diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..1b15f551
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "engine"]
+	path = engine
+	url = https://github.com/godotengine/godot.git
diff --git a/engine/.clangd b/engine/.clangd
index 95a1e907..3c9792ea 100644
--- a/engine/.clangd
+++ b/engine/.clangd
@@ -5,7 +5,6 @@
 Diagnostics:
   Includes:
     IgnoreHeader:
-      - core/typedefs\.h # Our "main" header, featuring transitive includes; allow everywhere.
       - \.compat\.inc
 ---
 # Header-specific conditions.
diff --git a/engine/.editorconfig b/engine/.editorconfig
index a2f93af3..c79c816e 100644
--- a/engine/.editorconfig
+++ b/engine/.editorconfig
@@ -16,5 +16,6 @@ indent_style = space
 indent_size = 2
 indent_style = space
 
-[*.svg]
-insert_final_newline = false
+[{*.props,*.vcxproj}]
+indent_size = 2
+indent_style = space
diff --git a/engine/.git-blame-ignore-revs b/engine/.git-blame-ignore-revs
index d54ff309..3203caf8 100644
--- a/engine/.git-blame-ignore-revs
+++ b/engine/.git-blame-ignore-revs
@@ -66,3 +66,9 @@ bb5f390fb9b466be35a5df7651323d7e66afca31
 
 # Style: Enforce `AllowShortFunctionsOnASingleLine`
 e06d83860d798b6766b23d6eae48557387a7db85
+
+# Style: Enforce trailing newlines on svgs
+7e5baa042639ffa835271703c720e2595e90afb8
+
+# Style: Replace header guards with `#pragma once`
+324512e11c1b7663c3cf47bec6ddbe65c6b8db2b
diff --git a/engine/.gitignore b/engine/.gitignore
index 2c3bf742..8adc7b78 100644
--- a/engine/.gitignore
+++ b/engine/.gitignore
@@ -263,6 +263,11 @@ bld/
 !thirdparty/**/arm/
 !thirdparty/**/arm64/
 
+thirdparty/swappy-frame-pacing/arm64-v8a/abi.json
+thirdparty/swappy-frame-pacing/armeabi-v7a/abi.json
+thirdparty/swappy-frame-pacing/x86/abi.json
+thirdparty/swappy-frame-pacing/x86_64/abi.json
+
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 
diff --git a/engine/.pre-commit-config.yaml b/engine/.pre-commit-config.yaml
index 5627d750..8c9f033a 100644
--- a/engine/.pre-commit-config.yaml
+++ b/engine/.pre-commit-config.yaml
@@ -4,24 +4,22 @@ default_language_version:
 exclude: |
   (?x)^(
     .*thirdparty/.*|
-    .*-so_wrap\.(h|c)|
+    .*-(dll|dylib|so)_wrap\.[ch]|
     platform/android/java/editor/src/main/java/com/android/.*|
     platform/android/java/lib/src/com/google/.*
   )$
 
 repos:
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.3
+    rev: v20.1.0
     hooks:
       - id: clang-format
         files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java)$
         types_or: [text]
-        exclude: ^tests/python_build/.*
       - id: clang-format
         name: clang-format-glsl
         files: \.glsl$
         types_or: [text]
-        exclude: ^tests/python_build/.*
         args: [-style=file:misc/utility/clang_format_glsl.yml]
 
   - repo: https://github.com/pocc/pre-commit-hooks
@@ -31,13 +29,12 @@ repos:
         files: \.(c|h|cpp|hpp|cc|hh|cxx|hxx|m|mm|inc|java|glsl)$
         args: [--fix, --quiet, --use-color]
         types_or: [text]
-        exclude: ^tests/python_build/.*
-        additional_dependencies: [clang-tidy==19.1.0]
+        additional_dependencies: [clang-tidy==20.1.0]
         require_serial: true
         stages: [manual] # Not automatically triggered, invoked via `pre-commit run --hook-stage manual clang-tidy`
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.4
+    rev: v0.11.4
     hooks:
       - id: ruff
         args: [--fix]
@@ -48,14 +45,14 @@ repos:
         types_or: [text]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.14.1 # Latest version that supports Python 3.8
     hooks:
       - id: mypy
         files: \.py$
         types_or: [text]
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         additional_dependencies: [tomli]
@@ -88,6 +85,13 @@ repos:
         pass_filenames: false
         files: ^(doc/classes|.*/doc_classes)/.*\.xml$
 
+      - id: validate-builders
+        name: validate-builders
+        language: python
+        entry: python tests/python_build/validate_builders.py
+        pass_filenames: false
+        files: ^(gles3|glsl)_builders\.py$
+
       - id: eslint
         name: eslint
         language: node
@@ -154,7 +158,6 @@ repos:
         language: python
         entry: python misc/scripts/header_guards.py
         files: \.(h|hpp|hh|hxx)$
-        exclude: ^.*/(dummy|thread|platform_config|platform_gl)\.h$
 
       - id: file-format
         name: file-format
diff --git a/engine/COPYRIGHT.txt b/engine/COPYRIGHT.txt
index 34aa95ed..38009093 100644
--- a/engine/COPYRIGHT.txt
+++ b/engine/COPYRIGHT.txt
@@ -163,6 +163,11 @@ Comment: Temporal Anti-Aliasing resolve implementation
 Copyright: 2016, Panos Karabelas
 License: Expat
 
+Files: thirdparty/accesskit/*
+Comment: AccessKit
+Copyright: 2023, The AccessKit Authors.
+License: Expat
+
 Files: thirdparty/amd-fsr/*
 Comment: AMD FidelityFX Super Resolution
 Copyright: 2021, Advanced Micro Devices, Inc.
@@ -200,7 +205,7 @@ License: MPL-2.0
 
 Files: thirdparty/clipper2/*
 Comment: Clipper2
-Copyright: 2010-2024, Angus Johnson
+Copyright: 2010-2025, Angus Johnson
 License: BSL-1.0
 
 Files: thirdparty/cvtt/*
diff --git a/engine/SConstruct b/engine/SConstruct
index f4500d75..03990864 100644
--- a/engine/SConstruct
+++ b/engine/SConstruct
@@ -14,6 +14,7 @@ from importlib.util import module_from_spec, spec_from_file_location
 from types import ModuleType
 
 from SCons import __version__ as scons_raw_version
+from SCons.Builder import ListEmitter
 
 # Explicitly resolve the helper modules, this is done to avoid clash with
 # modules of the same name that might be randomly added (e.g. someone adding
@@ -57,7 +58,7 @@ import gles3_builders
 import glsl_builders
 import methods
 import scu_builders
-from misc.utility.color import STDERR_COLOR, print_error, print_info, print_warning
+from misc.utility.color import is_stderr_color, print_error, print_info, print_warning
 from platform_methods import architecture_aliases, architectures, compatibility_platform_aliases
 
 if ARGUMENTS.get("target", "editor") == "editor":
@@ -166,7 +167,7 @@ opts.Add(
         "optimize",
         "Optimization level (by default inferred from 'target' and 'dev_build')",
         "auto",
-        ("auto", "none", "custom", "debug", "speed", "speed_trace", "size"),
+        ("auto", "none", "custom", "debug", "speed", "speed_trace", "size", "size_extra"),
     )
 )
 opts.Add(BoolVariable("debug_symbols", "Build with debugging symbols", False))
@@ -186,11 +187,12 @@ opts.Add(BoolVariable("vulkan", "Enable the vulkan rendering driver", True))
 opts.Add(BoolVariable("opengl3", "Enable the OpenGL/GLES3 rendering driver", True))
 opts.Add(BoolVariable("d3d12", "Enable the Direct3D 12 rendering driver on supported platforms", False))
 opts.Add(BoolVariable("metal", "Enable the Metal rendering driver on supported platforms (Apple arm64 only)", False))
-opts.Add(BoolVariable("openxr", "Enable the OpenXR driver", True))
 opts.Add(BoolVariable("use_volk", "Use the volk library to load the Vulkan loader dynamically", True))
 opts.Add(BoolVariable("disable_exceptions", "Force disabling exception handling code", True))
 opts.Add("custom_modules", "A list of comma-separated directory paths containing custom modules to build.", "")
 opts.Add(BoolVariable("custom_modules_recursive", "Detect custom modules recursively for each specified path.", True))
+opts.Add(BoolVariable("accesskit", "Use AccessKit C SDK", True))
+opts.Add(("accesskit_sdk_path", "Path to the AccessKit C SDK", ""))
 
 # Advanced options
 opts.Add(
@@ -220,6 +222,11 @@ opts.Add("vsproj_name", "Name of the Visual Studio solution", "godot")
 opts.Add("import_env_vars", "A comma-separated list of environment variables to copy from the outer environment.", "")
 opts.Add(BoolVariable("disable_3d", "Disable 3D nodes for a smaller executable", False))
 opts.Add(BoolVariable("disable_advanced_gui", "Disable advanced GUI nodes and behaviors", False))
+opts.Add(BoolVariable("disable_physics_2d", "Disable 2D physics nodes and server", False))
+opts.Add(BoolVariable("disable_physics_3d", "Disable 3D physics nodes and server", False))
+opts.Add(BoolVariable("disable_navigation_2d", "Disable 2D navigation features", False))
+opts.Add(BoolVariable("disable_navigation_3d", "Disable 3D navigation features", False))
+opts.Add(BoolVariable("disable_xr", "Disable XR nodes and server", False))
 opts.Add("build_profile", "Path to a file containing a feature build profile", "")
 opts.Add(BoolVariable("modules_enabled_by_default", "If no, disable all modules except ones explicitly enabled", True))
 opts.Add(BoolVariable("no_editor_splash", "Don't use the custom splash screen for the editor", True))
@@ -236,6 +243,13 @@ opts.Add(BoolVariable("engine_update_check", "Enable engine update checks in the
 opts.Add(BoolVariable("steamapi", "Enable minimal SteamAPI integration for usage time tracking (editor only)", False))
 opts.Add("cache_path", "Path to a directory where SCons cache files will be stored. No value disables the cache.", "")
 opts.Add("cache_limit", "Max size (in GiB) for the SCons cache. 0 means no limit.", "0")
+opts.Add(
+    BoolVariable(
+        "redirect_build_objects",
+        "Enable redirecting built objects/libraries to `bin/obj/` to declutter the repository.",
+        True,
+    )
+)
 
 # Thirdparty libraries
 opts.Add(BoolVariable("builtin_brotli", "Use the built-in Brotli library", True))
@@ -433,10 +447,19 @@ for tool in custom_tools:
     env.Tool(tool)
 
 
-# add default include paths
-
+# Add default include paths.
 env.Prepend(CPPPATH=["#"])
 
+# Allow marking includes as external/system to avoid raising warnings.
+env["_CCCOMCOM"] += " $_CPPEXTINCFLAGS"
+env["CPPEXTPATH"] = []
+if env.scons_version < (4, 2):
+    env["_CPPEXTINCFLAGS"] = "${_concat(EXTINCPREFIX, CPPEXTPATH, EXTINCSUFFIX, __env__, RDirs, TARGET, SOURCE)}"
+else:
+    env["_CPPEXTINCFLAGS"] = (
+        "${_concat(EXTINCPREFIX, CPPEXTPATH, EXTINCSUFFIX, __env__, RDirs, TARGET, SOURCE, affect_signature=False)}"
+    )
+
 # configure ENV for platform
 env.platform_exporters = platform_exporters
 env.platform_apis = platform_apis
@@ -696,83 +719,84 @@ if env["arch"] == "x86_32":
 
 # Explicitly specify colored output.
 if methods.using_gcc(env):
-    env.AppendUnique(CCFLAGS=["-fdiagnostics-color" if STDERR_COLOR else "-fno-diagnostics-color"])
+    env.AppendUnique(CCFLAGS=["-fdiagnostics-color" if is_stderr_color() else "-fno-diagnostics-color"])
 elif methods.using_clang(env) or methods.using_emcc(env):
-    env.AppendUnique(CCFLAGS=["-fcolor-diagnostics" if STDERR_COLOR else "-fno-color-diagnostics"])
+    env.AppendUnique(CCFLAGS=["-fcolor-diagnostics" if is_stderr_color() else "-fno-color-diagnostics"])
     if sys.platform == "win32":
         env.AppendUnique(CCFLAGS=["-fansi-escape-codes"])
 
 # Set optimize and debug_symbols flags.
 # "custom" means do nothing and let users set their own optimization flags.
 # Needs to happen after configure to have `env.msvc` defined.
+env.AppendUnique(CCFLAGS=["$OPTIMIZELEVEL"])
 if env.msvc:
     if env["debug_symbols"]:
-        env.Append(CCFLAGS=["/Zi", "/FS"])
-        env.Append(LINKFLAGS=["/DEBUG:FULL"])
+        env.AppendUnique(CCFLAGS=["/Zi", "/FS"])
+        env.AppendUnique(LINKFLAGS=["/DEBUG:FULL"])
     else:
-        env.Append(LINKFLAGS=["/DEBUG:NONE"])
+        env.AppendUnique(LINKFLAGS=["/DEBUG:NONE"])
 
     if env["optimize"].startswith("speed"):
-        env.Append(CCFLAGS=["/O2"])
-        env.Append(LINKFLAGS=["/OPT:REF"])
+        env["OPTIMIZELEVEL"] = "/O2"
+        env.AppendUnique(LINKFLAGS=["/OPT:REF"])
         if env["optimize"] == "speed_trace":
-            env.Append(LINKFLAGS=["/OPT:NOICF"])
-    elif env["optimize"] == "size":
-        env.Append(CCFLAGS=["/O1"])
-        env.Append(LINKFLAGS=["/OPT:REF"])
+            env.AppendUnique(LINKFLAGS=["/OPT:NOICF"])
+    elif env["optimize"].startswith("size"):
+        env["OPTIMIZELEVEL"] = "/O1"
+        env.AppendUnique(LINKFLAGS=["/OPT:REF"])
+        if env["optimize"] == "size_extra":
+            env.AppendUnique(CPPDEFINES=["SIZE_EXTRA"])
     elif env["optimize"] == "debug" or env["optimize"] == "none":
-        env.Append(CCFLAGS=["/Od"])
+        env["OPTIMIZELEVEL"] = "/Od"
 else:
     if env["debug_symbols"]:
         if env["platform"] == "windows":
             if methods.using_clang(env):
-                env.Append(CCFLAGS=["-gdwarf-4"])  # clang dwarf-5 symbols are broken on Windows.
+                env.AppendUnique(CCFLAGS=["-gdwarf-4"])  # clang dwarf-5 symbols are broken on Windows.
             else:
-                env.Append(CCFLAGS=["-gdwarf-5"])  # For gcc, only dwarf-5 symbols seem usable by libbacktrace.
+                env.AppendUnique(CCFLAGS=["-gdwarf-5"])  # For gcc, only dwarf-5 symbols seem usable by libbacktrace.
         else:
             # Adding dwarf-4 explicitly makes stacktraces work with clang builds,
             # otherwise addr2line doesn't understand them
-            env.Append(CCFLAGS=["-gdwarf-4"])
+            env.AppendUnique(CCFLAGS=["-gdwarf-4"])
         if methods.using_emcc(env):
             # Emscripten only produces dwarf symbols when using "-g3".
-            env.Append(CCFLAGS=["-g3"])
+            env.AppendUnique(CCFLAGS=["-g3"])
             # Emscripten linker needs debug symbols options too.
-            env.Append(LINKFLAGS=["-gdwarf-4"])
-            env.Append(LINKFLAGS=["-g3"])
+            env.AppendUnique(LINKFLAGS=["-gdwarf-4"])
+            env.AppendUnique(LINKFLAGS=["-g3"])
         elif env.dev_build:
-            env.Append(CCFLAGS=["-g3"])
+            env.AppendUnique(CCFLAGS=["-g3"])
         else:
-            env.Append(CCFLAGS=["-g2"])
+            env.AppendUnique(CCFLAGS=["-g2"])
         if env["debug_paths_relative"]:
             # Remap absolute paths to relative paths for debug symbols.
             project_path = Dir("#").abspath
-            env.Append(CCFLAGS=[f"-ffile-prefix-map={project_path}=."])
+            env.AppendUnique(CCFLAGS=[f"-ffile-prefix-map={project_path}=."])
     else:
         if methods.is_apple_clang(env):
             # Apple Clang, its linker doesn't like -s.
-            env.Append(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
+            env.AppendUnique(LINKFLAGS=["-Wl,-S", "-Wl,-x", "-Wl,-dead_strip"])
         else:
-            env.Append(LINKFLAGS=["-s"])
+            env.AppendUnique(LINKFLAGS=["-s"])
 
     # Linker needs optimization flags too, at least for Emscripten.
     # For other toolchains, this _may_ be useful for LTO too to disambiguate.
+    env.AppendUnique(LINKFLAGS=["$OPTIMIZELEVEL"])
 
     if env["optimize"] == "speed":
-        env.Append(CCFLAGS=["-O3"])
-        env.Append(LINKFLAGS=["-O3"])
+        env["OPTIMIZELEVEL"] = "-O3"
     # `-O2` is friendlier to debuggers than `-O3`, leading to better crash backtraces.
     elif env["optimize"] == "speed_trace":
-        env.Append(CCFLAGS=["-O2"])
-        env.Append(LINKFLAGS=["-O2"])
-    elif env["optimize"] == "size":
-        env.Append(CCFLAGS=["-Os"])
-        env.Append(LINKFLAGS=["-Os"])
+        env["OPTIMIZELEVEL"] = "-O2"
+    elif env["optimize"].startswith("size"):
+        env["OPTIMIZELEVEL"] = "-Os"
+        if env["optimize"] == "size_extra":
+            env.AppendUnique(CPPDEFINES=["SIZE_EXTRA"])
     elif env["optimize"] == "debug":
-        env.Append(CCFLAGS=["-Og"])
-        env.Append(LINKFLAGS=["-Og"])
+        env["OPTIMIZELEVEL"] = "-Og"
     elif env["optimize"] == "none":
-        env.Append(CCFLAGS=["-O0"])
-        env.Append(LINKFLAGS=["-O0"])
+        env["OPTIMIZELEVEL"] = "-O0"
 
 # Needs to happen after configure to handle "auto".
 if env["lto"] != "none":
@@ -813,6 +837,7 @@ elif env.msvc:
     env.Append(CXXFLAGS=["/EHsc"])
 
 # Configure compiler warnings
+env.AppendUnique(CCFLAGS=["$WARNLEVEL"])
 if env.msvc and not methods.using_clang(env):  # MSVC
     # Disable warnings which we don't plan to fix.
     disabled_warnings = [
@@ -830,19 +855,23 @@ if env.msvc and not methods.using_clang(env):  # MSVC
     ]
 
     if env["warnings"] == "extra":
-        env.Append(CCFLAGS=["/W4"] + disabled_warnings)
+        env["WARNLEVEL"] = "/W4"
+        env.AppendUnique(CCFLAGS=disabled_warnings)
     elif env["warnings"] == "all":
+        env["WARNLEVEL"] = "/W3"
         # C4458 is like -Wshadow. Part of /W4 but let's apply it for the default /W3 too.
-        env.Append(CCFLAGS=["/W3", "/w34458"] + disabled_warnings)
+        env.AppendUnique(CCFLAGS=["/w34458"] + disabled_warnings)
     elif env["warnings"] == "moderate":
-        env.Append(CCFLAGS=["/W2"] + disabled_warnings)
+        env["WARNLEVEL"] = "/W2"
+        env.AppendUnique(CCFLAGS=disabled_warnings)
     else:  # 'no'
+        env["WARNLEVEL"] = "/w"
         # C4267 is particularly finicky & needs to be explicitly disabled.
-        env.Append(CCFLAGS=["/w", "/wd4267"])
+        env.AppendUnique(CCFLAGS=["/wd4267"])
 
     if env["werror"]:
-        env.Append(CCFLAGS=["/WX"])
-        env.Append(LINKFLAGS=["/WX"])
+        env.AppendUnique(CCFLAGS=["/WX"])
+        env.AppendUnique(LINKFLAGS=["/WX"])
 
 else:  # GCC, Clang
     common_warnings = []
@@ -861,14 +890,14 @@ else:  # GCC, Clang
         # for putting them in `Set` or `Map`. We don't mind about unreliable ordering.
         common_warnings += ["-Wno-ordered-compare-function-pointers"]
 
-    # clang-cl will interpret `-Wall` as `-Weverything`, workaround with compatibility cast
-    W_ALL = "-Wall" if not env.msvc else "-W3"
+    # clang-cl will interpret `-Wall` as `-Weverything`, workaround with compatibility cast.
+    env["WARNLEVEL"] = "-Wall" if not env.msvc else "-W3"
 
     if env["warnings"] == "extra":
-        env.Append(CCFLAGS=[W_ALL, "-Wextra", "-Wwrite-strings", "-Wno-unused-parameter"] + common_warnings)
-        env.Append(CXXFLAGS=["-Wctor-dtor-privacy", "-Wnon-virtual-dtor"])
+        env.AppendUnique(CCFLAGS=["-Wextra", "-Wwrite-strings", "-Wno-unused-parameter"] + common_warnings)
+        env.AppendUnique(CXXFLAGS=["-Wctor-dtor-privacy", "-Wnon-virtual-dtor"])
         if methods.using_gcc(env):
-            env.Append(
+            env.AppendUnique(
                 CCFLAGS=[
                     "-Walloc-zero",
                     "-Wduplicated-branches",
@@ -876,25 +905,38 @@ else:  # GCC, Clang
                     "-Wstringop-overflow=4",
                 ]
             )
-            env.Append(CXXFLAGS=["-Wplacement-new=1"])
+            env.AppendUnique(CXXFLAGS=["-Wplacement-new=1", "-Wvirtual-inheritance"])
             # Need to fix a warning with AudioServer lambdas before enabling.
             # if cc_version_major != 9:  # GCC 9 had a regression (GH-36325).
             #    env.Append(CXXFLAGS=["-Wnoexcept"])
             if cc_version_major >= 9:
-                env.Append(CCFLAGS=["-Wattribute-alias=2"])
+                env.AppendUnique(CCFLAGS=["-Wattribute-alias=2"])
             if cc_version_major >= 11:  # Broke on MethodBind templates before GCC 11.
-                env.Append(CCFLAGS=["-Wlogical-op"])
+                env.AppendUnique(CCFLAGS=["-Wlogical-op"])
         elif methods.using_clang(env) or methods.using_emcc(env):
-            env.Append(CCFLAGS=["-Wimplicit-fallthrough"])
+            env.AppendUnique(CCFLAGS=["-Wimplicit-fallthrough"])
     elif env["warnings"] == "all":
-        env.Append(CCFLAGS=[W_ALL] + common_warnings)
+        env.AppendUnique(CCFLAGS=common_warnings)
     elif env["warnings"] == "moderate":
-        env.Append(CCFLAGS=[W_ALL, "-Wno-unused"] + common_warnings)
+        env.AppendUnique(CCFLAGS=["-Wno-unused"] + common_warnings)
     else:  # 'no'
-        env.Append(CCFLAGS=["-w"])
+        env["WARNLEVEL"] = "-w"
 
     if env["werror"]:
-        env.Append(CCFLAGS=["-Werror"])
+        env.AppendUnique(CCFLAGS=["-Werror"])
+
+# Configure external includes.
+if env.msvc:
+    if not methods.using_clang(env):
+        if cc_version_major < 16 or (cc_version_major == 16 and cc_version_minor < 10):
+            env.AppendUnique(CCFLAGS=["/experimental:external"])
+        env.AppendUnique(CCFLAGS=["/external:anglebrackets"])
+    env.AppendUnique(CCFLAGS=["/external:W0"])
+    env["EXTINCPREFIX"] = "/external:I"
+    env["EXTINCSUFFIX"] = ""
+else:
+    env["EXTINCPREFIX"] = "-isystem "
+    env["EXTINCSUFFIX"] = ""
 
 if hasattr(detect, "get_program_suffix"):
     suffix = "." + detect.get_program_suffix()
@@ -918,6 +960,51 @@ suffix += env.extra_suffix
 sys.path.remove(tmppath)
 sys.modules.pop("detect")
 
+if env.editor_build:
+    unsupported_opts = []
+    for disable_opt in [
+        "disable_3d",
+        "disable_advanced_gui",
+        "disable_physics_2d",
+        "disable_physics_3d",
+        "disable_navigation_2d",
+        "disable_navigation_3d",
+    ]:
+        if env[disable_opt]:
+            unsupported_opts.append(disable_opt)
+    if unsupported_opts != []:
+        print_error(
+            "The following build option(s) cannot be used for editor builds, but only for export template builds: {}.".format(
+                ", ".join(unsupported_opts)
+            )
+        )
+        Exit(255)
+
+if env["disable_3d"]:
+    env.Append(CPPDEFINES=["_3D_DISABLED"])
+    env["disable_navigation_3d"] = True
+    env["disable_physics_3d"] = True
+    env["disable_xr"] = True
+if env["disable_advanced_gui"]:
+    env.Append(CPPDEFINES=["ADVANCED_GUI_DISABLED"])
+if env["disable_physics_2d"]:
+    env.Append(CPPDEFINES=["PHYSICS_2D_DISABLED"])
+if env["disable_physics_3d"]:
+    env.Append(CPPDEFINES=["PHYSICS_3D_DISABLED"])
+if env["disable_navigation_2d"]:
+    env.Append(CPPDEFINES=["NAVIGATION_2D_DISABLED"])
+if env["disable_navigation_3d"]:
+    env.Append(CPPDEFINES=["NAVIGATION_3D_DISABLED"])
+if env["disable_xr"]:
+    env.Append(CPPDEFINES=["XR_DISABLED"])
+if env["minizip"]:
+    env.Append(CPPDEFINES=["MINIZIP_ENABLED"])
+if env["brotli"]:
+    env.Append(CPPDEFINES=["BROTLI_ENABLED"])
+
+if not env["verbose"]:
+    methods.no_verbose(env)
+
 modules_enabled = OrderedDict()
 env.module_dependencies = {}
 env.module_icons_paths = []
@@ -968,8 +1055,6 @@ if env.editor_build:
         print_error("Not all modules required by editor builds are enabled.")
         Exit(255)
 
-env.version_info = methods.get_version_info(env.module_version_string)
-
 env["PROGSUFFIX_WRAP"] = suffix + env.module_version_string + ".console" + env["PROGSUFFIX"]
 env["PROGSUFFIX"] = suffix + env.module_version_string + env["PROGSUFFIX"]
 env["OBJSUFFIX"] = suffix + env["OBJSUFFIX"]
@@ -989,28 +1074,6 @@ env["SHLIBSUFFIX"] = suffix + env["SHLIBSUFFIX"]
 env["OBJPREFIX"] = env["object_prefix"]
 env["SHOBJPREFIX"] = env["object_prefix"]
 
-if env["disable_3d"]:
-    if env.editor_build:
-        print_error("Build option `disable_3d=yes` cannot be used for editor builds, only for export template builds.")
-        Exit(255)
-    else:
-        env.Append(CPPDEFINES=["_3D_DISABLED"])
-if env["disable_advanced_gui"]:
-    if env.editor_build:
-        print_error(
-            "Build option `disable_advanced_gui=yes` cannot be used for editor builds, only for export template builds."
-        )
-        Exit(255)
-    else:
-        env.Append(CPPDEFINES=["ADVANCED_GUI_DISABLED"])
-if env["minizip"]:
-    env.Append(CPPDEFINES=["MINIZIP_ENABLED"])
-if env["brotli"]:
-    env.Append(CPPDEFINES=["BROTLI_ENABLED"])
-
-if not env["verbose"]:
-    methods.no_verbose(env)
-
 GLSL_BUILDERS = {
     "RD_GLSL": env.Builder(
         action=env.Run(glsl_builders.build_rd_headers),
@@ -1051,6 +1114,14 @@ if env["ninja"]:
 if env["threads"]:
     env.Append(CPPDEFINES=["THREADS_ENABLED"])
 
+# Ensure build objects are put in their own folder if `redirect_build_objects` is enabled.
+env.Prepend(LIBEMITTER=[methods.redirect_emitter])
+env.Prepend(SHLIBEMITTER=[methods.redirect_emitter])
+for key in (emitters := env.StaticObject.builder.emitter):
+    emitters[key] = ListEmitter([methods.redirect_emitter] + env.Flatten(emitters[key]))
+for key in (emitters := env.SharedObject.builder.emitter):
+    emitters[key] = ListEmitter([methods.redirect_emitter] + env.Flatten(emitters[key]))
+
 # Build subdirs, the build order is dependent on link order.
 Export("env")
 
@@ -1082,11 +1153,11 @@ if "check_c_headers" in env:
     for header in headers:
         if conf.CheckCHeader(header):
             env.AppendUnique(CPPDEFINES=[headers[header]])
+conf.Finish()
 
-
-methods.show_progress(env)
-# TODO: replace this with `env.Dump(format="json")`
-# once we start requiring SCons 4.0 as min version.
-methods.dump(env)
-methods.prepare_purge(env)
-methods.prepare_timer()
+# Miscellaneous & post-build methods.
+if not env.GetOption("clean") and not env.GetOption("help"):
+    methods.dump(env)
+    methods.show_progress(env)
+    methods.prepare_purge(env)
+    methods.prepare_timer()
diff --git a/engine/core/SCsub b/engine/core/SCsub
index f055a75c..a252a074 100644
--- a/engine/core/SCsub
+++ b/engine/core/SCsub
@@ -51,8 +51,8 @@ if env["brotli"] and env["builtin_brotli"]:
     ]
     thirdparty_brotli_sources = [thirdparty_brotli_dir + file for file in thirdparty_brotli_sources]
 
-    env_thirdparty.Prepend(CPPPATH=[thirdparty_brotli_dir + "include"])
-    env.Prepend(CPPPATH=[thirdparty_brotli_dir + "include"])
+    env_thirdparty.Prepend(CPPEXTPATH=[thirdparty_brotli_dir + "include"])
+    env.Prepend(CPPEXTPATH=[thirdparty_brotli_dir + "include"])
 
     if env.get("use_ubsan") or env.get("use_asan") or env.get("use_tsan") or env.get("use_lsan") or env.get("use_msan"):
         env_thirdparty.Append(CPPDEFINES=["BROTLI_BUILD_PORTABLE"])
@@ -69,8 +69,8 @@ if env["builtin_clipper2"]:
     ]
     thirdparty_clipper_sources = [thirdparty_clipper_dir + file for file in thirdparty_clipper_sources]
 
-    env_thirdparty.Prepend(CPPPATH=[thirdparty_clipper_dir + "include"])
-    env.Prepend(CPPPATH=[thirdparty_clipper_dir + "include"])
+    env_thirdparty.Prepend(CPPEXTPATH=[thirdparty_clipper_dir + "include"])
+    env.Prepend(CPPEXTPATH=[thirdparty_clipper_dir + "include"])
 
     env_thirdparty.Append(CPPDEFINES=["CLIPPER2_ENABLED"])
     env.Append(CPPDEFINES=["CLIPPER2_ENABLED"])
@@ -94,9 +94,9 @@ if env["builtin_zlib"]:
     ]
     thirdparty_zlib_sources = [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources]
 
-    env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir])
+    env_thirdparty.Prepend(CPPEXTPATH=[thirdparty_zlib_dir])
     # Needs to be available in main env too
-    env.Prepend(CPPPATH=[thirdparty_zlib_dir])
+    env.Prepend(CPPEXTPATH=[thirdparty_zlib_dir])
     if env.dev_build:
         env_thirdparty.Append(CPPDEFINES=["ZLIB_DEBUG"])
         # Affects headers so it should also be defined for Godot code
@@ -148,9 +148,9 @@ if env["builtin_zstd"]:
         thirdparty_zstd_sources.append("decompress/huf_decompress_amd64.S")
     thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources]
 
-    env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
+    env_thirdparty.Prepend(CPPEXTPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"])
     env_thirdparty.Append(CPPDEFINES=["ZSTD_STATIC_LINKING_ONLY"])
-    env.Prepend(CPPPATH=thirdparty_zstd_dir)
+    env.Prepend(CPPEXTPATH=thirdparty_zstd_dir)
     # Also needed in main env includes will trigger warnings
     env.Append(CPPDEFINES=["ZSTD_STATIC_LINKING_ONLY"])
 
@@ -167,10 +167,9 @@ env.add_source_files(env.core_sources, "*.cpp")
 
 # Generate disabled classes
 def disabled_class_builder(target, source, env):
-    with methods.generated_wrapper(target) as file:
+    with methods.generated_wrapper(str(target[0])) as file:
         for c in source[0].read():
-            cs = c.strip()
-            if cs != "":
+            if cs := c.strip():
                 file.write(f"#define ClassDB_Disable_{cs} 1\n")
 
 
@@ -179,49 +178,51 @@ env.CommandNoCache("disabled_classes.gen.h", env.Value(env.disabled_classes), en
 
 # Generate version info
 def version_info_builder(target, source, env):
-    with methods.generated_wrapper(target) as file:
+    with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             """\
-#define VERSION_SHORT_NAME "{short_name}"
-#define VERSION_NAME "{name}"
-#define VERSION_MAJOR {major}
-#define VERSION_MINOR {minor}
-#define VERSION_PATCH {patch}
-#define VERSION_STATUS "{status}"
-#define VERSION_BUILD "{build}"
-#define VERSION_MODULE_CONFIG "{module_config}"
-#define VERSION_WEBSITE "{website}"
-#define VERSION_DOCS_BRANCH "{docs_branch}"
-#define VERSION_DOCS_URL "https://docs.godotengine.org/en/" VERSION_DOCS_BRANCH
-""".format(**env.version_info)
+#define GODOT_VERSION_SHORT_NAME "{short_name}"
+#define GODOT_VERSION_NAME "{name}"
+#define GODOT_VERSION_MAJOR {major}
+#define GODOT_VERSION_MINOR {minor}
+#define GODOT_VERSION_PATCH {patch}
+#define GODOT_VERSION_STATUS "{status}"
+#define GODOT_VERSION_BUILD "{build}"
+#define GODOT_VERSION_MODULE_CONFIG "{module_config}"
+#define GODOT_VERSION_WEBSITE "{website}"
+#define GODOT_VERSION_DOCS_BRANCH "{docs_branch}"
+#define GODOT_VERSION_DOCS_URL "https://docs.godotengine.org/en/" GODOT_VERSION_DOCS_BRANCH
+""".format(**source[0].read())
         )
 
 
-env.CommandNoCache("version_generated.gen.h", env.Value(env.version_info), env.Run(version_info_builder))
+env.CommandNoCache(
+    "version_generated.gen.h",
+    env.Value(methods.get_version_info(env.module_version_string)),
+    env.Run(version_info_builder),
+)
 
 
 # Generate version hash
 def version_hash_builder(target, source, env):
-    with methods.generated_wrapper(target) as file:
+    with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             """\
 #include "core/version.h"
 
-const char *const VERSION_HASH = "{git_hash}";
-const uint64_t VERSION_TIMESTAMP = {git_timestamp};
-""".format(**env.version_info)
+const char *const GODOT_VERSION_HASH = "{git_hash}";
+const uint64_t GODOT_VERSION_TIMESTAMP = {git_timestamp};
+""".format(**source[0].read())
         )
 
 
-gen_hash = env.CommandNoCache(
-    "version_hash.gen.cpp", env.Value(env.version_info["git_hash"]), env.Run(version_hash_builder)
-)
+gen_hash = env.CommandNoCache("version_hash.gen.cpp", env.Value(methods.get_git_info()), env.Run(version_hash_builder))
 env.add_source_files(env.core_sources, gen_hash)
 
 
 # Generate AES256 script encryption key
 def encryption_key_builder(target, source, env):
-    with methods.generated_wrapper(target) as file:
+    with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             f"""\
 #include "core/config/project_settings.h"
@@ -251,30 +252,21 @@ env.add_source_files(env.core_sources, gen_encrypt)
 
 
 # Certificates
-env.Depends(
-    "#core/io/certs_compressed.gen.h",
-    ["#thirdparty/certs/ca-certificates.crt", env.Value(env["builtin_certs"]), env.Value(env["system_certs_path"])],
-)
 env.CommandNoCache(
     "#core/io/certs_compressed.gen.h",
-    "#thirdparty/certs/ca-certificates.crt",
+    ["#thirdparty/certs/ca-certificates.crt", env.Value(env["builtin_certs"]), env.Value(env["system_certs_path"])],
     env.Run(core_builders.make_certs_header),
 )
 
 # Authors
-env.Depends("#core/authors.gen.h", "../AUTHORS.md")
-env.CommandNoCache("#core/authors.gen.h", "../AUTHORS.md", env.Run(core_builders.make_authors_header))
+env.CommandNoCache("#core/authors.gen.h", "#AUTHORS.md", env.Run(core_builders.make_authors_header))
 
 # Donors
-env.Depends("#core/donors.gen.h", "../DONORS.md")
-env.CommandNoCache("#core/donors.gen.h", "../DONORS.md", env.Run(core_builders.make_donors_header))
+env.CommandNoCache("#core/donors.gen.h", "#DONORS.md", env.Run(core_builders.make_donors_header))
 
 # License
-env.Depends("#core/license.gen.h", ["../COPYRIGHT.txt", "../LICENSE.txt"])
 env.CommandNoCache(
-    "#core/license.gen.h",
-    ["../COPYRIGHT.txt", "../LICENSE.txt"],
-    env.Run(core_builders.make_license_header),
+    "#core/license.gen.h", ["#COPYRIGHT.txt", "#LICENSE.txt"], env.Run(core_builders.make_license_header)
 )
 
 # Chain load SCsubs
diff --git a/engine/core/config/engine.cpp b/engine/core/config/engine.cpp
index 402e6281..0f7ead2f 100644
--- a/engine/core/config/engine.cpp
+++ b/engine/core/config/engine.cpp
@@ -125,17 +125,17 @@ double Engine::get_unfrozen_time_scale() const {
 
 Dictionary Engine::get_version_info() const {
 	Dictionary dict;
-	dict["major"] = VERSION_MAJOR;
-	dict["minor"] = VERSION_MINOR;
-	dict["patch"] = VERSION_PATCH;
-	dict["hex"] = VERSION_HEX;
-	dict["status"] = VERSION_STATUS;
-	dict["build"] = VERSION_BUILD;
+	dict["major"] = GODOT_VERSION_MAJOR;
+	dict["minor"] = GODOT_VERSION_MINOR;
+	dict["patch"] = GODOT_VERSION_PATCH;
+	dict["hex"] = GODOT_VERSION_HEX;
+	dict["status"] = GODOT_VERSION_STATUS;
+	dict["build"] = GODOT_VERSION_BUILD;
 
-	String hash = String(VERSION_HASH);
+	String hash = String(GODOT_VERSION_HASH);
 	dict["hash"] = hash.is_empty() ? String("unknown") : hash;
 
-	dict["timestamp"] = VERSION_TIMESTAMP;
+	dict["timestamp"] = GODOT_VERSION_TIMESTAMP;
 
 	String stringver = String(dict["major"]) + "." + String(dict["minor"]);
 	if ((int)dict["patch"] != 0) {
diff --git a/engine/core/config/engine.h b/engine/core/config/engine.h
index ec5fb955..701cfda5 100644
--- a/engine/core/config/engine.h
+++ b/engine/core/config/engine.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENGINE_H
-#define ENGINE_H
+#pragma once
 
 #include "core/os/main_loop.h"
 #include "core/string/ustring.h"
@@ -214,5 +213,3 @@ public:
 	Engine();
 	virtual ~Engine();
 };
-
-#endif // ENGINE_H
diff --git a/engine/core/config/project_settings.cpp b/engine/core/config/project_settings.cpp
index e4cc0f9c..565a9734 100644
--- a/engine/core/config/project_settings.cpp
+++ b/engine/core/config/project_settings.cpp
@@ -77,7 +77,7 @@ String ProjectSettings::get_imported_files_path() const {
 // This is used by the project manager to provide the initial_settings for config/features.
 const PackedStringArray ProjectSettings::get_required_features() {
 	PackedStringArray features;
-	features.append(VERSION_BRANCH);
+	features.append(GODOT_VERSION_BRANCH);
 #ifdef REAL_T_IS_DOUBLE
 	features.append("Double Precision");
 #endif
@@ -92,9 +92,9 @@ const PackedStringArray ProjectSettings::_get_supported_features() {
 #endif
 	// Allow pinning to a specific patch number or build type by marking
 	// them as supported. They're only used if the user adds them manually.
-	features.append(VERSION_BRANCH "." _MKSTR(VERSION_PATCH));
-	features.append(VERSION_FULL_CONFIG);
-	features.append(VERSION_FULL_BUILD);
+	features.append(GODOT_VERSION_BRANCH "." _MKSTR(GODOT_VERSION_PATCH));
+	features.append(GODOT_VERSION_FULL_CONFIG);
+	features.append(GODOT_VERSION_FULL_BUILD);
 
 #ifdef RD_ENABLED
 	features.append("Forward Plus");
@@ -173,7 +173,7 @@ String ProjectSettings::localize_path(const String &p_path) const {
 
 	if (dir->change_dir(path) == OK) {
 		String cwd = dir->get_current_dir();
-		cwd = cwd.replace("\\", "/");
+		cwd = cwd.replace_char('\\', '/');
 
 		// Ensure that we end with a '/'.
 		// This is important to ensure that we do not wrongly localize the resource path
@@ -208,7 +208,7 @@ String ProjectSettings::localize_path(const String &p_path) const {
 		if (plocal[plocal.length() - 1] == '/') {
 			sep += 1;
 		}
-		return plocal + path.substr(sep, path.size() - sep);
+		return plocal + path.substr(sep);
 	}
 }
 
@@ -289,7 +289,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) {
 				remove_autoload(node_name);
 			}
 		} else if (p_name.operator String().begins_with("global_group/")) {
-			String group_name = p_name.operator String().get_slice("/", 1);
+			String group_name = p_name.operator String().get_slicec('/', 1);
 			if (global_groups.has(group_name)) {
 				remove_global_group(group_name);
 			}
@@ -340,7 +340,7 @@ bool ProjectSettings::_set(const StringName &p_name, const Variant &p_value) {
 			}
 			add_autoload(autoload);
 		} else if (p_name.operator String().begins_with("global_group/")) {
-			String group_name = p_name.operator String().get_slice("/", 1);
+			String group_name = p_name.operator String().get_slicec('/', 1);
 			add_global_group(group_name, p_value);
 		}
 	}
@@ -359,14 +359,14 @@ bool ProjectSettings::_get(const StringName &p_name, Variant &r_ret) const {
 	return true;
 }
 
-Variant ProjectSettings::get_setting_with_override(const StringName &p_name) const {
+Variant ProjectSettings::get_setting_with_override_and_custom_features(const StringName &p_name, const Vector<String> &p_features) const {
 	_THREAD_SAFE_METHOD_
 
 	StringName name = p_name;
 	if (feature_overrides.has(name)) {
 		const LocalVector<Pair<StringName, StringName>> &overrides = feature_overrides[name];
 		for (uint32_t i = 0; i < overrides.size(); i++) {
-			if (OS::get_singleton()->has_feature(overrides[i].first)) { // Custom features are checked in OS.has_feature() already. No need to check twice.
+			if (p_features.has(String(overrides[i].first).to_lower())) {
 				if (props.has(overrides[i].second)) {
 					name = overrides[i].second;
 					break;
@@ -376,12 +376,39 @@ Variant ProjectSettings::get_setting_with_override(const StringName &p_name) con
 	}
 
 	if (!props.has(name)) {
-		WARN_PRINT(vformat("Property not found: '%s'.", String(name)));
+		WARN_PRINT("Property not found: " + String(name));
 		return Variant();
 	}
 	return props[name].variant;
 }
 
+Variant ProjectSettings::get_setting_with_override(const StringName &p_name) const {
+	_THREAD_SAFE_METHOD_
+
+	const LocalVector<Pair<StringName, StringName>> *overrides = feature_overrides.getptr(p_name);
+	if (overrides) {
+		for (uint32_t i = 0; i < overrides->size(); i++) {
+			if (!OS::get_singleton()->has_feature((*overrides)[i].first)) {
+				continue;
+			}
+
+			// Custom features are checked in OS.has_feature() already. No need to check twice.
+			const RBMap<StringName, VariantContainer>::Element *override_prop = props.find((*overrides)[i].second);
+			if (override_prop) {
+				return override_prop->get().variant;
+			}
+		}
+	}
+
+	const RBMap<StringName, VariantContainer>::Element *prop = props.find(p_name);
+	if (!prop) {
+		WARN_PRINT(vformat("Property not found: '%s'.", p_name));
+		return Variant();
+	}
+
+	return prop->get().variant;
+}
+
 struct _VCSort {
 	String name;
 	Variant::Type type = Variant::VARIANT_MAX;
@@ -564,7 +591,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
 	if (!OS::get_singleton()->get_resource_dir().is_empty()) {
 		// OS will call ProjectSettings->get_resource_path which will be empty if not overridden!
 		// If the OS would rather use a specific location, then it will not be empty.
-		resource_path = OS::get_singleton()->get_resource_dir().replace("\\", "/");
+		resource_path = OS::get_singleton()->get_resource_dir().replace_char('\\', '/');
 		if (!resource_path.is_empty() && resource_path[resource_path.length() - 1] == '/') {
 			resource_path = resource_path.substr(0, resource_path.length() - 1); // Chop end.
 		}
@@ -685,7 +712,7 @@ Error ProjectSettings::_setup(const String &p_path, const String &p_main_pack, b
 	while (true) {
 		// Set the resource path early so things can be resolved when loading.
 		resource_path = current_dir;
-		resource_path = resource_path.replace("\\", "/"); // Windows path to Unix path just in case.
+		resource_path = resource_path.replace_char('\\', '/'); // Windows path to Unix path just in case.
 		err = _load_settings_text_or_binary(current_dir.path_join("project.godot"), current_dir.path_join("project.binary"));
 		if (err == OK && !p_ignore_override) {
 			// Optional, we don't mind if it fails.
@@ -770,8 +797,7 @@ Error ProjectSettings::_load_settings_binary(const String &p_path) {
 		cs.resize(slen + 1);
 		cs[slen] = 0;
 		f->get_buffer((uint8_t *)cs.ptr(), slen);
-		String key;
-		key.parse_utf8(cs.ptr(), slen);
+		String key = String::utf8(cs.ptr(), slen);
 
 		uint32_t vlen = f->get_32();
 		Vector<uint8_t> d;
@@ -1129,7 +1155,7 @@ Error ProjectSettings::save_custom(const String &p_path, const CustomMap &p_cust
 			category = "";
 		} else {
 			category = category.substr(0, div);
-			name = name.substr(div + 1, name.size());
+			name = name.substr(div + 1);
 		}
 		save_props[category].push_back(name);
 	}
@@ -1141,7 +1167,7 @@ Error ProjectSettings::save_custom(const String &p_path, const CustomMap &p_cust
 			save_features += ",";
 		}
 
-		String f = p_custom_features[i].strip_edges().replace("\"", "");
+		String f = p_custom_features[i].strip_edges().remove_char('\"');
 		save_features += f;
 	}
 
@@ -1408,6 +1434,7 @@ void ProjectSettings::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_setting", "name", "default_value"), &ProjectSettings::get_setting, DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("get_setting_with_override", "name"), &ProjectSettings::get_setting_with_override);
 	ClassDB::bind_method(D_METHOD("get_global_class_list"), &ProjectSettings::get_global_class_list);
+	ClassDB::bind_method(D_METHOD("get_setting_with_override_and_custom_features", "name", "features"), &ProjectSettings::get_setting_with_override_and_custom_features);
 	ClassDB::bind_method(D_METHOD("set_order", "name", "position"), &ProjectSettings::set_order);
 	ClassDB::bind_method(D_METHOD("get_order", "name"), &ProjectSettings::get_order);
 	ClassDB::bind_method(D_METHOD("set_initial_value", "name", "value"), &ProjectSettings::set_initial_value);
@@ -1434,8 +1461,8 @@ void ProjectSettings::_add_builtin_input_map() {
 			Array events;
 
 			// Convert list of input events into array
-			for (List<Ref<InputEvent>>::Element *I = E.value.front(); I; I = I->next()) {
-				events.push_back(I->get());
+			for (const Ref<InputEvent> &event : E.value) {
+				events.push_back(event);
 			}
 
 			Dictionary action;
@@ -1488,6 +1515,9 @@ ProjectSettings::ProjectSettings() {
 	GLOBAL_DEF("application/config/auto_accept_quit", true);
 	GLOBAL_DEF("application/config/quit_on_go_back", true);
 
+	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "accessibility/general/accessibility_support", PROPERTY_HINT_ENUM, "Auto (When Screen Reader is Running),Always Active,Disabled"), 0);
+	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "accessibility/general/updates_per_second", PROPERTY_HINT_RANGE, "1,100,1"), 60);
+
 	// The default window size is tuned to:
 	// - Have a 16:9 aspect ratio,
 	// - Have both dimensions divisible by 8 to better play along with video recording,
@@ -1497,9 +1527,10 @@ ProjectSettings::ProjectSettings() {
 
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "display/window/size/mode", PROPERTY_HINT_ENUM, "Windowed,Minimized,Maximized,Fullscreen,Exclusive Fullscreen"), 0);
 
-	// Keep the enum values in sync with the `DisplayServer::SCREEN_` enum.
-	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "display/window/size/initial_position_type", PROPERTY_HINT_ENUM, "Absolute,Center of Primary Screen,Center of Other Screen,Center of Screen With Mouse Pointer,Center of Screen With Keyboard Focus"), 1);
+	// Keep the enum values in sync with the `Window::WINDOW_INITIAL_POSITION_` enum.
+	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "display/window/size/initial_position_type", PROPERTY_HINT_ENUM, "Absolute:0,Center of Primary Screen:1,Center of Other Screen:3,Center of Screen With Mouse Pointer:4,Center of Screen With Keyboard Focus:5"), 1);
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::VECTOR2I, "display/window/size/initial_position"), Vector2i());
+	// Keep the enum values in sync with the `DisplayServer::SCREEN_` enum.
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "display/window/size/initial_screen", PROPERTY_HINT_RANGE, "0,64,1,or_greater"), 0);
 
 	GLOBAL_DEF_BASIC("display/window/size/resizable", true);
@@ -1509,6 +1540,8 @@ ProjectSettings::ProjectSettings() {
 	GLOBAL_DEF("display/window/size/extend_to_title", false);
 	GLOBAL_DEF("display/window/size/no_focus", false);
 	GLOBAL_DEF("display/window/size/sharp_corners", false);
+	GLOBAL_DEF("display/window/size/minimize_disabled", false);
+	GLOBAL_DEF("display/window/size/maximize_disabled", false);
 
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "display/window/size/window_width_override", PROPERTY_HINT_RANGE, "0,7680,1,or_greater"), 0); // 8K resolution
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "display/window/size/window_height_override", PROPERTY_HINT_RANGE, "0,4320,1,or_greater"), 0); // 8K resolution
@@ -1543,8 +1576,13 @@ ProjectSettings::ProjectSettings() {
 #else
 	custom_prop_info["rendering/driver/threads/thread_model"] = PropertyInfo(Variant::INT, "rendering/driver/threads/thread_model", PROPERTY_HINT_ENUM, "Unsafe (deprecated),Safe,Separate");
 #endif
+
+#ifndef PHYSICS_2D_DISABLED
 	GLOBAL_DEF("physics/2d/run_on_separate_thread", false);
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	GLOBAL_DEF("physics/3d/run_on_separate_thread", false);
+#endif // PHYSICS_3D_DISABLED
 
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "display/window/stretch/mode", PROPERTY_HINT_ENUM, "disabled,canvas_items,viewport"), "disabled");
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "display/window/stretch/aspect", PROPERTY_HINT_ENUM, "ignore,keep,keep_width,keep_height,expand"), "keep");
@@ -1612,6 +1650,8 @@ ProjectSettings::ProjectSettings() {
 	GLOBAL_DEF_BASIC("input_devices/pointing/android/enable_long_press_as_right_click", false);
 	GLOBAL_DEF_BASIC("input_devices/pointing/android/enable_pan_and_scale_gestures", false);
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "input_devices/pointing/android/rotary_input_scroll_axis", PROPERTY_HINT_ENUM, "Horizontal,Vertical"), 1);
+	GLOBAL_DEF("input_devices/pointing/android/override_volume_buttons", false);
+	GLOBAL_DEF_BASIC("input_devices/pointing/android/disable_scroll_deadzone", false);
 
 	// These properties will not show up in the dialog. If you want to exclude whole groups, use add_hidden_prefix().
 	GLOBAL_DEF_INTERNAL("application/config/features", PackedStringArray());
@@ -1620,6 +1660,19 @@ ProjectSettings::ProjectSettings() {
 	GLOBAL_DEF_INTERNAL("internationalization/locale/translations_pot_files", PackedStringArray());
 	GLOBAL_DEF_INTERNAL("internationalization/locale/translation_add_builtin_strings_to_pot", false);
 
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
+	GLOBAL_DEF("navigation/world/map_use_async_iterations", true);
+
+	GLOBAL_DEF("navigation/avoidance/thread_model/avoidance_use_multiple_threads", true);
+	GLOBAL_DEF("navigation/avoidance/thread_model/avoidance_use_high_priority_threads", true);
+
+	GLOBAL_DEF("navigation/pathfinding/max_threads", 4);
+
+	GLOBAL_DEF("navigation/baking/use_crash_prevention_checks", true);
+	GLOBAL_DEF("navigation/baking/thread_model/baking_use_multiple_threads", true);
+	GLOBAL_DEF("navigation/baking/thread_model/baking_use_high_priority_threads", true);
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
+
 	ProjectSettings::get_singleton()->add_hidden_prefix("input/");
 }
 
diff --git a/engine/core/config/project_settings.h b/engine/core/config/project_settings.h
index 02049290..65fa72ea 100644
--- a/engine/core/config/project_settings.h
+++ b/engine/core/config/project_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_SETTINGS_H
-#define PROJECT_SETTINGS_H
+#pragma once
 
 #include "core/object/class_db.h"
 
@@ -194,6 +193,7 @@ public:
 	List<String> get_input_presets() const { return input_presets; }
 
 	Variant get_setting_with_override(const StringName &p_name) const;
+	Variant get_setting_with_override_and_custom_features(const StringName &p_name, const Vector<String> &p_features) const;
 
 	bool is_using_datapack() const;
 	bool is_project_loaded() const;
@@ -243,5 +243,3 @@ Variant _GLOBAL_DEF(const PropertyInfo &p_info, const Variant &p_default, bool p
 #define GLOBAL_DEF_RST_NOVAL_BASIC(m_var, m_value) _GLOBAL_DEF(m_var, m_value, true, true, true)
 
 #define GLOBAL_DEF_INTERNAL(m_var, m_value) _GLOBAL_DEF(m_var, m_value, false, false, false, true)
-
-#endif // PROJECT_SETTINGS_H
diff --git a/engine/core/core_bind.compat.inc b/engine/core/core_bind.compat.inc
index 22c78623..8bfa66e4 100644
--- a/engine/core/core_bind.compat.inc
+++ b/engine/core/core_bind.compat.inc
@@ -30,7 +30,7 @@
 
 #ifndef DISABLE_DEPRECATED
 
-namespace core_bind {
+namespace CoreBind {
 
 // Semaphore
 
@@ -53,10 +53,12 @@ Dictionary OS::_execute_with_pipe_bind_compat_94434(const String &p_path, const
 }
 
 void OS::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_method(D_METHOD("read_string_from_stdin", "buffer_size"), &OS::read_string_from_stdin);
+	ClassDB::bind_compatibility_method(D_METHOD("read_buffer_from_stdin", "buffer_size"), &OS::read_buffer_from_stdin);
 	ClassDB::bind_compatibility_method(D_METHOD("read_string_from_stdin"), &OS::_read_string_from_stdin_bind_compat_91201);
 	ClassDB::bind_compatibility_method(D_METHOD("execute_with_pipe", "path", "arguments"), &OS::_execute_with_pipe_bind_compat_94434);
 }
 
-} // namespace core_bind
+} // namespace CoreBind
 
 #endif // DISABLE_DEPRECATED
diff --git a/engine/core/core_bind.cpp b/engine/core/core_bind.cpp
index acd58978..d55305b2 100644
--- a/engine/core/core_bind.cpp
+++ b/engine/core/core_bind.cpp
@@ -42,7 +42,7 @@
 #include "core/os/thread_safe.h"
 #include "core/variant/typed_array.h"
 
-namespace core_bind {
+namespace CoreBind {
 
 ////// ResourceLoader //////
 
@@ -466,8 +466,8 @@ bool OS::is_restart_on_exit_set() const {
 Vector<String> OS::get_restart_on_exit_arguments() const {
 	List<String> args = ::OS::get_singleton()->get_restart_on_exit_arguments();
 	Vector<String> args_vector;
-	for (List<String>::Element *E = args.front(); E; E = E->next()) {
-		args_vector.push_back(E->get());
+	for (const String &arg : args) {
+		args_vector.push_back(arg);
 	}
 
 	return args_vector;
@@ -657,8 +657,8 @@ void OS::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_system_font_path_for_text", "font_name", "text", "locale", "script", "weight", "stretch", "italic"), &OS::get_system_font_path_for_text, DEFVAL(String()), DEFVAL(String()), DEFVAL(400), DEFVAL(100), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("get_executable_path"), &OS::get_executable_path);
 
-	ClassDB::bind_method(D_METHOD("read_string_from_stdin", "buffer_size"), &OS::read_string_from_stdin);
-	ClassDB::bind_method(D_METHOD("read_buffer_from_stdin", "buffer_size"), &OS::read_buffer_from_stdin);
+	ClassDB::bind_method(D_METHOD("read_string_from_stdin", "buffer_size"), &OS::read_string_from_stdin, DEFVAL(1024));
+	ClassDB::bind_method(D_METHOD("read_buffer_from_stdin", "buffer_size"), &OS::read_buffer_from_stdin, DEFVAL(1024));
 	ClassDB::bind_method(D_METHOD("get_stdin_type"), &OS::get_stdin_type);
 	ClassDB::bind_method(D_METHOD("get_stdout_type"), &OS::get_stdout_type);
 	ClassDB::bind_method(D_METHOD("get_stderr_type"), &OS::get_stderr_type);
@@ -806,13 +806,11 @@ Vector<Vector2> Geometry2D::get_closest_points_between_segments(const Vector2 &p
 }
 
 Vector2 Geometry2D::get_closest_point_to_segment(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b) {
-	Vector2 s[2] = { p_a, p_b };
-	return ::Geometry2D::get_closest_point_to_segment(p_point, s);
+	return ::Geometry2D::get_closest_point_to_segment(p_point, p_a, p_b);
 }
 
 Vector2 Geometry2D::get_closest_point_to_segment_uncapped(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b) {
-	Vector2 s[2] = { p_a, p_b };
-	return ::Geometry2D::get_closest_point_to_segment_uncapped(p_point, s);
+	return ::Geometry2D::get_closest_point_to_segment_uncapped(p_point, p_a, p_b);
 }
 
 bool Geometry2D::point_is_inside_triangle(const Vector2 &s, const Vector2 &a, const Vector2 &b, const Vector2 &c) const {
@@ -1069,13 +1067,11 @@ Vector<Vector3> Geometry3D::get_closest_points_between_segments(const Vector3 &p
 }
 
 Vector3 Geometry3D::get_closest_point_to_segment(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b) {
-	Vector3 s[2] = { p_a, p_b };
-	return ::Geometry3D::get_closest_point_to_segment(p_point, s);
+	return ::Geometry3D::get_closest_point_to_segment(p_point, p_a, p_b);
 }
 
 Vector3 Geometry3D::get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b) {
-	Vector3 s[2] = { p_a, p_b };
-	return ::Geometry3D::get_closest_point_to_segment_uncapped(p_point, s);
+	return ::Geometry3D::get_closest_point_to_segment_uncapped(p_point, p_a, p_b);
 }
 
 Vector3 Geometry3D::get_triangle_barycentric_coords(const Vector3 &p_point, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2) {
@@ -1241,6 +1237,9 @@ Vector<uint8_t> Marshalls::base64_to_raw(const String &p_str) {
 }
 
 String Marshalls::utf8_to_base64(const String &p_str) {
+	if (p_str.is_empty()) {
+		return String();
+	}
 	CharString cstr = p_str.utf8();
 	String ret = CryptoCore::b64_encode_str((unsigned char *)cstr.get_data(), cstr.length());
 	ERR_FAIL_COND_V(ret.is_empty(), ret);
@@ -1340,6 +1339,7 @@ void Thread::_start_func(void *ud) {
 	// When the call returns, we will reference the thread again if possible.
 	ObjectID th_instance_id = t->get_instance_id();
 	Callable target_callable = t->target_callable;
+	String id = t->get_id();
 	t = Ref<Thread>();
 
 	Callable::CallError ce;
@@ -1347,7 +1347,7 @@ void Thread::_start_func(void *ud) {
 	target_callable.callp(nullptr, 0, ret, ce);
 	// If script properly kept a reference to the thread, we should be able to re-reference it now
 	// (well, or if the call failed, since we had to break chains anyway because the outcome isn't known upfront).
-	t = Ref<Thread>(ObjectDB::get_instance(th_instance_id));
+	t = ObjectDB::get_ref<Thread>(th_instance_id);
 	if (t.is_valid()) {
 		t->ret = ret;
 		t->running.clear();
@@ -1357,7 +1357,7 @@ void Thread::_start_func(void *ud) {
 	}
 
 	if (ce.error != Callable::CallError::CALL_OK) {
-		ERR_FAIL_MSG(vformat("Could not call function '%s' to start thread %d: %s.", func_name, t->get_id(), Variant::get_callable_error_text(t->target_callable, nullptr, 0, ce)));
+		ERR_FAIL_MSG(vformat("Could not call function '%s' to start thread %s: %s.", func_name, id, Variant::get_callable_error_text(target_callable, nullptr, 0, ce)));
 	}
 }
 
@@ -1419,7 +1419,7 @@ void Thread::_bind_methods() {
 	BIND_ENUM_CONSTANT(PRIORITY_HIGH);
 }
 
-namespace special {
+namespace Special {
 
 ////// ClassDB //////
 
@@ -1438,8 +1438,8 @@ PackedStringArray ClassDB::get_class_list() const {
 }
 
 PackedStringArray ClassDB::get_inheriters_from_class(const StringName &p_class) const {
-	List<StringName> classes;
-	::ClassDB::get_inheriters_from_class(p_class, &classes);
+	LocalVector<StringName> classes;
+	::ClassDB::get_inheriters_from_class(p_class, classes);
 
 	PackedStringArray ret;
 	ret.resize(classes.size());
@@ -1746,7 +1746,7 @@ void ClassDB::_bind_methods() {
 	BIND_ENUM_CONSTANT(API_NONE);
 }
 
-} // namespace special
+} // namespace Special
 
 ////// Engine //////
 
@@ -1876,8 +1876,8 @@ Vector<String> Engine::get_singleton_list() const {
 	List<::Engine::Singleton> singletons;
 	::Engine::get_singleton()->get_singletons(&singletons);
 	Vector<String> ret;
-	for (List<::Engine::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
-		ret.push_back(E->get().name);
+	for (const ::Engine::Singleton &E : singletons) {
+		ret.push_back(E.name);
 	}
 	return ret;
 }
@@ -2190,4 +2190,4 @@ void EngineDebugger::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("clear_breakpoints"), &EngineDebugger::clear_breakpoints);
 }
 
-} // namespace core_bind
+} // namespace CoreBind
diff --git a/engine/core/core_bind.h b/engine/core/core_bind.h
index b96dc56b..ec74c53d 100644
--- a/engine/core/core_bind.h
+++ b/engine/core/core_bind.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CORE_BIND_H
-#define CORE_BIND_H
+#pragma once
 
 #include "core/debugger/engine_profiler.h"
 #include "core/io/resource_loader.h"
@@ -42,7 +41,7 @@ class MainLoop;
 template <typename T>
 class TypedArray;
 
-namespace core_bind {
+namespace CoreBind {
 
 class ResourceLoader : public Object {
 	GDCLASS(ResourceLoader, Object);
@@ -458,7 +457,7 @@ public:
 	static void set_thread_safety_checks_enabled(bool p_enabled);
 };
 
-namespace special {
+namespace Special {
 
 class ClassDB : public Object {
 	GDCLASS(ClassDB, Object);
@@ -524,7 +523,7 @@ public:
 	~ClassDB() {}
 };
 
-} // namespace special
+} // namespace Special
 
 class Engine : public Object {
 	GDCLASS(Engine, Object);
@@ -652,23 +651,21 @@ public:
 	~EngineDebugger();
 };
 
-} // namespace core_bind
+} // namespace CoreBind
 
-VARIANT_ENUM_CAST(core_bind::ResourceLoader::ThreadLoadStatus);
-VARIANT_ENUM_CAST(core_bind::ResourceLoader::CacheMode);
+VARIANT_ENUM_CAST(CoreBind::ResourceLoader::ThreadLoadStatus);
+VARIANT_ENUM_CAST(CoreBind::ResourceLoader::CacheMode);
 
-VARIANT_BITFIELD_CAST(core_bind::ResourceSaver::SaverFlags);
+VARIANT_BITFIELD_CAST(CoreBind::ResourceSaver::SaverFlags);
 
-VARIANT_ENUM_CAST(core_bind::OS::RenderingDriver);
-VARIANT_ENUM_CAST(core_bind::OS::SystemDir);
-VARIANT_ENUM_CAST(core_bind::OS::StdHandleType);
+VARIANT_ENUM_CAST(CoreBind::OS::RenderingDriver);
+VARIANT_ENUM_CAST(CoreBind::OS::SystemDir);
+VARIANT_ENUM_CAST(CoreBind::OS::StdHandleType);
 
-VARIANT_ENUM_CAST(core_bind::Geometry2D::PolyBooleanOperation);
-VARIANT_ENUM_CAST(core_bind::Geometry2D::PolyJoinType);
-VARIANT_ENUM_CAST(core_bind::Geometry2D::PolyEndType);
+VARIANT_ENUM_CAST(CoreBind::Geometry2D::PolyBooleanOperation);
+VARIANT_ENUM_CAST(CoreBind::Geometry2D::PolyJoinType);
+VARIANT_ENUM_CAST(CoreBind::Geometry2D::PolyEndType);
 
-VARIANT_ENUM_CAST(core_bind::Thread::Priority);
+VARIANT_ENUM_CAST(CoreBind::Thread::Priority);
 
-VARIANT_ENUM_CAST(core_bind::special::ClassDB::APIType);
-
-#endif // CORE_BIND_H
+VARIANT_ENUM_CAST(CoreBind::Special::ClassDB::APIType);
diff --git a/engine/core/core_builders.py b/engine/core/core_builders.py
index d7c0603c..5eaac237 100644
--- a/engine/core/core_builders.py
+++ b/engine/core/core_builders.py
@@ -1,171 +1,104 @@
 """Functions used to generate source files during build time"""
 
-import zlib
+from collections import OrderedDict
+from io import TextIOWrapper
 
-
-def escape_string(s):
-    def charcode_to_c_escapes(c):
-        rev_result = []
-        while c >= 256:
-            c, low = (c // 256, c % 256)
-            rev_result.append("\\%03o" % low)
-        rev_result.append("\\%03o" % c)
-        return "".join(reversed(rev_result))
-
-    result = ""
-    if isinstance(s, str):
-        s = s.encode("utf-8")
-    for c in s:
-        if not (32 <= c < 127) or c in (ord("\\"), ord('"')):
-            result += charcode_to_c_escapes(c)
-        else:
-            result += chr(c)
-    return result
+import methods
 
 
 def make_certs_header(target, source, env):
-    src = str(source[0])
-    dst = str(target[0])
-    with open(src, "rb") as f, open(dst, "w", encoding="utf-8", newline="\n") as g:
-        buf = f.read()
-        decomp_size = len(buf)
-
-        # Use maximum zlib compression level to further reduce file size
-        # (at the cost of initial build times).
-        buf = zlib.compress(buf, zlib.Z_BEST_COMPRESSION)
-
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef CERTS_COMPRESSED_GEN_H\n")
-        g.write("#define CERTS_COMPRESSED_GEN_H\n")
+    buffer = methods.get_buffer(str(source[0]))
+    decomp_size = len(buffer)
+    buffer = methods.compress_buffer(buffer)
 
+    with methods.generated_wrapper(str(target[0])) as file:
         # System certs path. Editor will use them if defined. (for package maintainers)
-        path = env["system_certs_path"]
-        g.write('#define _SYSTEM_CERTS_PATH "%s"\n' % str(path))
+        file.write('#define _SYSTEM_CERTS_PATH "{}"\n'.format(env["system_certs_path"]))
         if env["builtin_certs"]:
             # Defined here and not in env so changing it does not trigger a full rebuild.
-            g.write("#define BUILTIN_CERTS_ENABLED\n")
-            g.write("static const int _certs_compressed_size = " + str(len(buf)) + ";\n")
-            g.write("static const int _certs_uncompressed_size = " + str(decomp_size) + ";\n")
-            g.write("static const unsigned char _certs_compressed[] = {\n")
-            for i in range(len(buf)):
-                g.write("\t" + str(buf[i]) + ",\n")
-            g.write("};\n")
-        g.write("#endif // CERTS_COMPRESSED_GEN_H")
+            file.write(f"""\
+#define BUILTIN_CERTS_ENABLED
+
+inline constexpr int _certs_compressed_size = {len(buffer)};
+inline constexpr int _certs_uncompressed_size = {decomp_size};
+inline constexpr unsigned char _certs_compressed[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
+""")
 
 
 def make_authors_header(target, source, env):
-    sections = [
-        "Project Founders",
-        "Lead Developer",
-        "Project Manager",
-        "Developers",
-    ]
-    sections_id = [
-        "AUTHORS_FOUNDERS",
-        "AUTHORS_LEAD_DEVELOPERS",
-        "AUTHORS_PROJECT_MANAGERS",
-        "AUTHORS_DEVELOPERS",
-    ]
+    SECTIONS = {
+        "Project Founders": "AUTHORS_FOUNDERS",
+        "Lead Developer": "AUTHORS_LEAD_DEVELOPERS",
+        "Project Manager": "AUTHORS_PROJECT_MANAGERS",
+        "Developers": "AUTHORS_DEVELOPERS",
+    }
+    buffer = methods.get_buffer(str(source[0]))
+    reading = False
 
-    src = str(source[0])
-    dst = str(target[0])
-    with open(src, "r", encoding="utf-8") as f, open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef AUTHORS_GEN_H\n")
-        g.write("#define AUTHORS_GEN_H\n")
-
-        reading = False
+    with methods.generated_wrapper(str(target[0])) as file:
 
         def close_section():
-            g.write("\t0\n")
-            g.write("};\n")
+            file.write("\tnullptr,\n};\n\n")
 
-        for line in f:
-            if reading:
-                if line.startswith("    "):
-                    g.write('\t"' + escape_string(line.strip()) + '",\n')
-                    continue
-            if line.startswith("## "):
+        for line in buffer.decode().splitlines():
+            if line.startswith("    ") and reading:
+                file.write(f'\t"{methods.to_escaped_cstring(line).strip()}",\n')
+            elif line.startswith("## "):
                 if reading:
                     close_section()
                     reading = False
-                for section, section_id in zip(sections, sections_id):
-                    if line.strip().endswith(section):
-                        current_section = escape_string(section_id)
-                        reading = True
-                        g.write("const char *const " + current_section + "[] = {\n")
-                        break
+                section = SECTIONS[line[3:].strip()]
+                if section:
+                    file.write(f"inline constexpr const char *{section}[] = {{\n")
+                    reading = True
 
         if reading:
             close_section()
 
-        g.write("#endif // AUTHORS_GEN_H\n")
-
 
 def make_donors_header(target, source, env):
-    sections = [
-        "Patrons",
-        "Platinum sponsors",
-        "Gold sponsors",
-        "Silver sponsors",
-        "Diamond members",
-        "Titanium members",
-        "Platinum members",
-        "Gold members",
-    ]
-    sections_id = [
-        "DONORS_PATRONS",
-        "DONORS_SPONSORS_PLATINUM",
-        "DONORS_SPONSORS_GOLD",
-        "DONORS_SPONSORS_SILVER",
-        "DONORS_MEMBERS_DIAMOND",
-        "DONORS_MEMBERS_TITANIUM",
-        "DONORS_MEMBERS_PLATINUM",
-        "DONORS_MEMBERS_GOLD",
-    ]
+    SECTIONS = {
+        "Patrons": "DONORS_PATRONS",
+        "Platinum sponsors": "DONORS_SPONSORS_PLATINUM",
+        "Gold sponsors": "DONORS_SPONSORS_GOLD",
+        "Silver sponsors": "DONORS_SPONSORS_SILVER",
+        "Diamond members": "DONORS_MEMBERS_DIAMOND",
+        "Titanium members": "DONORS_MEMBERS_TITANIUM",
+        "Platinum members": "DONORS_MEMBERS_PLATINUM",
+        "Gold members": "DONORS_MEMBERS_GOLD",
+    }
+    buffer = methods.get_buffer(str(source[0]))
+    reading = False
 
-    src = str(source[0])
-    dst = str(target[0])
-    with open(src, "r", encoding="utf-8") as f, open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef DONORS_GEN_H\n")
-        g.write("#define DONORS_GEN_H\n")
-
-        reading = False
+    with methods.generated_wrapper(str(target[0])) as file:
 
         def close_section():
-            g.write("\t0\n")
-            g.write("};\n")
+            file.write("\tnullptr,\n};\n\n")
 
-        for line in f:
-            if reading >= 0:
-                if line.startswith("    "):
-                    g.write('\t"' + escape_string(line.strip()) + '",\n')
-                    continue
-            if line.startswith("## "):
+        for line in buffer.decode().splitlines():
+            if line.startswith("    ") and reading:
+                file.write(f'\t"{methods.to_escaped_cstring(line).strip()}",\n')
+            elif line.startswith("## "):
                 if reading:
                     close_section()
                     reading = False
-                for section, section_id in zip(sections, sections_id):
-                    if line.strip().endswith(section):
-                        current_section = escape_string(section_id)
-                        reading = True
-                        g.write("const char *const " + current_section + "[] = {\n")
-                        break
+                section = SECTIONS.get(line[3:].strip())
+                if section:
+                    file.write(f"inline constexpr const char *{section}[] = {{\n")
+                    reading = True
 
         if reading:
             close_section()
 
-        g.write("#endif // DONORS_GEN_H\n")
-
 
 def make_license_header(target, source, env):
     src_copyright = str(source[0])
     src_license = str(source[1])
-    dst = str(target[0])
 
     class LicenseReader:
-        def __init__(self, license_file):
+        def __init__(self, license_file: TextIOWrapper):
             self._license_file = license_file
             self.line_num = 0
             self.current = self.next_line()
@@ -188,9 +121,7 @@ def make_license_header(target, source, env):
                 lines.append(self.current.strip())
             return (tag, lines)
 
-    from collections import OrderedDict
-
-    projects: dict = OrderedDict()
+    projects = OrderedDict()
     license_list = []
 
     with open(src_copyright, "r", encoding="utf-8") as copyright_file:
@@ -212,7 +143,7 @@ def make_license_header(target, source, env):
                 part = {}
                 reader.next_line()
 
-    data_list: list = []
+    data_list = []
     for project in iter(projects.values()):
         for part in project:
             part["file_index"] = len(data_list)
@@ -220,96 +151,76 @@ def make_license_header(target, source, env):
             part["copyright_index"] = len(data_list)
             data_list += part["Copyright"]
 
-    with open(dst, "w", encoding="utf-8", newline="\n") as f:
-        f.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        f.write("#ifndef LICENSE_GEN_H\n")
-        f.write("#define LICENSE_GEN_H\n")
-        f.write("const char *const GODOT_LICENSE_TEXT =")
+    with open(src_license, "r", encoding="utf-8") as file:
+        license_text = file.read()
 
-        with open(src_license, "r", encoding="utf-8") as license_file:
-            for line in license_file:
-                escaped_string = escape_string(line.strip())
-                f.write('\n\t\t"' + escaped_string + '\\n"')
-        f.write(";\n\n")
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write(f"""\
+inline constexpr const char *GODOT_LICENSE_TEXT = {{
+{methods.to_raw_cstring(license_text)}
+}};
 
-        f.write(
-            "struct ComponentCopyrightPart {\n"
-            "\tconst char *license;\n"
-            "\tconst char *const *files;\n"
-            "\tconst char *const *copyright_statements;\n"
-            "\tint file_count;\n"
-            "\tint copyright_count;\n"
-            "};\n\n"
-        )
+struct ComponentCopyrightPart {{
+	const char *license;
+	const char *const *files;
+	const char *const *copyright_statements;
+	int file_count;
+	int copyright_count;
+}};
 
-        f.write(
-            "struct ComponentCopyright {\n"
-            "\tconst char *name;\n"
-            "\tconst ComponentCopyrightPart *parts;\n"
-            "\tint part_count;\n"
-            "};\n\n"
-        )
+struct ComponentCopyright {{
+	const char *name;
+	const ComponentCopyrightPart *parts;
+	int part_count;
+}};
 
-        f.write("const char *const COPYRIGHT_INFO_DATA[] = {\n")
+""")
+
+        file.write("inline constexpr const char *COPYRIGHT_INFO_DATA[] = {\n")
         for line in data_list:
-            f.write('\t"' + escape_string(line) + '",\n')
-        f.write("};\n\n")
+            file.write(f'\t"{methods.to_escaped_cstring(line)}",\n')
+        file.write("};\n\n")
 
-        f.write("const ComponentCopyrightPart COPYRIGHT_PROJECT_PARTS[] = {\n")
+        file.write("inline constexpr ComponentCopyrightPart COPYRIGHT_PROJECT_PARTS[] = {\n")
         part_index = 0
         part_indexes = {}
         for project_name, project in iter(projects.items()):
             part_indexes[project_name] = part_index
             for part in project:
-                f.write(
-                    '\t{ "'
-                    + escape_string(part["License"][0])
-                    + '", '
-                    + "&COPYRIGHT_INFO_DATA["
-                    + str(part["file_index"])
-                    + "], "
-                    + "&COPYRIGHT_INFO_DATA["
-                    + str(part["copyright_index"])
-                    + "], "
-                    + str(len(part["Files"]))
-                    + ", "
-                    + str(len(part["Copyright"]))
-                    + " },\n"
+                file.write(
+                    f'\t{{ "{methods.to_escaped_cstring(part["License"][0])}", '
+                    + f"&COPYRIGHT_INFO_DATA[{part['file_index']}], "
+                    + f"&COPYRIGHT_INFO_DATA[{part['copyright_index']}], "
+                    + f"{len(part['Files'])}, {len(part['Copyright'])} }},\n"
                 )
                 part_index += 1
-        f.write("};\n\n")
+        file.write("};\n\n")
 
-        f.write("const int COPYRIGHT_INFO_COUNT = " + str(len(projects)) + ";\n")
+        file.write(f"inline constexpr int COPYRIGHT_INFO_COUNT = {len(projects)};\n")
 
-        f.write("const ComponentCopyright COPYRIGHT_INFO[] = {\n")
+        file.write("inline constexpr ComponentCopyright COPYRIGHT_INFO[] = {\n")
         for project_name, project in iter(projects.items()):
-            f.write(
-                '\t{ "'
-                + escape_string(project_name)
-                + '", '
-                + "&COPYRIGHT_PROJECT_PARTS["
-                + str(part_indexes[project_name])
-                + "], "
-                + str(len(project))
-                + " },\n"
+            file.write(
+                f'\t{{ "{methods.to_escaped_cstring(project_name)}", '
+                + f"&COPYRIGHT_PROJECT_PARTS[{part_indexes[project_name]}], "
+                + f"{len(project)} }},\n"
             )
-        f.write("};\n\n")
+        file.write("};\n\n")
 
-        f.write("const int LICENSE_COUNT = " + str(len(license_list)) + ";\n")
+        file.write(f"inline constexpr int LICENSE_COUNT = {len(license_list)};\n")
 
-        f.write("const char *const LICENSE_NAMES[] = {\n")
+        file.write("inline constexpr const char *LICENSE_NAMES[] = {\n")
         for license in license_list:
-            f.write('\t"' + escape_string(license[0]) + '",\n')
-        f.write("};\n\n")
+            file.write(f'\t"{methods.to_escaped_cstring(license[0])}",\n')
+        file.write("};\n\n")
 
-        f.write("const char *const LICENSE_BODIES[] = {\n\n")
+        file.write("inline constexpr const char *LICENSE_BODIES[] = {\n\n")
         for license in license_list:
+            to_raw = []
             for line in license[1:]:
                 if line == ".":
-                    f.write('\t"\\n"\n')
+                    to_raw += [""]
                 else:
-                    f.write('\t"' + escape_string(line) + '\\n"\n')
-            f.write('\t"",\n\n')
-        f.write("};\n\n")
-
-        f.write("#endif // LICENSE_GEN_H\n")
+                    to_raw += [line]
+            file.write(f"{methods.to_raw_cstring(to_raw)},\n\n")
+        file.write("};\n\n")
diff --git a/engine/core/core_constants.h b/engine/core/core_constants.h
index 8ab4a78a..c432fdca 100644
--- a/engine/core/core_constants.h
+++ b/engine/core/core_constants.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CORE_CONSTANTS_H
-#define CORE_CONSTANTS_H
+#pragma once
 
 #include "core/string/string_name.h"
 #include "core/templates/hash_map.h"
@@ -47,5 +46,3 @@ public:
 	static bool is_global_enum(const StringName &p_enum);
 	static void get_enum_values(const StringName &p_enum, HashMap<StringName, int64_t> *p_values);
 };
-
-#endif // CORE_CONSTANTS_H
diff --git a/engine/core/core_globals.h b/engine/core/core_globals.h
index ebb1f41a..63a6a5b1 100644
--- a/engine/core/core_globals.h
+++ b/engine/core/core_globals.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CORE_GLOBALS_H
-#define CORE_GLOBALS_H
+#pragma once
 
 // Home for state needed from global functions
 // that cannot be stored in Engine or OS due to e.g. circular includes
@@ -40,5 +39,3 @@ public:
 	static bool print_line_enabled;
 	static bool print_error_enabled;
 };
-
-#endif // CORE_GLOBALS_H
diff --git a/engine/core/core_string_names.h b/engine/core/core_string_names.h
index be3bc38e..33203c5b 100644
--- a/engine/core/core_string_names.h
+++ b/engine/core/core_string_names.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CORE_STRING_NAMES_H
-#define CORE_STRING_NAMES_H
+#pragma once
 
 #include "core/string/string_name.h"
 
@@ -87,5 +86,3 @@ public:
 };
 
 #define CoreStringName(m_name) CoreStringNames::get_singleton()->m_name
-
-#endif // CORE_STRING_NAMES_H
diff --git a/engine/core/crypto/SCsub b/engine/core/crypto/SCsub
index 3cea6bfb..d33d119f 100644
--- a/engine/core/crypto/SCsub
+++ b/engine/core/crypto/SCsub
@@ -13,7 +13,7 @@ if is_builtin or not has_module:
     # Use our headers for builtin or if the module is not going to be compiled.
     # We decided not to depend on system mbedtls just for these few files that can
     # be easily extracted.
-    env_crypto.Prepend(CPPPATH=["#thirdparty/mbedtls/include"])
+    env_crypto.Prepend(CPPEXTPATH=["#thirdparty/mbedtls/include"])
 
 # MbedTLS core functions (for CryptoCore).
 # If the mbedtls module is compiled we don't need to add the .c files with our
diff --git a/engine/core/crypto/aes_context.h b/engine/core/crypto/aes_context.h
index ab0792ac..2ae62c84 100644
--- a/engine/core/crypto/aes_context.h
+++ b/engine/core/crypto/aes_context.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AES_CONTEXT_H
-#define AES_CONTEXT_H
+#pragma once
 
 #include "core/crypto/crypto_core.h"
 #include "core/object/ref_counted.h"
@@ -64,5 +63,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AESContext::Mode);
-
-#endif // AES_CONTEXT_H
diff --git a/engine/core/crypto/crypto.h b/engine/core/crypto/crypto.h
index dc4441c9..9c752e77 100644
--- a/engine/core/crypto/crypto.h
+++ b/engine/core/crypto/crypto.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CRYPTO_H
-#define CRYPTO_H
+#pragma once
 
 #include "core/crypto/hashing_context.h"
 #include "core/io/resource.h"
@@ -167,5 +166,3 @@ public:
 	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
 	virtual bool recognize(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // CRYPTO_H
diff --git a/engine/core/crypto/crypto_core.cpp b/engine/core/crypto/crypto_core.cpp
index 13852d51..9d2c346e 100644
--- a/engine/core/crypto/crypto_core.cpp
+++ b/engine/core/crypto/crypto_core.cpp
@@ -214,8 +214,8 @@ Error CryptoCore::AESContext::decrypt_cfb(size_t p_length, uint8_t p_iv[16], con
 }
 
 // CryptoCore
-String CryptoCore::b64_encode_str(const uint8_t *p_src, int p_src_len) {
-	int b64len = p_src_len / 3 * 4 + 4 + 1;
+String CryptoCore::b64_encode_str(const uint8_t *p_src, size_t p_src_len) {
+	size_t b64len = p_src_len / 3 * 4 + 4 + 1;
 	Vector<uint8_t> b64buff;
 	b64buff.resize(b64len);
 	uint8_t *w64 = b64buff.ptrw();
@@ -225,27 +225,27 @@ String CryptoCore::b64_encode_str(const uint8_t *p_src, int p_src_len) {
 	return ret ? String() : (const char *)&w64[0];
 }
 
-Error CryptoCore::b64_encode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len) {
+Error CryptoCore::b64_encode(uint8_t *r_dst, size_t p_dst_len, size_t *r_len, const uint8_t *p_src, size_t p_src_len) {
 	int ret = mbedtls_base64_encode(r_dst, p_dst_len, r_len, p_src, p_src_len);
 	return ret ? FAILED : OK;
 }
 
-Error CryptoCore::b64_decode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len) {
+Error CryptoCore::b64_decode(uint8_t *r_dst, size_t p_dst_len, size_t *r_len, const uint8_t *p_src, size_t p_src_len) {
 	int ret = mbedtls_base64_decode(r_dst, p_dst_len, r_len, p_src, p_src_len);
 	return ret ? FAILED : OK;
 }
 
-Error CryptoCore::md5(const uint8_t *p_src, int p_src_len, unsigned char r_hash[16]) {
+Error CryptoCore::md5(const uint8_t *p_src, size_t p_src_len, unsigned char r_hash[16]) {
 	int ret = mbedtls_md5_ret(p_src, p_src_len, r_hash);
 	return ret ? FAILED : OK;
 }
 
-Error CryptoCore::sha1(const uint8_t *p_src, int p_src_len, unsigned char r_hash[20]) {
+Error CryptoCore::sha1(const uint8_t *p_src, size_t p_src_len, unsigned char r_hash[20]) {
 	int ret = mbedtls_sha1_ret(p_src, p_src_len, r_hash);
 	return ret ? FAILED : OK;
 }
 
-Error CryptoCore::sha256(const uint8_t *p_src, int p_src_len, unsigned char r_hash[32]) {
+Error CryptoCore::sha256(const uint8_t *p_src, size_t p_src_len, unsigned char r_hash[32]) {
 	int ret = mbedtls_sha256_ret(p_src, p_src_len, r_hash, 0);
 	return ret ? FAILED : OK;
 }
diff --git a/engine/core/crypto/crypto_core.h b/engine/core/crypto/crypto_core.h
index 4a9ffda8..8ef50fbc 100644
--- a/engine/core/crypto/crypto_core.h
+++ b/engine/core/crypto/crypto_core.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CRYPTO_CORE_H
-#define CRYPTO_CORE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -107,13 +106,11 @@ public:
 		Error decrypt_cfb(size_t p_length, uint8_t p_iv[16], const uint8_t *p_src, uint8_t *r_dst);
 	};
 
-	static String b64_encode_str(const uint8_t *p_src, int p_src_len);
-	static Error b64_encode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len);
-	static Error b64_decode(uint8_t *r_dst, int p_dst_len, size_t *r_len, const uint8_t *p_src, int p_src_len);
+	static String b64_encode_str(const uint8_t *p_src, size_t p_src_len);
+	static Error b64_encode(uint8_t *r_dst, size_t p_dst_len, size_t *r_len, const uint8_t *p_src, size_t p_src_len);
+	static Error b64_decode(uint8_t *r_dst, size_t p_dst_len, size_t *r_len, const uint8_t *p_src, size_t p_src_len);
 
-	static Error md5(const uint8_t *p_src, int p_src_len, unsigned char r_hash[16]);
-	static Error sha1(const uint8_t *p_src, int p_src_len, unsigned char r_hash[20]);
-	static Error sha256(const uint8_t *p_src, int p_src_len, unsigned char r_hash[32]);
+	static Error md5(const uint8_t *p_src, size_t p_src_len, unsigned char r_hash[16]);
+	static Error sha1(const uint8_t *p_src, size_t p_src_len, unsigned char r_hash[20]);
+	static Error sha256(const uint8_t *p_src, size_t p_src_len, unsigned char r_hash[32]);
 };
-
-#endif // CRYPTO_CORE_H
diff --git a/engine/core/crypto/hashing_context.h b/engine/core/crypto/hashing_context.h
index 436afd83..6c9de6a8 100644
--- a/engine/core/crypto/hashing_context.h
+++ b/engine/core/crypto/hashing_context.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HASHING_CONTEXT_H
-#define HASHING_CONTEXT_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -62,5 +61,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(HashingContext::HashType);
-
-#endif // HASHING_CONTEXT_H
diff --git a/engine/core/debugger/debugger_marshalls.cpp b/engine/core/debugger/debugger_marshalls.cpp
index cc36ca48..55b61f1c 100644
--- a/engine/core/debugger/debugger_marshalls.cpp
+++ b/engine/core/debugger/debugger_marshalls.cpp
@@ -36,8 +36,7 @@
 #define CHECK_END(arr, expected, what) ERR_FAIL_COND_V_MSG((uint32_t)arr.size() > (uint32_t)expected, false, String("Malformed ") + what + " message from script debugger, message too long. Expected size: " + itos(expected) + ", actual size: " + itos(arr.size()))
 
 Array DebuggerMarshalls::ScriptStackDump::serialize() {
-	Array arr;
-	arr.push_back(frames.size() * 3);
+	Array arr = { frames.size() * 3 };
 	for (const ScriptLanguage::StackInfo &frame : frames) {
 		arr.push_back(frame.file);
 		arr.push_back(frame.line);
@@ -64,10 +63,7 @@ bool DebuggerMarshalls::ScriptStackDump::deserialize(const Array &p_arr) {
 }
 
 Array DebuggerMarshalls::ScriptStackVariable::serialize(int max_size) {
-	Array arr;
-	arr.push_back(name);
-	arr.push_back(type);
-	arr.push_back(value.get_type());
+	Array arr = { name, type, value.get_type() };
 
 	Variant var = value;
 	if (value.get_type() == Variant::OBJECT && value.get_validated_object() == nullptr) {
@@ -99,20 +95,20 @@ bool DebuggerMarshalls::ScriptStackVariable::deserialize(const Array &p_arr) {
 }
 
 Array DebuggerMarshalls::OutputError::serialize() {
-	Array arr;
-	arr.push_back(hr);
-	arr.push_back(min);
-	arr.push_back(sec);
-	arr.push_back(msec);
-	arr.push_back(source_file);
-	arr.push_back(source_func);
-	arr.push_back(source_line);
-	arr.push_back(error);
-	arr.push_back(error_descr);
-	arr.push_back(warning);
 	unsigned int size = callstack.size();
+	Array arr = {
+		hr,
+		min,
+		sec, msec,
+		source_file,
+		source_func,
+		source_line,
+		error,
+		error_descr,
+		warning,
+		size * 3
+	};
 	const ScriptLanguage::StackInfo *r = callstack.ptr();
-	arr.push_back(size * 3);
 	for (int i = 0; i < callstack.size(); i++) {
 		arr.push_back(r[i].file);
 		arr.push_back(r[i].func);
diff --git a/engine/core/debugger/debugger_marshalls.h b/engine/core/debugger/debugger_marshalls.h
index 1072ddae..c661ef39 100644
--- a/engine/core/debugger/debugger_marshalls.h
+++ b/engine/core/debugger/debugger_marshalls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEBUGGER_MARSHALLS_H
-#define DEBUGGER_MARSHALLS_H
+#pragma once
 
 #include "core/input/shortcut.h"
 #include "core/object/script_language.h"
@@ -73,5 +72,3 @@ struct DebuggerMarshalls {
 	static Array serialize_key_shortcut(const Ref<Shortcut> &p_shortcut);
 	static Ref<Shortcut> deserialize_key_shortcut(const Array &p_keys);
 };
-
-#endif // DEBUGGER_MARSHALLS_H
diff --git a/engine/core/debugger/engine_debugger.cpp b/engine/core/debugger/engine_debugger.cpp
index a9f87ad8..8d0f5261 100644
--- a/engine/core/debugger/engine_debugger.cpp
+++ b/engine/core/debugger/engine_debugger.cpp
@@ -127,7 +127,7 @@ void EngineDebugger::iteration(uint64_t p_frame_ticks, uint64_t p_process_ticks,
 	singleton->poll_events(true);
 }
 
-void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, const Vector<String> &p_breakpoints, void (*p_allow_focus_steal_fn)()) {
+void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, bool p_ignore_error_breaks, const Vector<String> &p_breakpoints, void (*p_allow_focus_steal_fn)()) {
 	register_uri_handler("tcp://", RemoteDebuggerPeerTCP::create); // TCP is the default protocol. Platforms/modules can add more.
 	if (p_uri.is_empty()) {
 		return;
@@ -149,8 +149,7 @@ void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, co
 		singleton = memnew(RemoteDebugger(Ref<RemoteDebuggerPeer>(peer)));
 		script_debugger = memnew(ScriptDebugger);
 		// Notify editor of our pid (to allow focus stealing).
-		Array msg;
-		msg.push_back(OS::get_singleton()->get_process_id());
+		Array msg = { OS::get_singleton()->get_process_id() };
 		singleton->send_message("set_pid", msg);
 	}
 	if (!singleton) {
@@ -160,13 +159,14 @@ void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, co
 	// There is a debugger, parse breakpoints.
 	ScriptDebugger *singleton_script_debugger = singleton->get_script_debugger();
 	singleton_script_debugger->set_skip_breakpoints(p_skip_breakpoints);
+	singleton_script_debugger->set_ignore_error_breaks(p_ignore_error_breaks);
 
 	for (int i = 0; i < p_breakpoints.size(); i++) {
 		const String &bp = p_breakpoints[i];
 		int sp = bp.rfind_char(':');
 		ERR_CONTINUE_MSG(sp == -1, vformat("Invalid breakpoint: '%s', expected file:line format.", bp));
 
-		singleton_script_debugger->insert_breakpoint(bp.substr(sp + 1, bp.length()).to_int(), bp.substr(0, sp));
+		singleton_script_debugger->insert_breakpoint(bp.substr(sp + 1).to_int(), bp.substr(0, sp));
 	}
 
 	allow_focus_steal_fn = p_allow_focus_steal_fn;
diff --git a/engine/core/debugger/engine_debugger.h b/engine/core/debugger/engine_debugger.h
index 1822915f..cfe1b6e3 100644
--- a/engine/core/debugger/engine_debugger.h
+++ b/engine/core/debugger/engine_debugger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENGINE_DEBUGGER_H
-#define ENGINE_DEBUGGER_H
+#pragma once
 
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
@@ -107,7 +106,7 @@ public:
 
 	_FORCE_INLINE_ static ScriptDebugger *get_script_debugger() { return script_debugger; }
 
-	static void initialize(const String &p_uri, bool p_skip_breakpoints, const Vector<String> &p_breakpoints, void (*p_allow_focus_steal_fn)());
+	static void initialize(const String &p_uri, bool p_skip_breakpoints, bool p_ignore_error_breaks, const Vector<String> &p_breakpoints, void (*p_allow_focus_steal_fn)());
 	static void deinitialize();
 	static void register_profiler(const StringName &p_name, const Profiler &p_profiler);
 	static void unregister_profiler(const StringName &p_name);
@@ -140,5 +139,3 @@ public:
 
 	virtual ~EngineDebugger();
 };
-
-#endif // ENGINE_DEBUGGER_H
diff --git a/engine/core/debugger/engine_profiler.h b/engine/core/debugger/engine_profiler.h
index d3d0021e..f74d20b8 100644
--- a/engine/core/debugger/engine_profiler.h
+++ b/engine/core/debugger/engine_profiler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENGINE_PROFILER_H
-#define ENGINE_PROFILER_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
@@ -59,5 +58,3 @@ public:
 	EngineProfiler() {}
 	virtual ~EngineProfiler();
 };
-
-#endif // ENGINE_PROFILER_H
diff --git a/engine/core/debugger/local_debugger.cpp b/engine/core/debugger/local_debugger.cpp
index a5d807f6..47a6d15d 100644
--- a/engine/core/debugger/local_debugger.cpp
+++ b/engine/core/debugger/local_debugger.cpp
@@ -242,7 +242,7 @@ void LocalDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
 		} else if (line.begins_with("br") || line.begins_with("break")) {
 			if (line.get_slice_count(" ") <= 1) {
 				const HashMap<int, HashSet<StringName>> &breakpoints = script_debugger->get_breakpoints();
-				if (breakpoints.size() == 0) {
+				if (breakpoints.is_empty()) {
 					print_line("No Breakpoints.");
 					continue;
 				}
diff --git a/engine/core/debugger/local_debugger.h b/engine/core/debugger/local_debugger.h
index 13c975c4..5c603e5f 100644
--- a/engine/core/debugger/local_debugger.h
+++ b/engine/core/debugger/local_debugger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LOCAL_DEBUGGER_H
-#define LOCAL_DEBUGGER_H
+#pragma once
 
 #include "core/debugger/engine_debugger.h"
 #include "core/object/script_language.h"
@@ -55,5 +54,3 @@ public:
 	LocalDebugger();
 	~LocalDebugger();
 };
-
-#endif // LOCAL_DEBUGGER_H
diff --git a/engine/core/debugger/remote_debugger.cpp b/engine/core/debugger/remote_debugger.cpp
index f8e42e6d..d14ea59a 100644
--- a/engine/core/debugger/remote_debugger.cpp
+++ b/engine/core/debugger/remote_debugger.cpp
@@ -95,10 +95,7 @@ public:
 };
 
 Error RemoteDebugger::_put_msg(const String &p_message, const Array &p_data) {
-	Array msg;
-	msg.push_back(p_message);
-	msg.push_back(Thread::get_caller_id());
-	msg.push_back(p_data);
+	Array msg = { p_message, Thread::get_caller_id(), p_data };
 	Error err = peer->put_message(msg);
 	if (err != OK) {
 		n_messages_dropped++;
@@ -235,9 +232,7 @@ void RemoteDebugger::flush_output() {
 			types.push_back(MESSAGE_TYPE_LOG);
 		}
 
-		Array arr;
-		arr.push_back(strings);
-		arr.push_back(types);
+		Array arr = { strings, types };
 		_put_msg("output", arr);
 		output_strings.clear();
 	}
@@ -413,17 +408,25 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
 	}
 
 	ScriptLanguage *script_lang = script_debugger->get_break_language();
-	const String error_str = script_lang ? script_lang->debug_get_error() : "";
-	Array msg;
-	msg.push_back(p_can_continue);
-	msg.push_back(error_str);
 	ERR_FAIL_NULL(script_lang);
-	msg.push_back(script_lang->debug_get_stack_level_count() > 0);
-	msg.push_back(Thread::get_caller_id() == Thread::get_main_id() ? String(RTR("Main Thread")) : itos(Thread::get_caller_id()));
-	if (allow_focus_steal_fn) {
-		allow_focus_steal_fn();
+	const bool can_break = !(p_is_error_breakpoint && script_debugger->is_ignoring_error_breaks());
+	const String error_str = script_lang ? script_lang->debug_get_error() : "";
+
+	if (can_break) {
+		Array msg = {
+			p_can_continue,
+			error_str,
+			script_lang->debug_get_stack_level_count() > 0,
+			Thread::get_caller_id()
+		};
+		if (allow_focus_steal_fn) {
+			allow_focus_steal_fn();
+		}
+		send_message("debug_enter", msg);
+	} else {
+		ERR_PRINT(error_str);
+		return;
 	}
-	send_message("debug_enter", msg);
 
 	Input::MouseMode mouse_mode = Input::MOUSE_MODE_VISIBLE;
 
@@ -507,8 +510,7 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
 				script_lang->debug_get_globals(&globals, &globals_vals);
 				ERR_FAIL_COND(globals.size() != globals_vals.size());
 
-				Array var_size;
-				var_size.push_back(local_vals.size() + member_vals.size() + globals_vals.size());
+				Array var_size = { local_vals.size() + member_vals.size() + globals_vals.size() };
 				send_message("stack_frame_vars", var_size);
 				_send_stack_vars(locals, local_vals, 0);
 				_send_stack_vars(members, member_vals, 1);
@@ -530,6 +532,9 @@ void RemoteDebugger::debug(bool p_can_continue, bool p_is_error_breakpoint) {
 			} else if (command == "set_skip_breakpoints") {
 				ERR_FAIL_COND(data.is_empty());
 				script_debugger->set_skip_breakpoints(data[0]);
+			} else if (command == "set_ignore_error_breaks") {
+				ERR_FAIL_COND(data.is_empty());
+				script_debugger->set_ignore_error_breaks(data[0]);
 			} else if (command == "evaluate") {
 				String expression_str = data[0];
 				int frame = data[1];
@@ -669,6 +674,9 @@ Error RemoteDebugger::_core_capture(const String &p_cmd, const Array &p_data, bo
 	} else if (p_cmd == "set_skip_breakpoints") {
 		ERR_FAIL_COND_V(p_data.is_empty(), ERR_INVALID_DATA);
 		script_debugger->set_skip_breakpoints(p_data[0]);
+	} else if (p_cmd == "set_ignore_error_breaks") {
+		ERR_FAIL_COND_V(p_data.is_empty(), ERR_INVALID_DATA);
+		script_debugger->set_ignore_error_breaks(p_data[0]);
 	} else if (p_cmd == "break") {
 		script_debugger->debug(script_debugger->get_break_language());
 	} else {
diff --git a/engine/core/debugger/remote_debugger.h b/engine/core/debugger/remote_debugger.h
index e91d09be..cbac2257 100644
--- a/engine/core/debugger/remote_debugger.h
+++ b/engine/core/debugger/remote_debugger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REMOTE_DEBUGGER_H
-#define REMOTE_DEBUGGER_H
+#pragma once
 
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"
@@ -122,5 +121,3 @@ public:
 	explicit RemoteDebugger(Ref<RemoteDebuggerPeer> p_peer);
 	~RemoteDebugger();
 };
-
-#endif // REMOTE_DEBUGGER_H
diff --git a/engine/core/debugger/remote_debugger_peer.cpp b/engine/core/debugger/remote_debugger_peer.cpp
index 1afb7fe0..011e6722 100644
--- a/engine/core/debugger/remote_debugger_peer.cpp
+++ b/engine/core/debugger/remote_debugger_peer.cpp
@@ -96,7 +96,7 @@ void RemoteDebuggerPeerTCP::_write_out() {
 	while (tcp_client->get_status() == StreamPeerTCP::STATUS_CONNECTED && tcp_client->wait(NetSocket::POLL_TYPE_OUT) == OK) {
 		uint8_t *buf = out_buf.ptrw();
 		if (out_left <= 0) {
-			if (out_queue.size() == 0) {
+			if (out_queue.is_empty()) {
 				break; // Nothing left to send
 			}
 			mutex.lock();
diff --git a/engine/core/debugger/remote_debugger_peer.h b/engine/core/debugger/remote_debugger_peer.h
index 37da0a92..3b171e4b 100644
--- a/engine/core/debugger/remote_debugger_peer.h
+++ b/engine/core/debugger/remote_debugger_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REMOTE_DEBUGGER_PEER_H
-#define REMOTE_DEBUGGER_PEER_H
+#pragma once
 
 #include "core/io/stream_peer_tcp.h"
 #include "core/object/ref_counted.h"
@@ -92,5 +91,3 @@ public:
 	RemoteDebuggerPeerTCP(Ref<StreamPeerTCP> p_stream = Ref<StreamPeerTCP>());
 	~RemoteDebuggerPeerTCP();
 };
-
-#endif // REMOTE_DEBUGGER_PEER_H
diff --git a/engine/core/debugger/script_debugger.cpp b/engine/core/debugger/script_debugger.cpp
index e7d8654a..e522d9ba 100644
--- a/engine/core/debugger/script_debugger.cpp
+++ b/engine/core/debugger/script_debugger.cpp
@@ -58,7 +58,7 @@ void ScriptDebugger::remove_breakpoint(int p_line, const StringName &p_source) {
 	}
 
 	breakpoints[p_line].erase(p_source);
-	if (breakpoints[p_line].size() == 0) {
+	if (breakpoints[p_line].is_empty()) {
 		breakpoints.erase(p_line);
 	}
 }
@@ -79,6 +79,14 @@ bool ScriptDebugger::is_skipping_breakpoints() {
 	return skip_breakpoints;
 }
 
+void ScriptDebugger::set_ignore_error_breaks(bool p_ignore) {
+	ignore_error_breaks = p_ignore;
+}
+
+bool ScriptDebugger::is_ignoring_error_breaks() {
+	return ignore_error_breaks;
+}
+
 void ScriptDebugger::debug(ScriptLanguage *p_lang, bool p_can_continue, bool p_is_error_breakpoint) {
 	ScriptLanguage *prev = break_lang;
 	break_lang = p_lang;
diff --git a/engine/core/debugger/script_debugger.h b/engine/core/debugger/script_debugger.h
index fb786f1b..0a5ffe78 100644
--- a/engine/core/debugger/script_debugger.h
+++ b/engine/core/debugger/script_debugger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_DEBUGGER_H
-#define SCRIPT_DEBUGGER_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "core/string/string_name.h"
@@ -40,6 +39,7 @@ class ScriptDebugger {
 	typedef ScriptLanguage::StackInfo StackInfo;
 
 	bool skip_breakpoints = false;
+	bool ignore_error_breaks = false;
 
 	HashMap<int, HashSet<StringName>> breakpoints;
 
@@ -64,6 +64,8 @@ public:
 	ScriptLanguage *get_break_language() { return break_lang; }
 	void set_skip_breakpoints(bool p_skip_breakpoints);
 	bool is_skipping_breakpoints();
+	void set_ignore_error_breaks(bool p_ignore);
+	bool is_ignoring_error_breaks();
 	void insert_breakpoint(int p_line, const StringName &p_source);
 	void remove_breakpoint(int p_line, const StringName &p_source);
 	_ALWAYS_INLINE_ bool is_breakpoint(int p_line, const StringName &p_source) const {
@@ -82,5 +84,3 @@ public:
 	Vector<StackInfo> get_error_stack_info() const;
 	ScriptDebugger() {}
 };
-
-#endif // SCRIPT_DEBUGGER_H
diff --git a/engine/core/doc_data.cpp b/engine/core/doc_data.cpp
index 28814435..d1904025 100644
--- a/engine/core/doc_data.cpp
+++ b/engine/core/doc_data.cpp
@@ -32,11 +32,11 @@
 
 String DocData::get_default_value_string(const Variant &p_value) {
 	if (p_value.get_type() == Variant::ARRAY) {
-		return Variant(Array(p_value, 0, StringName(), Variant())).get_construct_string().replace("\n", " ");
+		return Variant(Array(p_value, 0, StringName(), Variant())).get_construct_string().replace_char('\n', ' ');
 	} else if (p_value.get_type() == Variant::DICTIONARY) {
-		return Variant(Dictionary(p_value, 0, StringName(), Variant(), 0, StringName(), Variant())).get_construct_string().replace("\n", " ");
+		return Variant(Dictionary(p_value, 0, StringName(), Variant(), 0, StringName(), Variant())).get_construct_string().replace_char('\n', ' ');
 	} else {
-		return p_value.get_construct_string().replace("\n", " ");
+		return p_value.get_construct_string().replace_char('\n', ' ');
 	}
 }
 
@@ -51,7 +51,7 @@ void DocData::return_doc_from_retinfo(DocData::MethodDoc &p_method, const Proper
 	} else if (p_retinfo.type == Variant::INT && p_retinfo.usage & (PROPERTY_USAGE_CLASS_IS_ENUM | PROPERTY_USAGE_CLASS_IS_BITFIELD)) {
 		p_method.return_enum = p_retinfo.class_name;
 		if (p_method.return_enum.begins_with("_")) { //proxy class
-			p_method.return_enum = p_method.return_enum.substr(1, p_method.return_enum.length());
+			p_method.return_enum = p_method.return_enum.substr(1);
 		}
 		p_method.return_is_bitfield = p_retinfo.usage & PROPERTY_USAGE_CLASS_IS_BITFIELD;
 		p_method.return_type = "int";
@@ -85,7 +85,7 @@ void DocData::argument_doc_from_arginfo(DocData::ArgumentDoc &p_argument, const
 	} else if (p_arginfo.type == Variant::INT && p_arginfo.usage & (PROPERTY_USAGE_CLASS_IS_ENUM | PROPERTY_USAGE_CLASS_IS_BITFIELD)) {
 		p_argument.enumeration = p_arginfo.class_name;
 		if (p_argument.enumeration.begins_with("_")) { //proxy class
-			p_argument.enumeration = p_argument.enumeration.substr(1, p_argument.enumeration.length());
+			p_argument.enumeration = p_argument.enumeration.substr(1);
 		}
 		p_argument.is_bitfield = p_arginfo.usage & PROPERTY_USAGE_CLASS_IS_BITFIELD;
 		p_argument.type = "int";
@@ -136,11 +136,10 @@ void DocData::method_doc_from_methodinfo(DocData::MethodDoc &p_method, const Met
 
 	return_doc_from_retinfo(p_method, p_methodinfo.return_val);
 
-	int i = 0;
-	for (List<PropertyInfo>::ConstIterator itr = p_methodinfo.arguments.begin(); itr != p_methodinfo.arguments.end(); ++itr, ++i) {
+	for (int64_t i = 0; i < p_methodinfo.arguments.size(); ++i) {
 		DocData::ArgumentDoc argument;
-		argument_doc_from_arginfo(argument, *itr);
-		int default_arg_index = i - (p_methodinfo.arguments.size() - p_methodinfo.default_arguments.size());
+		argument_doc_from_arginfo(argument, p_methodinfo.arguments[i]);
+		int64_t default_arg_index = i - (p_methodinfo.arguments.size() - p_methodinfo.default_arguments.size());
 		if (default_arg_index >= 0) {
 			Variant default_arg = p_methodinfo.default_arguments[default_arg_index];
 			argument.default_value = get_default_value_string(default_arg);
diff --git a/engine/core/doc_data.h b/engine/core/doc_data.h
index 49f9c3aa..50e67ec7 100644
--- a/engine/core/doc_data.h
+++ b/engine/core/doc_data.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DOC_DATA_H
-#define DOC_DATA_H
+#pragma once
 
 #include "core/io/xml_parser.h"
 #include "core/variant/variant.h"
@@ -115,7 +114,7 @@ public:
 				// Must be an operator or a constructor since there is no other overloading
 				if (name.left(8) == "operator") {
 					if (arguments.size() == p_method.arguments.size()) {
-						if (arguments.size() == 0) {
+						if (arguments.is_empty()) {
 							return false;
 						}
 						return arguments[0].type < p_method.arguments[0].type;
@@ -127,7 +126,7 @@ public:
 					// - 1. Default constructor: Foo()
 					// - 2. Copy constructor: Foo(Foo)
 					// - 3+. Other constructors Foo(Bar, ...) based on first argument's name
-					if (arguments.size() == 0 || p_method.arguments.size() == 0) { // 1.
+					if (arguments.is_empty() || p_method.arguments.is_empty()) { // 1.
 						return arguments.size() < p_method.arguments.size();
 					}
 					if (arguments[0].type == return_type || p_method.arguments[0].type == p_method.return_type) { // 2.
@@ -795,8 +794,8 @@ public:
 			if (p_dict.has("enums")) {
 				enums = p_dict["enums"];
 			}
-			for (int i = 0; i < enums.size(); i++) {
-				doc.enums[enums.get_key_at_index(i)] = EnumDoc::from_dict(enums.get_value_at_index(i));
+			for (const KeyValue<Variant, Variant> &kv : enums) {
+				doc.enums[kv.key] = EnumDoc::from_dict(kv.value);
 			}
 
 			Array properties;
@@ -980,5 +979,3 @@ public:
 	static void argument_doc_from_arginfo(DocData::ArgumentDoc &p_argument, const PropertyInfo &p_arginfo);
 	static void method_doc_from_methodinfo(DocData::MethodDoc &p_method, const MethodInfo &p_methodinfo, const String &p_desc);
 };
-
-#endif // DOC_DATA_H
diff --git a/engine/core/error/error_list.cpp b/engine/core/error/error_list.cpp
index f14cc84b..13e560c3 100644
--- a/engine/core/error/error_list.cpp
+++ b/engine/core/error/error_list.cpp
@@ -30,6 +30,8 @@
 
 #include "error_list.h"
 
+#include <iterator>
+
 const char *error_names[] = {
 	"OK", // OK
 	"Failed", // FAILED
@@ -82,4 +84,4 @@ const char *error_names[] = {
 	"Printer on fire", // ERR_PRINTER_ON_FIRE
 };
 
-static_assert(sizeof(error_names) / sizeof(*error_names) == ERR_MAX);
+static_assert(std::size(error_names) == ERR_MAX);
diff --git a/engine/core/error/error_list.h b/engine/core/error/error_list.h
index cdf06eb0..cdc31ecd 100644
--- a/engine/core/error/error_list.h
+++ b/engine/core/error/error_list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ERROR_LIST_H
-#define ERROR_LIST_H
+#pragma once
 
 /** Error List. Please never compare an error against FAILED
  * Either do result != OK , or !result. This way, Error fail
@@ -98,5 +97,3 @@ enum Error {
 };
 
 extern const char *error_names[];
-
-#endif // ERROR_LIST_H
diff --git a/engine/core/error/error_macros.cpp b/engine/core/error/error_macros.cpp
index a2369992..74dc9336 100644
--- a/engine/core/error/error_macros.cpp
+++ b/engine/core/error/error_macros.cpp
@@ -31,6 +31,7 @@
 #include "error_macros.h"
 
 #include "core/io/logger.h"
+#include "core/object/object_id.h"
 #include "core/os/os.h"
 #include "core/string/ustring.h"
 
@@ -187,7 +188,7 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
 			} else {
 				String node_name;
 				if (p_id.is_valid()) {
-					Node *node = Object::cast_to<Node>(ObjectDB::get_instance(p_id));
+					Node *node = ObjectDB::get_instance<Node>(p_id);
 					if (node && node->is_inside_tree()) {
 						node_name = "\"" + String(node->get_path()) + "\"";
 					} else {
diff --git a/engine/core/error/error_macros.h b/engine/core/error/error_macros.h
index 752fd605..bedb84b4 100644
--- a/engine/core/error/error_macros.h
+++ b/engine/core/error/error_macros.h
@@ -28,15 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ERROR_MACROS_H
-#define ERROR_MACROS_H
+#pragma once
 
-#include "core/object/object_id.h"
 #include "core/typedefs.h"
 
-#include <atomic> // We'd normally use safe_refcount.h, but that would cause circular includes.
+#include <atomic> // IWYU pragma: keep // Used in macro. We'd normally use `safe_refcount.h`, but that would cause circular includes.
 
 class String;
+class ObjectID;
 
 enum ErrorHandlerType {
 	ERR_HANDLER_ERROR,
@@ -62,16 +61,16 @@ void add_error_handler(ErrorHandlerList *p_handler);
 void remove_error_handler(const ErrorHandlerList *p_handler);
 
 // Functions used by the error macros.
-void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
-void _err_print_error(const char *p_function, const char *p_file, int p_line, const String &p_error, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
-void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const char *p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
-void _err_print_error(const char *p_function, const char *p_file, int p_line, const String &p_error, const char *p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
-void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const String &p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
-void _err_print_error(const char *p_function, const char *p_file, int p_line, const String &p_error, const String &p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
+_NO_INLINE_ void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
+_NO_INLINE_ void _err_print_error(const char *p_function, const char *p_file, int p_line, const String &p_error, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
+_NO_INLINE_ void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const char *p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
+_NO_INLINE_ void _err_print_error(const char *p_function, const char *p_file, int p_line, const String &p_error, const char *p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
+_NO_INLINE_ void _err_print_error(const char *p_function, const char *p_file, int p_line, const char *p_error, const String &p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
+_NO_INLINE_ void _err_print_error(const char *p_function, const char *p_file, int p_line, const String &p_error, const String &p_message, bool p_editor_notify = false, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
 void _err_print_error_asap(const String &p_error, ErrorHandlerType p_type = ERR_HANDLER_ERROR);
-void _err_print_index_error(const char *p_function, const char *p_file, int p_line, int64_t p_index, int64_t p_size, const char *p_index_str, const char *p_size_str, const char *p_message = "", bool p_editor_notify = false, bool fatal = false);
-void _err_print_index_error(const char *p_function, const char *p_file, int p_line, int64_t p_index, int64_t p_size, const char *p_index_str, const char *p_size_str, const String &p_message, bool p_editor_notify = false, bool fatal = false);
-void _err_flush_stdout();
+_NO_INLINE_ void _err_print_index_error(const char *p_function, const char *p_file, int p_line, int64_t p_index, int64_t p_size, const char *p_index_str, const char *p_size_str, const char *p_message = "", bool p_editor_notify = false, bool fatal = false);
+_NO_INLINE_ void _err_print_index_error(const char *p_function, const char *p_file, int p_line, int64_t p_index, int64_t p_size, const char *p_index_str, const char *p_size_str, const String &p_message, bool p_editor_notify = false, bool fatal = false);
+_NO_INLINE_ void _err_flush_stdout();
 
 void _physics_interpolation_warning(const char *p_function, const char *p_file, int p_line, ObjectID p_id, const char *p_warn_string);
 
@@ -845,5 +844,3 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
 
 #define PHYSICS_INTERPOLATION_WARNING(m_string) \
 	_physics_interpolation_warning(FUNCTION_STR, __FILE__, __LINE__, ObjectID(UINT64_MAX), m_string)
-
-#endif // ERROR_MACROS_H
diff --git a/engine/core/extension/extension_api_dump.cpp b/engine/core/extension/extension_api_dump.cpp
index 52f1672a..93b1b272 100644
--- a/engine/core/extension/extension_api_dump.cpp
+++ b/engine/core/extension/extension_api_dump.cpp
@@ -96,8 +96,7 @@ static String fix_doc_description(const String &p_bbcode) {
 	// Based on what EditorHelp does.
 
 	return p_bbcode.dedent()
-			.replace("\t", "")
-			.replace("\r", "")
+			.remove_chars("\t\r")
 			.strip_edges();
 }
 
@@ -107,16 +106,22 @@ Dictionary GDExtensionAPIDump::generate_extension_api(bool p_include_docs) {
 	{
 		//header
 		Dictionary header;
-		header["version_major"] = VERSION_MAJOR;
-		header["version_minor"] = VERSION_MINOR;
-#if VERSION_PATCH
-		header["version_patch"] = VERSION_PATCH;
+		header["version_major"] = GODOT_VERSION_MAJOR;
+		header["version_minor"] = GODOT_VERSION_MINOR;
+#if GODOT_VERSION_PATCH
+		header["version_patch"] = GODOT_VERSION_PATCH;
 #else
 		header["version_patch"] = 0;
 #endif
-		header["version_status"] = VERSION_STATUS;
-		header["version_build"] = VERSION_BUILD;
-		header["version_full_name"] = VERSION_FULL_NAME;
+		header["version_status"] = GODOT_VERSION_STATUS;
+		header["version_build"] = GODOT_VERSION_BUILD;
+		header["version_full_name"] = GODOT_VERSION_FULL_NAME;
+
+#if REAL_T_IS_DOUBLE
+		header["precision"] = "double";
+#else
+		header["precision"] = "single";
+#endif
 
 		api_dump["header"] = header;
 	}
@@ -278,43 +283,43 @@ Dictionary GDExtensionAPIDump::generate_extension_api(bool p_include_docs) {
 #define REAL_MEMBER_OFFSET(type, member) \
 	{                                    \
 		type,                            \
-				member,                  \
-				"float",                 \
-				sizeof(float),           \
-				"float",                 \
-				sizeof(float),           \
-				"double",                \
-				sizeof(double),          \
-				"double",                \
-				sizeof(double),          \
+		member,                          \
+		"float",                         \
+		sizeof(float),                   \
+		"float",                         \
+		sizeof(float),                   \
+		"double",                        \
+		sizeof(double),                  \
+		"double",                        \
+		sizeof(double),                  \
 	}
 
 #define INT32_MEMBER_OFFSET(type, member) \
 	{                                     \
 		type,                             \
-				member,                   \
-				"int32",                  \
-				sizeof(int32_t),          \
-				"int32",                  \
-				sizeof(int32_t),          \
-				"int32",                  \
-				sizeof(int32_t),          \
-				"int32",                  \
-				sizeof(int32_t),          \
+		member,                           \
+		"int32",                          \
+		sizeof(int32_t),                  \
+		"int32",                          \
+		sizeof(int32_t),                  \
+		"int32",                          \
+		sizeof(int32_t),                  \
+		"int32",                          \
+		sizeof(int32_t),                  \
 	}
 
 #define INT32_BASED_BUILTIN_MEMBER_OFFSET(type, member, member_type, member_elems) \
 	{                                                                              \
 		type,                                                                      \
-				member,                                                            \
-				member_type,                                                       \
-				sizeof(int32_t) * member_elems,                                    \
-				member_type,                                                       \
-				sizeof(int32_t) * member_elems,                                    \
-				member_type,                                                       \
-				sizeof(int32_t) * member_elems,                                    \
-				member_type,                                                       \
-				sizeof(int32_t) * member_elems,                                    \
+		member,                                                                    \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
+		member_type,                                                               \
+		sizeof(int32_t) * member_elems,                                            \
 	}
 
 #define REAL_BASED_BUILTIN_MEMBER_OFFSET(type, member, member_type, member_elems) \
@@ -970,14 +975,14 @@ Dictionary GDExtensionAPIDump::generate_extension_api(bool p_include_docs) {
 					Array values;
 					List<StringName> enum_constant_list;
 					ClassDB::get_enum_constants(class_name, F, &enum_constant_list, true);
-					for (List<StringName>::Element *G = enum_constant_list.front(); G; G = G->next()) {
+					for (const StringName &enum_constant : enum_constant_list) {
 						Dictionary d3;
-						d3["name"] = String(G->get());
-						d3["value"] = ClassDB::get_integer_constant(class_name, G->get());
+						d3["name"] = String(enum_constant);
+						d3["value"] = ClassDB::get_integer_constant(class_name, enum_constant);
 
 						if (p_include_docs) {
 							for (const DocData::ConstantDoc &constant_doc : class_doc->constants) {
-								if (constant_doc.name == G->get()) {
+								if (constant_doc.name == enum_constant) {
 									d3["description"] = fix_doc_description(constant_doc.description);
 									break;
 								}
@@ -1048,9 +1053,8 @@ Dictionary GDExtensionAPIDump::generate_extension_api(bool p_include_docs) {
 						}
 
 						Array arguments;
-						int i = 0;
-						for (List<PropertyInfo>::ConstIterator itr = mi.arguments.begin(); itr != mi.arguments.end(); ++itr, ++i) {
-							const PropertyInfo &pinfo = *itr;
+						for (int64_t i = 0; i < mi.arguments.size(); ++i) {
+							const PropertyInfo &pinfo = mi.arguments[i];
 							Dictionary d3;
 
 							d3["name"] = pinfo.name;
@@ -1175,11 +1179,10 @@ Dictionary GDExtensionAPIDump::generate_extension_api(bool p_include_docs) {
 
 					Array arguments;
 
-					int i = 0;
-					for (List<PropertyInfo>::ConstIterator itr = F.arguments.begin(); itr != F.arguments.end(); ++itr, ++i) {
+					for (int64_t i = 0; i < F.arguments.size(); ++i) {
 						Dictionary d3;
-						d3["name"] = itr->name;
-						d3["type"] = get_property_info_type_name(*itr);
+						d3["name"] = F.arguments[i].name;
+						d3["type"] = get_property_info_type_name(F.arguments[i]);
 						if (F.get_argument_meta(i) > 0) {
 							d3["meta"] = get_type_meta_name((GodotTypeInfo::Metadata)F.get_argument_meta(i));
 						}
@@ -1340,16 +1343,16 @@ static bool compare_value(const String &p_path, const String &p_field, const Var
 	} else if (p_old_value.get_type() == Variant::DICTIONARY && p_new_value.get_type() == Variant::DICTIONARY) {
 		Dictionary old_dict = p_old_value;
 		Dictionary new_dict = p_new_value;
-		for (const Variant &key : old_dict.keys()) {
-			if (!new_dict.has(key)) {
+		for (const KeyValue<Variant, Variant> &kv : old_dict) {
+			if (!new_dict.has(kv.key)) {
 				failed = true;
-				print_error(vformat("Validate extension JSON: Error: Field '%s': %s was removed.", p_path, key));
+				print_error(vformat("Validate extension JSON: Error: Field '%s': %s was removed.", p_path, kv.key));
 				continue;
 			}
-			if (p_allow_name_change && key == "name") {
+			if (p_allow_name_change && kv.key == "name") {
 				continue;
 			}
-			if (!compare_value(path, key, old_dict[key], new_dict[key], p_allow_name_change)) {
+			if (!compare_value(path, kv.key, kv.value, new_dict[kv.key], p_allow_name_change)) {
 				failed = true;
 			}
 		}
@@ -1420,25 +1423,25 @@ static bool compare_dict_array(const Dictionary &p_old_api, const Dictionary &p_
 			bool optional = field.begins_with("*");
 			if (optional) {
 				// This is an optional field, but if exists it has to exist in both.
-				field = field.substr(1, field.length());
+				field = field.substr(1);
 			}
 
 			bool added = field.begins_with("+");
 			if (added) {
 				// Meaning this field must either exist or contents may not exist.
-				field = field.substr(1, field.length());
+				field = field.substr(1);
 			}
 
 			bool enum_values = field.begins_with("$");
 			if (enum_values) {
 				// Meaning this field is a list of enum values.
-				field = field.substr(1, field.length());
+				field = field.substr(1);
 			}
 
 			bool allow_name_change = field.begins_with("@");
 			if (allow_name_change) {
 				// Meaning that when structurally comparing the old and new value, the dictionary entry 'name' may change.
-				field = field.substr(1, field.length());
+				field = field.substr(1);
 			}
 
 			Variant old_value;
@@ -1598,8 +1601,8 @@ Error GDExtensionAPIDump::validate_extension_json_file(const String &p_path) {
 		int major = header["version_major"];
 		int minor = header["version_minor"];
 
-		ERR_FAIL_COND_V_MSG(major != VERSION_MAJOR, ERR_INVALID_DATA, vformat("JSON API dump is for a different engine version (%d) than this one (%d)", major, VERSION_MAJOR));
-		ERR_FAIL_COND_V_MSG(minor > VERSION_MINOR, ERR_INVALID_DATA, vformat("JSON API dump is for a newer version of the engine: %d.%d", major, minor));
+		ERR_FAIL_COND_V_MSG(major != GODOT_VERSION_MAJOR, ERR_INVALID_DATA, vformat("JSON API dump is for a different engine version (%d) than this one (%d)", major, GODOT_VERSION_MAJOR));
+		ERR_FAIL_COND_V_MSG(minor > GODOT_VERSION_MINOR, ERR_INVALID_DATA, vformat("JSON API dump is for a newer version of the engine: %d.%d", major, minor));
 	}
 
 	bool failed = false;
diff --git a/engine/core/extension/extension_api_dump.h b/engine/core/extension/extension_api_dump.h
index 204a115f..027a8d91 100644
--- a/engine/core/extension/extension_api_dump.h
+++ b/engine/core/extension/extension_api_dump.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EXTENSION_API_DUMP_H
-#define EXTENSION_API_DUMP_H
+#pragma once
 
 #include "core/extension/gdextension.h"
 
@@ -42,5 +41,3 @@ public:
 	static Error validate_extension_json_file(const String &p_path);
 };
 #endif
-
-#endif // EXTENSION_API_DUMP_H
diff --git a/engine/core/extension/gdextension.cpp b/engine/core/extension/gdextension.cpp
index f40612ec..ea314b71 100644
--- a/engine/core/extension/gdextension.cpp
+++ b/engine/core/extension/gdextension.cpp
@@ -679,6 +679,13 @@ void GDExtension::_get_library_path(GDExtensionClassLibraryPtr p_library, GDExte
 	memnew_placement(r_path, String(library_path));
 }
 
+void GDExtension::_register_get_classes_used_callback(GDExtensionClassLibraryPtr p_library, GDExtensionEditorGetClassesUsedCallback p_callback) {
+#ifdef TOOLS_ENABLED
+	GDExtension *self = reinterpret_cast<GDExtension *>(p_library);
+	self->get_classes_used_callback = p_callback;
+#endif
+}
+
 HashMap<StringName, GDExtensionInterfaceFunctionPtr> GDExtension::gdextension_interface_functions;
 
 void GDExtension::register_interface_function(const StringName &p_function_name, GDExtensionInterfaceFunctionPtr p_function_pointer) {
@@ -799,6 +806,7 @@ void GDExtension::initialize_gdextensions() {
 	register_interface_function("classdb_register_extension_class_signal", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_extension_class_signal);
 	register_interface_function("classdb_unregister_extension_class", (GDExtensionInterfaceFunctionPtr)&GDExtension::_unregister_extension_class);
 	register_interface_function("get_library_path", (GDExtensionInterfaceFunctionPtr)&GDExtension::_get_library_path);
+	register_interface_function("editor_register_get_classes_used_callback", (GDExtensionInterfaceFunctionPtr)&GDExtension::_register_get_classes_used_callback);
 }
 
 void GDExtension::finalize_gdextensions() {
@@ -1034,6 +1042,14 @@ void GDExtension::_untrack_instance(void *p_user_data, void *p_instance) {
 	extension->instances.erase(obj->get_instance_id());
 }
 
+PackedStringArray GDExtension::get_classes_used() const {
+	PackedStringArray ret;
+	if (get_classes_used_callback) {
+		get_classes_used_callback((GDExtensionTypePtr)&ret);
+	}
+	return ret;
+}
+
 Vector<StringName> GDExtensionEditorPlugins::extension_classes;
 GDExtensionEditorPlugins::EditorPluginRegisterFunc GDExtensionEditorPlugins::editor_node_add_plugin = nullptr;
 GDExtensionEditorPlugins::EditorPluginRegisterFunc GDExtensionEditorPlugins::editor_node_remove_plugin = nullptr;
diff --git a/engine/core/extension/gdextension.h b/engine/core/extension/gdextension.h
index bfed8424..a40f7af4 100644
--- a/engine/core/extension/gdextension.h
+++ b/engine/core/extension/gdextension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDEXTENSION_H
-#define GDEXTENSION_H
+#pragma once
 
 #include "core/extension/gdextension_interface.h"
 #include "core/extension/gdextension_loader.h"
@@ -94,6 +93,7 @@ class GDExtension : public Resource {
 	static void _register_extension_class_signal(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstStringNamePtr p_signal_name, const GDExtensionPropertyInfo *p_argument_info, GDExtensionInt p_argument_count);
 	static void _unregister_extension_class(GDExtensionClassLibraryPtr p_library, GDExtensionConstStringNamePtr p_class_name);
 	static void _get_library_path(GDExtensionClassLibraryPtr p_library, GDExtensionStringPtr r_path);
+	static void _register_get_classes_used_callback(GDExtensionClassLibraryPtr p_library, GDExtensionEditorGetClassesUsedCallback p_callback);
 
 	GDExtensionInitialization initialization;
 	int32_t level_initialized = -1;
@@ -102,6 +102,7 @@ class GDExtension : public Resource {
 	bool is_reloading = false;
 	Vector<GDExtensionMethodBind *> invalid_methods;
 	Vector<ObjectID> instance_bindings;
+	GDExtensionEditorGetClassesUsedCallback get_classes_used_callback = nullptr;
 
 	static void _track_instance(void *p_user_data, void *p_instance);
 	static void _untrack_instance(void *p_user_data, void *p_instance);
@@ -156,6 +157,8 @@ public:
 
 	void track_instance_binding(Object *p_object);
 	void untrack_instance_binding(Object *p_object);
+
+	PackedStringArray get_classes_used() const;
 #endif
 
 	InitializationLevel get_minimum_library_initialization_level() const;
@@ -226,5 +229,3 @@ public:
 };
 
 #endif // TOOLS_ENABLED
-
-#endif // GDEXTENSION_H
diff --git a/engine/core/extension/gdextension_interface.cpp b/engine/core/extension/gdextension_interface.cpp
index 30f0ce98..725475d9 100644
--- a/engine/core/extension/gdextension_interface.cpp
+++ b/engine/core/extension/gdextension_interface.cpp
@@ -241,11 +241,25 @@ GDExtensionInterfaceFunctionPtr gdextension_get_proc_address(const char *p_name)
 	return GDExtension::get_interface_function(p_name);
 }
 
+#ifndef DISABLE_DEPRECATED
 static void gdextension_get_godot_version(GDExtensionGodotVersion *r_godot_version) {
-	r_godot_version->major = VERSION_MAJOR;
-	r_godot_version->minor = VERSION_MINOR;
-	r_godot_version->patch = VERSION_PATCH;
-	r_godot_version->string = VERSION_FULL_NAME;
+	r_godot_version->major = GODOT_VERSION_MAJOR;
+	r_godot_version->minor = GODOT_VERSION_MINOR;
+	r_godot_version->patch = GODOT_VERSION_PATCH;
+	r_godot_version->string = GODOT_VERSION_FULL_NAME;
+}
+#endif
+
+static void gdextension_get_godot_version2(GDExtensionGodotVersion2 *r_godot_version) {
+	r_godot_version->major = GODOT_VERSION_MAJOR;
+	r_godot_version->minor = GODOT_VERSION_MINOR;
+	r_godot_version->patch = GODOT_VERSION_PATCH;
+	r_godot_version->hex = GODOT_VERSION_HEX;
+	r_godot_version->status = GODOT_VERSION_STATUS;
+	r_godot_version->build = GODOT_VERSION_BUILD;
+	r_godot_version->hash = GODOT_VERSION_HASH;
+	r_godot_version->timestamp = GODOT_VERSION_TIMESTAMP;
+	r_godot_version->string = GODOT_VERSION_FULL_NAME;
 }
 
 // Memory Functions
@@ -858,84 +872,82 @@ static GDExtensionPtrUtilityFunction gdextension_variant_get_ptr_utility_functio
 //string helpers
 
 static void gdextension_string_new_with_latin1_chars(GDExtensionUninitializedStringPtr r_dest, const char *p_contents) {
-	memnew_placement(r_dest, String(p_contents));
+	String *dest = memnew_placement(r_dest, String);
+	dest->append_latin1(Span<char>(p_contents, p_contents ? strlen(p_contents) : 0));
 }
 
 static void gdextension_string_new_with_utf8_chars(GDExtensionUninitializedStringPtr r_dest, const char *p_contents) {
-	memnew_placement(r_dest, String);
-	String *dest = reinterpret_cast<String *>(r_dest);
-	dest->parse_utf8(p_contents);
+	String *dest = memnew_placement(r_dest, String);
+	dest->append_utf8(p_contents);
 }
 
 static void gdextension_string_new_with_utf16_chars(GDExtensionUninitializedStringPtr r_dest, const char16_t *p_contents) {
-	memnew_placement(r_dest, String);
-	String *dest = reinterpret_cast<String *>(r_dest);
-	dest->parse_utf16(p_contents);
+	String *dest = memnew_placement(r_dest, String);
+	dest->append_utf16(p_contents);
 }
 
 static void gdextension_string_new_with_utf32_chars(GDExtensionUninitializedStringPtr r_dest, const char32_t *p_contents) {
-	memnew_placement(r_dest, String((const char32_t *)p_contents));
+	String *dest = memnew_placement(r_dest, String);
+	dest->append_utf32(Span(p_contents, p_contents ? strlen(p_contents) : 0));
 }
 
 static void gdextension_string_new_with_wide_chars(GDExtensionUninitializedStringPtr r_dest, const wchar_t *p_contents) {
 	if constexpr (sizeof(wchar_t) == 2) {
-		// wchar_t is 16 bit, parse.
-		memnew_placement(r_dest, String);
-		String *dest = reinterpret_cast<String *>(r_dest);
-		dest->parse_utf16((const char16_t *)p_contents);
+		// wchar_t is 16 bit (UTF-16).
+		String *dest = memnew_placement(r_dest, String);
+		dest->append_utf16((const char16_t *)p_contents);
 	} else {
-		// wchar_t is 32 bit, copy.
-		memnew_placement(r_dest, String((const char32_t *)p_contents));
+		// wchar_t is 32 bit (UTF-32).
+		String *string = memnew_placement(r_dest, String);
+		string->append_utf32(Span((const char32_t *)p_contents, p_contents ? strlen(p_contents) : 0));
 	}
 }
 
 static void gdextension_string_new_with_latin1_chars_and_len(GDExtensionUninitializedStringPtr r_dest, const char *p_contents, GDExtensionInt p_size) {
-	memnew_placement(r_dest, String(p_contents, p_size));
+	String *dest = memnew_placement(r_dest, String);
+	dest->append_latin1(Span(p_contents, p_contents ? _strlen_clipped(p_contents, p_size) : 0));
 }
 
 static void gdextension_string_new_with_utf8_chars_and_len(GDExtensionUninitializedStringPtr r_dest, const char *p_contents, GDExtensionInt p_size) {
-	memnew_placement(r_dest, String);
-	String *dest = reinterpret_cast<String *>(r_dest);
-	dest->parse_utf8(p_contents, p_size);
+	String *dest = memnew_placement(r_dest, String);
+	dest->append_utf8(p_contents, p_size);
 }
 
 static GDExtensionInt gdextension_string_new_with_utf8_chars_and_len2(GDExtensionUninitializedStringPtr r_dest, const char *p_contents, GDExtensionInt p_size) {
-	memnew_placement(r_dest, String);
-	String *dest = reinterpret_cast<String *>(r_dest);
-	return (GDExtensionInt)dest->parse_utf8(p_contents, p_size);
+	String *dest = memnew_placement(r_dest, String);
+	return (GDExtensionInt)dest->append_utf8(p_contents, p_size);
 }
 
 static void gdextension_string_new_with_utf16_chars_and_len(GDExtensionUninitializedStringPtr r_dest, const char16_t *p_contents, GDExtensionInt p_char_count) {
-	memnew_placement(r_dest, String);
-	String *dest = reinterpret_cast<String *>(r_dest);
-	dest->parse_utf16(p_contents, p_char_count);
+	String *dest = memnew_placement(r_dest, String);
+	dest->append_utf16(p_contents, p_char_count);
 }
 
 static GDExtensionInt gdextension_string_new_with_utf16_chars_and_len2(GDExtensionUninitializedStringPtr r_dest, const char16_t *p_contents, GDExtensionInt p_char_count, GDExtensionBool p_default_little_endian) {
-	memnew_placement(r_dest, String);
-	String *dest = reinterpret_cast<String *>(r_dest);
-	return (GDExtensionInt)dest->parse_utf16(p_contents, p_char_count, p_default_little_endian);
+	String *dest = memnew_placement(r_dest, String);
+	return (GDExtensionInt)dest->append_utf16(p_contents, p_char_count, p_default_little_endian);
 }
 
 static void gdextension_string_new_with_utf32_chars_and_len(GDExtensionUninitializedStringPtr r_dest, const char32_t *p_contents, GDExtensionInt p_char_count) {
-	memnew_placement(r_dest, String((const char32_t *)p_contents, p_char_count));
+	String *string = memnew_placement(r_dest, String);
+	string->append_utf32(Span(p_contents, p_contents ? _strlen_clipped(p_contents, p_char_count) : 0));
 }
 
 static void gdextension_string_new_with_wide_chars_and_len(GDExtensionUninitializedStringPtr r_dest, const wchar_t *p_contents, GDExtensionInt p_char_count) {
 	if constexpr (sizeof(wchar_t) == 2) {
-		// wchar_t is 16 bit, parse.
-		memnew_placement(r_dest, String);
-		String *dest = reinterpret_cast<String *>(r_dest);
-		dest->parse_utf16((const char16_t *)p_contents, p_char_count);
+		// wchar_t is 16 bit (UTF-16).
+		String *dest = memnew_placement(r_dest, String);
+		dest->append_utf16((const char16_t *)p_contents, p_char_count);
 	} else {
-		// wchar_t is 32 bit, copy.
-		memnew_placement(r_dest, String((const char32_t *)p_contents, p_char_count));
+		// wchar_t is 32 bit (UTF-32).
+		String *string = memnew_placement(r_dest, String);
+		string->append_utf32(Span((const char32_t *)p_contents, p_contents ? _strlen_clipped((const char32_t *)p_contents, p_char_count) : 0));
 	}
 }
 
 static GDExtensionInt gdextension_string_to_latin1_chars(GDExtensionConstStringPtr p_self, char *r_text, GDExtensionInt p_max_write_length) {
 	String *self = (String *)p_self;
-	CharString cs = self->ascii(true);
+	CharString cs = self->latin1();
 	GDExtensionInt len = cs.length();
 	if (r_text) {
 		const char *s_text = cs.ptr();
@@ -1040,16 +1052,12 @@ static void gdextension_string_name_new_with_latin1_chars(GDExtensionUninitializ
 }
 
 static void gdextension_string_name_new_with_utf8_chars(GDExtensionUninitializedStringNamePtr r_dest, const char *p_contents) {
-	String tmp;
-	tmp.parse_utf8(p_contents);
-
+	String tmp = String::utf8(p_contents);
 	memnew_placement(r_dest, StringName(tmp));
 }
 
 static void gdextension_string_name_new_with_utf8_chars_and_len(GDExtensionUninitializedStringNamePtr r_dest, const char *p_contents, GDExtensionInt p_size) {
-	String tmp;
-	tmp.parse_utf8(p_contents, p_size);
-
+	String tmp = String::utf8(p_contents, p_size);
 	memnew_placement(r_dest, StringName(tmp));
 }
 
@@ -1543,11 +1551,8 @@ static void gdextension_placeholder_script_instance_update(GDExtensionScriptInst
 		properties_list.push_back(PropertyInfo::from_dict(d));
 	}
 
-	List<Variant> keys;
-	values.get_key_list(&keys);
-
-	for (const Variant &E : keys) {
-		values_map.insert(E, values[E]);
+	for (const KeyValue<Variant, Variant> &kv : values) {
+		values_map.insert(kv.key, kv.value);
 	}
 
 	placeholder->update(properties_list, values_map);
@@ -1572,6 +1577,15 @@ static GDExtensionScriptInstancePtr gdextension_object_get_script_instance(GDExt
 	return script_instance_extension->instance;
 }
 
+static void gdextension_object_set_script_instance(GDExtensionObjectPtr p_object, GDExtensionScriptInstancePtr p_script_instance) {
+	ERR_FAIL_NULL(p_object);
+
+	Object *o = (Object *)p_object;
+	ScriptInstance *script_instance = (ScriptInstanceExtension *)p_script_instance;
+
+	o->set_script_instance(script_instance);
+}
+
 #ifndef DISABLE_DEPRECATED
 static void gdextension_callable_custom_create(GDExtensionUninitializedTypePtr r_callable, GDExtensionCallableCustomInfo *p_custom_callable_info) {
 	memnew_placement(r_callable, Callable(memnew(CallableCustomExtension(p_custom_callable_info))));
@@ -1666,7 +1680,10 @@ static void gdextension_editor_help_load_xml_from_utf8_chars(const char *p_data)
 #define REGISTER_INTERFACE_FUNC(m_name) GDExtension::register_interface_function(#m_name, (GDExtensionInterfaceFunctionPtr) & gdextension_##m_name)
 
 void gdextension_setup_interface() {
+#ifndef DISABLE_DEPRECATED
 	REGISTER_INTERFACE_FUNC(get_godot_version);
+#endif // DISABLE_DEPRECATED
+	REGISTER_INTERFACE_FUNC(get_godot_version2);
 	REGISTER_INTERFACE_FUNC(mem_alloc);
 	REGISTER_INTERFACE_FUNC(mem_realloc);
 	REGISTER_INTERFACE_FUNC(mem_free);
@@ -1809,6 +1826,7 @@ void gdextension_setup_interface() {
 	REGISTER_INTERFACE_FUNC(placeholder_script_instance_create);
 	REGISTER_INTERFACE_FUNC(placeholder_script_instance_update);
 	REGISTER_INTERFACE_FUNC(object_get_script_instance);
+	REGISTER_INTERFACE_FUNC(object_set_script_instance);
 #ifndef DISABLE_DEPRECATED
 	REGISTER_INTERFACE_FUNC(callable_custom_create);
 #endif // DISABLE_DEPRECATED
diff --git a/engine/core/extension/gdextension_interface.h b/engine/core/extension/gdextension_interface.h
index ac0181e0..ecd40c86 100644
--- a/engine/core/extension/gdextension_interface.h
+++ b/engine/core/extension/gdextension_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDEXTENSION_INTERFACE_H
-#define GDEXTENSION_INTERFACE_H
+#pragma once
 
 /* This is a C class header, you can copy it and use it directly in your own binders.
  * Together with the JSON file, you should be able to generate any binder.
@@ -401,6 +400,9 @@ typedef struct {
 
 typedef void *GDExtensionClassLibraryPtr;
 
+/* Passed a pointer to a PackedStringArray that should be filled with the classes that may be used by the GDExtension. */
+typedef void (*GDExtensionEditorGetClassesUsedCallback)(GDExtensionTypePtr p_packed_string_array);
+
 /* Method */
 
 typedef enum {
@@ -790,9 +792,22 @@ typedef struct {
 	const char *string;
 } GDExtensionGodotVersion;
 
+typedef struct {
+	uint32_t major;
+	uint32_t minor;
+	uint32_t patch;
+	uint32_t hex; // Full version encoded as hexadecimal with one byte (2 hex digits) per number (e.g. for "3.1.12" it would be 0x03010C)
+	const char *status; // (e.g. "stable", "beta", "rc1", "rc2")
+	const char *build; // (e.g. "custom_build")
+	const char *hash; // Full Git commit hash.
+	uint64_t timestamp; // Git commit date UNIX timestamp in seconds, or 0 if unavailable.
+	const char *string; // (e.g. "Godot v3.1.4.stable.official.mono")
+} GDExtensionGodotVersion2;
+
 /**
  * @name get_godot_version
  * @since 4.1
+ * @deprecated in Godot 4.5. Use `get_godot_version2` instead.
  *
  * Gets the Godot version that the GDExtension was loaded into.
  *
@@ -800,6 +815,16 @@ typedef struct {
  */
 typedef void (*GDExtensionInterfaceGetGodotVersion)(GDExtensionGodotVersion *r_godot_version);
 
+/**
+ * @name get_godot_version2
+ * @since 4.5
+ *
+ * Gets the Godot version that the GDExtension was loaded into.
+ *
+ * @param r_godot_version A pointer to the structure to write the version information into.
+ */
+typedef void (*GDExtensionInterfaceGetGodotVersion2)(GDExtensionGodotVersion2 *r_godot_version);
+
 /* INTERFACE: Memory */
 
 /**
@@ -2721,6 +2746,17 @@ typedef void (*GDExtensionInterfacePlaceHolderScriptInstanceUpdate)(GDExtensionS
  */
 typedef GDExtensionScriptInstanceDataPtr (*GDExtensionInterfaceObjectGetScriptInstance)(GDExtensionConstObjectPtr p_object, GDExtensionObjectPtr p_language);
 
+/**
+ * @name object_set_script_instance
+ * @since 4.5
+ *
+ * Set the script instance data attached to this object.
+ *
+ * @param p_object A pointer to the Object.
+ * @param p_script_instance A pointer to the script instance data to attach to this object.
+ */
+typedef void (*GDExtensionInterfaceObjectSetScriptInstance)(GDExtensionObjectPtr p_object, GDExtensionScriptInstanceDataPtr p_script_instance);
+
 /* INTERFACE: Callable */
 
 /**
@@ -3078,8 +3114,22 @@ typedef void (*GDExtensionsInterfaceEditorHelpLoadXmlFromUtf8Chars)(const char *
  */
 typedef void (*GDExtensionsInterfaceEditorHelpLoadXmlFromUtf8CharsAndLen)(const char *p_data, GDExtensionInt p_size);
 
+/**
+ * @name editor_register_get_classes_used_callback
+ * @since 4.5
+ *
+ * Registers a callback that Godot can call to get the list of all classes (from ClassDB) that may be used by the calling GDExtension.
+ *
+ * This is used by the editor to generate a build profile (in "Tools" > "Engine Compilation Configuration Editor..." > "Detect from project"),
+ * in order to recompile Godot with only the classes used.
+ * In the provided callback, the GDExtension should provide the list of classes that _may_ be used statically, thus the time of invocation shouldn't matter.
+ * If a GDExtension doesn't register a callback, Godot will assume that it could be using any classes.
+ *
+ * @param p_library A pointer the library received by the GDExtension's entry point function.
+ * @param p_callback The callback to retrieve the list of classes used.
+ */
+typedef void (*GDExtensionInterfaceEditorRegisterGetClassesUsedCallback)(GDExtensionClassLibraryPtr p_library, GDExtensionEditorGetClassesUsedCallback p_callback);
+
 #ifdef __cplusplus
 }
 #endif
-
-#endif // GDEXTENSION_INTERFACE_H
diff --git a/engine/core/extension/gdextension_library_loader.cpp b/engine/core/extension/gdextension_library_loader.cpp
index 17200916..1d6be752 100644
--- a/engine/core/extension/gdextension_library_loader.cpp
+++ b/engine/core/extension/gdextension_library_loader.cpp
@@ -307,12 +307,12 @@ Error GDExtensionLibraryLoader::parse_gdextension_file(const String &p_path) {
 
 	bool compatible = true;
 	// Check version lexicographically.
-	if (VERSION_MAJOR != compatibility_minimum[0]) {
-		compatible = VERSION_MAJOR > compatibility_minimum[0];
-	} else if (VERSION_MINOR != compatibility_minimum[1]) {
-		compatible = VERSION_MINOR > compatibility_minimum[1];
+	if (GODOT_VERSION_MAJOR != compatibility_minimum[0]) {
+		compatible = GODOT_VERSION_MAJOR > compatibility_minimum[0];
+	} else if (GODOT_VERSION_MINOR != compatibility_minimum[1]) {
+		compatible = GODOT_VERSION_MINOR > compatibility_minimum[1];
 	} else {
-		compatible = VERSION_PATCH >= compatibility_minimum[2];
+		compatible = GODOT_VERSION_PATCH >= compatibility_minimum[2];
 	}
 	if (!compatible) {
 		ERR_PRINT(vformat("GDExtension only compatible with Godot version %d.%d.%d or later: %s", compatibility_minimum[0], compatibility_minimum[1], compatibility_minimum[2], p_path));
@@ -334,15 +334,15 @@ Error GDExtensionLibraryLoader::parse_gdextension_file(const String &p_path) {
 		}
 
 		compatible = true;
-		if (VERSION_MAJOR != compatibility_maximum[0]) {
-			compatible = VERSION_MAJOR < compatibility_maximum[0];
-		} else if (VERSION_MINOR != compatibility_maximum[1]) {
-			compatible = VERSION_MINOR < compatibility_maximum[1];
+		if (GODOT_VERSION_MAJOR != compatibility_maximum[0]) {
+			compatible = GODOT_VERSION_MAJOR < compatibility_maximum[0];
+		} else if (GODOT_VERSION_MINOR != compatibility_maximum[1]) {
+			compatible = GODOT_VERSION_MINOR < compatibility_maximum[1];
 		}
-#if VERSION_PATCH
+#if GODOT_VERSION_PATCH
 		// #if check to avoid -Wtype-limits warning when 0.
 		else {
-			compatible = VERSION_PATCH <= compatibility_maximum[2];
+			compatible = GODOT_VERSION_PATCH <= compatibility_maximum[2];
 		}
 #endif
 
diff --git a/engine/core/extension/gdextension_library_loader.h b/engine/core/extension/gdextension_library_loader.h
index f781611b..75ad0ebe 100644
--- a/engine/core/extension/gdextension_library_loader.h
+++ b/engine/core/extension/gdextension_library_loader.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDEXTENSION_LIBRARY_LOADER_H
-#define GDEXTENSION_LIBRARY_LOADER_H
+#pragma once
 
 #include <functional>
 
@@ -38,6 +37,8 @@
 #include "core/os/shared_object.h"
 
 class GDExtensionLibraryLoader : public GDExtensionLoader {
+	GDSOFTCLASS(GDExtensionLibraryLoader, GDExtensionLoader);
+
 	friend class GDExtensionManager;
 	friend class GDExtension;
 
@@ -81,5 +82,3 @@ public:
 
 	Error parse_gdextension_file(const String &p_path);
 };
-
-#endif // GDEXTENSION_LIBRARY_LOADER_H
diff --git a/engine/core/extension/gdextension_loader.h b/engine/core/extension/gdextension_loader.h
index 22895503..5d212779 100644
--- a/engine/core/extension/gdextension_loader.h
+++ b/engine/core/extension/gdextension_loader.h
@@ -28,14 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDEXTENSION_LOADER_H
-#define GDEXTENSION_LOADER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
 class GDExtension;
 
 class GDExtensionLoader : public RefCounted {
+	GDSOFTCLASS(GDExtensionLoader, GDExtensionLoader);
+
 public:
 	virtual Error open_library(const String &p_path) = 0;
 	virtual Error initialize(GDExtensionInterfaceGetProcAddress p_get_proc_address, const Ref<GDExtension> &p_extension, GDExtensionInitialization *r_initialization) = 0;
@@ -44,5 +45,3 @@ public:
 	virtual bool has_library_changed() const = 0;
 	virtual bool library_exists() const = 0;
 };
-
-#endif // GDEXTENSION_LOADER_H
diff --git a/engine/core/extension/gdextension_manager.h b/engine/core/extension/gdextension_manager.h
index 39a60047..1523c07c 100644
--- a/engine/core/extension/gdextension_manager.h
+++ b/engine/core/extension/gdextension_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDEXTENSION_MANAGER_H
-#define GDEXTENSION_MANAGER_H
+#pragma once
 
 #include "core/extension/gdextension.h"
 
@@ -92,5 +91,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(GDExtensionManager::LoadStatus)
-
-#endif // GDEXTENSION_MANAGER_H
diff --git a/engine/core/extension/gdextension_special_compat_hashes.h b/engine/core/extension/gdextension_special_compat_hashes.h
index 0d447897..9cfb9208 100644
--- a/engine/core/extension/gdextension_special_compat_hashes.h
+++ b/engine/core/extension/gdextension_special_compat_hashes.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDEXTENSION_SPECIAL_COMPAT_HASHES_H
-#define GDEXTENSION_SPECIAL_COMPAT_HASHES_H
+#pragma once
 
 #ifndef DISABLE_DEPRECATED
 
@@ -58,5 +57,3 @@ public:
 };
 
 #endif // DISABLE_DEPRECATED
-
-#endif // GDEXTENSION_SPECIAL_COMPAT_HASHES_H
diff --git a/engine/core/extension/make_interface_dumper.py b/engine/core/extension/make_interface_dumper.py
index af356882..45f257a3 100644
--- a/engine/core/extension/make_interface_dumper.py
+++ b/engine/core/extension/make_interface_dumper.py
@@ -1,55 +1,37 @@
-import zlib
+import methods
 
 
 def run(target, source, env):
-    src = str(source[0])
-    dst = str(target[0])
-    with open(src, "rb") as f, open(dst, "w", encoding="utf-8", newline="\n") as g:
-        buf = f.read()
-        decomp_size = len(buf)
-
-        # Use maximum zlib compression level to further reduce file size
-        # (at the cost of initial build times).
-        buf = zlib.compress(buf, zlib.Z_BEST_COMPRESSION)
-
-        g.write(
-            """/* THIS FILE IS GENERATED DO NOT EDIT */
-#ifndef GDEXTENSION_INTERFACE_DUMP_H
-#define GDEXTENSION_INTERFACE_DUMP_H
+    buffer = methods.get_buffer(str(source[0]))
+    decomp_size = len(buffer)
+    buffer = methods.compress_buffer(buffer)
 
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write(f"""\
 #ifdef TOOLS_ENABLED
 
 #include "core/io/compression.h"
 #include "core/io/file_access.h"
 #include "core/string/ustring.h"
 
-"""
-        )
+inline constexpr int _gdextension_interface_data_compressed_size = {len(buffer)};
+inline constexpr int _gdextension_interface_data_uncompressed_size = {decomp_size};
+inline constexpr unsigned char _gdextension_interface_data_compressed[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
 
-        g.write("static const int _gdextension_interface_data_compressed_size = " + str(len(buf)) + ";\n")
-        g.write("static const int _gdextension_interface_data_uncompressed_size = " + str(decomp_size) + ";\n")
-        g.write("static const unsigned char _gdextension_interface_data_compressed[] = {\n")
-        for i in range(len(buf)):
-            g.write("\t" + str(buf[i]) + ",\n")
-        g.write("};\n")
-
-        g.write(
-            """
-class GDExtensionInterfaceDump {
-    public:
-        static void generate_gdextension_interface_file(const String &p_path) {
-            Ref<FileAccess> fa = FileAccess::open(p_path, FileAccess::WRITE);
-            ERR_FAIL_COND_MSG(fa.is_null(), vformat("Cannot open file '%s' for writing.", p_path));
-            Vector<uint8_t> data;
-            data.resize(_gdextension_interface_data_uncompressed_size);
-            int ret = Compression::decompress(data.ptrw(), _gdextension_interface_data_uncompressed_size, _gdextension_interface_data_compressed, _gdextension_interface_data_compressed_size, Compression::MODE_DEFLATE);
-            ERR_FAIL_COND_MSG(ret == -1, "Compressed file is corrupt.");
-            fa->store_buffer(data.ptr(), data.size());
-        };
-};
+class GDExtensionInterfaceDump {{
+	public:
+		static void generate_gdextension_interface_file(const String &p_path) {{
+			Ref<FileAccess> fa = FileAccess::open(p_path, FileAccess::WRITE);
+			ERR_FAIL_COND_MSG(fa.is_null(), vformat("Cannot open file '%s' for writing.", p_path));
+			Vector<uint8_t> data;
+			data.resize(_gdextension_interface_data_uncompressed_size);
+			int ret = Compression::decompress(data.ptrw(), _gdextension_interface_data_uncompressed_size, _gdextension_interface_data_compressed, _gdextension_interface_data_compressed_size, Compression::MODE_DEFLATE);
+			ERR_FAIL_COND_MSG(ret == -1, "Compressed file is corrupt.");
+			fa->store_buffer(data.ptr(), data.size());
+		}};
+}};
 
 #endif // TOOLS_ENABLED
-
-#endif // GDEXTENSION_INTERFACE_DUMP_H
-"""
-        )
+""")
diff --git a/engine/core/extension/make_wrappers.py b/engine/core/extension/make_wrappers.py
index 665b6f0f..96936d8c 100644
--- a/engine/core/extension/make_wrappers.py
+++ b/engine/core/extension/make_wrappers.py
@@ -119,10 +119,7 @@ def generate_ex_version(argcount, const=False, returns=False):
 def run(target, source, env):
     max_versions = 12
 
-    txt = """
-#ifndef GDEXTENSION_WRAPPERS_GEN_H
-#define GDEXTENSION_WRAPPERS_GEN_H
-"""
+    txt = "#pragma once"
 
     for i in range(max_versions + 1):
         txt += "\n/* Extension Wrapper " + str(i) + " Arguments */\n"
@@ -138,7 +135,5 @@ def run(target, source, env):
         txt += generate_mod_version(i, True, False)
         txt += generate_mod_version(i, True, True)
 
-    txt += "\n#endif\n"
-
     with open(str(target[0]), "w", encoding="utf-8", newline="\n") as f:
         f.write(txt)
diff --git a/engine/core/input/default_controller_mappings.h b/engine/core/input/default_controller_mappings.h
index 34e7d5d8..6d7c807a 100644
--- a/engine/core/input/default_controller_mappings.h
+++ b/engine/core/input/default_controller_mappings.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEFAULT_CONTROLLER_MAPPINGS_H
-#define DEFAULT_CONTROLLER_MAPPINGS_H
+#pragma once
 
 class DefaultControllerMappings {
 public:
 	static const char *mappings[];
 };
-
-#endif // DEFAULT_CONTROLLER_MAPPINGS_H
diff --git a/engine/core/input/input.cpp b/engine/core/input/input.cpp
index f03b9c05..6b9fec6f 100644
--- a/engine/core/input/input.cpp
+++ b/engine/core/input/input.cpp
@@ -219,7 +219,7 @@ void Input::get_argument_options(const StringName &p_function, int p_idx, List<S
 				continue;
 			}
 
-			String name = pi.name.substr(pi.name.find_char('/') + 1, pi.name.length());
+			String name = pi.name.substr(pi.name.find_char('/') + 1);
 			r_options->push_back(name.quote());
 		}
 	}
@@ -1594,8 +1594,8 @@ void Input::parse_mapping(const String &p_mapping) {
 			continue;
 		}
 
-		String output = entry[idx].get_slice(":", 0).replace(" ", "");
-		String input = entry[idx].get_slice(":", 1).replace(" ", "");
+		String output = entry[idx].get_slicec(':', 0).remove_char(' ');
+		String input = entry[idx].get_slicec(':', 1).remove_char(' ');
 		if (output.length() < 1 || input.length() < 2) {
 			continue;
 		}
diff --git a/engine/core/input/input.h b/engine/core/input/input.h
index bbe185de..8d3b7ae3 100644
--- a/engine/core/input/input.h
+++ b/engine/core/input/input.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INPUT_H
-#define INPUT_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/object/object.h"
@@ -86,7 +85,7 @@ public:
 	typedef void (*EventDispatchFunc)(const Ref<InputEvent> &p_event);
 
 private:
-	BitField<MouseButtonMask> mouse_button_mask;
+	BitField<MouseButtonMask> mouse_button_mask = MouseButtonMask::NONE;
 
 	RBSet<Key> key_label_pressed;
 	RBSet<Key> physical_keys_pressed;
@@ -403,5 +402,3 @@ public:
 
 VARIANT_ENUM_CAST(Input::MouseMode);
 VARIANT_ENUM_CAST(Input::CursorShape);
-
-#endif // INPUT_H
diff --git a/engine/core/input/input_builders.py b/engine/core/input/input_builders.py
index 3685e726..c63f595f 100644
--- a/engine/core/input/input_builders.py
+++ b/engine/core/input/input_builders.py
@@ -2,18 +2,22 @@
 
 from collections import OrderedDict
 
+import methods
+
 
 def make_default_controller_mappings(target, source, env):
-    dst = str(target[0])
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write('#include "core/typedefs.h"\n')
-        g.write('#include "core/input/default_controller_mappings.h"\n')
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write("""\
+#include "core/input/default_controller_mappings.h"
+
+#include "core/typedefs.h"
+
+""")
 
         # ensure mappings have a consistent order
-        platform_mappings: dict = OrderedDict()
-        for src_path in source:
-            with open(str(src_path), "r", encoding="utf-8") as f:
+        platform_mappings = OrderedDict()
+        for src_path in map(str, source):
+            with open(src_path, "r", encoding="utf-8") as f:
                 # read mapping file and skip header
                 mapping_file_lines = f.readlines()[2:]
 
@@ -32,28 +36,28 @@ def make_default_controller_mappings(target, source, env):
                     line_parts = line.split(",")
                     guid = line_parts[0]
                     if guid in platform_mappings[current_platform]:
-                        g.write(
+                        file.write(
                             "// WARNING: DATABASE {} OVERWROTE PRIOR MAPPING: {} {}\n".format(
                                 src_path, current_platform, platform_mappings[current_platform][guid]
                             )
                         )
                     platform_mappings[current_platform][guid] = line
 
-        platform_variables = {
-            "Linux": "#ifdef LINUXBSD_ENABLED",
-            "Windows": "#ifdef WINDOWS_ENABLED",
-            "Mac OS X": "#ifdef MACOS_ENABLED",
-            "Android": "#ifdef ANDROID_ENABLED",
-            "iOS": "#ifdef IOS_ENABLED",
-            "Web": "#ifdef WEB_ENABLED",
+        PLATFORM_VARIABLES = {
+            "Linux": "LINUXBSD",
+            "Windows": "WINDOWS",
+            "Mac OS X": "MACOS",
+            "Android": "ANDROID",
+            "iOS": "IOS",
+            "Web": "WEB",
         }
 
-        g.write("const char* DefaultControllerMappings::mappings[] = {\n")
+        file.write("const char *DefaultControllerMappings::mappings[] = {\n")
         for platform, mappings in platform_mappings.items():
-            variable = platform_variables[platform]
-            g.write("{}\n".format(variable))
+            variable = PLATFORM_VARIABLES[platform]
+            file.write(f"#ifdef {variable}_ENABLED\n")
             for mapping in mappings.values():
-                g.write('\t"{}",\n'.format(mapping))
-            g.write("#endif\n")
+                file.write(f'\t"{mapping}",\n')
+            file.write(f"#endif // {variable}_ENABLED\n")
 
-        g.write("\tnullptr\n};\n")
+        file.write("\tnullptr\n};\n")
diff --git a/engine/core/input/input_enums.h b/engine/core/input/input_enums.h
index 182a5aab..d4efb3d8 100644
--- a/engine/core/input/input_enums.h
+++ b/engine/core/input/input_enums.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INPUT_ENUMS_H
-#define INPUT_ENUMS_H
+#pragma once
 
 #include "core/error/error_macros.h"
 
@@ -138,4 +137,10 @@ inline MouseButtonMask mouse_button_to_mask(MouseButton button) {
 	return MouseButtonMask(1 << ((int)button - 1));
 }
 
-#endif // INPUT_ENUMS_H
+constexpr MouseButtonMask operator|(MouseButtonMask p_a, MouseButtonMask p_b) {
+	return static_cast<MouseButtonMask>(static_cast<int>(p_a) | static_cast<int>(p_b));
+}
+
+constexpr MouseButtonMask &operator|=(MouseButtonMask &p_a, MouseButtonMask p_b) {
+	return p_a = p_a | p_b;
+}
diff --git a/engine/core/input/input_event.cpp b/engine/core/input/input_event.cpp
index 6e8cdc4b..85c35c05 100644
--- a/engine/core/input/input_event.cpp
+++ b/engine/core/input/input_event.cpp
@@ -230,7 +230,7 @@ void InputEventWithModifiers::set_modifiers_from_event(const InputEventWithModif
 }
 
 BitField<KeyModifierMask> InputEventWithModifiers::get_modifiers_mask() const {
-	BitField<KeyModifierMask> mask;
+	BitField<KeyModifierMask> mask = {};
 	if (is_ctrl_pressed()) {
 		mask.set_flag(KeyModifierMask::CTRL);
 	}
@@ -385,11 +385,11 @@ bool InputEventKey::is_echo() const {
 }
 
 Key InputEventKey::get_keycode_with_modifiers() const {
-	return keycode | (int64_t)get_modifiers_mask();
+	return keycode | get_modifiers_mask();
 }
 
 Key InputEventKey::get_physical_keycode_with_modifiers() const {
-	return physical_keycode | (int64_t)get_modifiers_mask();
+	return physical_keycode | get_modifiers_mask();
 }
 
 Key InputEventKey::get_key_label_with_modifiers() const {
diff --git a/engine/core/input/input_event.h b/engine/core/input/input_event.h
index 19176f74..6e308f6c 100644
--- a/engine/core/input/input_event.h
+++ b/engine/core/input/input_event.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INPUT_EVENT_H
-#define INPUT_EVENT_H
+#pragma once
 
 #include "core/input/input_enums.h"
 #include "core/io/resource.h"
@@ -209,7 +208,7 @@ public:
 class InputEventMouse : public InputEventWithModifiers {
 	GDCLASS(InputEventMouse, InputEventWithModifiers);
 
-	BitField<MouseButtonMask> button_mask;
+	BitField<MouseButtonMask> button_mask = MouseButtonMask::NONE;
 
 	Vector2 pos;
 	Vector2 global_pos;
@@ -595,5 +594,3 @@ public:
 
 	InputEventShortcut();
 };
-
-#endif // INPUT_EVENT_H
diff --git a/engine/core/input/input_map.cpp b/engine/core/input/input_map.cpp
index bcd3b63a..ea03c25c 100644
--- a/engine/core/input/input_map.cpp
+++ b/engine/core/input/input_map.cpp
@@ -47,6 +47,8 @@ void InputMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_action", "action", "deadzone"), &InputMap::add_action, DEFVAL(DEFAULT_DEADZONE));
 	ClassDB::bind_method(D_METHOD("erase_action", "action"), &InputMap::erase_action);
 
+	ClassDB::bind_method(D_METHOD("get_action_description", "action"), &InputMap::get_action_description);
+
 	ClassDB::bind_method(D_METHOD("action_set_deadzone", "action", "deadzone"), &InputMap::action_set_deadzone);
 	ClassDB::bind_method(D_METHOD("action_get_deadzone", "action"), &InputMap::action_get_deadzone);
 	ClassDB::bind_method(D_METHOD("action_add_event", "action", "event"), &InputMap::action_add_event);
@@ -106,7 +108,7 @@ void InputMap::get_argument_options(const StringName &p_function, int p_idx, Lis
 				continue;
 			}
 
-			String name = pi.name.substr(pi.name.find_char('/') + 1, pi.name.length());
+			String name = pi.name.substr(pi.name.find_char('/') + 1);
 			r_options->push_back(name.quote());
 		}
 	}
@@ -181,6 +183,25 @@ bool InputMap::has_action(const StringName &p_action) const {
 	return input_map.has(p_action);
 }
 
+String InputMap::get_action_description(const StringName &p_action) const {
+	ERR_FAIL_COND_V_MSG(!input_map.has(p_action), String(), suggest_actions(p_action));
+
+	String ret;
+	const List<Ref<InputEvent>> &inputs = input_map[p_action].inputs;
+	for (Ref<InputEventKey> iek : inputs) {
+		if (iek.is_valid()) {
+			if (!ret.is_empty()) {
+				ret += RTR(" or ");
+			}
+			ret += iek->as_text();
+		}
+	}
+	if (ret.is_empty()) {
+		ret = RTR("Action has no bound inputs");
+	}
+	return ret;
+}
+
 float InputMap::action_get_deadzone(const StringName &p_action) {
 	ERR_FAIL_COND_V_MSG(!input_map.has(p_action), 0.0f, suggest_actions(p_action));
 
@@ -304,7 +325,7 @@ void InputMap::load_from_project_settings() {
 			continue;
 		}
 
-		String name = pi.name.substr(pi.name.find_char('/') + 1, pi.name.length());
+		String name = pi.name.substr(pi.name.find_char('/') + 1);
 
 		Dictionary action = GLOBAL_GET(pi.name);
 		float deadzone = action.has("deadzone") ? (float)action["deadzone"] : DEFAULT_DEADZONE;
@@ -344,6 +365,7 @@ static const _BuiltinActionDisplayName _builtin_action_display_names[] = {
     { "ui_cut",                                        TTRC("Cut") },
     { "ui_copy",                                       TTRC("Copy") },
     { "ui_paste",                                      TTRC("Paste") },
+	{ "ui_focus_mode",                                 TTRC("Toggle Tab Focus Mode") },
     { "ui_undo",                                       TTRC("Undo") },
     { "ui_redo",                                       TTRC("Redo") },
     { "ui_text_completion_query",                      TTRC("Completion Query") },
@@ -397,17 +419,21 @@ static const _BuiltinActionDisplayName _builtin_action_display_names[] = {
     { "ui_text_submit",                                TTRC("Submit Text") },
     { "ui_graph_duplicate",                            TTRC("Duplicate Nodes") },
     { "ui_graph_delete",                               TTRC("Delete Nodes") },
+	{ "ui_graph_follow_left",                          TTRC("Follow Input Port Connection") },
+	{ "ui_graph_follow_right",                         TTRC("Follow Output Port Connection") },
     { "ui_filedialog_up_one_level",                    TTRC("Go Up One Level") },
     { "ui_filedialog_refresh",                         TTRC("Refresh") },
     { "ui_filedialog_show_hidden",                     TTRC("Show Hidden") },
     { "ui_swap_input_direction ",                      TTRC("Swap Input Direction") },
     { "ui_unicode_start",                              TTRC("Start Unicode Character Input") },
+    { "ui_colorpicker_delete_preset",                  TTRC("Toggle License Notices") },
+	{ "ui_accessibility_drag_and_drop",                TTRC("Accessibility: Keyboard Drag and Drop") },
     { "",                                              ""}
 	/* clang-format on */
 };
 
 String InputMap::get_builtin_display_name(const String &p_name) const {
-	int len = sizeof(_builtin_action_display_names) / sizeof(_BuiltinActionDisplayName);
+	constexpr int len = std::size(_builtin_action_display_names);
 
 	for (int i = 0; i < len; i++) {
 		if (_builtin_action_display_names[i].name == p_name) {
@@ -487,6 +513,9 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins() {
 	inputs.push_back(InputEventKey::create_reference(Key::END));
 	default_builtin_cache.insert("ui_end", inputs);
 
+	inputs = List<Ref<InputEvent>>();
+	default_builtin_cache.insert("ui_accessibility_drag_and_drop", inputs);
+
 	// ///// UI basic Shortcuts /////
 
 	inputs = List<Ref<InputEvent>>();
@@ -499,6 +528,10 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins() {
 	inputs.push_back(InputEventKey::create_reference(Key::INSERT | KeyModifierMask::CMD_OR_CTRL));
 	default_builtin_cache.insert("ui_copy", inputs);
 
+	inputs = List<Ref<InputEvent>>();
+	inputs.push_back(InputEventKey::create_reference(Key::M | KeyModifierMask::CTRL));
+	default_builtin_cache.insert("ui_focus_mode", inputs);
+
 	inputs = List<Ref<InputEvent>>();
 	inputs.push_back(InputEventKey::create_reference(Key::V | KeyModifierMask::CMD_OR_CTRL));
 	inputs.push_back(InputEventKey::create_reference(Key::INSERT | KeyModifierMask::SHIFT));
@@ -772,6 +805,22 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins() {
 	inputs.push_back(InputEventKey::create_reference(Key::KEY_DELETE));
 	default_builtin_cache.insert("ui_graph_delete", inputs);
 
+	inputs = List<Ref<InputEvent>>();
+	inputs.push_back(InputEventKey::create_reference(Key::LEFT | KeyModifierMask::CMD_OR_CTRL));
+	default_builtin_cache.insert("ui_graph_follow_left", inputs);
+
+	inputs = List<Ref<InputEvent>>();
+	inputs.push_back(InputEventKey::create_reference(Key::LEFT | KeyModifierMask::ALT));
+	default_builtin_cache.insert("ui_graph_follow_left.macos", inputs);
+
+	inputs = List<Ref<InputEvent>>();
+	inputs.push_back(InputEventKey::create_reference(Key::RIGHT | KeyModifierMask::CMD_OR_CTRL));
+	default_builtin_cache.insert("ui_graph_follow_right", inputs);
+
+	inputs = List<Ref<InputEvent>>();
+	inputs.push_back(InputEventKey::create_reference(Key::RIGHT | KeyModifierMask::ALT));
+	default_builtin_cache.insert("ui_graph_follow_right.macos", inputs);
+
 	// ///// UI File Dialog Shortcuts /////
 	inputs = List<Ref<InputEvent>>();
 	inputs.push_back(InputEventKey::create_reference(Key::BACKSPACE));
@@ -789,6 +838,12 @@ const HashMap<String, List<Ref<InputEvent>>> &InputMap::get_builtins() {
 	inputs.push_back(InputEventKey::create_reference(Key::QUOTELEFT | KeyModifierMask::CMD_OR_CTRL));
 	default_builtin_cache.insert("ui_swap_input_direction", inputs);
 
+	// ///// UI ColorPicker Shortcuts /////
+	inputs = List<Ref<InputEvent>>();
+	inputs.push_back(InputEventJoypadButton::create_reference(JoyButton::X));
+	inputs.push_back(InputEventKey::create_reference(Key::KEY_DELETE));
+	default_builtin_cache.insert("ui_colorpicker_delete_preset", inputs);
+
 	return default_builtin_cache;
 }
 
diff --git a/engine/core/input/input_map.h b/engine/core/input/input_map.h
index 520c10c4..00bc1550 100644
--- a/engine/core/input/input_map.h
+++ b/engine/core/input/input_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INPUT_MAP_H
-#define INPUT_MAP_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/object/class_db.h"
@@ -86,6 +85,8 @@ public:
 	void add_action(const StringName &p_action, float p_deadzone = DEFAULT_DEADZONE);
 	void erase_action(const StringName &p_action);
 
+	String get_action_description(const StringName &p_action) const;
+
 	float action_get_deadzone(const StringName &p_action);
 	void action_set_deadzone(const StringName &p_action, float p_deadzone);
 	void action_add_event(const StringName &p_action, const Ref<InputEvent> &p_event);
@@ -116,5 +117,3 @@ public:
 	InputMap();
 	~InputMap();
 };
-
-#endif // INPUT_MAP_H
diff --git a/engine/core/input/shortcut.h b/engine/core/input/shortcut.h
index 4109e31f..5c054827 100644
--- a/engine/core/input/shortcut.h
+++ b/engine/core/input/shortcut.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHORTCUT_H
-#define SHORTCUT_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/io/resource.h"
@@ -55,5 +54,3 @@ public:
 
 	static bool is_event_array_equal(const Array &p_event_array1, const Array &p_event_array2);
 };
-
-#endif // SHORTCUT_H
diff --git a/engine/core/io/compression.cpp b/engine/core/io/compression.cpp
index 4e4627c4..79f37db1 100644
--- a/engine/core/io/compression.cpp
+++ b/engine/core/io/compression.cpp
@@ -42,6 +42,12 @@
 #include <brotli/decode.h>
 #endif
 
+// Caches for zstd.
+static BinaryMutex mutex;
+static ZSTD_DCtx *current_zstd_d_ctx = nullptr;
+static bool current_zstd_long_distance_matching;
+static int current_zstd_window_log_size;
+
 int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode) {
 	switch (p_mode) {
 		case MODE_BROTLI: {
@@ -187,12 +193,22 @@ int Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p
 			return total;
 		} break;
 		case MODE_ZSTD: {
-			ZSTD_DCtx *dctx = ZSTD_createDCtx();
-			if (zstd_long_distance_matching) {
-				ZSTD_DCtx_setParameter(dctx, ZSTD_d_windowLogMax, zstd_window_log_size);
+			MutexLock lock(mutex);
+
+			if (!current_zstd_d_ctx || current_zstd_long_distance_matching != zstd_long_distance_matching || current_zstd_window_log_size != zstd_window_log_size) {
+				if (current_zstd_d_ctx) {
+					ZSTD_freeDCtx(current_zstd_d_ctx);
+				}
+
+				current_zstd_d_ctx = ZSTD_createDCtx();
+				if (zstd_long_distance_matching) {
+					ZSTD_DCtx_setParameter(current_zstd_d_ctx, ZSTD_d_windowLogMax, zstd_window_log_size);
+				}
+				current_zstd_long_distance_matching = zstd_long_distance_matching;
+				current_zstd_window_log_size = zstd_window_log_size;
 			}
-			int ret = ZSTD_decompressDCtx(dctx, p_dst, p_dst_max_size, p_src, p_src_size);
-			ZSTD_freeDCtx(dctx);
+
+			int ret = ZSTD_decompressDCtx(current_zstd_d_ctx, p_dst, p_dst_max_size, p_src, p_src_size);
 			return ret;
 		} break;
 	}
diff --git a/engine/core/io/compression.h b/engine/core/io/compression.h
index ea56ab8e..08468de9 100644
--- a/engine/core/io/compression.h
+++ b/engine/core/io/compression.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COMPRESSION_H
-#define COMPRESSION_H
+#pragma once
 
 #include "core/templates/vector.h"
 #include "core/typedefs.h"
@@ -56,5 +55,3 @@ public:
 	static int decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_ZSTD);
 	static int decompress_dynamic(Vector<uint8_t> *p_dst_vect, int p_max_dst_size, const uint8_t *p_src, int p_src_size, Mode p_mode);
 };
-
-#endif // COMPRESSION_H
diff --git a/engine/core/io/config_file.h b/engine/core/io/config_file.h
index 05b4ed89..01a860be 100644
--- a/engine/core/io/config_file.h
+++ b/engine/core/io/config_file.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONFIG_FILE_H
-#define CONFIG_FILE_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
@@ -78,5 +77,3 @@ public:
 	Error save_encrypted(const String &p_path, const Vector<uint8_t> &p_key);
 	Error save_encrypted_pass(const String &p_path, const String &p_pass);
 };
-
-#endif // CONFIG_FILE_H
diff --git a/engine/core/io/dir_access.cpp b/engine/core/io/dir_access.cpp
index 4bdfc5a5..02f270da 100644
--- a/engine/core/io/dir_access.cpp
+++ b/engine/core/io/dir_access.cpp
@@ -146,7 +146,7 @@ Error DirAccess::make_dir_recursive(const String &p_dir) {
 		full_dir = p_dir;
 	}
 
-	full_dir = full_dir.replace("\\", "/");
+	full_dir = full_dir.replace_char('\\', '/');
 
 	String base;
 
@@ -336,7 +336,7 @@ Ref<DirAccess> DirAccess::create_temp(const String &p_prefix, bool p_keep, Error
 	uint32_t suffix_i = 0;
 	String path;
 	while (true) {
-		String datetime = Time::get_singleton()->get_datetime_string_from_system().replace("-", "").replace("T", "").replace(":", "");
+		String datetime = Time::get_singleton()->get_datetime_string_from_system().remove_chars("-T:");
 		datetime += itos(Time::get_singleton()->get_ticks_usec());
 		String suffix = datetime + (suffix_i > 0 ? itos(suffix_i) : "");
 		path = (p_prefix.is_empty() ? "" : p_prefix + "-") + suffix;
@@ -626,6 +626,10 @@ bool DirAccess::is_case_sensitive(const String &p_path) const {
 	return true;
 }
 
+bool DirAccess::is_equivalent(const String &p_path_a, const String &p_path_b) const {
+	return p_path_a == p_path_b;
+}
+
 void DirAccess::_bind_methods() {
 	ClassDB::bind_static_method("DirAccess", D_METHOD("open", "path"), &DirAccess::_open);
 	ClassDB::bind_static_method("DirAccess", D_METHOD("get_open_error"), &DirAccess::get_open_error);
@@ -671,6 +675,7 @@ void DirAccess::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_include_hidden"), &DirAccess::get_include_hidden);
 
 	ClassDB::bind_method(D_METHOD("is_case_sensitive", "path"), &DirAccess::is_case_sensitive);
+	ClassDB::bind_method(D_METHOD("is_equivalent", "path_a", "path_b"), &DirAccess::is_equivalent);
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "include_navigational"), "set_include_navigational", "get_include_navigational");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "include_hidden"), "set_include_hidden", "get_include_hidden");
diff --git a/engine/core/io/dir_access.h b/engine/core/io/dir_access.h
index 588e0377..511a414f 100644
--- a/engine/core/io/dir_access.h
+++ b/engine/core/io/dir_access.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIR_ACCESS_H
-#define DIR_ACCESS_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"
@@ -169,10 +168,9 @@ public:
 
 	virtual bool is_case_sensitive(const String &p_path) const;
 	virtual bool is_bundle(const String &p_file) const { return false; }
+	virtual bool is_equivalent(const String &p_path_a, const String &p_path_b) const;
 
 public:
 	DirAccess() {}
 	virtual ~DirAccess();
 };
-
-#endif // DIR_ACCESS_H
diff --git a/engine/core/io/dtls_server.h b/engine/core/io/dtls_server.h
index 5ffed1ec..e22a0eff 100644
--- a/engine/core/io/dtls_server.h
+++ b/engine/core/io/dtls_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DTLS_SERVER_H
-#define DTLS_SERVER_H
+#pragma once
 
 #include "core/io/net_socket.h"
 #include "core/io/packet_peer_dtls.h"
@@ -53,5 +52,3 @@ public:
 
 	DTLSServer() {}
 };
-
-#endif // DTLS_SERVER_H
diff --git a/engine/core/io/file_access.cpp b/engine/core/io/file_access.cpp
index 7d422bf0..68b85cd1 100644
--- a/engine/core/io/file_access.cpp
+++ b/engine/core/io/file_access.cpp
@@ -104,7 +104,7 @@ Ref<FileAccess> FileAccess::create_temp(int p_mode_flags, const String &p_prefix
 	uint32_t suffix_i = 0;
 	String path;
 	while (true) {
-		String datetime = Time::get_singleton()->get_datetime_string_from_system().replace("-", "").replace("T", "").replace(":", "");
+		String datetime = Time::get_singleton()->get_datetime_string_from_system().remove_chars("-T:");
 		datetime += itos(Time::get_singleton()->get_ticks_usec());
 		String suffix = datetime + (suffix_i > 0 ? itos(suffix_i) : "");
 		path = TEMP_DIR.path_join((p_prefix.is_empty() ? "" : p_prefix + "-") + suffix + (extension.is_empty() ? "" : "." + extension));
@@ -259,7 +259,7 @@ FileAccess::AccessType FileAccess::get_access_type() const {
 String FileAccess::fix_path(const String &p_path) const {
 	// Helper used by file accesses that use a single filesystem.
 
-	String r_path = p_path.replace("\\", "/");
+	String r_path = p_path.replace_char('\\', '/');
 
 	switch (_access_type) {
 		case ACCESS_RESOURCES: {
@@ -313,9 +313,15 @@ uint16_t FileAccess::get_16() const {
 	uint16_t data = 0;
 	get_buffer(reinterpret_cast<uint8_t *>(&data), sizeof(uint16_t));
 
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		data = BSWAP16(data);
+	}
+#else
 	if (big_endian) {
 		data = BSWAP16(data);
 	}
+#endif
 
 	return data;
 }
@@ -324,9 +330,15 @@ uint32_t FileAccess::get_32() const {
 	uint32_t data = 0;
 	get_buffer(reinterpret_cast<uint8_t *>(&data), sizeof(uint32_t));
 
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		data = BSWAP32(data);
+	}
+#else
 	if (big_endian) {
 		data = BSWAP32(data);
 	}
+#endif
 
 	return data;
 }
@@ -335,9 +347,15 @@ uint64_t FileAccess::get_64() const {
 	uint64_t data = 0;
 	get_buffer(reinterpret_cast<uint8_t *>(&data), sizeof(uint64_t));
 
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		data = BSWAP64(data);
+	}
+#else
 	if (big_endian) {
 		data = BSWAP64(data);
 	}
+#endif
 
 	return data;
 }
@@ -429,7 +447,7 @@ class CharBuffer {
 public:
 	_FORCE_INLINE_ CharBuffer() :
 			buffer(stack_buffer),
-			capacity(sizeof(stack_buffer) / sizeof(char)) {
+			capacity(std::size(stack_buffer)) {
 	}
 
 	_FORCE_INLINE_ void push_back(char c) {
@@ -565,7 +583,7 @@ String FileAccess::get_as_utf8_string(bool p_skip_cr) const {
 	w[len] = 0;
 
 	String s;
-	s.parse_utf8((const char *)w, len, p_skip_cr);
+	s.append_utf8((const char *)w, len, p_skip_cr);
 	return s;
 }
 
@@ -574,25 +592,43 @@ bool FileAccess::store_8(uint8_t p_dest) {
 }
 
 bool FileAccess::store_16(uint16_t p_dest) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_dest = BSWAP16(p_dest);
+	}
+#else
 	if (big_endian) {
 		p_dest = BSWAP16(p_dest);
 	}
+#endif
 
 	return store_buffer(reinterpret_cast<uint8_t *>(&p_dest), sizeof(uint16_t));
 }
 
 bool FileAccess::store_32(uint32_t p_dest) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_dest = BSWAP32(p_dest);
+	}
+#else
 	if (big_endian) {
 		p_dest = BSWAP32(p_dest);
 	}
+#endif
 
 	return store_buffer(reinterpret_cast<uint8_t *>(&p_dest), sizeof(uint32_t));
 }
 
 bool FileAccess::store_64(uint64_t p_dest) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_dest = BSWAP64(p_dest);
+	}
+#else
 	if (big_endian) {
 		p_dest = BSWAP64(p_dest);
 	}
+#endif
 
 	return store_buffer(reinterpret_cast<uint8_t *>(&p_dest), sizeof(uint64_t));
 }
@@ -629,8 +665,29 @@ uint64_t FileAccess::get_modified_time(const String &p_file) {
 	Ref<FileAccess> fa = create_for_path(p_file);
 	ERR_FAIL_COND_V_MSG(fa.is_null(), 0, vformat("Cannot create FileAccess for path '%s'.", p_file));
 
-	uint64_t mt = fa->_get_modified_time(p_file);
-	return mt;
+	return fa->_get_modified_time(p_file);
+}
+
+uint64_t FileAccess::get_access_time(const String &p_file) {
+	if (PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled() && (PackedData::get_singleton()->has_path(p_file) || PackedData::get_singleton()->has_directory(p_file))) {
+		return 0;
+	}
+
+	Ref<FileAccess> fa = create_for_path(p_file);
+	ERR_FAIL_COND_V_MSG(fa.is_null(), 0, "Cannot create FileAccess for path '" + p_file + "'.");
+
+	return fa->_get_access_time(p_file);
+}
+
+int64_t FileAccess::get_size(const String &p_file) {
+	if (PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled() && (PackedData::get_singleton()->has_path(p_file) || PackedData::get_singleton()->has_directory(p_file))) {
+		return PackedData::get_singleton()->get_size(p_file);
+	}
+
+	Ref<FileAccess> fa = create_for_path(p_file);
+	ERR_FAIL_COND_V_MSG(fa.is_null(), -1, "Cannot create FileAccess for path '" + p_file + "'.");
+
+	return fa->_get_size(p_file);
 }
 
 BitField<FileAccess::UnixPermissionFlags> FileAccess::get_unix_permissions(const String &p_file) {
@@ -723,9 +780,7 @@ String FileAccess::get_pascal_string() {
 	get_buffer((uint8_t *)cs.ptr(), sl);
 	cs[sl] = 0;
 
-	String ret;
-	ret.parse_utf8(cs.ptr(), sl);
-	return ret;
+	return String::utf8(cs.ptr(), sl);
 }
 
 bool FileAccess::store_line(const String &p_line) {
@@ -817,7 +872,7 @@ String FileAccess::get_file_as_string(const String &p_path, Error *r_error) {
 	}
 
 	String ret;
-	ret.parse_utf8((const char *)array.ptr(), array.size());
+	ret.append_utf8((const char *)array.ptr(), array.size());
 	return ret;
 }
 
@@ -931,7 +986,7 @@ void FileAccess::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_float"), &FileAccess::get_float);
 	ClassDB::bind_method(D_METHOD("get_double"), &FileAccess::get_double);
 	ClassDB::bind_method(D_METHOD("get_real"), &FileAccess::get_real);
-	ClassDB::bind_method(D_METHOD("get_buffer", "length"), (Vector<uint8_t>(FileAccess::*)(int64_t) const) & FileAccess::get_buffer);
+	ClassDB::bind_method(D_METHOD("get_buffer", "length"), (Vector<uint8_t> (FileAccess::*)(int64_t) const) & FileAccess::get_buffer);
 	ClassDB::bind_method(D_METHOD("get_line"), &FileAccess::get_line);
 	ClassDB::bind_method(D_METHOD("get_csv_line", "delim"), &FileAccess::get_csv_line, DEFVAL(","));
 	ClassDB::bind_method(D_METHOD("get_as_text", "skip_cr"), &FileAccess::get_as_text, DEFVAL(false));
@@ -950,7 +1005,7 @@ void FileAccess::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("store_float", "value"), &FileAccess::store_float);
 	ClassDB::bind_method(D_METHOD("store_double", "value"), &FileAccess::store_double);
 	ClassDB::bind_method(D_METHOD("store_real", "value"), &FileAccess::store_real);
-	ClassDB::bind_method(D_METHOD("store_buffer", "buffer"), (bool(FileAccess::*)(const Vector<uint8_t> &)) & FileAccess::store_buffer);
+	ClassDB::bind_method(D_METHOD("store_buffer", "buffer"), (bool (FileAccess::*)(const Vector<uint8_t> &))&FileAccess::store_buffer);
 	ClassDB::bind_method(D_METHOD("store_line", "line"), &FileAccess::store_line);
 	ClassDB::bind_method(D_METHOD("store_csv_line", "values", "delim"), &FileAccess::store_csv_line, DEFVAL(","));
 	ClassDB::bind_method(D_METHOD("store_string", "string"), &FileAccess::store_string);
@@ -963,6 +1018,8 @@ void FileAccess::_bind_methods() {
 
 	ClassDB::bind_static_method("FileAccess", D_METHOD("file_exists", "path"), &FileAccess::exists);
 	ClassDB::bind_static_method("FileAccess", D_METHOD("get_modified_time", "file"), &FileAccess::get_modified_time);
+	ClassDB::bind_static_method("FileAccess", D_METHOD("get_access_time", "file"), &FileAccess::get_access_time);
+	ClassDB::bind_static_method("FileAccess", D_METHOD("get_size", "file"), &FileAccess::get_size);
 
 	ClassDB::bind_static_method("FileAccess", D_METHOD("get_unix_permissions", "file"), &FileAccess::get_unix_permissions);
 	ClassDB::bind_static_method("FileAccess", D_METHOD("set_unix_permissions", "file", "permissions"), &FileAccess::set_unix_permissions);
diff --git a/engine/core/io/file_access.h b/engine/core/io/file_access.h
index f53f1f18..1947da85 100644
--- a/engine/core/io/file_access.h
+++ b/engine/core/io/file_access.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_H
-#define FILE_ACCESS_H
+#pragma once
 
 #include "core/io/compression.h"
 #include "core/math/math_defs.h"
@@ -87,7 +86,11 @@ public:
 	typedef void (*FileCloseFailNotify)(const String &);
 
 	typedef Ref<FileAccess> (*CreateFunc)();
+#ifdef BIG_ENDIAN_ENABLED
+	bool big_endian = true;
+#else
 	bool big_endian = false;
+#endif
 	bool real_is_double = false;
 
 	virtual BitField<UnixPermissionFlags> _get_unix_permissions(const String &p_file) = 0;
@@ -105,6 +108,8 @@ protected:
 	virtual String fix_path(const String &p_path) const;
 	virtual Error open_internal(const String &p_path, int p_mode_flags) = 0; ///< open a file
 	virtual uint64_t _get_modified_time(const String &p_file) = 0;
+	virtual uint64_t _get_access_time(const String &p_file) = 0;
+	virtual int64_t _get_size(const String &p_file) = 0;
 	virtual void _set_access_type(AccessType p_access);
 
 	static FileCloseFailNotify close_fail_notify;
@@ -239,6 +244,8 @@ public:
 	static CreateFunc get_create_func(AccessType p_access);
 	static bool exists(const String &p_name); ///< return true if a file exists
 	static uint64_t get_modified_time(const String &p_file);
+	static uint64_t get_access_time(const String &p_file);
+	static int64_t get_size(const String &p_file);
 	static BitField<FileAccess::UnixPermissionFlags> get_unix_permissions(const String &p_file);
 	static Error set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions);
 
@@ -273,5 +280,3 @@ public:
 VARIANT_ENUM_CAST(FileAccess::CompressionMode);
 VARIANT_ENUM_CAST(FileAccess::ModeFlags);
 VARIANT_BITFIELD_CAST(FileAccess::UnixPermissionFlags);
-
-#endif // FILE_ACCESS_H
diff --git a/engine/core/io/file_access_compressed.cpp b/engine/core/io/file_access_compressed.cpp
index b7300ded..da313492 100644
--- a/engine/core/io/file_access_compressed.cpp
+++ b/engine/core/io/file_access_compressed.cpp
@@ -247,7 +247,11 @@ bool FileAccessCompressed::eof_reached() const {
 }
 
 uint64_t FileAccessCompressed::get_buffer(uint8_t *p_dst, uint64_t p_length) const {
-	ERR_FAIL_COND_V(!p_dst && p_length > 0, -1);
+	if (p_length == 0) {
+		return 0;
+	}
+
+	ERR_FAIL_NULL_V(p_dst, -1);
 	ERR_FAIL_COND_V_MSG(f.is_null(), -1, "File must be opened before use.");
 	ERR_FAIL_COND_V_MSG(writing, -1, "File has not been opened in read mode.");
 
@@ -256,29 +260,38 @@ uint64_t FileAccessCompressed::get_buffer(uint8_t *p_dst, uint64_t p_length) con
 		return 0;
 	}
 
-	for (uint64_t i = 0; i < p_length; i++) {
-		p_dst[i] = read_ptr[read_pos];
-		read_pos++;
-		if (read_pos >= read_block_size) {
-			read_block++;
+	uint64_t dst_idx = 0;
+	while (true) {
+		// Copy over as much of our current block as possible.
+		const uint32_t copied_bytes_count = MIN(p_length - dst_idx, read_block_size - read_pos);
+		memcpy(p_dst + dst_idx, read_ptr + read_pos, copied_bytes_count);
+		dst_idx += copied_bytes_count;
+		read_pos += copied_bytes_count;
 
-			if (read_block < read_block_count) {
-				//read another block of compressed data
-				f->get_buffer(comp_buffer.ptrw(), read_blocks[read_block].csize);
-				int ret = Compression::decompress(buffer.ptrw(), read_blocks.size() == 1 ? read_total : block_size, comp_buffer.ptr(), read_blocks[read_block].csize, cmode);
-				ERR_FAIL_COND_V_MSG(ret == -1, -1, "Compressed file is corrupt.");
-				read_block_size = read_block == read_block_count - 1 ? read_total % block_size : block_size;
-				read_pos = 0;
-
-			} else {
-				read_block--;
-				at_end = true;
-				if (i + 1 < p_length) {
-					read_eof = true;
-				}
-				return i + 1;
-			}
+		if (dst_idx == p_length) {
+			// We're done! We read back all that was requested.
+			return p_length;
 		}
+
+		// We're not done yet; try reading the next block.
+		read_block++;
+
+		if (read_block >= read_block_count) {
+			// We're done! We read back the whole file.
+			read_block--;
+			at_end = true;
+			if (dst_idx + 1 < p_length) {
+				read_eof = true;
+			}
+			return dst_idx;
+		}
+
+		// Read the next block of compressed data.
+		f->get_buffer(comp_buffer.ptrw(), read_blocks[read_block].csize);
+		int ret = Compression::decompress(buffer.ptrw(), read_blocks.size() == 1 ? read_total : block_size, comp_buffer.ptr(), read_blocks[read_block].csize, cmode);
+		ERR_FAIL_COND_V_MSG(ret == -1, -1, "Compressed file is corrupt.");
+		read_block_size = read_block == read_block_count - 1 ? read_total % block_size : block_size;
+		read_pos = 0;
 	}
 
 	return p_length;
@@ -332,6 +345,22 @@ uint64_t FileAccessCompressed::_get_modified_time(const String &p_file) {
 	}
 }
 
+uint64_t FileAccessCompressed::_get_access_time(const String &p_file) {
+	if (f.is_valid()) {
+		return f->get_access_time(p_file);
+	} else {
+		return 0;
+	}
+}
+
+int64_t FileAccessCompressed::_get_size(const String &p_file) {
+	if (f.is_valid()) {
+		return f->get_size(p_file);
+	} else {
+		return -1;
+	}
+}
+
 BitField<FileAccess::UnixPermissionFlags> FileAccessCompressed::_get_unix_permissions(const String &p_file) {
 	if (f.is_valid()) {
 		return f->_get_unix_permissions(p_file);
diff --git a/engine/core/io/file_access_compressed.h b/engine/core/io/file_access_compressed.h
index 607a45fc..7c5e6a5f 100644
--- a/engine/core/io/file_access_compressed.h
+++ b/engine/core/io/file_access_compressed.h
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_COMPRESSED_H
-#define FILE_ACCESS_COMPRESSED_H
+#pragma once
 
 #include "core/io/compression.h"
 #include "core/io/file_access.h"
 
 class FileAccessCompressed : public FileAccess {
+	GDSOFTCLASS(FileAccessCompressed, FileAccess);
 	Compression::Mode cmode = Compression::MODE_ZSTD;
 	bool writing = false;
 	uint64_t write_pos = 0;
@@ -94,6 +94,8 @@ public:
 	virtual bool file_exists(const String &p_name) override; ///< return true if a file exists
 
 	virtual uint64_t _get_modified_time(const String &p_file) override;
+	virtual uint64_t _get_access_time(const String &p_file) override;
+	virtual int64_t _get_size(const String &p_file) override;
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override;
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override;
 
@@ -107,5 +109,3 @@ public:
 	FileAccessCompressed() {}
 	virtual ~FileAccessCompressed();
 };
-
-#endif // FILE_ACCESS_COMPRESSED_H
diff --git a/engine/core/io/file_access_encrypted.cpp b/engine/core/io/file_access_encrypted.cpp
index f2749157..7af7737c 100644
--- a/engine/core/io/file_access_encrypted.cpp
+++ b/engine/core/io/file_access_encrypted.cpp
@@ -30,9 +30,17 @@
 
 #include "file_access_encrypted.h"
 
-#include "core/crypto/crypto_core.h"
 #include "core/variant/variant.h"
 
+CryptoCore::RandomGenerator *FileAccessEncrypted::_fae_static_rng = nullptr;
+
+void FileAccessEncrypted::deinitialize() {
+	if (_fae_static_rng) {
+		memdelete(_fae_static_rng);
+		_fae_static_rng = nullptr;
+	}
+}
+
 Error FileAccessEncrypted::open_and_parse(Ref<FileAccess> p_base, const Vector<uint8_t> &p_key, Mode p_mode, bool p_with_magic, const Vector<uint8_t> &p_iv) {
 	ERR_FAIL_COND_V_MSG(file.is_valid(), ERR_ALREADY_IN_USE, vformat("Can't open file while another file from path '%s' is open.", file->get_path_absolute()));
 	ERR_FAIL_COND_V(p_key.size() != 32, ERR_INVALID_PARAMETER);
@@ -48,9 +56,15 @@ Error FileAccessEncrypted::open_and_parse(Ref<FileAccess> p_base, const Vector<u
 		key = p_key;
 		if (p_iv.is_empty()) {
 			iv.resize(16);
-			CryptoCore::RandomGenerator rng;
-			ERR_FAIL_COND_V_MSG(rng.init(), FAILED, "Failed to initialize random number generator.");
-			Error err = rng.get_random_bytes(iv.ptrw(), 16);
+			if (unlikely(!_fae_static_rng)) {
+				_fae_static_rng = memnew(CryptoCore::RandomGenerator);
+				if (_fae_static_rng->init() != OK) {
+					memdelete(_fae_static_rng);
+					_fae_static_rng = nullptr;
+					ERR_FAIL_V_MSG(FAILED, "Failed to initialize random number generator.");
+				}
+			}
+			Error err = _fae_static_rng->get_random_bytes(iv.ptrw(), 16);
 			ERR_FAIL_COND_V(err != OK, err);
 		} else {
 			ERR_FAIL_COND_V(p_iv.size() != 16, ERR_INVALID_PARAMETER);
@@ -265,7 +279,27 @@ bool FileAccessEncrypted::file_exists(const String &p_name) {
 }
 
 uint64_t FileAccessEncrypted::_get_modified_time(const String &p_file) {
-	return 0;
+	if (file.is_valid()) {
+		return file->get_modified_time(p_file);
+	} else {
+		return 0;
+	}
+}
+
+uint64_t FileAccessEncrypted::_get_access_time(const String &p_file) {
+	if (file.is_valid()) {
+		return file->get_access_time(p_file);
+	} else {
+		return 0;
+	}
+}
+
+int64_t FileAccessEncrypted::_get_size(const String &p_file) {
+	if (file.is_valid()) {
+		return file->get_size(p_file);
+	} else {
+		return -1;
+	}
 }
 
 BitField<FileAccess::UnixPermissionFlags> FileAccessEncrypted::_get_unix_permissions(const String &p_file) {
diff --git a/engine/core/io/file_access_encrypted.h b/engine/core/io/file_access_encrypted.h
index 570955b7..15cad3a1 100644
--- a/engine/core/io/file_access_encrypted.h
+++ b/engine/core/io/file_access_encrypted.h
@@ -28,14 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_ENCRYPTED_H
-#define FILE_ACCESS_ENCRYPTED_H
+#pragma once
 
+#include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
 
 #define ENCRYPTED_HEADER_MAGIC 0x43454447
 
 class FileAccessEncrypted : public FileAccess {
+	GDSOFTCLASS(FileAccessEncrypted, FileAccess);
+
 public:
 	enum Mode : int32_t {
 		MODE_READ,
@@ -57,6 +59,8 @@ private:
 
 	void _close();
 
+	static CryptoCore::RandomGenerator *_fae_static_rng;
+
 public:
 	Error open_and_parse(Ref<FileAccess> p_base, const Vector<uint8_t> &p_key, Mode p_mode, bool p_with_magic = true, const Vector<uint8_t> &p_iv = Vector<uint8_t>());
 	Error open_and_parse_password(Ref<FileAccess> p_base, const String &p_key, Mode p_mode);
@@ -87,6 +91,8 @@ public:
 	virtual bool file_exists(const String &p_name) override; ///< return true if a file exists
 
 	virtual uint64_t _get_modified_time(const String &p_file) override;
+	virtual uint64_t _get_access_time(const String &p_file) override;
+	virtual int64_t _get_size(const String &p_file) override;
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override;
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override;
 
@@ -97,8 +103,8 @@ public:
 
 	virtual void close() override;
 
+	static void deinitialize();
+
 	FileAccessEncrypted() {}
 	~FileAccessEncrypted();
 };
-
-#endif // FILE_ACCESS_ENCRYPTED_H
diff --git a/engine/core/io/file_access_memory.h b/engine/core/io/file_access_memory.h
index 6845cf71..2ff638e9 100644
--- a/engine/core/io/file_access_memory.h
+++ b/engine/core/io/file_access_memory.h
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_MEMORY_H
-#define FILE_ACCESS_MEMORY_H
+#pragma once
 
 #include "core/io/file_access.h"
 
 class FileAccessMemory : public FileAccess {
+	GDSOFTCLASS(FileAccessMemory, FileAccess);
 	uint8_t *data = nullptr;
 	uint64_t length = 0;
 	mutable uint64_t pos = 0;
@@ -66,6 +66,9 @@ public:
 	virtual bool file_exists(const String &p_name) override; ///< return true if a file exists
 
 	virtual uint64_t _get_modified_time(const String &p_file) override { return 0; }
+	virtual uint64_t _get_access_time(const String &p_file) override { return 0; }
+	virtual int64_t _get_size(const String &p_file) override { return -1; }
+
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override { return 0; }
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override { return FAILED; }
 
@@ -78,5 +81,3 @@ public:
 
 	FileAccessMemory() {}
 };
-
-#endif // FILE_ACCESS_MEMORY_H
diff --git a/engine/core/io/file_access_pack.cpp b/engine/core/io/file_access_pack.cpp
index 3fba2c70..788825f3 100644
--- a/engine/core/io/file_access_pack.cpp
+++ b/engine/core/io/file_access_pack.cpp
@@ -264,7 +264,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
 	f->get_32(); // patch number, not used for validation.
 
 	ERR_FAIL_COND_V_MSG(version != PACK_FORMAT_VERSION, false, vformat("Pack version unsupported: %d.", version));
-	ERR_FAIL_COND_V_MSG(ver_major > VERSION_MAJOR || (ver_major == VERSION_MAJOR && ver_minor > VERSION_MINOR), false, vformat("Pack created with a newer version of the engine: %d.%d.", ver_major, ver_minor));
+	ERR_FAIL_COND_V_MSG(ver_major > GODOT_VERSION_MAJOR || (ver_major == GODOT_VERSION_MAJOR && ver_minor > GODOT_VERSION_MINOR), false, vformat("Pack created with a newer version of the engine: %d.%d.", ver_major, ver_minor));
 
 	uint32_t pack_flags = f->get_32();
 	uint64_t file_base = f->get_64();
@@ -306,9 +306,7 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files,
 		f->get_buffer((uint8_t *)cs.ptr(), sl);
 		cs[sl] = 0;
 
-		String path;
-		path.parse_utf8(cs.ptr(), sl);
-
+		String path = String::utf8(cs.ptr(), sl);
 		uint64_t ofs = f->get_64();
 		uint64_t size = f->get_64();
 		uint8_t md5[16];
@@ -550,7 +548,7 @@ String DirAccessPack::get_drive(int p_drive) {
 }
 
 PackedData::PackedDir *DirAccessPack::_find_dir(const String &p_dir) {
-	String nd = p_dir.replace("\\", "/");
+	String nd = p_dir.replace_char('\\', '/');
 
 	// Special handling since simplify_path() will forbid it
 	if (p_dir == "..") {
diff --git a/engine/core/io/file_access_pack.h b/engine/core/io/file_access_pack.h
index 0e4e7cd2..9a482db7 100644
--- a/engine/core/io/file_access_pack.h
+++ b/engine/core/io/file_access_pack.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_PACK_H
-#define FILE_ACCESS_PACK_H
+#pragma once
 
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
@@ -127,6 +126,8 @@ public:
 	_FORCE_INLINE_ Ref<FileAccess> try_open_path(const String &p_path);
 	_FORCE_INLINE_ bool has_path(const String &p_path);
 
+	_FORCE_INLINE_ int64_t get_size(const String &p_path);
+
 	_FORCE_INLINE_ Ref<DirAccess> try_open_directory(const String &p_path);
 	_FORCE_INLINE_ bool has_directory(const String &p_path);
 
@@ -156,6 +157,7 @@ public:
 };
 
 class FileAccessPack : public FileAccess {
+	GDSOFTCLASS(FileAccessPack, FileAccess);
 	PackedData::PackedFile pf;
 
 	mutable uint64_t pos;
@@ -165,6 +167,8 @@ class FileAccessPack : public FileAccess {
 	Ref<FileAccess> f;
 	virtual Error open_internal(const String &p_path, int p_mode_flags) override;
 	virtual uint64_t _get_modified_time(const String &p_file) override { return 0; }
+	virtual uint64_t _get_access_time(const String &p_file) override { return 0; }
+	virtual int64_t _get_size(const String &p_file) override { return -1; }
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override { return 0; }
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override { return FAILED; }
 
@@ -200,6 +204,19 @@ public:
 	FileAccessPack(const String &p_path, const PackedData::PackedFile &p_file);
 };
 
+int64_t PackedData::get_size(const String &p_path) {
+	String simplified_path = p_path.simplify_path();
+	PathMD5 pmd5(simplified_path.md5_buffer());
+	HashMap<PathMD5, PackedFile, PathMD5>::Iterator E = files.find(pmd5);
+	if (!E) {
+		return -1; // File not found.
+	}
+	if (E->value.offset == 0) {
+		return -1; // File was erased.
+	}
+	return E->value.size;
+}
+
 Ref<FileAccess> PackedData::try_open_path(const String &p_path) {
 	String simplified_path = p_path.simplify_path().trim_prefix("res://");
 	PathMD5 pmd5(simplified_path.md5_buffer());
@@ -225,6 +242,7 @@ bool PackedData::has_directory(const String &p_path) {
 }
 
 class DirAccessPack : public DirAccess {
+	GDSOFTCLASS(DirAccessPack, DirAccess);
 	PackedData::PackedDir *current;
 
 	List<String> list_dirs;
@@ -272,5 +290,3 @@ Ref<DirAccess> PackedData::try_open_directory(const String &p_path) {
 	}
 	return da;
 }
-
-#endif // FILE_ACCESS_PACK_H
diff --git a/engine/core/io/file_access_zip.h b/engine/core/io/file_access_zip.h
index a1544fee..e1f4439d 100644
--- a/engine/core/io/file_access_zip.h
+++ b/engine/core/io/file_access_zip.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_ZIP_H
-#define FILE_ACCESS_ZIP_H
+#pragma once
 
 #ifdef MINIZIP_ENABLED
 
@@ -74,6 +73,7 @@ public:
 };
 
 class FileAccessZip : public FileAccess {
+	GDSOFTCLASS(FileAccessZip, FileAccess);
 	unzFile zfile = nullptr;
 	unz_file_info64 file_info;
 
@@ -102,7 +102,9 @@ public:
 
 	virtual bool file_exists(const String &p_name) override; ///< return true if a file exists
 
-	virtual uint64_t _get_modified_time(const String &p_file) override { return 0; } // todo
+	virtual uint64_t _get_modified_time(const String &p_file) override { return 0; }
+	virtual uint64_t _get_access_time(const String &p_file) override { return 0; }
+	virtual int64_t _get_size(const String &p_file) override { return -1; }
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override { return 0; }
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override { return FAILED; }
 
@@ -118,5 +120,3 @@ public:
 };
 
 #endif // MINIZIP_ENABLED
-
-#endif // FILE_ACCESS_ZIP_H
diff --git a/engine/core/io/http_client.cpp b/engine/core/io/http_client.cpp
index b7a324e7..c452faf1 100644
--- a/engine/core/io/http_client.cpp
+++ b/engine/core/io/http_client.cpp
@@ -70,10 +70,9 @@ Error HTTPClient::_request(Method p_method, const String &p_url, const Vector<St
 
 String HTTPClient::query_string_from_dict(const Dictionary &p_dict) {
 	String query = "";
-	Array keys = p_dict.keys();
-	for (int i = 0; i < keys.size(); ++i) {
-		String encoded_key = String(keys[i]).uri_encode();
-		const Variant &value = p_dict[keys[i]];
+	for (const KeyValue<Variant, Variant> &kv : p_dict) {
+		String encoded_key = String(kv.key).uri_encode();
+		const Variant &value = kv.value;
 		switch (value.get_type()) {
 			case Variant::ARRAY: {
 				// Repeat the key with every values
@@ -118,7 +117,7 @@ Dictionary HTTPClient::_get_response_headers_as_dictionary() {
 			continue;
 		}
 		String key = s.substr(0, sp).strip_edges();
-		String value = s.substr(sp + 1, s.length()).strip_edges();
+		String value = s.substr(sp + 1).strip_edges();
 		ret[key] = value;
 	}
 
diff --git a/engine/core/io/http_client.h b/engine/core/io/http_client.h
index 59452911..fe2f2df2 100644
--- a/engine/core/io/http_client.h
+++ b/engine/core/io/http_client.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HTTP_CLIENT_H
-#define HTTP_CLIENT_H
+#pragma once
 
 #include "core/crypto/crypto.h"
 #include "core/io/ip.h"
@@ -205,5 +204,3 @@ public:
 VARIANT_ENUM_CAST(HTTPClient::ResponseCode)
 VARIANT_ENUM_CAST(HTTPClient::Method);
 VARIANT_ENUM_CAST(HTTPClient::Status);
-
-#endif // HTTP_CLIENT_H
diff --git a/engine/core/io/http_client_tcp.cpp b/engine/core/io/http_client_tcp.cpp
index 3147b59c..f6495585 100644
--- a/engine/core/io/http_client_tcp.cpp
+++ b/engine/core/io/http_client_tcp.cpp
@@ -50,13 +50,13 @@ Error HTTPClientTCP::connect_to_host(const String &p_host, int p_port, Ref<TLSOp
 
 	String host_lower = conn_host.to_lower();
 	if (host_lower.begins_with("http://")) {
-		conn_host = conn_host.substr(7, conn_host.length() - 7);
+		conn_host = conn_host.substr(7);
 		tls_options.unref();
 	} else if (host_lower.begins_with("https://")) {
 		if (tls_options.is_null()) {
 			tls_options = TLSOptions::client();
 		}
-		conn_host = conn_host.substr(8, conn_host.length() - 8);
+		conn_host = conn_host.substr(8);
 	}
 
 	ERR_FAIL_COND_V(tls_options.is_valid() && tls_options->is_server(), ERR_INVALID_PARAMETER);
@@ -196,7 +196,7 @@ Error HTTPClientTCP::request(Method p_method, const String &p_url, const Vector<
 		// Should it add utf8 encoding?
 	}
 	if (add_uagent) {
-		request += "User-Agent: GodotEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n";
+		request += "User-Agent: GodotEngine/" + String(GODOT_VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n";
 	}
 	if (add_accept) {
 		request += "Accept: */*\r\n";
@@ -483,8 +483,7 @@ Error HTTPClientTCP::poll() {
 						(rs >= 4 && response_str[rs - 4] == '\r' && response_str[rs - 3] == '\n' && response_str[rs - 2] == '\r' && response_str[rs - 1] == '\n')) {
 					// End of response, parse.
 					response_str.push_back(0);
-					String response;
-					response.parse_utf8((const char *)response_str.ptr(), response_str.size());
+					String response = String::utf8((const char *)response_str.ptr(), response_str.size());
 					Vector<String> responses = response.split("\n");
 					body_size = -1;
 					chunked = false;
@@ -508,11 +507,11 @@ Error HTTPClientTCP::poll() {
 							continue;
 						}
 						if (s.begins_with("content-length:")) {
-							body_size = s.substr(s.find_char(':') + 1, s.length()).strip_edges().to_int();
+							body_size = s.substr(s.find_char(':') + 1).strip_edges().to_int();
 							body_left = body_size;
 
 						} else if (s.begins_with("transfer-encoding:")) {
-							String encoding = header.substr(header.find_char(':') + 1, header.length()).strip_edges();
+							String encoding = header.substr(header.find_char(':') + 1).strip_edges();
 							if (encoding == "chunked") {
 								chunked = true;
 							}
diff --git a/engine/core/io/http_client_tcp.h b/engine/core/io/http_client_tcp.h
index dd6cc6b8..4e4db3ac 100644
--- a/engine/core/io/http_client_tcp.h
+++ b/engine/core/io/http_client_tcp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HTTP_CLIENT_TCP_H
-#define HTTP_CLIENT_TCP_H
+#pragma once
 
 #include "http_client.h"
 
@@ -100,5 +99,3 @@ public:
 	void set_https_proxy(const String &p_host, int p_port) override;
 	HTTPClientTCP();
 };
-
-#endif // HTTP_CLIENT_TCP_H
diff --git a/engine/core/io/image.cpp b/engine/core/io/image.cpp
index 45f9599c..857a9ec6 100644
--- a/engine/core/io/image.cpp
+++ b/engine/core/io/image.cpp
@@ -31,7 +31,6 @@
 #include "image.h"
 
 #include "core/config/project_settings.h"
-#include "core/error/error_list.h"
 #include "core/error/error_macros.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
@@ -89,11 +88,13 @@ SavePNGFunc Image::save_png_func = nullptr;
 SaveJPGFunc Image::save_jpg_func = nullptr;
 SaveEXRFunc Image::save_exr_func = nullptr;
 SaveWebPFunc Image::save_webp_func = nullptr;
+SaveDDSFunc Image::save_dds_func = nullptr;
 
 SavePNGBufferFunc Image::save_png_buffer_func = nullptr;
 SaveJPGBufferFunc Image::save_jpg_buffer_func = nullptr;
 SaveEXRBufferFunc Image::save_exr_buffer_func = nullptr;
 SaveWebPBufferFunc Image::save_webp_buffer_func = nullptr;
+SaveDDSBufferFunc Image::save_dds_buffer_func = nullptr;
 
 // External loader function pointers.
 
@@ -105,6 +106,7 @@ ImageMemLoadFunc Image::_tga_mem_loader_func = nullptr;
 ImageMemLoadFunc Image::_bmp_mem_loader_func = nullptr;
 ScalableImageMemLoadFunc Image::_svg_scalable_mem_loader_func = nullptr;
 ImageMemLoadFunc Image::_ktx_mem_loader_func = nullptr;
+ImageMemLoadFunc Image::_dds_mem_loader_func = nullptr;
 
 // External VRAM compression function pointers.
 
@@ -571,7 +573,7 @@ static bool _are_formats_compatible(Image::Format p_format0, Image::Format p_for
 void Image::convert(Format p_new_format) {
 	ERR_FAIL_INDEX_MSG(p_new_format, FORMAT_MAX, vformat("The Image format specified (%d) is out of range. See Image's Format enum.", p_new_format));
 
-	if (data.size() == 0 || p_new_format == format) {
+	if (data.is_empty() || p_new_format == format) {
 		return;
 	}
 
@@ -796,7 +798,7 @@ Image::Format Image::get_format() const {
 }
 
 static double _bicubic_interp_kernel(double x) {
-	x = ABS(x);
+	x = Math::abs(x);
 
 	double bc = 0;
 
@@ -1139,7 +1141,7 @@ bool Image::is_size_po2() const {
 }
 
 void Image::resize_to_po2(bool p_square, Interpolation p_interpolation) {
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot resize in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot resize in compressed image formats.");
 
 	int w = next_power_of_2(width);
 	int h = next_power_of_2(height);
@@ -1158,7 +1160,7 @@ void Image::resize_to_po2(bool p_square, Interpolation p_interpolation) {
 
 void Image::resize(int p_width, int p_height, Interpolation p_interpolation) {
 	ERR_FAIL_COND_MSG(data.is_empty(), "Cannot resize image before creating it, use set_data() first.");
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot resize in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot resize in compressed image formats.");
 
 	bool mipmap_aware = p_interpolation == INTERPOLATE_TRILINEAR /* || p_interpolation == INTERPOLATE_TRICUBIC */;
 
@@ -1461,8 +1463,7 @@ void Image::resize(int p_width, int p_height, Interpolation p_interpolation) {
 }
 
 void Image::crop_from_point(int p_x, int p_y, int p_width, int p_height) {
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot crop in compressed or custom image formats.");
-
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot crop in compressed image formats.");
 	ERR_FAIL_COND_MSG(p_x < 0, "Start x position cannot be smaller than 0.");
 	ERR_FAIL_COND_MSG(p_y < 0, "Start y position cannot be smaller than 0.");
 	ERR_FAIL_COND_MSG(p_width <= 0, "Width of image must be greater than 0.");
@@ -1515,7 +1516,7 @@ void Image::crop(int p_width, int p_height) {
 }
 
 void Image::rotate_90(ClockDirection p_direction) {
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot rotate in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot rotate in compressed image formats.");
 	ERR_FAIL_COND_MSG(width <= 0, vformat("The Image width specified (%d pixels) must be greater than 0 pixels.", width));
 	ERR_FAIL_COND_MSG(height <= 0, vformat("The Image height specified (%d pixels) must be greater than 0 pixels.", height));
 
@@ -1633,7 +1634,7 @@ void Image::rotate_90(ClockDirection p_direction) {
 }
 
 void Image::rotate_180() {
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot rotate in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot rotate in compressed image formats.");
 	ERR_FAIL_COND_MSG(width <= 0, vformat("The Image width specified (%d pixels) must be greater than 0 pixels.", width));
 	ERR_FAIL_COND_MSG(height <= 0, vformat("The Image height specified (%d pixels) must be greater than 0 pixels.", height));
 
@@ -1667,7 +1668,7 @@ void Image::rotate_180() {
 }
 
 void Image::flip_y() {
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot flip_y in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot flip_y in compressed image formats.");
 
 	bool used_mipmaps = has_mipmaps();
 	if (used_mipmaps) {
@@ -1697,7 +1698,7 @@ void Image::flip_y() {
 }
 
 void Image::flip_x() {
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot flip_x in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot flip_x in compressed image formats.");
 
 	bool used_mipmaps = has_mipmaps();
 	if (used_mipmaps) {
@@ -1789,10 +1790,6 @@ int64_t Image::_get_dst_image_size(int p_width, int p_height, Format p_format, i
 	return size;
 }
 
-bool Image::_can_modify(Format p_format) const {
-	return !Image::is_format_compressed(p_format);
-}
-
 template <typename Component, int CC, bool renormalize,
 		void (*average_func)(Component &, const Component &, const Component &, const Component &, const Component &),
 		void (*renormalize_func)(Component *)>
@@ -1926,7 +1923,7 @@ void Image::shrink_x2() {
 		memcpy(new_data.ptrw(), data.ptr() + ofs, new_size);
 	} else {
 		// Generate a mipmap and replace the original.
-		ERR_FAIL_COND(!_can_modify(format));
+		ERR_FAIL_COND(is_compressed());
 
 		new_data.resize((width / 2) * (height / 2) * get_format_pixel_size(format));
 		ERR_FAIL_COND(data.is_empty() || new_data.is_empty());
@@ -1963,7 +1960,7 @@ void Image::normalize() {
 }
 
 Error Image::generate_mipmaps(bool p_renormalize) {
-	ERR_FAIL_COND_V_MSG(!_can_modify(format), ERR_UNAVAILABLE, "Cannot generate mipmaps in compressed or custom image formats.");
+	ERR_FAIL_COND_V_MSG(is_compressed(), ERR_UNAVAILABLE, "Cannot generate mipmaps from compressed image formats.");
 	ERR_FAIL_COND_V_MSG(format == FORMAT_RGBA4444, ERR_UNAVAILABLE, "Cannot generate mipmaps from RGBA4444 format.");
 	ERR_FAIL_COND_V_MSG(width == 0 || height == 0, ERR_UNCONFIGURED, "Cannot generate mipmaps with width or height equal to 0.");
 
@@ -2180,7 +2177,7 @@ void Image::clear_mipmaps() {
 }
 
 bool Image::is_empty() const {
-	return (data.size() == 0);
+	return (data.is_empty());
 }
 
 Vector<uint8_t> Image::get_data() const {
@@ -2297,7 +2294,7 @@ void Image::initialize_data(const char **p_xpm) {
 		switch (status) {
 			case READING_HEADER: {
 				String line_str = line_ptr;
-				line_str.replace("\t", " ");
+				line_str.replace_char('\t', ' ');
 
 				size_width = line_str.get_slicec(' ', 0).to_int();
 				size_height = line_str.get_slicec(' ', 1).to_int();
@@ -2441,47 +2438,75 @@ void Image::initialize_data(const char **p_xpm) {
 	}
 
 bool Image::is_invisible() const {
-	if (format == FORMAT_L8 || format == FORMAT_RGB8 || format == FORMAT_RG8) {
-		return false;
-	}
-
-	int64_t len = data.size();
+	int w, h;
+	int64_t len;
+	_get_mipmap_offset_and_size(1, len, w, h);
 
 	if (len == 0) {
 		return true;
 	}
 
-	int w, h;
-	_get_mipmap_offset_and_size(1, len, w, h);
-
-	const uint8_t *r = data.ptr();
-	const unsigned char *data_ptr = r;
-
-	bool detected = false;
-
 	switch (format) {
 		case FORMAT_LA8: {
-			for (int i = 0; i < (len >> 1); i++) {
-				DETECT_NON_ALPHA(data_ptr[(i << 1) + 1]);
-			}
+			const int pixel_count = len / 2;
+			const uint16_t *pixeldata = reinterpret_cast<const uint16_t *>(data.ptr());
 
+			for (int i = 0; i < pixel_count; i++) {
+				if ((pixeldata[i] & 0xFF00) != 0) {
+					return false;
+				}
+			}
 		} break;
 		case FORMAT_RGBA8: {
-			for (int i = 0; i < (len >> 2); i++) {
-				DETECT_NON_ALPHA(data_ptr[(i << 2) + 3])
+			const int pixel_count = len / 4;
+			const uint32_t *pixeldata = reinterpret_cast<const uint32_t *>(data.ptr());
+
+			for (int i = 0; i < pixel_count; i++) {
+				if ((pixeldata[i] & 0xFF000000) != 0) {
+					return false;
+				}
 			}
-
 		} break;
+		case FORMAT_RGBA4444: {
+			const int pixel_count = len / 2;
+			const uint16_t *pixeldata = reinterpret_cast<const uint16_t *>(data.ptr());
 
-		case FORMAT_DXT3:
-		case FORMAT_DXT5: {
-			detected = true;
+			for (int i = 0; i < pixel_count; i++) {
+				if ((pixeldata[i] & 0x000F) != 0) {
+					return false;
+				}
+			}
+		} break;
+		case FORMAT_RGBAH: {
+			// The alpha mask accounts for the sign bit.
+			const int pixel_count = len / 4;
+			const uint16_t *pixeldata = reinterpret_cast<const uint16_t *>(data.ptr());
+
+			for (int i = 0; i < pixel_count; i += 4) {
+				if ((pixeldata[i + 3] & 0x7FFF) != 0) {
+					return false;
+				}
+			}
+		} break;
+		case FORMAT_RGBAF: {
+			// The alpha mask accounts for the sign bit.
+			const int pixel_count = len / 4;
+			const uint32_t *pixeldata = reinterpret_cast<const uint32_t *>(data.ptr());
+
+			for (int i = 0; i < pixel_count; i += 4) {
+				if ((pixeldata[i + 3] & 0x7FFFFFFF) != 0) {
+					return false;
+				}
+			}
 		} break;
 		default: {
+			// Formats that are compressed or don't support alpha channels are presumed to be visible.
+			return false;
 		}
 	}
 
-	return !detected;
+	// Every pixel has been checked, the image is invisible.
+	return true;
 }
 
 Image::AlphaMode Image::detect_alpha() const {
@@ -2603,6 +2628,21 @@ Vector<uint8_t> Image::save_exr_to_buffer(bool p_grayscale) const {
 	return save_exr_buffer_func(Ref<Image>((Image *)this), p_grayscale);
 }
 
+Error Image::save_dds(const String &p_path) const {
+	if (save_dds_func == nullptr) {
+		return ERR_UNAVAILABLE;
+	}
+
+	return save_dds_func(p_path, Ref<Image>((Image *)this));
+}
+
+Vector<uint8_t> Image::save_dds_to_buffer() const {
+	if (save_dds_buffer_func == nullptr) {
+		return Vector<uint8_t>();
+	}
+	return save_dds_buffer_func(Ref<Image>((Image *)this));
+}
+
 Error Image::save_webp(const String &p_path, const bool p_lossy, const float p_quality) const {
 	if (save_webp_func == nullptr) {
 		return ERR_UNAVAILABLE;
@@ -2682,6 +2722,19 @@ Error Image::decompress() {
 	return OK;
 }
 
+bool Image::can_decompress(const String &p_format_tag) {
+	if (p_format_tag == "astc") {
+		return _image_decompress_astc != nullptr;
+	} else if (p_format_tag == "bptc") {
+		return _image_decompress_bptc != nullptr;
+	} else if (p_format_tag == "etc2") {
+		return _image_decompress_etc2 != nullptr;
+	} else if (p_format_tag == "s3tc") {
+		return _image_decompress_bc != nullptr;
+	}
+	return false;
+}
+
 Error Image::compress(CompressMode p_mode, CompressSource p_source, ASTCFormat p_astc_format) {
 	ERR_FAIL_INDEX_V_MSG(p_mode, COMPRESS_MAX, ERR_INVALID_PARAMETER, "Invalid compress mode.");
 	ERR_FAIL_INDEX_V_MSG(p_source, COMPRESS_SOURCE_MAX, ERR_INVALID_PARAMETER, "Invalid compress source.");
@@ -2863,7 +2916,7 @@ void Image::blit_rect(const Ref<Image> &p_src, const Rect2i &p_src_rect, const P
 	ERR_FAIL_COND(dsize == 0);
 	ERR_FAIL_COND(srcdsize == 0);
 	ERR_FAIL_COND(format != p_src->format);
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot blit_rect in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot blit_rect in compressed image formats.");
 
 	Rect2i src_rect;
 	Rect2i dest_rect;
@@ -3043,10 +3096,10 @@ void Image::_repeat_pixel_over_subsequent_memory(uint8_t *p_pixel, int p_pixel_s
 }
 
 void Image::fill(const Color &p_color) {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return;
 	}
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot fill in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot fill in compressed image formats.");
 
 	uint8_t *dst_data_ptr = data.ptrw();
 
@@ -3059,10 +3112,10 @@ void Image::fill(const Color &p_color) {
 }
 
 void Image::fill_rect(const Rect2i &p_rect, const Color &p_color) {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return;
 	}
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot fill rect in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot fill rect in compressed image formats.");
 
 	Rect2i r = Rect2i(0, 0, width, height).intersection(p_rect.abs());
 	if (!r.has_area()) {
@@ -3278,7 +3331,7 @@ void Image::_set_color_at_ofs(uint8_t *ptr, uint32_t ofs, const Color &p_color)
 			uint16_t rgba = 0;
 
 			rgba = uint16_t(CLAMP(p_color.r * 31.0, 0, 31));
-			rgba |= uint16_t(CLAMP(p_color.g * 63.0, 0, 33)) << 5;
+			rgba |= uint16_t(CLAMP(p_color.g * 63.0, 0, 63)) << 5;
 			rgba |= uint16_t(CLAMP(p_color.b * 31.0, 0, 31)) << 11;
 
 			((uint16_t *)ptr)[ofs] = rgba;
@@ -3366,7 +3419,7 @@ int64_t Image::get_data_size() const {
 }
 
 void Image::adjust_bcs(float p_brightness, float p_contrast, float p_saturation) {
-	ERR_FAIL_COND_MSG(!_can_modify(format), "Cannot adjust_bcs in compressed or custom image formats.");
+	ERR_FAIL_COND_MSG(is_compressed(), "Cannot adjust_bcs in compressed image formats.");
 
 	uint8_t *w = data.ptrw();
 	uint32_t pixel_size = get_format_pixel_size(format);
@@ -3524,6 +3577,9 @@ void Image::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("save_jpg_to_buffer", "quality"), &Image::save_jpg_to_buffer, DEFVAL(0.75));
 	ClassDB::bind_method(D_METHOD("save_exr", "path", "grayscale"), &Image::save_exr, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("save_exr_to_buffer", "grayscale"), &Image::save_exr_to_buffer, DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("save_dds", "path"), &Image::save_dds);
+	ClassDB::bind_method(D_METHOD("save_dds_to_buffer"), &Image::save_dds_to_buffer);
+
 	ClassDB::bind_method(D_METHOD("save_webp", "path", "lossy", "quality"), &Image::save_webp, DEFVAL(false), DEFVAL(0.75f));
 	ClassDB::bind_method(D_METHOD("save_webp_to_buffer", "lossy", "quality"), &Image::save_webp_to_buffer, DEFVAL(false), DEFVAL(0.75f));
 
@@ -3577,6 +3633,7 @@ void Image::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("load_tga_from_buffer", "buffer"), &Image::load_tga_from_buffer);
 	ClassDB::bind_method(D_METHOD("load_bmp_from_buffer", "buffer"), &Image::load_bmp_from_buffer);
 	ClassDB::bind_method(D_METHOD("load_ktx_from_buffer", "buffer"), &Image::load_ktx_from_buffer);
+	ClassDB::bind_method(D_METHOD("load_dds_from_buffer", "buffer"), &Image::load_dds_from_buffer);
 
 	ClassDB::bind_method(D_METHOD("load_svg_from_buffer", "buffer", "scale"), &Image::load_svg_from_buffer, DEFVAL(1.0));
 	ClassDB::bind_method(D_METHOD("load_svg_from_string", "svg_str", "scale"), &Image::load_svg_from_string, DEFVAL(1.0));
@@ -3677,7 +3734,7 @@ void Image::normal_map_to_xy() {
 }
 
 Ref<Image> Image::rgbe_to_srgb() {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return Ref<Image>();
 	}
 
@@ -3724,7 +3781,7 @@ Ref<Image> Image::get_image_from_mipmap(int p_mipmap) const {
 }
 
 void Image::bump_map_to_normal_map(float bump_scale) {
-	ERR_FAIL_COND(!_can_modify(format));
+	ERR_FAIL_COND(is_compressed());
 	clear_mipmaps();
 	convert(Image::FORMAT_RF);
 
@@ -3799,7 +3856,7 @@ bool Image::detect_signed(bool p_include_mips) const {
 }
 
 void Image::srgb_to_linear() {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return;
 	}
 
@@ -3830,7 +3887,7 @@ void Image::srgb_to_linear() {
 }
 
 void Image::linear_to_srgb() {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return;
 	}
 
@@ -3861,7 +3918,7 @@ void Image::linear_to_srgb() {
 }
 
 void Image::premultiply_alpha() {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return;
 	}
 
@@ -3883,7 +3940,7 @@ void Image::premultiply_alpha() {
 }
 
 void Image::fix_alpha_edges() {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return;
 	}
 
@@ -4072,6 +4129,14 @@ Error Image::load_bmp_from_buffer(const Vector<uint8_t> &p_array) {
 	return _load_from_buffer(p_array, _bmp_mem_loader_func);
 }
 
+Error Image::load_dds_from_buffer(const Vector<uint8_t> &p_array) {
+	ERR_FAIL_NULL_V_MSG(
+			_dds_mem_loader_func,
+			ERR_UNAVAILABLE,
+			"The DDS module isn't enabled. Recompile the Godot editor or export template binary with the `module_dds_enabled=yes` SCons option.");
+	return _load_from_buffer(p_array, _dds_mem_loader_func);
+}
+
 Error Image::load_svg_from_buffer(const Vector<uint8_t> &p_array, float scale) {
 	ERR_FAIL_NULL_V_MSG(
 			_svg_scalable_mem_loader_func,
@@ -4266,10 +4331,10 @@ Dictionary Image::compute_image_metrics(const Ref<Image> p_compared_image, bool
 	// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 	Dictionary result;
-	result["max"] = INFINITY;
-	result["mean"] = INFINITY;
-	result["mean_squared"] = INFINITY;
-	result["root_mean_squared"] = INFINITY;
+	result["max"] = Math::INF;
+	result["mean"] = Math::INF;
+	result["mean_squared"] = Math::INF;
+	result["root_mean_squared"] = Math::INF;
 	result["peak_snr"] = 0.0f;
 
 	ERR_FAIL_COND_V(p_compared_image.is_null(), result);
diff --git a/engine/core/io/image.h b/engine/core/io/image.h
index 992c4359..3cb57a3a 100644
--- a/engine/core/io/image.h
+++ b/engine/core/io/image.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_H
-#define IMAGE_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/math/color.h"
@@ -59,6 +58,9 @@ typedef Vector<uint8_t> (*SaveWebPBufferFunc)(const Ref<Image> &p_img, const boo
 typedef Error (*SaveEXRFunc)(const String &p_path, const Ref<Image> &p_img, bool p_grayscale);
 typedef Vector<uint8_t> (*SaveEXRBufferFunc)(const Ref<Image> &p_img, bool p_grayscale);
 
+typedef Error (*SaveDDSFunc)(const String &p_path, const Ref<Image> &p_img);
+typedef Vector<uint8_t> (*SaveDDSBufferFunc)(const Ref<Image> &p_img);
+
 class Image : public Resource {
 	GDCLASS(Image, Resource);
 
@@ -186,10 +188,12 @@ public:
 	static SaveJPGFunc save_jpg_func;
 	static SaveEXRFunc save_exr_func;
 	static SaveWebPFunc save_webp_func;
+	static SaveDDSFunc save_dds_func;
 	static SavePNGBufferFunc save_png_buffer_func;
 	static SaveEXRBufferFunc save_exr_buffer_func;
 	static SaveJPGBufferFunc save_jpg_buffer_func;
 	static SaveWebPBufferFunc save_webp_buffer_func;
+	static SaveDDSBufferFunc save_dds_buffer_func;
 
 	// External loader function pointers.
 
@@ -201,6 +205,7 @@ public:
 	static ImageMemLoadFunc _bmp_mem_loader_func;
 	static ScalableImageMemLoadFunc _svg_scalable_mem_loader_func;
 	static ImageMemLoadFunc _ktx_mem_loader_func;
+	static ImageMemLoadFunc _dds_mem_loader_func;
 
 	// External VRAM compression function pointers.
 
@@ -251,7 +256,6 @@ private:
 	_FORCE_INLINE_ void _get_mipmap_offset_and_size(int p_mipmap, int64_t &r_offset, int &r_width, int &r_height) const; // Get where the mipmap begins in data.
 
 	static int64_t _get_dst_image_size(int p_width, int p_height, Format p_format, int &r_mipmaps, int p_mipmaps = -1, int *r_mm_width = nullptr, int *r_mm_height = nullptr);
-	bool _can_modify(Format p_format) const;
 
 	_FORCE_INLINE_ void _get_clipped_src_and_dest_rects(const Ref<Image> &p_src, const Rect2i &p_src_rect, const Point2i &p_dest, Rect2i &r_clipped_src_rect, Rect2i &r_clipped_dest_rect) const;
 
@@ -334,9 +338,11 @@ public:
 	static Ref<Image> load_from_file(const String &p_path);
 	Error save_png(const String &p_path) const;
 	Error save_jpg(const String &p_path, float p_quality = 0.75) const;
+	Error save_dds(const String &p_path) const;
 	Vector<uint8_t> save_png_to_buffer() const;
 	Vector<uint8_t> save_jpg_to_buffer(float p_quality = 0.75) const;
 	Vector<uint8_t> save_exr_to_buffer(bool p_grayscale = false) const;
+	Vector<uint8_t> save_dds_to_buffer() const;
 	Error save_exr(const String &p_path, bool p_grayscale = false) const;
 	Error save_webp(const String &p_path, const bool p_lossy = false, const float p_quality = 0.75f) const;
 	Vector<uint8_t> save_webp_to_buffer(const bool p_lossy = false, const float p_quality = 0.75f) const;
@@ -373,6 +379,8 @@ public:
 	bool is_compressed() const;
 	static bool is_format_compressed(Format p_format);
 
+	static bool can_decompress(const String &p_format_tag);
+
 	void fix_alpha_edges();
 	void premultiply_alpha();
 	void srgb_to_linear();
@@ -403,6 +411,7 @@ public:
 	Error load_tga_from_buffer(const Vector<uint8_t> &p_array);
 	Error load_bmp_from_buffer(const Vector<uint8_t> &p_array);
 	Error load_ktx_from_buffer(const Vector<uint8_t> &p_array);
+	Error load_dds_from_buffer(const Vector<uint8_t> &p_array);
 
 	Error load_svg_from_buffer(const Vector<uint8_t> &p_array, float scale = 1.0);
 	Error load_svg_from_string(const String &p_svg_str, float scale = 1.0);
@@ -442,5 +451,3 @@ VARIANT_ENUM_CAST(Image::UsedChannels)
 VARIANT_ENUM_CAST(Image::AlphaMode)
 VARIANT_ENUM_CAST(Image::RoughnessChannel)
 VARIANT_ENUM_CAST(Image::ASTCFormat)
-
-#endif // IMAGE_H
diff --git a/engine/core/io/image_loader.h b/engine/core/io/image_loader.h
index 26af6503..00642da0 100644
--- a/engine/core/io/image_loader.h
+++ b/engine/core/io/image_loader.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_H
-#define IMAGE_LOADER_H
+#pragma once
 
 #include "core/core_bind.h"
 #include "core/io/file_access.h"
@@ -108,5 +107,3 @@ public:
 	virtual bool handles_type(const String &p_type) const override;
 	virtual String get_resource_type(const String &p_path) const override;
 };
-
-#endif // IMAGE_LOADER_H
diff --git a/engine/core/io/ip.h b/engine/core/io/ip.h
index 4816d59a..9d23a465 100644
--- a/engine/core/io/ip.h
+++ b/engine/core/io/ip.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IP_H
-#define IP_H
+#pragma once
 
 #include "core/io/ip_address.h"
 #include "core/os/os.h"
@@ -110,5 +109,3 @@ public:
 
 VARIANT_ENUM_CAST(IP::Type);
 VARIANT_ENUM_CAST(IP::ResolverStatus);
-
-#endif // IP_H
diff --git a/engine/core/io/ip_address.cpp b/engine/core/io/ip_address.cpp
index f12c896d..78b8a19f 100644
--- a/engine/core/io/ip_address.cpp
+++ b/engine/core/io/ip_address.cpp
@@ -148,7 +148,7 @@ void IPAddress::_parse_ipv6(const String &p_string) {
 void IPAddress::_parse_ipv4(const String &p_string, int p_start, uint8_t *p_ret) {
 	String ip;
 	if (p_start != 0) {
-		ip = p_string.substr(p_start, p_string.length() - p_start);
+		ip = p_string.substr(p_start);
 	} else {
 		ip = p_string;
 	}
diff --git a/engine/core/io/ip_address.h b/engine/core/io/ip_address.h
index da7b0f77..114038d9 100644
--- a/engine/core/io/ip_address.h
+++ b/engine/core/io/ip_address.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IP_ADDRESS_H
-#define IP_ADDRESS_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -96,4 +95,6 @@ public:
 	IPAddress() { clear(); }
 };
 
-#endif // IP_ADDRESS_H
+// Zero-constructing IPAddress initializes field, valid, and wildcard to 0 (and thus empty).
+template <>
+struct is_zero_constructible<IPAddress> : std::true_type {};
diff --git a/engine/core/io/json.cpp b/engine/core/io/json.cpp
index 131a7e80..fcb6182f 100644
--- a/engine/core/io/json.cpp
+++ b/engine/core/io/json.cpp
@@ -122,8 +122,7 @@ String JSON::_stringify(const Variant &p_var, const String &p_indent, int p_cur_
 			ERR_FAIL_COND_V_MSG(p_markers.has(d.id()), "\"{...}\"", "Converting circular structure to JSON.");
 			p_markers.insert(d.id());
 
-			List<Variant> keys;
-			d.get_key_list(&keys);
+			LocalVector<Variant> keys = d.get_key_list();
 
 			if (p_sort_keys) {
 				keys.sort_custom<StringLikeVariantOrder>();
@@ -664,201 +663,96 @@ Variant JSON::_from_native(const Variant &p_variant, bool p_full_objects, int p_
 
 		case Variant::VECTOR2: {
 			const Vector2 v = p_variant;
-
-			Array args;
-			args.push_back(v.x);
-			args.push_back(v.y);
-
+			Array args = { v.x, v.y };
 			RETURN_ARGS;
 		} break;
 		case Variant::VECTOR2I: {
 			const Vector2i v = p_variant;
-
-			Array args;
-			args.push_back(v.x);
-			args.push_back(v.y);
-
+			Array args = { v.x, v.y };
 			RETURN_ARGS;
 		} break;
 		case Variant::RECT2: {
 			const Rect2 r = p_variant;
-
-			Array args;
-			args.push_back(r.position.x);
-			args.push_back(r.position.y);
-			args.push_back(r.size.width);
-			args.push_back(r.size.height);
-
+			Array args = { r.position.x, r.position.y, r.size.width, r.size.height };
 			RETURN_ARGS;
 		} break;
 		case Variant::RECT2I: {
 			const Rect2i r = p_variant;
-
-			Array args;
-			args.push_back(r.position.x);
-			args.push_back(r.position.y);
-			args.push_back(r.size.width);
-			args.push_back(r.size.height);
-
+			Array args = { r.position.x, r.position.y, r.size.width, r.size.height };
 			RETURN_ARGS;
 		} break;
 		case Variant::VECTOR3: {
 			const Vector3 v = p_variant;
-
-			Array args;
-			args.push_back(v.x);
-			args.push_back(v.y);
-			args.push_back(v.z);
-
+			Array args = { v.x, v.y, v.z };
 			RETURN_ARGS;
 		} break;
 		case Variant::VECTOR3I: {
 			const Vector3i v = p_variant;
-
-			Array args;
-			args.push_back(v.x);
-			args.push_back(v.y);
-			args.push_back(v.z);
-
+			Array args = { v.x, v.y, v.z };
 			RETURN_ARGS;
 		} break;
 		case Variant::TRANSFORM2D: {
 			const Transform2D t = p_variant;
-
-			Array args;
-			args.push_back(t[0].x);
-			args.push_back(t[0].y);
-			args.push_back(t[1].x);
-			args.push_back(t[1].y);
-			args.push_back(t[2].x);
-			args.push_back(t[2].y);
-
+			Array args = { t[0].x, t[0].y, t[1].x, t[1].y, t[2].x, t[2].y };
 			RETURN_ARGS;
 		} break;
 		case Variant::VECTOR4: {
 			const Vector4 v = p_variant;
-
-			Array args;
-			args.push_back(v.x);
-			args.push_back(v.y);
-			args.push_back(v.z);
-			args.push_back(v.w);
-
+			Array args = { v.x, v.y, v.z, v.w };
 			RETURN_ARGS;
 		} break;
 		case Variant::VECTOR4I: {
 			const Vector4i v = p_variant;
-
-			Array args;
-			args.push_back(v.x);
-			args.push_back(v.y);
-			args.push_back(v.z);
-			args.push_back(v.w);
-
+			Array args = { v.x, v.y, v.z, v.w };
 			RETURN_ARGS;
 		} break;
 		case Variant::PLANE: {
 			const Plane p = p_variant;
-
-			Array args;
-			args.push_back(p.normal.x);
-			args.push_back(p.normal.y);
-			args.push_back(p.normal.z);
-			args.push_back(p.d);
-
+			Array args = { p.normal.x, p.normal.y, p.normal.z, p.d };
 			RETURN_ARGS;
 		} break;
 		case Variant::QUATERNION: {
 			const Quaternion q = p_variant;
-
-			Array args;
-			args.push_back(q.x);
-			args.push_back(q.y);
-			args.push_back(q.z);
-			args.push_back(q.w);
-
+			Array args = { q.x, q.y, q.z, q.w };
 			RETURN_ARGS;
 		} break;
 		case Variant::AABB: {
 			const AABB aabb = p_variant;
-
-			Array args;
-			args.push_back(aabb.position.x);
-			args.push_back(aabb.position.y);
-			args.push_back(aabb.position.z);
-			args.push_back(aabb.size.x);
-			args.push_back(aabb.size.y);
-			args.push_back(aabb.size.z);
-
+			Array args = { aabb.position.x, aabb.position.y, aabb.position.z, aabb.size.x, aabb.size.y, aabb.size.z };
 			RETURN_ARGS;
 		} break;
 		case Variant::BASIS: {
 			const Basis b = p_variant;
 
-			Array args;
-			args.push_back(b.get_column(0).x);
-			args.push_back(b.get_column(0).y);
-			args.push_back(b.get_column(0).z);
-			args.push_back(b.get_column(1).x);
-			args.push_back(b.get_column(1).y);
-			args.push_back(b.get_column(1).z);
-			args.push_back(b.get_column(2).x);
-			args.push_back(b.get_column(2).y);
-			args.push_back(b.get_column(2).z);
+			Array args = { b.get_column(0).x, b.get_column(0).y, b.get_column(0).z,
+				b.get_column(1).x, b.get_column(1).y, b.get_column(1).z,
+				b.get_column(2).x, b.get_column(2).y, b.get_column(2).z };
 
 			RETURN_ARGS;
 		} break;
 		case Variant::TRANSFORM3D: {
 			const Transform3D t = p_variant;
 
-			Array args;
-			args.push_back(t.basis.get_column(0).x);
-			args.push_back(t.basis.get_column(0).y);
-			args.push_back(t.basis.get_column(0).z);
-			args.push_back(t.basis.get_column(1).x);
-			args.push_back(t.basis.get_column(1).y);
-			args.push_back(t.basis.get_column(1).z);
-			args.push_back(t.basis.get_column(2).x);
-			args.push_back(t.basis.get_column(2).y);
-			args.push_back(t.basis.get_column(2).z);
-			args.push_back(t.origin.x);
-			args.push_back(t.origin.y);
-			args.push_back(t.origin.z);
+			Array args = { t.basis.get_column(0).x, t.basis.get_column(0).y, t.basis.get_column(0).z,
+				t.basis.get_column(1).x, t.basis.get_column(1).y, t.basis.get_column(1).z,
+				t.basis.get_column(2).x, t.basis.get_column(2).y, t.basis.get_column(2).z,
+				t.origin.x, t.origin.y, t.origin.z };
 
 			RETURN_ARGS;
 		} break;
 		case Variant::PROJECTION: {
 			const Projection p = p_variant;
 
-			Array args;
-			args.push_back(p[0].x);
-			args.push_back(p[0].y);
-			args.push_back(p[0].z);
-			args.push_back(p[0].w);
-			args.push_back(p[1].x);
-			args.push_back(p[1].y);
-			args.push_back(p[1].z);
-			args.push_back(p[1].w);
-			args.push_back(p[2].x);
-			args.push_back(p[2].y);
-			args.push_back(p[2].z);
-			args.push_back(p[2].w);
-			args.push_back(p[3].x);
-			args.push_back(p[3].y);
-			args.push_back(p[3].z);
-			args.push_back(p[3].w);
+			Array args = { p[0].x, p[0].y, p[0].z, p[0].w,
+				p[1].x, p[1].y, p[1].z, p[1].w,
+				p[2].x, p[2].y, p[2].z, p[2].w,
+				p[3].x, p[3].y, p[3].z, p[3].w };
 
 			RETURN_ARGS;
 		} break;
 		case Variant::COLOR: {
 			const Color c = p_variant;
-
-			Array args;
-			args.push_back(c.r);
-			args.push_back(c.g);
-			args.push_back(c.b);
-			args.push_back(c.a);
-
+			Array args = { c.r, c.g, c.b, c.a };
 			RETURN_ARGS;
 		} break;
 
@@ -922,12 +816,9 @@ Variant JSON::_from_native(const Variant &p_variant, bool p_full_objects, int p_
 
 			ERR_FAIL_COND_V_MSG(p_depth > Variant::MAX_RECURSION_DEPTH, ret, "Variant is too deep. Bailing.");
 
-			List<Variant> keys;
-			dict.get_key_list(&keys);
-
-			for (const Variant &key : keys) {
-				args.push_back(_from_native(key, p_full_objects, p_depth + 1));
-				args.push_back(_from_native(dict[key], p_full_objects, p_depth + 1));
+			for (const KeyValue<Variant, Variant> &kv : dict) {
+				args.push_back(_from_native(kv.key, p_full_objects, p_depth + 1));
+				args.push_back(_from_native(kv.value, p_full_objects, p_depth + 1));
 			}
 
 			return ret;
diff --git a/engine/core/io/json.h b/engine/core/io/json.h
index 70baf289..9169e578 100644
--- a/engine/core/io/json.h
+++ b/engine/core/io/json.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JSON_H
-#define JSON_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/io/resource_loader.h"
@@ -125,5 +124,3 @@ public:
 	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
 	virtual bool recognize(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // JSON_H
diff --git a/engine/core/io/logger.cpp b/engine/core/io/logger.cpp
index 2965a1ea..26fb06eb 100644
--- a/engine/core/io/logger.cpp
+++ b/engine/core/io/logger.cpp
@@ -36,10 +36,9 @@
 #include "core/templates/rb_set.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
+
 #ifdef MODULE_REGEX_ENABLED
 #include "modules/regex/regex.h"
-#else
-class RegEx : public RefCounted {};
 #endif // MODULE_REGEX_ENABLED
 
 #if defined(MINGW_ENABLED) || defined(_MSC_VER)
@@ -156,7 +155,7 @@ void RotatedFileLogger::rotate_file() {
 
 	if (FileAccess::exists(base_path)) {
 		if (max_files > 1) {
-			String timestamp = Time::get_singleton()->get_datetime_string_from_system().replace(":", ".");
+			String timestamp = Time::get_singleton()->get_datetime_string_from_system().replace_char(':', '.');
 			String backup_name = base_path.get_basename() + timestamp;
 			if (!base_path.get_extension().is_empty()) {
 				backup_name += "." + base_path.get_extension();
diff --git a/engine/core/io/logger.h b/engine/core/io/logger.h
index e55f73f6..f3d8acad 100644
--- a/engine/core/io/logger.h
+++ b/engine/core/io/logger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LOGGER_H
-#define LOGGER_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/string/ustring.h"
@@ -109,5 +108,3 @@ public:
 
 	virtual ~CompositeLogger();
 };
-
-#endif // LOGGER_H
diff --git a/engine/core/io/marshalls.cpp b/engine/core/io/marshalls.cpp
index 19efe289..c81aaecc 100644
--- a/engine/core/io/marshalls.cpp
+++ b/engine/core/io/marshalls.cpp
@@ -107,7 +107,7 @@ static Error _decode_string(const uint8_t *&buf, int &len, int *r_len, String &r
 	ERR_FAIL_COND_V(strlen < 0 || strlen + pad > len, ERR_FILE_EOF);
 
 	String str;
-	ERR_FAIL_COND_V(str.parse_utf8((const char *)buf, strlen) != OK, ERR_INVALID_DATA);
+	ERR_FAIL_COND_V(str.append_utf8((const char *)buf, strlen) != OK, ERR_INVALID_DATA);
 	r_string = str;
 
 	// Add padding.
@@ -1345,7 +1345,7 @@ static Error _encode_container_type(const ContainerType &p_type, uint8_t *&buf,
 				_encode_string(EncodedObjectAsID::get_class_static(), buf, r_len);
 			}
 		} else if (p_type.class_name != StringName()) {
-			_encode_string(p_full_objects ? p_type.class_name.operator String() : EncodedObjectAsID::get_class_static(), buf, r_len);
+			_encode_string(p_full_objects ? p_type.class_name : EncodedObjectAsID::get_class_static(), buf, r_len);
 		} else {
 			// No need to check `p_full_objects` since `class_name` should be non-empty for `builtin_type == Variant::OBJECT`.
 			if (buf) {
@@ -1849,19 +1849,16 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo
 			}
 			r_len += 4;
 
-			List<Variant> keys;
-			dict.get_key_list(&keys);
-
-			for (const Variant &key : keys) {
+			for (const KeyValue<Variant, Variant> &kv : dict) {
 				int len;
-				Error err = encode_variant(key, buf, len, p_full_objects, p_depth + 1);
+				Error err = encode_variant(kv.key, buf, len, p_full_objects, p_depth + 1);
 				ERR_FAIL_COND_V(err, err);
 				ERR_FAIL_COND_V(len % 4, ERR_BUG);
 				r_len += len;
 				if (buf) {
 					buf += len;
 				}
-				const Variant *value = dict.getptr(key);
+				const Variant *value = dict.getptr(kv.key);
 				ERR_FAIL_NULL_V(value, ERR_BUG);
 				err = encode_variant(*value, buf, len, p_full_objects, p_depth + 1);
 				ERR_FAIL_COND_V(err, err);
diff --git a/engine/core/io/marshalls.h b/engine/core/io/marshalls.h
index 82c760c2..1d057d4d 100644
--- a/engine/core/io/marshalls.h
+++ b/engine/core/io/marshalls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MARSHALLS_H
-#define MARSHALLS_H
+#pragma once
 
 #include "core/math/math_defs.h"
 #include "core/object/ref_counted.h"
@@ -226,5 +225,3 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int
 Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bool p_full_objects = false, int p_depth = 0);
 
 Vector<float> vector3_to_float32_array(const Vector3 *vecs, size_t count);
-
-#endif // MARSHALLS_H
diff --git a/engine/core/io/missing_resource.h b/engine/core/io/missing_resource.h
index 4cded5ca..702cd3b3 100644
--- a/engine/core/io/missing_resource.h
+++ b/engine/core/io/missing_resource.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MISSING_RESOURCE_H
-#define MISSING_RESOURCE_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -61,5 +60,3 @@ public:
 
 	MissingResource();
 };
-
-#endif // MISSING_RESOURCE_H
diff --git a/engine/core/io/net_socket.h b/engine/core/io/net_socket.h
index 49b23575..49671ece 100644
--- a/engine/core/io/net_socket.h
+++ b/engine/core/io/net_socket.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NET_SOCKET_H
-#define NET_SOCKET_H
+#pragma once
 
 #include "core/io/ip.h"
 #include "core/object/ref_counted.h"
@@ -79,5 +78,3 @@ public:
 
 	virtual ~NetSocket() {}
 };
-
-#endif // NET_SOCKET_H
diff --git a/engine/core/io/packed_data_container.cpp b/engine/core/io/packed_data_container.cpp
index ca236ce0..222e1679 100644
--- a/engine/core/io/packed_data_container.cpp
+++ b/engine/core/io/packed_data_container.cpp
@@ -268,14 +268,12 @@ uint32_t PackedDataContainer::_pack(const Variant &p_data, Vector<uint8_t> &tmpd
 			encode_uint32(TYPE_DICT, &tmpdata.write[pos + 0]);
 			encode_uint32(len, &tmpdata.write[pos + 4]);
 
-			List<Variant> keys;
-			d.get_key_list(&keys);
 			List<DictKey> sortk;
 
-			for (const Variant &key : keys) {
+			for (const KeyValue<Variant, Variant> &kv : d) {
 				DictKey dk;
-				dk.hash = key.hash();
-				dk.key = key;
+				dk.hash = kv.key.hash();
+				dk.key = kv.key;
 				sortk.push_back(dk);
 			}
 
diff --git a/engine/core/io/packed_data_container.h b/engine/core/io/packed_data_container.h
index f4ffa090..8d25d5c9 100644
--- a/engine/core/io/packed_data_container.h
+++ b/engine/core/io/packed_data_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKED_DATA_CONTAINER_H
-#define PACKED_DATA_CONTAINER_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -100,5 +99,3 @@ public:
 
 	PackedDataContainerRef() {}
 };
-
-#endif // PACKED_DATA_CONTAINER_H
diff --git a/engine/core/io/packet_peer.h b/engine/core/io/packet_peer.h
index 86ebe32c..91d3bc44 100644
--- a/engine/core/io/packet_peer.h
+++ b/engine/core/io/packet_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKET_PEER_H
-#define PACKET_PEER_H
+#pragma once
 
 #include "core/io/stream_peer.h"
 #include "core/object/class_db.h"
@@ -124,5 +123,3 @@ public:
 	int get_output_buffer_max_size() const;
 	PacketPeerStream();
 };
-
-#endif // PACKET_PEER_H
diff --git a/engine/core/io/packet_peer_dtls.h b/engine/core/io/packet_peer_dtls.h
index 03d97a59..5de9640d 100644
--- a/engine/core/io/packet_peer_dtls.h
+++ b/engine/core/io/packet_peer_dtls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKET_PEER_DTLS_H
-#define PACKET_PEER_DTLS_H
+#pragma once
 
 #include "core/crypto/crypto.h"
 #include "core/io/packet_peer_udp.h"
@@ -64,5 +63,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(PacketPeerDTLS::Status);
-
-#endif // PACKET_PEER_DTLS_H
diff --git a/engine/core/io/packet_peer_udp.cpp b/engine/core/io/packet_peer_udp.cpp
index 3463c41a..91e9934f 100644
--- a/engine/core/io/packet_peer_udp.cpp
+++ b/engine/core/io/packet_peer_udp.cpp
@@ -105,18 +105,16 @@ Error PacketPeerUDP::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
 		return ERR_UNAVAILABLE;
 	}
 
-/* Bogus GCC warning here:
- * In member function 'int RingBuffer<T>::read(T*, int, bool) [with T = unsigned char]',
- *     inlined from 'virtual Error PacketPeerUDP::get_packet(const uint8_t**, int&)' at core/io/packet_peer_udp.cpp:112:9,
- *     inlined from 'virtual Error PacketPeerUDP::get_packet(const uint8_t**, int&)' at core/io/packet_peer_udp.cpp:99:7:
- * Error: ./core/ring_buffer.h:68:46: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
- *   68 |                                 p_buf[dst++] = read[pos + i];
- *      |                                 ~~~~~~~~~~~~~^~~~~~~
- */
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wstringop-overflow=0"
-#endif
+	/* Bogus GCC warning here:
+	 * In member function 'int RingBuffer<T>::read(T*, int, bool) [with T = unsigned char]',
+	 *     inlined from 'virtual Error PacketPeerUDP::get_packet(const uint8_t**, int&)' at core/io/packet_peer_udp.cpp:112:9,
+	 *     inlined from 'virtual Error PacketPeerUDP::get_packet(const uint8_t**, int&)' at core/io/packet_peer_udp.cpp:99:7:
+	 * Error: ./core/ring_buffer.h:68:46: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
+	 *   68 |                                 p_buf[dst++] = read[pos + i];
+	 *      |                                 ~~~~~~~~~~~~~^~~~~~~
+	 */
+	GODOT_GCC_WARNING_PUSH
+	GODOT_GCC_PRAGMA(GCC diagnostic warning "-Wstringop-overflow=0") // Can't "ignore" this for some reason.
 
 	uint32_t size = 0;
 	uint8_t ipv6[16] = {};
@@ -129,9 +127,7 @@ Error PacketPeerUDP::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
 	*r_buffer = packet_buffer;
 	r_buffer_size = size;
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+	GODOT_GCC_WARNING_POP
 
 	return OK;
 }
diff --git a/engine/core/io/packet_peer_udp.h b/engine/core/io/packet_peer_udp.h
index c69a138c..1c909860 100644
--- a/engine/core/io/packet_peer_udp.h
+++ b/engine/core/io/packet_peer_udp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKET_PEER_UDP_H
-#define PACKET_PEER_UDP_H
+#pragma once
 
 #include "core/io/ip.h"
 #include "core/io/net_socket.h"
@@ -97,5 +96,3 @@ public:
 	PacketPeerUDP();
 	~PacketPeerUDP();
 };
-
-#endif // PACKET_PEER_UDP_H
diff --git a/engine/core/io/pck_packer.cpp b/engine/core/io/pck_packer.cpp
index c7cfca19..75870f09 100644
--- a/engine/core/io/pck_packer.cpp
+++ b/engine/core/io/pck_packer.cpp
@@ -91,9 +91,9 @@ Error PCKPacker::pck_start(const String &p_pck_path, int p_alignment, const Stri
 
 	file->store_32(PACK_HEADER_MAGIC);
 	file->store_32(PACK_FORMAT_VERSION);
-	file->store_32(VERSION_MAJOR);
-	file->store_32(VERSION_MINOR);
-	file->store_32(VERSION_PATCH);
+	file->store_32(GODOT_VERSION_MAJOR);
+	file->store_32(GODOT_VERSION_MINOR);
+	file->store_32(GODOT_VERSION_PATCH);
 
 	uint32_t pack_flags = 0;
 	if (enc_dir) {
@@ -118,8 +118,7 @@ Error PCKPacker::add_file_removal(const String &p_target_path) {
 	pf.size = 0;
 	pf.removal = true;
 
-	pf.md5.resize(16);
-	pf.md5.fill(0);
+	pf.md5.resize_zeroed(16);
 
 	files.push_back(pf);
 
diff --git a/engine/core/io/pck_packer.h b/engine/core/io/pck_packer.h
index 043a1dbd..4c386b36 100644
--- a/engine/core/io/pck_packer.h
+++ b/engine/core/io/pck_packer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PCK_PACKER_H
-#define PCK_PACKER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -66,5 +65,3 @@ public:
 
 	PCKPacker() {}
 };
-
-#endif // PCK_PACKER_H
diff --git a/engine/core/io/plist.cpp b/engine/core/io/plist.cpp
index 30c786ae..b02ca8a7 100644
--- a/engine/core/io/plist.cpp
+++ b/engine/core/io/plist.cpp
@@ -383,14 +383,16 @@ void PListNode::store_text(String &p_stream, uint8_t p_indent) const {
 			p_stream += String("\t").repeat(p_indent);
 			p_stream += "<data>\n";
 			p_stream += String("\t").repeat(p_indent);
-			p_stream += data_string + "\n";
+			// Data should be Base64 (i.e. ASCII only).
+			p_stream += String::ascii(data_string) + "\n";
 			p_stream += String("\t").repeat(p_indent);
 			p_stream += "</data>\n";
 		} break;
 		case PList::PLNodeType::PL_NODE_TYPE_DATE: {
 			p_stream += String("\t").repeat(p_indent);
 			p_stream += "<date>";
-			p_stream += data_string;
+			// Data should be ISO 8601 (i.e. ASCII only).
+			p_stream += String::ascii(data_string);
 			p_stream += "</date>\n";
 		} break;
 		case PList::PLNodeType::PL_NODE_TYPE_STRING: {
@@ -629,7 +631,7 @@ bool PList::load_file(const String &p_filename) {
 	unsigned char magic[8];
 	fb->get_buffer(magic, 8);
 
-	if (String((const char *)magic, 8) == "bplist00") {
+	if (String::ascii(Span((const char *)magic, 8)) == "bplist00") {
 		fb->seek_end(-26);
 		trailer.offset_size = fb->get_8();
 		trailer.ref_size = fb->get_8();
@@ -645,10 +647,8 @@ bool PList::load_file(const String &p_filename) {
 		Vector<uint8_t> array = FileAccess::get_file_as_bytes(p_filename, &err);
 		ERR_FAIL_COND_V(err != OK, false);
 
-		String ret;
-		ret.parse_utf8((const char *)array.ptr(), array.size());
 		String err_str;
-		bool ok = load_string(ret, err_str);
+		bool ok = load_string(String::utf8((const char *)array.ptr(), array.size()), err_str);
 		ERR_FAIL_COND_V_MSG(!ok, false, "PList: " + err_str);
 
 		return true;
diff --git a/engine/core/io/plist.h b/engine/core/io/plist.h
index 7b319906..6d2dcef3 100644
--- a/engine/core/io/plist.h
+++ b/engine/core/io/plist.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLIST_H
-#define PLIST_H
+#pragma once
 
 // Property list file format (application/x-plist) parser, property list ASN-1 serialization.
 
@@ -84,6 +83,8 @@ public:
 /*************************************************************************/
 
 class PListNode : public RefCounted {
+	GDSOFTCLASS(PListNode, RefCounted);
+
 	static int _asn1_size_len(uint8_t p_len_octets);
 
 public:
@@ -122,5 +123,3 @@ public:
 	PListNode() {}
 	~PListNode() {}
 };
-
-#endif // PLIST_H
diff --git a/engine/core/io/remote_filesystem_client.h b/engine/core/io/remote_filesystem_client.h
index f96c263c..6b4db9b5 100644
--- a/engine/core/io/remote_filesystem_client.h
+++ b/engine/core/io/remote_filesystem_client.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REMOTE_FILESYSTEM_CLIENT_H
-#define REMOTE_FILESYSTEM_CLIENT_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/hash_set.h"
@@ -60,5 +59,3 @@ public:
 	Error synchronize_with_server(const String &p_host, int p_port, const String &p_password, String &r_cache_path);
 	virtual ~RemoteFilesystemClient() {}
 };
-
-#endif // REMOTE_FILESYSTEM_CLIENT_H
diff --git a/engine/core/io/resource.cpp b/engine/core/io/resource.cpp
index 886ec6f5..fac829d9 100644
--- a/engine/core/io/resource.cpp
+++ b/engine/core/io/resource.cpp
@@ -32,10 +32,15 @@
 
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
+#include "core/math/random_pcg.h"
 #include "core/os/os.h"
 #include "scene/main/node.h" //only so casting works
 
 void Resource::emit_changed() {
+	if (emit_changed_state != EMIT_CHANGED_UNBLOCKED) {
+		emit_changed_state = EMIT_CHANGED_BLOCKED_PENDING_EMIT;
+		return;
+	}
 	if (ResourceLoader::is_within_load() && !Thread::is_main_thread()) {
 		ResourceLoader::resource_changed_emit(this);
 		return;
@@ -44,6 +49,20 @@ void Resource::emit_changed() {
 	emit_signal(CoreStringName(changed));
 }
 
+void Resource::_block_emit_changed() {
+	if (emit_changed_state == EMIT_CHANGED_UNBLOCKED) {
+		emit_changed_state = EMIT_CHANGED_BLOCKED;
+	}
+}
+
+void Resource::_unblock_emit_changed() {
+	bool emit = (emit_changed_state == EMIT_CHANGED_BLOCKED_PENDING_EMIT);
+	emit_changed_state = EMIT_CHANGED_UNBLOCKED;
+	if (emit) {
+		emit_changed();
+	}
+}
+
 void Resource::_resource_path_changed() {
 }
 
@@ -95,7 +114,7 @@ void Resource::set_path_cache(const String &p_path) {
 	GDVIRTUAL_CALL(_set_path_cache, p_path);
 }
 
-static thread_local RandomPCG unique_id_gen(0, RandomPCG::DEFAULT_INC);
+static thread_local RandomPCG unique_id_gen = RandomPCG(0);
 
 void Resource::seed_scene_unique_id(uint32_t p_seed) {
 	unique_id_gen.seed(p_seed);
@@ -205,6 +224,8 @@ Error Resource::copy_from(const Ref<Resource> &p_resource) {
 		return ERR_INVALID_PARAMETER;
 	}
 
+	_block_emit_changed();
+
 	reset_state(); // May want to reset state.
 
 	List<PropertyInfo> pi;
@@ -220,6 +241,9 @@ Error Resource::copy_from(const Ref<Resource> &p_resource) {
 
 		set(E.name, p_resource->get(E.name));
 	}
+
+	_unblock_emit_changed();
+
 	return OK;
 }
 
@@ -248,9 +272,7 @@ void Resource::_dupe_sub_resources(Variant &r_variant, Node *p_for_scene, HashMa
 		} break;
 		case Variant::DICTIONARY: {
 			Dictionary d = r_variant;
-			List<Variant> keys;
-			d.get_key_list(&keys);
-			for (Variant &k : keys) {
+			for (Variant &k : d.get_key_list()) {
 				if (k.get_type() == Variant::OBJECT) {
 					// Replace in dictionary key.
 					Ref<Resource> sr = k;
@@ -322,11 +344,9 @@ void Resource::_find_sub_resources(const Variant &p_variant, HashSet<Ref<Resourc
 		} break;
 		case Variant::DICTIONARY: {
 			Dictionary d = p_variant;
-			List<Variant> keys;
-			d.get_key_list(&keys);
-			for (const Variant &k : keys) {
-				_find_sub_resources(k, p_resources_found);
-				_find_sub_resources(d[k], p_resources_found);
+			for (const KeyValue<Variant, Variant> &kv : d) {
+				_find_sub_resources(kv.key, p_resources_found);
+				_find_sub_resources(kv.value, p_resources_found);
 			}
 		} break;
 		case Variant::OBJECT: {
diff --git a/engine/core/io/resource.h b/engine/core/io/resource.h
index ebc82cee..14c08629 100644
--- a/engine/core/io/resource.h
+++ b/engine/core/io/resource.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_H
-#define RESOURCE_H
+#pragma once
 
 #include "core/io/resource_uid.h"
 #include "core/object/class_db.h"
@@ -72,6 +71,12 @@ private:
 	String import_path;
 #endif
 
+	enum EmitChangedState {
+		EMIT_CHANGED_UNBLOCKED,
+		EMIT_CHANGED_BLOCKED,
+		EMIT_CHANGED_BLOCKED_PENDING_EMIT,
+	};
+	EmitChangedState emit_changed_state = EMIT_CHANGED_UNBLOCKED;
 	bool local_to_scene = false;
 	friend class SceneState;
 	Node *local_scene = nullptr;
@@ -85,6 +90,9 @@ protected:
 	virtual void _resource_path_changed();
 	static void _bind_methods();
 
+	void _block_emit_changed();
+	void _unblock_emit_changed();
+
 	void _set_path(const String &p_path);
 	void _take_over_path(const String &p_path);
 
@@ -179,5 +187,3 @@ public:
 	static void get_cached_resources(List<Ref<Resource>> *p_resources);
 	static int get_cached_resource_count();
 };
-
-#endif // RESOURCE_H
diff --git a/engine/core/io/resource_format_binary.cpp b/engine/core/io/resource_format_binary.cpp
index 891510e3..98511f02 100644
--- a/engine/core/io/resource_format_binary.cpp
+++ b/engine/core/io/resource_format_binary.cpp
@@ -162,9 +162,7 @@ StringName ResourceLoaderBinary::_get_string() {
 			return StringName();
 		}
 		f->get_buffer((uint8_t *)&str_buf[0], len);
-		String s;
-		s.parse_utf8(&str_buf[0], len);
-		return s;
+		return String::utf8(&str_buf[0], len);
 	}
 
 	return string_map[id];
@@ -918,9 +916,7 @@ static String get_ustring(Ref<FileAccess> f) {
 	Vector<char> str_buf;
 	str_buf.resize(len);
 	f->get_buffer((uint8_t *)&str_buf[0], len);
-	String s;
-	s.parse_utf8(&str_buf[0], len);
-	return s;
+	return String::utf8(&str_buf[0], len);
 }
 
 String ResourceLoaderBinary::get_unicode_string() {
@@ -932,9 +928,7 @@ String ResourceLoaderBinary::get_unicode_string() {
 		return String();
 	}
 	f->get_buffer((uint8_t *)&str_buf[0], len);
-	String s;
-	s.parse_utf8(&str_buf[0], len);
-	return s;
+	return String::utf8(&str_buf[0], len);
 }
 
 void ResourceLoaderBinary::get_classes_used(Ref<FileAccess> p_f, HashSet<StringName> *p_classes) {
@@ -1028,10 +1022,10 @@ void ResourceLoaderBinary::open(Ref<FileAccess> p_f, bool p_no_resources, bool p
 	print_bl("minor: " + itos(ver_minor));
 	print_bl("format: " + itos(ver_format));
 
-	if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
+	if (ver_format > FORMAT_VERSION || ver_major > GODOT_VERSION_MAJOR) {
 		f.unref();
 		ERR_FAIL_MSG(vformat("File '%s' can't be loaded, as it uses a format version (%d) or engine version (%d.%d) which are not supported by your engine version (%s).",
-				local_path, ver_format, ver_major, ver_minor, VERSION_BRANCH));
+				local_path, ver_format, ver_major, ver_minor, GODOT_VERSION_BRANCH));
 	}
 
 	type = get_unicode_string();
@@ -1155,7 +1149,7 @@ String ResourceLoaderBinary::recognize(Ref<FileAccess> p_f) {
 	f->get_32(); // ver_minor
 	uint32_t ver_fmt = f->get_32();
 
-	if (ver_fmt > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
+	if (ver_fmt > FORMAT_VERSION || ver_major > GODOT_VERSION_MAJOR) {
 		f.unref();
 		return "";
 	}
@@ -1196,7 +1190,7 @@ String ResourceLoaderBinary::recognize_script_class(Ref<FileAccess> p_f) {
 	f->get_32(); // ver_minor
 	uint32_t ver_fmt = f->get_32();
 
-	if (ver_fmt > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
+	if (ver_fmt > FORMAT_VERSION || ver_major > GODOT_VERSION_MAJOR) {
 		f.unref();
 		return "";
 	}
@@ -1348,13 +1342,10 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 	bool use_real64 = f->get_32();
 
 	f->set_big_endian(big_endian != 0); //read big endian if saved as big endian
-#ifdef BIG_ENDIAN_ENABLED
-	fw->store_32(!big_endian);
-#else
+
 	fw->store_32(big_endian);
-#endif
-	fw->set_big_endian(big_endian != 0);
 	fw->store_32(use_real64); //use real64
+	fw->set_big_endian(big_endian != 0);
 
 	uint32_t ver_major = f->get_32();
 	uint32_t ver_minor = f->get_32();
@@ -1392,10 +1383,10 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
 		return ResourceFormatSaverBinary::singleton->save(res, p_path);
 	}
 
-	if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
+	if (ver_format > FORMAT_VERSION || ver_major > GODOT_VERSION_MAJOR) {
 		ERR_FAIL_V_MSG(ERR_FILE_UNRECOGNIZED,
 				vformat("File '%s' can't be loaded, as it uses a format version (%d) or engine version (%d.%d) which are not supported by your engine version (%s).",
-						local_path, ver_format, ver_major, ver_minor, VERSION_BRANCH));
+						local_path, ver_format, ver_major, ver_minor, GODOT_VERSION_BRANCH));
 	}
 
 	// Since we're not actually converting the file contents, leave the version
@@ -1876,12 +1867,9 @@ void ResourceFormatSaverBinaryInstance::write_variant(Ref<FileAccess> f, const V
 			Dictionary d = p_property;
 			f->store_32(uint32_t(d.size()));
 
-			List<Variant> keys;
-			d.get_key_list(&keys);
-
-			for (const Variant &E : keys) {
-				write_variant(f, E, resource_map, external_resources, string_map);
-				write_variant(f, d[E], resource_map, external_resources, string_map);
+			for (const KeyValue<Variant, Variant> &kv : d) {
+				write_variant(f, kv.key, resource_map, external_resources, string_map);
+				write_variant(f, kv.value, resource_map, external_resources, string_map);
 			}
 
 		} break;
@@ -2086,12 +2074,9 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant
 			Dictionary d = p_variant;
 			_find_resources(d.get_typed_key_script());
 			_find_resources(d.get_typed_value_script());
-			List<Variant> keys;
-			d.get_key_list(&keys);
-			for (const Variant &E : keys) {
-				_find_resources(E);
-				Variant v = d[E];
-				_find_resources(v);
+			for (const KeyValue<Variant, Variant> &kv : d) {
+				_find_resources(kv.key);
+				_find_resources(kv.value);
 			}
 		} break;
 		case Variant::NODE_PATH: {
@@ -2180,14 +2165,14 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const Ref<Re
 
 	if (big_endian) {
 		f->store_32(1);
-		f->set_big_endian(true);
 	} else {
 		f->store_32(0);
 	}
-
 	f->store_32(0); //64 bits file, false for now
-	f->store_32(VERSION_MAJOR);
-	f->store_32(VERSION_MINOR);
+	f->set_big_endian(big_endian);
+
+	f->store_32(GODOT_VERSION_MAJOR);
+	f->store_32(GODOT_VERSION_MINOR);
 	f->store_32(FORMAT_VERSION);
 
 	if (f->get_error() != OK && f->get_error() != ERR_FILE_EOF) {
@@ -2424,13 +2409,10 @@ Error ResourceFormatSaverBinaryInstance::set_uid(const String &p_path, ResourceU
 	big_endian = f->get_32();
 	bool use_real64 = f->get_32();
 	f->set_big_endian(big_endian != 0); //read big endian if saved as big endian
-#ifdef BIG_ENDIAN_ENABLED
-	fw->store_32(!big_endian);
-#else
+
 	fw->store_32(big_endian);
-#endif
-	fw->set_big_endian(big_endian != 0);
 	fw->store_32(use_real64); //use real64
+	fw->set_big_endian(big_endian != 0);
 
 	uint32_t ver_major = f->get_32();
 	uint32_t ver_minor = f->get_32();
@@ -2450,10 +2432,10 @@ Error ResourceFormatSaverBinaryInstance::set_uid(const String &p_path, ResourceU
 		return ERR_UNAVAILABLE;
 	}
 
-	if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) {
+	if (ver_format > FORMAT_VERSION || ver_major > GODOT_VERSION_MAJOR) {
 		ERR_FAIL_V_MSG(ERR_FILE_UNRECOGNIZED,
 				vformat("File '%s' can't be loaded, as it uses a format version (%d) or engine version (%d.%d) which are not supported by your engine version (%s).",
-						local_path, ver_format, ver_major, ver_minor, VERSION_BRANCH));
+						local_path, ver_format, ver_major, ver_minor, GODOT_VERSION_BRANCH));
 	}
 
 	// Since we're not actually converting the file contents, leave the version
diff --git a/engine/core/io/resource_format_binary.h b/engine/core/io/resource_format_binary.h
index ec8d7ead..dfd2cd6f 100644
--- a/engine/core/io/resource_format_binary.h
+++ b/engine/core/io/resource_format_binary.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_FORMAT_BINARY_H
-#define RESOURCE_FORMAT_BINARY_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
@@ -189,5 +188,3 @@ public:
 
 	ResourceFormatSaverBinary();
 };
-
-#endif // RESOURCE_FORMAT_BINARY_H
diff --git a/engine/core/io/resource_importer.cpp b/engine/core/io/resource_importer.cpp
index b7a14f2b..81c3deb9 100644
--- a/engine/core/io/resource_importer.cpp
+++ b/engine/core/io/resource_importer.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/io/config_file.h"
+#include "core/io/image.h"
 #include "core/os/os.h"
 #include "core/variant/variant_parser.h"
 
@@ -41,7 +42,7 @@ bool ResourceFormatImporter::SortImporterByName::operator()(const Ref<ResourceIm
 	return p_a->get_importer_name() < p_b->get_importer_name();
 }
 
-Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndType &r_path_and_type, bool *r_valid) const {
+Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndType &r_path_and_type, bool p_load, bool *r_valid) const {
 	Error err;
 	Ref<FileAccess> f = FileAccess::open(p_path + ".import", FileAccess::READ, &err);
 
@@ -65,7 +66,10 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
 
 	int lines = 0;
 	String error_text;
-	bool path_found = false; //first match must have priority
+	bool path_found = false; // First match must have priority.
+
+	String decomp_path;
+	bool decomp_path_found = false;
 	while (true) {
 		assign = Variant();
 		next_tag.fields.clear();
@@ -73,6 +77,11 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
 
 		err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, nullptr, true);
 		if (err == ERR_FILE_EOF) {
+			if (p_load && !path_found && decomp_path_found) {
+				print_verbose(vformat("No natively supported texture format found for %s, using decompressable format %s.", p_path, decomp_path));
+				r_path_and_type.path = decomp_path;
+			}
+
 			return OK;
 		} else if (err != OK) {
 			ERR_PRINT(vformat("ResourceFormatImporter::load - %s.import:%d error: %s.", p_path, lines, error_text));
@@ -84,12 +93,15 @@ Error ResourceFormatImporter::_get_path_and_type(const String &p_path, PathAndTy
 				String feature = assign.get_slicec('.', 1);
 				if (OS::get_singleton()->has_feature(feature)) {
 					r_path_and_type.path = value;
-					path_found = true; //first match must have priority
+					path_found = true; // First match must have priority.
+				} else if (p_load && Image::can_decompress(feature) && !decomp_path_found) { // When loading, check for decompressable formats and use first one found if nothing else is supported.
+					decomp_path = value;
+					decomp_path_found = true; // First match must have priority.
 				}
 
 			} else if (!path_found && assign == "path") {
 				r_path_and_type.path = value;
-				path_found = true; //first match must have priority
+				path_found = true; // First match must have priority.
 			} else if (assign == "type") {
 				r_path_and_type.type = ClassDB::get_compatibility_remapped_class(value);
 			} else if (assign == "importer") {
@@ -154,7 +166,7 @@ Ref<Resource> ResourceFormatImporter::load(const String &p_path, const String &p
 
 Ref<Resource> ResourceFormatImporter::load_internal(const String &p_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode, bool p_silence_errors) {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, true);
 
 	if (err != OK) {
 		if (r_error) {
@@ -244,13 +256,13 @@ Error ResourceFormatImporter::get_import_order_threads_and_importer(const String
 
 	if (FileAccess::exists(p_path + ".import")) {
 		PathAndType pat;
-		Error err = _get_path_and_type(p_path, pat);
+		Error err = _get_path_and_type(p_path, pat, false);
 
 		if (err == OK) {
 			importer = get_importer_by_name(pat.importer);
 		}
 	} else {
-		importer = get_importer_by_extension(p_path.get_extension().to_lower());
+		importer = get_importer_by_file(p_path);
 	}
 
 	if (importer.is_valid()) {
@@ -268,13 +280,13 @@ int ResourceFormatImporter::get_import_order(const String &p_path) const {
 
 	if (FileAccess::exists(p_path + ".import")) {
 		PathAndType pat;
-		Error err = _get_path_and_type(p_path, pat);
+		Error err = _get_path_and_type(p_path, pat, false);
 
 		if (err == OK) {
 			importer = get_importer_by_name(pat.importer);
 		}
 	} else {
-		importer = get_importer_by_extension(p_path.get_extension().to_lower());
+		importer = get_importer_by_file(p_path);
 	}
 
 	if (importer.is_valid()) {
@@ -300,7 +312,7 @@ bool ResourceFormatImporter::handles_type(const String &p_type) const {
 
 String ResourceFormatImporter::get_internal_resource_path(const String &p_path) const {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, false);
 
 	if (err != OK) {
 		return String();
@@ -354,20 +366,20 @@ void ResourceFormatImporter::get_internal_resource_path_list(const String &p_pat
 String ResourceFormatImporter::get_import_group_file(const String &p_path) const {
 	bool valid = true;
 	PathAndType pat;
-	_get_path_and_type(p_path, pat, &valid);
+	_get_path_and_type(p_path, pat, false, &valid);
 	return valid ? pat.group_file : String();
 }
 
 bool ResourceFormatImporter::is_import_valid(const String &p_path) const {
 	bool valid = true;
 	PathAndType pat;
-	_get_path_and_type(p_path, pat, &valid);
+	_get_path_and_type(p_path, pat, false, &valid);
 	return valid;
 }
 
 String ResourceFormatImporter::get_resource_type(const String &p_path) const {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, false);
 
 	if (err != OK) {
 		return "";
@@ -378,7 +390,7 @@ String ResourceFormatImporter::get_resource_type(const String &p_path) const {
 
 ResourceUID::ID ResourceFormatImporter::get_resource_uid(const String &p_path) const {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, false);
 
 	if (err != OK) {
 		return ResourceUID::INVALID_ID;
@@ -393,7 +405,7 @@ bool ResourceFormatImporter::has_custom_uid_support() const {
 
 Error ResourceFormatImporter::get_resource_import_info(const String &p_path, StringName &r_type, ResourceUID::ID &r_uid, String &r_import_group_file) const {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, false);
 
 	if (err == OK) {
 		r_type = pat.type;
@@ -410,7 +422,7 @@ Error ResourceFormatImporter::get_resource_import_info(const String &p_path, Str
 
 Variant ResourceFormatImporter::get_resource_metadata(const String &p_path) const {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, false);
 
 	if (err != OK) {
 		return Variant();
@@ -420,7 +432,7 @@ Variant ResourceFormatImporter::get_resource_metadata(const String &p_path) cons
 }
 void ResourceFormatImporter::get_classes_used(const String &p_path, HashSet<StringName> *r_classes) {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, false);
 
 	if (err != OK) {
 		return;
@@ -431,7 +443,7 @@ void ResourceFormatImporter::get_classes_used(const String &p_path, HashSet<Stri
 
 void ResourceFormatImporter::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) {
 	PathAndType pat;
-	Error err = _get_path_and_type(p_path, pat);
+	Error err = _get_path_and_type(p_path, pat, false);
 
 	if (err != OK) {
 		return;
@@ -459,12 +471,12 @@ void ResourceFormatImporter::add_importer(const Ref<ResourceImporter> &p_importe
 	}
 }
 
-void ResourceFormatImporter::get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter>> *r_importers) {
+void ResourceFormatImporter::get_importers_for_file(const String &p_file, List<Ref<ResourceImporter>> *r_importers) {
 	for (int i = 0; i < importers.size(); i++) {
 		List<String> local_exts;
 		importers[i]->get_recognized_extensions(&local_exts);
 		for (const String &F : local_exts) {
-			if (p_extension.to_lower() == F) {
+			if (p_file.right(F.length()).nocasecmp_to(F) == 0) {
 				r_importers->push_back(importers[i]);
 				break;
 			}
@@ -478,7 +490,7 @@ void ResourceFormatImporter::get_importers(List<Ref<ResourceImporter>> *r_import
 	}
 }
 
-Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const String &p_extension) const {
+Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_file(const String &p_file) const {
 	Ref<ResourceImporter> importer;
 	float priority = 0;
 
@@ -486,9 +498,10 @@ Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const St
 		List<String> local_exts;
 		importers[i]->get_recognized_extensions(&local_exts);
 		for (const String &F : local_exts) {
-			if (p_extension.to_lower() == F && importers[i]->get_priority() > priority) {
+			if (p_file.right(F.length()).nocasecmp_to(F) == 0 && importers[i]->get_priority() > priority) {
 				importer = importers[i];
 				priority = importers[i]->get_priority();
+				break;
 			}
 		}
 	}
@@ -503,7 +516,7 @@ String ResourceFormatImporter::get_import_base_path(const String &p_for_file) co
 bool ResourceFormatImporter::are_import_settings_valid(const String &p_path) const {
 	bool valid = true;
 	PathAndType pat;
-	_get_path_and_type(p_path, pat, &valid);
+	_get_path_and_type(p_path, pat, false, &valid);
 
 	if (!valid) {
 		return false;
diff --git a/engine/core/io/resource_importer.h b/engine/core/io/resource_importer.h
index 1d00ef3b..ff1baad9 100644
--- a/engine/core/io/resource_importer.h
+++ b/engine/core/io/resource_importer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_H
-#define RESOURCE_IMPORTER_H
+#pragma once
 
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
@@ -49,7 +48,7 @@ class ResourceFormatImporter : public ResourceFormatLoader {
 		ResourceUID::ID uid = ResourceUID::INVALID_ID;
 	};
 
-	Error _get_path_and_type(const String &p_path, PathAndType &r_path_and_type, bool *r_valid = nullptr) const;
+	Error _get_path_and_type(const String &p_path, PathAndType &r_path_and_type, bool p_load, bool *r_valid = nullptr) const;
 
 	static ResourceFormatImporter *singleton;
 
@@ -90,8 +89,8 @@ public:
 
 	void remove_importer(const Ref<ResourceImporter> &p_importer) { importers.erase(p_importer); }
 	Ref<ResourceImporter> get_importer_by_name(const String &p_name) const;
-	Ref<ResourceImporter> get_importer_by_extension(const String &p_extension) const;
-	void get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter>> *r_importers);
+	Ref<ResourceImporter> get_importer_by_file(const String &p_file) const;
+	void get_importers_for_file(const String &p_file, List<Ref<ResourceImporter>> *r_importers);
 	void get_importers(List<Ref<ResourceImporter>> *r_importers);
 
 	bool are_import_settings_valid(const String &p_path) const;
@@ -166,5 +165,3 @@ class ResourceFormatImporterSaver : public ResourceFormatSaver {
 public:
 	virtual Error set_uid(const String &p_path, ResourceUID::ID p_uid) override;
 };
-
-#endif // RESOURCE_IMPORTER_H
diff --git a/engine/core/io/resource_loader.cpp b/engine/core/io/resource_loader.cpp
index 04fd641f..869faa98 100644
--- a/engine/core/io/resource_loader.cpp
+++ b/engine/core/io/resource_loader.cpp
@@ -61,8 +61,6 @@ bool ResourceFormatLoader::recognize_path(const String &p_path, const String &p_
 		return ret;
 	}
 
-	String extension = p_path.get_extension();
-
 	List<String> extensions;
 	if (p_for_type.is_empty()) {
 		get_recognized_extensions(&extensions);
@@ -71,7 +69,8 @@ bool ResourceFormatLoader::recognize_path(const String &p_path, const String &p_
 	}
 
 	for (const String &E : extensions) {
-		if (E.nocasecmp_to(extension) == 0) {
+		const String ext = !E.begins_with(".") ? "." + E : E;
+		if (p_path.right(ext.length()).nocasecmp_to(ext) == 0) {
 			return true;
 		}
 	}
@@ -264,6 +263,14 @@ void ResourceLoader::LoadToken::clear() {
 				thread_load_tasks.erase(local_path);
 			}
 			local_path.clear(); // Mark as already cleared.
+			if (task_to_await) {
+				for (KeyValue<String, ResourceLoader::ThreadLoadTask> &E : thread_load_tasks) {
+					if (E.value.task_id == task_to_await) {
+						task_to_await = 0;
+						break; // Same task is reused by nested loads, do not wait for completion here.
+					}
+				}
+			}
 		}
 	}
 
@@ -322,7 +329,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
 
 #ifdef TOOLS_ENABLED
 	if (Engine::get_singleton()->is_editor_hint()) {
-		if (ResourceFormatImporter::get_singleton()->get_importer_by_extension(p_path.get_extension()).is_valid()) {
+		if (ResourceFormatImporter::get_singleton()->get_importer_by_file(p_path).is_valid()) {
 			// The format is known to the editor, but the file hasn't been imported
 			// (otherwise, ResourceFormatImporter would have been found as a suitable loader).
 			found = true;
@@ -772,6 +779,10 @@ Ref<Resource> ResourceLoader::_load_complete(LoadToken &p_load_token, Error *r_e
 	return _load_complete_inner(p_load_token, r_error, thread_load_lock);
 }
 
+void ResourceLoader::set_is_import_thread(bool p_import_thread) {
+	import_thread = p_import_thread;
+}
+
 Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Error *r_error, MutexLock<SafeBinaryMutex<BINARY_MUTEX_TAG>> &p_thread_load_lock) {
 	if (r_error) {
 		*r_error = OK;
@@ -825,6 +836,12 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
 
 				p_thread_load_lock.temp_relock();
 				load_task.awaited = true;
+				// Mark nested loads with the same task id as awaited.
+				for (KeyValue<String, ResourceLoader::ThreadLoadTask> &E : thread_load_tasks) {
+					if (E.value.task_id == load_task.task_id) {
+						E.value.awaited = true;
+					}
+				}
 
 				DEV_ASSERT(load_task.status == THREAD_LOAD_FAILED || load_task.status == THREAD_LOAD_LOADED);
 			} else if (load_task.need_wait) {
@@ -886,9 +903,11 @@ Ref<Resource> ResourceLoader::_load_complete_inner(LoadToken &p_load_token, Erro
 							MessageQueue::get_main_singleton()->push_callable(callable_mp(rcc.source, &Resource::connect_changed).bind(rcc.callable, rcc.flags));
 						}
 					}
-					core_bind::Semaphore done;
-					MessageQueue::get_main_singleton()->push_callable(callable_mp(&done, &core_bind::Semaphore::post).bind(1));
-					done.wait();
+					if (!import_thread) { // Main thread is blocked by initial resource reimport, do not wait.
+						CoreBind::Semaphore done;
+						MessageQueue::get_main_singleton()->push_callable(callable_mp(&done, &CoreBind::Semaphore::post).bind(1));
+						done.wait();
+					}
 				}
 			}
 		}
@@ -1339,10 +1358,8 @@ void ResourceLoader::load_translation_remaps() {
 	}
 
 	Dictionary remaps = GLOBAL_GET("internationalization/locale/translation_remaps");
-	List<Variant> keys;
-	remaps.get_key_list(&keys);
-	for (const Variant &E : keys) {
-		Array langs = remaps[E];
+	for (const KeyValue<Variant, Variant> &kv : remaps) {
+		Array langs = kv.value;
 		Vector<String> lang_remaps;
 		lang_remaps.resize(langs.size());
 		String *lang_remaps_ptrw = lang_remaps.ptrw();
@@ -1350,7 +1367,7 @@ void ResourceLoader::load_translation_remaps() {
 			*lang_remaps_ptrw++ = lang;
 		}
 
-		translation_remaps[String(E)] = lang_remaps;
+		translation_remaps[String(kv.key)] = lang_remaps;
 	}
 }
 
@@ -1565,6 +1582,7 @@ bool ResourceLoader::create_missing_resources_if_class_unavailable = false;
 bool ResourceLoader::abort_on_missing_resource = true;
 bool ResourceLoader::timestamp_on_load = false;
 
+thread_local bool ResourceLoader::import_thread = false;
 thread_local int ResourceLoader::load_nesting = 0;
 thread_local Vector<String> ResourceLoader::load_paths_stack;
 thread_local HashMap<int, HashMap<String, Ref<Resource>>> ResourceLoader::res_ref_overrides;
diff --git a/engine/core/io/resource_loader.h b/engine/core/io/resource_loader.h
index 10a82e81..189f000e 100644
--- a/engine/core/io/resource_loader.h
+++ b/engine/core/io/resource_loader.h
@@ -28,15 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_LOADER_H
-#define RESOURCE_LOADER_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
 
-namespace core_bind {
+namespace CoreBind {
 class ResourceLoader;
 }
 
@@ -105,7 +104,7 @@ typedef void (*ResourceLoadedCallback)(Ref<Resource> p_resource, const String &p
 
 class ResourceLoader {
 	friend class LoadToken;
-	friend class core_bind::ResourceLoader;
+	friend class CoreBind::ResourceLoader;
 
 	enum {
 		MAX_LOADERS = 64
@@ -205,6 +204,7 @@ private:
 
 	static void _run_load_task(void *p_userdata);
 
+	static thread_local bool import_thread;
 	static thread_local int load_nesting;
 	static thread_local HashMap<int, HashMap<String, Ref<Resource>>> res_ref_overrides; // Outermost key is nesting level.
 	static thread_local Vector<String> load_paths_stack;
@@ -254,6 +254,8 @@ public:
 	static bool is_imported(const String &p_path);
 	static int get_import_order(const String &p_path);
 
+	static void set_is_import_thread(bool p_import_thread);
+
 	static void set_timestamp_on_load(bool p_timestamp) { timestamp_on_load = p_timestamp; }
 	static bool get_timestamp_on_load() { return timestamp_on_load; }
 
@@ -316,5 +318,3 @@ public:
 	static void initialize();
 	static void finalize();
 };
-
-#endif // RESOURCE_LOADER_H
diff --git a/engine/core/io/resource_saver.h b/engine/core/io/resource_saver.h
index 3e082192..5602a3a4 100644
--- a/engine/core/io/resource_saver.h
+++ b/engine/core/io/resource_saver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_SAVER_H
-#define RESOURCE_SAVER_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -103,5 +102,3 @@ public:
 	static void add_custom_savers();
 	static void remove_custom_savers();
 };
-
-#endif // RESOURCE_SAVER_H
diff --git a/engine/core/io/resource_uid.cpp b/engine/core/io/resource_uid.cpp
index a73adf9d..ef997f74 100644
--- a/engine/core/io/resource_uid.cpp
+++ b/engine/core/io/resource_uid.cpp
@@ -35,6 +35,7 @@
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
+#include "core/math/random_pcg.h"
 
 // These constants are off by 1, causing the 'z' and '9' characters never to be used.
 // This cannot be fixed without breaking compatibility; see GH-83843.
@@ -46,7 +47,7 @@ String ResourceUID::get_cache_file() {
 }
 
 static constexpr uint8_t uuid_characters[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', '0', '1', '2', '3', '4', '5', '6', '7', '8' };
-static constexpr uint32_t uuid_characters_element_count = (sizeof(uuid_characters) / sizeof(*uuid_characters));
+static constexpr uint32_t uuid_characters_element_count = std::size(uuid_characters);
 static constexpr uint8_t max_uuid_number_length = 13; // Max 0x7FFFFFFFFFFFFFFF (uid://d4n4ub6itg400) size is 13 characters.
 
 String ResourceUID::id_to_text(ID p_id) const {
@@ -121,10 +122,31 @@ ResourceUID::ID ResourceUID::create_id() {
 	}
 }
 
+ResourceUID::ID ResourceUID::create_id_for_path(const String &p_path) {
+	ID id = INVALID_ID;
+	RandomPCG rng;
+
+	const String project_name = GLOBAL_GET("application/config/name");
+	rng.seed(project_name.hash64() * p_path.hash64() * FileAccess::get_md5(p_path).hash64());
+
+	while (true) {
+		int64_t num1 = rng.rand();
+		int64_t num2 = ((int64_t)rng.rand()) << 32;
+		id = (num1 | num2) & 0x7FFFFFFFFFFFFFFF;
+
+		MutexLock lock(mutex);
+		if (!unique_ids.has(id)) {
+			break;
+		}
+	}
+	return id;
+}
+
 bool ResourceUID::has_id(ID p_id) const {
 	MutexLock l(mutex);
 	return unique_ids.has(p_id);
 }
+
 void ResourceUID::add_id(ID p_id, const String &p_path) {
 	MutexLock l(mutex);
 	ERR_FAIL_COND(unique_ids.has(p_id));
@@ -311,7 +333,7 @@ String ResourceUID::get_path_from_cache(Ref<FileAccess> &p_cache_file, const Str
 		ERR_FAIL_COND_V(rl != len, String());
 
 		if (singleton->id_to_text(id) == p_uid_string) {
-			return String(cs);
+			return String::utf8(cs.get_data());
 		}
 	}
 	return String();
@@ -327,6 +349,7 @@ void ResourceUID::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("text_to_id", "text_id"), &ResourceUID::text_to_id);
 
 	ClassDB::bind_method(D_METHOD("create_id"), &ResourceUID::create_id);
+	ClassDB::bind_method(D_METHOD("create_id_for_path", "path"), &ResourceUID::create_id_for_path);
 
 	ClassDB::bind_method(D_METHOD("has_id", "id"), &ResourceUID::has_id);
 	ClassDB::bind_method(D_METHOD("add_id", "id", "path"), &ResourceUID::add_id);
diff --git a/engine/core/io/resource_uid.h b/engine/core/io/resource_uid.h
index 2912168d..6ac4c9c9 100644
--- a/engine/core/io/resource_uid.h
+++ b/engine/core/io/resource_uid.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_UID_H
-#define RESOURCE_UID_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/string/string_name.h"
@@ -71,6 +70,7 @@ public:
 	ID text_to_id(const String &p_text) const;
 
 	ID create_id();
+	ID create_id_for_path(const String &p_path);
 	bool has_id(ID p_id) const;
 	void add_id(ID p_id, const String &p_path);
 	void set_id(ID p_id, const String &p_path);
@@ -93,5 +93,3 @@ public:
 	ResourceUID();
 	~ResourceUID();
 };
-
-#endif // RESOURCE_UID_H
diff --git a/engine/core/io/stream_peer.cpp b/engine/core/io/stream_peer.cpp
index bc7ea8a0..2f2c1d30 100644
--- a/engine/core/io/stream_peer.cpp
+++ b/engine/core/io/stream_peer.cpp
@@ -125,54 +125,90 @@ void StreamPeer::put_8(int8_t p_val) {
 }
 
 void StreamPeer::put_u16(uint16_t p_val) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_val = BSWAP16(p_val);
+	}
+#else
 	if (big_endian) {
 		p_val = BSWAP16(p_val);
 	}
+#endif
 	uint8_t buf[2];
 	encode_uint16(p_val, buf);
 	put_data(buf, 2);
 }
 
 void StreamPeer::put_16(int16_t p_val) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_val = BSWAP16(p_val);
+	}
+#else
 	if (big_endian) {
 		p_val = BSWAP16(p_val);
 	}
+#endif
 	uint8_t buf[2];
 	encode_uint16(p_val, buf);
 	put_data(buf, 2);
 }
 
 void StreamPeer::put_u32(uint32_t p_val) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_val = BSWAP32(p_val);
+	}
+#else
 	if (big_endian) {
 		p_val = BSWAP32(p_val);
 	}
+#endif
 	uint8_t buf[4];
 	encode_uint32(p_val, buf);
 	put_data(buf, 4);
 }
 
 void StreamPeer::put_32(int32_t p_val) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_val = BSWAP32(p_val);
+	}
+#else
 	if (big_endian) {
 		p_val = BSWAP32(p_val);
 	}
+#endif
 	uint8_t buf[4];
 	encode_uint32(p_val, buf);
 	put_data(buf, 4);
 }
 
 void StreamPeer::put_u64(uint64_t p_val) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_val = BSWAP64(p_val);
+	}
+#else
 	if (big_endian) {
 		p_val = BSWAP64(p_val);
 	}
+#endif
 	uint8_t buf[8];
 	encode_uint64(p_val, buf);
 	put_data(buf, 8);
 }
 
 void StreamPeer::put_64(int64_t p_val) {
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		p_val = BSWAP64(p_val);
+	}
+#else
 	if (big_endian) {
 		p_val = BSWAP64(p_val);
 	}
+#endif
 	uint8_t buf[8];
 	encode_uint64(p_val, buf);
 	put_data(buf, 8);
@@ -183,9 +219,15 @@ void StreamPeer::put_half(float p_val) {
 
 	encode_half(p_val, buf);
 	uint16_t *p16 = (uint16_t *)buf;
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		*p16 = BSWAP16(*p16);
+	}
+#else
 	if (big_endian) {
 		*p16 = BSWAP16(*p16);
 	}
+#endif
 
 	put_data(buf, 2);
 }
@@ -194,10 +236,17 @@ void StreamPeer::put_float(float p_val) {
 	uint8_t buf[4];
 
 	encode_float(p_val, buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		uint32_t *p32 = (uint32_t *)buf;
+		*p32 = BSWAP32(*p32);
+	}
+#else
 	if (big_endian) {
 		uint32_t *p32 = (uint32_t *)buf;
 		*p32 = BSWAP32(*p32);
 	}
+#endif
 
 	put_data(buf, 4);
 }
@@ -206,10 +255,17 @@ void StreamPeer::put_double(double p_val) {
 	uint8_t buf[8];
 
 	encode_double(p_val, buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		uint64_t *p64 = (uint64_t *)buf;
+		*p64 = BSWAP64(*p64);
+	}
+#else
 	if (big_endian) {
 		uint64_t *p64 = (uint64_t *)buf;
 		*p64 = BSWAP64(*p64);
 	}
+#endif
 
 	put_data(buf, 8);
 }
@@ -253,9 +309,15 @@ uint16_t StreamPeer::get_u16() {
 	get_data(buf, 2);
 
 	uint16_t r = decode_uint16(buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		r = BSWAP16(r);
+	}
+#else
 	if (big_endian) {
 		r = BSWAP16(r);
 	}
+#endif
 
 	return r;
 }
@@ -265,9 +327,15 @@ int16_t StreamPeer::get_16() {
 	get_data(buf, 2);
 
 	uint16_t r = decode_uint16(buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		r = BSWAP16(r);
+	}
+#else
 	if (big_endian) {
 		r = BSWAP16(r);
 	}
+#endif
 
 	return int16_t(r);
 }
@@ -277,9 +345,15 @@ uint32_t StreamPeer::get_u32() {
 	get_data(buf, 4);
 
 	uint32_t r = decode_uint32(buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		r = BSWAP32(r);
+	}
+#else
 	if (big_endian) {
 		r = BSWAP32(r);
 	}
+#endif
 
 	return r;
 }
@@ -289,9 +363,15 @@ int32_t StreamPeer::get_32() {
 	get_data(buf, 4);
 
 	uint32_t r = decode_uint32(buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		r = BSWAP32(r);
+	}
+#else
 	if (big_endian) {
 		r = BSWAP32(r);
 	}
+#endif
 
 	return int32_t(r);
 }
@@ -301,9 +381,15 @@ uint64_t StreamPeer::get_u64() {
 	get_data(buf, 8);
 
 	uint64_t r = decode_uint64(buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		r = BSWAP64(r);
+	}
+#else
 	if (big_endian) {
 		r = BSWAP64(r);
 	}
+#endif
 
 	return r;
 }
@@ -313,9 +399,15 @@ int64_t StreamPeer::get_64() {
 	get_data(buf, 8);
 
 	uint64_t r = decode_uint64(buf);
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		r = BSWAP64(r);
+	}
+#else
 	if (big_endian) {
 		r = BSWAP64(r);
 	}
+#endif
 
 	return int64_t(r);
 }
@@ -324,10 +416,17 @@ float StreamPeer::get_half() {
 	uint8_t buf[2];
 	get_data(buf, 2);
 
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		uint16_t *p16 = (uint16_t *)buf;
+		*p16 = BSWAP16(*p16);
+	}
+#else
 	if (big_endian) {
 		uint16_t *p16 = (uint16_t *)buf;
 		*p16 = BSWAP16(*p16);
 	}
+#endif
 
 	return decode_half(buf);
 }
@@ -336,10 +435,17 @@ float StreamPeer::get_float() {
 	uint8_t buf[4];
 	get_data(buf, 4);
 
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		uint32_t *p32 = (uint32_t *)buf;
+		*p32 = BSWAP32(*p32);
+	}
+#else
 	if (big_endian) {
 		uint32_t *p32 = (uint32_t *)buf;
 		*p32 = BSWAP32(*p32);
 	}
+#endif
 
 	return decode_float(buf);
 }
@@ -348,10 +454,17 @@ double StreamPeer::get_double() {
 	uint8_t buf[8];
 	get_data(buf, 8);
 
+#ifdef BIG_ENDIAN_ENABLED
+	if (!big_endian) {
+		uint64_t *p64 = (uint64_t *)buf;
+		*p64 = BSWAP64(*p64);
+	}
+#else
 	if (big_endian) {
 		uint64_t *p64 = (uint64_t *)buf;
 		*p64 = BSWAP64(*p64);
 	}
+#endif
 
 	return decode_double(buf);
 }
@@ -383,9 +496,7 @@ String StreamPeer::get_utf8_string(int p_bytes) {
 	err = get_data(buf.ptrw(), p_bytes);
 	ERR_FAIL_COND_V(err != OK, String());
 
-	String ret;
-	ret.parse_utf8((const char *)buf.ptr(), buf.size());
-	return ret;
+	return String::utf8((const char *)buf.ptr(), buf.size());
 }
 
 Variant StreamPeer::get_var(bool p_allow_objects) {
diff --git a/engine/core/io/stream_peer.h b/engine/core/io/stream_peer.h
index 44bbfbf1..a73e92d2 100644
--- a/engine/core/io/stream_peer.h
+++ b/engine/core/io/stream_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STREAM_PEER_H
-#define STREAM_PEER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -50,7 +49,11 @@ protected:
 	Array _get_data(int p_bytes);
 	Array _get_partial_data(int p_bytes);
 
+#ifdef BIG_ENDIAN_ENABLED
+	bool big_endian = true;
+#else
 	bool big_endian = false;
+#endif
 
 public:
 	virtual Error put_data(const uint8_t *p_data, int p_bytes) = 0; ///< put a whole chunk of data, blocking until it sent
@@ -152,5 +155,3 @@ public:
 
 	StreamPeerBuffer() {}
 };
-
-#endif // STREAM_PEER_H
diff --git a/engine/core/io/stream_peer_gzip.cpp b/engine/core/io/stream_peer_gzip.cpp
index 514bcf59..ed247eaf 100644
--- a/engine/core/io/stream_peer_gzip.cpp
+++ b/engine/core/io/stream_peer_gzip.cpp
@@ -195,12 +195,12 @@ int StreamPeerGZIP::get_available_bytes() const {
 Error StreamPeerGZIP::finish() {
 	ERR_FAIL_COND_V(!ctx || !compressing, ERR_UNAVAILABLE);
 	// Ensure we have enough space in temporary buffer.
-	if (buffer.size() < 1024) {
-		buffer.resize(1024); // 1024 should be more than enough.
+	if (buffer.size() < get_available_bytes()) {
+		buffer.resize(get_available_bytes()); // get_available_bytes() is what we can store in RingBuffer.
 	}
 	int consumed = 0;
 	int to_write = 0;
-	Error err = _process(buffer.ptrw(), 1024, nullptr, 0, consumed, to_write, true); // compress
+	Error err = _process(buffer.ptrw(), buffer.size(), nullptr, 0, consumed, to_write, true); // compress
 	if (err != OK) {
 		return err;
 	}
diff --git a/engine/core/io/stream_peer_gzip.h b/engine/core/io/stream_peer_gzip.h
index a2e25ea4..394fd613 100644
--- a/engine/core/io/stream_peer_gzip.h
+++ b/engine/core/io/stream_peer_gzip.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STREAM_PEER_GZIP_H
-#define STREAM_PEER_GZIP_H
+#pragma once
 
 #include "core/io/stream_peer.h"
 
@@ -72,5 +71,3 @@ public:
 	StreamPeerGZIP();
 	~StreamPeerGZIP();
 };
-
-#endif // STREAM_PEER_GZIP_H
diff --git a/engine/core/io/stream_peer_tcp.h b/engine/core/io/stream_peer_tcp.h
index d7da7503..80097a66 100644
--- a/engine/core/io/stream_peer_tcp.h
+++ b/engine/core/io/stream_peer_tcp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STREAM_PEER_TCP_H
-#define STREAM_PEER_TCP_H
+#pragma once
 
 #include "core/io/ip.h"
 #include "core/io/ip_address.h"
@@ -92,5 +91,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(StreamPeerTCP::Status);
-
-#endif // STREAM_PEER_TCP_H
diff --git a/engine/core/io/stream_peer_tls.h b/engine/core/io/stream_peer_tls.h
index 3e03e25a..80a48115 100644
--- a/engine/core/io/stream_peer_tls.h
+++ b/engine/core/io/stream_peer_tls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STREAM_PEER_TLS_H
-#define STREAM_PEER_TLS_H
+#pragma once
 
 #include "core/crypto/crypto.h"
 #include "core/io/stream_peer.h"
@@ -66,5 +65,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(StreamPeerTLS::Status);
-
-#endif // STREAM_PEER_TLS_H
diff --git a/engine/core/io/tcp_server.h b/engine/core/io/tcp_server.h
index 472d86f3..943d4c6f 100644
--- a/engine/core/io/tcp_server.h
+++ b/engine/core/io/tcp_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TCP_SERVER_H
-#define TCP_SERVER_H
+#pragma once
 
 #include "core/io/ip.h"
 #include "core/io/net_socket.h"
@@ -59,5 +58,3 @@ public:
 	TCPServer();
 	~TCPServer();
 };
-
-#endif // TCP_SERVER_H
diff --git a/engine/core/io/translation_loader_po.cpp b/engine/core/io/translation_loader_po.cpp
index 1761d6fa..35773109 100644
--- a/engine/core/io/translation_loader_po.cpp
+++ b/engine/core/io/translation_loader_po.cpp
@@ -76,14 +76,17 @@ Ref<Resource> TranslationLoaderPO::load_translation(Ref<FileAccess> f, Error *r_
 				bool is_plural = false;
 				for (uint32_t j = 0; j < str_len + 1; j++) {
 					if (data[j] == 0x04) {
-						msg_context.parse_utf8((const char *)data.ptr(), j);
+						msg_context.clear();
+						msg_context.append_utf8((const char *)data.ptr(), j);
 						str_start = j + 1;
 					}
 					if (data[j] == 0x00) {
 						if (is_plural) {
-							msg_id_plural.parse_utf8((const char *)(data.ptr() + str_start), j - str_start);
+							msg_id_plural.clear();
+							msg_id_plural.append_utf8((const char *)(data.ptr() + str_start), j - str_start);
 						} else {
-							msg_id.parse_utf8((const char *)(data.ptr() + str_start), j - str_start);
+							msg_id.clear();
+							msg_id.append_utf8((const char *)(data.ptr() + str_start), j - str_start);
 							is_plural = true;
 						}
 						str_start = j + 1;
@@ -189,7 +192,7 @@ Ref<Resource> TranslationLoaderPO::load_translation(Ref<FileAccess> f, Error *r_
 					}
 				}
 				msg_context = "";
-				l = l.substr(7, l.length()).strip_edges();
+				l = l.substr(7).strip_edges();
 				status = STATUS_READING_CONTEXT;
 				entered_context = true;
 			}
@@ -202,7 +205,7 @@ Ref<Resource> TranslationLoaderPO::load_translation(Ref<FileAccess> f, Error *r_
 				}
 				// We don't record the message in "msgid_plural" itself as tr_n(), TTRN(), RTRN() interfaces provide the plural string already.
 				// We just have to reset variables related to plurals for "msgstr[]" later on.
-				l = l.substr(12, l.length()).strip_edges();
+				l = l.substr(12).strip_edges();
 				plural_index = -1;
 				msgs_plural.clear();
 				msgs_plural.resize(plural_forms);
@@ -230,7 +233,7 @@ Ref<Resource> TranslationLoaderPO::load_translation(Ref<FileAccess> f, Error *r_
 					}
 				}
 
-				l = l.substr(5, l.length()).strip_edges();
+				l = l.substr(5).strip_edges();
 				status = STATUS_READING_ID;
 				// If we did not encounter msgctxt, we reset context to empty to reset it.
 				if (!entered_context) {
@@ -246,10 +249,10 @@ Ref<Resource> TranslationLoaderPO::load_translation(Ref<FileAccess> f, Error *r_
 			if (l.begins_with("msgstr[")) {
 				ERR_FAIL_COND_V_MSG(status != STATUS_READING_PLURAL, Ref<Resource>(), vformat("Unexpected 'msgstr[]', was expecting 'msgid_plural' before 'msgstr[]' while parsing: %s:%d.", path, line));
 				plural_index++; // Increment to add to the next slot in vector msgs_plural.
-				l = l.substr(9, l.length()).strip_edges();
+				l = l.substr(9).strip_edges();
 			} else if (l.begins_with("msgstr")) {
 				ERR_FAIL_COND_V_MSG(status != STATUS_READING_ID, Ref<Resource>(), vformat("Unexpected 'msgstr', was expecting 'msgid' before 'msgstr' while parsing: %s:%d.", path, line));
-				l = l.substr(6, l.length()).strip_edges();
+				l = l.substr(6).strip_edges();
 				status = STATUS_READING_STRING;
 			}
 
@@ -263,7 +266,7 @@ Ref<Resource> TranslationLoaderPO::load_translation(Ref<FileAccess> f, Error *r_
 
 			ERR_FAIL_COND_V_MSG(!l.begins_with("\"") || status == STATUS_NONE, Ref<Resource>(), vformat("Invalid line '%s' while parsing: %s:%d.", l, path, line));
 
-			l = l.substr(1, l.length());
+			l = l.substr(1);
 			// Find final quote, ignoring escaped ones (\").
 			// The escape_next logic is necessary to properly parse things like \\"
 			// where the backslash is the one being escaped, not the quote.
@@ -329,7 +332,7 @@ Ref<Resource> TranslationLoaderPO::load_translation(Ref<FileAccess> f, Error *r_
 			continue;
 		}
 		String prop = c.substr(0, p).strip_edges();
-		String value = c.substr(p + 1, c.length()).strip_edges();
+		String value = c.substr(p + 1).strip_edges();
 
 		if (prop == "X-Language" || prop == "Language") {
 			translation->set_locale(value);
diff --git a/engine/core/io/translation_loader_po.h b/engine/core/io/translation_loader_po.h
index 1f9782c4..5ed0e1f5 100644
--- a/engine/core/io/translation_loader_po.h
+++ b/engine/core/io/translation_loader_po.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSLATION_LOADER_PO_H
-#define TRANSLATION_LOADER_PO_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
@@ -49,5 +48,3 @@ public:
 
 	TranslationLoaderPO() {}
 };
-
-#endif // TRANSLATION_LOADER_PO_H
diff --git a/engine/core/io/udp_server.h b/engine/core/io/udp_server.h
index 39b7fd98..9edf4318 100644
--- a/engine/core/io/udp_server.h
+++ b/engine/core/io/udp_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UDP_SERVER_H
-#define UDP_SERVER_H
+#pragma once
 
 #include "core/io/net_socket.h"
 #include "core/io/packet_peer_udp.h"
@@ -76,5 +75,3 @@ public:
 	UDPServer();
 	~UDPServer();
 };
-
-#endif // UDP_SERVER_H
diff --git a/engine/core/io/xml_parser.cpp b/engine/core/io/xml_parser.cpp
index ed1f6f4e..a50a1723 100644
--- a/engine/core/io/xml_parser.cpp
+++ b/engine/core/io/xml_parser.cpp
@@ -95,7 +95,8 @@ void XMLParser::_ignore_definition() {
 	while (*P && *P != '>') {
 		next_char();
 	}
-	node_name.parse_utf8(F, P - F);
+	node_name.clear();
+	node_name.append_utf8(F, P - F);
 
 	if (*P) {
 		next_char();
diff --git a/engine/core/io/xml_parser.h b/engine/core/io/xml_parser.h
index a14bdee5..911d2b11 100644
--- a/engine/core/io/xml_parser.h
+++ b/engine/core/io/xml_parser.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XML_PARSER_H
-#define XML_PARSER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"
@@ -126,5 +125,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(XMLParser::NodeType);
-
-#endif // XML_PARSER_H
diff --git a/engine/core/io/zip_io.cpp b/engine/core/io/zip_io.cpp
index 972656e2..e01c181a 100644
--- a/engine/core/io/zip_io.cpp
+++ b/engine/core/io/zip_io.cpp
@@ -76,8 +76,7 @@ void *zipio_open(voidpf opaque, const char *p_fname, int mode) {
 	Ref<FileAccess> *fa = reinterpret_cast<Ref<FileAccess> *>(opaque);
 	ERR_FAIL_NULL_V(fa, nullptr);
 
-	String fname;
-	fname.parse_utf8(p_fname);
+	String fname = String::utf8(p_fname);
 
 	int file_access_mode = 0;
 	if (mode & ZLIB_FILEFUNC_MODE_READ) {
diff --git a/engine/core/io/zip_io.h b/engine/core/io/zip_io.h
index cd5c873c..82004d9c 100644
--- a/engine/core/io/zip_io.h
+++ b/engine/core/io/zip_io.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ZIP_IO_H
-#define ZIP_IO_H
+#pragma once
 
 #include "core/io/file_access.h"
 
@@ -61,5 +60,3 @@ voidpf zipio_alloc(voidpf opaque, uInt items, uInt size);
 void zipio_free(voidpf opaque, voidpf address);
 
 zlib_filefunc_def zipio_create_io(Ref<FileAccess> *p_data);
-
-#endif // ZIP_IO_H
diff --git a/engine/core/math/a_star.cpp b/engine/core/math/a_star.cpp
index 060b1bb1..9b6717c6 100644
--- a/engine/core/math/a_star.cpp
+++ b/engine/core/math/a_star.cpp
@@ -302,12 +302,7 @@ Vector3 AStar3D::get_closest_position_in_segment(const Vector3 &p_point) const {
 			continue;
 		}
 
-		Vector3 segment[2] = {
-			from_point->pos,
-			to_point->pos,
-		};
-
-		Vector3 p = Geometry3D::get_closest_point_to_segment(p_point, segment);
+		Vector3 p = Geometry3D::get_closest_point_to_segment(p_point, from_point->pos, to_point->pos);
 		real_t d = p_point.distance_squared_to(p);
 		if (d < closest_dist) {
 			closest_point = p;
diff --git a/engine/core/math/a_star.h b/engine/core/math/a_star.h
index e510923b..d7e0f3fd 100644
--- a/engine/core/math/a_star.h
+++ b/engine/core/math/a_star.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef A_STAR_H
-#define A_STAR_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
@@ -222,5 +221,3 @@ public:
 	AStar2D() {}
 	~AStar2D() {}
 };
-
-#endif // A_STAR_H
diff --git a/engine/core/math/a_star_grid_2d.cpp b/engine/core/math/a_star_grid_2d.cpp
index 7e0e982c..8bde50ad 100644
--- a/engine/core/math/a_star_grid_2d.cpp
+++ b/engine/core/math/a_star_grid_2d.cpp
@@ -34,27 +34,27 @@
 #include "core/variant/typed_array.h"
 
 static real_t heuristic_euclidean(const Vector2i &p_from, const Vector2i &p_to) {
-	real_t dx = (real_t)ABS(p_to.x - p_from.x);
-	real_t dy = (real_t)ABS(p_to.y - p_from.y);
+	real_t dx = (real_t)Math::abs(p_to.x - p_from.x);
+	real_t dy = (real_t)Math::abs(p_to.y - p_from.y);
 	return (real_t)Math::sqrt(dx * dx + dy * dy);
 }
 
 static real_t heuristic_manhattan(const Vector2i &p_from, const Vector2i &p_to) {
-	real_t dx = (real_t)ABS(p_to.x - p_from.x);
-	real_t dy = (real_t)ABS(p_to.y - p_from.y);
+	real_t dx = (real_t)Math::abs(p_to.x - p_from.x);
+	real_t dy = (real_t)Math::abs(p_to.y - p_from.y);
 	return dx + dy;
 }
 
 static real_t heuristic_octile(const Vector2i &p_from, const Vector2i &p_to) {
-	real_t dx = (real_t)ABS(p_to.x - p_from.x);
-	real_t dy = (real_t)ABS(p_to.y - p_from.y);
-	real_t F = Math_SQRT2 - 1;
+	real_t dx = (real_t)Math::abs(p_to.x - p_from.x);
+	real_t dy = (real_t)Math::abs(p_to.y - p_from.y);
+	real_t F = Math::SQRT2 - 1;
 	return (dx < dy) ? F * dx + dy : F * dy + dx;
 }
 
 static real_t heuristic_chebyshev(const Vector2i &p_from, const Vector2i &p_to) {
-	real_t dx = (real_t)ABS(p_to.x - p_from.x);
-	real_t dy = (real_t)ABS(p_to.y - p_from.y);
+	real_t dx = (real_t)Math::abs(p_to.x - p_from.x);
+	real_t dy = (real_t)Math::abs(p_to.y - p_from.y);
 	return MAX(dx, dy);
 }
 
@@ -503,6 +503,7 @@ bool AStarGrid2D::_solve(Point *p_begin_point, Point *p_end_point, bool p_allow_
 
 	LocalVector<Point *> open_list;
 	SortArray<Point *, SortPoints> sorter;
+	LocalVector<Point *> nbors;
 
 	p_begin_point->g_score = 0;
 	p_begin_point->f_score = _estimate_cost(p_begin_point->id, p_end_point->id);
@@ -528,7 +529,7 @@ bool AStarGrid2D::_solve(Point *p_begin_point, Point *p_end_point, bool p_allow_
 		open_list.remove_at(open_list.size() - 1);
 		p->closed_pass = pass; // Mark the point as closed.
 
-		LocalVector<Point *> nbors;
+		nbors.clear();
 		_get_nbors(p, nbors);
 
 		for (Point *e : nbors) {
diff --git a/engine/core/math/a_star_grid_2d.h b/engine/core/math/a_star_grid_2d.h
index ae6f3a1f..4883c092 100644
--- a/engine/core/math/a_star_grid_2d.h
+++ b/engine/core/math/a_star_grid_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef A_STAR_GRID_2D_H
-#define A_STAR_GRID_2D_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
@@ -230,5 +229,3 @@ public:
 VARIANT_ENUM_CAST(AStarGrid2D::DiagonalMode);
 VARIANT_ENUM_CAST(AStarGrid2D::Heuristic);
 VARIANT_ENUM_CAST(AStarGrid2D::CellShape)
-
-#endif // A_STAR_GRID_2D_H
diff --git a/engine/core/math/aabb.cpp b/engine/core/math/aabb.cpp
index 7d1d7c56..0e01771a 100644
--- a/engine/core/math/aabb.cpp
+++ b/engine/core/math/aabb.cpp
@@ -37,14 +37,6 @@ real_t AABB::get_volume() const {
 	return size.x * size.y * size.z;
 }
 
-bool AABB::operator==(const AABB &p_rval) const {
-	return ((position == p_rval.position) && (size == p_rval.size));
-}
-
-bool AABB::operator!=(const AABB &p_rval) const {
-	return ((position != p_rval.position) || (size != p_rval.size));
-}
-
 void AABB::merge_with(const AABB &p_aabb) {
 #ifdef MATH_CHECKS
 	if (unlikely(size.x < 0 || size.y < 0 || size.z < 0 || p_aabb.size.x < 0 || p_aabb.size.y < 0 || p_aabb.size.z < 0)) {
@@ -76,6 +68,10 @@ bool AABB::is_equal_approx(const AABB &p_aabb) const {
 	return position.is_equal_approx(p_aabb.position) && size.is_equal_approx(p_aabb.size);
 }
 
+bool AABB::is_same(const AABB &p_aabb) const {
+	return position.is_same(p_aabb.position) && size.is_same(p_aabb.size);
+}
+
 bool AABB::is_finite() const {
 	return position.is_finite() && size.is_finite();
 }
diff --git a/engine/core/math/aabb.h b/engine/core/math/aabb.h
index 7a5581b5..4d78fed8 100644
--- a/engine/core/math/aabb.h
+++ b/engine/core/math/aabb.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AABB_H
-#define AABB_H
+#pragma once
 
 #include "core/math/plane.h"
 #include "core/math/vector3.h"
@@ -59,10 +58,15 @@ struct [[nodiscard]] AABB {
 	const Vector3 &get_size() const { return size; }
 	void set_size(const Vector3 &p_size) { size = p_size; }
 
-	bool operator==(const AABB &p_rval) const;
-	bool operator!=(const AABB &p_rval) const;
+	constexpr bool operator==(const AABB &p_rval) const {
+		return position == p_rval.position && size == p_rval.size;
+	}
+	constexpr bool operator!=(const AABB &p_rval) const {
+		return position != p_rval.position || size != p_rval.size;
+	}
 
 	bool is_equal_approx(const AABB &p_aabb) const;
+	bool is_same(const AABB &p_aabb) const;
 	bool is_finite() const;
 	_FORCE_INLINE_ bool intersects(const AABB &p_aabb) const; /// Both AABBs overlap
 	_FORCE_INLINE_ bool intersects_inclusive(const AABB &p_aabb) const; /// Both AABBs (or their faces) overlap
@@ -129,8 +133,8 @@ struct [[nodiscard]] AABB {
 
 	operator String() const;
 
-	_FORCE_INLINE_ AABB() {}
-	inline AABB(const Vector3 &p_pos, const Vector3 &p_size) :
+	AABB() = default;
+	constexpr AABB(const Vector3 &p_pos, const Vector3 &p_size) :
 			position(p_pos),
 			size(p_size) {
 	}
@@ -496,4 +500,5 @@ AABB AABB::quantized(real_t p_unit) const {
 	return ret;
 }
 
-#endif // AABB_H
+template <>
+struct is_zero_constructible<AABB> : std::true_type {};
diff --git a/engine/core/math/audio_frame.h b/engine/core/math/audio_frame.h
index e205126c..ff0f9a5b 100644
--- a/engine/core/math/audio_frame.h
+++ b/engine/core/math/audio_frame.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_FRAME_H
-#define AUDIO_FRAME_H
+#pragma once
 
 #include "core/math/vector2.h"
 #include "core/typedefs.h"
@@ -53,6 +52,7 @@ static const float AUDIO_MIN_PEAK_DB = -200.0f; // linear_to_db(AUDIO_PEAK_OFFSE
 struct AudioFrame {
 	// Left and right samples.
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
 			float left;
 			float right;
@@ -64,6 +64,7 @@ struct AudioFrame {
 		};
 #endif
 		float levels[2] = { 0.0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_ALWAYS_INLINE_ const float &operator[](int p_idx) const {
@@ -75,46 +76,46 @@ struct AudioFrame {
 		return levels[p_idx];
 	}
 
-	_ALWAYS_INLINE_ AudioFrame operator+(const AudioFrame &p_frame) const { return AudioFrame(left + p_frame.left, right + p_frame.right); }
-	_ALWAYS_INLINE_ AudioFrame operator-(const AudioFrame &p_frame) const { return AudioFrame(left - p_frame.left, right - p_frame.right); }
-	_ALWAYS_INLINE_ AudioFrame operator*(const AudioFrame &p_frame) const { return AudioFrame(left * p_frame.left, right * p_frame.right); }
-	_ALWAYS_INLINE_ AudioFrame operator/(const AudioFrame &p_frame) const { return AudioFrame(left / p_frame.left, right / p_frame.right); }
+	constexpr AudioFrame operator+(const AudioFrame &p_frame) const { return AudioFrame(left + p_frame.left, right + p_frame.right); }
+	constexpr AudioFrame operator-(const AudioFrame &p_frame) const { return AudioFrame(left - p_frame.left, right - p_frame.right); }
+	constexpr AudioFrame operator*(const AudioFrame &p_frame) const { return AudioFrame(left * p_frame.left, right * p_frame.right); }
+	constexpr AudioFrame operator/(const AudioFrame &p_frame) const { return AudioFrame(left / p_frame.left, right / p_frame.right); }
 
-	_ALWAYS_INLINE_ AudioFrame operator+(float p_sample) const { return AudioFrame(left + p_sample, right + p_sample); }
-	_ALWAYS_INLINE_ AudioFrame operator-(float p_sample) const { return AudioFrame(left - p_sample, right - p_sample); }
-	_ALWAYS_INLINE_ AudioFrame operator*(float p_sample) const { return AudioFrame(left * p_sample, right * p_sample); }
-	_ALWAYS_INLINE_ AudioFrame operator/(float p_sample) const { return AudioFrame(left / p_sample, right / p_sample); }
+	constexpr AudioFrame operator+(float p_sample) const { return AudioFrame(left + p_sample, right + p_sample); }
+	constexpr AudioFrame operator-(float p_sample) const { return AudioFrame(left - p_sample, right - p_sample); }
+	constexpr AudioFrame operator*(float p_sample) const { return AudioFrame(left * p_sample, right * p_sample); }
+	constexpr AudioFrame operator/(float p_sample) const { return AudioFrame(left / p_sample, right / p_sample); }
 
-	_ALWAYS_INLINE_ void operator+=(const AudioFrame &p_frame) {
+	constexpr void operator+=(const AudioFrame &p_frame) {
 		left += p_frame.left;
 		right += p_frame.right;
 	}
-	_ALWAYS_INLINE_ void operator-=(const AudioFrame &p_frame) {
+	constexpr void operator-=(const AudioFrame &p_frame) {
 		left -= p_frame.left;
 		right -= p_frame.right;
 	}
-	_ALWAYS_INLINE_ void operator*=(const AudioFrame &p_frame) {
+	constexpr void operator*=(const AudioFrame &p_frame) {
 		left *= p_frame.left;
 		right *= p_frame.right;
 	}
-	_ALWAYS_INLINE_ void operator/=(const AudioFrame &p_frame) {
+	constexpr void operator/=(const AudioFrame &p_frame) {
 		left /= p_frame.left;
 		right /= p_frame.right;
 	}
 
-	_ALWAYS_INLINE_ void operator+=(float p_sample) {
+	constexpr void operator+=(float p_sample) {
 		left += p_sample;
 		right += p_sample;
 	}
-	_ALWAYS_INLINE_ void operator-=(float p_sample) {
+	constexpr void operator-=(float p_sample) {
 		left -= p_sample;
 		right -= p_sample;
 	}
-	_ALWAYS_INLINE_ void operator*=(float p_sample) {
+	constexpr void operator*=(float p_sample) {
 		left *= p_sample;
 		right *= p_sample;
 	}
-	_ALWAYS_INLINE_ void operator/=(float p_sample) {
+	constexpr void operator/=(float p_sample) {
 		left /= p_sample;
 		right /= p_sample;
 	}
@@ -133,41 +134,41 @@ struct AudioFrame {
 		return res;
 	}
 
-	_ALWAYS_INLINE_ AudioFrame(float p_left, float p_right) {
-		left = p_left;
-		right = p_right;
-	}
-	_ALWAYS_INLINE_ AudioFrame(const AudioFrame &p_frame) {
+	// NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
+	constexpr AudioFrame(float p_left, float p_right) :
+			left(p_left), right(p_right) {}
+	constexpr AudioFrame(const AudioFrame &p_frame) :
+			left(p_frame.left), right(p_frame.right) {}
+	// NOLINTEND(cppcoreguidelines-pro-type-member-init)
+
+	constexpr void operator=(const AudioFrame &p_frame) {
 		left = p_frame.left;
 		right = p_frame.right;
 	}
 
-	_ALWAYS_INLINE_ void operator=(const AudioFrame &p_frame) {
-		left = p_frame.left;
-		right = p_frame.right;
-	}
-
-	_ALWAYS_INLINE_ operator Vector2() const {
+	constexpr operator Vector2() const {
 		return Vector2(left, right);
 	}
 
-	_ALWAYS_INLINE_ AudioFrame(const Vector2 &p_v2) {
-		left = p_v2.x;
-		right = p_v2.y;
-	}
-	_ALWAYS_INLINE_ AudioFrame() {}
+	// NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
+	constexpr AudioFrame(const Vector2 &p_v2) :
+			left(p_v2.x), right(p_v2.y) {}
+	constexpr AudioFrame() :
+			left(0), right(0) {}
+	// NOLINTEND(cppcoreguidelines-pro-type-member-init)
 };
 
-_ALWAYS_INLINE_ AudioFrame operator*(float p_scalar, const AudioFrame &p_frame) {
+constexpr AudioFrame operator*(float p_scalar, const AudioFrame &p_frame) {
 	return AudioFrame(p_frame.left * p_scalar, p_frame.right * p_scalar);
 }
 
-_ALWAYS_INLINE_ AudioFrame operator*(int32_t p_scalar, const AudioFrame &p_frame) {
+constexpr AudioFrame operator*(int32_t p_scalar, const AudioFrame &p_frame) {
 	return AudioFrame(p_frame.left * p_scalar, p_frame.right * p_scalar);
 }
 
-_ALWAYS_INLINE_ AudioFrame operator*(int64_t p_scalar, const AudioFrame &p_frame) {
+constexpr AudioFrame operator*(int64_t p_scalar, const AudioFrame &p_frame) {
 	return AudioFrame(p_frame.left * p_scalar, p_frame.right * p_scalar);
 }
 
-#endif // AUDIO_FRAME_H
+template <>
+struct is_zero_constructible<AudioFrame> : std::true_type {};
diff --git a/engine/core/math/basis.cpp b/engine/core/math/basis.cpp
index 18959f3c..191f8a6a 100644
--- a/engine/core/math/basis.cpp
+++ b/engine/core/math/basis.cpp
@@ -186,7 +186,7 @@ Basis Basis::diagonalize() {
 		// Compute the rotation angle
 		real_t angle;
 		if (Math::is_equal_approx(rows[j][j], rows[i][i])) {
-			angle = Math_PI / 4;
+			angle = Math::PI / 4;
 		} else {
 			angle = 0.5f * Math::atan(2 * rows[i][j] / (rows[j][j] - rows[i][i]));
 		}
@@ -486,12 +486,12 @@ Vector3 Basis::get_euler(EulerOrder p_order) const {
 					}
 				} else {
 					euler.x = Math::atan2(rows[2][1], rows[1][1]);
-					euler.y = -Math_PI / 2.0f;
+					euler.y = -Math::PI / 2.0f;
 					euler.z = 0.0f;
 				}
 			} else {
 				euler.x = Math::atan2(rows[2][1], rows[1][1]);
-				euler.y = Math_PI / 2.0f;
+				euler.y = Math::PI / 2.0f;
 				euler.z = 0.0f;
 			}
 			return euler;
@@ -515,13 +515,13 @@ Vector3 Basis::get_euler(EulerOrder p_order) const {
 					// It's -1
 					euler.x = -Math::atan2(rows[1][2], rows[2][2]);
 					euler.y = 0.0f;
-					euler.z = Math_PI / 2.0f;
+					euler.z = Math::PI / 2.0f;
 				}
 			} else {
 				// It's 1
 				euler.x = -Math::atan2(rows[1][2], rows[2][2]);
 				euler.y = 0.0f;
-				euler.z = -Math_PI / 2.0f;
+				euler.z = -Math::PI / 2.0f;
 			}
 			return euler;
 		}
@@ -551,12 +551,12 @@ Vector3 Basis::get_euler(EulerOrder p_order) const {
 						euler.z = atan2(rows[1][0], rows[1][1]);
 					}
 				} else { // m12 == -1
-					euler.x = Math_PI * 0.5f;
+					euler.x = Math::PI * 0.5f;
 					euler.y = atan2(rows[0][1], rows[0][0]);
 					euler.z = 0;
 				}
 			} else { // m12 == 1
-				euler.x = -Math_PI * 0.5f;
+				euler.x = -Math::PI * 0.5f;
 				euler.y = -atan2(rows[0][1], rows[0][0]);
 				euler.z = 0;
 			}
@@ -582,13 +582,13 @@ Vector3 Basis::get_euler(EulerOrder p_order) const {
 					// It's -1
 					euler.x = Math::atan2(rows[2][1], rows[2][2]);
 					euler.y = 0.0f;
-					euler.z = -Math_PI / 2.0f;
+					euler.z = -Math::PI / 2.0f;
 				}
 			} else {
 				// It's 1
 				euler.x = Math::atan2(rows[2][1], rows[2][2]);
 				euler.y = 0.0f;
-				euler.z = Math_PI / 2.0f;
+				euler.z = Math::PI / 2.0f;
 			}
 			return euler;
 		} break;
@@ -608,13 +608,13 @@ Vector3 Basis::get_euler(EulerOrder p_order) const {
 					euler.z = Math::atan2(-rows[0][1], rows[1][1]);
 				} else {
 					// It's -1
-					euler.x = -Math_PI / 2.0f;
+					euler.x = -Math::PI / 2.0f;
 					euler.y = Math::atan2(rows[0][2], rows[0][0]);
 					euler.z = 0;
 				}
 			} else {
 				// It's 1
-				euler.x = Math_PI / 2.0f;
+				euler.x = Math::PI / 2.0f;
 				euler.y = Math::atan2(rows[0][2], rows[0][0]);
 				euler.z = 0;
 			}
@@ -637,13 +637,13 @@ Vector3 Basis::get_euler(EulerOrder p_order) const {
 				} else {
 					// It's -1
 					euler.x = 0;
-					euler.y = Math_PI / 2.0f;
+					euler.y = Math::PI / 2.0f;
 					euler.z = -Math::atan2(rows[0][1], rows[1][1]);
 				}
 			} else {
 				// It's 1
 				euler.x = 0;
-				euler.y = -Math_PI / 2.0f;
+				euler.y = -Math::PI / 2.0f;
 				euler.z = -Math::atan2(rows[0][1], rows[1][1]);
 			}
 			return euler;
@@ -699,26 +699,14 @@ bool Basis::is_equal_approx(const Basis &p_basis) const {
 	return rows[0].is_equal_approx(p_basis.rows[0]) && rows[1].is_equal_approx(p_basis.rows[1]) && rows[2].is_equal_approx(p_basis.rows[2]);
 }
 
+bool Basis::is_same(const Basis &p_basis) const {
+	return rows[0].is_same(p_basis.rows[0]) && rows[1].is_same(p_basis.rows[1]) && rows[2].is_same(p_basis.rows[2]);
+}
+
 bool Basis::is_finite() const {
 	return rows[0].is_finite() && rows[1].is_finite() && rows[2].is_finite();
 }
 
-bool Basis::operator==(const Basis &p_matrix) const {
-	for (int i = 0; i < 3; i++) {
-		for (int j = 0; j < 3; j++) {
-			if (rows[i][j] != p_matrix.rows[i][j]) {
-				return false;
-			}
-		}
-	}
-
-	return true;
-}
-
-bool Basis::operator!=(const Basis &p_matrix) const {
-	return (!(*this == p_matrix));
-}
-
 Basis::operator String() const {
 	return "[X: " + get_column(0).operator String() +
 			", Y: " + get_column(1).operator String() +
@@ -790,8 +778,8 @@ void Basis::get_axis_angle(Vector3 &r_axis, real_t &r_angle) const {
 		if ((xx > yy) && (xx > zz)) { // rows[0][0] is the largest diagonal term.
 			if (xx < CMP_EPSILON) {
 				x = 0;
-				y = Math_SQRT12;
-				z = Math_SQRT12;
+				y = Math::SQRT12;
+				z = Math::SQRT12;
 			} else {
 				x = Math::sqrt(xx);
 				y = xy / x;
@@ -799,9 +787,9 @@ void Basis::get_axis_angle(Vector3 &r_axis, real_t &r_angle) const {
 			}
 		} else if (yy > zz) { // rows[1][1] is the largest diagonal term.
 			if (yy < CMP_EPSILON) {
-				x = Math_SQRT12;
+				x = Math::SQRT12;
 				y = 0;
-				z = Math_SQRT12;
+				z = Math::SQRT12;
 			} else {
 				y = Math::sqrt(yy);
 				x = xy / y;
@@ -809,8 +797,8 @@ void Basis::get_axis_angle(Vector3 &r_axis, real_t &r_angle) const {
 			}
 		} else { // rows[2][2] is the largest diagonal term so base result on this.
 			if (zz < CMP_EPSILON) {
-				x = Math_SQRT12;
-				y = Math_SQRT12;
+				x = Math::SQRT12;
+				y = Math::SQRT12;
 				z = 0;
 			} else {
 				z = Math::sqrt(zz);
@@ -819,7 +807,7 @@ void Basis::get_axis_angle(Vector3 &r_axis, real_t &r_angle) const {
 			}
 		}
 		r_axis = Vector3(x, y, z);
-		r_angle = Math_PI;
+		r_angle = Math::PI;
 		return;
 	}
 	// As we have reached here there are no singularities so we can handle normally.
diff --git a/engine/core/math/basis.h b/engine/core/math/basis.h
index 2d4994de..e85437e7 100644
--- a/engine/core/math/basis.h
+++ b/engine/core/math/basis.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BASIS_H
-#define BASIS_H
+#pragma once
 
 #include "core/math/quaternion.h"
 #include "core/math/vector3.h"
@@ -41,10 +40,10 @@ struct [[nodiscard]] Basis {
 		Vector3(0, 0, 1)
 	};
 
-	_FORCE_INLINE_ const Vector3 &operator[](int p_row) const {
+	constexpr const Vector3 &operator[](int p_row) const {
 		return rows[p_row];
 	}
-	_FORCE_INLINE_ Vector3 &operator[](int p_row) {
+	constexpr Vector3 &operator[](int p_row) {
 		return rows[p_row];
 	}
 
@@ -121,23 +120,24 @@ struct [[nodiscard]] Basis {
 	}
 
 	bool is_equal_approx(const Basis &p_basis) const;
+	bool is_same(const Basis &p_basis) const;
 	bool is_finite() const;
 
-	bool operator==(const Basis &p_matrix) const;
-	bool operator!=(const Basis &p_matrix) const;
+	constexpr bool operator==(const Basis &p_matrix) const;
+	constexpr bool operator!=(const Basis &p_matrix) const;
 
 	_FORCE_INLINE_ Vector3 xform(const Vector3 &p_vector) const;
 	_FORCE_INLINE_ Vector3 xform_inv(const Vector3 &p_vector) const;
 	_FORCE_INLINE_ void operator*=(const Basis &p_matrix);
 	_FORCE_INLINE_ Basis operator*(const Basis &p_matrix) const;
-	_FORCE_INLINE_ void operator+=(const Basis &p_matrix);
-	_FORCE_INLINE_ Basis operator+(const Basis &p_matrix) const;
-	_FORCE_INLINE_ void operator-=(const Basis &p_matrix);
-	_FORCE_INLINE_ Basis operator-(const Basis &p_matrix) const;
-	_FORCE_INLINE_ void operator*=(real_t p_val);
-	_FORCE_INLINE_ Basis operator*(real_t p_val) const;
-	_FORCE_INLINE_ void operator/=(real_t p_val);
-	_FORCE_INLINE_ Basis operator/(real_t p_val) const;
+	constexpr void operator+=(const Basis &p_matrix);
+	constexpr Basis operator+(const Basis &p_matrix) const;
+	constexpr void operator-=(const Basis &p_matrix);
+	constexpr Basis operator-(const Basis &p_matrix) const;
+	constexpr void operator*=(real_t p_val);
+	constexpr Basis operator*(real_t p_val) const;
+	constexpr void operator/=(real_t p_val);
+	constexpr Basis operator/(real_t p_val) const;
 
 	bool is_orthogonal() const;
 	bool is_orthonormal() const;
@@ -204,9 +204,12 @@ struct [[nodiscard]] Basis {
 				rows[0].z * p_m[0].y + rows[1].z * p_m[1].y + rows[2].z * p_m[2].y,
 				rows[0].z * p_m[0].z + rows[1].z * p_m[1].z + rows[2].z * p_m[2].z);
 	}
-	Basis(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_zx, real_t p_zy, real_t p_zz) {
-		set(p_xx, p_xy, p_xz, p_yx, p_yy, p_yz, p_zx, p_zy, p_zz);
-	}
+	constexpr Basis(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_zx, real_t p_zy, real_t p_zz) :
+			rows{
+				{ p_xx, p_xy, p_xz },
+				{ p_yx, p_yy, p_yz },
+				{ p_zx, p_zy, p_zz },
+			} {}
 
 	void orthonormalize();
 	Basis orthonormalized() const;
@@ -230,17 +233,36 @@ struct [[nodiscard]] Basis {
 	Basis(const Vector3 &p_axis, real_t p_angle, const Vector3 &p_scale) { set_axis_angle_scale(p_axis, p_angle, p_scale); }
 	static Basis from_scale(const Vector3 &p_scale);
 
-	_FORCE_INLINE_ Basis(const Vector3 &p_x_axis, const Vector3 &p_y_axis, const Vector3 &p_z_axis) {
-		set_columns(p_x_axis, p_y_axis, p_z_axis);
-	}
+	constexpr Basis(const Vector3 &p_x_axis, const Vector3 &p_y_axis, const Vector3 &p_z_axis) :
+			rows{
+				{ p_x_axis.x, p_y_axis.x, p_z_axis.x },
+				{ p_x_axis.y, p_y_axis.y, p_z_axis.y },
+				{ p_x_axis.z, p_y_axis.z, p_z_axis.z },
+			} {}
 
-	_FORCE_INLINE_ Basis() {}
+	Basis() = default;
 
 private:
 	// Helper method.
 	void _set_diagonal(const Vector3 &p_diag);
 };
 
+constexpr bool Basis::operator==(const Basis &p_matrix) const {
+	for (int i = 0; i < 3; i++) {
+		for (int j = 0; j < 3; j++) {
+			if (rows[i][j] != p_matrix.rows[i][j]) {
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
+constexpr bool Basis::operator!=(const Basis &p_matrix) const {
+	return (!(*this == p_matrix));
+}
+
 _FORCE_INLINE_ void Basis::operator*=(const Basis &p_matrix) {
 	set(
 			p_matrix.tdotx(rows[0]), p_matrix.tdoty(rows[0]), p_matrix.tdotz(rows[0]),
@@ -255,49 +277,49 @@ _FORCE_INLINE_ Basis Basis::operator*(const Basis &p_matrix) const {
 			p_matrix.tdotx(rows[2]), p_matrix.tdoty(rows[2]), p_matrix.tdotz(rows[2]));
 }
 
-_FORCE_INLINE_ void Basis::operator+=(const Basis &p_matrix) {
+constexpr void Basis::operator+=(const Basis &p_matrix) {
 	rows[0] += p_matrix.rows[0];
 	rows[1] += p_matrix.rows[1];
 	rows[2] += p_matrix.rows[2];
 }
 
-_FORCE_INLINE_ Basis Basis::operator+(const Basis &p_matrix) const {
+constexpr Basis Basis::operator+(const Basis &p_matrix) const {
 	Basis ret(*this);
 	ret += p_matrix;
 	return ret;
 }
 
-_FORCE_INLINE_ void Basis::operator-=(const Basis &p_matrix) {
+constexpr void Basis::operator-=(const Basis &p_matrix) {
 	rows[0] -= p_matrix.rows[0];
 	rows[1] -= p_matrix.rows[1];
 	rows[2] -= p_matrix.rows[2];
 }
 
-_FORCE_INLINE_ Basis Basis::operator-(const Basis &p_matrix) const {
+constexpr Basis Basis::operator-(const Basis &p_matrix) const {
 	Basis ret(*this);
 	ret -= p_matrix;
 	return ret;
 }
 
-_FORCE_INLINE_ void Basis::operator*=(real_t p_val) {
+constexpr void Basis::operator*=(real_t p_val) {
 	rows[0] *= p_val;
 	rows[1] *= p_val;
 	rows[2] *= p_val;
 }
 
-_FORCE_INLINE_ Basis Basis::operator*(real_t p_val) const {
+constexpr Basis Basis::operator*(real_t p_val) const {
 	Basis ret(*this);
 	ret *= p_val;
 	return ret;
 }
 
-_FORCE_INLINE_ void Basis::operator/=(real_t p_val) {
+constexpr void Basis::operator/=(real_t p_val) {
 	rows[0] /= p_val;
 	rows[1] /= p_val;
 	rows[2] /= p_val;
 }
 
-_FORCE_INLINE_ Basis Basis::operator/(real_t p_val) const {
+constexpr Basis Basis::operator/(real_t p_val) const {
 	Basis ret(*this);
 	ret /= p_val;
 	return ret;
@@ -322,5 +344,3 @@ real_t Basis::determinant() const {
 			rows[1][0] * (rows[0][1] * rows[2][2] - rows[2][1] * rows[0][2]) +
 			rows[2][0] * (rows[0][1] * rows[1][2] - rows[1][1] * rows[0][2]);
 }
-
-#endif // BASIS_H
diff --git a/engine/core/math/bvh.h b/engine/core/math/bvh.h
index 4815466e..9a9dde17 100644
--- a/engine/core/math/bvh.h
+++ b/engine/core/math/bvh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BVH_H
-#define BVH_H
+#pragma once
 
 // BVH
 // This class provides a wrapper around BVH tree, which contains most of the functionality
@@ -52,6 +51,8 @@
 // and pairable_mask is either 0 if static, or set to all if non static
 
 #include "bvh_tree.h"
+
+#include "core/math/geometry_3d.h"
 #include "core/os/mutex.h"
 
 #define BVHTREE_CLASS BVH_Tree<T, NUM_TREES, 2, MAX_ITEMS, USER_PAIR_TEST_FUNCTION, USER_CULL_TEST_FUNCTION, USE_PAIRS, BOUNDS, POINT>
@@ -405,7 +406,7 @@ public:
 		}
 
 		Vector<Vector3> convex_points = Geometry3D::compute_convex_mesh_points(&p_convex[0], p_convex.size());
-		if (convex_points.size() == 0) {
+		if (convex_points.is_empty()) {
 			return 0;
 		}
 
@@ -435,8 +436,6 @@ private:
 			return;
 		}
 
-		BOUNDS bb;
-
 		typename BVHTREE_CLASS::CullParams params;
 
 		params.result_count_overall = 0;
@@ -806,5 +805,3 @@ public:
 };
 
 #undef BVHTREE_CLASS
-
-#endif // BVH_H
diff --git a/engine/core/math/bvh_abb.h b/engine/core/math/bvh_abb.h
index 3d32c250..b96ea085 100644
--- a/engine/core/math/bvh_abb.h
+++ b/engine/core/math/bvh_abb.h
@@ -28,8 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BVH_ABB_H
-#define BVH_ABB_H
+#pragma once
+
+#include "core/math/aabb.h"
 
 // special optimized version of axis aligned bounding box
 template <typename BOUNDS = AABB, typename POINT = Vector3>
@@ -288,5 +289,3 @@ struct BVH_ABB {
 		return false;
 	}
 };
-
-#endif // BVH_ABB_H
diff --git a/engine/core/math/bvh_tree.h b/engine/core/math/bvh_tree.h
index 2a2a6d67..76e5c999 100644
--- a/engine/core/math/bvh_tree.h
+++ b/engine/core/math/bvh_tree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BVH_TREE_H
-#define BVH_TREE_H
+#pragma once
 
 // BVH Tree
 // This is an implementation of a dynamic BVH with templated leaf size.
@@ -41,7 +40,6 @@
 
 #include "core/math/aabb.h"
 #include "core/math/bvh_abb.h"
-#include "core/math/geometry_3d.h"
 #include "core/math/vector3.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/pooled_list.h"
@@ -454,5 +452,3 @@ private:
 };
 
 #undef VERBOSE_PRINT
-
-#endif // BVH_TREE_H
diff --git a/engine/core/math/color.cpp b/engine/core/math/color.cpp
index 4c31d814..d032a3fe 100644
--- a/engine/core/math/color.cpp
+++ b/engine/core/math/color.cpp
@@ -109,36 +109,27 @@ uint64_t Color::to_rgba64() const {
 	return c;
 }
 
-String _to_hex(float p_val) {
+void _append_hex(float p_val, char32_t *string) {
 	int v = Math::round(p_val * 255.0f);
 	v = CLAMP(v, 0, 255);
-	String ret;
 
-	for (int i = 0; i < 2; i++) {
-		char32_t c[2] = { 0, 0 };
-		int lv = v & 0xF;
-		if (lv < 10) {
-			c[0] = '0' + lv;
-		} else {
-			c[0] = 'a' + lv - 10;
-		}
-
-		v >>= 4;
-		String cs = (const char32_t *)c;
-		ret = cs + ret;
-	}
-
-	return ret;
+	string[0] = hex_char_table_lower[(v >> 4) & 0xF];
+	string[1] = hex_char_table_lower[v & 0xF];
 }
 
 String Color::to_html(bool p_alpha) const {
 	String txt;
-	txt += _to_hex(r);
-	txt += _to_hex(g);
-	txt += _to_hex(b);
+	txt.resize(p_alpha ? 9 : 7);
+	char32_t *ptr = txt.ptrw();
+
+	_append_hex(r, ptr + 0);
+	_append_hex(g, ptr + 2);
+	_append_hex(b, ptr + 4);
 	if (p_alpha) {
-		txt += _to_hex(a);
+		_append_hex(a, ptr + 6);
 	}
+	ptr[txt.size() - 1] = '\0';
+
 	return txt;
 }
 
@@ -259,6 +250,10 @@ bool Color::is_equal_approx(const Color &p_color) const {
 	return Math::is_equal_approx(r, p_color.r) && Math::is_equal_approx(g, p_color.g) && Math::is_equal_approx(b, p_color.b) && Math::is_equal_approx(a, p_color.a);
 }
 
+bool Color::is_same(const Color &p_color) const {
+	return Math::is_same(r, p_color.r) && Math::is_same(g, p_color.g) && Math::is_same(b, p_color.b) && Math::is_same(a, p_color.a);
+}
+
 Color Color::clamp(const Color &p_min, const Color &p_max) const {
 	return Color(
 			CLAMP(r, p_min.r, p_max.r),
@@ -321,47 +316,38 @@ Color Color::inverted() const {
 }
 
 Color Color::html(const String &p_rgba) {
-	String color = p_rgba;
-	if (color.length() == 0) {
+	if (p_rgba.is_empty()) {
 		return Color();
 	}
-	if (color[0] == '#') {
-		color = color.substr(1);
-	}
 
-	// If enabled, use 1 hex digit per channel instead of 2.
-	// Other sizes aren't in the HTML/CSS spec but we could add them if desired.
-	bool is_shorthand = color.length() < 5;
-	bool alpha = false;
+	const int current_pos = (p_rgba[0] == '#') ? 1 : 0;
+	const int num_of_digits = p_rgba.length() - current_pos;
 
-	if (color.length() == 8) {
-		alpha = true;
-	} else if (color.length() == 6) {
-		alpha = false;
-	} else if (color.length() == 4) {
-		alpha = true;
-	} else if (color.length() == 3) {
-		alpha = false;
+	float r, g, b, a = 1.0f;
+
+	if (num_of_digits == 3) {
+		// #rgb
+		r = _parse_col4(p_rgba, current_pos) / 15.0f;
+		g = _parse_col4(p_rgba, current_pos + 1) / 15.0f;
+		b = _parse_col4(p_rgba, current_pos + 2) / 15.0f;
+	} else if (num_of_digits == 4) {
+		r = _parse_col4(p_rgba, current_pos) / 15.0f;
+		g = _parse_col4(p_rgba, current_pos + 1) / 15.0f;
+		b = _parse_col4(p_rgba, current_pos + 2) / 15.0f;
+		a = _parse_col4(p_rgba, current_pos + 3) / 15.0f;
+	} else if (num_of_digits == 6) {
+		r = _parse_col8(p_rgba, current_pos) / 255.0f;
+		g = _parse_col8(p_rgba, current_pos + 2) / 255.0f;
+		b = _parse_col8(p_rgba, current_pos + 4) / 255.0f;
+	} else if (num_of_digits == 8) {
+		r = _parse_col8(p_rgba, current_pos) / 255.0f;
+		g = _parse_col8(p_rgba, current_pos + 2) / 255.0f;
+		b = _parse_col8(p_rgba, current_pos + 4) / 255.0f;
+		a = _parse_col8(p_rgba, current_pos + 6) / 255.0f;
 	} else {
 		ERR_FAIL_V_MSG(Color(), "Invalid color code: " + p_rgba + ".");
 	}
 
-	float r, g, b, a = 1.0f;
-	if (is_shorthand) {
-		r = _parse_col4(color, 0) / 15.0f;
-		g = _parse_col4(color, 1) / 15.0f;
-		b = _parse_col4(color, 2) / 15.0f;
-		if (alpha) {
-			a = _parse_col4(color, 3) / 15.0f;
-		}
-	} else {
-		r = _parse_col8(color, 0) / 255.0f;
-		g = _parse_col8(color, 2) / 255.0f;
-		b = _parse_col8(color, 4) / 255.0f;
-		if (alpha) {
-			a = _parse_col8(color, 6) / 255.0f;
-		}
-	}
 	ERR_FAIL_COND_V_MSG(r < 0.0f, Color(), "Invalid color code: " + p_rgba + ".");
 	ERR_FAIL_COND_V_MSG(g < 0.0f, Color(), "Invalid color code: " + p_rgba + ".");
 	ERR_FAIL_COND_V_MSG(b < 0.0f, Color(), "Invalid color code: " + p_rgba + ".");
@@ -373,22 +359,20 @@ Color Color::html(const String &p_rgba) {
 bool Color::html_is_valid(const String &p_color) {
 	String color = p_color;
 
-	if (color.length() == 0) {
+	if (color.is_empty()) {
 		return false;
 	}
-	if (color[0] == '#') {
-		color = color.substr(1);
-	}
 
-	// Check if the amount of hex digits is valid.
-	int len = color.length();
-	if (!(len == 3 || len == 4 || len == 6 || len == 8)) {
+	const int current_pos = (color[0] == '#') ? 1 : 0;
+	const int len = color.length();
+	const int num_of_digits = len - current_pos;
+	if (!(num_of_digits == 3 || num_of_digits == 4 || num_of_digits == 6 || num_of_digits == 8)) {
 		return false;
 	}
 
 	// Check if each hex digit is valid.
-	for (int i = 0; i < len; i++) {
-		if (_parse_col4(color, i) == -1) {
+	for (int i = current_pos; i < len; i++) {
+		if (!is_hex_digit(p_color[i])) {
 			return false;
 		}
 	}
@@ -415,18 +399,14 @@ Color Color::named(const String &p_name, const Color &p_default) {
 int Color::find_named_color(const String &p_name) {
 	String name = p_name;
 	// Normalize name.
-	name = name.replace(" ", "");
-	name = name.replace("-", "");
-	name = name.replace("_", "");
-	name = name.replace("'", "");
-	name = name.replace(".", "");
+	name = name.remove_chars(" -_'.");
 	name = name.to_upper();
 
 	static HashMap<String, int> named_colors_hashmap;
 	if (unlikely(named_colors_hashmap.is_empty())) {
 		const int named_color_count = get_named_color_count();
 		for (int i = 0; i < named_color_count; i++) {
-			named_colors_hashmap[String(named_colors[i].name).replace("_", "")] = i;
+			named_colors_hashmap[String(named_colors[i].name).remove_char('_')] = i;
 		}
 	}
 
@@ -439,7 +419,7 @@ int Color::find_named_color(const String &p_name) {
 }
 
 int Color::get_named_color_count() {
-	return sizeof(named_colors) / sizeof(NamedColor);
+	return std::size(named_colors);
 }
 
 String Color::get_named_color_name(int p_idx) {
@@ -490,104 +470,6 @@ Color::operator String() const {
 	return "(" + String::num(r, 4) + ", " + String::num(g, 4) + ", " + String::num(b, 4) + ", " + String::num(a, 4) + ")";
 }
 
-Color Color::operator+(const Color &p_color) const {
-	return Color(
-			r + p_color.r,
-			g + p_color.g,
-			b + p_color.b,
-			a + p_color.a);
-}
-
-void Color::operator+=(const Color &p_color) {
-	r = r + p_color.r;
-	g = g + p_color.g;
-	b = b + p_color.b;
-	a = a + p_color.a;
-}
-
-Color Color::operator-(const Color &p_color) const {
-	return Color(
-			r - p_color.r,
-			g - p_color.g,
-			b - p_color.b,
-			a - p_color.a);
-}
-
-void Color::operator-=(const Color &p_color) {
-	r = r - p_color.r;
-	g = g - p_color.g;
-	b = b - p_color.b;
-	a = a - p_color.a;
-}
-
-Color Color::operator*(const Color &p_color) const {
-	return Color(
-			r * p_color.r,
-			g * p_color.g,
-			b * p_color.b,
-			a * p_color.a);
-}
-
-Color Color::operator*(float p_scalar) const {
-	return Color(
-			r * p_scalar,
-			g * p_scalar,
-			b * p_scalar,
-			a * p_scalar);
-}
-
-void Color::operator*=(const Color &p_color) {
-	r = r * p_color.r;
-	g = g * p_color.g;
-	b = b * p_color.b;
-	a = a * p_color.a;
-}
-
-void Color::operator*=(float p_scalar) {
-	r = r * p_scalar;
-	g = g * p_scalar;
-	b = b * p_scalar;
-	a = a * p_scalar;
-}
-
-Color Color::operator/(const Color &p_color) const {
-	return Color(
-			r / p_color.r,
-			g / p_color.g,
-			b / p_color.b,
-			a / p_color.a);
-}
-
-Color Color::operator/(float p_scalar) const {
-	return Color(
-			r / p_scalar,
-			g / p_scalar,
-			b / p_scalar,
-			a / p_scalar);
-}
-
-void Color::operator/=(const Color &p_color) {
-	r = r / p_color.r;
-	g = g / p_color.g;
-	b = b / p_color.b;
-	a = a / p_color.a;
-}
-
-void Color::operator/=(float p_scalar) {
-	r = r / p_scalar;
-	g = g / p_scalar;
-	b = b / p_scalar;
-	a = a / p_scalar;
-}
-
-Color Color::operator-() const {
-	return Color(
-			1.0f - r,
-			1.0f - g,
-			1.0f - b,
-			1.0f - a);
-}
-
 Color Color::from_ok_hsl(float p_h, float p_s, float p_l, float p_alpha) {
 	Color c;
 	c.set_ok_hsl(p_h, p_s, p_l, p_alpha);
diff --git a/engine/core/math/color.h b/engine/core/math/color.h
index c2ffde18..ae91677d 100644
--- a/engine/core/math/color.h
+++ b/engine/core/math/color.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLOR_H
-#define COLOR_H
+#pragma once
 
 #include "core/math/math_funcs.h"
 
@@ -37,6 +36,7 @@ class String;
 
 struct [[nodiscard]] Color {
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
 			float r;
 			float g;
@@ -44,6 +44,7 @@ struct [[nodiscard]] Color {
 			float a;
 		};
 		float components[4] = { 0, 0, 0, 1.0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	uint32_t to_rgba32() const;
@@ -69,31 +70,32 @@ struct [[nodiscard]] Color {
 		return components[p_idx];
 	}
 
-	bool operator==(const Color &p_color) const {
+	constexpr bool operator==(const Color &p_color) const {
 		return (r == p_color.r && g == p_color.g && b == p_color.b && a == p_color.a);
 	}
-	bool operator!=(const Color &p_color) const {
+	constexpr bool operator!=(const Color &p_color) const {
 		return (r != p_color.r || g != p_color.g || b != p_color.b || a != p_color.a);
 	}
 
-	Color operator+(const Color &p_color) const;
-	void operator+=(const Color &p_color);
+	constexpr Color operator+(const Color &p_color) const;
+	constexpr void operator+=(const Color &p_color);
 
-	Color operator-() const;
-	Color operator-(const Color &p_color) const;
-	void operator-=(const Color &p_color);
+	constexpr Color operator-() const;
+	constexpr Color operator-(const Color &p_color) const;
+	constexpr void operator-=(const Color &p_color);
 
-	Color operator*(const Color &p_color) const;
-	Color operator*(float p_scalar) const;
-	void operator*=(const Color &p_color);
-	void operator*=(float p_scalar);
+	constexpr Color operator*(const Color &p_color) const;
+	constexpr Color operator*(float p_scalar) const;
+	constexpr void operator*=(const Color &p_color);
+	constexpr void operator*=(float p_scalar);
 
-	Color operator/(const Color &p_color) const;
-	Color operator/(float p_scalar) const;
-	void operator/=(const Color &p_color);
-	void operator/=(float p_scalar);
+	constexpr Color operator/(const Color &p_color) const;
+	constexpr Color operator/(float p_scalar) const;
+	constexpr void operator/=(const Color &p_color);
+	constexpr void operator/=(float p_scalar);
 
 	bool is_equal_approx(const Color &p_color) const;
+	bool is_same(const Color &p_color) const;
 
 	Color clamp(const Color &p_min = Color(0, 0, 0, 0), const Color &p_max = Color(1, 1, 1, 1)) const;
 	void invert();
@@ -215,7 +217,7 @@ struct [[nodiscard]] Color {
 	static Color from_rgbe9995(uint32_t p_rgbe);
 	static Color from_rgba8(int64_t p_r8, int64_t p_g8, int64_t p_b8, int64_t p_a8 = 255);
 
-	_FORCE_INLINE_ bool operator<(const Color &p_color) const; // Used in set keys.
+	constexpr bool operator<(const Color &p_color) const; // Used in set keys.
 	operator String() const;
 
 	// For the binder.
@@ -235,39 +237,29 @@ struct [[nodiscard]] Color {
 	_FORCE_INLINE_ void set_ok_hsl_s(float p_s) { set_ok_hsl(get_ok_hsl_h(), p_s, get_ok_hsl_l(), a); }
 	_FORCE_INLINE_ void set_ok_hsl_l(float p_l) { set_ok_hsl(get_ok_hsl_h(), get_ok_hsl_s(), p_l, a); }
 
-	_FORCE_INLINE_ Color() {}
+	constexpr Color() :
+			r(0), g(0), b(0), a(1) {}
 
 	/**
 	 * RGBA construct parameters.
 	 * Alpha is not optional as otherwise we can't bind the RGB version for scripting.
 	 */
-	_FORCE_INLINE_ Color(float p_r, float p_g, float p_b, float p_a) {
-		r = p_r;
-		g = p_g;
-		b = p_b;
-		a = p_a;
-	}
+	constexpr Color(float p_r, float p_g, float p_b, float p_a) :
+			r(p_r), g(p_g), b(p_b), a(p_a) {}
 
 	/**
 	 * RGB construct parameters.
 	 */
-	_FORCE_INLINE_ Color(float p_r, float p_g, float p_b) {
-		r = p_r;
-		g = p_g;
-		b = p_b;
-		a = 1.0f;
-	}
+	constexpr Color(float p_r, float p_g, float p_b) :
+			r(p_r), g(p_g), b(p_b), a(1) {}
 
 	/**
 	 * Construct a Color from another Color, but with the specified alpha value.
 	 */
-	_FORCE_INLINE_ Color(const Color &p_c, float p_a) {
-		r = p_c.r;
-		g = p_c.g;
-		b = p_c.b;
-		a = p_a;
-	}
+	constexpr Color(const Color &p_c, float p_a) :
+			r(p_c.r), g(p_c.g), b(p_c.b), a(p_a) {}
 
+	// NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
 	Color(const String &p_code) {
 		if (html_is_valid(p_code)) {
 			*this = html(p_code);
@@ -280,9 +272,108 @@ struct [[nodiscard]] Color {
 		*this = Color(p_code);
 		a = p_a;
 	}
+	// NOLINTEND(cppcoreguidelines-pro-type-member-init)
 };
 
-bool Color::operator<(const Color &p_color) const {
+constexpr Color Color::operator+(const Color &p_color) const {
+	return Color(
+			r + p_color.r,
+			g + p_color.g,
+			b + p_color.b,
+			a + p_color.a);
+}
+
+constexpr void Color::operator+=(const Color &p_color) {
+	r = r + p_color.r;
+	g = g + p_color.g;
+	b = b + p_color.b;
+	a = a + p_color.a;
+}
+
+constexpr Color Color::operator-(const Color &p_color) const {
+	return Color(
+			r - p_color.r,
+			g - p_color.g,
+			b - p_color.b,
+			a - p_color.a);
+}
+
+constexpr void Color::operator-=(const Color &p_color) {
+	r = r - p_color.r;
+	g = g - p_color.g;
+	b = b - p_color.b;
+	a = a - p_color.a;
+}
+
+constexpr Color Color::operator*(const Color &p_color) const {
+	return Color(
+			r * p_color.r,
+			g * p_color.g,
+			b * p_color.b,
+			a * p_color.a);
+}
+
+constexpr Color Color::operator*(float p_scalar) const {
+	return Color(
+			r * p_scalar,
+			g * p_scalar,
+			b * p_scalar,
+			a * p_scalar);
+}
+
+constexpr void Color::operator*=(const Color &p_color) {
+	r = r * p_color.r;
+	g = g * p_color.g;
+	b = b * p_color.b;
+	a = a * p_color.a;
+}
+
+constexpr void Color::operator*=(float p_scalar) {
+	r = r * p_scalar;
+	g = g * p_scalar;
+	b = b * p_scalar;
+	a = a * p_scalar;
+}
+
+constexpr Color Color::operator/(const Color &p_color) const {
+	return Color(
+			r / p_color.r,
+			g / p_color.g,
+			b / p_color.b,
+			a / p_color.a);
+}
+
+constexpr Color Color::operator/(float p_scalar) const {
+	return Color(
+			r / p_scalar,
+			g / p_scalar,
+			b / p_scalar,
+			a / p_scalar);
+}
+
+constexpr void Color::operator/=(const Color &p_color) {
+	r = r / p_color.r;
+	g = g / p_color.g;
+	b = b / p_color.b;
+	a = a / p_color.a;
+}
+
+constexpr void Color::operator/=(float p_scalar) {
+	r = r / p_scalar;
+	g = g / p_scalar;
+	b = b / p_scalar;
+	a = a / p_scalar;
+}
+
+constexpr Color Color::operator-() const {
+	return Color(
+			1.0f - r,
+			1.0f - g,
+			1.0f - b,
+			1.0f - a);
+}
+
+constexpr bool Color::operator<(const Color &p_color) const {
 	if (r == p_color.r) {
 		if (g == p_color.g) {
 			if (b == p_color.b) {
@@ -298,8 +389,6 @@ bool Color::operator<(const Color &p_color) const {
 	}
 }
 
-_FORCE_INLINE_ Color operator*(float p_scalar, const Color &p_color) {
+constexpr Color operator*(float p_scalar, const Color &p_color) {
 	return p_color * p_scalar;
 }
-
-#endif // COLOR_H
diff --git a/engine/core/math/color_names.inc b/engine/core/math/color_names.inc
index 6c0d2a4b..969acc68 100644
--- a/engine/core/math/color_names.inc
+++ b/engine/core/math/color_names.inc
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 // Names from https://en.wikipedia.org/wiki/X11_color_names
 
 // So this in a way that does not require memory allocation
 // the old way leaked memory
 // this is not used as often as for more performance to make sense
 
+#include "core/math/color.h"
+
 struct NamedColor {
 	const char *name;
 	Color color;
diff --git a/engine/core/math/convex_hull.cpp b/engine/core/math/convex_hull.cpp
index 4052234f..fbd367b9 100644
--- a/engine/core/math/convex_hull.cpp
+++ b/engine/core/math/convex_hull.cpp
@@ -2237,7 +2237,7 @@ real_t ConvexHullComputer::compute(const Vector3 *p_coords, int32_t p_count, rea
 Error ConvexHullComputer::convex_hull(const Vector<Vector3> &p_points, Geometry3D::MeshData &r_mesh) {
 	r_mesh = Geometry3D::MeshData(); // clear
 
-	if (p_points.size() == 0) {
+	if (p_points.is_empty()) {
 		return FAILED; // matches QuickHull
 	}
 
diff --git a/engine/core/math/convex_hull.h b/engine/core/math/convex_hull.h
index 75787f7b..9af39790 100644
--- a/engine/core/math/convex_hull.h
+++ b/engine/core/math/convex_hull.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONVEX_HULL_H
-#define CONVEX_HULL_H
+#pragma once
 
 /*
 Copyright (c) 2011 Ole Kniemeyer, MAXON, www.maxon.net
@@ -112,5 +111,3 @@ public:
 
 	static Error convex_hull(const Vector<Vector3> &p_points, Geometry3D::MeshData &r_mesh);
 };
-
-#endif // CONVEX_HULL_H
diff --git a/engine/core/math/delaunay_2d.h b/engine/core/math/delaunay_2d.h
index 0bc67a92..cb0eca2b 100644
--- a/engine/core/math/delaunay_2d.h
+++ b/engine/core/math/delaunay_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DELAUNAY_2D_H
-#define DELAUNAY_2D_H
+#pragma once
 
 #include "core/math/rect2.h"
 #include "core/templates/vector.h"
@@ -156,5 +155,3 @@ public:
 		return triangles;
 	}
 };
-
-#endif // DELAUNAY_2D_H
diff --git a/engine/core/math/delaunay_3d.h b/engine/core/math/delaunay_3d.h
index 5bbdcc09..122ff945 100644
--- a/engine/core/math/delaunay_3d.h
+++ b/engine/core/math/delaunay_3d.h
@@ -28,17 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DELAUNAY_3D_H
-#define DELAUNAY_3D_H
+#pragma once
 
-#include "core/io/file_access.h"
 #include "core/math/aabb.h"
 #include "core/math/projection.h"
 #include "core/math/vector3.h"
+#include "core/templates/list.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/oa_hash_map.h"
 #include "core/templates/vector.h"
-#include "core/variant/variant.h"
 
 #include "thirdparty/misc/r128.h"
 
@@ -187,7 +185,7 @@ class Delaunay3D {
 			Plane p(p_points[p_simplex.points[i]], p_points[p_simplex.points[(i + 1) % 4]], p_points[p_simplex.points[(i + 2) % 4]]);
 			// This tolerance should not be smaller than the one used with
 			// Plane::has_point() when creating the LightmapGI probe BSP tree.
-			if (ABS(p.distance_to(p_points[p_simplex.points[(i + 3) % 4]])) < 0.001) {
+			if (Math::abs(p.distance_to(p_points[p_simplex.points[(i + 3) % 4]])) < 0.001) {
 				return true;
 			}
 		}
@@ -389,5 +387,3 @@ public:
 		return ret_simplices;
 	}
 };
-
-#endif // DELAUNAY_3D_H
diff --git a/engine/core/math/disjoint_set.h b/engine/core/math/disjoint_set.h
index 4348da99..9345375f 100644
--- a/engine/core/math/disjoint_set.h
+++ b/engine/core/math/disjoint_set.h
@@ -28,10 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISJOINT_SET_H
-#define DISJOINT_SET_H
+#pragma once
 
-#include "core/templates/rb_map.h"
+#include "core/templates/hash_map.h"
 #include "core/templates/vector.h"
 
 /* This DisjointSet class uses Find with path compression and Union by rank */
@@ -146,5 +145,3 @@ void DisjointSet<T, H, C, AL>::get_members(Vector<T> &out_members, T representat
 		}
 	}
 }
-
-#endif // DISJOINT_SET_H
diff --git a/engine/core/math/dynamic_bvh.cpp b/engine/core/math/dynamic_bvh.cpp
index e1315d1c..1195072a 100644
--- a/engine/core/math/dynamic_bvh.cpp
+++ b/engine/core/math/dynamic_bvh.cpp
@@ -181,7 +181,7 @@ DynamicBVH::Volume DynamicBVH::_bounds(Node **leaves, int p_count) {
 
 void DynamicBVH::_bottom_up(Node **leaves, int p_count) {
 	while (p_count > 1) {
-		real_t minsize = INFINITY;
+		real_t minsize = Math::INF;
 		int minidx[2] = { -1, -1 };
 		for (int i = 0; i < p_count; ++i) {
 			for (int j = i + 1; j < p_count; ++j) {
diff --git a/engine/core/math/dynamic_bvh.h b/engine/core/math/dynamic_bvh.h
index 26fc517f..10e4e063 100644
--- a/engine/core/math/dynamic_bvh.h
+++ b/engine/core/math/dynamic_bvh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DYNAMIC_BVH_H
-#define DYNAMIC_BVH_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/templates/list.h"
@@ -474,5 +473,3 @@ void DynamicBVH::ray_query(const Vector3 &p_from, const Vector3 &p_to, QueryResu
 		}
 	} while (depth > 0);
 }
-
-#endif // DYNAMIC_BVH_H
diff --git a/engine/core/math/expression.cpp b/engine/core/math/expression.cpp
index 26b773a2..0bfc8def 100644
--- a/engine/core/math/expression.cpp
+++ b/engine/core/math/expression.cpp
@@ -454,16 +454,16 @@ Error Expression::_get_token(Token &r_token) {
 						r_token.value = false;
 					} else if (id == "PI") {
 						r_token.type = TK_CONSTANT;
-						r_token.value = Math_PI;
+						r_token.value = Math::PI;
 					} else if (id == "TAU") {
 						r_token.type = TK_CONSTANT;
-						r_token.value = Math_TAU;
+						r_token.value = Math::TAU;
 					} else if (id == "INF") {
 						r_token.type = TK_CONSTANT;
-						r_token.value = INFINITY;
+						r_token.value = Math::INF;
 					} else if (id == "NAN") {
 						r_token.type = TK_CONSTANT;
-						r_token.value = NAN;
+						r_token.value = Math::NaN;
 					} else if (id == "not") {
 						r_token.type = TK_OP_NOT;
 					} else if (id == "or") {
diff --git a/engine/core/math/expression.h b/engine/core/math/expression.h
index 46bc3618..aea714cf 100644
--- a/engine/core/math/expression.h
+++ b/engine/core/math/expression.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EXPRESSION_H
-#define EXPRESSION_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -271,5 +270,3 @@ public:
 	Expression() {}
 	~Expression();
 };
-
-#endif // EXPRESSION_H
diff --git a/engine/core/math/face3.cpp b/engine/core/math/face3.cpp
index 1dff0ee4..b9ab85e4 100644
--- a/engine/core/math/face3.cpp
+++ b/engine/core/math/face3.cpp
@@ -263,7 +263,7 @@ void Face3::get_support(const Vector3 &p_normal, const Transform3D &p_transform,
 
 		// check if edge is valid as a support
 		real_t dot = (vertex[i] - vertex[(i + 1) % 3]).normalized().dot(n);
-		dot = ABS(dot);
+		dot = Math::abs(dot);
 		if (dot < edge_support_threshold) {
 			*p_count = MIN(2, p_max);
 
diff --git a/engine/core/math/face3.h b/engine/core/math/face3.h
index 519dcb64..b7472f9d 100644
--- a/engine/core/math/face3.h
+++ b/engine/core/math/face3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FACE3_H
-#define FACE3_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
@@ -79,12 +78,9 @@ struct [[nodiscard]] Face3 {
 	_FORCE_INLINE_ bool intersects_aabb2(const AABB &p_aabb) const;
 	operator String() const;
 
-	inline Face3() {}
-	inline Face3(const Vector3 &p_v1, const Vector3 &p_v2, const Vector3 &p_v3) {
-		vertex[0] = p_v1;
-		vertex[1] = p_v2;
-		vertex[2] = p_v3;
-	}
+	Face3() = default;
+	constexpr Face3(const Vector3 &p_v1, const Vector3 &p_v2, const Vector3 &p_v3) :
+			vertex{ p_v1, p_v2, p_v3 } {}
 };
 
 bool Face3::intersects_aabb2(const AABB &p_aabb) const {
@@ -238,4 +234,5 @@ bool Face3::intersects_aabb2(const AABB &p_aabb) const {
 	return true;
 }
 
-#endif // FACE3_H
+template <>
+struct is_zero_constructible<Face3> : std::true_type {};
diff --git a/engine/core/math/geometry_2d.cpp b/engine/core/math/geometry_2d.cpp
index 376d5d0b..30ea79a0 100644
--- a/engine/core/math/geometry_2d.cpp
+++ b/engine/core/math/geometry_2d.cpp
@@ -38,17 +38,63 @@
 const int clipper_precision = 5; // Based on CMP_EPSILON.
 const double clipper_scale = Math::pow(10.0, clipper_precision);
 
-Vector<Vector<Vector2>> Geometry2D::decompose_polygon_in_convex(const Vector<Point2> &polygon) {
+void Geometry2D::merge_many_polygons(const Vector<Vector<Vector2>> &p_polygons, Vector<Vector<Vector2>> &r_out_polygons, Vector<Vector<Vector2>> &r_out_holes) {
+	using namespace Clipper2Lib;
+
+	PathsD subjects;
+	for (const Vector<Vector2> &polygon : p_polygons) {
+		PathD path(polygon.size());
+		for (int i = 0; i < polygon.size(); i++) {
+			const Vector2 &point = polygon[i];
+			path[i] = PointD(point.x, point.y);
+		}
+		subjects.push_back(path);
+	}
+
+	PathsD solution = Union(subjects, FillRule::NonZero);
+	solution = SimplifyPaths(solution, 0.01);
+
+	r_out_polygons.clear();
+	r_out_holes.clear();
+	for (PathsD::size_type i = 0; i < solution.size(); ++i) {
+		PathD &path = solution[i];
+
+		Vector<Point2> output_polygon;
+		output_polygon.resize(path.size());
+		for (PathsD::size_type j = 0; j < path.size(); ++j) {
+			output_polygon.set(j, Vector2(static_cast<real_t>(path[j].x), static_cast<real_t>(path[j].y)));
+		}
+		if (IsPositive(path)) {
+			r_out_polygons.push_back(output_polygon);
+		} else {
+			r_out_holes.push_back(output_polygon);
+		}
+	}
+}
+
+Vector<Vector<Vector2>> Geometry2D::decompose_many_polygons_in_convex(const Vector<Vector<Point2>> &p_polygons, const Vector<Vector<Point2>> &p_holes) {
 	Vector<Vector<Vector2>> decomp;
 	List<TPPLPoly> in_poly, out_poly;
 
-	TPPLPoly inp;
-	inp.Init(polygon.size());
-	for (int i = 0; i < polygon.size(); i++) {
-		inp.GetPoint(i) = polygon[i];
+	for (const Vector<Vector2> &polygon : p_polygons) {
+		TPPLPoly inp;
+		inp.Init(polygon.size());
+		for (int i = 0; i < polygon.size(); i++) {
+			inp.GetPoint(i) = polygon[i];
+		}
+		inp.SetOrientation(TPPL_ORIENTATION_CCW);
+		in_poly.push_back(inp);
+	}
+	for (const Vector<Vector2> &polygon : p_holes) {
+		TPPLPoly inp;
+		inp.Init(polygon.size());
+		for (int i = 0; i < polygon.size(); i++) {
+			inp.GetPoint(i) = polygon[i];
+		}
+		inp.SetOrientation(TPPL_ORIENTATION_CW);
+		inp.SetHole(true);
+		in_poly.push_back(inp);
 	}
-	inp.SetOrientation(TPPL_ORIENTATION_CCW);
-	in_poly.push_back(inp);
 	TPPLPartition tpart;
 	if (tpart.ConvexPartition_HM(&in_poly, &out_poly) == 0) { // Failed.
 		ERR_PRINT("Convex decomposing failed!");
@@ -57,9 +103,7 @@ Vector<Vector<Vector2>> Geometry2D::decompose_polygon_in_convex(const Vector<Poi
 
 	decomp.resize(out_poly.size());
 	int idx = 0;
-	for (List<TPPLPoly>::Element *I = out_poly.front(); I; I = I->next()) {
-		TPPLPoly &tp = I->get();
-
+	for (TPPLPoly &tp : out_poly) {
 		decomp.write[idx].resize(tp.GetNumPoints());
 
 		for (int64_t i = 0; i < tp.GetNumPoints(); i++) {
@@ -72,6 +116,10 @@ Vector<Vector<Vector2>> Geometry2D::decompose_polygon_in_convex(const Vector<Poi
 	return decomp;
 }
 
+Vector<Vector<Vector2>> Geometry2D::decompose_polygon_in_convex(const Vector<Point2> &p_polygon) {
+	return Geometry2D::decompose_many_polygons_in_convex({ p_polygon }, {});
+}
+
 struct _AtlasWorkRect {
 	Size2i s;
 	Point2i p;
diff --git a/engine/core/math/geometry_2d.h b/engine/core/math/geometry_2d.h
index abd395d8..fa5b0f06 100644
--- a/engine/core/math/geometry_2d.h
+++ b/engine/core/math/geometry_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GEOMETRY_2D_H
-#define GEOMETRY_2D_H
+#pragma once
 
 #include "core/math/delaunay_2d.h"
 #include "core/math/math_funcs.h"
@@ -100,27 +99,39 @@ public:
 		return Math::sqrt((c1 - c2).dot(c1 - c2));
 	}
 
+#ifndef DISABLE_DEPRECATED
 	static Vector2 get_closest_point_to_segment(const Vector2 &p_point, const Vector2 *p_segment) {
-		Vector2 p = p_point - p_segment[0];
-		Vector2 n = p_segment[1] - p_segment[0];
+		return get_closest_point_to_segment(p_point, p_segment[0], p_segment[1]);
+	}
+#endif // DISABLE_DEPRECATED
+
+	static Vector2 get_closest_point_to_segment(const Vector2 &p_point, const Vector2 &p_segment_a, const Vector2 &p_segment_b) {
+		Vector2 p = p_point - p_segment_a;
+		Vector2 n = p_segment_b - p_segment_a;
 		real_t l2 = n.length_squared();
 		if (l2 < 1e-20f) {
-			return p_segment[0]; // Both points are the same, just give any.
+			return p_segment_a; // Both points are the same, just give any.
 		}
 
 		real_t d = n.dot(p) / l2;
 
 		if (d <= 0.0f) {
-			return p_segment[0]; // Before first point.
+			return p_segment_a; // Before first point.
 		} else if (d >= 1.0f) {
-			return p_segment[1]; // After first point.
+			return p_segment_b; // After first point.
 		} else {
-			return p_segment[0] + n * d; // Inside.
+			return p_segment_a + n * d; // Inside.
 		}
 	}
 
+#ifndef DISABLE_DEPRECATED
 	static real_t get_distance_to_segment(const Vector2 &p_point, const Vector2 *p_segment) {
-		return p_point.distance_to(get_closest_point_to_segment(p_point, p_segment));
+		return get_distance_to_segment(p_point, p_segment[0], p_segment[1]);
+	}
+#endif // DISABLE_DEPRECATED
+
+	static real_t get_distance_to_segment(const Vector2 &p_point, const Vector2 &p_segment_a, const Vector2 &p_segment_b) {
+		return p_point.distance_to(get_closest_point_to_segment(p_point, p_segment_a, p_segment_b));
 	}
 
 	static bool is_point_in_triangle(const Vector2 &s, const Vector2 &a, const Vector2 &b, const Vector2 &c) {
@@ -137,24 +148,26 @@ public:
 		return (cn.cross(an) > 0) == orientation;
 	}
 
+#ifndef DISABLE_DEPRECATED
 	static Vector2 get_closest_point_to_segment_uncapped(const Vector2 &p_point, const Vector2 *p_segment) {
-		Vector2 p = p_point - p_segment[0];
-		Vector2 n = p_segment[1] - p_segment[0];
+		return get_closest_point_to_segment_uncapped(p_point, p_segment[0], p_segment[1]);
+	}
+#endif // DISABLE_DEPRECATED
+
+	static Vector2 get_closest_point_to_segment_uncapped(const Vector2 &p_point, const Vector2 &p_segment_a, const Vector2 &p_segment_b) {
+		Vector2 p = p_point - p_segment_a;
+		Vector2 n = p_segment_b - p_segment_a;
 		real_t l2 = n.length_squared();
 		if (l2 < 1e-20f) {
-			return p_segment[0]; // Both points are the same, just give any.
+			return p_segment_a; // Both points are the same, just give any.
 		}
 
 		real_t d = n.dot(p) / l2;
 
-		return p_segment[0] + n * d; // Inside.
+		return p_segment_a + n * d; // Inside.
 	}
 
-// Disable False Positives in MSVC compiler; we correctly check for 0 here to prevent a division by 0.
-// See: https://github.com/godotengine/godot/pull/44274
-#ifdef _MSC_VER
-#pragma warning(disable : 4723)
-#endif
+	GODOT_MSVC_WARNING_PUSH_AND_IGNORE(4723) // Potential divide by 0. False positive (see: GH-44274).
 
 	static bool line_intersects_line(const Vector2 &p_from_a, const Vector2 &p_dir_a, const Vector2 &p_from_b, const Vector2 &p_dir_b, Vector2 &r_result) {
 		// See http://paulbourke.net/geometry/pointlineplane/
@@ -170,10 +183,7 @@ public:
 		return true;
 	}
 
-// Re-enable division by 0 warning
-#ifdef _MSC_VER
-#pragma warning(default : 4723)
-#endif
+	GODOT_MSVC_WARNING_POP
 
 	static bool segment_intersects_segment(const Vector2 &p_from_a, const Vector2 &p_to_a, const Vector2 &p_from_b, const Vector2 &p_to_b, Vector2 *r_result) {
 		Vector2 B = p_to_a - p_from_a;
@@ -489,7 +499,10 @@ public:
 		return points;
 	}
 
-	static Vector<Vector<Vector2>> decompose_polygon_in_convex(const Vector<Point2> &polygon);
+	static void merge_many_polygons(const Vector<Vector<Point2>> &p_polygons, Vector<Vector<Vector2>> &r_out_polygons, Vector<Vector<Vector2>> &r_out_holes);
+	static Vector<Vector<Vector2>> decompose_many_polygons_in_convex(const Vector<Vector<Point2>> &p_polygons, const Vector<Vector<Point2>> &p_holes);
+
+	static Vector<Vector<Vector2>> decompose_polygon_in_convex(const Vector<Point2> &p_polygon);
 
 	static void make_atlas(const Vector<Size2i> &p_rects, Vector<Point2i> &r_result, Size2i &r_size);
 	static Vector<Vector3i> partial_pack_rects(const Vector<Vector2i> &p_sizes, const Size2i &p_atlas_size);
@@ -498,5 +511,3 @@ private:
 	static Vector<Vector<Point2>> _polypaths_do_operation(PolyBooleanOperation p_op, const Vector<Point2> &p_polypath_a, const Vector<Point2> &p_polypath_b, bool is_a_open = false);
 	static Vector<Vector<Point2>> _polypath_offset(const Vector<Point2> &p_polypath, real_t p_delta, PolyJoinType p_join_type, PolyEndType p_end_type);
 };
-
-#endif // GEOMETRY_2D_H
diff --git a/engine/core/math/geometry_3d.cpp b/engine/core/math/geometry_3d.cpp
index 361a0607..71559ead 100644
--- a/engine/core/math/geometry_3d.cpp
+++ b/engine/core/math/geometry_3d.cpp
@@ -30,6 +30,8 @@
 
 #include "geometry_3d.h"
 
+#include "core/templates/hash_map.h"
+
 void Geometry3D::get_closest_points_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1, Vector3 &r_ps, Vector3 &r_qt) {
 	// Based on David Eberly's Computation of Distance Between Line Segments algorithm.
 
@@ -593,7 +595,7 @@ Geometry3D::MeshData Geometry3D::build_convex_mesh(const Vector<Plane> &p_planes
 
 		Vector3 ref = Vector3(0.0, 1.0, 0.0);
 
-		if (ABS(p.normal.dot(ref)) > 0.95f) {
+		if (Math::abs(p.normal.dot(ref)) > 0.95f) {
 			ref = Vector3(0.0, 0.0, 1.0); // Change axis.
 		}
 
@@ -742,7 +744,7 @@ Vector<Plane> Geometry3D::build_cylinder_planes(real_t p_radius, real_t p_height
 
 	Vector<Plane> planes;
 
-	const double sides_step = Math_TAU / p_sides;
+	const double sides_step = Math::TAU / p_sides;
 	for (int i = 0; i < p_sides; i++) {
 		Vector3 normal;
 		normal[(p_axis + 1) % 3] = Math::cos(i * sides_step);
@@ -773,7 +775,7 @@ Vector<Plane> Geometry3D::build_sphere_planes(real_t p_radius, int p_lats, int p
 	axis_neg[(p_axis + 2) % 3] = 1.0;
 	axis_neg[p_axis] = -1.0;
 
-	const double lon_step = Math_TAU / p_lons;
+	const double lon_step = Math::TAU / p_lons;
 	for (int i = 0; i < p_lons; i++) {
 		Vector3 normal;
 		normal[(p_axis + 1) % 3] = Math::cos(i * lon_step);
@@ -804,7 +806,7 @@ Vector<Plane> Geometry3D::build_capsule_planes(real_t p_radius, real_t p_height,
 	axis_neg[(p_axis + 2) % 3] = 1.0;
 	axis_neg[p_axis] = -1.0;
 
-	const double sides_step = Math_TAU / p_sides;
+	const double sides_step = Math::TAU / p_sides;
 	for (int i = 0; i < p_sides; i++) {
 		Vector3 normal;
 		normal[(p_axis + 1) % 3] = Math::cos(i * sides_step);
@@ -860,7 +862,6 @@ Vector<Vector3> Geometry3D::compute_convex_mesh_points(const Plane *p_planes, in
 }
 
 #define square(m_s) ((m_s) * (m_s))
-#define INF 1e20
 
 /* dt of 1d function using squared distance */
 static void edt(float *f, int stride, int n) {
@@ -870,8 +871,8 @@ static void edt(float *f, int stride, int n) {
 
 	int k = 0;
 	v[0] = 0;
-	z[0] = -INF;
-	z[1] = +INF;
+	z[0] = -Math::INF;
+	z[1] = +Math::INF;
 	for (int q = 1; q <= n - 1; q++) {
 		float s = ((f[q * stride] + square(q)) - (f[v[k] * stride] + square(v[k]))) / (2 * q - 2 * v[k]);
 		while (s <= z[k]) {
@@ -882,7 +883,7 @@ static void edt(float *f, int stride, int n) {
 		v[k] = q;
 
 		z[k] = s;
-		z[k + 1] = +INF;
+		z[k + 1] = +Math::INF;
 	}
 
 	k = 0;
@@ -907,7 +908,7 @@ Vector<uint32_t> Geometry3D::generate_edf(const Vector<bool> &p_voxels, const Ve
 
 	float *work_memory = memnew_arr(float, float_count);
 	for (uint32_t i = 0; i < float_count; i++) {
-		work_memory[i] = INF;
+		work_memory[i] = Math::INF;
 	}
 
 	uint32_t y_mult = p_size.x;
diff --git a/engine/core/math/geometry_3d.h b/engine/core/math/geometry_3d.h
index ff39d825..bd8dbe43 100644
--- a/engine/core/math/geometry_3d.h
+++ b/engine/core/math/geometry_3d.h
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GEOMETRY_3D_H
-#define GEOMETRY_3D_H
+#pragma once
 
 #include "core/math/delaunay_3d.h"
 #include "core/math/face3.h"
-#include "core/object/object.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/vector.h"
 
@@ -274,7 +272,7 @@ public:
 		return true;
 	}
 
-	static bool segment_intersects_convex(const Vector3 &p_from, const Vector3 &p_to, const Plane *p_planes, int p_plane_count, Vector3 *p_res, Vector3 *p_norm) {
+	static bool segment_intersects_convex(const Vector3 &p_from, const Vector3 &p_to, const Plane *p_planes, int p_plane_count, Vector3 *r_res, Vector3 *r_norm) {
 		real_t min = -1e20, max = 1e20;
 
 		Vector3 rel = p_to - p_from;
@@ -317,46 +315,58 @@ public:
 			return false; // No intersection.
 		}
 
-		if (p_res) {
-			*p_res = p_from + dir * min;
+		if (r_res) {
+			*r_res = p_from + dir * min;
 		}
-		if (p_norm) {
-			*p_norm = p_planes[min_index].normal;
+		if (r_norm) {
+			*r_norm = p_planes[min_index].normal;
 		}
 
 		return true;
 	}
 
+#ifndef DISABLE_DEPRECATED
 	static Vector3 get_closest_point_to_segment(const Vector3 &p_point, const Vector3 *p_segment) {
-		Vector3 p = p_point - p_segment[0];
-		Vector3 n = p_segment[1] - p_segment[0];
+		return get_closest_point_to_segment(p_point, p_segment[0], p_segment[1]);
+	}
+#endif // DISABLE_DEPRECATED
+
+	static Vector3 get_closest_point_to_segment(const Vector3 &p_point, const Vector3 &p_segment_a, const Vector3 &p_segment_b) {
+		Vector3 p = p_point - p_segment_a;
+		Vector3 n = p_segment_b - p_segment_a;
 		real_t l2 = n.length_squared();
 		if (l2 < 1e-20f) {
-			return p_segment[0]; // Both points are the same, just give any.
+			return p_segment_a; // Both points are the same, just give any.
 		}
 
 		real_t d = n.dot(p) / l2;
 
 		if (d <= 0.0f) {
-			return p_segment[0]; // Before first point.
+			return p_segment_a; // Before first point.
 		} else if (d >= 1.0f) {
-			return p_segment[1]; // After first point.
+			return p_segment_b; // After first point.
 		} else {
-			return p_segment[0] + n * d; // Inside.
+			return p_segment_a + n * d; // Inside.
 		}
 	}
 
+#ifndef DISABLE_DEPRECATED
 	static Vector3 get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 *p_segment) {
-		Vector3 p = p_point - p_segment[0];
-		Vector3 n = p_segment[1] - p_segment[0];
+		return get_closest_point_to_segment_uncapped(p_point, p_segment[0], p_segment[1]);
+	}
+#endif // DISABLE_DEPRECATED
+
+	static Vector3 get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 &p_segment_a, const Vector3 &p_segment_b) {
+		Vector3 p = p_point - p_segment_a;
+		Vector3 n = p_segment_b - p_segment_a;
 		real_t l2 = n.length_squared();
 		if (l2 < 1e-20f) {
-			return p_segment[0]; // Both points are the same, just give any.
+			return p_segment_a; // Both points are the same, just give any.
 		}
 
 		real_t d = n.dot(p) / l2;
 
-		return p_segment[0] + n * d; // Inside.
+		return p_segment_a + n * d; // Inside.
 	}
 
 	static inline bool point_in_projected_triangle(const Vector3 &p_point, const Vector3 &p_v1, const Vector3 &p_v2, const Vector3 &p_v3) {
@@ -383,8 +393,14 @@ public:
 		return true;
 	}
 
+#ifndef DISABLE_DEPRECATED
 	static inline bool triangle_sphere_intersection_test(const Vector3 *p_triangle, const Vector3 &p_normal, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 &r_triangle_contact, Vector3 &r_sphere_contact) {
-		real_t d = p_normal.dot(p_sphere_pos) - p_normal.dot(p_triangle[0]);
+		return triangle_sphere_intersection_test(p_triangle[0], p_triangle[1], p_triangle[2], p_normal, p_sphere_pos, p_sphere_radius, r_triangle_contact, r_sphere_contact);
+	}
+#endif // DISABLE_DEPRECATED
+
+	static inline bool triangle_sphere_intersection_test(const Vector3 &p_triangle_a, const Vector3 &p_triangle_b, const Vector3 &p_triangle_c, const Vector3 &p_normal, const Vector3 &p_sphere_pos, real_t p_sphere_radius, Vector3 &r_triangle_contact, Vector3 &r_sphere_contact) {
+		real_t d = p_normal.dot(p_sphere_pos) - p_normal.dot(p_triangle_a);
 
 		if (d > p_sphere_radius || d < -p_sphere_radius) {
 			// Not touching the plane of the face, return.
@@ -395,7 +411,7 @@ public:
 
 		/** 2nd) TEST INSIDE TRIANGLE **/
 
-		if (Geometry3D::point_in_projected_triangle(contact, p_triangle[0], p_triangle[1], p_triangle[2])) {
+		if (Geometry3D::point_in_projected_triangle(contact, p_triangle_a, p_triangle_b, p_triangle_c)) {
 			r_triangle_contact = contact;
 			r_sphere_contact = p_sphere_pos - p_normal * p_sphere_radius;
 			//printf("solved inside triangle\n");
@@ -404,7 +420,7 @@ public:
 
 		/** 3rd TEST INSIDE EDGE CYLINDERS **/
 
-		const Vector3 verts[4] = { p_triangle[0], p_triangle[1], p_triangle[2], p_triangle[0] }; // for() friendly
+		const Vector3 verts[4] = { p_triangle_a, p_triangle_b, p_triangle_c, p_triangle_a }; // for() friendly
 
 		for (int i = 0; i < 3; i++) {
 			// Check edge cylinder.
@@ -420,7 +436,7 @@ public:
 
 			real_t ad = axis.dot(n2);
 
-			if (ABS(ad) > p_sphere_radius) {
+			if (Math::abs(ad) > p_sphere_radius) {
 				// No chance with this edge, too far away.
 				continue;
 			}
@@ -468,7 +484,7 @@ public:
 			LOC_OUTSIDE = -1
 		};
 
-		if (polygon.size() == 0) {
+		if (polygon.is_empty()) {
 			return polygon;
 		}
 
@@ -840,5 +856,3 @@ public:
 		return n.normalized();
 	}
 };
-
-#endif // GEOMETRY_3D_H
diff --git a/engine/core/math/math_defs.h b/engine/core/math/math_defs.h
index fe53121a..5a9be58c 100644
--- a/engine/core/math/math_defs.h
+++ b/engine/core/math/math_defs.h
@@ -28,8 +28,24 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATH_DEFS_H
-#define MATH_DEFS_H
+#pragma once
+
+#include "core/typedefs.h"
+
+#include <limits>
+
+namespace Math {
+inline constexpr double SQRT2 = 1.4142135623730950488016887242;
+inline constexpr double SQRT3 = 1.7320508075688772935274463415059;
+inline constexpr double SQRT12 = 0.7071067811865475244008443621048490;
+inline constexpr double SQRT13 = 0.57735026918962576450914878050196;
+inline constexpr double LN2 = 0.6931471805599453094172321215;
+inline constexpr double TAU = 6.2831853071795864769252867666;
+inline constexpr double PI = 3.1415926535897932384626433833;
+inline constexpr double E = 2.7182818284590452353602874714;
+inline constexpr double INF = std::numeric_limits<double>::infinity();
+inline constexpr double NaN = std::numeric_limits<double>::quiet_NaN();
+} // namespace Math
 
 #define CMP_EPSILON 0.00001
 #define CMP_EPSILON2 (CMP_EPSILON * CMP_EPSILON)
@@ -37,13 +53,6 @@
 #define CMP_NORMALIZE_TOLERANCE 0.000001
 #define CMP_POINT_IN_PLANE_EPSILON 0.00001
 
-#define Math_SQRT12 0.7071067811865475244008443621048490
-#define Math_SQRT2 1.4142135623730950488016887242
-#define Math_LN2 0.6931471805599453094172321215
-#define Math_TAU 6.2831853071795864769252867666
-#define Math_PI 3.1415926535897932384626433833
-#define Math_E 2.7182818284590452353602874714
-
 #ifdef DEBUG_ENABLED
 #define MATH_CHECKS
 #endif
@@ -136,5 +145,3 @@ typedef double real_t;
 #else
 typedef float real_t;
 #endif
-
-#endif // MATH_DEFS_H
diff --git a/engine/core/math/math_fieldwise.cpp b/engine/core/math/math_fieldwise.cpp
index 4064e6aa..8e81e4cc 100644
--- a/engine/core/math/math_fieldwise.cpp
+++ b/engine/core/math/math_fieldwise.cpp
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifdef TOOLS_ENABLED
+#ifdef DEBUG_ENABLED
 
 #include "math_fieldwise.h"
 
@@ -242,4 +242,4 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
 	/* clang-format on */
 }
 
-#endif // TOOLS_ENABLED
+#endif // DEBUG_ENABLED
diff --git a/engine/core/math/math_fieldwise.h b/engine/core/math/math_fieldwise.h
index 6d222c15..2628beb4 100644
--- a/engine/core/math/math_fieldwise.h
+++ b/engine/core/math/math_fieldwise.h
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATH_FIELDWISE_H
-#define MATH_FIELDWISE_H
+#pragma once
 
-#ifdef TOOLS_ENABLED
+#ifdef DEBUG_ENABLED
 
 #include "core/variant/variant.h"
 
 Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const String &p_field);
 
-#endif // TOOLS_ENABLED
-
-#endif // MATH_FIELDWISE_H
+#endif // DEBUG_ENABLED
diff --git a/engine/core/math/math_funcs.cpp b/engine/core/math/math_funcs.cpp
index 0d5b0faa..76d9cd25 100644
--- a/engine/core/math/math_funcs.cpp
+++ b/engine/core/math/math_funcs.cpp
@@ -31,18 +31,19 @@
 #include "math_funcs.h"
 
 #include "core/error/error_macros.h"
+#include "core/math/random_pcg.h"
 
-RandomPCG Math::default_rand(RandomPCG::DEFAULT_SEED, RandomPCG::DEFAULT_INC);
+static RandomPCG default_rand;
 
-uint32_t Math::rand_from_seed(uint64_t *seed) {
-	RandomPCG rng = RandomPCG(*seed, RandomPCG::DEFAULT_INC);
+uint32_t Math::rand_from_seed(uint64_t *p_seed) {
+	RandomPCG rng = RandomPCG(*p_seed);
 	uint32_t r = rng.rand();
-	*seed = rng.get_seed();
+	*p_seed = rng.get_seed();
 	return r;
 }
 
-void Math::seed(uint64_t x) {
-	default_rand.seed(x);
+void Math::seed(uint64_t p_value) {
+	default_rand.seed(p_value);
 }
 
 void Math::randomize() {
@@ -53,8 +54,8 @@ uint32_t Math::rand() {
 	return default_rand.rand();
 }
 
-double Math::randfn(double mean, double deviation) {
-	return default_rand.randfn(mean, deviation);
+double Math::randfn(double p_mean, double p_deviation) {
+	return default_rand.randfn(p_mean, p_deviation);
 }
 
 int Math::step_decimals(double p_step) {
@@ -168,14 +169,14 @@ uint32_t Math::larger_prime(uint32_t p_val) {
 	}
 }
 
-double Math::random(double from, double to) {
-	return default_rand.random(from, to);
+double Math::random(double p_from, double p_to) {
+	return default_rand.random(p_from, p_to);
 }
 
-float Math::random(float from, float to) {
-	return default_rand.random(from, to);
+float Math::random(float p_from, float p_to) {
+	return default_rand.random(p_from, p_to);
 }
 
-int Math::random(int from, int to) {
-	return default_rand.random(from, to);
+int Math::random(int p_from, int p_to) {
+	return default_rand.random(p_from, p_to);
 }
diff --git a/engine/core/math/math_funcs.h b/engine/core/math/math_funcs.h
index 1afc5f4b..56027765 100644
--- a/engine/core/math/math_funcs.h
+++ b/engine/core/math/math_funcs.h
@@ -28,735 +28,851 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATH_FUNCS_H
-#define MATH_FUNCS_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
-#include "core/math/random_pcg.h"
 #include "core/typedefs.h"
 
-#include "thirdparty/misc/pcg.h"
-
 #include <float.h>
 #include <math.h>
 
-class Math {
-	static RandomPCG default_rand;
+namespace Math {
 
-public:
-	Math() {} // useless to instance
+_ALWAYS_INLINE_ double sin(double p_x) {
+	return ::sin(p_x);
+}
+_ALWAYS_INLINE_ float sin(float p_x) {
+	return ::sinf(p_x);
+}
 
-	// Not using 'RANDOM_MAX' to avoid conflict with system headers on some OSes (at least NetBSD).
-	static const uint64_t RANDOM_32BIT_MAX = 0xFFFFFFFF;
+_ALWAYS_INLINE_ double cos(double p_x) {
+	return ::cos(p_x);
+}
+_ALWAYS_INLINE_ float cos(float p_x) {
+	return ::cosf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double sin(double p_x) { return ::sin(p_x); }
-	static _ALWAYS_INLINE_ float sin(float p_x) { return ::sinf(p_x); }
+_ALWAYS_INLINE_ double tan(double p_x) {
+	return ::tan(p_x);
+}
+_ALWAYS_INLINE_ float tan(float p_x) {
+	return ::tanf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double cos(double p_x) { return ::cos(p_x); }
-	static _ALWAYS_INLINE_ float cos(float p_x) { return ::cosf(p_x); }
+_ALWAYS_INLINE_ double sinh(double p_x) {
+	return ::sinh(p_x);
+}
+_ALWAYS_INLINE_ float sinh(float p_x) {
+	return ::sinhf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double tan(double p_x) { return ::tan(p_x); }
-	static _ALWAYS_INLINE_ float tan(float p_x) { return ::tanf(p_x); }
+_ALWAYS_INLINE_ double sinc(double p_x) {
+	return p_x == 0 ? 1 : sin(p_x) / p_x;
+}
+_ALWAYS_INLINE_ float sinc(float p_x) {
+	return p_x == 0 ? 1 : sin(p_x) / p_x;
+}
 
-	static _ALWAYS_INLINE_ double sinh(double p_x) { return ::sinh(p_x); }
-	static _ALWAYS_INLINE_ float sinh(float p_x) { return ::sinhf(p_x); }
+_ALWAYS_INLINE_ double sincn(double p_x) {
+	return sinc(PI * p_x);
+}
+_ALWAYS_INLINE_ float sincn(float p_x) {
+	return sinc((float)PI * p_x);
+}
 
-	static _ALWAYS_INLINE_ float sinc(float p_x) { return p_x == 0 ? 1 : ::sin(p_x) / p_x; }
-	static _ALWAYS_INLINE_ double sinc(double p_x) { return p_x == 0 ? 1 : ::sin(p_x) / p_x; }
+_ALWAYS_INLINE_ double cosh(double p_x) {
+	return ::cosh(p_x);
+}
+_ALWAYS_INLINE_ float cosh(float p_x) {
+	return ::coshf(p_x);
+}
 
-	static _ALWAYS_INLINE_ float sincn(float p_x) { return sinc((float)Math_PI * p_x); }
-	static _ALWAYS_INLINE_ double sincn(double p_x) { return sinc(Math_PI * p_x); }
+_ALWAYS_INLINE_ double tanh(double p_x) {
+	return ::tanh(p_x);
+}
+_ALWAYS_INLINE_ float tanh(float p_x) {
+	return ::tanhf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double cosh(double p_x) { return ::cosh(p_x); }
-	static _ALWAYS_INLINE_ float cosh(float p_x) { return ::coshf(p_x); }
+// Always does clamping so always safe to use.
+_ALWAYS_INLINE_ double asin(double p_x) {
+	return p_x < -1 ? (-PI / 2) : (p_x > 1 ? (PI / 2) : ::asin(p_x));
+}
+_ALWAYS_INLINE_ float asin(float p_x) {
+	return p_x < -1 ? (-(float)PI / 2) : (p_x > 1 ? ((float)PI / 2) : ::asinf(p_x));
+}
 
-	static _ALWAYS_INLINE_ double tanh(double p_x) { return ::tanh(p_x); }
-	static _ALWAYS_INLINE_ float tanh(float p_x) { return ::tanhf(p_x); }
+// Always does clamping so always safe to use.
+_ALWAYS_INLINE_ double acos(double p_x) {
+	return p_x < -1 ? PI : (p_x > 1 ? 0 : ::acos(p_x));
+}
+_ALWAYS_INLINE_ float acos(float p_x) {
+	return p_x < -1 ? (float)PI : (p_x > 1 ? 0 : ::acosf(p_x));
+}
 
-	// Always does clamping so always safe to use.
-	static _ALWAYS_INLINE_ double asin(double p_x) { return p_x < -1 ? (-Math_PI / 2) : (p_x > 1 ? (Math_PI / 2) : ::asin(p_x)); }
-	static _ALWAYS_INLINE_ float asin(float p_x) { return p_x < -1 ? (-Math_PI / 2) : (p_x > 1 ? (Math_PI / 2) : ::asinf(p_x)); }
+_ALWAYS_INLINE_ double atan(double p_x) {
+	return ::atan(p_x);
+}
+_ALWAYS_INLINE_ float atan(float p_x) {
+	return ::atanf(p_x);
+}
 
-	// Always does clamping so always safe to use.
-	static _ALWAYS_INLINE_ double acos(double p_x) { return p_x < -1 ? Math_PI : (p_x > 1 ? 0 : ::acos(p_x)); }
-	static _ALWAYS_INLINE_ float acos(float p_x) { return p_x < -1 ? Math_PI : (p_x > 1 ? 0 : ::acosf(p_x)); }
+_ALWAYS_INLINE_ double atan2(double p_y, double p_x) {
+	return ::atan2(p_y, p_x);
+}
+_ALWAYS_INLINE_ float atan2(float p_y, float p_x) {
+	return ::atan2f(p_y, p_x);
+}
 
-	static _ALWAYS_INLINE_ double atan(double p_x) { return ::atan(p_x); }
-	static _ALWAYS_INLINE_ float atan(float p_x) { return ::atanf(p_x); }
+_ALWAYS_INLINE_ double asinh(double p_x) {
+	return ::asinh(p_x);
+}
+_ALWAYS_INLINE_ float asinh(float p_x) {
+	return ::asinhf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double atan2(double p_y, double p_x) { return ::atan2(p_y, p_x); }
-	static _ALWAYS_INLINE_ float atan2(float p_y, float p_x) { return ::atan2f(p_y, p_x); }
+// Always does clamping so always safe to use.
+_ALWAYS_INLINE_ double acosh(double p_x) {
+	return p_x < 1 ? 0 : ::acosh(p_x);
+}
+_ALWAYS_INLINE_ float acosh(float p_x) {
+	return p_x < 1 ? 0 : ::acoshf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double asinh(double p_x) { return ::asinh(p_x); }
-	static _ALWAYS_INLINE_ float asinh(float p_x) { return ::asinhf(p_x); }
+// Always does clamping so always safe to use.
+_ALWAYS_INLINE_ double atanh(double p_x) {
+	return p_x <= -1 ? -INF : (p_x >= 1 ? INF : ::atanh(p_x));
+}
+_ALWAYS_INLINE_ float atanh(float p_x) {
+	return p_x <= -1 ? (float)-INF : (p_x >= 1 ? (float)INF : ::atanhf(p_x));
+}
 
-	// Always does clamping so always safe to use.
-	static _ALWAYS_INLINE_ double acosh(double p_x) { return p_x < 1 ? 0 : ::acosh(p_x); }
-	static _ALWAYS_INLINE_ float acosh(float p_x) { return p_x < 1 ? 0 : ::acoshf(p_x); }
+_ALWAYS_INLINE_ double sqrt(double p_x) {
+	return ::sqrt(p_x);
+}
+_ALWAYS_INLINE_ float sqrt(float p_x) {
+	return ::sqrtf(p_x);
+}
 
-	// Always does clamping so always safe to use.
-	static _ALWAYS_INLINE_ double atanh(double p_x) { return p_x <= -1 ? -INFINITY : (p_x >= 1 ? INFINITY : ::atanh(p_x)); }
-	static _ALWAYS_INLINE_ float atanh(float p_x) { return p_x <= -1 ? -INFINITY : (p_x >= 1 ? INFINITY : ::atanhf(p_x)); }
+_ALWAYS_INLINE_ double fmod(double p_x, double p_y) {
+	return ::fmod(p_x, p_y);
+}
+_ALWAYS_INLINE_ float fmod(float p_x, float p_y) {
+	return ::fmodf(p_x, p_y);
+}
 
-	static _ALWAYS_INLINE_ double sqrt(double p_x) { return ::sqrt(p_x); }
-	static _ALWAYS_INLINE_ float sqrt(float p_x) { return ::sqrtf(p_x); }
+_ALWAYS_INLINE_ double modf(double p_x, double *r_y) {
+	return ::modf(p_x, r_y);
+}
+_ALWAYS_INLINE_ float modf(float p_x, float *r_y) {
+	return ::modff(p_x, r_y);
+}
 
-	static _ALWAYS_INLINE_ double fmod(double p_x, double p_y) { return ::fmod(p_x, p_y); }
-	static _ALWAYS_INLINE_ float fmod(float p_x, float p_y) { return ::fmodf(p_x, p_y); }
+_ALWAYS_INLINE_ double floor(double p_x) {
+	return ::floor(p_x);
+}
+_ALWAYS_INLINE_ float floor(float p_x) {
+	return ::floorf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double modf(double p_x, double *r_y) { return ::modf(p_x, r_y); }
-	static _ALWAYS_INLINE_ float modf(float p_x, float *r_y) { return ::modff(p_x, r_y); }
+_ALWAYS_INLINE_ double ceil(double p_x) {
+	return ::ceil(p_x);
+}
+_ALWAYS_INLINE_ float ceil(float p_x) {
+	return ::ceilf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double floor(double p_x) { return ::floor(p_x); }
-	static _ALWAYS_INLINE_ float floor(float p_x) { return ::floorf(p_x); }
+_ALWAYS_INLINE_ double pow(double p_x, double p_y) {
+	return ::pow(p_x, p_y);
+}
+_ALWAYS_INLINE_ float pow(float p_x, float p_y) {
+	return ::powf(p_x, p_y);
+}
 
-	static _ALWAYS_INLINE_ double ceil(double p_x) { return ::ceil(p_x); }
-	static _ALWAYS_INLINE_ float ceil(float p_x) { return ::ceilf(p_x); }
+_ALWAYS_INLINE_ double log(double p_x) {
+	return ::log(p_x);
+}
+_ALWAYS_INLINE_ float log(float p_x) {
+	return ::logf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double pow(double p_x, double p_y) { return ::pow(p_x, p_y); }
-	static _ALWAYS_INLINE_ float pow(float p_x, float p_y) { return ::powf(p_x, p_y); }
+_ALWAYS_INLINE_ double log1p(double p_x) {
+	return ::log1p(p_x);
+}
+_ALWAYS_INLINE_ float log1p(float p_x) {
+	return ::log1pf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double log(double p_x) { return ::log(p_x); }
-	static _ALWAYS_INLINE_ float log(float p_x) { return ::logf(p_x); }
+_ALWAYS_INLINE_ double log2(double p_x) {
+	return ::log2(p_x);
+}
+_ALWAYS_INLINE_ float log2(float p_x) {
+	return ::log2f(p_x);
+}
 
-	static _ALWAYS_INLINE_ double log1p(double p_x) { return ::log1p(p_x); }
-	static _ALWAYS_INLINE_ float log1p(float p_x) { return ::log1pf(p_x); }
+_ALWAYS_INLINE_ double exp(double p_x) {
+	return ::exp(p_x);
+}
+_ALWAYS_INLINE_ float exp(float p_x) {
+	return ::expf(p_x);
+}
 
-	static _ALWAYS_INLINE_ double log2(double p_x) { return ::log2(p_x); }
-	static _ALWAYS_INLINE_ float log2(float p_x) { return ::log2f(p_x); }
-
-	static _ALWAYS_INLINE_ double exp(double p_x) { return ::exp(p_x); }
-	static _ALWAYS_INLINE_ float exp(float p_x) { return ::expf(p_x); }
-
-	static _ALWAYS_INLINE_ bool is_nan(double p_val) {
+_ALWAYS_INLINE_ bool is_nan(double p_val) {
 #ifdef _MSC_VER
-		return _isnan(p_val);
+	return _isnan(p_val);
 #elif defined(__GNUC__) && __GNUC__ < 6
-		union {
-			uint64_t u;
-			double f;
-		} ieee754;
-		ieee754.f = p_val;
-		// (unsigned)(0x7ff0000000000001 >> 32) : 0x7ff00000
-		return ((((unsigned)(ieee754.u >> 32) & 0x7fffffff) + ((unsigned)ieee754.u != 0)) > 0x7ff00000);
+	union {
+		uint64_t u;
+		double f;
+	} ieee754;
+	ieee754.f = p_val;
+	// (unsigned)(0x7ff0000000000001 >> 32) : 0x7ff00000
+	return ((((unsigned)(ieee754.u >> 32) & 0x7fffffff) + ((unsigned)ieee754.u != 0)) > 0x7ff00000);
 #else
-		return isnan(p_val);
+	return isnan(p_val);
 #endif
-	}
+}
 
-	static _ALWAYS_INLINE_ bool is_nan(float p_val) {
+_ALWAYS_INLINE_ bool is_nan(float p_val) {
 #ifdef _MSC_VER
-		return _isnan(p_val);
+	return _isnan(p_val);
 #elif defined(__GNUC__) && __GNUC__ < 6
-		union {
-			uint32_t u;
-			float f;
-		} ieee754;
-		ieee754.f = p_val;
-		// -----------------------------------
-		// (single-precision floating-point)
-		// NaN : s111 1111 1xxx xxxx xxxx xxxx xxxx xxxx
-		//     : (> 0x7f800000)
-		// where,
-		//   s : sign
-		//   x : non-zero number
-		// -----------------------------------
-		return ((ieee754.u & 0x7fffffff) > 0x7f800000);
+	union {
+		uint32_t u;
+		float f;
+	} ieee754;
+	ieee754.f = p_val;
+	// -----------------------------------
+	// (single-precision floating-point)
+	// NaN : s111 1111 1xxx xxxx xxxx xxxx xxxx xxxx
+	//     : (> 0x7f800000)
+	// where,
+	//   s : sign
+	//   x : non-zero number
+	// -----------------------------------
+	return ((ieee754.u & 0x7fffffff) > 0x7f800000);
 #else
-		return isnan(p_val);
+	return isnan(p_val);
 #endif
-	}
+}
 
-	static _ALWAYS_INLINE_ bool is_inf(double p_val) {
+_ALWAYS_INLINE_ bool is_inf(double p_val) {
 #ifdef _MSC_VER
-		return !_finite(p_val);
+	return !_finite(p_val);
 // use an inline implementation of isinf as a workaround for problematic libstdc++ versions from gcc 5.x era
 #elif defined(__GNUC__) && __GNUC__ < 6
-		union {
-			uint64_t u;
-			double f;
-		} ieee754;
-		ieee754.f = p_val;
-		return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) == 0x7ff00000 &&
-				((unsigned)ieee754.u == 0);
+	union {
+		uint64_t u;
+		double f;
+	} ieee754;
+	ieee754.f = p_val;
+	return ((unsigned)(ieee754.u >> 32) & 0x7fffffff) == 0x7ff00000 &&
+			((unsigned)ieee754.u == 0);
 #else
-		return isinf(p_val);
+	return isinf(p_val);
 #endif
-	}
+}
 
-	static _ALWAYS_INLINE_ bool is_inf(float p_val) {
+_ALWAYS_INLINE_ bool is_inf(float p_val) {
 #ifdef _MSC_VER
-		return !_finite(p_val);
+	return !_finite(p_val);
 // use an inline implementation of isinf as a workaround for problematic libstdc++ versions from gcc 5.x era
 #elif defined(__GNUC__) && __GNUC__ < 6
-		union {
-			uint32_t u;
-			float f;
-		} ieee754;
-		ieee754.f = p_val;
-		return (ieee754.u & 0x7fffffff) == 0x7f800000;
+	union {
+		uint32_t u;
+		float f;
+	} ieee754;
+	ieee754.f = p_val;
+	return (ieee754.u & 0x7fffffff) == 0x7f800000;
 #else
-		return isinf(p_val);
+	return isinf(p_val);
 #endif
+}
+
+// These methods assume (p_num + p_den) doesn't overflow.
+_ALWAYS_INLINE_ int32_t division_round_up(int32_t p_num, int32_t p_den) {
+	int32_t offset = (p_num < 0 && p_den < 0) ? 1 : -1;
+	return (p_num + p_den + offset) / p_den;
+}
+_ALWAYS_INLINE_ uint32_t division_round_up(uint32_t p_num, uint32_t p_den) {
+	return (p_num + p_den - 1) / p_den;
+}
+_ALWAYS_INLINE_ int64_t division_round_up(int64_t p_num, int64_t p_den) {
+	int32_t offset = (p_num < 0 && p_den < 0) ? 1 : -1;
+	return (p_num + p_den + offset) / p_den;
+}
+_ALWAYS_INLINE_ uint64_t division_round_up(uint64_t p_num, uint64_t p_den) {
+	return (p_num + p_den - 1) / p_den;
+}
+
+_ALWAYS_INLINE_ bool is_finite(double p_val) {
+	return isfinite(p_val);
+}
+_ALWAYS_INLINE_ bool is_finite(float p_val) {
+	return isfinite(p_val);
+}
+
+_ALWAYS_INLINE_ double absd(double p_value) {
+	return ::fabs(p_value);
+}
+_ALWAYS_INLINE_ float absf(float p_value) {
+	return ::fabsf(p_value);
+}
+
+_ALWAYS_INLINE_ double abs(double p_value) {
+	return absd(p_value);
+}
+_ALWAYS_INLINE_ float abs(float p_value) {
+	return absf(p_value);
+}
+_ALWAYS_INLINE_ int8_t abs(int8_t p_value) {
+	return p_value > 0 ? p_value : -p_value;
+}
+_ALWAYS_INLINE_ int16_t abs(int16_t p_value) {
+	return p_value > 0 ? p_value : -p_value;
+}
+_ALWAYS_INLINE_ int32_t abs(int32_t p_value) {
+	return ::abs(p_value);
+}
+_ALWAYS_INLINE_ int64_t abs(int64_t p_value) {
+	return ::llabs(p_value);
+}
+
+_ALWAYS_INLINE_ double fposmod(double p_x, double p_y) {
+	double value = fmod(p_x, p_y);
+	if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) {
+		value += p_y;
 	}
-
-	// These methods assume (p_num + p_den) doesn't overflow.
-	static _ALWAYS_INLINE_ int32_t division_round_up(int32_t p_num, int32_t p_den) {
-		int32_t offset = (p_num < 0 && p_den < 0) ? 1 : -1;
-		return (p_num + p_den + offset) / p_den;
+	value += 0.0;
+	return value;
+}
+_ALWAYS_INLINE_ float fposmod(float p_x, float p_y) {
+	float value = fmod(p_x, p_y);
+	if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) {
+		value += p_y;
 	}
-	static _ALWAYS_INLINE_ uint32_t division_round_up(uint32_t p_num, uint32_t p_den) {
-		return (p_num + p_den - 1) / p_den;
+	value += 0.0f;
+	return value;
+}
+
+_ALWAYS_INLINE_ double fposmodp(double p_x, double p_y) {
+	double value = fmod(p_x, p_y);
+	if (value < 0) {
+		value += p_y;
 	}
-	static _ALWAYS_INLINE_ int64_t division_round_up(int64_t p_num, int64_t p_den) {
-		int32_t offset = (p_num < 0 && p_den < 0) ? 1 : -1;
-		return (p_num + p_den + offset) / p_den;
+	value += 0.0;
+	return value;
+}
+_ALWAYS_INLINE_ float fposmodp(float p_x, float p_y) {
+	float value = fmod(p_x, p_y);
+	if (value < 0) {
+		value += p_y;
 	}
-	static _ALWAYS_INLINE_ uint64_t division_round_up(uint64_t p_num, uint64_t p_den) {
-		return (p_num + p_den - 1) / p_den;
+	value += 0.0f;
+	return value;
+}
+
+_ALWAYS_INLINE_ int64_t posmod(int64_t p_x, int64_t p_y) {
+	ERR_FAIL_COND_V_MSG(p_y == 0, 0, "Division by zero in posmod is undefined. Returning 0 as fallback.");
+	int64_t value = p_x % p_y;
+	if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) {
+		value += p_y;
 	}
+	return value;
+}
 
-	static _ALWAYS_INLINE_ bool is_finite(double p_val) { return isfinite(p_val); }
-	static _ALWAYS_INLINE_ bool is_finite(float p_val) { return isfinite(p_val); }
+_ALWAYS_INLINE_ double deg_to_rad(double p_y) {
+	return p_y * (PI / 180.0);
+}
+_ALWAYS_INLINE_ float deg_to_rad(float p_y) {
+	return p_y * ((float)PI / 180.0f);
+}
 
-	static _ALWAYS_INLINE_ double abs(double g) { return absd(g); }
-	static _ALWAYS_INLINE_ float abs(float g) { return absf(g); }
-	static _ALWAYS_INLINE_ int abs(int g) { return g > 0 ? g : -g; }
+_ALWAYS_INLINE_ double rad_to_deg(double p_y) {
+	return p_y * (180.0 / PI);
+}
+_ALWAYS_INLINE_ float rad_to_deg(float p_y) {
+	return p_y * (180.0f / (float)PI);
+}
 
-	static _ALWAYS_INLINE_ double fposmod(double p_x, double p_y) {
-		double value = Math::fmod(p_x, p_y);
-		if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) {
-			value += p_y;
-		}
-		value += 0.0;
-		return value;
+_ALWAYS_INLINE_ double lerp(double p_from, double p_to, double p_weight) {
+	return p_from + (p_to - p_from) * p_weight;
+}
+_ALWAYS_INLINE_ float lerp(float p_from, float p_to, float p_weight) {
+	return p_from + (p_to - p_from) * p_weight;
+}
+
+_ALWAYS_INLINE_ double cubic_interpolate(double p_from, double p_to, double p_pre, double p_post, double p_weight) {
+	return 0.5 *
+			((p_from * 2.0) +
+					(-p_pre + p_to) * p_weight +
+					(2.0 * p_pre - 5.0 * p_from + 4.0 * p_to - p_post) * (p_weight * p_weight) +
+					(-p_pre + 3.0 * p_from - 3.0 * p_to + p_post) * (p_weight * p_weight * p_weight));
+}
+_ALWAYS_INLINE_ float cubic_interpolate(float p_from, float p_to, float p_pre, float p_post, float p_weight) {
+	return 0.5f *
+			((p_from * 2.0f) +
+					(-p_pre + p_to) * p_weight +
+					(2.0f * p_pre - 5.0f * p_from + 4.0f * p_to - p_post) * (p_weight * p_weight) +
+					(-p_pre + 3.0f * p_from - 3.0f * p_to + p_post) * (p_weight * p_weight * p_weight));
+}
+
+_ALWAYS_INLINE_ double cubic_interpolate_angle(double p_from, double p_to, double p_pre, double p_post, double p_weight) {
+	double from_rot = fmod(p_from, TAU);
+
+	double pre_diff = fmod(p_pre - from_rot, TAU);
+	double pre_rot = from_rot + fmod(2.0 * pre_diff, TAU) - pre_diff;
+
+	double to_diff = fmod(p_to - from_rot, TAU);
+	double to_rot = from_rot + fmod(2.0 * to_diff, TAU) - to_diff;
+
+	double post_diff = fmod(p_post - to_rot, TAU);
+	double post_rot = to_rot + fmod(2.0 * post_diff, TAU) - post_diff;
+
+	return cubic_interpolate(from_rot, to_rot, pre_rot, post_rot, p_weight);
+}
+
+_ALWAYS_INLINE_ float cubic_interpolate_angle(float p_from, float p_to, float p_pre, float p_post, float p_weight) {
+	float from_rot = fmod(p_from, (float)TAU);
+
+	float pre_diff = fmod(p_pre - from_rot, (float)TAU);
+	float pre_rot = from_rot + fmod(2.0f * pre_diff, (float)TAU) - pre_diff;
+
+	float to_diff = fmod(p_to - from_rot, (float)TAU);
+	float to_rot = from_rot + fmod(2.0f * to_diff, (float)TAU) - to_diff;
+
+	float post_diff = fmod(p_post - to_rot, (float)TAU);
+	float post_rot = to_rot + fmod(2.0f * post_diff, (float)TAU) - post_diff;
+
+	return cubic_interpolate(from_rot, to_rot, pre_rot, post_rot, p_weight);
+}
+
+_ALWAYS_INLINE_ double cubic_interpolate_in_time(double p_from, double p_to, double p_pre, double p_post, double p_weight,
+		double p_to_t, double p_pre_t, double p_post_t) {
+	/* Barry-Goldman method */
+	double t = lerp(0.0, p_to_t, p_weight);
+	double a1 = lerp(p_pre, p_from, p_pre_t == 0 ? 0.0 : (t - p_pre_t) / -p_pre_t);
+	double a2 = lerp(p_from, p_to, p_to_t == 0 ? 0.5 : t / p_to_t);
+	double a3 = lerp(p_to, p_post, p_post_t - p_to_t == 0 ? 1.0 : (t - p_to_t) / (p_post_t - p_to_t));
+	double b1 = lerp(a1, a2, p_to_t - p_pre_t == 0 ? 0.0 : (t - p_pre_t) / (p_to_t - p_pre_t));
+	double b2 = lerp(a2, a3, p_post_t == 0 ? 1.0 : t / p_post_t);
+	return lerp(b1, b2, p_to_t == 0 ? 0.5 : t / p_to_t);
+}
+_ALWAYS_INLINE_ float cubic_interpolate_in_time(float p_from, float p_to, float p_pre, float p_post, float p_weight,
+		float p_to_t, float p_pre_t, float p_post_t) {
+	/* Barry-Goldman method */
+	float t = lerp(0.0f, p_to_t, p_weight);
+	float a1 = lerp(p_pre, p_from, p_pre_t == 0 ? 0.0f : (t - p_pre_t) / -p_pre_t);
+	float a2 = lerp(p_from, p_to, p_to_t == 0 ? 0.5f : t / p_to_t);
+	float a3 = lerp(p_to, p_post, p_post_t - p_to_t == 0 ? 1.0f : (t - p_to_t) / (p_post_t - p_to_t));
+	float b1 = lerp(a1, a2, p_to_t - p_pre_t == 0 ? 0.0f : (t - p_pre_t) / (p_to_t - p_pre_t));
+	float b2 = lerp(a2, a3, p_post_t == 0 ? 1.0f : t / p_post_t);
+	return lerp(b1, b2, p_to_t == 0 ? 0.5f : t / p_to_t);
+}
+
+_ALWAYS_INLINE_ double cubic_interpolate_angle_in_time(double p_from, double p_to, double p_pre, double p_post, double p_weight,
+		double p_to_t, double p_pre_t, double p_post_t) {
+	double from_rot = fmod(p_from, TAU);
+
+	double pre_diff = fmod(p_pre - from_rot, TAU);
+	double pre_rot = from_rot + fmod(2.0 * pre_diff, TAU) - pre_diff;
+
+	double to_diff = fmod(p_to - from_rot, TAU);
+	double to_rot = from_rot + fmod(2.0 * to_diff, TAU) - to_diff;
+
+	double post_diff = fmod(p_post - to_rot, TAU);
+	double post_rot = to_rot + fmod(2.0 * post_diff, TAU) - post_diff;
+
+	return cubic_interpolate_in_time(from_rot, to_rot, pre_rot, post_rot, p_weight, p_to_t, p_pre_t, p_post_t);
+}
+_ALWAYS_INLINE_ float cubic_interpolate_angle_in_time(float p_from, float p_to, float p_pre, float p_post, float p_weight,
+		float p_to_t, float p_pre_t, float p_post_t) {
+	float from_rot = fmod(p_from, (float)TAU);
+
+	float pre_diff = fmod(p_pre - from_rot, (float)TAU);
+	float pre_rot = from_rot + fmod(2.0f * pre_diff, (float)TAU) - pre_diff;
+
+	float to_diff = fmod(p_to - from_rot, (float)TAU);
+	float to_rot = from_rot + fmod(2.0f * to_diff, (float)TAU) - to_diff;
+
+	float post_diff = fmod(p_post - to_rot, (float)TAU);
+	float post_rot = to_rot + fmod(2.0f * post_diff, (float)TAU) - post_diff;
+
+	return cubic_interpolate_in_time(from_rot, to_rot, pre_rot, post_rot, p_weight, p_to_t, p_pre_t, p_post_t);
+}
+
+_ALWAYS_INLINE_ double bezier_interpolate(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
+	/* Formula from Wikipedia article on Bezier curves. */
+	double omt = (1.0 - p_t);
+	double omt2 = omt * omt;
+	double omt3 = omt2 * omt;
+	double t2 = p_t * p_t;
+	double t3 = t2 * p_t;
+
+	return p_start * omt3 + p_control_1 * omt2 * p_t * 3.0 + p_control_2 * omt * t2 * 3.0 + p_end * t3;
+}
+_ALWAYS_INLINE_ float bezier_interpolate(float p_start, float p_control_1, float p_control_2, float p_end, float p_t) {
+	/* Formula from Wikipedia article on Bezier curves. */
+	float omt = (1.0f - p_t);
+	float omt2 = omt * omt;
+	float omt3 = omt2 * omt;
+	float t2 = p_t * p_t;
+	float t3 = t2 * p_t;
+
+	return p_start * omt3 + p_control_1 * omt2 * p_t * 3.0f + p_control_2 * omt * t2 * 3.0f + p_end * t3;
+}
+
+_ALWAYS_INLINE_ double bezier_derivative(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
+	/* Formula from Wikipedia article on Bezier curves. */
+	double omt = (1.0 - p_t);
+	double omt2 = omt * omt;
+	double t2 = p_t * p_t;
+
+	double d = (p_control_1 - p_start) * 3.0 * omt2 + (p_control_2 - p_control_1) * 6.0 * omt * p_t + (p_end - p_control_2) * 3.0 * t2;
+	return d;
+}
+_ALWAYS_INLINE_ float bezier_derivative(float p_start, float p_control_1, float p_control_2, float p_end, float p_t) {
+	/* Formula from Wikipedia article on Bezier curves. */
+	float omt = (1.0f - p_t);
+	float omt2 = omt * omt;
+	float t2 = p_t * p_t;
+
+	float d = (p_control_1 - p_start) * 3.0f * omt2 + (p_control_2 - p_control_1) * 6.0f * omt * p_t + (p_end - p_control_2) * 3.0f * t2;
+	return d;
+}
+
+_ALWAYS_INLINE_ double angle_difference(double p_from, double p_to) {
+	double difference = fmod(p_to - p_from, TAU);
+	return fmod(2.0 * difference, TAU) - difference;
+}
+_ALWAYS_INLINE_ float angle_difference(float p_from, float p_to) {
+	float difference = fmod(p_to - p_from, (float)TAU);
+	return fmod(2.0f * difference, (float)TAU) - difference;
+}
+
+_ALWAYS_INLINE_ double lerp_angle(double p_from, double p_to, double p_weight) {
+	return p_from + angle_difference(p_from, p_to) * p_weight;
+}
+_ALWAYS_INLINE_ float lerp_angle(float p_from, float p_to, float p_weight) {
+	return p_from + angle_difference(p_from, p_to) * p_weight;
+}
+
+_ALWAYS_INLINE_ double inverse_lerp(double p_from, double p_to, double p_value) {
+	return (p_value - p_from) / (p_to - p_from);
+}
+_ALWAYS_INLINE_ float inverse_lerp(float p_from, float p_to, float p_value) {
+	return (p_value - p_from) / (p_to - p_from);
+}
+
+_ALWAYS_INLINE_ double remap(double p_value, double p_istart, double p_istop, double p_ostart, double p_ostop) {
+	return lerp(p_ostart, p_ostop, inverse_lerp(p_istart, p_istop, p_value));
+}
+_ALWAYS_INLINE_ float remap(float p_value, float p_istart, float p_istop, float p_ostart, float p_ostop) {
+	return lerp(p_ostart, p_ostop, inverse_lerp(p_istart, p_istop, p_value));
+}
+
+_ALWAYS_INLINE_ bool is_equal_approx(double p_left, double p_right, double p_tolerance) {
+	// Check for exact equality first, required to handle "infinity" values.
+	if (p_left == p_right) {
+		return true;
 	}
-	static _ALWAYS_INLINE_ float fposmod(float p_x, float p_y) {
-		float value = Math::fmod(p_x, p_y);
-		if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) {
-			value += p_y;
-		}
-		value += 0.0f;
-		return value;
+	// Then check for approximate equality.
+	return abs(p_left - p_right) < p_tolerance;
+}
+_ALWAYS_INLINE_ bool is_equal_approx(float p_left, float p_right, float p_tolerance) {
+	// Check for exact equality first, required to handle "infinity" values.
+	if (p_left == p_right) {
+		return true;
 	}
-	static _ALWAYS_INLINE_ float fposmodp(float p_x, float p_y) {
-		float value = Math::fmod(p_x, p_y);
-		if (value < 0) {
-			value += p_y;
-		}
-		value += 0.0f;
-		return value;
+	// Then check for approximate equality.
+	return abs(p_left - p_right) < p_tolerance;
+}
+
+_ALWAYS_INLINE_ bool is_equal_approx(double p_left, double p_right) {
+	// Check for exact equality first, required to handle "infinity" values.
+	if (p_left == p_right) {
+		return true;
 	}
-	static _ALWAYS_INLINE_ double fposmodp(double p_x, double p_y) {
-		double value = Math::fmod(p_x, p_y);
-		if (value < 0) {
-			value += p_y;
-		}
-		value += 0.0;
-		return value;
+	// Then check for approximate equality.
+	double tolerance = CMP_EPSILON * abs(p_left);
+	if (tolerance < CMP_EPSILON) {
+		tolerance = CMP_EPSILON;
 	}
-
-	static _ALWAYS_INLINE_ int64_t posmod(int64_t p_x, int64_t p_y) {
-		ERR_FAIL_COND_V_MSG(p_y == 0, 0, "Division by zero in posmod is undefined. Returning 0 as fallback.");
-		int64_t value = p_x % p_y;
-		if (((value < 0) && (p_y > 0)) || ((value > 0) && (p_y < 0))) {
-			value += p_y;
-		}
-		return value;
+	return abs(p_left - p_right) < tolerance;
+}
+_ALWAYS_INLINE_ bool is_equal_approx(float p_left, float p_right) {
+	// Check for exact equality first, required to handle "infinity" values.
+	if (p_left == p_right) {
+		return true;
 	}
-
-	static _ALWAYS_INLINE_ double deg_to_rad(double p_y) { return p_y * (Math_PI / 180.0); }
-	static _ALWAYS_INLINE_ float deg_to_rad(float p_y) { return p_y * (float)(Math_PI / 180.0); }
-
-	static _ALWAYS_INLINE_ double rad_to_deg(double p_y) { return p_y * (180.0 / Math_PI); }
-	static _ALWAYS_INLINE_ float rad_to_deg(float p_y) { return p_y * (float)(180.0 / Math_PI); }
-
-	static _ALWAYS_INLINE_ double lerp(double p_from, double p_to, double p_weight) { return p_from + (p_to - p_from) * p_weight; }
-	static _ALWAYS_INLINE_ float lerp(float p_from, float p_to, float p_weight) { return p_from + (p_to - p_from) * p_weight; }
-
-	static _ALWAYS_INLINE_ double cubic_interpolate(double p_from, double p_to, double p_pre, double p_post, double p_weight) {
-		return 0.5 *
-				((p_from * 2.0) +
-						(-p_pre + p_to) * p_weight +
-						(2.0 * p_pre - 5.0 * p_from + 4.0 * p_to - p_post) * (p_weight * p_weight) +
-						(-p_pre + 3.0 * p_from - 3.0 * p_to + p_post) * (p_weight * p_weight * p_weight));
+	// Then check for approximate equality.
+	float tolerance = (float)CMP_EPSILON * abs(p_left);
+	if (tolerance < (float)CMP_EPSILON) {
+		tolerance = (float)CMP_EPSILON;
 	}
-	static _ALWAYS_INLINE_ float cubic_interpolate(float p_from, float p_to, float p_pre, float p_post, float p_weight) {
-		return 0.5f *
-				((p_from * 2.0f) +
-						(-p_pre + p_to) * p_weight +
-						(2.0f * p_pre - 5.0f * p_from + 4.0f * p_to - p_post) * (p_weight * p_weight) +
-						(-p_pre + 3.0f * p_from - 3.0f * p_to + p_post) * (p_weight * p_weight * p_weight));
-	}
-
-	static _ALWAYS_INLINE_ double cubic_interpolate_angle(double p_from, double p_to, double p_pre, double p_post, double p_weight) {
-		double from_rot = fmod(p_from, Math_TAU);
-
-		double pre_diff = fmod(p_pre - from_rot, Math_TAU);
-		double pre_rot = from_rot + fmod(2.0 * pre_diff, Math_TAU) - pre_diff;
-
-		double to_diff = fmod(p_to - from_rot, Math_TAU);
-		double to_rot = from_rot + fmod(2.0 * to_diff, Math_TAU) - to_diff;
-
-		double post_diff = fmod(p_post - to_rot, Math_TAU);
-		double post_rot = to_rot + fmod(2.0 * post_diff, Math_TAU) - post_diff;
-
-		return cubic_interpolate(from_rot, to_rot, pre_rot, post_rot, p_weight);
-	}
-
-	static _ALWAYS_INLINE_ float cubic_interpolate_angle(float p_from, float p_to, float p_pre, float p_post, float p_weight) {
-		float from_rot = fmod(p_from, (float)Math_TAU);
-
-		float pre_diff = fmod(p_pre - from_rot, (float)Math_TAU);
-		float pre_rot = from_rot + fmod(2.0f * pre_diff, (float)Math_TAU) - pre_diff;
-
-		float to_diff = fmod(p_to - from_rot, (float)Math_TAU);
-		float to_rot = from_rot + fmod(2.0f * to_diff, (float)Math_TAU) - to_diff;
-
-		float post_diff = fmod(p_post - to_rot, (float)Math_TAU);
-		float post_rot = to_rot + fmod(2.0f * post_diff, (float)Math_TAU) - post_diff;
-
-		return cubic_interpolate(from_rot, to_rot, pre_rot, post_rot, p_weight);
-	}
-
-	static _ALWAYS_INLINE_ double cubic_interpolate_in_time(double p_from, double p_to, double p_pre, double p_post, double p_weight,
-			double p_to_t, double p_pre_t, double p_post_t) {
-		/* Barry-Goldman method */
-		double t = Math::lerp(0.0, p_to_t, p_weight);
-		double a1 = Math::lerp(p_pre, p_from, p_pre_t == 0 ? 0.0 : (t - p_pre_t) / -p_pre_t);
-		double a2 = Math::lerp(p_from, p_to, p_to_t == 0 ? 0.5 : t / p_to_t);
-		double a3 = Math::lerp(p_to, p_post, p_post_t - p_to_t == 0 ? 1.0 : (t - p_to_t) / (p_post_t - p_to_t));
-		double b1 = Math::lerp(a1, a2, p_to_t - p_pre_t == 0 ? 0.0 : (t - p_pre_t) / (p_to_t - p_pre_t));
-		double b2 = Math::lerp(a2, a3, p_post_t == 0 ? 1.0 : t / p_post_t);
-		return Math::lerp(b1, b2, p_to_t == 0 ? 0.5 : t / p_to_t);
-	}
-
-	static _ALWAYS_INLINE_ float cubic_interpolate_in_time(float p_from, float p_to, float p_pre, float p_post, float p_weight,
-			float p_to_t, float p_pre_t, float p_post_t) {
-		/* Barry-Goldman method */
-		float t = Math::lerp(0.0f, p_to_t, p_weight);
-		float a1 = Math::lerp(p_pre, p_from, p_pre_t == 0 ? 0.0f : (t - p_pre_t) / -p_pre_t);
-		float a2 = Math::lerp(p_from, p_to, p_to_t == 0 ? 0.5f : t / p_to_t);
-		float a3 = Math::lerp(p_to, p_post, p_post_t - p_to_t == 0 ? 1.0f : (t - p_to_t) / (p_post_t - p_to_t));
-		float b1 = Math::lerp(a1, a2, p_to_t - p_pre_t == 0 ? 0.0f : (t - p_pre_t) / (p_to_t - p_pre_t));
-		float b2 = Math::lerp(a2, a3, p_post_t == 0 ? 1.0f : t / p_post_t);
-		return Math::lerp(b1, b2, p_to_t == 0 ? 0.5f : t / p_to_t);
-	}
-
-	static _ALWAYS_INLINE_ double cubic_interpolate_angle_in_time(double p_from, double p_to, double p_pre, double p_post, double p_weight,
-			double p_to_t, double p_pre_t, double p_post_t) {
-		double from_rot = fmod(p_from, Math_TAU);
-
-		double pre_diff = fmod(p_pre - from_rot, Math_TAU);
-		double pre_rot = from_rot + fmod(2.0 * pre_diff, Math_TAU) - pre_diff;
-
-		double to_diff = fmod(p_to - from_rot, Math_TAU);
-		double to_rot = from_rot + fmod(2.0 * to_diff, Math_TAU) - to_diff;
-
-		double post_diff = fmod(p_post - to_rot, Math_TAU);
-		double post_rot = to_rot + fmod(2.0 * post_diff, Math_TAU) - post_diff;
-
-		return cubic_interpolate_in_time(from_rot, to_rot, pre_rot, post_rot, p_weight, p_to_t, p_pre_t, p_post_t);
-	}
-
-	static _ALWAYS_INLINE_ float cubic_interpolate_angle_in_time(float p_from, float p_to, float p_pre, float p_post, float p_weight,
-			float p_to_t, float p_pre_t, float p_post_t) {
-		float from_rot = fmod(p_from, (float)Math_TAU);
-
-		float pre_diff = fmod(p_pre - from_rot, (float)Math_TAU);
-		float pre_rot = from_rot + fmod(2.0f * pre_diff, (float)Math_TAU) - pre_diff;
-
-		float to_diff = fmod(p_to - from_rot, (float)Math_TAU);
-		float to_rot = from_rot + fmod(2.0f * to_diff, (float)Math_TAU) - to_diff;
-
-		float post_diff = fmod(p_post - to_rot, (float)Math_TAU);
-		float post_rot = to_rot + fmod(2.0f * post_diff, (float)Math_TAU) - post_diff;
-
-		return cubic_interpolate_in_time(from_rot, to_rot, pre_rot, post_rot, p_weight, p_to_t, p_pre_t, p_post_t);
-	}
-
-	static _ALWAYS_INLINE_ double bezier_interpolate(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
-		/* Formula from Wikipedia article on Bezier curves. */
-		double omt = (1.0 - p_t);
-		double omt2 = omt * omt;
-		double omt3 = omt2 * omt;
-		double t2 = p_t * p_t;
-		double t3 = t2 * p_t;
-
-		return p_start * omt3 + p_control_1 * omt2 * p_t * 3.0 + p_control_2 * omt * t2 * 3.0 + p_end * t3;
-	}
-
-	static _ALWAYS_INLINE_ float bezier_interpolate(float p_start, float p_control_1, float p_control_2, float p_end, float p_t) {
-		/* Formula from Wikipedia article on Bezier curves. */
-		float omt = (1.0f - p_t);
-		float omt2 = omt * omt;
-		float omt3 = omt2 * omt;
-		float t2 = p_t * p_t;
-		float t3 = t2 * p_t;
-
-		return p_start * omt3 + p_control_1 * omt2 * p_t * 3.0f + p_control_2 * omt * t2 * 3.0f + p_end * t3;
-	}
-
-	static _ALWAYS_INLINE_ double bezier_derivative(double p_start, double p_control_1, double p_control_2, double p_end, double p_t) {
-		/* Formula from Wikipedia article on Bezier curves. */
-		double omt = (1.0 - p_t);
-		double omt2 = omt * omt;
-		double t2 = p_t * p_t;
-
-		double d = (p_control_1 - p_start) * 3.0 * omt2 + (p_control_2 - p_control_1) * 6.0 * omt * p_t + (p_end - p_control_2) * 3.0 * t2;
-		return d;
-	}
-
-	static _ALWAYS_INLINE_ float bezier_derivative(float p_start, float p_control_1, float p_control_2, float p_end, float p_t) {
-		/* Formula from Wikipedia article on Bezier curves. */
-		float omt = (1.0f - p_t);
-		float omt2 = omt * omt;
-		float t2 = p_t * p_t;
-
-		float d = (p_control_1 - p_start) * 3.0f * omt2 + (p_control_2 - p_control_1) * 6.0f * omt * p_t + (p_end - p_control_2) * 3.0f * t2;
-		return d;
-	}
-
-	static _ALWAYS_INLINE_ double angle_difference(double p_from, double p_to) {
-		double difference = fmod(p_to - p_from, Math_TAU);
-		return fmod(2.0 * difference, Math_TAU) - difference;
-	}
-	static _ALWAYS_INLINE_ float angle_difference(float p_from, float p_to) {
-		float difference = fmod(p_to - p_from, (float)Math_TAU);
-		return fmod(2.0f * difference, (float)Math_TAU) - difference;
-	}
-
-	static _ALWAYS_INLINE_ double lerp_angle(double p_from, double p_to, double p_weight) {
-		return p_from + Math::angle_difference(p_from, p_to) * p_weight;
-	}
-	static _ALWAYS_INLINE_ float lerp_angle(float p_from, float p_to, float p_weight) {
-		return p_from + Math::angle_difference(p_from, p_to) * p_weight;
-	}
-
-	static _ALWAYS_INLINE_ double inverse_lerp(double p_from, double p_to, double p_value) {
-		return (p_value - p_from) / (p_to - p_from);
-	}
-	static _ALWAYS_INLINE_ float inverse_lerp(float p_from, float p_to, float p_value) {
-		return (p_value - p_from) / (p_to - p_from);
-	}
-
-	static _ALWAYS_INLINE_ double remap(double p_value, double p_istart, double p_istop, double p_ostart, double p_ostop) {
-		return Math::lerp(p_ostart, p_ostop, Math::inverse_lerp(p_istart, p_istop, p_value));
-	}
-	static _ALWAYS_INLINE_ float remap(float p_value, float p_istart, float p_istop, float p_ostart, float p_ostop) {
-		return Math::lerp(p_ostart, p_ostop, Math::inverse_lerp(p_istart, p_istop, p_value));
-	}
-
-	static _ALWAYS_INLINE_ double smoothstep(double p_from, double p_to, double p_s) {
-		if (is_equal_approx(p_from, p_to)) {
-			if (likely(p_from <= p_to)) {
-				return p_s <= p_from ? 0.0 : 1.0;
-			} else {
-				return p_s <= p_to ? 1.0 : 0.0;
-			}
-		}
-		double s = CLAMP((p_s - p_from) / (p_to - p_from), 0.0, 1.0);
-		return s * s * (3.0 - 2.0 * s);
-	}
-	static _ALWAYS_INLINE_ float smoothstep(float p_from, float p_to, float p_s) {
-		if (is_equal_approx(p_from, p_to)) {
-			if (likely(p_from <= p_to)) {
-				return p_s <= p_from ? 0.0f : 1.0f;
-			} else {
-				return p_s <= p_to ? 1.0f : 0.0f;
-			}
-		}
-		float s = CLAMP((p_s - p_from) / (p_to - p_from), 0.0f, 1.0f);
-		return s * s * (3.0f - 2.0f * s);
-	}
-
-	static _ALWAYS_INLINE_ double move_toward(double p_from, double p_to, double p_delta) {
-		return abs(p_to - p_from) <= p_delta ? p_to : p_from + SIGN(p_to - p_from) * p_delta;
-	}
-	static _ALWAYS_INLINE_ float move_toward(float p_from, float p_to, float p_delta) {
-		return abs(p_to - p_from) <= p_delta ? p_to : p_from + SIGN(p_to - p_from) * p_delta;
-	}
-
-	static _ALWAYS_INLINE_ double rotate_toward(double p_from, double p_to, double p_delta) {
-		double difference = Math::angle_difference(p_from, p_to);
-		double abs_difference = Math::abs(difference);
-		// When `p_delta < 0` move no further than to PI radians away from `p_to` (as PI is the max possible angle distance).
-		return p_from + CLAMP(p_delta, abs_difference - Math_PI, abs_difference) * (difference >= 0.0 ? 1.0 : -1.0);
-	}
-	static _ALWAYS_INLINE_ float rotate_toward(float p_from, float p_to, float p_delta) {
-		float difference = Math::angle_difference(p_from, p_to);
-		float abs_difference = Math::abs(difference);
-		// When `p_delta < 0` move no further than to PI radians away from `p_to` (as PI is the max possible angle distance).
-		return p_from + CLAMP(p_delta, abs_difference - (float)Math_PI, abs_difference) * (difference >= 0.0f ? 1.0f : -1.0f);
-	}
-
-	static _ALWAYS_INLINE_ double linear_to_db(double p_linear) {
-		return Math::log(p_linear) * 8.6858896380650365530225783783321;
-	}
-	static _ALWAYS_INLINE_ float linear_to_db(float p_linear) {
-		return Math::log(p_linear) * (float)8.6858896380650365530225783783321;
-	}
-
-	static _ALWAYS_INLINE_ double db_to_linear(double p_db) {
-		return Math::exp(p_db * 0.11512925464970228420089957273422);
-	}
-	static _ALWAYS_INLINE_ float db_to_linear(float p_db) {
-		return Math::exp(p_db * (float)0.11512925464970228420089957273422);
-	}
-
-	static _ALWAYS_INLINE_ double round(double p_val) { return ::round(p_val); }
-	static _ALWAYS_INLINE_ float round(float p_val) { return ::roundf(p_val); }
-
-	static _ALWAYS_INLINE_ int64_t wrapi(int64_t value, int64_t min, int64_t max) {
-		int64_t range = max - min;
-		return range == 0 ? min : min + ((((value - min) % range) + range) % range);
-	}
-	static _ALWAYS_INLINE_ double wrapf(double value, double min, double max) {
-		double range = max - min;
-		if (is_zero_approx(range)) {
-			return min;
-		}
-		double result = value - (range * Math::floor((value - min) / range));
-		if (is_equal_approx(result, max)) {
-			return min;
-		}
-		return result;
-	}
-	static _ALWAYS_INLINE_ float wrapf(float value, float min, float max) {
-		float range = max - min;
-		if (is_zero_approx(range)) {
-			return min;
-		}
-		float result = value - (range * Math::floor((value - min) / range));
-		if (is_equal_approx(result, max)) {
-			return min;
-		}
-		return result;
-	}
-
-	static _ALWAYS_INLINE_ float fract(float value) {
-		return value - floor(value);
-	}
-	static _ALWAYS_INLINE_ double fract(double value) {
-		return value - floor(value);
-	}
-	static _ALWAYS_INLINE_ float pingpong(float value, float length) {
-		return (length != 0.0f) ? abs(fract((value - length) / (length * 2.0f)) * length * 2.0f - length) : 0.0f;
-	}
-	static _ALWAYS_INLINE_ double pingpong(double value, double length) {
-		return (length != 0.0) ? abs(fract((value - length) / (length * 2.0)) * length * 2.0 - length) : 0.0;
-	}
-
-	// double only, as these functions are mainly used by the editor and not performance-critical,
-	static double ease(double p_x, double p_c);
-	static int step_decimals(double p_step);
-	static int range_step_decimals(double p_step); // For editor use only.
-	static double snapped(double p_value, double p_step);
-
-	static uint32_t larger_prime(uint32_t p_val);
-
-	static void seed(uint64_t x);
-	static void randomize();
-	static uint32_t rand_from_seed(uint64_t *seed);
-	static uint32_t rand();
-	static _ALWAYS_INLINE_ double randd() { return (double)rand() / (double)Math::RANDOM_32BIT_MAX; }
-	static _ALWAYS_INLINE_ float randf() { return (float)rand() / (float)Math::RANDOM_32BIT_MAX; }
-	static double randfn(double mean, double deviation);
-
-	static double random(double from, double to);
-	static float random(float from, float to);
-	static int random(int from, int to);
-
-	static _ALWAYS_INLINE_ bool is_equal_approx(float a, float b) {
-		// Check for exact equality first, required to handle "infinity" values.
-		if (a == b) {
-			return true;
-		}
-		// Then check for approximate equality.
-		float tolerance = (float)CMP_EPSILON * abs(a);
-		if (tolerance < (float)CMP_EPSILON) {
-			tolerance = (float)CMP_EPSILON;
-		}
-		return abs(a - b) < tolerance;
-	}
-
-	static _ALWAYS_INLINE_ bool is_equal_approx(float a, float b, float tolerance) {
-		// Check for exact equality first, required to handle "infinity" values.
-		if (a == b) {
-			return true;
-		}
-		// Then check for approximate equality.
-		return abs(a - b) < tolerance;
-	}
-
-	static _ALWAYS_INLINE_ bool is_zero_approx(float s) {
-		return abs(s) < (float)CMP_EPSILON;
-	}
-
-	static _ALWAYS_INLINE_ bool is_equal_approx(double a, double b) {
-		// Check for exact equality first, required to handle "infinity" values.
-		if (a == b) {
-			return true;
-		}
-		// Then check for approximate equality.
-		double tolerance = CMP_EPSILON * abs(a);
-		if (tolerance < CMP_EPSILON) {
-			tolerance = CMP_EPSILON;
-		}
-		return abs(a - b) < tolerance;
-	}
-
-	static _ALWAYS_INLINE_ bool is_equal_approx(double a, double b, double tolerance) {
-		// Check for exact equality first, required to handle "infinity" values.
-		if (a == b) {
-			return true;
-		}
-		// Then check for approximate equality.
-		return abs(a - b) < tolerance;
-	}
-
-	static _ALWAYS_INLINE_ bool is_zero_approx(double s) {
-		return abs(s) < CMP_EPSILON;
-	}
-
-	static _ALWAYS_INLINE_ float absf(float g) {
-		union {
-			float f;
-			uint32_t i;
-		} u;
-
-		u.f = g;
-		u.i &= 2147483647u;
-		return u.f;
-	}
-
-	static _ALWAYS_INLINE_ double absd(double g) {
-		union {
-			double d;
-			uint64_t i;
-		} u;
-		u.d = g;
-		u.i &= (uint64_t)9223372036854775807ll;
-		return u.d;
-	}
-
-	// This function should be as fast as possible and rounding mode should not matter.
-	static _ALWAYS_INLINE_ int fast_ftoi(float a) {
-		// Assuming every supported compiler has `lrint()`.
-		return lrintf(a);
-	}
-
-	static _ALWAYS_INLINE_ uint32_t halfbits_to_floatbits(uint16_t h) {
-		uint16_t h_exp, h_sig;
-		uint32_t f_sgn, f_exp, f_sig;
-
-		h_exp = (h & 0x7c00u);
-		f_sgn = ((uint32_t)h & 0x8000u) << 16;
-		switch (h_exp) {
-			case 0x0000u: /* 0 or subnormal */
-				h_sig = (h & 0x03ffu);
-				/* Signed zero */
-				if (h_sig == 0) {
-					return f_sgn;
-				}
-				/* Subnormal */
-				h_sig <<= 1;
-				while ((h_sig & 0x0400u) == 0) {
-					h_sig <<= 1;
-					h_exp++;
-				}
-				f_exp = ((uint32_t)(127 - 15 - h_exp)) << 23;
-				f_sig = ((uint32_t)(h_sig & 0x03ffu)) << 13;
-				return f_sgn + f_exp + f_sig;
-			case 0x7c00u: /* inf or NaN */
-				/* All-ones exponent and a copy of the significand */
-				return f_sgn + 0x7f800000u + (((uint32_t)(h & 0x03ffu)) << 13);
-			default: /* normalized */
-				/* Just need to adjust the exponent and shift */
-				return f_sgn + (((uint32_t)(h & 0x7fffu) + 0x1c000u) << 13);
-		}
-	}
-
-	static _ALWAYS_INLINE_ float halfptr_to_float(const uint16_t *h) {
-		union {
-			uint32_t u32;
-			float f32;
-		} u;
-
-		u.u32 = halfbits_to_floatbits(*h);
-		return u.f32;
-	}
-
-	static _ALWAYS_INLINE_ float half_to_float(const uint16_t h) {
-		return halfptr_to_float(&h);
-	}
-
-	static _ALWAYS_INLINE_ uint16_t make_half_float(float f) {
-		union {
-			float fv;
-			uint32_t ui;
-		} ci;
-		ci.fv = f;
-
-		uint32_t x = ci.ui;
-		uint32_t sign = (unsigned short)(x >> 31);
-		uint32_t mantissa;
-		uint32_t exponent;
-		uint16_t hf;
-
-		// get mantissa
-		mantissa = x & ((1 << 23) - 1);
-		// get exponent bits
-		exponent = x & (0xFF << 23);
-		if (exponent >= 0x47800000) {
-			// check if the original single precision float number is a NaN
-			if (mantissa && (exponent == (0xFF << 23))) {
-				// we have a single precision NaN
-				mantissa = (1 << 23) - 1;
-			} else {
-				// 16-bit half-float representation stores number as Inf
-				mantissa = 0;
-			}
-			hf = (((uint16_t)sign) << 15) | (uint16_t)((0x1F << 10)) |
-					(uint16_t)(mantissa >> 13);
-		}
-		// check if exponent is <= -15
-		else if (exponent <= 0x38000000) {
-			/*
-			// store a denorm half-float value or zero
-			exponent = (0x38000000 - exponent) >> 23;
-			mantissa >>= (14 + exponent);
-
-			hf = (((uint16_t)sign) << 15) | (uint16_t)(mantissa);
-			*/
-			hf = 0; //denormals do not work for 3D, convert to zero
+	return abs(p_left - p_right) < tolerance;
+}
+
+_ALWAYS_INLINE_ bool is_zero_approx(double p_value) {
+	return abs(p_value) < CMP_EPSILON;
+}
+_ALWAYS_INLINE_ bool is_zero_approx(float p_value) {
+	return abs(p_value) < (float)CMP_EPSILON;
+}
+
+_ALWAYS_INLINE_ bool is_same(double p_left, double p_right) {
+	return (p_left == p_right) || (is_nan(p_left) && is_nan(p_right));
+}
+_ALWAYS_INLINE_ bool is_same(float p_left, float p_right) {
+	return (p_left == p_right) || (is_nan(p_left) && is_nan(p_right));
+}
+
+_ALWAYS_INLINE_ double smoothstep(double p_from, double p_to, double p_s) {
+	if (is_equal_approx(p_from, p_to)) {
+		if (likely(p_from <= p_to)) {
+			return p_s <= p_from ? 0.0 : 1.0;
 		} else {
-			hf = (((uint16_t)sign) << 15) |
-					(uint16_t)((exponent - 0x38000000) >> 13) |
-					(uint16_t)(mantissa >> 13);
+			return p_s <= p_to ? 1.0 : 0.0;
 		}
-
-		return hf;
 	}
-
-	static _ALWAYS_INLINE_ float snap_scalar(float p_offset, float p_step, float p_target) {
-		return p_step != 0 ? Math::snapped(p_target - p_offset, p_step) + p_offset : p_target;
+	double s = CLAMP((p_s - p_from) / (p_to - p_from), 0.0, 1.0);
+	return s * s * (3.0 - 2.0 * s);
+}
+_ALWAYS_INLINE_ float smoothstep(float p_from, float p_to, float p_s) {
+	if (is_equal_approx(p_from, p_to)) {
+		if (likely(p_from <= p_to)) {
+			return p_s <= p_from ? 0.0f : 1.0f;
+		} else {
+			return p_s <= p_to ? 1.0f : 0.0f;
+		}
 	}
+	float s = CLAMP((p_s - p_from) / (p_to - p_from), 0.0f, 1.0f);
+	return s * s * (3.0f - 2.0f * s);
+}
 
-	static _ALWAYS_INLINE_ float snap_scalar_separation(float p_offset, float p_step, float p_target, float p_separation) {
-		if (p_step != 0) {
-			float a = Math::snapped(p_target - p_offset, p_step + p_separation) + p_offset;
-			float b = a;
-			if (p_target >= 0) {
-				b -= p_separation;
-			} else {
-				b += p_step;
+_ALWAYS_INLINE_ double move_toward(double p_from, double p_to, double p_delta) {
+	return abs(p_to - p_from) <= p_delta ? p_to : p_from + SIGN(p_to - p_from) * p_delta;
+}
+_ALWAYS_INLINE_ float move_toward(float p_from, float p_to, float p_delta) {
+	return abs(p_to - p_from) <= p_delta ? p_to : p_from + SIGN(p_to - p_from) * p_delta;
+}
+
+_ALWAYS_INLINE_ double rotate_toward(double p_from, double p_to, double p_delta) {
+	double difference = angle_difference(p_from, p_to);
+	double abs_difference = abs(difference);
+	// When `p_delta < 0` move no further than to PI radians away from `p_to` (as PI is the max possible angle distance).
+	return p_from + CLAMP(p_delta, abs_difference - PI, abs_difference) * (difference >= 0.0 ? 1.0 : -1.0);
+}
+_ALWAYS_INLINE_ float rotate_toward(float p_from, float p_to, float p_delta) {
+	float difference = angle_difference(p_from, p_to);
+	float abs_difference = abs(difference);
+	// When `p_delta < 0` move no further than to PI radians away from `p_to` (as PI is the max possible angle distance).
+	return p_from + CLAMP(p_delta, abs_difference - (float)PI, abs_difference) * (difference >= 0.0f ? 1.0f : -1.0f);
+}
+
+_ALWAYS_INLINE_ double linear_to_db(double p_linear) {
+	return log(p_linear) * 8.6858896380650365530225783783321;
+}
+_ALWAYS_INLINE_ float linear_to_db(float p_linear) {
+	return log(p_linear) * (float)8.6858896380650365530225783783321;
+}
+
+_ALWAYS_INLINE_ double db_to_linear(double p_db) {
+	return exp(p_db * 0.11512925464970228420089957273422);
+}
+_ALWAYS_INLINE_ float db_to_linear(float p_db) {
+	return exp(p_db * (float)0.11512925464970228420089957273422);
+}
+
+_ALWAYS_INLINE_ double round(double p_val) {
+	return ::round(p_val);
+}
+_ALWAYS_INLINE_ float round(float p_val) {
+	return ::roundf(p_val);
+}
+
+_ALWAYS_INLINE_ double wrapf(double p_value, double p_min, double p_max) {
+	double range = p_max - p_min;
+	if (is_zero_approx(range)) {
+		return p_min;
+	}
+	double result = p_value - (range * floor((p_value - p_min) / range));
+	if (is_equal_approx(result, p_max)) {
+		return p_min;
+	}
+	return result;
+}
+_ALWAYS_INLINE_ float wrapf(float p_value, float p_min, float p_max) {
+	float range = p_max - p_min;
+	if (is_zero_approx(range)) {
+		return p_min;
+	}
+	float result = p_value - (range * floor((p_value - p_min) / range));
+	if (is_equal_approx(result, p_max)) {
+		return p_min;
+	}
+	return result;
+}
+
+_ALWAYS_INLINE_ int64_t wrapi(int64_t p_value, int64_t p_min, int64_t p_max) {
+	int64_t range = p_max - p_min;
+	return range == 0 ? p_min : p_min + ((((p_value - p_min) % range) + range) % range);
+}
+
+_ALWAYS_INLINE_ double fract(double p_value) {
+	return p_value - floor(p_value);
+}
+_ALWAYS_INLINE_ float fract(float p_value) {
+	return p_value - floor(p_value);
+}
+
+_ALWAYS_INLINE_ double pingpong(double p_value, double p_length) {
+	return (p_length != 0.0) ? abs(fract((p_value - p_length) / (p_length * 2.0)) * p_length * 2.0 - p_length) : 0.0;
+}
+_ALWAYS_INLINE_ float pingpong(float p_value, float p_length) {
+	return (p_length != 0.0f) ? abs(fract((p_value - p_length) / (p_length * 2.0f)) * p_length * 2.0f - p_length) : 0.0f;
+}
+
+// double only, as these functions are mainly used by the editor and not performance-critical,
+double ease(double p_x, double p_c);
+int step_decimals(double p_step);
+int range_step_decimals(double p_step); // For editor use only.
+double snapped(double p_value, double p_step);
+
+uint32_t larger_prime(uint32_t p_val);
+
+void seed(uint64_t p_seed);
+void randomize();
+uint32_t rand_from_seed(uint64_t *p_seed);
+uint32_t rand();
+_ALWAYS_INLINE_ double randd() {
+	return (double)rand() / (double)UINT32_MAX;
+}
+_ALWAYS_INLINE_ float randf() {
+	return (float)rand() / (float)UINT32_MAX;
+}
+double randfn(double p_mean, double p_deviation);
+
+double random(double p_from, double p_to);
+float random(float p_from, float p_to);
+int random(int p_from, int p_to);
+
+// This function should be as fast as possible and rounding mode should not matter.
+_ALWAYS_INLINE_ int fast_ftoi(float p_value) {
+	// Assuming every supported compiler has `lrint()`.
+	return lrintf(p_value);
+}
+
+_ALWAYS_INLINE_ uint32_t halfbits_to_floatbits(uint16_t p_half) {
+	uint16_t h_exp, h_sig;
+	uint32_t f_sgn, f_exp, f_sig;
+
+	h_exp = (p_half & 0x7c00u);
+	f_sgn = ((uint32_t)p_half & 0x8000u) << 16;
+	switch (h_exp) {
+		case 0x0000u: /* 0 or subnormal */
+			h_sig = (p_half & 0x03ffu);
+			/* Signed zero */
+			if (h_sig == 0) {
+				return f_sgn;
 			}
-			return (Math::abs(p_target - a) < Math::abs(p_target - b)) ? a : b;
-		}
-		return p_target;
+			/* Subnormal */
+			h_sig <<= 1;
+			while ((h_sig & 0x0400u) == 0) {
+				h_sig <<= 1;
+				h_exp++;
+			}
+			f_exp = ((uint32_t)(127 - 15 - h_exp)) << 23;
+			f_sig = ((uint32_t)(h_sig & 0x03ffu)) << 13;
+			return f_sgn + f_exp + f_sig;
+		case 0x7c00u: /* inf or NaN */
+			/* All-ones exponent and a copy of the significand */
+			return f_sgn + 0x7f800000u + (((uint32_t)(p_half & 0x03ffu)) << 13);
+		default: /* normalized */
+			/* Just need to adjust the exponent and shift */
+			return f_sgn + (((uint32_t)(p_half & 0x7fffu) + 0x1c000u) << 13);
 	}
-};
+}
 
-#endif // MATH_FUNCS_H
+_ALWAYS_INLINE_ float halfptr_to_float(const uint16_t *p_half) {
+	union {
+		uint32_t u32;
+		float f32;
+	} u;
+
+	u.u32 = halfbits_to_floatbits(*p_half);
+	return u.f32;
+}
+
+_ALWAYS_INLINE_ float half_to_float(const uint16_t p_half) {
+	return halfptr_to_float(&p_half);
+}
+
+_ALWAYS_INLINE_ uint16_t make_half_float(float p_value) {
+	union {
+		float fv;
+		uint32_t ui;
+	} ci;
+	ci.fv = p_value;
+
+	uint32_t x = ci.ui;
+	uint32_t sign = (unsigned short)(x >> 31);
+	uint32_t mantissa;
+	uint32_t exponent;
+	uint16_t hf;
+
+	// get mantissa
+	mantissa = x & ((1 << 23) - 1);
+	// get exponent bits
+	exponent = x & (0xFF << 23);
+	if (exponent >= 0x47800000) {
+		// check if the original single precision float number is a NaN
+		if (mantissa && (exponent == (0xFF << 23))) {
+			// we have a single precision NaN
+			mantissa = (1 << 23) - 1;
+		} else {
+			// 16-bit half-float representation stores number as Inf
+			mantissa = 0;
+		}
+		hf = (((uint16_t)sign) << 15) | (uint16_t)((0x1F << 10)) |
+				(uint16_t)(mantissa >> 13);
+	}
+	// check if exponent is <= -15
+	else if (exponent <= 0x38000000) {
+		/*
+		// store a denorm half-float value or zero
+		exponent = (0x38000000 - exponent) >> 23;
+		mantissa >>= (14 + exponent);
+
+		hf = (((uint16_t)sign) << 15) | (uint16_t)(mantissa);
+		*/
+		hf = 0; //denormals do not work for 3D, convert to zero
+	} else {
+		hf = (((uint16_t)sign) << 15) |
+				(uint16_t)((exponent - 0x38000000) >> 13) |
+				(uint16_t)(mantissa >> 13);
+	}
+
+	return hf;
+}
+
+_ALWAYS_INLINE_ float snap_scalar(float p_offset, float p_step, float p_target) {
+	return p_step != 0 ? snapped(p_target - p_offset, p_step) + p_offset : p_target;
+}
+
+_ALWAYS_INLINE_ float snap_scalar_separation(float p_offset, float p_step, float p_target, float p_separation) {
+	if (p_step != 0) {
+		float a = snapped(p_target - p_offset, p_step + p_separation) + p_offset;
+		float b = a;
+		if (p_target >= 0) {
+			b -= p_separation;
+		} else {
+			b += p_step;
+		}
+		return (abs(p_target - a) < abs(p_target - b)) ? a : b;
+	}
+	return p_target;
+}
+
+}; // namespace Math
diff --git a/engine/core/math/plane.cpp b/engine/core/math/plane.cpp
index 6b9bcea0..74783b2a 100644
--- a/engine/core/math/plane.cpp
+++ b/engine/core/math/plane.cpp
@@ -58,7 +58,7 @@ Vector3 Plane::get_any_perpendicular_normal() const {
 	static const Vector3 p2 = Vector3(0, 1, 0);
 	Vector3 p;
 
-	if (ABS(normal.dot(p1)) > 0.99f) { // if too similar to p1
+	if (Math::abs(normal.dot(p1)) > 0.99f) { // if too similar to p1
 		p = p2; // use p2
 	} else {
 		p = p1; // use p1
@@ -172,6 +172,10 @@ bool Plane::is_equal_approx(const Plane &p_plane) const {
 	return normal.is_equal_approx(p_plane.normal) && Math::is_equal_approx(d, p_plane.d);
 }
 
+bool Plane::is_same(const Plane &p_plane) const {
+	return normal.is_same(p_plane.normal) && Math::is_same(d, p_plane.d);
+}
+
 bool Plane::is_finite() const {
 	return normal.is_finite() && Math::is_finite(d);
 }
diff --git a/engine/core/math/plane.h b/engine/core/math/plane.h
index 65783ff4..77a53e57 100644
--- a/engine/core/math/plane.h
+++ b/engine/core/math/plane.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLANE_H
-#define PLANE_H
+#pragma once
 
 #include "core/math/vector3.h"
 
@@ -71,21 +70,22 @@ struct [[nodiscard]] Plane {
 
 	/* misc */
 
-	Plane operator-() const { return Plane(-normal, -d); }
+	constexpr Plane operator-() const { return Plane(-normal, -d); }
 	bool is_equal_approx(const Plane &p_plane) const;
+	bool is_same(const Plane &p_plane) const;
 	bool is_equal_approx_any_side(const Plane &p_plane) const;
 	bool is_finite() const;
 
-	_FORCE_INLINE_ bool operator==(const Plane &p_plane) const;
-	_FORCE_INLINE_ bool operator!=(const Plane &p_plane) const;
+	constexpr bool operator==(const Plane &p_plane) const;
+	constexpr bool operator!=(const Plane &p_plane) const;
 	operator String() const;
 
-	_FORCE_INLINE_ Plane() {}
-	_FORCE_INLINE_ Plane(real_t p_a, real_t p_b, real_t p_c, real_t p_d) :
+	Plane() = default;
+	constexpr Plane(real_t p_a, real_t p_b, real_t p_c, real_t p_d) :
 			normal(p_a, p_b, p_c),
 			d(p_d) {}
 
-	_FORCE_INLINE_ Plane(const Vector3 &p_normal, real_t p_d = 0.0);
+	constexpr Plane(const Vector3 &p_normal, real_t p_d = 0.0);
 	_FORCE_INLINE_ Plane(const Vector3 &p_normal, const Vector3 &p_point);
 	_FORCE_INLINE_ Plane(const Vector3 &p_point1, const Vector3 &p_point2, const Vector3 &p_point3, ClockDirection p_dir = CLOCKWISE);
 };
@@ -100,11 +100,11 @@ real_t Plane::distance_to(const Vector3 &p_point) const {
 
 bool Plane::has_point(const Vector3 &p_point, real_t p_tolerance) const {
 	real_t dist = normal.dot(p_point) - d;
-	dist = ABS(dist);
+	dist = Math::abs(dist);
 	return (dist <= p_tolerance);
 }
 
-Plane::Plane(const Vector3 &p_normal, real_t p_d) :
+constexpr Plane::Plane(const Vector3 &p_normal, real_t p_d) :
 		normal(p_normal),
 		d(p_d) {
 }
@@ -125,12 +125,13 @@ Plane::Plane(const Vector3 &p_point1, const Vector3 &p_point2, const Vector3 &p_
 	d = normal.dot(p_point1);
 }
 
-bool Plane::operator==(const Plane &p_plane) const {
+constexpr bool Plane::operator==(const Plane &p_plane) const {
 	return normal == p_plane.normal && d == p_plane.d;
 }
 
-bool Plane::operator!=(const Plane &p_plane) const {
+constexpr bool Plane::operator!=(const Plane &p_plane) const {
 	return normal != p_plane.normal || d != p_plane.d;
 }
 
-#endif // PLANE_H
+template <>
+struct is_zero_constructible<Plane> : std::true_type {};
diff --git a/engine/core/math/projection.cpp b/engine/core/math/projection.cpp
index 20638826..a71e44d9 100644
--- a/engine/core/math/projection.cpp
+++ b/engine/core/math/projection.cpp
@@ -402,82 +402,35 @@ void Projection::set_frustum(real_t p_size, real_t p_aspect, Vector2 p_offset, r
 }
 
 real_t Projection::get_z_far() const {
-	const real_t *matrix = (const real_t *)columns;
-	Plane new_plane = Plane(matrix[3] - matrix[2],
-			matrix[7] - matrix[6],
-			matrix[11] - matrix[10],
-			matrix[15] - matrix[14]);
-
-	new_plane.normalize();
-
-	return new_plane.d;
+	// NOTE: This assumes z-facing near and far planes, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - near and far planes are z-facing (i.e. columns[0][2] and [1][2] == 0)
+	return (columns[3][3] - columns[3][2]) / (columns[2][3] - columns[2][2]);
 }
 
 real_t Projection::get_z_near() const {
-	const real_t *matrix = (const real_t *)columns;
-	Plane new_plane = Plane(matrix[3] + matrix[2],
-			matrix[7] + matrix[6],
-			matrix[11] + matrix[10],
-			-matrix[15] - matrix[14]);
-
-	new_plane.normalize();
-	return new_plane.d;
+	// NOTE: This assumes z-facing near and far planes, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - near and far planes are z-facing (i.e. columns[0][2] and [1][2] == 0)
+	return (columns[3][3] + columns[3][2]) / (columns[2][3] + columns[2][2]);
 }
 
 Vector2 Projection::get_viewport_half_extents() const {
-	const real_t *matrix = (const real_t *)columns;
-	///////--- Near Plane ---///////
-	Plane near_plane = Plane(matrix[3] + matrix[2],
-			matrix[7] + matrix[6],
-			matrix[11] + matrix[10],
-			-matrix[15] - matrix[14]);
-	near_plane.normalize();
-
-	///////--- Right Plane ---///////
-	Plane right_plane = Plane(matrix[3] - matrix[0],
-			matrix[7] - matrix[4],
-			matrix[11] - matrix[8],
-			-matrix[15] + matrix[12]);
-	right_plane.normalize();
-
-	Plane top_plane = Plane(matrix[3] - matrix[1],
-			matrix[7] - matrix[5],
-			matrix[11] - matrix[9],
-			-matrix[15] + matrix[13]);
-	top_plane.normalize();
-
-	Vector3 res;
-	near_plane.intersect_3(right_plane, top_plane, &res);
-
-	return Vector2(res.x, res.y);
+	// NOTE: This assumes a symmetrical frustum, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - the projection plane is rectangular (i.e. columns[0][2] and [1][2] == 0 if columns[2][3] != 0)
+	// - there is no offset / skew (i.e. columns[2][0] == columns[2][1] == 0)
+	real_t w = -get_z_near() * columns[2][3] + columns[3][3];
+	return Vector2(w / columns[0][0], w / columns[1][1]);
 }
 
 Vector2 Projection::get_far_plane_half_extents() const {
-	const real_t *matrix = (const real_t *)columns;
-	///////--- Far Plane ---///////
-	Plane far_plane = Plane(matrix[3] - matrix[2],
-			matrix[7] - matrix[6],
-			matrix[11] - matrix[10],
-			-matrix[15] + matrix[14]);
-	far_plane.normalize();
-
-	///////--- Right Plane ---///////
-	Plane right_plane = Plane(matrix[3] - matrix[0],
-			matrix[7] - matrix[4],
-			matrix[11] - matrix[8],
-			-matrix[15] + matrix[12]);
-	right_plane.normalize();
-
-	Plane top_plane = Plane(matrix[3] - matrix[1],
-			matrix[7] - matrix[5],
-			matrix[11] - matrix[9],
-			-matrix[15] + matrix[13]);
-	top_plane.normalize();
-
-	Vector3 res;
-	far_plane.intersect_3(right_plane, top_plane, &res);
-
-	return Vector2(res.x, res.y);
+	// NOTE: This assumes a symmetrical frustum, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - the projection plane is rectangular (i.e. columns[0][2] and [1][2] == 0 if columns[2][3] != 0)
+	// - there is no offset / skew (i.e. columns[2][0] == columns[2][1] == 0)
+	real_t w = -get_z_far() * columns[2][3] + columns[3][3];
+	return Vector2(w / columns[0][0], w / columns[1][1]);
 }
 
 bool Projection::get_endpoints(const Transform3D &p_transform, Vector3 *p_8points) const {
@@ -827,24 +780,8 @@ void Projection::flip_y() {
 	}
 }
 
-Projection::Projection() {
-	set_identity();
-}
-
-Projection Projection::operator*(const Projection &p_matrix) const {
-	Projection new_matrix;
-
-	for (int j = 0; j < 4; j++) {
-		for (int i = 0; i < 4; i++) {
-			real_t ab = 0;
-			for (int k = 0; k < 4; k++) {
-				ab += columns[k][i] * p_matrix.columns[j][k];
-			}
-			new_matrix.columns[j][i] = ab;
-		}
-	}
-
-	return new_matrix;
+bool Projection::is_same(const Projection &p_cam) const {
+	return columns[0].is_same(p_cam.columns[0]) && columns[1].is_same(p_cam.columns[1]) && columns[2].is_same(p_cam.columns[2]) && columns[3].is_same(p_cam.columns[3]);
 }
 
 void Projection::set_depth_correction(bool p_flip_y, bool p_reverse_z, bool p_remap_z) {
@@ -919,53 +856,45 @@ Projection::operator String() const {
 }
 
 real_t Projection::get_aspect() const {
-	Vector2 vp_he = get_viewport_half_extents();
-	return vp_he.x / vp_he.y;
+	// NOTE: This assumes a rectangular projection plane, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - the projection plane is rectangular (i.e. columns[0][2] and [1][2] == 0 if columns[2][3] != 0)
+	return columns[1][1] / columns[0][0];
 }
 
 int Projection::get_pixels_per_meter(int p_for_pixel_width) const {
-	Vector3 result = xform(Vector3(1, 0, -1));
-
-	return int((result.x * 0.5 + 0.5) * p_for_pixel_width);
+	// NOTE: This assumes a rectangular projection plane, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - the projection plane is rectangular (i.e. columns[0][2] and [1][2] == 0 if columns[2][3] != 0)
+	real_t width = 2 * (-get_z_near() * columns[2][3] + columns[3][3]) / columns[0][0];
+	return p_for_pixel_width / width; // Note : return type should be real_t (kept as int for compatibility for now).
 }
 
 bool Projection::is_orthogonal() const {
-	return columns[3][3] == 1.0;
+	// NOTE: This assumes that the matrix is a projection across z-axis
+	// i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0
+	return columns[2][3] == 0.0;
 }
 
 real_t Projection::get_fov() const {
-	const real_t *matrix = (const real_t *)columns;
-
-	Plane right_plane = Plane(matrix[3] - matrix[0],
-			matrix[7] - matrix[4],
-			matrix[11] - matrix[8],
-			-matrix[15] + matrix[12]);
-	right_plane.normalize();
-
-	if ((matrix[8] == 0) && (matrix[9] == 0)) {
-		return Math::rad_to_deg(Math::acos(Math::abs(right_plane.normal.x))) * 2.0;
+	// NOTE: This assumes a rectangular projection plane, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - the projection plane is rectangular (i.e. columns[0][2] and [1][2] == 0 if columns[2][3] != 0)
+	if (columns[2][0] == 0) {
+		return Math::rad_to_deg(2 * Math::atan2(1, columns[0][0]));
 	} else {
-		// our frustum is asymmetrical need to calculate the left planes angle separately..
-		Plane left_plane = Plane(matrix[3] + matrix[0],
-				matrix[7] + matrix[4],
-				matrix[11] + matrix[8],
-				matrix[15] + matrix[12]);
-		left_plane.normalize();
-
-		return Math::rad_to_deg(Math::acos(Math::abs(left_plane.normal.x))) + Math::rad_to_deg(Math::acos(Math::abs(right_plane.normal.x)));
+		// The frustum is asymmetrical so we need to calculate the left and right angles separately.
+		real_t right = Math::atan2(columns[2][0] + 1, columns[0][0]);
+		real_t left = Math::atan2(columns[2][0] - 1, columns[0][0]);
+		return Math::rad_to_deg(right - left);
 	}
 }
 
 real_t Projection::get_lod_multiplier() const {
-	if (is_orthogonal()) {
-		return get_viewport_half_extents().x;
-	} else {
-		const real_t zn = get_z_near();
-		const real_t width = get_viewport_half_extents().x * 2.0f;
-		return 1.0f / (zn / width);
-	}
-
-	// Usage is lod_size / (lod_distance * multiplier) < threshold
+	// NOTE: This assumes a rectangular projection plane, i.e. that :
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - the projection plane is rectangular (i.e. columns[0][2] and [1][2] == 0 if columns[2][3] != 0)
+	return 2 / columns[0][0];
 }
 
 void Projection::make_scale(const Vector3 &p_scale) {
@@ -1028,13 +957,6 @@ Projection::operator Transform3D() const {
 	return tr;
 }
 
-Projection::Projection(const Vector4 &p_x, const Vector4 &p_y, const Vector4 &p_z, const Vector4 &p_w) {
-	columns[0] = p_x;
-	columns[1] = p_y;
-	columns[2] = p_z;
-	columns[3] = p_w;
-}
-
 Projection::Projection(const Transform3D &p_transform) {
 	const Transform3D &tr = p_transform;
 	real_t *m = &columns[0][0];
@@ -1056,6 +978,3 @@ Projection::Projection(const Transform3D &p_transform) {
 	m[14] = tr.origin.z;
 	m[15] = 1.0;
 }
-
-Projection::~Projection() {
-}
diff --git a/engine/core/math/projection.h b/engine/core/math/projection.h
index 5af43561..6d5f585c 100644
--- a/engine/core/math/projection.h
+++ b/engine/core/math/projection.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECTION_H
-#define PROJECTION_H
+#pragma once
 
 #include "core/math/vector3.h"
 #include "core/math/vector4.h"
@@ -53,14 +52,19 @@ struct [[nodiscard]] Projection {
 		PLANE_BOTTOM
 	};
 
-	Vector4 columns[4];
+	Vector4 columns[4] = {
+		{ 1, 0, 0, 0 },
+		{ 0, 1, 0, 0 },
+		{ 0, 0, 1, 0 },
+		{ 0, 0, 0, 1 },
+	};
 
-	_FORCE_INLINE_ const Vector4 &operator[](int p_axis) const {
+	constexpr const Vector4 &operator[](int p_axis) const {
 		DEV_ASSERT((unsigned int)p_axis < 4);
 		return columns[p_axis];
 	}
 
-	_FORCE_INLINE_ Vector4 &operator[](int p_axis) {
+	constexpr Vector4 &operator[](int p_axis) {
 		DEV_ASSERT((unsigned int)p_axis < 4);
 		return columns[p_axis];
 	}
@@ -115,7 +119,7 @@ struct [[nodiscard]] Projection {
 	void invert();
 	Projection inverse() const;
 
-	Projection operator*(const Projection &p_matrix) const;
+	constexpr Projection operator*(const Projection &p_matrix) const;
 
 	Plane xform4(const Plane &p_vec4) const;
 	_FORCE_INLINE_ Vector3 xform(const Vector3 &p_vec3) const;
@@ -133,7 +137,9 @@ struct [[nodiscard]] Projection {
 
 	void flip_y();
 
-	bool operator==(const Projection &p_cam) const {
+	bool is_same(const Projection &p_cam) const;
+
+	constexpr bool operator==(const Projection &p_cam) const {
 		for (uint32_t i = 0; i < 4; i++) {
 			for (uint32_t j = 0; j < 4; j++) {
 				if (columns[i][j] != p_cam.columns[i][j]) {
@@ -144,18 +150,41 @@ struct [[nodiscard]] Projection {
 		return true;
 	}
 
-	bool operator!=(const Projection &p_cam) const {
+	constexpr bool operator!=(const Projection &p_cam) const {
 		return !(*this == p_cam);
 	}
 
 	real_t get_lod_multiplier() const;
 
-	Projection();
-	Projection(const Vector4 &p_x, const Vector4 &p_y, const Vector4 &p_z, const Vector4 &p_w);
+	Projection() = default;
+	constexpr Projection(const Vector4 &p_x, const Vector4 &p_y, const Vector4 &p_z, const Vector4 &p_w) :
+			columns{ p_x, p_y, p_z, p_w } {}
+	constexpr Projection(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_xw, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_yw, real_t p_zx, real_t p_zy, real_t p_zz, real_t p_zw, real_t p_wx, real_t p_wy, real_t p_wz, real_t p_ww) :
+			columns{
+				{ p_xx, p_xy, p_xz, p_xw },
+				{ p_yx, p_yy, p_yz, p_yw },
+				{ p_zx, p_zy, p_zz, p_zw },
+				{ p_wx, p_wy, p_wz, p_ww },
+			} {}
 	Projection(const Transform3D &p_transform);
-	~Projection();
 };
 
+constexpr Projection Projection::operator*(const Projection &p_matrix) const {
+	Projection new_matrix;
+
+	for (int j = 0; j < 4; j++) {
+		for (int i = 0; i < 4; i++) {
+			real_t ab = 0;
+			for (int k = 0; k < 4; k++) {
+				ab += columns[k][i] * p_matrix.columns[j][k];
+			}
+			new_matrix.columns[j][i] = ab;
+		}
+	}
+
+	return new_matrix;
+}
+
 Vector3 Projection::xform(const Vector3 &p_vec3) const {
 	Vector3 ret;
 	ret.x = columns[0][0] * p_vec3.x + columns[1][0] * p_vec3.y + columns[2][0] * p_vec3.z + columns[3][0];
@@ -164,5 +193,3 @@ Vector3 Projection::xform(const Vector3 &p_vec3) const {
 	real_t w = columns[0][3] * p_vec3.x + columns[1][3] * p_vec3.y + columns[2][3] * p_vec3.z + columns[3][3];
 	return ret / w;
 }
-
-#endif // PROJECTION_H
diff --git a/engine/core/math/quaternion.cpp b/engine/core/math/quaternion.cpp
index 08eac14b..6c0b491a 100644
--- a/engine/core/math/quaternion.cpp
+++ b/engine/core/math/quaternion.cpp
@@ -46,26 +46,14 @@ Vector3 Quaternion::get_euler(EulerOrder p_order) const {
 	return Basis(*this).get_euler(p_order);
 }
 
-void Quaternion::operator*=(const Quaternion &p_q) {
-	real_t xx = w * p_q.x + x * p_q.w + y * p_q.z - z * p_q.y;
-	real_t yy = w * p_q.y + y * p_q.w + z * p_q.x - x * p_q.z;
-	real_t zz = w * p_q.z + z * p_q.w + x * p_q.y - y * p_q.x;
-	w = w * p_q.w - x * p_q.x - y * p_q.y - z * p_q.z;
-	x = xx;
-	y = yy;
-	z = zz;
-}
-
-Quaternion Quaternion::operator*(const Quaternion &p_q) const {
-	Quaternion r = *this;
-	r *= p_q;
-	return r;
-}
-
 bool Quaternion::is_equal_approx(const Quaternion &p_quaternion) const {
 	return Math::is_equal_approx(x, p_quaternion.x) && Math::is_equal_approx(y, p_quaternion.y) && Math::is_equal_approx(z, p_quaternion.z) && Math::is_equal_approx(w, p_quaternion.w);
 }
 
+bool Quaternion::is_same(const Quaternion &p_quaternion) const {
+	return Math::is_same(x, p_quaternion.x) && Math::is_same(y, p_quaternion.y) && Math::is_same(z, p_quaternion.z) && Math::is_same(w, p_quaternion.w);
+}
+
 bool Quaternion::is_finite() const {
 	return Math::is_finite(x) && Math::is_finite(y) && Math::is_finite(z) && Math::is_finite(w);
 }
diff --git a/engine/core/math/quaternion.h b/engine/core/math/quaternion.h
index 58a4ec5b..6dae7a79 100644
--- a/engine/core/math/quaternion.h
+++ b/engine/core/math/quaternion.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef QUATERNION_H
-#define QUATERNION_H
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "core/math/vector3.h"
@@ -37,6 +36,7 @@
 
 struct [[nodiscard]] Quaternion {
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
 			real_t x;
 			real_t y;
@@ -44,6 +44,7 @@ struct [[nodiscard]] Quaternion {
 			real_t w;
 		};
 		real_t components[4] = { 0, 0, 0, 1.0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_FORCE_INLINE_ real_t &operator[](int p_idx) {
@@ -54,6 +55,7 @@ struct [[nodiscard]] Quaternion {
 	}
 	_FORCE_INLINE_ real_t length_squared() const;
 	bool is_equal_approx(const Quaternion &p_quaternion) const;
+	bool is_same(const Quaternion &p_quaternion) const;
 	bool is_finite() const;
 	real_t length() const;
 	void normalize();
@@ -84,8 +86,8 @@ struct [[nodiscard]] Quaternion {
 		r_axis.z = z * r;
 	}
 
-	void operator*=(const Quaternion &p_q);
-	Quaternion operator*(const Quaternion &p_q) const;
+	constexpr void operator*=(const Quaternion &p_q);
+	constexpr Quaternion operator*(const Quaternion &p_q) const;
 
 	_FORCE_INLINE_ Vector3 xform(const Vector3 &p_v) const {
 #ifdef MATH_CHECKS
@@ -100,40 +102,33 @@ struct [[nodiscard]] Quaternion {
 		return inverse().xform(p_v);
 	}
 
-	_FORCE_INLINE_ void operator+=(const Quaternion &p_q);
-	_FORCE_INLINE_ void operator-=(const Quaternion &p_q);
-	_FORCE_INLINE_ void operator*=(real_t p_s);
-	_FORCE_INLINE_ void operator/=(real_t p_s);
-	_FORCE_INLINE_ Quaternion operator+(const Quaternion &p_q2) const;
-	_FORCE_INLINE_ Quaternion operator-(const Quaternion &p_q2) const;
-	_FORCE_INLINE_ Quaternion operator-() const;
-	_FORCE_INLINE_ Quaternion operator*(real_t p_s) const;
-	_FORCE_INLINE_ Quaternion operator/(real_t p_s) const;
+	constexpr void operator+=(const Quaternion &p_q);
+	constexpr void operator-=(const Quaternion &p_q);
+	constexpr void operator*=(real_t p_s);
+	constexpr void operator/=(real_t p_s);
+	constexpr Quaternion operator+(const Quaternion &p_q2) const;
+	constexpr Quaternion operator-(const Quaternion &p_q2) const;
+	constexpr Quaternion operator-() const;
+	constexpr Quaternion operator*(real_t p_s) const;
+	constexpr Quaternion operator/(real_t p_s) const;
 
-	_FORCE_INLINE_ bool operator==(const Quaternion &p_quaternion) const;
-	_FORCE_INLINE_ bool operator!=(const Quaternion &p_quaternion) const;
+	constexpr bool operator==(const Quaternion &p_quaternion) const;
+	constexpr bool operator!=(const Quaternion &p_quaternion) const;
 
 	operator String() const;
 
-	_FORCE_INLINE_ Quaternion() {}
+	constexpr Quaternion() :
+			x(0), y(0), z(0), w(1) {}
 
-	_FORCE_INLINE_ Quaternion(real_t p_x, real_t p_y, real_t p_z, real_t p_w) :
-			x(p_x),
-			y(p_y),
-			z(p_z),
-			w(p_w) {
-	}
+	constexpr Quaternion(real_t p_x, real_t p_y, real_t p_z, real_t p_w) :
+			x(p_x), y(p_y), z(p_z), w(p_w) {}
 
 	Quaternion(const Vector3 &p_axis, real_t p_angle);
 
-	Quaternion(const Quaternion &p_q) :
-			x(p_q.x),
-			y(p_q.y),
-			z(p_q.z),
-			w(p_q.w) {
-	}
+	constexpr Quaternion(const Quaternion &p_q) :
+			x(p_q.x), y(p_q.y), z(p_q.z), w(p_q.w) {}
 
-	void operator=(const Quaternion &p_q) {
+	constexpr void operator=(const Quaternion &p_q) {
 		x = p_q.x;
 		y = p_q.y;
 		z = p_q.z;
@@ -178,64 +173,78 @@ real_t Quaternion::length_squared() const {
 	return dot(*this);
 }
 
-void Quaternion::operator+=(const Quaternion &p_q) {
+constexpr void Quaternion::operator+=(const Quaternion &p_q) {
 	x += p_q.x;
 	y += p_q.y;
 	z += p_q.z;
 	w += p_q.w;
 }
 
-void Quaternion::operator-=(const Quaternion &p_q) {
+constexpr void Quaternion::operator-=(const Quaternion &p_q) {
 	x -= p_q.x;
 	y -= p_q.y;
 	z -= p_q.z;
 	w -= p_q.w;
 }
 
-void Quaternion::operator*=(real_t p_s) {
+constexpr void Quaternion::operator*=(real_t p_s) {
 	x *= p_s;
 	y *= p_s;
 	z *= p_s;
 	w *= p_s;
 }
 
-void Quaternion::operator/=(real_t p_s) {
-	*this *= 1.0f / p_s;
+constexpr void Quaternion::operator/=(real_t p_s) {
+	*this *= (1 / p_s);
 }
 
-Quaternion Quaternion::operator+(const Quaternion &p_q2) const {
+constexpr Quaternion Quaternion::operator+(const Quaternion &p_q2) const {
 	const Quaternion &q1 = *this;
 	return Quaternion(q1.x + p_q2.x, q1.y + p_q2.y, q1.z + p_q2.z, q1.w + p_q2.w);
 }
 
-Quaternion Quaternion::operator-(const Quaternion &p_q2) const {
+constexpr Quaternion Quaternion::operator-(const Quaternion &p_q2) const {
 	const Quaternion &q1 = *this;
 	return Quaternion(q1.x - p_q2.x, q1.y - p_q2.y, q1.z - p_q2.z, q1.w - p_q2.w);
 }
 
-Quaternion Quaternion::operator-() const {
+constexpr Quaternion Quaternion::operator-() const {
 	const Quaternion &q2 = *this;
 	return Quaternion(-q2.x, -q2.y, -q2.z, -q2.w);
 }
 
-Quaternion Quaternion::operator*(real_t p_s) const {
+constexpr Quaternion Quaternion::operator*(real_t p_s) const {
 	return Quaternion(x * p_s, y * p_s, z * p_s, w * p_s);
 }
 
-Quaternion Quaternion::operator/(real_t p_s) const {
-	return *this * (1.0f / p_s);
+constexpr Quaternion Quaternion::operator/(real_t p_s) const {
+	return *this * (1 / p_s);
 }
 
-bool Quaternion::operator==(const Quaternion &p_quaternion) const {
+constexpr bool Quaternion::operator==(const Quaternion &p_quaternion) const {
 	return x == p_quaternion.x && y == p_quaternion.y && z == p_quaternion.z && w == p_quaternion.w;
 }
 
-bool Quaternion::operator!=(const Quaternion &p_quaternion) const {
+constexpr bool Quaternion::operator!=(const Quaternion &p_quaternion) const {
 	return x != p_quaternion.x || y != p_quaternion.y || z != p_quaternion.z || w != p_quaternion.w;
 }
 
-_FORCE_INLINE_ Quaternion operator*(real_t p_real, const Quaternion &p_quaternion) {
-	return p_quaternion * p_real;
+constexpr void Quaternion::operator*=(const Quaternion &p_q) {
+	real_t xx = w * p_q.x + x * p_q.w + y * p_q.z - z * p_q.y;
+	real_t yy = w * p_q.y + y * p_q.w + z * p_q.x - x * p_q.z;
+	real_t zz = w * p_q.z + z * p_q.w + x * p_q.y - y * p_q.x;
+	w = w * p_q.w - x * p_q.x - y * p_q.y - z * p_q.z;
+	x = xx;
+	y = yy;
+	z = zz;
 }
 
-#endif // QUATERNION_H
+constexpr Quaternion Quaternion::operator*(const Quaternion &p_q) const {
+	Quaternion r = *this;
+	r *= p_q;
+	return r;
+}
+
+constexpr Quaternion operator*(real_t p_real, const Quaternion &p_quaternion) {
+	return p_quaternion * p_real;
+}
diff --git a/engine/core/math/quick_hull.cpp b/engine/core/math/quick_hull.cpp
index 34a0c021..360b272e 100644
--- a/engine/core/math/quick_hull.cpp
+++ b/engine/core/math/quick_hull.cpp
@@ -30,6 +30,9 @@
 
 #include "quick_hull.h"
 
+#include "core/templates/hash_map.h"
+#include "core/templates/hash_set.h"
+
 uint32_t QuickHull::debug_stop_after = 0xFFFFFFFF;
 
 Error QuickHull::build(const Vector<Vector3> &p_points, Geometry3D::MeshData &r_mesh) {
@@ -320,7 +323,7 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry3D::MeshData &r_
 
 		for (List<Face>::Element *&E : new_faces) {
 			Face &f2 = E->get();
-			if (f2.points_over.size() == 0) {
+			if (f2.points_over.is_empty()) {
 				faces.move_to_front(E);
 			}
 		}
diff --git a/engine/core/math/quick_hull.h b/engine/core/math/quick_hull.h
index f4891a7c..e374211d 100644
--- a/engine/core/math/quick_hull.h
+++ b/engine/core/math/quick_hull.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef QUICK_HULL_H
-#define QUICK_HULL_H
+#pragma once
 
 #include "core/math/geometry_3d.h"
 #include "core/templates/list.h"
@@ -89,5 +88,3 @@ public:
 	static uint32_t debug_stop_after;
 	static Error build(const Vector<Vector3> &p_points, Geometry3D::MeshData &r_mesh);
 };
-
-#endif // QUICK_HULL_H
diff --git a/engine/core/math/random_number_generator.h b/engine/core/math/random_number_generator.h
index 7ec4cdff..aa21b41a 100644
--- a/engine/core/math/random_number_generator.h
+++ b/engine/core/math/random_number_generator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RANDOM_NUMBER_GENERATOR_H
-#define RANDOM_NUMBER_GENERATOR_H
+#pragma once
 
 #include "core/math/random_pcg.h"
 #include "core/object/ref_counted.h"
@@ -61,5 +60,3 @@ public:
 
 	RandomNumberGenerator() { randbase.randomize(); }
 };
-
-#endif // RANDOM_NUMBER_GENERATOR_H
diff --git a/engine/core/math/random_pcg.h b/engine/core/math/random_pcg.h
index 6bad7005..f39cd7ab 100644
--- a/engine/core/math/random_pcg.h
+++ b/engine/core/math/random_pcg.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RANDOM_PCG_H
-#define RANDOM_PCG_H
+#pragma once
 
 #include "core/math/math_defs.h"
 
@@ -135,19 +134,17 @@ public:
 		if (temp < CMP_EPSILON) {
 			temp += CMP_EPSILON; // To prevent generating of INF value in log function, resulting to return NaN value from this function.
 		}
-		return p_mean + p_deviation * (cos(Math_TAU * randd()) * sqrt(-2.0 * log(temp))); // Box-Muller transform.
+		return p_mean + p_deviation * (cos(Math::TAU * randd()) * sqrt(-2.0 * log(temp))); // Box-Muller transform.
 	}
 	_FORCE_INLINE_ float randfn(float p_mean, float p_deviation) {
 		float temp = randf();
 		if (temp < CMP_EPSILON) {
 			temp += CMP_EPSILON; // To prevent generating of INF value in log function, resulting to return NaN value from this function.
 		}
-		return p_mean + p_deviation * (cos((float)Math_TAU * randf()) * sqrt(-2.0 * log(temp))); // Box-Muller transform.
+		return p_mean + p_deviation * (cos((float)Math::TAU * randf()) * sqrt(-2.0 * log(temp))); // Box-Muller transform.
 	}
 
 	double random(double p_from, double p_to);
 	float random(float p_from, float p_to);
 	int random(int p_from, int p_to);
 };
-
-#endif // RANDOM_PCG_H
diff --git a/engine/core/math/rect2.cpp b/engine/core/math/rect2.cpp
index 7f77b078..102a9e4b 100644
--- a/engine/core/math/rect2.cpp
+++ b/engine/core/math/rect2.cpp
@@ -38,6 +38,10 @@ bool Rect2::is_equal_approx(const Rect2 &p_rect) const {
 	return position.is_equal_approx(p_rect.position) && size.is_equal_approx(p_rect.size);
 }
 
+bool Rect2::is_same(const Rect2 &p_rect) const {
+	return position.is_same(p_rect.position) && size.is_same(p_rect.size);
+}
+
 bool Rect2::is_finite() const {
 	return position.is_finite() && size.is_finite();
 }
diff --git a/engine/core/math/rect2.h b/engine/core/math/rect2.h
index 817923c1..27a701e9 100644
--- a/engine/core/math/rect2.h
+++ b/engine/core/math/rect2.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RECT2_H
-#define RECT2_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/vector2.h"
@@ -203,10 +202,11 @@ struct [[nodiscard]] Rect2 {
 	}
 
 	bool is_equal_approx(const Rect2 &p_rect) const;
+	bool is_same(const Rect2 &p_rect) const;
 	bool is_finite() const;
 
-	bool operator==(const Rect2 &p_rect) const { return position == p_rect.position && size == p_rect.size; }
-	bool operator!=(const Rect2 &p_rect) const { return position != p_rect.position || size != p_rect.size; }
+	constexpr bool operator==(const Rect2 &p_rect) const { return position == p_rect.position && size == p_rect.size; }
+	constexpr bool operator!=(const Rect2 &p_rect) const { return position != p_rect.position || size != p_rect.size; }
 
 	inline Rect2 grow(real_t p_amount) const {
 		Rect2 g = *this;
@@ -361,15 +361,16 @@ struct [[nodiscard]] Rect2 {
 	operator String() const;
 	operator Rect2i() const;
 
-	Rect2() {}
-	Rect2(real_t p_x, real_t p_y, real_t p_width, real_t p_height) :
+	Rect2() = default;
+	constexpr Rect2(real_t p_x, real_t p_y, real_t p_width, real_t p_height) :
 			position(Point2(p_x, p_y)),
 			size(Size2(p_width, p_height)) {
 	}
-	Rect2(const Point2 &p_pos, const Size2 &p_size) :
+	constexpr Rect2(const Point2 &p_pos, const Size2 &p_size) :
 			position(p_pos),
 			size(p_size) {
 	}
 };
 
-#endif // RECT2_H
+template <>
+struct is_zero_constructible<Rect2> : std::true_type {};
diff --git a/engine/core/math/rect2i.h b/engine/core/math/rect2i.h
index 5f3a3d54..d0b8b5e7 100644
--- a/engine/core/math/rect2i.h
+++ b/engine/core/math/rect2i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RECT2I_H
-#define RECT2I_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/vector2i.h"
@@ -144,8 +143,8 @@ struct [[nodiscard]] Rect2i {
 		return true;
 	}
 
-	bool operator==(const Rect2i &p_rect) const { return position == p_rect.position && size == p_rect.size; }
-	bool operator!=(const Rect2i &p_rect) const { return position != p_rect.position || size != p_rect.size; }
+	constexpr bool operator==(const Rect2i &p_rect) const { return position == p_rect.position && size == p_rect.size; }
+	constexpr bool operator!=(const Rect2i &p_rect) const { return position != p_rect.position || size != p_rect.size; }
 
 	Rect2i grow(int p_amount) const {
 		Rect2i g = *this;
@@ -227,15 +226,16 @@ struct [[nodiscard]] Rect2i {
 	operator String() const;
 	operator Rect2() const;
 
-	Rect2i() {}
-	Rect2i(int p_x, int p_y, int p_width, int p_height) :
+	Rect2i() = default;
+	constexpr Rect2i(int p_x, int p_y, int p_width, int p_height) :
 			position(Point2i(p_x, p_y)),
 			size(Size2i(p_width, p_height)) {
 	}
-	Rect2i(const Point2i &p_pos, const Size2i &p_size) :
+	constexpr Rect2i(const Point2i &p_pos, const Size2i &p_size) :
 			position(p_pos),
 			size(p_size) {
 	}
 };
 
-#endif // RECT2I_H
+template <>
+struct is_zero_constructible<Rect2i> : std::true_type {};
diff --git a/engine/core/math/static_raycaster.h b/engine/core/math/static_raycaster.h
index 74e4b751..fbb5194c 100644
--- a/engine/core/math/static_raycaster.h
+++ b/engine/core/math/static_raycaster.h
@@ -28,21 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STATIC_RAYCASTER_H
-#define STATIC_RAYCASTER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
-#if !defined(__aligned)
-
-#if defined(_WIN32) && defined(_MSC_VER)
-#define __aligned(...) __declspec(align(__VA_ARGS__))
-#else
-#define __aligned(...) __attribute__((aligned(__VA_ARGS__)))
-#endif
-
-#endif
-
 class StaticRaycaster : public RefCounted {
 	GDCLASS(StaticRaycaster, RefCounted)
 protected:
@@ -50,7 +39,7 @@ protected:
 
 public:
 	// Compatible with embree4 rays.
-	struct __aligned(16) Ray {
+	struct alignas(16) Ray {
 		const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h
 
 		/*! Default construction does nothing. */
@@ -62,7 +51,7 @@ public:
 		_FORCE_INLINE_ Ray(const Vector3 &p_org,
 				const Vector3 &p_dir,
 				float p_tnear = 0.0f,
-				float p_tfar = INFINITY) :
+				float p_tfar = Math::INF) :
 				org(p_org),
 				tnear(p_tnear),
 				dir(p_dir),
@@ -107,5 +96,3 @@ public:
 
 	static Ref<StaticRaycaster> create();
 };
-
-#endif // STATIC_RAYCASTER_H
diff --git a/engine/core/math/transform_2d.cpp b/engine/core/math/transform_2d.cpp
index f6525fe5..b5a971e7 100644
--- a/engine/core/math/transform_2d.cpp
+++ b/engine/core/math/transform_2d.cpp
@@ -71,12 +71,12 @@ void Transform2D::rotate(real_t p_angle) {
 
 real_t Transform2D::get_skew() const {
 	real_t det = determinant();
-	return Math::acos(columns[0].normalized().dot(SIGN(det) * columns[1].normalized())) - (real_t)Math_PI * 0.5f;
+	return Math::acos(columns[0].normalized().dot(SIGN(det) * columns[1].normalized())) - (real_t)Math::PI * 0.5f;
 }
 
 void Transform2D::set_skew(real_t p_angle) {
 	real_t det = determinant();
-	columns[1] = SIGN(det) * columns[0].rotated(((real_t)Math_PI * 0.5f + p_angle)).normalized() * columns[1].length();
+	columns[1] = SIGN(det) * columns[0].rotated(((real_t)Math::PI * 0.5f + p_angle)).normalized() * columns[1].length();
 }
 
 real_t Transform2D::get_rotation() const {
@@ -180,6 +180,10 @@ bool Transform2D::is_equal_approx(const Transform2D &p_transform) const {
 	return columns[0].is_equal_approx(p_transform.columns[0]) && columns[1].is_equal_approx(p_transform.columns[1]) && columns[2].is_equal_approx(p_transform.columns[2]);
 }
 
+bool Transform2D::is_same(const Transform2D &p_transform) const {
+	return columns[0].is_same(p_transform.columns[0]) && columns[1].is_same(p_transform.columns[1]) && columns[2].is_same(p_transform.columns[2]);
+}
+
 bool Transform2D::is_finite() const {
 	return columns[0].is_finite() && columns[1].is_finite() && columns[2].is_finite();
 }
@@ -191,26 +195,6 @@ Transform2D Transform2D::looking_at(const Vector2 &p_target) const {
 	return return_trans;
 }
 
-bool Transform2D::operator==(const Transform2D &p_transform) const {
-	for (int i = 0; i < 3; i++) {
-		if (columns[i] != p_transform.columns[i]) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool Transform2D::operator!=(const Transform2D &p_transform) const {
-	for (int i = 0; i < 3; i++) {
-		if (columns[i] != p_transform.columns[i]) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 void Transform2D::operator*=(const Transform2D &p_transform) {
 	columns[2] = xform(p_transform.columns[2]);
 
@@ -283,30 +267,6 @@ Transform2D Transform2D::interpolate_with(const Transform2D &p_transform, real_t
 			get_origin().lerp(p_transform.get_origin(), p_weight));
 }
 
-void Transform2D::operator*=(real_t p_val) {
-	columns[0] *= p_val;
-	columns[1] *= p_val;
-	columns[2] *= p_val;
-}
-
-Transform2D Transform2D::operator*(real_t p_val) const {
-	Transform2D ret(*this);
-	ret *= p_val;
-	return ret;
-}
-
-void Transform2D::operator/=(real_t p_val) {
-	columns[0] /= p_val;
-	columns[1] /= p_val;
-	columns[2] /= p_val;
-}
-
-Transform2D Transform2D::operator/(real_t p_val) const {
-	Transform2D ret(*this);
-	ret /= p_val;
-	return ret;
-}
-
 Transform2D::operator String() const {
 	return "[X: " + columns[0].operator String() +
 			", Y: " + columns[1].operator String() +
diff --git a/engine/core/math/transform_2d.h b/engine/core/math/transform_2d.h
index 1ee7d3d8..27eebe1a 100644
--- a/engine/core/math/transform_2d.h
+++ b/engine/core/math/transform_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSFORM_2D_H
-#define TRANSFORM_2D_H
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
@@ -53,13 +52,17 @@ struct [[nodiscard]] Transform2D {
 	// WARNING: Be aware that unlike 3D code, 2D code uses a left-handed coordinate system:
 	// Y-axis points down, and angle is measure from +X to +Y in a clockwise-fashion.
 
-	Vector2 columns[3];
+	Vector2 columns[3] = {
+		{ 1, 0 },
+		{ 0, 1 },
+		{ 0, 0 },
+	};
 
 	_FORCE_INLINE_ real_t tdotx(const Vector2 &p_v) const { return columns[0][0] * p_v.x + columns[1][0] * p_v.y; }
 	_FORCE_INLINE_ real_t tdoty(const Vector2 &p_v) const { return columns[0][1] * p_v.x + columns[1][1] * p_v.y; }
 
-	const Vector2 &operator[](int p_idx) const { return columns[p_idx]; }
-	Vector2 &operator[](int p_idx) { return columns[p_idx]; }
+	constexpr const Vector2 &operator[](int p_idx) const { return columns[p_idx]; }
+	constexpr Vector2 &operator[](int p_idx) { return columns[p_idx]; }
 
 	void invert();
 	Transform2D inverse() const;
@@ -101,19 +104,20 @@ struct [[nodiscard]] Transform2D {
 	Transform2D orthonormalized() const;
 	bool is_conformal() const;
 	bool is_equal_approx(const Transform2D &p_transform) const;
+	bool is_same(const Transform2D &p_transform) const;
 	bool is_finite() const;
 
 	Transform2D looking_at(const Vector2 &p_target) const;
 
-	bool operator==(const Transform2D &p_transform) const;
-	bool operator!=(const Transform2D &p_transform) const;
+	constexpr bool operator==(const Transform2D &p_transform) const;
+	constexpr bool operator!=(const Transform2D &p_transform) const;
 
 	void operator*=(const Transform2D &p_transform);
 	Transform2D operator*(const Transform2D &p_transform) const;
-	void operator*=(real_t p_val);
-	Transform2D operator*(real_t p_val) const;
-	void operator/=(real_t p_val);
-	Transform2D operator/(real_t p_val) const;
+	constexpr void operator*=(real_t p_val);
+	constexpr Transform2D operator*(real_t p_val) const;
+	constexpr void operator/=(real_t p_val);
+	constexpr Transform2D operator/(real_t p_val) const;
 
 	Transform2D interpolate_with(const Transform2D &p_transform, real_t p_c) const;
 
@@ -128,31 +132,67 @@ struct [[nodiscard]] Transform2D {
 
 	operator String() const;
 
-	Transform2D(real_t p_xx, real_t p_xy, real_t p_yx, real_t p_yy, real_t p_ox, real_t p_oy) {
-		columns[0][0] = p_xx;
-		columns[0][1] = p_xy;
-		columns[1][0] = p_yx;
-		columns[1][1] = p_yy;
-		columns[2][0] = p_ox;
-		columns[2][1] = p_oy;
-	}
+	constexpr Transform2D(real_t p_xx, real_t p_xy, real_t p_yx, real_t p_yy, real_t p_ox, real_t p_oy) :
+			columns{
+				{ p_xx, p_xy },
+				{ p_yx, p_yy },
+				{ p_ox, p_oy },
+			} {}
 
-	Transform2D(const Vector2 &p_x, const Vector2 &p_y, const Vector2 &p_origin) {
-		columns[0] = p_x;
-		columns[1] = p_y;
-		columns[2] = p_origin;
-	}
+	constexpr Transform2D(const Vector2 &p_x, const Vector2 &p_y, const Vector2 &p_origin) :
+			columns{ p_x, p_y, p_origin } {}
 
 	Transform2D(real_t p_rot, const Vector2 &p_pos);
 
 	Transform2D(real_t p_rot, const Size2 &p_scale, real_t p_skew, const Vector2 &p_pos);
 
-	Transform2D() {
-		columns[0][0] = 1.0;
-		columns[1][1] = 1.0;
-	}
+	Transform2D() = default;
 };
 
+constexpr bool Transform2D::operator==(const Transform2D &p_transform) const {
+	for (int i = 0; i < 3; i++) {
+		if (columns[i] != p_transform.columns[i]) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+constexpr bool Transform2D::operator!=(const Transform2D &p_transform) const {
+	for (int i = 0; i < 3; i++) {
+		if (columns[i] != p_transform.columns[i]) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+constexpr void Transform2D::operator*=(real_t p_val) {
+	columns[0] *= p_val;
+	columns[1] *= p_val;
+	columns[2] *= p_val;
+}
+
+constexpr Transform2D Transform2D::operator*(real_t p_val) const {
+	Transform2D ret(*this);
+	ret *= p_val;
+	return ret;
+}
+
+constexpr void Transform2D::operator/=(real_t p_val) {
+	columns[0] /= p_val;
+	columns[1] /= p_val;
+	columns[2] /= p_val;
+}
+
+constexpr Transform2D Transform2D::operator/(real_t p_val) const {
+	Transform2D ret(*this);
+	ret /= p_val;
+	return ret;
+}
+
 Vector2 Transform2D::basis_xform(const Vector2 &p_vec) const {
 	return Vector2(
 			tdotx(p_vec),
@@ -249,5 +289,3 @@ Vector<Vector2> Transform2D::xform_inv(const Vector<Vector2> &p_array) const {
 	}
 	return array;
 }
-
-#endif // TRANSFORM_2D_H
diff --git a/engine/core/math/transform_3d.cpp b/engine/core/math/transform_3d.cpp
index d4673851..b4d02408 100644
--- a/engine/core/math/transform_3d.cpp
+++ b/engine/core/math/transform_3d.cpp
@@ -173,18 +173,14 @@ bool Transform3D::is_equal_approx(const Transform3D &p_transform) const {
 	return basis.is_equal_approx(p_transform.basis) && origin.is_equal_approx(p_transform.origin);
 }
 
+bool Transform3D::is_same(const Transform3D &p_transform) const {
+	return basis.is_same(p_transform.basis) && origin.is_same(p_transform.origin);
+}
+
 bool Transform3D::is_finite() const {
 	return basis.is_finite() && origin.is_finite();
 }
 
-bool Transform3D::operator==(const Transform3D &p_transform) const {
-	return (basis == p_transform.basis && origin == p_transform.origin);
-}
-
-bool Transform3D::operator!=(const Transform3D &p_transform) const {
-	return (basis != p_transform.basis || origin != p_transform.origin);
-}
-
 void Transform3D::operator*=(const Transform3D &p_transform) {
 	origin = xform(p_transform.origin);
 	basis *= p_transform.basis;
@@ -196,48 +192,9 @@ Transform3D Transform3D::operator*(const Transform3D &p_transform) const {
 	return t;
 }
 
-void Transform3D::operator*=(real_t p_val) {
-	origin *= p_val;
-	basis *= p_val;
-}
-
-Transform3D Transform3D::operator*(real_t p_val) const {
-	Transform3D ret(*this);
-	ret *= p_val;
-	return ret;
-}
-
-void Transform3D::operator/=(real_t p_val) {
-	basis /= p_val;
-	origin /= p_val;
-}
-
-Transform3D Transform3D::operator/(real_t p_val) const {
-	Transform3D ret(*this);
-	ret /= p_val;
-	return ret;
-}
-
 Transform3D::operator String() const {
 	return "[X: " + basis.get_column(0).operator String() +
 			", Y: " + basis.get_column(1).operator String() +
 			", Z: " + basis.get_column(2).operator String() +
 			", O: " + origin.operator String() + "]";
 }
-
-Transform3D::Transform3D(const Basis &p_basis, const Vector3 &p_origin) :
-		basis(p_basis),
-		origin(p_origin) {
-}
-
-Transform3D::Transform3D(const Vector3 &p_x, const Vector3 &p_y, const Vector3 &p_z, const Vector3 &p_origin) :
-		origin(p_origin) {
-	basis.set_column(0, p_x);
-	basis.set_column(1, p_y);
-	basis.set_column(2, p_z);
-}
-
-Transform3D::Transform3D(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_zx, real_t p_zy, real_t p_zz, real_t p_ox, real_t p_oy, real_t p_oz) {
-	basis = Basis(p_xx, p_xy, p_xz, p_yx, p_yy, p_yz, p_zx, p_zy, p_zz);
-	origin = Vector3(p_ox, p_oy, p_oz);
-}
diff --git a/engine/core/math/transform_3d.h b/engine/core/math/transform_3d.h
index b1de2334..0d5cbb0f 100644
--- a/engine/core/math/transform_3d.h
+++ b/engine/core/math/transform_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSFORM_3D_H
-#define TRANSFORM_3D_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
@@ -75,10 +74,11 @@ struct [[nodiscard]] Transform3D {
 	void orthogonalize();
 	Transform3D orthogonalized() const;
 	bool is_equal_approx(const Transform3D &p_transform) const;
+	bool is_same(const Transform3D &p_transform) const;
 	bool is_finite() const;
 
-	bool operator==(const Transform3D &p_transform) const;
-	bool operator!=(const Transform3D &p_transform) const;
+	constexpr bool operator==(const Transform3D &p_transform) const;
+	constexpr bool operator!=(const Transform3D &p_transform) const;
 
 	_FORCE_INLINE_ Vector3 xform(const Vector3 &p_vector) const;
 	_FORCE_INLINE_ AABB xform(const AABB &p_aabb) const;
@@ -102,10 +102,10 @@ struct [[nodiscard]] Transform3D {
 
 	void operator*=(const Transform3D &p_transform);
 	Transform3D operator*(const Transform3D &p_transform) const;
-	void operator*=(real_t p_val);
-	Transform3D operator*(real_t p_val) const;
-	void operator/=(real_t p_val);
-	Transform3D operator/(real_t p_val) const;
+	constexpr void operator*=(real_t p_val);
+	constexpr Transform3D operator*(real_t p_val) const;
+	constexpr void operator/=(real_t p_val);
+	constexpr Transform3D operator/(real_t p_val) const;
 
 	Transform3D interpolate_with(const Transform3D &p_transform, real_t p_c) const;
 
@@ -124,12 +124,48 @@ struct [[nodiscard]] Transform3D {
 
 	operator String() const;
 
-	Transform3D() {}
-	Transform3D(const Basis &p_basis, const Vector3 &p_origin = Vector3());
-	Transform3D(const Vector3 &p_x, const Vector3 &p_y, const Vector3 &p_z, const Vector3 &p_origin);
-	Transform3D(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_zx, real_t p_zy, real_t p_zz, real_t p_ox, real_t p_oy, real_t p_oz);
+	Transform3D() = default;
+	constexpr Transform3D(const Basis &p_basis, const Vector3 &p_origin = Vector3()) :
+			basis(p_basis),
+			origin(p_origin) {}
+	constexpr Transform3D(const Vector3 &p_x, const Vector3 &p_y, const Vector3 &p_z, const Vector3 &p_origin) :
+			basis(p_x, p_y, p_z),
+			origin(p_origin) {}
+	constexpr Transform3D(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_zx, real_t p_zy, real_t p_zz, real_t p_ox, real_t p_oy, real_t p_oz) :
+			basis(p_xx, p_xy, p_xz, p_yx, p_yy, p_yz, p_zx, p_zy, p_zz),
+			origin(p_ox, p_oy, p_oz) {}
 };
 
+constexpr bool Transform3D::operator==(const Transform3D &p_transform) const {
+	return (basis == p_transform.basis && origin == p_transform.origin);
+}
+
+constexpr bool Transform3D::operator!=(const Transform3D &p_transform) const {
+	return (basis != p_transform.basis || origin != p_transform.origin);
+}
+
+constexpr void Transform3D::operator*=(real_t p_val) {
+	origin *= p_val;
+	basis *= p_val;
+}
+
+constexpr Transform3D Transform3D::operator*(real_t p_val) const {
+	Transform3D ret(*this);
+	ret *= p_val;
+	return ret;
+}
+
+constexpr void Transform3D::operator/=(real_t p_val) {
+	basis /= p_val;
+	origin /= p_val;
+}
+
+constexpr Transform3D Transform3D::operator/(real_t p_val) const {
+	Transform3D ret(*this);
+	ret /= p_val;
+	return ret;
+}
+
 _FORCE_INLINE_ Vector3 Transform3D::xform(const Vector3 &p_vector) const {
 	return Vector3(
 			basis[0].dot(p_vector) + origin.x,
@@ -269,5 +305,3 @@ _FORCE_INLINE_ Plane Transform3D::xform_inv_fast(const Plane &p_plane, const Tra
 	real_t d = normal.dot(point);
 	return Plane(normal, d);
 }
-
-#endif // TRANSFORM_3D_H
diff --git a/engine/core/math/transform_interpolator.h b/engine/core/math/transform_interpolator.h
index cc556707..d80876d9 100644
--- a/engine/core/math/transform_interpolator.h
+++ b/engine/core/math/transform_interpolator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSFORM_INTERPOLATOR_H
-#define TRANSFORM_INTERPOLATOR_H
+#pragma once
 
 #include "core/math/math_defs.h"
 #include "core/math/vector3.h"
@@ -91,5 +90,3 @@ public:
 
 	static Method find_method(const Basis &p_a, const Basis &p_b);
 };
-
-#endif // TRANSFORM_INTERPOLATOR_H
diff --git a/engine/core/math/triangle_mesh.cpp b/engine/core/math/triangle_mesh.cpp
index 01b73318..3b24b351 100644
--- a/engine/core/math/triangle_mesh.cpp
+++ b/engine/core/math/triangle_mesh.cpp
@@ -182,7 +182,11 @@ void TriangleMesh::create(const Vector<Vector3> &p_faces, const Vector<int32_t>
 	valid = true;
 }
 
-bool TriangleMesh::intersect_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index) const {
+bool TriangleMesh::intersect_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index, int32_t *r_face_index) const {
+	if (!valid) {
+		return false;
+	}
+
 	uint32_t *stack = (uint32_t *)alloca(sizeof(int) * max_depth);
 
 	enum {
@@ -234,6 +238,9 @@ bool TriangleMesh::intersect_segment(const Vector3 &p_begin, const Vector3 &p_en
 								if (r_surf_index) {
 									*r_surf_index = s.surface_index;
 								}
+								if (r_face_index) {
+									*r_face_index = b.face_index;
+								}
 								inters = true;
 							}
 						}
@@ -283,7 +290,11 @@ bool TriangleMesh::intersect_segment(const Vector3 &p_begin, const Vector3 &p_en
 	return inters;
 }
 
-bool TriangleMesh::intersect_ray(const Vector3 &p_begin, const Vector3 &p_dir, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index) const {
+bool TriangleMesh::intersect_ray(const Vector3 &p_begin, const Vector3 &p_dir, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index, int32_t *r_face_index) const {
+	if (!valid) {
+		return false;
+	}
+
 	uint32_t *stack = (uint32_t *)alloca(sizeof(int) * max_depth);
 
 	enum {
@@ -335,6 +346,9 @@ bool TriangleMesh::intersect_ray(const Vector3 &p_begin, const Vector3 &p_dir, V
 								if (r_surf_index) {
 									*r_surf_index = s.surface_index;
 								}
+								if (r_face_index) {
+									*r_face_index = b.face_index;
+								}
 								inters = true;
 							}
 						}
@@ -385,6 +399,10 @@ bool TriangleMesh::intersect_ray(const Vector3 &p_begin, const Vector3 &p_dir, V
 }
 
 bool TriangleMesh::inside_convex_shape(const Plane *p_planes, int p_plane_count, const Vector3 *p_points, int p_point_count, Vector3 p_scale) const {
+	if (!valid) {
+		return false;
+	}
+
 	uint32_t *stack = (uint32_t *)alloca(sizeof(int) * max_depth);
 
 	enum {
@@ -503,6 +521,85 @@ Vector<Face3> TriangleMesh::get_faces() const {
 	return faces;
 }
 
+bool TriangleMesh::create_from_faces(const Vector<Vector3> &p_faces) {
+	create(p_faces);
+	return is_valid();
+}
+
+Dictionary TriangleMesh::intersect_segment_scriptwrap(const Vector3 &p_begin, const Vector3 &p_end) const {
+	if (!valid) {
+		return Dictionary();
+	}
+
+	Vector3 r_point;
+	Vector3 r_normal;
+	int32_t r_face_index = -1;
+
+	bool intersected = intersect_segment(p_begin, p_end, r_point, r_normal, nullptr, &r_face_index);
+	if (!intersected) {
+		return Dictionary();
+	}
+
+	Dictionary result;
+	result["position"] = r_point;
+	result["normal"] = r_normal;
+	result["face_index"] = r_face_index;
+
+	return result;
+}
+
+Dictionary TriangleMesh::intersect_ray_scriptwrap(const Vector3 &p_begin, const Vector3 &p_dir) const {
+	if (!valid) {
+		return Dictionary();
+	}
+
+	Vector3 r_point;
+	Vector3 r_normal;
+	int32_t r_face_index = -1;
+
+	bool intersected = intersect_ray(p_begin, p_dir, r_point, r_normal, nullptr, &r_face_index);
+	if (!intersected) {
+		return Dictionary();
+	}
+
+	Dictionary result;
+	result["position"] = r_point;
+	result["normal"] = r_normal;
+	result["face_index"] = r_face_index;
+
+	return result;
+}
+
+Vector<Vector3> TriangleMesh::get_faces_scriptwrap() const {
+	if (!valid) {
+		return Vector<Vector3>();
+	}
+
+	Vector<Vector3> faces;
+	int ts = triangles.size();
+	faces.resize(triangles.size() * 3);
+
+	Vector3 *w = faces.ptrw();
+	const Triangle *r = triangles.ptr();
+	const Vector3 *rv = vertices.ptr();
+
+	for (int i = 0; i < ts; i++) {
+		for (int j = 0; j < 3; j++) {
+			w[i * 3 + j] = rv[r[i].indices[j]];
+		}
+	}
+
+	return faces;
+}
+
+void TriangleMesh::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("create_from_faces", "faces"), &TriangleMesh::create_from_faces);
+	ClassDB::bind_method(D_METHOD("get_faces"), &TriangleMesh::get_faces_scriptwrap);
+
+	ClassDB::bind_method(D_METHOD("intersect_segment", "begin", "end"), &TriangleMesh::intersect_segment_scriptwrap);
+	ClassDB::bind_method(D_METHOD("intersect_ray", "begin", "dir"), &TriangleMesh::intersect_ray_scriptwrap);
+}
+
 TriangleMesh::TriangleMesh() {
 	valid = false;
 	max_depth = 0;
diff --git a/engine/core/math/triangle_mesh.h b/engine/core/math/triangle_mesh.h
index 24fc12dd..65fd0ff9 100644
--- a/engine/core/math/triangle_mesh.h
+++ b/engine/core/math/triangle_mesh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRIANGLE_MESH_H
-#define TRIANGLE_MESH_H
+#pragma once
 
 #include "core/math/face3.h"
 #include "core/object/ref_counted.h"
@@ -41,9 +40,12 @@ public:
 	struct Triangle {
 		Vector3 normal;
 		int indices[3];
-		int32_t surface_index;
+		int32_t surface_index = 0;
 	};
 
+protected:
+	static void _bind_methods();
+
 private:
 	Vector<Triangle> triangles;
 	Vector<Vector3> vertices;
@@ -51,10 +53,10 @@ private:
 	struct BVH {
 		AABB aabb;
 		Vector3 center; //used for sorting
-		int left;
-		int right;
+		int left = -1;
+		int right = -1;
 
-		int face_index;
+		int32_t face_index = -1;
 	};
 
 	struct BVHCmpX {
@@ -77,13 +79,13 @@ private:
 	int _create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc);
 
 	Vector<BVH> bvh;
-	int max_depth;
-	bool valid;
+	int max_depth = 0;
+	bool valid = false;
 
 public:
 	bool is_valid() const;
-	bool intersect_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index = nullptr) const;
-	bool intersect_ray(const Vector3 &p_begin, const Vector3 &p_dir, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index = nullptr) const;
+	bool intersect_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index = nullptr, int32_t *r_face_index = nullptr) const;
+	bool intersect_ray(const Vector3 &p_begin, const Vector3 &p_dir, Vector3 &r_point, Vector3 &r_normal, int32_t *r_surf_index = nullptr, int32_t *r_face_index = nullptr) const;
 	bool inside_convex_shape(const Plane *p_planes, int p_plane_count, const Vector3 *p_points, int p_point_count, Vector3 p_scale = Vector3(1, 1, 1)) const;
 	Vector<Face3> get_faces() const;
 
@@ -92,7 +94,13 @@ public:
 	void get_indices(Vector<int> *r_triangles_indices) const;
 
 	void create(const Vector<Vector3> &p_faces, const Vector<int32_t> &p_surface_indices = Vector<int32_t>());
+
+	// Wrapped functions for compatibility with method bindings
+	// and user exposed script api that can't use more native types.
+	bool create_from_faces(const Vector<Vector3> &p_faces);
+	Dictionary intersect_segment_scriptwrap(const Vector3 &p_begin, const Vector3 &p_end) const;
+	Dictionary intersect_ray_scriptwrap(const Vector3 &p_begin, const Vector3 &p_dir) const;
+	Vector<Vector3> get_faces_scriptwrap() const;
+
 	TriangleMesh();
 };
-
-#endif // TRIANGLE_MESH_H
diff --git a/engine/core/math/triangulate.h b/engine/core/math/triangulate.h
index 0b88f7ec..87cdbd4f 100644
--- a/engine/core/math/triangulate.h
+++ b/engine/core/math/triangulate.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRIANGULATE_H
-#define TRIANGULATE_H
+#pragma once
 
 #include "core/math/vector2.h"
 #include "core/templates/vector.h"
@@ -58,5 +57,3 @@ public:
 private:
 	static bool snip(const Vector<Vector2> &p_contour, int u, int v, int w, int n, const Vector<int> &V, bool relaxed);
 };
-
-#endif // TRIANGULATE_H
diff --git a/engine/core/math/vector2.cpp b/engine/core/math/vector2.cpp
index 0590ee8a..7a51c139 100644
--- a/engine/core/math/vector2.cpp
+++ b/engine/core/math/vector2.cpp
@@ -194,6 +194,10 @@ bool Vector2::is_equal_approx(const Vector2 &p_v) const {
 	return Math::is_equal_approx(x, p_v.x) && Math::is_equal_approx(y, p_v.y);
 }
 
+bool Vector2::is_same(const Vector2 &p_v) const {
+	return Math::is_same(x, p_v.x) && Math::is_same(y, p_v.y);
+}
+
 bool Vector2::is_zero_approx() const {
 	return Math::is_zero_approx(x) && Math::is_zero_approx(y);
 }
diff --git a/engine/core/math/vector2.h b/engine/core/math/vector2.h
index edb47db6..3f6dbefc 100644
--- a/engine/core/math/vector2.h
+++ b/engine/core/math/vector2.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VECTOR2_H
-#define VECTOR2_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
@@ -46,18 +45,19 @@ struct [[nodiscard]] Vector2 {
 	};
 
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
-			union {
-				real_t x;
-				real_t width;
-			};
-			union {
-				real_t y;
-				real_t height;
-			};
+			real_t x;
+			real_t y;
+		};
+
+		struct {
+			real_t width;
+			real_t height;
 		};
 
 		real_t coord[2] = { 0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_FORCE_INLINE_ real_t &operator[](int p_axis) {
@@ -129,35 +129,36 @@ struct [[nodiscard]] Vector2 {
 	Vector2 reflect(const Vector2 &p_normal) const;
 
 	bool is_equal_approx(const Vector2 &p_v) const;
+	bool is_same(const Vector2 &p_v) const;
 	bool is_zero_approx() const;
 	bool is_finite() const;
 
-	Vector2 operator+(const Vector2 &p_v) const;
-	void operator+=(const Vector2 &p_v);
-	Vector2 operator-(const Vector2 &p_v) const;
-	void operator-=(const Vector2 &p_v);
-	Vector2 operator*(const Vector2 &p_v1) const;
+	constexpr Vector2 operator+(const Vector2 &p_v) const;
+	constexpr void operator+=(const Vector2 &p_v);
+	constexpr Vector2 operator-(const Vector2 &p_v) const;
+	constexpr void operator-=(const Vector2 &p_v);
+	constexpr Vector2 operator*(const Vector2 &p_v1) const;
 
-	Vector2 operator*(real_t p_rvalue) const;
-	void operator*=(real_t p_rvalue);
-	void operator*=(const Vector2 &p_rvalue) { *this = *this * p_rvalue; }
+	constexpr Vector2 operator*(real_t p_rvalue) const;
+	constexpr void operator*=(real_t p_rvalue);
+	constexpr void operator*=(const Vector2 &p_rvalue) { *this = *this * p_rvalue; }
 
-	Vector2 operator/(const Vector2 &p_v1) const;
+	constexpr Vector2 operator/(const Vector2 &p_v1) const;
 
-	Vector2 operator/(real_t p_rvalue) const;
+	constexpr Vector2 operator/(real_t p_rvalue) const;
 
-	void operator/=(real_t p_rvalue);
-	void operator/=(const Vector2 &p_rvalue) { *this = *this / p_rvalue; }
+	constexpr void operator/=(real_t p_rvalue);
+	constexpr void operator/=(const Vector2 &p_rvalue) { *this = *this / p_rvalue; }
 
-	Vector2 operator-() const;
+	constexpr Vector2 operator-() const;
 
-	bool operator==(const Vector2 &p_vec2) const;
-	bool operator!=(const Vector2 &p_vec2) const;
+	constexpr bool operator==(const Vector2 &p_vec2) const;
+	constexpr bool operator!=(const Vector2 &p_vec2) const;
 
-	bool operator<(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y < p_vec2.y) : (x < p_vec2.x); }
-	bool operator>(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y > p_vec2.y) : (x > p_vec2.x); }
-	bool operator<=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y <= p_vec2.y) : (x < p_vec2.x); }
-	bool operator>=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y >= p_vec2.y) : (x > p_vec2.x); }
+	constexpr bool operator<(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y < p_vec2.y) : (x < p_vec2.x); }
+	constexpr bool operator>(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y > p_vec2.y) : (x > p_vec2.x); }
+	constexpr bool operator<=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y <= p_vec2.y) : (x < p_vec2.x); }
+	constexpr bool operator>=(const Vector2 &p_vec2) const { return x == p_vec2.x ? (y >= p_vec2.y) : (x > p_vec2.x); }
 
 	real_t angle() const;
 	static Vector2 from_angle(real_t p_angle);
@@ -184,70 +185,71 @@ struct [[nodiscard]] Vector2 {
 	operator String() const;
 	operator Vector2i() const;
 
-	_FORCE_INLINE_ Vector2() {}
-	_FORCE_INLINE_ Vector2(real_t p_x, real_t p_y) {
-		x = p_x;
-		y = p_y;
-	}
+	// NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
+	constexpr Vector2() :
+			x(0), y(0) {}
+	constexpr Vector2(real_t p_x, real_t p_y) :
+			x(p_x), y(p_y) {}
+	// NOLINTEND(cppcoreguidelines-pro-type-member-init)
 };
 
 _FORCE_INLINE_ Vector2 Vector2::plane_project(real_t p_d, const Vector2 &p_vec) const {
 	return p_vec - *this * (dot(p_vec) - p_d);
 }
 
-_FORCE_INLINE_ Vector2 Vector2::operator+(const Vector2 &p_v) const {
+constexpr Vector2 Vector2::operator+(const Vector2 &p_v) const {
 	return Vector2(x + p_v.x, y + p_v.y);
 }
 
-_FORCE_INLINE_ void Vector2::operator+=(const Vector2 &p_v) {
+constexpr void Vector2::operator+=(const Vector2 &p_v) {
 	x += p_v.x;
 	y += p_v.y;
 }
 
-_FORCE_INLINE_ Vector2 Vector2::operator-(const Vector2 &p_v) const {
+constexpr Vector2 Vector2::operator-(const Vector2 &p_v) const {
 	return Vector2(x - p_v.x, y - p_v.y);
 }
 
-_FORCE_INLINE_ void Vector2::operator-=(const Vector2 &p_v) {
+constexpr void Vector2::operator-=(const Vector2 &p_v) {
 	x -= p_v.x;
 	y -= p_v.y;
 }
 
-_FORCE_INLINE_ Vector2 Vector2::operator*(const Vector2 &p_v1) const {
+constexpr Vector2 Vector2::operator*(const Vector2 &p_v1) const {
 	return Vector2(x * p_v1.x, y * p_v1.y);
 }
 
-_FORCE_INLINE_ Vector2 Vector2::operator*(real_t p_rvalue) const {
+constexpr Vector2 Vector2::operator*(real_t p_rvalue) const {
 	return Vector2(x * p_rvalue, y * p_rvalue);
 }
 
-_FORCE_INLINE_ void Vector2::operator*=(real_t p_rvalue) {
+constexpr void Vector2::operator*=(real_t p_rvalue) {
 	x *= p_rvalue;
 	y *= p_rvalue;
 }
 
-_FORCE_INLINE_ Vector2 Vector2::operator/(const Vector2 &p_v1) const {
+constexpr Vector2 Vector2::operator/(const Vector2 &p_v1) const {
 	return Vector2(x / p_v1.x, y / p_v1.y);
 }
 
-_FORCE_INLINE_ Vector2 Vector2::operator/(real_t p_rvalue) const {
+constexpr Vector2 Vector2::operator/(real_t p_rvalue) const {
 	return Vector2(x / p_rvalue, y / p_rvalue);
 }
 
-_FORCE_INLINE_ void Vector2::operator/=(real_t p_rvalue) {
+constexpr void Vector2::operator/=(real_t p_rvalue) {
 	x /= p_rvalue;
 	y /= p_rvalue;
 }
 
-_FORCE_INLINE_ Vector2 Vector2::operator-() const {
+constexpr Vector2 Vector2::operator-() const {
 	return Vector2(-x, -y);
 }
 
-_FORCE_INLINE_ bool Vector2::operator==(const Vector2 &p_vec2) const {
+constexpr bool Vector2::operator==(const Vector2 &p_vec2) const {
 	return x == p_vec2.x && y == p_vec2.y;
 }
 
-_FORCE_INLINE_ bool Vector2::operator!=(const Vector2 &p_vec2) const {
+constexpr bool Vector2::operator!=(const Vector2 &p_vec2) const {
 	return x != p_vec2.x || y != p_vec2.y;
 }
 
@@ -308,23 +310,24 @@ Vector2 Vector2::direction_to(const Vector2 &p_to) const {
 // Multiplication operators required to workaround issues with LLVM using implicit conversion
 // to Vector2i instead for integers where it should not.
 
-_FORCE_INLINE_ Vector2 operator*(float p_scalar, const Vector2 &p_vec) {
+constexpr Vector2 operator*(float p_scalar, const Vector2 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector2 operator*(double p_scalar, const Vector2 &p_vec) {
+constexpr Vector2 operator*(double p_scalar, const Vector2 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector2 operator*(int32_t p_scalar, const Vector2 &p_vec) {
+constexpr Vector2 operator*(int32_t p_scalar, const Vector2 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector2 operator*(int64_t p_scalar, const Vector2 &p_vec) {
+constexpr Vector2 operator*(int64_t p_scalar, const Vector2 &p_vec) {
 	return p_vec * p_scalar;
 }
 
 typedef Vector2 Size2;
 typedef Vector2 Point2;
 
-#endif // VECTOR2_H
+template <>
+struct is_zero_constructible<Vector2> : std::true_type {};
diff --git a/engine/core/math/vector2i.cpp b/engine/core/math/vector2i.cpp
index 790f5647..cef55185 100644
--- a/engine/core/math/vector2i.cpp
+++ b/engine/core/math/vector2i.cpp
@@ -65,75 +65,6 @@ double Vector2i::length() const {
 	return Math::sqrt((double)length_squared());
 }
 
-Vector2i Vector2i::operator+(const Vector2i &p_v) const {
-	return Vector2i(x + p_v.x, y + p_v.y);
-}
-
-void Vector2i::operator+=(const Vector2i &p_v) {
-	x += p_v.x;
-	y += p_v.y;
-}
-
-Vector2i Vector2i::operator-(const Vector2i &p_v) const {
-	return Vector2i(x - p_v.x, y - p_v.y);
-}
-
-void Vector2i::operator-=(const Vector2i &p_v) {
-	x -= p_v.x;
-	y -= p_v.y;
-}
-
-Vector2i Vector2i::operator*(const Vector2i &p_v1) const {
-	return Vector2i(x * p_v1.x, y * p_v1.y);
-}
-
-Vector2i Vector2i::operator*(int32_t p_rvalue) const {
-	return Vector2i(x * p_rvalue, y * p_rvalue);
-}
-
-void Vector2i::operator*=(int32_t p_rvalue) {
-	x *= p_rvalue;
-	y *= p_rvalue;
-}
-
-Vector2i Vector2i::operator/(const Vector2i &p_v1) const {
-	return Vector2i(x / p_v1.x, y / p_v1.y);
-}
-
-Vector2i Vector2i::operator/(int32_t p_rvalue) const {
-	return Vector2i(x / p_rvalue, y / p_rvalue);
-}
-
-void Vector2i::operator/=(int32_t p_rvalue) {
-	x /= p_rvalue;
-	y /= p_rvalue;
-}
-
-Vector2i Vector2i::operator%(const Vector2i &p_v1) const {
-	return Vector2i(x % p_v1.x, y % p_v1.y);
-}
-
-Vector2i Vector2i::operator%(int32_t p_rvalue) const {
-	return Vector2i(x % p_rvalue, y % p_rvalue);
-}
-
-void Vector2i::operator%=(int32_t p_rvalue) {
-	x %= p_rvalue;
-	y %= p_rvalue;
-}
-
-Vector2i Vector2i::operator-() const {
-	return Vector2i(-x, -y);
-}
-
-bool Vector2i::operator==(const Vector2i &p_vec2) const {
-	return x == p_vec2.x && y == p_vec2.y;
-}
-
-bool Vector2i::operator!=(const Vector2i &p_vec2) const {
-	return x != p_vec2.x || y != p_vec2.y;
-}
-
 Vector2i::operator String() const {
 	return "(" + itos(x) + ", " + itos(y) + ")";
 }
diff --git a/engine/core/math/vector2i.h b/engine/core/math/vector2i.h
index fff9b0a6..5ce0b93b 100644
--- a/engine/core/math/vector2i.h
+++ b/engine/core/math/vector2i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VECTOR2I_H
-#define VECTOR2I_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
@@ -46,18 +45,19 @@ struct [[nodiscard]] Vector2i {
 	};
 
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
-			union {
-				int32_t x;
-				int32_t width;
-			};
-			union {
-				int32_t y;
-				int32_t height;
-			};
+			int32_t x;
+			int32_t y;
+		};
+
+		struct {
+			int32_t width;
+			int32_t height;
 		};
 
 		int32_t coord[2] = { 0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_FORCE_INLINE_ int32_t &operator[](int p_axis) {
@@ -101,32 +101,32 @@ struct [[nodiscard]] Vector2i {
 		return (p_to - *this).length_squared();
 	}
 
-	Vector2i operator+(const Vector2i &p_v) const;
-	void operator+=(const Vector2i &p_v);
-	Vector2i operator-(const Vector2i &p_v) const;
-	void operator-=(const Vector2i &p_v);
-	Vector2i operator*(const Vector2i &p_v1) const;
+	constexpr Vector2i operator+(const Vector2i &p_v) const;
+	constexpr void operator+=(const Vector2i &p_v);
+	constexpr Vector2i operator-(const Vector2i &p_v) const;
+	constexpr void operator-=(const Vector2i &p_v);
+	constexpr Vector2i operator*(const Vector2i &p_v1) const;
 
-	Vector2i operator*(int32_t p_rvalue) const;
-	void operator*=(int32_t p_rvalue);
+	constexpr Vector2i operator*(int32_t p_rvalue) const;
+	constexpr void operator*=(int32_t p_rvalue);
 
-	Vector2i operator/(const Vector2i &p_v1) const;
-	Vector2i operator/(int32_t p_rvalue) const;
-	void operator/=(int32_t p_rvalue);
+	constexpr Vector2i operator/(const Vector2i &p_v1) const;
+	constexpr Vector2i operator/(int32_t p_rvalue) const;
+	constexpr void operator/=(int32_t p_rvalue);
 
-	Vector2i operator%(const Vector2i &p_v1) const;
-	Vector2i operator%(int32_t p_rvalue) const;
-	void operator%=(int32_t p_rvalue);
+	constexpr Vector2i operator%(const Vector2i &p_v1) const;
+	constexpr Vector2i operator%(int32_t p_rvalue) const;
+	constexpr void operator%=(int32_t p_rvalue);
 
-	Vector2i operator-() const;
-	bool operator<(const Vector2i &p_vec2) const { return (x == p_vec2.x) ? (y < p_vec2.y) : (x < p_vec2.x); }
-	bool operator>(const Vector2i &p_vec2) const { return (x == p_vec2.x) ? (y > p_vec2.y) : (x > p_vec2.x); }
+	constexpr Vector2i operator-() const;
+	constexpr bool operator<(const Vector2i &p_vec2) const { return (x == p_vec2.x) ? (y < p_vec2.y) : (x < p_vec2.x); }
+	constexpr bool operator>(const Vector2i &p_vec2) const { return (x == p_vec2.x) ? (y > p_vec2.y) : (x > p_vec2.x); }
 
-	bool operator<=(const Vector2i &p_vec2) const { return x == p_vec2.x ? (y <= p_vec2.y) : (x < p_vec2.x); }
-	bool operator>=(const Vector2i &p_vec2) const { return x == p_vec2.x ? (y >= p_vec2.y) : (x > p_vec2.x); }
+	constexpr bool operator<=(const Vector2i &p_vec2) const { return x == p_vec2.x ? (y <= p_vec2.y) : (x < p_vec2.x); }
+	constexpr bool operator>=(const Vector2i &p_vec2) const { return x == p_vec2.x ? (y >= p_vec2.y) : (x > p_vec2.x); }
 
-	bool operator==(const Vector2i &p_vec2) const;
-	bool operator!=(const Vector2i &p_vec2) const;
+	constexpr bool operator==(const Vector2i &p_vec2) const;
+	constexpr bool operator!=(const Vector2i &p_vec2) const;
 
 	int64_t length_squared() const;
 	double length() const;
@@ -142,32 +142,103 @@ struct [[nodiscard]] Vector2i {
 	operator String() const;
 	operator Vector2() const;
 
-	inline Vector2i() {}
-	inline Vector2i(int32_t p_x, int32_t p_y) {
-		x = p_x;
-		y = p_y;
-	}
+	// NOLINTBEGIN(cppcoreguidelines-pro-type-member-init)
+	constexpr Vector2i() :
+			x(0), y(0) {}
+	constexpr Vector2i(int32_t p_x, int32_t p_y) :
+			x(p_x), y(p_y) {}
+	// NOLINTEND(cppcoreguidelines-pro-type-member-init)
 };
 
+constexpr Vector2i Vector2i::operator+(const Vector2i &p_v) const {
+	return Vector2i(x + p_v.x, y + p_v.y);
+}
+
+constexpr void Vector2i::operator+=(const Vector2i &p_v) {
+	x += p_v.x;
+	y += p_v.y;
+}
+
+constexpr Vector2i Vector2i::operator-(const Vector2i &p_v) const {
+	return Vector2i(x - p_v.x, y - p_v.y);
+}
+
+constexpr void Vector2i::operator-=(const Vector2i &p_v) {
+	x -= p_v.x;
+	y -= p_v.y;
+}
+
+constexpr Vector2i Vector2i::operator*(const Vector2i &p_v1) const {
+	return Vector2i(x * p_v1.x, y * p_v1.y);
+}
+
+constexpr Vector2i Vector2i::operator*(int32_t p_rvalue) const {
+	return Vector2i(x * p_rvalue, y * p_rvalue);
+}
+
+constexpr void Vector2i::operator*=(int32_t p_rvalue) {
+	x *= p_rvalue;
+	y *= p_rvalue;
+}
+
+constexpr Vector2i Vector2i::operator/(const Vector2i &p_v1) const {
+	return Vector2i(x / p_v1.x, y / p_v1.y);
+}
+
+constexpr Vector2i Vector2i::operator/(int32_t p_rvalue) const {
+	return Vector2i(x / p_rvalue, y / p_rvalue);
+}
+
+constexpr void Vector2i::operator/=(int32_t p_rvalue) {
+	x /= p_rvalue;
+	y /= p_rvalue;
+}
+
+constexpr Vector2i Vector2i::operator%(const Vector2i &p_v1) const {
+	return Vector2i(x % p_v1.x, y % p_v1.y);
+}
+
+constexpr Vector2i Vector2i::operator%(int32_t p_rvalue) const {
+	return Vector2i(x % p_rvalue, y % p_rvalue);
+}
+
+constexpr void Vector2i::operator%=(int32_t p_rvalue) {
+	x %= p_rvalue;
+	y %= p_rvalue;
+}
+
+constexpr Vector2i Vector2i::operator-() const {
+	return Vector2i(-x, -y);
+}
+
+constexpr bool Vector2i::operator==(const Vector2i &p_vec2) const {
+	return x == p_vec2.x && y == p_vec2.y;
+}
+
+constexpr bool Vector2i::operator!=(const Vector2i &p_vec2) const {
+	return x != p_vec2.x || y != p_vec2.y;
+}
+
 // Multiplication operators required to workaround issues with LLVM using implicit conversion.
 
-_FORCE_INLINE_ Vector2i operator*(int32_t p_scalar, const Vector2i &p_vector) {
+constexpr Vector2i operator*(int32_t p_scalar, const Vector2i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector2i operator*(int64_t p_scalar, const Vector2i &p_vector) {
+constexpr Vector2i operator*(int64_t p_scalar, const Vector2i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector2i operator*(float p_scalar, const Vector2i &p_vector) {
+constexpr Vector2i operator*(float p_scalar, const Vector2i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector2i operator*(double p_scalar, const Vector2i &p_vector) {
+constexpr Vector2i operator*(double p_scalar, const Vector2i &p_vector) {
 	return p_vector * p_scalar;
 }
 
 typedef Vector2i Size2i;
 typedef Vector2i Point2i;
 
-#endif // VECTOR2I_H
+template <>
+struct is_zero_constructible<Vector2i> : std::true_type {};
diff --git a/engine/core/math/vector3.cpp b/engine/core/math/vector3.cpp
index e18ac3b0..24422c57 100644
--- a/engine/core/math/vector3.cpp
+++ b/engine/core/math/vector3.cpp
@@ -156,6 +156,10 @@ bool Vector3::is_equal_approx(const Vector3 &p_v) const {
 	return Math::is_equal_approx(x, p_v.x) && Math::is_equal_approx(y, p_v.y) && Math::is_equal_approx(z, p_v.z);
 }
 
+bool Vector3::is_same(const Vector3 &p_v) const {
+	return Math::is_same(x, p_v.x) && Math::is_same(y, p_v.y) && Math::is_same(z, p_v.z);
+}
+
 bool Vector3::is_zero_approx() const {
 	return Math::is_zero_approx(x) && Math::is_zero_approx(y) && Math::is_zero_approx(z);
 }
diff --git a/engine/core/math/vector3.h b/engine/core/math/vector3.h
index fd0dec35..4ddfac64 100644
--- a/engine/core/math/vector3.h
+++ b/engine/core/math/vector3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VECTOR3_H
-#define VECTOR3_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
@@ -49,6 +48,7 @@ struct [[nodiscard]] Vector3 {
 	};
 
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
 			real_t x;
 			real_t y;
@@ -56,6 +56,7 @@ struct [[nodiscard]] Vector3 {
 		};
 
 		real_t coord[3] = { 0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_FORCE_INLINE_ const real_t &operator[](int p_axis) const {
@@ -156,43 +157,42 @@ struct [[nodiscard]] Vector3 {
 	_FORCE_INLINE_ Vector3 reflect(const Vector3 &p_normal) const;
 
 	bool is_equal_approx(const Vector3 &p_v) const;
+	bool is_same(const Vector3 &p_v) const;
 	bool is_zero_approx() const;
 	bool is_finite() const;
 
 	/* Operators */
 
-	_FORCE_INLINE_ Vector3 &operator+=(const Vector3 &p_v);
-	_FORCE_INLINE_ Vector3 operator+(const Vector3 &p_v) const;
-	_FORCE_INLINE_ Vector3 &operator-=(const Vector3 &p_v);
-	_FORCE_INLINE_ Vector3 operator-(const Vector3 &p_v) const;
-	_FORCE_INLINE_ Vector3 &operator*=(const Vector3 &p_v);
-	_FORCE_INLINE_ Vector3 operator*(const Vector3 &p_v) const;
-	_FORCE_INLINE_ Vector3 &operator/=(const Vector3 &p_v);
-	_FORCE_INLINE_ Vector3 operator/(const Vector3 &p_v) const;
+	constexpr Vector3 &operator+=(const Vector3 &p_v);
+	constexpr Vector3 operator+(const Vector3 &p_v) const;
+	constexpr Vector3 &operator-=(const Vector3 &p_v);
+	constexpr Vector3 operator-(const Vector3 &p_v) const;
+	constexpr Vector3 &operator*=(const Vector3 &p_v);
+	constexpr Vector3 operator*(const Vector3 &p_v) const;
+	constexpr Vector3 &operator/=(const Vector3 &p_v);
+	constexpr Vector3 operator/(const Vector3 &p_v) const;
 
-	_FORCE_INLINE_ Vector3 &operator*=(real_t p_scalar);
-	_FORCE_INLINE_ Vector3 operator*(real_t p_scalar) const;
-	_FORCE_INLINE_ Vector3 &operator/=(real_t p_scalar);
-	_FORCE_INLINE_ Vector3 operator/(real_t p_scalar) const;
+	constexpr Vector3 &operator*=(real_t p_scalar);
+	constexpr Vector3 operator*(real_t p_scalar) const;
+	constexpr Vector3 &operator/=(real_t p_scalar);
+	constexpr Vector3 operator/(real_t p_scalar) const;
 
-	_FORCE_INLINE_ Vector3 operator-() const;
+	constexpr Vector3 operator-() const;
 
-	_FORCE_INLINE_ bool operator==(const Vector3 &p_v) const;
-	_FORCE_INLINE_ bool operator!=(const Vector3 &p_v) const;
-	_FORCE_INLINE_ bool operator<(const Vector3 &p_v) const;
-	_FORCE_INLINE_ bool operator<=(const Vector3 &p_v) const;
-	_FORCE_INLINE_ bool operator>(const Vector3 &p_v) const;
-	_FORCE_INLINE_ bool operator>=(const Vector3 &p_v) const;
+	constexpr bool operator==(const Vector3 &p_v) const;
+	constexpr bool operator!=(const Vector3 &p_v) const;
+	constexpr bool operator<(const Vector3 &p_v) const;
+	constexpr bool operator<=(const Vector3 &p_v) const;
+	constexpr bool operator>(const Vector3 &p_v) const;
+	constexpr bool operator>=(const Vector3 &p_v) const;
 
 	operator String() const;
 	operator Vector3i() const;
 
-	_FORCE_INLINE_ Vector3() {}
-	_FORCE_INLINE_ Vector3(real_t p_x, real_t p_y, real_t p_z) {
-		x = p_x;
-		y = p_y;
-		z = p_z;
-	}
+	constexpr Vector3() :
+			x(0), y(0), z(0) {}
+	constexpr Vector3(real_t p_x, real_t p_y, real_t p_z) :
+			x(p_x), y(p_y), z(p_z) {}
 };
 
 Vector3 Vector3::cross(const Vector3 &p_with) const {
@@ -339,51 +339,51 @@ Vector3 Vector3::get_any_perpendicular() const {
 
 /* Operators */
 
-Vector3 &Vector3::operator+=(const Vector3 &p_v) {
+constexpr Vector3 &Vector3::operator+=(const Vector3 &p_v) {
 	x += p_v.x;
 	y += p_v.y;
 	z += p_v.z;
 	return *this;
 }
 
-Vector3 Vector3::operator+(const Vector3 &p_v) const {
+constexpr Vector3 Vector3::operator+(const Vector3 &p_v) const {
 	return Vector3(x + p_v.x, y + p_v.y, z + p_v.z);
 }
 
-Vector3 &Vector3::operator-=(const Vector3 &p_v) {
+constexpr Vector3 &Vector3::operator-=(const Vector3 &p_v) {
 	x -= p_v.x;
 	y -= p_v.y;
 	z -= p_v.z;
 	return *this;
 }
 
-Vector3 Vector3::operator-(const Vector3 &p_v) const {
+constexpr Vector3 Vector3::operator-(const Vector3 &p_v) const {
 	return Vector3(x - p_v.x, y - p_v.y, z - p_v.z);
 }
 
-Vector3 &Vector3::operator*=(const Vector3 &p_v) {
+constexpr Vector3 &Vector3::operator*=(const Vector3 &p_v) {
 	x *= p_v.x;
 	y *= p_v.y;
 	z *= p_v.z;
 	return *this;
 }
 
-Vector3 Vector3::operator*(const Vector3 &p_v) const {
+constexpr Vector3 Vector3::operator*(const Vector3 &p_v) const {
 	return Vector3(x * p_v.x, y * p_v.y, z * p_v.z);
 }
 
-Vector3 &Vector3::operator/=(const Vector3 &p_v) {
+constexpr Vector3 &Vector3::operator/=(const Vector3 &p_v) {
 	x /= p_v.x;
 	y /= p_v.y;
 	z /= p_v.z;
 	return *this;
 }
 
-Vector3 Vector3::operator/(const Vector3 &p_v) const {
+constexpr Vector3 Vector3::operator/(const Vector3 &p_v) const {
 	return Vector3(x / p_v.x, y / p_v.y, z / p_v.z);
 }
 
-Vector3 &Vector3::operator*=(real_t p_scalar) {
+constexpr Vector3 &Vector3::operator*=(real_t p_scalar) {
 	x *= p_scalar;
 	y *= p_scalar;
 	z *= p_scalar;
@@ -393,50 +393,50 @@ Vector3 &Vector3::operator*=(real_t p_scalar) {
 // Multiplication operators required to workaround issues with LLVM using implicit conversion
 // to Vector3i instead for integers where it should not.
 
-_FORCE_INLINE_ Vector3 operator*(float p_scalar, const Vector3 &p_vec) {
+constexpr Vector3 operator*(float p_scalar, const Vector3 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector3 operator*(double p_scalar, const Vector3 &p_vec) {
+constexpr Vector3 operator*(double p_scalar, const Vector3 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector3 operator*(int32_t p_scalar, const Vector3 &p_vec) {
+constexpr Vector3 operator*(int32_t p_scalar, const Vector3 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector3 operator*(int64_t p_scalar, const Vector3 &p_vec) {
+constexpr Vector3 operator*(int64_t p_scalar, const Vector3 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-Vector3 Vector3::operator*(real_t p_scalar) const {
+constexpr Vector3 Vector3::operator*(real_t p_scalar) const {
 	return Vector3(x * p_scalar, y * p_scalar, z * p_scalar);
 }
 
-Vector3 &Vector3::operator/=(real_t p_scalar) {
+constexpr Vector3 &Vector3::operator/=(real_t p_scalar) {
 	x /= p_scalar;
 	y /= p_scalar;
 	z /= p_scalar;
 	return *this;
 }
 
-Vector3 Vector3::operator/(real_t p_scalar) const {
+constexpr Vector3 Vector3::operator/(real_t p_scalar) const {
 	return Vector3(x / p_scalar, y / p_scalar, z / p_scalar);
 }
 
-Vector3 Vector3::operator-() const {
+constexpr Vector3 Vector3::operator-() const {
 	return Vector3(-x, -y, -z);
 }
 
-bool Vector3::operator==(const Vector3 &p_v) const {
+constexpr bool Vector3::operator==(const Vector3 &p_v) const {
 	return x == p_v.x && y == p_v.y && z == p_v.z;
 }
 
-bool Vector3::operator!=(const Vector3 &p_v) const {
+constexpr bool Vector3::operator!=(const Vector3 &p_v) const {
 	return x != p_v.x || y != p_v.y || z != p_v.z;
 }
 
-bool Vector3::operator<(const Vector3 &p_v) const {
+constexpr bool Vector3::operator<(const Vector3 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z < p_v.z;
@@ -446,7 +446,7 @@ bool Vector3::operator<(const Vector3 &p_v) const {
 	return x < p_v.x;
 }
 
-bool Vector3::operator>(const Vector3 &p_v) const {
+constexpr bool Vector3::operator>(const Vector3 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z > p_v.z;
@@ -456,7 +456,7 @@ bool Vector3::operator>(const Vector3 &p_v) const {
 	return x > p_v.x;
 }
 
-bool Vector3::operator<=(const Vector3 &p_v) const {
+constexpr bool Vector3::operator<=(const Vector3 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z <= p_v.z;
@@ -466,7 +466,7 @@ bool Vector3::operator<=(const Vector3 &p_v) const {
 	return x < p_v.x;
 }
 
-bool Vector3::operator>=(const Vector3 &p_v) const {
+constexpr bool Vector3::operator>=(const Vector3 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z >= p_v.z;
@@ -550,4 +550,5 @@ Vector3 Vector3::reflect(const Vector3 &p_normal) const {
 	return 2.0f * p_normal * dot(p_normal) - *this;
 }
 
-#endif // VECTOR3_H
+template <>
+struct is_zero_constructible<Vector3> : std::true_type {};
diff --git a/engine/core/math/vector3i.h b/engine/core/math/vector3i.h
index 40d0700b..d7d1455e 100644
--- a/engine/core/math/vector3i.h
+++ b/engine/core/math/vector3i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VECTOR3I_H
-#define VECTOR3I_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
@@ -47,6 +46,7 @@ struct [[nodiscard]] Vector3i {
 	};
 
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
 			int32_t x;
 			int32_t y;
@@ -54,6 +54,7 @@ struct [[nodiscard]] Vector3i {
 		};
 
 		int32_t coord[3] = { 0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_FORCE_INLINE_ const int32_t &operator[](int p_axis) const {
@@ -102,42 +103,40 @@ struct [[nodiscard]] Vector3i {
 
 	/* Operators */
 
-	_FORCE_INLINE_ Vector3i &operator+=(const Vector3i &p_v);
-	_FORCE_INLINE_ Vector3i operator+(const Vector3i &p_v) const;
-	_FORCE_INLINE_ Vector3i &operator-=(const Vector3i &p_v);
-	_FORCE_INLINE_ Vector3i operator-(const Vector3i &p_v) const;
-	_FORCE_INLINE_ Vector3i &operator*=(const Vector3i &p_v);
-	_FORCE_INLINE_ Vector3i operator*(const Vector3i &p_v) const;
-	_FORCE_INLINE_ Vector3i &operator/=(const Vector3i &p_v);
-	_FORCE_INLINE_ Vector3i operator/(const Vector3i &p_v) const;
-	_FORCE_INLINE_ Vector3i &operator%=(const Vector3i &p_v);
-	_FORCE_INLINE_ Vector3i operator%(const Vector3i &p_v) const;
+	constexpr Vector3i &operator+=(const Vector3i &p_v);
+	constexpr Vector3i operator+(const Vector3i &p_v) const;
+	constexpr Vector3i &operator-=(const Vector3i &p_v);
+	constexpr Vector3i operator-(const Vector3i &p_v) const;
+	constexpr Vector3i &operator*=(const Vector3i &p_v);
+	constexpr Vector3i operator*(const Vector3i &p_v) const;
+	constexpr Vector3i &operator/=(const Vector3i &p_v);
+	constexpr Vector3i operator/(const Vector3i &p_v) const;
+	constexpr Vector3i &operator%=(const Vector3i &p_v);
+	constexpr Vector3i operator%(const Vector3i &p_v) const;
 
-	_FORCE_INLINE_ Vector3i &operator*=(int32_t p_scalar);
-	_FORCE_INLINE_ Vector3i operator*(int32_t p_scalar) const;
-	_FORCE_INLINE_ Vector3i &operator/=(int32_t p_scalar);
-	_FORCE_INLINE_ Vector3i operator/(int32_t p_scalar) const;
-	_FORCE_INLINE_ Vector3i &operator%=(int32_t p_scalar);
-	_FORCE_INLINE_ Vector3i operator%(int32_t p_scalar) const;
+	constexpr Vector3i &operator*=(int32_t p_scalar);
+	constexpr Vector3i operator*(int32_t p_scalar) const;
+	constexpr Vector3i &operator/=(int32_t p_scalar);
+	constexpr Vector3i operator/(int32_t p_scalar) const;
+	constexpr Vector3i &operator%=(int32_t p_scalar);
+	constexpr Vector3i operator%(int32_t p_scalar) const;
 
-	_FORCE_INLINE_ Vector3i operator-() const;
+	constexpr Vector3i operator-() const;
 
-	_FORCE_INLINE_ bool operator==(const Vector3i &p_v) const;
-	_FORCE_INLINE_ bool operator!=(const Vector3i &p_v) const;
-	_FORCE_INLINE_ bool operator<(const Vector3i &p_v) const;
-	_FORCE_INLINE_ bool operator<=(const Vector3i &p_v) const;
-	_FORCE_INLINE_ bool operator>(const Vector3i &p_v) const;
-	_FORCE_INLINE_ bool operator>=(const Vector3i &p_v) const;
+	constexpr bool operator==(const Vector3i &p_v) const;
+	constexpr bool operator!=(const Vector3i &p_v) const;
+	constexpr bool operator<(const Vector3i &p_v) const;
+	constexpr bool operator<=(const Vector3i &p_v) const;
+	constexpr bool operator>(const Vector3i &p_v) const;
+	constexpr bool operator>=(const Vector3i &p_v) const;
 
 	operator String() const;
 	operator Vector3() const;
 
-	_FORCE_INLINE_ Vector3i() {}
-	_FORCE_INLINE_ Vector3i(int32_t p_x, int32_t p_y, int32_t p_z) {
-		x = p_x;
-		y = p_y;
-		z = p_z;
-	}
+	constexpr Vector3i() :
+			x(0), y(0), z(0) {}
+	constexpr Vector3i(int32_t p_x, int32_t p_y, int32_t p_z) :
+			x(p_x), y(p_y), z(p_z) {}
 };
 
 int64_t Vector3i::length_squared() const {
@@ -166,125 +165,125 @@ int64_t Vector3i::distance_squared_to(const Vector3i &p_to) const {
 
 /* Operators */
 
-Vector3i &Vector3i::operator+=(const Vector3i &p_v) {
+constexpr Vector3i &Vector3i::operator+=(const Vector3i &p_v) {
 	x += p_v.x;
 	y += p_v.y;
 	z += p_v.z;
 	return *this;
 }
 
-Vector3i Vector3i::operator+(const Vector3i &p_v) const {
+constexpr Vector3i Vector3i::operator+(const Vector3i &p_v) const {
 	return Vector3i(x + p_v.x, y + p_v.y, z + p_v.z);
 }
 
-Vector3i &Vector3i::operator-=(const Vector3i &p_v) {
+constexpr Vector3i &Vector3i::operator-=(const Vector3i &p_v) {
 	x -= p_v.x;
 	y -= p_v.y;
 	z -= p_v.z;
 	return *this;
 }
 
-Vector3i Vector3i::operator-(const Vector3i &p_v) const {
+constexpr Vector3i Vector3i::operator-(const Vector3i &p_v) const {
 	return Vector3i(x - p_v.x, y - p_v.y, z - p_v.z);
 }
 
-Vector3i &Vector3i::operator*=(const Vector3i &p_v) {
+constexpr Vector3i &Vector3i::operator*=(const Vector3i &p_v) {
 	x *= p_v.x;
 	y *= p_v.y;
 	z *= p_v.z;
 	return *this;
 }
 
-Vector3i Vector3i::operator*(const Vector3i &p_v) const {
+constexpr Vector3i Vector3i::operator*(const Vector3i &p_v) const {
 	return Vector3i(x * p_v.x, y * p_v.y, z * p_v.z);
 }
 
-Vector3i &Vector3i::operator/=(const Vector3i &p_v) {
+constexpr Vector3i &Vector3i::operator/=(const Vector3i &p_v) {
 	x /= p_v.x;
 	y /= p_v.y;
 	z /= p_v.z;
 	return *this;
 }
 
-Vector3i Vector3i::operator/(const Vector3i &p_v) const {
+constexpr Vector3i Vector3i::operator/(const Vector3i &p_v) const {
 	return Vector3i(x / p_v.x, y / p_v.y, z / p_v.z);
 }
 
-Vector3i &Vector3i::operator%=(const Vector3i &p_v) {
+constexpr Vector3i &Vector3i::operator%=(const Vector3i &p_v) {
 	x %= p_v.x;
 	y %= p_v.y;
 	z %= p_v.z;
 	return *this;
 }
 
-Vector3i Vector3i::operator%(const Vector3i &p_v) const {
+constexpr Vector3i Vector3i::operator%(const Vector3i &p_v) const {
 	return Vector3i(x % p_v.x, y % p_v.y, z % p_v.z);
 }
 
-Vector3i &Vector3i::operator*=(int32_t p_scalar) {
+constexpr Vector3i &Vector3i::operator*=(int32_t p_scalar) {
 	x *= p_scalar;
 	y *= p_scalar;
 	z *= p_scalar;
 	return *this;
 }
 
-Vector3i Vector3i::operator*(int32_t p_scalar) const {
+constexpr Vector3i Vector3i::operator*(int32_t p_scalar) const {
 	return Vector3i(x * p_scalar, y * p_scalar, z * p_scalar);
 }
 
 // Multiplication operators required to workaround issues with LLVM using implicit conversion.
 
-_FORCE_INLINE_ Vector3i operator*(int32_t p_scalar, const Vector3i &p_vector) {
+constexpr Vector3i operator*(int32_t p_scalar, const Vector3i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector3i operator*(int64_t p_scalar, const Vector3i &p_vector) {
+constexpr Vector3i operator*(int64_t p_scalar, const Vector3i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector3i operator*(float p_scalar, const Vector3i &p_vector) {
+constexpr Vector3i operator*(float p_scalar, const Vector3i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector3i operator*(double p_scalar, const Vector3i &p_vector) {
+constexpr Vector3i operator*(double p_scalar, const Vector3i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-Vector3i &Vector3i::operator/=(int32_t p_scalar) {
+constexpr Vector3i &Vector3i::operator/=(int32_t p_scalar) {
 	x /= p_scalar;
 	y /= p_scalar;
 	z /= p_scalar;
 	return *this;
 }
 
-Vector3i Vector3i::operator/(int32_t p_scalar) const {
+constexpr Vector3i Vector3i::operator/(int32_t p_scalar) const {
 	return Vector3i(x / p_scalar, y / p_scalar, z / p_scalar);
 }
 
-Vector3i &Vector3i::operator%=(int32_t p_scalar) {
+constexpr Vector3i &Vector3i::operator%=(int32_t p_scalar) {
 	x %= p_scalar;
 	y %= p_scalar;
 	z %= p_scalar;
 	return *this;
 }
 
-Vector3i Vector3i::operator%(int32_t p_scalar) const {
+constexpr Vector3i Vector3i::operator%(int32_t p_scalar) const {
 	return Vector3i(x % p_scalar, y % p_scalar, z % p_scalar);
 }
 
-Vector3i Vector3i::operator-() const {
+constexpr Vector3i Vector3i::operator-() const {
 	return Vector3i(-x, -y, -z);
 }
 
-bool Vector3i::operator==(const Vector3i &p_v) const {
+constexpr bool Vector3i::operator==(const Vector3i &p_v) const {
 	return (x == p_v.x && y == p_v.y && z == p_v.z);
 }
 
-bool Vector3i::operator!=(const Vector3i &p_v) const {
+constexpr bool Vector3i::operator!=(const Vector3i &p_v) const {
 	return (x != p_v.x || y != p_v.y || z != p_v.z);
 }
 
-bool Vector3i::operator<(const Vector3i &p_v) const {
+constexpr bool Vector3i::operator<(const Vector3i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z < p_v.z;
@@ -296,7 +295,7 @@ bool Vector3i::operator<(const Vector3i &p_v) const {
 	}
 }
 
-bool Vector3i::operator>(const Vector3i &p_v) const {
+constexpr bool Vector3i::operator>(const Vector3i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z > p_v.z;
@@ -308,7 +307,7 @@ bool Vector3i::operator>(const Vector3i &p_v) const {
 	}
 }
 
-bool Vector3i::operator<=(const Vector3i &p_v) const {
+constexpr bool Vector3i::operator<=(const Vector3i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z <= p_v.z;
@@ -320,7 +319,7 @@ bool Vector3i::operator<=(const Vector3i &p_v) const {
 	}
 }
 
-bool Vector3i::operator>=(const Vector3i &p_v) const {
+constexpr bool Vector3i::operator>=(const Vector3i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			return z >= p_v.z;
@@ -336,4 +335,5 @@ void Vector3i::zero() {
 	x = y = z = 0;
 }
 
-#endif // VECTOR3I_H
+template <>
+struct is_zero_constructible<Vector3i> : std::true_type {};
diff --git a/engine/core/math/vector4.cpp b/engine/core/math/vector4.cpp
index 8ac2c4bf..e4fa1769 100644
--- a/engine/core/math/vector4.cpp
+++ b/engine/core/math/vector4.cpp
@@ -62,6 +62,10 @@ bool Vector4::is_equal_approx(const Vector4 &p_vec4) const {
 	return Math::is_equal_approx(x, p_vec4.x) && Math::is_equal_approx(y, p_vec4.y) && Math::is_equal_approx(z, p_vec4.z) && Math::is_equal_approx(w, p_vec4.w);
 }
 
+bool Vector4::is_same(const Vector4 &p_vec4) const {
+	return Math::is_same(x, p_vec4.x) && Math::is_same(y, p_vec4.y) && Math::is_same(z, p_vec4.z) && Math::is_same(w, p_vec4.w);
+}
+
 bool Vector4::is_zero_approx() const {
 	return Math::is_zero_approx(x) && Math::is_zero_approx(y) && Math::is_zero_approx(z) && Math::is_zero_approx(w);
 }
diff --git a/engine/core/math/vector4.h b/engine/core/math/vector4.h
index 9197e358..c8356413 100644
--- a/engine/core/math/vector4.h
+++ b/engine/core/math/vector4.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VECTOR4_H
-#define VECTOR4_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/math_defs.h"
@@ -49,6 +48,7 @@ struct [[nodiscard]] Vector4 {
 	};
 
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
 			real_t x;
 			real_t y;
@@ -56,6 +56,7 @@ struct [[nodiscard]] Vector4 {
 			real_t w;
 		};
 		real_t coord[4] = { 0, 0, 0, 0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_FORCE_INLINE_ real_t &operator[](int p_axis) {
@@ -89,6 +90,7 @@ struct [[nodiscard]] Vector4 {
 	_FORCE_INLINE_ real_t length_squared() const;
 	bool is_equal_approx(const Vector4 &p_vec4) const;
 	bool is_zero_approx() const;
+	bool is_same(const Vector4 &p_vec4) const;
 	bool is_finite() const;
 	real_t length() const;
 	void normalize();
@@ -120,37 +122,34 @@ struct [[nodiscard]] Vector4 {
 	Vector4 inverse() const;
 	_FORCE_INLINE_ real_t dot(const Vector4 &p_vec4) const;
 
-	_FORCE_INLINE_ void operator+=(const Vector4 &p_vec4);
-	_FORCE_INLINE_ void operator-=(const Vector4 &p_vec4);
-	_FORCE_INLINE_ void operator*=(const Vector4 &p_vec4);
-	_FORCE_INLINE_ void operator/=(const Vector4 &p_vec4);
-	_FORCE_INLINE_ void operator*=(real_t p_s);
-	_FORCE_INLINE_ void operator/=(real_t p_s);
-	_FORCE_INLINE_ Vector4 operator+(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ Vector4 operator-(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ Vector4 operator*(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ Vector4 operator/(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ Vector4 operator-() const;
-	_FORCE_INLINE_ Vector4 operator*(real_t p_s) const;
-	_FORCE_INLINE_ Vector4 operator/(real_t p_s) const;
+	constexpr void operator+=(const Vector4 &p_vec4);
+	constexpr void operator-=(const Vector4 &p_vec4);
+	constexpr void operator*=(const Vector4 &p_vec4);
+	constexpr void operator/=(const Vector4 &p_vec4);
+	constexpr void operator*=(real_t p_s);
+	constexpr void operator/=(real_t p_s);
+	constexpr Vector4 operator+(const Vector4 &p_vec4) const;
+	constexpr Vector4 operator-(const Vector4 &p_vec4) const;
+	constexpr Vector4 operator*(const Vector4 &p_vec4) const;
+	constexpr Vector4 operator/(const Vector4 &p_vec4) const;
+	constexpr Vector4 operator-() const;
+	constexpr Vector4 operator*(real_t p_s) const;
+	constexpr Vector4 operator/(real_t p_s) const;
 
-	_FORCE_INLINE_ bool operator==(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ bool operator!=(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ bool operator>(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ bool operator<(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ bool operator>=(const Vector4 &p_vec4) const;
-	_FORCE_INLINE_ bool operator<=(const Vector4 &p_vec4) const;
+	constexpr bool operator==(const Vector4 &p_vec4) const;
+	constexpr bool operator!=(const Vector4 &p_vec4) const;
+	constexpr bool operator>(const Vector4 &p_vec4) const;
+	constexpr bool operator<(const Vector4 &p_vec4) const;
+	constexpr bool operator>=(const Vector4 &p_vec4) const;
+	constexpr bool operator<=(const Vector4 &p_vec4) const;
 
 	operator String() const;
 	operator Vector4i() const;
 
-	_FORCE_INLINE_ Vector4() {}
-	_FORCE_INLINE_ Vector4(real_t p_x, real_t p_y, real_t p_z, real_t p_w) {
-		x = p_x;
-		y = p_y;
-		z = p_z;
-		w = p_w;
-	}
+	constexpr Vector4() :
+			x(0), y(0), z(0), w(0) {}
+	constexpr Vector4(real_t p_x, real_t p_y, real_t p_z, real_t p_w) :
+			x(p_x), y(p_y), z(p_z), w(p_w) {}
 };
 
 real_t Vector4::dot(const Vector4 &p_vec4) const {
@@ -161,81 +160,81 @@ real_t Vector4::length_squared() const {
 	return dot(*this);
 }
 
-void Vector4::operator+=(const Vector4 &p_vec4) {
+constexpr void Vector4::operator+=(const Vector4 &p_vec4) {
 	x += p_vec4.x;
 	y += p_vec4.y;
 	z += p_vec4.z;
 	w += p_vec4.w;
 }
 
-void Vector4::operator-=(const Vector4 &p_vec4) {
+constexpr void Vector4::operator-=(const Vector4 &p_vec4) {
 	x -= p_vec4.x;
 	y -= p_vec4.y;
 	z -= p_vec4.z;
 	w -= p_vec4.w;
 }
 
-void Vector4::operator*=(const Vector4 &p_vec4) {
+constexpr void Vector4::operator*=(const Vector4 &p_vec4) {
 	x *= p_vec4.x;
 	y *= p_vec4.y;
 	z *= p_vec4.z;
 	w *= p_vec4.w;
 }
 
-void Vector4::operator/=(const Vector4 &p_vec4) {
+constexpr void Vector4::operator/=(const Vector4 &p_vec4) {
 	x /= p_vec4.x;
 	y /= p_vec4.y;
 	z /= p_vec4.z;
 	w /= p_vec4.w;
 }
-void Vector4::operator*=(real_t p_s) {
+constexpr void Vector4::operator*=(real_t p_s) {
 	x *= p_s;
 	y *= p_s;
 	z *= p_s;
 	w *= p_s;
 }
 
-void Vector4::operator/=(real_t p_s) {
-	*this *= 1.0f / p_s;
+constexpr void Vector4::operator/=(real_t p_s) {
+	*this *= (1 / p_s);
 }
 
-Vector4 Vector4::operator+(const Vector4 &p_vec4) const {
+constexpr Vector4 Vector4::operator+(const Vector4 &p_vec4) const {
 	return Vector4(x + p_vec4.x, y + p_vec4.y, z + p_vec4.z, w + p_vec4.w);
 }
 
-Vector4 Vector4::operator-(const Vector4 &p_vec4) const {
+constexpr Vector4 Vector4::operator-(const Vector4 &p_vec4) const {
 	return Vector4(x - p_vec4.x, y - p_vec4.y, z - p_vec4.z, w - p_vec4.w);
 }
 
-Vector4 Vector4::operator*(const Vector4 &p_vec4) const {
+constexpr Vector4 Vector4::operator*(const Vector4 &p_vec4) const {
 	return Vector4(x * p_vec4.x, y * p_vec4.y, z * p_vec4.z, w * p_vec4.w);
 }
 
-Vector4 Vector4::operator/(const Vector4 &p_vec4) const {
+constexpr Vector4 Vector4::operator/(const Vector4 &p_vec4) const {
 	return Vector4(x / p_vec4.x, y / p_vec4.y, z / p_vec4.z, w / p_vec4.w);
 }
 
-Vector4 Vector4::operator-() const {
+constexpr Vector4 Vector4::operator-() const {
 	return Vector4(-x, -y, -z, -w);
 }
 
-Vector4 Vector4::operator*(real_t p_s) const {
+constexpr Vector4 Vector4::operator*(real_t p_s) const {
 	return Vector4(x * p_s, y * p_s, z * p_s, w * p_s);
 }
 
-Vector4 Vector4::operator/(real_t p_s) const {
-	return *this * (1.0f / p_s);
+constexpr Vector4 Vector4::operator/(real_t p_s) const {
+	return *this * (1 / p_s);
 }
 
-bool Vector4::operator==(const Vector4 &p_vec4) const {
+constexpr bool Vector4::operator==(const Vector4 &p_vec4) const {
 	return x == p_vec4.x && y == p_vec4.y && z == p_vec4.z && w == p_vec4.w;
 }
 
-bool Vector4::operator!=(const Vector4 &p_vec4) const {
+constexpr bool Vector4::operator!=(const Vector4 &p_vec4) const {
 	return x != p_vec4.x || y != p_vec4.y || z != p_vec4.z || w != p_vec4.w;
 }
 
-bool Vector4::operator<(const Vector4 &p_v) const {
+constexpr bool Vector4::operator<(const Vector4 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -248,7 +247,7 @@ bool Vector4::operator<(const Vector4 &p_v) const {
 	return x < p_v.x;
 }
 
-bool Vector4::operator>(const Vector4 &p_v) const {
+constexpr bool Vector4::operator>(const Vector4 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -261,7 +260,7 @@ bool Vector4::operator>(const Vector4 &p_v) const {
 	return x > p_v.x;
 }
 
-bool Vector4::operator<=(const Vector4 &p_v) const {
+constexpr bool Vector4::operator<=(const Vector4 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -274,7 +273,7 @@ bool Vector4::operator<=(const Vector4 &p_v) const {
 	return x < p_v.x;
 }
 
-bool Vector4::operator>=(const Vector4 &p_v) const {
+constexpr bool Vector4::operator>=(const Vector4 &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -287,20 +286,21 @@ bool Vector4::operator>=(const Vector4 &p_v) const {
 	return x > p_v.x;
 }
 
-_FORCE_INLINE_ Vector4 operator*(float p_scalar, const Vector4 &p_vec) {
+constexpr Vector4 operator*(float p_scalar, const Vector4 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector4 operator*(double p_scalar, const Vector4 &p_vec) {
+constexpr Vector4 operator*(double p_scalar, const Vector4 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector4 operator*(int32_t p_scalar, const Vector4 &p_vec) {
+constexpr Vector4 operator*(int32_t p_scalar, const Vector4 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-_FORCE_INLINE_ Vector4 operator*(int64_t p_scalar, const Vector4 &p_vec) {
+constexpr Vector4 operator*(int64_t p_scalar, const Vector4 &p_vec) {
 	return p_vec * p_scalar;
 }
 
-#endif // VECTOR4_H
+template <>
+struct is_zero_constructible<Vector4> : std::true_type {};
diff --git a/engine/core/math/vector4i.h b/engine/core/math/vector4i.h
index a9036d68..56ae3f22 100644
--- a/engine/core/math/vector4i.h
+++ b/engine/core/math/vector4i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VECTOR4I_H
-#define VECTOR4I_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/math_funcs.h"
@@ -48,6 +47,7 @@ struct [[nodiscard]] Vector4i {
 	};
 
 	union {
+		// NOLINTBEGIN(modernize-use-default-member-init)
 		struct {
 			int32_t x;
 			int32_t y;
@@ -56,6 +56,7 @@ struct [[nodiscard]] Vector4i {
 		};
 
 		int32_t coord[4] = { 0 };
+		// NOLINTEND(modernize-use-default-member-init)
 	};
 
 	_FORCE_INLINE_ const int32_t &operator[](int p_axis) const {
@@ -104,44 +105,41 @@ struct [[nodiscard]] Vector4i {
 
 	/* Operators */
 
-	_FORCE_INLINE_ Vector4i &operator+=(const Vector4i &p_v);
-	_FORCE_INLINE_ Vector4i operator+(const Vector4i &p_v) const;
-	_FORCE_INLINE_ Vector4i &operator-=(const Vector4i &p_v);
-	_FORCE_INLINE_ Vector4i operator-(const Vector4i &p_v) const;
-	_FORCE_INLINE_ Vector4i &operator*=(const Vector4i &p_v);
-	_FORCE_INLINE_ Vector4i operator*(const Vector4i &p_v) const;
-	_FORCE_INLINE_ Vector4i &operator/=(const Vector4i &p_v);
-	_FORCE_INLINE_ Vector4i operator/(const Vector4i &p_v) const;
-	_FORCE_INLINE_ Vector4i &operator%=(const Vector4i &p_v);
-	_FORCE_INLINE_ Vector4i operator%(const Vector4i &p_v) const;
+	constexpr Vector4i &operator+=(const Vector4i &p_v);
+	constexpr Vector4i operator+(const Vector4i &p_v) const;
+	constexpr Vector4i &operator-=(const Vector4i &p_v);
+	constexpr Vector4i operator-(const Vector4i &p_v) const;
+	constexpr Vector4i &operator*=(const Vector4i &p_v);
+	constexpr Vector4i operator*(const Vector4i &p_v) const;
+	constexpr Vector4i &operator/=(const Vector4i &p_v);
+	constexpr Vector4i operator/(const Vector4i &p_v) const;
+	constexpr Vector4i &operator%=(const Vector4i &p_v);
+	constexpr Vector4i operator%(const Vector4i &p_v) const;
 
-	_FORCE_INLINE_ Vector4i &operator*=(int32_t p_scalar);
-	_FORCE_INLINE_ Vector4i operator*(int32_t p_scalar) const;
-	_FORCE_INLINE_ Vector4i &operator/=(int32_t p_scalar);
-	_FORCE_INLINE_ Vector4i operator/(int32_t p_scalar) const;
-	_FORCE_INLINE_ Vector4i &operator%=(int32_t p_scalar);
-	_FORCE_INLINE_ Vector4i operator%(int32_t p_scalar) const;
+	constexpr Vector4i &operator*=(int32_t p_scalar);
+	constexpr Vector4i operator*(int32_t p_scalar) const;
+	constexpr Vector4i &operator/=(int32_t p_scalar);
+	constexpr Vector4i operator/(int32_t p_scalar) const;
+	constexpr Vector4i &operator%=(int32_t p_scalar);
+	constexpr Vector4i operator%(int32_t p_scalar) const;
 
-	_FORCE_INLINE_ Vector4i operator-() const;
+	constexpr Vector4i operator-() const;
 
-	_FORCE_INLINE_ bool operator==(const Vector4i &p_v) const;
-	_FORCE_INLINE_ bool operator!=(const Vector4i &p_v) const;
-	_FORCE_INLINE_ bool operator<(const Vector4i &p_v) const;
-	_FORCE_INLINE_ bool operator<=(const Vector4i &p_v) const;
-	_FORCE_INLINE_ bool operator>(const Vector4i &p_v) const;
-	_FORCE_INLINE_ bool operator>=(const Vector4i &p_v) const;
+	constexpr bool operator==(const Vector4i &p_v) const;
+	constexpr bool operator!=(const Vector4i &p_v) const;
+	constexpr bool operator<(const Vector4i &p_v) const;
+	constexpr bool operator<=(const Vector4i &p_v) const;
+	constexpr bool operator>(const Vector4i &p_v) const;
+	constexpr bool operator>=(const Vector4i &p_v) const;
 
 	operator String() const;
 	operator Vector4() const;
 
-	_FORCE_INLINE_ Vector4i() {}
+	constexpr Vector4i() :
+			x(0), y(0), z(0), w(0) {}
 	Vector4i(const Vector4 &p_vec4);
-	_FORCE_INLINE_ Vector4i(int32_t p_x, int32_t p_y, int32_t p_z, int32_t p_w) {
-		x = p_x;
-		y = p_y;
-		z = p_z;
-		w = p_w;
-	}
+	constexpr Vector4i(int32_t p_x, int32_t p_y, int32_t p_z, int32_t p_w) :
+			x(p_x), y(p_y), z(p_z), w(p_w) {}
 };
 
 int64_t Vector4i::length_squared() const {
@@ -170,7 +168,7 @@ Vector4i Vector4i::sign() const {
 
 /* Operators */
 
-Vector4i &Vector4i::operator+=(const Vector4i &p_v) {
+constexpr Vector4i &Vector4i::operator+=(const Vector4i &p_v) {
 	x += p_v.x;
 	y += p_v.y;
 	z += p_v.z;
@@ -178,11 +176,11 @@ Vector4i &Vector4i::operator+=(const Vector4i &p_v) {
 	return *this;
 }
 
-Vector4i Vector4i::operator+(const Vector4i &p_v) const {
+constexpr Vector4i Vector4i::operator+(const Vector4i &p_v) const {
 	return Vector4i(x + p_v.x, y + p_v.y, z + p_v.z, w + p_v.w);
 }
 
-Vector4i &Vector4i::operator-=(const Vector4i &p_v) {
+constexpr Vector4i &Vector4i::operator-=(const Vector4i &p_v) {
 	x -= p_v.x;
 	y -= p_v.y;
 	z -= p_v.z;
@@ -190,11 +188,11 @@ Vector4i &Vector4i::operator-=(const Vector4i &p_v) {
 	return *this;
 }
 
-Vector4i Vector4i::operator-(const Vector4i &p_v) const {
+constexpr Vector4i Vector4i::operator-(const Vector4i &p_v) const {
 	return Vector4i(x - p_v.x, y - p_v.y, z - p_v.z, w - p_v.w);
 }
 
-Vector4i &Vector4i::operator*=(const Vector4i &p_v) {
+constexpr Vector4i &Vector4i::operator*=(const Vector4i &p_v) {
 	x *= p_v.x;
 	y *= p_v.y;
 	z *= p_v.z;
@@ -202,11 +200,11 @@ Vector4i &Vector4i::operator*=(const Vector4i &p_v) {
 	return *this;
 }
 
-Vector4i Vector4i::operator*(const Vector4i &p_v) const {
+constexpr Vector4i Vector4i::operator*(const Vector4i &p_v) const {
 	return Vector4i(x * p_v.x, y * p_v.y, z * p_v.z, w * p_v.w);
 }
 
-Vector4i &Vector4i::operator/=(const Vector4i &p_v) {
+constexpr Vector4i &Vector4i::operator/=(const Vector4i &p_v) {
 	x /= p_v.x;
 	y /= p_v.y;
 	z /= p_v.z;
@@ -214,11 +212,11 @@ Vector4i &Vector4i::operator/=(const Vector4i &p_v) {
 	return *this;
 }
 
-Vector4i Vector4i::operator/(const Vector4i &p_v) const {
+constexpr Vector4i Vector4i::operator/(const Vector4i &p_v) const {
 	return Vector4i(x / p_v.x, y / p_v.y, z / p_v.z, w / p_v.w);
 }
 
-Vector4i &Vector4i::operator%=(const Vector4i &p_v) {
+constexpr Vector4i &Vector4i::operator%=(const Vector4i &p_v) {
 	x %= p_v.x;
 	y %= p_v.y;
 	z %= p_v.z;
@@ -226,11 +224,11 @@ Vector4i &Vector4i::operator%=(const Vector4i &p_v) {
 	return *this;
 }
 
-Vector4i Vector4i::operator%(const Vector4i &p_v) const {
+constexpr Vector4i Vector4i::operator%(const Vector4i &p_v) const {
 	return Vector4i(x % p_v.x, y % p_v.y, z % p_v.z, w % p_v.w);
 }
 
-Vector4i &Vector4i::operator*=(int32_t p_scalar) {
+constexpr Vector4i &Vector4i::operator*=(int32_t p_scalar) {
 	x *= p_scalar;
 	y *= p_scalar;
 	z *= p_scalar;
@@ -238,29 +236,29 @@ Vector4i &Vector4i::operator*=(int32_t p_scalar) {
 	return *this;
 }
 
-Vector4i Vector4i::operator*(int32_t p_scalar) const {
+constexpr Vector4i Vector4i::operator*(int32_t p_scalar) const {
 	return Vector4i(x * p_scalar, y * p_scalar, z * p_scalar, w * p_scalar);
 }
 
 // Multiplication operators required to workaround issues with LLVM using implicit conversion.
 
-_FORCE_INLINE_ Vector4i operator*(int32_t p_scalar, const Vector4i &p_vector) {
+constexpr Vector4i operator*(int32_t p_scalar, const Vector4i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector4i operator*(int64_t p_scalar, const Vector4i &p_vector) {
+constexpr Vector4i operator*(int64_t p_scalar, const Vector4i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector4i operator*(float p_scalar, const Vector4i &p_vector) {
+constexpr Vector4i operator*(float p_scalar, const Vector4i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-_FORCE_INLINE_ Vector4i operator*(double p_scalar, const Vector4i &p_vector) {
+constexpr Vector4i operator*(double p_scalar, const Vector4i &p_vector) {
 	return p_vector * p_scalar;
 }
 
-Vector4i &Vector4i::operator/=(int32_t p_scalar) {
+constexpr Vector4i &Vector4i::operator/=(int32_t p_scalar) {
 	x /= p_scalar;
 	y /= p_scalar;
 	z /= p_scalar;
@@ -268,11 +266,11 @@ Vector4i &Vector4i::operator/=(int32_t p_scalar) {
 	return *this;
 }
 
-Vector4i Vector4i::operator/(int32_t p_scalar) const {
+constexpr Vector4i Vector4i::operator/(int32_t p_scalar) const {
 	return Vector4i(x / p_scalar, y / p_scalar, z / p_scalar, w / p_scalar);
 }
 
-Vector4i &Vector4i::operator%=(int32_t p_scalar) {
+constexpr Vector4i &Vector4i::operator%=(int32_t p_scalar) {
 	x %= p_scalar;
 	y %= p_scalar;
 	z %= p_scalar;
@@ -280,23 +278,23 @@ Vector4i &Vector4i::operator%=(int32_t p_scalar) {
 	return *this;
 }
 
-Vector4i Vector4i::operator%(int32_t p_scalar) const {
+constexpr Vector4i Vector4i::operator%(int32_t p_scalar) const {
 	return Vector4i(x % p_scalar, y % p_scalar, z % p_scalar, w % p_scalar);
 }
 
-Vector4i Vector4i::operator-() const {
+constexpr Vector4i Vector4i::operator-() const {
 	return Vector4i(-x, -y, -z, -w);
 }
 
-bool Vector4i::operator==(const Vector4i &p_v) const {
+constexpr bool Vector4i::operator==(const Vector4i &p_v) const {
 	return (x == p_v.x && y == p_v.y && z == p_v.z && w == p_v.w);
 }
 
-bool Vector4i::operator!=(const Vector4i &p_v) const {
+constexpr bool Vector4i::operator!=(const Vector4i &p_v) const {
 	return (x != p_v.x || y != p_v.y || z != p_v.z || w != p_v.w);
 }
 
-bool Vector4i::operator<(const Vector4i &p_v) const {
+constexpr bool Vector4i::operator<(const Vector4i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -312,7 +310,7 @@ bool Vector4i::operator<(const Vector4i &p_v) const {
 	}
 }
 
-bool Vector4i::operator>(const Vector4i &p_v) const {
+constexpr bool Vector4i::operator>(const Vector4i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -328,7 +326,7 @@ bool Vector4i::operator>(const Vector4i &p_v) const {
 	}
 }
 
-bool Vector4i::operator<=(const Vector4i &p_v) const {
+constexpr bool Vector4i::operator<=(const Vector4i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -344,7 +342,7 @@ bool Vector4i::operator<=(const Vector4i &p_v) const {
 	}
 }
 
-bool Vector4i::operator>=(const Vector4i &p_v) const {
+constexpr bool Vector4i::operator>=(const Vector4i &p_v) const {
 	if (x == p_v.x) {
 		if (y == p_v.y) {
 			if (z == p_v.z) {
@@ -364,4 +362,5 @@ void Vector4i::zero() {
 	x = y = z = w = 0;
 }
 
-#endif // VECTOR4I_H
+template <>
+struct is_zero_constructible<Vector4i> : std::true_type {};
diff --git a/engine/core/object/callable_method_pointer.h b/engine/core/object/callable_method_pointer.h
index a12db51c..7462316d 100644
--- a/engine/core/object/callable_method_pointer.h
+++ b/engine/core/object/callable_method_pointer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CALLABLE_METHOD_POINTER_H
-#define CALLABLE_METHOD_POINTER_H
+#pragma once
 
 #include "core/object/object.h"
 #include "core/variant/binder_common.h"
@@ -82,8 +81,7 @@ class CallableCustomMethodPointer : public CallableCustomMethodPointerBase {
 	struct Data {
 		T *instance;
 		uint64_t object_id;
-		R(T::*method)
-		(P...);
+		R (T::*method)(P...);
 	} data;
 
 public:
@@ -152,8 +150,7 @@ class CallableCustomMethodPointerC : public CallableCustomMethodPointerBase {
 	struct Data {
 		T *instance;
 		uint64_t object_id;
-		R(T::*method)
-		(P...) const;
+		R (T::*method)(P...) const;
 	} data;
 
 public:
@@ -226,8 +223,7 @@ Callable create_custom_callable_function_pointer(T *p_instance,
 template <typename R, typename... P>
 class CallableCustomStaticMethodPointer : public CallableCustomMethodPointerBase {
 	struct Data {
-		R(*method)
-		(P...);
+		R (*method)(P...);
 	} data;
 
 public:
@@ -292,5 +288,3 @@ Callable create_custom_callable_static_function_pointer(
 #else
 #define callable_mp_static(M) create_custom_callable_static_function_pointer(M)
 #endif
-
-#endif // CALLABLE_METHOD_POINTER_H
diff --git a/engine/core/object/class_db.cpp b/engine/core/object/class_db.cpp
index e6536fe8..fbc5fcda 100644
--- a/engine/core/object/class_db.cpp
+++ b/engine/core/object/class_db.cpp
@@ -35,9 +35,6 @@
 #include "core/object/script_language.h"
 #include "core/version.h"
 
-#define OBJTYPE_RLOCK RWLockRead _rw_lockr_(lock);
-#define OBJTYPE_WLOCK RWLockWrite _rw_lockw_(lock);
-
 #ifdef DEBUG_METHODS_ENABLED
 
 MethodDefinition D_METHODP(const char *p_name, const char *const **p_args, uint32_t p_argcount) {
@@ -238,13 +235,13 @@ bool ClassDB::_is_parent_class(const StringName &p_class, const StringName &p_in
 }
 
 bool ClassDB::is_parent_class(const StringName &p_class, const StringName &p_inherits) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	return _is_parent_class(p_class, p_inherits);
 }
 
 void ClassDB::get_class_list(List<StringName> *p_classes) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
 		p_classes->push_back(E.key);
@@ -255,7 +252,7 @@ void ClassDB::get_class_list(List<StringName> *p_classes) {
 
 #ifdef TOOLS_ENABLED
 void ClassDB::get_extensions_class_list(List<StringName> *p_classes) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
 		if (E.value.api != API_EXTENSION && E.value.api != API_EDITOR_EXTENSION) {
@@ -268,7 +265,7 @@ void ClassDB::get_extensions_class_list(List<StringName> *p_classes) {
 }
 
 void ClassDB::get_extension_class_list(const Ref<GDExtension> &p_extension, List<StringName> *p_classes) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
 		if (E.value.api != API_EXTENSION && E.value.api != API_EDITOR_EXTENSION) {
@@ -284,28 +281,28 @@ void ClassDB::get_extension_class_list(const Ref<GDExtension> &p_extension, List
 }
 #endif
 
-void ClassDB::get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) {
-	OBJTYPE_RLOCK;
+void ClassDB::get_inheriters_from_class(const StringName &p_class, LocalVector<StringName> &p_classes) {
+	Locker::Lock lock(Locker::STATE_READ);
 
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
 		if (E.key != p_class && _is_parent_class(E.key, p_class)) {
-			p_classes->push_back(E.key);
+			p_classes.push_back(E.key);
 		}
 	}
 }
 
 void ClassDB::get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
-		if (E.key != p_class && _get_parent_class(E.key) == p_class) {
+		if (E.value.inherits == p_class) {
 			p_classes->push_back(E.key);
 		}
 	}
 }
 
 StringName ClassDB::get_parent_class_nocheck(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *ti = classes.getptr(p_class);
 	if (!ti) {
@@ -315,7 +312,7 @@ StringName ClassDB::get_parent_class_nocheck(const StringName &p_class) {
 }
 
 bool ClassDB::get_inheritance_chain_nocheck(const StringName &p_class, Vector<StringName> &r_result) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *start = classes.getptr(p_class);
 	if (!start) {
@@ -356,13 +353,13 @@ StringName ClassDB::_get_parent_class(const StringName &p_class) {
 }
 
 StringName ClassDB::get_parent_class(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	return _get_parent_class(p_class);
 }
 
 ClassDB::APIType ClassDB::get_api_type(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *ti = classes.getptr(p_class);
 
@@ -372,13 +369,13 @@ ClassDB::APIType ClassDB::get_api_type(const StringName &p_class) {
 
 uint32_t ClassDB::get_api_hash(APIType p_api) {
 #ifdef DEBUG_METHODS_ENABLED
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 	if (api_hashes_cache.has(p_api)) {
 		return api_hashes_cache[p_api];
 	}
 
-	uint64_t hash = hash_murmur3_one_64(HashMapHasherDefault::hash(VERSION_FULL_CONFIG));
+	uint64_t hash = hash_murmur3_one_64(HashMapHasherDefault::hash(GODOT_VERSION_FULL_CONFIG));
 
 	List<StringName> class_list;
 	for (const KeyValue<StringName, ClassInfo> &E : classes) {
@@ -520,12 +517,12 @@ uint32_t ClassDB::get_api_hash(APIType p_api) {
 }
 
 bool ClassDB::class_exists(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 	return classes.has(p_class);
 }
 
 void ClassDB::add_compatibility_class(const StringName &p_class, const StringName &p_fallback) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	compat_classes[p_class] = p_fallback;
 }
 
@@ -536,18 +533,21 @@ StringName ClassDB::get_compatibility_class(const StringName &p_class) {
 	return StringName();
 }
 
-Object *ClassDB::_instantiate_internal(const StringName &p_class, bool p_require_real_class, bool p_notify_postinitialize) {
+Object *ClassDB::_instantiate_internal(const StringName &p_class, bool p_require_real_class, bool p_notify_postinitialize, bool p_exposed_only) {
 	ClassInfo *ti;
 	{
-		OBJTYPE_RLOCK;
+		Locker::Lock lock(Locker::STATE_READ);
 		ti = classes.getptr(p_class);
-		if (!_can_instantiate(ti)) {
+		if (!_can_instantiate(ti, p_exposed_only)) {
 			if (compat_classes.has(p_class)) {
 				ti = classes.getptr(compat_classes[p_class]);
 			}
 		}
 		ERR_FAIL_NULL_V_MSG(ti, nullptr, vformat("Cannot get class '%s'.", String(p_class)));
 		ERR_FAIL_COND_V_MSG(ti->disabled, nullptr, vformat("Class '%s' is disabled.", String(p_class)));
+		if (p_exposed_only) {
+			ERR_FAIL_COND_V_MSG(!ti->exposed, nullptr, vformat("Class '%s' isn't exposed.", String(p_class)));
+		}
 		ERR_FAIL_NULL_V_MSG(ti->creation_func, nullptr, vformat("Class '%s' or its base class cannot be instantiated.", String(p_class)));
 	}
 
@@ -599,11 +599,15 @@ Object *ClassDB::_instantiate_internal(const StringName &p_class, bool p_require
 	}
 }
 
-bool ClassDB::_can_instantiate(ClassInfo *p_class_info) {
+bool ClassDB::_can_instantiate(ClassInfo *p_class_info, bool p_exposed_only) {
 	if (!p_class_info) {
 		return false;
 	}
 
+	if (p_exposed_only && !p_class_info->exposed) {
+		return false;
+	}
+
 	if (p_class_info->disabled || !p_class_info->creation_func) {
 		return false;
 	}
@@ -645,7 +649,7 @@ ObjectGDExtension *ClassDB::get_placeholder_extension(const StringName &p_class)
 
 	ClassInfo *ti;
 	{
-		OBJTYPE_RLOCK;
+		Locker::Lock lock(Locker::STATE_READ);
 		ti = classes.getptr(p_class);
 		if (!_can_instantiate(ti)) {
 			if (compat_classes.has(p_class)) {
@@ -730,7 +734,7 @@ void ClassDB::set_object_extension_instance(Object *p_object, const StringName &
 	ERR_FAIL_NULL(p_object);
 	ClassInfo *ti;
 	{
-		OBJTYPE_RLOCK;
+		Locker::Lock lock(Locker::STATE_READ);
 		ti = classes.getptr(p_class);
 		if (!_can_instantiate(ti)) {
 			if (compat_classes.has(p_class)) {
@@ -755,7 +759,7 @@ void ClassDB::set_object_extension_instance(Object *p_object, const StringName &
 bool ClassDB::can_instantiate(const StringName &p_class) {
 	String script_path;
 	{
-		OBJTYPE_RLOCK;
+		Locker::Lock lock(Locker::STATE_READ);
 
 		ClassInfo *ti = classes.getptr(p_class);
 		if (!ti) {
@@ -781,7 +785,7 @@ use_script:
 bool ClassDB::is_abstract(const StringName &p_class) {
 	String script_path;
 	{
-		OBJTYPE_RLOCK;
+		Locker::Lock lock(Locker::STATE_READ);
 
 		ClassInfo *ti = classes.getptr(p_class);
 		if (!ti) {
@@ -813,7 +817,7 @@ use_script:
 bool ClassDB::is_virtual(const StringName &p_class) {
 	String script_path;
 	{
-		OBJTYPE_RLOCK;
+		Locker::Lock lock(Locker::STATE_READ);
 
 		ClassInfo *ti = classes.getptr(p_class);
 		if (!ti) {
@@ -836,8 +840,8 @@ use_script:
 	return scr.is_valid() && scr->is_valid() && scr->is_abstract();
 }
 
-void ClassDB::_add_class2(const StringName &p_class, const StringName &p_inherits) {
-	OBJTYPE_WLOCK;
+void ClassDB::_add_class(const StringName &p_class, const StringName &p_inherits) {
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 	const StringName &name = p_class;
 
@@ -880,7 +884,7 @@ static MethodInfo info_from_bind(MethodBind *p_method) {
 }
 
 void ClassDB::get_method_list(const StringName &p_class, List<MethodInfo> *p_methods, bool p_no_inheritance, bool p_exclude_from_properties) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -926,7 +930,7 @@ void ClassDB::get_method_list(const StringName &p_class, List<MethodInfo> *p_met
 }
 
 void ClassDB::get_method_list_with_compatibility(const StringName &p_class, List<Pair<MethodInfo, uint32_t>> *p_methods, bool p_no_inheritance, bool p_exclude_from_properties) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -986,7 +990,7 @@ void ClassDB::get_method_list_with_compatibility(const StringName &p_class, List
 }
 
 bool ClassDB::get_method_info(const StringName &p_class, const StringName &p_method, MethodInfo *r_info, bool p_no_inheritance, bool p_exclude_from_properties) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1036,7 +1040,7 @@ bool ClassDB::get_method_info(const StringName &p_class, const StringName &p_met
 }
 
 MethodBind *ClassDB::get_method(const StringName &p_class, const StringName &p_name) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1051,7 +1055,7 @@ MethodBind *ClassDB::get_method(const StringName &p_class, const StringName &p_n
 }
 
 Vector<uint32_t> ClassDB::get_method_compatibility_hashes(const StringName &p_class, const StringName &p_name) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1070,7 +1074,7 @@ Vector<uint32_t> ClassDB::get_method_compatibility_hashes(const StringName &p_cl
 }
 
 MethodBind *ClassDB::get_method_with_compatibility(const StringName &p_class, const StringName &p_name, uint64_t p_hash, bool *r_method_exists, bool *r_is_deprecated) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1105,7 +1109,7 @@ MethodBind *ClassDB::get_method_with_compatibility(const StringName &p_class, co
 }
 
 void ClassDB::bind_integer_constant(const StringName &p_class, const StringName &p_enum, const StringName &p_name, int64_t p_constant, bool p_is_bitfield) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1142,7 +1146,7 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
 }
 
 void ClassDB::get_integer_constant_list(const StringName &p_class, List<String> *p_constants, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1167,7 +1171,7 @@ void ClassDB::get_integer_constant_list(const StringName &p_class, List<String>
 }
 
 int64_t ClassDB::get_integer_constant(const StringName &p_class, const StringName &p_name, bool *p_success) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1191,7 +1195,7 @@ int64_t ClassDB::get_integer_constant(const StringName &p_class, const StringNam
 }
 
 bool ClassDB::has_integer_constant(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1210,7 +1214,7 @@ bool ClassDB::has_integer_constant(const StringName &p_class, const StringName &
 }
 
 StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1234,7 +1238,7 @@ StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const S
 }
 
 void ClassDB::get_enum_list(const StringName &p_class, List<StringName> *p_enums, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1252,7 +1256,7 @@ void ClassDB::get_enum_list(const StringName &p_class, List<StringName> *p_enums
 }
 
 void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_enum, List<StringName> *p_constants, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1275,7 +1279,7 @@ void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_
 
 void ClassDB::set_method_error_return_values(const StringName &p_class, const StringName &p_method, const Vector<Error> &p_values) {
 #ifdef DEBUG_METHODS_ENABLED
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	ClassInfo *type = classes.getptr(p_class);
 
 	ERR_FAIL_NULL(type);
@@ -1286,7 +1290,7 @@ void ClassDB::set_method_error_return_values(const StringName &p_class, const St
 
 Vector<Error> ClassDB::get_method_error_return_values(const StringName &p_class, const StringName &p_method) {
 #ifdef DEBUG_METHODS_ENABLED
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 	ClassInfo *type = classes.getptr(p_class);
 
 	ERR_FAIL_NULL_V(type, Vector<Error>());
@@ -1301,7 +1305,7 @@ Vector<Error> ClassDB::get_method_error_return_values(const StringName &p_class,
 }
 
 bool ClassDB::has_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1320,7 +1324,7 @@ bool ClassDB::has_enum(const StringName &p_class, const StringName &p_name, bool
 }
 
 bool ClassDB::is_enum_bitfield(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1339,7 +1343,7 @@ bool ClassDB::is_enum_bitfield(const StringName &p_class, const StringName &p_na
 }
 
 void ClassDB::add_signal(const StringName &p_class, const MethodInfo &p_signal) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
@@ -1358,7 +1362,7 @@ void ClassDB::add_signal(const StringName &p_class, const MethodInfo &p_signal)
 }
 
 void ClassDB::get_signal_list(const StringName &p_class, List<MethodInfo> *p_signals, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
@@ -1379,7 +1383,7 @@ void ClassDB::get_signal_list(const StringName &p_class, List<MethodInfo> *p_sig
 }
 
 bool ClassDB::has_signal(const StringName &p_class, const StringName &p_signal, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 	ClassInfo *type = classes.getptr(p_class);
 	ClassInfo *check = type;
 	while (check) {
@@ -1396,7 +1400,7 @@ bool ClassDB::has_signal(const StringName &p_class, const StringName &p_signal,
 }
 
 bool ClassDB::get_signal(const StringName &p_class, const StringName &p_signal, MethodInfo *r_signal) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 	ClassInfo *type = classes.getptr(p_class);
 	ClassInfo *check = type;
 	while (check) {
@@ -1413,7 +1417,7 @@ bool ClassDB::get_signal(const StringName &p_class, const StringName &p_signal,
 }
 
 void ClassDB::add_property_group(const StringName &p_class, const String &p_name, const String &p_prefix, int p_indent_depth) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
 
@@ -1426,7 +1430,7 @@ void ClassDB::add_property_group(const StringName &p_class, const String &p_name
 }
 
 void ClassDB::add_property_subgroup(const StringName &p_class, const String &p_name, const String &p_prefix, int p_indent_depth) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
 
@@ -1443,7 +1447,7 @@ void ClassDB::add_property_array_count(const StringName &p_class, const String &
 }
 
 void ClassDB::add_property_array(const StringName &p_class, const StringName &p_path, const String &p_array_element_prefix) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
 
@@ -1452,9 +1456,9 @@ void ClassDB::add_property_array(const StringName &p_class, const StringName &p_
 
 // NOTE: For implementation simplicity reasons, this method doesn't allow setters to have optional arguments at the end.
 void ClassDB::add_property(const StringName &p_class, const PropertyInfo &p_pinfo, const StringName &p_setter, const StringName &p_getter, int p_index) {
-	lock.read_lock();
+	Locker::Lock lock(Locker::STATE_WRITE);
+
 	ClassInfo *type = classes.getptr(p_class);
-	lock.read_unlock();
 
 	ERR_FAIL_NULL(type);
 
@@ -1486,8 +1490,6 @@ void ClassDB::add_property(const StringName &p_class, const PropertyInfo &p_pinf
 	ERR_FAIL_COND_MSG(type->property_setget.has(p_pinfo.name), vformat("Object '%s' already has property '%s'.", p_class, p_pinfo.name));
 #endif
 
-	OBJTYPE_WLOCK
-
 	type->property_list.push_back(p_pinfo);
 	type->property_map[p_pinfo.name] = p_pinfo;
 #ifdef DEBUG_METHODS_ENABLED
@@ -1518,7 +1520,7 @@ void ClassDB::set_property_default_value(const StringName &p_class, const String
 
 void ClassDB::add_linked_property(const StringName &p_class, const String &p_property, const String &p_linked_property) {
 #ifdef TOOLS_ENABLED
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	ClassInfo *type = classes.getptr(p_class);
 	ERR_FAIL_NULL(type);
 
@@ -1534,7 +1536,7 @@ void ClassDB::add_linked_property(const StringName &p_class, const String &p_pro
 }
 
 void ClassDB::get_property_list(const StringName &p_class, List<PropertyInfo> *p_list, bool p_no_inheritance, const Object *p_validator) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 	ClassInfo *check = type;
@@ -1577,7 +1579,7 @@ void ClassDB::get_linked_properties_info(const StringName &p_class, const String
 }
 
 bool ClassDB::get_property_info(const StringName &p_class, const StringName &p_property, PropertyInfo *r_info, bool p_no_inheritance, const Object *p_validator) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *check = classes.getptr(p_class);
 	while (check) {
@@ -1800,7 +1802,7 @@ bool ClassDB::has_property(const StringName &p_class, const StringName &p_proper
 }
 
 void ClassDB::set_method_flags(const StringName &p_class, const StringName &p_method, int p_flags) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	ClassInfo *type = classes.getptr(p_class);
 	ClassInfo *check = type;
 	ERR_FAIL_NULL(check);
@@ -1825,7 +1827,7 @@ bool ClassDB::has_method(const StringName &p_class, const StringName &p_method,
 }
 
 int ClassDB::get_method_argument_count(const StringName &p_class, const StringName &p_method, bool *r_is_valid, bool p_no_inheritance) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -1864,7 +1866,7 @@ void ClassDB::_bind_compatibility(ClassInfo *type, MethodBind *p_method) {
 }
 
 void ClassDB::_bind_method_custom(const StringName &p_class, MethodBind *p_method, bool p_compatibility) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 	StringName method_name = p_method->get_name();
 
@@ -1933,7 +1935,7 @@ MethodBind *ClassDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind, bool p_
 	StringName mdname = StaticCString::create(method_name);
 #endif
 
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 	ERR_FAIL_NULL_V(p_bind, nullptr);
 	p_bind->set_name(mdname);
 
@@ -1996,7 +1998,7 @@ MethodBind *ClassDB::bind_methodfi(uint32_t p_flags, MethodBind *p_bind, bool p_
 void ClassDB::add_virtual_method(const StringName &p_class, const MethodInfo &p_method, bool p_virtual, const Vector<String> &p_arg_names, bool p_object_core) {
 	ERR_FAIL_COND_MSG(!classes.has(p_class), vformat("Request for nonexistent class '%s'.", p_class));
 
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 #ifdef DEBUG_METHODS_ENABLED
 	MethodInfo mi = p_method;
@@ -2011,9 +2013,8 @@ void ClassDB::add_virtual_method(const StringName &p_class, const MethodInfo &p_
 		if (p_arg_names.size() != mi.arguments.size()) {
 			WARN_PRINT(vformat("Mismatch argument name count for virtual method: '%s::%s'.", String(p_class), p_method.name));
 		} else {
-			List<PropertyInfo>::Iterator itr = mi.arguments.begin();
-			for (int i = 0; i < p_arg_names.size(); ++itr, ++i) {
-				itr->name = p_arg_names[i];
+			for (int64_t i = 0; i < p_arg_names.size(); ++i) {
+				mi.arguments.write[i].name = p_arg_names[i];
 			}
 		}
 	}
@@ -2031,7 +2032,7 @@ void ClassDB::add_virtual_method(const StringName &p_class, const MethodInfo &p_
 void ClassDB::add_virtual_compatibility_method(const StringName &p_class, const MethodInfo &p_method, bool p_virtual, const Vector<String> &p_arg_names, bool p_object_core) {
 	ERR_FAIL_COND_MSG(!classes.has(p_class), vformat("Request for nonexistent class '%s'.", p_class));
 
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 	HashMap<StringName, Vector<uint32_t>> &virtual_methods_compat = classes[p_class].virtual_methods_compat;
 
@@ -2066,7 +2067,7 @@ void ClassDB::get_virtual_methods(const StringName &p_class, List<MethodInfo> *p
 }
 
 Vector<uint32_t> ClassDB::get_virtual_method_compatibility_hashes(const StringName &p_class, const StringName &p_name) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *type = classes.getptr(p_class);
 
@@ -2107,14 +2108,14 @@ void ClassDB::add_extension_class_virtual_method(const StringName &p_class, cons
 }
 
 void ClassDB::set_class_enabled(const StringName &p_class, bool p_enable) {
-	OBJTYPE_WLOCK;
+	Locker::Lock lock(Locker::STATE_WRITE);
 
 	ERR_FAIL_COND_MSG(!classes.has(p_class), vformat("Request for nonexistent class '%s'.", p_class));
 	classes[p_class].disabled = !p_enable;
 }
 
 bool ClassDB::is_class_enabled(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *ti = classes.getptr(p_class);
 	if (!ti || !ti->creation_func) {
@@ -2128,7 +2129,7 @@ bool ClassDB::is_class_enabled(const StringName &p_class) {
 }
 
 bool ClassDB::is_class_exposed(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *ti = classes.getptr(p_class);
 	ERR_FAIL_NULL_V_MSG(ti, false, vformat("Cannot get class '%s'.", String(p_class)));
@@ -2136,7 +2137,7 @@ bool ClassDB::is_class_exposed(const StringName &p_class) {
 }
 
 bool ClassDB::is_class_reloadable(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *ti = classes.getptr(p_class);
 	ERR_FAIL_NULL_V_MSG(ti, false, vformat("Cannot get class '%s'.", String(p_class)));
@@ -2144,7 +2145,7 @@ bool ClassDB::is_class_reloadable(const StringName &p_class) {
 }
 
 bool ClassDB::is_class_runtime(const StringName &p_class) {
-	OBJTYPE_RLOCK;
+	Locker::Lock lock(Locker::STATE_READ);
 
 	ClassInfo *ti = classes.getptr(p_class);
 	ERR_FAIL_NULL_V_MSG(ti, false, vformat("Cannot get class '%s'.", String(p_class)));
@@ -2342,7 +2343,9 @@ uint64_t ClassDB::get_native_struct_size(const StringName &p_name) {
 	return native_structs[p_name].struct_size;
 }
 
-RWLock ClassDB::lock;
+Object *ClassDB::_instantiate_allow_unexposed(const StringName &p_class) {
+	return _instantiate_internal(p_class, false, true, false);
+}
 
 void ClassDB::cleanup_defaults() {
 	default_values.clear();
@@ -2379,3 +2382,32 @@ bool ClassDB::is_default_array_arg(const Array &p_array) {
 }
 
 //
+
+ClassDB::Locker::Lock::Lock(Locker::State p_state) {
+	DEV_ASSERT(p_state != STATE_UNLOCKED);
+	if (p_state == STATE_READ) {
+		if (Locker::thread_state == STATE_UNLOCKED) {
+			state = STATE_READ;
+			Locker::thread_state = STATE_READ;
+			Locker::lock.read_lock();
+		}
+	} else if (p_state == STATE_WRITE) {
+		if (Locker::thread_state == STATE_UNLOCKED) {
+			state = STATE_WRITE;
+			Locker::thread_state = STATE_WRITE;
+			Locker::lock.write_lock();
+		} else if (Locker::thread_state == STATE_READ) {
+			CRASH_NOW_MSG("Lock can't be upgraded from read to write.");
+		}
+	}
+}
+
+ClassDB::Locker::Lock::~Lock() {
+	if (state == STATE_READ) {
+		Locker::lock.read_unlock();
+		Locker::thread_state = STATE_UNLOCKED;
+	} else if (state == STATE_WRITE) {
+		Locker::lock.write_unlock();
+		Locker::thread_state = STATE_UNLOCKED;
+	}
+}
diff --git a/engine/core/object/class_db.h b/engine/core/object/class_db.h
index ed9550cc..f90b691b 100644
--- a/engine/core/object/class_db.h
+++ b/engine/core/object/class_db.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CLASS_DB_H
-#define CLASS_DB_H
+#pragma once
 
 #include "core/object/method_bind.h"
 #include "core/object/object.h"
@@ -79,6 +78,8 @@ MethodDefinition D_METHOD(const char *p_name, const VarArgs... p_args) {
 #endif
 
 class ClassDB {
+	friend class Object;
+
 public:
 	enum APIType {
 		API_CORE,
@@ -153,7 +154,30 @@ public:
 		return ret;
 	}
 
-	static RWLock lock;
+	// We need a recursive r/w lock because there are various code paths
+	// that may in turn invoke other entry points with require locking.
+	class Locker {
+	public:
+		enum State {
+			STATE_UNLOCKED,
+			STATE_READ,
+			STATE_WRITE,
+		};
+
+	private:
+		inline static RWLock lock;
+		inline thread_local static State thread_state = STATE_UNLOCKED;
+
+	public:
+		class Lock {
+			State state = STATE_UNLOCKED;
+
+		public:
+			explicit Lock(State p_state);
+			~Lock();
+		};
+	};
+
 	static HashMap<StringName, ClassInfo> classes;
 	static HashMap<StringName, StringName> resource_base_extensions;
 	static HashMap<StringName, StringName> compat_classes;
@@ -171,7 +195,7 @@ public:
 	static APIType current_api;
 	static HashMap<APIType, uint32_t> api_hashes_cache;
 
-	static void _add_class2(const StringName &p_class, const StringName &p_inherits);
+	static void _add_class(const StringName &p_class, const StringName &p_inherits);
 
 	static HashMap<StringName, HashMap<StringName, Variant>> default_values;
 	static HashSet<StringName> default_values_cached;
@@ -194,20 +218,14 @@ private:
 	static MethodBind *_bind_vararg_method(MethodBind *p_bind, const StringName &p_name, const Vector<Variant> &p_default_args, bool p_compatibility);
 	static void _bind_method_custom(const StringName &p_class, MethodBind *p_method, bool p_compatibility);
 
-	static Object *_instantiate_internal(const StringName &p_class, bool p_require_real_class = false, bool p_notify_postinitialize = true);
+	static Object *_instantiate_internal(const StringName &p_class, bool p_require_real_class = false, bool p_notify_postinitialize = true, bool p_exposed_only = true);
 
-	static bool _can_instantiate(ClassInfo *p_class_info);
+	static bool _can_instantiate(ClassInfo *p_class_info, bool p_exposed_only = true);
 
 public:
-	// DO NOT USE THIS!!!!!! NEEDS TO BE PUBLIC BUT DO NOT USE NO MATTER WHAT!!!
-	template <typename T>
-	static void _add_class() {
-		_add_class2(T::get_class_static(), T::get_parent_class_static());
-	}
-
 	template <typename T>
 	static void register_class(bool p_virtual = false) {
-		GLOBAL_LOCK_FUNCTION;
+		Locker::Lock lock(Locker::STATE_WRITE);
 		static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
 		T::initialize_class();
 		ClassInfo *t = classes.getptr(T::get_class_static());
@@ -222,7 +240,7 @@ public:
 
 	template <typename T>
 	static void register_abstract_class() {
-		GLOBAL_LOCK_FUNCTION;
+		Locker::Lock lock(Locker::STATE_WRITE);
 		static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
 		T::initialize_class();
 		ClassInfo *t = classes.getptr(T::get_class_static());
@@ -235,7 +253,7 @@ public:
 
 	template <typename T>
 	static void register_internal_class() {
-		GLOBAL_LOCK_FUNCTION;
+		Locker::Lock lock(Locker::STATE_WRITE);
 		static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
 		T::initialize_class();
 		ClassInfo *t = classes.getptr(T::get_class_static());
@@ -250,7 +268,7 @@ public:
 
 	template <typename T>
 	static void register_runtime_class() {
-		GLOBAL_LOCK_FUNCTION;
+		Locker::Lock lock(Locker::STATE_WRITE);
 		static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
 		T::initialize_class();
 		ClassInfo *t = classes.getptr(T::get_class_static());
@@ -275,7 +293,7 @@ public:
 
 	template <typename T>
 	static void register_custom_instance_class() {
-		GLOBAL_LOCK_FUNCTION;
+		Locker::Lock lock(Locker::STATE_WRITE);
 		static_assert(std::is_same_v<typename T::self_type, T>, "Class not declared properly, please use GDCLASS.");
 		T::initialize_class();
 		ClassInfo *t = classes.getptr(T::get_class_static());
@@ -293,7 +311,7 @@ public:
 	static void get_extension_class_list(const Ref<GDExtension> &p_extension, List<StringName> *p_classes);
 	static ObjectGDExtension *get_placeholder_extension(const StringName &p_class);
 #endif
-	static void get_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
+	static void get_inheriters_from_class(const StringName &p_class, LocalVector<StringName> &p_classes);
 	static void get_direct_inheriters_from_class(const StringName &p_class, List<StringName> *p_classes);
 	static StringName get_parent_class_nocheck(const StringName &p_class);
 	static bool get_inheritance_chain_nocheck(const StringName &p_class, Vector<StringName> &r_result);
@@ -391,7 +409,7 @@ public:
 
 	template <typename M>
 	static MethodBind *bind_vararg_method(uint32_t p_flags, const StringName &p_name, M p_method, const MethodInfo &p_info = MethodInfo(), const Vector<Variant> &p_default_args = Vector<Variant>(), bool p_return_nil_is_variant = true) {
-		GLOBAL_LOCK_FUNCTION;
+		Locker::Lock lock(Locker::STATE_WRITE);
 
 		MethodBind *bind = create_vararg_method_bind(p_method, p_info, p_return_nil_is_variant);
 		ERR_FAIL_NULL_V(bind, nullptr);
@@ -404,7 +422,7 @@ public:
 
 	template <typename M>
 	static MethodBind *bind_compatibility_vararg_method(uint32_t p_flags, const StringName &p_name, M p_method, const MethodInfo &p_info = MethodInfo(), const Vector<Variant> &p_default_args = Vector<Variant>(), bool p_return_nil_is_variant = true) {
-		GLOBAL_LOCK_FUNCTION;
+		Locker::Lock lock(Locker::STATE_WRITE);
 
 		MethodBind *bind = create_vararg_method_bind(p_method, p_info, p_return_nil_is_variant);
 		ERR_FAIL_NULL_V(bind, nullptr);
@@ -498,6 +516,8 @@ public:
 	static void get_native_struct_list(List<StringName> *r_names);
 	static String get_native_struct_code(const StringName &p_name);
 	static uint64_t get_native_struct_size(const StringName &p_name); // Used for asserting
+
+	static Object *_instantiate_allow_unexposed(const StringName &p_class); // Used to create unexposed classes from GDExtension, typically for unexposed EditorPlugin.
 };
 
 #define BIND_ENUM_CONSTANT(m_constant) \
@@ -563,7 +583,3 @@ _FORCE_INLINE_ Vector<Error> errarray(P... p_args) {
 	}
 
 #define GDREGISTER_NATIVE_STRUCT(m_class, m_code) ClassDB::register_native_struct(#m_class, m_code, sizeof(m_class))
-
-#include "core/disabled_classes.gen.h"
-
-#endif // CLASS_DB_H
diff --git a/engine/core/object/make_virtuals.py b/engine/core/object/make_virtuals.py
index 13775ecd..e130edbc 100644
--- a/engine/core/object/make_virtuals.py
+++ b/engine/core/object/make_virtuals.py
@@ -15,57 +15,65 @@ script_has_method = """ScriptInstance *_script_instance = ((Object *)(this))->ge
 		}"""
 
 proto = """#define GDVIRTUAL$VER($ALIAS $RET m_name $ARG)\\
-	StringName _gdvirtual_##$VARNAME##_sn = #m_name;\\
-	mutable bool _gdvirtual_##$VARNAME##_initialized = false;\\
 	mutable void *_gdvirtual_##$VARNAME = nullptr;\\
 	_FORCE_INLINE_ bool _gdvirtual_##$VARNAME##_call($CALLARGS) $CONST {\\
+		static const StringName _gdvirtual_##$VARNAME##_sn = _scs_create(#m_name, true);\\
 		$SCRIPTCALL\\
-		if (unlikely(_get_extension() && !_gdvirtual_##$VARNAME##_initialized)) {\\
-			MethodInfo mi = _gdvirtual_##$VARNAME##_get_method_info();\\
-			uint32_t hash = mi.get_compatibility_hash();\\
-			_gdvirtual_##$VARNAME = nullptr;\\
-			if (_get_extension()->get_virtual_call_data2 && _get_extension()->call_virtual_with_data) {\\
-				_gdvirtual_##$VARNAME = _get_extension()->get_virtual_call_data2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
-			} else if (_get_extension()->get_virtual2) {\\
-				_gdvirtual_##$VARNAME = (void *)_get_extension()->get_virtual2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
+		if (_get_extension()) {\\
+			if (unlikely(!_gdvirtual_##$VARNAME)) {\\
+				MethodInfo mi = _gdvirtual_##$VARNAME##_get_method_info();\\
+				uint32_t hash = mi.get_compatibility_hash();\\
+				_gdvirtual_##$VARNAME = nullptr;\\
+				if (_get_extension()->get_virtual_call_data2 && _get_extension()->call_virtual_with_data) {\\
+					_gdvirtual_##$VARNAME = _get_extension()->get_virtual_call_data2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
+				} else if (_get_extension()->get_virtual2) {\\
+					_gdvirtual_##$VARNAME = (void *)_get_extension()->get_virtual2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
+				}\\
+				_GDVIRTUAL_GET_DEPRECATED(_gdvirtual_##$VARNAME, _gdvirtual_##$VARNAME##_sn, $COMPAT)\\
+				_GDVIRTUAL_TRACK(_gdvirtual_##$VARNAME);\\
+				if (_gdvirtual_##$VARNAME == nullptr) {\\
+					_gdvirtual_##$VARNAME = reinterpret_cast<void*>(_INVALID_GDVIRTUAL_FUNC_ADDR);\\
+				}\\
 			}\\
-			_GDVIRTUAL_GET_DEPRECATED(_gdvirtual_##$VARNAME, _gdvirtual_##$VARNAME##_sn, $COMPAT)\\
-			_GDVIRTUAL_TRACK(_gdvirtual_##$VARNAME, _gdvirtual_##$VARNAME##_initialized);\\
-			_gdvirtual_##$VARNAME##_initialized = true;\\
-		}\\
-		if (_gdvirtual_##$VARNAME) {\\
-			$CALLPTRARGS\\
-			$CALLPTRRETDEF\\
-			if (_get_extension()->call_virtual_with_data) {\\
-				_get_extension()->call_virtual_with_data(_get_extension_instance(), &_gdvirtual_##$VARNAME##_sn, _gdvirtual_##$VARNAME, $CALLPTRARGPASS, $CALLPTRRETPASS);\\
-				$CALLPTRRET\\
-			} else {\\
-				((GDExtensionClassCallVirtual)_gdvirtual_##$VARNAME)(_get_extension_instance(), $CALLPTRARGPASS, $CALLPTRRETPASS);\\
-				$CALLPTRRET\\
+			if (_gdvirtual_##$VARNAME != reinterpret_cast<void*>(_INVALID_GDVIRTUAL_FUNC_ADDR)) {\\
+				$CALLPTRARGS\\
+				$CALLPTRRETDEF\\
+				if (_get_extension()->call_virtual_with_data) {\\
+					_get_extension()->call_virtual_with_data(_get_extension_instance(), &_gdvirtual_##$VARNAME##_sn, _gdvirtual_##$VARNAME, $CALLPTRARGPASS, $CALLPTRRETPASS);\\
+					$CALLPTRRET\\
+				} else {\\
+					((GDExtensionClassCallVirtual)_gdvirtual_##$VARNAME)(_get_extension_instance(), $CALLPTRARGPASS, $CALLPTRRETPASS);\\
+					$CALLPTRRET\\
+				}\\
+				return true;\\
 			}\\
-			return true;\\
 		}\\
 		$REQCHECK\\
 		$RVOID\\
 		return false;\\
 	}\\
 	_FORCE_INLINE_ bool _gdvirtual_##$VARNAME##_overridden() const {\\
+		static const StringName _gdvirtual_##$VARNAME##_sn = _scs_create(#m_name, true);\\
 		$SCRIPTHASMETHOD\\
-		if (unlikely(_get_extension() && !_gdvirtual_##$VARNAME##_initialized)) {\\
-			MethodInfo mi = _gdvirtual_##$VARNAME##_get_method_info();\\
-			uint32_t hash = mi.get_compatibility_hash();\\
-			_gdvirtual_##$VARNAME = nullptr;\\
-			if (_get_extension()->get_virtual_call_data2 && _get_extension()->call_virtual_with_data) {\\
-				_gdvirtual_##$VARNAME = _get_extension()->get_virtual_call_data2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
-			} else if (_get_extension()->get_virtual2) {\\
-				_gdvirtual_##$VARNAME = (void *)_get_extension()->get_virtual2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
+		if (_get_extension()) {\\
+			if (unlikely(!_gdvirtual_##$VARNAME)) {\\
+				MethodInfo mi = _gdvirtual_##$VARNAME##_get_method_info();\\
+				uint32_t hash = mi.get_compatibility_hash();\\
+				_gdvirtual_##$VARNAME = nullptr;\\
+				if (_get_extension()->get_virtual_call_data2 && _get_extension()->call_virtual_with_data) {\\
+					_gdvirtual_##$VARNAME = _get_extension()->get_virtual_call_data2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
+				} else if (_get_extension()->get_virtual2) {\\
+					_gdvirtual_##$VARNAME = (void *)_get_extension()->get_virtual2(_get_extension()->class_userdata, &_gdvirtual_##$VARNAME##_sn, hash);\\
+				}\\
+				_GDVIRTUAL_GET_DEPRECATED(_gdvirtual_##$VARNAME, _gdvirtual_##$VARNAME##_sn, $COMPAT)\\
+				_GDVIRTUAL_TRACK(_gdvirtual_##$VARNAME);\\
+				if (_gdvirtual_##$VARNAME == nullptr) {\\
+					_gdvirtual_##$VARNAME = reinterpret_cast<void*>(_INVALID_GDVIRTUAL_FUNC_ADDR);\\
+				}\\
+			}\\
+			if (_gdvirtual_##$VARNAME != reinterpret_cast<void*>(_INVALID_GDVIRTUAL_FUNC_ADDR)) {\\
+				return true;\\
 			}\\
-			_GDVIRTUAL_GET_DEPRECATED(_gdvirtual_##$VARNAME, _gdvirtual_##$VARNAME##_sn, $COMPAT)\\
-			_GDVIRTUAL_TRACK(_gdvirtual_##$VARNAME, _gdvirtual_##$VARNAME##_initialized);\\
-			_gdvirtual_##$VARNAME##_initialized = true;\\
-		}\\
-		if (_gdvirtual_##$VARNAME) {\\
-			return true;\\
 		}\\
 		return false;\\
 	}\\
@@ -207,24 +215,22 @@ def run(target, source, env):
     max_versions = 12
 
     txt = """/* THIS FILE IS GENERATED DO NOT EDIT */
-#ifndef GDVIRTUAL_GEN_H
-#define GDVIRTUAL_GEN_H
+#pragma once
 
 #include "core/object/script_instance.h"
 
-#include <utility>
+inline constexpr uintptr_t _INVALID_GDVIRTUAL_FUNC_ADDR = static_cast<uintptr_t>(-1);
 
 #ifdef TOOLS_ENABLED
-#define _GDVIRTUAL_TRACK(m_virtual, m_initialized)\\
+#define _GDVIRTUAL_TRACK(m_virtual)\\
 	if (_get_extension()->reloadable) {\\
 		VirtualMethodTracker *tracker = memnew(VirtualMethodTracker);\\
 		tracker->method = (void **)&m_virtual;\\
-		tracker->initialized = &m_initialized;\\
 		tracker->next = virtual_method_list;\\
 		virtual_method_list = tracker;\\
 	}
 #else
-#define _GDVIRTUAL_TRACK(m_virtual, m_initialized)
+#define _GDVIRTUAL_TRACK(m_virtual)
 #endif
 
 #ifndef DISABLE_DEPRECATED
@@ -257,7 +263,5 @@ def run(target, source, env):
         txt += generate_version(i, True, False, False, True)
         txt += generate_version(i, True, True, False, True)
 
-    txt += "#endif // GDVIRTUAL_GEN_H\n"
-
     with open(str(target[0]), "w", encoding="utf-8", newline="\n") as f:
         f.write(txt)
diff --git a/engine/core/object/message_queue.cpp b/engine/core/object/message_queue.cpp
index 4b0b1ce6..673e60d6 100644
--- a/engine/core/object/message_queue.cpp
+++ b/engine/core/object/message_queue.cpp
@@ -226,7 +226,7 @@ void CallQueue::_call_function(const Callable &p_callable, const Variant *p_args
 Error CallQueue::flush() {
 	LOCK_MUTEX;
 
-	if (pages.size() == 0) {
+	if (pages.is_empty()) {
 		// Never allocated
 		UNLOCK_MUTEX;
 		return OK; // Do nothing.
@@ -308,7 +308,7 @@ Error CallQueue::flush() {
 void CallQueue::clear() {
 	LOCK_MUTEX;
 
-	if (pages.size() == 0) {
+	if (pages.is_empty()) {
 		UNLOCK_MUTEX;
 		return; // Nothing to clear.
 	}
diff --git a/engine/core/object/message_queue.h b/engine/core/object/message_queue.h
index 64e244bd..8a66d0c1 100644
--- a/engine/core/object/message_queue.h
+++ b/engine/core/object/message_queue.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESSAGE_QUEUE_H
-#define MESSAGE_QUEUE_H
+#pragma once
 
 #include "core/object/object_id.h"
 #include "core/os/thread_safe.h"
@@ -171,5 +170,3 @@ public:
 	MessageQueue();
 	~MessageQueue();
 };
-
-#endif // MESSAGE_QUEUE_H
diff --git a/engine/core/object/method_bind.h b/engine/core/object/method_bind.h
index a07824a0..93683ee6 100644
--- a/engine/core/object/method_bind.h
+++ b/engine/core/object/method_bind.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef METHOD_BIND_H
-#define METHOD_BIND_H
+#pragma once
 
 #include "core/variant/binder_common.h"
 
@@ -143,8 +142,7 @@ public:
 template <typename Derived, typename T, typename R, bool should_returns>
 class MethodBindVarArgBase : public MethodBind {
 protected:
-	R(T::*method)
-	(const Variant **, int, Callable::CallError &);
+	R (T::*method)(const Variant **, int, Callable::CallError &);
 	MethodInfo method_info;
 
 public:
@@ -152,7 +150,7 @@ public:
 		if (p_arg < 0) {
 			return _gen_return_type_info();
 		} else if (p_arg < method_info.arguments.size()) {
-			return method_info.arguments.get(p_arg);
+			return method_info.arguments[p_arg];
 		} else {
 			return PropertyInfo(Variant::NIL, "arg_" + itos(p_arg), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT);
 		}
@@ -193,11 +191,10 @@ public:
 			Vector<StringName> names;
 			names.resize(method_info.arguments.size());
 #endif
-			int i = 0;
-			for (List<PropertyInfo>::ConstIterator itr = method_info.arguments.begin(); itr != method_info.arguments.end(); ++itr, ++i) {
-				at[i + 1] = itr->type;
+			for (int64_t i = 0; i < method_info.arguments.size(); ++i) {
+				at[i + 1] = method_info.arguments[i].type;
 #ifdef DEBUG_METHODS_ENABLED
-				names.write[i] = itr->name;
+				names.write[i] = method_info.arguments[i].name;
 #endif
 			}
 
@@ -259,11 +256,8 @@ class MethodBindVarArgTR : public MethodBindVarArgBase<MethodBindVarArgTR<T, R>,
 	friend class MethodBindVarArgBase<MethodBindVarArgTR<T, R>, T, R, true>;
 
 public:
-#if defined(SANITIZERS_ENABLED) && defined(__GNUC__) && !defined(__clang__)
-	// Workaround GH-66343 raised only with UBSAN, seems to be a false positive.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
+	GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wmaybe-uninitialized") // Workaround GH-66343 raised only with UBSAN, seems to be a false positive.
+
 	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Callable::CallError &r_error) const override {
 #ifdef TOOLS_ENABLED
 		ERR_FAIL_COND_V_MSG(p_object && p_object->is_extension_placeholder() && p_object->get_class_name() == MethodBind::get_instance_class(), Variant(), vformat("Cannot call method bind '%s' on placeholder instance.", MethodBind::get_name()));
@@ -271,9 +265,7 @@ public:
 		return (static_cast<T *>(p_object)->*MethodBindVarArgBase<MethodBindVarArgTR<T, R>, T, R, true>::method)(p_args, p_arg_count, r_error);
 	}
 
-#if defined(SANITIZERS_ENABLED) && defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+	GODOT_GCC_WARNING_POP
 
 	MethodBindVarArgTR(
 			R (T::*p_method)(const Variant **, int, Callable::CallError &),
@@ -480,8 +472,7 @@ template <typename T, typename R, typename... P>
 template <typename R, typename... P>
 #endif
 class MethodBindTR : public MethodBind {
-	R(MB_T::*method)
-	(P...);
+	R (MB_T::*method)(P...);
 
 protected:
 	virtual Variant::Type _gen_argument_type(int p_arg) const override {
@@ -576,8 +567,7 @@ template <typename T, typename R, typename... P>
 template <typename R, typename... P>
 #endif
 class MethodBindTRC : public MethodBind {
-	R(MB_T::*method)
-	(P...) const;
+	R (MB_T::*method)(P...) const;
 
 protected:
 	virtual Variant::Type _gen_argument_type(int p_arg) const override {
@@ -728,8 +718,7 @@ MethodBind *create_static_method_bind(void (*p_method)(P...)) {
 
 template <typename R, typename... P>
 class MethodBindTRS : public MethodBind {
-	R(*function)
-	(P...);
+	R (*function)(P...);
 
 protected:
 	virtual Variant::Type _gen_argument_type(int p_arg) const override {
@@ -790,5 +779,3 @@ MethodBind *create_static_method_bind(R (*p_method)(P...)) {
 	MethodBind *a = memnew((MethodBindTRS<R, P...>)(p_method));
 	return a;
 }
-
-#endif // METHOD_BIND_H
diff --git a/engine/core/object/object.cpp b/engine/core/object/object.cpp
index 8df107ec..852d877f 100644
--- a/engine/core/object/object.cpp
+++ b/engine/core/object/object.cpp
@@ -115,10 +115,19 @@ TypedArray<Dictionary> convert_property_list(const List<PropertyInfo> *p_list) {
 	return va;
 }
 
+TypedArray<Dictionary> convert_property_list(const Vector<PropertyInfo> &p_vector) {
+	TypedArray<Dictionary> va;
+	for (const PropertyInfo &E : p_vector) {
+		va.push_back(Dictionary(E));
+	}
+
+	return va;
+}
+
 MethodInfo::operator Dictionary() const {
 	Dictionary d;
 	d["name"] = name;
-	d["args"] = convert_property_list(&arguments);
+	d["args"] = convert_property_list(arguments);
 	Array da;
 	for (int i = 0; i < default_arguments.size(); i++) {
 		da.push_back(default_arguments[i]);
@@ -240,21 +249,15 @@ void Object::cancel_free() {
 }
 
 void Object::_initialize() {
-	_class_name_ptr = _get_class_namev(); // Set the direct pointer, which is much faster to obtain, but can only happen after _initialize.
+	// Cache the class name in the object for quick reference.
+	_class_name_ptr = _get_class_namev();
 	_initialize_classv();
-	_class_name_ptr = nullptr; // May have been called from a constructor.
 }
 
 void Object::_postinitialize() {
 	notification(NOTIFICATION_POSTINITIALIZE);
 }
 
-void Object::get_valid_parents_static(List<String> *p_parents) {
-}
-
-void Object::_get_valid_parents_static(List<String> *p_parents) {
-}
-
 void Object::set(const StringName &p_name, const Variant &p_value, bool *r_valid) {
 #ifdef TOOLS_ENABLED
 
@@ -902,18 +905,14 @@ Variant Object::call_const(const StringName &p_method, const Variant **p_args, i
 	return ret;
 }
 
-void Object::notification(int p_notification, bool p_reversed) {
-	if (p_reversed) {
-		if (script_instance) {
-			script_instance->notification(p_notification, p_reversed);
-		}
-	} else {
-		_notificationv(p_notification, p_reversed);
-	}
+void Object::_notification_forward(int p_notification) {
+	// Notify classes starting with Object and ending with most derived subclass.
+	// e.g. Object -> Node -> Node3D
+	_notification_forwardv(p_notification);
 
 	if (_extension) {
 		if (_extension->notification2) {
-			_extension->notification2(_extension_instance, p_notification, static_cast<GDExtensionBool>(p_reversed));
+			_extension->notification2(_extension_instance, p_notification, static_cast<GDExtensionBool>(false));
 #ifndef DISABLE_DEPRECATED
 		} else if (_extension->notification) {
 			_extension->notification(_extension_instance, p_notification);
@@ -921,13 +920,29 @@ void Object::notification(int p_notification, bool p_reversed) {
 		}
 	}
 
-	if (p_reversed) {
-		_notificationv(p_notification, p_reversed);
-	} else {
-		if (script_instance) {
-			script_instance->notification(p_notification, p_reversed);
+	if (script_instance) {
+		script_instance->notification(p_notification, false);
+	}
+}
+
+void Object::_notification_backward(int p_notification) {
+	if (script_instance) {
+		script_instance->notification(p_notification, true);
+	}
+
+	if (_extension) {
+		if (_extension->notification2) {
+			_extension->notification2(_extension_instance, p_notification, static_cast<GDExtensionBool>(true));
+#ifndef DISABLE_DEPRECATED
+		} else if (_extension->notification) {
+			_extension->notification(_extension_instance, p_notification);
+#endif // DISABLE_DEPRECATED
 		}
 	}
+
+	// Notify classes starting with most derived subclass and ending in Object.
+	// e.g. Node3D -> Node -> Object
+	_notification_backwardv(p_notification);
 }
 
 String Object::to_string() {
@@ -1080,8 +1095,8 @@ TypedArray<Dictionary> Object::_get_method_list_bind() const {
 	get_method_list(&ml);
 	TypedArray<Dictionary> ret;
 
-	for (List<MethodInfo>::Element *E = ml.front(); E; E = E->next()) {
-		Dictionary d = E->get();
+	for (const MethodInfo &mi : ml) {
+		Dictionary d = mi;
 		//va.push_back(d);
 		ret.push_back(d);
 	}
@@ -1575,7 +1590,7 @@ void Object::initialize_class() {
 	if (initialized) {
 		return;
 	}
-	ClassDB::_add_class<Object>();
+	_add_class_to_classdb(get_class_static(), StringName());
 	_bind_methods();
 	_bind_compatibility_methods();
 	initialized = true;
@@ -1640,12 +1655,10 @@ void Object::_clear_internal_resource_paths(const Variant &p_var) {
 		} break;
 		case Variant::DICTIONARY: {
 			Dictionary d = p_var;
-			List<Variant> keys;
-			d.get_key_list(&keys);
 
-			for (const Variant &E : keys) {
-				_clear_internal_resource_paths(E);
-				_clear_internal_resource_paths(d[E]);
+			for (const KeyValue<Variant, Variant> &kv : d) {
+				_clear_internal_resource_paths(kv.key);
+				_clear_internal_resource_paths(kv.value);
 			}
 		} break;
 		default: {
@@ -1653,9 +1666,20 @@ void Object::_clear_internal_resource_paths(const Variant &p_var) {
 	}
 }
 
+void Object::_add_class_to_classdb(const StringName &p_class, const StringName &p_inherits) {
+	ClassDB::_add_class(p_class, p_inherits);
+}
+
+void Object::_get_property_list_from_classdb(const StringName &p_class, List<PropertyInfo> *p_list, bool p_no_inheritance, const Object *p_validator) {
+	ClassDB::get_property_list(p_class, p_list, p_no_inheritance, p_validator);
+}
+
 #ifdef TOOLS_ENABLED
-void Object::editor_set_section_unfold(const String &p_section, bool p_unfolded) {
-	set_edited(true);
+void Object::editor_set_section_unfold(const String &p_section, bool p_unfolded, bool p_initializing) {
+	if (!p_initializing) {
+		set_edited(true);
+	}
+
 	if (p_unfolded) {
 		editor_section_folding.insert(p_section);
 	} else {
@@ -1878,7 +1902,7 @@ Variant::Type Object::get_static_property_type(const StringName &p_property, boo
 }
 
 Variant::Type Object::get_static_property_type_indexed(const Vector<StringName> &p_path, bool *r_valid) const {
-	if (p_path.size() == 0) {
+	if (p_path.is_empty()) {
 		if (r_valid) {
 			*r_valid = false;
 		}
@@ -1945,6 +1969,20 @@ uint32_t Object::get_edited_version() const {
 }
 #endif
 
+const StringName &Object::get_class_name() const {
+	if (_extension) {
+		// Can't put inside the unlikely as constructor can run it.
+		return _extension->class_name;
+	}
+
+	if (unlikely(!_class_name_ptr)) {
+		// While class is initializing / deinitializing, constructors and destructors
+		// need access to the proper class at the proper stage.
+		return *_get_class_namev();
+	}
+	return *_class_name_ptr;
+}
+
 StringName Object::get_class_name_for_extension(const GDExtension *p_library) const {
 #ifdef TOOLS_ENABLED
 	// If this is the library this extension comes from and it's a placeholder, we
@@ -2092,7 +2130,6 @@ void Object::clear_internal_extension() {
 	// Clear the virtual methods.
 	while (virtual_method_list) {
 		(*virtual_method_list->method) = nullptr;
-		(*virtual_method_list->initialized) = false;
 		virtual_method_list = virtual_method_list->next;
 	}
 }
diff --git a/engine/core/object/object.h b/engine/core/object/object.h
index 16d8e19e..1607f827 100644
--- a/engine/core/object/object.h
+++ b/engine/core/object/object.h
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OBJECT_H
-#define OBJECT_H
+#pragma once
 
+#include "core/disabled_classes.gen.h"
 #include "core/extension/gdextension_interface.h"
 #include "core/object/message_queue.h"
 #include "core/object/object_id.h"
@@ -47,6 +47,9 @@
 template <typename T>
 class TypedArray;
 
+template <typename T>
+class Ref;
+
 enum PropertyHint {
 	PROPERTY_HINT_NONE, ///< no hint provided.
 	PROPERTY_HINT_RANGE, ///< hint_text = "min,max[,step][,or_greater][,or_less][,hide_slider][,radians_as_degrees][,degrees][,exp][,suffix:<keyword>] range.
@@ -129,6 +132,9 @@ enum PropertyUsageFlags {
 	PROPERTY_USAGE_NO_EDITOR = PROPERTY_USAGE_STORAGE,
 };
 
+// Respective values are defined by disabled_classes.gen.h
+#define GD_IS_CLASS_ENABLED(m_class) m_class::_class_is_enabled
+
 #define ADD_SIGNAL(m_signal) ::ClassDB::add_signal(get_class_static(), m_signal)
 #define ADD_PROPERTY(m_property, m_setter, m_getter) ::ClassDB::add_property(get_class_static(), m_property, _scs_create(m_setter), _scs_create(m_getter))
 #define ADD_PROPERTYI(m_property, m_setter, m_getter, m_index) ::ClassDB::add_property(get_class_static(), m_property, _scs_create(m_setter), _scs_create(m_getter), m_index)
@@ -209,6 +215,7 @@ struct PropertyInfo {
 };
 
 TypedArray<Dictionary> convert_property_list(const List<PropertyInfo> *p_list);
+TypedArray<Dictionary> convert_property_list(const Vector<PropertyInfo> &p_vector);
 
 enum MethodFlags {
 	METHOD_FLAG_NORMAL = 1,
@@ -227,7 +234,7 @@ struct MethodInfo {
 	PropertyInfo return_val;
 	uint32_t flags = METHOD_FLAGS_DEFAULT;
 	int id = 0;
-	List<PropertyInfo> arguments;
+	Vector<PropertyInfo> arguments;
 	Vector<Variant> default_arguments;
 	int return_val_metadata = 0;
 	Vector<int> arguments_metadata;
@@ -256,8 +263,8 @@ struct MethodInfo {
 			return_val(PropertyInfo(pinfo.return_value)),
 			flags(pinfo.flags),
 			id(pinfo.id) {
-		for (uint32_t j = 0; j < pinfo.argument_count; j++) {
-			arguments.push_back(PropertyInfo(pinfo.arguments[j]));
+		for (uint32_t i = 0; i < pinfo.argument_count; i++) {
+			arguments.push_back(PropertyInfo(pinfo.arguments[i]));
 		}
 		const Variant *def_values = (const Variant *)pinfo.default_arguments;
 		for (uint32_t j = 0; j < pinfo.default_argument_count; j++) {
@@ -265,22 +272,12 @@ struct MethodInfo {
 		}
 	}
 
-	void _push_params(const PropertyInfo &p_param) {
-		arguments.push_back(p_param);
-	}
-
-	template <typename... VarArgs>
-	void _push_params(const PropertyInfo &p_param, VarArgs... p_params) {
-		arguments.push_back(p_param);
-		_push_params(p_params...);
-	}
-
 	MethodInfo(const String &p_name) { name = p_name; }
 
 	template <typename... VarArgs>
 	MethodInfo(const String &p_name, VarArgs... p_params) {
 		name = p_name;
-		_push_params(p_params...);
+		arguments = Vector<PropertyInfo>{ p_params... };
 	}
 
 	MethodInfo(Variant::Type ret) { return_val.type = ret; }
@@ -293,7 +290,7 @@ struct MethodInfo {
 	MethodInfo(Variant::Type ret, const String &p_name, VarArgs... p_params) {
 		name = p_name;
 		return_val.type = ret;
-		_push_params(p_params...);
+		arguments = Vector<PropertyInfo>{ p_params... };
 	}
 
 	MethodInfo(const PropertyInfo &p_ret, const String &p_name) {
@@ -305,7 +302,7 @@ struct MethodInfo {
 	MethodInfo(const PropertyInfo &p_ret, const String &p_name, VarArgs... p_params) {
 		return_val = p_ret;
 		name = p_name;
-		_push_params(p_params...);
+		arguments = Vector<PropertyInfo>{ p_params... };
 	}
 };
 
@@ -396,57 +393,46 @@ struct ObjectGDExtension {
  * much alone defines the object model.
  */
 
+// This is a barebones version of GDCLASS,
+// only intended for simple classes deriving from Object
+// so that they can support the `Object::cast_to()` method.
+#define GDSOFTCLASS(m_class, m_inherits)                                             \
+public:                                                                              \
+	using self_type = m_class;                                                       \
+	using super_type = m_inherits;                                                   \
+	static _FORCE_INLINE_ void *get_class_ptr_static() {                             \
+		static int ptr;                                                              \
+		return &ptr;                                                                 \
+	}                                                                                \
+	virtual bool is_class_ptr(void *p_ptr) const override {                          \
+		return (p_ptr == get_class_ptr_static()) || m_inherits::is_class_ptr(p_ptr); \
+	}                                                                                \
+                                                                                     \
+private:
+
 #define GDCLASS(m_class, m_inherits)                                                                                                        \
+	GDSOFTCLASS(m_class, m_inherits)                                                                                                        \
 private:                                                                                                                                    \
 	void operator=(const m_class &p_rval) {}                                                                                                \
 	friend class ::ClassDB;                                                                                                                 \
                                                                                                                                             \
 public:                                                                                                                                     \
-	typedef m_class self_type;                                                                                                              \
 	static constexpr bool _class_is_enabled = !bool(GD_IS_DEFINED(ClassDB_Disable_##m_class)) && m_inherits::_class_is_enabled;             \
-	virtual String get_class() const override {                                                                                             \
-		if (_get_extension()) {                                                                                                             \
-			return _get_extension()->class_name.operator String();                                                                          \
-		}                                                                                                                                   \
-		return String(#m_class);                                                                                                            \
-	}                                                                                                                                       \
 	virtual const StringName *_get_class_namev() const override {                                                                           \
+		return &get_class_static();                                                                                                         \
+	}                                                                                                                                       \
+	static const StringName &get_class_static() {                                                                                           \
 		static StringName _class_name_static;                                                                                               \
 		if (unlikely(!_class_name_static)) {                                                                                                \
 			StringName::assign_static_unique_class_name(&_class_name_static, #m_class);                                                     \
 		}                                                                                                                                   \
-		return &_class_name_static;                                                                                                         \
-	}                                                                                                                                       \
-	static _FORCE_INLINE_ void *get_class_ptr_static() {                                                                                    \
-		static int ptr;                                                                                                                     \
-		return &ptr;                                                                                                                        \
-	}                                                                                                                                       \
-	static _FORCE_INLINE_ String get_class_static() {                                                                                       \
-		return String(#m_class);                                                                                                            \
-	}                                                                                                                                       \
-	static _FORCE_INLINE_ String get_parent_class_static() {                                                                                \
-		return m_inherits::get_class_static();                                                                                              \
-	}                                                                                                                                       \
-	static void get_inheritance_list_static(List<String> *p_inheritance_list) {                                                             \
-		m_inherits::get_inheritance_list_static(p_inheritance_list);                                                                        \
-		p_inheritance_list->push_back(String(#m_class));                                                                                    \
+		return _class_name_static;                                                                                                          \
 	}                                                                                                                                       \
 	virtual bool is_class(const String &p_class) const override {                                                                           \
 		if (_get_extension() && _get_extension()->is_class(p_class)) {                                                                      \
 			return true;                                                                                                                    \
 		}                                                                                                                                   \
 		return (p_class == (#m_class)) ? true : m_inherits::is_class(p_class);                                                              \
-	}                                                                                                                                       \
-	virtual bool is_class_ptr(void *p_ptr) const override {                                                                                 \
-		return (p_ptr == get_class_ptr_static()) ? true : m_inherits::is_class_ptr(p_ptr);                                                  \
-	}                                                                                                                                       \
-                                                                                                                                            \
-	static void get_valid_parents_static(List<String> *p_parents) {                                                                         \
-		if (m_class::_get_valid_parents_static != m_inherits::_get_valid_parents_static) {                                                  \
-			m_class::_get_valid_parents_static(p_parents);                                                                                  \
-		}                                                                                                                                   \
-                                                                                                                                            \
-		m_inherits::get_valid_parents_static(p_parents);                                                                                    \
 	}                                                                                                                                       \
                                                                                                                                             \
 protected:                                                                                                                                  \
@@ -464,7 +450,7 @@ public:
 			return;                                                                                                                         \
 		}                                                                                                                                   \
 		m_inherits::initialize_class();                                                                                                     \
-		::ClassDB::_add_class<m_class>();                                                                                                   \
+		_add_class_to_classdb(get_class_static(), super_type::get_class_static());                                                          \
 		if (m_class::_get_bind_methods() != m_inherits::_get_bind_methods()) {                                                              \
 			_bind_methods();                                                                                                                \
 		}                                                                                                                                   \
@@ -479,7 +465,7 @@ protected:
 		initialize_class();                                                                                                                 \
 	}                                                                                                                                       \
 	_FORCE_INLINE_ bool (Object::*_get_get() const)(const StringName &p_name, Variant &) const {                                            \
-		return (bool(Object::*)(const StringName &, Variant &) const) & m_class::_get;                                                      \
+		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_get;                                                     \
 	}                                                                                                                                       \
 	virtual bool _getv(const StringName &p_name, Variant &r_ret) const override {                                                           \
 		if (m_class::_get_get() != m_inherits::_get_get()) {                                                                                \
@@ -490,7 +476,7 @@ protected:
 		return m_inherits::_getv(p_name, r_ret);                                                                                            \
 	}                                                                                                                                       \
 	_FORCE_INLINE_ bool (Object::*_get_set() const)(const StringName &p_name, const Variant &p_property) {                                  \
-		return (bool(Object::*)(const StringName &, const Variant &)) & m_class::_set;                                                      \
+		return (bool (Object::*)(const StringName &, const Variant &)) & m_class::_set;                                                     \
 	}                                                                                                                                       \
 	virtual bool _setv(const StringName &p_name, const Variant &p_property) override {                                                      \
 		if (m_inherits::_setv(p_name, p_property)) {                                                                                        \
@@ -502,14 +488,14 @@ protected:
 		return false;                                                                                                                       \
 	}                                                                                                                                       \
 	_FORCE_INLINE_ void (Object::*_get_get_property_list() const)(List<PropertyInfo> * p_list) const {                                      \
-		return (void(Object::*)(List<PropertyInfo> *) const) & m_class::_get_property_list;                                                 \
+		return (void (Object::*)(List<PropertyInfo> *) const) & m_class::_get_property_list;                                                \
 	}                                                                                                                                       \
 	virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const override {                                          \
 		if (!p_reversed) {                                                                                                                  \
 			m_inherits::_get_property_listv(p_list, p_reversed);                                                                            \
 		}                                                                                                                                   \
 		p_list->push_back(PropertyInfo(Variant::NIL, get_class_static(), PROPERTY_HINT_NONE, get_class_static(), PROPERTY_USAGE_CATEGORY)); \
-		::ClassDB::get_property_list(#m_class, p_list, true, this);                                                                         \
+		_get_property_list_from_classdb(#m_class, p_list, true, this);                                                                      \
 		if (m_class::_get_get_property_list() != m_inherits::_get_get_property_list()) {                                                    \
 			_get_property_list(p_list);                                                                                                     \
 		}                                                                                                                                   \
@@ -518,7 +504,7 @@ protected:
 		}                                                                                                                                   \
 	}                                                                                                                                       \
 	_FORCE_INLINE_ void (Object::*_get_validate_property() const)(PropertyInfo & p_property) const {                                        \
-		return (void(Object::*)(PropertyInfo &) const) & m_class::_validate_property;                                                       \
+		return (void (Object::*)(PropertyInfo &) const) & m_class::_validate_property;                                                      \
 	}                                                                                                                                       \
 	virtual void _validate_propertyv(PropertyInfo &p_property) const override {                                                             \
 		m_inherits::_validate_propertyv(p_property);                                                                                        \
@@ -527,7 +513,7 @@ protected:
 		}                                                                                                                                   \
 	}                                                                                                                                       \
 	_FORCE_INLINE_ bool (Object::*_get_property_can_revert() const)(const StringName &p_name) const {                                       \
-		return (bool(Object::*)(const StringName &) const) & m_class::_property_can_revert;                                                 \
+		return (bool (Object::*)(const StringName &) const) & m_class::_property_can_revert;                                                \
 	}                                                                                                                                       \
 	virtual bool _property_can_revertv(const StringName &p_name) const override {                                                           \
 		if (m_class::_get_property_can_revert() != m_inherits::_get_property_can_revert()) {                                                \
@@ -538,7 +524,7 @@ protected:
 		return m_inherits::_property_can_revertv(p_name);                                                                                   \
 	}                                                                                                                                       \
 	_FORCE_INLINE_ bool (Object::*_get_property_get_revert() const)(const StringName &p_name, Variant &) const {                            \
-		return (bool(Object::*)(const StringName &, Variant &) const) & m_class::_property_get_revert;                                      \
+		return (bool (Object::*)(const StringName &, Variant &) const) & m_class::_property_get_revert;                                     \
 	}                                                                                                                                       \
 	virtual bool _property_get_revertv(const StringName &p_name, Variant &r_ret) const override {                                           \
 		if (m_class::_get_property_get_revert() != m_inherits::_get_property_get_revert()) {                                                \
@@ -549,18 +535,19 @@ protected:
 		return m_inherits::_property_get_revertv(p_name, r_ret);                                                                            \
 	}                                                                                                                                       \
 	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) {                                                                         \
-		return (void(Object::*)(int)) & m_class::_notification;                                                                             \
+		return (void (Object::*)(int)) & m_class::_notification;                                                                            \
 	}                                                                                                                                       \
-	virtual void _notificationv(int p_notification, bool p_reversed) override {                                                             \
-		if (!p_reversed) {                                                                                                                  \
-			m_inherits::_notificationv(p_notification, p_reversed);                                                                         \
-		}                                                                                                                                   \
+	virtual void _notification_forwardv(int p_notification) override {                                                                      \
+		m_inherits::_notification_forwardv(p_notification);                                                                                 \
 		if (m_class::_get_notification() != m_inherits::_get_notification()) {                                                              \
 			_notification(p_notification);                                                                                                  \
 		}                                                                                                                                   \
-		if (p_reversed) {                                                                                                                   \
-			m_inherits::_notificationv(p_notification, p_reversed);                                                                         \
+	}                                                                                                                                       \
+	virtual void _notification_backwardv(int p_notification) override {                                                                     \
+		if (m_class::_get_notification() != m_inherits::_get_notification()) {                                                              \
+			_notification(p_notification);                                                                                                  \
 		}                                                                                                                                   \
+		m_inherits::_notification_backwardv(p_notification);                                                                                \
 	}                                                                                                                                       \
                                                                                                                                             \
 private:
@@ -704,7 +691,11 @@ protected:
 	virtual void _validate_propertyv(PropertyInfo &p_property) const {}
 	virtual bool _property_can_revertv(const StringName &p_name) const { return false; }
 	virtual bool _property_get_revertv(const StringName &p_name, Variant &r_property) const { return false; }
-	virtual void _notificationv(int p_notification, bool p_reversed) {}
+
+	void _notification_forward(int p_notification);
+	void _notification_backward(int p_notification);
+	virtual void _notification_forwardv(int p_notification) {}
+	virtual void _notification_backwardv(int p_notification) {}
 
 	static void _bind_methods();
 	static void _bind_compatibility_methods() {}
@@ -743,18 +734,12 @@ protected:
 	_FORCE_INLINE_ void (Object::*_get_notification() const)(int) {
 		return &Object::_notification;
 	}
-	static void get_valid_parents_static(List<String> *p_parents);
-	static void _get_valid_parents_static(List<String> *p_parents);
 
 	Variant _call_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 	Variant _call_deferred_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 	virtual const StringName *_get_class_namev() const {
-		static StringName _class_name_static;
-		if (unlikely(!_class_name_static)) {
-			StringName::assign_static_unique_class_name(&_class_name_static, "Object");
-		}
-		return &_class_name_static;
+		return &get_class_static();
 	}
 
 	TypedArray<StringName> _get_meta_list_bind() const;
@@ -766,12 +751,14 @@ protected:
 	friend class ClassDB;
 	friend class PlaceholderExtensionInstance;
 
+	static void _add_class_to_classdb(const StringName &p_class, const StringName &p_inherits);
+	static void _get_property_list_from_classdb(const StringName &p_class, List<PropertyInfo> *p_list, bool p_no_inheritance, const Object *p_validator);
+
 	bool _disconnect(const StringName &p_signal, const Callable &p_callable, bool p_force = false);
 
 #ifdef TOOLS_ENABLED
 	struct VirtualMethodTracker {
 		void **method;
-		bool *initialized;
 		VirtualMethodTracker *next;
 	};
 
@@ -797,12 +784,18 @@ public:
 
 	template <typename T>
 	static T *cast_to(Object *p_object) {
-		return p_object ? dynamic_cast<T *>(p_object) : nullptr;
+		// This is like dynamic_cast, but faster.
+		// The reason is that we can assume no virtual and multiple inheritance.
+		static_assert(std::is_base_of_v<Object, T>, "T must be derived from Object");
+		static_assert(std::is_same_v<std::decay_t<T>, typename T::self_type>, "T must use GDCLASS or GDSOFTCLASS");
+		return p_object && p_object->is_class_ptr(T::get_class_ptr_static()) ? static_cast<T *>(p_object) : nullptr;
 	}
 
 	template <typename T>
 	static const T *cast_to(const Object *p_object) {
-		return p_object ? dynamic_cast<const T *>(p_object) : nullptr;
+		static_assert(std::is_base_of_v<Object, T>, "T must be derived from Object");
+		static_assert(std::is_same_v<std::decay_t<T>, typename T::self_type>, "T must use GDCLASS or GDSOFTCLASS");
+		return p_object && p_object->is_class_ptr(T::get_class_ptr_static()) ? static_cast<const T *>(p_object) : nullptr;
 	}
 
 	enum {
@@ -814,17 +807,16 @@ public:
 	};
 
 	/* TYPE API */
-	static void get_inheritance_list_static(List<String> *p_inheritance_list) { p_inheritance_list->push_back("Object"); }
-
-	static String get_class_static() { return "Object"; }
-	static String get_parent_class_static() { return String(); }
-
-	virtual String get_class() const {
-		if (_extension) {
-			return _extension->class_name.operator String();
+	static const StringName &get_class_static() {
+		static StringName _class_name_static;
+		if (unlikely(!_class_name_static)) {
+			StringName::assign_static_unique_class_name(&_class_name_static, "Object");
 		}
-		return "Object";
+		return _class_name_static;
 	}
+
+	_FORCE_INLINE_ String get_class() const { return get_class_name(); }
+
 	virtual String get_save_class() const { return get_class(); } //class stored when saving
 
 	virtual bool is_class(const String &p_class) const {
@@ -835,19 +827,7 @@ public:
 	}
 	virtual bool is_class_ptr(void *p_ptr) const { return get_class_ptr_static() == p_ptr; }
 
-	_FORCE_INLINE_ const StringName &get_class_name() const {
-		if (_extension) {
-			// Can't put inside the unlikely as constructor can run it
-			return _extension->class_name;
-		}
-
-		if (unlikely(!_class_name_ptr)) {
-			// While class is initializing / deinitializing, constructors and destructurs
-			// need access to the proper class at the proper stage.
-			return *_get_class_namev();
-		}
-		return *_class_name_ptr;
-	}
+	const StringName &get_class_name() const;
 
 	StringName get_class_name_for_extension(const GDExtension *p_library) const;
 
@@ -882,7 +862,17 @@ public:
 		return (cerr.error == Callable::CallError::CALL_OK) ? ret : Variant();
 	}
 
-	void notification(int p_notification, bool p_reversed = false);
+	// Depending on the boolean, we call either the virtual function _notification_backward or _notification_forward.
+	// - Forward calls subclasses in descending order (e.g. Object -> Node -> Node3D -> extension -> script).
+	//   Backward calls subclasses in descending order (e.g. script -> extension -> Node3D -> Node -> Object).
+	_FORCE_INLINE_ void notification(int p_notification, bool p_reversed = false) {
+		if (p_reversed) {
+			_notification_backward(p_notification);
+		} else {
+			_notification_forward(p_notification);
+		}
+	}
+
 	virtual String to_string();
 
 	// Used mainly by script, get and set all INCLUDING string.
@@ -974,7 +964,7 @@ public:
 
 #ifdef TOOLS_ENABLED
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const;
-	void editor_set_section_unfold(const String &p_section, bool p_unfolded);
+	void editor_set_section_unfold(const String &p_section, bool p_unfolded, bool p_initializing = false);
 	bool editor_is_section_unfolded(const String &p_section);
 	const HashSet<String> &editor_get_section_folding() const { return editor_section_folding; }
 	void editor_clear_section_folding() { editor_section_folding.clear(); }
@@ -1062,8 +1052,15 @@ public:
 
 		return object;
 	}
+
+	template <typename T>
+	_ALWAYS_INLINE_ static T *get_instance(ObjectID p_instance_id) {
+		return Object::cast_to<T>(get_instance(p_instance_id));
+	}
+
+	template <typename T>
+	_ALWAYS_INLINE_ static Ref<T> get_ref(ObjectID p_instance_id); // Defined in ref_counted.h
+
 	static void debug_objects(DebugFunc p_func);
 	static int get_object_count();
 };
-
-#endif // OBJECT_H
diff --git a/engine/core/object/object_id.h b/engine/core/object/object_id.h
index b04e2df1..2fc66beb 100644
--- a/engine/core/object/object_id.h
+++ b/engine/core/object/object_id.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OBJECT_ID_H
-#define OBJECT_ID_H
+#pragma once
 
 #include "core/typedefs.h"
 
@@ -60,4 +59,5 @@ public:
 	_ALWAYS_INLINE_ explicit ObjectID(const int64_t p_id) { id = p_id; }
 };
 
-#endif // OBJECT_ID_H
+template <>
+struct is_zero_constructible<ObjectID> : std::true_type {};
diff --git a/engine/core/object/ref_counted.h b/engine/core/object/ref_counted.h
index 927e457d..3bd2b062 100644
--- a/engine/core/object/ref_counted.h
+++ b/engine/core/object/ref_counted.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REF_COUNTED_H
-#define REF_COUNTED_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/templates/safe_refcount.h"
@@ -86,6 +85,10 @@ class Ref {
 
 	//virtual RefCounted * get_reference() const { return reference; }
 public:
+	static _FORCE_INLINE_ String get_class_static() {
+		return T::get_class_static();
+	}
+
 	_FORCE_INLINE_ bool operator==(const T *p_ptr) const {
 		return reference == p_ptr;
 	}
@@ -128,6 +131,15 @@ public:
 		ref(p_from);
 	}
 
+	void operator=(Ref &&p_from) {
+		if (reference == p_from.reference) {
+			return;
+		}
+		unref();
+		reference = p_from.reference;
+		p_from.reference = nullptr;
+	}
+
 	template <typename T_Other>
 	void operator=(const Ref<T_Other> &p_from) {
 		ref_pointer<false>(Object::cast_to<T>(p_from.ptr()));
@@ -160,6 +172,11 @@ public:
 		this->operator=(p_from);
 	}
 
+	Ref(Ref &&p_from) {
+		reference = p_from.reference;
+		p_from.reference = nullptr;
+	}
+
 	template <typename T_Other>
 	Ref(const Ref<T_Other> &p_from) {
 		this->operator=(p_from);
@@ -181,10 +198,15 @@ public:
 		// do a lot of referencing on references and stuff
 		// mutexes will avoid more crashes?
 
-		if (reference && reference->unreference()) {
-			memdelete(reference);
+		if (reference) {
+			// NOTE: `reinterpret_cast` is "safe" here because we know `T` has simple linear
+			// inheritance to `RefCounted`. This guarantees that `T * == `RefCounted *`, which
+			// allows us to declare `Ref<T>` with forward declared `T` types.
+			if (reinterpret_cast<RefCounted *>(reference)->unreference()) {
+				memdelete(reinterpret_cast<RefCounted *>(reference));
+			}
+			reference = nullptr;
 		}
-		reference = nullptr;
 	}
 
 	template <typename... VarArgs>
@@ -233,19 +255,6 @@ struct PtrToArg<Ref<T>> {
 	}
 };
 
-template <typename T>
-struct PtrToArg<const Ref<T> &> {
-	typedef Ref<T> EncodeT;
-
-	_FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) {
-		if (p_ptr == nullptr) {
-			return Ref<T>();
-		}
-		// p_ptr points to a RefCounted object
-		return Ref<T>(*((T *const *)p_ptr));
-	}
-};
-
 template <typename T>
 struct GetTypeInfo<Ref<T>> {
 	static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
@@ -256,26 +265,17 @@ struct GetTypeInfo<Ref<T>> {
 	}
 };
 
-template <typename T>
-struct GetTypeInfo<const Ref<T> &> {
-	static const Variant::Type VARIANT_TYPE = Variant::OBJECT;
-	static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
-
-	static inline PropertyInfo get_class_info() {
-		return PropertyInfo(Variant::OBJECT, String(), PROPERTY_HINT_RESOURCE_TYPE, T::get_class_static());
-	}
-};
-
 template <typename T>
 struct VariantInternalAccessor<Ref<T>> {
 	static _FORCE_INLINE_ Ref<T> get(const Variant *v) { return Ref<T>(*VariantInternal::get_object(v)); }
 	static _FORCE_INLINE_ void set(Variant *v, const Ref<T> &p_ref) { VariantInternal::object_assign(v, p_ref); }
 };
 
+// Zero-constructing Ref initializes reference to nullptr (and thus empty).
 template <typename T>
-struct VariantInternalAccessor<const Ref<T> &> {
-	static _FORCE_INLINE_ Ref<T> get(const Variant *v) { return Ref<T>(*VariantInternal::get_object(v)); }
-	static _FORCE_INLINE_ void set(Variant *v, const Ref<T> &p_ref) { VariantInternal::object_assign(v, p_ref); }
-};
+struct is_zero_constructible<Ref<T>> : std::true_type {};
 
-#endif // REF_COUNTED_H
+template <typename T>
+Ref<T> ObjectDB::get_ref(ObjectID p_instance_id) {
+	return Ref<T>(get_instance(p_instance_id));
+}
diff --git a/engine/core/object/script_instance.h b/engine/core/object/script_instance.h
index 2c8132ec..59b7199c 100644
--- a/engine/core/object/script_instance.h
+++ b/engine/core/object/script_instance.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_INSTANCE_H
-#define SCRIPT_INSTANCE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -96,5 +95,3 @@ public:
 	virtual ScriptLanguage *get_language() = 0;
 	virtual ~ScriptInstance();
 };
-
-#endif // SCRIPT_INSTANCE_H
diff --git a/engine/core/object/script_language.cpp b/engine/core/object/script_language.cpp
index 33bf7ab4..a2c738b6 100644
--- a/engine/core/object/script_language.cpp
+++ b/engine/core/object/script_language.cpp
@@ -633,6 +633,7 @@ void ScriptLanguage::_bind_methods() {
 	BIND_ENUM_CONSTANT(SCRIPT_NAME_CASING_PASCAL_CASE);
 	BIND_ENUM_CONSTANT(SCRIPT_NAME_CASING_SNAKE_CASE);
 	BIND_ENUM_CONSTANT(SCRIPT_NAME_CASING_KEBAB_CASE);
+	BIND_ENUM_CONSTANT(SCRIPT_NAME_CASING_CAMEL_CASE);
 }
 
 bool PlaceHolderScriptInstance::set(const StringName &p_name, const Variant &p_value) {
diff --git a/engine/core/object/script_language.h b/engine/core/object/script_language.h
index 8158d633..c724177f 100644
--- a/engine/core/object/script_language.h
+++ b/engine/core/object/script_language.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_LANGUAGE_H
-#define SCRIPT_LANGUAGE_H
+#pragma once
 
 #include "core/doc_data.h"
 #include "core/io/resource.h"
@@ -247,6 +246,7 @@ public:
 		SCRIPT_NAME_CASING_PASCAL_CASE,
 		SCRIPT_NAME_CASING_SNAKE_CASE,
 		SCRIPT_NAME_CASING_KEBAB_CASE,
+		SCRIPT_NAME_CASING_CAMEL_CASE,
 	};
 
 	struct ScriptTemplate {
@@ -505,5 +505,3 @@ public:
 	PlaceHolderScriptInstance(ScriptLanguage *p_language, Ref<Script> p_script, Object *p_owner);
 	~PlaceHolderScriptInstance();
 };
-
-#endif // SCRIPT_LANGUAGE_H
diff --git a/engine/core/object/script_language_extension.h b/engine/core/object/script_language_extension.h
index 715ec43f..a8e47eef 100644
--- a/engine/core/object/script_language_extension.h
+++ b/engine/core/object/script_language_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_LANGUAGE_EXTENSION_H
-#define SCRIPT_LANGUAGE_EXTENSION_H
+#pragma once
 
 #include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/gdvirtual.gen.inc"
@@ -193,10 +192,8 @@ public:
 	virtual void get_constants(HashMap<StringName, Variant> *p_constants) override {
 		Dictionary constants;
 		GDVIRTUAL_CALL(_get_constants, constants);
-		List<Variant> keys;
-		constants.get_key_list(&keys);
-		for (const Variant &K : keys) {
-			p_constants->insert(K, constants[K]);
+		for (const KeyValue<Variant, Variant> &kv : constants) {
+			p_constants->insert(kv.key, kv.value);
 		}
 	}
 	GDVIRTUAL0RC_REQUIRED(TypedArray<StringName>, _get_members)
@@ -516,7 +513,7 @@ public:
 	virtual void debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1) override {
 		Dictionary ret;
 		GDVIRTUAL_CALL(_debug_get_stack_level_locals, p_level, p_max_subitems, p_max_depth, ret);
-		if (ret.size() == 0) {
+		if (ret.is_empty()) {
 			return;
 		}
 		if (p_locals != nullptr && ret.has("locals")) {
@@ -536,7 +533,7 @@ public:
 	virtual void debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1) override {
 		Dictionary ret;
 		GDVIRTUAL_CALL(_debug_get_stack_level_members, p_level, p_max_subitems, p_max_depth, ret);
-		if (ret.size() == 0) {
+		if (ret.is_empty()) {
 			return;
 		}
 		if (p_members != nullptr && ret.has("members")) {
@@ -563,7 +560,7 @@ public:
 	virtual void debug_get_globals(List<String> *p_globals, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1) override {
 		Dictionary ret;
 		GDVIRTUAL_CALL(_debug_get_globals, p_max_subitems, p_max_depth, ret);
-		if (ret.size() == 0) {
+		if (ret.is_empty()) {
 			return;
 		}
 		if (p_globals != nullptr && ret.has("globals")) {
@@ -714,11 +711,7 @@ public:
 
 	GDExtensionScriptInstanceDataPtr instance = nullptr;
 
-// There should not be warnings on explicit casts.
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wignored-qualifiers"
-#endif
+	GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wignored-qualifiers") // There should not be warnings on explicit casts.
 
 	virtual bool set(const StringName &p_name, const Variant &p_value) override {
 		if (native_info->set_func) {
@@ -966,9 +959,5 @@ public:
 #endif // DISABLE_DEPRECATED
 	}
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+	GODOT_GCC_WARNING_POP
 };
-
-#endif // SCRIPT_LANGUAGE_EXTENSION_H
diff --git a/engine/core/object/undo_redo.h b/engine/core/object/undo_redo.h
index ded96267..0be8dfb3 100644
--- a/engine/core/object/undo_redo.h
+++ b/engine/core/object/undo_redo.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UNDO_REDO_H
-#define UNDO_REDO_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
@@ -151,5 +150,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(UndoRedo::MergeMode);
-
-#endif // UNDO_REDO_H
diff --git a/engine/core/object/worker_thread_pool.cpp b/engine/core/object/worker_thread_pool.cpp
index 08903d61..3be0ce4b 100644
--- a/engine/core/object/worker_thread_pool.cpp
+++ b/engine/core/object/worker_thread_pool.cpp
@@ -37,6 +37,8 @@
 
 WorkerThreadPool::Task *const WorkerThreadPool::ThreadData::YIELDING = (Task *)1;
 
+HashMap<StringName, WorkerThreadPool *> WorkerThreadPool::named_pools;
+
 void WorkerThreadPool::Task::free_template_userdata() {
 	ERR_FAIL_NULL(template_userdata);
 	ERR_FAIL_NULL(native_func_userdata);
@@ -184,26 +186,34 @@ void WorkerThreadPool::_thread_function(void *p_user) {
 	while (true) {
 		Task *task_to_process = nullptr;
 		{
-			MutexLock lock(singleton->task_mutex);
+			// Create the lock outside the inner loop so it isn't needlessly unlocked and relocked
+			//  when no task was found to process, and the loop is re-entered.
+			MutexLock lock(thread_data->pool->task_mutex);
 
-			bool exit = singleton->_handle_runlevel(thread_data, lock);
-			if (unlikely(exit)) {
+			while (true) {
+				bool exit = thread_data->pool->_handle_runlevel(thread_data, lock);
+				if (unlikely(exit)) {
+					return;
+				}
+
+				thread_data->signaled = false;
+
+				if (!thread_data->pool->task_queue.first()) {
+					// There wasn't a task available yet.
+					// Let's wait for the next notification, then recheck.
+					thread_data->cond_var.wait(lock);
+					continue;
+				}
+
+				// Got a task to process! Remove it from the queue, then break into the task handling section.
+				task_to_process = thread_data->pool->task_queue.first()->self();
+				thread_data->pool->task_queue.remove(thread_data->pool->task_queue.first());
 				break;
 			}
-
-			thread_data->signaled = false;
-
-			if (singleton->task_queue.first()) {
-				task_to_process = singleton->task_queue.first()->self();
-				singleton->task_queue.remove(singleton->task_queue.first());
-			} else {
-				thread_data->cond_var.wait(lock);
-			}
 		}
 
-		if (task_to_process) {
-			singleton->_process_task(task_to_process);
-		}
+		DEV_ASSERT(task_to_process);
+		thread_data->pool->_process_task(task_to_process);
 	}
 }
 
@@ -211,7 +221,7 @@ void WorkerThreadPool::_post_tasks(Task **p_tasks, uint32_t p_count, bool p_high
 	// Fall back to processing on the calling thread if there are no worker threads.
 	// Separated into its own variable to make it easier to extend this logic
 	// in custom builds.
-	bool process_on_calling_thread = threads.size() == 0;
+	bool process_on_calling_thread = threads.is_empty();
 	if (process_on_calling_thread) {
 		p_lock.temp_unlock();
 		for (uint32_t i = 0; i < p_count; i++) {
@@ -497,7 +507,7 @@ void WorkerThreadPool::_wait_collaboratively(ThreadData *p_caller_pool_thread, T
 				}
 			}
 
-			if (singleton->task_queue.first()) {
+			if (p_caller_pool_thread->pool->task_queue.first()) {
 				task_to_process = task_queue.first()->self();
 				task_queue.remove(task_queue.first());
 			}
@@ -505,7 +515,9 @@ void WorkerThreadPool::_wait_collaboratively(ThreadData *p_caller_pool_thread, T
 			if (!task_to_process) {
 				p_caller_pool_thread->awaited_task = p_task;
 
-				_unlock_unlockable_mutexes();
+				if (this == singleton) {
+					_unlock_unlockable_mutexes();
+				}
 				relock_unlockables = true;
 
 				p_caller_pool_thread->cond_var.wait(lock);
@@ -514,7 +526,7 @@ void WorkerThreadPool::_wait_collaboratively(ThreadData *p_caller_pool_thread, T
 			}
 		}
 
-		if (relock_unlockables) {
+		if (relock_unlockables && this == singleton) {
 			_lock_unlockable_mutexes();
 		}
 
@@ -690,9 +702,13 @@ void WorkerThreadPool::wait_for_group_task_completion(GroupID p_group) {
 	{
 		Group *group = *groupp;
 
-		_unlock_unlockable_mutexes();
+		if (this == singleton) {
+			_unlock_unlockable_mutexes();
+		}
 		group->done_semaphore.wait();
-		_lock_unlockable_mutexes();
+		if (this == singleton) {
+			_lock_unlockable_mutexes();
+		}
 
 		uint32_t max_users = group->tasks_used + 1; // Add 1 because the thread waiting for it is also user. Read before to avoid another thread freeing task after increment.
 		uint32_t finished_users = group->finished.increment(); // fetch happens before inc, so increment later.
@@ -709,15 +725,15 @@ void WorkerThreadPool::wait_for_group_task_completion(GroupID p_group) {
 #endif
 }
 
-int WorkerThreadPool::get_thread_index() {
+int WorkerThreadPool::get_thread_index() const {
 	Thread::ID tid = Thread::get_caller_id();
-	return singleton->thread_ids.has(tid) ? singleton->thread_ids[tid] : -1;
+	return thread_ids.has(tid) ? thread_ids[tid] : -1;
 }
 
-WorkerThreadPool::TaskID WorkerThreadPool::get_caller_task_id() {
+WorkerThreadPool::TaskID WorkerThreadPool::get_caller_task_id() const {
 	int th_index = get_thread_index();
-	if (th_index != -1 && singleton->threads[th_index].current_task) {
-		return singleton->threads[th_index].current_task->self;
+	if (th_index != -1 && threads[th_index].current_task) {
+		return threads[th_index].current_task->self;
 	} else {
 		return INVALID_TASK_ID;
 	}
@@ -764,15 +780,29 @@ void WorkerThreadPool::init(int p_thread_count, float p_low_priority_task_ratio)
 
 	threads.resize(p_thread_count);
 
+	Thread::Settings settings;
+#ifdef __APPLE__
+	// The default stack size for new threads on Apple platforms is 512KiB.
+	// This is insufficient when using a library like SPIRV-Cross,
+	// which can generate deep stacks and result in a stack overflow.
+#ifdef DEV_ENABLED
+	// Debug builds need an even larger stack size.
+	settings.stack_size = 2 * 1024 * 1024; // 2 MiB
+#else
+	settings.stack_size = 1 * 1024 * 1024; // 1 MiB
+#endif
+#endif
+
 	for (uint32_t i = 0; i < threads.size(); i++) {
 		threads[i].index = i;
-		threads[i].thread.start(&WorkerThreadPool::_thread_function, &threads[i]);
+		threads[i].pool = this;
+		threads[i].thread.start(&WorkerThreadPool::_thread_function, &threads[i], settings);
 		thread_ids.insert(threads[i].thread.get_id(), i);
 	}
 }
 
 void WorkerThreadPool::exit_languages_threads() {
-	if (threads.size() == 0) {
+	if (threads.is_empty()) {
 		return;
 	}
 
@@ -792,7 +822,7 @@ void WorkerThreadPool::exit_languages_threads() {
 }
 
 void WorkerThreadPool::finish() {
-	if (threads.size() == 0) {
+	if (threads.is_empty()) {
 		return;
 	}
 
@@ -832,10 +862,33 @@ void WorkerThreadPool::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("wait_for_group_task_completion", "group_id"), &WorkerThreadPool::wait_for_group_task_completion);
 }
 
-WorkerThreadPool::WorkerThreadPool() {
-	singleton = this;
+WorkerThreadPool *WorkerThreadPool::get_named_pool(const StringName &p_name) {
+	WorkerThreadPool **pool_ptr = named_pools.getptr(p_name);
+	if (pool_ptr) {
+		return *pool_ptr;
+	} else {
+		WorkerThreadPool *pool = memnew(WorkerThreadPool(false));
+		pool->init();
+		named_pools[p_name] = pool;
+		return pool;
+	}
+}
+
+WorkerThreadPool::WorkerThreadPool(bool p_singleton) {
+	if (p_singleton) {
+		singleton = this;
+	}
 }
 
 WorkerThreadPool::~WorkerThreadPool() {
 	finish();
+
+	if (this == singleton) {
+		singleton = nullptr;
+		for (KeyValue<StringName, WorkerThreadPool *> &E : named_pools) {
+			E.value->finish();
+			memdelete(E.value);
+		}
+		named_pools.clear();
+	}
 }
diff --git a/engine/core/object/worker_thread_pool.h b/engine/core/object/worker_thread_pool.h
index 58e86e3e..d0cfea35 100644
--- a/engine/core/object/worker_thread_pool.h
+++ b/engine/core/object/worker_thread_pool.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WORKER_THREAD_POOL_H
-#define WORKER_THREAD_POOL_H
+#pragma once
 
 #include "core/os/condition_variable.h"
 #include "core/os/memory.h"
@@ -119,6 +118,7 @@ private:
 		Task *current_task = nullptr;
 		Task *awaited_task = nullptr; // Null if not awaiting the condition variable, or special value (YIELDING).
 		ConditionVariable cond_var;
+		WorkerThreadPool *pool = nullptr;
 
 		ThreadData() :
 				signaled(false),
@@ -166,6 +166,8 @@ private:
 
 	uint64_t last_task = 1;
 
+	static HashMap<StringName, WorkerThreadPool *> named_pools;
+
 	static void _thread_function(void *p_user);
 
 	void _process_task(Task *task);
@@ -266,9 +268,12 @@ public:
 #endif
 	}
 
+	// Note: Do not use this unless you know what you are doing, and it is absolutely necessary. Main thread pool (`get_singleton()`) should be preferred instead.
+	static WorkerThreadPool *get_named_pool(const StringName &p_name);
+
 	static WorkerThreadPool *get_singleton() { return singleton; }
-	static int get_thread_index();
-	static TaskID get_caller_task_id();
+	int get_thread_index() const;
+	TaskID get_caller_task_id() const;
 
 #ifdef THREADS_ENABLED
 	_ALWAYS_INLINE_ static uint32_t thread_enter_unlock_allowance_zone(const MutexLock<BinaryMutex> &p_lock) { return _thread_enter_unlock_allowance_zone(p_lock._get_lock()); }
@@ -285,8 +290,6 @@ public:
 	void init(int p_thread_count = -1, float p_low_priority_task_ratio = 0.3);
 	void exit_languages_threads();
 	void finish();
-	WorkerThreadPool();
+	WorkerThreadPool(bool p_singleton = true);
 	~WorkerThreadPool();
 };
-
-#endif // WORKER_THREAD_POOL_H
diff --git a/engine/core/os/condition_variable.h b/engine/core/os/condition_variable.h
index 6530b40b..4fbd55e8 100644
--- a/engine/core/os/condition_variable.h
+++ b/engine/core/os/condition_variable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONDITION_VARIABLE_H
-#define CONDITION_VARIABLE_H
+#pragma once
 
 #include "core/os/mutex.h"
 #include "core/os/safe_binary_mutex.h"
@@ -85,5 +84,3 @@ public:
 };
 
 #endif // THREADS_ENABLED
-
-#endif // CONDITION_VARIABLE_H
diff --git a/engine/core/os/keyboard.cpp b/engine/core/os/keyboard.cpp
index 973c216d..902d1af7 100644
--- a/engine/core/os/keyboard.cpp
+++ b/engine/core/os/keyboard.cpp
@@ -387,6 +387,10 @@ String keycode_get_string(Key p_code) {
 	}
 
 	p_code &= KeyModifierMask::CODE_MASK;
+	if ((char32_t)p_code == 0) {
+		// The key was just a modifier without any code.
+		return codestr;
+	}
 
 	const _KeyCodeText *kct = &_keycodes[0];
 
@@ -406,7 +410,7 @@ String keycode_get_string(Key p_code) {
 Key find_keycode(const String &p_codestr) {
 	Key keycode = Key::NONE;
 	Vector<String> code_parts = p_codestr.split("+");
-	if (code_parts.size() < 1) {
+	if (code_parts.is_empty()) {
 		return keycode;
 	}
 
diff --git a/engine/core/os/keyboard.h b/engine/core/os/keyboard.h
index 1485c519..40f1c886 100644
--- a/engine/core/os/keyboard.h
+++ b/engine/core/os/keyboard.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KEYBOARD_H
-#define KEYBOARD_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -347,5 +346,3 @@ const char *keycode_get_name_by_index(int p_index);
 char32_t fix_unicode(char32_t p_char);
 Key fix_keycode(char32_t p_char, Key p_key);
 Key fix_key_label(char32_t p_char, Key p_key);
-
-#endif // KEYBOARD_H
diff --git a/engine/core/os/main_loop.h b/engine/core/os/main_loop.h
index 9c22cbaf..baa6a528 100644
--- a/engine/core/os/main_loop.h
+++ b/engine/core/os/main_loop.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MAIN_LOOP_H
-#define MAIN_LOOP_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -71,5 +70,3 @@ public:
 	MainLoop() {}
 	virtual ~MainLoop() {}
 };
-
-#endif // MAIN_LOOP_H
diff --git a/engine/core/os/memory.h b/engine/core/os/memory.h
index 0071c3d5..9753d3c6 100644
--- a/engine/core/os/memory.h
+++ b/engine/core/os/memory.h
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MEMORY_H
-#define MEMORY_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/templates/safe_refcount.h"
 
-#include <stddef.h>
-#include <new>
+#include <cstring>
+#include <new> // IWYU pragma: keep // `new` operators.
 #include <type_traits>
 
 class Memory {
@@ -196,6 +195,22 @@ T *memnew_arr_template(size_t p_elements) {
 	return (T *)mem;
 }
 
+// Fast alternative to a loop constructor pattern.
+template <bool p_ensure_zero = false, typename T>
+_FORCE_INLINE_ void memnew_arr_placement(T *p_start, size_t p_num) {
+	if constexpr (std::is_trivially_constructible_v<T> && !p_ensure_zero) {
+		// Don't need to do anything :)
+	} else if constexpr (is_zero_constructible_v<T>) {
+		// Can optimize with memset.
+		memset(static_cast<void *>(p_start), 0, p_num * sizeof(T));
+	} else {
+		// Need to use a for loop.
+		for (size_t i = 0; i < p_num; i++) {
+			memnew_placement(p_start + i, T);
+		}
+	}
+}
+
 /**
  * Wonders of having own array functions, you can actually check the length of
  * an allocated-with memnew_arr() array
@@ -244,5 +259,3 @@ public:
 	_FORCE_INLINE_ T *new_allocation(const Args &&...p_args) { return memnew(T(p_args...)); }
 	_FORCE_INLINE_ void delete_allocation(T *p_allocation) { memdelete(p_allocation); }
 };
-
-#endif // MEMORY_H
diff --git a/engine/core/os/midi_driver.h b/engine/core/os/midi_driver.h
index ddce63f9..9ac37147 100644
--- a/engine/core/os/midi_driver.h
+++ b/engine/core/os/midi_driver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MIDI_DRIVER_H
-#define MIDI_DRIVER_H
+#pragma once
 
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
@@ -110,5 +109,3 @@ public:
 
 	PackedStringArray get_connected_inputs() const;
 };
-
-#endif // MIDI_DRIVER_H
diff --git a/engine/core/os/mutex.h b/engine/core/os/mutex.h
index c650d842..4b0d81e0 100644
--- a/engine/core/os/mutex.h
+++ b/engine/core/os/mutex.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MUTEX_H
-#define MUTEX_H
+#pragma once
 
 #include "core/typedefs.h"
 
@@ -127,5 +126,3 @@ using Mutex = MutexImpl;
 using BinaryMutex = MutexImpl;
 
 #endif // THREADS_ENABLED
-
-#endif // MUTEX_H
diff --git a/engine/core/os/os.cpp b/engine/core/os/os.cpp
index 46e51930..81fdd4f1 100644
--- a/engine/core/os/os.cpp
+++ b/engine/core/os/os.cpp
@@ -199,6 +199,14 @@ void OS::set_stderr_enabled(bool p_enabled) {
 	_stderr_enabled = p_enabled;
 }
 
+String OS::multibyte_to_string(const String &p_encoding, const PackedByteArray &p_array) const {
+	return String();
+}
+
+PackedByteArray OS::string_to_multibyte(const String &p_encoding, const String &p_string) const {
+	return PackedByteArray();
+}
+
 int OS::get_exit_code() const {
 	return _exit_code;
 }
@@ -214,7 +222,7 @@ String OS::get_locale() const {
 // Non-virtual helper to extract the 2 or 3-letter language code from
 // `get_locale()` in a way that's consistent for all platforms.
 String OS::get_locale_language() const {
-	return get_locale().left(3).replace("_", "");
+	return get_locale().left(3).remove_char('_');
 }
 
 // Embedded PCK offset.
@@ -246,7 +254,7 @@ String OS::get_safe_dir_name(const String &p_dir_name, bool p_allow_paths) const
 	if (p_allow_paths) {
 		// Dir separators are allowed, but disallow ".." to avoid going up the filesystem
 		invalid_chars.push_back("..");
-		safe_dir_name = safe_dir_name.replace("\\", "/").strip_edges();
+		safe_dir_name = safe_dir_name.replace_char('\\', '/').replace("//", "/").strip_edges();
 	} else {
 		invalid_chars.push_back("/");
 		invalid_chars.push_back("\\");
@@ -274,7 +282,7 @@ String OS::get_safe_dir_name(const String &p_dir_name, bool p_allow_paths) const
 // Get properly capitalized engine name for system paths
 String OS::get_godot_dir_name() const {
 	// Default to lowercase, so only override when different case is needed
-	return String(VERSION_SHORT_NAME).to_lower();
+	return String(GODOT_VERSION_SHORT_NAME).to_lower();
 }
 
 // OS equivalent of XDG_DATA_HOME
diff --git a/engine/core/os/os.h b/engine/core/os/os.h
index e0ec320e..51ea976d 100644
--- a/engine/core/os/os.h
+++ b/engine/core/os/os.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_H
-#define OS_H
+#pragma once
 
 #include "core/config/engine.h"
 #include "core/io/logger.h"
@@ -266,6 +265,9 @@ public:
 	virtual void set_crash_handler_silent() { _silent_crash_handler = true; }
 	virtual bool is_crash_handler_silent() { return _silent_crash_handler; }
 
+	virtual String multibyte_to_string(const String &p_encoding, const PackedByteArray &p_array) const;
+	virtual PackedByteArray string_to_multibyte(const String &p_encoding, const String &p_string) const;
+
 	virtual void disable_crash_handler() {}
 	virtual bool is_disable_crash_handler() const { return false; }
 	virtual void initialize_debugging() {}
@@ -362,12 +364,10 @@ public:
 	// This is invoked by the GDExtensionManager after loading GDExtensions specified by the project.
 	virtual void load_platform_gdextensions() const {}
 
-	// Windows only. Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some NVIDIA drivers.
-	virtual bool _test_create_rendering_device_and_gl() const { return true; }
-	virtual bool _test_create_rendering_device() const { return true; }
+	// Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some NVIDIA drivers.
+	virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const { return true; }
+	virtual bool _test_create_rendering_device(const String &p_display_driver) const { return true; }
 
 	OS();
 	virtual ~OS();
 };
-
-#endif // OS_H
diff --git a/engine/core/os/rw_lock.h b/engine/core/os/rw_lock.h
index e5bb6aec..521c1dea 100644
--- a/engine/core/os/rw_lock.h
+++ b/engine/core/os/rw_lock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RW_LOCK_H
-#define RW_LOCK_H
+#pragma once
 
 #include "core/typedefs.h"
 
@@ -102,5 +101,3 @@ public:
 		lock.write_unlock();
 	}
 };
-
-#endif // RW_LOCK_H
diff --git a/engine/core/os/safe_binary_mutex.h b/engine/core/os/safe_binary_mutex.h
index 74a20043..c353ca53 100644
--- a/engine/core/os/safe_binary_mutex.h
+++ b/engine/core/os/safe_binary_mutex.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SAFE_BINARY_MUTEX_H
-#define SAFE_BINARY_MUTEX_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/os/mutex.h"
@@ -37,10 +36,7 @@
 
 #ifdef THREADS_ENABLED
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wundefined-var-template"
-#endif
+GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wundefined-var-template")
 
 // A very special kind of mutex, used in scenarios where these
 // requirements hold at the same time:
@@ -120,9 +116,7 @@ public:
 	// TODO: Implement a `try_temp_relock` if needed (will also need a dummy method below).
 };
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+GODOT_CLANG_WARNING_POP
 
 #else // No threads.
 
@@ -149,5 +143,3 @@ public:
 };
 
 #endif // THREADS_ENABLED
-
-#endif // SAFE_BINARY_MUTEX_H
diff --git a/engine/core/os/semaphore.h b/engine/core/os/semaphore.h
index 19ef1ded..aae5d427 100644
--- a/engine/core/os/semaphore.h
+++ b/engine/core/os/semaphore.h
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SEMAPHORE_H
-#define SEMAPHORE_H
+#pragma once
 
-#include <cstdint>
+#include "core/typedefs.h"
 
 #ifdef THREADS_ENABLED
 
-#include "core/error/error_list.h"
-#include "core/typedefs.h"
 #ifdef DEBUG_ENABLED
 #include "core/error/error_macros.h"
 #endif
@@ -148,5 +145,3 @@ public:
 };
 
 #endif // THREADS_ENABLED
-
-#endif // SEMAPHORE_H
diff --git a/engine/core/os/shared_object.h b/engine/core/os/shared_object.h
index 88423bed..0045a51b 100644
--- a/engine/core/os/shared_object.h
+++ b/engine/core/os/shared_object.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHARED_OBJECT_H
-#define SHARED_OBJECT_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
@@ -47,5 +46,3 @@ struct SharedObject {
 
 	SharedObject() {}
 };
-
-#endif // SHARED_OBJECT_H
diff --git a/engine/core/os/spin_lock.h b/engine/core/os/spin_lock.h
index eb7b1721..c5d1a52c 100644
--- a/engine/core/os/spin_lock.h
+++ b/engine/core/os/spin_lock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPIN_LOCK_H
-#define SPIN_LOCK_H
+#pragma once
 
 #include "core/os/thread.h"
 #include "core/typedefs.h"
@@ -127,5 +126,3 @@ public:
 };
 
 #endif // THREADS_ENABLED
-
-#endif // SPIN_LOCK_H
diff --git a/engine/core/os/thread.h b/engine/core/os/thread.h
index 47299867..bb6d42c2 100644
--- a/engine/core/os/thread.h
+++ b/engine/core/os/thread.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include "platform_config.h"
 
 // Define PLATFORM_THREAD_OVERRIDE in your platform's `platform_config.h`
@@ -40,9 +42,6 @@
 
 #else
 
-#ifndef THREAD_H
-#define THREAD_H
-
 #include "core/typedefs.h"
 
 #ifdef THREADS_ENABLED
@@ -93,14 +92,9 @@ public:
 	};
 
 #if defined(__cpp_lib_hardware_interference_size) && !defined(ANDROID_ENABLED) // This would be OK with NDK >= 26.
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Winterference-size"
-#endif
+	GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Winterference-size")
 	static constexpr size_t CACHE_LINE_BYTES = std::hardware_destructive_interference_size;
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+	GODOT_GCC_WARNING_POP
 #else
 	// At a negligible memory cost, we use a conservatively high value.
 	static constexpr size_t CACHE_LINE_BYTES = 128;
@@ -125,6 +119,8 @@ private:
 public:
 	static void _set_platform_functions(const PlatformFunctions &p_functions);
 
+	_FORCE_INLINE_ static void yield() { std::this_thread::yield(); }
+
 	_FORCE_INLINE_ ID get_id() const { return id; }
 	// get the ID of the caller thread
 	_FORCE_INLINE_ static ID get_caller_id() {
@@ -208,6 +204,4 @@ public:
 
 #endif // THREADS_ENABLED
 
-#endif // THREAD_H
-
 #endif // PLATFORM_THREAD_OVERRIDE
diff --git a/engine/core/os/thread_safe.h b/engine/core/os/thread_safe.h
index f49592a4..2c909190 100644
--- a/engine/core/os/thread_safe.h
+++ b/engine/core/os/thread_safe.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THREAD_SAFE_H
-#define THREAD_SAFE_H
+#pragma once
 
 #include "core/os/mutex.h" // IWYU pragma: keep // Used in macro.
 
@@ -40,5 +39,3 @@
 
 bool is_current_thread_safe_for_nodes();
 void set_current_thread_safe_for_nodes(bool p_safe);
-
-#endif // THREAD_SAFE_H
diff --git a/engine/core/os/time.cpp b/engine/core/os/time.cpp
index d1d3588d..f25cc79c 100644
--- a/engine/core/os/time.cpp
+++ b/engine/core/os/time.cpp
@@ -233,15 +233,8 @@ Dictionary Time::get_time_dict_from_unix_time(int64_t p_unix_time_val) const {
 String Time::get_datetime_string_from_unix_time(int64_t p_unix_time_val, bool p_use_space) const {
 	UNIX_TIME_TO_HMS
 	UNIX_TIME_TO_YMD
-	// vformat only supports up to 6 arguments, so we need to split this up into 2 parts.
-	String timestamp = vformat("%04d-%02d-%02d", year, (uint8_t)month, day);
-	if (p_use_space) {
-		timestamp = vformat("%s %02d:%02d:%02d", timestamp, hour, minute, second);
-	} else {
-		timestamp = vformat("%sT%02d:%02d:%02d", timestamp, hour, minute, second);
-	}
-
-	return timestamp;
+	const String format_string = p_use_space ? "%04d-%02d-%02d %02d:%02d:%02d" : "%04d-%02d-%02dT%02d:%02d:%02d";
+	return vformat(format_string, year, (uint8_t)month, day, hour, minute, second);
 }
 
 String Time::get_date_string_from_unix_time(int64_t p_unix_time_val) const {
@@ -277,14 +270,8 @@ String Time::get_datetime_string_from_datetime_dict(const Dictionary &p_datetime
 	ERR_FAIL_COND_V_MSG(p_datetime.is_empty(), "", "Invalid datetime Dictionary: Dictionary is empty.");
 	EXTRACT_FROM_DICTIONARY
 	VALIDATE_YMDHMS("")
-	// vformat only supports up to 6 arguments, so we need to split this up into 2 parts.
-	String timestamp = vformat("%04d-%02d-%02d", year, (uint8_t)month, day);
-	if (p_use_space) {
-		timestamp = vformat("%s %02d:%02d:%02d", timestamp, hour, minute, second);
-	} else {
-		timestamp = vformat("%sT%02d:%02d:%02d", timestamp, hour, minute, second);
-	}
-	return timestamp;
+	const String format_string = p_use_space ? "%04d-%02d-%02d %02d:%02d:%02d" : "%04d-%02d-%02dT%02d:%02d:%02d";
+	return vformat(format_string, year, (uint8_t)month, day, hour, minute, second);
 }
 
 int64_t Time::get_unix_time_from_datetime_dict(const Dictionary &p_datetime) const {
@@ -352,15 +339,8 @@ Dictionary Time::get_time_dict_from_system(bool p_utc) const {
 
 String Time::get_datetime_string_from_system(bool p_utc, bool p_use_space) const {
 	OS::DateTime dt = OS::get_singleton()->get_datetime(p_utc);
-	// vformat only supports up to 6 arguments, so we need to split this up into 2 parts.
-	String timestamp = vformat("%04d-%02d-%02d", dt.year, (uint8_t)dt.month, dt.day);
-	if (p_use_space) {
-		timestamp = vformat("%s %02d:%02d:%02d", timestamp, dt.hour, dt.minute, dt.second);
-	} else {
-		timestamp = vformat("%sT%02d:%02d:%02d", timestamp, dt.hour, dt.minute, dt.second);
-	}
-
-	return timestamp;
+	const String format_string = p_use_space ? "%04d-%02d-%02d %02d:%02d:%02d" : "%04d-%02d-%02dT%02d:%02d:%02d";
+	return vformat(format_string, dt.year, (uint8_t)dt.month, dt.day, dt.hour, dt.minute, dt.second);
 }
 
 String Time::get_date_string_from_system(bool p_utc) const {
diff --git a/engine/core/os/time.h b/engine/core/os/time.h
index 6550cd90..3d1958dc 100644
--- a/engine/core/os/time.h
+++ b/engine/core/os/time.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TIME_H
-#define TIME_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "time_enums.h"
@@ -83,5 +82,3 @@ public:
 
 VARIANT_ENUM_CAST(Month);
 VARIANT_ENUM_CAST(Weekday);
-
-#endif // TIME_H
diff --git a/engine/core/os/time_enums.h b/engine/core/os/time_enums.h
index a61bdaa7..c7dc3123 100644
--- a/engine/core/os/time_enums.h
+++ b/engine/core/os/time_enums.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TIME_ENUMS_H
-#define TIME_ENUMS_H
+#pragma once
 
 #include <cstdint>
 
@@ -59,5 +58,3 @@ enum Weekday : uint8_t {
 	WEEKDAY_FRIDAY,
 	WEEKDAY_SATURDAY,
 };
-
-#endif // TIME_ENUMS_H
diff --git a/engine/core/register_core_types.cpp b/engine/core/register_core_types.cpp
index 568694bd..d76ebc2a 100644
--- a/engine/core/register_core_types.cpp
+++ b/engine/core/register_core_types.cpp
@@ -45,6 +45,7 @@
 #include "core/io/config_file.h"
 #include "core/io/dir_access.h"
 #include "core/io/dtls_server.h"
+#include "core/io/file_access_encrypted.h"
 #include "core/io/http_client.h"
 #include "core/io/image_loader.h"
 #include "core/io/json.h"
@@ -91,19 +92,19 @@ static Ref<GDExtensionResourceLoader> resource_loader_gdextension;
 static Ref<ResourceFormatSaverJSON> resource_saver_json;
 static Ref<ResourceFormatLoaderJSON> resource_loader_json;
 
-static core_bind::ResourceLoader *_resource_loader = nullptr;
-static core_bind::ResourceSaver *_resource_saver = nullptr;
-static core_bind::OS *_os = nullptr;
-static core_bind::Engine *_engine = nullptr;
-static core_bind::special::ClassDB *_classdb = nullptr;
-static core_bind::Marshalls *_marshalls = nullptr;
-static core_bind::EngineDebugger *_engine_debugger = nullptr;
+static CoreBind::ResourceLoader *_resource_loader = nullptr;
+static CoreBind::ResourceSaver *_resource_saver = nullptr;
+static CoreBind::OS *_os = nullptr;
+static CoreBind::Engine *_engine = nullptr;
+static CoreBind::Special::ClassDB *_classdb = nullptr;
+static CoreBind::Marshalls *_marshalls = nullptr;
+static CoreBind::EngineDebugger *_engine_debugger = nullptr;
 
 static IP *ip = nullptr;
 static Time *_time = nullptr;
 
-static core_bind::Geometry2D *_geometry_2d = nullptr;
-static core_bind::Geometry3D *_geometry_3d = nullptr;
+static CoreBind::Geometry2D *_geometry_2d = nullptr;
+static CoreBind::Geometry3D *_geometry_3d = nullptr;
 
 static WorkerThreadPool *worker_thread_pool = nullptr;
 
@@ -136,8 +137,10 @@ void register_core_types() {
 
 	CoreStringNames::create();
 
-	resource_format_po.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_format_po);
+	if (GD_IS_CLASS_ENABLED(Translation)) {
+		resource_format_po.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_format_po);
+	}
 
 	resource_saver_binary.instantiate();
 	ResourceSaver::add_resource_format_saver(resource_saver_binary);
@@ -150,8 +153,10 @@ void register_core_types() {
 	resource_format_importer_saver.instantiate();
 	ResourceSaver::add_resource_format_saver(resource_format_importer_saver);
 
-	resource_format_image.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_format_image);
+	if (GD_IS_CLASS_ENABLED(Image)) {
+		resource_format_image.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_format_image);
+	}
 
 	GDREGISTER_CLASS(Object);
 
@@ -218,16 +223,21 @@ void register_core_types() {
 	ClassDB::register_custom_instance_class<PacketPeerDTLS>();
 	ClassDB::register_custom_instance_class<DTLSServer>();
 
-	resource_format_saver_crypto.instantiate();
-	ResourceSaver::add_resource_format_saver(resource_format_saver_crypto);
-	resource_format_loader_crypto.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_format_loader_crypto);
+	if (GD_IS_CLASS_ENABLED(Crypto)) {
+		resource_format_saver_crypto.instantiate();
+		ResourceSaver::add_resource_format_saver(resource_format_saver_crypto);
 
-	resource_loader_json.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_json);
+		resource_format_loader_crypto.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_format_loader_crypto);
+	}
 
-	resource_saver_json.instantiate();
-	ResourceSaver::add_resource_format_saver(resource_saver_json);
+	if (GD_IS_CLASS_ENABLED(JSON)) {
+		resource_saver_json.instantiate();
+		ResourceSaver::add_resource_format_saver(resource_saver_json);
+
+		resource_loader_json.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_json);
+	}
 
 	GDREGISTER_CLASS(MainLoop);
 	GDREGISTER_CLASS(Translation);
@@ -241,9 +251,9 @@ void register_core_types() {
 
 	GDREGISTER_ABSTRACT_CLASS(FileAccess);
 	GDREGISTER_ABSTRACT_CLASS(DirAccess);
-	GDREGISTER_CLASS(core_bind::Thread);
-	GDREGISTER_CLASS(core_bind::Mutex);
-	GDREGISTER_CLASS(core_bind::Semaphore);
+	GDREGISTER_CLASS(CoreBind::Thread);
+	GDREGISTER_CLASS(CoreBind::Mutex);
+	GDREGISTER_CLASS(CoreBind::Semaphore);
 
 	GDREGISTER_CLASS(XMLParser);
 	GDREGISTER_CLASS(JSON);
@@ -276,21 +286,23 @@ void register_core_types() {
 
 	gdextension_manager = memnew(GDExtensionManager);
 
-	resource_loader_gdextension.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_gdextension);
+	if (GD_IS_CLASS_ENABLED(GDExtension)) {
+		resource_loader_gdextension.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_gdextension);
+	}
 
 	ip = IP::create();
 
-	_geometry_2d = memnew(core_bind::Geometry2D);
-	_geometry_3d = memnew(core_bind::Geometry3D);
+	_geometry_2d = memnew(CoreBind::Geometry2D);
+	_geometry_3d = memnew(CoreBind::Geometry3D);
 
-	_resource_loader = memnew(core_bind::ResourceLoader);
-	_resource_saver = memnew(core_bind::ResourceSaver);
-	_os = memnew(core_bind::OS);
-	_engine = memnew(core_bind::Engine);
-	_classdb = memnew(core_bind::special::ClassDB);
-	_marshalls = memnew(core_bind::Marshalls);
-	_engine_debugger = memnew(core_bind::EngineDebugger);
+	_resource_loader = memnew(CoreBind::ResourceLoader);
+	_resource_saver = memnew(CoreBind::ResourceSaver);
+	_os = memnew(CoreBind::OS);
+	_engine = memnew(CoreBind::Engine);
+	_classdb = memnew(CoreBind::Special::ClassDB);
+	_marshalls = memnew(CoreBind::Marshalls);
+	_engine_debugger = memnew(CoreBind::EngineDebugger);
 
 	GDREGISTER_NATIVE_STRUCT(ObjectID, "uint64_t id = 0");
 	GDREGISTER_NATIVE_STRUCT(AudioFrame, "float left;float right");
@@ -312,14 +324,14 @@ void register_core_settings() {
 }
 
 void register_early_core_singletons() {
-	GDREGISTER_CLASS(core_bind::Engine);
-	Engine::get_singleton()->add_singleton(Engine::Singleton("Engine", core_bind::Engine::get_singleton()));
+	GDREGISTER_CLASS(CoreBind::Engine);
+	Engine::get_singleton()->add_singleton(Engine::Singleton("Engine", CoreBind::Engine::get_singleton()));
 
 	GDREGISTER_CLASS(ProjectSettings);
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ProjectSettings", ProjectSettings::get_singleton()));
 
-	GDREGISTER_CLASS(core_bind::OS);
-	Engine::get_singleton()->add_singleton(Engine::Singleton("OS", core_bind::OS::get_singleton()));
+	GDREGISTER_CLASS(CoreBind::OS);
+	Engine::get_singleton()->add_singleton(Engine::Singleton("OS", CoreBind::OS::get_singleton()));
 
 	GDREGISTER_CLASS(Time);
 	Engine::get_singleton()->add_singleton(Engine::Singleton("Time", Time::get_singleton()));
@@ -329,29 +341,29 @@ void register_core_singletons() {
 	OS::get_singleton()->benchmark_begin_measure("Core", "Register Singletons");
 
 	GDREGISTER_ABSTRACT_CLASS(IP);
-	GDREGISTER_CLASS(core_bind::Geometry2D);
-	GDREGISTER_CLASS(core_bind::Geometry3D);
-	GDREGISTER_CLASS(core_bind::ResourceLoader);
-	GDREGISTER_CLASS(core_bind::ResourceSaver);
-	GDREGISTER_CLASS(core_bind::special::ClassDB);
-	GDREGISTER_CLASS(core_bind::Marshalls);
+	GDREGISTER_CLASS(CoreBind::Geometry2D);
+	GDREGISTER_CLASS(CoreBind::Geometry3D);
+	GDREGISTER_CLASS(CoreBind::ResourceLoader);
+	GDREGISTER_CLASS(CoreBind::ResourceSaver);
+	GDREGISTER_CLASS(CoreBind::Special::ClassDB);
+	GDREGISTER_CLASS(CoreBind::Marshalls);
 	GDREGISTER_CLASS(TranslationServer);
 	GDREGISTER_ABSTRACT_CLASS(Input);
 	GDREGISTER_CLASS(InputMap);
 	GDREGISTER_CLASS(Expression);
-	GDREGISTER_CLASS(core_bind::EngineDebugger);
+	GDREGISTER_CLASS(CoreBind::EngineDebugger);
 
 	Engine::get_singleton()->add_singleton(Engine::Singleton("IP", IP::get_singleton(), "IP"));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("Geometry2D", core_bind::Geometry2D::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("Geometry3D", core_bind::Geometry3D::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceLoader", core_bind::ResourceLoader::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceSaver", core_bind::ResourceSaver::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("Geometry2D", CoreBind::Geometry2D::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("Geometry3D", CoreBind::Geometry3D::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceLoader", CoreBind::ResourceLoader::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceSaver", CoreBind::ResourceSaver::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ClassDB", _classdb));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("Marshalls", core_bind::Marshalls::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("Marshalls", CoreBind::Marshalls::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("TranslationServer", TranslationServer::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("Input", Input::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("InputMap", InputMap::get_singleton()));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("EngineDebugger", core_bind::EngineDebugger::get_singleton()));
+	Engine::get_singleton()->add_singleton(Engine::Singleton("EngineDebugger", CoreBind::EngineDebugger::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("GDExtensionManager", GDExtensionManager::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("ResourceUID", ResourceUID::get_singleton()));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("WorkerThreadPool", worker_thread_pool));
@@ -408,8 +420,10 @@ void unregister_core_types() {
 		memdelete(ip);
 	}
 
-	ResourceLoader::remove_resource_format_loader(resource_format_image);
-	resource_format_image.unref();
+	if (GD_IS_CLASS_ENABLED(Image)) {
+		ResourceLoader::remove_resource_format_loader(resource_format_image);
+		resource_format_image.unref();
+	}
 
 	ResourceSaver::remove_resource_format_saver(resource_saver_binary);
 	resource_saver_binary.unref();
@@ -423,22 +437,31 @@ void unregister_core_types() {
 	ResourceSaver::remove_resource_format_saver(resource_format_importer_saver);
 	resource_format_importer_saver.unref();
 
-	ResourceLoader::remove_resource_format_loader(resource_format_po);
-	resource_format_po.unref();
+	if (GD_IS_CLASS_ENABLED(Translation)) {
+		ResourceLoader::remove_resource_format_loader(resource_format_po);
+		resource_format_po.unref();
+	}
 
-	ResourceSaver::remove_resource_format_saver(resource_format_saver_crypto);
-	resource_format_saver_crypto.unref();
-	ResourceLoader::remove_resource_format_loader(resource_format_loader_crypto);
-	resource_format_loader_crypto.unref();
+	if (GD_IS_CLASS_ENABLED(Crypto)) {
+		ResourceSaver::remove_resource_format_saver(resource_format_saver_crypto);
+		resource_format_saver_crypto.unref();
 
-	ResourceSaver::remove_resource_format_saver(resource_saver_json);
-	resource_saver_json.unref();
+		ResourceLoader::remove_resource_format_loader(resource_format_loader_crypto);
+		resource_format_loader_crypto.unref();
+	}
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_json);
-	resource_loader_json.unref();
+	if (GD_IS_CLASS_ENABLED(JSON)) {
+		ResourceSaver::remove_resource_format_saver(resource_saver_json);
+		resource_saver_json.unref();
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_gdextension);
-	resource_loader_gdextension.unref();
+		ResourceLoader::remove_resource_format_loader(resource_loader_json);
+		resource_loader_json.unref();
+	}
+
+	if (GD_IS_CLASS_ENABLED(GDExtension)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_gdextension);
+		resource_loader_gdextension.unref();
+	}
 
 	ResourceLoader::finalize();
 
@@ -455,5 +478,7 @@ void unregister_core_types() {
 	CoreStringNames::free();
 	StringName::cleanup();
 
+	FileAccessEncrypted::deinitialize();
+
 	OS::get_singleton()->benchmark_end_measure("Core", "Unregister Types");
 }
diff --git a/engine/core/register_core_types.h b/engine/core/register_core_types.h
index b8db5c5d..d4c1224b 100644
--- a/engine/core/register_core_types.h
+++ b/engine/core/register_core_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_CORE_TYPES_H
-#define REGISTER_CORE_TYPES_H
+#pragma once
 
 void register_core_types();
 void register_core_settings();
@@ -38,5 +37,3 @@ void register_early_core_singletons();
 void register_core_singletons();
 void unregister_core_types();
 void unregister_core_extensions();
-
-#endif // REGISTER_CORE_TYPES_H
diff --git a/engine/core/string/char_range.inc b/engine/core/string/char_range.inc
index efae7578..860ff567 100644
--- a/engine/core/string/char_range.inc
+++ b/engine/core/string/char_range.inc
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CHAR_RANGE_INC
-#define CHAR_RANGE_INC
+#pragma once
 
 #include "core/typedefs.h"
 
@@ -43,7 +42,7 @@ struct CharRange {
 
 constexpr inline CharRange xid_start[] = {
 	{ 0x41, 0x5a },
-	{ 0x5f, 0x5f }, // Underscore technically isn't in XID_Start, but for our purposes it's included.
+	{ 0x5f, 0x5f },
 	{ 0x61, 0x7a },
 	{ 0xaa, 0xaa },
 	{ 0xb5, 0xb5 },
@@ -3629,4 +3628,42 @@ constexpr inline CharRange unicode_letter[] = {
 	{ 0x31350, 0x323af },
 };
 
-#endif // CHAR_RANGE_INC
+// OEM encodings for Alt codes input.
+
+inline constexpr char32_t alt_code_oem437[256] = {
+	0x0000, 0x263a, 0x263b, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, 0x25d8, 0x25cb, 0x25d9, 0x2642, 0x2640, 0x266a, 0x266b, 0x263c,
+	0x25ba, 0x25c4, 0x2195, 0x203c, 0x00b6, 0x00a7, 0x25ac, 0x21a8, 0x2191, 0x2193, 0x2192, 0x2190, 0x221f, 0x2194, 0x25b2, 0x25bc,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x2302,
+	0x00c7, 0x00fc, 0x00e9, 0x00e2, 0x00e4, 0x00e0, 0x00e5, 0x00e7, 0x00ea, 0x00eb, 0x00e8, 0x00ef, 0x00ee, 0x00ec, 0x00c4, 0x00c5,
+	0x00c9, 0x00e6, 0x00c6, 0x00f4, 0x00f6, 0x00f2, 0x00fb, 0x00f9, 0x00ff, 0x00d6, 0x00dc, 0x00a2, 0x00a3, 0x00a5, 0x20a7, 0x0192,
+	0x00e1, 0x00ed, 0x00f3, 0x00fa, 0x00f1, 0x00d1, 0x00aa, 0x00ba, 0x00bf, 0x2310, 0x00ac, 0x00bd, 0x00bc, 0x00a1, 0x00ab, 0x00bb,
+	0x2591, 0x2592, 0x2593, 0x2502, 0x2524, 0x2561, 0x2562, 0x2556, 0x2555, 0x2563, 0x2551, 0x2557, 0x255d, 0x255c, 0x255b, 0x2510,
+	0x2514, 0x2534, 0x252c, 0x251c, 0x2500, 0x253c, 0x255e, 0x255f, 0x255a, 0x2554, 0x2569, 0x2566, 0x2560, 0x2550, 0x256c, 0x2567,
+	0x2568, 0x2564, 0x2565, 0x2559, 0x2558, 0x2552, 0x2553, 0x256b, 0x256a, 0x2518, 0x250c, 0x2588, 0x2584, 0x258c, 0x2590, 0x2580,
+	0x03b1, 0x00df, 0x0393, 0x03c0, 0x03a3, 0x03c3, 0x00b5, 0x03a4, 0x03a6, 0x0398, 0x03a9, 0x03b4, 0x221e, 0x03c6, 0x03b5, 0x2229,
+	0x2261, 0x00b1, 0x2265, 0x2264, 0x2320, 0x2321, 0x00f7, 0x2248, 0x00b0, 0x2219, 0x00b7, 0x221a, 0x207f, 0x00b2, 0x25a0, 0x00a0
+};
+
+inline constexpr char32_t alt_code_cp1252[256] = {
+	0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f,
+	0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019, 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f,
+	0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d, 0x002e, 0x002f,
+	0x0030, 0x0031, 0x0032, 0x0033, 0x0034, 0x0035, 0x0036, 0x0037, 0x0038, 0x0039, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f,
+	0x0040, 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004a, 0x004b, 0x004c, 0x004d, 0x004e, 0x004f,
+	0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005a, 0x005b, 0x005c, 0x005d, 0x005e, 0x005f,
+	0x0060, 0x0061, 0x0062, 0x0063, 0x0064, 0x0065, 0x0066, 0x0067, 0x0068, 0x0069, 0x006a, 0x006b, 0x006c, 0x006d, 0x006e, 0x006f,
+	0x0070, 0x0071, 0x0072, 0x0073, 0x0074, 0x0075, 0x0076, 0x0077, 0x0078, 0x0079, 0x007a, 0x007b, 0x007c, 0x007d, 0x007e, 0x007f,
+	0x20ac, 0x0081, 0x201a, 0x0192, 0x201e, 0x2026, 0x2020, 0x2021, 0x02c6, 0x2030, 0x0160, 0x2039, 0x0152, 0x008d, 0x017d, 0x008f,
+	0x0090, 0x2018, 0x2019, 0x201c, 0x201d, 0x2022, 0x2013, 0x2014, 0x02dc, 0x2122, 0x0161, 0x203a, 0x0153, 0x009d, 0x017e, 0x0178,
+	0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af,
+	0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
+	0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x00c9, 0x00ca, 0x00cb, 0x00cc, 0x00cd, 0x00ce, 0x00cf,
+	0x00d0, 0x00d1, 0x00d2, 0x00d3, 0x00d4, 0x00d5, 0x00d6, 0x00d7, 0x00d8, 0x00d9, 0x00da, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x00df,
+	0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x00e8, 0x00e9, 0x00ea, 0x00eb, 0x00ec, 0x00ed, 0x00ee, 0x00ef,
+	0x00f0, 0x00f1, 0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6, 0x00f7, 0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
+};
diff --git a/engine/core/string/char_utils.h b/engine/core/string/char_utils.h
index c14851f9..f0499761 100644
--- a/engine/core/string/char_utils.h
+++ b/engine/core/string/char_utils.h
@@ -28,30 +28,34 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CHAR_UTILS_H
-#define CHAR_UTILS_H
+#pragma once
 
 #include "core/typedefs.h"
 
 #include "char_range.inc"
 
-#define BSEARCH_CHAR_RANGE(m_array)                      \
-	int low = 0;                                         \
-	int high = sizeof(m_array) / sizeof(m_array[0]) - 1; \
-	int middle = (low + high) / 2;                       \
-                                                         \
-	while (low <= high) {                                \
-		if (p_char < m_array[middle].start) {            \
-			high = middle - 1;                           \
-		} else if (p_char > m_array[middle].end) {       \
-			low = middle + 1;                            \
-		} else {                                         \
-			return true;                                 \
-		}                                                \
-                                                         \
-		middle = (low + high) / 2;                       \
-	}                                                    \
-                                                         \
+#include <iterator>
+
+static constexpr char hex_char_table_upper[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+static constexpr char hex_char_table_lower[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+#define BSEARCH_CHAR_RANGE(m_array)                \
+	int low = 0;                                   \
+	int high = std::size(m_array) - 1;             \
+	int middle = (low + high) / 2;                 \
+                                                   \
+	while (low <= high) {                          \
+		if (p_char < m_array[middle].start) {      \
+			high = middle - 1;                     \
+		} else if (p_char > m_array[middle].end) { \
+			low = middle + 1;                      \
+		} else {                                   \
+			return true;                           \
+		}                                          \
+                                                   \
+		middle = (low + high) / 2;                 \
+	}                                              \
+                                                   \
 	return false
 
 constexpr bool is_unicode_identifier_start(char32_t p_char) {
@@ -132,4 +136,6 @@ constexpr bool is_underscore(char32_t p_char) {
 	return (p_char == '_');
 }
 
-#endif // CHAR_UTILS_H
+constexpr bool is_hyphen(char32_t p_char) {
+	return (p_char == '-') || (p_char == 0x2010) || (p_char == 0x2011);
+}
diff --git a/engine/core/string/fuzzy_search.h b/engine/core/string/fuzzy_search.h
index 5d8ed813..e9572689 100644
--- a/engine/core/string/fuzzy_search.h
+++ b/engine/core/string/fuzzy_search.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FUZZY_SEARCH_H
-#define FUZZY_SEARCH_H
+#pragma once
 
 #include "core/variant/variant.h"
 
@@ -97,5 +96,3 @@ public:
 	bool search(const String &p_target, FuzzySearchResult &p_result) const;
 	void search_all(const PackedStringArray &p_targets, Vector<FuzzySearchResult> &p_results) const;
 };
-
-#endif // FUZZY_SEARCH_H
diff --git a/engine/core/string/locales.h b/engine/core/string/locales.h
index 840fca65..ceab379e 100644
--- a/engine/core/string/locales.h
+++ b/engine/core/string/locales.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LOCALES_H
-#define LOCALES_H
+#pragma once
 
 // Windows has some weird locale identifiers which do not honor the ISO 639-1
 // standardized nomenclature. Whenever those don't conflict with existing ISO
@@ -1195,5 +1194,3 @@ static const char *script_list[][2] = {
 	{ "Zanabazar Square", "Zanb" },
 	{ nullptr, nullptr }
 };
-
-#endif // LOCALES_H
diff --git a/engine/core/string/node_path.cpp b/engine/core/string/node_path.cpp
index 3ab8eb86..3ff12103 100644
--- a/engine/core/string/node_path.cpp
+++ b/engine/core/string/node_path.cpp
@@ -350,7 +350,7 @@ void NodePath::simplify() {
 			data->path.remove_at(i - 1);
 			data->path.remove_at(i - 1);
 			i -= 2;
-			if (data->path.size() == 0) {
+			if (data->path.is_empty()) {
 				data->path.push_back(".");
 				break;
 			}
@@ -366,7 +366,7 @@ NodePath NodePath::simplified() const {
 }
 
 NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute) {
-	if (p_path.size() == 0 && !p_absolute) {
+	if (p_path.is_empty() && !p_absolute) {
 		return;
 	}
 
@@ -378,7 +378,7 @@ NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute) {
 }
 
 NodePath::NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p_subpath, bool p_absolute) {
-	if (p_path.size() == 0 && p_subpath.size() == 0 && !p_absolute) {
+	if (p_path.is_empty() && p_subpath.is_empty() && !p_absolute) {
 		return;
 	}
 
diff --git a/engine/core/string/node_path.h b/engine/core/string/node_path.h
index 56799839..2dce2d1c 100644
--- a/engine/core/string/node_path.h
+++ b/engine/core/string/node_path.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NODE_PATH_H
-#define NODE_PATH_H
+#pragma once
 
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
@@ -97,4 +96,6 @@ public:
 	~NodePath();
 };
 
-#endif // NODE_PATH_H
+// Zero-constructing NodePath initializes data to nullptr (and thus empty).
+template <>
+struct is_zero_constructible<NodePath> : std::true_type {};
diff --git a/engine/core/string/optimized_translation.cpp b/engine/core/string/optimized_translation.cpp
index 71be8524..7481929e 100644
--- a/engine/core/string/optimized_translation.cpp
+++ b/engine/core/string/optimized_translation.cpp
@@ -110,7 +110,7 @@ void OptimizedTranslation::generate(const Ref<Translation> &p_from) {
 		const Vector<Pair<int, CharString>> &b = buckets[i];
 		HashMap<uint32_t, int> &t = table.write[i];
 
-		if (b.size() == 0) {
+		if (b.is_empty()) {
 			continue;
 		}
 
@@ -148,7 +148,7 @@ void OptimizedTranslation::generate(const Ref<Translation> &p_from) {
 
 	for (int i = 0; i < size; i++) {
 		const HashMap<uint32_t, int> &t = table[i];
-		if (t.size() == 0) {
+		if (t.is_empty()) {
 			htw[i] = 0xFFFFFFFF; //nothing
 			continue;
 		}
@@ -253,17 +253,12 @@ StringName OptimizedTranslation::get_message(const StringName &p_src_text, const
 	}
 
 	if (bucket.elem[idx].comp_size == bucket.elem[idx].uncomp_size) {
-		String rstr;
-		rstr.parse_utf8(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].uncomp_size);
-
-		return rstr;
+		return String::utf8(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].uncomp_size);
 	} else {
 		CharString uncomp;
 		uncomp.resize(bucket.elem[idx].uncomp_size + 1);
 		smaz_decompress(&sptr[bucket.elem[idx].str_offset], bucket.elem[idx].comp_size, uncomp.ptrw(), bucket.elem[idx].uncomp_size);
-		String rstr;
-		rstr.parse_utf8(uncomp.get_data());
-		return rstr;
+		return String::utf8(uncomp.get_data());
 	}
 }
 
@@ -283,15 +278,13 @@ Vector<String> OptimizedTranslation::get_translated_message_list() const {
 			const Bucket &bucket = *(const Bucket *)&btptr[p];
 			for (int j = 0; j < bucket.size; j++) {
 				if (bucket.elem[j].comp_size == bucket.elem[j].uncomp_size) {
-					String rstr;
-					rstr.parse_utf8(&sptr[bucket.elem[j].str_offset], bucket.elem[j].uncomp_size);
+					String rstr = String::utf8(&sptr[bucket.elem[j].str_offset], bucket.elem[j].uncomp_size);
 					msgs.push_back(rstr);
 				} else {
 					CharString uncomp;
 					uncomp.resize(bucket.elem[j].uncomp_size + 1);
 					smaz_decompress(&sptr[bucket.elem[j].str_offset], bucket.elem[j].comp_size, uncomp.ptrw(), bucket.elem[j].uncomp_size);
-					String rstr;
-					rstr.parse_utf8(uncomp.get_data());
+					String rstr = String::utf8(uncomp.get_data());
 					msgs.push_back(rstr);
 				}
 			}
diff --git a/engine/core/string/optimized_translation.h b/engine/core/string/optimized_translation.h
index 3992cc51..fc4f4468 100644
--- a/engine/core/string/optimized_translation.h
+++ b/engine/core/string/optimized_translation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPTIMIZED_TRANSLATION_H
-#define OPTIMIZED_TRANSLATION_H
+#pragma once
 
 #include "core/string/translation.h"
 
@@ -65,7 +64,7 @@ class OptimizedTranslation : public Translation {
 			d = 0x1000193;
 		}
 		while (*p_str) {
-			d = (d * 0x1000193) ^ uint32_t(*p_str);
+			d = (d * 0x1000193) ^ static_cast<uint8_t>(*p_str);
 			p_str++;
 		}
 
@@ -86,5 +85,3 @@ public:
 
 	OptimizedTranslation() {}
 };
-
-#endif // OPTIMIZED_TRANSLATION_H
diff --git a/engine/core/string/print_string.cpp b/engine/core/string/print_string.cpp
index 08628814..9d01efd8 100644
--- a/engine/core/string/print_string.cpp
+++ b/engine/core/string/print_string.cpp
@@ -110,7 +110,7 @@ void __print_line_rich(const String &p_string) {
 		int brk_end = p_string.find_char(']', brk_pos + 1);
 
 		if (brk_end == -1) {
-			txt += p_string.substr(brk_pos, p_string.length() - brk_pos);
+			txt += p_string.substr(brk_pos);
 			output += txt;
 			break;
 		}
diff --git a/engine/core/string/print_string.h b/engine/core/string/print_string.h
index 570e08c5..4eb31608 100644
--- a/engine/core/string/print_string.h
+++ b/engine/core/string/print_string.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PRINT_STRING_H
-#define PRINT_STRING_H
+#pragma once
 
 #include "core/variant/variant.h"
 
@@ -86,5 +85,3 @@ template <typename... Args>
 void print_line_rich(const Variant &p_var, Args... p_args) {
 	__print_line_rich(stringify_variants(p_var, p_args...));
 }
-
-#endif // PRINT_STRING_H
diff --git a/engine/core/string/string_buffer.h b/engine/core/string/string_buffer.h
index c1cdd38e..5a4e66f5 100644
--- a/engine/core/string/string_buffer.h
+++ b/engine/core/string/string_buffer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STRING_BUFFER_H
-#define STRING_BUFFER_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -158,5 +157,3 @@ int64_t StringBuffer<SHORT_BUFFER_SIZE>::as_int() {
 	current_buffer_ptr()[string_length] = '\0';
 	return String::to_int(current_buffer_ptr());
 }
-
-#endif // STRING_BUFFER_H
diff --git a/engine/core/string/string_builder.h b/engine/core/string/string_builder.h
index 3ba279b4..69a87983 100644
--- a/engine/core/string/string_builder.h
+++ b/engine/core/string/string_builder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STRING_BUILDER_H
-#define STRING_BUILDER_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/local_vector.h"
@@ -80,5 +79,3 @@ public:
 
 	StringBuilder() {}
 };
-
-#endif // STRING_BUILDER_H
diff --git a/engine/core/string/string_name.h b/engine/core/string/string_name.h
index 743eab9d..53d8b4f2 100644
--- a/engine/core/string/string_name.h
+++ b/engine/core/string/string_name.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STRING_NAME_H
-#define STRING_NAME_H
+#pragma once
 
 #include "core/os/mutex.h"
 #include "core/string/ustring.h"
@@ -167,24 +166,49 @@ public:
 	static StringName search(const String &p_name);
 
 	struct AlphCompare {
-		_FORCE_INLINE_ bool operator()(const StringName &l, const StringName &r) const {
+		template <typename LT, typename RT>
+		_FORCE_INLINE_ bool operator()(const LT &l, const RT &r) const {
+			return compare(l, r);
+		}
+		_FORCE_INLINE_ static bool compare(const StringName &l, const StringName &r) {
 			const char *l_cname = l._data ? l._data->cname : "";
 			const char *r_cname = r._data ? r._data->cname : "";
 
 			if (l_cname) {
 				if (r_cname) {
-					return is_str_less(l_cname, r_cname);
+					return str_compare(l_cname, r_cname) < 0;
 				} else {
-					return is_str_less(l_cname, r._data->name.ptr());
+					return str_compare(l_cname, r._data->name.ptr()) < 0;
 				}
 			} else {
 				if (r_cname) {
-					return is_str_less(l._data->name.ptr(), r_cname);
+					return str_compare(l._data->name.ptr(), r_cname) < 0;
 				} else {
-					return is_str_less(l._data->name.ptr(), r._data->name.ptr());
+					return str_compare(l._data->name.ptr(), r._data->name.ptr()) < 0;
 				}
 			}
 		}
+		_FORCE_INLINE_ static bool compare(const String &l, const StringName &r) {
+			const char *r_cname = r._data ? r._data->cname : "";
+
+			if (r_cname) {
+				return str_compare(l.get_data(), r_cname) < 0;
+			} else {
+				return str_compare(l.get_data(), r._data->name.ptr()) < 0;
+			}
+		}
+		_FORCE_INLINE_ static bool compare(const StringName &l, const String &r) {
+			const char *l_cname = l._data ? l._data->cname : "";
+
+			if (l_cname) {
+				return str_compare(l_cname, r.get_data()) < 0;
+			} else {
+				return str_compare(l._data->name.ptr(), r.get_data()) < 0;
+			}
+		}
+		_FORCE_INLINE_ static bool compare(const String &l, const String &r) {
+			return str_compare(l.get_data(), r.get_data()) < 0;
+		}
 	};
 
 	StringName &operator=(const StringName &p_name);
@@ -209,7 +233,13 @@ public:
 	StringName() {}
 
 	static void assign_static_unique_class_name(StringName *ptr, const char *p_name);
-	_FORCE_INLINE_ ~StringName() {
+
+#ifdef SIZE_EXTRA
+	_NO_INLINE_
+#else
+	_FORCE_INLINE_
+#endif
+	~StringName() {
 		if (likely(configured) && _data) { //only free if configured
 			unref();
 		}
@@ -220,6 +250,10 @@ public:
 #endif
 };
 
+// Zero-constructing StringName initializes _data to nullptr (and thus empty).
+template <>
+struct is_zero_constructible<StringName> : std::true_type {};
+
 bool operator==(const String &p_name, const StringName &p_string_name);
 bool operator!=(const String &p_name, const StringName &p_string_name);
 bool operator==(const char *p_name, const StringName &p_string_name);
@@ -240,5 +274,3 @@ StringName _scs_create(const char *p_chr, bool p_static = false);
  */
 
 #define SNAME(m_arg) ([]() -> const StringName & { static StringName sname = _scs_create(m_arg, true); return sname; })()
-
-#endif // STRING_NAME_H
diff --git a/engine/core/string/translation.cpp b/engine/core/string/translation.cpp
index d944135a..c6ea0ac1 100644
--- a/engine/core/string/translation.cpp
+++ b/engine/core/string/translation.cpp
@@ -67,10 +67,8 @@ Vector<String> Translation::get_translated_message_list() const {
 }
 
 void Translation::_set_messages(const Dictionary &p_messages) {
-	List<Variant> keys;
-	p_messages.get_key_list(&keys);
-	for (const Variant &E : keys) {
-		translation_map[E] = p_messages[E];
+	for (const KeyValue<Variant, Variant> &kv : p_messages) {
+		translation_map[kv.key] = kv.value;
 	}
 }
 
diff --git a/engine/core/string/translation.h b/engine/core/string/translation.h
index 4e8cffc9..b8c5b0a7 100644
--- a/engine/core/string/translation.h
+++ b/engine/core/string/translation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSLATION_H
-#define TRANSLATION_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -69,5 +68,3 @@ public:
 
 	Translation() {}
 };
-
-#endif // TRANSLATION_H
diff --git a/engine/core/string/translation_domain.cpp b/engine/core/string/translation_domain.cpp
index 1ff8dcd7..cd27fdba 100644
--- a/engine/core/string/translation_domain.cpp
+++ b/engine/core/string/translation_domain.cpp
@@ -182,7 +182,7 @@ const char32_t *TranslationDomain::_get_accented_version(char32_t p_character) c
 		return nullptr;
 	}
 
-	for (unsigned int i = 0; i < sizeof(_character_to_accented) / sizeof(_character_to_accented[0]); i++) {
+	for (unsigned int i = 0; i < std::size(_character_to_accented); i++) {
 		if (_character_to_accented[i].character == p_character) {
 			return _character_to_accented[i].accented_character;
 		}
diff --git a/engine/core/string/translation_domain.h b/engine/core/string/translation_domain.h
index 55592d3b..0b62352d 100644
--- a/engine/core/string/translation_domain.h
+++ b/engine/core/string/translation_domain.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSLATION_DOMAIN_H
-#define TRANSLATION_DOMAIN_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -103,5 +102,3 @@ public:
 
 	TranslationDomain();
 };
-
-#endif // TRANSLATION_DOMAIN_H
diff --git a/engine/core/string/translation_po.cpp b/engine/core/string/translation_po.cpp
index 7eb8a2af..8ff9006a 100644
--- a/engine/core/string/translation_po.cpp
+++ b/engine/core/string/translation_po.cpp
@@ -30,9 +30,9 @@
 
 #include "translation_po.h"
 
+#ifdef DEBUG_TRANSLATION_PO
 #include "core/io/file_access.h"
 
-#ifdef DEBUG_TRANSLATION_PO
 void TranslationPO::print_translation_map() {
 	Error err;
 	Ref<FileAccess> file = FileAccess::open("translation_map_print_test.txt", FileAccess::WRITE, &err);
@@ -53,8 +53,7 @@ void TranslationPO::print_translation_map() {
 
 		List<StringName> id_l;
 		inner_map.get_key_list(&id_l);
-		for (List<StringName>::Element *E2 = id_l.front(); E2; E2 = E2->next()) {
-			StringName id = E2->get();
+		for (const StringName &id : id_l) {
 			file->store_line("msgid: " + String::utf8(String(id).utf8()));
 			for (int i = 0; i < inner_map[id].size(); i++) {
 				file->store_line("msgstr[" + String::num_int64(i) + "]: " + String::utf8(String(inner_map[id][i]).utf8()));
@@ -86,20 +85,16 @@ Dictionary TranslationPO::_get_messages() const {
 void TranslationPO::_set_messages(const Dictionary &p_messages) {
 	// Construct translation_map from a Dictionary.
 
-	List<Variant> context_l;
-	p_messages.get_key_list(&context_l);
-	for (const Variant &ctx : context_l) {
-		const Dictionary &id_str_map = p_messages[ctx];
+	for (const KeyValue<Variant, Variant> &kv : p_messages) {
+		const Dictionary &id_str_map = kv.value;
 
 		HashMap<StringName, Vector<StringName>> temp_map;
-		List<Variant> id_l;
-		id_str_map.get_key_list(&id_l);
-		for (List<Variant>::Element *E2 = id_l.front(); E2; E2 = E2->next()) {
-			StringName id = E2->get();
-			temp_map[id] = id_str_map[id];
+		for (const KeyValue<Variant, Variant> &kv_id : id_str_map) {
+			StringName id = kv_id.key;
+			temp_map[id] = kv_id.value;
 		}
 
-		translation_map[ctx] = temp_map;
+		translation_map[kv.key] = temp_map;
 	}
 }
 
diff --git a/engine/core/string/translation_po.h b/engine/core/string/translation_po.h
index ba820c6e..570c008f 100644
--- a/engine/core/string/translation_po.h
+++ b/engine/core/string/translation_po.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSLATION_PO_H
-#define TRANSLATION_PO_H
+#pragma once
 
 //#define DEBUG_TRANSLATION_PO
 
@@ -99,5 +98,3 @@ public:
 
 	TranslationPO() {}
 };
-
-#endif // TRANSLATION_PO_H
diff --git a/engine/core/string/translation_server.cpp b/engine/core/string/translation_server.cpp
index a1ca194c..db37b375 100644
--- a/engine/core/string/translation_server.cpp
+++ b/engine/core/string/translation_server.cpp
@@ -135,10 +135,10 @@ TranslationServer::Locale::operator String() const {
 
 TranslationServer::Locale::Locale(const TranslationServer &p_server, const String &p_locale, bool p_add_defaults) {
 	// Replaces '-' with '_' for macOS style locales.
-	String univ_locale = p_locale.replace("-", "_");
+	String univ_locale = p_locale.replace_char('-', '_');
 
 	// Extract locale elements.
-	Vector<String> locale_elements = univ_locale.get_slice("@", 0).split("_");
+	Vector<String> locale_elements = univ_locale.get_slicec('@', 0).split("_");
 	language = locale_elements[0];
 	if (locale_elements.size() >= 2) {
 		if (locale_elements[1].length() == 4 && is_ascii_upper_case(locale_elements[1][0]) && is_ascii_lower_case(locale_elements[1][1]) && is_ascii_lower_case(locale_elements[1][2]) && is_ascii_lower_case(locale_elements[1][3])) {
@@ -162,7 +162,7 @@ TranslationServer::Locale::Locale(const TranslationServer &p_server, const Strin
 	}
 
 	// Try extract script and variant from the extra part.
-	Vector<String> script_extra = univ_locale.get_slice("@", 1).split(";");
+	Vector<String> script_extra = univ_locale.get_slicec('@', 1).split(";");
 	for (int i = 0; i < script_extra.size(); i++) {
 		if (script_extra[i].to_lower() == "cyrillic") {
 			script = "Cyrl";
@@ -504,10 +504,10 @@ String TranslationServer::get_tool_locale() {
 #ifdef TOOLS_ENABLED
 	if (Engine::get_singleton()->is_editor_hint() || Engine::get_singleton()->is_project_manager_hint()) {
 		const PackedStringArray &locales = editor_domain->get_loaded_locales();
-		if (locales.is_empty()) {
-			return "en";
+		if (locales.has(locale)) {
+			return locale;
 		}
-		return locales[0];
+		return "en";
 	} else {
 #else
 	{
diff --git a/engine/core/string/translation_server.h b/engine/core/string/translation_server.h
index b6e4bba6..c8755716 100644
--- a/engine/core/string/translation_server.h
+++ b/engine/core/string/translation_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TRANSLATION_SERVER_H
-#define TRANSLATION_SERVER_H
+#pragma once
 
 #include "core/string/translation.h"
 #include "core/string/translation_domain.h"
@@ -160,5 +159,3 @@ public:
 
 	TranslationServer();
 };
-
-#endif // TRANSLATION_SERVER_H
diff --git a/engine/core/string/ucaps.h b/engine/core/string/ucaps.h
index ea58331b..6cda79e0 100644
--- a/engine/core/string/ucaps.h
+++ b/engine/core/string/ucaps.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UCAPS_H
-#define UCAPS_H
+#pragma once
 
 // This file was generated using the `misc/scripts/ucaps_fetch.py` script.
 
@@ -3018,5 +3017,3 @@ static int _find_lower(int ch) {
 
 	return ch;
 }
-
-#endif // UCAPS_H
diff --git a/engine/core/string/ustring.cpp b/engine/core/string/ustring.cpp
index 63739432..c2f6c3b4 100644
--- a/engine/core/string/ustring.cpp
+++ b/engine/core/string/ustring.cpp
@@ -34,6 +34,8 @@
 #include "core/math/color.h"
 #include "core/math/math_funcs.h"
 #include "core/object/object.h"
+#include "core/os/memory.h"
+#include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/string_name.h"
 #include "core/string/translation_server.h"
@@ -97,7 +99,7 @@ bool Char16String::operator<(const Char16String &p_right) const {
 		return p_right.length() != 0;
 	}
 
-	return is_str_less(get_data(), p_right.get_data());
+	return str_compare(get_data(), p_right.get_data()) < 0;
 }
 
 Char16String &Char16String::operator+=(char16_t p_char) {
@@ -155,7 +157,7 @@ bool CharString::operator<(const CharString &p_right) const {
 		return p_right.length() != 0;
 	}
 
-	return is_str_less(get_data(), p_right.get_data());
+	return str_compare(get_data(), p_right.get_data()) < 0;
 }
 
 bool CharString::operator==(const CharString &p_right) const {
@@ -238,7 +240,7 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
 		}
 		if (is_scheme_valid) {
 			r_scheme = base.substr(0, pos + 3).to_lower();
-			base = base.substr(pos + 3, base.length() - pos - 3);
+			base = base.substr(pos + 3);
 		}
 	}
 	pos = base.find_char('#');
@@ -250,14 +252,14 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
 	pos = base.find_char('/');
 	// Path
 	if (pos != -1) {
-		r_path = base.substr(pos, base.length() - pos);
+		r_path = base.substr(pos);
 		base = base.substr(0, pos);
 	}
 	// Host
 	pos = base.find_char('@');
 	if (pos != -1) {
 		// Strip credentials
-		base = base.substr(pos + 1, base.length() - pos - 1);
+		base = base.substr(pos + 1);
 	}
 	if (base.begins_with("[")) {
 		// Literal IPv6
@@ -266,7 +268,7 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
 			return ERR_INVALID_PARAMETER;
 		}
 		r_host = base.substr(1, pos - 1);
-		base = base.substr(pos + 1, base.length() - pos - 1);
+		base = base.substr(pos + 1);
 	} else {
 		// Anything else
 		if (base.get_slice_count(":") > 2) {
@@ -278,7 +280,7 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
 			base = "";
 		} else {
 			r_host = base.substr(0, pos);
-			base = base.substr(pos, base.length() - pos);
+			base = base.substr(pos);
 		}
 	}
 	if (r_host.is_empty()) {
@@ -287,7 +289,7 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
 	r_host = r_host.to_lower();
 	// Port
 	if (base.begins_with(":")) {
-		base = base.substr(1, base.length() - 1);
+		base = base.substr(1);
 		if (!base.is_valid_int()) {
 			return ERR_INVALID_PARAMETER;
 		}
@@ -299,17 +301,17 @@ Error String::parse_url(String &r_scheme, String &r_host, int &r_port, String &r
 	return OK;
 }
 
-void String::parse_latin1(const StrRange<char> &p_cstr) {
-	if (p_cstr.len == 0) {
-		resize(0);
+void String::append_latin1(const Span<char> &p_cstr) {
+	if (p_cstr.is_empty()) {
 		return;
 	}
 
-	resize(p_cstr.len + 1); // include 0
+	const int prev_length = length();
+	resize(prev_length + p_cstr.size() + 1); // include 0
 
-	const char *src = p_cstr.c_str;
-	const char *end = src + p_cstr.len;
-	char32_t *dst = ptrw();
+	const char *src = p_cstr.ptr();
+	const char *end = src + p_cstr.size();
+	char32_t *dst = ptrw() + prev_length;
 
 	for (; src < end; ++src, ++dst) {
 		// If char is int8_t, a set sign bit will be reinterpreted as 256 - val implicitly.
@@ -318,57 +320,27 @@ void String::parse_latin1(const StrRange<char> &p_cstr) {
 	*dst = 0;
 }
 
-void String::parse_utf32(const StrRange<char32_t> &p_cstr) {
-	if (p_cstr.len == 0) {
-		resize(0);
+void String::append_utf32(const Span<char32_t> &p_cstr) {
+	if (p_cstr.is_empty()) {
 		return;
 	}
 
-	copy_from_unchecked(p_cstr.c_str, p_cstr.len);
-}
+	const int prev_length = length();
+	resize(prev_length + p_cstr.size() + 1);
+	const char32_t *src = p_cstr.ptr();
+	const char32_t *end = p_cstr.ptr() + p_cstr.size();
+	char32_t *dst = ptrw() + prev_length;
 
-void String::parse_utf32(const char32_t &p_char) {
-	if (p_char == 0) {
-		print_unicode_error("NUL character", true);
-		return;
-	}
-
-	resize(2);
-
-	char32_t *dst = ptrw();
-
-	if ((p_char & 0xfffff800) == 0xd800) {
-		print_unicode_error(vformat("Unpaired surrogate (%x)", (uint32_t)p_char));
-		dst[0] = _replacement_char;
-	} else if (p_char > 0x10ffff) {
-		print_unicode_error(vformat("Invalid unicode codepoint (%x)", (uint32_t)p_char));
-		dst[0] = _replacement_char;
-	} else {
-		dst[0] = p_char;
-	}
-
-	dst[1] = 0;
-}
-
-// assumes the following have already been validated:
-// p_char != nullptr
-// p_length > 0
-// p_length <= p_char strlen
-void String::copy_from_unchecked(const char32_t *p_char, const int p_length) {
-	resize(p_length + 1);
-
-	const char32_t *end = p_char + p_length;
-	char32_t *dst = ptrw();
-
-	for (; p_char < end; ++p_char, ++dst) {
-		const char32_t chr = *p_char;
+	// Copy the string, and check for UTF-32 problems.
+	for (; src < end; ++src, ++dst) {
+		const char32_t chr = *src;
 		if ((chr & 0xfffff800) == 0xd800) {
-			print_unicode_error(vformat("Unpaired surrogate (%x)", (uint32_t)chr));
+			print_unicode_error(vformat("Unpaired surrogate (%x)", (uint32_t)chr), true);
 			*dst = _replacement_char;
 			continue;
 		}
 		if (chr > 0x10ffff) {
-			print_unicode_error(vformat("Invalid unicode codepoint (%x)", (uint32_t)chr));
+			print_unicode_error(vformat("Invalid unicode codepoint (%x)", (uint32_t)chr), true);
 			*dst = _replacement_char;
 			continue;
 		}
@@ -377,12 +349,42 @@ void String::copy_from_unchecked(const char32_t *p_char, const int p_length) {
 	*dst = 0;
 }
 
+// assumes the following have already been validated:
+// p_char != nullptr
+// p_length > 0
+// p_length <= p_char strlen
+// p_char is a valid UTF32 string
+void String::copy_from_unchecked(const char32_t *p_char, const int p_length) {
+	resize(p_length + 1); // + 1 for \0
+	char32_t *dst = ptrw();
+	memcpy(dst, p_char, p_length * sizeof(char32_t));
+	*(dst + p_length) = _null;
+}
+
 String String::operator+(const String &p_str) const {
 	String res = *this;
 	res += p_str;
 	return res;
 }
 
+String String::operator+(const char *p_str) const {
+	String res = *this;
+	res += p_str;
+	return res;
+}
+
+String String::operator+(const wchar_t *p_str) const {
+	String res = *this;
+	res += p_str;
+	return res;
+}
+
+String String::operator+(const char32_t *p_str) const {
+	String res = *this;
+	res += p_str;
+	return res;
+}
+
 String String::operator+(char32_t p_char) const {
 	String res = *this;
 	res += p_char;
@@ -412,55 +414,16 @@ String operator+(char32_t p_chr, const String &p_str) {
 }
 
 String &String::operator+=(const String &p_str) {
-	const int lhs_len = length();
-	if (lhs_len == 0) {
+	if (is_empty()) {
 		*this = p_str;
 		return *this;
 	}
-
-	const int rhs_len = p_str.length();
-	if (rhs_len == 0) {
-		return *this;
-	}
-
-	resize(lhs_len + rhs_len + 1);
-
-	const char32_t *src = p_str.ptr();
-	char32_t *dst = ptrw() + lhs_len;
-
-	// Don't copy the terminating null with `memcpy` to avoid undefined behavior when string is being added to itself (it would overlap the destination).
-	memcpy(dst, src, rhs_len * sizeof(char32_t));
-	*(dst + rhs_len) = _null;
-
+	append_utf32(p_str);
 	return *this;
 }
 
 String &String::operator+=(const char *p_str) {
-	if (!p_str || p_str[0] == 0) {
-		return *this;
-	}
-
-	const int lhs_len = length();
-	const size_t rhs_len = strlen(p_str);
-
-	resize(lhs_len + rhs_len + 1);
-
-	char32_t *dst = ptrw() + lhs_len;
-
-	for (size_t i = 0; i <= rhs_len; i++) {
-#if CHAR_MIN == 0
-		uint8_t c = p_str[i];
-#else
-		uint8_t c = p_str[i] >= 0 ? p_str[i] : uint8_t(256 + p_str[i]);
-#endif
-		if (c == 0 && i < rhs_len) {
-			print_unicode_error("NUL character", true);
-			dst[i] = _replacement_char;
-		} else {
-			dst[i] = c;
-		}
-	}
-
+	append_latin1(p_str);
 	return *this;
 }
 
@@ -476,32 +439,12 @@ String &String::operator+=(const wchar_t *p_str) {
 }
 
 String &String::operator+=(const char32_t *p_str) {
-	*this += String(p_str);
+	append_utf32(Span(p_str, strlen(p_str)));
 	return *this;
 }
 
 String &String::operator+=(char32_t p_char) {
-	if (p_char == 0) {
-		print_unicode_error("NUL character", true);
-		return *this;
-	}
-
-	const int lhs_len = length();
-	resize(lhs_len + 2);
-	char32_t *dst = ptrw();
-
-	if ((p_char & 0xfffff800) == 0xd800) {
-		print_unicode_error(vformat("Unpaired surrogate (%x)", (uint32_t)p_char));
-		dst[lhs_len] = _replacement_char;
-	} else if (p_char > 0x10ffff) {
-		print_unicode_error(vformat("Invalid unicode codepoint (%x)", (uint32_t)p_char));
-		dst[lhs_len] = _replacement_char;
-	} else {
-		dst[lhs_len] = p_char;
-	}
-
-	dst[lhs_len + 1] = 0;
-
+	append_utf32(Span(&p_char, 1));
 	return *this;
 }
 
@@ -564,8 +507,8 @@ bool String::operator==(const String &p_str) const {
 	return memcmp(ptr(), p_str.ptr(), length() * sizeof(char32_t)) == 0;
 }
 
-bool String::operator==(const StrRange<char32_t> &p_str_range) const {
-	const int len = p_str_range.len;
+bool String::operator==(const Span<char32_t> &p_str_range) const {
+	const int len = p_str_range.size();
 
 	if (length() != len) {
 		return false;
@@ -574,7 +517,7 @@ bool String::operator==(const StrRange<char32_t> &p_str_range) const {
 		return true;
 	}
 
-	return memcmp(ptr(), p_str_range.c_str, len * sizeof(char32_t)) == 0;
+	return memcmp(ptr(), p_str_range.ptr(), len * sizeof(char32_t)) == 0;
 }
 
 bool operator==(const char *p_chr, const String &p_str) {
@@ -640,7 +583,7 @@ bool String::operator<(const char *p_str) const {
 	if (is_empty()) {
 		return true;
 	}
-	return is_str_less(get_data(), p_str);
+	return str_compare(get_data(), p_str) < 0;
 }
 
 bool String::operator<(const wchar_t *p_str) const {
@@ -653,10 +596,10 @@ bool String::operator<(const wchar_t *p_str) const {
 
 #ifdef WINDOWS_ENABLED
 	// wchar_t is 16-bit
-	return is_str_less(get_data(), String::utf16((const char16_t *)p_str).get_data());
+	return str_compare(get_data(), String::utf16((const char16_t *)p_str).get_data()) < 0;
 #else
 	// wchar_t is 32-bit
-	return is_str_less(get_data(), (const char32_t *)p_str);
+	return str_compare(get_data(), (const char32_t *)p_str) < 0;
 #endif
 }
 
@@ -668,7 +611,7 @@ bool String::operator<(const char32_t *p_str) const {
 		return true;
 	}
 
-	return is_str_less(get_data(), p_str);
+	return str_compare(get_data(), p_str) < 0;
 }
 
 bool String::operator<(const String &p_str) const {
@@ -939,15 +882,15 @@ const char32_t *String::get_data() const {
 	return size() ? &operator[](0) : &zero;
 }
 
-String String::_camelcase_to_underscore() const {
-	const char32_t *cstr = get_data();
-	String new_string;
-	int start_index = 0;
-
+String String::_separate_compound_words() const {
 	if (length() == 0) {
 		return *this;
 	}
 
+	const char32_t *cstr = get_data();
+	int start_index = 0;
+	String new_string;
+
 	bool is_prev_upper = is_unicode_upper_case(cstr[0]);
 	bool is_prev_lower = is_unicode_lower_case(cstr[0]);
 	bool is_prev_digit = is_digit(cstr[0]);
@@ -968,7 +911,7 @@ String String::_camelcase_to_underscore() const {
 		const bool cond_d = (is_prev_upper || is_prev_lower) && is_curr_digit; // A2, a2
 
 		if (cond_a || cond_b || cond_c || cond_d) {
-			new_string += substr(start_index, i - start_index) + "_";
+			new_string += substr(start_index, i - start_index) + " ";
 			start_index = i;
 		}
 
@@ -978,40 +921,72 @@ String String::_camelcase_to_underscore() const {
 	}
 
 	new_string += substr(start_index, size() - start_index);
+
+	for (int i = 0; i < new_string.size(); i++) {
+		const bool whitespace = is_whitespace(new_string[i]);
+		const bool underscore = is_underscore(new_string[i]);
+		const bool hyphen = is_hyphen(new_string[i]);
+
+		if (whitespace || underscore || hyphen) {
+			new_string[i] = ' ';
+		}
+	}
+
 	return new_string.to_lower();
 }
 
 String String::capitalize() const {
-	String aux = _camelcase_to_underscore().replace("_", " ").strip_edges();
-	String cap;
-	for (int i = 0; i < aux.get_slice_count(" "); i++) {
-		String slice = aux.get_slicec(' ', i);
+	String words = _separate_compound_words().strip_edges();
+	String ret;
+	for (int i = 0; i < words.get_slice_count(" "); i++) {
+		String slice = words.get_slicec(' ', i);
 		if (slice.length() > 0) {
 			slice[0] = _find_upper(slice[0]);
 			if (i > 0) {
-				cap += " ";
+				ret += " ";
 			}
-			cap += slice;
+			ret += slice;
 		}
 	}
-
-	return cap;
+	return ret;
 }
 
 String String::to_camel_case() const {
-	String s = to_pascal_case();
-	if (!s.is_empty()) {
-		s[0] = _find_lower(s[0]);
+	String words = _separate_compound_words().strip_edges();
+	String ret;
+	for (int i = 0; i < words.get_slice_count(" "); i++) {
+		String slice = words.get_slicec(' ', i);
+		if (slice.length() > 0) {
+			if (i == 0) {
+				slice[0] = _find_lower(slice[0]);
+			} else {
+				slice[0] = _find_upper(slice[0]);
+			}
+			ret += slice;
+		}
 	}
-	return s;
+	return ret;
 }
 
 String String::to_pascal_case() const {
-	return capitalize().replace(" ", "");
+	String words = _separate_compound_words().strip_edges();
+	String ret;
+	for (int i = 0; i < words.get_slice_count(" "); i++) {
+		String slice = words.get_slicec(' ', i);
+		if (slice.length() > 0) {
+			slice[0] = _find_upper(slice[0]);
+			ret += slice;
+		}
+	}
+	return ret;
 }
 
 String String::to_snake_case() const {
-	return _camelcase_to_underscore().replace(" ", "_").strip_edges();
+	return _separate_compound_words().replace_char(' ', '_');
+}
+
+String String::to_kebab_case() const {
+	return _separate_compound_words().replace_char(' ', '-');
 }
 
 String String::get_with_code_lines() const {
@@ -1175,7 +1150,7 @@ String String::get_slicec(char32_t p_splitter, int p_slice) const {
 	}
 }
 
-Vector<String> String::split_spaces() const {
+Vector<String> String::split_spaces(int p_maxsplit) const {
 	Vector<String> ret;
 	int from = 0;
 	int i = 0;
@@ -1199,6 +1174,11 @@ Vector<String> String::split_spaces() const {
 		}
 
 		if (empty && inside) {
+			if (p_maxsplit > 0 && p_maxsplit == ret.size()) {
+				// Put rest of the string and leave cycle.
+				ret.push_back(substr(from));
+				break;
+			}
 			ret.push_back(substr(from, i - from));
 			inside = false;
 		}
@@ -1593,11 +1573,6 @@ String String::to_lower() const {
 	return lower;
 }
 
-String String::chr(char32_t p_char) {
-	char32_t c[2] = { p_char, 0 };
-	return String(c);
-}
-
 String String::num(double p_num, int p_decimals) {
 	if (Math::is_nan(p_num)) {
 		return "nan";
@@ -1716,7 +1691,7 @@ String String::num_int64(int64_t p_num, int base, bool capitalize_hex) {
 	c[chars] = 0;
 	n = p_num;
 	do {
-		int mod = ABS(n % base);
+		int mod = Math::abs(n % base);
 		if (mod >= 10) {
 			char a = (capitalize_hex ? 'A' : 'a');
 			c[--chars] = a + (mod - 10);
@@ -1921,23 +1896,46 @@ CharString String::ascii(bool p_allow_extended) const {
 	return cs;
 }
 
+Error String::append_ascii(const Span<char> &p_range) {
+	if (p_range.is_empty()) {
+		return OK;
+	}
+
+	const int prev_length = length();
+	resize(prev_length + p_range.size() + 1); // Include \0
+
+	const char *src = p_range.ptr();
+	const char *end = src + p_range.size();
+	char32_t *dst = ptrw() + prev_length;
+	bool decode_failed = false;
+
+	for (; src < end; ++src, ++dst) {
+		// If char is int8_t, a set sign bit will be reinterpreted as 256 - val implicitly.
+		const uint8_t chr = *src;
+		if (chr > 127) {
+			print_unicode_error(vformat("Invalid ASCII codepoint (%x)", (uint32_t)chr), true);
+			decode_failed = true;
+			*dst = _replacement_char;
+		} else {
+			*dst = chr;
+		}
+	}
+	*dst = _null;
+	return decode_failed ? ERR_INVALID_DATA : OK;
+}
+
 String String::utf8(const char *p_utf8, int p_len) {
 	String ret;
-	ret.parse_utf8(p_utf8, p_len);
+	ret.append_utf8(p_utf8, p_len);
 
 	return ret;
 }
 
-Error String::parse_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
+Error String::append_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
 	if (!p_utf8) {
 		return ERR_INVALID_DATA;
 	}
 
-	String aux;
-
-	int cstr_size = 0;
-	int str_size = 0;
-
 	/* HANDLE BOM (Byte Order Mark) */
 	if (p_len < 0 || p_len >= 3) {
 		bool has_bom = uint8_t(p_utf8[0]) == 0xef && uint8_t(p_utf8[1]) == 0xbb && uint8_t(p_utf8[2]) == 0xbf;
@@ -1950,192 +1948,202 @@ Error String::parse_utf8(const char *p_utf8, int p_len, bool p_skip_cr) {
 		}
 	}
 
-	bool decode_error = false;
-	bool decode_failed = false;
-	{
-		const char *ptrtmp = p_utf8;
-		const char *ptrtmp_limit = p_len >= 0 ? &p_utf8[p_len] : nullptr;
-		int skip = 0;
-		uint8_t c_start = 0;
-		while (ptrtmp != ptrtmp_limit && *ptrtmp) {
-#if CHAR_MIN == 0
-			uint8_t c = *ptrtmp;
-#else
-			uint8_t c = *ptrtmp >= 0 ? *ptrtmp : uint8_t(256 + *ptrtmp);
-#endif
-
-			if (skip == 0) {
-				if (p_skip_cr && c == '\r') {
-					ptrtmp++;
-					continue;
-				}
-				/* Determine the number of characters in sequence */
-				if ((c & 0x80) == 0) {
-					skip = 0;
-				} else if ((c & 0xe0) == 0xc0) {
-					skip = 1;
-				} else if ((c & 0xf0) == 0xe0) {
-					skip = 2;
-				} else if ((c & 0xf8) == 0xf0) {
-					skip = 3;
-				} else if ((c & 0xfc) == 0xf8) {
-					skip = 4;
-				} else if ((c & 0xfe) == 0xfc) {
-					skip = 5;
-				} else {
-					skip = 0;
-					print_unicode_error(vformat("Invalid UTF-8 leading byte (%x)", c), true);
-					decode_failed = true;
-				}
-				c_start = c;
-
-				if (skip == 1 && (c & 0x1e) == 0) {
-					print_unicode_error(vformat("Overlong encoding (%x ...)", c));
-					decode_error = true;
-				}
-				str_size++;
-			} else {
-				if ((c_start == 0xe0 && skip == 2 && c < 0xa0) || (c_start == 0xf0 && skip == 3 && c < 0x90) || (c_start == 0xf8 && skip == 4 && c < 0x88) || (c_start == 0xfc && skip == 5 && c < 0x84)) {
-					print_unicode_error(vformat("Overlong encoding (%x %x ...)", c_start, c));
-					decode_error = true;
-				}
-				if (c < 0x80 || c > 0xbf) {
-					print_unicode_error(vformat("Invalid UTF-8 continuation byte (%x ... %x ...)", c_start, c), true);
-					decode_failed = true;
-					skip = 0;
-				} else {
-					--skip;
-				}
-			}
-
-			cstr_size++;
-			ptrtmp++;
-		}
-
-		if (skip) {
-			print_unicode_error(vformat("Missing %d UTF-8 continuation byte(s)", skip), true);
-			decode_failed = true;
-		}
+	if (p_len < 0) {
+		p_len = strlen(p_utf8);
 	}
 
-	if (str_size == 0) {
-		clear();
-		return OK; // empty string
-	}
+	const int prev_length = length();
+	// If all utf8 characters maps to ASCII, then the max size will be p_len, and we add +1 for the null termination.
+	resize(prev_length + p_len + 1);
+	char32_t *dst = ptrw() + prev_length;
 
-	resize(str_size + 1);
-	char32_t *dst = ptrw();
-	dst[str_size] = 0;
+	Error result = Error::OK;
 
-	int skip = 0;
-	uint32_t unichar = 0;
-	while (cstr_size) {
-#if CHAR_MIN == 0
-		uint8_t c = *p_utf8;
-#else
-		uint8_t c = *p_utf8 >= 0 ? *p_utf8 : uint8_t(256 + *p_utf8);
-#endif
+	const uint8_t *ptrtmp = (uint8_t *)p_utf8;
+	const uint8_t *ptr_limit = (uint8_t *)p_utf8 + p_len;
 
-		if (skip == 0) {
-			if (p_skip_cr && c == '\r') {
-				p_utf8++;
-				continue;
+	while (ptrtmp < ptr_limit && *ptrtmp) {
+		uint8_t c = *ptrtmp;
+
+		if (p_skip_cr && c == '\r') {
+			++ptrtmp;
+			continue;
+		}
+		uint32_t unicode = _replacement_char;
+		uint32_t size = 1;
+
+		if ((c & 0b10000000) == 0) {
+			unicode = c;
+			if (unicode > 0x7F) {
+				unicode = _replacement_char;
+				print_unicode_error(vformat("Invalid unicode codepoint (%d)", unicode), true);
+				result = Error::ERR_INVALID_DATA;
 			}
-			/* Determine the number of characters in sequence */
-			if ((c & 0x80) == 0) {
-				*(dst++) = c;
-				unichar = 0;
-				skip = 0;
-			} else if ((c & 0xe0) == 0xc0) {
-				unichar = (0xff >> 3) & c;
-				skip = 1;
-			} else if ((c & 0xf0) == 0xe0) {
-				unichar = (0xff >> 4) & c;
-				skip = 2;
-			} else if ((c & 0xf8) == 0xf0) {
-				unichar = (0xff >> 5) & c;
-				skip = 3;
-			} else if ((c & 0xfc) == 0xf8) {
-				unichar = (0xff >> 6) & c;
-				skip = 4;
-			} else if ((c & 0xfe) == 0xfc) {
-				unichar = (0xff >> 7) & c;
-				skip = 5;
+		} else if ((c & 0b11100000) == 0b11000000) {
+			if (ptrtmp + 1 >= ptr_limit) {
+				print_unicode_error(vformat("Missing %x UTF-8 continuation byte", c), true);
+				result = Error::ERR_INVALID_DATA;
 			} else {
-				*(dst++) = _replacement_char;
-				unichar = 0;
-				skip = 0;
+				uint8_t c2 = *(ptrtmp + 1);
+
+				if ((c2 & 0b11000000) == 0b10000000) {
+					unicode = (uint32_t)((c & 0b00011111) << 6) | (uint32_t)(c2 & 0b00111111);
+
+					if (unicode < 0x80) {
+						unicode = _replacement_char;
+						print_unicode_error(vformat("Overlong encoding (%x %x)", c, c2));
+						result = Error::ERR_INVALID_DATA;
+					} else if (unicode > 0x7FF) {
+						unicode = _replacement_char;
+						print_unicode_error(vformat("Invalid unicode codepoint (%d)", unicode), true);
+						result = Error::ERR_INVALID_DATA;
+					} else {
+						size = 2;
+					}
+				} else {
+					print_unicode_error(vformat("Byte %x is not a correct continuation byte after %x", c2, c));
+					result = Error::ERR_INVALID_DATA;
+				}
+			}
+		} else if ((c & 0b11110000) == 0b11100000) {
+			uint32_t range_min = (c == 0xE0) ? 0xA0 : 0x80;
+			uint32_t range_max = (c == 0xED) ? 0x9F : 0xBF;
+			uint8_t c2 = (ptrtmp + 1) < ptr_limit ? *(ptrtmp + 1) : 0;
+			uint8_t c3 = (ptrtmp + 2) < ptr_limit ? *(ptrtmp + 2) : 0;
+			bool c2_valid = c2 && (c2 >= range_min) && (c2 <= range_max);
+			bool c3_valid = c3 && ((c3 & 0b11000000) == 0b10000000);
+
+			if (c2_valid && c3_valid) {
+				unicode = (uint32_t)((c & 0b00001111) << 12) | (uint32_t)((c2 & 0b00111111) << 6) | (uint32_t)(c3 & 0b00111111);
+
+				if (unicode < 0x800) {
+					unicode = _replacement_char;
+					print_unicode_error(vformat("Overlong encoding (%x %x %x)", c, c2, c3));
+					result = Error::ERR_INVALID_DATA;
+				} else if (unicode > 0xFFFF) {
+					unicode = _replacement_char;
+					print_unicode_error(vformat("Invalid unicode codepoint (%d)", unicode), true);
+					result = Error::ERR_INVALID_DATA;
+				} else {
+					size = 3;
+				}
+			} else {
+				if (c2 == 0) {
+					print_unicode_error(vformat("Missing %x UTF-8 continuation byte", c), true);
+				} else if (c2_valid == false) {
+					print_unicode_error(vformat("Byte %x is not a correct continuation byte after %x", c2, c));
+				} else if (c3 == 0) {
+					print_unicode_error(vformat("Missing %x %x UTF-8 continuation byte", c, c2), true);
+				} else {
+					print_unicode_error(vformat("Byte %x is not a correct continuation byte after %x %x", c3, c, c2));
+					// The unicode specification, in paragraphe 3.9 "Unicode Encoding Forms" Conformance
+					// state : "Only when a sequence of two or three bytes is a truncated version of a sequence which is
+					// otherwise well-formed to that point, is more than one byte replaced with a single U+FFFD"
+					// So here we replace the first 2 bytes with one single replacement_char.
+					size = 2;
+				}
+
+				result = Error::ERR_INVALID_DATA;
+			}
+		} else if ((c & 0b11111000) == 0b11110000) {
+			uint32_t range_min = (c == 0xF0) ? 0x90 : 0x80;
+			uint32_t range_max = (c == 0xF4) ? 0x8F : 0xBF;
+
+			uint8_t c2 = ((ptrtmp + 1) < ptr_limit) ? *(ptrtmp + 1) : 0;
+			uint8_t c3 = ((ptrtmp + 2) < ptr_limit) ? *(ptrtmp + 2) : 0;
+			uint8_t c4 = ((ptrtmp + 3) < ptr_limit) ? *(ptrtmp + 3) : 0;
+
+			bool c2_valid = c2 && (c2 >= range_min) && (c2 <= range_max);
+			bool c3_valid = c3 && ((c3 & 0b11000000) == 0b10000000);
+			bool c4_valid = c4 && ((c4 & 0b11000000) == 0b10000000);
+
+			if (c2_valid && c3_valid && c4_valid) {
+				unicode = (uint32_t)((c & 0b00000111) << 18) | (uint32_t)((c2 & 0b00111111) << 12) | (uint32_t)((c3 & 0b00111111) << 6) | (uint32_t)(c4 & 0b00111111);
+
+				if (unicode < 0x10000) {
+					unicode = _replacement_char;
+					print_unicode_error(vformat("Overlong encoding (%x %x %x %x)", c, c2, c3, c4));
+					result = Error::ERR_INVALID_DATA;
+				} else if (unicode > 0x10FFFF) {
+					unicode = _replacement_char;
+					print_unicode_error(vformat("Invalid unicode codepoint (%d)", unicode), true);
+					result = Error::ERR_INVALID_DATA;
+				} else {
+					size = 4;
+				}
+			} else {
+				if (c2 == 0) {
+					print_unicode_error(vformat("Missing %x UTF-8 continuation byte", c), true);
+				} else if (c2_valid == false) {
+					print_unicode_error(vformat("Byte %x is not a correct continuation byte after %x", c2, c));
+				} else if (c3 == 0) {
+					print_unicode_error(vformat("Missing %x %x UTF-8 continuation byte", c, c2), true);
+				} else if (c3_valid == false) {
+					print_unicode_error(vformat("Byte %x is not a correct continuation byte after %x %x", c3, c, c2));
+					size = 2;
+				} else if (c4 == 0) {
+					print_unicode_error(vformat("Missing %x %x %x UTF-8 continuation byte", c, c2, c3), true);
+				} else {
+					print_unicode_error(vformat("Byte %x is not a correct continuation byte after %x %x %x", c4, c, c2, c3));
+					size = 3;
+				}
+
+				result = Error::ERR_INVALID_DATA;
 			}
 		} else {
-			if (c < 0x80 || c > 0xbf) {
-				*(dst++) = _replacement_char;
-				skip = 0;
-			} else {
-				unichar = (unichar << 6) | (c & 0x3f);
-				--skip;
-				if (skip == 0) {
-					if (unichar == 0) {
-						print_unicode_error("NUL character", true);
-						decode_failed = true;
-						unichar = _replacement_char;
-					} else if ((unichar & 0xfffff800) == 0xd800) {
-						print_unicode_error(vformat("Unpaired surrogate (%x)", unichar), true);
-						decode_failed = true;
-						unichar = _replacement_char;
-					} else if (unichar > 0x10ffff) {
-						print_unicode_error(vformat("Invalid unicode codepoint (%x)", unichar), true);
-						decode_failed = true;
-						unichar = _replacement_char;
-					}
-					*(dst++) = unichar;
-				}
-			}
+			print_unicode_error(vformat("Invalid UTF-8 leading byte (%x)", c), true);
+			result = Error::ERR_INVALID_DATA;
 		}
 
-		cstr_size--;
-		p_utf8++;
-	}
-	if (skip) {
-		*(dst++) = 0x20;
+		(*dst++) = unicode;
+		ptrtmp += size;
 	}
 
-	if (decode_failed) {
-		return ERR_INVALID_DATA;
-	} else if (decode_error) {
-		return ERR_PARSE_ERROR;
-	} else {
-		return OK;
-	}
+	(*dst++) = 0;
+	resize(prev_length + dst - ptr());
+
+	return result;
 }
 
-CharString String::utf8() const {
+CharString String::utf8(Vector<uint8_t> *r_ch_length_map) const {
 	int l = length();
 	if (!l) {
 		return CharString();
 	}
 
+	uint8_t *map_ptr = nullptr;
+	if (r_ch_length_map) {
+		r_ch_length_map->resize(l);
+		map_ptr = r_ch_length_map->ptrw();
+	}
+
 	const char32_t *d = &operator[](0);
 	int fl = 0;
 	for (int i = 0; i < l; i++) {
 		uint32_t c = d[i];
+		int ch_w = 1;
 		if (c <= 0x7f) { // 7 bits.
-			fl += 1;
+			ch_w = 1;
 		} else if (c <= 0x7ff) { // 11 bits
-			fl += 2;
+			ch_w = 2;
 		} else if (c <= 0xffff) { // 16 bits
-			fl += 3;
+			ch_w = 3;
 		} else if (c <= 0x001fffff) { // 21 bits
-			fl += 4;
+			ch_w = 4;
 		} else if (c <= 0x03ffffff) { // 26 bits
-			fl += 5;
+			ch_w = 5;
 			print_unicode_error(vformat("Invalid unicode codepoint (%x)", c));
 		} else if (c <= 0x7fffffff) { // 31 bits
-			fl += 6;
+			ch_w = 6;
 			print_unicode_error(vformat("Invalid unicode codepoint (%x)", c));
 		} else {
-			fl += 1;
+			ch_w = 1;
 			print_unicode_error(vformat("Invalid unicode codepoint (%x), cannot represent as UTF-8", c), true);
 		}
+		fl += ch_w;
+		if (map_ptr) {
+			map_ptr[i] = ch_w;
+		}
 	}
 
 	CharString utf8s;
@@ -2194,12 +2202,12 @@ CharString String::utf8() const {
 
 String String::utf16(const char16_t *p_utf16, int p_len) {
 	String ret;
-	ret.parse_utf16(p_utf16, p_len, true);
+	ret.append_utf16(p_utf16, p_len, true);
 
 	return ret;
 }
 
-Error String::parse_utf16(const char16_t *p_utf16, int p_len, bool p_default_little_endian) {
+Error String::append_utf16(const char16_t *p_utf16, int p_len, bool p_default_little_endian) {
 	if (!p_utf16) {
 		return ERR_INVALID_DATA;
 	}
@@ -2276,8 +2284,9 @@ Error String::parse_utf16(const char16_t *p_utf16, int p_len, bool p_default_lit
 		return OK; // empty string
 	}
 
-	resize(str_size + 1);
-	char32_t *dst = ptrw();
+	const int prev_length = length();
+	resize(prev_length + str_size + 1);
+	char32_t *dst = ptrw() + prev_length;
 	dst[str_size] = 0;
 
 	bool skip = false;
@@ -3074,6 +3083,130 @@ String String::erase(int p_pos, int p_chars) const {
 	return left(p_pos) + substr(p_pos + p_chars);
 }
 
+template <class T>
+static bool _contains_char(char32_t p_c, const T *p_chars, int p_chars_len) {
+	for (int i = 0; i < p_chars_len; ++i) {
+		if (p_c == (char32_t)p_chars[i]) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+String String::remove_char(char32_t p_char) const {
+	if (p_char == 0) {
+		return *this;
+	}
+
+	int len = length();
+	if (len == 0) {
+		return *this;
+	}
+
+	int index = 0;
+	const char32_t *old_ptr = ptr();
+	for (; index < len; ++index) {
+		if (old_ptr[index] == p_char) {
+			break;
+		}
+	}
+
+	// If no occurrence of `char` was found, return this.
+	if (index == len) {
+		return *this;
+	}
+
+	// If we found at least one occurrence of `char`, create new string, allocating enough space for the current length minus one.
+	String new_string;
+	new_string.resize(len);
+	char32_t *new_ptr = new_string.ptrw();
+
+	// Copy part of input before `char`.
+	memcpy(new_ptr, old_ptr, index * sizeof(char32_t));
+
+	int new_size = index;
+
+	// Copy rest, skipping `char`.
+	for (++index; index < len; ++index) {
+		const char32_t old_char = old_ptr[index];
+		if (old_char != p_char) {
+			new_ptr[new_size] = old_char;
+			++new_size;
+		}
+	}
+
+	new_ptr[new_size] = _null;
+
+	// Shrink new string to fit.
+	new_string.resize(new_size + 1);
+
+	return new_string;
+}
+
+template <class T>
+static String _remove_chars_common(const String &p_this, const T *p_chars, int p_chars_len) {
+	// Delegate if p_chars has a single element.
+	if (p_chars_len == 1) {
+		return p_this.remove_char(*p_chars);
+	} else if (p_chars_len == 0) {
+		return p_this;
+	}
+
+	int len = p_this.length();
+
+	if (len == 0) {
+		return p_this;
+	}
+
+	int index = 0;
+	const char32_t *old_ptr = p_this.ptr();
+	for (; index < len; ++index) {
+		if (_contains_char(old_ptr[index], p_chars, p_chars_len)) {
+			break;
+		}
+	}
+
+	// If no occurrence of `chars` was found, return this.
+	if (index == len) {
+		return p_this;
+	}
+
+	// If we found at least one occurrence of `chars`, create new string, allocating enough space for the current length minus one.
+	String new_string;
+	new_string.resize(len);
+	char32_t *new_ptr = new_string.ptrw();
+
+	// Copy part of input before `char`.
+	memcpy(new_ptr, old_ptr, index * sizeof(char32_t));
+
+	int new_size = index;
+
+	// Copy rest, skipping `chars`.
+	for (++index; index < len; ++index) {
+		const char32_t old_char = old_ptr[index];
+		if (!_contains_char(old_char, p_chars, p_chars_len)) {
+			new_ptr[new_size] = old_char;
+			++new_size;
+		}
+	}
+
+	new_ptr[new_size] = 0;
+
+	// Shrink new string to fit.
+	new_string.resize(new_size + 1);
+
+	return new_string;
+}
+
+String String::remove_chars(const String &p_chars) const {
+	return _remove_chars_common(*this, p_chars.ptr(), p_chars.length());
+}
+
+String String::remove_chars(const char *p_chars) const {
+	return _remove_chars_common(*this, p_chars, strlen(p_chars));
+}
+
 String String::substr(int p_from, int p_chars) const {
 	if (p_chars == -1) {
 		p_chars = length() - p_from;
@@ -3195,14 +3328,20 @@ int String::find(const char *p_str, int p_from) const {
 }
 
 int String::find_char(char32_t p_char, int p_from) const {
-	return _cowdata.find(p_char, p_from);
+	if (p_from < 0) {
+		p_from = length() + p_from;
+	}
+	if (p_from < 0 || p_from >= length()) {
+		return -1;
+	}
+	return span().find(p_char, p_from);
 }
 
 int String::findmk(const Vector<String> &p_keys, int p_from, int *r_key) const {
 	if (p_from < 0) {
 		return -1;
 	}
-	if (p_keys.size() == 0) {
+	if (p_keys.is_empty()) {
 		return -1;
 	}
 
@@ -3432,7 +3571,13 @@ int String::rfind(const char *p_str, int p_from) const {
 }
 
 int String::rfind_char(char32_t p_char, int p_from) const {
-	return _cowdata.rfind(p_char, p_from);
+	if (p_from < 0) {
+		p_from = length() + p_from;
+	}
+	if (p_from < 0 || p_from >= length()) {
+		return -1;
+	}
+	return span().rfind(p_char, p_from);
 }
 
 int String::rfindn(const String &p_str, int p_from) const {
@@ -3867,11 +4012,9 @@ String String::format(const Variant &values, const String &placeholder) const {
 		}
 	} else if (values.get_type() == Variant::DICTIONARY) {
 		Dictionary d = values;
-		List<Variant> keys;
-		d.get_key_list(&keys);
 
-		for (const Variant &key : keys) {
-			new_string = new_string.replace(placeholder.replace("_", key), d[key]);
+		for (const KeyValue<Variant, Variant> &kv : d) {
+			new_string = new_string.replace(placeholder.replace("_", kv.key), kv.value);
 		}
 	} else if (values.get_type() == Variant::OBJECT) {
 		Object *obj = values.get_validated_object();
@@ -4088,6 +4231,117 @@ String String::replace_first(const char *p_key, const char *p_with) const {
 	return *this;
 }
 
+String String::replace_char(char32_t p_key, char32_t p_with) const {
+	ERR_FAIL_COND_V_MSG(p_with == 0, *this, "`with` must not be the NUL character.");
+
+	if (p_key == 0) {
+		return *this;
+	}
+
+	int len = length();
+	if (len == 0) {
+		return *this;
+	}
+
+	int index = 0;
+	const char32_t *old_ptr = ptr();
+	for (; index < len; ++index) {
+		if (old_ptr[index] == p_key) {
+			break;
+		}
+	}
+
+	// If no occurrence of `key` was found, return this.
+	if (index == len) {
+		return *this;
+	}
+
+	// If we found at least one occurrence of `key`, create new string.
+	String new_string;
+	new_string.resize(len + 1);
+	char32_t *new_ptr = new_string.ptrw();
+
+	// Copy part of input before `key`.
+	memcpy(new_ptr, old_ptr, index * sizeof(char32_t));
+
+	new_ptr[index] = p_with;
+
+	// Copy or replace rest of input.
+	for (++index; index < len; ++index) {
+		if (old_ptr[index] == p_key) {
+			new_ptr[index] = p_with;
+		} else {
+			new_ptr[index] = old_ptr[index];
+		}
+	}
+
+	new_ptr[index] = _null;
+
+	return new_string;
+}
+
+template <class T>
+static String _replace_chars_common(const String &p_this, const T *p_keys, int p_keys_len, char32_t p_with) {
+	ERR_FAIL_COND_V_MSG(p_with == 0, p_this, "`with` must not be the NUL character.");
+
+	// Delegate if p_keys is a single element.
+	if (p_keys_len == 1) {
+		return p_this.replace_char(*p_keys, p_with);
+	} else if (p_keys_len == 0) {
+		return p_this;
+	}
+
+	int len = p_this.length();
+	if (len == 0) {
+		return p_this;
+	}
+
+	int index = 0;
+	const char32_t *old_ptr = p_this.ptr();
+	for (; index < len; ++index) {
+		if (_contains_char(old_ptr[index], p_keys, p_keys_len)) {
+			break;
+		}
+	}
+
+	// If no occurrence of `keys` was found, return this.
+	if (index == len) {
+		return p_this;
+	}
+
+	// If we found at least one occurrence of `keys`, create new string.
+	String new_string;
+	new_string.resize(len + 1);
+	char32_t *new_ptr = new_string.ptrw();
+
+	// Copy part of input before `key`.
+	memcpy(new_ptr, old_ptr, index * sizeof(char32_t));
+
+	new_ptr[index] = p_with;
+
+	// Copy or replace rest of input.
+	for (++index; index < len; ++index) {
+		const char32_t old_char = old_ptr[index];
+		if (_contains_char(old_char, p_keys, p_keys_len)) {
+			new_ptr[index] = p_with;
+		} else {
+			new_ptr[index] = old_char;
+		}
+	}
+
+	new_ptr[index] = 0;
+
+	return new_string;
+}
+
+String String::replace_chars(const String &p_keys, char32_t p_with) const {
+	return _replace_chars_common(*this, p_keys.ptr(), p_keys.length(), p_with);
+}
+
+String String::replace_chars(const char *p_keys, char32_t p_with) const {
+	return _replace_chars_common(*this, p_keys, strlen(p_keys), p_with);
+}
+
 String String::replacen(const String &p_key, const String &p_with) const {
 	return _replace_common(*this, p_key, p_with, true);
 }
@@ -4370,7 +4624,7 @@ String String::simplify_path() const {
 		}
 	}
 
-	s = s.replace("\\", "/");
+	s = s.replace_char('\\', '/');
 	while (true) { // in case of using 2 or more slash
 		String compare = s.replace("//", "/");
 		if (s == compare) {
@@ -4574,9 +4828,8 @@ String String::uri_encode() const {
 			res += ord;
 		} else {
 			char p[4] = { '%', 0, 0, 0 };
-			static const char hex[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-			p[1] = hex[ord >> 4];
-			p[2] = hex[ord & 0xF];
+			p[1] = hex_char_table_upper[ord >> 4];
+			p[2] = hex_char_table_upper[ord & 0xF];
 			res += p;
 		}
 	}
@@ -4608,6 +4861,29 @@ String String::uri_decode() const {
 	return String::utf8(res);
 }
 
+String String::uri_file_decode() const {
+	CharString src = utf8();
+	CharString res;
+	for (int i = 0; i < src.length(); ++i) {
+		if (src[i] == '%' && i + 2 < src.length()) {
+			char ord1 = src[i + 1];
+			if (is_digit(ord1) || is_ascii_upper_case(ord1)) {
+				char ord2 = src[i + 2];
+				if (is_digit(ord2) || is_ascii_upper_case(ord2)) {
+					char bytes[3] = { (char)ord1, (char)ord2, 0 };
+					res += (char)strtol(bytes, nullptr, 16);
+					i += 2;
+				}
+			} else {
+				res += src[i];
+			}
+		} else {
+			res += src[i];
+		}
+	}
+	return String::utf8(res);
+}
+
 String String::c_unescape() const {
 	String escaped = *this;
 	escaped = escaped.replace("\\a", "\a");
@@ -4861,7 +5137,7 @@ String String::pad_zeros(int p_digits) const {
 String String::trim_prefix(const String &p_prefix) const {
 	String s = *this;
 	if (s.begins_with(p_prefix)) {
-		return s.substr(p_prefix.length(), s.length() - p_prefix.length());
+		return s.substr(p_prefix.length());
 	}
 	return s;
 }
@@ -4870,7 +5146,7 @@ String String::trim_prefix(const char *p_prefix) const {
 	String s = *this;
 	if (s.begins_with(p_prefix)) {
 		int prefix_length = strlen(p_prefix);
-		return s.substr(prefix_length, s.length() - prefix_length);
+		return s.substr(prefix_length);
 	}
 	return s;
 }
@@ -4934,6 +5210,10 @@ bool String::is_valid_hex_number(bool p_with_prefix) const {
 		from += 2;
 	}
 
+	if (from == len) {
+		return false;
+	}
+
 	for (int i = from; i < len; i++) {
 		char32_t c = operator[](i);
 		if (is_hex_digit(c)) {
@@ -4987,8 +5267,8 @@ bool String::is_valid_float() const {
 
 String String::path_to_file(const String &p_path) const {
 	// Don't get base dir for src, this is expected to be a dir already.
-	String src = replace("\\", "/");
-	String dst = p_path.replace("\\", "/").get_base_dir();
+	String src = replace_char('\\', '/');
+	String dst = p_path.replace_char('\\', '/').get_base_dir();
 	String rel = src.path_to(dst);
 	if (rel == dst) { // failed
 		return p_path;
@@ -4998,8 +5278,8 @@ String String::path_to_file(const String &p_path) const {
 }
 
 String String::path_to(const String &p_path) const {
-	String src = replace("\\", "/");
-	String dst = p_path.replace("\\", "/");
+	String src = replace_char('\\', '/');
+	String dst = p_path.replace_char('\\', '/');
 	if (!src.ends_with("/")) {
 		src += "/";
 	}
@@ -5026,8 +5306,8 @@ String String::path_to(const String &p_path) const {
 			return p_path; //impossible to do this
 		}
 
-		src = src.substr(src_begin.length(), src.length());
-		dst = dst.substr(dst_begin.length(), dst.length());
+		src = src.substr(src_begin.length());
+		dst = dst.substr(dst_begin.length());
 	}
 
 	//remove leading and trailing slash and split
@@ -5427,7 +5707,7 @@ String String::sprintf(const Array &values, bool *error) const {
 					// Get basic number.
 					String str;
 					if (!as_unsigned) {
-						str = String::num_int64(ABS(value), base, capitalize);
+						str = String::num_int64(Math::abs(value), base, capitalize);
 					} else {
 						uint64_t uvalue = *((uint64_t *)&value);
 						// In unsigned hex, if the value fits in 32 bits, trim it down to that.
@@ -5829,6 +6109,10 @@ Vector<uint8_t> String::to_wchar_buffer() const {
 #endif
 }
 
+Vector<uint8_t> String::to_multibyte_char_buffer(const String &p_encoding) const {
+	return OS::get_singleton()->string_to_multibyte(p_encoding, *this);
+}
+
 #ifdef TOOLS_ENABLED
 /**
  * "Tools TRanslate". Performs string replacement for internationalization
@@ -5884,10 +6168,10 @@ String DTR(const String &p_text, const String &p_context) {
 	const String text = p_text.dedent().strip_edges();
 
 	if (TranslationServer::get_singleton()) {
-		return String(TranslationServer::get_singleton()->doc_translate(text, p_context)).replace("$DOCS_URL", VERSION_DOCS_URL);
+		return String(TranslationServer::get_singleton()->doc_translate(text, p_context)).replace("$DOCS_URL", GODOT_VERSION_DOCS_URL);
 	}
 
-	return text.replace("$DOCS_URL", VERSION_DOCS_URL);
+	return text.replace("$DOCS_URL", GODOT_VERSION_DOCS_URL);
 }
 
 /**
@@ -5901,14 +6185,14 @@ String DTRN(const String &p_text, const String &p_text_plural, int p_n, const St
 	const String text_plural = p_text_plural.dedent().strip_edges();
 
 	if (TranslationServer::get_singleton()) {
-		return String(TranslationServer::get_singleton()->doc_translate_plural(text, text_plural, p_n, p_context)).replace("$DOCS_URL", VERSION_DOCS_URL);
+		return String(TranslationServer::get_singleton()->doc_translate_plural(text, text_plural, p_n, p_context)).replace("$DOCS_URL", GODOT_VERSION_DOCS_URL);
 	}
 
 	// Return message based on English plural rule if translation is not possible.
 	if (p_n == 1) {
-		return text.replace("$DOCS_URL", VERSION_DOCS_URL);
+		return text.replace("$DOCS_URL", GODOT_VERSION_DOCS_URL);
 	}
-	return text_plural.replace("$DOCS_URL", VERSION_DOCS_URL);
+	return text_plural.replace("$DOCS_URL", GODOT_VERSION_DOCS_URL);
 }
 #endif
 
diff --git a/engine/core/string/ustring.h b/engine/core/string/ustring.h
index b8ebeb99..7ecf1308 100644
--- a/engine/core/string/ustring.h
+++ b/engine/core/string/ustring.h
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef USTRING_GODOT_H
-#define USTRING_GODOT_H
+#pragma once
 
 // Note: _GODOT suffix added to header guard to avoid conflict with ICU header.
 
-#include "core/string/char_utils.h"
+#include "core/string/char_utils.h" // IWYU pragma: export
 #include "core/templates/cowdata.h"
 #include "core/templates/vector.h"
 #include "core/typedefs.h"
@@ -98,30 +97,6 @@ constexpr size_t _strlen_clipped(const char32_t *p_str, int p_clip_to_len) {
 	return len;
 }
 
-/*************************************************************************/
-/*  StrRange                                                             */
-/*************************************************************************/
-
-template <typename Element>
-struct StrRange {
-	const Element *c_str;
-	size_t len;
-
-	explicit StrRange(const std::nullptr_t p_cstring) :
-			c_str(nullptr), len(0) {}
-
-	explicit StrRange(const Element *p_cstring, const size_t p_len) :
-			c_str(p_cstring), len(p_len) {}
-
-	template <size_t len>
-	explicit StrRange(const Element (&p_cstring)[len]) :
-			c_str(p_cstring), len(strlen(p_cstring)) {}
-
-	static StrRange from_c_str(const Element *p_cstring) {
-		return StrRange(p_cstring, p_cstring ? strlen(p_cstring) : 0);
-	}
-};
-
 /*************************************************************************/
 /*  CharProxy                                                            */
 /*************************************************************************/
@@ -178,6 +153,10 @@ public:
 	_FORCE_INLINE_ char16_t *ptrw() { return _cowdata.ptrw(); }
 	_FORCE_INLINE_ const char16_t *ptr() const { return _cowdata.ptr(); }
 	_FORCE_INLINE_ int size() const { return _cowdata.size(); }
+
+	_FORCE_INLINE_ operator Span<char16_t>() const { return Span(ptr(), length()); }
+	_FORCE_INLINE_ Span<char16_t> span() const { return Span(ptr(), length()); }
+
 	Error resize(int p_size) { return _cowdata.resize(p_size); }
 
 	_FORCE_INLINE_ char16_t get(int p_index) const { return _cowdata.get(p_index); }
@@ -192,10 +171,9 @@ public:
 	_FORCE_INLINE_ CharProxy<char16_t> operator[](int p_index) { return CharProxy<char16_t>(p_index, _cowdata); }
 
 	_FORCE_INLINE_ Char16String() {}
-	_FORCE_INLINE_ Char16String(const Char16String &p_str) { _cowdata._ref(p_str._cowdata); }
-	_FORCE_INLINE_ Char16String(Char16String &&p_str) :
-			_cowdata(std::move(p_str._cowdata)) {}
-	_FORCE_INLINE_ void operator=(const Char16String &p_str) { _cowdata._ref(p_str._cowdata); }
+	_FORCE_INLINE_ Char16String(const Char16String &p_str) = default;
+	_FORCE_INLINE_ Char16String(Char16String &&p_str) = default;
+	_FORCE_INLINE_ void operator=(const Char16String &p_str) { _cowdata = p_str._cowdata; }
 	_FORCE_INLINE_ void operator=(Char16String &&p_str) { _cowdata = std::move(p_str._cowdata); }
 	_FORCE_INLINE_ Char16String(const char16_t *p_cstr) { copy_from(p_cstr); }
 
@@ -204,8 +182,6 @@ public:
 	Char16String &operator+=(char16_t p_char);
 	int length() const { return size() ? size() - 1 : 0; }
 	const char16_t *get_data() const;
-	operator const char16_t *() const { return get_data(); }
-	explicit operator StrRange<char16_t>() const { return StrRange(get_data(), length()); }
 
 protected:
 	void copy_from(const char16_t *p_cstr);
@@ -223,6 +199,10 @@ public:
 	_FORCE_INLINE_ char *ptrw() { return _cowdata.ptrw(); }
 	_FORCE_INLINE_ const char *ptr() const { return _cowdata.ptr(); }
 	_FORCE_INLINE_ int size() const { return _cowdata.size(); }
+
+	_FORCE_INLINE_ operator Span<char>() const { return Span(ptr(), length()); }
+	_FORCE_INLINE_ Span<char> span() const { return Span(ptr(), length()); }
+
 	Error resize(int p_size) { return _cowdata.resize(p_size); }
 
 	_FORCE_INLINE_ char get(int p_index) const { return _cowdata.get(p_index); }
@@ -237,10 +217,9 @@ public:
 	_FORCE_INLINE_ CharProxy<char> operator[](int p_index) { return CharProxy<char>(p_index, _cowdata); }
 
 	_FORCE_INLINE_ CharString() {}
-	_FORCE_INLINE_ CharString(const CharString &p_str) { _cowdata._ref(p_str._cowdata); }
-	_FORCE_INLINE_ CharString(CharString &&p_str) :
-			_cowdata(std::move(p_str._cowdata)) {}
-	_FORCE_INLINE_ void operator=(const CharString &p_str) { _cowdata._ref(p_str._cowdata); }
+	_FORCE_INLINE_ CharString(const CharString &p_str) = default;
+	_FORCE_INLINE_ CharString(CharString &&p_str) = default;
+	_FORCE_INLINE_ void operator=(const CharString &p_str) { _cowdata = p_str._cowdata; }
 	_FORCE_INLINE_ void operator=(CharString &&p_str) { _cowdata = std::move(p_str._cowdata); }
 	_FORCE_INLINE_ CharString(const char *p_cstr) { copy_from(p_cstr); }
 
@@ -250,8 +229,6 @@ public:
 	CharString &operator+=(char p_char);
 	int length() const { return size() ? size() - 1 : 0; }
 	const char *get_data() const;
-	operator const char *() const { return get_data(); }
-	explicit operator StrRange<char>() const { return StrRange(get_data(), length()); }
 
 protected:
 	void copy_from(const char *p_cstr);
@@ -267,58 +244,40 @@ class String {
 	static const char32_t _replacement_char;
 
 	// Known-length copy.
-	void parse_latin1(const StrRange<char> &p_cstr);
-	void parse_utf32(const StrRange<char32_t> &p_cstr);
-	void parse_utf32(const char32_t &p_char);
 	void copy_from_unchecked(const char32_t *p_char, int p_length);
 
 	// NULL-terminated c string copy - automatically parse the string to find the length.
-	void parse_latin1(const char *p_cstr) {
-		parse_latin1(StrRange<char>::from_c_str(p_cstr));
+	void append_latin1(const char *p_cstr) {
+		append_latin1(Span(p_cstr, p_cstr ? strlen(p_cstr) : 0));
 	}
-	void parse_latin1(const char *p_cstr, int p_clip_to) {
-		parse_latin1(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
-	}
-	void parse_utf32(const char32_t *p_cstr) {
-		parse_utf32(StrRange<char32_t>::from_c_str(p_cstr));
-	}
-	void parse_utf32(const char32_t *p_cstr, int p_clip_to) {
-		parse_utf32(StrRange(p_cstr, p_cstr ? _strlen_clipped(p_cstr, p_clip_to) : 0));
+	void append_utf32(const char32_t *p_cstr) {
+		append_utf32(Span(p_cstr, p_cstr ? strlen(p_cstr) : 0));
 	}
 
 	// wchar_t copy_from depends on the platform.
-	void parse_wstring(const StrRange<wchar_t> &p_cstr) {
+	void append_wstring(const Span<wchar_t> &p_cstr) {
 #ifdef WINDOWS_ENABLED
 		// wchar_t is 16-bit, parse as UTF-16
-		parse_utf16((const char16_t *)p_cstr.c_str, p_cstr.len);
+		append_utf16((const char16_t *)p_cstr.ptr(), p_cstr.size());
 #else
 		// wchar_t is 32-bit, copy directly
-		parse_utf32((StrRange<char32_t> &)p_cstr);
+		append_utf32((Span<char32_t> &)p_cstr);
 #endif
 	}
-	void parse_wstring(const wchar_t *p_cstr) {
+	void append_wstring(const wchar_t *p_cstr) {
 #ifdef WINDOWS_ENABLED
 		// wchar_t is 16-bit, parse as UTF-16
-		parse_utf16((const char16_t *)p_cstr);
+		append_utf16((const char16_t *)p_cstr);
 #else
 		// wchar_t is 32-bit, copy directly
-		parse_utf32((const char32_t *)p_cstr);
-#endif
-	}
-	void parse_wstring(const wchar_t *p_cstr, int p_clip_to) {
-#ifdef WINDOWS_ENABLED
-		// wchar_t is 16-bit, parse as UTF-16
-		parse_utf16((const char16_t *)p_cstr, p_clip_to);
-#else
-		// wchar_t is 32-bit, copy directly
-		parse_utf32((const char32_t *)p_cstr, p_clip_to);
+		append_utf32((const char32_t *)p_cstr);
 #endif
 	}
 
 	bool _base_is_subsequence_of(const String &p_string, bool case_insensitive) const;
 	int _count(const String &p_string, int p_from, int p_to, bool p_case_insensitive) const;
 	int _count(const char *p_string, int p_from, int p_to, bool p_case_insensitive) const;
-	String _camelcase_to_underscore() const;
+	String _separate_compound_words() const;
 
 public:
 	enum {
@@ -327,6 +286,10 @@ public:
 
 	_FORCE_INLINE_ char32_t *ptrw() { return _cowdata.ptrw(); }
 	_FORCE_INLINE_ const char32_t *ptr() const { return _cowdata.ptr(); }
+	_FORCE_INLINE_ int size() const { return _cowdata.size(); }
+
+	_FORCE_INLINE_ operator Span<char32_t>() const { return Span(ptr(), length()); }
+	_FORCE_INLINE_ Span<char32_t> span() const { return Span(ptr(), length()); }
 
 	void remove_at(int p_index) { _cowdata.remove_at(p_index); }
 
@@ -334,7 +297,6 @@ public:
 
 	_FORCE_INLINE_ char32_t get(int p_index) const { return _cowdata.get(p_index); }
 	_FORCE_INLINE_ void set(int p_index, const char32_t &p_elem) { _cowdata.set(p_index, p_elem); }
-	_FORCE_INLINE_ int size() const { return _cowdata.size(); }
 	Error resize(int p_size) { return _cowdata.resize(p_size); }
 
 	_FORCE_INLINE_ const char32_t &operator[](int p_index) const {
@@ -351,6 +313,9 @@ public:
 	bool operator==(const String &p_str) const;
 	bool operator!=(const String &p_str) const;
 	String operator+(const String &p_str) const;
+	String operator+(const char *p_char) const;
+	String operator+(const wchar_t *p_char) const;
+	String operator+(const char32_t *p_char) const;
 	String operator+(char32_t p_char) const;
 
 	String &operator+=(const String &);
@@ -362,7 +327,7 @@ public:
 	bool operator==(const char *p_str) const;
 	bool operator==(const wchar_t *p_str) const;
 	bool operator==(const char32_t *p_str) const;
-	bool operator==(const StrRange<char32_t> &p_str_range) const;
+	bool operator==(const Span<char32_t> &p_str_range) const;
 
 	bool operator!=(const char *p_str) const;
 	bool operator!=(const wchar_t *p_str) const;
@@ -429,12 +394,18 @@ public:
 	String replace_first(const char *p_key, const char *p_with) const;
 	String replace(const String &p_key, const String &p_with) const;
 	String replace(const char *p_key, const char *p_with) const;
+	String replace_char(char32_t p_key, char32_t p_with) const;
+	String replace_chars(const String &p_keys, char32_t p_with) const;
+	String replace_chars(const char *p_keys, char32_t p_with) const;
 	String replacen(const String &p_key, const String &p_with) const;
 	String replacen(const char *p_key, const char *p_with) const;
 	String repeat(int p_count) const;
 	String reverse() const;
 	String insert(int p_at_pos, const String &p_string) const;
 	String erase(int p_pos, int p_chars = 1) const;
+	String remove_char(char32_t p_what) const;
+	String remove_chars(const String &p_chars) const;
+	String remove_chars(const char *p_chars) const;
 	String pad_decimals(int p_digits) const;
 	String pad_zeros(int p_digits) const;
 	String trim_prefix(const String &p_prefix) const;
@@ -452,7 +423,11 @@ public:
 	static String num_real(float p_num, bool p_trailing = true);
 	static String num_int64(int64_t p_num, int base = 10, bool capitalize_hex = false);
 	static String num_uint64(uint64_t p_num, int base = 10, bool capitalize_hex = false);
-	static String chr(char32_t p_char);
+	static String chr(char32_t p_char) {
+		String string;
+		string.append_utf32(Span(&p_char, 1));
+		return string;
+	}
 	static String md5(const uint8_t *p_md5);
 	static String hex_encode_buffer(const uint8_t *p_buffer, int p_len);
 	Vector<uint8_t> hex_decode() const;
@@ -477,6 +452,7 @@ public:
 	String to_camel_case() const;
 	String to_pascal_case() const;
 	String to_snake_case() const;
+	String to_kebab_case() const;
 
 	String get_with_code_lines() const;
 	int get_slice_count(const String &p_splitter) const;
@@ -489,7 +465,7 @@ public:
 	Vector<String> split(const char *p_splitter = "", bool p_allow_empty = true, int p_maxsplit = 0) const;
 	Vector<String> rsplit(const String &p_splitter = "", bool p_allow_empty = true, int p_maxsplit = 0) const;
 	Vector<String> rsplit(const char *p_splitter = "", bool p_allow_empty = true, int p_maxsplit = 0) const;
-	Vector<String> split_spaces() const;
+	Vector<String> split_spaces(int p_maxsplit = 0) const;
 	Vector<double> split_floats(const String &p_splitter, bool p_allow_empty = true) const;
 	Vector<float> split_floats_mk(const Vector<String> &p_splitters, bool p_allow_empty = true) const;
 	Vector<int> split_ints(const String &p_splitter, bool p_allow_empty = true) const;
@@ -521,13 +497,44 @@ public:
 	char32_t unicode_at(int p_idx) const;
 
 	CharString ascii(bool p_allow_extended = false) const;
-	CharString utf8() const;
-	Error parse_utf8(const char *p_utf8, int p_len = -1, bool p_skip_cr = false);
+	// Parse an ascii string.
+	// If any character is > 127, an error will be logged, and 0xfffd will be inserted.
+	Error append_ascii(const Span<char> &p_range);
+	static String ascii(const Span<char> &p_range) {
+		String s;
+		s.append_ascii(p_range);
+		return s;
+	}
+	CharString latin1() const { return ascii(true); }
+	void append_latin1(const Span<char> &p_cstr);
+	static String latin1(const Span<char> &p_string) {
+		String string;
+		string.append_latin1(p_string);
+		return string;
+	}
+
+	CharString utf8(Vector<uint8_t> *r_ch_length_map = nullptr) const;
+	Error append_utf8(const char *p_utf8, int p_len = -1, bool p_skip_cr = false);
+	Error append_utf8(const Span<char> &p_range, bool p_skip_cr = false) {
+		return append_utf8(p_range.ptr(), p_range.size(), p_skip_cr);
+	}
 	static String utf8(const char *p_utf8, int p_len = -1);
+	static String utf8(const Span<char> &p_range) { return utf8(p_range.ptr(), p_range.size()); }
 
 	Char16String utf16() const;
-	Error parse_utf16(const char16_t *p_utf16, int p_len = -1, bool p_default_little_endian = true);
+	Error append_utf16(const char16_t *p_utf16, int p_len = -1, bool p_default_little_endian = true);
+	Error append_utf16(const Span<char16_t> p_range, bool p_skip_cr = false) {
+		return append_utf16(p_range.ptr(), p_range.size(), p_skip_cr);
+	}
 	static String utf16(const char16_t *p_utf16, int p_len = -1);
+	static String utf16(const Span<char16_t> &p_range) { return utf16(p_range.ptr(), p_range.size()); }
+
+	void append_utf32(const Span<char32_t> &p_cstr);
+	static String utf32(const Span<char32_t> &p_span) {
+		String string;
+		string.append_utf32(p_span);
+		return string;
+	}
 
 	static uint32_t hash(const char32_t *p_cstr, int p_len); /* hash the string */
 	static uint32_t hash(const char32_t *p_cstr); /* hash the string */
@@ -567,6 +574,7 @@ public:
 	String xml_unescape() const;
 	String uri_encode() const;
 	String uri_decode() const;
+	String uri_file_decode() const;
 	String c_escape() const;
 	String c_escape_multiline() const;
 	String c_unescape() const;
@@ -599,10 +607,12 @@ public:
 	 */
 
 	_FORCE_INLINE_ String() {}
-	_FORCE_INLINE_ String(const String &p_str) { _cowdata._ref(p_str._cowdata); }
-	_FORCE_INLINE_ String(String &&p_str) :
-			_cowdata(std::move(p_str._cowdata)) {}
-	_FORCE_INLINE_ void operator=(const String &p_str) { _cowdata._ref(p_str._cowdata); }
+	_FORCE_INLINE_ String(const String &p_str) = default;
+	_FORCE_INLINE_ String(String &&p_str) = default;
+#ifdef SIZE_EXTRA
+	_NO_INLINE_ ~String() {}
+#endif
+	_FORCE_INLINE_ void operator=(const String &p_str) { _cowdata = p_str._cowdata; }
 	_FORCE_INLINE_ void operator=(String &&p_str) { _cowdata = std::move(p_str._cowdata); }
 
 	Vector<uint8_t> to_ascii_buffer() const;
@@ -610,41 +620,38 @@ public:
 	Vector<uint8_t> to_utf16_buffer() const;
 	Vector<uint8_t> to_utf32_buffer() const;
 	Vector<uint8_t> to_wchar_buffer() const;
+	Vector<uint8_t> to_multibyte_char_buffer(const String &p_encoding = String()) const;
 
 	// Constructors for NULL terminated C strings.
 	String(const char *p_cstr) {
-		parse_latin1(p_cstr);
+		append_latin1(p_cstr);
 	}
 	String(const wchar_t *p_cstr) {
-		parse_wstring(p_cstr);
+		append_wstring(p_cstr);
 	}
 	String(const char32_t *p_cstr) {
-		parse_utf32(p_cstr);
-	}
-	String(const char *p_cstr, int p_clip_to_len) {
-		parse_latin1(p_cstr, p_clip_to_len);
-	}
-	String(const wchar_t *p_cstr, int p_clip_to_len) {
-		parse_wstring(p_cstr, p_clip_to_len);
-	}
-	String(const char32_t *p_cstr, int p_clip_to_len) {
-		parse_utf32(p_cstr, p_clip_to_len);
+		append_utf32(p_cstr);
 	}
 
 	// Copy assignment for NULL terminated C strings.
 	void operator=(const char *p_cstr) {
-		parse_latin1(p_cstr);
+		clear();
+		append_latin1(p_cstr);
 	}
 	void operator=(const wchar_t *p_cstr) {
-		parse_wstring(p_cstr);
+		clear();
+		append_wstring(p_cstr);
 	}
 	void operator=(const char32_t *p_cstr) {
-		parse_utf32(p_cstr);
+		clear();
+		append_utf32(p_cstr);
 	}
-
-	explicit operator StrRange<char32_t>() const { return StrRange(get_data(), length()); }
 };
 
+// Zero-constructing String initializes _cowdata.ptr() to nullptr and thus empty.
+template <>
+struct is_zero_constructible<String> : std::true_type {};
+
 bool operator==(const char *p_chr, const String &p_str);
 bool operator==(const wchar_t *p_chr, const String &p_str);
 bool operator!=(const char *p_chr, const String &p_str);
@@ -678,21 +685,13 @@ struct FileNoCaseComparator {
 };
 
 template <typename L, typename R>
-_FORCE_INLINE_ bool is_str_less(const L *l_ptr, const R *r_ptr) {
+_FORCE_INLINE_ int64_t str_compare(const L *l_ptr, const R *r_ptr) {
 	while (true) {
 		const char32_t l = *l_ptr;
 		const char32_t r = *r_ptr;
 
-		if (l == 0 && r == 0) {
-			return false;
-		} else if (l == 0) {
-			return true;
-		} else if (r == 0) {
-			return false;
-		} else if (l < r) {
-			return true;
-		} else if (l > r) {
-			return false;
+		if (l == 0 || l != r) {
+			return static_cast<int64_t>(l) - static_cast<int64_t>(r);
 		}
 
 		l_ptr++;
@@ -792,5 +791,3 @@ _FORCE_INLINE_ Vector<String> sarray(P... p_args) {
 	sarray_add_str(arr, p_args...);
 	return arr;
 }
-
-#endif // USTRING_GODOT_H
diff --git a/engine/core/templates/a_hash_map.h b/engine/core/templates/a_hash_map.h
index 03089f09..b71db3dc 100644
--- a/engine/core/templates/a_hash_map.h
+++ b/engine/core/templates/a_hash_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef A_HASH_MAP_H
-#define A_HASH_MAP_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 
@@ -666,7 +665,9 @@ public:
 	}
 
 	AHashMap(const HashMap<TKey, TValue> &p_other) {
-		reserve(p_other.size());
+		if (p_other.size() > get_capacity()) {
+			reserve(p_other.size());
+		}
 		for (const KeyValue<TKey, TValue> &E : p_other) {
 			uint32_t hash = _hash(E.key);
 			_insert_element(E.key, E.value, hash);
@@ -704,7 +705,9 @@ public:
 	}
 
 	AHashMap(std::initializer_list<KeyValue<TKey, TValue>> p_init) {
-		reserve(p_init.size());
+		if (p_init.size() > get_capacity()) {
+			reserve(p_init.size());
+		}
 		for (const KeyValue<TKey, TValue> &E : p_init) {
 			insert(E.key, E.value);
 		}
@@ -736,5 +739,3 @@ extern template class AHashMap<String, int>;
 extern template class AHashMap<StringName, StringName>;
 extern template class AHashMap<StringName, Variant>;
 extern template class AHashMap<StringName, int>;
-
-#endif // A_HASH_MAP_H
diff --git a/engine/core/templates/bin_sorted_array.h b/engine/core/templates/bin_sorted_array.h
index 30c1fefb..e0860c4f 100644
--- a/engine/core/templates/bin_sorted_array.h
+++ b/engine/core/templates/bin_sorted_array.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BIN_SORTED_ARRAY_H
-#define BIN_SORTED_ARRAY_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_array.h"
@@ -177,5 +176,3 @@ public:
 		reset();
 	}
 };
-
-#endif // BIN_SORTED_ARRAY_H
diff --git a/engine/core/templates/bit_field.h b/engine/core/templates/bit_field.h
new file mode 100644
index 00000000..d8155f13
--- /dev/null
+++ b/engine/core/templates/bit_field.h
@@ -0,0 +1,73 @@
+/**************************************************************************/
+/*  bit_field.h                                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/typedefs.h"
+
+#include <type_traits>
+
+// TODO: Replace `typename` with enum concept once C++20 concepts/constraints are allowed.
+
+template <typename T>
+class BitField {
+	static_assert(std::is_enum_v<T>);
+	uint64_t value;
+
+public:
+	_ALWAYS_INLINE_ constexpr void set_flag(BitField p_flag) { value |= p_flag.value; }
+	_ALWAYS_INLINE_ constexpr bool has_flag(BitField p_flag) const { return value & p_flag.value; }
+	_ALWAYS_INLINE_ constexpr bool is_empty() const { return value == 0; }
+	_ALWAYS_INLINE_ constexpr void clear_flag(BitField p_flag) { value &= ~p_flag.value; }
+	_ALWAYS_INLINE_ constexpr void clear() { value = 0; }
+
+	[[nodiscard]] _ALWAYS_INLINE_ constexpr BitField get_combined(BitField p_other) const { return BitField(value | p_other.value); }
+	[[nodiscard]] _ALWAYS_INLINE_ constexpr BitField get_shared(BitField p_other) const { return BitField(value & p_other.value); }
+	[[nodiscard]] _ALWAYS_INLINE_ constexpr BitField get_different(BitField p_other) const { return BitField(value ^ p_other.value); }
+
+	_ALWAYS_INLINE_ constexpr BitField() = default;
+	_ALWAYS_INLINE_ constexpr BitField(T p_value) :
+			value(static_cast<uint64_t>(p_value)) {}
+	_ALWAYS_INLINE_ constexpr operator T() const { return static_cast<T>(value); }
+
+	// TODO: Unify as single constructor once C++20 `explicit` conditionals are allowed.
+
+	template <typename V, std::enable_if_t<std::is_arithmetic_v<V> && std::is_convertible_v<T, int>, int> = 0>
+	_ALWAYS_INLINE_ constexpr BitField(V p_value) :
+			value(static_cast<uint64_t>(p_value)) {}
+	template <typename V, std::enable_if_t<std::is_arithmetic_v<V> && !std::is_convertible_v<T, int>, int> = 0>
+	_ALWAYS_INLINE_ constexpr explicit BitField(V p_value) :
+			value(static_cast<uint64_t>(p_value)) {}
+	template <typename V, std::enable_if_t<std::is_arithmetic_v<V>, int> = 0>
+	_ALWAYS_INLINE_ constexpr explicit operator V() const { return static_cast<V>(value); }
+};
+
+// Implicitly zero-constructible as a trivially-constructible type.
+static_assert(is_zero_constructible_v<BitField<Error>>);
diff --git a/engine/core/templates/command_queue_mt.h b/engine/core/templates/command_queue_mt.h
index 576b2ff8..8154796e 100644
--- a/engine/core/templates/command_queue_mt.h
+++ b/engine/core/templates/command_queue_mt.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COMMAND_QUEUE_MT_H
-#define COMMAND_QUEUE_MT_H
+#pragma once
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/condition_variable.h"
@@ -114,7 +113,7 @@ class CommandQueueMT {
 	uint32_t sync_awaiters = 0;
 	WorkerThreadPool::TaskID pump_task_id = WorkerThreadPool::INVALID_TASK_ID;
 	uint64_t flush_read_ptr = 0;
-	std::atomic<bool> pending;
+	std::atomic<bool> pending{ false };
 
 	template <typename T, typename... Args>
 	_FORCE_INLINE_ void create_command(Args &&...p_args) {
@@ -256,5 +255,3 @@ public:
 	CommandQueueMT();
 	~CommandQueueMT();
 };
-
-#endif // COMMAND_QUEUE_MT_H
diff --git a/engine/core/templates/cowdata.h b/engine/core/templates/cowdata.h
index d53548dd..4cdf1f35 100644
--- a/engine/core/templates/cowdata.h
+++ b/engine/core/templates/cowdata.h
@@ -28,44 +28,23 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COWDATA_H
-#define COWDATA_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
 #include "core/templates/safe_refcount.h"
+#include "core/templates/span.h"
 
 #include <string.h>
 #include <initializer_list>
 #include <type_traits>
-#include <utility>
-
-template <typename T>
-class Vector;
-class String;
-class Char16String;
-class CharString;
-template <typename T, typename V>
-class VMap;
 
 static_assert(std::is_trivially_destructible_v<std::atomic<uint64_t>>);
 
-// Silence a false positive warning (see GH-52119).
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wplacement-new"
-#endif
+GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wplacement-new") // Silence a false positive warning (see GH-52119).
 
 template <typename T>
 class CowData {
-	template <typename TV>
-	friend class Vector;
-	friend class String;
-	friend class Char16String;
-	friend class CharString;
-	template <typename TV, typename VV>
-	friend class VMap;
-
 public:
 	typedef int64_t Size;
 	typedef uint64_t USize;
@@ -134,11 +113,11 @@ private:
 		return (USize *)((uint8_t *)_ptr - DATA_OFFSET + SIZE_OFFSET);
 	}
 
-	_FORCE_INLINE_ USize _get_alloc_size(USize p_elements) const {
+	_FORCE_INLINE_ static USize _get_alloc_size(USize p_elements) {
 		return next_po2(p_elements * sizeof(T));
 	}
 
-	_FORCE_INLINE_ bool _get_alloc_size_checked(USize p_elements, USize *out) const {
+	_FORCE_INLINE_ static bool _get_alloc_size_checked(USize p_elements, USize *out) {
 		if (unlikely(p_elements == 0)) {
 			*out = 0;
 			return true;
@@ -249,9 +228,8 @@ public:
 		return OK;
 	}
 
-	Size find(const T &p_val, Size p_from = 0) const;
-	Size rfind(const T &p_val, Size p_from = -1) const;
-	Size count(const T &p_val) const;
+	_FORCE_INLINE_ operator Span<T>() const { return Span<T>(ptr(), size()); }
+	_FORCE_INLINE_ Span<T> span() const { return operator Span<T>(); }
 
 	_FORCE_INLINE_ CowData() {}
 	_FORCE_INLINE_ ~CowData() { _unref(); }
@@ -386,14 +364,7 @@ Error CowData<T>::resize(Size p_size) {
 		}
 
 		// construct the newly created elements
-
-		if constexpr (!std::is_trivially_constructible_v<T>) {
-			for (Size i = *_get_size(); i < p_size; i++) {
-				memnew_placement(&_ptr[i], T);
-			}
-		} else if (p_ensure_zero) {
-			memset((void *)(_ptr + current_size), 0, (p_size - current_size) * sizeof(T));
-		}
+		memnew_arr_placement<p_ensure_zero>(_ptr + current_size, p_size - current_size);
 
 		*_get_size() = p_size;
 
@@ -434,54 +405,6 @@ Error CowData<T>::_realloc(Size p_alloc_size) {
 	return OK;
 }
 
-template <typename T>
-typename CowData<T>::Size CowData<T>::find(const T &p_val, Size p_from) const {
-	Size ret = -1;
-
-	if (p_from < 0 || size() == 0) {
-		return ret;
-	}
-
-	for (Size i = p_from; i < size(); i++) {
-		if (get(i) == p_val) {
-			ret = i;
-			break;
-		}
-	}
-
-	return ret;
-}
-
-template <typename T>
-typename CowData<T>::Size CowData<T>::rfind(const T &p_val, Size p_from) const {
-	const Size s = size();
-
-	if (p_from < 0) {
-		p_from = s + p_from;
-	}
-	if (p_from < 0 || p_from >= s) {
-		p_from = s - 1;
-	}
-
-	for (Size i = p_from; i >= 0; i--) {
-		if (get(i) == p_val) {
-			return i;
-		}
-	}
-	return -1;
-}
-
-template <typename T>
-typename CowData<T>::Size CowData<T>::count(const T &p_val) const {
-	Size amount = 0;
-	for (Size i = 0; i < size(); i++) {
-		if (get(i) == p_val) {
-			amount++;
-		}
-	}
-	return amount;
-}
-
 template <typename T>
 void CowData<T>::_ref(const CowData *p_from) {
 	_ref(*p_from);
@@ -517,8 +440,8 @@ CowData<T>::CowData(std::initializer_list<T> p_init) {
 	}
 }
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+GODOT_GCC_WARNING_POP
 
-#endif // COWDATA_H
+// Zero-constructing CowData initializes _ptr to nullptr (and thus empty).
+template <typename T>
+struct is_zero_constructible<CowData<T>> : std::true_type {};
diff --git a/engine/core/templates/hash_map.h b/engine/core/templates/hash_map.h
index c982e9b1..4dc6baf4 100644
--- a/engine/core/templates/hash_map.h
+++ b/engine/core/templates/hash_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HASH_MAP_H
-#define HASH_MAP_H
+#pragma once
 
 #include "core/os/memory.h"
 #include "core/templates/hashfuncs.h"
@@ -671,5 +670,3 @@ public:
 		}
 	}
 };
-
-#endif // HASH_MAP_H
diff --git a/engine/core/templates/hash_set.h b/engine/core/templates/hash_set.h
index 9a08da1d..14632a3b 100644
--- a/engine/core/templates/hash_set.h
+++ b/engine/core/templates/hash_set.h
@@ -28,14 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HASH_SET_H
-#define HASH_SET_H
+#pragma once
 
-#include "core/math/math_funcs.h"
 #include "core/os/memory.h"
-#include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
-#include "core/templates/paged_allocator.h"
 
 /**
  * Implementation of Set using a bidi indexed hash map.
@@ -479,5 +475,3 @@ public:
 		}
 	}
 };
-
-#endif // HASH_SET_H
diff --git a/engine/core/templates/hashfuncs.h b/engine/core/templates/hashfuncs.h
index a2cf57a0..781269ec 100644
--- a/engine/core/templates/hashfuncs.h
+++ b/engine/core/templates/hashfuncs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HASHFUNCS_H
-#define HASHFUNCS_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
@@ -56,6 +55,10 @@
 #include "core/templates/rid.h"
 #include "core/typedefs.h"
 
+#ifdef _MSC_VER
+#include <intrin.h> // Needed for `__umulh` below.
+#endif
+
 /**
  * Hashing functions
  */
@@ -146,7 +149,7 @@ static _FORCE_INLINE_ uint32_t hash_murmur3_one_float(float p_in, uint32_t p_see
 	if (p_in == 0.0f) {
 		u.f = 0.0;
 	} else if (Math::is_nan(p_in)) {
-		u.f = NAN;
+		u.f = Math::NaN;
 	} else {
 		u.f = p_in;
 	}
@@ -169,7 +172,7 @@ static _FORCE_INLINE_ uint32_t hash_murmur3_one_double(double p_in, uint32_t p_s
 	if (p_in == 0.0f) {
 		u.d = 0.0;
 	} else if (Math::is_nan(p_in)) {
-		u.d = NAN;
+		u.d = Math::NaN;
 	} else {
 		u.d = p_in;
 	}
@@ -257,7 +260,7 @@ static _FORCE_INLINE_ uint32_t hash_djb2_one_float(double p_in, uint32_t p_prev
 	if (p_in == 0.0f) {
 		u.d = 0.0;
 	} else if (Math::is_nan(p_in)) {
-		u.d = NAN;
+		u.d = Math::NaN;
 	} else {
 		u.d = p_in;
 	}
@@ -286,7 +289,7 @@ static _FORCE_INLINE_ uint64_t hash_djb2_one_float_64(double p_in, uint64_t p_pr
 	if (p_in == 0.0f) {
 		u.d = 0.0;
 	} else if (Math::is_nan(p_in)) {
-		u.d = NAN;
+		u.d = Math::NaN;
 	} else {
 		u.d = p_in;
 	}
@@ -426,116 +429,98 @@ struct HashMapComparatorDefault {
 template <>
 struct HashMapComparatorDefault<float> {
 	static bool compare(const float &p_lhs, const float &p_rhs) {
-		return (p_lhs == p_rhs) || (Math::is_nan(p_lhs) && Math::is_nan(p_rhs));
+		return Math::is_same(p_lhs, p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<double> {
 	static bool compare(const double &p_lhs, const double &p_rhs) {
-		return (p_lhs == p_rhs) || (Math::is_nan(p_lhs) && Math::is_nan(p_rhs));
+		return Math::is_same(p_lhs, p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Color> {
 	static bool compare(const Color &p_lhs, const Color &p_rhs) {
-		return ((p_lhs.r == p_rhs.r) || (Math::is_nan(p_lhs.r) && Math::is_nan(p_rhs.r))) && ((p_lhs.g == p_rhs.g) || (Math::is_nan(p_lhs.g) && Math::is_nan(p_rhs.g))) && ((p_lhs.b == p_rhs.b) || (Math::is_nan(p_lhs.b) && Math::is_nan(p_rhs.b))) && ((p_lhs.a == p_rhs.a) || (Math::is_nan(p_lhs.a) && Math::is_nan(p_rhs.a)));
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Vector2> {
 	static bool compare(const Vector2 &p_lhs, const Vector2 &p_rhs) {
-		return ((p_lhs.x == p_rhs.x) || (Math::is_nan(p_lhs.x) && Math::is_nan(p_rhs.x))) && ((p_lhs.y == p_rhs.y) || (Math::is_nan(p_lhs.y) && Math::is_nan(p_rhs.y)));
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Vector3> {
 	static bool compare(const Vector3 &p_lhs, const Vector3 &p_rhs) {
-		return ((p_lhs.x == p_rhs.x) || (Math::is_nan(p_lhs.x) && Math::is_nan(p_rhs.x))) && ((p_lhs.y == p_rhs.y) || (Math::is_nan(p_lhs.y) && Math::is_nan(p_rhs.y))) && ((p_lhs.z == p_rhs.z) || (Math::is_nan(p_lhs.z) && Math::is_nan(p_rhs.z)));
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Vector4> {
 	static bool compare(const Vector4 &p_lhs, const Vector4 &p_rhs) {
-		return ((p_lhs.x == p_rhs.x) || (Math::is_nan(p_lhs.x) && Math::is_nan(p_rhs.x))) && ((p_lhs.y == p_rhs.y) || (Math::is_nan(p_lhs.y) && Math::is_nan(p_rhs.y))) && ((p_lhs.z == p_rhs.z) || (Math::is_nan(p_lhs.z) && Math::is_nan(p_rhs.z))) && ((p_lhs.w == p_rhs.w) || (Math::is_nan(p_lhs.w) && Math::is_nan(p_rhs.w)));
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Rect2> {
 	static bool compare(const Rect2 &p_lhs, const Rect2 &p_rhs) {
-		return HashMapComparatorDefault<Vector2>().compare(p_lhs.position, p_rhs.position) && HashMapComparatorDefault<Vector2>().compare(p_lhs.size, p_rhs.size);
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<AABB> {
 	static bool compare(const AABB &p_lhs, const AABB &p_rhs) {
-		return HashMapComparatorDefault<Vector3>().compare(p_lhs.position, p_rhs.position) && HashMapComparatorDefault<Vector3>().compare(p_lhs.size, p_rhs.size);
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Plane> {
 	static bool compare(const Plane &p_lhs, const Plane &p_rhs) {
-		return HashMapComparatorDefault<Vector3>().compare(p_lhs.normal, p_rhs.normal) && ((p_lhs.d == p_rhs.d) || (Math::is_nan(p_lhs.d) && Math::is_nan(p_rhs.d)));
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Transform2D> {
 	static bool compare(const Transform2D &p_lhs, const Transform2D &p_rhs) {
-		for (int i = 0; i < 3; ++i) {
-			if (!HashMapComparatorDefault<Vector2>().compare(p_lhs.columns[i], p_rhs.columns[i])) {
-				return false;
-			}
-		}
-
-		return true;
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Basis> {
 	static bool compare(const Basis &p_lhs, const Basis &p_rhs) {
-		for (int i = 0; i < 3; ++i) {
-			if (!HashMapComparatorDefault<Vector3>().compare(p_lhs.rows[i], p_rhs.rows[i])) {
-				return false;
-			}
-		}
-
-		return true;
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Transform3D> {
 	static bool compare(const Transform3D &p_lhs, const Transform3D &p_rhs) {
-		return HashMapComparatorDefault<Basis>().compare(p_lhs.basis, p_rhs.basis) && HashMapComparatorDefault<Vector3>().compare(p_lhs.origin, p_rhs.origin);
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Projection> {
 	static bool compare(const Projection &p_lhs, const Projection &p_rhs) {
-		for (int i = 0; i < 4; ++i) {
-			if (!HashMapComparatorDefault<Vector4>().compare(p_lhs.columns[i], p_rhs.columns[i])) {
-				return false;
-			}
-		}
-
-		return true;
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
 template <>
 struct HashMapComparatorDefault<Quaternion> {
 	static bool compare(const Quaternion &p_lhs, const Quaternion &p_rhs) {
-		return ((p_lhs.x == p_rhs.x) || (Math::is_nan(p_lhs.x) && Math::is_nan(p_rhs.x))) && ((p_lhs.y == p_rhs.y) || (Math::is_nan(p_lhs.y) && Math::is_nan(p_rhs.y))) && ((p_lhs.z == p_rhs.z) || (Math::is_nan(p_lhs.z) && Math::is_nan(p_rhs.z))) && ((p_lhs.w == p_rhs.w) || (Math::is_nan(p_lhs.w) && Math::is_nan(p_rhs.w)));
+		return p_lhs.is_same(p_rhs);
 	}
 };
 
@@ -634,5 +619,3 @@ static _FORCE_INLINE_ uint32_t fastmod(const uint32_t n, const uint64_t c, const
 #endif // __SIZEOF_INT128__
 #endif // _MSC_VER
 }
-
-#endif // HASHFUNCS_H
diff --git a/engine/core/templates/list.h b/engine/core/templates/list.h
index 3d7cff37..9f3ebb34 100644
--- a/engine/core/templates/list.h
+++ b/engine/core/templates/list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIST_H
-#define LIST_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
@@ -829,5 +828,3 @@ void List<T, A>::Element::transfer_to_back(List<T, A> *p_dst_list) {
 	data = p_dst_list->_data;
 	p_dst_list->_data->size_cache++;
 }
-
-#endif // LIST_H
diff --git a/engine/core/templates/local_vector.h b/engine/core/templates/local_vector.h
index b89799ab..39929547 100644
--- a/engine/core/templates/local_vector.h
+++ b/engine/core/templates/local_vector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LOCAL_VECTOR_H
-#define LOCAL_VECTOR_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
@@ -49,13 +48,12 @@ private:
 	T *data = nullptr;
 
 public:
-	T *ptr() {
-		return data;
-	}
+	_FORCE_INLINE_ T *ptr() { return data; }
+	_FORCE_INLINE_ const T *ptr() const { return data; }
+	_FORCE_INLINE_ U size() const { return count; }
 
-	const T *ptr() const {
-		return data;
-	}
+	_FORCE_INLINE_ Span<T> span() const { return Span(data, count); }
+	_FORCE_INLINE_ operator Span<T>() const { return span(); }
 
 	// Must take a copy instead of a reference (see GH-31736).
 	_FORCE_INLINE_ void push_back(T p_elem) {
@@ -66,7 +64,7 @@ public:
 		}
 
 		if constexpr (!std::is_trivially_constructible_v<T> && !force_trivial) {
-			memnew_placement(&data[count++], T(p_elem));
+			memnew_placement(&data[count++], T(std::move(p_elem)));
 		} else {
 			data[count++] = std::move(p_elem);
 		}
@@ -105,6 +103,15 @@ public:
 		return false;
 	}
 
+	bool erase_unordered(const T &p_val) {
+		int64_t idx = find(p_val);
+		if (idx >= 0) {
+			remove_at_unordered(idx);
+			return true;
+		}
+		return false;
+	}
+
 	U erase_multiple_unordered(const T &p_val) {
 		U from = 0;
 		U occurrences = 0;
@@ -147,7 +154,6 @@ public:
 		}
 	}
 
-	_FORCE_INLINE_ U size() const { return count; }
 	void resize(U p_size) {
 		if (p_size < count) {
 			if constexpr (!std::is_trivially_destructible_v<T> && !force_trivial) {
@@ -163,9 +169,7 @@ public:
 				CRASH_COND_MSG(!data, "Out of memory");
 			}
 			if constexpr (!std::is_trivially_constructible_v<T> && !force_trivial) {
-				for (U i = count; i < p_size; i++) {
-					memnew_placement(&data[i], T);
-				}
+				memnew_arr_placement(data + count, p_size - count);
 			}
 			count = p_size;
 		}
@@ -256,13 +260,14 @@ public:
 		}
 	}
 
-	int64_t find(const T &p_val, U p_from = 0) const {
-		for (U i = p_from; i < count; i++) {
-			if (data[i] == p_val) {
-				return int64_t(i);
-			}
+	int64_t find(const T &p_val, int64_t p_from = 0) const {
+		if (p_from < 0) {
+			p_from = size() + p_from;
 		}
-		return -1;
+		if (p_from < 0 || p_from >= size()) {
+			return -1;
+		}
+		return span().find(p_val, p_from);
 	}
 
 	bool has(const T &p_val) const {
@@ -281,7 +286,7 @@ public:
 	}
 
 	void sort() {
-		sort_custom<_DefaultComparator<T>>();
+		sort_custom<Comparator<T>>();
 	}
 
 	void ordered_insert(T p_val) {
@@ -386,4 +391,6 @@ public:
 template <typename T, typename U = uint32_t, bool force_trivial = false>
 using TightLocalVector = LocalVector<T, U, force_trivial, true>;
 
-#endif // LOCAL_VECTOR_H
+// Zero-constructing LocalVector initializes count, capacity and data to 0 and thus empty.
+template <typename T, typename U, bool force_trivial, bool tight>
+struct is_zero_constructible<LocalVector<T, U, force_trivial, tight>> : std::true_type {};
diff --git a/engine/core/templates/lru.h b/engine/core/templates/lru.h
index 7f48c3b2..df15d4b6 100644
--- a/engine/core/templates/lru.h
+++ b/engine/core/templates/lru.h
@@ -28,25 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LRU_H
-#define LRU_H
+#pragma once
 
-#include "core/math/math_funcs.h"
 #include "hash_map.h"
 #include "list.h"
 
-#if defined(__GNUC__) && !defined(__clang__)
-#define ADDRESS_DIAGNOSTIC_WARNING_DISABLE \
-	_Pragma("GCC diagnostic push");        \
-	_Pragma("GCC diagnostic ignored \"-Waddress\"");
-
-#define ADDRESS_DIAGNOSTIC_POP \
-	_Pragma("GCC diagnostic pop");
-#else
-#define ADDRESS_DIAGNOSTIC_WARNING_DISABLE
-#define ADDRESS_DIAGNOSTIC_POP
-#endif
-
 template <typename TKey, typename TData, typename Hasher = HashMapHasherDefault, typename Comparator = HashMapComparatorDefault<TKey>, void (*BeforeEvict)(TKey &, TData &) = nullptr>
 class LRUCache {
 public:
@@ -74,11 +60,11 @@ public:
 		Element n = _list.push_front(Pair(p_key, p_value));
 
 		if (e) {
-			ADDRESS_DIAGNOSTIC_WARNING_DISABLE;
+			GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Waddress")
 			if constexpr (BeforeEvict != nullptr) {
 				BeforeEvict((*e)->get().key, (*e)->get().data);
 			}
-			ADDRESS_DIAGNOSTIC_POP;
+			GODOT_GCC_WARNING_POP
 			_list.erase(*e);
 			_map.erase(p_key);
 		}
@@ -86,11 +72,11 @@ public:
 
 		while (_map.size() > capacity) {
 			Element d = _list.back();
-			ADDRESS_DIAGNOSTIC_WARNING_DISABLE
+			GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Waddress")
 			if constexpr (BeforeEvict != nullptr) {
 				BeforeEvict(d->get().key, d->get().data);
 			}
-			ADDRESS_DIAGNOSTIC_POP
+			GODOT_GCC_WARNING_POP
 			_map.erase(d->get().key);
 			_list.pop_back();
 		}
@@ -143,11 +129,11 @@ public:
 			capacity = p_capacity;
 			while (_map.size() > capacity) {
 				Element d = _list.back();
-				ADDRESS_DIAGNOSTIC_WARNING_DISABLE;
+				GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Waddress")
 				if constexpr (BeforeEvict != nullptr) {
 					BeforeEvict(d->get().key, d->get().data);
 				}
-				ADDRESS_DIAGNOSTIC_POP;
+				GODOT_GCC_WARNING_POP
 				_map.erase(d->get().key);
 				_list.pop_back();
 			}
@@ -162,8 +148,3 @@ public:
 		capacity = p_capacity;
 	}
 };
-
-#undef ADDRESS_DIAGNOSTIC_WARNING_DISABLE
-#undef ADDRESS_DIAGNOSTIC_POP
-
-#endif // LRU_H
diff --git a/engine/core/templates/oa_hash_map.h b/engine/core/templates/oa_hash_map.h
index edb34895..3aedeb69 100644
--- a/engine/core/templates/oa_hash_map.h
+++ b/engine/core/templates/oa_hash_map.h
@@ -28,10 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OA_HASH_MAP_H
-#define OA_HASH_MAP_H
+#pragma once
 
-#include "core/math/math_funcs.h"
 #include "core/os/memory.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/pair.h"
@@ -405,5 +403,3 @@ public:
 		Memory::free_static(hashes);
 	}
 };
-
-#endif // OA_HASH_MAP_H
diff --git a/engine/core/templates/paged_allocator.h b/engine/core/templates/paged_allocator.h
index 0b70fa02..697dc1e9 100644
--- a/engine/core/templates/paged_allocator.h
+++ b/engine/core/templates/paged_allocator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PAGED_ALLOCATOR_H
-#define PAGED_ALLOCATOR_H
+#pragma once
 
 #include "core/core_globals.h"
 #include "core/os/memory.h"
@@ -38,7 +37,7 @@
 #include "core/typedefs.h"
 
 #include <type_traits>
-#include <typeinfo>
+#include <typeinfo> // IWYU pragma: keep // Used in macro.
 
 template <typename T, bool thread_safe = false, uint32_t DEFAULT_PAGE_SIZE = 4096>
 class PagedAllocator {
@@ -177,5 +176,3 @@ public:
 		}
 	}
 };
-
-#endif // PAGED_ALLOCATOR_H
diff --git a/engine/core/templates/paged_array.h b/engine/core/templates/paged_array.h
index 1aa8fa24..060c5a58 100644
--- a/engine/core/templates/paged_array.h
+++ b/engine/core/templates/paged_array.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PAGED_ARRAY_H
-#define PAGED_ARRAY_H
+#pragma once
 
 #include "core/os/memory.h"
 #include "core/os/spin_lock.h"
@@ -372,5 +371,3 @@ public:
 		reset();
 	}
 };
-
-#endif // PAGED_ARRAY_H
diff --git a/engine/core/templates/pair.h b/engine/core/templates/pair.h
index fd774641..a39ed4aa 100644
--- a/engine/core/templates/pair.h
+++ b/engine/core/templates/pair.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PAIR_H
-#define PAIR_H
+#pragma once
 
 #include "core/templates/hashfuncs.h"
 #include "core/typedefs.h"
@@ -78,6 +77,10 @@ struct PairHash {
 	}
 };
 
+// Pair is zero-constructible if and only if both constrained types are zero-constructible.
+template <typename F, typename S>
+struct is_zero_constructible<Pair<F, S>> : std::conjunction<is_zero_constructible<F>, is_zero_constructible<S>> {};
+
 template <typename K, typename V>
 struct KeyValue {
 	const K key;
@@ -111,4 +114,6 @@ struct KeyValueSort {
 	}
 };
 
-#endif // PAIR_H
+// KeyValue is zero-constructible if and only if both constrained types are zero-constructible.
+template <typename K, typename V>
+struct is_zero_constructible<KeyValue<K, V>> : std::conjunction<is_zero_constructible<K>, is_zero_constructible<V>> {};
diff --git a/engine/core/templates/pass_func.h b/engine/core/templates/pass_func.h
index 3e86327f..118011d5 100644
--- a/engine/core/templates/pass_func.h
+++ b/engine/core/templates/pass_func.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PASS_FUNC_H
-#define PASS_FUNC_H
+#pragma once
 
 #define PASS0R(m_r, m_name)        \
 	m_r m_name() {                 \
@@ -160,5 +159,3 @@
 	void m_name(m_type1 arg1, m_type2 arg2, m_type3 arg3, m_type4 arg4, m_type5 arg5, m_type6 arg6, m_type7 arg7, m_type8 arg8, m_type9 arg9, m_type10 arg10, m_type11 arg11, m_type12 arg12, m_type13 arg13, m_type14 arg14, m_type15 arg15) { \
 		PASSBASE->m_name(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15);                                                                                                                       \
 	}
-
-#endif // PASS_FUNC_H
diff --git a/engine/core/templates/pooled_list.h b/engine/core/templates/pooled_list.h
index 0e704873..4c7f3eda 100644
--- a/engine/core/templates/pooled_list.h
+++ b/engine/core/templates/pooled_list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POOLED_LIST_H
-#define POOLED_LIST_H
+#pragma once
 
 // Simple template to provide a pool with O(1) allocate and free.
 // The freelist could alternatively be a linked list placed within the unused elements
@@ -207,5 +206,3 @@ private:
 	LocalVector<U, U> _active_map;
 	LocalVector<U, U> _active_list;
 };
-
-#endif // POOLED_LIST_H
diff --git a/engine/core/templates/rb_map.h b/engine/core/templates/rb_map.h
index 09c8a1ca..7c207928 100644
--- a/engine/core/templates/rb_map.h
+++ b/engine/core/templates/rb_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RB_MAP_H
-#define RB_MAP_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
@@ -777,5 +776,3 @@ public:
 		clear();
 	}
 };
-
-#endif // RB_MAP_H
diff --git a/engine/core/templates/rb_set.h b/engine/core/templates/rb_set.h
index cb2218d2..79835395 100644
--- a/engine/core/templates/rb_set.h
+++ b/engine/core/templates/rb_set.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RB_SET_H
-#define RB_SET_H
+#pragma once
 
 #include "core/os/memory.h"
 #include "core/typedefs.h"
@@ -715,5 +714,3 @@ public:
 		clear();
 	}
 };
-
-#endif // RB_SET_H
diff --git a/engine/core/templates/rid.h b/engine/core/templates/rid.h
index 3f6a62ff..a8b86c1e 100644
--- a/engine/core/templates/rid.h
+++ b/engine/core/templates/rid.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RID_H
-#define RID_H
+#pragma once
 
 #include "core/typedefs.h"
 
@@ -73,4 +72,5 @@ public:
 	_ALWAYS_INLINE_ RID() {}
 };
 
-#endif // RID_H
+template <>
+struct is_zero_constructible<RID> : std::true_type {};
diff --git a/engine/core/templates/rid_owner.h b/engine/core/templates/rid_owner.h
index 149ac0db..3ff34c40 100644
--- a/engine/core/templates/rid_owner.h
+++ b/engine/core/templates/rid_owner.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RID_OWNER_H
-#define RID_OWNER_H
+#pragma once
 
 #include "core/os/memory.h"
 #include "core/os/mutex.h"
@@ -39,7 +38,7 @@
 #include "core/templates/safe_refcount.h"
 
 #include <stdio.h>
-#include <typeinfo>
+#include <typeinfo> // IWYU pragma: keep // Used in macro.
 
 #ifdef SANITIZERS_ENABLED
 #ifdef __has_feature
@@ -576,5 +575,3 @@ public:
 	RID_Owner(uint32_t p_target_chunk_byte_size = 65536, uint32_t p_maximum_number_of_elements = 262144) :
 			alloc(p_target_chunk_byte_size, p_maximum_number_of_elements) {}
 };
-
-#endif // RID_OWNER_H
diff --git a/engine/core/templates/ring_buffer.h b/engine/core/templates/ring_buffer.h
index f5161cef..e60b9485 100644
--- a/engine/core/templates/ring_buffer.h
+++ b/engine/core/templates/ring_buffer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RING_BUFFER_H
-#define RING_BUFFER_H
+#pragma once
 
 #include "core/templates/vector.h"
 
@@ -216,5 +215,3 @@ public:
 	}
 	~RingBuffer() {}
 };
-
-#endif // RING_BUFFER_H
diff --git a/engine/core/templates/safe_list.h b/engine/core/templates/safe_list.h
index ab07077a..768135ce 100644
--- a/engine/core/templates/safe_list.h
+++ b/engine/core/templates/safe_list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SAFE_LIST_H
-#define SAFE_LIST_H
+#pragma once
 
 #include "core/os/memory.h"
 #include "core/typedefs.h"
@@ -37,7 +36,6 @@
 #include <atomic>
 #include <functional>
 #include <initializer_list>
-#include <type_traits>
 
 // Design goals for these classes:
 // - Accessing this list with an iterator will never result in a use-after free,
@@ -244,5 +242,3 @@ public:
 #endif
 	}
 };
-
-#endif // SAFE_LIST_H
diff --git a/engine/core/templates/safe_refcount.h b/engine/core/templates/safe_refcount.h
index 16b605ea..4173f756 100644
--- a/engine/core/templates/safe_refcount.h
+++ b/engine/core/templates/safe_refcount.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SAFE_REFCOUNT_H
-#define SAFE_REFCOUNT_H
+#pragma once
 
 #include "core/typedefs.h"
 
@@ -38,7 +37,7 @@
 #endif
 
 #include <atomic>
-#include <type_traits>
+#include <type_traits> // IWYU pragma: keep // Used in macro.
 
 // Design goals for these classes:
 // - No automatic conversions or arithmetic operators,
@@ -222,5 +221,3 @@ public:
 		count.set(p_value);
 	}
 };
-
-#endif // SAFE_REFCOUNT_H
diff --git a/engine/core/templates/search_array.h b/engine/core/templates/search_array.h
index 835bcd63..13d76688 100644
--- a/engine/core/templates/search_array.h
+++ b/engine/core/templates/search_array.h
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SEARCH_ARRAY_H
-#define SEARCH_ARRAY_H
+#pragma once
 
-#include <core/templates/sort_array.h>
+#include "core/typedefs.h"
 
-template <typename T, typename Comparator = _DefaultComparator<T>>
+template <typename T, typename Comparator = Comparator<T>>
 class SearchArray {
 public:
 	Comparator compare;
@@ -63,5 +62,3 @@ public:
 		return lo;
 	}
 };
-
-#endif // SEARCH_ARRAY_H
diff --git a/engine/core/templates/self_list.h b/engine/core/templates/self_list.h
index a0497259..f2c8da7d 100644
--- a/engine/core/templates/self_list.h
+++ b/engine/core/templates/self_list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SELF_LIST_H
-#define SELF_LIST_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/typedefs.h"
@@ -201,5 +200,3 @@ public:
 		}
 	}
 };
-
-#endif // SELF_LIST_H
diff --git a/engine/core/templates/simple_type.h b/engine/core/templates/simple_type.h
index 197115dd..1468885a 100644
--- a/engine/core/templates/simple_type.h
+++ b/engine/core/templates/simple_type.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SIMPLE_TYPE_H
-#define SIMPLE_TYPE_H
+#pragma once
 
 #include <type_traits>
 
 template <typename T>
 using GetSimpleTypeT = typename std::remove_cv_t<std::remove_reference_t<T>>;
-
-#endif // SIMPLE_TYPE_H
diff --git a/engine/core/templates/sort_array.h b/engine/core/templates/sort_array.h
index 5bf5b281..6ef232fb 100644
--- a/engine/core/templates/sort_array.h
+++ b/engine/core/templates/sort_array.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SORT_ARRAY_H
-#define SORT_ARRAY_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/typedefs.h"
@@ -40,18 +39,13 @@
 		break;                                                        \
 	}
 
-template <typename T>
-struct _DefaultComparator {
-	_FORCE_INLINE_ bool operator()(const T &a, const T &b) const { return (a < b); }
-};
-
 #ifdef DEBUG_ENABLED
 #define SORT_ARRAY_VALIDATE_ENABLED true
 #else
 #define SORT_ARRAY_VALIDATE_ENABLED false
 #endif
 
-template <typename T, typename Comparator = _DefaultComparator<T>, bool Validate = SORT_ARRAY_VALIDATE_ENABLED>
+template <typename T, typename Comparator = Comparator<T>, bool Validate = SORT_ARRAY_VALIDATE_ENABLED>
 class SortArray {
 	enum {
 		INTROSORT_THRESHOLD = 16
@@ -316,5 +310,3 @@ public:
 		introselect(p_first, p_nth, p_last, p_array, bitlog(p_last - p_first) * 2);
 	}
 };
-
-#endif // SORT_ARRAY_H
diff --git a/engine/core/templates/span.h b/engine/core/templates/span.h
new file mode 100644
index 00000000..5e796702
--- /dev/null
+++ b/engine/core/templates/span.h
@@ -0,0 +1,124 @@
+/**************************************************************************/
+/*  span.h                                                                */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/typedefs.h"
+
+// Equivalent of std::span.
+// Represents a view into a contiguous memory space.
+// DISCLAIMER: This data type does not own the underlying buffer. DO NOT STORE IT.
+//  Additionally, for the lifetime of the Span, do not resize the buffer, and do not insert or remove elements from it.
+//  Failure to respect this may lead to crashes or undefined behavior.
+template <typename T>
+class Span {
+	const T *_ptr = nullptr;
+	uint64_t _len = 0;
+
+public:
+	static constexpr bool is_string = std::disjunction_v<
+			std::is_same<T, char>,
+			std::is_same<T, char16_t>,
+			std::is_same<T, char32_t>,
+			std::is_same<T, wchar_t>>;
+
+	_FORCE_INLINE_ constexpr Span() = default;
+	_FORCE_INLINE_ constexpr Span(const T *p_ptr, uint64_t p_len) :
+			_ptr(p_ptr), _len(p_len) {}
+
+	// Allows creating Span directly from C arrays and string literals.
+	template <size_t N>
+	_FORCE_INLINE_ constexpr Span(const T (&p_array)[N]) :
+			_ptr(p_array), _len(N) {
+		if constexpr (is_string) {
+			// Cut off the \0 terminator implicitly added to string literals.
+			if (N > 0 && p_array[N - 1] == '\0') {
+				_len--;
+			}
+		}
+	}
+
+	_FORCE_INLINE_ constexpr uint64_t size() const { return _len; }
+	_FORCE_INLINE_ constexpr bool is_empty() const { return _len == 0; }
+
+	_FORCE_INLINE_ constexpr const T *ptr() const { return _ptr; }
+
+	// NOTE: Span subscripts sanity check the bounds to avoid undefined behavior.
+	//       This is slower than direct buffer access and can prevent autovectorization.
+	//       If the bounds are known, use ptr() subscript instead.
+	_FORCE_INLINE_ constexpr const T &operator[](uint64_t p_idx) const {
+		CRASH_COND(p_idx >= _len);
+		return _ptr[p_idx];
+	}
+
+	_FORCE_INLINE_ constexpr const T *begin() const { return _ptr; }
+	_FORCE_INLINE_ constexpr const T *end() const { return _ptr + _len; }
+
+	// Algorithms.
+	constexpr int64_t find(const T &p_val, uint64_t p_from = 0) const;
+	constexpr int64_t rfind(const T &p_val, uint64_t p_from) const;
+	_FORCE_INLINE_ constexpr int64_t rfind(const T &p_val) const { return rfind(p_val, size() - 1); }
+	constexpr uint64_t count(const T &p_val) const;
+};
+
+template <typename T>
+constexpr int64_t Span<T>::find(const T &p_val, uint64_t p_from) const {
+	for (uint64_t i = p_from; i < size(); i++) {
+		if (ptr()[i] == p_val) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+template <typename T>
+constexpr int64_t Span<T>::rfind(const T &p_val, uint64_t p_from) const {
+	for (int64_t i = p_from; i >= 0; i--) {
+		if (ptr()[i] == p_val) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+template <typename T>
+constexpr uint64_t Span<T>::count(const T &p_val) const {
+	uint64_t amount = 0;
+	for (uint64_t i = 0; i < size(); i++) {
+		if (ptr()[i] == p_val) {
+			amount++;
+		}
+	}
+	return amount;
+}
+
+// Zero-constructing Span initializes _ptr and _len to 0 (and thus empty).
+template <typename T>
+struct is_zero_constructible<Span<T>> : std::true_type {};
diff --git a/engine/core/templates/tuple.h b/engine/core/templates/tuple.h
index 2825bd46..4492fab7 100644
--- a/engine/core/templates/tuple.h
+++ b/engine/core/templates/tuple.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TUPLE_H
-#define TUPLE_H
+#pragma once
 
 // Simple recursive Tuple type that has no runtime overhead.
 //
@@ -86,6 +85,10 @@ struct Tuple<T, Rest...> : Tuple<Rest...> {
 			value(std::forward<F>(f)) {}
 };
 
+// Tuple is zero-constructible if and only if all constrained types are zero-constructible.
+template <typename... Types>
+struct is_zero_constructible<Tuple<Types...>> : std::conjunction<is_zero_constructible<Types>...> {};
+
 template <size_t I, typename Tuple>
 struct TupleGet;
 
@@ -117,5 +120,3 @@ template <size_t I, typename... Types>
 _FORCE_INLINE_ const auto &tuple_get(const Tuple<Types...> &t) {
 	return TupleGet<I, Tuple<Types...>>::tuple_get(t);
 }
-
-#endif // TUPLE_H
diff --git a/engine/core/templates/vector.h b/engine/core/templates/vector.h
index 3cede430..f30747d2 100644
--- a/engine/core/templates/vector.h
+++ b/engine/core/templates/vector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VECTOR_H
-#define VECTOR_H
+#pragma once
 
 /**
  * @class Vector
@@ -40,14 +39,14 @@
  */
 
 #include "core/error/error_macros.h"
-#include "core/os/memory.h"
 #include "core/templates/cowdata.h"
 #include "core/templates/search_array.h"
 #include "core/templates/sort_array.h"
 
-#include <climits>
 #include <initializer_list>
-#include <utility>
+
+template <typename T>
+class Vector;
 
 template <typename T>
 class VectorWriteProxy {
@@ -90,21 +89,41 @@ public:
 
 	_FORCE_INLINE_ T *ptrw() { return _cowdata.ptrw(); }
 	_FORCE_INLINE_ const T *ptr() const { return _cowdata.ptr(); }
+	_FORCE_INLINE_ Size size() const { return _cowdata.size(); }
+
+	_FORCE_INLINE_ operator Span<T>() const { return _cowdata.span(); }
+	_FORCE_INLINE_ Span<T> span() const { return _cowdata.span(); }
+
 	_FORCE_INLINE_ void clear() { resize(0); }
 	_FORCE_INLINE_ bool is_empty() const { return _cowdata.is_empty(); }
 
 	_FORCE_INLINE_ T get(Size p_index) { return _cowdata.get(p_index); }
 	_FORCE_INLINE_ const T &get(Size p_index) const { return _cowdata.get(p_index); }
 	_FORCE_INLINE_ void set(Size p_index, const T &p_elem) { _cowdata.set(p_index, p_elem); }
-	_FORCE_INLINE_ Size size() const { return _cowdata.size(); }
 	Error resize(Size p_size) { return _cowdata.resize(p_size); }
 	Error resize_zeroed(Size p_size) { return _cowdata.template resize<true>(p_size); }
 	_FORCE_INLINE_ const T &operator[](Size p_index) const { return _cowdata.get(p_index); }
 	// Must take a copy instead of a reference (see GH-31736).
 	Error insert(Size p_pos, T p_val) { return _cowdata.insert(p_pos, p_val); }
-	Size find(const T &p_val, Size p_from = 0) const { return _cowdata.find(p_val, p_from); }
-	Size rfind(const T &p_val, Size p_from = -1) const { return _cowdata.rfind(p_val, p_from); }
-	Size count(const T &p_val) const { return _cowdata.count(p_val); }
+	Size find(const T &p_val, Size p_from = 0) const {
+		if (p_from < 0) {
+			p_from = size() + p_from;
+		}
+		if (p_from < 0 || p_from >= size()) {
+			return -1;
+		}
+		return span().find(p_val, p_from);
+	}
+	Size rfind(const T &p_val, Size p_from = -1) const {
+		if (p_from < 0) {
+			p_from = size() + p_from;
+		}
+		if (p_from < 0 || p_from >= size()) {
+			return -1;
+		}
+		return span().rfind(p_val, p_from);
+	}
+	Size count(const T &p_val) const { return span().count(p_val); }
 
 	// Must take a copy instead of a reference (see GH-31736).
 	void append_array(Vector<T> p_other);
@@ -112,7 +131,7 @@ public:
 	_FORCE_INLINE_ bool has(const T &p_val) const { return find(p_val) != -1; }
 
 	void sort() {
-		sort_custom<_DefaultComparator<T>>();
+		sort_custom<Comparator<T>>();
 	}
 
 	template <typename Comparator, bool Validate = SORT_ARRAY_VALIDATE_ENABLED, typename... Args>
@@ -128,7 +147,7 @@ public:
 	}
 
 	Size bsearch(const T &p_value, bool p_before) {
-		return bsearch_custom<_DefaultComparator<T>>(p_value, p_before);
+		return bsearch_custom<Comparator<T>>(p_value, p_before);
 	}
 
 	template <typename Comparator, typename Value, typename... Args>
@@ -151,7 +170,7 @@ public:
 		insert(i, p_val);
 	}
 
-	void operator=(const Vector &p_from) { _cowdata._ref(p_from._cowdata); }
+	void operator=(const Vector &p_from) { _cowdata = p_from._cowdata; }
 	void operator=(Vector &&p_from) { _cowdata = std::move(p_from._cowdata); }
 
 	Vector<uint8_t> to_byte_array() const {
@@ -288,9 +307,8 @@ public:
 	_FORCE_INLINE_ Vector() {}
 	_FORCE_INLINE_ Vector(std::initializer_list<T> p_init) :
 			_cowdata(p_init) {}
-	_FORCE_INLINE_ Vector(const Vector &p_from) { _cowdata._ref(p_from._cowdata); }
-	_FORCE_INLINE_ Vector(Vector &&p_from) :
-			_cowdata(std::move(p_from._cowdata)) {}
+	_FORCE_INLINE_ Vector(const Vector &p_from) = default;
+	_FORCE_INLINE_ Vector(Vector &&p_from) = default;
 
 	_FORCE_INLINE_ ~Vector() {}
 };
@@ -333,4 +351,6 @@ void Vector<T>::fill(T p_elem) {
 	}
 }
 
-#endif // VECTOR_H
+// Zero-constructing Vector initializes CowData.ptr() to nullptr and thus empty.
+template <typename T>
+struct is_zero_constructible<Vector<T>> : std::true_type {};
diff --git a/engine/core/templates/vmap.h b/engine/core/templates/vmap.h
index c0cd35c2..be325ee3 100644
--- a/engine/core/templates/vmap.h
+++ b/engine/core/templates/vmap.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VMAP_H
-#define VMAP_H
+#pragma once
 
 #include "core/templates/cowdata.h"
 #include "core/typedefs.h"
@@ -196,11 +195,7 @@ public:
 	_FORCE_INLINE_ VMap() {}
 	_FORCE_INLINE_ VMap(std::initializer_list<T> p_init) :
 			_cowdata(p_init) {}
-	_FORCE_INLINE_ VMap(const VMap &p_from) { _cowdata._ref(p_from._cowdata); }
+	_FORCE_INLINE_ VMap(const VMap &p_from) = default;
 
-	inline void operator=(const VMap &p_from) {
-		_cowdata._ref(p_from._cowdata);
-	}
+	void operator=(const VMap &p_from) { _cowdata = p_from._cowdata; }
 };
-
-#endif // VMAP_H
diff --git a/engine/core/templates/vset.h b/engine/core/templates/vset.h
index d22f29bc..dec8c765 100644
--- a/engine/core/templates/vset.h
+++ b/engine/core/templates/vset.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VSET_H
-#define VSET_H
+#pragma once
 
 #include "core/templates/vector.h"
 #include "core/typedefs.h"
@@ -142,5 +141,3 @@ public:
 	_FORCE_INLINE_ VSet(std::initializer_list<T> p_init) :
 			_data(p_init) {}
 };
-
-#endif // VSET_H
diff --git a/engine/core/typedefs.h b/engine/core/typedefs.h
index 7802b727..104b2da1 100644
--- a/engine/core/typedefs.h
+++ b/engine/core/typedefs.h
@@ -28,25 +28,31 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TYPEDEFS_H
-#define TYPEDEFS_H
-
-#include <stddef.h>
+#pragma once
 
 /**
  * Basic definitions and simple functions to be used everywhere.
  */
 
+// IWYU pragma: always_keep
+
+// Ensure that C++ standard is at least C++17.
+// If on MSVC, also ensures that the `Zc:__cplusplus` flag is present.
+static_assert(__cplusplus >= 201703L, "Minimum of C++17 required.");
+
+// IWYU pragma: begin_exports
+
 // Include first in case the platform needs to pre-define/include some things.
 #include "platform_config.h"
 
 // Should be available everywhere.
 #include "core/error/error_list.h"
+
+#include <cstddef>
 #include <cstdint>
 #include <utility>
 
-// Ensure that C++ standard is at least C++17. If on MSVC, also ensures that the `Zc:__cplusplus` flag is present.
-static_assert(__cplusplus >= 201703L);
+// IWYU pragma: end_exports
 
 // Turn argument to string constant:
 // https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html#Stringizing
@@ -66,15 +72,27 @@ static_assert(__cplusplus >= 201703L);
 #endif
 #endif
 
-// Should always inline, except in dev builds because it makes debugging harder.
+// Should always inline, except in dev builds because it makes debugging harder,
+// or `size_enabled` builds where inlining is actively avoided.
 #ifndef _FORCE_INLINE_
-#ifdef DEV_ENABLED
+#if defined(DEV_ENABLED) || defined(SIZE_EXTRA)
 #define _FORCE_INLINE_ inline
 #else
 #define _FORCE_INLINE_ _ALWAYS_INLINE_
 #endif
 #endif
 
+// Should never inline.
+#ifndef _NO_INLINE_
+#if defined(__GNUC__)
+#define _NO_INLINE_ __attribute__((noinline))
+#elif defined(_MSC_VER)
+#define _NO_INLINE_ __declspec(noinline)
+#else
+#define _NO_INLINE_
+#endif
+#endif
+
 // In some cases [[nodiscard]] will get false positives,
 // we can prevent the warning in specific cases by preceding the call with a cast.
 #ifndef _ALLOW_DISCARD_
@@ -96,18 +114,11 @@ static_assert(__cplusplus >= 201703L);
 #endif
 
 // Make room for our constexpr's below by overriding potential system-specific macros.
-#undef ABS
 #undef SIGN
 #undef MIN
 #undef MAX
 #undef CLAMP
 
-// Generic ABS function, for math uses please use Math::abs.
-template <typename T>
-constexpr T ABS(T m_v) {
-	return m_v < 0 ? -m_v : m_v;
-}
-
 template <typename T>
 constexpr const T SIGN(const T m_v) {
 	return m_v > 0 ? +1.0f : (m_v < 0 ? -1.0f : 0.0f);
@@ -316,4 +327,63 @@ struct BuildIndexSequence<0, Is...> : IndexSequence<Is...> {};
 #define ___gd_is_defined(val) ____gd_is_defined(__GDARG_PLACEHOLDER_##val)
 #define GD_IS_DEFINED(x) ___gd_is_defined(x)
 
-#endif // TYPEDEFS_H
+// Whether the default value of a type is just all-0 bytes.
+// This can most commonly be exploited by using memset for these types instead of loop-construct.
+// Trivially constructible types are also zero-constructible.
+template <typename T>
+struct is_zero_constructible : std::is_trivially_constructible<T> {};
+
+template <typename T>
+struct is_zero_constructible<const T> : is_zero_constructible<T> {};
+
+template <typename T>
+struct is_zero_constructible<volatile T> : is_zero_constructible<T> {};
+
+template <typename T>
+struct is_zero_constructible<const volatile T> : is_zero_constructible<T> {};
+
+template <typename T>
+inline constexpr bool is_zero_constructible_v = is_zero_constructible<T>::value;
+
+// Warning suppression helper macros.
+#if defined(__clang__)
+#define GODOT_CLANG_PRAGMA(m_content) _Pragma(#m_content)
+#define GODOT_CLANG_WARNING_PUSH GODOT_CLANG_PRAGMA(clang diagnostic push)
+#define GODOT_CLANG_WARNING_IGNORE(m_warning) GODOT_CLANG_PRAGMA(clang diagnostic ignored m_warning)
+#define GODOT_CLANG_WARNING_POP GODOT_CLANG_PRAGMA(clang diagnostic pop)
+#define GODOT_CLANG_WARNING_PUSH_AND_IGNORE(m_warning) GODOT_CLANG_WARNING_PUSH GODOT_CLANG_WARNING_IGNORE(m_warning)
+#else
+#define GODOT_CLANG_PRAGMA(m_content)
+#define GODOT_CLANG_WARNING_PUSH
+#define GODOT_CLANG_WARNING_IGNORE(m_warning)
+#define GODOT_CLANG_WARNING_POP
+#define GODOT_CLANG_WARNING_PUSH_AND_IGNORE(m_warning)
+#endif
+
+#if defined(__GNUC__) && !defined(__clang__)
+#define GODOT_GCC_PRAGMA(m_content) _Pragma(#m_content)
+#define GODOT_GCC_WARNING_PUSH GODOT_GCC_PRAGMA(GCC diagnostic push)
+#define GODOT_GCC_WARNING_IGNORE(m_warning) GODOT_GCC_PRAGMA(GCC diagnostic ignored m_warning)
+#define GODOT_GCC_WARNING_POP GODOT_GCC_PRAGMA(GCC diagnostic pop)
+#define GODOT_GCC_WARNING_PUSH_AND_IGNORE(m_warning) GODOT_GCC_WARNING_PUSH GODOT_GCC_WARNING_IGNORE(m_warning)
+#else
+#define GODOT_GCC_PRAGMA(m_content)
+#define GODOT_GCC_WARNING_PUSH
+#define GODOT_GCC_WARNING_IGNORE(m_warning)
+#define GODOT_GCC_WARNING_POP
+#define GODOT_GCC_WARNING_PUSH_AND_IGNORE(m_warning)
+#endif
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#define GODOT_MSVC_PRAGMA(m_command) __pragma(m_command)
+#define GODOT_MSVC_WARNING_PUSH GODOT_MSVC_PRAGMA(warning(push))
+#define GODOT_MSVC_WARNING_IGNORE(m_warning) GODOT_MSVC_PRAGMA(warning(disable : m_warning))
+#define GODOT_MSVC_WARNING_POP GODOT_MSVC_PRAGMA(warning(pop))
+#define GODOT_MSVC_WARNING_PUSH_AND_IGNORE(m_warning) GODOT_MSVC_WARNING_PUSH GODOT_MSVC_WARNING_IGNORE(m_warning)
+#else
+#define GODOT_MSVC_PRAGMA(m_command)
+#define GODOT_MSVC_WARNING_PUSH
+#define GODOT_MSVC_WARNING_IGNORE(m_warning)
+#define GODOT_MSVC_WARNING_POP
+#define GODOT_MSVC_WARNING_PUSH_AND_IGNORE(m_warning)
+#endif
diff --git a/engine/core/variant/array.cpp b/engine/core/variant/array.cpp
index d91612b4..81caa5d1 100644
--- a/engine/core/variant/array.cpp
+++ b/engine/core/variant/array.cpp
@@ -45,6 +45,10 @@ struct ArrayPrivate {
 	Vector<Variant> array;
 	Variant *read_only = nullptr; // If enabled, a pointer is used to a temporary value that is used to return read-only values.
 	ContainerTypeValidate typed;
+
+	ArrayPrivate() {}
+	ArrayPrivate(std::initializer_list<Variant> p_init) :
+			array(p_init) {}
 };
 
 void Array::_ref(const Array &p_from) const {
@@ -88,11 +92,11 @@ Array::Iterator Array::end() {
 }
 
 Array::ConstIterator Array::begin() const {
-	return ConstIterator(_p->array.ptr(), _p->read_only);
+	return ConstIterator(_p->array.ptr());
 }
 
 Array::ConstIterator Array::end() const {
-	return ConstIterator(_p->array.ptr() + _p->array.size(), _p->read_only);
+	return ConstIterator(_p->array.ptr() + _p->array.size());
 }
 
 Variant &Array::operator[](int p_idx) {
@@ -104,10 +108,6 @@ Variant &Array::operator[](int p_idx) {
 }
 
 const Variant &Array::operator[](int p_idx) const {
-	if (unlikely(_p->read_only)) {
-		*_p->read_only = _p->array[p_idx];
-		return *_p->read_only;
-	}
 	return _p->array[p_idx];
 }
 
@@ -281,7 +281,7 @@ void Array::push_back(const Variant &p_value) {
 	ERR_FAIL_COND_MSG(_p->read_only, "Array is in read-only state.");
 	Variant value = p_value;
 	ERR_FAIL_COND(!_p->typed.validate(value, "push_back"));
-	_p->array.push_back(value);
+	_p->array.push_back(std::move(value));
 }
 
 void Array::append_array(const Array &p_array) {
@@ -312,14 +312,22 @@ Error Array::insert(int p_pos, const Variant &p_value) {
 	ERR_FAIL_COND_V_MSG(_p->read_only, ERR_LOCKED, "Array is in read-only state.");
 	Variant value = p_value;
 	ERR_FAIL_COND_V(!_p->typed.validate(value, "insert"), ERR_INVALID_PARAMETER);
-	return _p->array.insert(p_pos, value);
+
+	if (p_pos < 0) {
+		// Relative offset from the end.
+		p_pos = _p->array.size() + p_pos;
+	}
+
+	ERR_FAIL_INDEX_V_MSG(p_pos, _p->array.size(), ERR_INVALID_PARAMETER, vformat("The calculated index %d is out of bounds (the array has %d elements). Leaving the array untouched.", p_pos, _p->array.size()));
+
+	return _p->array.insert(p_pos, std::move(value));
 }
 
 void Array::fill(const Variant &p_value) {
 	ERR_FAIL_COND_MSG(_p->read_only, "Array is in read-only state.");
 	Variant value = p_value;
 	ERR_FAIL_COND(!_p->typed.validate(value, "fill"));
-	_p->array.fill(value);
+	_p->array.fill(std::move(value));
 }
 
 void Array::erase(const Variant &p_value) {
@@ -345,7 +353,7 @@ Variant Array::pick_random() const {
 }
 
 int Array::find(const Variant &p_value, int p_from) const {
-	if (_p->array.size() == 0) {
+	if (_p->array.is_empty()) {
 		return -1;
 	}
 	Variant value = p_value;
@@ -396,7 +404,7 @@ int Array::find_custom(const Callable &p_callable, int p_from) const {
 }
 
 int Array::rfind(const Variant &p_value, int p_from) const {
-	if (_p->array.size() == 0) {
+	if (_p->array.is_empty()) {
 		return -1;
 	}
 	Variant value = p_value;
@@ -421,7 +429,7 @@ int Array::rfind(const Variant &p_value, int p_from) const {
 }
 
 int Array::rfind_custom(const Callable &p_callable, int p_from) const {
-	if (_p->array.size() == 0) {
+	if (_p->array.is_empty()) {
 		return -1;
 	}
 
@@ -458,7 +466,7 @@ int Array::rfind_custom(const Callable &p_callable, int p_from) const {
 int Array::count(const Variant &p_value) const {
 	Variant value = p_value;
 	ERR_FAIL_COND_V(!_p->typed.validate(value, "count"), 0);
-	if (_p->array.size() == 0) {
+	if (_p->array.is_empty()) {
 		return 0;
 	}
 
@@ -481,6 +489,14 @@ bool Array::has(const Variant &p_value) const {
 
 void Array::remove_at(int p_pos) {
 	ERR_FAIL_COND_MSG(_p->read_only, "Array is in read-only state.");
+
+	if (p_pos < 0) {
+		// Relative offset from the end.
+		p_pos = _p->array.size() + p_pos;
+	}
+
+	ERR_FAIL_INDEX_MSG(p_pos, _p->array.size(), vformat("The calculated index %d is out of bounds (the array has %d elements). Leaving the array untouched.", p_pos, _p->array.size()));
+
 	_p->array.remove_at(p_pos);
 }
 
@@ -489,7 +505,7 @@ void Array::set(int p_idx, const Variant &p_value) {
 	Variant value = p_value;
 	ERR_FAIL_COND(!_p->typed.validate(value, "set"));
 
-	operator[](p_idx) = value;
+	_p->array.write[p_idx] = std::move(value);
 }
 
 const Variant &Array::get(int p_idx) const {
@@ -707,9 +723,7 @@ void Array::shuffle() {
 	Variant *data = _p->array.ptrw();
 	for (int i = n - 1; i >= 1; i--) {
 		const int j = Math::rand() % (i + 1);
-		const Variant tmp = data[j];
-		data[j] = data[i];
-		data[i] = tmp;
+		SWAP(data[i], data[j]);
 	}
 }
 
@@ -736,7 +750,7 @@ void Array::push_front(const Variant &p_value) {
 	ERR_FAIL_COND_MSG(_p->read_only, "Array is in read-only state.");
 	Variant value = p_value;
 	ERR_FAIL_COND(!_p->typed.validate(value, "push_front"));
-	_p->array.insert(0, value);
+	_p->array.insert(0, std::move(value));
 }
 
 Variant Array::pop_back() {
@@ -913,6 +927,12 @@ Array::Array(const Array &p_from) {
 	_ref(p_from);
 }
 
+Array::Array(std::initializer_list<Variant> p_init) {
+	_p = memnew(ArrayPrivate);
+	_p->refcount.init();
+	_p->array = Vector<Variant>(p_init);
+}
+
 Array::Array() {
 	_p = memnew(ArrayPrivate);
 	_p->refcount.init();
diff --git a/engine/core/variant/array.h b/engine/core/variant/array.h
index b386ae7a..65e990ef 100644
--- a/engine/core/variant/array.h
+++ b/engine/core/variant/array.h
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ARRAY_H
-#define ARRAY_H
+#pragma once
 
 #include "core/typedefs.h"
 
 #include <climits>
+#include <initializer_list>
 
 class Callable;
 class StringName;
@@ -57,21 +57,19 @@ public:
 		_FORCE_INLINE_ bool operator==(const ConstIterator &p_other) const { return element_ptr == p_other.element_ptr; }
 		_FORCE_INLINE_ bool operator!=(const ConstIterator &p_other) const { return element_ptr != p_other.element_ptr; }
 
-		_FORCE_INLINE_ ConstIterator(const Variant *p_element_ptr, Variant *p_read_only = nullptr) :
-				element_ptr(p_element_ptr), read_only(p_read_only) {}
+		_FORCE_INLINE_ ConstIterator(const Variant *p_element_ptr) :
+				element_ptr(p_element_ptr) {}
 		_FORCE_INLINE_ ConstIterator() {}
 		_FORCE_INLINE_ ConstIterator(const ConstIterator &p_other) :
-				element_ptr(p_other.element_ptr), read_only(p_other.read_only) {}
+				element_ptr(p_other.element_ptr) {}
 
 		_FORCE_INLINE_ ConstIterator &operator=(const ConstIterator &p_other) {
 			element_ptr = p_other.element_ptr;
-			read_only = p_other.read_only;
 			return *this;
 		}
 
 	private:
 		const Variant *element_ptr = nullptr;
-		Variant *read_only = nullptr;
 	};
 
 	struct Iterator {
@@ -97,7 +95,7 @@ public:
 		}
 
 		operator ConstIterator() const {
-			return ConstIterator(element_ptr, read_only);
+			return ConstIterator(element_ptr);
 		}
 
 	private:
@@ -204,8 +202,7 @@ public:
 
 	Array(const Array &p_base, uint32_t p_type, const StringName &p_class_name, const Variant &p_script);
 	Array(const Array &p_from);
+	Array(std::initializer_list<Variant> p_init);
 	Array();
 	~Array();
 };
-
-#endif // ARRAY_H
diff --git a/engine/core/variant/binder_common.h b/engine/core/variant/binder_common.h
index b6810930..67b68d30 100644
--- a/engine/core/variant/binder_common.h
+++ b/engine/core/variant/binder_common.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BINDER_COMMON_H
-#define BINDER_COMMON_H
+#pragma once
 
 #include "core/input/input_enums.h"
 #include "core/object/object.h"
@@ -82,73 +81,8 @@ struct VariantCaster<const T &> {
 	}
 };
 
-#define VARIANT_ENUM_CAST(m_enum)                                            \
-	MAKE_ENUM_TYPE_INFO(m_enum)                                              \
-	template <>                                                              \
-	struct VariantCaster<m_enum> {                                           \
-		static _FORCE_INLINE_ m_enum cast(const Variant &p_variant) {        \
-			return (m_enum)p_variant.operator int64_t();                     \
-		}                                                                    \
-	};                                                                       \
-	template <>                                                              \
-	struct PtrToArg<m_enum> {                                                \
-		_FORCE_INLINE_ static m_enum convert(const void *p_ptr) {            \
-			return m_enum(*reinterpret_cast<const int64_t *>(p_ptr));        \
-		}                                                                    \
-		typedef int64_t EncodeT;                                             \
-		_FORCE_INLINE_ static void encode(m_enum p_val, const void *p_ptr) { \
-			*(int64_t *)p_ptr = (int64_t)p_val;                              \
-		}                                                                    \
-	};                                                                       \
-	template <>                                                              \
-	struct ZeroInitializer<m_enum> {                                         \
-		static void initialize(m_enum &value) {                              \
-			value = (m_enum)0;                                               \
-		}                                                                    \
-	};                                                                       \
-	template <>                                                              \
-	struct VariantInternalAccessor<m_enum> {                                 \
-		static _FORCE_INLINE_ m_enum get(const Variant *v) {                 \
-			return m_enum(*VariantInternal::get_int(v));                     \
-		}                                                                    \
-		static _FORCE_INLINE_ void set(Variant *v, m_enum p_value) {         \
-			*VariantInternal::get_int(v) = (int64_t)p_value;                 \
-		}                                                                    \
-	};
-
-#define VARIANT_BITFIELD_CAST(m_enum)                                                  \
-	MAKE_BITFIELD_TYPE_INFO(m_enum)                                                    \
-	template <>                                                                        \
-	struct VariantCaster<BitField<m_enum>> {                                           \
-		static _FORCE_INLINE_ BitField<m_enum> cast(const Variant &p_variant) {        \
-			return BitField<m_enum>(p_variant.operator int64_t());                     \
-		}                                                                              \
-	};                                                                                 \
-	template <>                                                                        \
-	struct PtrToArg<BitField<m_enum>> {                                                \
-		_FORCE_INLINE_ static BitField<m_enum> convert(const void *p_ptr) {            \
-			return BitField<m_enum>(*reinterpret_cast<const int64_t *>(p_ptr));        \
-		}                                                                              \
-		typedef int64_t EncodeT;                                                       \
-		_FORCE_INLINE_ static void encode(BitField<m_enum> p_val, const void *p_ptr) { \
-			*(int64_t *)p_ptr = p_val;                                                 \
-		}                                                                              \
-	};                                                                                 \
-	template <>                                                                        \
-	struct ZeroInitializer<BitField<m_enum>> {                                         \
-		static void initialize(BitField<m_enum> &value) {                              \
-			value = 0;                                                                 \
-		}                                                                              \
-	};                                                                                 \
-	template <>                                                                        \
-	struct VariantInternalAccessor<BitField<m_enum>> {                                 \
-		static _FORCE_INLINE_ BitField<m_enum> get(const Variant *v) {                 \
-			return BitField<m_enum>(*VariantInternal::get_int(v));                     \
-		}                                                                              \
-		static _FORCE_INLINE_ void set(Variant *v, BitField<m_enum> p_value) {         \
-			*VariantInternal::get_int(v) = p_value.operator int64_t();                 \
-		}                                                                              \
-	};
+#define VARIANT_ENUM_CAST(m_enum) MAKE_ENUM_TYPE_INFO(m_enum)
+#define VARIANT_BITFIELD_CAST(m_enum) MAKE_BITFIELD_TYPE_INFO(m_enum)
 
 // Object enum casts must go here
 VARIANT_ENUM_CAST(Object::ConnectFlags);
@@ -189,32 +123,6 @@ VARIANT_ENUM_CAST(Key);
 VARIANT_BITFIELD_CAST(KeyModifierMask);
 VARIANT_ENUM_CAST(KeyLocation);
 
-static inline Key &operator|=(Key &a, BitField<KeyModifierMask> b) {
-	a = static_cast<Key>(static_cast<int>(a) | static_cast<int>(b.operator int64_t()));
-	return a;
-}
-
-static inline Key &operator&=(Key &a, BitField<KeyModifierMask> b) {
-	a = static_cast<Key>(static_cast<int>(a) & static_cast<int>(b.operator int64_t()));
-	return a;
-}
-
-static inline Key operator|(Key a, BitField<KeyModifierMask> b) {
-	return (Key)((int)a | (int)b.operator int64_t());
-}
-
-static inline Key operator&(Key a, BitField<KeyModifierMask> b) {
-	return (Key)((int)a & (int)b.operator int64_t());
-}
-
-static inline Key operator+(BitField<KeyModifierMask> a, Key b) {
-	return (Key)((int)a.operator int64_t() + (int)b);
-}
-
-static inline Key operator|(BitField<KeyModifierMask> a, Key b) {
-	return (Key)((int)a.operator int64_t() | (int)b);
-}
-
 template <>
 struct VariantCaster<char32_t> {
 	static _FORCE_INLINE_ char32_t cast(const Variant &p_variant) {
@@ -690,10 +598,7 @@ void call_with_validated_object_instance_args_static_retc(T *base, R (*p_method)
 
 // GCC raises "parameter 'p_args' set but not used" when P = {},
 // it's not clever enough to treat other P values as making this branch valid.
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
-#endif
+GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wunused-but-set-parameter")
 
 template <typename Q>
 void call_get_argument_type_helper(int p_arg, int &index, Variant::Type &type) {
@@ -1034,8 +939,4 @@ void call_with_variant_args_static_dv(void (*p_method)(P...), const Variant **p_
 	call_with_variant_args_static(p_method, args, r_error, BuildIndexSequence<sizeof...(P)>{});
 }
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#endif // BINDER_COMMON_H
+GODOT_GCC_WARNING_POP
diff --git a/engine/core/variant/callable.cpp b/engine/core/variant/callable.cpp
index 402dc682..0603ea27 100644
--- a/engine/core/variant/callable.cpp
+++ b/engine/core/variant/callable.cpp
@@ -188,7 +188,7 @@ int Callable::get_argument_count(bool *r_is_valid) const {
 	if (is_custom()) {
 		bool valid = false;
 		return custom->get_argument_count(r_is_valid ? *r_is_valid : valid);
-	} else if (!is_null()) {
+	} else if (is_valid()) {
 		return get_object()->get_method_argument_count(method, r_is_valid);
 	} else {
 		if (r_is_valid) {
diff --git a/engine/core/variant/callable.h b/engine/core/variant/callable.h
index a66a6efe..89299c56 100644
--- a/engine/core/variant/callable.h
+++ b/engine/core/variant/callable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CALLABLE_H
-#define CALLABLE_H
+#pragma once
 
 #include "core/object/object_id.h"
 #include "core/string/string_name.h"
@@ -136,6 +135,10 @@ public:
 	~Callable();
 };
 
+// Zero-constructing Callable initializes method and object to 0 (and thus empty).
+template <>
+struct is_zero_constructible<Callable> : std::true_type {};
+
 class CallableCustom {
 	friend class Callable;
 	SafeRefCount ref_count;
@@ -201,10 +204,12 @@ public:
 	Signal() {}
 };
 
+// Zero-constructing Signal initializes name and object to 0 (and thus empty).
+template <>
+struct is_zero_constructible<Signal> : std::true_type {};
+
 struct CallableComparator {
 	const Callable &func;
 
 	bool operator()(const Variant &p_l, const Variant &p_r) const;
 };
-
-#endif // CALLABLE_H
diff --git a/engine/core/variant/callable_bind.h b/engine/core/variant/callable_bind.h
index 13462771..a36a8209 100644
--- a/engine/core/variant/callable_bind.h
+++ b/engine/core/variant/callable_bind.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CALLABLE_BIND_H
-#define CALLABLE_BIND_H
+#pragma once
 
 #include "core/variant/callable.h"
 #include "core/variant/variant.h"
@@ -94,5 +93,3 @@ public:
 	CallableCustomUnbind(const Callable &p_callable, int p_argcount);
 	virtual ~CallableCustomUnbind();
 };
-
-#endif // CALLABLE_BIND_H
diff --git a/engine/core/variant/container_type_validate.h b/engine/core/variant/container_type_validate.h
index 18761a63..a138b739 100644
--- a/engine/core/variant/container_type_validate.h
+++ b/engine/core/variant/container_type_validate.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONTAINER_TYPE_VALIDATE_H
-#define CONTAINER_TYPE_VALIDATE_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "core/variant/variant.h"
@@ -148,5 +147,3 @@ struct ContainerTypeValidate {
 		return true;
 	}
 };
-
-#endif // CONTAINER_TYPE_VALIDATE_H
diff --git a/engine/core/variant/dictionary.cpp b/engine/core/variant/dictionary.cpp
index c094d532..11d2f086 100644
--- a/engine/core/variant/dictionary.cpp
+++ b/engine/core/variant/dictionary.cpp
@@ -49,14 +49,22 @@ struct DictionaryPrivate {
 	Variant *typed_fallback = nullptr; // Allows a typed dictionary to return dummy values when attempting an invalid access.
 };
 
-void Dictionary::get_key_list(List<Variant> *p_keys) const {
-	if (_p->variant_map.is_empty()) {
-		return;
-	}
+Dictionary::ConstIterator Dictionary::begin() const {
+	return _p->variant_map.begin();
+}
 
+Dictionary::ConstIterator Dictionary::end() const {
+	return _p->variant_map.end();
+}
+
+LocalVector<Variant> Dictionary::get_key_list() const {
+	LocalVector<Variant> keys;
+
+	keys.reserve(_p->variant_map.size());
 	for (const KeyValue<Variant, Variant> &E : _p->variant_map) {
-		p_keys->push_back(E.key);
+		keys.push_back(E.key);
 	}
+	return keys;
 }
 
 Variant Dictionary::get_key_at_index(int p_index) const {
@@ -101,10 +109,12 @@ Variant &Dictionary::operator[](const Variant &p_key) {
 		}
 		return *_p->read_only;
 	} else {
-		if (unlikely(!_p->variant_map.has(key))) {
-			VariantInternal::initialize(&_p->variant_map[key], _p->typed_value.type);
+		const uint32_t old_size = _p->variant_map.size();
+		Variant &value = _p->variant_map[key];
+		if (_p->variant_map.size() > old_size) {
+			VariantInternal::initialize(&value, _p->typed_value.type);
 		}
-		return _p->variant_map[key];
+		return value;
 	}
 }
 
@@ -208,7 +218,7 @@ bool Dictionary::is_empty() const {
 bool Dictionary::has(const Variant &p_key) const {
 	Variant key = p_key;
 	ERR_FAIL_COND_V(!_p->typed_key.validate(key, "use 'has'"), false);
-	return _p->variant_map.has(p_key);
+	return _p->variant_map.has(key);
 }
 
 bool Dictionary::has_all(const Array &p_keys) const {
diff --git a/engine/core/variant/dictionary.h b/engine/core/variant/dictionary.h
index d7a22281..d170a5d3 100644
--- a/engine/core/variant/dictionary.h
+++ b/engine/core/variant/dictionary.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DICTIONARY_H
-#define DICTIONARY_H
+#pragma once
 
 #include "core/string/ustring.h"
-#include "core/templates/list.h"
+#include "core/templates/hash_map.h"
+#include "core/templates/local_vector.h"
 #include "core/templates/pair.h"
 #include "core/variant/array.h"
 
@@ -40,6 +40,8 @@ class Variant;
 
 struct ContainerType;
 struct DictionaryPrivate;
+struct StringLikeVariantComparator;
+struct VariantHasher;
 
 class Dictionary {
 	mutable DictionaryPrivate *_p;
@@ -48,7 +50,12 @@ class Dictionary {
 	void _unref() const;
 
 public:
-	void get_key_list(List<Variant> *p_keys) const;
+	using ConstIterator = HashMap<Variant, Variant, VariantHasher, StringLikeVariantComparator>::ConstIterator;
+
+	ConstIterator begin() const;
+	ConstIterator end() const;
+
+	LocalVector<Variant> get_key_list() const;
 	Variant get_key_at_index(int p_index) const;
 	Variant get_value_at_index(int p_index) const;
 
@@ -123,5 +130,3 @@ public:
 	Dictionary();
 	~Dictionary();
 };
-
-#endif // DICTIONARY_H
diff --git a/engine/core/variant/method_ptrcall.h b/engine/core/variant/method_ptrcall.h
index 540dcc4a..d7800dc9 100644
--- a/engine/core/variant/method_ptrcall.h
+++ b/engine/core/variant/method_ptrcall.h
@@ -28,15 +28,18 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef METHOD_PTRCALL_H
-#define METHOD_PTRCALL_H
+#pragma once
 
 #include "core/object/object_id.h"
+#include "core/templates/simple_type.h"
 #include "core/typedefs.h"
 #include "core/variant/variant.h"
 
+template <typename T, typename = void>
+struct PtrToArg;
+
 template <typename T>
-struct PtrToArg {};
+struct PtrToArg<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : PtrToArg<GetSimpleTypeT<T>> {};
 
 #define MAKE_PTRARG(m_type)                                              \
 	template <>                                                          \
@@ -48,17 +51,7 @@ struct PtrToArg {};
 		_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) {   \
 			*((m_type *)p_ptr) = p_val;                                  \
 		}                                                                \
-	};                                                                   \
-	template <>                                                          \
-	struct PtrToArg<const m_type &> {                                    \
-		_FORCE_INLINE_ static const m_type &convert(const void *p_ptr) { \
-			return *reinterpret_cast<const m_type *>(p_ptr);             \
-		}                                                                \
-		typedef m_type EncodeT;                                          \
-		_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) {   \
-			*((m_type *)p_ptr) = p_val;                                  \
-		}                                                                \
-	}
+	};
 
 #define MAKE_PTRARGCONV(m_type, m_conv)                                           \
 	template <>                                                                   \
@@ -70,17 +63,7 @@ struct PtrToArg {};
 		_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) {            \
 			*((m_conv *)p_ptr) = static_cast<m_conv>(p_val);                      \
 		}                                                                         \
-	};                                                                            \
-	template <>                                                                   \
-	struct PtrToArg<const m_type &> {                                             \
-		_FORCE_INLINE_ static m_type convert(const void *p_ptr) {                 \
-			return static_cast<m_type>(*reinterpret_cast<const m_conv *>(p_ptr)); \
-		}                                                                         \
-		typedef m_conv EncodeT;                                                   \
-		_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) {            \
-			*((m_conv *)p_ptr) = static_cast<m_conv>(p_val);                      \
-		}                                                                         \
-	}
+	};
 
 #define MAKE_PTRARG_BY_REFERENCE(m_type)                                      \
 	template <>                                                               \
@@ -92,17 +75,19 @@ struct PtrToArg {};
 		_FORCE_INLINE_ static void encode(const m_type &p_val, void *p_ptr) { \
 			*((m_type *)p_ptr) = p_val;                                       \
 		}                                                                     \
-	};                                                                        \
-	template <>                                                               \
-	struct PtrToArg<const m_type &> {                                         \
-		_FORCE_INLINE_ static const m_type &convert(const void *p_ptr) {      \
-			return *reinterpret_cast<const m_type *>(p_ptr);                  \
-		}                                                                     \
-		typedef m_type EncodeT;                                               \
-		_FORCE_INLINE_ static void encode(const m_type &p_val, void *p_ptr) { \
-			*((m_type *)p_ptr) = p_val;                                       \
-		}                                                                     \
-	}
+	};
+
+#define MAKE_PTRARGCONV_CONDITIONAL(m_type, m_conv, m_conditional)                \
+	template <typename T>                                                         \
+	struct PtrToArg<m_type, std::enable_if_t<m_conditional>> {                    \
+		_FORCE_INLINE_ static m_type convert(const void *p_ptr) {                 \
+			return static_cast<m_type>(*reinterpret_cast<const m_conv *>(p_ptr)); \
+		}                                                                         \
+		typedef m_conv EncodeT;                                                   \
+		_FORCE_INLINE_ static void encode(m_type p_val, void *p_ptr) {            \
+			*((m_conv *)p_ptr) = static_cast<m_conv>(p_val);                      \
+		}                                                                         \
+	};
 
 MAKE_PTRARGCONV(bool, uint8_t);
 // Integer types.
@@ -155,6 +140,9 @@ MAKE_PTRARG(PackedColorArray);
 MAKE_PTRARG(PackedVector4Array);
 MAKE_PTRARG_BY_REFERENCE(Variant);
 
+MAKE_PTRARGCONV_CONDITIONAL(T, int64_t, std::is_enum_v<T>);
+MAKE_PTRARGCONV_CONDITIONAL(BitField<T>, int64_t, std::is_enum_v<T>);
+
 // This is for Object.
 
 template <typename T>
@@ -222,23 +210,7 @@ struct PtrToArg<ObjectID> {
 				}                                                                        \
 			}                                                                            \
 		}                                                                                \
-	};                                                                                   \
-	template <>                                                                          \
-	struct PtrToArg<const Vector<m_type> &> {                                            \
-		_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) {                \
-			const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr); \
-			Vector<m_type> ret;                                                          \
-			int len = dvs->size();                                                       \
-			ret.resize(len);                                                             \
-			{                                                                            \
-				const m_type *r = dvs->ptr();                                            \
-				for (int i = 0; i < len; i++) {                                          \
-					ret.write[i] = r[i];                                                 \
-				}                                                                        \
-			}                                                                            \
-			return ret;                                                                  \
-		}                                                                                \
-	}
+	};
 
 // No EncodeT because direct pointer conversion not possible.
 #define MAKE_VECARG_ALT(m_type, m_type_alt)                                               \
@@ -268,23 +240,7 @@ struct PtrToArg<ObjectID> {
 				}                                                                         \
 			}                                                                             \
 		}                                                                                 \
-	};                                                                                    \
-	template <>                                                                           \
-	struct PtrToArg<const Vector<m_type_alt> &> {                                         \
-		_FORCE_INLINE_ static Vector<m_type_alt> convert(const void *p_ptr) {             \
-			const Vector<m_type> *dvs = reinterpret_cast<const Vector<m_type> *>(p_ptr);  \
-			Vector<m_type_alt> ret;                                                       \
-			int len = dvs->size();                                                        \
-			ret.resize(len);                                                              \
-			{                                                                             \
-				const m_type *r = dvs->ptr();                                             \
-				for (int i = 0; i < len; i++) {                                           \
-					ret.write[i] = r[i];                                                  \
-				}                                                                         \
-			}                                                                             \
-			return ret;                                                                   \
-		}                                                                                 \
-	}
+	};
 
 MAKE_VECARG_ALT(String, StringName);
 
@@ -312,20 +268,7 @@ MAKE_VECARG_ALT(String, StringName);
 				(*arr)[i] = p_vec[i];                                                 \
 			}                                                                         \
 		}                                                                             \
-	};                                                                                \
-	template <>                                                                       \
-	struct PtrToArg<const Vector<m_type> &> {                                         \
-		_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) {             \
-			const Array *arr = reinterpret_cast<const Array *>(p_ptr);                \
-			Vector<m_type> ret;                                                       \
-			int len = arr->size();                                                    \
-			ret.resize(len);                                                          \
-			for (int i = 0; i < len; i++) {                                           \
-				ret.write[i] = (*arr)[i];                                             \
-			}                                                                         \
-			return ret;                                                               \
-		}                                                                             \
-	}
+	};
 
 MAKE_VECARR(Variant);
 MAKE_VECARR(RID);
@@ -359,23 +302,7 @@ MAKE_VECARR(Plane);
 				}                                                                     \
 			}                                                                         \
 		}                                                                             \
-	};                                                                                \
-	template <>                                                                       \
-	struct PtrToArg<const Vector<m_type> &> {                                         \
-		_FORCE_INLINE_ static Vector<m_type> convert(const void *p_ptr) {             \
-			const Array *arr = reinterpret_cast<const Array *>(p_ptr);                \
-			Vector<m_type> ret;                                                       \
-			int len = arr->size();                                                    \
-			ret.resize(len);                                                          \
-			{                                                                         \
-				m_type *w = ret.ptrw();                                               \
-				for (int i = 0; i < len; i++) {                                       \
-					w[i] = (*arr)[i];                                                 \
-				}                                                                     \
-			}                                                                         \
-			return ret;                                                               \
-		}                                                                             \
-	}
+	};
 
 // Special case for IPAddress.
 
@@ -391,15 +318,7 @@ MAKE_VECARR(Plane);
 			String *arr = reinterpret_cast<String *>(p_ptr);                  \
 			*arr = p_vec;                                                     \
 		}                                                                     \
-	};                                                                        \
-                                                                              \
-	template <>                                                               \
-	struct PtrToArg<const m_type &> {                                         \
-		_FORCE_INLINE_ static m_type convert(const void *p_ptr) {             \
-			m_type s = *reinterpret_cast<const String *>(p_ptr);              \
-			return s;                                                         \
-		}                                                                     \
-	}
+	};
 
 MAKE_STRINGCONV_BY_REFERENCE(IPAddress);
 
@@ -437,26 +356,3 @@ struct PtrToArg<Vector<Face3>> {
 		}
 	}
 };
-
-// No EncodeT because direct pointer conversion not possible.
-template <>
-struct PtrToArg<const Vector<Face3> &> {
-	_FORCE_INLINE_ static Vector<Face3> convert(const void *p_ptr) {
-		const Vector<Vector3> *dvs = reinterpret_cast<const Vector<Vector3> *>(p_ptr);
-		Vector<Face3> ret;
-		int len = dvs->size() / 3;
-		ret.resize(len);
-		{
-			const Vector3 *r = dvs->ptr();
-			Face3 *w = ret.ptrw();
-			for (int i = 0; i < len; i++) {
-				w[i].vertex[0] = r[i * 3 + 0];
-				w[i].vertex[1] = r[i * 3 + 1];
-				w[i].vertex[2] = r[i * 3 + 2];
-			}
-		}
-		return ret;
-	}
-};
-
-#endif // METHOD_PTRCALL_H
diff --git a/engine/core/variant/native_ptr.h b/engine/core/variant/native_ptr.h
index 0811ae86..e97bee03 100644
--- a/engine/core/variant/native_ptr.h
+++ b/engine/core/variant/native_ptr.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NATIVE_PTR_H
-#define NATIVE_PTR_H
+#pragma once
 
 #include "core/math/audio_frame.h"
 #include "core/variant/method_ptrcall.h"
@@ -176,5 +175,3 @@ GDVIRTUAL_NATIVE_PTR(int64_t)
 GDVIRTUAL_NATIVE_PTR(uint64_t)
 GDVIRTUAL_NATIVE_PTR(float)
 GDVIRTUAL_NATIVE_PTR(double)
-
-#endif // NATIVE_PTR_H
diff --git a/engine/core/variant/type_info.h b/engine/core/variant/type_info.h
index c05f6b0b..b9d75823 100644
--- a/engine/core/variant/type_info.h
+++ b/engine/core/variant/type_info.h
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TYPE_INFO_H
-#define TYPE_INFO_H
+#pragma once
 
+#include "core/templates/simple_type.h"
 #include "core/typedefs.h"
 
 #include <type_traits>
@@ -61,6 +61,9 @@ enum Metadata {
 template <typename T, typename = void>
 struct GetTypeInfo;
 
+template <typename T>
+struct GetTypeInfo<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : GetTypeInfo<GetSimpleTypeT<T>> {};
+
 #define MAKE_TYPE_INFO(m_type, m_var_type)                                            \
 	template <>                                                                       \
 	struct GetTypeInfo<m_type> {                                                      \
@@ -69,14 +72,6 @@ struct GetTypeInfo;
 		static inline PropertyInfo get_class_info() {                                 \
 			return PropertyInfo(VARIANT_TYPE, String());                              \
 		}                                                                             \
-	};                                                                                \
-	template <>                                                                       \
-	struct GetTypeInfo<const m_type &> {                                              \
-		static const Variant::Type VARIANT_TYPE = m_var_type;                         \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
-		static inline PropertyInfo get_class_info() {                                 \
-			return PropertyInfo(VARIANT_TYPE, String());                              \
-		}                                                                             \
 	};
 
 #define MAKE_TYPE_INFO_WITH_META(m_type, m_var_type, m_metadata)    \
@@ -87,14 +82,6 @@ struct GetTypeInfo;
 		static inline PropertyInfo get_class_info() {               \
 			return PropertyInfo(VARIANT_TYPE, String());            \
 		}                                                           \
-	};                                                              \
-	template <>                                                     \
-	struct GetTypeInfo<const m_type &> {                            \
-		static const Variant::Type VARIANT_TYPE = m_var_type;       \
-		static const GodotTypeInfo::Metadata METADATA = m_metadata; \
-		static inline PropertyInfo get_class_info() {               \
-			return PropertyInfo(VARIANT_TYPE, String());            \
-		}                                                           \
 	};
 
 MAKE_TYPE_INFO(bool, Variant::BOOL)
@@ -168,15 +155,6 @@ struct GetTypeInfo<Variant> {
 	}
 };
 
-template <>
-struct GetTypeInfo<const Variant &> {
-	static const Variant::Type VARIANT_TYPE = Variant::NIL;
-	static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
-	static inline PropertyInfo get_class_info() {
-		return PropertyInfo(Variant::NIL, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT);
-	}
-};
-
 #define MAKE_TEMPLATE_TYPE_INFO(m_template, m_type, m_var_type)                       \
 	template <>                                                                       \
 	struct GetTypeInfo<m_template<m_type>> {                                          \
@@ -185,14 +163,6 @@ struct GetTypeInfo<const Variant &> {
 		static inline PropertyInfo get_class_info() {                                 \
 			return PropertyInfo(VARIANT_TYPE, String());                              \
 		}                                                                             \
-	};                                                                                \
-	template <>                                                                       \
-	struct GetTypeInfo<const m_template<m_type> &> {                                  \
-		static const Variant::Type VARIANT_TYPE = m_var_type;                         \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE; \
-		static inline PropertyInfo get_class_info() {                                 \
-			return PropertyInfo(VARIANT_TYPE, String());                              \
-		}                                                                             \
 	};
 
 MAKE_TEMPLATE_TYPE_INFO(Vector, Variant, Variant::ARRAY)
@@ -210,8 +180,8 @@ struct GetTypeInfo<T *, std::enable_if_t<std::is_base_of_v<Object, T>>> {
 	}
 };
 
-namespace godot {
-namespace details {
+namespace GodotTypeInfo {
+namespace Internal {
 inline String enum_qualified_name_to_class_info_name(const String &p_qualified_name) {
 	Vector<String> parts = p_qualified_name.split("::", false);
 	if (parts.size() <= 2) {
@@ -220,124 +190,57 @@ inline String enum_qualified_name_to_class_info_name(const String &p_qualified_n
 	// Contains namespace. We only want the class and enum names.
 	return parts[parts.size() - 2] + "." + parts[parts.size() - 1];
 }
-} // namespace details
-} // namespace godot
+} // namespace Internal
+} // namespace GodotTypeInfo
 
-#define TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_impl)                                                                                            \
+#define MAKE_ENUM_TYPE_INFO(m_enum)                                                                                                          \
 	template <>                                                                                                                              \
-	struct GetTypeInfo<m_impl> {                                                                                                             \
+	struct GetTypeInfo<m_enum> {                                                                                                             \
 		static const Variant::Type VARIANT_TYPE = Variant::INT;                                                                              \
 		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                        \
 		static inline PropertyInfo get_class_info() {                                                                                        \
 			return PropertyInfo(Variant::INT, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_ENUM, \
-					godot::details::enum_qualified_name_to_class_info_name(String(#m_enum)));                                                \
+					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_enum)));                                       \
 		}                                                                                                                                    \
 	};
 
-#define MAKE_ENUM_TYPE_INFO(m_enum)                 \
-	TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_enum)       \
-	TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_enum const) \
-	TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_enum &)     \
-	TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, const m_enum &)
-
 template <typename T>
 inline StringName __constant_get_enum_name(T param, const String &p_constant) {
-	if constexpr (GetTypeInfo<T>::VARIANT_TYPE == Variant::NIL) {
-		ERR_PRINT("Missing VARIANT_ENUM_CAST for constant's enum: " + p_constant);
-	}
 	return GetTypeInfo<T>::get_class_info().class_name;
 }
 
-template <typename T>
-class BitField {
-	int64_t value = 0;
-
-public:
-	_FORCE_INLINE_ BitField<T> &set_flag(T p_flag) {
-		value |= (int64_t)p_flag;
-		return *this;
-	}
-	_FORCE_INLINE_ bool has_flag(T p_flag) const { return value & (int64_t)p_flag; }
-	_FORCE_INLINE_ bool is_empty() const { return value == 0; }
-	_FORCE_INLINE_ void clear_flag(T p_flag) { value &= ~(int64_t)p_flag; }
-	_FORCE_INLINE_ void clear() { value = 0; }
-	_FORCE_INLINE_ constexpr BitField() = default;
-	_FORCE_INLINE_ constexpr BitField(int64_t p_value) { value = p_value; }
-	_FORCE_INLINE_ constexpr BitField(T p_value) { value = (int64_t)p_value; }
-	_FORCE_INLINE_ operator int64_t() const { return value; }
-	_FORCE_INLINE_ operator Variant() const { return value; }
-	_FORCE_INLINE_ BitField<T> operator^(const BitField<T> &p_b) const { return BitField<T>(value ^ p_b.value); }
-};
-
-#define TEMPL_MAKE_BITFIELD_TYPE_INFO(m_enum, m_impl)                                                                                            \
+#define MAKE_BITFIELD_TYPE_INFO(m_enum)                                                                                                          \
 	template <>                                                                                                                                  \
-	struct GetTypeInfo<m_impl> {                                                                                                                 \
+	struct GetTypeInfo<m_enum> {                                                                                                                 \
 		static const Variant::Type VARIANT_TYPE = Variant::INT;                                                                                  \
 		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                            \
 		static inline PropertyInfo get_class_info() {                                                                                            \
 			return PropertyInfo(Variant::INT, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_BITFIELD, \
-					godot::details::enum_qualified_name_to_class_info_name(String(#m_enum)));                                                    \
+					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_enum)));                                           \
 		}                                                                                                                                        \
 	};                                                                                                                                           \
 	template <>                                                                                                                                  \
-	struct GetTypeInfo<BitField<m_impl>> {                                                                                                       \
+	struct GetTypeInfo<BitField<m_enum>> {                                                                                                       \
 		static const Variant::Type VARIANT_TYPE = Variant::INT;                                                                                  \
 		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                            \
 		static inline PropertyInfo get_class_info() {                                                                                            \
 			return PropertyInfo(Variant::INT, String(), PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_BITFIELD, \
-					godot::details::enum_qualified_name_to_class_info_name(String(#m_enum)));                                                    \
+					GodotTypeInfo::Internal::enum_qualified_name_to_class_info_name(String(#m_enum)));                                           \
 		}                                                                                                                                        \
 	};
 
-#define MAKE_BITFIELD_TYPE_INFO(m_enum)                 \
-	TEMPL_MAKE_BITFIELD_TYPE_INFO(m_enum, m_enum)       \
-	TEMPL_MAKE_BITFIELD_TYPE_INFO(m_enum, m_enum const) \
-	TEMPL_MAKE_BITFIELD_TYPE_INFO(m_enum, m_enum &)     \
-	TEMPL_MAKE_BITFIELD_TYPE_INFO(m_enum, const m_enum &)
-
 template <typename T>
 inline StringName __constant_get_bitfield_name(T param, const String &p_constant) {
-	if (GetTypeInfo<T>::VARIANT_TYPE == Variant::NIL) {
-		ERR_PRINT("Missing VARIANT_ENUM_CAST for constant's bitfield: " + p_constant);
-	}
 	return GetTypeInfo<BitField<T>>::get_class_info().class_name;
 }
 #define CLASS_INFO(m_type) (GetTypeInfo<m_type *>::get_class_info())
 
+// No initialization by default, except for scalar types.
 template <typename T>
 struct ZeroInitializer {
-	static void initialize(T &value) {} //no initialization by default
+	static void initialize(T &value) {
+		if constexpr (std::is_scalar_v<T>) {
+			value = {};
+		}
+	}
 };
-
-template <>
-struct ZeroInitializer<bool> {
-	static void initialize(bool &value) { value = false; }
-};
-
-template <typename T>
-struct ZeroInitializer<T *> {
-	static void initialize(T *&value) { value = nullptr; }
-};
-
-#define ZERO_INITIALIZER_NUMBER(m_type)         \
-	template <>                                 \
-	struct ZeroInitializer<m_type> {            \
-		static void initialize(m_type &value) { \
-			value = 0;                          \
-		}                                       \
-	};
-
-ZERO_INITIALIZER_NUMBER(uint8_t)
-ZERO_INITIALIZER_NUMBER(int8_t)
-ZERO_INITIALIZER_NUMBER(uint16_t)
-ZERO_INITIALIZER_NUMBER(int16_t)
-ZERO_INITIALIZER_NUMBER(uint32_t)
-ZERO_INITIALIZER_NUMBER(int32_t)
-ZERO_INITIALIZER_NUMBER(uint64_t)
-ZERO_INITIALIZER_NUMBER(int64_t)
-ZERO_INITIALIZER_NUMBER(char16_t)
-ZERO_INITIALIZER_NUMBER(char32_t)
-ZERO_INITIALIZER_NUMBER(float)
-ZERO_INITIALIZER_NUMBER(double)
-
-#endif // TYPE_INFO_H
diff --git a/engine/core/variant/typed_array.h b/engine/core/variant/typed_array.h
index 07bf8afa..8e6c83ec 100644
--- a/engine/core/variant/typed_array.h
+++ b/engine/core/variant/typed_array.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TYPED_ARRAY_H
-#define TYPED_ARRAY_H
+#pragma once
 
 #include "core/object/object.h"
 #include "core/variant/array.h"
@@ -56,6 +55,8 @@ public:
 			assign(p_array);
 		}
 	}
+	_FORCE_INLINE_ TypedArray(std::initializer_list<Variant> p_init) :
+			TypedArray(Array(p_init)) {}
 	_FORCE_INLINE_ TypedArray() {
 		set_typed(Variant::OBJECT, T::get_class_static(), Variant());
 	}
@@ -82,6 +83,9 @@ struct VariantInternalAccessor<const TypedArray<T> &> {
 			ERR_FAIL_COND_MSG(!is_same_typed(p_array), "Cannot assign an array with a different element type."); \
 			_ref(p_array);                                                                                       \
 		}                                                                                                        \
+		_FORCE_INLINE_ TypedArray(std::initializer_list<Variant> p_init) :                                       \
+				Array(Array(p_init), m_variant_type, StringName(), Variant()) {                                  \
+		}                                                                                                        \
 		_FORCE_INLINE_ TypedArray(const Variant &p_variant) :                                                    \
 				TypedArray(Array(p_variant)) {                                                                   \
 		}                                                                                                        \
@@ -158,14 +162,6 @@ struct PtrToArg<TypedArray<T>> {
 	}
 };
 
-template <typename T>
-struct PtrToArg<const TypedArray<T> &> {
-	typedef Array EncodeT;
-	_FORCE_INLINE_ static TypedArray<T> convert(const void *p_ptr) {
-		return TypedArray<T>(*reinterpret_cast<const Array *>(p_ptr));
-	}
-};
-
 template <typename T>
 struct GetTypeInfo<TypedArray<T>> {
 	static const Variant::Type VARIANT_TYPE = Variant::ARRAY;
@@ -175,15 +171,6 @@ struct GetTypeInfo<TypedArray<T>> {
 	}
 };
 
-template <typename T>
-struct GetTypeInfo<const TypedArray<T> &> {
-	static const Variant::Type VARIANT_TYPE = Variant::ARRAY;
-	static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
-	static inline PropertyInfo get_class_info() {
-		return PropertyInfo(Variant::ARRAY, String(), PROPERTY_HINT_ARRAY_TYPE, T::get_class_static());
-	}
-};
-
 #define MAKE_TYPED_ARRAY_INFO(m_type, m_variant_type)                                                                        \
 	template <>                                                                                                              \
 	struct GetTypeInfo<TypedArray<m_type>> {                                                                                 \
@@ -192,14 +179,6 @@ struct GetTypeInfo<const TypedArray<T> &> {
 		static inline PropertyInfo get_class_info() {                                                                        \
 			return PropertyInfo(Variant::ARRAY, String(), PROPERTY_HINT_ARRAY_TYPE, Variant::get_type_name(m_variant_type)); \
 		}                                                                                                                    \
-	};                                                                                                                       \
-	template <>                                                                                                              \
-	struct GetTypeInfo<const TypedArray<m_type> &> {                                                                         \
-		static const Variant::Type VARIANT_TYPE = Variant::ARRAY;                                                            \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                        \
-		static inline PropertyInfo get_class_info() {                                                                        \
-			return PropertyInfo(Variant::ARRAY, String(), PROPERTY_HINT_ARRAY_TYPE, Variant::get_type_name(m_variant_type)); \
-		}                                                                                                                    \
 	};
 
 MAKE_TYPED_ARRAY_INFO(bool, Variant::BOOL)
@@ -251,5 +230,3 @@ MAKE_TYPED_ARRAY_INFO(IPAddress, Variant::STRING)
 
 #undef MAKE_TYPED_ARRAY
 #undef MAKE_TYPED_ARRAY_INFO
-
-#endif // TYPED_ARRAY_H
diff --git a/engine/core/variant/typed_dictionary.h b/engine/core/variant/typed_dictionary.h
index 86b4183c..e75c8a1b 100644
--- a/engine/core/variant/typed_dictionary.h
+++ b/engine/core/variant/typed_dictionary.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TYPED_DICTIONARY_H
-#define TYPED_DICTIONARY_H
+#pragma once
 
 #include "core/object/object.h"
 #include "core/variant/binder_common.h"
@@ -92,15 +91,6 @@ struct PtrToArg<TypedDictionary<K, V>> {
 	}
 };
 
-template <typename K, typename V>
-struct PtrToArg<const TypedDictionary<K, V> &> {
-	typedef Dictionary EncodeT;
-	_FORCE_INLINE_ static TypedDictionary<K, V>
-	convert(const void *p_ptr) {
-		return TypedDictionary<K, V>(*reinterpret_cast<const Dictionary *>(p_ptr));
-	}
-};
-
 template <typename K, typename V>
 struct GetTypeInfo<TypedDictionary<K, V>> {
 	static const Variant::Type VARIANT_TYPE = Variant::DICTIONARY;
@@ -110,15 +100,6 @@ struct GetTypeInfo<TypedDictionary<K, V>> {
 	}
 };
 
-template <typename K, typename V>
-struct GetTypeInfo<const TypedDictionary<K, V> &> {
-	static const Variant::Type VARIANT_TYPE = Variant::DICTIONARY;
-	static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;
-	static inline PropertyInfo get_class_info() {
-		return PropertyInfo(Variant::DICTIONARY, String(), PROPERTY_HINT_DICTIONARY_TYPE, vformat("%s;%s", K::get_class_static(), V::get_class_static()));
-	}
-};
-
 // Specialization for the rest of the Variant types.
 
 #define MAKE_TYPED_DICTIONARY_WITH_OBJECT(m_type, m_variant_type)                                                                                  \
@@ -161,15 +142,6 @@ struct GetTypeInfo<const TypedDictionary<K, V> &> {
 		}                                                                                                                                          \
 	};                                                                                                                                             \
 	template <typename T>                                                                                                                          \
-	struct GetTypeInfo<const TypedDictionary<T, m_type> &> {                                                                                       \
-		static const Variant::Type VARIANT_TYPE = Variant::DICTIONARY;                                                                             \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                              \
-		static inline PropertyInfo get_class_info() {                                                                                              \
-			return PropertyInfo(Variant::DICTIONARY, String(), PROPERTY_HINT_DICTIONARY_TYPE,                                                      \
-					vformat("%s;%s", T::get_class_static(), m_variant_type == Variant::NIL ? "Variant" : Variant::get_type_name(m_variant_type))); \
-		}                                                                                                                                          \
-	};                                                                                                                                             \
-	template <typename T>                                                                                                                          \
 	class TypedDictionary<m_type, T> : public Dictionary {                                                                                         \
 	public:                                                                                                                                        \
 		_FORCE_INLINE_ void operator=(const Dictionary &p_dictionary) {                                                                            \
@@ -190,18 +162,16 @@ struct GetTypeInfo<const TypedDictionary<K, V> &> {
 		_FORCE_INLINE_ TypedDictionary() {                                                                                                         \
 			set_typed(m_variant_type, StringName(), Variant(), Variant::OBJECT, T::get_class_static(), Variant());                                 \
 		}                                                                                                                                          \
-	};                                                                                                                                             \
-	template <typename T>                                                                                                                          \
-	struct GetTypeInfo<TypedDictionary<m_type, T>> {                                                                                               \
-		static const Variant::Type VARIANT_TYPE = Variant::DICTIONARY;                                                                             \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                              \
-		static inline PropertyInfo get_class_info() {                                                                                              \
-			return PropertyInfo(Variant::DICTIONARY, String(), PROPERTY_HINT_DICTIONARY_TYPE,                                                      \
-					vformat("%s;%s", m_variant_type == Variant::NIL ? "Variant" : Variant::get_type_name(m_variant_type), T::get_class_static())); \
+		_FORCE_INLINE_ TypedDictionary(std::initializer_list<KeyValue<m_type, T>> p_init) :                                                        \
+				Dictionary() {                                                                                                                     \
+			set_typed(m_variant_type, StringName(), Variant(), Variant::OBJECT, std::remove_pointer<T>::type::get_class_static(), Variant());      \
+			for (const KeyValue<m_type, T> &E : p_init) {                                                                                          \
+				operator[](E.key) = E.value;                                                                                                       \
+			}                                                                                                                                      \
 		}                                                                                                                                          \
 	};                                                                                                                                             \
 	template <typename T>                                                                                                                          \
-	struct GetTypeInfo<const TypedDictionary<m_type, T> &> {                                                                                       \
+	struct GetTypeInfo<TypedDictionary<m_type, T>> {                                                                                               \
 		static const Variant::Type VARIANT_TYPE = Variant::DICTIONARY;                                                                             \
 		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                                              \
 		static inline PropertyInfo get_class_info() {                                                                                              \
@@ -249,16 +219,6 @@ struct GetTypeInfo<const TypedDictionary<K, V> &> {
 					vformat("%s;%s", m_variant_type_key == Variant::NIL ? "Variant" : Variant::get_type_name(m_variant_type_key), \
 							m_variant_type_value == Variant::NIL ? "Variant" : Variant::get_type_name(m_variant_type_value)));    \
 		}                                                                                                                         \
-	};                                                                                                                            \
-	template <>                                                                                                                   \
-	struct GetTypeInfo<const TypedDictionary<m_type_key, m_type_value> &> {                                                       \
-		static const Variant::Type VARIANT_TYPE = Variant::DICTIONARY;                                                            \
-		static const GodotTypeInfo::Metadata METADATA = GodotTypeInfo::METADATA_NONE;                                             \
-		static inline PropertyInfo get_class_info() {                                                                             \
-			return PropertyInfo(Variant::DICTIONARY, String(), PROPERTY_HINT_DICTIONARY_TYPE,                                     \
-					vformat("%s;%s", m_variant_type_key == Variant::NIL ? "Variant" : Variant::get_type_name(m_variant_type_key), \
-							m_variant_type_value == Variant::NIL ? "Variant" : Variant::get_type_name(m_variant_type_value)));    \
-		}                                                                                                                         \
 	};
 
 #define MAKE_TYPED_DICTIONARY_NIL(m_type, m_variant_type)                                                     \
@@ -360,5 +320,3 @@ MAKE_TYPED_DICTIONARY(IPAddress, Variant::STRING)
 #undef MAKE_TYPED_DICTIONARY_NIL
 #undef MAKE_TYPED_DICTIONARY_EXPANDED
 #undef MAKE_TYPED_DICTIONARY_WITH_OBJECT
-
-#endif // TYPED_DICTIONARY_H
diff --git a/engine/core/variant/variant.cpp b/engine/core/variant/variant.cpp
index f16375db..6219c9ff 100644
--- a/engine/core/variant/variant.cpp
+++ b/engine/core/variant/variant.cpp
@@ -984,34 +984,34 @@ bool Variant::is_zero() const {
 
 		// Arrays.
 		case PACKED_BYTE_ARRAY: {
-			return PackedArrayRef<uint8_t>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<uint8_t>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_INT32_ARRAY: {
-			return PackedArrayRef<int32_t>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<int32_t>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_INT64_ARRAY: {
-			return PackedArrayRef<int64_t>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<int64_t>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_FLOAT32_ARRAY: {
-			return PackedArrayRef<float>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<float>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_FLOAT64_ARRAY: {
-			return PackedArrayRef<double>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<double>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_STRING_ARRAY: {
-			return PackedArrayRef<String>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<String>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_VECTOR2_ARRAY: {
-			return PackedArrayRef<Vector2>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<Vector2>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_VECTOR3_ARRAY: {
-			return PackedArrayRef<Vector3>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<Vector3>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_COLOR_ARRAY: {
-			return PackedArrayRef<Color>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<Color>::get_array(_data.packed_array).is_empty();
 		}
 		case PACKED_VECTOR4_ARRAY: {
-			return PackedArrayRef<Vector4>::get_array(_data.packed_array).size() == 0;
+			return PackedArrayRef<Vector4>::get_array(_data.packed_array).is_empty();
 		}
 		default: {
 		}
@@ -1654,15 +1654,13 @@ String Variant::stringify(int recursion_count) const {
 			// Add leading and trailing space to Dictionary printing. This distinguishes it
 			// from array printing on fonts that have similar-looking {} and [] characters.
 			String str("{ ");
-			List<Variant> keys;
-			d.get_key_list(&keys);
 
 			Vector<_VariantStrPair> pairs;
 
-			for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
+			for (const KeyValue<Variant, Variant> &kv : d) {
 				_VariantStrPair sp;
-				sp.key = stringify_variant_clean(E->get(), recursion_count);
-				sp.value = stringify_variant_clean(d[E->get()], recursion_count);
+				sp.key = stringify_variant_clean(kv.key, recursion_count);
+				sp.value = stringify_variant_clean(kv.value, recursion_count);
 
 				pairs.push_back(sp);
 			}
@@ -2296,14 +2294,6 @@ Variant::operator Vector<StringName>() const {
 	return to;
 }
 
-Variant::operator Side() const {
-	return (Side) operator int();
-}
-
-Variant::operator Orientation() const {
-	return (Orientation) operator int();
-}
-
 Variant::operator IPAddress() const {
 	if (type == PACKED_FLOAT32_ARRAY || type == PACKED_INT32_ARRAY || type == PACKED_FLOAT64_ARRAY || type == PACKED_INT64_ARRAY || type == PACKED_BYTE_ARRAY) {
 		Vector<int> addr = operator Vector<int>();
@@ -2531,6 +2521,11 @@ Variant::Variant(const Dictionary &p_dictionary) :
 	static_assert(sizeof(Dictionary) <= sizeof(_data._mem));
 }
 
+Variant::Variant(std::initializer_list<Variant> p_init) :
+		type(ARRAY) {
+	memnew_placement(_data._mem, Array(p_init));
+}
+
 Variant::Variant(const Array &p_array) :
 		type(ARRAY) {
 	memnew_placement(_data._mem, Array(p_array));
@@ -3139,32 +3134,20 @@ uint32_t Variant::recursive_hash(int recursion_count) const {
 #define hash_compare_scalar(p_lhs, p_rhs) \
 	(hash_compare_scalar_base(p_lhs, p_rhs, true))
 
-#define hash_compare_vector2(p_lhs, p_rhs)        \
-	(hash_compare_scalar((p_lhs).x, (p_rhs).x) && \
-			hash_compare_scalar((p_lhs).y, (p_rhs).y))
+#define hash_compare_vector2(p_lhs, p_rhs) \
+	(p_lhs).is_same(p_rhs)
 
-#define hash_compare_vector3(p_lhs, p_rhs)               \
-	(hash_compare_scalar((p_lhs).x, (p_rhs).x) &&        \
-			hash_compare_scalar((p_lhs).y, (p_rhs).y) && \
-			hash_compare_scalar((p_lhs).z, (p_rhs).z))
+#define hash_compare_vector3(p_lhs, p_rhs) \
+	(p_lhs).is_same(p_rhs)
 
-#define hash_compare_vector4(p_lhs, p_rhs)               \
-	(hash_compare_scalar((p_lhs).x, (p_rhs).x) &&        \
-			hash_compare_scalar((p_lhs).y, (p_rhs).y) && \
-			hash_compare_scalar((p_lhs).z, (p_rhs).z) && \
-			hash_compare_scalar((p_lhs).w, (p_rhs).w))
+#define hash_compare_vector4(p_lhs, p_rhs) \
+	(p_lhs).is_same(p_rhs)
 
-#define hash_compare_quaternion(p_lhs, p_rhs)            \
-	(hash_compare_scalar((p_lhs).x, (p_rhs).x) &&        \
-			hash_compare_scalar((p_lhs).y, (p_rhs).y) && \
-			hash_compare_scalar((p_lhs).z, (p_rhs).z) && \
-			hash_compare_scalar((p_lhs).w, (p_rhs).w))
+#define hash_compare_quaternion(p_lhs, p_rhs) \
+	(p_lhs).is_same(p_rhs)
 
-#define hash_compare_color(p_lhs, p_rhs)                 \
-	(hash_compare_scalar((p_lhs).r, (p_rhs).r) &&        \
-			hash_compare_scalar((p_lhs).g, (p_rhs).g) && \
-			hash_compare_scalar((p_lhs).b, (p_rhs).b) && \
-			hash_compare_scalar((p_lhs).a, (p_rhs).a))
+#define hash_compare_color(p_lhs, p_rhs) \
+	(p_lhs).is_same(p_rhs)
 
 #define hash_compare_packed_array(p_lhs, p_rhs, p_type, p_compare_func) \
 	const Vector<p_type> &l = PackedArrayRef<p_type>::get_array(p_lhs); \
@@ -3235,13 +3218,7 @@ bool Variant::hash_compare(const Variant &p_variant, int recursion_count, bool s
 			Transform2D *l = _data._transform2d;
 			Transform2D *r = p_variant._data._transform2d;
 
-			for (int i = 0; i < 3; i++) {
-				if (!hash_compare_vector2(l->columns[i], r->columns[i])) {
-					return false;
-				}
-			}
-
-			return true;
+			return l->is_same(*r);
 		} break;
 
 		case VECTOR3: {
@@ -3273,17 +3250,14 @@ bool Variant::hash_compare(const Variant &p_variant, int recursion_count, bool s
 			const Plane *l = reinterpret_cast<const Plane *>(_data._mem);
 			const Plane *r = reinterpret_cast<const Plane *>(p_variant._data._mem);
 
-			return hash_compare_vector3(l->normal, r->normal) &&
-					hash_compare_scalar(l->d, r->d);
+			return l->is_same(*r);
 		} break;
 
 		case AABB: {
 			const ::AABB *l = _data._aabb;
 			const ::AABB *r = p_variant._data._aabb;
 
-			return hash_compare_vector3(l->position, r->position) &&
-					hash_compare_vector3(l->size, r->size);
-
+			return l->is_same(*r);
 		} break;
 
 		case QUATERNION: {
@@ -3297,38 +3271,20 @@ bool Variant::hash_compare(const Variant &p_variant, int recursion_count, bool s
 			const Basis *l = _data._basis;
 			const Basis *r = p_variant._data._basis;
 
-			for (int i = 0; i < 3; i++) {
-				if (!hash_compare_vector3(l->rows[i], r->rows[i])) {
-					return false;
-				}
-			}
-
-			return true;
+			return l->is_same(*r);
 		} break;
 
 		case TRANSFORM3D: {
 			const Transform3D *l = _data._transform3d;
 			const Transform3D *r = p_variant._data._transform3d;
 
-			for (int i = 0; i < 3; i++) {
-				if (!hash_compare_vector3(l->basis.rows[i], r->basis.rows[i])) {
-					return false;
-				}
-			}
-
-			return hash_compare_vector3(l->origin, r->origin);
+			return l->is_same(*r);
 		} break;
 		case PROJECTION: {
 			const Projection *l = _data._projection;
 			const Projection *r = p_variant._data._projection;
 
-			for (int i = 0; i < 4; i++) {
-				if (!hash_compare_vector4(l->columns[i], r->columns[i])) {
-					return false;
-				}
-			}
-
-			return true;
+			return l->is_same(*r);
 		} break;
 
 		case COLOR: {
@@ -3447,6 +3403,26 @@ bool StringLikeVariantComparator::compare(const Variant &p_lhs, const Variant &p
 	return false;
 }
 
+bool StringLikeVariantOrder::compare(const Variant &p_lhs, const Variant &p_rhs) {
+	if (p_lhs.get_type() == Variant::STRING) {
+		const String &lhs = *VariantInternal::get_string(&p_lhs);
+		if (p_rhs.get_type() == Variant::STRING) {
+			return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string(&p_rhs));
+		} else if (p_rhs.get_type() == Variant::STRING_NAME) {
+			return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string_name(&p_rhs));
+		}
+	} else if (p_lhs.get_type() == Variant::STRING_NAME) {
+		const StringName &lhs = *VariantInternal::get_string_name(&p_lhs);
+		if (p_rhs.get_type() == Variant::STRING) {
+			return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string(&p_rhs));
+		} else if (p_rhs.get_type() == Variant::STRING_NAME) {
+			return StringName::AlphCompare::compare(lhs, *VariantInternal::get_string_name(&p_rhs));
+		}
+	}
+
+	return p_lhs < p_rhs;
+}
+
 bool Variant::is_ref_counted() const {
 	return type == OBJECT && _get_obj().id.is_ref_counted();
 }
diff --git a/engine/core/variant/variant.h b/engine/core/variant/variant.h
index 633b9c9e..9e1963bb 100644
--- a/engine/core/variant/variant.h
+++ b/engine/core/variant/variant.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_H
-#define VARIANT_H
+#pragma once
 
 #include "core/core_string_names.h"
 #include "core/input/input_enums.h"
@@ -55,6 +54,8 @@
 #include "core/os/keyboard.h"
 #include "core/string/node_path.h"
 #include "core/string/ustring.h"
+#include "core/templates/bit_field.h"
+#include "core/templates/list.h"
 #include "core/templates/paged_allocator.h"
 #include "core/templates/rid.h"
 #include "core/variant/array.h"
@@ -66,6 +67,8 @@ class RefCounted;
 
 template <typename T>
 class Ref;
+template <typename T>
+class BitField;
 
 struct PropertyInfo;
 struct MethodInfo;
@@ -479,12 +482,13 @@ public:
 	operator Vector<Variant>() const;
 	operator Vector<StringName>() const;
 
-	// some core type enums to convert to
-	operator Side() const;
-	operator Orientation() const;
-
 	operator IPAddress() const;
 
+	template <typename T, std::enable_if_t<std::is_enum_v<T>, int> = 0>
+	_FORCE_INLINE_ operator T() const { return static_cast<T>(operator int64_t()); }
+	template <typename T>
+	_FORCE_INLINE_ operator BitField<T>() const { return static_cast<T>(operator uint64_t()); }
+
 	Object *get_validated_object() const;
 	Object *get_validated_object_with_check(bool &r_previously_freed) const;
 
@@ -527,6 +531,7 @@ public:
 	Variant(const Signal &p_signal);
 	Variant(const Dictionary &p_dictionary);
 
+	Variant(std::initializer_list<Variant> p_init);
 	Variant(const Array &p_array);
 	Variant(const PackedByteArray &p_byte_array);
 	Variant(const PackedInt32Array &p_int32_array);
@@ -547,22 +552,12 @@ public:
 
 	Variant(const IPAddress &p_address);
 
-#define VARIANT_ENUM_CLASS_CONSTRUCTOR(m_enum) \
-	Variant(m_enum p_value) :                  \
-			type(INT) {                        \
-		_data._int = (int64_t)p_value;         \
-	}
-
-	// Only enum classes that need to be bound need this to be defined.
-	VARIANT_ENUM_CLASS_CONSTRUCTOR(EulerOrder)
-	VARIANT_ENUM_CLASS_CONSTRUCTOR(JoyAxis)
-	VARIANT_ENUM_CLASS_CONSTRUCTOR(JoyButton)
-	VARIANT_ENUM_CLASS_CONSTRUCTOR(Key)
-	VARIANT_ENUM_CLASS_CONSTRUCTOR(KeyLocation)
-	VARIANT_ENUM_CLASS_CONSTRUCTOR(MIDIMessage)
-	VARIANT_ENUM_CLASS_CONSTRUCTOR(MouseButton)
-
-#undef VARIANT_ENUM_CLASS_CONSTRUCTOR
+	template <typename T, std::enable_if_t<std::is_enum_v<T>, int> = 0>
+	_FORCE_INLINE_ Variant(T p_enum) :
+			Variant(static_cast<int64_t>(p_enum)) {}
+	template <typename T>
+	_FORCE_INLINE_ Variant(BitField<T> p_bitfield) :
+			Variant(static_cast<uint64_t>(p_bitfield)) {}
 
 	// If this changes the table in variant_op must be updated
 	enum Operator {
@@ -910,12 +905,7 @@ struct StringLikeVariantComparator {
 };
 
 struct StringLikeVariantOrder {
-	static _ALWAYS_INLINE_ bool compare(const Variant &p_lhs, const Variant &p_rhs) {
-		if (p_lhs.is_string() && p_rhs.is_string()) {
-			return p_lhs.operator String() < p_rhs.operator String();
-		}
-		return p_lhs < p_rhs;
-	}
+	static bool compare(const Variant &p_lhs, const Variant &p_rhs);
 
 	_ALWAYS_INLINE_ bool operator()(const Variant &p_lhs, const Variant &p_rhs) const {
 		return compare(p_lhs, p_rhs);
@@ -998,18 +988,10 @@ Array::Iterator &Array::Iterator::operator--() {
 }
 
 const Variant &Array::ConstIterator::operator*() const {
-	if (unlikely(read_only)) {
-		*read_only = *element_ptr;
-		return *read_only;
-	}
 	return *element_ptr;
 }
 
 const Variant *Array::ConstIterator::operator->() const {
-	if (unlikely(read_only)) {
-		*read_only = *element_ptr;
-		return read_only;
-	}
 	return element_ptr;
 }
 
@@ -1023,4 +1005,6 @@ Array::ConstIterator &Array::ConstIterator::operator--() {
 	return *this;
 }
 
-#endif // VARIANT_H
+// Zero-constructing Variant results in NULL.
+template <>
+struct is_zero_constructible<Variant> : std::true_type {};
diff --git a/engine/core/variant/variant_call.cpp b/engine/core/variant/variant_call.cpp
index 730bf72b..39917258 100644
--- a/engine/core/variant/variant_call.cpp
+++ b/engine/core/variant/variant_call.cpp
@@ -694,11 +694,62 @@ struct _VariantCall {
 		return s;
 	}
 
+	static void func_PackedByteArray_bswap16(PackedByteArray *p_instance, int64_t p_offset, int64_t p_count) {
+		size_t sz = p_instance->size();
+		if (sz == 0 || p_count == 0) {
+			return;
+		}
+		ERR_FAIL_COND(p_offset < 0 || p_offset > int64_t(sz) - 2);
+		if (p_count < 0) {
+			p_count = floor((sz - p_offset) / 2);
+		}
+		ERR_FAIL_COND(p_count > floor((sz - p_offset) / 2));
+
+		uint16_t *w = (uint16_t *)(p_instance->ptrw() + p_offset);
+		for (int64_t i = 0; i < p_count; i++) {
+			w[i] = BSWAP16(w[i]);
+		}
+	}
+
+	static void func_PackedByteArray_bswap32(PackedByteArray *p_instance, int64_t p_offset, int64_t p_count) {
+		size_t sz = p_instance->size();
+		if (sz == 0 || p_count == 0) {
+			return;
+		}
+		ERR_FAIL_COND(p_offset < 0 || p_offset > int64_t(sz) - 4);
+		if (p_count < 0) {
+			p_count = floor((sz - p_offset) / 4);
+		}
+		ERR_FAIL_COND(p_count > floor((sz - p_offset) / 4));
+
+		uint32_t *w = (uint32_t *)(p_instance->ptrw() + p_offset);
+		for (int64_t i = 0; i < p_count; i++) {
+			w[i] = BSWAP32(w[i]);
+		}
+	}
+
+	static void func_PackedByteArray_bswap64(PackedByteArray *p_instance, int64_t p_offset, int64_t p_count) {
+		size_t sz = p_instance->size();
+		if (sz == 0 || p_count == 0) {
+			return;
+		}
+		ERR_FAIL_COND(p_offset < 0 || p_offset > int64_t(sz) - 8);
+		if (p_count < 0) {
+			p_count = floor((sz - p_offset) / 8);
+		}
+		ERR_FAIL_COND(p_count > floor((sz - p_offset) / 8));
+
+		uint64_t *w = (uint64_t *)(p_instance->ptrw() + p_offset);
+		for (int64_t i = 0; i < p_count; i++) {
+			w[i] = BSWAP64(w[i]);
+		}
+	}
+
 	static String func_PackedByteArray_get_string_from_utf8(PackedByteArray *p_instance) {
 		String s;
 		if (p_instance->size() > 0) {
 			const uint8_t *r = p_instance->ptr();
-			s.parse_utf8((const char *)r, p_instance->size());
+			s.append_utf8((const char *)r, p_instance->size());
 		}
 		return s;
 	}
@@ -707,7 +758,7 @@ struct _VariantCall {
 		String s;
 		if (p_instance->size() > 0) {
 			const uint8_t *r = p_instance->ptr();
-			s.parse_utf16((const char16_t *)r, floor((double)p_instance->size() / (double)sizeof(char16_t)));
+			s.append_utf16((const char16_t *)r, floor((double)p_instance->size() / (double)sizeof(char16_t)));
 		}
 		return s;
 	}
@@ -716,7 +767,7 @@ struct _VariantCall {
 		String s;
 		if (p_instance->size() > 0) {
 			const uint8_t *r = p_instance->ptr();
-			s = String((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t)));
+			s.append_utf32(Span((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t))));
 		}
 		return s;
 	}
@@ -726,14 +777,22 @@ struct _VariantCall {
 		if (p_instance->size() > 0) {
 			const uint8_t *r = p_instance->ptr();
 #ifdef WINDOWS_ENABLED
-			s.parse_utf16((const char16_t *)r, floor((double)p_instance->size() / (double)sizeof(char16_t)));
+			s.append_utf16((const char16_t *)r, floor((double)p_instance->size() / (double)sizeof(char16_t)));
 #else
-			s = String((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t)));
+			s.append_utf32(Span((const char32_t *)r, floor((double)p_instance->size() / (double)sizeof(char32_t))));
 #endif
 		}
 		return s;
 	}
 
+	static String func_PackedByteArray_get_string_from_multibyte_char(PackedByteArray *p_instance, const String &p_encoding) {
+		String s;
+		if (p_instance->size() > 0) {
+			s = OS::get_singleton()->multibyte_to_string(p_encoding, *p_instance);
+		}
+		return s;
+	}
+
 	static PackedByteArray func_PackedByteArray_compress(PackedByteArray *p_instance, int p_mode) {
 		PackedByteArray compressed;
 
@@ -1731,6 +1790,10 @@ static void _register_variant_builtin_methods_string() {
 	bind_string_method(format, sarray("values", "placeholder"), varray("{_}"));
 	bind_string_methodv(replace, static_cast<String (String::*)(const String &, const String &) const>(&String::replace), sarray("what", "forwhat"), varray());
 	bind_string_methodv(replacen, static_cast<String (String::*)(const String &, const String &) const>(&String::replacen), sarray("what", "forwhat"), varray());
+	bind_string_method(replace_char, sarray("key", "with"), varray());
+	bind_string_methodv(replace_chars, static_cast<String (String::*)(const String &, char32_t) const>(&String::replace_chars), sarray("keys", "with"), varray());
+	bind_string_method(remove_char, sarray("what"), varray());
+	bind_string_methodv(remove_chars, static_cast<String (String::*)(const String &) const>(&String::remove_chars), sarray("chars"), varray());
 	bind_string_method(repeat, sarray("count"), varray());
 	bind_string_method(reverse, sarray(), varray());
 	bind_string_method(insert, sarray("position", "what"), varray());
@@ -1739,6 +1802,7 @@ static void _register_variant_builtin_methods_string() {
 	bind_string_method(to_camel_case, sarray(), varray());
 	bind_string_method(to_pascal_case, sarray(), varray());
 	bind_string_method(to_snake_case, sarray(), varray());
+	bind_string_method(to_kebab_case, sarray(), varray());
 	bind_string_methodv(split, static_cast<Vector<String> (String::*)(const String &, bool, int) const>(&String::split), sarray("delimiter", "allow_empty", "maxsplit"), varray("", true, 0));
 	bind_string_methodv(rsplit, static_cast<Vector<String> (String::*)(const String &, bool, int) const>(&String::rsplit), sarray("delimiter", "allow_empty", "maxsplit"), varray("", true, 0));
 	bind_string_method(split_floats, sarray("delimiter", "allow_empty"), varray(true));
@@ -1780,6 +1844,7 @@ static void _register_variant_builtin_methods_string() {
 	bind_string_method(xml_unescape, sarray(), varray());
 	bind_string_method(uri_encode, sarray(), varray());
 	bind_string_method(uri_decode, sarray(), varray());
+	bind_string_method(uri_file_decode, sarray(), varray());
 	bind_string_method(c_escape, sarray(), varray());
 	bind_string_method(c_unescape, sarray(), varray());
 	bind_string_method(json_escape, sarray(), varray());
@@ -1813,8 +1878,9 @@ static void _register_variant_builtin_methods_string() {
 	bind_string_method(to_utf8_buffer, sarray(), varray());
 	bind_string_method(to_utf16_buffer, sarray(), varray());
 	bind_string_method(to_utf32_buffer, sarray(), varray());
-	bind_string_method(hex_decode, sarray(), varray());
 	bind_string_method(to_wchar_buffer, sarray(), varray());
+	bind_string_method(to_multibyte_char_buffer, sarray("encoding"), varray(String()));
+	bind_string_method(hex_decode, sarray(), varray());
 
 	bind_static_method(String, num_scientific, sarray("number"), varray());
 	bind_static_method(String, num, sarray("number", "decimals"), varray(-1));
@@ -2449,12 +2515,14 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedByteArray, find, sarray("value", "from"), varray(0));
 	bind_method(PackedByteArray, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedByteArray, count, sarray("value"), varray());
+	bind_method(PackedByteArray, erase, sarray("value"), varray());
 
 	bind_function(PackedByteArray, get_string_from_ascii, _VariantCall::func_PackedByteArray_get_string_from_ascii, sarray(), varray());
 	bind_function(PackedByteArray, get_string_from_utf8, _VariantCall::func_PackedByteArray_get_string_from_utf8, sarray(), varray());
 	bind_function(PackedByteArray, get_string_from_utf16, _VariantCall::func_PackedByteArray_get_string_from_utf16, sarray(), varray());
 	bind_function(PackedByteArray, get_string_from_utf32, _VariantCall::func_PackedByteArray_get_string_from_utf32, sarray(), varray());
 	bind_function(PackedByteArray, get_string_from_wchar, _VariantCall::func_PackedByteArray_get_string_from_wchar, sarray(), varray());
+	bind_function(PackedByteArray, get_string_from_multibyte_char, _VariantCall::func_PackedByteArray_get_string_from_multibyte_char, sarray("encoding"), varray(String()));
 	bind_function(PackedByteArray, hex_encode, _VariantCall::func_PackedByteArray_hex_encode, sarray(), varray());
 	bind_function(PackedByteArray, compress, _VariantCall::func_PackedByteArray_compress, sarray("compression_mode"), varray(0));
 	bind_function(PackedByteArray, decompress, _VariantCall::func_PackedByteArray_decompress, sarray("buffer_size", "compression_mode"), varray(0));
@@ -2480,6 +2548,10 @@ static void _register_variant_builtin_methods_array() {
 	bind_function(PackedByteArray, to_float32_array, _VariantCall::func_PackedByteArray_decode_float_array, sarray(), varray());
 	bind_function(PackedByteArray, to_float64_array, _VariantCall::func_PackedByteArray_decode_double_array, sarray(), varray());
 
+	bind_functionnc(PackedByteArray, bswap16, _VariantCall::func_PackedByteArray_bswap16, sarray("offset", "count"), varray(0, -1));
+	bind_functionnc(PackedByteArray, bswap32, _VariantCall::func_PackedByteArray_bswap32, sarray("offset", "count"), varray(0, -1));
+	bind_functionnc(PackedByteArray, bswap64, _VariantCall::func_PackedByteArray_bswap64, sarray("offset", "count"), varray(0, -1));
+
 	bind_functionnc(PackedByteArray, encode_u8, _VariantCall::func_PackedByteArray_encode_u8, sarray("byte_offset", "value"), varray());
 	bind_functionnc(PackedByteArray, encode_s8, _VariantCall::func_PackedByteArray_encode_s8, sarray("byte_offset", "value"), varray());
 	bind_functionnc(PackedByteArray, encode_u16, _VariantCall::func_PackedByteArray_encode_u16, sarray("byte_offset", "value"), varray());
@@ -2515,6 +2587,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedInt32Array, find, sarray("value", "from"), varray(0));
 	bind_method(PackedInt32Array, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedInt32Array, count, sarray("value"), varray());
+	bind_method(PackedInt32Array, erase, sarray("value"), varray());
 
 	/* Int64 Array */
 
@@ -2538,6 +2611,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedInt64Array, find, sarray("value", "from"), varray(0));
 	bind_method(PackedInt64Array, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedInt64Array, count, sarray("value"), varray());
+	bind_method(PackedInt64Array, erase, sarray("value"), varray());
 
 	/* Float32 Array */
 
@@ -2561,6 +2635,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedFloat32Array, find, sarray("value", "from"), varray(0));
 	bind_method(PackedFloat32Array, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedFloat32Array, count, sarray("value"), varray());
+	bind_method(PackedFloat32Array, erase, sarray("value"), varray());
 
 	/* Float64 Array */
 
@@ -2584,6 +2659,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedFloat64Array, find, sarray("value", "from"), varray(0));
 	bind_method(PackedFloat64Array, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedFloat64Array, count, sarray("value"), varray());
+	bind_method(PackedFloat64Array, erase, sarray("value"), varray());
 
 	/* String Array */
 
@@ -2607,6 +2683,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedStringArray, find, sarray("value", "from"), varray(0));
 	bind_method(PackedStringArray, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedStringArray, count, sarray("value"), varray());
+	bind_method(PackedStringArray, erase, sarray("value"), varray());
 
 	/* Vector2 Array */
 
@@ -2630,6 +2707,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedVector2Array, find, sarray("value", "from"), varray(0));
 	bind_method(PackedVector2Array, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedVector2Array, count, sarray("value"), varray());
+	bind_method(PackedVector2Array, erase, sarray("value"), varray());
 
 	/* Vector3 Array */
 
@@ -2653,6 +2731,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedVector3Array, find, sarray("value", "from"), varray(0));
 	bind_method(PackedVector3Array, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedVector3Array, count, sarray("value"), varray());
+	bind_method(PackedVector3Array, erase, sarray("value"), varray());
 
 	/* Color Array */
 
@@ -2676,6 +2755,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedColorArray, find, sarray("value", "from"), varray(0));
 	bind_method(PackedColorArray, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedColorArray, count, sarray("value"), varray());
+	bind_method(PackedColorArray, erase, sarray("value"), varray());
 
 	/* Vector4 Array */
 
@@ -2699,6 +2779,7 @@ static void _register_variant_builtin_methods_array() {
 	bind_method(PackedVector4Array, find, sarray("value", "from"), varray(0));
 	bind_method(PackedVector4Array, rfind, sarray("value", "from"), varray(-1));
 	bind_method(PackedVector4Array, count, sarray("value"), varray());
+	bind_method(PackedVector4Array, erase, sarray("value"), varray());
 }
 
 static void _register_variant_builtin_constants() {
@@ -2715,7 +2796,7 @@ static void _register_variant_builtin_constants() {
 
 	_VariantCall::add_variant_constant(Variant::VECTOR3, "ZERO", Vector3(0, 0, 0));
 	_VariantCall::add_variant_constant(Variant::VECTOR3, "ONE", Vector3(1, 1, 1));
-	_VariantCall::add_variant_constant(Variant::VECTOR3, "INF", Vector3(INFINITY, INFINITY, INFINITY));
+	_VariantCall::add_variant_constant(Variant::VECTOR3, "INF", Vector3(Math::INF, Math::INF, Math::INF));
 	_VariantCall::add_variant_constant(Variant::VECTOR3, "LEFT", Vector3(-1, 0, 0));
 	_VariantCall::add_variant_constant(Variant::VECTOR3, "RIGHT", Vector3(1, 0, 0));
 	_VariantCall::add_variant_constant(Variant::VECTOR3, "UP", Vector3(0, 1, 0));
@@ -2737,7 +2818,7 @@ static void _register_variant_builtin_constants() {
 
 	_VariantCall::add_variant_constant(Variant::VECTOR4, "ZERO", Vector4(0, 0, 0, 0));
 	_VariantCall::add_variant_constant(Variant::VECTOR4, "ONE", Vector4(1, 1, 1, 1));
-	_VariantCall::add_variant_constant(Variant::VECTOR4, "INF", Vector4(INFINITY, INFINITY, INFINITY, INFINITY));
+	_VariantCall::add_variant_constant(Variant::VECTOR4, "INF", Vector4(Math::INF, Math::INF, Math::INF, Math::INF));
 
 	_VariantCall::add_enum_constant(Variant::VECTOR3I, "Axis", "AXIS_X", Vector3i::AXIS_X);
 	_VariantCall::add_enum_constant(Variant::VECTOR3I, "Axis", "AXIS_Y", Vector3i::AXIS_Y);
@@ -2772,7 +2853,7 @@ static void _register_variant_builtin_constants() {
 
 	_VariantCall::add_variant_constant(Variant::VECTOR2, "ZERO", Vector2(0, 0));
 	_VariantCall::add_variant_constant(Variant::VECTOR2, "ONE", Vector2(1, 1));
-	_VariantCall::add_variant_constant(Variant::VECTOR2, "INF", Vector2(INFINITY, INFINITY));
+	_VariantCall::add_variant_constant(Variant::VECTOR2, "INF", Vector2(Math::INF, Math::INF));
 	_VariantCall::add_variant_constant(Variant::VECTOR2, "LEFT", Vector2(-1, 0));
 	_VariantCall::add_variant_constant(Variant::VECTOR2, "RIGHT", Vector2(1, 0));
 	_VariantCall::add_variant_constant(Variant::VECTOR2, "UP", Vector2(0, -1));
diff --git a/engine/core/variant/variant_callable.h b/engine/core/variant/variant_callable.h
index 1811f3bb..7d4a5a76 100644
--- a/engine/core/variant/variant_callable.h
+++ b/engine/core/variant/variant_callable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_CALLABLE_H
-#define VARIANT_CALLABLE_H
+#pragma once
 
 #include "core/variant/callable.h"
 #include "core/variant/variant.h"
@@ -55,5 +54,3 @@ public:
 
 	VariantCallable(const Variant &p_variant, const StringName &p_method);
 };
-
-#endif // VARIANT_CALLABLE_H
diff --git a/engine/core/variant/variant_construct.h b/engine/core/variant/variant_construct.h
index f625419d..8e390cf1 100644
--- a/engine/core/variant/variant_construct.h
+++ b/engine/core/variant/variant_construct.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_CONSTRUCT_H
-#define VARIANT_CONSTRUCT_H
+#pragma once
 
 #include "variant.h"
 
@@ -813,5 +812,3 @@ public:
 		return Variant::OBJECT;
 	}
 };
-
-#endif // VARIANT_CONSTRUCT_H
diff --git a/engine/core/variant/variant_destruct.h b/engine/core/variant/variant_destruct.h
index d91d99b0..730bcc82 100644
--- a/engine/core/variant/variant_destruct.h
+++ b/engine/core/variant/variant_destruct.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_DESTRUCT_H
-#define VARIANT_DESTRUCT_H
+#pragma once
 
 #include "core/variant/variant.h"
 
@@ -68,5 +67,3 @@ MAKE_PTRDESTRUCT(PackedColorArray);
 MAKE_PTRDESTRUCT(PackedVector4Array);
 
 #undef MAKE_PTRDESTRUCT
-
-#endif // VARIANT_DESTRUCT_H
diff --git a/engine/core/variant/variant_internal.h b/engine/core/variant/variant_internal.h
index 9a40dcec..48d13a51 100644
--- a/engine/core/variant/variant_internal.h
+++ b/engine/core/variant/variant_internal.h
@@ -28,11 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_INTERNAL_H
-#define VARIANT_INTERNAL_H
+#pragma once
 
 #include "variant.h"
 
+#include "core/templates/simple_type.h"
+
 // For use when you want to access the internal pointer of a Variant directly.
 // Use with caution. You need to be sure that the type is correct.
 
@@ -528,9 +529,11 @@ public:
 	}
 };
 
+template <typename T, typename = void>
+struct VariantGetInternalPtr;
+
 template <typename T>
-struct VariantGetInternalPtr {
-};
+struct VariantGetInternalPtr<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : VariantGetInternalPtr<GetSimpleTypeT<T>> {};
 
 template <>
 struct VariantGetInternalPtr<bool> {
@@ -538,56 +541,14 @@ struct VariantGetInternalPtr<bool> {
 	static const bool *get_ptr(const Variant *v) { return VariantInternal::get_bool(v); }
 };
 
-template <>
-struct VariantGetInternalPtr<int8_t> {
+template <typename T>
+struct VariantGetInternalPtr<T, std::enable_if_t<std::is_integral_v<T> || std::is_enum_v<T>>> {
 	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
 	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
 };
 
-template <>
-struct VariantGetInternalPtr<uint8_t> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
-template <>
-struct VariantGetInternalPtr<int16_t> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
-template <>
-struct VariantGetInternalPtr<uint16_t> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
-template <>
-struct VariantGetInternalPtr<int32_t> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
-template <>
-struct VariantGetInternalPtr<uint32_t> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
-template <>
-struct VariantGetInternalPtr<int64_t> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
-template <>
-struct VariantGetInternalPtr<uint64_t> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
-template <>
-struct VariantGetInternalPtr<char32_t> {
+template <typename T>
+struct VariantGetInternalPtr<BitField<T>, std::enable_if_t<std::is_enum_v<T>>> {
 	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
 	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
 };
@@ -598,12 +559,6 @@ struct VariantGetInternalPtr<ObjectID> {
 	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
 };
 
-template <>
-struct VariantGetInternalPtr<Error> {
-	static int64_t *get_ptr(Variant *v) { return VariantInternal::get_int(v); }
-	static const int64_t *get_ptr(const Variant *v) { return VariantInternal::get_int(v); }
-};
-
 template <>
 struct VariantGetInternalPtr<float> {
 	static double *get_ptr(Variant *v) { return VariantInternal::get_float(v); }
@@ -821,9 +776,11 @@ struct VariantGetInternalPtr<PackedVector4Array> {
 	static const PackedVector4Array *get_ptr(const Variant *v) { return VariantInternal::get_vector4_array(v); }
 };
 
+template <typename T, typename = void>
+struct VariantInternalAccessor;
+
 template <typename T>
-struct VariantInternalAccessor {
-};
+struct VariantInternalAccessor<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : VariantInternalAccessor<GetSimpleTypeT<T>> {};
 
 template <>
 struct VariantInternalAccessor<bool> {
@@ -831,26 +788,17 @@ struct VariantInternalAccessor<bool> {
 	static _FORCE_INLINE_ void set(Variant *v, bool p_value) { *VariantInternal::get_bool(v) = p_value; }
 };
 
-#define VARIANT_ACCESSOR_NUMBER(m_type)                              \
-	template <>                                                      \
-	struct VariantInternalAccessor<m_type> {                         \
-		static _FORCE_INLINE_ m_type get(const Variant *v) {         \
-			return (m_type) * VariantInternal::get_int(v);           \
-		}                                                            \
-		static _FORCE_INLINE_ void set(Variant *v, m_type p_value) { \
-			*VariantInternal::get_int(v) = p_value;                  \
-		}                                                            \
-	};
+template <typename T>
+struct VariantInternalAccessor<T, std::enable_if_t<std::is_integral_v<T> || std::is_enum_v<T>>> {
+	static _FORCE_INLINE_ T get(const Variant *v) { return static_cast<T>(*VariantInternal::get_int(v)); }
+	static _FORCE_INLINE_ void set(Variant *v, T p_value) { *VariantInternal::get_int(v) = static_cast<int64_t>(p_value); }
+};
 
-VARIANT_ACCESSOR_NUMBER(int8_t)
-VARIANT_ACCESSOR_NUMBER(uint8_t)
-VARIANT_ACCESSOR_NUMBER(int16_t)
-VARIANT_ACCESSOR_NUMBER(uint16_t)
-VARIANT_ACCESSOR_NUMBER(int32_t)
-VARIANT_ACCESSOR_NUMBER(uint32_t)
-VARIANT_ACCESSOR_NUMBER(int64_t)
-VARIANT_ACCESSOR_NUMBER(uint64_t)
-VARIANT_ACCESSOR_NUMBER(char32_t)
+template <typename T>
+struct VariantInternalAccessor<BitField<T>, std::enable_if_t<std::is_enum_v<T>>> {
+	static _FORCE_INLINE_ BitField<T> get(const Variant *v) { return BitField<T>(static_cast<T>(*VariantInternal::get_int(v))); }
+	static _FORCE_INLINE_ void set(Variant *v, BitField<T> p_value) { *VariantInternal::get_int(v) = static_cast<int64_t>(p_value); }
+};
 
 template <>
 struct VariantInternalAccessor<ObjectID> {
@@ -1127,47 +1075,7 @@ struct VariantInternalAccessor<Vector<Variant>> {
 
 template <typename T>
 struct VariantInitializer {
-};
-
-template <>
-struct VariantInitializer<bool> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<bool>(v); }
-};
-
-#define INITIALIZER_INT(m_type)                        \
-	template <>                                        \
-	struct VariantInitializer<m_type> {                \
-		static _FORCE_INLINE_ void init(Variant *v) {  \
-			VariantInternal::init_generic<int64_t>(v); \
-		}                                              \
-	};
-
-INITIALIZER_INT(uint8_t)
-INITIALIZER_INT(int8_t)
-INITIALIZER_INT(uint16_t)
-INITIALIZER_INT(int16_t)
-INITIALIZER_INT(uint32_t)
-INITIALIZER_INT(int32_t)
-INITIALIZER_INT(uint64_t)
-INITIALIZER_INT(int64_t)
-INITIALIZER_INT(char32_t)
-INITIALIZER_INT(Error)
-INITIALIZER_INT(ObjectID)
-INITIALIZER_INT(Vector2::Axis)
-INITIALIZER_INT(Vector2i::Axis)
-INITIALIZER_INT(Vector3::Axis)
-INITIALIZER_INT(Vector3i::Axis)
-INITIALIZER_INT(Vector4::Axis)
-INITIALIZER_INT(Vector4i::Axis)
-
-template <>
-struct VariantInitializer<double> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<double>(v); }
-};
-
-template <>
-struct VariantInitializer<float> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<double>(v); }
+	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<T>(v); }
 };
 
 template <>
@@ -1175,59 +1083,11 @@ struct VariantInitializer<String> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_string(v); }
 };
 
-template <>
-struct VariantInitializer<Vector2> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Vector2>(v); }
-};
-
-template <>
-struct VariantInitializer<Vector2i> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Vector2i>(v); }
-};
-
-template <>
-struct VariantInitializer<Rect2> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Rect2>(v); }
-};
-
-template <>
-struct VariantInitializer<Rect2i> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Rect2i>(v); }
-};
-
-template <>
-struct VariantInitializer<Vector3> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Vector3>(v); }
-};
-
-template <>
-struct VariantInitializer<Vector3i> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Vector3i>(v); }
-};
-template <>
-struct VariantInitializer<Vector4> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Vector4>(v); }
-};
-
-template <>
-struct VariantInitializer<Vector4i> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Vector4i>(v); }
-};
 template <>
 struct VariantInitializer<Transform2D> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_transform2d(v); }
 };
 
-template <>
-struct VariantInitializer<Plane> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Plane>(v); }
-};
-
-template <>
-struct VariantInitializer<Quaternion> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Quaternion>(v); }
-};
-
 template <>
 struct VariantInitializer<AABB> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_aabb(v); }
@@ -1242,16 +1102,12 @@ template <>
 struct VariantInitializer<Transform3D> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_transform3d(v); }
 };
+
 template <>
 struct VariantInitializer<Projection> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_projection(v); }
 };
 
-template <>
-struct VariantInitializer<Color> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<Color>(v); }
-};
-
 template <>
 struct VariantInitializer<StringName> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_string_name(v); }
@@ -1262,11 +1118,6 @@ struct VariantInitializer<NodePath> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_node_path(v); }
 };
 
-template <>
-struct VariantInitializer<::RID> {
-	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_generic<::RID>(v); }
-};
-
 template <>
 struct VariantInitializer<Callable> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_callable(v); }
@@ -1342,17 +1193,24 @@ struct VariantInitializer<Object *> {
 	static _FORCE_INLINE_ void init(Variant *v) { VariantInternal::init_object(v); }
 };
 
+template <typename T, typename = void>
+struct VariantDefaultInitializer;
+
 template <typename T>
-struct VariantDefaultInitializer {
-};
+struct VariantDefaultInitializer<T, std::enable_if_t<!std::is_same_v<T, GetSimpleTypeT<T>>>> : VariantDefaultInitializer<GetSimpleTypeT<T>> {};
 
 template <>
 struct VariantDefaultInitializer<bool> {
 	static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_bool(v) = false; }
 };
 
-template <>
-struct VariantDefaultInitializer<int64_t> {
+template <typename T>
+struct VariantDefaultInitializer<T, std::enable_if_t<std::is_integral_v<T> || std::is_enum_v<T>>> {
+	static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_int(v) = 0; }
+};
+
+template <typename T>
+struct VariantDefaultInitializer<BitField<T>, std::enable_if_t<std::is_enum_v<T>>> {
 	static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_int(v) = 0; }
 };
 
@@ -1590,5 +1448,3 @@ struct VariantTypeConstructor {
 		memnew_placement(r_value, T(*reinterpret_cast<Variant *>(p_variant)));
 	}
 };
-
-#endif // VARIANT_INTERNAL_H
diff --git a/engine/core/variant/variant_op.h b/engine/core/variant/variant_op.h
index e95f2b49..424ebd93 100644
--- a/engine/core/variant/variant_op.h
+++ b/engine/core/variant/variant_op.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_OP_H
-#define VARIANT_OP_H
+#pragma once
 
 #include "variant.h"
 
@@ -908,9 +907,7 @@ template <typename S>
 class OperatorEvaluatorStringFormat<S, void> {
 public:
 	_FORCE_INLINE_ static String do_mod(const String &s, bool *r_valid) {
-		Array values;
-		values.push_back(Variant());
-
+		Array values = { Variant() };
 		String a = s.sprintf(values, r_valid);
 		if (r_valid) {
 			*r_valid = !*r_valid;
@@ -967,8 +964,7 @@ template <typename S>
 class OperatorEvaluatorStringFormat<S, Object> {
 public:
 	_FORCE_INLINE_ static String do_mod(const String &s, const Object *p_object, bool *r_valid) {
-		Array values;
-		values.push_back(p_object);
+		Array values = { p_object };
 		String a = s.sprintf(values, r_valid);
 		if (r_valid) {
 			*r_valid = !*r_valid;
@@ -998,8 +994,7 @@ template <typename S, typename T>
 class OperatorEvaluatorStringFormat {
 public:
 	_FORCE_INLINE_ static String do_mod(const String &s, const T &p_value, bool *r_valid) {
-		Array values;
-		values.push_back(p_value);
+		Array values = { p_value };
 		String a = s.sprintf(values, r_valid);
 		if (r_valid) {
 			*r_valid = !*r_valid;
@@ -1558,5 +1553,3 @@ public:
 	}
 	static Variant::Type get_return_type() { return Variant::BOOL; }
 };
-
-#endif // VARIANT_OP_H
diff --git a/engine/core/variant/variant_parser.cpp b/engine/core/variant/variant_parser.cpp
index c0468b89..5b9fc4c8 100644
--- a/engine/core/variant/variant_parser.cpp
+++ b/engine/core/variant/variant_parser.cpp
@@ -147,11 +147,12 @@ const char *VariantParser::tk_name[TK_MAX] = {
 
 static double stor_fix(const String &p_str) {
 	if (p_str == "inf") {
-		return INFINITY;
-	} else if (p_str == "inf_neg") {
-		return -INFINITY;
+		return Math::INF;
+	} else if (p_str == "-inf" || p_str == "inf_neg") {
+		// inf_neg kept for compatibility.
+		return -Math::INF;
 	} else if (p_str == "nan") {
-		return NAN;
+		return Math::NaN;
 	}
 	return -1;
 }
@@ -395,7 +396,10 @@ Error VariantParser::get_token(Stream *p_stream, Token &r_token, int &line, Stri
 				}
 
 				if (p_stream->is_utf8()) {
-					str.parse_utf8(str.ascii(true).get_data());
+					// Re-interpret the string we built as ascii.
+					CharString string_as_ascii = str.ascii(true);
+					str.clear();
+					str.append_utf8(string_as_ascii);
 				}
 				if (string_name) {
 					r_token.type = TK_STRING_NAME;
@@ -411,11 +415,13 @@ Error VariantParser::get_token(Stream *p_stream, Token &r_token, int &line, Stri
 				if (cchar <= 32) {
 					break;
 				}
-
-				if (cchar == '-' || (cchar >= '0' && cchar <= '9')) {
+				StringBuffer<> token_text;
+				if (cchar == '-') {
+					token_text += '-';
+					cchar = p_stream->get_char();
+				}
+				if (cchar >= '0' && cchar <= '9') {
 					//a number
-
-					StringBuffer<> num;
 #define READING_SIGN 0
 #define READING_INT 1
 #define READING_DEC 2
@@ -423,11 +429,6 @@ Error VariantParser::get_token(Stream *p_stream, Token &r_token, int &line, Stri
 #define READING_DONE 4
 					int reading = READING_INT;
 
-					if (cchar == '-') {
-						num += '-';
-						cchar = p_stream->get_char();
-					}
-
 					char32_t c = cchar;
 					bool exp_sign = false;
 					bool exp_beg = false;
@@ -474,7 +475,7 @@ Error VariantParser::get_token(Stream *p_stream, Token &r_token, int &line, Stri
 						if (reading == READING_DONE) {
 							break;
 						}
-						num += c;
+						token_text += c;
 						c = p_stream->get_char();
 					}
 
@@ -483,17 +484,16 @@ Error VariantParser::get_token(Stream *p_stream, Token &r_token, int &line, Stri
 					r_token.type = TK_NUMBER;
 
 					if (is_float) {
-						r_token.value = num.as_double();
+						r_token.value = token_text.as_double();
 					} else {
-						r_token.value = num.as_int();
+						r_token.value = token_text.as_int();
 					}
 					return OK;
 				} else if (is_ascii_alphabet_char(cchar) || is_underscore(cchar)) {
-					StringBuffer<> id;
 					bool first = true;
 
 					while (is_ascii_alphabet_char(cchar) || is_underscore(cchar) || (!first && is_digit(cchar))) {
-						id += cchar;
+						token_text += cchar;
 						cchar = p_stream->get_char();
 						first = false;
 					}
@@ -501,7 +501,7 @@ Error VariantParser::get_token(Stream *p_stream, Token &r_token, int &line, Stri
 					p_stream->saved = cchar;
 
 					r_token.type = TK_IDENTIFIER;
-					r_token.value = id.as_string();
+					r_token.value = token_text.as_string();
 					return OK;
 				} else {
 					r_err_str = "Unexpected character";
@@ -698,11 +698,12 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream,
 		} else if (id == "null" || id == "nil") {
 			value = Variant();
 		} else if (id == "inf") {
-			value = INFINITY;
-		} else if (id == "inf_neg") {
-			value = -INFINITY;
+			value = Math::INF;
+		} else if (id == "-inf" || id == "inf_neg") {
+			// inf_neg kept for compatibility.
+			value = -Math::INF;
 		} else if (id == "nan") {
-			value = NAN;
+			value = Math::NaN;
 		} else if (id == "Vector2") {
 			Vector<real_t> args;
 			Error err = _parse_construct<real_t>(p_stream, args, line, r_err_str);
@@ -1736,7 +1737,8 @@ Error VariantParser::_parse_tag(Token &token, Stream *p_stream, int &line, Strin
 				}
 				cs += c;
 			}
-			r_tag.name.parse_utf8(cs.get_data(), cs.length());
+			r_tag.name.clear();
+			r_tag.name.append_utf8(cs.get_data(), cs.length());
 		} else {
 			while (true) {
 				char32_t c = p_stream->get_char();
@@ -1932,7 +1934,7 @@ Error VariantParser::parse(Stream *p_stream, Variant &r_ret, String &r_err_str,
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
-static String rtos_fix(double p_value) {
+static String rtos_fix(double p_value, bool p_compat) {
 	if (p_value == 0.0) {
 		return "0"; //avoid negative zero (-0) being written, which may annoy git, svn, etc. for changes when they don't exist.
 	} else if (isnan(p_value)) {
@@ -1940,8 +1942,10 @@ static String rtos_fix(double p_value) {
 	} else if (isinf(p_value)) {
 		if (p_value > 0) {
 			return "inf";
-		} else {
+		} else if (p_compat) {
 			return "inf_neg";
+		} else {
+			return "-inf";
 		}
 	} else {
 		return rtoss(p_value);
@@ -1960,8 +1964,8 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 			p_store_string_func(p_store_string_ud, itos(p_variant.operator int64_t()));
 		} break;
 		case Variant::FLOAT: {
-			String s = rtos_fix(p_variant.operator double());
-			if (s != "inf" && s != "inf_neg" && s != "nan") {
+			String s = rtos_fix(p_variant.operator double(), p_compat);
+			if (s != "inf" && s != "-inf" && s != "nan") {
 				if (!s.contains_char('.') && !s.contains_char('e') && !s.contains_char('E')) {
 					s += ".0";
 				}
@@ -1977,7 +1981,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 		// Math types.
 		case Variant::VECTOR2: {
 			Vector2 v = p_variant;
-			p_store_string_func(p_store_string_ud, "Vector2(" + rtos_fix(v.x) + ", " + rtos_fix(v.y) + ")");
+			p_store_string_func(p_store_string_ud, "Vector2(" + rtos_fix(v.x, p_compat) + ", " + rtos_fix(v.y, p_compat) + ")");
 		} break;
 		case Variant::VECTOR2I: {
 			Vector2i v = p_variant;
@@ -1985,7 +1989,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 		} break;
 		case Variant::RECT2: {
 			Rect2 aabb = p_variant;
-			p_store_string_func(p_store_string_ud, "Rect2(" + rtos_fix(aabb.position.x) + ", " + rtos_fix(aabb.position.y) + ", " + rtos_fix(aabb.size.x) + ", " + rtos_fix(aabb.size.y) + ")");
+			p_store_string_func(p_store_string_ud, "Rect2(" + rtos_fix(aabb.position.x, p_compat) + ", " + rtos_fix(aabb.position.y, p_compat) + ", " + rtos_fix(aabb.size.x, p_compat) + ", " + rtos_fix(aabb.size.y, p_compat) + ")");
 		} break;
 		case Variant::RECT2I: {
 			Rect2i aabb = p_variant;
@@ -1993,7 +1997,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 		} break;
 		case Variant::VECTOR3: {
 			Vector3 v = p_variant;
-			p_store_string_func(p_store_string_ud, "Vector3(" + rtos_fix(v.x) + ", " + rtos_fix(v.y) + ", " + rtos_fix(v.z) + ")");
+			p_store_string_func(p_store_string_ud, "Vector3(" + rtos_fix(v.x, p_compat) + ", " + rtos_fix(v.y, p_compat) + ", " + rtos_fix(v.z, p_compat) + ")");
 		} break;
 		case Variant::VECTOR3I: {
 			Vector3i v = p_variant;
@@ -2001,7 +2005,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 		} break;
 		case Variant::VECTOR4: {
 			Vector4 v = p_variant;
-			p_store_string_func(p_store_string_ud, "Vector4(" + rtos_fix(v.x) + ", " + rtos_fix(v.y) + ", " + rtos_fix(v.z) + ", " + rtos_fix(v.w) + ")");
+			p_store_string_func(p_store_string_ud, "Vector4(" + rtos_fix(v.x, p_compat) + ", " + rtos_fix(v.y, p_compat) + ", " + rtos_fix(v.z, p_compat) + ", " + rtos_fix(v.w, p_compat) + ")");
 		} break;
 		case Variant::VECTOR4I: {
 			Vector4i v = p_variant;
@@ -2009,15 +2013,15 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 		} break;
 		case Variant::PLANE: {
 			Plane p = p_variant;
-			p_store_string_func(p_store_string_ud, "Plane(" + rtos_fix(p.normal.x) + ", " + rtos_fix(p.normal.y) + ", " + rtos_fix(p.normal.z) + ", " + rtos_fix(p.d) + ")");
+			p_store_string_func(p_store_string_ud, "Plane(" + rtos_fix(p.normal.x, p_compat) + ", " + rtos_fix(p.normal.y, p_compat) + ", " + rtos_fix(p.normal.z, p_compat) + ", " + rtos_fix(p.d, p_compat) + ")");
 		} break;
 		case Variant::AABB: {
 			AABB aabb = p_variant;
-			p_store_string_func(p_store_string_ud, "AABB(" + rtos_fix(aabb.position.x) + ", " + rtos_fix(aabb.position.y) + ", " + rtos_fix(aabb.position.z) + ", " + rtos_fix(aabb.size.x) + ", " + rtos_fix(aabb.size.y) + ", " + rtos_fix(aabb.size.z) + ")");
+			p_store_string_func(p_store_string_ud, "AABB(" + rtos_fix(aabb.position.x, p_compat) + ", " + rtos_fix(aabb.position.y, p_compat) + ", " + rtos_fix(aabb.position.z, p_compat) + ", " + rtos_fix(aabb.size.x, p_compat) + ", " + rtos_fix(aabb.size.y, p_compat) + ", " + rtos_fix(aabb.size.z, p_compat) + ")");
 		} break;
 		case Variant::QUATERNION: {
 			Quaternion quaternion = p_variant;
-			p_store_string_func(p_store_string_ud, "Quaternion(" + rtos_fix(quaternion.x) + ", " + rtos_fix(quaternion.y) + ", " + rtos_fix(quaternion.z) + ", " + rtos_fix(quaternion.w) + ")");
+			p_store_string_func(p_store_string_ud, "Quaternion(" + rtos_fix(quaternion.x, p_compat) + ", " + rtos_fix(quaternion.y, p_compat) + ", " + rtos_fix(quaternion.z, p_compat) + ", " + rtos_fix(quaternion.w, p_compat) + ")");
 		} break;
 		case Variant::TRANSFORM2D: {
 			String s = "Transform2D(";
@@ -2027,7 +2031,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 					if (i != 0 || j != 0) {
 						s += ", ";
 					}
-					s += rtos_fix(m3.columns[i][j]);
+					s += rtos_fix(m3.columns[i][j], p_compat);
 				}
 			}
 
@@ -2041,7 +2045,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 					if (i != 0 || j != 0) {
 						s += ", ";
 					}
-					s += rtos_fix(m3.rows[i][j]);
+					s += rtos_fix(m3.rows[i][j], p_compat);
 				}
 			}
 
@@ -2056,11 +2060,11 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 					if (i != 0 || j != 0) {
 						s += ", ";
 					}
-					s += rtos_fix(m3.rows[i][j]);
+					s += rtos_fix(m3.rows[i][j], p_compat);
 				}
 			}
 
-			s = s + ", " + rtos_fix(t.origin.x) + ", " + rtos_fix(t.origin.y) + ", " + rtos_fix(t.origin.z);
+			s = s + ", " + rtos_fix(t.origin.x, p_compat) + ", " + rtos_fix(t.origin.y, p_compat) + ", " + rtos_fix(t.origin.z, p_compat);
 
 			p_store_string_func(p_store_string_ud, s + ")");
 		} break;
@@ -2072,7 +2076,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 					if (i != 0 || j != 0) {
 						s += ", ";
 					}
-					s += rtos_fix(t.columns[i][j]);
+					s += rtos_fix(t.columns[i][j], p_compat);
 				}
 			}
 
@@ -2082,7 +2086,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 		// Misc types.
 		case Variant::COLOR: {
 			Color c = p_variant;
-			p_store_string_func(p_store_string_ud, "Color(" + rtos_fix(c.r) + ", " + rtos_fix(c.g) + ", " + rtos_fix(c.b) + ", " + rtos_fix(c.a) + ")");
+			p_store_string_func(p_store_string_ud, "Color(" + rtos_fix(c.r, p_compat) + ", " + rtos_fix(c.g, p_compat) + ", " + rtos_fix(c.b, p_compat) + ", " + rtos_fix(c.a, p_compat) + ")");
 		} break;
 		case Variant::STRING_NAME: {
 			String str = p_variant;
@@ -2244,8 +2248,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 				ERR_PRINT("Max recursion reached");
 				p_store_string_func(p_store_string_ud, "{}");
 			} else {
-				List<Variant> keys;
-				dict.get_key_list(&keys);
+				LocalVector<Variant> keys = dict.get_key_list();
 				keys.sort_custom<StringLikeVariantOrder>();
 
 				if (keys.is_empty()) {
@@ -2256,11 +2259,12 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 
 					p_store_string_func(p_store_string_ud, "{\n");
 
-					for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
-						write(E->get(), p_store_string_func, p_store_string_ud, p_encode_res_func, p_encode_res_ud, p_recursion_count, p_compat);
+					for (uint32_t i = 0; i < keys.size(); i++) {
+						const Variant &key = keys[i];
+						write(key, p_store_string_func, p_store_string_ud, p_encode_res_func, p_encode_res_ud, p_recursion_count, p_compat);
 						p_store_string_func(p_store_string_ud, ": ");
-						write(dict[E->get()], p_store_string_func, p_store_string_ud, p_encode_res_func, p_encode_res_ud, p_recursion_count, p_compat);
-						if (E->next()) {
+						write(dict[key], p_store_string_func, p_store_string_ud, p_encode_res_func, p_encode_res_ud, p_recursion_count, p_compat);
+						if (i + 1 < keys.size()) {
 							p_store_string_func(p_store_string_ud, ",\n");
 						} else {
 							p_store_string_func(p_store_string_ud, "\n");
@@ -2397,7 +2401,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 				if (i > 0) {
 					p_store_string_func(p_store_string_ud, ", ");
 				}
-				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i]));
+				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i], p_compat));
 			}
 
 			p_store_string_func(p_store_string_ud, ")");
@@ -2412,7 +2416,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 				if (i > 0) {
 					p_store_string_func(p_store_string_ud, ", ");
 				}
-				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i]));
+				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i], p_compat));
 			}
 
 			p_store_string_func(p_store_string_ud, ")");
@@ -2442,7 +2446,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 				if (i > 0) {
 					p_store_string_func(p_store_string_ud, ", ");
 				}
-				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].x) + ", " + rtos_fix(ptr[i].y));
+				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].x, p_compat) + ", " + rtos_fix(ptr[i].y, p_compat));
 			}
 
 			p_store_string_func(p_store_string_ud, ")");
@@ -2457,7 +2461,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 				if (i > 0) {
 					p_store_string_func(p_store_string_ud, ", ");
 				}
-				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].x) + ", " + rtos_fix(ptr[i].y) + ", " + rtos_fix(ptr[i].z));
+				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].x, p_compat) + ", " + rtos_fix(ptr[i].y, p_compat) + ", " + rtos_fix(ptr[i].z, p_compat));
 			}
 
 			p_store_string_func(p_store_string_ud, ")");
@@ -2472,7 +2476,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 				if (i > 0) {
 					p_store_string_func(p_store_string_ud, ", ");
 				}
-				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].r) + ", " + rtos_fix(ptr[i].g) + ", " + rtos_fix(ptr[i].b) + ", " + rtos_fix(ptr[i].a));
+				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].r, p_compat) + ", " + rtos_fix(ptr[i].g, p_compat) + ", " + rtos_fix(ptr[i].b, p_compat) + ", " + rtos_fix(ptr[i].a, p_compat));
 			}
 
 			p_store_string_func(p_store_string_ud, ")");
@@ -2487,7 +2491,7 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 				if (i > 0) {
 					p_store_string_func(p_store_string_ud, ", ");
 				}
-				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].x) + ", " + rtos_fix(ptr[i].y) + ", " + rtos_fix(ptr[i].z) + ", " + rtos_fix(ptr[i].w));
+				p_store_string_func(p_store_string_ud, rtos_fix(ptr[i].x, p_compat) + ", " + rtos_fix(ptr[i].y, p_compat) + ", " + rtos_fix(ptr[i].z, p_compat) + ", " + rtos_fix(ptr[i].w, p_compat));
 			}
 
 			p_store_string_func(p_store_string_ud, ")");
diff --git a/engine/core/variant/variant_parser.h b/engine/core/variant/variant_parser.h
index b0ac0717..11c9d5b3 100644
--- a/engine/core/variant/variant_parser.h
+++ b/engine/core/variant/variant_parser.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_PARSER_H
-#define VARIANT_PARSER_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/io/resource.h"
@@ -164,5 +163,3 @@ public:
 	static Error write(const Variant &p_variant, StoreStringFunc p_store_string_func, void *p_store_string_ud, EncodeResourceFunc p_encode_res_func, void *p_encode_res_ud, int p_recursion_count = 0, bool p_compat = true);
 	static Error write_to_string(const Variant &p_variant, String &r_string, EncodeResourceFunc p_encode_res_func = nullptr, void *p_encode_res_ud = nullptr, bool p_compat = true);
 };
-
-#endif // VARIANT_PARSER_H
diff --git a/engine/core/variant/variant_setget.cpp b/engine/core/variant/variant_setget.cpp
index a50f213b..8175c904 100644
--- a/engine/core/variant/variant_setget.cpp
+++ b/engine/core/variant/variant_setget.cpp
@@ -768,8 +768,7 @@ struct VariantIndexedSetGet_String {
 			*oob = true;
 			return;
 		}
-		char32_t result = (*VariantGetInternalPtr<String>::get_ptr(base))[index];
-		*value = String(&result, 1);
+		*value = String::chr((*VariantGetInternalPtr<String>::get_ptr(base))[index]);
 		*oob = false;
 	}
 	static void ptr_get(const void *base, int64_t index, void *member) {
@@ -779,8 +778,7 @@ struct VariantIndexedSetGet_String {
 			index += v.length();
 		}
 		OOB_TEST(index, v.length());
-		char32_t c = v[index];
-		PtrToArg<String>::encode(String(&c, 1), member);
+		PtrToArg<String>::encode(String::chr(v[index]), member);
 	}
 	static void set(Variant *base, int64_t index, const Variant *value, bool *valid, bool *oob) {
 		if (value->get_type() != Variant::STRING) {
@@ -1288,11 +1286,9 @@ Variant Variant::get(const Variant &p_index, bool *r_valid, VariantGetError *err
 void Variant::get_property_list(List<PropertyInfo> *p_list) const {
 	if (type == DICTIONARY) {
 		const Dictionary *dic = reinterpret_cast<const Dictionary *>(_data._mem);
-		List<Variant> keys;
-		dic->get_key_list(&keys);
-		for (const Variant &E : keys) {
-			if (E.is_string()) {
-				p_list->push_back(PropertyInfo(dic->get_valid(E).get_type(), E));
+		for (const KeyValue<Variant, Variant> &kv : *dic) {
+			if (kv.key.is_string()) {
+				p_list->push_back(PropertyInfo(dic->get_valid(kv.key).get_type(), kv.key));
 			}
 		}
 	} else if (type == OBJECT) {
@@ -1383,8 +1379,7 @@ bool Variant::iter_init(Variant &r_iter, bool &valid) const {
 #endif
 			Callable::CallError ce;
 			ce.error = Callable::CallError::CALL_OK;
-			Array ref;
-			ref.push_back(r_iter);
+			Array ref = { r_iter };
 			Variant vref = ref;
 			const Variant *refp[] = { &vref };
 			Variant ret = _get_obj().obj->callp(CoreStringName(_iter_init), refp, 1, ce);
@@ -1618,8 +1613,7 @@ bool Variant::iter_next(Variant &r_iter, bool &valid) const {
 #endif
 			Callable::CallError ce;
 			ce.error = Callable::CallError::CALL_OK;
-			Array ref;
-			ref.push_back(r_iter);
+			Array ref = { r_iter };
 			Variant vref = ref;
 			const Variant *refp[] = { &vref };
 			Variant ret = _get_obj().obj->callp(CoreStringName(_iter_next), refp, 1, ce);
diff --git a/engine/core/variant/variant_setget.h b/engine/core/variant/variant_setget.h
index dc06c3f3..67049dae 100644
--- a/engine/core/variant/variant_setget.h
+++ b/engine/core/variant/variant_setget.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_SETGET_H
-#define VARIANT_SETGET_H
+#pragma once
 
 #include "variant.h"
 
@@ -359,5 +358,3 @@ SETGET_NUMBER_STRUCT_FUNC(Color, double, v, set_v, get_v)
 SETGET_NUMBER_STRUCT_FUNC(Color, double, ok_hsl_h, set_ok_hsl_h, get_ok_hsl_h)
 SETGET_NUMBER_STRUCT_FUNC(Color, double, ok_hsl_s, set_ok_hsl_s, get_ok_hsl_s)
 SETGET_NUMBER_STRUCT_FUNC(Color, double, ok_hsl_l, set_ok_hsl_l, get_ok_hsl_l)
-
-#endif // VARIANT_SETGET_H
diff --git a/engine/core/variant/variant_utility.cpp b/engine/core/variant/variant_utility.cpp
index a53b5660..b07cc2a8 100644
--- a/engine/core/variant/variant_utility.cpp
+++ b/engine/core/variant/variant_utility.cpp
@@ -244,7 +244,7 @@ Variant VariantUtilityFunctions::abs(const Variant &x, Callable::CallError &r_er
 	r_error.error = Callable::CallError::CALL_OK;
 	switch (x.get_type()) {
 		case Variant::INT: {
-			return ABS(VariantInternalAccessor<int64_t>::get(&x));
+			return Math::abs(VariantInternalAccessor<int64_t>::get(&x));
 		} break;
 		case Variant::FLOAT: {
 			return Math::absd(VariantInternalAccessor<double>::get(&x));
@@ -281,7 +281,7 @@ double VariantUtilityFunctions::absf(double x) {
 }
 
 int64_t VariantUtilityFunctions::absi(int64_t x) {
-	return ABS(x);
+	return Math::abs(x);
 }
 
 Variant VariantUtilityFunctions::sign(const Variant &x, Callable::CallError &r_error) {
@@ -1678,7 +1678,7 @@ template <typename T>
 static void register_utility_function(const String &p_name, const Vector<String> &argnames) {
 	String name = p_name;
 	if (name.begins_with("_")) {
-		name = name.substr(1, name.length() - 1);
+		name = name.substr(1);
 	}
 	StringName sname = name;
 	ERR_FAIL_COND(utility_function_table.has(sname));
diff --git a/engine/core/variant/variant_utility.h b/engine/core/variant/variant_utility.h
index a6533696..2e9a8faa 100644
--- a/engine/core/variant/variant_utility.h
+++ b/engine/core/variant/variant_utility.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_UTILITY_H
-#define VARIANT_UTILITY_H
+#pragma once
 
 #include "variant.h"
 
@@ -154,5 +153,3 @@ struct VariantUtilityFunctions {
 	static RID rid_from_int64(uint64_t p_base);
 	static bool is_same(const Variant &p_a, const Variant &p_b);
 };
-
-#endif // VARIANT_UTILITY_H
diff --git a/engine/core/version.h b/engine/core/version.h
index 18a97cad..03148d00 100644
--- a/engine/core/version.h
+++ b/engine/core/version.h
@@ -28,10 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VERSION_H
-#define VERSION_H
+#pragma once
 
-#include "core/version_generated.gen.h"
+#include "core/version_generated.gen.h" // IWYU pragma: export
 
 #include <stdint.h>
 
@@ -48,39 +47,65 @@
 // Defines the main "branch" version. Patch versions in this branch should be
 // forward-compatible.
 // Example: "3.1"
-#define VERSION_BRANCH _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR)
-#if VERSION_PATCH
+#define GODOT_VERSION_BRANCH _MKSTR(GODOT_VERSION_MAJOR) "." _MKSTR(GODOT_VERSION_MINOR)
+#if GODOT_VERSION_PATCH
 // Example: "3.1.4"
-#define VERSION_NUMBER VERSION_BRANCH "." _MKSTR(VERSION_PATCH)
+#define GODOT_VERSION_NUMBER GODOT_VERSION_BRANCH "." _MKSTR(GODOT_VERSION_PATCH)
 #else // patch is 0, we don't include it in the "pretty" version number.
 // Example: "3.1" instead of "3.1.0"
-#define VERSION_NUMBER VERSION_BRANCH
-#endif // VERSION_PATCH
+#define GODOT_VERSION_NUMBER GODOT_VERSION_BRANCH
+#endif // GODOT_VERSION_PATCH
 
 // Version number encoded as hexadecimal int with one byte for each number,
 // for easy comparison from code.
 // Example: 3.1.4 will be 0x030104, making comparison easy from script.
-#define VERSION_HEX 0x10000 * VERSION_MAJOR + 0x100 * VERSION_MINOR + VERSION_PATCH
+#define GODOT_VERSION_HEX 0x10000 * GODOT_VERSION_MAJOR + 0x100 * GODOT_VERSION_MINOR + GODOT_VERSION_PATCH
 
 // Describes the full configuration of that Godot version, including the version number,
-// the status (beta, stable, etc.) and potential module-specific features (e.g. mono).
-// Example: "3.1.4.stable.mono"
-#define VERSION_FULL_CONFIG VERSION_NUMBER "." VERSION_STATUS VERSION_MODULE_CONFIG
+// the status (beta, stable, etc.), potential module-specific features (e.g. mono)
+// and double-precision status.
+// Example: "3.1.4.stable.mono.double"
+#ifdef REAL_T_IS_DOUBLE
+#define GODOT_VERSION_FULL_CONFIG GODOT_VERSION_NUMBER "." GODOT_VERSION_STATUS GODOT_VERSION_MODULE_CONFIG ".double"
+#else
+#define GODOT_VERSION_FULL_CONFIG GODOT_VERSION_NUMBER "." GODOT_VERSION_STATUS GODOT_VERSION_MODULE_CONFIG
+#endif
 
-// Similar to VERSION_FULL_CONFIG, but also includes the (potentially custom) VERSION_BUILD
+// Similar to GODOT_VERSION_FULL_CONFIG, but also includes the (potentially custom) GODOT_VERSION_BUILD
 // description (e.g. official, custom_build, etc.).
-// Example: "3.1.4.stable.mono.official"
-#define VERSION_FULL_BUILD VERSION_FULL_CONFIG "." VERSION_BUILD
+// Example: "3.1.4.stable.mono.double.official"
+#define GODOT_VERSION_FULL_BUILD GODOT_VERSION_FULL_CONFIG "." GODOT_VERSION_BUILD
 
 // Same as above, but prepended with Godot's name and a cosmetic "v" for "version".
-// Example: "Godot v3.1.4.stable.official.mono"
-#define VERSION_FULL_NAME VERSION_NAME " v" VERSION_FULL_BUILD
+// Example: "Godot v3.1.4.stable.official.mono.double"
+#define GODOT_VERSION_FULL_NAME GODOT_VERSION_NAME " v" GODOT_VERSION_FULL_BUILD
 
 // Git commit hash, generated at build time in `core/version_hash.gen.cpp`.
-extern const char *const VERSION_HASH;
+extern const char *const GODOT_VERSION_HASH;
 
 // Git commit date UNIX timestamp (in seconds), generated at build time in `core/version_hash.gen.cpp`.
 // Set to 0 if unknown.
-extern const uint64_t VERSION_TIMESTAMP;
+extern const uint64_t GODOT_VERSION_TIMESTAMP;
 
-#endif // VERSION_H
+#ifndef DISABLE_DEPRECATED
+// Compatibility with pre-4.5 modules.
+#define VERSION_SHORT_NAME GODOT_VERSION_SHORT_NAME
+#define VERSION_NAME GODOT_VERSION_NAME
+#define VERSION_MAJOR GODOT_VERSION_MAJOR
+#define VERSION_MINOR GODOT_VERSION_MINOR
+#define VERSION_PATCH GODOT_VERSION_PATCH
+#define VERSION_STATUS GODOT_VERSION_STATUS
+#define VERSION_BUILD GODOT_VERSION_BUILD
+#define VERSION_MODULE_CONFIG GODOT_VERSION_MODULE_CONFIG
+#define VERSION_WEBSITE GODOT_VERSION_WEBSITE
+#define VERSION_DOCS_BRANCH GODOT_VERSION_DOCS_BRANCH
+#define VERSION_DOCS_URL GODOT_VERSION_DOCS_URL
+#define VERSION_BRANCH GODOT_VERSION_BRANCH
+#define VERSION_NUMBER GODOT_VERSION_NUMBER
+#define VERSION_HEX GODOT_VERSION_HEX
+#define VERSION_FULL_CONFIG GODOT_VERSION_FULL_CONFIG
+#define VERSION_FULL_BUILD GODOT_VERSION_FULL_BUILD
+#define VERSION_FULL_NAME GODOT_VERSION_FULL_NAME
+#define VERSION_HASH GODOT_VERSION_HASH
+#define VERSION_TIMESTAMP GODOT_VERSION_TIMESTAMP
+#endif // DISABLE_DEPRECATED
diff --git a/engine/doc/classes/@GlobalScope.xml b/engine/doc/classes/@GlobalScope.xml
index 38b1ec35..eb071836 100644
--- a/engine/doc/classes/@GlobalScope.xml
+++ b/engine/doc/classes/@GlobalScope.xml
@@ -2926,7 +2926,7 @@
 			Hints that a property is an [Array] with the stored type specified in the hint string.
 		</constant>
 		<constant name="PROPERTY_HINT_DICTIONARY_TYPE" value="38" enum="PropertyHint">
-			Hints that a property is a [Dictionary] with the stored types specified in the hint string.
+			Hints that a property is a [Dictionary] with the stored types specified in the hint string. The hint string contains the key and value types separated by a semicolon (e.g. [code]"int;String"[/code]).
 		</constant>
 		<constant name="PROPERTY_HINT_LOCALE_ID" value="32" enum="PropertyHint">
 			Hints that a string property is a locale code. Editing it will show a locale dialog for picking language and country.
diff --git a/engine/doc/classes/AcceptDialog.xml b/engine/doc/classes/AcceptDialog.xml
index 39236442..ccbe2ddd 100644
--- a/engine/doc/classes/AcceptDialog.xml
+++ b/engine/doc/classes/AcceptDialog.xml
@@ -73,8 +73,10 @@
 		</member>
 		<member name="exclusive" type="bool" setter="set_exclusive" getter="is_exclusive" overrides="Window" default="true" />
 		<member name="keep_title_visible" type="bool" setter="set_keep_title_visible" getter="get_keep_title_visible" overrides="Window" default="true" />
-		<member name="ok_button_text" type="String" setter="set_ok_button_text" getter="get_ok_button_text" default="&quot;OK&quot;">
-			The text displayed by the OK button (see [method get_ok_button]).
+		<member name="maximize_disabled" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
+		<member name="minimize_disabled" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
+		<member name="ok_button_text" type="String" setter="set_ok_button_text" getter="get_ok_button_text" default="&quot;&quot;">
+			The text displayed by the OK button (see [method get_ok_button]). If empty, a default text will be used.
 		</member>
 		<member name="title" type="String" setter="set_title" getter="get_title" overrides="Window" default="&quot;Alert!&quot;" />
 		<member name="transient" type="bool" setter="set_transient" getter="is_transient" overrides="Window" default="true" />
diff --git a/engine/doc/classes/AnimatedSprite2D.xml b/engine/doc/classes/AnimatedSprite2D.xml
index cc1e9117..487124c9 100644
--- a/engine/doc/classes/AnimatedSprite2D.xml
+++ b/engine/doc/classes/AnimatedSprite2D.xml
@@ -54,7 +54,7 @@
 			<param index="0" name="frame" type="int" />
 			<param index="1" name="progress" type="float" />
 			<description>
-				Sets [member frame] the [member frame_progress] to the given values. Unlike setting [member frame], this method does not reset the [member frame_progress] to [code]0.0[/code] implicitly.
+				Sets [member frame] and [member frame_progress] to the given values. Unlike setting [member frame], this method does not reset the [member frame_progress] to [code]0.0[/code] implicitly.
 				[b]Example:[/b] Change the animation while keeping the same [member frame] and [member frame_progress]:
 				[codeblocks]
 				[gdscript]
diff --git a/engine/doc/classes/AnimatedSprite3D.xml b/engine/doc/classes/AnimatedSprite3D.xml
index 1b1f58e5..9484a082 100644
--- a/engine/doc/classes/AnimatedSprite3D.xml
+++ b/engine/doc/classes/AnimatedSprite3D.xml
@@ -53,7 +53,7 @@
 			<param index="0" name="frame" type="int" />
 			<param index="1" name="progress" type="float" />
 			<description>
-				Sets [member frame] the [member frame_progress] to the given values. Unlike setting [member frame], this method does not reset the [member frame_progress] to [code]0.0[/code] implicitly.
+				Sets [member frame] and [member frame_progress] to the given values. Unlike setting [member frame], this method does not reset the [member frame_progress] to [code]0.0[/code] implicitly.
 				[b]Example:[/b] Change the animation while keeping the same [member frame] and [member frame_progress]:
 				[codeblocks]
 				[gdscript]
diff --git a/engine/doc/classes/AnimationMixer.xml b/engine/doc/classes/AnimationMixer.xml
index 36cb6757..e74b5393 100644
--- a/engine/doc/classes/AnimationMixer.xml
+++ b/engine/doc/classes/AnimationMixer.xml
@@ -135,7 +135,7 @@
 				    move_and_slide()
 				[/gdscript]
 				[/codeblocks]
-				If [member root_motion_local] is [code]true[/code], return the pre-multiplied translation value with the inverted rotation.
+				If [member root_motion_local] is [code]true[/code], returns the pre-multiplied translation value with the inverted rotation.
 				In this case, the code can be written as follows:
 				[codeblocks]
 				[gdscript]
diff --git a/engine/doc/classes/AnimationPlayer.xml b/engine/doc/classes/AnimationPlayer.xml
index 9aeb4b71..7490833e 100644
--- a/engine/doc/classes/AnimationPlayer.xml
+++ b/engine/doc/classes/AnimationPlayer.xml
@@ -90,7 +90,7 @@
 		<method name="has_section" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if an animation is currently playing with section.
+				Returns [code]true[/code] if an animation is currently playing with a section.
 			</description>
 		</method>
 		<method name="is_playing" qualifiers="const">
@@ -208,7 +208,7 @@
 		<method name="reset_section">
 			<return type="void" />
 			<description>
-				Resets the current section if section is set.
+				Resets the current section. Does nothing if a section has not been set.
 			</description>
 		</method>
 		<method name="seek">
diff --git a/engine/doc/classes/Array.xml b/engine/doc/classes/Array.xml
index 3ffb2c98..3dbf34f5 100644
--- a/engine/doc/classes/Array.xml
+++ b/engine/doc/classes/Array.xml
@@ -488,7 +488,7 @@
 			<param index="0" name="position" type="int" />
 			<param index="1" name="value" type="Variant" />
 			<description>
-				Inserts a new element ([param value]) at a given index ([param position]) in the array. [param position] should be between [code]0[/code] and the array's [method size].
+				Inserts a new element ([param value]) at a given index ([param position]) in the array. [param position] should be between [code]0[/code] and the array's [method size]. If negative, [param position] is considered relative to the end of the array.
 				Returns [constant OK] on success, or one of the other [enum Error] constants if this method fails.
 				[b]Note:[/b] Every element's index after [param position] needs to be shifted forward, which may have a noticeable performance cost, especially on larger arrays.
 			</description>
@@ -663,7 +663,7 @@
 			<return type="void" />
 			<param index="0" name="position" type="int" />
 			<description>
-				Removes the element from the array at the given index ([param position]). If the index is out of bounds, this method fails.
+				Removes the element from the array at the given index ([param position]). If the index is out of bounds, this method fails. If the index is negative, [param position] is considered relative to the end of the array.
 				If you need to return the removed element, use [method pop_at]. To remove an element by value, use [method erase] instead.
 				[b]Note:[/b] This method shifts every element's index after [param position] back, which may have a noticeable performance cost, especially on larger arrays.
 				[b]Note:[/b] The [param position] cannot be negative. To remove an element relative to the end of the array, use [code]arr.remove_at(arr.size() - (i + 1))[/code]. To remove the last element from the array, use [code]arr.resize(arr.size() - 1)[/code].
@@ -674,7 +674,7 @@
 			<param index="0" name="size" type="int" />
 			<description>
 				Sets the array's number of elements to [param size]. If [param size] is smaller than the array's current size, the elements at the end are removed. If [param size] is greater, new default elements (usually [code]null[/code]) are added, depending on the array's type.
-				Returns [constant OK] on success, or one of the other [enum Error] constants if this method fails.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_LOCKED] if the array is read-only, [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 				[b]Note:[/b] Calling this method once and assigning the new values is faster than calling [method append] for every new element.
 			</description>
 		</method>
diff --git a/engine/doc/classes/AudioEffectPhaser.xml b/engine/doc/classes/AudioEffectPhaser.xml
index 2057202c..6e845ff3 100644
--- a/engine/doc/classes/AudioEffectPhaser.xml
+++ b/engine/doc/classes/AudioEffectPhaser.xml
@@ -12,7 +12,7 @@
 	</tutorials>
 	<members>
 		<member name="depth" type="float" setter="set_depth" getter="get_depth" default="1.0">
-			Governs how high the filter frequencies sweep. Low value will primarily affect bass frequencies. High value can sweep high into the treble. Value can range from 0.1 to 4.
+			Determines how high the filter frequencies sweep. Low value will primarily affect bass frequencies. High value can sweep high into the treble. Value can range from [code]0.1[/code] to [code]4.0[/code].
 		</member>
 		<member name="feedback" type="float" setter="set_feedback" getter="get_feedback" default="0.7">
 			Output percent of modified sound. Value can range from 0.1 to 0.9.
diff --git a/engine/doc/classes/AudioStreamPlayer3D.xml b/engine/doc/classes/AudioStreamPlayer3D.xml
index 8c8b6b40..718f0e14 100644
--- a/engine/doc/classes/AudioStreamPlayer3D.xml
+++ b/engine/doc/classes/AudioStreamPlayer3D.xml
@@ -94,7 +94,9 @@
 			The maximum number of sounds this node can play at the same time. Playing additional sounds after this value is reached will cut off the oldest sounds.
 		</member>
 		<member name="panning_strength" type="float" setter="set_panning_strength" getter="get_panning_strength" default="1.0">
-			Scales the panning strength for this node by multiplying the base [member ProjectSettings.audio/general/3d_panning_strength] with this factor. Higher values will pan audio from left to right more dramatically than lower values.
+			Scales the panning strength for this node by multiplying the base [member ProjectSettings.audio/general/3d_panning_strength] by this factor. If the product is [code]0.0[/code] then stereo panning is disabled and the volume is the same for all channels. If the product is [code]1.0[/code] then one of the channels will be muted when the sound is located exactly to the left (or right) of the listener.
+			Two speaker stereo arrangements implement the [url=https://webaudio.github.io/web-audio-api/#stereopanner-algorithm]WebAudio standard for StereoPannerNode Panning[/url] where the volume is cosine of half the azimuth angle to the ear.
+			For other speaker arrangements such as the 5.1 and 7.1 the SPCAP (Speaker-Placement Correction Amplitude) algorithm is implemented.
 		</member>
 		<member name="pitch_scale" type="float" setter="set_pitch_scale" getter="get_pitch_scale" default="1.0">
 			The pitch and the tempo of the audio, as a multiplier of the audio sample's sample rate.
diff --git a/engine/doc/classes/BaseMaterial3D.xml b/engine/doc/classes/BaseMaterial3D.xml
index e23bd19d..76f9c20f 100644
--- a/engine/doc/classes/BaseMaterial3D.xml
+++ b/engine/doc/classes/BaseMaterial3D.xml
@@ -215,7 +215,7 @@
 			Texture that specifies how much surface emits light at a given point.
 		</member>
 		<member name="fixed_size" type="bool" setter="set_flag" getter="get_flag" default="false">
-			If [code]true[/code], the object is rendered at the same size regardless of distance.
+			If [code]true[/code], the object is rendered at the same size regardless of distance. The object's size on screen is the same as if the camera was [code]1.0[/code] units away from the object's origin, regardless of the actual distance from the camera. The [Camera3D]'s field of view (or [member Camera3D.size] when in orthogonal/frustum mode) still affects the size the object is drawn at.
 		</member>
 		<member name="grow" type="bool" setter="set_grow_enabled" getter="is_grow_enabled" default="false">
 			If [code]true[/code], enables the vertex grow setting. This can be used to create mesh-based outlines using a second material pass and its [member cull_mode] set to [constant CULL_FRONT]. See also [member grow_amount].
diff --git a/engine/doc/classes/BoneAttachment3D.xml b/engine/doc/classes/BoneAttachment3D.xml
index c66eb159..1e2f3089 100644
--- a/engine/doc/classes/BoneAttachment3D.xml
+++ b/engine/doc/classes/BoneAttachment3D.xml
@@ -18,7 +18,7 @@
 		<method name="get_skeleton">
 			<return type="Skeleton3D" />
 			<description>
-				Get parent or external [Skeleton3D] node if found.
+				Returns the parent or external [Skeleton3D] node if it exists, otherwise returns [code]null[/code].
 			</description>
 		</method>
 		<method name="get_use_external_skeleton" qualifiers="const">
diff --git a/engine/doc/classes/Button.xml b/engine/doc/classes/Button.xml
index 5103134f..cc13cb54 100644
--- a/engine/doc/classes/Button.xml
+++ b/engine/doc/classes/Button.xml
@@ -46,6 +46,9 @@
 		<member name="autowrap_mode" type="int" setter="set_autowrap_mode" getter="get_autowrap_mode" enum="TextServer.AutowrapMode" default="0">
 			If set to something other than [constant TextServer.AUTOWRAP_OFF], the text gets wrapped inside the node's bounding rectangle.
 		</member>
+		<member name="autowrap_trim_flags" type="int" setter="set_autowrap_trim_flags" getter="get_autowrap_trim_flags" enum="TextServer.LineBreakFlag" is_bitfield="true" default="128">
+			Autowrap space trimming flags. See [constant TextServer.BREAK_TRIM_START_EDGE_SPACES] and [constant TextServer.BREAK_TRIM_END_EDGE_SPACES] for more info.
+		</member>
 		<member name="clip_text" type="bool" setter="set_clip_text" getter="get_clip_text" default="false">
 			If [code]true[/code], text that is too large to fit the button is clipped horizontally. If [code]false[/code], the button will always be wide enough to hold the text. The text is not vertically clipped, and the button's height is not affected by this property.
 		</member>
diff --git a/engine/doc/classes/Camera2D.xml b/engine/doc/classes/Camera2D.xml
index da98e6c2..714288de 100644
--- a/engine/doc/classes/Camera2D.xml
+++ b/engine/doc/classes/Camera2D.xml
@@ -142,6 +142,9 @@
 		<member name="limit_bottom" type="int" setter="set_limit" getter="get_limit" default="10000000">
 			Bottom scroll limit in pixels. The camera stops moving when reaching this value, but [member offset] can push the view past the limit.
 		</member>
+		<member name="limit_enabled" type="bool" setter="set_limit_enabled" getter="is_limit_enabled" default="true">
+			If [code]true[/code], the limits will be enabled. Disabling this will allow the camera to focus anywhere, when the four [code]limit_*[/code] properties will not work.
+		</member>
 		<member name="limit_left" type="int" setter="set_limit" getter="get_limit" default="-10000000">
 			Left scroll limit in pixels. The camera stops moving when reaching this value, but [member offset] can push the view past the limit.
 		</member>
diff --git a/engine/doc/classes/CameraServer.xml b/engine/doc/classes/CameraServer.xml
index f30edb1d..c9a423ef 100644
--- a/engine/doc/classes/CameraServer.xml
+++ b/engine/doc/classes/CameraServer.xml
@@ -45,6 +45,12 @@
 			</description>
 		</method>
 	</methods>
+	<members>
+		<member name="monitoring_feeds" type="bool" setter="set_monitoring_feeds" getter="is_monitoring_feeds" default="false">
+			If [code]true[/code], the server is actively monitoring available camera feeds.
+			This has a performance cost, so only set it to [code]true[/code] when you're actively accessing the camera.
+		</member>
+	</members>
 	<signals>
 		<signal name="camera_feed_added">
 			<param index="0" name="id" type="int" />
diff --git a/engine/doc/classes/CanvasItem.xml b/engine/doc/classes/CanvasItem.xml
index 41c1808b..3e80ef28 100644
--- a/engine/doc/classes/CanvasItem.xml
+++ b/engine/doc/classes/CanvasItem.xml
@@ -416,19 +416,20 @@
 		<method name="force_update_transform">
 			<return type="void" />
 			<description>
-				Forces the transform to update. Transform changes in physics are not instant for performance reasons. Transforms are accumulated and then set. Use this if you need an up-to-date transform when doing physics operations.
+				Forces the node's transform to update. Fails if the node is not inside the tree. See also [method get_transform].
+				[b]Note:[/b] For performance reasons, transform changes are usually accumulated and applied [i]once[/i] at the end of the frame. The update propagates through [CanvasItem] children, as well. Therefore, use this method only when you need an up-to-date transform (such as during physics operations).
 			</description>
 		</method>
 		<method name="get_canvas" qualifiers="const">
 			<return type="RID" />
 			<description>
-				Returns the [RID] of the [World2D] canvas where this item is in.
+				Returns the [RID] of the [World2D] canvas where this node is registered to, used by the [RenderingServer].
 			</description>
 		</method>
 		<method name="get_canvas_item" qualifiers="const">
 			<return type="RID" />
 			<description>
-				Returns the canvas item RID used by [RenderingServer] for this item.
+				Returns the internal canvas item [RID] used by the [RenderingServer] for this node.
 			</description>
 		</method>
 		<method name="get_canvas_layer_node" qualifiers="const">
@@ -440,13 +441,13 @@
 		<method name="get_canvas_transform" qualifiers="const">
 			<return type="Transform2D" />
 			<description>
-				Returns the transform from the coordinate system of the canvas, this item is in, to the [Viewport]s coordinate system.
+				Returns the transform of this node, converted from its registered canvas's coordinate system to its viewport's coordinate system. See also [method Node.get_viewport].
 			</description>
 		</method>
 		<method name="get_global_mouse_position" qualifiers="const">
 			<return type="Vector2" />
 			<description>
-				Returns the mouse's position in the [CanvasLayer] that this [CanvasItem] is in using the coordinate system of the [CanvasLayer].
+				Returns mouse cursor's global position relative to the [CanvasLayer] that contains this node.
 				[b]Note:[/b] For screen-space coordinates (e.g. when using a non-embedded [Popup]), you can use [method DisplayServer.mouse_get_position].
 			</description>
 		</method>
@@ -485,32 +486,33 @@
 		<method name="get_transform" qualifiers="const">
 			<return type="Transform2D" />
 			<description>
-				Returns the transform matrix of this item.
+				Returns the transform matrix of this [CanvasItem].
 			</description>
 		</method>
 		<method name="get_viewport_rect" qualifiers="const">
 			<return type="Rect2" />
 			<description>
-				Returns the viewport's boundaries as a [Rect2].
+				Returns this node's viewport boundaries as a [Rect2]. See also [method Node.get_viewport].
 			</description>
 		</method>
 		<method name="get_viewport_transform" qualifiers="const">
 			<return type="Transform2D" />
 			<description>
-				Returns the transform from the coordinate system of the canvas, this item is in, to the [Viewport]s embedders coordinate system.
+				Returns the transform of this node, converted from its registered canvas's coordinate system to its viewport embedder's coordinate system. See also [method Viewport.get_final_transform] and [method Node.get_viewport].
 			</description>
 		</method>
 		<method name="get_visibility_layer_bit" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="layer" type="int" />
 			<description>
-				Returns an individual bit on the rendering visibility layer.
+				Returns [code]true[/code] if the layer at the given index is set in [member visibility_layer].
 			</description>
 		</method>
 		<method name="get_world_2d" qualifiers="const">
 			<return type="World2D" />
 			<description>
-				Returns the [World2D] where this item is in.
+				Returns the [World2D] this node is registered to.
+				Usually, this is the same as this node's viewport (see [method Node.get_viewport] and [method Viewport.find_world_2d]).
 			</description>
 		</method>
 		<method name="hide">
@@ -522,13 +524,13 @@
 		<method name="is_local_transform_notification_enabled" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if local transform notifications are communicated to children.
+				Returns [code]true[/code] if the node receives [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] whenever its local transform changes. This is enabled with [method set_notify_local_transform].
 			</description>
 		</method>
 		<method name="is_transform_notification_enabled" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if global transform notifications are communicated to children.
+				Returns [code]true[/code] if the node receives [constant NOTIFICATION_TRANSFORM_CHANGED] whenever its global transform changes. This is enabled with [method set_notify_transform].
 			</description>
 		</method>
 		<method name="is_visible_in_tree" qualifiers="const">
@@ -554,14 +556,13 @@
 			<return type="InputEvent" />
 			<param index="0" name="event" type="InputEvent" />
 			<description>
-				Transformations issued by [param event]'s inputs are applied in local space instead of global space.
+				Returns a copy of the given [param event] with its coordinates converted from global space to this [CanvasItem]'s local space. If not possible, returns the same [InputEvent] unchanged.
 			</description>
 		</method>
 		<method name="move_to_front">
 			<return type="void" />
 			<description>
-				Moves this node to display on top of its siblings.
-				Internally, the node is moved to the bottom of parent's child list. The method has no effect on nodes without a parent.
+				Moves this node below its siblings, usually causing the node to draw on top of its siblings. Does nothing if this node does not have a parent. See also [method Node.move_child].
 			</description>
 		</method>
 		<method name="queue_redraw">
@@ -584,14 +585,16 @@
 			<return type="void" />
 			<param index="0" name="enable" type="bool" />
 			<description>
-				If [param enable] is [code]true[/code], this node will receive [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] when its local transform changes.
+				If [code]true[/code], the node will receive [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] whenever its local transform changes.
+				[b]Note:[/b] Many canvas items such as [Bone2D] or [CollisionShape2D] automatically enable this in order to function correctly.
 			</description>
 		</method>
 		<method name="set_notify_transform">
 			<return type="void" />
 			<param index="0" name="enable" type="bool" />
 			<description>
-				If [param enable] is [code]true[/code], this node will receive [constant NOTIFICATION_TRANSFORM_CHANGED] when its global transform changes.
+				If [code]true[/code], the node will receive [constant NOTIFICATION_TRANSFORM_CHANGED] whenever global transform changes.
+				[b]Note:[/b] Many canvas items such as [Camera2D] or [Light2D] automatically enable this in order to function correctly.
 			</description>
 		</method>
 		<method name="set_visibility_layer_bit">
@@ -605,14 +608,15 @@
 		<method name="show">
 			<return type="void" />
 			<description>
-				Show the [CanvasItem] if it's currently hidden. This is equivalent to setting [member visible] to [code]true[/code]. For controls that inherit [Popup], the correct way to make them visible is to call one of the multiple [code]popup*()[/code] functions instead.
+				Show the [CanvasItem] if it's currently hidden. This is equivalent to setting [member visible] to [code]true[/code].
+				[b]Note:[/b] For controls that inherit [Popup], the correct way to make them visible is to call one of the multiple [code]popup*()[/code] functions instead.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="clip_children" type="int" setter="set_clip_children_mode" getter="get_clip_children_mode" enum="CanvasItem.ClipChildrenMode" default="0">
-			Allows the current node to clip child nodes, essentially acting as a mask.
-			[b]Note:[/b] Clipping nodes cannot be nested or placed within [CanvasGroup]s. If an ancestor of this node clips its children or is a [CanvasGroup], then this node's clip mode should be set to [constant CLIP_CHILDREN_DISABLED] to avoid unexpected behavior.
+			The mode in which this node clips its children, acting as a mask.
+			[b]Note:[/b] Clipping nodes cannot be nested or placed within a [CanvasGroup]. If an ancestor of this node clips its children or is a [CanvasGroup], then this node's clip mode should be set to [constant CLIP_CHILDREN_DISABLED] to avoid unexpected behavior.
 		</member>
 		<member name="light_mask" type="int" setter="set_light_mask" getter="get_light_mask" default="1">
 			The rendering layers in which this [CanvasItem] responds to [Light2D] nodes.
@@ -625,22 +629,22 @@
 		</member>
 		<member name="self_modulate" type="Color" setter="set_self_modulate" getter="get_self_modulate" default="Color(1, 1, 1, 1)">
 			The color applied to this [CanvasItem]. This property does [b]not[/b] affect child [CanvasItem]s, unlike [member modulate] which affects both the node itself and its children.
-			[b]Note:[/b] Internal children (e.g. sliders in [ColorPicker] or tab bar in [TabContainer]) are also not affected by this property (see [code]include_internal[/code] parameter of [method Node.get_child] and other similar methods).
+			[b]Note:[/b] Internal children are also not affected by this property (see the [code]include_internal[/code] parameter in [method Node.add_child]). For built-in nodes this includes sliders in [ColorPicker], and the tab bar in [TabContainer].
 		</member>
 		<member name="show_behind_parent" type="bool" setter="set_draw_behind_parent" getter="is_draw_behind_parent_enabled" default="false">
-			If [code]true[/code], the object draws behind its parent.
+			If [code]true[/code], this node draws behind its parent.
 		</member>
 		<member name="texture_filter" type="int" setter="set_texture_filter" getter="get_texture_filter" enum="CanvasItem.TextureFilter" default="0">
-			The texture filtering mode to use on this [CanvasItem].
+			The filtering mode used to render this [CanvasItem]'s texture(s).
 		</member>
 		<member name="texture_repeat" type="int" setter="set_texture_repeat" getter="get_texture_repeat" enum="CanvasItem.TextureRepeat" default="0">
-			The texture repeating mode to use on this [CanvasItem].
+			The repeating mode used to render this [CanvasItem]'s texture(s).
 		</member>
 		<member name="top_level" type="bool" setter="set_as_top_level" getter="is_set_as_top_level" default="false">
 			If [code]true[/code], this [CanvasItem] will [i]not[/i] inherit its transform from parent [CanvasItem]s. Its draw order will also be changed to make it draw on top of other [CanvasItem]s that do not have [member top_level] set to [code]true[/code]. The [CanvasItem] will effectively act as if it was placed as a child of a bare [Node].
 		</member>
 		<member name="use_parent_material" type="bool" setter="set_use_parent_material" getter="get_use_parent_material" default="false">
-			If [code]true[/code], the parent [CanvasItem]'s [member material] property is used as this one's material.
+			If [code]true[/code], the parent [CanvasItem]'s [member material] is used as this node's material.
 		</member>
 		<member name="visibility_layer" type="int" setter="set_visibility_layer" getter="get_visibility_layer" default="1">
 			The rendering layer in which this [CanvasItem] is rendered by [Viewport] nodes. A [Viewport] will render a [CanvasItem] if it and all its parents share a layer with the [Viewport]'s canvas cull mask.
@@ -655,11 +659,12 @@
 			Nodes sort relative to each other only if they are on the same [member z_index].
 		</member>
 		<member name="z_as_relative" type="bool" setter="set_z_as_relative" getter="is_z_relative" default="true">
-			If [code]true[/code], the node's Z index is relative to its parent's Z index. If this node's Z index is 2 and its parent's effective Z index is 3, then this node's effective Z index will be 2 + 3 = 5.
+			If [code]true[/code], this node's final Z index is relative to its parent's Z index.
+			For example, if [member z_index] is [code]2[/code] and its parent's final Z index is [code]3[/code], then this node's final Z index will be [code]5[/code] ([code]2 + 3[/code]).
 		</member>
 		<member name="z_index" type="int" setter="set_z_index" getter="get_z_index" default="0">
-			Controls the order in which the nodes render. A node with a higher Z index will display in front of others. Must be between [constant RenderingServer.CANVAS_ITEM_Z_MIN] and [constant RenderingServer.CANVAS_ITEM_Z_MAX] (inclusive).
-			[b]Note:[/b] Changing the Z index of a [Control] only affects the drawing order, not the order in which input events are handled. This can be useful to implement certain UI animations, e.g. a menu where hovered items are scaled and should overlap others.
+			The order in which this node is drawn. A node with a higher Z index will display in front of others. Must be between [constant RenderingServer.CANVAS_ITEM_Z_MIN] and [constant RenderingServer.CANVAS_ITEM_Z_MAX] (inclusive).
+			[b]Note:[/b] The Z index does [b]not[/b] affect the order in which [CanvasItem] nodes are processed or the way input events are handled. This is especially important to keep in mind for [Control] nodes.
 		</member>
 	</members>
 	<signals>
@@ -671,7 +676,7 @@
 		</signal>
 		<signal name="hidden">
 			<description>
-				Emitted when the [CanvasItem] is hidden, i.e. it's no longer visible in the tree (see [method is_visible_in_tree]).
+				Emitted when this node becomes hidden, i.e. it's no longer visible in the tree (see [method is_visible_in_tree]).
 			</description>
 		</signal>
 		<signal name="item_rect_changed">
@@ -682,21 +687,25 @@
 		<signal name="visibility_changed">
 			<description>
 				Emitted when the [CanvasItem]'s visibility changes, either because its own [member visible] property changed or because its visibility in the tree changed (see [method is_visible_in_tree]).
+				This signal is emitted [i]after[/i] the related [constant NOTIFICATION_VISIBILITY_CHANGED] notification.
 			</description>
 		</signal>
 	</signals>
 	<constants>
 		<constant name="NOTIFICATION_TRANSFORM_CHANGED" value="2000">
-			The [CanvasItem]'s global transform has changed. This notification is only received if enabled by [method set_notify_transform].
+			Notification received when this node's global transform changes, if [method is_transform_notification_enabled] is [code]true[/code]. See also [method set_notify_transform] and [method get_transform].
+			[b]Note:[/b] Many canvas items such as [Camera2D] or [CollisionObject2D] automatically enable this in order to function correctly.
 		</constant>
 		<constant name="NOTIFICATION_LOCAL_TRANSFORM_CHANGED" value="35">
-			The [CanvasItem]'s local transform has changed. This notification is only received if enabled by [method set_notify_local_transform].
+			Notification received when this node's transform changes, if [method is_local_transform_notification_enabled] is [code]true[/code]. This is not received when a parent [Node2D]'s transform changes. See also [method set_notify_local_transform].
+			[b]Note:[/b] Many canvas items such as [Camera2D] or [CollisionShape2D] automatically enable this in order to function correctly.
 		</constant>
 		<constant name="NOTIFICATION_DRAW" value="30">
 			The [CanvasItem] is requested to draw (see [method _draw]).
 		</constant>
 		<constant name="NOTIFICATION_VISIBILITY_CHANGED" value="31">
-			The [CanvasItem]'s visibility has changed.
+			Notification received when this node's visibility changes (see [member visible] and [method is_visible_in_tree]).
+			This notification is received [i]before[/i] the related [signal visibility_changed] signal.
 		</constant>
 		<constant name="NOTIFICATION_ENTER_CANVAS" value="32">
 			The [CanvasItem] has entered the canvas.
@@ -705,7 +714,7 @@
 			The [CanvasItem] has exited the canvas.
 		</constant>
 		<constant name="NOTIFICATION_WORLD_2D_CHANGED" value="36">
-			The [CanvasItem]'s active [World2D] changed.
+			Notification received when this [CanvasItem] is registered to a new [World2D] (see [method get_world_2d]).
 		</constant>
 		<constant name="TEXTURE_FILTER_PARENT_NODE" value="0" enum="TextureFilter">
 			The [CanvasItem] will inherit the filter from its parent.
@@ -739,25 +748,25 @@
 			The [CanvasItem] will inherit the filter from its parent.
 		</constant>
 		<constant name="TEXTURE_REPEAT_DISABLED" value="1" enum="TextureRepeat">
-			Texture will not repeat.
+			The texture does not repeat.
 		</constant>
 		<constant name="TEXTURE_REPEAT_ENABLED" value="2" enum="TextureRepeat">
-			Texture will repeat normally.
+			The texture repeats when exceeding the texture's size.
 		</constant>
 		<constant name="TEXTURE_REPEAT_MIRROR" value="3" enum="TextureRepeat">
-			Texture will repeat in a 2×2 tiled mode, where elements at even positions are mirrored.
+			The texture repeats when the exceeding the texture's size in a "2×2 tiled mode". Repeated textures at even positions are mirrored.
 		</constant>
 		<constant name="TEXTURE_REPEAT_MAX" value="4" enum="TextureRepeat">
 			Represents the size of the [enum TextureRepeat] enum.
 		</constant>
 		<constant name="CLIP_CHILDREN_DISABLED" value="0" enum="ClipChildrenMode">
-			Child draws over parent and is not clipped.
+			Children are drawn over this node and are not clipped.
 		</constant>
 		<constant name="CLIP_CHILDREN_ONLY" value="1" enum="ClipChildrenMode">
-			Parent is used for the purposes of clipping only. Child is clipped to the parent's visible area, parent is not drawn.
+			This node is used as a mask and is [b]not[/b] drawn. The mask is based on this node's alpha channel: Opaque pixels are kept, transparent pixels are discarded, and semi-transparent pixels are blended in according to their opacity. Children are clipped to this node's drawn area.
 		</constant>
 		<constant name="CLIP_CHILDREN_AND_DRAW" value="2" enum="ClipChildrenMode">
-			Parent is used for clipping child, but parent is also drawn underneath child as normal before clipping child to its visible area.
+			This node is used as a mask and is also drawn. The mask is based on this node's alpha channel: Opaque pixels are kept, transparent pixels are discarded, and semi-transparent pixels are blended in according to their opacity. Children are clipped to the parent's drawn area.
 		</constant>
 		<constant name="CLIP_CHILDREN_MAX" value="3" enum="ClipChildrenMode">
 			Represents the size of the [enum ClipChildrenMode] enum.
diff --git a/engine/doc/classes/CanvasLayer.xml b/engine/doc/classes/CanvasLayer.xml
index e542eb7a..427cabe7 100644
--- a/engine/doc/classes/CanvasLayer.xml
+++ b/engine/doc/classes/CanvasLayer.xml
@@ -7,7 +7,7 @@
 		[CanvasItem]-derived nodes that are direct or indirect children of a [CanvasLayer] will be drawn in that layer. The layer is a numeric index that defines the draw order. The default 2D scene renders with index [code]0[/code], so a [CanvasLayer] with index [code]-1[/code] will be drawn below, and a [CanvasLayer] with index [code]1[/code] will be drawn above. This order will hold regardless of the [member CanvasItem.z_index] of the nodes within each layer.
 		[CanvasLayer]s can be hidden and they can also optionally follow the viewport. This makes them useful for HUDs like health bar overlays (on layers [code]1[/code] and higher) or backgrounds (on layers [code]-1[/code] and lower).
 		[b]Note:[/b] Embedded [Window]s are placed on layer [code]1024[/code]. [CanvasItem]s on layers [code]1025[/code] and higher appear in front of embedded windows.
-		[b]Note:[/b] Each [CanvasLayer] is drawn on one specific [Viewport] and cannot be shared between multiple [Viewport]s, see [member custom_viewport]. When using multiple [Viewport]s, for example in a split-screen game, you need create an individual [CanvasLayer] for each [Viewport] you want it to be drawn on.
+		[b]Note:[/b] Each [CanvasLayer] is drawn on one specific [Viewport] and cannot be shared between multiple [Viewport]s, see [member custom_viewport]. When using multiple [Viewport]s, for example in a split-screen game, you need to create an individual [CanvasLayer] for each [Viewport] you want it to be drawn on.
 	</description>
 	<tutorials>
 		<link title="Viewport and canvas transforms">$DOCS_URL/tutorials/2d/2d_transforms.html</link>
diff --git a/engine/doc/classes/CharacterBody2D.xml b/engine/doc/classes/CharacterBody2D.xml
index 30438be1..99f7181f 100644
--- a/engine/doc/classes/CharacterBody2D.xml
+++ b/engine/doc/classes/CharacterBody2D.xml
@@ -166,7 +166,7 @@
 			If [code]false[/code], the body will slide on floor's slopes when [member velocity] applies a downward force.
 		</member>
 		<member name="max_slides" type="int" setter="set_max_slides" getter="get_max_slides" default="4">
-			Maximum number of times the body can change direction before it stops when calling [method move_and_slide].
+			Maximum number of times the body can change direction before it stops when calling [method move_and_slide]. Must be greater than zero.
 		</member>
 		<member name="motion_mode" type="int" setter="set_motion_mode" getter="get_motion_mode" enum="CharacterBody2D.MotionMode" default="0">
 			Sets the motion mode which defines the behavior of [method move_and_slide]. See [enum MotionMode] constants for available modes.
@@ -196,7 +196,7 @@
 			Current velocity vector in pixels per second, used and modified during calls to [method move_and_slide].
 		</member>
 		<member name="wall_min_slide_angle" type="float" setter="set_wall_min_slide_angle" getter="get_wall_min_slide_angle" default="0.261799">
-			Minimum angle (in radians) where the body is allowed to slide when it encounters a slope. The default value equals 15 degrees. This property only affects movement when [member motion_mode] is [constant MOTION_MODE_FLOATING].
+			Minimum angle (in radians) where the body is allowed to slide when it encounters a wall. The default value equals 15 degrees. This property only affects movement when [member motion_mode] is [constant MOTION_MODE_FLOATING].
 		</member>
 	</members>
 	<constants>
diff --git a/engine/doc/classes/CharacterBody3D.xml b/engine/doc/classes/CharacterBody3D.xml
index 474adfc6..0307ea67 100644
--- a/engine/doc/classes/CharacterBody3D.xml
+++ b/engine/doc/classes/CharacterBody3D.xml
@@ -157,7 +157,7 @@
 			If [code]false[/code], the body will slide on floor's slopes when [member velocity] applies a downward force.
 		</member>
 		<member name="max_slides" type="int" setter="set_max_slides" getter="get_max_slides" default="6">
-			Maximum number of times the body can change direction before it stops when calling [method move_and_slide].
+			Maximum number of times the body can change direction before it stops when calling [method move_and_slide]. Must be greater than zero.
 		</member>
 		<member name="motion_mode" type="int" setter="set_motion_mode" getter="get_motion_mode" enum="CharacterBody3D.MotionMode" default="0">
 			Sets the motion mode which defines the behavior of [method move_and_slide]. See [enum MotionMode] constants for available modes.
@@ -187,7 +187,7 @@
 			Current velocity vector (typically meters per second), used and modified during calls to [method move_and_slide].
 		</member>
 		<member name="wall_min_slide_angle" type="float" setter="set_wall_min_slide_angle" getter="get_wall_min_slide_angle" default="0.261799">
-			Minimum angle (in radians) where the body is allowed to slide when it encounters a slope. The default value equals 15 degrees. When [member motion_mode] is [constant MOTION_MODE_GROUNDED], it only affects movement if [member floor_block_on_wall] is [code]true[/code].
+			Minimum angle (in radians) where the body is allowed to slide when it encounters a wall. The default value equals 15 degrees. When [member motion_mode] is [constant MOTION_MODE_GROUNDED], it only affects movement if [member floor_block_on_wall] is [code]true[/code].
 		</member>
 	</members>
 	<constants>
diff --git a/engine/doc/classes/CheckBox.xml b/engine/doc/classes/CheckBox.xml
index 5b2c93f7..4dd3724a 100644
--- a/engine/doc/classes/CheckBox.xml
+++ b/engine/doc/classes/CheckBox.xml
@@ -15,6 +15,12 @@
 		<member name="toggle_mode" type="bool" setter="set_toggle_mode" getter="is_toggle_mode" overrides="BaseButton" default="true" />
 	</members>
 	<theme_items>
+		<theme_item name="checkbox_checked_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			The color of the checked icon when the checkbox is pressed.
+		</theme_item>
+		<theme_item name="checkbox_unchecked_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			The color of the unchecked icon when the checkbox is not pressed.
+		</theme_item>
 		<theme_item name="check_v_offset" data_type="constant" type="int" default="0">
 			The vertical offset used when rendering the check icons (in pixels).
 		</theme_item>
diff --git a/engine/doc/classes/CheckButton.xml b/engine/doc/classes/CheckButton.xml
index c2da6cfe..bdcb049b 100644
--- a/engine/doc/classes/CheckButton.xml
+++ b/engine/doc/classes/CheckButton.xml
@@ -14,6 +14,12 @@
 		<member name="toggle_mode" type="bool" setter="set_toggle_mode" getter="is_toggle_mode" overrides="BaseButton" default="true" />
 	</members>
 	<theme_items>
+		<theme_item name="button_checked_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			The color of the checked icon when the checkbox is pressed.
+		</theme_item>
+		<theme_item name="button_unchecked_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			The color of the unchecked icon when the checkbox is not pressed.
+		</theme_item>
 		<theme_item name="check_v_offset" data_type="constant" type="int" default="0">
 			The vertical offset used when rendering the toggle icons (in pixels).
 		</theme_item>
diff --git a/engine/doc/classes/CodeEdit.xml b/engine/doc/classes/CodeEdit.xml
index 77d37286..edc0ee87 100644
--- a/engine/doc/classes/CodeEdit.xml
+++ b/engine/doc/classes/CodeEdit.xml
@@ -582,13 +582,13 @@
 			If [code]true[/code], lines can be folded. Otherwise, line folding methods like [method fold_line] will not work and [method can_fold_line] will always return [code]false[/code]. See [member gutters_draw_fold_gutter].
 		</member>
 		<member name="line_length_guidelines" type="int[]" setter="set_line_length_guidelines" getter="get_line_length_guidelines" default="[]">
-			Draws vertical lines at the provided columns. The first entry is considered a main hard guideline and is draw more prominently.
+			Draws vertical lines at the provided columns. The first entry is considered a main hard guideline and is drawn more prominently.
 		</member>
 		<member name="symbol_lookup_on_click" type="bool" setter="set_symbol_lookup_on_click_enabled" getter="is_symbol_lookup_on_click_enabled" default="false">
 			Set when a validated word from [signal symbol_validate] is clicked, the [signal symbol_lookup] should be emitted.
 		</member>
 		<member name="symbol_tooltip_on_hover" type="bool" setter="set_symbol_tooltip_on_hover_enabled" getter="is_symbol_tooltip_on_hover_enabled" default="false">
-			Set when a word is hovered, the [signal symbol_hovered] should be emitted.
+			If [code]true[/code], the [signal symbol_hovered] signal is emitted when hovering over a word.
 		</member>
 		<member name="text_direction" type="int" setter="set_text_direction" getter="get_text_direction" overrides="TextEdit" enum="Control.TextDirection" default="1" />
 	</members>
@@ -596,7 +596,7 @@
 		<signal name="breakpoint_toggled">
 			<param index="0" name="line" type="int" />
 			<description>
-				Emitted when a breakpoint is added or removed from a line. If the line is moved via backspace a removed is emitted at the old line.
+				Emitted when a breakpoint is added or removed from a line. If the line is removed via backspace, a signal is emitted at the old line.
 			</description>
 		</signal>
 		<signal name="code_completion_requested">
diff --git a/engine/doc/classes/Color.xml b/engine/doc/classes/Color.xml
index 5434b5ed..5ceb2220 100644
--- a/engine/doc/classes/Color.xml
+++ b/engine/doc/classes/Color.xml
@@ -6,6 +6,7 @@
 	<description>
 		A color represented in RGBA format by a red ([member r]), green ([member g]), blue ([member b]), and alpha ([member a]) component. Each component is a 32-bit floating-point value, usually ranging from [code]0.0[/code] to [code]1.0[/code]. Some properties (such as [member CanvasItem.modulate]) may support values greater than [code]1.0[/code], for overbright or HDR (High Dynamic Range) colors.
 		Colors can be created in various ways: By the various [Color] constructors, by static methods such as [method from_hsv], and by using a name from the set of standardized colors based on [url=https://en.wikipedia.org/wiki/X11_color_names]X11 color names[/url] with the addition of [constant TRANSPARENT]. GDScript also provides [method @GDScript.Color8], which uses integers from [code]0[/code] to [code]255[/code] and doesn't support overbright colors.
+		Color data may be stored in many color spaces and encodings. The [method srgb_to_linear] and [method linear_to_srgb] methods can convert between nonlinear sRGB encoding and linear RGB encoding.
 		[b]Note:[/b] In a boolean context, a Color will evaluate to [code]false[/code] if it is equal to [code]Color(0, 0, 0, 1)[/code] (opaque black). Otherwise, a Color will always evaluate to [code]true[/code].
 		[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/color_constants.png]Color constants cheatsheet[/url]
 	</description>
@@ -364,12 +365,14 @@
 			<return type="Color" />
 			<description>
 				Returns the color converted to the [url=https://en.wikipedia.org/wiki/SRGB]sRGB[/url] color space. This method assumes the original color is in the linear color space. See also [method srgb_to_linear] which performs the opposite operation.
+				[b]Note:[/b] The color's [member a]lpha channel is not affected. The alpha channel is always stored with linear encoding, regardless of the color space of the other color channels.
 			</description>
 		</method>
 		<method name="srgb_to_linear" qualifiers="const">
 			<return type="Color" />
 			<description>
 				Returns the color converted to the linear color space. This method assumes the original color already is in the sRGB color space. See also [method linear_to_srgb] which performs the opposite operation.
+				[b]Note:[/b] The color's [member a]lpha channel is not affected. The alpha channel is always stored with linear encoding, regardless of the color space of the other color channels.
 			</description>
 		</method>
 		<method name="to_abgr32" qualifiers="const">
@@ -492,6 +495,7 @@
 	<members>
 		<member name="a" type="float" setter="" getter="" default="1.0">
 			The color's alpha component, typically on the range of 0 to 1. A value of 0 means that the color is fully transparent. A value of 1 means that the color is fully opaque.
+			[b]Note:[/b] The alpha channel is always stored with linear encoding, regardless of the color space of the other color channels. The [method linear_to_srgb] and [method srgb_to_linear] methods do not affect the alpha channel.
 		</member>
 		<member name="a8" type="int" setter="" getter="" default="255">
 			Wrapper for [member a] that uses the range 0 to 255, instead of 0 to 1.
diff --git a/engine/doc/classes/ColorPicker.xml b/engine/doc/classes/ColorPicker.xml
index 81624b1d..ce046e44 100644
--- a/engine/doc/classes/ColorPicker.xml
+++ b/engine/doc/classes/ColorPicker.xml
@@ -141,6 +141,9 @@
 		</constant>
 	</constants>
 	<theme_items>
+		<theme_item name="focused_not_editing_cursor_color" data_type="color" type="Color" default="Color(1, 1, 1, 0.275)">
+			Color of rectangle or circle drawn when a picker shape part is focused but not editable via keyboard or joypad. Displayed [i]over[/i] the picker shape, so a partially transparent color should be used to ensure the picker shape remains visible.
+		</theme_item>
 		<theme_item name="center_slider_grabbers" data_type="constant" type="int" default="1">
 			Overrides the [theme_item Slider.center_grabber] theme property of the sliders.
 		</theme_item>
@@ -204,5 +207,14 @@
 		<theme_item name="shape_rect_wheel" data_type="icon" type="Texture2D">
 			The icon for rectangular wheel picker shapes.
 		</theme_item>
+		<theme_item name="picker_focus_circle" data_type="style" type="StyleBox">
+			The [StyleBox] used when the circle-shaped part of the picker is focused. Displayed [i]over[/i] the picker shape, so a partially transparent [StyleBox] should be used to ensure the picker shape remains visible. A [StyleBox] that represents an outline or an underline works well for this purpose. To disable the focus visual effect, assign a [StyleBoxEmpty] resource. Note that disabling the focus visual effect will harm keyboard/controller navigation usability, so this is not recommended for accessibility reasons.
+		</theme_item>
+		<theme_item name="picker_focus_rectangle" data_type="style" type="StyleBox">
+			The [StyleBox] used when the rectangle-shaped part of the picker is focused. Displayed [i]over[/i] the picker shape, so a partially transparent [StyleBox] should be used to ensure the picker shape remains visible. A [StyleBox] that represents an outline or an underline works well for this purpose. To disable the focus visual effect, assign a [StyleBoxEmpty] resource. Note that disabling the focus visual effect will harm keyboard/controller navigation usability, so this is not recommended for accessibility reasons.
+		</theme_item>
+		<theme_item name="sample_focus" data_type="style" type="StyleBox">
+			The [StyleBox] used for the old color sample part when it is focused. Displayed [i]over[/i] the sample, so a partially transparent [StyleBox] should be used to ensure the picker shape remains visible. A [StyleBox] that represents an outline or an underline works well for this purpose. To disable the focus visual effect, assign a [StyleBoxEmpty] resource. Note that disabling the focus visual effect will harm keyboard/controller navigation usability, so this is not recommended for accessibility reasons.
+		</theme_item>
 	</theme_items>
 </class>
diff --git a/engine/doc/classes/Control.xml b/engine/doc/classes/Control.xml
index 5ef0b2b5..c33bbfb6 100644
--- a/engine/doc/classes/Control.xml
+++ b/engine/doc/classes/Control.xml
@@ -24,6 +24,12 @@
 		<link title="All GUI Demos">https://github.com/godotengine/godot-demo-projects/tree/master/gui</link>
 	</tutorials>
 	<methods>
+		<method name="_accessibility_get_contextual_info" qualifiers="virtual const">
+			<return type="String" />
+			<description>
+				Return the description of the keyboard shortcuts and other contextual help for this control.
+			</description>
+		</method>
 		<method name="_can_drop_data" qualifiers="virtual const">
 			<return type="bool" />
 			<param index="0" name="at_position" type="Vector2" />
@@ -31,6 +37,7 @@
 			<description>
 				Godot calls this method to test if [param data] from a control's [method _get_drag_data] can be dropped at [param at_position]. [param at_position] is local to this control.
 				This method should only be used to test the data. Process the data in [method _drop_data].
+				[b]Note:[/b] If drag was initiated by keyboard shortcut or [method accessibility_drag], [param at_position] is set to [code]Vector2(INFINITY, INFINITY)[/code] and the currently selected item/text position should be used as drop position.
 				[codeblocks]
 				[gdscript]
 				func _can_drop_data(position, data):
@@ -55,6 +62,7 @@
 			<param index="1" name="data" type="Variant" />
 			<description>
 				Godot calls this method to pass you the [param data] from a control's [method _get_drag_data] result. Godot first calls [method _can_drop_data] to test if [param data] is allowed to drop at [param at_position] where [param at_position] is local to this control.
+				[b]Note:[/b] If drag was initiated by keyboard shortcut or [method accessibility_drag], [param at_position] is set to [code]Vector2(INFINITY, INFINITY)[/code] and the currently selected item/text position should be used as drop position.
 				[codeblocks]
 				[gdscript]
 				func _can_drop_data(position, data):
@@ -83,6 +91,7 @@
 			<description>
 				Godot calls this method to get data that can be dragged and dropped onto controls that expect drop data. Returns [code]null[/code] if there is no data to drag. Controls that want to receive drop data should implement [method _can_drop_data] and [method _drop_data]. [param at_position] is local to this control. Drag may be forced with [method force_drag].
 				A preview that will follow the mouse that should represent the data can be set with [method set_drag_preview]. A good time to set the preview is in this method.
+				[b]Note:[/b] If drag was initiated by keyboard shortcut or [method accessibility_drag], [param at_position] is set to [code]Vector2(INFINITY, INFINITY)[/code] and the currently selected item/text position should be used as drop position.
 				[codeblocks]
 				[gdscript]
 				func _get_drag_data(position):
@@ -223,6 +232,18 @@
 				[b]Note:[/b] This does not affect the methods in [Input], only the way events are propagated.
 			</description>
 		</method>
+		<method name="accessibility_drag">
+			<return type="void" />
+			<description>
+				Starts drag-and-drop operation without using a mouse.
+			</description>
+		</method>
+		<method name="accessibility_drop">
+			<return type="void" />
+			<description>
+				Ends drag-and-drop operation without using a mouse.
+			</description>
+		</method>
 		<method name="add_theme_color_override">
 			<return type="void" />
 			<param index="0" name="name" type="StringName" />
@@ -394,6 +415,12 @@
 				Returns [member offset_right] and [member offset_bottom].
 			</description>
 		</method>
+		<method name="get_focus_mode_with_recursive" qualifiers="const">
+			<return type="int" enum="Control.FocusMode" />
+			<description>
+				Similar to the getter of [member focus_mode], but takes parent's [member focus_recursive_behavior] into account.
+			</description>
+		</method>
 		<method name="get_focus_neighbor" qualifiers="const">
 			<return type="NodePath" />
 			<param index="0" name="side" type="int" enum="Side" />
@@ -416,6 +443,12 @@
 				Returns the minimum size for this control. See [member custom_minimum_size].
 			</description>
 		</method>
+		<method name="get_mouse_filter_with_recursive" qualifiers="const">
+			<return type="int" enum="Control.MouseFilter" />
+			<description>
+				Similar to the getter of [member mouse_filter], but takes parent's [member mouse_recursive_behavior] into account.
+			</description>
+		</method>
 		<method name="get_offset" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="offset" type="int" enum="Side" />
@@ -701,7 +734,7 @@
 		<method name="is_layout_rtl" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if layout is right-to-left. See also [member layout_direction].
+				Returns [code]true[/code] if the layout is right-to-left. See also [member layout_direction].
 			</description>
 		</method>
 		<method name="release_focus">
@@ -973,6 +1006,9 @@
 			Tells Godot which node it should give focus to if the user presses [kbd]Shift + Tab[/kbd] on a keyboard by default. You can change the key by editing the [member ProjectSettings.input/ui_focus_prev] input action.
 			If this property is not set, Godot will select a "best guess" based on surrounding nodes in the scene tree.
 		</member>
+		<member name="focus_recursive_behavior" type="int" setter="set_focus_recursive_behavior" getter="get_focus_recursive_behavior" enum="Control.RecursiveBehavior" default="0">
+			Controls whether the recursive child nodes should have their [member focus_mode] overridden to [constant FOCUS_NONE] when evaluating input.
+		</member>
 		<member name="global_position" type="Vector2" setter="_set_global_position" getter="get_global_position">
 			The node's global position, relative to the world (usually to the [CanvasLayer]).
 		</member>
@@ -1001,6 +1037,9 @@
 			You should disable it on the root of your UI if you do not want scroll events to go to the [method Node._unhandled_input] processing.
 			[b]Note:[/b] Because this property defaults to [code]true[/code], this allows nested scrollable containers to work out of the box.
 		</member>
+		<member name="mouse_recursive_behavior" type="int" setter="set_mouse_recursive_behavior" getter="get_mouse_recursive_behavior" enum="Control.RecursiveBehavior" default="0">
+			Controls whether the recursive child nodes should have their [member mouse_filter] overridden to [constant MOUSE_FILTER_IGNORE] when evaluating input.
+		</member>
 		<member name="offset_bottom" type="float" setter="set_offset" getter="get_offset" default="0.0">
 			Distance between the node's bottom edge and its parent control, based on [member anchor_bottom].
 			Offsets are often controlled by one or multiple parent [Container] nodes, so you should not modify them manually if your node is a direct child of a [Container]. Offsets update automatically when you move or resize the node.
@@ -1156,6 +1195,18 @@
 		<constant name="FOCUS_ALL" value="2" enum="FocusMode">
 			The node can grab focus on mouse click, using the arrows and the Tab keys on the keyboard, or using the D-pad buttons on a gamepad. Use with [member focus_mode].
 		</constant>
+		<constant name="FOCUS_ACCESSIBILITY" value="3" enum="FocusMode">
+			The node can grab focus only when screen reader is active. Use with [member focus_mode].
+		</constant>
+		<constant name="RECURSIVE_BEHAVIOR_INHERITED" value="0" enum="RecursiveBehavior">
+			Inherits the associated behavior from the control's parent. This is the default for any newly created control.
+		</constant>
+		<constant name="RECURSIVE_BEHAVIOR_DISABLED" value="1" enum="RecursiveBehavior">
+			The current control and all its recursive child controls have their associated behavior disabled, regardless of the parent control's configuration.
+		</constant>
+		<constant name="RECURSIVE_BEHAVIOR_ENABLED" value="2" enum="RecursiveBehavior">
+			The current control and all its recursive child controls have their associated behavior enabled, regardless of the parent control's configuration.
+		</constant>
 		<constant name="NOTIFICATION_RESIZED" value="40">
 			Sent when the node changes size. Use [member size] to get the new size.
 		</constant>
diff --git a/engine/doc/classes/Dictionary.xml b/engine/doc/classes/Dictionary.xml
index 2e02de54..f80114d5 100644
--- a/engine/doc/classes/Dictionary.xml
+++ b/engine/doc/classes/Dictionary.xml
@@ -477,7 +477,15 @@
 		<method name="sort">
 			<return type="void" />
 			<description>
-				Sorts the dictionary in-place by key. This can be used to ensure dictionaries with the same contents produce equivalent results when getting the [method keys], getting the [method values], and converting to a string. This is also useful when wanting a JSON representation consistent with what is in memory, and useful for storing on a database that requires dictionaries to be sorted.
+				Sorts the dictionary in ascending order, by key. The final order is dependent on the "less than" ([code]&lt;[/code]) comparison between keys.
+				[codeblocks]
+				[gdscript]
+				var numbers = { "c": 2, "a": 0, "b": 1 }
+				numbers.sort()
+				print(numbers) # Prints { "a": 0, "b": 1, "c": 2 }
+				[/gdscript]
+				[/codeblocks]
+				This method ensures that the dictionary's entries are ordered consistently when [method keys] or [method values] are called, or when the dictionary needs to be converted to a string through [method @GlobalScope.str] or [method JSON.stringify].
 			</description>
 		</method>
 		<method name="values" qualifiers="const">
diff --git a/engine/doc/classes/DirAccess.xml b/engine/doc/classes/DirAccess.xml
index cee4d1fe..beb57aef 100644
--- a/engine/doc/classes/DirAccess.xml
+++ b/engine/doc/classes/DirAccess.xml
@@ -248,6 +248,14 @@
 				[b]Note:[/b] This method is implemented on macOS, Linux (for EXT4 and F2FS filesystems only) and Windows. On other platforms, it always returns [code]true[/code].
 			</description>
 		</method>
+		<method name="is_equivalent" qualifiers="const">
+			<return type="bool" />
+			<param index="0" name="path_a" type="String" />
+			<param index="1" name="path_b" type="String" />
+			<description>
+				Returns [code]true[/code] if paths [param path_a] and [param path_b] resolve to the same file system object. Returns [code]false[/code] otherwise, even if the files are bit-for-bit identical (e.g., identical copies of the file that are not symbolic links).
+			</description>
+		</method>
 		<method name="is_link">
 			<return type="bool" />
 			<param index="0" name="path" type="String" />
diff --git a/engine/doc/classes/DisplayServer.xml b/engine/doc/classes/DisplayServer.xml
index 6089f85b..d7b2c427 100644
--- a/engine/doc/classes/DisplayServer.xml
+++ b/engine/doc/classes/DisplayServer.xml
@@ -10,6 +10,630 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="accessibility_create_element">
+			<return type="RID" />
+			<param index="0" name="window_id" type="int" />
+			<param index="1" name="role" type="int" enum="DisplayServer.AccessibilityRole" />
+			<description>
+				Creates a new, empty accessibility element resource.
+				[b]Note:[/b] An accessibility element is created and freed automatically for each [Node]. In general, this function should not be called manually.
+			</description>
+		</method>
+		<method name="accessibility_create_sub_element">
+			<return type="RID" />
+			<param index="0" name="parent_rid" type="RID" />
+			<param index="1" name="role" type="int" enum="DisplayServer.AccessibilityRole" />
+			<param index="2" name="insert_pos" type="int" default="-1" />
+			<description>
+				Creates a new, empty accessibility sub-element resource. Sub-elements can be used to provide accessibility information for objects which are not [Node]s, such as list items, table cells, or menu items. Sub-elements are freed automatically when the parent element is freed, or can be freed early using the [method accessibility_free_element] method.
+			</description>
+		</method>
+		<method name="accessibility_create_sub_text_edit_elements">
+			<return type="RID" />
+			<param index="0" name="parent_rid" type="RID" />
+			<param index="1" name="shaped_text" type="RID" />
+			<param index="2" name="min_height" type="float" />
+			<param index="3" name="insert_pos" type="int" default="-1" />
+			<description>
+				Creates a new, empty accessibility sub-element from the shaped text buffer. Sub-elements are freed automatically when the parent element is freed, or can be freed early using the [method accessibility_free_element] method.
+			</description>
+		</method>
+		<method name="accessibility_element_get_meta" qualifiers="const">
+			<return type="Variant" />
+			<param index="0" name="id" type="RID" />
+			<description>
+				Returns the metadata of the accessibility element.
+			</description>
+		</method>
+		<method name="accessibility_element_set_meta">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="meta" type="Variant" />
+			<description>
+				Sets the metadata of the accessibility element.
+			</description>
+		</method>
+		<method name="accessibility_free_element">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<description>
+				Frees an object created by [method accessibility_create_element], [method accessibility_create_sub_element], or [method accessibility_create_sub_text_edit_elements].
+			</description>
+		</method>
+		<method name="accessibility_get_window_root" qualifiers="const">
+			<return type="RID" />
+			<param index="0" name="window_id" type="int" />
+			<description>
+				Returns the main accessibility element of the OS native window.
+			</description>
+		</method>
+		<method name="accessibility_has_element" qualifiers="const">
+			<return type="bool" />
+			<param index="0" name="id" type="RID" />
+			<description>
+				Returns [code]true[/code] if [param id] is a valid accessibility element.
+			</description>
+		</method>
+		<method name="accessibility_screen_reader_active" qualifiers="const">
+			<return type="int" />
+			<description>
+				Returns [code]1[/code] if a screen reader, Braille display or other assistive app is active, [code]0[/code] otherwise. Returns [code]-1[/code] if status is unknown.
+				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
+				[b]Note:[/b] Accessibility debugging tools, such as Accessibility Insights for Windows, macOS Accessibility Inspector, or AT-SPI Browser do not count as assistive apps and will not affect this value. To test your app with these tools, set [member ProjectSettings.accessibility/general/accessibility_support] to [code]1[/code].
+			</description>
+		</method>
+		<method name="accessibility_set_window_focused">
+			<return type="void" />
+			<param index="0" name="window_id" type="int" />
+			<param index="1" name="focused" type="bool" />
+			<description>
+				Sets the window focused state for assistive apps.
+				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
+				[b]Note:[/b] Advanced users only! [Window] objects call this method automatically.
+			</description>
+		</method>
+		<method name="accessibility_set_window_rect">
+			<return type="void" />
+			<param index="0" name="window_id" type="int" />
+			<param index="1" name="rect_out" type="Rect2" />
+			<param index="2" name="rect_in" type="Rect2" />
+			<description>
+				Sets window outer (with decorations) and inner (without decorations) bounds for assistive apps.
+				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
+				[b]Note:[/b] Advanced users only! [Window] objects call this method automatically.
+			</description>
+		</method>
+		<method name="accessibility_should_increase_contrast" qualifiers="const">
+			<return type="int" />
+			<description>
+				Returns [code]1[/code] if a high-contrast user interface theme should be used, [code]0[/code] otherwise. Returns [code]-1[/code] if status is unknown.
+				[b]Note:[/b] This method is implemented on Linux (X11/Wayland, GNOME), macOS, and Windows.
+			</description>
+		</method>
+		<method name="accessibility_should_reduce_animation" qualifiers="const">
+			<return type="int" />
+			<description>
+				Returns [code]1[/code] if flashing, blinking, and other moving content that can cause seizures in users with photosensitive epilepsy should be disabled, [code]0[/code] otherwise. Returns [code]-1[/code] if status is unknown.
+				[b]Note:[/b] This method is implemented on macOS and Windows.
+			</description>
+		</method>
+		<method name="accessibility_should_reduce_transparency" qualifiers="const">
+			<return type="int" />
+			<description>
+				Returns [code]1[/code] if background images, transparency, and other features that can reduce the contrast between the foreground and background should be disabled, [code]0[/code] otherwise. Returns [code]-1[/code] if status is unknown.
+				[b]Note:[/b] This method is implemented on macOS and Windows.
+			</description>
+		</method>
+		<method name="accessibility_update_add_action">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="action" type="int" enum="DisplayServer.AccessibilityAction" />
+			<param index="2" name="callable" type="Callable" />
+			<description>
+				Adds a callback for the accessibility action (action which can be performed by using a special screen reader command or buttons on the Braille display), and marks this action as supported. The action callback receives one [Variant] argument, which value depends on action type.
+			</description>
+		</method>
+		<method name="accessibility_update_add_child">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="child_id" type="RID" />
+			<description>
+				Adds a child accessibility element.
+				[b]Note:[/b] [Node] children and sub-elements are added to the child list automatically.
+			</description>
+		</method>
+		<method name="accessibility_update_add_custom_action">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="action_id" type="int" />
+			<param index="2" name="action_description" type="String" />
+			<description>
+				Adds support for a custom accessibility action. [param action_id] is passed as an argument to the callback of [constant ACTION_CUSTOM] action.
+			</description>
+		</method>
+		<method name="accessibility_update_add_related_controls">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="related_id" type="RID" />
+			<description>
+				Adds an element that is controlled by this element.
+			</description>
+		</method>
+		<method name="accessibility_update_add_related_described_by">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="related_id" type="RID" />
+			<description>
+				Adds an element that describes this element.
+			</description>
+		</method>
+		<method name="accessibility_update_add_related_details">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="related_id" type="RID" />
+			<description>
+				Adds an element that details this element.
+			</description>
+		</method>
+		<method name="accessibility_update_add_related_flow_to">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="related_id" type="RID" />
+			<description>
+				Adds an element that this element flow into.
+			</description>
+		</method>
+		<method name="accessibility_update_add_related_labeled_by">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="related_id" type="RID" />
+			<description>
+				Adds an element that labels this element.
+			</description>
+		</method>
+		<method name="accessibility_update_add_related_radio_group">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="related_id" type="RID" />
+			<description>
+				Adds an element that is part of the same radio group.
+				[b]Note:[/b] This method should be called on each element of the group, using all other elements as [param related_id].
+			</description>
+		</method>
+		<method name="accessibility_update_set_active_descendant">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="other_id" type="RID" />
+			<description>
+				Adds an element that is an active descendant of this element.
+			</description>
+		</method>
+		<method name="accessibility_update_set_background_color">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="color" type="Color" />
+			<description>
+				Sets element background color.
+			</description>
+		</method>
+		<method name="accessibility_update_set_bounds">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="p_rect" type="Rect2" />
+			<description>
+				Sets element bounding box, relative to the node position.
+			</description>
+		</method>
+		<method name="accessibility_update_set_checked">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="checekd" type="bool" />
+			<description>
+				Sets element checked state.
+			</description>
+		</method>
+		<method name="accessibility_update_set_classname">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="classname" type="String" />
+			<description>
+				Sets element class name.
+			</description>
+		</method>
+		<method name="accessibility_update_set_color_value">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="color" type="Color" />
+			<description>
+				Sets element color value.
+			</description>
+		</method>
+		<method name="accessibility_update_set_description">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="description" type="String" />
+			<description>
+				Sets element accessibility description.
+			</description>
+		</method>
+		<method name="accessibility_update_set_error_message">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="other_id" type="RID" />
+			<description>
+				Sets an element which contains an error message for this element.
+			</description>
+		</method>
+		<method name="accessibility_update_set_extra_info">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="name" type="String" />
+			<description>
+				Sets element accessibility extra information added to the element name.
+			</description>
+		</method>
+		<method name="accessibility_update_set_flag">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="flag" type="int" enum="DisplayServer.AccessibilityFlags" />
+			<param index="2" name="value" type="bool" />
+			<description>
+				Sets element flag, see [enum DisplayServer.AccessibilityFlags].
+			</description>
+		</method>
+		<method name="accessibility_update_set_focus">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<description>
+				Sets currently focused element.
+			</description>
+		</method>
+		<method name="accessibility_update_set_foreground_color">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="color" type="Color" />
+			<description>
+				Sets element foreground color.
+			</description>
+		</method>
+		<method name="accessibility_update_set_in_page_link_target">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="other_id" type="RID" />
+			<description>
+				Sets target element for the link.
+			</description>
+		</method>
+		<method name="accessibility_update_set_language">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="language" type="String" />
+			<description>
+				Sets element text language.
+			</description>
+		</method>
+		<method name="accessibility_update_set_list_item_count">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="size" type="int" />
+			<description>
+				Sets number of items in the list.
+			</description>
+		</method>
+		<method name="accessibility_update_set_list_item_expanded">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="expanded" type="bool" />
+			<description>
+				Sets list/tree item expanded status.
+			</description>
+		</method>
+		<method name="accessibility_update_set_list_item_index">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Sets the position of the element in the list.
+			</description>
+		</method>
+		<method name="accessibility_update_set_list_item_level">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="level" type="int" />
+			<description>
+				Sets the hierarchical level of the element in the list.
+			</description>
+		</method>
+		<method name="accessibility_update_set_list_item_selected">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="selected" type="bool" />
+			<description>
+				Sets list/tree item selected status.
+			</description>
+		</method>
+		<method name="accessibility_update_set_list_orientation">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="vertical" type="bool" />
+			<description>
+				Sets the orientation of the list elements.
+			</description>
+		</method>
+		<method name="accessibility_update_set_live">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="live" type="int" enum="DisplayServer.AccessibilityLiveMode" />
+			<description>
+				Sets the priority of the live region updates.
+			</description>
+		</method>
+		<method name="accessibility_update_set_member_of">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="group_id" type="RID" />
+			<description>
+				Sets the element to be a member of the group.
+			</description>
+		</method>
+		<method name="accessibility_update_set_name">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="name" type="String" />
+			<description>
+				Sets element accessibility name.
+			</description>
+		</method>
+		<method name="accessibility_update_set_next_on_line">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="other_id" type="RID" />
+			<description>
+				Sets next element on the line.
+			</description>
+		</method>
+		<method name="accessibility_update_set_num_jump">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="jump" type="float" />
+			<description>
+				Sets numeric value jump.
+			</description>
+		</method>
+		<method name="accessibility_update_set_num_range">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
+			<description>
+				Sets numeric value range.
+			</description>
+		</method>
+		<method name="accessibility_update_set_num_step">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="step" type="float" />
+			<description>
+				Sets numeric value step.
+			</description>
+		</method>
+		<method name="accessibility_update_set_num_value">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="position" type="float" />
+			<description>
+				Sets numeric value.
+			</description>
+		</method>
+		<method name="accessibility_update_set_placeholder">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="placeholder" type="String" />
+			<description>
+				Sets placeholder text.
+			</description>
+		</method>
+		<method name="accessibility_update_set_popup_type">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="popup" type="int" enum="DisplayServer.AccessibilityPopupType" />
+			<description>
+				Sets popup type for popup buttons.
+			</description>
+		</method>
+		<method name="accessibility_update_set_previous_on_line">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="other_id" type="RID" />
+			<description>
+				Sets previous element on the line.
+			</description>
+		</method>
+		<method name="accessibility_update_set_role">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="role" type="int" enum="DisplayServer.AccessibilityRole" />
+			<description>
+				Sets element accessibility role.
+			</description>
+		</method>
+		<method name="accessibility_update_set_role_description">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="description" type="String" />
+			<description>
+				Sets element accessibility role description text.
+			</description>
+		</method>
+		<method name="accessibility_update_set_scroll_x">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="position" type="float" />
+			<description>
+				Sets scroll bar x position.
+			</description>
+		</method>
+		<method name="accessibility_update_set_scroll_x_range">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
+			<description>
+				Sets scroll bar x range.
+			</description>
+		</method>
+		<method name="accessibility_update_set_scroll_y">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="position" type="float" />
+			<description>
+				Sets scroll bar y position.
+			</description>
+		</method>
+		<method name="accessibility_update_set_scroll_y_range">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="min" type="float" />
+			<param index="2" name="max" type="float" />
+			<description>
+				Sets scroll bar y range.
+			</description>
+		</method>
+		<method name="accessibility_update_set_shortcut">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="shortcut" type="String" />
+			<description>
+				Sets the list of keyboard shortcuts used by element.
+			</description>
+		</method>
+		<method name="accessibility_update_set_state_description">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="description" type="String" />
+			<description>
+				Sets human-readable description of the current checked state.
+			</description>
+		</method>
+		<method name="accessibility_update_set_table_cell_position">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="row_index" type="int" />
+			<param index="2" name="column_index" type="int" />
+			<description>
+				Sets cell position in the table.
+			</description>
+		</method>
+		<method name="accessibility_update_set_table_cell_span">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="row_span" type="int" />
+			<param index="2" name="column_span" type="int" />
+			<description>
+				Sets cell row/column span.
+			</description>
+		</method>
+		<method name="accessibility_update_set_table_column_count">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="count" type="int" />
+			<description>
+				Sets number of columns in the table.
+			</description>
+		</method>
+		<method name="accessibility_update_set_table_column_index">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Sets position of the column.
+			</description>
+		</method>
+		<method name="accessibility_update_set_table_row_count">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="count" type="int" />
+			<description>
+				Sets number of rows in the table.
+			</description>
+		</method>
+		<method name="accessibility_update_set_table_row_index">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Sets position of the row in the table.
+			</description>
+		</method>
+		<method name="accessibility_update_set_text_align">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="align" type="int" enum="HorizontalAlignment" />
+			<description>
+				Sets element text alignment.
+			</description>
+		</method>
+		<method name="accessibility_update_set_text_decorations">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="underline" type="bool" />
+			<param index="2" name="strikethrough" type="bool" />
+			<param index="3" name="overline" type="bool" />
+			<description>
+				Sets text underline/overline/strikethrough.
+			</description>
+		</method>
+		<method name="accessibility_update_set_text_orientation">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="vertical" type="bool" />
+			<description>
+				Sets text orientation.
+			</description>
+		</method>
+		<method name="accessibility_update_set_text_selection">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="text_start_id" type="RID" />
+			<param index="2" name="start_char" type="int" />
+			<param index="3" name="text_end_id" type="RID" />
+			<param index="4" name="end_char" type="int" />
+			<description>
+				Sets text selection to the text field. [param text_start_id] and [param text_end_id] should be elements created by [method accessibility_create_sub_text_edit_elements]. Character offsets are relative to the corresponding element.
+			</description>
+		</method>
+		<method name="accessibility_update_set_tooltip">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="tooltip" type="String" />
+			<description>
+				Sets tooltip text.
+			</description>
+		</method>
+		<method name="accessibility_update_set_transform">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="transform" type="Transform2D" />
+			<description>
+				Sets element 2D transform.
+			</description>
+		</method>
+		<method name="accessibility_update_set_url">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="url" type="String" />
+			<description>
+				Sets link URL.
+			</description>
+		</method>
+		<method name="accessibility_update_set_value">
+			<return type="void" />
+			<param index="0" name="id" type="RID" />
+			<param index="1" name="value" type="String" />
+			<description>
+				Sets element text value.
+			</description>
+		</method>
 		<method name="beep" qualifiers="const">
 			<return type="void" />
 			<description>
@@ -64,6 +688,16 @@
 				[b]Note:[/b] This method is only implemented on Linux (X11/Wayland).
 			</description>
 		</method>
+		<method name="color_picker">
+			<return type="bool" />
+			<param index="0" name="callback" type="Callable" />
+			<description>
+				Displays OS native color picker.
+				Callbacks have the following arguments: [code]status: bool, color: Color[/code].
+				[b]Note:[/b] This method is implemented if the display server has the [constant FEATURE_NATIVE_COLOR_PICKER] feature.
+				[b]Note:[/b] This method is only implemented on Linux (X11/Wayland).
+			</description>
+		</method>
 		<method name="create_status_indicator">
 			<return type="int" />
 			<param index="0" name="icon" type="Texture2D" />
@@ -143,10 +777,11 @@
 			<param index="4" name="mode" type="int" enum="DisplayServer.FileDialogMode" />
 			<param index="5" name="filters" type="PackedStringArray" />
 			<param index="6" name="callback" type="Callable" />
+			<param index="7" name="parent_window_id" type="int" default="0" />
 			<description>
 				Displays OS native dialog for selecting files or directories in the file system.
 				Each filter string in the [param filters] array should be formatted like this: [code]*.png,*.jpg,*.jpeg;Image Files;image/png,image/jpeg[/code]. The description text of the filter is optional and can be omitted. It is recommended to set both file extension and MIME type. See also [member FileDialog.filters].
-				Callbacks have the following arguments: [code]status: bool, selected_paths: PackedStringArray, selected_filter_index: int[/code]. [b]On Android,[/b] callback argument [code]selected_filter_index[/code] is always zero.
+				Callbacks have the following arguments: [code]status: bool, selected_paths: PackedStringArray, selected_filter_index: int[/code]. [b]On Android,[/b] the third callback argument ([code]selected_filter_index[/code]) is always [code]0[/code].
 				[b]Note:[/b] This method is implemented if the display server has the [constant FEATURE_NATIVE_DIALOG_FILE] feature. Supported platforms include Linux (X11/Wayland), Windows, macOS, and Android.
 				[b]Note:[/b] [param current_directory] might be ignored.
 				[b]Note:[/b] Embedded file dialog and Windows file dialog support only file extensions, while Android, Linux, and macOS file dialogs also support MIME types.
@@ -166,6 +801,7 @@
 			<param index="6" name="filters" type="PackedStringArray" />
 			<param index="7" name="options" type="Dictionary[]" />
 			<param index="8" name="callback" type="Callable" />
+			<param index="9" name="parent_window_id" type="int" default="0" />
 			<description>
 				Displays OS native dialog for selecting files or directories in the file system with additional user selectable options.
 				Each filter string in the [param filters] array should be formatted like this: [code]*.png,*.jpg,*.jpeg;Image Files;image/png,image/jpeg[/code]. The description text of the filter is optional and can be omitted. It is recommended to set both file extension and MIME type. See also [member FileDialog.filters].
@@ -193,7 +829,7 @@
 			<return type="Color" />
 			<description>
 				Returns OS theme accent color. Returns [code]Color(0, 0, 0, 0)[/code], if accent color is unknown.
-				[b]Note:[/b] This method is implemented on macOS, Windows, and Android.
+				[b]Note:[/b] This method is implemented on macOS, Windows, Android, and Linux (X11/Wayland).
 			</description>
 		</method>
 		<method name="get_base_color" qualifiers="const">
@@ -906,8 +1542,8 @@
 		<method name="has_hardware_keyboard" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if hardware keyboard is connected.
-				[b]Note:[/b] This method is implemented on Android and iOS, on other platforms this method always returns [code]true[/code].
+				Returns [code]true[/code] if a hardware keyboard is connected.
+				[b]Note:[/b] This method is implemented on Android and iOS. On other platforms, this method always returns [code]true[/code].
 			</description>
 		</method>
 		<method name="help_set_search_callbacks">
@@ -1076,18 +1712,18 @@
 			<return type="Image" />
 			<param index="0" name="screen" type="int" default="-1" />
 			<description>
-				Returns screenshot of the [param screen].
+				Returns a screenshot of the [param screen].
 				[b]Note:[/b] This method is implemented on Linux (X11), macOS, and Windows.
-				[b]Note:[/b] On macOS, this method requires "Screen Recording" permission, if permission is not granted it will return desktop wallpaper color.
+				[b]Note:[/b] On macOS, this method requires the "Screen Recording" permission. If permission is not granted, this method returns a screenshot that will not include other application windows or OS elements not related to the application.
 			</description>
 		</method>
 		<method name="screen_get_image_rect" qualifiers="const">
 			<return type="Image" />
 			<param index="0" name="rect" type="Rect2i" />
 			<description>
-				Returns screenshot of the screen [param rect].
+				Returns a screenshot of the screen region defined by [param rect].
 				[b]Note:[/b] This method is implemented on macOS and Windows.
-				[b]Note:[/b] On macOS, this method requires "Screen Recording" permission, if permission is not granted it will return desktop wallpaper color.
+				[b]Note:[/b] On macOS, this method requires the "Screen Recording" permission. If permission is not granted, this method returns a screenshot that will not include other application windows or OS elements not related to the application.
 			</description>
 		</method>
 		<method name="screen_get_max_scale" qualifiers="const">
@@ -1192,6 +1828,14 @@
 				[b]Note:[/b] On iOS, this method has no effect if [member ProjectSettings.display/window/handheld/orientation] is not set to [constant SCREEN_SENSOR].
 			</description>
 		</method>
+		<method name="set_hardware_keyboard_connection_change_callback">
+			<return type="void" />
+			<param index="0" name="callable" type="Callable" />
+			<description>
+				Sets the [param callable] that should be called when hardware keyboard is connected/disconnected. [param callable] should accept a single [bool] parameter indicating whether the keyboard is connected (true) or disconnected (false).
+				[b]Note:[/b] This method is only implemented on Android.
+			</description>
+		</method>
 		<method name="set_icon">
 			<return type="void" />
 			<param index="0" name="image" type="Image" />
@@ -1313,7 +1957,6 @@
 				- [code]language[/code] is language code in [code]lang_Variant[/code] format. The [code]lang[/code] part is a 2 or 3-letter code based on the ISO-639 standard, in lowercase. The [code skip-lint]Variant[/code] part is an engine-dependent string describing country, region or/and dialect.
 				Note that Godot depends on system libraries for text-to-speech functionality. These libraries are installed by default on Windows and macOS, but not on all Linux distributions. If they are not present, this method will return an empty list. This applies to both Godot users on Linux, as well as end-users on Linux running Godot games that use text-to-speech.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_get_voices_for_language" qualifiers="const">
@@ -1322,7 +1965,6 @@
 			<description>
 				Returns an [PackedStringArray] of voice identifiers for the [param language].
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_is_paused" qualifiers="const">
@@ -1330,7 +1972,6 @@
 			<description>
 				Returns [code]true[/code] if the synthesizer is in a paused state.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_is_speaking" qualifiers="const">
@@ -1338,7 +1979,6 @@
 			<description>
 				Returns [code]true[/code] if the synthesizer is generating speech, or have utterance waiting in the queue.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_pause">
@@ -1346,7 +1986,6 @@
 			<description>
 				Puts the synthesizer into a paused state.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_resume">
@@ -1354,7 +1993,6 @@
 			<description>
 				Resumes the synthesizer if it was paused.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_set_utterance_callback">
@@ -1367,7 +2005,6 @@
 				- [constant TTS_UTTERANCE_BOUNDARY] callable's method should take two [int] parameters, the index of the character and the utterance ID.
 				[b]Note:[/b] The granularity of the boundary callbacks is engine dependent.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_speak">
@@ -1389,7 +2026,6 @@
 				[b]Note:[/b] On Windows and Linux (X11/Wayland), utterance [param text] can use SSML markup. SSML support is engine and voice dependent. If the engine does not support SSML, you should strip out all XML markup before calling [method tts_speak].
 				[b]Note:[/b] The granularity of pitch, rate, and volume is engine and voice dependent. Values may be truncated.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Wayland), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="tts_stop">
@@ -1397,7 +2033,6 @@
 			<description>
 				Stops synthesis in progress and removes all utterances from the queue.
 				[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux (X11/Linux), macOS, and Windows.
-				[b]Note:[/b] [member ProjectSettings.audio/general/text_to_speech] should be [code]true[/code] to use text-to-speech.
 			</description>
 		</method>
 		<method name="unregister_additional_output">
@@ -1896,7 +2531,7 @@
 			Display server supports windows can use per-pixel transparency to make windows behind them partially or fully visible. [b]Windows, macOS, Linux (X11/Wayland)[/b]
 		</constant>
 		<constant name="FEATURE_HIDPI" value="12" enum="Feature">
-			Display server supports querying the operating system's display scale factor. This allows for [i]reliable[/i] automatic hiDPI display detection, as opposed to guessing based on the screen resolution and reported display DPI (which can be unreliable due to broken monitor EDID). [b]Windows, Linux (Wayland), macOS[/b]
+			Display server supports querying the operating system's display scale factor. This allows automatically detecting the hiDPI display [i]reliably[/i], instead of guessing based on the screen resolution and the display's reported DPI (which might be unreliable due to broken monitor EDID). [b]Windows, Linux (Wayland), macOS[/b]
 		</constant>
 		<constant name="FEATURE_ICON" value="13" enum="Feature">
 			Display server supports changing the window icon (usually displayed in the top-left corner). [b]Windows, macOS, Linux (X11)[/b]
@@ -1952,6 +2587,282 @@
 		<constant name="FEATURE_EMOJI_AND_SYMBOL_PICKER" value="31" enum="Feature">
 			Display server supports system emoji and symbol picker. [b]Windows, macOS[/b]
 		</constant>
+		<constant name="FEATURE_NATIVE_COLOR_PICKER" value="32" enum="Feature">
+			Display server supports native color picker. [b]Linux (X11/Wayland)[/b]
+		</constant>
+		<constant name="FEATURE_SELF_FITTING_WINDOWS" value="33" enum="Feature">
+			Display server automatically fits popups according to the screen boundaries. Window nodes should not attempt to do that themselves.
+		</constant>
+		<constant name="FEATURE_ACCESSIBILITY_SCREEN_READER" value="34" enum="Feature">
+			Display server supports interaction with screen reader or Braille display. [b]Linux (X11/Wayland), macOS, Windows[/b]
+		</constant>
+		<constant name="ROLE_UNKNOWN" value="0" enum="AccessibilityRole">
+			Unknown or custom role.
+		</constant>
+		<constant name="ROLE_DEFAULT_BUTTON" value="1" enum="AccessibilityRole">
+			Default dialog button element.
+		</constant>
+		<constant name="ROLE_AUDIO" value="2" enum="AccessibilityRole">
+			Audio player element.
+		</constant>
+		<constant name="ROLE_VIDEO" value="3" enum="AccessibilityRole">
+			Video player element.
+		</constant>
+		<constant name="ROLE_STATIC_TEXT" value="4" enum="AccessibilityRole">
+			Non-editable text label.
+		</constant>
+		<constant name="ROLE_CONTAINER" value="5" enum="AccessibilityRole">
+			Container element. Elements with this role are used for internal structure and ignored by screen readers.
+		</constant>
+		<constant name="ROLE_PANEL" value="6" enum="AccessibilityRole">
+			Panel container element.
+		</constant>
+		<constant name="ROLE_BUTTON" value="7" enum="AccessibilityRole">
+			Button element.
+		</constant>
+		<constant name="ROLE_LINK" value="8" enum="AccessibilityRole">
+			Link element.
+		</constant>
+		<constant name="ROLE_CHECK_BOX" value="9" enum="AccessibilityRole">
+			Check box element.
+		</constant>
+		<constant name="ROLE_RADIO_BUTTON" value="10" enum="AccessibilityRole">
+			Radio button element.
+		</constant>
+		<constant name="ROLE_CHECK_BUTTON" value="11" enum="AccessibilityRole">
+			Check button element.
+		</constant>
+		<constant name="ROLE_SCROLL_BAR" value="12" enum="AccessibilityRole">
+			Scroll bar element.
+		</constant>
+		<constant name="ROLE_SCROLL_VIEW" value="13" enum="AccessibilityRole">
+			Scroll container element.
+		</constant>
+		<constant name="ROLE_SPLITTER" value="14" enum="AccessibilityRole">
+			Container splitter handle element.
+		</constant>
+		<constant name="ROLE_SLIDER" value="15" enum="AccessibilityRole">
+			Slider element.
+		</constant>
+		<constant name="ROLE_SPIN_BUTTON" value="16" enum="AccessibilityRole">
+			Spin box element.
+		</constant>
+		<constant name="ROLE_PROGRESS_INDICATOR" value="17" enum="AccessibilityRole">
+			Progress indicator element.
+		</constant>
+		<constant name="ROLE_TEXT_FIELD" value="18" enum="AccessibilityRole">
+			Editable text field element.
+		</constant>
+		<constant name="ROLE_MULTILINE_TEXT_FIELD" value="19" enum="AccessibilityRole">
+			Multiline editable text field element.
+		</constant>
+		<constant name="ROLE_COLOR_PICKER" value="20" enum="AccessibilityRole">
+			Color picker element.
+		</constant>
+		<constant name="ROLE_TABLE" value="21" enum="AccessibilityRole">
+			Table element.
+		</constant>
+		<constant name="ROLE_CELL" value="22" enum="AccessibilityRole">
+			Table/tree cell element.
+		</constant>
+		<constant name="ROLE_ROW" value="23" enum="AccessibilityRole">
+			Table/tree row element.
+		</constant>
+		<constant name="ROLE_ROW_GROUP" value="24" enum="AccessibilityRole">
+			Table/tree row group element.
+		</constant>
+		<constant name="ROLE_ROW_HEADER" value="25" enum="AccessibilityRole">
+			Table/tree row header element.
+		</constant>
+		<constant name="ROLE_COLUMN_HEADER" value="26" enum="AccessibilityRole">
+			Table/tree column header element.
+		</constant>
+		<constant name="ROLE_TREE" value="27" enum="AccessibilityRole">
+			Tree view element.
+		</constant>
+		<constant name="ROLE_TREE_ITEM" value="28" enum="AccessibilityRole">
+			Tree view item element.
+		</constant>
+		<constant name="ROLE_LIST" value="29" enum="AccessibilityRole">
+			List element.
+		</constant>
+		<constant name="ROLE_LIST_ITEM" value="30" enum="AccessibilityRole">
+			List item element.
+		</constant>
+		<constant name="ROLE_LIST_BOX" value="31" enum="AccessibilityRole">
+			List view element.
+		</constant>
+		<constant name="ROLE_LIST_BOX_OPTION" value="32" enum="AccessibilityRole">
+			List view item element.
+		</constant>
+		<constant name="ROLE_TAB_BAR" value="33" enum="AccessibilityRole">
+			Tab bar element.
+		</constant>
+		<constant name="ROLE_TAB" value="34" enum="AccessibilityRole">
+			Tab bar item element.
+		</constant>
+		<constant name="ROLE_TAB_PANEL" value="35" enum="AccessibilityRole">
+			Tab panel element.
+		</constant>
+		<constant name="ROLE_MENU_BAR" value="36" enum="AccessibilityRole">
+			Menu bar element.
+		</constant>
+		<constant name="ROLE_MENU" value="37" enum="AccessibilityRole">
+			Popup menu element.
+		</constant>
+		<constant name="ROLE_MENU_ITEM" value="38" enum="AccessibilityRole">
+			Popup menu item element.
+		</constant>
+		<constant name="ROLE_MENU_ITEM_CHECK_BOX" value="39" enum="AccessibilityRole">
+			Popup menu check button item element.
+		</constant>
+		<constant name="ROLE_MENU_ITEM_RADIO" value="40" enum="AccessibilityRole">
+			Popup menu radio button item element.
+		</constant>
+		<constant name="ROLE_IMAGE" value="41" enum="AccessibilityRole">
+			Image element.
+		</constant>
+		<constant name="ROLE_WINDOW" value="42" enum="AccessibilityRole">
+			Window element.
+		</constant>
+		<constant name="ROLE_TITLE_BAR" value="43" enum="AccessibilityRole">
+			Embedded window title bar element.
+		</constant>
+		<constant name="ROLE_DIALOG" value="44" enum="AccessibilityRole">
+			Dialog window element.
+		</constant>
+		<constant name="ROLE_TOOLTIP" value="45" enum="AccessibilityRole">
+			Tooltip element.
+		</constant>
+		<constant name="POPUP_UNKNOWN" value="0" enum="AccessibilityPopupType">
+			Other/unknown popup type.
+		</constant>
+		<constant name="POPUP_MENU" value="1" enum="AccessibilityPopupType">
+			Popup menu.
+		</constant>
+		<constant name="POPUP_LIST" value="2" enum="AccessibilityPopupType">
+			Popup list.
+		</constant>
+		<constant name="POPUP_TREE" value="3" enum="AccessibilityPopupType">
+			Popup tree view.
+		</constant>
+		<constant name="POPUP_DIALOG" value="4" enum="AccessibilityPopupType">
+			Popup dialog.
+		</constant>
+		<constant name="FLAG_HIDDEN" value="0" enum="AccessibilityFlags">
+			Element is hidden for accessibility tools.
+		</constant>
+		<constant name="FLAG_LINKED" value="1" enum="AccessibilityFlags">
+		</constant>
+		<constant name="FLAG_MULTISELECTABLE" value="2" enum="AccessibilityFlags">
+			Element is support multiple item selection.
+		</constant>
+		<constant name="FLAG_REQUIRED" value="3" enum="AccessibilityFlags">
+			Element require user input.
+		</constant>
+		<constant name="FLAG_VISITED" value="4" enum="AccessibilityFlags">
+			Element is a visited link.
+		</constant>
+		<constant name="FLAG_BUSY" value="5" enum="AccessibilityFlags">
+			Element content is not ready (e.g. loading).
+		</constant>
+		<constant name="FLAG_MODAL" value="6" enum="AccessibilityFlags">
+			Element is modal window.
+		</constant>
+		<constant name="FLAG_TOUCH_PASSTHROUGH" value="7" enum="AccessibilityFlags">
+			Element allows touches to be passed through when a screen reader is in touch exploration mode.
+		</constant>
+		<constant name="FLAG_READONLY" value="8" enum="AccessibilityFlags">
+			Element is text field with selectable but read-only text.
+		</constant>
+		<constant name="FLAG_DISABLED" value="9" enum="AccessibilityFlags">
+			Element is disabled.
+		</constant>
+		<constant name="FLAG_CLIPS_CHILDREN" value="10" enum="AccessibilityFlags">
+			Element clips children.
+		</constant>
+		<constant name="ACTION_CLICK" value="0" enum="AccessibilityAction">
+			Single click action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_FOCUS" value="1" enum="AccessibilityAction">
+			Focus action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_BLUR" value="2" enum="AccessibilityAction">
+			Blur action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_COLLAPSE" value="3" enum="AccessibilityAction">
+			Collapse action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_EXPAND" value="4" enum="AccessibilityAction">
+			Expand action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_DECREMENT" value="5" enum="AccessibilityAction">
+			Decrement action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_INCREMENT" value="6" enum="AccessibilityAction">
+			Increment action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_HIDE_TOOLTIP" value="7" enum="AccessibilityAction">
+			Hide tooltip action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SHOW_TOOLTIP" value="8" enum="AccessibilityAction">
+			Show tooltip action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SET_TEXT_SELECTION" value="9" enum="AccessibilityAction">
+			Set text selection action, callback argument is set to [Dictionary] with the following keys:
+			- [code]"start_element"[/code] accessibility element of the selection start.
+			- [code]"start_char"[/code] character offset relative to the accessibility element of the selection start.
+			- [code]"end_element"[/code] accessibility element of the selection end.
+			- [code]"end_char"[/code] character offset relative to the accessibility element of the selection end.
+		</constant>
+		<constant name="ACTION_REPLACE_SELECTED_TEXT" value="10" enum="AccessibilityAction">
+			Replace text action, callback argument is set to [String] with the replacement text.
+		</constant>
+		<constant name="ACTION_SCROLL_BACKWARD" value="11" enum="AccessibilityAction">
+			Scroll backward action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SCROLL_DOWN" value="12" enum="AccessibilityAction">
+			Scroll down action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SCROLL_FORWARD" value="13" enum="AccessibilityAction">
+			Scroll forward action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SCROLL_LEFT" value="14" enum="AccessibilityAction">
+			Scroll left action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SCROLL_RIGHT" value="15" enum="AccessibilityAction">
+			Scroll right action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SCROLL_UP" value="16" enum="AccessibilityAction">
+			Scroll up action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SCROLL_INTO_VIEW" value="17" enum="AccessibilityAction">
+			Scroll into view action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_SCROLL_TO_POINT" value="18" enum="AccessibilityAction">
+			Scroll to point action, callback argument is set to [Vector2] with the relative point coordinates.
+		</constant>
+		<constant name="ACTION_SET_SCROLL_OFFSET" value="19" enum="AccessibilityAction">
+			Set scroll offset action, callback argument is set to [Vector2] with the scroll offset.
+		</constant>
+		<constant name="ACTION_SET_VALUE" value="20" enum="AccessibilityAction">
+			Set value action action, callback argument is set to [String] or number with the new value.
+		</constant>
+		<constant name="ACTION_SHOW_CONTEXT_MENU" value="21" enum="AccessibilityAction">
+			Show context menu action, callback argument is not set.
+		</constant>
+		<constant name="ACTION_CUSTOM" value="22" enum="AccessibilityAction">
+			Custom action, callback argument is set to the integer action id.
+		</constant>
+		<constant name="LIVE_OFF" value="0" enum="AccessibilityLiveMode">
+			Indicates that updates to the live region should not be presented.
+		</constant>
+		<constant name="LIVE_POLITE" value="1" enum="AccessibilityLiveMode">
+			Indicates that updates to the live region should be presented at the next opportunity (for example at the end of speaking the current sentence).
+		</constant>
+		<constant name="LIVE_ASSERTIVE" value="2" enum="AccessibilityLiveMode">
+			Indicates that updates to the live region have the highest priority and should be presented immediately.
+		</constant>
 		<constant name="MOUSE_MODE_VISIBLE" value="0" enum="MouseMode">
 			Makes the mouse cursor visible if it is hidden.
 		</constant>
@@ -2124,7 +3035,6 @@
 			Full screen mode with full multi-window support.
 			Full screen window covers the entire display area of a screen and has no decorations. The display's video mode is not changed.
 			[b]On Android:[/b] This enables immersive mode.
-			[b]On Windows:[/b] Multi-window full-screen mode has a 1px border of the [member ProjectSettings.rendering/environment/defaults/default_clear_color] color.
 			[b]On macOS:[/b] A new desktop is used to display the running project.
 			[b]Note:[/b] Regardless of the platform, enabling full screen will change the window size to match the monitor's size. Therefore, make sure your project supports [url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html]multiple resolutions[/url] when enabling full screen mode.
 		</constant>
@@ -2172,11 +3082,22 @@
 			[b]Note:[/b] This flag is implemented only on Windows (11).
 		</constant>
 		<constant name="WINDOW_FLAG_EXCLUDE_FROM_CAPTURE" value="9" enum="WindowFlags">
-			Windows is excluded from screenshots taken by [method screen_get_image], [method screen_get_image_rect], and [method screen_get_pixel].
+			Window is excluded from screenshots taken by [method screen_get_image], [method screen_get_image_rect], and [method screen_get_pixel].
 			[b]Note:[/b] This flag is implemented on macOS and Windows.
-			[b]Note:[/b] Setting this flag will [b]NOT[/b] prevent other apps from capturing an image, it should not be used as a security measure.
+			[b]Note:[/b] Setting this flag will [b]NOT[/b] prevent other apps from capturing an image. It should not be used as a security measure.
 		</constant>
-		<constant name="WINDOW_FLAG_MAX" value="10" enum="WindowFlags">
+		<constant name="WINDOW_FLAG_POPUP_WM_HINT" value="10" enum="WindowFlags">
+			Signals the window manager that this window is supposed to be an implementation-defined "popup" (usually a floating, borderless, untileable and immovable child window).
+		</constant>
+		<constant name="WINDOW_FLAG_MINIMIZE_DISABLED" value="11" enum="WindowFlags">
+			Window minimize button is disabled.
+			[b]Note:[/b] This flag is implemented on macOS and Windows.
+		</constant>
+		<constant name="WINDOW_FLAG_MAXIMIZE_DISABLED" value="12" enum="WindowFlags">
+			Window maximize button is disabled.
+			[b]Note:[/b] This flag is implemented on macOS and Windows.
+		</constant>
+		<constant name="WINDOW_FLAG_MAX" value="13" enum="WindowFlags">
 			Max value of the [enum WindowFlags].
 		</constant>
 		<constant name="WINDOW_EVENT_MOUSE_ENTER" value="0" enum="WindowEvent">
@@ -2200,12 +3121,16 @@
 		</constant>
 		<constant name="WINDOW_EVENT_DPI_CHANGE" value="6" enum="WindowEvent">
 			Sent when the window is moved to the display with different DPI, or display DPI is changed.
-			[b]Note:[/b] This flag is implemented only on macOS.
+			[b]Note:[/b] This flag is implemented only on macOS and Linux (Wayland).
 		</constant>
 		<constant name="WINDOW_EVENT_TITLEBAR_CHANGE" value="7" enum="WindowEvent">
 			Sent when the window title bar decoration is changed (e.g. [constant WINDOW_FLAG_EXTEND_TO_TITLE] is set or window entered/exited full screen mode).
 			[b]Note:[/b] This flag is implemented only on macOS.
 		</constant>
+		<constant name="WINDOW_EVENT_FORCE_CLOSE" value="8" enum="WindowEvent">
+			Sent when the window has been forcibly closed by the Display Server. The window shall immediately hide and clean any internal rendering references.
+			[b]Note:[/b] This flag is implemented only on Linux (Wayland).
+		</constant>
 		<constant name="WINDOW_EDGE_TOP_LEFT" value="0" enum="WindowResizeEdge">
 			Top-left edge of a window.
 		</constant>
diff --git a/engine/doc/classes/EditorExportPlatform.xml b/engine/doc/classes/EditorExportPlatform.xml
index 8a742775..ef38ffe0 100644
--- a/engine/doc/classes/EditorExportPlatform.xml
+++ b/engine/doc/classes/EditorExportPlatform.xml
@@ -121,6 +121,7 @@
 		</method>
 		<method name="get_forced_export_files" qualifiers="static">
 			<return type="PackedStringArray" />
+			<param index="0" name="preset" type="EditorExportPreset" />
 			<description>
 				Returns array of core file names that always should be exported regardless of preset config.
 			</description>
diff --git a/engine/doc/classes/EditorExportPlugin.xml b/engine/doc/classes/EditorExportPlugin.xml
index 23e3f413..01dff2b5 100644
--- a/engine/doc/classes/EditorExportPlugin.xml
+++ b/engine/doc/classes/EditorExportPlugin.xml
@@ -241,6 +241,16 @@
 				Return [code]true[/code] if the plugin supports the given [param platform].
 			</description>
 		</method>
+		<method name="_update_android_prebuilt_manifest" qualifiers="virtual const">
+			<return type="PackedByteArray" />
+			<param index="0" name="platform" type="EditorExportPlatform" />
+			<param index="1" name="manifest_data" type="PackedByteArray" />
+			<description>
+				Provide access to the Android prebuilt manifest and allows the plugin to modify it if needed.
+				Implementers of this virtual method should take the binary manifest data from [param manifest_data], copy it, modify it, and then return it with the modifications.
+				If no modifications are needed, then an empty [PackedByteArray] should be returned.
+			</description>
+		</method>
 		<method name="add_file">
 			<return type="void" />
 			<param index="0" name="path" type="String" />
diff --git a/engine/doc/classes/EditorExportPreset.xml b/engine/doc/classes/EditorExportPreset.xml
index 7405dfb4..a2d08f45 100644
--- a/engine/doc/classes/EditorExportPreset.xml
+++ b/engine/doc/classes/EditorExportPreset.xml
@@ -36,13 +36,13 @@
 		<method name="get_encrypt_directory" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code], PCK directory encryption is enabled in the export dialog.
+				Returns [code]true[/code] if PCK directory encryption is enabled in the export dialog.
 			</description>
 		</method>
 		<method name="get_encrypt_pck" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code], PCK encryption is enabled in the export dialog.
+				Returns [code]true[/code] if PCK encryption is enabled in the export dialog.
 			</description>
 		</method>
 		<method name="get_encryption_ex_filter" qualifiers="const">
@@ -121,6 +121,13 @@
 				Returns export preset name.
 			</description>
 		</method>
+		<method name="get_project_setting">
+			<return type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<description>
+				Returns the value of the setting identified by [param name] using export preset feature tag overrides instead of current OS features.
+			</description>
+		</method>
 		<method name="get_script_export_mode" qualifiers="const">
 			<return type="int" />
 			<description>
@@ -140,7 +147,7 @@
 			<return type="bool" />
 			<param index="0" name="property" type="StringName" />
 			<description>
-				Returns [code]true[/code] if preset has specified property.
+				Returns [code]true[/code] if the preset has the property named [param property].
 			</description>
 		</method>
 		<method name="has_export_file">
diff --git a/engine/doc/classes/EditorInspector.xml b/engine/doc/classes/EditorInspector.xml
index 644cbe5b..0bbd55f0 100644
--- a/engine/doc/classes/EditorInspector.xml
+++ b/engine/doc/classes/EditorInspector.xml
@@ -51,6 +51,7 @@
 	<members>
 		<member name="draw_focus_border" type="bool" setter="set_draw_focus_border" getter="get_draw_focus_border" overrides="ScrollContainer" default="true" />
 		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
+		<member name="follow_focus" type="bool" setter="set_follow_focus" getter="is_following_focus" overrides="ScrollContainer" default="true" />
 		<member name="horizontal_scroll_mode" type="int" setter="set_horizontal_scroll_mode" getter="get_horizontal_scroll_mode" overrides="ScrollContainer" enum="ScrollContainer.ScrollMode" default="0" />
 	</members>
 	<signals>
diff --git a/engine/doc/classes/EditorInterface.xml b/engine/doc/classes/EditorInterface.xml
index d4acb820..26828882 100644
--- a/engine/doc/classes/EditorInterface.xml
+++ b/engine/doc/classes/EditorInterface.xml
@@ -101,7 +101,7 @@
 			<return type="float" />
 			<description>
 				Returns the actual scale of the editor UI ([code]1.0[/code] being 100% scale). This can be used to adjust position and dimensions of the UI added by plugins.
-				[b]Note:[/b] This value is set via the [code]interface/editor/display_scale[/code] and [code]interface/editor/custom_display_scale[/code] editor settings. Editor must be restarted for changes to be properly applied.
+				[b]Note:[/b] This value is set via the [member EditorSettings.interface/editor/display_scale] and [member EditorSettings.interface/editor/custom_display_scale] settings. The editor must be restarted for changes to be properly applied.
 			</description>
 		</method>
 		<method name="get_editor_settings" qualifiers="const">
@@ -156,10 +156,16 @@
 				[b]Warning:[/b] Removing and freeing this node will render a part of the editor useless and may cause a crash.
 			</description>
 		</method>
+		<method name="get_open_scene_roots" qualifiers="const">
+			<return type="Node[]" />
+			<description>
+				Returns an array with references to the root nodes of the currently opened scenes.
+			</description>
+		</method>
 		<method name="get_open_scenes" qualifiers="const">
 			<return type="PackedStringArray" />
 			<description>
-				Returns an [Array] with the file paths of the currently opened scenes.
+				Returns an array with the file paths of the currently opened scenes.
 			</description>
 		</method>
 		<method name="get_playing_scene" qualifiers="const">
@@ -438,7 +444,7 @@
 			<return type="void" />
 			<param index="0" name="name" type="String" />
 			<description>
-				Sets the editor's current main screen to the one specified in [param name]. [param name] must match the title of the tab in question exactly (e.g. [code]2D[/code], [code]3D[/code], [code skip-lint]Script[/code], or [code]AssetLib[/code] for default tabs).
+				Sets the editor's current main screen to the one specified in [param name]. [param name] must match the title of the tab in question exactly (e.g. [code]2D[/code], [code]3D[/code], [code skip-lint]Script[/code], [code]Game[/code], or [code]AssetLib[/code] for default tabs).
 			</description>
 		</method>
 		<method name="set_plugin_enabled">
diff --git a/engine/doc/classes/EditorPlugin.xml b/engine/doc/classes/EditorPlugin.xml
index 2cc9e08d..e2fc5f0a 100644
--- a/engine/doc/classes/EditorPlugin.xml
+++ b/engine/doc/classes/EditorPlugin.xml
@@ -55,16 +55,16 @@
 			<return type="void" />
 			<param index="0" name="viewport_control" type="Control" />
 			<description>
-				Called by the engine when the 3D editor's viewport is updated. Use the [code]overlay[/code] [Control] for drawing. You can update the viewport manually by calling [method update_overlays].
+				Called by the engine when the 3D editor's viewport is updated. [param viewport_control] is an overlay on top of the viewport and it can be used for drawing. You can update the viewport manually by calling [method update_overlays].
 				[codeblocks]
 				[gdscript]
 				func _forward_3d_draw_over_viewport(overlay):
-				    # Draw a circle at cursor position.
+				    # Draw a circle at the cursor's position.
 				    overlay.draw_circle(overlay.get_local_mouse_position(), 64, Color.WHITE)
 
 				func _forward_3d_gui_input(camera, event):
 				    if event is InputEventMouseMotion:
-				        # Redraw viewport when cursor is moved.
+				        # Redraw the viewport when the cursor is moved.
 				        update_overlays()
 				        return EditorPlugin.AFTER_GUI_INPUT_STOP
 				    return EditorPlugin.AFTER_GUI_INPUT_PASS
@@ -72,7 +72,7 @@
 				[csharp]
 				public override void _Forward3DDrawOverViewport(Control viewportControl)
 				{
-				    // Draw a circle at cursor position.
+				    // Draw a circle at the cursor's position.
 				    viewportControl.DrawCircle(viewportControl.GetLocalMousePosition(), 64, Colors.White);
 				}
 
@@ -80,7 +80,7 @@
 				{
 				    if (@event is InputEventMouseMotion)
 				    {
-				        // Redraw viewport when cursor is moved.
+				        // Redraw the viewport when the cursor is moved.
 				        UpdateOverlays();
 				        return EditorPlugin.AfterGuiInput.Stop;
 				    }
@@ -139,16 +139,16 @@
 			<return type="void" />
 			<param index="0" name="viewport_control" type="Control" />
 			<description>
-				Called by the engine when the 2D editor's viewport is updated. Use the [code]overlay[/code] [Control] for drawing. You can update the viewport manually by calling [method update_overlays].
+				Called by the engine when the 2D editor's viewport is updated. [param viewport_control] is an overlay on top of the viewport and it can be used for drawing. You can update the viewport manually by calling [method update_overlays].
 				[codeblocks]
 				[gdscript]
 				func _forward_canvas_draw_over_viewport(overlay):
-				    # Draw a circle at cursor position.
+				    # Draw a circle at the cursor's position.
 				    overlay.draw_circle(overlay.get_local_mouse_position(), 64, Color.WHITE)
 
 				func _forward_canvas_gui_input(event):
 				    if event is InputEventMouseMotion:
-				        # Redraw viewport when cursor is moved.
+				        # Redraw the viewport when the cursor is moved.
 				        update_overlays()
 				        return true
 				    return false
@@ -156,7 +156,7 @@
 				[csharp]
 				public override void _ForwardCanvasDrawOverViewport(Control viewportControl)
 				{
-				    // Draw a circle at cursor position.
+				    // Draw a circle at the cursor's position.
 				    viewportControl.DrawCircle(viewportControl.GetLocalMousePosition(), 64, Colors.White);
 				}
 
@@ -164,7 +164,7 @@
 				{
 				    if (@event is InputEventMouseMotion)
 				    {
-				        // Redraw viewport when cursor is moved.
+				        // Redraw the viewport when the cursor is moved.
 				        UpdateOverlays();
 				        return true;
 				    }
@@ -234,7 +234,7 @@
 			<return type="Texture2D" />
 			<description>
 				Override this method in your plugin to return a [Texture2D] in order to give it an icon.
-				For main screen plugins, this appears at the top of the screen, to the right of the "2D", "3D", "Script", and "AssetLib" buttons.
+				For main screen plugins, this appears at the top of the screen, to the right of the "2D", "3D", "Script", "Game", and "AssetLib" buttons.
 				Ideally, the plugin icon should be white with a transparent background and 16×16 pixels in size.
 				[codeblocks]
 				[gdscript]
@@ -260,7 +260,7 @@
 			<return type="String" />
 			<description>
 				Override this method in your plugin to provide the name of the plugin when displayed in the Godot editor.
-				For main screen plugins, this appears at the top of the screen, to the right of the "2D", "3D", "Script", and "AssetLib" buttons.
+				For main screen plugins, this appears at the top of the screen, to the right of the "2D", "3D", "Script", "Game", and "AssetLib" buttons.
 			</description>
 		</method>
 		<method name="_get_state" qualifiers="virtual const">
@@ -329,7 +329,7 @@
 		<method name="_has_main_screen" qualifiers="virtual const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if this is a main screen editor plugin (it goes in the workspace selector together with [b]2D[/b], [b]3D[/b], [b]Script[/b] and [b]AssetLib[/b]).
+				Returns [code]true[/code] if this is a main screen editor plugin (it goes in the workspace selector together with [b]2D[/b], [b]3D[/b], [b]Script[/b], [b]Game[/b], and [b]AssetLib[/b]).
 				When the plugin's workspace is selected, other main screen plugins will be hidden, but your plugin will not appear automatically. It needs to be added as a child of [method EditorInterface.get_editor_main_screen] and made visible inside [method _make_visible].
 				Use [method _get_plugin_name] and [method _get_plugin_icon] to customize the plugin button's appearance.
 				[codeblock]
@@ -439,7 +439,7 @@
 				Adds the control to a specific dock slot (see [enum DockSlot] for options).
 				If the dock is repositioned and as long as the plugin is active, the editor will save the dock position on further sessions.
 				When your plugin is deactivated, make sure to remove your custom control with [method remove_control_from_docks] and free it with [method Node.queue_free].
-				Optionally, you can specify a shortcut parameter. When pressed, this shortcut will toggle the dock's visibility once it's moved to the bottom panel (this shortcut does not affect the dock otherwise). See the default editor bottom panel shortcuts in the Editor Settings for inspiration. Per convention, they all use [kbd]Alt[/kbd] modifier.
+				Optionally, you can specify a shortcut parameter. When pressed, this shortcut will open and focus the dock.
 			</description>
 		</method>
 		<method name="add_custom_type">
@@ -784,7 +784,7 @@
 		<signal name="main_screen_changed">
 			<param index="0" name="screen_name" type="String" />
 			<description>
-				Emitted when user changes the workspace ([b]2D[/b], [b]3D[/b], [b]Script[/b], [b]AssetLib[/b]). Also works with custom screens defined by plugins.
+				Emitted when user changes the workspace ([b]2D[/b], [b]3D[/b], [b]Script[/b], [b]Game[/b], [b]AssetLib[/b]). Also works with custom screens defined by plugins.
 			</description>
 		</signal>
 		<signal name="project_settings_changed" deprecated="Use [signal ProjectSettings.settings_changed] instead.">
diff --git a/engine/doc/classes/EditorProperty.xml b/engine/doc/classes/EditorProperty.xml
index cf829684..aea0a218 100644
--- a/engine/doc/classes/EditorProperty.xml
+++ b/engine/doc/classes/EditorProperty.xml
@@ -118,6 +118,7 @@
 		<member name="draw_warning" type="bool" setter="set_draw_warning" getter="is_draw_warning" default="false">
 			Used by the inspector, set to [code]true[/code] when the property is drawn with the editor theme's warning color. This is used for editable children's properties.
 		</member>
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="3" />
 		<member name="keying" type="bool" setter="set_keying" getter="is_keying" default="false">
 			Used by the inspector, set to [code]true[/code] when the property can add keys for animation.
 		</member>
diff --git a/engine/doc/classes/EditorSelection.xml b/engine/doc/classes/EditorSelection.xml
index 4ef960ac..40dc1a24 100644
--- a/engine/doc/classes/EditorSelection.xml
+++ b/engine/doc/classes/EditorSelection.xml
@@ -30,10 +30,17 @@
 				Returns the list of selected nodes.
 			</description>
 		</method>
-		<method name="get_transformable_selected_nodes">
+		<method name="get_top_selected_nodes">
 			<return type="Node[]" />
 			<description>
-				Returns the list of selected nodes, optimized for transform operations (i.e. moving them, rotating, etc.). This list can be used to avoid situations where a node is selected and is also a child/grandchild.
+				Returns the list of top selected nodes only, excluding any children. This is useful for performing transform operations (moving them, rotating, etc.).
+				For example, if there is a node A with a child B and a sibling C, then selecting all three will cause this method to return only A and C. Changing the global transform of A will affect the global transform of B, so there is no need to change B separately.
+			</description>
+		</method>
+		<method name="get_transformable_selected_nodes" deprecated="Use [method get_top_selected_nodes] instead.">
+			<return type="Node[]" />
+			<description>
+				Returns the list of top selected nodes only, excluding any children. This is useful for performing transform operations (moving them, rotating, etc.). See [method get_top_selected_nodes].
 			</description>
 		</method>
 		<method name="remove_node">
diff --git a/engine/doc/classes/EditorSettings.xml b/engine/doc/classes/EditorSettings.xml
index de1af96a..cb4463d7 100644
--- a/engine/doc/classes/EditorSettings.xml
+++ b/engine/doc/classes/EditorSettings.xml
@@ -191,6 +191,10 @@
 		<member name="debugger/auto_switch_to_stack_trace" type="bool" setter="" getter="">
 			If [code]true[/code], automatically switches to the [b]Stack Trace[/b] panel when the debugger hits a breakpoint or steps.
 		</member>
+		<member name="debugger/max_node_selection" type="int" setter="" getter="">
+			The limit of how many remote nodes can be selected at once.
+			[b]Warning:[/b] Increasing this value is not recommended, as selecting too many can make the editing and inspection of remote properties unreliable.
+		</member>
 		<member name="debugger/profile_native_calls" type="bool" setter="" getter="">
 			If [code]true[/code], enables collection of profiling data from non-GDScript Godot functions, such as engine class methods. Enabling this slows execution while profiling further.
 		</member>
@@ -229,6 +233,9 @@
 		<member name="docks/property_editor/subresource_hue_tint" type="float" setter="" getter="">
 			The tint intensity to use for the subresources background in the Inspector dock. The tint is used to distinguish between different subresources in the inspector. Higher values result in a more noticeable background color difference.
 		</member>
+		<member name="docks/scene_tree/accessibility_warnings" type="bool" setter="" getter="">
+			If [code]true[/code], accessibility related warnings are displayed alongside other configuration warnings.
+		</member>
 		<member name="docks/scene_tree/ask_before_deleting_related_animation_tracks" type="bool" setter="" getter="">
 			If [code]true[/code], when a node is deleted with animation tracks referencing it, a confirmation dialog appears before the tracks are deleted. The dialog will appear even when using the "Delete (No Confirm)" shortcut.
 		</member>
@@ -288,6 +295,10 @@
 		<member name="editors/2d/zoom_speed_factor" type="float" setter="" getter="">
 			The factor to use when zooming in or out in the 2D editor. For example, [code]1.1[/code] will zoom in by 10% with every step. If set to [code]2.0[/code], zooming will only cycle through powers of two.
 		</member>
+		<member name="editors/3d/active_selection_box_color" type="Color" setter="" getter="">
+			The color to use for the active selection box that surrounds selected nodes in the 3D editor viewport. The color's alpha channel influences the selection box's opacity.
+			[b]Note:[/b] The term "active" indicates that this object is the primary selection used as the basis for certain operations. This is the last selected [Node3D], which can be reordered with [kbd]Shift + Left mouse button[/kbd].
+		</member>
 		<member name="editors/3d/default_fov" type="float" setter="" getter="">
 			The default camera vertical field of view to use in the 3D editor (in degrees). The camera field of view can be adjusted on a per-scene basis using the [b]View[/b] menu at the top of the 3D editor. If a scene had its camera field of view adjusted using the [b]View[/b] menu, this setting is ignored in the scene in question. This setting is also ignored while a [Camera3D] node is being previewed in the editor.
 			[b]Note:[/b] The editor camera always uses the [b]Keep Height[/b] aspect mode.
@@ -514,12 +525,22 @@
 			If [code]true[/code], display a confirmation dialog when adding a new track to an animation by pressing the "key" icon next to a property. Holding Shift will bypass the dialog.
 			If [code]false[/code], the behavior is reversed, i.e. the dialog only appears when Shift is held.
 		</member>
+		<member name="editors/animation/default_animation_step" type="float" setter="" getter="">
+			Default step used when creating a new [Animation] in the Animation bottom panel. Only affects the first animation created in the [AnimationPlayer]. By default, other newly created animations will use the step from the previous ones.
+			This value is always expressed in seconds. If you want e.g. [code]10[/code] FPS to be the default, you need to set the default step to [code]0.1[/code].
+		</member>
 		<member name="editors/animation/default_create_bezier_tracks" type="bool" setter="" getter="">
 			If [code]true[/code], create a Bezier track instead of a standard track when pressing the "key" icon next to a property. Bezier tracks provide more control over animation curves, but are more difficult to adjust quickly.
 		</member>
 		<member name="editors/animation/default_create_reset_tracks" type="bool" setter="" getter="">
 			If [code]true[/code], create a [code]RESET[/code] track when creating a new animation track. This track can be used to restore the animation to a "default" state.
 		</member>
+		<member name="editors/animation/default_fps_compatibility" type="bool" setter="" getter="">
+			Controls whether [AnimationPlayer] will apply snapping to nearest integer FPS when snapping is in Seconds mode. The option is remembered locally for a scene and this option only determines the default value when scene doesn't have local state yet.
+		</member>
+		<member name="editors/animation/default_fps_mode" type="int" setter="" getter="">
+			Default step mode for [AnimationPlayer] (seconds or FPS). The option is remembered locally for a scene and this option only determines the default value when scene doesn't have local state yet.
+		</member>
 		<member name="editors/animation/onion_layers_future_color" type="Color" setter="" getter="">
 			The modulate color to use for "future" frames displayed in the animation editor's onion skinning feature.
 		</member>
@@ -787,7 +808,7 @@
 		</member>
 		<member name="interface/editor/accept_dialog_cancel_ok_buttons" type="int" setter="" getter="">
 			How to position the Cancel and OK buttons in the editor's [AcceptDialog]s. Different platforms have different standard behaviors for this, which can be overridden using this setting. This is useful if you use Godot both on Windows and macOS/Linux and your Godot muscle memory is stronger than your OS specific one.
-			- [b]Auto[/b] follows the platform convention: Cancel first on macOS and Linux, OK first on Windows.
+			- [b]Auto[/b] follows the platform convention: OK first on Windows, KDE, and LXQt, Cancel first on macOS and other Linux desktop environments.
 			- [b]Cancel First[/b] forces the ordering Cancel/OK.
 			- [b]OK First[/b] forces the ordering OK/Cancel.
 		</member>
@@ -829,7 +850,7 @@
 			Translations are provided by the community. If you spot a mistake, [url=$DOCS_URL/contributing/documentation/editor_and_docs_localization.html]contribute to editor translations on Weblate![/url]
 		</member>
 		<member name="interface/editor/editor_screen" type="int" setter="" getter="">
-			The preferred monitor to display the editor. If [b]Auto[/b], the editor will remember the last screen it was displayed on across restarts.
+			The preferred monitor to display the editor. If [b]Auto[/b], the editor will remember the last screen it was displayed on across multiple sessions.
 		</member>
 		<member name="interface/editor/expand_to_title" type="bool" setter="" getter="">
 			Expanding main editor window content to the title, if supported by [DisplayServer]. See [constant DisplayServer.WINDOW_FLAG_EXTEND_TO_TITLE].
@@ -890,7 +911,7 @@
 			If [code]true[/code], scenes and scripts are saved when the editor loses focus. Depending on the work flow, this behavior can be less intrusive than [member text_editor/behavior/files/autosave_interval_secs] or remembering to save manually.
 		</member>
 		<member name="interface/editor/separate_distraction_mode" type="bool" setter="" getter="">
-			If [code]true[/code], the editor's Script tab will have a separate distraction mode setting from the 2D/3D/AssetLib tabs. If [code]false[/code], the distraction-free mode toggle is shared between all tabs.
+			If [code]true[/code], the editor's Script tab will have a separate distraction mode setting from the 2D/3D/Game/AssetLib tabs. If [code]false[/code], the distraction-free mode toggle is shared between all tabs.
 		</member>
 		<member name="interface/editor/show_internal_errors_in_toast_notifications" type="int" setter="" getter="">
 			If enabled, displays internal engine errors in toast notifications (toggleable by clicking the "bell" icon at the bottom of the editor). No matter the value of this setting, non-internal engine errors will always be visible in toast notifications.
@@ -909,6 +930,9 @@
 			[b]Note:[/b] To query whether the editor can use multiple windows in an editor plugin, use [method EditorInterface.is_multi_window_enabled] instead of querying the value of this editor setting.
 			[b]Note:[/b] If [code]true[/code], game embedding is disabled.
 		</member>
+		<member name="interface/editor/tablet_driver" type="int" setter="" getter="">
+			Overrides the tablet driver used by the editor.
+		</member>
 		<member name="interface/editor/ui_layout_direction" type="int" setter="" getter="">
 			Editor UI default layout direction.
 		</member>
@@ -1081,6 +1105,10 @@
 			If [code]true[/code], enable two finger pan and scale gestures on touchscreen devices.
 			[b]Note:[/b] Defaults to [code]true[/code] on touchscreen devices.
 		</member>
+		<member name="interface/touchscreen/enable_touch_actions_panel" type="bool" setter="" getter="">
+			If [code]true[/code], enables the TouchActionsPanel to provide easy access to keyboard shortcuts on touchscreen devices.
+			[b]Note:[/b] Only available in the Android editor.
+		</member>
 		<member name="interface/touchscreen/increase_scrollbar_touch_area" type="bool" setter="" getter="">
 			If [code]true[/code], increases the scrollbar touch area to improve usability on touchscreen devices.
 			[b]Note:[/b] Defaults to [code]true[/code] on touchscreen devices.
@@ -1165,7 +1193,7 @@
 		</member>
 		<member name="run/window_placement/rect" type="int" setter="" getter="">
 			The window mode to use to display the project when starting the project from the editor.
-			[b]Note:[/b] Game embedding is not available for "Force Maximized" or "Force Fullscreen."
+			[b]Note:[/b] Game embedding is not available for [b]"Force Maximized"[/b] or [b]"Force Fullscreen"[/b].
 		</member>
 		<member name="run/window_placement/rect_custom_position" type="Vector2" setter="" getter="">
 			The custom position to use when starting the project from the editor (in pixels from the top-left corner). Only effective if [member run/window_placement/rect] is set to [b]Custom Position[/b].
@@ -1248,6 +1276,10 @@
 		<member name="text_editor/behavior/files/convert_indent_on_save" type="bool" setter="" getter="">
 			If [code]true[/code], converts indentation to match the script editor's indentation settings when saving a script. See also [member text_editor/behavior/indent/type].
 		</member>
+		<member name="text_editor/behavior/files/drop_preload_resources_as_uid" type="bool" setter="" getter="">
+			If [code]true[/code], when dropping a [Resource] file to script editor while [kbd]Ctrl[/kbd] is held, the resource will be preloaded with a UID. If [code]false[/code], the resource will be preloaded with a path.
+			When you hold [kbd]Ctrl+Shift[/kbd], the behavior is reversed.
+		</member>
 		<member name="text_editor/behavior/files/open_dominant_script_on_scene_change" type="bool" setter="" getter="">
 			If [code]true[/code], opening a scene automatically opens the script attached to the root node, or the topmost node if the root has no script.
 		</member>
@@ -1517,6 +1549,9 @@
 		<member name="text_editor/theme/highlighting/user_type_color" type="Color" setter="" getter="">
 			The script editor's color for user-defined types (using [code]class_name[/code]).
 		</member>
+		<member name="text_editor/theme/highlighting/warning_color" type="Color" setter="" getter="">
+			The script editor's background color for lines with warnings. This should be set to a translucent color so that it can display on top of other line color modifiers such as [member text_editor/theme/highlighting/current_line_color].
+		</member>
 		<member name="text_editor/theme/highlighting/word_highlighted_color" type="Color" setter="" getter="">
 			The script editor's color for words highlighted by selecting them. Only visible if [member text_editor/appearance/caret/highlight_all_occurrences] is [code]true[/code].
 		</member>
diff --git a/engine/doc/classes/FileAccess.xml b/engine/doc/classes/FileAccess.xml
index 03a1146a..248c1000 100644
--- a/engine/doc/classes/FileAccess.xml
+++ b/engine/doc/classes/FileAccess.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		This class can be used to permanently store data in the user device's file system and to read from it. This is useful for storing game save data or player configuration files.
-		Here's a sample on how to write and read from a file:
+		[b]Example:[/b] How to write and read from a file. The file named [code]"save_game.dat"[/code] will be stored in the user data folder, as specified in the [url=$DOCS_URL/tutorials/io/data_paths.html]Data paths[/url] documentation:
 		[codeblocks]
 		[gdscript]
 		func save_to_file(content):
@@ -32,10 +32,9 @@
 		}
 		[/csharp]
 		[/codeblocks]
-		In the example above, the file will be saved in the user data folder as specified in the [url=$DOCS_URL/tutorials/io/data_paths.html]Data paths[/url] documentation.
-		[FileAccess] will close when it's freed, which happens when it goes out of scope or when it gets assigned with [code]null[/code]. [method close] can be used to close it before then explicitly. In C# the reference must be disposed manually, which can be done with the [code]using[/code] statement or by calling the [code]Dispose[/code] method directly.
+		A [FileAccess] instance will close its file when the instance is freed. Since it inherits [RefCounted], this happens automatically when it is no longer in use. [method close] can be called to close it earlier. In C#, the reference must be disposed manually, which can be done with the [code]using[/code] statement or by calling the [code]Dispose[/code] method directly.
 		[b]Note:[/b] To access project resources once exported, it is recommended to use [ResourceLoader] instead of [FileAccess], as some files are converted to engine-specific formats and their original source files might not be present in the exported PCK package. If using [FileAccess], make sure the file is included in the export by changing its import mode to [b]Keep File (exported as is)[/b] in the Import dock, or, for files where this option is not available, change the non-resource export filter in the Export dialog to include the file's extension (e.g. [code]*.txt[/code]).
-		[b]Note:[/b] Files are automatically closed only if the process exits "normally" (such as by clicking the window manager's close button or pressing [b]Alt + F4[/b]). If you stop the project execution by pressing [b]F8[/b] while the project is running, the file won't be closed as the game process will be killed. You can work around this by calling [method flush] at regular intervals.
+		[b]Note:[/b] Files are automatically closed only if the process exits "normally" (such as by clicking the window manager's close button or pressing [kbd]Alt + F4[/kbd]). If you stop the project execution by pressing [kbd]F8[/kbd] while the project is running, the file won't be closed as the game process will be killed. You can work around this by calling [method flush] at regular intervals.
 	</description>
 	<tutorials>
 		<link title="File system">$DOCS_URL/tutorials/scripting/filesystem.html</link>
@@ -123,6 +122,13 @@
 				Returns the next 64 bits from the file as an integer. See [method store_64] for details on what values can be stored and retrieved this way.
 			</description>
 		</method>
+		<method name="get_access_time" qualifiers="static">
+			<return type="int" />
+			<param index="0" name="file" type="String" />
+			<description>
+				Returns the last time the [param file] was accessed in Unix timestamp format, or [code]0[/code] on error. This Unix timestamp can be converted to another format using the [Time] singleton.
+			</description>
+		</method>
 		<method name="get_as_text" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="skip_cr" type="bool" default="false" />
@@ -280,6 +286,13 @@
 				Returns an SHA-256 [String] representing the file at the given path or an empty [String] on failure.
 			</description>
 		</method>
+		<method name="get_size" qualifiers="static">
+			<return type="int" />
+			<param index="0" name="file" type="String" />
+			<description>
+				Returns file size in bytes, or [code]-1[/code] on error.
+			</description>
+		</method>
 		<method name="get_unix_permissions" qualifiers="static">
 			<return type="int" enum="FileAccess.UnixPermissionFlags" is_bitfield="true" />
 			<param index="0" name="file" type="String" />
@@ -555,8 +568,7 @@
 	<members>
 		<member name="big_endian" type="bool" setter="set_big_endian" getter="is_big_endian">
 			If [code]true[/code], the file is read with big-endian [url=https://en.wikipedia.org/wiki/Endianness]endianness[/url]. If [code]false[/code], the file is read with little-endian endianness. If in doubt, leave this to [code]false[/code] as most files are written with little-endian endianness.
-			[b]Note:[/b] [member big_endian] is only about the file format, not the CPU type. The CPU endianness doesn't affect the default endianness for files written.
-			[b]Note:[/b] This is always reset to [code]false[/code] whenever you open the file. Therefore, you must set [member big_endian] [i]after[/i] opening the file, not before.
+			[b]Note:[/b] This is always reset to system endianness, which is little-endian on all supported platforms, whenever you open the file. Therefore, you must set [member big_endian] [i]after[/i] opening the file, not before.
 		</member>
 	</members>
 	<constants>
diff --git a/engine/doc/classes/FoldableContainer.xml b/engine/doc/classes/FoldableContainer.xml
new file mode 100644
index 00000000..677a65fc
--- /dev/null
+++ b/engine/doc/classes/FoldableContainer.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="FoldableContainer" inherits="Container" keywords="expandable, collapsible, collapse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+	<brief_description>
+		A container that can be expanded/collapsed.
+	</brief_description>
+	<description>
+		A container that can be expanded/collapsed, with a title that can be filled with controls, such as buttons.
+		The title can be positioned at the top or bottom of the container.
+		The container can be expanded or collapsed by clicking the title or by pressing [code]ui_accept[/code] when focused.
+		Child control nodes are hidden when the container is collapsed. Ignores non-control children.
+		Can allow grouping with other FoldableContainers, check [member foldable_group] and [FoldableGroup].
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="add_title_bar_control">
+			<return type="void" />
+			<param index="0" name="control" type="Control" />
+			<description>
+				Adds a [Control] that will be placed next to the container's title, obscuring the clickable area. Prime usage is adding [Button] nodes, but it can be any [Control].
+				The control will be added as a child of this container and removed from previous parent if necessary. The controls will be placed aligned to the right, with the first added control being the leftmost one.
+			</description>
+		</method>
+		<method name="expand">
+			<return type="void" />
+			<description>
+				Expands the container and emits [signal folding_changed].
+			</description>
+		</method>
+		<method name="fold">
+			<return type="void" />
+			<description>
+				Folds the container and emits [signal folding_changed].
+			</description>
+		</method>
+		<method name="remove_title_bar_control">
+			<return type="void" />
+			<param index="0" name="control" type="Control" />
+			<description>
+				Removes a [Control] added with [method add_title_bar_control]. The node is not freed automatically, you need to use [method Node.queue_free].
+			</description>
+		</method>
+	</methods>
+	<members>
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
+		<member name="foldable_group" type="FoldableGroup" setter="set_foldable_group" getter="get_foldable_group">
+			The [FoldableGroup] associated with the container.
+		</member>
+		<member name="folded" type="bool" setter="set_folded" getter="is_folded" default="false">
+			If [code]true[/code], the container will becomes folded and will hide all its children.
+		</member>
+		<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
+			Language code used for text shaping algorithms. If left empty, current locale is used instead.
+		</member>
+		<member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" overrides="Control" enum="Control.MouseFilter" default="0" />
+		<member name="text" type="String" setter="set_text" getter="get_text" default="&quot;&quot;">
+			The Container's title text.
+		</member>
+		<member name="text_direction" type="int" setter="set_text_direction" getter="get_text_direction" enum="Control.TextDirection" default="0">
+			Base text writing direction.
+		</member>
+		<member name="text_overrun_behavior" type="int" setter="set_text_overrun_behavior" getter="get_text_overrun_behavior" enum="TextServer.OverrunBehavior" default="0">
+			Defines the behavior of the [FoldableContainer] when the text is longer than the available space.
+		</member>
+		<member name="title_alignment" type="int" setter="set_title_alignment" getter="get_title_alignment" enum="HorizontalAlignment" default="0">
+			Title's horizontal text alignment as defined in the [enum HorizontalAlignment] enum.
+		</member>
+		<member name="title_position" type="int" setter="set_title_position" getter="get_title_position" enum="FoldableContainer.TitlePosition" default="0">
+			Title's position as defined in the [enum TitlePosition] enum.
+		</member>
+	</members>
+	<signals>
+		<signal name="folding_changed">
+			<param index="0" name="is_folded" type="bool" />
+			<description>
+				Emitted when the container is folded/expanded.
+			</description>
+		</signal>
+	</signals>
+	<constants>
+		<constant name="POSITION_TOP" value="0" enum="TitlePosition">
+			Makes the title appear at the top of the container.
+		</constant>
+		<constant name="POSITION_BOTTOM" value="1" enum="TitlePosition">
+			Makes the title appear at the bottom of the container. Also makes all StyleBoxes flipped vertically.
+		</constant>
+	</constants>
+	<theme_items>
+		<theme_item name="collapsed_font_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			The title's font color when collapsed.
+		</theme_item>
+		<theme_item name="font_color" data_type="color" type="Color" default="Color(0.875, 0.875, 0.875, 1)">
+			The title's font color when expanded.
+		</theme_item>
+		<theme_item name="font_outline_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			The title's font outline color.
+		</theme_item>
+		<theme_item name="hover_font_color" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
+			The title's font hover color.
+		</theme_item>
+		<theme_item name="h_separation" data_type="constant" type="int" default="2">
+			The horizontal separation between the title's icon and text, and between title bar controls.
+		</theme_item>
+		<theme_item name="outline_size" data_type="constant" type="int" default="0">
+			The title's font outline size.
+		</theme_item>
+		<theme_item name="font" data_type="font" type="Font">
+			The title's font.
+		</theme_item>
+		<theme_item name="font_size" data_type="font_size" type="int">
+			The title's font size.
+		</theme_item>
+		<theme_item name="expanded_arrow" data_type="icon" type="Texture2D">
+			The title's icon used when expanded.
+		</theme_item>
+		<theme_item name="expanded_arrow_mirrored" data_type="icon" type="Texture2D">
+			The title's icon used when expanded (for bottom title).
+		</theme_item>
+		<theme_item name="folded_arrow" data_type="icon" type="Texture2D">
+			The title's icon used when folded (for left-to-right layouts).
+		</theme_item>
+		<theme_item name="folded_arrow_mirrored" data_type="icon" type="Texture2D">
+			The title's icon used when collapsed (for right-to-left layouts).
+		</theme_item>
+		<theme_item name="focus" data_type="style" type="StyleBox">
+			Background used when [FoldableContainer] has GUI focus. The [theme_item focus] [StyleBox] is displayed [i]over[/i] the base [StyleBox], so a partially transparent [StyleBox] should be used to ensure the base [StyleBox] remains visible. A [StyleBox] that represents an outline or an underline works well for this purpose. To disable the focus visual effect, assign a [StyleBoxEmpty] resource. Note that disabling the focus visual effect will harm keyboard/controller navigation usability, so this is not recommended for accessibility reasons.
+		</theme_item>
+		<theme_item name="panel" data_type="style" type="StyleBox">
+			Default background for the [FoldableContainer].
+		</theme_item>
+		<theme_item name="title_collapsed_hover_panel" data_type="style" type="StyleBox">
+			Background used when the mouse cursor enters the title's area when collapsed.
+		</theme_item>
+		<theme_item name="title_collapsed_panel" data_type="style" type="StyleBox">
+			Default background for the [FoldableContainer]'s title when collapsed.
+		</theme_item>
+		<theme_item name="title_hover_panel" data_type="style" type="StyleBox">
+			Background used when the mouse cursor enters the title's area when expanded.
+		</theme_item>
+		<theme_item name="title_panel" data_type="style" type="StyleBox">
+			Default background for the [FoldableContainer]'s title when expanded.
+		</theme_item>
+	</theme_items>
+</class>
diff --git a/engine/doc/classes/FoldableGroup.xml b/engine/doc/classes/FoldableGroup.xml
new file mode 100644
index 00000000..f803f0e8
--- /dev/null
+++ b/engine/doc/classes/FoldableGroup.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="FoldableGroup" inherits="Resource" keywords="expandable, collapsible, collapse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+	<brief_description>
+		A group of foldable containers that doesn't allow more than one container to be expanded at a time.
+	</brief_description>
+	<description>
+		A group of [FoldableContainer]-derived nodes. Only one container can be expanded at a time.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="get_containers" qualifiers="const">
+			<return type="FoldableContainer[]" />
+			<description>
+				Returns an [Array] of [FoldableContainer]s that have this as their FoldableGroup (see [member FoldableContainer.foldable_group]). This is equivalent to [ButtonGroup] but for FoldableContainers.
+			</description>
+		</method>
+		<method name="get_expanded_container" qualifiers="const">
+			<return type="FoldableContainer" />
+			<description>
+				Returns the current expanded container.
+			</description>
+		</method>
+	</methods>
+	<members>
+		<member name="allow_folding_all" type="bool" setter="set_allow_folding_all" getter="is_allow_folding_all" default="false">
+			If [code]true[/code], it is possible to fold all containers in this FoldableGroup.
+		</member>
+		<member name="resource_local_to_scene" type="bool" setter="set_local_to_scene" getter="is_local_to_scene" overrides="Resource" default="true" />
+	</members>
+	<signals>
+		<signal name="expanded">
+			<param index="0" name="container" type="FoldableContainer" />
+			<description>
+				Emitted when one of the containers of the group is expanded.
+			</description>
+		</signal>
+	</signals>
+</class>
diff --git a/engine/doc/classes/FontFile.xml b/engine/doc/classes/FontFile.xml
index e7a724ce..c3e744fa 100644
--- a/engine/doc/classes/FontFile.xml
+++ b/engine/doc/classes/FontFile.xml
@@ -634,6 +634,9 @@
 		<member name="keep_rounding_remainders" type="bool" setter="set_keep_rounding_remainders" getter="get_keep_rounding_remainders" default="true">
 			If set to [code]true[/code], when aligning glyphs to the pixel boundaries rounding remainders are accumulated to ensure more uniform glyph distribution. This setting has no effect if subpixel positioning is enabled.
 		</member>
+		<member name="modulate_color_glyphs" type="bool" setter="set_modulate_color_glyphs" getter="is_modulate_color_glyphs" default="false">
+			If set to [code]true[/code], color modulation is applied when drawing colored glyphs, otherwise it's applied to the monochrome glyphs only.
+		</member>
 		<member name="msdf_pixel_range" type="int" setter="set_msdf_pixel_range" getter="get_msdf_pixel_range" default="16">
 			The width of the range around the shape between the minimum and maximum representable signed distance. If using font outlines, [member msdf_pixel_range] must be set to at least [i]twice[/i] the size of the largest font outline. The default [member msdf_pixel_range] value of [code]16[/code] allows outline sizes up to [code]8[/code] to look correct.
 		</member>
diff --git a/engine/doc/classes/GraphEdit.xml b/engine/doc/classes/GraphEdit.xml
index 1d7ba4cf..39d3af92 100644
--- a/engine/doc/classes/GraphEdit.xml
+++ b/engine/doc/classes/GraphEdit.xml
@@ -208,6 +208,23 @@
 				Returns the points which would make up a connection between [param from_node] and [param to_node].
 			</description>
 		</method>
+		<method name="get_connection_list_from_node" qualifiers="const">
+			<return type="Dictionary[]" />
+			<param index="0" name="node" type="StringName" />
+			<description>
+				Returns an [Array] containing a list of all connections for [param node].
+				A connection is represented as a [Dictionary] in the form of:
+				[codeblock]
+				{
+				    from_node: StringName,
+				    from_port: int,
+				    to_node: StringName,
+				    to_port: int,
+				    keep_alive: bool
+				}
+				[/codeblock]
+			</description>
+		</method>
 		<method name="get_connections_intersecting_with_rect" qualifiers="const">
 			<return type="Dictionary[]" />
 			<param index="0" name="rect" type="Rect2" />
@@ -374,6 +391,9 @@
 		<member name="snapping_enabled" type="bool" setter="set_snapping_enabled" getter="is_snapping_enabled" default="true">
 			If [code]true[/code], enables snapping.
 		</member>
+		<member name="type_names" type="Dictionary" setter="set_type_names" getter="get_type_names" default="{}">
+			[Dictionary] of human readable port type names.
+		</member>
 		<member name="zoom" type="float" setter="set_zoom" getter="get_zoom" default="1.0">
 			The current zoom value.
 		</member>
@@ -586,5 +606,8 @@
 		<theme_item name="panel" data_type="style" type="StyleBox">
 			The background drawn under the grid.
 		</theme_item>
+		<theme_item name="panel_focus" data_type="style" type="StyleBox">
+			[StyleBox] used when the [GraphEdit] is focused (when used with assistive apps).
+		</theme_item>
 	</theme_items>
 </class>
diff --git a/engine/doc/classes/GraphNode.xml b/engine/doc/classes/GraphNode.xml
index fc8bc15b..a9445c33 100644
--- a/engine/doc/classes/GraphNode.xml
+++ b/engine/doc/classes/GraphNode.xml
@@ -267,6 +267,7 @@
 		</method>
 	</methods>
 	<members>
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="3" />
 		<member name="ignore_invalid_connection_type" type="bool" setter="set_ignore_invalid_connection_type" getter="is_ignoring_valid_connection_type" default="false">
 			If [code]true[/code], you can connect ports with different types, even if the connection was not explicitly allowed in the parent [GraphEdit].
 		</member>
@@ -299,12 +300,18 @@
 		<theme_item name="panel" data_type="style" type="StyleBox">
 			The default background for the slot area of the [GraphNode].
 		</theme_item>
+		<theme_item name="panel_focus" data_type="style" type="StyleBox">
+			[StyleBox] used when the [GraphNode] is focused (when used with assistive apps).
+		</theme_item>
 		<theme_item name="panel_selected" data_type="style" type="StyleBox">
 			The [StyleBox] used for the slot area when selected.
 		</theme_item>
 		<theme_item name="slot" data_type="style" type="StyleBox">
 			The [StyleBox] used for each slot of the [GraphNode].
 		</theme_item>
+		<theme_item name="slot_selected" data_type="style" type="StyleBox">
+			[StyleBox] used when the slot is focused (when used with assistive apps).
+		</theme_item>
 		<theme_item name="titlebar" data_type="style" type="StyleBox">
 			The [StyleBox] used for the title bar of the [GraphNode].
 		</theme_item>
diff --git a/engine/doc/classes/Image.xml b/engine/doc/classes/Image.xml
index 4421318b..af96f97a 100644
--- a/engine/doc/classes/Image.xml
+++ b/engine/doc/classes/Image.xml
@@ -346,6 +346,14 @@
 				[b]Note:[/b] This method is only available in engine builds with the BMP module enabled. By default, the BMP module is enabled, but it can be disabled at build-time using the [code]module_bmp_enabled=no[/code] SCons option.
 			</description>
 		</method>
+		<method name="load_dds_from_buffer">
+			<return type="int" enum="Error" />
+			<param index="0" name="buffer" type="PackedByteArray" />
+			<description>
+				Loads an image from the binary contents of a DDS file.
+				[b]Note:[/b] This method is only available in engine builds with the DDS module enabled. By default, the DDS module is enabled, but it can be disabled at build-time using the [code]module_dds_enabled=no[/code] SCons option.
+			</description>
+		</method>
 		<method name="load_from_file" qualifiers="static">
 			<return type="Image" />
 			<param index="0" name="path" type="String" />
@@ -458,6 +466,21 @@
 				Rotates the image by [code]180[/code] degrees. The width and height of the image must be greater than [code]1[/code].
 			</description>
 		</method>
+		<method name="save_dds" qualifiers="const">
+			<return type="int" enum="Error" />
+			<param index="0" name="path" type="String" />
+			<description>
+				Saves the image as a DDS (DirectDraw Surface) file to [param path]. DDS is a container format that can store textures in various compression formats, such as DXT1, DXT5, or BC7. This function will return [constant ERR_UNAVAILABLE] if Godot was compiled without the DDS module.
+				[b]Note:[/b] The DDS module may be disabled in certain builds, which means [method save_dds] will return [constant ERR_UNAVAILABLE] when it is called from an exported project.
+			</description>
+		</method>
+		<method name="save_dds_to_buffer" qualifiers="const">
+			<return type="PackedByteArray" />
+			<description>
+				Saves the image as a DDS (DirectDraw Surface) file to a byte array. DDS is a container format that can store textures in various compression formats, such as DXT1, DXT5, or BC7. This function will return an empty byte array if Godot was compiled without the DDS module.
+				[b]Note:[/b] The DDS module may be disabled in certain builds, which means [method save_dds_to_buffer] will return an empty byte array when it is called from an exported project.
+			</description>
+		</method>
 		<method name="save_exr" qualifiers="const">
 			<return type="int" enum="Error" />
 			<param index="0" name="path" type="String" />
diff --git a/engine/doc/classes/InputMap.xml b/engine/doc/classes/InputMap.xml
index 0abd7c69..c4b9695a 100644
--- a/engine/doc/classes/InputMap.xml
+++ b/engine/doc/classes/InputMap.xml
@@ -90,6 +90,13 @@
 				If [param exact_match] is [code]false[/code], it ignores additional input modifiers for [InputEventKey] and [InputEventMouseButton] events, and the direction for [InputEventJoypadMotion] events.
 			</description>
 		</method>
+		<method name="get_action_description" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="action" type="StringName" />
+			<description>
+				Returns the human-readable description of the given action.
+			</description>
+		</method>
 		<method name="get_actions">
 			<return type="StringName[]" />
 			<description>
diff --git a/engine/doc/classes/JSONRPC.xml b/engine/doc/classes/JSONRPC.xml
index e5ee93cb..b9975d40 100644
--- a/engine/doc/classes/JSONRPC.xml
+++ b/engine/doc/classes/JSONRPC.xml
@@ -69,11 +69,14 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_scope">
+		<method name="set_method">
 			<return type="void" />
-			<param index="0" name="scope" type="String" />
-			<param index="1" name="target" type="Object" />
+			<param index="0" name="name" type="String" />
+			<param index="1" name="callback" type="Callable" />
 			<description>
+				Registers a callback for the given method name.
+				- [param name] The name that clients can use to access the callback.
+				- [param callback] The callback which will handle the specific method.
 			</description>
 		</method>
 	</methods>
diff --git a/engine/doc/classes/JavaClassWrapper.xml b/engine/doc/classes/JavaClassWrapper.xml
index e8c5712f..ad99374b 100644
--- a/engine/doc/classes/JavaClassWrapper.xml
+++ b/engine/doc/classes/JavaClassWrapper.xml
@@ -32,6 +32,7 @@
 			<param index="0" name="name" type="String" />
 			<description>
 				Wraps a class defined in Java, and returns it as a [JavaClass] [Object] type that Godot can interact with.
+				When wrapping inner (nested) classes, use [code]$[/code] instead of [code].[/code] to separate them. For example, [code]JavaClassWrapper.wrap("android.view.WindowManager$LayoutParams")[/code] wraps the [b]WindowManager.LayoutParams[/b] class.
 				[b]Note:[/b] This method only works on Android. On every other platform, this method does nothing and returns an empty [JavaClass].
 			</description>
 		</method>
diff --git a/engine/doc/classes/Label.xml b/engine/doc/classes/Label.xml
index 7657cf31..2e39d953 100644
--- a/engine/doc/classes/Label.xml
+++ b/engine/doc/classes/Label.xml
@@ -49,12 +49,16 @@
 		<member name="autowrap_mode" type="int" setter="set_autowrap_mode" getter="get_autowrap_mode" enum="TextServer.AutowrapMode" default="0">
 			If set to something other than [constant TextServer.AUTOWRAP_OFF], the text gets wrapped inside the node's bounding rectangle. If you resize the node, it will change its height automatically to show all the text. To see how each mode behaves, see [enum TextServer.AutowrapMode].
 		</member>
+		<member name="autowrap_trim_flags" type="int" setter="set_autowrap_trim_flags" getter="get_autowrap_trim_flags" enum="TextServer.LineBreakFlag" is_bitfield="true" default="192">
+			Autowrap space trimming flags. See [constant TextServer.BREAK_TRIM_START_EDGE_SPACES] and [constant TextServer.BREAK_TRIM_END_EDGE_SPACES] for more info.
+		</member>
 		<member name="clip_text" type="bool" setter="set_clip_text" getter="is_clipping_text" default="false">
 			If [code]true[/code], the Label only shows the text that fits inside its bounding rectangle and will clip text horizontally.
 		</member>
 		<member name="ellipsis_char" type="String" setter="set_ellipsis_char" getter="get_ellipsis_char" default="&quot;…&quot;">
 			Ellipsis character used for text clipping.
 		</member>
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="3" />
 		<member name="horizontal_alignment" type="int" setter="set_horizontal_alignment" getter="get_horizontal_alignment" enum="HorizontalAlignment" default="0">
 			Controls the text's horizontal alignment. Supports left, center, right, and fill, or justify. Set it to one of the [enum HorizontalAlignment] constants.
 		</member>
@@ -150,6 +154,9 @@
 		<theme_item name="font_size" data_type="font_size" type="int">
 			Font size of the [Label]'s text.
 		</theme_item>
+		<theme_item name="focus" data_type="style" type="StyleBox">
+			[StyleBox] used when the [Label] is focused (when used with assistive apps).
+		</theme_item>
 		<theme_item name="normal" data_type="style" type="StyleBox">
 			Background [StyleBox] for the [Label].
 		</theme_item>
diff --git a/engine/doc/classes/Label3D.xml b/engine/doc/classes/Label3D.xml
index 7584a1d5..b655d77b 100644
--- a/engine/doc/classes/Label3D.xml
+++ b/engine/doc/classes/Label3D.xml
@@ -51,6 +51,9 @@
 		<member name="autowrap_mode" type="int" setter="set_autowrap_mode" getter="get_autowrap_mode" enum="TextServer.AutowrapMode" default="0">
 			If set to something other than [constant TextServer.AUTOWRAP_OFF], the text gets wrapped inside the node's bounding rectangle. If you resize the node, it will change its height automatically to show all the text. To see how each mode behaves, see [enum TextServer.AutowrapMode].
 		</member>
+		<member name="autowrap_trim_flags" type="int" setter="set_autowrap_trim_flags" getter="get_autowrap_trim_flags" enum="TextServer.LineBreakFlag" is_bitfield="true" default="192">
+			Autowrap space trimming flags. See [constant TextServer.BREAK_TRIM_START_EDGE_SPACES] and [constant TextServer.BREAK_TRIM_END_EDGE_SPACES] for more info.
+		</member>
 		<member name="billboard" type="int" setter="set_billboard_mode" getter="get_billboard_mode" enum="BaseMaterial3D.BillboardMode" default="0">
 			The billboard mode to use for the label. See [enum BaseMaterial3D.BillboardMode] for possible values.
 		</member>
@@ -59,7 +62,7 @@
 			If [code]true[/code], text can be seen from the back as well, if [code]false[/code], it is invisible when looking at it from behind.
 		</member>
 		<member name="fixed_size" type="bool" setter="set_draw_flag" getter="get_draw_flag" default="false">
-			If [code]true[/code], the label is rendered at the same size regardless of distance.
+			If [code]true[/code], the label is rendered at the same size regardless of distance. The label's size on screen is the same as if the camera was [code]1.0[/code] units away from the label's origin, regardless of the actual distance from the camera. The [Camera3D]'s field of view (or [member Camera3D.size] when in orthogonal/frustum mode) still affects the size the label is drawn at.
 		</member>
 		<member name="font" type="Font" setter="set_font" getter="get_font">
 			Font configuration used to display text.
diff --git a/engine/doc/classes/Light3D.xml b/engine/doc/classes/Light3D.xml
index 4878599d..038240f4 100644
--- a/engine/doc/classes/Light3D.xml
+++ b/engine/doc/classes/Light3D.xml
@@ -64,7 +64,7 @@
 			[b]Note:[/b] Meshes' global illumination mode will also affect the global illumination rendering. See [member GeometryInstance3D.gi_mode].
 		</member>
 		<member name="light_color" type="Color" setter="set_color" getter="get_color" default="Color(1, 1, 1, 1)">
-			The light's color. An [i]overbright[/i] color can be used to achieve a result equivalent to increasing the light's [member light_energy].
+			The light's color in the nonlinear sRGB color space. An [i]overbright[/i] color can be used to achieve a result equivalent to increasing the light's [member light_energy].
 		</member>
 		<member name="light_cull_mask" type="int" setter="set_cull_mask" getter="get_cull_mask" default="4294967295">
 			The light will affect objects in the selected layers.
diff --git a/engine/doc/classes/LineEdit.xml b/engine/doc/classes/LineEdit.xml
index c6cdacb6..426c3bbb 100644
--- a/engine/doc/classes/LineEdit.xml
+++ b/engine/doc/classes/LineEdit.xml
@@ -9,6 +9,10 @@
 		- To enter edit mode, click on the control with the mouse, see also [member keep_editing_on_text_submit].
 		- To exit edit mode, press [code]ui_text_submit[/code] or [code]ui_cancel[/code] (by default [kbd]Escape[/kbd]) actions.
 		- Check [method edit], [method unedit], [method is_editing], and [signal editing_toggled] for more information.
+		While entering text, it is possible to insert special characters using Unicode, OEM or Windows alt codes:
+		- To enter Unicode codepoints, hold [kbd]Alt[/kbd] and type the codepoint on the numpad. For example, to enter the character [code]á[/code] (U+00E1), hold [kbd]Alt[/kbd] and type [kbd]+E1[/kbd] on the numpad (the leading zeroes can be omitted).
+		- To enter OEM codepoints, hold [kbd]Alt[/kbd] and type the code on the numpad. For example, to enter the character [code]á[/code] (OEM 160), hold [kbd]Alt[/kbd] and type [code]160[/code] on the numpad.
+		- To enter Windows codepoints, hold [kbd]Alt[/kbd] and type the code on the numpad. For example, to enter the character [code]á[/code] (Windows 0225), hold [kbd]Alt[/kbd] and type [kbd]0[/kbd], [kbd]2[/kbd], [kbd]2[/kbd], [kbd]5[/kbd] on the numpad. The leading zero here must [b]not[/b] be omitted, as this is how Windows codepoints are distinguished from OEM codepoints.
 		[b]Important:[/b]
 		- Focusing the [LineEdit] with [code]ui_focus_next[/code] (by default [kbd]Tab[/kbd]) or [code]ui_focus_prev[/code] (by default [kbd]Shift + Tab[/kbd]) or [method Control.grab_focus] still enters edit mode (for compatibility).
 		[LineEdit] features many built-in shortcuts that are always available ([kbd]Ctrl[/kbd] here maps to [kbd]Cmd[/kbd] on macOS):
@@ -252,7 +256,7 @@
 			The caret's column position inside the [LineEdit]. When set, the text may scroll to accommodate it.
 		</member>
 		<member name="caret_force_displayed" type="bool" setter="set_caret_force_displayed" getter="is_caret_force_displayed" default="false">
-			If [code]true[/code], the [LineEdit] will always show the caret, even if focus is lost.
+			If [code]true[/code], the [LineEdit] will always show the caret, even if not editing or focus is lost.
 		</member>
 		<member name="caret_mid_grapheme" type="bool" setter="set_caret_mid_grapheme_enabled" getter="is_caret_mid_grapheme_enabled" default="false">
 			Allow moving caret, selecting and removing the individual composite character components.
diff --git a/engine/doc/classes/LinkButton.xml b/engine/doc/classes/LinkButton.xml
index b1b3d747..80289985 100644
--- a/engine/doc/classes/LinkButton.xml
+++ b/engine/doc/classes/LinkButton.xml
@@ -10,7 +10,7 @@
 	<tutorials>
 	</tutorials>
 	<members>
-		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="0" />
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="3" />
 		<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
 			Language code used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 		</member>
diff --git a/engine/doc/classes/LookAtModifier3D.xml b/engine/doc/classes/LookAtModifier3D.xml
index 3922c30e..cf0e53c3 100644
--- a/engine/doc/classes/LookAtModifier3D.xml
+++ b/engine/doc/classes/LookAtModifier3D.xml
@@ -19,7 +19,7 @@
 		<method name="is_interpolating" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns whether the time-based interpolation is running or not. If [code]true[/code], it is equivalent to [method get_interpolation_remaining] being [code]0[/code].
+				Returns [code]true[/code] if time-based interpolation is running. If [code]true[/code], it is equivalent to [method get_interpolation_remaining] returning [code]0.0[/code].
 				This is useful to determine whether a [LookAtModifier3D] can be removed safely.
 			</description>
 		</method>
diff --git a/engine/doc/classes/Material.xml b/engine/doc/classes/Material.xml
index 94d12018..17df3f75 100644
--- a/engine/doc/classes/Material.xml
+++ b/engine/doc/classes/Material.xml
@@ -56,7 +56,7 @@
 			[b]Note:[/b] This only applies to [StandardMaterial3D]s and [ShaderMaterial]s with type "Spatial".
 		</member>
 		<member name="render_priority" type="int" setter="set_render_priority" getter="get_render_priority">
-			Sets the render priority for objects in 3D scenes. Higher priority objects will be sorted in front of lower priority objects. In other words, all objects with [member render_priority] [code]1[/code] will render before all objects with [member render_priority] [code]0[/code].
+			Sets the render priority for objects in 3D scenes. Higher priority objects will be sorted in front of lower priority objects. In other words, all objects with [member render_priority] [code]1[/code] will render on top of all objects with [member render_priority] [code]0[/code].
 			[b]Note:[/b] This only applies to [StandardMaterial3D]s and [ShaderMaterial]s with type "Spatial".
 			[b]Note:[/b] This will not impact how transparent objects are sorted relative to opaque objects or how dynamic meshes will be sorted relative to other opaque meshes. This is because all transparent objects are drawn after all opaque objects and all dynamic opaque meshes are drawn before other opaque meshes.
 		</member>
diff --git a/engine/doc/classes/MenuBar.xml b/engine/doc/classes/MenuBar.xml
index d2303622..2fecdd23 100644
--- a/engine/doc/classes/MenuBar.xml
+++ b/engine/doc/classes/MenuBar.xml
@@ -100,6 +100,7 @@
 		<member name="flat" type="bool" setter="set_flat" getter="is_flat" default="false">
 			Flat [MenuBar] don't display item decoration.
 		</member>
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
 		<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
 			Language code used for line-breaking and text shaping algorithms, if left empty current locale is used instead.
 		</member>
diff --git a/engine/doc/classes/MenuButton.xml b/engine/doc/classes/MenuButton.xml
index 16b3772f..a1e0b34f 100644
--- a/engine/doc/classes/MenuButton.xml
+++ b/engine/doc/classes/MenuButton.xml
@@ -34,7 +34,7 @@
 	<members>
 		<member name="action_mode" type="int" setter="set_action_mode" getter="get_action_mode" overrides="BaseButton" enum="BaseButton.ActionMode" default="0" />
 		<member name="flat" type="bool" setter="set_flat" getter="is_flat" overrides="Button" default="true" />
-		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="0" />
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="3" />
 		<member name="item_count" type="int" setter="set_item_count" getter="get_item_count" default="0">
 			The number of items currently in the list.
 		</member>
diff --git a/engine/doc/classes/Mesh.xml b/engine/doc/classes/Mesh.xml
index 7f4dd5af..0eced470 100644
--- a/engine/doc/classes/Mesh.xml
+++ b/engine/doc/classes/Mesh.xml
@@ -359,7 +359,7 @@
 			Flag used to mark that the array contains 2D vertices.
 		</constant>
 		<constant name="ARRAY_FLAG_USE_DYNAMIC_UPDATE" value="67108864" enum="ArrayFormat" is_bitfield="true">
-			Flag indices that the mesh data will use [code]GL_DYNAMIC_DRAW[/code] on GLES. Unused on Vulkan.
+			Flag used to mark that the mesh data will use [code]GL_DYNAMIC_DRAW[/code] on GLES. Unused on Vulkan.
 		</constant>
 		<constant name="ARRAY_FLAG_USE_8_BONE_WEIGHTS" value="134217728" enum="ArrayFormat" is_bitfield="true">
 			Flag used to mark that the mesh contains up to 8 bone influences per vertex. This flag indicates that [constant ARRAY_BONES] and [constant ARRAY_WEIGHTS] elements will have double length.
diff --git a/engine/doc/classes/MultiplayerAPIExtension.xml b/engine/doc/classes/MultiplayerAPIExtension.xml
index acb6a2c1..57901491 100644
--- a/engine/doc/classes/MultiplayerAPIExtension.xml
+++ b/engine/doc/classes/MultiplayerAPIExtension.xml
@@ -18,10 +18,12 @@
 		    # Just passthrough base signals (copied to var to avoid cyclic reference)
 		    var cts = connected_to_server
 		    var cf = connection_failed
+		    var sd = server_disconnected
 		    var pc = peer_connected
 		    var pd = peer_disconnected
 		    base_multiplayer.connected_to_server.connect(func(): cts.emit())
 		    base_multiplayer.connection_failed.connect(func(): cf.emit())
+		    base_multiplayer.server_disconnected.connect(func(): sd.emit())
 		    base_multiplayer.peer_connected.connect(func(id): pc.emit(id))
 		    base_multiplayer.peer_disconnected.connect(func(id): pd.emit(id))
 
@@ -59,6 +61,9 @@
 		func _get_unique_id() -&gt; int:
 		    return base_multiplayer.get_unique_id()
 
+		func _get_remote_sender_id() -&gt; int:
+		    return base_multiplayer.get_remote_sender_id()
+
 		func _get_peer_ids() -&gt; PackedInt32Array:
 		    return base_multiplayer.get_peers()
 		[/gdscript]
diff --git a/engine/doc/classes/NativeMenu.xml b/engine/doc/classes/NativeMenu.xml
index 6081d7af..5eaec56e 100644
--- a/engine/doc/classes/NativeMenu.xml
+++ b/engine/doc/classes/NativeMenu.xml
@@ -374,7 +374,7 @@
 			<param index="0" name="rid" type="RID" />
 			<description>
 				Returns global menu open callback.
-				b]Note:[/b] This method is implemented only on macOS.
+				[b]Note:[/b] This method is implemented only on macOS.
 			</description>
 		</method>
 		<method name="get_size" qualifiers="const">
diff --git a/engine/doc/classes/NavigationPathQueryParameters2D.xml b/engine/doc/classes/NavigationPathQueryParameters2D.xml
index 1f9c064f..29a6d835 100644
--- a/engine/doc/classes/NavigationPathQueryParameters2D.xml
+++ b/engine/doc/classes/NavigationPathQueryParameters2D.xml
@@ -10,6 +10,14 @@
 		<link title="Using NavigationPathQueryObjects">$DOCS_URL/tutorials/navigation/navigation_using_navigationpathqueryobjects.html</link>
 	</tutorials>
 	<members>
+		<member name="excluded_regions" type="RID[]" setter="set_excluded_regions" getter="get_excluded_regions" default="[]">
+			The list of region [RID]s that will be excluded from the path query. Use [method NavigationRegion2D.get_rid] to get the [RID] associated with a [NavigationRegion2D] node.
+			[b]Note:[/b] The returned array is copied and any changes to it will not update the original property value. To update the value you need to modify the returned array, and then set it to the property again.
+		</member>
+		<member name="included_regions" type="RID[]" setter="set_included_regions" getter="get_included_regions" default="[]">
+			The list of region [RID]s that will be included by the path query. Use [method NavigationRegion2D.get_rid] to get the [RID] associated with a [NavigationRegion2D] node. If left empty all regions are included. If a region ends up being both included and excluded at the same time it will be excluded.
+			[b]Note:[/b] The returned array is copied and any changes to it will not update the original property value. To update the value you need to modify the returned array, and then set it to the property again.
+		</member>
 		<member name="map" type="RID" setter="set_map" getter="get_map" default="RID()">
 			The navigation map [RID] used in the path query.
 		</member>
diff --git a/engine/doc/classes/NavigationPathQueryParameters3D.xml b/engine/doc/classes/NavigationPathQueryParameters3D.xml
index a4c622d0..a9b47948 100644
--- a/engine/doc/classes/NavigationPathQueryParameters3D.xml
+++ b/engine/doc/classes/NavigationPathQueryParameters3D.xml
@@ -10,6 +10,14 @@
 		<link title="Using NavigationPathQueryObjects">$DOCS_URL/tutorials/navigation/navigation_using_navigationpathqueryobjects.html</link>
 	</tutorials>
 	<members>
+		<member name="excluded_regions" type="RID[]" setter="set_excluded_regions" getter="get_excluded_regions" default="[]">
+			The list of region [RID]s that will be excluded from the path query. Use [method NavigationRegion3D.get_rid] to get the [RID] associated with a [NavigationRegion3D] node.
+			[b]Note:[/b] The returned array is copied and any changes to it will not update the original property value. To update the value you need to modify the returned array, and then set it to the property again.
+		</member>
+		<member name="included_regions" type="RID[]" setter="set_included_regions" getter="get_included_regions" default="[]">
+			The list of region [RID]s that will be included by the path query. Use [method NavigationRegion3D.get_rid] to get the [RID] associated with a [NavigationRegion3D] node. If left empty all regions are included. If a region ends up being both included and excluded at the same time it will be excluded.
+			[b]Note:[/b] The returned array is copied and any changes to it will not update the original property value. To update the value you need to modify the returned array, and then set it to the property again.
+		</member>
 		<member name="map" type="RID" setter="set_map" getter="get_map" default="RID()">
 			The navigation map [RID] used in the path query.
 		</member>
diff --git a/engine/doc/classes/NavigationServer2D.xml b/engine/doc/classes/NavigationServer2D.xml
index 95db5591..f7aba7e4 100644
--- a/engine/doc/classes/NavigationServer2D.xml
+++ b/engine/doc/classes/NavigationServer2D.xml
@@ -303,6 +303,13 @@
 				Returns all created navigation map [RID]s on the NavigationServer. This returns both 2D and 3D created navigation maps as there is technically no distinction between them.
 			</description>
 		</method>
+		<method name="get_process_info" qualifiers="const">
+			<return type="int" />
+			<param index="0" name="process_info" type="int" enum="NavigationServer2D.ProcessInfo" />
+			<description>
+				Returns information about the current state of the NavigationServer. See [enum ProcessInfo] for a list of available states.
+			</description>
+		</method>
 		<method name="is_baking_navigation_polygon" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="navigation_polygon" type="NavigationPolygon" />
@@ -457,7 +464,7 @@
 				Create a new map.
 			</description>
 		</method>
-		<method name="map_force_update">
+		<method name="map_force_update" deprecated="This method is no longer supported, as it is incompatible with asynchronous updates. It can only be used in a single-threaded context, at your own risk.">
 			<return type="void" />
 			<param index="0" name="map" type="RID" />
 			<description>
@@ -971,6 +978,13 @@
 				If [param enabled] is [code]true[/code], the navigation [param region] will use edge connections to connect with other navigation regions within proximity of the navigation map edge connection margin.
 			</description>
 		</method>
+		<method name="set_active">
+			<return type="void" />
+			<param index="0" name="active" type="bool" />
+			<description>
+				Control activation of this server.
+			</description>
+		</method>
 		<method name="set_debug_enabled">
 			<return type="void" />
 			<param index="0" name="enabled" type="bool" />
@@ -1006,6 +1020,11 @@
 		</method>
 	</methods>
 	<signals>
+		<signal name="avoidance_debug_changed">
+			<description>
+				Emitted when avoidance debug settings are changed. Only available in debug builds.
+			</description>
+		</signal>
 		<signal name="map_changed">
 			<param index="0" name="map" type="RID" />
 			<description>
@@ -1018,4 +1037,36 @@
 			</description>
 		</signal>
 	</signals>
+	<constants>
+		<constant name="INFO_ACTIVE_MAPS" value="0" enum="ProcessInfo">
+			Constant to get the number of active navigation maps.
+		</constant>
+		<constant name="INFO_REGION_COUNT" value="1" enum="ProcessInfo">
+			Constant to get the number of active navigation regions.
+		</constant>
+		<constant name="INFO_AGENT_COUNT" value="2" enum="ProcessInfo">
+			Constant to get the number of active navigation agents processing avoidance.
+		</constant>
+		<constant name="INFO_LINK_COUNT" value="3" enum="ProcessInfo">
+			Constant to get the number of active navigation links.
+		</constant>
+		<constant name="INFO_POLYGON_COUNT" value="4" enum="ProcessInfo">
+			Constant to get the number of navigation mesh polygons.
+		</constant>
+		<constant name="INFO_EDGE_COUNT" value="5" enum="ProcessInfo">
+			Constant to get the number of navigation mesh polygon edges.
+		</constant>
+		<constant name="INFO_EDGE_MERGE_COUNT" value="6" enum="ProcessInfo">
+			Constant to get the number of navigation mesh polygon edges that were merged due to edge key overlap.
+		</constant>
+		<constant name="INFO_EDGE_CONNECTION_COUNT" value="7" enum="ProcessInfo">
+			Constant to get the number of navigation mesh polygon edges that are considered connected by edge proximity.
+		</constant>
+		<constant name="INFO_EDGE_FREE_COUNT" value="8" enum="ProcessInfo">
+			Constant to get the number of navigation mesh polygon edges that could not be merged but may be still connected by edge proximity or with links.
+		</constant>
+		<constant name="INFO_OBSTACLE_COUNT" value="9" enum="ProcessInfo">
+			Constant to get the number of active navigation obstacles.
+		</constant>
+	</constants>
 </class>
diff --git a/engine/doc/classes/NavigationServer3D.xml b/engine/doc/classes/NavigationServer3D.xml
index 64da1cda..3a37bd45 100644
--- a/engine/doc/classes/NavigationServer3D.xml
+++ b/engine/doc/classes/NavigationServer3D.xml
@@ -496,7 +496,7 @@
 				Create a new map.
 			</description>
 		</method>
-		<method name="map_force_update">
+		<method name="map_force_update" deprecated="This method is no longer supported, as it is incompatible with asynchronous updates. It can only be used in a single-threaded context, at your own risk.">
 			<return type="void" />
 			<param index="0" name="map" type="RID" />
 			<description>
diff --git a/engine/doc/classes/Node.xml b/engine/doc/classes/Node.xml
index 29081de3..8521acd2 100644
--- a/engine/doc/classes/Node.xml
+++ b/engine/doc/classes/Node.xml
@@ -36,6 +36,20 @@
 				Corresponds to the [constant NOTIFICATION_EXIT_TREE] notification in [method Object._notification] and signal [signal tree_exiting]. To get notified when the node has already left the active tree, connect to the [signal tree_exited].
 			</description>
 		</method>
+		<method name="_get_accessibility_configuration_warnings" qualifiers="virtual const">
+			<return type="PackedStringArray" />
+			<description>
+				The elements in the array returned from this method are displayed as warnings in the Scene dock if the script that overrides it is a [code]tool[/code] script, and accessibility warnings are enabled in the editor settings.
+				Returning an empty array produces no warnings.
+			</description>
+		</method>
+		<method name="_get_accessibility_container_name" qualifiers="virtual const">
+			<return type="String" />
+			<param index="0" name="node" type="Node" />
+			<description>
+				Return a human-readable description of the position of [param node] child in the custom container, added to the node name.
+			</description>
+		</method>
 		<method name="_get_configuration_warnings" qualifiers="virtual const">
 			<return type="PackedStringArray" />
 			<description>
@@ -56,6 +70,12 @@
 				[/codeblock]
 			</description>
 		</method>
+		<method name="_get_focused_accessibility_element" qualifiers="virtual const">
+			<return type="RID" />
+			<description>
+				Called during accessibility information updates to determine the currently focused sub-element, should return a sub-element RID or the value returned by [method get_accessibility_element].
+			</description>
+		</method>
 		<method name="_input" qualifiers="virtual">
 			<return type="void" />
 			<param index="0" name="event" type="InputEvent" />
@@ -142,7 +162,7 @@
 			<description>
 				Adds a child [param node]. Nodes can have any number of children, but every child must have a unique name. Child nodes are automatically deleted when the parent node is deleted, so an entire scene can be removed by deleting its topmost node.
 				If [param force_readable_name] is [code]true[/code], improves the readability of the added [param node]. If not named, the [param node] is renamed to its type, and if it shares [member name] with a sibling, a number is suffixed more appropriately. This operation is very slow. As such, it is recommended leaving this to [code]false[/code], which assigns a dummy name featuring [code]@[/code] in both situations.
-				If [param internal] is different than [constant INTERNAL_MODE_DISABLED], the child will be added as internal node. These nodes are ignored by methods like [method get_children], unless their parameter [code]include_internal[/code] is [code]true[/code]. The intended usage is to hide the internal nodes from the user, so the user won't accidentally delete or modify them. Used by some GUI nodes, e.g. [ColorPicker]. See [enum InternalMode] for available modes.
+				If [param internal] is different than [constant INTERNAL_MODE_DISABLED], the child will be added as internal node. These nodes are ignored by methods like [method get_children], unless their parameter [code]include_internal[/code] is [code]true[/code]. It also prevents these nodes being duplicated with their parent. The intended usage is to hide the internal nodes from the user, so the user won't accidentally delete or modify them. Used by some GUI nodes, e.g. [ColorPicker]. See [enum InternalMode] for available modes.
 				[b]Note:[/b] If [param node] already has a parent, this method will fail. Use [method remove_child] first to remove [param node] from its current parent. For example:
 				[codeblocks]
 				[gdscript]
@@ -259,7 +279,7 @@
 			<return type="Node" />
 			<param index="0" name="flags" type="int" default="15" />
 			<description>
-				Duplicates the node, returning a new node with all of its properties, signals, groups, and children copied from the original. The behavior can be tweaked through the [param flags] (see [enum DuplicateFlags]).
+				Duplicates the node, returning a new node with all of its properties, signals, groups, and children copied from the original. The behavior can be tweaked through the [param flags] (see [enum DuplicateFlags]). Internal nodes are not duplicated.
 				[b]Note:[/b] For nodes with a [Script] attached, if [method Object._init] has been defined with required parameters, the duplicated node will not have a [Script].
 			</description>
 		</method>
@@ -299,6 +319,13 @@
 				[b]Note:[/b] As this method walks upwards in the scene tree, it can be slow in large, deeply nested nodes. Consider storing a reference to the found node in a variable. Alternatively, use [method get_node] with unique names (see [member unique_name_in_owner]).
 			</description>
 		</method>
+		<method name="get_accessibility_element" qualifiers="const">
+			<return type="RID" />
+			<description>
+				Returns main accessibility element RID.
+				[b]Note:[/b] This method should be called only during accessibility information updates ([constant NOTIFICATION_ACCESSIBILITY_UPDATE]).
+			</description>
+		</method>
 		<method name="get_child" qualifiers="const">
 			<return type="Node" />
 			<param index="0" name="idx" type="int" />
@@ -777,6 +804,12 @@
 				Calls [method Object.notification] with [param what] on this node and all of its children, recursively.
 			</description>
 		</method>
+		<method name="queue_accessibility_update">
+			<return type="void" />
+			<description>
+				Queues an accessibility information update for this node.
+			</description>
+		</method>
 		<method name="queue_free" keywords="delete, remove, kill, die">
 			<return type="void" />
 			<description>
@@ -994,6 +1027,27 @@
 		</method>
 	</methods>
 	<members>
+		<member name="accessibility_controls_nodes" type="NodePath[]" setter="set_accessibility_controls_nodes" getter="get_accessibility_controls_nodes" default="[]">
+			The list of nodes which are controlled by this node.
+		</member>
+		<member name="accessibility_described_by_nodes" type="NodePath[]" setter="set_accessibility_described_by_nodes" getter="get_accessibility_described_by_nodes" default="[]">
+			The list of nodes which are describing this node.
+		</member>
+		<member name="accessibility_description" type="String" setter="set_accessibility_description" getter="get_accessibility_description" default="&quot;&quot;">
+			The human-readable node description that is reported to assistive apps.
+		</member>
+		<member name="accessibility_flow_to_nodes" type="NodePath[]" setter="set_accessibility_flow_to_nodes" getter="get_accessibility_flow_to_nodes" default="[]">
+			The list of nodes which this node flows into.
+		</member>
+		<member name="accessibility_labeled_by_nodes" type="NodePath[]" setter="set_accessibility_labeled_by_nodes" getter="get_accessibility_labeled_by_nodes" default="[]">
+			The list of nodes which label this node.
+		</member>
+		<member name="accessibility_live" type="int" setter="set_accessibility_live" getter="get_accessibility_live" enum="DisplayServer.AccessibilityLiveMode" default="0">
+			Live region update mode, a live region is [Node] that is updated as a result of an external event when user focus may be elsewhere.
+		</member>
+		<member name="accessibility_name" type="String" setter="set_accessibility_name" getter="get_accessibility_name" default="&quot;&quot;">
+			The human-readable node name that is reported to assistive apps.
+		</member>
 		<member name="auto_translate_mode" type="int" setter="set_auto_translate_mode" getter="get_auto_translate_mode" enum="Node.AutoTranslateMode" default="0">
 			Defines if any text should automatically change to its translated version depending on the current locale (for nodes such as [Label], [RichTextLabel], [Window], etc.). Also decides if the node's strings should be parsed for POT generation.
 			[b]Note:[/b] For the root node, auto translate mode can also be set via [member ProjectSettings.internationalization/rendering/root_node_auto_translate].
@@ -1226,6 +1280,9 @@
 		<constant name="NOTIFICATION_VP_MOUSE_EXIT" value="1011">
 			Notification received when the mouse cursor leaves the [Viewport]'s visible area, that is not occluded behind other [Control]s or [Window]s, provided its [member Viewport.gui_disable_input] is [code]false[/code] and regardless if it's currently focused or not.
 		</constant>
+		<constant name="NOTIFICATION_WM_POSITION_CHANGED" value="1012">
+			Notification received when the window is moved.
+		</constant>
 		<constant name="NOTIFICATION_OS_MEMORY_WARNING" value="2009">
 			Notification received from the OS when the application is exceeding its allocated memory.
 			Implemented only on iOS.
@@ -1273,6 +1330,12 @@
 		<constant name="NOTIFICATION_TEXT_SERVER_CHANGED" value="2018">
 			Notification received when the [TextServer] is changed.
 		</constant>
+		<constant name="NOTIFICATION_ACCESSIBILITY_UPDATE" value="3000">
+			Notification received when an accessibility information update is required.
+		</constant>
+		<constant name="NOTIFICATION_ACCESSIBILITY_INVALIDATE" value="3001">
+			Notification received when accessibility elements are invalidated. All node accessibility elements are automatically deleted after receiving this message, therefore all existing references to such elements should be discarded.
+		</constant>
 		<constant name="PROCESS_MODE_INHERIT" value="0" enum="ProcessMode">
 			Inherits [member process_mode] from the node's parent. This is the default for any newly created node.
 		</constant>
@@ -1316,7 +1379,7 @@
 			Disables physics interpolation for this node and for children set to [constant PHYSICS_INTERPOLATION_MODE_INHERIT].
 		</constant>
 		<constant name="DUPLICATE_SIGNALS" value="1" enum="DuplicateFlags">
-			Duplicate the node's signal connections.
+			Duplicate the node's signal connections that are connected with the [constant Object.CONNECT_PERSIST] flag.
 		</constant>
 		<constant name="DUPLICATE_GROUPS" value="2" enum="DuplicateFlags">
 			Duplicate the node's groups.
diff --git a/engine/doc/classes/Node3D.xml b/engine/doc/classes/Node3D.xml
index d092fd50..d1dadc97 100644
--- a/engine/doc/classes/Node3D.xml
+++ b/engine/doc/classes/Node3D.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="Node3D" inherits="Node" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
+<class name="Node3D" inherits="Node" keywords="spatial" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Most basic 3D game object, parent of all 3D-related nodes.
+		Base object in 3D space, inherited by all 3D nodes.
 	</brief_description>
 	<description>
-		Most basic 3D game object, with a [Transform3D] and visibility settings. All other 3D game objects inherit from [Node3D]. Use [Node3D] as a parent node to move, scale, rotate and show/hide children in a 3D project.
-		Affine operations (rotate, scale, translate) happen in parent's local coordinate system, unless the [Node3D] object is set as top-level. Affine operations in this coordinate system correspond to direct affine operations on the [Node3D]'s transform. The word local below refers to this coordinate system. The coordinate system that is attached to the [Node3D] object itself is referred to as object-local coordinate system.
-		[b]Note:[/b] Unless otherwise specified, all methods that have angle parameters must have angles specified as [i]radians[/i]. To convert degrees to radians, use [method @GlobalScope.deg_to_rad].
-		[b]Note:[/b] Be aware that "Spatial" nodes are now called "Node3D" starting with Godot 4. Any Godot 3.x references to "Spatial" nodes refer to "Node3D" in Godot 4.
+		The [Node3D] node is the base representation of a node in 3D space. All other 3D nodes inherit from this class.
+		Affine operations (translation, rotation, scale) are calculated in the coordinate system relative to the parent, unless the [Node3D]'s [member top_level] is [code]true[/code]. In this coordinate system, affine operations correspond to direct affine operations on the [Node3D]'s [member transform]. The term [i]parent space[/i] refers to this coordinate system. The coordinate system that is attached to the [Node3D] itself is referred to as object-local coordinate system, or [i]local space[/i].
+		[b]Note:[/b] Unless otherwise specified, all methods that need angle parameters must receive angles in [i]radians[/i]. To convert degrees to radians, use [method @GlobalScope.deg_to_rad].
+		[b]Note:[/b] In Godot 3 and older, [Node3D] was named [i]Spatial[/i].
 	</description>
 	<tutorials>
 		<link title="Introduction to 3D">$DOCS_URL/tutorials/3d/introduction_to_3d.html</link>
@@ -18,32 +18,33 @@
 			<return type="void" />
 			<param index="0" name="gizmo" type="Node3DGizmo" />
 			<description>
-				Attach an editor gizmo to this [Node3D].
-				[b]Note:[/b] The gizmo object would typically be an instance of [EditorNode3DGizmo], but the argument type is kept generic to avoid creating a dependency on editor classes in [Node3D].
+				Attaches the given [param gizmo] to this node. Only works in the editor.
+				[b]Note:[/b] [param gizmo] should be an [EditorNode3DGizmo]. The argument type is [Node3DGizmo] to avoid depending on editor classes in [Node3D].
 			</description>
 		</method>
 		<method name="clear_gizmos">
 			<return type="void" />
 			<description>
-				Clear all gizmos attached to this [Node3D].
+				Clears all [EditorNode3DGizmo] objects attached to this node. Only works in the editor.
 			</description>
 		</method>
 		<method name="clear_subgizmo_selection">
 			<return type="void" />
 			<description>
-				Clears subgizmo selection for this node in the editor. Useful when subgizmo IDs become invalid after a property change.
+				Deselects all subgizmos for this node. Useful to call when the selected subgizmo may no longer exist after a property change. Only works in the editor.
 			</description>
 		</method>
 		<method name="force_update_transform">
 			<return type="void" />
 			<description>
-				Forces the transform to update. Transform changes in physics are not instant for performance reasons. Transforms are accumulated and then set. Use this if you need an up-to-date transform when doing physics operations.
+				Forces the node's [member global_transform] to update, by sending [constant NOTIFICATION_TRANSFORM_CHANGED]. Fails if the node is not inside the tree.
+				[b]Note:[/b] For performance reasons, transform changes are usually accumulated and applied [i]once[/i] at the end of the frame. The update propagates through [Node3D] children, as well. Therefore, use this method only when you need an up-to-date transform (such as during physics operations).
 			</description>
 		</method>
 		<method name="get_gizmos" qualifiers="const">
 			<return type="Node3DGizmo[]" />
 			<description>
-				Returns all the gizmos attached to this [Node3D].
+				Returns all the [EditorNode3DGizmo] objects attached to this node. Only works in the editor.
 			</description>
 		</method>
 		<method name="get_global_transform_interpolated">
@@ -57,14 +58,15 @@
 		<method name="get_parent_node_3d" qualifiers="const">
 			<return type="Node3D" />
 			<description>
-				Returns the parent [Node3D], or [code]null[/code] if no parent exists, the parent is not of type [Node3D], or [member top_level] is [code]true[/code].
-				[b]Note:[/b] Calling this method is not equivalent to [code]get_parent() as Node3D[/code], which does not take [member top_level] into account.
+				Returns the parent [Node3D] that directly affects this node's [member global_transform]. Returns [code]null[/code] if no parent exists, the parent is not a [Node3D], or [member top_level] is [code]true[/code].
+				[b]Note:[/b] This method is not always equivalent to [method Node.get_parent], which does not take [member top_level] into account.
 			</description>
 		</method>
 		<method name="get_world_3d" qualifiers="const">
 			<return type="World3D" />
 			<description>
-				Returns the current [World3D] resource this [Node3D] node is registered to.
+				Returns the [World3D] this node is registered to.
+				Usually, this is the same as the world used by this node's viewport (see [method Node.get_viewport] and [method Viewport.find_world_3d]).
 			</description>
 		</method>
 		<method name="global_rotate">
@@ -72,53 +74,54 @@
 			<param index="0" name="axis" type="Vector3" />
 			<param index="1" name="angle" type="float" />
 			<description>
-				Rotates the global (world) transformation around axis, a unit [Vector3], by specified angle in radians. The rotation axis is in global coordinate system.
+				Rotates this node's [member global_basis] around the global [param axis] by the given [param angle], in radians. This operation is calculated in global space (relative to the world) and preserves the [member global_position].
 			</description>
 		</method>
 		<method name="global_scale">
 			<return type="void" />
 			<param index="0" name="scale" type="Vector3" />
 			<description>
-				Scales the global (world) transformation by the given [Vector3] scale factors.
+				Scales this node's [member global_basis] by the given [param scale] factor. This operation is calculated in global space (relative to the world) and preserves the [member global_position].
+				[b]Note:[/b] This method is not to be confused with the [member scale] property.
 			</description>
 		</method>
 		<method name="global_translate">
 			<return type="void" />
 			<param index="0" name="offset" type="Vector3" />
 			<description>
-				Moves the global (world) transformation by [Vector3] offset. The offset is in global coordinate system.
+				Adds the given translation [param offset] to the node's [member global_position] in global space (relative to the world).
 			</description>
 		</method>
 		<method name="hide">
 			<return type="void" />
 			<description>
-				Disables rendering of this node. Changes [member visible] to [code]false[/code].
+				Prevents this node from being rendered. Equivalent to setting [member visible] to [code]false[/code]. This is the opposite of [method show].
 			</description>
 		</method>
 		<method name="is_local_transform_notification_enabled" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns whether node notifies about its local transformation changes. [Node3D] will not propagate this by default.
+				Returns [code]true[/code] if the node receives [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] whenever [member transform] changes. This is enabled with [method set_notify_local_transform].
 			</description>
 		</method>
 		<method name="is_scale_disabled" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns whether this node uses a scale of [code](1, 1, 1)[/code] or its local transformation scale.
+				Returns [code]true[/code] if this node's [member global_transform] is automatically orthonormalized. This results in this node not appearing distorted, as if its global scale were set to [constant Vector3.ONE] (or its negative counterpart). See also [method set_disable_scale] and [method orthonormalize].
+				[b]Note:[/b] [member transform] is not affected by this setting.
 			</description>
 		</method>
 		<method name="is_transform_notification_enabled" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns whether the node notifies about its global and local transformation changes. [Node3D] will not propagate this by default.
+				Returns [code]true[/code] if the node receives [constant NOTIFICATION_TRANSFORM_CHANGED] whenever [member global_transform] changes. This is enabled with [method set_notify_transform].
 			</description>
 		</method>
 		<method name="is_visible_in_tree" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if the node is present in the [SceneTree], its [member visible] property is [code]true[/code] and all its ancestors are also visible. If any ancestor is hidden, this node will not be visible in the scene tree.
-				Visibility is checked only in parent nodes that inherit from [Node3D]. If the parent is of any other type (such as [Node], [AnimationPlayer], or [Node2D]), it is assumed to be visible.
-				[b]Note:[/b] This method does not take [member VisualInstance3D.layers] into account, so even if this method returns [code]true[/code], the node might end up not being rendered.
+				Returns [code]true[/code] if this node is inside the scene tree and the [member visible] property is [code]true[/code] for this node and all of its [Node3D] ancestors [i]in sequence[/i]. An ancestor of any other type (such as [Node] or [Node2D]) breaks the sequence. See also [method Node.get_parent].
+				[b]Note:[/b] This method cannot take [member VisualInstance3D.layers] into account, so even if this method returns [code]true[/code], the node may not be rendered.
 			</description>
 		</method>
 		<method name="look_at">
@@ -127,12 +130,11 @@
 			<param index="1" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
 			<param index="2" name="use_model_front" type="bool" default="false" />
 			<description>
-				Rotates the node so that the local forward axis (-Z, [constant Vector3.FORWARD]) points toward the [param target] position.
+				Rotates the node so that the local forward axis (-Z, [constant Vector3.FORWARD]) points toward the [param target] position. This operation is calculated in global space (relative to the world).
 				The local up axis (+Y) points as close to the [param up] vector as possible while staying perpendicular to the local forward axis. The resulting transform is orthogonal, and the scale is preserved. Non-uniform scaling may not work correctly.
-				The [param target] position cannot be the same as the node's position, the [param up] vector cannot be zero.
-				The [param target] and the [param up] cannot be [constant Vector3.ZERO], and shouldn't be colinear to avoid unintended rotation around local Z axis.
-				Operations take place in global space, which means that the node must be in the scene tree.
+				The [param target] position cannot be the same as the node's position, the [param up] vector cannot be [constant Vector3.ZERO]. Furthermore, the direction from the node's position to the [param target] position cannot be parallel to the [param up] vector, to avoid an unintended rotation around the local Z axis.
 				If [param use_model_front] is [code]true[/code], the +Z axis (asset front) is treated as forward (implies +X is left) and points toward the [param target] position. By default, the -Z axis (camera forward) is treated as forward (implies +X is right).
+				[b]Note:[/b] This method fails if the node is not in the scene tree. If necessary, use [method look_at_from_position] instead.
 			</description>
 		</method>
 		<method name="look_at_from_position">
@@ -142,13 +144,13 @@
 			<param index="2" name="up" type="Vector3" default="Vector3(0, 1, 0)" />
 			<param index="3" name="use_model_front" type="bool" default="false" />
 			<description>
-				Moves the node to the specified [param position], and then rotates the node to point toward the [param target] as per [method look_at]. Operations take place in global space.
+				Moves the node to the specified [param position], then rotates the node to point toward the [param target] position, similar to [method look_at]. This operation is calculated in global space (relative to the world).
 			</description>
 		</method>
 		<method name="orthonormalize">
 			<return type="void" />
 			<description>
-				Resets this node's transformations (like scale, skew and taper) preserving its rotation and translation by performing Gram-Schmidt orthonormalization on this node's [Transform3D].
+				Orthonormalizes this node's [member basis]. This method sets this node's [member scale] to [constant Vector3.ONE] (or its negative counterpart), but preserves the [member position] and [member rotation]. See also [method Transform3D.orthonormalized].
 			</description>
 		</method>
 		<method name="rotate">
@@ -156,7 +158,7 @@
 			<param index="0" name="axis" type="Vector3" />
 			<param index="1" name="angle" type="float" />
 			<description>
-				Rotates the local transformation around axis, a unit [Vector3], by specified angle in radians.
+				Rotates this node's [member basis] around the [param axis] by the given [param angle], in radians. This operation is calculated in parent space (relative to the parent) and preserves the [member position].
 			</description>
 		</method>
 		<method name="rotate_object_local">
@@ -164,69 +166,74 @@
 			<param index="0" name="axis" type="Vector3" />
 			<param index="1" name="angle" type="float" />
 			<description>
-				Rotates the local transformation around axis, a unit [Vector3], by specified angle in radians. The rotation axis is in object-local coordinate system.
+				Rotates this node's [member basis] around the [param axis] by the given [param angle], in radians. This operation is calculated in local space (relative to this node) and preserves the [member position].
 			</description>
 		</method>
 		<method name="rotate_x">
 			<return type="void" />
 			<param index="0" name="angle" type="float" />
 			<description>
-				Rotates the local transformation around the X axis by angle in radians.
+				Rotates this node's [member basis] around the X axis by the given [param angle], in radians. This operation is calculated in parent space (relative to the parent) and preserves the [member position].
 			</description>
 		</method>
 		<method name="rotate_y">
 			<return type="void" />
 			<param index="0" name="angle" type="float" />
 			<description>
-				Rotates the local transformation around the Y axis by angle in radians.
+				Rotates this node's [member basis] around the Y axis by the given [param angle], in radians. This operation is calculated in parent space (relative to the parent) and preserves the [member position].
 			</description>
 		</method>
 		<method name="rotate_z">
 			<return type="void" />
 			<param index="0" name="angle" type="float" />
 			<description>
-				Rotates the local transformation around the Z axis by angle in radians.
+				Rotates this node's [member basis] around the Z axis by the given [param angle], in radians. This operation is calculated in parent space (relative to the parent) and preserves the [member position].
 			</description>
 		</method>
 		<method name="scale_object_local">
 			<return type="void" />
 			<param index="0" name="scale" type="Vector3" />
 			<description>
-				Scales the local transformation by given 3D scale factors in object-local coordinate system.
+				Scales this node's [member basis] by the given [param scale] factor. This operation is calculated in local space (relative to this node) and preserves the [member position].
 			</description>
 		</method>
 		<method name="set_disable_scale">
 			<return type="void" />
 			<param index="0" name="disable" type="bool" />
 			<description>
-				Sets whether the node uses a scale of [code](1, 1, 1)[/code] or its local transformation scale. Changes to the local transformation scale are preserved.
+				If [code]true[/code], this node's [member global_transform] is automatically orthonormalized. This results in this node not appearing distorted, as if its global scale were set to [constant Vector3.ONE] (or its negative counterpart). See also [method is_scale_disabled] and [method orthonormalize].
+				[b]Note:[/b] [member transform] is not affected by this setting.
 			</description>
 		</method>
 		<method name="set_identity">
 			<return type="void" />
 			<description>
-				Reset all transformations for this node (sets its [Transform3D] to the identity matrix).
+				Sets this node's [member transform] to [constant Transform3D.IDENTITY], which resets all transformations in parent space ([member position], [member rotation], and [member scale]).
 			</description>
 		</method>
 		<method name="set_ignore_transform_notification">
 			<return type="void" />
 			<param index="0" name="enabled" type="bool" />
 			<description>
-				Sets whether the node ignores notification that its transformation (global or local) changed.
+				If [code]true[/code], the node will not receive [constant NOTIFICATION_TRANSFORM_CHANGED] or [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED].
+				It may useful to call this method when handling these notifications to prevent infinite recursion.
 			</description>
 		</method>
 		<method name="set_notify_local_transform">
 			<return type="void" />
 			<param index="0" name="enable" type="bool" />
 			<description>
-				Sets whether the node notifies about its local transformation changes. [Node3D] will not propagate this by default.
+				If [code]true[/code], the node will receive [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] whenever [member transform] changes.
+				[b]Note:[/b] Some 3D nodes such as [CSGShape3D] or [CollisionShape3D] automatically enable this to function correctly.
 			</description>
 		</method>
-		<method name="set_notify_transform">
+		<method name="set_notify_transform" keywords="set_notify_global_transform">
 			<return type="void" />
 			<param index="0" name="enable" type="bool" />
 			<description>
-				Sets whether the node notifies about its global and local transformation changes. [Node3D] will not propagate this by default, unless it is in the editor context and it has a valid gizmo.
+				If [code]true[/code], the node will receive [constant NOTIFICATION_TRANSFORM_CHANGED] whenever [member global_transform] changes.
+				[b]Note:[/b] Most 3D nodes such as [VisualInstance3D] or [CollisionObject3D] automatically enable this to function correctly.
+				[b]Note:[/b] In the editor, nodes will propagate this notification to their children if a gizmo is attached (see [method add_gizmo]).
 			</description>
 		</method>
 		<method name="set_subgizmo_selection">
@@ -235,143 +242,161 @@
 			<param index="1" name="id" type="int" />
 			<param index="2" name="transform" type="Transform3D" />
 			<description>
-				Set subgizmo selection for this node in the editor.
+				Selects the [param gizmo]'s subgizmo with the given [param id] and sets its transform. Only works in the editor.
 				[b]Note:[/b] The gizmo object would typically be an instance of [EditorNode3DGizmo], but the argument type is kept generic to avoid creating a dependency on editor classes in [Node3D].
 			</description>
 		</method>
 		<method name="show">
 			<return type="void" />
 			<description>
-				Enables rendering of this node. Changes [member visible] to [code]true[/code].
+				Allows this node to be rendered. Equivalent to setting [member visible] to [code]true[/code]. This is the opposite of [method hide].
 			</description>
 		</method>
 		<method name="to_global" qualifiers="const">
 			<return type="Vector3" />
 			<param index="0" name="local_point" type="Vector3" />
 			<description>
-				Transforms [param local_point] from this node's local space to world space.
+				Returns the [param local_point] converted from this node's local space to global space. This is the opposite of [method to_local].
 			</description>
 		</method>
 		<method name="to_local" qualifiers="const">
 			<return type="Vector3" />
 			<param index="0" name="global_point" type="Vector3" />
 			<description>
-				Transforms [param global_point] from world space to this node's local space.
+				Returns the [param global_point] converted from global space to this node's local space. This is the opposite of [method to_global].
 			</description>
 		</method>
 		<method name="translate">
 			<return type="void" />
 			<param index="0" name="offset" type="Vector3" />
 			<description>
-				Changes the node's position by the given offset [Vector3].
-				Note that the translation [param offset] is affected by the node's scale, so if scaled by e.g. [code](10, 1, 1)[/code], a translation by an offset of [code](2, 0, 0)[/code] would actually add 20 ([code]2 * 10[/code]) to the X coordinate.
+				Adds the given translation [param offset] to the node's position, in local space (relative to this node).
+				[b]Note:[/b] Prefer using [method translate_object_local], instead, as this method may be changed in a future release.
+				[b]Note:[/b] Despite the naming convention, this operation is [b]not[/b] calculated in parent space for compatibility reasons. To translate in parent space, add [param offset] to the [member position] ([code]node_3d.position += offset[/code]).
 			</description>
 		</method>
 		<method name="translate_object_local">
 			<return type="void" />
 			<param index="0" name="offset" type="Vector3" />
 			<description>
-				Changes the node's position by the given offset [Vector3] in local space.
+				Adds the given translation [param offset] to the node's position, in local space (relative to this node).
 			</description>
 		</method>
 		<method name="update_gizmos">
 			<return type="void" />
 			<description>
-				Updates all the [Node3D] gizmos attached to this node.
+				Updates all the [EditorNode3DGizmo] objects attached to this node. Only works in the editor.
 			</description>
 		</method>
 	</methods>
 	<members>
 		<member name="basis" type="Basis" setter="set_basis" getter="get_basis">
-			Basis of the [member transform] property. Represents the rotation, scale, and shear of this node.
+			Basis of the [member transform] property. Represents the rotation, scale, and shear of this node in parent space (relative to the parent node).
 		</member>
 		<member name="global_basis" type="Basis" setter="set_global_basis" getter="get_global_basis">
-			Global basis of this node. This is equivalent to [code]global_transform.basis[/code].
+			Basis of the [member global_transform] property. Represents the rotation, scale, and shear of this node in global space (relative to the world).
+			[b]Note:[/b] If the node is not inside the tree, getting this property fails and returns [constant Basis.IDENTITY].
 		</member>
-		<member name="global_position" type="Vector3" setter="set_global_position" getter="get_global_position">
-			Global position of this node. This is equivalent to [code]global_transform.origin[/code].
+		<member name="global_position" type="Vector3" setter="set_global_position" getter="get_global_position" keywords="global_translation">
+			Global position (translation) of this node in global space (relative to the world). This is equivalent to the [member global_transform]'s [member Transform3D.origin].
+			[b]Note:[/b] If the node is not inside the tree, getting this property fails and returns [constant Vector3.ZERO].
 		</member>
 		<member name="global_rotation" type="Vector3" setter="set_global_rotation" getter="get_global_rotation">
-			Rotation part of the global transformation in radians, specified in terms of YXZ-Euler angles in the format (X angle, Y angle, Z angle).
-			[b]Note:[/b] In the mathematical sense, rotation is a matrix and not a vector. The three Euler angles, which are the three independent parameters of the Euler-angle parametrization of the rotation matrix, are stored in a [Vector3] data structure not because the rotation is a vector, but only because [Vector3] exists as a convenient data-structure to store 3 floating-point numbers. Therefore, applying affine operations on the rotation "vector" is not meaningful.
+			Global rotation of this node as [url=https://en.wikipedia.org/wiki/Euler_angles]Euler angles[/url], in radians and in global space (relative to the world). This value is obtained from [member global_basis]'s rotation.
+			- The [member Vector3.x] is the angle around the global X axis (pitch);
+			- The [member Vector3.y] is the angle around the global Y axis (yaw);
+			- The [member Vector3.z] is the angle around the global Z axis (roll).
+			[b]Note:[/b] Unlike [member rotation], this property always follows the YXZ convention ([constant EULER_ORDER_YXZ]).
+			[b]Note:[/b] If the node is not inside the tree, getting this property fails and returns [constant Vector3.ZERO].
 		</member>
 		<member name="global_rotation_degrees" type="Vector3" setter="set_global_rotation_degrees" getter="get_global_rotation_degrees">
-			Helper property to access [member global_rotation] in degrees instead of radians.
+			The [member global_rotation] of this node, in degrees instead of radians.
+			[b]Note:[/b] If the node is not inside the tree, getting this property fails and returns [constant Vector3.ZERO].
 		</member>
 		<member name="global_transform" type="Transform3D" setter="set_global_transform" getter="get_global_transform">
-			World3D space (global) [Transform3D] of this node.
+			The transformation of this node, in global space (relative to the world). Contains and represents this node's [member global_position], [member global_rotation], and global scale.
+			[b]Note:[/b] If the node is not inside the tree, getting this property fails and returns [constant Transform3D.IDENTITY].
 		</member>
-		<member name="position" type="Vector3" setter="set_position" getter="get_position" default="Vector3(0, 0, 0)">
-			Local position or translation of this node relative to the parent. This is equivalent to [code]transform.origin[/code].
+		<member name="position" type="Vector3" setter="set_position" getter="get_position" default="Vector3(0, 0, 0)" keywords="translation">
+			Position (translation) of this node in parent space (relative to the parent node). This is equivalent to the [member transform]'s [member Transform3D.origin].
 		</member>
 		<member name="quaternion" type="Quaternion" setter="set_quaternion" getter="get_quaternion">
-			Access to the node rotation as a [Quaternion]. This property is ideal for tweening complex rotations.
+			Rotation of this node represented as a [Quaternion] in parent space (relative to the parent node). This value is obtained from [member basis]'s rotation.
+			[b]Note:[/b] Quaternions are much more suitable for 3D math but are less intuitive. Setting this property can be useful for interpolation (see [method Quaternion.slerp]).
 		</member>
 		<member name="rotation" type="Vector3" setter="set_rotation" getter="get_rotation" default="Vector3(0, 0, 0)">
-			Rotation part of the local transformation in radians, specified in terms of Euler angles. The angles construct a rotation in the order specified by the [member rotation_order] property.
-			[b]Note:[/b] In the mathematical sense, rotation is a matrix and not a vector. The three Euler angles, which are the three independent parameters of the Euler-angle parametrization of the rotation matrix, are stored in a [Vector3] data structure not because the rotation is a vector, but only because [Vector3] exists as a convenient data-structure to store 3 floating-point numbers. Therefore, applying affine operations on the rotation "vector" is not meaningful.
-			[b]Note:[/b] This property is edited in the inspector in degrees. If you want to use degrees in a script, use [member rotation_degrees].
+			Rotation of this node as [url=https://en.wikipedia.org/wiki/Euler_angles]Euler angles[/url], in radians and in parent space (relative to the parent node). This value is obtained from [member basis]'s rotation.
+			- The [member Vector3.x] is the angle around the local X axis (pitch);
+			- The [member Vector3.y] is the angle around the local Y axis (yaw);
+			- The [member Vector3.z] is the angle around the local Z axis (roll).
+			The order of each consecutive rotation can be changed with [member rotation_order] (see [enum EulerOrder] constants). By default, the YXZ convention is used ([constant EULER_ORDER_YXZ]).
+			[b]Note:[/b] This property is edited in degrees in the inspector. If you want to use degrees in a script, use [member rotation_degrees].
 		</member>
 		<member name="rotation_degrees" type="Vector3" setter="set_rotation_degrees" getter="get_rotation_degrees">
-			Helper property to access [member rotation] in degrees instead of radians.
+			The [member rotation] of this node, in degrees instead of radians.
+			[b]Note:[/b] This is [b]not[/b] the property available in the Inspector dock.
 		</member>
 		<member name="rotation_edit_mode" type="int" setter="set_rotation_edit_mode" getter="get_rotation_edit_mode" enum="Node3D.RotationEditMode" default="0">
-			Specify how rotation (and scale) will be presented in the editor.
+			How this node's rotation and scale are displayed in the Inspector dock.
 		</member>
 		<member name="rotation_order" type="int" setter="set_rotation_order" getter="get_rotation_order" enum="EulerOrder" default="2">
-			Specify the axis rotation order of the [member rotation] property. The final orientation is constructed by rotating the Euler angles in the order specified by this property.
+			The axis rotation order of the [member rotation] property. The final orientation is calculated by rotating around the local X, Y, and Z axis in this order.
 		</member>
 		<member name="scale" type="Vector3" setter="set_scale" getter="get_scale" default="Vector3(1, 1, 1)">
-			Scale part of the local transformation.
-			[b]Note:[/b] Mixed negative scales in 3D are not decomposable from the transformation matrix. Due to the way scale is represented with transformation matrices in Godot, the scale values will either be all positive or all negative.
-			[b]Note:[/b] Not all nodes are visually scaled by the [member scale] property. For example, [Light3D]s are not visually affected by [member scale].
+			Scale of this node in local space (relative to this node). This value is obtained from [member basis]'s scale.
+			[b]Note:[/b] The behavior of some 3D node types is not affected by this property. These include [Light3D], [Camera3D], [AudioStreamPlayer3D], and more.
+			[b]Warning:[/b] The scale's components must either be all positive or all negative, and [b]not[/b] exactly [code]0.0[/code]. Otherwise, it won't be possible to obtain the scale from the [member basis]. This may cause the intended scale to be lost when reloaded from disk, and potentially other unstable behavior.
 		</member>
 		<member name="top_level" type="bool" setter="set_as_top_level" getter="is_set_as_top_level" default="false">
-			If [code]true[/code], the node will not inherit its transformations from its parent. Node transformations are only in global space.
+			If [code]true[/code], the node does not inherit its transformations from its parent. As such, node transformations will only be in global space, which also means that [member global_transform] and [member transform] will be identical.
 		</member>
 		<member name="transform" type="Transform3D" setter="set_transform" getter="get_transform" default="Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)">
-			Local space [Transform3D] of this node, with respect to the parent node.
+			The local transformation of this node, in parent space (relative to the parent node). Contains and represents this node's [member position], [member rotation], and [member scale].
 		</member>
 		<member name="visibility_parent" type="NodePath" setter="set_visibility_parent" getter="get_visibility_parent" default="NodePath(&quot;&quot;)">
-			Defines the visibility range parent for this node and its subtree. The visibility parent must be a GeometryInstance3D. Any visual instance will only be visible if the visibility parent (and all of its visibility ancestors) is hidden by being closer to the camera than its own [member GeometryInstance3D.visibility_range_begin]. Nodes hidden via the [member Node3D.visible] property are essentially removed from the visibility dependency tree, so dependent instances will not take the hidden node or its ancestors into account.
+			Path to the visibility range parent for this node and its descendants. The visibility parent must be a [GeometryInstance3D].
+			Any visual instance will only be visible if the visibility parent (and all of its visibility ancestors) is hidden by being closer to the camera than its own [member GeometryInstance3D.visibility_range_begin]. Nodes hidden via the [member Node3D.visible] property are essentially removed from the visibility dependency tree, so dependent instances will not take the hidden node or its descendants into account.
 		</member>
 		<member name="visible" type="bool" setter="set_visible" getter="is_visible" default="true">
-			If [code]true[/code], this node is drawn. The node is only visible if all of its ancestors are visible as well (in other words, [method is_visible_in_tree] must return [code]true[/code]).
+			If [code]true[/code], this node can be visible. The node is only rendered when all of its ancestors are visible, as well. That means [method is_visible_in_tree] must return [code]true[/code].
 		</member>
 	</members>
 	<signals>
 		<signal name="visibility_changed">
 			<description>
-				Emitted when node visibility changes.
+				Emitted when this node's visibility changes (see [member visible] and [method is_visible_in_tree]).
+				This signal is emitted [i]after[/i] the related [constant NOTIFICATION_VISIBILITY_CHANGED] notification.
 			</description>
 		</signal>
 	</signals>
 	<constants>
-		<constant name="NOTIFICATION_TRANSFORM_CHANGED" value="2000">
-			[Node3D] nodes receive this notification when their global transform changes. This means that either the current or a parent node changed its transform.
-			In order for [constant NOTIFICATION_TRANSFORM_CHANGED] to work, users first need to ask for it, with [method set_notify_transform]. The notification is also sent if the node is in the editor context and it has at least one valid gizmo.
+		<constant name="NOTIFICATION_TRANSFORM_CHANGED" value="2000" keywords="NOTIFICATION_GLOBAL_TRANSFORM_CHANGED">
+			Notification received when this node's [member global_transform] changes, if [method is_transform_notification_enabled] is [code]true[/code]. See also [method set_notify_transform].
+			[b]Note:[/b] Most 3D nodes such as [VisualInstance3D] or [CollisionObject3D] automatically enable this to function correctly.
+			[b]Note:[/b] In the editor, nodes will propagate this notification to their children if a gizmo is attached (see [method add_gizmo]).
 		</constant>
 		<constant name="NOTIFICATION_ENTER_WORLD" value="41">
-			[Node3D] nodes receive this notification when they are registered to new [World3D] resource.
+			Notification received when this node is registered to a new [World3D] (see [method get_world_3d]).
 		</constant>
 		<constant name="NOTIFICATION_EXIT_WORLD" value="42">
-			[Node3D] nodes receive this notification when they are unregistered from current [World3D] resource.
+			Notification received when this node is unregistered from the current [World3D] (see [method get_world_3d]).
 		</constant>
 		<constant name="NOTIFICATION_VISIBILITY_CHANGED" value="43">
-			[Node3D] nodes receive this notification when their visibility changes.
+			Notification received when this node's visibility changes (see [member visible] and [method is_visible_in_tree]).
+			This notification is received [i]before[/i] the related [signal visibility_changed] signal.
 		</constant>
 		<constant name="NOTIFICATION_LOCAL_TRANSFORM_CHANGED" value="44">
-			[Node3D] nodes receive this notification when their local transform changes. This is not received when the transform of a parent node is changed.
-			In order for [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] to work, users first need to ask for it, with [method set_notify_local_transform].
+			Notification received when this node's [member transform] changes, if [method is_local_transform_notification_enabled] is [code]true[/code]. This is not received when a parent [Node3D]'s [member transform] changes. See also [method set_notify_local_transform].
+			[b]Note:[/b] Some 3D nodes such as [CSGShape3D] or [CollisionShape3D] automatically enable this to function correctly.
 		</constant>
 		<constant name="ROTATION_EDIT_MODE_EULER" value="0" enum="RotationEditMode">
-			The rotation is edited using [Vector3] Euler angles.
+			The rotation is edited using a [Vector3] in [url=https://en.wikipedia.org/wiki/Euler_angles]Euler angles[/url].
 		</constant>
 		<constant name="ROTATION_EDIT_MODE_QUATERNION" value="1" enum="RotationEditMode">
 			The rotation is edited using a [Quaternion].
 		</constant>
 		<constant name="ROTATION_EDIT_MODE_BASIS" value="2" enum="RotationEditMode">
-			The rotation is edited using a [Basis]. In this mode, [member scale] can't be edited separately.
+			The rotation is edited using a [Basis]. In this mode, the raw [member basis]'s axes can be freely modified, but the [member scale] property is not available.
 		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/OS.xml b/engine/doc/classes/OS.xml
index 72857bae..05715749 100644
--- a/engine/doc/classes/OS.xml
+++ b/engine/doc/classes/OS.xml
@@ -471,19 +471,23 @@
 		<method name="get_stderr_type" qualifiers="const">
 			<return type="int" enum="OS.StdHandleType" />
 			<description>
-				Returns type of the standard error device.
+				Returns the type of the standard error device.
+				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
 			</description>
 		</method>
 		<method name="get_stdin_type" qualifiers="const">
 			<return type="int" enum="OS.StdHandleType" />
 			<description>
-				Returns type of the standard input device.
+				Returns the type of the standard input device.
+				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
+				[b]Note:[/b] On exported Windows builds, run the console wrapper executable to access the standard input. If you need a single executable with full console support, use a custom build compiled with the [code]windows_subsystem=console[/code] flag.
 			</description>
 		</method>
 		<method name="get_stdout_type" qualifiers="const">
 			<return type="int" enum="OS.StdHandleType" />
 			<description>
-				Returns type of the standard output device.
+				Returns the type of the standard output device.
+				[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.
 			</description>
 		</method>
 		<method name="get_system_ca_certificates">
@@ -720,9 +724,9 @@
 		</method>
 		<method name="read_buffer_from_stdin">
 			<return type="PackedByteArray" />
-			<param index="0" name="buffer_size" type="int" />
+			<param index="0" name="buffer_size" type="int" default="1024" />
 			<description>
-				Reads a user input as raw data from the standard input. This operation can be [i]blocking[/i], which causes the window to freeze if [method read_string_from_stdin] is called on the main thread.
+				Reads a user input as raw data from the standard input. This operation can be [i]blocking[/i], which causes the window to freeze if [method read_buffer_from_stdin] is called on the main thread.
 				- If standard input is console, this method will block until the program receives a line break in standard input (usually by the user pressing [kbd]Enter[/kbd]).
 				- If standard input is pipe, this method will block until a specific amount of data is read or pipe is closed.
 				- If standard input is a file, this method will read a specific amount of data (or less if end-of-file is reached) and return immediately.
@@ -732,7 +736,7 @@
 		</method>
 		<method name="read_string_from_stdin">
 			<return type="String" />
-			<param index="0" name="buffer_size" type="int" />
+			<param index="0" name="buffer_size" type="int" default="1024" />
 			<description>
 				Reads a user input as a UTF-8 encoded string from the standard input. This operation can be [i]blocking[/i], which causes the window to freeze if [method read_string_from_stdin] is called on the main thread.
 				- If standard input is console, this method will block until the program receives a line break in standard input (usually by the user pressing [kbd]Enter[/kbd]).
diff --git a/engine/doc/classes/Object.xml b/engine/doc/classes/Object.xml
index ec34d464..74d74797 100644
--- a/engine/doc/classes/Object.xml
+++ b/engine/doc/classes/Object.xml
@@ -205,7 +205,6 @@
 			<param index="0" name="iter" type="Array" />
 			<description>
 				Initializes the iterator. [param iter] stores the iteration state. Since GDScript does not support passing arguments by reference, a single-element array is used as a wrapper. Returns [code]true[/code] so long as the iterator has not reached the end.
-				Example:
 				[codeblock]
 				class MyRange:
 				    var _from
@@ -519,131 +518,9 @@
 			<param index="2" name="flags" type="int" default="0" />
 			<description>
 				Connects a [param signal] by name to a [param callable]. Optional [param flags] can be also added to configure the connection's behavior (see [enum ConnectFlags] constants).
-				A signal can only be connected once to the same [Callable]. If the signal is already connected, this method returns [constant ERR_INVALID_PARAMETER] and pushes an error message, unless the signal is connected with [constant CONNECT_REFERENCE_COUNTED]. To prevent this, use [method is_connected] first to check for existing connections.
-				If the [param callable]'s object is freed, the connection will be lost.
-				[b]Examples with recommended syntax:[/b]
-				Connecting signals is one of the most common operations in Godot and the API gives many options to do so, which are described further down. The code block below shows the recommended approach.
-				[codeblocks]
-				[gdscript]
-				func _ready():
-				    var button = Button.new()
-				    # `button_down` here is a Signal variant type, and we thus call the Signal.connect() method, not Object.connect().
-				    # See discussion below for a more in-depth overview of the API.
-				    button.button_down.connect(_on_button_down)
-
-				    # This assumes that a `Player` class exists, which defines a `hit` signal.
-				    var player = Player.new()
-				    # We use Signal.connect() again, and we also use the Callable.bind() method,
-				    # which returns a new Callable with the parameter binds.
-				    player.hit.connect(_on_player_hit.bind("sword", 100))
-
-				func _on_button_down():
-				    print("Button down!")
-
-				func _on_player_hit(weapon_type, damage):
-				    print("Hit with weapon %s for %d damage." % [weapon_type, damage])
-				[/gdscript]
-				[csharp]
-				public override void _Ready()
-				{
-				    var button = new Button();
-				    // C# supports passing signals as events, so we can use this idiomatic construct:
-				    button.ButtonDown += OnButtonDown;
-
-				    // This assumes that a `Player` class exists, which defines a `Hit` signal.
-				    var player = new Player();
-				    // We can use lambdas when we need to bind additional parameters.
-				    player.Hit += () =&gt; OnPlayerHit("sword", 100);
-				}
-
-				private void OnButtonDown()
-				{
-				    GD.Print("Button down!");
-				}
-
-				private void OnPlayerHit(string weaponType, int damage)
-				{
-				    GD.Print($"Hit with weapon {weaponType} for {damage} damage.");
-				}
-				[/csharp]
-				[/codeblocks]
-				[b][code skip-lint]Object.connect()[/code] or [code skip-lint]Signal.connect()[/code]?[/b]
-				As seen above, the recommended method to connect signals is not [method Object.connect]. The code block below shows the four options for connecting signals, using either this legacy method or the recommended [method Signal.connect], and using either an implicit [Callable] or a manually defined one.
-				[codeblocks]
-				[gdscript]
-				func _ready():
-				    var button = Button.new()
-				    # Option 1: Object.connect() with an implicit Callable for the defined function.
-				    button.connect("button_down", _on_button_down)
-				    # Option 2: Object.connect() with a constructed Callable using a target object and method name.
-				    button.connect("button_down", Callable(self, "_on_button_down"))
-				    # Option 3: Signal.connect() with an implicit Callable for the defined function.
-				    button.button_down.connect(_on_button_down)
-				    # Option 4: Signal.connect() with a constructed Callable using a target object and method name.
-				    button.button_down.connect(Callable(self, "_on_button_down"))
-
-				func _on_button_down():
-				    print("Button down!")
-				[/gdscript]
-				[csharp]
-				public override void _Ready()
-				{
-				    var button = new Button();
-				    // Option 1: In C#, we can use signals as events and connect with this idiomatic syntax:
-				    button.ButtonDown += OnButtonDown;
-				    // Option 2: GodotObject.Connect() with a constructed Callable from a method group.
-				    button.Connect(Button.SignalName.ButtonDown, Callable.From(OnButtonDown));
-				    // Option 3: GodotObject.Connect() with a constructed Callable using a target object and method name.
-				    button.Connect(Button.SignalName.ButtonDown, new Callable(this, MethodName.OnButtonDown));
-				}
-
-				private void OnButtonDown()
-				{
-				    GD.Print("Button down!");
-				}
-				[/csharp]
-				[/codeblocks]
-				While all options have the same outcome ([code]button[/code]'s [signal BaseButton.button_down] signal will be connected to [code]_on_button_down[/code]), [b]option 3[/b] offers the best validation: it will print a compile-time error if either the [code]button_down[/code] [Signal] or the [code]_on_button_down[/code] [Callable] are not defined. On the other hand, [b]option 2[/b] only relies on string names and will only be able to validate either names at runtime: it will print a runtime error if [code]"button_down"[/code] doesn't correspond to a signal, or if [code]"_on_button_down"[/code] is not a registered method in the object [code]self[/code]. The main reason for using options 1, 2, or 4 would be if you actually need to use strings (e.g. to connect signals programmatically based on strings read from a configuration file). Otherwise, option 3 is the recommended (and fastest) method.
-				[b]Binding and passing parameters:[/b]
-				The syntax to bind parameters is through [method Callable.bind], which returns a copy of the [Callable] with its parameters bound.
-				When calling [method emit_signal] or [method Signal.emit], the signal parameters can be also passed. The examples below show the relationship between these signal parameters and bound parameters.
-				[codeblocks]
-				[gdscript]
-				func _ready():
-				    # This assumes that a `Player` class exists, which defines a `hit` signal.
-				    var player = Player.new()
-				    # Using Callable.bind().
-				    player.hit.connect(_on_player_hit.bind("sword", 100))
-
-				    # Parameters added when emitting the signal are passed first.
-				    player.hit.emit("Dark lord", 5)
-
-				# We pass two arguments when emitting (`hit_by`, `level`),
-				# and bind two more arguments when connecting (`weapon_type`, `damage`).
-				func _on_player_hit(hit_by, level, weapon_type, damage):
-				    print("Hit by %s (level %d) with weapon %s for %d damage." % [hit_by, level, weapon_type, damage])
-				[/gdscript]
-				[csharp]
-				public override void _Ready()
-				{
-				    // This assumes that a `Player` class exists, which defines a `Hit` signal.
-				    var player = new Player();
-				    // Using lambda expressions that create a closure that captures the additional parameters.
-				    // The lambda only receives the parameters defined by the signal's delegate.
-				    player.Hit += (hitBy, level) =&gt; OnPlayerHit(hitBy, level, "sword", 100);
-
-				    // Parameters added when emitting the signal are passed first.
-				    player.EmitSignal(SignalName.Hit, "Dark lord", 5);
-				}
-
-				// We pass two arguments when emitting (`hit_by`, `level`),
-				// and bind two more arguments when connecting (`weapon_type`, `damage`).
-				private void OnPlayerHit(string hitBy, int level, string weaponType, int damage)
-				{
-				    GD.Print($"Hit by {hitBy} (level {level}) with weapon {weaponType} for {damage} damage.");
-				}
-				[/csharp]
-				[/codeblocks]
+				A signal can only be connected once to the same [Callable]. If the signal is already connected, this method returns [constant ERR_INVALID_PARAMETER] and generates an error, unless the signal is connected with [constant CONNECT_REFERENCE_COUNTED]. To prevent this, use [method is_connected] first to check for existing connections.
+				[b]Note:[/b] If the [param callable]'s object is freed, the connection will be lost.
+				[b]Note:[/b] In GDScript, it is generally recommended to connect signals with [method Signal.connect] instead.
 			</description>
 		</method>
 		<method name="disconnect">
diff --git a/engine/doc/classes/OptionButton.xml b/engine/doc/classes/OptionButton.xml
index f04b0d94..aab6a113 100644
--- a/engine/doc/classes/OptionButton.xml
+++ b/engine/doc/classes/OptionButton.xml
@@ -42,6 +42,13 @@
 				Clears all the items in the [OptionButton].
 			</description>
 		</method>
+		<method name="get_item_auto_translate_mode" qualifiers="const">
+			<return type="int" enum="Node.AutoTranslateMode" />
+			<param index="0" name="idx" type="int" />
+			<description>
+				Returns the auto translate mode of the item at index [param idx].
+			</description>
+		</method>
 		<method name="get_item_icon" qualifiers="const">
 			<return type="Texture2D" />
 			<param index="0" name="idx" type="int" />
@@ -153,6 +160,15 @@
 				If [code]true[/code], shortcuts are disabled and cannot be used to trigger the button.
 			</description>
 		</method>
+		<method name="set_item_auto_translate_mode">
+			<return type="void" />
+			<param index="0" name="idx" type="int" />
+			<param index="1" name="mode" type="int" enum="Node.AutoTranslateMode" />
+			<description>
+				Sets the auto translate mode of the item at index [param idx].
+				Items use [constant Node.AUTO_TRANSLATE_MODE_INHERIT] by default, which uses the same auto translate mode as the [OptionButton] itself.
+			</description>
+		</method>
 		<method name="set_item_disabled">
 			<return type="void" />
 			<param index="0" name="idx" type="int" />
diff --git a/engine/doc/classes/PackedByteArray.xml b/engine/doc/classes/PackedByteArray.xml
index 2f8e4889..712b8484 100644
--- a/engine/doc/classes/PackedByteArray.xml
+++ b/engine/doc/classes/PackedByteArray.xml
@@ -6,7 +6,7 @@
 	<description>
 		An array specifically designed to hold bytes. Packs data tightly, so it saves memory for large array sizes.
 		[PackedByteArray] also provides methods to encode/decode various types to/from bytes. The way values are encoded is an implementation detail and shouldn't be relied upon when interacting with external apps.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -56,6 +56,30 @@
 				[b]Note:[/b] Calling [method bsearch] on an unsorted array results in unexpected behavior.
 			</description>
 		</method>
+		<method name="bswap16">
+			<return type="void" />
+			<param index="0" name="offset" type="int" default="0" />
+			<param index="1" name="count" type="int" default="-1" />
+			<description>
+				Swaps the byte order of [param count] 16-bit segments of the array starting at [param offset]. Swap is done in-place. If [param count] is less than zero, all segments to the end of array are processed, if processed data size is not a multiple of 2, the byte after the last processed 16-bit segment is not modified.
+			</description>
+		</method>
+		<method name="bswap32">
+			<return type="void" />
+			<param index="0" name="offset" type="int" default="0" />
+			<param index="1" name="count" type="int" default="-1" />
+			<description>
+				Swaps the byte order of [param count] 32-bit segments of the array starting at [param offset]. Swap is done in-place. If [param count] is less than zero, all segments to the end of array are processed, if processed data size is not a multiple of 4, bytes after the last processed 32-bit segment are not modified.
+			</description>
+		</method>
+		<method name="bswap64">
+			<return type="void" />
+			<param index="0" name="offset" type="int" default="0" />
+			<param index="1" name="count" type="int" default="-1" />
+			<description>
+				Swaps the byte order of [param count] 64-bit segments of the array starting at [param offset]. Swap is done in-place. If [param count] is less than zero, all segments to the end of array are processed, if processed data size is not a multiple of 8, bytes after the last processed 64-bit segment are not modified.
+			</description>
+		</method>
 		<method name="clear">
 			<return type="void" />
 			<description>
@@ -292,6 +316,13 @@
 				Encodes a [Variant] at the index of [param byte_offset] bytes. A sufficient space must be allocated, depending on the encoded variant's size. If [param allow_objects] is [code]false[/code], [Object]-derived values are not permitted and will instead be serialized as ID-only.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="int" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="int" />
@@ -320,6 +351,16 @@
 				Converts ASCII/Latin-1 encoded array to [String]. Fast alternative to [method get_string_from_utf8] if the content is ASCII/Latin-1 only. Unlike the UTF-8 function this function maps every byte to a character in the array. Multibyte sequences will not be interpreted correctly. For parsing user input always use [method get_string_from_utf8]. This is the inverse of [method String.to_ascii_buffer].
 			</description>
 		</method>
+		<method name="get_string_from_multibyte_char" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="encoding" type="String" default="&quot;&quot;" />
+			<description>
+				Converts system multibyte code page encoded array to [String]. If conversion fails, empty string is returned. This is the inverse of [method String.to_multibyte_char_buffer].
+				The values permitted for [param encoding] are system dependent. If [param encoding] is empty string, system default encoding is used.
+				- For Windows, see [url=https://learn.microsoft.com/en-us/windows/win32/Intl/code-page-identifiers]Code Page Identifiers[/url] .NET names.
+				- For macOS and Linux/BSD, see [code]libiconv[/code] library documentation and [code]iconv --list[/code] for a list of supported encodings.
+			</description>
+		</method>
 		<method name="get_string_from_utf8" qualifiers="const">
 			<return type="String" />
 			<description>
@@ -329,13 +370,13 @@
 		<method name="get_string_from_utf16" qualifiers="const">
 			<return type="String" />
 			<description>
-				Converts UTF-16 encoded array to [String]. If the BOM is missing, system endianness is assumed. Returns empty string if source array is not valid UTF-16 string. This is the inverse of [method String.to_utf16_buffer].
+				Converts UTF-16 encoded array to [String]. If the BOM is missing, little-endianness is assumed. Returns empty string if source array is not valid UTF-16 string. This is the inverse of [method String.to_utf16_buffer].
 			</description>
 		</method>
 		<method name="get_string_from_utf32" qualifiers="const">
 			<return type="String" />
 			<description>
-				Converts UTF-32 encoded array to [String]. System endianness is assumed. Returns empty string if source array is not valid UTF-32 string. This is the inverse of [method String.to_utf32_buffer].
+				Converts UTF-32 encoded array to [String]. Returns empty string if source array is not valid UTF-32 string. This is the inverse of [method String.to_utf32_buffer].
 			</description>
 		</method>
 		<method name="get_string_from_wchar" qualifiers="const">
@@ -408,6 +449,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedColorArray.xml b/engine/doc/classes/PackedColorArray.xml
index b9cef0ea..7f10e53d 100644
--- a/engine/doc/classes/PackedColorArray.xml
+++ b/engine/doc/classes/PackedColorArray.xml
@@ -6,7 +6,7 @@
 	<description>
 		An array specifically designed to hold [Color]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedColorArray] versus [code]Array[Color][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -79,6 +79,13 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="Color" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="Color" />
@@ -141,6 +148,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedFloat32Array.xml b/engine/doc/classes/PackedFloat32Array.xml
index 237b659a..07467762 100644
--- a/engine/doc/classes/PackedFloat32Array.xml
+++ b/engine/doc/classes/PackedFloat32Array.xml
@@ -6,7 +6,7 @@
 	<description>
 		An array specifically designed to hold 32-bit floating-point values (float). Packs data tightly, so it saves memory for large array sizes.
 		If you need to pack 64-bit floats tightly, see [PackedFloat64Array].
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -77,6 +77,14 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="float" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+				[b]Note:[/b] [constant @GDScript.NAN] doesn't behave the same as other numbers. Therefore, the results from this method may not be accurate if NaNs are included.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="float" />
@@ -141,6 +149,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedFloat64Array.xml b/engine/doc/classes/PackedFloat64Array.xml
index 56cc08d8..7471ee44 100644
--- a/engine/doc/classes/PackedFloat64Array.xml
+++ b/engine/doc/classes/PackedFloat64Array.xml
@@ -7,7 +7,7 @@
 		An array specifically designed to hold 64-bit floating-point values (double). Packs data tightly, so it saves memory for large array sizes.
 		If you only need to pack 32-bit floats tightly, see [PackedFloat32Array] for a more memory-friendly alternative.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedFloat64Array] versus [code]Array[float][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -78,6 +78,14 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="float" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+				[b]Note:[/b] [constant @GDScript.NAN] doesn't behave the same as other numbers. Therefore, the results from this method may not be accurate if NaNs are included.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="float" />
@@ -142,6 +150,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedInt32Array.xml b/engine/doc/classes/PackedInt32Array.xml
index 5bb2ea97..9d13b9de 100644
--- a/engine/doc/classes/PackedInt32Array.xml
+++ b/engine/doc/classes/PackedInt32Array.xml
@@ -6,7 +6,7 @@
 	<description>
 		An array specifically designed to hold 32-bit integer values. Packs data tightly, so it saves memory for large array sizes.
 		[b]Note:[/b] This type stores signed 32-bit integers, which means it can take values in the interval [code][-2^31, 2^31 - 1][/code], i.e. [code][-2147483648, 2147483647][/code]. Exceeding those bounds will wrap around. In comparison, [int] uses signed 64-bit integers which can hold much larger values. If you need to pack 64-bit integers tightly, see [PackedInt64Array].
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -75,6 +75,13 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="int" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="int" />
@@ -137,6 +144,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedInt64Array.xml b/engine/doc/classes/PackedInt64Array.xml
index 2ed85489..7992dff1 100644
--- a/engine/doc/classes/PackedInt64Array.xml
+++ b/engine/doc/classes/PackedInt64Array.xml
@@ -7,7 +7,7 @@
 		An array specifically designed to hold 64-bit integer values. Packs data tightly, so it saves memory for large array sizes.
 		[b]Note:[/b] This type stores signed 64-bit integers, which means it can take values in the interval [code][-2^63, 2^63 - 1][/code], i.e. [code][-9223372036854775808, 9223372036854775807][/code]. Exceeding those bounds will wrap around. If you only need to pack 32-bit integers tightly, see [PackedInt32Array] for a more memory-friendly alternative.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedInt64Array] versus [code]Array[int][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -76,6 +76,13 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="int" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="int" />
@@ -138,6 +145,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedStringArray.xml b/engine/doc/classes/PackedStringArray.xml
index df8be476..d583ecc8 100644
--- a/engine/doc/classes/PackedStringArray.xml
+++ b/engine/doc/classes/PackedStringArray.xml
@@ -12,7 +12,7 @@
 		print(string) # "hello world"
 		[/codeblock]
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedStringArray] versus [code]Array[String][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 		<link title="Operating System Testing Demo">https://godotengine.org/asset-library/asset/2789</link>
@@ -82,6 +82,13 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="String" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="String" />
@@ -144,6 +151,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedVector2Array.xml b/engine/doc/classes/PackedVector2Array.xml
index 4d487b6d..93adcbf9 100644
--- a/engine/doc/classes/PackedVector2Array.xml
+++ b/engine/doc/classes/PackedVector2Array.xml
@@ -6,7 +6,7 @@
 	<description>
 		An array specifically designed to hold [Vector2]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedVector2Array] versus [code]Array[Vector2][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 		<link title="Grid-based Navigation with AStarGrid2D Demo">https://godotengine.org/asset-library/asset/2723</link>
@@ -82,6 +82,14 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="Vector2" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+				[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the same as other vectors. Therefore, the results from this method may not be accurate if NaNs are included.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="Vector2" />
@@ -146,6 +154,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedVector3Array.xml b/engine/doc/classes/PackedVector3Array.xml
index d47f2f3c..be524078 100644
--- a/engine/doc/classes/PackedVector3Array.xml
+++ b/engine/doc/classes/PackedVector3Array.xml
@@ -6,7 +6,7 @@
 	<description>
 		An array specifically designed to hold [Vector3]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedVector3Array] versus [code]Array[Vector3][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -81,6 +81,14 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="Vector3" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+				[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the same as other vectors. Therefore, the results from this method may not be accurate if NaNs are included.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="Vector3" />
@@ -145,6 +153,7 @@
 			<param index="0" name="new_size" type="int" />
 			<description>
 				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/PackedVector4Array.xml b/engine/doc/classes/PackedVector4Array.xml
index 7bebee79..8859b87b 100644
--- a/engine/doc/classes/PackedVector4Array.xml
+++ b/engine/doc/classes/PackedVector4Array.xml
@@ -6,7 +6,7 @@
 	<description>
 		An array specifically designed to hold [Vector4]. Packs data tightly, so it saves memory for large array sizes.
 		[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] Packed arrays are generally faster to iterate on and modify compared to a typed array of the same type (e.g. [PackedVector4Array] versus [code]Array[Vector4][/code]). Also, packed arrays consume less memory. As a downside, packed arrays are less flexible as they don't offer as many convenience methods such as [method Array.map]. Typed arrays are in turn faster to iterate on and modify than untyped arrays.
-		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. The returned packed array of these are a copies, and changing it will [i]not[/i] affect the original value. To update a built-in property you need to modify the returned array, and then assign it to the property again.
+		[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of an array that can be modified independently of the original array, use [method duplicate]. This is [i]not[/i] the case for built-in properties and methods. In these cases the returned packed array is a copy, and changing it will [i]not[/i] affect the original value. To update a built-in property of this type, modify the returned array and then assign it to the property again.
 	</description>
 	<tutorials>
 	</tutorials>
@@ -81,6 +81,14 @@
 				Creates a copy of the array, and returns it.
 			</description>
 		</method>
+		<method name="erase">
+			<return type="bool" />
+			<param index="0" name="value" type="Vector4" />
+			<description>
+				Removes the first occurrence of a value from the array and returns [code]true[/code]. If the value does not exist in the array, nothing happens and [code]false[/code] is returned. To remove an element by index, use [method remove_at] instead.
+				[b]Note:[/b] Vectors with [constant @GDScript.NAN] elements don't behave the same as other vectors. Therefore, the results from this method may not be accurate if NaNs are included.
+			</description>
+		</method>
 		<method name="fill">
 			<return type="void" />
 			<param index="0" name="value" type="Vector4" />
@@ -144,7 +152,8 @@
 			<return type="int" />
 			<param index="0" name="new_size" type="int" />
 			<description>
-				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size.
+				Sets the size of the array. If the array is grown, reserves elements at the end of the array. If the array is shrunk, truncates the array to the new size. Calling [method resize] once and assigning the new values is faster than adding new elements one by one.
+				Returns [constant OK] on success, or one of the following [enum Error] constants if this method fails: [constant ERR_INVALID_PARAMETER] if the size is negative, or [constant ERR_OUT_OF_MEMORY] if allocations fail. Use [method size] to find the actual size of the array after resize.
 			</description>
 		</method>
 		<method name="reverse">
diff --git a/engine/doc/classes/Path3D.xml b/engine/doc/classes/Path3D.xml
index 730bcfd4..b650aee0 100644
--- a/engine/doc/classes/Path3D.xml
+++ b/engine/doc/classes/Path3D.xml
@@ -13,6 +13,10 @@
 		<member name="curve" type="Curve3D" setter="set_curve" getter="get_curve">
 			A [Curve3D] describing the path.
 		</member>
+		<member name="debug_custom_color" type="Color" setter="set_debug_custom_color" getter="get_debug_custom_color" default="Color(0, 0, 0, 1)">
+			The custom color to use to draw the shape in the editor.
+			If set to [code]Color(0.0, 0.0, 0.0)[/code] (by default), the color set in EditorSettings is used.
+		</member>
 	</members>
 	<signals>
 		<signal name="curve_changed">
@@ -20,5 +24,10 @@
 				Emitted when the [member curve] changes.
 			</description>
 		</signal>
+		<signal name="debug_color_changed">
+			<description>
+				Emitted when the [member debug_custom_color] changes.
+			</description>
+		</signal>
 	</signals>
 </class>
diff --git a/engine/doc/classes/Performance.xml b/engine/doc/classes/Performance.xml
index 66078d26..e882aa8e 100644
--- a/engine/doc/classes/Performance.xml
+++ b/engine/doc/classes/Performance.xml
@@ -195,34 +195,34 @@
 			Output latency of the [AudioServer]. Equivalent to calling [method AudioServer.get_output_latency], it is not recommended to call this every frame.
 		</constant>
 		<constant name="NAVIGATION_ACTIVE_MAPS" value="24" enum="Monitor">
-			Number of active navigation maps in the [NavigationServer3D]. This also includes the two empty default navigation maps created by World2D and World3D.
+			Number of active navigation maps in [NavigationServer2D] and [NavigationServer3D]. This also includes the two empty default navigation maps created by World2D and World3D.
 		</constant>
 		<constant name="NAVIGATION_REGION_COUNT" value="25" enum="Monitor">
-			Number of active navigation regions in the [NavigationServer3D].
+			Number of active navigation regions in [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="NAVIGATION_AGENT_COUNT" value="26" enum="Monitor">
-			Number of active navigation agents processing avoidance in the [NavigationServer3D].
+			Number of active navigation agents processing avoidance in [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="NAVIGATION_LINK_COUNT" value="27" enum="Monitor">
-			Number of active navigation links in the [NavigationServer3D].
+			Number of active navigation links in [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="NAVIGATION_POLYGON_COUNT" value="28" enum="Monitor">
-			Number of navigation mesh polygons in the [NavigationServer3D].
+			Number of navigation mesh polygons in [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="NAVIGATION_EDGE_COUNT" value="29" enum="Monitor">
-			Number of navigation mesh polygon edges in the [NavigationServer3D].
+			Number of navigation mesh polygon edges in [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="NAVIGATION_EDGE_MERGE_COUNT" value="30" enum="Monitor">
-			Number of navigation mesh polygon edges that were merged due to edge key overlap in the [NavigationServer3D].
+			Number of navigation mesh polygon edges that were merged due to edge key overlap in [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="NAVIGATION_EDGE_CONNECTION_COUNT" value="31" enum="Monitor">
-			Number of polygon edges that are considered connected by edge proximity [NavigationServer3D].
+			Number of polygon edges that are considered connected by edge proximity [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="NAVIGATION_EDGE_FREE_COUNT" value="32" enum="Monitor">
-			Number of navigation mesh polygon edges that could not be merged in the [NavigationServer3D]. The edges still may be connected by edge proximity or with links.
+			Number of navigation mesh polygon edges that could not be merged in [NavigationServer2D] and [NavigationServer3D]. The edges still may be connected by edge proximity or with links.
 		</constant>
 		<constant name="NAVIGATION_OBSTACLE_COUNT" value="33" enum="Monitor">
-			Number of active navigation obstacles in the [NavigationServer3D].
+			Number of active navigation obstacles in the [NavigationServer2D] and [NavigationServer3D].
 		</constant>
 		<constant name="PIPELINE_COMPILATIONS_CANVAS" value="34" enum="Monitor">
 			Number of pipeline compilations that were triggered by the 2D canvas renderer.
@@ -239,7 +239,67 @@
 		<constant name="PIPELINE_COMPILATIONS_SPECIALIZATION" value="38" enum="Monitor">
 			Number of pipeline compilations that were triggered to optimize the current scene. These compilations are done in the background and should not cause any stutters whatsoever.
 		</constant>
-		<constant name="MONITOR_MAX" value="39" enum="Monitor">
+		<constant name="NAVIGATION_2D_ACTIVE_MAPS" value="39" enum="Monitor">
+			Number of active navigation maps in the [NavigationServer2D]. This also includes the two empty default navigation maps created by World2D.
+		</constant>
+		<constant name="NAVIGATION_2D_REGION_COUNT" value="40" enum="Monitor">
+			Number of active navigation regions in the [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_2D_AGENT_COUNT" value="41" enum="Monitor">
+			Number of active navigation agents processing avoidance in the [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_2D_LINK_COUNT" value="42" enum="Monitor">
+			Number of active navigation links in the [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_2D_POLYGON_COUNT" value="43" enum="Monitor">
+			Number of navigation mesh polygons in the [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_2D_EDGE_COUNT" value="44" enum="Monitor">
+			Number of navigation mesh polygon edges in the [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_2D_EDGE_MERGE_COUNT" value="45" enum="Monitor">
+			Number of navigation mesh polygon edges that were merged due to edge key overlap in the [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_2D_EDGE_CONNECTION_COUNT" value="46" enum="Monitor">
+			Number of polygon edges that are considered connected by edge proximity [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_2D_EDGE_FREE_COUNT" value="47" enum="Monitor">
+			Number of navigation mesh polygon edges that could not be merged in the [NavigationServer2D]. The edges still may be connected by edge proximity or with links.
+		</constant>
+		<constant name="NAVIGATION_2D_OBSTACLE_COUNT" value="48" enum="Monitor">
+			Number of active navigation obstacles in the [NavigationServer2D].
+		</constant>
+		<constant name="NAVIGATION_3D_ACTIVE_MAPS" value="49" enum="Monitor">
+			Number of active navigation maps in the [NavigationServer3D]. This also includes the two empty default navigation maps created by World3D.
+		</constant>
+		<constant name="NAVIGATION_3D_REGION_COUNT" value="50" enum="Monitor">
+			Number of active navigation regions in the [NavigationServer3D].
+		</constant>
+		<constant name="NAVIGATION_3D_AGENT_COUNT" value="51" enum="Monitor">
+			Number of active navigation agents processing avoidance in the [NavigationServer3D].
+		</constant>
+		<constant name="NAVIGATION_3D_LINK_COUNT" value="52" enum="Monitor">
+			Number of active navigation links in the [NavigationServer3D].
+		</constant>
+		<constant name="NAVIGATION_3D_POLYGON_COUNT" value="53" enum="Monitor">
+			Number of navigation mesh polygons in the [NavigationServer3D].
+		</constant>
+		<constant name="NAVIGATION_3D_EDGE_COUNT" value="54" enum="Monitor">
+			Number of navigation mesh polygon edges in the [NavigationServer3D].
+		</constant>
+		<constant name="NAVIGATION_3D_EDGE_MERGE_COUNT" value="55" enum="Monitor">
+			Number of navigation mesh polygon edges that were merged due to edge key overlap in the [NavigationServer3D].
+		</constant>
+		<constant name="NAVIGATION_3D_EDGE_CONNECTION_COUNT" value="56" enum="Monitor">
+			Number of polygon edges that are considered connected by edge proximity [NavigationServer3D].
+		</constant>
+		<constant name="NAVIGATION_3D_EDGE_FREE_COUNT" value="57" enum="Monitor">
+			Number of navigation mesh polygon edges that could not be merged in the [NavigationServer3D]. The edges still may be connected by edge proximity or with links.
+		</constant>
+		<constant name="NAVIGATION_3D_OBSTACLE_COUNT" value="58" enum="Monitor">
+			Number of active navigation obstacles in the [NavigationServer3D].
+		</constant>
+		<constant name="MONITOR_MAX" value="59" enum="Monitor">
 			Represents the size of the [enum Monitor] enum.
 		</constant>
 	</constants>
diff --git a/engine/doc/classes/PhysicsDirectSpaceState2D.xml b/engine/doc/classes/PhysicsDirectSpaceState2D.xml
index 059073a9..4a3d0a26 100644
--- a/engine/doc/classes/PhysicsDirectSpaceState2D.xml
+++ b/engine/doc/classes/PhysicsDirectSpaceState2D.xml
@@ -33,14 +33,14 @@
 			<return type="Dictionary" />
 			<param index="0" name="parameters" type="PhysicsShapeQueryParameters2D" />
 			<description>
-				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space. If it collides with more than one shape, the nearest one is selected. If the shape did not intersect anything, then an empty dictionary is returned instead.
-				[b]Note:[/b] This method does not take into account the [code]motion[/code] property of the object. The returned object is a dictionary containing the following fields:
+				Checks the intersections of a shape, given through a [PhysicsShapeQueryParameters2D] object, against the space. If it collides with more than one shape, the nearest one is selected. The returned object is a dictionary containing the following fields:
 				[code]collider_id[/code]: The colliding object's ID.
 				[code]linear_velocity[/code]: The colliding object's velocity [Vector2]. If the object is an [Area2D], the result is [code](0, 0)[/code].
 				[code]normal[/code]: The collision normal of the query shape at the intersection point, pointing away from the intersecting object.
 				[code]point[/code]: The intersection point.
 				[code]rid[/code]: The intersecting object's [RID].
 				[code]shape[/code]: The shape index of the colliding shape.
+				If the shape did not intersect anything, then an empty dictionary is returned instead.
 			</description>
 		</method>
 		<method name="intersect_point">
diff --git a/engine/doc/classes/PhysicsDirectSpaceState3D.xml b/engine/doc/classes/PhysicsDirectSpaceState3D.xml
index 2f09b4f9..fee04c46 100644
--- a/engine/doc/classes/PhysicsDirectSpaceState3D.xml
+++ b/engine/doc/classes/PhysicsDirectSpaceState3D.xml
@@ -15,7 +15,7 @@
 			<return type="PackedFloat32Array" />
 			<param index="0" name="parameters" type="PhysicsShapeQueryParameters3D" />
 			<description>
-				Checks how far a [Shape3D] can move without colliding. All the parameters for the query, including the shape, are supplied through a [PhysicsShapeQueryParameters3D] object.
+				Checks how far a [Shape3D] can move without colliding. All the parameters for the query, including the shape and the motion, are supplied through a [PhysicsShapeQueryParameters3D] object.
 				Returns an array with the safe and unsafe proportions (between 0 and 1) of the motion. The safe proportion is the maximum fraction of the motion that can be made without a collision. The unsafe proportion is the minimum fraction of the distance that must be moved for a collision. If no collision is detected a result of [code][1.0, 1.0][/code] will be returned.
 				[b]Note:[/b] Any [Shape3D]s that the shape is already colliding with e.g. inside of, will be ignored. Use [method collide_shape] to determine the [Shape3D]s that the shape is already colliding with.
 			</description>
diff --git a/engine/doc/classes/Popup.xml b/engine/doc/classes/Popup.xml
index 29b44a98..e3118411 100644
--- a/engine/doc/classes/Popup.xml
+++ b/engine/doc/classes/Popup.xml
@@ -10,7 +10,10 @@
 	</tutorials>
 	<members>
 		<member name="borderless" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
+		<member name="maximize_disabled" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
+		<member name="minimize_disabled" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
 		<member name="popup_window" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
+		<member name="popup_wm_hint" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
 		<member name="transient" type="bool" setter="set_transient" getter="is_transient" overrides="Window" default="true" />
 		<member name="unresizable" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
 		<member name="visible" type="bool" setter="set_visible" getter="is_visible" overrides="Window" default="false" />
diff --git a/engine/doc/classes/PopupMenu.xml b/engine/doc/classes/PopupMenu.xml
index 8c140813..7f546563 100644
--- a/engine/doc/classes/PopupMenu.xml
+++ b/engine/doc/classes/PopupMenu.xml
@@ -237,6 +237,13 @@
 				Returns the accelerator of the item at the given [param index]. An accelerator is a keyboard shortcut that can be pressed to trigger the menu button even if it's not currently open. The return value is an integer which is generally a combination of [enum KeyModifierMask]s and [enum Key]s using bitwise OR such as [code]KEY_MASK_CTRL | KEY_A[/code] ([kbd]Ctrl + A[/kbd]). If no accelerator is defined for the specified [param index], [method get_item_accelerator] returns [code]0[/code] (corresponding to [constant @GlobalScope.KEY_NONE]).
 			</description>
 		</method>
+		<method name="get_item_auto_translate_mode" qualifiers="const">
+			<return type="int" enum="Node.AutoTranslateMode" />
+			<param index="0" name="index" type="int" />
+			<description>
+				Returns the auto translate mode of the item at the given [param index].
+			</description>
+		</method>
 		<method name="get_item_icon" qualifiers="const">
 			<return type="Texture2D" />
 			<param index="0" name="index" type="int" />
@@ -462,6 +469,15 @@
 				Mark the item at the given [param index] as a separator, which means that it would be displayed as a line. If [code]false[/code], sets the type of the item to plain text.
 			</description>
 		</method>
+		<method name="set_item_auto_translate_mode">
+			<return type="void" />
+			<param index="0" name="index" type="int" />
+			<param index="1" name="mode" type="int" enum="Node.AutoTranslateMode" />
+			<description>
+				Sets the auto translate mode of the item at the given [param index].
+				Items use [constant Node.AUTO_TRANSLATE_MODE_INHERIT] by default, which uses the same auto translate mode as the [PopupMenu] itself.
+			</description>
+		</method>
 		<method name="set_item_checked">
 			<return type="void" />
 			<param index="0" name="index" type="int" />
diff --git a/engine/doc/classes/PortableCompressedTexture2D.xml b/engine/doc/classes/PortableCompressedTexture2D.xml
index b85fe1de..52ed3917 100644
--- a/engine/doc/classes/PortableCompressedTexture2D.xml
+++ b/engine/doc/classes/PortableCompressedTexture2D.xml
@@ -74,5 +74,7 @@
 		</constant>
 		<constant name="COMPRESSION_MODE_BPTC" value="5" enum="CompressionMode">
 		</constant>
+		<constant name="COMPRESSION_MODE_ASTC" value="6" enum="CompressionMode">
+		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/PrimitiveMesh.xml b/engine/doc/classes/PrimitiveMesh.xml
index ba48d2dc..fdbbd767 100644
--- a/engine/doc/classes/PrimitiveMesh.xml
+++ b/engine/doc/classes/PrimitiveMesh.xml
@@ -49,7 +49,7 @@
 			Overrides the [AABB] with one defined by user for use with frustum culling. Especially useful to avoid unexpected culling when using a shader to offset vertices.
 		</member>
 		<member name="flip_faces" type="bool" setter="set_flip_faces" getter="get_flip_faces" default="false">
-			If set, the order of the vertices in each triangle are reversed resulting in the backside of the mesh being drawn.
+			If [code]true[/code], the order of the vertices in each triangle is reversed, resulting in the backside of the mesh being drawn.
 			This gives the same result as using [constant BaseMaterial3D.CULL_FRONT] in [member BaseMaterial3D.cull_mode].
 		</member>
 		<member name="material" type="Material" setter="set_material" getter="get_material">
diff --git a/engine/doc/classes/ProjectSettings.xml b/engine/doc/classes/ProjectSettings.xml
index 1a29e200..863fef32 100644
--- a/engine/doc/classes/ProjectSettings.xml
+++ b/engine/doc/classes/ProjectSettings.xml
@@ -114,6 +114,14 @@
 				[/codeblocks]
 			</description>
 		</method>
+		<method name="get_setting_with_override_and_custom_features" qualifiers="const">
+			<return type="Variant" />
+			<param index="0" name="name" type="StringName" />
+			<param index="1" name="features" type="PackedStringArray" />
+			<description>
+				Similar to [method get_setting_with_override], but applies feature tag overrides instead of current OS features.
+			</description>
+		</method>
 		<method name="globalize_path" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="path" type="String" />
@@ -235,6 +243,16 @@
 		</method>
 	</methods>
 	<members>
+		<member name="accessibility/general/accessibility_support" type="int" setter="" getter="" default="0">
+			Accessibility support mode:
+			- [b]Auto[/b] ([code]0[/code]): accessibility support is enabled, but accessibility information updates are processed only if an assistive app (e.g. screen reader or Braille display) is active (default).
+			- [b]Always Active[/b] ([code]1[/code]): accessibility support is enabled, and accessibility information updates are processed regardless of current assistive apps' status.
+			- [b]Disabled[/b] ([code]2[/code]): accessibility support is fully disabled.
+			[b]Note:[/b] Accessibility debugging tools, such as Accessibility Insights for Windows, macOS Accessibility Inspector, or AT-SPI Browser do not count as assistive apps. To test your app with these tools, use [code]1[/code].
+		</member>
+		<member name="accessibility/general/updates_per_second" type="int" setter="" getter="" default="60">
+			The number of accessibility information updates per second.
+		</member>
 		<member name="animation/warnings/check_angle_interpolation_type_conflicting" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], [AnimationMixer] prints the warning of interpolation being forced to choose the shortest rotation path due to multiple angle interpolation types being mixed in the [AnimationMixer] cache.
 		</member>
@@ -408,7 +426,7 @@
 		</member>
 		<member name="audio/general/3d_panning_strength" type="float" setter="" getter="" default="0.5">
 			The base strength of the panning effect for all [AudioStreamPlayer3D] nodes. The panning strength can be further scaled on each Node using [member AudioStreamPlayer3D.panning_strength]. A value of [code]0.0[/code] disables stereo panning entirely, leaving only volume attenuation in place. A value of [code]1.0[/code] completely mutes one of the channels if the sound is located exactly to the left (or right) of the listener.
-			The default value of [code]0.5[/code] is tuned for headphones. When using speakers, you may find lower values to sound better as speakers have a lower stereo separation compared to headphones.
+			The default value of [code]0.5[/code] is tuned for headphones which means that the opposite side channel goes no lower than 50% of the volume of the nearside channel. You may find that you can set this value higher for speakers to have the same effect since both ears can hear from each speaker.
 		</member>
 		<member name="audio/general/default_playback_type" type="int" setter="" getter="" default="0" experimental="">
 			Specifies the default playback type of the platform.
@@ -427,7 +445,7 @@
 			Sets the [url=https://developer.apple.com/documentation/avfaudio/avaudiosessioncategory]AVAudioSessionCategory[/url] on iOS. Use the [code]Playback[/code] category to get sound output, even if the phone is in silent mode.
 		</member>
 		<member name="audio/general/text_to_speech" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], text-to-speech support is enabled, see [method DisplayServer.tts_get_voices] and [method DisplayServer.tts_speak].
+			If [code]true[/code], text-to-speech support is enabled on startup, otherwise it is enabled first time TTS method is used, see [method DisplayServer.tts_get_voices] and [method DisplayServer.tts_speak].
 			[b]Note:[/b] Enabling TTS can cause addition idle CPU usage and interfere with the sleep mode, so consider disabling it if TTS is not used.
 		</member>
 		<member name="audio/video/video_delay_compensation_ms" type="int" setter="" getter="" default="0">
@@ -688,31 +706,58 @@
 		<member name="debug/shader_language/warnings/unused_varying" type="bool" setter="" getter="" default="true">
 			When set to [code]true[/code], produces a warning when a varying is never used.
 		</member>
-		<member name="debug/shapes/avoidance/agents_radius_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 0.25)">
+		<member name="debug/shapes/avoidance/2d/agents_radius_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 0.25)">
 			Color of the avoidance agents radius, visible when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/enable_agents_radius" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/avoidance/2d/enable_agents_radius" type="bool" setter="" getter="" default="true">
 			If enabled, displays avoidance agents radius when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/enable_obstacles_radius" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/avoidance/2d/enable_obstacles_radius" type="bool" setter="" getter="" default="true">
 			If enabled, displays avoidance obstacles radius when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/enable_obstacles_static" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/avoidance/2d/enable_obstacles_static" type="bool" setter="" getter="" default="true">
 			If enabled, displays static avoidance obstacles when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/obstacles_radius_color" type="Color" setter="" getter="" default="Color(1, 0.5, 0, 0.25)">
+		<member name="debug/shapes/avoidance/2d/obstacles_radius_color" type="Color" setter="" getter="" default="Color(1, 0.5, 0, 0.25)">
 			Color of the avoidance obstacles radius, visible when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/obstacles_static_edge_pushin_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 1)">
+		<member name="debug/shapes/avoidance/2d/obstacles_static_edge_pushin_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 1)">
 			Color of the static avoidance obstacles edges when their vertices are winded in order to push agents in, visible when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/obstacles_static_edge_pushout_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 1)">
+		<member name="debug/shapes/avoidance/2d/obstacles_static_edge_pushout_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 1)">
 			Color of the static avoidance obstacles edges when their vertices are winded in order to push agents out, visible when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/obstacles_static_face_pushin_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 0)">
+		<member name="debug/shapes/avoidance/2d/obstacles_static_face_pushin_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 0)">
 			Color of the static avoidance obstacles faces when their vertices are winded in order to push agents in, visible when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/avoidance/obstacles_static_face_pushout_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 0.5)">
+		<member name="debug/shapes/avoidance/2d/obstacles_static_face_pushout_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 0.5)">
+			Color of the static avoidance obstacles faces when their vertices are winded in order to push agents out, visible when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/agents_radius_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 0.25)">
+			Color of the avoidance agents radius, visible when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/enable_agents_radius" type="bool" setter="" getter="" default="true">
+			If enabled, displays avoidance agents radius when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/enable_obstacles_radius" type="bool" setter="" getter="" default="true">
+			If enabled, displays avoidance obstacles radius when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/enable_obstacles_static" type="bool" setter="" getter="" default="true">
+			If enabled, displays static avoidance obstacles when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/obstacles_radius_color" type="Color" setter="" getter="" default="Color(1, 0.5, 0, 0.25)">
+			Color of the avoidance obstacles radius, visible when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/obstacles_static_edge_pushin_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 1)">
+			Color of the static avoidance obstacles edges when their vertices are winded in order to push agents in, visible when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/obstacles_static_edge_pushout_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 1)">
+			Color of the static avoidance obstacles edges when their vertices are winded in order to push agents out, visible when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/obstacles_static_face_pushin_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 0)">
+			Color of the static avoidance obstacles faces when their vertices are winded in order to push agents in, visible when "Visible Avoidance" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/avoidance/3d/obstacles_static_face_pushout_color" type="Color" setter="" getter="" default="Color(1, 1, 0, 0.5)">
 			Color of the static avoidance obstacles faces when their vertices are winded in order to push agents out, visible when "Visible Avoidance" is enabled in the Debug menu.
 		</member>
 		<member name="debug/shapes/collision/contact_color" type="Color" setter="" getter="" default="Color(1, 0.2, 0.1, 0.8)">
@@ -727,58 +772,100 @@
 		<member name="debug/shapes/collision/shape_color" type="Color" setter="" getter="" default="Color(0, 0.6, 0.7, 0.42)">
 			Color of the collision shapes, visible when "Visible Collision Shapes" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/agent_path_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 1)">
+		<member name="debug/shapes/navigation/2d/agent_path_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 1)">
 			Color to display enabled navigation agent paths when an agent has debug enabled.
 		</member>
-		<member name="debug/shapes/navigation/agent_path_point_size" type="float" setter="" getter="" default="4.0">
+		<member name="debug/shapes/navigation/2d/agent_path_point_size" type="float" setter="" getter="" default="4.0">
 			Rasterized size (pixel) used to render navigation agent path points when an agent has debug enabled.
 		</member>
-		<member name="debug/shapes/navigation/edge_connection_color" type="Color" setter="" getter="" default="Color(1, 0, 1, 1)">
+		<member name="debug/shapes/navigation/2d/edge_connection_color" type="Color" setter="" getter="" default="Color(1, 0, 1, 1)">
 			Color to display edge connections between navigation regions, visible when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/enable_agent_paths" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/navigation/2d/enable_agent_paths" type="bool" setter="" getter="" default="true">
 			If enabled, displays navigation agent paths when an agent has debug enabled.
 		</member>
-		<member name="debug/shapes/navigation/enable_agent_paths_xray" type="bool" setter="" getter="" default="true">
-			If enabled, displays navigation agent paths through geometry when an agent has debug enabled.
-		</member>
-		<member name="debug/shapes/navigation/enable_edge_connections" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/navigation/2d/enable_edge_connections" type="bool" setter="" getter="" default="true">
 			If enabled, displays edge connections between navigation regions when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/enable_edge_connections_xray" type="bool" setter="" getter="" default="true">
-			If enabled, displays edge connections between navigation regions through geometry when "Visible Navigation" is enabled in the Debug menu.
-		</member>
-		<member name="debug/shapes/navigation/enable_edge_lines" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/navigation/2d/enable_edge_lines" type="bool" setter="" getter="" default="true">
 			If enabled, displays navigation mesh polygon edges when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/enable_edge_lines_xray" type="bool" setter="" getter="" default="true">
-			If enabled, displays navigation mesh polygon edges through geometry when "Visible Navigation" is enabled in the Debug menu.
-		</member>
-		<member name="debug/shapes/navigation/enable_geometry_face_random_color" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/navigation/2d/enable_geometry_face_random_color" type="bool" setter="" getter="" default="true">
 			If enabled, colorizes each navigation mesh polygon face with a random color when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/enable_link_connections" type="bool" setter="" getter="" default="true">
+		<member name="debug/shapes/navigation/2d/enable_link_connections" type="bool" setter="" getter="" default="true">
 			If enabled, displays navigation link connections when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/enable_link_connections_xray" type="bool" setter="" getter="" default="true">
-			If enabled, displays navigation link connections through geometry when "Visible Navigation" is enabled in the Debug menu.
-		</member>
-		<member name="debug/shapes/navigation/geometry_edge_color" type="Color" setter="" getter="" default="Color(0.5, 1, 1, 1)">
+		<member name="debug/shapes/navigation/2d/geometry_edge_color" type="Color" setter="" getter="" default="Color(0.5, 1, 1, 1)">
 			Color to display enabled navigation mesh polygon edges, visible when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/geometry_edge_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 1)">
+		<member name="debug/shapes/navigation/2d/geometry_edge_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 1)">
 			Color to display disabled navigation mesh polygon edges, visible when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/geometry_face_color" type="Color" setter="" getter="" default="Color(0.5, 1, 1, 0.4)">
+		<member name="debug/shapes/navigation/2d/geometry_face_color" type="Color" setter="" getter="" default="Color(0.5, 1, 1, 0.4)">
 			Color to display enabled navigation mesh polygon faces, visible when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/geometry_face_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 0.4)">
+		<member name="debug/shapes/navigation/2d/geometry_face_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 0.4)">
 			Color to display disabled navigation mesh polygon faces, visible when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/link_connection_color" type="Color" setter="" getter="" default="Color(1, 0.5, 1, 1)">
+		<member name="debug/shapes/navigation/2d/link_connection_color" type="Color" setter="" getter="" default="Color(1, 0.5, 1, 1)">
 			Color to use to display navigation link connections, visible when "Visible Navigation" is enabled in the Debug menu.
 		</member>
-		<member name="debug/shapes/navigation/link_connection_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 1)">
+		<member name="debug/shapes/navigation/2d/link_connection_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 1)">
+			Color to use to display disabled navigation link connections, visible when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/agent_path_color" type="Color" setter="" getter="" default="Color(1, 0, 0, 1)">
+			Color to display enabled navigation agent paths when an agent has debug enabled.
+		</member>
+		<member name="debug/shapes/navigation/3d/agent_path_point_size" type="float" setter="" getter="" default="4.0">
+			Rasterized size (pixel) used to render navigation agent path points when an agent has debug enabled.
+		</member>
+		<member name="debug/shapes/navigation/3d/edge_connection_color" type="Color" setter="" getter="" default="Color(1, 0, 1, 1)">
+			Color to display edge connections between navigation regions, visible when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_agent_paths" type="bool" setter="" getter="" default="true">
+			If enabled, displays navigation agent paths when an agent has debug enabled.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_agent_paths_xray" type="bool" setter="" getter="" default="true">
+			If enabled, displays navigation agent paths through geometry when an agent has debug enabled.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_edge_connections" type="bool" setter="" getter="" default="true">
+			If enabled, displays edge connections between navigation regions when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_edge_connections_xray" type="bool" setter="" getter="" default="true">
+			If enabled, displays edge connections between navigation regions through geometry when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_edge_lines" type="bool" setter="" getter="" default="true">
+			If enabled, displays navigation mesh polygon edges when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_edge_lines_xray" type="bool" setter="" getter="" default="true">
+			If enabled, displays navigation mesh polygon edges through geometry when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_geometry_face_random_color" type="bool" setter="" getter="" default="true">
+			If enabled, colorizes each navigation mesh polygon face with a random color when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_link_connections" type="bool" setter="" getter="" default="true">
+			If enabled, displays navigation link connections when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/enable_link_connections_xray" type="bool" setter="" getter="" default="true">
+			If enabled, displays navigation link connections through geometry when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/geometry_edge_color" type="Color" setter="" getter="" default="Color(0.5, 1, 1, 1)">
+			Color to display enabled navigation mesh polygon edges, visible when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/geometry_edge_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 1)">
+			Color to display disabled navigation mesh polygon edges, visible when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/geometry_face_color" type="Color" setter="" getter="" default="Color(0.5, 1, 1, 0.4)">
+			Color to display enabled navigation mesh polygon faces, visible when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/geometry_face_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 0.4)">
+			Color to display disabled navigation mesh polygon faces, visible when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/link_connection_color" type="Color" setter="" getter="" default="Color(1, 0.5, 1, 1)">
+			Color to use to display navigation link connections, visible when "Visible Navigation" is enabled in the Debug menu.
+		</member>
+		<member name="debug/shapes/navigation/3d/link_connection_disabled_color" type="Color" setter="" getter="" default="Color(0.5, 0.5, 0.5, 1)">
 			Color to use to display disabled navigation link connections, visible when "Visible Navigation" is enabled in the Debug menu.
 		</member>
 		<member name="debug/shapes/paths/geometry_color" type="Color" setter="" getter="" default="Color(0.1, 1, 0.7, 0.4)">
@@ -827,10 +914,10 @@
 		</member>
 		<member name="display/window/frame_pacing/android/swappy_mode" type="int" setter="" getter="" default="2">
 			Swappy mode to use. The options are:
-			- pipeline_forced_on: Try to honor [member Engine.max_fps]. Pipelining is always on. This is the same behavior as Desktop PC.
-			- auto_fps_pipeline_forced_on: Autocalculate max fps. Actual max_fps will be between 0 and [member Engine.max_fps]. While this sounds convenient, beware that Swappy will often downgrade max fps until it finds something that can be met and sustained. That means if your game runs between 40fps and 60fps on a 60hz screen, after some time Swappy will downgrade max fps so that the game renders at perfect 30fps.
-			- auto_fps_auto_pipeline: Same as auto_fps_pipeline_forced_on, but if Swappy detects that rendering is very fast (e.g. it takes &lt; 8ms to render on a 60hz screen) Swappy will disable pipelining to minimize input latency. This is the default.
-			[b]Note:[/b] If [member Engine.max_fps] is 0, actual max_fps will considered as to be the screen's refresh rate (often 60hz, 90hz or 120hz depending on device model and OS settings).
+			- [code]pipeline_forced_on[/code]: Try to honor [member Engine.max_fps]. Pipelining is always on. This is the same behavior as a desktop PC.
+			- [code]auto_fps_pipeline_forced_on[/code]: Calculate the max FPS automatically. The actual max FPS will be between [code]0[/code] and [member Engine.max_fps]. While this sounds convenient, beware that Swappy will often downgrade the max FPS until it finds a value that can be maintained. That means, if your game runs between 40fps and 60fps on a 60hz screen, after some time Swappy will downgrade the max FPS so that the game renders at a perfect 30fps.
+			- [code]auto_fps_auto_pipeline[/code]: Same as [code]auto_fps_pipeline_forced_on[/code], but if Swappy detects that rendering is very fast (for example it takes less than 8ms to render on a 60hz screen), Swappy will disable pipelining to minimize input latency. This is the default.
+			[b]Note:[/b] If [member Engine.max_fps] is [code]0[/code], the actual max FPS will be considered to be the screen's refresh rate (often 60hz, 90hz, or 120hz, depending on device model and OS settings).
 		</member>
 		<member name="display/window/handheld/orientation" type="int" setter="" getter="" default="0">
 			The default screen orientation to use on mobile devices. See [enum DisplayServer.ScreenOrientation] for possible values.
@@ -879,6 +966,12 @@
 			Main window initial screen, this setting is used only if [member display/window/size/initial_position_type] is set to "Other Screen Center" ([code]2[/code]).
 			[b]Note:[/b] This setting only affects the exported project, or when the project is run from the command line. In the editor, the value of [member EditorSettings.run/window_placement/screen] is used instead.
 		</member>
+		<member name="display/window/size/maximize_disabled" type="bool" setter="" getter="" default="false">
+			If [code]true[/code], the main window's maximize button is disabled.
+		</member>
+		<member name="display/window/size/minimize_disabled" type="bool" setter="" getter="" default="false">
+			If [code]true[/code], the main window's minimize button is disabled.
+		</member>
 		<member name="display/window/size/mode" type="int" setter="" getter="" default="0">
 			Main window mode. See [enum DisplayServer.WindowMode] for possible values and how each mode behaves.
 			[b]Note:[/b] Game embedding is available only in the "Windowed" mode.
@@ -1032,7 +1125,7 @@
 		</member>
 		<member name="filesystem/import/blender/enabled" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], Blender 3D scene files with the [code].blend[/code] extension will be imported by converting them to glTF 2.0.
-			This requires configuring a path to a Blender executable in the editor settings at [code]filesystem/import/blender/blender_path[/code]. Blender 3.0 or later is required.
+			This requires configuring a path to a Blender executable in the [member EditorSettings.filesystem/import/blender/blender_path] setting. Blender 3.0 or later is required.
 		</member>
 		<member name="filesystem/import/blender/enabled.android" type="bool" setter="" getter="" default="false">
 			Override for [member filesystem/import/blender/enabled] on Android where Blender can't easily be accessed from Godot.
@@ -1056,8 +1149,11 @@
 		<member name="gui/common/snap_controls_to_pixels" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], snaps [Control] node vertices to the nearest pixel to ensure they remain crisp even when the camera moves or zooms.
 		</member>
-		<member name="gui/common/swap_cancel_ok" type="bool" setter="" getter="">
-			If [code]true[/code], swaps [b]Cancel[/b] and [b]OK[/b] buttons in dialogs on Windows to follow interface conventions. [method DisplayServer.get_swap_cancel_ok] can be used to query whether buttons are swapped at run-time.
+		<member name="gui/common/swap_cancel_ok" type="int" setter="" getter="" default="0">
+			How to position the Cancel and OK buttons in the project's [AcceptDialog]s. Different platforms have different standard behaviors for this, which can be overridden using this setting.
+			- [b]Auto[/b] ([code]0[/code]) follows the platform convention: OK first on Windows, KDE, and LXQt, Cancel first on macOS and other Linux desktop environments. [method DisplayServer.get_swap_cancel_ok] can be used to query whether buttons are swapped at run-time.
+			- [b]Cancel First[/b] ([code]1[/code]) forces the ordering Cancel/OK.
+			- [b]OK First[/b] ([code]2[/code]) forces the ordering OK/Cancel.
 			[b]Note:[/b] This doesn't affect native dialogs such as the ones spawned by [method DisplayServer.dialog_show].
 		</member>
 		<member name="gui/common/text_edit_undo_stack_max_size" type="int" setter="" getter="" default="1024">
@@ -1119,10 +1215,18 @@
 			Default [InputEventAction] to confirm a focused button, menu or list item, or validate input.
 			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
 		</member>
+		<member name="input/ui_accessibility_drag_and_drop" type="Dictionary" setter="" getter="">
+			Default [InputEventAction] to start or end a drag-and-drop operation without using mouse.
+			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
+		</member>
 		<member name="input/ui_cancel" type="Dictionary" setter="" getter="">
 			Default [InputEventAction] to discard a modal or pending input.
 			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
 		</member>
+		<member name="input/ui_colorpicker_delete_preset" type="Dictionary" setter="" getter="">
+			Default [InputEventAction] to delete a color preset in a [ColorPicker].
+			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
+		</member>
 		<member name="input/ui_copy" type="Dictionary" setter="" getter="">
 			Default [InputEventAction] to copy a selection to the clipboard.
 			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
@@ -1151,6 +1255,10 @@
 			Default [InputEventAction] to go up one directory in a [FileDialog].
 			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
 		</member>
+		<member name="input/ui_focus_mode" type="Dictionary" setter="" getter="">
+			Default [InputEventAction] to switch [TextEdit] [member input/ui_text_indent] between moving keyboard focus to the next [Control] in the scene and inputting a [code]Tab[/code] character.
+			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
+		</member>
 		<member name="input/ui_focus_next" type="Dictionary" setter="" getter="">
 			Default [InputEventAction] to focus the next [Control] in the scene. The focus behavior can be configured via [member Control.focus_next].
 			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
@@ -1167,6 +1275,20 @@
 			Default [InputEventAction] to duplicate a [GraphNode] in a [GraphEdit].
 			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
 		</member>
+		<member name="input/ui_graph_follow_left" type="Dictionary" setter="" getter="">
+			Default [InputEventAction] to follow a [GraphNode] input port connection.
+			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
+		</member>
+		<member name="input/ui_graph_follow_left.macos" type="Dictionary" setter="" getter="">
+			macOS specific override for the shortcut to follow a [GraphNode] input port connection.
+		</member>
+		<member name="input/ui_graph_follow_right" type="Dictionary" setter="" getter="">
+			Default [InputEventAction] to follow a [GraphNode] output port connection.
+			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
+		</member>
+		<member name="input/ui_graph_follow_right.macos" type="Dictionary" setter="" getter="">
+			macOS specific override for the shortcut to follow a [GraphNode] output port connection.
+		</member>
 		<member name="input/ui_home" type="Dictionary" setter="" getter="">
 			Default [InputEventAction] to go to the start position of a [Control] (e.g. first item in an [ItemList] or a [Tree]), matching the behavior of [constant KEY_HOME] on typical desktop UI systems.
 			[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are necessary for the internal logic of several [Control]s. The events assigned to the action can however be modified.
@@ -1438,12 +1560,18 @@
 			- [code]wintab[/code], uses Wacom "WinTab" driver.
 			- [code]dummy[/code], tablet input is disabled.
 		</member>
+		<member name="input_devices/pointing/android/disable_scroll_deadzone" type="bool" setter="" getter="" default="false">
+			If [code]true[/code], disables the scroll deadzone on Android, allowing even very small scroll movements to be registered. This may increase scroll sensitivity but can also lead to unintended scrolling from slight finger movements.
+		</member>
 		<member name="input_devices/pointing/android/enable_long_press_as_right_click" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], long press events on an Android touchscreen are transformed into right click events.
 		</member>
 		<member name="input_devices/pointing/android/enable_pan_and_scale_gestures" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], multi-touch pan and scale gestures are enabled on Android devices.
 		</member>
+		<member name="input_devices/pointing/android/override_volume_buttons" type="bool" setter="" getter="" default="false">
+			If [code]true[/code], system volume changes are disabled when the buttons are used within the app.
+		</member>
 		<member name="input_devices/pointing/android/rotary_input_scroll_axis" type="int" setter="" getter="" default="1">
 			On Wear OS devices, defines which axis of the mouse wheel rotary input is mapped to. This rotary input is usually performed by rotating the physical or virtual (touch-based) bezel on a smartwatch.
 		</member>
@@ -2376,9 +2504,10 @@
 			[b]Note:[/b] This property is only read when the project starts. To change the maximum number of simulated physics steps per frame at runtime, set [member Engine.max_physics_steps_per_frame] instead.
 		</member>
 		<member name="physics/common/physics_interpolation" type="bool" setter="" getter="" default="false">
-			If [code]true[/code], the renderer will interpolate the transforms of physics objects between the last two transforms, so that smooth motion is seen even when physics ticks do not coincide with rendered frames. See also [member Node.physics_interpolation_mode] and [method Node.reset_physics_interpolation].
-			[b]Note:[/b] If [code]true[/code], the physics jitter fix should be disabled by setting [member physics/common/physics_jitter_fix] to [code]0.0[/code].
+			If [code]true[/code], the renderer will interpolate the transforms of objects (both physics and non-physics) between the last two transforms, so that smooth motion is seen even when physics ticks do not coincide with rendered frames. See also [method Node.reset_physics_interpolation].
+			[b]Note:[/b] Although this is a global setting, finer control of individual branches of the [SceneTree] is possible using [member Node.physics_interpolation_mode].
 			[b]Note:[/b] This property is only read when the project starts. To toggle physics interpolation at runtime, set [member SceneTree.physics_interpolation] instead.
+			[b]Note:[/b] Property [member physics/common/physics_jitter_fix] is automatically disabled if [member physics/common/physics_interpolation] is set to [code]true[/code], as the two methods are incompatible.
 		</member>
 		<member name="physics/common/physics_jitter_fix" type="float" setter="" getter="" default="0.5">
 			Controls how much physics ticks are synchronized with real time. For 0 or less, the ticks are synchronized. Such values are recommended for network games, where clock synchronization matters. Higher values cause higher deviation of in-game clock and real clock, but allows smoothing out framerate jitters. The default value of 0.5 should be good enough for most; values above 2 could cause the game to react to dropped frames with a noticeable delay and are not recommended.
@@ -2397,13 +2526,11 @@
 			[b]Note:[/b] Setting this too high can result in objects not depenetrating properly.
 			[b]Note:[/b] This applies to all shape queries, as well as physics bodies within the simulation.
 			[b]Note:[/b] This does not apply when enabling Jolt's enhanced internal edge removal, which supersedes this.
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/collisions/collision_margin_fraction" type="float" setter="" getter="" default="0.08">
 			The amount of collision margin to use for certain convex collision shapes, such as [BoxShape3D], [CylinderShape3D] and [ConvexPolygonShape3D], as a fraction of the shape's shortest axis, with [member Shape3D.margin] as the upper bound. This is mainly used to speed up collision detection with convex shapes.
 			[b]Note:[/b] Collision margins in Jolt do not add any extra size to the shape. Instead the shape is first shrunk by the margin and then expanded by the same amount, resulting in a shape with rounded corners.
 			[b]Note:[/b] Setting this value too close to [code]0.0[/code] may also negatively affect the accuracy of the collision detection with convex shapes.
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/joints/world_node" type="int" setter="" getter="" default="0">
 			Which of the two nodes bound by a joint should represent the world when one of the two is omitted, as either [member Joint3D.node_a] or [member Joint3D.node_b]. This can be thought of as having the omitted node be a [StaticBody3D] at the joint's position. Joint limits are more easily expressed when [member Joint3D.node_a] represents the world.
@@ -2438,28 +2565,23 @@
 		<member name="physics/jolt_physics_3d/motion_queries/recovery_amount" type="float" setter="" getter="" default="0.4">
 			Fraction of the total penetration to depenetrate per iteration during motion queries.
 			[b]Note:[/b] This affects methods [method CharacterBody3D.move_and_slide], [method PhysicsBody3D.move_and_collide], [method PhysicsBody3D.test_move] and [method PhysicsServer3D.body_test_motion].
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/motion_queries/recovery_iterations" type="int" setter="" getter="" default="4">
 			The number of iterations to run when depenetrating during motion queries.
 			[b]Note:[/b] This affects methods [method CharacterBody3D.move_and_slide], [method PhysicsBody3D.move_and_collide], [method PhysicsBody3D.test_move] and [method PhysicsServer3D.body_test_motion].
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/motion_queries/use_enhanced_internal_edge_removal" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], enables Jolt's enhanced internal edge removal during motion queries. This can help alleviate ghost collisions, but only with edges within a single body, meaning edges between separate bodies can still cause ghost collisions.
 			[b]Note:[/b] This affects methods [method CharacterBody3D.move_and_slide], [method PhysicsBody3D.move_and_collide], [method PhysicsBody3D.test_move] and [method PhysicsServer3D.body_test_motion].
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/queries/enable_ray_cast_face_index" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], populates the [code]face_index[/code] field in the results of [method PhysicsDirectSpaceState3D.intersect_ray], also accessed through [method RayCast3D.get_collision_face_index]. If [code]false[/code], the [code]face_index[/code] field will be left at its default value of [code]-1[/code].
 			[b]Note:[/b] Enabling this setting will increase Jolt's memory usage for [ConcavePolygonShape3D] by around 25%.
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/queries/use_enhanced_internal_edge_removal" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], enables Jolt's enhanced internal edge removal during shape queries. This can help alleviate ghost collisions when using shape queries for things like character movement, but only with edges within a single body, meaning edges between separate bodies can still cause ghost collisions.
 			[b]Note:[/b] This affects methods [method PhysicsDirectSpaceState3D.cast_motion], [method PhysicsDirectSpaceState3D.collide_shape], [method PhysicsDirectSpaceState3D.get_rest_info] and [method PhysicsDirectSpaceState3D.intersect_shape].
 			[b]Note:[/b] Enabling this setting can cause certain shapes to be culled from the results entirely, but you will get at least one intersection per body.
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/simulation/allow_sleep" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], [RigidBody3D] nodes are allowed to go to sleep if their velocity is below the threshold defined in [member physics/jolt_physics_3d/simulation/sleep_velocity_threshold] for the duration set in [member physics/jolt_physics_3d/simulation/sleep_time_threshold]. This can improve physics simulation performance when there are non-moving [RigidBody3D] nodes, at the cost of some nodes possibly failing to wake up in certain scenarios. Consider disabling this temporarily to troubleshoot [RigidBody3D] nodes not moving when they should.
@@ -2485,7 +2607,6 @@
 		</member>
 		<member name="physics/jolt_physics_3d/simulation/bounce_velocity_threshold" type="float" setter="" getter="" default="1.0">
 			The minimum velocity needed before a collision can be bouncy, in meters per second.
-			[b]Note:[/b] This setting will only be read once during the lifetime of the application.
 		</member>
 		<member name="physics/jolt_physics_3d/simulation/continuous_cd_max_penetration" type="float" setter="" getter="" default="0.25">
 			Fraction of a body's inner radius that may penetrate another body while using continuous collision detection.
@@ -2619,6 +2740,7 @@
 		</member>
 		<member name="rendering/environment/glow/upscale_mode" type="int" setter="" getter="" default="1">
 			Sets how the glow effect is upscaled before being copied onto the screen. Linear is faster, but looks blocky. Bicubic is slower but looks smooth.
+			[b]Note:[/b] [member rendering/environment/glow/upscale_mode] is only effective when using the Forward+ or Mobile rendering methods, as Compatibility uses a different glow implementation.
 		</member>
 		<member name="rendering/environment/glow/upscale_mode.mobile" type="int" setter="" getter="" default="0">
 			Lower-end override for [member rendering/environment/glow/upscale_mode] on mobile devices, due to performance concerns or driver support.
@@ -2957,6 +3079,7 @@
 		</member>
 		<member name="rendering/reflections/sky_reflections/texture_array_reflections" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], uses texture arrays instead of mipmaps for reflection probes and panorama backgrounds (sky). This reduces jitter noise and upscaling artifacts on reflections, but is significantly slower to compute and uses [member rendering/reflections/sky_reflections/roughness_layers] times more memory.
+			[b]Note:[/b] Texture array reflections are always disabled on macOS on Intel GPUs due to driver bugs.
 		</member>
 		<member name="rendering/reflections/sky_reflections/texture_array_reflections.mobile" type="bool" setter="" getter="" default="false">
 			Lower-end override for [member rendering/reflections/sky_reflections/texture_array_reflections] on mobile devices, due to performance concerns or driver support.
@@ -3037,11 +3160,11 @@
 		</member>
 		<member name="rendering/rendering_device/fallback_to_opengl3" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], the forward renderer will fall back to OpenGL 3 if Direct3D 12, Metal, and Vulkan are not supported.
-			[b]Note:[/b] This setting is implemented only on Windows, Android, macOS, iOS, and Linux/X11.
+			[b]Note:[/b] This setting is implemented on Windows, Android, macOS, iOS, and Linux/X11.
 		</member>
 		<member name="rendering/rendering_device/fallback_to_vulkan" type="bool" setter="" getter="" default="true">
 			If [code]true[/code], the forward renderer will fall back to Vulkan if Direct3D 12 (on Windows) or Metal (on macOS x86_64) are not supported. The fallback is always attempted regardless of this setting if Direct3D 12 (Windows) or Metal (macOS) driver support was disabled at compile time.
-			[b]Note:[/b] This setting is implemented only on Windows and macOS.
+			[b]Note:[/b] This setting is implemented on Windows and macOS.
 		</member>
 		<member name="rendering/rendering_device/pipeline_cache/enable" type="bool" setter="" getter="" default="true">
 			Enable the pipeline cache that is saved to disk if the graphics API supports it.
@@ -3210,7 +3333,7 @@
 			The ratio of [WorkerThreadPool]'s threads that will be reserved for low-priority tasks. For example, if 10 threads are available and this value is set to [code]0.3[/code], 3 of the worker threads will be reserved for low-priority tasks. The actual value won't exceed the number of CPU cores minus one, and if possible, at least one worker thread will be dedicated to low-priority tasks.
 		</member>
 		<member name="threading/worker_pool/max_threads" type="int" setter="" getter="" default="-1">
-			Maximum number of threads to be used by [WorkerThreadPool]. Value of [code]-1[/code] means no limit.
+			Maximum number of threads to be used by [WorkerThreadPool]. Value of [code]-1[/code] means [code]1[/code] on Web, or a number of [i]logical[/i] CPU cores available on other platforms (see [method OS.get_processor_count]).
 		</member>
 		<member name="xr/openxr/binding_modifiers/analog_threshold" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], enables the analog threshold binding modifier if supported by the XR runtime.
@@ -3245,11 +3368,11 @@
 		</member>
 		<member name="xr/openxr/extensions/hand_tracking_controller_data_source" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], support for the controller inferred data source is requested. If supported, you will receive hand tracking data even if the user has a controller in hand, with finger positions automatically inferred from controller input and/or sensors.
-			[b]Node:[/b] This requires the OpenXR data source extension and controller inferred handtracking to be supported by the XR runtime. If not supported this setting will be ignored. [member xr/openxr/extensions/hand_tracking] must be enabled for this setting to be used.
+			[b]Note:[/b] This requires the OpenXR data source extension and controller inferred handtracking to be supported by the XR runtime. If not supported this setting will be ignored. [member xr/openxr/extensions/hand_tracking] must be enabled for this setting to be used.
 		</member>
 		<member name="xr/openxr/extensions/hand_tracking_unobstructed_data_source" type="bool" setter="" getter="" default="false">
 			If [code]true[/code], support for the unobstructed data source is requested. If supported, you will receive hand tracking data based on the actual finger positions of the user often determined by optical tracking.
-			[b]Node:[/b] This requires the OpenXR data source extension and unobstructed handtracking to be supported by the XR runtime. If not supported this setting will be ignored. [member xr/openxr/extensions/hand_tracking] must be enabled for this setting to be used.
+			[b]Note:[/b] This requires the OpenXR data source extension and unobstructed handtracking to be supported by the XR runtime. If not supported this setting will be ignored. [member xr/openxr/extensions/hand_tracking] must be enabled for this setting to be used.
 		</member>
 		<member name="xr/openxr/form_factor" type="int" setter="" getter="" default="&quot;0&quot;">
 			Specify whether OpenXR should be configured for an HMD or a hand held device.
diff --git a/engine/doc/classes/Projection.xml b/engine/doc/classes/Projection.xml
index d32fdc9b..fd9dd744 100644
--- a/engine/doc/classes/Projection.xml
+++ b/engine/doc/classes/Projection.xml
@@ -207,7 +207,7 @@
 			<return type="int" />
 			<param index="0" name="for_pixel_width" type="int" />
 			<description>
-				Returns the number of pixels with the given pixel width displayed per meter, after this [Projection] is applied.
+				Returns [param for_pixel_width] divided by the viewport's width measured in meters on the near plane, after this [Projection] is applied.
 			</description>
 		</method>
 		<method name="get_projection_plane" qualifiers="const">
diff --git a/engine/doc/classes/RDTextureView.xml b/engine/doc/classes/RDTextureView.xml
index bd8102d5..2e03ee44 100644
--- a/engine/doc/classes/RDTextureView.xml
+++ b/engine/doc/classes/RDTextureView.xml
@@ -9,7 +9,7 @@
 	<tutorials>
 	</tutorials>
 	<members>
-		<member name="format_override" type="int" setter="set_format_override" getter="get_format_override" enum="RenderingDevice.DataFormat" default="218">
+		<member name="format_override" type="int" setter="set_format_override" getter="get_format_override" enum="RenderingDevice.DataFormat" default="232">
 			Optional override for the data format to return sampled values in. The corresponding [RDTextureFormat] must have had this added as a shareable format. The default value of [constant RenderingDevice.DATA_FORMAT_MAX] does not override the format.
 		</member>
 		<member name="swizzle_a" type="int" setter="set_swizzle_a" getter="get_swizzle_a" enum="RenderingDevice.TextureSwizzle" default="6">
diff --git a/engine/doc/classes/RDVertexAttribute.xml b/engine/doc/classes/RDVertexAttribute.xml
index 364b8252..04e4bb53 100644
--- a/engine/doc/classes/RDVertexAttribute.xml
+++ b/engine/doc/classes/RDVertexAttribute.xml
@@ -9,7 +9,7 @@
 	<tutorials>
 	</tutorials>
 	<members>
-		<member name="format" type="int" setter="set_format" getter="get_format" enum="RenderingDevice.DataFormat" default="218">
+		<member name="format" type="int" setter="set_format" getter="get_format" enum="RenderingDevice.DataFormat" default="232">
 			The way that this attribute's data is interpreted when sent to a shader.
 		</member>
 		<member name="frequency" type="int" setter="set_frequency" getter="get_frequency" enum="RenderingDevice.VertexFrequency" default="0">
diff --git a/engine/doc/classes/RenderingDevice.xml b/engine/doc/classes/RenderingDevice.xml
index 8db0272c..67a26569 100644
--- a/engine/doc/classes/RenderingDevice.xml
+++ b/engine/doc/classes/RenderingDevice.xml
@@ -676,7 +676,7 @@
 		<method name="get_tracked_object_type_count" qualifiers="const">
 			<return type="int" />
 			<description>
-				Returns how many types of trackable objects are.
+				Returns how many types of trackable objects there are.
 				This is only used by Vulkan in debug builds. Godot must also be started with the [code]--extra-gpu-memory-tracking[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line argument[/url].
 			</description>
 		</method>
@@ -1112,7 +1112,7 @@
 			<param index="1" name="data" type="PackedByteArray" default="PackedByteArray()" />
 			<param index="2" name="creation_bits" type="int" enum="RenderingDevice.BufferCreationBits" is_bitfield="true" default="0" />
 			<description>
-				It can be accessed with the RID that is returned.
+				Creates a new vertex buffer. It can be accessed with the RID that is returned.
 				Once finished with your RID, you will want to free the RID using the RenderingDevice's [method free_rid] method.
 			</description>
 		</method>
@@ -1302,7 +1302,7 @@
 			8-bit-per-channel signed integer red/green/blue channel data format. Values are in the [code][-127, 127][/code] range.
 		</constant>
 		<constant name="DATA_FORMAT_R8G8B8_SRGB" value="28" enum="DataFormat">
-			8-bit-per-channel unsigned floating-point red/green/blue/blue channel data format with normalized value and non-linear sRGB encoding. Values are in the [code][0.0, 1.0][/code] range.
+			8-bit-per-channel unsigned floating-point red/green/blue channel data format with normalized value and non-linear sRGB encoding. Values are in the [code][0.0, 1.0][/code] range.
 		</constant>
 		<constant name="DATA_FORMAT_B8G8R8_UNORM" value="29" enum="DataFormat">
 			8-bit-per-channel unsigned floating-point blue/green/red channel data format with normalized value. Values are in the [code][0.0, 1.0][/code] range.
@@ -1871,7 +1871,35 @@
 		<constant name="DATA_FORMAT_G16_B16_R16_3PLANE_444_UNORM" value="217" enum="DataFormat">
 			16-bit-per-channel unsigned floating-point green/blue/red channel data with normalized value, plus 6 unused bits after each channel. Stored across 3 separate planes (green + blue + red). Values are in the [code][0.0, 1.0][/code] range.
 		</constant>
-		<constant name="DATA_FORMAT_MAX" value="218" enum="DataFormat">
+		<constant name="DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK" value="218" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK" value="219" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK" value="220" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK" value="221" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK" value="222" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK" value="223" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK" value="224" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK" value="225" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK" value="226" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK" value="227" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK" value="228" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK" value="229" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK" value="230" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK" value="231" enum="DataFormat">
+		</constant>
+		<constant name="DATA_FORMAT_MAX" value="232" enum="DataFormat">
 			Represents the size of the [enum DataFormat] enum.
 		</constant>
 		<constant name="BARRIER_MASK_VERTEX" value="1" enum="BarrierMask" is_bitfield="true">
@@ -2451,6 +2479,12 @@
 		<constant name="PIPELINE_SPECIALIZATION_CONSTANT_TYPE_FLOAT" value="2" enum="PipelineSpecializationConstantType">
 			Floating-point specialization constant.
 		</constant>
+		<constant name="SUPPORTS_METALFX_SPATIAL" value="3" enum="Features">
+			Support for MetalFX spatial upscaling.
+		</constant>
+		<constant name="SUPPORTS_METALFX_TEMPORAL" value="4" enum="Features">
+			Support for MetalFX temporal upscaling.
+		</constant>
 		<constant name="SUPPORTS_BUFFER_DEVICE_ADDRESS" value="6" enum="Features">
 			Features support for buffer device address extension.
 		</constant>
diff --git a/engine/doc/classes/RenderingServer.xml b/engine/doc/classes/RenderingServer.xml
index 7ccaf880..048b024e 100644
--- a/engine/doc/classes/RenderingServer.xml
+++ b/engine/doc/classes/RenderingServer.xml
@@ -1259,6 +1259,7 @@
 			<param index="0" name="enable" type="bool" />
 			<description>
 				If [param enable] is [code]true[/code], enables bicubic upscaling for glow which improves quality at the cost of performance. Equivalent to [member ProjectSettings.rendering/environment/glow/upscale_mode].
+				[b]Note:[/b] This setting is only effective when using the Forward+ or Mobile rendering methods, as Compatibility uses a different glow implementation.
 			</description>
 		</method>
 		<method name="environment_set_adjustment">
@@ -1344,6 +1345,16 @@
 				Configures fog for the specified environment RID. See [code]fog_*[/code] properties in [Environment] for more information.
 			</description>
 		</method>
+		<method name="environment_set_fog_depth">
+			<return type="void" />
+			<param index="0" name="env" type="RID" />
+			<param index="1" name="curve" type="float" />
+			<param index="2" name="begin" type="float" />
+			<param index="3" name="end" type="float" />
+			<description>
+				Configures fog depth for the specified environment RID. Only has an effect when the fog mode of the environment is [constant ENV_FOG_MODE_DEPTH]. See [code]fog_depth_*[/code] properties in [Environment] for more information.
+			</description>
+		</method>
 		<method name="environment_set_glow">
 			<return type="void" />
 			<param index="0" name="env" type="RID" />
@@ -4668,7 +4679,7 @@
 			Flag used to mark that the array contains 2D vertices.
 		</constant>
 		<constant name="ARRAY_FLAG_USE_DYNAMIC_UPDATE" value="67108864" enum="ArrayFormat" is_bitfield="true">
-			Flag indices that the mesh data will use [code]GL_DYNAMIC_DRAW[/code] on GLES. Unused on Vulkan.
+			Flag used to mark that the mesh data will use [code]GL_DYNAMIC_DRAW[/code] on GLES. Unused on Vulkan.
 		</constant>
 		<constant name="ARRAY_FLAG_USE_8_BONE_WEIGHTS" value="134217728" enum="ArrayFormat" is_bitfield="true">
 			Flag used to mark that the array uses 8 bone weights instead of 4.
@@ -4806,7 +4817,7 @@
 			Normal bias used to offset shadow lookup by object normal. Can be used to fix self-shadowing artifacts.
 		</constant>
 		<constant name="LIGHT_PARAM_SHADOW_BIAS" value="15" enum="LightParam">
-			Bias the shadow lookup to fix self-shadowing artifacts.
+			Bias for the shadow lookup to fix self-shadowing artifacts.
 		</constant>
 		<constant name="LIGHT_PARAM_SHADOW_PANCAKE_SIZE" value="16" enum="LightParam">
 			Sets the size of the directional shadow pancake. The pancake offsets the start of the shadow's camera frustum to provide a higher effective depth resolution for the shadow. However, a high pancake size can cause artifacts in the shadows of large objects that are close to the edge of the frustum. Reducing the pancake size can help. Setting the size to [code]0[/code] turns off the pancaking effect.
@@ -5021,17 +5032,17 @@
 			Use bilinear scaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will result in undersampling while values greater than [code]1.0[/code] will result in supersampling. A value of [code]1.0[/code] disables scaling.
 		</constant>
 		<constant name="VIEWPORT_SCALING_3D_MODE_FSR" value="1" enum="ViewportScaling3DMode">
-			Use AMD FidelityFX Super Resolution 1.0 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the viewport being upscaled using FSR. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
+			Use AMD FidelityFX Super Resolution 1.0 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will result in the viewport being upscaled using FSR. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
 		</constant>
 		<constant name="VIEWPORT_SCALING_3D_MODE_FSR2" value="2" enum="ViewportScaling3DMode">
-			Use AMD FidelityFX Super Resolution 2.2 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the viewport being upscaled using FSR2. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use FSR2 at native resolution as a TAA solution.
+			Use AMD FidelityFX Super Resolution 2.2 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will result in the viewport being upscaled using FSR2. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use FSR2 at native resolution as a TAA solution.
 		</constant>
 		<constant name="VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL" value="3" enum="ViewportScaling3DMode">
-			Use MetalFX spatial upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
+			Use MetalFX spatial upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
 			[b]Note:[/b] Only supported when the Metal rendering driver is in use, which limits this scaling mode to macOS and iOS.
 		</constant>
 		<constant name="VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL" value="4" enum="ViewportScaling3DMode">
-			Use MetalFX temporal upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use MetalFX at native resolution as a TAA solution.
+			Use MetalFX temporal upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use MetalFX at native resolution as a TAA solution.
 			[b]Note:[/b] Only supported when the Metal rendering driver is in use, which limits this scaling mode to macOS and iOS.
 		</constant>
 		<constant name="VIEWPORT_SCALING_3D_MODE_MAX" value="5" enum="ViewportScaling3DMode">
@@ -5183,10 +5194,11 @@
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_LIGHTING" value="2" enum="ViewportDebugDraw">
 			Objects are displayed with only light information.
+			[b]Note:[/b] When using this debug draw mode, custom shaders are ignored since all materials in the scene temporarily use a debug material. This means the result from custom shader functions (such as vertex displacement) won't be visible anymore when using this debug draw mode.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_OVERDRAW" value="3" enum="ViewportDebugDraw">
 			Objects are displayed semi-transparent with additive blending so you can see where they are drawing over top of one another. A higher overdraw (represented by brighter colors) means you are wasting performance on drawing pixels that are being hidden behind others.
-			[b]Note:[/b] When using this debug draw mode, custom shaders will be ignored. This means vertex displacement won't be visible anymore.
+			[b]Note:[/b] When using this debug draw mode, custom shaders are ignored since all materials in the scene temporarily use a debug material. This means the result from custom shader functions (such as vertex displacement) won't be visible anymore when using this debug draw mode.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_WIREFRAME" value="4" enum="ViewportDebugDraw">
 			Debug draw draws objects in wireframe.
@@ -5196,13 +5208,16 @@
 			Normal buffer is drawn instead of regular scene so you can see the per-pixel normals that will be used by post-processing effects.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_VOXEL_GI_ALBEDO" value="6" enum="ViewportDebugDraw">
-			Objects are displayed with only the albedo value from [VoxelGI]s.
+			Objects are displayed with only the albedo value from [VoxelGI]s. Requires at least one visible [VoxelGI] node that has been baked to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_VOXEL_GI_LIGHTING" value="7" enum="ViewportDebugDraw">
-			Objects are displayed with only the lighting value from [VoxelGI]s.
+			Objects are displayed with only the lighting value from [VoxelGI]s. Requires at least one visible [VoxelGI] node that has been baked to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_VOXEL_GI_EMISSION" value="8" enum="ViewportDebugDraw">
-			Objects are displayed with only the emission color from [VoxelGI]s.
+			Objects are displayed with only the emission color from [VoxelGI]s. Requires at least one visible [VoxelGI] node that has been baked to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_SHADOW_ATLAS" value="9" enum="ViewportDebugDraw">
 			Draws the shadow atlas that stores shadows from [OmniLight3D]s and [SpotLight3D]s in the upper left quadrant of the [Viewport].
@@ -5214,51 +5229,67 @@
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_SCENE_LUMINANCE" value="11" enum="ViewportDebugDraw">
 			Draws the estimated scene luminance. This is a 1×1 texture that is generated when autoexposure is enabled to control the scene's exposure.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_SSAO" value="12" enum="ViewportDebugDraw">
 			Draws the screen space ambient occlusion texture instead of the scene so that you can clearly see how it is affecting objects. In order for this display mode to work, you must have [member Environment.ssao_enabled] set in your [WorldEnvironment].
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_SSIL" value="13" enum="ViewportDebugDraw">
 			Draws the screen space indirect lighting texture instead of the scene so that you can clearly see how it is affecting objects. In order for this display mode to work, you must have [member Environment.ssil_enabled] set in your [WorldEnvironment].
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_PSSM_SPLITS" value="14" enum="ViewportDebugDraw">
-			Colors each PSSM split for the [DirectionalLight3D]s in the scene a different color so you can see where the splits are. In order they will be colored red, green, blue, yellow.
+			Colors each PSSM split for the [DirectionalLight3D]s in the scene a different color so you can see where the splits are. In order (from closest to furthest from the camera), they are colored red, green, blue, and yellow.
+			[b]Note:[/b] When using this debug draw mode, custom shaders are ignored since all materials in the scene temporarily use a debug material. This means the result from custom shader functions (such as vertex displacement) won't be visible anymore when using this debug draw mode.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_DECAL_ATLAS" value="15" enum="ViewportDebugDraw">
 			Draws the decal atlas that stores decal textures from [Decal]s.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_SDFGI" value="16" enum="ViewportDebugDraw">
 			Draws SDFGI cascade data. This is the data structure that is used to bounce lighting against and create reflections.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_SDFGI_PROBES" value="17" enum="ViewportDebugDraw">
 			Draws SDFGI probe data. This is the data structure that is used to give indirect lighting dynamic objects moving within the scene.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_GI_BUFFER" value="18" enum="ViewportDebugDraw">
-			Draws the global illumination buffer ([VoxelGI] or SDFGI).
+			Draws the global illumination buffer from [VoxelGI] or SDFGI. Requires [VoxelGI] (at least one visible baked VoxelGI node) or SDFGI ([member Environment.sdfgi_enabled]) to be enabled to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_DISABLE_LOD" value="19" enum="ViewportDebugDraw">
 			Disable mesh LOD. All meshes are drawn with full detail, which can be used to compare performance.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_CLUSTER_OMNI_LIGHTS" value="20" enum="ViewportDebugDraw">
 			Draws the [OmniLight3D] cluster. Clustering determines where lights are positioned in screen-space, which allows the engine to only process these portions of the screen for lighting.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_CLUSTER_SPOT_LIGHTS" value="21" enum="ViewportDebugDraw">
 			Draws the [SpotLight3D] cluster. Clustering determines where lights are positioned in screen-space, which allows the engine to only process these portions of the screen for lighting.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_CLUSTER_DECALS" value="22" enum="ViewportDebugDraw">
 			Draws the [Decal] cluster. Clustering determines where decals are positioned in screen-space, which allows the engine to only process these portions of the screen for decals.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_CLUSTER_REFLECTION_PROBES" value="23" enum="ViewportDebugDraw">
 			Draws the [ReflectionProbe] cluster. Clustering determines where reflection probes are positioned in screen-space, which allows the engine to only process these portions of the screen for reflection probes.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_OCCLUDERS" value="24" enum="ViewportDebugDraw">
 			Draws the occlusion culling buffer. This low-resolution occlusion culling buffer is rasterized on the CPU and is used to check whether instances are occluded by other objects.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_MOTION_VECTORS" value="25" enum="ViewportDebugDraw">
 			Draws the motion vectors buffer. This is used by temporal antialiasing to correct for motion that occurs during gameplay.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="VIEWPORT_DEBUG_DRAW_INTERNAL_BUFFER" value="26" enum="ViewportDebugDraw">
 			Internal buffer is drawn instead of regular scene so you can see the per-pixel output that will be used by post-processing effects.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="VIEWPORT_VRS_DISABLED" value="0" enum="ViewportVRSMode">
 			Variable rate shading is disabled.
diff --git a/engine/doc/classes/ResourceImporterDynamicFont.xml b/engine/doc/classes/ResourceImporterDynamicFont.xml
index ee7504ae..47184aa0 100644
--- a/engine/doc/classes/ResourceImporterDynamicFont.xml
+++ b/engine/doc/classes/ResourceImporterDynamicFont.xml
@@ -50,6 +50,9 @@
 		<member name="language_support" type="Dictionary" setter="" getter="" default="{}">
 			Override the list of languages supported by this font. If left empty, this is supplied by the font metadata. There is usually no need to change this. See also [member script_support].
 		</member>
+		<member name="modulate_color_glyphs" type="bool" setter="" getter="" default="false">
+			If set to [code]true[/code], color modulation is applied when drawing colored glyphs, otherwise it's applied to the monochrome glyphs only.
+		</member>
 		<member name="msdf_pixel_range" type="int" setter="" getter="" default="8">
 			The width of the range around the shape between the minimum and maximum representable signed distance. If using font outlines, [member msdf_pixel_range] must be set to at least [i]twice[/i] the size of the largest font outline. The default [member msdf_pixel_range] value of [code]8[/code] allows outline sizes up to [code]4[/code] to look correct.
 		</member>
diff --git a/engine/doc/classes/ResourceUID.xml b/engine/doc/classes/ResourceUID.xml
index 24853d46..a87fb328 100644
--- a/engine/doc/classes/ResourceUID.xml
+++ b/engine/doc/classes/ResourceUID.xml
@@ -26,6 +26,13 @@
 				In order for this UID to be registered, you must call [method add_id] or [method set_id].
 			</description>
 		</method>
+		<method name="create_id_for_path">
+			<return type="int" />
+			<param index="0" name="path" type="String" />
+			<description>
+				Like [method create_id], but the UID is seeded with the provided [param path] and project name. UIDs generated for that path will be always the same within the current project.
+			</description>
+		</method>
 		<method name="get_id_path" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="id" type="int" />
diff --git a/engine/doc/classes/RichTextLabel.xml b/engine/doc/classes/RichTextLabel.xml
index 2662cb07..2786879d 100644
--- a/engine/doc/classes/RichTextLabel.xml
+++ b/engine/doc/classes/RichTextLabel.xml
@@ -29,6 +29,7 @@
 			<param index="7" name="pad" type="bool" default="false" />
 			<param index="8" name="tooltip" type="String" default="&quot;&quot;" />
 			<param index="9" name="size_in_percent" type="bool" default="false" />
+			<param index="10" name="alt_text" type="String" default="&quot;&quot;" />
 			<description>
 				Adds an image's opening and closing tags to the tag stack, optionally providing a [param width] and [param height] to resize the image, a [param color] to tint the image and a [param region] to only use parts of the image.
 				If [param width] or [param height] is set to 0, the image size will be adjusted in order to keep the original aspect ratio.
@@ -36,6 +37,7 @@
 				[param key] is an optional identifier, that can be used to modify the image via [method update_image].
 				If [param pad] is set, and the image is smaller than the size specified by [param width] and [param height], the image padding is added to match the size instead of upscaling.
 				If [param size_in_percent] is set, [param width] and [param height] values are percentages of the control width instead of pixels.
+				[param alt_text] is used as the image description for assistive apps.
 			</description>
 		</method>
 		<method name="add_text">
@@ -341,6 +343,7 @@
 			<param index="0" name="bgcolor" type="Color" />
 			<description>
 				Adds a [code skip-lint][bgcolor][/code] tag to the tag stack.
+				[b]Note:[/b] The background color has padding applied by default, which is controlled using [theme_item text_highlight_h_padding] and [theme_item text_highlight_v_padding]. This can lead to overlapping highlights if background colors are placed on neighboring lines/columns, so consider setting those theme items to [code]0[/code] if you want to avoid this.
 			</description>
 		</method>
 		<method name="push_bold">
@@ -400,6 +403,7 @@
 			<param index="0" name="fgcolor" type="Color" />
 			<description>
 				Adds a [code skip-lint][fgcolor][/code] tag to the tag stack.
+				[b]Note:[/b] The foreground color has padding applied by default, which is controlled using [theme_item text_highlight_h_padding] and [theme_item text_highlight_v_padding]. This can lead to overlapping highlights if foreground colors are placed on neighboring lines/columns, so consider setting those theme items to [code]0[/code] if you want to avoid this.
 			</description>
 		</method>
 		<method name="push_font">
@@ -515,8 +519,9 @@
 			<param index="0" name="columns" type="int" />
 			<param index="1" name="inline_align" type="int" enum="InlineAlignment" default="0" />
 			<param index="2" name="align_to_row" type="int" default="-1" />
+			<param index="3" name="name" type="String" default="&quot;&quot;" />
 			<description>
-				Adds a [code skip-lint][table=columns,inline_align][/code] tag to the tag stack. Use [method set_table_column_expand] to set column expansion ratio. Use [method push_cell] to add cells.
+				Adds a [code skip-lint][table=columns,inline_align][/code] tag to the tag stack. Use [method set_table_column_expand] to set column expansion ratio. Use [method push_cell] to add cells. [param name] is used as the table name for assistive apps.
 			</description>
 		</method>
 		<method name="push_underline">
@@ -525,6 +530,12 @@
 				Adds a [code skip-lint][u][/code] tag to the tag stack.
 			</description>
 		</method>
+		<method name="reload_effects">
+			<return type="void" />
+			<description>
+				Reloads custom effects. Useful when [member custom_effects] is modified manually.
+			</description>
+		</method>
 		<method name="remove_paragraph">
 			<return type="bool" />
 			<param index="0" name="paragraph" type="int" />
@@ -604,6 +615,14 @@
 				If [param expand] is [code]false[/code], the column will not contribute to the total ratio.
 			</description>
 		</method>
+		<method name="set_table_column_name">
+			<return type="void" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="name" type="String" />
+			<description>
+				Sets table column name for assistive apps.
+			</description>
+		</method>
 		<method name="update_image">
 			<return type="void" />
 			<param index="0" name="key" type="Variant" />
@@ -626,6 +645,9 @@
 		<member name="autowrap_mode" type="int" setter="set_autowrap_mode" getter="get_autowrap_mode" enum="TextServer.AutowrapMode" default="3">
 			If set to something other than [constant TextServer.AUTOWRAP_OFF], the text gets wrapped inside the node's bounding rectangle. To see how each mode behaves, see [enum TextServer.AutowrapMode].
 		</member>
+		<member name="autowrap_trim_flags" type="int" setter="set_autowrap_trim_flags" getter="get_autowrap_trim_flags" enum="TextServer.LineBreakFlag" is_bitfield="true" default="192">
+			Autowrap space trimming flags. See [constant TextServer.BREAK_TRIM_START_EDGE_SPACES] and [constant TextServer.BREAK_TRIM_END_EDGE_SPACES] for more info.
+		</member>
 		<member name="bbcode_enabled" type="bool" setter="set_use_bbcode" getter="is_using_bbcode" default="false">
 			If [code]true[/code], the label uses BBCode formatting.
 			[b]Note:[/b] This only affects the contents of [member text], not the tag stack.
@@ -647,6 +669,7 @@
 		<member name="fit_content" type="bool" setter="set_fit_content" getter="is_fit_content_enabled" default="false">
 			If [code]true[/code], the label's minimum size will be automatically updated to fit its content, matching the behavior of [Label].
 		</member>
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="3" />
 		<member name="hint_underlined" type="bool" setter="set_hint_underline" getter="is_hint_underlined" default="true">
 			If [code]true[/code], the label underlines hint tags such as [code skip-lint][hint=description]{text}[/hint][/code].
 		</member>
@@ -855,10 +878,10 @@
 			The vertical separation of elements in a table.
 		</theme_item>
 		<theme_item name="text_highlight_h_padding" data_type="constant" type="int" default="3">
-			The horizontal padding around boxes drawn by the [code][fgcolor][/code] and [code][bgcolor][/code] tags. This does not affect the appearance of text selection.
+			The horizontal padding around boxes drawn by the [code][fgcolor][/code] and [code][bgcolor][/code] tags. This does not affect the appearance of text selection. To avoid any risk of neighboring highlights overlapping each other, set this to [code]0[/code] to disable padding.
 		</theme_item>
 		<theme_item name="text_highlight_v_padding" data_type="constant" type="int" default="3">
-			The vertical padding around boxes drawn by the [code][fgcolor][/code] and [code][bgcolor][/code] tags. This does not affect the appearance of text selection.
+			The vertical padding around boxes drawn by the [code][fgcolor][/code] and [code][bgcolor][/code] tags. This does not affect the appearance of text selection. To avoid any risk of neighboring highlights overlapping each other, set this to [code]0[/code] to disable padding.
 		</theme_item>
 		<theme_item name="bold_font" data_type="font" type="Font">
 			The font used for bold text.
diff --git a/engine/doc/classes/SceneState.xml b/engine/doc/classes/SceneState.xml
index b7c8931a..e7dfc65e 100644
--- a/engine/doc/classes/SceneState.xml
+++ b/engine/doc/classes/SceneState.xml
@@ -10,6 +10,12 @@
 	<tutorials>
 	</tutorials>
 	<methods>
+		<method name="get_base_scene_state" qualifiers="const">
+			<return type="SceneState" />
+			<description>
+				Returns the [SceneState] of the scene that this scene inherits from, or [code]null[/code] if it doesn't inherit from any scene.
+			</description>
+		</method>
 		<method name="get_connection_binds" qualifiers="const">
 			<return type="Array" />
 			<param index="0" name="idx" type="int" />
@@ -155,6 +161,12 @@
 				Returns the type of the node at [param idx].
 			</description>
 		</method>
+		<method name="get_path" qualifiers="const">
+			<return type="String" />
+			<description>
+				Returns the resource path to the represented [PackedScene].
+			</description>
+		</method>
 		<method name="is_node_instance_placeholder" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="idx" type="int" />
diff --git a/engine/doc/classes/SceneTree.xml b/engine/doc/classes/SceneTree.xml
index 77baef9d..31459dcd 100644
--- a/engine/doc/classes/SceneTree.xml
+++ b/engine/doc/classes/SceneTree.xml
@@ -58,6 +58,7 @@
 				1. The current scene node is immediately removed from the tree. From that point, [method Node.get_tree] called on the current (outgoing) scene will return [code]null[/code]. [member current_scene] will be [code]null[/code], too, because the new scene is not available yet.
 				2. At the end of the frame, the formerly current scene, already removed from the tree, will be deleted (freed from memory) and then the new scene will be instantiated and added to the tree. [method Node.get_tree] and [member current_scene] will be back to working as usual.
 				This ensures that both scenes aren't running at the same time, while still freeing the previous scene in a safe way similar to [method Node.queue_free].
+				If you want to reliably access the new scene, await the [signal scene_changed] signal.
 			</description>
 		</method>
 		<method name="create_timer">
@@ -151,6 +152,18 @@
 				Returns [code]true[/code] if a node added to the given group [param name] exists in the tree.
 			</description>
 		</method>
+		<method name="is_accessibility_enabled" qualifiers="const">
+			<return type="bool" />
+			<description>
+				Returns [code]true[/code] if accessibility features are enabled, and accessibility information updates are actively processed.
+			</description>
+		</method>
+		<method name="is_accessibility_supported" qualifiers="const">
+			<return type="bool" />
+			<description>
+				Returns [code]true[/code] if accessibility features are supported by the OS and enabled in project settings.
+			</description>
+		</method>
 		<method name="notify_group">
 			<return type="void" />
 			<param index="0" name="group" type="StringName" />
@@ -265,8 +278,9 @@
 			- Depending on each node's [member Node.process_mode], their [method Node._process], [method Node._physics_process] and [method Node._input] callback methods may not called anymore.
 		</member>
 		<member name="physics_interpolation" type="bool" setter="set_physics_interpolation_enabled" getter="is_physics_interpolation_enabled" default="false">
-			If [code]true[/code], the renderer will interpolate the transforms of physics objects between the last two transforms, so that smooth motion is seen even when physics ticks do not coincide with rendered frames.
+			If [code]true[/code], the renderer will interpolate the transforms of objects (both physics and non-physics) between the last two transforms, so that smooth motion is seen even when physics ticks do not coincide with rendered frames.
 			The default value of this property is controlled by [member ProjectSettings.physics/common/physics_interpolation].
+			[b]Note:[/b] Although this is a global setting, finer control of individual branches of the [SceneTree] is possible using [member Node.physics_interpolation_mode].
 		</member>
 		<member name="quit_on_go_back" type="bool" setter="set_quit_on_go_back" getter="is_quit_on_go_back" default="true">
 			If [code]true[/code], the application quits automatically when navigating back (e.g. using the system "Back" button on Android).
@@ -312,6 +326,17 @@
 				Emitted immediately before [method Node._process] is called on every node in this tree.
 			</description>
 		</signal>
+		<signal name="scene_changed">
+			<description>
+				Emitted after the new scene is added to scene tree and initialized. Can be used to reliably access [member current_scene] when changing scenes.
+				[codeblock]
+				# This code should be inside an autoload.
+				get_tree().change_scene_to_file(other_scene_path)
+				await get_tree().scene_changed
+				print(get_tree().current_scene) # Prints the new scene.
+				[/codeblock]
+			</description>
+		</signal>
 		<signal name="tree_changed">
 			<description>
 				Emitted any time the tree's hierarchy changes (nodes being moved, renamed, etc.).
diff --git a/engine/doc/classes/ScriptLanguage.xml b/engine/doc/classes/ScriptLanguage.xml
index 0a1b801f..30ee98e6 100644
--- a/engine/doc/classes/ScriptLanguage.xml
+++ b/engine/doc/classes/ScriptLanguage.xml
@@ -15,5 +15,7 @@
 		</constant>
 		<constant name="SCRIPT_NAME_CASING_KEBAB_CASE" value="3" enum="ScriptNameCasing">
 		</constant>
+		<constant name="SCRIPT_NAME_CASING_CAMEL_CASE" value="4" enum="ScriptNameCasing">
+		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/ScrollBar.xml b/engine/doc/classes/ScrollBar.xml
index 4ee05632..d9f02176 100644
--- a/engine/doc/classes/ScrollBar.xml
+++ b/engine/doc/classes/ScrollBar.xml
@@ -12,6 +12,7 @@
 		<member name="custom_step" type="float" setter="set_custom_step" getter="get_custom_step" default="-1.0">
 			Overrides the step used when clicking increment and decrement buttons or when using arrow keys when the [ScrollBar] is focused.
 		</member>
+		<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="3" />
 		<member name="step" type="float" setter="set_step" getter="get_step" overrides="Range" default="0.0" />
 	</members>
 	<signals>
diff --git a/engine/doc/classes/Signal.xml b/engine/doc/classes/Signal.xml
index b9ec3495..b3149260 100644
--- a/engine/doc/classes/Signal.xml
+++ b/engine/doc/classes/Signal.xml
@@ -24,6 +24,128 @@
 		delegate void ItemDroppedEventHandler(string itemName, int amount);
 		[/csharp]
 		[/codeblocks]
+		Connecting signals is one of the most common operations in Godot and the API gives many options to do so, which are described further down. The code block below shows the recommended approach.
+		[codeblocks]
+		[gdscript]
+		func _ready():
+		    var button = Button.new()
+		    # `button_down` here is a Signal Variant type. We therefore call the Signal.connect() method, not Object.connect().
+		    # See discussion below for a more in-depth overview of the API.
+		    button.button_down.connect(_on_button_down)
+
+		    # This assumes that a `Player` class exists, which defines a `hit` signal.
+		    var player = Player.new()
+		    # We use Signal.connect() again, and we also use the Callable.bind() method,
+		    # which returns a new Callable with the parameter binds.
+		    player.hit.connect(_on_player_hit.bind("sword", 100))
+
+		func _on_button_down():
+		    print("Button down!")
+
+		func _on_player_hit(weapon_type, damage):
+		    print("Hit with weapon %s for %d damage." % [weapon_type, damage])
+		[/gdscript]
+		[csharp]
+		public override void _Ready()
+		{
+		    var button = new Button();
+		    // C# supports passing signals as events, so we can use this idiomatic construct:
+		    button.ButtonDown += OnButtonDown;
+
+		    // This assumes that a `Player` class exists, which defines a `Hit` signal.
+		    var player = new Player();
+		    // We can use lambdas when we need to bind additional parameters.
+		    player.Hit += () =&gt; OnPlayerHit("sword", 100);
+		}
+
+		private void OnButtonDown()
+		{
+		    GD.Print("Button down!");
+		}
+
+		private void OnPlayerHit(string weaponType, int damage)
+		{
+		    GD.Print($"Hit with weapon {weaponType} for {damage} damage.");
+		}
+		[/csharp]
+		[/codeblocks]
+		[b][code skip-lint]Object.connect()[/code] or [code skip-lint]Signal.connect()[/code]?[/b]
+		As seen above, the recommended method to connect signals is not [method Object.connect]. The code block below shows the four options for connecting signals, using either this legacy method or the recommended [method Signal.connect], and using either an implicit [Callable] or a manually defined one.
+		[codeblocks]
+		[gdscript]
+		func _ready():
+		    var button = Button.new()
+		    # Option 1: Object.connect() with an implicit Callable for the defined function.
+		    button.connect("button_down", _on_button_down)
+		    # Option 2: Object.connect() with a constructed Callable using a target object and method name.
+		    button.connect("button_down", Callable(self, "_on_button_down"))
+		    # Option 3: Signal.connect() with an implicit Callable for the defined function.
+		    button.button_down.connect(_on_button_down)
+		    # Option 4: Signal.connect() with a constructed Callable using a target object and method name.
+		    button.button_down.connect(Callable(self, "_on_button_down"))
+
+		func _on_button_down():
+		    print("Button down!")
+		[/gdscript]
+		[csharp]
+		public override void _Ready()
+		{
+		    var button = new Button();
+		    // Option 1: In C#, we can use signals as events and connect with this idiomatic syntax:
+		    button.ButtonDown += OnButtonDown;
+		    // Option 2: GodotObject.Connect() with a constructed Callable from a method group.
+		    button.Connect(Button.SignalName.ButtonDown, Callable.From(OnButtonDown));
+		    // Option 3: GodotObject.Connect() with a constructed Callable using a target object and method name.
+		    button.Connect(Button.SignalName.ButtonDown, new Callable(this, MethodName.OnButtonDown));
+		}
+
+		private void OnButtonDown()
+		{
+		    GD.Print("Button down!");
+		}
+		[/csharp]
+		[/codeblocks]
+		While all options have the same outcome ([code]button[/code]'s [signal BaseButton.button_down] signal will be connected to [code]_on_button_down[/code]), [b]option 3[/b] offers the best validation: it will print a compile-time error if either the [code]button_down[/code] [Signal] or the [code]_on_button_down[/code] [Callable] are not defined. On the other hand, [b]option 2[/b] only relies on string names and will only be able to validate either names at runtime: it will generate an error at runtime if [code]"button_down"[/code] is not a signal, or if [code]"_on_button_down"[/code] is not a method in the object [code]self[/code]. The main reason for using options 1, 2, or 4 would be if you actually need to use strings (e.g. to connect signals programmatically based on strings read from a configuration file). Otherwise, option 3 is the recommended (and fastest) method.
+		[b]Binding and passing parameters:[/b]
+		The syntax to bind parameters is through [method Callable.bind], which returns a copy of the [Callable] with its parameters bound.
+		When calling [method emit] or [method Object.emit_signal], the signal parameters can be also passed. The examples below show the relationship between these signal parameters and bound parameters.
+		[codeblocks]
+		[gdscript]
+		func _ready():
+		    # This assumes that a `Player` class exists, which defines a `hit` signal.
+		    var player = Player.new()
+		    # Using Callable.bind().
+		    player.hit.connect(_on_player_hit.bind("sword", 100))
+
+		    # Parameters added when emitting the signal are passed first.
+		    player.hit.emit("Dark lord", 5)
+
+		# We pass two arguments when emitting (`hit_by`, `level`),
+		# and bind two more arguments when connecting (`weapon_type`, `damage`).
+		func _on_player_hit(hit_by, level, weapon_type, damage):
+		    print("Hit by %s (level %d) with weapon %s for %d damage." % [hit_by, level, weapon_type, damage])
+		[/gdscript]
+		[csharp]
+		public override void _Ready()
+		{
+		    // This assumes that a `Player` class exists, which defines a `Hit` signal.
+		    var player = new Player();
+		    // Using lambda expressions that create a closure that captures the additional parameters.
+		    // The lambda only receives the parameters defined by the signal's delegate.
+		    player.Hit += (hitBy, level) =&gt; OnPlayerHit(hitBy, level, "sword", 100);
+
+		    // Parameters added when emitting the signal are passed first.
+		    player.EmitSignal(SignalName.Hit, "Dark lord", 5);
+		}
+
+		// We pass two arguments when emitting (`hit_by`, `level`),
+		// and bind two more arguments when connecting (`weapon_type`, `damage`).
+		private void OnPlayerHit(string hitBy, int level, string weaponType, int damage)
+		{
+		    GD.Print($"Hit by {hitBy} (level {level}) with weapon {weaponType} for {damage} damage.");
+		}
+		[/csharp]
+		[/codeblocks]
 	</description>
 	<tutorials>
 		<link title="Using Signals">$DOCS_URL/getting_started/step_by_step/signals.html</link>
@@ -59,7 +181,7 @@
 			<param index="1" name="flags" type="int" default="0" />
 			<description>
 				Connects this signal to the specified [param callable]. Optional [param flags] can be also added to configure the connection's behavior (see [enum Object.ConnectFlags] constants). You can provide additional arguments to the connected [param callable] by using [method Callable.bind].
-				A signal can only be connected once to the same [Callable]. If the signal is already connected, returns [constant ERR_INVALID_PARAMETER] and pushes an error message, unless the signal is connected with [constant Object.CONNECT_REFERENCE_COUNTED]. To prevent this, use [method is_connected] first to check for existing connections.
+				A signal can only be connected once to the same [Callable]. If the signal is already connected, this method returns [constant ERR_INVALID_PARAMETER] and generates an error, unless the signal is connected with [constant Object.CONNECT_REFERENCE_COUNTED]. To prevent this, use [method is_connected] first to check for existing connections.
 				[codeblock]
 				for button in $Buttons.get_children():
 				    button.pressed.connect(_on_pressed.bind(button))
@@ -67,6 +189,7 @@
 				func _on_pressed(button):
 				    print(button.name, " was pressed")
 				[/codeblock]
+				[b]Note:[/b] If the [param callable]'s object is freed, the connection will be lost.
 			</description>
 		</method>
 		<method name="disconnect">
diff --git a/engine/doc/classes/Skeleton3D.xml b/engine/doc/classes/Skeleton3D.xml
index aa751de5..98cc27ab 100644
--- a/engine/doc/classes/Skeleton3D.xml
+++ b/engine/doc/classes/Skeleton3D.xml
@@ -20,6 +20,14 @@
 				[b]Note:[/b] Bone names should be unique, non empty, and cannot include the [code]:[/code] and [code]/[/code] characters.
 			</description>
 		</method>
+		<method name="advance">
+			<return type="void" />
+			<param index="0" name="delta" type="float" />
+			<description>
+				Manually advance the child [SkeletonModifier3D]s by the specified time (in seconds).
+				[b]Note:[/b] The [param delta] is temporarily accumulated in the [Skeleton3D], and the deferred process uses the accumulated value to process the modification.
+			</description>
+		</method>
 		<method name="clear_bones">
 			<return type="void" />
 			<description>
@@ -104,14 +112,14 @@
 			<param index="0" name="bone_idx" type="int" />
 			<param index="1" name="key" type="StringName" />
 			<description>
-				Returns bone metadata for [param bone_idx] with [param key].
+				Returns the metadata for the bone at index [param bone_idx] with [param key].
 			</description>
 		</method>
 		<method name="get_bone_meta_list" qualifiers="const">
 			<return type="StringName[]" />
 			<param index="0" name="bone_idx" type="int" />
 			<description>
-				Returns a list of all metadata keys for [param bone_idx].
+				Returns the list of all metadata keys for the bone at index [param bone_idx].
 			</description>
 		</method>
 		<method name="get_bone_name" qualifiers="const">
@@ -191,7 +199,7 @@
 			<param index="0" name="bone_idx" type="int" />
 			<param index="1" name="key" type="StringName" />
 			<description>
-				Returns whether there exists any bone metadata for [param bone_idx] with key [param key].
+				Returns [code]true[/code] if the bone at index [param bone_idx] has metadata with the key [param key].
 			</description>
 		</method>
 		<method name="is_bone_enabled" qualifiers="const">
@@ -292,7 +300,7 @@
 			<param index="1" name="key" type="StringName" />
 			<param index="2" name="value" type="Variant" />
 			<description>
-				Sets bone metadata for [param bone_idx], will set the [param key] meta to [param value].
+				Sets the metadata for the bone at index [param bone_idx], setting the [param key] meta to [param value].
 			</description>
 		</method>
 		<method name="set_bone_name">
@@ -420,5 +428,8 @@
 		<constant name="MODIFIER_CALLBACK_MODE_PROCESS_IDLE" value="1" enum="ModifierCallbackModeProcess">
 			Set a flag to process modification during process frames (see [constant Node.NOTIFICATION_INTERNAL_PROCESS]).
 		</constant>
+		<constant name="MODIFIER_CALLBACK_MODE_PROCESS_MANUAL" value="2" enum="ModifierCallbackModeProcess">
+			Do not process modification. Use [method advance] to process the modification manually.
+		</constant>
 	</constants>
 </class>
diff --git a/engine/doc/classes/SkeletonModifier3D.xml b/engine/doc/classes/SkeletonModifier3D.xml
index 7e9814b1..c33a79c5 100644
--- a/engine/doc/classes/SkeletonModifier3D.xml
+++ b/engine/doc/classes/SkeletonModifier3D.xml
@@ -1,24 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="SkeletonModifier3D" inherits="Node3D" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		A node that may modify Skeleton3D's bone.
+		A node that may modify a Skeleton3D's bones.
 	</brief_description>
 	<description>
 		[SkeletonModifier3D] retrieves a target [Skeleton3D] by having a [Skeleton3D] parent.
-		If there is [AnimationMixer], modification always performs after playback process of the [AnimationMixer].
+		If there is an [AnimationMixer], a modification always performs after playback process of the [AnimationMixer].
 		This node should be used to implement custom IK solvers, constraints, or skeleton physics.
 	</description>
 	<tutorials>
 		<link title="Design of the Skeleton Modifier 3D">https://godotengine.org/article/design-of-the-skeleton-modifier-3d/</link>
 	</tutorials>
 	<methods>
-		<method name="_process_modification" qualifiers="virtual">
+		<method name="_process_modification" qualifiers="virtual" deprecated="Use [method _process_modification_with_delta] instead.">
 			<return type="void" />
 			<description>
 				Override this virtual method to implement a custom skeleton modifier. You should do things like get the [Skeleton3D]'s current pose and apply the pose here.
 				[method _process_modification] must not apply [member influence] to bone poses because the [Skeleton3D] automatically applies influence to all bone poses set by the modifier.
 			</description>
 		</method>
+		<method name="_process_modification_with_delta" qualifiers="virtual">
+			<return type="void" />
+			<param index="0" name="delta" type="float" />
+			<description>
+				Override this virtual method to implement a custom skeleton modifier. You should do things like get the [Skeleton3D]'s current pose and apply the pose here.
+				[method _process_modification_with_delta] must not apply [member influence] to bone poses because the [Skeleton3D] automatically applies influence to all bone poses set by the modifier.
+				[param delta] is passed from parent [Skeleton3D]. See also [method Skeleton3D.advance].
+			</description>
+		</method>
 		<method name="get_skeleton" qualifiers="const">
 			<return type="Skeleton3D" />
 			<description>
diff --git a/engine/doc/classes/SpringBoneSimulator3D.xml b/engine/doc/classes/SpringBoneSimulator3D.xml
index 60121216..c0a3be5b 100644
--- a/engine/doc/classes/SpringBoneSimulator3D.xml
+++ b/engine/doc/classes/SpringBoneSimulator3D.xml
@@ -19,7 +19,7 @@
 			<return type="bool" />
 			<param index="0" name="index" type="int" />
 			<description>
-				Returns [code]true[/code] if the all child [SpringBoneCollision3D]s are contained in the collision list at [param index] in the settings.
+				Returns [code]true[/code] if all child [SpringBoneCollision3D]s are contained in the collision list at [param index] in the settings.
 			</description>
 		</method>
 		<method name="clear_collisions">
@@ -378,8 +378,8 @@
 			<param index="0" name="index" type="int" />
 			<param index="1" name="enabled" type="bool" />
 			<description>
-				If sets [param enabled] to [code]true[/code], the all child [SpringBoneCollision3D]s are collided and [method set_exclude_collision_path] is enabled as an exclusion list at [param index] in the settings.
-				If sets [param enabled] to [code]false[/code], you need to manually register all valid collisions with [method set_collision_path].
+				If [param enabled] is [code]true[/code], all child [SpringBoneCollision3D]s are colliding and [method set_exclude_collision_path] is enabled as an exclusion list at [param index] in the settings.
+				If [param enabled] is [code]false[/code], you need to manually register all valid collisions with [method set_collision_path].
 			</description>
 		</method>
 		<method name="set_end_bone">
@@ -594,6 +594,10 @@
 		</method>
 	</methods>
 	<members>
+		<member name="external_force" type="Vector3" setter="set_external_force" getter="get_external_force" default="Vector3(0, 0, 0)">
+			The constant force that always affected bones. It is equal to the result when the parent [Skeleton3D] moves at this speed in the opposite direction.
+			This is useful for effects such as wind and anti-gravity.
+		</member>
 		<member name="setting_count" type="int" setter="set_setting_count" getter="get_setting_count" default="0">
 			The number of settings.
 		</member>
diff --git a/engine/doc/classes/SpriteBase3D.xml b/engine/doc/classes/SpriteBase3D.xml
index d6f8a519..b2b954ec 100644
--- a/engine/doc/classes/SpriteBase3D.xml
+++ b/engine/doc/classes/SpriteBase3D.xml
@@ -67,7 +67,7 @@
 			If [code]true[/code], texture can be seen from the back as well, if [code]false[/code], it is invisible when looking at it from behind.
 		</member>
 		<member name="fixed_size" type="bool" setter="set_draw_flag" getter="get_draw_flag" default="false">
-			If [code]true[/code], the label is rendered at the same size regardless of distance.
+			If [code]true[/code], the texture is rendered at the same size regardless of distance. The texture's size on screen is the same as if the camera was [code]1.0[/code] units away from the texture's origin, regardless of the actual distance from the camera. The [Camera3D]'s field of view (or [member Camera3D.size] when in orthogonal/frustum mode) still affects the size the sprite is drawn at.
 		</member>
 		<member name="flip_h" type="bool" setter="set_flip_h" getter="is_flipped_h" default="false">
 			If [code]true[/code], texture is flipped horizontally.
diff --git a/engine/doc/classes/StreamPeer.xml b/engine/doc/classes/StreamPeer.xml
index acff5cf6..e3fb1e80 100644
--- a/engine/doc/classes/StreamPeer.xml
+++ b/engine/doc/classes/StreamPeer.xml
@@ -69,7 +69,7 @@
 			<return type="Array" />
 			<param index="0" name="bytes" type="int" />
 			<description>
-				Returns a chunk data with the received bytes. The number of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will return how many were actually received. This function returns two values, an [enum Error] code, and a data array.
+				Returns a chunk data with the received bytes. The number of bytes to be received can be requested in the [param bytes] argument. If not enough bytes are available, the function will return how many were actually received. This function returns two values: an [enum Error] code and a data array.
 			</description>
 		</method>
 		<method name="get_string">
diff --git a/engine/doc/classes/StreamPeerGZIP.xml b/engine/doc/classes/StreamPeerGZIP.xml
index e3f8441d..01ca7d90 100644
--- a/engine/doc/classes/StreamPeerGZIP.xml
+++ b/engine/doc/classes/StreamPeerGZIP.xml
@@ -19,7 +19,8 @@
 		<method name="finish">
 			<return type="int" enum="Error" />
 			<description>
-				Finalizes the stream, compressing or decompressing any buffered chunk left.
+				Finalizes the stream, compressing any buffered chunk left.
+				You must call it only when you are compressing.
 			</description>
 		</method>
 		<method name="start_compression">
diff --git a/engine/doc/classes/String.xml b/engine/doc/classes/String.xml
index 68a7f673..8ace19c4 100644
--- a/engine/doc/classes/String.xml
+++ b/engine/doc/classes/String.xml
@@ -112,7 +112,7 @@
 			<param index="0" name="to" type="String" />
 			<description>
 				Performs a case-sensitive comparison to another string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/code] if equal. "Less than" and "greater than" are determined by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code points[/url] of each string, which roughly matches the alphabetical order.
-				With different string lengths, returns [code]1[/code] if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is [i]always[/i] [code]0[/code].
+				If the character comparison reaches the end of one string, but the other string contains more characters, then it will use length as the deciding factor: [code]1[/code] will be returned if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is always [code]0[/code].
 				To get a [bool] result from a string comparison, use the [code]==[/code] operator instead. See also [method nocasecmp_to], [method filecasecmp_to], and [method naturalcasecmp_to].
 			</description>
 		</method>
@@ -367,12 +367,12 @@
 				[gdscript]
 				var text = "hello world"
 				var encoded = text.to_utf8_buffer().hex_encode() # outputs "68656c6c6f20776f726c64"
-				print(buf.hex_decode().get_string_from_utf8())
+				print(encoded.hex_decode().get_string_from_utf8())
 				[/gdscript]
 				[csharp]
 				var text = "hello world";
 				var encoded = text.ToUtf8Buffer().HexEncode(); // outputs "68656c6c6f20776f726c64"
-				GD.Print(buf.HexDecode().GetStringFromUtf8());
+				GD.Print(encoded.HexDecode().GetStringFromUtf8());
 				[/csharp]
 				[/codeblocks]
 			</description>
@@ -651,7 +651,7 @@
 			<description>
 				Performs a [b]case-sensitive[/b], [i]natural order[/i] comparison to another string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/code] if equal. "Less than" or "greater than" are determined by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code points[/url] of each string, which roughly matches the alphabetical order.
 				When used for sorting, natural order comparison orders sequences of numbers by the combined value of each digit as is often expected, instead of the single digit's value. A sorted sequence of numbered strings will be [code]["1", "2", "3", ...][/code], not [code]["1", "10", "2", "3", ...][/code].
-				With different string lengths, returns [code]1[/code] if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is [i]always[/i] [code]0[/code].
+				If the character comparison reaches the end of one string, but the other string contains more characters, then it will use length as the deciding factor: [code]1[/code] will be returned if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is always [code]0[/code].
 				To get a [bool] result from a string comparison, use the [code]==[/code] operator instead. See also [method naturalnocasecmp_to], [method filecasecmp_to], and [method nocasecmp_to].
 			</description>
 		</method>
@@ -661,7 +661,7 @@
 			<description>
 				Performs a [b]case-insensitive[/b], [i]natural order[/i] comparison to another string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/code] if equal. "Less than" or "greater than" are determined by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code points[/url] of each string, which roughly matches the alphabetical order. Internally, lowercase characters are converted to uppercase for the comparison.
 				When used for sorting, natural order comparison orders sequences of numbers by the combined value of each digit as is often expected, instead of the single digit's value. A sorted sequence of numbered strings will be [code]["1", "2", "3", ...][/code], not [code]["1", "10", "2", "3", ...][/code].
-				With different string lengths, returns [code]1[/code] if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is [i]always[/i] [code]0[/code].
+				If the character comparison reaches the end of one string, but the other string contains more characters, then it will use length as the deciding factor: [code]1[/code] will be returned if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is always [code]0[/code].
 				To get a [bool] result from a string comparison, use the [code]==[/code] operator instead. See also [method naturalcasecmp_to], [method filenocasecmp_to], and [method casecmp_to].
 			</description>
 		</method>
@@ -670,7 +670,7 @@
 			<param index="0" name="to" type="String" />
 			<description>
 				Performs a [b]case-insensitive[/b] comparison to another string. Returns [code]-1[/code] if less than, [code]1[/code] if greater than, or [code]0[/code] if equal. "Less than" or "greater than" are determined by the [url=https://en.wikipedia.org/wiki/List_of_Unicode_characters]Unicode code points[/url] of each string, which roughly matches the alphabetical order. Internally, lowercase characters are converted to uppercase for the comparison.
-				With different string lengths, returns [code]1[/code] if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is [i]always[/i] [code]0[/code].
+				If the character comparison reaches the end of one string, but the other string contains more characters, then it will use length as the deciding factor: [code]1[/code] will be returned if this string is longer than the [param to] string, or [code]-1[/code] if shorter. Note that the length of empty strings is always [code]0[/code].
 				To get a [bool] result from a string comparison, use the [code]==[/code] operator instead. See also [method casecmp_to], [method filenocasecmp_to], and [method naturalnocasecmp_to].
 			</description>
 		</method>
@@ -727,7 +727,7 @@
 				GD.Print(n.ToString("e1")); // Prints -5.2e+008
 				[/csharp]
 				[/codeblocks]
-				[b]Note:[/b] In C#, this method is not implemented. To achieve similar results, see C#'s [url=https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-numeric-format-strings]Standard numeric format strings[/url]
+				[b]Note:[/b] In C#, this method is not implemented. To achieve similar results, see C#'s [url=https://learn.microsoft.com/en-us/dotnet/standard/base-types/standard-numeric-format-strings]Standard numeric format strings[/url].
 			</description>
 		</method>
 		<method name="num_uint64" qualifiers="static">
@@ -763,6 +763,20 @@
 				[b]Example:[/b] [code]"this/is".path_join("path") == "this/is/path"[/code].
 			</description>
 		</method>
+		<method name="remove_char" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="what" type="int" />
+			<description>
+				Removes all occurrences of the Unicode character with code [param what]. Faster version of [method replace] when the key is only one character long and the replacement is [code]""[/code].
+			</description>
+		</method>
+		<method name="remove_chars" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="chars" type="String" />
+			<description>
+				Removes any occurrence of the characters in [param chars]. See also [method remove_char].
+			</description>
+		</method>
 		<method name="repeat" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="count" type="int" />
@@ -778,6 +792,22 @@
 				Replaces all occurrences of [param what] inside the string with the given [param forwhat].
 			</description>
 		</method>
+		<method name="replace_char" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="key" type="int" />
+			<param index="1" name="with" type="int" />
+			<description>
+				Replaces all occurrences of the Unicode character with code [param key] with the Unicode character with code [param with]. Faster version of [method replace] when the key is only one character long. To get a single character use [code]"X".unicode_at(0)[/code] (note that some strings, like compound letters and emoji, can be made up of multiple unicode codepoints, and will not work with this method, use [method length] to make sure).
+			</description>
+		</method>
+		<method name="replace_chars" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="keys" type="String" />
+			<param index="1" name="with" type="int" />
+			<description>
+				Replaces any occurrence of the characters in [param keys] with the Unicode character with code [param with]. See also [method replace_char].
+			</description>
+		</method>
 		<method name="replacen" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="what" type="String" />
@@ -1010,12 +1040,41 @@
 				[/codeblock]
 			</description>
 		</method>
+		<method name="to_kebab_case" qualifiers="const">
+			<return type="String" />
+			<description>
+				Returns the string converted to [code]kebab-case[/code].
+				[b]Note:[/b] Numbers followed by a [i]single[/i] letter are not separated in the conversion to keep some words (such as "2D") together.
+				[codeblocks]
+				[gdscript]
+				"Node2D".to_kebab_case()               # Returns "node-2d"
+				"2nd place".to_kebab_case()            # Returns "2-nd-place"
+				"Texture3DAssetFolder".to_kebab_case() # Returns "texture-3d-asset-folder"
+				[/gdscript]
+				[csharp]
+				"Node2D".ToKebabCase();               // Returns "node-2d"
+				"2nd place".ToKebabCase();            // Returns "2-nd-place"
+				"Texture3DAssetFolder".ToKebabCase(); // Returns "texture-3d-asset-folder"
+				[/csharp]
+				[/codeblocks]
+			</description>
+		</method>
 		<method name="to_lower" qualifiers="const">
 			<return type="String" />
 			<description>
 				Returns the string converted to [code]lowercase[/code].
 			</description>
 		</method>
+		<method name="to_multibyte_char_buffer" qualifiers="const">
+			<return type="PackedByteArray" />
+			<param index="0" name="encoding" type="String" default="&quot;&quot;" />
+			<description>
+				Converts the string to system multibyte code page encoded [PackedByteArray]. If conversion fails, empty array is returned.
+				The values permitted for [param encoding] are system dependent. If [param encoding] is empty string, system default encoding is used.
+				- For Windows, see [url=https://learn.microsoft.com/en-us/windows/win32/Intl/code-page-identifiers]Code Page Identifiers[/url] .NET names.
+				- For macOS and Linux/BSD, see [code]libiconv[/code] library documentation and [code]iconv --list[/code] for a list of supported encodings.
+			</description>
+		</method>
 		<method name="to_pascal_case" qualifiers="const">
 			<return type="String" />
 			<description>
@@ -1106,6 +1165,7 @@
 				GD.Print(url.URIDecode()) // Prints "$DOCS_URL/?highlight=Godot Engine:docs"
 				[/csharp]
 				[/codeblocks]
+				[b]Note:[/b] This method decodes [code]+[/code] as space.
 			</description>
 		</method>
 		<method name="uri_encode" qualifiers="const">
@@ -1128,6 +1188,12 @@
 				[/codeblocks]
 			</description>
 		</method>
+		<method name="uri_file_decode" qualifiers="const">
+			<return type="String" />
+			<description>
+				Decodes the file path from its URL-encoded format. Unlike [method uri_decode] this method leaves [code]+[/code] as is.
+			</description>
+		</method>
 		<method name="validate_filename" qualifiers="const">
 			<return type="String" />
 			<description>
diff --git a/engine/doc/classes/StringName.xml b/engine/doc/classes/StringName.xml
index 96972706..ae3ad94c 100644
--- a/engine/doc/classes/StringName.xml
+++ b/engine/doc/classes/StringName.xml
@@ -350,12 +350,12 @@
 				[gdscript]
 				var text = "hello world"
 				var encoded = text.to_utf8_buffer().hex_encode() # outputs "68656c6c6f20776f726c64"
-				print(buf.hex_decode().get_string_from_utf8())
+				print(encoded.hex_decode().get_string_from_utf8())
 				[/gdscript]
 				[csharp]
 				var text = "hello world";
 				var encoded = text.ToUtf8Buffer().HexEncode(); // outputs "68656c6c6f20776f726c64"
-				GD.Print(buf.HexDecode().GetStringFromUtf8());
+				GD.Print(encoded.HexDecode().GetStringFromUtf8());
 				[/csharp]
 				[/codeblocks]
 			</description>
@@ -671,6 +671,20 @@
 				[b]Example:[/b] [code]"this/is".path_join("path") == "this/is/path"[/code].
 			</description>
 		</method>
+		<method name="remove_char" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="what" type="int" />
+			<description>
+				Removes all occurrences of the Unicode character with code [param what]. Faster version of [method replace] when the key is only one character long and the replacement is [code]""[/code].
+			</description>
+		</method>
+		<method name="remove_chars" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="chars" type="String" />
+			<description>
+				Removes any occurrence of the characters in [param chars]. See also [method remove_char].
+			</description>
+		</method>
 		<method name="repeat" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="count" type="int" />
@@ -686,6 +700,22 @@
 				Replaces all occurrences of [param what] inside the string with the given [param forwhat].
 			</description>
 		</method>
+		<method name="replace_char" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="key" type="int" />
+			<param index="1" name="with" type="int" />
+			<description>
+				Replaces all occurrences of the Unicode character with code [param key] with the Unicode character with code [param with]. Faster version of [method replace] when the key is only one character long. To get a single character use [code]"X".unicode_at(0)[/code] (note that some strings, like compound letters and emoji, can be made up of multiple unicode codepoints, and will not work with this method, use [method length] to make sure).
+			</description>
+		</method>
+		<method name="replace_chars" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="keys" type="String" />
+			<param index="1" name="with" type="int" />
+			<description>
+				Replaces any occurrence of the characters in [param keys] with the Unicode character with code [param with]. See also [method replace_char].
+			</description>
+		</method>
 		<method name="replacen" qualifiers="const">
 			<return type="String" />
 			<param index="0" name="what" type="String" />
@@ -918,12 +948,41 @@
 				[/codeblock]
 			</description>
 		</method>
+		<method name="to_kebab_case" qualifiers="const">
+			<return type="String" />
+			<description>
+				Returns the string converted to [code]kebab-case[/code].
+				[b]Note:[/b] Numbers followed by a [i]single[/i] letter are not separated in the conversion to keep some words (such as "2D") together.
+				[codeblocks]
+				[gdscript]
+				"Node2D".to_kebab_case()               # Returns "node-2d"
+				"2nd place".to_kebab_case()            # Returns "2-nd-place"
+				"Texture3DAssetFolder".to_kebab_case() # Returns "texture-3d-asset-folder"
+				[/gdscript]
+				[csharp]
+				"Node2D".ToKebabCase();               // Returns "node-2d"
+				"2nd place".ToKebabCase();            // Returns "2-nd-place"
+				"Texture3DAssetFolder".ToKebabCase(); // Returns "texture-3d-asset-folder"
+				[/csharp]
+				[/codeblocks]
+			</description>
+		</method>
 		<method name="to_lower" qualifiers="const">
 			<return type="String" />
 			<description>
 				Returns the string converted to [code]lowercase[/code].
 			</description>
 		</method>
+		<method name="to_multibyte_char_buffer" qualifiers="const">
+			<return type="PackedByteArray" />
+			<param index="0" name="encoding" type="String" default="&quot;&quot;" />
+			<description>
+				Converts the string to system multibyte code page encoded [PackedByteArray]. If conversion fails, empty array is returned.
+				The values permitted for [param encoding] are system dependent. If [param encoding] is empty string, system default encoding is used.
+				- For Windows, see [url=https://learn.microsoft.com/en-us/windows/win32/Intl/code-page-identifiers]Code Page Identifiers[/url] .NET names.
+				- For macOS and Linux/BSD, see [code]libiconv[/code] library documentation and [code]iconv --list[/code] for a list of supported encodings.
+			</description>
+		</method>
 		<method name="to_pascal_case" qualifiers="const">
 			<return type="String" />
 			<description>
@@ -1014,6 +1073,7 @@
 				GD.Print(url.URIDecode()) // Prints "$DOCS_URL/?highlight=Godot Engine:docs"
 				[/csharp]
 				[/codeblocks]
+				[b]Note:[/b] This method decodes [code]+[/code] as space.
 			</description>
 		</method>
 		<method name="uri_encode" qualifiers="const">
@@ -1036,6 +1096,12 @@
 				[/codeblocks]
 			</description>
 		</method>
+		<method name="uri_file_decode" qualifiers="const">
+			<return type="String" />
+			<description>
+				Decodes the file path from its URL-encoded format. Unlike [method uri_decode] this method leaves [code]+[/code] as is.
+			</description>
+		</method>
 		<method name="validate_filename" qualifiers="const">
 			<return type="String" />
 			<description>
diff --git a/engine/doc/classes/SystemFont.xml b/engine/doc/classes/SystemFont.xml
index b91ae74e..636779f8 100644
--- a/engine/doc/classes/SystemFont.xml
+++ b/engine/doc/classes/SystemFont.xml
@@ -46,6 +46,9 @@
 		<member name="keep_rounding_remainders" type="bool" setter="set_keep_rounding_remainders" getter="get_keep_rounding_remainders" default="true">
 			If set to [code]true[/code], when aligning glyphs to the pixel boundaries rounding remainders are accumulated to ensure more uniform glyph distribution. This setting has no effect if subpixel positioning is enabled.
 		</member>
+		<member name="modulate_color_glyphs" type="bool" setter="set_modulate_color_glyphs" getter="is_modulate_color_glyphs" default="false">
+			If set to [code]true[/code], color modulation is applied when drawing colored glyphs, otherwise it's applied to the monochrome glyphs only.
+		</member>
 		<member name="msdf_pixel_range" type="int" setter="set_msdf_pixel_range" getter="get_msdf_pixel_range" default="16">
 			The width of the range around the shape between the minimum and maximum representable signed distance. If using font outlines, [member msdf_pixel_range] must be set to at least [i]twice[/i] the size of the largest font outline. The default [member msdf_pixel_range] value of [code]16[/code] allows outline sizes up to [code]8[/code] to look correct.
 		</member>
diff --git a/engine/doc/classes/TabBar.xml b/engine/doc/classes/TabBar.xml
index d080294c..5d0b25a8 100644
--- a/engine/doc/classes/TabBar.xml
+++ b/engine/doc/classes/TabBar.xml
@@ -245,6 +245,9 @@
 		<member name="clip_tabs" type="bool" setter="set_clip_tabs" getter="get_clip_tabs" default="true">
 			If [code]true[/code], tabs overflowing this node's width will be hidden, displaying two navigation buttons instead. Otherwise, this node's minimum size is updated so that all tabs are visible.
 		</member>
+		<member name="close_with_middle_mouse" type="bool" setter="set_close_with_middle_mouse" getter="get_close_with_middle_mouse" default="true">
+			If [code]true[/code], middle clicking on the mouse will fire the [signal tab_close_pressed] signal.
+		</member>
 		<member name="current_tab" type="int" setter="set_current_tab" getter="get_current_tab" default="-1">
 			The index of the current selected tab. A value of [code]-1[/code] means that no tab is selected and can only be set when [member deselect_enabled] is [code]true[/code] or if all tabs are hidden or disabled.
 		</member>
@@ -309,7 +312,7 @@
 		<signal name="tab_close_pressed">
 			<param index="0" name="tab" type="int" />
 			<description>
-				Emitted when a tab's close button is pressed.
+				Emitted when a tab's close button is pressed or when middle-clicking on a tab, if [member close_with_middle_mouse] is enabled.
 				[b]Note:[/b] Tabs are not removed automatically once the close button is pressed, this behavior needs to be programmed manually. For example:
 				[codeblocks]
 				[gdscript]
@@ -395,6 +398,9 @@
 			The size of the tab text outline.
 			[b]Note:[/b] If using a font with [member FontFile.multichannel_signed_distance_field] enabled, its [member FontFile.msdf_pixel_range] must be set to at least [i]twice[/i] the value of [theme_item outline_size] for outline rendering to look correct. Otherwise, the outline may appear to be cut off earlier than intended.
 		</theme_item>
+		<theme_item name="tab_separation" data_type="constant" type="int" default="0">
+			The space between tabs in the tab bar.
+		</theme_item>
 		<theme_item name="font" data_type="font" type="Font">
 			The font used to draw tab names.
 		</theme_item>
diff --git a/engine/doc/classes/TabContainer.xml b/engine/doc/classes/TabContainer.xml
index 090afa02..8244ee0f 100644
--- a/engine/doc/classes/TabContainer.xml
+++ b/engine/doc/classes/TabContainer.xml
@@ -330,6 +330,9 @@
 			The space at the left or right edges of the tab bar, accordingly with the current [member tab_alignment].
 			The margin is ignored with [constant TabBar.ALIGNMENT_RIGHT] if the tabs are clipped (see [member clip_tabs]) or a popup has been set (see [method set_popup]). The margin is always ignored with [constant TabBar.ALIGNMENT_CENTER].
 		</theme_item>
+		<theme_item name="tab_separation" data_type="constant" type="int" default="0">
+			The space between tabs in the tab bar.
+		</theme_item>
 		<theme_item name="font" data_type="font" type="Font">
 			The font used to draw tab names.
 		</theme_item>
diff --git a/engine/doc/classes/TextEdit.xml b/engine/doc/classes/TextEdit.xml
index 330ea492..e04a8284 100644
--- a/engine/doc/classes/TextEdit.xml
+++ b/engine/doc/classes/TextEdit.xml
@@ -5,6 +5,10 @@
 	</brief_description>
 	<description>
 		A multiline text editor. It also has limited facilities for editing code, such as syntax highlighting support. For more advanced facilities for editing code, see [CodeEdit].
+		While entering text, it is possible to insert special characters using Unicode, OEM or Windows alt codes:
+		- To enter Unicode codepoints, hold [kbd]Alt[/kbd] and type the codepoint on the numpad. For example, to enter the character [code]á[/code] (U+00E1), hold [kbd]Alt[/kbd] and type [kbd]+E1[/kbd] on the numpad (the leading zeroes can be omitted).
+		- To enter OEM codepoints, hold [kbd]Alt[/kbd] and type the code on the numpad. For example, to enter the character [code]á[/code] (OEM 160), hold [kbd]Alt[/kbd] and type [code]160[/code] on the numpad.
+		- To enter Windows codepoints, hold [kbd]Alt[/kbd] and type the code on the numpad. For example, to enter the character [code]á[/code] (Windows 0225), hold [kbd]Alt[/kbd] and type [kbd]0[/kbd], [kbd]2[/kbd], [kbd]2[/kbd], [kbd]5[/kbd] on the numpad. The leading zero here must [b]not[/b] be omitted, as this is how Windows codepoints are distinguished from OEM codepoints.
 		[b]Note:[/b] Most viewport, caret, and edit methods contain a [code]caret_index[/code] argument for [member caret_multiple] support. The argument should be one of the following: [code]-1[/code] for all carets, [code]0[/code] for the main caret, or greater than [code]0[/code] for secondary carets in the order they were created.
 		[b]Note:[/b] When holding down [kbd]Alt[/kbd], the vertical scroll wheel will scroll 5 times as fast as it would normally do. This also works in the Godot script editor.
 	</description>
@@ -1380,6 +1384,9 @@
 			The syntax highlighter to use.
 			[b]Note:[/b] A [SyntaxHighlighter] instance should not be used across multiple [TextEdit] nodes.
 		</member>
+		<member name="tab_input_mode" type="bool" setter="set_tab_input_mode" getter="get_tab_input_mode" default="true">
+			If [code]true[/code], [member ProjectSettings.input/ui_text_indent] input [code]Tab[/code] character, otherwise it moves keyboard focus to the next [Control] in the scene.
+		</member>
 		<member name="text" type="String" setter="set_text" getter="get_text" default="&quot;&quot;">
 			String value of the [TextEdit].
 		</member>
diff --git a/engine/doc/classes/TextLine.xml b/engine/doc/classes/TextLine.xml
index 2e4a3f7e..f5164ad6 100644
--- a/engine/doc/classes/TextLine.xml
+++ b/engine/doc/classes/TextLine.xml
@@ -56,6 +56,12 @@
 				Draw text into a canvas item at a given position, with [param color]. [param pos] specifies the top left corner of the bounding box.
 			</description>
 		</method>
+		<method name="get_inferred_direction" qualifiers="const">
+			<return type="int" enum="TextServer.Direction" />
+			<description>
+				Returns the text writing direction inferred by the BiDi algorithm.
+			</description>
+		</method>
 		<method name="get_line_ascent" qualifiers="const">
 			<return type="float" />
 			<description>
diff --git a/engine/doc/classes/TextParagraph.xml b/engine/doc/classes/TextParagraph.xml
index c9ac660b..2b590f32 100644
--- a/engine/doc/classes/TextParagraph.xml
+++ b/engine/doc/classes/TextParagraph.xml
@@ -122,6 +122,12 @@
 				Returns drop cap bounding box size.
 			</description>
 		</method>
+		<method name="get_inferred_direction" qualifiers="const">
+			<return type="int" enum="TextServer.Direction" />
+			<description>
+				Returns the text writing direction inferred by the BiDi algorithm.
+			</description>
+		</method>
 		<method name="get_line_ascent" qualifiers="const">
 			<return type="float" />
 			<param index="0" name="line" type="int" />
@@ -205,6 +211,12 @@
 				Returns the size of the bounding box of the paragraph, without line breaks.
 			</description>
 		</method>
+		<method name="get_range" qualifiers="const">
+			<return type="Vector2i" />
+			<description>
+				Returns the character range of the paragraph.
+			</description>
+		</method>
 		<method name="get_rid" qualifiers="const">
 			<return type="RID" />
 			<description>
diff --git a/engine/doc/classes/TextServer.xml b/engine/doc/classes/TextServer.xml
index bc7dc8ab..9853ae44 100644
--- a/engine/doc/classes/TextServer.xml
+++ b/engine/doc/classes/TextServer.xml
@@ -571,6 +571,13 @@
 				Returns [code]true[/code], if font supports given language ([url=https://en.wikipedia.org/wiki/ISO_639-1]ISO 639[/url] code).
 			</description>
 		</method>
+		<method name="font_is_modulate_color_glyphs" qualifiers="const">
+			<return type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<description>
+				Returns [code]true[/code], if color modulation is applied when drawing colored glyphs.
+			</description>
+		</method>
 		<method name="font_is_multichannel_signed_distance_field" qualifiers="const">
 			<return type="bool" />
 			<param index="0" name="font_rid" type="RID" />
@@ -858,6 +865,14 @@
 				Adds override for [method font_is_language_supported].
 			</description>
 		</method>
+		<method name="font_set_modulate_color_glyphs">
+			<return type="void" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="force_autohinter" type="bool" />
+			<description>
+				If set to [code]true[/code], color modulation is applied when drawing colored glyphs, otherwise it's applied to the monochrome glyphs only.
+			</description>
+		</method>
 		<method name="font_set_msdf_pixel_range">
 			<return type="void" />
 			<param index="0" name="font_rid" type="RID" />
@@ -1200,6 +1215,69 @@
 				[b]Note:[/b] This function is used by during project export, to include TextServer database.
 			</description>
 		</method>
+		<method name="shaped_get_run_count" qualifiers="const">
+			<return type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<description>
+				Returns the number of uniform text runs in the buffer.
+			</description>
+		</method>
+		<method name="shaped_get_run_direction" qualifiers="const">
+			<return type="int" enum="TextServer.Direction" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the direction of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="shaped_get_run_font_rid" qualifiers="const">
+			<return type="RID" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the font RID of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="shaped_get_run_font_size" qualifiers="const">
+			<return type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the font size of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="shaped_get_run_language" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the language of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="shaped_get_run_object" qualifiers="const">
+			<return type="Variant" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the embedded object of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="shaped_get_run_range" qualifiers="const">
+			<return type="Vector2i" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the source text range of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="shaped_get_run_text" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the source text of the [param index] text run (in visual order).
+			</description>
+		</method>
 		<method name="shaped_get_span_count" qualifiers="const">
 			<return type="int" />
 			<param index="0" name="shaped" type="RID" />
@@ -1223,6 +1301,29 @@
 				Returns text span metadata.
 			</description>
 		</method>
+		<method name="shaped_get_span_object" qualifiers="const">
+			<return type="Variant" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the text span embedded object key.
+			</description>
+		</method>
+		<method name="shaped_get_span_text" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				Returns the text span source text.
+			</description>
+		</method>
+		<method name="shaped_get_text" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<description>
+				Returns the text buffer source text, including object replacement characters.
+			</description>
+		</method>
 		<method name="shaped_set_span_update_font">
 			<return type="void" />
 			<param index="0" name="shaped" type="RID" />
@@ -1844,7 +1945,7 @@
 		</constant>
 		<constant name="FONT_ANTIALIASING_LCD" value="2" enum="FontAntialiasing">
 			Font glyphs are rasterized for LCD screens.
-			LCD subpixel layout is determined by the value of [code]gui/theme/lcd_subpixel_layout[/code] project settings.
+			LCD subpixel layout is determined by the value of the [member ProjectSettings.gui/theme/lcd_subpixel_layout] setting.
 			LCD subpixel anti-aliasing mode is suitable only for rendering horizontal, unscaled text in 2D.
 		</constant>
 		<constant name="FONT_LCD_SUBPIXEL_LAYOUT_NONE" value="0" enum="FontLCDSubpixelLayout">
@@ -1938,12 +2039,20 @@
 		<constant name="BREAK_ADAPTIVE" value="8" enum="LineBreakFlag" is_bitfield="true">
 			Should be used only in conjunction with [constant BREAK_WORD_BOUND], break the line between any unconnected graphemes, if it's impossible to break it between the words.
 		</constant>
-		<constant name="BREAK_TRIM_EDGE_SPACES" value="16" enum="LineBreakFlag" is_bitfield="true">
+		<constant name="BREAK_TRIM_EDGE_SPACES" value="16" enum="LineBreakFlag" is_bitfield="true" deprecated="Use [code]BREAK_TRIM_START_EDGE_SPACES | BREAK_TRIM_END_EDGE_SPACES[/code] instead.">
 			Remove edge spaces from the broken line segments.
 		</constant>
 		<constant name="BREAK_TRIM_INDENT" value="32" enum="LineBreakFlag" is_bitfield="true">
 			Subtract first line indentation width from all lines after the first one.
 		</constant>
+		<constant name="BREAK_TRIM_START_EDGE_SPACES" value="64" enum="LineBreakFlag" is_bitfield="true">
+			Remove spaces and line break characters from the start of broken line segments.
+			E.g, after line breaking, the second segment of the following text [code]test  \n  next[/code], is [code]next[/code] if the flag is set, and [code]  next[/code] if it is not.
+		</constant>
+		<constant name="BREAK_TRIM_END_EDGE_SPACES" value="128" enum="LineBreakFlag" is_bitfield="true">
+			Remove spaces and line break characters from the end of broken line segments.
+			E.g, after line breaking, the first segment of the following text [code]test  \n  next[/code], is [code]test[/code] if the flag is set, and [code]test  \n[/code] if it is not.
+		</constant>
 		<constant name="VC_CHARS_BEFORE_SHAPING" value="0" enum="VisibleCharactersBehavior">
 			Trims text before the shaping. e.g, increasing [member Label.visible_characters] or [member RichTextLabel.visible_characters] value is visually identical to typing the text.
 			[b]Note:[/b] In this mode, trimmed text is not processed at all. It is not accounted for in line breaking and size calculations.
@@ -1970,10 +2079,16 @@
 			Trims the text per word.
 		</constant>
 		<constant name="OVERRUN_TRIM_ELLIPSIS" value="3" enum="OverrunBehavior">
-			Trims the text per character and adds an ellipsis to indicate that parts are hidden.
+			Trims the text per character and adds an ellipsis to indicate that parts are hidden if trimmed text is 6 characters or longer.
 		</constant>
 		<constant name="OVERRUN_TRIM_WORD_ELLIPSIS" value="4" enum="OverrunBehavior">
-			Trims the text per word and adds an ellipsis to indicate that parts are hidden.
+			Trims the text per word and adds an ellipsis to indicate that parts are hidden if trimmed text is 6 characters or longer.
+		</constant>
+		<constant name="OVERRUN_TRIM_ELLIPSIS_FORCE" value="5" enum="OverrunBehavior">
+			Trims the text per character and adds an ellipsis to indicate that parts are hidden regardless of trimmed text length.
+		</constant>
+		<constant name="OVERRUN_TRIM_WORD_ELLIPSIS_FORCE" value="6" enum="OverrunBehavior">
+			Trims the text per word and adds an ellipsis to indicate that parts are hidden regardless of trimmed text length.
 		</constant>
 		<constant name="OVERRUN_NO_TRIM" value="0" enum="TextOverrunFlag" is_bitfield="true">
 			No trimming is performed.
diff --git a/engine/doc/classes/TextServerExtension.xml b/engine/doc/classes/TextServerExtension.xml
index 37f4984a..ef00e7cf 100644
--- a/engine/doc/classes/TextServerExtension.xml
+++ b/engine/doc/classes/TextServerExtension.xml
@@ -617,6 +617,14 @@
 				Returns [code]true[/code], if font supports given language ([url=https://en.wikipedia.org/wiki/ISO_639-1]ISO 639[/url] code).
 			</description>
 		</method>
+		<method name="_font_is_modulate_color_glyphs" qualifiers="virtual const">
+			<return type="bool" />
+			<param index="0" name="font_rid" type="RID" />
+			<description>
+				[b]Optional.[/b]
+				Returns [code]true[/code], if color modulation is applied when drawing colored glyphs.
+			</description>
+		</method>
 		<method name="_font_is_multichannel_signed_distance_field" qualifiers="virtual const">
 			<return type="bool" />
 			<param index="0" name="font_rid" type="RID" />
@@ -942,6 +950,15 @@
 				Adds override for [method _font_is_language_supported].
 			</description>
 		</method>
+		<method name="_font_set_modulate_color_glyphs" qualifiers="virtual">
+			<return type="void" />
+			<param index="0" name="font_rid" type="RID" />
+			<param index="1" name="modulate" type="bool" />
+			<description>
+				[b]Optional.[/b]
+				If set to [code]true[/code], color modulation is applied when drawing colored glyphs, otherwise it's applied to the monochrome glyphs only.
+			</description>
+		</method>
 		<method name="_font_set_msdf_pixel_range" qualifiers="virtual">
 			<return type="void" />
 			<param index="0" name="font_rid" type="RID" />
@@ -1306,6 +1323,77 @@
 				Saves optional TextServer database (e.g. ICU break iterators and dictionaries) to the file.
 			</description>
 		</method>
+		<method name="_shaped_get_run_count" qualifiers="virtual const">
+			<return type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<description>
+				[b]Required.[/b]
+				Returns the number of uniform text runs in the buffer.
+			</description>
+		</method>
+		<method name="_shaped_get_run_direction" qualifiers="virtual const">
+			<return type="int" enum="TextServer.Direction" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the direction of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="_shaped_get_run_font_rid" qualifiers="virtual const">
+			<return type="RID" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the font RID of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="_shaped_get_run_font_size" qualifiers="virtual const">
+			<return type="int" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the font size of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="_shaped_get_run_language" qualifiers="virtual const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the language of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="_shaped_get_run_object" qualifiers="virtual const">
+			<return type="Variant" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the embedded object of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="_shaped_get_run_range" qualifiers="virtual const">
+			<return type="Vector2i" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the source text range of the [param index] text run (in visual order).
+			</description>
+		</method>
+		<method name="_shaped_get_run_text" qualifiers="virtual const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the source text of the [param index] text run (in visual order).
+			</description>
+		</method>
 		<method name="_shaped_get_span_count" qualifiers="virtual const">
 			<return type="int" />
 			<param index="0" name="shaped" type="RID" />
@@ -1332,6 +1420,32 @@
 				Returns text span metadata.
 			</description>
 		</method>
+		<method name="_shaped_get_span_object" qualifiers="virtual const">
+			<return type="Variant" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the text span embedded object key.
+			</description>
+		</method>
+		<method name="_shaped_get_span_text" qualifiers="virtual const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<param index="1" name="index" type="int" />
+			<description>
+				[b]Required.[/b]
+				Returns the text span source text.
+			</description>
+		</method>
+		<method name="_shaped_get_text" qualifiers="virtual const">
+			<return type="String" />
+			<param index="0" name="shaped" type="RID" />
+			<description>
+				[b]Required.[/b]
+				Returns the text buffer source text, including object replacement characters.
+			</description>
+		</method>
 		<method name="_shaped_set_span_update_font" qualifiers="virtual">
 			<return type="void" />
 			<param index="0" name="shaped" type="RID" />
diff --git a/engine/doc/classes/TileData.xml b/engine/doc/classes/TileData.xml
index e8a74f0b..7537e18c 100644
--- a/engine/doc/classes/TileData.xml
+++ b/engine/doc/classes/TileData.xml
@@ -4,7 +4,7 @@
 		Settings for a single tile in a [TileSet].
 	</brief_description>
 	<description>
-		[TileData] object represents a single tile in a [TileSet]. It is usually edited using the tileset editor, but it can be modified at runtime using [method TileMap._tile_data_runtime_update].
+		[TileData] object represents a single tile in a [TileSet]. It is usually edited using the tileset editor, but it can be modified at runtime using [method TileMapLayer._tile_data_runtime_update].
 	</description>
 	<tutorials>
 	</tutorials>
@@ -301,7 +301,7 @@
 			Vertical point of the tile used for determining y-sorted order.
 		</member>
 		<member name="z_index" type="int" setter="set_z_index" getter="get_z_index" default="0">
-			Ordering index of this tile, relative to [TileMap].
+			Ordering index of this tile, relative to [TileMapLayer].
 		</member>
 	</members>
 	<signals>
diff --git a/engine/doc/classes/TileMapLayer.xml b/engine/doc/classes/TileMapLayer.xml
index e7f0a3d9..fceedfbd 100644
--- a/engine/doc/classes/TileMapLayer.xml
+++ b/engine/doc/classes/TileMapLayer.xml
@@ -115,7 +115,7 @@
 			<return type="Vector2i" />
 			<param index="0" name="body" type="RID" />
 			<description>
-				Returns the coordinates of the tile for given physics body [RID]. Such an [RID] can be retrieved from [method KinematicCollision2D.get_collider_rid], when colliding with a tile.
+				Returns the coordinates of the physics quadrant (see [member physics_quadrant_size]) for given physics body [RID]. Such an [RID] can be retrieved from [method KinematicCollision2D.get_collider_rid], when colliding with a tile.
 			</description>
 		</method>
 		<method name="get_navigation_map" qualifiers="const">
@@ -311,8 +311,13 @@
 		<member name="occlusion_enabled" type="bool" setter="set_occlusion_enabled" getter="is_occlusion_enabled" default="true">
 			Enable or disable light occlusion.
 		</member>
+		<member name="physics_quadrant_size" type="int" setter="set_physics_quadrant_size" getter="get_physics_quadrant_size" default="16">
+			The [TileMapLayer]'s physics quadrant size. Within a physics quadrant, cells with similar physics properties are grouped together and their collision shapes get merged. [member physics_quadrant_size] defines the length of a square's side, in the map's coordinate system, that forms the quadrant. Thus, the default quadrant size groups together [code]16 * 16 = 256[/code] tiles.
+			[b]Note:[/b] As quadrants are created according to the map's coordinate system, the quadrant's "square shape" might not look like square in the [TileMapLayer]'s local coordinate system.
+			[b]Note:[/b] This impacts the value returned by [method get_coords_for_body_rid].
+		</member>
 		<member name="rendering_quadrant_size" type="int" setter="set_rendering_quadrant_size" getter="get_rendering_quadrant_size" default="16">
-			The [TileMapLayer]'s quadrant size. A quadrant is a group of tiles to be drawn together on a single canvas item, for optimization purposes. [member rendering_quadrant_size] defines the length of a square's side, in the map's coordinate system, that forms the quadrant. Thus, the default quadrant size groups together [code]16 * 16 = 256[/code] tiles.
+			The [TileMapLayer]'s rendering quadrant size. A quadrant is a group of tiles to be drawn together on a single canvas item, for optimization purposes. [member rendering_quadrant_size] defines the length of a square's side, in the map's coordinate system, that forms the quadrant. Thus, the default quadrant size groups together [code]16 * 16 = 256[/code] tiles.
 			The quadrant size does not apply on a Y-sorted [TileMapLayer], as tiles are grouped by Y position instead in that case.
 			[b]Note:[/b] As quadrants are created according to the map's coordinate system, the quadrant's "square shape" might not look like square in the [TileMapLayer]'s local coordinate system.
 		</member>
diff --git a/engine/doc/classes/TileSet.xml b/engine/doc/classes/TileSet.xml
index a24f920d..650151f5 100644
--- a/engine/doc/classes/TileSet.xml
+++ b/engine/doc/classes/TileSet.xml
@@ -491,8 +491,7 @@
 			<param index="5" name="alternative_to" type="int" />
 			<description>
 				Create an alternative-level proxy for the given identifiers. A proxy will map set of tile identifiers to another set of identifiers.
-				This can be used to replace a tile in all TileMaps using this TileSet, as TileMap nodes will find and use the proxy's target tile when one is available.
-				Proxied tiles can be automatically replaced in TileMap nodes using the editor.
+				Proxied tiles can be automatically replaced in TileMapLayer nodes using the editor.
 			</description>
 		</method>
 		<method name="set_coords_level_tile_proxy">
@@ -503,8 +502,7 @@
 			<param index="3" name="coords_to" type="Vector2i" />
 			<description>
 				Creates a coordinates-level proxy for the given identifiers. A proxy will map set of tile identifiers to another set of identifiers. The alternative tile ID is kept the same when using coordinates-level proxies.
-				This can be used to replace a tile in all TileMaps using this TileSet, as TileMap nodes will find and use the proxy's target tile when one is available.
-				Proxied tiles can be automatically replaced in TileMap nodes using the editor.
+				Proxied tiles can be automatically replaced in TileMapLayer nodes using the editor.
 			</description>
 		</method>
 		<method name="set_custom_data_layer_name">
@@ -602,8 +600,7 @@
 			<param index="1" name="source_to" type="int" />
 			<description>
 				Creates a source-level proxy for the given source ID. A proxy will map set of tile identifiers to another set of identifiers. Both the atlas coordinates ID and the alternative tile ID are kept the same when using source-level proxies.
-				This can be used to replace a source in all TileMaps using this TileSet, as TileMap nodes will find and use the proxy's target source when one is available.
-				Proxied tiles can be automatically replaced in TileMap nodes using the editor.
+				Proxied tiles can be automatically replaced in TileMapLayer nodes using the editor.
 			</description>
 		</method>
 		<method name="set_terrain_color">
@@ -635,7 +632,7 @@
 	</methods>
 	<members>
 		<member name="tile_layout" type="int" setter="set_tile_layout" getter="get_tile_layout" enum="TileSet.TileLayout" default="0">
-			For all half-offset shapes (Isometric, Hexagonal and Half-Offset square), changes the way tiles are indexed in the TileMap grid.
+			For all half-offset shapes (Isometric, Hexagonal and Half-Offset square), changes the way tiles are indexed in the [TileMapLayer] grid.
 		</member>
 		<member name="tile_offset_axis" type="int" setter="set_tile_offset_axis" getter="get_tile_offset_axis" enum="TileSet.TileOffsetAxis" default="0">
 			For all half-offset shapes (Isometric, Hexagonal and Half-Offset square), determines the offset axis.
@@ -656,7 +653,7 @@
 		</constant>
 		<constant name="TILE_SHAPE_ISOMETRIC" value="1" enum="TileShape">
 			Diamond tile shape (for isometric look).
-			[b]Note:[/b] Isometric [TileSet] works best if [TileMap] and all its layers have Y-sort enabled.
+			[b]Note:[/b] Isometric [TileSet] works best if all sibling [TileMapLayer]s and their parent inheriting from [Node2D] have Y-sort enabled.
 		</constant>
 		<constant name="TILE_SHAPE_HALF_OFFSET_SQUARE" value="2" enum="TileShape">
 			Rectangular tile shape with one row/column out of two offset by half a tile.
diff --git a/engine/doc/classes/TileSetAtlasSource.xml b/engine/doc/classes/TileSetAtlasSource.xml
index 684c05f3..a9921b2e 100644
--- a/engine/doc/classes/TileSetAtlasSource.xml
+++ b/engine/doc/classes/TileSetAtlasSource.xml
@@ -288,12 +288,12 @@
 			Represents the size of the [enum TileAnimationMode] enum.
 		</constant>
 		<constant name="TRANSFORM_FLIP_H" value="4096">
-			Represents cell's horizontal flip flag. Should be used directly with [TileMap] to flip placed tiles by altering their alternative IDs.
+			Represents cell's horizontal flip flag. Should be used directly with [TileMapLayer] to flip placed tiles by altering their alternative IDs.
 			[codeblock]
-			var alternate_id = $TileMap.get_cell_alternative_tile(0, Vector2i(2, 2))
+			var alternate_id = $TileMapLayer.get_cell_alternative_tile(Vector2i(2, 2))
 			if not alternate_id &amp; TileSetAtlasSource.TRANSFORM_FLIP_H:
 			    # If tile is not already flipped, flip it.
-			    $TileMap.set_cell(0, Vector2i(2, 2), source_id, atlas_coords, alternate_id | TileSetAtlasSource.TRANSFORM_FLIP_H)
+			    $TileMapLayer.set_cell(Vector2i(2, 2), source_id, atlas_coords, alternate_id | TileSetAtlasSource.TRANSFORM_FLIP_H)
 			[/codeblock]
 			[b]Note:[/b] These transformations can be combined to do the equivalent of 0, 90, 180, and 270 degree rotations, as shown below:
 			[codeblock]
diff --git a/engine/doc/classes/TileSetScenesCollectionSource.xml b/engine/doc/classes/TileSetScenesCollectionSource.xml
index 40ad269e..d890179e 100644
--- a/engine/doc/classes/TileSetScenesCollectionSource.xml
+++ b/engine/doc/classes/TileSetScenesCollectionSource.xml
@@ -4,8 +4,8 @@
 		Exposes a set of scenes as tiles for a [TileSet] resource.
 	</brief_description>
 	<description>
-		When placed on a [TileMap], tiles from [TileSetScenesCollectionSource] will automatically instantiate an associated scene at the cell's position in the TileMap.
-		Scenes are instantiated as children of the [TileMap] when it enters the tree. If you add/remove a scene tile in the [TileMap] that is already inside the tree, the [TileMap] will automatically instantiate/free the scene accordingly.
+		When placed on a [TileMapLayer], tiles from [TileSetScenesCollectionSource] will automatically instantiate an associated scene at the cell's position in the TileMapLayer.
+		Scenes are instantiated as children of the [TileMapLayer] when it enters the tree. If you add/remove a scene tile in the [TileMapLayer] that is already inside the tree, the [TileMapLayer] will automatically instantiate/free the scene accordingly.
 		[b]Note:[/b] Scene tiles all occupy one tile slot and instead use alternate tile ID to identify scene index. [method TileSetSource.get_tiles_count] will always return [code]1[/code]. Use [method get_scene_tiles_count] to get a number of scenes in a [TileSetScenesCollectionSource].
 		Use this code if you want to find the scene path at a given tile in [TileMapLayer]:
 		[codeblocks]
@@ -113,7 +113,7 @@
 			<param index="0" name="id" type="int" />
 			<param index="1" name="packed_scene" type="PackedScene" />
 			<description>
-				Assigns a [PackedScene] resource to the scene tile with [param id]. This will fail if the scene does not extend CanvasItem, as positioning properties are needed to place the scene on the TileMap.
+				Assigns a [PackedScene] resource to the scene tile with [param id]. This will fail if the scene does not extend [CanvasItem], as positioning properties are needed to place the scene on the [TileMapLayer].
 			</description>
 		</method>
 	</methods>
diff --git a/engine/doc/classes/Tree.xml b/engine/doc/classes/Tree.xml
index 9fad1ca9..76e5a6fd 100644
--- a/engine/doc/classes/Tree.xml
+++ b/engine/doc/classes/Tree.xml
@@ -513,11 +513,14 @@
 			Text [Color] for a [constant TreeItem.CELL_MODE_CHECK] mode cell when it's non-editable (see [method TreeItem.set_editable]).
 		</theme_item>
 		<theme_item name="font_hovered_color" data_type="color" type="Color" default="Color(0.95, 0.95, 0.95, 1)">
-			Text [Color] used when the item is hovered.
+			Text [Color] used when the item is hovered and not selected yet.
 		</theme_item>
 		<theme_item name="font_hovered_dimmed_color" data_type="color" type="Color" default="Color(0.875, 0.875, 0.875, 1)">
 			Text [Color] used when the item is hovered, while a button of the same item is hovered as the same time.
 		</theme_item>
+		<theme_item name="font_hovered_selected_color" data_type="color" type="Color" default="Color(1, 1, 1, 1)">
+			Text [Color] used when the item is hovered and selected.
+		</theme_item>
 		<theme_item name="font_outline_color" data_type="color" type="Color" default="Color(0, 0, 0, 1)">
 			The tint of text outline of the item.
 		</theme_item>
@@ -679,11 +682,17 @@
 			The focused style for the [Tree], drawn on top of everything.
 		</theme_item>
 		<theme_item name="hovered" data_type="style" type="StyleBox">
-			[StyleBox] for the item being hovered.
+			[StyleBox] for the item being hovered, but not selected.
 		</theme_item>
 		<theme_item name="hovered_dimmed" data_type="style" type="StyleBox">
 			[StyleBox] for the item being hovered, while a button of the same item is hovered as the same time.
 		</theme_item>
+		<theme_item name="hovered_selected" data_type="style" type="StyleBox">
+			[StyleBox] for the hovered and selected items, used when the [Tree] is not being focused.
+		</theme_item>
+		<theme_item name="hovered_selected_focus" data_type="style" type="StyleBox">
+			[StyleBox] for the hovered and selected items, used when the [Tree] is being focused.
+		</theme_item>
 		<theme_item name="panel" data_type="style" type="StyleBox">
 			The background style for the [Tree].
 		</theme_item>
diff --git a/engine/doc/classes/TreeItem.xml b/engine/doc/classes/TreeItem.xml
index cce31b4b..7901d3d0 100644
--- a/engine/doc/classes/TreeItem.xml
+++ b/engine/doc/classes/TreeItem.xml
@@ -18,8 +18,9 @@
 			<param index="2" name="id" type="int" default="-1" />
 			<param index="3" name="disabled" type="bool" default="false" />
 			<param index="4" name="tooltip_text" type="String" default="&quot;&quot;" />
+			<param index="5" name="alt_text" type="String" default="&quot;&quot;" />
 			<description>
-				Adds a button with [Texture2D] [param button] to the end of the cell at column [param column]. The [param id] is used to identify the button in the according [signal Tree.button_clicked] signal and can be different from the buttons index. If not specified, the next available index is used, which may be retrieved by calling [method get_button_count] immediately before this method. Optionally, the button can be [param disabled] and have a [param tooltip_text].
+				Adds a button with [Texture2D] [param button] to the end of the cell at column [param column]. The [param id] is used to identify the button in the according [signal Tree.button_clicked] signal and can be different from the buttons index. If not specified, the next available index is used, which may be retrieved by calling [method get_button_count] immediately before this method. Optionally, the button can be [param disabled] and have a [param tooltip_text]. [param alt_text] is used as the button description for assistive apps.
 			</description>
 		</method>
 		<method name="add_child">
@@ -79,6 +80,13 @@
 				Removes the button at index [param button_index] in column [param column].
 			</description>
 		</method>
+		<method name="get_alt_text" qualifiers="const">
+			<return type="String" />
+			<param index="0" name="column" type="int" />
+			<description>
+				Returns the given column's alternative text.
+			</description>
+		</method>
 		<method name="get_auto_translate_mode" qualifiers="const">
 			<return type="int" enum="Node.AutoTranslateMode" />
 			<param index="0" name="column" type="int" />
@@ -506,6 +514,14 @@
 				Selects the given [param column].
 			</description>
 		</method>
+		<method name="set_alt_text">
+			<return type="void" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="text" type="String" />
+			<description>
+				Sets the given column's alternative (description) text for assistive apps.
+			</description>
+		</method>
 		<method name="set_auto_translate_mode">
 			<return type="void" />
 			<param index="0" name="column" type="int" />
@@ -532,6 +548,15 @@
 				Sets the given column's button [Texture2D] at index [param button_index] to [param button].
 			</description>
 		</method>
+		<method name="set_button_alt_text">
+			<return type="void" />
+			<param index="0" name="column" type="int" />
+			<param index="1" name="button_index" type="int" />
+			<param index="2" name="alt_text" type="String" />
+			<description>
+				Sets the given column's button alternative text (description) at index [param button_index] for assistive apps.
+			</description>
+		</method>
 		<method name="set_button_color">
 			<return type="void" />
 			<param index="0" name="column" type="int" />
diff --git a/engine/doc/classes/TriangleMesh.xml b/engine/doc/classes/TriangleMesh.xml
index 79bab0ec..dc4e688b 100644
--- a/engine/doc/classes/TriangleMesh.xml
+++ b/engine/doc/classes/TriangleMesh.xml
@@ -1,11 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class name="TriangleMesh" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../class.xsd">
 	<brief_description>
-		Internal mesh type.
+		Triangle geometry for efficient, physicsless intersection queries.
 	</brief_description>
 	<description>
-		Mesh type used internally for collision calculations.
+		Creates a bounding volume hierarchy (BVH) tree structure around triangle geometry.
+		The triangle BVH tree can be used for efficient intersection queries without involving a physics engine.
+		For example, this can be used in editor tools to select objects with complex shapes based on the mouse cursor position.
+		[b]Performance:[/b] Creating the BVH tree for complex geometry is a slow process and best done in a background thread.
 	</description>
 	<tutorials>
 	</tutorials>
+	<methods>
+		<method name="create_from_faces">
+			<return type="bool" />
+			<param index="0" name="faces" type="PackedVector3Array" />
+			<description>
+				Creates the BVH tree from an array of faces. Each 3 vertices of the input [param faces] array represent one triangle (face).
+				Returns [code]true[/code] if the tree is successfully built, [code]false[/code] otherwise.
+			</description>
+		</method>
+		<method name="get_faces" qualifiers="const">
+			<return type="PackedVector3Array" />
+			<description>
+				Returns a copy of the geometry faces. Each 3 vertices of the array represent one triangle (face).
+			</description>
+		</method>
+		<method name="intersect_ray" qualifiers="const">
+			<return type="Dictionary" />
+			<param index="0" name="begin" type="Vector3" />
+			<param index="1" name="dir" type="Vector3" />
+			<description>
+				Tests for intersection with a ray starting at [param begin] and facing [param dir] and extending toward infinity.
+				If an intersection with a triangle happens, returns a [Dictionary] with the following fields:
+				[code]position[/code]: The position on the intersected triangle.
+				[code]normal[/code]: The normal of the intersected triangle.
+				[code]face_index[/code]: The index of the intersected triangle.
+				Returns an empty [Dictionary] if no intersection happens.
+				See also [method intersect_segment], which is similar but uses a finite-length segment.
+			</description>
+		</method>
+		<method name="intersect_segment" qualifiers="const">
+			<return type="Dictionary" />
+			<param index="0" name="begin" type="Vector3" />
+			<param index="1" name="end" type="Vector3" />
+			<description>
+				Tests for intersection with a segment going from [param begin] to [param end].
+				If an intersection with a triangle happens returns a [Dictionary] with the following fields:
+				[code]position[/code]: The position on the intersected triangle.
+				[code]normal[/code]: The normal of the intersected triangle.
+				[code]face_index[/code]: The index of the intersected triangle.
+				Returns an empty [Dictionary] if no intersection happens.
+				See also [method intersect_ray], which is similar but uses an infinite-length ray.
+			</description>
+		</method>
+	</methods>
 </class>
diff --git a/engine/doc/classes/Tween.xml b/engine/doc/classes/Tween.xml
index 45fb9f92..8a8a742f 100644
--- a/engine/doc/classes/Tween.xml
+++ b/engine/doc/classes/Tween.xml
@@ -11,8 +11,8 @@
 		[codeblocks]
 		[gdscript]
 		var tween = get_tree().create_tween()
-		tween.tween_property($Sprite, "modulate", Color.RED, 1)
-		tween.tween_property($Sprite, "scale", Vector2(), 1)
+		tween.tween_property($Sprite, "modulate", Color.RED, 1.0)
+		tween.tween_property($Sprite, "scale", Vector2(), 1.0)
 		tween.tween_callback($Sprite.queue_free)
 		[/gdscript]
 		[csharp]
@@ -27,8 +27,8 @@
 		[codeblocks]
 		[gdscript]
 		var tween = get_tree().create_tween()
-		tween.tween_property($Sprite, "modulate", Color.RED, 1).set_trans(Tween.TRANS_SINE)
-		tween.tween_property($Sprite, "scale", Vector2(), 1).set_trans(Tween.TRANS_BOUNCE)
+		tween.tween_property($Sprite, "modulate", Color.RED, 1.0).set_trans(Tween.TRANS_SINE)
+		tween.tween_property($Sprite, "scale", Vector2(), 1.0).set_trans(Tween.TRANS_BOUNCE)
 		tween.tween_callback($Sprite.queue_free)
 		[/gdscript]
 		[csharp]
@@ -42,8 +42,8 @@
 		[codeblocks]
 		[gdscript]
 		var tween = get_tree().create_tween().bind_node(self).set_trans(Tween.TRANS_ELASTIC)
-		tween.tween_property($Sprite, "modulate", Color.RED, 1)
-		tween.tween_property($Sprite, "scale", Vector2(), 1)
+		tween.tween_property($Sprite, "modulate", Color.RED, 1.0)
+		tween.tween_property($Sprite, "scale", Vector2(), 1.0)
 		tween.tween_callback($Sprite.queue_free)
 		[/gdscript]
 		[csharp]
@@ -58,7 +58,7 @@
 		[gdscript]
 		var tween = create_tween()
 		for sprite in get_children():
-		    tween.tween_property(sprite, "position", Vector2(0, 0), 1)
+		    tween.tween_property(sprite, "position", Vector2(0, 0), 1.0)
 		[/gdscript]
 		[csharp]
 		Tween tween = CreateTween();
@@ -326,7 +326,7 @@
 				[codeblocks]
 				[gdscript]
 				var tween = get_tree().create_tween().set_loops()
-				tween.tween_callback(shoot).set_delay(1)
+				tween.tween_callback(shoot).set_delay(1.0)
 				[/gdscript]
 				[csharp]
 				Tween tween = GetTree().CreateTween().SetLoops();
@@ -371,10 +371,10 @@
 				[codeblocks]
 				[gdscript]
 				var tween = create_tween().set_loops()
-				tween.tween_property($Sprite, "position:x", 200.0, 1).as_relative()
+				tween.tween_property($Sprite, "position:x", 200.0, 1.0).as_relative()
 				tween.tween_callback(jump)
 				tween.tween_interval(2)
-				tween.tween_property($Sprite, "position:x", -200.0, 1).as_relative()
+				tween.tween_property($Sprite, "position:x", -200.0, 1.0).as_relative()
 				tween.tween_callback(jump)
 				tween.tween_interval(2)
 				[/gdscript]
@@ -402,7 +402,7 @@
 				[codeblocks]
 				[gdscript]
 				var tween = create_tween()
-				tween.tween_method(look_at.bind(Vector3.UP), Vector3(-1, 0, -1), Vector3(1, 0, -1), 1) # The look_at() method takes up vector as second argument.
+				tween.tween_method(look_at.bind(Vector3.UP), Vector3(-1, 0, -1), Vector3(1, 0, -1), 1.0) # The look_at() method takes up vector as second argument.
 				[/gdscript]
 				[csharp]
 				Tween tween = CreateTween();
@@ -414,7 +414,7 @@
 				[gdscript]
 				func _ready():
 				    var tween = create_tween()
-				    tween.tween_method(set_label_text, 0, 10, 1).set_delay(1)
+				    tween.tween_method(set_label_text, 0, 10, 1.0).set_delay(1.0)
 
 				func set_label_text(value: int):
 				    $Label.text = "Counting " + str(value)
@@ -447,8 +447,8 @@
 				[codeblocks]
 				[gdscript]
 				var tween = create_tween()
-				tween.tween_property($Sprite, "position", Vector2(100, 200), 1)
-				tween.tween_property($Sprite, "position", Vector2(200, 300), 1)
+				tween.tween_property($Sprite, "position", Vector2(100, 200), 1.0)
+				tween.tween_property($Sprite, "position", Vector2(200, 300), 1.0)
 				[/gdscript]
 				[csharp]
 				Tween tween = CreateTween();
@@ -462,8 +462,8 @@
 				[codeblocks]
 				[gdscript]
 				var tween = create_tween()
-				tween.tween_property($Sprite, "position", Vector2.RIGHT * 300, 1).as_relative().set_trans(Tween.TRANS_SINE)
-				tween.tween_property($Sprite, "position", Vector2.RIGHT * 300, 1).as_relative().from_current().set_trans(Tween.TRANS_EXPO)
+				tween.tween_property($Sprite, "position", Vector2.RIGHT * 300, 1.0).as_relative().set_trans(Tween.TRANS_SINE)
+				tween.tween_property($Sprite, "position", Vector2.RIGHT * 300, 1.0).as_relative().from_current().set_trans(Tween.TRANS_EXPO)
 				[/gdscript]
 				[csharp]
 				Tween tween = CreateTween();
diff --git a/engine/doc/classes/UDPServer.xml b/engine/doc/classes/UDPServer.xml
index 59a12a1d..feda1821 100644
--- a/engine/doc/classes/UDPServer.xml
+++ b/engine/doc/classes/UDPServer.xml
@@ -154,7 +154,7 @@
 		<method name="poll">
 			<return type="int" enum="Error" />
 			<description>
-				Call this method at regular intervals (e.g. inside [method Node._process]) to process new packets. And packet from known address/port pair will be delivered to the appropriate [PacketPeerUDP], any packet received from an unknown address/port pair will be added as a pending connection (see [method is_connection_available], [method take_connection]). The maximum number of pending connection is defined via [member max_pending_connections].
+				Call this method at regular intervals (e.g. inside [method Node._process]) to process new packets. Any packet from a known address/port pair will be delivered to the appropriate [PacketPeerUDP], while any packet received from an unknown address/port pair will be added as a pending connection (see [method is_connection_available] and [method take_connection]). The maximum number of pending connections is defined via [member max_pending_connections].
 			</description>
 		</method>
 		<method name="stop">
diff --git a/engine/doc/classes/Viewport.xml b/engine/doc/classes/Viewport.xml
index a55c40d0..6021c962 100644
--- a/engine/doc/classes/Viewport.xml
+++ b/engine/doc/classes/Viewport.xml
@@ -148,6 +148,12 @@
 				Returns the drag data from the GUI, that was previously returned by [method Control._get_drag_data].
 			</description>
 		</method>
+		<method name="gui_get_drag_description" qualifiers="const">
+			<return type="String" />
+			<description>
+				Returns the drag data human-readable description.
+			</description>
+		</method>
 		<method name="gui_get_focus_owner" qualifiers="const">
 			<return type="Control" />
 			<description>
@@ -180,6 +186,13 @@
 				Removes the focus from the currently focused [Control] within this viewport. If no [Control] has the focus, does nothing.
 			</description>
 		</method>
+		<method name="gui_set_drag_description">
+			<return type="void" />
+			<param index="0" name="description" type="String" />
+			<description>
+				Sets the drag data human-readable description.
+			</description>
+		</method>
 		<method name="is_input_handled" qualifiers="const">
 			<return type="bool" />
 			<description>
@@ -512,22 +525,22 @@
 			Use bilinear scaling for the viewport's 3D buffer. The amount of scaling can be set using [member scaling_3d_scale]. Values less than [code]1.0[/code] will result in undersampling while values greater than [code]1.0[/code] will result in supersampling. A value of [code]1.0[/code] disables scaling.
 		</constant>
 		<constant name="SCALING_3D_MODE_FSR" value="1" enum="Scaling3DMode">
-			Use AMD FidelityFX Super Resolution 1.0 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the viewport being upscaled using FSR. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
+			Use AMD FidelityFX Super Resolution 1.0 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member scaling_3d_scale]. Values less than [code]1.0[/code] will result in the viewport being upscaled using FSR. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
 		</constant>
 		<constant name="SCALING_3D_MODE_FSR2" value="2" enum="Scaling3DMode">
-			Use AMD FidelityFX Super Resolution 2.2 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the viewport being upscaled using FSR2. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use FSR2 at native resolution as a TAA solution.
+			Use AMD FidelityFX Super Resolution 2.2 upscaling for the viewport's 3D buffer. The amount of scaling can be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/code] will result in the viewport being upscaled using FSR2. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use FSR2 at native resolution as a TAA solution.
 		</constant>
 		<constant name="SCALING_3D_MODE_METALFX_SPATIAL" value="3" enum="Scaling3DMode">
 			Use the [url=https://developer.apple.com/documentation/metalfx/mtlfxspatialscaler#overview]MetalFX spatial upscaler[/url] for the viewport's 3D buffer.
 			The amount of scaling can be set using [member scaling_3d_scale].
-			Values less than [code]1.0[/code] will be result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
+			Values less than [code]1.0[/code] will result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] disables scaling.
 			More information: [url=https://developer.apple.com/documentation/metalfx]MetalFX[/url].
 			[b]Note:[/b] Only supported when the Metal rendering driver is in use, which limits this scaling mode to macOS and iOS.
 		</constant>
 		<constant name="SCALING_3D_MODE_METALFX_TEMPORAL" value="4" enum="Scaling3DMode">
 			Use the [url=https://developer.apple.com/documentation/metalfx/mtlfxtemporalscaler#overview]MetalFX temporal upscaler[/url] for the viewport's 3D buffer.
 			The amount of scaling can be set using [member scaling_3d_scale]. To determine the minimum input scale, use the [method RenderingDevice.limit_get] method with [constant RenderingDevice.LIMIT_METALFX_TEMPORAL_SCALER_MIN_SCALE].
-			Values less than [code]1.0[/code] will be result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use MetalFX at native resolution as a TAA solution.
+			Values less than [code]1.0[/code] will result in the viewport being upscaled using MetalFX. Values greater than [code]1.0[/code] are not supported and bilinear downsampling will be used instead. A value of [code]1.0[/code] will use MetalFX at native resolution as a TAA solution.
 			More information: [url=https://developer.apple.com/documentation/metalfx]MetalFX[/url].
 			[b]Note:[/b] Only supported when the Metal rendering driver is in use, which limits this scaling mode to macOS and iOS.
 		</constant>
@@ -608,9 +621,11 @@
 		</constant>
 		<constant name="DEBUG_DRAW_LIGHTING" value="2" enum="DebugDraw">
 			Objects are displayed without textures and only with lighting information.
+			[b]Note:[/b] When using this debug draw mode, custom shaders are ignored since all materials in the scene temporarily use a debug material. This means the result from custom shader functions (such as vertex displacement) won't be visible anymore when using this debug draw mode.
 		</constant>
 		<constant name="DEBUG_DRAW_OVERDRAW" value="3" enum="DebugDraw">
 			Objects are displayed semi-transparent with additive blending so you can see where they are drawing over top of one another. A higher overdraw means you are wasting performance on drawing pixels that are being hidden behind others.
+			[b]Note:[/b] When using this debug draw mode, custom shaders are ignored since all materials in the scene temporarily use a debug material. This means the result from custom shader functions (such as vertex displacement) won't be visible anymore when using this debug draw mode.
 		</constant>
 		<constant name="DEBUG_DRAW_WIREFRAME" value="4" enum="DebugDraw">
 			Objects are displayed as wireframe models.
@@ -618,15 +633,19 @@
 		</constant>
 		<constant name="DEBUG_DRAW_NORMAL_BUFFER" value="5" enum="DebugDraw">
 			Objects are displayed without lighting information and their textures replaced by normal mapping.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_VOXEL_GI_ALBEDO" value="6" enum="DebugDraw">
-			Objects are displayed with only the albedo value from [VoxelGI]s.
+			Objects are displayed with only the albedo value from [VoxelGI]s. Requires at least one visible [VoxelGI] node that has been baked to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_VOXEL_GI_LIGHTING" value="7" enum="DebugDraw">
-			Objects are displayed with only the lighting value from [VoxelGI]s.
+			Objects are displayed with only the lighting value from [VoxelGI]s. Requires at least one visible [VoxelGI] node that has been baked to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_VOXEL_GI_EMISSION" value="8" enum="DebugDraw">
-			Objects are displayed with only the emission color from [VoxelGI]s.
+			Objects are displayed with only the emission color from [VoxelGI]s. Requires at least one visible [VoxelGI] node that has been baked to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_SHADOW_ATLAS" value="9" enum="DebugDraw">
 			Draws the shadow atlas that stores shadows from [OmniLight3D]s and [SpotLight3D]s in the upper left quadrant of the [Viewport].
@@ -636,53 +655,69 @@
 		</constant>
 		<constant name="DEBUG_DRAW_SCENE_LUMINANCE" value="11" enum="DebugDraw">
 			Draws the scene luminance buffer (if available) in the upper left quadrant of the [Viewport].
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="DEBUG_DRAW_SSAO" value="12" enum="DebugDraw">
 			Draws the screen-space ambient occlusion texture instead of the scene so that you can clearly see how it is affecting objects. In order for this display mode to work, you must have [member Environment.ssao_enabled] set in your [WorldEnvironment].
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_SSIL" value="13" enum="DebugDraw">
 			Draws the screen-space indirect lighting texture instead of the scene so that you can clearly see how it is affecting objects. In order for this display mode to work, you must have [member Environment.ssil_enabled] set in your [WorldEnvironment].
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_PSSM_SPLITS" value="14" enum="DebugDraw">
-			Colors each PSSM split for the [DirectionalLight3D]s in the scene a different color so you can see where the splits are. In order, they will be colored red, green, blue, and yellow.
+			Colors each PSSM split for the [DirectionalLight3D]s in the scene a different color so you can see where the splits are. In order (from closest to furthest from the camera), they are colored red, green, blue, and yellow.
+			[b]Note:[/b] When using this debug draw mode, custom shaders are ignored since all materials in the scene temporarily use a debug material. This means the result from custom shader functions (such as vertex displacement) won't be visible anymore when using this debug draw mode.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="DEBUG_DRAW_DECAL_ATLAS" value="15" enum="DebugDraw">
 			Draws the decal atlas used by [Decal]s and light projector textures in the upper left quadrant of the [Viewport].
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="DEBUG_DRAW_SDFGI" value="16" enum="DebugDraw">
 			Draws the cascades used to render signed distance field global illumination (SDFGI).
-			Does nothing if the current environment's [member Environment.sdfgi_enabled] is [code]false[/code] or SDFGI is not supported on the platform.
+			Does nothing if the current environment's [member Environment.sdfgi_enabled] is [code]false[/code].
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_SDFGI_PROBES" value="17" enum="DebugDraw">
 			Draws the probes used for signed distance field global illumination (SDFGI).
-			Does nothing if the current environment's [member Environment.sdfgi_enabled] is [code]false[/code] or SDFGI is not supported on the platform.
+			Does nothing if the current environment's [member Environment.sdfgi_enabled] is [code]false[/code].
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_GI_BUFFER" value="18" enum="DebugDraw">
-			Draws the buffer used for global illumination (GI).
+			Draws the buffer used for global illumination from [VoxelGI] or SDFGI. Requires [VoxelGI] (at least one visible baked VoxelGI node) or SDFGI ([member Environment.sdfgi_enabled]) to be enabled to have a visible effect.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_DISABLE_LOD" value="19" enum="DebugDraw">
-			Draws all of the objects at their highest polycount, without low level of detail (LOD).
+			Draws all of the objects at their highest polycount regardless of their distance from the camera. No low level of detail (LOD) is applied.
 		</constant>
 		<constant name="DEBUG_DRAW_CLUSTER_OMNI_LIGHTS" value="20" enum="DebugDraw">
 			Draws the cluster used by [OmniLight3D] nodes to optimize light rendering.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_CLUSTER_SPOT_LIGHTS" value="21" enum="DebugDraw">
 			Draws the cluster used by [SpotLight3D] nodes to optimize light rendering.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_CLUSTER_DECALS" value="22" enum="DebugDraw">
 			Draws the cluster used by [Decal] nodes to optimize decal rendering.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_CLUSTER_REFLECTION_PROBES" value="23" enum="DebugDraw">
 			Draws the cluster used by [ReflectionProbe] nodes to optimize decal rendering.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_OCCLUDERS" value="24" enum="DebugDraw">
 			Draws the buffer used for occlusion culling.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="DEBUG_DRAW_MOTION_VECTORS" value="25" enum="DebugDraw">
 			Draws vector lines over the viewport to indicate the movement of pixels between frames.
+			[b]Note:[/b] Only supported when using the Forward+ rendering method.
 		</constant>
 		<constant name="DEBUG_DRAW_INTERNAL_BUFFER" value="26" enum="DebugDraw">
-			Draws the internal resolution buffer of the scene before post-processing is applied.
+			Draws the internal resolution buffer of the scene in linear colorspace before tonemapping or post-processing is applied.
+			[b]Note:[/b] Only supported when using the Forward+ or Mobile rendering methods.
 		</constant>
 		<constant name="DEFAULT_CANVAS_ITEM_TEXTURE_FILTER_NEAREST" value="0" enum="DefaultCanvasItemTextureFilter">
 			The texture filter reads from the nearest pixel only. This makes the texture look pixelated from up close, and grainy from a distance (due to mipmaps not being sampled).
diff --git a/engine/doc/classes/VisibleOnScreenNotifier2D.xml b/engine/doc/classes/VisibleOnScreenNotifier2D.xml
index 418abb6d..01ab440d 100644
--- a/engine/doc/classes/VisibleOnScreenNotifier2D.xml
+++ b/engine/doc/classes/VisibleOnScreenNotifier2D.xml
@@ -24,6 +24,9 @@
 		<member name="rect" type="Rect2" setter="set_rect" getter="get_rect" default="Rect2(-10, -10, 20, 20)">
 			The VisibleOnScreenNotifier2D's bounding rectangle.
 		</member>
+		<member name="show_rect" type="bool" setter="set_show_rect" getter="is_showing_rect" default="true">
+			If [code]true[/code], shows the rectangle area of [member rect] in the editor with a translucent magenta fill. Unlike changing the visibility of the VisibleOnScreenNotifier2D, this does not affect the screen culling detection.
+		</member>
 	</members>
 	<signals>
 		<signal name="screen_entered">
diff --git a/engine/doc/classes/Window.xml b/engine/doc/classes/Window.xml
index 90eba0bd..88bec276 100644
--- a/engine/doc/classes/Window.xml
+++ b/engine/doc/classes/Window.xml
@@ -108,6 +108,12 @@
 				Returns [code]true[/code] if the [param flag] is set.
 			</description>
 		</method>
+		<method name="get_focused_window" qualifiers="static">
+			<return type="Window" />
+			<description>
+				Returns the focused window.
+			</description>
+		</method>
 		<method name="get_layout_direction" qualifiers="const">
 			<return type="int" enum="Window.LayoutDirection" />
 			<description>
@@ -338,7 +344,7 @@
 		<method name="is_layout_rtl" qualifiers="const">
 			<return type="bool" />
 			<description>
-				Returns [code]true[/code] if layout is right-to-left.
+				Returns [code]true[/code] if the layout is right-to-left.
 			</description>
 		</method>
 		<method name="is_maximize_allowed" qualifiers="const">
@@ -600,7 +606,9 @@
 			The screen the window is currently on.
 		</member>
 		<member name="exclude_from_capture" type="bool" setter="set_flag" getter="get_flag" default="false">
-			Windows is excluded from screenshots taken by [method DisplayServer.screen_get_image], [method DisplayServer.screen_get_image_rect], and [method DisplayServer.screen_get_pixel].
+			If [code]true[/code], the [Window] is excluded from screenshots taken by [method DisplayServer.screen_get_image], [method DisplayServer.screen_get_image_rect], and [method DisplayServer.screen_get_pixel].
+			[b]Note:[/b] This property is implemented on macOS and Windows.
+			[b]Note:[/b] Enabling this setting does [b]NOT[/b] prevent other apps from capturing an image. It should not be used as a security measure.
 		</member>
 		<member name="exclusive" type="bool" setter="set_exclusive" getter="is_exclusive" default="false">
 			If [code]true[/code], the [Window] will be in exclusive mode. Exclusive windows are always on top of their parent and will block all input going to the parent [Window].
@@ -624,10 +632,20 @@
 			If non-zero, the [Window] can't be resized to be bigger than this size.
 			[b]Note:[/b] This property will be ignored if the value is lower than [member min_size].
 		</member>
+		<member name="maximize_disabled" type="bool" setter="set_flag" getter="get_flag" default="false">
+			If [code]true[/code], the [Window]'s maximize button is disabled.
+			[b]Note:[/b] If both minimize and maximize buttons are disabled, buttons are fully hidden, and only close button is visible.
+			[b]Note:[/b] This property is implemented only on macOS and Windows.
+		</member>
 		<member name="min_size" type="Vector2i" setter="set_min_size" getter="get_min_size" default="Vector2i(0, 0)">
 			If non-zero, the [Window] can't be resized to be smaller than this size.
 			[b]Note:[/b] This property will be ignored in favor of [method get_contents_minimum_size] if [member wrap_controls] is enabled and if its size is bigger.
 		</member>
+		<member name="minimize_disabled" type="bool" setter="set_flag" getter="get_flag" default="false">
+			If [code]true[/code], the [Window]'s minimize button is disabled.
+			[b]Note:[/b] If both minimize and maximize buttons are disabled, buttons are fully hidden, and only close button is visible.
+			[b]Note:[/b] This property is implemented only on macOS and Windows.
+		</member>
 		<member name="mode" type="int" setter="set_mode" getter="get_mode" enum="Window.Mode" default="0">
 			Set's the window's current mode.
 			[b]Note:[/b] Fullscreen mode is not exclusive full screen on Windows and Linux.
@@ -670,6 +688,9 @@
 		<member name="popup_window" type="bool" setter="set_flag" getter="get_flag" default="false">
 			If [code]true[/code], the [Window] will be considered a popup. Popups are sub-windows that don't show as separate windows in system's window manager's window list and will send close request when anything is clicked outside of them (unless [member exclusive] is enabled).
 		</member>
+		<member name="popup_wm_hint" type="bool" setter="set_flag" getter="get_flag" default="false">
+			If [code]true[/code], the [Window] will signal to the window manager that it is supposed to be an implementation-defined "popup" (usually a floating, borderless, untileable and immovable child window).
+		</member>
 		<member name="position" type="Vector2i" setter="set_position" getter="get_position" default="Vector2i(0, 0)">
 			The window's position in pixels.
 			If [member ProjectSettings.display/window/subwindows/embed_subwindows] is [code]false[/code], the position is in absolute screen coordinates. This typically applies to editor plugins. If the setting is [code]true[/code], the window's position is in the coordinates of its parent [Viewport].
@@ -709,7 +730,7 @@
 			If [code]true[/code], the [Window] can't be focused nor interacted with. It can still be visible.
 		</member>
 		<member name="unresizable" type="bool" setter="set_flag" getter="get_flag" default="false">
-			If [code]true[/code], the window can't be resized. Minimize and maximize buttons are disabled.
+			If [code]true[/code], the window can't be resized.
 		</member>
 		<member name="visible" type="bool" setter="set_visible" getter="is_visible" default="true">
 			If [code]true[/code], the window is visible.
@@ -734,7 +755,7 @@
 		<signal name="dpi_changed">
 			<description>
 				Emitted when the [Window]'s DPI changes as a result of OS-level changes (e.g. moving the window from a Retina display to a lower resolution one).
-				[b]Note:[/b] Only implemented on macOS.
+				[b]Note:[/b] Only implemented on macOS and Linux (Wayland).
 			</description>
 		</signal>
 		<signal name="files_dropped">
@@ -879,7 +900,18 @@
 			[b]Note:[/b] This flag is implemented on macOS and Windows.
 			[b]Note:[/b] Setting this flag will [b]NOT[/b] prevent other apps from capturing an image, it should not be used as a security measure.
 		</constant>
-		<constant name="FLAG_MAX" value="10" enum="Flags">
+		<constant name="FLAG_POPUP_WM_HINT" value="10" enum="Flags">
+			Signals the window manager that this window is supposed to be an implementation-defined "popup" (usually a floating, borderless, untileable and immovable child window).
+		</constant>
+		<constant name="FLAG_MINIMIZE_DISABLED" value="11" enum="Flags">
+			Window minimize button is disabled.
+			[b]Note:[/b] This flag is implemented on macOS and Windows.
+		</constant>
+		<constant name="FLAG_MAXIMIZE_DISABLED" value="12" enum="Flags">
+			Window maximize button is disabled.
+			[b]Note:[/b] This flag is implemented on macOS and Windows.
+		</constant>
+		<constant name="FLAG_MAX" value="13" enum="Flags">
 			Max value of the [enum Flags].
 		</constant>
 		<constant name="CONTENT_SCALE_MODE_DISABLED" value="0" enum="ContentScaleMode">
diff --git a/engine/doc/classes/XRCamera3D.xml b/engine/doc/classes/XRCamera3D.xml
index e49e884f..ca1cd431 100644
--- a/engine/doc/classes/XRCamera3D.xml
+++ b/engine/doc/classes/XRCamera3D.xml
@@ -10,4 +10,7 @@
 	<tutorials>
 		<link title="XR documentation index">$DOCS_URL/tutorials/xr/index.html</link>
 	</tutorials>
+	<members>
+		<member name="physics_interpolation_mode" type="int" setter="set_physics_interpolation_mode" getter="get_physics_interpolation_mode" overrides="Node" enum="Node.PhysicsInterpolationMode" default="2" />
+	</members>
 </class>
diff --git a/engine/doc/classes/XRController3D.xml b/engine/doc/classes/XRController3D.xml
index 508752e0..d322b137 100644
--- a/engine/doc/classes/XRController3D.xml
+++ b/engine/doc/classes/XRController3D.xml
@@ -7,7 +7,7 @@
 		This is a helper 3D node that is linked to the tracking of controllers. It also offers several handy passthroughs to the state of buttons and such on the controllers.
 		Controllers are linked by their ID. You can create controller nodes before the controllers are available. If your game always uses two controllers (one for each hand), you can predefine the controllers with ID 1 and 2; they will become active as soon as the controllers are identified. If you expect additional controllers to be used, you should react to the signals and add XRController3D nodes to your scene.
 		The position of the controller node is automatically updated by the [XRServer]. This makes this node ideal to add child nodes to visualize the controller.
-		As many XR runtimes now use a configurable action map all inputs are named.
+		The current [XRInterface] defines the names of inputs. In the case of OpenXR, these are the names of actions in the current action set from the OpenXR action map.
 	</description>
 	<tutorials>
 		<link title="XR documentation index">$DOCS_URL/tutorials/xr/index.html</link>
@@ -18,6 +18,7 @@
 			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns a numeric value for the input with the given [param name]. This is used for triggers and grip sensors.
+				[b]Note:[/b] The current [XRInterface] defines the [param name] for each input. In the case of OpenXR, these are the names of actions in the current action set.
 			</description>
 		</method>
 		<method name="get_input" qualifiers="const">
@@ -25,6 +26,7 @@
 			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns a [Variant] for the input with the given [param name]. This works for any input type, the variant will be typed according to the actions configuration.
+				[b]Note:[/b] The current [XRInterface] defines the [param name] for each input. In the case of OpenXR, these are the names of actions in the current action set.
 			</description>
 		</method>
 		<method name="get_tracker_hand" qualifiers="const">
@@ -38,6 +40,7 @@
 			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns a [Vector2] for the input with the given [param name]. This is used for thumbsticks and thumbpads found on many controllers.
+				[b]Note:[/b] The current [XRInterface] defines the [param name] for each input. In the case of OpenXR, these are the names of actions in the current action set.
 			</description>
 		</method>
 		<method name="is_button_pressed" qualifiers="const">
@@ -45,6 +48,7 @@
 			<param index="0" name="name" type="StringName" />
 			<description>
 				Returns [code]true[/code] if the button with the given [param name] is pressed.
+				[b]Note:[/b] The current [XRInterface] defines the [param name] for each input. In the case of OpenXR, these are the names of actions in the current action set.
 			</description>
 		</method>
 	</methods>
diff --git a/engine/doc/classes/XRInterface.xml b/engine/doc/classes/XRInterface.xml
index 52552556..13eb3c67 100644
--- a/engine/doc/classes/XRInterface.xml
+++ b/engine/doc/classes/XRInterface.xml
@@ -263,6 +263,9 @@
 		<constant name="XR_PLAY_AREA_STAGE" value="4" enum="PlayAreaMode">
 			Same as [constant XR_PLAY_AREA_ROOMSCALE] but origin point is fixed to the center of the physical space. In this mode, system-level recentering may be disabled, requiring the use of [method XRServer.center_on_hmd].
 		</constant>
+		<constant name="XR_PLAY_AREA_CUSTOM" value="2147483647" enum="PlayAreaMode">
+			Custom play area set by a GDExtension.
+		</constant>
 		<constant name="XR_ENV_BLEND_MODE_OPAQUE" value="0" enum="EnvironmentBlendMode">
 			Opaque blend mode. This is typically used for VR devices.
 		</constant>
diff --git a/engine/doc/classes/XRNode3D.xml b/engine/doc/classes/XRNode3D.xml
index fce3708d..cc2f4b87 100644
--- a/engine/doc/classes/XRNode3D.xml
+++ b/engine/doc/classes/XRNode3D.xml
@@ -46,6 +46,7 @@
 		</method>
 	</methods>
 	<members>
+		<member name="physics_interpolation_mode" type="int" setter="set_physics_interpolation_mode" getter="get_physics_interpolation_mode" overrides="Node" enum="Node.PhysicsInterpolationMode" default="2" />
 		<member name="pose" type="StringName" setter="set_pose_name" getter="get_pose_name" default="&amp;&quot;default&quot;">
 			The name of the pose we're bound to. Which poses a tracker supports is not known during design time.
 			Godot defines number of standard pose names such as [code]aim[/code] and [code]grip[/code] but other may be configured within a given [XRInterface].
diff --git a/engine/doc/tools/doc_status.py b/engine/doc/tools/doc_status.py
index db2b1944..960778de 100755
--- a/engine/doc/tools/doc_status.py
+++ b/engine/doc/tools/doc_status.py
@@ -10,14 +10,14 @@ from typing import Dict, List, Set
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
 
-from misc.utility.color import STDOUT_COLOR, Ansi, toggle_color
+from misc.utility.color import Ansi, force_stdout_color, is_stdout_color
 
 ################################################################################
 #                                    Config                                    #
 ################################################################################
 
 flags = {
-    "c": STDOUT_COLOR,
+    "c": is_stdout_color(),
     "b": False,
     "g": False,
     "s": False,
@@ -114,6 +114,8 @@ def validate_tag(elem: ET.Element, tag: str) -> None:
 
 
 def color(color: str, string: str) -> str:
+    if not is_stdout_color():
+        return string
     color_format = "".join([str(x) for x in colors[color]])
     return f"{color_format}{string}{Ansi.RESET}"
 
@@ -330,8 +332,7 @@ if flags["u"]:
     table_column_names.append("Docs URL")
     table_columns.append("url")
 
-if flags["c"]:
-    toggle_color(True)
+force_stdout_color(flags["c"])
 
 ################################################################################
 #                                     Help                                     #
diff --git a/engine/doc/tools/make_rst.py b/engine/doc/tools/make_rst.py
index 0b4896d2..243c08ba 100755
--- a/engine/doc/tools/make_rst.py
+++ b/engine/doc/tools/make_rst.py
@@ -13,7 +13,7 @@ from typing import Any, Dict, List, Optional, TextIO, Tuple, Union
 sys.path.insert(0, root_directory := os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
 
 import version
-from misc.utility.color import Ansi, toggle_color
+from misc.utility.color import Ansi, force_stderr_color, force_stdout_color
 
 # $DOCS_URL/path/to/page.html(#fragment-tag)
 GODOT_DOCS_PATTERN = re.compile(r"^\$DOCS_URL/(.*)\.html(#.*)?$")
@@ -698,7 +698,8 @@ def main() -> None:
     args = parser.parse_args()
 
     if args.color:
-        toggle_color(True)
+        force_stdout_color(True)
+        force_stderr_color(True)
 
     # Retrieve heading translations for the given language.
     if not args.dry_run and args.lang != "en":
diff --git a/engine/doc/translations/de.po b/engine/doc/translations/de.po
index f6e45430..27157ff6 100644
--- a/engine/doc/translations/de.po
+++ b/engine/doc/translations/de.po
@@ -103,12 +103,13 @@
 # Daniel Schmid <daniel.ds.schmid@gmail.com>, 2025.
 # Michael Domanek <michael.domanek2@gmail.com>, 2025.
 # Keschler <keschler0@protonmail.com>, 2025.
+# Silikonmanns Kanal <silvan.goeth@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2025-02-26 15:06+0000\n"
-"Last-Translator: Keschler <keschler0@protonmail.com>\n"
+"PO-Revision-Date: 2025-03-10 14:33+0000\n"
+"Last-Translator: Silikonmann <silvan.goeth@gmail.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/godot-"
 "class-reference/de/>\n"
 "Language: de\n"
@@ -116,7 +117,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.2-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "All classes"
 msgstr "Alle Klassen"
@@ -13723,6 +13724,9 @@ msgstr ""
 "globalen Raum und nicht im lokalen Objektraum berechnet. Siehe auch [member "
 "uv2_triplanar]."
 
+msgid "Using 3D transforms"
+msgstr "3D-Transformationen verwenden"
+
 msgid ""
 "Returns [code]true[/code] if this basis and [param b] are approximately "
 "equal, by calling [method @GlobalScope.is_equal_approx] on all vector "
diff --git a/engine/doc/translations/es.po b/engine/doc/translations/es.po
index 27b8d3b8..559e5b27 100644
--- a/engine/doc/translations/es.po
+++ b/engine/doc/translations/es.po
@@ -84,7 +84,7 @@
 # Zgtale <zgtale1@hotmail.com>, 2024.
 # Juan Matias Olmos <ma7as@protonmail.com>, 2024.
 # Juan Castro <castrotio09172002@gmail.com>, 2024.
-# Alejandro Moctezuma <moctezumaalejandro25@gmail.com>, 2024.
+# Alejandro Moctezuma <moctezumaalejandro25@gmail.com>, 2024, 2025.
 # gallegonovato <fran-carro@hotmail.es>, 2024.
 # Andres David Calderon <andresdavidcalderonjimenez@gmail.com>, 2024.
 # MayorTom4815 <domiisac2004@proton.me>, 2024.
@@ -99,8 +99,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2025-03-02 21:09+0000\n"
-"Last-Translator: LuisGFlorez <lgfgcoder@gmail.com>\n"
+"PO-Revision-Date: 2025-03-05 16:43+0000\n"
+"Last-Translator: Alejandro Moctezuma <moctezumaalejandro25@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/es/>\n"
 "Language: es\n"
@@ -168,13 +168,13 @@ msgid "Property Descriptions"
 msgstr "Descripciones de Propiedades"
 
 msgid "Constructor Descriptions"
-msgstr "Descripciones de Constructor"
+msgstr "Descripciones de Constructores"
 
 msgid "Method Descriptions"
 msgstr "Descripciones de Métodos"
 
 msgid "Operator Descriptions"
-msgstr "Descripciones de Operador"
+msgstr "Descripciones de Operadores"
 
 msgid "Theme Property Descriptions"
 msgstr "Descripciones de las propiedades del tema"
@@ -353,9 +353,23 @@ msgstr ""
 msgid "Built-in GDScript constants, functions, and annotations."
 msgstr "Constantes, funciones y anotaciones de GDScript integradas."
 
+msgid ""
+"A list of utility functions and annotations accessible from any script "
+"written in GDScript.\n"
+"For the list of global functions and constants that can be accessed in any "
+"scripting language, see [@GlobalScope]."
+msgstr ""
+"Una lista de funciones de utilidad y anotaciones específicas de GDScript, "
+"accesibles desde cualquier script escrito en GDScript.\n"
+"Para obtener la lista de funciones globales y constantes a las que se puede "
+"acceder desde cualquier lenguaje de scripting, consulte [@GlobalScope]."
+
 msgid "GDScript exports"
 msgstr "Exportaciones de GDScript"
 
+msgid "Use [method Color.from_rgba8] instead."
+msgstr "Usar [method Color.from_rgba8] en su lugar."
+
 msgid ""
 "Returns a [Color] constructed from red ([param r8]), green ([param g8]), blue "
 "([param b8]), and optionally alpha ([param a8]) integer channels, each "
@@ -442,6 +456,23 @@ msgstr ""
 "tanto, no puede acceder a él como un [Callable] ni usarlo dentro de "
 "expresiones."
 
+msgid ""
+"Returns a single character (as a [String]) of the given Unicode code point "
+"(which is compatible with ASCII code).\n"
+"[codeblock]\n"
+"var upper = char(65)      # upper is \"A\"\n"
+"var lower = char(65 + 32) # lower is \"a\"\n"
+"var euro = char(8364)     # euro is \"€\"\n"
+"[/codeblock]"
+msgstr ""
+"Devuelve un único carácter (como un [String]) del punto de código Unicode "
+"indicado (que es compatible con el código ASCII).\n"
+"[codeblock]\n"
+"var superior = char(65)      # superior es \"A\"\n"
+"var inferior = char(65 + 32) # inferior es \"a\"\n"
+"var euro = char(8364)     # euro es \"€\"\n"
+"[/codeblock]"
+
 msgid "Use [method @GlobalScope.type_convert] instead."
 msgstr "Utiliza el [método @GlobalScope.type_convert] en su lugar."
 
@@ -457,18 +488,24 @@ msgid ""
 "print(b is Array) # Prints false\n"
 "[/codeblock]"
 msgstr ""
-"[i]obsoleto.[/i] Usar [method @GlobalScope.type_convert] en su lugar.\n"
 "Convierte [param what] a [param type] de la mejor forma posible. El [param "
-"type] usa los valores de[enum Variant.Type].\n"
+"type] usa los valores de [enum Variant.Type].\n"
 "[codeblock]\n"
 "var a = [4, 2.5, 1.2]\n"
 "print(a is Array) # Imprime true\n"
 "\n"
 "var b = convert(a, TYPE_PACKED_BYTE_ARRAY)\n"
-"print(b)• • • • • • • • # Prints [4, 2, 1]\n"
+"print(b)          # Imprime [4, 2, 1]\n"
 "print(b is Array) # Imprime false\n"
 "[/codeblock]"
 
+msgid ""
+"Consider using [method JSON.to_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Considere usar [method JSON.to_native] o [method Object.get_property_list] en "
+"su lugar."
+
 msgid ""
 "Converts a [param dictionary] (created with [method inst_to_dict]) back to an "
 "Object instance. Can be useful for deserializing."
@@ -526,6 +563,13 @@ msgstr ""
 "[b]Nota:[/b] La llamada a esta función desde un [Thread] no está soportada. "
 "Si lo hace, devolverá un array vacío."
 
+msgid ""
+"Consider using [method JSON.from_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Considere usar [method JSON.from_native] o [method Object.get_property_list] "
+"en su lugar."
+
 msgid ""
 "Returns a [Resource] from the filesystem located at the absolute [param "
 "path]. Unless it's already referenced elsewhere (such as in another script or "
@@ -1005,6 +1049,24 @@ msgstr ""
 "[url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]curva de Bézier [/url] "
 "definida dados los puntos [param control_1], [param control_2], y [param end]."
 
+msgid ""
+"Rounds [param x] upward (towards positive infinity), returning the smallest "
+"whole number that is not less than [param x].\n"
+"A type-safe version of [method ceil], returning a [float]."
+msgstr ""
+"Redondea [param x] hacia arriba (hacia el infinito positivo) y devuelve el "
+"número entero más pequeño que no sea menor que [param x].\n"
+"Una versión de [method ceil] con seguridad de tipos, que devuelve un [float]."
+
+msgid ""
+"Rounds [param x] upward (towards positive infinity), returning the smallest "
+"whole number that is not less than [param x].\n"
+"A type-safe version of [method ceil], returning an [int]."
+msgstr ""
+"Redondea [param x] hacia arriba (hacia el infinito positivo) y devuelve el "
+"número entero más pequeño que no sea menor que [param x].\n"
+"Una versión de tipo seguro de [method ceil], que devuelve un [int]."
+
 msgid ""
 "Clamps the [param value], returning a [Variant] not less than [param min] and "
 "not more than [param max]. Any values that can be compared with the less than "
@@ -20416,6 +20478,13 @@ msgstr ""
 "El recurso [Environment] utilizado por este [WorldEnvironment], definiendo "
 "las propiedades por defecto."
 
+msgid ""
+"Returns [code]true[/code] if the currently parsed element is empty, e.g. "
+"[code]<element />[/code]."
+msgstr ""
+"Devuelve [code]true[/code] si el elemento analizado actualmente está vacío, "
+"por ejemplo, [code]<element />[/code]."
+
 msgid "There's no node (no file or buffer opened)."
 msgstr "No hay ningún nodo (ningún archivo o buffer abierto)."
 
diff --git a/engine/doc/translations/fr.po b/engine/doc/translations/fr.po
index 8f526aaa..62a783b9 100644
--- a/engine/doc/translations/fr.po
+++ b/engine/doc/translations/fr.po
@@ -115,13 +115,14 @@
 # alpikespot <hasibe1973nurullah@gmail.com>, 2024.
 # dan rastock <veryellow@free.fr>, 2024.
 # Théo GUEURET <tgueuret@live.fr>, 2025.
+# Olivier <martio@hotmail.fr>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-01-23 17:32+0000\n"
-"Last-Translator: Théo GUEURET <tgueuret@live.fr>\n"
+"PO-Revision-Date: 2025-03-14 04:09+0000\n"
+"Last-Translator: Olivier <martio@hotmail.fr>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/godot-"
 "class-reference/fr/>\n"
 "Language: fr\n"
@@ -129,7 +130,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "All classes"
 msgstr "Toutes les classes"
@@ -373,9 +374,23 @@ msgstr ""
 msgid "Built-in GDScript constants, functions, and annotations."
 msgstr "Constantes, fonctions et annotations intégrées à GDScript."
 
+msgid ""
+"A list of utility functions and annotations accessible from any script "
+"written in GDScript.\n"
+"For the list of global functions and constants that can be accessed in any "
+"scripting language, see [@GlobalScope]."
+msgstr ""
+"Une liste de fonctions utilitaires et d'annotations, utilisables depuis "
+"n'importe quel script écrit en GDScript.\n"
+"Pour voir la liste des fonctions et constantes globales disponibles dans "
+"n'importe quel langage, voir [@GlobalScope]."
+
 msgid "GDScript exports"
 msgstr "Exports GDScript"
 
+msgid "Use [method Color.from_rgba8] instead."
+msgstr "Utilisez [method Color.from_rgba8] à la place."
+
 msgid ""
 "Returns a [Color] constructed from red ([param r8]), green ([param g8]), blue "
 "([param b8]), and optionally alpha ([param a8]) integer channels, each "
@@ -401,9 +416,9 @@ msgstr ""
 "utile lorsque vous devez faire correspondre des valeurs de couleur exactes "
 "dans une [Image].\n"
 "[codeblock]\n"
-"var red = Color8(255, 0, 0)             # Meme effet que Color(1, 0, 0).\n"
-"var dark_blue = Color8(0, 0, 51)        # Meme effet que Color(0, 0, 0.2).\n"
-"var my_color = Color8(306, 255, 0, 102) # Meme effet que Color(1.2, 1, 0, "
+"var red = Color8(255, 0, 0)             # Même effet que Color(1, 0, 0).\n"
+"var dark_blue = Color8(0, 0, 51)        # Même effet que Color(0, 0, 0.2).\n"
+"var my_color = Color8(306, 255, 0, 102) # Même effet que Color(1.2, 1, 0, "
 "0.4).\n"
 "[/codeblock]\n"
 "[b]Note :[/b] En raison de la précision inférieure de [method Color8] par "
@@ -469,6 +484,23 @@ msgstr ""
 "pouvez donc pas y accéder en tant que [Callable] ou l'utiliser dans des "
 "expressions."
 
+msgid ""
+"Returns a single character (as a [String]) of the given Unicode code point "
+"(which is compatible with ASCII code).\n"
+"[codeblock]\n"
+"var upper = char(65)      # upper is \"A\"\n"
+"var lower = char(65 + 32) # lower is \"a\"\n"
+"var euro = char(8364)     # euro is \"€\"\n"
+"[/codeblock]"
+msgstr ""
+"Renvoie un unique caractère au format chaîne de caractère ([String]) "
+"correspondant à la valeur Unicode donnée (compatible avec le code ASCII).\n"
+"[codeblock]\n"
+"var upper = char(65)      # upper vaut « A »\n"
+"var lower = char(65 + 32) # lower vaut « a »\n"
+"var euro = char(8364)     # euro vaut « € »\n"
+"[/codeblock]"
+
 msgid "Use [method @GlobalScope.type_convert] instead."
 msgstr "Utilisez [method @GlobalScope.type_convert] à la place."
 
@@ -495,6 +527,13 @@ msgstr ""
 "print(b is Array) # Affiche false\n"
 "[/codeblock]"
 
+msgid ""
+"Consider using [method JSON.to_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Songez à utiliser [method JSON.to_native] ou [method Object."
+"get_property_list] à la place."
+
 msgid ""
 "Converts a [param dictionary] (created with [method inst_to_dict]) back to an "
 "Object instance. Can be useful for deserializing."
@@ -553,6 +592,110 @@ msgstr ""
 "[b]Note :[/b] L'appel de cette fonction depuis un [Thread] n'est pas pris en "
 "charge. Cela renverra un tableau vide."
 
+msgid ""
+"Consider using [method JSON.from_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Songez à utiliser [method JSON.from_native] ou [method Object."
+"get_property_list] à la place."
+
+msgid ""
+"Returns the passed [param instance] converted to a Dictionary. Can be useful "
+"for serializing.\n"
+"[codeblock]\n"
+"var foo = \"bar\"\n"
+"func _ready():\n"
+"    var d = inst_to_dict(self)\n"
+"    print(d.keys())\n"
+"    print(d.values())\n"
+"[/codeblock]\n"
+"Prints out:\n"
+"[codeblock lang=text]\n"
+"[@subpath, @path, foo]\n"
+"[, res://test.gd, bar]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This function can only be used to serialize objects with an "
+"attached [GDScript] stored in a separate file. Objects without an attached "
+"script, with a script written in another language, or with a built-in script "
+"are not supported.\n"
+"[b]Note:[/b] This function is not recursive, which means that nested objects "
+"will not be represented as dictionaries. Also, properties passed by reference "
+"([Object], [Dictionary], [Array], and packed arrays) are copied by reference, "
+"not duplicated."
+msgstr ""
+"Retourne l'[param instance] donnée convertie en un Dictionnaire. Peut "
+"s'avérer utile pour la sérialisation.\n"
+"[codeblock]\n"
+"var foo = \"bar\"\n"
+"func _ready():\n"
+"    var d = inst_to_dict(self)\n"
+"    print(d.keys())\n"
+"    print(d.values())\n"
+"[/codeblock]\n"
+"Affiche :\n"
+"[codeblock lang=text]\n"
+"[@subpath, @path, foo]\n"
+"[, res://test.gd, bar]\n"
+"[/codeblock]\n"
+"[b]Remarque :[/b] Cette fonction ne peut être utilisée que pour sérialiser "
+"des objets ayant un [GDScript] associé dans un fichier séparé. Les objets "
+"sans script associé, avec un script écrit dans un autre langage, ou encore "
+"avec un script incorporé ne sont pas supportés.\n"
+"[b]Remarque :[/b] Cette fonction n'est pas récursive. Ce qui veut dire que "
+"les objets contenus ne seront pas représentés sous forme de dictionnaire. "
+"Aussi, les propriétés passées par référence ([Object], [Dictionary], [Array], "
+"et packed arrays) seront copiées par référence, pas dupliquées."
+
+msgid ""
+"Returns [code]true[/code] if [param value] is an instance of [param type]. "
+"The [param type] value must be one of the following:\n"
+"- A constant from the [enum Variant.Type] enumeration, for example [constant "
+"TYPE_INT].\n"
+"- An [Object]-derived class which exists in [ClassDB], for example [Node].\n"
+"- A [Script] (you can use any class, including inner one).\n"
+"Unlike the right operand of the [code]is[/code] operator, [param type] can be "
+"a non-constant value. The [code]is[/code] operator supports more features "
+"(such as typed arrays). Use the operator instead of this method if you do not "
+"need dynamic type checking.\n"
+"[b]Examples:[/b]\n"
+"[codeblock]\n"
+"print(is_instance_of(a, TYPE_INT))\n"
+"print(is_instance_of(a, Node))\n"
+"print(is_instance_of(a, MyClass))\n"
+"print(is_instance_of(a, MyClass.InnerClass))\n"
+"[/codeblock]\n"
+"[b]Note:[/b] If [param value] and/or [param type] are freed objects (see "
+"[method @GlobalScope.is_instance_valid]), or [param type] is not one of the "
+"above options, this method will raise a runtime error.\n"
+"See also [method @GlobalScope.typeof], [method type_exists], [method Array."
+"is_same_typed] (and other [Array] methods)."
+msgstr ""
+"Renvoie [code]true[/code] si [param value] est une instance de [param type]. "
+"La valeur de [param type] doit être l'une des suivantes :\n"
+"- Une constante de l'énumération [enum Variant.Type], par exemple [constant "
+"TYPE_INT].\n"
+"- Une classe dérivée de [Object] qui existe dans [ClassDB], par exemple "
+"[Node].\n"
+"- Un [Script] (vous pouvez utiliser n'importe quelle classe, y compris une "
+"classe interne).\n"
+"Contrairement à l'opérande droit de l'opérateur [code]is[/code], [param type] "
+"peut être une valeur non constante. L'opérateur [code]is[/code] prend en "
+"charge davantage de fonctionnalités (telles que les tableaux typés). Utilisez "
+"l'opérateur au lieu de cette méthode si vous n'avez pas besoin d'une "
+"vérification dynamique des types.\n"
+"[b]Exemples :[/b]\n"
+"[codeblock]\n"
+"print(is_instance_of(a, TYPE_INT))\n"
+"print(is_instance_of(a, Node))\n"
+"print(is_instance_of(a, MyClass))\n"
+"print(is_instance_of(a, MyClass.InnerClass))\n"
+"[/codeblock]\n"
+"[b]Note :[/b] Si [param value] et/ou [param type] sont des objets libérés "
+"(voir [method @GlobalScope.is_instance_valid]), ou si [param type] n'est pas "
+"l'une des options ci-dessus, cette méthode lèvera une erreur d'exécution.\n"
+"Voir aussi [method @GlobalScope.typeof], [method type_exists], [method Array."
+"is_same_typed] (et autres méthodes [Array])."
+
 msgid ""
 "Returns a [Resource] from the filesystem located at the absolute [param "
 "path]. Unless it's already referenced elsewhere (such as in another script or "
@@ -778,7 +921,7 @@ msgstr ""
 "à virgule) invalide. [constant NAN] a des propriétés particulières, notamment "
 "que [code] !=[/code] retourne toujours [code]true[/code], tandis que les "
 "autres comparateurs retournerons toujours [code]false[/code]. Cela est vrai "
-"meme en le comparant à lui-même ([code]NAN == NAN[/code] retourne "
+"même en le comparant à lui-même ([code]NAN == NAN[/code] retourne "
 "[code]false[/code] et [code]NAN != NAN[/code] retourne [code]true[/code]). "
 "NAN est retourné par certaines operations invalides telles que diviser un "
 "nombre flottant [code]0.0[/code] par [code]0.0[/code].\n"
@@ -12163,9 +12306,9 @@ msgstr ""
 "supporte la recherche dans la liste lorsque le contrôle est en focus. Appuyez "
 "sur une touche qui correspond à la premiere lettre d'un objet pour "
 "sélectionner le premier objet commençant par cette lettre. Après cela, il y à "
-"deux façons d'effectuer une recherche incrémentale : 1) Appuyez sur la meme "
+"deux façons d'effectuer une recherche incrémentale : 1) Appuyez sur la même "
 "touche pendant la fin du délai pour sélectionner l'objet suivant commençant "
-"par la meme lettre. 2) Entrer les lettres qui correspondent au reste du mot "
+"par la même lettre. 2) Entrer les lettres qui correspondent au reste du mot "
 "avant la fin du délai pour sélectionner l'objet directement.\n"
 "Ces deux actions retournerons au debut de la liste si le délai a expiré "
 "depuis le dernier appui enregistré. Vous pouvez ajuster la longueur du délai "
diff --git a/engine/doc/translations/ga.po b/engine/doc/translations/ga.po
index 7fc4e8af..52e2c35d 100644
--- a/engine/doc/translations/ga.po
+++ b/engine/doc/translations/ga.po
@@ -70500,13 +70500,6 @@ msgstr ""
 "Suíomh colún an fheighlí laistigh den [LineEdit]. Nuair a bheidh sé "
 "socraithe, féadfaidh an téacs scrollú chun freastal air."
 
-msgid ""
-"If [code]true[/code], the [LineEdit] will always show the caret, even if "
-"focus is lost."
-msgstr ""
-"Más [code]true[/code], taispeánfaidh an [LineEdit] an feirm i gcónaí, fiú má "
-"chailltear an fócas."
-
 msgid ""
 "Allow moving caret, selecting and removing the individual composite character "
 "components.\n"
@@ -74958,13 +74951,6 @@ msgstr ""
 "Filleann íosleithead roghchláir dhomhanda.\n"
 "[b]Nóta:[/b] Is ar macOS amháin a chuirtear an modh seo i bhfeidhm."
 
-msgid ""
-"Returns global menu open callback.\n"
-"b]Note:[/b] This method is implemented only on macOS."
-msgstr ""
-"Filleann roghchlár domhanda aisghlao oscailte.\n"
-"b]Nóta:[/b] Is ar macOS amháin a chuirtear an modh seo i bhfeidhm."
-
 msgid ""
 "Returns global menu size.\n"
 "[b]Note:[/b] This method is implemented on macOS and Windows."
diff --git a/engine/doc/translations/it.po b/engine/doc/translations/it.po
index 1bb3feb7..bdf33caf 100644
--- a/engine/doc/translations/it.po
+++ b/engine/doc/translations/it.po
@@ -38,13 +38,14 @@
 # PinePunk16 <pinepunk16@gmail.com>, 2024.
 # Simone Lungarella <simonelungarella@gmail.com>, 2024.
 # Ott8v <Ott8v@users.noreply.hosted.weblate.org>, 2024.
-# Micky <micheledevita2@gmail.com>, 2024.
+# Micky <micheledevita2@gmail.com>, 2024, 2025.
 # Ludovico Cammarata <cammarataludvico9@gmail.com>, 2024.
+# Gabriele Ellena <kitzugaming2001@proton.me>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2024-11-27 20:00+0000\n"
+"PO-Revision-Date: 2025-03-15 11:27+0000\n"
 "Last-Translator: Micky <micheledevita2@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/it/>\n"
@@ -53,7 +54,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.9-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "All classes"
 msgstr "Tutte le classi"
@@ -298,9 +299,22 @@ msgstr ""
 msgid "Built-in GDScript constants, functions, and annotations."
 msgstr "Costanti, funzioni e annotazioni di GDScript integrate."
 
+msgid ""
+"A list of utility functions and annotations accessible from any script "
+"written in GDScript.\n"
+"For the list of global functions and constants that can be accessed in any "
+"scripting language, see [@GlobalScope]."
+msgstr ""
+"Una lista di funzioni di utilità e annotazioni, accessibili da qualsiasi "
+"script scritto in GDScript.\n"
+"Per la lista di funzioni e costanti globali vedi [@GlobalScope]."
+
 msgid "GDScript exports"
 msgstr "Esportazione GDScript"
 
+msgid "Use [method Color.from_rgba8] instead."
+msgstr "Utilizza invece [method Color.from_rgba8]."
+
 msgid ""
 "Returns a [Color] constructed from red ([param r8]), green ([param g8]), blue "
 "([param b8]), and optionally alpha ([param a8]) integer channels, each "
@@ -387,6 +401,23 @@ msgstr ""
 "[b]Note:[/b] [method assert] è una parola chiave, non una funzione. Perciò "
 "non puoi accedervi come un [Callable] o usarla all'interno di espressioni."
 
+msgid ""
+"Returns a single character (as a [String]) of the given Unicode code point "
+"(which is compatible with ASCII code).\n"
+"[codeblock]\n"
+"var upper = char(65)      # upper is \"A\"\n"
+"var lower = char(65 + 32) # lower is \"a\"\n"
+"var euro = char(8364)     # euro is \"€\"\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce un singolo carattere (come [String]) dal codice Unicode "
+"specificato (compatibile con il codice ASCII).\n"
+"[codeblock]\n"
+"var maiusc = char(65)      # maiusc è \"A\"\n"
+"var minusc = char(65 + 32) # minusc è \"a\"\n"
+"var euro = char(8364)    # euro è \"€\"\n"
+"[/codeblock]"
+
 msgid "Use [method @GlobalScope.type_convert] instead."
 msgstr "Usa [method @GlobalScope.type_convert] invece."
 
@@ -413,6 +444,13 @@ msgstr ""
 "print(b is Array) # Stampa false\n"
 "[/codeblock]"
 
+msgid ""
+"Consider using [method JSON.to_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Considera invece di utilizzare [method JSON.to_native] o [method Object."
+"get_property_list]."
+
 msgid ""
 "Converts a [param dictionary] (created with [method inst_to_dict]) back to an "
 "Object instance. Can be useful for deserializing."
@@ -471,6 +509,135 @@ msgstr ""
 "[b]Nota:[/b] Chiamare questa funzione da un [Thread] non è supportato. "
 "Facendolo verrà restituito un array vuoto."
 
+msgid ""
+"Consider using [method JSON.from_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Considera invece di utilizzare [method JSON.from_native] o [method Object."
+"get_property_list]."
+
+msgid ""
+"Returns the passed [param instance] converted to a Dictionary. Can be useful "
+"for serializing.\n"
+"[codeblock]\n"
+"var foo = \"bar\"\n"
+"func _ready():\n"
+"    var d = inst_to_dict(self)\n"
+"    print(d.keys())\n"
+"    print(d.values())\n"
+"[/codeblock]\n"
+"Prints out:\n"
+"[codeblock lang=text]\n"
+"[@subpath, @path, foo]\n"
+"[, res://test.gd, bar]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This function can only be used to serialize objects with an "
+"attached [GDScript] stored in a separate file. Objects without an attached "
+"script, with a script written in another language, or with a built-in script "
+"are not supported.\n"
+"[b]Note:[/b] This function is not recursive, which means that nested objects "
+"will not be represented as dictionaries. Also, properties passed by reference "
+"([Object], [Dictionary], [Array], and packed arrays) are copied by reference, "
+"not duplicated."
+msgstr ""
+"Restituisce l'istanza [param instance] convertita in un dizionario. Può "
+"essere utile per la serializzazione.\n"
+"[codeblock]\n"
+"var foo = \"bar\"\n"
+"func _ready():\n"
+"    var d = inst_to_dict(self)\n"
+"    print(d.keys())\n"
+"    print(d.values())\n"
+"[/codeblock]\n"
+"Stampa:\n"
+"[codeblock lang=text]\n"
+"[@subpath, @path, foo]\n"
+"[, res://test.gd, bar]\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Questa funzione può essere utilizzata solo per serializzare "
+"oggetti il quale [GDScript] allegato è memorizzato in un file separato. Gli "
+"oggetti senza uno script allegato, con uno script scritto in un altro "
+"linguaggio o con uno script integrato non sono supportati.\n"
+"[b]Nota:[/b] Questa funzione non è ricorsiva, il che significa che gli "
+"oggetti nidificati non saranno rappresentati come dizionari. Inoltre, le "
+"proprietà passate per riferimento ([Object], [Dictionary], [Array] e array "
+"impacchettati) vengono copiate per riferimento, non duplicate."
+
+msgid ""
+"Returns [code]true[/code] if [param value] is an instance of [param type]. "
+"The [param type] value must be one of the following:\n"
+"- A constant from the [enum Variant.Type] enumeration, for example [constant "
+"TYPE_INT].\n"
+"- An [Object]-derived class which exists in [ClassDB], for example [Node].\n"
+"- A [Script] (you can use any class, including inner one).\n"
+"Unlike the right operand of the [code]is[/code] operator, [param type] can be "
+"a non-constant value. The [code]is[/code] operator supports more features "
+"(such as typed arrays). Use the operator instead of this method if you do not "
+"need dynamic type checking.\n"
+"[b]Examples:[/b]\n"
+"[codeblock]\n"
+"print(is_instance_of(a, TYPE_INT))\n"
+"print(is_instance_of(a, Node))\n"
+"print(is_instance_of(a, MyClass))\n"
+"print(is_instance_of(a, MyClass.InnerClass))\n"
+"[/codeblock]\n"
+"[b]Note:[/b] If [param value] and/or [param type] are freed objects (see "
+"[method @GlobalScope.is_instance_valid]), or [param type] is not one of the "
+"above options, this method will raise a runtime error.\n"
+"See also [method @GlobalScope.typeof], [method type_exists], [method Array."
+"is_same_typed] (and other [Array] methods)."
+msgstr ""
+"Restituisce [code]true[/code] se [param value] è un'istanza del tipo [param "
+"type]. Il valore [param type] deve essere uno dei seguenti:\n"
+"- Una costante dall'enumerazione [enum Variant.Type], per esempio "
+"[TYPE_INT].\n"
+"- Una classe derivante da [Object] che esiste in [ClassDB], per esempio "
+"[Node].\n"
+"- Uno [Script] (è possibile utilizzare qualsiasi classe, comprese quelle "
+"interne).\n"
+"A differenza dell'operando destro dell'operatore [code]is[/code], [param "
+"type] può essere un valore non costante. L'operatore [code]is[/code] supporta "
+"più funzionalità (ad esempio array tipizzati). Utilizza l'operatore invece di "
+"questo metodo se non hai bisogno di verificare il tipo dinamicamente.\n"
+"[b]Esempi:[/b]\n"
+"[codeblock]\n"
+"print(is_instance_of(a, TYPE_INT))\n"
+"print(is_instance_of(a, Node))\n"
+"print(is_instance_of(a, MyClass))\n"
+"print(is_instance_of(a, MyClass.InnerClass))\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Se [param value] e/o [param type] sono oggetti liberati (vedi "
+"[method @GlobalScope.is_instance_valid]), o [param type] non è una delle "
+"opzioni precedenti, questo metodo genererà un errore durante l'esecuzione.\n"
+"Vedi anche [method @GlobalScope.typeof], [method type_exists], [method Array."
+"is_same_typed] (e altri metodi di [Array])."
+
+msgid ""
+"Returns the length of the given Variant [param var]. The length can be the "
+"character count of a [String] or [StringName], the element count of any array "
+"type, or the size of a [Dictionary]. For every other Variant type, a run-time "
+"error is generated and execution is stopped.\n"
+"[codeblock]\n"
+"var a = [1, 2, 3, 4]\n"
+"len(a) # Returns 4\n"
+"\n"
+"var b = \"Hello!\"\n"
+"len(b) # Returns 6\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce la lunghezza del [Variant] [param var]. La lunghezza può essere "
+"il numero dei caratteri di una [String] o [StringName], il numero degli "
+"elementi di un tipo di array, o la dimensione di un [Dictionary]. Per ogni "
+"altro tipo di [Variant], un errore verrà generato e l'esecuzione verrà "
+"interrotta.\n"
+"[codeblock]\n"
+"var a = [1, 2, 3, 4]\n"
+"len(a) # Restituisce 4\n"
+"\n"
+"var b = \"Ciao!\"\n"
+"len(b) # Restituisce 6\n"
+"[/codeblock]"
+
 msgid ""
 "Returns a [Resource] from the filesystem located at [param path]. During run-"
 "time, the resource is loaded when the script is being parsed. This function "
@@ -552,6 +719,105 @@ msgstr ""
 "[b]Nota:[/b] Chiamare questa funzione da un [Thread] non è supportato. "
 "Facendolo invece stamperà l'ID del thread."
 
+msgid ""
+"Returns an array with the given range. [method range] can be called in three "
+"ways:\n"
+"[code]range(n: int)[/code]: Starts from 0, increases by steps of 1, and stops "
+"[i]before[/i] [code]n[/code]. The argument [code]n[/code] is [b]exclusive[/"
+"b].\n"
+"[code]range(b: int, n: int)[/code]: Starts from [code]b[/code], increases by "
+"steps of 1, and stops [i]before[/i] [code]n[/code]. The arguments [code]b[/"
+"code] and [code]n[/code] are [b]inclusive[/b] and [b]exclusive[/b], "
+"respectively.\n"
+"[code]range(b: int, n: int, s: int)[/code]: Starts from [code]b[/code], "
+"increases/decreases by steps of [code]s[/code], and stops [i]before[/i] "
+"[code]n[/code]. The arguments [code]b[/code] and [code]n[/code] are "
+"[b]inclusive[/b] and [b]exclusive[/b], respectively. The argument [code]s[/"
+"code] [b]can[/b] be negative, but not [code]0[/code]. If [code]s[/code] is "
+"[code]0[/code], an error message is printed.\n"
+"[method range] converts all arguments to [int] before processing.\n"
+"[b]Note:[/b] Returns an empty array if no value meets the value constraint (e."
+"g. [code]range(2, 5, -1)[/code] or [code]range(5, 5, 1)[/code]).\n"
+"[b]Examples:[/b]\n"
+"[codeblock]\n"
+"print(range(4))        # Prints [0, 1, 2, 3]\n"
+"print(range(2, 5))     # Prints [2, 3, 4]\n"
+"print(range(0, 6, 2))  # Prints [0, 2, 4]\n"
+"print(range(4, 1, -1)) # Prints [4, 3, 2]\n"
+"[/codeblock]\n"
+"To iterate over an [Array] backwards, use:\n"
+"[codeblock]\n"
+"var array = [3, 6, 9]\n"
+"for i in range(array.size() - 1, -1, -1):\n"
+"    print(array[i])\n"
+"[/codeblock]\n"
+"Output:\n"
+"[codeblock lang=text]\n"
+"9\n"
+"6\n"
+"3\n"
+"[/codeblock]\n"
+"To iterate over [float], convert them in the loop.\n"
+"[codeblock]\n"
+"for i in range (3, 0, -1):\n"
+"    print(i / 10.0)\n"
+"[/codeblock]\n"
+"Output:\n"
+"[codeblock lang=text]\n"
+"0.3\n"
+"0.2\n"
+"0.1\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce un array contenente l'intervallo fornito. [method range] può "
+"essere chiamato in tre modi:\n"
+"[code]range(n:int)[/code]: Parte da 0, incrementa di 1 a ogni passaggio, e si "
+"ferma [i]prima di[/i][code]n[/code]. L'argomento [code]n[/code] è "
+"[b]esclusivo[/b].\n"
+"[code]range(b: int, n: int)[/code]: Parte da [code]b[/code], incrementa di 1 "
+"a ogni passaggio, e si ferma [i]prima[/i] di [code]n[/code]. Gli argomenti "
+"[code]b[/code] e [code]n[/code] sono, rispettivamente, [b]inclusivo[/b] ed "
+"[b]esclusivo[/b].\n"
+"[code]range(b: int, n: int, s: int)[/code]: Parte da [code]b[/code], aumenta/"
+"diminuisce di [code]s[/code] a ogni passaggio, e si ferma [i]prima[/i] di "
+"[code]n[/code]. Gli argomenti [code]b[/code] e [code]n[/code] sono, "
+"rispettivamente, [b]inclusivi[/b] ed [b]esclusivi[/b]. L'argomento [code]s[/"
+"code] [b]può[/b] essere negativo, ma non [code]0[/code]. Se [code]s[/code] è "
+"[code]0[/code], un messaggio di errore verrà stampato.\n"
+"[method range] converte tutti gli argomenti a [int] prima di elaborarli.\n"
+"[b]Nota:[/b] Restituisce un array vuoto se nessun valore soddisfa i requisiti "
+"(es. [code]range(2, 5, -1)[/code] or [code]range(5, 5, 1)[/code]).\n"
+"[b]Esempi:[/b]\n"
+"[codeblock]\n"
+"print(range(4))        # Stampa [0, 1, 2, 3]\n"
+"print(range(2, 5))     # Stampa [2, 3, 4]\n"
+"print(range(0, 6, 2))  # Stampa [0, 2, 4]\n"
+"print(range(4, 1, -1)) # Stampa [4, 3, 2]\n"
+"[/codeblock]\n"
+"Per iterare su un [Array] all'indietro, usa:\n"
+"[codeblock]\n"
+"var array = [3, 6, 9]\n"
+"for i in range(array.size(), 0, -1):\n"
+"    print(array[i - 1])\n"
+"[/codeblock]\n"
+"Risultato:\n"
+"[codeblock]\n"
+"9\n"
+"6\n"
+"3\n"
+"[/codeblock]\n"
+"Per iterare su un [float], convertili nel ciclo.\n"
+"[codeblock]\n"
+"for i in range (3, 0, -1):\n"
+"    print(i / 10.0)\n"
+"[/codeblock]\n"
+"Risultato:\n"
+"[codeblock lang=text]\n"
+"0.3\n"
+"0.2\n"
+"0.1\n"
+"[/codeblock]"
+
 msgid ""
 "Returns [code]true[/code] if the given [Object]-derived class exists in "
 "[ClassDB]. Note that [Variant] data types are not registered in [ClassDB].\n"
@@ -1388,6 +1654,203 @@ msgstr ""
 "@export var c: int # Memorizzato nel file, visualizzato nell'editor.\n"
 "[/codeblock]"
 
+msgid ""
+"Define a new subgroup for the following exported properties. This helps to "
+"organize properties in the Inspector dock. Subgroups work exactly like "
+"groups, except they need a parent group to exist. See [annotation "
+"@export_group].\n"
+"See also [constant PROPERTY_USAGE_SUBGROUP].\n"
+"[codeblock]\n"
+"@export_group(\"Racer Properties\")\n"
+"@export var nickname = \"Nick\"\n"
+"@export var age = 26\n"
+"\n"
+"@export_subgroup(\"Car Properties\", \"car_\")\n"
+"@export var car_label = \"Speedy\"\n"
+"@export var car_number = 3\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Subgroups cannot be nested, but you can use the slash separator "
+"([code]/[/code]) to achieve the desired effect:\n"
+"[codeblock]\n"
+"@export_group(\"Car Properties\")\n"
+"@export_subgroup(\"Wheels\", \"wheel_\")\n"
+"@export_subgroup(\"Wheels/Front\", \"front_wheel_\")\n"
+"@export var front_wheel_strength = 10\n"
+"@export var front_wheel_mobility = 5\n"
+"@export_subgroup(\"Wheels/Rear\", \"rear_wheel_\")\n"
+"@export var rear_wheel_strength = 8\n"
+"@export var rear_wheel_mobility = 3\n"
+"@export_subgroup(\"Wheels\", \"wheel_\")\n"
+"@export var wheel_material: PhysicsMaterial\n"
+"[/codeblock]"
+msgstr ""
+"Definire un nuovo sottogruppo per le seguenti proprietà esportate. Questo "
+"aiuta a organizzare le proprietà nel pannello dell'ispettore. I sottogruppi "
+"funzionano esattamente come i gruppi, tranne che hanno bisogno di un gruppo "
+"genitore per esistere. Vedi [annotation @export_group].\n"
+"Vedi anche [constant PROPERTY_USAGE_SUBGROUP].\n"
+"[codeblock]\n"
+"@export_group(\"Propertà del pilota\")\n"
+"@export var nickname = \"Nick\"\n"
+"@export var age = 26\n"
+"\n"
+"@export_subgroup(\"Proprietà dell'auto\", \"car_\")\n"
+"@export var car_label = \"Speedy\"\n"
+"@export var car_number = 3\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] I sottogruppi non possono essere annidati, ma è possibile usare "
+"il separatore barra ([code]/[/code]) per ottenere l'effetto desiderato:\n"
+"[codeblock]\n"
+"@export_group(\"Proprietà dell'auto\")\n"
+"@export_subgroup(\"Ruote\", \"ruota_\")\n"
+"@export_subgroup(\"Ruote/Avanti\", \"ruota_avanti_\")\n"
+"@export var ruota_avanti_forza= 10\n"
+"@export var ruota_avanti_mobilità = 5\n"
+"@export_subgroup(\"Ruote/Dietro\", \"ruota_dietro_\")\n"
+"@export var ruota_dietro_forza = 8\n"
+"@export var ruota_dietro_mobilità = 3\n"
+"@export_subgroup(\"Ruota\", \"ruota_\")\n"
+"@export var ruota_materiale: PhysicsMaterial\n"
+"[/codeblock]"
+
+msgid ""
+"Export a [Callable] property as a clickable button with the label [param "
+"text]. When the button is pressed, the callable is called.\n"
+"If [param icon] is specified, it is used to fetch an icon for the button via "
+"[method Control.get_theme_icon], from the [code]\"EditorIcons\"[/code] theme "
+"type. If [param icon] is omitted, the default [code]\"Callable\"[/code] icon "
+"is used instead.\n"
+"Consider using the [EditorUndoRedoManager] to allow the action to be reverted "
+"safely.\n"
+"See also [constant PROPERTY_HINT_TOOL_BUTTON].\n"
+"[codeblock]\n"
+"@tool\n"
+"extends Sprite2D\n"
+"\n"
+"@export_tool_button(\"Hello\") var hello_action = hello\n"
+"@export_tool_button(\"Randomize the color!\", \"ColorRect\")\n"
+"var randomize_color_action = randomize_color\n"
+"\n"
+"func hello():\n"
+"    print(\"Hello world!\")\n"
+"\n"
+"func randomize_color():\n"
+"    var undo_redo = EditorInterface.get_editor_undo_redo()\n"
+"    undo_redo.create_action(\"Randomized Sprite2D Color\")\n"
+"    undo_redo.add_do_property(self, &\"self_modulate\", Color(randf(), "
+"randf(), randf()))\n"
+"    undo_redo.add_undo_property(self, &\"self_modulate\", self_modulate)\n"
+"    undo_redo.commit_action()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] The property is exported without the [constant "
+"PROPERTY_USAGE_STORAGE] flag because a [Callable] cannot be properly "
+"serialized and stored in a file.\n"
+"[b]Note:[/b] In an exported project neither [EditorInterface] nor "
+"[EditorUndoRedoManager] exist, which may cause some scripts to break. To "
+"prevent this, you can use [method Engine.get_singleton] and omit the static "
+"type from the variable declaration:\n"
+"[codeblock]\n"
+"var undo_redo = Engine.get_singleton(&\"EditorInterface\")."
+"get_editor_undo_redo()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Avoid storing lambda callables in member variables of "
+"[RefCounted]-based classes (e.g. resources), as this can lead to memory "
+"leaks. Use only method callables and optionally [method Callable.bind] or "
+"[method Callable.unbind]."
+msgstr ""
+"Esporta una proprietà [Callable] come pulsante cliccabile con l'etichetta "
+"[param text]. Quando il pulsante viene premuto, il chiamabile viene "
+"chiamato.\n"
+"Se [param icon] è specificato, viene utilizzato per recuperare un'icona per "
+"il pulsante tramite [method Control.get_theme_icon], dal tipo di tema "
+"[code]\"EditorIcons\"[/code]. Se [param icon] viene omesso, viene utilizzata "
+"l'icona predefinita [code]\"Callable\"[/code].\n"
+"Considera di usare [EditorUndoRedoManager] per prevedere l'annullamento "
+"sicuro dell'azione.\n"
+"Vedi anche [constant PROPERTY_HINT_TOOL_BUTTON].\n"
+"[codeblock]\n"
+"@tool\n"
+"extends Sprite2D\n"
+"\n"
+"@export_tool_button(\"Ciao\") var azione_ciao = ciao\n"
+"@export_tool_button(\"Randomizza il colore!\", \"ColorRect\")\n"
+"var azione_randomizza_colore = randomizza_colore\n"
+"\n"
+"func ciao():\n"
+"    print(\"Ciao mondo!\")\n"
+"\n"
+"func randomizza_colore():\n"
+"    var undo_redo = EditorInterface.get_editor_undo_redo()\n"
+"    undo_redo.create_action(\"Colore di Sprite2D randomizzato\")\n"
+"    undo_redo.add_do_property(self, &\"self_modulate\", Color(randf(), "
+"randf(), randf()))\n"
+"    undo_redo.add_undo_property(self, &\"self_modulate\", self_modulate)\n"
+"    undo_redo.commit_action()\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] La proprietà è esportata senza il flag [constant "
+"PROPERTY_USAGE_STORAGE] perché un [Callable] non può essere serializzato "
+"correttamente e memorizzato in un file.\n"
+"[b]Nota:[/b] In un progetto esportato non esistono né [EditorInterface] né "
+"[EditorUndoRedoManager], il che potrebbe causare alcuni script a non "
+"funzionare correttamente. Per evitare ciò, è possibile usare [method Engine."
+"get_singleton] e omettere il tipo statico dalla dichiarazione della "
+"variabile:\n"
+"[codeblock]\n"
+"var undo_redo = Engine.get_singleton(&\"EditorInterface\")."
+"get_editor_undo_redo()\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Evita di memorizzare i chiamabili lambda nelle variabili membro "
+"delle classi basate su [RefCounted] (ad esempio risorse), poiché ciò può "
+"causare perdite di memoria. Utilizza solo i chiamabili da metodi e "
+"facoltativamente [method Callable.bind] o [method Callable.unbind]."
+
+msgid ""
+"Add a custom icon to the current script. The icon specified at [param "
+"icon_path] is displayed in the Scene dock for every node of that class, as "
+"well as in various editor dialogs.\n"
+"[codeblock]\n"
+"@icon(\"res://path/to/class/icon.svg\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Only the script can have a custom icon. Inner classes are not "
+"supported.\n"
+"[b]Note:[/b] As annotations describe their subject, the [annotation @icon] "
+"annotation must be placed before the class definition and inheritance.\n"
+"[b]Note:[/b] Unlike most other annotations, the argument of the [annotation "
+"@icon] annotation must be a string literal (constant expressions are not "
+"supported)."
+msgstr ""
+"Aggiunge un'icona personalizzata allo script attuale. L'icona specificata dal "
+"percorso [param icon_path] viene visualizzata nel pannello di Scena per ogni "
+"nodo di quella classe, così come in varie finestre di dialogo dell'editor.\n"
+"[codeblock]\n"
+"@icon(\"res://path/to/class/icon.svg\")\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Solo lo script può avere un'icona personalizzata. Le classi "
+"interne non sono supportate.\n"
+"[b]Nota:[/b] Poiché le annotazioni descrivono il loro soggetto, l'annotazione "
+"[annotation @icon] deve essere posta prima della definizione di classe e di "
+"eredità.\n"
+"[b]Nota:[/b] A differenza di altre annotazioni, l'argomento dell'annotazione "
+"[annotation @icon] deve essere una stringa letterale (le espressioni costanti "
+"non sono supportate)."
+
+msgid ""
+"Mark the following property as assigned when the [Node] is ready. Values for "
+"these properties are not assigned immediately when the node is initialized "
+"([method Object._init]), and instead are computed and stored right before "
+"[method Node._ready].\n"
+"[codeblock]\n"
+"@onready var character_name = $Label\n"
+"[/codeblock]"
+msgstr ""
+"Segna la proprietà seguente come assegnata quando il nodo è pronto. I valori "
+"per queste proprietà non vengono assegnati immediatamente quando il nodo "
+"viene inizializzato ([method Object._init]), e invece vengono calcolati e "
+"memorizzati subito prima di [method Node._ready].\n"
+"[codeblock]\n"
+"@onready var nome_personaggio = $Label\n"
+"[/codeblock]"
+
 msgid ""
 "Mark the following method for remote procedure calls. See [url=$DOCS_URL/"
 "tutorials/networking/high_level_multiplayer.html]High-level multiplayer[/"
@@ -1514,9 +1977,106 @@ msgstr ""
 "[annotation @tool] deve essere posta prima della definizione e di classe e di "
 "eredità."
 
+msgid ""
+"Mark the following statement to ignore the specified [param warning]. See "
+"[url=$DOCS_URL/tutorials/scripting/gdscript/warning_system.html]GDScript "
+"warning system[/url].\n"
+"[codeblock]\n"
+"func test():\n"
+"    print(\"hello\")\n"
+"    return\n"
+"    @warning_ignore(\"unreachable_code\")\n"
+"    print(\"unreachable\")\n"
+"[/codeblock]\n"
+"See also [annotation @warning_ignore_start] and [annotation "
+"@warning_ignore_restore]."
+msgstr ""
+"Segna la seguente dichiarazione per ignorare l'avviso specificato da [param "
+"warning]. Vedi [url=$DOCS_URL/tutorials/scripting/gdscript/warning_system."
+"html]Sistema di avvisi di GDScript[/url].\n"
+"[codeblock]\n"
+"func test():\n"
+"    print(\"ciao\")\n"
+"    return\n"
+"    @warning_ignore(\"unreachable_code\")\n"
+"    print(\"non raggiungibile\")\n"
+"[/codeblock]\n"
+"Vedi anche [annotation @warning_ignore_start] and [annotation "
+"@warning_ignore_restore]."
+
+msgid ""
+"Stops ignoring the listed warning types after [annotation "
+"@warning_ignore_start]. Ignoring the specified warning types will be reset to "
+"Project Settings. This annotation can be omitted to ignore the warning types "
+"until the end of the file.\n"
+"[b]Note:[/b] Unlike most other annotations, arguments of the [annotation "
+"@warning_ignore_restore] annotation must be string literals (constant "
+"expressions are not supported)."
+msgstr ""
+"Smette di ignorare i tipi di avviso elencati dopo [annotation "
+"@warning_ignore_start]. Ciò sarà reimpostato sulle Impostazioni del progetto. "
+"È possibile omettere questa annotazione per ignorare i tipi di avviso fino "
+"alla fine del file.\n"
+"[b]Nota:[/b] A differenza della maggior parte delle altre annotazioni, gli "
+"argomenti dell'annotazione [annotation @warning_ignore_restore] devono essere "
+"stringhe letterali (le espressioni costanti non sono supportate)."
+
+msgid ""
+"Starts ignoring the listed warning types until the end of the file or the "
+"[annotation @warning_ignore_restore] annotation with the given warning type.\n"
+"[codeblock]\n"
+"func test():\n"
+"    var a = 1 # Warning (if enabled in the Project Settings).\n"
+"    @warning_ignore_start(\"unused_variable\")\n"
+"    var b = 2 # No warning.\n"
+"    var c = 3 # No warning.\n"
+"    @warning_ignore_restore(\"unused_variable\")\n"
+"    var d = 4 # Warning (if enabled in the Project Settings).\n"
+"[/codeblock]\n"
+"[b]Note:[/b] To suppress a single warning, use [annotation @warning_ignore] "
+"instead.\n"
+"[b]Note:[/b] Unlike most other annotations, arguments of the [annotation "
+"@warning_ignore_start] annotation must be string literals (constant "
+"expressions are not supported)."
+msgstr ""
+"Comincia a ignorare i tipi di avviso elencati fino alla fine del file o "
+"dell'annotazione [annotation @warning_ignore_restore] con il tipo di avviso "
+"specificato.\n"
+"[codeblock]\n"
+"func test():\n"
+"    var a = 1 # Avviso (se abilitato nelle Impostazioni del progetto).\n"
+"    @warning_ignore_start(\"unused_variable\")\n"
+"    var b = 2 # Nessun avviso.\n"
+"    var c = 3 # Nessun avviso.\n"
+"    @warning_ignore_restore(\"unused_variable\")\n"
+"    var d = 4 # Avviso (se abilitato nelle Impostazioni del progetto).\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Per sopprimere un singolo avviso, usa invece [annotation "
+"@warning_ignore].\n"
+"[b]Nota:[/b] A differenza della maggior parte delle altre annotazioni, gli "
+"argomenti dell'annotazione [annotation @warning_ignore_restore] devono essere "
+"stringhe letterali (le espressioni costanti non sono supportate)."
+
 msgid "Global scope constants and functions."
 msgstr "Costanti e funzioni di ambito globale."
 
+msgid ""
+"A list of global scope enumerated constants and built-in functions. This is "
+"all that resides in the globals, constants regarding error codes, keycodes, "
+"property hints, etc.\n"
+"Singletons are also documented here, since they can be accessed from "
+"anywhere.\n"
+"For the entries that can only be accessed from scripts written in GDScript, "
+"see [@GDScript]."
+msgstr ""
+"Una lista di costanti enumerate e funzioni di ambito globale. Questo è tutto "
+"ciò che risiede nei globali, le costanti riguardano gli errori di codice, "
+"keycode, suggerimenti di proprietà, ecc...\n"
+"Anche i singleton sono documentati qui, visto che sono accessibili da "
+"ovunque.\n"
+"Per le voci a cui è possibile accedere da ogni script scritto in GDScript, "
+"vedi [@GDScript]."
+
 msgid "Random number generation"
 msgstr "Generazione di numeri casuali"
 
@@ -1646,6 +2206,17 @@ msgstr ""
 "var b = acosh(-1) # Restituisce 0\n"
 "[/codeblock]"
 
+msgid ""
+"Returns the difference between the two angles (in radians), in the range of "
+"[code][-PI, +PI][/code]. When [param from] and [param to] are opposite, "
+"returns [code]-PI[/code] if [param from] is smaller than [param to], or "
+"[code]PI[/code] otherwise."
+msgstr ""
+"Restituisce la differenza tra i due angoli (in radianti), nell'intervallo "
+"[code][-PI, +PI][/code]. Quando [param from] e [param to] sono opposti, "
+"restituisce [code]-PI[/code] se [param from] è minore di [param to], o "
+"[code]PI[/code] altrimenti."
+
 msgid ""
 "Returns the arc sine of [param x] in radians. Use to get the angle of sine "
 "[param x]. [param x] will be clamped between [code]-1.0[/code] and [code]1.0[/"
@@ -2003,6 +2574,61 @@ msgstr ""
 "var r = deg_to_rad(180) # r è 3.141593\n"
 "[/codeblock]"
 
+msgid ""
+"Returns an \"eased\" value of [param x] based on an easing function defined "
+"with [param curve]. This easing function is based on an exponent. The [param "
+"curve] can be any floating-point number, with specific values leading to the "
+"following behaviors:\n"
+"[codeblock lang=text]\n"
+"- Lower than -1.0 (exclusive): Ease in-out\n"
+"- -1.0: Linear\n"
+"- Between -1.0 and 0.0 (exclusive): Ease out-in\n"
+"- 0.0: Constant\n"
+"- Between 0.0 to 1.0 (exclusive): Ease out\n"
+"- 1.0: Linear\n"
+"- Greater than 1.0 (exclusive): Ease in\n"
+"[/codeblock]\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"ease_cheatsheet.png]ease() curve values cheatsheet[/url]\n"
+"See also [method smoothstep]. If you need to perform more advanced "
+"transitions, use [method Tween.interpolate_value]."
+msgstr ""
+"Restituisce un valore \"allentato\" di [param x] basato su una funzione di "
+"allentamento definita con [param curve]. Questa funzione è basata su un "
+"esponente. [param curve] può essere qualunque numero decimale, con valori "
+"specifici che portano ai seguenti comportamenti:\n"
+"[codeblock lang=text]\n"
+"- Minore di -1.0 (esclusi): Ease in-out\n"
+"- 1.0: Lineare\n"
+"- Compreso tra -1.0 and 0.0 (esclusi): Ease out-in\n"
+"- 0.0: Costante\n"
+"- Compreso tra 0.0 to 1.0 (esclusi): Ease in\n"
+"- 1.0: Lineare\n"
+"- Maggiore di 1.0 (esclusi): Ease out\n"
+"[/codeblock]\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"ease_cheatsheet.png]cheatsheet per i valori di curva di ease()[/url]\n"
+"Vedi anche [method smoothstep]. Se hai bisogno di eseguire transizioni più "
+"avanzate, usa [Tween.interpolate_value]."
+
+msgid ""
+"Returns a human-readable name for the given [enum Error] code.\n"
+"[codeblock]\n"
+"print(OK)                              # Prints 0\n"
+"print(error_string(OK))                # Prints \"OK\"\n"
+"print(error_string(ERR_BUSY))          # Prints \"Busy\"\n"
+"print(error_string(ERR_OUT_OF_MEMORY)) # Prints \"Out of memory\"\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce un nome leggibile in chiaro per il codice di errore ([enum "
+"Error]) indicato.\n"
+"[codeblock]\n"
+"print(OK)                              # Stampa 0\n"
+"print(error_string(OK))                # Stampa \"OK\"\n"
+"print(error_string(ERR_BUSY))          # Stampa \"Busy\"\n"
+"print(error_string(ERR_OUT_OF_MEMORY)) # Stampa \"Out of memory\"\n"
+"[/codeblock]"
+
 msgid ""
 "The natural exponential function. It raises the mathematical constant [i]e[/"
 "i] to the power of [param x] and returns it.\n"
@@ -2147,6 +2773,60 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Returns the [Object] that corresponds to [param instance_id]. All Objects "
+"have a unique instance ID. See also [method Object.get_instance_id].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var drink = \"water\"\n"
+"\n"
+"func _ready():\n"
+"    var id = get_instance_id()\n"
+"    var instance = instance_from_id(id)\n"
+"    print(instance.foo) # Prints \"water\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"    public string Drink { get; set; } = \"water\";\n"
+"\n"
+"    public override void _Ready()\n"
+"    {\n"
+"        ulong id = GetInstanceId();\n"
+"        var instance = (MyNode)InstanceFromId(Id);\n"
+"        GD.Print(instance.Drink); // Prints \"water\"\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce l'istanza di [Object] che corrisponde a [param instance_id]. "
+"Tutti gli oggetti hanno un ID univoco d'istanza. Vedi anche [method Object."
+"get_instance_id].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var bevanda = \"acqua\"\n"
+"\n"
+"func _ready():\n"
+"    var id = get_instance_id()\n"
+"    var inst = instance_from_id(id)\n"
+"    print(inst.bevanda) # Stampa \"acqua\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"    public string Bevanda { get; set; } = \"acqua\";\n"
+"\n"
+"    public override void _Ready()\n"
+"    {\n"
+"        ulong id = GetInstanceId();\n"
+"        var inst = (MyNode)InstanceFromId(Id);\n"
+"        GD.Print(inst.Bevanda); // Stampa \"acqua\"\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns an interpolation or extrapolation factor considering the range "
 "specified in [param from] and [param to], and the interpolated value "
@@ -2227,7 +2907,7 @@ msgid ""
 msgstr ""
 "Restituisce [code]true[/code] se l'oggetto che corrisponde a [param id] è un "
 "oggetto valido (ad esempio, non è stato eliminato dalla memoria). Tutti gli "
-"oggetti hanno un ID unico di istanza."
+"oggetti hanno un ID univoco d'istanza."
 
 msgid ""
 "Returns [code]true[/code] if [param instance] is a valid Object (e.g. has not "
@@ -2313,6 +2993,48 @@ msgstr ""
 "Questo metodo è più veloce di [method is_equal_approx] con uno dei valori "
 "impostati a zero."
 
+msgid ""
+"Linearly interpolates between two values by the factor defined in [param "
+"weight]. To perform interpolation, [param weight] should be between "
+"[code]0.0[/code] and [code]1.0[/code] (inclusive). However, values outside "
+"this range are allowed and can be used to perform [i]extrapolation[/i]. If "
+"this is not desired, use [method clampf] to limit [param weight].\n"
+"Both [param from] and [param to] must be the same type. Supported types: "
+"[int], [float], [Vector2], [Vector3], [Vector4], [Color], [Quaternion], "
+"[Basis], [Transform2D], [Transform3D].\n"
+"[codeblock]\n"
+"lerp(0, 4, 0.75) # Returns 3.0\n"
+"[/codeblock]\n"
+"See also [method inverse_lerp] which performs the reverse of this operation. "
+"To perform eased interpolation with [method lerp], combine it with [method "
+"ease] or [method smoothstep]. See also [method remap] to map a continuous "
+"series of values to another.\n"
+"[b]Note:[/b] For better type safety, use [method lerpf], [method Vector2."
+"lerp], [method Vector3.lerp], [method Vector4.lerp], [method Color.lerp], "
+"[method Quaternion.slerp], [method Basis.slerp], [method Transform2D."
+"interpolate_with], or [method Transform3D.interpolate_with]."
+msgstr ""
+"Interpola linearmente tra due valori con un fattore definito in [param "
+"weight]. Per interpolare, [param weight] dovrebbe rimanere tra [code]0.0[/"
+"code] e [code]1.0[/code] (inclusi). Tuttavia, i valori al di fuori di questo "
+"intervallo sono consentiti e possono essere utilizzati per eseguire "
+"un'[i]estrapolazione[/i]. Se non è desiderato, utilizza [method clamp] sul "
+"risultato di questa funzione.\n"
+"Sia [param from] che [param to] devono essere dello stesso tipo. I tipi "
+"supported sono: [int], [float], [Vector2], [Vector3], [Vector4], [Color], "
+"[Quaternion], [Basis], [Transform2D], [Transform3D].\n"
+"[codeblock]\n"
+"lerp(0, 4, 0.75) # Restituisce 3.0\n"
+"[/codeblock]\n"
+"Vedi anche [method inverse_lerp] che esegue l'inverso di questa operazione. "
+"Per eseguire un'interpolazione alleggerita con [method lerp], combinalo con "
+"[method ease] o [method smoothstep]. Vedi anche [method remap] per mappare "
+"una serie continua di valori a un altra.\n"
+"[b]Nota:[/b] Per migliore sicurezza di tipo, usa [method lerpf], [method "
+"Vector2.lerp], [method Vector3.lerp], [method Vector4.lerp], [method Color."
+"lerp], [method Quaternion.slerp], [method Basis.slerp], [method Transform2D."
+"interpolate_with], o [method Transform3D.interpolate_with]."
+
 msgid ""
 "Linearly interpolates between two angles (in radians) by a [param weight] "
 "value between 0.0 and 1.0.\n"
@@ -2383,6 +3105,27 @@ msgstr ""
 "Per eseguire un'interpolazione alleggerita con [method lerp], combinalo con "
 "[method ease] o [method smoothstep]."
 
+msgid ""
+"Converts from linear energy to decibels (audio). Since volume is not normally "
+"linear, this can be used to implement volume sliders that behave as "
+"expected.\n"
+"[b]Example:[/b] Change the Master bus's volume through a [Slider] node, which "
+"ranges from [code]0.0[/code] to [code]1.0[/code]:\n"
+"[codeblock]\n"
+"AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"Master\"), "
+"linear_to_db($Slider.value))\n"
+"[/codeblock]"
+msgstr ""
+"Converte da energia lineare in decibel (audio). Siccome il volume non è "
+"lineare, può essere usato per implementare gli slider del volume che si "
+"comportano come ci si aspetta.\n"
+"[b]Esempio:[/b] Modifica il volume del bus Master tramite un nodo [Slider], "
+"che va da [code]0.0[/code] a [code]1.0[/code]:\n"
+"[codeblock]\n"
+"AudioServer.set_bus_volume_db(AudioServer.get_bus_index(\"Master\"), "
+"linear_to_db($Slider.value))\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the [url=https://en.wikipedia.org/wiki/Natural_logarithm]natural "
 "logarithm[/url] of [param x] (base [url=https://en.wikipedia.org/wiki/"
@@ -2655,6 +3398,119 @@ msgstr ""
 "pow(4, 1.5) # Restituisce 8.0\n"
 "[/codeblock]"
 
+msgid ""
+"Converts one or more arguments of any type to string in the best way possible "
+"and prints them to the console.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var a = [1, 2, 3]\n"
+"print(\"a\", \"b\", a) # Prints \"ab[1, 2, 3]\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array a = [1, 2, 3];\n"
+"GD.Print(\"a\", \"b\", a); // Prints \"ab[1, 2, 3]\"\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Consider using [method push_error] and [method push_warning] to "
+"print error and warning messages instead of [method print] or [method "
+"print_rich]. This distinguishes them from print messages used for debugging "
+"purposes, while also displaying a stack trace when an error or warning is "
+"printed. See also [member Engine.print_to_stdout] and [member ProjectSettings."
+"application/run/disable_stdout]."
+msgstr ""
+"Converte uno o più argomenti di qualunque tipo in una stringa e li stampa "
+"nella console.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var a = [1, 2, 3]\n"
+"print(\"a\", \"b\", a) # Stampa \"ab[1, 2, 3]\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var a = new Godot.Collections.Array { 1, 2, 3 };\n"
+"GD.Print(\"a\", \"b\", a); // Stampa \"ab[1, 2, 3]\"\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Valuta l'utilizzo di [method push_error] e [method push_warning] "
+"per stampare messaggi di errore e di avviso invece di utilizzare [method "
+"print]. Questo consente di distinguerli dai messaggi di debug, mostrando "
+"inoltre uno stack trace quando viene stampato un errore o un'avviso. Vedi "
+"anche [member Engine.print_to_stdout] e [member ProjectSettings.application/"
+"run/disable_stdout]."
+
+msgid ""
+"Converts one or more arguments of any type to string in the best way possible "
+"and prints them to the console.\n"
+"The following BBCode tags are supported: [code]b[/code], [code]i[/code], "
+"[code]u[/code], [code]s[/code], [code]indent[/code], [code]code[/code], "
+"[code]url[/code], [code]center[/code], [code]right[/code], [code]color[/"
+"code], [code]bgcolor[/code], [code]fgcolor[/code].\n"
+"URL tags only support URLs wrapped by a URL tag, not URLs with a different "
+"title.\n"
+"When printing to standard output, the supported subset of BBCode is converted "
+"to ANSI escape codes for the terminal emulator to display. Support for ANSI "
+"escape codes varies across terminal emulators, especially for italic and "
+"strikethrough. In standard output, [code]code[/code] is represented with "
+"faint text but without any font change. Unsupported tags are left as-is in "
+"standard output.\n"
+"[codeblocks]\n"
+"[gdscript skip-lint]\n"
+"print_rich(\"[color=green][b]Hello world![/b][/color]\") # Prints \"Hello "
+"world!\", in green with a bold font.\n"
+"[/gdscript]\n"
+"[csharp skip-lint]\n"
+"GD.PrintRich(\"[color=green][b]Hello world![/b][/color]\"); // Prints \"Hello "
+"world!\", in green with a bold font.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Consider using [method push_error] and [method push_warning] to "
+"print error and warning messages instead of [method print] or [method "
+"print_rich]. This distinguishes them from print messages used for debugging "
+"purposes, while also displaying a stack trace when an error or warning is "
+"printed.\n"
+"[b]Note:[/b] On Windows, only Windows 10 and later correctly displays ANSI "
+"escape codes in standard output.\n"
+"[b]Note:[/b] Output displayed in the editor supports clickable [code skip-"
+"lint][url=address]text[/url][/code] tags. The [code skip-lint][url][/code] "
+"tag's [code]address[/code] value is handled by [method OS.shell_open] when "
+"clicked."
+msgstr ""
+"Converte uno o più argomenti di qualsiasi tipo in stringa nel miglior modo "
+"possibile e li stampa nella console.\n"
+"I seguenti tag BBCode sono supportati: [code]b[/code], [code]i[/code], "
+"[code]u[/code], [code]s[/code], [code]indent[/code], [code]code[/code], "
+"[code]url[/code], [code]center[/code], [code]right[/code], [code]color[/"
+"code], [code]bgcolor[/code], [code]fgcolor[/code].\n"
+"Le tag URL supportano solo gli URL avvolti da un tag URL, non URL con un "
+"titolo diverso.\n"
+"Quando si stampa all'output standard, il sottoinsieme supportato di BBCode "
+"viene convertito in codici di escape ANSI da visualizzare per l'emulatore del "
+"terminale. Il supporto per i codici di escape ANSI varia tra diversi "
+"emulatori di terminali, soprattutto per il corsivo e la barratura. "
+"Nell'output standard, [code]code[/code] è rappresentato con testo schiarito "
+"ma senza alcun cambiamento di caratteri. I tag non supportati vengono "
+"lasciati così come sono nell'output standard.\n"
+"[codeblocks]\n"
+"[gdscript skip-lint]\n"
+"print_rich(\"[color=green][b]Ciao mondo![/b][/color]\") # Stampa \"Ciao mondo!"
+"\", in verde con caratteri in grassetto\n"
+"[/gdscript]\n"
+"[csharp skip-lint]\n"
+"GD.PrintRich(\"[color=green][b]Ciao mondo![/b][/color]\"); // Stampa \"Ciao "
+"mondo!\", in verde con caratteri in grassetto\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Considera l'utilizzo di [method push_error] e di [method "
+"push_warning] per stampare messaggi di errore e di avviso invece di [method "
+"print] o [method print_rich]. Ciò li distingue dai messaggi stampati usati "
+"per scopi di debug, e visualizzano anche una traccia di stack quando viene "
+"stampato un errore o un avviso.\n"
+"[b]Nota:[/b] Su Windows, solo da Windows 10 in poi i codici di escape ANSI "
+"sull'output standard sono visualizzati correttamente .\n"
+"[b]Nota:[/b] L'output visualizzato nell'editor supporta tag cliccabili [code "
+"skip-lint][url=address]text[/url][/code][code]. Il valore di [code]address[/"
+"code] del tag [code skip-lint][url][/code] viene gestito da [method OS."
+"shell_open] al clic."
+
 msgid ""
 "If verbose mode is enabled ([method OS.is_stdout_verbose] returning "
 "[code]true[/code]), converts one or more arguments of any type to string in "
@@ -2687,6 +3543,155 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Prints one or more arguments to strings in the best way possible to the OS "
+"terminal. Unlike [method print], no newline is automatically added at the "
+"end.\n"
+"[b]Note:[/b] The OS terminal is [i]not[/i] the same as the editor's Output "
+"dock. The output sent to the OS terminal can be seen when running Godot from "
+"a terminal. On Windows, this requires using the [code]console.exe[/code] "
+"executable.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Prints \"ABC\" to terminal.\n"
+"printraw(\"A\")\n"
+"printraw(\"B\")\n"
+"printraw(\"C\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Prints \"ABC\" to terminal.\n"
+"GD.PrintRaw(\"A\");\n"
+"GD.PrintRaw(\"B\");\n"
+"GD.PrintRaw(\"C\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Stampa uno o più argomenti come stringhe nel miglior modo possibile sulla "
+"linea di errore standard. A differenza di [method print], nessuna nuova linea "
+"viene automaticamente aggiunta alla fine.\n"
+"[b]Nota:[/b] Il terminale del sistema operativo [i]not[/i] è lo stesso del "
+"pannello di output dell'editor. È possibile vedere l'output inviato al "
+"terminale del sistema operativo quando Godot è eseguito dal terminale. Su "
+"Windows, ciò richiede l'utilizzo dell'eseguibile [code]console.exe[/code] .\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"printraw(\"A\")\n"
+"printraw(\"B\")\n"
+"printraw(\"C\")\n"
+"# Stampa \"ABC\" sul terminale\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PrintRaw(\"A\");\n"
+"GD.PrintRaw(\"B\");\n"
+"GD.PrintRaw(\"C\");\n"
+"// Stampa \"ABC\" sul terminale\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Prints one or more arguments to the console with a space between each "
+"argument.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"prints(\"A\", \"B\", \"C\") # Prints \"A B C\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PrintS(\"A\", \"B\", \"C\"); // Prints \"A B C\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Stampa uno o più argomenti sulla console con uno spazio tra ogni argomento.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"prints(\"A\", \"B\", \"C\") # Stampa \"A B C\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PrintS(\"A\", \"B\", \"C\"); // Stampa \"A B C\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Prints one or more arguments to the console with a tab between each "
+"argument.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"printt(\"A\", \"B\", \"C\") # Prints \"A       B       C\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PrintT(\"A\", \"B\", \"C\"); // Prints \"A       B       C\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Stampa uno o più argomenti sulla console con una tabulazione tra ogni "
+"argomento.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"printt(\"A\", \"B\", \"C\") # Stampa \"A       B       C\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PrintT(\"A\", \"B\", \"C\"); // Stampa \"A       B       C\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Pushes an error message to Godot's built-in debugger and to the OS terminal.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"push_error(\"test error\") # Prints \"test error\" to debugger and terminal "
+"as an error.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PushError(\"test error\"); // Prints \"test error\" to debugger and "
+"terminal as an error.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] This function does not pause project execution. To print an "
+"error message and pause project execution in debug builds, use "
+"[code]assert(false, \"test error\")[/code] instead."
+msgstr ""
+"Manda un messaggio di errore al debugger integrato di Godot e al terminale "
+"del sistema operativo.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"push_error(\"errore di prova\") # Stampa \"errore di prova\" nel debugger e "
+"nel terminale come errore.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PushError(\"errore di prova\"); // Stampa \"errore di prova\" nel debugger "
+"e nel terminale come errore.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Questo funzione non interrompe l'esecuzione del progetto. Per "
+"stampare un messaggio e mettere in pausa l'esecuzione nelle build di debug, "
+"usa invece [code]assert(false, \"test error\")[/code]."
+
+msgid ""
+"Pushes a warning message to Godot's built-in debugger and to the OS "
+"terminal.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"push_warning(\"test warning\") # Prints \"test warning\" to debugger and "
+"terminal as a warning.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PushWarning(\"test warning\"); // Prints \"test warning\" to debugger and "
+"terminal as a warning.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Manda un messaggio di avviso al debugger integrato di Godot e al terminale "
+"del sistema operativo.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"push_warning(\"avviso di prova\") # Stampa \"avviso di prova\" nel debugger e "
+"nel terminale come avviso.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.PushWarning(\"avviso di prova\"); // Stampa \"avviso di prova\" nel "
+"debugger e nel terminale come avviso.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Converts an angle expressed in radians to degrees.\n"
 "[codeblock]\n"
@@ -2702,6 +3707,33 @@ msgstr ""
 "rad_to_deg(PI * 2)   # Restituisce 360\n"
 "[/codeblock]"
 
+msgid ""
+"Given a [param seed], returns a [PackedInt64Array] of size [code]2[/code], "
+"where its first element is the randomized [int] value, and the second element "
+"is the same as [param seed]. Passing the same [param seed] consistently "
+"returns the same array.\n"
+"[b]Note:[/b] \"Seed\" here refers to the internal state of the pseudo random "
+"number generator, currently implemented as a 64 bit integer.\n"
+"[codeblock]\n"
+"var a = rand_from_seed(4)\n"
+"\n"
+"print(a[0]) # Prints 2879024997\n"
+"print(a[1]) # Prints 4\n"
+"[/codeblock]"
+msgstr ""
+"Dato un [param seed], restituisce un [PackedInt64Array] di dimensione "
+"[code]2[/code], dove il suo primo elemento è il valore [int] randomizzato, e "
+"il secondo elemento è lo stesso di [param seed]. Passando lo stesso [param "
+"seed] restituisce costantemente lo stesso array.\n"
+"[b]Nota:[/b] \"Seed\" qui si riferisce allo stato interno del generatore di "
+"numeri pseudocasuali, attualmente implementato come un intero a 64 bit.\n"
+"[codeblock]\n"
+"var a = rand_from_seed(4)\n"
+"\n"
+"print(a[0]) # Stampa 2879024997\n"
+"print(a[1]) # Stampa 4\n"
+"[/codeblock]"
+
 msgid ""
 "Returns a random floating-point value between [code]0.0[/code] and [code]1.0[/"
 "code] (inclusive).\n"
@@ -3051,6 +4083,23 @@ msgstr ""
 "signf(NAN)  # Restituisce 0.0\n"
 "[/codeblock]"
 
+msgid ""
+"Returns [code]-1[/code] if [param x] is negative, [code]1[/code] if [param x] "
+"is positive, and [code]0[/code] if [param x] is zero.\n"
+"[codeblock]\n"
+"signi(-6) # Returns -1\n"
+"signi(0)  # Returns 0\n"
+"signi(6)  # Returns 1\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce [code]-1[/code] se [param x] è negativo, [code]1[/code] se [param "
+"x] è positivo, e [code]0[/code] se [param x] è zero.\n"
+"[codeblock]\n"
+"signi(-6) # Restituisce -1\n"
+"signi(0)  # Restituisce 0\n"
+"signi(6)  # Restituisce 1\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the sine of angle [param angle_rad] in radians.\n"
 "[codeblock]\n"
@@ -3077,6 +4126,65 @@ msgstr ""
 "sinh(a) # Restituisce 0.75\n"
 "[/codeblock]"
 
+msgid ""
+"Returns a smooth cubic Hermite interpolation between [code]0[/code] and "
+"[code]1[/code].\n"
+"For positive ranges (when [code]from <= to[/code]) the return value is "
+"[code]0[/code] when [code]x <= from[/code], and [code]1[/code] when [code]x "
+">= to[/code]. If [param x] lies between [param from] and [param to], the "
+"return value follows an S-shaped curve that smoothly transitions from "
+"[code]0[/code] to [code]1[/code].\n"
+"For negative ranges (when [code]from > to[/code]) the function is mirrored "
+"and returns [code]1[/code] when [code]x <= to[/code] and [code]0[/code] when "
+"[code]x >= from[/code].\n"
+"This S-shaped curve is the cubic Hermite interpolator, given by [code]f(y) = "
+"3*y^2 - 2*y^3[/code] where [code]y = (x-from) / (to-from)[/code].\n"
+"[codeblock]\n"
+"smoothstep(0, 2, -5.0) # Returns 0.0\n"
+"smoothstep(0, 2, 0.5) # Returns 0.15625\n"
+"smoothstep(0, 2, 1.0) # Returns 0.5\n"
+"smoothstep(0, 2, 2.0) # Returns 1.0\n"
+"[/codeblock]\n"
+"Compared to [method ease] with a curve value of [code]-1.6521[/code], [method "
+"smoothstep] returns the smoothest possible curve with no sudden changes in "
+"the derivative. If you need to perform more advanced transitions, use [Tween] "
+"or [AnimationPlayer].\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"smoothstep_ease_comparison.png]Comparison between smoothstep() and ease(x, "
+"-1.6521) return values[/url]\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"smoothstep_range.webp]Smoothstep() return values with positive, zero, and "
+"negative ranges[/url]"
+msgstr ""
+"Restituisce il risultato della regolare interpolazione del valore di [param "
+"x] tra [code]0[/code] e [code]1[/code], basata sulla posizione di [param x] "
+"rispetto agli angoli [param from] e [param to].\n"
+"Il valore di ritorno è [code]0[/code] if [code]s <= from[/code], e [code]1[/"
+"code] if [code]s >= to[/code]. Se [param x] è compreso tra [param from] e "
+"[param to], il valore di ritorno seguirà una curva a forma di S che mostrerà "
+"[param x] tra [code]0[/code] e [code]1[/code].\n"
+"Per intervalli negativi (quando [code]from > to[/code]) la funzione è "
+"invertita e restituisce [code]1[/code] quando [code]x <= to[/code] e [code]0[/"
+"code] quando [code]x >= from[/code].\n"
+"La curva a forma di S è l'interpolatore cubico Hermite, dato da [code]f(y) = "
+"3*y^2 - 2*y^3[/code] dove [code]y = (x-from) / (to-from)[/code].\n"
+"[codeblock]\n"
+"smoothstep(0, 2, -5.0) # Restituisce 0.0\n"
+"smoothstep(0, 2, 0.5) # Restituisce 0.15625\n"
+"smoothstep(0, 2, 1.0) # Restituisce 0.5\n"
+"smoothstep(0, 2, 2.0) # Restituisce 1.0\n"
+"[/codeblock]\n"
+"Rispetto a [method ease] con un valore di curva di [code]-1.6521[/code], "
+"[method smoothstep] restituisce la curva più regolare possibile senza "
+"improvvisi cambiamenti sulla derivata. Se hai bisogno di effettuare "
+"transizioni più avanzate, usa [Tween] o [AnimationPlayer].\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/3.5/img/"
+"smoothstep_ease_comparison.png]Confronto dei valori di ritorno tra "
+"smoothstep() e ease(x, -1.6521)[/url]\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"smoothstep_range.webp]Valori restituiti da smoothstep() con intervalli "
+"positivi, negativi o pari a zero[/url]"
+
 msgid ""
 "Returns the multiple of [param step] that is the closest to [param x]. This "
 "can also be used to round a floating-point number to an arbitrary number of "
@@ -3302,6 +4410,52 @@ msgstr ""
 "type_convert(\"Hi!\", TYPE_NIL) # Restituisce null\n"
 "[/codeblock]"
 
+msgid ""
+"Returns a human-readable name of the given [param type], using the [enum "
+"Variant.Type] values.\n"
+"[codeblock]\n"
+"print(TYPE_INT) # Prints 2\n"
+"print(type_string(TYPE_INT)) # Prints \"int\"\n"
+"print(type_string(TYPE_STRING)) # Prints \"String\"\n"
+"[/codeblock]\n"
+"See also [method typeof]."
+msgstr ""
+"Restituisce un nome leggibile in chiaro del tipo fornito [param type], "
+"attraverso i valori di [enum Variant.Type].\n"
+"[codeblock]\n"
+"print(TYPE_INT) # Stampa 2\n"
+"print(type_string(TYPE_INT)) # Stampa \"int\"\n"
+"print(type_string(TYPE_STRING)) # Stampa \"String\"\n"
+"[/codeblock]\n"
+"Vedi anche [method typeof]."
+
+msgid ""
+"Returns the internal type of the given [param variable], using the [enum "
+"Variant.Type] values.\n"
+"[codeblock]\n"
+"var json = JSON.new()\n"
+"json.parse('[\"a\", \"b\", \"c\"]')\n"
+"var result = json.get_data()\n"
+"if result is Array:\n"
+"    print(result[0]) # Prints \"a\"\n"
+"else:\n"
+"    print(\"Unexpected result!\")\n"
+"[/codeblock]\n"
+"See also [method type_string]."
+msgstr ""
+"Restituisce il tipo interno della variabile fornita [param variable], "
+"attraverso i valori di [enum Variant.Type].\n"
+"[codeblock]\n"
+"var json = JSON.new()\n"
+"json.parse('[\"a\", \"b\", \"c\"]')\n"
+"var result = json.get_data()\n"
+"if result is Array:\n"
+"    print(result[0]) # Stampa \"a\"\n"
+"else:\n"
+"    print(\"Risultato inaspettato!\")\n"
+"[/codeblock]\n"
+"Vedi anche [method type_string]."
+
 msgid ""
 "Encodes a [Variant] value to a byte array, without encoding objects. "
 "Deserialization can be done with [method bytes_to_var].\n"
@@ -4135,12 +5289,24 @@ msgstr "Tasto hyper (solo su Linux/X11)."
 msgid "Help key."
 msgstr "Tasto help."
 
+msgid "Back key."
+msgstr "Tasto indietro."
+
+msgid "Forward key."
+msgstr "Tasto avanti."
+
 msgid "Media stop key."
-msgstr "Tasto Ferma media."
+msgstr "Tasto ferma media."
+
+msgid "Refresh key."
+msgstr "Tasto ricarica."
 
 msgid "Volume down key."
 msgstr "Tasto di abbassamento del volume."
 
+msgid "Mute volume key."
+msgstr "Tasto per silenziare il volume."
+
 msgid "Volume up key."
 msgstr "Tasto di alzamento del volume."
 
@@ -4238,11 +5404,56 @@ msgid "かな key on Mac keyboard."
 msgstr "Tasto かな su una tastiera Mac."
 
 msgid "Unknown key."
-msgstr "Tasto Sconosciuto."
+msgstr "Tasto sconosciuto."
 
 msgid "Space key."
 msgstr "Tasto spazio (la barra spaziatrice)."
 
+msgid "Exclamation mark ([code]![/code]) key."
+msgstr "Tasto punto esclamativo ([code]![/code])."
+
+msgid "Double quotation mark ([code]\"[/code]) key."
+msgstr "Tasto virgolette doppie ([code]\"[/code])."
+
+msgid "Number sign or [i]hash[/i] ([code]#[/code]) key."
+msgstr "Tasto cancelletto ([code]#[/code])."
+
+msgid "Dollar sign ([code]$[/code]) key."
+msgstr "Tasto simbolo del dollaro ([code]$[/code])."
+
+msgid "Percent sign ([code]%[/code]) key."
+msgstr "Tasto simbolo di percentuale ([code]%[/code])."
+
+msgid "Ampersand ([code]&[/code]) key."
+msgstr "Tasto \"e\" commerciale ([code]%[/code])."
+
+msgid "Apostrophe ([code]'[/code]) key."
+msgstr "Tasto apostrofo ([code]'[/code])."
+
+msgid "Left parenthesis ([code]([/code]) key."
+msgstr "Tasto parentesi tonda aperta ([code]([/code])."
+
+msgid "Right parenthesis ([code])[/code]) key."
+msgstr "Tasto parentesi tonda chiusa ([code])[/code])."
+
+msgid "Asterisk ([code]*[/code]) key."
+msgstr "Tasto asterisco ([code]*[/code])."
+
+msgid "Plus ([code]+[/code]) key."
+msgstr "Tasto simbolo più ([code]+[/code])."
+
+msgid "Comma ([code],[/code]) key."
+msgstr "Tasto virgola ([code],[/code])."
+
+msgid "Minus ([code]-[/code]) key."
+msgstr "Tasto simbolo meno ([code]-[/code])."
+
+msgid "Period ([code].[/code]) key."
+msgstr "Tasto punto ([code].[/code])."
+
+msgid "Slash ([code]/[/code]) key."
+msgstr "Tasto barra ([code]/[/code])."
+
 msgid "Number 0 key."
 msgstr "Tasto numero 0."
 
@@ -4273,6 +5484,27 @@ msgstr "Tasto numero 8."
 msgid "Number 9 key."
 msgstr "Tasto numero 9."
 
+msgid "Colon ([code]:[/code]) key."
+msgstr "Tasto due punti ([code]:[/code])."
+
+msgid "Semicolon ([code];[/code]) key."
+msgstr "Tasto punto e virgola ([code];[/code])."
+
+msgid "Less-than sign ([code]<[/code]) key."
+msgstr "Tasto simbolo di minore ([code]<[/code])."
+
+msgid "Equal sign ([code]=[/code]) key."
+msgstr "Tasto simbolo di uguale ([code]=[/code])."
+
+msgid "Greater-than sign ([code]>[/code]) key."
+msgstr "Tasto simbolo di maggiore ([code]>[/code])."
+
+msgid "Question mark ([code]?[/code]) key."
+msgstr "Tasto punto interrogativo ([code]?[/code])."
+
+msgid "At sign ([code]@[/code]) key."
+msgstr "Tasto chiocciola o \"a\" commerciale ([code]@[/code])."
+
 msgid "A key."
 msgstr "Tasto A."
 
@@ -4351,6 +5583,42 @@ msgstr "Tasto Y."
 msgid "Z key."
 msgstr "Tasto Z."
 
+msgid "Left bracket ([code][lb][/code]) key."
+msgstr "Tasto parentesi quadra aperta ([code][lb][/code])."
+
+msgid "Backslash ([code]\\[/code]) key."
+msgstr "Tasto barra rovesciata ([code]\\[/code])."
+
+msgid "Right bracket ([code][rb][/code]) key."
+msgstr "Tasto parentesi quadra chiusa ([code][rb][/code])."
+
+msgid "Caret ([code]^[/code]) key."
+msgstr "Tasto accento circonflesso ([code]^[/code])."
+
+msgid "Underscore ([code]_[/code]) key."
+msgstr "Tasto trattino basso ([code]_[/code])."
+
+msgid "Backtick ([code]`[/code]) key."
+msgstr "Tasto apice inverso ([code]`[/code])."
+
+msgid "Left brace ([code]{[/code]) key."
+msgstr "Tasto parentesi graffa aperta ([code]{[/code])."
+
+msgid "Vertical bar or [i]pipe[/i] ([code]|[/code]) key."
+msgstr "Tasto barra verticale o [i]pipe[/i] ([code]|[/code])."
+
+msgid "Right brace ([code]}[/code]) key."
+msgstr "Tasto parentesi graffa chiusa ([code]}[/code])."
+
+msgid "Tilde ([code]~[/code]) key."
+msgstr "Tasto tilde ([code]~[/code])."
+
+msgid "Yen symbol ([code]¥[/code]) key."
+msgstr "Tasto simbolo del yen ([code]¥[/code])."
+
+msgid "Section sign ([code]§[/code]) key."
+msgstr "Tasto segno di sezione ([code]§[/code])."
+
 msgid "Key Code mask."
 msgstr "Maschera di codice tasto."
 
@@ -4787,6 +6055,40 @@ msgstr ""
 "predefinito, come se fosse appena acceso. Non dovrebbe essere inviato quando "
 "il dispositivo MIDI viene acceso."
 
+msgid ""
+"Methods that return [enum Error] return [constant OK] when no error "
+"occurred.\n"
+"Since [constant OK] has value [code]0[/code], and all other error constants "
+"are positive integers, it can also be used in boolean checks.\n"
+"[codeblock]\n"
+"var error = method_that_returns_error()\n"
+"if error != OK:\n"
+"    printerr(\"Failure!\")\n"
+"\n"
+"# Or, alternatively:\n"
+"if error:\n"
+"    printerr(\"Still failing!\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Many functions do not return an error code, but will print error "
+"messages to standard output."
+msgstr ""
+"I metodi che restituiscono [enum Error] restituiscono [constant OK] quando "
+"non si è verificato alcun errore.\n"
+"Poiché [constant OK] ha valore di [code]0[/code], e tutte le altre costanti "
+"d'errore sono interi positivi, può essere utilizzato anche nelle verifiche "
+"booleane.\n"
+"[codeblock]\n"
+"var errore = metodo_che_restituisce_errore()\n"
+"if errore != OK:\n"
+"    printerr(\"Male!\")\n"
+"\n"
+"# O, alternativamente:\n"
+"if errore:\n"
+"    printerr(\"Ancora male!\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Molte funzioni non restituiscono un codice di errore, ma "
+"stampano messaggi d'errore sull'output standard."
+
 msgid "Generic error."
 msgstr "Errore generico."
 
@@ -4950,6 +6252,50 @@ msgstr ""
 msgid "The property has no hint for the editor."
 msgstr "Questa proprietà non ha nessun suggerimento per l'editor."
 
+msgid ""
+"Hints that an [int] or [float] property should be within a range specified "
+"via the hint string [code]\"min,max\"[/code] or [code]\"min,max,step\"[/"
+"code]. The hint string can optionally include [code]\"or_greater\"[/code] and/"
+"or [code]\"or_less\"[/code] to allow manual input going respectively above "
+"the max or below the min values.\n"
+"[b]Example:[/b] [code]\"-360,360,1,or_greater,or_less\"[/code].\n"
+"Additionally, other keywords can be included: [code]\"exp\"[/code] for "
+"exponential range editing, [code]\"radians_as_degrees\"[/code] for editing "
+"radian angles in degrees (the range values are also in degrees), "
+"[code]\"degrees\"[/code] to hint at an angle and [code]\"hide_slider\"[/code] "
+"to hide the slider."
+msgstr ""
+"Indica che una proprietà [int] o [float] dovrebbe essere all'interno di un "
+"intervallo specificato tramite la stringa indicativa [code]\"min,max\"[/code] "
+"o [code]\"min,max,step\"[/code]. La stringa indicativa può, facoltativamente, "
+"includere [code]\"or_greater\"[/code] e/o [code]\"or_lesser\"[/code] per "
+"permettere un input manuale che vada rispettivamente sopra il massimo o sotto "
+"il minimo dei valori.\n"
+"[b]Esempio:[/b] [code]\"-360,360,1,or_greater,or_lesser\"[/code].\n"
+"Inoltre, è possibile includere altre parole chiave: [code]\"exp\"[/code] per "
+"modificare in un intervallo esponenziale, [code]\"radians_as_degrees\"[/code] "
+"per modificare angoli in radianti visualizzati in gradi (anche i valori "
+"dell'intervallo sono in gradi), [code]\"degrees\"[/code] per indicare un "
+"angolo e [code]\"hide_slider\"[/code] per nascondere lo slider."
+
+msgid ""
+"Hints that an [int] or [String] property is an enumerated value to pick in a "
+"list specified via a hint string.\n"
+"The hint string is a comma separated list of names such as [code]\"Hello,"
+"Something,Else\"[/code]. Whitespaces are [b]not[/b] removed from either end "
+"of a name. For integer properties, the first name in the list has value 0, "
+"the next 1, and so on. Explicit values can also be specified by appending "
+"[code]:integer[/code] to the name, e.g. [code]\"Zero,One,Three:3,Four,"
+"Six:6\"[/code]."
+msgstr ""
+"Indica che una proprietà [int] o [String] sia un valore innumerato da "
+"scegliere tra una lista specificata tramite una stringa indicativa.\n"
+"La stringa indicativa è un elenco di nomi separati da virgola come "
+"[code]\"Ciao,Qualcosa,Altro\"[/code]. Per le proprietà intere, il primo nome "
+"nella lista ha valore 0, il successivo 1, e così via. È possibile specificare "
+"valori espliciti aggiungendo [code]:integer[/code] al nome, ad esempio "
+"[code]\"Zero,Uno,Tre:3,Quattro,Sei:6\"[/code]."
+
 msgid ""
 "Hints that a [String] property can be an enumerated value to pick in a list "
 "specified via a hint string such as [code]\"Hello,Something,Else\"[/code].\n"
@@ -5141,9 +6487,185 @@ msgid ""
 "type specified in the hint string. Used by the debugger."
 msgstr ""
 "Indica che il valore della proprietà è un oggetto codificato come ID di "
-"oggetto, con il suo tipo specificato nella stringa di suggerimento. Usato dal "
+"oggetto, con il suo tipo specificato nella stringa indicativa. Usato dal "
 "debugger."
 
+msgid ""
+"If a property is [String], hints that the property represents a particular "
+"type (class). This allows to select a type from the create dialog. The "
+"property will store the selected type as a string.\n"
+"If a property is [Array], hints the editor how to show elements. The "
+"[code]hint_string[/code] must encode nested types using [code]\":\"[/code] "
+"and [code]\"/\"[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Array of elem_type.\n"
+"hint_string = \"%d:\" % [elem_type]\n"
+"hint_string = \"%d/%d:%s\" % [elem_type, elem_hint, elem_hint_string]\n"
+"# Two-dimensional array of elem_type (array of arrays of elem_type).\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d/%d:%s\" % [TYPE_ARRAY, elem_type, elem_hint, "
+"elem_hint_string]\n"
+"# Three-dimensional array of elem_type (array of arrays of arrays of "
+"elem_type).\n"
+"hint_string = \"%d:%d:%d:\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d:%d/%d:%s\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type, "
+"elem_hint, elem_hint_string]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Array of elemType.\n"
+"hintString = $\"{elemType:D}:\";\n"
+"hintString = $\"{elemType:}/{elemHint:D}:{elemHintString}\";\n"
+"// Two-dimensional array of elemType (array of arrays of elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}:\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}/{elemHint:D}:"
+"{elemHintString}\";\n"
+"// Three-dimensional array of elemType (array of arrays of arrays of "
+"elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}:"
+"\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}/"
+"{elemHint:D}:{elemHintString}\";\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Examples:[/b]\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"hint_string = \"%d:\" % [TYPE_INT] # Array of integers.\n"
+"hint_string = \"%d/%d:1,10,1\" % [TYPE_INT, PROPERTY_HINT_RANGE] # Array of "
+"integers (in range from 1 to 10).\n"
+"hint_string = \"%d/%d:Zero,One,Two\" % [TYPE_INT, PROPERTY_HINT_ENUM] # Array "
+"of integers (an enum).\n"
+"hint_string = \"%d/%d:Zero,One,Three:3,Six:6\" % [TYPE_INT, "
+"PROPERTY_HINT_ENUM] # Array of integers (an enum).\n"
+"hint_string = \"%d/%d:*.png\" % [TYPE_STRING, PROPERTY_HINT_FILE] # Array of "
+"strings (file paths).\n"
+"hint_string = \"%d/%d:Texture2D\" % [TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Array of textures.\n"
+"\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, TYPE_FLOAT] # Two-dimensional array "
+"of floats.\n"
+"hint_string = \"%d:%d/%d:\" % [TYPE_ARRAY, TYPE_STRING, "
+"PROPERTY_HINT_MULTILINE_TEXT] # Two-dimensional array of multiline strings.\n"
+"hint_string = \"%d:%d/%d:-1,1,0.1\" % [TYPE_ARRAY, TYPE_FLOAT, "
+"PROPERTY_HINT_RANGE] # Two-dimensional array of floats (in range from -1 to "
+"1).\n"
+"hint_string = \"%d:%d/%d:Texture2D\" % [TYPE_ARRAY, TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Two-dimensional array of textures.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Range:D}:1,10,1\"; // "
+"Array of integers (in range from 1 to 10).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,One,Two\"; // "
+"Array of integers (an enum).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,One,Three:3,"
+"Six:6\"; // Array of integers (an enum).\n"
+"hintString = $\"{Variant.Type.String:D}/{PropertyHint.File:D}:*.png\"; // "
+"Array of strings (file paths).\n"
+"hintString = $\"{Variant.Type.Object:D}/{PropertyHint.ResourceType:D}:"
+"Texture2D\"; // Array of textures.\n"
+"\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}:\"; // Two-"
+"dimensional array of floats.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.String:D}/{PropertyHint."
+"MultilineText:D}:\"; // Two-dimensional array of multiline strings.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}/{PropertyHint."
+"Range:D}:-1,1,0.1\"; // Two-dimensional array of floats (in range from -1 to "
+"1).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Object:D}/{PropertyHint."
+"ResourceType:D}:Texture2D\"; // Two-dimensional array of textures.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] The trailing colon is required for properly detecting built-in "
+"types."
+msgstr ""
+"Se una proprietà è [String], suggerisce che la proprietà rappresenta un tipo "
+"particolare (classe). Questo consente di selezionare un tipo dalla finestra "
+"di dialogo di creazione. La proprietà memorizzerà il tipo selezionato come "
+"stringa.\n"
+"Se una proprietà è [Array], indica all'editor come mostrare gli elementi. La "
+"[code]hint_string[/code] deve codificare i tipi innestati usando [code]\":\"[/"
+"code] e [code]\"/\"[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Array di elem_type.\n"
+"hint_string = \"%d:\" % [elem_type]\n"
+"hint_string = \"%d/%d:%s\" % [elem_type, elem_hint, elem_hint_string]\n"
+"# Array bidimensionale di elem_type (array di array di elem_type).\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d/%d:%s\" % [TYPE_ARRAY, elem_type, elem_hint, "
+"elem_hint_string]\n"
+"# Array tridimensionale di elem_type (array di array di array di elem_type).\n"
+"hint_string = \"%d:%d:%d:\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d:%d/%d:%s\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type, "
+"elem_hint, elem_hint_string]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Array di elemType.\n"
+"hintString = $\"{elemType:D}:\";\n"
+"hintString = $\"{elemType:}/{elemHint:D}:{elemHintString}\";\n"
+"// Array bidimensionale di elemType (array di array di elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}:\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}/{elemHint:D}:"
+"{elemHintString}\";\n"
+"// Array tridimensionale di elemType (array di array di array di elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}:"
+"\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}/"
+"{elemHint:D}:{elemHintString}\";\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Esempi:[/b]\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"hint_string = \"%d:\" % [TYPE_INT] # Array di interi.\n"
+"hint_string = \"%d/%d:1,10,1\" % [TYPE_INT, PROPERTY_HINT_RANGE] # Array di "
+"interi (nell'intervallo da 1 a 10).\n"
+"hint_string = \"%d/%d:Zero,Uno,Due\" % [TYPE_INT, PROPERTY_HINT_ENUM] # Array "
+"di interi (un enum).\n"
+"hint_string = \"%d/%d:Zero,Uno,Tre:3,Sei:6\" % [TYPE_INT, PROPERTY_HINT_ENUM] "
+"# Array di interi (un enum).\n"
+"hint_string = \"%d/%d:*.png\" % [TYPE_STRING, PROPERTY_HINT_FILE] # Array di "
+"stringhe (percorsi di file).\n"
+"hint_string = \"%d/%d:Texture2D\" % [TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Array di texture.\n"
+"\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, TYPE_FLOAT] # Array bidimensionale di "
+"float.\n"
+"hint_string = \"%d:%d/%d:\" % [TYPE_ARRAY, TYPE_STRING, "
+"PROPERTY_HINT_MULTILINE_TEXT] # Array bidimensionale di stringhe multilinea.\n"
+"hint_string = \"%d:%d/%d:-1,1,0.1\" % [TYPE_ARRAY, TYPE_FLOAT, "
+"PROPERTY_HINT_RANGE] # Array bidimensionale di float (nell'intervallo da -1 a "
+"1).\n"
+"hint_string = \"%d:%d/%d:Texture2D\" % [TYPE_ARRAY, TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Array bidimensionale di texture.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Range:D}:1,10,1\"; // "
+"Array di interi (nell'intervallo da 1 a 10).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,Uno,Due\"; // "
+"Array di interi (un enum).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,Uno,Tre:3,"
+"Sei:6\"; // Array di interi (un enum).\n"
+"hintString = $\"{Variant.Type.String:D}/{PropertyHint.File:D}:*.png\"; // "
+"Array di stringhe (percorsi di file).\n"
+"hintString = $\"{Variant.Type.Object:D}/{PropertyHint.ResourceType:D}:"
+"Texture2D\"; // Array di texture.\n"
+"\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}:\"; // Array "
+"bidimensionale di float.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.String:D}/{PropertyHint."
+"MultilineText:D}:\"; // Array bidimensionale di stringhe multilinea.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}/{PropertyHint."
+"Range:D}:-1,1,0.1\"; // Array bidimensionale di float (nell'intervallo da -1 "
+"a 1).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Object:D}/{PropertyHint."
+"ResourceType:D}:Texture2D\"; // Array bidimensionale di texture.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] I due punti alla fine sono necessari per rilevare correttamente "
+"i tipi incorporati."
+
 msgid "This hint is not used by the engine."
 msgstr "Questo suggerimento non è usato dal motore."
 
@@ -5194,8 +6716,15 @@ msgid ""
 "Hints that a property is an [Array] with the stored type specified in the "
 "hint string."
 msgstr ""
-"Suggerisce che una proprietà è un [Array] con il tipo memorizzato specificato "
-"nella stringa di suggerimento."
+"Indica che una proprietà è un [Array] con il tipo memorizzato specificato "
+"nella stringa indicativa."
+
+msgid ""
+"Hints that a property is a [Dictionary] with the stored types specified in "
+"the hint string."
+msgstr ""
+"Indica che una proprietà è un [Dictionary] con i tipi memorizzati specificati "
+"nella stringa indicativa."
 
 msgid ""
 "Hints that a string property is a locale code. Editing it will show a locale "
@@ -5235,6 +6764,43 @@ msgstr ""
 "Induce che una proprietà di stringa è una password, e ogni carattere è "
 "sostituito con il carattere segreto."
 
+msgid ""
+"Hints that a [Callable] property should be displayed as a clickable button. "
+"When the button is pressed, the callable is called. The hint string specifies "
+"the button text and optionally an icon from the [code]\"EditorIcons\"[/code] "
+"theme type.\n"
+"[codeblock lang=text]\n"
+"\"Click me!\" - A button with the text \"Click me!\" and the default "
+"\"Callable\" icon.\n"
+"\"Click me!,ColorRect\" - A button with the text \"Click me!\" and the "
+"\"ColorRect\" icon.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] A [Callable] cannot be properly serialized and stored in a file, "
+"so it is recommended to use [constant PROPERTY_USAGE_EDITOR] instead of "
+"[constant PROPERTY_USAGE_DEFAULT]."
+msgstr ""
+"Indica che una proprietà [Callable] dovrebbe essere visualizzata come un "
+"pulsante cliccabile. Quando il pulsante viene premuto, il chiamabile viene "
+"richiamato. La stringa indicativa specifica il testo del pulsante e, "
+"facoltativamente, un'icona dal tipo di tema [code]\"EditorIcons\"[/code].\n"
+"[codeblock lang=text]\n"
+"\"Cliccami!\" - Un pulsante con il testo \"Cliccami!\" e l'icona \"Callable\" "
+"predefinita.\n"
+"\"Cliccami!,ColorRect\" - Un pulsante con il testo \"Cliccami!\" e l'icona "
+"\"ColorRect\".\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Un [Callable] non può essere correttamente serializzato e "
+"memorizzato in un file, quindi si consiglia di utilizzare [constant "
+"PROPERTY_USAGE_EDITOR] invece di [constant PROPERTY_USAGE_DEFAULT]."
+
+msgid ""
+"Hints that a property will be changed on its own after setting, such as "
+"[member AudioStreamPlayer.playing] or [member GPUParticles3D.emitting]."
+msgstr ""
+"Indica che una proprietà verrà modificata automaticamente dopo che è "
+"impostata, ad esempio [member AudioStreamPlayer.playing] o [member "
+"GPUParticles3D.emitting]."
+
 msgid "Represents the size of the [enum PropertyHint] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum PropertyHint]."
 
@@ -5298,6 +6864,20 @@ msgstr ""
 "In seguito a una modifica della proprietà, sarà chiesto all'utente di "
 "riavviare l'editor."
 
+msgid ""
+"The property is a script variable. [constant PROPERTY_USAGE_SCRIPT_VARIABLE] "
+"can be used to distinguish between exported script variables from built-in "
+"variables (which don't have this usage flag). By default, [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] is [b]not[/b] applied to variables that are "
+"created by overriding [method Object._get_property_list] in a script."
+msgstr ""
+"La proprietà è una variabile di script. [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] può essere utilizzata per distinguere tra le "
+"variabili esportate da script e le variabili integrate (che non hanno questo "
+"flag di utilizzo). Come predefinito, [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] [b]non[/b] viene applicato alle variabili "
+"create sovrascrivendo [method Object._get_property_list] in uno script."
+
 msgid ""
 "The property value of type [Object] will be stored even if its value is "
 "[code]null[/code]."
@@ -5313,6 +6893,13 @@ msgstr ""
 msgid "This flag is not used by the engine."
 msgstr "Questo flag non è utilizzato dal motore."
 
+msgid ""
+"The property is a variable of enum type, i.e. it only takes named integer "
+"constants from its associated enumeration."
+msgstr ""
+"La proprietà è una variabile di tipo enumeratore, ossia prende solo le "
+"constanti di interi denominate dalla sua enumerazione associata."
+
 msgid ""
 "If property has [code]nil[/code] as default value, its type will be [Variant]."
 msgstr ""
@@ -5409,29 +6996,32 @@ msgstr ""
 "(memorizzazione)."
 
 msgid "Flag for a normal method."
-msgstr "Flag per una funzione normale."
+msgstr "Flag per un metodo normale."
 
 msgid "Flag for an editor method."
-msgstr "Flag per una funzione dell'editor."
+msgstr "Flag per un metodo dell'editor."
 
 msgid "Flag for a constant method."
-msgstr "Flag per una funzione costante."
+msgstr "Flag per un metodo costante."
 
 msgid "Flag for a virtual method."
-msgstr "Flag per una funzione virtuale."
+msgstr "Flag per un metodo virtuale."
 
 msgid "Flag for a method with a variable number of arguments."
-msgstr "Flag per una funzione con un numero variabile di argomenti."
+msgstr "Flag per una metodo con un numero variabile di argomenti."
 
 msgid "Flag for a static method."
-msgstr "Flag per una funzione statica."
+msgstr "Flag per un metodo statico."
 
 msgid ""
 "Used internally. Allows to not dump core virtual methods (such as [method "
 "Object._notification]) to the JSON API."
 msgstr ""
 "Usato internamente. Consente di non scaricare metodi virtuali fondamentali "
-"(come [method Object._notification]) all'API di JSON."
+"(come [method Object._notification]) all'API JSON."
+
+msgid "Flag for a virtual method that is required."
+msgstr "Flag per un metodo virtuale che è obbligatorio."
 
 msgid "Default method flags (normal)."
 msgstr "Flag di metodo predefiniti (normale)."
@@ -5656,7 +7246,7 @@ msgstr ""
 "agli assi in uno spazio 3D. Essa è definita dalla sua posizione ([member "
 "position]) e dimensioni ([member size]), che sono [Vector3]. Viene spesso "
 "utilizzato per dei test rapidi di sovrapposizione (vedi [method intersects]). "
-"Nonostante [AABB] sia allineato alle assi, può essere combinato con "
+"Nonostante [AABB] sia allineato agli assi, può essere combinato con "
 "[Transform3D] per rappresentare una bounding box ruotata o inclinata.\n"
 "Utilizza le coordinate in virgola mobile. La controparte 2D a [AABB] è "
 "[Rect2]. Non esiste una versione di [AABB] che utilizza delle coordinate "
@@ -5693,6 +7283,47 @@ msgstr ""
 "Costruisce un [AABB] dalla posizione ([param position]) e dimensioni ([param "
 "size])."
 
+msgid ""
+"Returns an [AABB] equivalent to this bounding box, with its width, height, "
+"and depth modified to be non-negative values.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(5, 0, 5), Vector3(-20, -10, -5))\n"
+"var absolute = box.abs()\n"
+"print(absolute.position) # Prints (-15.0, -10.0, 0.0)\n"
+"print(absolute.size)     # Prints (20.0, 10.0, 5.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(5, 0, 5), new Vector3(-20, -10, -5));\n"
+"var absolute = box.Abs();\n"
+"GD.Print(absolute.Position); // Prints (-15, -10, 0)\n"
+"GD.Print(absolute.Size);     // Prints (20, 10, 5)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] It's recommended to use this method when [member size] is "
+"negative, as most other methods in Godot assume that the [member size]'s "
+"components are greater than [code]0[/code]."
+msgstr ""
+"Restituisce un [AABB] equivalente a questa bounding box, con la sua "
+"larghezza, altezza e profondità modificate per essere valori non negativi.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(5, 0, 5), Vector3(-20, -10, -5))\n"
+"var absolute = box.abs()\n"
+"print(absolute.position) # Stampa (-15.0, -10.0, 0.0)\n"
+"print(absolute.size)     # Stampa (20.0, 10.0, 5.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(5, 0, 5), new Vector3(-20, -10, -5));\n"
+"var absolute = box.Abs();\n"
+"GD.Print(absolute.Position); // Stampa (-15, -10, 0)\n"
+"GD.Print(absolute.Size);     // Stampa (20, 10, 5)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Si consiglia di utilizzare questo metodo quando [member size] è "
+"negativo, poiché la maggior parte degli altri metodi in Godot presumono che i "
+"componenti di [member size] sono maggiori di [code]0[/code]."
+
 msgid ""
 "Returns [code]true[/code] if this bounding box [i]completely[/i] encloses the "
 "[param with] box. The edges of both boxes are included.\n"
@@ -5741,6 +7372,61 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Returns a copy of this bounding box expanded to align the edges with the "
+"given [param to_point], if necessary.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(5, 2, 5))\n"
+"\n"
+"box = box.expand(Vector3(10, 0, 0))\n"
+"print(box.position) # Prints (0.0, 0.0, 0.0)\n"
+"print(box.size)     # Prints (10.0, 2.0, 5.0)\n"
+"\n"
+"box = box.expand(Vector3(-5, 0, 5))\n"
+"print(box.position) # Prints (-5.0, 0.0, 0.0)\n"
+"print(box.size)     # Prints (15.0, 2.0, 5.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(5, 2, 5));\n"
+"\n"
+"box = box.Expand(new Vector3(10, 0, 0));\n"
+"GD.Print(box.Position); // Prints (0, 0, 0)\n"
+"GD.Print(box.Size);     // Prints (10, 2, 5)\n"
+"\n"
+"box = box.Expand(new Vector3(-5, 0, 5));\n"
+"GD.Print(box.Position); // Prints (-5, 0, 0)\n"
+"GD.Print(box.Size);     // Prints (15, 2, 5)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce una copia di questa bounding box espansa per allineare i bordi "
+"con il punto [param to] specificato, se necessario.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(5, 2, 5))\n"
+"\n"
+"box = box.expand(Vector3(10, 0, 0))\n"
+"print(box.position) # Stampa (0.0, 0.0, 0.0)\n"
+"print(box.size)     # Stampa (10.0, 2.0, 5.0)\n"
+"\n"
+"box = box.expand(Vector3(-5, 0, 5))\n"
+"print(box.position) # Stampa (-5.0, 0.0, 0.0)\n"
+"print(box.size)     # Stampa (15.0, 2.0, 5.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(5, 2, 5));\n"
+"\n"
+"box = box.Expand(new Vector3(10, 0, 0));\n"
+"GD.Print(box.Position); // Stampa (0, 0, 0)\n"
+"GD.Print(box.Size);     // Stampa (10, 2, 5)\n"
+"\n"
+"box = box.Expand(new Vector3(-5, 0, 5));\n"
+"GD.Print(box.Position); // Stampa (-5, 0, 0)\n"
+"GD.Print(box.Size);     // Stampa (15, 2, 5)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the center point of the bounding box. This is the same as "
 "[code]position + (size / 2.0)[/code]."
@@ -5758,6 +7444,49 @@ msgstr ""
 "[member position], e un [param idx] di [code]7[/code] è lo stesso di [member "
 "end]."
 
+msgid ""
+"Returns the longest normalized axis of this bounding box's [member size], as "
+"a [Vector3] ([constant Vector3.RIGHT], [constant Vector3.UP], or [constant "
+"Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_longest_axis())       # Prints (0.0, 0.0, 1.0)\n"
+"print(box.get_longest_axis_index()) # Prints 2\n"
+"print(box.get_longest_axis_size())  # Prints 8.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetLongestAxis());      // Prints (0, 0, 1)\n"
+"GD.Print(box.GetLongestAxisIndex()); // Prints Z\n"
+"GD.Print(box.GetLongestAxisSize());  // Prints 8\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method get_longest_axis_index] and [method get_longest_axis_size]."
+msgstr ""
+"Restituisce l'asse normalizzato più lungo di [member size] di questa bounding "
+"box, come [Vector3] ([constant Vector3.RIGHT], [constant Vector3.UP] o "
+"[constant Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_longest_axis())       # Stampa (0.0, 0.0, 1.0)\n"
+"print(box.get_longest_axis_index()) # Stampa 2\n"
+"print(box.get_longest_axis_size())  # Stampa 8.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetLongestAxis());      // Stampa (0, 0, 1)\n"
+"GD.Print(box.GetLongestAxisIndex()); // Stampa Z\n"
+"GD.Print(box.GetLongestAxisSize());  // Stampa 8\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Vedi anche [method get_longest_axis_index] e [method get_longest_axis_size]."
+
 msgid ""
 "Returns the index to the longest axis of this bounding box's [member size] "
 "(see [constant Vector3.AXIS_X], [constant Vector3.AXIS_Y], and [constant "
@@ -5776,6 +7505,49 @@ msgstr ""
 "Restituisce la dimensione più lunga di [member size] di questa bounding box.\n"
 "Per un esempio, vedi [method get_longest_axis]."
 
+msgid ""
+"Returns the shortest normalized axis of this bounding box's [member size], as "
+"a [Vector3] ([constant Vector3.RIGHT], [constant Vector3.UP], or [constant "
+"Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_shortest_axis())       # Prints (1.0, 0.0, 0.0)\n"
+"print(box.get_shortest_axis_index()) # Prints 0\n"
+"print(box.get_shortest_axis_size())  # Prints 2.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetShortestAxis());      // Prints (1, 0, 0)\n"
+"GD.Print(box.GetShortestAxisIndex()); // Prints X\n"
+"GD.Print(box.GetShortestAxisSize());  // Prints 2\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method get_shortest_axis_index] and [method get_shortest_axis_size]."
+msgstr ""
+"Restituisce l'asse normalizzato più corto di [member size] di questa bounding "
+"box, come [Vector3] ([constant Vector3.RIGHT], [constant Vector3.UP] o "
+"[constant Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_shortest_axis())       # Stampa (1.0, 0.0, 0.0)\n"
+"print(box.get_shortest_axis_index()) # Stampa 0\n"
+"print(box.get_shortest_axis_size())  # Stampa 2\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetShortestAxis());      // Stampa (1, 0, 0)\n"
+"GD.Print(box.GetShortestAxisIndex()); // Stampa X\n"
+"GD.Print(box.GetShortestAxisSize());  // Stampa 2\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Vedi anche [method get_shortest_axis_index] e [method get_shortest_axis_size]."
+
 msgid ""
 "Returns the index to the shortest axis of this bounding box's [member size] "
 "(see [constant Vector3.AXIS_X], [constant Vector3.AXIS_Y], and [constant "
@@ -5810,6 +7582,54 @@ msgstr ""
 "Restituisce il volume della bounding box. Questo è equivalente a [code]size.x "
 "* size.y * size.z[/code]. Vedi anche [method has_volume]."
 
+msgid ""
+"Returns a copy of this bounding box extended on all sides by the given amount "
+"[param by]. A negative amount shrinks the box instead.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var a = AABB(Vector3(4, 4, 4), Vector3(8, 8, 8)).grow(4)\n"
+"print(a.position) # Prints (0.0, 0.0, 0.0)\n"
+"print(a.size)     # Prints (16.0, 16.0, 16.0)\n"
+"\n"
+"var b = AABB(Vector3(0, 0, 0), Vector3(8, 4, 2)).grow(2)\n"
+"print(b.position) # Prints (-2.0, -2.0, -2.0)\n"
+"print(b.size)     # Prints (12.0, 8.0, 6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var a = new Aabb(new Vector3(4, 4, 4), new Vector3(8, 8, 8)).Grow(4);\n"
+"GD.Print(a.Position); // Prints (0, 0, 0)\n"
+"GD.Print(a.Size);     // Prints (16, 16, 16)\n"
+"\n"
+"var b = new Aabb(new Vector3(0, 0, 0), new Vector3(8, 4, 2)).Grow(2);\n"
+"GD.Print(b.Position); // Prints (-2, -2, -2)\n"
+"GD.Print(b.Size);     // Prints (12, 8, 6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce una copia di questa bounding box estesa su tutti i lati dalla "
+"quantità fornita ([param by]). Una quantità negativa invece restringe la "
+"scatola.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var a = AABB(Vector3(4, 4, 4), Vector3(8, 8, 8)).grow(4)\n"
+"print(a.position) # Stampa (0.0, 0.0, 0.0)\n"
+"print(a.size)     # Stampa (16.0, 16.0, 16.0)\n"
+"\n"
+"var b = AABB(Vector3(0, 0, 0), Vector3(8, 4, 2)).grow(2)\n"
+"print(b.position) # Stampa (-2.0, -2.0, -2.0)\n"
+"print(b.size)     # Stampa (12.0, 8.0, 6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var a = new Aabb(new Vector3(4, 4, 4), new Vector3(8, 8, 8)).Grow(4);\n"
+"GD.Print(a.Position); // Stampa (0, 0, 0)\n"
+"GD.Print(a.Size);     // Stampa (16, 16, 16)\n"
+"\n"
+"var b = new Aabb(new Vector3(0, 0, 0), new Vector3(8, 4, 2)).Grow(2);\n"
+"GD.Print(b.Position); // Stampa (-2, -2, -2)\n"
+"GD.Print(b.Size);     // Stampa (12, 8, 6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns [code]true[/code] if the bounding box contains the given [param "
 "point]. By convention, points exactly on the right, top, and front sides are "
@@ -5840,6 +7660,57 @@ msgstr ""
 "Restituisce [code]true[/code] se la lunghezza, l'altezza, e la profondità di "
 "questa bounding box sono tutti positivi. Vedi anche [method get_volume]."
 
+msgid ""
+"Returns the intersection between this bounding box and [param with]. If the "
+"boxes do not intersect, returns an empty [AABB]. If the boxes intersect at "
+"the edge, returns a flat [AABB] with no volume (see [method has_surface] and "
+"[method has_volume]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box1 = AABB(Vector3(0, 0, 0), Vector3(5, 2, 8))\n"
+"var box2 = AABB(Vector3(2, 0, 2), Vector3(8, 4, 4))\n"
+"\n"
+"var intersection = box1.intersection(box2)\n"
+"print(intersection.position) # Prints (2.0, 0.0, 2.0)\n"
+"print(intersection.size)     # Prints (3.0, 2.0, 4.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box1 = new Aabb(new Vector3(0, 0, 0), new Vector3(5, 2, 8));\n"
+"var box2 = new Aabb(new Vector3(2, 0, 2), new Vector3(8, 4, 4));\n"
+"\n"
+"var intersection = box1.Intersection(box2);\n"
+"GD.Print(intersection.Position); // Prints (2, 0, 2)\n"
+"GD.Print(intersection.Size);     // Prints (3, 2, 4)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you only need to know whether two bounding boxes are "
+"intersecting, use [method intersects], instead."
+msgstr ""
+"Restituisce l'intersezione tra questa bounding box e [param con]. Se i box "
+"non si intersecano, restituisce un [AABB] vuoto. Se i box si intersecano al "
+"bordo, restituisce un [AABB] piatto senza volume (vedi [method has_surface] e "
+"[method has_volume]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box1 = AABB(Vector3(0, 0, 0), Vector3(5, 2, 8))\n"
+"var box2 = AABB(Vector3(2, 0, 2), Vector3(8, 4, 4))\n"
+"\n"
+"var intersection = box1.intersection(box2)\n"
+"print(intersection.position) # Stampa (2.0, 0.0, 2.0)\n"
+"print(intersection.size)     # Stampa (3.0, 2.0, 4.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box1 = new Aabb(new Vector3(0, 0, 0), new Vector3(5, 2, 8));\n"
+"var box2 = new Aabb(new Vector3(2, 0, 2), new Vector3(8, 4, 4));\n"
+"\n"
+"var intersection = box1.Intersection(box2);\n"
+"GD.Print(intersection.Position); // Stampa (2, 0, 2)\n"
+"GD.Print(intersection.Size);     // Stampa (3, 2, 4)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Se hai solo bisogno di sapere se due bounding box sono "
+"intersecanti, utilizza [method intersects], invece."
+
 msgid ""
 "Returns [code]true[/code] if this bounding box overlaps with the box [param "
 "with]. The edges of both boxes are [i]always[/i] excluded."
@@ -5876,6 +7747,23 @@ msgstr ""
 "restituisce [code]null[/code].\n"
 "Il raggio comincia da [param from], e finisce a [param to]."
 
+msgid ""
+"Returns [code]true[/code] if this bounding box and [param aabb] are "
+"approximately equal, by calling [method Vector3.is_equal_approx] on the "
+"[member position] and the [member size]."
+msgstr ""
+"Restituisce [code]true[/code] se questa bounding box e [param aabb] sono "
+"approssimativamente eguali, chiamando [method Vector3.is_equal_approx] su "
+"[member position] e [member size]."
+
+msgid ""
+"Returns [code]true[/code] if this bounding box's values are finite, by "
+"calling [method Vector3.is_finite] on the [member position] and the [member "
+"size]."
+msgstr ""
+"Restituisce [code]true[/code] se i valori di questa bounding box sono finiti, "
+"chiamando [method Vector3.is_finite] su [member position] e [member size]."
+
 msgid ""
 "Returns an [AABB] that encloses both this bounding box and [param with] "
 "around the edges. See also [method encloses]."
@@ -5883,6 +7771,40 @@ msgstr ""
 "Restituisce un [AABB] che racchiude sia questa bounding box sia [param with] "
 "intorno ai bordi. Vedi anche [method encloses]."
 
+msgid ""
+"The ending point. This is usually the corner on the top-right and back of the "
+"bounding box, and is equivalent to [code]position + size[/code]. Setting this "
+"point affects the [member size]."
+msgstr ""
+"Il punto di fine. Questo è di solito lo spigolo in alto a destra e sul retro "
+"della bounding box, ed è equivalente a [code]position + size[/code]. "
+"Impostare questo punto influisce su [member size]."
+
+msgid ""
+"The origin point. This is usually the corner on the bottom-left and forward "
+"of the bounding box."
+msgstr ""
+"Il punto di origine. Questo è di solito lo spigolo in basso a sinistra e in "
+"avanti della bounding box."
+
+msgid ""
+"The bounding box's width, height, and depth starting from [member position]. "
+"Setting this value also affects the [member end] point.\n"
+"[b]Note:[/b] It's recommended setting the width, height, and depth to non-"
+"negative values. This is because most methods in Godot assume that the "
+"[member position] is the bottom-left-forward corner, and the [member end] is "
+"the top-right-back corner. To get an equivalent bounding box with non-"
+"negative size, use [method abs]."
+msgstr ""
+"La larghezza, l'altezza e la profondità della bounding box a partire da "
+"[member position]. Impostare questo valore influisce anche sul punto [member "
+"end].\n"
+"[b]Nota:[/b] Si raccomanda di impostare la larghezza, l'altezza e la "
+"profondità a valori non negativi. Questo perché la maggior parte dei metodi "
+"in Godot presumono che [member position] sia lo spigolo in basso a sinistra "
+"anteriore, e che [member end] sia lo spigolo in alto a destra posteriore. Per "
+"ottenere una bounding box con dimensioni non negative, utilizza [method abs]."
+
 msgid ""
 "Returns [code]true[/code] if the [member position] or [member size] of both "
 "bounding boxes are not equal.\n"
@@ -6496,6 +8418,35 @@ msgstr ""
 "-1.0[/code] e [code]from_end = true[/code], quindi vedi la sua descrizione "
 "per ulteriori informazioni."
 
+msgid ""
+"Sets [member frame] the [member frame_progress] to the given values. Unlike "
+"setting [member frame], this method does not reset the [member "
+"frame_progress] to [code]0.0[/code] implicitly.\n"
+"[b]Example:[/b] Change the animation while keeping the same [member frame] "
+"and [member frame_progress]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_frame = animated_sprite.get_frame()\n"
+"var current_progress = animated_sprite.get_frame_progress()\n"
+"animated_sprite.play(\"walk_another_skin\")\n"
+"animated_sprite.set_frame_and_progress(current_frame, current_progress)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Imposta [member frame] e [member frame_progress] ai valori forniti. A "
+"differenza di impostare [member frame], questo metodo non ripristina [member "
+"frame_progress] a [code]0.0[/code] implicitamente.\n"
+"[b]Esempio:[/b] Cambia l'animazione, mantenendo lo stesso [member frame] e "
+"[member frame_progress].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_frame = animated_sprite.get_frame()\n"
+"var current_progress = animated_sprite.get_frame_progress()\n"
+"animated_sprite.play(\"walk_another_skin\")\n"
+"animated_sprite.set_frame_and_progress(current_frame, current_progress)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
 msgid ""
 "Stops the currently playing animation. The animation position is reset to "
 "[code]0[/code] and the [code]custom_speed[/code] is reset to [code]1.0[/"
@@ -6841,6 +8792,9 @@ msgstr ""
 msgid "Animation documentation index"
 msgstr "Indice di documentazione di animazione"
 
+msgid "Adds a marker to this Animation."
+msgstr "Aggiunge un marcatore a questa animazione."
+
 msgid "Adds a track to the Animation."
 msgstr "Aggiunge una traccia all'animazione."
 
@@ -7061,9 +9015,44 @@ msgstr ""
 "Restituisce l'indice della traccia specificata. Se la traccia non è trovata, "
 "restituisce -1."
 
+msgid "Returns the name of the marker located at the given time."
+msgstr "Restituisce il nome del marcatore situato al tempo fornito."
+
+msgid "Returns the given marker's color."
+msgstr "Restituisce il colore del marcatore specificato."
+
+msgid "Returns every marker in this Animation, sorted ascending by time."
+msgstr ""
+"Restituisce ogni marcatore in questa animazione, ordinati in ordine crescente "
+"di tempo."
+
+msgid "Returns the given marker's time."
+msgstr "Restituisce il tempo del marcatore specificato."
+
+msgid ""
+"Returns the closest marker that comes after the given time. If no such marker "
+"exists, an empty string is returned."
+msgstr ""
+"Restituisce il marcatore più vicino che viene dopo il tempo specificato. Se "
+"tale marcatore non esiste, viene restituita una stringa vuota."
+
+msgid ""
+"Returns the closest marker that comes before the given time. If no such "
+"marker exists, an empty string is returned."
+msgstr ""
+"Restituisce il marcatore più vicino che viene prima del tempo specificato. Se "
+"tale marcatore non esiste, viene restituita una stringa vuota."
+
 msgid "Returns the amount of tracks in the animation."
 msgstr "Restituisce la quantità di tracce nell'animazione."
 
+msgid ""
+"Returns [code]true[/code] if this Animation contains a marker with the given "
+"name."
+msgstr ""
+"Restituisce [code]true[/code] se questa animazione contiene un marcatore con "
+"il nome specificato."
+
 msgid "Returns the method name of a method track."
 msgstr "Restituisce il nome del metodo di una traccia di metodi."
 
@@ -7074,6 +9063,14 @@ msgstr ""
 "Restituisce i valori degli argomenti da chiamare su una traccia di metodi per "
 "una determinata chiave in una determinata traccia."
 
+msgid ""
+"Optimize the animation and all its tracks in-place. This will preserve only "
+"as many keys as are necessary to keep the animation within the specified "
+"bounds."
+msgstr ""
+"Ottimizza l'animazione e tutte le sue tracce sul posto. Ciò preserverà solo "
+"le chiavi necessarie per mantenere l'animazione entro i limiti specificati."
+
 msgid "Inserts a key in a given 3D position track. Returns the key index."
 msgstr ""
 "Inserire una chiave in una determinata traccia di posizione 3D. Restituisce "
@@ -7087,6 +9084,9 @@ msgstr ""
 "secondi). Il [param track_idx] deve essere l'indice di una traccia di "
 "posizione 3D."
 
+msgid "Removes the marker with the given name from this Animation."
+msgstr "Rimuove il marcatore con il nome specificato da questa animazione."
+
 msgid "Removes a track by specifying the track index."
 msgstr "Rimuove una traccia specificando l'indice della traccia."
 
@@ -7116,6 +9116,9 @@ msgstr ""
 "secondi). Il [param track_idx] deve essere l'indice di una traccia di scala "
 "3D."
 
+msgid "Sets the given marker's color."
+msgstr "Imposta il colore del marcatore specificato."
+
 msgid ""
 "Finds the key index by time in a given track. Optionally, only find it if the "
 "approx/exact time is given.\n"
@@ -7504,6 +9507,10 @@ msgstr ""
 msgid "Returns the keys for the [Animation]s stored in the library."
 msgstr "Restituisce le chiavi per l'animazione memorizzata nella libreria."
 
+msgid "Returns the key count for the [Animation]s stored in the library."
+msgstr ""
+"Restituisce il numero di chiavi per le animazioni memorizzate nella libreria."
+
 msgid ""
 "Returns [code]true[/code] if the library stores an [Animation] with [param "
 "name] as the key."
@@ -7663,6 +9670,364 @@ msgstr "Restituisce la lista di chiavi memorizzate di libreria."
 msgid "Returns the list of stored animation keys."
 msgstr "Restituisce la lista di chiavi memorizzate di animazione."
 
+msgid ""
+"Retrieve the motion delta of position with the [member root_motion_track] as "
+"a [Vector3] that can be used elsewhere.\n"
+"If [member root_motion_track] is not a path to a track of type [constant "
+"Animation.TYPE_POSITION_3D], returns [code]Vector3(0, 0, 0)[/code].\n"
+"See also [member root_motion_track] and [RootMotionView].\n"
+"The most basic example is applying position to [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_rotation\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_rotation = get_quaternion()\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var velocity = current_rotation * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"By using this in combination with [method "
+"get_root_motion_rotation_accumulator], you can apply the root motion position "
+"more correctly to account for the rotation of the node.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = (animation_tree.get_root_motion_rotation_accumulator()."
+"inverse() * get_quaternion()) * animation_tree.get_root_motion_position() / "
+"delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"If [member root_motion_local] is [code]true[/code], return the pre-multiplied "
+"translation value with the inverted rotation.\n"
+"In this case, the code can be written as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = get_quaternion() * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Recupera il delta di movimento della posizione con la [member "
+"root_motion_track] come [Vector3] che può essere utilizzato altrove.\n"
+"Se [member root_motion_track] non è un percorso verso una traccia di tipo "
+"[constant Animation.TYPE_POSITION_3D], restituisce [code]Vector3(0, 0, 0)[/"
+"code].\n"
+"Vedi anche [member root_motion_track] e [RootMotionView].\n"
+"L'esempio più basilare è l'applicazione della posizione a [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_rotation\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_rotation = get_quaternion()\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var velocity = current_rotation * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Utilizzando questo in combinazione con [method "
+"get_root_motion_rotation_accumulator], puoi applicare la posizione del "
+"movimento della radice più correttamente per tenere conto della rotazione del "
+"nodo.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = (animation_tree.get_root_motion_rotation_accumulator()."
+"inverse() * get_quaternion()) * animation_tree.get_root_motion_position() / "
+"delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Se [member root_motion_local] è [code]true[/code], restituisce il valore di "
+"traslazione pre-moltiplicato con la rotazione invertita.\n"
+"In questo caso, il codice può essere scritto come segue:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = get_quaternion() * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Retrieve the blended value of the position tracks with the [member "
+"root_motion_track] as a [Vector3] that can be used elsewhere.\n"
+"This is useful in cases where you want to respect the initial key values of "
+"the animation.\n"
+"For example, if an animation with only one key [code]Vector3(0, 0, 0)[/code] "
+"is played in the previous frame and then an animation with only one key "
+"[code]Vector3(1, 0, 1)[/code] is played in the next frame, the difference can "
+"be calculated as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_position_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_position_accumulator = animation_tree."
+"get_root_motion_position_accumulator()\n"
+"    var difference = current_root_motion_position_accumulator - "
+"prev_root_motion_position_accumulator\n"
+"    prev_root_motion_position_accumulator = "
+"current_root_motion_position_accumulator\n"
+"    transform.origin += difference\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"However, if the animation loops, an unintended discrete change may occur, so "
+"this is only useful for some simple use cases."
+msgstr ""
+"Recupera il valore combinato delle tracce di posizione con [member "
+"root_motion_track] come [Vector3] che può essere utilizzato altrove.\n"
+"Ciò è utile nei casi in cui si desidera rispettare i valori della chiave "
+"iniziale dell'animazione.\n"
+"Ad esempio, se un'animazione con una sola chiave [code]Vector3(0, 0, 0)[/"
+"code] viene riprodotta nel frame precedente e poi un'animazione con una sola "
+"chiave [code]Vector3(1, 0, 1)[/code] viene riprodotta nel frame successivo, "
+"la differenza può essere calcolata come segue:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_position_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_position_accumulator = animation_tree."
+"get_root_motion_position_accumulator()\n"
+"    var difference = current_root_motion_position_accumulator - "
+"prev_root_motion_position_accumulator\n"
+"    prev_root_motion_position_accumulator = "
+"current_root_motion_position_accumulator\n"
+"    transform.origin += difference\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Tuttavia, se l'animazione si ripete, potrebbe verificarsi un cambiamento "
+"discreto indesiderato, quindi questa funzionalità è utile solo per alcuni "
+"casi d'uso semplici."
+
+msgid ""
+"Retrieve the motion delta of rotation with the [member root_motion_track] as "
+"a [Quaternion] that can be used elsewhere.\n"
+"If [member root_motion_track] is not a path to a track of type [constant "
+"Animation.TYPE_ROTATION_3D], returns [code]Quaternion(0, 0, 0, 1)[/code].\n"
+"See also [member root_motion_track] and [RootMotionView].\n"
+"The most basic example is applying rotation to [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Recupera il delta del movimento di rotazione con [member root_motion_track] "
+"come [Quaternion] che può essere utilizzato altrove.\n"
+"Se [member root_motion_track] non è un percorso verso una traccia di tipo "
+"[constant Animation.TYPE_ROTATION_3D], restituisce [code]Quaternion(0, 0, 0, "
+"1)[/code].\n"
+"Vedi anche [member root_motion_track] e [RootMotionView].\n"
+"L'esempio più basilare è per applicare la rotazione a [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Retrieve the blended value of the rotation tracks with the [member "
+"root_motion_track] as a [Quaternion] that can be used elsewhere.\n"
+"This is necessary to apply the root motion position correctly, taking "
+"rotation into account. See also [method get_root_motion_position].\n"
+"Also, this is useful in cases where you want to respect the initial key "
+"values of the animation.\n"
+"For example, if an animation with only one key [code]Quaternion(0, 0, 0, 1)[/"
+"code] is played in the previous frame and then an animation with only one key "
+"[code]Quaternion(0, 0.707, 0, 0.707)[/code] is played in the next frame, the "
+"difference can be calculated as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_rotation_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_rotation_accumulator = animation_tree."
+"get_root_motion_rotation_accumulator()\n"
+"    var difference = prev_root_motion_rotation_accumulator.inverse() * "
+"current_root_motion_rotation_accumulator\n"
+"    prev_root_motion_rotation_accumulator = "
+"current_root_motion_rotation_accumulator\n"
+"    transform.basis *=  Basis(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"However, if the animation loops, an unintended discrete change may occur, so "
+"this is only useful for some simple use cases."
+msgstr ""
+"Recupera il valore combinato delle tracce di rotazione con [member "
+"root_motion_track] come [Quaternion] che può essere utilizzato altrove.\n"
+"Ciò è necessario per applicare correttamente la posizione del movimento "
+"radice, tenendo conto della rotazione. Vedi anche [method "
+"get_root_motion_position].\n"
+"Inoltre, ciò è utile nei casi in cui si desidera rispettare i valori della "
+"chiave iniziale dell'animazione.\n"
+"Ad esempio, se un'animazione con una sola chiave [code]Quaternion(0, 0, 0, 1)"
+"[/code] viene riprodotta nel frame precedente e poi un'animazione con una "
+"sola chiave [code]Quaternion(0, 0.707, 0, 0.707)[/code] viene riprodotta nel "
+"frame successivo, la differenza può essere calcolata come segue:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_rotation_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_rotation_accumulator = animation_tree."
+"get_root_motion_rotation_accumulator()\n"
+"    var difference = prev_root_motion_rotation_accumulator.inverse() * "
+"current_root_motion_rotation_accumulator\n"
+"    prev_root_motion_rotation_accumulator = "
+"current_root_motion_rotation_accumulator\n"
+"    transform.basis *=  Basis(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Tuttavia, se l'animazione si ripete, potrebbe verificarsi un cambiamento "
+"discreto indesiderato, quindi questa funzionalità è utile solo per alcuni "
+"casi d'uso semplici."
+
+msgid ""
+"Retrieve the motion delta of scale with the [member root_motion_track] as a "
+"[Vector3] that can be used elsewhere.\n"
+"If [member root_motion_track] is not a path to a track of type [constant "
+"Animation.TYPE_SCALE_3D], returns [code]Vector3(0, 0, 0)[/code].\n"
+"See also [member root_motion_track] and [RootMotionView].\n"
+"The most basic example is applying scale to [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_scale = Vector3(1, 1, 1)\n"
+"var scale_accum = Vector3(1, 1, 1)\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_scale = get_scale()\n"
+"        scale_accum = Vector3(1, 1, 1)\n"
+"        state_machine.travel(\"Animate\")\n"
+"    scale_accum += animation_tree.get_root_motion_scale()\n"
+"    set_scale(current_scale * scale_accum)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Recupera il delta di movimento della scala con la [member root_motion_track] "
+"come [Vector3] che può essere utilizzato altrove.\n"
+"Se [member root_motion_track] non è un percorso verso una traccia di tipo "
+"[constant Animation.TYPE_POSITION_3D], restituisce [code]Vector3(0, 0, 0)[/"
+"code].\n"
+"Vedi anche [member root_motion_track] e [RootMotionView].\n"
+"L'esempio più basilare è l'applicazione della posizione a [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_scale = Vector3(1, 1, 1)\n"
+"var scale_accum = Vector3(1, 1, 1)\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_scale = get_scale()\n"
+"        scale_accum = Vector3(1, 1, 1)\n"
+"        state_machine.travel(\"Animate\")\n"
+"    scale_accum += animation_tree.get_root_motion_scale()\n"
+"    set_scale(current_scale * scale_accum)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Retrieve the blended value of the scale tracks with the [member "
+"root_motion_track] as a [Vector3] that can be used elsewhere.\n"
+"For example, if an animation with only one key [code]Vector3(1, 1, 1)[/code] "
+"is played in the previous frame and then an animation with only one key "
+"[code]Vector3(2, 2, 2)[/code] is played in the next frame, the difference can "
+"be calculated as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_scale_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_scale_accumulator = animation_tree."
+"get_root_motion_scale_accumulator()\n"
+"    var difference = current_root_motion_scale_accumulator - "
+"prev_root_motion_scale_accumulator\n"
+"    prev_root_motion_scale_accumulator = "
+"current_root_motion_scale_accumulator\n"
+"    transform.basis = transform.basis.scaled(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"However, if the animation loops, an unintended discrete change may occur, so "
+"this is only useful for some simple use cases."
+msgstr ""
+"Recupera il valore combinato delle tracce di scala con [member "
+"root_motion_track] come [Vector3] che può essere utilizzato altrove.\n"
+"Ad esempio, se un'animazione con una sola chiave [code]Vector3(1, 1, 1)[/"
+"code] viene riprodotta nel frame precedente e poi un'animazione con una sola "
+"chiave [code]Vector3(2, 2, 2)[/code] viene riprodotta nel frame successivo, "
+"la differenza può essere calcolata come segue:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_scale_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_scale_accumulator = animation_tree."
+"get_root_motion_scale_accumulator()\n"
+"    var difference = current_root_motion_scale_accumulator - "
+"prev_root_motion_scale_accumulator\n"
+"    prev_root_motion_scale_accumulator = "
+"current_root_motion_scale_accumulator\n"
+"    transform.basis = transform.basis.scaled(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Tuttavia, se l'animazione si ripete, potrebbe verificarsi un cambiamento "
+"discreto indesiderato, quindi questa funzionalità è utile solo per alcuni "
+"casi d'uso semplici."
+
 msgid ""
 "Returns [code]true[/code] if the [AnimationMixer] stores an [Animation] with "
 "key [param name]."
@@ -7789,6 +10154,16 @@ msgstr ""
 "animazioni nell'editor, in quanto le modifiche alla scena non saranno salvate "
 "finché sono impostate nell'animazione di reset."
 
+msgid ""
+"If [code]true[/code], [method get_root_motion_position] value is extracted as "
+"a local translation value before blending. In other words, it is treated like "
+"the translation is done after the rotation."
+msgstr ""
+"Se [code]true[/code], il valore da [method get_root_motion_position] viene "
+"estratto come valore di traslazione locale prima della fusione. In altre "
+"parole, viene trattato come se la traslazione fosse stata effettuata dopo la "
+"rotazione."
+
 msgid ""
 "The path to the Animation track used for root motion. Paths must be valid "
 "scene-tree paths to a node, and must be specified starting from the parent "
@@ -7914,13 +10289,209 @@ msgstr ""
 "Animation.UPDATE_DISCRETE]. Questo è il comportamento predefinito per "
 "[AnimationPlayer]."
 
+msgid ""
+"Always treat the [constant Animation.UPDATE_DISCRETE] track value as "
+"[constant Animation.UPDATE_CONTINUOUS] with [constant Animation."
+"INTERPOLATION_NEAREST]. This is the default behavior for [AnimationTree].\n"
+"If a value track has un-interpolatable type key values, it is internally "
+"converted to use [constant ANIMATION_CALLBACK_MODE_DISCRETE_RECESSIVE] with "
+"[constant Animation.UPDATE_DISCRETE].\n"
+"Un-interpolatable type list:\n"
+"- [constant @GlobalScope.TYPE_NIL]\n"
+"- [constant @GlobalScope.TYPE_NODE_PATH]\n"
+"- [constant @GlobalScope.TYPE_RID]\n"
+"- [constant @GlobalScope.TYPE_OBJECT]\n"
+"- [constant @GlobalScope.TYPE_CALLABLE]\n"
+"- [constant @GlobalScope.TYPE_SIGNAL]\n"
+"- [constant @GlobalScope.TYPE_DICTIONARY]\n"
+"- [constant @GlobalScope.TYPE_PACKED_BYTE_ARRAY]\n"
+"[constant @GlobalScope.TYPE_BOOL] and [constant @GlobalScope.TYPE_INT] are "
+"treated as [constant @GlobalScope.TYPE_FLOAT] during blending and rounded "
+"when the result is retrieved.\n"
+"It is same for arrays and vectors with them such as [constant @GlobalScope."
+"TYPE_PACKED_INT32_ARRAY] or [constant @GlobalScope.TYPE_VECTOR2I], they are "
+"treated as [constant @GlobalScope.TYPE_PACKED_FLOAT32_ARRAY] or [constant "
+"@GlobalScope.TYPE_VECTOR2]. Also note that for arrays, the size is also "
+"interpolated.\n"
+"[constant @GlobalScope.TYPE_STRING] and [constant @GlobalScope."
+"TYPE_STRING_NAME] are interpolated between character codes and lengths, but "
+"note that there is a difference in algorithm between interpolation between "
+"keys and interpolation by blending."
+msgstr ""
+"Tratta sempre il valore della traccia [constant Animation.UPDATE_DISCRETE] "
+"come [constant Animation.UPDATE_CONTINUOUS] con [constant Animation."
+"INTERPOLATION_NEAREST]. Questo è il comportamento predefinito per "
+"[AnimationTree].\n"
+"Se una traccia di valore ha valori di chiave di tipo non interpolabili, viene "
+"convertita internamente per usare [constant "
+"ANIMATION_CALLBACK_MODE_DISCRETE_RECESSIVE] con [constant Animation."
+"UPDATE_DISCRETE].\n"
+"[constant @GlobalScope.TYPE_BOOL] e [constant @GlobalScope.TYPE_INT] vengono "
+"trattati come [constant @GlobalScope.TYPE_FLOAT] durante la fusione e "
+"arrotondati quando il risultato viene recuperato.\n"
+"Lista di tipi che non si possono interpolare:\n"
+"- [constant @GlobalScope.TYPE_NIL]\n"
+"- [constant @GlobalScope.TYPE_NODE_PATH]\n"
+"- [constant @GlobalScope.TYPE_RID]\n"
+"- [constant @GlobalScope.TYPE_OBJECT]\n"
+"- [constant @GlobalScope.TYPE_CALLABLE]\n"
+"- [constant @GlobalScope.TYPE_SIGNAL]\n"
+"- [constant @GlobalScope.TYPE_DICTIONARY]\n"
+"- [constant @GlobalScope.TYPE_PACKED_BYTE_ARRAY]\n"
+"Lo stesso vale per array e vettori, come [constant @GlobalScope."
+"TYPE_PACKED_INT32_ARRAY] o [constant @GlobalScope.TYPE_VECTOR2I], vengono "
+"trattati come [constant @GlobalScope.TYPE_PACKED_FLOAT32_ARRAY] o [constant "
+"@GlobalScope.TYPE_VECTOR2]. Nota inoltre che per gli array, anche la "
+"dimensione viene interpolata.\n"
+"[constant @GlobalScope.TYPE_STRING] e [constant @GlobalScope."
+"TYPE_STRING_NAME] vengono interpolate tra codici carattere e lunghezze, ma si "
+"noti che esiste una differenza nell'algoritmo tra l'interpolazione tra chiavi "
+"e l'interpolazione tramite fusione."
+
 msgid "Base class for [AnimationTree] nodes. Not related to scene nodes."
 msgstr ""
 "Classe di base per nodi [AnimationTree]. Non riguarda i nodi della scena."
 
+msgid ""
+"Base resource for [AnimationTree] nodes. In general, it's not used directly, "
+"but you can create custom ones with custom blending formulas.\n"
+"Inherit this when creating animation nodes mainly for use in "
+"[AnimationNodeBlendTree], otherwise [AnimationRootNode] should be used "
+"instead.\n"
+"You can access the time information as read-only parameter which is processed "
+"and stored in the previous frame for all nodes except [AnimationNodeOutput].\n"
+"[b]Note:[/b] If multiple inputs exist in the [AnimationNode], which time "
+"information takes precedence depends on the type of [AnimationNode].\n"
+"[codeblock]\n"
+"var current_length = $AnimationTree[parameters/AnimationNodeName/"
+"current_length]\n"
+"var current_position = $AnimationTree[parameters/AnimationNodeName/"
+"current_position]\n"
+"var current_delta = $AnimationTree[parameters/AnimationNodeName/"
+"current_delta]\n"
+"[/codeblock]"
+msgstr ""
+"Risorsa base per i nodi [AnimationTree]. In genere, non viene utilizzata "
+"direttamente, ma puoi crearne di personalizzate, con formule di fusione "
+"personalizzate.\n"
+"Eredita questo quando crei nodi di animazione principalmente per l'uso in "
+"[AnimationNodeBlendTree], altrimenti dovrebbe essere utilizzato "
+"[AnimationRootNode].\n"
+"È possibile accedere alle informazioni sul tempo come parametro di sola "
+"lettura, che vengono elaborati e memorizzati nel frame precedente per tutti i "
+"nodi eccetto [AnimationNodeOutput].\n"
+"[b]Nota:[/b] Se sono presenti più input nell'[AnimationNode], le informazioni "
+"sul tempo che hanno la precedenza dipendono dal tipo di [AnimationNode].\n"
+"[codeblock]\n"
+"var current_length = $AnimationTree[parameters/AnimationNodeName/"
+"current_length]\n"
+"var current_position = $AnimationTree[parameters/AnimationNodeName/"
+"current_position]\n"
+"var current_delta = $AnimationTree[parameters/AnimationNodeName/"
+"current_delta]\n"
+"[/codeblock]"
+
 msgid "Using AnimationTree"
 msgstr "Utilizzare l'AnimationTree"
 
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"override the text caption for this animation node."
+msgstr ""
+"Quando si eredita da [AnimationRootNode], implementare questo metodo virtuale "
+"per sovrascrivere la didascalia di testo per questo nodo di animazione."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return a child animation node by its [param name]."
+msgstr ""
+"Quando si eredita da [AnimationRootNode], implementare questo metodo virtuale "
+"per restituire un nodo di animazione figlio dal nome [param name]."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return all child animation nodes in order as a [code]name: node[/code] "
+"dictionary."
+msgstr ""
+"Quando si eredita da [AnimationRootNode], implementare questo metodo virtuale "
+"per restituire tutti i nodi di animazione figlio in ordine, sotto forma di un "
+"dizionario [code]nome: nodo[/code]."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return the default value of a [param parameter]. Parameters are custom local "
+"memory used for your animation nodes, given a resource can be reused in "
+"multiple trees."
+msgstr ""
+"Quando si eredita da [AnimationRootNode], implementare questo metodo virtuale "
+"per restituire il valore predefinito del parametro [param parameter]. I "
+"parametri sono memoria locale personalizzata utilizzata per i nodi di "
+"animazione, poiché una risorsa può essere riutilizzata in più alberi."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return a list of the properties on this animation node. Parameters are custom "
+"local memory used for your animation nodes, given a resource can be reused in "
+"multiple trees. Format is similar to [method Object.get_property_list]."
+msgstr ""
+"Quando si eredita da [AnimationRootNode], implementare questo metodo virtuale "
+"per restituire una lista di proprietà in questo nodo di animazione. I "
+"parametri sono memoria locale personalizzata utilizzata per i nodi di "
+"animazione, poiché una risorsa può essere riutilizzata in più alberi. Il "
+"formato è simile a [method Object.get_property_list]."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return whether the [param parameter] is read-only. Parameters are custom "
+"local memory used for your animation nodes, given a resource can be reused in "
+"multiple trees."
+msgstr ""
+"Quando si eredita da [AnimationRootNode], implementare questo metodo virtuale "
+"per restituire se il parametro [param parameter] è di sola lettura. I "
+"parametri sono memoria locale personalizzata utilizzata per i nodi di "
+"animazione, poiché una risorsa può essere riutilizzata in più alberi."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"run some code when this animation node is processed. The [param time] "
+"parameter is a relative delta, unless [param seek] is [code]true[/code], in "
+"which case it is absolute.\n"
+"Here, call the [method blend_input], [method blend_node] or [method "
+"blend_animation] functions. You can also use [method get_parameter] and "
+"[method set_parameter] to modify local memory.\n"
+"This function should return the delta."
+msgstr ""
+"Quando si eredita da [AnimationRootNode], implementare questo metodo virtuale "
+"per eseguire codice quando questo nodo di animazione viene elaborato. Il "
+"parametro [param time] è un tempo delta relativo, a meno che [param seek] non "
+"sia [code]true[/code], nel qual caso è assoluto.\n"
+"Qui, chiama le funzioni [method blend_input], [method blend_node] o [method "
+"blend_animation]. È anche possibile usare [method get_parameter] e [method "
+"set_parameter] per modificare la memoria locale.\n"
+"Questa funzione dovrebbe restituire il delta."
+
+msgid ""
+"Adds an input to the animation node. This is only useful for animation nodes "
+"created for use in an [AnimationNodeBlendTree]. If the addition fails, "
+"returns [code]false[/code]."
+msgstr ""
+"Aggiunge un input al nodo di animazione. È utile solo per i nodi di "
+"animazione creati per l'uso in un [AnimationNodeBlendTree]. Se l'aggiunta "
+"fallisce, restituisce [code]false[/code]."
+
+msgid ""
+"Blend an animation by [param blend] amount (name must be valid in the linked "
+"[AnimationPlayer]). A [param time] and [param delta] may be passed, as well "
+"as whether [param seeked] happened.\n"
+"A [param looped_flag] is used by internal processing immediately after the "
+"loop. See also [enum Animation.LoopedFlag]."
+msgstr ""
+"Combina un'animazione della quantità [param blend] (il nome deve essere "
+"valido nell'[AnimationPlayer] collegato). È possibile passare un tempo [param "
+"time] e un [param delta], nonché se [param seeked] è avvenuto.\n"
+"Un [param looped_flag] viene utilizzato dall'elaborazione interna "
+"immediatamente dopo la ripetizione. Vedi anche [enum Animation.LoopedFlag]."
+
 msgid ""
 "Blend an input. This is only useful for animation nodes created for an "
 "[AnimationNodeBlendTree]. The [param time] parameter is a relative delta, "
@@ -7969,6 +10540,27 @@ msgstr ""
 "personalizzata utilizzata per i nodi di animazione, dato che una risorsa può "
 "essere riutilizzata in più alberi."
 
+msgid ""
+"Returns the object id of the [AnimationTree] that owns this node.\n"
+"[b]Note:[/b] This method should only be called from within the [method "
+"AnimationNodeExtension._process_animation_node] method, and will return an "
+"invalid id otherwise."
+msgstr ""
+"Restituisce l'ID oggetto dell'[AnimationTree] che possiede questo nodo.\n"
+"[b]Nota:[/b] Questo metodo dovrebbe essere chiamato solo dall'interno del "
+"metodo [method AnimationNodeExtension._process_animation_node], altrimenti "
+"restituirà un ID non valido."
+
+msgid "Returns [code]true[/code] if the given path is filtered."
+msgstr "Restituisce [code]true[/code] se il percorso specificato è filtrato."
+
+msgid ""
+"Returns [code]true[/code] if this animation node is being processed in test-"
+"only mode."
+msgstr ""
+"Restituisce [code]true[/code] se questo nodo d'animazione è in elaborazione "
+"in modalità di solo test."
+
 msgid "Removes an input, call this only when inactive."
 msgstr "Rimuove un'ingresso, richiama questo metodo solo quando inattivo."
 
@@ -8048,9 +10640,86 @@ msgstr ""
 "Fonde due animazioni in modo additivo all'interno di un "
 "[AnimationNodeBlendTree]."
 
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Blends two animations "
+"additively based on the amount value.\n"
+"If the amount is greater than [code]1.0[/code], the animation connected to "
+"\"in\" port is blended with the amplified animation connected to \"add\" "
+"port.\n"
+"If the amount is less than [code]0.0[/code], the animation connected to "
+"\"in\" port is blended with the inverted animation connected to \"add\" port."
+msgstr ""
+"Una risorsa da aggiungere a un [AnimationNodeBlendTree]. Combina due "
+"animazioni in modo additivo in base al valore di quantità.\n"
+"Se la quantità è maggiore di [code]1.0[/code], l'animazione collegata alla "
+"porta \"in\" viene combinata all'animazione amplificata collegata alla porta "
+"\"add\".\n"
+"Se la quantità è minore di [code]0.0[/code], l'animazione collegata alla "
+"porta \"in\" viene combinata all'animazione invertita collegata alla porta "
+"\"add\"."
+
+msgid ""
+"Blends two of three animations additively inside of an "
+"[AnimationNodeBlendTree]."
+msgstr ""
+"Fonde due delle tre animazioni in modo additivo all'interno di un "
+"[AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Blends two animations out "
+"of three additively out of three based on the amount value.\n"
+"This animation node has three inputs:\n"
+"- The base animation to add to\n"
+"- A \"-add\" animation to blend with when the blend amount is negative\n"
+"- A \"+add\" animation to blend with when the blend amount is positive\n"
+"If the absolute value of the amount is greater than [code]1.0[/code], the "
+"animation connected to \"in\" port is blended with the amplified animation "
+"connected to \"-add\"/\"+add\" port."
+msgstr ""
+"Una risorsa da aggiungere a un [AnimationNodeBlendTree]. Combina due "
+"animazioni su tre in modo additivo su tre in base al valore di quantità.\n"
+"Questo nodo di animazione ha tre ingressi:\n"
+"- L'animazione base a cui aggiungere\n"
+"- Un'animazione \"-add\" con cui fondersi quando l'importo di fusione è "
+"negativo\n"
+"- Un'animazione \"+add\" con cui fondersi quando l'importo di fusione è "
+"positivo\n"
+"Se il valore assoluto di quantità è maggiore di [code]1.0[/code], "
+"l'animazione connessa alla porta \"in\" viene fusa con l'animazione "
+"amplificata connessa alla porta \"-add\"/\"+add\"."
+
+msgid "An input animation for an [AnimationNodeBlendTree]."
+msgstr "Un'animazione d'ingresso per un [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Only has one output port "
+"using the [member animation] property. Used as an input for [AnimationNode]s "
+"that blend animations together."
+msgstr ""
+"Una risorsa da aggiungere a un [AnimationNodeBlendTree]. Ha una sola porta "
+"d'uscita che usa la proprietà [member animation]. Usata come ingresso per "
+"[AnimationNode] che fondono le animazioni insieme."
+
+msgid "3D Platformer Demo"
+msgstr "Demo di gioco piattaforme 3D"
+
+msgid ""
+"Animation to use as an output. It is one of the animations provided by "
+"[member AnimationTree.anim_player]."
+msgstr ""
+"Animazione da usare come uscita. È una delle animazioni fornite da [member "
+"AnimationTree.anim_player]."
+
 msgid "Determines the playback direction of the animation."
 msgstr "Restituisce la direzione di riproduzione dell'animazione."
 
+msgid ""
+"If [member use_custom_timeline] is [code]true[/code], offset the start "
+"position of the animation."
+msgstr ""
+"Se [member use_custom_timeline] è [code]true[/code], sposta la posizione "
+"iniziale dell'animazione."
+
 msgid ""
 "If [code]true[/code], [AnimationNode] provides an animation based on the "
 "[Animation] resource with some parameters adjusted."
@@ -8058,6 +10727,12 @@ msgstr ""
 "Se [code]true[/code], l'[AnimationNode] fornisce un'animazione basata sulla "
 "risorsa [Animation] con alcuni parametri aggiustati."
 
+msgid "Plays animation in forward direction."
+msgstr "Riproduce l'animazione in avanti."
+
+msgid "Plays animation in backward direction."
+msgstr "Riproduce l'animazione all'indietro."
+
 msgid ""
 "A resource used by [AnimationNodeBlendTree].\n"
 "[AnimationNodeBlendSpace1D] represents a virtual axis on which any type of "
@@ -8379,6 +11054,28 @@ msgstr "I nodi in ingresso e in uscita sono gli stessi."
 msgid "The specified connection already exists."
 msgstr "La connessione specificata esiste già."
 
+msgid "Base class for extending [AnimationRootNode]s from GDScript, C#, or C++."
+msgstr ""
+"Classe base per estendere gli [AnimationRootNode] da GDScript, C# o C++."
+
+msgid ""
+"[AnimationNodeExtension] exposes the APIs of [AnimationRootNode] to allow "
+"users to extend it from GDScript, C#, or C++. This class is not meant to be "
+"used directly, but to be extended by other classes. It is used to create "
+"custom nodes for the [AnimationTree] system."
+msgstr ""
+"[AnimationNodeExtension] espone le API di [AnimationRootNode] per consentire "
+"agli utenti di estenderlo da GDScript, C# o C++. Questa classe non è pensata "
+"per essere usata direttamente, ma per essere estesa da altre classi. È "
+"utilizzata per creare nodi personalizzati per il sistema di [AnimationTree]."
+
+msgid ""
+"Returns [code]true[/code] if the animation for the given [param node_info] is "
+"looping."
+msgstr ""
+"Restituisce [code]true[/code] se l'animazione per il [param node_info] "
+"fornito è in ripetizione."
+
 msgid "Plays an animation once in an [AnimationNodeBlendTree]."
 msgstr "Riproduce un'animazione una sola volta in un [AnimationNodeBlendTree]."
 
@@ -8482,6 +11179,14 @@ msgstr ""
 "(in secondi) tra 0 e questo valore verrà aggiunto a [member "
 "autorestart_delay]."
 
+msgid ""
+"Determines how cross-fading between animations is eased. If empty, the "
+"transition will be linear. Should be a unit [Curve]."
+msgstr ""
+"Determina il modo in cui la dissolvenza incrociata tra le animazioni è "
+"allentata. Se vuoto, la transizione sarà lineare. Dovrebbe essere una [Curve] "
+"unitaria."
+
 msgid ""
 "The fade-in duration. For example, setting this to [code]1.0[/code] for a 5 "
 "second length animation will produce a cross-fade that starts at 0 second and "
@@ -8565,6 +11270,41 @@ msgid ""
 msgstr ""
 "Una macchina a stati con più [AnimationRootNode], usata da [AnimationTree]."
 
+msgid ""
+"Contains multiple [AnimationRootNode]s representing animation states, "
+"connected in a graph. State transitions can be configured to happen "
+"automatically or via code, using a shortest-path algorithm. Retrieve the "
+"[AnimationNodeStateMachinePlayback] object from the [AnimationTree] node to "
+"control it programmatically.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\") as AnimationNodeStateMachinePlayback;\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Contiene più [AnimationRootNode] che rappresentano gli stati di animazione, "
+"collegati in un grafico. È possibile configurare le transizioni di stato per "
+"svolgersi automaticamente o tramite codice, utilizzando un algoritmo di "
+"percorso più breve. Recupera l'oggetto [AnimationNodeStateMachinePlayback] "
+"dal nodo [AnimationTree] per controllarlo programmaticamente.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\") as AnimationNodeStateMachinePlayback;\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Adds a new animation node to the graph. The [param position] is used for "
 "display in the editor."
@@ -8680,6 +11420,24 @@ msgstr ""
 "Questa proprietà può definire il processo delle transizioni per diversi casi "
 "d'uso. Vedi anche [enum AnimationNodeStateMachine.StateMachineType]."
 
+msgid ""
+"Seeking to the beginning is treated as playing from the start state. "
+"Transition to the end state is treated as exiting the state machine."
+msgstr ""
+"Cercare all'inizio è considerato come una riproduzione dallo stato iniziale. "
+"La transizione allo stato finale è considerata come un'uscita dalla macchina "
+"a stati."
+
+msgid ""
+"Seeking to the beginning is treated as seeking to the beginning of the "
+"animation in the current state. Transition to the end state, or the absence "
+"of transitions in each state, is treated as exiting the state machine."
+msgstr ""
+"Cercare all'inizio è considerato come cercare all'inizio dell'animazione "
+"nello stato attuale. La transizione allo stato finale, o l'assenza di "
+"transizioni in ogni stato, è considerata come un'uscita dalla macchina a "
+"stati."
+
 msgid ""
 "This is a grouped state machine that can be controlled from a parent state "
 "machine. It does not work independently. There must be a state machine with "
@@ -8696,6 +11454,37 @@ msgid "Provides playback control for an [AnimationNodeStateMachine]."
 msgstr ""
 "Fornisce il controllo della riproduzione per un [AnimationNodeStateMachine]."
 
+msgid ""
+"Allows control of [AnimationTree] state machines created with "
+"[AnimationNodeStateMachine]. Retrieve with [code]$AnimationTree."
+"get(\"parameters/playback\")[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\").As<AnimationNodeStateMachinePlayback>();\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Permette il controllo delle macchine a stati create con "
+"[AnimationNodeStateMachine] in un [AnimationTree]. Recuperato con "
+"[code]$AnimationTree.get(\"parameters/playback\")[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\").As<AnimationNodeStateMachinePlayback>();\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the current state length.\n"
 "[b]Note:[/b] It is possible that any [AnimationRootNode] can be nodes as well "
@@ -8836,6 +11625,17 @@ msgstr ""
 "di macchine a stati complesse, interfacciandosi direttamente con il codice di "
 "script."
 
+msgid ""
+"Determines whether the transition should be disabled, enabled when using "
+"[method AnimationNodeStateMachinePlayback.travel], or traversed automatically "
+"if the [member advance_condition] and [member advance_expression] checks are "
+"[code]true[/code] (if assigned)."
+msgstr ""
+"Determina se la transizione dovrebbe essere disattivata, abilitata quando si "
+"utilizza [method AnimationNodeStateMachinePlayback.travel], o attraversata "
+"automaticamente se le verifiche di [member advance_condition] e [member "
+"advance_expression] sono pari a [code]true[/code] (se assegnati)."
+
 msgid ""
 "Lower priority transitions are preferred when travelling through the tree via "
 "[method AnimationNodeStateMachinePlayback.travel] or [member advance_mode] is "
@@ -8855,6 +11655,13 @@ msgstr ""
 msgid "The transition type."
 msgstr "Il tipo di transizione."
 
+msgid ""
+"Ease curve for better control over cross-fade between this state and the "
+"next. Should be a unit [Curve]."
+msgstr ""
+"Curva di allentamento per un miglior controllo sulla dissolvenza incrociata "
+"tra questo stato e quello successivo. Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "The time to cross-fade between this state and the next.\n"
 "[b]Note:[/b] [AnimationNodeStateMachine] transitions the current state "
@@ -8906,6 +11713,14 @@ msgstr ""
 "Utilizza questa transizione solo durante [method "
 "AnimationNodeStateMachinePlayback.travel]."
 
+msgid ""
+"Automatically use this transition if the [member advance_condition] and "
+"[member advance_expression] checks are [code]true[/code] (if assigned)."
+msgstr ""
+"Utilizza automaticamente questa transizione se le verifiche di [member "
+"advance_condition] e [member advance_expression] sono pari a [code]true[/"
+"code] (se assegnati)."
+
 msgid ""
 "Blends two animations subtractively inside of an [AnimationNodeBlendTree]."
 msgstr ""
@@ -9271,6 +12086,18 @@ msgstr "Utilizza [member AnimationMixer.root_node] invece."
 msgid "Returns the node which node path references will travel from."
 msgstr "Restituisce il nodo da cui i riferimenti di percorso del nodo partono."
 
+msgid "Returns the end time of the section currently being played."
+msgstr "Restituisce il tempo di fine della sezione attualmente riprodotta."
+
+msgid "Returns the start time of the section currently being played."
+msgstr "Restituisce il tempo di inizio della sezione attualmente riprodotta."
+
+msgid ""
+"Returns [code]true[/code] if an animation is currently playing with section."
+msgstr ""
+"Restituisce [code]true[/code] se un'animazione è in riproduzione con la "
+"sezione fornita."
+
 msgid ""
 "Pauses the currently playing animation. The [member "
 "current_animation_position] will be kept and calling [method play] or [method "
@@ -9285,6 +12112,103 @@ msgstr ""
 "riproduzione corrente.\n"
 "Vedi anche [method stop]."
 
+msgid ""
+"Plays the animation with key [param name]. Custom blend times and speed can "
+"be set.\n"
+"The [param from_end] option only affects when switching to a new animation "
+"track, or if the same track but at the start or end. It does not affect "
+"resuming playback that was paused in the middle of an animation. If [param "
+"custom_speed] is negative and [param from_end] is [code]true[/code], the "
+"animation will play backwards (which is equivalent to calling [method "
+"play_backwards]).\n"
+"The [AnimationPlayer] keeps track of its current or last played animation "
+"with [member assigned_animation]. If this method is called with that same "
+"animation [param name], or with no [param name] parameter, the assigned "
+"animation will resume playing if it was paused.\n"
+"[b]Note:[/b] The animation will be updated the next time the "
+"[AnimationPlayer] is processed. If other variables are updated at the same "
+"time this is called, they may be updated too early. To perform the update "
+"immediately, call [code]advance(0)[/code]."
+msgstr ""
+"Riproduce l'animazione con la chiave [param name]. È possibile impostare "
+"tempi e velocità di fusione personalizzati.\n"
+"L'opzione [param from_end] ha effetto solo quando si passa a una nuova "
+"traccia di animazione o se è la stessa traccia ma all'inizio o alla fine. Non "
+"ha effetto quando si riprende la riproduzione messa in pausa nel mezzo di "
+"un'animazione. Se [param custom_speed] è negativo e [param from_end] è "
+"[code]true[/code], l'animazione sarà riprodotta all'indietro (il che equivale "
+"a chiamare [method play_backwards]).\n"
+"[AnimationPlayer] tiene traccia della sua animazione attuale o dell'ultima "
+"riprodotta con [member assignment_animation]. Se questo metodo viene chiamato "
+"con la stessa animazione con [param name] o senza il parametro [param name], "
+"l'animazione assegnata riprenderà la riproduzione se era stata messa in "
+"pausa.\n"
+"[b]Nota:[/b] L'animazione verrà aggiornata la prossima volta che "
+"l'[AnimationPlayer] verrà elaborato. Se altre variabili vengono aggiornate "
+"allo stesso tempo che questo metodo viene chiamato, potrebbero essere "
+"aggiornate troppo presto. Per eseguire l'aggiornamento immediatamente, chiama "
+"[code]advance(0)[/code]."
+
+msgid ""
+"Plays the animation with key [param name] and the section starting from "
+"[param start_time] and ending on [param end_time]. See also [method play].\n"
+"Setting [param start_time] to a value outside the range of the animation "
+"means the start of the animation will be used instead, and setting [param "
+"end_time] to a value outside the range of the animation means the end of the "
+"animation will be used instead. [param start_time] cannot be equal to [param "
+"end_time]."
+msgstr ""
+"Riproduce l'animazione con la chiave [param name] e la sezione a partire da "
+"[param start_time] e che termina a [param end_time]. Vedi anche [method "
+"play].\n"
+"Impostando [param start_time] su un valore al di fuori dell'intervallo "
+"dell'animazione, verrà utilizzato l'inizio dell'animazione, mentre impostando "
+"[param end_time] su un valore al di fuori dell'intervallo dell'animazione, "
+"verrà utilizzata la fine dell'animazione. [param start_time] non può essere "
+"uguale a [param end_time]."
+
+msgid ""
+"Plays the animation with key [param name] and the section starting from "
+"[param start_time] and ending on [param end_time] in reverse.\n"
+"This method is a shorthand for [method play_section] with [code]custom_speed "
+"= -1.0[/code] and [code]from_end = true[/code], see its description for more "
+"information."
+msgstr ""
+"Riproduce l'animazione con la chiave [param name] e la sezione a partire da "
+"[param start_time] e che termina a [param end_time] al rovescio.\n"
+"Questo metodo è una abbreviazione per [method play_section] con "
+"[code]custom_speed = -1.0[/code] e [code]from_end = true[/code], quindi vedi "
+"la sua descrizione per ulteriori informazioni."
+
+msgid ""
+"Plays the animation with key [param name] and the section starting from "
+"[param start_marker] and ending on [param end_marker].\n"
+"If the start marker is empty, the section starts from the beginning of the "
+"animation. If the end marker is empty, the section ends on the end of the "
+"animation. See also [method play]."
+msgstr ""
+"Riproduce l'animazione con la chiave [param name] e la sezione che inizia da "
+"[param start_marker] e termina su [param end_marker].\n"
+"Se il marcatore di inizio è vuoto, la sezione inizia dall'inizio "
+"dell'animazione. Se il marcatore di fine è vuoto, la sezione termina alla "
+"fine dell'animazione. Vedi anche [method play]."
+
+msgid ""
+"Plays the animation with key [param name] and the section starting from "
+"[param start_marker] and ending on [param end_marker] in reverse.\n"
+"This method is a shorthand for [method play_section_with_markers] with "
+"[code]custom_speed = -1.0[/code] and [code]from_end = true[/code], see its "
+"description for more information."
+msgstr ""
+"Riproduce l'animazione con la chiave [param name] e la sezione a partire da "
+"[param start_marker] e che termina a [param end_marker] al rovescio.\n"
+"Questo metodo è una abbreviazione per [method play_section_with_markers] con "
+"[code]custom_speed = -1.0[/code] e [code]from_end = true[/code], quindi vedi "
+"la sua descrizione per ulteriori informazioni."
+
+msgid "Resets the current section if section is set."
+msgstr "Ripristina la sezione attuale se una sezione è impostata."
+
 msgid ""
 "Specifies a blend time (in seconds) between two animations, referenced by "
 "their keys."
@@ -9302,6 +12226,29 @@ msgstr "Imposta la notifica di processo in cui aggiornare le animazioni."
 msgid "Sets the node which node path references will travel from."
 msgstr "Imposta il nodo da cui i riferimenti di percorso del nodo partono."
 
+msgid ""
+"Changes the start and end times of the section being played. The current "
+"playback position will be clamped within the new section. See also [method "
+"play_section]."
+msgstr ""
+"Modifica i tempi di inizio e fine della sezione riprodotta. La posizione di "
+"riproduzione attuale verrà limitata all'interno della nuova sezione. Vedi "
+"anche [method play_section]."
+
+msgid ""
+"Changes the start and end markers of the section being played. The current "
+"playback position will be clamped within the new section. See also [method "
+"play_section_with_markers].\n"
+"If the argument is empty, the section uses the beginning or end of the "
+"animation. If both are empty, it means that the section is not set."
+msgstr ""
+"Modifica i marcatori di inizio e fine della sezione riprodotta. La posizione "
+"di riproduzione attuale verrà limitata all'interno della nuova sezione. Vedi "
+"anche [method play_section_with_markers].\n"
+"Se l'argomento è vuoto, la sezione utilizza l'inizio o la fine "
+"dell'animazione. Se entrambi sono vuoti, significa che la sezione non è "
+"impostata."
+
 msgid ""
 "Stops the currently playing animation. The animation position is reset to "
 "[code]0[/code] and the [code]custom_speed[/code] is reset to [code]1.0[/"
@@ -9793,6 +12740,42 @@ msgstr ""
 "Emesso quando l'area ricevuta [param area] esce da questa area. Richiede che "
 "[member monitoring] sia impostato a [code]true[/code]."
 
+msgid ""
+"Emitted when a [Shape2D] of the received [param area] enters a shape of this "
+"area. Requires [member monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param area_shape_index] contain indices of the "
+"interacting shapes from this area and the other area, respectively. [param "
+"area_rid] contains the [RID] of the other area. These values can be used with "
+"the [PhysicsServer2D].\n"
+"[b]Example:[/b] Get the [CollisionShape2D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Emesso quando un [Shape2D] dell'area ricevuta [param area] entra in una forma "
+"di questa area. Richiede che [member monitoring] sia impostato su [code]true[/"
+"code].\n"
+"[param local_shape_index] e [param area_shape_index] contengono gli indici "
+"delle forme di collisione che interagiscono da questa area e dall'altra area, "
+"rispettivamente. [param area_rid] contiene il [RID] dell'altra area. Questi "
+"valori possono essere utilizzati con il [PhysicsServer2D].\n"
+"[b]Esempio:[/b] Ottieni il nodo [CollisionShape2D] dall'indice della forma:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
 msgid ""
 "Emitted when a [Shape2D] of the received [param area] exits a shape of this "
 "area. Requires [member monitoring] to be set to [code]true[/code].\n"
@@ -9825,6 +12808,46 @@ msgstr ""
 "se il loro [TileSet] ha forme di collisione configurate. Richiede che [member "
 "monitoring] sia impostato a [code]true[/code]."
 
+msgid ""
+"Emitted when a [Shape2D] of the received [param body] enters a shape of this "
+"area. [param body] can be a [PhysicsBody2D] or a [TileMap]. [TileMap]s are "
+"detected if their [TileSet] has collision shapes configured. Requires [member "
+"monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param body_shape_index] contain indices of the "
+"interacting shapes from this area and the interacting body, respectively. "
+"[param body_rid] contains the [RID] of the body. These values can be used "
+"with the [PhysicsServer2D].\n"
+"[b]Example:[/b] Get the [CollisionShape2D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Emesso quando un [Shape2D] del corpo ricevuto [param body] entra in una forma "
+"di questa area. [param body] può essere un [PhysicsBody2D] o un [TileMap]. I "
+"[TileMap] sono rilevati se il loro [TileSet] ha forme di collisione "
+"configurate. Richiede che [member monitoring] sia impostato a [code]true[/"
+"code].\n"
+"[param local_shape_index] e [param area_shape_index] contengono gli indici "
+"delle forme di collisione che interagiscono da questa area e dal corpo, "
+"rispettivamente. [param area_rid] contiene il [RID] del corpo. Questi valori "
+"possono essere utilizzati con il [PhysicsServer2D].\n"
+"[b]Esempio:[/b] Ottieni il nodo [CollisionShape2D] dall'indice della forma:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
 msgid ""
 "Emitted when a [Shape2D] of the received [param body] exits a shape of this "
 "area. [param body] can be a [PhysicsBody2D] or a [TileMap]. [TileMap]s are "
@@ -10139,6 +13162,42 @@ msgstr ""
 "[b]Nota:[/b] Questa forza del vento si applica solo ai nodi [SoftBody3D]. "
 "Altri corpi di fisica non sono attualmente influenzati dal vento."
 
+msgid ""
+"Emitted when a [Shape3D] of the received [param area] enters a shape of this "
+"area. Requires [member monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param area_shape_index] contain indices of the "
+"interacting shapes from this area and the other area, respectively. [param "
+"area_rid] contains the [RID] of the other area. These values can be used with "
+"the [PhysicsServer3D].\n"
+"[b]Example:[/b] Get the [CollisionShape3D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Emesso quando un [Shape3D] dell'area ricevuta [param area] entra in una forma "
+"di questa area. Richiede che [member monitoring] sia impostato su [code]true[/"
+"code].\n"
+"[param local_shape_index] e [param area_shape_index] contengono gli indici "
+"delle forme di collisione che interagiscono da questa area e dall'altra area, "
+"rispettivamente. [param area_rid] contiene il [RID] dell'altra area. Questi "
+"valori possono essere utilizzati con il [PhysicsServer3D].\n"
+"[b]Esempio:[/b] Ottieni il nodo [CollisionShape3D] dall'indice della forma:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
 msgid ""
 "Emitted when a [Shape3D] of the received [param area] exits a shape of this "
 "area. Requires [member monitoring] to be set to [code]true[/code].\n"
@@ -10171,6 +13230,46 @@ msgstr ""
 "se il loro [MeshLibrary] ha forme di collisione configurate. Richiede che "
 "[member monitoring] sia impostato a [code]true[/code]."
 
+msgid ""
+"Emitted when a [Shape3D] of the received [param body] enters a shape of this "
+"area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are "
+"detected if their [MeshLibrary] has collision shapes configured. Requires "
+"[member monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param body_shape_index] contain indices of the "
+"interacting shapes from this area and the interacting body, respectively. "
+"[param body_rid] contains the [RID] of the body. These values can be used "
+"with the [PhysicsServer3D].\n"
+"[b]Example:[/b] Get the [CollisionShape3D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Emesso quando un [Shape3D] del corpo ricevuto [param body] entra in una forma "
+"di questa area. [param body] può essere un [PhysicsBody3D] o un [GridMap]. I "
+"[GridMap] sono rilevati se il loro [MeshLibrary] ha forme di collisione "
+"configurate. Richiede che [member monitoring] sia impostato a [code]true[/"
+"code].\n"
+"[param local_shape_index] e [param area_shape_index] contengono gli indici "
+"delle forme di collisione che interagiscono da questa area e dal corpo, "
+"rispettivamente. [param area_rid] contiene il [RID] del corpo. Questi valori "
+"possono essere utilizzati con il [PhysicsServer3D].\n"
+"[b]Esempio:[/b] Ottieni il nodo [CollisionShape3D] dall'indice della forma:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
 msgid ""
 "Emitted when a [Shape3D] of the received [param body] exits a shape of this "
 "area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are "
@@ -10188,9 +13287,165 @@ msgstr ""
 msgid "A built-in data structure that holds a sequence of elements."
 msgstr "Una struttura di dati integrata che contiene una sequenza di elementi."
 
+msgid ""
+"An array data structure that can contain a sequence of elements of any "
+"[Variant] type. Elements are accessed by a numerical index starting at "
+"[code]0[/code]. Negative indices are used to count from the back ([code]-1[/"
+"code] is the last element, [code]-2[/code] is the second to last, etc.).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = [\"First\", 2, 3, \"Last\"]\n"
+"print(array[0])  # Prints \"First\"\n"
+"print(array[2])  # Prints 3\n"
+"print(array[-1]) # Prints \"Last\"\n"
+"\n"
+"array[1] = \"Second\"\n"
+"print(array[1])  # Prints \"Second\"\n"
+"print(array[-3]) # Prints \"Second\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [\"First\", 2, 3, \"Last\"];\n"
+"GD.Print(array[0]); // Prints \"First\"\n"
+"GD.Print(array[2]); // Prints 3\n"
+"GD.Print(array[^1]); // Prints \"Last\"\n"
+"\n"
+"array[1] = \"Second\";\n"
+"GD.Print(array[1]); // Prints \"Second\"\n"
+"GD.Print(array[^3]); // Prints \"Second\"\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Arrays are always passed by [b]reference[/b]. To get a copy of "
+"an array that can be modified independently of the original array, use "
+"[method duplicate].\n"
+"[b]Note:[/b] Erasing elements while iterating over arrays is [b]not[/b] "
+"supported and will result in unpredictable behavior.\n"
+"[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] "
+"Packed arrays are generally faster to iterate on and modify compared to a "
+"typed array of the same type (e.g. [PackedInt64Array] versus [code]Array[int]"
+"[/code]). Also, packed arrays consume less memory. As a downside, packed "
+"arrays are less flexible as they don't offer as many convenience methods such "
+"as [method Array.map]. Typed arrays are in turn faster to iterate on and "
+"modify than untyped arrays."
+msgstr ""
+"Una struttura dati che può contenere una sequenza di elementi di qualsiasi "
+"tipo di [Variant]. Gli elementi sono accessibili da un indice numerico a "
+"partire da [code]0[/code]. Gli indici negativi sono utilizzati per contare "
+"dalla fine ([code]-1[/code] è l'ultimo elemento, [code]-2[/code] è il "
+"penultimo, ecc.).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = [\"Primo\", 2, 3, \"Ultimo\"]\n"
+"print(array[0])  # Stampa \"Primo\"\n"
+"print(array[2])  # Stampa 3\n"
+"print(array[-1]) # Stampa \"Ultimo\"\n"
+"\n"
+"array[1] = \"Secondo\"\n"
+"print(array[1])  # Stampa \"Secondo\"\n"
+"print(array[-3]) # Stampa \"Secondo\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [\"Primo\", 2, 3, \"Ultimo\"];\n"
+"GD.Print(array[0]); // Stampa \"Primo\"\n"
+"GD.Print(array[2]); // Stampa 3\n"
+"GD.Print(array[^1]);; // Stampa \"Ultimo\"\n"
+"\n"
+"array[2] = \"Secondo\";\n"
+"GD.Print(array[1]); // Stampa \"Secondo\"\n"
+"GD.Print(array[^3]); // Stampa \"Secondo\"\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Gli array sono sempre passati per [b]riferimento[/b]. Per "
+"ottenere una copia di un array che può essere modificato indipendentemente "
+"dall'array originale, utilizza [method duplicate].\n"
+"[b]Nota:[/b] Rimuovere elementi durante un'iterazione su un array [b]non[/b] "
+"è supportato e risulterà in comportamento imprevedibile.\n"
+"[b]Differenze tra gli array impacchettati, gli array tipizzati e gli array "
+"non tipizzati:[/b] Gli array impacchettati sono generalmente più veloci da "
+"iterare e modificare rispetto a un array tipizzato dello stesso tipo (ad "
+"esempio [PackedInt64Array] in confronto a [code]Array[int][/code]). Inoltre, "
+"gli array impacchettati consumano meno memoria. Come svantaggio, i array "
+"impacchettati sono meno flessibili in quanto non offrono molti metodi di "
+"convenienza come [method Array.map]. Gli array tipizzati sono anche loro più "
+"veloci da iterare e modificare in confronto ad array non tipizzati."
+
 msgid "Constructs an empty [Array]."
 msgstr "Costruisce un [Array] vuoto."
 
+msgid ""
+"Creates a typed array from the [param base] array. A typed array can only "
+"contain elements of the given type, or that inherit from the given class, as "
+"described by this constructor's parameters:\n"
+"- [param type] is the built-in [Variant] type, as one the [enum Variant.Type] "
+"constants.\n"
+"- [param class_name] is the built-in class name (see [method Object."
+"get_class]).\n"
+"- [param script] is the associated script. It must be a [Script] instance or "
+"[code]null[/code].\n"
+"If [param type] is not [constant TYPE_OBJECT], [param class_name] must be an "
+"empty [StringName] and [param script] must be [code]null[/code].\n"
+"[codeblock]\n"
+"class_name Sword\n"
+"extends Node\n"
+"\n"
+"class Stats:\n"
+"    pass\n"
+"\n"
+"func _ready():\n"
+"    var a = Array([], TYPE_INT, \"\", null)               # Array[int]\n"
+"    var b = Array([], TYPE_OBJECT, \"Node\", null)        # Array[Node]\n"
+"    var c = Array([], TYPE_OBJECT, \"Node\", Sword)       # Array[Sword]\n"
+"    var d = Array([], TYPE_OBJECT, \"RefCounted\", Stats) # Array[Stats]\n"
+"[/codeblock]\n"
+"The [param base] array's elements are converted when necessary. If this is "
+"not possible or [param base] is already typed, this constructor fails and "
+"returns an empty [Array].\n"
+"In GDScript, this constructor is usually not necessary, as it is possible to "
+"create a typed array through static typing:\n"
+"[codeblock]\n"
+"var numbers: Array[float] = []\n"
+"var children: Array[Node] = [$Node, $Sprite2D, $RigidBody3D]\n"
+"\n"
+"var integers: Array[int] = [0.2, 4.5, -2.0]\n"
+"print(integers) # Prints [0, 4, -2]\n"
+"[/codeblock]"
+msgstr ""
+"Crea un array tipizzato dall'array [param base]. Un array tipizzato può "
+"contenere solo elementi del tipo specificato o che ereditano dalla classe "
+"specificata, come descritto dai parametri di questo costruttore:\n"
+"- [param type] è il tipo di [Variant] integrato, come una delle costanti di "
+"[enum Variant.Type].\n"
+"- [param class_name] è il nome della classe integrata (vedi [method Object."
+"get_class]).\n"
+"- [param script] è lo script associato. Deve essere un'istanza di [Script] o "
+"[code]null[/code].\n"
+"Se [param type] non è [constant TYPE_OBJECT], [param class_name] deve essere "
+"uno [StringName] vuoto e [param script] deve essere [code]null[/code].\n"
+"[codeblock]\n"
+"class_name Sword\n"
+"extends Node\n"
+"\n"
+"class Stats:\n"
+"    pass\n"
+"\n"
+"func _ready():\n"
+"    var a = Array([], TYPE_INT, \"\", null)               # Array[int]\n"
+"    var b = Array([], TYPE_OBJECT, \"Node\", null)        # Array[Node]\n"
+"    var c = Array([], TYPE_OBJECT, \"Node\", Sword)       # Array[Sword]\n"
+"    var d = Array([], TYPE_OBJECT, \"RefCounted\", Stats) # Array[Stats]\n"
+"[/codeblock]\n"
+"Gli elementi dell'array [param base] vengono convertiti quando necessario. Se "
+"ciò non è possibile o [param base] è già tipizzato, questo costruttore "
+"fallisce e restituisce un [Array] vuoto.\n"
+"In GDScript, questo costruttore di solito non è necessario, poiché è "
+"possibile creare un array tipizzato tramite tipizzazione statica:\n"
+"[codeblock]\n"
+"var numbers: Array[float] = []\n"
+"var children: Array[Node] = [$Node, $Sprite2D, $RigidBody3D]\n"
+"\n"
+"var integers: Array[int] = [0.2, 4.5, -2.0]\n"
+"print(integers) # Prints [0, 4, -2]\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the same array as [param from]. If you need a copy of the array, use "
 "[method duplicate]."
@@ -10228,6 +13483,184 @@ msgstr "Costruisce un array da un [PackedVector3Array]."
 msgid "Constructs an array from a [PackedVector4Array]."
 msgstr "Costruisce un [Array] da un [PackedVector4Array]."
 
+msgid ""
+"Calls the given [Callable] on each element in the array and returns "
+"[code]true[/code] if the [Callable] returns [code]true[/code] for [i]all[/i] "
+"elements in the array. If the [Callable] returns [code]false[/code] for one "
+"array element or more, this method returns [code]false[/code].\n"
+"The [param method] should take one [Variant] parameter (the current array "
+"element) and return a [bool].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].all(greater_than_5)) # Prints true (3/3 elements "
+"evaluate to true).\n"
+"    print([4, 10, 4].all(greater_than_5)) # Prints false (1/3 elements "
+"evaluate to true).\n"
+"    print([4, 4, 4].all(greater_than_5))  # Prints false (0/3 elements "
+"evaluate to true).\n"
+"    print([].all(greater_than_5))         # Prints true (0/0 elements "
+"evaluate to true).\n"
+"\n"
+"    # Same as the first line above, but using a lambda function.\n"
+"    print([6, 10, 6].all(func(element): return element > 5)) # Prints true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private static bool GreaterThan5(int number)\n"
+"{\n"
+"    return number > 5;\n"
+"}\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Prints True (3/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }."
+"All(GreaterThan5));\n"
+"    // Prints False (1/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 10, 4 }."
+"All(GreaterThan5));\n"
+"    // Prints False (0/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 4, 4 }."
+"All(GreaterThan5));\n"
+"    // Prints True (0/0 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { }.All(GreaterThan5));\n"
+"\n"
+"    // Same as the first line above, but using a lambda function.\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }.All(element => "
+"element > 5)); // Prints True\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method any], [method filter], [method map] and [method reduce].\n"
+"[b]Note:[/b] Unlike relying on the size of an array returned by [method "
+"filter], this method will return as early as possible to improve performance "
+"(especially with large arrays).\n"
+"[b]Note:[/b] For an empty array, this method [url=https://en.wikipedia.org/"
+"wiki/Vacuous_truth]always[/url] returns [code]true[/code]."
+msgstr ""
+"Chiama il [Callable] fornito su ogni elemento nell'array e restituisce "
+"[code]true[/code] se il [Callable] restituisce [code]true[/code] per "
+"[i]tutti[/i] gli elementi nell'array. Se il [Callable] restituisce "
+"[code]false[/code] per uno o più elementi nell'array, questo metodo "
+"restituisce [code]true[/code].\n"
+"Il [param method] dovrebbe accettare un parametro [Variant] (l'elemento "
+"attuale dell'array) e restituire un [bool].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].all(greater_than_5)) # Stampa true (3/3 elementi sono "
+"valutati come true).\n"
+"    print([4, 10, 4].all(greater_than_5)) # Stampa false (1/3 elementi sono "
+"valutati come true).\n"
+"    print([4, 4, 4].all(greater_than_5))  # Stampa false (0/3 elementi sono "
+"valutati come true).\n"
+"    print([].all(greater_than_5))         # Stampa true (0/0 elementi sono "
+"valutati come true).\n"
+"\n"
+"    # Come la prima riga sopra, ma usando una funzione lambda.\n"
+"    print([6, 10, 6].all(func(element): return element > 5)) # Stampa true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private static bool GreaterThan5(int number)\n"
+"{\n"
+"    return number > 5;\n"
+"}\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Stampa True (3/3 elementi sono valutati come true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }."
+"All(GreaterThan5));\n"
+"    // Stampa False (1/3 elementi sono valutati come true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 10, 4 }."
+"All(GreaterThan5));\n"
+"    // Stampa False (0/3 elementi sono valutati come true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 4, 4 }."
+"All(GreaterThan5));\n"
+"    // Stampa True (0/0 elementi sono valutati come true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { }.All(GreaterThan5));\n"
+"\n"
+"    // Come la prima riga sopra, ma usando una funzione lambda.\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }.All(element => "
+"element > 5)); // Stampa True\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Vedi anche [method all], [method filter], [method map] e [method reduce].\n"
+"[b]Nota:[/b] A differenza di basarsi sulla dimensione di un array restituito "
+"da [method filter], questo metodo restituirà il prima possibile per "
+"migliorare le prestazioni (soprattutto con array di grandi dimensioni).\n"
+"[b]Nota:[/b] Per un array vuoto, questo metodo restituisce [url=https://en."
+"wikipedia.org/wiki/Vacuous_truth]sempre[/url] [code]true[/code]."
+
+msgid ""
+"Calls the given [Callable] on each element in the array and returns "
+"[code]true[/code] if the [Callable] returns [code]true[/code] for [i]one or "
+"more[/i] elements in the array. If the [Callable] returns [code]false[/code] "
+"for all elements in the array, this method returns [code]false[/code].\n"
+"The [param method] should take one [Variant] parameter (the current array "
+"element) and return a [bool].\n"
+"[codeblock]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].any(greater_than_5)) # Prints true (3 elements evaluate "
+"to true).\n"
+"    print([4, 10, 4].any(greater_than_5)) # Prints true (1 elements evaluate "
+"to true).\n"
+"    print([4, 4, 4].any(greater_than_5))  # Prints false (0 elements evaluate "
+"to true).\n"
+"    print([].any(greater_than_5))         # Prints false (0 elements evaluate "
+"to true).\n"
+"\n"
+"    # Same as the first line above, but using a lambda function.\n"
+"    print([6, 10, 6].any(func(number): return number > 5)) # Prints true\n"
+"[/codeblock]\n"
+"See also [method all], [method filter], [method map] and [method reduce].\n"
+"[b]Note:[/b] Unlike relying on the size of an array returned by [method "
+"filter], this method will return as early as possible to improve performance "
+"(especially with large arrays).\n"
+"[b]Note:[/b] For an empty array, this method always returns [code]false[/"
+"code]."
+msgstr ""
+"Chiama il [Callable] fornito su ogni elemento nell'array e restituisce "
+"[code]true[/code] se il [Callable] restituisce [code]true[/code] per [i]uno o "
+"più[/i] elementi nell'array. Se il [Callable] restituisce [code]false[/code] "
+"per tutti gli elementi nell'array, questo metodo restituisce [code]false[/"
+"code].\n"
+"Il [param method] dovrebbe accettare un parametro [Variant] (l'elemento "
+"attuale dell'array) e restituire un [bool].\n"
+"[codeblock]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].any(greater_than_5)) # Stampa true (3 elementi sono "
+"valutati come true).\n"
+"    print([4, 10, 4].any(greater_than_5)) # Stampa true (1 elements è "
+"valutato come to true).\n"
+"    print([4, 4, 4].any(greater_than_5))  # Stampa false (0 elementi sono "
+"valutati come true).\n"
+"    print([].any(greater_than_5))         # Stampa false (0 elements sono "
+"valutati come true).\n"
+"\n"
+"    # Come la prima riga sopra, ma usando una funzione lambda.\n"
+"    print([6, 10, 6].any(func(number): return number > 5)) # Stampa true\n"
+"[/codeblock]\n"
+"Vedi anche [method all], [method filter], [method map] e [method reduce].\n"
+"[b]Nota:[/b] A differenza di basarsi sulla dimensione di un array restituito "
+"da [method filter], questo metodo restituirà il prima possibile per "
+"migliorare le prestazioni (soprattutto con array di grandi dimensioni).\n"
+"[b]Nota:[/b] Per un array vuoto, questo metodo restituisce sempre "
+"[code]false[/code]."
+
 msgid ""
 "Appends [param value] at the end of the array (alias of [method push_back])."
 msgstr ""
@@ -10400,6 +13833,15 @@ msgstr ""
 "Rimuove tutti gli elementi dall'array. Questo è equivalente a utilizzare "
 "[method resize] con una dimensione di [code]0[/code]."
 
+msgid ""
+"Returns the number of times an element is in the array.\n"
+"To count how many elements in an array satisfy a condition, see [method "
+"reduce]."
+msgstr ""
+"Restituisce il numero di volte in cui un elemento è presente nell'array.\n"
+"Per contare quanti elementi in un array soddisfano una condizione, vedi "
+"[method reduce]."
+
 msgid ""
 "Returns a new copy of the array.\n"
 "By default, a [b]shallow[/b] copy is returned: all nested [Array] and "
@@ -10435,6 +13877,49 @@ msgstr ""
 "[b]Nota:[/b] Rimuovere elementi durante un'iterazione su un array [b]non[/b] "
 "è supportato e risulterà in comportamento imprevedibile."
 
+msgid ""
+"Assigns the given [param value] to all elements in the array.\n"
+"This method can often be combined with [method resize] to create an array "
+"with a given size and initialized elements:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = []\n"
+"array.resize(5)\n"
+"array.fill(2)\n"
+"print(array) # Prints [2, 2, 2, 2, 2]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [];\n"
+"array.Resize(5);\n"
+"array.Fill(2);\n"
+"GD.Print(array); // Prints [2, 2, 2, 2, 2]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If [param value] is a [Variant] passed by reference ([Object]-"
+"derived, [Array], [Dictionary], etc.), the array will be filled with "
+"references to the same [param value], which are not duplicates."
+msgstr ""
+"Assegna il valore [param value] a tutti gli elementi dell'array.\n"
+"Questo metodo può spesso essere combinato con [method resize] per creare un "
+"array con una certa dimensione ed elementi inizializzati:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = []\n"
+"array.resize(5)\n"
+"array.fill(2)\n"
+"print(array) # Stampa [2, 2, 2, 2, 2]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [];\n"
+"array.Resize(5);\n"
+"array.Fill(2);\n"
+"GD.Print(array); // Stampa [2, 2, 2, 2, 2]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Se [param value] è un [Variant] passato per riferimento "
+"(derivato da [Object], [Array], [Dictionary], ecc.), l'array sarà riempito "
+"con riferimenti allo stesso [param value], che non sono duplicati."
+
 msgid ""
 "Calls the given [Callable] on each element in the array and returns a new, "
 "filtered [Array].\n"
@@ -10492,6 +13977,43 @@ msgstr ""
 "([enum Variant.Type]) di [param what]. Ad esempio, [code]7[/code] ([int]) e "
 "[code]7.0[/code] ([float])) non sono considerati uguali per questo metodo."
 
+msgid ""
+"Returns the index of the [b]first[/b] element in the array that causes [param "
+"method] to return [code]true[/code], or [code]-1[/code] if there are none. "
+"The search's start can be specified with [param from], continuing to the end "
+"of the array.\n"
+"[param method] is a callable that takes an element of the array, and returns "
+"a [bool].\n"
+"[b]Note:[/b] If you just want to know whether the array contains [i]anything[/"
+"i] that satisfies [param method], use [method any].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    print([1, 3, 4, 7].find_custom(is_even.bind())) # Prints 2\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce l'indice del [b]primo[/b] elemento nell'array che fa in modo che "
+"[param method] restituisca [code]true[/code], o [code]-1[/code] se non ce ne "
+"sono. L'inizio della ricerca può essere specificato con [param from], "
+"continuando fino alla fine dell'array.\n"
+"[param method] è un chiamabile che accetta un elemento dell'array e "
+"restituisce un [bool].\n"
+"[b]Nota:[/b] Se vuoi solo sapere se l'array contiene [i]qualcosa[/i] che "
+"soddisfa [param method], usa [method any].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    print([1, 3, 4, 7].find_custom(is_even.bind())) # Stampa 2\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the first element of the array. If the array is empty, fails and "
 "returns [code]null[/code]. See also [method back].\n"
@@ -10503,13 +14025,20 @@ msgstr ""
 "[b]Nota:[/b] A differenza dell'operatore [code][][/code] ([code]array[0][/"
 "code]), viene generato un errore senza interrompere l'esecuzione del progetto."
 
+msgid ""
+"Returns the element at the given [param index] in the array. This is the same "
+"as using the [code][][/code] operator ([code]array[index][/code])."
+msgstr ""
+"Restituisce l'elemento all'indice [param index] nell'array. È lo stesso che "
+"usare l'operatore [code][][/code] ([code]array[index][/code])."
+
 msgid ""
 "Returns the built-in [Variant] type of the typed array as a [enum Variant."
 "Type] constant. If the array is not typed, returns [constant TYPE_NIL]. See "
 "also [method is_typed]."
 msgstr ""
-"Restituisce il tipo di [Variant] incorporato dell'array tipizzato come "
-"constante di [enum Variant.Type]. Se l'array non tipizzato, restituisce "
+"Restituisce il tipo di [Variant] integrato dell'array tipizzato come "
+"constante di [enum Variant.Type]. Se l'array non è tipizzato, restituisce "
 "[constant TYPE_NIL]. Vedi anche [method is_typed]."
 
 msgid ""
@@ -10517,8 +14046,8 @@ msgid ""
 "[Variant] type [constant TYPE_OBJECT]. Otherwise, returns an empty "
 "[StringName]. See also [method is_typed] and [method Object.get_class]."
 msgstr ""
-"Restituisce il nome della classe [b]incorporata[/b] dell'array tipizzato, se "
-"il tipo di [Variant] incorporato è [constant TYPE_OBJECT]. Altrimenti, "
+"Restituisce il nome della classe [b]integrata[/b] dell'array tipizzato, se il "
+"tipo di [Variant] incorporato è [constant TYPE_OBJECT]. Altrimenti, "
 "restituisce un [StringName] vuoto. Vedi anche [method is_typed] e [method "
 "Object.get_class]."
 
@@ -10529,6 +14058,59 @@ msgstr ""
 "Restituisce l'istanza di [Script] associata a questo array tipizzato, o "
 "[code]null[/code] se non esiste. Vedi anche [method is_typed]."
 
+msgid ""
+"Returns [code]true[/code] if the array contains the given [param value].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print([\"inside\", 7].has(\"inside\"))  # Prints true\n"
+"print([\"inside\", 7].has(\"outside\")) # Prints false\n"
+"print([\"inside\", 7].has(7))         # Prints true\n"
+"print([\"inside\", 7].has(\"7\"))       # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array arr = [\"inside\", 7];\n"
+"// By C# convention, this method is renamed to `Contains`.\n"
+"GD.Print(arr.Contains(\"inside\"));  // Prints True\n"
+"GD.Print(arr.Contains(\"outside\")); // Prints False\n"
+"GD.Print(arr.Contains(7));         // Prints True\n"
+"GD.Print(arr.Contains(\"7\"));       // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, this is equivalent to the [code]in[/code] operator:\n"
+"[codeblock]\n"
+"if 4 in [2, 4, 6, 8]:\n"
+"    print(\"4 is here!\") # Will be printed.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] For performance reasons, the search is affected by the [param "
+"value]'s [enum Variant.Type]. For example, [code]7[/code] ([int]) and "
+"[code]7.0[/code] ([float]) are not considered equal for this method."
+msgstr ""
+"Restituisce [code]true[/code] se l'array contiene il valore [param value].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print([\"inside\", 7].has(\"dentro\"))  # Stampa true\n"
+"print([\"inside\", 7].has(\"fuori\")) # Stampa false\n"
+"print([\"inside\", 7].has(7))         # Stampa true\n"
+"print([\"inside\", 7].has(\"7\"))       # Stampa false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array arr = [\"dentro\", 7];\n"
+"// By C# convention, this method is renamed to `Contains`.\n"
+"GD.Print(arr.Contains(\"dentro\"));  // Stampa True\n"
+"GD.Print(arr.Contains(\"fuori\")); // Stampa False\n"
+"GD.Print(arr.Contains(7));         // Stampa True\n"
+"GD.Print(arr.Contains(\"7\"));       // Stampa False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, questo metodo equivale all'operatore [code]in[/code]:\n"
+"[codeblock]\n"
+"if 4 in [2, 4, 6, 8]:\n"
+"    print(\"4 è qui!\") # Sarà stampato.\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Per motivi di prestazioni, la ricerca è influenzata dal tipo "
+"([enum Variant.Type]) di [param value]. Ad esempio, [code]7[/code] ([int]) e "
+"[code]7.0[/code] ([float])) non sono considerati uguali per questo metodo."
+
 msgid ""
 "Returns a hashed 32-bit integer value representing the array and its "
 "contents.\n"
@@ -10674,6 +14256,41 @@ msgstr ""
 "possono essere confrontati. Altrimenti, restituisce [code]null[/code]. Vedi "
 "anche [method max]."
 
+msgid ""
+"Returns a random element from the array. Generates an error and returns "
+"[code]null[/code] if the array is empty.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# May print 1, 2, 3.25, or \"Hi\".\n"
+"print([1, 2, 3.25, \"Hi\"].pick_random())\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [1, 2, 3.25f, \"Hi\"];\n"
+"GD.Print(array.PickRandom()); // May print 1, 2, 3.25, or \"Hi\".\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Like many similar functions in the engine (such as [method "
+"@GlobalScope.randi] or [method shuffle]), this method uses a common, global "
+"random seed. To get a predictable outcome from this method, see [method "
+"@GlobalScope.seed]."
+msgstr ""
+"Restituisce un elemento a caso dall'array. Genera un errore e restituisce "
+"[code]null[/code] se l'array è vuoto.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Potrebbe stampare 1, 2, 3.25, o \"Ciao\".\n"
+"print([1, 2, 3.25, \"Ciao\"].pick_random())\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [1, 2, 3.25f, \"Ciao\"];\n"
+"GD.Print(array.PickRandom()); // Potrebbe stampare 1, 2, 3.25, o \"Ciao\".\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Come molte funzioni simili nel motore (come ad esempio [method "
+"@GlobalScope.randi] o [method shuffle]), questo metodo utilizza un seed "
+"casuale, comune e globale. Per ottenere un risultato prevedibile da questo "
+"metodo, vedi [method @GlobalScope.seed]."
+
 msgid ""
 "Removes and returns the element of the array at index [param position]. If "
 "negative, [param position] is considered relative to the end of the array. "
@@ -10729,6 +14346,98 @@ msgstr ""
 "il che può avere un notevole costo sulle prestazioni, soprattutto su array "
 "più grandi."
 
+msgid ""
+"Calls the given [Callable] for each element in array, accumulates the result "
+"in [param accum], then returns it.\n"
+"The [param method] takes two arguments: the current value of [param accum] "
+"and the current array element. If [param accum] is [code]null[/code] (as by "
+"default), the iteration will start from the second element, with the first "
+"one used as initial value of [param accum].\n"
+"[codeblock]\n"
+"func sum(accum, number):\n"
+"    return accum + number\n"
+"\n"
+"func _ready():\n"
+"    print([1, 2, 3].reduce(sum, 0))  # Prints 6\n"
+"    print([1, 2, 3].reduce(sum, 10)) # Prints 16\n"
+"\n"
+"    # Same as above, but using a lambda function.\n"
+"    print([1, 2, 3].reduce(func(accum, number): return accum + number, 10))\n"
+"[/codeblock]\n"
+"If [method max] is not desirable, this method may also be used to implement a "
+"custom comparator:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    var arr = [Vector2i(5, 0), Vector2i(3, 4), Vector2i(1, 2)]\n"
+"\n"
+"    var longest_vec = arr.reduce(func(max, vec): return vec if "
+"is_length_greater(vec, max) else max)\n"
+"    print(longest_vec) # Prints (3, 4)\n"
+"\n"
+"func is_length_greater(a, b):\n"
+"    return a.length() > b.length()\n"
+"[/codeblock]\n"
+"This method can also be used to count how many elements in an array satisfy a "
+"certain condition, similar to [method count]:\n"
+"[codeblock]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    var arr = [1, 2, 3, 4, 5]\n"
+"    # If the current element is even, increment count, otherwise leave count "
+"the same.\n"
+"    var even_count = arr.reduce(func(count, next): return count + 1 if "
+"is_even(next) else count, 0)\n"
+"    print(even_count) # Prints 2\n"
+"[/codeblock]\n"
+"See also [method map], [method filter], [method any], and [method all]."
+msgstr ""
+"Chiama il [Callable] fornito per ogni elemento nell'array, accumula il "
+"risultato in [param accum], quindi lo restituisce.\n"
+"Il [param method] prende due argomenti: il valore attuale di [param accum] e "
+"l'elemento attuale dell'array. Se [param accum] è [code]null[/code] (come per "
+"impostazione predefinita), l'iterazione inizierà dal secondo elemento, con il "
+"primo utilizzato come valore iniziale di [param accum].\n"
+"[codeblock]\n"
+"func somma(accum, numero):\n"
+"    return accum + numero\n"
+"\n"
+"func _ready():\n"
+"    print([1, 2, 3].reduce(somma, 0))  # Stampa 6\n"
+"    print([1, 2, 3].reduce(somma, 10)) # Stampa 16\n"
+"\n"
+"    # Stesso di sopra, ma usando una funzione lambda.\n"
+"    print([1, 2, 3].reduce(func(accum, numero): return accum + numero, 10))\n"
+"[/codeblock]\n"
+"Se [method max] non è desiderato, questo metodo può anche essere utilizzato "
+"per implementare un comparatore personalizzato:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    var arr = [Vector2(5, 0), Vector2(3, 4), Vector2(1, 2)]\n"
+"\n"
+"    var longest_vec = arr.reduce(func(max, vec): return vec if "
+"is_length_greater(vec, max) else max)\n"
+"    print(longest_vec) # Stampa Vector2(3, 4).\n"
+"\n"
+"func is_length_greater(a, b):\n"
+"    return a.length() > b.length()\n"
+"[/codeblock]\n"
+"Questo metodo può essere utilizzato anche per contare quanti elementi in un "
+"array soddisfano una determinata condizione, in modo simile al metodo [method "
+"count]:\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"func _ready():\n"
+"    var arr = [1, 2, 3, 4, 5]\n"
+"    # Se l'elemento attuale è pari, incrementa il conteggio, altrimenti "
+"lascialo invariato.\n"
+"    var even_count = arr.reduce(func(count, next): return count + 1 if "
+"is_even(next) else count, 0)\n"
+"    print(even_count) # Stampa 2\n"
+"[/codeblock]\n"
+"Vedi anche [method map], [method filter], [method any] e [method all]."
+
 msgid ""
 "Removes the element from the array at the given index ([param position]). If "
 "the index is out of bounds, this method fails.\n"
@@ -10787,6 +14496,18 @@ msgstr ""
 "essere specificato con [param from], la quale continua fino all'inizio "
 "dell'array. Questo metodo è l'inverso di [method find]."
 
+msgid ""
+"Returns the index of the [b]last[/b] element of the array that causes [param "
+"method] to return [code]true[/code], or [code]-1[/code] if there are none. "
+"The search's start can be specified with [param from], continuing to the "
+"beginning of the array. This method is the reverse of [method find_custom]."
+msgstr ""
+"Restituisce l'indice dell'[b]ultima[/b] occorrenza nell'array che provoca "
+"[param method] a ritornare [code]true[/code], o [code]-1[/code] se non ne "
+"esistono. L'inizio della ricerca può essere specificato con [param from], la "
+"quale continua fino all'inizio dell'array. Questo metodo è l'inverso di "
+"[method find_custom]."
+
 msgid ""
 "Shuffles all elements of the array in a random order.\n"
 "[b]Note:[/b] Like many similar functions in the engine (such as [method "
@@ -10851,6 +14572,47 @@ msgstr ""
 "print(lettere.slice(4, 1, -1)) # Stampa [\"E\", \"D\", \"C\"]\n"
 "[/codeblock]"
 
+msgid ""
+"Sorts the array in ascending order. The final order is dependent on the "
+"\"less than\" ([code]<[/code]) comparison between elements.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var numbers = [10, 5, 2.5, 8]\n"
+"numbers.sort()\n"
+"print(numbers) # Prints [2.5, 5, 8, 10]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array numbers = [10, 5, 2.5, 8];\n"
+"numbers.Sort();\n"
+"GD.Print(numbers); // Prints [2.5, 5, 8, 10]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] The sorting algorithm used is not [url=https://en.wikipedia.org/"
+"wiki/Sorting_algorithm#Stability]stable[/url]. This means that equivalent "
+"elements (such as [code]2[/code] and [code]2.0[/code]) may have their order "
+"changed when calling [method sort]."
+msgstr ""
+"Ordina l'array in ordine crescente. L'ordine finale dipende dal confronto "
+"\"minore di\" ([code]<[/code]) tra gli elementi.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var numeri = [10, 5, 2.5, 8]\n"
+"numeri.sort()\n"
+"print(numeri) # Stampa [2.5, 5, 8, 10]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array numbers = [10, 5, 2.5, 8];\n"
+"numeri.Sort();\n"
+"GD.Print(numeri); // Stampa [2.5, 5, 8, 10]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] L'algoritmo di selezione utilizzato non è [url=https://it."
+"wikipedia.org/wiki/"
+"Algoritmo_di_ordinamento#Stabilit%C3%A0_di_un_algoritmo]stabile[/url]. Ciò "
+"significa che gli elementi equivalenti (come [code]2[/code] e [code]2.0[/"
+"code]) potrebbero avere il loro ordine cambiato quando viene chiamato [method "
+"sort]."
+
 msgid ""
 "Sorts the array using a custom [Callable].\n"
 "[param func] is called as many times as necessary, receiving two array "
@@ -10939,6 +14701,45 @@ msgstr ""
 "Restituisce [code]true[/code] se la dimensione dell'array o i suoi elementi "
 "sono diversi da quelli di [param right]."
 
+msgid ""
+"Appends the [param right] array to the left operand, creating a new [Array]. "
+"This is also known as an array concatenation.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array1 = [\"One\", 2]\n"
+"var array2 = [3, \"Four\"]\n"
+"print(array1 + array2) # Prints [\"One\", 2, 3, \"Four\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Note that concatenation is not possible with C#'s native Array type.\n"
+"Godot.Collections.Array array1 = [\"One\", 2];\n"
+"Godot.Collections.Array array2 = [3, \"Four\"];\n"
+"GD.Print(array1 + array2); // Prints [\"One\", 2, 3, \"Four\"]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] For existing arrays, [method append_array] is much more "
+"efficient than concatenation and assignment with the [code]+=[/code] operator."
+msgstr ""
+"Appende l'array [param right] all'operando sinistro, creando un nuovo "
+"[Array]. Questa è anche conosciuta come una concatenazione di array.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array1 = [\"Uno\", 2]\n"
+"var array2 = [3, \"Quattro\"]\n"
+"print(array1 + array2) # Stampa [\"Uno\", 2, 3, \"Quattro\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Si noti che la concatenazione non è possibile con il tipo Array nativo di "
+"C#.\n"
+"Godot.Collections.Array array1 = [\"Uno\", 2];\n"
+"Godot.Collections.Array array2 = [3, \"Quattro\"];\n"
+"GD.Print(array1 + array2); // Stampa [\"Uno\", 2, 3, \"Quattro\"]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Per gli array esistenti, [method append_array] è molto più "
+"efficiente della concatenazione e dell'assegnazione con l'operatore [code]+=[/"
+"code]."
+
 msgid ""
 "Compares the elements of both arrays in order, starting from index [code]0[/"
 "code] and ending on the last index in common between both arrays. For each "
@@ -11047,6 +14848,104 @@ msgstr ""
 "Un tipo di [Mesh] che fornisce utilità per la costruzione di una superficie "
 "da più array."
 
+msgid ""
+"The [ArrayMesh] is used to construct a [Mesh] by specifying the attributes as "
+"arrays.\n"
+"The most basic example is the creation of a single triangle:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var vertices = PackedVector3Array()\n"
+"vertices.push_back(Vector3(0, 1, 0))\n"
+"vertices.push_back(Vector3(1, 0, 0))\n"
+"vertices.push_back(Vector3(0, 0, 1))\n"
+"\n"
+"# Initialize the ArrayMesh.\n"
+"var arr_mesh = ArrayMesh.new()\n"
+"var arrays = []\n"
+"arrays.resize(Mesh.ARRAY_MAX)\n"
+"arrays[Mesh.ARRAY_VERTEX] = vertices\n"
+"\n"
+"# Create the Mesh.\n"
+"arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)\n"
+"var m = MeshInstance3D.new()\n"
+"m.mesh = arr_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Vector3[] vertices =\n"
+"[\n"
+"    new Vector3(0, 1, 0),\n"
+"    new Vector3(1, 0, 0),\n"
+"    new Vector3(0, 0, 1),\n"
+"];\n"
+"\n"
+"// Initialize the ArrayMesh.\n"
+"var arrMesh = new ArrayMesh();\n"
+"Godot.Collections.Array arrays = [];\n"
+"arrays.Resize((int)Mesh.ArrayType.Max);\n"
+"arrays[(int)Mesh.ArrayType.Vertex] = vertices;\n"
+"\n"
+"// Create the Mesh.\n"
+"arrMesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, arrays);\n"
+"var m = new MeshInstance3D();\n"
+"m.Mesh = arrMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The [MeshInstance3D] is ready to be added to the [SceneTree] to be shown.\n"
+"See also [ImmediateMesh], [MeshDataTool] and [SurfaceTool] for procedural "
+"geometry generation.\n"
+"[b]Note:[/b] Godot uses clockwise [url=https://learnopengl.com/Advanced-"
+"OpenGL/Face-culling]winding order[/url] for front faces of triangle primitive "
+"modes."
+msgstr ""
+"Un [ArrayMesh] viene utilizzato per costruire una [Mesh] specificando gli "
+"attributi come più array.\n"
+"L'esempio più basilare è la creazione di un unico triangolo:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var vertices = PackedVector3Array()\n"
+"vertices.push_back(Vector3(0, 1, 0))\n"
+"vertices.push_back(Vector3(1, 0, 0))\n"
+"vertices.push_back(Vector3(0, 0, 1))\n"
+"\n"
+"# Inizializza l'ArrayMesh.\n"
+"var arr_mesh = ArrayMesh.new()\n"
+"var arrays = []\n"
+"arrays.resize(Mesh.ARRAY_MAX)\n"
+"arrays[Mesh.ARRAY_VERTEX] = vertices\n"
+"\n"
+"# Crea la Mesh.\n"
+"arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)\n"
+"var m = MeshInstance3D.new()\n"
+"m.mesh = arr_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var vertices = new Vector3[]\n"
+"{\n"
+"    new Vector3(0, 1, 0),\n"
+"    new Vector3(1, 0, 0),\n"
+"    new Vector3(0, 0, 1),\n"
+"};\n"
+"\n"
+"// Inizializza l'ArrayMesh.\n"
+"var arrMesh = new ArrayMesh();\n"
+"Godot.Collections.Array arrays = [];\n"
+"arrays.Resize((int)Mesh.ArrayType.Max);\n"
+"arrays[(int)Mesh.ArrayType.Vertex] = vertices;\n"
+"\n"
+"// Crea la Mesh.\n"
+"arrMesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, arrays);\n"
+"var m = new MeshInstance3D();\n"
+"m.Mesh = arrMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Il [MeshInstance3D] è pronto per essere aggiunto al [SceneTree] per essere "
+"mostrato.\n"
+"Vedi anche [ImmediateMesh], [MeshDataTool], e [SurfaceTool] per la "
+"generazione di geometria procedurale.\n"
+"[b]Nota:[/b] Godot utilizza l'[url=https://learnopengl.com/Advanced-OpenGL/"
+"Face-culling]ordine di avvolgimento[/url] in senso orario per le facce "
+"anteriori delle modalità di triangolo primitivo."
+
 msgid "Procedural geometry using the ArrayMesh"
 msgstr "Geometria procedurale utilizzando ArrayMesh"
 
@@ -11312,7 +15211,7 @@ msgid ""
 "[param bidirectional] is [code]false[/code], returns whether movement from "
 "[param id] to [param to_id] is possible through this segment."
 msgstr ""
-"Restituisce se c'è una connessione/segmento tra i punti specificati. Se "
+"Restituisce se c'è un collegamento/segmento tra i punti specificati. Se "
 "[param bidirectional] è [code]false[/code], restituisce se è possibile il "
 "movimento da [param id] a [param to_id] attraverso questo segmento."
 
@@ -11430,6 +15329,90 @@ msgstr ""
 "Il risultato è nel segmento che va da [code]y = 0[/code] a [code]y = 5[/"
 "code]. È la posizione più vicina nel segmento al punto indicato."
 
+msgid ""
+"Returns an array with the IDs of the points that form the path found by "
+"AStar2D between the given points. The array is ordered from the starting "
+"point to the ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] When [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 1), 1) # Default weight is 1\n"
+"astar.add_point(3, Vector2(1, 1))\n"
+"astar.add_point(4, Vector2(2, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # Returns [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 1), 1); // Default weight is 1\n"
+"astar.AddPoint(3, new Vector2(1, 1));\n"
+"astar.AddPoint(4, new Vector2(2, 0));\n"
+"\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // Returns [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If you change the 2nd point's weight to 3, then the result will be [code][1, "
+"4, 3][/code] instead, because now even though the distance is longer, it's "
+"\"easier\" to get through point 4 than through point 2."
+msgstr ""
+"Restituisce un array con gli ID dei punti che formano il percorso trovato da "
+"AStar2D tra i punti indicati. L'array è ordinato dal punto iniziale al punto "
+"finale del percorso.\n"
+"Se non c'è un percorso valido per la destinazione, e [param "
+"allow_partial_path] è [code]true[/code], restituisce un percorso al punto più "
+"vicino alla destinazione che può essere raggiunto.\n"
+"[b]Nota:[/b] Quando [param allow_partial_path] è [code]true[/code] e [param "
+"to_id] è disabilitato, la ricerca potrebbe richiedere un tempo insolitamente "
+"lungo per essere completata.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 1), 1) # Il peso predefinito è 1\n"
+"astar.add_point(3, Vector2(1, 1))\n"
+"astar.add_point(4, Vector2(2, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # Restituisce [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 1), 1); // Il peso predefinito è 1\n"
+"astar.AddPoint(3, new Vector2(1, 1));\n"
+"astar.AddPoint(4, new Vector2(2, 0));\n"
+"\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // Restituisce [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Se si cambia il peso a 3 per il punto 2, allora il risultato sarà [code][1, "
+"4, 3][/code] invece, poiché adesso anche se la distanza è più lunga, è \"più "
+"facile\" arrivare attraverso il punto 4 che attraverso il punto 2."
+
 msgid ""
 "Returns the capacity of the structure backing the points, useful in "
 "conjunction with [method reserve_space]."
@@ -11437,12 +15420,95 @@ msgstr ""
 "Restituisce la capacità della struttura che sostiene i punti, utile in "
 "combinazione con [method reserve_space]."
 
+msgid ""
+"Returns an array with the IDs of the points that form the connection with the "
+"given point.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 1))\n"
+"astar.add_point(3, Vector2(1, 1))\n"
+"astar.add_point(4, Vector2(2, 0))\n"
+"\n"
+"astar.connect_points(1, 2, true)\n"
+"astar.connect_points(1, 3, true)\n"
+"\n"
+"var neighbors = astar.get_point_connections(1) # Returns [2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 1));\n"
+"astar.AddPoint(3, new Vector2(1, 1));\n"
+"astar.AddPoint(4, new Vector2(2, 0));\n"
+"\n"
+"astar.ConnectPoints(1, 2, true);\n"
+"astar.ConnectPoints(1, 3, true);\n"
+"\n"
+"long[] neighbors = astar.GetPointConnections(1); // Returns [2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce un array con gli ID dei punti che formano il collegamento con il "
+"punto indicato.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 1))\n"
+"astar.add_point(3, Vector2(1, 1))\n"
+"astar.add_point(4, Vector2(2, 0))\n"
+"\n"
+"astar.connect_points(1, 2, true)\n"
+"astar.connect_points(1, 3, true)\n"
+"\n"
+"var neighbors = astar.get_point_connections(1) # Restituisce [2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 1));\n"
+"astar.AddPoint(3, new Vector2(1, 1));\n"
+"astar.AddPoint(4, new Vector2(2, 0));\n"
+"\n"
+"astar.ConnectPoints(1, 2, true);\n"
+"astar.ConnectPoints(1, 3, true);\n"
+"\n"
+"long[] neighbors = astar.GetPointConnections(1); // Restituisce [2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Returns the number of points currently in the points pool."
 msgstr "Restituisce il numero di punti attualmente nell'insieme dei punti."
 
 msgid "Returns an array of all point IDs."
 msgstr "Restituisce un array di tutti gli ID dei punti."
 
+msgid ""
+"Returns an array with the points that are in the path found by AStar2D "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it "
+"will return an empty array and will print an error message.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish."
+msgstr ""
+"Restituisce un array con i punti che sono presenti nel percorso trovato da "
+"AStar2D tra i punti indicati. L'array è ordinato dal punto iniziale al punto "
+"finale del percorso.\n"
+"Se non c'è un percorso valido per la destinazione, e [param "
+"allow_partial_path] è [code]true[/code], restituisce un percorso al punto più "
+"vicino alla destinazione che può essere raggiunto.\n"
+"[b]Nota:[/b] Questo metodo non è thread-safe. Se chiamato da un [Thread], "
+"restituirà un array vuoto e stamperà un messaggio di errore.\n"
+"Inoltre, quando [param allow_partial_path] è [code]true[/code] e [param "
+"to_id] è disabilitato, la ricerca potrebbe richiedere un tempo insolitamente "
+"lungo per essere completata."
+
 msgid "Returns the position of the point associated with the given [param id]."
 msgstr "Restituisce la posizione del punto associato all'[param id] fornito."
 
@@ -11466,6 +15532,16 @@ msgid ""
 msgstr ""
 "Rimuove il punto associato all'[param id] fornito dall'insieme di punti."
 
+msgid ""
+"Reserves space internally for [param num_nodes] points. Useful if you're "
+"adding a known large number of points at once, such as points on a grid. The "
+"new capacity must be greater or equal to the old capacity."
+msgstr ""
+"Riserva internamente lo spazio per il numero di punti [param num_nodes]. "
+"Utile se si sta aggiungendo un gran numero di punti conosciuti alla volta, "
+"come punti su una griglia. La nuova capacità deve essere maggiore o uguale "
+"alla capacità precedente."
+
 msgid ""
 "Disables or enables the specified point for pathfinding. Useful for making a "
 "temporary obstacle."
@@ -11520,6 +15596,169 @@ msgstr ""
 "movimento da [param id] a [param to_id] è possibile attraverso questo "
 "segmento."
 
+msgid ""
+"Returns an array with the IDs of the points that form the path found by "
+"AStar3D between the given points. The array is ordered from the starting "
+"point to the ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] When [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 1, 0), 1) # Default weight is 1\n"
+"astar.add_point(3, Vector3(1, 1, 0))\n"
+"astar.add_point(4, Vector3(2, 0, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # Returns [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 1, 0), 1); // Default weight is 1\n"
+"astar.AddPoint(3, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(4, new Vector3(2, 0, 0));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // Returns [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If you change the 2nd point's weight to 3, then the result will be [code][1, "
+"4, 3][/code] instead, because now even though the distance is longer, it's "
+"\"easier\" to get through point 4 than through point 2."
+msgstr ""
+"Restituisce un array con gli ID dei punti che formano il percorso trovato da "
+"AStar3D tra i punti indicati. L'array è ordinato dal punto iniziale al punto "
+"finale del percorso.\n"
+"Se non c'è un percorso valido per la destinazione, e [param "
+"allow_partial_path] è [code]true[/code], restituisce un percorso al punto più "
+"vicino alla destinazione che può essere raggiunto.\n"
+"[b]Nota:[/b] quando [param allow_partial_path] è [code]true[/code] e [param "
+"to_id] è disabilitato, la ricerca potrebbe richiedere un tempo insolitamente "
+"lungo per essere completata.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 1, 0), 1) # Il peso predefinito è 1\n"
+"astar.add_point(3, Vector3(1, 1, 0))\n"
+"astar.add_point(4, Vector3(2, 0, 0))\n"
+"\n"
+"astar.connect_points(1, 2, false)\n"
+"astar.connect_points(2, 3, false)\n"
+"astar.connect_points(4, 3, false)\n"
+"astar.connect_points(1, 4, false)\n"
+"\n"
+"var res = astar.get_id_path(1, 3) # Restituisce [1, 2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 1, 0), 1); // Il peso predefinito è 1\n"
+"astar.AddPoint(3, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(4, new Vector3(2, 0, 0));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"astar.ConnectPoints(2, 3, false);\n"
+"astar.ConnectPoints(4, 3, false);\n"
+"astar.ConnectPoints(1, 4, false);\n"
+"long[] res = astar.GetIdPath(1, 3); // Restituisce [1, 2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Se si cambia il peso a 3 per il punto 2, allora il risultato sarà [code][1, "
+"4, 3][/code] invece, poiché adesso anche se la distanza è più lunga, è \"più "
+"facile\" arrivare attraverso il punto 4 che attraverso il punto 2."
+
+msgid ""
+"Returns an array with the IDs of the points that form the connection with the "
+"given point.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 1, 0))\n"
+"astar.add_point(3, Vector3(1, 1, 0))\n"
+"astar.add_point(4, Vector3(2, 0, 0))\n"
+"\n"
+"astar.connect_points(1, 2, true)\n"
+"astar.connect_points(1, 3, true)\n"
+"\n"
+"var neighbors = astar.get_point_connections(1) # Returns [2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 1, 0));\n"
+"astar.AddPoint(3, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(4, new Vector3(2, 0, 0));\n"
+"astar.ConnectPoints(1, 2, true);\n"
+"astar.ConnectPoints(1, 3, true);\n"
+"\n"
+"long[] neighbors = astar.GetPointConnections(1); // Returns [2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce un array con gli ID dei punti che formano la connessione con il "
+"punto indicato.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 1, 0))\n"
+"astar.add_point(3, Vector3(1, 1, 0))\n"
+"astar.add_point(4, Vector3(2, 0, 0))\n"
+"\n"
+"astar.connect_points(1, 2, true)\n"
+"astar.connect_points(1, 3, true)\n"
+"\n"
+"var neighbors = astar.get_point_connections(1) # Returns [2, 3]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 1, 0));\n"
+"astar.AddPoint(3, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(4, new Vector3(2, 0, 0));\n"
+"astar.ConnectPoints(1, 2, true);\n"
+"astar.ConnectPoints(1, 3, true);\n"
+"\n"
+"long[] neighbors = astar.GetPointConnections(1); // Returns [2, 3]\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns an array with the points that are in the path found by AStar3D "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it "
+"will return an empty array and will print an error message.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish."
+msgstr ""
+"Restituisce un array con i punti che sono presenti nel percorso trovato da "
+"AStar3D tra i punti indicati. L'array è ordinato dal punto iniziale al punto "
+"finale del percorso.\n"
+"Se non c'è un percorso valido per l'obiettivo, e [param allow_partial_path] è "
+"[code]true[/code], restituisce un percorso al punto più vicino all'obiettivo "
+"che può essere raggiunto.\n"
+"[b]Nota:[/b] Questo metodo non è thread-safe. Se chiamato da un [Thread], "
+"restituirà un array vuoto e stamperà un messaggio di errore.\n"
+"Inoltre, quando [param allow_partial_path] è [code]true[/code] e [param "
+"to_id] è disabilitato, la ricerca potrebbe richiedere un tempo insolitamente "
+"lungo per essere completata."
+
 msgid ""
 "Reserves space internally for [param num_nodes] points. Useful if you're "
 "adding a known large number of points at once, such as points on a grid. New "
@@ -11537,6 +15776,74 @@ msgstr ""
 "Un'implementazione di A* per trovare il percorso più breve tra due punti su "
 "una griglia parziale 2D."
 
+msgid ""
+"[AStarGrid2D] is a variant of [AStar2D] that is specialized for partial 2D "
+"grids. It is simpler to use because it doesn't require you to manually create "
+"points and connect them together. This class also supports multiple types of "
+"heuristics, modes for diagonal movement, and a jumping mode to speed up "
+"calculations.\n"
+"To use [AStarGrid2D], you only need to set the [member region] of the grid, "
+"optionally set the [member cell_size], and then call the [method update] "
+"method:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar_grid = AStarGrid2D.new()\n"
+"astar_grid.region = Rect2i(0, 0, 32, 32)\n"
+"astar_grid.cell_size = Vector2(16, 16)\n"
+"astar_grid.update()\n"
+"print(astar_grid.get_id_path(Vector2i(0, 0), Vector2i(3, 4))) # Prints [(0, "
+"0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"print(astar_grid.get_point_path(Vector2i(0, 0), Vector2i(3, 4))) # Prints "
+"[(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"AStarGrid2D astarGrid = new AStarGrid2D();\n"
+"astarGrid.Region = new Rect2I(0, 0, 32, 32);\n"
+"astarGrid.CellSize = new Vector2I(16, 16);\n"
+"astarGrid.Update();\n"
+"GD.Print(astarGrid.GetIdPath(Vector2I.Zero, new Vector2I(3, 4))); // Prints "
+"[(0, 0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"GD.Print(astarGrid.GetPointPath(Vector2I.Zero, new Vector2I(3, 4))); // "
+"Prints [(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To remove a point from the pathfinding grid, it must be set as \"solid\" with "
+"[method set_point_solid]."
+msgstr ""
+"[AStarGrid2D] è una variante di [AStar2D] che è specializzata per le griglie "
+"2D parziali. È più semplice da usare perché non richiede di creare "
+"manualmente i punti e collegarli insieme. Questa classe supporta anche più "
+"tipi di euristica, modalità per movimento diagonale, e una modalità di salto "
+"per accelerare i calcoli.\n"
+"Per utilizzare [AStarGrid2D], è sufficiente solo impostare la regione "
+"([member region]) della griglia, impostando facoltativamente le dimensioni "
+"della cella ([member cell_size]), e infine chiamare il metodo [method "
+"update]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar_grid = AStarGrid2D.new()\n"
+"astar_grid.region = Rect2i(0, 0, 32, 32)\n"
+"astar_grid.cell_size = Vector2(16, 16)\n"
+"astar_grid.update()\n"
+"print(astar_grid.get_id_path(Vector2i(0, 0), Vector2i(3, 4))) # Stampa [(0, "
+"0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"print(astar_grid.get_point_path(Vector2i(0, 0), Vector2i(3, 4))) # Stampa "
+"[(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"AStarGrid2D astarGrid = new AStarGrid2D();\n"
+"astarGrid.Region = new Rect2I(0, 0, 32, 32);\n"
+"astarGrid.CellSize = new Vector2I(16, 16);\n"
+"astarGrid.Update();\n"
+"GD.Print(astarGrid.GetIdPath(Vector2I.Zero, new Vector2I(3, 4))); // Stampa "
+"[(0, 0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"GD.Print(astarGrid.GetPointPath(Vector2I.Zero, new Vector2I(3, 4))); // "
+"Stampa [(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Per rimuovere un punto dalla griglia di rilevamento del percorso, deve essere "
+"impostato come \"solido\" con [method set_point_solid]."
+
 msgid ""
 "Called when computing the cost between two connected points.\n"
 "Note that this function is hidden in the default [AStarGrid2D] class."
@@ -11581,6 +15888,50 @@ msgstr ""
 "[b]Nota:[/b] Chiamare [method update] non è necessario dopo aver chiamato "
 "questa funzione."
 
+msgid ""
+"Returns an array with the IDs of the points that form the path found by "
+"AStar2D between the given points. The array is ordered from the starting "
+"point to the ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] When [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is solid the search may take an unusually long time to finish."
+msgstr ""
+"Restituisce un array con i punti che formano il percorso trovato da AStar2D "
+"tra i punti indicati. L'array è ordinato dal punto iniziale al punto finale "
+"del percorso.\n"
+"Se non c'è un percorso valido per la destinazione, e [param "
+"allow_partial_path] è [code]true[/code], restituisce un percorso al punto più "
+"vicino alla destinazione che può essere raggiunto.\n"
+"[b]Nota:[/b] quando [param allow_partial_path] è [code]true[/code] e [param "
+"to_id] è solido, la ricerca potrebbe richiedere un tempo insolitamente lungo "
+"per essere completata."
+
+msgid ""
+"Returns an array with the points that are in the path found by [AStarGrid2D] "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it "
+"will return an empty array and will print an error message.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is solid the search may take an unusually long time to finish."
+msgstr ""
+"Restituisce un array con i punti che sono presenti nel percorso trovato da "
+"AStar2D tra i punti indicati. L'array è ordinato dal punto iniziale al punto "
+"finale del percorso.\n"
+"Se non c'è un percorso valido per la destinazione, e [param "
+"allow_partial_path] è [code]true[/code], restituisce un percorso al punto più "
+"vicino alla destinazione che può essere raggiunto.\n"
+"[b]Nota:[/b] Questo metodo non è thread-safe. Se chiamato da un [Thread], "
+"restituirà un array vuoto e stamperà un messaggio di errore.\n"
+"Inoltre, quando [param allow_partial_path] è [code]true[/code] e [param "
+"to_id] è solido, la ricerca potrebbe richiedere un tempo insolitamente lungo "
+"per essere completata."
+
 msgid ""
 "Indicates that the grid parameters were changed and [method update] needs to "
 "be called."
@@ -11881,6 +16232,29 @@ msgstr "Rappresenta la dimensione dell'enumerazione [enum CellShape]."
 msgid "A texture that crops out part of another Texture2D."
 msgstr "Una texture che ritaglia parte di un'altra Texture2D."
 
+msgid ""
+"[Texture2D] resource that draws only part of its [member atlas] texture, as "
+"defined by the [member region]. An additional [member margin] can also be "
+"set, which is useful for small adjustments.\n"
+"Multiple [AtlasTexture] resources can be cropped from the same [member "
+"atlas]. Packing many smaller textures into a singular large texture helps to "
+"optimize video memory costs and render calls.\n"
+"[b]Note:[/b] [AtlasTexture] cannot be used in an [AnimatedTexture], and will "
+"not tile properly in nodes such as [TextureRect] or [Sprite2D]. To tile an "
+"[AtlasTexture], modify its [member region] instead."
+msgstr ""
+"Risorsa [Texture2D] che disegna solo parte della sua texture [member atlas], "
+"come definita dalla regione ([member region]). È inoltre possibile impostare "
+"un ulteriore [member margin], che è utile per piccoli aggiustamenti.\n"
+"È possibile ritagliare molteplici risorse [AtlasTexture] dallo stesso [member "
+"atlas]. Impacchettare molte texture più piccole in una singola, grande "
+"texture aiuta a ottimizzare i costi di memoria video e delle chiamate per il "
+"rendering.\n"
+"[b]Nota:[/b] [AtlasTexture] non può essere utilizzato in un [AnimatedTexture] "
+"e potrebbe non ripetersi correttamente in nodi come [TextureRect] o "
+"[Sprite2D]. Per ripetere un [AtlasTexture], modifica invece la sua [member "
+"region]."
+
 msgid ""
 "The texture that contains the atlas. Can be any type inheriting from "
 "[Texture2D], including another [AtlasTexture]."
@@ -12760,6 +17134,15 @@ msgstr ""
 "Combina i segnali sfasati con il segnale originale. Il movimento dei segnali "
 "sfasati è controllato utilizzando un oscillatore a bassa frequenza."
 
+msgid ""
+"Governs how high the filter frequencies sweep. Low value will primarily "
+"affect bass frequencies. High value can sweep high into the treble. Value can "
+"range from 0.1 to 4."
+msgstr ""
+"Regola quanto in alto si spostano le frequenze del filtro. Un valore basso "
+"influenzerà principalmente le frequenze dei bassi. Un valore elevato può "
+"arrivare fino agli acuti. Il valore può variare da 0,1 a 4."
+
 msgid "Output percent of modified sound. Value can range from 0.1 to 0.9."
 msgstr ""
 "Percentuale in uscita del suono modificato. Il valore può variare da 0,1 a "
@@ -12779,6 +17162,13 @@ msgstr ""
 "Determina la frequenza minima influenzata dalle modulazioni di LFO, in Hz. Il "
 "valore può variare da 10 a 10000."
 
+msgid ""
+"Adjusts the rate in Hz at which the effect sweeps up and down across the "
+"frequency range."
+msgstr ""
+"Regola la velocità in Hz alla quale l'effetto scorre in alto e in basso lungo "
+"l'intervallo di frequenza."
+
 msgid ""
 "Adds a pitch-shifting audio effect to an audio bus.\n"
 "Raises or lowers the pitch of original sound."
@@ -12988,6 +17378,21 @@ msgstr ""
 "Effetto audio che può essere utilizzato per le visualizzazioni di audio in "
 "tempo reale."
 
+msgid ""
+"This audio effect does not affect sound output, but can be used for real-time "
+"audio visualizations.\n"
+"This resource configures an [AudioEffectSpectrumAnalyzerInstance], which "
+"performs the actual analysis at runtime. An instance can be obtained with "
+"[method AudioServer.get_bus_effect_instance].\n"
+"See also [AudioStreamGenerator] for procedurally generating sounds."
+msgstr ""
+"Questo effetto audio non influisce sul suono riprodotto, ma può essere "
+"utilizzato per visualizzare l'audio in tempo reale.\n"
+"Questa risorsa configura un [AudioEffectSpectrumAnalyzerInstance], il quale "
+"effettivamente analizza lo spettro audio durante l'esecuzione. È possibile "
+"ottenere un'istanza con [method AudioServer.get_bus_effect_instance].\n"
+"Vedi anche [AudioStreamGenerator] per generare proceduralmente i suoni."
+
 msgid "Audio Spectrum Visualizer Demo"
 msgstr "Demo di visualizzatore spettro audio"
 
@@ -13014,6 +17419,18 @@ msgstr ""
 msgid "Queryable instance of an [AudioEffectSpectrumAnalyzer]."
 msgstr "Istanza interrogabile di un [AudioEffectSpectrumAnalyzer]."
 
+msgid ""
+"The runtime part of an [AudioEffectSpectrumAnalyzer], which can be used to "
+"query the magnitude of a frequency range on its host bus.\n"
+"An instance of this class can be obtained with [method AudioServer."
+"get_bus_effect_instance]."
+msgstr ""
+"La parte in esecuzione di un [AudioEffectSpectrumAnalyzer], che può essere "
+"utilizzata per richiedere l'ampiezza di un intervallo di frequenza sul suo "
+"bus host.\n"
+"È possibile ottenere un'istanza di questa classe con [method AudioServer."
+"get_bus_effect_instance]."
+
 msgid ""
 "Returns the magnitude of the frequencies from [param from_hz] to [param "
 "to_hz] in linear energy as a Vector2. The [code]x[/code] component of the "
@@ -13058,7 +17475,7 @@ msgstr ""
 "make_current], questo nodo sostituirà la posizione da cui si sentono i suoni. "
 "Solo un [AudioListener2D] può essere attuale. Utilizzare [method "
 "make_current] disabiliterà il [AudioListener2D] precedente.\n"
-"Se non è presente alcun [AudioListener2D] attivo nel [Viewport] attuale, il "
+"Se non è presente alcun [AudioListener2D] attivo nella [Viewport] attuale, il "
 "centro dello schermo sarà utilizzato come punto di ascolto dell'audio. "
 "[AudioListener2D] deve essere all'interno di un [SceneTree] per poter "
 "funzionare."
@@ -13222,6 +17639,10 @@ msgstr ""
 "descrizione di quella impostazione per avvertenze riguardo le autorizzazioni "
 "e le impostazioni sulla privacy del sistema operativo."
 
+msgid "Returns the sample rate at the input of the [AudioServer]."
+msgstr ""
+"Restituisce la frequenza di campionamento all'uscita dell'[AudioServer]."
+
 msgid "Returns the sample rate at the output of the [AudioServer]."
 msgstr "Restituisce la frequenza di campionamento all'uscita del [AudioServer]."
 
@@ -13249,6 +17670,10 @@ msgstr "Restituisce la configurazione degli speaker."
 msgid "Returns the relative time since the last mix occurred."
 msgstr "Restituisce il tempo relativo trascorso dall'ultimo mixaggio."
 
+msgid "Returns the relative time until the next mix occurs."
+msgstr ""
+"Restituisce il tempo relativo fino al verificarsi del mixaggio successivo."
+
 msgid ""
 "If [code]true[/code], the bus at index [param bus_idx] is bypassing effects."
 msgstr ""
@@ -13282,6 +17707,13 @@ msgstr ""
 "riprodotto. Per prevenire i picchi di ritardo, registra il flusso come "
 "campione con [method register_stream_as_sample]."
 
+msgid ""
+"Locks the audio driver's main loop.\n"
+"[b]Note:[/b] Remember to unlock it afterwards."
+msgstr ""
+"Blocca il ciclo principale del driver audio.\n"
+"[b]Nota:[/b] Ricorda di sbloccarlo successivamente."
+
 msgid "Moves the bus from index [param index] to index [param to_index]."
 msgstr "Sposta il bus dall'indice [param index] all'indice [param to_index]."
 
@@ -13322,6 +17754,13 @@ msgstr ""
 "Collega l'uscita del bus all'indice [param bus_idx] al bus con il nome [param "
 "send]."
 
+msgid ""
+"Sets the volume in decibels of the bus at index [param bus_idx] to [param "
+"volume_db]."
+msgstr ""
+"Imposta il volume in decibel del bus all'indice [param bus_idx] su [param "
+"volume_db]."
+
 msgid ""
 "If set to [code]true[/code], all instances of [AudioStreamPlayback] will call "
 "[method AudioStreamPlayback._tag_used_streams] every mix step.\n"
@@ -13467,6 +17906,10 @@ msgstr "Flussi audio"
 msgid "Audio Generator Demo"
 msgstr "Demo di generatore audio"
 
+msgid "Override this method to return the bar beats of this stream."
+msgstr ""
+"Sostituisci questo metodo restituire i battiti per battuta di questo flusso."
+
 msgid ""
 "Overridable method. Should return the total number of beats of this audio "
 "stream. Used by the engine to determine the position of every beat.\n"
@@ -13517,6 +17960,21 @@ msgstr ""
 "Sovrascrivi questo metodo per personalizzare il nome assegnato a questo "
 "flusso audio. Non usato dal motore."
 
+msgid ""
+"Override this method to return [code]true[/code] if this stream has a loop."
+msgstr ""
+"Sostituisci questo metodo restituire [code]true[/code] se questo flusso si "
+"ripete."
+
+msgid ""
+"Override this method to customize the returned value of [method "
+"instantiate_playback]. Should return a new [AudioStreamPlayback] created when "
+"the stream is played (such as by an [AudioStreamPlayer])."
+msgstr ""
+"Sovrascrivi questo metodo per personalizzare il valore restituito da [method "
+"instantiate_playback]. Dovrebbe restituire un nuovo [AudioStreamPlayback] "
+"creato quando il flusso viene riprodotto (come da un [AudioStreamPlayer]."
+
 msgid ""
 "Override this method to customize the returned value of [method "
 "is_monophonic]. Should return [code]true[/code] if this audio stream only "
@@ -13576,6 +18034,147 @@ msgstr ""
 msgid "An audio stream with utilities for procedural sound generation."
 msgstr "Un flusso audio con utilità per la generazione del suono procedurale."
 
+msgid ""
+"[AudioStreamGenerator] is a type of audio stream that does not play back "
+"sounds on its own; instead, it expects a script to generate audio data for "
+"it. See also [AudioStreamGeneratorPlayback].\n"
+"Here's a sample on how to use it to generate a sine wave:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var playback # Will hold the AudioStreamGeneratorPlayback.\n"
+"@onready var sample_hz = $AudioStreamPlayer.stream.mix_rate\n"
+"var pulse_hz = 440.0 # The frequency of the sound wave.\n"
+"var phase = 0.0\n"
+"\n"
+"func _ready():\n"
+"    $AudioStreamPlayer.play()\n"
+"    playback = $AudioStreamPlayer.get_stream_playback()\n"
+"    fill_buffer()\n"
+"\n"
+"func fill_buffer():\n"
+"    var increment = pulse_hz / sample_hz\n"
+"    var frames_available = playback.get_frames_available()\n"
+"\n"
+"    for i in range(frames_available):\n"
+"        playback.push_frame(Vector2.ONE * sin(phase * TAU))\n"
+"        phase = fmod(phase + increment, 1.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export] public AudioStreamPlayer Player { get; set; }\n"
+"\n"
+"private AudioStreamGeneratorPlayback _playback; // Will hold the "
+"AudioStreamGeneratorPlayback.\n"
+"private float _sampleHz;\n"
+"private float _pulseHz = 440.0f; // The frequency of the sound wave.\n"
+"private double phase = 0.0;\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    if (Player.Stream is AudioStreamGenerator generator) // Type as a "
+"generator to access MixRate.\n"
+"    {\n"
+"        _sampleHz = generator.MixRate;\n"
+"        Player.Play();\n"
+"        _playback = (AudioStreamGeneratorPlayback)Player."
+"GetStreamPlayback();\n"
+"        FillBuffer();\n"
+"    }\n"
+"}\n"
+"\n"
+"public void FillBuffer()\n"
+"{\n"
+"    float increment = _pulseHz / _sampleHz;\n"
+"    int framesAvailable = _playback.GetFramesAvailable();\n"
+"\n"
+"    for (int i = 0; i < framesAvailable; i++)\n"
+"    {\n"
+"        _playback.PushFrame(Vector2.One * (float)Mathf.Sin(phase * Mathf."
+"Tau));\n"
+"        phase = Mathf.PosMod(phase + increment, 1.0);\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In the example above, the \"AudioStreamPlayer\" node must use an "
+"[AudioStreamGenerator] as its stream. The [code]fill_buffer[/code] function "
+"provides audio data for approximating a sine wave.\n"
+"See also [AudioEffectSpectrumAnalyzer] for performing real-time audio "
+"spectrum analysis.\n"
+"[b]Note:[/b] Due to performance constraints, this class is best used from C# "
+"or from a compiled language via GDExtension. If you still want to use this "
+"class from GDScript, consider using a lower [member mix_rate] such as 11,025 "
+"Hz or 22,050 Hz."
+msgstr ""
+"[AudioStreamGenerator] è un tipo di flusso audio che non riproduce suoni da "
+"solo; invece, si aspetta che uno script generi dati audio per esso. Vedi "
+"anche [AudioStreamGeneratorPlayback].\n"
+"Ecco un esempio su come utilizzarlo per generare un'onda sinusoidale:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var playback # Conterrà l'AudioStreamGeneratorPlayback.\n"
+"@onready var sample_hz = $AudioStreamPlayer.stream.mix_rate\n"
+"var pulse_hz = 440.0 # La frequenza dell'onda sonora.\n"
+"var phase = 0.0\n"
+"\n"
+"func _ready():\n"
+"    $AudioStreamPlayer.play()\n"
+"    playback = $AudioStreamPlayer.get_stream_playback()\n"
+"    fill_buffer()\n"
+"\n"
+"func fill_buffer():\n"
+"    var increment = pulse_hz / sample_hz\n"
+"    var frames_available = playback.get_frames_available()\n"
+"\n"
+"    for i in range(frames_available):\n"
+"        playback.push_frame(Vector2.ONE * sin(phase * TAU))\n"
+"        phase = fmod(phase + increment, 1.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export] public AudioStreamPlayer Player { get; set; }\n"
+"\n"
+"private AudioStreamGeneratorPlayback _playback; // Conterrà "
+"l'AudioStreamGeneratorPlayback.\n"
+"private float _sampleHz;\n"
+"private float _pulseHz = 440.0f; // La frequenza dell'onda sonora.\n"
+"private double phase = 0.0;\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    if (Player.Stream is AudioStreamGenerator generator) // Tipo come un "
+"generatore per accedere a MixRate.\n"
+"    {\n"
+"        _sampleHz = generator.MixRate;\n"
+"        Player.Play();\n"
+"        _playback = (AudioStreamGeneratorPlayback)Player."
+"GetStreamPlayback();\n"
+"        FillBuffer();\n"
+"    }\n"
+"}\n"
+"\n"
+"public void FillBuffer()\n"
+"{\n"
+"    float increment = _pulseHz / _sampleHz;\n"
+"    int framesAvailable = _playback.GetFramesAvailable();\n"
+"\n"
+"    for (int i = 0; i < framesAvailable; i++)\n"
+"    {\n"
+"        _playback.PushFrame(Vector2.One * (float)Mathf.Sin(phase * Mathf."
+"Tau));\n"
+"        phase = Mathf.PosMod(phase + increment, 1.0);\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Nell'esempio sopra, il nodo \"AudioStreamPlayer\" deve usare un "
+"[AudioStreamGenerator] come flusso. La funzione [code]fill_buffer[/code] "
+"fornisce dati audio per approssimare un'onda sinusoidale.\n"
+"Vedi anche [AudioEffectSpectrumAnalyzer] per analizzare uno spettro audio in "
+"tempo reale.\n"
+"[b]Nota:[/b] A causa di vincoli di prestazioni, questa classe è meglio "
+"utilizzata da C# o da un linguaggio compilato tramite GDExtension. Se si "
+"desidera comunque utilizzare questa classe da GDScript, considera l'utilizzo "
+"di un [member mix_rate] inferiore, ad esempio 11.025 Hz o 22.050 Hz."
+
 msgid ""
 "The length of the buffer to generate (in seconds). Lower values result in "
 "less latency, but require the script to generate audio data faster, resulting "
@@ -13898,6 +18497,20 @@ msgstr ""
 msgid "Runtime file loading and saving"
 msgstr "Caricamento e salvataggio di file a tempo di esecuzione"
 
+msgid ""
+"Creates a new [AudioStreamOggVorbis] instance from the given buffer. The "
+"buffer must contain Ogg Vorbis data."
+msgstr ""
+"Crea una nuova istanza [AudioStreamOggVorbis] dal buffer fornito. Il buffer "
+"deve contenere i dati in Ogg Vorbis."
+
+msgid ""
+"Creates a new [AudioStreamOggVorbis] instance from the given file path. The "
+"file must be in Ogg Vorbis format."
+msgstr ""
+"Crea una nuova istanza [AudioStreamOggVorbis] dal percorso di file fornito. "
+"Il file deve essere in formato Ogg Vorbis."
+
 msgid ""
 "If [code]true[/code], the audio will play again from the specified [member "
 "loop_offset] once it is done playing. Useful for ambient sounds and "
@@ -14004,6 +18617,12 @@ msgstr ""
 "code]. I plugin dell'editor possono utilizzare questo metodo per \"taggare\" "
 "la posizione corrente lungo il flusso audio e visualizzarla in un'anteprima."
 
+msgid "Returns the number of times the stream has looped."
+msgstr "Restituisce il numero di volte che il flusso si è ripetuto."
+
+msgid "Returns the current position in the stream, in seconds."
+msgstr "Restituisce la posizione attuale nel flusso, in secondi."
+
 msgid ""
 "Returns the [AudioSamplePlayback] associated with this [AudioStreamPlayback] "
 "for playing back the audio sample of this stream."
@@ -14011,6 +18630,12 @@ msgstr ""
 "Restituisce l'[AudioSamplePlayback] associato a questo [AudioStreamPlayback] "
 "per riprodurre il campione audio di questo flusso."
 
+msgid "Returns [code]true[/code] if the stream is playing."
+msgstr "Restituisce [code]true[/code] se il flusso è in riproduzione."
+
+msgid "Seeks the stream at the given [param time], in seconds."
+msgstr "Cerca il flusso al tempo [param time], in secondi."
+
 msgid ""
 "Associates [AudioSamplePlayback] to this [AudioStreamPlayback] for playing "
 "back the audio sample of this stream."
@@ -14018,9 +18643,22 @@ msgstr ""
 "Associa l'[AudioSamplePlayback] a questo [AudioStreamPlayback] per riprodurre "
 "il campione audio di questo flusso."
 
+msgid "Starts the stream from the given [param from_pos], in seconds."
+msgstr "Avvia il flusso dalla posizione [param from_position], in secondi."
+
+msgid "Stops the stream."
+msgstr "Arresta il flusso."
+
 msgid "Playback component of [AudioStreamInteractive]."
 msgstr "Componente di riproduzione di [AudioStreamInteractive]."
 
+msgid ""
+"Playback component of [AudioStreamInteractive]. Contains functions to change "
+"the currently played clip."
+msgstr ""
+"Componente di riproduzione di [AudioStreamInteractive]. Contiene funzioni per "
+"cambiare la clip attualmente riprodotta."
+
 msgid "Switch to a clip (by index)."
 msgstr "Passa a una clip (per indice)."
 
@@ -14048,6 +18686,15 @@ msgstr ""
 "AudioStreamPlayer2D.get_stream_playback] o [method AudioStreamPlayer3D."
 "get_stream_playback]."
 
+msgid ""
+"Returns [code]true[/code] if the stream associated with the given integer ID "
+"is still playing. Check [method play_stream] for information on when this ID "
+"becomes invalid."
+msgstr ""
+"Restituisce [code]true[/code] se il flusso associato a l'ID intero fornito è "
+"ancora in riproduzione. Consulta [method play_stream] per informazioni su "
+"quando questo ID diventa non valido."
+
 msgid ""
 "Play an [AudioStream] at a given offset, volume, pitch scale, playback type, "
 "and bus. Playback starts immediately.\n"
@@ -14104,6 +18751,43 @@ msgstr ""
 msgid "A node for audio playback."
 msgstr "Un nodo per la riproduzione audio."
 
+msgid ""
+"The [AudioStreamPlayer] node plays an audio stream non-positionally. It is "
+"ideal for user interfaces, menus, or background music.\n"
+"To use this node, [member stream] needs to be set to a valid [AudioStream] "
+"resource. Playing more than one sound at the same time is also supported, see "
+"[member max_polyphony].\n"
+"If you need to play audio at a specific position, use [AudioStreamPlayer2D] "
+"or [AudioStreamPlayer3D] instead."
+msgstr ""
+"Il nodo [AudioStreamPlayer] riproduce un flusso audio in modo non "
+"posizionale. È ideale per le interfacce utente, menu o musica di sottofondo.\n"
+"Per utilizzare questo nodo, [member stream] deve essere impostato su una "
+"risorsa [AudioStream] valida. È supportata anche la riproduzione di più suoni "
+"alla volta, vedi [member max_polyphony].\n"
+"Se è necessario riprodurre l'audio in una posizione specifica, usa invece "
+"[AudioStreamPlayer2D] o [AudioStreamPlayer3D]."
+
+msgid ""
+"Returns the position in the [AudioStream] of the latest sound, in seconds. "
+"Returns [code]0.0[/code] if no sounds are playing.\n"
+"[b]Note:[/b] The position is not always accurate, as the [AudioServer] does "
+"not mix audio every processed frame. To get more accurate results, add "
+"[method AudioServer.get_time_since_last_mix] to the returned position.\n"
+"[b]Note:[/b] This method always returns [code]0.0[/code] if the [member "
+"stream] is an [AudioStreamInteractive], since it can have multiple clips "
+"playing at once."
+msgstr ""
+"Restituisce la posizione nell'[AudioStream] dell'ultimo suono, in secondi. "
+"Restituisce [code]0.0[/code] se non è riprodotto alcun suono.\n"
+"[b]Nota:[/b] La posizione non è sempre precisa, poiché [AudioServer] non mixa "
+"l'audio in ogni frame di processo. Per ottenere risultati più accurati, "
+"aggiungi [method AudioServer.get_time_since_last_mix] alla posizione "
+"restituita.\n"
+"[b]Nota:[/b] Questo metodo restituisce sempre [code]0.0[/code] se [member "
+"stream] è un [AudioStreamInteractive], poiché può avere più clip in "
+"riproduzione alla volta."
+
 msgid ""
 "Returns the latest [AudioStreamPlayback] of this node, usually the most "
 "recently created by [method play]. If no sounds are playing, this method "
@@ -14219,6 +18903,19 @@ msgstr ""
 "o si entra nell'albero, oppure quando questo nodo viene messo in pausa (vedi "
 "[member Node.process_mode])."
 
+msgid ""
+"Volume of sound, in decibels. This is an offset of the [member stream]'s "
+"volume.\n"
+"[b]Note:[/b] To convert between decibel and linear energy (like most volume "
+"sliders do), use [member volume_linear], or [method @GlobalScope."
+"db_to_linear] and [method @GlobalScope.linear_to_db]."
+msgstr ""
+"Volume del suono, in decibel. Questo è un offset del volume di [member "
+"stream].\n"
+"[b]Nota:[/b] Per convertire tra decibel ed energia lineare (come fanno la "
+"maggior parte dei cursori del volume), usa [member volume_linear], o [method "
+"@GlobalScope.db_to_linear] e [method @GlobalScope.linear_to_db]."
+
 msgid ""
 "Emitted when a sound finishes playing without interruptions. This signal is "
 "[i]not[/i] emitted when calling [method stop], or when exiting the tree while "
@@ -14380,6 +19077,9 @@ msgstr ""
 "Se [code]true[/code], la riproduzione è in pausa. È possibile riprenderla "
 "impostando [member stream_paused] su [code]false[/code]."
 
+msgid "Base volume before attenuation, in decibels."
+msgstr "Volume di base prima dell'attenuazione, in decibel."
+
 msgid "Emitted when the audio stops playing."
 msgstr "Emesso al termine della riproduzione dell'audio."
 
@@ -14768,6 +19468,17 @@ msgstr ""
 "Flusso che può essere dotato di flussi secondari, che verranno riprodotti in "
 "sintonia."
 
+msgid ""
+"This is a stream that can be fitted with sub-streams, which will be played in-"
+"sync. The streams begin at exactly the same time when play is pressed, and "
+"will end when the last of them ends. If one of the sub-streams loops, then "
+"playback will continue."
+msgstr ""
+"Questo è un flusso che può essere dotato di sotto-flussi, i quali saranno "
+"riprodotti in sincronia. I flussi cominciano esattamente allo stesso momento "
+"quando si preme play, e termineranno quando termina l'ultimo di essi. Se uno "
+"dei sotto-flussi va in ripetizione, la riproduzione continuerà."
+
 msgid "Get one of the synchronized streams, by index."
 msgstr "Ottiene uno dei flussi sincronizzati, per indice."
 
@@ -14806,9 +19517,38 @@ msgstr ""
 "generati dinamicamente. Vedi anche [AudioStreamGenerator] per la generazione "
 "di audio procedurale."
 
+msgid ""
+"Saves the AudioStreamWAV as a WAV file to [param path]. Samples with IMA "
+"ADPCM or Quite OK Audio formats can't be saved.\n"
+"[b]Note:[/b] A [code].wav[/code] extension is automatically appended to "
+"[param path] if it is missing."
+msgstr ""
+"Salva l'AudioStreamWAV come file WAV al percorso [param path]. I campioni con "
+"formati IMA ADPCM o Quite OK Audio non possono essere salvati.\n"
+"[b]Nota:[/b] Un'estensione [code].wav[/code] viene automaticamente aggiunta a "
+"[param path] se manca."
+
 msgid "Audio format. See [enum Format] constants for values."
 msgstr "Il formato audio. Vedi le costanti di [enum Format] per i valori."
 
+msgid ""
+"The loop start point (in number of samples, relative to the beginning of the "
+"stream)."
+msgstr ""
+"Il punto iniziale del loop (in numero di campioni, relativo all'inizio del "
+"flusso)."
+
+msgid ""
+"The loop end point (in number of samples, relative to the beginning of the "
+"stream)."
+msgstr ""
+"Il punto finale del loop (in numero di campioni, relativo all'inizio del "
+"flusso)."
+
+msgid "The loop mode. See [enum LoopMode] constants for values."
+msgstr ""
+"La modalità di ripetizione. Vedi le costanti di [enum LoopMode] per i valori."
+
 msgid ""
 "The sample rate for mixing this audio. Higher values require more storage "
 "space, but result in better quality.\n"
@@ -14841,6 +19581,22 @@ msgstr ""
 msgid "If [code]true[/code], audio is stereo."
 msgstr "Se [code]true[/code], l'audio è stereo."
 
+msgid "8-bit PCM audio codec."
+msgstr "Codec di audio PCM a 8 bit."
+
+msgid "16-bit PCM audio codec."
+msgstr "Codec di audio PCM a 16 bit."
+
+msgid "Audio is lossily compressed as IMA ADPCM."
+msgstr "L'audio è compresso con perdita di dati come IMA ADPCM."
+
+msgid ""
+"Audio is lossily compressed as [url=https://qoaformat.org/]Quite OK Audio[/"
+"url]."
+msgstr ""
+"L'audio è compresso con perdita di dati come ([url=https://qoaformat."
+"org/]Quite OK Audio[/url])."
+
 msgid "Audio does not loop."
 msgstr "L'audio non si ripete."
 
@@ -15004,6 +19760,21 @@ msgstr ""
 "Per consentire sia il clic sinistro che quello destro, usa "
 "[code]MOUSE_BUTTON_MASK_LEFT | MOUSE_BUTTON_MASK_RIGHT[/code]."
 
+msgid ""
+"If [code]true[/code], the button's state is pressed. Means the button is "
+"pressed down or toggled (if [member toggle_mode] is active). Only works if "
+"[member toggle_mode] is [code]true[/code].\n"
+"[b]Note:[/b] Changing the value of [member button_pressed] will result in "
+"[signal toggled] to be emitted. If you want to change the pressed state "
+"without emitting that signal, use [method set_pressed_no_signal]."
+msgstr ""
+"Se [code]true[/code], lo stato del pulsante è premuto. Significa che il "
+"pulsante è premuto o commutato (se [member toggle_mode] è attivo). Funziona "
+"solo se [member toggle_mode] è [code]true[/code].\n"
+"[b]Nota:[/b] Cambiando il valore di [member button_pressed] verrà emesso "
+"[signal toggled]. Se si desidera cambiare lo stato di pressione senza "
+"emettere quel segnale, usa [method set_pressed_no_signal]."
+
 msgid ""
 "If [code]true[/code], the button is in disabled state and can't be clicked or "
 "toggled."
@@ -15262,6 +20033,27 @@ msgstr ""
 "alfa di [member anisotropy_flowmap] se lì è definita una texture e la texture "
 "contiene un canale alfa."
 
+msgid ""
+"If [code]true[/code], anisotropy is enabled. Anisotropy changes the shape of "
+"the specular blob and aligns it to tangent space. This is useful for brushed "
+"aluminum and hair reflections.\n"
+"[b]Note:[/b] Mesh tangents are needed for anisotropy to work. If the mesh "
+"does not contain tangents, the anisotropy effect will appear broken.\n"
+"[b]Note:[/b] Material anisotropy should not to be confused with anisotropic "
+"texture filtering, which can be enabled by setting [member texture_filter] to "
+"[constant TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC]."
+msgstr ""
+"Se [code]true[/code], l'anisotropia è abilitata. L'anisotropia cambia la "
+"forma della massa speculare e la allinea allo spazio tangente. Questo è utile "
+"per i riflessi di alluminio lucidato e dei capelli.\n"
+"[b]Nota:[/b] Le tangenti delle mesh sono necessarie affinché l'anisotropia "
+"funzioni. Se la mesh non contiene tangenti, l'effetto anisotropico apparirà "
+"fratturato.\n"
+"[b]Nota:[/b] L'anisotropia del materiale non deve essere confusa con il "
+"filtro anisotropico delle texture, il quale può essere abilitato impostando "
+"[member texture_filter] su [constant "
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC]."
+
 msgid ""
 "Texture that offsets the tangent map for anisotropy calculations and "
 "optionally controls the anisotropy effect (if an alpha channel is present). "
@@ -15367,6 +20159,20 @@ msgstr ""
 "Altrimenti la scala si perderà durante il billboarding. Si applica solo "
 "quando [member billboard_mode] non è [constant BILLBOARD_DISABLED]."
 
+msgid ""
+"Controls how the object faces the camera. See [enum BillboardMode].\n"
+"[b]Note:[/b] Billboard mode is not suitable for VR because the left-right "
+"vector of the camera is not horizontal when the screen is attached to your "
+"head instead of on the table. See [url=https://github.com/godotengine/godot/"
+"issues/41567]GitHub issue #41567[/url] for details."
+msgstr ""
+"Controlla il modo in cui l'oggetto è rivolto verso la telecamera. Vedi [enum "
+"BillboardMode].\n"
+"[b]Nota:[/b] La modalità billboard non è adatta per il VR perché il vettore "
+"di sinistra-destra della telecamera non è orizzontale quando lo schermo è "
+"fissato alla testa anziché sul tavolo. Vedi [url=https://github.com/"
+"godotengine/godot/issues/41567]Problema su GitHub #41567[/url] per i dettagli."
+
 msgid ""
 "The material's blend mode.\n"
 "[b]Note:[/b] Values other than [code]Mix[/code] force the object into the "
@@ -15430,6 +20236,20 @@ msgstr ""
 "Determina quando avviene il rendering della profondità. Vedi [enum "
 "DepthDrawMode]. Vedi anche [member transparency]."
 
+msgid ""
+"Texture that specifies the color of the detail overlay. [member "
+"detail_albedo]'s alpha channel is used as a mask, even when the material is "
+"opaque. To use a dedicated texture as a mask, see [member detail_mask].\n"
+"[b]Note:[/b] [member detail_albedo] is [i]not[/i] modulated by [member "
+"albedo_color]."
+msgstr ""
+"Texture che specifica il colore della sovrapposizione del dettaglio. Il "
+"canale alfa di [member detail_albedo] è utilizzato come maschera, anche "
+"quando il materiale è opaco. Per utilizzare una texture dedicata come "
+"maschera, vedi [member detail_mask].\n"
+"[b]Nota:[/b] [member detail_albedo] [i]non[/i] è modulato da [member "
+"albedo_color]."
+
 msgid ""
 "Specifies how the [member detail_albedo] should blend with the current "
 "[code]ALBEDO[/code]. See [enum BlendMode] for options."
@@ -15437,6 +20257,18 @@ msgstr ""
 "Specifica come il [member detail_albedo] dovrebbe fondersi con l'attuale "
 "[code]ALBEDO[/code]. Vedi [enum BlendMode] per le opzioni."
 
+msgid ""
+"If [code]true[/code], enables the detail overlay. Detail is a second texture "
+"that gets mixed over the surface of the object based on [member detail_mask] "
+"and [member detail_albedo]'s alpha channel. This can be used to add variation "
+"to objects, or to blend between two different albedo/normal textures."
+msgstr ""
+"Se [code]true[/code], abilita la sovrapposizione del dettaglio. Il dettaglio "
+"è una seconda texture che viene mescolata sulla superficie dell'oggetto in "
+"base al canale alfa di [member detail_mask] e di [member detail_albedo]. Può "
+"essere utilizzato per aggiungere variazione agli oggetti o per fondere due "
+"diverse texture albedo o normali."
+
 msgid ""
 "Texture used to specify how the detail textures get blended with the base "
 "textures. [member detail_mask] can be used together with [member "
@@ -15446,6 +20278,27 @@ msgstr ""
 "con le texture di base. [member detail_mask] può essere utilizzato insieme al "
 "canale alfa di [member detail_albedo] (se presente)."
 
+msgid ""
+"Texture that specifies the per-pixel normal of the detail overlay. The "
+"[member detail_normal] texture only uses the red and green channels; the blue "
+"and alpha channels are ignored. The normal read from [member detail_normal] "
+"is oriented around the surface normal provided by the [Mesh].\n"
+"[b]Note:[/b] Godot expects the normal map to use X+, Y+, and Z+ coordinates. "
+"See [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates]this page[/url] for a "
+"comparison of normal map coordinates expected by popular engines."
+msgstr ""
+"Texture che specifica il normale per ogni pixel della sovrapposizione del "
+"dettaglio. La texture [member detail_normal] utilizza solo i canali rosso e "
+"verde; i canali blu e alfa sono ignorati. La lettura dei normali da [member "
+"detail_normal] è orientata attorno al normale della superficie fornita da "
+"[Mesh].\n"
+"[b]Nota:[/b] Godot prevede che la mappa normale utilizzi le coordinate X+, "
+"Y+, e Z+. Vedi [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates]questa pagina[/url] "
+"per un confronto delle coordinate della mappa normale previste dai motori più "
+"diffusi."
+
 msgid ""
 "Specifies whether to use [code]UV[/code] or [code]UV2[/code] for the detail "
 "layer. See [enum DetailUV] for options."
@@ -15564,6 +20417,29 @@ msgstr ""
 "Se [code]true[/code], l'oggetto è renderizzato con le stesse dimensioni a "
 "prescindere dalla distanza."
 
+msgid ""
+"If [code]true[/code], enables the vertex grow setting. This can be used to "
+"create mesh-based outlines using a second material pass and its [member "
+"cull_mode] set to [constant CULL_FRONT]. See also [member grow_amount].\n"
+"[b]Note:[/b] Vertex growth cannot create new vertices, which means that "
+"visible gaps may occur in sharp corners. This can be alleviated by designing "
+"the mesh to use smooth normals exclusively using [url=http://wiki.polycount."
+"com/wiki/Face_weighted_normals]face weighted normals[/url] in the 3D "
+"authoring software. In this case, grow will be able to join every outline "
+"together, just like in the original mesh."
+msgstr ""
+"Se [code]true[/code], abilita l'impostazione di crescita dei vertici. Questo "
+"può essere usato per creare contorni basati su mesh attraverso un secondo "
+"passaggio di materiale e il suo [member cull_mode] impostato su [constant "
+"CULL_FRONT]. Vedi anche [member grow_amount].\n"
+"[b]Nota:[/b] La crescita dei vertici non può creare nuovi vertici, il che "
+"significa che potrebbero verificarsi fratture visibili negli angoli acuti. "
+"Questo può essere alleviato progettando la mesh in modo che usi normali "
+"uniformi attraverso esclusivamente [url=https://wiki.polycount.com/wiki/"
+"Face_weighted_normals]face weighted normals[/url] nel software di "
+"modellazione 3D. In questo caso, la crescita sarà in grado di unire tutti i "
+"contorni insieme, proprio come nella mesh originale."
+
 msgid ""
 "Grows object vertices in the direction of their normals. Only effective if "
 "[member grow] is [code]true[/code]."
@@ -15996,6 +20872,18 @@ msgstr ""
 "nel canale rosso, la ruvidità nel blu e l'occlusione ambientale nel verde, "
 "potresti ridurre il numero di texture utilizzate."
 
+msgid ""
+"Sets whether the shading takes place, per-pixel, per-vertex or unshaded. Per-"
+"vertex lighting is faster, making it the best choice for mobile applications, "
+"however it looks considerably worse than per-pixel. Unshaded rendering is the "
+"fastest, but disables all interactions with lights."
+msgstr ""
+"Imposta se l'ombreggiatura avviene per pixel, per vertice o senza "
+"ombreggiatura. L'illuminazione per vertice è più veloce, rendendola la scelta "
+"migliore per le applicazioni sui dispositivi mobili, tuttavia ha un aspetto "
+"notevolmente peggiore di quella per pixel. Il rendering senza ombreggiatura è "
+"il più veloce, ma disabilita tutte le interazioni con le luci."
+
 msgid ""
 "If [code]true[/code], enables the \"shadow to opacity\" render mode where "
 "lighting modifies the alpha so shadowed areas are opaque and non-shadowed "
@@ -16305,6 +21193,9 @@ msgstr ""
 msgid "Texture specifying per-pixel detail color."
 msgstr "Texture che specifica il colore dei dettagli per pixel."
 
+msgid "Texture specifying per-pixel detail normal."
+msgstr "Texture che specifica le normali del dettaglio per ogni pixel."
+
 msgid "Texture holding ambient occlusion, roughness, and metallic."
 msgstr ""
 "Texture che contiene i valori dell'occlusione ambientale, la ruvidità, e il "
@@ -16468,6 +21359,13 @@ msgstr ""
 "L'oggetto sarà ombreggiato per pixel. Utile per effetti di ombreggiatura "
 "realistici."
 
+msgid ""
+"The object will be shaded per vertex. Useful when you want cheaper shaders "
+"and do not care about visual quality."
+msgstr ""
+"L'oggetto sarà ombreggiato per vertice. Utile quando si desiderano shader "
+"meno costosi e la qualità visiva non importa."
+
 msgid "Represents the size of the [enum ShadingMode] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum ShadingMode]."
 
@@ -16875,6 +21773,74 @@ msgstr ""
 msgid "A 3×3 matrix for representing 3D rotation and scale."
 msgstr "Una matrice 3×3 per rappresentare la rotazione e la scala 3D."
 
+msgid ""
+"The [Basis] built-in [Variant] type is a 3×3 [url=https://en.wikipedia.org/"
+"wiki/Matrix_(mathematics)]matrix[/url] used to represent 3D rotation, scale, "
+"and shear. It is frequently used within a [Transform3D].\n"
+"A [Basis] is composed by 3 axis vectors, each representing a column of the "
+"matrix: [member x], [member y], and [member z]. The length of each axis "
+"([method Vector3.length]) influences the basis's scale, while the direction "
+"of all axes influence the rotation. Usually, these axes are perpendicular to "
+"one another. However, when you rotate any axis individually, the basis "
+"becomes sheared. Applying a sheared basis to a 3D model will make the model "
+"appear distorted.\n"
+"A [Basis] is:\n"
+"- [b]Orthogonal[/b] if its axes are perpendicular to each other.\n"
+"- [b]Normalized[/b] if the length of every axis is [code]1.0[/code].\n"
+"- [b]Uniform[/b] if all axes share the same length (see [method get_scale]).\n"
+"- [b]Orthonormal[/b] if it is both orthogonal and normalized, which allows it "
+"to only represent rotations (see [method orthonormalized]).\n"
+"- [b]Conformal[/b] if it is both orthogonal and uniform, which ensures it is "
+"not distorted.\n"
+"For a general introduction, see the [url=$DOCS_URL/tutorials/math/"
+"matrices_and_transforms.html]Matrices and transforms[/url] tutorial.\n"
+"[b]Note:[/b] Godot uses a [url=https://en.wikipedia.org/wiki/Right-"
+"hand_rule]right-handed coordinate system[/url], which is a common standard. "
+"For directions, the convention for built-in types like [Camera3D] is for -Z "
+"to point forward (+X is right, +Y is up, and +Z is back). Other objects may "
+"use different direction conventions. For more information, see the "
+"[url=$DOCS_URL/tutorials/assets_pipeline/importing_3d_scenes/"
+"model_export_considerations.html#d-asset-direction-conventions]3D asset "
+"direction conventions[/url] tutorial.\n"
+"[b]Note:[/b] The basis matrices are exposed as [url=https://www.mindcontrol."
+"org/~hplus/graphics/matrix-layout.html]column-major[/url] order, which is the "
+"same as OpenGL. However, they are stored internally in row-major order, which "
+"is the same as DirectX."
+msgstr ""
+"Il tipo di [Variant] integrato [Basis] è una [url=https://it.wikipedia.org/"
+"wiki/Matrice]matrice[/url] 3×3 utilizzata per rappresentare rotazione, scala "
+"e taglio. Viene spesso utilizzato all'interno di un [Transform3D].\n"
+"Una base è composta da 3 vettori di assi, ciascuno dei quali rappresenta una "
+"colonna della matrice: [member x], [member y] e [member z]. La lunghezza di "
+"ciascun asse ([method Vector3.length]) influenza la scala della base, mentre "
+"la direzione di tutti gli assi influenza la rotazione. Di solito questi assi "
+"sono perpendicolari tra loro. Tuttavia, quando si ruota un asse "
+"individualmente, la base diventa inclinata. L'applicazione di una base "
+"inclinata a un modello 3D farà apparire il modello distorto.\n"
+"Una base è:\n"
+"- [b]Ortogonale[/b] se i suoi assi sono perpendicolari tra loro. \n"
+"- [b]Normalizzata[/b] se la lunghezza di ogni asse è [code]1.0[/code].\n"
+"- [b]Uniforme[/b] se tutti gli assi condividono la stessa lunghezza (vedi "
+"[method get_scale]).\n"
+"- [b]Ortonormale[/b] se è sia ortogonale che normalizzata, il che le consente "
+"di rappresentare solo rotazioni. (vedi [method orthonormalized]).\n"
+"- [b]Conforme[/b] se è sia ortogonale che uniforme, il che garantisce che non "
+"sia distorta.\n"
+"Per un'introduzione generale, consulta il tutorial [url=$DOCS_URL/tutorials/"
+"math/matrices_and_transforms.html]Matrici e trasformazioni[/url].\n"
+"[b]Nota:[/b] Godot utilizza un [url=https://it.wikipedia.org/wiki/"
+"Regola_della_mano_destra]sistema di coordinate destrorso[/url], che è uno "
+"standard comune. Per le direzioni, la convenzione per i tipi integrati come "
+"[Camera3D] prevede che -Z punti in avanti (+X è destra, +Y è su e +Z è "
+"indietro). Altri oggetti possono utilizzare convenzioni di direzione diverse. "
+"Per ulteriori informazioni, consulta il tutorial [url=$DOCS_URL/tutorials/"
+"assets_pipeline/importing_3d_scenes/model_export_considerations.html#d-asset-"
+"direction-conventions]Convenzioni sulla direzione delle risorse 3D[/url].\n"
+"[b]Nota:[/b] Le matrici di base sono esposte come ordine di [url=https://www."
+"mindcontrol.org/~hplus/graphics/matrix-layout.html]colonna prima[/url], che è "
+"lo stesso di OpenGL. Tuttavia, sono memorizzati internamente in ordine di "
+"riga prima, che è lo stesso di DirectX."
+
 msgid "Matrices and transforms"
 msgstr "Le matrici e le trasformazioni"
 
@@ -16887,6 +21853,15 @@ msgstr "Demo di trasformazione di matrice"
 msgid "2.5D Game Demo"
 msgstr "Demo di gioco 2.5D"
 
+msgid ""
+"Constructs a [Basis] identical to [constant IDENTITY].\n"
+"[b]Note:[/b] In C#, this constructs a [Basis] with all of its components set "
+"to [constant Vector3.ZERO]."
+msgstr ""
+"Costruisce una [Basis] identica a [constant IDENTITY].\n"
+"[b]Nota:[/b] In C#, costruisce una [Basis] con tutti i suoi componenti "
+"impostati su [constant Vector3.ZERO]."
+
 msgid "Constructs a [Basis] as a copy of the given [Basis]."
 msgstr "Costruisce un [Basis] come copia del [Basis] specificato."
 
@@ -16922,7 +21897,253 @@ msgid ""
 "matrix."
 msgstr ""
 "Costruisce un [Basis] da 3 vettori assi. Queste sono le colonne della matrice "
-"della base."
+"base."
+
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/Determinant]determinant[/url] "
+"of this basis's matrix. For advanced math, this number can be used to "
+"determine a few attributes:\n"
+"- If the determinant is exactly [code]0.0[/code], the basis is not invertible "
+"(see [method inverse]).\n"
+"- If the determinant is a negative number, the basis represents a negative "
+"scale.\n"
+"[b]Note:[/b] If the basis's scale is the same for every axis, its determinant "
+"is always that scale by the power of 2."
+msgstr ""
+"Restituisce il [url=https://it.wikipedia.org/wiki/"
+"Determinante_(algebra)]determinante[/url] della matrice di questa base. Per "
+"la matematica avanzata, questo numero può essere usato per determinare alcuni "
+"attributi:\n"
+"- Se il determinante è esattamente [code]0.0[/code], la base non è "
+"invertibile (vedi [method inverse]).\n"
+"- Se il determinante è un numero negativo, la base rappresenta una scala "
+"negativa.\n"
+"[b]Nota:[/b] Se la scala della base è la stessa per ogni asse, il suo "
+"determinante è sempre quella scala elevata alla potenza di 2."
+
+msgid ""
+"Constructs a new [Basis] that only represents rotation from the given "
+"[Vector3] of [url=https://en.wikipedia.org/wiki/Euler_angles]Euler angles[/"
+"url], in radians.\n"
+"- The [member Vector3.x] should contain the angle around the [member x] axis "
+"(pitch);\n"
+"- The [member Vector3.y] should contain the angle around the [member y] axis "
+"(yaw);\n"
+"- The [member Vector3.z] should contain the angle around the [member z] axis "
+"(roll).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Creates a Basis whose z axis points down.\n"
+"var my_basis = Basis.from_euler(Vector3(TAU / 4, 0, 0))\n"
+"\n"
+"print(my_basis.z) # Prints (0.0, -1.0, 0.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Creates a Basis whose z axis points down.\n"
+"var myBasis = Basis.FromEuler(new Vector3(Mathf.Tau / 4.0f, 0.0f, 0.0f));\n"
+"\n"
+"GD.Print(myBasis.Z); // Prints (0, -1, 0)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The order of each consecutive rotation can be changed with [param order] (see "
+"[enum EulerOrder] constants). By default, the YXZ convention is used "
+"([constant EULER_ORDER_YXZ]): the basis rotates first around the Y axis "
+"(yaw), then X (pitch), and lastly Z (roll). When using the opposite method "
+"[method get_euler], this order is reversed."
+msgstr ""
+"Costruisce una nuova [Basis] che rappresenta solo la rotazione dal [Vector3] "
+"fornito di [url=https://it.wikipedia.org/wiki/Angoli_di_Eulero]angoli di "
+"Eulero[/url], in radianti.\n"
+"- Il [member Vector3.x] dovrebbe contenere l'angolo attorno all'asse [member "
+"x] (beccheggio).\n"
+"- Il [member Vector3.y] dovrebbe contenere l'angolo attorno all'asse [member "
+"y] (imbardata).\n"
+"- Il [member Vector3.z] dovrebbe contenere l'angolo attorno all'asse [member "
+"z] (rollio).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Crea una base il cui asse z punta verso il basso.\n"
+"var my_basis = Basis.from_euler(Vector3(TAU / 4, 0, 0))\n"
+"\n"
+"print(my_basis.z) # Stampa (0.0, -1.0, 0.0).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Crea una base il cui asse z punta verso il basso.\n"
+"var myBasis = Basis.FromEuler(new Vector3(Mathf.Tau / 4.0f, 0.0f, 0.0f));\n"
+"\n"
+"GD.Print(myBasis.Z); // Stampa (0, -1, 0).\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"L'ordine di ogni rotazione consecutiva può essere modificato con [param "
+"order] (vedi le costanti di [enum EulerOrder]). Come predefinito, è usata la "
+"convenzione YXZ ([constant EULER_ORDER_YXZ]): la base ruota prima attorno "
+"all'asse Y (imbardata), poi X (beccheggio) e infine Z (rollio). Quando si "
+"utilizza il metodo opposto [method get_euler], questo ordine è invertito."
+
+msgid ""
+"Constructs a new [Basis] that only represents scale, with no rotation or "
+"shear, from the given [param scale] vector.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.from_scale(Vector3(2, 4, 8))\n"
+"\n"
+"print(my_basis.x) # Prints (2.0, 0.0, 0.0)\n"
+"print(my_basis.y) # Prints (0.0, 4.0, 0.0)\n"
+"print(my_basis.z) # Prints (0.0, 0.0, 8.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.FromScale(new Vector3(2.0f, 4.0f, 8.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (2, 0, 0)\n"
+"GD.Print(myBasis.Y); // Prints (0, 4, 0)\n"
+"GD.Print(myBasis.Z); // Prints (0, 0, 8)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] In linear algebra, the matrix of this basis is also known as a "
+"[url=https://en.wikipedia.org/wiki/Diagonal_matrix]diagonal matrix[/url]."
+msgstr ""
+"Costruisce una nuova [Basis] che rappresenta solo la scala, senza rotazione o "
+"inclinazione, dal vettore [param scale] specificato.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.from_scale(Vector3(2, 4, 8))\n"
+"\n"
+"print(my_basis.x) # Stampa (2.0, 0.0, 0.0).\n"
+"print(my_basis.y) # Stampa (0.0, 4.0, 0.0).\n"
+"print(my_basis.z) # Stampa (0.0, 0.0, 8.0).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.FromScale(new Vector3(2.0f, 4.0f, 8.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Stampa (2, 0, 0).\n"
+"GD.Print(myBasis.Y); // Stampa (0, 4, 0).\n"
+"GD.Print(myBasis.Z); // Stampa (0, 0, 8).\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Nell'algebra lineare, la matrice di questa base è anche "
+"conosciuta come [url=https://it.wikipedia.org/wiki/Matrice_diagonale]matrice "
+"diagonale[/url]."
+
+msgid ""
+"Returns this basis's rotation as a [Vector3] of [url=https://en.wikipedia.org/"
+"wiki/Euler_angles]Euler angles[/url], in radians. For the returned value:\n"
+"- The [member Vector3.x] contains the angle around the [member x] axis "
+"(pitch);\n"
+"- The [member Vector3.y] contains the angle around the [member y] axis "
+"(yaw);\n"
+"- The [member Vector3.z] contains the angle around the [member z] axis "
+"(roll).\n"
+"The order of each consecutive rotation can be changed with [param order] (see "
+"[enum EulerOrder] constants). By default, the YXZ convention is used "
+"([constant EULER_ORDER_YXZ]): Z (roll) is calculated first, then X (pitch), "
+"and lastly Y (yaw). When using the opposite method [method from_euler], this "
+"order is reversed.\n"
+"[b]Note:[/b] For this method to return correctly, the basis needs to be "
+"[i]orthonormal[/i] (see [method orthonormalized]).\n"
+"[b]Note:[/b] Euler angles are much more intuitive but are not suitable for 3D "
+"math. Because of this, consider using the [method get_rotation_quaternion] "
+"method instead, which returns a [Quaternion].\n"
+"[b]Note:[/b] In the Inspector dock, a basis's rotation is often displayed in "
+"Euler angles (in degrees), as is the case with the [member Node3D.rotation] "
+"property."
+msgstr ""
+"Restituisce la rotazione di questa base come un [Vector3] di [url=https://it."
+"wikipedia.org/wiki/Angoli_di_Eulero]angoli di Eulero[/url], in radianti. Per "
+"il valore restituito:\n"
+"- [member Vector3.x] contiene l'angolo attorno all'asse [member x] "
+"(beccheggio);\n"
+"- [member Vector3.y] contiene l'angolo attorno all'asse [member y] "
+"(imbardata);\n"
+"- [member Vector3.z] contiene l'angolo attorno all'asse [member z] (rollio).\n"
+"L'ordine di ogni rotazione consecutiva può essere modificato con [param "
+"order] (vedi le costanti di [enum EulerOrder]). Come predefinito, è usata la "
+"convenzione YXZ ([constant EULER_ORDER_YXZ]): viene calcolato prima Z "
+"(rollio), poi X (beccheggio) e infine Y (imbardata). Quando si utilizza il "
+"metodo opposto [method from_euler], questo ordine viene invertito.\n"
+"[b]Nota:[/b] Affinché questo metodo restituisca correttamente, la base deve "
+"essere [i]ortonormale[/i] (vedi [method orthonormalized]).\n"
+"[b]Nota:[/b] Gli angoli di Eulero sono molto più intuitivi ma non sono adatti "
+"per la matematica 3D. Per questo motivo, considera invece usare il metodo "
+"[method get_rotation_quaternion], che restituisce un [Quaternion].\n"
+"[b]Nota:[/b] Nel pannello dell'Ispettore, la rotazione di una base è spesso "
+"visualizzata in angoli di Eulero (in gradi), come nel caso della proprietà "
+"[member Node3D.rotation]."
+
+msgid ""
+"Returns this basis's rotation as a [Quaternion].\n"
+"[b]Note:[/b] Quaternions are much more suitable for 3D math but are less "
+"intuitive. For user interfaces, consider using the [method get_euler] method, "
+"which returns Euler angles."
+msgstr ""
+"Restituisce la rotazione di questa base come [Quaternion].\n"
+"[b]Nota:[/b] I quaternioni sono molto più adatti alla matematica 3D ma sono "
+"meno intuitivi. Per le interfacce utente, considera l'utilizzo del metodo "
+"[method get_euler], che restituisce angoli di Eulero."
+
+msgid ""
+"Returns the length of each axis of this basis, as a [Vector3]. If the basis "
+"is not sheared, this value is the scaling factor. It is not affected by "
+"rotation.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(2, 0, 0),\n"
+"    Vector3(0, 4, 0),\n"
+"    Vector3(0, 0, 8)\n"
+")\n"
+"# Rotating the Basis in any way preserves its scale.\n"
+"my_basis = my_basis.rotated(Vector3.UP, TAU / 2)\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, TAU / 4)\n"
+"\n"
+"print(my_basis.get_scale()) # Prints (2.0, 4.0, 8.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    Vector3(2.0f, 0.0f, 0.0f),\n"
+"    Vector3(0.0f, 4.0f, 0.0f),\n"
+"    Vector3(0.0f, 0.0f, 8.0f)\n"
+");\n"
+"// Rotating the Basis in any way preserves its scale.\n"
+"myBasis = myBasis.Rotated(Vector3.Up, Mathf.Tau / 2.0f);\n"
+"myBasis = myBasis.Rotated(Vector3.Right, Mathf.Tau / 4.0f);\n"
+"\n"
+"GD.Print(myBasis.Scale); // Prints (2, 4, 8)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If the value returned by [method determinant] is negative, the "
+"scale is also negative."
+msgstr ""
+"Restituisce la lunghezza di ogni asse di questa base, come [Vector3]. Se la "
+"base non è inclinata, questo è il fattore di scala. Non è influenzato dalla "
+"rotazione.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(2, 0, 0),\n"
+"    Vector3(0, 4, 0),\n"
+"    Vector3(0, 0, 8)\n"
+")\n"
+"# Ruotando la base in qualsiasi modo conserva la sua scala.\n"
+"my_basis = my_basis.rotated(Vector3.UP, TAU / 2)\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, TAU / 4)\n"
+"\n"
+"print(my_basis.get_scale()) # Prints (2.0, 4.0, 8.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    Vector3(2.0f, 0.0f, 0.0f),\n"
+"    Vector3(0.0f, 4.0f, 0.0f),\n"
+"    Vector3(0.0f, 0.0f, 8.0f)\n"
+");\n"
+"// Ruotando la base in qualsiasi modo conserva la sua scala.\n"
+"myBasis = myBasis.Rotated(Vector3.Up, Mathf.Tau / 2.0f);\n"
+"myBasis = myBasis.Rotated(Vector3.Right, Mathf.Tau / 4.0f);\n"
+"\n"
+"GD.Print(myBasis.Scale); // Prints (2, 4, 8)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Se il valore restituito da [method determinant] è negativo, "
+"anche la scala è negativa."
 
 msgid ""
 "Returns the [url=https://en.wikipedia.org/wiki/Invertible_matrix]inverse of "
@@ -16958,6 +22179,244 @@ msgstr ""
 "Restituisce [code]true[/code] se i valori di questa base sono finiti, "
 "chiamando [method Vector2.is_finite] su tutti i componenti vettoriali."
 
+msgid ""
+"Creates a new [Basis] with a rotation such that the forward axis (-Z) points "
+"towards the [param target] position.\n"
+"By default, the -Z axis (camera forward) is treated as forward (implies +X is "
+"right). If [param use_model_front] is [code]true[/code], the +Z axis (asset "
+"front) is treated as forward (implies +X is left) and points toward the "
+"[param target] position.\n"
+"The up axis (+Y) points as close to the [param up] vector as possible while "
+"staying perpendicular to the forward axis. The returned basis is "
+"orthonormalized (see [method orthonormalized]).\n"
+"The [param target] and the [param up] cannot be [constant Vector3.ZERO], and "
+"shouldn't be colinear to avoid unintended rotation around local Z axis."
+msgstr ""
+"Crea una nuova [Basis] con una rotazione tale che l'asse in avanti (-Z) punti "
+"verso la posizione [param target].\n"
+"Come predefinito, l'asse -Z (avanti per la telecamera) viene trattato come "
+"\"in avanti\" (implica che +X sia a destra). Se [param use_model_front] è "
+"[code]true[/code], l'asse +Z (avanti per gli asset) viene trattato come \"in "
+"avanti\" (implica che +X sia a sinistra) e punta verso la posizione [param "
+"target].\n"
+"L'asse in alto (+Y) punta il più vicino possibile al vettore [param up] pur "
+"rimanendo perpendicolare all'asse in avanti. La base restituita è "
+"ortonormalizzata (vedi [method orthonormalized]).\n"
+"I vettori [param target] e [param up] non possono essere [constant Vector3."
+"ZERO] e non dovrebbero essere collineari per evitare una rotazione "
+"involontaria attorno all'asse Z locale."
+
+msgid ""
+"Returns the orthonormalized version of this basis. An orthonormal basis is "
+"both [i]orthogonal[/i] (the axes are perpendicular to each other) and "
+"[i]normalized[/i] (the axes have a length of [code]1.0[/code]), which also "
+"means it can only represent a rotation.\n"
+"It is often useful to call this method to avoid rounding errors on a rotating "
+"basis:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Rotate this Node3D every frame.\n"
+"func _process(delta):\n"
+"    basis = basis.rotated(Vector3.UP, TAU * delta)\n"
+"    basis = basis.rotated(Vector3.RIGHT, TAU * delta)\n"
+"\n"
+"    basis = basis.orthonormalized()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Rotate this Node3D every frame.\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    Basis = Basis.Rotated(Vector3.Up, Mathf.Tau * (float)delta)\n"
+"                 .Rotated(Vector3.Right, Mathf.Tau * (float)delta)\n"
+"                 .Orthonormalized();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce la versione ortonormalizzata di questa base. Una base ortonormale "
+"è sia [i]ortogonale[/i] (gli assi sono perpendicolari tra loro) sia "
+"[i]normalizzata[/i] (gli assi hanno una lunghezza di [code]1.0[/code]), il "
+"che significa inoltre che può rappresentare solo la rotazione.\n"
+"Spesso è utile chiamare questo metodo per evitare errori di arrotondamento su "
+"una base in rotazione:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Ruota questo Node3D ogni frame.\n"
+"func _process(delta):\n"
+"    basis = basis.rotated(Vector3.UP, TAU * delta)\n"
+"    basis = basis.rotated(Vector3.RIGHT, TAU * delta)\n"
+"\n"
+"    basis = basis.orthonormalized()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Ruota questo Node3D ogni frame.\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    Basis = Basis.Rotated(Vector3.Up, Mathf.Tau * (float)delta)\n"
+"                 .Rotated(Vector3.Right, Mathf.Tau * (float)delta)\n"
+"                 .Orthonormalized();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns a copy of this basis rotated around the given [param axis] by the "
+"given [param angle] (in radians).\n"
+"The [param axis] must be a normalized vector (see [method Vector3."
+"normalized]). If [param angle] is positive, the basis is rotated counter-"
+"clockwise around the axis.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.IDENTITY\n"
+"var angle = TAU / 2\n"
+"\n"
+"my_basis = my_basis.rotated(Vector3.UP, angle)    # Rotate around the up axis "
+"(yaw).\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, angle) # Rotate around the right "
+"axis (pitch).\n"
+"my_basis = my_basis.rotated(Vector3.BACK, angle)  # Rotate around the back "
+"axis (roll).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.Identity;\n"
+"var angle = Mathf.Tau / 2.0f;\n"
+"\n"
+"myBasis = myBasis.Rotated(Vector3.Up, angle);    // Rotate around the up axis "
+"(yaw).\n"
+"myBasis = myBasis.Rotated(Vector3.Right, angle); // Rotate around the right "
+"axis (pitch).\n"
+"myBasis = myBasis.Rotated(Vector3.Back, angle);  // Rotate around the back "
+"axis (roll).\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce questa base ruotata attorno all'asse [para axis] di [param angle] "
+"(in radianti).\n"
+"[param axis] deve essere un vettore normalizzato (vedi [method Vector3."
+"normalized]). Se [param angle] è positivo, la base viene ruotata in senso "
+"antiorario attorno all'asse.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.IDENTITY\n"
+"var angle = TAU / 2\n"
+"\n"
+"my_basis = my_basis.rotated(Vector3.UP, angle)    # Ruota intorno all'asse "
+"superiore (imbardata).\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, angle) # Ruota intorno all'asse "
+"destro (beccheggio).\n"
+"my_basis = my_basis.rotated(Vector3.BACK, angle)  # Ruota intorno all'asse "
+"posteriore (rollio).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.Identity;\n"
+"var angle = Mathf.Tau / 2.0f;\n"
+"\n"
+"myBasis = myBasis.Rotated(Vector3.Up, angle);    // Ruota intorno all'asse "
+"superiore (imbardata).\n"
+"myBasis = myBasis.Rotated(Vector3.Right, angle); // Ruota intorno all'asse "
+"destro (beccheggio).\n"
+"myBasis = myBasis.Rotated(Vector3.Back, angle);  // Ruota intorno all'asse "
+"posteriore (rollio).\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns this basis with each axis's components scaled by the given [param "
+"scale]'s components.\n"
+"The basis matrix's rows are multiplied by [param scale]'s components. This "
+"operation is a global scale (relative to the parent).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 1, 1),\n"
+"    Vector3(2, 2, 2),\n"
+"    Vector3(3, 3, 3)\n"
+")\n"
+"my_basis = my_basis.scaled(Vector3(0, 2, -2))\n"
+"\n"
+"print(my_basis.x) # Prints (0.0, 2.0, -2.0)\n"
+"print(my_basis.y) # Prints (0.0, 4.0, -4.0)\n"
+"print(my_basis.z) # Prints (0.0, 6.0, -6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 1.0f, 1.0f),\n"
+"    new Vector3(2.0f, 2.0f, 2.0f),\n"
+"    new Vector3(3.0f, 3.0f, 3.0f)\n"
+");\n"
+"myBasis = myBasis.Scaled(new Vector3(0.0f, 2.0f, -2.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (0, 2, -2)\n"
+"GD.Print(myBasis.Y); // Prints (0, 4, -4)\n"
+"GD.Print(myBasis.Z); // Prints (0, 6, -6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce questa base con i componenti di ciascun asse ridimensionati in "
+"base ai componenti di [param scale].\n"
+"Le righe della matrice base sono moltiplicate per i componenti di [param "
+"scale]. Questa operazione è una scala globale (relativa al genitore).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 1, 1),\n"
+"    Vector3(2, 2, 2),\n"
+"    Vector3(3, 3, 3)\n"
+")\n"
+"my_basis = my_basis.scaled(Vector3(0, 2, -2))\n"
+"\n"
+"print(my_basis.x) # Stampa (0.0, 2.0, -2.0)\n"
+"print(my_basis.y) # Stampa (0.0, 4.0, -4.0)\n"
+"print(my_basis.z) # Stampa (0.0, 6.0, -6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 1.0f, 1.0f),\n"
+"    new Vector3(2.0f, 2.0f, 2.0f),\n"
+"    new Vector3(3.0f, 3.0f, 3.0f)\n"
+");\n"
+"myBasis = myBasis.Scaled(new Vector3(0.0f, 2.0f, -2.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Stampa (0, 2, -2)\n"
+"GD.Print(myBasis.Y); // Stampa (0, 4, -4)\n"
+"GD.Print(myBasis.Z); // Stampa (0, 6, -6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Performs a spherical-linear interpolation with the [param to] basis, given a "
+"[param weight]. Both this basis and [param to] should represent a rotation.\n"
+"[b]Example:[/b] Smoothly rotate a [Node3D] to the target basis over time, "
+"with a [Tween]:\n"
+"[codeblock]\n"
+"var start_basis = Basis.IDENTITY\n"
+"var target_basis = Basis.IDENTITY.rotated(Vector3.UP, TAU / 2)\n"
+"\n"
+"func _ready():\n"
+"    create_tween().tween_method(interpolate, 0.0, 1.0, 5.0).set_trans(Tween."
+"TRANS_EXPO)\n"
+"\n"
+"func interpolate(weight):\n"
+"    basis = start_basis.slerp(target_basis, weight)\n"
+"[/codeblock]"
+msgstr ""
+"Esegue un'interpolazione sferico-lineare con la base [param to], dato un peso "
+"[param weight]. Sia questa base che [param to] dovrebbero rappresentare una "
+"rotazione.\n"
+"[b]Esempio:[/b] Ruota gradualmente un [Node3D] sulla base di destinazione nel "
+"corso del tempo, con un [Tween].\n"
+"[codeblock]\n"
+"var start_basis = Basis.IDENTITY\n"
+"var target_basis = Basis.IDENTITY.rotated(Vector3.UP, TAU / 2)\n"
+"\n"
+"func _ready():\n"
+"    create_tween().tween_method(interpolate, 0.0, 1.0, 5.0).set_trans(Tween."
+"TRANS_EXPO)\n"
+"\n"
+"func interpolate(weight):\n"
+"    basis = start_basis.slerp(target_basis, weight)\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the transposed dot product between [param with] and the [member x] "
 "axis (see [method transposed]).\n"
@@ -16985,6 +22444,65 @@ msgstr ""
 "z] (vedi [method transposed]).\n"
 "Questo è equivalente a [code]basis.z.dot(vector)[/code]."
 
+msgid ""
+"Returns the transposed version of this basis. This turns the basis matrix's "
+"columns into rows, and its rows into columns.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 2, 3),\n"
+"    Vector3(4, 5, 6),\n"
+"    Vector3(7, 8, 9)\n"
+")\n"
+"my_basis = my_basis.transposed()\n"
+"\n"
+"print(my_basis.x) # Prints (1.0, 4.0, 7.0)\n"
+"print(my_basis.y) # Prints (2.0, 5.0, 8.0)\n"
+"print(my_basis.z) # Prints (3.0, 6.0, 9.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 2.0f, 3.0f),\n"
+"    new Vector3(4.0f, 5.0f, 6.0f),\n"
+"    new Vector3(7.0f, 8.0f, 9.0f)\n"
+");\n"
+"myBasis = myBasis.Transposed();\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (1, 4, 7)\n"
+"GD.Print(myBasis.Y); // Prints (2, 5, 8)\n"
+"GD.Print(myBasis.Z); // Prints (3, 6, 9)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce la versione trasposta di questa base. Ciò trasforma le colonne "
+"della matrice base in righe e le sue righe in colonne.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 2, 3),\n"
+"    Vector3(4, 5, 6),\n"
+"    Vector3(7, 8, 9)\n"
+")\n"
+"my_basis = my_basis.transposed()\n"
+"\n"
+"print(my_basis.x) # Stampa (1.0, 4.0, 7.0).\n"
+"print(my_basis.y) # Stampa (2.0, 5.0, 8.0).\n"
+"print(my_basis.z) # Stampa (3.0, 6.0, 9.0).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 2.0f, 3.0f),\n"
+"    new Vector3(4.0f, 5.0f, 6.0f),\n"
+"    new Vector3(7.0f, 8.0f, 9.0f)\n"
+");\n"
+"myBasis = myBasis.Transposed();\n"
+"\n"
+"GD.Print(myBasis.X); // Stampa (1, 4, 7).\n"
+"GD.Print(myBasis.Y); // Stampa (2, 5, 8).\n"
+"GD.Print(myBasis.Z); // Stampa (3, 6, 9).\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "The basis's X axis, and the column [code]0[/code] of the matrix.\n"
 "On the identity basis, this vector points right ([constant Vector3.RIGHT])."
@@ -17006,6 +22524,53 @@ msgstr ""
 "L'asse Z della base e la colonna [code]2[/code] della matrice.\n"
 "Sulla base identità, questo vettore punta indietro ([costant Vector3.BACK])."
 
+msgid ""
+"The identity [Basis]. This is an orthonormal basis with no rotation, no "
+"shear, and a scale of [constant Vector3.ONE]. This also means that:\n"
+"- The [member x] points right ([constant Vector3.RIGHT]);\n"
+"- The [member y] points up ([constant Vector3.UP]);\n"
+"- The [member z] points back ([constant Vector3.BACK]).\n"
+"[codeblock]\n"
+"var basis = Basis.IDENTITY\n"
+"print(\"| X | Y | Z\")\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.x, basis.y.x, basis.z.x])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.y, basis.y.y, basis.z.y])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.z, basis.y.z, basis.z.z])\n"
+"# Prints:\n"
+"# | X | Y | Z\n"
+"# | 1 | 0 | 0\n"
+"# | 0 | 1 | 0\n"
+"# | 0 | 0 | 1\n"
+"[/codeblock]\n"
+"If a [Vector3] or another [Basis] is transformed (multiplied) by this "
+"constant, no transformation occurs.\n"
+"[b]Note:[/b] In GDScript, this constant is equivalent to creating a "
+"[constructor Basis] without any arguments. It can be used to make your code "
+"clearer, and for consistency with C#."
+msgstr ""
+"La [Basis] di identità. Questa è una base senza rotazione, senza inclinazione "
+"e con una scala pari a [constant Vector3.ONE]. Ciò significa anche che:\n"
+"- La [member x] punta a destra ([constant Vector3.RIGHT]);\n"
+"- La [member y] punta in alto ([constant Vector3.UP]);\n"
+"- La [member z] punta indietro ([constant Vector3.BACK]).\n"
+"[codeblock]\n"
+"var basis = Basis.IDENTITY\n"
+"print(\"| X | Y | Z\")\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.x, basis.y.x, basis.z.x])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.y, basis.y.y, basis.z.y])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.z, basis.y.z, basis.z.z])\n"
+"# Stampa:\n"
+"# | X | Y | Z\n"
+"# | 1 | 0 | 0\n"
+"# | 0 | 1 | 0\n"
+"# | 0 | 0 | 1\n"
+"[/codeblock]\n"
+"Se un [Vector3] o un altra [Basis] viene trasformata (moltiplicata) per "
+"questa costante, non si verifica alcuna trasformazione.\n"
+"[b]Nota:[/b] In GDScript, questa costante è identica alla creazione di una "
+"[constructor Basis] senza parametri. Questa costante può essere usata per "
+"rendere il codice più chiaro e per coerenza con C#."
+
 msgid ""
 "When any basis is multiplied by [constant FLIP_X], it negates all components "
 "of the [member x] axis (the X column).\n"
@@ -17057,6 +22622,39 @@ msgstr ""
 "Trasforma (moltiplica) la base [param right] per questa base.\n"
 "Questa è l'operazione eseguita tra genitore e figlio [Node3D]."
 
+msgid ""
+"Transforms (multiplies) the [param right] vector by this basis, returning a "
+"[Vector3].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Basis that swaps the X/Z axes and doubles the scale.\n"
+"var my_basis = Basis(Vector3(0, 2, 0), Vector3(2, 0, 0), Vector3(0, 0, 2))\n"
+"print(my_basis * Vector3(1, 2, 3)) # Prints (4.0, 2.0, 6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Basis that swaps the X/Z axes and doubles the scale.\n"
+"var myBasis = new Basis(new Vector3(0, 2, 0), new Vector3(2, 0, 0), new "
+"Vector3(0, 0, 2));\n"
+"GD.Print(myBasis * new Vector3(1, 2, 3)); // Prints (4, 2, 6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Trasforma (moltiplica) il vettore [param right] per questa base, restituendo "
+"un [Vector3].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Base che scambia gli assi X/Z e raddoppia la scala.\n"
+"var my_basis = Basis(Vector3(0, 2, 0), Vector3(2, 0, 0), Vector3(0, 0, 2))\n"
+"print(my_basis * Vector3(1, 2, 3)) # Stampa (4.0, 2.0, 6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Base che scambia gli assi X/Z e raddoppia la scala.\n"
+"var myBasis = new Basis(new Vector3(0, 2, 0), new Vector3(2, 0, 0), new "
+"Vector3(0, 0, 2));\n"
+"GD.Print(myBasis * new Vector3(1, 2, 3)); // Prints (4, 2, 6)\n"
+"[/csharp]\n"
+"[codeblocks]"
+
 msgid ""
 "Multiplies all components of the [Basis] by the given [float]. This affects "
 "the basis's scale uniformly, resizing all 3 axes by the [param right] value."
@@ -17182,6 +22780,31 @@ msgstr ""
 "situati all'esterno di [param rect] non sono influenzati da [method "
 "grow_mask]."
 
+msgid ""
+"Creates an [Array] of polygons covering a rectangular portion of the bitmap. "
+"It uses a marching squares algorithm, followed by Ramer-Douglas-Peucker (RDP) "
+"reduction of the number of vertices. Each polygon is described as a "
+"[PackedVector2Array] of its vertices.\n"
+"To get polygons covering the whole bitmap, pass:\n"
+"[codeblock]\n"
+"Rect2(Vector2(), get_size())\n"
+"[/codeblock]\n"
+"[param epsilon] is passed to RDP to control how accurately the polygons cover "
+"the bitmap: a lower [param epsilon] corresponds to more points in the "
+"polygons."
+msgstr ""
+"Crea un [Array] di poligoni che coprono una porzione rettangolare della "
+"bitmap. Utilizza un algoritmo \"marching squares\", seguito dalla riduzione "
+"di Ramer-Douglas-Peucker (RDP) del numero di vertici. Ogni poligono è "
+"descritto come un [PackedVector2Array] dei suoi vertici.\n"
+"Per ottenere poligoni che coprono l'intera bitmap, passa:\n"
+"[codeblock]\n"
+"Rect2(Vector2(), get_size())\n"
+"[/codeblock]\n"
+"[param epsilon] viene passato a RDP per controllare la precisione con cui i "
+"poligoni coprono la bitmap: un [param epsilon] inferiore corrisponde a più "
+"punti nei poligoni."
+
 msgid "Resizes the image to [param new_size]."
 msgstr "Ridimensiona l'immagine a [param new_size]."
 
@@ -17276,6 +22899,9 @@ msgstr ""
 "Restituisce il percorso ([NodePath]) al nodo [Skeleton3D] esterno, se ne è "
 "stato impostato uno."
 
+msgid "Get parent or external [Skeleton3D] node if found."
+msgstr "Ottiene il nodo [Skeleton3D] genitore o esterno se trovato."
+
 msgid "The index of the attached bone."
 msgstr "L'indice dell'osso attaccato."
 
@@ -17532,6 +23158,15 @@ msgstr ""
 msgid "The child controls will be centered in the container."
 msgstr "I controlli figli saranno centrati nel contenitore."
 
+msgid ""
+"The child controls will be arranged at the end of the container, i.e. bottom "
+"if orientation is vertical, right if orientation is horizontal (left for RTL "
+"layout)."
+msgstr ""
+"I controlli figlio saranno disposti alla fine del contenitore, ovvero in "
+"basso se l'orientamento è verticale, a destra se l'orientamento è orizzontale "
+"(a sinistra per il layout RTL)."
+
 msgid "The space between the [BoxContainer]'s elements, in pixels."
 msgstr "Lo spazio tra gli elementi del[BoxContainer], in pixel."
 
@@ -17583,6 +23218,80 @@ msgstr ""
 msgid "A themed button that can contain text and an icon."
 msgstr "Un pulsante con tema che può contenere testo e un'icona."
 
+msgid ""
+"[Button] is the standard themed button. It can contain text and an icon, and "
+"it will display them according to the current [Theme].\n"
+"[b]Example:[/b] Create a button and connect a method that will be called when "
+"the button is pressed:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    var button = Button.new()\n"
+"    button.text = \"Click me\"\n"
+"    button.pressed.connect(_button_pressed)\n"
+"    add_child(button)\n"
+"\n"
+"func _button_pressed():\n"
+"    print(\"Hello world!\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    var button = new Button();\n"
+"    button.Text = \"Click me\";\n"
+"    button.Pressed += ButtonPressed;\n"
+"    AddChild(button);\n"
+"}\n"
+"\n"
+"private void ButtonPressed()\n"
+"{\n"
+"    GD.Print(\"Hello world!\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [BaseButton] which contains common properties and methods associated "
+"with this node.\n"
+"[b]Note:[/b] Buttons do not detect touch input and therefore don't support "
+"multitouch, since mouse emulation can only press one button at a given time. "
+"Use [TouchScreenButton] for buttons that trigger gameplay movement or actions."
+msgstr ""
+"[Button] è il pulsante standard con tema. Può contenere testo e un'icona e li "
+"visualizzerà in base al [Theme] attuale.\n"
+"[b]Esempio[/b]: Crea di un pulsante e connetti un metodo che verrà chiamato "
+"quando il pulsante viene premuto:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    var button = Button.new()\n"
+"    button.text = \"Cliccami\"\n"
+"    button.pressed.connect(self._button_pressed)\n"
+"    add_child(button)\n"
+"\n"
+"func _button_pressed():\n"
+"    print(\"Ciao mondo!\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    var button = new Button();\n"
+"    button.Text = \"Cliccami\";\n"
+"    button.Pressed += ButtonPressed;\n"
+"    AddChild(button);\n"
+"}\n"
+"\n"
+"private void ButtonPressed()\n"
+"{\n"
+"    GD.Print(\"Ciao mondo!\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Vedi anche [BaseButton] che contiene proprietà e metodi comuni associati a "
+"questo nodo.\n"
+"[b]Nota:[/b] I pulsanti non interpretano gli input di tocco e quindi non "
+"supportano il multitouch, poiché l'emulazione del mouse può premere solo un "
+"pulsante alla volta. Utilizza [TouchScreenButton] per i pulsanti che attivano "
+"movimenti o azioni di gioco."
+
 msgid "Operating System Testing Demo"
 msgstr "Demo di test di sistema operativo"
 
@@ -17905,6 +23614,152 @@ msgstr "Emesso quando viene premuto uno dei pulsanti del gruppo."
 msgid "A built-in type representing a method or a standalone function."
 msgstr "Un tipo integrato che rappresenta un metodo o una funzione autonoma."
 
+msgid ""
+"[Callable] is a built-in [Variant] type that represents a function. It can "
+"either be a method within an [Object] instance, or a custom callable used for "
+"different purposes (see [method is_custom]). Like all [Variant] types, it can "
+"be stored in variables and passed to other functions. It is most commonly "
+"used for signal callbacks.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func print_args(arg1, arg2, arg3 = \"\"):\n"
+"    prints(arg1, arg2, arg3)\n"
+"\n"
+"func test():\n"
+"    var callable = Callable(self, \"print_args\")\n"
+"    callable.call(\"hello\", \"world\")  # Prints \"hello world \".\n"
+"    callable.call(Vector2.UP, 42, callable)  # Prints \"(0.0, -1.0) 42 "
+"Node(node.gd)::print_args\"\n"
+"    callable.call(\"invalid\")  # Invalid call, should have at least 2 "
+"arguments.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Default parameter values are not supported.\n"
+"public void PrintArgs(Variant arg1, Variant arg2, Variant arg3 = default)\n"
+"{\n"
+"    GD.PrintS(arg1, arg2, arg3);\n"
+"}\n"
+"\n"
+"public void Test()\n"
+"{\n"
+"    // Invalid calls fail silently.\n"
+"    Callable callable = new Callable(this, MethodName.PrintArgs);\n"
+"    callable.Call(\"hello\", \"world\"); // Default parameter values are not "
+"supported, should have 3 arguments.\n"
+"    callable.Call(Vector2.Up, 42, callable); // Prints \"(0, -1) 42 Node(Node."
+"cs)::PrintArgs\"\n"
+"    callable.Call(\"invalid\"); // Invalid call, should have 3 arguments.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, it's possible to create lambda functions within a method. Lambda "
+"functions are custom callables that are not associated with an [Object] "
+"instance. Optionally, lambda functions can also be named. The name will be "
+"displayed in the debugger, or when calling [method get_method].\n"
+"[codeblock]\n"
+"func _init():\n"
+"    var my_lambda = func (message):\n"
+"        print(message)\n"
+"\n"
+"    # Prints \"Hello everyone!\"\n"
+"    my_lambda.call(\"Hello everyone!\")\n"
+"\n"
+"    # Prints \"Attack!\", when the button_pressed signal is emitted.\n"
+"    button_pressed.connect(func(): print(\"Attack!\"))\n"
+"[/codeblock]\n"
+"In GDScript, you can access methods and global functions as [Callable]s:\n"
+"[codeblock]\n"
+"tween.tween_callback(node.queue_free)  # Object methods.\n"
+"tween.tween_callback(array.clear)  # Methods of built-in types.\n"
+"tween.tween_callback(print.bind(\"Test\"))  # Global functions.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] [Dictionary] does not support the above due to ambiguity with "
+"keys.\n"
+"[codeblock]\n"
+"var dictionary = {\"hello\": \"world\"}\n"
+"\n"
+"# This will not work, `clear` is treated as a key.\n"
+"tween.tween_callback(dictionary.clear)\n"
+"\n"
+"# This will work.\n"
+"tween.tween_callback(Callable.create(dictionary, \"clear\"))\n"
+"[/codeblock]"
+msgstr ""
+"Il [Callable] (chiamabile) è un tipo di [Variant] incorporato che rappresenta "
+"una funzione. Può essere un metodo all'interno di un'istanza di [Object] o un "
+"chiamabile personalizzato utilizzato per diversi scopi (vedi [method "
+"is_custom]). Come tutti i tipi di [Variant], può essere memorizzato in "
+"variabili e passato ad altre funzioni. È più comunemente usato per le "
+"richiamate di segnale.\n"
+"[b]Esempio:[/b]\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func print_args(arg1, arg2, arg3 = \"\"):\n"
+"    prints(arg1, arg2, arg3)\n"
+"\n"
+"func test():\n"
+"    var callable = Callable(self, \"print_args\")\n"
+"    callable.call(\"ciao\", \"mondo\")  # Stampa \"ciao modo\".\n"
+"    callable.call(Vector2.UP, 42, callable)  # Stampa \"(0.0, -1.0) 42 "
+"Node(node.gd)::print_args\"\n"
+"    callable.call(\"invalid\")  # Chiamata non valida, deve avere almeno 2 "
+"argomenti.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// I valori predefiniti dei parametri non sono supportati\n"
+"public void PrintArgs(Variant arg1, Variant arg2, Variant arg3 = default)\n"
+"{\n"
+"    GD.PrintS(arg1, arg2, arg3);\n"
+"}\n"
+"\n"
+"public void Test()\n"
+"{\n"
+"    // Le chiamate non valide falliscono silenziosamente.\n"
+"    Callable callable = new Callable(this, MethodName.PrintArgs);\n"
+"    callable.Call(\"ciao\", \"mondo\"); // I valori predefiniti dei parametri "
+"non sono supportati, deve avere 3 argomenti.\n"
+"    callable.Call(Vector2.Up, 42, callable); // Stampa \"(0, -1) 42 Node(Node."
+"cs)::PrintArgs\"\n"
+"    callable.Call(\"invalid\"); // Chiamata non valida, deve avere 3 "
+"argomenti.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript è possibile creare funzioni lambda all'interno di un metodo. Le "
+"funzioni lambda sono chiamabili personalizzati che non sono associati a "
+"un'istanza di [Object]. Facoltativamente, è possibile nominare anche le "
+"funzioni lambda. Il nome sarà visualizzato nel debugger o quando si chiama "
+"[method get_method].\n"
+"[codeblock]\n"
+"func _init():\n"
+"    var my_lambda = func (message):\n"
+"        print(message)\n"
+"\n"
+"    # Stampa \"Ciao a tutti!\"\n"
+"    my_lambda.call(\"Ciao a tutti!\")\n"
+"\n"
+"    # Stampa \"Attacca!\", quando il segnale button_pressed viene emesso.\n"
+"    button_pressed.connect(func(): print(\"Attacca!\"))\n"
+"[/codeblock]\n"
+"In GDScript, è possibile accedere a metodi e funzioni globali come "
+"[Callable]:\n"
+"[codeblock]\n"
+"tween.tween_callback(node.queue_free)  # Metodi di Object.\n"
+"tween.tween_callback(array.clear)  # Metodi di tipi integrati.\n"
+"tween.tween_callback(print.bind(\"Test\"))  # Funzioni globali.\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] [Dictionary] non supporta quanto descritto sopra a causa "
+"dell'ambiguità con le chiavi.\n"
+"[codeblock]\n"
+"var dictionary = {\"hello\": \"world\"}\n"
+"\n"
+"# Questo non funzionerà, `clear` è trattato come chiave.\n"
+"tween.tween_callback(dictionary.clear)\n"
+"\n"
+"# Questo funzionerà.\n"
+"tween.tween_callback(Callable.create(dictionary, \"clear\"))\n"
+"[/codeblock]"
+
 msgid "Constructs an empty [Callable], with no object nor method bound."
 msgstr "Costruisce un [Callable] vuoto, senza oggetto né metodo associato."
 
@@ -18067,6 +23922,18 @@ msgstr ""
 "Restituisce l'ID dell'oggetto di questo [Callable] (vedi [method Object."
 "get_instance_id])."
 
+msgid ""
+"Returns the total amount of arguments unbound via successive [method bind] or "
+"[method unbind] calls. See [method get_bound_arguments] for details.\n"
+"[b]Note:[/b] The [method get_bound_arguments_count] and [method "
+"get_unbound_arguments_count] methods can both return positive values."
+msgstr ""
+"Restituisce la quantità totale di argomenti disassociati tramite chiamate "
+"successive a [method bind] o [method unbind]. Vedi [method "
+"get_bound_arguments] per i dettagli.\n"
+"[b]Note:[/b] I metodi [method get_bound_arguments_count] e [method "
+"get_unbound_arguments_count] possono entrambi restituire valori positivi."
+
 msgid ""
 "Returns the 32-bit hash value of this [Callable]'s object.\n"
 "[b]Note:[/b] [Callable]s with equal content will always produce identical "
@@ -18300,7 +24167,7 @@ msgid ""
 "or not a [Viewport], uses the default viewport instead."
 msgstr ""
 "Il nodo [Viewport] personalizzato associato alla [Camera2D]. Se [code]null[/"
-"code] o non è un [Viewport], utilizza invece il viewport predefinito."
+"code] o non è una [Viewport], utilizza invece la viewport predefinita."
 
 msgid ""
 "Bottom margin needed to drag the camera. A value of [code]1[/code] makes the "
@@ -18610,7 +24477,7 @@ msgid ""
 "description). If the camera node is outside the scene tree, it will attempt "
 "to become current once it's added."
 msgstr ""
-"Rende questa telecamera la telecamera attuale per il [Viewport] (vedi la "
+"Rende questa telecamera la telecamera attuale per la [Viewport] (vedi la "
 "descrizione della classe). Se il nodo telecamera non è all'interno "
 "dell'albero di scene, tenterà di diventare attuale una volta aggiunto."
 
@@ -18640,7 +24507,7 @@ msgid ""
 "intersection or picking."
 msgstr ""
 "Restituisce un vettore normale nello spazio mondiale, ottenuto proiettando un "
-"punto sul rettangolo del [Viewport] mediante la proiezione inversa della "
+"punto sul rettangolo della [Viewport] mediante la proiezione inversa della "
 "telecamera. Ciò è utile per proiettare raggi sotto forma di (origine, "
 "normale) per l'intersezione o la selezione di oggetti."
 
@@ -18651,7 +24518,7 @@ msgid ""
 "intersection or picking."
 msgstr ""
 "Restituisce una posizione 3D nello spazio mondiale, ottenuto proiettando un "
-"punto sul rettangolo del [Viewport] mediante la proiezione inversa della "
+"punto sul rettangolo della [Viewport] mediante la proiezione inversa della "
 "telecamera. Ciò è utile per proiettare raggi sotto forma di (origine, "
 "normale) per l'intersezione o la selezione di oggetti."
 
@@ -18711,10 +24578,10 @@ msgid ""
 "unproject_position(global_transform.origin)\n"
 "[/codeblock]"
 msgstr ""
-"Restituisce le coordinate 2D nel rettangolo del [Viewport] che mappa al punto "
-"3D specificato in spazio mondiale.\n"
+"Restituisce le coordinate 2D nel rettangolo della [Viewport] che mappa al "
+"punto 3D specificato in spazio mondiale.\n"
 "[b]Nota:[/b] Quando si usa per posizionare gli elementi della GUI su una "
-"vista 3D, usa [method is_position_behind] per evitare che appaiano se il "
+"viewport 3D, usa [method is_position_behind] per evitare che appaiano se il "
 "punto 3D è dietro la telecamera:\n"
 "[codeblock]\n"
 "# Questo blocco di codice fa parte di uno script che eredita da Node3D.\n"
@@ -18775,7 +24642,7 @@ msgid ""
 "current, setting one camera's [member current] to [code]false[/code] will "
 "cause the other camera to be made current."
 msgstr ""
-"Se [code]true[/code], il [Viewport] antenato sta attualmente usando questa "
+"Se [code]true[/code], la [Viewport] antenato sta attualmente usando questa "
 "telecamera.\n"
 "Se nella scena sono presenti più telecamere, una diventerà sempre attuale. Ad "
 "esempio, se nella scena sono presenti due nodi [Camera3D] e solo uno è "
@@ -18992,6 +24859,24 @@ msgstr ""
 "Moltiplicatore per la quantità di esposizione. Un valore più alto produce "
 "un'immagine più luminosa."
 
+msgid ""
+"Sensitivity of camera sensors, measured in ISO. A higher sensitivity results "
+"in a brighter image.\n"
+"If [member auto_exposure_enabled] is [code]true[/code], this can be used as a "
+"method of exposure compensation, doubling the value will increase the "
+"exposure value (measured in EV100) by 1 stop.\n"
+"[b]Note:[/b] Only available when [member ProjectSettings.rendering/"
+"lights_and_shadows/use_physical_light_units] is enabled."
+msgstr ""
+"Sensibilità dei sensori della telecamera, misurata in ISO. Una sensibilità "
+"più elevata produce un'immagine più luminosa.\n"
+"Se [member auto_exposure_enabled] è [code]true[/code], questo può essere "
+"utilizzato come modo di compensazione dell'esposizione, raddoppiando il "
+"valore si aumenterà il valore dell'esposizione (misurato in EV100) di 1 "
+"stop.\n"
+"[b]Nota:[/b] Disponibile solo quando [member ProjectSettings.rendering/"
+"lights_and_shadows/use_physical_light_units] è abilitato."
+
 msgid "Physically-based camera settings."
 msgstr "Impostazioni di telecamera basate sulla fisica."
 
@@ -19019,6 +24904,18 @@ msgstr ""
 "automatica al di sotto di una certa luminosità, risultando in un punto di "
 "interruzione in cui la scena rimarrà luminosa."
 
+msgid ""
+"The minimum luminance (in EV100) used when calculating auto exposure. When "
+"calculating scene average luminance, color values will be clamped to at least "
+"this value. This limits the auto-exposure from exposing above a certain "
+"brightness, resulting in a cut off point where the scene will remain dark."
+msgstr ""
+"La luminanza minima (in EV100) utilizzata per il calcolo dell'esposizione "
+"automatica. Quando si calcola la luminanza media della scena, i valori del "
+"colore saranno limitati almeno a questo valore. Ciò limita l'esposizione "
+"automatica al di sopra di una certa luminosità, risultando in un punto di "
+"taglio in cui la scena rimarrà scura."
+
 msgid ""
 "Size of the aperture of the camera, measured in f-stops. An f-stop is a "
 "unitless ratio between the focal length of the camera and the diameter of the "
@@ -19222,6 +25119,39 @@ msgstr ""
 "Un feed della telecamera ti dà accesso a una singola telecamera fisica "
 "collegata al tuo dispositivo."
 
+msgid ""
+"A camera feed gives you access to a single physical camera attached to your "
+"device. When enabled, Godot will start capturing frames from the camera which "
+"can then be used. See also [CameraServer].\n"
+"[b]Note:[/b] Many cameras will return YCbCr images which are split into two "
+"textures and need to be combined in a shader. Godot does this automatically "
+"for you if you set the environment to show the camera image in the "
+"background.\n"
+"[b]Note:[/b] This class is currently only implemented on Linux, macOS, and "
+"iOS. On other platforms no [CameraFeed]s will be available. To get a "
+"[CameraFeed] on iOS, the camera plugin from [url=https://github.com/"
+"godotengine/godot-ios-plugins]godot-ios-plugins[/url] is required."
+msgstr ""
+"Un feed di fotocamera ti dà accesso a una singola fotocamera fisica collegata "
+"al tuo dispositivo. Quando abilitato, Godot inizierà a catturare fotogrammi "
+"dalla fotocamera che potranno quindi essere utilizzati. Vedi anche "
+"[CameraServer].\n"
+"[b]Nota:[/b] Molte fotocamere restituiscono immagini in YCbCr che sono divise "
+"in due texture e che devono essere combinate in uno shader. Godot fa ciò "
+"automaticamente se l'ambiente è impostato per mostrare l'immagine della "
+"fotocamera nello sfondo.\n"
+"[b]Nota:[/b] Questa classe è attualmente implementata solo su Linux, macOS e "
+"iOS. Su altre piattaforme i [CameraFeed] non saranno disponibili. Per "
+"ottenere un [CameraFeed] su iOS, è necessaria l'estensione della fotocamera "
+"da [url=https://github.com/godotengine/godot-ios-plugins]godot-ios-plugins[/"
+"url]."
+
+msgid "Called when the camera feed is activated."
+msgstr "Chiamato quando il feed della fotocamera viene attivato."
+
+msgid "Called when the camera feed is deactivated."
+msgstr "Chiamato quando il feed della fotocamera viene disattivato."
+
 msgid "Returns feed image data type."
 msgstr "Restituisce il tipo di dati dell'immagine del feed."
 
@@ -19234,12 +25164,33 @@ msgstr "Restituisce il nome della fotocamera."
 msgid "Returns the position of camera on the device."
 msgstr "Restituisce la posizione della fotocamera sul dispositivo."
 
+msgid "Sets the camera's name."
+msgstr "Imposta il nome della fotocamera."
+
+msgid "Sets the position of this camera."
+msgstr "Imposta la posizione di questa fotocamera."
+
+msgid "Sets RGB image for this feed."
+msgstr "Imposta l'immagine RGB per questo feed."
+
+msgid "Sets YCbCr image for this feed."
+msgstr "Imposta l'immagine YCbCr per questo feed."
+
 msgid "If [code]true[/code], the feed is active."
 msgstr "Se [code]true[/code], il feed è attivo."
 
+msgid "Emitted when the format has changed."
+msgstr "Emesso quando il formato è cambiato."
+
+msgid "Emitted when a new frame is available."
+msgstr "Emesso quando un nuovo fotogramma è disponibile."
+
 msgid "Unspecified position."
 msgstr "Posizione non specificata."
 
+msgid "Server keeping track of different cameras accessible in Godot."
+msgstr "Server che tiene traccia delle diverse fotocamere accessibili in Godot."
+
 msgid "Adds the camera [param feed] to the camera server."
 msgstr "Aggiunge il [param feed] di fotocamera al server di telecamera."
 
@@ -19341,7 +25292,7 @@ msgid ""
 "in, to the [Viewport]s coordinate system."
 msgstr ""
 "Restituisce la trasformazione dal sistema di coordinate del canvas in cui si "
-"trova questo elemento, al sistema di coordinate del [Viewport]."
+"trova questo elemento, al sistema di coordinate della [Viewport]."
 
 msgid ""
 "Returns the mouse's position in the [CanvasLayer] that this [CanvasItem] is "
@@ -19371,7 +25322,7 @@ msgid ""
 "to the [Viewport]s coordinate system."
 msgstr ""
 "Restituisce la trasformazione dal sistema di coordinate locali di questo "
-"[CanvasItem] al sistema di coordinate del [Viewport]."
+"[CanvasItem] al sistema di coordinate del la [Viewport]."
 
 msgid "Get the value of a shader parameter as set on this instance."
 msgstr ""
@@ -19450,6 +25401,30 @@ msgstr ""
 "NOTIFICATION_DRAW] e viene chiamato [method _draw]. Ciò si verifica solo "
 "[b]una[/b] volta per frame, anche se questo metodo è stato chiamato più volte."
 
+msgid ""
+"Set the value of a shader uniform for this instance only ([url=$DOCS_URL/"
+"tutorials/shaders/shader_reference/shading_language.html#per-instance-"
+"uniforms]per-instance uniform[/url]). See also [method ShaderMaterial."
+"set_shader_parameter] to assign a uniform on all instances using the same "
+"[ShaderMaterial].\n"
+"[b]Note:[/b] For a shader uniform to be assignable on a per-instance basis, "
+"it [i]must[/i] be defined with [code]instance uniform ...[/code] rather than "
+"[code]uniform ...[/code] in the shader code.\n"
+"[b]Note:[/b] [param name] is case-sensitive and must match the name of the "
+"uniform in the code exactly (not the capitalized name in the inspector)."
+msgstr ""
+"Imposta il valore di un'uniforme di shader solo per questa istanza "
+"([url=$DOCS_URL/tutorials/shaders/shader_reference/shading_language.html#per-"
+"instance-uniforms]uniforme per istanza[/url]). Consulta anche [method "
+"ShaderMaterial.set_shader_parameter] per assegnare un'uniforme a tutte le "
+"istanze che utilizzano lo stesso [ShaderMaterial].\n"
+"[b]Nota:[/b] Affinché un'uniforme di shader possa essere assegnabile per "
+"istanza individualmente, [i]deve[/i] essere definita con [code]instance "
+"uniform ...[/code] anziché [code]uniform ...[/code] nel codice dello shader.\n"
+"[b]Nota:[/b] [param name] è sensibile alle maiuscole e alle minuscole e deve "
+"corrispondere esattamente al nome dell'uniforme in codice (non al nome "
+"formattato nell'ispettore)."
+
 msgid ""
 "If [param enable] is [code]true[/code], this node will receive [constant "
 "NOTIFICATION_LOCAL_TRANSFORM_CHANGED] when its local transform changes."
@@ -19554,9 +25529,54 @@ msgid ""
 "share a layer with the [Viewport]'s canvas cull mask."
 msgstr ""
 "Gli strati di rendering in cui questo [CanvasItem] viene renderizzato dai "
-"nodi [Viewport]. Un [Viewport] eseguirà il rendering di un [CanvasItem] se "
-"esso e tutti i suoi elementi genitori condividono uno strato con la maschera "
-"di culling del [Viewport]."
+"nodi [Viewport]. Una [Viewport] renderizzerà un [CanvasItem] se esso e tutti "
+"i suoi elementi genitori condividono uno strato con la maschera di culling "
+"della [Viewport]."
+
+msgid ""
+"If [code]true[/code], this [CanvasItem] may be drawn. Whether this "
+"[CanvasItem] is actually drawn depends on the visibility of all of its "
+"[CanvasItem] ancestors. In other words: this [CanvasItem] will be drawn when "
+"[method is_visible_in_tree] returns [code]true[/code] and all [CanvasItem] "
+"ancestors share at least one [member visibility_layer] with this "
+"[CanvasItem].\n"
+"[b]Note:[/b] For controls that inherit [Popup], the correct way to make them "
+"visible is to call one of the multiple [code]popup*()[/code] functions "
+"instead."
+msgstr ""
+"Se [code]true[/code], questo [CanvasItem] potrebbe essere disegnato. Se "
+"questo [CanvasItem] sia effettivamente disegnato dipende dalla visibilità di "
+"tutti i suoi [CanvasItem] antenati. In altre parole: questo [CanvasItem] sarà "
+"disegnato quando [method is_visible_in_tree] restituisce [code]true[/code] e "
+"tutti i [CanvasItem] antenati condividono almeno uno strato di visibilità "
+"([member visibility_layer]) con questo [CanvasItem].\n"
+"[b]Nota:[/b] Per i controlli che ereditano [Popup], il modo corretto per "
+"renderli visibili è di invece chiamare una delle molteplici funzioni "
+"[code]popup*()[/code]."
+
+msgid ""
+"If [code]true[/code], this and child [CanvasItem] nodes with a higher Y "
+"position are rendered in front of nodes with a lower Y position. If "
+"[code]false[/code], this and child [CanvasItem] nodes are rendered normally "
+"in scene tree order.\n"
+"With Y-sorting enabled on a parent node ('A') but disabled on a child node "
+"('B'), the child node ('B') is sorted but its children ('C1', 'C2', etc.) "
+"render together on the same Y position as the child node ('B'). This allows "
+"you to organize the render order of a scene without changing the scene tree.\n"
+"Nodes sort relative to each other only if they are on the same [member "
+"z_index]."
+msgstr ""
+"Se [code]true[/code], questo e i nodi [CanvasItem] figli con una posizione in "
+"Y più alta sono renderizzati davanti ai nodi con una posizione in Y più "
+"bassa. Se [code]false[/code], questo nodo e i [CanvasItem] figli sono "
+"renderizzati normalmente nell'ordine dell'albero di scene.\n"
+"Con l'ordinamento in Y abilitato su un nodo genitore ('A') ma disabilitato su "
+"un nodo figlio ('B'), il nodo figlio ('B') è ordinato ma i suoi figli ('C1', "
+"'C2', ecc.) renderizzano insieme sulla stessa posizione in Y del nodo figlio "
+"(\"B\"). Ciò consente di organizzare l'ordine di rendering di una scena senza "
+"modificare l'albero di scene.\n"
+"I nodi sono ordinati l'uno rispetto all'altro solo se si trovano sullo stesso "
+"[member z_index]."
 
 msgid ""
 "If [code]true[/code], the node's Z index is relative to its parent's Z index. "
@@ -19599,6 +25619,31 @@ msgstr ""
 "[b]Nota:[/b] Le connessioni differite non consentono il disegno tramite i "
 "metodi [code]draw_*[/code]."
 
+msgid ""
+"Emitted when the [CanvasItem] is hidden, i.e. it's no longer visible in the "
+"tree (see [method is_visible_in_tree])."
+msgstr ""
+"Emesso quando il [CanvasItem] è nascosto, ovvero non è più visibile "
+"nell'albero (vedi [method is_visible_in_tree])."
+
+msgid ""
+"Emitted when the [CanvasItem]'s boundaries (position or size) change, or when "
+"an action took place that may have affected these boundaries (e.g. changing "
+"[member Sprite2D.texture])."
+msgstr ""
+"Emesso quando i confini [Rect2] del [CanvasItem] (posizione o dimensioni) "
+"sono cambiati o quando si svolge un'azione che potrebbe aver influito su tali "
+"confini (ad esempio la modifica di [member Sprite2D.texture])."
+
+msgid ""
+"Emitted when the [CanvasItem]'s visibility changes, either because its own "
+"[member visible] property changed or because its visibility in the tree "
+"changed (see [method is_visible_in_tree])."
+msgstr ""
+"Emesso quando la visibilità del [CanvasItem] cambia, o perché è cambiata la "
+"sua proprietà [member visible] o perché è cambiata la sua visibilità "
+"nell'albero (vedi [method is_visible_in_tree])."
+
 msgid ""
 "The [CanvasItem]'s global transform has changed. This notification is only "
 "received if enabled by [method set_notify_transform]."
@@ -19763,6 +25808,13 @@ msgstr ""
 "Modalità di fusione mista. Si presuppone che i colori siano premoltiplicati "
 "per il valore alfa (opacità)."
 
+msgid ""
+"Render the material using both light and non-light sensitive material "
+"properties."
+msgstr ""
+"Renderizza il materiale usando proprietà del materiale sia sensibili alla "
+"luce che non sensibili alla luce."
+
 msgid "Render the material as if there were no light."
 msgstr "Renderizza il materiale come se non ci fosse luce."
 
@@ -19826,7 +25878,7 @@ msgid ""
 "[Viewport]s coordinate system."
 msgstr ""
 "Restituisce la trasformazione dal sistema di coordinate del [CanvasLayer] al "
-"sistema di coordinate del [Viewport]."
+"sistema di coordinate della [Viewport]."
 
 msgid ""
 "Hides any [CanvasItem] under this [CanvasLayer]. This is equivalent to "
@@ -19847,7 +25899,7 @@ msgid ""
 "code], uses the default viewport instead."
 msgstr ""
 "Il nodo [Viewport] personalizzato assegnato al [CanvasLayer]. Se [code]null[/"
-"code], utilizza invece il viewport predefinito."
+"code], utilizza invece la viewport predefinita."
 
 msgid ""
 "Scales the layer when using [member follow_viewport_enabled]. Layers moving "
@@ -20205,6 +26257,50 @@ msgstr ""
 "movimento diagonale, a differenza di [member velocity] che restituisce la "
 "velocità richiesta."
 
+msgid ""
+"Returns a [KinematicCollision2D], which contains information about a "
+"collision that occurred during the last call to [method move_and_slide]. "
+"Since the body can collide several times in a single call to [method "
+"move_and_slide], you must specify the index of the collision in the range 0 "
+"to ([method get_slide_collision_count] - 1).\n"
+"[b]Example:[/b] Iterate through the collisions with a [code]for[/code] loop:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in get_slide_collision_count():\n"
+"    var collision = get_slide_collision(i)\n"
+"    print(\"Collided with: \", collision.get_collider().name)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < GetSlideCollisionCount(); i++)\n"
+"{\n"
+"    KinematicCollision2D collision = GetSlideCollision(i);\n"
+"    GD.Print(\"Collided with: \", (collision.GetCollider() as Node).Name);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce un [KinematicCollision2D], che contiene informazioni su una "
+"collisione che si è verificate durante l'ultima chiamata a [method "
+"move_and_slide]. Poiché il corpo può collidere più volte in una singola "
+"chiamata a [method move_and_slide], è necessario specificare l'indice della "
+"collisione nell'intervallo da 0 a ([method get_slide_collision_count] - 1).\n"
+"[b]Esempio:[/b] Itera tra le collisioni con un ciclo [code]for[/code]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in get_slide_collision_count():\n"
+"    var collision = get_slide_collision(i)\n"
+"    print(\"In collisione con: \", collision.get_collider().name)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < GetSlideCollisionCount(); i++)\n"
+"{\n"
+"    KinematicCollision2D collision = GetSlideCollision(i);\n"
+"    GD.Print(\"In collisione con: \", (collision.GetCollider() as Node)."
+"Name);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the number of times the body collided and changed direction during "
 "the last call to [method move_and_slide]."
@@ -20506,6 +26602,33 @@ msgstr ""
 "influisce sul movimento solo quando [member motion_mode] è [constant "
 "MOTION_MODE_FLOATING]."
 
+msgid ""
+"Apply when notions of walls, ceiling and floor are relevant. In this mode the "
+"body motion will react to slopes (acceleration/slowdown). This mode is "
+"suitable for sided games like platformers."
+msgstr ""
+"Da applicare quando sono rilevanti le nozioni di muri, soffitto e pavimento. "
+"In questa modalità il movimento del corpo reagirà alle pendenze "
+"(accelerazione/rallentamento). Questa modalità è adatta per giochi laterali "
+"come i piattaforme."
+
+msgid ""
+"Apply when there is no notion of floor or ceiling. All collisions will be "
+"reported as [code]on_wall[/code]. In this mode, when you slide, the speed "
+"will always be constant. This mode is suitable for top-down games."
+msgstr ""
+"Da applicare quando non c'è nozione di pavimento o soffitto. Tutte le "
+"collisioni saranno segnalate come [code]on_wall[/code]. In questa modalità, "
+"quando scivoli, la velocità sarà sempre costante. Questa modalità è adatta "
+"per i giochi dall'alto."
+
+msgid ""
+"Add the last platform velocity to the [member velocity] when you leave a "
+"moving platform."
+msgstr ""
+"Aggiunge la velocità dell'ultima piattaforma alla [member velocity] quando si "
+"abbandona una piattaforma in movimento."
+
 msgid ""
 "Add the last platform velocity to the [member velocity] when you leave a "
 "moving platform, but any downward motion is ignored. It's useful to keep full "
@@ -20685,6 +26808,16 @@ msgstr ""
 "motion_mode] è [constant MOTION_MODE_GROUNDED], questa proprietà influisce "
 "sul movimento solo se [member floor_block_on_wall] è [code]true[/code]."
 
+msgid ""
+"Apply when notions of walls, ceiling and floor are relevant. In this mode the "
+"body motion will react to slopes (acceleration/slowdown). This mode is "
+"suitable for grounded games like platformers."
+msgstr ""
+"Da applicare quando sono rilevanti le nozioni di muri, soffitto e pavimento. "
+"In questa modalità il movimento del corpo reagirà alle pendenze "
+"(accelerazione/rallentamento). Questa modalità è adatta per giochi come i "
+"piattaforme."
+
 msgid ""
 "Apply when there is no notion of floor or ceiling. All collisions will be "
 "reported as [code]on_wall[/code]. In this mode, when you slide, the speed "
@@ -20755,10 +26888,56 @@ msgstr ""
 "1)}\n"
 "[/codeblock]"
 
+msgid ""
+"Number of glyphs in the grapheme cluster. This value is set in the first "
+"glyph of a cluster.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Numero di glifi nel cluster di grafemi. Questo valore è impostato nel primo "
+"glifo di un cluster.\n"
+"[b]Nota:[/b] Di sola lettura. Impostare questa proprietà non influirà sul "
+"disegno."
+
+msgid ""
+"Glyph flags. See [enum TextServer.GraphemeFlag] for more info.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Opzioni per il glifo. Vedi [enum TextServer.GraphemeFlag] per ulteriori "
+"informazioni.\n"
+"[b]Nota:[/b] Di sola lettura. Impostare questa proprietà non influirà sul "
+"disegno."
+
 msgid "The position offset the character will be drawn with (in pixels)."
 msgstr ""
 "Lo scostamento della posizione con cui sarà disegnato il carattere (in pixel)."
 
+msgid ""
+"If [code]true[/code], FX transform is called for outline drawing.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Se [code]true[/code], la trasformazione FX viene chiamata per disegnare il "
+"contorno.\n"
+"[b]Nota:[/b] Di sola lettura. Impostare questa proprietà non influirà sul "
+"disegno."
+
+msgid ""
+"Absolute character range in the string, corresponding to the glyph.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Intervallo assoluto di caratteri nella stringa, corrispondente al glifo.\n"
+"[b]Nota:[/b] Di sola lettura. Impostare questa proprietà non influirà sul "
+"disegno."
+
+msgid ""
+"The character offset of the glyph, relative to the current [RichTextEffect] "
+"custom block.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Lo scostamento del carattere del glifo, relativo al blocco [RichTextEffect] "
+"personalizzato attuale.\n"
+"[b]Nota:[/b] Di sola lettura. Impostare questa proprietà non influirà sul "
+"disegno."
+
 msgid ""
 "The current transform of the current glyph. It can be overridden (for "
 "example, by driving the position and rotation from a curve). You can also "
@@ -20962,9 +27141,16 @@ msgstr ""
 "Restituisce [code]true[/code] se gli oggetti possono essere istanziati dalla "
 "classe [param class], altrimenti restituisce [code]false[/code]."
 
+msgid "Calls a static method on a class."
+msgstr "Chiama un metodo statico su una classe."
+
 msgid "Returns whether the specified [param class] is available or not."
 msgstr "Restituisce se la classe [param class] è disponibile o meno."
 
+msgid "Returns the API type of [param class]. See [enum APIType]."
+msgstr ""
+"Restituisce il tipo di API della classe [param class]. Vedi [enum APIType]."
+
 msgid ""
 "Returns an array with all the keys in [param enum] of [param class] or its "
 "ancestry."
@@ -21038,6 +27224,11 @@ msgstr ""
 "Restituisce il valore predefinito della proprietà nominata [param property] "
 "della classe [param class] o le sue classi antenate."
 
+msgid "Returns the getter method name of [param property] of [param class]."
+msgstr ""
+"Restituisce il nome del metodo getter della proprietà nominata [param "
+"property] della classe [param class]."
+
 msgid ""
 "Returns an array with all the properties of [param class] or its ancestry if "
 "[param no_inheritance] is [code]false[/code]."
@@ -21045,6 +27236,11 @@ msgstr ""
 "Restituisce un array con tutte le proprietà della classe [param class] o i "
 "suoi antenati se [param no_inheritance] è [code]false[/code]."
 
+msgid "Returns the setter method name of [param property] of [param class]."
+msgstr ""
+"Restituisce il nome del metodo setter della proprietà nominata [param "
+"property] della classe [param class]."
+
 msgid ""
 "Returns the [param signal] data of [param class] or its ancestry. The "
 "returned value is a [Dictionary] with the following keys: [code]args[/code], "
@@ -21134,6 +27330,15 @@ msgstr ""
 "Restituisce se la classe nominata [param inherits] è un antenato della classe "
 "[param class] o meno."
 
+msgid "GDExtension class type."
+msgstr "Tipo di classe GDExtension."
+
+msgid "GDExtension Editor class type."
+msgstr "Tipo di classe GDExtension dell'editor."
+
+msgid "Unknown class type."
+msgstr "Tipo di classe sconosciuto."
+
 msgid "A multiline text editor designed for editing code."
 msgstr "Un editor di testo multilinea progettato per modificare codice."
 
@@ -21404,6 +27609,9 @@ msgstr ""
 msgid "Gets all executing lines."
 msgstr "Ottiene tutte le righe in esecuzione."
 
+msgid "Returns all lines that are currently folded."
+msgstr "Restituisce tutte le righe che sono attualmente ridotte."
+
 msgid ""
 "Returns the full text with char [code]0xFFFF[/code] at the caret location."
 msgstr ""
@@ -21461,6 +27669,47 @@ msgstr ""
 "non è fornito, restituirà l'indice del delimitatore se l'intera riga ([param "
 "line]) è una stringa. Altrimenti [code]-1[/code]."
 
+msgid ""
+"Returns [code]true[/code] if the given line is bookmarked. See [method "
+"set_line_as_bookmarked]."
+msgstr ""
+"Restituisce [code]true[/code] se la riga fornita ha un segnalibro . Vedi "
+"anche [method set_line_as_bookmarked]."
+
+msgid ""
+"Returns [code]true[/code] if the given line is breakpointed. See [method "
+"set_line_as_breakpoint]."
+msgstr ""
+"Restituisce [code]true[/code] se la riga fornita ha un punto d'interruzione. "
+"Vedi anche [method set_line_as_breakpoint]."
+
+msgid ""
+"Returns [code]true[/code] if the given line is a code region end. See [method "
+"set_code_region_tags]."
+msgstr ""
+"Restituisce [code]true[/code] se la riga fornita è la fine di una regione di "
+"codice. Vedi anche [method set_code_region_tags]."
+
+msgid ""
+"Returns [code]true[/code] if the given line is a code region start. See "
+"[method set_code_region_tags]."
+msgstr ""
+"Restituisce [code]true[/code] se la riga fornita è l'inizio di una regione di "
+"codice. Vedi anche [method set_code_region_tags]."
+
+msgid ""
+"Returns [code]true[/code] if the given line is marked as executing. See "
+"[method set_line_as_executing]."
+msgstr ""
+"Restituisce [code]true[/code] se la riga fornita è segnata come in "
+"esecuzione. Vedi anche [method set_line_as_executing]."
+
+msgid ""
+"Returns [code]true[/code] if the given line is folded. See [method fold_line]."
+msgstr ""
+"Restituisce [code]true[/code] se la riga fornita è ridotta. Vedi anche "
+"[method fold_line]."
+
 msgid "Moves all lines down that are selected or have a caret on them."
 msgstr ""
 "Sposta verso il basso tutte le righe selezionate o che contengono un cursore."
@@ -21495,6 +27744,15 @@ msgstr ""
 "Imposta il testo del suggerimento sul codice. Passa una stringa vuota per "
 "cancellare."
 
+msgid ""
+"If [code]true[/code], the code hint will draw below the main caret. If "
+"[code]false[/code], the code hint will draw above the main caret. See [method "
+"set_code_hint]."
+msgstr ""
+"Se [code]true[/code], il suggerimento del codice sarà disegnato sotto il "
+"cursore principale. Se [code]false[/code], il suggerimento del codice sarà "
+"disegnato sopra il cursore principale. Vedi [method set_code_hint]."
+
 msgid "Sets the code region start and end tags (without comment delimiter)."
 msgstr ""
 "Imposta i tag di inizio e fine delle aree di codice (senza delimitatore di "
@@ -21511,6 +27769,9 @@ msgid "Toggle the folding of the code block on all lines with a caret on them."
 msgstr ""
 "Commuta il ripiegamento del blocco di codice su tutte le righe con un cursore."
 
+msgid "Unfolds all lines that are folded."
+msgstr "Espande tutte le righe che erano precedentemente ridotte."
+
 msgid ""
 "Submits all completion options added with [method "
 "add_code_completion_option]. Will try to force the autocomplete menu to "
@@ -21537,6 +27798,39 @@ msgstr ""
 "Imposta i delimitatori di stringa. Tutti i delimitatori di stringa esistenti "
 "saranno rimossi."
 
+msgid ""
+"If [code]true[/code], bookmarks are drawn in the gutter. This gutter is "
+"shared with breakpoints and executing lines. See [method "
+"set_line_as_bookmarked]."
+msgstr ""
+"Se [code]true[/code], i segnalibri sono disegnati nel gutter. Questo gutter è "
+"condiviso con i punti d'interruzione e le righe in esecuzione. Vedi [method "
+"set_line_as_bookmarked]."
+
+msgid ""
+"If [code]true[/code], executing lines are marked in the gutter. This gutter "
+"is shared with breakpoints and bookmarks. See [method set_line_as_executing]."
+msgstr ""
+"Se [code]true[/code], le righe in esecuzione sono segnate nel gutter. Questo "
+"gutter è condiviso con i punti d'interruzione e i segnalibri. Vedi [method "
+"set_line_as_executing]."
+
+msgid ""
+"If [code]true[/code], line numbers drawn in the gutter are zero padded based "
+"on the total line count. Requires [member gutters_draw_line_numbers] to be "
+"set to [code]true[/code]."
+msgstr ""
+"Se [code]true[/code], i numeri di riga disegnati nel gutter sono riempiti di "
+"zeri in base al numero totale delle righe. Necessita che [member "
+"gutters_draw_line_numbers] sia impostato su [code]true[/code]."
+
+msgid ""
+"Prefixes to trigger an automatic indent. Used when [member indent_automatic] "
+"is set to [code]true[/code]."
+msgstr ""
+"Prefissi che attivano una indentazione automatica. Usato quando [member "
+"indent_automatic] è impostato su [code]true[/code]."
+
 msgid ""
 "Size of the tabulation indent (one [kbd]Tab[/kbd] press) in characters. If "
 "[member indent_use_spaces] is enabled the number of spaces to use."
@@ -21562,6 +27856,12 @@ msgstr ""
 "Impostato se quando si clicca su una parola convalidata da [signal "
 "symbol_validate], dovrebbe essere emesso [signal symbol_lookup]."
 
+msgid ""
+"Set when a word is hovered, the [signal symbol_hovered] should be emitted."
+msgstr ""
+"Imposta se quando si passa sopra una parola con il cursore del mouse, [signal "
+"symbol_hovered] dovrebbe essere emesso."
+
 msgid ""
 "Emitted when a breakpoint is added or removed from a line. If the line is "
 "moved via backspace a removed is emitted at the old line."
@@ -21573,6 +27873,18 @@ msgstr ""
 msgid "Emitted when the user has clicked on a valid symbol."
 msgstr "Emesso quando l'utente ha cliccato su un simbolo valido."
 
+msgid ""
+"Emitted when the user hovers over a symbol. The symbol should be validated "
+"and responded to, by calling [method set_symbol_lookup_word_as_valid].\n"
+"[b]Note:[/b] [member symbol_lookup_on_click] must be [code]true[/code] for "
+"this signal to be emitted."
+msgstr ""
+"Emesso quando l'utente passa il cursore del mouse su un simbolo. Il simbolo "
+"deve essere convalidato e ci si deve rispondere, chiamando [method "
+"set_symbol_lookup_word_as_valid].\n"
+"[b]Nota:[/b] [member symbol_lookup_on_click] deve essere [code]true[/code] "
+"affinché questo segnale venga emesso."
+
 msgid "Marks the option as a class."
 msgstr "Contrassegna l'opzione come classe."
 
@@ -21741,6 +28053,13 @@ msgstr ""
 "Imposta una [Texture2D] personalizzata da disegnare nel gutter delle "
 "ripiegature quando una regione di codice può essere ripiegata."
 
+msgid ""
+"Background panel for the color preview box in autocompletion (visible when "
+"the color is translucent)."
+msgstr ""
+"Pannello di sfondo per il riquadro di anteprima del colore nel completamento "
+"automatico (visibile quando il colore è traslucido)."
+
 msgid "Icon to draw in the executing gutter for executing lines."
 msgstr "Icona da disegnare nel gutter di esecuzione per le righe in esecuzione."
 
@@ -22483,6 +28802,23 @@ msgid "A node that provides a polygon shape to a [CollisionObject2D] parent."
 msgstr ""
 "Un nodo che fornisce una forma poligonale a un [CollisionObject2D] genitore."
 
+msgid ""
+"A node that provides a polygon shape to a [CollisionObject2D] parent and "
+"allows to edit it. The polygon can be concave or convex. This can give a "
+"detection shape to an [Area2D], turn [PhysicsBody2D] into a solid object, or "
+"give a hollow shape to a [StaticBody2D].\n"
+"[b]Warning:[/b] A non-uniformly scaled [CollisionPolygon2D] will likely not "
+"behave as expected. Make sure to keep its scale the same on all axes and "
+"adjust its polygon instead."
+msgstr ""
+"Un nodo che fornisce una forma poligonale a un [CollisionObject2D] genitore e "
+"consente di modificarla. Il poligono può essere concavo o convesso. Ciò può "
+"dare una forma di rilevamento a un [Area2D], trasformare un [PhysicsBody2D] "
+"in un oggetto solido o dare una forma cava a uno [StaticBody2D].\n"
+"[b]Avviso:[/b] Un [CollisionShape2D] ridimensionato in modo non uniforme "
+"probabilmente non si comporterà come previsto. Assicurati di mantenere la sua "
+"scala uguale su tutti gli assi e regola invece la sua forma."
+
 msgid "Collision build mode. Use one of the [enum BuildMode] constants."
 msgstr ""
 "Modalità di costruzione delle collisioni. Utilizzare una delle costanti di "
@@ -22571,6 +28907,34 @@ msgstr ""
 "probabilmente non si comporterà come previsto. Assicurati di mantenere la sua "
 "scala uguale su tutti gli assi e regola invece la sua risorsa forma."
 
+msgid ""
+"The collision shape color that is displayed in the editor, or in the running "
+"project if [b]Debug > Visible Collision Shapes[/b] is checked at the top of "
+"the editor.\n"
+"[b]Note:[/b] The default value is [member ProjectSettings.debug/shapes/"
+"collision/shape_color]. The [code]Color(0, 0, 0, 0)[/code] value documented "
+"here is a placeholder, and not the actual default debug color."
+msgstr ""
+"Il colore di debug della forma di collisione che è visualizzato nell'editor, "
+"o nel progetto in esecuzione se [b]Debug > Forme di collisione visibili[/b].\n"
+"[b]Nota:[/b] Il valore predefinito è [member ProjectSettings.debug/shapes/"
+"collision/shape_color]. Il valore [code]Color(0, 0, 0, 1)[/code] documentato "
+"qui è un segnaposto e non il colore di debug predefinito effettivo."
+
+msgid ""
+"If [code]true[/code], when the shape is displayed, it will show a solid fill "
+"color in addition to its wireframe."
+msgstr ""
+"Se [code]true[/code], quando la forma è visualizzata, mostrerà un colore "
+"solido di riempimento oltre al suo wireframe."
+
+msgid ""
+"Length that the resulting collision extends in either direction perpendicular "
+"to its 2D polygon."
+msgstr ""
+"Lunghezza per cui la collisione risultante si estende in entrambe le "
+"direzioni perpendicolari al suo poligono 2D."
+
 msgid "If [code]true[/code], no collision will be produced."
 msgstr "Se [code]true[/code], non sarà prodotta alcuna collisione."
 
@@ -22714,6 +29078,17 @@ msgstr "Demo di interpolazione Tween"
 msgid "GUI Drag And Drop Demo"
 msgstr "Demo di trascinamento e rilascio in un interfaccia utente"
 
+msgid ""
+"Constructs a default [Color] from opaque black. This is the same as [constant "
+"BLACK].\n"
+"[b]Note:[/b] In C#, this constructs a [Color] with all of its components set "
+"to [code]0.0[/code] (transparent black)."
+msgstr ""
+"Costruisce un [Color] predefinito dal nero opaco. È lo stesso di [constant "
+"BLACK].\n"
+"[b]Nota:[/b] In C#, costruisce un [Color] con tutti i suoi componenti "
+"impostati su [code]0.0[/code] (nero trasparente)."
+
 msgid ""
 "Constructs a [Color] from the existing color, with [member a] set to the "
 "given [param alpha] value.\n"
@@ -22927,6 +29302,37 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Returns a [Color] constructed from red ([param r8]), green ([param g8]), blue "
+"([param b8]), and optionally alpha ([param a8]) integer channels, each "
+"divided by [code]255.0[/code] for their final value.\n"
+"[codeblock]\n"
+"var red = Color.from_rgba8(255, 0, 0)             # Same as Color(1, 0, 0).\n"
+"var dark_blue = Color.from_rgba8(0, 0, 51)        # Same as Color(0, 0, "
+"0.2).\n"
+"var my_color = Color.from_rgba8(306, 255, 0, 102) # Same as Color(1.2, 1, 0, "
+"0.4).\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Due to the lower precision of [method from_rgba8] compared to "
+"the standard [Color] constructor, a color created with [method from_rgba8] "
+"will generally not be equal to the same color created with the standard "
+"[Color] constructor. Use [method is_equal_approx] for comparisons to avoid "
+"issues with floating-point precision error."
+msgstr ""
+"Restituisce un [Color] costruito da rosso ([param r8]), verde ([param g8]), "
+"blu ([param b8]), e facoltativamente alfa ([param a8]) canali interi, "
+"ciascuno diviso da [code]255.0[/code] per il loro valore finale.\n"
+"[codeblock]\n"
+"var red = Color8(255, 0, 0)             # Uguale a Color(1, 0, 0).\n"
+"var dark_blue = Color8(0, 0, 51)        # Uguale a Color(0, 0, 0.2).\n"
+"var my_color = Color8(306, 255, 0, 102) # Uguale a Color(1.2, 1, 0, 0.4).\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] A causa della minore precisione di [method Color8] rispetto al "
+"costruttore standard di [Color], un colore creato con [method Color8] "
+"generalmente non sarà uguale allo stesso colore creato con il costruttore "
+"standard di [Color]. Utilizza [method Color.is_equal_approx] per i confronti "
+"per evitare problemi d'errori di precisione in virgola mobile."
+
 msgid ""
 "Decodes a [Color] from an RGBE9995 format integer. See [constant Image."
 "FORMAT_RGBE9995]."
@@ -23492,6 +29898,15 @@ msgstr ""
 msgid "The HSV hue of this color, on the range 0 to 1."
 msgstr "Tonalità HSV di questo colore, nell'intervallo da 0 a 1."
 
+msgid "The OKHSL hue of this color, on the range 0 to 1."
+msgstr "La tonalità OKHSL di questo colore, nell'intervallo da 0 a 1."
+
+msgid "The OKHSL lightness of this color, on the range 0 to 1."
+msgstr "La luminosità OKHSL di questo colore, nell'intervallo da 0 a 1."
+
+msgid "The OKHSL saturation of this color, on the range 0 to 1."
+msgstr "La saturazione OKHSL di questo colore, nell'intervallo da 0 a 1."
+
 msgid "The color's red component, typically on the range of 0 to 1."
 msgstr "Il componente rosso del colore, solitamente nell'intervallo da 0 a 1."
 
@@ -23795,6 +30210,9 @@ msgstr "Colore bianco Navajo."
 msgid "Navy blue color."
 msgstr "Colore blu marino."
 
+msgid "Old lace color."
+msgstr "Colore pizzo antico."
+
 msgid "Olive color."
 msgstr "Colore oliva."
 
@@ -24020,6 +30438,9 @@ msgstr ""
 "[code]Color(1 - c.r, 1 - c.g, 1 - c.b, 1 - c.a)[/code]. A differenza di "
 "[method inverted], anche il componente [member a] è invertito."
 
+msgid "A [PackedColorArray] containing the colors in the palette."
+msgstr "[PackedColorArray] contenente i colori nella tavolozza."
+
 msgid "A widget that provides an interface for selecting or modifying a color."
 msgstr ""
 "Un widget che fornisce un'interfaccia per selezionare o modificare un colore."
@@ -24237,6 +30658,9 @@ msgstr "L'icona per il menu a tendina dei preset di colori quando è espanso."
 msgid "The icon for color preset drop down menu when folded."
 msgstr "L'icona per il menu a tendina dei preset di colori quando è chiuso."
 
+msgid "The icon for color preset option menu."
+msgstr "L'icona per il menu a tendina dei preset di colori."
+
 msgid ""
 "The indicator used to signalize that the color value is outside the 0-1 range."
 msgstr ""
@@ -24250,6 +30674,9 @@ msgstr ""
 "L'immagine visualizzata sopra il riquadro o cerchio dei colori (a seconda di "
 "[member picker_shape]), che contrassegna il colore attualmente selezionato."
 
+msgid "The fill image displayed behind the picker cursor."
+msgstr "L'immagine di riempimento visualizzata dietro il cursore del selettore."
+
 msgid ""
 "Background panel for the color preview box (visible when the color is "
 "translucent)."
@@ -24272,6 +30699,12 @@ msgstr ""
 msgid "The icon for the screen color picker button."
 msgstr "L'icona per il pulsante di preleva colore dallo schermo."
 
+msgid "The icon for circular picker shapes."
+msgstr "L'icona per le forme circolari del selettore."
+
+msgid "The icon for rectangular picker shapes."
+msgstr "L'icona per le forme rettangolari del selettore."
+
 msgid "The icon for rectangular wheel picker shapes."
 msgstr "L'icona per le forme rettangolari della ruota di selezione."
 
@@ -24423,6 +30856,48 @@ msgstr ""
 "render_data] fornisce l'accesso allo stato di rendering, è valido solo "
 "durante il rendering e non dovrebbe essere memorizzato."
 
+msgid ""
+"If [code]true[/code] and MSAA is enabled, this will trigger a color buffer "
+"resolve before the effect is run.\n"
+"[b]Note:[/b] In [method _render_callback], to access the resolved buffer "
+"use:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var color_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"color\")\n"
+"[/codeblock]"
+msgstr ""
+"Se [code]true[/code] e MSAA è abilitato, sarà attivata la risoluzione del "
+"buffer di colore prima che l'effetto sia eseguito.\n"
+"[b]Nota:[/b] In [method _render_callback], per accedere al buffer risolto "
+"usa:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var color_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"color\")\n"
+"[/codeblock]"
+
+msgid ""
+"If [code]true[/code] and MSAA is enabled, this will trigger a depth buffer "
+"resolve before the effect is run.\n"
+"[b]Note:[/b] In [method _render_callback], to access the resolved buffer "
+"use:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var depth_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"depth\")\n"
+"[/codeblock]"
+msgstr ""
+"Se [code]true[/code] e MSAA è abilitato, sarà attivata la risoluzione del "
+"buffer di profondità prima che l'effetto sia eseguito.\n"
+"[b]Nota:[/b] In [method _render_callback], per accedere al buffer risolto "
+"usa:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var depth_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"depth\")\n"
+"[/codeblock]"
+
 msgid ""
 "The type of effect that is implemented, determines at what stage of rendering "
 "the callback is called."
@@ -24437,6 +30912,25 @@ msgstr ""
 "Se [code]true[/code] questo effetto di rendering è applicato a qualsiasi "
 "viewport a cui viene aggiunto."
 
+msgid ""
+"If [code]true[/code] this triggers motion vectors being calculated during the "
+"opaque render state.\n"
+"[b]Note:[/b] In [method _render_callback], to access the motion vector buffer "
+"use:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var motion_buffer = render_scene_buffers.get_velocity_texture()\n"
+"[/codeblock]"
+msgstr ""
+"Se [code]true[/code] questo attiva i vettori di movimento calcolati durante "
+"lo stato del rendering opaco.\n"
+"[b]Nota:[/b] In [method _render_callback], per accedere al buffer dei vettori "
+"di movimento usa:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var motion_buffer = render_scene_buffers.get_velocity_texture()\n"
+"[/codeblock]"
+
 msgid ""
 "The callback is called before our opaque rendering pass, but after depth "
 "prepass (if applicable)."
@@ -24451,6 +30945,15 @@ msgstr ""
 "Il callback viene richiamato dopo il nostro passaggio di rendering opaco, ma "
 "prima che venga renderizzato il cielo."
 
+msgid ""
+"The callback is called after our sky is rendered, but before our back buffers "
+"are created (and if enabled, before subsurface scattering and/or screen space "
+"reflections)."
+msgstr ""
+"Il callback viene chiamato dopo il rendering del cielo, ma prima che vengano "
+"creati i back buffer (e, se abilitato, prima del subsurface scattering e/o "
+"delle riflessioni nello spazio dello schermo)."
+
 msgid ""
 "The callback is called before our transparent rendering pass, but after our "
 "sky is rendered and we've created our back buffers."
@@ -24459,6 +30962,14 @@ msgstr ""
 "trasparente, ma dopo che il cielo è stato renderizzato e abbiamo creato i "
 "nostri back buffer."
 
+msgid ""
+"The callback is called after our transparent rendering pass, but before any "
+"built-in post-processing effects and output to our render target."
+msgstr ""
+"Il callback viene chiamato dopo il passaggio di rendering trasparente, ma "
+"prima di qualsiasi effetto di post-elaborazione e inviato sulla destinazione "
+"di rendering."
+
 msgid "Represents the size of the [enum EffectCallbackType] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum EffectCallbackType]."
 
@@ -25422,12 +31933,102 @@ msgstr ""
 "Classe di base per tutti i controlli della GUI. Adatta la sua posizione e "
 "dimensioni in base al suo controllo padre."
 
+msgid ""
+"Base class for all UI-related nodes. [Control] features a bounding rectangle "
+"that defines its extents, an anchor position relative to its parent control "
+"or the current viewport, and offsets relative to the anchor. The offsets "
+"update automatically when the node, any of its parents, or the screen size "
+"change.\n"
+"For more information on Godot's UI system, anchors, offsets, and containers, "
+"see the related tutorials in the manual. To build flexible UIs, you'll need a "
+"mix of UI elements that inherit from [Control] and [Container] nodes.\n"
+"[b]Note:[/b] Since both [Node2D] and [Control] inherit from [CanvasItem], "
+"they share several concepts from the class such as the [member CanvasItem."
+"z_index] and [member CanvasItem.visible] properties.\n"
+"[b]User Interface nodes and input[/b]\n"
+"Godot propagates input events via viewports. Each [Viewport] is responsible "
+"for propagating [InputEvent]s to their child nodes. As the [member SceneTree."
+"root] is a [Window], this already happens automatically for all UI elements "
+"in your game.\n"
+"Input events are propagated through the [SceneTree] from the root node to all "
+"child nodes by calling [method Node._input]. For UI elements specifically, it "
+"makes more sense to override the virtual method [method _gui_input], which "
+"filters out unrelated input events, such as by checking z-order, [member "
+"mouse_filter], focus, or if the event was inside of the control's bounding "
+"box.\n"
+"Call [method accept_event] so no other node receives the event. Once you "
+"accept an input, it becomes handled so [method Node._unhandled_input] will "
+"not process it.\n"
+"Only one [Control] node can be in focus. Only the node in focus will receive "
+"events. To get the focus, call [method grab_focus]. [Control] nodes lose "
+"focus when another node grabs it, or if you hide the node in focus.\n"
+"Sets [member mouse_filter] to [constant MOUSE_FILTER_IGNORE] to tell a "
+"[Control] node to ignore mouse or touch events. You'll need it if you place "
+"an icon on top of a button.\n"
+"[Theme] resources change the control's appearance. The [member theme] of a "
+"[Control] node affects all of its direct and indirect children (as long as a "
+"chain of controls is uninterrupted). To override some of the theme items, "
+"call one of the [code]add_theme_*_override[/code] methods, like [method "
+"add_theme_font_override]. You can also override theme items in the "
+"Inspector.\n"
+"[b]Note:[/b] Theme items are [i]not[/i] [Object] properties. This means you "
+"can't access their values using [method Object.get] and [method Object.set]. "
+"Instead, use the [code]get_theme_*[/code] and [code]add_theme_*_override[/"
+"code] methods provided by this class."
+msgstr ""
+"Classe base per tutti i nodi riguardanti l'interfaccia utente. [Control] "
+"presenta un rettangolo di delimitazione che definisce le sue estensioni, una "
+"posizione di ancoraggio relativa al suo controllo padre o alla finestra di "
+"visualizzazione attuale e offset relativi all'ancoraggio. Gli offset si "
+"aggiornano automaticamente quando il nodo, uno qualsiasi dei suoi genitori o "
+"le dimensioni dello schermo cambiano.\n"
+"Per ulteriori informazioni sul sistema di interfaccia utente di Godot, "
+"ancore, offset e contenitori, consulta i tutorial al riguardo nel manuale. "
+"Per creare interfacce utente flessibili, avrai bisogno di un misto di "
+"elementi dell'UI che ereditano dai nodi [Control] e [Container].\n"
+"[b]Nota:[/b] Poiché sia [Node2D] che [Control] ereditano da [CanvasItem], "
+"essi condividono diversi concetti della classe come le proprietà [member "
+"CanvasItem.z_index] e [member CanvasItem.visible].\n"
+"[b]Nodi e e input per l'interfaccia utente[/b]\n"
+"Godot propaga gli eventi di input tramite le viewport. Ogni [Viewport] è "
+"responsabile della propagazione degli [InputEvent] ai propri nodi figlio. "
+"Poiché [member SceneTree.root] è una [Window], ciò avviene automaticamente "
+"per tutti gli elementi dell'UI nel tuo gioco. Gli eventi di input vengono "
+"propagati tramite [SceneTree] dal nodo radice a tutti i nodi figlio chiamando "
+"[method Node._input]. Per gli elementi UI in particolare, ha più senso "
+"sovrascrivere il metodo virtuale [method _gui_input], che filtra gli eventi "
+"di input non correlati, ad esempio controllando z-order, [member "
+"mouse_filter], focus o se l'evento era all'interno del riquadro di "
+"delimitazione del controllo.\n"
+"Chiama [method accept_event] in modo che nessun altro nodo riceva l'evento. "
+"Una volta accettato un input, questo viene gestito in modo che [method Node."
+"_unhandled_input] non lo elabori.\n"
+"Solo un nodo [Control] può essere in focus. Solo il nodo in focus riceverà "
+"gli eventi. Per ottenere il focus, chiama [method grab_focus]. I nodi "
+"[Control] perdono il focus quando un altro nodo lo ottiene o se nascondi il "
+"nodo in focus. Imposta [member mouse_filter] su [constant "
+"MOUSE_FILTER_IGNORE] per dire a un nodo [Control] di ignorare gli eventi del "
+"mouse o di tocco. Ne avrai bisogno se posizioni un'icona sopra un pulsante.\n"
+"Le risorse [Theme] cambiano l'aspetto del Control. Il [member theme] di un "
+"[Control] influisce su tutti i suoi figli diretti e indiretti (purché una "
+"catena di controlli non sia interrotta). Per sovrascrivere alcuni elementi "
+"del tema, chiama uno dei metodi [code]add_theme_*_override[/code], come "
+"[method add_theme_font_override]. È possibile anche sovrascrivere elementi "
+"del tema nell'Ispettore.\n"
+"[b]Nota:[/b] Gli elementi del tema [i]non[/i] sono proprietà [Object]. Ciò "
+"significa che non è possibile accedere ai loro valori attraverso [method "
+"Object.get] e [method Object.set]. Invece, usa i metodi [code]get_theme_*[/"
+"code] e [code]add_theme_*_override[/code] forniti da questa classe."
+
 msgid "GUI documentation index"
 msgstr "Indice di documentazione GUI"
 
 msgid "Control node gallery"
 msgstr "Galleria dei nodi di controllo"
 
+msgid "Multiple resolutions"
+msgstr "Molteplici risoluzioni"
+
 msgid "All GUI Demos"
 msgstr "Tutte le demo d'interfaccia grafica"
 
@@ -25478,6 +32079,59 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Godot calls this method to pass you the [param data] from a control's [method "
+"_get_drag_data] result. Godot first calls [method _can_drop_data] to test if "
+"[param data] is allowed to drop at [param at_position] where [param "
+"at_position] is local to this control.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _can_drop_data(position, data):\n"
+"    return typeof(data) == TYPE_DICTIONARY and data.has(\"color\")\n"
+"\n"
+"func _drop_data(position, data):\n"
+"    var color = data[\"color\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override bool _CanDropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    return data.VariantType == Variant.Type.Dictionary && data."
+"AsGodotDictionary().ContainsKey(\"color\");\n"
+"}\n"
+"\n"
+"public override void _DropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    Color color = data.AsGodotDictionary()[\"color\"].AsColor();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Godot chiama questo metodo per passare [param data] dal risultato di [method "
+"_get_drag_data] di un controllo. Godot chiama prima [method _can_drop_data] "
+"per verificare se [param data] può essere rilasciato nella posizione [param "
+"at_position], dove [param at_position] è locale a questo controllo.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _can_drop_data(position, data):\n"
+"    return typeof(data) == TYPE_DICTIONARY and data.has(\"colore\")\n"
+"\n"
+"func _drop_data(position, data):\n"
+"    var colore= data[\"colore\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override bool _CanDropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    return data.VariantType == Variant.Type.Dictionary && dict."
+"AsGodotDictionary().ContainsKey(\"colore\");\n"
+"}\n"
+"\n"
+"public override void _DropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    Color colore = data.AsGodotDictionary()[\"colore\"].AsColor();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Godot calls this method to get data that can be dragged and dropped onto "
 "controls that expect drop data. Returns [code]null[/code] if there is no data "
@@ -25560,6 +32214,100 @@ msgstr ""
 "maggior parte dei nodi GUI basilari, come [Control], [Container], [Panel], "
 "ecc."
 
+msgid ""
+"Virtual method to be implemented by the user. Returns the tooltip text for "
+"the position [param at_position] in control's local coordinates, which will "
+"typically appear when the cursor is resting over this control. See [method "
+"get_tooltip].\n"
+"[b]Note:[/b] If this method returns an empty [String] and [method "
+"_make_custom_tooltip] is not overridden, no tooltip is displayed."
+msgstr ""
+"Metodo virtuale da implementare dall'utente. Restituisce il testo del tooltip "
+"per la posizione [param at_position] nelle coordinate locali del controllo, "
+"che in genere apparirà quando il cursore si trova su questo controllo. Vedi "
+"[method get_tooltip].\n"
+"[b]Nota:[/b] Se questo metodo restituisce una [String] vuota e [method "
+"_make_custom_tooltip] non è sovrascritto, non viene visualizzato alcun "
+"tooltip."
+
+msgid ""
+"Virtual method to be implemented by the user. Override this method to handle "
+"and accept inputs on UI elements. See also [method accept_event].\n"
+"[b]Example:[/b] Click on the control to print a message:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _gui_input(event):\n"
+"    if event is InputEventMouseButton:\n"
+"        if event.button_index == MOUSE_BUTTON_LEFT and event.pressed:\n"
+"            print(\"I've been clicked D:\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _GuiInput(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseButton mb)\n"
+"    {\n"
+"        if (mb.ButtonIndex == MouseButton.Left && mb.Pressed)\n"
+"        {\n"
+"            GD.Print(\"I've been clicked D:\");\n"
+"        }\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If the [param event] inherits [InputEventMouse], this method will [b]not[/b] "
+"be called when:\n"
+"- the control's [member mouse_filter] is set to [constant "
+"MOUSE_FILTER_IGNORE];\n"
+"- the control is obstructed by another control on top, that doesn't have "
+"[member mouse_filter] set to [constant MOUSE_FILTER_IGNORE];\n"
+"- the control's parent has [member mouse_filter] set to [constant "
+"MOUSE_FILTER_STOP] or has accepted the event;\n"
+"- the control's parent has [member clip_contents] enabled and the [param "
+"event]'s position is outside the parent's rectangle;\n"
+"- the [param event]'s position is outside the control (see [method "
+"_has_point]).\n"
+"[b]Note:[/b] The [param event]'s position is relative to this control's "
+"origin."
+msgstr ""
+"Metodo virtuale da implementare dall'utente. Sovrascrivi questo metodo per "
+"gestire e accettare gli input sugli elementi dell'UI. Vedi anche [method "
+"accept_event].\n"
+"[b]Esempio:[/b] Clicca sul controllo per stampare un messaggio.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _gui_input(event):\n"
+"    if event is InputEventMouseButton:\n"
+"        if event.button_index == MOUSE_BUTTON_LEFT and event.pressed:\n"
+"            print(\"Sono stato cliccato! D:\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _GuiInput(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseButton mb)\n"
+"    {\n"
+"        if (mb.ButtonIndex == MouseButton.Left && mb.Pressed)\n"
+"        {\n"
+"            GD.Print(\"Sono stato cliccato! D:\");\n"
+"        }\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Se [param event] eredita [InputEventMouse], questo metodo [b]non[/b] verrà "
+"chiamato quando:\n"
+"- il [member mouse_filter] del controllo è impostato su [constant "
+"MOUSE_FILTER_IGNORE];\n"
+"- il controllo è ostruito da un altro controllo sopra di esso, che non ha "
+"[member mouse_filter] impostato su [constant MOUSE_FILTER_IGNORE];\n"
+"- il genitore del controllo ha [member mouse_filter] impostato su [constant "
+"MOUSE_FILTER_STOP] o ha accettato l'evento;\n"
+"- il genitore del controllo ha [member clip_contents] abilitato e la "
+"posizione del [param event] è all'esterno del rettangolo del genitore;\n"
+"- la posizione di [param event] è all'esterno del controllo (vedi [method "
+"_has_point]).\n"
+"[b]Nota:[/b] La posizione di [param event] è relativa all'origine di questo "
+"controllo."
+
 msgid ""
 "Virtual method to be implemented by the user. Returns whether the given "
 "[param point] is inside this control.\n"
@@ -25575,6 +32323,128 @@ msgstr ""
 "[b]Nota:[/b] Se vuoi controllare se un punto è all'interno del controllo, "
 "puoi usare [code]Rect2(Vector2.ZERO, size).has_point(point)[/code]."
 
+msgid ""
+"Virtual method to be implemented by the user. Returns a [Control] node that "
+"should be used as a tooltip instead of the default one. [param for_text] is "
+"the return value of [method get_tooltip].\n"
+"The returned node must be of type [Control] or Control-derived. It can have "
+"child nodes of any type. It is freed when the tooltip disappears, so make "
+"sure you always provide a new instance (if you want to use a pre-existing "
+"node from your scene tree, you can duplicate it and pass the duplicated "
+"instance). When [code]null[/code] or a non-Control node is returned, the "
+"default tooltip will be used instead.\n"
+"The returned node will be added as child to a [PopupPanel], so you should "
+"only provide the contents of that panel. That [PopupPanel] can be themed "
+"using [method Theme.set_stylebox] for the type [code]\"TooltipPanel\"[/code] "
+"(see [member tooltip_text] for an example).\n"
+"[b]Note:[/b] The tooltip is shrunk to minimal size. If you want to ensure "
+"it's fully visible, you might want to set its [member custom_minimum_size] to "
+"some non-zero value.\n"
+"[b]Note:[/b] The node (and any relevant children) should have their [member "
+"CanvasItem.visible] set to [code]true[/code] when returned, otherwise, the "
+"viewport that instantiates it will not be able to calculate its minimum size "
+"reliably.\n"
+"[b]Note:[/b] If overridden, this method is called even if [method "
+"get_tooltip] returns an empty string. When this happens with the default "
+"tooltip, it is not displayed. To copy this behavior, return [code]null[/code] "
+"in this method when [param for_text] is empty.\n"
+"[b]Example:[/b] Use a constructed node as a tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var label = Label.new()\n"
+"    label.text = for_text\n"
+"    return label\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    var label = new Label();\n"
+"    label.Text = forText;\n"
+"    return label;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Example:[/b] Usa a scene instance as a tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var tooltip = preload(\"res://some_tooltip_scene.tscn\").instantiate()\n"
+"    tooltip.get_node(\"Label\").text = for_text\n"
+"    return tooltip\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    Node tooltip = ResourceLoader.Load<PackedScene>(\"res://"
+"some_tooltip_scene.tscn\").Instantiate();\n"
+"    tooltip.GetNode<Label>(\"Label\").Text = forText;\n"
+"    return tooltip;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Metodo virtuale da implementare dall'utente. Restituisce un nodo [Control] "
+"che dovrebbe essere usato come tooltip invece di quello predefinito. [param "
+"for_text] è il valore restituito da [method get_tooltip].\n"
+"Il nodo restituito deve essere di tipo [Control] o derivato da Control. Può "
+"avere nodi figlio di qualsiasi tipo. Viene liberato quando il tooltip "
+"scompare, quindi assicurati di fornire sempre una nuova istanza (se vuoi "
+"usare un nodo già esistente dal tuo albero di scene, puoi duplicarlo e "
+"passare l'istanza duplicata). Quando viene restituito [code]null[/code] o un "
+"nodo non-Control, verrà usato il tooltip predefinito.\n"
+"Il nodo restituito sarà aggiunto come figlio a un [PopupPanel], quindi "
+"dovresti fornire solo il contenuto di quel pannello. Tale [PopupPanel] può "
+"essere tematizzato tramite [method Theme.set_stylebox] per il tipo "
+"[code]\"TooltipPanel\"[/code] (vedi [member tooltip_text] per un esempio).\n"
+"[b]Nota:[/b] Il tooltip è ridotto alla dimensione minima. Se vuoi assicurarti "
+"che sia completamente visibile, potresti voler impostare il suo [member "
+"custom_minimum_size] su un valore diverso da zero.\n"
+"[b]Nota:[/b] Il nodo (e tutti i figli relativi) dovrebbero avere [member "
+"CanvasItem.visible] impostato su [code]true[/code] quando restituito, "
+"altrimenti, la viewport che lo istanzia non sarà in grado di calcolare la sue "
+"dimensioni minime in modo affidabile.\n"
+"[b]Nota:[/b] Se sovrascritto, questo metodo viene chiamato anche se [method "
+"get_tooltip] restituisce una stringa vuota. Quando ciò accade con il tooltip "
+"predefinito, esso non viene visualizzato. Per copiare questo comportamento, "
+"restituisci [code]null[/code] in questo metodo quando [param for_text] è "
+"vuoto.\n"
+"[b]Esempio:[/b] Utilizza un nodo costruito come tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var label = Label.new()\n"
+"    label.text = for_text\n"
+"    return label\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    var label = new Label();\n"
+"    label.Text = forText;\n"
+"    return label;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Esempio:[/b] Utilizza un'istanza di una scena come tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var tooltip = preload(\"res://some_tooltip_scene.tscn\").instantiate()\n"
+"    tooltip.get_node(\"Label\").text = for_text\n"
+"    return tooltip\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    Node tooltip = ResourceLoader.Load<PackedScene>(\"res://"
+"some_tooltip_scene.tscn\").Instantiate();\n"
+"    tooltip.GetNode<Label>(\"Label\").Text = forText;\n"
+"    return tooltip;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "User defined BiDi algorithm override function.\n"
 "Returns an [Array] of [Vector3i] text ranges and text base directions, in the "
@@ -25601,6 +32471,72 @@ msgstr ""
 "[b]Nota:[/b] Questo non influisce sui metodi in [Input], ma solo sul modo in "
 "cui sono propagati gli eventi."
 
+msgid ""
+"Creates a local override for a theme [Color] with the specified [param name]. "
+"Local overrides always take precedence when fetching theme items for the "
+"control. An override can be removed with [method "
+"remove_theme_color_override].\n"
+"See also [method get_theme_color].\n"
+"[b]Example:[/b] Override a [Label]'s color and reset it later:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Given the child Label node \"MyLabel\", override its font color with a "
+"custom value.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", Color(1, 0.5, 0))\n"
+"# Reset the font color of the child label.\n"
+"$MyLabel.remove_theme_color_override(\"font_color\")\n"
+"# Alternatively it can be overridden with the default value from the Label "
+"type.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", "
+"get_theme_color(\"font_color\", \"Label\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Given the child Label node \"MyLabel\", override its font color with a "
+"custom value.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", new "
+"Color(1, 0.5f, 0));\n"
+"// Reset the font color of the child label.\n"
+"GetNode<Label>(\"MyLabel\").RemoveThemeColorOverride(\"font_color\");\n"
+"// Alternatively it can be overridden with the default value from the Label "
+"type.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", "
+"GetThemeColor(\"font_color\", \"Label\"));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Crea una sostituzione locale per un [Color] di tema con il nome [param name]. "
+"Le sostituzioni locali hanno sempre la precedenza quando si recuperano "
+"elementi del tema per il controllo. Una sostituzione può essere rimossa con "
+"[method remove_theme_color_override].\n"
+"Vedi anche [method get_theme_color].\n"
+"[b]Esempio:[/b] Sostituisci il colore di un [Label] e reimpostalo in "
+"seguito:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Specificato il nodo Label \"MyLabel\" figlio, sovrascrivi il suo colore del "
+"font con un valore personalizzato.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", Color(1, 0.5, 0))\n"
+"# Reimposta il colore del font dell'etichetta figlio.\n"
+"$MyLabel.remove_theme_color_override(\"font_color\")\n"
+"# In alternativa, è possibile sovrascriverlo con il valore predefinito dal "
+"tipo Label.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", "
+"get_theme_color(\"font_color\", \"Label\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Specificato il nodo Label \"MyLabel\" figlio, sovrascrivi il suo colore "
+"del font con un valore personalizzato.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", new "
+"Color(1, 0.5f, 0));\n"
+"// Reimposta il colore del font dell'etichetta figlio.\n"
+"GetNode<Label>(\"MyLabel\").RemoveThemeColorOverride(\"font_color\");\n"
+"In alternativa, è possibile sovrascriverlo con il valore predefinito dal tipo "
+"Label.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", "
+"GetThemeColor(\"font_color\", \"Label\"));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Creates a local override for a theme constant with the specified [param "
 "name]. Local overrides always take precedence when fetching theme items for "
@@ -25653,6 +32589,79 @@ msgstr ""
 "[method remove_theme_icon_override].\n"
 "Vedi anche [method get_theme_icon]."
 
+msgid ""
+"Creates a local override for a theme [StyleBox] with the specified [param "
+"name]. Local overrides always take precedence when fetching theme items for "
+"the control. An override can be removed with [method "
+"remove_theme_stylebox_override].\n"
+"See also [method get_theme_stylebox].\n"
+"[b]Example:[/b] Modify a property in a [StyleBox] by duplicating it:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# The snippet below assumes the child node \"MyButton\" has a StyleBoxFlat "
+"assigned.\n"
+"# Resources are shared across instances, so we need to duplicate it\n"
+"# to avoid modifying the appearance of all other buttons.\n"
+"var new_stylebox_normal = $MyButton.get_theme_stylebox(\"normal\")."
+"duplicate()\n"
+"new_stylebox_normal.border_width_top = 3\n"
+"new_stylebox_normal.border_color = Color(0, 1, 0.5)\n"
+"$MyButton.add_theme_stylebox_override(\"normal\", new_stylebox_normal)\n"
+"# Remove the stylebox override.\n"
+"$MyButton.remove_theme_stylebox_override(\"normal\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// The snippet below assumes the child node \"MyButton\" has a StyleBoxFlat "
+"assigned.\n"
+"// Resources are shared across instances, so we need to duplicate it\n"
+"// to avoid modifying the appearance of all other buttons.\n"
+"StyleBoxFlat newStyleboxNormal = GetNode<Button>(\"MyButton\")."
+"GetThemeStylebox(\"normal\").Duplicate() as StyleBoxFlat;\n"
+"newStyleboxNormal.BorderWidthTop = 3;\n"
+"newStyleboxNormal.BorderColor = new Color(0, 1, 0.5f);\n"
+"GetNode<Button>(\"MyButton\").AddThemeStyleboxOverride(\"normal\", "
+"newStyleboxNormal);\n"
+"// Remove the stylebox override.\n"
+"GetNode<Button>(\"MyButton\").RemoveThemeStyleboxOverride(\"normal\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Crea una sostituzione locale per lo [StyleBox] di tema con il nome [param "
+"name]. Le sostituzioni locali hanno sempre la precedenza quando si recuperano "
+"elementi del tema per il controllo. Una sostituzione può essere rimossa con "
+"[method remove_theme_stylebox_override].\n"
+"Vedi anche [method get_theme_stylebox].\n"
+"[b]Esempio:[/b] Modifica una proprietà in uno [StyleBox] duplicandola:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Lo snippet seguente assume che al nodo figlio \"MyButton\" sia assegnato "
+"uno StyleBoxFlat.\n"
+"# Le risorse sono condivise tra le istanze, quindi dobbiamo duplicarle\n"
+"# per evitare di modificare l'aspetto di tutti gli altri pulsanti.\n"
+"var new_stylebox_normal = $MyButton.get_theme_stylebox(\"normal\")."
+"duplicate()\n"
+"new_stylebox_normal.border_width_top = 3\n"
+"new_stylebox_normal.border_color = Color(0, 1, 0.5)\n"
+"$MyButton.add_theme_stylebox_override(\"normal\", new_stylebox_normal)\n"
+"# Rimuovi la sostituzione dello stylebox.\n"
+"$MyButton.remove_theme_stylebox_override(\"normal\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Lo snippet seguente assume che al nodo figlio \"MyButton\" sia assegnato "
+"uno StyleBoxFlat.\n"
+"// Le risorse sono condivise tra le istanze, quindi dobbiamo duplicarle\n"
+"// per evitare di modificare l'aspetto di tutti gli altri pulsanti.\n"
+"StyleBoxFlat newStyleboxNormal = GetNode<Button>(\"MyButton\")."
+"GetThemeStylebox(\"normal\").Duplicate() as StyleBoxFlat;\n"
+"newStyleboxNormal.BorderWidthTop = 3;\n"
+"newStyleboxNormal.BorderColor = new Color(0, 1, 0.5f);\n"
+"GetNode<Button>(\"MyButton\").AddThemeStyleboxOverride(\"normal\", "
+"newStyleboxNormal);\n"
+"// Rimuovi la sostituzione dello stylebox.\n"
+"GetNode<Button>(\"MyButton\").RemoveThemeStyleboxOverride(\"normal\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Prevents [code]*_theme_*_override[/code] methods from emitting [constant "
 "NOTIFICATION_THEME_CHANGED] until [method end_bulk_theme_override] is called."
@@ -25806,6 +32815,30 @@ msgstr ""
 "[code]true[/code] può causare imprecisioni di arrotondamento tra il controllo "
 "visualizzato e il [Rect2] restituito."
 
+msgid ""
+"Returns the position of this [Control] in global screen coordinates (i.e. "
+"taking window position into account). Mostly useful for editor plugins.\n"
+"Equals to [member global_position] if the window is embedded (see [member "
+"Viewport.gui_embed_subwindows]).\n"
+"[b]Example:[/b] Show a popup at the mouse position:\n"
+"[codeblock]\n"
+"popup_menu.position = get_screen_position() + get_local_mouse_position()\n"
+"popup_menu.reset_size()\n"
+"popup_menu.popup()\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce la posizione di questo [Control] nelle coordinate globali dello "
+"schermo (ossia tenendo conto della posizione della finestra). Utile "
+"soprattutto per le estensioni dell'editor.\n"
+"Uguale a [member global_position] se la finestra è incorporata (vedi [member "
+"Viewport.gui_embed_subwindows]).\n"
+"[b]Esempio:[/b] Mostra un popup alla posizione del mouse:\n"
+"[codeblock]\n"
+"popup_menu.position = get_screen_position() + get_local_mouse_position()\n"
+"popup_menu.reset_size()\n"
+"popup_menu.popup()\n"
+"[/codeblock]"
+
 msgid ""
 "Returns a [Color] from the first matching [Theme] in the tree if that [Theme] "
 "has a color item with the specified [param name] and [param theme_type]. If "
@@ -25962,6 +32995,60 @@ msgstr ""
 "[param theme_type] specificati.\n"
 "Vedi [method get_theme_color] per i dettagli."
 
+msgid ""
+"Returns the tooltip text for the position [param at_position] in control's "
+"local coordinates, which will typically appear when the cursor is resting "
+"over this control. By default, it returns [member tooltip_text].\n"
+"This method can be overridden to customize its behavior. See [method "
+"_get_tooltip].\n"
+"[b]Note:[/b] If this method returns an empty [String] and [method "
+"_make_custom_tooltip] is not overridden, no tooltip is displayed."
+msgstr ""
+"Restituisce il testo del tooltip per la posizione [param at_position] nelle "
+"coordinate locali del controllo, che in genere appare quando il cursore del "
+"mouse si trova su questo controllo. Come predefinito, restituisce [member "
+"tooltip_text].\n"
+"Questo metodo può essere sovrascritto per personalizzarne il comportamento. "
+"Vedi [method _get_tooltip].\n"
+"[b]Nota:[/b] Se questo metodo restituisce una [String] vuota e [method "
+"_make_custom_tooltip] non è sovrascritto, non viene visualizzato alcun "
+"tooltip."
+
+msgid ""
+"Creates an [InputEventMouseButton] that attempts to click the control. If the "
+"event is received, the control gains focus.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    grab_click_focus() # When clicking another Control node, this node will "
+"be clicked instead.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    GrabClickFocus(); // When clicking another Control node, this node will "
+"be clicked instead.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Crea un [InputEventMouseButton] che tenta di cliccare sul controllo. Se "
+"l'evento viene ricevuto, il controllo acquisisce il focus.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    grab_click_focus() # Quando si clicca su un altro nodo Control, questo "
+"nodo verrà invece cliccato.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    GrabClickFocus(); // Quando si clicca su un altro nodo Control, questo "
+"nodo verrà invece cliccato.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Steal the focus from another control and become the focused control (see "
 "[member focus_mode]).\n"
@@ -26110,6 +33197,13 @@ msgstr ""
 "con successo. Alternativa a [method Viewport.gui_is_drag_successful].\n"
 "Meglio usata con [constant Node.NOTIFICATION_DRAG_END]."
 
+msgid ""
+"Returns [code]true[/code] if layout is right-to-left. See also [member "
+"layout_direction]."
+msgstr ""
+"Restituisce [code]true[/code] se il layout è da destra a sinistra. Vedi anche "
+"[member layout_direction]."
+
 msgid "Give up the focus. No other control will be able to receive input."
 msgstr ""
 "Rilascia il focus. Nessun altro controllo sarà in grado di ricevere input."
@@ -26597,6 +33691,15 @@ msgstr ""
 "maggiore della sua dimensione attuale, affinché il controllo sia alto almeno "
 "quanto l'altezza minima."
 
+msgid ""
+"Controls layout direction and text writing direction. Right-to-left layouts "
+"are necessary for certain languages (e.g. Arabic and Hebrew). See also "
+"[method is_layout_rtl]."
+msgstr ""
+"Controlla la direzione del layout e la direzione della scrittura del testo. I "
+"layout da destra a sinistra sono necessari per alcune lingue (ad esempio, "
+"arabo ed ebraico). Vedi anche [method is_layout_rtl]."
+
 msgid ""
 "If [code]true[/code], automatically converts code line numbers, list indices, "
 "[SpinBox] and [ProgressBar] values from the Western Arabic (0..9) to the "
@@ -26634,6 +33737,25 @@ msgstr ""
 "Controlla anche se il controllo può ricevere i segnali [signal mouse_entered] "
 "e [signal mouse_exited]. Guarda le costanti per scoprire cosa fa ciascuna."
 
+msgid ""
+"When enabled, scroll wheel events processed by [method _gui_input] will be "
+"passed to the parent control even if [member mouse_filter] is set to "
+"[constant MOUSE_FILTER_STOP].\n"
+"You should disable it on the root of your UI if you do not want scroll events "
+"to go to the [method Node._unhandled_input] processing.\n"
+"[b]Note:[/b] Because this property defaults to [code]true[/code], this allows "
+"nested scrollable containers to work out of the box."
+msgstr ""
+"Se abilitato, gli eventi della rotellina di scorrimento elaborati da [method "
+"_gui_input] saranno passati al controllo genitore anche se [member "
+"mouse_filter] è impostato su [constant MOUSE_FILTER_STOP].\n"
+"Dovresti disabilitarlo nel controllo radice della tua interfaccia utente se "
+"non vuoi che gli eventi di scorrimento vengano elaborati in [method Node."
+"_unhandled_input].\n"
+"[b]Nota:[/b] Poiché questa proprietà è predefinita su [code]true[/code], ciò "
+"consente ai contenitori scorrevoli nidificati di funzionare senza aver "
+"bisogno di modifiche."
+
 msgid ""
 "Distance between the node's bottom edge and its parent control, based on "
 "[member anchor_bottom].\n"
@@ -26876,6 +33998,78 @@ msgstr ""
 "tipo o di classe. Il tema a livello del progetto e il tema predefinito "
 "saranno verificati per ultimi."
 
+msgid ""
+"The default tooltip text. The tooltip appears when the user's mouse cursor "
+"stays idle over this control for a few moments, provided that the [member "
+"mouse_filter] property is not [constant MOUSE_FILTER_IGNORE]. The time "
+"required for the tooltip to appear can be changed with the [member "
+"ProjectSettings.gui/timers/tooltip_delay_sec] setting.\n"
+"This string is the default return value of [method get_tooltip]. Override "
+"[method _get_tooltip] to generate tooltip text dynamically. Override [method "
+"_make_custom_tooltip] to customize the tooltip interface and behavior.\n"
+"The tooltip popup will use either a default implementation, or a custom one "
+"that you can provide by overriding [method _make_custom_tooltip]. The default "
+"tooltip includes a [PopupPanel] and [Label] whose theme properties can be "
+"customized using [Theme] methods with the [code]\"TooltipPanel\"[/code] and "
+"[code]\"TooltipLabel\"[/code] respectively. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var style_box = StyleBoxFlat.new()\n"
+"style_box.set_bg_color(Color(1, 1, 0))\n"
+"style_box.set_border_width_all(2)\n"
+"# We assume here that the `theme` property has been assigned a custom Theme "
+"beforehand.\n"
+"theme.set_stylebox(\"panel\", \"TooltipPanel\", style_box)\n"
+"theme.set_color(\"font_color\", \"TooltipLabel\", Color(0, 1, 1))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var styleBox = new StyleBoxFlat();\n"
+"styleBox.SetBgColor(new Color(1, 1, 0));\n"
+"styleBox.SetBorderWidthAll(2);\n"
+"// We assume here that the `Theme` property has been assigned a custom Theme "
+"beforehand.\n"
+"Theme.SetStyleBox(\"panel\", \"TooltipPanel\", styleBox);\n"
+"Theme.SetColor(\"font_color\", \"TooltipLabel\", new Color(0, 1, 1));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Il testo predefinito del tooltip. Il tooltip appare quando il cursore del "
+"mouse rimane inattivo su questo controllo per qualche momento, a condizione "
+"che la proprietà [member mouse_filter] non sia [constant "
+"MOUSE_FILTER_IGNORE]. È possibile modificare il tempo necessario per far "
+"apparire il tooltip con l'opzione [member ProjectSettings.gui/timers/"
+"tooltip_delay_sec]. Vedi anche [method get_tooltip].\n"
+"Questa stringa è il valore di ritorno predefinito di [method get_tooltip]. "
+"Sovrascrivi [method _get_tooltip] per generare dinamicamente il testo del "
+"tooltip. Sostituisci [method _make_custom_tooltip] per personalizzare "
+"l'interfaccia e il comportamento del tooltip.\n"
+"Il popup del tooltip utilizzerà un'implementazione predefinita o una "
+"personalizzata, la quale è possibile fornire sovrascrivendo [method "
+"_make_custom_tooltip]. Il tooltip predefinito include un [PopupPanel] e un "
+"[Label], le cui proprietà del tema possono essere personalizzate attraverso i "
+"metodi di [Theme] con [code]\"TooltipPanel\"[/code] e [code]\"TooltipLabel\"[/"
+"code] rispettivamente. Ad esempio:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var style_box = StyleBoxFlat.new()\n"
+"style_box.set_bg_color(Color(1, 1, 0))\n"
+"style_box.set_border_width_all(2)\n"
+"# Qui supponiamo che alla proprietà `theme` sia stata assegnata in precedenza "
+"un tema personalizzato.\n"
+"theme.set_stylebox(\"panel\", \"TooltipPanel\", style_box)\n"
+"theme.set_color(\"font_color\", \"TooltipLabel\", Color(0, 1, 1))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var styleBox = new StyleBoxFlat();\n"
+"styleBox.SetBgColor(new Color(1, 1, 0));\n"
+"styleBox.SetBorderWidthAll(2);\n"
+"// Qui supponiamo che alla proprietà `theme` sia stata assegnata in "
+"precedenza un tema personalizzato.\n"
+"Theme.SetStyleBox(\"panel\", \"TooltipPanel\", styleBox);\n"
+"Theme.SetColor(\"font_color\", \"TooltipLabel\", new Color(0, 1, 1));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Emitted when the node gains focus."
 msgstr "Emesso quando il nodo ottiene il focus."
 
@@ -27498,6 +34692,69 @@ msgstr ""
 "usato con [constant SIZE_EXPAND] in alcuni contenitori. Da utilizzare con "
 "[member size_flags_horizontal] e [member size_flags_vertical]."
 
+msgid ""
+"The control will receive mouse movement input events and mouse button input "
+"events if clicked on through [method _gui_input]. The control will also "
+"receive the [signal mouse_entered] and [signal mouse_exited] signals. These "
+"events are automatically marked as handled, and they will not propagate "
+"further to other controls. This also results in blocking signals in other "
+"controls."
+msgstr ""
+"Il controllo riceverà eventi di input del movimento del mouse ed eventi di "
+"input del pulsante del mouse se cliccato tramite [method _gui_input]. Il "
+"controllo riceverà inoltre i segnali [signal mouse_entered] e [signal "
+"mouse_exited]. Questi eventi sono automaticamente contrassegnati come gestiti "
+"e non si propagheranno ulteriormente ad altri controlli. Ciò comporta anche "
+"al blocco dei segnali in altri controlli."
+
+msgid ""
+"The control will receive mouse movement input events and mouse button input "
+"events if clicked on through [method _gui_input]. The control will also "
+"receive the [signal mouse_entered] and [signal mouse_exited] signals.\n"
+"If this control does not handle the event, the event will propagate up to its "
+"parent control if it has one. The event is bubbled up the node hierarchy "
+"until it reaches a non-[CanvasItem], a control with [constant "
+"MOUSE_FILTER_STOP], or a [CanvasItem] with [member CanvasItem.top_level] "
+"enabled. This will allow signals to fire in all controls it reaches. If no "
+"control handled it, the event will be passed to [method Node._shortcut_input] "
+"for further processing."
+msgstr ""
+"Il controllo riceverà eventi di input del movimento del mouse ed eventi di "
+"input del pulsante del mouse se cliccato, attraverso [method _gui_input]. Il "
+"controllo riceverà inoltre i segnali [signal mouse_entered] e [signal "
+"mouse_exited].\n"
+"Se questo controllo non gestisce l'evento, l'evento verrà propagato al suo "
+"controllo genitore, se ne ha uno. L'evento viene propagato verso l'alto nella "
+"gerarchia dei nodi finché non raggiunge un nodo che non è [CanvasItem], un "
+"controllo con [constant MOUSE_FILTER_STOP] o un [CanvasItem] con [member "
+"CanvasItem.top_level] abilitato. Ciò consentirà l'invio di segnali a tutti i "
+"controlli che l'evento raggiunge. Se nessun controllo lo ha gestito, l'evento "
+"sarà passato a [method Node._shortcut_input] per un'ulteriore elaborazione."
+
+msgid ""
+"The control will not receive any mouse movement input events nor mouse button "
+"input events through [method _gui_input]. The control will also not receive "
+"the [signal mouse_entered] nor [signal mouse_exited] signals. This will not "
+"block other controls from receiving these events or firing the signals. "
+"Ignored events will not be handled automatically. If a child has [constant "
+"MOUSE_FILTER_PASS] and an event was passed to this control, the event will "
+"further propagate up to the control's parent.\n"
+"[b]Note:[/b] If the control has received [signal mouse_entered] but not "
+"[signal mouse_exited], changing the [member mouse_filter] to [constant "
+"MOUSE_FILTER_IGNORE] will cause [signal mouse_exited] to be emitted."
+msgstr ""
+"Il controllo non riceverà eventi di input del movimento del mouse ed eventi "
+"di input del pulsante del mouse se cliccato tramite [method _gui_input]. Il "
+"controllo non riceverà nemmeno i segnali [signal mouse_entered] né [signal "
+"mouse_exited]. Ciò non impedirà ad altri controlli di ricevere questi eventi "
+"o di attivare i lori segnali. Gli eventi ignorati non saranno gestiti "
+"automaticamente. Se un figlio ha [constant MOUSE_FILTER_PASS] e un evento è "
+"stato passato a questo controllo, l'evento verrà ulteriormente propagato fino "
+"al genitore del controllo .\n"
+"[b]Nota:[/b] Se il controllo ha ricevuto [signal mouse_entered] ma non "
+"[signal mouse_exited], la modifica di [member mouse_filter] in [constant "
+"MOUSE_FILTER_IGNORE] causerà l'emissione di [signal mouse_exited]."
+
 msgid ""
 "The control will grow to the left or top to make up if its minimum size is "
 "changed to be greater than its current size on the respective axis."
@@ -27557,6 +34814,12 @@ msgstr "Direzione di layout da sinistra a destra."
 msgid "Right-to-left layout direction."
 msgstr "Direzione di layout da destra a sinistra."
 
+msgid "Represents the size of the [enum LayoutDirection] enum."
+msgstr "Rappresenta la dimensione dell'enumerazione [enum LayoutDirection]."
+
+msgid "Use [constant LAYOUT_DIRECTION_APPLICATION_LOCALE] instead."
+msgstr "Utilizza invece [constant LAYOUT_DIRECTION_APPLICATION_LOCALE]."
+
 msgid "Text writing direction is the same as layout direction."
 msgstr ""
 "La direzione di scrittura del testo è la stessa della direzione del layout."
@@ -27733,6 +34996,22 @@ msgstr ""
 "Restituisce lo stato abilitato del flag di particella specificato (vedi [enum "
 "ParticleFlags] per le opzioni)."
 
+msgid ""
+"Restarts the particle emitter.\n"
+"If [param keep_seed] is [code]true[/code], the current random seed will be "
+"preserved. Useful for seeking and playback."
+msgstr ""
+"Riavvia l'emettitore di particelle.\n"
+"Se [param keep_seed] è [code]true[/code], il seed casuale attuale verrà "
+"conservato. Utile per la ricerca e la riproduzione."
+
+msgid ""
+"Sets the [Curve] of the parameter specified by [enum Parameter]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Imposta la risorsa [Curve] del parametro specificato da [enum Parameter]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid "Sets the maximum value for the given parameter."
 msgstr "Imposta il valore massimo per il parametro specificato."
 
@@ -27748,12 +35027,26 @@ msgstr ""
 msgid "Number of particles emitted in one emission cycle."
 msgstr "Numero di particelle emesse in un singolo ciclo di emissione."
 
+msgid ""
+"Each particle's rotation will be animated along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"La rotazione di ogni particella sarà animata lungo questa [Curve]. Dovrebbe "
+"essere una [Curve] unitaria."
+
 msgid "Maximum initial rotation applied to each particle, in degrees."
 msgstr "Rotazione iniziale massima applicata a ciascuna particella, in gradi."
 
 msgid "Minimum equivalent of [member angle_max]."
 msgstr "Equivalente minimo di [member angle_max]."
 
+msgid ""
+"Each particle's angular velocity will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"La velocità angolare di ciascuna particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Maximum initial angular velocity (rotation speed) applied to each particle in "
 "[i]degrees[/i] per second."
@@ -27764,6 +35057,13 @@ msgstr ""
 msgid "Minimum equivalent of [member angular_velocity_max]."
 msgstr "Equivalente minimo di [member angular_velocity_max]."
 
+msgid ""
+"Each particle's animation offset will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"L'offset dell'animazione di ogni particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Maximum animation offset that corresponds to frame index in the texture. "
 "[code]0[/code] is the first frame, [code]1[/code] is the last one. See "
@@ -27776,6 +35076,13 @@ msgstr ""
 msgid "Minimum equivalent of [member anim_offset_max]."
 msgstr "Equivalente minimo di [member anim_offset_max]."
 
+msgid ""
+"Each particle's animation speed will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"La velocità dell'animazione di ogni particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Maximum particle animation speed. Animation speed of [code]1[/code] means "
 "that the particles will make full [code]0[/code] to [code]1[/code] offset "
@@ -27802,6 +35109,25 @@ msgstr ""
 "Colore iniziale di ciascuna particella. Se [member texture] è definito, sarà "
 "moltiplicato per questo colore."
 
+msgid ""
+"Each particle's initial color will vary along this [Gradient] (multiplied "
+"with [member color])."
+msgstr ""
+"Il colore di ciascuna particella varierà lungo questo [Gradient] "
+"(moltiplicato per [member color])."
+
+msgid ""
+"Each particle's color will vary along this [Gradient] over its lifetime "
+"(multiplied with [member color])."
+msgstr ""
+"Il colore di ciascuna particella varierà lungo questo [Gradient] nel corso "
+"della sua durata (moltiplicato per [member color])."
+
+msgid "Damping will vary along this [Curve]. Should be a unit [Curve]."
+msgstr ""
+"Lo smorzamento varierà lungo questa [Curve]. Dovrebbe essere una [Curve] "
+"unitaria."
+
 msgid ""
 "The maximum rate at which particles lose velocity. For example value of "
 "[code]100[/code] means that the particle will go from [code]100[/code] "
@@ -27909,6 +35235,12 @@ msgstr ""
 msgid "Gravity applied to every particle."
 msgstr "Gravità applicata a ogni particella."
 
+msgid ""
+"Each particle's hue will vary along this [Curve]. Should be a unit [Curve]."
+msgstr ""
+"La tonalità di ogni particella varierà lungo questa [Curve]. Dovrebbe essere "
+"una [Curve] unitaria."
+
 msgid ""
 "Maximum initial hue variation applied to each particle. It will shift the "
 "particle color's hue."
@@ -27935,6 +35267,13 @@ msgstr "Quantità di tempo in cui ogni particella esisterà."
 msgid "Particle lifetime randomness ratio."
 msgstr "Rapporto di casualità della durata di vita delle particelle."
 
+msgid ""
+"Each particle's linear acceleration will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"L'accelerazione lineare di ogni particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Maximum linear acceleration applied to each particle in the direction of "
 "motion."
@@ -27968,6 +35307,13 @@ msgstr ""
 "su [code]true[/code] durante un ciclo, l'emissione si interromperà alla fine "
 "del ciclo."
 
+msgid ""
+"Each particle's orbital velocity will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"La velocità orbitale di ciascuna particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Maximum orbital velocity applied to each particle. Makes the particles circle "
 "around origin. Specified in number of full rotations around origin per second."
@@ -27987,6 +35333,13 @@ msgstr ""
 "Il sistema di particelle si avvia come se fosse già iniziato questo numero di "
 "secondi fa."
 
+msgid ""
+"Each particle's radial acceleration will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"L'accelerazione radiale di ogni particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Maximum radial acceleration applied to each particle. Makes particle "
 "accelerate away from the origin or towards it if negative."
@@ -28001,12 +35354,43 @@ msgstr "Equivalente minimo di [member radial_accel_max]."
 msgid "Emission lifetime randomness ratio."
 msgstr "Rapporto di casualità del tempo di vita dell'emissione."
 
+msgid ""
+"Each particle's scale will vary along this [Curve]. Should be a unit [Curve]."
+msgstr ""
+"La scala di ciascuna particella varierà lungo questa [Curve]. Dovrebbe essere "
+"una [Curve] unitaria."
+
 msgid "Maximum initial scale applied to each particle."
 msgstr "Scala iniziale massima applicata a ciascuna particella."
 
 msgid "Minimum equivalent of [member scale_amount_max]."
 msgstr "Equivalente minimo di [member scale_amount_max]."
 
+msgid ""
+"Each particle's horizontal scale will vary along this [Curve]. Should be a "
+"unit [Curve].\n"
+"[member split_scale] must be enabled."
+msgstr ""
+"La scala orizzontale di ciascuna particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria.\n"
+"[member split_scale] deve essere abilitato."
+
+msgid ""
+"Each particle's vertical scale will vary along this [Curve]. Should be a unit "
+"[Curve].\n"
+"[member split_scale] must be enabled."
+msgstr ""
+"La scala verticale di ciascuna particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria.\n"
+"[member split_scale] deve essere abilitato."
+
+msgid ""
+"Sets the random seed used by the particle system. Only effective if [member "
+"use_fixed_seed] is [code]true[/code]."
+msgstr ""
+"Imposta il seed casuale utilizzato dal sistema di particelle. Efficace solo "
+"se [member use_fixed_seed] è [code]true[/code]."
+
 msgid ""
 "Particle system's running speed scaling ratio. A value of [code]0[/code] can "
 "be used to pause the particles."
@@ -28028,6 +35412,13 @@ msgstr ""
 "La direzione iniziale di ciascuna particella varia da [code]+spread[/code] a "
 "[code]-spread[/code] (in gradi)."
 
+msgid ""
+"Each particle's tangential acceleration will vary along this [Curve]. Should "
+"be a unit [Curve]."
+msgstr ""
+"L'accelerazione tangenziale di ogni particella varierà lungo questa [Curve]. "
+"Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Maximum tangential acceleration applied to each particle. Tangential "
 "acceleration is perpendicular to the particle's velocity giving the particles "
@@ -28251,6 +35642,13 @@ msgstr "Angolo massimo."
 msgid "Minimum angle."
 msgstr "Angolo minimo."
 
+msgid ""
+"Each particle's angular velocity (rotation speed) will vary along this "
+"[Curve] over its lifetime. Should be a unit [Curve]."
+msgstr ""
+"La velocità angolare di ogni particella (velocità di rotazione) varierà lungo "
+"questa [Curve] per tutta la sua durata. Dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Minimum initial angular velocity (rotation speed) applied to each particle in "
 "[i]degrees[/i] per second."
@@ -28287,6 +35685,45 @@ msgstr ""
 "essere inserito nella funzione [code]fragment()[/code] dello shader. "
 "Altrimenti, [member color] non avrà alcun effetto visibile."
 
+msgid ""
+"Each particle's initial color will vary along this [Gradient] (multiplied "
+"with [member color]).\n"
+"[b]Note:[/b] [member color_initial_ramp] multiplies the particle mesh's "
+"vertex colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"color_initial_ramp] will have no visible effect."
+msgstr ""
+"Il colore iniziale di ogni particella varierà lungo questo [Gradient] "
+"(moltiplicato per [member color]).\n"
+"[b]Nota:[/b] [member color_initial_ramp] moltiplica i colori dei vertici "
+"della mesh di particelle. Per avere un effetto visibile su un "
+"[BaseMaterial3D], [member BaseMaterial3D.vertex_color_use_as_albedo] [i]deve[/"
+"i] essere [code]true[/code]. Per uno [ShaderMaterial], [code]ALBEDO *= COLOR."
+"rgb;[/code] deve essere inserito nella funzione [code]fragment()[/code] dello "
+"shader. Altrimenti, [member color_initial_ramp] non avrà alcun effetto "
+"visibile."
+
+msgid ""
+"Each particle's color will vary along this [Gradient] over its lifetime "
+"(multiplied with [member color]).\n"
+"[b]Note:[/b] [member color_ramp] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member color_ramp] "
+"will have no visible effect."
+msgstr ""
+"Il colore di ogni particella varierà lungo questa [Gradient] per tutta la sua "
+"durata (moltiplicato per [member color]).\n"
+"[b]Nota:[/b] [member color_ramp] moltiplica i colori dei vertici della mesh "
+"di particelle. Per avere un effetto visibile su un [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]deve[/i] essere [code]true[/"
+"code]. Per uno [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] deve "
+"essere inserito nella funzione [code]fragment()[/code] dello shader. "
+"Altrimenti, [member color_ramp] non avrà alcun effetto visibile."
+
 msgid "Maximum damping."
 msgstr "Smorzamento massimo."
 
@@ -28954,9 +36391,63 @@ msgstr ""
 msgid "A CSG Mesh shape that uses a mesh resource."
 msgstr "Una forma di mesh CSG che utilizza una risorsa mesh."
 
+msgid ""
+"This CSG node allows you to use any mesh resource as a CSG shape, provided it "
+"is [i]manifold[/i]. A manifold shape is closed, does not self-intersect, does "
+"not contain internal faces and has no edges that connect to more than two "
+"faces. See also [CSGPolygon3D] for drawing 2D extruded polygons to be used as "
+"CSG nodes.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Questo nodo CSG consente di utilizzare qualsiasi risorsa mesh come forma CSG, "
+"purché sia [i]manifold[/i].\n"
+"Una forma manifold è chiusa, non si interseca, non contiene facce interne e "
+"non ha bordi che si collegano a più di due facce. Vedi anche [CSGPolygon3D] "
+"per disegnare poligoni estrusi 2D da utilizzare come nodi CSG.\n"
+"[b]Nota:[/b] I nodi CSG sono progettati per la prototipazione di livelli. La "
+"creazione di nodi CSG ha un costo notevole sulla CPU rispetto alla creazione "
+"di un [MeshInstance3D] con un [PrimitiveMesh]. Anche spostare un nodo CSG "
+"all'interno di un altro nodo CSG ha un costo notevole sulla CPU, quindi "
+"dovrebbe essere evitato durante il gioco."
+
 msgid "The [Material] used in drawing the CSG shape."
 msgstr "Il [Material] utilizzato per disegnare la forma CSG."
 
+msgid ""
+"The [Mesh] resource to use as a CSG shape.\n"
+"[b]Note:[/b] Some [Mesh] types such as [PlaneMesh], [PointMesh], [QuadMesh], "
+"and [RibbonTrailMesh] are excluded from the type hint for this property, as "
+"these primitives are non-[i]manifold[/i] and thus not compatible with the CSG "
+"algorithm.\n"
+"[b]Note:[/b] When using an [ArrayMesh], all vertex attributes except "
+"[constant Mesh.ARRAY_VERTEX], [constant Mesh.ARRAY_NORMAL] and [constant Mesh."
+"ARRAY_TEX_UV] are left unused. Only [constant Mesh.ARRAY_VERTEX] and "
+"[constant Mesh.ARRAY_TEX_UV] will be passed to the GPU.\n"
+"[constant Mesh.ARRAY_NORMAL] is only used to determine which faces require "
+"the use of flat shading. By default, CSGMesh will ignore the mesh's vertex "
+"normals, recalculate them for each vertex and use a smooth shader. If a flat "
+"shader is required for a face, ensure that all vertex normals of the face are "
+"approximately equal."
+msgstr ""
+"La risorsa [Mesh] da usare come forma CSG.\n"
+"[b]Nota:[/b] Alcuni tipi di [Mesh] come [PlaneMesh], [PointMesh], [QuadMesh] "
+"e [RibbonTrailMesh] sono esclusi dall'indicazione del tipo per questa "
+"proprietà, poiché queste primitive sono non-[i]manifold[/i] e quindi non "
+"compatibili con l'algoritmo CSG.\n"
+"[b]Nota:[/b] Quando si usa un [ArrayMesh], tutti gli attributi dei vertici "
+"tranne [constant Mesh.ARRAY_VERTEX], [constant Mesh.ARRAY_NORMAL] e [constant "
+"Mesh.ARRAY_TEX_UV] non sono utilizzati. Solo [constant Mesh.ARRAY_VERTEX] e "
+"[constant Mesh.ARRAY_TEX_UV] saranno passati alla GPU.\n"
+"[constant Mesh.ARRAY_NORMAL] è usato solo per determinare quali facce "
+"richiedono l'uso di ombreggiatura piatta. Come predefinito, CSGMesh ignorerà "
+"le normali dei vertici della mesh, le ricalcolerà per ogni vertice e userà "
+"uno shader omogeneo. Se è necessario uno shader piatto per una faccia, "
+"assicurarsi che tutte le normali dei vertici della faccia siano "
+"approssimativamente uguali."
+
 msgid "Extrudes a 2D polygon shape to create a 3D mesh."
 msgstr "Estrude una forma poligonale 2D per creare una mesh 3D."
 
@@ -29180,6 +36671,13 @@ msgstr ""
 "all'interno di un altro nodo CSG ha un costo notevole sulla CPU, quindi "
 "dovrebbe essere evitato durante il gioco."
 
+msgid ""
+"If set, the order of the vertices in each triangle are reversed resulting in "
+"the backside of the mesh being drawn."
+msgstr ""
+"Se impostato, l'ordine dei vertici in ciascun triangolo è invertito, "
+"risultando nel retro della mesh a essere disegnato."
+
 msgid "The CSG base class."
 msgstr "La classe di base CSG."
 
@@ -29264,6 +36762,9 @@ msgstr ""
 "figlio CSG poiché l'operazione avviene tra questo nodo e il figlio precedente "
 "del genitore di questo nodo."
 
+msgid "This property does nothing."
+msgstr "Questa proprietà non fa nulla."
+
 msgid ""
 "Adds a collision shape to the physics engine for our CSG shape. This will "
 "always act like a static body. Note that the collision shape is still active "
@@ -29401,6 +36902,82 @@ msgid "An array of [Cubemap]s, stored together and with a single reference."
 msgstr ""
 "Un array di [Cubemap], memorizzati insieme e con un singolo riferimento."
 
+msgid ""
+"[CubemapArray]s are made of an array of [Cubemap]s. Like [Cubemap]s, they are "
+"made of multiple textures, the amount of which must be divisible by 6 (one "
+"for each face of the cube).\n"
+"The primary benefit of [CubemapArray]s is that they can be accessed in shader "
+"code using a single texture reference. In other words, you can pass multiple "
+"[Cubemap]s into a shader using a single [CubemapArray]. [Cubemap]s are "
+"allocated in adjacent cache regions on the GPU, which makes [CubemapArray]s "
+"the most efficient way to store multiple [Cubemap]s.\n"
+"Godot uses [CubemapArray]s internally for many effects, including the [Sky] "
+"if you set [member ProjectSettings.rendering/reflections/sky_reflections/"
+"texture_array_reflections] to [code]true[/code].\n"
+"To create such a texture file yourself, reimport your image files using the "
+"Godot Editor import presets. To create a CubemapArray from code, use [method "
+"ImageTextureLayered.create_from_images] on an instance of the CubemapArray "
+"class.\n"
+"The expected image order is X+, X-, Y+, Y-, Z+, Z- (in Godot's coordinate "
+"system, so Y+ is \"up\" and Z- is \"forward\"). You can use one of the "
+"following templates as a base:\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]2×3 cubemap template "
+"(default layout option)[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]3×2 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]1×6 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]6×1 cubemap template[/"
+"url]\n"
+"Multiple layers are stacked on top of each other when using the default "
+"vertical import option (with the first layer at the top). Alternatively, you "
+"can choose an horizontal layout in the import options (with the first layer "
+"at the left).\n"
+"[b]Note:[/b] [CubemapArray] is not supported in the Compatibility renderer "
+"due to graphics API limitations."
+msgstr ""
+"I [CubemapArray] sono composti da un array di [Cubemap]. Come i [Cubemap], "
+"sono composti da più texture, la cui quantità deve essere divisibile per 6 "
+"(una per ogni faccia del cubo).\n"
+"Il vantaggio principale dei [CubemapArray] è che è possibile accedervi nel "
+"codice di uno shader attraverso un singolo riferimento di texture. In altre "
+"parole, è possibile passare più [Cubemap] in uno shader attraverso un singolo "
+"[CubemapArray]. I [Cubemap] sono allocati in regioni di cache adiacenti sulla "
+"GPU, il che rende i [CubemapArray] il modo più efficiente per memorizzare più "
+"[Cubemap].\n"
+"Godot utilizza i [CubemapArray] internamente per molti effetti, incluso lo "
+"[Sky] se [member ProjectSettings.rendering/reflections/sky_reflections/"
+"texture_array_reflections] è impostato su [code]true[/code].\n"
+"Per creare manualmente un file texture di questo tipo, reimporta i file "
+"immagine utilizzando i preset di importazione del pannello File System.\n"
+"Per creare un CubemapArray da codice, usa [method ImageTextureLayered."
+"create_from_images] su un'istanza della classe CubemapArray.\n"
+"L'ordine previsto delle immagini è X+, X-, Y+, Y-, Z+, Z- (nel sistema di "
+"coordinate di Godot, quindi Y+ è \"su\" e Z- è \"avanti\"). Puoi usare uno "
+"dei seguenti modelli come base:\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]Modello di cubemap "
+"2×3 (opzione di layout predefinita)[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]Modello di cubemap "
+"3×2[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]Modello di cubemap "
+"1×6[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]Modello di cubemap "
+"6×1[/url]\n"
+"Più livelli sono impilati uno sopra l'altro quando si utilizza l'opzione di "
+"importazione verticale predefinita (con il primo livello in alto). "
+"Alternativamente, puoi scegliere un layout orizzontale nelle opzioni di "
+"importazione (con il primo livello a sinistra).\n"
+"[b]Nota:[/b] [CubemapArray] non è supportato nel renderer di Compatibilità a "
+"causa di limitazioni dell'API grafica."
+
 msgid ""
 "Creates a placeholder version of this resource ([PlaceholderCubemapArray])."
 msgstr ""
@@ -29409,6 +36986,24 @@ msgstr ""
 msgid "A mathematical curve."
 msgstr "Una curva matematica."
 
+msgid ""
+"This resource describes a mathematical curve by defining a set of points and "
+"tangents at each point. By default, it ranges between [code]0[/code] and "
+"[code]1[/code] on the X and Y axes, but these ranges can be changed.\n"
+"Please note that many resources and nodes assume they are given [i]unit "
+"curves[/i]. A unit curve is a curve whose domain (the X axis) is between "
+"[code]0[/code] and [code]1[/code]. Some examples of unit curve usage are "
+"[member CPUParticles2D.angle_curve] and [member Line2D.width_curve]."
+msgstr ""
+"Questa risorsa descrive una curva matematica definendo una serie di punti e "
+"tangenti in ogni punto. Come predefinito, varia tra [code]0[/code] e [code]1[/"
+"code] sugli assi X e Y, ma è possibile cambiare questi intervalli.\n"
+"Si noti che molte risorse e nodi presumono di avere [i]curve unitarie[/i]. "
+"Una curva unitaria è una curva il cui dominio (l'asse X) è compreso tra "
+"[code]0[/code] e [code]1[/code]. Alcuni esempi di utilizzo di una curva "
+"unitaria sono [member CPUParticles2D.angle_curve] e [member Line2D."
+"width_curve]."
+
 msgid ""
 "Adds a point to the curve. For each side, if the [code]*_mode[/code] is "
 "[constant TANGENT_LINEAR], the [code]*_tangent[/code] angle (in degrees) uses "
@@ -29462,6 +37057,10 @@ msgstr ""
 "Restituisce l'angolo tangente destro (in gradi) per il punto all'indice "
 "[param index]."
 
+msgid ""
+"Returns the difference between [member min_value] and [member max_value]."
+msgstr "Restituisce la differenza tra [member min_value] e [member max_value]."
+
 msgid "Removes the point at [param index] from the curve."
 msgstr "Rimuove il punto all'indice [param index] dalla curva."
 
@@ -29520,9 +37119,19 @@ msgstr ""
 "Il numero di punti da includere nei dati della curva precalcolati (ovvero "
 "memorizzati nella cache)."
 
+msgid "The maximum domain (x-coordinate) that points can have."
+msgstr "Il dominio massimo (la coordinata x) che i punti possono avere."
+
+msgid "The minimum domain (x-coordinate) that points can have."
+msgstr "Il dominio minimo (la coordinata x) che i punti possono avere."
+
 msgid "The number of points describing the curve."
 msgstr "Il numero di punti che descrivono la curva."
 
+msgid "Emitted when [member max_domain] or [member min_domain] is changed."
+msgstr ""
+"Emesso quando [member max_domain] o [member min_domain] vengono modificati."
+
 msgid "Emitted when [member max_value] or [member min_value] is changed."
 msgstr "Emesso quando [member max_value] o [member min_value] viene modificato."
 
@@ -29640,6 +37249,25 @@ msgstr ""
 "Elimina il punto all'indice [param idx] dalla curva. Invia un errore alla "
 "console se [param idx] è fuori dai limiti."
 
+msgid ""
+"Returns the position between the vertex [param idx] and the vertex [code]idx "
+"+ 1[/code], where [param t] controls if the point is the first vertex "
+"([code]t = 0.0[/code]), the last vertex ([code]t = 1.0[/code]), or in "
+"between. Values of [param t] outside the range ([code]0.0 <= t <= 1.0[/code]) "
+"give strange, but predictable results.\n"
+"If [param idx] is out of bounds it is truncated to the first or last vertex, "
+"and [param t] is ignored. If the curve has no points, the function sends an "
+"error to the console, and returns [code](0, 0)[/code]."
+msgstr ""
+"Restituisce la posizione tra il vertice [param idx] e il vertice [code]idx + "
+"1[/code], dove [param t] controlla se il punto è il primo vertice ([code]t = "
+"0.0[/code]), l'ultimo vertice ([code]t = 1.0[/code]) o intermedio. I valori "
+"di [param t] al di fuori dell'intervallo ([code]0,0 >= t <=1[/code]) danno "
+"risultati strani, ma prevedibili.\n"
+"Se [param idx] è fuori dai limiti, viene troncato al primo o all'ultimo "
+"vertice e [param t] viene ignorato. Se la curva non ha punti, la funzione "
+"invia un errore alla console e restituisce [code](0, 0)[/code]."
+
 msgid ""
 "Returns a point within the curve at position [param offset], where [param "
 "offset] is measured as a pixel distance along the curve.\n"
@@ -29958,6 +37586,13 @@ msgstr ""
 "Minore è la distanza, più punti ci saranno nella cache e più memoria "
 "consumerà, quindi usala con cautela."
 
+msgid ""
+"If [code]true[/code], and the curve has more than 2 control points, the last "
+"point and the first one will be connected in a loop."
+msgstr ""
+"Se [code]true[/code] e la curva ha più di 2 punti di controllo, l'ultimo "
+"punto e il primo saranno collegati in un ciclo."
+
 msgid ""
 "If [code]true[/code], the curve will bake up vectors used for orientation. "
 "This is used when [member PathFollow3D.rotation_mode] is set to [constant "
@@ -29974,6 +37609,27 @@ msgstr ""
 "Una texture 1D in cui la luminosità dei pixel corrisponde ai punti su una "
 "curva."
 
+msgid ""
+"A 1D texture where pixel brightness corresponds to points on a unit [Curve] "
+"resource, either in grayscale or in red. This visual representation "
+"simplifies the task of saving curves as image files.\n"
+"If you need to store up to 3 curves within a single texture, use "
+"[CurveXYZTexture] instead. See also [GradientTexture1D] and "
+"[GradientTexture2D]."
+msgstr ""
+"Una texture 1D in cui la luminosità dei pixel corrisponde ai punti su una "
+"risorsa [Curve] unitaria, in scala di grigi o in rosso. Questa "
+"rappresentazione visiva semplifica il compito di salvare le curve come file "
+"immagine.\n"
+"Se hai bisogno di memorizzare fino a 3 curve in una singola texture, usa "
+"invece [CurveXYZTexture]. Vedi anche [GradientTexture1D] e "
+"[GradientTexture2D]."
+
+msgid "The [Curve] that is rendered onto the texture. Should be a unit [Curve]."
+msgstr ""
+"La [Curve] che è renderizzata sulla texture. Dovrebbe essere una [Curve] "
+"unitaria."
+
 msgid ""
 "The format the texture should be generated with. When passing a CurveTexture "
 "as an input to a [Shader], this may need to be adjusted."
@@ -30015,6 +37671,43 @@ msgstr ""
 "Una texture 1D in cui i canali di colore rosso, verde e blu corrispondono a "
 "punti su 3 curve."
 
+msgid ""
+"A 1D texture where the red, green, and blue color channels correspond to "
+"points on 3 unit [Curve] resources. Compared to using separate "
+"[CurveTexture]s, this further simplifies the task of saving curves as image "
+"files.\n"
+"If you only need to store one curve within a single texture, use "
+"[CurveTexture] instead. See also [GradientTexture1D] and [GradientTexture2D]."
+msgstr ""
+"Una texture 1D in cui i canali di colore rosso, verde e blu corrispondono a "
+"punti su 3 risorse [Curve] unitarie. In confronto all'utilizzo di "
+"[CurveTexture] separate, ciò semplifica ulteriormente il compito di salvare "
+"le curve come file immagine.\n"
+"Se hai bisogno di memorizzare solo una curva all'interno di una singola "
+"texture, utilizza invece [CurveTexture]. Vedi anche [GradientTexture1D] e "
+"[GradientTexture2D]."
+
+msgid ""
+"The [Curve] that is rendered onto the texture's red channel. Should be a unit "
+"[Curve]."
+msgstr ""
+"La [Curve] che è renderizzata sul canale rosso della texture. Dovrebbe essere "
+"una [Curve] unitaria."
+
+msgid ""
+"The [Curve] that is rendered onto the texture's green channel. Should be a "
+"unit [Curve]."
+msgstr ""
+"La [Curve] che è renderizzata sul canale verde della texture. Dovrebbe essere "
+"una [Curve] unitaria."
+
+msgid ""
+"The [Curve] that is rendered onto the texture's blue channel. Should be a "
+"unit [Curve]."
+msgstr ""
+"La [Curve] che è renderizzata sul canale blu della texture. Dovrebbe essere "
+"una [Curve] unitaria."
+
 msgid "Class representing a cylindrical [PrimitiveMesh]."
 msgstr "Classe rappresentante una [PrimitiveMesh] cilindrica."
 
@@ -30908,6 +38601,15 @@ msgstr ""
 "Restituisce lo stesso dizionario di [param from]. Se hai bisogno di una copia "
 "del dizionario, usa [method duplicate]."
 
+msgid ""
+"Assigns elements of another [param dictionary] into the dictionary. Resizes "
+"the dictionary to match [param dictionary]. Performs type conversions if the "
+"dictionary is typed."
+msgstr ""
+"Assegna elementi di un altro [param dictionary] in questo dizionario. "
+"Ridimensiona il dizionario per corrispondere a [param dictionary]. Esegue le "
+"conversioni di tipo se il dizionario è tipizzato."
+
 msgid "Clears the dictionary, removing all entries from it."
 msgstr "Pulisce il dizionario, rimuovendo tutte le voci da esso."
 
@@ -30962,6 +38664,129 @@ msgstr ""
 "key] esiste nel dizionario, si comporta come [method get]. Altrimenti, il "
 "valore [param default] viene inserito nel dizionario e restituito."
 
+msgid ""
+"Returns the built-in [Variant] type of the typed dictionary's keys as a [enum "
+"Variant.Type] constant. If the keys are not typed, returns [constant "
+"TYPE_NIL]. See also [method is_typed_key]."
+msgstr ""
+"Restituisce il tipo di [Variant] integrato delle chiavi del dizionario "
+"tipizzato come constante di [enum Variant.Type]. Se le chiavi non sono "
+"tipizzate, restituisce [constant TYPE_NIL]. Vedi anche [method is_typed_key]."
+
+msgid ""
+"Returns the [b]built-in[/b] class name of the typed dictionary's keys, if the "
+"built-in [Variant] type is [constant TYPE_OBJECT]. Otherwise, returns an "
+"empty [StringName]. See also [method is_typed_key] and [method Object."
+"get_class]."
+msgstr ""
+"Restituisce il nome della classe [b]integrata[/b] delle chiavi del dizionario "
+"tipizzato, se il tipo di [Variant] incorporato è [constant TYPE_OBJECT]. "
+"Altrimenti, restituisce un [StringName] vuoto. Vedi anche [method "
+"is_typed_key] e [method Object.get_class]."
+
+msgid ""
+"Returns the [Script] instance associated with this typed dictionary's keys, "
+"or [code]null[/code] if it does not exist. See also [method is_typed_key]."
+msgstr ""
+"Restituisce l'istanza di [Script] associata alle chiavi di questo dizionario "
+"tipizzato, o [code]null[/code] se non esiste. Vedi anche [method is_typed]."
+
+msgid ""
+"Returns the built-in [Variant] type of the typed dictionary's values as a "
+"[enum Variant.Type] constant. If the values are not typed, returns [constant "
+"TYPE_NIL]. See also [method is_typed_value]."
+msgstr ""
+"Restituisce il tipo di [Variant] integrato dei valori del dizionario "
+"tipizzato come constante di [enum Variant.Type]. Se i valori non sono "
+"tipizzati, restituisce [constant TYPE_NIL]. Vedi anche [method "
+"is_typed_value]."
+
+msgid ""
+"Returns the [b]built-in[/b] class name of the typed dictionary's values, if "
+"the built-in [Variant] type is [constant TYPE_OBJECT]. Otherwise, returns an "
+"empty [StringName]. See also [method is_typed_value] and [method Object."
+"get_class]."
+msgstr ""
+"Restituisce il nome della classe [b]integrata[/b] dei valori del dizionario "
+"tipizzato, se il tipo di [Variant] integrato è [constant TYPE_OBJECT]. "
+"Altrimenti, restituisce un [StringName] vuoto. Vedi anche [method "
+"is_typed_value] e [method Object.get_class]."
+
+msgid ""
+"Returns the [Script] instance associated with this typed dictionary's values, "
+"or [code]null[/code] if it does not exist. See also [method is_typed_value]."
+msgstr ""
+"Restituisce l'istanza di [Script] associata ai valori di questo dizionario "
+"tipizzato, o [code]null[/code] se non esiste. Vedi anche [method "
+"is_typed_value]."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary contains an entry with the given "
+"[param key].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {\n"
+"    \"Godot\" : 4,\n"
+"    210 : null,\n"
+"}\n"
+"\n"
+"print(my_dict.has(\"Godot\")) # Prints true\n"
+"print(my_dict.has(210))     # Prints true\n"
+"print(my_dict.has(4))       # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    { \"Godot\", 4 },\n"
+"    { 210, default },\n"
+"};\n"
+"\n"
+"GD.Print(myDict.ContainsKey(\"Godot\")); // Prints True\n"
+"GD.Print(myDict.ContainsKey(210));     // Prints True\n"
+"GD.Print(myDict.ContainsKey(4));       // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, this is equivalent to the [code]in[/code] operator:\n"
+"[codeblock]\n"
+"if \"Godot\" in {\"Godot\": 4}:\n"
+"    print(\"The key is here!\") # Will be printed.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This method returns [code]true[/code] as long as the [param key] "
+"exists, even if its corresponding value is [code]null[/code]."
+msgstr ""
+"Restituisce [code]true[/code] se il dizionario contiene una voce con la "
+"[param key] specificata.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {\n"
+"    \"Godot\" : 4,\n"
+"    210 : null,\n"
+"}\n"
+"\n"
+"print(my_dict.has(\"Godot\")) # Stampa true\n"
+"print(my_dict.has(210))     # Stampa true\n"
+"print(my_dict.has(4))       # Stampa false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    { \"Godot\", 4 },\n"
+"    { 210, default },\n"
+"};\n"
+"\n"
+"GD.Print(myDict.ContainsKey(\"Godot\")); // Stampa True\n"
+"GD.Print(myDict.ContainsKey(210));     // Stampa True\n"
+"GD.Print(myDict.ContainsKey(4));       // Stampa False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, questo è equivalente all'operatore [code]in[/code]:\n"
+"[codeblock]\n"
+"if \"Godot\" in {\"Godot\": 4}:\n"
+"    print(\"La chiave è qui!\") # Verrà stampato.\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Questo metodo restituisce [code]true[/code] finché esiste la "
+"chiave [param key], anche se il suo valore corrispondente è [code]null[/code]."
+
 msgid ""
 "Returns [code]true[/code] if the dictionary contains all keys in the given "
 "[param keys] array.\n"
@@ -30977,6 +38802,53 @@ msgstr ""
 "data.has_all([\"altezza\", \"larghezza\"]) # Restituisce true\n"
 "[/codeblock]"
 
+msgid ""
+"Returns a hashed 32-bit integer value representing the dictionary contents.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var dict1 = {\"A\": 10, \"B\": 2}\n"
+"var dict2 = {\"A\": 10, \"B\": 2}\n"
+"\n"
+"print(dict1.hash() == dict2.hash()) # Prints true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var dict1 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"var dict2 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"\n"
+"// Godot.Collections.Dictionary has no Hash() method. Use GD.Hash() instead.\n"
+"GD.Print(GD.Hash(dict1) == GD.Hash(dict2)); // Prints True\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Dictionaries with the same entries but in a different order will "
+"not have the same hash.\n"
+"[b]Note:[/b] Dictionaries with equal hash values are [i]not[/i] guaranteed to "
+"be the same, because of hash collisions. On the contrary, dictionaries with "
+"different hash values are guaranteed to be different."
+msgstr ""
+"Restituisce un valore intero hash a 32 bit che rappresenta il contenuto del "
+"dizionario.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var dict1 = {\"A\": 10, \"B\": 2}\n"
+"var dict2 = {\"A\": 10, \"B\": 2}\n"
+"\n"
+"print(dict1.hash() == dict2.hash()) # Stampa true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var dict1 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"var dict2 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"\n"
+"// Godot.Collections.Dictionary non ha un metodo Hash(). Usa invece GD."
+"Hash().\n"
+"GD.Print(GD.Hash(dict1) == GD.Hash(dict2)); // Stampa true\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] I dizionari con le stesse voci ma in un ordine diverso non "
+"avranno lo stesso hash.\n"
+"[b]Nota:[/b] I dizionari con valori hash uguali [i]non[/i] sono garantiti di "
+"essere uguali, a causa delle collisioni di hash. Al contrario, i dizionari "
+"con valori hash diversi sono garantiti come diversi."
+
 msgid ""
 "Returns [code]true[/code] if the dictionary is empty (its size is [code]0[/"
 "code]). See also [method size]."
@@ -30993,6 +38865,46 @@ msgstr ""
 "[method make_read_only]. I dizionari sono automaticamente di sola lettura se "
 "dichiarati con la parola chiave [code]const[/code]."
 
+msgid ""
+"Returns [code]true[/code] if the dictionary is typed the same as [param "
+"dictionary]."
+msgstr ""
+"Restituisce [code]true[/code] se il dizionario è tipizzato nello stesso modo "
+"di [param dictionary]."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary's keys are typed the same as "
+"[param dictionary]'s keys."
+msgstr ""
+"Restituisce [code]true[/code] se le chiavi del dizionario sono tipizzate "
+"nello stesso modo delle chiavi di [param dictionary]."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary's values are typed the same as "
+"[param dictionary]'s values."
+msgstr ""
+"Restituisce [code]true[/code] se i valori del dizionario sono tipizzati nello "
+"stesso modo dei valori di [param dictionary]."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary is typed. Typed dictionaries can "
+"only store keys/values of their associated type and provide type safety for "
+"the [code][][/code] operator. Methods of typed dictionary still return "
+"[Variant]."
+msgstr ""
+"Restituisce [code]true[/code] se il dizionario è tipizzato. I dizionari "
+"tipizzati possono memorizzare solo chiavi/valori del tipo associato e fornire "
+"sicurezza di tipo per l'operatore [code][][/code]. I metodi del dizionario "
+"tipizzato restituiscono comunque [Variant]."
+
+msgid "Returns [code]true[/code] if the dictionary's keys are typed."
+msgstr ""
+"Restituisce [code]true[/code] se le chiavi del dizionario sono tipizzate."
+
+msgid "Returns [code]true[/code] if the dictionary's values are typed."
+msgstr ""
+"Restituisce [code]true[/code] se i valori del dizionario sono tipizzati."
+
 msgid "Returns the list of keys in the dictionary."
 msgstr "Restituisce la lista delle chiavi nel dizionario."
 
@@ -31183,6 +39095,147 @@ msgstr ""
 msgid "Provides methods for managing directories and their content."
 msgstr "Fornisce metodi per gestire le cartelle e il loro contenuto."
 
+msgid ""
+"This class is used to manage directories and their content, even outside of "
+"the project folder.\n"
+"[DirAccess] can't be instantiated directly. Instead it is created with a "
+"static method that takes a path for which it will be opened.\n"
+"Most of the methods have a static alternative that can be used without "
+"creating a [DirAccess]. Static methods only support absolute paths (including "
+"[code]res://[/code] and [code]user://[/code]).\n"
+"[codeblock]\n"
+"# Standard\n"
+"var dir = DirAccess.open(\"user://levels\")\n"
+"dir.make_dir(\"world1\")\n"
+"# Static\n"
+"DirAccess.make_dir_absolute(\"user://levels/world1\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Accessing project (\"res://\") directories once exported may "
+"behave unexpectedly as some files are converted to engine-specific formats "
+"and their original source files may not be present in the expected PCK "
+"package. Because of this, to access resources in an exported project, it is "
+"recommended to use [ResourceLoader] instead of [FileAccess].\n"
+"Here is an example on how to iterate through the files of a directory:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func dir_contents(path):\n"
+"    var dir = DirAccess.open(path)\n"
+"    if dir:\n"
+"        dir.list_dir_begin()\n"
+"        var file_name = dir.get_next()\n"
+"        while file_name != \"\":\n"
+"            if dir.current_is_dir():\n"
+"                print(\"Found directory: \" + file_name)\n"
+"            else:\n"
+"                print(\"Found file: \" + file_name)\n"
+"            file_name = dir.get_next()\n"
+"    else:\n"
+"        print(\"An error occurred when trying to access the path.\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public void DirContents(string path)\n"
+"{\n"
+"    using var dir = DirAccess.Open(path);\n"
+"    if (dir != null)\n"
+"    {\n"
+"        dir.ListDirBegin();\n"
+"        string fileName = dir.GetNext();\n"
+"        while (fileName != \"\")\n"
+"        {\n"
+"            if (dir.CurrentIsDir())\n"
+"            {\n"
+"                GD.Print($\"Found directory: {fileName}\");\n"
+"            }\n"
+"            else\n"
+"            {\n"
+"                GD.Print($\"Found file: {fileName}\");\n"
+"            }\n"
+"            fileName = dir.GetNext();\n"
+"        }\n"
+"    }\n"
+"    else\n"
+"    {\n"
+"        GD.Print(\"An error occurred when trying to access the path.\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Keep in mind that file names may change or be remapped after export. If you "
+"want to see the actual resource file list as it appears in the editor, use "
+"[method ResourceLoader.list_directory] instead."
+msgstr ""
+"Questa classe è utilizzata per gestire le cartelle (directory) e il loro "
+"contenuto, anche al di fuori della cartella del progetto.\n"
+"[DirAccess] non può essere istanziato direttamente. Invece viene creato con "
+"un metodo statico che accetta un percorso per il quale verrà aperto.\n"
+"La maggior parte dei metodi ha un'alternativa statica che può essere "
+"utilizzata senza creare un [DirAccess]. I metodi statici supportano solo "
+"percorsi assoluti (inclusi [code]res://[/code] e [code]user://[/code]).\n"
+"[codeblock]\n"
+"# Standard\n"
+"var dir = DirAccess.open(\"user://levels\")\n"
+"dir.make_dir(\"world1\")\n"
+"# Statico\n"
+"DirAccess.make_dir_absolute(\"user://levels/world1\")\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] L'accesso alle cartelle del progetto (\"res://\") una volta "
+"esportate potrebbe comportarsi in modo imprevisto poiché alcuni file vengono "
+"convertiti in formati specifici del motore e i loro file sorgente originali "
+"potrebbero non essere presenti nel pacchetto PCK previsto. Per questo motivo, "
+"per accedere alle risorse in un progetto esportato, si consiglia di "
+"utilizzare [ResourceLoader] anziché [FileAccess].\n"
+"Ecco un esempio su come interare i file di una directory:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func dir_contents(path):\n"
+"    var dir = DirAccess.open(path)\n"
+"    if dir:\n"
+"        dir.list_dir_begin()\n"
+"        var file_name = dir.get_next()\n"
+"        while file_name != \"\":\n"
+"            if dir.current_is_dir():\n"
+"                print(\"Cartelle trovata: \" + file_name)\n"
+"            else:\n"
+"                print(\"File trovato: \" + file_name)\n"
+"            file_name = dir.get_next()\n"
+"    else:\n"
+"        print(\"Si è verificato un errore cercando di accedere al percorso."
+"\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public void DirContents(string path)\n"
+"{\n"
+"    using var dir = DirAccess.Open(path);\n"
+"    if (dir != null)\n"
+"    {\n"
+"        dir.ListDirBegin();\n"
+"        string fileName = dir.GetNext();\n"
+"        while (fileName != \"\")\n"
+"        {\n"
+"            if (dir.CurrentIsDir())\n"
+"            {\n"
+"                GD.Print($\"Cartella trovata: {fileName}\");\n"
+"            }\n"
+"            else\n"
+"            {\n"
+"                GD.Print($\"File trovato: {fileName}\");\n"
+"            }\n"
+"            fileName = dir.GetNext();\n"
+"        }\n"
+"    }\n"
+"    else\n"
+"    {\n"
+"        GD.Print(\"Si è verificato un errore cercando di accedere al percorso."
+"\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Tieni presente che i nomi dei file potrebbero cambiare o essere rimappati "
+"dopo l'esportazione. Se vuoi vedere l'elenco effettivo dei file di risorse "
+"così come appare nell'editor, usa invece [method ResourceLoader."
+"list_directory]."
+
 msgid "File system"
 msgstr "Il File system"
 
@@ -31241,6 +39294,26 @@ msgstr ""
 "esecuzione con privilegi elevati o se è abilitata la modalità sviluppatore.\n"
 "[b]Nota:[/b] Questo metodo è implementato su macOS, Linux, e Windows."
 
+msgid ""
+"Creates a temporary directory. This directory will be freed when the returned "
+"[DirAccess] is freed.\n"
+"If [param prefix] is not empty, it will be prefixed to the directory name, "
+"separated by a [code]-[/code].\n"
+"If [param keep] is [code]true[/code], the directory is not deleted when the "
+"returned [DirAccess] is freed.\n"
+"Returns [code]null[/code] if opening the directory failed. You can use "
+"[method get_open_error] to check the error that occurred."
+msgstr ""
+"Crea una cartella temporanea. Questa cartella sarà liberata quando il "
+"[DirAccess] restituito viene liberato.\n"
+"Se [param prefix] non è vuoto, verrà prefissato al nome della cartella, "
+"separato da [code]-[/code].\n"
+"Se [param keep] è [code]true[/code], la cartella non viene eliminata quando "
+"il [DirAccess] restituito viene liberato.\n"
+"Restituisce [code]null[/code] se l'apertura della cartella non avviene con "
+"successo. Puoi usare [method get_open_error] per controllare l'errore che si "
+"è verificato."
+
 msgid ""
 "Returns whether the current item processed with the last [method get_next] "
 "call is a directory ([code].[/code] and [code]..[/code] are considered "
@@ -31250,6 +39323,24 @@ msgstr ""
 "get_next] è una cartella ([code].[/code] e [code]..[/code] sono considerate "
 "cartelle)."
 
+msgid ""
+"Returns whether the target file exists. The argument can be relative to the "
+"current directory, or an absolute path.\n"
+"For a static equivalent, use [method FileAccess.file_exists].\n"
+"[b]Note:[/b] Many resources types are imported (e.g. textures or sound "
+"files), and their source asset will not be included in the exported game, as "
+"only the imported version is used. See [method ResourceLoader.exists] for an "
+"alternative approach that takes resource remapping into account."
+msgstr ""
+"Restituisce se il file di destinazione esiste. L'argomento può essere "
+"relativo alla cartella attuale oppure un percorso assoluto.\n"
+"Per un equivalente statico, usa [method FileAccess.file_exists].\n"
+"[b]Nota:[/b] Molti tipi di risorse sono importati (ad esempio texture o file "
+"audio) e la loro risorsa sorgente non sarà inclusa nel gioco esportato, "
+"poiché solo la versione importata è utilizzata. Vedi [method ResourceLoader."
+"exists] per un approccio alternativo che tenga conto della rimappatura delle "
+"risorse."
+
 msgid ""
 "Returns the absolute path to the currently opened directory (e.g. [code]res://"
 "folder[/code] or [code]C:\\tmp\\folder[/code])."
@@ -31265,6 +39356,39 @@ msgstr ""
 "[method get_drive_name] per convertire l'indice restituito nel nome "
 "dell'unità."
 
+msgid ""
+"Returns a [PackedStringArray] containing filenames of the directory contents, "
+"excluding files. The array is sorted alphabetically.\n"
+"Affected by [member include_hidden] and [member include_navigational].\n"
+"[b]Note:[/b] The returned directories in the editor and after exporting in "
+"the [code]res://[/code] directory may differ as some files are converted to "
+"engine-specific formats when exported."
+msgstr ""
+"Restituisce un [PackedStringArray] contenente i nomi dei file del contenuto "
+"della cartella, esclusi i file. L'array è ordinato alfabeticamente.\n"
+"Influenzato da [member include_hidden] e [member include_navigational].\n"
+"[b]Nota:[/b] Le cartelle restituite nell'editor e dopo l'esportazione nella "
+"cartella [code]res://[/code] potrebbero essere diversi poiché alcuni file "
+"vengono convertiti in formati specifici del motore durante l'esportazione."
+
+msgid ""
+"Returns a [PackedStringArray] containing filenames of the directory contents, "
+"excluding files, at the given [param path]. The array is sorted "
+"alphabetically.\n"
+"Use [method get_directories] if you want more control of what gets included.\n"
+"[b]Note:[/b] The returned directories in the editor and after exporting in "
+"the [code]res://[/code] directory may differ as some files are converted to "
+"engine-specific formats when exported."
+msgstr ""
+"Restituisce un [PackedStringArray] contenente i nomi dei file del contenuto "
+"della cartella, esclusi i file, nel percorso [param path] specificato. "
+"L'array è ordinato alfabeticamente.\n"
+"Usa [method get_directories] se si desidera più controllo su cosa viene "
+"incluso.\n"
+"[b]Nota:[/b] Le cartelle restituite nell'editor e dopo l'esportazione nella "
+"cartella [code]res://[/code] potrebbero essere diversi poiché alcuni file "
+"vengono convertiti in formati specifici del motore durante l'esportazione."
+
 msgid ""
 "On Windows, returns the number of drives (partitions) mounted on the current "
 "filesystem.\n"
@@ -31323,6 +39447,35 @@ msgstr ""
 "ProjectSettings.editor/export/convert_text_resources_to_binary] sia "
 "[code]true[/code]."
 
+msgid ""
+"Returns a [PackedStringArray] containing filenames of the directory contents, "
+"excluding directories, at the given [param path]. The array is sorted "
+"alphabetically.\n"
+"Use [method get_files] if you want more control of what gets included.\n"
+"[b]Note:[/b] When used on a [code]res://[/code] path in an exported project, "
+"only the files included in the PCK at the given folder level are returned. In "
+"practice, this means that since imported resources are stored in a top-level "
+"[code].godot/[/code] folder, only paths to [code].gd[/code] and [code]."
+"import[/code] files are returned (plus a few other files, such as "
+"[code]project.godot[/code] or [code]project.binary[/code] and the project "
+"icon). In an exported project, the list of returned files will also vary "
+"depending on [member ProjectSettings.editor/export/"
+"convert_text_resources_to_binary]."
+msgstr ""
+"Restituisce un [PackedStringArray] contenente i nomi file del contenuto della "
+"cartella, escluse le cartelle, al percorso [param path] specificato. L'array "
+"è ordinato alfabeticamente.\n"
+"Usa [method get_files] se si desidera più controllo su cosa viene incluso.\n"
+"[b]Nota:[/b] Quando utilizzato su un percorso [code]res://[/code] in un "
+"progetto esportato, sono restituiti solo i file effettivamente inclusi nel "
+"PCK al livello di cartella specificato. In pratica, ciò significa che poiché "
+"le risorse importate sono archiviate in una cartella di livello superiore "
+"[code].godot/[/code], sono restituiti solo i percorsi ai file [code]*.gd[/"
+"code] e [code]*.import[/code] (oltre a qualche altro file come [code]project."
+"godot[/code] o [code]project.binary[/code] e l'icona del progetto). In un "
+"progetto esportato, l'elenco dei file restituiti varierà anche a seconda di "
+"[member ProjectSettings.editor/export/convert_text_resources_to_binary]."
+
 msgid ""
 "Returns the next element (file or directory) in the current directory.\n"
 "The name of the file or directory is returned (and not its full path). Once "
@@ -31350,6 +39503,13 @@ msgstr ""
 "Restituisce [code]0[/code] se il metodo specifico della piattaforma per "
 "interrogare lo spazio disponibile fallisce."
 
+msgid ""
+"Returns [code]true[/code] if the directory is a macOS bundle.\n"
+"[b]Note:[/b] This method is implemented on macOS."
+msgstr ""
+"Restituisce [code]true[/code] se la cartella è un pacchetto macOS.\n"
+"[b]Nota:[/b] Questo metodo è implementato solo su macOS."
+
 msgid ""
 "Returns [code]true[/code] if the file system or directory use case sensitive "
 "file names.\n"
@@ -31759,8 +39919,22 @@ msgstr ""
 "gestione delle finestre. La maggior parte delle funzioni di [DisplayServer] "
 "restituirà valori fittizi in questo caso."
 
+msgid ""
+"Plays the beep sound from the operative system, if possible. Because it comes "
+"from the OS, the beep sound will be audible even if the application is muted. "
+"It may also be disabled for the entire OS by the user.\n"
+"[b]Note:[/b] This method is implemented on macOS, Linux (X11/Wayland), and "
+"Windows."
+msgstr ""
+"Riproduce il suono del beep dal sistema operativo, se possibile. Poiché "
+"proviene dal sistema operativo, il segnale acustico sarà udibile anche se "
+"l'applicazione è silenziata. Potrebbe anche essere disabilitato per l'intero "
+"sistema operativo dall'utente.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS, Linux (X11/Wayland) e "
+"Windows."
+
 msgid "Returns the user's clipboard as a string if possible."
-msgstr "Restituisce gli appunti dell'utente come string, se possibile."
+msgstr "Restituisce gli appunti dell'utente come stringa, se possibile."
 
 msgid ""
 "Returns the user's clipboard as an image if possible.\n"
@@ -31877,6 +40051,36 @@ msgstr ""
 msgid "Removes the application status indicator."
 msgstr "Rimuove l'indicatore di stato dell'applicazione."
 
+msgid ""
+"Shows a text input dialog which uses the operating system's native look-and-"
+"feel. [param callback] should accept a single [String] parameter which "
+"contains the text field's contents.\n"
+"[b]Note:[/b] This method is implemented if the display server has the "
+"[constant FEATURE_NATIVE_DIALOG_INPUT] feature. Supported platforms include "
+"macOS, Windows, and Android."
+msgstr ""
+"Mostra una finestra di dialogo con campo di testo che utilizza l'aspetto "
+"nativo del sistema operativo. [param callback] dovrebbe accettare un singolo "
+"parametro [String] che contiene il contenuto del campo di testo.\n"
+"[b]Nota:[/b] Questo metodo è implementato se il server di visualizzazione ha "
+"la funzionalità [constant FEATURE_NATIVE_DIALOG_INPUT]. Le piattaforme "
+"supportate includono macOS, Windows e Android."
+
+msgid ""
+"Shows a text dialog which uses the operating system's native look-and-feel. "
+"[param callback] should accept a single [int] parameter which corresponds to "
+"the index of the pressed button.\n"
+"[b]Note:[/b] This method is implemented if the display server has the "
+"[constant FEATURE_NATIVE_DIALOG] feature. Supported platforms include macOS, "
+"Windows, and Android."
+msgstr ""
+"Mostra una finestra di dialogo con testo che utilizza l'aspetto nativo del "
+"sistema operativo. [param callback] dovrebbe accettare un singolo parametro "
+"[String] che contiene il contenuto del campo di testo.\n"
+"[b]Nota:[/b] Questo metodo è implementato se il server di visualizzazione ha "
+"la funzionalità [constant FEATURE_NATIVE_DIALOG]. Le piattaforme supportate "
+"includono macOS, Windows e Android."
+
 msgid ""
 "Allows the [param process_id] PID to steal focus from this window. In other "
 "words, this disables the operating system's focus stealing protection for the "
@@ -31888,6 +40092,115 @@ msgstr ""
 "operativo contro il furto dello stato attivo per il PID specificato.\n"
 "[b]Nota:[/b] Questo metodo è implementato solo su Windows."
 
+msgid ""
+"Displays OS native dialog for selecting files or directories in the file "
+"system.\n"
+"Each filter string in the [param filters] array should be formatted like "
+"this: [code]*.png,*.jpg,*.jpeg;Image Files;image/png,image/jpeg[/code]. The "
+"description text of the filter is optional and can be omitted. It is "
+"recommended to set both file extension and MIME type. See also [member "
+"FileDialog.filters].\n"
+"Callbacks have the following arguments: [code]status: bool, selected_paths: "
+"PackedStringArray, selected_filter_index: int[/code]. [b]On Android,[/b] "
+"callback argument [code]selected_filter_index[/code] is always zero.\n"
+"[b]Note:[/b] This method is implemented if the display server has the "
+"[constant FEATURE_NATIVE_DIALOG_FILE] feature. Supported platforms include "
+"Linux (X11/Wayland), Windows, macOS, and Android.\n"
+"[b]Note:[/b] [param current_directory] might be ignored.\n"
+"[b]Note:[/b] Embedded file dialog and Windows file dialog support only file "
+"extensions, while Android, Linux, and macOS file dialogs also support MIME "
+"types.\n"
+"[b]Note:[/b] On Android and Linux, [param show_hidden] is ignored.\n"
+"[b]Note:[/b] On Android and macOS, native file dialogs have no title.\n"
+"[b]Note:[/b] On macOS, sandboxed apps will save security-scoped bookmarks to "
+"retain access to the opened folders across multiple sessions. Use [method OS."
+"get_granted_permissions] to get a list of saved bookmarks."
+msgstr ""
+"Visualizza la finestra di dialogo nativa del sistema operativo per "
+"selezionare file o cartelle nel file system.\n"
+"Ogni stringa di filtro nell'array [param filter] deve essere formattata in "
+"questo modo: [code]*.txt,*.doc;Text Files[/code]. Il testo descrittivo del "
+"filtro è facoltativo e può essere omesso. È consigliato impostare sia "
+"l'estensione file sia il tipo MIME. Vedi anche [member FileDialog.filters].\n"
+"I callback hanno i seguenti argomenti: [code]status: bool, selected_paths: "
+"PackedStringArray, selected_filter_index: int[/code]. [b]Su Android,[/b] "
+"l'argomento [code]selected_filter_index[/code] del callback è sempre zero.\n"
+"[b]Nota:[/b] Questo metodo è implementato se il server di visualizzazione ha "
+"la funzionalità [constant FEATURE_NATIVE_DIALOG_FILE]. Le piattaforme "
+"supportate includono Linux (X11/Wayland), Windows, macOS e Android.\n"
+"[b]Nota:[/b] [param current_directory] potrebbe essere ignorato.\n"
+"[b]Nota:[/b] Sia le finestre di dialogo incorporate, sia le finestre di "
+"dialogo su Windows supportano solo le estensioni dei file, mentre su Android, "
+"Linux e macOS esse supportano anche i tipi MIME.\n"
+"[b]Nota:[/b] Su Android e Linux, [param show_hidden] viene ignorato.\n"
+"[b]Nota:[/b] Su Android e macOS, le finestre di dialogo native dei file non "
+"hanno titolo.\n"
+"[b]Nota:[/b] Su macOS, le app in sandbox salveranno segnalibri con ambito di "
+"sicurezza per mantenere l'accesso alle cartelle aperte in più sessioni. Usa "
+"[method OS.get_granted_permissions] per ottenere una lista dei segnalibri "
+"salvati."
+
+msgid ""
+"Displays OS native dialog for selecting files or directories in the file "
+"system with additional user selectable options.\n"
+"Each filter string in the [param filters] array should be formatted like "
+"this: [code]*.png,*.jpg,*.jpeg;Image Files;image/png,image/jpeg[/code]. The "
+"description text of the filter is optional and can be omitted. It is "
+"recommended to set both file extension and MIME type. See also [member "
+"FileDialog.filters].\n"
+"[param options] is array of [Dictionary]s with the following keys:\n"
+"- [code]\"name\"[/code] - option's name [String].\n"
+"- [code]\"values\"[/code] - [PackedStringArray] of values. If empty, boolean "
+"option (check box) is used.\n"
+"- [code]\"default\"[/code] - default selected option index ([int]) or default "
+"boolean value ([bool]).\n"
+"Callbacks have the following arguments: [code]status: bool, selected_paths: "
+"PackedStringArray, selected_filter_index: int, selected_option: Dictionary[/"
+"code].\n"
+"[b]Note:[/b] This method is implemented if the display server has the "
+"[constant FEATURE_NATIVE_DIALOG_FILE_EXTRA] feature. Supported platforms "
+"include Linux (X11/Wayland), Windows, and macOS.\n"
+"[b]Note:[/b] [param current_directory] might be ignored.\n"
+"[b]Note:[/b] Embedded file dialog and Windows file dialog support only file "
+"extensions, while Android, Linux, and macOS file dialogs also support MIME "
+"types.\n"
+"[b]Note:[/b] On Linux (X11), [param show_hidden] is ignored.\n"
+"[b]Note:[/b] On macOS, native file dialogs have no title.\n"
+"[b]Note:[/b] On macOS, sandboxed apps will save security-scoped bookmarks to "
+"retain access to the opened folders across multiple sessions. Use [method OS."
+"get_granted_permissions] to get a list of saved bookmarks."
+msgstr ""
+"Visualizza la finestra di dialogo nativa del sistema operativo per "
+"selezionare file o cartelle nel file system con opzioni aggiuntive "
+"selezionabili dall'utente.\n"
+"Ogni stringa di filtro nell'array [param filter] deve essere formattata in "
+"questo modo: [code]*.txt,*.doc;Text Files[/code]. Il testo descrittivo del "
+"filtro è facoltativo e può essere omesso. È consigliato impostare sia "
+"l'estensione file sia il tipo MIME. Vedi anche [member FileDialog.filters].\n"
+"[param options] è un array di [Dictionary] con le seguenti chiavi:\n"
+"- [code]\"name\"[/code] - nome dell'opzione [String].\n"
+"- [code]\"values\"[/code] - [PackedStringArray] di valori. Se vuoto, viene "
+"utilizzata un'opzione booleana (casella di spunta).\n"
+"- [code]\"default\"[/code] - indice dell'opzione selezionata predefinita "
+"([int]) o valore booleano predefinito ([bool]).\n"
+"I callback hanno i seguenti argomenti: [code]status: bool, selected_paths: "
+"PackedStringArray, selected_filter_index: int, selected_option: Dictionary[/"
+"code].\n"
+"[b]Nota:[/b] Questo metodo è implementato se il server di visualizzazione ha "
+"la funzionalità [constant FEATURE_NATIVE_DIALOG_FILE]. Le piattaforme "
+"supportate includono Linux (X11/Wayland), Windows e macOS.\n"
+"[b]Nota:[/b] [param current_directory] potrebbe essere ignorato.\n"
+"[b]Nota:[/b] Sia le finestre di dialogo incorporate, sia le finestre di "
+"dialogo su Windows supportano solo le estensioni dei file, mentre su Android, "
+"Linux e macOS esse supportano anche i tipi MIME.\n"
+"[b]Nota:[/b] Su Linux (X11), [param show_hidden] viene ignorato.\n"
+"[b]Nota:[/b] Su macOS, le finestre di dialogo dei file nativi non hanno "
+"titolo.\n"
+"[b]Nota:[/b] Su macOS, le app in sandbox salveranno segnalibri con ambito di "
+"sicurezza per mantenere l'accesso alle cartelle aperte in più sessioni. Usa "
+"[method OS.get_granted_permissions] per ottenere una lista dei segnalibri "
+"salvati."
+
 msgid ""
 "Forces window manager processing while ignoring all [InputEvent]s. See also "
 "[method process_events].\n"
@@ -31897,6 +40210,25 @@ msgstr ""
 "[InputEvent]. Vedi anche [method process_events].\n"
 "[b]Nota:[/b] Questo metodo è implementato su Windows e macOS."
 
+msgid ""
+"Returns OS theme accent color. Returns [code]Color(0, 0, 0, 0)[/code], if "
+"accent color is unknown.\n"
+"[b]Note:[/b] This method is implemented on macOS, Windows, and Android."
+msgstr ""
+"Restituisce il colore d'accento del tema del sistema operativo. Restituisce "
+"[code]Color(0, 0, 0, 0)[/code], se il colore d'accento è sconosciuto.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS, Windows e Android."
+
+msgid ""
+"Returns the OS theme base color (default control background). Returns "
+"[code]Color(0, 0, 0, 0)[/code] if the base color is unknown.\n"
+"[b]Note:[/b] This method is implemented on macOS, Windows, and Android."
+msgstr ""
+"Restituisce il colore di base del tema del sistema operativo (colore "
+"predefinito di sfondo). Restituisce [code]Color(0, 0, 0, 0)[/code], se il "
+"colore di base è sconosciuto.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS, Windows e Android."
+
 msgid ""
 "Returns an [Array] of [Rect2], each of which is the bounding rectangle for a "
 "display cutout or notch. These are non-functional areas on edge-to-edge "
@@ -31946,6 +40278,15 @@ msgstr "Restituisce l'indice dello schermo principale."
 msgid "Returns the number of displays available."
 msgstr "Restituisce il numero di display disponibili."
 
+msgid ""
+"Returns the index of the screen that overlaps the most with the given "
+"rectangle. Returns [code]-1[/code] if the rectangle doesn't overlap with any "
+"screen or has no area."
+msgstr ""
+"Restituisce l'indice dello schermo che si sovrappone di più al rettangolo "
+"fornito. Restituisce [code]-1[/code] se il rettangolo non si sovrappone ad "
+"alcuno schermo o non ha area."
+
 msgid ""
 "Returns [code]true[/code] if positions of [b]OK[/b] and [b]Cancel[/b] buttons "
 "are swapped in dialogs. This is enabled by default on Windows to follow "
@@ -32324,6 +40665,15 @@ msgstr ""
 "Restituisce [code]true[/code] se la funzionalità [param feature] specificata "
 "è supportata dal [DisplayServer] attuale, altrimenti [code]false[/code]."
 
+msgid ""
+"Returns [code]true[/code] if hardware keyboard is connected.\n"
+"[b]Note:[/b] This method is implemented on Android and iOS, on other "
+"platforms this method always returns [code]true[/code]."
+msgstr ""
+"Restituisce [code]true[/code] se la tastiera hardware è connessa.\n"
+"[b]Nota:[/b] Questo metodo è implementato su Android e iOS. Su altre "
+"piattaforme, questo metodo restituisce sempre [code]true[/code]."
+
 msgid ""
 "Returns the text selection in the [url=https://en.wikipedia.org/wiki/"
 "Input_method]Input Method Editor[/url] composition string, with the "
@@ -32367,6 +40717,16 @@ msgstr ""
 "[b]Nota:[/b] Questo metodo è implementato su Android, iOS, macOS, Windows, e "
 "Linux (X11/Wayland)."
 
+msgid ""
+"Returns [code]true[/code] if touch events are available (Android or iOS), the "
+"capability is detected on the Web platform or if [member ProjectSettings."
+"input_devices/pointing/emulate_touch_from_mouse] is [code]true[/code]."
+msgstr ""
+"Restituisce [code]true[/code] se sono disponibili gli eventi di tocco "
+"(Android o iOS), la capacità è rilevata sulla piattaforma Web o se [member "
+"ProjectSettings.input_devices/pointing/emulate_touch_from_mouse] è "
+"[code]true[/code]."
+
 msgid ""
 "Returns [code]true[/code] if the window background can be made transparent. "
 "This method returns [code]false[/code] if [member ProjectSettings.display/"
@@ -32545,6 +40905,18 @@ msgstr ""
 "schermo\", se il permesso non viene concesso, restituirà il colore dello "
 "sfondo del desktop."
 
+msgid ""
+"Returns screenshot of the screen [param rect].\n"
+"[b]Note:[/b] This method is implemented on macOS and Windows.\n"
+"[b]Note:[/b] On macOS, this method requires \"Screen Recording\" permission, "
+"if permission is not granted it will return desktop wallpaper color."
+msgstr ""
+"Restituisce uno screenshot del rettangolo [param rect] nello schermo.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS e Windows.\n"
+"[b]Nota:[/b] Su macOS, questo metodo richiede il permesso \"Registrazione "
+"schermo\", se il permesso non viene concesso, restituirà il colore dello "
+"sfondo del desktop."
+
 msgid ""
 "Returns the greatest scale factor of all screens.\n"
 "[b]Note:[/b] On macOS returned value is [code]2.0[/code] if there is at least "
@@ -32644,6 +41016,29 @@ msgstr ""
 "    refresh_rate = 60.0\n"
 "[/codeblock]"
 
+msgid ""
+"Returns the scale factor of the specified screen by index.\n"
+"[b]Note:[/b] On macOS, the returned value is [code]2.0[/code] for hiDPI "
+"(Retina) screens, and [code]1.0[/code] for all other cases.\n"
+"[b]Note:[/b] On Linux (Wayland), the returned value is accurate only when "
+"[param screen] is [constant SCREEN_OF_MAIN_WINDOW]. Due to API limitations, "
+"passing a direct index will return a rounded-up integer, if the screen has a "
+"fractional scale (e.g. [code]1.25[/code] would get rounded up to [code]2.0[/"
+"code]).\n"
+"[b]Note:[/b] This method is implemented on Android, iOS, Web, macOS, and "
+"Linux (Wayland)."
+msgstr ""
+"Restituisce il fattore di scala dello schermo specificato per indice.\n"
+"[b]Nota:[/b] Su macOS, il valore restituito è [code]2.0[/code] per gli "
+"schermi hiDPI (Retina) e [code]1.0[/code] per tutti gli altri casi.\n"
+"[b]Nota:[/b] Su Linux (Wayland), il valore restituito è accurato solo quando "
+"[param screen] è [constant SCREEN_OF_MAIN_WINDOW]. A causa delle limitazioni "
+"dell'API, il passaggio di un indice diretto restituirà un intero arrotondato "
+"per eccesso, se lo schermo ha una scala frazionaria (ad esempio, [code]1.25[/"
+"code] verrebbe arrotondato per eccesso a [code]2.0[/code]).\n"
+"[b]Nota:[/b] Questo metodo è implementato su Android, iOS, Web, macOS e Linux "
+"(Wayland)."
+
 msgid ""
 "Returns the screen's size in pixels. See also [method screen_get_position] "
 "and [method screen_get_usable_rect]."
@@ -32731,6 +41126,13 @@ msgstr ""
 "[b]Nota:[/b] Questo metodo è implementato su Android, iOS, macOS, Windows, e "
 "Linux (X11/Wayland)."
 
+msgid ""
+"Opens system emoji and symbol picker.\n"
+"[b]Note:[/b] This method is implemented on macOS and Windows."
+msgstr ""
+"Apre il selettore di emoji e simboli del sistema.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS e Windows."
+
 msgid ""
 "Returns the rectangle for the given status indicator [param id] in screen "
 "coordinates. If the status indicator is not visible, returns an empty "
@@ -33104,6 +41506,13 @@ msgstr ""
 "Utilizzando l'argomento della riga di comando [code]--disable-render-loop[/"
 "code] o una build headless verrà restituito [code]false[/code]."
 
+msgid ""
+"Returns ID of the active popup window, or [constant INVALID_WINDOW_ID] if "
+"there is none."
+msgstr ""
+"Restituisce l'ID della finestra popup attiva o [constant INVALID_WINDOW_ID] "
+"se non ce n'è alcuna."
+
 msgid ""
 "Returns the [method Object.get_instance_id] of the [Window] the [param "
 "window_id] is attached to."
@@ -33160,6 +41569,12 @@ msgstr ""
 "utilizzata per aprire la finestra popup nel sistema di coordinate dello "
 "schermo."
 
+msgid ""
+"Returns the position of the client area of the given window on the screen."
+msgstr ""
+"Restituisce la posizione dell'area client della finestra specificata sullo "
+"schermo."
+
 msgid ""
 "Returns the position of the given window on the screen including the borders "
 "drawn by the operating system. See also [method window_get_position]."
@@ -33406,6 +41821,92 @@ msgstr ""
 "disabilitare le restrizioni della geometria della finestra e quindi aggirare "
 "questo limite."
 
+msgid ""
+"Sets window mode for the given window to [param mode]. See [enum WindowMode] "
+"for possible values and how each mode behaves.\n"
+"[b]Note:[/b] On Android, setting it to [constant WINDOW_MODE_FULLSCREEN] or "
+"[constant WINDOW_MODE_EXCLUSIVE_FULLSCREEN] will enable immersive mode.\n"
+"[b]Note:[/b] Setting the window to full screen forcibly sets the borderless "
+"flag to [code]true[/code], so make sure to set it back to [code]false[/code] "
+"when not wanted."
+msgstr ""
+"Imposta la modalità della finestra per la finestra specificata su [param "
+"mode]. Vedi [enum WindowMode] per i valori possibili e il comportamento di "
+"ciascuna modalità.\n"
+"[b]Nota:[/b] su Android, impostandola su [constant WINDOW_MODE_FULLSCREEN] o "
+"[constant WINDOW_MODE_EXCLUSIVE_FULLSCREEN] verrà abilitata la modalità "
+"immersiva.\n"
+"[b]Nota:[/b] Impostando la finestra a schermo intero, il flag borderless "
+"(senza bordi) viene forzato su [code]true[/code], quindi assicurarsi di "
+"reimpostarlo su [code]false[/code] se non desiderato."
+
+msgid ""
+"Sets a polygonal region of the window which accepts mouse events. Mouse "
+"events outside the region will be passed through.\n"
+"Passing an empty array will disable passthrough support (all mouse events "
+"will be intercepted by the window, which is the default behavior).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Set region, using Path2D node.\n"
+"DisplayServer.window_set_mouse_passthrough($Path2D.curve.get_baked_points())\n"
+"\n"
+"# Set region, using Polygon2D node.\n"
+"DisplayServer.window_set_mouse_passthrough($Polygon2D.polygon)\n"
+"\n"
+"# Reset region to default.\n"
+"DisplayServer.window_set_mouse_passthrough([])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Set region, using Path2D node.\n"
+"DisplayServer.WindowSetMousePassthrough(GetNode<Path2D>(\"Path2D\").Curve."
+"GetBakedPoints());\n"
+"\n"
+"// Set region, using Polygon2D node.\n"
+"DisplayServer.WindowSetMousePassthrough(GetNode<Polygon2D>(\"Polygon2D\")."
+"Polygon);\n"
+"\n"
+"// Reset region to default.\n"
+"DisplayServer.WindowSetMousePassthrough([]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] On Windows, the portion of a window that lies outside the region "
+"is not drawn, while on Linux (X11) and macOS it is.\n"
+"[b]Note:[/b] This method is implemented on Linux (X11), macOS and Windows."
+msgstr ""
+"Imposta una regione poligonale della finestra che accetta eventi dal mouse. "
+"Gli eventi dal mouse al di fuori della regione passeranno attraverso "
+"(passthrough).\n"
+"Impostando un array vuoto il supporto per il passthrough verrà disabilitato "
+"(tutti gli eventi del mouse saranno intercettati dalla finestra, il che è il "
+"comportamento predefinito).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Imposta la regione, usando il nodo Path2D.\n"
+"DisplayServer.window_set_mouse_passthrough($Path2D.curve.get_baked_points())\n"
+"\n"
+"# Imposta la regione, usando il nodo Polygon2D.\n"
+"DisplayServer.window_set_mouse_passthrough($Polygon2D.polygon)\n"
+"\n"
+"# Reimposta la regione sul valore predefinito.\n"
+"DisplayServer.window_set_mouse_passthrough([])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Imposta la regione, usando il nodo Path2D.\n"
+"DisplayServer.WindowSetMousePassthrough(GetNode<Path2D>(\"Path2D\").Curve."
+"GetBakedPoints());\n"
+"\n"
+"// Imposta la regione, usando il nodo Polygon2D.\n"
+"DisplayServer.WindowSetMousePassthrough(GetNode<Polygon2D>(\"Polygon2D\")."
+"Polygon);\n"
+"\n"
+"// Reimposta la regione sul valore predefinito.\n"
+"DisplayServer.WindowSetMousePassthrough(new Vector2[] {});\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Su Windows, la parte di una finestra che si trova all'esterno "
+"della regione non è disegnata, mentre su Linux (X11) e macOS lo è.\n"
+"[b]Nota:[/b] Questo metodo è implementato su Linux (X11), macOS e Windows."
+
 msgid ""
 "Sets the bounding box of control, or menu item that was used to open the "
 "popup window, in the screen coordinate system. Clicking this area will not "
@@ -33491,6 +41992,25 @@ msgstr ""
 "Cerca di modificare il titolo della finestra solo poche volte al secondo al "
 "massimo."
 
+msgid ""
+"Sets window transient parent. Transient window will be destroyed with its "
+"transient parent and will return focus to their parent when closed. The "
+"transient window is displayed on top of a non-exclusive full-screen parent "
+"window. Transient windows can't enter full-screen mode.\n"
+"[b]Note:[/b] It's recommended to change this value using [member Window."
+"transient] instead.\n"
+"[b]Note:[/b] The behavior might be different depending on the platform."
+msgstr ""
+"Imposta la finestra transitoria genitore. La finestra transitoria verrà "
+"distrutta con il suo genitore transitorio e tornerà il focus sul suo genitore "
+"quando verrà chiusa. La finestra transitoria è visualizzata sopra una "
+"finestra padre a schermo intero non esclusivo. Le finestre transitorie non "
+"possono entrare in modalità a schermo intero.\n"
+"[b]Nota:[/b] Si consiglia invece di modificare questo valore tramite [member "
+"Window.transient].\n"
+"[b]Nota:[/b] Il comportamento potrebbe essere diverso a seconda della "
+"piattaforma."
+
 msgid ""
 "Sets the V-Sync mode of the given window. See also [member ProjectSettings."
 "display/window/vsync/vsync_mode].\n"
@@ -33632,6 +42152,20 @@ msgstr ""
 "trasparenza per pixel per rendere le finestre dietro di esse parzialmente o "
 "completamente visibili. [b]Windows, macOS, Linux (X11/Wayland)[/b]"
 
+msgid ""
+"Display server supports querying the operating system's display scale factor. "
+"This allows for [i]reliable[/i] automatic hiDPI display detection, as opposed "
+"to guessing based on the screen resolution and reported display DPI (which "
+"can be unreliable due to broken monitor EDID). [b]Windows, Linux (Wayland), "
+"macOS[/b]"
+msgstr ""
+"Il server di visualizzazione supporta la richiesta al sistema operativo del "
+"fattore di scala del display. Ciò consente di rilevare automaticamente e "
+"[i]affidabilmente[/i] l'hiDPI del display, anziché fare assunzioni in base "
+"alla risoluzione dello schermo e al DPI del display segnalato (il che può "
+"essere inaffidabile a causa dell'EDID del monitor non funzionante). "
+"[b]Windows, Linux (Wayland), macOS[/b]"
+
 msgid ""
 "Display server supports changing the window icon (usually displayed in the "
 "top-left corner). [b]Windows, macOS, Linux (X11)[/b]"
@@ -33713,6 +42247,42 @@ msgstr ""
 "di inserimento di testo utilizzando l'aspetto nativo del sistema operativo. "
 "Vedi [method dialog_input_text]. [b]Windows, macOS[/b]"
 
+msgid ""
+"Display server supports spawning dialogs for selecting files or directories "
+"using the operating system's native look-and-feel. See [method "
+"file_dialog_show]. [b]Windows, macOS, Linux (X11/Wayland), Android[/b]"
+msgstr ""
+"Il server di visualizzazione supporta la generazione di finestre di dialogo "
+"per la selezione di file o cartelle utilizzando l'aspetto nativo del sistema "
+"operativo. Vedi [method file_dialog_show]. [b]Windows, macOS, Linux (X11/"
+"Wayland)[/b]"
+
+msgid ""
+"The display server supports all features of [constant "
+"FEATURE_NATIVE_DIALOG_FILE], with the added functionality of Options and "
+"native dialog file access to [code]res://[/code] and [code]user://[/code] "
+"paths. See [method file_dialog_show] and [method "
+"file_dialog_with_options_show]. [b]Windows, macOS, Linux (X11/Wayland)[/b]"
+msgstr ""
+"Il server di visualizzazione supporta tutte le funzionalità di [constant "
+"FEATURE_NATIVE_DIALOG_FILE], con l'aggiunta di \"opzioni\" e accesso ai file "
+"per la finestra di dialogo nativa per i percorsi [code]res://[/code] e "
+"[code]user://[/code] . Vedi [method file_dialog_show] e [method "
+"file_dialog_with_options_show]. [b]Windows, macOS, Linux (X11/Wayland)[/b]"
+
+msgid ""
+"Display server supports embedding a window from another process. [b]Windows, "
+"Linux (X11)[/b]"
+msgstr ""
+"Il server di visualizzazione supporta l'incoporamento di una finestra da un "
+"altro processo. [b]Windows, Linux (X11)[/b]"
+
+msgid ""
+"Display server supports system emoji and symbol picker. [b]Windows, macOS[/b]"
+msgstr ""
+"Il server di visualizzazione supporta il selettore di emoji e simboli del "
+"sistema. [b]Windows, macOS[/b]"
+
 msgid "Makes the mouse cursor visible if it is hidden."
 msgstr "Rende visibile il cursore del mouse se è nascosto."
 
@@ -33738,6 +42308,9 @@ msgid "Confines the mouse cursor to the game window, and make it hidden."
 msgstr ""
 "Restringe il cursore del mouse alla finestra del gioco e lo rende nascosto."
 
+msgid "Max value of the [enum MouseMode]."
+msgstr "Valore massimo di [enum MouseMode]."
+
 msgid ""
 "Represents the screen containing the mouse pointer.\n"
 "[b]Note:[/b] On Linux (Wayland), this constant always represents the screen "
@@ -33915,6 +42488,77 @@ msgstr ""
 "dello schermo, tranne la barra delle applicazioni, e visualizzerà comunque i "
 "suoi bordi. Normalmente accade quando si preme il pulsante di massimizzazione."
 
+msgid ""
+"Full screen mode with full multi-window support.\n"
+"Full screen window covers the entire display area of a screen and has no "
+"decorations. The display's video mode is not changed.\n"
+"[b]On Android:[/b] This enables immersive mode.\n"
+"[b]On Windows:[/b] Multi-window full-screen mode has a 1px border of the "
+"[member ProjectSettings.rendering/environment/defaults/default_clear_color] "
+"color.\n"
+"[b]On macOS:[/b] A new desktop is used to display the running project.\n"
+"[b]Note:[/b] Regardless of the platform, enabling full screen will change the "
+"window size to match the monitor's size. Therefore, make sure your project "
+"supports [url=$DOCS_URL/tutorials/rendering/multiple_resolutions."
+"html]multiple resolutions[/url] when enabling full screen mode."
+msgstr ""
+"Modalità a schermo intero con supporto multi-finestra completo.\n"
+"La finestra a schermo intero copre l'intera area di visualizzazione di uno "
+"schermo e non ha decorazioni. La modalità video del display non cambia.\n"
+"[b]Su Android:[/b] Questo abilita la modalità immersiva.\n"
+"[b]Su Windows:[/b] La modalità a schermo intero multi-finestra ha un bordo di "
+"1px del colore di [member ProjectSettings.rendering/environment/defaults/"
+"default_clear_color].\n"
+"[b]Su macOS:[/b] È utilizzato un nuovo desktop per visualizzare il progetto "
+"in esecuzione.\n"
+"[b]Nota:[/b] A prescindere dalla piattaforma, abilitando lo schermo intero si "
+"modificheranno le dimensioni della finestra in modo che corrispondano alle "
+"dimensioni del monitor. Pertanto, assicurati che il tuo progetto supporti "
+"[url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html]diverse "
+"risoluzioni[/url] quando abiliti la modalità a schermo intero."
+
+msgid ""
+"A single window full screen mode. This mode has less overhead, but only one "
+"window can be open on a given screen at a time (opening a child window or "
+"application switching will trigger a full screen transition).\n"
+"Full screen window covers the entire display area of a screen and has no "
+"border or decorations. The display's video mode is not changed.\n"
+"[b]On Android:[/b] This enables immersive mode.\n"
+"[b]On Windows:[/b] Depending on video driver, full screen transition might "
+"cause screens to go black for a moment.\n"
+"[b]On macOS:[/b] A new desktop is used to display the running project. "
+"Exclusive full screen mode prevents Dock and Menu from showing up when the "
+"mouse pointer is hovering the edge of the screen.\n"
+"[b]On Linux (X11):[/b] Exclusive full screen mode bypasses compositor.\n"
+"[b]On Linux (Wayland):[/b] Equivalent to [constant WINDOW_MODE_FULLSCREEN].\n"
+"[b]Note:[/b] Regardless of the platform, enabling full screen will change the "
+"window size to match the monitor's size. Therefore, make sure your project "
+"supports [url=$DOCS_URL/tutorials/rendering/multiple_resolutions."
+"html]multiple resolutions[/url] when enabling full screen mode."
+msgstr ""
+"Modalità a schermo intero con una sola finestra. Questa modalità è più "
+"efficiente, ma può essere aperta solo una finestra alla volta su un "
+"determinato schermo (l'apertura di una finestra secondaria o il cambio "
+"dell'applicazione attiverà una transizione dallo schermo intero).\n"
+"La finestra a schermo intero copre l'intera area di visualizzazione di uno "
+"schermo e non ha bordi o decorazioni. La modalità video del display non "
+"cambia.\n"
+"[b]Su Android:[/b] Questo abilita la modalità immersiva.\n"
+"[b]Su Windows:[/b] A seconda del driver video, la transizione allo schermo "
+"intero potrebbe causare lo spegnimento momentaneo dello schermo.\n"
+"[b]Su macOS:[/b] È utilizzato un nuovo desktop per visualizzare il progetto "
+"in esecuzione. La modalità a schermo intero esclusiva impedisce che Dock e "
+"Menu vengano visualizzati quando il puntatore del mouse passa sul bordo dello "
+"schermo.\n"
+"[b]Su Linux (X11):[/b] La modalità a schermo intero esclusiva ignora il "
+"compositore.\n"
+"[b]Su Linux (Wayland):[/b] Equivalente a [constant WINDOW_MODE_FULLSCREEN].\n"
+"[b]Nota:[/b] A prescindere dalla piattaforma, abilitando lo schermo intero si "
+"modificheranno le dimensioni della finestra in modo che corrispondano alle "
+"dimensioni del monitor. Pertanto, assicurati che il tuo progetto supporti "
+"[url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html]diverse "
+"risoluzioni[/url] quando abiliti la modalità a schermo intero."
+
 msgid ""
 "The window can't be resized by dragging its resize grip. It's still possible "
 "to resize the window using [method window_set_size]. This flag is ignored for "
@@ -34003,6 +42647,13 @@ msgstr ""
 "Tutti gli eventi del mouse vengono passati alla finestra sottostante della "
 "stessa applicazione."
 
+msgid ""
+"Window style is overridden, forcing sharp corners.\n"
+"[b]Note:[/b] This flag is implemented only on Windows (11)."
+msgstr ""
+"Lo stile della finestra è sostituito, forzando angoli acuti.\n"
+"[b]Nota:[/b] Questo flag è implementato solo su Windows (11)."
+
 msgid "Max value of the [enum WindowFlags]."
 msgstr "Valore massimo di [enum WindowFlags]."
 
@@ -34012,6 +42663,12 @@ msgstr "Inviato quando il puntatore del mouse entra nella finestra."
 msgid "Sent when the mouse pointer exits the window."
 msgstr "Inviato quando il puntatore del mouse esce dalla finestra."
 
+msgid "Sent when the window grabs focus."
+msgstr "Inviato quando la finestra cattura il focus."
+
+msgid "Sent when the window loses focus."
+msgstr "Inviato quando la finestra perde il focus."
+
 msgid ""
 "Sent when the user has attempted to close the window (e.g. close button is "
 "pressed)."
@@ -34033,7 +42690,7 @@ msgid ""
 msgstr ""
 "Emesso quando la finestra viene spostata su un display con un DPI diverso, o "
 "il DPI del display viene cambiato.\n"
-"[b]Nota:[/b] Questa flag è implementata solo su macOS."
+"[b]Nota:[/b] Questo flag è implementata solo su macOS."
 
 msgid ""
 "Sent when the window title bar decoration is changed (e.g. [constant "
@@ -34046,6 +42703,33 @@ msgstr ""
 "impostato o la finestra è entrata/uscita dalla modalità a schermo intero).\n"
 "[b]Nota:[/b] Questo flag è implementato solo su macOS."
 
+msgid "Top-left edge of a window."
+msgstr "Bordo superiore sinistro di una finestra."
+
+msgid "Top edge of a window."
+msgstr "Bordo superiore di una finestra."
+
+msgid "Top-right edge of a window."
+msgstr "Bordo superiore destro di una finestra."
+
+msgid "Left edge of a window."
+msgstr "Bordo sinistro di una finestra."
+
+msgid "Right edge of a window."
+msgstr "Bordo destro di una finestra."
+
+msgid "Bottom-left edge of a window."
+msgstr "Bordo inferiore sinistro di una finestra."
+
+msgid "Bottom edge of a window."
+msgstr "Bordo inferiore di una finestra."
+
+msgid "Bottom-right edge of a window."
+msgstr "Bordo inferiore destro di una finestra."
+
+msgid "Represents the size of the [enum WindowResizeEdge] enum."
+msgstr "Rappresenta la dimensione dell'enumerazione [enum WindowResizeEdge]."
+
 msgid ""
 "No vertical synchronization, which means the engine will display frames as "
 "fast as possible (tearing may be visible). Framerate is unlimited (regardless "
@@ -34103,6 +42787,84 @@ msgstr ""
 "frequenza di aggiornamento del display. Si comporta come [constant "
 "VSYNC_ENABLED] quando si utilizza il metodo di rendering Compatibilità."
 
+msgid ""
+"Display handle:\n"
+"- Linux (X11): [code]X11::Display*[/code] for the display.\n"
+"- Linux (Wayland): [code]wl_display[/code] for the display.\n"
+"- Android: [code]EGLDisplay[/code] for the display."
+msgstr ""
+"Gestore del display:\n"
+"- Linux (X11): [code]X11::Display*[/code] per il display.\n"
+"- Linux (Wayland): [code]wl_display[/code] per il display.\n"
+"- Android: [code]EGLDisplay[/code] per il display."
+
+msgid ""
+"Window handle:\n"
+"- Windows: [code]HWND[/code] for the window.\n"
+"- Linux (X11): [code]X11::Window*[/code] for the window.\n"
+"- Linux (Wayland): [code]wl_surface[/code] for the window.\n"
+"- macOS: [code]NSWindow*[/code] for the window.\n"
+"- iOS: [code]UIViewController*[/code] for the view controller.\n"
+"- Android: [code]jObject[/code] for the activity."
+msgstr ""
+"Gestore della finestra:\n"
+"- Windows: [code]HWND[/code] per la finestra.\n"
+"- Linux (X11): [code]X11::Window*[/code] per la finestra.\n"
+"- Linux (Wayland): [code]wl_surface[/code] per la finestra.\n"
+"- macOS: [code]NSWindow*[/code] per la finestra.\n"
+"- iOS: [code]UIViewController*[/code] per il view controller.\n"
+"- Android: [code]jObject[/code] per l'attività."
+
+msgid ""
+"Window view:\n"
+"- Windows: [code]HDC[/code] for the window (only with the Compatibility "
+"renderer).\n"
+"- macOS: [code]NSView*[/code] for the window main view.\n"
+"- iOS: [code]UIView*[/code] for the window main view."
+msgstr ""
+"Vista della finestra:\n"
+"- Windows: [code]HDC[/code] per la finestra (solo con il renderer "
+"Compatibilità).\n"
+"- macOS: [code]NSView*[/code] per la vista principale della finestra.\n"
+"- iOS: [code]UIView*[/code] per la vista principale della finestra."
+
+msgid ""
+"OpenGL context (only with the Compatibility renderer):\n"
+"- Windows: [code]HGLRC[/code] for the window (native GL), or "
+"[code]EGLContext[/code] for the window (ANGLE).\n"
+"- Linux (X11): [code]GLXContext*[/code] for the window.\n"
+"- Linux (Wayland): [code]EGLContext[/code] for the window.\n"
+"- macOS: [code]NSOpenGLContext*[/code] for the window (native GL), or "
+"[code]EGLContext[/code] for the window (ANGLE).\n"
+"- Android: [code]EGLContext[/code] for the window."
+msgstr ""
+"Contesto OpenGL (solo con il renderer Compatibilità):\n"
+"- Windows: [code]HGLRC[/code] per la finestra (GL nativo) o [code]EGLContext[/"
+"code] per la finestra (ANGLE).\n"
+"- Linux (X11): [code]GLXContext*[/code] per la finestra.\n"
+"- Linux (Wayland): [code]EGLContext[/code] per la finestra.\n"
+"- macOS: [code]NSOpenGLContext*[/code] per la finestra (GL nativo) o "
+"[code]EGLContext[/code] per la finestra (ANGLE).\n"
+"- Android: [code]EGLContext[/code] per la finestra."
+
+msgid ""
+"- Windows: [code]EGLDisplay[/code] for the window (ANGLE).\n"
+"- macOS: [code]EGLDisplay[/code] for the window (ANGLE).\n"
+"- Linux (Wayland): [code]EGLDisplay[/code] for the window."
+msgstr ""
+"- Windows: [code]EGLDisplay[/code] per la finestra (ANGLE).\n"
+"- macOS: [code]EGLDisplay[/code] per la finestra (ANGLE).\n"
+"- Linux (Wayland): [code]EGLDisplay[/code] per la finestra."
+
+msgid ""
+"- Windows: [code]EGLConfig[/code] for the window (ANGLE).\n"
+"- macOS: [code]EGLConfig[/code] for the window (ANGLE).\n"
+"- Linux (Wayland): [code]EGLConfig[/code] for the window."
+msgstr ""
+"- Windows: [code]EGLConfig[/code] per la finestra (ANGLE).\n"
+"- macOS: [code]EGLConfig[/code] per la finestra (ANGLE).\n"
+"- Linux (Wayland): [code]EGLConfig[/code] per la finestra."
+
 msgid "Utterance has begun to be spoken."
 msgstr "L'espressione ha cominciato a essere pronunciata."
 
@@ -34206,9 +42968,150 @@ msgstr ""
 "- [param key_name]: [String] (Nome del tasto per un particolare [b]Comando[/"
 "b].)"
 
+msgid "Plugin for adding custom context menus in the editor."
+msgstr "Estensione per aggiungere menu contestuali personalizzati nell'editor."
+
 msgid "A base class to implement debugger plugins."
 msgstr "Una classe di base per implementare estensioni del debugger."
 
+msgid ""
+"[EditorDebuggerPlugin] provides functions related to the editor side of the "
+"debugger.\n"
+"To interact with the debugger, an instance of this class must be added to the "
+"editor via [method EditorPlugin.add_debugger_plugin].\n"
+"Once added, the [method _setup_session] callback will be called for every "
+"[EditorDebuggerSession] available to the plugin, and when new ones are "
+"created (the sessions may be inactive during this stage).\n"
+"You can retrieve the available [EditorDebuggerSession]s via [method "
+"get_sessions] or get a specific one via [method get_session].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorPlugin\n"
+"\n"
+"class ExampleEditorDebugger extends EditorDebuggerPlugin:\n"
+"\n"
+"    func _has_capture(capture):\n"
+"        # Return true if you wish to handle messages with the prefix "
+"\"my_plugin:\".\n"
+"        return capture == \"my_plugin\"\n"
+"\n"
+"    func _capture(message, data, session_id):\n"
+"        if message == \"my_plugin:ping\":\n"
+"            get_session(session_id).send_message(\"my_plugin:echo\", data)\n"
+"            return true\n"
+"        return false\n"
+"\n"
+"    func _setup_session(session_id):\n"
+"        # Add a new tab in the debugger session UI containing a label.\n"
+"        var label = Label.new()\n"
+"        label.name = \"Example plugin\" # Will be used as the tab title.\n"
+"        label.text = \"Example plugin\"\n"
+"        var session = get_session(session_id)\n"
+"        # Listens to the session started and stopped signals.\n"
+"        session.started.connect(func (): print(\"Session started\"))\n"
+"        session.stopped.connect(func (): print(\"Session stopped\"))\n"
+"        session.add_session_tab(label)\n"
+"\n"
+"var debugger = ExampleEditorDebugger.new()\n"
+"\n"
+"func _enter_tree():\n"
+"    add_debugger_plugin(debugger)\n"
+"\n"
+"func _exit_tree():\n"
+"    remove_debugger_plugin(debugger)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"To connect on the running game side, use the [EngineDebugger] singleton:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends Node\n"
+"\n"
+"func _ready():\n"
+"    EngineDebugger.register_message_capture(\"my_plugin\", _capture)\n"
+"    EngineDebugger.send_message(\"my_plugin:ping\", [\"test\"])\n"
+"\n"
+"func _capture(message, data):\n"
+"    # Note that the \"my_plugin:\" prefix is not used here.\n"
+"    if message == \"echo\":\n"
+"        prints(\"Echo received:\", data)\n"
+"        return true\n"
+"    return false\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] While the game is running, [method @GlobalScope.print] and "
+"similar functions [i]called in the editor[/i] do not print anything, the "
+"Output Log prints only game messages."
+msgstr ""
+"[EditorDebuggerPlugin] fornisce funzioni riguardo il debugger dal lato "
+"dell'editor.\n"
+"Per interagire con il debugger, un'istanza di questa classe deve essere "
+"aggiunta all'editor tramite [method EditorPlugin.add_debugger_plugin].\n"
+"Una volta aggiunta, il callback [method _setup_session] verrà chiamato per "
+"ogni [EditorDebuggerSession] disponibile per il plugin e quando ne vengono "
+"create di nuove (le sessioni potrebbero essere inattive durante questa "
+"fase).\n"
+"È possibile recuperare le [EditorDebuggerSession] disponibili tramite [method "
+"get_sessions] o ottenerne una specifica tramite [method get_session].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorPlugin\n"
+"\n"
+"class ExampleEditorDebugger extends EditorDebuggerPlugin:\n"
+"\n"
+"    func _has_capture(prefix):\n"
+"        # Restituisci true se desideri gestire il messaggio con questo "
+"prefisso.\n"
+"        return prefix == \"my_plugin\"\n"
+"\n"
+"    func _capture(message, data, session_id):\n"
+"        if message == \"my_plugin:ping\":\n"
+"            get_session(session_id).send_message(\"my_plugin:echo\", data)\n"
+"\n"
+"    func _setup_session(session_id):\n"
+"        # Aggiunge una nuova scheda nell'interfaccia utente della sessione "
+"del debugger contenente un'etichetta.\n"
+"        var label = Label.new()\n"
+"        label.name = \"Example plugin\"\n"
+"        label.text = \"Example plugin\"\n"
+"        var session = get_session(session_id)\n"
+"        # Ascolta i segnali di avvio e arresto della sessione.\n"
+"        session.started.connect(func (): print(\"Session avviata\"))\n"
+"        session.stopped.connect(func (): print(\"Sessione arrestata\"))\n"
+"        session.add_session_tab(label)\n"
+"\n"
+"var debugger = ExampleEditorDebugger.new()\n"
+"\n"
+"func _enter_tree():\n"
+"    add_debugger_plugin(debugger)\n"
+"\n"
+"func _exit_tree():\n"
+"    remove_debugger_plugin(debugger)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Per connettersi dal lato del gioco in esecuzione, usa il singleton "
+"[EngineDebugger]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends Node\n"
+"\n"
+"func _ready():\n"
+"    EngineDebugger.register_message_capture(\"my_plugin\", _capture)\n"
+"    EngineDebugger.send_message(\"my_plugin:ping\", [\"test\"])\n"
+"\n"
+"func _capture(message, data):\n"
+"    # Nota che il prefisso \"my_plugin:\" non è utilizzato qui.\n"
+"    if message == \"echo\":\n"
+"        prints(\"Eco ricevuto:\", data)\n"
+"        return true\n"
+"    return false\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Mentre il gioco è in esecuzione, [method @GlobalScope.print] e "
+"funzioni simili [i]chiamate nell'editor[/i] non stampano nulla, il log di "
+"output stampa solo i messaggi del gioco."
+
 msgid ""
 "Override this method to be notified when a breakpoint is set in the editor."
 msgstr ""
@@ -34222,6 +43125,17 @@ msgstr ""
 "Sostituisci questo metodo per essere notificato quando tutti i punti "
 "d'interruzione vengono cancellati nell'editor."
 
+msgid ""
+"Override this method to process incoming messages. The [param session_id] is "
+"the ID of the [EditorDebuggerSession] that received the [param message]. Use "
+"[method get_session] to retrieve the session. This method should return "
+"[code]true[/code] if the message is recognized."
+msgstr ""
+"Sostituisci questo metodo per elaborare i messaggi in arrivo. Il [param "
+"session_id] è l'ID dell'[EditorDebuggerSession] che ha ricevuto il messaggio. "
+"Usa [method get_session] per recuperare la sessione. Questo metodo dovrebbe "
+"restituire [code]true[/code] se il messaggio viene riconosciuto."
+
 msgid ""
 "Override this method to be notified when a breakpoint line has been clicked "
 "in the debugger breakpoint panel."
@@ -34230,6 +43144,23 @@ msgstr ""
 "riga con un punto d'interruzione nel pannello dei punti d'interruzione del "
 "debugger."
 
+msgid ""
+"Override this method to enable receiving messages from the debugger. If "
+"[param capture] is \"my_message\" then messages starting with \"my_message:\" "
+"will be passed to the [method _capture] method."
+msgstr ""
+"Sostituisci questo metodo per abilitare la ricezione di messaggi dal "
+"debugger. Se [param capture] è \"my_message\", i messaggi che iniziano con "
+"\"my_message:\" saranno passati al metodo [method _capture]."
+
+msgid ""
+"Override this method to be notified whenever a new [EditorDebuggerSession] is "
+"created. Note that the session may be inactive during this stage."
+msgstr ""
+"Sostituisci questo metodo per essere notificato ogni volta che viene creato "
+"un nuovo [EditorDebuggerSession]. Nota che la sessione potrebbe essere "
+"inattiva durante questa fase."
+
 msgid "Returns the [EditorDebuggerSession] with the given [param id]."
 msgstr "Restituisce l'[EditorDebuggerSession] con il [param id] fornito."
 
@@ -34260,6 +43191,14 @@ msgstr ""
 "add_session_tab], inviare messaggi tramite [method send_message] e commutare "
 "gli [EngineProfiler] tramite [method toggle_profiler]."
 
+msgid ""
+"Adds the given [param control] to the debug session UI in the debugger bottom "
+"panel. The [param control]'s node name will be used as the tab title."
+msgstr ""
+"Aggiunge il [param control] specificato all'interfaccia utente della sessione "
+"di debug nel pannello inferiore del debugger. Il nome del nodo [param "
+"control] sarà usato come titolo della scheda."
+
 msgid ""
 "Returns [code]true[/code] if the debug session is currently attached to a "
 "remote instance."
@@ -34346,9 +43285,76 @@ msgstr ""
 "Identifica una piattaforma di esportazione supportata e fornisce internamente "
 "la funzionalità di esportazione verso tale piattaforma."
 
+msgid ""
+"Base resource that provides the functionality of exporting a release build of "
+"a project to a platform, from the editor. Stores platform-specific metadata "
+"such as the name and supported features of the platform, and performs the "
+"exporting of projects, PCK files, and ZIP files. Uses an export template for "
+"the platform provided at the time of project exporting.\n"
+"Used in scripting by [EditorExportPlugin] to configure platform-specific "
+"customization of scenes and resources. See [method EditorExportPlugin."
+"_begin_customize_scenes] and [method EditorExportPlugin."
+"_begin_customize_resources] for more details."
+msgstr ""
+"Risorsa base che fornisce la funzionalità di esportazione di una build di "
+"rilascio di un progetto su una piattaforma, dall'editor. Memorizza metadati "
+"specifici della piattaforma, come il nome e le funzionalità supportate della "
+"piattaforma, ed esegue l'esportazione dei progetti, dei file PCK e dei file "
+"ZIP. Utilizza un modello d'esportazione per la piattaforma fornito al momento "
+"dell'esportazione del progetto.\n"
+"Utilizzato in scripting da [EditorExportPlugin] per configurare la "
+"personalizzazione specifica per una piattaforma di scene e di risorse. "
+"Consulta [method EditorExportPlugin._begin_customize_scenes] e [method "
+"EditorExportPlugin._begin_customize_resources] per ulteriori dettagli."
+
 msgid "Console support in Godot"
 msgstr "Supporto per le console in Godot"
 
+msgid ""
+"Adds a message to the export log that will be displayed when exporting ends."
+msgstr ""
+"Aggiunge un messaggio al log d'esportazione che sarà visualizzato al termine "
+"dell'esportazione."
+
+msgid "Clears the export log."
+msgstr "Cancella il log d'esportazione."
+
+msgid "Create a new preset for this platform."
+msgstr "Crea una nuova preimpostazione per questa piattaforma."
+
+msgid "Creates a PCK archive at [param path] for the specified [param preset]."
+msgstr ""
+"Crea un archivio PCK nel percorso [param path] per la preimpostazione [param "
+"preset]."
+
+msgid "Creates a full project at [param path] for the specified [param preset]."
+msgstr ""
+"Crea un progetto completo nel percorso [param path] per la preimpostazione "
+"[param preset]."
+
+msgid "Create a ZIP archive at [param path] for the specified [param preset]."
+msgstr ""
+"Crea un archivio ZIP nel percorso [param path] per la preimpostazione [param "
+"preset]."
+
+msgid "Returns message category, for the message with [param index]."
+msgstr ""
+"Restituisce la categoria del messaggio, per il messaggio con l'indice [param "
+"index]."
+
+msgid "Returns number of messages in the export log."
+msgstr "Restituisce il numero di messaggi nel log d'esportazione."
+
+msgid "Returns message text, for the message with [param index]."
+msgstr ""
+"Restituisce il testo del messaggio, per il messaggio con l'indice [param "
+"index]."
+
+msgid "Returns message type, for the message with [param index]."
+msgstr ""
+"Restituisce il tipo del messaggio, per il messaggio con l'indice [param "
+"index]."
+
 msgid ""
 "Returns the name of the export operating system handled by this "
 "[EditorExportPlatform] class, as a friendly string. Possible return values "
@@ -34360,6 +43366,17 @@ msgstr ""
 "valori restituiti sono [code]Windows[/code], [code]Linux[/code], [code]macOS[/"
 "code], [code]Android[/code], [code]iOS[/code] e [code]Web[/code]."
 
+msgid "Returns most severe message type currently present in the export log."
+msgstr ""
+"Restituisce il tipo di messaggio più severo attualmente presente nel log "
+"d'esportazione."
+
+msgid ""
+"Invalid message type used as the default value when no type is specified."
+msgstr ""
+"Tipo di messaggio non valido utilizzato come valore predefinito quando nessun "
+"tipo viene specificato."
+
 msgid "Exporter for Android."
 msgstr "Esportatore per Android."
 
@@ -34394,6 +43411,13 @@ msgstr ""
 "crittografia PCK. Consulta [url=https://developer.android.com/google/play/"
 "expansion-files]File di espansione APK[/url]"
 
+msgid ""
+"Base64 encoded RSA public key for your publisher account, available from the "
+"profile page on the \"Google Play Console\"."
+msgstr ""
+"Chiave pubblica RSA codificata in Base64 per il tuo account publisher, "
+"disponibile nella pagina del profilo su \"Google Play Console\"."
+
 msgid ""
 "If [code]true[/code], [code]arm64[/code] binaries are included into exported "
 "project."
@@ -34484,6 +43508,26 @@ msgstr ""
 "Percorso alla cartella di compilazione di Gradle. Se lasciato vuoto, verrà "
 "utilizzato [code]res://android[/code]."
 
+msgid ""
+"Minimum Android API level required for the application to run (used during "
+"Gradle build). See [url=https://developer.android.com/guide/topics/manifest/"
+"uses-sdk-element#uses]android:minSdkVersion[/url]."
+msgstr ""
+"Livello API Android minimo richiesto per l'esecuzione dell'applicazione "
+"(utilizzato durante la compilazione Gradle). Consulta [url=https://developer."
+"android.com/guide/topics/manifest/uses-sdk-element#uses]android:"
+"minSdkVersion[/url]."
+
+msgid ""
+"The Android API level on which the application is designed to run (used "
+"during Gradle build). See [url=https://developer.android.com/guide/topics/"
+"manifest/uses-sdk-element#uses]android:targetSdkVersion[/url]."
+msgstr ""
+"Livello API Android su cui è progettata l'applicazione per essere eseguita "
+"(utilizzato durante la compilazione Gradle). Consulta [url=https://developer."
+"android.com/guide/topics/manifest/uses-sdk-element#uses]android:"
+"targetSdkVersion[/url]."
+
 msgid "If [code]true[/code], Gradle build is used instead of pre-built APK."
 msgstr ""
 "Se [code]true[/code], la build di Gradle è utilizzata invece dell'APK "
@@ -34496,6 +43540,72 @@ msgstr ""
 "Se [code]true[/code], sarà creato il contesto di debug di OpenGL ES "
 "(verifiche, convalida e logging aggiuntivi in fase di esecuzione)."
 
+msgid ""
+"Path of the debug keystore file.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_ANDROID_KEYSTORE_DEBUG_PATH[/code].\n"
+"Fallbacks to [code]EditorSettings.export/android/debug_keystore[/code] if "
+"empty."
+msgstr ""
+"Percorso del file keystore di debug.\n"
+"Può essere sovrascritto con la variabile di ambiente "
+"[code]GODOT_ANDROID_KEYSTORE_DEBUG_PATH[/code].\n"
+"Predefinito su [code]EditorSettings.export/android/debug_keystore[/code] se "
+"vuoto."
+
+msgid ""
+"Password for the debug keystore file.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_ANDROID_KEYSTORE_DEBUG_PASSWORD[/code].\n"
+"Fallbacks to [code]EditorSettings.export/android/debug_keystore_pass[/code] "
+"if both it and [member keystore/debug] are empty."
+msgstr ""
+"Password per il file keystore di debug.\n"
+"Può essere sovrascritto con la variabile di ambiente "
+"[code]GODOT_ANDROID_KEYSTORE_DEBUG_PASSWORD[/code].\n"
+"Predefinito su [code]EditorSettings.export/android/debug_keystore_pass[/code] "
+"se sia esso che [member keystore/debug] sono vuoti."
+
+msgid ""
+"User name for the debug keystore file.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_ANDROID_KEYSTORE_DEBUG_USER[/code].\n"
+"Fallbacks to [code]EditorSettings.export/android/debug_keystore_user[/code] "
+"if both it and [member keystore/debug] are empty."
+msgstr ""
+"Nome utente per il file keystore di debug.\n"
+"Può essere sovrascritto con la variabile di ambiente "
+"[code]GODOT_ANDROID_KEYSTORE_DEBUG_USER[/code].\n"
+"Predefinito su [code]EditorSettings.export/android/debug_keystore_user[/code] "
+"se sia esso che [member keystore/debug] sono vuoti."
+
+msgid ""
+"Path of the release keystore file.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_ANDROID_KEYSTORE_RELEASE_PATH[/code]."
+msgstr ""
+"Percorso del file keystore di rilascio.\n"
+"Può essere sovrascritto con la variabile di ambiente "
+"[code]GODOT_ANDROID_KEYSTORE_RELEASE_PATH[/code]."
+
+msgid ""
+"Password for the release keystore file.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_ANDROID_KEYSTORE_RELEASE_PASSWORD[/code]."
+msgstr ""
+"Password per il file keystore di rilascio.\n"
+"Può essere sovrascritta con la variabile di ambiente "
+"[code]GODOT_ANDROID_KEYSTORE_RELEASE_PASSWORD[/code]."
+
+msgid ""
+"User name for the release keystore file.\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_ANDROID_KEYSTORE_RELEASE_USER[/code]."
+msgstr ""
+"Nome utente per il file keystore di rilascio.\n"
+"Può essere sovrascritto con la variabile di ambiente "
+"[code]GODOT_ANDROID_KEYSTORE_RELEASE_USER[/code]."
+
 msgid ""
 "Background layer of the application adaptive icon file. See [url=https://"
 "developer.android.com/develop/ui/views/launch/icon_design_adaptive#design-"
@@ -34514,6 +43624,15 @@ msgstr ""
 "Consulta [url=https://developer.android.com/develop/ui/views/launch/"
 "icon_design_adaptive#design-adaptive-icons]Progettare icone adattive[/url]."
 
+msgid ""
+"Monochrome layer of the application adaptive icon file. See [url=https://"
+"developer.android.com/develop/ui/views/launch/icon_design_adaptive#design-"
+"adaptive-icons]Design adaptive icons[/url]."
+msgstr ""
+"Livello monocromatico del file dell'icona adattiva dell'applicazione. "
+"Consulta [url=https://developer.android.com/develop/ui/views/launch/"
+"icon_design_adaptive#design-adaptive-icons]Progettare icone adattive[/url]."
+
 msgid ""
 "Application icon file. If left empty, it will fallback to [member "
 "ProjectSettings.application/config/icon]."
@@ -34556,6 +43675,18 @@ msgstr ""
 "developer.android.com/guide/topics/manifest/application-"
 "element#fragileuserdata]android:hasFragileUserData[/url]."
 
+msgid ""
+"If [code]true[/code], the user will be able to set this app as the system "
+"launcher in Android preferences."
+msgstr ""
+"Se [code]true[/code], l'utente sarà in grado di impostare questa applicazione "
+"come il lanciatore di sistema nelle preferenze Android."
+
+msgid "If [code]true[/code], this app will show in Android TV launcher UI."
+msgstr ""
+"Se [code]true[/code], questa applicazione sarà mostrata nell'interfaccia "
+"utente del launcher di Android TV."
+
 msgid ""
 "If [code]true[/code], this app will show in the device's app library.\n"
 "[b]Note:[/b] This is [code]true[/code] by default."
@@ -34564,6 +43695,9 @@ msgstr ""
 "dispositivo.\n"
 "[b]Nota:[/b] Questo è [code]true[/code] per impostazione predefinita."
 
+msgid "If [code]true[/code], package signing is enabled."
+msgstr "Se [code]true[/code], la firma del pacchetto è abilitata."
+
 msgid ""
 "Unique application identifier in a reverse-DNS format. The reverse DNS format "
 "should preferably match a domain name you control, but this is not strictly "
@@ -34609,6 +43743,16 @@ msgstr ""
 "pubblicata su Google Play deve utilizzare lo stesso nome di pacchetto della "
 "tua. Altrimenti, non potrai pubblicare la tua app su Google Play."
 
+msgid ""
+"Allows read/write access to the \"properties\" table in the checkin database. "
+"See [url=https://developer.android.com/reference/android/Manifest."
+"permission#ACCESS_CHECKIN_PROPERTIES]ACCESS_CHECKIN_PROPERTIES[/url]."
+msgstr ""
+"Consente l'accesso in lettura/scrittura alla tabella \"proprietà\" nel "
+"database di check-in. Consulta [url=https://developer.android.com/reference/"
+"android/Manifest."
+"permission#ACCESS_CHECKIN_PROPERTIES]ACCESS_CHECKIN_PROPERTIES[/url]."
+
 msgid ""
 "Allows access to the approximate location information. See [url=https://"
 "developer.android.com/reference/android/Manifest."
@@ -34638,6 +43782,16 @@ msgstr ""
 "permission#ACCESS_LOCATION_EXTRA_COMMANDS]ACCESS_LOCATION_EXTRA_COMMANDS[/"
 "url]."
 
+msgid ""
+"Allows an application to access any geographic locations persisted in the "
+"user's shared collection. See [url=https://developer.android.com/reference/"
+"android/Manifest.permission#ACCESS_MEDIA_LOCATION]ACCESS_MEDIA_LOCATION[/url]."
+msgstr ""
+"Consente a un'applicazione di accedere a qualsiasi posizione geografica "
+"mantenuta nella raccolta condivisa dell'utente. Consulta [url=https://"
+"developer.android.com/reference/android/Manifest."
+"permission#ACCESS_MEDIA_LOCATION]ACCESS_MEDIA_LOCATION[/url]."
+
 msgid "Allows an application to create mock location providers for testing."
 msgstr ""
 "Consente a un'applicazione di creare fornitori di posizione fittizi per "
@@ -34666,6 +43820,15 @@ msgstr ""
 "developer.android.com/reference/android/Manifest."
 "permission#ACCESS_WIFI_STATE]ACCESS_WIFI_STATE[/url]."
 
+msgid ""
+"Allows applications to call into AccountAuthenticators. See [url=https://"
+"developer.android.com/reference/android/Manifest."
+"permission#ACCOUNT_MANAGER]ACCOUNT_MANAGER[/url]."
+msgstr ""
+"Consente alle applicazioni di chiamare all'interno dei AccountAuthenticator. "
+"Consulta [url=https://developer.android.com/reference/android/Manifest."
+"permission#ACCOUNT_MANAGER]ACCOUNT_MANAGER[/url]."
+
 msgid ""
 "Allows an application to add voicemails into the system. See [url=https://"
 "developer.android.com/reference/android/Manifest."
@@ -34821,6 +43984,17 @@ msgstr ""
 "Consulta [url=https://developer.android.com/reference/android/Manifest."
 "permission#BLUETOOTH_ADMIN]BLUETOOTH_ADMIN[/url]."
 
+msgid ""
+"Allows applications to pair bluetooth devices without user interaction, and "
+"to allow or disallow phonebook access or message access. See [url=https://"
+"developer.android.com/reference/android/Manifest."
+"permission#BLUETOOTH_PRIVILEGED]BLUETOOTH_PRIVILEGED[/url]."
+msgstr ""
+"Consente alle applicazioni di associare dispositivi Bluetooth senza "
+"interazione dell'utente e di consentire o impedire l'accesso alla rubrica o "
+"ai messaggi. Consulta [url=https://developer.android.com/reference/android/"
+"Manifest.permission#BLUETOOTH_PRIVILEGED]BLUETOOTH_PRIVILEGED[/url]."
+
 msgid "Required to be able to disable the device (very dangerous!)."
 msgstr "Necessario per poter disattivare il dispositivo (molto pericoloso!)."
 
@@ -34991,6 +44165,14 @@ msgstr ""
 msgid "Allows low-level access to power management."
 msgstr "Consente l'accesso di basso livello alla gestione dell'alimentazione."
 
+msgid ""
+"Allows applications to RW to diagnostic resources. See [url=https://developer."
+"android.com/reference/android/Manifest.permission#DIAGNOSTIC]DIAGNOSTIC[/url]."
+msgstr ""
+"Consente alle applicazioni di eseguire operazioni di lettura e di scrittura "
+"per diagnosticare le risorse. Consulta [url=https://developer.android.com/"
+"reference/android/Manifest.permission#DIAGNOSTIC]DIAGNOSTIC[/url]."
+
 msgid ""
 "Allows applications to disable the keyguard if it is not secure. See "
 "[url=https://developer.android.com/reference/android/Manifest."
@@ -35018,6 +44200,15 @@ msgstr ""
 "Consulta [url=https://developer.android.com/reference/android/Manifest."
 "permission#EXPAND_STATUS_BAR]EXPAND_STATUS_BAR[/url]."
 
+msgid ""
+"Run as a manufacturer test application, running as the root user. See "
+"[url=https://developer.android.com/reference/android/Manifest."
+"permission#FACTORY_TEST]FACTORY_TEST[/url]."
+msgstr ""
+"Esegue come applicazione di test del produttore, in esecuzione come utente "
+"root. Consulta [url=https://developer.android.com/reference/android/Manifest."
+"permission#FACTORY_TEST]FACTORY_TEST[/url]."
+
 msgid "Allows access to the flashlight."
 msgstr "Consente l'accesso alla torcia."
 
@@ -35162,6 +44353,16 @@ msgstr ""
 "android.com/reference/android/Manifest."
 "permission#MANAGE_DOCUMENTS]MANAGE_DOCUMENTS[/url]."
 
+msgid ""
+"Allows an application a broad access to external storage in scoped storage. "
+"See [url=https://developer.android.com/reference/android/Manifest."
+"permission#MANAGE_EXTERNAL_STORAGE]MANAGE_EXTERNAL_STORAGE[/url]."
+msgstr ""
+"Consente a un'applicazione un ampio accesso all'archiviazione esterna in un "
+"archivio delimitato. Consulta [url=https://developer.android.com/reference/"
+"android/Manifest.permission#MANAGE_EXTERNAL_STORAGE]MANAGE_EXTERNAL_STORAGE[/"
+"url]."
+
 msgid ""
 "See [url=https://developer.android.com/reference/android/Manifest."
 "permission#MASTER_CLEAR]MASTER_CLEAR[/url]."
@@ -35320,6 +44521,47 @@ msgstr ""
 "sistema . Consulta [url=https://developer.android.com/reference/android/"
 "Manifest.permission#READ_LOGS]READ_LOGS[/url]."
 
+msgid ""
+"Allows an application to read audio files from external storage. See "
+"[url=https://developer.android.com/reference/android/Manifest."
+"permission#READ_MEDIA_AUDIO]READ_MEDIA_AUDIO[/url]."
+msgstr ""
+"Consente a un'applicazione di leggere file audio da una memoria esterna. "
+"Consulta [url=https://developer.android.com/reference/android/Manifest."
+"permission#READ_MEDIA_AUDIO]READ_MEDIA_AUDIO[/url]."
+
+msgid ""
+"Allows an application to read image files from external storage. See "
+"[url=https://developer.android.com/reference/android/Manifest."
+"permission#READ_MEDIA_IMAGES]READ_MEDIA_IMAGES[/url]."
+msgstr ""
+"Consente a un'applicazione di leggere file immagine da un archivio esterno. "
+"Consulta [url=https://developer.android.com/reference/android/Manifest."
+"permission#READ_MEDIA_IMAGES]READ_MEDIA_IMAGES[/url]."
+
+msgid ""
+"Allows an application to read video files from external storage. See "
+"[url=https://developer.android.com/reference/android/Manifest."
+"permission#READ_MEDIA_VIDEO]READ_MEDIA_VIDEO[/url]."
+msgstr ""
+"Consente a un'applicazione di leggere file video da un archivio esterno. "
+"Consulta [url=https://developer.android.com/reference/android/Manifest."
+"permission#READ_MEDIA_VIDEO]READ_MEDIA_VIDEO[/url]."
+
+msgid ""
+"Allows an application to read image or video files from external storage that "
+"a user has selected via the permission prompt photo picker. See [url=https://"
+"developer.android.com/reference/android/Manifest."
+"permission#READ_MEDIA_VISUAL_USER_SELECTED]READ_MEDIA_VISUAL_USER_SELECTED[/"
+"url]."
+msgstr ""
+"Consente a un'applicazione di leggere file immagine o video da una memoria "
+"esterna che un utente ha selezionato tramite il messaggio di autorizzazione "
+"del selettore foto. Consulta [url=https://developer.android.com/reference/"
+"android/Manifest."
+"permission#READ_MEDIA_VISUAL_USER_SELECTED]READ_MEDIA_VISUAL_USER_SELECTED[/"
+"url]."
+
 msgid ""
 "Allows read only access to phone state. See [url=https://developer.android."
 "com/reference/android/Manifest.permission#READ_PHONE_STATE]READ_PHONE_STATE[/"
@@ -35357,6 +44599,14 @@ msgstr ""
 msgid "Allows an application to write SMS messages."
 msgstr "Consente a un'applicazione di scrivere messaggi SMS."
 
+msgid ""
+"If [code]true[/code], hides navigation and status bar. See [method "
+"DisplayServer.window_set_mode] to toggle it at runtime."
+msgstr ""
+"Se [code]true[/code], nasconde la barra di navigazione e di stato. Vedi "
+"[method DisplayServer.window_set_mode] per cambiarne la visibilità durante "
+"l'esecuzione."
+
 msgid "Indicates whether the application supports smaller screen form-factors."
 msgstr "Indica se l'applicazione supporta fattori forma di schermi più piccoli."
 
@@ -35390,6 +44640,139 @@ msgstr ""
 msgid "The extended reality (XR) mode for this application."
 msgstr "Modalità di realtà estesa (XR) per questa applicazione."
 
+msgid "Base class for custom [EditorExportPlatform] implementations (plugins)."
+msgstr ""
+"Classe base per implementazioni di [EditorExportPlatform] personalizzate "
+"(estensioni)."
+
+msgid ""
+"External [EditorExportPlatform] implementations should inherit from this "
+"class.\n"
+"To use [EditorExportPlatform], register it using the [method EditorPlugin."
+"add_export_platform] method first."
+msgstr ""
+"Implementazioni esterne di [EditorExportPlatform] dovrebbero ereditare da "
+"questa classe.\n"
+"Per utilizzare [EditorExportPlatform], registrarlo prima attraverso il metodo "
+"[method EditorPlugin.add_export_platform]."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Called by the editor before platform is unregistered."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Chiamato prima che la registrazione della piattaforma venga annullata."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns device architecture for one-click deploy."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce l'architettura del dispositivo per la distribuzione con un click."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns export platform name."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce il nome della piattaforma d'esportazione."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns one-click deploy menu item label for the specified [param device]."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce l'identificatore della voce nel menu di distribuzione con un "
+"click per il dispositivo [param device]."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns one-click deploy menu item tooltip for the specified [param device]."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce il suggerimento della voce nel menu di distribuzione con un click "
+"per il dispositivo [param device]."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns number one-click deploy devices (or other one-click option displayed "
+"in the menu)."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce il numero di dispositivi per la distribuzione con un click (o "
+"altre opzioni con un click visualizzate nel menu)."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns tooltip of the one-click deploy menu button."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce il suggerimento del pulsante del menu di distribuzione con un "
+"click."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns target OS name."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce il nome dell'OS di destinazione."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns array of platform specific features."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce un array di funzionalità specifiche per la piattaforma."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns array of platform specific features for the specified [param preset]."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce un array di funzionalità specifiche per la piattaforma per il "
+"[param preset] specificato."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns [code]true[/code] if export configuration is valid."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce [code]true[/code] se la configurazione d'esportazione è valida."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns [code]true[/code] if project configuration is valid."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce [code]true[/code] se la configurazione del progetto è valida."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns [code]true[/code] if specified file is a valid executable (native "
+"executable or script) for the target platform."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce [code]true[/code] se il file specificato è un eseguibile valido "
+"(eseguibile nativo o script) per la piattaforma di destinazione."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns [code]true[/code] if one-click deploy options are changed and editor "
+"interface should be updated."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce [code]true[/code] se le opzioni di distribuzione con un click "
+"sono cambiate e l'interfaccia dell'editor dovrebbe essere aggiornata."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns [code]true[/code] if export options list is changed and presets "
+"should be updated."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce [code]true[/code] se la lista delle opzioni di esportazione è "
+"cambiata e i preset dovrebbero essere aggiornati."
+
 msgid "Exporter for iOS."
 msgstr "Esportatore per iOS."
 
@@ -35418,6 +44801,19 @@ msgstr ""
 "<string>value</string>\n"
 "[/codeblock]"
 
+msgid ""
+"Apple Team ID, unique 10-character string. To locate your Team ID check "
+"\"Membership details\" section in your Apple developer account dashboard, or "
+"\"Organizational Unit\" of your code signing certificate. See [url=https://"
+"developer.apple.com/help/account/manage-your-team/locate-your-team-id]Locate "
+"your Team ID[/url]."
+msgstr ""
+"ID team Apple, una stringa univoca di 10 caratteri. Per individuare il tuo ID "
+"team, controlla la sezione \"Dettagli abbonamento\" nella dashboard del tuo "
+"account sviluppatore Apple o \"Unità organizzativa\" del tuo certificato di "
+"firma del codice. Consulta [url=https://developer.apple.com/it/help/account/"
+"manage-your-team/locate-your-team-id]Individuare l’ID team[/url]."
+
 msgid ""
 "Unique application identifier in a reverse-DNS format, can only contain "
 "alphanumeric characters ([code]A-Z[/code], [code]a-z[/code], and [code]0-9[/"
@@ -35485,6 +44881,34 @@ msgstr ""
 "formato [code]major.minor.patch[/code] o [code]major.minor[/code], può "
 "contenere solo caratteri numerici ([code]0-9[/code]) e punti ([code].[/code])."
 
+msgid ""
+"Name of the provisioning profile. Sets XCode PROVISIONING_PROFILE_SPECIFIER "
+"for debug. [url=https://developer.apple.com/documentation/xcode/build-"
+"settings-reference#Provisioning-Profile]Used for manual provisioning[/url].\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_IOS_PROFILE_SPECIFIER_DEBUG[/code]."
+msgstr ""
+"Nome del profilo di provisioning. Imposta XCode "
+"PROVISIONING_PROFILE_SPECIFIER per il debug. [url=https://developer.apple.com/"
+"documentation/xcode/build-settings-reference#Provisioning-Profile]Usato per "
+"il provisioning manuale[/url].\n"
+"Può essere sovrascritto con la variabile di ambiente "
+"[code]GODOT_IOS_PROFILE_SPECIFIER_DEBUG[/code]."
+
+msgid ""
+"Name of the provisioning profile. Sets XCode PROVISIONING_PROFILE_SPECIFIER "
+"for release. [url=https://developer.apple.com/documentation/xcode/build-"
+"settings-reference#Provisioning-Profile]Used for manual provisioning[/url].\n"
+"Can be overridden with the environment variable "
+"[code]GODOT_IOS_PROFILE_SPECIFIER_RELEASE[/code]."
+msgstr ""
+"Nome del profilo di provisioning. Imposta XCode "
+"PROVISIONING_PROFILE_SPECIFIER per il rilascio. [url=https://developer.apple."
+"com/documentation/xcode/build-settings-reference#Provisioning-Profile]Usato "
+"per il provisioning manuale[/url].\n"
+"Può essere sovrascritto con la variabile di ambiente "
+"[code]GODOT_IOS_PROFILE_SPECIFIER_RELEASE[/code]."
+
 msgid ""
 "UUID of the provisioning profile. If left empty, Xcode will download or "
 "create a provisioning profile automatically. See [url=https://developer.apple."
@@ -35580,6 +45004,54 @@ msgstr ""
 "Percorso al modello di esportazione personalizzato. Se lasciato vuoto, viene "
 "utilizzato il modello predefinito."
 
+msgid ""
+"Additional data added to the root [code]<dict>[/code] section of the "
+"[url=https://developer.apple.com/documentation/bundleresources/entitlements]."
+"entitlements[/url] file. The value should be an XML section with pairs of key-"
+"value elements, for example:\n"
+"[codeblock lang=text]\n"
+"<key>key_name</key>\n"
+"<string>value</string>\n"
+"[/codeblock]"
+msgstr ""
+"Ulteriori dati aggiunti alla sezione radice [code]<dict>[/code] del file "
+"[url=https://developer.apple.com/documentation/bundleresources/entitlements]."
+"entitlements[/url]. Il valore dovrebbe essere una sezione XML con coppie di "
+"elementi chiave-valore, ad esempio:\n"
+"[codeblock lang=text]\n"
+"<key>key_name</key>\n"
+"<string>value</string>\n"
+"[/codeblock]"
+
+msgid ""
+"Enable to allow access to Game Center features. [url=https://developer.apple."
+"com/documentation/bundleresources/entitlements/com_apple_developer_game-"
+"center]com.apple.developer.game-center[/url]."
+msgstr ""
+"Abilita per consentire l'accesso alle funzionalità del Game Center. Consulta "
+"[url=https://developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_developer_game-center]com.apple.developer.game-center[/url]."
+
+msgid ""
+"Enable if app may perform better with a higher memory limit. [url=https://"
+"developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_developer_kernel_increased-memory-limit]com.apple.developer.kernel."
+"increased-memory-limit[/url]."
+msgstr ""
+"Abilita se l'applicazione potrebbe funzionare meglio con un limite di memoria "
+"più elevato. Consulta [url=https://developer.apple.com/documentation/"
+"bundleresources/entitlements/com_apple_developer_kernel_increased-memory-"
+"limit]com.apple.developer.kernel.increased-memory-limit[/url]."
+
+msgid ""
+"Environment for Apple Push Notification service. See [url=https://developer."
+"apple.com/documentation/bundleresources/entitlements/aps-environment]aps-"
+"environment[/url]."
+msgstr ""
+"Ambiente per il servizio Apple Push Notification. Consulta [url=https://"
+"developer.apple.com/documentation/bundleresources/entitlements/aps-"
+"environment]aps-environment[/url]."
+
 msgid ""
 "App Store application icon file. If left empty, it will fallback to [member "
 "ProjectSettings.application/config/icon]. See [url=https://developer.apple."
@@ -35590,6 +45062,140 @@ msgstr ""
 "[url=https://developer.apple.com/design/human-interface-guidelines/"
 "foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"App Store application icon file, dark version. See [url=https://developer."
+"apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/"
+"url]."
+msgstr ""
+"File icona dell'applicazione sull'App Store, versione scura. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"App Store application icon file, tinted version. See [url=https://developer."
+"apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/"
+"url]."
+msgstr ""
+"File icona dell'applicazione sull'App Store, versione tinta. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Base application icon used to generate other icons. If left empty, it will "
+"fallback to [member ProjectSettings.application/config/icon]. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona base dell'applicazione usata per generare le altre icone. Se "
+"lasciato vuoto, verrà utilizzata [member ProjectSettings.application/config/"
+"icon]. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Base application icon used to generate other icons, dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona base dell'applicazione usata per generare le altre icone, versione "
+"scura. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Base application icon used to generate other icons, tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona base dell'applicazione usata per generare le altre icone, versione "
+"tinta. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 64x64 icon file (2x DPI). If left empty, it will fallback to "
+"[member ProjectSettings.application/config/icon]. See [url=https://developer."
+"apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/"
+"url]."
+msgstr ""
+"File icona 64x64 dell'applicazione iOS (2x DPI). Se lasciato vuoto, verrà "
+"utilizzata [member ProjectSettings.application/config/icon]. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 64x64 icon file (2x DPI), dark version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona 64x64 dell'applicazione iOS (2x DPI), versione scura. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 64x64 icon file (2x DPI), tinted version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona 64x64 dell'applicazione iOS (2x DPI), versione tinta. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 68x68 icon file (2x DPI). If left empty, it will fallback to "
+"[member ProjectSettings.application/config/icon]. See [url=https://developer."
+"apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/"
+"url]."
+msgstr ""
+"File icona 68x68 dell'applicazione iOS (2x DPI). Se lasciato vuoto, verrà "
+"utilizzata [member ProjectSettings.application/config/icon]. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 68x68 icon file (2x DPI), dark version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona 68x68 dell'applicazione iOS (2x DPI), versione scura. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 68x68 icon file (2x DPI), tinted version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona 68x68 dell'applicazione iOS (2x DPI), versione tinta. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 64x64 icon file (3x DPI). If left empty, it will fallback to "
+"[member ProjectSettings.application/config/icon]. See [url=https://developer."
+"apple.com/design/human-interface-guidelines/foundations/app-icons]App icons[/"
+"url]."
+msgstr ""
+"File icona 64x64 dell'applicazione iOS (3x DPI). Se lasciato vuoto, verrà "
+"utilizzata [member ProjectSettings.application/config/icon]. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 64x64 icon file (3x DPI), dark version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona 64x64 dell'applicazione iOS (3x DPI), versione scura. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"iOS application 64x64 icon file (3x DPI), tinted version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona 64x64 dell'applicazione iOS (3x DPI), versione tinta. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Home screen application icon file on iPad (2x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35597,10 +45203,28 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona dell'applicazione nella schermata Home su iPad (2x DPI). Se "
-"lasciato vuoto, verrà utilizzato [member ProjectSettings.application/config/"
+"lasciato vuoto, verrà utilizzata [member ProjectSettings.application/config/"
 "icon]. Consulta [url=https://developer.apple.com/design/human-interface-"
 "guidelines/foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Home screen application icon file on iPad (2x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPad (2x DPI), versione "
+"scura. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Home screen application icon file on iPad (2x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPad (2x DPI), versione "
+"tinta. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Home screen application icon file on iPad (3x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35608,10 +45232,28 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona dell'applicazione nella schermata Home su iPad (3x DPI). Se "
-"lasciato vuoto, verrà utilizzato [member ProjectSettings.application/config/"
+"lasciato vuoto, verrà utilizzata [member ProjectSettings.application/config/"
 "icon]. Consulta [url=https://developer.apple.com/design/human-interface-"
 "guidelines/foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Home screen application icon file on iPad (3x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPad (3x DPI), versione "
+"scura. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Home screen application icon file on iPad (3x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPad (3x DPI), versione "
+"tinta. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Home screen application icon file on iPhone (2x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35619,10 +45261,28 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona dell'applicazione nella schermata Home su iPhone (2x DPI). Se "
-"lasciato vuoto, verrà utilizzato [member ProjectSettings.application/config/"
+"lasciato vuoto, verrà utilizzata [member ProjectSettings.application/config/"
 "icon]. Consulta [url=https://developer.apple.com/design/human-interface-"
 "guidelines/foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Home screen application icon file on iPhone (2x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPhone (2x DPI), "
+"versione scura. Consulta [url=https://developer.apple.com/design/human-"
+"interface-guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Home screen application icon file on iPhone (2x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPhone (2x DPI), "
+"versione tinta. Consulta [url=https://developer.apple.com/design/human-"
+"interface-guidelines/foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Home screen application icon file on iPhone (3x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35630,10 +45290,28 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona dell'applicazione nella schermata Home su iPhone (3x DPI). Se "
-"lasciato vuoto, verrà utilizzato [member ProjectSettings.application/config/"
+"lasciato vuoto, verrà utilizzata [member ProjectSettings.application/config/"
 "icon]. Consulta [url=https://developer.apple.com/design/human-interface-"
 "guidelines/foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Home screen application icon file on iPhone (3x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPhone (3x DPI), "
+"versione scura. Consulta [url=https://developer.apple.com/design/human-"
+"interface-guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Home screen application icon file on iPhone (3x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona dell'applicazione nella schermata Home su iPhone (3x DPI), "
+"versione tinta. Consulta [url=https://developer.apple.com/design/human-"
+"interface-guidelines/foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Notification icon file on iPad and iPhone (2x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35641,10 +45319,28 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona delle notifiche su iPad e iPhone (2x DPI). Se lasciato vuoto, "
-"verrà utilizzato [member ProjectSettings.application/config/icon]. Consulta "
+"verrà utilizzata [member ProjectSettings.application/config/icon]. Consulta "
 "[url=https://developer.apple.com/design/human-interface-guidelines/"
 "foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Notification icon file on iPad and iPhone (2x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle notifiche su iPad e iPhone (2x DPI), versione scura. "
+"Consulta [url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Notification icon file on iPad and iPhone (2x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle notifiche su iPad e iPhone (2x DPI), versione tinta. "
+"Consulta [url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Notification icon file on iPhone (3x DPI). If left empty, it will fallback to "
 "[member ProjectSettings.application/config/icon]. See [url=https://developer."
@@ -35652,10 +45348,57 @@ msgid ""
 "url]."
 msgstr ""
 "File icona delle notifiche su iPhone (3x DPI). Se lasciato vuoto, verrà "
-"utilizzato [member ProjectSettings.application/config/icon]. Consulta "
+"utilizzata [member ProjectSettings.application/config/icon]. Consulta "
 "[url=https://developer.apple.com/design/human-interface-guidelines/"
 "foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Notification icon file on iPhone (3x DPI), dark version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona delle notifiche su iPhone (3x DPI), versione scura. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Notification icon file on iPhone (3x DPI), tinted version. See [url=https://"
+"developer.apple.com/design/human-interface-guidelines/foundations/app-"
+"icons]App icons[/url]."
+msgstr ""
+"File icona delle notifiche su iPhone (3x DPI), versione tinta. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Notification icon file on iPad and iPhone (3x DPI). If left empty, it will "
+"fallback to [member ProjectSettings.application/config/icon]. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle notifiche su iPad e iPhone (3x DPI). Se lasciato vuoto, "
+"verrà utilizzata [member ProjectSettings.application/config/icon]. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Notification icon file on iPad and iPhone (3x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle notifiche su iPad e iPhone (3x DPI), versione scura. "
+"Consulta [url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Notification icon file on iPad and iPhone (3x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle notifiche su iPad e iPhone (3x DPI), versione tinta. "
+"Consulta [url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Application settings icon file on iPad and iPhone (2x DPI). If left empty, it "
 "will fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35663,10 +45406,28 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona delle impostazioni dell'applicazione su iPad e iPhone (2x DPI). Se "
-"lasciato vuoto, verrà utilizzato [member ProjectSettings.application/config/"
+"lasciato vuoto, verrà utilizzata [member ProjectSettings.application/config/"
 "icon]. Consulta [url=https://developer.apple.com/design/human-interface-"
 "guidelines/foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Application settings icon file on iPad and iPhone (2x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle impostazioni dell'applicazione su iPad e iPhone (2x DPI), "
+"versione scura. Consulta [url=https://developer.apple.com/design/human-"
+"interface-guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Application settings icon file on iPad and iPhone (2x DPI), tinted version. "
+"See [url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle impostazioni dell'applicazione su iPad e iPhone (2x DPI), "
+"versione tinta. Consulta [url=https://developer.apple.com/design/human-"
+"interface-guidelines/foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Application settings icon file on iPhone (3x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35674,10 +45435,28 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona delle impostazioni dell'applicazione su iPhone (3x DPI). Se "
-"lasciato vuoto, verrà utilizzato [member ProjectSettings.application/config/"
+"lasciato vuoto, verrà utilizzata [member ProjectSettings.application/config/"
 "icon]. Consulta [url=https://developer.apple.com/design/human-interface-"
 "guidelines/foundations/app-icons]Icone delle app[/url]."
 
+msgid ""
+"Application settings icon file on iPhone (3x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle impostazioni dell'applicazione su iPhone (3x DPI), versione "
+"scura. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Application settings icon file on iPhone (3x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona delle impostazioni dell'applicazione su iPhone (3x DPI), versione "
+"tinta. Consulta [url=https://developer.apple.com/design/human-interface-"
+"guidelines/foundations/app-icons]Icone delle app[/url]."
+
 msgid ""
 "Spotlight icon file on iPad and iPhone (2x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/config/icon]. See "
@@ -35685,7 +45464,54 @@ msgid ""
 "foundations/app-icons]App icons[/url]."
 msgstr ""
 "File icona in evidenza su iPad e iPhone (2x DPI). Se lasciato vuoto, verrà "
-"utilizzato [member ProjectSettings.application/config/icon]. Consulta "
+"utilizzata [member ProjectSettings.application/config/icon]. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Spotlight icon file on iPad and iPhone (2x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona in evidenza su iPad e iPhone (2x DPI), versione scura. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Spotlight icon file on iPad and iPhone (2x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona in evidenza su iPad e iPhone (2x DPI), versione tinta. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Spotlight icon file on iPad and iPhone (3x DPI). If left empty, it will "
+"fallback to [member ProjectSettings.application/config/icon]. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona in evidenza su iPad e iPhone (3x DPI). Se lasciato vuoto, verrà "
+"utilizzata [member ProjectSettings.application/config/icon]. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Spotlight icon file on iPad and iPhone (3x DPI), dark version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona in evidenza su iPad e iPhone (3x DPI), versione scura. Consulta "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]Icone delle app[/url]."
+
+msgid ""
+"Spotlight icon file on iPad and iPhone (3x DPI), tinted version. See "
+"[url=https://developer.apple.com/design/human-interface-guidelines/"
+"foundations/app-icons]App icons[/url]."
+msgstr ""
+"File icona in evidenza su iPad e iPhone (3x DPI), versione tinta. Consulta "
 "[url=https://developer.apple.com/design/human-interface-guidelines/"
 "foundations/app-icons]Icone delle app[/url]."
 
@@ -36151,6 +45977,26 @@ msgid ""
 msgstr ""
 "Indica se l'app utilizza altre informazioni di contatto per il tracciamento."
 
+msgid "Indicates whether your app collects any other data."
+msgstr "Indica se l'app raccoglie qualunque altro dato."
+
+msgid ""
+"The reasons your app collects any other data. See [url=https://developer."
+"apple.com/documentation/bundleresources/privacy_manifest_files/"
+"describing_data_use_in_privacy_manifests]Describing data use in privacy "
+"manifests[/url]."
+msgstr ""
+"I motivi per cui l'app raccoglie qualunque altro dato. Consulta [url=https://"
+"developer.apple.com/documentation/bundleresources/privacy_manifest_files/"
+"describing_data_use_in_privacy_manifests]Descrivere l'uso dei dati nei "
+"manifesti sulla privacy[/url]."
+
+msgid "Indicates whether your app links any other data to the user's identity."
+msgstr "Indica se l'app collega qualunque altro dato all'identità dell'utente."
+
+msgid "Indicates whether your app uses any other data for tracking."
+msgstr "Indica se l'app utilizza qualunque altro dato per il tracciamento."
+
 msgid "Indicates whether your app collects any other diagnostic data."
 msgstr "Indica se l'app raccoglie altri dati diagnostici."
 
@@ -36379,6 +46225,32 @@ msgid "Indicates whether your app uses precise location data for tracking."
 msgstr ""
 "Indica se l'app utilizza dati precisi sulla posizione per il tracciamento."
 
+msgid "Indicates whether your app collects product interaction data."
+msgstr "Indica se l'app raccoglie dati sulle interazioni con il prodotto."
+
+msgid ""
+"The reasons your app collects product interaction data. See [url=https://"
+"developer.apple.com/documentation/bundleresources/privacy_manifest_files/"
+"describing_data_use_in_privacy_manifests]Describing data use in privacy "
+"manifests[/url]."
+msgstr ""
+"I motivi per cui l'app raccoglie i dati sulle interazioni con il prodotto. "
+"Consulta [url=https://developer.apple.com/documentation/bundleresources/"
+"privacy_manifest_files/describing_data_use_in_privacy_manifests]Descrivere "
+"l'uso dei dati nei manifesti sulla privacy[/url]."
+
+msgid ""
+"Indicates whether your app links product interaction data to the user's "
+"identity."
+msgstr ""
+"Indica se l'app collega i dati sulle interazioni con il prodotto all'identità "
+"dell'utente."
+
+msgid "Indicates whether your app uses product interaction data for tracking."
+msgstr ""
+"Indica se l'app utilizza i dati sulle interazioni con il prodotto per il "
+"tracciamento."
+
 msgid "Indicates whether your app collects purchase history."
 msgstr "Indica se l'app raccoglie la cronologia degli acquisti."
 
@@ -36561,6 +46433,11 @@ msgstr ""
 "privacy_manifest_files/describing_use_of_required_reason_api]Descrivere l'uso "
 "dell'API per i motivi richiesti[/url]."
 
+msgid "A custom background color of the storyboard launch screen."
+msgstr ""
+"Un colore di sfondo personalizzato per la schermata di lancio dello "
+"storyboard."
+
 msgid ""
 "Application launch screen image file (2x DPI). If left empty, it will "
 "fallback to [member ProjectSettings.application/boot_splash/image]."
@@ -36617,6 +46494,21 @@ msgstr "Esportatore per Linux/BSD."
 msgid "Exporting for Linux"
 msgstr "Esportazione per Linux"
 
+msgid ""
+"Application executable architecture.\n"
+"Supported architectures: [code]x86_32[/code], [code]x86_64[/code], "
+"[code]arm64[/code], [code]arm32[/code], [code]rv64[/code], [code]ppc64[/"
+"code], [code]ppc32[/code], and [code]loongarch64[/code].\n"
+"Official export templates include [code]x86_32[/code], [code]x86_64[/code], "
+"[code]arm32[/code], and [code]arm64[/code] binaries only."
+msgstr ""
+"Architettura dell'eseguibile dell'applicazione.\n"
+"Architetture supportate: [code]x86_32[/code], [code]x86_64[/code], "
+"[code]arm64[/code], [code]arm32[/code], [code]rv64[/code], [code]ppc64[/"
+"code], [code]ppc32[/code] e [code]loongarch64[/code].\n"
+"I modelli di esportazione ufficiali includono solo i binari [code]x86_32[/"
+"code], [code]x86_64[/code], [code]arm32[/code], e [code]arm64[/code]."
+
 msgid ""
 "If [code]true[/code], project resources are embedded into the executable."
 msgstr ""
@@ -36743,6 +46635,28 @@ msgstr ""
 "ProjectSettings.application/config/macos_native_icon], e poi su [member "
 "ProjectSettings.application/config/icon]."
 
+msgid ""
+"Minimum version of macOS required for this application to run on Apple "
+"Silicon Macs, in the [code]major.minor.patch[/code] or [code]major.minor[/"
+"code] format, can only contain numeric characters ([code]0-9[/code]) and "
+"periods ([code].[/code])."
+msgstr ""
+"Versione minima di macOS richiesta per eseguire questa applicazione sui Mac "
+"Apple Silicon, nel formato [code]major.minor.patch[/code] o [code]major."
+"minor[/code], può contenere solo caratteri numerici ([code]0-9[/code]) e "
+"punti ([code].[/code])."
+
+msgid ""
+"Minimum version of macOS required for this application to run on Intel Macs, "
+"in the [code]major.minor.patch[/code] or [code]major.minor[/code] format, can "
+"only contain numeric characters ([code]0-9[/code]) and periods ([code].[/"
+"code])."
+msgstr ""
+"Versione minima di macOS richiesta per eseguire questa applicazione sui Mac "
+"Intel, nel formato [code]major.minor.patch[/code] o [code]major.minor[/code], "
+"può contenere solo caratteri numerici ([code]0-9[/code]) e punti ([code].[/"
+"code])."
+
 msgid ""
 "Application executable architecture.\n"
 "Supported architectures: [code]x86_64[/code], [code]arm64[/code], and "
@@ -37362,6 +47276,20 @@ msgstr ""
 "Percorso file per il modello di esportazione personalizzato utilizzato per le "
 "build di rilascio. Se lasciato vuoto, viene utilizzato il modello predefinito."
 
+msgid ""
+"Determines how the canvas should be resized by Godot.\n"
+"- [b]None:[/b] The canvas is not automatically resized.\n"
+"- [b]Project:[/b] The size of the canvas is dependent on the "
+"[ProjectSettings].\n"
+"- [b]Adaptive:[/b] The canvas is automatically resized to fit as much of the "
+"web page as possible."
+msgstr ""
+"Determina come il canvas deve essere ridimensionato da Godot.\n"
+"- [b]None:[/b] Il canvas non viene ridimensionato automaticamente.\n"
+"- [b]Project:[/b] Le dimensioni del canvas dipende da [ProjectSettings].\n"
+"- [b]Adaptive:[/b] Il canvas viene ridimensionato automaticamente per "
+"adattarsi il più possibile alla pagina web."
+
 msgid ""
 "The custom HTML page that wraps the exported web build. If left empty, the "
 "default HTML shell is used.\n"
@@ -37451,6 +47379,39 @@ msgstr ""
 "abbia intestazioni di isolamento cross-origin (COEP/COOP).\n"
 "Ciò può semplificare la configurazione per servire il gioco esportato."
 
+msgid ""
+"File path to the smallest icon for this web application. If not defined, "
+"defaults to the project icon.\n"
+"[b]Note:[/b] If the icon is not 144×144, it will be automatically resized for "
+"the final build."
+msgstr ""
+"Percorso del file dell'icona più piccola per questa applicazione web. Se non "
+"definito, il valore predefinito è l'icona del progetto.\n"
+"[b]Nota:[/b] Se l'icona non è 144×144, verrà ridimensionata automaticamente "
+"per la build finale."
+
+msgid ""
+"File path to the small icon for this web application. If not defined, "
+"defaults to the project icon.\n"
+"[b]Note:[/b] If the icon is not 180×180, it will be automatically resized for "
+"the final build."
+msgstr ""
+"Percorso del file dell'icona piccola per questa applicazione web. Se non "
+"definito, il valore predefinito è l'icona del progetto.\n"
+"[b]Nota:[/b] Se l'icona non è 180×180, verrà ridimensionata automaticamente "
+"per la build finale."
+
+msgid ""
+"File path to the largest icon for this web application. If not defined, "
+"defaults to the project icon.\n"
+"[b]Note:[/b] If the icon is not 512×512, it will be automatically resized for "
+"the final build."
+msgstr ""
+"Percorso del file dell'icona normale per questa applicazione web. Se non "
+"definito, il valore predefinito è l'icona del progetto.\n"
+"[b]Nota:[/b] se l'icona non è 512×512, verrà ridimensionata automaticamente "
+"per la build finale."
+
 msgid ""
 "The page to display, should the server hosting the page not be available. "
 "This page is saved in the client's machine."
@@ -37494,6 +47455,20 @@ msgstr ""
 "conseguenza, è più soggetto a problemi di prestazioni e audio, ma richiederà "
 "solo di essere eseguito su un sito web HTTPS."
 
+msgid ""
+"If [code]true[/code], allows textures to be optimized for desktop through the "
+"S3TC/BPTC algorithm."
+msgstr ""
+"Se [code]true[/code], consente di ottimizzare le texture per i desktop "
+"attraverso l'algoritmo S3TC/BPTC."
+
+msgid ""
+"If [code]true[/code] allows textures to be optimized for mobile through the "
+"ETC2/ASTC algorithm."
+msgstr ""
+"Se [code]true[/code] consente di ottimizzare le texture per i dispositivi "
+"mobili attraverso l'algoritmo ETC2/ASTC."
+
 msgid "Exporter for Windows."
 msgstr "Esportatore per Windows."
 
@@ -37616,6 +47591,15 @@ msgstr ""
 "[url=https://learn.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-"
 "block]StringFileInfo[/url]."
 
+msgid ""
+"Application executable architecture.\n"
+"Supported architectures: [code]x86_32[/code], [code]x86_64[/code], and "
+"[code]arm64[/code]."
+msgstr ""
+"Architettura dell'eseguibile dell'applicazione.\n"
+"Architetture supportate: [code]x86_32[/code], [code]x86_64[/code] e "
+"[code]arm64[/code]."
+
 msgid ""
 "Array of the additional command line arguments passed to the code signing "
 "tool. See [url=https://learn.microsoft.com/en-us/dotnet/framework/tools/"
@@ -37741,6 +47725,21 @@ msgstr ""
 "Se abilitato, [method _get_customization_configuration_hash] e [method "
 "_customize_resource] saranno chiamati e dovranno essere implementati."
 
+msgid ""
+"Return [code]true[/code] if this plugin will customize scenes based on the "
+"platform and features used.\n"
+"When enabled, [method _get_customization_configuration_hash] and [method "
+"_customize_scene] will be called and must be implemented.\n"
+"[b]Note:[/b] [method _customize_scene] will only be called for scenes that "
+"have been modified since the last export."
+msgstr ""
+"Restituisci [code]true[/code] se questa estensione personalizzerà le scene in "
+"base alla piattaforma e alle funzionalità utilizzate.\n"
+"Se abilitato, [method _get_customization_configuration_hash] e [method "
+"_customize_scene] verranno chiamati e dovranno essere implementati.\n"
+"[b]Nota:[/b] [method _customize_scene] verrà chiamato solo per le scene che "
+"sono state modificate dall'ultima esportazione."
+
 msgid ""
 "Return a [PackedStringArray] of additional features this preset, for the "
 "given [param platform], should have."
@@ -37764,6 +47763,12 @@ msgstr ""
 "Restituisce [code]true[/code] se l'estensione supporta la piattaforma [param "
 "platform]."
 
+msgid "Returns currently used export platform."
+msgstr "Restituisce la piattaforma d'esportazione attualmente utilizzata."
+
+msgid "Returns currently used export preset."
+msgstr "Restituisce la preimpostazione d'esportazione attualmente utilizzata."
+
 msgid ""
 "Returns the current value of an export option supplied by [method "
 "_get_export_options]."
@@ -37771,6 +47776,94 @@ msgstr ""
 "Restituisce il valore attuale di un'opzione di esportazione fornita da "
 "[method _get_export_options]."
 
+msgid "Export preset configuration."
+msgstr "La configurazione della preimpostazione d'esportazione."
+
+msgid ""
+"Returns [code]true[/code] if \"Advanced\" toggle is enabled in the export "
+"dialog."
+msgstr ""
+"Restituisce [code]true[/code] se l'opzione \"Avanzato\" è abilitato nella "
+"finestra di dialogo d'esportazione."
+
+msgid ""
+"Returns number of files selected in the \"Resources\" tab of the export "
+"dialog."
+msgstr ""
+"Restituisce il numero di file selezionati nella scheda \"Risorse\" della "
+"finestra di dialogo d'esportazione."
+
+msgid ""
+"Returns [code]true[/code], PCK directory encryption is enabled in the export "
+"dialog."
+msgstr ""
+"Restituisce [code]true[/code] se la crittografia delle cartelle del PCK è "
+"abilitata nella finestra di dialogo d'esportazione."
+
+msgid ""
+"Returns [code]true[/code], PCK encryption is enabled in the export dialog."
+msgstr ""
+"Restituisce [code]true[/code] se la crittografia del PCK è abilitata nella "
+"finestra di dialogo d'esportazione."
+
+msgid "Returns file filters to exclude during PCK encryption."
+msgstr ""
+"Restituisce i filtri dei file da escludere durante la crittografia del PCK."
+
+msgid "Returns file filters to include during PCK encryption."
+msgstr ""
+"Restituisce i filtri dei file da includere durante la crittografia del PCK."
+
+msgid "Returns PCK encryption key."
+msgstr "Restituisce la chiave di crittografia del PCK."
+
+msgid "Returns file filters to exclude during export."
+msgstr "Restituisce i filtri dei file da escludere durante l'esportazione."
+
+msgid "Returns export target path."
+msgstr "Restituisce il percorso di destinazione dell'esportazione."
+
+msgid "Returns file export mode for the specified file."
+msgstr "Restituisce la modalità d'esportazione file per il file specificato."
+
+msgid "Returns array of files to export."
+msgstr "Restituisce l'array di file da esportare."
+
+msgid "Returns file filters to include during export."
+msgstr "Restituisce i filtri dei file da includere durante l'esportazione."
+
+msgid "Returns the list of packs on which to base a patch export on."
+msgstr ""
+"Restituisce la lista dei pacchetti da cui basare un'esportazione di patch."
+
+msgid "Returns export preset name."
+msgstr "Restituisce il nome della preimpostazione d'esportazione."
+
+msgid "Returns script export mode."
+msgstr "Restituisce la modalità d'esportazione degli script."
+
+msgid "Returns [code]true[/code] if preset has specified property."
+msgstr ""
+"Restituisce [code]true[/code] se la preimpostazione ha la proprietà "
+"specificata."
+
+msgid "Returns [code]true[/code] if specified file is exported."
+msgstr "Restituisce [code]true[/code] se il file specificato è esportato."
+
+msgid ""
+"Returns [code]true[/code] if dedicated server export mode is selected in the "
+"export dialog."
+msgstr ""
+"Restituisce [code]true[/code] se la modalità d'esportazione \"server "
+"dedicato\" è selezionata nella finestra di dialogo d'esportazione."
+
+msgid ""
+"Returns [code]true[/code] if \"Runnable\" toggle is enabled in the export "
+"dialog."
+msgstr ""
+"Restituisce [code]true[/code] se \"Eseguibile\" è abilitato nella finestra di "
+"dialogo d'esportazione."
+
 msgid ""
 "An editor feature profile which can be used to disable specific features."
 msgstr ""
@@ -37974,6 +48067,15 @@ msgstr ""
 "Il pannelo Cronologia. Se questa funzionalità è disabilitata, il pannello "
 "Cronologia non sarà visibile."
 
+msgid ""
+"The Game tab, which allows embedding the game window and selecting nodes by "
+"clicking inside of it. If this feature is disabled, the Game tab won't "
+"display."
+msgstr ""
+"La scheda Gioco, che consente di incorporare la finestra di gioco e "
+"selezionare i nodi cliccando al suo interno. Se questa funzionalità è "
+"disabilitata, la scheda Gioco non sarà visualizzata."
+
 msgid "A modified version of [FileDialog] used by the editor."
 msgstr "Una versione modificata di [FileDialog] utilizzata dall'editor."
 
@@ -38020,6 +48122,15 @@ msgstr ""
 "file con il testo del titolo [param title] in cima. È consentito un solo menù "
 "laterale."
 
+msgid "Clear the filter for file names."
+msgstr "Svuota il filtro per i nomi dei file."
+
+msgid "Removes all filters except for \"All Files (*.*)\"."
+msgstr "Rimuove tutti i filtri tranne \"Tutti i file (*.*)\"."
+
+msgid "Returns the value of the filter for file names."
+msgstr "Restituisce il valore del filtro per i nomi dei file."
+
 msgid ""
 "Returns the LineEdit for the selected file.\n"
 "[b]Warning:[/b] This is a required internal node, removing and freeing it may "
@@ -38087,6 +48198,9 @@ msgstr ""
 "finestre di dialogo dei file nell'editor e seleziona il nome del file se è "
 "presente un file attuale."
 
+msgid "Sets the value of the filter for file names."
+msgstr "Imposta il valore del filtro per i nomi dei file."
+
 msgid ""
 "Sets the default value index of the [OptionButton] or [CheckBox] with index "
 "[param option]."
@@ -38174,6 +48288,9 @@ msgstr "Emesso quando viene selezionata una cartella."
 msgid "Emitted when a file is selected."
 msgstr "Emesso quando viene selezionata un file."
 
+msgid "Emitted when the filter for file names changes."
+msgstr "Emesso quando il filtro per i nomi dei file cambia."
+
 msgid "Emitted when multiple files are selected."
 msgstr "Emesso quando vengono selezionati più file."
 
@@ -38319,6 +48436,11 @@ msgstr "Restituite le estensioni di file supportate."
 msgid "Return whether this importer is active."
 msgstr "Restituisce se questo importatore è abilitato."
 
+msgid "Query support. Return [code]false[/code] if import must not continue."
+msgstr ""
+"Supporto per le richieste. Restituisci [code]false[/code] se l'importazione "
+"non deve continuare."
+
 msgid "Gets the name of the options preset at this index."
 msgstr "Ottiene il nome del preset delle opzioni a questo indice."
 
@@ -38382,6 +48504,12 @@ msgstr ""
 msgid "Returns the [EditorPaths] singleton."
 msgstr "Restituisce il singleton [EditorPaths]."
 
+msgid "Returns the editor's [EditorToaster]."
+msgstr "Restituisce l'[EditorToaster] dell'editor."
+
+msgid "Returns the editor's [EditorUndoRedoManager]."
+msgstr "Restituisce l'[EditorUndoRedoManager] dell'editor."
+
 msgid ""
 "Returns the editor's [FileSystemDock] instance.\n"
 "[b]Warning:[/b] Removing and freeing this node will render a part of the "
@@ -38496,6 +48624,13 @@ msgstr ""
 msgid "Marks the current scene tab as unsaved."
 msgstr "Contrassegna la scheda della scena attuale come non salvata."
 
+msgid ""
+"Opens the scene at the given path. If [param set_inherited] is [code]true[/"
+"code], creates a new inherited scene."
+msgstr ""
+"Apre la scena al percorso specificato. Se [param set_inherited] è [code]true[/"
+"code], crea una nuova scena ereditata."
+
 msgid "Plays the currently active scene."
 msgstr "Riproduce la scena attualmente attiva."
 
@@ -38549,6 +48684,93 @@ msgstr ""
 "deve avere un genitore attuale, altrimenti il metodo fallisce.\n"
 "Vedi anche [method Window.set_unparent_when_invisible]."
 
+msgid ""
+"Pops up an editor dialog for selecting a [Node] from the edited scene. The "
+"[param callback] must take a single argument of type [NodePath]. It is called "
+"on the selected [NodePath] or the empty path [code]^\"\"[/code] if the dialog "
+"is canceled. If [param valid_types] is provided, the dialog will only show "
+"Nodes that match one of the listed Node types. If [param current_value] is "
+"provided, the Node will be automatically selected in the tree, if it exists.\n"
+"[b]Example:[/b] Display the node selection dialog as soon as this node is "
+"added to the tree for the first time:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    if Engine.is_editor_hint():\n"
+"        EditorInterface.popup_node_selector(_on_node_selected, [\"Button\"])\n"
+"\n"
+"func _on_node_selected(node_path):\n"
+"    if node_path.is_empty():\n"
+"        print(\"node selection canceled\")\n"
+"    else:\n"
+"        print(\"selected \", node_path)\n"
+"[/codeblock]"
+msgstr ""
+"Apre una finestra di dialogo dell'editor per selezionare un [Node] dalla "
+"scena modificata. Il [param callback] deve accettare un singolo argomento di "
+"tipo [NodePath]. Viene chiamato sul [NodePath] selezionato o sul percorso "
+"vuoto [code]^\"\"[/code] se la finestra di dialogo viene annullata. Se [param "
+"valid_types] viene fornito, la finestra di dialogo mostrerà solo i nodi che "
+"corrispondono a uno dei tipi di nodo elencati. Se viene fornito [param "
+"current_value], il nodo verrà selezionato automaticamente nell'albero, se "
+"esiste.\n"
+"[b]Esempio:[/b] Visualizza la finestra di dialogo per selezionare un nodo non "
+"appena questo nodo viene aggiunto all'albero per la prima volta:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    if Engine.is_editor_hint():\n"
+"        EditorInterface.popup_node_selector(_on_node_selected, [\"Button\"])\n"
+"\n"
+"func _on_node_selected(node_path):\n"
+"    if node_path.is_empty():\n"
+"        print(\"selezione nodo annullata\")\n"
+"    else:\n"
+"        print(\"selezionato \", node_path)\n"
+"[/codeblock]"
+
+msgid ""
+"Pops up an editor dialog for selecting properties from [param object]. The "
+"[param callback] must take a single argument of type [NodePath]. It is called "
+"on the selected property path (see [method NodePath.get_as_property_path]) or "
+"the empty path [code]^\"\"[/code] if the dialog is canceled. If [param "
+"type_filter] is provided, the dialog will only show properties that match one "
+"of the listed [enum Variant.Type] values. If [param current_value] is "
+"provided, the property will be selected automatically in the property list, "
+"if it exists.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    if Engine.is_editor_hint():\n"
+"        EditorInterface.popup_property_selector(this, _on_property_selected, "
+"[TYPE_INT])\n"
+"\n"
+"func _on_property_selected(property_path):\n"
+"    if property_path.is_empty():\n"
+"        print(\"property selection canceled\")\n"
+"    else:\n"
+"        print(\"selected \", property_path)\n"
+"[/codeblock]"
+msgstr ""
+"Apre una finestra di dialogo dell'editor per selezionare le proprietà da "
+"[param object]. Il [param callback] deve accettare un singolo argomento di "
+"tipo [NodePath]. Viene chiamato sul percorso della proprietà selezionata "
+"(vedi [method NodePath.get_as_property_path]) o sul percorso vuoto "
+"[code]^\"\"[/code] se la finestra di dialogo viene annullata. Se [param "
+"type_filter] viene fornito, la finestra di dialogo mostrerà solo le proprietà "
+"che corrispondono a uno dei valori di [enum Variant.Type] elencati. Se viene "
+"fornito [param current_value], la proprietà verrà selezionata automaticamente "
+"nell'elenco delle proprietà, se esiste.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    if Engine.is_editor_hint():\n"
+"        EditorInterface.popup_property_selector(this, _on_property_selected, "
+"[TYPE_INT])\n"
+"\n"
+"func _on_property_selected(property_path):\n"
+"    if property_path.is_empty():\n"
+"        print(\"selezione proprietà annullata\")\n"
+"    else:\n"
+"        print(\"selezionata \", property_path)\n"
+"[/codeblock]"
+
 msgid "Reloads the scene at the given path."
 msgstr "Ricarica la scena al percorso indicato."
 
@@ -38999,6 +49221,15 @@ msgstr ""
 "sono fornite nello spazio locale rispetto al Node3D del gizmo. Chiamato per i "
 "gizmo attivi di questa estensione."
 
+msgid ""
+"Override this method to return a custom [EditorNode3DGizmo] for the 3D nodes "
+"of your choice, return [code]null[/code] for the rest of nodes. See also "
+"[method _has_gizmo]."
+msgstr ""
+"Sovrascrivi questo metodo per restituire un [EditorNode3DGizmo] "
+"personalizzato per i nodi 3D di tua scelta, restituisci [code]null[/code] per "
+"il resto dei nodi. Vedi anche [method _has_gizmo]."
+
 msgid ""
 "Override this method to provide the name that will appear in the gizmo "
 "visibility menu."
@@ -39468,6 +49699,85 @@ msgstr ""
 "È necessario abilitare la chiamata di questo metodo tramite [method "
 "set_force_draw_over_forwarding_enabled]."
 
+msgid ""
+"Called when there is a root node in the current edited scene, [method "
+"_handles] is implemented, and an [InputEvent] happens in the 3D viewport. The "
+"return value decides whether the [InputEvent] is consumed or forwarded to "
+"other [EditorPlugin]s. See [enum AfterGUIInput] for options.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Prevents the InputEvent from reaching other Editor classes.\n"
+"func _forward_3d_gui_input(camera, event):\n"
+"    return EditorPlugin.AFTER_GUI_INPUT_STOP\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Prevents the InputEvent from reaching other Editor classes.\n"
+"public override EditorPlugin.AfterGuiInput _Forward3DGuiInput(Camera3D "
+"camera, InputEvent @event)\n"
+"{\n"
+"    return EditorPlugin.AfterGuiInput.Stop;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This method must return [constant AFTER_GUI_INPUT_PASS] in order to forward "
+"the [InputEvent] to other Editor classes.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Consumes InputEventMouseMotion and forwards other InputEvent types.\n"
+"func _forward_3d_gui_input(camera, event):\n"
+"    return EditorPlugin.AFTER_GUI_INPUT_STOP if event is "
+"InputEventMouseMotion else EditorPlugin.AFTER_GUI_INPUT_PASS\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Consumes InputEventMouseMotion and forwards other InputEvent types.\n"
+"public override EditorPlugin.AfterGuiInput _Forward3DGuiInput(Camera3D "
+"camera, InputEvent @event)\n"
+"{\n"
+"    return @event is InputEventMouseMotion ? EditorPlugin.AfterGuiInput."
+"Stop : EditorPlugin.AfterGuiInput.Pass;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Chiamato quando c'è un nodo radice nella scena attualmente modificata, "
+"[method _handles] è implementato e si verifica un [InputEvent] nella viewport "
+"3D. Il valore restituito decide se [InputEvent] viene consumato o inoltrato "
+"ad altri [EditorPlugin]. Vedi [enum AfterGUIInput] per le opzioni.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Impedisce all'InputEvent di raggiungere altre classi dell'Editor.\n"
+"func _forward_3d_gui_input(camera, event):\n"
+"    return EditorPlugin.AFTER_GUI_INPUT_STOP\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Impedisce all'InputEvent di raggiungere altre classi dell'Editor.\n"
+"public override EditorPlugin.AfterGuiInput _Forward3DGuiInput(Camera3D "
+"camera, InputEvent @event)\n"
+"{\n"
+"    return EditorPlugin.AfterGuiInput.Stop;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Questo metodo deve restituire [constant AFTER_GUI_INPUT_PASS] per inoltrare "
+"l'[InputEvent] ad altre classi dell'Editor.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Consuma gli InputEventMouseMotion e inoltra gli altri tipi di InputEvent.\n"
+"func _forward_3d_gui_input(camera, event):\n"
+"    return EditorPlugin.AFTER_GUI_INPUT_STOP if event is "
+"InputEventMouseMotion else EditorPlugin.AFTER_GUI_INPUT_PASS\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Consuma gli InputEventMouseMotion e inoltra gli altri tipi di InputEvent.\n"
+"public override EditorPlugin.AfterGuiInput _Forward3DGuiInput(Camera3D "
+"camera, InputEvent @event)\n"
+"{\n"
+"    return @event is InputEventMouseMotion ? EditorPlugin.AfterGuiInput."
+"Stop : EditorPlugin.AfterGuiInput.Pass;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Called by the engine when the 2D editor's viewport is updated. Use the "
 "[code]overlay[/code] [Control] for drawing. You can update the viewport "
@@ -39556,6 +49866,91 @@ msgstr ""
 "È necessario abilitare la chiamata di questo metodo tramite [method "
 "set_force_draw_over_forwarding_enabled]."
 
+msgid ""
+"Called when there is a root node in the current edited scene, [method "
+"_handles] is implemented, and an [InputEvent] happens in the 2D viewport. If "
+"this method returns [code]true[/code], [param event] is intercepted by this "
+"[EditorPlugin], otherwise [param event] is forwarded to other Editor "
+"classes.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Prevents the InputEvent from reaching other Editor classes.\n"
+"func _forward_canvas_gui_input(event):\n"
+"    return true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Prevents the InputEvent from reaching other Editor classes.\n"
+"public override bool ForwardCanvasGuiInput(InputEvent @event)\n"
+"{\n"
+"    return true;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This method must return [code]false[/code] in order to forward the "
+"[InputEvent] to other Editor classes.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Consumes InputEventMouseMotion and forwards other InputEvent types.\n"
+"func _forward_canvas_gui_input(event):\n"
+"    if (event is InputEventMouseMotion):\n"
+"        return true\n"
+"    return false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Consumes InputEventMouseMotion and forwards other InputEvent types.\n"
+"public override bool _ForwardCanvasGuiInput(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseMotion)\n"
+"    {\n"
+"        return true;\n"
+"    }\n"
+"    return false;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Chiamato quando c'è un nodo radice nella scena attualmente modificata, "
+"[method _handles] è implementato e si verifica un [InputEvent] nella viewport "
+"2D. Se questo metodo restituisce [code]true[/code], [param event] viene "
+"intercettato da questo [EditorPlugin], altrimenti [param event] viene "
+"inoltrato ad altre classi dell'Editor.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Impedisce all'InputEvent di raggiungere altre classi dell'Editor.\n"
+"func _forward_canvas_gui_input(event):\n"
+"    return true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Impedisce all'InputEvent di raggiungere altre classi dell'Editor.\n"
+"public override bool ForwardCanvasGuiInput(InputEvent @event)\n"
+"{\n"
+"    return true;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Questo metodo deve restituire [code]false[/code] per inoltrare l'[InputEvent] "
+"ad altre classi dell'Editor.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Consuma gli InputEventMouseMotion e inoltra gli altri tipi di InputEvent.\n"
+"func _forward_canvas_gui_input(event):\n"
+"    if (event is InputEventMouseMotion):\n"
+"        return true\n"
+"    return false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Consuma gli InputEventMouseMotion e inoltra gli altri tipi di InputEvent.\n"
+"public override bool _ForwardCanvasGuiInput(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseMotion)\n"
+"    {\n"
+"        return true;\n"
+"    }\n"
+"    return false;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "This is for editors that edit script-based objects. You can return a list of "
 "breakpoints in the format ([code]script:line[/code]), for example: "
@@ -39920,6 +50315,36 @@ msgstr ""
 "Aggiunge uno script nel percorso [param path] all'elenco degli Autoload, con "
 "il nome [param name]."
 
+msgid ""
+"Adds a control to the bottom panel (together with Output, Debug, Animation, "
+"etc.). Returns a reference to the button added. It's up to you to hide/show "
+"the button when needed. When your plugin is deactivated, make sure to remove "
+"your custom control with [method remove_control_from_bottom_panel] and free "
+"it with [method Node.queue_free].\n"
+"Optionally, you can specify a shortcut parameter. When pressed, this shortcut "
+"will toggle the bottom panel's visibility. See the default editor bottom "
+"panel shortcuts in the Editor Settings for inspiration. Per convention, they "
+"all use [kbd]Alt[/kbd] modifier."
+msgstr ""
+"Aggiunge un controllo al pannello inferiore (insieme a Output, Debug, "
+"Animazione, ecc.). Restituisce un riferimento al pulsante aggiunto. Sta a te "
+"nascondere/mostrare il pulsante quando necessario. Quando l'estensione è "
+"disattivata, assicurati di rimuovere il tuo controllo personalizzato con "
+"[method remove_control_from_bottom_panel] e liberarlo con [method Node."
+"queue_free].\n"
+"Facoltativamente, è possibile specificare un parametro di scelta rapida. "
+"Quando attivata, la scelta rapida cambierà la visibilità del pannello "
+"inferiore. Vedi i tasti di scelta rapida predefiniti del pannello inferiore "
+"dell'editor nelle Impostazioni dell'editor come riferimento. Per convenzione, "
+"usano tutti il modificatore [kbd]Alt[/kbd]."
+
+msgid ""
+"Registers a new [EditorExportPlatform]. Export platforms provides "
+"functionality of exporting to the specific platform."
+msgstr ""
+"Registra un nuovo [EditorExportPlatform]. Le piattaforme di esportazione "
+"forniscono funzionalità di esportazione verso la piattaforma specifica."
+
 msgid ""
 "Adds a custom menu item to [b]Project > Tools[/b] named [param name]. When "
 "clicked, the provided [param callable] will be called."
@@ -40008,6 +50433,9 @@ msgstr "Accoda il salvataggio della disposizione nell'editor del progetto."
 msgid "Removes an Autoload [param name] from the list."
 msgstr "Rimuove l'Autoload denominato [param name] dalla lista."
 
+msgid "Removes the specified context menu plugin."
+msgstr "Rimuove l'estensione di menu contestuale specificata."
+
 msgid ""
 "Removes the control from the bottom panel. You have to manually [method Node."
 "queue_free] the control."
@@ -40036,6 +50464,11 @@ msgid "Removes the debugger plugin with given script from the Debugger."
 msgstr ""
 "Rimuove l'estensione del debugger con lo script specificato dal Debugger."
 
+msgid "Removes an export platform registered by [method add_export_platform]."
+msgstr ""
+"Rimuove una piattaforma di esportazione registrata da [method "
+"add_export_platform]."
+
 msgid "Removes an export plugin registered by [method add_export_plugin]."
 msgstr ""
 "Rimuove un'estensione di esportazione registrata da [method "
@@ -40046,6 +50479,10 @@ msgstr ""
 "Rimuove un'estensione di importazione registrata da [method "
 "add_import_plugin]."
 
+msgid "Removes an inspector plugin registered by [method add_inspector_plugin]."
+msgstr ""
+"Rimuove un'estensione dell'ispettore registrata da [method add_import_plugin]."
+
 msgid "Removes a gizmo plugin registered by [method add_node_3d_gizmo_plugin]."
 msgstr ""
 "Rimuove un'estensione gizmo registrata da [method add_node_3d_gizmo_plugin]."
@@ -40314,6 +50751,9 @@ msgstr ""
 "aggiungilo qui. Ciò permetterà di ripristinare il focus se l'ispettore è "
 "aggiornato."
 
+msgid "Draw property as not selected. Used by the inspector."
+msgstr "Disegna la proprietà come non selezionata. Usato per l'ispettore."
+
 msgid ""
 "If one or several properties have changed, this must be called. [param field] "
 "is used in case your editor can modify fields separately (as an example, "
@@ -40338,6 +50778,16 @@ msgstr ""
 "(aggiunta tramite [method EditorInspectorPlugin._parse_property]), allora "
 "questo restituirà la proprietà."
 
+msgid ""
+"Returns [code]true[/code] if property is drawn as selected. Used by the "
+"inspector."
+msgstr ""
+"Restituisce [code]true[/code] se la proprietà è disegnata come selezionata. "
+"Usato per l'ispettore."
+
+msgid "Draw property as selected. Used by the inspector."
+msgstr "Disegna la proprietà come selezionata. Usato per l'ispettore."
+
 msgid ""
 "Puts the [param editor] control below the property label. The control must be "
 "previously added using [method Node.add_child]."
@@ -40352,21 +50802,35 @@ msgid ""
 "Used by the inspector, set to [code]true[/code] when the property is "
 "checkable."
 msgstr ""
-"Utilizzato dall'ispettore, impostato su [code]true[/code] quando la proprietà "
-"è spuntabile."
+"Utilizzato per l'ispettore, impostato su [code]true[/code] quando la "
+"proprietà è spuntabile."
 
 msgid ""
 "Used by the inspector, set to [code]true[/code] when the property is checked."
 msgstr ""
-"Utilizzato dall'ispettore, impostato su [code]true[/code] quando la proprietà "
-"è spuntata."
+"Utilizzato per l'ispettore, impostato su [code]true[/code] quando la "
+"proprietà è spuntata."
 
 msgid ""
 "Used by the inspector, set to [code]true[/code] when the property can be "
 "deleted by the user."
 msgstr ""
-"Utilizzato dall'ispettore, impostato su [code]true[/code] quando la proprietà "
-"può essere eliminata dall'utente."
+"Utilizzato per l'ispettore, impostato su [code]true[/code] quando la "
+"proprietà può essere eliminata dall'utente."
+
+msgid ""
+"Used by the inspector, set to [code]true[/code] when the property label is "
+"drawn."
+msgstr ""
+"Utilizzato per l'ispettore, impostato su [code]true[/code] quando l'etichetta "
+"della proprietà è disegnata."
+
+msgid ""
+"Used by the inspector, set to [code]true[/code] when the property background "
+"is drawn."
+msgstr ""
+"Utilizzato per l'ispettore, impostato su [code]true[/code] quando lo sfondo "
+"della proprietà è disegnato."
 
 msgid ""
 "Used by the inspector, set to [code]true[/code] when the property is drawn "
@@ -40395,6 +50859,13 @@ msgstr ""
 "Utilizzato per l'ispettore, impostato su [code]true[/code] quando la "
 "proprietà è di sola lettura."
 
+msgid ""
+"Used by the inspector, set to [code]true[/code] when the property is "
+"selectable."
+msgstr ""
+"Utilizzato per l'ispettore, impostato su [code]true[/code] quando la "
+"proprietà è selezionabile."
+
 msgid ""
 "Emit it if you want multiple properties modified at the same time. Do not use "
 "if added via [method EditorInspectorPlugin._parse_property]."
@@ -40425,6 +50896,13 @@ msgstr "Emesso quando una proprietà viene spuntata. Utilizzato internamente."
 msgid "Emitted when a property was deleted. Used internally."
 msgstr "Emesso quando una proprietà viene eliminata. Utilizzato internamente."
 
+msgid ""
+"Emit it if you want to mark a property as favorited, making it appear at the "
+"top of the inspector."
+msgstr ""
+"Emettilo se desideri impostare una proprietà come preferita, facendola "
+"apparire in cima all'ispettore."
+
 msgid ""
 "Emit it if you want to add this value as an animation key (check for keying "
 "being enabled first)."
@@ -40660,6 +51138,48 @@ msgstr ""
 "Verifica se la risorsa è cambiata, in tal caso verrà invalidata e verrà "
 "emesso il segnale corrispondente."
 
+msgid ""
+"Queue the [param resource] being edited for preview. Once the preview is "
+"ready, the [param receiver]'s [param receiver_func] will be called. The "
+"[param receiver_func] must take the following four arguments: [String] path, "
+"[Texture2D] preview, [Texture2D] thumbnail_preview, [Variant] userdata. "
+"[param userdata] can be anything, and will be returned when [param "
+"receiver_func] is called.\n"
+"[b]Note:[/b] If it was not possible to create the preview the [param "
+"receiver_func] will still be called, but the preview will be [code]null[/"
+"code]."
+msgstr ""
+"Mette in coda la risorsa [param resource] in fase di modifica per "
+"l'anteprima. Una volta che l'anteprima è pronta, sarà chiamata la funzione "
+"[param receiver_func] del ricevitore [param receiver]. [param receiver_func] "
+"deve accettare i seguenti quattro argomenti: [String] percorso, [Texture2D] "
+"anteprima, [Texture2D] anteprima in miniatura, [Variant] userdata. [param "
+"userdata] può essere qualsiasi cosa e sarà restituito quando [param "
+"receiver_func] viene chiamato.\n"
+"[b]Nota:[/b] Se non è stato possibile creare l'anteprima, [param "
+"receiver_func] verrà comunque chiamata, ma l'anteprima sarà [code]null[/code]."
+
+msgid ""
+"Queue a resource file located at [param path] for preview. Once the preview "
+"is ready, the [param receiver]'s [param receiver_func] will be called. The "
+"[param receiver_func] must take the following four arguments: [String] path, "
+"[Texture2D] preview, [Texture2D] thumbnail_preview, [Variant] userdata. "
+"[param userdata] can be anything, and will be returned when [param "
+"receiver_func] is called.\n"
+"[b]Note:[/b] If it was not possible to create the preview the [param "
+"receiver_func] will still be called, but the preview will be [code]null[/"
+"code]."
+msgstr ""
+"Mette in coda il file risorsa situato al percorso [param path] per "
+"l'anteprima. Una volta che l'anteprima è pronta, sarà chiamata la funzione "
+"[param receiver_func] del ricevitore [param receiver]. [param receiver_func] "
+"deve accettare i seguenti quattro argomenti: [String] percorso, [Texture2D] "
+"anteprima, [Texture2D] anteprima in miniatura, [Variant] userdata. [param "
+"userdata] può essere qualsiasi cosa e sarà restituito quando [param "
+"receiver_func] viene chiamato.\n"
+"[b]Nota:[/b] Se non è stato possibile creare l'anteprima, [param "
+"receiver_func] verrà comunque chiamata, ma l'anteprima sarà [code]null[/code]."
+
 msgid "Removes a custom preview generator."
 msgstr "Rimuove un generatore di anteprime personalizzato."
 
@@ -40673,6 +51193,14 @@ msgstr ""
 msgid "Custom generator of previews."
 msgstr "Generatore personalizzato di anteprime."
 
+msgid ""
+"Custom code to generate previews. Check [member EditorSettings.filesystem/"
+"file_dialog/thumbnail_size] to find a proper size to generate previews at."
+msgstr ""
+"Codice personalizzato per generare anteprime. Controlla [member "
+"EditorSettings.filesystem/file_dialog/thumbnail_size] per individuare una "
+"dimensione appropriata con cui generare le anteprime."
+
 msgid ""
 "If this function returns [code]true[/code], the generator will call [method "
 "_generate] or [method _generate_from_path] for small previews as well.\n"
@@ -40802,6 +51330,33 @@ msgstr ""
 "Per utilizzare [EditorSceneFormatImporter], registrarlo prima attraverso il "
 "metodo [method EditorPlugin.add_scene_format_importer_plugin]."
 
+msgid "Return supported file extensions for this scene importer."
+msgstr ""
+"Restituite le estensioni di file supportate per questo importatore di scene."
+
+msgid ""
+"Should return [code]true[/code] to show the given option, [code]false[/code] "
+"to hide the given option, or [code]null[/code] to ignore."
+msgstr ""
+"Dovrebbe restituire [code]true[/code] per mostrare l'opzione specificata, "
+"[code]false[/code] per nascondere l'opzione specificata o [code]null[/code] "
+"per ignorarla."
+
+msgid ""
+"Add a specific import option (name and default value only). This function can "
+"only be called from [method _get_import_options]."
+msgstr ""
+"Aggiunge un'opzione di importazione specifica (solo il nome e il valore "
+"predefinito). Questa funzione può essere chiamata solo da [method "
+"_get_import_options]."
+
+msgid ""
+"Add a specific import option. This function can only be called from [method "
+"_get_import_options]."
+msgstr ""
+"Aggiunge un'opzione di importazione specifica. Questa funzione può essere "
+"chiamata solo da [method _get_import_options]."
+
 msgid "Importer for Blender's [code].blend[/code] scene file format."
 msgstr ""
 "Importatore per il formato di file di scena [code].blend[/code] di Blender."
@@ -41168,6 +51723,18 @@ msgid "Sets the list of favorite files and directories for this project."
 msgstr ""
 "Imposta la lista dei file e delle cartelle preferite per questo progetto."
 
+msgid ""
+"Sets the initial value of the setting specified by [param name] to [param "
+"value]. This is used to provide a value for the Revert button in the Editor "
+"Settings. If [param update_current] is [code]true[/code], the setting is "
+"reset to [param value] as well."
+msgstr ""
+"Imposta il valore iniziale dell'impostazione specificata da [param name] su "
+"[param value]. Questo è utilizzato per fornire un valore per il pulsante "
+"Ripristina nelle Impostazioni dell'editor. Se [param update_current] è "
+"[code]true[/code], anche il valore attuale dell'impostazione verrà impostato "
+"su [param value]."
+
 msgid ""
 "Sets project-specific metadata with the [param section], [param key] and "
 "[param data] specified. This metadata is stored outside the project folder "
@@ -41194,6 +51761,13 @@ msgstr ""
 "value]. Equivale a utilizzare [method Object.set] sull'istanza di "
 "EditorSettings."
 
+msgid ""
+"If [code]true[/code], automatically switches to the [b]Stack Trace[/b] panel "
+"when the debugger hits a breakpoint or steps."
+msgstr ""
+"Se [code]true[/code], passa automaticamente al pannello [b]Stack Trace[/b] "
+"quando il debugger raggiunge un punto d'interruzione o passa in avanti."
+
 msgid ""
 "If [code]true[/code], enables collection of profiling data from non-GDScript "
 "Godot functions, such as engine class methods. Enabling this slows execution "
@@ -41268,6 +51842,22 @@ msgstr ""
 "[b]Nota:[/b] Questa impostazione non ha effetto quando la modalità di "
 "divisione è disattivata (impostazione predefinita)."
 
+msgid ""
+"A comma separated list of unsupported file extensions to show in the "
+"FileSystem dock, e.g. [code]\"ico,icns\"[/code]."
+msgstr ""
+"Un'elenco separato da virgole di estensioni file non supportate da mostrare "
+"nel pannello del Filesystem, ad esempio [code]\"ico,icns\"[/code]."
+
+msgid ""
+"A comma separated list of file extensions to consider as editable text files "
+"in the FileSystem dock (by double-clicking on the files), e.g. [code]\"txt,md,"
+"cfg,ini,log,json,yml,yaml,toml,xml\"[/code]."
+msgstr ""
+"Un'elenco separato da virgole di estensioni file da considerare come file di "
+"testo modificabili nel pannello del Filesystem (facendo doppio clic sui "
+"file), ad esempio [code]\"txt,md,cfg,ini,log,json,yml,yaml,toml,xml\"[/code]."
+
 msgid ""
 "The thumbnail size to use in the FileSystem dock (in pixels). See also "
 "[member filesystem/file_dialog/thumbnail_size]."
@@ -41405,6 +51995,15 @@ msgstr ""
 "abilitato nel menu Opzioni di scatto nella parte superiore della viewport "
 "dell'editor 2D."
 
+msgid ""
+"If [code]true[/code], the 2D editor will snap to integer zoom values when not "
+"holding the [kbd]Alt[/kbd] key. If [code]false[/code], this behavior is "
+"swapped."
+msgstr ""
+"Se [code]true[/code], l'editor 2D arrotonderà i valori di zoom su numeri "
+"interi quando non si tiene premuto il tasto [kbd]Alt[/kbd]. Se [code]false[/"
+"code], questo comportamento è invertito."
+
 msgid ""
 "The color of the viewport border in the 2D editor. This border represents the "
 "viewport's size at the base resolution defined in the Project Settings. "
@@ -41618,6 +52217,39 @@ msgstr ""
 "griglia potrebbe non essere completamente visibile poiché viene utilizzato "
 "uno shader per dissolverla gradualmente."
 
+msgid ""
+"If [code]true[/code], renders the grid on the XY plane in perspective view. "
+"This can be useful for 3D side-scrolling games."
+msgstr ""
+"Se [code]true[/code], renderizza la griglia su un piano XY in vista "
+"prospettica. Questo può essere utile per i giochi 3D a scorrimento laterale."
+
+msgid ""
+"If [code]true[/code], renders the grid on the XZ plane in perspective view."
+msgstr ""
+"Se [code]true[/code], renderizza la griglia su un piano XZ in vista "
+"prospettica."
+
+msgid ""
+"If [code]true[/code], renders the grid on the YZ plane in perspective view. "
+"This can be useful for 3D side-scrolling games."
+msgstr ""
+"Se [code]true[/code], renderizza la griglia su un piano YZ in vista "
+"prospettica. Questo può essere utile per i giochi 3D a scorrimento laterale."
+
+msgid ""
+"If [code]true[/code], enables 3-button mouse emulation mode. This is useful "
+"on laptops when using a trackpad.\n"
+"When 3-button mouse emulation mode is enabled, the pan, zoom and orbit "
+"modifiers can always be used in the 3D editor viewport, even when not holding "
+"down any mouse button."
+msgstr ""
+"Se [code]true[/code], abilita la modalità di emulazione del mouse a 3 "
+"pulsanti. È utile sui laptop quando si usa un trackpad.\n"
+"Quando la modalità di emulazione del mouse a 3 pulsanti è abilitata, è "
+"possibile usare i modificatori di panoramica, zoom e orbita nella viewport "
+"dell'editor 3D, anche quando non si tiene premuto alcun pulsante del mouse."
+
 msgid ""
 "If [code]true[/code], allows using the top row [kbd]0[/kbd]-[kbd]9[/kbd] keys "
 "to function as their equivalent numpad keys for 3D editor navigation. This "
@@ -41685,6 +52317,9 @@ msgstr ""
 "riducono l'accelerazione e la decelerazione della telecamera, il che appare "
 "più fluido ma aggiunge ritardo."
 
+msgid "The mouse sensitivity to use when panning in the 3D editor."
+msgstr "La sensibilità del mouse da usare quando ci si sposta nell'editor 3D."
+
 msgid ""
 "The inertia to use when zooming in the 3D editor. Higher values make the "
 "camera start and stop slower, which looks smoother but adds latency."
@@ -41737,6 +52372,24 @@ msgstr ""
 "Il colore da utilizzare per il gizmo AABB che visualizza l'[AABB] "
 "personalizzato di [GeometryInstance3D]."
 
+msgid "The 3D editor gizmo color for [Camera3D]s."
+msgstr "Il colore dei gizmo dell'editor 3D per i [Camera3D]."
+
+msgid ""
+"The 3D editor gizmo color for CSG nodes (such as [CSGShape3D] or [CSGBox3D])."
+msgstr ""
+"Il colore dei gizmo dell'editor 3D per i nodi CSG (come [CSGShape3D] e "
+"[CSGBox3D])."
+
+msgid "The 3D editor gizmo color for [Decal] nodes."
+msgstr "Il colore dei gizmo dell'editor 3D per i nodi [Decal]."
+
+msgid "The 3D editor gizmo color for [FogVolume] nodes."
+msgstr "Il colore dei gizmo dell'editor 3D per i nodi [FogVolume]."
+
+msgid "The 3D editor gizmo color for the [GridMap] grid."
+msgstr "Il colore dei gizmo dell'editor 3D per le griglie dei [GridMap]."
+
 msgid ""
 "The color override to use for 3D editor gizmos if the [Node3D] in question is "
 "part of an instantiated scene file (from the perspective of the current "
@@ -41750,6 +52403,51 @@ msgid "The 3D editor gizmo color for [Joint3D]s and [PhysicalBone3D]s."
 msgstr ""
 "Il colore dei gizmo dell'editor 3D per i [Joint3D] e i [PhysicalBone3D]."
 
+msgid "The 3D editor gizmo color used for [LightmapProbe] nodes."
+msgstr "Il colore dei gizmo dell'editor 3D usato per i nodi [LightmapProbe]."
+
+msgid "The 3D editor gizmo color used for [OccluderInstance3D] nodes."
+msgstr ""
+"Il colore dei gizmo dell'editor 3D usato per i nodi [OccluderInstance3D]."
+
+msgid "The 3D editor gizmo color used for [GPUParticlesAttractor3D] nodes."
+msgstr ""
+"Il colore dei gizmo dell'editor 3D usato per i nodi [GPUParticlesAttractor3D]."
+
+msgid "The 3D editor gizmo color used for [GPUParticlesCollision3D] nodes."
+msgstr ""
+"Il colore dei gizmo dell'editor 3D usato per i nodi "
+"[GPUParticlesCollisions3D]."
+
+msgid ""
+"The 3D editor gizmo color used for [CPUParticles3D] and [GPUParticles3D] "
+"nodes."
+msgstr ""
+"Il colore dei gizmo dell'editor 3D per i nodi [CPUParticles3D] e "
+"[GPUParticles3D]."
+
+msgid "The 3D editor gizmo color used for [ReflectionProbe] nodes."
+msgstr "Il colore dei gizmo dell'editor 3D per i nodi [ReflectionProbe]."
+
+msgid ""
+"The 3D editor gizmo color used for the currently selected [Skeleton3D] bone."
+msgstr ""
+"Il colore dei gizmo dell'editor 3D usato per l'osso attualmente selezionato "
+"di uno [Skeleton3D]."
+
+msgid ""
+"The 3D editor gizmo color used for [VisibleOnScreenNotifier3D] and "
+"[VisibleOnScreenEnabler3D] nodes."
+msgstr ""
+"Il colore dei gizmo dell'editor 3D usato per i nodi "
+"[VisibleOnScreenNotifier3D] e [VisibleOnScreenEnabler3D]."
+
+msgid "The 3D editor gizmo color used for [VoxelGI] nodes."
+msgstr "Il colore dei gizmo dell'editor 3D usato per i nodi [VoxelGI]."
+
+msgid "The length of [Skeleton3D] bone gizmos in the 3D editor."
+msgstr "La lunghezza dei gizmo delle ossa di uno [Skeleton3D] nell'editor 3D."
+
 msgid ""
 "If [code]true[/code], automatically updates animation tracks' target paths "
 "when renaming or reparenting nodes in the Scene tree dock."
@@ -41844,6 +52542,29 @@ msgstr ""
 "tenere premuto il pulsante sinistro del mouse mentre si tiene premuto "
 "[kbd]Spazio[/kbd] per spostarsi nella viewport dell'editor 2D."
 
+msgid ""
+"Controls whether the mouse wheel scroll zooms or pans in subeditors. The list "
+"of affected subeditors is: animation blend tree editor, [Polygon2D] editor, "
+"tileset editor, texture region editor and visual shader editor. See also "
+"[member editors/panning/2d_editor_panning_scheme] and [member editors/panning/"
+"animation_editors_panning_scheme]."
+msgstr ""
+"Controlla se la rotellina del mouse esegue lo zoom o la panoramica negli "
+"editor secondari. La lista degli editor secondari influenzati è: editor di "
+"animation blend tree, editor di [Polygon2D], editor di tileset, editor di "
+"regione di texture e editor di visual shader. Vedi anche [member editors/"
+"panning/2d_editor_panning_scheme] e [member editors/panning/"
+"animation_editors_panning_scheme]."
+
+msgid ""
+"If [code]true[/code], warps the mouse around the 2D viewport while panning in "
+"the 2D editor. This makes it possible to pan over a large area without having "
+"to exit panning and adjust the mouse cursor."
+msgstr ""
+"Se [code]true[/code], avvolge il mouse attorno alla viewport 2D durante lo "
+"spostamento (panoramica) nell'editor 2D. Ciò consente di spostarsi su un'area "
+"ampia senza dover uscire dalla panoramica e regolare il cursore del mouse."
+
 msgid ""
 "The delay in seconds until more complex and performance costly polygon "
 "editors commit their outlines, e.g. the 2D navigation polygon editor rebakes "
@@ -42007,6 +52728,17 @@ msgstr "Il colore di una porta o connessione di tipo Vector4."
 msgid "The pattern used for the background grid."
 msgstr "Il motivo utilizzato per la griglia di sfondo."
 
+msgid ""
+"The curvature to use for connection lines in the visual shader editor. Higher "
+"values will make connection lines appear more curved, with values above "
+"[code]0.5[/code] resulting in more \"angular\" turns in the middle of "
+"connection lines."
+msgstr ""
+"La curvatura da usare per le linee dei collegamenti nell'editor di visual "
+"shader. Valori più alti faranno apparire le linee dei collegamenti più "
+"curvate, con valori superiori a [code]0.5[/code] che risultano in curve più "
+"\"angolari\" al centro delle linee dei collegamenti."
+
 msgid ""
 "The opacity of the minimap displayed in the bottom-right corner of the visual "
 "shader editor."
@@ -42244,6 +52976,27 @@ msgstr ""
 "alcuni programmi antivirus. In questo caso, potrebbe essere necessario "
 "impostarla su [code]false[/code] per evitare problemi di blocco dei file."
 
+msgid "If [code]true[/code], fuzzy matching of search tokens is allowed."
+msgstr ""
+"Se [code]true[/code], è consentita la corrispondenza approssimata dei token "
+"di ricerca."
+
+msgid ""
+"If [code]true[/code], results will include files located in the [code]addons[/"
+"code] folder."
+msgstr ""
+"Se [code]true[/code], i risultati includeranno i file situati nella cartella "
+"[code]addons[/code]."
+
+msgid "Maximum number of matches to show in dialog."
+msgstr "Numero massimo di corrispondenze da mostrare nella finestra di dialogo."
+
+msgid ""
+"If [code]true[/code], results will be highlighted with their search matches."
+msgstr ""
+"Se [code]true[/code], i risultati saranno evidenziati con le loro "
+"corrispondenze nella ricerca."
+
 msgid ""
 "The path to the directory containing the Open Image Denoise (OIDN) "
 "executable, used optionally for denoising lightmaps. It can be downloaded "
@@ -42316,6 +53069,15 @@ msgstr ""
 "- [b]Cancel First[/b] Forza l'ordinamento Annulla/OK.\n"
 "- [b]OK First[/b] Forza l'ordinamento OK/Annulla."
 
+msgid ""
+"If [code]true[/code], automatically opens screenshots with the default "
+"program associated to [code].png[/code] files after a screenshot is taken "
+"using the [b]Editor > Take Screenshot[/b] action."
+msgstr ""
+"Se [code]true[/code], apre automaticamente gli screenshot con il programma "
+"predefinito associato ai file [code].png[/code] dopo che uno screenshot è "
+"stato catturato tramite l'azione [b]Editor > Cattura screenshot[/b]."
+
 msgid ""
 "The font to use for the script editor. Must be a resource of a [Font] type "
 "such as a [code].ttf[/code] or [code].otf[/code] font file."
@@ -42672,6 +53434,22 @@ msgstr ""
 "update_continuously] è [code]true[/code], poiché abilitando tale impostazione "
 "si disabilita la modalità a basso processore."
 
+msgid ""
+"If [code]true[/code], redraws the editor every frame even if nothing has "
+"changed on screen. When this setting is enabled, the update spinner displays "
+"in red (see [member interface/editor/show_update_spinner]).\n"
+"[b]Warning:[/b] This greatly increases CPU and GPU utilization, leading to "
+"increased power usage. This should only be enabled for troubleshooting "
+"purposes."
+msgstr ""
+"Se [code]true[/code], ridisegna l'editor ogni frame, anche se sullo schermo "
+"non è cambiato nulla. Quando questa impostazione è abilitata, lo spinner di "
+"aggiornamento è visualizzato in rosso (vedi [member interface/editor/"
+"show_update_spinner]).\n"
+"[b]Attenzione:[/b] Questo aumenta notevolmente l'utilizzo della CPU e GPU, "
+"portando a un maggiore consumo di energia. Dovrebbe essere abilitato solo a "
+"scopo di risolvere problemi."
+
 msgid ""
 "If [code]true[/code], editor main menu is using embedded [MenuBar] instead of "
 "system global menu.\n"
@@ -42705,6 +53483,13 @@ msgstr ""
 "[b]Nota:[/b] Le modalità V-Sync diverse da [b]Enabled[/b] sono supportate "
 "solo nei metodi di rendering Forward+ e Mobile, non Compatibilità."
 
+msgid ""
+"If [code]true[/code], the Scene dock will display buttons to quickly add a "
+"root node to a newly created scene."
+msgstr ""
+"Se [code]true[/code], il pannello dell'albero di scene visualizzerà i "
+"pulsanti per aggiungere rapidamente un nodo radice a una scena appena creata."
+
 msgid ""
 "If [code]true[/code], automatically expands property groups in the Inspector "
 "dock when opening a scene that hasn't been opened previously. If [code]false[/"
@@ -42764,6 +53549,19 @@ msgstr ""
 "Impostazioni del progetto e nelle Impostazioni dell'editor, utilizza invece "
 "[member interface/editor/localize_settings]."
 
+msgid ""
+"If [code]true[/code], add a margin around Array, Dictionary, and Resource "
+"Editors that are not already colored.\n"
+"[b]Note:[/b] If [member interface/inspector/nested_color_mode] is set to "
+"[b]Containers & Resources[/b] this parameter will have no effect since those "
+"editors will already be colored."
+msgstr ""
+"Se [code]true[/code], aggiunge un margine attorno agli editor di array, "
+"dizionari e risorse che non sono già colorati.\n"
+"[b]Nota:[/b] Se [member interface/inspector/nested_color_mode] è impostato su "
+"[b]Containers & Resources[/b] questo parametro non avrà effetto poiché quegli "
+"editor saranno già colorati."
+
 msgid ""
 "If [code]true[/code], forces all property groups to be expanded in the "
 "Inspector dock and prevents collapsing them."
@@ -42803,6 +53601,17 @@ msgstr ""
 "compatto, ma può essere più difficile vedere e modificare valori grandi senza "
 "espandere l'ispettore orizzontalmente."
 
+msgid ""
+"The number of [Array] or [Dictionary] items to display on each \"page\" in "
+"the inspector. Higher values allow viewing more values per page, but take "
+"more time to load. This increased load time is noticeable when selecting "
+"nodes that have array or dictionary properties in the editor."
+msgstr ""
+"Il numero di elementi [Array] o [Dictionary] da visualizzare su ogni "
+"\"pagina\" nell'ispettore. Valori più alti consentono di visualizzare più "
+"valori per pagina, ma richiedono più tempo per caricare. Ciò è più notabile "
+"quando si selezionano nodi che hanno proprietà array o dizionario nell'editor."
+
 msgid ""
 "Control which property editors are colored when they are opened.\n"
 "- [b]Containers & Resources:[/b] Color all Array, Dictionary, and Resource "
@@ -42846,6 +53655,26 @@ msgstr ""
 "Se [code]true[/code], visualizza le funzionalità OpenType segnate come "
 "\"nascoste\" ([code]hidden[/code]) dal file font nell'editor di [Font]."
 
+msgid ""
+"If [code]true[/code], multiple window support in editor is enabled. The "
+"following panels can become dedicated windows (i.e. made floating): Docks, "
+"Script editor, Shader editor, and Game Workspace.\n"
+"[b]Note:[/b] When [member interface/editor/single_window_mode] is [code]true[/"
+"code], the multi window support is always disabled.\n"
+"[b]Note:[/b] To query whether the editor can use multiple windows in an "
+"editor plugin, use [method EditorInterface.is_multi_window_enabled] instead "
+"of querying the value of this editor setting."
+msgstr ""
+"Se [code]true[/code], il supporto multi-finestra nell'editor è abilitato. I "
+"seguenti pannelli possono diventare finestre dedicate (ovvero rese mobili): "
+"Pannelli, Editor di script, Editor di shader e Area di lavoro del gioco.\n"
+"[b]Nota:[/b] Quando [member interface/editor/single_window_mode] è "
+"[code]true[/code], il supporto multi-finestra è sempre disabilitato.\n"
+"[b]Nota:[/b] Per verificare se l'editor può utilizzare più finestre in "
+"un'estensione dell'editor, utilizzare [method EditorInterface."
+"is_multi_window_enabled] anziché verificare il valore di questa impostazione "
+"dell'editor."
+
 msgid ""
 "If [code]true[/code], when panels are made floating they will be maximized.\n"
 "If [code]false[/code], when panels are made floating their position and size "
@@ -43041,6 +53870,14 @@ msgstr ""
 "grafiche utente dell'editor (GUI) basate su [Tree] (ad esempio il pannello "
 "dell'albero di scene)."
 
+msgid ""
+"If [code]true[/code], set accent color based on system settings.\n"
+"[b]Note:[/b] This setting is only effective on Windows, MacOS, and Android."
+msgstr ""
+"Se [code]true[/code], imposta il colore d'accento in base alle impostazioni "
+"del sistema.\n"
+"[b]Nota:[/b] Questa impostazione funziona solo su Windows, MacOS e Android."
+
 msgid ""
 "If [code]true[/code], long press on touchscreen is treated as right click.\n"
 "[b]Note:[/b] Defaults to [code]true[/code] on touchscreen devices."
@@ -43113,6 +53950,17 @@ msgstr ""
 "piattaforme di terze parti che ospitano contenuti dalla Libreria dei "
 "contenuti."
 
+msgid ""
+"The address to listen to when starting the remote debugger. This can be set "
+"to this device's local IP address to allow external clients to connect to the "
+"remote debugger (instead of restricting the remote debugger to connections "
+"from [code]localhost[/code])."
+msgstr ""
+"L'indirizzo da ascoltare quando si avvia il debugger remoto. Può essere "
+"impostato sull'indirizzo IP locale di questo dispositivo per consentire ai "
+"client esterni di connettersi al debugger remoto (invece di limitare il "
+"debugger remoto alle connessioni da [code]localhost[/code])."
+
 msgid ""
 "The port to listen to when starting the remote debugger. Godot will try to "
 "use port numbers above the configured number if the configured number is "
@@ -43229,6 +54077,17 @@ msgstr ""
 "Se [code]true[/code], su Linux/BSD, l'editor verificherà prima Wayland invece "
 "di X11 (se disponibile)."
 
+msgid ""
+"The window mode to use to display the project when starting the project from "
+"the editor.\n"
+"[b]Note:[/b] Game embedding is not available for \"Force Maximized\" or "
+"\"Force Fullscreen.\""
+msgstr ""
+"La modalità di finestra da utilizzare per visualizzare il progetto quando si "
+"avvia il progetto dall'editor.\n"
+"[b]Nota:[/b] L'incorporamento del gioco non è disponibile per \"Force "
+"Maximized\" o \"Force Fullscreen\"."
+
 msgid ""
 "The custom position to use when starting the project from the editor (in "
 "pixels from the top-left corner). Only effective if [member run/"
@@ -43413,6 +54272,20 @@ msgstr ""
 "tra le righe può migliorare la leggibilità a costo di visualizzare meno righe "
 "sullo schermo."
 
+msgid ""
+"If [code]true[/code], documentation tooltips will appear when hovering over a "
+"symbol."
+msgstr ""
+"Se [code]true[/code], i suggerimenti della documentazione appariranno quando "
+"si passa il mouse su un simbolo."
+
+msgid ""
+"If [code]true[/code], tool scripts will be automatically soft-reloaded after "
+"they are saved."
+msgstr ""
+"Se [code]true[/code], gli script di strumento (tool) verranno ricaricati "
+"automaticamente dopo essere stati salvati."
+
 msgid ""
 "If [code]true[/code], automatically reloads scripts in the editor when they "
 "have been modified and saved by external editors."
@@ -43770,6 +54643,20 @@ msgstr ""
 "(nella posizione in cui verrebbe visualizzata la panoramica dei membri "
 "durante la modifica di uno script)."
 
+msgid ""
+"If [code]true[/code], the script's method list in the Script Editor is sorted "
+"alphabetically."
+msgstr ""
+"Se [code]true[/code], l'elenco dei metodi dello script nell'Editor di script "
+"è ordinato alfabeticamente."
+
+msgid ""
+"If [code]true[/code], the scripts that are used by the current scene are "
+"highlighted in the Script Editor's script list."
+msgstr ""
+"Se [code]true[/code], gli script utilizzati dalla scena attuale sono "
+"evidenziati nell'elenco degli script dell'Editor di script."
+
 msgid ""
 "If [code]true[/code], displays an overview of the current script's member "
 "variables and functions at the left of the script editor. See also [member "
@@ -43938,6 +54825,11 @@ msgstr ""
 "questo è utilizzato per i commenti che iniziano con [code]///[/code] o [code]/"
 "**[/code]."
 
+msgid "The script editor's engine type color ([Object], [Mesh], [Node], ...)."
+msgstr ""
+"Il colore dei tipi del motore nell'editor di script ([Object], [Mesh], "
+"[Node], ...)."
+
 msgid ""
 "The script editor's color for the debugger's executing line icon (displayed "
 "in the gutter)."
@@ -44084,6 +54976,11 @@ msgstr ""
 "Visibile solo se [member text_editor/appearance/caret/"
 "highlight_all_occurrences] è [code]true[/code]."
 
+msgid "The vertical line separation used in text editors, in pixels."
+msgstr ""
+"La separazione della linea verticale utilizzata negli editor di testo, in "
+"pixel."
+
 msgid "Emitted after any editor setting has changed."
 msgstr "Emesso dopo che qualsiasi impostazione dell'editor viene modificata."
 
@@ -44143,11 +55040,17 @@ msgstr "Emesso quando lo spinner/slider viene afferrato."
 msgid "Emitted when the spinner/slider is ungrabbed."
 msgstr "Emesso quando lo spinner/slider viene rilasciato."
 
+msgid "Emitted when the updown button is pressed."
+msgstr "Emesso quando il pulsante su/giù viene premuto."
+
 msgid "Emitted when the value form gains focus."
-msgstr "Emesso quando il modulo del valore ottiene il focus."
+msgstr "Emesso quando il campo del valore ottiene il focus."
 
 msgid "Emitted when the value form loses focus."
-msgstr "Emesso quando il modulo del valore perde il focus."
+msgstr "Emesso quando il campo del valore perde il focus."
+
+msgid "Single texture representing both the up and down buttons."
+msgstr "Singola texture che rappresenta entrambi i pulsanti su e giù."
 
 msgid "Base class for [SyntaxHighlighter] used by the [ScriptEditor]."
 msgstr "Classe di base per [SyntaxHighlighter] utilizzata dallo [ScriptEditor]."
@@ -44177,6 +55080,23 @@ msgstr ""
 "Metodo virtuale che può essere sovrascritto per restituire i nomi dei "
 "linguaggi supportati."
 
+msgid "Manages toast notifications within the editor."
+msgstr "Gestisce le notifiche toast all'interno dell'editor."
+
+msgid ""
+"This object manages the functionality and display of toast notifications "
+"within the editor, ensuring timely and informative alerts are presented to "
+"users.\n"
+"[b]Note:[/b] This class shouldn't be instantiated directly. Instead, access "
+"the singleton using [method EditorInterface.get_editor_toaster]."
+msgstr ""
+"Questo oggetto gestisce la funzionalità e la visualizzazione delle notifiche "
+"toast all'interno dell'editor, assicurando che avvisi opportuni e informativi "
+"vengano presentati agli utenti.\n"
+"[b]Nota:[/b] Questa classe non dovrebbe essere istanziata direttamente. "
+"Invece, accedi al singleton tramite [method EditorInterface."
+"get_editor_toaster]."
+
 msgid ""
 "Plugin for adding custom parsers to extract strings that are to be translated "
 "from custom files (.csv, .json etc.)."
@@ -44184,6 +55104,252 @@ msgstr ""
 "Estensione per aggiungere parser personalizzati per estrarre stringhe da "
 "tradurre dai file personalizzati (.csv, .json ecc.)."
 
+msgid ""
+"[EditorTranslationParserPlugin] is invoked when a file is being parsed to "
+"extract strings that require translation. To define the parsing and string "
+"extraction logic, override the [method _parse_file] method in script.\n"
+"The return value should be an [Array] of [PackedStringArray]s, one for each "
+"extracted translatable string. Each entry should contain [code][msgid, "
+"msgctxt, msgid_plural, comment][/code], where all except [code]msgid[/code] "
+"are optional. Empty strings will be ignored.\n"
+"The extracted strings will be written into a POT file selected by user under "
+"\"POT Generation\" in \"Localization\" tab in \"Project Settings\" menu.\n"
+"Below shows an example of a custom parser that extracts strings from a CSV "
+"file to write into a POT.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"    var ret: Array[PackedStringArray] = []\n"
+"    var file = FileAccess.open(path, FileAccess.READ)\n"
+"    var text = file.get_as_text()\n"
+"    var split_strs = text.split(\",\", false)\n"
+"    for s in split_strs:\n"
+"        ret.append(PackedStringArray([s]))\n"
+"        #print(\"Extracted string: \" + s)\n"
+"\n"
+"    return ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"    public override Godot.Collections.Array<string[]> _ParseFile(string "
+"path)\n"
+"    {\n"
+"        Godot.Collections.Array<string[]> ret;\n"
+"        using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"        string text = file.GetAsText();\n"
+"        string[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"        foreach (string s in splitStrs)\n"
+"        {\n"
+"            ret.Add([s]);\n"
+"            //GD.Print($\"Extracted string: {s}\");\n"
+"        }\n"
+"        return ret;\n"
+"    }\n"
+"\n"
+"    public override string[] _GetRecognizedExtensions()\n"
+"    {\n"
+"        return [\"csv\"];\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To add a translatable string associated with a context, plural, or comment:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", and comment \"test 1 comment\".\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\"]))\n"
+"# This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", and comment \"test 1 comment\".\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\"]);\n"
+"// This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you override parsing logic for standard script types "
+"(GDScript, C#, etc.), it would be better to load the [code]path[/code] "
+"argument using [method ResourceLoader.load]. This is because built-in scripts "
+"are loaded as [Resource] type, not [FileAccess] type. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"    var res = ResourceLoader.load(path, \"Script\")\n"
+"    var text = res.source_code\n"
+"    # Parsing logic.\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"    var res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"    string text = res.SourceCode;\n"
+"    // Parsing logic.\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"    return [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To use [EditorTranslationParserPlugin], register it using the [method "
+"EditorPlugin.add_translation_parser_plugin] method first."
+msgstr ""
+"[EditorTranslationParserPlugin] viene richiamato quando un file viene "
+"analizzato per estrarre stringhe che richiedono una traduzione. Per definire "
+"la logica di analisi ed estrazione delle stringhe, sovrascrivi il metodo "
+"[method _parse_file] nello script.\n"
+"Il valore restituito dovrebbe essere un [Array] di [PackedStringArray], uno "
+"per ogni stringa traducibile estratta. Ogni voce dovrebbe contenere [code]"
+"[msgid, msgctxt, msgid_plural, comment][/code], dove tutti tranne "
+"[code]msgid[/code] sono facoltativi. Le stringhe vuote verranno ignorate.\n"
+"Le stringhe estratte verranno scritte in un file POT selezionato dall'utente "
+"in \"Generazione del POT\" nella scheda \"Localizzazione\" nel menu "
+"\"Impostazioni del progetto\".\n"
+"Di seguito è riportato un esempio di un parser personalizzato che estrae "
+"stringhe da un file CSV per scriverle in un POT.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"    var ret: Array[PackedStringArray] = []\n"
+"    var file = FileAccess.open(path, FileAccess.READ)\n"
+"    var text = file.get_as_text()\n"
+"    var split_strs = text.split(\",\", false)\n"
+"    for s in split_strs:\n"
+"        ret.append(PackedStringArray([s]))\n"
+"        #print(\"Extracted string: \" + s)\n"
+"\n"
+"    return ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"    public override Godot.Collections.Array<string[]> _ParseFile(string "
+"path)\n"
+"    {\n"
+"        Godot.Collections.Array<string[]> ret;\n"
+"        using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"        string text = file.GetAsText();\n"
+"        string[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"        foreach (string s in splitStrs)\n"
+"        {\n"
+"            ret.Add([s]);\n"
+"            //GD.Print($\"Extracted string: {s}\");\n"
+"        }\n"
+"        return ret;\n"
+"    }\n"
+"\n"
+"    public override string[] _GetRecognizedExtensions()\n"
+"    {\n"
+"        return [\"csv\"];\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Per aggiungere una stringa traducibile associata a un contesto, con un "
+"plurale o con un commento:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Questo aggiungerà un messaggio con msgid \"Test 1\", msgctxt \"context\" e "
+"msgid_plural \"test 1 plurals\" e commento \"test 1 comment\".\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\"]))\n"
+"# Questo aggiungerà un messaggio con msgid \"A test without context\" e "
+"msgid_plural \"plurals\".\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# Questo aggiungerà un messaggio con msgid \"Only with context\" e msgctxt "
+"\"a friendly context\".\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Questo aggiungerà un messaggio con msgid \"Test 1\", msgctxt \"context\" e "
+"msgid_plural \"test 1 plurals\" e commento \"test 1 comment\".\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\"]);\n"
+"// Questo aggiungerà un messaggio con msgid \"A test without context\" e "
+"msgid_plural \"plurals\".\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// Questo aggiungerà un messaggio con msgid \"Only with context\" e msgctxt "
+"\"a friendly context\".\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Se si sovrascrive la logica di analisi per i tipi di script "
+"standard (GDScript, C#, ecc.), sarebbe meglio caricare l'argomento "
+"[code]path[/code] tramite [method ResourceLoader.load]. Questo perché gli "
+"script integrati sono caricati come tipo [Resource], non come tipo "
+"[FileAccess]. Ad esempio:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"    var res = ResourceLoader.load(path, \"Script\")\n"
+"    var text = res.source_code\n"
+"    # Parsing logic.\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"    var res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"    string text = res.SourceCode;\n"
+"    // Parsing logic.\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"    return [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Per utilizzare [EditorTranslationParserPlugin], registrarlo prima attraverso "
+"il metodo [method EditorPlugin.add_translation_parser_plugin]."
+
+msgid ""
+"Gets the list of file extensions to associate with this parser, e.g. [code]"
+"[\"csv\"][/code]."
+msgstr ""
+"Ottiene la lista delle estensioni di file da associare a questo parser, ad "
+"esempio [code][\"csv\"][/code]."
+
 msgid ""
 "Override this method to define a custom parsing logic to extract the "
 "translatable strings."
@@ -44592,6 +55758,32 @@ msgstr ""
 "Arresta l'istanza dell'estensione VCS. Chiamato quando l'utente chiude "
 "l'editor o arresta l'estensione VCS tramite l'interfaccia utente dell'editor."
 
+msgid "Stages the file present at [param file_path] to the staged area."
+msgstr ""
+"Esegue lo staging del file presente nel percorso [param file_path] nell'area "
+"di staging."
+
+msgid ""
+"Unstages the file present at [param file_path] from the staged area to the "
+"unstaged area."
+msgstr ""
+"Sposta il file presente nel percorso [param file_path] dall'area di staging "
+"all'area di non staging."
+
+msgid ""
+"Helper function to add an array of [param diff_hunks] into a [param "
+"diff_file]."
+msgstr ""
+"Funzione di supporto per aggiungere un array di [param diff_hunks] in un "
+"[param diff_file]."
+
+msgid ""
+"Helper function to add an array of [param line_diffs] into a [param "
+"diff_hunk]."
+msgstr ""
+"Funzione di supporto per aggiungere un array di [param line_diffs] in un "
+"[param diff_hunk]."
+
 msgid ""
 "Helper function to create a commit [Dictionary] item. [param msg] is the "
 "commit message of the commit. [param author] is a single human-readable "
@@ -45259,6 +56451,20 @@ msgstr ""
 "di tutti i peer connessi a intervalli regolari, tuttavia, questa funzione può "
 "essere chiamata per garantire richieste del ping più frequenti."
 
+msgid ""
+"Sets the [param ping_interval] in milliseconds at which pings will be sent to "
+"a peer. Pings are used both to monitor the liveness of the connection and "
+"also to dynamically adjust the throttle during periods of low traffic so that "
+"the throttle has reasonable responsiveness during traffic spikes. The default "
+"ping interval is [code]500[/code] milliseconds."
+msgstr ""
+"Imposta l'intervallo in millisecondi in cui i ping saranno inviati a un peer "
+"su [param ping_interval]. I ping sono usati sia per monitorare la vitalità "
+"della connessione, sia per regolare dinamicamente il throttle durante i "
+"periodi di traffico basso, in modo che il throttle abbia un tempo di risposta "
+"ragionevole durante i picchi di traffico. L'intervallo dei ping predefinito è "
+"[code]500[/code] millisecondi."
+
 msgid ""
 "Forcefully disconnects a peer. The foreign host represented by the peer is "
 "not notified of the disconnection and will timeout on its connection to the "
@@ -45275,6 +56481,72 @@ msgstr ""
 "channel]. Vedi le costanti [code]FLAG_*[/code] per i flag dei pacchetti "
 "disponibili."
 
+msgid ""
+"Sets the timeout parameters for a peer. The timeout parameters control how "
+"and when a peer will timeout from a failure to acknowledge reliable traffic. "
+"Timeout values are expressed in milliseconds.\n"
+"The [param timeout] is a factor that, multiplied by a value based on the "
+"average round trip time, will determine the timeout limit for a reliable "
+"packet. When that limit is reached, the timeout will be doubled, and the peer "
+"will be disconnected if that limit has reached [param timeout_min]. The "
+"[param timeout_max] parameter, on the other hand, defines a fixed timeout for "
+"which any packet must be acknowledged or the peer will be dropped."
+msgstr ""
+"Imposta i parametri di timeout per un peer. I parametri di timeout "
+"controllano come e quando un peer andrà in timeout a causa di un errore nel "
+"riconoscere il traffico affidabile. I valori di timeout sono espressi in "
+"millisecondi.\n"
+"Il [param timeout] è un fattore che, moltiplicato per un valore basato sul "
+"tempo medio di andata e ritorno, determinerà il limite di timeout per un "
+"pacchetto affidabile. Quando si raggiunge tale limite, il timeout sarà "
+"raddoppiato e il peer sarà disconnesso se tale limite ha raggiunto [param "
+"timeout_min]. Il parametro [param timeout_max], d'altra parte, definisce un "
+"timeout fisso per il quale qualsiasi pacchetto deve essere riconosciuto o il "
+"peer verrà eliminato."
+
+msgid ""
+"Configures throttle parameter for a peer.\n"
+"Unreliable packets are dropped by ENet in response to the varying conditions "
+"of the Internet connection to the peer. The throttle represents a probability "
+"that an unreliable packet should not be dropped and thus sent by ENet to the "
+"peer. By measuring fluctuations in round trip times of reliable packets over "
+"the specified [param interval], ENet will either increase the probability by "
+"the amount specified in the [param acceleration] parameter, or decrease it by "
+"the amount specified in the [param deceleration] parameter (both are ratios "
+"to [constant PACKET_THROTTLE_SCALE]).\n"
+"When the throttle has a value of [constant PACKET_THROTTLE_SCALE], no "
+"unreliable packets are dropped by ENet, and so 100% of all unreliable packets "
+"will be sent.\n"
+"When the throttle has a value of [code]0[/code], all unreliable packets are "
+"dropped by ENet, and so 0% of all unreliable packets will be sent.\n"
+"Intermediate values for the throttle represent intermediate probabilities "
+"between 0% and 100% of unreliable packets being sent. The bandwidth limits of "
+"the local and foreign hosts are taken into account to determine a sensible "
+"limit for the throttle probability above which it should not raise even in "
+"the best of conditions."
+msgstr ""
+"Configura il parametro throttle per un peer.\n"
+"I pacchetti inaffidabili vengono scartati da ENet in risposta alle diverse "
+"condizioni della connessione Internet al peer. Il throttle rappresenta una "
+"probabilità che un pacchetto inaffidabile non debba essere scartato e quindi "
+"inviato da ENet al peer. Misurando le fluttuazioni nei tempi di andata e "
+"ritorno dei pacchetti affidabili nell'intervallo [param interval] "
+"specificato, ENet aumenterà la probabilità della quantità specificata nel "
+"parametro [param acceleration] o la diminuirà della quantità specificata nel "
+"parametro [param deceleration] (entrambi sono rapporti a [constant "
+"PACKET_THROTTLE_SCALE]).\n"
+"Quando il throttle ha un valore di [constant PACKET_THROTTLE_SCALE], nessun "
+"pacchetto inaffidabile viene scartato da ENet e quindi verrà inviato il 100% "
+"di tutti i pacchetti inaffidabili.\n"
+"Quando il throttle ha un valore di [code]0[/code], tutti i pacchetti "
+"inaffidabili vengono scartati da ENet e quindi verrà inviato lo 0% di tutti i "
+"pacchetti inaffidabili.\n"
+"I valori intermedi per il throttle rappresentano probabilità intermedie tra "
+"lo 0% e il 100% di pacchetti inaffidabili inviati. I limiti di larghezza di "
+"banda degli host locali ed esterni vengono presi in considerazione per "
+"determinare un limite ragionevole per la probabilità di throttle, oltre la "
+"quale non dovrebbe aumentare nemmeno nelle migliori condizioni."
+
 msgid "The peer is disconnected."
 msgstr "Il peer è disconnesso."
 
@@ -45327,6 +56599,18 @@ msgstr ""
 msgid "Packet loss variance."
 msgstr "Variazione della perdita di pacchetti."
 
+msgid ""
+"The time at which packet loss statistics were last updated (in milliseconds "
+"since the connection started). The interval for packet loss statistics "
+"updates is 10 seconds, and at least one packet must have been sent since the "
+"last statistics update."
+msgstr ""
+"Il tempo in cui le statistiche sulla perdita di pacchetti sono state "
+"aggiornate l'ultima volta (in millisecondi dall'inizio della connessione). "
+"L'intervallo per gli aggiornamenti delle statistiche sulla perdita di "
+"pacchetti è di 10 secondi e almeno un pacchetto deve essere stato inviato "
+"dall'ultimo aggiornamento delle statistiche."
+
 msgid "Mean packet round trip time for reliable packets."
 msgstr "Tempo medio di andata e ritorno per i pacchetti affidabili."
 
@@ -45337,6 +56621,9 @@ msgid "Last recorded round trip time for a reliable packet."
 msgstr ""
 "Ultimo tempo di andata e ritorno registrato per un pacchetto affidabile."
 
+msgid "Variance of the last trip time recorded."
+msgstr "Varianza dell'ultimo tempo registrato di andata e ritorno."
+
 msgid "The peer's current throttle status."
 msgstr "Lo stato attuale del throttle del peer."
 
@@ -45349,6 +56636,16 @@ msgstr ""
 "scartati. Questo valore è sempre maggiore o uguale a [code]1[/code]. Il "
 "valore iniziale è uguale a [constant PACKET_THROTTLE_SCALE]."
 
+msgid ""
+"Internal value used to increment the packet throttle counter. The value is "
+"hardcoded to [code]7[/code] and cannot be changed. You probably want to look "
+"at [constant PEER_PACKET_THROTTLE_ACCELERATION] instead."
+msgstr ""
+"Valore interno utilizzato per incrementare il contatore di throttle dei "
+"pacchetti. Il valore è fissato su [code]7[/code] e non può essere modificato. "
+"Probabilmente vorrai invece dare un'occhiata a [constant "
+"PEER_PACKET_THROTTLE_ACCELERATION]."
+
 msgid ""
 "The time at which throttle statistics were last updated (in milliseconds "
 "since the connection started). The interval for throttle statistics updates "
@@ -45428,6 +56725,39 @@ msgstr ""
 "Memorizza anche informazioni sulla build attuale di Godot, come la versione "
 "attuale."
 
+msgid ""
+"Returns the name of the CPU architecture the Godot binary was built for. "
+"Possible return values include [code]\"x86_64\"[/code], [code]\"x86_32\"[/"
+"code], [code]\"arm64\"[/code], [code]\"arm32\"[/code], [code]\"rv64\"[/code], "
+"[code]\"riscv\"[/code], [code]\"ppc64\"[/code], [code]\"ppc\"[/code], "
+"[code]\"wasm64\"[/code], and [code]\"wasm32\"[/code].\n"
+"To detect whether the current build is 64-bit, or the type of architecture, "
+"don't use the architecture name. Instead, use [method OS.has_feature] to "
+"check for the [code]\"64\"[/code] feature tag, or tags such as [code]\"x86\"[/"
+"code] or [code]\"arm\"[/code]. See the [url=$DOCS_URL/tutorials/export/"
+"feature_tags.html]Feature Tags[/url] documentation for more details.\n"
+"[b]Note:[/b] This method does [i]not[/i] return the name of the system's CPU "
+"architecture (like [method OS.get_processor_name]). For example, when running "
+"an [code]x86_32[/code] Godot binary on an [code]x86_64[/code] system, the "
+"returned value will still be [code]\"x86_32\"[/code]."
+msgstr ""
+"Restituisce il nome dell'architettura della CPU per il quale è stato creato "
+"l'eseguibile di Godot. I possibili valori restituiti includono "
+"[code]\"x86_64\"[/code], [code]\"x86_32\"[/code], [code]\"arm64\"[/code], "
+"[code]\"arm32\"[/code], [code]\"rv64\"[/code], [code]\"riscv\"[/code], "
+"[code]\"ppc64\"[/code], [code]\"ppc\"[/code], [code]\"wasm64\"[/code] e "
+"[code]\"wasm32\"[/code].\n"
+"Per individuare se la build corrente è a 64 bit, o il tipo di architettura, "
+"non usare il nome dell'architettura. Invece, usa [method OS.has_feature] per "
+"controllare il tag di funzionalità [code]\"64\"[/code], oppure tag come "
+"[code]\"x86\"[/code] o [code]\"arm\"[/code]. Consulta la documentazione dei "
+"[url=$DOCS_URL/tutorials/export/feature_tags.html]tag di funzionalità[/url] "
+"per ulteriori dettagli.\n"
+"[b]Nota:[/b] Questo metodo [i]non[/i] restituisce il nome dell'architettura "
+"CPU del sistema (come [method OS.get_processor_name]). Ad esempio, quando si "
+"esegue un binario Godot [code]x86_32[/code] su un sistema [code]x86_64[/"
+"code], il valore restituito sarà comunque [code]\"x86_32\"[/code]."
+
 msgid ""
 "Returns the engine author information as a [Dictionary], where each entry is "
 "an [Array] of strings with the names of notable contributors to the Godot "
@@ -45763,6 +57093,45 @@ msgstr ""
 "percorso predefinito può essere modificato in [member ProjectSettings.editor/"
 "movie_writer/movie_file]."
 
+msgid ""
+"Returns [code]true[/code] if a singleton with the given [param name] exists "
+"in the global scope. See also [method get_singleton].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(Engine.has_singleton(\"OS\"))          # Prints true\n"
+"print(Engine.has_singleton(\"Engine\"))      # Prints true\n"
+"print(Engine.has_singleton(\"AudioServer\")) # Prints true\n"
+"print(Engine.has_singleton(\"Unknown\"))     # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(Engine.HasSingleton(\"OS\"));          // Prints True\n"
+"GD.Print(Engine.HasSingleton(\"Engine\"));      // Prints True\n"
+"GD.Print(Engine.HasSingleton(\"AudioServer\")); // Prints True\n"
+"GD.Print(Engine.HasSingleton(\"Unknown\"));     // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Global singletons are not the same as autoloaded nodes, which "
+"are configurable in the project settings."
+msgstr ""
+"Restituisce [code]true[/code] se un singleton con il nome [param name] esiste "
+"nell'ambito globale. Vedi anche [method get_singleton].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(Engine.has_singleton(\"OS\"))          # Stampa true\n"
+"print(Engine.has_singleton(\"Engine\"))      # Stampa true\n"
+"print(Engine.has_singleton(\"AudioServer\")) # Stampa true\n"
+"print(Engine.has_singleton(\"Unknown\"))     # Stampa false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(Engine.HasSingleton(\"OS\"));          // Stampa True\n"
+"GD.Print(Engine.HasSingleton(\"Engine\"));      // Stampa True\n"
+"GD.Print(Engine.HasSingleton(\"AudioServer\")); // Stampa True\n"
+"GD.Print(Engine.HasSingleton(\"Unknown\"));     // Stampa False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] I singleton globali non sono la stessa cosa dei nodi autoload, "
+"che sono configurabili nelle impostazioni del progetto."
+
 msgid ""
 "Returns [code]true[/code] if the script is currently running inside the "
 "editor, otherwise returns [code]false[/code]. This is useful for [code]@tool[/"
@@ -46180,6 +57549,16 @@ msgstr ""
 "Restituisce [code]true[/code] se il debugger sta saltando i punti "
 "d'interruzione altrimenti [code]false[/code]."
 
+msgid ""
+"Forces a processing loop of debugger events. The purpose of this method is "
+"just processing events every now and then when the script might get too busy, "
+"so that bugs like infinite loops can be caught."
+msgstr ""
+"Forza un ciclo di elaborazione degli eventi del debugger. Lo scopo di questo "
+"metodo è di elaborare gli eventi ogni tanto quando lo script potrebbe essere "
+"troppo occupato, in modo che bug come i cicli infiniti possano essere "
+"individuati"
+
 msgid ""
 "Calls the [code]add[/code] callable of the profiler with given [param name] "
 "and [param data]."
@@ -46196,6 +57575,26 @@ msgstr ""
 "name] e [param arguments] specificati. Abilita/disabilita lo stesso profiler "
 "in base all'argomento [param enable]."
 
+msgid ""
+"Registers a message capture with given [param name]. If [param name] is "
+"\"my_message\" then messages starting with \"my_message:\" will be called "
+"with the given callable.\n"
+"The callable must accept a message string and a data array as argument. The "
+"callable should return [code]true[/code] if the message is recognized.\n"
+"[b]Note:[/b] The callable will receive the message with the prefix stripped, "
+"unlike [method EditorDebuggerPlugin._capture]. See the [EditorDebuggerPlugin] "
+"description for an example."
+msgstr ""
+"Registra una cattura di messaggio con il nome [param name]. Se [param name] è "
+"\"my_message\", i messaggi che iniziano con \"my_message:\" saranno chiamati "
+"con il chiamabile fornito.\n"
+"Il chiamabile deve accettare una stringa di messaggio e un array di dati come "
+"argomenti. Se il messaggio e i dati sono validi, il chiamabile deve "
+"restituire [code]true[/code] altrimenti [code]false[/code].\n"
+"[b]Nota:[/b] Il chiamabile riceverà il messaggio con il prefisso rimosso, a "
+"differenza di [method EditorDebuggerPlugin._capture]. Consulta la descrizione "
+"di [EditorDebuggerPlugin] per un esempio."
+
 msgid ""
 "Registers a profiler with the given [param name]. See [EngineProfiler] for "
 "more information."
@@ -48248,6 +59647,13 @@ msgstr ""
 "Restituisce i 32 bit successivi del file interpretandoli come numero in "
 "virgola mobile."
 
+msgid ""
+"Returns the next 16 bits from the file as a half-precision floating-point "
+"number."
+msgstr ""
+"Restituisce i 16 bit successivi del file interpretandoli come numero in "
+"virgola mobile mezza precisione."
+
 msgid ""
 "Returns [code]true[/code], if file [code]hidden[/code] attribute is set.\n"
 "[b]Note:[/b] This method is implemented on iOS, BSD, macOS, and Windows."
@@ -48459,6 +59865,243 @@ msgstr ""
 "Imposta i permessi UNIX del file.\n"
 "[b]Nota:[/b] Questo metodo è implementato su iOS, BSD, macOS, e Windows."
 
+msgid ""
+"Stores an integer as 8 bits in the file.\n"
+"[b]Note:[/b] The [param value] should lie in the interval [code][0, 255][/"
+"code]. Any other value will overflow and wrap around.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate.\n"
+"To store a signed integer, use [method store_64], or convert it manually (see "
+"[method store_16] for an example)."
+msgstr ""
+"Memorizza un intero come 8 bit nel file.\n"
+"[b]Nota:[/b] [param value] dovrebbe essere compreso nell'intervallo [code][0, "
+"255][/code]. Qualsiasi altro valore andrà in overflow e verrà avvolto.\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato.\n"
+"Per memorizzare un intero con segno, usa [method store_64] o convertirlo "
+"manualmente (vedi [method store_16] per un esempio)."
+
+msgid ""
+"Stores an integer as 16 bits in the file.\n"
+"[b]Note:[/b] The [param value] should lie in the interval [code][0, 2^16 - 1]"
+"[/code]. Any other value will overflow and wrap around.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate.\n"
+"To store a signed integer, use [method store_64] or store a signed integer "
+"from the interval [code][-2^15, 2^15 - 1][/code] (i.e. keeping one bit for "
+"the signedness) and compute its sign manually when reading. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"const MAX_15B = 1 << 15\n"
+"const MAX_16B = 1 << 16\n"
+"\n"
+"func unsigned16_to_signed(unsigned):\n"
+"    return (unsigned + MAX_15B) % MAX_16B - MAX_15B\n"
+"\n"
+"func _ready():\n"
+"    var f = FileAccess.open(\"user://file.dat\", FileAccess.WRITE_READ)\n"
+"    f.store_16(-42) # This wraps around and stores 65494 (2^16 - 42).\n"
+"    f.store_16(121) # In bounds, will store 121.\n"
+"    f.seek(0) # Go back to start to read the stored value.\n"
+"    var read1 = f.get_16() # 65494\n"
+"    var read2 = f.get_16() # 121\n"
+"    var converted1 = unsigned16_to_signed(read1) # -42\n"
+"    var converted2 = unsigned16_to_signed(read2) # 121\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    using var f = FileAccess.Open(\"user://file.dat\", FileAccess.ModeFlags."
+"WriteRead);\n"
+"    f.Store16(unchecked((ushort)-42)); // This wraps around and stores 65494 "
+"(2^16 - 42).\n"
+"    f.Store16(121); // In bounds, will store 121.\n"
+"    f.Seek(0); // Go back to start to read the stored value.\n"
+"    ushort read1 = f.Get16(); // 65494\n"
+"    ushort read2 = f.Get16(); // 121\n"
+"    short converted1 = (short)read1; // -42\n"
+"    short converted2 = (short)read2; // 121\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Memorizza un intero come 16 bit nel file.\n"
+"[b]Nota:[/b] [param value] dovrebbe essere compreso nell'intervallo [code][0, "
+"2^16 - 1][/code]. Qualsiasi altro valore andrà in overflow e si avvolgerà.\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato.\n"
+"Per memorizzare un intero con segno, usa [method store_64] o memorizza un "
+"intero con segno nell'intervallo [code][-2^15, 2^15 - 1][/code] (ovvero "
+"mantenendo un bit per il segno) e calcolarne manualmente il segno durante la "
+"lettura. Ad esempio:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"const MAX_15B = 1 << 15\n"
+"const MAX_16B = 1 << 16\n"
+"\n"
+"func unsigned16_to_signed(unsigned):\n"
+"    return (unsigned + MAX_15B) % MAX_16B - MAX_15B\n"
+"\n"
+"func _ready():\n"
+"    var f = FileAccess.open(\"user://file.dat\", FileAccess.WRITE_READ)\n"
+"    f.store_16(-42) # Questo si avvolge e memorizza 65494 (2^16 - 42).\n"
+"    f.store_16(121) # Nei limiti, memorizzerà 121.\n"
+"    f.seek(0) # Torna indietro per iniziare a leggere il valore memorizzato.\n"
+"    var read1 = f.get_16() # 65494\n"
+"    var read2 = f.get_16() # 121\n"
+"    var converted1 = unsigned16_to_signed(read1) # -42\n"
+"    var converted2 = unsigned16_to_signed(read2) # 121\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    using var f = FileAccess.Open(\"user://file.dat\", FileAccess.ModeFlags."
+"WriteRead);\n"
+"    f.Store16(unchecked((ushort)-42)); // Questo si avvolge e memorizza 65494 "
+"(2^16 - 42).\n"
+"    f.Store16(121); // Nei limiti, memorizzerà 121.\n"
+"    f.Seek(0); // Torna indietro per iniziare a leggere il valore "
+"memorizzato.\n"
+"    ushort read1 = f.Get16(); // 65494\n"
+"    ushort read2 = f.Get16(); // 121\n"
+"    short converted1 = (short)read1; // -42\n"
+"    short converted2 = (short)read2; // 121\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Stores an integer as 32 bits in the file.\n"
+"[b]Note:[/b] The [param value] should lie in the interval [code][0, 2^32 - 1]"
+"[/code]. Any other value will overflow and wrap around.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate.\n"
+"To store a signed integer, use [method store_64], or convert it manually (see "
+"[method store_16] for an example)."
+msgstr ""
+"Memorizza un intero come 32 bit nel file.\n"
+"[b]Nota:[/b] [param value] dovrebbe essere compreso nell'intervallo [code][0, "
+"2^32 - 1][/code]. Qualsiasi altro valore andrà in overflow e si avvolgerà.\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato.\n"
+"Per memorizzare un intero con segno, usa [method store_64] o convertirlo "
+"manualmente (vedi [method store_16] per un esempio)."
+
+msgid ""
+"Stores an integer as 64 bits in the file.\n"
+"[b]Note:[/b] The [param value] must lie in the interval [code][-2^63, 2^63 - "
+"1][/code] (i.e. be a valid [int] value).\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate."
+msgstr ""
+"Memorizza un intero come 64 bit nel file.\n"
+"[b]Nota:[/b] [param value] deve essere compreso nell'intervallo [code][-2^63, "
+"2^63 - 1][/code] (ovvero deve essere un valore [int] valido).\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato."
+
+msgid ""
+"Store the given [PackedStringArray] in the file as a line formatted in the "
+"CSV (Comma-Separated Values) format. You can pass a different delimiter "
+"[param delim] to use other than the default [code]\",\"[/code] (comma). This "
+"delimiter must be one-character long.\n"
+"Text will be encoded as UTF-8.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate."
+msgstr ""
+"Memorizza il [PackedStringArray] fornito nel file come singola riga nel "
+"formato CSV (Comma-Separated Values). È possibile passare un delimitatore "
+"([param delim]) da usare diverso da quello predefinito [code]\",\"[/code] (la "
+"virgola). Questo delimitatore deve essere un solo carattere.\n"
+"Il testo sarà codificato come UTF-8.\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato."
+
+msgid "Stores a half-precision floating-point number as 16 bits in the file."
+msgstr ""
+"Memorizza un numero in virgola mobile a mezza precisione come 16 bit nel file."
+
+msgid ""
+"Stores [param line] in the file followed by a newline character ([code]\\n[/"
+"code]), encoding the text as UTF-8.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate."
+msgstr ""
+"Aggiunge la riga [param line] al file, seguita da un carattere di ritorno a "
+"capo ([code]\\n[/code]), codificando il testo come UTF-8. Se si verifica un "
+"errore, il valore risultante dell'indicatore di posizione nel file non può "
+"essere determinato."
+
+msgid ""
+"Stores the given [String] as a line in the file in Pascal format (i.e. also "
+"store the length of the string).\n"
+"Text will be encoded as UTF-8.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate."
+msgstr ""
+"Memorizza la [String] specificata come una riga nel file in formato Pascal "
+"(ovvero memorizza anche la lunghezza della stringa).\n"
+"Il testo sarà codificato come UTF-8.\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato."
+
+msgid ""
+"Stores [param string] in the file without a newline character ([code]\\n[/"
+"code]), encoding the text as UTF-8.\n"
+"[b]Note:[/b] This method is intended to be used to write text files. The "
+"string is stored as a UTF-8 encoded buffer without string length or "
+"terminating zero, which means that it can't be loaded back easily. If you "
+"want to store a retrievable string in a binary file, consider using [method "
+"store_pascal_string] instead. For retrieving strings from a text file, you "
+"can use [code]get_buffer(length).get_string_from_utf8()[/code] (if you know "
+"the length) or [method get_as_text].\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate."
+msgstr ""
+"Accoda la stringa [param string] al file senza ritorno a capo, codificando il "
+"testo come UTF-8.\n"
+"[b]Nota:[/b] Questo metodo è progettato per scrivere file di testo. La "
+"stringa è memorizzata come buffer codificato in UTF-8, senza la lunghezza "
+"della stringa o lo zero di terminazione. Ciò significa che non può essere "
+"recuperata facilmente. Se si desidera memorizzare una stringa recuperabile in "
+"un file binario, considera di usare [method store_pascal_string]. Per "
+"recuperare stringhe da un file di testo, è possibile usare "
+"[code]get_buffer(length).get_string_from_utf8()[/code] (se si conosce la "
+"lunghezza) o [method get_as_text].\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato."
+
+msgid ""
+"Stores any Variant value in the file. If [param full_objects] is [code]true[/"
+"code], encoding objects is allowed (and can potentially include code).\n"
+"Internally, this uses the same encoding mechanism as the [method @GlobalScope."
+"var_to_bytes] method.\n"
+"[b]Note:[/b] Not all properties are included. Only properties that are "
+"configured with the [constant PROPERTY_USAGE_STORAGE] flag set will be "
+"serialized. You can add a new usage flag to a property by overriding the "
+"[method Object._get_property_list] method in your class. You can also check "
+"how property usage is configured by calling [method Object."
+"_get_property_list]. See [enum PropertyUsageFlags] for the possible usage "
+"flags.\n"
+"[b]Note:[/b] If an error occurs, the resulting value of the file position "
+"indicator is indeterminate."
+msgstr ""
+"Inserisce un qualunque Variant nel file. Se [param full_objects] è "
+"[code]true[/code], è consentito codificare le istanze di oggetti (e può "
+"potenzialmente includere codice).\n"
+"Internamente, questo metodo utilizza lo stesso meccanismo di codifica del "
+"metodo [method @GlobalScope.var_to_bytes].\n"
+"[b]Nota:[/b] Non tutte le proprietà sono incluse. Saranno serializzate solo "
+"le proprietà configurate con il flag [constant PROPERTY_USAGE_STORAGE]. Puoi "
+"aggiungere un nuovo flag di utilizzo a una proprietà sovrascrivendo il metodo "
+"[method Object._get_property_list] nella tua classe. Puoi anche controllare "
+"come è configurato l'utilizzo della proprietà chiamando [method Object."
+"_get_property_list]. Consulta [enum PropertyUsageFlags] per i possibili flag "
+"di utilizzo.\n"
+"[b]Nota:[/b] Se si verifica un errore, il valore risultante dell'indicatore "
+"di posizione nel file non può essere determinato."
+
 msgid ""
 "If [code]true[/code], the file is read with big-endian [url=https://en."
 "wikipedia.org/wiki/Endianness]endianness[/url]. If [code]false[/code], the "
@@ -48712,6 +60355,45 @@ msgstr ""
 "[b]Nota:[/b] Questa proprietà è ignorata dalle finestre di dialogo native dei "
 "file."
 
+msgid ""
+"If [code]true[/code], the dialog will show hidden files.\n"
+"[b]Note:[/b] This property is ignored by native file dialogs on Android and "
+"Linux."
+msgstr ""
+"Se [code]true[/code], la finestra di dialogo mostrerà i file nascosti.\n"
+"[b]Nota:[/b] Questa proprietà è ignorata dalle finestre di dialogo native dei "
+"file su Android e Linux."
+
+msgid ""
+"If [code]true[/code], and if supported by the current [DisplayServer], OS "
+"native dialog will be used instead of custom one.\n"
+"[b]Note:[/b] On Android, it is only supported when using [constant "
+"ACCESS_FILESYSTEM]. For access mode [constant ACCESS_RESOURCES] and [constant "
+"ACCESS_USERDATA], the system will fall back to custom FileDialog.\n"
+"[b]Note:[/b] On Linux and macOS, sandboxed apps always use native dialogs to "
+"access the host file system.\n"
+"[b]Note:[/b] On macOS, sandboxed apps will save security-scoped bookmarks to "
+"retain access to the opened folders across multiple sessions. Use [method OS."
+"get_granted_permissions] to get a list of saved bookmarks.\n"
+"[b]Note:[/b] Native dialogs are isolated from the base process, file dialog "
+"properties can't be modified once the dialog is shown."
+msgstr ""
+"Se [code]true[/code] e se supportato dal [DisplayServer] attuale, sarà "
+"utilizzata la finestra di dialogo nativa del sistema operativo anziché quella "
+"personalizzata.\n"
+"[b]Nota:[/b] Su Android, è supportato solo se si utilizza [constant "
+"ACCESS_FILESYSTEM]. Per le modalità di accesso [constant ACCESS_RESOURCES] e "
+"[constant ACCESS_USERDATA], il sistema tornerà al FileDialog personalizzato.\n"
+"[b]Nota:[/b] Su Linux e macOS, le app in sandbox utilizzano sempre le "
+"finestre di dialogo native per accedere al file system dell'host.\n"
+"[b]Nota:[/b] Su macOS, le app in sandbox salveranno i segnalibri con ambito "
+"di sicurezza per mantenere l'accesso alle cartelle aperte in più sessioni. "
+"Usa [method OS.get_granted_permissions] per ottenere una lista dei segnalibri "
+"salvati.\n"
+"[b]Nota:[/b] Le finestre di dialogo native sono isolate dal processo di base, "
+"le proprietà della finestra di dialogo del file non possono essere modificate "
+"una volta che la finestra di dialogo è visualizzata."
+
 msgid "Emitted when the user selects a directory."
 msgstr "Emesso quando l'utente seleziona una cartella."
 
@@ -48798,6 +60480,9 @@ msgstr "Icona personalizzata per la freccia della cartella padre."
 msgid "Custom icon for the reload button."
 msgstr "Icona personalizzata per il pulsante di ricarica."
 
+msgid "Custom icon for the toggle button for the filter for file names."
+msgstr "Icona personalizzata per l'Interruttore del filtro per i nomi di file."
+
 msgid "Custom icon for the toggle hidden button."
 msgstr "Icona personalizzata per l'Interruttore dei file nascosti."
 
@@ -48960,6 +60645,19 @@ msgid ""
 msgstr ""
 "Restituisce [code]true[/code] se l'intero ha un valore diverso dal [float]."
 
+msgid ""
+"Multiplies each component of the [Color], including the alpha, by the given "
+"[float].\n"
+"[codeblock]\n"
+"print(1.5 * Color(0.5, 0.5, 0.5)) # Prints (0.75, 0.75, 0.75, 1.5)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Color], compreso l'alfa, per il [float] "
+"fornito.\n"
+"[codeblock]\n"
+"print(1.5 * Color(0.5, 0.5, 0.5)) # Stampa (0.75, 0.75, 0.75, 1.5)\n"
+"[/codeblock]"
+
 msgid ""
 "Multiplies each component of the [Quaternion] by the given [float]. This "
 "operation is not meaningful on its own, but it can be used as a part of a "
@@ -48969,12 +60667,62 @@ msgstr ""
 "operazione non ha senso di per sé, ma può essere utilizzata come parte di "
 "un'espressione più ampia."
 
+msgid ""
+"Multiplies each component of the [Vector2] by the given [float].\n"
+"[codeblock]\n"
+"print(2.5 * Vector2(1, 3)) # Prints (2.5, 7.5)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector2] per il [float] fornito.\n"
+"[codeblock]\n"
+"print(2.5 * Vector2(1, 3)) # Stampa (2.5, 7.5)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector2i] by the given [float]. Returns a "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(0.9 * Vector2i(10, 15)) # Prints (9.0, 13.5)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector2i] per il [float] fornito. Restituisce "
+"un [Vector2].\n"
+"[codeblock]\n"
+"print(0.9 * Vector2i(10, 15)) # Stampa (9.0, 13.5)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector3] by the given [float]."
 msgstr "Moltiplica ogni componente del [Vector3] per il [float] fornito."
 
+msgid ""
+"Multiplies each component of the [Vector3i] by the given [float]. Returns a "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(0.9 * Vector3i(10, 15, 20)) # Prints (9.0, 13.5, 18.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector3i] per il [float] fornito. Restituisce "
+"un [Vector3].\n"
+"[codeblock]\n"
+"print(0.9 * Vector3i(10, 15, 20)) # Stampa (9.0, 13.5, 18.0)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector4] by the given [float]."
 msgstr "Moltiplica ogni componente del [Vector4] per il [float] fornito."
 
+msgid ""
+"Multiplies each component of the [Vector4i] by the given [float]. Returns a "
+"[Vector4].\n"
+"[codeblock]\n"
+"print(0.9 * Vector4i(10, 15, 20, -10)) # Prints (9.0, 13.5, 18.0, -9.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector4i] per il [float] fornito. Restituisce "
+"un [Vector4].\n"
+"[codeblock]\n"
+"print(0.9 * Vector4i(10, 15, 20, -10)) # Stampa (9.0, 13.5, 18.0, -9.0)\n"
+"[/codeblock]"
+
 msgid "Multiplies two [float]s."
 msgstr "Moltiplica due [float]."
 
@@ -49931,7 +61679,7 @@ msgstr ""
 msgid "Returns extra baseline offset (as a fraction of font height)."
 msgstr ""
 "Restituisce lo scostamento aggiuntivo dalla linea di base (come frazione "
-"dell'altezza del carattere)."
+"dell'altezza del font)."
 
 msgid ""
 "Returns spacing for [param spacing] (see [enum TextServer.SpacingType]) in "
@@ -49960,6 +61708,9 @@ msgstr ""
 "Restituisce l'indice del glifo del carattere [param char], facoltativamente "
 "modificato da [param variation_selector]."
 
+msgid "Returns list of rendered glyphs in the cache entry."
+msgstr "Restituisce la lista dei glifi renderizzati nella voce nella cache."
+
 msgid "Returns glyph offset from the baseline."
 msgstr "Restituisce l'offset del glifo dalla linea di base."
 
@@ -50266,6 +62017,16 @@ msgstr ""
 "[member msdf_pixel_range] di [code]16[/code] consente dimensioni per il "
 "contorno fino a [code]8[/code] per apparire corrette."
 
+msgid ""
+"Source font size used to generate MSDF textures. Higher values allow for more "
+"precision, but are slower to render and require more memory. Only increase "
+"this value if you notice a visible lack of precision in glyph rendering."
+msgstr ""
+"Dimensione del font sorgente utilizzata per generare le texture MSDF. Valori "
+"più alti consentono una maggiore precisione, ma sono più lenti da "
+"renderizzare e richiedono più memoria. Aumenta questo valore solo se noti una "
+"notevole mancanza di precisione nel rendering dei glifi."
+
 msgid ""
 "If set to [code]true[/code], glyphs of all sizes are rendered using single "
 "multichannel signed distance field (MSDF) generated from the dynamic font "
@@ -50639,6 +62400,13 @@ msgstr ""
 "un [GDExtension] già caricato, altrimenti questo metodo restituisce [constant "
 "LOAD_STATUS_NOT_LOADED]."
 
+msgid ""
+"Emitted after the editor has finished loading a new extension.\n"
+"[b]Note:[/b] This signal is only emitted in editor builds."
+msgstr ""
+"Emesso dopo che l'editor ha finito di caricare una nuova estensione.\n"
+"[b]Nota:[/b] Questo segnale viene emesso solo nelle build dell'editor."
+
 msgid "Emitted after the editor has finished reloading one or more extensions."
 msgstr "Emesso dopo che l'editor ha finito di ricaricare una o più estensioni."
 
@@ -50686,6 +62454,21 @@ msgstr ""
 msgid "GDScript documentation index"
 msgstr "Indice di documentazione su GDScript"
 
+msgid ""
+"Returns a new instance of the script.\n"
+"[codeblock]\n"
+"var MyClass = load(\"myclass.gd\")\n"
+"var instance = MyClass.new()\n"
+"print(instance.get_script() == MyClass) # Prints true\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce una nuova istanza dello script.\n"
+"[codeblock]\n"
+"var MyClass = load(\"myclass.gd\")\n"
+"var instance = MyClass.new()\n"
+"print(instance.get_script() == MyClass) # Prints true\n"
+"[/codeblock]"
+
 msgid ""
 "A physics joint that allows for complex movement and rotation between two 3D "
 "physics bodies."
@@ -51300,6 +63083,73 @@ msgstr ""
 "poligoni interni (buchi) che si possono distinguere chiamando [method "
 "is_polygon_clockwise]."
 
+msgid ""
+"Inflates or deflates [param polygon] by [param delta] units (pixels). If "
+"[param delta] is positive, makes the polygon grow outward. If [param delta] "
+"is negative, shrinks the polygon inward. Returns an array of polygons because "
+"inflating/deflating may result in multiple discrete polygons. Returns an "
+"empty array if [param delta] is negative and the absolute value of it "
+"approximately exceeds the minimum bounding rectangle dimensions of the "
+"polygon.\n"
+"Each polygon's vertices will be rounded as determined by [param join_type], "
+"see [enum PolyJoinType].\n"
+"The operation may result in an outer polygon (boundary) and inner polygon "
+"(hole) produced which could be distinguished by calling [method "
+"is_polygon_clockwise].\n"
+"[b]Note:[/b] To translate the polygon's vertices specifically, multiply them "
+"to a [Transform2D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var polygon = PackedVector2Array([Vector2(0, 0), Vector2(100, 0), "
+"Vector2(100, 100), Vector2(0, 100)])\n"
+"var offset = Vector2(50, 50)\n"
+"polygon = Transform2D(0, offset) * polygon\n"
+"print(polygon) # Prints [(50.0, 50.0), (150.0, 50.0), (150.0, 150.0), (50.0, "
+"150.0)]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Vector2[] polygon = [new Vector2(0, 0), new Vector2(100, 0), new Vector2(100, "
+"100), new Vector2(0, 100)];\n"
+"var offset = new Vector2(50, 50);\n"
+"polygon = new Transform2D(0, offset) * polygon;\n"
+"GD.Print((Variant)polygon); // Prints [(50, 50), (150, 50), (150, 150), (50, "
+"150)]\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Gonfia o sgonfia il poligono [param polygon] di [param delta] unità (pixel). "
+"Se [param delta] è positivo, fa crescere il poligono verso l'esterno. Se "
+"[param delta] è negativo, rimpicciolisce il poligono verso l'interno. "
+"Restituisce un array di poligoni perché il gonfiaggio/sgonfiaggio potrebbe "
+"produrre più poligoni discreti. Restituisce un array vuoto se [param delta] è "
+"negativo e il suo valore assoluto supera approssimativamente le dimensioni "
+"minime del rettangolo di delimitazione del poligono.\n"
+"I vertici di ogni poligono saranno arrotondati come determinato da [param "
+"join_type], vedi [enum PolyJoinType].\n"
+"L'operazione potrebbe produrre un poligono esterno (confine) e un poligono "
+"interno (buco) che si possono distinguere chiamando [method "
+"is_polygon_clockwise].\n"
+"[b]Nota:[/b] Per traslare in modo specifico i vertici del poligono, "
+"moltiplicali per un [Transform2D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var polygon = PackedVector2Array([Vector2(0, 0), Vector2(100, 0), "
+"Vector2(100, 100), Vector2(0, 100)])\n"
+"var offset = Vector2(50, 50)\n"
+"polygon = Transform2D(0, offset) * polygon\n"
+"print(polygon) # Stampa [(50.0, 50.0), (150.0, 50.0), (150.0, 150.0), (50.0, "
+"150.0)]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var polygon = new Vector2[] { new Vector2(0, 0), new Vector2(100, 0), new "
+"Vector2(100, 100), new Vector2(0, 100) };\n"
+"var offset = new Vector2(50, 50);\n"
+"polygon = new Transform2D(0, offset) * polygon;\n"
+"GD.Print((Variant)polygon); // Stampa [(50, 50), (150, 50), (150, 150), (50, "
+"150)]\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Inflates or deflates [param polyline] by [param delta] units (pixels), "
 "producing polygons. If [param delta] is positive, makes the polyline grow "
@@ -51653,6 +63503,34 @@ msgstr ""
 msgid "Visibility ranges (HLOD)"
 msgstr "Campi di visibilità (HLOD)"
 
+msgid ""
+"Set the value of a shader uniform for this instance only ([url=$DOCS_URL/"
+"tutorials/shaders/shader_reference/shading_language.html#per-instance-"
+"uniforms]per-instance uniform[/url]). See also [method ShaderMaterial."
+"set_shader_parameter] to assign a uniform on all instances using the same "
+"[ShaderMaterial].\n"
+"[b]Note:[/b] For a shader uniform to be assignable on a per-instance basis, "
+"it [i]must[/i] be defined with [code]instance uniform ...[/code] rather than "
+"[code]uniform ...[/code] in the shader code.\n"
+"[b]Note:[/b] [param name] is case-sensitive and must match the name of the "
+"uniform in the code exactly (not the capitalized name in the inspector).\n"
+"[b]Note:[/b] Per-instance shader uniforms are only available in Spatial and "
+"CanvasItem shaders, but not for Fog, Sky, or Particles shaders."
+msgstr ""
+"Imposta il valore di un'uniforme di shader solo per questa istanza "
+"([url=$DOCS_URL/tutorials/shaders/shader_reference/shading_language.html#per-"
+"instance-uniforms]uniforme per istanza[/url]). Consulta anche [method "
+"ShaderMaterial.set_shader_parameter] per assegnare un'uniforme a tutte le "
+"istanze che utilizzano lo stesso [ShaderMaterial].\n"
+"[b]Nota:[/b] Affinché un'uniforme di shader possa essere assegnabile per "
+"istanza, [i]deve[/i] essere definita con [code]instance uniform ...[/code] "
+"anziché [code]uniform ...[/code] nel codice dello shader.\n"
+"[b]Nota:[/b] [param name] è sensibile alle maiuscole e alle minuscole e deve "
+"corrispondere esattamente al nome dell'uniforme in codice (non al nome "
+"formattato nell'ispettore).\n"
+"b]Nota:[/b] Le uniformi di shader per istanza sono disponibili solo nei "
+"shader Spatial e CanvasItem, ma non per gli shader Fog, Sky, o Particles."
+
 msgid ""
 "The selected shadow casting flag. See [enum ShadowCastingSetting] for "
 "possible values."
@@ -51691,6 +63569,37 @@ msgstr ""
 "La distanza ulteriormente aggiunta al bounding box ([AABB]) di "
 "GeometryInstance3D per aumentare il suo cull box."
 
+msgid "Use [member gi_lightmap_texel_scale] instead."
+msgstr "Utilizza [member gi_lightmap_texel_scale] invece."
+
+msgid "The texel density to use for lightmapping in [LightmapGI]."
+msgstr "La densità dei texel da user per il lightmapping in [LightmapGI]."
+
+msgid ""
+"The texel density to use for lightmapping in [LightmapGI]. Greater scale "
+"values provide higher resolution in the lightmap, which can result in sharper "
+"shadows for lights that have both direct and indirect light baked. However, "
+"greater scale values will also increase the space taken by the mesh in the "
+"lightmap texture, which increases the memory, storage, and bake time "
+"requirements. When using a single mesh at different scales, consider "
+"adjusting this value to keep the lightmap texel density consistent across "
+"meshes.\n"
+"For example, doubling [member gi_lightmap_texel_scale] doubles the lightmap "
+"texture resolution for this object [i]on each axis[/i], so it will "
+"[i]quadruple[/i] the texel count."
+msgstr ""
+"La densità dei texel da usare per il lightmapping in [LightmapGI]. Valori di "
+"scala maggiori forniscono una risoluzione più alta nella lightmap, il che può "
+"risultare in ombre più nitide per le luci che hanno precalcolato sia la luce "
+"diretta sia quella indiretta. Tuttavia, valori di scala maggiori aumenteranno "
+"anche lo spazio occupato dalla mesh nella texture lightmap, il che aumenta i "
+"requisiti di memoria, archiviazione e tempo di precalcolo. Quando si usa una "
+"singola mesh a scale diverse, si consiglia di regolare questo valore per "
+"mantenere la densità dei texel nella lightmap coerente tra le mesh.\n"
+"Ad esempio, raddoppiando [member gi_lightmap_texel_scale] si raddoppia la "
+"risoluzione della texture lightmap per questo oggetto [i]su ciascun asse[/i], "
+"quindi [i]quadruplicherà[/i] il numero dei texel."
+
 msgid ""
 "The global illumination mode to use for the whole geometry. To avoid "
 "inconsistent results, use a mode that matches the purpose of the mesh during "
@@ -52018,9 +63927,38 @@ msgstr ""
 "questa modalità si comporta come [constant VISIBILITY_RANGE_FADE_DISABLED] ma "
 "con isteresi disabilitata."
 
+msgid "Represents a glTF accessor."
+msgstr "Rappresenta un accessor glTF."
+
+msgid ""
+"GLTFAccessor is a data structure representing a glTF [code]accessor[/code] "
+"that would be found in the [code]\"accessors\"[/code] array. A buffer is a "
+"blob of binary data. A buffer view is a slice of a buffer. An accessor is a "
+"typed interpretation of the data in a buffer view.\n"
+"Most custom data stored in glTF does not need accessors, only buffer views "
+"(see [GLTFBufferView]). Accessors are for more advanced use cases such as "
+"interleaved mesh data encoded for the GPU."
+msgstr ""
+"GLTFAccessor è una struttura dati che rappresenta un [code]accessor[/code] "
+"glTF che si troverebbe nell'array [code]\"accessors\"[/code]. Un buffer è un "
+"blob di dati binari. Una buffer view è una sezione di un buffer. Un accessor "
+"è un'interpretazione tipizzata dei dati in una buffer view.\n"
+"La maggior parte dei dati personalizzati archiviati in glTF non necessita di "
+"accessor, solo di buffer view (vedi [GLTFBufferView]). Gli accessor sono per "
+"casi d'uso più avanzati come dati mesh interlacciati codificati per la GPU."
+
 msgid "Buffers, BufferViews, and Accessors in Khronos glTF specification"
 msgstr "Buffer, BufferView e Accessor nella specificazione glTF di Khronos"
 
+msgid ""
+"The glTF accessor type as an enum. Possible values are 0 for \"SCALAR\", 1 "
+"for \"VEC2\", 2 for \"VEC3\", 3 for \"VEC4\", 4 for \"MAT2\", 5 for \"MAT3\", "
+"and 6 for \"MAT4\"."
+msgstr ""
+"Il tipo di accessor glTF come enumerazione. I valori possibili sono 0 per "
+"\"SCALAR\", 1 per \"VEC2\", 2 per \"VEC3\", 3 per \"VEC4\", 4 per \"MAT2\", 5 "
+"per \"MAT3\" e 6 per \"MAT4\"."
+
 msgid ""
 "The index of the buffer view this accessor is referencing. If [code]-1[/"
 "code], this accessor is not referencing any buffer view."
@@ -52031,6 +63969,17 @@ msgstr ""
 msgid "The offset relative to the start of the buffer view in bytes."
 msgstr "L'offset relativo all'inizio della buffer view in byte."
 
+msgid ""
+"The glTF component type as an enum. See [enum GLTFComponentType] for possible "
+"values. Within the core glTF specification, a value of 5125 or "
+"\"UNSIGNED_INT\" must not be used for any accessor that is not referenced by "
+"mesh.primitive.indices."
+msgstr ""
+"Il tipo di componente glTF come enumerazione. Vedi [enum GLTFComponentType] "
+"per i valori possibili. All'interno della specifica glTF di base, un valore "
+"di 5125 o \"UNSIGNED_INT\" non deve essere utilizzato per qualsiasi accessor "
+"che non sia referenziato da mesh.primitive.indices."
+
 msgid "The number of elements referenced by this accessor."
 msgstr "Il numero di elementi riferiti da questo accessor."
 
@@ -52079,6 +64028,11 @@ msgstr "L'offset relativo all'inizio del bufferView in byte."
 msgid "Use [member accessor_type] instead."
 msgstr "Usa [member accessor_type] invece."
 
+msgid "The glTF accessor type as an enum. Use [member accessor_type] instead."
+msgstr ""
+"Il tipo di accessor glTF come enumerazione. Utilizza invece [member "
+"accessor_type]."
+
 msgid ""
 "Accessor type \"SCALAR\". For the glTF object model, this can be used to map "
 "to a single float, int, or bool value, or a float array."
@@ -52129,9 +64083,63 @@ msgstr ""
 "Tipo di accessor \"MAT4\". Per il modello di oggetti glTF, questo corrisponde "
 "a \"float2x2\", rappresentato nel JSON glTF come un array di sedici float."
 
+msgid ""
+"Gets additional arbitrary data in this [GLTFAnimation] instance. This can be "
+"used to keep per-node state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The argument should be the [GLTFDocumentExtension] name (does not have to "
+"match the extension name in the glTF file), and the return value can be "
+"anything you set. If nothing was set, the return value is [code]null[/code]."
+msgstr ""
+"Ottiene ulteriori dati arbitrari in questa istanza [GLTFAnimation]. Può "
+"essere utilizzato per mantenere i dati di stato per ogni nodo nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"L'argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non deve "
+"corrispondere al nome dell'estensione nel file glTF ) e il valore restituito "
+"può essere qualsiasi cosa tu imposti. Se non è stato impostato nulla, il "
+"valore restituito è [code]null[/code]."
+
+msgid ""
+"Sets additional arbitrary data in this [GLTFAnimation] instance. This can be "
+"used to keep per-node state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The first argument should be the [GLTFDocumentExtension] name (does not have "
+"to match the extension name in the glTF file), and the second argument can be "
+"anything you want."
+msgstr ""
+"Imposta ulteriori dati arbitrari in questa istanza [GLTFAnimation]. Può "
+"essere utilizzato per mantenere i dati di stato per ogni nodo nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"Il primo argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non "
+"deve corrispondere al nome dell'estensione nel file glTF) e il secondo "
+"argomento può essere qualsiasi cosa tu voglia."
+
 msgid "The original name of the animation."
 msgstr "Il nome originale dell'animazione."
 
+msgid "Represents a glTF buffer view."
+msgstr "Rappresenta una buffer view glTF."
+
+msgid ""
+"GLTFBufferView is a data structure representing a glTF [code]bufferView[/"
+"code] that would be found in the [code]\"bufferViews\"[/code] array. A buffer "
+"is a blob of binary data. A buffer view is a slice of a buffer that can be "
+"used to identify and extract data from the buffer.\n"
+"Most custom uses of buffers only need to use the [member buffer], [member "
+"byte_length], and [member byte_offset]. The [member byte_stride] and [member "
+"indices] properties are for more advanced use cases such as interleaved mesh "
+"data encoded for the GPU."
+msgstr ""
+"GLTFBufferView è una struttura dati che rappresenta glTF una "
+"[code]bufferView[/code] che si troverebbe nell'array [code]\"bufferViews\"[/"
+"code]. Un buffer è un blob di dati binari. Una buffer view è una porzione di "
+"un buffer che può essere utilizzata per identificare ed estrarre dati dal "
+"buffer.\n"
+"La maggior parte degli usi personalizzati dei buffer necessita solo di usare "
+"[member buffer], [member byte_length] e [member byte_offset]. Le proprietà "
+"[member byte_stride] e [member indices] sono per casi d'uso più avanzati come "
+"dati mesh interlacciati codificati per la GPU."
+
 msgid ""
 "Loads the buffer view data from the buffer referenced by this buffer view in "
 "the given [GLTFState]. Interleaved data with a byte stride is not yet "
@@ -52146,8 +64154,8 @@ msgid ""
 "The index of the buffer this buffer view is referencing. If [code]-1[/code], "
 "this buffer view is not referencing any buffer."
 msgstr ""
-"L'indice del buffer a cui fa riferimento questa vista di buffer. Se [code]-1[/"
-"code], questa vista di buffer non fa riferimento ad alcun buffer."
+"L'indice del buffer a cui fa riferimento questa buffer view. Se [code]-1[/"
+"code], questa buffer view non fa riferimento ad alcun buffer."
 
 msgid ""
 "The length, in bytes, of this buffer view. If [code]0[/code], this buffer "
@@ -52169,6 +64177,54 @@ msgstr ""
 "Il passo, in byte, tra i dati interlacciati. Se [code]-1[/code], questa "
 "buffer view non è interlacciata."
 
+msgid ""
+"[code]true[/code] if the GLTFBufferView's OpenGL GPU buffer type is an "
+"[code]ELEMENT_ARRAY_BUFFER[/code] used for vertex indices (integer constant "
+"[code]34963[/code]). [code]false[/code] if the buffer type is any other "
+"value. See [url=https://github.com/KhronosGroup/glTF-Tutorials/blob/master/"
+"gltfTutorial/gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffers, "
+"BufferViews, and Accessors[/url] for possible values. This property is set on "
+"import and used on export."
+msgstr ""
+"[code]true[/code] se il tipo del buffer GPU OpenGL del GLTFBufferView è un "
+"[code]ELEMENT_ARRAY_BUFFER[/code] utilizzato per gli indici dei vertici "
+"(costante intera [code]34963[/code]). [code]false[/code] se il tipo di buffer "
+"è un qualunque altro valore. Consulta [url=https://github.com/KhronosGroup/"
+"glTF-Tutorials/blob/master/gltfTutorial/"
+"gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffer, BufferView e "
+"Accessor[/url] per i valori possibili. Questa proprietà viene impostata "
+"all'importazione e utilizzata all'esportazione."
+
+msgid ""
+"[code]true[/code] if the GLTFBufferView's OpenGL GPU buffer type is an "
+"[code]ARRAY_BUFFER[/code] used for vertex attributes (integer constant "
+"[code]34962[/code]). [code]false[/code] if the buffer type is any other "
+"value. See [url=https://github.com/KhronosGroup/glTF-Tutorials/blob/master/"
+"gltfTutorial/gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffers, "
+"BufferViews, and Accessors[/url] for possible values. This property is set on "
+"import and used on export."
+msgstr ""
+"[code]true[/code] se il tipo di buffer GPU OpenGL del GLTFBufferView è un "
+"[code]ARRAY_BUFFER[/code] utilizzato per gli indici dei vertici (costante "
+"intera [code]34962[/code]). [code]false[/code] se il tipo di buffer è un "
+"qualunque altro valore. Consulta [url=https://github.com/KhronosGroup/glTF-"
+"Tutorials/blob/master/gltfTutorial/"
+"gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffer, BufferView e "
+"Accessor[/url] per i valori possibili. Questa proprietà viene impostata "
+"all'importazione e utilizzata all'esportazione."
+
+msgid "Represents a glTF camera."
+msgstr "Rappresenta una telecamera glTF."
+
+msgid "Represents a camera as defined by the base glTF spec."
+msgstr "Rappresenta una telecamera come definita dalle specifiche glTF di base."
+
+msgid "glTF camera detailed specification"
+msgstr "Specifiche dettagliate di una telecamera glTF"
+
+msgid "glTF camera spec and example file"
+msgstr "Specifiche di una telecamera glTF e file di esempio"
+
 msgid "Creates a new GLTFCamera instance by parsing the given [Dictionary]."
 msgstr ""
 "Crea una nuova istanza di GLTFCamera analizzando il [Dictionary] specificato."
@@ -52183,15 +64239,118 @@ msgstr "Serializza questa istanza di GLTFCamera in un [Dictionary]."
 msgid "Converts this GLTFCamera instance into a Godot [Camera3D] node."
 msgstr "Converte questa istanza GLTFCamera in un nodo [Camera3D] di Godot."
 
+msgid ""
+"The distance to the far culling boundary for this camera relative to its "
+"local Z axis, in meters. This maps to glTF's [code]zfar[/code] property."
+msgstr ""
+"La distanza dal limite di ritaglio lontano per questa telecamera rispetto al "
+"suo asse Z locale, in metri. Questa corrisponde alla proprietà [code]zfar[/"
+"code] di glTF."
+
+msgid ""
+"The distance to the near culling boundary for this camera relative to its "
+"local Z axis, in meters. This maps to glTF's [code]znear[/code] property."
+msgstr ""
+"La distanza dal limite di ritaglio vicino per questa telecamera rispetto al "
+"suo asse Z locale, in metri. Questa corrisponde alla proprietà [code]znear[/"
+"code] di glTF."
+
+msgid ""
+"The FOV of the camera. This class and glTF define the camera FOV in radians, "
+"while Godot uses degrees. This maps to glTF's [code]yfov[/code] property. "
+"This value is only used for perspective cameras, when [member perspective] is "
+"[code]true[/code]."
+msgstr ""
+"Il FOV (campo visivo) della telecamera. Questa classe e glTF definiscono il "
+"FOV della telecamera in radianti, mentre Godot usa i gradi. Questo "
+"corrisponde alla proprietà [code]yfov[/code] di glTF. Questo valore è usato "
+"solo per le telecamere prospettiche, quando [member perspective] è "
+"[code]true[/code]."
+
+msgid ""
+"If [code]true[/code], the camera is in perspective mode. Otherwise, the "
+"camera is in orthographic/orthogonal mode. This maps to glTF's camera "
+"[code]type[/code] property. See [member Camera3D.projection] and the glTF "
+"spec for more information."
+msgstr ""
+"Se [code]true[/code] la telecamera è in modalità prospettiva. Altrimenti, la "
+"telecamera è in modalità ortografica/ortogonale. Questo corrisponde alla "
+"proprietà [code]type[/code] di una telecamera in glTF. Vedi [member Camera3D."
+"projection] e le specifiche glTF per ulteriori informazioni."
+
+msgid ""
+"The size of the camera. This class and glTF define the camera size magnitude "
+"as a radius in meters, while Godot defines it as a diameter in meters. This "
+"maps to glTF's [code]ymag[/code] property. This value is only used for "
+"orthographic/orthogonal cameras, when [member perspective] is [code]false[/"
+"code]."
+msgstr ""
+"La dimensione della telecamera. Questa classe e GLTF definiscono le unità "
+"della dimensione della telecamera come raggio in metri, mentre Godot la "
+"definisce come diametro in metri. Questo corrisponde alla proprietà "
+"[code]ymag[/code] di GLTF. Questo valore è utilizzato solo per telecamere "
+"ortografiche/ortogonali, quando [member perspective] è [code]false[/code]."
+
 msgid "Class for importing and exporting glTF files in and out of Godot."
 msgstr "Classe per importare ed esportare file glTF da Godot."
 
+msgid ""
+"GLTFDocument supports reading data from a glTF file, buffer, or Godot scene. "
+"This data can then be written to the filesystem, buffer, or used to create a "
+"Godot scene.\n"
+"All of the data in a glTF scene is stored in the [GLTFState] class. "
+"GLTFDocument processes state objects, but does not contain any scene data "
+"itself. GLTFDocument has member variables to store export configuration "
+"settings such as the image format, but is otherwise stateless. Multiple "
+"scenes can be processed with the same settings using the same GLTFDocument "
+"object and different [GLTFState] objects.\n"
+"GLTFDocument can be extended with arbitrary functionality by extending the "
+"[GLTFDocumentExtension] class and registering it with GLTFDocument via "
+"[method register_gltf_document_extension]. This allows for custom data to be "
+"imported and exported."
+msgstr ""
+"GLTFDocument supporta la lettura di dati da un file glTF, buffer o scena "
+"Godot. È possibile successivamente scrivere questi dati nel file system, "
+"buffer o utilizzati per creare una scena Godot.\n"
+"Tutti i dati in una scena glTF sono archiviati nella classe [GLTFState]. "
+"GLTFDocument elabora oggetti di stato, ma esso stesso non contiene dati di "
+"scena. GLTFDocument ha variabili membro per memorizzare impostazioni "
+"d'esportazione come il formato immagine, ma è comunque stateless. È possibile "
+"elaborare più scene con le stesse impostazioni utilizzando lo stesso oggetto "
+"GLTFDocument e diversi oggetti [GLTFState].\n"
+"GLTFDocument può essere esteso con funzionalità arbitrarie estendendo la "
+"classe [GLTFDocumentExtension] e registrandola con GLTFDocument tramite "
+"[method register_gltf_document_extension]. Ciò consente di importare ed "
+"esportare dati personalizzati."
+
 msgid "glTF 'What the duck?' guide"
 msgstr "Guida 'What the duck?' glTF"
 
 msgid "Khronos glTF specification"
 msgstr "Specifiche glTF Khronos"
 
+msgid ""
+"Takes a [PackedByteArray] defining a glTF and imports the data to the given "
+"[GLTFState] object through the [param state] parameter.\n"
+"[b]Note:[/b] The [param base_path] tells [method append_from_buffer] where to "
+"find dependencies and can be empty."
+msgstr ""
+"Accetta un [PackedByteArray] che definisce un glTF e importa i dati "
+"nell'oggetto [GLTFState] specificato tramite il parametro [param state].\n"
+"[b]Nota:[/b] Il parametro [param base_path] indica a [method "
+"append_from_buffer] dove trovare le dipendenze e può essere vuoto."
+
+msgid ""
+"Takes a path to a glTF file and imports the data at that file path to the "
+"given [GLTFState] object through the [param state] parameter.\n"
+"[b]Note:[/b] The [param base_path] tells [method append_from_file] where to "
+"find dependencies and can be empty."
+msgstr ""
+"Accetta un percorso verso un file glTF e importa i dati in quel percorso file "
+"nell'oggetto [GLTFState] specificato tramite il parametro [param state].\n"
+"[b]Nota:[/b] Il parametro [param base_path] indica a [method "
+"append_from_buffer] dove trovare le dipendenze e può essere vuoto."
+
 msgid ""
 "Takes a Godot Engine scene node and exports it and its descendants to the "
 "given [GLTFState] object through the [param state] parameter."
@@ -52200,6 +64359,13 @@ msgstr ""
 "discendenti nell'oggetto [GLTFState] specificato tramite il parametro [param "
 "state]."
 
+msgid ""
+"Takes a [GLTFState] object through the [param state] parameter and returns a "
+"glTF [PackedByteArray]."
+msgstr ""
+"Accetta un oggetto [GLTFState] tramite il parametro [param state] e "
+"restituisce un [PackedByteArray] glTF."
+
 msgid ""
 "Takes a [GLTFState] object through the [param state] parameter and returns a "
 "Godot Engine scene node.\n"
@@ -52209,6 +64375,23 @@ msgstr ""
 "restituisce un nodo scena di Godot Engine.\n"
 "Il parametro [param bake_fps] sostituisce bake_fps in [param state]."
 
+msgid ""
+"Registers the given [GLTFDocumentExtension] instance with GLTFDocument. If "
+"[param first_priority] is [code]true[/code], this extension will be run "
+"first. Otherwise, it will be run last.\n"
+"[b]Note:[/b] Like GLTFDocument itself, all GLTFDocumentExtension classes must "
+"be stateless in order to function properly. If you need to store data, use "
+"the [code]set_additional_data[/code] and [code]get_additional_data[/code] "
+"methods in [GLTFState] or [GLTFNode]."
+msgstr ""
+"Registra l'istanza [GLTFDocumentExtension] specificata con GLTFDocument. Se "
+"[param first_priority] è [code]true[/code], questa estensione sarà eseguita "
+"per prima. Altrimenti, sarà eseguita per ultima.\n"
+"[b]Nota:[/b] Come GLTFDocument stesso, tutte le classi GLTFDocumentExtension "
+"devono essere stateless per funzionare correttamente. Se è necessario "
+"memorizzare dati, usa i metodi [code]set_additional_data[/code] e "
+"[code]get_additional_data[/code] in [GLTFState] o [GLTFNode]."
+
 msgid "Unregisters the given [GLTFDocumentExtension] instance."
 msgstr ""
 "Annulla la registrazione dell'istanza [GLTFDocumentExtension] specificata."
@@ -52224,6 +64407,21 @@ msgstr ""
 "[b]Nota:[/b] L'estensione del file glTF determina se si tratta di un file "
 "binario .glb o di un file di testo .gltf."
 
+msgid ""
+"The user-friendly name of the export image format. This is used when "
+"exporting the glTF file, including writing to a file and writing to a byte "
+"array.\n"
+"By default, Godot allows the following options: \"None\", \"PNG\", \"JPEG\", "
+"\"Lossless WebP\", and \"Lossy WebP\". Support for more image formats can be "
+"added in [GLTFDocumentExtension] classes."
+msgstr ""
+"Il nome leggibile in chiaro del formato di immagine d'esportazione. Viene "
+"utilizzato quando si esporta il file glTF, inclusa la scrittura su un file e "
+"su un array di byte.\n"
+"Per impostazione predefinita, Godot consente le seguenti opzioni: \"None\", "
+"\"PNG\", \"JPEG\", \"Lossless WebP\" e \"Lossy WebP\". È possibile aggiungere "
+"supporto per altri formati di immagine nelle classi [GLTFDocumentExtension]."
+
 msgid ""
 "If [member image_format] is a lossy image format, this determines the lossy "
 "quality of the image. On a range of [code]0.0[/code] to [code]1.0[/code], "
@@ -52291,6 +64489,133 @@ msgstr ""
 msgid "[GLTFDocument] extension class."
 msgstr "Classe di estensione [GLTFDocument]."
 
+msgid ""
+"Extends the functionality of the [GLTFDocument] class by allowing you to run "
+"arbitrary code at various stages of glTF import or export.\n"
+"To use, make a new class extending GLTFDocumentExtension, override any "
+"methods you need, make an instance of your class, and register it using "
+"[method GLTFDocument.register_gltf_document_extension].\n"
+"[b]Note:[/b] Like GLTFDocument itself, all GLTFDocumentExtension classes must "
+"be stateless in order to function properly. If you need to store data, use "
+"the [code]set_additional_data[/code] and [code]get_additional_data[/code] "
+"methods in [GLTFState] or [GLTFNode]."
+msgstr ""
+"Estende la funzionalità della classe [GLTFDocument] consentendo di eseguire "
+"codice arbitrario in varie fasi dell'importazione o dell'esportazione glTF.\n"
+"Per utilizzarla, crea una nuova classe che estende GLTFDocumentExtension, "
+"sovrascrivi tutti i metodi di cui hai bisogno, crea un'istanza della tua "
+"classe e registrala tramite [method GLTFDocument."
+"register_gltf_document_extension].\n"
+"[b]Nota:[/b] Come GLTFDocument stesso, tutte le classi GLTFDocumentExtension "
+"devono essere stateless per funzionare correttamente. Se è necessario "
+"memorizzare dati, usa i metodi [code]set_additional_data[/code] e "
+"[code]get_additional_data[/code] in [GLTFState] o [GLTFNode]."
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_export_preflight] and before [method _export_post_convert].\n"
+"Runs when converting the data from a Godot scene node. This method can be "
+"used to process the Godot scene node data into a format that can be used by "
+"[method _export_node]."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito dopo [method "
+"_export_preflight] e prima di [method _export_post_convert].\n"
+"Viene eseguito quando si convertono i dati da un nodo di una scena di Godot. "
+"Questo metodo può essere utilizzato per elaborare i dati dei nodi in una "
+"scena di Godot in un formato che può essere utilizzato da [method "
+"_export_node]."
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_get_saveable_image_formats] and before [method _export_post]. If this "
+"[GLTFDocumentExtension] is used for exporting images, this runs after [method "
+"_serialize_texture_json].\n"
+"This method can be used to modify the final JSON of each node. Data should be "
+"primarily stored in [param gltf_node] prior to serializing the JSON, but the "
+"original Godot [Node] is also provided if available. [param node] may be "
+"[code]null[/code] if not available, such as when exporting glTF data not "
+"generated from a Godot scene."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito dopo [method "
+"_get_saveable_image_formats] e prima di [method _export_post]. Se questo "
+"[GLTFDocumentExtension] viene utilizzato per esportare le immagini, viene "
+"eseguito dopo [method _serialize_texture_json].\n"
+"Questo metodo può essere utilizzato per modificare il JSON finale di ogni "
+"nodo. I dati devono essere principalmente memorizzati in [param gltf_node] "
+"prima di serializzare il JSON, ma viene anche fornito il nodo originale di "
+"Godot ([param node]) se disponibile. Il nodo potrebbe essere [code]null[/"
+"code] se non disponibile, ad esempio quando si esportano dati glTF non "
+"generati da una scena di Godot."
+
+msgid ""
+"Part of the export process. This method is run last, after all other parts of "
+"the export process.\n"
+"This method can be used to modify the final JSON of the generated glTF file."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito per ultimo, "
+"dopo tutte le altre parti del processo di esportazione.\n"
+"Questo metodo può essere utilizzato per modificare il JSON finale del file "
+"glTF generato."
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_convert_scene_node] and before [method _export_preserialize].\n"
+"This method can be used to modify the converted node data structures before "
+"serialization with any additional data from the scene tree."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito dopo [method "
+"_convert_scene_node] e prima di [method _export_preserialize].\n"
+"Questo metodo può essere utilizzato per apportare modifiche alle strutture "
+"dati del nodo convertito prima della serializzazione, con eventuali dati "
+"aggiuntivi dall'albero di scene."
+
+msgid ""
+"Part of the export process. This method is run first, before all other parts "
+"of the export process.\n"
+"The return value is used to determine if this [GLTFDocumentExtension] "
+"instance should be used for exporting a given glTF file. If [constant OK], "
+"the export will use this [GLTFDocumentExtension] instance. If not overridden, "
+"[constant OK] is returned."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito per primo, "
+"prima di tutte le altre parti del processo di esportazione.\n"
+"Il valore restituito è utilizzato per determinare se questa istanza di "
+"[GLTFDocumentExtension] deve essere utilizzata per esportare un determinato "
+"file glTF. Se [constant OK], l'esportazione utilizzerà questa istanza di "
+"[GLTFDocumentExtension]. Se non sovrascritto, viene restituito [constant OK]."
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_export_post_convert] and before [method _get_saveable_image_formats].\n"
+"This method can be used to alter the state before performing serialization. "
+"It runs every time when generating a buffer with [method GLTFDocument."
+"generate_buffer] or writing to the file system with [method GLTFDocument."
+"write_to_filesystem]."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito dopo [method "
+"_export_post_convert] e prima di [method _get_saveable_image_formats].\n"
+"Questo metodo può essere utilizzato per alterare lo stato prima di eseguire "
+"la serializzazione. È eseguito ogni volta che si genera un buffer con [method "
+"GLTFDocument.generate_buffer] o si scrive sul file system con [method "
+"GLTFDocument.write_to_filesystem]."
+
+msgid ""
+"Part of the import process. This method is run after [method "
+"_import_pre_generate] and before [method _import_node].\n"
+"Runs when generating a Godot scene node from a GLTFNode. The returned node "
+"will be added to the scene tree. Multiple nodes can be generated in this step "
+"if they are added as a child of the returned node.\n"
+"[b]Note:[/b] The [param scene_parent] parameter may be [code]null[/code] if "
+"this is the single root node."
+msgstr ""
+"Parte del processo di importazione. Questo metodo viene eseguito dopo [method "
+"_import_pre_generate] e prima di [method _import_node].\n"
+"È eseguito quando si genera un nodo di scena di Godot da un GLTFNode. Il nodo "
+"restituito sarà aggiunto all'albero di scene. In questo passaggio è possibile "
+"generare più nodi se vengono aggiunti come figli del nodo restituito.\n"
+"[b]Nota:[/b] Il parametro [param scene_parent] potrebbe essere [code]null[/"
+"code] se questo è il singolo nodo radice."
+
 msgid ""
 "Returns the file extension to use for saving image data into, for example, "
 "[code]\".png\"[/code]. If defined, when this extension is used to handle "
@@ -52330,6 +64655,19 @@ msgstr ""
 "formato contiene [code]\"Lossy\"[/code], sarà visualizzato il cursore della "
 "qualità lossy."
 
+msgid ""
+"Part of the import process. This method is run after [method "
+"_import_preflight] and before [method _parse_node_extensions].\n"
+"Returns an array of the glTF extensions supported by this "
+"GLTFDocumentExtension class. This is used to validate if a glTF file with "
+"required extensions can be loaded."
+msgstr ""
+"Parte del processo di importazione. Questo metodo viene eseguito dopo [method "
+"_import_preflight] e prima di [method _parse_node_extensions].\n"
+"Restituisce un array delle estensioni glTF supportate da questa classe "
+"GLTFDocumentExtension. Viene utilizzato per verificare se è possibile "
+"caricare un file glTF con le estensioni richieste."
+
 msgid ""
 "Part of the import process. This method is run after [method "
 "_generate_scene_node] and before [method _import_post].\n"
@@ -52352,6 +64690,58 @@ msgstr ""
 "Questo metodo può essere utilizzato per modificare la scena finale di Godot "
 "generata dal processo di importazione."
 
+msgid ""
+"Part of the import process. This method is run after [method "
+"_parse_node_extensions] and before [method _import_pre_generate].\n"
+"This method can be used to modify any of the data imported so far after "
+"parsing each node, but before generating the scene or any of its nodes."
+msgstr ""
+"Parte del processo di importazione. Questo metodo viene eseguito dopo [method "
+"_parse_node_extensions] e prima di [method _import_pre_generate].\n"
+"Questo metodo può essere utilizzato per modificare uno qualsiasi dei dati "
+"importati finora dopo aver analizzato ogni nodo, ma prima di generare la "
+"scena o uno qualsiasi dei suoi nodi."
+
+msgid ""
+"Part of the import process. This method is run after [method "
+"_import_post_parse] and before [method _generate_scene_node].\n"
+"This method can be used to modify or read from any of the processed data "
+"structures, before generating the nodes and then running the final per-node "
+"import step."
+msgstr ""
+"Parte del processo di importazione. Questo metodo viene eseguito dopo [method "
+"_import_post_parse] e prima di [method _generate_scene_node].\n"
+"Questo metodo può essere utilizzato per modificare o leggere da una qualsiasi "
+"delle strutture dati elaborate, prima di generare i nodi e successivamente "
+"eseguire il passaggio finale di importazione per ogni nodo."
+
+msgid ""
+"Part of the import process. This method is run first, before all other parts "
+"of the import process.\n"
+"The return value is used to determine if this [GLTFDocumentExtension] "
+"instance should be used for importing a given glTF file. If [constant OK], "
+"the import will use this [GLTFDocumentExtension] instance. If not overridden, "
+"[constant OK] is returned."
+msgstr ""
+"Parte del processo di importazione. Questo metodo viene eseguito per primo, "
+"prima di tutte le altre parti del processo di importazione.\n"
+"Il valore restituito è utilizzato per determinare se questa istanza di "
+"[GLTFDocumentExtension] deve essere utilizzata per importare un determinato "
+"file glTF. Se è [constant OK], l'importazione utilizzerà questa istanza di "
+"[GLTFDocumentExtension]. Se non sovrascritto, viene restituito [constant OK]."
+
+msgid ""
+"Part of the import process. This method is run after [method "
+"_parse_node_extensions] and before [method _parse_texture_json].\n"
+"Runs when parsing image data from a glTF file. The data could be sourced from "
+"a separate file, a URI, or a buffer, and then is passed as a byte array."
+msgstr ""
+"Parte del processo di importazione. Questo metodo viene eseguito dopo [method "
+"_parse_node_extensions] e prima di [method _parse_texture_json].\n"
+"È eseguito durante l'elaborazione dei dati immagine da un file glTF. I dati "
+"potrebbero provenire da un file separato, un URI o un buffer, e sono passati "
+"come array di byte."
+
 msgid ""
 "Part of the import process. This method is run after [method "
 "_get_supported_extensions] and before [method _import_post_parse].\n"
@@ -52367,6 +64757,57 @@ msgstr ""
 "in un formato che può essere utilizzato da [method _generate_scene_node]. Il "
 "valore restituito deve essere un membro dell'enumerazione [enum Error]."
 
+msgid ""
+"Part of the import process. This method is run after [method "
+"_parse_image_data] and before [method _generate_scene_node].\n"
+"Runs when parsing the texture JSON from the glTF textures array. This can be "
+"used to set the source image index to use as the texture."
+msgstr ""
+"Parte del processo di importazione. Questo metodo viene eseguito dopo [method "
+"_parse_image_data] e prima di [method _generate_scene_node].\n"
+"Viene eseguito durante l'analisi del JSON della texture dall'array di texture "
+"glTF. Può essere utilizzato per impostare l'indice dell'immagine sorgente da "
+"utilizzare come texture."
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_get_saveable_image_formats] and before [method _serialize_texture_json].\n"
+"This method is run when saving images separately from the glTF file. When "
+"images are embedded, [method _serialize_image_to_bytes] runs instead. Note "
+"that these methods only run when this [GLTFDocumentExtension] is selected as "
+"the image exporter."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito dopo [method "
+"_get_saveable_image_formats] e prima di [method _serialize_texture_json].\n"
+"Questo metodo viene eseguito quando si salvano le immagini separatamente dal "
+"file glTF. Quando le immagini sono incorporate, viene invece eseguito [method "
+"_serialize_image_to_bytes]. Nota che questi metodi vengono eseguiti solo "
+"quando questo [GLTFDocumentExtension] è selezionato come esportatore di "
+"immagini."
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_get_saveable_image_formats] and before [method _serialize_texture_json].\n"
+"This method is run when embedding images in the glTF file. When images are "
+"saved separately, [method _save_image_at_path] runs instead. Note that these "
+"methods only run when this [GLTFDocumentExtension] is selected as the image "
+"exporter.\n"
+"This method must set the image MIME type in the [param image_dict] with the "
+"[code]\"mimeType\"[/code] key. For example, for a PNG image, it would be set "
+"to [code]\"image/png\"[/code]. The return value must be a [PackedByteArray] "
+"containing the image data."
+msgstr ""
+"Parte del processo di esportazione. Questo metodo viene eseguito dopo [method "
+"_get_saveable_image_formats] e prima di [method _serialize_texture_json].\n"
+"Questo metodo viene eseguito quando si incorporano immagini nel file glTF. "
+"Quando si salvano le immagini separatamente, viene invece eseguito [method "
+"_save_image_at_path]. Nota che questi metodi vengono eseguiti solo quando "
+"questo [GLTFDocumentExtension] è selezionato come esportatore di immagini.\n"
+"Questo metodo deve impostare il tipo MIME dell'immagine nel [param "
+"image_dict] con la chiave [code]\"mimeType\"[/code]. Ad esempio, per "
+"un'immagine PNG, verrebbe impostato su [code]\"image/png\"[/code]. Il valore "
+"restituito deve essere un [PackedByteArray] contenente i dati dell'immagine."
+
 msgid ""
 "Part of the export process. This method is run after [method "
 "_save_image_at_path] or [method _serialize_image_to_bytes], and before "
@@ -52388,6 +64829,19 @@ msgstr ""
 "add_used_extension], assicurati di impostare [code]required[/code] su "
 "[code]true[/code] se non stai fornendo un'alternativa di riserva."
 
+msgid "Represents a glTF light."
+msgstr "Rappresenta una luce glTF."
+
+msgid ""
+"Represents a light as defined by the [code]KHR_lights_punctual[/code] glTF "
+"extension."
+msgstr ""
+"Rappresenta una luce come definita dall'estensione glTF "
+"[code]KHR_lights_punctual[/code]."
+
+msgid "KHR_lights_punctual glTF extension spec"
+msgstr "Specifiche sull'estensione glTF KHR_lights_punctual"
+
 msgid "Creates a new GLTFLight instance by parsing the given [Dictionary]."
 msgstr ""
 "Crea una nuova istanza GLTFLight elaborando il [Dictionary] specificato."
@@ -52462,6 +64916,58 @@ msgstr ""
 "le direzioni. Quando si crea un [SpotLight3D] di Godot, l'angolo del cono "
 "esterno viene utilizzato come angolo del riflettore."
 
+msgid ""
+"The range of the light, beyond which the light has no effect. glTF lights "
+"with no range defined behave like physical lights (which have infinite "
+"range). When creating a Godot light, the range is clamped to 4096."
+msgstr ""
+"La portata della luce, oltre la quale la luce non ha effetto. Le luci glTF "
+"senza portata definita si comportano come luci fisiche (che hanno portata "
+"infinita). Quando si crea una luce di Godot, la portata è limitata a 4096."
+
+msgid "GLTFMesh represents a glTF mesh."
+msgstr "GLTFMesh rappresenta una mesh glTF."
+
+msgid ""
+"GLTFMesh handles 3D mesh data imported from glTF files. It includes "
+"properties for blend channels, blend weights, instance materials, and the "
+"mesh itself."
+msgstr ""
+"GLTFMesh gestisce i dati di mesh 3D importati dai file glTF. Include "
+"proprietà per canali di fusione, pesi di fusione, materiali di istanza e la "
+"mesh stessa."
+
+msgid ""
+"Gets additional arbitrary data in this [GLTFMesh] instance. This can be used "
+"to keep per-node state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The argument should be the [GLTFDocumentExtension] name (does not have to "
+"match the extension name in the glTF file), and the return value can be "
+"anything you set. If nothing was set, the return value is [code]null[/code]."
+msgstr ""
+"Ottiene ulteriori dati arbitrari in questa istanza [GLTFMesh]. Può essere "
+"utilizzato per mantenere i dati di stato per ogni nodo nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"L'argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non deve "
+"corrispondere al nome dell'estensione nel file glTF) e il valore restituito "
+"può essere qualsiasi cosa tu imposti. Se niente è stato impostato, il valore "
+"restituito è [code]null[/code]."
+
+msgid ""
+"Sets additional arbitrary data in this [GLTFMesh] instance. This can be used "
+"to keep per-node state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The first argument should be the [GLTFDocumentExtension] name (does not have "
+"to match the extension name in the glTF file), and the second argument can be "
+"anything you want."
+msgstr ""
+"Imposta ulteriori dati arbitrari in questa istanza [GLTFMesh]. Può essere "
+"utilizzato per mantenere i dati di stato per ogni nodo nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"Il primo argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non "
+"deve corrispondere al nome dell'estensione nel file glTF) e il secondo "
+"argomento può essere qualsiasi cosa tu voglia."
+
 msgid "An array of floats representing the blend weights of the mesh."
 msgstr "Un array di float che rappresentano i pesi di fusione della mesh."
 
@@ -52477,6 +64983,81 @@ msgstr "L'oggetto [ImporterMesh] che rappresenta la mesh stessa."
 msgid "The original name of the mesh."
 msgstr "Il nome originale della mesh."
 
+msgid "glTF node class."
+msgstr "Classe per un nodo glTF."
+
+msgid ""
+"Represents a glTF node. glTF nodes may have names, transforms, children "
+"(other glTF nodes), and more specialized properties (represented by their own "
+"classes).\n"
+"glTF nodes generally exist inside of [GLTFState] which represents all data of "
+"a glTF file. Most of GLTFNode's properties are indices of other data in the "
+"glTF file. You can extend a glTF node with additional properties by using "
+"[method get_additional_data] and [method set_additional_data]."
+msgstr ""
+"Rappresenta un nodo glTF. I nodi glTF possono avere nomi, trasformazioni, "
+"figli (altri nodi glTF) e proprietà più specializzate (rappresentate dalle "
+"proprie classi).\n"
+"I nodi glTF in genere esistono all'interno di [GLTFState] che rappresenta "
+"tutti i dati di un file glTF. La maggior parte delle proprietà di glTFNode "
+"sono indici di altri dati nel file glTF. È possibile estendere un nodo glTF "
+"con proprietà aggiuntive tramite [method get_additional_data] e [method "
+"set_additional_data]."
+
+msgid "glTF scene and node spec"
+msgstr "Specifiche di scene e nodi glTF"
+
+msgid "Appends the given child node index to the [member children] array."
+msgstr ""
+"Accoda l'indice del nodo figlio specificato all'array [member children]."
+
+msgid ""
+"Gets additional arbitrary data in this [GLTFNode] instance. This can be used "
+"to keep per-node state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The argument should be the [GLTFDocumentExtension] name (does not have to "
+"match the extension name in the glTF file), and the return value can be "
+"anything you set. If nothing was set, the return value is [code]null[/code]."
+msgstr ""
+"Ottiene ulteriori dati arbitrari in questa istanza [GLTFNode]. Può essere "
+"utilizzato per mantenere i dati di stato per ogni nodo nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"L'argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non deve "
+"corrispondere al nome dell'estensione nel file glTF) e il valore restituito "
+"può essere qualsiasi cosa tu imposti. Se niente è stato impostato, il valore "
+"restituito è [code]null[/code]."
+
+msgid ""
+"Sets additional arbitrary data in this [GLTFNode] instance. This can be used "
+"to keep per-node state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The first argument should be the [GLTFDocumentExtension] name (does not have "
+"to match the extension name in the glTF file), and the second argument can be "
+"anything you want."
+msgstr ""
+"Imposta ulteriori dati arbitrari in questa istanza [GLTFNode]. Può essere "
+"utilizzato per mantenere i dati di stato per ogni nodo nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"Il primo argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non "
+"deve corrispondere al nome dell'estensione nel file glTF) e il secondo "
+"argomento può essere qualsiasi cosa tu voglia."
+
+msgid ""
+"If this glTF node is a camera, the index of the [GLTFCamera] in the "
+"[GLTFState] that describes the camera's properties. If -1, this node is not a "
+"camera."
+msgstr ""
+"Se questo nodo glTF è una telecamera, l'indice della [GLTFCamera] nel "
+"[GLTFState] che descrive le proprietà della telecamera. Se -1, questo nodo "
+"non è una telecamera."
+
+msgid ""
+"The indices of the child nodes in the [GLTFState]. If this glTF node has no "
+"children, this will be an empty array."
+msgstr ""
+"Gli indici dei nodi figlio nel [GLTFState]. Se questo nodo glTF non ha figli, "
+"questo sarà un array vuoto."
+
 msgid ""
 "How deep into the node hierarchy this node is. A root node will have a height "
 "of 0, its children will have a height of 1, and so on. If -1, the height has "
@@ -52486,6 +65067,20 @@ msgstr ""
 "un'altezza di 0, i suoi figli avranno un'altezza di 1 e così via. Se -1, "
 "l'altezza non è stata calcolata."
 
+msgid ""
+"If this glTF node is a light, the index of the [GLTFLight] in the [GLTFState] "
+"that describes the light's properties. If -1, this node is not a light."
+msgstr ""
+"Se questo nodo glTF è una luce, l'indice della [GLTFLight] nel [GLTFState] "
+"che descrive le proprietà della luce. Se -1, questo nodo non è una luce."
+
+msgid ""
+"If this glTF node is a mesh, the index of the [GLTFMesh] in the [GLTFState] "
+"that describes the mesh's properties. If -1, this node is not a mesh."
+msgstr ""
+"Se questo nodo glTF è una mesh, l'indice della [GLTFMesh] nel [GLTFState] che "
+"descrive le proprietà della mesh. Se -1, questo nodo non è una mesh."
+
 msgid "The original name of the node."
 msgstr "Il nome originale del nodo."
 
@@ -52495,6 +65090,87 @@ msgid ""
 msgstr ""
 "L'indice del nodo padre nel [GLTFState]. Se -1, questo nodo è un nodo radice."
 
+msgid "The position of the glTF node relative to its parent."
+msgstr "La posizione del nodo glTF rispetto al suo genitore."
+
+msgid "The rotation of the glTF node relative to its parent."
+msgstr "La rotazione del nodo glTF rispetto al suo genitore."
+
+msgid "The scale of the glTF node relative to its parent."
+msgstr "La scala del nodo glTF rispetto al suo genitore."
+
+msgid ""
+"If this glTF node has a skeleton, the index of the [GLTFSkeleton] in the "
+"[GLTFState] that describes the skeleton's properties. If -1, this node does "
+"not have a skeleton."
+msgstr ""
+"Se questo nodo glTF ha uno scheletro, l'indice dello [GLTFSkeleton] nel "
+"[GLTFState] che descrive le proprietà dello scheletro. Se -1, questo nodo non "
+"ha uno scheletro."
+
+msgid ""
+"If this glTF node has a skin, the index of the [GLTFSkin] in the [GLTFState] "
+"that describes the skin's properties. If -1, this node does not have a skin."
+msgstr ""
+"Se questo nodo glTF ha una skin, l'indice della [GLTFSkin] nel [GLTFState] "
+"che descrive le proprietà della skin. Se -1, questo nodo non ha una skin."
+
+msgid ""
+"The transform of the glTF node relative to its parent. This property is "
+"usually unused since the position, rotation, and scale properties are "
+"preferred."
+msgstr ""
+"La trasformazione del nodo glTF rispetto al suo genitore. Questa proprietà è "
+"solitamente inutilizzata poiché sono preferite le proprietà di posizione, "
+"rotazione e scala."
+
+msgid "KHR_animation_pointer GLTF extension"
+msgstr "Specifiche sull'estensione glTF KHR_animation_pointer"
+
+msgid ""
+"Object model type \"float2x2\". Represented in the glTF JSON as an array of "
+"four numbers, and encoded in a [GLTFAccessor] as \"MAT2\"."
+msgstr ""
+"Tipo di modello d'oggetto \"float2x2\". Rappresentato nel JSON glTF come un "
+"array di quattro numeri e codificato in un [GLTFAccessor] come \"MAT2\"."
+
+msgid ""
+"Object model type \"float3x3\". Represented in the glTF JSON as an array of "
+"nine numbers, and encoded in a [GLTFAccessor] as \"MAT3\"."
+msgstr ""
+"Tipo di modello d'oggetto \"float3x3\". Rappresentato nel JSON glTF come un "
+"array di nove numeri e codificato in un [GLTFAccessor] come \"MAT3\"."
+
+msgid ""
+"Object model type \"float4x4\". Represented in the glTF JSON as an array of "
+"sixteen numbers, and encoded in a [GLTFAccessor] as \"MAT4\"."
+msgstr ""
+"Tipo di modello d'oggetto \"float4x4\". Rappresentato nel JSON glTF come un "
+"array di sedici numeri e codificato in un [GLTFAccessor] come \"MAT4\"."
+
+msgid "Represents a glTF physics body."
+msgstr "Rappresenta un corpo fisico glTF."
+
+msgid ""
+"Represents a physics body as an intermediary between the "
+"[code]OMI_physics_body[/code] glTF data and Godot's nodes, and it's "
+"abstracted in a way that allows adding support for different glTF physics "
+"extensions in the future."
+msgstr ""
+"Rappresenta un corpo fisico come intermediario tra i dati glTF "
+"[code]OMI_physics_body[/code] e i nodi di Godot, ed è astratto in modo da "
+"supportare in futuro diverse estensioni glTF di fisica."
+
+msgid "OMI_physics_body glTF extension"
+msgstr "Estensione glTF OMI_physics_body"
+
+msgid ""
+"Creates a new GLTFPhysicsBody instance by parsing the given [Dictionary] in "
+"the [code]OMI_physics_body[/code] glTF extension format."
+msgstr ""
+"Crea una nuova istanza di GLTFPhysicsBody elaborando il [Dictionary] "
+"specificato nel formato di estensione glTF [code]OMI_physics_body[/code]."
+
 msgid ""
 "Creates a new GLTFPhysicsBody instance from the given Godot "
 "[CollisionObject3D] node."
@@ -52502,6 +65178,13 @@ msgstr ""
 "Crea una nuova istanza di GLTFPhysicsBody dal nodo [CollisionObject3D] di "
 "Godot specificato."
 
+msgid ""
+"Serializes this GLTFPhysicsBody instance into a [Dictionary]. It will be in "
+"the format expected by the [code]OMI_physics_body[/code] glTF extension."
+msgstr ""
+"Serializza questa istanza di GLTFPhysicsBody in un [Dictionary]. Sarà nel "
+"formato previsto dall'estensione glTF [code]OMI_physics_body[/code]."
+
 msgid ""
 "Converts this GLTFPhysicsBody instance into a Godot [CollisionObject3D] node."
 msgstr ""
@@ -52515,6 +65198,19 @@ msgstr ""
 "La velocità angolare del corpo fisico, in radianti al secondo. È utilizzata "
 "solo quando il tipo di corpo è \"rigid\" o \"vehicle\"."
 
+msgid ""
+"The type of the body. When importing, this controls what type of "
+"[CollisionObject3D] node Godot should generate. Valid values are \"static\", "
+"\"animatable\", \"character\", \"rigid\", \"vehicle\", and \"trigger\". When "
+"exporting, this will be squashed down to one of \"static\", \"kinematic\", or "
+"\"dynamic\" motion types, or the \"trigger\" property."
+msgstr ""
+"Il tipo di corpo. Quando si importa, questo controlla il tipo di nodo "
+"[CollisionObject3D] che Godot deve generare. I valori validi sono \"static\", "
+"\"animatable\", \"character\", \"rigid\", \"vehicle\" e \"trigger\". "
+"All'esportazione, questo verrà compresso in uno dei tipi di movimento "
+"\"static\", \"kinematic\" o \"dynamic\" o nella proprietà \"trigger\"."
+
 msgid ""
 "The center of mass of the body, in meters. This is in local space relative to "
 "the body. By default, the center of the mass is the body's origin."
@@ -52575,6 +65271,26 @@ msgstr ""
 "La massa del corpo fisico, chilogrammi. È utilizzata solo quando il tipo di "
 "corpo è \"rigid\" o \"vehicle\"."
 
+msgid "Represents a glTF physics shape."
+msgstr "Rappresenta una forma fisica glTF."
+
+msgid ""
+"Represents a physics shape as defined by the [code]OMI_physics_shape[/code] "
+"or [code]OMI_collider[/code] glTF extensions. This class is an intermediary "
+"between the glTF data and Godot's nodes, and it's abstracted in a way that "
+"allows adding support for different glTF physics extensions in the future."
+msgstr ""
+"Rappresenta una forma fisica come definita dalle estensioni glTF "
+"[code]OMI_physics_shape[/code] o [code]OMI_collider[/code]. Questa classe è "
+"un intermediario tra i dati glTF e i nodi di Godot, ed è astratta in modo da "
+"supportare in futuro diverse estensioni glTF di fisica."
+
+msgid "OMI_physics_shape glTF extension"
+msgstr "Estensione glTF OMI_physics_shape"
+
+msgid "OMI_collider glTF extension"
+msgstr "Estensione glTF OMI_collider"
+
 msgid ""
 "Creates a new GLTFPhysicsShape instance by parsing the given [Dictionary]."
 msgstr ""
@@ -52628,6 +65344,26 @@ msgstr ""
 "La risorsa [ImporterMesh] della forma. È utilizzata solo quando il tipo di "
 "forma è \"hull\" (hull convesso) o \"trimesh\" (trimesh concavo)."
 
+msgid ""
+"If [code]true[/code], indicates that this shape is a trigger. For Godot, this "
+"means that the shape should be a child of an Area3D node.\n"
+"This is the only variable not used in the [method to_node] method, it's "
+"intended to be used alongside when deciding where to add the generated node "
+"as a child."
+msgstr ""
+"Se [code]true[/code], indica che questa forma è un trigger. Per Godot, questo "
+"significa che la forma dovrebbe essere un figlio di un nodo Area3D.\n"
+"Questa è l'unica variabile non utilizzata nel metodo [method to_node], è "
+"pensata per essere utilizzata accanto quando si decide dove aggiungere il "
+"nodo generato come figlio."
+
+msgid ""
+"The index of the shape's mesh in the glTF file. This is only used when the "
+"shape type is \"hull\" (convex hull) or \"trimesh\" (concave trimesh)."
+msgstr ""
+"L'indice della mesh della forma nel file glTF. È utilizzato solo quando il "
+"tipo di forma è \"hull\" (hull convesso) o \"trimesh\" (trimesh concavo)."
+
 msgid ""
 "The radius of the shape, in meters. This is only used when the shape type is "
 "\"capsule\", \"cylinder\", or \"sphere\". This value should not be negative."
@@ -52652,6 +65388,43 @@ msgstr ""
 "forma è \"box\" e rappresenta il \"diametro\" del riquadro. Questo valore non "
 "deve essere negativo."
 
+msgid ""
+"Returns a [Dictionary] that maps skeleton bone indices to the indices of glTF "
+"nodes. This property is unused during import, and only set during export. In "
+"a glTF file, a bone is a node, so Godot converts skeleton bones to glTF nodes."
+msgstr ""
+"Restituisce un [Dictionary] che mappa gli indici delle ossa di uno scheletro "
+"agli indici dei nodi glTF. Questa proprietà non è utilizzata durante "
+"l'importazione ed è impostata solo durante l'esportazione. In un file glTF, "
+"un osso è un nodo, quindi Godot converte le ossa di uno scheletro in nodi "
+"glTF."
+
+msgid ""
+"Sets a [Dictionary] that maps skeleton bone indices to the indices of glTF "
+"nodes. This property is unused during import, and only set during export. In "
+"a glTF file, a bone is a node, so Godot converts skeleton bones to glTF nodes."
+msgstr ""
+"Imposta un [Dictionary] che mappa gli indici delle ossa di uno scheletro agli "
+"indici dei nodi glTF. Questa proprietà non è utilizzata durante "
+"l'importazione ed è impostata solo durante l'esportazione. In un file glTF, "
+"un osso è un nodo, quindi Godot converte le ossa di uno scheletro in nodi "
+"glTF."
+
+msgid "Archived glTF extension for specular/glossy materials."
+msgstr "Estensione glTF archiviata per materiali speculari/lucidi."
+
+msgid ""
+"KHR_materials_pbrSpecularGlossiness is an archived glTF extension. This means "
+"that it is deprecated and not recommended for new files. However, it is still "
+"supported for loading old files."
+msgstr ""
+"KHR_materials_pbrSpecularGlossiness è un'estensione glTF archiviata. Ciò "
+"significa che è deprecata e non consigliata per i nuovi file. Tuttavia, è "
+"ancora supportata per il caricamento di vecchi file."
+
+msgid "KHR_materials_pbrSpecularGlossiness glTF extension spec"
+msgstr "Specifiche sull'estensione glTF KHR_materials_pbrSpecularGlossiness"
+
 msgid "The reflected diffuse factor of the material."
 msgstr "Il fattore di diffusione riflessa del materiale."
 
@@ -52667,6 +65440,133 @@ msgstr "La texture con lucentezza speculare."
 msgid "The specular RGB color of the material. The alpha channel is unused."
 msgstr "Il colore RGB speculare del materiale. Il canale alfa non è utilizzato."
 
+msgid "Represents all data of a glTF file."
+msgstr "Rappresenta tutti i dati di un file glTF."
+
+msgid ""
+"Contains all nodes and resources of a glTF file. This is used by "
+"[GLTFDocument] as data storage, which allows [GLTFDocument] and all "
+"[GLTFDocumentExtension] classes to remain stateless.\n"
+"GLTFState can be populated by [GLTFDocument] reading a file or by converting "
+"a Godot scene. Then the data can either be used to create a Godot scene or "
+"save to a glTF file. The code that converts to/from a Godot scene can be "
+"intercepted at arbitrary points by [GLTFDocumentExtension] classes. This "
+"allows for custom data to be stored in the glTF file or for custom data to be "
+"converted to/from Godot nodes."
+msgstr ""
+"Contiene tutti i nodi e le risorse di un file glTF. Questo è utilizzato da "
+"[GLTFDocument] come archivio dati, che consente a [GLTFDocument] e a tutte le "
+"classi [GLTFDocumentExtension] di rimanere stateless.\n"
+"GLTFState può essere popolato da [GLTFDocument] leggendo un file o "
+"convertendo una scena di Godot. Successivamente, è possibile utilizzare i "
+"dati per creare una scena di Godot o salvarli in un file glTF. Il codice che "
+"converte in/da una scena di Godot può essere intercettato in punti arbitrari "
+"dalle classi [GLTFDocumentExtension]. Ciò consente di memorizzare dati "
+"personalizzati nel file glTF o di convertire dati personalizzati in/da nodi "
+"di Godot."
+
+msgid "glTF asset header schema"
+msgstr "Schema dell'intestazione delle risorse glTF"
+
+msgid ""
+"Appends an extension to the list of extensions used by this glTF file during "
+"serialization. If [param required] is [code]true[/code], the extension will "
+"also be added to the list of required extensions. Do not run this in [method "
+"GLTFDocumentExtension._export_post], as that stage is too late to add "
+"extensions. The final list is sorted alphabetically."
+msgstr ""
+"Aggiunge un'estensione alla lista delle estensioni utilizzate da questo file "
+"glTF durante la serializzazione. Se [param required] è [code]true[/code], "
+"l'estensione sarà aggiunta anche alla lista delle estensioni obbligatorie. "
+"Non eseguirlo in [method GLTFDocumentExtension._export_post], poiché durante "
+"questa fase è troppo tardi per aggiungere estensioni. La lista finale è "
+"ordinata alfabeticamente."
+
+msgid ""
+"Appends the given byte array data to the buffers and creates a "
+"[GLTFBufferView] for it. The index of the destination [GLTFBufferView] is "
+"returned. If [param deduplication] is [code]true[/code], the buffers will "
+"first be searched for duplicate data, otherwise new bytes will always be "
+"appended."
+msgstr ""
+"Aggiunge i dati dell'array di byte specificato ai buffer e crea un "
+"[GLTFBufferView] per esso. Viene restituito l'indice della [GLTFBufferView] "
+"di destinazione. Se [param deduplication] è [code]true[/code], i buffer "
+"saranno prima analizzati per dati duplicati, altrimenti saranno sempre "
+"aggiunti nuovi byte."
+
+msgid ""
+"Gets additional arbitrary data in this [GLTFState] instance. This can be used "
+"to keep per-file state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The argument should be the [GLTFDocumentExtension] name (does not have to "
+"match the extension name in the glTF file), and the return value can be "
+"anything you set. If nothing was set, the return value is [code]null[/code]."
+msgstr ""
+"Ottiene ulteriori dati arbitrari in questa istanza [GLTFState]. Può essere "
+"utilizzato per mantenere i dati di stato per ogni file nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"L'argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non deve "
+"corrispondere al nome dell'estensione nel file glTF) e il valore restituito "
+"può essere qualsiasi cosa tu imposti. Se niente è stato impostato, il valore "
+"restituito è [code]null[/code]."
+
+msgid ""
+"Returns the [AnimationPlayer] node with the given index. These nodes are only "
+"used during the export process when converting Godot [AnimationPlayer] nodes "
+"to glTF animations."
+msgstr ""
+"Restituisce il nodo [AnimationPlayer] con l'indice specificato. Questi nodi "
+"sono utilizzati solo durante il processo di esportazione quando si convertono "
+"i nodi [AnimationPlayer] di Godot in animazioni glTF."
+
+msgid ""
+"Returns the number of [AnimationPlayer] nodes in this [GLTFState]. These "
+"nodes are only used during the export process when converting Godot "
+"[AnimationPlayer] nodes to glTF animations."
+msgstr ""
+"Restituisce il numero di nodi [AnimationPlayer] in questo [GLTFState]. Questi "
+"nodi sono utilizzati solo durante il processo di esportazione quando si "
+"convertono i nodi [AnimationPlayer] di Godot in animazioni glTF."
+
+msgid ""
+"Returns an array of all [GLTFAnimation]s in the glTF file. When importing, "
+"these will be generated as animations in an [AnimationPlayer] node. When "
+"exporting, these will be generated from Godot [AnimationPlayer] nodes."
+msgstr ""
+"Restituisce un array di tutti i [GLTFAnimation] nel file glTF. Durante "
+"l'importazione, questi saranno generati come animazioni in un nodo "
+"[AnimationPlayer]. Durante l'esportazione, questi saranno generati dai nodi "
+"[AnimationPlayer] di Godot."
+
+msgid ""
+"Returns an array of all [GLTFCamera]s in the glTF file. These are the cameras "
+"that the [member GLTFNode.camera] index refers to."
+msgstr ""
+"Restituisce un array di tutte le [GLTFCamera] nel file glTF. Queste sono le "
+"telecamere a cui fa riferimento l'indice [member GLTFNode.camera]."
+
+msgid ""
+"Gets the images of the glTF file as an array of [Texture2D]s. These are the "
+"images that the [member GLTFTexture.src_image] index refers to."
+msgstr ""
+"Ottiene le immagini del file glTF come un array di [Texture2D]. Queste sono "
+"le immagini a cui fa riferimento l'indice [member GLTFTexture.src_image]."
+
+msgid ""
+"Returns an array of all [GLTFLight]s in the glTF file. These are the lights "
+"that the [member GLTFNode.light] index refers to."
+msgstr ""
+"Restituisce un array di tutte le [GLTFLight] nel file glTF. Queste sono le "
+"luci a cui fa riferimento l'indice [member GLTFNode.light]."
+
+msgid ""
+"Returns an array of all [GLTFMesh]es in the glTF file. These are the meshes "
+"that the [member GLTFNode.mesh] index refers to."
+msgstr ""
+"Restituisce un array di tutte le [GLTFMesh] nel file glTF. Queste sono le "
+"mesh a cui fa riferimento l'indice [member GLTFNode.mesh]."
+
 msgid ""
 "Returns the index of the [GLTFNode] corresponding to this Godot scene node. "
 "This is the inverse of [method get_scene_node]. Useful during the export "
@@ -52683,6 +65583,17 @@ msgstr ""
 "non c'è un indice [GLTFNode] per questo nodo di scena, viene restituito "
 "[code]-1[/code]."
 
+msgid ""
+"Returns an array of all [GLTFNode]s in the glTF file. These are the nodes "
+"that [member GLTFNode.children] and [member root_nodes] refer to. This "
+"includes nodes that may not be generated in the Godot scene, or nodes that "
+"may generate multiple Godot scene nodes."
+msgstr ""
+"Restituisce un array di tutti i [GLTFNode] nel file glTF. Questi sono i nodi "
+"a cui fanno riferimento [member GLTFNode.children] e [member root_nodes]. Ciò "
+"include i nodi che potrebbero non essere generati nella scena di Godot o i "
+"nodi che potrebbero generare più nodi di scena di Godot."
+
 msgid ""
 "Returns the Godot scene node that corresponds to the same index as the "
 "[GLTFNode] it was generated from. This is the inverse of [method "
@@ -52699,6 +65610,27 @@ msgstr ""
 "c'è alcun nodo di scena per questo indice di [GLTFNode], viene restituito "
 "[code]null[/code]."
 
+msgid ""
+"Returns an array of all [GLTFSkeleton]s in the glTF file. These are the "
+"skeletons that the [member GLTFNode.skeleton] index refers to."
+msgstr ""
+"Restituisce un array di tutti i [GLTFSkeleton] nel file glTF. Questi sono gli "
+"scheletri a cui fa riferimento l'indice [member GLTFNode.skeleton]."
+
+msgid ""
+"Returns an array of all [GLTFSkin]s in the glTF file. These are the skins "
+"that the [member GLTFNode.skin] index refers to."
+msgstr ""
+"Restituisce un array di tutte le [GLTFSkin] nel file glTF. Queste sono le "
+"skin a cui fa riferimento l'indice [member GLTFNode.skin]."
+
+msgid ""
+"Retrieves the array of texture samplers that are used by the textures "
+"contained in the glTF."
+msgstr ""
+"Recupera l'array dei campionatori di texture utilizzati dalle texture "
+"contenute nel glTF."
+
 msgid ""
 "Returns an array of unique animation names. This is only used during the "
 "import process."
@@ -52713,6 +65645,21 @@ msgstr ""
 "Restituisce un array di nomi univoci di nodi. È utilizzato sia nel processo "
 "di importazione che in quello di esportazione."
 
+msgid ""
+"Sets additional arbitrary data in this [GLTFState] instance. This can be used "
+"to keep per-file state data in [GLTFDocumentExtension] classes, which is "
+"important because they are stateless.\n"
+"The first argument should be the [GLTFDocumentExtension] name (does not have "
+"to match the extension name in the glTF file), and the second argument can be "
+"anything you want."
+msgstr ""
+"Imposta ulteriori dati arbitrari in questa istanza [GLTFState]. Può essere "
+"utilizzato per mantenere i dati di stato per ogni file nelle classi "
+"[GLTFDocumentExtension], il che è importante perché sono stateless.\n"
+"Il primo argomento dovrebbe essere il nome del [GLTFDocumentExtension] (non "
+"deve corrispondere al nome dell'estensione nel file glTF) e il secondo "
+"argomento può essere qualsiasi cosa tu voglia."
+
 msgid ""
 "Sets the [GLTFAnimation]s in the state. When importing, these will be "
 "generated as animations in an [AnimationPlayer] node. When exporting, these "
@@ -52777,6 +65724,13 @@ msgstr ""
 "Imposta le [GLTFSkin] nello stato. Queste sono le skin a cui fa riferimento "
 "l'indice [member GLTFNode.skin]."
 
+msgid ""
+"Sets the array of texture samplers that are used by the textures contained in "
+"the glTF."
+msgstr ""
+"Imposta l'array dei campionatori di texture utilizzati dalle texture "
+"contenute nel glTF."
+
 msgid ""
 "Sets the unique animation names in the state. This is only used during the "
 "import process."
@@ -52795,13 +65749,73 @@ msgid "The baking fps of the animation for either import or export."
 msgstr ""
 "Gli FPS di elaborazione dell'animazione per l'importazione o l'esportazione."
 
+msgid ""
+"The folder path associated with this glTF data. This is used to find other "
+"files the glTF file references, like images or binary buffers. This will be "
+"set during import when appending from a file, and will be set during export "
+"when writing to a file."
+msgstr ""
+"Il percorso della cartella associato a questi dati glTF. È utilizzato per "
+"trovare altri file a cui fa riferimento il file glTF, come immagini o buffer "
+"binari. Sarà impostato durante l'importazione quando si aggiunge da un file e "
+"sarà impostato durante l'esportazione quando si scrive su un file."
+
+msgid ""
+"The copyright string in the asset header of the glTF file. This is set during "
+"import if present and export if non-empty. See the glTF asset header "
+"documentation for more information."
+msgstr ""
+"La stringa del copyright nell'intestazione dei contenuti del file glTF. "
+"Questa è impostata durante l'importazione se presente e durante "
+"l'esportazione se non è vuota. Consulta la documentazione dell'intestazione "
+"dei contenuti glTF per maggiori informazioni."
+
+msgid ""
+"The file name associated with this glTF data. If it ends with [code].gltf[/"
+"code], this is text-based glTF, otherwise this is binary GLB. This will be "
+"set during import when appending from a file, and will be set during export "
+"when writing to a file. If writing to a buffer, this will be an empty string."
+msgstr ""
+"Il nome del file associato a questi dati glTF. Se termina con [code].gltf[/"
+"code], questo è un glTF basato su testo, altrimenti è GLB binario. Sarà "
+"impostato durante l'importazione quando si aggiunge da un file e durante "
+"l'esportazione quando si scrive su un file. Se si scrive su un buffer, sarà "
+"una stringa vuota."
+
 msgid "The binary buffer attached to a .glb file."
 msgstr "Il buffer binario allegato a un file .glb."
 
+msgid ""
+"If [code]true[/code], forces all GLTFNodes in the document to be bones of a "
+"single [Skeleton3D] Godot node."
+msgstr ""
+"Se [code]true[/code], forza tutti i GLTFNode nel documento a essere ossa di "
+"un singolo nodo [Skeleton3D] di Godot."
+
 msgid "The original raw JSON document corresponding to this GLTFState."
 msgstr ""
 "Il documento JSON originale non elaborato corrispondente a questo GLTFState."
 
+msgid ""
+"The root nodes of the glTF file. Typically, a glTF file will only have one "
+"scene, and therefore one root node. However, a glTF file may have multiple "
+"scenes and therefore multiple root nodes, which will be generated as siblings "
+"of each other and as children of the root node of the generated Godot scene."
+msgstr ""
+"I nodi radice del file glTF. In genere, un file glTF avrà solo una scena e "
+"quindi un solo nodo radice. Tuttavia, un file glTF può avere più scene e "
+"quindi più nodi radice, che saranno generati come fratelli l'uno dell'altro e "
+"come figli del nodo radice della scena generata di Godot."
+
+msgid ""
+"The name of the scene. When importing, if not specified, this will be the "
+"file name. When exporting, if specified, the scene name will be saved to the "
+"glTF file."
+msgstr ""
+"Il nome della scena. Quando si importa, se non specificato, questo sarà il "
+"nome del file. Quando si esporta, se specificato, il nome della scena sarà "
+"salvato nel file glTF."
+
 msgid "Discards all embedded textures and uses untextured materials."
 msgstr "Scarta tutte le texture incorporate e utilizza materiali senza texture."
 
@@ -52824,6 +65838,9 @@ msgstr ""
 "Incorpora texture compresse senza perdita di dati nella scena generata, il "
 "che corrisponde al comportamento in passato."
 
+msgid "GLTFTexture represents a texture in a glTF file."
+msgstr "GLTFTexture rappresenta una texture in un file glTF."
+
 msgid ""
 "ID of the texture sampler to use when sampling the image. If -1, then the "
 "default texture sampler is used (linear filtering, and repeat wrapping in "
@@ -52840,6 +65857,19 @@ msgstr ""
 "L'indice dell'immagine associata a questa texture, vedi [method GLTFState."
 "get_images]. Se -1, questa texture non ha un'immagine assegnata."
 
+msgid "Represents a glTF texture sampler"
+msgstr "Rappresenta un campionatore di texture glTF"
+
+msgid ""
+"Represents a texture sampler as defined by the base glTF spec. Texture "
+"samplers in glTF specify how to sample data from the texture's base image, "
+"when rendering the texture on an object."
+msgstr ""
+"Rappresenta un campionatore di texture come definito dalle specificazioni "
+"glTF di base. I campionatori di texture in glTF definiscono come campionare i "
+"dati dall'immagine base della texture, quando si renderizza la texture su un "
+"oggetto."
+
 msgid ""
 "Texture's magnification filter, used when texture appears larger on screen "
 "than the source image."
@@ -52912,6 +65942,42 @@ msgstr ""
 "Imposta le proprietà di questo nodo in modo che corrispondano a un dato nodo "
 "[CPUParticles2D]."
 
+msgid ""
+"Emits a single particle. Whether [param xform], [param velocity], [param "
+"color] and [param custom] are applied depends on the value of [param flags]. "
+"See [enum EmitFlags].\n"
+"The default ParticleProcessMaterial will overwrite [param color] and use the "
+"contents of [param custom] as [code](rotation, age, animation, lifetime)[/"
+"code].\n"
+"[b]Note:[/b] [method emit_particle] is only supported on the Forward+ and "
+"Mobile rendering methods, not Compatibility."
+msgstr ""
+"Emette una singola particella. L'applicazione della trasformazione ([param "
+"xform]), la velocità ([param speed]), il colore ([param color]) e [param "
+"custom] dipende dal valore di [param flags]. Vedi [enum EmitFlags].\n"
+"Il ParticleProcessMaterial predefinito sovrascriverà [param color] e "
+"utilizzerà il contenuto di [param custom] come [code](rotazione, tempo "
+"iniziale, animazione, tempo di vita)[/code].\n"
+"[b]Nota:[/b] [method emit_particle] è supportato solo sui metodi di rendering "
+"Forward+ e Mobile, non su Compatibilità."
+
+msgid ""
+"Restarts the particle emission cycle, clearing existing particles. To avoid "
+"particles vanishing from the viewport, wait for the [signal finished] signal "
+"before calling.\n"
+"[b]Note:[/b] The [signal finished] signal is only emitted by [member "
+"one_shot] emitters.\n"
+"If [param keep_seed] is [code]true[/code], the current random seed will be "
+"preserved. Useful for seeking and playback."
+msgstr ""
+"Riavvia il ciclo di emissione delle particelle, eliminando le particelle "
+"esistenti. Per evitare che le particelle scompaiano dalla viewport, attendi "
+"il segnale [signal finished] prima di chiamare questo metodo.\n"
+"[b]Nota:[/b] Il segnale [signal finished] viene emesso solo dagli emettitori "
+"con [member one_shot] abilitato.\n"
+"Se [param keep_seed] è [code]true[/code], il seed casuale attuale verrà "
+"conservato. Utile per la ricerca e la riproduzione."
+
 msgid ""
 "The number of particles to emit in one emission cycle. The effective emission "
 "rate is [code](amount * amount_ratio) / lifetime[/code] particles per second. "
@@ -53151,6 +66217,26 @@ msgstr ""
 "tramite codice o con lo strumento dell'editor [b]Particelle → Genera "
 "rettangolo di visibilità[/b]."
 
+msgid ""
+"Emitted when all active particles have finished processing. To immediately "
+"restart the emission cycle, call [method restart].\n"
+"This signal is never emitted when [member one_shot] is disabled, as particles "
+"will be emitted and processed continuously.\n"
+"[b]Note:[/b] For [member one_shot] emitters, due to the particles being "
+"computed on the GPU, there may be a short period after receiving the signal "
+"during which setting [member emitting] to [code]true[/code] will not restart "
+"the emission cycle. This delay is avoided by instead calling [method restart]."
+msgstr ""
+"Emesso quando tutte le particelle attive hanno terminato l'elaborazione. Per "
+"riavviare immediatamente il ciclo di emissione, chiama [method restart].\n"
+"Questo segnale non è mai emesso quando [member one_shot] è disabilitato, "
+"poiché le particelle verranno emesse ed elaborate continuamente.\n"
+"[b]Nota:[/b] Per gli emettitori con [member one_shot] abilitato, poiché le "
+"particelle vengono elaborate sulla GPU, potrebbe esserci un breve periodo "
+"dopo la ricezione del segnale durante il quale l'impostazione di [member "
+"emitting] su [code]true[/code] non riavvierà il ciclo di emissione. Questo "
+"ritardo è evitato chiamando invece [method restart]."
+
 msgid ""
 "Particles are drawn in reverse order of remaining lifetime. In other words, "
 "the particle with the lowest lifetime is drawn at the front."
@@ -53617,6 +66703,37 @@ msgstr ""
 "risolto impostando [member GPUParticles3D.fixed_fps] su [code]0[/code] o su "
 "un valore che corrisponda o superi il frame rate di destinazione."
 
+msgid ""
+"The particle rendering layers ([member VisualInstance3D.layers]) that will be "
+"affected by the collision shape. By default, all particles that have [member "
+"ParticleProcessMaterial.collision_mode] set to [constant "
+"ParticleProcessMaterial.COLLISION_RIGID] or [constant ParticleProcessMaterial."
+"COLLISION_HIDE_ON_CONTACT] will be affected by a collision shape.\n"
+"After configuring particle nodes accordingly, specific layers can be "
+"unchecked to prevent certain particles from being affected by colliders. For "
+"example, this can be used if you're using a collider as part of a spell "
+"effect but don't want the collider to affect unrelated weather particles at "
+"the same position.\n"
+"Particle collision can also be disabled on a per-process material basis by "
+"setting [member ParticleProcessMaterial.collision_mode] on the "
+"[GPUParticles3D] node."
+msgstr ""
+"Gli strati di rendering delle particelle ([member VisualInstance3D.layers]) "
+"che saranno influenzate dalla forma di collisione. Per impostazione "
+"predefinita, tutte le particelle che hanno [member ParticleProcessMaterial."
+"collision_mode] impostato su [constant ParticleProcessMaterial."
+"COLLISION_RIGID] o [constant ParticleProcessMaterial."
+"COLLISION_HIDE_ON_CONTACT] saranno influenzate da una forma di collisione.\n"
+"Dopo aver configurato i nodi delle particelle adeguatamente, è possibile "
+"deselezionare strati specifici per impedire che determinate particelle siano "
+"influenzate dai collisori. Ad esempio, questo può essere utilizzato se si "
+"utilizza un collisore come parte di un effetto magico ma non si desidera che "
+"il collisore influenzi particelle del meteo non correlate nella stessa "
+"posizione.\n"
+"La collisione delle particelle può anche essere disabilitata per ogni "
+"materiale di processo impostando [member ParticleProcessMaterial."
+"collision_mode] sul nodo [GPUParticles3D]."
+
 msgid ""
 "A box-shaped 3D particle collision shape affecting [GPUParticles3D] nodes."
 msgstr ""
@@ -53695,6 +66812,24 @@ msgstr ""
 "[b]Nota:[/b] La collisione delle particelle influenza solo i "
 "[GPUParticles3D], non i [CPUParticles3D]."
 
+msgid ""
+"Returns [code]true[/code] if the specified layer of the [member "
+"heightfield_mask] is enabled, given a [param layer_number] between [code]1[/"
+"code] and [code]20[/code], inclusive."
+msgstr ""
+"Restituisce [code]true[/code] se lo strato specificato di [member "
+"heightfield_mask] è abilitato, dato un [param layer_number] compreso tra "
+"[code]1[/code] e [code]20[/code], inclusivo."
+
+msgid ""
+"Based on [param value], enables or disables the specified layer in the "
+"[member heightfield_mask], given a [param layer_number] between [code]1[/"
+"code] and [code]20[/code], inclusive."
+msgstr ""
+"In base a [param value], abilita o disabilita lo strato specificato in "
+"[member heightfield_mask], dato un [param layer_number] compreso tra [code]1[/"
+"code] e [code]20[/code]."
+
 msgid ""
 "If [code]true[/code], the [GPUParticlesCollisionHeightField3D] will follow "
 "the current camera in global space. The [GPUParticlesCollisionHeightField3D] "
@@ -53711,6 +66846,34 @@ msgstr ""
 "si muove. Considera di abbassare [member resolution] per migliorare le "
 "prestazioni se [member follow_camera_enabled] è [code]true[/code]."
 
+msgid ""
+"The visual layers to account for when updating the heightmap. Only "
+"[MeshInstance3D]s whose [member VisualInstance3D.layers] match with this "
+"[member heightfield_mask] will be included in the heightmap collision update. "
+"By default, all 20 user-visible layers are taken into account for updating "
+"the heightmap collision.\n"
+"[b]Note:[/b] Since the [member heightfield_mask] allows for 32 layers to be "
+"stored in total, there are an additional 12 layers that are only used "
+"internally by the engine and aren't exposed in the editor. Setting [member "
+"heightfield_mask] using a script allows you to toggle those reserved layers, "
+"which can be useful for editor plugins.\n"
+"To adjust [member heightfield_mask] more easily using a script, use [method "
+"get_heightfield_mask_value] and [method set_heightfield_mask_value]."
+msgstr ""
+"Gli strati visuali da considerare quando si aggiorna la heightmap. Solo i "
+"[MeshInstance3D] i cui [member VisualInstance3D.layers] corrispondono a "
+"questa [member heightfield_mask] saranno inclusi nell'aggiornamento della "
+"collisione della heightmap. Per impostazione predefinita, sono considerati "
+"tutti i 20 strati visibili all'utente per aggiornare la collisione della "
+"heightmap.\n"
+"[b]Nota:[/b] Poiché [member heightfield_mask] consente di memorizzare 32 "
+"strati in totale, ci sono altri 12 strati che sono utilizzati solo "
+"internamente dal motore e non sono esposti nell'editor. Impostare [member "
+"cull_mask] tramite uno script consente di attivare o disattivare i livelli "
+"riservati, il che può essere utile per le estensioni dell'editor.\n"
+"Per regolare [member heightfield_mask] più facilmente tramite uno script, usa "
+"[method get_heightfield_mask_value] e [method set_heightfield_mask_value]."
+
 msgid ""
 "Higher resolutions can represent small details more accurately in large "
 "scenes, at the cost of lower performance. If [member update_mode] is "
@@ -54285,6 +67448,81 @@ msgstr ""
 "Metodo virtuale che può essere sovrascritto per personalizzare il modo in cui "
 "vengono disegnate le connessioni."
 
+msgid ""
+"Returns whether the [param mouse_position] is in the input hot zone.\n"
+"By default, a hot zone is a [Rect2] positioned such that its center is at "
+"[param in_node].[method GraphNode.get_input_port_position]([param in_port]) "
+"(For output's case, call [method GraphNode.get_output_port_position] "
+"instead). The hot zone's width is twice the Theme Property "
+"[code]port_grab_distance_horizontal[/code], and its height is twice the "
+"[code]port_grab_distance_vertical[/code].\n"
+"Below is a sample code to help get started:\n"
+"[codeblock]\n"
+"func _is_in_input_hotzone(in_node, in_port, mouse_position):\n"
+"    var port_size = "
+"Vector2(get_theme_constant(\"port_grab_distance_horizontal\"), "
+"get_theme_constant(\"port_grab_distance_vertical\"))\n"
+"    var port_pos = in_node.get_position() + in_node."
+"get_input_port_position(in_port) - port_size / 2\n"
+"    var rect = Rect2(port_pos, port_size)\n"
+"\n"
+"    return rect.has_point(mouse_position)\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce se la posizione del mouse [param mouse_position] si trova nella "
+"zona calda d'ingresso.\n"
+"Per impostazione predefinita, una zona calda è un [Rect2] posizionato in modo "
+"tale che il suo centro sia in [param in_node].[method GraphNode."
+"get_input_port_position]([param in_port]) (per il caso dell'uscita, chiama "
+"invece [method GraphNode.get_output_port_position]). La larghezza della zona "
+"calda è il doppio della proprietà del tema "
+"[code]port_grab_distance_horizontal[/code] e la sua altezza è il doppio di "
+"[code]port_grab_distance_vertical[/code].\n"
+"Di seguito è riportato un codice di esempio per cominciare:\n"
+"[codeblock]\n"
+"func _is_in_input_hotzone(in_node, in_port, mouse_position):\n"
+"    var port_size = "
+"Vector2(get_theme_constant(\"port_grab_distance_horizontal\"), "
+"get_theme_constant(\"port_grab_distance_vertical\"))\n"
+"    var port_pos = in_node.get_position() + in_node."
+"get_input_port_position(in_port) - port_size / 2\n"
+"    var rect = Rect2(port_pos, port_size)\n"
+"\n"
+"    return rect.has_point(mouse_position)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns whether the [param mouse_position] is in the output hot zone. For "
+"more information on hot zones, see [method _is_in_input_hotzone].\n"
+"Below is a sample code to help get started:\n"
+"[codeblock]\n"
+"func _is_in_output_hotzone(in_node, in_port, mouse_position):\n"
+"    var port_size = "
+"Vector2(get_theme_constant(\"port_grab_distance_horizontal\"), "
+"get_theme_constant(\"port_grab_distance_vertical\"))\n"
+"    var port_pos = in_node.get_position() + in_node."
+"get_output_port_position(in_port) - port_size / 2\n"
+"    var rect = Rect2(port_pos, port_size)\n"
+"\n"
+"    return rect.has_point(mouse_position)\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce se la posizione del mouse [param mouse_position] si trova nella "
+"zona calda d'uscita. Per maggiori informazioni sulle zone calde, vedi [method "
+"_is_in_input_hotzone].\n"
+"Di seguito è riportato un codice di esempio per iniziare:\n"
+"[codeblock]\n"
+"func _is_in_output_hotzone(in_node, in_port, mouse_position):\n"
+"    var port_size = "
+"Vector2(get_theme_constant(\"port_grab_distance_horizontal\"), "
+"get_theme_constant(\"port_grab_distance_vertical\"))\n"
+"    var port_pos = in_node.get_position() + in_node."
+"get_output_port_position(in_port) - port_size / 2\n"
+"    var rect = Rect2(port_pos, port_size)\n"
+"\n"
+"    return rect.has_point(mouse_position)\n"
+"[/codeblock]"
+
 msgid ""
 "This virtual method can be used to insert additional error detection while "
 "the user is dragging a connection over a valid port.\n"
@@ -54376,6 +67614,20 @@ msgstr ""
 msgid "Removes all connections between nodes."
 msgstr "Rimuove tutte le connessioni tra i nodi."
 
+msgid ""
+"Create a connection between the [param from_port] of the [param from_node] "
+"[GraphNode] and the [param to_port] of the [param to_node] [GraphNode]. If "
+"the connection already exists, no connection is created.\n"
+"Connections with [param keep_alive] set to [code]false[/code] may be deleted "
+"automatically if invalid during a redraw."
+msgstr ""
+"Crea una connessione tra la porta [param from_port] del nodo [GraphNode] "
+"[param from_node] e la porta [param to_port] del [GraphNode] [param to_node]. "
+"Se la connessione esiste già, nessuna connessione viene creata.\n"
+"Le connessioni con [param keep_alive] impostato su [code]false[/code] "
+"potrebbero essere eliminate automaticamente se non valide durante un "
+"ridisegno."
+
 msgid ""
 "Detaches the [param element] [GraphElement] from the [GraphFrame] it is "
 "currently attached to."
@@ -54418,6 +67670,55 @@ msgstr ""
 "Restituisce un array di nomi dei nodi associati al [GraphFrame] con il nome "
 "specificato."
 
+msgid ""
+"Returns the closest connection to the given point in screen space. If no "
+"connection is found within [param max_distance] pixels, an empty [Dictionary] "
+"is returned.\n"
+"A connection is represented as a [Dictionary] in the form of:\n"
+"[codeblock]\n"
+"{\n"
+"    from_node: StringName,\n"
+"    from_port: int,\n"
+"    to_node: StringName,\n"
+"    to_port: int,\n"
+"    keep_alive: bool\n"
+"}\n"
+"[/codeblock]\n"
+"For example, getting a connection at a given mouse position can be achieved "
+"like this:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var connection = get_closest_connection_at_point(mouse_event.get_position())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce la connessione più vicina al punto specificato nello spazio dello "
+"schermo. Se nessuna connessione viene trovata entro [param max_distance] "
+"pixel, viene restituito un [Dictionary] vuoto.\n"
+"Una connessione è rappresentata in un [Dictionary] nella forma:\n"
+"[codeblock]\n"
+"{\n"
+"    from_node: StringName,\n"
+"    from_port: int,\n"
+"    to_node: StringName,\n"
+"    to_port: int,\n"
+"    keep_alive: bool\n"
+"}\n"
+"[/codeblock]\n"
+"Ad esempio, è possibile ottenere una connessione a una determinata posizione "
+"del mouse in questo modo:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var connection = get_closest_connection_at_point(mouse_event.get_position())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the number of connections from [param from_port] of [param from_node]."
+msgstr ""
+"Restituisce il numero di connessioni dalla porta [param from_port] del nodo "
+"[param from_node]."
+
 msgid ""
 "Returns the points which would make up a connection between [param from_node] "
 "and [param to_node]."
@@ -54425,6 +67726,33 @@ msgstr ""
 "Restituisce i punti che comporrebbero una connessione tra il nodo [param "
 "from_node] e il nodo [param to_node]."
 
+msgid ""
+"Returns an [Array] containing the list of connections that intersect with the "
+"given [Rect2].\n"
+"A connection is represented as a [Dictionary] in the form of:\n"
+"[codeblock]\n"
+"{\n"
+"    from_node: StringName,\n"
+"    from_port: int,\n"
+"    to_node: StringName,\n"
+"    to_port: int,\n"
+"    keep_alive: bool\n"
+"}\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce un [Array] contenente la lista delle connessioni che intersecano "
+"il [Rect2] fornito.\n"
+"Una connessione è rappresentata in un [Dictionary] nella forma:\n"
+"[codeblock]\n"
+"{\n"
+"    from_node: StringName,\n"
+"    from_port: int,\n"
+"    to_node: StringName,\n"
+"    to_port: int,\n"
+"    keep_alive: bool\n"
+"}\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the [GraphFrame] that contains the [GraphElement] with the given name."
 msgstr ""
@@ -54659,6 +67987,15 @@ msgstr ""
 "([kbd]Ctrl + C[/kbd] per impostazione predefinita). In generale, questo "
 "segnale indica che i [GraphElement] selezionati devono essere copiati."
 
+msgid ""
+"Emitted when this [GraphEdit] captures a [code]ui_cut[/code] action "
+"([kbd]Ctrl + X[/kbd] by default). In general, this signal indicates that the "
+"selected [GraphElement]s should be cut."
+msgstr ""
+"Emesso quando questo [GraphEdit] cattura un'azione [code]ui_cut[/code] "
+"([kbd]Ctrl + X[/kbd] per impostazione predefinita). In generale, questo "
+"segnale indica che i [GraphElement] selezionati devono essere tagliati."
+
 msgid ""
 "Emitted when this [GraphEdit] captures a [code]ui_graph_delete[/code] action "
 "([kbd]Delete[/kbd] by default).\n"
@@ -55182,6 +68519,13 @@ msgstr ""
 "utilizzato per aggiungere controlli personalizzati alla barra del titolo, "
 "come pulsanti di opzioni o di chiusura."
 
+msgid ""
+"Returns [code]true[/code] if the background [StyleBox] of the slot with the "
+"given [param slot_index] is drawn."
+msgstr ""
+"Restituisce [code]true[/code] se la [StyleBox] di sfondo dello slot con "
+"l'indice [param slot_index] è disegnata."
+
 msgid ""
 "Returns [code]true[/code] if left (input) side of the slot with the given "
 "[param slot_index] is enabled."
@@ -55650,6 +68994,39 @@ msgstr ""
 "set_cell_item] per cancellare le celle (o rappresentare una cella vuota in "
 "[method get_cell_item])."
 
+msgid ""
+"GridMapEditorPlugin provides access to the [GridMap] editor functionality."
+msgstr ""
+"GridMapEditorPlugin fornisce accesso alla funzionalità dell'editor di "
+"[GridMap]."
+
+msgid "Deselects any currently selected cells."
+msgstr "Deseleziona qualsiasi cella attualmente selezionata."
+
+msgid "Returns the [GridMap] node currently edited by the grid map editor."
+msgstr ""
+"Restituisce il nodo [GridMap] attualmente modificato dall'editor di grid map."
+
+msgid "Returns an array of [Vector3i]s with the selected cells' coordinates."
+msgstr ""
+"Restituisce un array di [Vector3i] con le coordinate delle celle selezionate."
+
+msgid ""
+"Returns the cell coordinate bounds of the current selection. Use [method "
+"has_selection] to check if there is an active selection."
+msgstr ""
+"Restituisce le coordinate delle celle che delimitano la selezione attuale. "
+"Usa [method has_selection] per verificare se è presente una selezione attiva."
+
+msgid "Returns [code]true[/code] if there are selected cells."
+msgstr "Restituisce [code]true[/code] se sono presenti celle selezionate."
+
+msgid ""
+"Selects the cells inside the given bounds from [param begin] to [param end]."
+msgstr ""
+"Seleziona le celle all'interno dei limiti specificati da [param begin] a "
+"[param end]."
+
 msgid ""
 "A physics joint that restricts the movement of two 2D physics bodies to a "
 "fixed axis."
@@ -55837,6 +69214,52 @@ msgstr ""
 msgid "A 3D height map shape used for physics collision."
 msgstr "Una forma di mappa di altezza 3D utilizzata per la collisione fisica."
 
+msgid ""
+"A 3D heightmap shape, intended for use in physics. Usually used to provide a "
+"shape for a [CollisionShape3D]. This is useful for terrain, but it is limited "
+"as overhangs (such as caves) cannot be stored. Holes in a [HeightMapShape3D] "
+"are created by assigning very low values to points in the desired area.\n"
+"[b]Performance:[/b] [HeightMapShape3D] is faster to check collisions against "
+"than [ConcavePolygonShape3D], but it is significantly slower than primitive "
+"shapes like [BoxShape3D].\n"
+"A heightmap collision shape can also be build by using an [Image] reference:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var heightmap_texture = ResourceLoader.load(\"res://heightmap_image.exr\")\n"
+"var heightmap_image = heightmap_texture.get_image()\n"
+"heightmap_image.convert(Image.FORMAT_RF)\n"
+"\n"
+"var height_min = 0.0\n"
+"var height_max = 10.0\n"
+"\n"
+"update_map_data_from_image(heightmap_image, height_min, height_max)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Una forma heightmap 3D, progettata per l'uso in fisica. Solitamente "
+"utilizzata per fornire una forma per un [CollisionShape3D]. È utile per il "
+"terreno, ma è limitata in quanto le sporgenze (come le grotte) non possono "
+"essere memorizzate. I buchi in un [HeightMapShape3D] sono creati assegnando "
+"valori molto bassi ai punti nell'area desiderata.\n"
+"[b]Prestazioni:[/b] [HeightMapShape3D] è più veloce per verificare le "
+"collisioni rispetto a [ConcavePolygonShape3D], ma è notevolmente più lento di "
+"forme primitive come [BoxShape3D].\n"
+"Una forma di collisione heightmap può anche essere creata usando un [Image] "
+"di riferimento:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var heightmap_texture: Texture = ResourceLoader.load(\"res://heightmap_image."
+"exr\")\n"
+"var heightmap_image: Image = heightmap_texture.get_image()\n"
+"heightmap_image.convert(Image.FORMAT_RF)\n"
+"\n"
+"var height_min: float = 0.0\n"
+"var height_max: float = 10.0\n"
+"\n"
+"update_map_data_from_image(heightmap_image, height_min, height_max)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the largest height value found in [member map_data]. Recalculates "
 "only when [member map_data] changes."
@@ -55998,6 +69421,103 @@ msgstr ""
 msgid "Used to create an HMAC for a message using a key."
 msgstr "Utilizzato per creare un HMAC per un messaggio tramite una chiave."
 
+msgid ""
+"The HMACContext class is useful for advanced HMAC use cases, such as "
+"streaming the message as it supports creating the message over time rather "
+"than providing it all at once.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends Node\n"
+"var ctx = HMACContext.new()\n"
+"\n"
+"func _ready():\n"
+"    var key = \"supersecret\".to_utf8_buffer()\n"
+"    var err = ctx.start(HashingContext.HASH_SHA256, key)\n"
+"    assert(err == OK)\n"
+"    var msg1 = \"this is \".to_utf8_buffer()\n"
+"    var msg2 = \"super duper secret\".to_utf8_buffer()\n"
+"    err = ctx.update(msg1)\n"
+"    assert(err == OK)\n"
+"    err = ctx.update(msg2)\n"
+"    assert(err == OK)\n"
+"    var hmac = ctx.finish()\n"
+"    print(hmac.hex_encode())\n"
+"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"using System.Diagnostics;\n"
+"\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"    private HmacContext _ctx = new HmacContext();\n"
+"\n"
+"    public override void _Ready()\n"
+"    {\n"
+"        byte[] key = \"supersecret\".ToUtf8Buffer();\n"
+"        Error err = _ctx.Start(HashingContext.HashType.Sha256, key);\n"
+"        Debug.Assert(err == Error.Ok);\n"
+"        byte[] msg1 = \"this is \".ToUtf8Buffer();\n"
+"        byte[] msg2 = \"super duper secret\".ToUtf8Buffer();\n"
+"        err = _ctx.Update(msg1);\n"
+"        Debug.Assert(err == Error.Ok);\n"
+"        err = _ctx.Update(msg2);\n"
+"        Debug.Assert(err == Error.Ok);\n"
+"        byte[] hmac = _ctx.Finish();\n"
+"        GD.Print(hmac.HexEncode());\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"La classe HMACContext è utile per casi d'uso HMAC avanzati, come lo streaming "
+"del messaggio, poiché supporta la creazione del messaggio nel corso del tempo "
+"anziché fornirlo tutto in una volta.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends Node\n"
+"var ctx = HMACContext.new()\n"
+"\n"
+"func _ready():\n"
+"    var key = \"supersecret\".to_utf8_buffer()\n"
+"    var err = ctx.start(HashingContext.HASH_SHA256, key)\n"
+"    assert(err == OK)\n"
+"    var msg1 = \"this is \".to_utf8_buffer()\n"
+"    var msg2 = \"super duper secret\".to_utf8_buffer()\n"
+"    err = ctx.update(msg1)\n"
+"    assert(err == OK)\n"
+"    err = ctx.update(msg2)\n"
+"    assert(err == OK)\n"
+"    var hmac = ctx.finish()\n"
+"    print(hmac.hex_encode())\n"
+"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"using System.Diagnostics;\n"
+"\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"    private HmacContext _ctx = new HmacContext();\n"
+"\n"
+"    public override void _Ready()\n"
+"    {\n"
+"        byte[] key = \"supersecret\".ToUtf8Buffer();\n"
+"        Error err = _ctx.Start(HashingContext.HashType.Sha256, key);\n"
+"        Debug.Assert(err == Error.Ok);\n"
+"        byte[] msg1 = \"this is \".ToUtf8Buffer();\n"
+"        byte[] msg2 = \"super duper secret\".ToUtf8Buffer();\n"
+"        err = _ctx.Update(msg1);\n"
+"        Debug.Assert(err == Error.Ok);\n"
+"        err = _ctx.Update(msg2);\n"
+"        Debug.Assert(err == Error.Ok);\n"
+"        byte[] hmac = _ctx.Finish();\n"
+"        GD.Print(hmac.HexEncode());\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the resulting HMAC. If the HMAC failed, an empty [PackedByteArray] is "
 "returned."
@@ -56129,6 +69649,28 @@ msgstr "Restituisce il codice di stato della risposta HTTP."
 msgid "Returns the response headers."
 msgstr "Restituisce le intestazioni della risposta."
 
+msgid ""
+"Returns all response headers as a [Dictionary]. Each entry is composed by the "
+"header name, and a [String] containing the values separated by [code]\"; \"[/"
+"code]. The casing is kept the same as the headers were received.\n"
+"[codeblock]\n"
+"{\n"
+"    \"content-length\": 12,\n"
+"    \"Content-Type\": \"application/json; charset=UTF-8\",\n"
+"}\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce tutte le intestazioni della risposta come [Dictionary]. Ogni voce "
+"è composta dal nome dell'intestazione e da una [String] contenente i valori "
+"separati da [code]\"; \"[/code]. Le maiuscole e le minuscole sono mantenute "
+"uguali a quelle delle intestazioni ricevute.\n"
+"[codeblock]\n"
+"{\n"
+"    \"content-length\": 12,\n"
+"    \"Content-Type\": \"application/json; charset=UTF-8\",\n"
+"}\n"
+"[/codeblock]"
+
 msgid ""
 "Returns a [enum Status] constant. Need to call [method poll] in order to get "
 "status updates."
@@ -56230,6 +69772,101 @@ msgstr ""
 msgid "Reads one chunk from the response."
 msgstr "Legge una parte della risposta."
 
+msgid ""
+"Sends a request to the connected host.\n"
+"The URL parameter is usually just the part after the host, so for "
+"[code]https://example.com/index.php[/code], it is [code]/index.php[/code]. "
+"When sending requests to an HTTP proxy server, it should be an absolute URL. "
+"For [constant HTTPClient.METHOD_OPTIONS] requests, [code]*[/code] is also "
+"allowed. For [constant HTTPClient.METHOD_CONNECT] requests, it should be the "
+"authority component ([code]host:port[/code]).\n"
+"Headers are HTTP request headers. For available HTTP methods, see [enum "
+"Method].\n"
+"To create a POST request with query strings to push to the server, do:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var fields = {\"username\" : \"user\", \"password\" : \"pass\"}\n"
+"var query_string = http_client.query_string_from_dict(fields)\n"
+"var headers = [\"Content-Type: application/x-www-form-urlencoded\", \"Content-"
+"Length: \" + str(query_string.length())]\n"
+"var result = http_client.request(http_client.METHOD_POST, \"/index.php\", "
+"headers, query_string)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var fields = new Godot.Collections.Dictionary { { \"username\", \"user\" }, "
+"{ \"password\", \"pass\" } };\n"
+"string queryString = new HttpClient().QueryStringFromDict(fields);\n"
+"string[] headers = [\"Content-Type: application/x-www-form-urlencoded\", $"
+"\"Content-Length: {queryString.Length}\"];\n"
+"var result = new HttpClient().Request(HttpClient.Method.Post, \"index.php\", "
+"headers, queryString);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] The [param body] parameter is ignored if [param method] is "
+"[constant HTTPClient.METHOD_GET]. This is because GET methods can't contain "
+"request data. As a workaround, you can pass request data as a query string in "
+"the URL. See [method String.uri_encode] for an example."
+msgstr ""
+"Invia una richiesta all'host connesso.\n"
+"Il parametro URL è solitamente solo la parte dopo l'host, quindi per "
+"[code]https://somehost.com/index.php[/code], è [code]/index.php[/code]. "
+"Quando si inviano richieste a un server proxy HTTP, dovrebbe essere un URL "
+"assoluto. Per le richieste [constant HTTPClient.METHOD_OPTIONS], è consentito "
+"anche [code]*[/code]. Per le richieste [constant HTTPClient.METHOD_CONNECT], "
+"dovrebbe essere il componente autorità ([code]host:port[/code]).\n"
+"Le intestazioni sono intestazioni di richiesta HTTP. Per i metodi HTTP "
+"disponibili, vedi [enum Method].\n"
+"Per creare una richiesta POST con stringhe di richiesta da inviare al server, "
+"usa:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var fields = {\"username\" : \"user\", \"password\" : \"pass\"}\n"
+"var query_string = http_client.query_string_from_dict(fields)\n"
+"var headers = [\"Content-Type: application/x-www-form-urlencoded\", \"Content-"
+"Length: \" + str(query_string.length())]\n"
+"var result = http_client.request(http_client.METHOD_POST, \"/index.php\", "
+"headers, query_string)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var fields = new Godot.Collections.Dictionary { { \"username\", \"user\" }, "
+"{ \"password\", \"pass\" } };\n"
+"string queryString = new HttpClient().QueryStringFromDict(fields);\n"
+"string[] headers = [\"Content-Type: application/x-www-form-urlencoded\", $"
+"\"Content-Length: {queryString.Length}\"];\n"
+"var result = new HttpClient().Request(HttpClient.Method.Post, \"index.php\", "
+"headers, queryString);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Il parametro [param body] viene ignorato se [param method] è "
+"[constant HTTPClient.METHOD_GET]. Questo perché i metodi GET non possono "
+"contenere dati di richiesta. Come alternativa, è possibile passare i dati di "
+"richiesta come stringa di richiesta nell'URL. Vedi [method String.uri_encode] "
+"per un esempio."
+
+msgid ""
+"Sends a raw request to the connected host.\n"
+"The URL parameter is usually just the part after the host, so for "
+"[code]https://example.com/index.php[/code], it is [code]/index.php[/code]. "
+"When sending requests to an HTTP proxy server, it should be an absolute URL. "
+"For [constant HTTPClient.METHOD_OPTIONS] requests, [code]*[/code] is also "
+"allowed. For [constant HTTPClient.METHOD_CONNECT] requests, it should be the "
+"authority component ([code]host:port[/code]).\n"
+"Headers are HTTP request headers. For available HTTP methods, see [enum "
+"Method].\n"
+"Sends the body data raw, as a byte array and does not encode it in any way."
+msgstr ""
+"Invia una richiesta grezza all'host connesso.\n"
+"Il parametro URL è solitamente solo la parte dopo l'host, quindi per "
+"[code]https://somehost.com/index.php[/code], è [code]/index.php[/code]. "
+"Quando si inviano richieste a un server proxy HTTP, dovrebbe essere un URL "
+"assoluto. Per le richieste [constant HTTPClient.METHOD_OPTIONS], è consentito "
+"anche [code]*[/code]. Per le richieste [constant HTTPClient.METHOD_CONNECT], "
+"dovrebbe essere il componente autoritativo ([code]host:port[/code]).\n"
+"Le intestazioni sono intestazioni di richiesta HTTP. Per i metodi HTTP "
+"disponibili, vedi [enum Method].\n"
+"Invia i dati del corpo grezzi, come array di byte e non li codifica in alcun "
+"modo."
+
 msgid ""
 "Sets the proxy server for HTTP requests.\n"
 "The proxy server is unset if [param host] is empty or [param port] is -1."
@@ -56399,6 +70036,29 @@ msgstr ""
 "server ha ricevuto e sta elaborando la richiesta, ma nessuna risposta è "
 "ancora disponibile."
 
+msgid ""
+"HTTP status code [code]200 OK[/code]. The request has succeeded. Default "
+"response for successful requests. Meaning varies depending on the request:\n"
+"- [constant METHOD_GET]: The resource has been fetched and is transmitted in "
+"the message body.\n"
+"- [constant METHOD_HEAD]: The entity headers are in the message body.\n"
+"- [constant METHOD_POST]: The resource describing the result of the action is "
+"transmitted in the message body.\n"
+"- [constant METHOD_TRACE]: The message body contains the request message as "
+"received by the server."
+msgstr ""
+"Codice di stato HTTP [code]200 OK[/code]. La richiesta è andata a buon fine. "
+"Risposta predefinita per le richieste riuscite. Il significato varia a "
+"seconda della richiesta:\n"
+"- [constant METHOD_GET]: La risorsa è stata recuperata ed è trasmessa nel "
+"corpo del messaggio.\n"
+"- [constant METHOD_HEAD]: Le intestazioni dell'ente si trovano nel corpo del "
+"messaggio.\n"
+"- [constant METHOD_POST]: La risorsa che descrive il risultato dell'azione è "
+"trasmessa nel corpo del messaggio.\n"
+"- [constant METHOD_TRACE]: Il corpo del messaggio contiene il messaggio di "
+"richiesta come ricevuto dal server."
+
 msgid ""
 "HTTP status code [code]201 Created[/code]. The request has succeeded and a "
 "new resource has been created as a result of it. This is typically the "
@@ -56957,6 +70617,355 @@ msgstr ""
 msgid "A node with the ability to send HTTP(S) requests."
 msgstr "Un nodo con la capacità di inviare richieste HTTP(S)."
 
+msgid ""
+"A node with the ability to send HTTP requests. Uses [HTTPClient] internally.\n"
+"Can be used to make HTTP requests, i.e. download or upload files or web "
+"content via HTTP.\n"
+"[b]Warning:[/b] See the notes and warnings on [HTTPClient] for limitations, "
+"especially regarding TLS security.\n"
+"[b]Note:[/b] When exporting to Android, make sure to enable the "
+"[code]INTERNET[/code] permission in the Android export preset before "
+"exporting the project or using one-click deploy. Otherwise, network "
+"communication of any kind will be blocked by Android.\n"
+"[b]Example:[/b] Contact a REST API and print one of its returned fields:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    # Create an HTTP request node and connect its completion signal.\n"
+"    var http_request = HTTPRequest.new()\n"
+"    add_child(http_request)\n"
+"    http_request.request_completed.connect(self._http_request_completed)\n"
+"\n"
+"    # Perform a GET request. The URL below returns JSON as of writing.\n"
+"    var error = http_request.request(\"https://httpbin.org/get\")\n"
+"    if error != OK:\n"
+"        push_error(\"An error occurred in the HTTP request.\")\n"
+"\n"
+"    # Perform a POST request. The URL below returns JSON as of writing.\n"
+"    # Note: Don't make simultaneous requests using a single HTTPRequest "
+"node.\n"
+"    # The snippet below is provided for reference only.\n"
+"    var body = JSON.new().stringify({\"name\": \"Godette\"})\n"
+"    error = http_request.request(\"https://httpbin.org/post\", [], HTTPClient."
+"METHOD_POST, body)\n"
+"    if error != OK:\n"
+"        push_error(\"An error occurred in the HTTP request.\")\n"
+"\n"
+"# Called when the HTTP request is completed.\n"
+"func _http_request_completed(result, response_code, headers, body):\n"
+"    var json = JSON.new()\n"
+"    json.parse(body.get_string_from_utf8())\n"
+"    var response = json.get_data()\n"
+"\n"
+"    # Will print the user agent string used by the HTTPRequest node (as "
+"recognized by httpbin.org).\n"
+"    print(response.headers[\"User-Agent\"])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Create an HTTP request node and connect its completion signal.\n"
+"    var httpRequest = new HttpRequest();\n"
+"    AddChild(httpRequest);\n"
+"    httpRequest.RequestCompleted += HttpRequestCompleted;\n"
+"\n"
+"    // Perform a GET request. The URL below returns JSON as of writing.\n"
+"    Error error = httpRequest.Request(\"https://httpbin.org/get\");\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"An error occurred in the HTTP request.\");\n"
+"    }\n"
+"\n"
+"    // Perform a POST request. The URL below returns JSON as of writing.\n"
+"    // Note: Don't make simultaneous requests using a single HTTPRequest "
+"node.\n"
+"    // The snippet below is provided for reference only.\n"
+"    string body = new Json().Stringify(new Godot.Collections.Dictionary\n"
+"    {\n"
+"        { \"name\", \"Godette\" }\n"
+"    });\n"
+"    error = httpRequest.Request(\"https://httpbin.org/post\", null, "
+"HttpClient.Method.Post, body);\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"An error occurred in the HTTP request.\");\n"
+"    }\n"
+"}\n"
+"\n"
+"// Called when the HTTP request is completed.\n"
+"private void HttpRequestCompleted(long result, long responseCode, string[] "
+"headers, byte[] body)\n"
+"{\n"
+"    var json = new Json();\n"
+"    json.Parse(body.GetStringFromUtf8());\n"
+"    var response = json.GetData().AsGodotDictionary();\n"
+"\n"
+"    // Will print the user agent string used by the HTTPRequest node (as "
+"recognized by httpbin.org).\n"
+"    GD.Print((response[\"headers\"].AsGodotDictionary())[\"User-Agent\"]);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Example:[/b] Load an image using [HTTPRequest] and display it:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    # Create an HTTP request node and connect its completion signal.\n"
+"    var http_request = HTTPRequest.new()\n"
+"    add_child(http_request)\n"
+"    http_request.request_completed.connect(self._http_request_completed)\n"
+"\n"
+"    # Perform the HTTP request. The URL below returns a PNG image as of "
+"writing.\n"
+"    var error = http_request.request(\"https://placehold.co/512\")\n"
+"    if error != OK:\n"
+"        push_error(\"An error occurred in the HTTP request.\")\n"
+"\n"
+"# Called when the HTTP request is completed.\n"
+"func _http_request_completed(result, response_code, headers, body):\n"
+"    if result != HTTPRequest.RESULT_SUCCESS:\n"
+"        push_error(\"Image couldn't be downloaded. Try a different image.\")\n"
+"\n"
+"    var image = Image.new()\n"
+"    var error = image.load_png_from_buffer(body)\n"
+"    if error != OK:\n"
+"        push_error(\"Couldn't load the image.\")\n"
+"\n"
+"    var texture = ImageTexture.create_from_image(image)\n"
+"\n"
+"    # Display the image in a TextureRect node.\n"
+"    var texture_rect = TextureRect.new()\n"
+"    add_child(texture_rect)\n"
+"    texture_rect.texture = texture\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Create an HTTP request node and connect its completion signal.\n"
+"    var httpRequest = new HttpRequest();\n"
+"    AddChild(httpRequest);\n"
+"    httpRequest.RequestCompleted += HttpRequestCompleted;\n"
+"\n"
+"    // Perform the HTTP request. The URL below returns a PNG image as of "
+"writing.\n"
+"    Error error = httpRequest.Request(\"https://placehold.co/512\");\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"An error occurred in the HTTP request.\");\n"
+"    }\n"
+"}\n"
+"\n"
+"// Called when the HTTP request is completed.\n"
+"private void HttpRequestCompleted(long result, long responseCode, string[] "
+"headers, byte[] body)\n"
+"{\n"
+"    if (result != (long)HttpRequest.Result.Success)\n"
+"    {\n"
+"        GD.PushError(\"Image couldn't be downloaded. Try a different image."
+"\");\n"
+"    }\n"
+"    var image = new Image();\n"
+"    Error error = image.LoadPngFromBuffer(body);\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"Couldn't load the image.\");\n"
+"    }\n"
+"\n"
+"    var texture = ImageTexture.CreateFromImage(image);\n"
+"\n"
+"    // Display the image in a TextureRect node.\n"
+"    var textureRect = new TextureRect();\n"
+"    AddChild(textureRect);\n"
+"    textureRect.Texture = texture;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] [HTTPRequest] nodes will automatically handle decompression of "
+"response bodies. A [code]Accept-Encoding[/code] header will be automatically "
+"added to each of your requests, unless one is already specified. Any response "
+"with a [code]Content-Encoding: gzip[/code] header will automatically be "
+"decompressed and delivered to you as uncompressed bytes."
+msgstr ""
+"Un nodo capace di inviare richieste HTTP. Utilizza [HTTPClient] "
+"internamente.\n"
+"Può essere utilizzato per effettuare richieste HTTP, ovvero scaricare o "
+"caricare file o contenuti Web tramite HTTP.\n"
+"[b]Attenzione:[/b] Consulta le note e gli avvertimenti su [HTTPClient] per le "
+"limitazioni, in particolare per quanto riguarda la sicurezza TLS.\n"
+"[b]Nota:[/b] Quando si esporta su Android, assicurarsi di abilitare "
+"l'autorizzazione [code]INTERNET[/code] nel modello di esportazione Android "
+"prima di esportare il progetto o di utilizzare la distribuzione con un clic. "
+"Altrimenti, qualsiasi tipo di comunicazione di rete sarà bloccata da "
+"Android.\n"
+"[b]Esempio:[/b] Contatta un'API REST e stampa uno dei sui campi restituiti:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    # Crea un nodo di richiesta HTTP e collega il suo segnale di "
+"completamento.\n"
+"    var http_request = HTTPRequest.new()\n"
+"    add_child(http_request)\n"
+"    http_request.request_completed.connect(self._http_request_completed)\n"
+"\n"
+"    # Effettua una richiesta GET. L'URL sottostante restituisce JSON al "
+"momento.\n"
+"    var error = http_request.request(\"https://httpbin.org/get\")\n"
+"    if error != OK:\n"
+"        push_error(\"An error occurred in the HTTP request.\")\n"
+"\n"
+"    # Effettua una richiesta POST. L'URL sottostante restituisce JSON al "
+"momento.\n"
+"    # Nota: non effettuare richieste simultanee utilizzando un singolo nodo "
+"HTTPRequest.\n"
+"    # Il pezzo di codice sottostante è fornito solo per riferimento.\n"
+"    var body = JSON.new().stringify({\"name\": \"Godette\"})\n"
+"    error = http_request.request(\"https://httpbin.org/post\", [], HTTPClient."
+"METHOD_POST, body)\n"
+"    if error != OK:\n"
+"        push_error(\"Si è verificato un errore nella richiesta HTTP.\")\n"
+"\n"
+"# Chiamato quando la richiesta HTTP è completata.\n"
+"func _http_request_completed(result, response_code, headers, body):\n"
+"    var json = JSON.new()\n"
+"    json.parse(body.get_string_from_utf8())\n"
+"    var response = json.get_data()\n"
+"\n"
+"    # Stamperà la stringa dell'agente utente utilizzata dal nodo HTTPRequest "
+"(come riconosciuto da httpbin.org).\n"
+"    print(response.headers[\"User-Agent\"])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Crea un nodo di richiesta HTTP e collega il suo segnale di "
+"completamento.\n"
+"    var httpRequest = new HttpRequest();\n"
+"    AddChild(httpRequest);\n"
+"    httpRequest.RequestCompleted += HttpRequestCompleted;\n"
+"\n"
+"    // Effettua una richiesta GET. L'URL sottostante restituisce JSON al "
+"momento.\n"
+"    Error error = httpRequest.Request(\"https://httpbin.org/get\");\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"Si è verificato un errore nella richiesta HTTP.\");\n"
+"    }\n"
+"\n"
+"    // Effettua una richiesta POST. L'URL sottostante restituisce JSON al "
+"momento.\n"
+"    // Nota: non effettuare richieste simultanee utilizzando un singolo nodo "
+"HTTPRequest.\n"
+"    // Il pezzo di codice sottostante è fornito solo per riferimento.\n"
+"    string body = new Json().Stringify(new Godot.Collections.Dictionary\n"
+"    {\n"
+"        { \"name\", \"Godette\" }\n"
+"    });\n"
+"    error = httpRequest.Request(\"https://httpbin.org/post\", null, "
+"HttpClient.Method.Post, body);\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"An error occurred in the HTTP request.\");\n"
+"    }\n"
+"}\n"
+"\n"
+"// Chiamato quando la richiesta HTTP è completata.\n"
+"private void HttpRequestCompleted(long result, long responseCode, string[] "
+"headers, byte[] body)\n"
+"{\n"
+"    var json = new Json();\n"
+"    json.Parse(body.GetStringFromUtf8());\n"
+"    var response = json.GetData().AsGodotDictionary();\n"
+"\n"
+"    // Stamperà la stringa dell'agente utente utilizzata dal nodo HTTPRequest "
+"(come riconosciuto da httpbin.org).\n"
+"    GD.Print((response[\"headers\"].AsGodotDictionary())[\"User-Agent\"]);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Esempio:[/b] Carica e visualizza un'immagine tramite [HTTPRequest]:\n"
+"[codeblocks]\n"
+"[gdscript][b]\n"
+"func _ready():\n"
+"    # Crea un nodo di richiesta HTTP e collega il suo segnale di "
+"completamento.\n"
+"    var http_request = HTTPRequest.new()\n"
+"    add_child(http_request)\n"
+"    http_request.request_completed.connect(self._http_request_completed)\n"
+"\n"
+"    # Effettua la richiesta HTTP. L'URL sottostante restituisce un'immagine "
+"PNG al momento.\n"
+"    var error = http_request.request(\"https://via.placeholder.com/512\")\n"
+"    if error != OK:\n"
+"        push_error(\"Si è verificato un errore nella richiesta HTTP.\")\n"
+"\n"
+"# Chiamato quando la richiesta HTTP è completata.\n"
+"func _http_request_completed(result, response_code, headers, body):\n"
+"    if result != HTTPRequest.RESULT_SUCCESS:\n"
+"        push_error(\"Impossibile scaricare l'immagine. Prova un'immagine "
+"diversa.\")\n"
+"\n"
+"    var image = Image.new()\n"
+"    var error = image.load_png_from_buffer(body)\n"
+"    if error != OK:\n"
+"        push_error(\"Impossibile caricare l'immagine.\")\n"
+"\n"
+"    var texture = ImageTexture.create_from_image(image)\n"
+"\n"
+"    # Visualizza l'immagine in un nodo TextureRect.\n"
+"    var texture_rect = TextureRect.new()\n"
+"    add_child(texture_rect)\n"
+"    texture_rect.texture = texture\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Crea un nodo di richiesta HTTP e collega il suo segnale di "
+"completamento.\n"
+"    var httpRequest = new HttpRequest();\n"
+"    AddChild(httpRequest);\n"
+"    httpRequest.RequestCompleted += HttpRequestCompleted;\n"
+"\n"
+"    // Effettua la richiesta HTTP. L'URL sottostante restituisce un'immagine "
+"PNG al momento.\n"
+"    Error error = httpRequest.Request(\"https://via.placeholder.com/512\");\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"Si è verificato un errore nella richiesta HTTP.\");\n"
+"    }\n"
+"}\n"
+"\n"
+"// Chiamato quando la richiesta HTTP è completata.\n"
+"private void HttpRequestCompleted(long result, long responseCode, string[] "
+"headers, byte[] body)\n"
+"{\n"
+"    if (result != (long)HttpRequest.Result.Success)\n"
+"    {\n"
+"        GD.PushError(\"Impossibile scaricare l'immagine. Prova un'immagine "
+"diversa.\");\n"
+"    }\n"
+"    var image = new Image();\n"
+"    Error error = image.LoadPngFromBuffer(body);\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"Impossibile caricare l'immagine.\");\n"
+"    }\n"
+"\n"
+"    var texture = ImageTexture.CreateFromImage(image);\n"
+"\n"
+"    // Visualizza l'immagine in un nodo TextureRect.\n"
+"    var textureRect = new TextureRect();\n"
+"    AddChild(textureRect);\n"
+"    textureRect.Texture = texture;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] I nodi [HTTPRequest] gestiranno automaticamente la "
+"decompressione dei corpi delle risposte. Un'intestazione [code]Accept-"
+"Encoding[/code] sarà aggiunta automaticamente a ciascuna delle tue richieste, "
+"a meno che non ne sia già stata specificata una. Qualsiasi risposta con "
+"un'intestazione [code]Content-Encoding: gzip[/code] sarà automaticamente "
+"decompressa e consegnata come byte non compressi."
+
 msgid "Making HTTP requests"
 msgstr "Effettuare richieste HTTP"
 
@@ -57262,6 +71271,24 @@ msgstr ""
 "ma possono avere formati diversi. [param src_rect] con dimensioni non "
 "positive viene trattato come vuoto."
 
+msgid ""
+"Copies [param src_rect] from [param src] image to this image at coordinates "
+"[param dst], clipped accordingly to both image bounds. This image and [param "
+"src] image [b]must[/b] have the same format. [param src_rect] with non-"
+"positive size is treated as empty.\n"
+"[b]Note:[/b] The alpha channel data in [param src] will overwrite the "
+"corresponding data in this image at the target position. To blend alpha "
+"channels, use [method blend_rect] instead."
+msgstr ""
+"Copia la regione [param src_rect] dall'immagine [param src] a questa immagine "
+"alle coordinate [param dst], ritagliata in base a entrambi i limiti delle "
+"immagini. Questa immagine e l'immagine [param src] [b]devono[/b] avere lo "
+"stesso formato. [param src_rect] con dimensioni non positive viene trattato "
+"come vuoto.\n"
+"[b]Nota:[/b] I dati del canale alfa in [param src] sovrascriveranno i dati "
+"corrispondenti in questa immagine nella posizione di destinazione. Per "
+"fondere i canali alfa, usa invece [method blend_rect]."
+
 msgid ""
 "Blits [param src_rect] area from [param src] image to this image at the "
 "coordinates given by [param dst], clipped accordingly to both image bounds. "
@@ -57795,6 +71822,40 @@ msgstr "Salva l'immagine come file PNG nel file nel percorso [param path]."
 msgid "Saves the image as a PNG file to a byte array."
 msgstr "Salva l'immagine come file PNG in un array di byte."
 
+msgid ""
+"Saves the image as a WebP (Web Picture) file to the file at [param path]. By "
+"default it will save lossless. If [param lossy] is [code]true[/code], the "
+"image will be saved lossy, using the [param quality] setting between "
+"[code]0.0[/code] and [code]1.0[/code] (inclusive). Lossless WebP offers more "
+"efficient compression than PNG.\n"
+"[b]Note:[/b] The WebP format is limited to a size of 16383×16383 pixels, "
+"while PNG can save larger images."
+msgstr ""
+"Salva l'immagine come file WebP (Web Picture) nel percorso [param path]. Per "
+"impostazione predefinita, salva senza perdita di dati. Se [param lossy] è "
+"[code]true[/code], l'immagine sarà salvata con perdita di dati, utilizzando "
+"la qualità [param quality] tra [code]0.0[/code] e [code]1.0[/code] (inclusi). "
+"WebP senza perdita offre una compressione più efficiente di PNG.\n"
+"[b]Nota:[/b] Il formato WebP è limitato a una dimensione di 16383×16383 "
+"pixel, mentre PNG può salvare immagini più grandi."
+
+msgid ""
+"Saves the image as a WebP (Web Picture) file to a byte array. By default it "
+"will save lossless. If [param lossy] is [code]true[/code], the image will be "
+"saved lossy, using the [param quality] setting between [code]0.0[/code] and "
+"[code]1.0[/code] (inclusive). Lossless WebP offers more efficient compression "
+"than PNG.\n"
+"[b]Note:[/b] The WebP format is limited to a size of 16383×16383 pixels, "
+"while PNG can save larger images."
+msgstr ""
+"Salva l'immagine come file WebP (Web Picture) in un array di byte. Per "
+"impostazione predefinita, salva senza perdita di dati. Se [param lossy] è "
+"[code]true[/code], l'immagine sarà salvata con perdita di dati, utilizzando "
+"la qualità [param quality] tra [code]0.0[/code] e [code]1.0[/code] (inclusi). "
+"WebP senza perdita offre una compressione più efficiente di PNG.\n"
+"[b]Nota:[/b] Il formato WebP è limitato a una dimensione di 16383×16383 "
+"pixel, mentre PNG può salvare immagini più grandi."
+
 msgid ""
 "Overwrites data of an existing [Image]. Non-static equivalent of [method "
 "create_from_data]."
@@ -57802,6 +71863,93 @@ msgstr ""
 "Sovrascrive i dati di un'[Image] esistente. Equivalente non statico di "
 "[method create_from_data]."
 
+msgid ""
+"Sets the [Color] of the pixel at [code](x, y)[/code] to [param color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixel(1, 2, Color.RED) # Sets the color at (1, 2) to red.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixel(1, 2, Colors.Red); // Sets the color at (1, 2) to red.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This is the same as [method set_pixelv], but with a two integer arguments "
+"instead of a [Vector2i] argument."
+msgstr ""
+"Imposta il [Color] del pixel nelle coordinate [code](x, y)[/code] su [param "
+"color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixel(1, 2, Colore.ROSSO) # Imposta il colore in (1, 2) su rosso.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixel(1, 2, Colori.Rosso); // Imposta il colore in (1, 2) su rosso.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Questo è lo stesso di [method set_pixelv], ma con due argomenti interi invece "
+"di un argomento [Vector2i]."
+
+msgid ""
+"Sets the [Color] of the pixel at [param point] to [param color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixelv(Vector2i(1, 2), Color.RED) # Sets the color at (1, 2) to red.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixelv(new Vector2I(1, 2), Colors.Red); // Sets the color at (1, 2) to "
+"red.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This is the same as [method set_pixel], but with a [Vector2i] argument "
+"instead of two integer arguments."
+msgstr ""
+"Imposta il [Color] del pixel nelle coordinate [param point] su [param "
+"color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var img_width = 10\n"
+"var img_height = 5\n"
+"var img = Image.create(img_width, img_height, false, Image.FORMAT_RGBA8)\n"
+"\n"
+"img.set_pixelv(Vector2i(1, 2), Color.RED) # Imposta il colore in (1, 2) su "
+"rosso.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int imgWidth = 10;\n"
+"int imgHeight = 5;\n"
+"var img = Image.Create(imgWidth, imgHeight, false, Image.Format.Rgba8);\n"
+"\n"
+"img.SetPixelv(new Vector2I(1, 2), Colors.Red); // Imposta il colore in (1, 2) "
+"su rosso.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Questo è lo stesso di [method set_pixel], ma con un argomento [Vector2i] "
+"invece di due argomenti interi."
+
 msgid ""
 "Shrinks the image by a factor of 2 on each axis (this divides the pixel count "
 "by 4)."
@@ -57809,6 +71957,14 @@ msgstr ""
 "Rimpicciolisce l'immagine di un fattore 2 su ciascun asse (ciò divide il "
 "numero di pixel per 4)."
 
+msgid ""
+"Converts the raw data from the sRGB colorspace to a linear scale. Only works "
+"on images with [constant FORMAT_RGB8] or [constant FORMAT_RGBA8] formats."
+msgstr ""
+"Converte i dati grezzi dallo spazio colore sRGB a quello lineare. Funziona "
+"solo sulle immagini con i formati [constant FORMAT_RGB8] o [constant "
+"FORMAT_RGBA8]."
+
 msgid ""
 "Holds all the image's color data in a given format. See [enum Format] "
 "constants."
@@ -58407,6 +72563,81 @@ msgstr "Rimuove questo caricatore di formato dal motore."
 msgid "A [Texture2D] based on an [Image]."
 msgstr "Una [Texture2D] basata su un [Image]."
 
+msgid ""
+"A [Texture2D] based on an [Image]. For an image to be displayed, an "
+"[ImageTexture] has to be created from it using the [method create_from_image] "
+"method:\n"
+"[codeblock]\n"
+"var image = Image.load_from_file(\"res://icon.svg\")\n"
+"var texture = ImageTexture.create_from_image(image)\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]\n"
+"This way, textures can be created at run-time by loading images both from "
+"within the editor and externally.\n"
+"[b]Warning:[/b] Prefer to load imported textures with [method @GDScript.load] "
+"over loading them from within the filesystem dynamically with [method Image."
+"load], as it may not work in exported projects:\n"
+"[codeblock]\n"
+"var texture = load(\"res://icon.svg\")\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]\n"
+"This is because images have to be imported as a [CompressedTexture2D] first "
+"to be loaded with [method @GDScript.load]. If you'd still like to load an "
+"image file just like any other [Resource], import it as an [Image] resource "
+"instead, and then load it normally using the [method @GDScript.load] method.\n"
+"[b]Note:[/b] The image can be retrieved from an imported texture using the "
+"[method Texture2D.get_image] method, which returns a copy of the image:\n"
+"[codeblock]\n"
+"var texture = load(\"res://icon.svg\")\n"
+"var image = texture.get_image()\n"
+"[/codeblock]\n"
+"An [ImageTexture] is not meant to be operated from within the editor "
+"interface directly, and is mostly useful for rendering images on screen "
+"dynamically via code. If you need to generate images procedurally from within "
+"the editor, consider saving and importing images as custom texture resources "
+"implementing a new [EditorImportPlugin].\n"
+"[b]Note:[/b] The maximum texture size is 16384×16384 pixels due to graphics "
+"hardware limitations."
+msgstr ""
+"Una [Texture2D] basata su una [Image]. Per visualizzare un'immagine, è "
+"necessario creare una [ImageTexture] da essa attraverso il metodo [method "
+"create_from_image]:\n"
+"[codeblock]\n"
+"var image = Image.load_from_file(\"res://icon.svg\")\n"
+"var texture = ImageTexture.create_from_image(image)\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]\n"
+"In questo modo, è possibile creare le texture in fase di esecuzione caricando "
+"le immagini sia dall'interno dell'editor sia esternamente.\n"
+"[b]Attenzione:[/b] Si consiglia di caricare le texture importate con [method "
+"@GDScript.load] invece di caricarle dinamicamente dall'interno del file "
+"system con [method Image.load], poiché ciò potrebbe non funzionare nei "
+"progetti esportati:\n"
+"[codeblock]\n"
+"var texture = load(\"res://icon.svg\")\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]\n"
+"Questo perché le immagini devono essere importate prima come "
+"[CompressedTexture2D] per essere caricate con [method @GDScript.load]. Se si "
+"desidera comunque caricare un file immagine come qualsiasi altra [Resource], "
+"importarla invece come risorsa [Image] e poi caricarla normalmente attraverso "
+"il metodo [method @GDScript.load].\n"
+"[b]Nota:[/b] L'immagine può essere recuperata da una texture importata "
+"tramite il metodo [method Texture2D.get_image], che restituisce una copia "
+"dell'immagine:\n"
+"[codeblock]\n"
+"var texture = load(\"res://icon.svg\")\n"
+"var image: Image = texture.get_image()\n"
+"[/codeblock]\n"
+"Una [ImageTexture] non è pensata per essere utilizzata direttamente "
+"dall'interfaccia dell'editor, ed è utile soprattutto per il rendering "
+"dinamico delle immagini sullo schermo tramite codice. Se è necessario "
+"generare immagini proceduralmente dall'editor, considerare di salvare e "
+"importare le immagini come risorse texture personalizzate implementando un "
+"nuovo [EditorImportPlugin].\n"
+"[b]Nota:[/b] Le dimensioni massime della texture sono 16384×16384 pixel a "
+"causa delle limitazioni degli hardware grafici."
+
 msgid ""
 "Creates a new [ImageTexture] and initializes it by allocating and setting the "
 "data from an [Image]."
@@ -58665,12 +72896,46 @@ msgid "Removes all surfaces and blend shapes from this [ImporterMesh]."
 msgstr ""
 "Rimuove tutte le superfici e le forme di fusione da questo [ImporterMesh]."
 
+msgid ""
+"Generates all lods for this ImporterMesh.\n"
+"[param normal_merge_angle] is in degrees and used in the same way as the "
+"importer settings in [code]lods[/code].\n"
+"[param normal_split_angle] is not used and only remains for compatibility "
+"with older versions of the API.\n"
+"The number of generated lods can be accessed using [method "
+"get_surface_lod_count], and each LOD is available in [method "
+"get_surface_lod_size] and [method get_surface_lod_indices].\n"
+"[param bone_transform_array] is an [Array] which can be either empty or "
+"contain [Transform3D]s which, for each of the mesh's bone IDs, will apply "
+"mesh skinning when generating the LOD mesh variations. This is usually used "
+"to account for discrepancies in scale between the mesh itself and its "
+"skinning data."
+msgstr ""
+"Genera tutti i LOD per questo ImporterMesh.\n"
+"[param normal_merge_angle] è in gradi e utilizzato nello stesso modo delle "
+"impostazioni d'importazione in [code]lods[/code]. \n"
+"[param normal_split_angle] non viene utilizzato e rimane solo per "
+"compatibilità con le versioni precedenti dell'API.\n"
+"È possibile accedere al numero di lod generati tramite [method "
+"get_surface_lod_count] e ogni LOD è disponibile in [method "
+"get_surface_lod_size] e [method get_surface_lod_indices].\n"
+"[param bone_transform_array] è un [Array] che può essere vuoto o contenere "
+"[Transform3D] che, per ciascuno degli ID osso della mesh, applicherà lo "
+"skinning della mesh durante la generazione delle variazioni LOD della mesh. "
+"Questo viene solitamente utilizzato per tenere conto delle discrepanze di "
+"scala tra la mesh stessa e i suoi dati di skinning."
+
 msgid "Returns the number of blend shapes that the mesh holds."
 msgstr "Restituisce il numero di forme di fusione contenute nella mesh."
 
 msgid "Returns the blend shape mode for this Mesh."
 msgstr "Restituisce la modalità delle forme di fusione per questo Mesh."
 
+msgid "Returns the size hint of this mesh for lightmap-unwrapping in UV-space."
+msgstr ""
+"Restituisce l'indicazione delle dimensioni di questa mesh per l'unwrapping "
+"della lightmap nello spazio UV."
+
 msgid ""
 "Returns the mesh data represented by this [ImporterMesh] as a usable "
 "[ArrayMesh].\n"
@@ -58814,6 +73079,29 @@ msgstr ""
 "volta per frame). Tuttavia, questo può essere utile in casi avanzati in cui "
 "si desidera un controllo preciso sulla tempistica della gestione degli eventi."
 
+msgid ""
+"Returns the acceleration in m/s² of the device's accelerometer sensor, if the "
+"device has one. Otherwise, the method returns [constant Vector3.ZERO].\n"
+"Note this method returns an empty [Vector3] when running from the editor even "
+"when your device has an accelerometer. You must export your project to a "
+"supported device to read values from the accelerometer.\n"
+"[b]Note:[/b] This method only works on Android and iOS. On other platforms, "
+"it always returns [constant Vector3.ZERO].\n"
+"[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/"
+"enable_accelerometer] must be enabled."
+msgstr ""
+"Restituisce l'accelerazione in m/s² del sensore accelerometro del "
+"dispositivo, se il dispositivo ne ha uno. Altrimenti, il metodo restituisce "
+"[constant Vector3.ZERO].\n"
+"Nota che questo metodo restituisce un [Vector3] vuoto quando viene eseguito "
+"dall'editor anche quando il dispositivo ha un accelerometro. È necessario "
+"esportare il progetto su un dispositivo supportato per leggere i valori "
+"dall'accelerometro.\n"
+"[b]Nota:[/b] Questo metodo funziona solo su Android e iOS. Su altre "
+"piattaforme, restituisce sempre [constant Vector3.ZERO].\n"
+"[b]Nota:[/b] Per Android, [member ProjectSettings.input_devices/sensors/"
+"enable_accelerometer] deve essere abilitato."
+
 msgid ""
 "Returns a value between 0 and 1 representing the raw intensity of the given "
 "action, ignoring the action's deadzone. In most cases, you should use [method "
@@ -58872,6 +73160,39 @@ msgstr ""
 "Restituisce la forma del cursore attualmente assegnata (vedi [enum "
 "CursorShape])."
 
+msgid ""
+"Returns the gravity in m/s² of the device's accelerometer sensor, if the "
+"device has one. Otherwise, the method returns [constant Vector3.ZERO].\n"
+"[b]Note:[/b] This method only works on Android and iOS. On other platforms, "
+"it always returns [constant Vector3.ZERO].\n"
+"[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/"
+"enable_gravity] must be enabled."
+msgstr ""
+"Restituisce la gravità in m/s² del sensore accelerometro del dispositivo, se "
+"il dispositivo ne ha uno. Altrimenti, il metodo restituisce [constant Vector3."
+"ZERO].\n"
+"[b]Nota:[/b] Questo metodo funziona solo su Android e iOS. Su altre "
+"piattaforme, restituisce sempre [constant Vector3.ZERO].\n"
+"[b]Nota:[/b] Per Android, [member ProjectSettings.input_devices/sensors/"
+"enable_gravity] deve essere abilitato."
+
+msgid ""
+"Returns the rotation rate in rad/s around a device's X, Y, and Z axes of the "
+"gyroscope sensor, if the device has one. Otherwise, the method returns "
+"[constant Vector3.ZERO].\n"
+"[b]Note:[/b] This method only works on Android and iOS. On other platforms, "
+"it always returns [constant Vector3.ZERO].\n"
+"[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] must be enabled."
+msgstr ""
+"Restituisce la velocità di rotazione (in radianti al secondo) attorno agli "
+"assi X, Y e Z del sensore giroscopio di un dispositivo, se il dispositivo ne "
+"ha uno. Altrimenti, il metodo restituisce [constant Vector3.ZERO].\n"
+"[b]Nota:[/b] Questo metodo funziona solo su Android e iOS. Su altre "
+"piattaforme, restituisce sempre [constant Vector3.ZERO].\n"
+"[b]Nota:[/b] Per Android, [member ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] deve essere abilitato."
+
 msgid ""
 "Returns the current value of the joypad axis at given index (see [enum "
 "JoyAxis])."
@@ -58879,6 +73200,62 @@ msgstr ""
 "Restituisce il valore attuale dell'asse del joypad all'indice specificato "
 "(vedi [enum JoyAxis])."
 
+msgid ""
+"Returns an SDL2-compatible device GUID on platforms that use gamepad "
+"remapping, e.g. [code]030000004c050000c405000000010000[/code]. Returns an "
+"empty string if it cannot be found. Godot uses the [url=https://github.com/"
+"gabomdq/SDL_GameControllerDB]SDL2 game controller database[/url] to determine "
+"gamepad names and mappings based on this GUID.\n"
+"On Windows, all XInput joypad GUIDs will be overridden by Godot to "
+"[code]__XINPUT_DEVICE__[/code], because their mappings are the same."
+msgstr ""
+"Restituisce un GUID dispositivo compatibile con SDL2 su piattaforme che "
+"utilizzano la rimappatura del gamepad, ad esempio "
+"[code]030000004c050000c405000000010000[/code]. Restituisce una stringa vuota "
+"se non può essere trovato. Godot utilizza il [url=https://github.com/gabomdq/"
+"SDL_GameControllerDB]database dei controller di gioco SDL2[/url] per "
+"determinare i nomi e le mappature dei gamepad in base a questo GUID.\n"
+"Su Windows, tutti i GUID dei joypad XInput saranno sovrascritti da Godot in "
+"[code]__XINPUT_DEVICE__[/code], perché le loro mappature sono le stesse."
+
+msgid ""
+"Returns a dictionary with extra platform-specific information about the "
+"device, e.g. the raw gamepad name from the OS or the Steam Input index.\n"
+"On Windows, the dictionary contains the following fields:\n"
+"[code]xinput_index[/code]: The index of the controller in the XInput system. "
+"Undefined for DirectInput devices.\n"
+"[code]vendor_id[/code]: The USB vendor ID of the device.\n"
+"[code]product_id[/code]: The USB product ID of the device.\n"
+"On Linux:\n"
+"[code]raw_name[/code]: The name of the controller as it came from the OS, "
+"before getting renamed by the godot controller database.\n"
+"[code]vendor_id[/code]: The USB vendor ID of the device.\n"
+"[code]product_id[/code]: The USB product ID of the device.\n"
+"[code]steam_input_index[/code]: The Steam Input gamepad index, if the device "
+"is not a Steam Input device this key won't be present.\n"
+"[b]Note:[/b] The returned dictionary is always empty on Web, iOS, Android, "
+"and macOS."
+msgstr ""
+"Restituisce un dizionario con ulteriori informazioni sul dispositivo, "
+"specifiche per la piattaforma, ad esempio il nome grezzo del gamepad dal "
+"sistema operativo o l'indice per Steam Input.\n"
+"Su Windows, il dizionario contiene i seguenti campi:\n"
+"[code]xinput_index[/code]: l'indice del controller nel sistema XInput. Non "
+"definito sui dispositivi DirectInput.\n"
+"[code]vendor_id[/code]: L'ID venditore USB del dispositivo.\n"
+"[code]product_id[/code]: l'ID prodotto USB del dispositivo.\n"
+"Su Linux:\n"
+"[code]raw_name[/code]: il nome del controller così come è arrivato dal "
+"sistema operativo, prima di essere rinominato dal database di controller "
+"Godot.\n"
+"[code]vendor_id[/code]: l'ID fornitore USB del dispositivo.\n"
+"[code]product_id[/code]: l'ID prodotto USB del dispositivo.\n"
+"[code]steam_input_index[/code]: l'indice Steam Input del gamepad, se il "
+"dispositivo non è un dispositivo Steam Input questa chiave non sarà "
+"presente.\n"
+"[b]Nota:[/b] Il dizionario restituito è sempre vuoto su Web, iOS, Android e "
+"macOS."
+
 msgid ""
 "Returns the name of the joypad at the specified device index, e.g. [code]PS4 "
 "Controller[/code]. Godot uses the [url=https://github.com/gabomdq/"
@@ -58920,6 +73297,23 @@ msgstr ""
 "Pertanto, la velocità del mouse sarà in ritardo rispetto ai movimenti del "
 "mouse."
 
+msgid ""
+"Returns the magnetic field strength in micro-Tesla for all axes of the "
+"device's magnetometer sensor, if the device has one. Otherwise, the method "
+"returns [constant Vector3.ZERO].\n"
+"[b]Note:[/b] This method only works on Android and iOS. On other platforms, "
+"it always returns [constant Vector3.ZERO].\n"
+"[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/"
+"enable_magnetometer] must be enabled."
+msgstr ""
+"Restituisce l'intensità del campo magnetico in micro-Tesla per tutti gli assi "
+"del sensore magnetometrico del dispositivo, se il dispositivo ne ha uno. "
+"Altrimenti, il metodo restituisce [constant Vector3.ZERO].\n"
+"[b]Nota:[/b] Questo metodo funziona solo su Android e iOS. Su altre "
+"piattaforme, restituisce sempre [constant Vector3.ZERO].\n"
+"[b]Nota:[/b] Per Android, [member ProjectSettings.input_devices/sensors/"
+"enable_magnetometer] deve essere abilitato."
+
 msgid ""
 "Returns mouse buttons as a bitmask. If multiple mouse buttons are pressed at "
 "the same time, the bits are added together. Equivalent to [method "
@@ -59140,6 +73534,52 @@ msgstr ""
 "input_examples.html#keyboard-events]Esempi di input[/url] nella "
 "documentazione per maggiori informazioni."
 
+msgid ""
+"Feeds an [InputEvent] to the game. Can be used to artificially trigger input "
+"events from code. Also generates [method Node._input] calls.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var cancel_event = InputEventAction.new()\n"
+"cancel_event.action = \"ui_cancel\"\n"
+"cancel_event.pressed = true\n"
+"Input.parse_input_event(cancel_event)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var cancelEvent = new InputEventAction();\n"
+"cancelEvent.Action = \"ui_cancel\";\n"
+"cancelEvent.Pressed = true;\n"
+"Input.ParseInputEvent(cancelEvent);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Calling this function has no influence on the operating system. "
+"So for example sending an [InputEventMouseMotion] will not move the OS mouse "
+"cursor to the specified position (use [method warp_mouse] instead) and "
+"sending [kbd]Alt/Cmd + Tab[/kbd] as [InputEventKey] won't toggle between "
+"active windows."
+msgstr ""
+"Fornisce un [InputEvent] al gioco. Può essere utilizzato per attivare "
+"artificialmente eventi di input da codice. Genera anche chiamate a [method "
+"Node._input].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var cancel_event = InputEventAction.new()\n"
+"cancel_event.action = \"ui_cancel\"\n"
+"cancel_event.pressed = true\n"
+"Input.parse_input_event(cancel_event)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var cancelEvent = new InputEventAction();\n"
+"cancelEvent.Action = \"ui_cancel\";\n"
+"cancelEvent.Pressed = true;\n"
+"Input.ParseInputEvent(cancelEvent);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Chiamare questa funzione non influenza il sistema operativo. Ad "
+"esempio, l'invio di un [InputEventMouseMotion] non sposterà il cursore del "
+"mouse del sistema operativo nella posizione specificata (usa invece [method "
+"warp_mouse]) e l'invio di [kbd]Alt/Cmd + Tab[/kbd] come [InputEventKey] non "
+"consentirà di alternare le finestre attive."
+
 msgid ""
 "Sets the acceleration value of the accelerometer sensor. Can be used for "
 "debugging on devices without a hardware sensor, for example in an editor on a "
@@ -59435,6 +73875,13 @@ msgstr ""
 "un'operazione e che non può essere utilizzata durante l'operazione (ad "
 "esempio, qualcosa sta bloccando il suo thread principale)."
 
+msgid ""
+"Busy cursor. Indicates that the application is busy performing an operation, "
+"and that it is still usable during the operation."
+msgstr ""
+"Cursore occupato. Indica che l'applicazione è impegnata nell'esecuzione di "
+"un'operazione e che è ancora utilizzabile durante l'operazione."
+
 msgid ""
 "Drag cursor. Usually displayed when dragging something.\n"
 "[b]Note:[/b] Windows lacks a dragging cursor, so [constant CURSOR_DRAG] is "
@@ -59804,7 +74251,7 @@ msgid ""
 "Control._gui_input], the position is relative to the current [Control] that "
 "received this gesture."
 msgstr ""
-"La posizione del gesto locale relativa al [Viewport]. Se utilizzato nel "
+"La posizione del gesto locale relativa alla [Viewport]. Se utilizzato in "
 "[method Control._gui_input], la posizione è relativa al [Control] attuale che "
 "ha ricevuto questo gesto."
 
@@ -60314,8 +74761,8 @@ msgid ""
 "the [Control] using the local coordinate system of the [Control]."
 msgstr ""
 "Quando ricevuto in [method Node._input] o [method Node._unhandled_input], "
-"restituisce la posizione del mouse nel [Viewport] in cui si trova questo "
-"[Node] utilizzando il sistema di coordinate di questo [Viewport].\n"
+"restituisce la posizione del mouse nella [Viewport] in cui si trova questo "
+"[Node] utilizzando il sistema di coordinate di questa [Viewport].\n"
 "Quando ricevuto in [method Control._gui_input], restituisce la posizione del "
 "mouse nel [Control] utilizzando il sistema di coordinate locale del [Control]."
 
@@ -61893,9 +76340,79 @@ msgid ""
 msgstr ""
 "Lo [StyleBox] per gli elementi selezionati, quando l'[ItemList] è focalizzato."
 
+msgid "Represents a class from the Java Native Interface."
+msgstr "Rappresenta una classe dalla Java Native Interface."
+
+msgid ""
+"Represents a class from the Java Native Interface. It is returned from "
+"[method JavaClassWrapper.wrap].\n"
+"[b]Note:[/b] This class only works on Android. On any other platform, this "
+"class does nothing.\n"
+"[b]Note:[/b] This class is not to be confused with [JavaScriptObject]."
+msgstr ""
+"Rappresenta una classe dalla Java Native Interface. Viene restituito da "
+"[method JavaClassWrapper.wrap].\n"
+"[b]Nota:[/b] Questa classe funziona solo su Android. Per qualsiasi altra "
+"piattaforma, questa classe non fa nulla.\n"
+"[b]Nota:[/b] Questa classe non va confusa con [JavaScriptObject]."
+
+msgid "Returns the Java class name."
+msgstr "Restituisce il nome della classe Java."
+
+msgid "Returns a [JavaClass] representing the Java parent class of this class."
+msgstr ""
+"Restituisce un [JavaClass] che rappresenta la classe padre di questa classe."
+
 msgid "Provides access to the Java Native Interface."
 msgstr "Fornisce l'accesso alla Java Native Interface."
 
+msgid ""
+"The JavaClassWrapper singleton provides a way for the Godot application to "
+"send and receive data through the [url=https://developer.android.com/training/"
+"articles/perf-jni]Java Native Interface[/url] (JNI).\n"
+"[b]Note:[/b] This singleton is only available in Android builds.\n"
+"[codeblock]\n"
+"var LocalDateTime = JavaClassWrapper.wrap(\"java.time.LocalDateTime\")\n"
+"var DateTimeFormatter = JavaClassWrapper.wrap(\"java.time.format."
+"DateTimeFormatter\")\n"
+"\n"
+"var datetime = LocalDateTime.now()\n"
+"var formatter = DateTimeFormatter.ofPattern(\"dd-MM-yyyy HH:mm:ss\")\n"
+"\n"
+"print(datetime.format(formatter))\n"
+"[/codeblock]\n"
+"[b]Warning:[/b] When calling Java methods, be sure to check [method "
+"JavaClassWrapper.get_exception] to check if the method threw an exception."
+msgstr ""
+"Il singleton JavaClassWrapper fornisce un modo all'applicazione Godot di "
+"inviare e ricevere dati tramite la [url=https://developer.android.com/"
+"training/articles/perf-jni]Java Native Interface[/url] (JNI).\n"
+"[b]Nota:[/b] Questo singleton è disponibile solo nelle build Android.\n"
+"[codeblock]\n"
+"var LocalDateTime = JavaClassWrapper.wrap(\"java.time.LocalDateTime\")\n"
+"var DateTimeFormatter = JavaClassWrapper.wrap(\"java.time.format."
+"DateTimeFormatter\")\n"
+"\n"
+"var datetime = LocalDateTime.now()\n"
+"var formatter = DateTimeFormatter.ofPattern(\"dd-MM-yyyy HH:mm:ss\")\n"
+"\n"
+"print(datetime.format(formatter))\n"
+"[/codeblock]\n"
+"[b]Attenzione:[/b] Quando si chiamano metodi Java, assicurarsi di controllare "
+"[method JavaClassWrapper.get_exception] per verificare se il metodo ha "
+"generato un'eccezione."
+
+msgid ""
+"Returns the Java exception from the last call into a Java class. If there was "
+"no exception, it will return [code]null[/code].\n"
+"[b]Note:[/b] This method only works on Android. On every other platform, this "
+"method will always return [code]null[/code]."
+msgstr ""
+"Restituisce l'eccezione Java dall'ultima chiamata in una classe Java. Se non "
+"c'è stata alcuna eccezione, restituirà [code]null[/code].\n"
+"[b]Nota:[/b] Questo metodo funziona solo su Android. Su tutte le altre "
+"piattaforme, questo metodo restituirà sempre [code]null[/code]."
+
 msgid ""
 "Wraps a class defined in Java, and returns it as a [JavaClass] [Object] type "
 "that Godot can interact with.\n"
@@ -61908,7 +76425,25 @@ msgstr ""
 "piattaforme, questo metodo non fa nulla e restituisce un [JavaClass] vuoto."
 
 msgid "Represents an object from the Java Native Interface."
-msgstr "Rappresenta un oggetto della Java Native Interface."
+msgstr "Rappresenta un oggetto dalla Java Native Interface."
+
+msgid ""
+"Represents an object from the Java Native Interface. It can be returned from "
+"Java methods called on [JavaClass] or other [JavaObject]s. See "
+"[JavaClassWrapper] for an example.\n"
+"[b]Note:[/b] This class only works on Android. On any other platform, this "
+"class does nothing.\n"
+"[b]Note:[/b] This class is not to be confused with [JavaScriptObject]."
+msgstr ""
+"Rappresenta un oggetto dalla Java Native Interface. Può essere restituito da "
+"metodi Java chiamati su [JavaClass] o altri [JavaObject]. Consulta "
+"[JavaClassWrapper] per un esempio.\n"
+"[b]Nota:[/b] Questa classe funziona solo su Android. Per qualsiasi altra "
+"piattaforma, questa classe non fa nulla.\n"
+"[b]Nota:[/b] Questa classe non va confusa con [JavaScriptObject]."
+
+msgid "Returns the [JavaClass] that this object is an instance of."
+msgstr "Restituisce la [JavaClass] di cui questo oggetto è un'istanza."
 
 msgid ""
 "Singleton that connects the engine with the browser's JavaScript context in "
@@ -61941,6 +76476,24 @@ msgstr ""
 msgid "Exporting for the Web: Calling JavaScript from script"
 msgstr "Esportazione per il Web: Chiamata di JavaScript da script"
 
+msgid ""
+"Creates a reference to a [Callable] that can be used as a callback by "
+"JavaScript. The reference must be kept until the callback happens, or it "
+"won't be called at all. See [JavaScriptObject] for usage.\n"
+"[b]Note:[/b] The callback function must take exactly one [Array] argument, "
+"which is going to be the JavaScript [url=https://developer.mozilla.org/en-US/"
+"docs/Web/JavaScript/Reference/Functions/arguments]arguments object[/url] "
+"converted to an array."
+msgstr ""
+"Crea un riferimento a un [Callable] che può essere utilizzato come callback "
+"da JavaScript. Il riferimento deve essere mantenuto finché non avviene il "
+"callback, altrimenti non verrà chiamato affatto. Vedi [JavaScriptObject] per "
+"l'utilizzo.\n"
+"[b]Nota:[/b] la funzione di callback deve accettare esattamente un solo "
+"argomento [Array], che sarà [url=https://developer.mozilla.org/en-US/docs/Web/"
+"JavaScript/Reference/Functions/arguments]l'oggetto argomenti[/url] di "
+"JavaScript convertito in un array."
+
 msgid ""
 "Creates a new JavaScript object using the [code]new[/code] constructor. The "
 "[param object] must a valid property of the JavaScript [code]window[/code]. "
@@ -63634,6 +78187,10 @@ msgstr ""
 "artefatti indesiderati. Cerca di mantenere il valore il più vicino possibile "
 "a quello predefinito."
 
+msgid "The light will only cast shadows using objects in the selected layers."
+msgstr ""
+"La luce proietterà ombre solo sugli oggetti presenti negli strati selezionati."
+
 msgid ""
 "If [code]true[/code], the light will cast real-time shadows. This has a "
 "significant performance cost. Only enable shadow rendering when it makes a "
@@ -64023,6 +78580,23 @@ msgstr ""
 "dimensioni delle texture. Lascia [member max_texture_size] al suo valore "
 "predefinito di [code]16384[/code] se non sei sicuro."
 
+msgid ""
+"The quality preset to use when baking lightmaps. This affects bake times, but "
+"output file sizes remain mostly identical across quality levels.\n"
+"To further speed up bake times, decrease [member bounces], disable [member "
+"use_denoiser] and/or decrease [member texel_scale].\n"
+"To further increase quality, enable [member supersampling] and/or increase "
+"[member texel_scale]."
+msgstr ""
+"Il modello di qualità da usare quando si precalcolano le lightmap. Ciò "
+"influisce sui tempi di preparazione, ma le dimensioni dei file risultanti "
+"rimangono per lo più identiche tra i vari livelli di qualità.\n"
+"Per velocizzare ulteriormente i tempi di preparazione, diminuisci [member "
+"bounces], disattiva [member use_denoiser] e aumenta le dimensioni dei texel "
+"della lightmap nelle scene 3D nel pannello d'Importazione.\n"
+"Per aumentare ulteriormente la qualità, abilita [member supersampling] e/o "
+"aumenta [member texel_scale]."
+
 msgid ""
 "If [code]true[/code], uses a GPU-based denoising algorithm on the generated "
 "lightmap. This eliminates most noise within the generated lightmap at the "
@@ -64557,6 +79131,15 @@ msgstr ""
 msgid "The polyline's width."
 msgstr "Lo spessore della polilinea."
 
+msgid ""
+"The polyline's width curve. The width of the polyline over its length will be "
+"equivalent to the value of the width curve over its domain. The width curve "
+"should be a unit [Curve]."
+msgstr ""
+"La curva di larghezza della polilinea. La larghezza della polilinea sulla sua "
+"lunghezza sarà equivalente al valore della curva di larghezza sul suo "
+"dominio. La curva di larghezza dovrebbe essere una [Curve] unitaria."
+
 msgid ""
 "Makes the polyline's joints pointy, connecting the sides of the two segments "
 "by extending them until they intersect. If the rotation of a joint is too big "
@@ -64623,6 +79206,13 @@ msgstr ""
 msgid "An input field for single-line text."
 msgstr "Un campo di input per testo su una sola riga."
 
+msgid ""
+"Applies text from the [url=https://en.wikipedia.org/wiki/Input_method]Input "
+"Method Editor[/url] (IME) and closes the IME if it is open."
+msgstr ""
+"Applica il testo dall'[url=https://en.wikipedia.org/wiki/Input_method]Input "
+"Method Editor[/url] (IME) e chiude l'IME se è aperto."
+
 msgid ""
 "Closes the [url=https://en.wikipedia.org/wiki/Input_method]Input Method "
 "Editor[/url] (IME) if it is open. Any text in the IME will be lost."
@@ -64786,6 +79376,9 @@ msgstr ""
 "Inserisce [param text] al cursore. Se il valore risultante è più lungo di "
 "[member max_length], non succede nulla."
 
+msgid "Returns whether the [LineEdit] is being edited."
+msgstr "Restituisce se il [LineEdit] è in fase di modifica."
+
 msgid ""
 "Returns whether the menu is visible. Use this instead of [code]get_menu()."
 "visible[/code] to improve performance (so the creation of the menu is "
@@ -64857,11 +79450,11 @@ msgstr ""
 "impostata, il testo potrebbe scorrere per adattarsi."
 
 msgid ""
-"If [code]true[/code], the [LineEdit] will always show the caret, even if "
-"focus is lost."
+"If [code]true[/code], the [LineEdit] will always show the caret, even if not "
+"editing or focus is lost."
 msgstr ""
-"Se [code]true[/code], il [LineEdit] mostrerà sempre il cursore, anche se la "
-"messa a fuoco è persa."
+"Se [code]true[/code], il [LineEdit] mostrerà sempre il cursore di testo, "
+"anche se non è in fase di modifica o il focus viene perso."
 
 msgid ""
 "Allow moving caret, selecting and removing the individual composite character "
@@ -64908,6 +79501,9 @@ msgstr ""
 "Se [code]false[/code], non è possibile modificare il testo esistente o "
 "aggiungere nuovo testo."
 
+msgid "If [code]true[/code], \"Emoji and Symbols\" menu is enabled."
+msgstr "Se [code]true[/code], il menu \"Emoji e simboli\" è abilitato."
+
 msgid ""
 "If [code]true[/code], the [LineEdit] width will increase to stay longer than "
 "the [member text]. It will [b]not[/b] compress if the [member text] is "
@@ -65001,6 +79597,9 @@ msgstr ""
 msgid "Specifies the type of virtual keyboard to show."
 msgstr "Specifica il tipo di tastiera virtuale da visualizzare."
 
+msgid "Emitted when the [LineEdit] switches in or out of edit mode."
+msgstr "Emesso quando il [LineEdit] entra o esce dalla modalità modifica."
+
 msgid ""
 "Emitted when appending text that overflows the [member max_length]. The "
 "appended text is truncated to fit [member max_length], and the part that "
@@ -65119,6 +79718,9 @@ msgstr "Inserisce il carattere di unione delle parole (WJ)."
 msgid "Inserts soft hyphen (SHY) character."
 msgstr "Inserisce il carattere trattino morbido (SHY)."
 
+msgid "Opens system emoji and symbol picker."
+msgstr "Apre il selettore di emoji e simboli del sistema."
+
 msgid "Represents the size of the [enum MenuItems] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum MenuItems]."
 
@@ -65238,6 +79840,51 @@ msgstr ""
 "La modalità di sottolineatura da usare per il testo. Vedi [enum LinkButton."
 "UnderlineMode] per le modalità disponibili."
 
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/Uniform_Resource_Identifier]URI[/url] "
+"for this [LinkButton]. If set to a valid URI, pressing the button opens the "
+"URI using the operating system's default program for the protocol (via "
+"[method OS.shell_open]). HTTP and HTTPS URLs open the default web browser.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"uri = \"https://godotengine.org\"  # Opens the URL in the default web "
+"browser.\n"
+"uri = \"C:\\SomeFolder\"  # Opens the file explorer at the given path.\n"
+"uri = \"C:\\SomeImage.png\"  # Opens the given image in the default viewing "
+"app.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Uri = \"https://godotengine.org\"; // Opens the URL in the default web "
+"browser.\n"
+"Uri = \"C:\\SomeFolder\"; // Opens the file explorer at the given path.\n"
+"Uri = \"C:\\SomeImage.png\"; // Opens the given image in the default viewing "
+"app.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"L'[url=https://it.wikipedia.org/wiki/Uniform_Resource_Identifier]URI[/url] "
+"per questo [LinkButton]. Se impostato su un URI valido, premendo il pulsante "
+"si apre l'URI utilizzando il programma predefinito del sistema operativo per "
+"il protocollo (tramite [method OS.shell_open]). Gli URL HTTP e HTTPS aprono "
+"il browser Web predefinito.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"uri = \"https://godotengine.org\"  # Apre l'URL nel browser Web predefinito.\n"
+"uri = \"C:\\SomeFolder\"  # Apre l'esploratore file nel percorso "
+"specificato.\n"
+"uri = \"C:\\SomeImage.png\"  # Apre l'immagine specificata nell'app di "
+"visualizzazione predefinita.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Uri = \"https://godotengine.org\"; // Apre l'URL nel browser Web "
+"predefinito.\n"
+"Uri = \"C:\\SomeFolder\"; // Apre l'esploratore file nel percorso "
+"specificato.\n"
+"Uri = \"C:\\SomeImage.png\"; // Apre l'immagine specificata nell'app di "
+"visualizzazione predefinita.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "The LinkButton will always show an underline at the bottom of its text."
 msgstr "Il LinkButton mostrerà sempre una sottolineatura sotto al suo testo."
 
@@ -65312,9 +79959,211 @@ msgstr ""
 "ridurrà l'usabilità della navigazione tramite tastiera o controller, perciò "
 "non è consigliato per motivi di accessibilità."
 
+msgid "Returns the remaining seconds of the time-based interpolation."
+msgstr "Restituisce i secondi rimanenti dell'interpolazione basata sul tempo."
+
+msgid "Index of the [member bone_name] in the parent [Skeleton3D]."
+msgstr "Indice del [member bone_name] nello [Skeleton3D] genitore."
+
+msgid "The bone name of the [Skeleton3D] that the modification will operate on."
+msgstr "Il nome dell'osso dello [Skeleton3D] su cui opererà la modificazione."
+
+msgid ""
+"The ease type of the time-based interpolation. See also [enum Tween.EaseType]."
+msgstr ""
+"Il tipo di allentamento dell'interpolazione basata sul tempo. Vedi anche "
+"[enum Tween. EaseType]."
+
+msgid ""
+"The limit angle of the primary rotation when [member symmetry_limitation] is "
+"[code]true[/code]."
+msgstr ""
+"L'angolo limite della rotazione primaria quando [member symmetry_limitation] "
+"è [code]true[/code]."
+
+msgid ""
+"The limit angle of negative side of the primary rotation when [member "
+"symmetry_limitation] is [code]false[/code]."
+msgstr ""
+"L'angolo limite del lato negativo della rotazione primaria quando [member "
+"symmetry_limitation] è [code]false[/code]."
+
+msgid ""
+"The limit angle of positive side of the primary rotation when [member "
+"symmetry_limitation] is [code]false[/code]."
+msgstr ""
+"L'angolo limite del lato positivo della rotazione primaria quando [member "
+"symmetry_limitation] è [code]false[/code]."
+
+msgid ""
+"The limit angle of the secondary rotation when [member symmetry_limitation] "
+"is [code]true[/code]."
+msgstr ""
+"L'angolo limite della rotazione secondaria quando [member "
+"symmetry_limitation] è [code]true[/code]."
+
+msgid ""
+"The limit angle of negative side of the secondary rotation when [member "
+"symmetry_limitation] is [code]false[/code]."
+msgstr ""
+"L'angolo limite del lato negativo della rotazione secondaria quando [member "
+"symmetry_limitation] è [code]false[/code]."
+
+msgid ""
+"The limit angle of positive side of the secondary rotation when [member "
+"symmetry_limitation] is [code]false[/code]."
+msgstr ""
+"L'angolo limite del lato positivo della rotazione secondaria quando [member "
+"symmetry_limitation] è [code]false[/code]."
+
+msgid ""
+"The [NodePath] to the node that is the target for the look at modification. "
+"This node is what the modification will rotate the bone to."
+msgstr ""
+"Il [NodePath] al nodo che è l'obiettivo per la modificazione \"look at\". "
+"Questo nodo è ciò verso cui la modificazione ruoterà l'osso."
+
+msgid ""
+"The transition type of the time-based interpolation. See also [enum Tween."
+"TransitionType]."
+msgstr ""
+"Il tipo di transizione dell'interpolazione basata sul tempo. Vedi anche [enum "
+"Tween.TransitionType]."
+
+msgid "If [code]true[/code], provides rotation by two axes."
+msgstr "Se [code]true[/code], fornisce la rotazione su due assi."
+
 msgid "Abstract base class for the game's main loop."
 msgstr "Classe di base astratta per il ciclo principale del gioco."
 
+msgid ""
+"[MainLoop] is the abstract base class for a Godot project's game loop. It is "
+"inherited by [SceneTree], which is the default game loop implementation used "
+"in Godot projects, though it is also possible to write and use one's own "
+"[MainLoop] subclass instead of the scene tree.\n"
+"Upon the application start, a [MainLoop] implementation must be provided to "
+"the OS; otherwise, the application will exit. This happens automatically (and "
+"a [SceneTree] is created) unless a [MainLoop] [Script] is provided from the "
+"command line (with e.g. [code]godot -s my_loop.gd[/code]) or the [member "
+"ProjectSettings.application/run/main_loop_type] project setting is "
+"overwritten.\n"
+"Here is an example script implementing a simple [MainLoop]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"class_name CustomMainLoop\n"
+"extends MainLoop\n"
+"\n"
+"var time_elapsed = 0\n"
+"\n"
+"func _initialize():\n"
+"    print(\"Initialized:\")\n"
+"    print(\"  Starting time: %s\" % str(time_elapsed))\n"
+"\n"
+"func _process(delta):\n"
+"    time_elapsed += delta\n"
+"    # Return true to end the main loop.\n"
+"    return Input.get_mouse_button_mask() != 0 || Input."
+"is_key_pressed(KEY_ESCAPE)\n"
+"\n"
+"func _finalize():\n"
+"    print(\"Finalized:\")\n"
+"    print(\"  End time: %s\" % str(time_elapsed))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[GlobalClass]\n"
+"public partial class CustomMainLoop : MainLoop\n"
+"{\n"
+"    private double _timeElapsed = 0;\n"
+"\n"
+"    public override void _Initialize()\n"
+"    {\n"
+"        GD.Print(\"Initialized:\");\n"
+"        GD.Print($\"  Starting Time: {_timeElapsed}\");\n"
+"    }\n"
+"\n"
+"    public override bool _Process(double delta)\n"
+"    {\n"
+"        _timeElapsed += delta;\n"
+"        // Return true to end the main loop.\n"
+"        return Input.GetMouseButtonMask() != 0 || Input.IsKeyPressed(Key."
+"Escape);\n"
+"    }\n"
+"\n"
+"    private void _Finalize()\n"
+"    {\n"
+"        GD.Print(\"Finalized:\");\n"
+"        GD.Print($\"  End Time: {_timeElapsed}\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"[MainLoop] è la classe base astratta per il ciclo di gioco di un progetto "
+"Godot. È ereditata da [SceneTree], che è l'implementazione predefinita del "
+"ciclo di gioco utilizzata nei progetti Godot, sebbene sia anche possibile "
+"scrivere e utilizzare la propria sottoclasse [MainLoop] al posto dell'albero "
+"di scene.\n"
+"All'avvio dell'applicazione, un'implementazione [MainLoop] deve essere "
+"fornita al sistema operativo; altrimenti, l'applicazione verrà chiusa. Ciò "
+"avviene automaticamente (e viene creato uno [SceneTree]) a meno che non sia "
+"fornito uno [Script] [MainLoop] dalla riga di comando (ad esempio con "
+"[code]godot -s my_loop.gd[/code]) o che l'impostazione del progetto [member "
+"ProjectSettings.application/run/main_loop_type] non sia sovrascritta.\n"
+"Ecco uno script di esempio che implementa un semplice [MainLoop]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"class_name CustomMainLoop\n"
+"extends MainLoop\n"
+"\n"
+"var time_elapsed = 0\n"
+"\n"
+"func _initialize():\n"
+"    print(\"Inizializzato:\")\n"
+"    print(\"  Tempo all'inizio: %s\" % str(time_elapsed))\n"
+"\n"
+"func _process(delta):\n"
+"    time_elapsed += delta\n"
+"    # Restituisci true per terminare il ciclo principale.\n"
+"    return Input.get_mouse_button_mask() != 0 || Input."
+"is_key_pressed(KEY_ESCAPE)\n"
+"\n"
+"func _finalize():\n"
+"    print(\"Finalizzato:\")\n"
+"    print(\"  Tempo alla fine: %s\" % str(time_elapsed))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[GlobalClass]\n"
+"public partial class CustomMainLoop : MainLoop\n"
+"{\n"
+"    private double _timeElapsed = 0;\n"
+"\n"
+"    public override void _Initialize()\n"
+"    {\n"
+"        GD.Print(\"Inizializzato:\");\n"
+"        GD.Print($\"  Tempo all'inizio: {_timeElapsed}\");\n"
+"    }\n"
+"\n"
+"    public override bool _Process(double delta)\n"
+"    {\n"
+"        _timeElapsed += delta;\n"
+"        // Restituisci true per terminare il ciclo principale.\n"
+"        return Input.GetMouseButtonMask() != 0 || Input.IsKeyPressed(Key."
+"Escape);\n"
+"    }\n"
+"\n"
+"    private void _Finalize()\n"
+"    {\n"
+"        GD.Print(\"Finalizzato:\");\n"
+"        GD.Print($\"  Tempo alla fine: {_timeElapsed}\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Called before the program exits."
 msgstr "Chiamato prima della chiusura del programma."
 
@@ -65333,6 +80182,18 @@ msgstr ""
 "memoria allocata.\n"
 "Specifico per la piattaforma iOS."
 
+msgid ""
+"Notification received when translations may have changed. Can be triggered by "
+"the user changing the locale. Can be used to respond to language changes, for "
+"example to change the UI strings on the fly. Useful when working with the "
+"built-in translation support, like [method Object.tr]."
+msgstr ""
+"Notifica ricevuta quando le traduzioni potrebbero essere cambiate. Può essere "
+"attivata dall'utente che cambia le impostazioni locali. Può essere utilizzata "
+"per rispondere alle modifiche della lingua, ad esempio per modificare le "
+"stringhe dell'interfaccia utente al volo. Utile quando si lavora con il "
+"supporto integrato di traduzione, come [method Object.tr]."
+
 msgid ""
 "Notification received from the OS when a request for \"About\" information is "
 "sent.\n"
@@ -65642,6 +80503,16 @@ msgstr ""
 msgid "Creates a placeholder version of this resource ([PlaceholderMaterial])."
 msgstr "Crea una versione segnaposto di questa risorsa ([PlaceholderMaterial])."
 
+msgid ""
+"Only available when running in the editor. Opens a popup that visualizes the "
+"generated shader code, including all variants and internal shader code. See "
+"also [method Shader.inspect_native_shader_code]."
+msgstr ""
+"Disponibile solo quando è in esecuzione nell'editor. Apre un popup che "
+"visualizza il codice dello shader generato, incluse tutte le varianti e il "
+"codice dello shader interno. Vedi anche [method Shader."
+"inspect_native_shader_code]."
+
 msgid ""
 "Sets the [Material] to be used for the next pass. This renders the object "
 "again using a different material.\n"
@@ -65693,6 +80564,22 @@ msgstr "Il valore massimo per il parametro [member render_priority]."
 msgid "Minimum value for the [member render_priority] parameter."
 msgstr "Il valore minimo per il parametro [member render_priority]."
 
+msgid "A horizontal menu bar that creates a menu for each [PopupMenu] child."
+msgstr ""
+"Una barra di menu orizzontale che crea un menu per ogni [PopupMenu] figlio."
+
+msgid ""
+"A horizontal menu bar that creates a menu for each [PopupMenu] child. New "
+"items are created by adding [PopupMenu]s to this node. Item title is "
+"determined by [member Window.title], or node name if [member Window.title] is "
+"empty. Item title can be overridden using [method set_menu_title]."
+msgstr ""
+"Una barra di menu orizzontale che crea un menu per ogni [PopupMenu] figlio. "
+"Si possono creare nuove voci aggiungendo dei [PopupMenu] a questo nodo. Il "
+"titolo di ogni voce è determinato da [member Window.title], o dal nome del "
+"nodo se [member Window.title] è vuoto. È possibile sovrascrivere il titolo di "
+"una voce attraverso [method set_menu_title]."
+
 msgid "Returns number of menu items."
 msgstr "Restituisce il numero di voci del menu."
 
@@ -66115,6 +81002,21 @@ msgstr "Imposta un suggerimento da usare per la risoluzione della lightmap."
 msgid "Render array as points (one vertex equals one point)."
 msgstr "Renderizza l'array come punti (un vertice equivale a un punto)."
 
+msgid "Render array as lines (every two vertices a line is created)."
+msgstr ""
+"Renderizza l'array come linee (ogni due vertici viene creata una linea)."
+
+msgid "Render array as line strip."
+msgstr "Renderizza l'array come una striscia di linee."
+
+msgid "Render array as triangles (every three vertices a triangle is created)."
+msgstr ""
+"Renderizza l'array come triangoli (ogni tre vertici viene creato un "
+"triangolo)."
+
+msgid "Render array as triangle strips."
+msgstr "Renderizza l'array come strisce di triangoli."
+
 msgid ""
 "[PackedVector3Array], [PackedVector2Array], or [Array] of vertex positions."
 msgstr ""
@@ -66364,6 +81266,33 @@ msgstr ""
 "Numero di bit di formato per canale personalizzato. Vedi [enum "
 "ArrayCustomFormat]."
 
+msgid "Amount to shift [enum ArrayCustomFormat] for custom channel index 0."
+msgstr ""
+"Quantità da spostare [enum ArrayCustomFormat] per il canale personalizzato di "
+"indice 0."
+
+msgid "Amount to shift [enum ArrayCustomFormat] for custom channel index 1."
+msgstr ""
+"Quantità da spostare [enum ArrayCustomFormat] per il canale personalizzato di "
+"indice 1."
+
+msgid "Amount to shift [enum ArrayCustomFormat] for custom channel index 2."
+msgstr ""
+"Quantità da spostare [enum ArrayCustomFormat] per il canale personalizzato di "
+"indice 2."
+
+msgid "Amount to shift [enum ArrayCustomFormat] for custom channel index 3."
+msgstr ""
+"Quantità da spostare [enum ArrayCustomFormat] per il canale personalizzato di "
+"indice 3."
+
+msgid ""
+"Mask of custom format bits per custom channel. Must be shifted by one of the "
+"SHIFT constants. See [enum ArrayCustomFormat]."
+msgstr ""
+"Maschera di bit di formato personalizzati per canale personalizzato. Deve "
+"essere spostata da una delle costanti SHIFT. Vedi [enum ArrayCustomFormat]."
+
 msgid ""
 "Shift of first compress flag. Compress flags should be passed to [method "
 "ArrayMesh.add_surface_from_arrays] and [method SurfaceTool.commit]."
@@ -66375,6 +81304,13 @@ msgstr ""
 msgid "Flag used to mark that the array contains 2D vertices."
 msgstr "Flag utilizzato per contrassegnare che l'array contiene vertici 2D."
 
+msgid ""
+"Flag indices that the mesh data will use [code]GL_DYNAMIC_DRAW[/code] on "
+"GLES. Unused on Vulkan."
+msgstr ""
+"Flag che indica che i dati della mesh utilizzeranno [code]GL_DYNAMIC_DRAW[/"
+"code] su GLES. Non utilizzato su Vulkan."
+
 msgid ""
 "Flag used to mark that the mesh contains up to 8 bone influences per vertex. "
 "This flag indicates that [constant ARRAY_BONES] and [constant ARRAY_WEIGHTS] "
@@ -66673,6 +81609,43 @@ msgstr "Restituisce i metadati associati alla faccia specificata."
 msgid "Calculates and returns the face normal of the given face."
 msgstr "Calcola e restituisce la normale alla faccia specificata."
 
+msgid ""
+"Returns the specified vertex index of the given face.\n"
+"[param vertex] must be either [code]0[/code], [code]1[/code], or [code]2[/"
+"code] because faces contain three vertices.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var index = mesh_data_tool.get_face_vertex(0, 1) # Gets the index of the "
+"second vertex of the first face.\n"
+"var position = mesh_data_tool.get_vertex(index)\n"
+"var normal = mesh_data_tool.get_vertex_normal(index)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int index = meshDataTool.GetFaceVertex(0, 1); // Gets the index of the second "
+"vertex of the first face.\n"
+"Vector3 position = meshDataTool.GetVertex(index);\n"
+"Vector3 normal = meshDataTool.GetVertexNormal(index);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce l'indice del vertice specificato della faccia fornita.\n"
+"[param vertex] deve essere [code]0[/code], [code]1[/code], or [code]2[/code] "
+"perché le facce contengono tre vertici.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var index = mesh_data_tool.get_face_vertex(0, 1) # Ottiene l'indice del "
+"secondo vertice della prima faccia.\n"
+"var position = mesh_data_tool.get_vertex(index)\n"
+"var normal = mesh_data_tool.get_vertex_normal(index)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"int index = meshDataTool.GetFaceVertex(0, 1); // Ottiene l'indice del secondo "
+"vertice della prima faccia.\n"
+"Vector3 position = meshDataTool.GetVertex(index);\n"
+"Vector3 normal = meshDataTool.GetVertexNormal(index);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the [Mesh]'s format as a combination of the [enum Mesh.ArrayFormat] "
 "flags. For example, a mesh containing both vertices and normals would return "
@@ -66827,6 +81800,24 @@ msgstr ""
 "[b]Prestazioni:[/b] I dati della [Mesh] devono essere ricevuti dalla GPU, "
 "bloccando il [RenderingServer] nel processo."
 
+msgid ""
+"Takes a snapshot of the current animated skeleton pose of the skinned mesh "
+"and bakes it to the provided [param existing] mesh. If no [param existing] "
+"mesh is provided a new [ArrayMesh] is created, baked, and returned. Requires "
+"a skeleton with a registered skin to work. Blendshapes are ignored. Mesh "
+"surface materials are not copied.\n"
+"[b]Performance:[/b] [Mesh] data needs to be retrieved from the GPU, stalling "
+"the [RenderingServer] in the process."
+msgstr ""
+"Esegue uno snapshot della posa attuale dello scheletro animato della mesh con "
+"skin e la elabora nella mesh [param existing]. Se non è fornita alcuna mesh "
+"[param existing], viene creato, elaborato e restituito un nuovo [ArrayMesh]. "
+"È necessario uno scheletro con una skin registrata per poter funzionare. Le "
+"forme di fusione sono ignorate. I materiali della superficie della mesh non "
+"vengono copiati.\n"
+"[b]Prestazioni:[/b] I dati della [Mesh] devono essere ricevuti dalla GPU, "
+"bloccando il [RenderingServer] nel processo."
+
 msgid ""
 "This helper creates a [StaticBody3D] child node with a [ConvexPolygonShape3D] "
 "collision shape calculated from the mesh geometry. It's mainly used for "
@@ -66964,6 +81955,24 @@ msgstr ""
 "su [param value]. Genera un errore se [member mesh] è [code]null[/code] o non "
 "ha una forma di fusione in quell'indice."
 
+msgid ""
+"Sets the override [param material] for the specified [param surface] of the "
+"[Mesh] resource. This material is associated with this [MeshInstance3D] "
+"rather than with [member mesh].\n"
+"[b]Note:[/b] This assigns the [Material] associated to the [MeshInstance3D]'s "
+"Surface Material Override properties, not the material within the [Mesh] "
+"resource. To set the material within the [Mesh] resource, use [method Mesh."
+"surface_set_material] instead."
+msgstr ""
+"Imposta la sostituzione del [param material] per la superfice [param surface] "
+"della risorsa [Mesh]. Questo materiale è associato a questa [MeshInstance3D] "
+"anziché alla [member mesh].\n"
+"[b]Nota:[/b] Questo assegna il [Material] associato alle proprietà "
+"Sostituzioni del materiale di superficie nella [MeshInstance3D], non il "
+"materiale all'interno della risorsa [Mesh]. Per impostare il materiale "
+"all'interno della risorsa [Mesh], usa invece [method Mesh."
+"surface_get_material]."
+
 msgid "The [Mesh] resource for the instance."
 msgstr "La risorsa [Mesh] per l'istanza."
 
@@ -67008,12 +82017,23 @@ msgstr "Restituisce la lista di ID degli elementi in uso."
 msgid "Returns the item's mesh."
 msgstr "Restituisce la mesh dell'elemento."
 
+msgid ""
+"Returns the item's shadow casting mode. See [enum RenderingServer."
+"ShadowCastingSetting] for possible values."
+msgstr ""
+"Restituisce la modalità di proiezione dell'ombra dell'elemento. Vedi [enum "
+"RenderingServer.ShadowCastingSetting] per i valori possibili."
+
 msgid "Returns the transform applied to the item's mesh."
 msgstr "Restituisce la trasformazione applicata alla mesh dell'elemento."
 
 msgid "Returns the item's name."
 msgstr "Restituisce il nome dell'elemento."
 
+msgid "Returns the item's navigation layers bitmask."
+msgstr ""
+"Restituisce la maschera di bit degli strati di navigazione dell'elemento."
+
 msgid "Returns the item's navigation mesh."
 msgstr "Restituisce la mesh di navigazione dell'elemento."
 
@@ -67052,6 +82072,13 @@ msgstr "Rimuove l'elemento."
 msgid "Sets the item's mesh."
 msgstr "Imposta la mesh dell'elemento."
 
+msgid ""
+"Sets the item's shadow casting mode. See [enum RenderingServer."
+"ShadowCastingSetting] for possible values."
+msgstr ""
+"Imposta la modalità di proiezione dell'ombra dell'elemento. Vedi [enum "
+"RenderingServer.ShadowCastingSetting] per i valori possibili."
+
 msgid "Sets the transform to apply to the item's mesh."
 msgstr "Imposta la trasformazione da applicare alla mesh dell'elemento."
 
@@ -67243,6 +82270,46 @@ msgstr ""
 msgid "Generic mobile VR implementation."
 msgstr "Implementazione generica di realtà virtuale (VR) mobile."
 
+msgid ""
+"This is a generic mobile VR implementation where you need to provide details "
+"about the phone and HMD used. It does not rely on any existing framework. "
+"This is the most basic interface we have. For the best effect, you need a "
+"mobile phone with a gyroscope and accelerometer.\n"
+"Note that even though there is no positional tracking, the camera will assume "
+"the headset is at a height of 1.85 meters. You can change this by setting "
+"[member eye_height].\n"
+"You can initialize this interface as follows:\n"
+"[codeblock]\n"
+"var interface = XRServer.find_interface(\"Native mobile\")\n"
+"if interface and interface.initialize():\n"
+"    get_viewport().use_xr = true\n"
+"[/codeblock]\n"
+"[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/"
+"enable_accelerometer], [member ProjectSettings.input_devices/sensors/"
+"enable_gravity], [member ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] and [member ProjectSettings.input_devices/sensors/"
+"enable_magnetometer] must be enabled."
+msgstr ""
+"Questa è un'implementazione generica di VR mobile in cui devi fornire "
+"dettagli sul telefono e sull'HMD utilizzati. Non si basa su alcun framework "
+"esistente. Questa è l'interfaccia più basilare disponibile. Per ottenere "
+"l'effetto migliore, hai bisogno di un telefono cellulare con giroscopio e "
+"accelerometro.\n"
+"Nota che anche se non c'è tracciamento posizionale, la telecamera presumerà "
+"che il visore si trovi a un'altezza di 1,85 metri. È possibile modificare "
+"questo valore impostando [member eye_height].\n"
+"È possibile inizializzare questa interfaccia come segue:\n"
+"[codeblock]\n"
+"var interface = XRServer.find_interface(\"Native mobile\")\n"
+"if interface and interface.initialize():\n"
+"    get_viewport().use_xr = true\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Per Android, [member ProjectSettings.input_devices/sensors/"
+"enable_accelerometer], [member ProjectSettings.input_devices/sensors/"
+"enable_gravity], [member ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] e [member ProjectSettings.input_devices/sensors/"
+"enable_magnetometer] devono essere abilitati."
+
 msgid ""
 "The distance between the display and the lenses inside of the device in "
 "centimeters."
@@ -67495,6 +82562,13 @@ msgstr ""
 "[b]Nota:[/b] Premere [kbd]Ctrl + C[/kbd] sul terminale che esegue l'editor o "
 "il progetto [i]non[/i] provoca la chiamata di [method _write_end]."
 
+msgid ""
+"Called at the end of every rendered frame. The [param frame_image] and [param "
+"audio_frame_block] function arguments should be written to."
+msgstr ""
+"Chiamato alla fine di ogni frame renderizzato. Gli argomenti della funzione "
+"[param frame_image] e [param audio_frame_block] dovrebbero essere modificati."
+
 msgid ""
 "Adds a writer to be usable by the engine. The supported file extensions can "
 "be set by overriding [method _handles_file].\n"
@@ -67939,6 +83013,28 @@ msgstr ""
 "eseguite nello stesso contesto di questa funzione (ad esempio [code]_process[/"
 "code], [code]physics[/code], [Thread])."
 
+msgid ""
+"Sends an RPC to the target [param peer]. The given [param method] will be "
+"called on the remote [param object] with the provided [param arguments]. The "
+"RPC may also be called locally depending on the implementation and RPC "
+"configuration. See [method Node.rpc] and [method Node.rpc_config].\n"
+"[b]Note:[/b] Prefer using [method Node.rpc], [method Node.rpc_id], or "
+"[code]my_method.rpc(peer, arg1, arg2, ...)[/code] (in GDScript), since they "
+"are faster. This method is mostly useful in conjunction with "
+"[MultiplayerAPIExtension] when extending or replacing the multiplayer "
+"capabilities."
+msgstr ""
+"Invia un RPC al [param peer] di destinazione. Il metodo specificato da [param "
+"method] verrà chiamato sull'oggetto remoto [param object] con gli argomenti "
+"[param arguments]. L'RPC può anche essere chiamato localmente a seconda "
+"dell'implementazione e della configurazione RPC. Vedi [method Node.rpc] e "
+"[method Node.rpc_config].\n"
+"[b]Nota:[/b] Preferisci usare [method Node.rpc], [method Node.rpc_id] o "
+"[code]my_method.rpc(peer, arg1, arg2, ...)[/code] (in GDScript), poiché sono "
+"più veloci. Questo metodo è utile soprattutto in combinazione con "
+"[MultiplayerAPIExtension] quando si estendono o si sostituiscono le capacità "
+"multigiocatore."
+
 msgid ""
 "Sets the default MultiplayerAPI implementation class. This method can be used "
 "by modules and extensions to configure which implementation will be used by "
@@ -68041,6 +83137,181 @@ msgstr ""
 msgid "Base class used for extending the [MultiplayerAPI]."
 msgstr "Classe di base utilizzata per estendere la [MultiplayerAPI]."
 
+msgid ""
+"This class can be used to extend or replace the default [MultiplayerAPI] "
+"implementation via script or extensions.\n"
+"The following example extend the default implementation ([SceneMultiplayer]) "
+"by logging every RPC being made, and every object being configured for "
+"replication.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends MultiplayerAPIExtension\n"
+"class_name LogMultiplayer\n"
+"\n"
+"# We want to extend the default SceneMultiplayer.\n"
+"var base_multiplayer = SceneMultiplayer.new()\n"
+"\n"
+"func _init():\n"
+"    # Just passthrough base signals (copied to var to avoid cyclic "
+"reference)\n"
+"    var cts = connected_to_server\n"
+"    var cf = connection_failed\n"
+"    var pc = peer_connected\n"
+"    var pd = peer_disconnected\n"
+"    base_multiplayer.connected_to_server.connect(func(): cts.emit())\n"
+"    base_multiplayer.connection_failed.connect(func(): cf.emit())\n"
+"    base_multiplayer.peer_connected.connect(func(id): pc.emit(id))\n"
+"    base_multiplayer.peer_disconnected.connect(func(id): pd.emit(id))\n"
+"\n"
+"func _poll():\n"
+"    return base_multiplayer.poll()\n"
+"\n"
+"# Log RPC being made and forward it to the default multiplayer.\n"
+"func _rpc(peer: int, object: Object, method: StringName, args: Array) -> "
+"Error:\n"
+"    print(\"Got RPC for %d: %s::%s(%s)\" % [peer, object, method, args])\n"
+"    return base_multiplayer.rpc(peer, object, method, args)\n"
+"\n"
+"# Log configuration add. E.g. root path (nullptr, NodePath), replication "
+"(Node, Spawner|Synchronizer), custom.\n"
+"func _object_configuration_add(object, config: Variant) -> Error:\n"
+"    if config is MultiplayerSynchronizer:\n"
+"        print(\"Adding synchronization configuration for %s. Synchronizer: "
+"%s\" % [object, config])\n"
+"    elif config is MultiplayerSpawner:\n"
+"        print(\"Adding node %s to the spawn list. Spawner: %s\" % [object, "
+"config])\n"
+"    return base_multiplayer.object_configuration_add(object, config)\n"
+"\n"
+"# Log configuration remove. E.g. root path (nullptr, NodePath), replication "
+"(Node, Spawner|Synchronizer), custom.\n"
+"func _object_configuration_remove(object, config: Variant) -> Error:\n"
+"    if config is MultiplayerSynchronizer:\n"
+"        print(\"Removing synchronization configuration for %s. Synchronizer: "
+"%s\" % [object, config])\n"
+"    elif config is MultiplayerSpawner:\n"
+"        print(\"Removing node %s from the spawn list. Spawner: %s\" % "
+"[object, config])\n"
+"    return base_multiplayer.object_configuration_remove(object, config)\n"
+"\n"
+"# These can be optional, but in our case we want to extend SceneMultiplayer, "
+"so forward everything.\n"
+"func _set_multiplayer_peer(p_peer: MultiplayerPeer):\n"
+"    base_multiplayer.multiplayer_peer = p_peer\n"
+"\n"
+"func _get_multiplayer_peer() -> MultiplayerPeer:\n"
+"    return base_multiplayer.multiplayer_peer\n"
+"\n"
+"func _get_unique_id() -> int:\n"
+"    return base_multiplayer.get_unique_id()\n"
+"\n"
+"func _get_peer_ids() -> PackedInt32Array:\n"
+"    return base_multiplayer.get_peers()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Then in your main scene or in an autoload call [method SceneTree."
+"set_multiplayer] to start using your custom [MultiplayerAPI]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# autoload.gd\n"
+"func _enter_tree():\n"
+"    # Sets our custom multiplayer as the main one in SceneTree.\n"
+"    get_tree().set_multiplayer(LogMultiplayer.new())\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Native extensions can alternatively use the [method MultiplayerAPI."
+"set_default_interface] method during initialization to configure themselves "
+"as the default implementation."
+msgstr ""
+"Questa classe può essere utilizzata per estendere o sostituire "
+"l'implementazione predefinita della [MultiplayerAPI] tramite script o "
+"estensioni.\n"
+"L'esempio seguente estende l'implementazione predefinita ([SceneMultiplayer]) "
+"registrando ogni RPC eseguita e ogni oggetto configurato per la replica.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"extends MultiplayerAPIExtension\n"
+"class_name LogMultiplayer\n"
+"\n"
+"# Vogliamo estendere il SceneMultiplayer predefinito.\n"
+"var base_multiplayer = SceneMultiplayer.new()\n"
+"\n"
+"func _init():\n"
+"    # Oltrepassa i segnali di base (copiati in var per evitare riferimenti "
+"ciclici)\n"
+"    var cts = connected_to_server\n"
+"    var cf = connection_failed\n"
+"    var pc = peer_connected\n"
+"    var pd = peer_disconnected\n"
+"    base_multiplayer.connected_to_server.connect(func(): cts.emit())\n"
+"    base_multiplayer.connection_failed.connect(func(): cf.emit())\n"
+"    base_multiplayer.peer_connected.connect(func(id): pc.emit(id))\n"
+"    base_multiplayer.peer_disconnected.connect(func(id): pd.emit(id))\n"
+"\n"
+"func _poll():\n"
+"    return base_multiplayer.poll()\n"
+"\n"
+"# Registra l'RPC in corso e inoltrala al multiplayer predefinito.\n"
+"func _rpc(peer: int, object: Object, method: StringName, args: Array) -> "
+"Error:\n"
+"    print(\"Ricevuta RPC per %d: %s::%s(%s)\" % [peer, object, method, "
+"args])\n"
+"    return base_multiplayer.rpc(peer, object, method, args)\n"
+"\n"
+"# Registra l'aggiunta di una configurazione. Ad esempio percorso radice "
+"(nullptr, NodePath), replicazione (Node, Spawner|Synchronizer), "
+"personalizzato.\n"
+"func _object_configuration_add(object, config: Variant) -> Error:\n"
+"    if config is MultiplayerSynchronizer:\n"
+"        print(\"Aggiunta configurazione di sincronizzazione per %s. "
+"Sincronizzatore: %s\" % [object, config])\n"
+"    elif config is MultiplayerSpawner:\n"
+"        print(\"Aggiunta nodo %s alla lista di generazioni. Generatore: %s\" "
+"% [object, config])\n"
+"    return base_multiplayer.object_configuration_add(object, config)\n"
+"\n"
+"# Log configuration remove. E.g. root path (nullptr, NodePath), replication "
+"(Node, Spawner|Synchronizer), custom.\n"
+"func _object_configuration_remove(object, config: Variant) -> Error:\n"
+"    if config is MultiplayerSynchronizer:\n"
+"        print(\"Rimozione configurazione di sincronizzazione per %s. "
+"Sincronizzatore: %s\" % [object, config])\n"
+"    elif config is MultiplayerSpawner:\n"
+"        print(\"Rimozione nodo %s dalla lista di generazioni. Generatore: "
+"%s\" % [object, config])\n"
+"    return base_multiplayer.object_configuration_remove(object, config)\n"
+"\n"
+"# Questi possono essere facoltativi, ma nel nostro caso vogliamo estendere "
+"SceneMultiplayer, quindi inoltra tutto.\n"
+"func _set_multiplayer_peer(p_peer: MultiplayerPeer):\n"
+"    base_multiplayer.multiplayer_peer = p_peer\n"
+"\n"
+"func _get_multiplayer_peer() -> MultiplayerPeer:\n"
+"    return base_multiplayer.multiplayer_peer\n"
+"\n"
+"func _get_unique_id() -> int:\n"
+"    return base_multiplayer.get_unique_id()\n"
+"\n"
+"func _get_peer_ids() -> PackedInt32Array:\n"
+"    return base_multiplayer.get_peers()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Successivamente, nella tua scena principale o in un autoload, chiama [method "
+"SceneTree.set_multiplayer] per iniziare a usare la [MultiplayerAPI] "
+"personalizzata:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# autoload.gd\n"
+"func _enter_tree():\n"
+"    # Imposta il multiplayer personalizzato come quello principale in "
+"SceneTree.\n"
+"get_tree().set_multiplayer(LogMultiplayer.new())\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"In alternativa, le estensioni native possono utilizzare il metodo [method "
+"MultiplayerAPI.set_default_interface] durante l'inizializzazione per "
+"configurarsi come implementazione predefinita."
+
 msgid "Called when the [member MultiplayerAPI.multiplayer_peer] is retrieved."
 msgstr ""
 "Chiamato quando viene recuperato [member MultiplayerAPI.multiplayer_peer]."
@@ -68149,6 +83420,17 @@ msgstr ""
 msgid "Returns the ID of this [MultiplayerPeer]."
 msgstr "Restituisce l'ID di questo [MultiplayerPeer]."
 
+msgid ""
+"Returns [code]true[/code] if the server can act as a relay in the current "
+"configuration. That is, if the higher level [MultiplayerAPI] should notify "
+"connected clients of other peers, and implement a relay protocol to allow "
+"communication between them."
+msgstr ""
+"Restituisce [code]true[/code] se il server può fungere da ripetitore nella "
+"configurazione attuale. Ovvero, se la [MultiplayerAPI] di livello superiore "
+"deve notificare ai client connessi la presenza di altri peer, e implementare "
+"un protocollo di ripetizione per consentirne la comunicazione."
+
 msgid "Waits up to 1 second to receive a new network event."
 msgstr "Attende fino a 1 secondo per ricevere un nuovo evento di rete."
 
@@ -68553,6 +83835,20 @@ msgstr ""
 "Percorso verso la radice di generazione. Le scene generabili aggiunte come "
 "figlie dirette sono replicate sugli altri peer."
 
+msgid ""
+"Emitted when a spawnable scene or custom spawn was despawned by the "
+"multiplayer authority. Only called on remote peers."
+msgstr ""
+"Emesso quando una scena generabile o una generazione personalizzata è stata "
+"rimossa dall'autorità multigiocatore. Chiamato solo sui peer remoti."
+
+msgid ""
+"Emitted when a spawnable scene or custom spawn was spawned by the multiplayer "
+"authority. Only called on remote peers."
+msgstr ""
+"Emesso quando una scena generabile o una generazione personalizzata è stata "
+"generata dall'autorità multigiocatore. Chiamato solo sui peer remoti."
+
 msgid ""
 "Synchronizes properties from the multiplayer authority to the remote peers."
 msgstr "Sincronizza le proprietà dall'autorità multigiocatore ai peer remoti."
@@ -68623,6 +83919,17 @@ msgstr ""
 "Se [param for_peer] è [code]0[/code] (il valore predefinito), vengono "
 "aggiornate le visibilità di tutti i peer."
 
+msgid ""
+"Time interval between delta synchronizations. Used when the replication is "
+"set to [constant SceneReplicationConfig.REPLICATION_MODE_ON_CHANGE]. If set "
+"to [code]0.0[/code] (the default), delta synchronizations happen every "
+"network process frame."
+msgstr ""
+"Intervallo di tempo tra sincronizzazioni delta. Usato quando la replicazione "
+"è impostata su [constant SceneReplicationConfig.Replication_MODE_ON_CHANGE]. "
+"Se impostato su [code]0.0[/code] (il valore predefinito), le sincronizzazioni "
+"delta avvengono a ogni frame di processo di rete."
+
 msgid ""
 "Whether synchronization should be visible to all peers by default. See "
 "[method set_visibility_for] and [method add_visibility_filter] for ways of "
@@ -68635,6 +83942,17 @@ msgstr ""
 msgid "Resource containing which properties to synchronize."
 msgstr "Risorsa contenente le proprietà da sincronizzare."
 
+msgid ""
+"Time interval between synchronizations. Used when the replication is set to "
+"[constant SceneReplicationConfig.REPLICATION_MODE_ALWAYS]. If set to "
+"[code]0.0[/code] (the default), synchronizations happen every network process "
+"frame."
+msgstr ""
+"Intervallo di tempo tra le sincronizzazioni. Usato quando la replicazione è "
+"impostata su [constant SceneReplicationConfig.REPLICATION_MODE_ALWAYS]. Se "
+"impostato su [code]0.0[/code] (il valore predefinito), le sincronizzazioni "
+"avvengono a ogni frame di processo di rete."
+
 msgid ""
 "Node path that replicated properties are relative to.\n"
 "If [member root_path] was spawned by a [MultiplayerSpawner], the node will be "
@@ -69265,9 +84583,16 @@ msgstr ""
 "Restituisce la larghezza minima del menu globale.\n"
 "[b]Nota:[/b] Questo metodo è implementato solo su macOS."
 
+msgid ""
+"Returns global menu close callback.\n"
+"[b]Note:[/b] This method is implemented on macOS and Windows."
+msgstr ""
+"Restituisce il callback di chiusura del menu globale.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS e Windows."
+
 msgid ""
 "Returns global menu open callback.\n"
-"b]Note:[/b] This method is implemented only on macOS."
+"[b]Note:[/b] This method is implemented only on macOS."
 msgstr ""
 "Restituisce il callback di apertura del menu globale.\n"
 "[b]Nota:[/b] Questo metodo è implementato solo su macOS."
@@ -69357,6 +84682,19 @@ msgstr ""
 "una voce.\n"
 "[b]Nota:[/b] Questo metodo è implementato solo su macOS."
 
+msgid ""
+"Returns [code]true[/code] if the item at index [param idx] has radio button-"
+"style checkability.\n"
+"[b]Note:[/b] This is purely cosmetic; you must add the logic for checking/"
+"unchecking items in radio groups.\n"
+"[b]Note:[/b] This method is implemented on macOS and Windows."
+msgstr ""
+"Restituisce [code]true[/code] se la voce all'indice [param idx] ha la "
+"possibilità di essere spuntato in stile pulsante di scelta (radio).\n"
+"[b]Nota:[/b] Questo è puramente estetico; bisogna aggiungere manualmente la "
+"logica per spuntare le voci nei gruppi di scelta.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS e Windows."
+
 msgid ""
 "Returns [code]true[/code] if the menu is currently opened.\n"
 "[b]Note:[/b] This method is implemented only on macOS."
@@ -69459,6 +84797,19 @@ msgstr ""
 "add_multistate_item] per i dettagli.\n"
 "[b]Nota:[/b] Questo metodo è implementato su macOS e Windows."
 
+msgid ""
+"Sets the type of the item at the specified index [param idx] to radio button. "
+"If [code]false[/code], sets the type of the item to plain text.\n"
+"[b]Note:[/b] This is purely cosmetic; you must add the logic for checking/"
+"unchecking items in radio groups.\n"
+"[b]Note:[/b] This method is implemented on macOS and Windows."
+msgstr ""
+"Imposta il tipo di voce all'indice [param idx] su pulsante di scelta (radio). "
+"Se [code]false[/code], imposta il tipo di voce su testo semplice.\n"
+"[b]Nota:[/b] Questo è puramente estetico; bisogna aggiungere manualmente la "
+"logica per spuntare le voci nei gruppi di scelta.\n"
+"[b]Nota:[/b] Questo metodo è implementato su macOS e Windows."
+
 msgid ""
 "Sets the state of a multistate item. See [method add_multistate_item] for "
 "details.\n"
@@ -69503,6 +84854,20 @@ msgstr ""
 "Imposta la larghezza minima del menu globale.\n"
 "[b]Nota:[/b] Questo metodo è implementato solo su macOS."
 
+msgid ""
+"Registers callable to emit when the menu is about to show.\n"
+"[b]Note:[/b] The OS can simulate menu opening to track menu item changes and "
+"global shortcuts, in which case the corresponding close callback is not "
+"triggered. Use [method is_opened] to check if the menu is currently opened.\n"
+"[b]Note:[/b] This method is implemented on macOS and Windows."
+msgstr ""
+"Registri chiamabili da emettere quando il menu sta per essere mostrato.\n"
+"[b]Nota:[/b] Il sistema operativo può simulare l'apertura del menu per "
+"tracciare le modifiche alle voci del menu e le scorciatoie globali, nel qual "
+"caso il callback di chiusura corrispondente non viene attivato. Utilizza "
+"[method is_opened] per verificare se il menu è attualmente aperto.\n"
+"[b]Nota:[/b] Questo metodo è implementato solo su macOS e Windows."
+
 msgid ""
 "Registers callable to emit after the menu is closed.\n"
 "[b]Note:[/b] This method is implemented only on macOS."
@@ -71085,6 +86450,9 @@ msgstr ""
 msgid "Clears the internal data."
 msgstr "Svuota i dati interni."
 
+msgid "Clears all projected obstructions."
+msgstr "Cancella tutte le ostruzioni proiettate."
+
 msgid "Returns all the obstructed area outlines arrays."
 msgstr "Restituisce tutti gli array di contorni per le aree ostruite."
 
@@ -71578,6 +86946,13 @@ msgstr ""
 "mesh di navigazione del percorso. Ciò crea percorsi migliori per i layout "
 "basati su tasselli o griglie che limitano il movimento al centro delle celle."
 
+msgid ""
+"Applies no postprocessing and returns the raw path corridor as found by the "
+"pathfinding algorithm."
+msgstr ""
+"Non applica alcuna post-elaborazione e restituisce il corridoio del percorso "
+"grezzo come trovato dall'argoritmo di rilevamento del percorso."
+
 msgid "Don't include any additional metadata about the returned path."
 msgstr "Non includere metadati aggiuntivi sul percorso restituito."
 
@@ -71695,6 +87070,105 @@ msgstr ""
 "Una mesh di navigazione 2D che descrive una superficie attraversabile per la "
 "ricerca del percorso."
 
+msgid ""
+"A navigation mesh can be created either by baking it with the help of the "
+"[NavigationServer2D], or by adding vertices and convex polygon indices arrays "
+"manually.\n"
+"To bake a navigation mesh at least one outline needs to be added that defines "
+"the outer bounds of the baked area.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var new_navigation_mesh = NavigationPolygon.new()\n"
+"var bounding_outline = PackedVector2Array([Vector2(0, 0), Vector2(0, 50), "
+"Vector2(50, 50), Vector2(50, 0)])\n"
+"new_navigation_mesh.add_outline(bounding_outline)\n"
+"NavigationServer2D.bake_from_source_geometry_data(new_navigation_mesh, "
+"NavigationMeshSourceGeometryData2D.new());\n"
+"$NavigationRegion2D.navigation_polygon = new_navigation_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var newNavigationMesh = new NavigationPolygon();\n"
+"Vector2[] boundingOutline = [new Vector2(0, 0), new Vector2(0, 50), new "
+"Vector2(50, 50), new Vector2(50, 0)];\n"
+"newNavigationMesh.AddOutline(boundingOutline);\n"
+"NavigationServer2D.BakeFromSourceGeometryData(newNavigationMesh, new "
+"NavigationMeshSourceGeometryData2D());\n"
+"GetNode<NavigationRegion2D>(\"NavigationRegion2D\").NavigationPolygon = "
+"newNavigationMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Adding vertices and polygon indices manually.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var new_navigation_mesh = NavigationPolygon.new()\n"
+"var new_vertices = PackedVector2Array([Vector2(0, 0), Vector2(0, 50), "
+"Vector2(50, 50), Vector2(50, 0)])\n"
+"new_navigation_mesh.vertices = new_vertices\n"
+"var new_polygon_indices = PackedInt32Array([0, 1, 2, 3])\n"
+"new_navigation_mesh.add_polygon(new_polygon_indices)\n"
+"$NavigationRegion2D.navigation_polygon = new_navigation_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var newNavigationMesh = new NavigationPolygon();\n"
+"Vector2[] newVertices = [new Vector2(0, 0), new Vector2(0, 50), new "
+"Vector2(50, 50), new Vector2(50, 0)];\n"
+"newNavigationMesh.Vertices = newVertices;\n"
+"int[] newPolygonIndices = [0, 1, 2, 3];\n"
+"newNavigationMesh.AddPolygon(newPolygonIndices);\n"
+"GetNode<NavigationRegion2D>(\"NavigationRegion2D\").NavigationPolygon = "
+"newNavigationMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Una mesh di navigazione può essere creata sia preparandola con l'aiuto di "
+"[NavigationServer2D], sia aggiungendo manualmente i vertici e gli array di "
+"indici dei poligoni convessi. Per preparare una mesh di navigazione è "
+"necessario aggiungere almeno un contorno che definisce i limiti esterni "
+"dell'area preparata.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var new_navigation_mesh = NavigationPolygon.new()\n"
+"var bounding_outline = PackedVector2Array([Vector2(0, 0), Vector2(0, 50), "
+"Vector2(50, 50), Vector2(50, 0)])\n"
+"new_navigation_mesh.add_outline(bounding_outline)\n"
+"NavigationServer2D.bake_from_source_geometry_data(new_navigation_mesh, "
+"NavigationMeshSourceGeometryData2D.new());\n"
+"$NavigationRegion2D.navigation_polygon = new_navigation_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var newNavigationMesh = new NavigationPolygon();\n"
+"Vector2[] boundingOutline = [new Vector2(0, 0), new Vector2(0, 50), new "
+"Vector2(50, 50), new Vector2(50, 0)];\n"
+"newNavigationMesh.AddOutline(boundingOutline);\n"
+"NavigationServer2D.BakeFromSourceGeometryData(newNavigationMesh, new "
+"NavigationMeshSourceGeometryData2D());\n"
+"GetNode<NavigationRegion2D>(\"NavigationRegion2D\").NavigationPolygon = "
+"newNavigationMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Aggiungere manualmente i vertici e gli indici dei poligoni.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var new_navigation_mesh = NavigationPolygon.new()\n"
+"var new_vertices = PackedVector2Array([Vector2(0, 0), Vector2(0, 50), "
+"Vector2(50, 50), Vector2(50, 0)])\n"
+"new_navigation_mesh.vertices = new_vertices\n"
+"var new_polygon_indices = PackedInt32Array([0, 1, 2, 3])\n"
+"new_navigation_mesh.add_polygon(new_polygon_indices)\n"
+"$NavigationRegion2D.navigation_polygon = new_navigation_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var newNavigationMesh = new NavigationPolygon();\n"
+"Vector2[] newVertices = [new Vector2(0, 0), new Vector2(0, 50), new "
+"Vector2(50, 50), new Vector2(50, 0)];\n"
+"newNavigationMesh.Vertices = newVertices;\n"
+"int[] newPolygonIndices = [0, 1, 2, 3];\n"
+"newNavigationMesh.AddPolygon(newPolygonIndices);\n"
+"GetNode<NavigationRegion2D>(\"NavigationRegion2D\").NavigationPolygon = "
+"newNavigationMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Navigation Polygon 2D Demo"
 msgstr "Demo di poligono di navigazione 2D"
 
@@ -71947,6 +87421,13 @@ msgstr ""
 "[code]true[/code] (predefinito), la preparazione viene eseguita su un thread "
 "separato."
 
+msgid ""
+"Returns the axis-aligned rectangle for the region's transformed navigation "
+"mesh."
+msgstr ""
+"Restituisce il rettangolo allineato agli assi per la mesh trasformata di "
+"navigazione della regione."
+
 msgid "Returns the current navigation map [RID] used by this region."
 msgstr ""
 "Restituisce il [RID] attuale della mappa di navigazione utilizzata da questa "
@@ -72105,6 +87586,13 @@ msgstr ""
 "automaticamente disabilitata sui sistemi operativi che non possono utilizzare "
 "i thread (ad esempio su Web con thread disabilitati)."
 
+msgid ""
+"Returns the axis-aligned bounding box for the region's transformed navigation "
+"mesh."
+msgstr ""
+"Restituisce la bounding box allineata agli assi per la mesh trasformata di "
+"navigazione della regione."
+
 msgid "Returns the [RID] of this region on the [NavigationServer3D]."
 msgstr "Restituisce il [RID] di questa regione sul [NavigationServer3D]."
 
@@ -72311,6 +87799,18 @@ msgstr ""
 msgid "Returns the velocity of the specified [param agent]."
 msgstr "Restituisce la velocità dell'agente specificato [param agent]."
 
+msgid ""
+"Return [code]true[/code] if the specified [param agent] has an avoidance "
+"callback."
+msgstr ""
+"Restituisce [code]true[/code] se l'agente [param agent] ha un callback di "
+"evasione."
+
+msgid "Returns [code]true[/code] if the map got changed the previous frame."
+msgstr ""
+"Restituisce [code]true[/code] se la mappa è stata modificata nel frame "
+"precedente."
+
 msgid ""
 "Sets the callback [Callable] that gets called after each avoidance processing "
 "step for the [param agent]. The calculated [code]safe_velocity[/code] will be "
@@ -72387,6 +87887,15 @@ msgstr ""
 "tempo di esecuzione della simulazione. Se il numero è troppo basso, la "
 "simulazione non sarà sicura."
 
+msgid ""
+"If [param paused] is [code]true[/code] the specified [param agent] will not "
+"be processed, e.g. calculate avoidance velocities or receive avoidance "
+"callbacks."
+msgstr ""
+"Se [param paused] è [code]true[/code], l'agente [param agent] non sarà "
+"elaborato, ovvero le velocità di evasione non saranno calcolate o i callback "
+"di evasione non saranno ricevuti."
+
 msgid "Sets the position of the agent in world space."
 msgstr "Imposta la posizione dell'agente nello spazio globale."
 
@@ -72647,6 +88156,21 @@ msgstr ""
 "Restituisce le dimensioni della cella della mappa utilizzata per rasterizzare "
 "i vertici della mesh di navigazione."
 
+msgid ""
+"Returns the navigation mesh surface point closest to the provided [param "
+"to_point] on the navigation [param map]."
+msgstr ""
+"Restituisce il punto sulla superfice della mesh di navigazione che è più "
+"vicino al punto [param to_point] sulla mappa di navigazione [param map]."
+
+msgid ""
+"Returns the owner region RID for the navigation mesh surface point closest to "
+"the provided [param to_point] on the navigation [param map]."
+msgstr ""
+"Restituisce il RID proprietario di regione per il punto sulla superfice della "
+"mesh di navigazione che è più vicino al punto [param to_point] sulla mappa di "
+"navigazione [param map]."
+
 msgid ""
 "Returns the edge connection margin of the map. The edge connection margin is "
 "a distance used to connect two regions."
@@ -72723,6 +88247,13 @@ msgstr ""
 "Restituisce tutti i [RID] delle regioni di navigazione attualmente assegnate "
 "alla mappa di navigazione specificata da [param map]."
 
+msgid ""
+"Returns [code]true[/code] if the [param map] synchronization uses an async "
+"process that runs on a background thread."
+msgstr ""
+"Restituisce [code]true[/code] se la sincronizzazione della mappa [param map] "
+"usa un processo asincrono che viene eseguito su un thread in background."
+
 msgid ""
 "Returns whether the navigation [param map] allows navigation regions to use "
 "edge connections to connect with other navigation regions within proximity of "
@@ -72733,6 +88264,9 @@ msgstr ""
 "regioni di navigazione in prossimità del margine di connessione ai bordi "
 "della mappa di navigazione."
 
+msgid "Returns [code]true[/code] if the map is active."
+msgstr "Restituisce [code]true[/code] se la mappa è attiva."
+
 msgid "Sets the map active."
 msgstr "Imposta la mappa come attiva."
 
@@ -72757,6 +88291,14 @@ msgstr ""
 "Imposta il raggio di connessione dei collegamenti della mappa utilizzato per "
 "collegare i collegamenti ai poligoni di navigazione."
 
+msgid ""
+"If [param enabled] is [code]true[/code] the [param map] synchronization uses "
+"an async process that runs on a background thread."
+msgstr ""
+"Se [param enabled] è [code]true[/code], la sincronizzazione della mappa "
+"[param map] usa un processo asincrono che viene eseguito su un thread in "
+"background."
+
 msgid ""
 "Set the navigation [param map] edge connection use. If [param enabled] is "
 "[code]true[/code], the navigation map allows navigation regions to use edge "
@@ -72829,6 +88371,13 @@ msgstr "Imposta il bitmask [code]avoidance_layers[/code] dell'ostacolo."
 msgid "Sets the navigation map [RID] for the obstacle."
 msgstr "Imposta il [RID] della mappa di navigazione per l'ostacolo."
 
+msgid ""
+"If [param paused] is [code]true[/code] the specified [param obstacle] will "
+"not be processed, e.g. affect avoidance velocities."
+msgstr ""
+"Se [param paused] è [code]true[/code] l'ostacolo [param obstacle] non verrà "
+"elaborato, ovvero non influenzerà sulle velocità di evasione."
+
 msgid "Sets the position of the obstacle in world space."
 msgstr "Imposta la posizione dell'ostacolo in spazio globale."
 
@@ -72882,9 +88431,37 @@ msgstr ""
 "le prestazioni, si preferisce utilizzare, ad esempio, forme di collisione o "
 "creare gli array di dati interamente in codice."
 
+msgid ""
+"Queries a path in a given navigation map. Start and target position and other "
+"parameters are defined through [NavigationPathQueryParameters2D]. Updates the "
+"provided [NavigationPathQueryResult2D] result object with the path among "
+"other results requested by the query. After the process is finished the "
+"optional [param callback] will be called."
+msgstr ""
+"Ricerca un percorso in una mappa di navigazione specificata. La posizione di "
+"partenza e di arrivo e altri parametri sono definiti tramite "
+"[NavigationPathQueryParameters2D]. Aggiorna l'oggetto fornito "
+"[NavigationPathQueryResult2D] risultante con il percorso, assieme agli altri "
+"risultati richiesti dalla query. Dopo che il processo ha terminato, verrà "
+"chiamato il [param callback] facoltativo."
+
 msgid "Creates a new region."
 msgstr "Crea una nuova regione."
 
+msgid ""
+"Returns the axis-aligned rectangle for the [param region]'s transformed "
+"navigation mesh."
+msgstr ""
+"Restituisce il rettangolo allineato agli assi per la mesh trasformata di "
+"navigazione della regione [param region]."
+
+msgid ""
+"Returns the navigation mesh surface point closest to the provided [param "
+"to_point] on the navigation [param region]."
+msgstr ""
+"Restituisce il punto sulla superfice della mesh di navigazione che è più "
+"vicino al punto [param to_point] sulla regione di navigazione [param region]."
+
 msgid ""
 "Returns the ending point of a connection door. [param connection] is an index "
 "between 0 and the return value of [method region_get_connections_count]."
@@ -73305,6 +88882,27 @@ msgstr ""
 "Restituisce le dimensioni delle celle della mappa utilizzate per rasterizzare "
 "i vertici della mesh di navigazione sul piano XZ."
 
+msgid ""
+"Returns the navigation mesh surface normal closest to the provided [param "
+"to_point] on the navigation [param map]."
+msgstr ""
+"Restituisce la normale sulla superfice della mesh di navigazione più vicina "
+"al punto [param to_point] sulla superficie della mappa di navigazione [param "
+"map]."
+
+msgid ""
+"Returns the navigation mesh surface point closest to the provided [param "
+"start] and [param end] segment on the navigation [param map].\n"
+"If [param use_collision] is [code]true[/code], a closest point test is only "
+"done when the segment intersects with the navigation mesh surface."
+msgstr ""
+"Restituisce il punto sulla superfice della mesh di navigazione che è più "
+"vicino al segmento fornito ([param start] e [param end]) sulla mappa di "
+"navigazione [param map].\n"
+"Se [param use_collision] è [code]true[/code], un test del punto più vicino "
+"viene eseguito solo quando il segmento interseca la superficie della mesh di "
+"navigazione."
+
 msgid ""
 "Returns the edge connection margin of the map. This distance is the minimum "
 "vertex distance needed to connect two edges from different regions."
@@ -73321,6 +88919,16 @@ msgstr ""
 msgid "Returns the map's up direction."
 msgstr "Restituisce la direzione in alto per la mappa."
 
+msgid ""
+"Returns [code]true[/code] if the navigation [param map] allows navigation "
+"regions to use edge connections to connect with other navigation regions "
+"within proximity of the navigation map edge connection margin."
+msgstr ""
+"Restituisce [code]true[/code] se la mappa di navigazione [param map] consente "
+"alle regioni di navigazione di utilizzare connessioni ai bordi per collegarsi "
+"con altre regioni di navigazione in prossimità del margine di connessione ai "
+"bordi della mappa di navigazione."
+
 msgid ""
 "Sets the map cell height used to rasterize the navigation mesh vertices on "
 "the Y axis. Must match with the cell height of the used navigation meshes."
@@ -73386,6 +88994,20 @@ msgstr ""
 "Imposta se l'ostacolo [param obstacle] utilizza l'evasione 2D o l'evasione 3D "
 "mentre l'evasione è abilitata."
 
+msgid ""
+"Queries a path in a given navigation map. Start and target position and other "
+"parameters are defined through [NavigationPathQueryParameters3D]. Updates the "
+"provided [NavigationPathQueryResult3D] result object with the path among "
+"other results requested by the query. After the process is finished the "
+"optional [param callback] will be called."
+msgstr ""
+"Ricerca un percorso in una mappa di navigazione specificata. La posizione di "
+"partenza e di arrivo e altri parametri sono definiti tramite "
+"[NavigationPathQueryParameters3D]. Aggiorna l'oggetto fornito "
+"[NavigationPathQueryParameters3D] risultante con il percorso, assieme agli "
+"altri risultati richiesti dalla query. Dopo che il processo ha terminato, "
+"verrà chiamato il [param callback] facoltativo."
+
 msgid ""
 "Bakes the [param navigation_mesh] with bake source geometry collected "
 "starting from the [param root_node]."
@@ -73393,6 +89015,44 @@ msgstr ""
 "Prepara il mesh di navigazione [param navigation_mesh] con la geometria "
 "sorgente raccolta a partire dal nodo radice [param root_node]."
 
+msgid ""
+"Returns the axis-aligned bounding box for the [param region]'s transformed "
+"navigation mesh."
+msgstr ""
+"Restituisce la bounding box allineata agli assi per la mesh trasformata di "
+"navigazione della regione [param region]."
+
+msgid ""
+"Returns the navigation mesh surface normal closest to the provided [param "
+"to_point] on the navigation [param region]."
+msgstr ""
+"Restituisce la normale sulla superfice della mesh di navigazione più vicina "
+"al punto [param to_point] sulla superficie della regione di navigazione "
+"[param region]."
+
+msgid ""
+"Returns the navigation mesh surface point closest to the provided [param "
+"start] and [param end] segment on the navigation [param region].\n"
+"If [param use_collision] is [code]true[/code], a closest point test is only "
+"done when the segment intersects with the navigation mesh surface."
+msgstr ""
+"Restituisce il punto sulla superfice della mesh di navigazione che è più "
+"vicino al segmento fornito ([param start] e [param end]) sulla regione di "
+"navigazione [param region].\n"
+"Se [param use_collision] è [code]true[/code], un test del punto più vicino "
+"viene eseguito solo quando il segmento interseca la superficie della mesh di "
+"navigazione."
+
+msgid ""
+"Returns [code]true[/code] if the navigation [param region] is set to use edge "
+"connections to connect with other navigation regions within proximity of the "
+"navigation map edge connection margin."
+msgstr ""
+"Restituisce [code]true[/code] se la regione di navigazione [param region] è "
+"impostata per utilizzare le connessioni ai bordi per collegarsi con altre "
+"regioni di navigazione in prossimità del margine di connessione ai bordi "
+"della mappa di navigazione."
+
 msgid ""
 "If [param enabled] is [code]true[/code], the specified [param region] will "
 "contribute to its current navigation map."
@@ -73482,6 +89142,9 @@ msgstr ""
 "navigazione che non possono essere uniti ma che possono essere comunque "
 "collegati tramite prossimità dei bordi o tramite collegamenti."
 
+msgid "Constant to get the number of active navigation obstacles."
+msgstr "Costante per ottenere il numero di ostacoli di navigazione attivi."
+
 msgid ""
 "A control that displays a texture by keeping its corners intact, but tiling "
 "its edges and center."
@@ -74314,6 +89977,21 @@ msgstr ""
 "è all'interno di [SceneTree]. Potrebbe non funzionare nel caso improbabile in "
 "cui si utilizzi un [MainLoop] personalizzato."
 
+msgid ""
+"Duplicates the node, returning a new node with all of its properties, "
+"signals, groups, and children copied from the original. The behavior can be "
+"tweaked through the [param flags] (see [enum DuplicateFlags]).\n"
+"[b]Note:[/b] For nodes with a [Script] attached, if [method Object._init] has "
+"been defined with required parameters, the duplicated node will not have a "
+"[Script]."
+msgstr ""
+"Duplica il nodo, restituendo un nuovo nodo con tutte le sue proprietà, "
+"segnali e gruppi copiati dall'originale. Il comportamento può essere "
+"modificato tramite [param flags] (vedi [enum DuplicateFlags]).\n"
+"[b]Nota:[/b] Per i nodi con uno [Script] allegato, se [method Object._init] è "
+"stato definito con i parametri obbligatori, il nodo duplicato non avrà uno "
+"[Script]."
+
 msgid ""
 "Finds the first descendant of this node whose [member name] matches [param "
 "pattern], returning [code]null[/code] if no match is found. The matching is "
@@ -74685,12 +90363,12 @@ msgid ""
 "[/csharp]\n"
 "[/codeblocks]"
 msgstr ""
-"Recupera un nodo e la sua risorsa più nidificata come specificato dal "
-"sottonome del [NodePath]. Restituisce un [Array] di dimensione [code]3[/code] "
+"Recupera un nodo e la sua risorsa più nidificata come specificato dal sotto-"
+"nome del [NodePath]. Restituisce un [Array] di dimensione [code]3[/code] "
 "dove:\n"
 "- L'elemento [code]0[/code] è il [Node], o [code]null[/code] se non trovato;\n"
-"- L'elemento [code]1[/code] è l'ultima [Resource] nidificata del sottonome, o "
-"[code]null[/code] se non trovata;\n"
+"- L'elemento [code]1[/code] è l'ultima [Resource] nidificata del sotto-nome, "
+"o [code]null[/code] se non trovata;\n"
 "- L'elemento [code]2[/code] è il [NodePath] rimanente, che si riferisce a una "
 "proprietà esistente, di tipo non [Resource] (vedi [method Object."
 "get_indexed]).\n"
@@ -74776,6 +90454,14 @@ msgstr ""
 "univoco, il percorso potrebbe essere più lungo di un normale percorso "
 "relativo, a causa dell'aggiunta del nome univoco del nodo."
 
+msgid ""
+"Returns [code]true[/code] if this node is an instance load placeholder. See "
+"[InstancePlaceholder] and [method set_scene_instance_load_placeholder]."
+msgstr ""
+"Restituisce [code]true[/code] se questo nodo è un segnaposto di carico di "
+"istanza. Vedi [InstancePlaceholder] e [method "
+"set_scene_instance_load_placeholder]."
+
 msgid ""
 "Returns the [SceneTree] that contains this node. If this node is not inside "
 "the tree, generates an error and returns [code]null[/code]. See also [method "
@@ -74873,7 +90559,7 @@ msgid ""
 "get_node_and_resource]."
 msgstr ""
 "Restituisce [code]true[/code] se il percorso [param path] punta a un nodo "
-"valido e i suoi sottonomi puntano a una [Resource] valida, ad esempio "
+"valido e i suoi sotto-nomi puntano a una [Resource] valida, ad esempio "
 "[code]Area2D/CollisionShape2D:shape[/code]. Le proprietà che non sono di tipo "
 "[Resource] (come i nodi o altri tipi [Variant]) non sono considerate. Vedi "
 "anche [method get_node_and_resource]."
@@ -75616,6 +91302,22 @@ msgstr ""
 "carattere [code]@[/code] è riservato ai nomi generati automaticamente. Vedere "
 "anche [method String.validate_node_name]."
 
+msgid ""
+"The owner of this node. The owner must be an ancestor of this node. When "
+"packing the owner node in a [PackedScene], all the nodes it owns are also "
+"saved with it. See also [member unique_name_in_owner].\n"
+"[b]Note:[/b] In the editor, nodes not owned by the scene root are usually not "
+"displayed in the Scene dock, and will [b]not[/b] be saved. To prevent this, "
+"remember to set the owner after calling [method add_child]."
+msgstr ""
+"Il proprietario di questo nodo. Il proprietario deve essere un antenato di "
+"questo nodo. Quando si impacchetta il nodo proprietario in un [PackedScene], "
+"tutti i nodi posseduti da esso sono salvati con esso.\n"
+"[b]Nota:[/b] Nell'editor, i nodi non posseduti dalla radice della scena di "
+"solito non sono visualizzati nel pannello Scena e [b]non[/b] saranno salvati. "
+"Per evitare ciò, ricorda di impostare il proprietario dopo aver chiamato "
+"[method add_child]. Vedi anche ([member unique_name_in_owner])."
+
 msgid ""
 "Allows enabling or disabling physics interpolation per node, offering a finer "
 "grain of control than turning physics interpolation on and off globally. See "
@@ -75642,6 +91344,26 @@ msgstr ""
 "verificare se il nodo può eseguire l'elaborazione nella sua modalità attuale, "
 "usa [method can_process]."
 
+msgid ""
+"Similar to [member process_priority] but for [constant "
+"NOTIFICATION_PHYSICS_PROCESS], [method _physics_process], or [constant "
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS]."
+msgstr ""
+"Simile a [member process_priority] ma per [constant "
+"NOTIFICATION_PHYSICS_PROCESS], [method _physics_process] o [constant "
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS]."
+
+msgid ""
+"The node's execution order of the process callbacks ([method _process], "
+"[constant NOTIFICATION_PROCESS], and [constant "
+"NOTIFICATION_INTERNAL_PROCESS]). Nodes whose priority value is [i]lower[/i] "
+"call their process callbacks first, regardless of tree order."
+msgstr ""
+"L'ordine di esecuzione dei callback di processo ([method _process], [constant "
+"NOTIFICATION_PROCESS] e [constant NOTIFICATION_INTERNAL_PROCESS]) del nodo. I "
+"nodi il cui valore di priorità è [i]inferiore[/i] chiamano per primi i loro "
+"callback di processo, a prescindere dall'ordine nell'albero."
+
 msgid ""
 "Set the process thread group for this node (basically, whether it receives "
 "[constant NOTIFICATION_PROCESS], [constant NOTIFICATION_PHYSICS_PROCESS], "
@@ -75780,6 +91502,13 @@ msgstr ""
 msgid "Emitted when the node's editor description field changed."
 msgstr "Emesso quando il campo della descrizione dell'editor del nodo cambia."
 
+msgid ""
+"Emitted when an attribute of the node that is relevant to the editor is "
+"changed. Only emitted in the editor."
+msgstr ""
+"Emesso quando un attributo del nodo rilevante per l'editor viene modificato. "
+"Emesso solo nell'editor."
+
 msgid ""
 "Emitted when the node is considered ready, after [method _ready] is called."
 msgstr ""
@@ -76124,6 +91853,9 @@ msgstr ""
 "condizione che il suo [member Viewport.gui_disable_input] sia [code]false[/"
 "code] e a prescindere dal fatto che sia attualmente focalizzata o meno."
 
+msgid "Notification received when the window is moved."
+msgstr "Notifica ricevuta quando la finestra viene mossa."
+
 msgid ""
 "Notification received from the OS when the application is exceeding its "
 "allocated memory.\n"
@@ -76323,6 +92055,15 @@ msgstr ""
 "Duplica lo script del nodo (sovrascrivendo anche gli script dei figli "
 "duplicati, se combinato con [constant DUPLICATE_USE_INSTANTIATION])."
 
+msgid ""
+"Duplicate using [method PackedScene.instantiate]. If the node comes from a "
+"scene saved on disk, reuses [method PackedScene.instantiate] as the base for "
+"the duplicated node and its children."
+msgstr ""
+"Duplica utilizzando [method PackedScene.instantiate]. Se il nodo proviene da "
+"una scena salvata su disco, riutilizza [method PackedScene.instantiate] come "
+"base per il nodo duplicato e i suoi figli."
+
 msgid "The node will not be internal."
 msgstr "Il nodo non sarà interno."
 
@@ -76366,6 +92107,31 @@ msgstr ""
 "L'analisi delle stringhe per la generazione di POT sarà saltata per questo "
 "nodo e per i figli impostati su [constant AUTO_TRANSLATE_MODE_INHERIT]."
 
+msgid ""
+"A 2D game object, inherited by all 2D-related nodes. Has a position, "
+"rotation, scale, and skew."
+msgstr ""
+"Un oggetto di gioco 2D, ereditato da tutti i nodi riguardanti il 2D. Ha una "
+"posizione, una rotazione, una scala e un'inclinazione."
+
+msgid ""
+"A 2D game object, with a transform (position, rotation, and scale). All 2D "
+"nodes, including physics objects and sprites, inherit from Node2D. Use Node2D "
+"as a parent node to move, scale and rotate children in a 2D project. Also "
+"gives control of the node's render order.\n"
+"[b]Note:[/b] Since both [Node2D] and [Control] inherit from [CanvasItem], "
+"they share several concepts from the class such as the [member CanvasItem."
+"z_index] and [member CanvasItem.visible] properties."
+msgstr ""
+"Un oggetto di gioco 2D, con una trasformazione (posizione, rotazione e "
+"scala). Tutti i nodi 2D, inclusi gli oggetti di fisica e gli sprite, "
+"ereditano da Node2D. Utilizza Node2D come nodo genitore per spostare, scalare "
+"e ruotare i figli in un progetto 2D. Offre inoltre il controllo dell'ordine "
+"di rendering del nodo.\n"
+"[b]Nota:[/b] Poiché sia [Node2D] che [Control] ereditano da [CanvasItem], "
+"essi condividono diversi concetti della classe come le proprietà [member "
+"CanvasItem.z_index] e [member CanvasItem.visible]."
+
 msgid "All 2D Demos"
 msgstr "Tutte le demo 2D"
 
@@ -76455,6 +92221,93 @@ msgid "Translates the node by the given [param offset] in local coordinates."
 msgstr ""
 "Trasla il nodo in base a [param offset] specificato in coordinate locali."
 
+msgid "Global position. See also [member position]."
+msgstr "La posizione globale. Vedi anche [member position]."
+
+msgid "Global rotation in radians. See also [member rotation]."
+msgstr "Rotazione globale in radianti. Vedi anche [member rotation]."
+
+msgid ""
+"Helper property to access [member global_rotation] in degrees instead of "
+"radians. See also [member rotation_degrees]."
+msgstr ""
+"Proprietà di supporto per accedere a [member global_rotation] in gradi "
+"anziché in radianti. Vedi anche [member rotation_degrees]."
+
+msgid "Global scale. See also [member scale]."
+msgstr "Scala globale. Vedi anche [member scale]."
+
+msgid "Global skew in radians. See also [member skew]."
+msgstr "Inclinazione globale in radianti. Vedi anche [member skew]."
+
+msgid "Global [Transform2D]. See also [member transform]."
+msgstr "[Transform2D] globale. Vedi anche [member transform]."
+
+msgid ""
+"Position, relative to the node's parent. See also [member global_position]."
+msgstr ""
+"Posizione, relativa al nodo genitore. Vedi anche [member global_position]."
+
+msgid ""
+"Rotation in radians, relative to the node's parent. See also [member "
+"global_rotation].\n"
+"[b]Note:[/b] This property is edited in the inspector in degrees. If you want "
+"to use degrees in a script, use [member rotation_degrees]."
+msgstr ""
+"Rotazione in radianti, relativa al genitore del nodo. Vedi anche [member "
+"global_rotation].\n"
+"[b]Nota:[/b] Questa proprietà è modificata nell'ispettore in gradi. Se vuoi "
+"usare i gradi in uno script, usa [member rotation_degrees]."
+
+msgid ""
+"Helper property to access [member rotation] in degrees instead of radians. "
+"See also [member global_rotation_degrees]."
+msgstr ""
+"Proprietà di supporto per accedere a [member rotation] in gradi anziché in "
+"radianti. Vedi anche [member global_rotation_degrees]."
+
+msgid ""
+"The node's scale, relative to the node's parent. Unscaled value: [code](1, 1)"
+"[/code]. See also [member global_scale].\n"
+"[b]Note:[/b] Negative X scales in 2D are not decomposable from the "
+"transformation matrix. Due to the way scale is represented with "
+"transformation matrices in Godot, negative scales on the X axis will be "
+"changed to negative scales on the Y axis and a rotation of 180 degrees when "
+"decomposed."
+msgstr ""
+"La scala del nodo, relativa al genitore del nodo. Valore non scalato: [code]"
+"(1, 1)[/code]. Vedi anche [member global_scale].\n"
+"[b]Nota:[/b] Le scale X negative in 2D non sono scomponibili dalla matrice di "
+"trasformazione. A causa del modo in cui la scala è rappresentata con le "
+"matrici di trasformazione in Godot, le scale negative sull'asse X saranno "
+"modificate in scale negative sull'asse Y e una rotazione di 180 gradi quando "
+"scomposte."
+
+msgid ""
+"If set to a non-zero value, slants the node in one direction or another. This "
+"can be used for pseudo-3D effects. See also [member global_skew].\n"
+"[b]Note:[/b] Skew is performed on the X axis only, and [i]between[/i] "
+"rotation and scaling.\n"
+"[b]Note:[/b] This property is edited in the inspector in degrees. If you want "
+"to use degrees in a script, use [code]skew = deg_to_rad(value_in_degrees)[/"
+"code]."
+msgstr ""
+"Se impostato su un valore diverso da zero, inclina il nodo in una direzione o "
+"nell'altra. Può essere utilizzato per effetti pseudo-3D. Vedi anche [member "
+"global_skew].\n"
+"[b]Nota:[/b] L'inclinazione viene eseguita solo sull'asse X e [i]tra[/i] la "
+"rotazione e il ridimensionamento.\n"
+"[b]Nota:[/b] Questa proprietà viene modificata nell'ispettore in gradi. Se è "
+"necessario utilizzare i gradi in uno script, usa [code]skew = "
+"deg_to_rad(valore_in_gradi)[/code]."
+
+msgid ""
+"The node's [Transform2D], relative to the node's parent. See also [member "
+"global_transform]."
+msgstr ""
+"il [Transform2D] del nodo, relativo al nodo genitore di questo nodo. Vedi "
+"anche [member global_transform]."
+
 msgid "Most basic 3D game object, parent of all 3D-related nodes."
 msgstr ""
 "L'oggetto di gioco 3D più basilare, ereditato da tutti i nodi correlati al 3D."
@@ -76552,6 +92405,12 @@ msgstr ""
 "unitario, di un angolo specificato in radianti. L'asse di rotazione è nel "
 "sistema di coordinate globali."
 
+msgid ""
+"Scales the global (world) transformation by the given [Vector3] scale factors."
+msgstr ""
+"Scala la trasformazione globale (mondiale) per il [Vector3] specificato di "
+"fattori di scala."
+
 msgid ""
 "Moves the global (world) transformation by [Vector3] offset. The offset is in "
 "global coordinate system."
@@ -76588,6 +92447,41 @@ msgstr ""
 "e locale. Per impostazione predefinita, [Node3D] non propagherà questa "
 "informazione."
 
+msgid ""
+"Rotates the node so that the local forward axis (-Z, [constant Vector3."
+"FORWARD]) points toward the [param target] position.\n"
+"The local up axis (+Y) points as close to the [param up] vector as possible "
+"while staying perpendicular to the local forward axis. The resulting "
+"transform is orthogonal, and the scale is preserved. Non-uniform scaling may "
+"not work correctly.\n"
+"The [param target] position cannot be the same as the node's position, the "
+"[param up] vector cannot be zero.\n"
+"The [param target] and the [param up] cannot be [constant Vector3.ZERO], and "
+"shouldn't be colinear to avoid unintended rotation around local Z axis.\n"
+"Operations take place in global space, which means that the node must be in "
+"the scene tree.\n"
+"If [param use_model_front] is [code]true[/code], the +Z axis (asset front) is "
+"treated as forward (implies +X is left) and points toward the [param target] "
+"position. By default, the -Z axis (camera forward) is treated as forward "
+"(implies +X is right)."
+msgstr ""
+"Ruota il nodo in modo che l'asse locale in avanti (-Z, [constant Vector3."
+"FORWARD]) punti verso la posizione [param target].\n"
+"L'asse locale in alto (+Y) punta il più vicino possibile al vettore [param "
+"up], pur rimanendo perpendicolare all'asse locale in avanti. La "
+"trasformazione risultante è ortogonale e la scala è conservata. Una scalatura "
+"non uniforme potrebbe non funzionare correttamente.\n"
+"La posizione [param target] non può essere la stessa della posizione del "
+"nodo, il vettore [param up] non può essere zero.\n"
+"I vettori [param target] e [param up] non dovrebbero essere collineari per "
+"evitare una rotazione involontaria attorno all'asse Z locale.\n"
+"Le operazioni avvengono nello spazio globale, il che significa che il nodo "
+"deve essere nell'albero di scene.\n"
+"Se [param use_model_front] è [code]true[/code], l'asse +Z (avanti per gli "
+"asset) viene trattato come in avanti (implica che +X sia a sinistra) e punta "
+"verso la posizione [param target]. Come predefinito, l'asse -Z (avanti per la "
+"telecamera) viene trattato come in avanti (implica che +X sia a destra)."
+
 msgid ""
 "Moves the node to the specified [param position], and then rotates the node "
 "to point toward the [param target] as per [method look_at]. Operations take "
@@ -76833,7 +92727,7 @@ msgid ""
 "orientation is constructed by rotating the Euler angles in the order "
 "specified by this property."
 msgstr ""
-"Specificare l'ordine di rotazione delle assi della proprietà [member "
+"Specificare l'ordine di rotazione degli assi della proprietà [member "
 "rotation]. L'orientamento finale è costruito ruotando gli angoli di Eulero "
 "nell'ordine specificato da questa proprietà."
 
@@ -77037,7 +92931,7 @@ msgstr ""
 "senza una dipendenza rigida al nodo o alla proprietà a cui puntano.\n"
 "Un percorso di nodo è rappresentato come una [String] composta da nomi di "
 "nodi separati da barra ([code]/[/code]) e nomi di proprietà separati da due "
-"punti ([code]:[/code]) (chiamati anche \"sottonomi\"). Simili a un percorso "
+"punti ([code]:[/code]) (chiamati anche \"sotto-nomi\"). Simili a un percorso "
 "di file system, [code]\"..\"[/code] e [code]\".\"[/code] sono nomi di nodo "
 "speciali. Si riferiscono rispettivamente al nodo padre e al nodo attuale.\n"
 "Gli esempi seguenti sono percorsi relativi al nodo attuale:\n"
@@ -77099,6 +92993,113 @@ msgstr "Costruisce un [NodePath] vuoto."
 msgid "Constructs a [NodePath] as a copy of the given [NodePath]."
 msgstr "Costruisce un [NodePath] come copia del [NodePath] specificato."
 
+msgid ""
+"Constructs a [NodePath] from a [String]. The created path is absolute if "
+"prefixed with a slash (see [method is_absolute]).\n"
+"The \"subnames\" optionally included after the path to the target node can "
+"point to properties, and can also be nested.\n"
+"The following strings can be valid node paths:\n"
+"[codeblock]\n"
+"# Points to the Sprite2D node.\n"
+"\"Level/RigidBody2D/Sprite2D\"\n"
+"\n"
+"# Points to the Sprite2D node and its \"texture\" resource.\n"
+"# get_node() would retrieve the Sprite2D, while get_node_and_resource()\n"
+"# would retrieve both the Sprite2D node and the \"texture\" resource.\n"
+"\"Level/RigidBody2D/Sprite2D:texture\"\n"
+"\n"
+"# Points to the Sprite2D node and its \"position\" property.\n"
+"\"Level/RigidBody2D/Sprite2D:position\"\n"
+"\n"
+"# Points to the Sprite2D node and the \"x\" component of its \"position\" "
+"property.\n"
+"\"Level/RigidBody2D/Sprite2D:position:x\"\n"
+"\n"
+"# Points to the RigidBody2D node as an absolute path beginning from the "
+"SceneTree.\n"
+"\"/root/Level/RigidBody2D\"\n"
+"[/codeblock]\n"
+"[b]Note:[/b] In GDScript, it's also possible to convert a constant string "
+"into a node path by prefixing it with [code]^[/code]. [code]^\"path/to/"
+"node\"[/code] is equivalent to [code]NodePath(\"path/to/node\")[/code]."
+msgstr ""
+"Costruisce un [NodePath] da una [String]. Il percorso creato è assoluto se "
+"preceduto da una barra (vedi [method is_absolute]).\n"
+"I \"sotto-nomi\" facoltativamente inclusi dopo il percorso al nodo di "
+"destinazione possono puntare a proprietà e possono anche essere annidati.\n"
+"Le seguenti stringe possono essere percorsi di nodi validi:\n"
+"[codeblock]\n"
+"# Punta al nodo Sprite2D.\n"
+"\"Level/RigidBody2D/Sprite2D\"\n"
+"\n"
+"# Punta al nodo Sprite2D e alla sua risorsa \"texture\".\n"
+"# get_node() recupererebbe Sprite2D, mentre get_node_and_resource()\n"
+"# recupererebbe sia il nodo Sprite2D sia la risorsa \"texture\".\n"
+"\"Level/RigidBody2D/Sprite2D:texture\"\n"
+"\n"
+"# Punta al nodo Sprite2D e alla sua proprietà \"position\".\n"
+"\"Level/RigidBody2D/Sprite2D:position\"\n"
+"\n"
+"# Punta al nodo Sprite2D e al componente \"x\" della sua proprietà "
+"\"position\".\n"
+"\"Level/RigidBody2D/Sprite2D:position:x\"\n"
+"\n"
+"# Punta al nodo RigidBody2D come percorso assoluto che parte dal SceneTree.\n"
+"\"/root/Level/RigidBody2D\"\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] In GDScript, è anche possibile convertire una stringa costante "
+"in un percorso di nodo prefissandola con [code]^[/code]. [code]^\"path/to/"
+"node\"[/code] equivale a [code]NodePath(\"path/to/node\")[/code]."
+
+msgid ""
+"Returns a copy of this node path with a colon character ([code]:[/code]) "
+"prefixed, transforming it to a pure property path with no node names "
+"(relative to the current node).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# node_path points to the \"x\" property of the child node named "
+"\"position\".\n"
+"var node_path = ^\"position:x\"\n"
+"\n"
+"# property_path points to the \"position\" in the \"x\" axis of this node.\n"
+"var property_path = node_path.get_as_property_path()\n"
+"print(property_path) # Prints \":position:x\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// nodePath points to the \"x\" property of the child node named "
+"\"position\".\n"
+"var nodePath = new NodePath(\"position:x\");\n"
+"\n"
+"// propertyPath points to the \"position\" in the \"x\" axis of this node.\n"
+"NodePath propertyPath = nodePath.GetAsPropertyPath();\n"
+"GD.Print(propertyPath); // Prints \":position:x\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce una copia di questo percorso del nodo con un carattere due punti "
+"([code]:[/code]) come prefisso, trasformandolo in un percorso di proprietà "
+"puro senza nomi di nodo (relativo al nodo attuale).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# node_path punta alla proprietà \"x\" del nodo figlio denominato "
+"\"position\".\n"
+"var node_path = ^\"position:x\"\n"
+"\n"
+"# property_path punta alla \"position\" nell'asse \"x\" di questo nodo.\n"
+"var property_path = node_path.get_as_property_path()\n"
+"print(property_path) # Stampa \":position:x\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// node_path punta alla proprietà \"x\" del nodo figlio denominato "
+"\"position\".\n"
+"var nodePath = new NodePath(\"position:x\");\n"
+"\n"
+"// property_path punta alla \"position\" nell'asse \"x\" di questo nodo.\n"
+"NodePath propertyPath = nodePath.GetAsPropertyPath();\n"
+"GD.Print(propertyPath); // Stampa \":position:x\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns all node names concatenated with a slash character ([code]/[/code]) "
 "as a single [StringName]."
@@ -77106,25 +93107,126 @@ msgstr ""
 "Restituisce tutti i nomi dei nodi concatenati con un carattere barra ([code]/"
 "[/code]) come un singolo [StringName]."
 
+msgid ""
+"Returns all property subnames concatenated with a colon character ([code]:[/"
+"code]) as a single [StringName].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node_path = ^\"Sprite2D:texture:resource_name\"\n"
+"print(node_path.get_concatenated_subnames()) # Prints \"texture:"
+"resource_name\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var nodePath = new NodePath(\"Sprite2D:texture:resource_name\");\n"
+"GD.Print(nodePath.GetConcatenatedSubnames()); // Prints \"texture:"
+"resource_name\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce tutti i sotto-nomi di proprietà concatenati con un carattere due "
+"punti ([code]:[/code]) come un singolo [StringName].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node_path = ^\"Sprite2D:texture:resource_name\"\n"
+"print(node_path.get_concatenated_subnames()) # Stampa \"texture:"
+"resource_name\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var nodePath = new NodePath(\"Sprite2D:texture:resource_name\");\n"
+"GD.Print(nodePath.GetConcatenatedSubnames()); // Stampa \"texture:"
+"resource_name\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the node name indicated by [param idx], starting from 0. If [param "
+"idx] is out of bounds, an error is generated. See also [method "
+"get_subname_count] and [method get_name_count].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var sprite_path = NodePath(\"../RigidBody2D/Sprite2D\")\n"
+"print(sprite_path.get_name(0)) # Prints \"..\"\n"
+"print(sprite_path.get_name(1)) # Prints \"RigidBody2D\"\n"
+"print(sprite_path.get_name(2)) # Prints \"Sprite\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var spritePath = new NodePath(\"../RigidBody2D/Sprite2D\");\n"
+"GD.Print(spritePath.GetName(0)); // Prints \"..\"\n"
+"GD.Print(spritePath.GetName(1)); // Prints \"PathFollow2D\"\n"
+"GD.Print(spritePath.GetName(2)); // Prints \"Sprite\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce il nome del nodo indicato dall'indice [param idx], a partire da "
+"0. Se [param idx] è fuori dai limiti, viene generato un errore. Vedi anche "
+"[method get_subname_count] e [method get_name_count].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var sprite_path = NodePath(\"../RigidBody2D/Sprite2D\")\n"
+"print(sprite_path.get_name(0)) # Stampa \"..\"\n"
+"print(sprite_path.get_name(1)) # Stampa \"RigidBody2D\"\n"
+"print(sprite_path.get_name(2)) # Stampa \"Sprite\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var spritePath = new NodePath(\"../RigidBody2D/Sprite2D\");\n"
+"GD.Print(spritePath.GetName(0)); // Stampa \"..\"\n"
+"GD.Print(spritePath.GetName(1)); // Stampa \"PathFollow2D\"\n"
+"GD.Print(spritePath.GetName(2)); // Stampa \"Sprite\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the number of node names in the path. Property subnames are not "
 "included.\n"
 "For example, [code]\"../RigidBody2D/Sprite2D:texture\"[/code] contains 3 node "
 "names."
 msgstr ""
-"Restituisce il numero di nomi di nodi nel percorso. I sottonomi delle "
+"Restituisce il numero di nomi di nodi nel percorso. I sotto-nomi delle "
 "proprietà non sono inclusi.\n"
 "Ad esempio, [code]\"../RigidBody2D/Sprite2D:texture\"[/code] contiene 3 nomi "
 "di nodi."
 
+msgid ""
+"Returns the property name indicated by [param idx], starting from 0. If "
+"[param idx] is out of bounds, an error is generated. See also [method "
+"get_subname_count].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var path_to_name = NodePath(\"Sprite2D:texture:resource_name\")\n"
+"print(path_to_name.get_subname(0)) # Prints \"texture\"\n"
+"print(path_to_name.get_subname(1)) # Prints \"resource_name\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var pathToName = new NodePath(\"Sprite2D:texture:resource_name\");\n"
+"GD.Print(pathToName.GetSubname(0)); // Prints \"texture\"\n"
+"GD.Print(pathToName.GetSubname(1)); // Prints \"resource_name\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce il nome di proprietà indicato dall'indice [param idx], a partire "
+"da 0. Se [param idx] è fuori dai limiti, viene generato un errore. Vedi anche "
+"[method get_subname_count].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var path_to_name = NodePath(\"Sprite2D:texture:resource_name\")\n"
+"print(path_to_name.get_subname(0)) # Stampa \"texture\"\n"
+"print(path_to_name.get_subname(1)) # Stampa \"resource_name\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var pathToName = new NodePath(\"Sprite2D:texture:resource_name\");\n"
+"GD.Print(pathToName.GetSubname(0)); // Stampa \"texture\"\n"
+"GD.Print(pathToName.GetSubname(1)); // Stampa \"resource_name\"\n"
+"[/csharp]\n"
+"[/codici]"
+
 msgid ""
 "Returns the number of property names (\"subnames\") in the path. Each subname "
 "in the node path is listed after a colon character ([code]:[/code]).\n"
 "For example, [code]\"Level/RigidBody2D/Sprite2D:texture:resource_name\"[/"
 "code] contains 2 subnames."
 msgstr ""
-"Restituisce il numero di nomi di proprietà (\"sottonomi\") nel percorso. Ogni "
-"sottonome nel percorso del nodo è elencato dopo un carattere due punti "
+"Restituisce il numero di nomi di proprietà (\"sotto-nomi\") nel percorso. "
+"Ogni sottonome nel percorso del nodo è elencato dopo un carattere due punti "
 "([code]:[/code]).\n"
 "Ad esempio, [code]\"Level/RigidBody2D/Sprite2D:texture:resource_name\"[/code] "
 "contiene 2 sottonomi."
@@ -77196,7 +93298,7 @@ msgid ""
 "composed of the same node names and subnames in the same order."
 msgstr ""
 "Restituisce [code]true[/code] se due percorsi di nodo sono uguali, cioè sono "
-"composti dagli stessi nodi e sottonomi nello stesso ordine."
+"composti dagli stessi nodi e sotto-nomi nello stesso ordine."
 
 msgid "Abstract base class for noise generators."
 msgstr "Classe base astratta per generatori di noise."
@@ -77505,6 +93607,127 @@ msgstr ""
 msgid "Base class for all other classes in the engine."
 msgstr "Classe di base per tutte le altre classi nel motore."
 
+msgid ""
+"An advanced [Variant] type. All classes in the engine inherit from Object. "
+"Each class may define new properties, methods or signals, which are available "
+"to all inheriting classes. For example, a [Sprite2D] instance is able to call "
+"[method Node.add_child] because it inherits from [Node].\n"
+"You can create new instances, using [code]Object.new()[/code] in GDScript, or "
+"[code]new GodotObject[/code] in C#.\n"
+"To delete an Object instance, call [method free]. This is necessary for most "
+"classes inheriting Object, because they do not manage memory on their own, "
+"and will otherwise cause memory leaks when no longer in use. There are a few "
+"classes that perform memory management. For example, [RefCounted] (and by "
+"extension [Resource]) deletes itself when no longer referenced, and [Node] "
+"deletes its children when freed.\n"
+"Objects can have a [Script] attached to them. Once the [Script] is "
+"instantiated, it effectively acts as an extension to the base class, allowing "
+"it to define and inherit new properties, methods and signals.\n"
+"Inside a [Script], [method _get_property_list] may be overridden to customize "
+"properties in several ways. This allows them to be available to the editor, "
+"display as lists of options, sub-divide into groups, save on disk, etc. "
+"Scripting languages offer easier ways to customize properties, such as with "
+"the [annotation @GDScript.@export] annotation.\n"
+"Godot is very dynamic. An object's script, and therefore its properties, "
+"methods and signals, can be changed at run-time. Because of this, there can "
+"be occasions where, for example, a property required by a method may not "
+"exist. To prevent run-time errors, see methods such as [method set], [method "
+"get], [method call], [method has_method], [method has_signal], etc. Note that "
+"these methods are [b]much[/b] slower than direct references.\n"
+"In GDScript, you can also check if a given property, method, or signal name "
+"exists in an object with the [code]in[/code] operator:\n"
+"[codeblock]\n"
+"var node = Node.new()\n"
+"print(\"name\" in node)         # Prints true\n"
+"print(\"get_parent\" in node)   # Prints true\n"
+"print(\"tree_entered\" in node) # Prints true\n"
+"print(\"unknown\" in node)      # Prints false\n"
+"[/codeblock]\n"
+"Notifications are [int] constants commonly sent and received by objects. For "
+"example, on every rendered frame, the [SceneTree] notifies nodes inside the "
+"tree with a [constant Node.NOTIFICATION_PROCESS]. The nodes receive it and "
+"may call [method Node._process] to update. To make use of notifications, see "
+"[method notification] and [method _notification].\n"
+"Lastly, every object can also contain metadata (data about data). [method "
+"set_meta] can be useful to store information that the object itself does not "
+"depend on. To keep your code clean, making excessive use of metadata is "
+"discouraged.\n"
+"[b]Note:[/b] Unlike references to a [RefCounted], references to an object "
+"stored in a variable can become invalid without being set to [code]null[/"
+"code]. To check if an object has been deleted, do [i]not[/i] compare it "
+"against [code]null[/code]. Instead, use [method @GlobalScope."
+"is_instance_valid]. It's also recommended to inherit from [RefCounted] for "
+"classes storing data instead of [Object].\n"
+"[b]Note:[/b] The [code]script[/code] is not exposed like most properties. To "
+"set or get an object's [Script] in code, use [method set_script] and [method "
+"get_script], respectively.\n"
+"[b]Note:[/b] In a boolean context, an [Object] will evaluate to [code]false[/"
+"code] if it is equal to [code]null[/code] or it has been freed. Otherwise, an "
+"[Object] will always evaluate to [code]true[/code]. See also [method "
+"@GlobalScope.is_instance_valid]."
+msgstr ""
+"Un tipo di [Variant] avanzato. Tutte le classi nel motore ereditano da "
+"Object. Ogni classe può definire nuove proprietà, metodi o segnali, che sono "
+"disponibili per tutte le classi ereditanti. Ad esempio, un'istanza [Sprite2D] "
+"è in grado di chiamare [method Node.add_child] perché eredita da [Node].\n"
+"Puoi creare nuove istanze, usando [code]Object.new()[/code] in GDScript, o "
+"[code]new GodotObject[/code] in C#.\n"
+"Per eliminare un'istanza di Object, chiama [method free]. Ciò è necessario "
+"per la maggior parte delle classi che ereditano Object, perché non gestiscono "
+"la memoria da sole e altrimenti causeranno perdite di memoria quando non sono "
+"più in uso. Esistono alcune classi che gestiscono la loro memoria. Ad "
+"esempio, [RefCounted] (e per estensione [Resource]) elimina se stesso quando "
+"non è più referenziato e [Node] elimina i suoi figli quando viene liberato.\n"
+"Gli oggetti possono avere uno [Script] allegato. Una volta istanziato lo "
+"[Script], agisce effettivamente come un'estensione della classe base, "
+"consentendogli di definire ed ereditare nuove proprietà, metodi e segnali.\n"
+"All'interno di uno [Script], [method _get_property_list] può essere "
+"sovrascritto per personalizzare le proprietà in diversi modi. Ciò consente "
+"loro di essere disponibili all'editor, di essere visualizzate come liste di "
+"opzioni, di essere suddivise in gruppi, di essere salvate su disco, ecc. I "
+"linguaggi di scripting offrono modi più semplici per personalizzare le "
+"proprietà, come con l'annotazione [annotation @GDScript.@export].\n"
+"Godot è molto dinamico. Lo script di un oggetto, e quindi le sue proprietà, "
+"metodi e segnali, possono essere modificati in fase di esecuzione. Per questo "
+"motivo, possono esserci occasioni in cui, ad esempio, una proprietà richiesta "
+"da un metodo potrebbe non esistere. Per evitare errori di durante "
+"l'esecuzione, vedi metodi come [method set], [method get], [method call], "
+"[method has_method], [method has_signal], ecc. Nota che questi metodi sono "
+"[b]molto[/b] più lenti dei riferimenti diretti.\n"
+"In GDScript, è anche possibile verificare se una determinata proprietà, "
+"metodo o nome di segnale esiste in un oggetto con l'operatore [code]in[/"
+"code]:\n"
+"[codeblock]\n"
+"var node = Node.new()\n"
+"print(\"name\" in node)         # Stampa true\n"
+"print(\"get_parent\" in node)   # Stampa true\n"
+"print(\"tree_entered\" in node) # Stampa true\n"
+"print(\"unknown\" in node)      # Stampa false\n"
+"[/codeblock]\n"
+"Le notifiche sono costanti [int] comunemente inviate e ricevute dagli "
+"oggetti. Ad esempio, su ogni frame renderizzato, [SceneTree] notifica i nodi "
+"all'interno dell'albero con una [const Node.NOTIFICATION_PROCESS]. I nodi la "
+"ricevono e possono chiamare [method Node._process] per aggiornarsi. Per "
+"utilizzare le notifiche, vedi [method notification] e [method "
+"_notification].\n"
+"Infine, ogni oggetto può anche contenere metadati (dati sui dati). [method "
+"set_meta] può essere utile per memorizzare informazioni da cui l'oggetto "
+"stesso non dipende. Per mantenere pulito il codice, si sconsiglia di fare un "
+"uso eccessivo di metadati.\n"
+"[b]Nota:[/b] A differenza di riferimenti a un [RefCounted], i riferimenti a "
+"un oggetto memorizzato in una variabile possono diventare non validi senza "
+"essere impostati su [code]null[/code]. Per verificare se un oggetto è stato "
+"eliminato, [i]non[/i] confrontarlo con [code]null[/code]. Invece, usa [method "
+"@GlobalScope.is_instance_valid]. Si consiglia inoltre di ereditare da "
+"[RefCounted] per le classi che memorizzano dati anziché [Object].\n"
+"[b]Nota:[/b] Lo [code]script[/code] non è esposto come la maggior parte delle "
+"proprietà. Per impostare o ottenere lo [Script] di un oggetto in codice, usa "
+"rispettivamente [method set_script] e [method get_script].\n"
+"[b]Nota:[/b] In un contesto booleano, un [Object] verrà valutato come "
+"[code]false[/code] se è uguale a [code]null[/code] o è stato liberato. "
+"Altrimenti, un [Object] verrà sempre valutato come [code]true[/code]. Vedi "
+"anche [method @GlobalScope.is_instance_valid]."
+
 msgid "Object class introduction"
 msgstr "Introduzione della classe Object"
 
@@ -77514,6 +93737,349 @@ msgstr "Quando e come evitare di usare i nodi per tutto"
 msgid "Object notifications"
 msgstr "Notifiche di oggetti"
 
+msgid ""
+"Override this method to customize the behavior of [method get]. Should return "
+"the given [param property]'s value, or [code]null[/code] if the [param "
+"property] should be handled normally.\n"
+"Combined with [method _set] and [method _get_property_list], this method "
+"allows defining custom properties, which is particularly useful for editor "
+"plugins. Note that a property must be present in [method get_property_list], "
+"otherwise this method will not be called.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _get(property):\n"
+"    if property == \"fake_property\":\n"
+"        print(\"Getting my property!\")\n"
+"        return 4\n"
+"\n"
+"func _get_property_list():\n"
+"    return [\n"
+"        { \"name\": \"fake_property\", \"type\": TYPE_INT }\n"
+"    ]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Variant _Get(StringName property)\n"
+"{\n"
+"    if (property == \"FakeProperty\")\n"
+"    {\n"
+"        GD.Print(\"Getting my property!\");\n"
+"        return 4;\n"
+"    }\n"
+"    return default;\n"
+"}\n"
+"\n"
+"public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"{\n"
+"    return\n"
+"    [\n"
+"        new Godot.Collections.Dictionary()\n"
+"        {\n"
+"            { \"name\", \"FakeProperty\" },\n"
+"            { \"type\", (int)Variant.Type.Int },\n"
+"        },\n"
+"    ];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Sostituisci questo metodo per personalizzare il comportamento di [method "
+"get]. Dovrebbe restituire il valore della proprietà [param property], oppure "
+"[code]null[/code] se la [param property] deve essere gestita normalmente.\n"
+"In combinazione con [method _set] e [method _get_property_list], questo "
+"metodo consente di definire proprietà personalizzate, il che è "
+"particolarmente utile per le estensioni dell'editor. Nota che una proprietà "
+"deve essere presente in [method get_property_list], altrimenti questo metodo "
+"non sarà chiamato.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _get(property):\n"
+"    if property == \"fake_property\":\n"
+"        print(\"Ottenendo la mia proprietà!\")\n"
+"        return 4\n"
+"\n"
+"func _get_property_list():\n"
+"    return [\n"
+"        { \"name\": \"fake_property\", \"type\": TYPE_INT }\n"
+"    ]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Variant _Get(StringName property)\n"
+"{\n"
+"    if (property == \"FakeProperty\")\n"
+"    {\n"
+"        GD.Print(\"Ottenendo la mia proprietà!\");\n"
+"        return 4;\n"
+"    }\n"
+"    return default;\n"
+"}\n"
+"\n"
+"public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"{\n"
+"    return new Godot.Collections.Array<Godot.Collections.Dictionary>()\n"
+"    {\n"
+"        new Godot.Collections.Dictionary()\n"
+"        {\n"
+"            { \"name\", \"FakeProperty\" },\n"
+"            { \"type\", (int)Variant.Type.Int },\n"
+"        }\n"
+"    };\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Override this method to provide a custom list of additional properties to "
+"handle by the engine.\n"
+"Should return a property list, as an [Array] of dictionaries. The result is "
+"added to the array of [method get_property_list], and should be formatted in "
+"the same way. Each [Dictionary] must at least contain the [code]name[/code] "
+"and [code]type[/code] entries.\n"
+"You can use [method _property_can_revert] and [method _property_get_revert] "
+"to customize the default values of the properties added by this method.\n"
+"The example below displays a list of numbers shown as words going from "
+"[code]ZERO[/code] to [code]FIVE[/code], with [code]number_count[/code] "
+"controlling the size of the list:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends Node\n"
+"\n"
+"@export var number_count = 3:\n"
+"    set(nc):\n"
+"        number_count = nc\n"
+"        numbers.resize(number_count)\n"
+"        notify_property_list_changed()\n"
+"\n"
+"var numbers = PackedInt32Array([0, 0, 0])\n"
+"\n"
+"func _get_property_list():\n"
+"    var properties = []\n"
+"\n"
+"    for i in range(number_count):\n"
+"        properties.append({\n"
+"            \"name\": \"number_%d\" % i,\n"
+"            \"type\": TYPE_INT,\n"
+"            \"hint\": PROPERTY_HINT_ENUM,\n"
+"            \"hint_string\": \"ZERO,ONE,TWO,THREE,FOUR,FIVE\",\n"
+"        })\n"
+"\n"
+"    return properties\n"
+"\n"
+"func _get(property):\n"
+"    if property.begins_with(\"number_\"):\n"
+"        var index = property.get_slice(\"_\", 1).to_int()\n"
+"        return numbers[index]\n"
+"\n"
+"func _set(property, value):\n"
+"    if property.begins_with(\"number_\"):\n"
+"        var index = property.get_slice(\"_\", 1).to_int()\n"
+"        numbers[index] = value\n"
+"        return true\n"
+"    return false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Tool]\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"    private int _numberCount;\n"
+"\n"
+"    [Export]\n"
+"    public int NumberCount\n"
+"    {\n"
+"        get => _numberCount;\n"
+"        set\n"
+"        {\n"
+"            _numberCount = value;\n"
+"            _numbers.Resize(_numberCount);\n"
+"            NotifyPropertyListChanged();\n"
+"        }\n"
+"    }\n"
+"\n"
+"    private Godot.Collections.Array<int> _numbers = [];\n"
+"\n"
+"    public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"    {\n"
+"        Godot.Collections.Array<Godot.Collections.Dictionary> properties = "
+"[];\n"
+"\n"
+"        for (int i = 0; i < _numberCount; i++)\n"
+"        {\n"
+"            properties.Add(new Godot.Collections.Dictionary()\n"
+"            {\n"
+"                { \"name\", $\"number_{i}\" },\n"
+"                { \"type\", (int)Variant.Type.Int },\n"
+"                { \"hint\", (int)PropertyHint.Enum },\n"
+"                { \"hint_string\", \"Zero,One,Two,Three,Four,Five\" },\n"
+"            });\n"
+"        }\n"
+"\n"
+"        return properties;\n"
+"    }\n"
+"\n"
+"    public override Variant _Get(StringName property)\n"
+"    {\n"
+"        string propertyName = property.ToString();\n"
+"        if (propertyName.StartsWith(\"number_\"))\n"
+"        {\n"
+"            int index = int.Parse(propertyName.Substring(\"number_\"."
+"Length));\n"
+"            return _numbers[index];\n"
+"        }\n"
+"        return default;\n"
+"    }\n"
+"\n"
+"    public override bool _Set(StringName property, Variant value)\n"
+"    {\n"
+"        string propertyName = property.ToString();\n"
+"        if (propertyName.StartsWith(\"number_\"))\n"
+"        {\n"
+"            int index = int.Parse(propertyName.Substring(\"number_\"."
+"Length));\n"
+"            _numbers[index] = value.As<int>();\n"
+"            return true;\n"
+"        }\n"
+"        return false;\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] This method is intended for advanced purposes. For most common "
+"use cases, the scripting languages offer easier ways to handle properties. "
+"See [annotation @GDScript.@export], [annotation @GDScript.@export_enum], "
+"[annotation @GDScript.@export_group], etc. If you want to customize exported "
+"properties, use [method _validate_property].\n"
+"[b]Note:[/b] If the object's script is not [annotation @GDScript.@tool], this "
+"method will not be called in the editor."
+msgstr ""
+"Sostituisci questo metodo per fornire un elenco personalizzato di proprietà "
+"aggiuntive da gestire dal motore.\n"
+"Dovrebbe restituire un elenco di proprietà, come un [Array] di dizionari. Il "
+"risultato viene aggiunto all'array di [method get_property_list] e dovrebbe "
+"essere formattato nello stesso modo. Ogni [Dictionary] deve contenere almeno "
+"le voci [code]name[/code] e [code]type[/code].\n"
+"È possibile usare [method _property_can_revert] e [method "
+"_property_get_revert] per personalizzare i valori predefiniti delle proprietà "
+"aggiunte da questo metodo.\n"
+"L'esempio seguente mostra un elenco di numeri mostrati come parole che vanno "
+"da [code]ZERO[/code] a [code]FIVE[/code], con [code]number_count[/code] che "
+"controlla la dimensione dell'elenco:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends Node\n"
+"\n"
+"@export var number_count = 3:\n"
+"    set(nc):\n"
+"        number_count = nc\n"
+"        numbers.resize(number_count)\n"
+"        notify_property_list_changed()\n"
+"\n"
+"var numbers = PackedInt32Array([0, 0, 0])\n"
+"\n"
+"func _get_property_list():\n"
+"    var properties = []\n"
+"\n"
+"    for i in range(number_count):\n"
+"        properties.append({\n"
+"            \"name\": \"number_%d\" % i,\n"
+"            \"type\": TYPE_INT,\n"
+"            \"hint\": PROPERTY_HINT_ENUM,\n"
+"            \"hint_string\": \"ZERO,ONE,TWO,THREE,FOUR,FIVE\",\n"
+"        })\n"
+"\n"
+"    return properties\n"
+"\n"
+"func _get(property):\n"
+"    if property.begins_with(\"number_\"):\n"
+"        var index = property.get_slice(\"_\", 1).to_int()\n"
+"        return numbers[index]\n"
+"\n"
+"func _set(property, value):\n"
+"    if property.begins_with(\"number_\"):\n"
+"        var index = property.get_slice(\"_\", 1).to_int()\n"
+"        numbers[index] = value\n"
+"        return true\n"
+"    return false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Tool]\n"
+"public partial class MyNode : Node\n"
+"{\n"
+"    private int _numberCount;\n"
+"\n"
+"    [Export]\n"
+"    public int NumberCount\n"
+"    {\n"
+"        get => _numberCount;\n"
+"        set\n"
+"        {\n"
+"            _numberCount = value;\n"
+"            _numbers.Resize(_numberCount);\n"
+"            NotifyPropertyListChanged();\n"
+"        }\n"
+"    }\n"
+"\n"
+"    private Godot.Collections.Array<int> _numbers = [];\n"
+"\n"
+"    public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"    {\n"
+"        Godot.Collections.Array<Godot.Collections.Dictionary> properties = "
+"[];\n"
+"\n"
+"        for (int i = 0; i < _numberCount; i++)\n"
+"        {\n"
+"            properties.Add(new Godot.Collections.Dictionary()\n"
+"            {\n"
+"                { \"name\", $\"number_{i}\" },\n"
+"                { \"type\", (int)Variant.Type.Int },\n"
+"                { \"hint\", (int)PropertyHint.Enum },\n"
+"                { \"hint_string\", \"Zero,One,Two,Three,Four,Five\" },\n"
+"            });\n"
+"        }\n"
+"\n"
+"        return properties;\n"
+"    }\n"
+"\n"
+"    public override Variant _Get(StringName property)\n"
+"    {\n"
+"        string propertyName = property.ToString();\n"
+"        if (propertyName.StartsWith(\"number_\"))\n"
+"        {\n"
+"            int index = int.Parse(propertyName.Substring(\"number_\"."
+"Length));\n"
+"            return _numbers[index];\n"
+"        }\n"
+"        return default;\n"
+"    }\n"
+"\n"
+"    public override bool _Set(StringName property, Variant value)\n"
+"    {\n"
+"        string propertyName = property.ToString();\n"
+"        if (propertyName.StartsWith(\"number_\"))\n"
+"        {\n"
+"            int index = int.Parse(propertyName.Substring(\"number_\"."
+"Length));\n"
+"            _numbers[index] = value.As<int>();\n"
+"            return true;\n"
+"        }\n"
+"        return false;\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Questo metodo è pensato per scopi avanzati. Per la maggior parte "
+"dei casi d'uso comuni, i linguaggi di scripting offrono modi più semplici per "
+"gestire le proprietà. Vedi [annotation @GDScript.@export], [annotation "
+"@GDScript.@export_enum], [annotation @GDScript.@export_group], ecc. Se si "
+"desidera personalizzare le proprietà esportate, usa [method "
+"_validate_property].\n"
+"[b]Nota:[/b] Se lo script dell'oggetto non è [annotation @GDScript.@tool], "
+"questo metodo non sarà chiamato nell'editor."
+
 msgid ""
 "Called when the object's script is instantiated, oftentimes after the object "
 "is initialized in memory (through [code]Object.new()[/code] in GDScript, or "
@@ -77616,6 +94182,144 @@ msgstr ""
 "[b]Nota:[/b] [method _property_can_revert] deve essere sovrascritto affinché "
 "questo metodo sia chiamato."
 
+msgid ""
+"Override this method to customize the behavior of [method set]. Should set "
+"the [param property] to [param value] and return [code]true[/code], or "
+"[code]false[/code] if the [param property] should be handled normally. The "
+"[i]exact[/i] way to set the [param property] is up to this method's "
+"implementation.\n"
+"Combined with [method _get] and [method _get_property_list], this method "
+"allows defining custom properties, which is particularly useful for editor "
+"plugins. Note that a property [i]must[/i] be present in [method "
+"get_property_list], otherwise this method will not be called.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var internal_data = {}\n"
+"\n"
+"func _set(property, value):\n"
+"    if property == \"fake_property\":\n"
+"        # Storing the value in the fake property.\n"
+"        internal_data[\"fake_property\"] = value\n"
+"        return true\n"
+"    return false\n"
+"\n"
+"func _get_property_list():\n"
+"    return [\n"
+"        { \"name\": \"fake_property\", \"type\": TYPE_INT }\n"
+"    ]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private Godot.Collections.Dictionary _internalData = new Godot.Collections."
+"Dictionary();\n"
+"\n"
+"public override bool _Set(StringName property, Variant value)\n"
+"{\n"
+"    if (property == \"FakeProperty\")\n"
+"    {\n"
+"        // Storing the value in the fake property.\n"
+"        _internalData[\"FakeProperty\"] = value;\n"
+"        return true;\n"
+"    }\n"
+"\n"
+"    return false;\n"
+"}\n"
+"\n"
+"public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"{\n"
+"    return\n"
+"    [\n"
+"        new Godot.Collections.Dictionary()\n"
+"        {\n"
+"            { \"name\", \"FakeProperty\" },\n"
+"            { \"type\", (int)Variant.Type.Int },\n"
+"        },\n"
+"    ];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Sostituisci questo metodo per personalizzare il comportamento di [method "
+"set]. Dovrebbe impostare la proprietà [param property] su [param value] e "
+"restituire [code]true[/code], o [code]false[/code] se la proprietà [param "
+"property] dovrebbe essere gestita normalmente. Il modo [i]esatto[/i] per "
+"impostare la proprietà [param property] dipende dall'implementazione di "
+"questo metodo.\n"
+"In combinazione con [method _get] e [method _get_property_list], questo "
+"metodo consente di definire proprietà personalizzate, il che è "
+"particolarmente utile per le estensioni dell'editor. Nota che una proprietà "
+"[i]deve[/i] essere presente in [method get_property_list], altrimenti questo "
+"metodo non sarà chiamato.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var internal_data = {}\n"
+"\n"
+"func _set(property, value):\n"
+"    if property == \"fake_property\":\n"
+"        # Memorizza i valori nella proprietà fasulla.\n"
+"        internal_data[\"fake_property\"] = value\n"
+"        return true\n"
+"    return false\n"
+"\n"
+"func _get_property_list():\n"
+"    return [\n"
+"        { \"name\": \"fake_property\", \"type\": TYPE_INT }\n"
+"    ]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private Godot.Collections.Dictionary _internalData = new Godot.Collections."
+"Dictionary();\n"
+"\n"
+"public override bool _Set(StringName property, Variant value)\n"
+"{\n"
+"    if (property == \"FakeProperty\")\n"
+"    {\n"
+"        // Storing the value in the fake property.\n"
+"        _internalData[\"FakeProperty\"] = value;\n"
+"        return true;\n"
+"    }\n"
+"\n"
+"    return false;\n"
+"}\n"
+"\n"
+"public override Godot.Collections.Array<Godot.Collections.Dictionary> "
+"_GetPropertyList()\n"
+"{\n"
+"    return\n"
+"    [\n"
+"        new Godot.Collections.Dictionary()\n"
+"        {\n"
+"            { \"name\", \"FakeProperty\" },\n"
+"            { \"type\", (int)Variant.Type.Int },\n"
+"        },\n"
+"    ];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Override this method to customize the return value of [method to_string], and "
+"therefore the object's representation as a [String].\n"
+"[codeblock]\n"
+"func _to_string():\n"
+"    return \"Welcome to Godot 4!\"\n"
+"\n"
+"func _init():\n"
+"    print(self)       # Prints \"Welcome to Godot 4!\"\n"
+"    var a = str(self) # a is \"Welcome to Godot 4!\"\n"
+"[/codeblock]"
+msgstr ""
+"Sovrascrivi questo metodo per personalizzare il valore restituito da [method "
+"to_string] e quindi la rappresentazione dell'oggetto come [String].\n"
+"[codeblock]\n"
+"func _to_string():\n"
+"    return \"Benvenuto su Godot 4!\"\n"
+"\n"
+"func _init():\n"
+"    print(self)       # Stampa \"Benvenuto su Godot 4!\"\n"
+"    var a = str(self) # a è \"Benvenuto su Godot 4!\"\n"
+"[/codeblock]"
+
 msgid ""
 "Override this method to customize existing properties. Every property info "
 "goes through this method, except properties added with [method "
@@ -77725,6 +94429,64 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Adds a user-defined signal named [param signal]. Optional arguments for the "
+"signal can be added as an [Array] of dictionaries, each defining a "
+"[code]name[/code] [String] and a [code]type[/code] [int] (see [enum Variant."
+"Type]). See also [method has_user_signal] and [method remove_user_signal].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"add_user_signal(\"hurt\", [\n"
+"    { \"name\": \"damage\", \"type\": TYPE_INT },\n"
+"    { \"name\": \"source\", \"type\": TYPE_OBJECT }\n"
+"])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"AddUserSignal(\"Hurt\",\n"
+"[\n"
+"    new Godot.Collections.Dictionary()\n"
+"    {\n"
+"        { \"name\", \"damage\" },\n"
+"        { \"type\", (int)Variant.Type.Int },\n"
+"    },\n"
+"    new Godot.Collections.Dictionary()\n"
+"    {\n"
+"        { \"name\", \"source\" },\n"
+"        { \"type\", (int)Variant.Type.Object },\n"
+"    },\n"
+"]);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Aggiunge un segnale definito dall'utente con il nome [param signal]. È "
+"possibile aggiungere argomenti opzionali per il segnale come un [Array] di "
+"dizionari, ognuno dei quali definisce un nome ([code]name[/code]) [String] e "
+"un tipo ([code]type[/code]) [int] (vedi [enum Variant.Type]). Vedi anche "
+"[method has_user_signal] e [method remove_user_signal].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"add_user_signal(\"hurt\", [\n"
+"    { \"name\": \"damage\", \"type\": TYPE_INT },\n"
+"    { \"name\": \"source\", \"type\": TYPE_OBJECT }\n"
+"])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"AddUserSignal(\"Hurt\", new Godot.Collections.Array()\n"
+"{\n"
+"    new Godot.Collections.Dictionary()\n"
+"    {\n"
+"        { \"name\", \"damage\" },\n"
+"        { \"type\", (int)Variant.Type.Int },\n"
+"    },\n"
+"    new Godot.Collections.Dictionary()\n"
+"    {\n"
+"        { \"name\", \"source\" },\n"
+"        { \"type\", (int)Variant.Type.Object },\n"
+"    }\n"
+"});\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Calls the [param method] on the object and returns the result. This method "
 "supports a variable number of arguments, so parameters can be passed as a "
@@ -77758,7 +94520,129 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]\n"
 "[b]Nota:[/b] In C#, [param method] deve essere in snake_case quando si fa "
-"riferimento a metodi incorporati di Godot. Preferisci usare i nomi esposti "
+"riferimento ai metodi integrati di Godot. Preferisci usare i nomi esposti "
+"nella classe [code]MethodName[/code] per evitare di allocare un nuovo "
+"[StringName] a ogni chiamata."
+
+msgid ""
+"Calls the [param method] on the object during idle time. Always returns "
+"[code]null[/code], [b]not[/b] the method's result.\n"
+"Idle time happens mainly at the end of process and physics frames. In it, "
+"deferred calls will be run until there are none left, which means you can "
+"defer calls from other deferred calls and they'll still be run in the current "
+"idle time cycle. This means you should not call a method deferred from itself "
+"(or from a method called by it), as this causes infinite recursion the same "
+"way as if you had called the method directly.\n"
+"This method supports a variable number of arguments, so parameters can be "
+"passed as a comma separated list.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.call_deferred(\"rotate\", Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.CallDeferred(Node3D.MethodName.Rotate, new Vector3(1f, 0f, 0f), "
+"1.571f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method Callable.call_deferred].\n"
+"[b]Note:[/b] In C#, [param method] must be in snake_case when referring to "
+"built-in Godot methods. Prefer using the names exposed in the "
+"[code]MethodName[/code] class to avoid allocating a new [StringName] on each "
+"call.\n"
+"[b]Note:[/b] If you're looking to delay the function call by a frame, refer "
+"to the [signal SceneTree.process_frame] and [signal SceneTree.physics_frame] "
+"signals.\n"
+"[codeblock]\n"
+"var node = Node3D.new()\n"
+"# Make a Callable and bind the arguments to the node's rotate() call.\n"
+"var callable = node.rotate.bind(Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"# Connect the callable to the process_frame signal, so it gets called in the "
+"next process frame.\n"
+"# CONNECT_ONE_SHOT makes sure it only gets called once instead of every "
+"frame.\n"
+"get_tree().process_frame.connect(callable, CONNECT_ONE_SHOT)\n"
+"[/codeblock]"
+msgstr ""
+"Chiama il metodo denominato [param method] sull'oggetto durante il tempo di "
+"inattività. Restituisce sempre [code]null[/code], [b]non[/b] il risultato del "
+"metodo.\n"
+"Il tempo di inattività si verifica principalmente alla fine dei frame di "
+"processo e di fisica. In esso, le chiamate differite saranno eseguite finché "
+"non ne rimarrà nessuna, il che significa che è possibile differire le "
+"chiamate da altre chiamate differite e saranno comunque eseguite nel ciclo di "
+"tempo di inattività attuale. Ciò significa che non dovresti chiamare un "
+"metodo differito da se stesso (o da un metodo chiamato da esso), poiché ciò "
+"causa una ricorsione infinita allo stesso modo di se avessi chiamato il "
+"metodo direttamente.\n"
+"Questo metodo supporta un numero variabile di argomenti, quindi è possibile "
+"passare i parametri come un elenco separato da virgole.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.call_deferred(\"rotate\", Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.CallDeferred(Node3D.MethodName.Rotate, new Vector3(1f, 0f, 0f), "
+"1.571f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Vedi anche [method Callable.call_deferred].\n"
+"[b]Nota:[/b] In C#, [param method] deve essere in snake_case quando si fa "
+"riferimento ai metodi integrati di Godot. Preferisci usare i nomi esposti "
+"nella classe [code]MethodName[/code] per evitare di allocare un nuovo "
+"[StringName] a ogni chiamata.\n"
+"[b]Nota:[/b] Se vuoi ritardare la chiamata alla funzione di un frame, usa i "
+"segnali [signal SceneTree.process_frame] e [signal SceneTree.physics_frame].\n"
+"[codeblock]\n"
+"var node = Node3D.new()\n"
+"# Crea un chiamabile e associa gli argomenti alla chiamata rotate() del "
+"nodo.\n"
+"var callable = node.rotate.bind(Vector3(1.0, 0.0, 0.0), 1.571)\n"
+"# Collega il chiamabile al segnale process_frame, in modo che sia chiamato "
+"nel frame di processo successivo.\n"
+"# CONNECT_ONE_SHOT assicura che sia chiamato solo una volta invece di ogni "
+"frame.\n"
+"get_tree().process_frame.connect(callable, CONNECT_ONE_SHOT)\n"
+"[/codeblock]"
+
+msgid ""
+"Calls the [param method] on the object and returns the result. Unlike [method "
+"call], this method expects all parameters to be contained inside [param "
+"arg_array].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.callv(\"rotate\", [Vector3(1.0, 0.0, 0.0), 1.571])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.Callv(Node3D.MethodName.Rotate, [new Vector3(1f, 0f, 0f), 1.571f]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] In C#, [param method] must be in snake_case when referring to "
+"built-in Godot methods. Prefer using the names exposed in the "
+"[code]MethodName[/code] class to avoid allocating a new [StringName] on each "
+"call."
+msgstr ""
+"Chiama il metodo denominato [param method] sull'oggetto e ne restituisce il "
+"risultato. A differenza di [method call], questo metodo si aspetta che tutti "
+"i parametri siano contenuti all'interno di [param arg_array].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node3D.new()\n"
+"node.callv(\"rotate\", [Vector3(1.0, 0.0, 0.0), 1.571])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node3D();\n"
+"node.Callv(Node3D.MethodName.Rotate, new Godot.Collections.Array { new "
+"Vector3(1f, 0f, 0f), 1.571f });\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] In C#, [param method] deve essere in snake_case quando si fa "
+"riferimento ai metodi integrati di Godot. Preferisci usare i nomi esposti "
 "nella classe [code]MethodName[/code] per evitare di allocare un nuovo "
 "[StringName] a ogni chiamata."
 
@@ -78018,7 +94902,7 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]\n"
 "[b]Nota:[/b] In C#, [param signal] deve essere in snake_case quando si fa "
-"riferimento a segnali incorporati di Godot. Preferisci usare i nomi esposti "
+"riferimento ai segnali integrati di Godot. Preferisci usare i nomi esposti "
 "nella classe [code]SignalName[/code] per evitare di allocare un nuovo "
 "[StringName] a ogni chiamata."
 
@@ -78191,6 +95075,12 @@ msgstr ""
 "l'editor non sono visualizzati nell'Ispettore e non dovrebbero essere "
 "modificati, sebbene si possano comunque trovare con questo metodo."
 
+msgid ""
+"Returns the object's metadata entry names as an [Array] of [StringName]s."
+msgstr ""
+"Restituisce i nomi delle voci dei metadati dell'oggetto come un [Array] di "
+"[StringName]."
+
 msgid ""
 "Returns the number of arguments of the given [param method] by name.\n"
 "[b]Note:[/b] In C#, [param method] must be in snake_case when referring to "
@@ -78201,7 +95091,7 @@ msgstr ""
 "Restituisce il numero di argomenti del metodo [param method] specificato per "
 "nome.\n"
 "[b]Nota:[/b] In C#, [param method] deve essere in snake_case quando si fa "
-"riferimento a metodi incorporati di Godot. Preferisci usare i nomi esposti "
+"riferimento ai metodi integrati di Godot. Preferisci usare i nomi esposti "
 "nella classe [code]MethodName[/code] per evitare di allocare un nuovo "
 "[StringName] a ogni chiamata."
 
@@ -78297,6 +95187,28 @@ msgstr ""
 "[b]Nota:[/b] A causa dell'implementazione, ogni [Dictionary] è formattato in "
 "modo molto simile ai valori restituiti da [method get_method_list]."
 
+msgid ""
+"Returns the name of the translation domain used by [method tr] and [method "
+"tr_n]. See also [TranslationServer]."
+msgstr ""
+"Restituisce il nome del dominio di traduzione usato da [method tr] e [method "
+"tr_n]. Vedi anche [TranslationServer]."
+
+msgid ""
+"Returns [code]true[/code] if any connection exists on the given [param "
+"signal] name.\n"
+"[b]Note:[/b] In C#, [param signal] must be in snake_case when referring to "
+"built-in Godot methods. Prefer using the names exposed in the "
+"[code]SignalName[/code] class to avoid allocating a new [StringName] on each "
+"call."
+msgstr ""
+"Restituisce [code]true[/code] se esiste una qualsiasi connessione al segnale "
+"con il nome [param signal].\n"
+"[b]Nota:[/b] In C#, [param signal] deve essere in snake_case quando si fa "
+"riferimento ai metodi integrati di Godot. Preferisci usare i nomi esposti "
+"nella classe [code]SignalName[/code] per evitare di allocare un nuovo "
+"[StringName] a ogni chiamata."
+
 msgid ""
 "Returns [code]true[/code] if a metadata entry is found with the given [param "
 "name]. See also [method get_meta], [method set_meta] and [method "
@@ -78329,10 +95241,25 @@ msgstr ""
 "Restituisce [code]true[/code] se un metodo con il nome [param method] esiste "
 "nell'oggetto.\n"
 "[b]Nota:[/b] In C#, [param method] deve essere in snake_case quando si fa "
-"riferimento ai metodi incorporati di Godot. Preferisci usare i nomi esposti "
+"riferimento ai metodi integrati di Godot. Preferisci usare i nomi esposti "
 "nella classe [code]MethodName[/code] per evitare di allocare un nuovo "
 "[StringName] a ogni chiamata."
 
+msgid ""
+"Returns [code]true[/code] if the given [param signal] name exists in the "
+"object.\n"
+"[b]Note:[/b] In C#, [param signal] must be in snake_case when referring to "
+"built-in Godot signals. Prefer using the names exposed in the "
+"[code]SignalName[/code] class to avoid allocating a new [StringName] on each "
+"call."
+msgstr ""
+"Restituisce [code]true[/code] se un segnale con il nome [param signal] esiste "
+"nell'oggetto.\n"
+"[b]Nota:[/b] In C#, [param signal] deve essere in snake_case quando si fa "
+"riferimento ai segnali integrati di Godot. Preferisci usare i nomi esposti "
+"nella classe [code]SignalName[/code] per evitare di allocare un nuovo "
+"[StringName] a ogni chiamata."
+
 msgid ""
 "Returns [code]true[/code] if the given user-defined [param signal] name "
 "exists. Only signals added with [method add_user_signal] are included. See "
@@ -78388,6 +95315,21 @@ msgstr ""
 "[b]Nota:[/b] Questo metodo ignora le dichiarazioni di [code]class_name[/code] "
 "nello script dell'oggetto."
 
+msgid ""
+"Returns [code]true[/code] if a connection exists between the given [param "
+"signal] name and [param callable].\n"
+"[b]Note:[/b] In C#, [param signal] must be in snake_case when referring to "
+"built-in Godot signals. Prefer using the names exposed in the "
+"[code]SignalName[/code] class to avoid allocating a new [StringName] on each "
+"call."
+msgstr ""
+"Restituisce [code]true[/code] se esiste una connessione tra il segnale con il "
+"nome [param signal] e [param callable].\n"
+"[b]Nota:[/b] In C#, [param signal] deve essere in snake_case quando si fa "
+"riferimento ai segnali integrati di Godot. Preferisci usare i nomi esposti "
+"nella classe [code]SignalName[/code] per evitare di allocare un nuovo "
+"[StringName] a ogni chiamata."
+
 msgid ""
 "Returns [code]true[/code] if the [method Node.queue_free] method was called "
 "for the object."
@@ -78523,6 +95465,46 @@ msgstr ""
 "Rimuove il segnale utente con il nome [param signal] dall'oggetto. Vedi anche "
 "[method add_user_signal] e [method has_user_signal]."
 
+msgid ""
+"Assigns [param value] to the given [param property]. If the property does not "
+"exist or the given [param value]'s type doesn't match, nothing happens.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node2D.new()\n"
+"node.set(\"global_scale\", Vector2(8, 2.5))\n"
+"print(node.global_scale) # Prints (8.0, 2.5)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node2D();\n"
+"node.Set(Node2D.PropertyName.GlobalScale, new Vector2(8, 2.5f));\n"
+"GD.Print(node.GlobalScale); // Prints (8, 2.5)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] In C#, [param property] must be in snake_case when referring to "
+"built-in Godot properties. Prefer using the names exposed in the "
+"[code]PropertyName[/code] class to avoid allocating a new [StringName] on "
+"each call."
+msgstr ""
+"Assegna [param value] alla proprietà [param property] specificata. Se la "
+"proprietà non esiste o il tipo del valore [param value] non corrisponde, non "
+"succede nulla.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node2D.new()\n"
+"node.set(\"global_scale\", Vector2(8, 2.5))\n"
+"print(node.global_scale) # Stampa (8.0, 2.5)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node2D();\n"
+"node.Set(Node2D.PropertyName.GlobalScale, new Vector2(8, 2.5f));\n"
+"GD.Print(node.GlobalScale); // Stampa (8, 2.5)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] In C#, [param property] deve essere in snake_case quando si fa "
+"riferimento alle proprietà integrate di Godot. Preferisci utilizzare i nomi "
+"esposti nella classe [code]PropertyName[/code] per evitare di allocare un "
+"nuovo [StringName] a ogni chiamata."
+
 msgid ""
 "If set to [code]true[/code], the object becomes unable to emit signals. As "
 "such, [method emit_signal] and signal connections will not work, until it is "
@@ -78593,6 +95575,52 @@ msgstr ""
 "esposti nella classe [code]PropertyName[/code] per evitare di allocare un "
 "nuovo [StringName] a ogni chiamata."
 
+msgid ""
+"Assigns a new [param value] to the property identified by the [param "
+"property_path]. The path should be a [NodePath] relative to this object, and "
+"can use the colon character ([code]:[/code]) to access nested properties.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node2D.new()\n"
+"node.set_indexed(\"position\", Vector2(42, 0))\n"
+"node.set_indexed(\"position:y\", -10)\n"
+"print(node.position) # Prints (42.0, -10.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node2D();\n"
+"node.SetIndexed(\"position\", new Vector2(42, 0));\n"
+"node.SetIndexed(\"position:y\", -10);\n"
+"GD.Print(node.Position); // Prints (42, -10)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] In C#, [param property_path] must be in snake_case when "
+"referring to built-in Godot properties. Prefer using the names exposed in the "
+"[code]PropertyName[/code] class to avoid allocating a new [StringName] on "
+"each call."
+msgstr ""
+"Assegna un nuovo [param value] alla proprietà identificata da [param "
+"property_path]. Il percorso dovrebbe essere un [NodePath] relativo a questo "
+"oggetto e può utilizzare il carattere due punti ([code]:[/code]) per accedere "
+"alle proprietà nidificate.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var node = Node2D.new()\n"
+"node.set_indexed(\"position\", Vector2(42, 0))\n"
+"node.set_indexed(\"position:y\", -10)\n"
+"print(node.position) # Stampa (42.0, -10.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var node = new Node2D();\n"
+"node.SetIndexed(\"position\", new Vector2(42, 0));\n"
+"node.SetIndexed(\"position:y\", -10);\n"
+"GD.Print(node.Position); // Stampa (42, -10)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] In C#, [param property_path] deve essere in snake_case quando si "
+"fa riferimento alle proprietà integrate di Godot. Preferisci usare i nomi "
+"esposti nella classe [code]PropertyName[/code] per evitare di allocare un "
+"nuovo [StringName] a ogni chiamata."
+
 msgid ""
 "If set to [code]true[/code], allows the object to translate messages with "
 "[method tr] and [method tr_n]. Enabled by default. See also [method "
@@ -78643,6 +95671,13 @@ msgstr ""
 "proprietà e lo stato vengono persi. I valori di proprietà integrate vengono "
 "comunque mantenuti."
 
+msgid ""
+"Sets the name of the translation domain used by [method tr] and [method "
+"tr_n]. See also [TranslationServer]."
+msgstr ""
+"Imposta il nome del dominio di traduzione usato da [method tr] e [method "
+"tr_n]. Vedi anche [TranslationServer]."
+
 msgid ""
 "Returns a [String] representing the object. Defaults to "
 "[code]\"<ClassName#RID>\"[/code]. Override [method _to_string] to customize "
@@ -78742,6 +95777,20 @@ msgstr ""
 "Notifica ricevuta quando l'oggetto viene inizializzato, prima che il suo "
 "script venga allegato. Utilizzato internamente."
 
+msgid ""
+"Notification received when the object is about to be deleted. Can be used "
+"like destructors in object-oriented programming languages."
+msgstr ""
+"Notifica ricevuta quando l'oggetto sta per essere eliminato. Può fungere da "
+"distruttore nei linguaggi di programmazione orientati agli oggetti."
+
+msgid ""
+"Notification received when the object finishes hot reloading. This "
+"notification is only sent for extensions classes and derived."
+msgstr ""
+"Notifica ricevuta quando l'oggetto termina il ricaricamento a caldo. Questa "
+"notifica viene inviata solo per le classi di estensioni e derivate."
+
 msgid ""
 "Deferred connections trigger their [Callable]s on idle time (at the end of "
 "the frame), rather than instantly."
@@ -79141,7 +96190,7 @@ msgid "Retrieve the action set at this index."
 msgstr "Recupera l'azione impostata su questo indice."
 
 msgid "Retrieve the number of actions sets in our action map."
-msgstr "Recupera il numero di set di azioni nella nostra mappa d'azione."
+msgstr "Recupera il numero di insiemi di azioni nella nostra mappa d'azioni."
 
 msgid "Get the interaction profile at this index."
 msgstr "Ottiene il profilo di interazione in questo indice."
@@ -79210,6 +96259,12 @@ msgstr "Il nome localizzato di questo insieme di azioni."
 msgid "The priority for this action set."
 msgstr "La priorità per questo insieme di azioni."
 
+msgid "Haptic pulse to emit when the user releases the input."
+msgstr "Impulso tattile da emettere quando l'utente rilascia l'input."
+
+msgid "Haptic pulse to emit when the user presses the input."
+msgstr "Impulso tattile da emettere quando l'utente preme l'input."
+
 msgid "Makes the OpenXR API available for GDExtension."
 msgstr "Rende disponibile l'API di OpenXR per GDExtension."
 
@@ -79248,6 +96303,13 @@ msgstr "Documentazione su xrBeginSession"
 msgid "XrPosef documentation"
 msgstr "Documentazione su XrPosef"
 
+msgid ""
+"Returns the corresponding [code]XrAction[/code] OpenXR handle for the given "
+"action RID."
+msgstr ""
+"Restituisce il gestore [code]XrAction[/code] OpenXR corrispondente per il RID "
+"azione specificato."
+
 msgid ""
 "Returns [code]true[/code] if OpenXR is initialized for rendering with an XR "
 "viewport."
@@ -79266,8 +96328,8 @@ msgid ""
 "Returns the corresponding [code]XRHandTrackerEXT[/code] handle for the given "
 "hand index value."
 msgstr ""
-"Restituisce l'impugnatura [code]XRHandTrackerEXT[/code] corrispondente per il "
-"valore dell'indice specificato di mano."
+"Restituisce il gestore [code]XRHandTrackerEXT[/code] corrispondente per il "
+"valore dell'indice di mano specificato."
 
 msgid ""
 "Returns the [url=https://registry.khronos.org/OpenXR/specs/1.0/man/html/"
@@ -79307,6 +96369,20 @@ msgstr ""
 msgid "Returns the predicted display timing for the current frame."
 msgstr "Restituisce il tempo di visualizzazione previsto per il frame attuale."
 
+msgid ""
+"Returns the far boundary value of the camera frustum.\n"
+"[b]Note:[/b] This is only accessible in the render thread."
+msgstr ""
+"Restituisce il valore del limite lontano del tronco della telecamera.\n"
+"[b]Nota:[/b] Questo è accessibile solo nel thread di rendering."
+
+msgid ""
+"Returns the near boundary value of the camera frustum.\n"
+"[b]Note:[/b] This is only accessible in the render thread."
+msgstr ""
+"Restituisce il valore del limite vicino del tronco della telecamera.\n"
+"[b]Nota:[/b] Questo è accessibile solo nel thread di rendering."
+
 msgid ""
 "Returns the OpenXR session, which is an [url=https://registry.khronos.org/"
 "OpenXR/specs/1.0/man/html/XrSession.html]XrSession[/url] cast to an integer."
@@ -79315,6 +96391,9 @@ msgstr ""
 "registry.khronos.org/OpenXR/specs/1.0/man/html/XrSession.html]XrSession[/url] "
 "in un intero."
 
+msgid "Returns an array of supported swapchain formats."
+msgstr "Restituisce un array di formati swapchain supportati."
+
 msgid "Returns the name of the specified swapchain format."
 msgstr "Restituisce il nome del formato swapchain specificato."
 
@@ -79351,10 +96430,36 @@ msgstr ""
 msgid "Returns [code]true[/code] if OpenXR is enabled."
 msgstr "Restituisce [code]true[/code] se OpenXR è abilitato."
 
+msgid "Acquires the image of the provided swapchain."
+msgstr "Ottiene l'immagine della swapchain specificata."
+
+msgid ""
+"Returns a pointer to a new swapchain created using the provided parameters."
+msgstr ""
+"Restituisce un puntatore a una nuova swapchain creata attraverso i parametri "
+"forniti."
+
+msgid "Returns the RID of the provided swapchain's image."
+msgstr "Restituisce il RID dell'immagine della swapchain specificata."
+
+msgid "Returns the [code]XrSwapchain[/code] handle of the provided swapchain."
+msgstr ""
+"Restituisce il gestore [code]XrSwapchain[/code] della swapchain specificata."
+
+msgid "Releases the image of the provided swapchain."
+msgstr "Restituisce l'immagine della swapchain specificata."
+
 msgid "Registers the given extension as a composition layer provider."
 msgstr ""
 "Registra l'estensione specificata come fornitore del livello di composizione."
 
+msgid ""
+"Registers the given extension as a provider of additional data structures to "
+"projections views."
+msgstr ""
+"Registra l'estensione specificata come fornitore di ulteriori strutture dati "
+"alle viste di proiezione."
+
 msgid ""
 "If set to [code]true[/code], an OpenXR extension is loaded which is capable "
 "of emulating the [constant XRInterface.XR_ENV_BLEND_MODE_ALPHA_BLEND] blend "
@@ -79364,6 +96469,19 @@ msgstr ""
 "grado di emulare la modalità di fusione [constant XRInterface."
 "XR_ENV_BLEND_MODE_ALPHA_BLEND]."
 
+msgid "Sets the render target of the velocity depth texture."
+msgstr ""
+"Imposta la destinazione di rendering della texture di profondità della "
+"velocità."
+
+msgid "Sets the target size of the velocity and velocity depth textures."
+msgstr ""
+"Imposta le dimensioni di destinazione della texture di velocità e della "
+"texture di profondità della velocità."
+
+msgid "Sets the render target of the velocity texture."
+msgstr "Imposta la destinazione di rendering della texture della velocità."
+
 msgid ""
 "Creates a [Transform3D] from an [url=https://registry.khronos.org/OpenXR/"
 "specs/1.0/man/html/XrPosef.html]XrPosef[/url]."
@@ -79376,6 +96494,13 @@ msgstr ""
 "Annulla la registrazione dell'estensione specificata come fornitore del "
 "livello di composizione."
 
+msgid ""
+"Unregisters the given extension as a provider of additional data structures "
+"to projections views."
+msgstr ""
+"Annulla la registrazione dell'estensione specificata come fornitore di "
+"ulteriori strutture dati alle viste di proiezione."
+
 msgid ""
 "Returns [code]true[/code] if the provided [url=https://registry.khronos.org/"
 "OpenXR/specs/1.0/man/html/XrResult.html]XrResult[/url] (cast to an integer) "
@@ -79410,6 +96535,19 @@ msgid ""
 msgstr ""
 "Significa che [constant XRInterface.XR_ENV_BLEND_MODE_ALPHA_BLEND] è emulato."
 
+msgid "Binding modifier editor."
+msgstr "Editor di modificatori di associazioni."
+
+msgid "Returns the [OpenXRBindingModifier] currently being edited."
+msgstr "Restituisce l'[OpenXRBindingModifier] attualmente in fase di modifica."
+
+msgid ""
+"Signal emitted when the user presses the delete binding modifier button for "
+"this modifier."
+msgstr ""
+"Segnale emesso quando l'utente preme il pulsante per eliminare il "
+"modificatore di associazione per questo modificatore."
+
 msgid "The parent class of all OpenXR composition layer nodes."
 msgstr "Classe padre di tutti i nodi OpenXR dei livelli di composizione."
 
@@ -79440,6 +96578,17 @@ msgstr ""
 "nello spazio globale.\n"
 "Restituisce [code]Vector2(-1.0, -1.0)[/code] se il raggio non interseca."
 
+msgid ""
+"Returns [code]true[/code] if the OpenXR runtime natively supports this "
+"composition layer type.\n"
+"[b]Note:[/b] This will only return an accurate result after the OpenXR "
+"session has started."
+msgstr ""
+"Restituisce [code]true[/code] se il runtime OpenXR supporta nativamente "
+"questo tipo di livello di composizione.\n"
+"[b]Nota:[/b] Questo metodo restituirà un risultato preciso solo dopo l'avvio "
+"della sessione OpenXR."
+
 msgid ""
 "Enables the blending the layer using its alpha channel.\n"
 "Can be combined with [member Viewport.transparent_bg] to give the layer a "
@@ -79553,6 +96702,16 @@ msgstr ""
 msgid "The dimensions of the quad."
 msgstr "Le dimensioni del quad."
 
+msgid ""
+"Center region in which our center position of our dpad return [code]true[/"
+"code]."
+msgstr ""
+"Regione centrale in cui la posizione centrale del nostro d-pad restituisce "
+"[code]true[/code]."
+
+msgid "Input path for this dpad binding modifier."
+msgstr "Percorso all'input per questo modificatore di associazione del d-pad."
+
 msgid "Allows clients to implement OpenXR extensions with GDExtension."
 msgstr "Consente agli utenti di implementare estensioni OpenXR con GDExtension."
 
@@ -79666,6 +96825,18 @@ msgstr "Chiamato subito prima che l'istanza OpenXR venga distrutta."
 msgid "Called right after the main swapchains are (re)created."
 msgstr "Chiamato subito dopo che le swapchain principali vengano (ri)create."
 
+msgid ""
+"Called right after the given viewport is rendered.\n"
+"[b]Note:[/b] The draw commands might only be queued at this point, not "
+"executed."
+msgstr ""
+"Chiamato subito dopo il rendering della viewport specificata.\n"
+"[b]Nota:[/b] I comandi di disegno potrebbero essere solo in coda a questo "
+"punto, non eseguiti."
+
+msgid "Called right before the given viewport is rendered."
+msgstr "Chiamato subito prima che la viewport fornita sia renderizzata."
+
 msgid "Called right before the XR viewports begin their rendering step."
 msgstr "Chiamato subito prima che le viewport XR inizino la fase di rendering."
 
@@ -79758,6 +96929,17 @@ msgstr ""
 "[param layer] è un puntatore a una struttura "
 "[code]XrCompositionLayerBaseHeader[/code]."
 
+msgid ""
+"Adds additional data structures to Android surface swapchains created by "
+"[OpenXRCompositionLayer].\n"
+"[param property_values] contains the values of the properties returned by "
+"[method _get_viewport_composition_layer_extension_properties]."
+msgstr ""
+"Aggiunge ulteriori strutture dati alle swapchain di superfice di Android "
+"create da [OpenXRCompositionLayer].\n"
+"[param property_values] contiene i valori delle proprietà restituite da "
+"[method _get_viewport_composition_layer_extension_properties]."
+
 msgid "Adds additional data structures when each hand tracker is created."
 msgstr ""
 "Aggiunge ulteriori strutture dati quando ogni tracciatore di mano viene "
@@ -79767,6 +96949,13 @@ msgid "Adds additional data structures when the OpenXR instance is created."
 msgstr ""
 "Aggiunge ulteriori strutture dati quando ogni istanza OpenXR viene creata."
 
+msgid ""
+"Adds additional data structures to the projection view of the given [param "
+"view_index]."
+msgstr ""
+"Aggiunge ulteriori strutture dati alla vista di proiezione dell'indice [param "
+"view_index]."
+
 msgid "Adds additional data structures when the OpenXR session is created."
 msgstr ""
 "Aggiunge ulteriori strutture dati quando ogni sessione OpenXR viene creata."
@@ -79775,6 +96964,11 @@ msgid "Adds additional data structures when creating OpenXR swapchains."
 msgstr ""
 "Aggiunge ulteriori strutture dati quando ogni swapchain OpenXR viene creata."
 
+msgid "Adds additional data structures when querying OpenXR system abilities."
+msgstr ""
+"Aggiunge ulteriori strutture dati quando le capacità del sistema OpenXR "
+"vengono interrogate."
+
 msgid ""
 "Adds additional data structures to composition layers created by "
 "[OpenXRCompositionLayer].\n"
@@ -79810,6 +97004,41 @@ msgstr "Utilizza invece [XRHandModifier3D]."
 msgid "Node supporting hand and finger tracking in OpenXR."
 msgstr "Nodo che supporta il tracciamento di mani e dita in OpenXR."
 
+msgid ""
+"This node enables OpenXR's hand tracking functionality. The node should be a "
+"child node of an [XROrigin3D] node, tracking will update its position to the "
+"player's tracked hand Palm joint location (the center of the middle finger's "
+"metacarpal bone). This node also updates the skeleton of a properly skinned "
+"hand or avatar model.\n"
+"If the skeleton is a hand (one of the hand bones is the root node of the "
+"skeleton), then the skeleton will be placed relative to the hand palm "
+"location and the hand mesh and skeleton should be children of the OpenXRHand "
+"node.\n"
+"If the hand bones are part of a full skeleton, then the root of the hand will "
+"keep its location with the assumption that IK is used to position the hand "
+"and arm.\n"
+"By default the skeleton hand bones are repositioned to match the size of the "
+"tracked hand. To preserve the modeled bone sizes change [member bone_update] "
+"to apply rotation only."
+msgstr ""
+"Questo nodo abilita la funzionalità di tracciamento delle mani di OpenXR. Il "
+"nodo dovrebbe essere un nodo figlio di un nodo [XROrigin3D], il tracciamento "
+"aggiornerà la sua posizione in base alla posizione dell'articolazione del "
+"palmo della mano tracciata del giocatore (il centro dell'osso metacarpale del "
+"dito medio). Questo nodo aggiorna anche lo scheletro di una mano o di un "
+"modello di avatar con skin corretta.\n"
+"Se lo scheletro è una mano (una delle ossa della mano è il nodo radice dello "
+"scheletro), allora lo scheletro sarà posizionato in relazione alla posizione "
+"del palmo della mano e la mesh e lo scheletro della mano dovrebbero essere "
+"figli del nodo OpenXRHand.\n"
+"Se le ossa della mano fanno parte di uno scheletro completo, allora la radice "
+"della mano manterrà la sua posizione, assumendo che un IK venga utilizzato "
+"per posizionare la mano e il braccio.\n"
+"Per impostazione predefinita, le ossa delle mani dello scheletro sono "
+"riposizionate in modo da corrispondere alle dimensioni della mano tracciata. "
+"Per preservare le dimensioni delle ossa modellate, modifica [member "
+"bone_update] per applicare solo la rotazione."
+
 msgid "Specify the type of updates to perform on the bone."
 msgstr "Specificare il tipo di aggiornamenti da effettuare sull'osso."
 
@@ -79842,7 +97071,15 @@ msgstr "Numero massimo di mani supportate."
 
 msgid "When player grips, hand skeleton will form a full fist."
 msgstr ""
-"Quando il giocatore afferra, lo scheletro della mano forma un pugno completo."
+"Quando il giocatore impugna il controller, lo scheletro della mano forma un "
+"pugno completo."
+
+msgid ""
+"When player grips, hand skeleton conforms to the controller the player is "
+"holding."
+msgstr ""
+"Quando il giocatore impugna il controller, lo scheletro della sua mano si "
+"adatta al controller che il giocatore sta tenendo in mano."
 
 msgid "Maximum supported motion ranges."
 msgstr "Intervalli di movimento massimi supportati."
@@ -79870,6 +97107,13 @@ msgstr ""
 msgid "Maximum supported bone update mode."
 msgstr "Modalità massima supportata di aggiornamento delle ossa."
 
+msgid "This is a base class for haptic feedback resources."
+msgstr "Questa è una classe base per le risorse di feedback tattile."
+
+msgid ""
+"The amplitude of the pulse between [code]0.0[/code] and [code]1.0[/code]."
+msgstr "L'amplitudine dell'impulso tra [code]0.0[/code] e [code]1.0[/code]."
+
 msgid "Suggested bindings object for OpenXR."
 msgstr "Oggetto suggerito di associazioni per OpenXR."
 
@@ -79891,12 +97135,35 @@ msgstr ""
 msgid "Retrieve the binding at this index."
 msgstr "Recupera l'associazione a questo indice."
 
+msgid "Get the number of bindings in this interaction profile."
+msgstr "Ottiene il numero di associazioni in questo profilo di interazione."
+
+msgid "Get the [OpenXRBindingModifier] at this index."
+msgstr "Ottiene l'[OpenXRBindingModifier] a questo indice."
+
+msgid "Get the number of binding modifiers in this interaction profile."
+msgstr ""
+"Ottiene il numero di modificatori di associazioni in questo profilo di "
+"interazione."
+
+msgid "Binding modifiers for this interaction profile."
+msgstr "Modificatori di associazioni per questo profilo di interazione."
+
 msgid "Action bindings for this interaction profile."
 msgstr "Associazioni di azioni per questo profilo di interazione."
 
 msgid "The interaction profile path identifying the XR device."
 msgstr "Percorso del profilo di interazione che identifica il dispositivo XR."
 
+msgid "Default OpenXR interaction profile editor."
+msgstr "Editor predefinito per un profilo di interazione OpenXR."
+
+msgid "Base class for editing interaction profiles."
+msgstr "Classe base per la modifica dei profili di interazione."
+
+msgid "Meta class registering supported devices in OpenXR."
+msgstr "Meta-classe che registra i dispositivi supportati in OpenXR."
+
 msgid ""
 "This class allows OpenXR core and extensions to register metadata relating to "
 "supported interaction devices such as controllers, trackers, haptic devices, "
@@ -80191,7 +97458,7 @@ msgstr ""
 "sessione OpenXR."
 
 msgid "Sets the given action set as active or inactive."
-msgstr "Imposta il set di azioni come attivo o inattivo."
+msgstr "Imposta l'insieme di azioni come attivo o inattivo."
 
 msgid ""
 "If handtracking is enabled and motion range is supported, sets the currently "
@@ -80452,9 +97719,30 @@ msgid "Defines a binding between an [OpenXRAction] and an XR input or output."
 msgstr ""
 "Definisce un'associazione tra un [OpenXRAction] e un input o un output XR."
 
+msgid ""
+"This binding resource binds an [OpenXRAction] to an input or output. As most "
+"controllers have left hand and right versions that are handled by the same "
+"interaction profile we can specify multiple bindings. For instance an action "
+"\"Fire\" could be bound to both \"/user/hand/left/input/trigger\" and \"/user/"
+"hand/right/input/trigger\". This would require two binding entries."
+msgstr ""
+"Questa risorsa associazione associa un [OpenXRAction] a un input o un output. "
+"Poiché la maggior parte dei controller ha versioni per la mano sinistra e per "
+"la mano destra che sono gestite dallo stesso profilo di interazione, possiamo "
+"specificare più associazioni. Ad esempio, un'azione \"Spara\" potrebbe essere "
+"associata sia a \"/user/hand/left/input/trigger\" sia a \"/user/hand/right/"
+"input/trigger\". Ciò richiederebbe due voci di associazioni."
+
+msgid "Binding is for a single path."
+msgstr "L'associazione è per un singolo percorso."
+
 msgid "Add an input/output path to this binding."
 msgstr "Aggiunge un percorso di input/output a questa associazione."
 
+msgid "Get the number of binding modifiers for this binding."
+msgstr ""
+"Ottiene il numero di modificatori di associazione per questa associazione."
+
 msgid "Get the number of input/output paths in this binding."
 msgstr "Ottiene il numero di percorsi di input/output in questa associazione."
 
@@ -80467,10 +97755,21 @@ msgstr ""
 msgid "Removes this input/output path from this binding."
 msgstr "Rimuove questo percorso di input/output da questa associazione."
 
+msgid "[OpenXRAction] that is bound to [member binding_path]."
+msgstr "[OpenXRAction] che è associato a [member binding_path]."
+
+msgid "Use [member binding_path] instead."
+msgstr "Utilizza [member binding_path] invece."
+
 msgid "Paths that define the inputs or outputs bound on the device."
 msgstr ""
 "Percorsi che definiscono gli input o gli output associati al dispositivo."
 
+msgid "Binding modifier that applies directly on an interaction profile."
+msgstr ""
+"Modificatore di associazione che viene applicato direttamente su un profilo "
+"di interazione."
+
 msgid "An optimized translation, used by default for CSV Translations."
 msgstr ""
 "Una traduzione ottimizzata, utilizzata per impostazione predefinita per le "
@@ -80766,6 +98065,16 @@ msgstr ""
 "piattaforma host. L'esecuzione del motore è bloccata finché la finestra di "
 "dialogo non viene chiusa."
 
+msgid ""
+"Shuts down the system MIDI driver. Godot will no longer receive "
+"[InputEventMIDI]. See also [method open_midi_inputs] and [method "
+"get_connected_midi_inputs].\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, Windows, and Web."
+msgstr ""
+"Spegne il driver MIDI del sistema. Godot non riceverà più [InputEventMIDI]. "
+"Vedi anche [method open_midi_inputs] e [method get_connected_midi_inputs].\n"
+"[b]Nota:[/b] Questo metodo è implementato su Linux, macOS, Windows e Web."
+
 msgid ""
 "Crashes the engine (or the editor if called within a [code]@tool[/code] "
 "script). See also [method kill].\n"
@@ -80801,6 +98110,64 @@ msgstr ""
 "Consulta [method create_process] se desideri eseguire un processo diverso.\n"
 "[b]Nota:[/b] Questo metodo è implementato su Android, Linux, macOS e Windows."
 
+msgid ""
+"Creates a new process that runs independently of Godot. It will not terminate "
+"when Godot terminates. The path specified in [param path] must exist and be "
+"an executable file or macOS [code].app[/code] bundle. The path is resolved "
+"based on the current platform. The [param arguments] are used in the given "
+"order and separated by a space.\n"
+"On Windows, if [param open_console] is [code]true[/code] and the process is a "
+"console app, a new terminal window will be opened.\n"
+"If the process is successfully created, this method returns its process ID, "
+"which you can use to monitor the process (and potentially terminate it with "
+"[method kill]). Otherwise, this method returns [code]-1[/code].\n"
+"[b]Example:[/b] Run another instance of the project:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var pid = OS.create_process(OS.get_executable_path(), [])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var pid = OS.CreateProcess(OS.GetExecutablePath(), []);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See [method execute] if you wish to run an external command and retrieve the "
+"results.\n"
+"[b]Note:[/b] This method is implemented on Android, Linux, macOS, and "
+"Windows.\n"
+"[b]Note:[/b] On macOS, sandboxed applications are limited to run only "
+"embedded helper executables, specified during export or system .app bundle, "
+"system .app bundles will ignore arguments."
+msgstr ""
+"Crea un nuovo processo che viene eseguito indipendentemente da Godot. Non "
+"terminerà quando Godot termina. Il percorso specificato in [param path] deve "
+"esistere ed essere un file eseguibile o un bundle [code].app[/code] per "
+"macOS. Il percorso è risolto in base alla piattaforma attuale. Gli argomenti "
+"[param arguments] sono utilizzati nell'ordine specificato e separati da uno "
+"spazio.\n"
+"Su Windows, se [param open_console] è [code]true[/code] e il processo è "
+"un'applicazione da console, verrà aperta una nuova finestra del terminale.\n"
+"Se il processo viene creato correttamente, questo metodo restituisce il suo "
+"ID di processo, che puoi utilizzare per monitorare il processo (e "
+"potenzialmente terminarlo con [method kill]). Altrimenti, questo metodo "
+"restituisce [code]-1[/code].\n"
+"[b]Esempio:[/b] Esegui un'altra istanza del progetto:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var pid = OS.create_process(OS.get_executable_path(), [])\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var pid = OS.CreateProcess(OS.GetExecutablePath(), new string[] {});\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Vedi [method execute] se desideri eseguire un comando esterno e recuperare i "
+"risultati.\n"
+"[b]Nota:[/b] Questo metodo è implementato su Android, Linux, macOS e "
+"Windows.\n"
+"[b]Nota:[/b] Su macOS, le applicazioni in sandbox sono limitate "
+"all'esecuzione di soli eseguibili di supporto incorporati, specificati "
+"durante l'esportazione o il bundle .app di sistema, i bundle .app di sistema "
+"ignoreranno gli argomenti."
+
 msgid ""
 "Delays execution of the current thread by [param msec] milliseconds. [param "
 "msec] must be greater than or equal to [code]0[/code]. Otherwise, [method "
@@ -80865,6 +98232,185 @@ msgstr ""
 "non il progetto se è in esecuzione (poiché il progetto è un processo figlio "
 "indipendente)."
 
+msgid ""
+"Executes the given process in a [i]blocking[/i] way. The file specified in "
+"[param path] must exist and be executable. The system path resolution will be "
+"used. The [param arguments] are used in the given order, separated by spaces, "
+"and wrapped in quotes.\n"
+"If an [param output] array is provided, the complete shell output of the "
+"process is appended to [param output] as a single [String] element. If [param "
+"read_stderr] is [code]true[/code], the output to the standard error stream is "
+"also appended to the array.\n"
+"On Windows, if [param open_console] is [code]true[/code] and the process is a "
+"console app, a new terminal window is opened.\n"
+"This method returns the exit code of the command, or [code]-1[/code] if the "
+"process fails to execute.\n"
+"[b]Note:[/b] The main thread will be blocked until the executed command "
+"terminates. Use [Thread] to create a separate thread that will not block the "
+"main thread, or use [method create_process] to create a completely "
+"independent process.\n"
+"For example, to retrieve a list of the working directory's contents:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var output = []\n"
+"var exit_code = OS.execute(\"ls\", [\"-l\", \"/tmp\"], output)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array output = [];\n"
+"int exitCode = OS.Execute(\"ls\", [\"-l\", \"/tmp\"], output);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If you wish to access a shell built-in or execute a composite command, a "
+"platform-specific shell can be invoked. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var output = []\n"
+"OS.execute(\"CMD.exe\", [\"/C\", \"cd %TEMP% && dir\"], output)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array output = [];\n"
+"OS.Execute(\"CMD.exe\", [\"/C\", \"cd %TEMP% && dir\"], output);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] This method is implemented on Android, Linux, macOS, and "
+"Windows.\n"
+"[b]Note:[/b] To execute a Windows command interpreter built-in command, "
+"specify [code]cmd.exe[/code] in [param path], [code]/c[/code] as the first "
+"argument, and the desired command as the second argument.\n"
+"[b]Note:[/b] To execute a PowerShell built-in command, specify "
+"[code]powershell.exe[/code] in [param path], [code]-Command[/code] as the "
+"first argument, and the desired command as the second argument.\n"
+"[b]Note:[/b] To execute a Unix shell built-in command, specify shell "
+"executable name in [param path], [code]-c[/code] as the first argument, and "
+"the desired command as the second argument.\n"
+"[b]Note:[/b] On macOS, sandboxed applications are limited to run only "
+"embedded helper executables, specified during export.\n"
+"[b]Note:[/b] On Android, system commands such as [code]dumpsys[/code] can "
+"only be run on a rooted device."
+msgstr ""
+"Esegue il processo specificato in modo [i]bloccante[/i]. Il file specificato "
+"in [param path] deve esistere ed essere eseguibile. Sarà usata la risoluzione "
+"del percorso di sistema. Gli argomenti [param arguments] sono usati "
+"nell'ordine specificato, separati da spazi e racchiusi tra virgolette.\n"
+"Se viene fornito un array [param output], l'output completo della shell del "
+"processo è aggiunto a [param output] come un singolo elemento [String]. Se "
+"[param read_stderr] è [code]true[/code], anche l'output nel canale di error "
+"standard è aggiunto all'array.\n"
+"Su Windows, se [param open_console] è [code]true[/code] e il processo è "
+"un'app console, è aperta una nuova finestra del terminale.\n"
+"Questo metodo restituisce il codice di uscita del comando o [code]-1[/code] "
+"se il processo non riesce a essere eseguito.\n"
+"[b]Nota:[/b] Il thread principale sarà bloccato fino al termine del comando "
+"eseguito. Usa [Thread] per creare un thread separato che non bloccherà il "
+"thread principale, oppure usa [method create_process] per creare un processo "
+"completamente indipendente.\n"
+"Ad esempio, per recuperare una lista del contenuto della cartella di lavoro:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var output = []\n"
+"var exit_code = OS.execute(\"ls\", [\"-l\", \"/tmp\"], output)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array output = [];\n"
+"int exitCode = OS.Execute(\"ls\", [\"-l\", \"/tmp\"], output);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Se si desidera accedere a una shell integrata o eseguire un comando "
+"composito, è possibile richiamare una shell specifica della piattaforma. Ad "
+"esempio:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var output = []\n"
+"OS.execute(\"CMD.exe\", [\"/C\", \"cd %TEMP% && dir\"], output)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array output = [];\n"
+"OS.Execute(\"CMD.exe\", [\"/C\", \"cd %TEMP% && dir\"], output);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Questo metodo è implementato su Android, Linux, macOS e "
+"Windows.\n"
+"[b]Nota:[/b] Per eseguire un comando integrato dell'interprete dei comandi in "
+"Windows, specifica [code]cmd.exe[/code] in [param path], [code]/c[/code] come "
+"primo argomento e il comando desiderato come secondo argomento.\n"
+"[b]Nota:[/b] Per eseguire un comando integrato in PowerShell, specificare "
+"[code]powershell.exe[/code] in [param path], [code]-Command[/code] come primo "
+"argomento e il comando desiderato come secondo argomento.\n"
+"[b]Nota:[/b] Per eseguire un comando integrato della shell in Unix, "
+"specificare il nome dell'eseguibile della shell in [param path], [code]-c[/"
+"code] come primo argomento e il comando desiderato come secondo argomento.\n"
+"[b]Nota:[/b] Su macOS, le applicazioni in sandbox possono soltanto eseguire "
+"gli eseguibili incorporati ausiliari, specificati durante l'esportazione.\n"
+"[b]Nota:[/b] Su Android, i comandi di sistema come [code]dumpsys[/code] "
+"possono essere eseguiti solo su un dispositivo radicato."
+
+msgid ""
+"Creates a new process that runs independently of Godot with redirected IO. It "
+"will not terminate when Godot terminates. The path specified in [param path] "
+"must exist and be an executable file or macOS [code].app[/code] bundle. The "
+"path is resolved based on the current platform. The [param arguments] are "
+"used in the given order and separated by a space.\n"
+"If [param blocking] is [code]false[/code], created pipes work in non-blocking "
+"mode, i.e. read and write operations will return immediately. Use [method "
+"FileAccess.get_error] to check if the last read/write operation was "
+"successful.\n"
+"If the process cannot be created, this method returns an empty [Dictionary]. "
+"Otherwise, this method returns a [Dictionary] with the following keys:\n"
+"- [code]\"stdio\"[/code] - [FileAccess] to access the process stdin and "
+"stdout pipes (read/write).\n"
+"- [code]\"stderr\"[/code] - [FileAccess] to access the process stderr pipe "
+"(read only).\n"
+"- [code]\"pid\"[/code] - Process ID as an [int], which you can use to monitor "
+"the process (and potentially terminate it with [method kill]).\n"
+"[b]Note:[/b] This method is implemented on Android, Linux, macOS, and "
+"Windows.\n"
+"[b]Note:[/b] To execute a Windows command interpreter built-in command, "
+"specify [code]cmd.exe[/code] in [param path], [code]/c[/code] as the first "
+"argument, and the desired command as the second argument.\n"
+"[b]Note:[/b] To execute a PowerShell built-in command, specify "
+"[code]powershell.exe[/code] in [param path], [code]-Command[/code] as the "
+"first argument, and the desired command as the second argument.\n"
+"[b]Note:[/b] To execute a Unix shell built-in command, specify shell "
+"executable name in [param path], [code]-c[/code] as the first argument, and "
+"the desired command as the second argument.\n"
+"[b]Note:[/b] On macOS, sandboxed applications are limited to run only "
+"embedded helper executables, specified during export or system .app bundle, "
+"system .app bundles will ignore arguments."
+msgstr ""
+"Crea un nuovo processo che è eseguito indipendentemente da Godot con IO "
+"reindirizzato. Non terminerà quando Godot termina. Il percorso specificato in "
+"[param path] deve esistere ed essere un file eseguibile o un bundle macOS "
+"[code].app[/code]. Il percorso è risolto in base alla piattaforma attuale. "
+"Gli argomenti [param arguments] sono usati nell'ordine specificato e separati "
+"da uno spazio.\n"
+"Se [param blocking] è [code]false[/code], le pipe create funzionano in "
+"modalità non bloccante, ovvero le operazioni di lettura e scrittura verranno "
+"restituite immediatamente. Usa [method FileAccess.get_error] per verificare "
+"se l'ultima operazione di lettura o di scrittura ha avuto successo.\n"
+"Se il processo non può essere creato, questo metodo restituisce un "
+"[Dictionary] vuoto. Altrimenti, questo metodo restituisce un [Dictionary] con "
+"le seguenti chiavi:\n"
+"- [code]\"stdio\"[/code] - [FileAccess] per accedere ai canali stdin e stdout "
+"del processo (lettura/scrittura).\n"
+"- [code]\"stderr\"[/code] - [FileAccess] per accedere al canale stderr del "
+"processo (sola lettura).\n"
+"- [code]\"pid\"[/code] - ID processo come [int], che si può utilizzare per "
+"monitorare il processo (e potenzialmente terminarlo con [method kill]).\n"
+"[b]Nota:[/b] Questo metodo è implementato su Android, Linux, macOS e "
+"Windows.\n"
+"[b]Nota:[/b] Per eseguire un comando integrato dell'interprete dei comandi in "
+"Windows, specifica [code]cmd.exe[/code] in [param path], [code]/c[/code] come "
+"primo argomento e il comando desiderato come secondo argomento.\n"
+"[b]Nota:[/b] Per eseguire un comando integrato in PowerShell, specificare "
+"[code]powershell.exe[/code] in [param path], [code]-Command[/code] come primo "
+"argomento e il comando desiderato come secondo argomento.\n"
+"[b]Nota:[/b] Per eseguire un comando integrato della shell in Unix, "
+"specificare il nome dell'eseguibile della shell in [param path], [code]-c[/"
+"code] come primo argomento e il comando desiderato come secondo argomento.\n"
+"[b]Nota:[/b] Su macOS, le applicazioni in sandbox possono soltanto eseguire "
+"gli eseguibili incorporati ausiliari, specificati durante l'esportazione o il "
+"bundle .app di sistema; i bundle .app di sistema ignoreranno gli argomenti."
+
 msgid ""
 "Finds the keycode for the given string. The returned values are equivalent to "
 "the [enum Key] constants.\n"
@@ -80932,6 +98478,103 @@ msgstr ""
 "Da non confondere con [method get_user_data_dir], che restituisce il percorso "
 "dei dati utente [i]specifico per il progetto[/i]."
 
+msgid ""
+"Returns the command-line arguments passed to the engine.\n"
+"Command-line arguments can be written in any form, including both [code]--key "
+"value[/code] and [code]--key=value[/code] forms so they can be properly "
+"parsed, as long as custom command-line arguments do not conflict with engine "
+"arguments.\n"
+"You can also incorporate environment variables using the [method "
+"get_environment] method.\n"
+"You can set [member ProjectSettings.editor/run/main_run_args] to define "
+"command-line arguments to be passed by the editor when running the project.\n"
+"[b]Example:[/b] Parse command-line arguments into a [Dictionary] using the "
+"[code]--key=value[/code] form for arguments:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var arguments = {}\n"
+"for argument in OS.get_cmdline_args():\n"
+"    if argument.contains(\"=\"):\n"
+"        var key_value = argument.split(\"=\")\n"
+"        arguments[key_value[0].trim_prefix(\"--\")] = key_value[1]\n"
+"    else:\n"
+"        # Options without an argument will be present in the dictionary,\n"
+"        # with the value set to an empty string.\n"
+"        arguments[argument.trim_prefix(\"--\")] = \"\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var arguments = new Dictionary<string, string>();\n"
+"foreach (var argument in OS.GetCmdlineArgs())\n"
+"{\n"
+"    if (argument.Contains('='))\n"
+"    {\n"
+"        string[] keyValue = argument.Split(\"=\");\n"
+"        arguments[keyValue[0].TrimPrefix(\"--\")] = keyValue[1];\n"
+"    }\n"
+"    else\n"
+"    {\n"
+"        // Options without an argument will be present in the dictionary,\n"
+"        // with the value set to an empty string.\n"
+"        arguments[argument.TrimPrefix(\"--\")] = \"\";\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Passing custom user arguments directly is not recommended, as "
+"the engine may discard or modify them. Instead, pass the standard UNIX double "
+"dash ([code]--[/code]) and then the custom arguments, which the engine will "
+"ignore by design. These can be read via [method get_cmdline_user_args]."
+msgstr ""
+"Restituisce gli argomenti della riga di comando passati al motore.\n"
+"Gli argomenti della riga di comando possono essere scritti in qualsiasi "
+"formato, inclusi i formati [code]--chiave valore[/code] e [code]--"
+"chiave=valore[/code], in modo che possano essere analizzati correttamente, "
+"purché gli argomenti della riga di comando personalizzati non siano in "
+"conflitto con gli argomenti del motore.\n"
+"Puoi anche incorporare variabili di ambiente usando il metodo [method "
+"get_environment].\n"
+"Puoi impostare [member ProjectSettings.editor/run/main_run_args] per definire "
+"gli argomenti della riga di comando che devono essere passati dall'editor "
+"durante l'esecuzione del progetto.\n"
+"[b]Esempio:[/b] Interpreta gli argomenti della riga di comando in un "
+"[Dictionary] usando il formato [code]--chiave=valore[/code] per gli "
+"argomenti:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var arguments = {}\n"
+"for argument in OS.get_cmdline_args():\n"
+"    if argument.contains(\"=\"):\n"
+"        var key_value = argument.split(\"=\")\n"
+"        arguments[key_value[0].trim_prefix(\"--\")] = key_value[1]\n"
+"    else:\n"
+"        # Options without an argument will be present in the dictionary,\n"
+"        # with the value set to an empty string.\n"
+"        arguments[argument.trim_prefix(\"--\")] = \"\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var arguments = new Dictionary<string, string>();\n"
+"foreach (var argument in OS.GetCmdlineArgs())\n"
+"{\n"
+"    if (argument.Contains('='))\n"
+"    {\n"
+"        string[] keyValue = argument.Split(\"=\");\n"
+"        arguments[keyValue[0].TrimPrefix(\"--\")] = keyValue[1];\n"
+"    }\n"
+"    else\n"
+"    {\n"
+"        // Options without an argument will be present in the dictionary,\n"
+"        // with the value set to an empty string.\n"
+"        arguments[argument.TrimPrefix(\"--\")] = \"\";\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Non è consigliabile passare direttamente argomenti utente "
+"personalizzati, poiché il motore potrebbe scartarli o modificarli. Invece, "
+"passa il doppio trattino UNIX standard ([code]--[/code]) e poi gli argomenti "
+"personalizzati, che il motore ignorerà per impostazione predefinita. Questi "
+"possono essere letti tramite [method get_cmdline_user_args]."
+
 msgid ""
 "Returns the command-line user arguments passed to the engine. User arguments "
 "are ignored by the engine and reserved for the user. They are passed after "
@@ -81222,6 +98865,15 @@ msgstr ""
 "[b]Nota:[/b] Il valore di ogni voce può essere [code]-1[/code] se è "
 "sconosciuto."
 
+msgid ""
+"Returns the model name of the current device.\n"
+"[b]Note:[/b] This method is implemented on Android, iOS, macOS, and Windows. "
+"Returns [code]\"GenericDevice\"[/code] on unsupported platforms."
+msgstr ""
+"Restituisce il nome del modello del dispositivo attuale.\n"
+"[b]Nota:[/b] Questo metodo è implementato su Android, iOS, macOS e Windows. "
+"Restituisce [code]\"GenericDevice\"[/code] su piattaforme non supportate."
+
 msgid ""
 "Returns the name of the host platform.\n"
 "- On Windows, this is [code]\"Windows\"[/code].\n"
@@ -81416,6 +99068,15 @@ msgstr ""
 "Restituisce la quantità di memoria statica utilizzata dal programma in byte. "
 "Funziona solo nelle build di debug."
 
+msgid "Returns type of the standard error device."
+msgstr "Restituisce il tipo del dispositivo di errore standard."
+
+msgid "Returns type of the standard input device."
+msgstr "Restituisce il tipo del dispositivo di input standard."
+
+msgid "Returns type of the standard output device."
+msgstr "Restituisce il tipo del dispositivo di output standard."
+
 msgid ""
 "Returns the list of certification authorities trusted by the operating system "
 "as a string of concatenated certificates in PEM format."
@@ -81697,6 +99358,41 @@ msgstr ""
 "progetto è un modello di esportazione (debug o release), utilizza invece "
 "[code]OS.has_feature(\"template\")[/code]."
 
+msgid ""
+"Returns [code]true[/code] if the input keycode corresponds to a Unicode "
+"character. For a list of codes, see the [enum Key] constants.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(OS.is_keycode_unicode(KEY_G))      # Prints true\n"
+"print(OS.is_keycode_unicode(KEY_KP_4))   # Prints true\n"
+"print(OS.is_keycode_unicode(KEY_TAB))    # Prints false\n"
+"print(OS.is_keycode_unicode(KEY_ESCAPE)) # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.G));      // Prints True\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.Kp4));    // Prints True\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.Tab));    // Prints False\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.Escape)); // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce [code]true[/code] se il codice tasto di input corrisponde a un "
+"carattere Unicode. Per un elenco di codici, vedi le costanti di [enum Key].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(OS.is_keycode_unicode(KEY_G))      # Stampa true\n"
+"print(OS.is_keycode_unicode(KEY_KP_4))   # Stampa true\n"
+"print(OS.is_keycode_unicode(KEY_TAB))    # Stampa false\n"
+"print(OS.is_keycode_unicode(KEY_ESCAPE)) # Stampa false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.G));      // Prints True\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.Kp4));    // Prints True\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.Tab));    // Prints False\n"
+"GD.Print(OS.IsKeycodeUnicode((long)Key.Escape)); // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns [code]true[/code] if the child process ID ([param pid]) is still "
 "running or [code]false[/code] if it has terminated. [param pid] must be a "
@@ -81811,6 +99507,105 @@ msgstr ""
 "[b]Nota:[/b] Se l'utente ha disabilitato il cestino sul proprio sistema, il "
 "file sarà invece eliminato definitivamente."
 
+msgid ""
+"Reads a user input as raw data from the standard input. This operation can be "
+"[i]blocking[/i], which causes the window to freeze if [method "
+"read_string_from_stdin] is called on the main thread.\n"
+"- If standard input is console, this method will block until the program "
+"receives a line break in standard input (usually by the user pressing "
+"[kbd]Enter[/kbd]).\n"
+"- If standard input is pipe, this method will block until a specific amount "
+"of data is read or pipe is closed.\n"
+"- If standard input is a file, this method will read a specific amount of "
+"data (or less if end-of-file is reached) and return immediately.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] On exported Windows builds, run the console wrapper executable "
+"to access the terminal. If standard input is console, calling this method "
+"without console wrapped will freeze permanently. If standard input is pipe or "
+"file, it can be used without console wrapper. If you need a single executable "
+"with full console support, use a custom build compiled with the "
+"[code]windows_subsystem=console[/code] flag."
+msgstr ""
+"Legge l'input dell'utente dall'input standard come dati grezzi. Questa "
+"operazione può essere [i]bloccante[/i], il che causa il blocco della finestra "
+"se [method read_string_from_stdin] viene chiamato sul thread principale.\n"
+"- Se l'input standard è una console, questo metodo si bloccherà finché il "
+"programma non riceverà un'interruzione di riga nell'input standard "
+"(solitamente quando l'utente preme [kbd]Invio[/kbd]).\n"
+"- Se l'input standard è una pipe, questo metodo si bloccherà finché non verrà "
+"letta una quantità specifica di dati o la pipe verrà chiusa.\n"
+"- Se l'input standard è un file, questo metodo leggerà una quantità specifica "
+"di dati (o meno se viene raggiunta la fine del file) e restituirà "
+"immediatamente.\n"
+"[b]Nota:[/b] Questo metodo è implementato su Linux, macOS e Windows.\n"
+"[b]Nota:[/b] Nelle build Windows esportate, esegui l'eseguibile wrapper della "
+"console per accedere al terminale. Altrimenti, l'input standard non "
+"funzionerà correttamente. Se hai bisogno di un singolo eseguibile con "
+"supporto per la console, usa una build personalizzata compilata con il flag "
+"[code]windows_subsystem=console[/code]."
+
+msgid ""
+"Reads a user input as a UTF-8 encoded string from the standard input. This "
+"operation can be [i]blocking[/i], which causes the window to freeze if "
+"[method read_string_from_stdin] is called on the main thread.\n"
+"- If standard input is console, this method will block until the program "
+"receives a line break in standard input (usually by the user pressing "
+"[kbd]Enter[/kbd]).\n"
+"- If standard input is pipe, this method will block until a specific amount "
+"of data is read or pipe is closed.\n"
+"- If standard input is a file, this method will read a specific amount of "
+"data (or less if end-of-file is reached) and return immediately.\n"
+"[b]Note:[/b] This method automatically replaces [code]\\r\\n[/code] line "
+"breaks with [code]\\n[/code] and removes them from the end of the string. Use "
+"[method read_buffer_from_stdin] to read the unprocessed data.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] On exported Windows builds, run the console wrapper executable "
+"to access the terminal. If standard input is console, calling this method "
+"without console wrapped will freeze permanently. If standard input is pipe or "
+"file, it can be used without console wrapper. If you need a single executable "
+"with full console support, use a custom build compiled with the "
+"[code]windows_subsystem=console[/code] flag."
+msgstr ""
+"Legge l'input dell'utente dall'input standard come stringa codificata in "
+"UTF-8. Questa operazione può è [i]bloccante[/i], il che causa il blocco della "
+"finestra se [method read_string_from_stdin] viene chiamato sul thread "
+"principale.\n"
+"- Se l'input standard è una console, questo metodo si bloccherà finché il "
+"programma non riceverà un'interruzione di riga nell'input standard "
+"(solitamente quando l'utente preme [kbd]Invio[/kbd]).\n"
+"- Se l'input standard è una pipe, questo metodo si bloccherà finché non verrà "
+"letta una quantità specifica di dati o la pipe verrà chiusa.\n"
+"- Se l'input standard è un file, questo metodo leggerà una quantità specifica "
+"di dati (o meno se viene raggiunta la fine del file) e restituirà "
+"immediatamente.\n"
+"[b]Nota:[/b] Questo metodo sostituisce automaticamente le interruzioni di "
+"riga [code]\\r\\n[/code] con [code]\\n[/code] e le rimuove dalla fine della "
+"stringa. Usa [method read_buffer_from_stdin] per leggere i dati non "
+"elaborati.\n"
+"[b]Nota:[/b] Questo metodo è implementato su Linux, macOS e Windows.\n"
+"[b]Nota:[/b] Nelle build Windows esportate, esegui l'eseguibile wrapper della "
+"console per accedere al terminale. Altrimenti, l'input standard non "
+"funzionerà correttamente. Se hai bisogno di un singolo eseguibile con "
+"supporto per la console, usa una build personalizzata compilata con il flag "
+"[code]windows_subsystem=console[/code]."
+
+msgid ""
+"Requests [i]dangerous[/i] permissions from the OS. Returns [code]true[/code] "
+"if permissions have already been granted. See also [signal MainLoop."
+"on_request_permissions_result].\n"
+"[b]Note:[/b] Permissions must be checked during export.\n"
+"[b]Note:[/b] This method is only implemented on Android. Normal permissions "
+"are automatically granted at install time in Android applications."
+msgstr ""
+"Richiede autorizzazioni [i]pericolose[/i] dal sistema operativo. Restituisce "
+"[code]true[/code] se le autorizzazioni sono state già concesse. Vedi anche "
+"[signal MainLoop.on_request_permissions_result].\n"
+"[b]Nota:[/b] Le autorizzazioni devono essere selezionate durante "
+"l'esportazione.\n"
+"[b]Nota:[/b] Questo metodo è implementato solo su Android. Le autorizzazioni "
+"normali sono concesse automaticamente al momento dell'installazione nelle "
+"applicazioni Android."
+
 msgid ""
 "On macOS (sandboxed applications only), this function clears list of user "
 "selected folders accessible to the application."
@@ -81897,6 +99692,51 @@ msgstr ""
 "applicazioni, come antivirus, editor di testo o persino dall'editor di Godot "
 "stesso."
 
+msgid ""
+"Requests the OS to open a resource identified by [param uri] with the most "
+"appropriate program. For example:\n"
+"- [code]OS.shell_open(\"C:\\\\Users\\\\name\\\\Downloads\")[/code] on Windows "
+"opens the file explorer at the user's Downloads folder.\n"
+"- [code]OS.shell_open(\"C:/Users/name/Downloads\")[/code] also works on "
+"Windows and opens the file explorer at the user's Downloads folder.\n"
+"- [code]OS.shell_open(\"https://godotengine.org\")[/code] opens the default "
+"web browser on the official Godot website.\n"
+"- [code]OS.shell_open(\"mailto:example@example.com\")[/code] opens the "
+"default email client with the \"To\" field set to [code]example@example.com[/"
+"code]. See [url=https://datatracker.ietf.org/doc/html/rfc2368]RFC 2368 - The "
+"[code]mailto[/code] URL scheme[/url] for a list of fields that can be added.\n"
+"Use [method ProjectSettings.globalize_path] to convert a [code]res://[/code] "
+"or [code]user://[/code] project path into a system path for use with this "
+"method.\n"
+"[b]Note:[/b] Use [method String.uri_encode] to encode characters within URLs "
+"in a URL-safe, portable way. This is especially required for line breaks. "
+"Otherwise, [method shell_open] may not work correctly in a project exported "
+"to the Web platform.\n"
+"[b]Note:[/b] This method is implemented on Android, iOS, Web, Linux, macOS "
+"and Windows."
+msgstr ""
+"Richiede al sistema operativo di aprire una risorsa identificata da [param "
+"uri] con il programma più appropriato. Ad esempio:\n"
+"- [code]OS.shell_open(\"C:\\\\Users\\name\\Downloads\")[/code] su Windows "
+"apre l'esploratore file nella cartella Download dell'utente.\n"
+"- [code]OS.shell_open(\"https://godotengine.org\")[/code] apre il browser Web "
+"predefinito sul sito Web ufficiale di Godot.\n"
+"- [code]OS.shell_open(\"mailto:example@example.com\")[/code] apre il client "
+"di posta elettronica predefinito con il campo \"Destinatario\" impostato su "
+"[code]example@example.com[/code]. Consulta [url=https://datatracker.ietf.org/"
+"doc/html/rfc2368]RFC 2368 - Lo schema URL [code]mailto[/code][/url] per un "
+"elenco di campi che è possibile aggiungere.\n"
+"Usa [method ProjectSettings.globalize_path] per convertire un percorso di "
+"progetto [code]res://[/code] o [code]user://[/code] in un percorso di sistema "
+"da usare con questo metodo.\n"
+"[b]Nota:[/b] Usa [method String.uri_encode] per codificare i caratteri "
+"all'interno degli URL in un modo URL-safe e portabile. Ciò è particolarmente "
+"necessario per le interruzioni di riga. Altrimenti, [method shell_open] "
+"potrebbe non funzionare correttamente in un progetto esportato sulla "
+"piattaforma Web.\n"
+"[b]Nota:[/b] Questo metodo è implementato su Android, iOS, Web, Linux, macOS "
+"e Windows."
+
 msgid ""
 "Requests the OS to open the file manager, navigate to the given [param "
 "file_or_dir_path] and select the target file or folder.\n"
@@ -81999,6 +99839,9 @@ msgstr ""
 msgid "The Direct3D 12 rendering driver."
 msgstr "Il driver di rendering Direct3D 12."
 
+msgid "The Metal rendering driver."
+msgstr "Il driver di rendering Metal."
+
 msgid "Refers to the Desktop directory path."
 msgstr "Fa riferimento al percorso della cartella Desktop."
 
@@ -82483,6 +100326,31 @@ msgstr ""
 "in caso contrario o quando il valore è derivato da [Object] e [param "
 "allow_objects] è [code]false[/code]."
 
+msgid ""
+"Returns a hexadecimal representation of this array as a [String].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = PackedByteArray([11, 46, 255])\n"
+"print(array.hex_encode()) # Prints \"0b2eff\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"byte[] array = [11, 46, 255];\n"
+"GD.Print(array.HexEncode()); // Prints \"0b2eff\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce una rappresentazione esadecimale di questo array come [String].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = PackedByteArray([11, 46, 255])\n"
+"print(array.hex_encode()) # Stampa \"0b2eff\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var array = new byte[] {11, 46, 255};\n"
+"GD.Print(array.HexEncode()); // Stampa \"0b2eff\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Inserts a new element at a given position in the array. The position must be "
 "valid, or at the end of the array ([code]idx == size()[/code])."
@@ -82783,6 +100651,62 @@ msgstr ""
 msgid "Efficiently packs and serializes [Array] or [Dictionary]."
 msgstr "Comprime e serializza in modo efficiente [Array] o [Dictionary]."
 
+msgid ""
+"[PackedDataContainer] can be used to efficiently store data from untyped "
+"containers. The data is packed into raw bytes and can be saved to file. Only "
+"[Array] and [Dictionary] can be stored this way.\n"
+"You can retrieve the data by iterating on the container, which will work as "
+"if iterating on the packed data itself. If the packed container is a "
+"[Dictionary], the data can be retrieved by key names ([String]/[StringName] "
+"only).\n"
+"[codeblock]\n"
+"var data = { \"key\": \"value\", \"another_key\": 123, \"lock\": Vector2() }\n"
+"var packed = PackedDataContainer.new()\n"
+"packed.pack(data)\n"
+"ResourceSaver.save(packed, \"packed_data.res\")\n"
+"[/codeblock]\n"
+"[codeblock]\n"
+"var container = load(\"packed_data.res\")\n"
+"for key in container:\n"
+"    prints(key, container[key])\n"
+"[/codeblock]\n"
+"Prints:\n"
+"[codeblock lang=text]\n"
+"key value\n"
+"lock (0, 0)\n"
+"another_key 123\n"
+"[/codeblock]\n"
+"Nested containers will be packed recursively. While iterating, they will be "
+"returned as [PackedDataContainerRef]."
+msgstr ""
+"[PackedDataContainer] può essere utilizzato per memorizzare in modo "
+"efficiente i dati da contenitori non tipizzati. I dati sono compressi in byte "
+"grezzi e possono essere salvati su file. Solo [Array] e [Dictionary] possono "
+"essere memorizzati in questo modo.\n"
+"È possibile recuperare i dati iterando sul contenitore, che funzionerà come "
+"se si iterasse sui dati compressi stessi. Se il contenitore compresso è un "
+"[Dictionary], è possibile recuperare i dati tramite i nomi delle chiavi (solo "
+"[String]/[StringName]).\n"
+"[codeblock]\n"
+"var data = { \"key\": \"value\", \"another_key\": 123, \"lock\": Vector2() }\n"
+"var packed = PackedDataContainer.new()\n"
+"packed.pack(data)\n"
+"ResourceSaver.save(packed, \"packed_data.res\")\n"
+"[/codeblock]\n"
+"[codeblock]\n"
+"var container = load(\"packed_data.res\")\n"
+"for key in container:\n"
+"    prints(key, container[key])\n"
+"[/codeblock]\n"
+"Stampa:\n"
+"[codeblock lang=text]\n"
+"key value\n"
+"lock (0, 0)\n"
+"another_key 123\n"
+"[/codeblock]\n"
+"I contenitori nidificati saranno impacchettati ricorsivamente. Durante un "
+"iterazione, saranno restituiti come [PackedDataContainerRef]."
+
 msgid ""
 "Packs the given container into a binary representation. The [param value] "
 "must be either [Array] or [Dictionary], any other type will result in invalid "
@@ -82809,6 +100733,61 @@ msgstr ""
 "Una classe interna utilizzata da [PackedDataContainer] per impacchettare "
 "array e dizionari annidati."
 
+msgid ""
+"When packing nested containers using [PackedDataContainer], they are "
+"recursively packed into [PackedDataContainerRef] (only applies to [Array] and "
+"[Dictionary]). Their data can be retrieved the same way as from "
+"[PackedDataContainer].\n"
+"[codeblock]\n"
+"var packed = PackedDataContainer.new()\n"
+"packed.pack([1, 2, 3, [\"nested1\", \"nested2\"], 4, 5, 6])\n"
+"\n"
+"for element in packed:\n"
+"    if element is PackedDataContainerRef:\n"
+"        for subelement in element:\n"
+"            print(\"::\", subelement)\n"
+"    else:\n"
+"        print(element)\n"
+"[/codeblock]\n"
+"Prints:\n"
+"[codeblock lang=text]\n"
+"1\n"
+"2\n"
+"3\n"
+"::nested1\n"
+"::nested2\n"
+"4\n"
+"5\n"
+"6\n"
+"[/codeblock]"
+msgstr ""
+"Quando si impacchettano contenitori innestati tramite un "
+"[PackedDataContainer], sono impacchettati ricorsivamente in un "
+"[PackedDataContainerRef] (si applica solo a [Array] e [Dictionary]). I loro "
+"dati possono essere recuperati nello stesso modo di [PackedDataContainer].\n"
+"[codeblock]\n"
+"var packed = PackedDataContainer.new()\n"
+"packed.pack([1, 2, 3, [\"nested1\", \"nested2\"], 4, 5, 6])\n"
+"\n"
+"for element in packed:\n"
+"    if element is PackedDataContainerRef:\n"
+"        for subelement in element:\n"
+"            print(\"::\", subelement)\n"
+"    else:\n"
+"        print(element)\n"
+"[/codeblock]\n"
+"Stampa:\n"
+"[codeblock lang=text]\n"
+"1\n"
+"2\n"
+"3\n"
+"::nested1\n"
+"::nested2\n"
+"4\n"
+"5\n"
+"6\n"
+"[/codeblock]"
+
 msgid "A packed array of 32-bit floating-point values."
 msgstr "Un array compatto di valori in virgola mobile a 32 bit."
 
@@ -82965,6 +100944,15 @@ msgstr ""
 "Pertanto, i risultati di questo metodo potrebbero non essere accurati se "
 "vengono inclusi i NaN."
 
+msgid ""
+"Returns a copy of the data converted to a [PackedByteArray], where each "
+"element has been encoded as 4 bytes.\n"
+"The size of the new array will be [code]float32_array.size() * 4[/code]."
+msgstr ""
+"Restituisce una copia dei dati convertiti in un [PackedByteArray], dove ogni "
+"elemento è stato codificato come 4 byte.\n"
+"La dimensione del nuovo array sarà [code]float32_array.size() * 4[/code]."
+
 msgid ""
 "Returns a new [PackedFloat32Array] with contents of [param right] added at "
 "the end of this array. For better performance, consider using [method "
@@ -83077,6 +101065,15 @@ msgstr ""
 "dell'array (ad esempio, [code]arr.slice(0, -2)[/code] è un'abbreviazione per "
 "[code]arr.slice(0, arr.size() - 2)[/code])."
 
+msgid ""
+"Returns a copy of the data converted to a [PackedByteArray], where each "
+"element has been encoded as 8 bytes.\n"
+"The size of the new array will be [code]float64_array.size() * 8[/code]."
+msgstr ""
+"Restituisce una copia dei dati convertiti in un [PackedByteArray], dove ogni "
+"elemento è stato codificato come 8 byte.\n"
+"La dimensione del nuovo array sarà [code]float64_array.size() * 8[/code]."
+
 msgid ""
 "Returns a new [PackedFloat64Array] with contents of [param right] added at "
 "the end of this array. For better performance, consider using [method "
@@ -83189,6 +101186,15 @@ msgstr ""
 "dell'array (ad esempio, [code]arr.slice(0, -2)[/code] è un'abbreviazione per "
 "[code]arr.slice(0, arr.size() - 2)[/code])."
 
+msgid ""
+"Returns a copy of the data converted to a [PackedByteArray], where each "
+"element has been encoded as 4 bytes.\n"
+"The size of the new array will be [code]int32_array.size() * 4[/code]."
+msgstr ""
+"Restituisce una copia dei dati convertiti in un [PackedByteArray], dove ogni "
+"elemento è stato codificato come 4 byte.\n"
+"La dimensione del nuovo array sarà [code]int32_array.size() * 4[/code]."
+
 msgid ""
 "Returns a new [PackedInt32Array] with contents of [param right] added at the "
 "end of this array. For better performance, consider using [method "
@@ -83220,6 +101226,53 @@ msgstr ""
 msgid "A packed array of 64-bit integers."
 msgstr "Un array compatto di interi a 64 bit."
 
+msgid ""
+"An array specifically designed to hold 64-bit integer values. Packs data "
+"tightly, so it saves memory for large array sizes.\n"
+"[b]Note:[/b] This type stores signed 64-bit integers, which means it can take "
+"values in the interval [code][-2^63, 2^63 - 1][/code], i.e. [code]"
+"[-9223372036854775808, 9223372036854775807][/code]. Exceeding those bounds "
+"will wrap around. If you only need to pack 32-bit integers tightly, see "
+"[PackedInt32Array] for a more memory-friendly alternative.\n"
+"[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] "
+"Packed arrays are generally faster to iterate on and modify compared to a "
+"typed array of the same type (e.g. [PackedInt64Array] versus [code]Array[int]"
+"[/code]). Also, packed arrays consume less memory. As a downside, packed "
+"arrays are less flexible as they don't offer as many convenience methods such "
+"as [method Array.map]. Typed arrays are in turn faster to iterate on and "
+"modify than untyped arrays.\n"
+"[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of "
+"an array that can be modified independently of the original array, use "
+"[method duplicate]. This is [i]not[/i] the case for built-in properties and "
+"methods. The returned packed array of these are a copies, and changing it "
+"will [i]not[/i] affect the original value. To update a built-in property you "
+"need to modify the returned array, and then assign it to the property again."
+msgstr ""
+"Un array progettato specificamente per contenere valori interi a 64 bit. "
+"Impacchetta i dati in modo compatto, in modo da risparmiare memoria per array "
+"di grandi dimensioni.\n"
+"[b]Nota:[/b] Questo tipo memorizza interi a 64 bit con segno, il che "
+"significa che può assumere valori nell'intervallo [code][-2^63, 2^63 - 1][/"
+"code], ovvero [code][-9223372036854775808, 9223372036854775807][/code]. I "
+"valori oltre i limiti saranno avvolti. Se è necessario soltanto impacchettare "
+"interi a 32 bit, vedi [PackedInt32Array] per un'alternativa più efficiente "
+"per la memoria.\n"
+"[b]Differenze tra gli array impacchettati, gli array tipizzati e gli array "
+"non tipizzati:[/b] Gli array impacchettati sono generalmente più veloci da "
+"iterare e modificare rispetto a un array tipizzato dello stesso tipo (ad "
+"esempio [PackedInt64Array] in confronto a [code]Array[int][/code]). Inoltre, "
+"gli array impacchettati consumano meno memoria. Come svantaggio, i array "
+"impacchettati sono meno flessibili in quanto non offrono molti metodi di "
+"convenienza come [method Array.map]. Gli array tipizzati sono anche loro più "
+"veloci da iterare e modificare in confronto ad array non tipizzati.\n"
+"[b]Nota:[/b] Gli array impacchettati sono sempre passati per riferimento. Per "
+"ottenere una copia di un array che può essere modificata indipendentemente "
+"dall'array originale, usa [method duplicate]. Questo [i]non[/i] è il caso per "
+"le proprietà e per i metodi integrati. L'array impacchettato restituito da "
+"essi è una copia e modificarlo [i]non[/i] influenzerà il valore originale. "
+"Per aggiornare una proprietà integrata è necessario modificare l'array "
+"restituito e successivamente riassegnarlo alla proprietà."
+
 msgid "Constructs an empty [PackedInt64Array]."
 msgstr "Costruisce un [PackedInt64Array] vuoto."
 
@@ -83261,6 +101314,15 @@ msgstr ""
 "dell'array (ad esempio, [code]arr.slice(0, -2)[/code] è un'abbreviazione per "
 "[code]arr.slice(0, arr.size() - 2)[/code])."
 
+msgid ""
+"Returns a copy of the data converted to a [PackedByteArray], where each "
+"element has been encoded as 8 bytes.\n"
+"The size of the new array will be [code]int64_array.size() * 8[/code]."
+msgstr ""
+"Restituisce una copia dei dati convertiti in un [PackedByteArray], dove ogni "
+"elemento è stato codificato come 8 byte.\n"
+"La dimensione del nuovo array sarà [code]int64_array.size() * 8[/code]."
+
 msgid ""
 "Returns a new [PackedInt64Array] with contents of [param right] added at the "
 "end of this array. For better performance, consider using [method "
@@ -83282,6 +101344,170 @@ msgstr ""
 msgid "An abstraction of a serialized scene."
 msgstr "Un'astrazione di una scena serializzata."
 
+msgid ""
+"A simplified interface to a scene file. Provides access to operations and "
+"checks that can be performed on the scene resource itself.\n"
+"Can be used to save a node to a file. When saving, the node as well as all "
+"the nodes it owns get saved (see [member Node.owner] property).\n"
+"[b]Note:[/b] The node doesn't need to own itself.\n"
+"[b]Example:[/b] Load a saved scene:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Use load() instead of preload() if the path isn't known at compile-time.\n"
+"var scene = preload(\"res://scene.tscn\").instantiate()\n"
+"# Add the node as a child of the node the script is attached to.\n"
+"add_child(scene)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// C# has no preload, so you have to always use ResourceLoader."
+"Load<PackedScene>().\n"
+"var scene = ResourceLoader.Load<PackedScene>(\"res://scene.tscn\")."
+"Instantiate();\n"
+"// Add the node as a child of the node the script is attached to.\n"
+"AddChild(scene);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Example:[/b] Save a node with different owners. The following example "
+"creates 3 objects: [Node2D] ([code]node[/code]), [RigidBody2D] ([code]body[/"
+"code]) and [CollisionObject2D] ([code]collision[/code]). [code]collision[/"
+"code] is a child of [code]body[/code] which is a child of [code]node[/code]. "
+"Only [code]body[/code] is owned by [code]node[/code] and [method pack] will "
+"therefore only save those two nodes, but not [code]collision[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Create the objects.\n"
+"var node = Node2D.new()\n"
+"var body = RigidBody2D.new()\n"
+"var collision = CollisionShape2D.new()\n"
+"\n"
+"# Create the object hierarchy.\n"
+"body.add_child(collision)\n"
+"node.add_child(body)\n"
+"\n"
+"# Change owner of `body`, but not of `collision`.\n"
+"body.owner = node\n"
+"var scene = PackedScene.new()\n"
+"\n"
+"# Only `node` and `body` are now packed.\n"
+"var result = scene.pack(node)\n"
+"if result == OK:\n"
+"    var error = ResourceSaver.save(scene, \"res://path/name.tscn\")  # Or "
+"\"user://...\"\n"
+"    if error != OK:\n"
+"        push_error(\"An error occurred while saving the scene to disk.\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Create the objects.\n"
+"var node = new Node2D();\n"
+"var body = new RigidBody2D();\n"
+"var collision = new CollisionShape2D();\n"
+"\n"
+"// Create the object hierarchy.\n"
+"body.AddChild(collision);\n"
+"node.AddChild(body);\n"
+"\n"
+"// Change owner of `body`, but not of `collision`.\n"
+"body.Owner = node;\n"
+"var scene = new PackedScene();\n"
+"\n"
+"// Only `node` and `body` are now packed.\n"
+"Error result = scene.Pack(node);\n"
+"if (result == Error.Ok)\n"
+"{\n"
+"    Error error = ResourceSaver.Save(scene, \"res://path/name.tscn\"); // Or "
+"\"user://...\"\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"An error occurred while saving the scene to disk.\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Un'interfaccia semplificata per un file di scena. Fornisce accesso alle "
+"operazioni e alle verifiche che possono essere eseguite sulla risorsa di "
+"scena stessa.\n"
+"Può essere utilizzato per salvare un nodo in un file. Durante il salvataggio, "
+"il nodo e tutti i nodi posseduti da esso sono salvati (vedi la proprietà "
+"[member Node.owner]).\n"
+"[b]Nota:[/b] Il nodo non deve possedere se stesso.\n"
+"[b]Esempio:[/b] Carica una scena salvata:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Usa load() invece di preload() se il percorso non è noto in fase di "
+"compilazione.\n"
+"var scene = preload(\"res://scene.tscn\").instantiate()\n"
+"# Aggiunge il nodo come figlio del nodo a cui è associato lo script.\n"
+"add_child(scene)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// C# non ha preload, quindi è necessario usare sempre ResourceLoader."
+"Load<PackedScene>().\n"
+"var scene = ResourceLoader.Load<PackedScene>(\"res://scene.tscn\")."
+"Instantiate();\n"
+"// Aggiunge il nodo come figlio del nodo a cui è associato lo script.\n"
+"AddChild(scene);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Esempio:[/b] Salva un nodo con proprietari diversi: L'esempio seguente "
+"crea 3 oggetti: [Node2D] ([code]node[/code]), [RigidBody2D] ([code]body[/"
+"code]) e [CollisionObject2D] ([code]collision[/code]). [code]collision[/code] "
+"è un figlio di [code]body[/code] che è un figlio di [code]node[/code]. Solo "
+"[code]body[/code] è posseduto da [code]node[/code] e [method pack] salverà "
+"quindi solo quei due nodi, ma non [code]collision[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Crea gli oggetti.\n"
+"var node = Node2D.new()\n"
+"var body = RigidBody2D.new()\n"
+"var collision = CollisionShape2D.new()\n"
+"\n"
+"# Crea la gerarchia degli oggetti.\n"
+"body.add_child(collision)\n"
+"node.add_child(body)\n"
+"\n"
+"# Cambia il proprietario di `body`, ma non di `collision`.\n"
+"body.owner = node\n"
+"var scene = PackedScene.new()\n"
+"\n"
+"# Solo `node` e `body` sono ora impacchettati.\n"
+"var result = scene.pack(node)\n"
+"if result == OK:\n"
+"    var error = ResourceSaver.save(scene, \"res://path/name.tscn\")  # Or "
+"\"user://...\"\n"
+"    if error != OK:\n"
+"        push_error(\"Si è verificato un errore durante il salvataggio della "
+"scena su disco.\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Crea gli oggetti.\n"
+"var node = new Node2D();\n"
+"var body = new RigidBody2D();\n"
+"var collision = new CollisionShape2D();\n"
+"\n"
+"// Crea la gerarchia degli oggetti.\n"
+"body.AddChild(collision);\n"
+"node.AddChild(body);\n"
+"\n"
+"// Cambia il proprietario di `body`, ma non di `collision`.\n"
+"body.Owner = node;\n"
+"var scene = new PackedScene();\n"
+"\n"
+"// Solo `node` e `body` sono ora impacchettati.\n"
+"Error result = scene.Pack(node);\n"
+"if (result == Error.Ok)\n"
+"{\n"
+"    Error error = ResourceSaver.Save(scene, \"res://path/name.tscn\"); // Or "
+"\"user://...\"\n"
+"    if (error != Error.Ok)\n"
+"    {\n"
+"        GD.PushError(\"Si è verificato un errore durante il salvataggio della "
+"scena su disco.\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Returns [code]true[/code] if the scene file has nodes."
 msgstr "Restituisce [code]true[/code] se il file di scena contiene nodi."
 
@@ -83436,6 +101662,13 @@ msgstr ""
 "dell'array (ad esempio, [code]arr.slice(0, -2)[/code] è un'abbreviazione per "
 "[code]arr.slice(0, arr.size() - 2)[/code])."
 
+msgid ""
+"Returns a [PackedByteArray] with each string encoded as UTF-8. Strings are "
+"[code]null[/code] terminated."
+msgstr ""
+"Restituisce un [PackedByteArray] con ogni stringa codificata come UTF8. Le "
+"stringhe vengono terminate con [code]null[/code]."
+
 msgid ""
 "Returns a new [PackedStringArray] with contents of [param right] added at the "
 "end of this array. For better performance, consider using [method "
@@ -83464,6 +101697,42 @@ msgstr ""
 msgid "A packed array of [Vector2]s."
 msgstr "Un array compatto di [Vector2]."
 
+msgid ""
+"An array specifically designed to hold [Vector2]. Packs data tightly, so it "
+"saves memory for large array sizes.\n"
+"[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] "
+"Packed arrays are generally faster to iterate on and modify compared to a "
+"typed array of the same type (e.g. [PackedVector2Array] versus "
+"[code]Array[Vector2][/code]). Also, packed arrays consume less memory. As a "
+"downside, packed arrays are less flexible as they don't offer as many "
+"convenience methods such as [method Array.map]. Typed arrays are in turn "
+"faster to iterate on and modify than untyped arrays.\n"
+"[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of "
+"an array that can be modified independently of the original array, use "
+"[method duplicate]. This is [i]not[/i] the case for built-in properties and "
+"methods. The returned packed array of these are a copies, and changing it "
+"will [i]not[/i] affect the original value. To update a built-in property you "
+"need to modify the returned array, and then assign it to the property again."
+msgstr ""
+"Un array progettato specificamente per contenere [Vector2]. Impacchetta i "
+"dati in modo compatto, in modo da risparmiare memoria per array di grandi "
+"dimensioni.\n"
+"[b]Differenze tra gli array impacchettati, gli array tipizzati e gli array "
+"non tipizzati:[/b] Gli array impacchettati sono generalmente più veloci da "
+"iterare e modificare rispetto a un array tipizzato dello stesso tipo (ad "
+"esempio [PackedVector2Array] in confronto a [code]Array[Vector2][/code]). "
+"Inoltre, gli array impacchettati consumano meno memoria. Come svantaggio, i "
+"array impacchettati sono meno flessibili in quanto non offrono molti metodi "
+"di convenienza come [method Array.map]. Gli array tipizzati sono anche loro "
+"più veloci da iterare e modificare in confronto ad array non tipizzati.\n"
+"[b]Nota:[/b] Gli array impacchettati sono sempre passati per riferimento. Per "
+"ottenere una copia di un array che può essere modificata indipendentemente "
+"dall'array originale, usa [method duplicate]. Questo [i]non[/i] è il caso per "
+"le proprietà e per i metodi integrati. L'array impacchettato restituito da "
+"essi è una copia e modificarlo [i]non[/i] influenzerà il valore originale. "
+"Per aggiornare una proprietà integrata è necessario modificare l'array "
+"restituito e successivamente riassegnarlo alla proprietà."
+
 msgid "Grid-based Navigation with AStarGrid2D Demo"
 msgstr "Demo di navigazione basata su griglia con AStarGrid2D"
 
@@ -83805,6 +102074,42 @@ msgstr ""
 msgid "A packed array of [Vector4]s."
 msgstr "Un array compatto di [Vector4]."
 
+msgid ""
+"An array specifically designed to hold [Vector4]. Packs data tightly, so it "
+"saves memory for large array sizes.\n"
+"[b]Differences between packed arrays, typed arrays, and untyped arrays:[/b] "
+"Packed arrays are generally faster to iterate on and modify compared to a "
+"typed array of the same type (e.g. [PackedVector4Array] versus "
+"[code]Array[Vector4][/code]). Also, packed arrays consume less memory. As a "
+"downside, packed arrays are less flexible as they don't offer as many "
+"convenience methods such as [method Array.map]. Typed arrays are in turn "
+"faster to iterate on and modify than untyped arrays.\n"
+"[b]Note:[/b] Packed arrays are always passed by reference. To get a copy of "
+"an array that can be modified independently of the original array, use "
+"[method duplicate]. This is [i]not[/i] the case for built-in properties and "
+"methods. The returned packed array of these are a copies, and changing it "
+"will [i]not[/i] affect the original value. To update a built-in property you "
+"need to modify the returned array, and then assign it to the property again."
+msgstr ""
+"Un array progettato specificamente per contenere [Vector4]. Impacchetta i "
+"dati in modo compatto, in modo da risparmiare memoria per array di grandi "
+"dimensioni.\n"
+"[b]Differenze tra gli array impacchettati, gli array tipizzati e gli array "
+"non tipizzati:[/b] Gli array impacchettati sono generalmente più veloci da "
+"iterare e modificare rispetto a un array tipizzato dello stesso tipo (ad "
+"esempio [PackedVector4Array] in confronto a [code]Array[Vector4][/code]). "
+"Inoltre, gli array impacchettati consumano meno memoria. Come svantaggio, i "
+"array impacchettati sono meno flessibili in quanto non offrono molti metodi "
+"di convenienza come [method Array.map]. Gli array tipizzati sono anche loro "
+"più veloci da iterare e modificare in confronto ad array non tipizzati.\n"
+"[b]Nota:[/b] Gli array impacchettati sono sempre passati per riferimento. Per "
+"ottenere una copia di un array che può essere modificata indipendentemente "
+"dall'array originale, usa [method duplicate]. Questo [i]non[/i] è il caso per "
+"le proprietà e per i metodi integrati. L'array impacchettato restituito da "
+"essi è una copia e modificarlo [i]non[/i] influenzerà il valore originale. "
+"Per aggiornare una proprietà integrata è necessario modificare l'array "
+"restituito e successivamente riassegnarlo alla proprietà."
+
 msgid "Constructs an empty [PackedVector4Array]."
 msgstr "Costruisce un [PackedVector4Array] vuoto."
 
@@ -84675,6 +102980,25 @@ msgstr ""
 "Se [code]true[/code], abilita il flag di particella specificato. Vedi [enum "
 "ParticleFlags] per le opzioni."
 
+msgid ""
+"The alpha value of each particle's color will be multiplied by this "
+"[CurveTexture] over its lifetime.\n"
+"[b]Note:[/b] [member alpha_curve] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"alpha_curve] will have no visible effect."
+msgstr ""
+"Il valore alfa del colore di ogni particella sarà moltiplicato per questa "
+"[CurveTexture] nel corso della sua durata.\n"
+"[b]Nota:[/b] [member alpha_curve] moltiplica i colori dei vertici della mesh "
+"di particelle. Per avere un effetto visibile su un [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]deve[/i] essere [code]true[/"
+"code]. Per uno [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] deve "
+"essere inserito nella funzione [code]fragment()[/code] dello shader. "
+"Altrimenti, [member color] non avrà alcun effetto visibile."
+
 msgid "Each particle's rotation will be animated along this [CurveTexture]."
 msgstr ""
 "La rotazione di ogni particella sarà animata lungo questa [CurveTexture]."
@@ -84908,6 +103232,25 @@ msgstr ""
 "shader. Altrimenti, [member emission_color_texture] non avrà alcun effetto "
 "visibile."
 
+msgid ""
+"Each particle's color will be multiplied by this [CurveTexture] over its "
+"lifetime.\n"
+"[b]Note:[/b] [member emission_curve] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"emission_curve] will have no visible effect."
+msgstr ""
+"Il colore di ogni particella sarà moltiplicato per questa [CurveTexture] nel "
+"corso della sua durata.\n"
+"[b]Nota:[/b] [member emission_curve] moltiplica i colori dei vertici della "
+"mesh di particelle. Per avere un effetto visibile su un [BaseMaterial3D], "
+"[member BaseMaterial3D.vertex_color_use_as_albedo] [i]deve[/i] essere "
+"[code]true[/code]. Per uno [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/"
+"code] deve essere inserito nella funzione [code]fragment()[/code] dello "
+"shader. Altrimenti, [member color] non avrà alcun effetto visibile."
+
 msgid ""
 "Particle velocity and rotation will be set by sampling this texture at the "
 "same point as the [member emission_point_texture]. Used only in [constant "
@@ -85124,12 +103467,12 @@ msgstr ""
 "COLLISION_HIDE_ON_CONTACT] sul materiale delle particelle principali, può "
 "essere utilizzato per ottenere effetti come gocce di pioggia che colpiscono "
 "il terreno.\n"
-"[b]Nota:[/b] Questo valore non deve superare [member GPUParticles2D.amount] o "
-"[member GPUParticles3D.amount] definiti sul [i]nodo sottoemettitore[/i] (non "
-"il nodo principale), in relazione alla durata delle particelle del "
-"sottoemettitore. Se il numero di particelle è superato, nessuna nuova "
-"particella sarà generata dal sottoemettitore finché non avranno finito "
-"abbastanza particelle."
+"[b]Nota:[/b] Questo valore non dovrebbe superare [member GPUParticles2D."
+"amount] o [member GPUParticles3D.amount] definiti sul [i]nodo "
+"sottoemettitore[/i] (non il nodo principale), in relazione alla durata delle "
+"particelle del sottoemettitore. Se il numero di particelle viene superato, "
+"nessuna nuova particella verrà generata dal sottoemettitore finché non "
+"avranno terminato abbastanza particelle."
 
 msgid ""
 "The amount of particles to spawn from the subemitter node when the particle "
@@ -85142,12 +103485,30 @@ msgid ""
 msgstr ""
 "Quantità di particelle da generare dal nodo sottoemettitore quando la "
 "particella finisce.\n"
-"[b]Nota:[/b] Questo valore non deve superare [member GPUParticles2D.amount] o "
-"[member GPUParticles3D.amount] definiti sul [i]nodo sottoemettitore[/i] (non "
-"il nodo principale), in relazione alla durata delle particelle del "
-"sottoemettitore. Se il numero di particelle è superato, nessuna nuova "
-"particella sarà generata dal sottoemettitore finché non avranno finito "
-"abbastanza particelle."
+"[b]Nota:[/b] Questo valore non dovrebbe superare [member GPUParticles2D."
+"amount] o [member GPUParticles3D.amount] definiti sul [i]nodo "
+"sottoemettitore[/i] (non il nodo principale), in relazione alla durata delle "
+"particelle del sottoemettitore. Se il numero di particelle viene superato, "
+"nessuna nuova particella verrà generata dal sottoemettitore finché non "
+"avranno terminato abbastanza particelle."
+
+msgid ""
+"The amount of particles to spawn from the subemitter node when the particle "
+"spawns.\n"
+"[b]Note:[/b] This value shouldn't exceed [member GPUParticles2D.amount] or "
+"[member GPUParticles3D.amount] defined on the [i]subemitter node[/i] (not the "
+"main node), relative to the subemitter's particle lifetime. If the number of "
+"particles is exceeded, no new particles will spawn from the subemitter until "
+"enough particles have expired."
+msgstr ""
+"La quantità di particelle da generare dal nodo sottoemettitore quando la "
+"particella viene generata.\n"
+"[b]Nota:[/b] Questo valore non dovrebbe superare [member GPUParticles2D."
+"amount] o [member GPUParticles3D.amount] definiti sul [i]nodo "
+"sottoemettitore[/i] (non il nodo principale), in relazione alla durata delle "
+"particelle del sottoemettitore. Se il numero di particelle viene superato, "
+"nessuna nuova particella verrà generata dal sottoemettitore finché non "
+"avranno terminato abbastanza particelle."
 
 msgid ""
 "The frequency at which particles should be emitted from the subemitter node. "
@@ -85161,12 +103522,12 @@ msgstr ""
 "La frequenza con cui le particelle devono essere emesse dal nodo "
 "sottoemettitore. Una particella verrà generata ogni [member "
 "sub_emitter_frequency] secondi.\n"
-"[b]Nota:[/b] Questo valore non deve superare [member GPUParticles2D.amount] o "
-"[member GPUParticles3D.amount] definiti sul [i]nodo sottoemettitore[/i] (non "
-"il nodo principale), in relazione alla durata delle particelle del "
-"sottoemettitore. Se il numero di particelle è superato, nessuna nuova "
-"particella sarà generata dal sottoemettitore finché non avranno finito "
-"abbastanza particelle."
+"[b]Nota:[/b] Questo valore non dovrebbe superare [member GPUParticles2D."
+"amount] o [member GPUParticles3D.amount] definiti sul [i]nodo "
+"sottoemettitore[/i] (non il nodo principale), in relazione alla durata delle "
+"particelle del sottoemettitore. Se il numero di particelle viene superato, "
+"nessuna nuova particella verrà generata dal sottoemettitore finché non "
+"avranno terminato abbastanza particelle."
 
 msgid ""
 "If [code]true[/code], the subemitter inherits the parent particle's velocity "
@@ -85602,6 +103963,26 @@ msgstr ""
 "La distanza lungo il percorso, in pixel. La modifica di questo valore imposta "
 "la posizione di questo nodo su un punto all'interno del percorso."
 
+msgid ""
+"The distance along the path as a number in the range 0.0 (for the first "
+"vertex) to 1.0 (for the last). This is just another way of expressing the "
+"progress within the path, as the offset supplied is multiplied internally by "
+"the path's length.\n"
+"It can be set or get only if the [PathFollow2D] is the child of a [Path2D] "
+"which is part of the scene tree, and that this [Path2D] has a [Curve2D] with "
+"a non-zero length. Otherwise, trying to set this field will print an error, "
+"and getting this field will return [code]0.0[/code]."
+msgstr ""
+"La distanza lungo il percorso come numero compreso tra 0,0 (per il primo "
+"vertice) e 1,0 (per l'ultimo). Questo è solo un altro modo di esprimere il "
+"progresso all'interno del percorso, poiché l'offset fornito è moltiplicato "
+"internamente per la lunghezza del percorso.\n"
+"Può essere impostato o ottenuto solo se il [PathFollow2D] è il figlio di un "
+"[Path2D] che fa parte dell'albero di scene e che questo [Path2D] ha una "
+"[Curve2D] con una lunghezza diversa da zero. Altrimenti, tentando di "
+"impostare questo campo sarà stampato un errore e ottenendo questo campo sarà "
+"restituito [code]0.0[/code]."
+
 msgid ""
 "If [code]true[/code], this node rotates to follow the path, with the +X "
 "direction facing forward on the path."
@@ -85670,6 +104051,26 @@ msgstr ""
 "modifica di questo valore imposta la posizione di questo nodo su un punto "
 "all'interno del percorso."
 
+msgid ""
+"The distance from the first vertex, considering 0.0 as the first vertex and "
+"1.0 as the last. This is just another way of expressing the progress within "
+"the path, as the progress supplied is multiplied internally by the path's "
+"length.\n"
+"It can be set or get only if the [PathFollow3D] is the child of a [Path3D] "
+"which is part of the scene tree, and that this [Path3D] has a [Curve3D] with "
+"a non-zero length. Otherwise, trying to set this field will print an error, "
+"and getting this field will return [code]0.0[/code]."
+msgstr ""
+"La distanza dal primo vertice, considerando 0,0 come il primo vertice e 1,0 "
+"come l'ultimo. Questo è solo un altro modo di esprimere il progresso "
+"all'interno del percorso, poiché il progresso fornito è moltiplicato "
+"internamente per la lunghezza del percorso.\n"
+"Può essere impostato o ottenuto solo se il [PathFollow3D] è il figlio di un "
+"[Path3D] che fa parte dell'albero di scene e che questo [Path3D] ha una "
+"[Curve3D] con una lunghezza diversa da zero. Altrimenti, tentando di "
+"impostare questo campo sarà stampato un errore e ottenendo questo campo sarà "
+"restituito [code]0.0[/code]."
+
 msgid ""
 "Allows or forbids rotation on one or more axes, depending on the [enum "
 "RotationMode] constants being used."
@@ -85717,6 +104118,60 @@ msgid "Creates packages that can be loaded into a running project."
 msgstr ""
 "Crea pacchetti che possono essere caricati in un progetto in esecuzione."
 
+msgid ""
+"The [PCKPacker] is used to create packages that can be loaded into a running "
+"project using [method ProjectSettings.load_resource_pack].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var packer = PCKPacker.new()\n"
+"packer.pck_start(\"test.pck\")\n"
+"packer.add_file(\"res://text.txt\", \"text.txt\")\n"
+"packer.flush()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var packer = new PckPacker();\n"
+"packer.PckStart(\"test.pck\");\n"
+"packer.AddFile(\"res://text.txt\", \"text.txt\");\n"
+"packer.Flush();\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The above [PCKPacker] creates package [code]test.pck[/code], then adds a file "
+"named [code]text.txt[/code] at the root of the package.\n"
+"[b]Note:[/b] PCK is Godot's own pack file format. To create ZIP archives that "
+"can be read by any program, use [ZIPPacker] instead."
+msgstr ""
+"[PCKPacker] è utilizzato per creare pacchetti che è possibile caricare in un "
+"progetto in esecuzione attraverso [method ProjectSettings."
+"load_resource_pack].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var packer = PCKPacker.new()\n"
+"packer.pck_start(\"test.pck\")\n"
+"packer.add_file(\"res://text.txt\", \"text.txt\")\n"
+"packer.flush()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var packer = new PckPacker();\n"
+"packer.PckStart(\"test.pck\");\n"
+"packer.AddFile(\"res://text.txt\", \"text.txt\");\n"
+"packer.Flush();\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Il [PCKPacker] soprastante crea il pacchetto [code]test.pck[/code], quindi "
+"aggiunge un file denominato [code]text.txt[/code] alla radice del pacchetto.\n"
+"[b]Nota:[/b] PCK è il formato di file impacchettato di Godot. Per creare "
+"archivi ZIP che è possibile leggere da qualsiasi programma, usa invece "
+"[ZIPPacker]."
+
+msgid ""
+"Adds the [param source_path] file to the current PCK package at the [param "
+"target_path] internal path. The [code]res://[/code] prefix for [param "
+"target_path] is optional and stripped internally."
+msgstr ""
+"Aggiunge il file nel percorso [param source_path] al pacchetto PCK attuale "
+"nel percorso interno [param target_path]. Il prefisso [code]res://[/code] per "
+"[param target_path] è facoltativo e rimosso internamente."
+
 msgid ""
 "Writes the files specified using all [method add_file] calls since the last "
 "flush. If [param verbose] is [code]true[/code], a list of files added will be "
@@ -85726,6 +104181,15 @@ msgstr ""
 "dall'ultimo svuotamento. Se [param verbose] è [code]true[/code], una lista "
 "dei file aggiunti sarà stampato sulla console per facilitare il debug."
 
+msgid ""
+"Creates a new PCK file at the file path [param pck_path]. The [code].pck[/"
+"code] file extension isn't added automatically, so it should be part of "
+"[param pck_path] (even though it's not required)."
+msgstr ""
+"Crea un nuovo file PCK con al percorso [param pck_path]. L'estensione del "
+"file [code].pck[/code] non viene aggiunta automaticamente, quindi dovrebbe "
+"far parte di [param pck_path] (anche se non è obbligatoria)."
+
 msgid "Exposes performance-related data."
 msgstr "Espone i dati relativi alle prestazioni."
 
@@ -86188,6 +104652,9 @@ msgstr ""
 "possibile unire nel [NavigationServer3D]. Gli spigoli possono comunque essere "
 "collegati tramite prossimità degli spigoli o con collegamenti."
 
+msgid "Number of active navigation obstacles in the [NavigationServer3D]."
+msgstr "Numero di ostacoli di navigazione attivi nel [NavigationServer3D]."
+
 msgid "Represents the size of the [enum Monitor] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum Monitor]."
 
@@ -86315,6 +104782,73 @@ msgstr ""
 "l'integrazione delle forze predefinita e di eseguire un'integrazione delle "
 "forze completamente personalizzata per un corpo."
 
+msgid ""
+"Applies a directional impulse without affecting rotation.\n"
+"An impulse is time-independent! Applying an impulse every frame would result "
+"in a framerate-dependent force. For this reason, it should only be used when "
+"simulating one-time impacts (use the \"_integrate_forces\" functions "
+"otherwise).\n"
+"This is equivalent to using [method apply_impulse] at the body's center of "
+"mass."
+msgstr ""
+"Applica un impulso direzionale senza influenzare la rotazione.\n"
+"Un impulso è indipendente dal tempo! Applicare un impulso a ogni frame "
+"risulterebbe in una forza dipendente dal frame rate. Per questo motivo, "
+"dovrebbe essere utilizzato solo quando si simulano impatti singoli "
+"(altrimenti, utilizza le funzioni \"_integrate_forces\").\n"
+"Ciò equivale a usare [method apply_impulse] al centro di massa del corpo."
+
+msgid ""
+"Applies a positioned impulse to the PhysicsBone3D.\n"
+"An impulse is time-independent! Applying an impulse every frame would result "
+"in a framerate-dependent force. For this reason, it should only be used when "
+"simulating one-time impacts (use the \"_integrate_forces\" functions "
+"otherwise).\n"
+"[param position] is the offset from the PhysicsBone3D origin in global "
+"coordinates."
+msgstr ""
+"Applica un impulso posizionato al corpo.\n"
+"Un impulso è indipendente dal tempo! Applicare un impulso a ogni frame "
+"risulterebbe in una forza dipendente dal frame rate. Per questo motivo, "
+"dovrebbe essere utilizzato solo quando si simulano impatti singoli "
+"(altrimenti, utilizza le funzioni \"_integrate_forces\").\n"
+"[param position] è lo scostamento dall'origine del PhysicsBone3D in "
+"coordinate globali."
+
+msgid "Returns the unique identifier of the PhysicsBone3D."
+msgstr "Restituisce l'identificatore unico del PhysicsBone3D."
+
+msgid ""
+"Returns [code]true[/code] if the PhysicsBone3D is allowed to simulate physics."
+msgstr ""
+"Restituisce [code]true[/code] se al PhysicsBone3D è consentito simulare la "
+"fisica."
+
+msgid ""
+"Returns [code]true[/code] if the PhysicsBone3D is currently simulating "
+"physics."
+msgstr ""
+"Restituisce [code]true[/code] se il PhysicsBone3D sta attualmente simulando "
+"la fisica."
+
+msgid ""
+"Damps the body's rotation. By default, the body will use the [member "
+"ProjectSettings.physics/3d/default_angular_damp] project setting or any value "
+"override set by an [Area3D] the body is in. Depending on [member "
+"angular_damp_mode], you can set [member angular_damp] to be added to or to "
+"replace the body's damping value.\n"
+"See [member ProjectSettings.physics/3d/default_angular_damp] for more details "
+"about damping."
+msgstr ""
+"Smorza la rotazione del corpo. Come predefinito, il corpo utilizzerà "
+"impostazione del progetto [member ProjectSettings.physics/3d/"
+"default_angular_damp], o un valore sostitutivo impostato da un'[Area3D] in "
+"cui si trova il corpo. A seconda di [member angular_damp_mode], è possibile "
+"impostare [member angular_damp] in modo che sia aggiunto o sostituito al "
+"valore di smorzamento del corpo.\n"
+"Vedi [member ProjectSettings.physics/3d/default_angular_damp] per ulteriori "
+"dettagli sullo smorzamento."
+
 msgid ""
 "Defines how [member angular_damp] is applied. See [enum DampMode] for "
 "possible values."
@@ -86380,6 +104914,18 @@ msgstr ""
 "L'attrito del corpo, da [code]0[/code] (senza attrito) a [code]1[/code] "
 "(massimo attrito)."
 
+msgid ""
+"This is multiplied by [member ProjectSettings.physics/3d/default_gravity] to "
+"produce this body's gravity. For example, a value of [code]1.0[/code] will "
+"apply normal gravity, [code]2.0[/code] will apply double the gravity, and "
+"[code]0.5[/code] will apply half the gravity to this body."
+msgstr ""
+"Questo è moltiplicato per [member ProjectSettings.physics/3d/default_gravity] "
+"per produrre la gravità di questo corpo. Ad esempio, un valore di [code]1.0[/"
+"code] applicherà la gravità normale, [code]2.0[/code] applicherà il doppio "
+"della gravità e [code]0.5[/code] applicherà metà della gravità per questo "
+"corpo."
+
 msgid "Sets the joint's transform."
 msgstr "Imposta la trasformazione dell'articolazione."
 
@@ -86391,6 +104937,22 @@ msgstr ""
 "Imposta il tipo di articolazione. Vedi [enum JointType] per i valori "
 "possibili."
 
+msgid ""
+"Damps the body's movement. By default, the body will use [member "
+"ProjectSettings.physics/3d/default_linear_damp] or any value override set by "
+"an [Area3D] the body is in. Depending on [member linear_damp_mode], [member "
+"linear_damp] may be added to or replace the body's damping value.\n"
+"See [member ProjectSettings.physics/3d/default_linear_damp] for more details "
+"about damping."
+msgstr ""
+"Smorza il movimento del corpo. Come predefinito, il corpo utilizzerà [member "
+"ProjectSettings.physics/3d/default_linear_damp], o un valore sostitutivo "
+"impostato da un'[Area3D] in cui si trova il corpo. A seconda di [member "
+"linear_damp_mode], è possibile impostare [member linear_damp] in modo che sia "
+"aggiunto o sostituito al valore di smorzamento del corpo.\n"
+"Vedi [member ProjectSettings.physics/3d/default_linear_damp] per ulteriori "
+"dettagli sullo smorzamento."
+
 msgid ""
 "Defines how [member linear_damp] is applied. See [enum DampMode] for possible "
 "values."
@@ -86427,6 +104989,15 @@ msgstr ""
 "In questa modalità, il valore di smorzamento del corpo sostituisce qualsiasi "
 "valore impostato nelle aree o il valore predefinito."
 
+msgid "No joint is applied to the PhysicsBone3D."
+msgstr "Nessuna articolazione è applicata al PhysicsBone3D."
+
+msgid "A cone joint is applied to the PhysicsBone3D."
+msgstr "Un'articolazione conica è applicata al PhysicsBone3D."
+
+msgid "A slider joint is applied to the PhysicsBone3D."
+msgstr "Un'articolazione scorrevole è applicata al PhysicsBone3D."
+
 msgid ""
 "Node that can be the parent of [PhysicalBone3D] and can apply the simulation "
 "results to [Skeleton3D]."
@@ -87606,6 +106177,39 @@ msgstr ""
 "[PhysicsShapeQueryParameters2D], il secondo è nella forma in collisione dallo "
 "spazio fisico."
 
+msgid ""
+"Checks the intersections of a shape, given through a "
+"[PhysicsShapeQueryParameters2D] object, against the space. If it collides "
+"with more than one shape, the nearest one is selected. If the shape did not "
+"intersect anything, then an empty dictionary is returned instead.\n"
+"[b]Note:[/b] This method does not take into account the [code]motion[/code] "
+"property of the object. The returned object is a dictionary containing the "
+"following fields:\n"
+"[code]collider_id[/code]: The colliding object's ID.\n"
+"[code]linear_velocity[/code]: The colliding object's velocity [Vector2]. If "
+"the object is an [Area2D], the result is [code](0, 0)[/code].\n"
+"[code]normal[/code]: The collision normal of the query shape at the "
+"intersection point, pointing away from the intersecting object.\n"
+"[code]point[/code]: The intersection point.\n"
+"[code]rid[/code]: The intersecting object's [RID].\n"
+"[code]shape[/code]: The shape index of the colliding shape."
+msgstr ""
+"Verifica le intersezioni di una forma, fornite tramite un oggetto "
+"[PhysicsShapeQueryParameters2D], rispetto allo spazio. Se entra in collisione "
+"con più di una forma, quella più vicina è selezionata. Se la forma non ha "
+"intersecato nulla, viene restituito un dizionario vuoto.\n"
+"[b]Nota:[/b] Questo metodo non tiene conto della proprietà [code]motion[/"
+"code] dell'oggetto. L'oggetto restituito è un dizionario contenente i "
+"seguenti campi:\n"
+"[code]collider_id[/code]: L'ID dell'oggetto in collisione.\n"
+"[code]linear_velocity[/code]: La velocità dell'oggetto in collisione come "
+"[Vector2]. Se l'oggetto è un [Area2D], il risultato è [code](0, 0)[/code].\n"
+"[code]normal[/code]: La normale alla superficie dell'oggetto nel punto di "
+"intersezione.\n"
+"[code]point[/code]: Il punto di intersezione.\n"
+"[code]rid[/code]: Il [RID] dell'oggetto in intersezione.\n"
+"[code]shape[/code]: L'indice della forma in collisione."
+
 msgid ""
 "Checks whether a point is inside any solid shape. Position and other "
 "parameters are defined through [PhysicsPointQueryParameters2D]. The shapes "
@@ -87768,6 +106372,41 @@ msgstr ""
 "[b]Nota:[/b] Questo metodo non tiene conto della proprietà [code]motion[/"
 "code] dell'oggetto."
 
+msgid ""
+"Checks the intersections of a shape, given through a "
+"[PhysicsShapeQueryParameters3D] object, against the space. If it collides "
+"with more than one shape, the nearest one is selected. The returned object is "
+"a dictionary containing the following fields:\n"
+"[code]collider_id[/code]: The colliding object's ID.\n"
+"[code]linear_velocity[/code]: The colliding object's velocity [Vector3]. If "
+"the object is an [Area3D], the result is [code](0, 0, 0)[/code].\n"
+"[code]normal[/code]: The collision normal of the query shape at the "
+"intersection point, pointing away from the intersecting object.\n"
+"[code]point[/code]: The intersection point.\n"
+"[code]rid[/code]: The intersecting object's [RID].\n"
+"[code]shape[/code]: The shape index of the colliding shape.\n"
+"If the shape did not intersect anything, then an empty dictionary is returned "
+"instead.\n"
+"[b]Note:[/b] This method does not take into account the [code]motion[/code] "
+"property of the object."
+msgstr ""
+"Verifica le intersezioni di una forma, fornite tramite un oggetto "
+"[PhysicsShapeQueryParameters3D], rispetto allo spazio. Se entra in collisione "
+"con più di una forma, quella più vicina è selezionata. L'oggetto restituito è "
+"un dizionario contenente i seguenti campi:\n"
+"[code]collider_id[/code]: l'ID dell'oggetto in collisione.\n"
+"[code]linear_velocity[/code]: La velocità dell'oggetto in collisione come "
+"[Vector3]. Se l'oggetto è un [Area3D], il risultato è [code](0, 0, 0)[/"
+"code].\n"
+"[code]normal[/code]: la normale alla superficie dell'oggetto nel punto di "
+"intersezione.\n"
+"[code]point[/code]: il punto di intersezione.\n"
+"[code]rid[/code]: il [RID] dell'oggetto in intersezione.\n"
+"[code]shape[/code]: l'indice della forma in collisione.\n"
+"Se la forma non ha intersecato nulla, viene restituito un dizionario vuoto.\n"
+"[b]Nota:[/b] Questo metodo non tiene conto della proprietà [code]motion[/"
+"code] dell'oggetto."
+
 msgid ""
 "Checks whether a point is inside any solid shape. Position and other "
 "parameters are defined through [PhysicsPointQueryParameters3D]. The shapes "
@@ -89089,6 +107728,20 @@ msgstr ""
 "[RID] che la identifica. Usa [method shape_set_data] per impostare i punti "
 "del poligono convesso."
 
+msgid ""
+"Returns the value of the given damped spring joint parameter. See [enum "
+"DampedSpringParam] for the list of available parameters."
+msgstr ""
+"Restituisce il valore del parametro dello giunto smorzato a molla indicato . "
+"Vedi [enum DampedSpringParam] per la lista dei parametri disponibili."
+
+msgid ""
+"Sets the value of the given damped spring joint parameter. See [enum "
+"DampedSpringParam] for the list of available parameters."
+msgstr ""
+"Imposta il valore del parametro del giunto smorzato a molla indicato. Vedi "
+"[enum DampedSpringParam] per l'elenco dei parametri disponibili."
+
 msgid ""
 "Destroys any of the objects created by PhysicsServer2D. If the [RID] passed "
 "is not one of the objects that can be created by PhysicsServer2D, an error "
@@ -89160,6 +107813,9 @@ msgstr ""
 "impostare i parametri specifici della molla smorzata, vedi [method "
 "damped_spring_joint_set_param]."
 
+msgid "Makes the joint a groove joint."
+msgstr "Rende il giunto un giunto scanalato."
+
 msgid ""
 "Makes the joint a pin joint. If [param body_b] is an empty [RID], then [param "
 "body_a] is pinned to the point [param anchor] (given in global coordinates); "
@@ -89173,6 +107829,13 @@ msgstr ""
 "[param anchor] (specificato in coordinate globali). Per impostare i parametri "
 "specifici del giunto a perno, vedi [method pin_joint_set_param]."
 
+msgid ""
+"Sets the value of the given joint parameter. See [enum JointParam] for the "
+"list of available parameters."
+msgstr ""
+"Imposta il valore del parametro del giunto indicato. Vedi [enum JointParam] "
+"per l'elenco dei parametri disponibili."
+
 msgid "Gets a pin joint flag (see [enum PinJointFlag] constants)."
 msgstr ""
 "Ottiene un flag di giunto a perno (vedi le costanti di [enum PinJointFlag])."
@@ -89184,6 +107847,11 @@ msgstr ""
 "Restituisce il valore di un parametro del perno. Vedi [enum PinJointParam] "
 "per un elenco di parametri disponibili."
 
+msgid "Sets a pin joint flag (see [enum PinJointFlag] constants)."
+msgstr ""
+"Imposta un flag di un giunto a perno (vedi le costanti di [enum "
+"PinJointFlag])."
+
 msgid ""
 "Sets a pin joint parameter. See [enum PinJointParam] for a list of available "
 "parameters."
@@ -89332,6 +108000,13 @@ msgstr ""
 "Attiva o disattiva lo spazio. Se [param active] è [code]false[/code], il "
 "server di fisica non farà nulla con questo spazio nel suo passaggio di fisica."
 
+msgid ""
+"Sets the value of the given space parameter. See [enum SpaceParameter] for "
+"the list of available parameters."
+msgstr ""
+"Imposta il valore del parametro dello spazio indicato. Vedi [enum "
+"SpaceParameter] per l'elenco dei parametri disponibili."
+
 msgid ""
 "Creates a 2D world boundary shape in the physics server, and returns the "
 "[RID] that identifies it. Use [method shape_set_data] to set the shape's "
@@ -89834,6 +108509,9 @@ msgstr ""
 msgid "Constant to set/get whether the body can sleep."
 msgstr "Costante per impostare/ottenere se il corpo può riposare."
 
+msgid "Constant to create pin joints."
+msgstr "Costante per creare giunti a perno."
+
 msgid "Constant to create groove joints."
 msgstr "Costante per creare giunti scanalati."
 
@@ -89953,6 +108631,20 @@ msgstr ""
 "Abilita il rilevamento continuo delle collisioni tramite la proiezione di "
 "forme. È il metodo di rilevamento continuo più lento, e il più preciso."
 
+msgid ""
+"The value of the first parameter and area callback function receives, when an "
+"object enters one of its shapes."
+msgstr ""
+"Il valore del primo parametro e la funzione di callback dell'area ricevuti, "
+"quando un oggetto entra in una delle sue forme."
+
+msgid ""
+"The value of the first parameter and area callback function receives, when an "
+"object exits one of its shapes."
+msgstr ""
+"Il valore del primo parametro e la funzione di callback dell'area ricevuti, "
+"quando un oggetto esce da una delle sue forme."
+
 msgid "Constant to get the number of objects that are not sleeping."
 msgstr "Costante per ottenere il numero di oggetti che non sono in riposo."
 
@@ -91904,13 +110596,13 @@ msgid ""
 "The amount of restitution when movement is across axes orthogonal to the "
 "slider."
 msgstr ""
-"La quantità di restituzione quando il movimento avviene lungo le assi "
+"La quantità di restituzione quando il movimento avviene lungo gli assi "
 "ortogonali allo slider."
 
 msgid ""
 "The amount of damping when movement is across axes orthogonal to the slider."
 msgstr ""
-"La quantità di smorzamento quando il movimento avviene lungo le assi "
+"La quantità di smorzamento quando il movimento avviene lungo gli assi "
 "ortogonali allo slider."
 
 msgid "The upper limit of rotation in the slider."
@@ -93932,6 +112624,67 @@ msgstr ""
 "id_pressed] e [signal id_focused]. Non è correlato agli argomenti "
 "[code]index[/code] ad esempio in [method set_item_checked]."
 
+msgid ""
+"Adds a new multistate item with text [param label].\n"
+"Contrarily to normal binary items, multistate items can have more than two "
+"states, as defined by [param max_states]. The default value is defined by "
+"[param default_state].\n"
+"An [param id] can optionally be provided, as well as an accelerator ([param "
+"accel]). If no [param id] is provided, one will be created from the index. If "
+"no [param accel] is provided, then the default value of 0 (corresponding to "
+"[constant @GlobalScope.KEY_NONE]) will be assigned to the item (which means "
+"it won't have any accelerator). See [method get_item_accelerator] for more "
+"info on accelerators.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    add_multistate_item(\"Item\", 3, 0)\n"
+"\n"
+"    index_pressed.connect(func(index: int):\n"
+"            toggle_item_multistate(index)\n"
+"            match get_item_multistate(index):\n"
+"                0:\n"
+"                    print(\"First state\")\n"
+"                1:\n"
+"                    print(\"Second state\")\n"
+"                2:\n"
+"                    print(\"Third state\")\n"
+"        )\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Multistate items don't update their state automatically and must "
+"be done manually. See [method toggle_item_multistate], [method "
+"set_item_multistate] and [method get_item_multistate] for more info on how to "
+"control it."
+msgstr ""
+"Aggiunge una nuova voce multistato con il testo [param label].\n"
+"Contrariamente alle voci binarie normali, le voci multistato possono avere "
+"più di due stati, come definito da [param max_states]. Il valore predefinito "
+"è definito da [param default_state].\n"
+"È possibile fornire un [param id] facoltativamente, così come un acceleratore "
+"([param accel]). Se nessun [param id] è fornito, ne sarà creato uno "
+"dall'indice. Se nessun [param accel] è fornito, alla voce sarà assegnata il "
+"valore predefinito 0 (corrispondente a [constant @GlobalScope.KEY_NONE]) (il "
+"che significa che non avrà alcun acceleratore). Consulta [method "
+"get_item_accelerator] per ulteriori informazioni sugli acceleratori.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    add_multistate_item(\"Item\", 3, 0)\n"
+"\n"
+"    index_pressed.connect(func(index: int):\n"
+"            toggle_item_multistate(index)\n"
+"            match get_item_multistate(index):\n"
+"                0:\n"
+"                    print(\"Primo stato\")\n"
+"                1:\n"
+"                    print(\"Secondo stato\")\n"
+"                2:\n"
+"                    print(\"Terzo stato\")\n"
+"        )\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Le voci multistato non aggiornano automaticamente il loro stato "
+"e bisogna farlo manualmente. Consulta [method toggle_item_multistate], "
+"[method set_item_multistate] e [method get_item_multistate] per ulteriori "
+"informazioni su come controllarli."
+
 msgid ""
 "Adds a new radio check button with text [param label].\n"
 "An [param id] can optionally be provided, as well as an accelerator ([param "
@@ -94620,6 +113373,9 @@ msgstr ""
 "Lo [StyleBox] per il lato destro del separatore etichettato. Vedi [method "
 "add_separator]."
 
+msgid "[StyleBox] for the background panel."
+msgstr "Lo [StyleBox] per il pannello di sfondo."
+
 msgid "[StyleBox] used for the separators. See [method add_separator]."
 msgstr "Lo [StyleBox] utilizzato per i separatori. Vedi [method add_separator]."
 
@@ -94745,10 +113501,55 @@ msgstr ""
 "ogni elemento è un altro Array di valori necessari per la mesh (vedi le "
 "costanti di [enum Mesh.ArrayType])."
 
+msgid ""
+"Returns the mesh arrays used to make up the surface of this primitive mesh.\n"
+"[b]Example:[/b] Pass the result to [method ArrayMesh.add_surface_from_arrays] "
+"to create a new surface:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var c = CylinderMesh.new()\n"
+"var arr_mesh = ArrayMesh.new()\n"
+"arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, c."
+"get_mesh_arrays())\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var c = new CylinderMesh();\n"
+"var arrMesh = new ArrayMesh();\n"
+"arrMesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, c."
+"GetMeshArrays());\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce gli array di mesh utilizzati per comporre la superficie di questa "
+"mesh primitiva. \n"
+"[b]Esempio:[/b] Passa il risultato a [method ArrayMesh."
+"add_surface_from_arrays] per creare una nuova superficie:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var c = CylinderMesh.new()\n"
+"var arr_mesh = ArrayMesh.new()\n"
+"arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, c."
+"get_mesh_arrays())\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var c = new CylinderMesh();\n"
+"var arrMesh = new ArrayMesh();\n"
+"arrMesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, c."
+"GetMeshArrays());\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Request an update of this primitive mesh based on its properties."
 msgstr ""
 "Richiede un aggiornamento di questa mesh primitiva in base alle sue proprietà."
 
+msgid ""
+"If set, generates UV2 UV coordinates applying a padding using the [member "
+"uv2_padding] setting. UV2 is needed for lightmapping."
+msgstr ""
+"Se impostato, genera coordinate UV2 UV applicando un padding usando "
+"l'impostazione [member uv2_padding]. L'UV2 è necessario per il lightmapping."
+
 msgid ""
 "If set, the order of the vertices in each triangle are reversed resulting in "
 "the backside of the mesh being drawn.\n"
@@ -94763,6 +113564,23 @@ msgstr ""
 msgid "The current [Material] of the primitive mesh."
 msgstr "Il [Material] attuale della mesh primitiva."
 
+msgid ""
+"If [member add_uv2] is set, specifies the padding in pixels applied along "
+"seams of the mesh. Lower padding values allow making better use of the "
+"lightmap texture (resulting in higher texel density), but may introduce "
+"visible lightmap bleeding along edges.\n"
+"If the size of the lightmap texture can't be determined when generating the "
+"mesh, UV2 is calculated assuming a texture size of 1024x1024."
+msgstr ""
+"Se [member add_uv2] è impostato, specifica il padding in pixel applicato "
+"lungo le cuciture della mesh. Valori di padding più bassi consentono di "
+"utilizzare meglio la texture della lightmap (risultando in una maggiore "
+"densità di texel), ma potrebbero introdurre un visibile bleeding della "
+"lightmap lungo i bordi.\n"
+"Se le dimensioni della texture della lightmap non possono essere determinate "
+"durante la generazione della mesh, l'UV2 è calcolato presupponendo che le "
+"dimensioni della texture siano 1024x1024."
+
 msgid "Class representing a prism-shaped [PrimitiveMesh]."
 msgstr "Classe che rappresenta un [PrimitiveMesh] a forma di prisma."
 
@@ -95012,6 +113830,15 @@ msgstr ""
 "meno memoria.\n"
 "Utilizzata internamente come matrice di proiezione di [Camera3D]."
 
+msgid ""
+"Constructs a default-initialized [Projection] identical to [constant "
+"IDENTITY].\n"
+"[b]Note:[/b] In C#, this constructs a [Projection] identical to [constant "
+"ZERO]."
+msgstr ""
+"Costruisce un [Projection] predefinito identico a [constant IDENTITY].\n"
+"[b]Nota:[/b] In C#, costruisce un [Projection] identico a [constant ZERO]."
+
 msgid "Constructs a [Projection] as a copy of the given [Projection]."
 msgstr "Costruisce un [Projection] come copia del [Projection] specificato."
 
@@ -95167,6 +113994,17 @@ msgstr ""
 msgid "Returns the horizontal field of view of the projection (in degrees)."
 msgstr "Restituisce il campo di vista orizzontale della proiezione (in gradi)."
 
+msgid ""
+"Returns the vertical field of view of the projection (in degrees) associated "
+"with the given horizontal field of view (in degrees) and aspect ratio.\n"
+"[b]Note:[/b] Unlike most methods of [Projection], [param aspect] is expected "
+"to be 1 divided by the X:Y aspect ratio."
+msgstr ""
+"Restituisce il campo visivo verticale della proiezione (in gradi) associato "
+"al campo visivo orizzontale (in gradi) e alle proporzioni specificati.\n"
+"[b]Nota:[/b] A differenza della maggior parte dei metodi di [Projection], ci "
+"si aspetta che [param aspect] sia 1 diviso per il rapporto di aspetto X:Y."
+
 msgid ""
 "Returns the factor by which the visible level of detail is scaled by this "
 "[Projection]."
@@ -95395,6 +114233,77 @@ msgstr ""
 "desiderati se vuoi che sovrascrivano le impostazioni del progetto di base su "
 "tutte le piattaforme e configurazioni."
 
+msgid "Project Settings"
+msgstr "Impostazioni del progetto"
+
+msgid ""
+"Adds a custom property info to a property. The dictionary must contain:\n"
+"- [code]\"name\"[/code]: [String] (the property's name)\n"
+"- [code]\"type\"[/code]: [int] (see [enum Variant.Type])\n"
+"- optionally [code]\"hint\"[/code]: [int] (see [enum PropertyHint]) and "
+"[code]\"hint_string\"[/code]: [String]\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"ProjectSettings.set(\"category/property_name\", 0)\n"
+"\n"
+"var property_info = {\n"
+"    \"name\": \"category/property_name\",\n"
+"    \"type\": TYPE_INT,\n"
+"    \"hint\": PROPERTY_HINT_ENUM,\n"
+"    \"hint_string\": \"one,two,three\"\n"
+"}\n"
+"\n"
+"ProjectSettings.add_property_info(property_info)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"ProjectSettings.Singleton.Set(\"category/property_name\", 0);\n"
+"\n"
+"var propertyInfo = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"name\", \"category/propertyName\"},\n"
+"    {\"type\", (int)Variant.Type.Int},\n"
+"    {\"hint\", (int)PropertyHint.Enum},\n"
+"    {\"hint_string\", \"one,two,three\"},\n"
+"};\n"
+"\n"
+"ProjectSettings.AddPropertyInfo(propertyInfo);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Aggiunge informazioni personalizzate di proprietà a una proprietà. Il "
+"dizionario deve contenere:\n"
+"- [code]\"name\"[/code]: [String] (il nome della proprietà)\n"
+"- [code]\"type\"[/code]: [int] (vedi [enum Variant.Type])\n"
+"- facoltativamente [code]\"hint\"[/code]: [int] (vedi [enum PropertyHint]) e "
+"[code]\"hint_string\"[/code]: [String]\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"ProjectSettings.set(\"category/property_name\", 0)\n"
+"\n"
+"var property_info = {\n"
+"    \"name\": \"category/property_name\",\n"
+"    \"type\": TYPE_INT,\n"
+"    \"hint\": PROPERTY_HINT_ENUM,\n"
+"    \"hint_string\": \"one,two,three\"\n"
+"}\n"
+"\n"
+"ProjectSettings.add_property_info(property_info)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"ProjectSettings.Singleton.Set(\"category/property_name\", 0);\n"
+"\n"
+"var propertyInfo = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"name\", \"category/propertyName\"},\n"
+"    {\"type\", (int)Variant.Type.Int},\n"
+"    {\"hint\", (int)PropertyHint.Enum},\n"
+"    {\"hint_string\", \"one,two,three\"},\n"
+"};\n"
+"\n"
+"ProjectSettings.AddPropertyInfo(propertyInfo);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Clears the whole configuration (not recommended, may break things)."
 msgstr ""
 "Cancella l'intera configurazione (non consigliato, potrebbe causare danni)."
@@ -95431,6 +114340,80 @@ msgstr ""
 "Restituisce l'ordine di un valore di configurazione (influenza quando viene "
 "salvato nel file di configurazione)."
 
+msgid ""
+"Returns the value of the setting identified by [param name]. If the setting "
+"doesn't exist and [param default_value] is specified, the value of [param "
+"default_value] is returned. Otherwise, [code]null[/code] is returned.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(ProjectSettings.get_setting(\"application/config/name\"))\n"
+"print(ProjectSettings.get_setting(\"application/config/custom_description\", "
+"\"No description specified.\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(ProjectSettings.GetSetting(\"application/config/name\"));\n"
+"GD.Print(ProjectSettings.GetSetting(\"application/config/"
+"custom_description\", \"No description specified.\"));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] This method doesn't take potential feature overrides into "
+"account automatically. Use [method get_setting_with_override] to handle "
+"seamlessly."
+msgstr ""
+"Restituisce il valore dell'impostazione identificata da [param name]. Se "
+"l'impostazione non esiste e [param default_value] viene specificato, viene "
+"restituito il valore di [param default_value]. Altrimenti, viene restituito "
+"[code]null[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(ProjectSettings.get_setting(\"application/config/name\"))\n"
+"print(ProjectSettings.get_setting(\"application/config/custom_description\", "
+"\"Nessuna descrizione specificata.\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(ProjectSettings.GetSetting(\"application/config/name\"));\n"
+"GD.Print(ProjectSettings.GetSetting(\"application/config/"
+"custom_description\", \"Nessuna descrizione specificata.\"));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Questo metodo non tiene conto automaticamente di eventuali "
+"sovrascritture delle funzionalità. Usa [method get_setting_with_override] per "
+"gestirle senza problemi."
+
+msgid ""
+"Similar to [method get_setting], but applies feature tag overrides if any "
+"exists and is valid.\n"
+"[b]Example:[/b] If the setting override [code]\"application/config/name."
+"windows\"[/code] exists, and the following code is executed on a [i]Windows[/"
+"i] operating system, the overridden setting is printed instead:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(ProjectSettings.get_setting_with_override(\"application/config/"
+"name\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(ProjectSettings.GetSettingWithOverride(\"application/config/"
+"name\"));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Simile a [method get_setting], ma applica le sovrascritture dei tag di "
+"funzionalità se ne esiste uno ed è valido.\n"
+"[b]Esempio:[/b] Se esiste la sovrascrittura dell'impostazione "
+"[code]\"application/config/name.windows\"[/code] e il codice seguente viene "
+"eseguito su un sistema operativo [i]Windows[/i], al suo posto viene stampata "
+"l'impostazione sovrascritta:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(ProjectSettings.get_setting_with_override(\"application/config/"
+"name\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(ProjectSettings.GetSettingWithOverride(\"application/config/"
+"name\"));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns the absolute, native OS path corresponding to the localized [param "
 "path] (starting with [code]res://[/code] or [code]user://[/code]). The "
@@ -95488,6 +114471,33 @@ msgid "Returns [code]true[/code] if a configuration value is present."
 msgstr ""
 "Restituisce [code]true[/code] se un valore è presente nella configurazione."
 
+msgid ""
+"Loads the contents of the .pck or .zip file specified by [param pack] into "
+"the resource filesystem ([code]res://[/code]). Returns [code]true[/code] on "
+"success.\n"
+"[b]Note:[/b] If a file from [param pack] shares the same path as a file "
+"already in the resource filesystem, any attempts to load that file will use "
+"the file from [param pack] unless [param replace_files] is set to "
+"[code]false[/code].\n"
+"[b]Note:[/b] The optional [param offset] parameter can be used to specify the "
+"offset in bytes to the start of the resource pack. This is only supported "
+"for .pck files.\n"
+"[b]Note:[/b] [DirAccess] will not show changes made to the contents of "
+"[code]res://[/code] after calling this function."
+msgstr ""
+"Carica il contenuto del file .pck o .zip specificato da [param pack] nel file "
+"system delle risorse ([code]res://[/code]). Restituisce [code]true[/code] in "
+"caso di successo.\n"
+"[b]Nota:[/b] Se un file da [param pack] condivide lo stesso percorso di un "
+"file già presente nel file system delle risorse, qualsiasi tentativo di "
+"caricare quel file utilizzerà il file da [param pack] a meno che [param "
+"replace_files] non sia impostato su [code]false[/code].\n"
+"[b]Nota:[/b] Il parametro facoltativo [param offset] può essere utilizzato "
+"per specificare l'offset in byte all'inizio del pacchetto di risorse. Questo "
+"è supportato solo per i file .pck.\n"
+"[b]Nota:[/b] [DirAccess] non mostrerà le modifiche apportate al contenuto di "
+"[code]res://[/code] dopo aver chiamato questa funzione."
+
 msgid ""
 "Returns the localized path (starting with [code]res://[/code]) corresponding "
 "to the absolute, native OS [param path]. See also [method globalize_path]."
@@ -95574,6 +114584,32 @@ msgstr ""
 "Abilitare [method set_restart_if_changed] [i]non[/i] ritarda l'impostazione "
 "quando viene modificata."
 
+msgid ""
+"Sets the value of a setting.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"ProjectSettings.set_setting(\"application/config/name\", \"Example\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"ProjectSettings.SetSetting(\"application/config/name\", \"Example\");\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This can also be used to erase custom project settings. To do this change the "
+"setting value to [code]null[/code]."
+msgstr ""
+"Imposta il valore di un'impostazione.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"ProjectSettings.set_setting(\"application/config/name\", \"Esempio\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"ProjectSettings.SetSetting(\"application/config/name\", \"Esempio\");\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Questo può anche essere usato per cancellare le impostazioni personalizzate "
+"del progetto. Per farlo, imposta il valore dell'impostazione su [code]null[/"
+"code]."
+
 msgid ""
 "If [code]true[/code], [AnimationMixer] prints the warning of interpolation "
 "being forced to choose the shortest rotation path due to multiple angle "
@@ -95851,6 +114887,38 @@ msgstr ""
 "prestazioni sono adeguate per il rendering dei frame alla frequenza di "
 "aggiornamento."
 
+msgid ""
+"If [code]true[/code], disables printing to standard error. If [code]true[/"
+"code], this also hides error and warning messages printed by [method "
+"@GlobalScope.push_error] and [method @GlobalScope.push_warning]. See also "
+"[member application/run/disable_stdout].\n"
+"Changes to this setting will only be applied upon restarting the application. "
+"To control this at runtime, use [member Engine.print_error_messages]."
+msgstr ""
+"Se [code]true[/code], disabilita la stampa su errore standard. Se [code]true[/"
+"code], nasconde anche i messaggi di errore e di avviso stampati da [method "
+"@GlobalScope.push_error] e [method @GlobalScope.push_warning]. Vedi anche "
+"[member application/run/disable_stdout].\n"
+"Le modifiche a questa impostazione saranno applicate solo al riavvio "
+"dell'applicazione. Per controllare ciò in fase di esecuzione, usa [member "
+"Engine.print_error_messages]."
+
+msgid ""
+"If [code]true[/code], disables printing to standard output. This is "
+"equivalent to starting the editor or project with the [code]--quiet[/code] "
+"[url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line "
+"argument[/url]. See also [member application/run/disable_stderr].\n"
+"Changes to this setting will only be applied upon restarting the application. "
+"To control this at runtime, use [member Engine.print_to_stdout]."
+msgstr ""
+"Se [code]true[/code], disabilita la stampa sull'output standard. Ciò equivale "
+"ad avviare l'editor o il progetto con l'[url=$DOCS_URL/tutorials/editor/"
+"command_line_tutorial.html]argomento della riga di comando[/url] [code]--"
+"quiet[/code] . Vedi anche [member application/run/disable_stderr].\n"
+"Le modifiche a questa impostazione saranno applicate solo al riavvio "
+"dell'applicazione. Per controllare ciò in fase di esecuzione, usa [member "
+"Engine.print_to_stdout]."
+
 msgid ""
 "If [code]true[/code], allows the [kbd]Alt + Space[/kbd] keys to display the "
 "window menu. This menu allows the user to perform various window management "
@@ -96047,6 +115115,35 @@ msgstr ""
 "File di risorsa [AudioBusLayout] predefinito da utilizzare nel progetto, a "
 "meno che non sia sovrascritto dalla scena."
 
+msgid ""
+"Specifies the audio driver to use. This setting is platform-dependent as each "
+"platform supports different audio drivers. If left empty, the default audio "
+"driver will be used.\n"
+"The [code]Dummy[/code] audio driver disables all audio playback and "
+"recording, which is useful for non-game applications as it reduces CPU usage. "
+"It also prevents the engine from appearing as an application playing audio in "
+"the OS' audio mixer.\n"
+"To query the value that is being used at run-time (which may be overridden by "
+"command-line arguments or headless mode), use [method AudioServer."
+"get_driver_name].\n"
+"[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--"
+"audio-driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]command line argument[/url]."
+msgstr ""
+"Specifica il driver audio da utilizzare. Questa impostazione dipende dalla "
+"piattaforma, poiché ogni piattaforma supporta driver audio diversi. Se "
+"lasciato vuoto, sarà utilizzato il driver audio predefinito.\n"
+"Il driver audio [code]Dummy[/code] disabilita tutta la riproduzione e la "
+"registrazione audio, il che è utile per le applicazioni non di gioco, poiché "
+"riduce l'utilizzo della CPU. Inoltre, impedisce al motore di apparire come "
+"un'applicazione che riproduce audio nel mixer audio del sistema operativo.\n"
+"Per richiedere il valore utilizzato in fase di esecuzione (il quale può "
+"essere sovrascritto dagli argomenti della riga di comando o dalla modalità "
+"headless), usa [method AudioServer.get_driver_name].\n"
+"[b]Nota:[/b] Il driver in uso può essere sovrascritto in fase di esecuzione "
+"tramite l'[url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]argomento della riga di comando[/url] [code]--audio-driver[/code]."
+
 msgid ""
 "If [code]true[/code], microphone input will be allowed. This requires "
 "appropriate permissions to be set when exporting to Android or iOS.\n"
@@ -96355,6 +115452,24 @@ msgstr ""
 "html]argomento della riga di comando[/url] [code]--log-file <file>[/code] , "
 "la rotazione dei file di registro è sempre disabilitata."
 
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when an [code]assert[/code] call always evaluates to "
+"[code]false[/code]."
+msgstr ""
+"Se impostato su [code]warn[/code] o [code]error[/code], produce "
+"rispettivamente un avviso o un errore quando una chiamata a [code]assert[/"
+"code] è sempre valutata come [code]false[/code]."
+
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when an [code]assert[/code] call always evaluates to "
+"[code]true[/code]."
+msgstr ""
+"Se impostato su [code]warn[/code] o [code]error[/code], produce "
+"rispettivamente un avviso o un errore quando una chiamata a [code]assert[/"
+"code] è sempre valutata come [code]true[/code]."
+
 msgid ""
 "When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
 "error respectively when a local variable captured by a lambda is reassigned, "
@@ -96546,6 +115661,16 @@ msgstr ""
 "rispettivamente un avviso o un errore quando si divide un numero intero per "
 "un altro numero intero (la parte decimale sarà scartata)."
 
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when the base class script has the [code]@tool[/code] "
+"annotation, but the current class script does not have it."
+msgstr ""
+"Se impostato su [code]warn[/code] o [code]error[/code], produce "
+"rispettivamente un avviso o un errore quando lo script della classe base ha "
+"l'annotazione [code]@tool[/code], ma lo script della classe attuale non ce "
+"l'ha."
+
 msgid ""
 "When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
 "error respectively when passing a floating-point value to a function that "
@@ -96635,6 +115760,24 @@ msgstr ""
 "locale o membro, un segnale o un'enumerazione che avrebbe lo stesso nome di "
 "una funzione integrata o di una classe globale, oscurandolo così."
 
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when a local variable or local constant shadows a member "
+"declared in the current class."
+msgstr ""
+"Se impostato su [code]warn[/code] o [code]error[/code], produce "
+"rispettivamente un avviso o un errore quando una variabile locale o una "
+"costante locale oscura un membro dichiarato nella classe attuale."
+
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when a local variable or local constant shadows a member "
+"declared in a base class."
+msgstr ""
+"Se impostato su [code]warn[/code] o [code]error[/code], produce "
+"rispettivamente un avviso o un errore quando una variabile locale o una "
+"costante locale oscura un membro dichiarato nella classe base."
+
 msgid ""
 "When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
 "error respectively when calling an expression that may have no effect on the "
@@ -97410,12 +116553,22 @@ msgstr ""
 "utilizzato invece il valore di [member EditorSettings.run/window_placement/"
 "screen]."
 
+msgid ""
+"Main window mode. See [enum DisplayServer.WindowMode] for possible values and "
+"how each mode behaves.\n"
+"[b]Note:[/b] Game embedding is available only in the \"Windowed\" mode."
+msgstr ""
+"Modalità della finestra principale. Vedi [enum DisplayServer.WindowMode] per "
+"i valori possibili e il comportamento di ciascuna modalità.\n"
+"[b]Nota:[/b] L'incorporamento del gioco è disponibile solo nella modalità "
+"\"Windowed\"."
+
 msgid ""
 "Main window can't be focused. No-focus window will ignore all input, except "
 "mouse clicks."
 msgstr ""
-"La finestra principale non può essere messa a fuoco. La finestra senza messa "
-"a fuoco ignorerà tutti gli input, eccetto i clic del mouse."
+"La finestra principale non può essere focalizzata. Una finestra impossibile "
+"da focalizzare ignorerà tutti gli input, tranne i clic del mouse."
 
 msgid ""
 "If [code]true[/code], allows the window to be resizable by default.\n"
@@ -97442,6 +116595,14 @@ msgstr ""
 "ridimensionabile.\n"
 "[b]Nota:[/b] Questa impostazione è ignorata su iOS."
 
+msgid ""
+"If [code]true[/code], the main window uses sharp corners by default.\n"
+"[b]Note:[/b] This property is implemented only on Windows (11)."
+msgstr ""
+"Se [code]true[/code], la finestra principale usa angoli acuti per "
+"impostazione predefinita.\n"
+"[b]Nota:[/b] Questa proprietà è implementata solo su Windows (11)."
+
 msgid ""
 "If [code]true[/code], enables a window manager hint that the main window "
 "background [i]can[/i] be transparent. This does not make the background "
@@ -97472,12 +116633,12 @@ msgid ""
 "window_width_override] and [member display/window/size/"
 "window_height_override]."
 msgstr ""
-"Imposta l'altezza della finestra principale del gioco. Sulle piattaforme "
+"Imposta l'altezza della viewport principale del gioco. Sulle piattaforme "
 "desktop, questa è anche l'altezza iniziale della finestra, rappresentata da "
 "un rettangolo color indaco nell'editor 2D. Le impostazioni della modalità di "
-"allungamento la usano anche come riferimento quando si usano le modalità di "
-"allungamento [code]canvas_items[/code] o [code]viewport[/code]. Vedi anche "
-"[member display/window/size/viewport_width], [member display/window/size/"
+"allargamento la usano anche come riferimento quando si usano le modalità "
+"[code]canvas_items[/code] o [code]viewport[/code]. Vedi anche [member display/"
+"window/size/viewport_width], [member display/window/size/"
 "window_width_override] e [member display/window/size/window_height_override]."
 
 msgid ""
@@ -97489,12 +116650,12 @@ msgid ""
 "window_width_override] and [member display/window/size/"
 "window_height_override]."
 msgstr ""
-"Imposta la larghezza della finestra principale del gioco. Sulle piattaforme "
+"Imposta la larghezza della viewport principale del gioco. Sulle piattaforme "
 "desktop, questa è anche la larghezza iniziale della finestra, rappresentata "
 "da un rettangolo color indaco nell'editor 2D. Le impostazioni della modalità "
-"di allungamento la usano anche come riferimento quando si usano le modalità "
-"di allungamento [code]canvas_items[/code] o [code]viewport[/code]. Vedi anche "
-"[member display/window/size/viewport_height], [member display/window/size/"
+"di allargamento la usano anche come riferimento quando si usano le modalità "
+"[code]canvas_items[/code] o [code]viewport[/code]. Vedi anche [member display/"
+"window/size/viewport_height], [member display/window/size/"
 "window_width_override] e [member display/window/size/window_height_override]."
 
 msgid ""
@@ -99024,6 +118185,36 @@ msgstr ""
 "Sostituzione specifica su macOS per selezionare la parola attualmente sotto "
 "il cursore."
 
+msgid ""
+"If no selection is currently active with the last caret in text fields, "
+"searches for the next occurrence of the word currently under the caret and "
+"moves the caret to the next occurrence. The action can be performed "
+"sequentially for other occurrences of the word under the last caret.\n"
+"If a selection is currently active with the last caret in text fields, "
+"searches for the next occurrence of the selection, adds a caret, selects the "
+"next occurrence then deselects the previous selection and its associated "
+"caret. The action can be performed sequentially for other occurrences of the "
+"selection of the last caret.\n"
+"The viewport is adjusted to the latest newly added caret.\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"Se nessuna selezione è attualmente attiva con l'ultimo cursore nei campi di "
+"testo, cerca l'occorrenza successiva della parola attualmente sotto il "
+"cursore e sposta il cursore all'occorrenza successiva. L'azione può essere "
+"eseguita in sequenza per altre occorrenze della parola sotto l'ultimo "
+"cursore.\n"
+"Se una selezione è attualmente attiva con l'ultimo cursore nei campi di "
+"testo, cerca l'occorrenza successiva della selezione, aggiunge un cursore, "
+"seleziona l'occorrenza successiva, quindi deseleziona la selezione precedente "
+"e il cursore associato. L'azione può essere eseguita in sequenza per altre "
+"occorrenze della selezione dell'ultimo cursore.\n"
+"La viewport viene regolata all'ultimo cursore appena aggiunto.\n"
+"[b]Nota:[/b] Le azioni predefinite [code]ui_*[/code] non possono essere "
+"rimosse in quanto sono necessarie per la logica interna di diversi [Control]. "
+"Gli eventi assegnati all'azione possono tuttavia essere modificati."
+
 msgid ""
 "Default [InputEventAction] to submit a text field.\n"
 "[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
@@ -99062,6 +118253,19 @@ msgstr ""
 "rimosse in quanto sono necessarie per la logica interna di diversi [Control]. "
 "Gli eventi assegnati all'azione possono tuttavia essere modificati."
 
+msgid ""
+"Default [InputEventAction] to start Unicode character hexadecimal code input "
+"in a text field.\n"
+"[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
+"necessary for the internal logic of several [Control]s. The events assigned "
+"to the action can however be modified."
+msgstr ""
+"L'[InputEventAction] predefinito per avviare l'immissione del codice "
+"esadecimale di un carattere Unicode in un campo di testo.\n"
+"[b]Nota:[/b] Le azioni predefinite [code]ui_*[/code] non possono essere "
+"rimosse in quanto sono necessarie per la logica interna di diversi [Control]. "
+"Gli eventi assegnati all'azione possono tuttavia essere modificati."
+
 msgid ""
 "Default [InputEventAction] to move up in the UI.\n"
 "[b]Note:[/b] Default [code]ui_*[/code] actions cannot be removed as they are "
@@ -99113,6 +118317,23 @@ msgstr ""
 "[code]false[/code]. Il comportamento tradizione è per supportare vecchi "
 "progetti che si basano sulla vecchia logica, senza modifiche allo script."
 
+msgid ""
+"Specifies the tablet driver to use. If left empty, the default driver will be "
+"used.\n"
+"[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--"
+"tablet-driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]command line argument[/url].\n"
+"[b]Note:[/b] Use [method DisplayServer.tablet_set_current_driver] to switch "
+"tablet driver in runtime."
+msgstr ""
+"Specifica il driver del tablet da utilizzare. Se lasciato vuoto, sarà "
+"utilizzato il driver predefinito.\n"
+"[b]Nota:[/b] Il driver in uso può essere sovrascritto in fase di esecuzione "
+"tramite l'[url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]argomento della riga di comando[/url] [code]--tablet-driver[/code].\n"
+"[b]Nota:[/b] Usa [method DisplayServer.tablet_set_current_driver] per "
+"cambiare il driver del tablet in fase di esecuzione."
+
 msgid ""
 "If [code]true[/code], long press events on an Android touchscreen are "
 "transformed into right click events."
@@ -99150,6 +118371,63 @@ msgstr ""
 "Se [code]true[/code], invia eventi di input tocco quando si clicca o si "
 "trascina il mouse."
 
+msgid ""
+"If [code]true[/code], the accelerometer sensor is enabled and [method Input."
+"get_accelerometer] returns valid data."
+msgstr ""
+"Se [code]true[/code], il sensore dell'accelerometro è abilitato e [method "
+"Input.get_accelerometer] restituisce dati validi."
+
+msgid ""
+"If [code]true[/code], the gravity sensor is enabled and [method Input."
+"get_gravity] returns valid data."
+msgstr ""
+"Se [code]true[/code], il sensore della gravità è abilitato e [method Input."
+"get_gravity] restituisce dati validi."
+
+msgid ""
+"If [code]true[/code], the gyroscope sensor is enabled and [method Input."
+"get_gyroscope] returns valid data."
+msgstr ""
+"Se [code]true[/code], il sensore dello giroscopio è abilitato e [method Input."
+"gyroscope] restituisce dati validi."
+
+msgid ""
+"If [code]true[/code], the magnetometer sensor is enabled and [method Input."
+"get_magnetometer] returns valid data."
+msgstr ""
+"Se [code]true[/code], il sensore del magnetometro è abilitato e [method Input."
+"get_magnetometer] restituisce dati validi."
+
+msgid ""
+"The locale to fall back to if a translation isn't available in a given "
+"language. If left empty, [code]en[/code] (English) will be used.\n"
+"[b]Note:[/b] Not to be confused with [TextServerFallback]."
+msgstr ""
+"La localizzazione a cui ricorrere se una traduzione non è disponibile in una "
+"determinata lingua. Se lasciato vuoto, sarà utilizzato [code]en[/code] "
+"(inglese).\n"
+"[b]Nota:[/b] Da non confondere con [TextServerFallback]."
+
+msgid ""
+"If [code]true[/code], text server break iteration rule sets, dictionaries and "
+"other optional data are included in the exported project.\n"
+"[b]Note:[/b] \"ICU / HarfBuzz / Graphite\" text server data includes "
+"dictionaries for Burmese, Chinese, Japanese, Khmer, Lao and Thai as well as "
+"Unicode Standard Annex #29 and Unicode Standard Annex #14 word and line "
+"breaking rules. Data is about 4 MB large.\n"
+"[b]Note:[/b] [TextServerFallback] does not use additional data."
+msgstr ""
+"Se [code]true[/code], la serie di regole di iterazione di interruzione, i "
+"dizionari e altri dati facoltativi del server di testo sono inclusi nel "
+"progetto esportato.\n"
+"[b]Nota:[/b] I dati del server di testo \"ICU / HarfBuzz / Graphite\" "
+"includono dizionari per birmano, cinese, giapponese, khmer, laotiano e "
+"tailandese, nonché le regole di interruzione di parole e righe Unicode "
+"Standard Annex #29 e Unicode Standard Annex #14. I dati sono grandi circa 4 "
+"MB.\n"
+"[b]Nota:[/b] [TextServerFallback] non utilizza dati aggiuntivi."
+
 msgid ""
 "Double vowels in strings during pseudolocalization to simulate the "
 "lengthening of text due to localization."
@@ -99166,6 +118444,20 @@ msgstr ""
 "pratica, un valore di [code]0.3[/code] è spesso sufficiente e aumenterà la "
 "lunghezza di ogni stringa del 30%."
 
+msgid ""
+"If [code]true[/code], emulate bidirectional (right-to-left) text when "
+"pseudolocalization is enabled. This can be used to spot issues with RTL "
+"layout and UI mirroring that will crop up if the project is localized to RTL "
+"languages such as Arabic or Hebrew. See also [member internationalization/"
+"rendering/force_right_to_left_layout_direction]."
+msgstr ""
+"Se [code]true[/code], emula il testo bidirezionale (da destra a sinistra) "
+"quando è abilitata la pseudolocalizzazione. Questo può essere utilizzato per "
+"individuare problemi con il layout RTL e il rispecchiamento dell'interfaccia "
+"utente, che si presenteranno se il progetto è localizzato in lingue RTL come "
+"l'arabo o l'ebraico. Vedi anche [member internationalization/rendering/"
+"force_right_to_left_layout_direction]."
+
 msgid ""
 "Replace all characters in the string with [code]*[/code]. Useful for finding "
 "non-localizable strings."
@@ -99230,6 +118522,39 @@ msgstr ""
 msgid "Root node default layout direction."
 msgstr "Direzione del layout predefinita del nodo radice."
 
+msgid ""
+"Specifies the [TextServer] to use. If left empty, the default will be used.\n"
+"\"ICU / HarfBuzz / Graphite\" ([TextServerAdvanced]) is the most advanced "
+"text driver, supporting right-to-left typesetting and complex scripts (for "
+"languages like Arabic, Hebrew, etc.). The \"Fallback\" text driver "
+"([TextServerFallback]) does not support right-to-left typesetting and complex "
+"scripts.\n"
+"[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--"
+"text-driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]command line argument[/url].\n"
+"[b]Note:[/b] There is an additional [code]Dummy[/code] text driver available, "
+"which disables all text rendering and font-related functionality. This driver "
+"is not listed in the project settings, but it can be enabled when running the "
+"editor or project using the [code]--text-driver Dummy[/code] [url=$DOCS_URL/"
+"tutorials/editor/command_line_tutorial.html]command line argument[/url]."
+msgstr ""
+"Specifica il [TextServer] da usare. Se lasciato vuoto, sarà usato quello "
+"predefinito.\n"
+"\"ICU / HarfBuzz / Graphite\" ([TextServerAdvanced]) è il driver di testo più "
+"avanzato, che supporta la composizione da destra a sinistra e gli alfabeti "
+"complessi (per lingue come arabo, ebraico, ecc.). Il driver di testo "
+"\"Fallback\" ([TextServerFallback]) non supporta la composizione da destra a "
+"sinistra e gli alfabeti complessi.\n"
+"[b]Nota:[/b] È possibile sovrascrivere il driver in uso in fase di esecuzione "
+"tramite l'[url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]argomento della riga di comando[/url] [code]--text-driver[/code].\n"
+"[b]Nota:[/b] È disponibile un ulteriore driver di testo [code]Dummy[/code], "
+"il quale disabilita tutte le funzionalità di rendering del testo e relative "
+"ai font. Questo driver non è elencato nelle impostazioni del progetto, ma è "
+"possibile abilitarlo eseguendo l'editor o il progetto utilizzando "
+"l'[url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]argomento della "
+"riga di comando[/url] [code]--text-driver Dummy[/code]."
+
 msgid ""
 "Optional name for the 2D navigation layer 1. If left empty, the layer will "
 "display as \"Layer 1\"."
@@ -101277,6 +120602,26 @@ msgstr ""
 "necessario modificare i valori di smorzamento. Questa modifica necessaria non "
 "è proporzionale e varia da caso a caso."
 
+msgid ""
+"If [code]true[/code], the 3D physics server runs on a separate thread, making "
+"better use of multi-core CPUs. If [code]false[/code], the 3D physics server "
+"runs on the main thread. Running the physics server on a separate thread can "
+"increase performance, but restricts API access to only physics process.\n"
+"[b]Note:[/b] When [member physics/3d/physics_engine] is set to [code]Jolt "
+"Physics[/code], enabling this setting will prevent the 3D physics server from "
+"being able to provide any context when reporting errors and warnings, and "
+"will instead always refer to nodes as [code]<unknown>[/code]."
+msgstr ""
+"Se [code]true[/code], il server di fisica 3D è eseguito su un thread "
+"separato, sfruttando al meglio le CPU multi-core. Se [code]false[/code], il "
+"server di fisica 3D è eseguito sul thread principale. Eseguire il server di "
+"fisica su un thread separato può aumentare le prestazioni, ma limita "
+"l'accesso all'API solo sul processo di fisica.\n"
+"[b]Nota:[/b] Quando [member physics/3d/physics_engine] è impostato su "
+"[code]Jolt Physics[/code], abilitando questa impostazione sarà impedito al "
+"server di fisica 3D di fornire qualsiasi contesto quando si segnalano errori "
+"e avvisi e si riferirà sempre ai nodi come [code]<unknown>[/code]."
+
 msgid ""
 "Threshold angular velocity under which a 3D physics body will be considered "
 "inactive. See [constant PhysicsServer3D."
@@ -101388,6 +120733,67 @@ msgstr ""
 "modificare il numero massimo di passaggi simulati di fisica per frame in fase "
 "di esecuzione, imposta invece [member Engine.max_physics_steps_per_frame]."
 
+msgid ""
+"If [code]true[/code], the renderer will interpolate the transforms of physics "
+"objects between the last two transforms, so that smooth motion is seen even "
+"when physics ticks do not coincide with rendered frames. See also [member "
+"Node.physics_interpolation_mode] and [method Node."
+"reset_physics_interpolation].\n"
+"[b]Note:[/b] If [code]true[/code], the physics jitter fix should be disabled "
+"by setting [member physics/common/physics_jitter_fix] to [code]0.0[/code].\n"
+"[b]Note:[/b] This property is only read when the project starts. To toggle "
+"physics interpolation at runtime, set [member SceneTree."
+"physics_interpolation] instead."
+msgstr ""
+"Se [code]true[/code], il renderer interpolerà le trasformazioni degli oggetti "
+"fisici tra le ultime due trasformazioni, in modo che un movimento fluido sia "
+"visibile anche quando i tick di fisica non coincidono con i frame "
+"renderizzati. Vedi anche [member Node.physics_interpolation_mode] e [method "
+"Node.reset_physics_interpolation].\n"
+"[b]Nota:[/b] Se [code]true[/code], la correzione del jitter di fisica "
+"dovrebbe essere disabilitata impostando [member physics/common/"
+"physics_jitter_fix] su [code]0.0[/code].\n"
+"[b]Nota:[/b] Questa proprietà è letta solo all'avvio del progetto. Per "
+"attivare/disattivare l'interpolazione fisica in fase di esecuzione, imposta "
+"invece [member SceneTree.physics_interpolation]."
+
+msgid ""
+"Controls how much physics ticks are synchronized with real time. For 0 or "
+"less, the ticks are synchronized. Such values are recommended for network "
+"games, where clock synchronization matters. Higher values cause higher "
+"deviation of in-game clock and real clock, but allows smoothing out framerate "
+"jitters. The default value of 0.5 should be good enough for most; values "
+"above 2 could cause the game to react to dropped frames with a noticeable "
+"delay and are not recommended.\n"
+"[b]Note:[/b] Jitter fix is automatically disabled at runtime when [member "
+"physics/common/physics_interpolation] is enabled.\n"
+"[b]Note:[/b] When using a custom physics interpolation solution, the physics "
+"jitter fix should be disabled by setting [member physics/common/"
+"physics_jitter_fix] to [code]0.0[/code].\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the physics jitter fix at runtime, set [member Engine.physics_jitter_fix] "
+"instead."
+msgstr ""
+"Controlla quanti tick fisici sono sincronizzati con il tempo reale. Per 0 o "
+"meno, i tick sono sincronizzati. Tali valori sono consigliati per i giochi in "
+"rete, dove la sincronizzazione del tempo è importante. Valori più alti "
+"causano una deviazione maggiore del tempo di gioco e del tempo reale, ma "
+"consentono di attenuare i tremolii del frame rate. Il valore predefinito di "
+"0,5 è solitamente abbastanza buono; valori superiori a 2 potrebbero causare "
+"il gioco a reagire ai frame persi con un ritardo evidente e non sono "
+"consigliati.\n"
+"[b]Nota:[/b] La correzione del tremolio viene automaticamente disabilitata in "
+"fase di esecuzione quando [member physics/common/physics_interpolation] è "
+"abilitato.\n"
+"[b]Nota:[/b] Quando si usa una soluzione di interpolazione della fisica (ad "
+"esempio abilitando [member physics/common/physics_interpolation] o usando una "
+"soluzione personalizzata), la correzione del tremolio della fisica dovrebbe "
+"essere disabilitata impostando [member physics/common/physics_jitter_fix] su "
+"[code]0.0[/code].\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"modificare la correzione del tremolio della fisica in fase di esecuzione, "
+"imposta invece [member Engine.physics_jitter_fix]."
+
 msgid ""
 "The number of fixed iterations per second. This controls how often physics "
 "simulation and [method Node._physics_process] methods are run. See also "
@@ -101419,6 +120825,21 @@ msgstr ""
 "physics_ticks_per_second] drasticamente al di sopra del suo valore "
 "predefinito."
 
+msgid ""
+"Number of solver position iterations. The greater the number of iterations, "
+"the more accurate the simulation will be, at the cost of CPU performance."
+msgstr ""
+"Numero di iterazioni di posizione per il risolutore. Maggiore è il numero di "
+"iterazioni, più accurata sarà la simulazione, a scapito delle prestazioni "
+"della CPU."
+
+msgid ""
+"Maximum number of canvas item commands that can be batched into a single draw "
+"call."
+msgstr ""
+"Numero massimo di comandi di elementi canvas che si possono raggruppare in "
+"una singola chiamata di disegno."
+
 msgid ""
 "Controls how much of the original viewport size should be covered by the 2D "
 "signed distance field. This SDF can be sampled in [CanvasItem] shaders and is "
@@ -101553,6 +120974,149 @@ msgstr ""
 "apparire ancora meno fluido. Si consiglia di abilitare solo "
 "quell'impostazione."
 
+msgid ""
+"Sets the number of multisample antialiasing (MSAA) samples to use for 2D/"
+"Canvas rendering (as a power of two). MSAA is used to reduce aliasing around "
+"the edges of polygons. A higher MSAA value results in smoother edges but can "
+"be significantly slower on some hardware, especially integrated graphics due "
+"to their limited memory bandwidth. This has no effect on shader-induced "
+"aliasing or texture aliasing.\n"
+"[b]Note:[/b] MSAA is only supported in the Forward+ and Mobile rendering "
+"methods, not Compatibility.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set the "
+"number of 2D MSAA samples at runtime, set [member Viewport.msaa_2d] or use "
+"[method RenderingServer.viewport_set_msaa_2d]."
+msgstr ""
+"Imposta il numero di campioni MSAA da usare per il rendering 2D/Canvas (come "
+"potenza di due). Lo MSAA è usato per ridurre l'aliasing attorno ai bordi dei "
+"poligoni. Un valore di MSAA più alto produce bordi più lisci ma può essere "
+"notevolmente più lento su alcuni hardware, specialmente sulla grafica "
+"integrata a causa della loro limitata larghezza di banda di memoria. Questo "
+"non ha alcun effetto sull'aliasing indotto dagli shader o sull'aliasing delle "
+"texture.\n"
+"[b]Nota:[/b] Lo MSAA è supportato solo nei metodi di rendering Forward+ e "
+"Mobile, non Compatibilità.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"impostare il numero di campioni MSAA 2D in fase di esecuzione, imposta "
+"[member Viewport.msaa_2d] o usa [method RenderingServer.viewport_set_msaa_2d]."
+
+msgid ""
+"Sets the number of multisample antialiasing (MSAA) samples to use for 3D "
+"rendering (as a power of two). MSAA is used to reduce aliasing around the "
+"edges of polygons. A higher MSAA value results in smoother edges but can be "
+"significantly slower on some hardware, especially integrated graphics due to "
+"their limited memory bandwidth. See also [member rendering/scaling_3d/mode] "
+"for supersampling, which provides higher quality but is much more expensive. "
+"This has no effect on shader-induced aliasing or texture aliasing.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set the "
+"number of 3D MSAA samples at runtime, set [member Viewport.msaa_3d] or use "
+"[method RenderingServer.viewport_set_msaa_3d]."
+msgstr ""
+"Imposta il numero di campioni MSAA da usare per il rendering 3D (come potenza "
+"di due). Lo MSAA è usato per ridurre l'aliasing attorno ai bordi dei "
+"poligoni. Un valore MSAA più alto produce bordi più lisci ma può essere "
+"notevolmente più lento su alcuni hardware, specialmente sulla grafica "
+"integrata a causa della loro limitata larghezza di banda di memoria. Vedi "
+"anche [member rendering/scaling_3d/mode] per il sovracampionamento, che "
+"fornisce una qualità più elevata ma è molto più costoso. Questo non ha alcun "
+"effetto sull'aliasing indotto dagli shader o sull'aliasing delle texture.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"impostare il numero di campioni MSAA 3D in fase di esecuzione, imposta "
+"[member Viewport.msaa_3d] o usa [method RenderingServer.viewport_set_msaa_3d]."
+
+msgid ""
+"Sets the screen-space antialiasing mode for the default screen [Viewport]. "
+"Screen-space antialiasing works by selectively blurring edges in a post-"
+"process shader. It differs from MSAA which takes multiple coverage samples "
+"while rendering objects. Screen-space AA methods are typically faster than "
+"MSAA and will smooth out specular aliasing, but tend to make scenes appear "
+"blurry. The blurriness is partially counteracted by automatically using a "
+"negative mipmap LOD bias (see [member rendering/textures/default_filters/"
+"texture_mipmap_bias]).\n"
+"Another way to combat specular aliasing is to enable [member rendering/"
+"anti_aliasing/screen_space_roughness_limiter/enabled].\n"
+"[b]Note:[/b] Screen-space antialiasing is only supported in the Forward+ and "
+"Mobile rendering methods, not Compatibility.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set the "
+"screen-space antialiasing mode at runtime, set [member Viewport."
+"screen_space_aa] on the root [Viewport] instead, or use [method "
+"RenderingServer.viewport_set_screen_space_aa]."
+msgstr ""
+"Imposta la modalità di antialiasing nello spazio dello schermo per la "
+"[Viewport] principale predefinita. L'antialiasing nello spazio dello schermo "
+"funziona sfocando selettivamente i bordi in uno shader di post-elaborazione. "
+"Si differenzia dall'MSAA che prende più campioni di copertura durante il "
+"rendering degli oggetti. I metodi di AA nello spazio dello schermo sono in "
+"genere più veloci dell'MSAA e smussano l'aliasing speculare, ma tendono a far "
+"apparire le scene sfocate. La sfocatura è parzialmente contrastata usando "
+"automaticamente un bias LOD negativo per le mipmap (vedi [member rendering/"
+"textures/default_filters/texture_mipmap_bias]).\n"
+"Un altro modo per combattere l'aliasing speculare è abilitare [member "
+"rendering/anti_aliasing/screen_space_roughness_limiter/enabled].\n"
+"[b]Nota:[/b] L'antialiasing nello spazio dello schermo è supportato solo nei "
+"metodi di rendering Forward+ e Mobile, non Compatibilità.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"impostare la modalità antialiasing nello spazio dello schermo in fase di "
+"esecuzione, imposta [member Viewport.screen_space_aa] sulla  [Viewport] "
+"radice oppure usa [method RenderingServer.viewport_set_screen_space_aa]."
+
+msgid ""
+"If [code]true[/code], uses a fast post-processing filter to make banding "
+"significantly less visible in 3D. 2D rendering is [i]not[/i] affected by "
+"debanding unless the [member Environment.background_mode] is [constant "
+"Environment.BG_CANVAS].\n"
+"In some cases, debanding may introduce a slightly noticeable dithering "
+"pattern. It's recommended to enable debanding only when actually needed since "
+"the dithering pattern will make lossless-compressed screenshots larger.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set "
+"debanding at runtime, set [member Viewport.use_debanding] on the root "
+"[Viewport] instead, or use [method RenderingServer."
+"viewport_set_use_debanding]."
+msgstr ""
+"Se [code]true[/code], utilizza un filtro di post-elaborazione veloce per "
+"rendere il banding notevolmente meno visibile in 3D. Il rendering 2D [i]non[/"
+"i] è influenzato dal debanding a meno che [member Environment."
+"background_mode] non sia [constant Environment.BG_CANVAS].\n"
+"In alcuni casi, il debanding potrebbe introdurre un leggero motivo di "
+"dithering. Si consiglia di abilitare il debanding solo quando è "
+"effettivamente necessario, poiché il motivo di dithering renderà più grandi "
+"gli screenshot compressi senza perdita di dati.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"impostare il debanding in fase di esecuzione, imposta invece [member Viewport."
+"use_debanding] sulla [Viewport] radice, o usa [method RenderingServer."
+"viewport_set_use_debanding]."
+
+msgid ""
+"Enables temporal antialiasing for the default screen [Viewport]. TAA works by "
+"jittering the camera and accumulating the images of the last rendered frames, "
+"motion vector rendering is used to account for camera and object motion. "
+"Enabling TAA can make the image blurrier, which is partially counteracted by "
+"automatically using a negative mipmap LOD bias (see [member rendering/"
+"textures/default_filters/texture_mipmap_bias]).\n"
+"[b]Note:[/b] The implementation is not complete yet. Some visual instances "
+"such as particles and skinned meshes may show ghosting artifacts in motion.\n"
+"[b]Note:[/b] TAA is only supported in the Forward+ rendering method, not "
+"Mobile or Compatibility.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set TAA "
+"at runtime, set [member Viewport.use_taa] on the root [Viewport] instead, or "
+"use [method RenderingServer.viewport_set_use_taa]."
+msgstr ""
+"Abilita l'antialiasing temporale per la [Viewport] principale predefinita. Il "
+"TAA funziona tremolando la telecamera e accumulando le immagini degli ultimi "
+"fotogrammi renderizzati, il rendering del vettore di movimento è utilizzato "
+"per tenere conto del movimento della telecamera e dell'oggetto. Abilitare il "
+"TAA può rendere l'immagine più sfocata, il che è parzialmente contrastato "
+"dall'uso automatico di un bias di LOD mipmap negativo (vedi [member rendering/"
+"textures/default_filters/texture_mipmap_bias]).\n"
+"[b]Nota:[/b] L'implementazione non è ancora completa. Alcune istanze visive "
+"come particelle e mesh con skin potrebbero mostrare artefatti di ghosting in "
+"movimento.\n"
+"[b]Nota:[/b] Il TAA è supportato solo nel metodo di rendering Forward+, non "
+"Mobile o Compatibilità.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"impostare TAA in fase di esecuzione, imposta [member Viewport.use_taa] sulla "
+"[Viewport] radice oppure usa [method RenderingServer.viewport_set_use_taa]."
+
 msgid ""
 "[b]Note:[/b] This property is only read when the project starts. To control "
 "the screen-space roughness limiter at runtime, call [method RenderingServer."
@@ -101744,6 +121308,22 @@ msgstr ""
 "produrrà un aspetto più fluido, ma sarà più lento da calcolare e avrà meno "
 "dettagli ad alta frequenza."
 
+msgid ""
+"Distance at which the screen-space ambient occlusion effect starts to fade "
+"out. Use this hide ambient occlusion from far away."
+msgstr ""
+"Distanza alla quale l'effetto di occlusione ambientale nello spazio dello "
+"schermo inizia a svanire. Usa questa per nascondere l'occlusione ambientale "
+"da molto lontano."
+
+msgid ""
+"Distance at which the screen-space ambient occlusion is fully faded out. Use "
+"this hide ambient occlusion from far away."
+msgstr ""
+"Distanza alla quale l'occlusione ambientale nello spazio sullo schermo è "
+"completamente svanita. Usa questa per nascondere l'occlusione ambientale da "
+"molto lontano."
+
 msgid ""
 "If [code]true[/code], screen-space ambient occlusion will be rendered at half "
 "size and then upscaled before being added to the scene. This is significantly "
@@ -101794,6 +121374,22 @@ msgstr ""
 "produrrà un aspetto più fluido, ma sarà più lento da calcolare e avrà meno "
 "dettagli ad alta frequenza."
 
+msgid ""
+"Distance at which the screen-space indirect lighting effect starts to fade "
+"out. Use this to hide screen-space indirect lighting from far away."
+msgstr ""
+"Distanza alla quale l'effetto di illuminazione indiretta nello spazio dello "
+"schermo inizia a svanire. Usa questa per nascondere l'illuminazione indiretta "
+"nello spazio dello schermo da molto lontano."
+
+msgid ""
+"Distance at which the screen-space indirect lighting is fully faded out. Use "
+"this to hide screen-space indirect lighting from far away."
+msgstr ""
+"Distanza alla quale l'effetto di illuminazione indiretta nello spazio dello "
+"schermo svanisce totalmente. Usa questa per nascondere l'illuminazione "
+"indiretta nello spazio dello schermo da molto lontano."
+
 msgid ""
 "If [code]true[/code], screen-space indirect lighting will be rendered at half "
 "size and then upscaled before being added to the scene. This is significantly "
@@ -101930,6 +121526,15 @@ msgstr ""
 "OpenGL per desktop non è supportato.\n"
 "[b]Nota:[/b] Questa impostazione è implementata solo su Linux/X11."
 
+msgid ""
+"If [code]true[/code], the compatibility renderer will fall back to native "
+"OpenGL if ANGLE is not supported, or ANGLE dynamic libraries aren't found.\n"
+"[b]Note:[/b] This setting is implemented on macOS and Windows."
+msgstr ""
+"Se [code]true[/code], il renderer di compatibilità tornerà a OpenGL nativo se "
+"ANGLE non è supportato o se le librerie dinamiche Angle non vengono trovate\n"
+"[b]Nota:[/b] Questa impostazione è implementata su macOS e Windows."
+
 msgid ""
 "An [Array] of devices which should always use the ANGLE renderer.\n"
 "Each entry is a [Dictionary] with the following keys: [code]vendor[/code] and "
@@ -102087,6 +121692,60 @@ msgstr ""
 "controllare la qualità di VoxelGI in fase di esecuzione, chiama invece "
 "[method RenderingServer.voxel_gi_set_quality]."
 
+msgid ""
+"The maximum number of rays that can be thrown per pass when baking lightmaps "
+"with [LightmapGI]. Depending on the scene, adjusting this value may result in "
+"higher GPU utilization when baking lightmaps, leading to faster bake times.\n"
+"[b]Note:[/b] Using a value that is too high for your system can cause crashes "
+"due to the GPU being unresponsive for long periods of time, and the graphics "
+"driver being reset by the OS."
+msgstr ""
+"Il numero massimo di raggi che possono essere proiettati per ogni passaggio "
+"durante la preparazione delle lightmap con [LightmapGI]. A seconda della "
+"scena, regolare questo valore potrebbe comportare un utilizzo maggiore della "
+"GPU durante la preparazione delle lightmap, con conseguenti tempi di "
+"elaborazione più rapidi.\n"
+"[b]Nota:[/b] Impostare un valore troppo alto per il sistema potrebbe causare "
+"un arresto anomalo dovuto alla GPU che non risponde per lunghi periodi di "
+"tempo, con conseguente ripristino del driver grafico da parte del sistema "
+"operativo."
+
+msgid ""
+"The maximum number of rays that can be thrown per pass when baking dynamic "
+"object lighting in [LightmapProbe]s with [LightmapGI]. Depending on the "
+"scene, adjusting this value may result in higher GPU utilization when baking "
+"lightmaps, leading to faster bake times.\n"
+"[b]Note:[/b] Using a value that is too high for your system can cause crashes "
+"due to the GPU being unresponsive for long periods of time, and the graphics "
+"driver being reset by the OS."
+msgstr ""
+"Il numero massimo di raggi che possono essere proiettati per ogni passaggio "
+"durante la preparazione dell'illuminazione dinamica degli oggetti nei "
+"[LightmapProbe] con [LightmapGI]. A seconda della scena, regolare questo "
+"valore può comportare un utilizzo maggiore della GPU durante la preparazione "
+"delle lightmap, con conseguenti tempi di elaborazione più rapidi.\n"
+"[b]Nota:[/b] Impostare un valore troppo alto per il sistema potrebbe causare "
+"un arresto anomalo dovuto alla GPU che non risponde per lunghi periodi di "
+"tempo, con conseguente ripristino del driver grafico da parte del sistema "
+"operativo."
+
+msgid ""
+"The maximum number of retry rays that can be thrown per pass when hitting a "
+"transparent surface when baking lightmaps with [LightmapGI]. Depending on the "
+"scene, reducing this value may lead to faster bake times.\n"
+"[b]Note:[/b] Using a value that is too high for your system can cause crashes "
+"due to the GPU being unresponsive for long periods of time, and the graphics "
+"driver being reset by the OS."
+msgstr ""
+"Il numero massimo di raggi di ripetizione che possono essere proiettati per "
+"ogni passaggio durante la preparazione delle lightmap con [LightmapGI]. A "
+"seconda della scena, regolare questo valore potrebbe comportare tempi di "
+"elaborazione più rapidi.\n"
+"[b]Nota:[/b] Impostare un valore troppo alto per il sistema potrebbe causare "
+"un arresto anomalo dovuto alla GPU che non risponde per lunghi periodi di "
+"tempo, con conseguente ripristino del driver grafico da parte del sistema "
+"operativo."
+
 msgid ""
 "The number of rays to use for baking dynamic object lighting in "
 "[LightmapProbe]s when [member LightmapGI.quality] is [constant LightmapGI."
@@ -102411,6 +122070,22 @@ msgstr ""
 "[b]Nota:[/b] Questa impostazione è efficace solo quando si utilizza il metodo "
 "di rendering Forward+, non Mobile e Compatibility."
 
+msgid ""
+"The maximum number of uniforms that can be used by the global shader uniform "
+"buffer. Each item takes up one slot. In other words, a single uniform float "
+"and a uniform vec4 will take the same amount of space in the buffer.\n"
+"[b]Note:[/b] When using the Compatibility renderer, most mobile devices (and "
+"all web exports) will be limited to a maximum size of 1024 due to hardware "
+"constraints."
+msgstr ""
+"Il numero massimo di uniformi che possono essere utilizzate dal buffer di "
+"uniformi dello shader globale. Ogni elemento occupa uno slot. In altre "
+"parole, un singolo float uniforme e un vec4 uniforme occuperanno la stessa "
+"quantità di spazio nel buffer.\n"
+"[b]Nota:[/b] Quando si utilizza il renderer di Compatibilità, la maggior "
+"parte dei dispositivi mobili (e tutte le esportazioni su web) saranno "
+"limitate a una dimensione massima di 1024 a causa di limiti dell'hardware."
+
 msgid ""
 "Max number of omnilights and spotlights renderable per object. At the default "
 "value of 8, this means that each surface can be affected by up to 8 "
@@ -102680,6 +122355,44 @@ msgstr ""
 "sky_reflections/texture_array_reflections] sui dispositivi mobili, a causa di "
 "problemi di prestazioni o di supporto dei driver."
 
+msgid ""
+"Sets the renderer that will be used by the project. Options are:\n"
+"[b]forward_plus[/b] (Forward+): High-end renderer designed for desktop "
+"devices. Has a higher base overhead, but scales well with complex scenes. Not "
+"suitable for older devices or mobile.\n"
+"[b]mobile[/b] (Mobile): Modern renderer designed for mobile devices. Has a "
+"lower base overhead than Forward+, but does not scale as well to large scenes "
+"with many elements.\n"
+"[b]gl_compatibility[/b] (Compatibility): Low-end renderer designed for older "
+"devices. Based on the limitations of the OpenGL 3.3 / OpenGL ES 3.0 / WebGL 2 "
+"APIs.\n"
+"This can be overridden using the [code]--rendering-method <method>[/code] "
+"command line argument.\n"
+"[b]Note:[/b] The actual rendering method may be automatically changed by the "
+"engine as a result of a fallback, or a user-specified command line argument. "
+"To get the actual rendering method that is used at runtime, use [method "
+"RenderingServer.get_current_rendering_method] instead of reading this project "
+"setting's value."
+msgstr ""
+"Imposta il renderer che sarà utilizzato dal progetto. Le opzioni sono:\n"
+"[b]forward_plus[/b] (Forward+: Renderer di fascia alta progettato per i "
+"dispositivi desktop. Ha un overhead di base più elevato, ma si adatta bene "
+"alle scene complesse. Non adatto a dispositivi più vecchi o mobili.\n"
+"[b]mobile[/b] (Mobile): Renderer moderno progettato per i dispositivi mobili. "
+"Ha un overhead di base inferiore a Forward+, ma non si adatta bene alle scene "
+"di grandi dimensioni con molti elementi.\n"
+"[b]gl_ccompatibility[/b] (Compatibilità): Renderer di fascia bassa progettato "
+"per i dispositivi più vecchi. Basato sulle limitazioni delle API OpenGL 3.3/"
+"OpenGL ES 3.0/WebGL 2.\n"
+"È possibile sovrascrivere questa impostazione attraverso l'argomento della "
+"riga di comando [code]--rendering-method <method>[/code].\n"
+"[b]Nota:[/b] È possibile che il metodo di rendering effettivo sia modificato "
+"automaticamente dal motore come risultato di riserva o di un argomento della "
+"riga di comando specificato dall'utente. Per ottenere il metodo di rendering "
+"effettivo utilizzato durante l'esecuzione, usa [method RenderingServer."
+"get_current_rendering_method] invece di leggere il valore di questa "
+"impostazione del progetto."
+
 msgid ""
 "Override for [member rendering/renderer/rendering_method] on mobile devices."
 msgstr ""
@@ -102741,6 +122454,43 @@ msgstr ""
 "A seconda della complessità delle scene, questo valore potrebbe essere "
 "abbassato o potrebbe essere necessario aumentarlo."
 
+msgid ""
+"If [code]true[/code], the forward renderer will fall back to Direct3D 12 if "
+"Vulkan is not supported. The fallback is always attempted regardless of this "
+"setting if Vulkan driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented only on Windows."
+msgstr ""
+"Se [code]true[/code], il renderer Forward ricadrà su Direct3D 12 se Vulkan "
+"non è supportato. L'alternativa viene sempre tentata a prescindere da questa "
+"impostazione se il supporto per il driver Vulkan è stato disabilitato in fase "
+"di compilazione.\n"
+"[b]Nota:[/b] Questa impostazione è implementata solo su Windows."
+
+msgid ""
+"If [code]true[/code], the forward renderer will fall back to OpenGL 3 if "
+"Direct3D 12, Metal, and Vulkan are not supported.\n"
+"[b]Note:[/b] This setting is implemented only on Windows, Android, macOS, "
+"iOS, and Linux/X11."
+msgstr ""
+"Se [code]true[/code], il renderer Forward ricadrà su OpenGL 3 se Direct3D 12, "
+"Metal e Vulkan non sono supportati.\n"
+"[b]Nota:[/b] Questa impostazione è implementata solo su Windows, Android, "
+"macOS, iOS e Linux/X11."
+
+msgid ""
+"If [code]true[/code], the forward renderer will fall back to Vulkan if "
+"Direct3D 12 (on Windows) or Metal (on macOS x86_64) are not supported. The "
+"fallback is always attempted regardless of this setting if Direct3D 12 "
+"(Windows) or Metal (macOS) driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented only on Windows and macOS."
+msgstr ""
+"Se [code]true[/code], il renderer Forward ricadrà su Vulkan se Direct3D 12 "
+"(su Windows) o Metal (su macOS x86_64) non è supportato. L'alternativa viene "
+"sempre tentata a prescindere da questa impostazione se il supporto per il "
+"driver Direct3D 12 (Windows) o Metal (macOS) è stato disabilitato in fase di "
+"compilazione.\n"
+"[b]Nota:[/b] Questa impostazione è implementata solo su Windows e macOS."
+
 msgid ""
 "Enable the pipeline cache that is saved to disk if the graphics API supports "
 "it.\n"
@@ -102764,6 +122514,19 @@ msgstr ""
 "Determina a quale intervallo la cache della pipeline è salvata sul disco. Più "
 "basso è il valore, più spesso è salvata."
 
+msgid ""
+"The maximum amount of memory allowed to be used by staging buffers. If the "
+"amount of data being uploaded or downloaded exceeds this amount, the GPU will "
+"stall and wait for previous frames to finish.\n"
+"[b]Note:[/b] This property is only read when the project starts. There is "
+"currently no way to change this value at run-time."
+msgstr ""
+"La quantità massima di memoria consentita per essere utilizzata dai buffer di "
+"staging. Se la quantità di dati caricati o scaricati supera questa quantità, "
+"la GPU si bloccherà e attenderà il completamento dei frame precedenti.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Al "
+"momento non è possibile modificare questo valore in fase di esecuzione."
+
 msgid ""
 "The number of frames to track on the CPU side before stalling to wait for the "
 "GPU.\n"
@@ -102863,6 +122626,28 @@ msgstr ""
 "Forward+, non Mobile o Compatibilità. Se si utilizza un metodo di rendering "
 "incompatibile, FSR tornerà al ridimensionamento bilineare."
 
+msgid ""
+"Scales the 3D render buffer based on the viewport size uses an image filter "
+"specified in [member rendering/scaling_3d/mode] to scale the output image to "
+"the full viewport size. Values lower than [code]1.0[/code] can be used to "
+"speed up 3D rendering at the cost of quality (undersampling). Values greater "
+"than [code]1.0[/code] are only valid for bilinear mode and can be used to "
+"improve 3D rendering quality at a high performance cost (supersampling). See "
+"also [member rendering/anti_aliasing/quality/msaa_3d] for multi-sample "
+"antialiasing, which is significantly cheaper but only smooths the edges of "
+"polygons."
+msgstr ""
+"Ridimensiona il buffer di rendering 3D in base alle dimensioni della "
+"viewport, usando un filtro d'immagine specificato in [member rendering/"
+"scaling_3d/mode] per ridimensionare l'immagine finale alle dimensioni intere "
+"della viewport. È possibile usare valori inferiori a [code]1.0[/code] per "
+"velocizzare il rendering 3D a scapito della qualità (sottocampionamento). "
+"Valori superiori a [code]1.0[/code] sono validi solo per la modalità "
+"bilineare ed è possibile usarli per migliorare la qualità del rendering 3D a "
+"un costo elevato per le prestazioni (sovracampionamento). Vedi anche [member "
+"rendering/anti_aliasing/quality/msaa_3d] per l'antialiasing multi-campione, "
+"che è significativamente più performante ma smussa solo i bordi dei poligoni."
+
 msgid ""
 "Enable the shader cache, which stores compiled shaders to disk to prevent "
 "stuttering from shader compilation the next time the shader is needed."
@@ -102887,6 +122672,38 @@ msgstr ""
 "force_lambert_over_burley] sui dispositivi mobili, a causa di problemi di "
 "prestazioni o di supporto dei driver."
 
+msgid ""
+"If [code]true[/code], forces vertex shading for all rendering. This can "
+"increase performance a lot, but also reduces quality immensely. Can be used "
+"to optimize performance on low-end mobile devices."
+msgstr ""
+"Se [code]true[/code], forza l'ombreggiatura con vertici per tutto il "
+"rendering. Questo può aumentare notevolmente le prestazioni, ma riduce "
+"immensamente la qualità. Può essere utilizzato per ottimizzare le prestazioni "
+"su dispositivi mobili di fascia bassa."
+
+msgid ""
+"The default texture filtering mode to use for [CanvasItem]s built-in texture. "
+"In shaders, this texture is accessed as [code]TEXTURE[/code].\n"
+"[b]Note:[/b] For pixel art aesthetics, see also [member rendering/2d/snap/"
+"snap_2d_vertices_to_pixel] and [member rendering/2d/snap/"
+"snap_2d_transforms_to_pixel]."
+msgstr ""
+"La modalità predefinita di filtraggio delle texture da utilizzare sulle "
+"texture integrate dei [CanvasItem]. Negli shader, questa texture è "
+"accessibile come [code]TEXTURE[/code].\n"
+"[b]Nota:[/b] Per l'estetica pixel art, vedi anche [member rendering/2d/snap/"
+"snap_2d_vertices_to_pixel] e [member rendering/2d/snap/"
+"snap_2d_transforms_to_pixel]."
+
+msgid ""
+"The default texture repeating mode to use for [CanvasItem]s built-in texture. "
+"In shaders, this texture is accessed as [code]TEXTURE[/code]."
+msgstr ""
+"La modalità predefinita di ripetizione delle texture da utilizzare sulle "
+"texture integrate dei [CanvasItem]. Negli shader, questa texture è "
+"accessibile come [code]TEXTURE[/code]."
+
 msgid ""
 "The filtering quality to use for [Decal] nodes. When using one of the "
 "anisotropic filtering modes, the anisotropic filtering level is controlled by "
@@ -102897,6 +122714,56 @@ msgstr ""
 "controllato da [member rendering/textures/default_filters/"
 "anisotropic_filtering_level]."
 
+msgid ""
+"Sets the maximum number of samples to take when using anisotropic filtering "
+"on textures (as a power of two). A higher sample count will result in sharper "
+"textures at oblique angles, but is more expensive to compute. A value of "
+"[code]0[/code] forcibly disables anisotropic filtering, even on materials "
+"where it is enabled.\n"
+"The anisotropic filtering level also affects decals and light projectors if "
+"they are configured to use anisotropic filtering. See [member rendering/"
+"textures/decals/filter] and [member rendering/textures/light_projectors/"
+"filter].\n"
+"[b]Note:[/b] In 3D, for this setting to have an effect, set [member "
+"BaseMaterial3D.texture_filter] to [constant BaseMaterial3D."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] or [constant BaseMaterial3D."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] on materials.\n"
+"[b]Note:[/b] In 2D, for this setting to have an effect, set [member "
+"CanvasItem.texture_filter] to [constant CanvasItem."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] or [constant CanvasItem."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] on the [CanvasItem] node "
+"displaying the texture (or in [CanvasTexture]). However, anisotropic "
+"filtering is rarely useful in 2D, so only enable it for textures in 2D if it "
+"makes a meaningful visual difference.\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the anisotropic filtering level at runtime, set [member Viewport."
+"anisotropic_filtering_level] on the root [Viewport] instead."
+msgstr ""
+"Imposta il numero massimo di campioni da prendere quando si usa il filtro "
+"anisotropico sulle texture (come potenza di due). Un numero di campioni più "
+"alto produrrà texture più nitide ad angoli obliqui, ma è più costoso da "
+"calcolare. Un valore di [code]0[/code] disabilita forzatamente il filtro "
+"anisotropico, anche sui materiali in cui è abilitato.\n"
+"Il livello del filtro anisotropico influisce anche su decalcomanie e "
+"proiettori di luce se sono configurati per usare il filtro anisotropico. Vedi "
+"[member rendering/textures/decals/filter] e [member rendering/textures/"
+"light_projectors/filter].\n"
+"[b]Nota:[/b] In 3D, per fare in modo che questa impostazione abbia effetto, "
+"imposta [member BaseMaterial3D.texture_filter] su [constant BaseMaterial3D."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] o [constant BaseMaterial3D."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] sui materiali.\n"
+"[b]Nota:[/b] In 2D, per fare in modo che questa impostazione abbia effetto, "
+"imposta [member CanvasItem.texture_filter] su [constant CanvasItem."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] o [constant CanvasItem."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] sul nodo [CanvasItem] che "
+"visualizza la texture (o in [CanvasTexture]). Tuttavia, il filtro "
+"anisotropico è raramente utile in 2D, quindi abilitalo per le texture in 2D "
+"solo se produce una notevole differenza visiva.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"modificare il livello di filtraggio anisotropico in fase di esecuzione, "
+"imposta invece [member Viewport.anisotropic_filtering_level] sulla [Viewport] "
+"radice."
+
 msgid ""
 "Affects the final texture sharpness by reading from a lower or higher mipmap "
 "(also called \"texture LOD bias\"). Negative values make mipmapped textures "
@@ -103048,6 +122915,46 @@ msgstr ""
 "decompressione non è influenzata in gran parte dal fattore di compressione. I "
 "valori supportati sono da 0 a 100."
 
+msgid ""
+"If [code]true[/code], enables [member Viewport.use_hdr_2d] on the root "
+"viewport. 2D rendering will use an high dynamic range (HDR) format "
+"framebuffer matching the bit depth of the 3D framebuffer. When using the "
+"Forward+ renderer this will be an [code]RGBA16[/code] framebuffer, while when "
+"using the Mobile renderer it will be an [code]RGB10_A2[/code] framebuffer. "
+"Additionally, 2D rendering will take place in linear color space and will be "
+"converted to sRGB space immediately before blitting to the screen. "
+"Practically speaking, this means that the end result of the Viewport will not "
+"be clamped into the [code]0-1[/code] range and can be used in 3D rendering "
+"without color space adjustments. This allows 2D rendering to take advantage "
+"of effects requiring high dynamic range (e.g. 2D glow) as well as "
+"substantially improves the appearance of effects requiring highly detailed "
+"gradients.\n"
+"[b]Note:[/b] This setting will have no effect when using the Compatibility "
+"renderer, which always renders in low dynamic range for performance reasons.\n"
+"[b]Note:[/b] This property is only read when the project starts. To toggle "
+"HDR 2D at runtime, set [member Viewport.use_hdr_2d] on the root [Viewport]."
+msgstr ""
+"Se [code]true[/code], abilita [member Viewport.use_hdr_2d] sulla viewport "
+"radice. il rendering 2D utilizzerà un framebuffer in formato HDR (High "
+"Dynamic Range, o \"alta gamma dinamica\") corrispondente alla profondità di "
+"bit del framebuffer 3D. Quando si utilizza il renderer Forward+, questo sarà "
+"un framebuffer [code]RGBA16[/code], mentre quando si utilizza il renderer "
+"Mobile, sarà un framebuffer [code]RGB10_A2[/code]. Inoltre, il rendering 2D "
+"avverrà nello spazio colore lineare e sarà convertito nello spazio sRGB "
+"subito prima di essere visualizzato sullo schermo (se la Viewport è collegata "
+"allo schermo). In pratica, ciò significa che il risultato finale della "
+"Viewport non sarà limitato nell'intervallo [code]0-1[/code] e potrà essere "
+"utilizzato nel rendering 3D senza aggiustare lo spazio colore. Ciò consente "
+"al rendering 2D di sfruttare gli effetti che richiedono un'elevata gamma "
+"dinamica (ad esempio, il bagliore 2D) e migliora sostanzialmente l'aspetto "
+"degli effetti che richiedono gradienti molto dettagliati.\n"
+"[b]Nota:[/b] Questa impostazione non avrà alcun effetto quando si utilizza il "
+"renderer di Compatibilità, il quale renderizza sempre in una gamma dinamica "
+"bassa per motivi di prestazioni.\n"
+"[b]Nota:[/b] Questa proprietà viene letta solo all'avvio del progetto. Per "
+"attivare il HDR 2D in fase di esecuzione, imposta [member Viewport."
+"use_hdr_2d] sulla [Viewport] radice."
+
 msgid ""
 "If [code]true[/code], enables [member Viewport.transparent_bg] on the root "
 "viewport. This allows per-pixel transparency to be effective after also "
@@ -103132,6 +123039,20 @@ msgstr ""
 "Il numero massimo di thread da utilizzare dal [WorkerThreadPool]. Un valore "
 "di [code]-1[/code] indica nessun limite."
 
+msgid ""
+"If [code]true[/code], enables the analog threshold binding modifier if "
+"supported by the XR runtime."
+msgstr ""
+"Se [code]true[/code], abilita il modificatore di associazione per la soglia "
+"analogica se supportato dal runtime XR."
+
+msgid ""
+"If [code]true[/code], enables the D-pad binding modifier if supported by the "
+"XR runtime."
+msgstr ""
+"Se [code]true[/code], abilita il modificatore di associazione per il d-pad se "
+"supportato dal runtime XR."
+
 msgid "Action map configuration to load by default."
 msgstr ""
 "La configurazione della mappa delle azioni da caricare per impostazione "
@@ -103158,12 +123079,30 @@ msgstr ""
 "seconda della piattaforma, potrebbe essere necessaria una configurazione di "
 "esportazione aggiuntiva."
 
+msgid ""
+"If [code]true[/code] the hand interaction profile extension will be activated "
+"if supported by the platform."
+msgstr ""
+"Se è [code]true[/code], l'estensione del profilo di interazione delle mani "
+"sarà attivata se supportata dalla piattaforma."
+
 msgid ""
 "Specify whether OpenXR should be configured for an HMD or a hand held device."
 msgstr ""
 "Specifica se OpenXR deve essere configurato per un dispositivo HMD o "
 "portatile."
 
+msgid ""
+"If [code]true[/code] and foveation is supported, will automatically adjust "
+"foveation level based on framerate up to the level set on [member xr/openxr/"
+"foveation_level].\n"
+"[b]Note:[/b] Only works on the Compatibility rendering method."
+msgstr ""
+"Se è [code]true[/code] e la foveazione è supportata, regolerà automaticamente "
+"il livello di foveazione in base al frame rate fino al livello impostato su "
+"[member xr/openxr/foveation_level].\n"
+"[b]Nota:[/b] Funziona solo con il metodo di rendering Compatibilità."
+
 msgid ""
 "Applied foveation level if supported: 0 = off, 1 = low, 2 = medium, 3 = "
 "high.\n"
@@ -103216,6 +123155,208 @@ msgstr ""
 msgid "Interpolates an [Object]'s property over time."
 msgstr "Interpola una proprietà di un [Object] nel corso del tempo."
 
+msgid ""
+"[PropertyTweener] is used to interpolate a property in an object. See [method "
+"Tween.tween_property] for more usage information.\n"
+"The tweener will finish automatically if the target object is freed.\n"
+"[b]Note:[/b] [method Tween.tween_property] is the only correct way to create "
+"[PropertyTweener]. Any [PropertyTweener] created manually will not function "
+"correctly."
+msgstr ""
+"[PropertyTweener] è utilizzato per interpolare una proprietà in un oggetto. "
+"Vedi [method Tween.tween_property] per ulteriori informazioni sull'utilizzo.\n"
+"Il tweener terminerà automaticamente se l'oggetto di destinazione viene "
+"liberato.\n"
+"[b]Nota:[/b] [method Tween.tween_property] è l'unico modo corretto per creare "
+"[PropertyTweener]. Qualsiasi [PropertyTweener] creato manualmente non "
+"funzionerà correttamente."
+
+msgid ""
+"When called, the final value will be used as a relative value instead.\n"
+"[b]Example:[/b] Move the node by [code]100[/code] pixels to the right.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property(self, \"position\", Vector2.RIGHT * 100, 1)."
+"as_relative()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(this, \"position\", Vector2.Right * 100.0f, 1.0f)."
+"AsRelative();\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Quando viene chiamato, il valore finale verrà invece utilizzato come valore "
+"relativo.\n"
+"[b]Esempio:[/b] Sposta il nodo di [code]100[/code] pixel verso destra.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property(self, \"position\", Vector2.RIGHT * 100, 1)."
+"as_relative()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(this, \"position\", Vector2.Right * 100.0f, 1.0f)."
+"AsRelative();\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Sets a custom initial value to the [PropertyTweener].\n"
+"[b]Example:[/b] Move the node from position [code](100, 100)[/code] to [code]"
+"(200, 100)[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1)."
+"from(Vector2(100, 100))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(this, \"position\", new Vector2(200.0f, 100.0f), 1.0f)."
+"From(new Vector2(100.0f, 100.0f));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Imposta un valore iniziale personalizzato per il [PropertyTweener].\n"
+"[b]Esempio:[/b] Sposta il nodo dalla posizione [code](100, 100)[/code] a "
+"[code](200, 100)[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1)."
+"from(Vector2(100, 100))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(this, \"position\", new Vector2(200.0f, 100.0f), 1.0f)."
+"From(new Vector2(100.0f, 100.0f));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Makes the [PropertyTweener] use the current property value (i.e. at the time "
+"of creating this [PropertyTweener]) as a starting point. This is equivalent "
+"of using [method from] with the current value. These two calls will do the "
+"same:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1)."
+"from(position)\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1)."
+"from_current()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"tween.TweenProperty(this, \"position\", new Vector2(200.0f, 100.0f), 1.0f)."
+"From(Position);\n"
+"tween.TweenProperty(this, \"position\", new Vector2(200.0f, 100.0f), 1.0f)."
+"FromCurrent();\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Fa sì che il [PropertyTweener] utilizzi il valore della proprietà attuale (ad "
+"esempio al momento della creazione di questo [PropertyTweener]) come punto di "
+"partenza. Ciò equivale a usare [method from] con il valore attuale. Le due "
+"chiamate seguenti daranno lo stesso risultato:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1)."
+"from(position)\n"
+"tween.tween_property(self, \"position\", Vector2(200, 100), 1)."
+"from_current()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"tween.TweenProperty(this, \"position\", new Vector2(200.0f, 100.0f), 1.0f)."
+"From(Position);\n"
+"tween.TweenProperty(this, \"position\", new Vector2(200.0f, 100.0f), 1.0f)."
+"FromCurrent();\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Allows interpolating the value with a custom easing function. The provided "
+"[param interpolator_method] will be called with a value ranging from "
+"[code]0.0[/code] to [code]1.0[/code] and is expected to return a value within "
+"the same range (values outside the range can be used for overshoot). The "
+"return value of the method is then used for interpolation between initial and "
+"final value. Note that the parameter passed to the method is still subject to "
+"the tweener's own easing.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@export var curve: Curve\n"
+"\n"
+"func _ready():\n"
+"    var tween = create_tween()\n"
+"    # Interpolate the value using a custom curve.\n"
+"    tween.tween_property(self, \"position:x\", 300, 1).as_relative()."
+"set_custom_interpolator(tween_curve)\n"
+"\n"
+"func tween_curve(v):\n"
+"    return curve.sample_baked(v)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export]\n"
+"public Curve Curve { get; set; }\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    Tween tween = CreateTween();\n"
+"    // Interpolate the value using a custom curve.\n"
+"    Callable tweenCurveCallable = Callable.From<float, float>(TweenCurve);\n"
+"    tween.TweenProperty(this, \"position:x\", 300.0f, 1.0f).AsRelative()."
+"SetCustomInterpolator(tweenCurveCallable);\n"
+"}\n"
+"\n"
+"private float TweenCurve(float value)\n"
+"{\n"
+"    return Curve.SampleBaked(value);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Permette di interpolare il valore con una funzione di allentamento "
+"personalizzata. Il [param interpolator_method] fornito sarà chiamato con un "
+"valore compreso tra [code]0.0[/code] e [code]1.0[/code] e dovrebbe restituire "
+"un valore compreso nello stesso intervallo (i valori al di fuori "
+"dell'intervallo possono essere utilizzati per oltrepassarlo). Il valore "
+"restituito dal metodo è quindi utilizzato per l'interpolazione tra il valore "
+"iniziale e quello finale. Nota che il parametro passato al metodo è comunque "
+"soggetto all'allentamento del tweener stesso.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@export var curve: Curve\n"
+"\n"
+"func _ready():\n"
+"    var tween = create_tween()\n"
+"    # Interpola il valore attraverso una curva personalizzata.\n"
+"    tween.tween_property(self, \"position:x\", 300, 1).as_relative()."
+"set_custom_interpolator(tween_curve)\n"
+"\n"
+"func tween_curve(v):\n"
+"    return curve.sample_baked(v)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export]\n"
+"public Curve Curve { get; set; }\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    Tween tween = CreateTween();\n"
+"    // Interpola il valore attraverso una curva personalizzata.\n"
+"    Callable tweenCurveCallable = Callable.From<float, float>(TweenCurve);\n"
+"    tween.TweenProperty(this, \"position:x\", 300.0f, 1.0f).AsRelative()."
+"SetCustomInterpolator(tweenCurveCallable);\n"
+"}\n"
+"\n"
+"private float TweenCurve(float value)\n"
+"{\n"
+"    return Curve.SampleBaked(value);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Sets the time in seconds after which the [PropertyTweener] will start "
 "interpolating. By default there's no delay."
@@ -103324,6 +123465,15 @@ msgstr "Visualizzazione dei quaternioni online"
 msgid "Advanced Quaternion Visualization"
 msgstr "Visualizzazione avanzata dei quaternioni"
 
+msgid ""
+"Constructs a [Quaternion] identical to [constant IDENTITY].\n"
+"[b]Note:[/b] In C#, this constructs a [Quaternion] with all of its components "
+"set to [code]0.0[/code]."
+msgstr ""
+"Costruisce un [Quaternion] identico a [constant IDENTITY].\n"
+"[b]Nota:[/b] In C#, costruisce un [Quaternion] con tutti i suoi componenti "
+"impostati su [code]0.0[/code]."
+
 msgid "Constructs a [Quaternion] as a copy of the given [Quaternion]."
 msgstr "Costruisce un [Quaternion] come copia del [Quaternion] specificato."
 
@@ -103446,6 +123596,14 @@ msgstr ""
 "Restituisce la versione inversa di questo quaternione, invertendo il segno di "
 "ogni componente eccetto [member w]."
 
+msgid ""
+"Returns [code]true[/code] if this quaternion and [param to] are approximately "
+"equal, by calling [method @GlobalScope.is_equal_approx] on each component."
+msgstr ""
+"Restituisce [code]true[/code] se questo quaternione e [param to] sono "
+"approssimativamente uguali, chiamando [method @GDScript.is_equal_approx] su "
+"ogni componente."
+
 msgid ""
 "Returns [code]true[/code] if this quaternion is finite, by calling [method "
 "@GlobalScope.is_finite] on each component."
@@ -103573,6 +123731,23 @@ msgstr ""
 "[b]Nota:[/b] I componenti di un quaternione solitamente non dovrebbero essere "
 "manipolati direttamente."
 
+msgid ""
+"The identity quaternion, representing no rotation. This has the same rotation "
+"as [constant Basis.IDENTITY].\n"
+"If a [Vector3] is rotated (multiplied) by this quaternion, it does not "
+"change.\n"
+"[b]Note:[/b] In GDScript, this constant is equivalent to creating a "
+"[constructor Quaternion] without any arguments. It can be used to make your "
+"code clearer, and for consistency with C#."
+msgstr ""
+"Il quaternione di identità, che rappresenta nessuna rotazione. Ha la stessa "
+"rotazione di [constant Basis.IDENTITY].\n"
+"Se un [Vector3] è ruotato (moltiplicato) da questo quaternione, esso non "
+"cambia.\n"
+"[b]Nota:[/b] In GDScript, questa costante è identica alla creazione di un "
+"[constructor Quaternion] senza parametri. Questa costante può essere usata "
+"per rendere il codice più chiaro e per coerenza con C#."
+
 msgid ""
 "Returns [code]true[/code] if the components of both quaternions are not "
 "exactly equal.\n"
@@ -103834,6 +124009,45 @@ msgstr ""
 "rng.state = 100 # Ripristina uno stato salvato in precedenza.\n"
 "[/codeblock]"
 
+msgid ""
+"The current state of the random number generator. Save and restore this "
+"property to restore the generator to a previous state:\n"
+"[codeblock]\n"
+"var rng = RandomNumberGenerator.new()\n"
+"print(rng.randf())\n"
+"var saved_state = rng.state # Store current state.\n"
+"print(rng.randf()) # Advance internal state.\n"
+"rng.state = saved_state # Restore the state.\n"
+"print(rng.randf()) # Prints the same value as previously.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Do not set state to arbitrary values, since the random number "
+"generator requires the state to have certain qualities to behave properly. It "
+"should only be set to values that came from the state property itself. To "
+"initialize the random number generator with arbitrary input, use [member "
+"seed] instead.\n"
+"[b]Note:[/b] The default value of this property is pseudo-random, and changes "
+"when calling [method randomize]. The [code]0[/code] value documented here is "
+"a placeholder, and not the actual default seed."
+msgstr ""
+"Lo stato attuale del generatore di numeri casuali. Salva e ripristina questa "
+"proprietà per ripristinare il generatore a uno stato precedente:\n"
+"[codeblock]\n"
+"var rng = RandomNumberGenerator.new()\n"
+"print(rng.randf())\n"
+"var saved_state = rng.state # Memorizza lo stato attuale.\n"
+"print(rng.randf()) # Avanza lo stato interno.\n"
+"rng.state = saved_state # Ripristina lo stato.\n"
+"print(rng.randf()) # Stampa lo stesso valore di prima.\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Non impostare lo stato su valori arbitrari, poiché il generatore "
+"di numeri casuali richiede che lo stato abbia determinate qualità per "
+"comportarsi correttamente. Dovrebbe essere impostato solo su valori che "
+"provengono dalla proprietà dello stato stessa. Per inizializzare il "
+"generatore di numeri casuali con input arbitrari, usa invece [member seed].\n"
+"[b]Nota:[/b] Il valore predefinito di questa proprietà è pseudocasuale e "
+"cambia quando si chiama [method randomize]. Il valore [code]0[/code] qui "
+"documentato è un segnaposto e non il seed predefinito effettivo."
+
 msgid "Abstract base class for controls that represent a number within a range."
 msgstr ""
 "Classe di base astratta per i controlli che rappresentano un numero "
@@ -103910,6 +124124,15 @@ msgstr ""
 "Valore minimo. L'intervallo è limitato se [member value] è minore di [member "
 "in_value]."
 
+msgid ""
+"Page size. Used mainly for [ScrollBar]. A [ScrollBar]'s grabber length is the "
+"[ScrollBar]'s size multiplied by [member page] over the difference between "
+"[member min_value] and [member max_value]."
+msgstr ""
+"Dimensione di pagina. Utilizzato principalmente per [ScrollBar]. La lunghezza "
+"del grabber di una [ScrollBar] è la sua dimensione moltiplicata per [member "
+"page] sulla differenza tra [member min_value] e [member max_value]."
+
 msgid "The value mapped between 0 and 1."
 msgstr "Il valore mappato tra 0 e 1."
 
@@ -103989,10 +124212,10 @@ msgstr ""
 "target_position] che trova il [CollisionObject2D] più vicino lungo il suo "
 "percorso, se ne interseca uno.\n"
 "[RayCast2D] può ignorare alcuni oggetti aggiungendoli a un elenco di "
-"eccezioni, facendo in modo che il suoi rapporti di rilevamento ignorino "
+"eccezioni, facendo in modo che il suoi risultati di rilevamento ignorino "
 "[Area2D] ([member collide_with_areas]) o [PhysicsBody2D] ([member "
 "collide_with_bodies]), o configurando gli strati di fisica.\n"
-"[RayCast2D] calcola l'intersezione ogni frame di fisica e mantiene il "
+"[RayCast2D] calcola l'intersezione a ogni frame di fisica e mantiene il "
 "risultato fino al frame di fisica successivo. Per un raycast immediato, o se "
 "vuoi configurare un [RayCast2D] più volte all'interno dello stesso frame di "
 "fisica, usa [method force_raycast_update].\n"
@@ -104191,6 +124414,39 @@ msgstr ""
 "Il punto di destinazione del raggio, relativo alla [code]position[/code] del "
 "RayCast."
 
+msgid "A ray in 3D space, used to find the first object it intersects."
+msgstr ""
+"Un raggio nello spazio 3D, utilizzato per trovare il primo oggetto che "
+"interseca."
+
+msgid ""
+"A raycast represents a ray from its origin to its [member target_position] "
+"that finds the closest object along its path, if it intersects any.\n"
+"[RayCast3D] can ignore some objects by adding them to an exception list, by "
+"making its detection reporting ignore [Area3D]s ([member collide_with_areas]) "
+"or [PhysicsBody3D]s ([member collide_with_bodies]), or by configuring physics "
+"layers.\n"
+"[RayCast3D] calculates intersection every physics frame, and it holds the "
+"result until the next physics frame. For an immediate raycast, or if you want "
+"to configure a [RayCast3D] multiple times within the same physics frame, use "
+"[method force_raycast_update].\n"
+"To sweep over a region of 3D space, you can approximate the region with "
+"multiple [RayCast3D]s or use [ShapeCast3D]."
+msgstr ""
+"Un raycast rappresenta un raggio dalla sua origine alla sua [member "
+"target_position] che rileva l'oggetto più vicino lungo il suo percorso, se ne "
+"interseca uno.\n"
+"[RayCast3D] può ignorare alcuni oggetti aggiungendoli a un elenco di "
+"eccezioni, facendo in modo che il suoi risultati di rilevamento ignorino "
+"[Area3D] ([member collide_with_areas]) o [PhysicsBody3D] ([member "
+"collide_with_bodies]), o configurando gli strati di fisica.\n"
+"[RayCast3D] calcola l'intersezione a ogni frame di fisica e mantiene il "
+"risultato fino al frame di fisica successivo. Per un raycast immediato, o se "
+"vuoi configurare un [RayCast3D] più volte all'interno dello stesso frame di "
+"fisica, usa [method force_raycast_update].\n"
+"Per passare su una regione nello spazio 3D, puoi approssimare la regione con "
+"più [RayCast3D] o usare [ShapeCast3D]."
+
 msgid ""
 "Adds a collision exception so the ray does not report collisions with the "
 "specified [CollisionObject3D] node."
@@ -104198,6 +124454,21 @@ msgstr ""
 "Aggiunge un'eccezione di collisione in modo che il raggio non riporti le "
 "collisioni con il nodo [CollisionObject3D] specificato."
 
+msgid ""
+"Returns the first object that the ray intersects, or [code]null[/code] if no "
+"object is intersecting the ray (i.e. [method is_colliding] returns "
+"[code]false[/code]).\n"
+"[b]Note:[/b] This object is not guaranteed to be a [CollisionObject3D]. For "
+"example, if the ray intersects a [CSGShape3D] or a [GridMap], the method will "
+"return a [CSGShape3D] or [GridMap] instance."
+msgstr ""
+"Restituisce il primo oggetto che il raggio interseca, oppure [code]null[/"
+"code] se nessun oggetto interseca il raggio (ovvero [method is_colliding] "
+"restituisce [code]false[/code]).\n"
+"[b]Nota:[/b] Non è garantito che questo oggetto sia un [CollisionObject3D]. "
+"Ad esempio, se il raggio interseca un [CSGShape3D] o una [GridMap], il metodo "
+"restituirà un'istanza di [CSGShape3D] o [GridMap]."
+
 msgid ""
 "Returns the shape ID of the first object that the ray intersects, or [code]0[/"
 "code] if no object is intersecting the ray (i.e. [method is_colliding] "
@@ -104695,6 +124966,15 @@ msgstr ""
 "altri oggetti. Se [code]false[/code], gli oggetti appariranno nell'ordine in "
 "cui sono stati disegnati (come nel renderer 2D di Godot)."
 
+msgid ""
+"If [code]true[/code], writes to the depth buffer whenever the depth test "
+"returns [code]true[/code]. Only works when enable_depth_test is also "
+"[code]true[/code]."
+msgstr ""
+"Se [code]true[/code], scrive nel buffer di profondità ogni volta che il test "
+"di profondità restituisce [code]true[/code]. Funziona solo quando "
+"enable_depth_test è anche [code]true[/code]."
+
 msgid ""
 "If [code]true[/code], enables stencil testing. There are separate stencil "
 "buffers for front-facing triangles and back-facing triangles. See properties "
@@ -104769,6 +125049,16 @@ msgstr ""
 "del frammento. Ciò consente alla trasparenza alfa di utilizzare "
 "l'antialiasing multicampione."
 
+msgid ""
+"If [code]true[/code], alpha is forced to either [code]0.0[/code] or "
+"[code]1.0[/code]. This allows hardening the edges of antialiased alpha "
+"transparencies. Only relevant if [member enable_alpha_to_coverage] is "
+"[code]true[/code]."
+msgstr ""
+"Se [code]true[/code], l'afa è forzato a [code]0.0[/code] o [code]1.0[/code]. "
+"Ciò consente di affinare i bordi delle trasparenze alfa antialias. Rilevante "
+"solo se [member enable_alpha_to_coverage] è [code]true[/code]."
+
 msgid ""
 "If [code]true[/code], enables per-sample shading which replaces MSAA by SSAA. "
 "This provides higher quality antialiasing that works with transparent (alpha "
@@ -104785,6 +125075,23 @@ msgstr ""
 "sampleshading]documentazione Vulkan sull'ombreggiatura per campione[/url] per "
 "maggiori dettagli."
 
+msgid ""
+"The multiplier of [member sample_count] that determines how many samples are "
+"performed for each fragment. Must be between [code]0.0[/code] and [code]1.0[/"
+"code] (inclusive). Only effective if [member enable_sample_shading] is "
+"[code]true[/code]. If [member min_sample_shading] is [code]1.0[/code], "
+"fragment invocation must only read from the coverage index sample. Tile image "
+"access must not be used if [member enable_sample_shading] is [i]not[/i] "
+"[code]1.0[/code]."
+msgstr ""
+"Il moltiplicatore di [member sample_count] che determina quanti campioni sono "
+"effettuati per ogni frammento. Deve essere compreso tra [code]0.0[/code] e "
+"[code]1.0[/code] (inclusi). Efficace solo se [member enable_sample_shading] è "
+"[code]true[/code]. Se [member min_sample_shading] è [code]1.0[/code], "
+"l'invocazione del frammento deve leggere solo dal campione dell'indice di "
+"copertura. L'accesso alle immagini piastrellate non deve essere utilizzato se "
+"[member enable_sample_shading] [i]non[/i] è [code]1.0[/code]."
+
 msgid ""
 "The number of MSAA samples (or SSAA samples if [member enable_sample_shading] "
 "is [code]true[/code]) to perform. Higher values result in better "
@@ -105137,6 +125444,22 @@ msgstr ""
 "source_fragment], [member source_tesselation_control], [member "
 "source_tesselation_evaluation] o [member source_vertex]."
 
+msgid ""
+"Sets [param source] code for the specified shader [param stage]. Equivalent "
+"to setting one of [member source_compute], [member source_fragment], [member "
+"source_tesselation_control], [member source_tesselation_evaluation] or "
+"[member source_vertex].\n"
+"[b]Note:[/b] If you set the compute shader source code using this method "
+"directly, remember to remove the Godot-specific hint [code]#[compute][/code]."
+msgstr ""
+"Imposta il codice sorgente per la fase [param stage] dello shader su [param "
+"source]. Equivale a impostare uno tra [member source_compute], [member "
+"source_fragment], [member source_tesselation_control], [member "
+"source_tesselation_evaluation] o [member source_vertex].\n"
+"[b]Nota:[/b] Se imposti il codice sorgente dello shader di calcolo "
+"utilizzando questo metodo direttamente, ricordati di rimuovere "
+"l'indicazionespecifica di Godot [code]#[compute][/code]."
+
 msgid "The language the shader is written in."
 msgstr "Il linguaggio in cui è scritto lo shader."
 
@@ -105332,6 +125655,17 @@ msgstr "La larghezza della texture (in pixel)."
 msgid "Texture view (used by [RenderingDevice])."
 msgstr "Visualizzazione di texture (utilizzata da [RenderingDevice])."
 
+msgid ""
+"Optional override for the data format to return sampled values in. The "
+"corresponding [RDTextureFormat] must have had this added as a shareable "
+"format. The default value of [constant RenderingDevice.DATA_FORMAT_MAX] does "
+"not override the format."
+msgstr ""
+"Sostituzione facoltativa per il formato dati in cui restituire i valori "
+"campionati. Il [RDTextureFormat] corrispondente deve aver avuto questo "
+"aggiunto come formato condivisibile. Il valore predefinito di [constant "
+"RenderingDevice.DATA_FORMAT_MAX] non sovrascrive il formato."
+
 msgid "The channel to sample when sampling the alpha channel."
 msgstr "Il canale da campionare quando si campiona il canale alfa."
 
@@ -105370,6 +125704,16 @@ msgstr "Il tipo di dati dell'uniforme."
 msgid "Vertex attribute (used by [RenderingDevice])."
 msgstr "Attributo di vertice (utilizzato da [RenderingDevice])."
 
+msgid "The location in the shader that this attribute is bound to."
+msgstr "La posizione nello shader a cui è vincolato questo attributo."
+
+msgid ""
+"The number of bytes between the start of the vertex buffer and the first "
+"instance of this attribute."
+msgstr ""
+"Il numero di byte tra l'inizio del buffer di vertici e la prima occorrenza di "
+"questo attributo."
+
 msgid "A 2D axis-aligned bounding box using floating-point coordinates."
 msgstr ""
 "Una bounding box allineata agli assi 2D con coordinate in virgola mobile."
@@ -105521,6 +125865,15 @@ msgstr ""
 "Restituisce il punto centrale del rettangolo. È lo stesso di [code]position + "
 "(size / 2.0)[/code]."
 
+msgid ""
+"Returns the vertex's position of this rect that's the farthest in the given "
+"direction. This point is commonly known as the support point in collision "
+"detection algorithms."
+msgstr ""
+"Restituisce la posizione del vertice di questo rettangolo che è il più "
+"lontano nella direzione fornita. Questo punto è comunemente noto come punto "
+"di supporto negli algoritmi di rilevamento delle collisioni."
+
 msgid ""
 "Returns a copy of this rectangle extended on all sides by the given [param "
 "amount]. A negative [param amount] shrinks the rectangle instead. See also "
@@ -106357,6 +126710,20 @@ msgstr ""
 "creato. Ovvero, annulla l'assegnazione dell'espressione regolare di questo "
 "oggetto."
 
+msgid ""
+"Compiles and assign the search pattern to use. Returns [constant OK] if the "
+"compilation is successful. If compilation fails, returns [constant FAILED] "
+"and when [param show_error] is [code]true[/code], details are printed to "
+"standard output."
+msgstr ""
+"Compila e assegna il modello di ricerca da usare. Restituisce [constant OK] "
+"se la compilazione avviene con successo. Se si verifica un errore, "
+"restituisce [constant FAILED] e, se [param show_error] è [code]true[/code], i "
+"dettagli vengono stampati sull'output standard."
+
+msgid "Creates and compiles a new [RegEx] object. See also [method compile]."
+msgstr "Crea e compila un nuovo oggetto [RegEx]. Vedi anche [method compile]."
+
 msgid "Returns the number of capturing groups in compiled pattern."
 msgstr "Restituisce il numero di gruppi di cattura nel modello compilato."
 
@@ -106630,6 +126997,13 @@ msgstr ""
 "Restituisce il [RID] dell'oggetto attributi della telecamera nel "
 "[RenderingServer] usato per renderizzare questa viewport."
 
+msgid ""
+"Returns the [RID] of the environment object in the [RenderingServer] being "
+"used to render this viewport."
+msgstr ""
+"Restituisce il [RID] dell'oggetto ambiente nel [RenderingServer] attualmente "
+"usato per renderizzare questa viewport."
+
 msgid ""
 "Returns the [RenderSceneBuffers] object managing the scene buffers for "
 "rendering this viewport."
@@ -106703,6 +127077,11 @@ msgstr "Astrazione per lavorare con API grafiche moderne di basso livello."
 msgid "Using compute shaders"
 msgstr "Utilizzo degli shader di calcolo"
 
+msgid "Raises a Vulkan compute barrier in the specified [param compute_list]."
+msgstr ""
+"Alza una barriera di elaborazione Vulkan nella [param compute_list] "
+"specificata."
+
 msgid ""
 "Creates a new compute pipeline. It can be accessed with the RID that is "
 "returned.\n"
@@ -106725,6 +127104,11 @@ msgid "This method does nothing and always returns an empty [PackedInt64Array]."
 msgstr ""
 "Questo metodo non fa nulla e restituisce sempre un [PackedInt64Array] vuoto."
 
+msgid "Binds [param index_array] to the specified [param draw_list]."
+msgstr ""
+"Associa l'array di indici [param index_array] alla lista di disegno [param "
+"draw_list]."
+
 msgid "Binds [param render_pipeline] to the specified [param draw_list]."
 msgstr ""
 "Associa la rendering pipeline ([param render_pipeline]) alla lista di disegno "
@@ -106797,6 +127181,24 @@ msgstr ""
 "Restituisce il numero totale di timestamp (passi di rendering) disponibili "
 "per la profilazione."
 
+msgid ""
+"Returns how many types of trackable objects are.\n"
+"This is only used by Vulkan in debug builds. Godot must also be started with "
+"the [code]--extra-gpu-memory-tracking[/code] [url=$DOCS_URL/tutorials/editor/"
+"command_line_tutorial.html]command line argument[/url]."
+msgstr ""
+"Restituisce quanti tipi di oggetti tracciabili ci sono.\n"
+"Questo è usato solo da Vulkan nelle build di debug. Godot deve anche essere "
+"avviato con l'[url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]argomento della riga di comando[/url] [code]--extra-gpu-memory-tracking[/"
+"code]."
+
+msgid ""
+"Returns [code]true[/code] if the [param feature] is supported by the GPU."
+msgstr ""
+"Restituisce [code]true[/code] se la funzionalità [param feature] è supportata "
+"dalla GPU."
+
 msgid ""
 "Creates a new index array. It can be accessed with the RID that is returned.\n"
 "Once finished with your RID, you will want to free the RID using the "
@@ -106806,6 +127208,16 @@ msgstr ""
 "Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
 "[method free_rid] del RenderingServer."
 
+msgid ""
+"Creates a new index buffer. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method."
+msgstr ""
+"Crea un nuovo buffer di indici. È possibile accedervi con il RID restituito.\n"
+"Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
+"[method free_rid] del RenderingDevice."
+
 msgid ""
 "Creates a new render pipeline. It can be accessed with the RID that is "
 "returned.\n"
@@ -106909,6 +127321,14 @@ msgstr ""
 msgid "Returns the data format used to create this texture."
 msgstr "Restituisce il formato di dati utilizzato per creare questa texture."
 
+msgid ""
+"Returns [code]true[/code] if the [param texture] is discardable, [code]false[/"
+"code] otherwise. See [RDTextureFormat] or [method texture_set_discardable]."
+msgstr ""
+"Restituisce [code]true[/code] se la texture [param texture] è scartabile, "
+"altrimenti [code]false[/code]. Vedi [RDTextureFormat] o [method "
+"texture_set_discardable]."
+
 msgid ""
 "Returns [code]true[/code] if the specified [param format] is supported for "
 "the given [param usage_flags], [code]false[/code] otherwise."
@@ -106930,6 +127350,17 @@ msgstr ""
 "Restituisce [code]true[/code] se la texture [param texture] è valida, "
 "altrimenti [code]false[/code]."
 
+msgid ""
+"Creates a new uniform buffer. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method."
+msgstr ""
+"Crea un nuovo buffer di uniformi. È possibile accedervi con il RID "
+"restituito.\n"
+"Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
+"[method free_rid] del RenderingDevice."
+
 msgid ""
 "Creates a new uniform set. It can be accessed with the RID that is returned.\n"
 "Once finished with your RID, you will want to free the RID using the "
@@ -106939,6 +127370,15 @@ msgstr ""
 "Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
 "[method free_rid] del RenderingServer."
 
+msgid ""
+"It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method."
+msgstr ""
+"È possibile accedervi con il RID restituito.\n"
+"Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
+"[method free_rid] del RenderingDevice."
+
 msgid "Represents the size of the [enum DeviceType] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum DeviceType]."
 
@@ -107071,6 +127511,9 @@ msgstr ""
 msgid "Represents the size of the [enum InitialAction] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum InitialAction]."
 
+msgid "Final actions are solved automatically by RenderingDevice."
+msgstr "Le azioni finali vengono risolte automaticamente dal RenderingDevice."
+
 msgid ""
 "Store the result of the draw list in the framebuffer. This is generally what "
 "you want to do."
@@ -107178,6 +127621,11 @@ msgstr "Costante di specializzazione intera."
 msgid "Floating-point specialization constant."
 msgstr "Costante di specializzazione in virgola mobile."
 
+msgid "Maximum number of uniform sets that can be bound at a given time."
+msgstr ""
+"Numero massimo di set di uniformi che si possono associare in un determinato "
+"momento."
+
 msgid ""
 "Maximum number of color framebuffer attachments that can be used at a given "
 "time."
@@ -107339,6 +127787,88 @@ msgstr ""
 "Restituito dalle funzioni che restituiscono un ID formato se un valore non è "
 "valido."
 
+msgid "Do not clear or ignore any attachments."
+msgstr "Non cancellare o ignorare alcun allegato."
+
+msgid "Clear the first color attachment."
+msgstr "Cancella il primo allegato di colore."
+
+msgid "Clear the second color attachment."
+msgstr "Cancella il secondo allegato di colore."
+
+msgid "Clear the third color attachment."
+msgstr "Cancella il terzo allegato di colore."
+
+msgid "Clear the fourth color attachment."
+msgstr "Cancella il quarto allegato di colore."
+
+msgid "Clear the fifth color attachment."
+msgstr "Cancella il quinto allegato di colore."
+
+msgid "Clear the sixth color attachment."
+msgstr "Cancella il sesto allegato di colore."
+
+msgid "Clear the seventh color attachment."
+msgstr "Cancella il settimo allegato di colore."
+
+msgid "Clear the eighth color attachment."
+msgstr "Cancella l'ottavo allegato di colore."
+
+msgid "Mask for clearing all color attachments."
+msgstr "Maschera per cancellare tutti gli allegati di colore."
+
+msgid "Clear all color attachments."
+msgstr "Cancella tutti gli allegati di colore."
+
+msgid "Ignore the previous contents of the first color attachment."
+msgstr "Ignora il contenuto precedente del primo allegato di colore."
+
+msgid "Ignore the previous contents of the second color attachment."
+msgstr "Ignora il contenuto precedente del secondo allegato di colore."
+
+msgid "Ignore the previous contents of the third color attachment."
+msgstr "Ignora il contenuto precedente del terzo allegato di colore."
+
+msgid "Ignore the previous contents of the fourth color attachment."
+msgstr "Ignora il contenuto precedente del quarto allegato di colore."
+
+msgid "Ignore the previous contents of the fifth color attachment."
+msgstr "Ignora il contenuto precedente del quinto allegato di colore."
+
+msgid "Ignore the previous contents of the sixth color attachment."
+msgstr "Ignora il contenuto precedente del sesto allegato di colore."
+
+msgid "Ignore the previous contents of the seventh color attachment."
+msgstr "Ignora il contenuto precedente del settimo allegato di colore."
+
+msgid "Ignore the previous contents of the eighth color attachment."
+msgstr "Ignora il contenuto precedente dell'ottavo allegato di colore."
+
+msgid "Mask for ignoring all the previous contents of the color attachments."
+msgstr ""
+"Maschera per ignorare il contenuto precedente di tutti gli allegati di colore."
+
+msgid "Ignore the previous contents of all color attachments."
+msgstr "Ignora il contenuto precedente di tutti gli allegati di colore."
+
+msgid "Clear the depth attachment."
+msgstr "Cancella l'allegato di profondità."
+
+msgid "Ignore the previous contents of the depth attachment."
+msgstr "Ignora il contenuto precedente dell'allegato di profondità."
+
+msgid "Clear the stencil attachment."
+msgstr "Cancella l'allegato di stencil."
+
+msgid "Ignore the previous contents of the stencil attachment."
+msgstr "Ignora il contenuto precedente dell'allegato di stencil."
+
+msgid "Clear all attachments."
+msgstr "Cancella tutti gli allegati."
+
+msgid "Ignore the previous contents of all attachments."
+msgstr "Ignora il contenuto precedente di tutti gli allegati."
+
 msgid "Server for anything visible."
 msgstr "Server per tutto quello che è visibile."
 
@@ -107567,6 +128097,15 @@ msgstr ""
 "Disegna un cerchio sul [CanvasItem] puntato dal [RID] [param item]. Vedi "
 "anche [method CanvasItem.draw_circle]."
 
+msgid ""
+"If [param ignore] is [code]true[/code], ignore clipping on items drawn with "
+"this canvas item until this is called again with [param ignore] set to "
+"[code]false[/code]."
+msgstr ""
+"Se [param ignore] è [code]true[/code], ignora il ritaglio sugli elementi "
+"disegnati con questo elemento canvas finché non viene richiamato con [param "
+"ignore] impostato su [code]false[/code]."
+
 msgid "See also [method CanvasItem.draw_lcd_texture_rect_region]."
 msgstr "Vedi anche [method CanvasItem.draw_lcd_texture_rect_region]."
 
@@ -107616,6 +128155,25 @@ msgid ""
 "Draws particles on the [CanvasItem] pointed to by the [param item] [RID]."
 msgstr "Disegna particelle sul [CanvasItem] puntato dal [RID] [param item]."
 
+msgid ""
+"Draws a 2D polygon on the [CanvasItem] pointed to by the [param item] [RID]. "
+"If you need more flexibility (such as being able to use bones), use [method "
+"canvas_item_add_triangle_array] instead. See also [method CanvasItem."
+"draw_polygon].\n"
+"[b]Note:[/b] If you frequently redraw the same polygon with a large number of "
+"vertices, consider pre-calculating the triangulation with [method Geometry2D."
+"triangulate_polygon] and using [method CanvasItem.draw_mesh], [method "
+"CanvasItem.draw_multimesh], or [method canvas_item_add_triangle_array]."
+msgstr ""
+"Disegna un poligono 2D sul [CanvasItem] puntato dal [RID] [param item]. Se "
+"hai bisogno di più flessibilità (ad esempio, l'uso di ossa), usa invece "
+"[method canvas_item_add_triangle_array]. Vedi anche [method CanvasItem."
+"draw_polygon].\n"
+"[b]Nota:[/b] Se ridisegni frequentemente lo stesso poligono con un gran "
+"numero di vertici, considera di precalcolare la triangolazione con [method "
+"Geometry2D.triangulate_polygon] e di usare [method CanvasItem.draw_mesh], "
+"[method CanvasItem.draw_multimesh] o [method canvas_item_add_triangle_array]."
+
 msgid ""
 "Draws a 2D polyline on the [CanvasItem] pointed to by the [param item] [RID]. "
 "See also [method CanvasItem.draw_polyline] and [method CanvasItem."
@@ -107677,6 +128235,9 @@ msgstr ""
 "complesso da usare rispetto a [method canvas_item_add_polygon].\n"
 "[b]Nota:[/b] [param count] non è usato e può essere lasciato non specificato."
 
+msgid "Attaches a skeleton to the [CanvasItem]. Removes the previous skeleton."
+msgstr "Associa uno scheletro al [CanvasItem]. Rimuove lo scheletro precedente."
+
 msgid "Clears the [CanvasItem] and removes all commands in it."
 msgstr "Cancella il [CanvasItem] e rimuove tutti i comandi in esso."
 
@@ -107695,6 +128256,23 @@ msgstr ""
 "[method free_rid] del RenderingServer.\n"
 "[b]Nota:[/b] Il nodo equivalente è [CanvasItem]."
 
+msgid ""
+"Returns the value of the per-instance shader uniform from the specified "
+"canvas item instance. Equivalent to [method CanvasItem."
+"get_instance_shader_parameter]."
+msgstr ""
+"Restituisce il valore dell'uniforme shader per istanza dall'elemento canvas "
+"specificato. Equivale a [method CanvasItem.get_instance_shader_parameter]."
+
+msgid ""
+"Returns the default value of the per-instance shader uniform from the "
+"specified canvas item instance. Equivalent to [method CanvasItem."
+"get_instance_shader_parameter]."
+msgstr ""
+"Restituisce il valore predefinito dell'uniforme shader per istanza "
+"dall'elemento canvas specificato. Equivale a [method CanvasItem."
+"get_instance_shader_parameter]."
+
 msgid ""
 "Prevents physics interpolation for the current physics tick.\n"
 "This is useful when moving a canvas item to a new location, to give an "
@@ -107795,6 +128373,14 @@ msgstr ""
 msgid "Sets the index for the [CanvasItem]."
 msgstr "Imposta l'indice per il [CanvasItem]."
 
+msgid ""
+"Sets the per-instance shader uniform on the specified canvas item instance. "
+"Equivalent to [method CanvasItem.set_instance_shader_parameter]."
+msgstr ""
+"Imposta il valore predefinito dell'uniforme shader per istanza nell'elemento "
+"canvas specificato. Equivale a [method CanvasItem."
+"set_instance_shader_parameter]."
+
 msgid ""
 "If [param interpolated] is [code]true[/code], turns on physics interpolation "
 "for the canvas item."
@@ -107925,6 +128511,11 @@ msgstr ""
 "nell'interpolazione, il che è particolarmente utile per mondi vasti che "
 "utilizzano un'origine mobile."
 
+msgid ""
+"Attaches the canvas light to the canvas. Removes it from its previous canvas."
+msgstr ""
+"Associa una luce canvas al canvas. La rimuove dal suo canvas precedente."
+
 msgid ""
 "Creates a canvas light and adds it to the RenderingServer. It can be accessed "
 "with the RID that is returned. This RID will be used in all "
@@ -107940,6 +128531,12 @@ msgstr ""
 "[method free_rid] del RenderingServer.\n"
 "[b]Nota:[/b] Il nodo equivalente è [Light2D]."
 
+msgid ""
+"Attaches a light occluder to the canvas. Removes it from its previous canvas."
+msgstr ""
+"Associa un occlusore di luce a un'istanza. Lo rimuove dal suo canvas "
+"precedente."
+
 msgid ""
 "Creates a light occluder and adds it to the RenderingServer. It can be "
 "accessed with the RID that is returned. This RID will be used in all "
@@ -108086,6 +128683,19 @@ msgstr ""
 "Imposta l'intervallo Z degli oggetti che saranno influenzati da questa luce. "
 "Equivale a [member Light2D.range_z_min] e [member Light2D.range_z_max]."
 
+msgid ""
+"Transforms both the current and previous stored transform for a canvas "
+"light.\n"
+"This allows transforming a light without creating a \"glitch\" in the "
+"interpolation, which is particularly useful for large worlds utilizing a "
+"shifting origin."
+msgstr ""
+"Trasforma sia la trasformazione attuale che quella memorizzata in precedenza "
+"per una luce canvas.\n"
+"Ciò consente di trasformare una luce senza creare un \"glitch\" "
+"nell'interpolazione, il che è particolarmente utile per mondi vasti che "
+"utilizzano un'origine mobile."
+
 msgid ""
 "Creates a new light occluder polygon and adds it to the RenderingServer. It "
 "can be accessed with the RID that is returned. This RID will be used in all "
@@ -108249,6 +128859,19 @@ msgstr ""
 "[param effects] dovrebbe essere un array contenente i RID creati con [method "
 "compositor_effect_create]."
 
+msgid ""
+"Creates a RenderingDevice that can be used to do draw and compute operations "
+"on a separate thread. Cannot draw to the screen nor share data with the "
+"global RenderingDevice.\n"
+"[b]Note:[/b] When using the OpenGL rendering driver or when running in "
+"headless mode, this function always returns [code]null[/code]."
+msgstr ""
+"Crea un RenderingDevice che può essere utilizzato per disegnare e calcolare "
+"operazioni su un thread separato. Non può disegnare sullo schermo né "
+"condividere dati con il RenderingDevice globale.\n"
+"[b]Nota:[/b] Quando si utilizza il backend OpenGL o quando si esegue in "
+"modalità headless, questa funzione restituisce sempre [code]null[/code]."
+
 msgid ""
 "Returns the bounding rectangle for a canvas item in local space, as "
 "calculated by the renderer. This bound is used internally for culling.\n"
@@ -108450,6 +129073,9 @@ msgstr ""
 msgid "Sets the intensity of the background color."
 msgstr "Imposta l'intensità del colore di sfondo."
 
+msgid "Sets the camera ID to be used as environment background."
+msgstr "L'ID del feed della telecamera da usare come sfondo dell'ambiente."
+
 msgid "Sets the maximum layer to use if using Canvas background mode."
 msgstr ""
 "Imposta il livello massimo da usare se la modalità di sfondo Canvas è "
@@ -108529,6 +129155,14 @@ msgstr ""
 "a [member Environment.sky_rotation], dove il vettore di rotazione è "
 "utilizzato per costruire la [Basis]."
 
+msgid ""
+"Sets the variables to be used with the screen-space ambient occlusion (SSAO) "
+"post-process effect. See [Environment] for more details."
+msgstr ""
+"Imposta le variabili da usare con l'effetto di post-elaborazione "
+"dell'occlusione ambientale nello spazio dello schermo (SSAO). Vedi "
+"[Environment] per ulteriori dettagli."
+
 msgid ""
 "Sets the quality level of the screen-space ambient occlusion (SSAO) post-"
 "process effect. See [Environment] for more details."
@@ -108545,6 +129179,20 @@ msgstr ""
 "indiretta dello spazio dello schermo (SSIL). Vedi [Environment] per maggiori "
 "dettagli."
 
+msgid ""
+"Sets the variables to be used with the screen-space reflections (SSR) post-"
+"process effect. See [Environment] for more details."
+msgstr ""
+"Imposta le variabili da usare con l'effetto di post-elaborazione dei riflessi "
+"nello spazio dello schermo (SSR). Vedi [Environment] per ulteriori dettagli."
+
+msgid ""
+"Sets the variables to be used with the \"tonemap\" post-process effect. See "
+"[Environment] for more details."
+msgstr ""
+"Imposta le variabili da usare con l'effetto di post-elaborazione \"tonemap\". "
+"Vedi [Environment] per ulteriori dettagli."
+
 msgid ""
 "Sets the variables to be used with the volumetric fog post-process effect. "
 "See [Environment] for more details."
@@ -108663,6 +129311,16 @@ msgstr ""
 "viewport_set_measure_render_time] sia abilitato su una viewport. Vedi anche "
 "[method viewport_get_measured_render_time_cpu]."
 
+msgid ""
+"Returns the global RenderingDevice.\n"
+"[b]Note:[/b] When using the OpenGL rendering driver or when running in "
+"headless mode, this function always returns [code]null[/code]."
+msgstr ""
+"Restituisce il RenderingDevice globale.\n"
+"[b]Nota:[/b] Quando si utilizza il driver di rendering OpenGL o quando si "
+"esegue in modalità headless, questa funzione restituisce sempre [code]null[/"
+"code]."
+
 msgid ""
 "Returns a statistic about the rendering engine which can be used for "
 "performance profiling. See [enum RenderingServer.RenderingInfo] for a list of "
@@ -108716,6 +129374,33 @@ msgstr ""
 "alla prima chiamata a [method get_test_cube], quindi sarà memorizzata nella "
 "cache per le chiamate successive. Vedi anche [method make_sphere_mesh]."
 
+msgid ""
+"Returns the RID of a 256×256 texture with a testing pattern on it (in "
+"[constant Image.FORMAT_RGB8] format). This texture will be created and "
+"returned on the first call to [method get_test_texture], then it will be "
+"cached for subsequent calls. See also [method get_white_texture].\n"
+"[b]Example:[/b] Get the test texture and apply it to a [Sprite2D] node:\n"
+"[codeblock]\n"
+"var texture_rid = RenderingServer.get_test_texture()\n"
+"var texture = ImageTexture.create_from_image(RenderingServer."
+"texture_2d_get(texture_rid))\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce il RID di una texture di dimensioni 256×256 contenente un motivo "
+"di prova (in formato [constant Image.FORMAT_RGB8]). Questa texture sarà "
+"creata e restituita alla prima chiamata a [method get_test_texture], quindi "
+"sarà memorizzata nella cache per le chiamate successive. Vedi anche [method "
+"get_white_texture].\n"
+"[b]Esempio:[/b] Ottieni la texture di prova e applicala a un nodo "
+"[Sprite2D]:\n"
+"[codeblock]\n"
+"var texture_rid = RenderingServer.get_test_texture()\n"
+"var texture = ImageTexture.create_from_image(RenderingServer."
+"texture_2d_get(texture_rid))\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the version of the graphics video adapter [i]currently in use[/i] (e."
 "g. \"1.2.189\" for Vulkan, \"3.3.0 NVIDIA 510.60.02\" for OpenGL). This "
@@ -108750,6 +129435,28 @@ msgstr ""
 "dal modello effettivo della GPU dell'utente). Ciò è per rendere più difficile "
 "lasciare impronte digitali."
 
+msgid ""
+"Returns the type of the video adapter. Since dedicated graphics cards from a "
+"given generation will [i]usually[/i] be significantly faster than integrated "
+"graphics made in the same generation, the device type can be used as a basis "
+"for automatic graphics settings adjustment. However, this is not always true, "
+"so make sure to provide users with a way to manually override graphics "
+"settings.\n"
+"[b]Note:[/b] When using the OpenGL rendering driver or when running in "
+"headless mode, this function always returns [constant RenderingDevice."
+"DEVICE_TYPE_OTHER]."
+msgstr ""
+"Restituisce il tipo della scheda video. Poiché le schede grafiche dedicate di "
+"una determinata generazione saranno [i]di solito[/i] notevolmente più veloci "
+"delle schede grafiche integrate realizzate nella stessa generazione, il tipo "
+"del dispositivo può essere utilizzato come base per regolare automaticamente "
+"le impostazioni grafiche. Tuttavia, questo non è sempre vero, quindi "
+"assicurati di fornire agli utenti un modo per sovrascrivere manualmente le "
+"impostazioni grafiche.\n"
+"[b]Nota:[/b] Quando si utilizza il driver di rendering OpenGL o quando si "
+"esegue in modalità headless, questa funzione restituisce sempre [constant "
+"RenderingDevice.DEVICE_TYPE_OTHER]."
+
 msgid ""
 "Returns the vendor of the video adapter (e.g. \"NVIDIA Corporation\").\n"
 "[b]Note:[/b] When running a headless or server binary, this function returns "
@@ -108760,6 +129467,31 @@ msgstr ""
 "[b]Nota:[/b] Quando si esegue un binario headless o server, questa funzione "
 "restituisce una stringa vuota."
 
+msgid ""
+"Returns the ID of a 4×4 white texture (in [constant Image.FORMAT_RGB8] "
+"format). This texture will be created and returned on the first call to "
+"[method get_white_texture], then it will be cached for subsequent calls. See "
+"also [method get_test_texture].\n"
+"[b]Example:[/b] Get the white texture and apply it to a [Sprite2D] node:\n"
+"[codeblock]\n"
+"var texture_rid = RenderingServer.get_white_texture()\n"
+"var texture = ImageTexture.create_from_image(RenderingServer."
+"texture_2d_get(texture_rid))\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce l'ID di una texture bianca di dimensioni 4×4 (nel formato "
+"[constant Image.FORMAT_RGB8]). Questa texture sarà creata e restituita alla "
+"prima chiamata a [method get_white_texture], quindi sarà memorizzata nella "
+"cache per le chiamate successive. Vedi anche [method get_test_texture].\n"
+"[b]Esempio:[/b] Ottieni la texture bianca e applicala a un nodo [Sprite2D]:\n"
+"[codeblock]\n"
+"var texture_rid = RenderingServer.get_white_texture()\n"
+"var texture = ImageTexture.create_from_image(RenderingServer."
+"texture_2d_get(texture_rid))\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]"
+
 msgid ""
 "If [param half_resolution] is [code]true[/code], renders [VoxelGI] and SDFGI "
 "([member Environment.sdfgi_enabled]) buffers at halved resolution on each "
@@ -108932,6 +129664,15 @@ msgstr ""
 "[method free_rid] del RenderingServer. Questo è un'abbreviazione per usare "
 "[method instance_create] e impostare manualmente la base e lo scenario."
 
+msgid ""
+"Prevents physics interpolation for the current physics tick.\n"
+"This is useful when moving an instance to a new location, to give an "
+"instantaneous change rather than interpolation from the previous location."
+msgstr ""
+"Impedisce l'interpolazione della fisica per il tick di fisica attuale.\n"
+"Ciò è utile quando si sposta un'istanza in una nuova posizione, per apportare "
+"una modifica istantanea anziché un'interpolazione dalla posizione precedente."
+
 msgid ""
 "Sets the world space transform of the instance. Equivalent to [member Node3D."
 "global_transform]."
@@ -109036,6 +129777,13 @@ msgid "Returns a mesh's surface's arrays for blend shapes."
 msgstr ""
 "Restituisce gli array della superficie di una mesh per le forme di fusione."
 
+msgid ""
+"Returns the stride of the attribute buffer for a mesh with given [param "
+"format]."
+msgstr ""
+"Restituisce il passo del buffer di attributi per una mesh con formato [param "
+"format]."
+
 msgid ""
 "Returns the stride of the combined normals and tangents for a mesh with given "
 "[param format]. Note importantly that, while normals and tangents are in the "
@@ -109151,6 +129899,17 @@ msgstr ""
 "Restituisce il [Transform2D] dell'istanza specificata. Da utilizzare quando "
 "la multimesh è impostata per utilizzare le trasformazioni 2D."
 
+msgid ""
+"Prevents physics interpolation for the specified instance during the current "
+"physics tick.\n"
+"This is useful when moving an instance to a new location, to give an "
+"instantaneous change rather than interpolation from the previous location."
+msgstr ""
+"Impedisce l'interpolazione per l'istanza specificata della fisica per il tick "
+"di fisica attuale.\n"
+"Ciò è utile quando si sposta un'istanza in una nuova posizione, per apportare "
+"una modifica istantanea anziché un'interpolazione dalla posizione precedente."
+
 msgid ""
 "Sets the color by which this instance will be modulated. Equivalent to "
 "[method MultiMesh.set_instance_color]."
@@ -109182,6 +129941,73 @@ msgstr ""
 "multimesh è utilizzato in 2D. Equivale a [method MultiMesh."
 "set_instance_transform_2d]."
 
+msgid ""
+"Set the entire data to use for drawing the [param multimesh] at once to "
+"[param buffer] (such as instance transforms and colors). [param buffer]'s "
+"size must match the number of instances multiplied by the per-instance data "
+"size (which depends on the enabled MultiMesh fields). Otherwise, an error "
+"message is printed and nothing is rendered. See also [method "
+"multimesh_get_buffer].\n"
+"The per-instance data size and expected data order is:\n"
+"[codeblock lang=text]\n"
+"2D:\n"
+"  - Position: 8 floats (8 floats for Transform2D)\n"
+"  - Position + Vertex color: 12 floats (8 floats for Transform2D, 4 floats "
+"for Color)\n"
+"  - Position + Custom data: 12 floats (8 floats for Transform2D, 4 floats of "
+"custom data)\n"
+"  - Position + Vertex color + Custom data: 16 floats (8 floats for "
+"Transform2D, 4 floats for Color, 4 floats of custom data)\n"
+"3D:\n"
+"  - Position: 12 floats (12 floats for Transform3D)\n"
+"  - Position + Vertex color: 16 floats (12 floats for Transform3D, 4 floats "
+"for Color)\n"
+"  - Position + Custom data: 16 floats (12 floats for Transform3D, 4 floats of "
+"custom data)\n"
+"  - Position + Vertex color + Custom data: 20 floats (12 floats for "
+"Transform3D, 4 floats for Color, 4 floats of custom data)\n"
+"[/codeblock]\n"
+"Instance transforms are in row-major order. Specifically:\n"
+"- For [Transform2D] the float-order is: [code](x.x, y.x, padding_float, "
+"origin.x, x.y, y.y, padding_float, origin.y)[/code].\n"
+"- For [Transform3D] the float-order is: [code](basis.x.x, basis.y.x, basis.z."
+"x, origin.x, basis.x.y, basis.y.y, basis.z.y, origin.y, basis.x.z, basis.y.z, "
+"basis.z.z, origin.z)[/code]."
+msgstr ""
+"Imposta tutti i dati da usare per disegnare la [param multimesh] in una volta "
+"sola su [param buffer] (come trasformazioni di istanza e colori). La "
+"dimensione di [param buffer] deve corrispondere al numero di istanze "
+"moltiplicato per la dimensione dei dati per istanza (che dipende dai campi "
+"abilitati per la MultiMesh). Altrimenti, viene stampato un messaggio di "
+"errore e niente viene renderizzato. Vedi anche [method "
+"multimesh_get_buffer].\n"
+"La dimensione dei dati per ogni istanza e l'ordine dei dati previsto sono:\n"
+"[codeblock lang=text]\n"
+"2D:\n"
+"  - Posizione: 8 float (8 float per Transform2D)\n"
+"  - Posizione + colore vertice: 12 float (8 float per Transform2D, 4 float "
+"per colore)\n"
+"  - Posizione + dati personalizzati: 12 float (8 float per Transform2D, 4 "
+"float di dati personalizzati)\n"
+"  - Posizione + colore vertice + dati personalizzati: 16 float (8 float per "
+"Transform2D, 4 float per colore, 4 float di dati personalizzati)\n"
+"3D:\n"
+"  - Posizione: 12 float (12 float per Transform3D)\n"
+"  - Posizione + colore vertice: 16 float (12 float per Transform3D, 4 float "
+"per colore)\n"
+"  - Posizione + dati personalizzati: 16 float (12 float per Transform3D, 4 "
+"float di dati personalizzati)\n"
+"  - Posizione + colore vertice + dati personalizzati: 20 float (12 float per "
+"Transform3D, 4 float per Color, 4 float di dati personalizzati)\n"
+"[/codeblock]\n"
+"Le trasformazioni di istanza sono in ordine di riga maggiore. In "
+"particolare:\n"
+"- Per [Transform2D] l'ordine dei float è: [code](x.x, y.x, padding_float, "
+"origin.x, x.y, y.y, padding_float, origin.y)[/code].\n"
+"- Per [Transform3D] l'ordine dei float è: [code](basis.x.x, basis.y.x, basis."
+"z.x, origin.x, basis.x.y, basis.y.y, basis.z.y, origin.y, basis.x.z, basis.y."
+"z, basis.z.z, origin.z)[/code]."
+
 msgid "Sets the custom AABB for this MultiMesh resource."
 msgstr "Imposta l'AABB personalizzato per questa risorsa MultiMesh."
 
@@ -109192,6 +130018,10 @@ msgstr ""
 "Imposta la mesh da utilizzare per la multimesh. Equivale a [member MultiMesh."
 "mesh]."
 
+msgid "Turns on and off physics interpolation for this MultiMesh resource."
+msgstr ""
+"Attiva e disattiva l'interpolazione della fisica per questa risorsa MultiMesh."
+
 msgid ""
 "Sets the number of instances visible at a given time. If -1, all instances "
 "that have been allocated are drawn. Equivalent to [member MultiMesh."
@@ -109259,6 +130089,16 @@ msgstr ""
 "[b]Nota:[/b] I nodi equivalenti sono [GPUParticlesCollision3D] e "
 "[GPUParticlesAttractor3D]."
 
+msgid ""
+"Requests an update for the 3D GPU particle collision heightfield. This may be "
+"automatically called by the 3D GPU particle collision heightfield depending "
+"on its [member GPUParticlesCollisionHeightField3D.update_mode]."
+msgstr ""
+"Richiede un aggiornamento per l'heightfield di una collisione di particelle "
+"GPU 3D. Questo può essere chiamato automaticamente dall'heightfield di una "
+"collisione di particelle GPU 3D a seconda del suo [member "
+"GPUParticlesCollisionHeightField3D.update_mode]."
+
 msgid ""
 "Sets the attenuation [param curve] for the 3D GPU particles attractor "
 "specified by the [param particles_collision] RID. Only used for attractors, "
@@ -109337,6 +130177,26 @@ msgstr ""
 "GPUParticlesAttractorVectorField3D.texture] a seconda del tipo di [param "
 "particles_collision]."
 
+msgid ""
+"Sets the heightfield [param mask] for the 3D GPU particles heightfield "
+"collision specified by the [param particles_collision] RID. Equivalent to "
+"[member GPUParticlesCollisionHeightField3D.heightfield_mask]."
+msgstr ""
+"Imposta la maschera dell'heightmap per la collisione heightfield delle "
+"particelle GPU 3D specificata dal RID [param antibodies_collision] su [param "
+"mask]. Equivale a [member GPUParticlesCollisionHeightField3D."
+"heightfield_mask]."
+
+msgid ""
+"Sets the heightmap [param resolution] for the 3D GPU particles heightfield "
+"collision specified by the [param particles_collision] RID. Equivalent to "
+"[member GPUParticlesCollisionHeightField3D.resolution]."
+msgstr ""
+"Imposta la risoluzione dell'heightmap per la collisione heightfield delle "
+"particelle GPU 3D specificata dal RID [param antibodies_collision] su [param "
+"resolution]. Equivale a [member GPUParticlesCollisionHeightField3D."
+"resolution]."
+
 msgid ""
 "Sets the [param radius] for the 3D GPU particles sphere collision or "
 "attractor specified by the [param particles_collision] RID. Equivalent to "
@@ -109479,6 +130339,15 @@ msgstr ""
 "Imposta la velocità di un nodo particelle, che sarà utilizzata da [member "
 "ParticleProcessMaterial.inherit_velocity_ratio]."
 
+msgid ""
+"If [code]true[/code], particles will emit over time. Setting to [code]false[/"
+"code] does not reset the particles, but only stops their emission. Equivalent "
+"to [member GPUParticles3D.emitting]."
+msgstr ""
+"Se [code]true[/code], le particelle saranno emesse nel tempo. Impostandolo su "
+"[code]false[/code] non si riavviano le particelle, ma si interrompe solo la "
+"loro emissione. Equivale a [member GPUParticles3D.emitting]."
+
 msgid ""
 "Sets the explosiveness ratio. Equivalent to [member GPUParticles3D."
 "explosiveness]."
@@ -109667,6 +130536,13 @@ msgstr ""
 "calcolo dei riflessi molto più lento. Equivale a [member ReflectionProbe."
 "enable_shadows]."
 
+msgid ""
+"Sets the intensity of the reflection probe. Intensity modulates the strength "
+"of the reflection. Equivalent to [member ReflectionProbe.intensity]."
+msgstr ""
+"Imposta l'intensità della sonda di riflessi. L'intensità modula la potenza "
+"del riflesso. Equivale a [member ReflectionProbe.intensity]."
+
 msgid ""
 "Sets the max distance away from the probe an object can be before it is "
 "culled. Equivalent to [member ReflectionProbe.max_distance]."
@@ -109778,6 +130654,21 @@ msgstr ""
 "riserva è utilizzato se nessun ambiente è impostato. Internamente, questo è "
 "utilizzato dall'editor per fornire un ambiente predefinito."
 
+msgid ""
+"Sets the screen-space roughness limiter parameters, such as whether it should "
+"be enabled and its thresholds. Equivalent to [member ProjectSettings."
+"rendering/anti_aliasing/screen_space_roughness_limiter/enabled], [member "
+"ProjectSettings.rendering/anti_aliasing/screen_space_roughness_limiter/"
+"amount] and [member ProjectSettings.rendering/anti_aliasing/"
+"screen_space_roughness_limiter/limit]."
+msgstr ""
+"Imposta i parametri del limitatore di ruvidità nello spazio dello schermo, ad "
+"esempio se deve essere abilitato e le sue soglie. Equivale a [member "
+"ProjectSettings.rendering/anti_aliasing/screen_space_roughness_limiter/"
+"enabled], [member ProjectSettings.rendering/anti_aliasing/"
+"screen_space_roughness_limiter/amount] e [member ProjectSettings.rendering/"
+"anti_aliasing/screen_space_roughness_limiter/limit]."
+
 msgid ""
 "Sets a boot image. The color defines the background color. If [param scale] "
 "is [code]true[/code], the image will be scaled to fit the screen size. If "
@@ -109942,6 +130833,27 @@ msgstr ""
 "che crea la risorsa [Texture2D] specifica di Godot a differenza del tipo "
 "texture dell'API grafica."
 
+msgid ""
+"Returns an [Image] instance from the given [param texture] [RID].\n"
+"[b]Example:[/b] Get the test texture from [method get_test_texture] and apply "
+"it to a [Sprite2D] node:\n"
+"[codeblock]\n"
+"var texture_rid = RenderingServer.get_test_texture()\n"
+"var texture = ImageTexture.create_from_image(RenderingServer."
+"texture_2d_get(texture_rid))\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce un'istanza [Image] dal [RID] [param texture] specificato.\n"
+"[b]Esempio:[/b] Ottieni la texture di prova da [method get_test_texture] e "
+"applicala a un nodo [Sprite2D]:\n"
+"[codeblock]\n"
+"var texture_rid = RenderingServer.get_test_texture()\n"
+"var texture = ImageTexture.create_from_image(RenderingServer."
+"texture_2d_get(texture_rid))\n"
+"$Sprite2D.texture = texture\n"
+"[/codeblock]"
+
 msgid ""
 "Returns an [Image] instance from the given [param texture] [RID] and [param "
 "layer]."
@@ -109956,13 +130868,48 @@ msgid ""
 "RenderingServer's [method free_rid] method.\n"
 "[b]Note:[/b] The equivalent resource is [TextureLayered]."
 msgstr ""
-"Crea una texture livellata bidimensionale e la aggiunge al RenderingServer. È "
-"possibile accedervi con il RID restituito. Questo RID sarà utilizzato in "
-"tutte le funzioni [code]texture_2d_layered_*[/code] del RenderingServer.\n"
+"Crea una texture multilivello bidimensionale e la aggiunge al "
+"RenderingServer. È possibile accedervi con il RID restituito. Questo RID sarà "
+"utilizzato in tutte le funzioni [code]texture_2d_layered_*[/code] del "
+"RenderingServer.\n"
 "Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
 "[method free_rid] del RenderingServer.\n"
 "[b]Nota:[/b] La risorsa equivalente è [TextureLayered]."
 
+msgid ""
+"Creates a placeholder for a 2-dimensional layered texture and adds it to the "
+"RenderingServer. It can be accessed with the RID that is returned. This RID "
+"will be used in all [code]texture_2d_layered_*[/code] RenderingServer "
+"functions, although it does nothing when used. See also [method "
+"texture_2d_placeholder_create].\n"
+"[b]Note:[/b] The equivalent resource is [PlaceholderTextureLayered]."
+msgstr ""
+"Crea un segnaposto per una texture multilivello bidimensionale e la aggiunge "
+"al RenderingServer. È possibile accedervi con il RID restituito. Questo RID "
+"sarà utilizzato in tutte le funzioni [code]texture_2d_layered_*[/code] del "
+"RenderingServer, anche se non fa nulla quando viene usato. Vedi anche [method "
+"texture_2d_placeholder_create].\n"
+"[b]Nota:[/b] La risorsa equivalente è [PlaceholderTextureLayered]."
+
+msgid ""
+"Creates a placeholder for a 2-dimensional layered texture and adds it to the "
+"RenderingServer. It can be accessed with the RID that is returned. This RID "
+"will be used in all [code]texture_2d_layered_*[/code] RenderingServer "
+"functions, although it does nothing when used. See also [method "
+"texture_2d_layered_placeholder_create].\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingServer's [method free_rid] method.\n"
+"[b]Note:[/b] The equivalent resource is [PlaceholderTexture2D]."
+msgstr ""
+"Crea un segnaposto per una texture multilivello bidimensionale e la aggiunge "
+"al RenderingServer. È possibile accedervi con il RID restituito. Questo RID "
+"sarà utilizzato in tutte le funzioni [code]texture_2d_layered_*[/code] del "
+"RenderingServer, anche se non fa nulla quando viene usato. Vedi anche [method "
+"texture_2d_layered_placeholder_create].\n"
+"Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
+"[method free_rid] del RenderingServer.\n"
+"[b]Nota:[/b] La risorsa equivalente è [PlaceholderTexture2D]."
+
 msgid ""
 "Creates a placeholder for a 3-dimensional texture and adds it to the "
 "RenderingServer. It can be accessed with the RID that is returned. This RID "
@@ -110006,6 +130953,49 @@ msgstr ""
 "Se [code]true[/code], imposta la viewport come attiva, altrimenti la imposta "
 "come inattiva."
 
+msgid ""
+"Sets the maximum number of samples to take when using anisotropic filtering "
+"on textures (as a power of two). A higher sample count will result in sharper "
+"textures at oblique angles, but is more expensive to compute. A value of "
+"[code]0[/code] forcibly disables anisotropic filtering, even on materials "
+"where it is enabled.\n"
+"The anisotropic filtering level also affects decals and light projectors if "
+"they are configured to use anisotropic filtering. See [member ProjectSettings."
+"rendering/textures/decals/filter] and [member ProjectSettings.rendering/"
+"textures/light_projectors/filter].\n"
+"[b]Note:[/b] In 3D, for this setting to have an effect, set [member "
+"BaseMaterial3D.texture_filter] to [constant BaseMaterial3D."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] or [constant BaseMaterial3D."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] on materials.\n"
+"[b]Note:[/b] In 2D, for this setting to have an effect, set [member "
+"CanvasItem.texture_filter] to [constant CanvasItem."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] or [constant CanvasItem."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] on the [CanvasItem] node "
+"displaying the texture (or in [CanvasTexture]). However, anisotropic "
+"filtering is rarely useful in 2D, so only enable it for textures in 2D if it "
+"makes a meaningful visual difference."
+msgstr ""
+"Imposta il numero massimo di campioni da ricavare quando si usa il filtro "
+"anisotropico sulle texture (come potenza di due). Un numero di campioni più "
+"alto produrrà texture più nitide ad angoli obliqui, ma è più costoso da "
+"calcolare. Un valore di [code]0[/code] disabilita forzatamente il filtro "
+"anisotropico, anche sui materiali in cui è abilitato.\n"
+"Il livello di filtro anisotropico influisce anche su decalcomanie e "
+"proiettori di luce se sono configurati per usare il filtro anisotropico. Vedi "
+"[member rendering/textures/decals/filter] e [member rendering/textures/"
+"light_projectors/filter].\n"
+"[b]Nota:[/b] In 3D, per fare in modo che questa impostazione abbia effetto, "
+"imposta [member BaseMaterial3D.texture_filter] su [constant BaseMaterial3D."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] o [constant BaseMaterial3D."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] sui materiali.\n"
+"[b]Nota:[/b] In 2D, per fare in modo che questa impostazione abbia effetto, "
+"imposta [member CanvasItem.texture_filter] su [constant CanvasItem."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] o [constant CanvasItem."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] sul nodo [CanvasItem] che "
+"visualizza la texture (o in [CanvasTexture]). Tuttavia, il filtro "
+"anisotropico è raramente utile in 2D, quindi abilitalo per le texture in 2D "
+"solo se produce una notevole differenza visiva."
+
 msgid ""
 "Sets the clear mode of a viewport. See [enum ViewportClearMode] for options."
 msgstr ""
@@ -110057,13 +131047,88 @@ msgstr ""
 msgid "Sets the viewport's width and height in pixels."
 msgstr "Imposta la larghezza e l'altezza del viewport in pixel."
 
+msgid ""
+"If [code]true[/code], enables debanding on the specified viewport. Equivalent "
+"to [member ProjectSettings.rendering/anti_aliasing/quality/use_debanding] or "
+"[member Viewport.use_debanding]."
+msgstr ""
+"Se [code]true[/code], abilita il debanding sulla viewport specificata. "
+"Equivale a [member ProjectSettings.rendering/anti_aliasing/quality/"
+"use_debanding] o [member Viewport.use_debanding]."
+
+msgid ""
+"If [code]true[/code], 2D rendering will use a high dynamic range (HDR) format "
+"framebuffer matching the bit depth of the 3D framebuffer. When using the "
+"Forward+ renderer this will be an [code]RGBA16[/code] framebuffer, while when "
+"using the Mobile renderer it will be an [code]RGB10_A2[/code] framebuffer. "
+"Additionally, 2D rendering will take place in linear color space and will be "
+"converted to sRGB space immediately before blitting to the screen (if the "
+"Viewport is attached to the screen). Practically speaking, this means that "
+"the end result of the Viewport will not be clamped into the [code]0-1[/code] "
+"range and can be used in 3D rendering without color space adjustments. This "
+"allows 2D rendering to take advantage of effects requiring high dynamic range "
+"(e.g. 2D glow) as well as substantially improves the appearance of effects "
+"requiring highly detailed gradients. This setting has the same effect as "
+"[member Viewport.use_hdr_2d].\n"
+"[b]Note:[/b] This setting will have no effect when using the Compatibility "
+"renderer, which always renders in low dynamic range for performance reasons."
+msgstr ""
+"Se [code]true[/code], il rendering 2D utilizzerà un framebuffer in formato "
+"HDR (High Dynamic Range, o \"alta gamma dinamica\") corrispondente alla "
+"profondità di bit del framebuffer 3D. Quando si utilizza il renderer "
+"Forward+, questo sarà un framebuffer [code]RGBA16[/code], mentre quando si "
+"utilizza il renderer Mobile, sarà un framebuffer [code]RGB10_A2[/code]. "
+"Inoltre, il rendering 2D avverrà nello spazio colore lineare e sarà "
+"convertito nello spazio sRGB subito prima di essere visualizzato sullo "
+"schermo (se la Viewport è collegata allo schermo). In pratica, ciò significa "
+"che il risultato finale della Viewport non sarà limitato nell'intervallo "
+"[code]0-1[/code] e potrà essere utilizzato nel rendering 3D senza aggiustare "
+"lo spazio colore. Ciò consente al rendering 2D di sfruttare gli effetti che "
+"richiedono un'elevata gamma dinamica (ad esempio, il bagliore 2D) e migliora "
+"sostanzialmente l'aspetto degli effetti che richiedono gradienti molto "
+"dettagliati. Questa impostazione ha lo stesso effetto di [member Viewport."
+"use_hdr_2d].\n"
+"[b]Nota:[/b] Questa impostazione non avrà alcun effetto quando si utilizza il "
+"renderer di Compatibilità, il quale renderizza sempre in una gamma dinamica "
+"bassa per motivi di prestazioni."
+
+msgid ""
+"If [code]true[/code], use temporal antialiasing. Equivalent to [member "
+"ProjectSettings.rendering/anti_aliasing/quality/use_taa] or [member Viewport."
+"use_taa]."
+msgstr ""
+"Se [code]true[/code], abilita l'antialiasing temporale. Equivale a [member "
+"ProjectSettings.rendering/anti_aliasing/quality/use_taa] o [member Viewport."
+"use_taa]."
+
 msgid ""
 "If [code]true[/code], the viewport uses augmented or virtual reality "
 "technologies. See [XRInterface]."
 msgstr ""
-"Se [code]true[/code], il viewport utilizza tecnologie di realtà aumentata o "
+"Se [code]true[/code], la viewport utilizza tecnologie di realtà aumentata o "
 "virtuale. Vedi [XRInterface]."
 
+msgid ""
+"Creates a new 3D visibility notifier object and adds it to the "
+"RenderingServer. It can be accessed with the RID that is returned. This RID "
+"will be used in all [code]visibility_notifier_*[/code] RenderingServer "
+"functions.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingServer's [method free_rid] method.\n"
+"To place in a scene, attach this notifier to an instance using [method "
+"instance_set_base] using the returned RID.\n"
+"[b]Note:[/b] The equivalent node is [VisibleOnScreenNotifier3D]."
+msgstr ""
+"Crea un nuovo notificatore di visibilità 3D e lo aggiunge al RenderingServer. "
+"È possibile accedervi con il RID restituito. Questo RID può essere utilizzato "
+"nella maggior parte delle funzioni [code]visibility_notifier_*[/code] del "
+"RenderingServer.\n"
+"Una volta finito con il RID, si consiglia di liberarlo tramite il metodo "
+"[method free_rid] del RenderingServer.\n"
+"Per inserirlo in una scena, associa questo notificatore di visibilità a "
+"un'istanza tramite [method instance_set_base] utilizzando il RID restituito.\n"
+"[b]Nota:[/b] Il nodo equivalente è [VisibleOnScreenNotifier3D]."
+
 msgid ""
 "Creates a new voxel-based global illumination object and adds it to the "
 "RenderingServer. It can be accessed with the RID that is returned. This RID "
@@ -110080,6 +131145,13 @@ msgstr ""
 "[method free_rid] del RenderingServer.\n"
 "[b]Nota:[/b] Il nodo equivalente è [VoxeGI]."
 
+msgid ""
+"Sets the [member VoxelGIData.use_two_bounces] value to use on the specified "
+"[param voxel_gi]'s [RID]."
+msgstr ""
+"Imposta il valore di [member VoxelGIData.use_two_bounces] da utilizzare sul "
+"[RID] del [param voxel_gi] specificato."
+
 msgid ""
 "If [code]false[/code], disables rendering completely, but the engine logic is "
 "still being processed. You can call [method force_draw] to draw a frame even "
@@ -110103,6 +131175,9 @@ msgstr ""
 "Emesso alla all'inizio del frame, prima che il RenderingServer aggiorni tutte "
 "le Viewport."
 
+msgid "Marks an error that shows that the index array is empty."
+msgstr "Segnala un errore che indica che l'array degli indici è vuoto."
+
 msgid "Number of weights/bones per vertex."
 msgstr "Numero di pesi/ossa per vertice."
 
@@ -110132,6 +131207,15 @@ msgstr ""
 msgid "The maximum number of surfaces a mesh can have."
 msgstr "Il numero massimo di superfici che può avere una mesh."
 
+msgid "2D texture."
+msgstr "Texture 2D."
+
+msgid "Layered texture."
+msgstr "Texture multilivello."
+
+msgid "3D texture."
+msgstr "Texture 3D."
+
 msgid "Array of 2-dimensional textures (see [Texture2DArray])."
 msgstr "Array di texture bidimensionali (vedi [Texture2DArray])."
 
@@ -110568,6 +131652,12 @@ msgstr ""
 msgid "The light's attenuation."
 msgstr "L'attenuazione della luce."
 
+msgid "The spotlight's angle."
+msgstr "L'angolazione del riflettore."
+
+msgid "The spotlight's attenuation."
+msgstr "L'attenuazione del riflettore."
+
 msgid "Proportion of shadow atlas occupied by the first split."
 msgstr "Proporzione dell'atlante delle ombre occupata dalla prima divisione."
 
@@ -110586,6 +131676,19 @@ msgid ""
 msgstr ""
 "Proporzione della distanza massima dell'ombra in cui inizierà a svanire."
 
+msgid ""
+"Normal bias used to offset shadow lookup by object normal. Can be used to fix "
+"self-shadowing artifacts."
+msgstr ""
+"Bias normale usato per compensare la ricerca delle ombre per la normale "
+"dell'oggetto. Può essere utilizzato per correggere gli artefatti di auto-"
+"ombreggiatura."
+
+msgid "Bias the shadow lookup to fix self-shadowing artifacts."
+msgstr ""
+"Il bias della ricerca delle ombre per correggere gli artefatti di auto-"
+"ombreggiatura."
+
 msgid ""
 "The light's shadow opacity. Values lower than [code]1.0[/code] make the light "
 "appear through shadows. This can be used to fake global illumination at a low "
@@ -110963,12 +132066,113 @@ msgstr ""
 "nodo [FogVolume] per riorientare il cono. Le dimensioni non uniformi non sono "
 "supportate (cambia invece la scala del nodo [FogVolume])."
 
+msgid ""
+"[FogVolume] will be shaped like an upright cylinder (in local coordinates). "
+"Rotate the [FogVolume] node to reorient the cylinder. The cylinder will be "
+"adjusted to fit within the size. Non-uniform scaling via size is not "
+"supported (scale the [FogVolume] node instead)."
+msgstr ""
+"[FogVolume] avrà la forma di un cilindro verticale (in coordinate locali). "
+"Ruota il nodo [FogVolume] per riorientare il cilindro. Il cilindro sarà "
+"regolato per adattarsi alle dimensioni. Le dimensioni non uniformi non sono "
+"supportate (cambia invece la scala del nodo [FogVolume])."
+
 msgid "[FogVolume] will be shaped like a box."
-msgstr "Il [FogVolume] avrà la forma di una scatola."
+msgstr "[FogVolume] avrà la forma di una scatola."
+
+msgid ""
+"[FogVolume] will have no shape, will cover the whole world and will not be "
+"culled."
+msgstr ""
+"[FogVolume] non avrà forma, coprirà il mondo intero e non sarà influenzato "
+"dal culling."
 
 msgid "Represents the size of the [enum FogVolumeShape] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum FogVolumeShape]."
 
+msgid ""
+"Use bilinear scaling for the viewport's 3D buffer. The amount of scaling can "
+"be set using [member Viewport.scaling_3d_scale]. Values less than [code]1.0[/"
+"code] will result in undersampling while values greater than [code]1.0[/code] "
+"will result in supersampling. A value of [code]1.0[/code] disables scaling."
+msgstr ""
+"Utilizza il ridimensionamento bilineare per il buffer 3D della viewport. La "
+"quantità di ridimensionamento può essere impostata tramite [member "
+"scaling_3d_scale]. I valori inferiori a [code]1.0[/code] risulteranno in un "
+"sottocampionamento mentre i valori superiori a [code]1.0[/code] risulteranno "
+"in sovracampionamento. Un valore di [code]1.0[/code] disabilita il "
+"ridimensionamento."
+
+msgid ""
+"Use AMD FidelityFX Super Resolution 1.0 upscaling for the viewport's 3D "
+"buffer. The amount of scaling can be set using [member Viewport."
+"scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the "
+"viewport being upscaled using FSR. Values greater than [code]1.0[/code] are "
+"not supported and bilinear downsampling will be used instead. A value of "
+"[code]1.0[/code] disables scaling."
+msgstr ""
+"Utilizza l'upscaling AMD FidelityFX Super Resolution 1.0 per il buffer 3D "
+"della viewport. La quantità di ridimensionamento può essere impostata tramite "
+"[member scaling_3d_scale]. I valori inferiori a [code]1.0[/code] risulteranno "
+"nell'upscaling della viewport tramite FSR. I valori superiori a [code]1.0[/"
+"code] non sono supportati e sarà invece utilizzato il sottocampionamento "
+"bilineare. Un valore di [code]1.0[/code] disabilita il ridimensionamento."
+
+msgid ""
+"Use AMD FidelityFX Super Resolution 2.2 upscaling for the viewport's 3D "
+"buffer. The amount of scaling can be set using [member Viewport."
+"scaling_3d_scale]. Values less than [code]1.0[/code] will be result in the "
+"viewport being upscaled using FSR2. Values greater than [code]1.0[/code] are "
+"not supported and bilinear downsampling will be used instead. A value of "
+"[code]1.0[/code] will use FSR2 at native resolution as a TAA solution."
+msgstr ""
+"Utilizza l'upscaling AMD FidelityFX Super Resolution 2.2 per il buffer 3D "
+"della viewport. La quantità di ridimensionamento può essere impostata tramite "
+"[member scaling_3d_scale]. I valori inferiori a [code]1.0[/code] risulteranno "
+"nell'upscaling della viewport tramite FSR2. I valori superiori a [code]1.0[/"
+"code] non sono supportati e sarà invece utilizzato il sottocampionamento "
+"bilineare. Un valore di [code]1.0[/code] userà FSR2 alla risoluzione nativa "
+"come soluzione TAA."
+
+msgid ""
+"Use MetalFX spatial upscaling for the viewport's 3D buffer. The amount of "
+"scaling can be set using [member Viewport.scaling_3d_scale]. Values less than "
+"[code]1.0[/code] will be result in the viewport being upscaled using MetalFX. "
+"Values greater than [code]1.0[/code] are not supported and bilinear "
+"downsampling will be used instead. A value of [code]1.0[/code] disables "
+"scaling.\n"
+"[b]Note:[/b] Only supported when the Metal rendering driver is in use, which "
+"limits this scaling mode to macOS and iOS."
+msgstr ""
+"Utilizza l'upscaling MetalFX spaziale per il buffer 3D della viewport. La "
+"quantità di ridimensionamento può essere impostata tramite [member "
+"scaling_3d_scale]. I valori inferiori a [code]1.0[/code] risulteranno in un "
+"upscaling della viewport tramite MetalFX. I valori superiori a [code]1.0[/"
+"code] non sono supportati e sarà invece utilizzato il sottocampionamento "
+"bilineare. Un valore di [code]1.0[/code] disabilita il ridimensionamento.\n"
+"[b]Nota:[/b] Supportato solo quando è in uso il driver di rendering Metal, il "
+"che limita questa modalità di ridimensionamento a macOS e iOS."
+
+msgid ""
+"Use MetalFX temporal upscaling for the viewport's 3D buffer. The amount of "
+"scaling can be set using [member Viewport.scaling_3d_scale]. Values less than "
+"[code]1.0[/code] will be result in the viewport being upscaled using MetalFX. "
+"Values greater than [code]1.0[/code] are not supported and bilinear "
+"downsampling will be used instead. A value of [code]1.0[/code] will use "
+"MetalFX at native resolution as a TAA solution.\n"
+"[b]Note:[/b] Only supported when the Metal rendering driver is in use, which "
+"limits this scaling mode to macOS and iOS."
+msgstr ""
+"Utilizza l'upscaling MetalFX temporale per il buffer 3D della viewport. La "
+"quantità di ridimensionamento può essere impostata tramite [member "
+"scaling_3d_scale]. I valori inferiori a [code]1.0[/code] risulteranno in un "
+"upscaling della viewport tramite MetalFX. I valori superiori a [code]1.0[/"
+"code] non sono supportati e sarà invece utilizzato il sottocampionamento "
+"bilineare. Un valore di [code]1.0[/code] userà MetalFX alla risoluzione "
+"nativa come soluzione TAA.\n"
+"[b]Nota:[/b] Supportato solo quando è in uso il driver di rendering Metal, il "
+"che limita questa modalità di ridimensionamento a macOS e iOS."
+
 msgid "Represents the size of the [enum ViewportScaling3DMode] enum."
 msgstr ""
 "Rappresenta la dimensione dell'enumerazione [enum ViewportScaling3DMode]."
@@ -111128,6 +132332,26 @@ msgstr ""
 msgid "Represents the size of the [enum ViewportMSAA] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum ViewportMSAA]."
 
+msgid "Anisotropic filtering is disabled."
+msgstr "Il filtro anisotropico è disabilitato."
+
+msgid "Use 2× anisotropic filtering."
+msgstr "Utilizza il filtro anisotropico 2×."
+
+msgid "Use 4× anisotropic filtering. This is the default value."
+msgstr "Utilizza il filtro anisotropico 4×. Questo è il valore predefinito."
+
+msgid "Use 8× anisotropic filtering."
+msgstr "Utilizza il filtro anisotropico 8×."
+
+msgid "Use 16× anisotropic filtering."
+msgstr "Utilizza il filtro anisotropico 16×."
+
+msgid "Represents the size of the [enum ViewportAnisotropicFiltering] enum."
+msgstr ""
+"Rappresenta la dimensione dell'enumerazione [enum "
+"ViewportAnisotropicFiltering]."
+
 msgid "Do not perform any antialiasing in the full screen post-process."
 msgstr ""
 "Non eseguire alcun antialiasing nella post-elaborazione dell'intero schermo."
@@ -111147,6 +132371,26 @@ msgid "Represents the size of the [enum ViewportScreenSpaceAA] enum."
 msgstr ""
 "Rappresenta la dimensione dell'enumerazione [enum ViewportScreenSpaceAA]."
 
+msgid ""
+"Low occlusion culling BVH build quality (as defined by Embree). Results in "
+"the lowest CPU usage, but least effective culling."
+msgstr ""
+"Bassa qualità di costruzione BVH con occlusion culling (come definito da "
+"Embree). Risulta nel più basso utilizzo della CPU, ma nel culling meno "
+"efficace."
+
+msgid "Medium occlusion culling BVH build quality (as defined by Embree)."
+msgstr ""
+"Media qualità di costruzione BVH con occlusion culling (come definito da "
+"Embree)."
+
+msgid ""
+"High occlusion culling BVH build quality (as defined by Embree). Results in "
+"the highest CPU usage, but most effective culling."
+msgstr ""
+"Alta qualità di costruzione BVH con occlusion culling (come definito da "
+"Embree). Risulta nel più alto utilizzo della CPU, ma nel culling più efficace."
+
 msgid "Number of objects drawn in a single frame."
 msgstr "Numero di oggetti disegnati in un singolo frame."
 
@@ -111555,6 +132799,18 @@ msgstr "Specifica un [Color] specifico per la luce ambientale."
 msgid "Disable reflections."
 msgstr "Disattiva i riflessi."
 
+msgid ""
+"Uses a high-contrast film-like tonemapping curve and desaturates bright "
+"values for a more realistic appearance. Slightly slower than [constant "
+"ENV_TONE_MAPPER_FILMIC].\n"
+"[b]Note:[/b] This tonemapping operator is called \"ACES Fitted\" in Godot 3.x."
+msgstr ""
+"Utilizza una curva di mappatura dei toni ad alto contrasto simile a quella di "
+"un film e desatura i valori luminosi per un aspetto più realistico. "
+"Leggermente più lento di [constant ENV_TONE_MAPPER_FILMIC].\n"
+"[b]Nota:[/b] Questo operatore di mappatura dei toni è chiamato \"ACES "
+"Fitted\" in Godot 3.x."
+
 msgid ""
 "Lowest quality of roughness filter for screen-space reflections. Rough "
 "materials will not have blurrier screen-space reflections compared to smooth "
@@ -111948,6 +133204,19 @@ msgid "Specular map canvas texture ([member CanvasTexture.specular_texture])."
 msgstr ""
 "Texture canvas di mappa speculare ([member CanvasTexture.specular_texture])."
 
+msgid "The nine patch gets stretched where needed."
+msgstr "Il nove-sezioni è esteso dove necessario."
+
+msgid "The nine patch gets filled with tiles where needed."
+msgstr "Il nove-toppe è riempito con piastrelle ripetute dove necessario."
+
+msgid ""
+"The nine patch gets filled with tiles where needed and stretches them a bit "
+"if needed."
+msgstr ""
+"Il nove-toppe è riempito con piastrelle ripetute dove necessario, e le "
+"estende un po' se necessario."
+
 msgid "Uses the default filter mode for this [Viewport]."
 msgstr "Utilizza la modalità predefinita di filtro per questa [Viewport]."
 
@@ -112274,6 +133543,15 @@ msgstr ""
 "uniform samplerCube ...[/code]). Esposto come [Cubemap] nell'interfaccia "
 "utente dell'editor."
 
+msgid ""
+"External sampler global shader parameter ([code]global uniform "
+"samplerExternalOES ...[/code]). Exposed as a [ExternalTexture] in the editor "
+"UI."
+msgstr ""
+"Tipo campionatore esterno per un parametro di shader globale ([code]global "
+"uniform samplerExternalOES ...[/code]). Esposto come [ExternalTexture] "
+"nell'interfaccia utente dell'editor."
+
 msgid "Represents the size of the [enum GlobalShaderParameterType] enum."
 msgstr ""
 "Rappresenta la dimensione dell'enumerazione [enum GlobalShaderParameterType]."
@@ -112309,6 +133587,26 @@ msgstr ""
 "Memoria utilizzata dei buffer (in byte). Include i dati di vertici, i buffer "
 "di uniformi e molti tipi di buffer vari utilizzati internamente."
 
+msgid ""
+"Video memory used (in bytes). When using the Forward+ or Mobile renderers, "
+"this is always greater than the sum of [constant "
+"RENDERING_INFO_TEXTURE_MEM_USED] and [constant "
+"RENDERING_INFO_BUFFER_MEM_USED], since there is miscellaneous data not "
+"accounted for by those two metrics. When using the Compatibility renderer, "
+"this is equal to the sum of [constant RENDERING_INFO_TEXTURE_MEM_USED] and "
+"[constant RENDERING_INFO_BUFFER_MEM_USED]."
+msgstr ""
+"Memoria video utilizzata (in byte). Quando si utilizzano i renderer Forward+ "
+"o Mobile, questo è sempre maggiore della somma di [constant "
+"RENDERING_INFO_TEXTURE_MEM_USED] e [constant RENDERING_INFO_BUFFER_MEM_USED], "
+"poiché ci sono dati vari non considerati da queste due metriche. Quando si "
+"utilizza il renderer di Compatibilità, questo è uguale alla somma di "
+"[constant RENDERING_INFO_TEXTURE_MEM_USED] e [constant "
+"RENDERING_INFO_BUFFER_MEM_USED]."
+
+msgid "Represents the size of the [enum PipelineSource] enum."
+msgstr "Rappresenta la dimensione dell'enumerazione [enum PipelineSource]."
+
 msgid "This constant has not been used since Godot 3.0."
 msgstr "Questa costante non è stata utilizzata a partire da Godot 3.0."
 
@@ -112328,8 +133626,8 @@ msgid ""
 msgstr ""
 "Oggetto astratto dei buffer di scena, creato per ogni viewport per cui viene "
 "eseguito il rendering 3D. Gestisce tutti i buffer aggiuntivi utilizzati "
-"durante il rendering e scarterà i buffer quando il viewport viene "
-"ridimensionato.\n"
+"durante il rendering e scarterà i buffer quando la viewport viene "
+"ridimensionata.\n"
 "[b]Nota:[/b] Questo è un oggetto interno nel server di rendering, non "
 "istanziarlo da script."
 
@@ -112399,6 +133697,11 @@ msgstr ""
 "Implementa questo metodo in GDExtension per gestire il (ri)dimensionamento di "
 "una viewport."
 
+msgid "Implement this in GDExtension to change the anisotropic filtering level."
+msgstr ""
+"Implementa questo metodo in GDExtension per cambiare il livello del filtro "
+"anisotropico."
+
 msgid "Implement this in GDExtension to record a new FSR sharpness value."
 msgstr ""
 "Implementa questo metodo in GDExtension per registrare un nuovo valore di "
@@ -112461,6 +133764,61 @@ msgstr ""
 "memorizza nella cache con il nome specificato. Restituirà la texture "
 "esistente se esiste già."
 
+msgid ""
+"Create a new texture view for an existing texture and cache this under the "
+"given [param view_name]. Will return the existing texture view if it already "
+"exists. Will error if the source texture doesn't exist."
+msgstr ""
+"Crea una nuova vista di texture per una texture esistente e la memorizza "
+"nella cache sotto il [param view_name] specificato. Restituirà la vista di "
+"texture esistente se esiste già. Genera un errore se la texture sorgente non "
+"esiste."
+
+msgid ""
+"Returns the specified layer from the color texture we are rendering 3D "
+"content to.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"Restituisce il livello specificato dalla texture di colore su cui stiamo "
+"renderizzando il contenuto 3D.\n"
+"Se [param msaa] è [code]true[/code] e il MSAA è abilitato, restituisce la "
+"variazione per il MSAA del buffer."
+
+msgid ""
+"Returns the color texture we are rendering 3D content to. If multiview is "
+"used this will be a texture array with all views.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"Restituisce la texture di colore su cui stiamo renderizzando il contenuto 3D. "
+"Se si utilizza multiview, esso sarà un array di texture con tutte le viste.\n"
+"Se [param msaa] è [code]true[/code] e il MSAA è abilitato, restituisce la "
+"variazione per il MSAA del buffer."
+
+msgid ""
+"Returns the specified layer from the depth texture we are rendering 3D "
+"content to.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"Restituisce il livello specificato dalla texture di profondità su cui stiamo "
+"renderizzando il contenuto 3D.\n"
+"Se [param msaa] è [code]true[/code] e il MSAA è abilitato, restituisce la "
+"variazione per il MSAA del buffer."
+
+msgid ""
+"Returns the depth texture we are rendering 3D content to. If multiview is "
+"used this will be a texture array with all views.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"Restituisce la texture di profondità su cui stiamo renderizzando il contenuto "
+"3D. Se si utilizza multiview, esso sarà un array di texture con tutte le "
+"viste.\n"
+"Se [param msaa] è [code]true[/code] e il MSAA è abilitato, restituisce la "
+"variazione per il MSAA del buffer."
+
 msgid ""
 "Returns the FSR sharpness value used while rendering the 3D content (if "
 "[method get_scaling_3d_mode] is an FSR mode)."
@@ -112551,7 +133909,7 @@ msgstr ""
 "variazione per il MSAA del buffer."
 
 msgid "Returns the view count for the associated viewport."
-msgstr "Restituisce il numero delle viste per il viewport associato."
+msgstr "Restituisce il numero delle viste per la viewport associata."
 
 msgid "Returns [code]true[/code] if a cached texture exists for this name."
 msgstr ""
@@ -112734,6 +134092,41 @@ msgstr ""
 "Sovrascrivi questo metodo per restituire un [RID] personalizzato quando viene "
 "chiamato [method get_rid]."
 
+msgid ""
+"Sets the resource's path to [param path] without involving the resource cache."
+msgstr ""
+"Imposta il percorso della risorsa su [param path] senza coinvolgere la cache "
+"delle risorse."
+
+msgid ""
+"Override this method to customize the newly duplicated resource created from "
+"[method PackedScene.instantiate], if the original's [member "
+"resource_local_to_scene] is set to [code]true[/code].\n"
+"[b]Example:[/b] Set a random [code]damage[/code] value to every local "
+"resource from an instantiated scene:\n"
+"[codeblock]\n"
+"extends Resource\n"
+"\n"
+"var damage = 0\n"
+"\n"
+"func _setup_local_to_scene():\n"
+"    damage = randi_range(10, 40)\n"
+"[/codeblock]"
+msgstr ""
+"Sovrascrivi questo metodo per personalizzare la risorsa appena duplicata "
+"creata da [method PackedScene.instantiate], se il [member "
+"resource_local_to_scene] dell'originale è impostato su [code]true[/code].\n"
+"[b]Esempio:[/b] Imposta un valore casuale di [code]damage[/code] per ogni "
+"risorsa locale da una scena istanziata.\n"
+"[codeblock]\n"
+"extends Resource\n"
+"\n"
+"var damage = 0\n"
+"\n"
+"func _setup_local_to_scene():\n"
+"    damage = randi_range(10, 40)\n"
+"[/codeblock]"
+
 msgid ""
 "Duplicates this resource, returning a new resource with its [code]export[/"
 "code]ed or [constant PROPERTY_USAGE_STORAGE] properties copied from the "
@@ -112837,6 +134230,13 @@ msgstr ""
 "memorizzate in un server specializzato ([DisplayServer], [RenderingServer], "
 "ecc.), quindi questa funzione restituirà il loro [RID] originale."
 
+msgid ""
+"Returns [code]true[/code] if the resource is built-in (from the engine) or "
+"[code]false[/code] if it is user-defined."
+msgstr ""
+"Restituisce [code]true[/code] se la risorsa è integrata (dal motore) o "
+"[code]false[/code] se è definita dall'utente."
+
 msgid "This method should only be called internally."
 msgstr "Questo metodo dovrebbe essere chiamato solo internamente."
 
@@ -113410,6 +134810,16 @@ msgstr ""
 "tentati per ultimi (vedi [member language_support] e [member "
 "script_support]). Vedi anche [member allow_system_fallback]."
 
+msgid ""
+"If [code]true[/code], forces generation of hinting data for the font using "
+"[url=https://freetype.org/]FreeType[/url]'s autohinter. This will make "
+"[member hinting] effective with fonts that don't include hinting data."
+msgstr ""
+"Se [code]true[/code], forza la generazione dei dati di hinting per il font "
+"tramite l'autohinter di [url=https://freetype.org/]FreeType[/url]. Questo "
+"renderà [member hinting] efficace con i font che non includono dati di "
+"hinting."
+
 msgid ""
 "If [code]true[/code], this font will have mipmaps generated. This prevents "
 "text from looking grainy when a [Control] is scaled down, or when a [Label3D] "
@@ -113676,6 +135086,39 @@ msgstr ""
 "[GPUParticlesAttractorVectorField3D]. Vedi anche [ResourceImporterTexture] e "
 "[ResourceImporterTextureAtlas]."
 
+msgid ""
+"Controls how color channels should be used in the imported texture.\n"
+"[b]sRGB Friendly:[/b], prevents the RG color format from being used, as it "
+"does not support sRGB color.\n"
+"[b]Optimized:[/b], allows the RG color format to be used if the texture does "
+"not use the blue channel. This reduces memory usage if the texture's blue "
+"channel can be discarded (all pixels must have a blue value of [code]0[/"
+"code]).\n"
+"[b]Normal Map (RG Channels):[/b] This forces all layers from the texture to "
+"be imported with the RG color format, with only the red and green channels "
+"preserved. RGTC (Red-Green Texture Compression) compression is able to "
+"preserve its detail much better, while using the same amount of memory as a "
+"standard RGBA VRAM-compressed texture. This only has an effect on textures "
+"with the VRAM Compressed or Basis Universal compression modes. This mode is "
+"only available in layered textures ([Cubemap], [CubemapArray], "
+"[Texture2DArray] and [Texture3D])."
+msgstr ""
+"Controlla come bisogna utilizzare i canali colore nella texture importata.\n"
+"[b]sRGB Friendly:[/b], impedisce l'uso del formato colore RG, poiché non "
+"supporta il colore sRGB.\n"
+"[b]Optimized:[/b], consente l'uso del formato colore RG se la texture non "
+"utilizza il canale blu. Ciò riduce l'utilizzo della memoria se il canale blu "
+"della texture può essere scartato (tutti i pixel devono avere un valore blu "
+"pari a [code]0[/code]).\n"
+"[b]Normal Map (RG Channels):[/b] Ciò forza l'importazione di tutti i livelli "
+"della texture con il formato colore RG, mantenendo solo i canali rosso e "
+"verde. La compressione RGTC (Red-Green Texture Compression) è in grado di "
+"preservare i dettagli molto meglio, utilizzando la stessa quantità di memoria "
+"di una texture RGBA standard compressa per la VRAM. Ciò ha effetto solo sulle "
+"texture con le modalità di compressione VRAM Compressed o Basis Universal. "
+"Questa modalità è disponibile solo nelle texture multilivello ([Cubemap], "
+"[CubemapArray], [Texture2DArray] e [Texture3D])."
+
 msgid ""
 "Controls how VRAM compression should be performed for HDR images.\n"
 "[b]Disabled:[/b] Never use VRAM compression for HDR textures, regardless of "
@@ -113850,6 +135293,48 @@ msgstr ""
 msgid "Importing audio samples"
 msgstr "Importazione di campioni audio"
 
+msgid ""
+"The number of bars within a single beat in the audio track. This is only "
+"relevant for music that wishes to make use of interactive music "
+"functionality, not sound effects.\n"
+"A more convenient editor for [member bar_beats] is provided in the "
+"[b]Advanced Import Settings[/b] dialog, as it lets you preview your changes "
+"without having to reimport the audio."
+msgstr ""
+"Il numero di battute in un singolo battito nella traccia audio. Rilevante "
+"solo per la musica con funzionalità interattiva, non gli effetti sonori.\n"
+"Nella finestra di dialogo [b]Impostazioni d'importazione avanzate[/b] è "
+"fornito un editor più comodo per [member bar_beats], in quanto consente di "
+"visualizzare le modifiche in anteprima senza dover reimportare l'audio."
+
+msgid ""
+"The beat count of the audio track. This is only relevant for music that "
+"wishes to make use of interactive music functionality, not sound effects.\n"
+"A more convenient editor for [member beat_count] is provided in the "
+"[b]Advanced Import Settings[/b] dialog, as it lets you preview your changes "
+"without having to reimport the audio."
+msgstr ""
+"Il numero di battiti nella traccia audio. Rilevante solo per la musica con "
+"funzionalità interattiva, non gli effetti sonori.\n"
+"Nella finestra di dialogo [b]Impostazioni d'importazione avanzate[/b] è "
+"fornito un editor più comodo per [member beat_count], in quanto consente di "
+"visualizzare le modifiche in anteprima senza dover reimportare l'audio."
+
+msgid ""
+"The beats per minute of the audio track. This should match the BPM measure "
+"that was used to compose the track. This is only relevant for music that "
+"wishes to make use of interactive music functionality, not sound effects.\n"
+"A more convenient editor for [member bpm] is provided in the [b]Advanced "
+"Import Settings[/b] dialog, as it lets you preview your changes without "
+"having to reimport the audio."
+msgstr ""
+"I battiti al minuto della traccia audio. Dovrebbe corrispondere alla misura "
+"del BPM che è stata usata per comporre la traccia. Rilevante solo per la "
+"musica con funzionalità interattiva, non gli effetti sonori.\n"
+"Nella finestra di dialogo [b]Impostazioni d'importazione avanzate[/b] è "
+"fornito un editor più comodo per [member bpm], in quanto consente di "
+"visualizzare le modifiche in anteprima senza dover reimportare l'audio."
+
 msgid ""
 "If enabled, the audio will begin playing at the beginning after playback ends "
 "by reaching the end of the audio.\n"
@@ -113919,6 +135404,24 @@ msgstr ""
 "Considera di abilitarla se noti artefatti a blocchi nelle normali o UV della "
 "mesh, o se hai mesh più grandi di qualche migliaio di metri in ogni direzione."
 
+msgid "If [code]true[/code], generates UV2 on import for [LightmapGI] baking."
+msgstr ""
+"Se [code]true[/code], genera l'UV2 durante l'importazione per la preparazione "
+"di [LightmapGI]."
+
+msgid ""
+"Controls the size of each texel on the baked lightmap. A smaller value "
+"results in more precise lightmaps, at the cost of larger lightmap sizes and "
+"longer bake times.\n"
+"[b]Note:[/b] Only effective if [member generate_lightmap_uv2] is [code]true[/"
+"code]."
+msgstr ""
+"Controlla le dimensioni di ogni texel sulla lightmap precalcolata. Un valore "
+"più piccolo produce lightmap più precise, a costo di dimensioni maggiori e "
+"tempi di precalcolo più lunghi.\n"
+"[b]Nota:[/b] Efficace solo se [member generate_lightmap_uv2] è impostato su "
+"[code]true[/code]."
+
 msgid ""
 "If [code]true[/code], generates lower detail variants of the mesh which will "
 "be displayed in the distance to improve rendering performance. Not all meshes "
@@ -114012,6 +135515,12 @@ msgstr ""
 "tempo, si consiglia di utilizzare WAV per quei suoni, soprattutto se "
 "destinati a dispositivi di fascia bassa."
 
+msgid "Use [method AudioStreamOggVorbis.load_from_buffer] instead."
+msgstr "Utilizza invece [method AudioStreamOggVorbis.load_from_buffer]."
+
+msgid "Use [method AudioStreamOggVorbis.load_from_file] instead."
+msgstr "Utilizza invece [method AudioStreamOggVorbis.load_from_file]."
+
 msgid "Imports a glTF, FBX, Collada or Blender 3D scene."
 msgstr "Importa una scena 3D da glTF, FBX, Collada o Blender."
 
@@ -114143,6 +135652,22 @@ msgstr ""
 "ridimensionato. Se [code]false[/code], [member nodes/root_scale] "
 "moltiplicherà invece la scala del nodo radice."
 
+msgid ""
+"Treat all nodes in the imported scene as if they are bones within a single "
+"[Skeleton3D]. Can be used to guarantee that imported animations target "
+"skeleton bones rather than nodes. May also be used to assign the "
+"[code]\"Root\"[/code] bone in a [BoneMap]. See [url=$DOCS_URL/tutorials/"
+"assets_pipeline/retargeting_3d_skeletons.html]Retargeting 3D Skeletons[/url] "
+"for more information."
+msgstr ""
+"Tratta tutti i nodi nella scena importata come se fossero ossa all'interno di "
+"un singolo [Skeleton3D]. Può essere utilizzato per assicurare che le "
+"animazioni importate puntino alle ossa dello scheletro piuttosto che ai nodi. "
+"Può anche essere utilizzato per assegnare l'osso [code]\"Root\"[/code] in una "
+"[BoneMap]. Consulta [url=$DOCS_URL/tutorials/assets_pipeline/"
+"retargeting_3d_skeletons.html]Retargeting 3D Skeletons[/url] per maggiori "
+"informazioni."
+
 msgid ""
 "Override for the root node name. If empty, the root node will use what the "
 "scene specifies, or the file name if the scene does not specify a root name."
@@ -114217,6 +135742,23 @@ msgstr ""
 msgid "Imports a WAV audio file for playback."
 msgstr "Importa un file audio WAV per la riproduzione."
 
+msgid ""
+"WAV is an uncompressed format, which can provide higher quality compared to "
+"Ogg Vorbis and MP3. It also has the lowest CPU cost to decode. This means "
+"high numbers of WAV sounds can be played at the same time, even on low-end "
+"devices.\n"
+"By default, Godot imports WAV files using the lossy Quite OK Audio "
+"compression. You may change this by setting the [member compress/mode] "
+"property."
+msgstr ""
+"WAV è un formato non compresso, il che può fornire una qualità superiore "
+"rispetto a Ogg Vorbis e MP3. Ha anche il costo di CPU più basso per la "
+"decodifica. Ciò significa che è possibile riprodurre un numero elevato di "
+"suoni WAV allo stesso tempo, anche su dispositivi di fascia bassa.\n"
+"Come predefinito, Godot importa i file WAV usando la compressione lossy Quite "
+"OK Audio. È possibile cambiare questa impostazione modificando la proprietà "
+"[member compress/mode]."
+
 msgid ""
 "If [code]true[/code], normalize the audio volume so that its peak volume is "
 "equal to 0 dB. When enabled, normalization will make audio sound louder "
@@ -114307,6 +135849,27 @@ msgstr ""
 "load_threaded_get_status] per sapere quando il caricamento è stato "
 "effettivamente completato."
 
+msgid ""
+"Returns the status of a threaded loading operation started with [method "
+"load_threaded_request] for the resource at [param path]. See [enum "
+"ThreadLoadStatus] for possible return values.\n"
+"An array variable can optionally be passed via [param progress], and will "
+"return a one-element array containing the ratio of completion of the threaded "
+"loading (between [code]0.0[/code] and [code]1.0[/code]).\n"
+"[b]Note:[/b] The recommended way of using this method is to call it during "
+"different frames (e.g., in [method Node._process], instead of a loop)."
+msgstr ""
+"Restituisce lo stato di un'operazione di caricamento su un thread, avviata "
+"con [method load_threaded_request], per la risorsa nel percorso [param path]. "
+"Vedi [enum ThreadLoadStatus] per i valori restituibili.\n"
+"Una variabile di tipo array può essere facoltativamente passata tramite "
+"[param progress] e restituirà un array di un elemento contenente la "
+"percentuale di completamento del caricamento su un thread (tra [code]0.0[/"
+"code] e [code]1.0[/code]).\n"
+"[b]Nota:[/b] Il modo consigliato per usare questo metodo è di chiamarlo "
+"durante frame diversi (ad esempio, in [method Node._process], invece di un "
+"ciclo)."
+
 msgid ""
 "Loads the resource using threads. If [param use_sub_threads] is [code]true[/"
 "code], multiple threads will be used to load the resource, which makes "
@@ -114511,6 +136074,21 @@ msgstr ""
 "Un singleton che gestisce gli identificatori univoci di tutte le risorse "
 "all'interno di un progetto."
 
+msgid ""
+"Resource UIDs (Unique IDentifiers) allow the engine to keep references "
+"between resources intact, even if files are renamed or moved. They can be "
+"accessed with [code]uid://[/code].\n"
+"[ResourceUID] keeps track of all registered resource UIDs in a project, "
+"generates new UIDs, and converts between their string and integer "
+"representations."
+msgstr ""
+"Gli UID delle risorse (Unique IDentifier) consentono al motore di mantenere "
+"intatti i riferimenti tra le risorse, anche se i file sono rinominati o "
+"spostati. Sono accessibili con [code]uid://[/code].\n"
+"[ResourceUID] tiene traccia di tutti gli UID registrati delle risorse in un "
+"progetto, genera nuovi UID e converte tra le loro rappresentazioni di stringa "
+"e di numeri interi."
+
 msgid ""
 "Adds a new UID value which is mapped to the given resource path.\n"
 "Fails with an error if the UID already exists, so be sure to check [method "
@@ -114577,6 +136155,36 @@ msgstr ""
 "può essere caricata.\n"
 "La sua rappresentazione testuale è [code]uid://<invalid>[/code]."
 
+msgid ""
+"Returns [code]true[/code] if [member enable] has [constant "
+"TRANSFORM_FLAG_POSITION]."
+msgstr ""
+"Restituisce [code]true[/code] se [member enable] ha [constant "
+"TRANSFORM_FLAG_POSITION]."
+
+msgid ""
+"Returns [code]true[/code] if [member enable] has [constant "
+"TRANSFORM_FLAG_ROTATION]."
+msgstr ""
+"Restituisce [code]true[/code] se [member enable] ha [constant "
+"TRANSFORM_FLAG_ROTATION]."
+
+msgid ""
+"Returns [code]true[/code] if [member enable] has [constant "
+"TRANSFORM_FLAG_SCALE]."
+msgstr ""
+"Restituisce [code]true[/code] se [member enable] has [constant "
+"TRANSFORM_FLAG_SCALE]."
+
+msgid "If set, allows to retarget the position."
+msgstr "Se impostato, consente di reindirizzare la posizione."
+
+msgid "If set, allows to retarget the rotation."
+msgstr "Se impostato, consente di reindirizzare la rotazione."
+
+msgid "If set, allows to retarget the scale."
+msgstr "Se impostato, consente di reindirizzare la scala."
+
 msgid "Represents a straight ribbon-shaped [PrimitiveMesh] with variable width."
 msgstr ""
 "Rappresenta una [PrimitiveMesh] a forma di nastro dritto con spessore "
@@ -114602,6 +136210,18 @@ msgstr ""
 msgid "3D Particle trails"
 msgstr "Scie di particelle 3D"
 
+msgid ""
+"Determines the size of the ribbon along its length. The size of a particular "
+"section segment is obtained by multiplying the baseline [member size] by the "
+"value of this curve at the given distance. For values smaller than [code]0[/"
+"code], the faces will be inverted. Should be a unit [Curve]."
+msgstr ""
+"Determina la dimensione del nastro lungo la sua lunghezza. La dimensione di "
+"un particolare segmento di sezione si ottiene moltiplicando la dimensione "
+"([member size]) della linea di base per il valore di questa curva alla "
+"distanza specificata. Per valori inferiori a [code]0[/code], le facce saranno "
+"invertite. Dovrebbe essere una [Curve] unitaria."
+
 msgid "The length of a section of the ribbon."
 msgstr "La lunghezza di una sezione del nastro."
 
@@ -114705,12 +136325,175 @@ msgstr ""
 "Un controllo per visualizzare testo che può contenere diversi stili di "
 "carattere, immagini e formattazione di base."
 
+msgid ""
+"A control for displaying text that can contain custom fonts, images, and "
+"basic formatting. [RichTextLabel] manages these as an internal tag stack. It "
+"also adapts itself to given width/heights.\n"
+"[b]Note:[/b] [method newline], [method push_paragraph], [code]\"\\n\"[/code], "
+"[code]\"\\r\\n\"[/code], [code]p[/code] tag, and alignment tags start a new "
+"paragraph. Each paragraph is processed independently, in its own BiDi "
+"context. If you want to force line wrapping within paragraph, any other line "
+"breaking character can be used, for example, Form Feed (U+000C), Next Line "
+"(U+0085), Line Separator (U+2028).\n"
+"[b]Note:[/b] Assignments to [member text] clear the tag stack and reconstruct "
+"it from the property's contents. Any edits made to [member text] will erase "
+"previous edits made from other manual sources such as [method append_text] "
+"and the [code]push_*[/code] / [method pop] methods.\n"
+"[b]Note:[/b] RichTextLabel doesn't support entangled BBCode tags. For "
+"example, instead of using [code skip-lint][b]bold[i]bold italic[/b]italic[/i]"
+"[/code], use [code skip-lint][b]bold[i]bold italic[/i][/b][i]italic[/i][/"
+"code].\n"
+"[b]Note:[/b] [code]push_*/pop_*[/code] functions won't affect BBCode.\n"
+"[b]Note:[/b] Unlike [Label], [RichTextLabel] doesn't have a [i]property[/i] "
+"to horizontally align text to the center. Instead, enable [member "
+"bbcode_enabled] and surround the text in a [code skip-lint][center][/code] "
+"tag as follows: [code skip-lint][center]Example[/center][/code]. There is "
+"currently no built-in way to vertically align text either, but this can be "
+"emulated by relying on anchors/containers and the [member fit_content] "
+"property."
+msgstr ""
+"Un controllo per visualizzare testo che può contenere font personalizzati, "
+"immagini e formattazione di base. [RichTextLabel] li gestisce come uno stack "
+"di tag interno. Si adatta anche a larghezze o altezze specificate.\n"
+"[b]Nota:[/b] [method newline], [method push_paragraph], [code]\"\\n\"[/code], "
+"[code]\"\\r\\n\"[/code], il tag [code]p[/code] e il tag di allineamento "
+"cominciano un nuovo paragrafo. Ogni paragrafo viene elaborato in modo "
+"indipendente, nel suo proprio contesto BiDi. Se si desidera forzare "
+"un'interruzione di riga all'interno del paragrafo, è possibile utilizzare "
+"qualsiasi altro carattere d'interruzione di riga, ad esempio, Form Feed "
+"(U+000C), Next Line (U+0085), Line Separator (U+2028).\n"
+"[b]Nota:[/b] Le assegnazioni a [member text] cancellano lo stack di tag e lo "
+"ricostruiscono dai contenuti della proprietà. Qualsiasi modifica apportata a "
+"[member text] cancellerà le modifiche precedenti apportate da altre sorgenti "
+"manuali come [method append_text] e i metodi [code]push_*[/code] / [method "
+"pop].\n"
+"[b]Nota:[/b] RichTextLabel non supporta i tag BBCode aggrovigliati. Ad "
+"esempio, invece di usare [code skip-lint][b]grassetto[i]grassetto corsivo[/"
+"b]corsivo[/i][/code], usa [code skip-lint][b]grassetto[i]grassetto corsivo[/i]"
+"[/b][i]corsivo[/i][/code].\n"
+"[b]Nota:[/b] Le funzioni [code]push_*/pop_*[/code] non influenzeranno il "
+"BBCode.\n"
+"[b]Nota:[/b] A differenza di [Label], [RichTextLabel] non ha una "
+"[i]proprietà[/i] per allineare orizzontalmente il testo al centro. Invece, "
+"abilita [member bbcode_enabled] e circonda il testo in un tag [code skip-lint]"
+"[center][/code] come segue: [code skip-lint][center]Esempio[/center][/code]. "
+"Attualmente non esiste un modo integrato per allineare verticalmente il "
+"testo, ma questo può essere emulato affidandosi ad ancore e contenitori e "
+"alla proprietà [member fit_content]."
+
 msgid "Rich Text Label with BBCode Demo"
 msgstr "Demo di etichetta di testo avanzato con BBCode"
 
 msgid "Adds raw non-BBCode-parsed text to the tag stack."
 msgstr "Aggiunge testo grezzo non analizzato da BBCode allo stack dei tag."
 
+msgid ""
+"Returns the line number of the character position provided. Line and "
+"character numbers are both zero-indexed.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce il numero di riga della posizione di carattere fornita. I numeri "
+"di riga e di carattere sono entrambi indicizzati a zero.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the paragraph number of the character position provided. Paragraph "
+"and character numbers are both zero-indexed.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce il numero di paragrafo della posizione di carattere fornita. I "
+"numeri di paragrafo e di carattere sono entrambi indicizzati a zero.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the height of the content.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce l'altezza del contenuto.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the width of the content.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce la larghezza del contenuto.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the total number of lines in the text. Wrapped text is counted as "
+"multiple lines.\n"
+"[b]Note:[/b] If [member visible_characters_behavior] is set to [constant "
+"TextServer.VC_CHARS_BEFORE_SHAPING] only visible wrapped lines are counted.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce il numero di righe nel testo. Il testo avvolto viene contato come "
+"molteplici righe.\n"
+"[b]Nota:[/b] Se [member visible_characters_behavior] è impostato su [constant "
+"TextServer.VC_CHARS_BEFORE_SHAPING] vengono conteggiate solo le righe "
+"visibili.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the vertical offset of the line found at the provided index.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce lo scostamento verticale della linea trovata all'indice fornito.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the indexes of the first and last visible characters for the given "
+"[param line], as a [Vector2i].\n"
+"[b]Note:[/b] If [member visible_characters_behavior] is set to [constant "
+"TextServer.VC_CHARS_BEFORE_SHAPING] only visible wrapped lines are counted.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce gli indici del primo e dell'ultimo carattere visibile per la riga "
+"[param line] specificata, come [Vector2i].\n"
+"[b]Nota:[/b] Se [member visible_characters_behavior] è impostato su [constant "
+"TextServer.VC_CHARS_BEFORE_SHAPING] vengono conteggiate solo le righe "
+"visibili.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the vertical offset of the paragraph found at the provided index.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce lo scostamento verticale del paragrafo trovato all'indice "
+"fornito.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
 msgid "Returns the text without BBCode mark-up."
 msgstr "Restituisce il testo senza marcatura BBCode."
 
@@ -114724,6 +136507,13 @@ msgstr ""
 "Restituisce l'indice del primo carattere della selezione attuale se una "
 "selezione è attiva, altrimenti [code]-1[/code]. Non include BBCode."
 
+msgid ""
+"Returns the current selection vertical line offset if a selection is active, "
+"[code]-1.0[/code] otherwise."
+msgstr ""
+"Restituisce lo scostamento verticale della riga della selezione attuale se "
+"una selezione è attiva, altrimenti [code]-1.0[/code]."
+
 msgid ""
 "Returns the current selection last character index if a selection is active, "
 "[code]-1[/code] otherwise. Does not include BBCodes."
@@ -114738,6 +136528,83 @@ msgstr ""
 "Restituisce il numero totale di caratteri dai tag di testo. Non include i "
 "BBCode."
 
+msgid ""
+"Returns the number of visible lines.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce il numero di righe visibili.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Returns the number of visible paragraphs. A paragraph is considered visible "
+"if at least one of its lines is visible.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"Restituisce il numero di paragrafi visibili. Un paragrafo è considerato "
+"visibile se almeno una delle sue righe è visibile.\n"
+"[b]Nota:[/b] Se [member threaded] è abilitato, questo metodo restituisce un "
+"valore per la parte caricata del documento. Usa [method is_finished] o "
+"[signal finished] per determinare se il documento ha caricato completamente."
+
+msgid ""
+"Installs a custom effect. This can also be done in the Inspector through the "
+"[member custom_effects] property. [param effect] should be a valid "
+"[RichTextEffect].\n"
+"[b]Example:[/b] With the following script extending from [RichTextEffect]:\n"
+"[codeblock]\n"
+"# effect.gd\n"
+"class_name MyCustomEffect\n"
+"extends RichTextEffect\n"
+"\n"
+"var bbcode = \"my_custom_effect\"\n"
+"\n"
+"# ...\n"
+"[/codeblock]\n"
+"The above effect can be installed in [RichTextLabel] from a script:\n"
+"[codeblock]\n"
+"# rich_text_label.gd\n"
+"extends RichTextLabel\n"
+"\n"
+"func _ready():\n"
+"    install_effect(MyCustomEffect.new())\n"
+"\n"
+"    # Alternatively, if not using `class_name` in the script that extends "
+"RichTextEffect:\n"
+"    install_effect(preload(\"res://effect.gd\").new())\n"
+"[/codeblock]"
+msgstr ""
+"Installa un effetto personalizzato. È possibile fare ciò anche nell'ispettore "
+"attraverso la proprietà [member custom_effects]. [param effect] dovrebbe "
+"essere un [RichTextEffect] valido.\n"
+"[b]Esempio:[/b] Con lo script seguente che si estende da [RichTextEffect]:\n"
+"[codeblock]\n"
+"# effect.gd\n"
+"class_name MyCustomEffect\n"
+"extends RichTextEffect\n"
+"\n"
+"var bbcode = \"my_custom_effect\"\n"
+"\n"
+"# ...\n"
+"[/codeblock]\n"
+"L'effetto precedente può essere installato in [RichTextLabel] da uno script:\n"
+"[codeblock]\n"
+"# rich_text_label.gd\n"
+"extends RichTextLabel\n"
+"\n"
+"func _ready():\n"
+"    install_effect(MyCustomEffect.new())\n"
+"\n"
+"    # In alternativa, se non si usa `class_name` nello script che estende "
+"RichTextEffect:\n"
+"    install_effect(preload(\"res://effect.gd\").new())\n"
+"[/codeblock]"
+
 msgid "Invalidates [param paragraph] and all subsequent paragraphs cache."
 msgstr ""
 "Invalida la cache del paragrafo [param paragraph] e di tutti i paragrafi "
@@ -114752,6 +136619,9 @@ msgstr ""
 "in background ha finito di elaborare il testo, altrimenti restituisce sempre "
 "[code]true[/code]."
 
+msgid "Use [method is_finished] instead."
+msgstr "Utilizza invece [method is_finished]."
+
 msgid "Adds a newline tag to the tag stack."
 msgstr "Aggiunge un tag di ritorno a capo allo stack dei tag."
 
@@ -115426,6 +137296,24 @@ msgstr ""
 "vettoriale fornito sarà impostata come la lunghezza vettoriale fornita. Ciò è "
 "utile per un comportamento di salto."
 
+msgid ""
+"Damps the body's rotation. By default, the body will use the [member "
+"ProjectSettings.physics/2d/default_angular_damp] setting or any value "
+"override set by an [Area2D] the body is in. Depending on [member "
+"angular_damp_mode], you can set [member angular_damp] to be added to or to "
+"replace the body's damping value.\n"
+"See [member ProjectSettings.physics/2d/default_angular_damp] for more details "
+"about damping."
+msgstr ""
+"Smorza la rotazione del corpo. Come predefinito, il corpo utilizzerà "
+"impostazione del progetto [member ProjectSettings.physics/2d/"
+"default_angular_damp], o un valore sostitutivo impostato da un'[Area2D] in "
+"cui si trova il corpo. A seconda di [member angular_damp_mode], è possibile "
+"impostare [member angular_damp] in modo che sia aggiunto o sostituito al "
+"valore di smorzamento del corpo.\n"
+"Vedi [member ProjectSettings.physics/2d/default_angular_damp] per ulteriori "
+"dettagli sullo smorzamento."
+
 msgid ""
 "If [code]true[/code], the body can enter sleep mode when there is no "
 "movement. See [member sleeping]."
@@ -115546,6 +137434,16 @@ msgstr ""
 "Per un corpo che è sempre congelato, usa invece [StaticBody2D] o "
 "[AnimatableBody2D]."
 
+msgid ""
+"Multiplies the gravity applied to the body. The body's gravity is calculated "
+"from the [member ProjectSettings.physics/2d/default_gravity] project setting "
+"and/or any additional gravity vector applied by [Area2D]s."
+msgstr ""
+"Moltiplica la gravità applicata al corpo. La gravità del corpo è calcolata "
+"dall'impostazione del progetto [member ProjectSettings.physics/2d/"
+"default_gravity] e/o da qualsiasi vettore di gravità aggiuntivo applicato "
+"dagli [Area2D]."
+
 msgid ""
 "The body's moment of inertia. This is like mass, but for rotation: it "
 "determines how much torque it takes to rotate the body. The moment of inertia "
@@ -115610,6 +137508,24 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Damps the body's movement. By default, the body will use the [member "
+"ProjectSettings.physics/2d/default_linear_damp] setting or any value override "
+"set by an [Area2D] the body is in. Depending on [member linear_damp_mode], "
+"you can set [member linear_damp] to be added to or to replace the body's "
+"damping value.\n"
+"See [member ProjectSettings.physics/2d/default_linear_damp] for more details "
+"about damping."
+msgstr ""
+"Smorza il movimento del corpo. Come predefinito, il corpo utilizzerà "
+"l'impostazione [member ProjectSettings.physics/2d/default_linear_damp] o "
+"qualsiasi valore di sostituzione impostato da un'[Area2D] in cui si trova il "
+"corpo. A seconda di [member linear_damp_mode], è possibile impostare [member "
+"linear_damp] in modo che sia aggiunto o sostituito al valore di smorzamento "
+"del corpo.\n"
+"Consulta [member ProjectSettings.physics/2d/default_linear_damp] per "
+"ulteriori dettagli sullo smorzamento."
+
 msgid ""
 "The body's linear velocity in pixels per second. Can be used sporadically, "
 "but [b]don't set this every frame[/b], because physics may run in another "
@@ -116048,6 +137964,24 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Damps the body's movement. By default, the body will use the [member "
+"ProjectSettings.physics/3d/default_linear_damp] project setting or any value "
+"override set by an [Area3D] the body is in. Depending on [member "
+"linear_damp_mode], you can set [member linear_damp] to be added to or to "
+"replace the body's damping value.\n"
+"See [member ProjectSettings.physics/3d/default_linear_damp] for more details "
+"about damping."
+msgstr ""
+"Smorza il movimento del corpo. Come predefinito, il corpo utilizzerà "
+"l'impostazione [member ProjectSettings.physics/3d/default_linear_damp] o "
+"qualsiasi valore di sostituzione impostato da un'[Area3D] in cui si trova il "
+"corpo. A seconda di [member linear_damp_mode], è possibile impostare [member "
+"linear_damp] in modo che sia aggiunto o sostituito al valore di smorzamento "
+"del corpo.\n"
+"Consulta [member ProjectSettings.physics/3d/default_linear_damp] per "
+"ulteriori dettagli sullo smorzamento."
+
 msgid ""
 "Emitted when a collision with another [PhysicsBody3D] or [GridMap] occurs. "
 "Requires [member contact_monitor] to be set to [code]true[/code] and [member "
@@ -116625,9 +138559,9 @@ msgstr ""
 "allo stesso tempo, il che potrebbe causare scatti in alcune situazioni "
 "intense sulle prestazioni.\n"
 "[b]Nota:[/b] In C#, [param method] deve essere in snake_case quando si fa "
-"riferimento a metodi Godot integrati. Preferisci usare i nomi esposti nella "
-"classe [code]MethodName[/code] per evitare di allocare un nuovo [StringName] "
-"a ogni chiamata."
+"riferimento ai metodi integrati di Godot. Preferisci usare i nomi esposti "
+"nella classe [code]MethodName[/code] per evitare di allocare un nuovo "
+"[StringName] a ogni chiamata."
 
 msgid ""
 "Calls the given [param method] on each node inside this tree added to the "
@@ -116662,7 +138596,7 @@ msgstr ""
 "        \"enemies\", \"hide\")\n"
 "[/codeblock]\n"
 "[b]Nota:[/b] In C#, [param method] deve essere in snake_case quando si fa "
-"riferimento ai metodi Godot integrati. Si preferisce utilizzare i nomi "
+"riferimento ai metodi integrati di Godot. Si preferisce utilizzare i nomi "
 "esposti nella classe [code]MethodName[/code] per evitare di allocare un nuovo "
 "[StringName] a ogni chiamata."
 
@@ -116916,9 +138850,9 @@ msgstr ""
 "allo stesso tempo, il che potrebbe causare scatti in alcune situazioni "
 "intense sulle prestazioni.\n"
 "[b]Nota:[/b] In C#, [param property] deve essere in snake_case quando si fa "
-"riferimento alle proprietà Godot integrate. Preferisci usare i nomi esposti "
-"nella classe [code]PropertyName[/code] per evitare di allocare un nuovo "
-"[StringName] a ogni chiamata."
+"riferimento alle proprietà integrate di Godot. Preferisci usare i nomi "
+"esposti nella classe [code]PropertyName[/code] per evitare di allocare un "
+"nuovo [StringName] a ogni chiamata."
 
 msgid ""
 "Sets the given [param property] to [param value] on all nodes inside this "
@@ -116935,9 +138869,9 @@ msgstr ""
 "hanno [param property] sono ignorati. Usa [param flags] per personalizzare il "
 "comportamento di questo metodo (vedi [enum GroupCallFlags]).\n"
 "[b]Nota:[/b] In C#, [param property] deve essere in snake_case quando si fa "
-"riferimento alle proprietà Godot integrate. Preferisci usare i nomi esposti "
-"nella classe [code]PropertyName[/code] per evitare di allocare un nuovo "
-"[StringName] a ogni chiamata."
+"riferimento alle proprietà integrate di Godot. Preferisci usare i nomi "
+"esposti nella classe [code]PropertyName[/code] per evitare di allocare un "
+"nuovo [StringName] a ogni chiamata."
 
 msgid ""
 "Sets a custom [MultiplayerAPI] with the given [param root_path] (controlling "
@@ -117335,6 +139269,13 @@ msgstr "Restituisce il tipo base dello script."
 msgid "Returns the default value of the specified property."
 msgstr "Restituisce il valore predefinito della proprietà specificata."
 
+msgid ""
+"Returns a [Dictionary] mapping method names to their RPC configuration "
+"defined by this script."
+msgstr ""
+"Restituisce un [Dictionary] che mappa i nomi dei metodi alla loro "
+"configurazione RPC definita da questo script."
+
 msgid "Returns a dictionary containing constant names and their values."
 msgstr ""
 "Restituisce un dizionario contenente i nomi delle costanti e i relativi "
@@ -117411,6 +139352,9 @@ msgstr ""
 "Finestra di dialogo popup dell'editor Godot per la creazione di nuovi file di "
 "[Script]."
 
+msgid "Returns array of breakpoints."
+msgstr "Restituisce un array di punti d'interruzione."
+
 msgid ""
 "Returns the [ScriptEditorBase] object that the user is currently editing."
 msgstr ""
@@ -117766,6 +139710,13 @@ msgstr "Scorrimento abilitato, la barra di scorrimento sarà sempre visibile."
 msgid "Scrolling enabled, scrollbar will be hidden."
 msgstr "Scorrimento abilitato, la barra di scorrimento sarà nascosta."
 
+msgid ""
+"The focus border [StyleBox] of the [ScrollContainer]. Only used if [member "
+"draw_focus_border] is [code]true[/code]."
+msgstr ""
+"La [StyleBox] di focus del bordo del [ScrollContainer]. Utilizzata solo se "
+"[member draw_focus_border] è [code]true[/code]."
+
 msgid "The background [StyleBox] of the [ScrollContainer]."
 msgstr "Lo [StyleBox] di sfondo del [ScrollContainer]."
 
@@ -117817,6 +139768,13 @@ msgstr ""
 "- Quando il conteggio dei riferimenti di un [Thread] raggiunge zero e viene "
 "quindi distrutto, non deve essere in attesa di alcun semaforo."
 
+msgid ""
+"Lowers the [Semaphore], allowing one thread in, or more if [param count] is "
+"specified."
+msgstr ""
+"Abbassa il [Semaphore], consentendo l'ingresso di un altro thread, o più se "
+"[param count] è specificato."
+
 msgid ""
 "Like [method wait], but won't block, so if the value is zero, fails "
 "immediately and returns [code]false[/code]. If non-zero, it returns "
@@ -117950,6 +139908,33 @@ msgstr ""
 msgid "Returns the shader mode for the shader."
 msgstr "Restituisce la modalità di shader per lo shader."
 
+msgid ""
+"Returns the list of shader uniforms that can be assigned to a "
+"[ShaderMaterial], for use with [method ShaderMaterial.set_shader_parameter] "
+"and [method ShaderMaterial.get_shader_parameter]. The parameters returned are "
+"contained in dictionaries in a similar format to the ones returned by [method "
+"Object.get_property_list].\n"
+"If argument [param get_groups] is [code]true[/code], parameter grouping hints "
+"are also included in the list."
+msgstr ""
+"Ottieni la lista delle uniformi dello shader che possono essere assegnate a "
+"uno [ShaderMaterial], per l'uso con [method ShaderMaterial."
+"set_shader_parameter] e [method ShaderMaterial.get_shader_parameter]. I "
+"parametri restituiti sono contenuti in dizionari in un formato simile a "
+"quelli restituiti da [method Object.get_property_list].\n"
+"Se l'argomento [param get_groups] è [code]true[/code], saranno forniti "
+"suggerimenti per il raggruppamento dei parametri."
+
+msgid ""
+"Only available when running in the editor. Opens a popup that visualizes the "
+"generated shader code, including all variants and internal shader code. See "
+"also [method Material.inspect_native_shader_code]."
+msgstr ""
+"Disponibile solo quando è in esecuzione nell'editor. Apre un popup che "
+"visualizza il codice dello shader generato, incluse tutte le varianti e il "
+"codice di shader interno. Vedi anche [method Material."
+"inspect_native_shader_code]."
+
 msgid ""
 "Sets the default texture to be used with a texture uniform. The default is "
 "used if a texture is not set in the [ShaderMaterial].\n"
@@ -118069,6 +140054,14 @@ msgstr ""
 "restituito è ciò che l'utente ha scritto, non il codice generato completo "
 "utilizzato internamente."
 
+msgid "Returns [code]true[/code] if an include file with this name exists."
+msgstr ""
+"Restituisce [code]true[/code] se un file include con questo nome esiste."
+
+msgid "Returns a list of built-in include files that are currently registered."
+msgstr ""
+"Restituisce una lista dei file include integrati attualmente registrati."
+
 msgid ""
 "A material defined by a custom [Shader] program and the values of its shader "
 "parameters."
@@ -118350,6 +140343,13 @@ msgstr ""
 "[b]Nota:[/b] La proiezione di forme è più costosa da elaborare rispetto alla "
 "proiezione di raggi."
 
+msgid ""
+"Adds a collision exception so the shape does not report collisions with the "
+"specified node."
+msgstr ""
+"Aggiunge un'eccezione di collisione in modo che la forma non riporti le "
+"collisioni con il nodo specificato."
+
 msgid ""
 "Adds a collision exception so the shape does not report collisions with the "
 "specified [RID]."
@@ -118360,6 +140360,46 @@ msgstr ""
 msgid "Removes all collision exceptions for this shape."
 msgstr "Rimuove tutte le eccezioni di collisione per questa forma."
 
+msgid ""
+"Updates the collision information for the shape immediately, without waiting "
+"for the next [code]_physics_process[/code] call. Use this method, for "
+"example, when the shape or its parent has changed state.\n"
+"[b]Note:[/b] Setting [member enabled] to [code]true[/code] is not required "
+"for this to work."
+msgstr ""
+"Aggiorna immediatamente le informazioni di collisione per la forma, senza "
+"attendere la successiva chiamata a [code]_physics_process[/code]. Utilizza "
+"questo metodo, ad esempio, quando la forma o il suo genitore hanno cambiato "
+"stato.\n"
+"[b]Nota:[/b] Impostare [member enabled] su [code]true[/code] non è necessario "
+"affinché ciò funzioni."
+
+msgid ""
+"Returns the fraction from this cast's origin to its [member target_position] "
+"of how far the shape can move without triggering a collision, as a value "
+"between [code]0.0[/code] and [code]1.0[/code]."
+msgstr ""
+"Restituisce la frazione dall'origine di questo cast al suo [member "
+"target_position] di quanto lontano la forma può muoversi senza provocare una "
+"collisione, come valore compreso tra [code]0.0[/code] e [code]1.0[/code].."
+
+msgid ""
+"Returns the fraction from this cast's origin to its [member target_position] "
+"of how far the shape must move to trigger a collision, as a value between "
+"[code]0.0[/code] and [code]1.0[/code].\n"
+"In ideal conditions this would be the same as [method "
+"get_closest_collision_safe_fraction], however shape casting is calculated in "
+"discrete steps, so the precise point of collision can occur between two "
+"calculated positions."
+msgstr ""
+"Restituisce la frazione dall'origine di questo cast al suo [member "
+"target_position] di quanto lontano la forma deve muoversi per provocare una "
+"collisione, come valore compreso tra [code]0.0[/code] e [code]1.0[/code]..\n"
+"In condizioni ideali, questo sarebbe lo stesso di [method "
+"get_closest_collision_safe_fraction], tuttavia la proiezione della forma "
+"viene calcolata in passaggi discreti, quindi il punto preciso di collisione "
+"può verificarsi tra due posizioni calcolate."
+
 msgid ""
 "Returns the collided [Object] of one of the multiple collisions at [param "
 "index], or [code]null[/code] if no object is intersecting the shape (i.e. "
@@ -118404,6 +140444,15 @@ msgstr ""
 "Restituisce la normale di una delle collisioni multiple all'indice [param "
 "index] dell'oggetto intersecante."
 
+msgid ""
+"Returns the collision point of one of the multiple collisions at [param "
+"index] where the shape intersects the colliding object.\n"
+"[b]Note:[/b] This point is in the [b]global[/b] coordinate system."
+msgstr ""
+"Restituisce il punto di collisione di una delle molteplici collisioni "
+"all'indice [param index] dove la forma interseca l'oggetto in collisione.\n"
+"[b]Nota:[/b] Questo punto è nel sistema di coordinate [b]globale[/b]."
+
 msgid ""
 "Returns whether any object is intersecting with the shape's vector "
 "(considering the vector length)."
@@ -118411,6 +140460,13 @@ msgstr ""
 "Restituisce un valore che indica se un oggetto interseca il vettore della "
 "forma (considerando la lunghezza del vettore)."
 
+msgid ""
+"Removes a collision exception so the shape does report collisions with the "
+"specified node."
+msgstr ""
+"Rimuove un'eccezione di collisione in modo che la forma riporti le collisioni "
+"con il nodo specificato."
+
 msgid ""
 "Removes a collision exception so the shape does report collisions with the "
 "specified [RID]."
@@ -118453,6 +140509,16 @@ msgstr ""
 "Con questo parametro è possibile limitare il numero di intersezioni, per "
 "ridurre i tempi di elaborazione."
 
+msgid "The shape to be used for collision queries."
+msgstr "La forma da utilizzare per le interrogazioni di collisione."
+
+msgid ""
+"The shape's destination point, relative to this node's [member Node2D."
+"position]."
+msgstr ""
+"Il punto di destinazione della forma, relativo alla [member Node2D.position] "
+"di questo nodo."
+
 msgid "A 3D shape that sweeps a region of space to detect [CollisionObject3D]s."
 msgstr ""
 "Una forma 3D che scansiona una regione di spazio per rilevare i "
@@ -118512,9 +140578,27 @@ msgstr ""
 "predefinita), è usato il colore impostato in [member ProjectSettings.debug/"
 "shapes/collision/shape_color]."
 
+msgid ""
+"The shape's destination point, relative to this node's [member Node3D."
+"position]."
+msgstr ""
+"Il punto di destinazione della forma, relativo alla [member Node3D.position] "
+"di questo nodo."
+
 msgid "A shortcut for binding input."
 msgstr "Una scorciatoia per associare input."
 
+msgid ""
+"Shortcuts are commonly used for interacting with a [Control] element from an "
+"[InputEvent] (also known as hotkeys).\n"
+"One shortcut can contain multiple [InputEvent]s, allowing the possibility of "
+"triggering one action with multiple different inputs."
+msgstr ""
+"Le scorciatoie sono comunemente utilizzate per interagire con un elemento "
+"[Control] da un [InputEvent] (noti anche come tasti di scelta rapida).\n"
+"Una scorciatoia può contenere più [InputEvent], consentendo la possibilità di "
+"attivare una sola azione con molteplici input diversi."
+
 msgid "Returns the shortcut's first valid [InputEvent] as a [String]."
 msgstr ""
 "Restituisce il primo valido [InputEvent] della scorciatoia come [String]."
@@ -118522,6 +140606,14 @@ msgstr ""
 msgid "Returns whether [member events] contains an [InputEvent] which is valid."
 msgstr "Restituisce se [member events] contiene un [InputEvent] valido."
 
+msgid ""
+"Returns whether any [InputEvent] in [member events] equals [param event]. "
+"This uses [method InputEvent.is_match] to compare events."
+msgstr ""
+"Restituisce se qualunque degli [InputEvent] in [member events] è uguale a "
+"[param event]. Questo utilizza [method InputEvent.is_match] per confrontare "
+"gli eventi."
+
 msgid ""
 "The shortcut's [InputEvent] array.\n"
 "Generally the [InputEvent] used is an [InputEventKey], though it can be any "
@@ -118534,6 +140626,65 @@ msgstr ""
 msgid "A built-in type representing a signal of an [Object]."
 msgstr "Un tipo integrato che rappresenta un segnale di un [Object]."
 
+msgid ""
+"[Signal] is a built-in [Variant] type that represents a signal of an [Object] "
+"instance. Like all [Variant] types, it can be stored in variables and passed "
+"to functions. Signals allow all connected [Callable]s (and by extension their "
+"respective objects) to listen and react to events, without directly "
+"referencing one another. This keeps the code flexible and easier to manage. "
+"You can check whether an [Object] has a given signal name using [method "
+"Object.has_signal].\n"
+"In GDScript, signals can be declared with the [code]signal[/code] keyword. In "
+"C#, you may use the [code][Signal][/code] attribute on a delegate.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"signal attacked\n"
+"\n"
+"# Additional arguments may be declared.\n"
+"# These arguments must be passed when the signal is emitted.\n"
+"signal item_dropped(item_name, amount)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Signal]\n"
+"delegate void AttackedEventHandler();\n"
+"\n"
+"// Additional arguments may be declared.\n"
+"// These arguments must be passed when the signal is emitted.\n"
+"[Signal]\n"
+"delegate void ItemDroppedEventHandler(string itemName, int amount);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"[Signal] è un tipo [Variant] integrato che rappresenta un segnale di "
+"un'istanza [Object]. Come tutti i tipi di [Variant], può essere memorizzato "
+"in variabili e passato alle funzioni. I segnali consentono a tutti i "
+"[Callable] connessi (e per estensione ai rispettivi oggetti) di ascoltare e "
+"reagire agli eventi, senza fare riferimento diretto l'uno all'altro. Ciò "
+"mantiene il codice flessibile e più facile da gestire. È possibile verificare "
+"se un [Object] ha un determinato nome di segnale tramite [method Object."
+"has_signal].\n"
+"In GDScript, i segnali possono essere dichiarati con la parola chiave "
+"[code]signal[/code]. In C#, puoi usare l'attributo [code][Signal][/code] su "
+"un delegato.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"signal attacked\n"
+"\n"
+"# È possibile dichiarare argomenti aggiuntivi.\n"
+"# Questi argomenti devono essere passati quando viene emesso il segnale.\n"
+"signal item_dropped(item_name, amount)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Signal]\n"
+"delegate void AttackedEventHandler();\n"
+"\n"
+"// È possibile dichiarare argomenti aggiuntivi.\n"
+"// Questi argomenti devono essere passati quando viene emesso il segnale.\n"
+"[Signal]\n"
+"delegate void ItemDroppedEventHandler(string itemName, int amount);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid "Using Signals"
 msgstr "Utilizzo dei segnali"
 
@@ -118547,6 +140698,13 @@ msgstr ""
 msgid "Constructs a [Signal] as a copy of the given [Signal]."
 msgstr "Costruisce un [Signal] come copia del [Signal] specificato."
 
+msgid ""
+"Creates a [Signal] object referencing a signal named [param signal] in the "
+"specified [param object]."
+msgstr ""
+"Crea un nuovo oggetto [Signal] che fa riferimento a un segnale denominato "
+"[param signal] nell'oggetto [param object]."
+
 msgid ""
 "Connects this signal to the specified [param callable]. Optional [param "
 "flags] can be also added to configure the connection's behavior (see [enum "
@@ -118627,6 +140785,11 @@ msgstr ""
 "Restituisce l'ID dell'oggetto che emette questo segnale (vedi [method Object."
 "get_instance_id])."
 
+msgid "Returns [code]true[/code] if any [Callable] is connected to this signal."
+msgstr ""
+"Restituisce [code]true[/code] se qualsiasi [Callable] è collegato a questo "
+"segnale."
+
 msgid ""
 "Returns [code]true[/code] if the specified [Callable] is connected to this "
 "signal."
@@ -118634,6 +140797,13 @@ msgstr ""
 "Restituisce [code]true[/code] se il [Callable] specificato è collegato a "
 "questo segnale."
 
+msgid ""
+"Returns [code]true[/code] if this [Signal] has no object and the signal name "
+"is empty. Equivalent to [code]signal == Signal()[/code]."
+msgstr ""
+"Restituisce [code]true[/code] se questo [Signal] non ha un oggetto e il nome "
+"del segnale è vuoto. Equivale a [code]signal == Signal()[/code]."
+
 msgid ""
 "Returns [code]true[/code] if the signals do not share the same object and "
 "name."
@@ -118850,6 +141020,16 @@ msgstr ""
 msgid "Returns the global rest transform for [param bone_idx]."
 msgstr "Restituisce la trasformazione di riposo globale per [param bone_idx]."
 
+msgid "Returns bone metadata for [param bone_idx] with [param key]."
+msgstr ""
+"Restituisce i metadati d'osso all'indice [param bone_idx] con la chiave "
+"[param key]."
+
+msgid "Returns a list of all metadata keys for [param bone_idx]."
+msgstr ""
+"Restituisce una lista di tutte le chiavi dei metadati per l'osso all'indice "
+"[param bone_idx]."
+
 msgid "Returns the name of the bone at index [param bone_idx]."
 msgstr "Restituisce il nome dell'osso all'indice [param bone_idx]."
 
@@ -118934,6 +141114,13 @@ msgstr ""
 "Utilizzabile per invalidare le cache nei risolutori IK e altri nodi che "
 "elaborano le ossa."
 
+msgid ""
+"Returns whether there exists any bone metadata for [param bone_idx] with key "
+"[param key]."
+msgstr ""
+"Restituisce se esistono metadati d'osso per l'osso all'indice [param "
+"bone_idx] con la chiave [param key]."
+
 msgid ""
 "Returns whether the bone pose for the bone at [param bone_idx] is enabled."
 msgstr ""
@@ -118994,6 +141181,13 @@ msgstr ""
 "globale, moltiplica il [method Transform3D.affine_inverse] del [member Node3D."
 "global_transform] del nodo per la trasformazione mondiale desiderata."
 
+msgid ""
+"Sets bone metadata for [param bone_idx], will set the [param key] meta to "
+"[param value]."
+msgstr ""
+"Imposta i metadati per l'osso all'indice [param bone_idx], imposterà i "
+"metadati con la chiave [param key] su [param value]."
+
 msgid "Sets the bone name, [param name], for the bone at [param bone_idx]."
 msgstr ""
 "Imposta il nome dell'osso a [param name] per l'osso all'indice [param "
@@ -119107,6 +141301,9 @@ msgstr ""
 "attivato, quindi la modificazione da uno [SkeletonModifier3D] non viene "
 "rilevata."
 
+msgid "Emitted when the rest is updated."
+msgstr "Emesso quando le pose di riposo vengono aggiornate."
+
 msgid "Emitted when the value of [member show_rest_only] changes."
 msgstr "Emesso quando il valore di [member show_rest_only] cambia."
 
@@ -119151,6 +141348,80 @@ msgstr ""
 "Un nodo utilizzato per ruotare tutte le ossa di una catena ossea [Skeleton3D] "
 "in modo da posizionare l'osso finale nella posizione 3D desiderata."
 
+msgid ""
+"SkeletonIK3D is used to rotate all bones of a [Skeleton3D] bone chain a way "
+"that places the end bone at a desired 3D position. A typical scenario for IK "
+"in games is to place a character's feet on the ground or a character's hands "
+"on a currently held object. SkeletonIK uses FabrikInverseKinematic internally "
+"to solve the bone chain and applies the results to the [Skeleton3D] "
+"[code]bones_global_pose_override[/code] property for all affected bones in "
+"the chain. If fully applied, this overwrites any bone transform from "
+"[Animation]s or bone custom poses set by users. The applied amount can be "
+"controlled with the [member SkeletonModifier3D.influence] property.\n"
+"[codeblock]\n"
+"# Apply IK effect automatically on every new frame (not the current)\n"
+"skeleton_ik_node.start()\n"
+"\n"
+"# Apply IK effect only on the current frame\n"
+"skeleton_ik_node.start(true)\n"
+"\n"
+"# Stop IK effect and reset bones_global_pose_override on Skeleton\n"
+"skeleton_ik_node.stop()\n"
+"\n"
+"# Apply full IK effect\n"
+"skeleton_ik_node.set_influence(1.0)\n"
+"\n"
+"# Apply half IK effect\n"
+"skeleton_ik_node.set_influence(0.5)\n"
+"\n"
+"# Apply zero IK effect (a value at or below 0.01 also removes "
+"bones_global_pose_override on Skeleton)\n"
+"skeleton_ik_node.set_influence(0.0)\n"
+"[/codeblock]"
+msgstr ""
+"SkeletonIK3D viene utilizzato per ruotare tutte le ossa di una catena d'ossa "
+"di uno [Skeleton3D] in modo da posizionare l'osso finale in una posizione 3D "
+"desiderata. Uno scenario tipico per un IK nei giochi è quello di posizionare "
+"i piedi di un personaggio a terra o le mani di un personaggio su un oggetto "
+"mantenuto. SkeletonIK utilizza FabrikInverseKinematic internamente per "
+"risolvere la catena d'ossa e applica il risultato alla proprietà [Skeleton3D] "
+"[code]bones_global_pose_override[/code] per tutte le ossa influenzate nella "
+"catena. Se applicato completamente, ciò sovrascrive qualsiasi trasformazione "
+"delle ossa dalle [Animation] o pose personalizzate delle ossa impostate dagli "
+"utenti. La quantità applicata può essere controllata con la proprietà [member "
+"SkeletonModifier3D.influence].\n"
+"[codeblock]\n"
+"# Applica l'effetto IK automaticamente a ogni nuova frame (non l'attuale)\n"
+"skeleton_ik_node.start()\n"
+"\n"
+"# Applica l'effetto IK solo per la frame attuale\n"
+"skeleton_ik_node.start(true)\n"
+"\n"
+"# Interrompe l'effetto IK e ripristina bones_global_pose_override sullo "
+"scheletro\n"
+"skeleton_ik_node.stop()\n"
+"\n"
+"# Applica l'effetto IK completamente\n"
+"skeleton_ik_node.set_influence(1.0)\n"
+"\n"
+"# Applica l'effetto IK a metà\n"
+"skeleton_ik_node.set_influence(0.5)\n"
+"\n"
+"# Applica nessun effetto IK (anche un valore uguale o minore di 0.01 rimuove "
+"bones_global_pose_override sullo scheletro)\n"
+"skeleton_ik_node.set_influence(0.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the parent [Skeleton3D] node that was present when SkeletonIK entered "
+"the scene tree. Returns [code]null[/code] if the parent node was not a "
+"[Skeleton3D] node when SkeletonIK3D entered the scene tree."
+msgstr ""
+"Restituisce il nodo [Skeleton3D] genitore che era presente quando questo "
+"SkeletonIK è entrato nell'albero di scene. Restituisce [code]null[/code] se "
+"il nodo genitore non era un nodo [Skeleton3D] quando lo SkeletonIK3D è "
+"entrato nell'albero di scene."
+
 msgid ""
 "Returns [code]true[/code] if SkeletonIK is applying IK effects on continues "
 "frames to the [Skeleton3D] bones. Returns [code]false[/code] if SkeletonIK is "
@@ -119438,7 +141709,7 @@ msgid ""
 "node is what the CCDIK chain will attempt to rotate the bone chain to."
 msgstr ""
 "Il NodePath al nodo che è l'obiettivo per la modificazione CCDIK. Questo nodo "
-"è ciò verso cui la catena CCDIK tenterà di ruotare la catena di ossa."
+"è ciò verso cui la catena CCDIK tenterà di ruotare la catena d'ossa."
 
 msgid ""
 "The end position of the CCDIK chain. Typically, this should be a child of a "
@@ -119501,7 +141772,7 @@ msgid ""
 "node is what the FABRIK chain will attempt to rotate the bone chain to."
 msgstr ""
 "Il NodePath al nodo che è l'obiettivo per la modificazione FABRIK. Questo "
-"nodo è ciò verso cui la catena FABRIK tenterà di ruotare la catena di ossa."
+"nodo è ciò verso cui la catena FABRIK tenterà di ruotare la catena d'ossa."
 
 msgid ""
 "A modification that jiggles [Bone2D] nodes as they move towards a target."
@@ -119509,6 +141780,37 @@ msgstr ""
 "Una modifica che fa oscillare i nodi [Bone2D] mentre si muovono verso un "
 "obiettivo."
 
+msgid ""
+"This modification moves a series of bones, typically called a bone chain, "
+"towards a target. What makes this modification special is that it calculates "
+"the velocity and acceleration for each bone in the bone chain, and runs a "
+"very light physics-like calculation using the inputted values. This allows "
+"the bones to overshoot the target and \"jiggle\" around. It can be configured "
+"to act more like a spring, or sway around like cloth might.\n"
+"This modification is useful for adding additional motion to things like hair, "
+"the edges of clothing, and more. It has several settings to that allow "
+"control over how the joint moves when the target moves.\n"
+"[b]Note:[/b] The Jiggle modifier has [code]jiggle_joints[/code], which are "
+"the data objects that hold the data for each joint in the Jiggle chain. This "
+"is different from than [Bone2D] nodes! Jiggle joints hold the data needed for "
+"each [Bone2D] in the bone chain used by the Jiggle modification."
+msgstr ""
+"Questa modificazione sposta una serie di ossa, solitamente chiamate catena "
+"d'ossa, verso un obiettivo. Ciò che rende speciale questa modifica è che "
+"calcola la velocità e l'accelerazione per ogni osso nella catena d'ossa ed "
+"esegue un calcolo molto leggero, simile alla fisica, utilizzando i valori "
+"immessi. Ciò consente alle ossa di oltrepassare l'obiettivo e \"oscillare\" "
+"attorno. Può essere configurato per agire più come una molla o oscillare come "
+"potrebbe fare un tessuto.\n"
+"Questa modificazione è utile per aggiungere ulteriore movimento a cose come "
+"capelli, bordi di vestiti e altro. Ha diverse impostazioni che consentono di "
+"controllare come si muove l'articolazione quando si muove il bersaglio.\n"
+"[b]Nota:[/b] Il modificatore Jiggle ha [code]jiggle_joints[/code], che sono "
+"gli oggetti dati che contengono i dati per ogni articolazione nella catena "
+"Jiggle. Questo è diverso dai nodi [Bone2D]! Le articolazioni Jiggle "
+"contengono i dati necessari per ogni [Bone2D] nella catena d'ossa utilizzata "
+"dalla modificazione Jiggle."
+
 msgid ""
 "Returns the collision mask used by the Jiggle modifier when collisions are "
 "enabled."
@@ -119679,7 +141981,7 @@ msgid ""
 "node is what the Jiggle chain will attempt to rotate the bone chain to."
 msgstr ""
 "Il NodePath al nodo che è l'obiettivo per la modificazione Jiggle. Questo "
-"nodo è ciò verso cui la catena Jiggle tenterà di ruotare la catena di ossa."
+"nodo è ciò verso cui la catena Jiggle tenterà di ruotare la catena d'ossa."
 
 msgid ""
 "Whether the gravity vector, [member gravity], should be applied to the Jiggle "
@@ -119968,6 +142270,15 @@ msgstr ""
 "Imposta l'indice del nodo [Bone2D] che è utilizzato come secondo osso nella "
 "modificazione TwoBoneIK."
 
+msgid ""
+"If [code]true[/code], the bones in the modification will bend outward as "
+"opposed to inwards when contracting. If [code]false[/code], the bones will "
+"bend inwards when contracting."
+msgstr ""
+"Se [code]true[/code], le ossa nella modificazione si piegheranno verso "
+"l'esterno anziché verso l'interno quando si contraggono. Se [code]false[/"
+"code], le ossa si piegheranno verso l'interno quando si contraggono."
+
 msgid ""
 "The maximum distance the target can be at. If the target is farther than this "
 "distance, the modification will solve as if it's at this maximum distance. "
@@ -120109,6 +142420,9 @@ msgstr ""
 "le modificazioni saranno applicate totalmente, sovrascrivendo le pose dei "
 "[Bone2D] dello [Skeleton2D]."
 
+msgid "A node that may modify Skeleton3D's bone."
+msgstr "Un nodo che potrebbe modificare un osso di uno Skeleton3D."
+
 msgid ""
 "[SkeletonModifier3D] retrieves a target [Skeleton3D] by having a [Skeleton3D] "
 "parent.\n"
@@ -120167,6 +142481,24 @@ msgstr ""
 "devi usare [method Skeleton3D.get_bone_pose] o [method Skeleton3D."
 "get_bone_global_pose] nel momento in cui viene attivato questo segnale."
 
+msgid "Enumerated value for the +X axis."
+msgstr "Valore enumerato per l'asse +X."
+
+msgid "Enumerated value for the -X axis."
+msgstr "Valore enumerato per l'asse -X."
+
+msgid "Enumerated value for the +Y axis."
+msgstr "Valore enumerato per l'asse +Y."
+
+msgid "Enumerated value for the -Y axis."
+msgstr "Valore enumerato per l'asse -Y."
+
+msgid "Enumerated value for the +Z axis."
+msgstr "Valore enumerato per l'asse +Z."
+
+msgid "Enumerated value for the -Z axis."
+msgstr "Valore enumerato per l'asse -X."
+
 msgid ""
 "Base class for a profile of a virtual skeleton used as a target for "
 "retargeting."
@@ -120402,6 +142734,135 @@ msgstr "La direzione non è calcolata."
 msgid "A humanoid [SkeletonProfile] preset."
 msgstr "Una preimpostazione di [SkeletonProfile] umanoide ."
 
+msgid ""
+"A [SkeletonProfile] as a preset that is optimized for the human form. This "
+"exists for standardization, so all parameters are read-only.\n"
+"A humanoid skeleton profile contains 54 bones divided in 4 groups: "
+"[code]\"Body\"[/code], [code]\"Face\"[/code], [code]\"LeftHand\"[/code], and "
+"[code]\"RightHand\"[/code]. It is structured as follows:\n"
+"[codeblock lang=text]\n"
+"Root\n"
+"└─ Hips\n"
+"    ├─ LeftUpperLeg\n"
+"    │  └─ LeftLowerLeg\n"
+"    │     └─ LeftFoot\n"
+"    │        └─ LeftToes\n"
+"    ├─ RightUpperLeg\n"
+"    │  └─ RightLowerLeg\n"
+"    │     └─ RightFoot\n"
+"    │        └─ RightToes\n"
+"    └─ Spine\n"
+"        └─ Chest\n"
+"            └─ UpperChest\n"
+"                ├─ Neck\n"
+"                │   └─ Head\n"
+"                │       ├─ Jaw\n"
+"                │       ├─ LeftEye\n"
+"                │       └─ RightEye\n"
+"                ├─ LeftShoulder\n"
+"                │  └─ LeftUpperArm\n"
+"                │     └─ LeftLowerArm\n"
+"                │        └─ LeftHand\n"
+"                │           ├─ LeftThumbMetacarpal\n"
+"                │           │  └─ LeftThumbProximal\n"
+"                │           │    └─ LeftThumbDistal\n"
+"                │           ├─ LeftIndexProximal\n"
+"                │           │  └─ LeftIndexIntermediate\n"
+"                │           │    └─ LeftIndexDistal\n"
+"                │           ├─ LeftMiddleProximal\n"
+"                │           │  └─ LeftMiddleIntermediate\n"
+"                │           │    └─ LeftMiddleDistal\n"
+"                │           ├─ LeftRingProximal\n"
+"                │           │  └─ LeftRingIntermediate\n"
+"                │           │    └─ LeftRingDistal\n"
+"                │           └─ LeftLittleProximal\n"
+"                │              └─ LeftLittleIntermediate\n"
+"                │                └─ LeftLittleDistal\n"
+"                └─ RightShoulder\n"
+"                   └─ RightUpperArm\n"
+"                      └─ RightLowerArm\n"
+"                         └─ RightHand\n"
+"                            ├─ RightThumbMetacarpal\n"
+"                            │  └─ RightThumbProximal\n"
+"                            │     └─ RightThumbDistal\n"
+"                            ├─ RightIndexProximal\n"
+"                            │  └─ RightIndexIntermediate\n"
+"                            │     └─ RightIndexDistal\n"
+"                            ├─ RightMiddleProximal\n"
+"                            │  └─ RightMiddleIntermediate\n"
+"                            │     └─ RightMiddleDistal\n"
+"                            ├─ RightRingProximal\n"
+"                            │  └─ RightRingIntermediate\n"
+"                            │     └─ RightRingDistal\n"
+"                            └─ RightLittleProximal\n"
+"                               └─ RightLittleIntermediate\n"
+"                                 └─ RightLittleDistal\n"
+"[/codeblock]"
+msgstr ""
+"Uno [SkeletonProfile] come preimpostazione ottimizzato per la forma umana. "
+"Esiste per standardizzazione, quindi tutti i parametri sono di sola lettura.\n"
+"Un profilo di scheletro umanoide contiene 54 ossa divise in 4 gruppi: "
+"[code]\"Body\"[/code], [code]\"Face\"[/code], [code]\"LeftHand\"[/code] e "
+"[code]\"RightHand\"[/code]. È strutturato come segue:\n"
+"[codeblock lang=text]\n"
+"Root\n"
+"└─ Hips\n"
+"    ├─ LeftUpperLeg\n"
+"    │  └─ LeftLowerLeg\n"
+"    │     └─ LeftFoot\n"
+"    │        └─ LeftToes\n"
+"    ├─ RightUpperLeg\n"
+"    │  └─ RightLowerLeg\n"
+"    │     └─ RightFoot\n"
+"    │        └─ RightToes\n"
+"    └─ Spine\n"
+"        └─ Chest\n"
+"            └─ UpperChest\n"
+"                ├─ Neck\n"
+"                │   └─ Head\n"
+"                │       ├─ Jaw\n"
+"                │       ├─ LeftEye\n"
+"                │       └─ RightEye\n"
+"                ├─ LeftShoulder\n"
+"                │  └─ LeftUpperArm\n"
+"                │     └─ LeftLowerArm\n"
+"                │        └─ LeftHand\n"
+"                │           ├─ LeftThumbMetacarpal\n"
+"                │           │  └─ LeftThumbProximal\n"
+"                │           │    └─ LeftThumbDistal\n"
+"                │           ├─ LeftIndexProximal\n"
+"                │           │  └─ LeftIndexIntermediate\n"
+"                │           │    └─ LeftIndexDistal\n"
+"                │           ├─ LeftMiddleProximal\n"
+"                │           │  └─ LeftMiddleIntermediate\n"
+"                │           │    └─ LeftMiddleDistal\n"
+"                │           ├─ LeftRingProximal\n"
+"                │           │  └─ LeftRingIntermediate\n"
+"                │           │    └─ LeftRingDistal\n"
+"                │           └─ LeftLittleProximal\n"
+"                │              └─ LeftLittleIntermediate\n"
+"                │                └─ LeftLittleDistal\n"
+"                └─ RightShoulder\n"
+"                   └─ RightUpperArm\n"
+"                      └─ RightLowerArm\n"
+"                         └─ RightHand\n"
+"                            ├─ RightThumbMetacarpal\n"
+"                            │  └─ RightThumbProximal\n"
+"                            │     └─ RightThumbDistal\n"
+"                            ├─ RightIndexProximal\n"
+"                            │  └─ RightIndexIntermediate\n"
+"                            │     └─ RightIndexDistal\n"
+"                            ├─ RightMiddleProximal\n"
+"                            │  └─ RightMiddleIntermediate\n"
+"                            │     └─ RightMiddleDistal\n"
+"                            ├─ RightRingProximal\n"
+"                            │  └─ RightRingIntermediate\n"
+"                            │     └─ RightRingDistal\n"
+"                            └─ RightLittleProximal\n"
+"                               └─ RightLittleIntermediate\n"
+"                                 └─ RightLittleDistal\n"
+"[/codeblock]"
+
 msgid ""
 "A reference-counted holder object for a skeleton RID used in the "
 "[RenderingServer]."
@@ -120604,6 +143065,22 @@ msgstr ""
 "Se [code]true[/code], lo slider visualizzerà delle tacche per i valori minimo "
 "e massimo."
 
+msgid ""
+"Emitted when the grabber stops being dragged. If [param value_changed] is "
+"[code]true[/code], [member Range.value] is different from the value when the "
+"dragging was started."
+msgstr ""
+"Emesso quando il trascinamento viene terminato. Se [param value_changed] è "
+"[code]true[/code], [member Range.value] è diverso dal valore di quando è "
+"stato iniziato il trascinamento."
+
+msgid ""
+"Emitted when the grabber starts being dragged. This is emitted before the "
+"corresponding [signal Range.value_changed] signal."
+msgstr ""
+"Emesso quando il trascinamento viene iniziato. Viene emesso prima del "
+"corrispondente segnale [signal Range.value_changed]."
+
 msgid ""
 "Boolean constant. If [code]1[/code], the grabber texture size will be ignored "
 "and it will fit within slider's bounds based only on its center position."
@@ -121092,6 +143569,73 @@ msgstr "Il raggio della sfera. Il diametro della forma è il doppio del raggio."
 msgid "An input field for numbers."
 msgstr "Un campo di input per i numeri."
 
+msgid ""
+"[SpinBox] is a numerical input text field. It allows entering integers and "
+"floating-point numbers.\n"
+"[b]Example:[/b] Create a [SpinBox], disable its context menu and set its text "
+"alignment to right.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var spin_box = SpinBox.new()\n"
+"add_child(spin_box)\n"
+"var line_edit = spin_box.get_line_edit()\n"
+"line_edit.context_menu_enabled = false\n"
+"spin_box.horizontal_alignment = LineEdit.HORIZONTAL_ALIGNMENT_RIGHT\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var spinBox = new SpinBox();\n"
+"AddChild(spinBox);\n"
+"var lineEdit = spinBox.GetLineEdit();\n"
+"lineEdit.ContextMenuEnabled = false;\n"
+"spinBox.AlignHorizontal = LineEdit.HorizontalAlignEnum.Right;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See [Range] class for more options over the [SpinBox].\n"
+"[b]Note:[/b] With the [SpinBox]'s context menu disabled, you can right-click "
+"the bottom half of the spinbox to set the value to its minimum, while right-"
+"clicking the top half sets the value to its maximum.\n"
+"[b]Note:[/b] [SpinBox] relies on an underlying [LineEdit] node. To theme a "
+"[SpinBox]'s background, add theme items for [LineEdit] and customize them. "
+"The [LineEdit] has the [code]SpinBoxInnerLineEdit[/code] theme variation, so "
+"that you can give it a distinct appearance from regular [LineEdit]s.\n"
+"[b]Note:[/b] If you want to implement drag and drop for the underlying "
+"[LineEdit], you can use [method Control.set_drag_forwarding] on the node "
+"returned by [method get_line_edit]."
+msgstr ""
+"[SpinBox] è un campo di testo di input numerico. Consente di immettere numeri "
+"interi e numeri in virgola mobile.\n"
+"[b]Esempio:[/b] Crea uno [SpinBox], disattiva il suo menu contestuale e "
+"imposta l'allineamento del testo a destra.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var spin_box = SpinBox.new()\n"
+"add_child(spin_box)\n"
+"var line_edit = spin_box.get_line_edit()\n"
+"line_edit.context_menu_enabled = false\n"
+"spin_box.horizontal_alignment = LineEdit.HORIZONTAL_ALIGNMENT_RIGHT\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var spinBox = new SpinBox();\n"
+"AddChild(spinBox);\n"
+"var lineEdit = spinBox.GetLineEdit();\n"
+"lineEdit.ContextMenuEnabled = false;\n"
+"spinBox.AlignHorizontal = LineEdit.HorizontalAlignEnum.Right;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Consulta la classe [Range] per altre opzioni su [SpinBox].\n"
+"[b]Nota:[/b] Con il menu contestuale di [SpinBox] disabilitato, puoi cliccare "
+"con il destro sulla metà inferiore dello spinbox per impostare il valore al "
+"minimo, mentre cliccando con il destro sulla metà superiore, il valore viene "
+"impostato al massimo.\n"
+"[b]Nota:[/b] [SpinBox] dipende su un nodo [LineEdit] sottostante. Per "
+"applicare un tema allo sfondo di uno [SpinBox], aggiungi elementi del tema "
+"per [LineEdit] e personalizzali. Tale [LineEdit] ha la variazione del tema "
+"[code]SpinBoxInnerLineEdit[/code], in modo da potergli dare un aspetto "
+"distinto dai normali [LineEdit].\n"
+"[b]Nota:[/b] Se vuoi implementare il trascinamento della selezione per il "
+"[LineEdit] sottostante, puoi usare [method Control.set_drag_forwarding] sul "
+"nodo restituito da [method get_line_edit]."
+
 msgid "Applies the current value of this [SpinBox]."
 msgstr "Applica il valore attuale di questo [SpinBox]."
 
@@ -121157,6 +143701,86 @@ msgstr ""
 "[LineEdit] viene [i]modificato[/i] anziché [i]inviato[/i]. Vedi [signal "
 "LineEdit.text_changed] e [signal LineEdit.text_submitted]."
 
+msgid "Down button icon modulation color, when the button is disabled."
+msgstr ""
+"Colore di modulazione del pulsante giù, quando il pulsante è disabilitato."
+
+msgid "Down button icon modulation color, when the button is hovered."
+msgstr ""
+"Colore di modulazione del pulsante giù, quando il pulsante è passato dal "
+"cursore del mouse."
+
+msgid "Down button icon modulation color, when the button is being pressed."
+msgstr "Colore di modulazione del pulsante giù, quando il pulsante è premuto."
+
+msgid "Up button icon modulation color, when the button is disabled."
+msgstr ""
+"Colore di modulazione del pulsante su, quando il pulsante è disabilitato."
+
+msgid "Up button icon modulation color, when the button is hovered."
+msgstr ""
+"Colore di modulazione del pulsante su, quando il pulsante è passato dal "
+"cursore del mouse."
+
+msgid "Up button icon modulation color, when the button is being pressed."
+msgstr "Colore di modulazione del pulsante su, quando il pulsante è premuto."
+
+msgid "Vertical separation between the up and down buttons."
+msgstr "La separazione verticale tra i pulsanti su e giù."
+
+msgid ""
+"Width of the horizontal separation between the text input field ([LineEdit]) "
+"and the buttons."
+msgstr ""
+"La larghezza della separazione orizzontale tra il campo di input del testo "
+"([LineEdit]) e i pulsanti."
+
+msgid "Down button icon when the button is disabled."
+msgstr "Icona del pulsante giù quando il pulsante è disabilitato."
+
+msgid "Down button icon when the button is hovered."
+msgstr ""
+"Icona del pulsante giù quando il pulsante è passato dal cursore del mouse."
+
+msgid "Down button icon when the button is being pressed."
+msgstr "Icona del pulsante giù quando il pulsante è premuto."
+
+msgid "Up button icon when the button is disabled."
+msgstr "Icona del pulsante su quando il pulsante è disabilitato."
+
+msgid "Up button icon when the button is hovered."
+msgstr ""
+"Icona del pulsante su quando il pulsante è passato dal cursore del mouse."
+
+msgid "Up button icon when the button is being pressed."
+msgstr "Icona del pulsante su quando il pulsante è premuto."
+
+msgid "Background style of the down button."
+msgstr "Lo stile di sfondo per il pulsante giù."
+
+msgid "Background style of the down button when disabled."
+msgstr "Lo stile di sfondo per il pulsante giù quando è disabilitato."
+
+msgid "Background style of the down button when hovered."
+msgstr ""
+"Lo stile di sfondo per il pulsante giù quando è passato dal cursore del mouse."
+
+msgid "Background style of the down button when being pressed."
+msgstr "Lo stile di sfondo per il pulsante giù quando è premuto."
+
+msgid "Background style of the up button."
+msgstr "Lo stile di sfondo per il pulsante su."
+
+msgid "Background style of the up button when disabled."
+msgstr "Lo stile di sfondo per il pulsante su quando è disabilitato."
+
+msgid "Background style of the up button when hovered."
+msgstr ""
+"Lo stile di sfondo per il pulsante su quando è passato dal cursore del mouse."
+
+msgid "Background style of the up button when being pressed."
+msgstr "Lo stile di sfondo per il pulsante su quando è premuto."
+
 msgid ""
 "A container that splits two child controls horizontally or vertically and "
 "provides a grabber for adjusting the split ratio."
@@ -121181,6 +143805,16 @@ msgstr ""
 "Limita il valore di [member split_offset] per rimanere nell'intervallo "
 "definito dai valori minimo e massimo attualmente possibili."
 
+msgid ""
+"If [code]true[/code], the dragger will be disabled and the children will be "
+"sized as if the [member split_offset] was [code]0[/code]."
+msgstr ""
+"Se [code]true[/code], il dragger sarà disabilitato e i figli saranno "
+"ridimensionati come se [member split_offset] fosse [code]0[/code]."
+
+msgid "Enables or disables split dragging."
+msgstr "Abilita o disabilita il trascinamento diviso."
+
 msgid ""
 "The initial offset of the splitting between the two [Control]s, with [code]0[/"
 "code] being at the end of the first [Control]."
@@ -121198,9 +143832,44 @@ msgstr ""
 "Non può essere modificato quando si utilizzano [HSplitContainer] e "
 "[VSplitContainer]."
 
+msgid "Emitted when the user ends dragging."
+msgstr "Emesso quando l'utente finisce di trascinare."
+
+msgid "Emitted when the user starts dragging."
+msgstr "Emesso quando l'utente inizia a trascinare."
+
 msgid "Emitted when the dragger is dragged by user."
 msgstr "Emesso quando il trascinatore viene trascinato dall'utente."
 
+msgid ""
+"The split dragger icon is not visible, and the split bar is collapsed to zero "
+"thickness."
+msgstr ""
+"L'icona del trascinatore divisore non è visibile, e la barra di divisione è "
+"ridotta a spessore zero."
+
+msgid ""
+"Boolean value. If [code]1[/code] ([code]true[/code]), the grabber will hide "
+"automatically when it isn't under the cursor. If [code]0[/code] ([code]false[/"
+"code]), it's always visible. The [member dragger_visibility] must be "
+"[constant DRAGGER_VISIBLE]."
+msgstr ""
+"Valore booleano. Se [code]1[/code] ([code]true[/code]), il grabber si "
+"nasconderà automaticamente quando non si trova sotto il cursore. Se [code]0[/"
+"code] ([code]false[/code]), è sempre visibile. [member dragger_visibility] "
+"deve essere [constant DRAGGER_VISIBLE]."
+
+msgid ""
+"The minimum thickness of the area users can click on to grab the split bar. "
+"This ensures that the split bar can still be dragged if [theme_item "
+"separation] or [theme_item h_grabber] / [theme_item v_grabber]'s size is too "
+"narrow to easily select."
+msgstr ""
+"Lo spessore minimo dell'area su cui gli utenti possono cliccare per afferrare "
+"la barra di divisione. Questo garantisce che la barra di divisione sia "
+"comunque trascinabile se [theme_item separation] o [theme_item h_grabber] / "
+"[theme_item v_grabber] sono troppo piccoli da selezionare facilmente."
+
 msgid "The icon used for the grabber drawn in the middle area."
 msgstr "L'icona utilizzata per il grabber disegnato nell'area centrale."
 
@@ -121413,6 +144082,418 @@ msgstr ""
 "Per saperne di più su come eseguire una proiezione di forma o una proiezione "
 "di raggio, consultare la documentazione di [PhysicsDirectSpaceState3D]."
 
+msgid ""
+"Get parent [Skeleton3D] node of the parent [SpringBoneSimulator3D] if found."
+msgstr ""
+"Ottiene il nodo [Skeleton3D] genitore del [SpringBoneSimulator3D] genitore se "
+"trovato."
+
+msgid ""
+"If [code]true[/code], the collision acts to trap the joint within the "
+"collision."
+msgstr ""
+"Se [code]true[/code], la collisione agisce intrappolando il giunto "
+"all'interno della collisione."
+
+msgid "The sphere's radius."
+msgstr "Il raggio della sfera."
+
+msgid ""
+"Returns [code]true[/code] if the all child [SpringBoneCollision3D]s are "
+"contained in the collision list at [param index] in the settings."
+msgstr ""
+"Restituisce [code]true[/code] se tutti i figli [SpringBoneCollision3D] sono "
+"contenuti nella lista di collisioni all'indice [param index] nelle "
+"impostazioni."
+
+msgid "Clears all settings."
+msgstr "Cancella tutte le impostazioni."
+
+msgid "Returns the center bone index of the bone chain."
+msgstr "Restituisce il percorso di nodo centrale della catena d'ossa."
+
+msgid "Returns the center bone name of the bone chain."
+msgstr "Restituisce il nome dell'osso centrale della catena d'ossa."
+
+msgid "Returns what the center originates from in the bone chain."
+msgstr "Restituisce l'origine del centro nella catena d'ossa."
+
+msgid "Returns the center node path of the bone chain."
+msgstr "Restituisce il percorso di nodo centrale della catena d'ossa."
+
+msgid ""
+"Returns the collision count of the bone chain's collision list when [method "
+"are_all_child_collisions_enabled] is [code]false[/code]."
+msgstr ""
+"Restituisce il numero di collisioni della lista delle collisioni della catena "
+"d'ossa quando [method are_all_child_collisions_enabled] è [code]false[/code]."
+
+msgid ""
+"Returns the node path of the [SpringBoneCollision3D] at [param collision] in "
+"the bone chain's collision list when [method "
+"are_all_child_collisions_enabled] is [code]false[/code]."
+msgstr ""
+"Restituisce il percorso di nodo del [SpringBoneCollision3D] in [param "
+"collision] nella lista delle collisioni della catena d'ossa quando [method "
+"are_all_child_collisions_enabled] è [code]false[/code]."
+
+msgid "Returns the drag force damping curve of the bone chain."
+msgstr ""
+"Restituisce la curva di smorzamento per la forza di resistenza della catena "
+"d'ossa."
+
+msgid "Returns the end bone index of the bone chain."
+msgstr "Restituisce l'indice dell'osso finale della catena d'ossa."
+
+msgid ""
+"Returns the end bone's tail direction of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"Restituisce la direzione della coda dell'osso finale della catena d'ossa "
+"quando [method is_end_bone_extended] è [code]true[/code]."
+
+msgid ""
+"Returns the end bone's tail length of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"Restituisce la lunghezza della coda dell'osso finale della catena d'ossa "
+"quando [method is_end_bone_extended] è [code]true[/code]."
+
+msgid "Returns the end bone name of the bone chain."
+msgstr "Restituisce il nome dell'osso finale della coda d'ossa."
+
+msgid ""
+"Returns the exclude collision count of the bone chain's exclude collision "
+"list when [method are_all_child_collisions_enabled] is [code]true[/code]."
+msgstr ""
+"Restituisce il numero di collisioni escluse della lista delle collisioni "
+"escluse della catena d'ossa quando [method are_all_child_collisions_enabled] "
+"è [code]true[/code]."
+
+msgid ""
+"Returns the node path of the [SpringBoneCollision3D] at [param collision] in "
+"the bone chain's exclude collision list when [method "
+"are_all_child_collisions_enabled] is [code]true[/code]."
+msgstr ""
+"Restituisce il percorso di nodo del [SpringBoneCollision3D] in [param "
+"collision] nella lista di esclusioni delle collisioni della catena d'ossa "
+"quando [method are_all_child_collisions_enabled] è [code]true[/code]."
+
+msgid "Returns the gravity amount of the bone chain."
+msgstr "Restituisce la quantità di gravità della catena d'ossa."
+
+msgid "Returns the gravity amount damping curve of the bone chain."
+msgstr ""
+"Restituisce la curva di smorzamento per la quantità di gravità della catena "
+"d'ossa."
+
+msgid "Returns the gravity direction of the bone chain."
+msgstr "Restituisce la direzione di gravità della catena d'ossa."
+
+msgid "Returns the bone index at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce l'indice dell'osso in [param joint] nella lista delle "
+"articolazioni della catena d'ossa."
+
+msgid "Returns the bone name at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce il nome dell'osso in [param joint] nella lista delle "
+"articolazioni della catena d'ossa."
+
+msgid "Returns the joint count of the bone chain's joint list."
+msgstr ""
+"Restituisce il numero di articolazioni nella lista delle articolazioni della "
+"catena d'ossa."
+
+msgid "Returns the drag force at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce la forza di resistenza in [param joint] nella lista delle "
+"articolazioni della catena d'ossa."
+
+msgid ""
+"Returns the gravity amount at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce la quantità di gravità in [param joint] nella lista delle "
+"articolazioni della catena d'ossa."
+
+msgid ""
+"Returns the gravity direction at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce la direzione di gravità in [param joint] nella lista delle "
+"articolazioni della catena d'ossa."
+
+msgid "Returns the radius at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce il raggio in [param joint] nella lista delle articolazioni della "
+"catena d'ossa."
+
+msgid ""
+"Returns the rotation axis at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce l'asse di rotazione in [param joint] nella lista delle "
+"articolazioni della catena d'ossa."
+
+msgid ""
+"Returns the stiffness force at [param joint] in the bone chain's joint list."
+msgstr ""
+"Restituisce la forza di rigidità in [param joint] nella lista delle "
+"articolazioni della catena d'ossa."
+
+msgid "Returns the root bone index of the bone chain."
+msgstr "Restituisce l'indice dell'osso radice della catena d'ossa."
+
+msgid "Returns the root bone name of the bone chain."
+msgstr "Restituisce il nome dell'osso radice della catena d'ossa."
+
+msgid "Returns the rotation axis of the bone chain."
+msgstr "Restituisce l'asse di rotazione della catena d'ossa."
+
+msgid "Returns the stiffness force of the bone chain."
+msgstr "Restituisce la forza di rigidità della catena d'ossa."
+
+msgid "Returns the stiffness force damping curve of the bone chain."
+msgstr ""
+"Restituisce la curva di smorzamento per la forza di rigidità della catena "
+"d'ossa."
+
+msgid ""
+"Returns [code]true[/code] if the config can be edited individually for each "
+"joint."
+msgstr ""
+"Restituisce [code]true[/code] se la configurazione può essere modificata "
+"individualmente per ogni articolazione."
+
+msgid "Returns [code]true[/code] if the end bone is extended to have the tail."
+msgstr ""
+"Restituisce [code]true[/code] se l'osso finale è prolungato per avere la coda."
+
+msgid "Sets the center bone index of the bone chain."
+msgstr "Imposta l'indice dell'osso centrale della catena d'ossa."
+
+msgid "Sets the center bone name of the bone chain."
+msgstr "Imposta il nome dell'osso centrale della catena d'ossa."
+
+msgid ""
+"Sets what the center originates from in the bone chain.\n"
+"Bone movement is calculated based on the difference in relative distance "
+"between center and bone in the previous and next frames.\n"
+"For example, if the parent [Skeleton3D] is used as the center, the bones are "
+"considered to have not moved if the [Skeleton3D] moves in the world.\n"
+"In this case, only a change in the bone pose is considered to be a bone "
+"movement."
+msgstr ""
+"Imposta l'origine del centro nella catena d'ossa.\n"
+"Il movimento delle ossa viene calcolato in base alla differenza nella "
+"distanza relativa tra centro e osso nei frame precedenti e successivi.\n"
+"Ad esempio, se lo [Skeleton3D] genitore è utilizzato come centro, le ossa "
+"sono considerate come non mosse se lo [Skeleton3D] si muove nel mondo.\n"
+"In questo caso, solo un cambiamento nella posa dell'osso viene considerato un "
+"movimento d'osso."
+
+msgid "Sets the center node path of the bone chain."
+msgstr "Imposta il percorso di nodo centrale della catena d'ossa."
+
+msgid ""
+"Sets the number of collisions in the collision list at [param index] in the "
+"settings when [method are_all_child_collisions_enabled] is [code]false[/code]."
+msgstr ""
+"Imposta il numero di collisioni nella lista delle collisioni all'indice "
+"[param index] nelle impostazioni quando [method "
+"are_all_child_collisions_enabled] è [code]false[/code]."
+
+msgid ""
+"Sets the node path of the [SpringBoneCollision3D] at [param collision] in the "
+"bone chain's collision list when [method are_all_child_collisions_enabled] is "
+"[code]false[/code]."
+msgstr ""
+"Imposta il percorso di nodo del [SpringBoneCollision3D] in [param collision] "
+"nella lista di collisioni della catena d'ossa quando [method "
+"are_all_child_collisions_enabled] è [code]false[/code]."
+
+msgid ""
+"Sets the drag force of the bone chain. The greater the value, the more "
+"suppressed the wiggling.\n"
+"The value is scaled by [method set_drag_damping_curve] and cached in each "
+"joint setting in the joint list."
+msgstr ""
+"Restituisce la forza di resistenza della catena d'ossa. Maggiore è il valore, "
+"più soppresse sono le oscillazioni.\n"
+"Questo valore viene ridimensionato da [method set_drag_damping_curve] e "
+"memorizzato nella cache in ogni impostazione d'articolazione nella lista "
+"delle articolazioni."
+
+msgid "Sets the drag force damping curve of the bone chain."
+msgstr ""
+"Imposta la curva di smorzamento per la forza di resistenza della catena "
+"d'ossa."
+
+msgid "Sets the end bone index of the bone chain."
+msgstr "Imposta l'indice dell'osso finale della catena d'ossa."
+
+msgid ""
+"Sets the end bone tail direction of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"Imposta la direzione della coda dell'osso finale della catena d'ossa quando "
+"[method is_end_bone_extended] è [code]true[/code]."
+
+msgid ""
+"Sets the end bone tail length of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"Imposta la lunghezza della coda dell'osso finale della catena d'ossa quando "
+"[method is_end_bone_extended] è [code]true[/code]."
+
+msgid ""
+"Sets the end bone name of the bone chain.\n"
+"[b]Note:[/b] End bone must be the root bone or a child of the root bone. If "
+"they are the same, the tail must be extended by [method set_extend_end_bone] "
+"to jiggle the bone."
+msgstr ""
+"Imposta il nome dell'osso finale della coda d'ossa.\n"
+"[b]Nota:[/b] L'osso finale deve essere l'osso radice o un figlio dell'osso "
+"radice. Se sono uguali, la coda deve essere estesa con [method "
+"set_extend_end_bone] per far oscillare l'osso."
+
+msgid ""
+"Sets the node path of the [SpringBoneCollision3D] at [param collision] in the "
+"bone chain's exclude collision list when [method "
+"are_all_child_collisions_enabled] is [code]true[/code]."
+msgstr ""
+"Imposta il percorso di nodo del [SpringBoneCollision3D] in [param collision] "
+"nella lista di esclusioni delle collisioni della catena d'ossa quando [method "
+"are_all_child_collisions_enabled] è [code]true[/code]."
+
+msgid ""
+"Sets the gravity amount of the bone chain. This value is not an acceleration, "
+"but a constant velocity of movement in [method set_gravity_direction].\n"
+"If [param gravity] is not [code]0[/code], the modified pose will not return "
+"to the original pose since it is always affected by gravity.\n"
+"The value is scaled by [method set_gravity_damping_curve] and cached in each "
+"joint setting in the joint list."
+msgstr ""
+"Imposta la quantità di gravità della catena d'ossa. Questo valore non è "
+"un'accelerazione, ma una velocità costante di movimento in [method "
+"set_gravity_direction].\n"
+"Se [param gravity] non è [code]0[/code], la posa modificata non tornerà alla "
+"posa originale poiché è sempre influenzata dalla gravità.\n"
+"Questo valore viene ridimensionato da [method set_gravity_damping_curve] e "
+"memorizzato nella cache in ogni impostazione d'articolazione nella lista "
+"delle articolazioni."
+
+msgid "Sets the gravity amount damping curve of the bone chain."
+msgstr ""
+"Imposta la curva di smorzamento per la quantità di gravità della catena "
+"d'ossa."
+
+msgid ""
+"Sets the gravity direction of the bone chain. This value is internally "
+"normalized and then multiplied by [method set_gravity].\n"
+"The value is cached in each joint setting in the joint list."
+msgstr ""
+"Imposta la direzione di gravità della catena d'ossa. Questo valore viene "
+"normalizzato internamente e poi moltiplicato per [method set_gravity].\n"
+"Il valore viene memorizzato nella cache in ogni impostazione d'articolazione "
+"nella lista delle articolazioni."
+
+msgid ""
+"If [param enabled] is [code]true[/code], the config can be edited "
+"individually for each joint."
+msgstr ""
+"Se [param enabled] è [code]true[/code], la configurazione può essere "
+"modificata individualmente per ogni articolazione."
+
+msgid ""
+"Sets the drag force at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"Imposta la forza di resistenza in [param joint] nella lista delle "
+"articolazioni della catena d'ossa quando [method is_config_individual] è "
+"[code]true[/code]."
+
+msgid ""
+"Sets the gravity amount at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"Imposta la quantità di gravità in [param joint] nella lista delle "
+"articolazioni della catena d'ossa quando [method is_config_individual] è "
+"[code]true[/code]."
+
+msgid ""
+"Sets the gravity direction at [param joint] in the bone chain's joint list "
+"when [method is_config_individual] is [code]true[/code]."
+msgstr ""
+"Imposta la direzione di gravità in [param joint] nella lista delle "
+"articolazioni della catena d'ossa quando [method is_config_individual] è "
+"[code]true[/code]."
+
+msgid ""
+"Sets the rotation axis at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"Imposta l'asse di rotazione in [param joint] nella lista delle articolazioni "
+"della catena d'ossa quando [method is_config_individual] è [code]true[/code]."
+
+msgid ""
+"Sets the stiffness force at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"Imposta la forza di rigidità in [param joint] nella lista delle articolazioni "
+"della catena d'ossa quando [method is_config_individual] è [code]true[/code]."
+
+msgid "Sets the root bone index of the bone chain."
+msgstr "Imposta l'indice dell'osso radice della catena d'ossa."
+
+msgid "Sets the root bone name of the bone chain."
+msgstr "Imposta il nome dell'osso radice della catena d'ossa."
+
+msgid ""
+"Sets the rotation axis of the bone chain. If sets a specific axis, it acts "
+"like a hinge joint.\n"
+"The value is cached in each joint setting in the joint list.\n"
+"[b]Note:[/b] The rotation axis and the forward vector shouldn't be colinear "
+"to avoid unintended rotation since [SpringBoneSimulator3D] does not factor in "
+"twisting forces."
+msgstr ""
+"Imposta l'asse di rotazione della catena d'ossa.\n"
+"Questo valore viene memorizzato nella cache in ogni impostazione "
+"d'articolazione nella lista delle articolazioni.\n"
+"[b]Nota:[/b] L'asse di rotazione e il vettore in avanti non dovrebbero essere "
+"collineari per evitare rotazioni indesiderate poiché [SpringBoneSimulator3D] "
+"non tiene conto delle forze di torsione."
+
+msgid ""
+"Sets the stiffness force of the bone chain. The greater the value, the faster "
+"it recovers to its initial pose.\n"
+"If [param stiffness] is [code]0[/code], the modified pose will not return to "
+"the original pose.\n"
+"The value is scaled by [method set_stiffness_damping_curve] and cached in "
+"each joint setting in the joint list."
+msgstr ""
+"Restituisce la forza di rigidità della catena d'ossa. Maggiore è il valore, "
+"più velocemente recupera la sua posa originale.\n"
+"Se [param stiffness] è [code]0[/code], la posa modificata non tornerà alla "
+"posa originale.\n"
+"Questo valore viene ridimensionato da [method set_stiffness_damping_curve] e "
+"memorizzato nella cache in ogni impostazione d'articolazione nella lista "
+"delle articolazioni."
+
+msgid "Sets the stiffness force damping curve of the bone chain."
+msgstr ""
+"Imposta la curva di smorzamento per la forza di rigidità della catena d'ossa."
+
+msgid "The number of settings."
+msgstr "Il numero di impostazioni."
+
+msgid "Enumerated value for the rotation of the X axis."
+msgstr "Valore enumerato per la rotazione dell'asse X."
+
+msgid "Enumerated value for the rotation of the Y axis."
+msgstr "Valore enumerato per la rotazione dell'asse Y."
+
+msgid "Enumerated value for the rotation of the Z axis."
+msgstr "Valore enumerato per la rotazione dell'asse Z."
+
 msgid "General-purpose sprite node."
 msgstr "Nodo di sprite per uso generale."
 
@@ -121424,6 +144505,64 @@ msgstr ""
 "regione di una texture più grande di atlante, o un fotogramma d'animazione da "
 "uno sprite sheet."
 
+msgid ""
+"Returns a [Rect2] representing the Sprite2D's boundary in local coordinates.\n"
+"[b]Example:[/b] Detect if the Sprite2D was clicked:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _input(event):\n"
+"    if event is InputEventMouseButton and event.pressed and event."
+"button_index == MOUSE_BUTTON_LEFT:\n"
+"        if get_rect().has_point(to_local(event.position)):\n"
+"            print(\"A click!\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Input(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseButton inputEventMouse)\n"
+"    {\n"
+"        if (inputEventMouse.Pressed && inputEventMouse.ButtonIndex == "
+"MouseButton.Left)\n"
+"        {\n"
+"            if (GetRect().HasPoint(ToLocal(inputEventMouse.Position)))\n"
+"            {\n"
+"                GD.Print(\"A click!\");\n"
+"            }\n"
+"        }\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce un [Rect2] che rappresenta il confine dello Sprite2D in "
+"coordinate locali.\n"
+"[b]Esempio:[/b] Rileva se lo Sprite2D è stato cliccato:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _input(event):\n"
+"    if event is InputEventMouseButton and event.pressed and event."
+"button_index == MOUSE_BUTTON_LEFT:\n"
+"        if get_rect().has_point(to_local(event.position)):\n"
+"            print(\"A click!\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Input(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseButton inputEventMouse)\n"
+"    {\n"
+"        if (inputEventMouse.Pressed && inputEventMouse.ButtonIndex == "
+"MouseButton.Left)\n"
+"        {\n"
+"            if (GetRect().HasPoint(ToLocal(inputEventMouse.Position)))\n"
+"            {\n"
+"                GD.Print(\"A click!\");\n"
+"            }\n"
+"        }\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns [code]true[/code], if the pixel at the given position is opaque and "
 "[code]false[/code] in other case. The position is in local coordinates.\n"
@@ -121491,6 +144630,15 @@ msgstr ""
 "Se [code]true[/code], la texture è ritagliata da una texture più grande "
 "dell'atlante. Vedi [member region_rect]."
 
+msgid ""
+"If [code]true[/code], the area outside of the [member region_rect] is clipped "
+"to avoid bleeding of the surrounding texture pixels. [member region_enabled] "
+"must be [code]true[/code]."
+msgstr ""
+"Se [code]true[/code], l'area al di fuori della regione [member region_rect] è "
+"ritagliata per evitare il bleeding dei pixel circostanti della texture. "
+"[member region_enabled] deve essere [code]true[/code]."
+
 msgid "[Texture2D] object to draw."
 msgstr "L'ogetto [Texture2D] da disegnare."
 
@@ -122196,6 +145344,20 @@ msgstr ""
 "prima di esportare il progetto o di utilizzare la distribuzione con un clic. "
 "Altrimenti, qualsiasi tipo di comunicazione di rete sarà bloccata da Android."
 
+msgid ""
+"Opens the TCP socket, and binds it to the specified local address.\n"
+"This method is generally not needed, and only used to force the subsequent "
+"call to [method connect_to_host] to use the specified [param host] and [param "
+"port] as source address. This can be desired in some NAT punchthrough "
+"techniques, or when forcing the source network interface."
+msgstr ""
+"Apre il socket TCP e lo associa all'indirizzo locale specificato.\n"
+"Questo metodo in genere non è necessario e viene utilizzato solo per forzare "
+"la chiamata successiva a [method connect_to_host] per utilizzare l'[param "
+"host] e la [param port] specificati come indirizzo sorgente. Ciò può essere "
+"desiderato in alcune tecniche NAT punchthrough o quando si forza "
+"l'interfaccia di rete sorgente."
+
 msgid ""
 "Connects to the specified [code]host:port[/code] pair. A hostname will be "
 "resolved if valid. Returns [constant OK] on success."
@@ -122332,6 +145494,43 @@ msgstr ""
 msgid "A built-in type for strings."
 msgstr "Un tipo integrato per le stringhe."
 
+msgid ""
+"This is the built-in string Variant type (and the one used by GDScript). "
+"Strings may contain any number of Unicode characters, and expose methods "
+"useful for manipulating and generating strings. Strings are reference-counted "
+"and use a copy-on-write approach (every modification to a string returns a "
+"new [String]), so passing them around is cheap in resources.\n"
+"Some string methods have corresponding variations. Variations suffixed with "
+"[code]n[/code] ([method countn], [method findn], [method replacen], etc.) are "
+"[b]case-insensitive[/b] (they make no distinction between uppercase and "
+"lowercase letters). Method variations prefixed with [code]r[/code] ([method "
+"rfind], [method rsplit], etc.) are reversed, and start from the end of the "
+"string, instead of the beginning.\n"
+"To convert any [Variant] to or from a string, see [method @GlobalScope.str], "
+"[method @GlobalScope.str_to_var], and [method @GlobalScope.var_to_str].\n"
+"[b]Note:[/b] In a boolean context, a string will evaluate to [code]false[/"
+"code] if it is empty ([code]\"\"[/code]). Otherwise, a string will always "
+"evaluate to [code]true[/code]."
+msgstr ""
+"Questo è il tipo di Variant stringa integrato (e quello utilizzato da "
+"GDScript). Le stringhe possono contenere un numero qualsiasi di caratteri "
+"Unicode, ed espongono metodi utili per manipolare e generare stringhe. Le "
+"stringhe sono conteggiate per riferimento e utilizzano un approccio copy-on-"
+"write (ogni modifica a una stringa restituisce una nuova [String]), quindi "
+"passarle in giro è economico in termini di risorse.\n"
+"Alcuni metodi di stringa hanno variazioni corrispondenti. Le variazioni con "
+"suffisso [code]n[/code] ([method countn], [method findn], [method replacen], "
+"ecc.) [b]non fanno distinzione[/b] tra lettere maiuscole e minuscole. Le "
+"variazioni dei metodi con prefisso [code]r[/code] ([method rfind], [method "
+"rsplit], ecc.) sono invertite e iniziano dalla fine della stringa, anziché "
+"dall'inizio.\n"
+"Per convertire qualsiasi [Variant] in o da una stringa, vedi [method "
+"@GlobalScope.str], [method @GlobalScope.str_to_var] e [method @GlobalScope."
+"var_to_str].\n"
+"[b]Nota:[/b] In un contesto booleano, una stringa sarà valutata come "
+"[code]false[/code] se è vuota ([code]\"\"[/code]). Altrimenti, una stringa "
+"sarà sempre valutata come [code]true[/code]."
+
 msgid "GDScript format strings"
 msgstr "Formattazione di stringhe in GDScript"
 
@@ -122504,6 +145703,39 @@ msgstr ""
 "print(String.chr(129302)) # Stampa \"🤖\" (emoji faccia di robot)\n"
 "[/codeblock]"
 
+msgid ""
+"Returns [code]true[/code] if the string contains [param what]. In GDScript, "
+"this corresponds to the [code]in[/code] operator.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(\"Node\".contains(\"de\")) # Prints true\n"
+"print(\"team\".contains(\"I\"))  # Prints false\n"
+"print(\"I\" in \"team\")         # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(\"Node\".Contains(\"de\")); // Prints True\n"
+"GD.Print(\"team\".Contains(\"I\"));  // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If you need to know where [param what] is within the string, use [method "
+"find]. See also [method containsn]."
+msgstr ""
+"Restituisce [code]true[/code] se la stringa contiene [param what]. In "
+"GDScript, questo corrisponde all'operatore [code]in[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(\"Node\".contains(\"de\")) # Stampa true\n"
+"print(\"team\".contains(\"I\"))  # Stampa false\n"
+"print(\"I\" in \"team\")         # Stampa false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(\"Node\".Contains(\"de\")); // Stampa True\n"
+"GD.Print(\"team\".Contains(\"I\"));  // Stampa False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Se hai bisogno di sapere dove si trova [param what] all'interno della "
+"stringa, usa [method find]. Vedi anche [method containsn]."
+
 msgid ""
 "Returns [code]true[/code] if the string contains [param what], [b]ignoring "
 "case[/b].\n"
@@ -122654,6 +145886,113 @@ msgstr ""
 "maiuscole e minuscole[/b]. L'indice di ricerca di partenza può essere "
 "specificato con [param from], continuando fino alla fine della stringa."
 
+msgid ""
+"Formats the string by replacing all occurrences of [param placeholder] with "
+"the elements of [param values].\n"
+"[param values] can be a [Dictionary], an [Array], or an [Object]. Any "
+"underscores in [param placeholder] will be replaced with the corresponding "
+"keys in advance. Array elements use their index as keys.\n"
+"[codeblock]\n"
+"# Prints \"Waiting for Godot is a play by Samuel Beckett, and Godot Engine is "
+"named after it.\"\n"
+"var use_array_values = \"Waiting for {0} is a play by {1}, and {0} Engine is "
+"named after it.\"\n"
+"print(use_array_values.format([\"Godot\", \"Samuel Beckett\"]))\n"
+"\n"
+"# Prints \"User 42 is Godot.\"\n"
+"print(\"User {id} is {name}.\".format({\"id\": 42, \"name\": \"Godot\"}))\n"
+"[/codeblock]\n"
+"Some additional handling is performed when [param values] is an [Array]. If "
+"[param placeholder] does not contain an underscore, the elements of the "
+"[param values] array will be used to replace one occurrence of the "
+"placeholder in order; If an element of [param values] is another 2-element "
+"array, it'll be interpreted as a key-value pair.\n"
+"[codeblock]\n"
+"# Prints \"User 42 is Godot.\"\n"
+"print(\"User {} is {}.\".format([42, \"Godot\"], \"{}\"))\n"
+"print(\"User {id} is {name}.\".format([[\"id\", 42], [\"name\", "
+"\"Godot\"]]))\n"
+"[/codeblock]\n"
+"When passing an [Object], the property names from [method Object."
+"get_property_list] are used as keys.\n"
+"[codeblock]\n"
+"# Prints \"Visible true, position (0, 0)\"\n"
+"var node = Node2D.new()\n"
+"print(\"Visible {visible}, position {position}\".format(node))\n"
+"[/codeblock]\n"
+"See also the [url=$DOCS_URL/tutorials/scripting/gdscript/"
+"gdscript_format_string.html]GDScript format string[/url] tutorial.\n"
+"[b]Note:[/b] Each replacement is done sequentially for each element of [param "
+"values], [b]not[/b] all at once. This means that if any element is inserted "
+"and it contains another placeholder, it may be changed by the next "
+"replacement. While this can be very useful, it often causes unexpected "
+"results. If not necessary, make sure [param values]'s elements do not contain "
+"placeholders.\n"
+"[codeblock]\n"
+"print(\"{0} {1}\".format([\"{1}\", \"x\"]))           # Prints \"x x\"\n"
+"print(\"{0} {1}\".format([\"x\", \"{0}\"]))           # Prints \"x {0}\"\n"
+"print(\"{a} {b}\".format({\"a\": \"{b}\", \"b\": \"c\"})) # Prints \"c c\"\n"
+"print(\"{a} {b}\".format({\"b\": \"c\", \"a\": \"{b}\"})) # Prints \"{b} c\"\n"
+"[/codeblock]\n"
+"[b]Note:[/b] In C#, it's recommended to [url=https://learn.microsoft.com/en-"
+"us/dotnet/csharp/language-reference/tokens/interpolated]interpolate strings "
+"with \"$\"[/url], instead."
+msgstr ""
+"Formatta la stringa sostituendo tutte le occorrenze di [param placeholder] "
+"con gli elementi di [param values].\n"
+"[param values] può essere un [Dictionary] o un [Array]. Qualsiasi trattino "
+"basso in [param placeholder] verrà sostituito in anticipo con le chiavi "
+"corrispondenti. Gli elementi di array utilizzano il loro indice come chiavi.\n"
+"[codeblock]\n"
+"# Stampa \"Aspettando Godot è un'opera di Samuel Beckett, e il Godot Engine "
+"prende il nome da essa.\"\n"
+"var use_array_values = \"Aspettando {0} è un'opera di {1}, e {0} Engine "
+"prende il nome da essa.\"\n"
+"print(use_array_values.format([\"Godot\", \"Samuel Beckett\"]))\n"
+"\n"
+"# Stampa \"Utente 42 è Godot.\"\n"
+"print(\"Utente {id} è {nome}.\".format({\"id\": 42, \"nome\": \"Godot\"}))\n"
+"[/codeblock]\n"
+"Vengono eseguite alcune operazioni aggiuntive quando [param values] è un "
+"[Array]. Se [param placeholder] non contiene un trattino basso, gli elementi "
+"dell'array [param values] verranno utilizzati per sostituire un'occorrenza "
+"del segnaposto in ordine; se un elemento di [param values] è un altro array "
+"di 2 elementi, verrà interpretato come una coppia chiave-valore.\n"
+"[codeblock]\n"
+"# Stampa \"Utente 42 is Godot.\"\n"
+"print(\"Utente {} è {}.\".format([42, \"Godot\"], \"{}\"))\n"
+"print(\"Utente {id} è {nome}.\".format([[\"id\", 42], [\"nome\", "
+"\"Godot\"]]))\n"
+"[/codeblock]\n"
+"Quando si passa un [Object], i nomi delle proprietà da [method Object."
+"get_property_list] vengono utilizzati come chiavi.\n"
+"[codeblock]\n"
+"# Stampa \"Visibile true, posizione (0, 0)\"\n"
+"var nodo = Node2D.new()\n"
+"print(\"Visibile {visible}, posizione {position}\".format(nodo))\n"
+"[/codeblock]\n"
+"Consulta anche il tutorial [url=$DOCS_URL/tutorials/scripting/gdscript/"
+"gdscript_format_string.html]Stringa di formato GDScript[/url].\n"
+"[b]Nota:[/b] Ogni sostituzione viene eseguita in sequenza per ogni elemento "
+"di [param values], [b]non[/b] tutto in una volta. Ciò significa che se un "
+"elemento viene inserito e contiene un altro segnaposto, potrebbe essere "
+"modificato dalla sostituzione successiva. Sebbene ciò possa essere molto "
+"utile, spesso causa risultati inaspettati. Se non necessario, assicurati che "
+"gli elementi di [param values] non contengano alcun segnaposto.\n"
+"[codeblock]\n"
+"print(\"{0} {1}\".format([\"{1}\", \"x\"]))                       # Stampa "
+"\"x x\"\n"
+"print(\"{0} {1}\".format([\"x\", \"{0}\"]))                       # Stampa "
+"\"x {0}\"\n"
+"print(\"{foo} {bar}\".format({\"a\": \"{b}\", \"b\": \"c\"})) # Stampa \"c "
+"c\"\n"
+"print(\"{foo} {bar}\".format({\"b\": \"c\", \"a\": \"{b}\"})) # Stampa \"{b} "
+"c\"\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] in C#, si consiglia di [url=https://learn.microsoft.com/en-us/"
+"dotnet/csharp/language-reference/tokens/interpolated]interpolare le stringhe "
+"con \"$\"[/url]."
+
 msgid ""
 "If the string is a valid file path, returns the base directory name.\n"
 "[codeblock]\n"
@@ -122725,6 +146064,26 @@ msgstr ""
 "var file = \"/path/to/icon.png\".get_file() # file è \"icon.png\"\n"
 "[/codeblock]"
 
+msgid ""
+"Splits the string using a [param delimiter] and returns the substring at "
+"index [param slice]. Returns the original string if [param delimiter] does "
+"not occur in the string. Returns an empty string if the [param slice] does "
+"not exist.\n"
+"This is faster than [method split], if you only need one substring.\n"
+"[codeblock]\n"
+"print(\"i/am/example/hi\".get_slice(\"/\", 2)) # Prints \"example\"\n"
+"[/codeblock]"
+msgstr ""
+"Divide la stringa tramite un [param delimiter] e restituisce la sottostringa "
+"all'indice [param slice]. Restituisce la stringa originale se [param "
+"delimiter] non esiste nella stringa. Restituisce una stringa vuota se la "
+"sezione all'indice [param slice] non esiste.\n"
+"Questo è più veloce di [method split], se hai bisogno di una sola "
+"sottostringa.\n"
+"[codeblock]\n"
+"print(\"sono/un/esempio/ciao\".get_slice(\"/\", 2)) # Stampa \"esempio\"\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the total number of slices when the string is split with the given "
 "[param delimiter] (see [method split])."
@@ -122914,6 +146273,30 @@ msgstr ""
 "questa stringa in [param text] nel loro ordine originale, [b]ignorando la "
 "distinzione tra le maiuscole e le minuscole[/b]."
 
+msgid ""
+"Returns [code]true[/code] if this string is a valid ASCII identifier. A valid "
+"ASCII identifier may contain only letters, digits, and underscores ([code]_[/"
+"code]), and the first character may not be a digit.\n"
+"[codeblock]\n"
+"print(\"node_2d\".is_valid_ascii_identifier())    # Prints true\n"
+"print(\"TYPE_FLOAT\".is_valid_ascii_identifier()) # Prints true\n"
+"print(\"1st_method\".is_valid_ascii_identifier()) # Prints false\n"
+"print(\"MyMethod#2\".is_valid_ascii_identifier()) # Prints false\n"
+"[/codeblock]\n"
+"See also [method is_valid_unicode_identifier]."
+msgstr ""
+"Restituisce [code]true[/code] se questa stringa è un identificatore ASCII "
+"valido. Un identificatore ASCII valido può contenere solo lettere, cifre e "
+"trattini bassi ([code]_[/code]) e il primo carattere non può essere una "
+"cifra.\n"
+"[codeblock]\n"
+"print(\"node_2d\".is_valid_ascii_identifier())    # Stampa true\n"
+"print(\"TYPE_FLOAT\".is_valid_ascii_identifier()) # Stampa true\n"
+"print(\"1st_method\".is_valid_ascii_identifier()) # Stampa false\n"
+"print(\"MyMethod#2\".is_valid_ascii_identifier()) # Stampa false\n"
+"[/codeblock]\n"
+"Vedi anche [method is_valid_unicode_identifier]."
+
 msgid ""
 "Returns [code]true[/code] if this string does not contain characters that are "
 "not allowed in file names ([code]:[/code] [code]/[/code] [code]\\[/code] "
@@ -122995,6 +146378,9 @@ msgstr ""
 "colori, come nomi o [code]hsl()[/code], non sono considerate valide. Vedi "
 "anche [method Color.html]."
 
+msgid "Use [method is_valid_ascii_identifier] instead."
+msgstr "Utilizza invece [method is_valid_ascii_identifier]."
+
 msgid ""
 "Returns [code]true[/code] if this string is a valid identifier. A valid "
 "identifier may contain only letters, digits and underscores ([code]_[/code]), "
@@ -123052,6 +146438,49 @@ msgstr ""
 "[code]\"0.0.0.0\"[/code] e [code]\"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\"[/"
 "code]."
 
+msgid ""
+"Returns the concatenation of [param parts]' elements, with each element "
+"separated by the string calling this method. This method is the opposite of "
+"[method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var fruits = [\"Apple\", \"Orange\", \"Pear\", \"Kiwi\"]\n"
+"\n"
+"print(\", \".join(fruits))  # Prints \"Apple, Orange, Pear, Kiwi\"\n"
+"print(\"---\".join(fruits)) # Prints \"Apple---Orange---Pear---Kiwi\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"string[] fruits = [\"Apple\", \"Orange\", \"Pear\", \"Kiwi\"];\n"
+"\n"
+"// In C#, this method is static.\n"
+"GD.Print(string.Join(\", \", fruits));  // Prints \"Apple, Orange, Pear, "
+"Kiwi\"\n"
+"GD.Print(string.Join(\"---\", fruits)); // Prints \"Apple---Orange---Pear---"
+"Kiwi\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Restituisce la concatenazione degli elementi di [param parts], con ogni "
+"elemento separato dalla stringa che chiama questo metodo. Questo metodo è "
+"l'opposto di [method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var frutta = [\"Mela\", \"Arancia\", \"Pera\", \"Kiwi\"]\n"
+"\n"
+"print(\", \".join(frutta))  # Stampa \"Mela, Arancia, Pera, Kiwi\"\n"
+"print(\"---\".join(frutta)) # Stampa \"Mela---Arancia---Pera---Kiwi\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"string[] frutta = [\"Mela\", \"Orange\", \"Pear\", \"Kiwi\"];\n"
+"\n"
+"// In C#, questo metodo è statico.\n"
+"GD.Print(string.Join(\", \", frutta));  // Stampa \"Mela, Arancia, Pera, "
+"Kiwi\"\n"
+"GD.Print(string.Join(\"---\", frutta)); // Stampa \"Mela---Arancia---Pera---"
+"Kiwi\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Returns a copy of the string with special characters escaped using the JSON "
 "standard. Because it closely matches the C standard, it is possible to use "
@@ -123250,6 +146679,54 @@ msgstr ""
 "l'operatore [code]==[/code]. Vedi anche [method nocasecmp_to], [method "
 "filecasecmp_to] e [method naturalcasecmp_to]."
 
+msgid ""
+"Converts a [float] to a string representation of a decimal number, with the "
+"number of decimal places specified in [param decimals].\n"
+"If [param decimals] is [code]-1[/code] as by default, the string "
+"representation may only have up to 14 significant digits, with digits before "
+"the decimal point having priority over digits after.\n"
+"Trailing zeros are not included in the string. The last digit is rounded, not "
+"truncated.\n"
+"[codeblock]\n"
+"String.num(3.141593)     # Returns \"3.141593\"\n"
+"String.num(3.141593, 3)  # Returns \"3.142\"\n"
+"String.num(3.14159300)   # Returns \"3.141593\"\n"
+"\n"
+"# Here, the last digit will be rounded up,\n"
+"# which reduces the total digit count, since trailing zeros are removed:\n"
+"String.num(42.129999, 5) # Returns \"42.13\"\n"
+"\n"
+"# If `decimals` is not specified, the maximum number of significant digits is "
+"14:\n"
+"String.num(-0.0000012345432123454321)     # Returns \"-0.00000123454321\"\n"
+"String.num(-10000.0000012345432123454321) # Returns \"-10000.0000012345\"\n"
+"[/codeblock]"
+msgstr ""
+"Converte un [float] in una rappresentazione stringa di un numero decimale, "
+"con il numero di cifre decimali specificato in [param decimals].\n"
+"Se [param decimals] è [code]-1[/code] come predefinito, la rappresentazione "
+"di stringa può avere solo fino a 14 cifre significative, con le cifre prima "
+"del punto decimale che hanno la priorità sulle cifre dopo.\n"
+"Gli zeri finali non sono inclusi nella stringa. L'ultima cifra viene "
+"arrotondata, non troncata.\n"
+"[codeblock]\n"
+"String.num(3.141593)     # Restituisce \"3.141593\"\n"
+"String.num(3.141593, 3)  # Restituisce \"3.142\"\n"
+"String.num(3.14159300)   # Restituisce \"3.141593\"\n"
+"\n"
+"# Qui, l'ultima cifra verrà arrotondata per eccesso,\n"
+"# il che riduce il conteggio totale delle cifre, poiché gli zeri finali "
+"vengono rimossi:\n"
+"String.num(42.129999, 5) # Returns \"42.13\"\n"
+"\n"
+"# Se `decimals` non è specificato, il numero massimo di cifre significative è "
+"14:\n"
+"String.num(-0.0000012345432123454321)     # Restituisce "
+"\"-0.00000123454321\"\n"
+"String.num(-10000.0000012345432123454321) # Restituisce "
+"\"-10000.0000012345\"\n"
+"[/codeblock]"
+
 msgid ""
 "Converts the given [param number] to a string representation, with the given "
 "[param base].\n"
@@ -123434,6 +146911,53 @@ msgstr ""
 "caratteri, aggiungendo più caratteri ([param character]) a destra della "
 "stringa, se necessario. Vedi anche [method lpad]."
 
+msgid ""
+"Splits the string using a [param delimiter] and returns an array of the "
+"substrings, starting from the end of the string. The splits in the returned "
+"array appear in the same order as the original string. If [param delimiter] "
+"is an empty string, each substring will be a single character.\n"
+"If [param allow_empty] is [code]false[/code], empty strings between adjacent "
+"delimiters are excluded from the array.\n"
+"If [param maxsplit] is greater than [code]0[/code], the number of splits may "
+"not exceed [param maxsplit]. By default, the entire string is split, which is "
+"mostly identical to [method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var some_string = \"One,Two,Three,Four\"\n"
+"var some_array = some_string.rsplit(\",\", true, 1)\n"
+"\n"
+"print(some_array.size()) # Prints 2\n"
+"print(some_array[0])     # Prints \"One,Two,Three\"\n"
+"print(some_array[1])     # Prints \"Four\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// In C#, there is no String.RSplit() method.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Divide la stringa tramite un [param delimiter] e restituisce un array delle "
+"sottostringhe, a partire dalla fine della stringa. Le suddivisioni nell'array "
+"restituito appaiono nello stesso ordine della stringa originale. Se [param "
+"delimiter] è una stringa vuota, ogni sottostringa sarà un singolo carattere.\n"
+"Se [param allow_empty] è [code]false[/code], le stringhe vuote tra "
+"delimitatori adiacenti vengono escluse dall'array.\n"
+"Se [param maxsplit] è maggiore di [code]0[/code], il numero di suddivisioni "
+"non può superare [param maxsplit]. Come predefinito, l'intera stringa viene "
+"suddivisa, il che è maggiormente identico a [method split].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var some_string = \"Uno,Due,Tre,Quattro\"\n"
+"var some_array = some_string.rsplit(\",\", true, 1)\n"
+"\n"
+"print(some_array.size()) # Stampa 2\n"
+"print(some_array[0])     # Stampa \"Uno,Due,Tre\"\n"
+"print(some_array[1])     # Stampa \"Quattro\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// In C#, non esiste il metodo String.RSplit().\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Removes a set of characters defined in [param chars] from the string's end. "
 "See also [method lstrip].\n"
@@ -123473,6 +146997,29 @@ msgstr ""
 "Restituisce l'hash [url=https://en.wikipedia.org/wiki/SHA-2]SHA-256[/url] "
 "della stringa sotto forma di un altra [String]."
 
+msgid ""
+"Returns the similarity index ([url=https://en.wikipedia.org/wiki/"
+"S%C3%B8rensen%E2%80%93Dice_coefficient]Sørensen-Dice coefficient[/url]) of "
+"this string compared to another. A result of [code]1.0[/code] means totally "
+"similar, while [code]0.0[/code] means totally dissimilar.\n"
+"[codeblock]\n"
+"print(\"ABC123\".similarity(\"ABC123\")) # Prints 1.0\n"
+"print(\"ABC123\".similarity(\"XYZ456\")) # Prints 0.0\n"
+"print(\"ABC123\".similarity(\"123ABC\")) # Prints 0.8\n"
+"print(\"ABC123\".similarity(\"abc123\")) # Prints 0.4\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce l'indice di similarità ([url=https://it.wikipedia.org/wiki/"
+"Indice_di_S%C3%B8rensen-Dice]indice di Sørensen-Dice[/url]) di questa stringa "
+"rispetto a un'altra. Un risultato di [code]1.0[/code] significa totalmente "
+"simile, mentre [code]0.0[/code] significa totalmente dissimile.\n"
+"[codeblock]\n"
+"print(\"ABC123\".similarity(\"ABC123\")) # Stampa 1.0\n"
+"print(\"ABC123\".similarity(\"XYZ456\")) # Stampa 0.0\n"
+"print(\"ABC123\".similarity(\"123ABC\")) # Stampa 0.8\n"
+"print(\"ABC123\".similarity(\"abc123\")) # Stampa 0.4\n"
+"[/codeblock]"
+
 msgid ""
 "If the string is a valid file path, converts the string into a canonical "
 "path. This is the shortest possible path, without [code]\"./\"[/code], and "
@@ -123490,6 +147037,66 @@ msgstr ""
 "print(percorso_semplice ) # Stampa \"path/file\"\n"
 "[/codeblock]"
 
+msgid ""
+"Splits the string using a [param delimiter] and returns an array of the "
+"substrings. If [param delimiter] is an empty string, each substring will be a "
+"single character. This method is the opposite of [method join].\n"
+"If [param allow_empty] is [code]false[/code], empty strings between adjacent "
+"delimiters are excluded from the array.\n"
+"If [param maxsplit] is greater than [code]0[/code], the number of splits may "
+"not exceed [param maxsplit]. By default, the entire string is split.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var some_array = \"One,Two,Three,Four\".split(\",\", true, 2)\n"
+"\n"
+"print(some_array.size()) # Prints 3\n"
+"print(some_array[0])     # Prints \"One\"\n"
+"print(some_array[1])     # Prints \"Two\"\n"
+"print(some_array[2])     # Prints \"Three,Four\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// C#'s `Split()` does not support the `maxsplit` parameter.\n"
+"var someArray = \"One,Two,Three\".Split(\",\");\n"
+"\n"
+"GD.Print(someArray[0]); // Prints \"One\"\n"
+"GD.Print(someArray[1]); // Prints \"Two\"\n"
+"GD.Print(someArray[2]); // Prints \"Three\"\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you only need one substring from the array, consider using "
+"[method get_slice] which is faster. If you need to split strings with more "
+"complex rules, use the [RegEx] class instead."
+msgstr ""
+"Divide la stringa tramite un [param delimiter] e restituisce un array delle "
+"sottostringhe. Se [param delimiter] è una stringa vuota, ogni sottostringa "
+"sarà un singolo carattere. Questo metodo è l'opposto di [method join].\n"
+"Se [param allow_empty] è [code]false[/code], le stringhe vuote tra "
+"delimitatori adiacenti vengono escluse dall'array.\n"
+"Se [param maxsplit] è maggiore di [code]0[/code], il numero di suddivisioni "
+"non può superare [param maxsplit]. Come predefinito, l'intera stringa viene "
+"suddivisa.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var some_array = \"Uno,Due,Tre,Quattro\".split(\",\", true, 2)\n"
+"\n"
+"print(some_array.size()) # Stampa 3\n"
+"print(some_array[0])     # Stampa \"Uno\"\n"
+"print(some_array[1])     # Stampa \"Due\"\n"
+"print(some_array[2])     # Stampa \"Tre,Quattro\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// La funzione `Split()` di C# non supporta il parametro `maxsplit`.\n"
+"var someArray = \"Uno,Due,Tre\".Split(\",\");\n"
+"\n"
+"GD.Print(someArray[0]); // Stampa \"Uno\"\n"
+"GD.Print(someArray[1]); // Stampa \"Due\"\n"
+"GD.Print(someArray[2]); // Stampa \"Tre\"\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Se hai bisogno solo di una sottostringa dall'array, considera di "
+"usare [method get_slice] che è più veloce. Se hai bisogno di dividere "
+"stringhe con regole più complesse, usa invece la classe [RegEx]."
+
 msgid ""
 "Splits the string into floats by using a [param delimiter] and returns a "
 "[PackedFloat64Array].\n"
@@ -123952,6 +147559,57 @@ msgstr ""
 msgid "A built-in type for unique strings."
 msgstr "Un tipo integrato per stringhe univoche."
 
+msgid ""
+"[StringName]s are immutable strings designed for general-purpose "
+"representation of unique names (also called \"string interning\"). Two "
+"[StringName]s with the same value are the same object. Comparing them is "
+"extremely fast compared to regular [String]s.\n"
+"You will usually pass a [String] to methods expecting a [StringName] and it "
+"will be automatically converted (often at compile time), but in rare cases "
+"you can construct a [StringName] ahead of time with the [StringName] "
+"constructor or, in GDScript, the literal syntax [code]&\"example\"[/code]. "
+"Manually constructing a [StringName] allows you to control when the "
+"conversion from [String] occurs or to use the literal and prevent conversions "
+"entirely.\n"
+"See also [NodePath], which is a similar concept specifically designed to "
+"store pre-parsed scene tree paths.\n"
+"All of [String]'s methods are available in this class too. They convert the "
+"[StringName] into a string, and they also return a string. This is highly "
+"inefficient and should only be used if the string is desired.\n"
+"[b]Note:[/b] In C#, an explicit conversion to [code]System.String[/code] is "
+"required to use the methods listed on this page. Use the [code]ToString()[/"
+"code] method to cast a [StringName] to a string, and then use the equivalent "
+"methods in [code]System.String[/code] or [code]StringExtensions[/code].\n"
+"[b]Note:[/b] In a boolean context, a [StringName] will evaluate to "
+"[code]false[/code] if it is empty ([code]StringName(\"\")[/code]). Otherwise, "
+"a [StringName] will always evaluate to [code]true[/code]."
+msgstr ""
+"Gli [StringName] sono stringhe immutabili progettate per la rappresentazione "
+"generica di nomi univoci (chiamata anche \"string interning\"). Due "
+"[StringName] con lo stesso valore sono lo stesso oggetto. Confrontarli è "
+"estremamente veloce rispetto alle normali [String].\n"
+"Di solito passerai una [String] ai metodi che si aspettano uno [StringName] e "
+"sarà convertita automaticamente (spesso in fase di compilazione), ma in rari "
+"casi puoi costruire uno [StringName] in anticipo con il costruttore "
+"[StringName] o, in GDScript, la sintassi letterale [code]&\"example\"[/code]. "
+"La costruzione manuale di uno [StringName] ti consente di controllare quando "
+"avviene la conversione da [String] o di usare la sintassi letterale e "
+"impedire completamente le conversioni.\n"
+"Vedi anche [NodePath], che è un concetto simile progettato specificamente per "
+"memorizzare percorsi di alberi di scene pre-analizzati.\n"
+"Tutti i metodi di [String] sono disponibili anche in questa classe. "
+"Convertono [StringName] in una stringa e restituiscono anche una stringa. "
+"Questo è molto inefficiente e dovrebbe essere utilizzato solo se si desidera "
+"la stringa.\n"
+"[b]Nota:[/b] In C#, è richiesta una conversione esplicita in [code]System."
+"String[/code] per utilizzare i metodi elencati in questa pagina. Usa il "
+"metodo [code]ToString()[/code] per convertire [StringName] in una stringa, "
+"quindi usa i metodi equivalenti in [code]System.String[/code] o "
+"[code]StringExtensions[/code].\n"
+"[b]Nota:[/b] In un contesto booleano, [StringName] sarà valutato come "
+"[code]false[/code] se è vuoto ([code]StringName(\"\")[/code]). Altrimenti, "
+"[StringName] sarà sempre valutato come [code]true[/code]."
+
 msgid "Constructs an empty [StringName]."
 msgstr "Costruisce un [StringName] vuoto."
 
@@ -124215,6 +147873,43 @@ msgstr ""
 msgid "A customizable [StyleBox] that doesn't use a texture."
 msgstr "Uno [StyleBox] personalizzabile che non utilizza una texture."
 
+msgid ""
+"By configuring various properties of this style box, you can achieve many "
+"common looks without the need of a texture. This includes optionally rounded "
+"borders, antialiasing, shadows, and skew.\n"
+"Setting corner radius to high values is allowed. As soon as corners overlap, "
+"the stylebox will switch to a relative system:\n"
+"[codeblock lang=text]\n"
+"height = 30\n"
+"corner_radius_top_left = 50\n"
+"corner_radius_bottom_left = 100\n"
+"[/codeblock]\n"
+"The relative system now would take the 1:2 ratio of the two left corners to "
+"calculate the actual corner width. Both corners added will [b]never[/b] be "
+"more than the height. Result:\n"
+"[codeblock lang=text]\n"
+"corner_radius_top_left: 10\n"
+"corner_radius_bottom_left: 20\n"
+"[/codeblock]"
+msgstr ""
+"Configurando varie proprietà di questo style box, puoi ottenere molti aspetti "
+"comuni senza la necessità di una texture. Ciò include bordi arrotondati "
+"facoltativi, antialiasing, ombre e inclinazione.\n"
+"È consentito impostare il raggio degli angoli su valori elevati. Non appena "
+"gli angoli si sovrappongono, lo style box passerà a un sistema relativo.\n"
+"[codeblock lang=text]\n"
+"height = 30\n"
+"corner_radius_top_left = 50\n"
+"corner_radius_bottom_left = 100\n"
+"[/codeblock]\n"
+"Il sistema relativo ora prenderebbe il rapporto 1:2 dei due angoli sinistri "
+"per calcolare la larghezza effettiva degli angoli. Entrambi gli angoli "
+"aggiunti non saranno [b]mai[/b] maggiori dell'altezza. Risultato:\n"
+"[codeblock lang=text]\n"
+"corner_radius_top_left: 10\n"
+"corner_radius_bottom_left: 20\n"
+"[/codeblock]"
+
 msgid "Returns the specified [enum Side]'s border width."
 msgstr "Restituisce la larghezza del bordo specificato con [enum Side]."
 
@@ -124604,6 +148299,18 @@ msgstr ""
 msgid "Modulates the color of the texture when this style box is drawn."
 msgstr "Modula il colore della texture quando viene disegnato questo style box."
 
+msgid ""
+"The region to use from the [member texture].\n"
+"This is equivalent to first wrapping the [member texture] in an "
+"[AtlasTexture] with the same region.\n"
+"If empty ([code]Rect2(0, 0, 0, 0)[/code]), the whole [member texture] is used."
+msgstr ""
+"La regione da usare dalla [member texture].\n"
+"Ciò equivale a racchiudere prima la [member texture] in un [AtlasTexture] con "
+"la stessa regione.\n"
+"Se vuoto ([code]Rect2(0, 0, 0, 0)[/code]), sarà usata l'intera [member "
+"texture]."
+
 msgid "The texture to use when drawing this style box."
 msgstr "La texture da utilizzare quando si disegna questo style box."
 
@@ -124684,6 +148391,28 @@ msgstr ""
 "AXIS_STRETCH_MODE_TILE], la texture può essere leggermente allungata per "
 "ripetere la texture a nove sezioni, senza cuciture."
 
+msgid ""
+"[SubtweenTweener] is used to execute a [Tween] as one step in a sequence "
+"defined by another [Tween]. See [method Tween.tween_subtween] for more usage "
+"information.\n"
+"[b]Note:[/b] [method Tween.tween_subtween] is the only correct way to create "
+"[SubtweenTweener]. Any [SubtweenTweener] created manually will not function "
+"correctly."
+msgstr ""
+"[SubtweenTweener] è utilizzato per eseguire un [Tween] come solo passaggio in "
+"una sequenza definita da un altro [Tween]. Vedi [method Tween.tween_subtween] "
+"per maggiori informazioni sull'utilizzo.\n"
+"[b]Nota:[/b] [method Tween.tween_subtween] è l'unico modo corretto per creare "
+"[SubtweenTweener]. Qualsiasi [SubtweenTweener] creato manualmente non "
+"funzionerà correttamente."
+
+msgid ""
+"Sets the time in seconds after which the [SubtweenTweener] will start running "
+"the subtween. By default there's no delay."
+msgstr ""
+"Imposta il tempo in secondi dopo il quale il [SubtweenTweener] inizierà a "
+"eseguire il subtween. Per impostazione predefinita, non c'è alcun ritardo."
+
 msgid ""
 "An interface to a game world that doesn't create a window or draw to the "
 "screen directly."
@@ -124691,6 +148420,29 @@ msgstr ""
 "Un'interfaccia per un mondo di gioco che non crea una finestra né disegna "
 "direttamente sullo schermo."
 
+msgid ""
+"[SubViewport] Isolates a rectangular region of a scene to be displayed "
+"independently. This can be used, for example, to display UI in 3D space.\n"
+"[b]Note:[/b] [SubViewport] is a [Viewport] that isn't a [Window], i.e. it "
+"doesn't draw anything by itself. To display anything, [SubViewport] must have "
+"a non-zero size and be either put inside a [SubViewportContainer] or assigned "
+"to a [ViewportTexture].\n"
+"[b]Note:[/b] [InputEvent]s are not passed to a standalone [SubViewport] by "
+"default. To ensure [InputEvent] propagation, a [SubViewport] can be placed "
+"inside of a [SubViewportContainer]."
+msgstr ""
+"[SubViewport] isola una regione rettangolare di una scena da visualizzare in "
+"modo indipendente. Può essere utilizzato, ad esempio, per visualizzare "
+"l'interfaccia utente nello spazio 3D.\n"
+"[b]Nota:[/b] [SubViewport] è un [Viewport] che non è un [Window], ovvero non "
+"disegna nulla da solo. Per visualizzare qualcosa, [SubViewport] deve avere "
+"una dimensione diversa da zero ed essere inserito in un "
+"[SubViewportContainer] o assegnato a una [ViewportTexture].\n"
+"[b]Nota:[/b] Gli [InputEvent] non vengono passati a un [SubViewport] a sé "
+"stante, come predefinito. Per garantire la propagazione degli [InputEvent], "
+"un [SubViewport] può essere posizionato all'interno di un "
+"[SubViewportContainer]."
+
 msgid "Using Viewports"
 msgstr "Utilizzo dei Viewport"
 
@@ -124823,10 +148575,10 @@ msgid ""
 "[b]Note:[/b] If [code]true[/code], this will prohibit changing [member "
 "SubViewport.size] of its children manually."
 msgstr ""
-"Se [code]true[/code], il viewport secondario sarà automaticamente "
-"ridimensionato alle dimensioni del controllo.\n"
-"[b]Nota:[/b] Se [code]true[/code], questo proibirà il cambiamento di [member "
-"SubViewport.size] dei suoi figli manualmente."
+"Se [code]true[/code], la viewport secondaria sarà automaticamente "
+"ridimensionata alle dimensioni del controllo.\n"
+"[b]Nota:[/b] Se [code]true[/code], questo proibirà il cambiamento manuale di "
+"[member SubViewport.size] dei suoi figli."
 
 msgid ""
 "Divides the sub-viewport's effective resolution by this value while "
@@ -124926,6 +148678,22 @@ msgstr ""
 msgid "Using the SurfaceTool"
 msgstr "Utilizzo di SurfaceTool"
 
+msgid ""
+"Adds a vertex to index array if you are using indexed vertices. Does not need "
+"to be called before adding vertices."
+msgstr ""
+"Aggiunge un vertice all'array di indici se si utilizzano vertici indicizzati. "
+"Non è necessario chiamarlo prima di aggiungere i vertici."
+
+msgid ""
+"Inserts a triangle fan made of array data into [Mesh] being constructed.\n"
+"Requires the primitive type be set to [constant Mesh.PRIMITIVE_TRIANGLES]."
+msgstr ""
+"Inserisce un ventaglio triangolare costituito da un array di dati nella "
+"[Mesh] in fase di costruzione.\n"
+"Richiede che il tipo di primitiva sia impostato su [constant Mesh."
+"PRIMITIVE_TRIANGLES]."
+
 msgid ""
 "Specifies the position of current vertex. Should be called after specifying "
 "other vertex properties (e.g. Color, UV)."
@@ -124951,6 +148719,22 @@ msgid "Clear all information passed into the surface tool so far."
 msgstr ""
 "Cancella tutte le informazioni passate finora allo strumento di superficie."
 
+msgid ""
+"Returns a constructed [ArrayMesh] from current information passed in. If an "
+"existing [ArrayMesh] is passed in as an argument, will add an extra surface "
+"to the existing [ArrayMesh].\n"
+"The [param flags] argument can be the bitwise OR of [constant Mesh."
+"ARRAY_FLAG_USE_DYNAMIC_UPDATE], [constant Mesh."
+"ARRAY_FLAG_USE_8_BONE_WEIGHTS], or [constant Mesh."
+"ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY]."
+msgstr ""
+"Restituisce un [ArrayMesh] costruito dalle informazioni attuali passate. Se "
+"un [ArrayMesh] esistente viene passato come argomento, aggiungerà una "
+"superficie aggiuntiva all'[ArrayMesh] esistente.\n"
+"L'argomento [param flags] può essere l'OR bit a bit di [constant Mesh."
+"ARRAY_FLAG_USE_DYNAMIC_UPDATE], [constant Mesh.ARRAY_FLAG_USE_8_BONE_WEIGHTS] "
+"o [constant Mesh.ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY]."
+
 msgid ""
 "Commits the data to the same format used by [method ArrayMesh."
 "add_surface_from_arrays], [method ImporterMesh.add_surface], and [method "
@@ -125007,6 +148791,45 @@ msgstr ""
 "quadrata della metrica di errore quadrico), utilizzando al massimo [param "
 "target_index_count] indici."
 
+msgid ""
+"Generates normals from vertices so you do not have to do it manually. If "
+"[param flip] is [code]true[/code], the resulting normals will be inverted. "
+"[method generate_normals] should be called [i]after[/i] generating geometry "
+"and [i]before[/i] committing the mesh using [method commit] or [method "
+"commit_to_arrays]. For correct display of normal-mapped surfaces, you will "
+"also have to generate tangents using [method generate_tangents].\n"
+"[b]Note:[/b] [method generate_normals] only works if the primitive type is "
+"set to [constant Mesh.PRIMITIVE_TRIANGLES].\n"
+"[b]Note:[/b] [method generate_normals] takes smooth groups into account. To "
+"generate smooth normals, set the smooth group to a value greater than or "
+"equal to [code]0[/code] using [method set_smooth_group] or leave the smooth "
+"group at the default of [code]0[/code]. To generate flat normals, set the "
+"smooth group to [code]-1[/code] using [method set_smooth_group] prior to "
+"adding vertices."
+msgstr ""
+"Genera le normali dai vertici in modo da non doverlo fare manualmente. Se "
+"[param flip] è [code]true[/code], le normali risultanti saranno invertite. "
+"[method generate_normals] dovrebbe essere chiamato [i]dopo[/i] la generazione "
+"della geometria e [i]prima[/i] di commettere le mesh usando [method commit] o "
+"[method commit_to_arrays]. Per visualizzare correttamente le superfici "
+"mappate con le normali, sarà necessario anche generare le tangenti usando "
+"[method generate_tangents].\n"
+"[b]Nota:[/b] [method generate_normals] funziona solo se il tipo di primitiva "
+"è impostato su [constant Mesh.PRIMITIVE_TRIANGLES].\n"
+"[b]Nota:[/b] [method generate_normals] tiene conto dei gruppi lisci. Per "
+"generare normali lisce, imposta il gruppo di lisciatura su un valore maggiore "
+"o uguale a [code]0[/code] tramite [method set_smooth_group] o lascia il "
+"gruppo sul valore predefinito di [code]0[/code]. Per generare normali piatte, "
+"imposta il gruppo di lisciatura su [code]-1[/code] tramite [method "
+"set_smooth_group] prima di aggiungere i vertici."
+
+msgid ""
+"Generates a tangent vector for each vertex. Requires that each vertex already "
+"has UVs and normals set (see [method generate_normals])."
+msgstr ""
+"Genera un vettore tangente per ogni vertice. Richiede che ogni vertice abbia "
+"già impostato gli UV e le normali (vedi [method generate_normals])."
+
 msgid "Returns the axis-aligned bounding box of the vertex positions."
 msgstr ""
 "Restituisce la bounding box allineata agli assi delle posizioni dei vertici."
@@ -125107,6 +148930,19 @@ msgstr ""
 "vertice deve avere questa informazione impostata e non la si invia per il "
 "primo vertice, tale informazione potrebbe non essere usata affatto."
 
+msgid ""
+"Set to [constant SKIN_8_WEIGHTS] to indicate that up to 8 bone influences per "
+"vertex may be used.\n"
+"By default, only 4 bone influences are used ([constant SKIN_4_WEIGHTS]).\n"
+"[b]Note:[/b] This function takes an enum, not the exact number of weights."
+msgstr ""
+"Imposta su [constant SKIN_8_WEIGHTS] per indicare che è possibile utilizzare "
+"fino a 8 influenze delle ossa per ogni vertice.\n"
+"Come predefinito, sono utilizzate solo 4 influenze delle ossa ([constant "
+"SKIN_4_WEIGHTS])\n"
+"[b]Nota:[/b] Questa funzione accetta un'enumerazione, non il numero esatto di "
+"pesi."
+
 msgid ""
 "Specifies the smooth group to use for the [i]next[/i] vertex. If this is "
 "never called, all vertices will have the default smooth group of [code]0[/"
@@ -125285,6 +149121,51 @@ msgstr ""
 "Successivamente richiama il metodo sovrascrivibile [method "
 "_clear_highlighting_cache]."
 
+msgid ""
+"Returns the syntax highlighting data for the line at index [param line]. If "
+"the line is not cached, calls [method _get_line_syntax_highlighting] first to "
+"calculate the data.\n"
+"Each entry is a column number containing a nested [Dictionary]. The column "
+"number denotes the start of a region, the region will end if another region "
+"is found, or at the end of the line. The nested [Dictionary] contains the "
+"data for that region. Currently only the key [code]\"color\"[/code] is "
+"supported.\n"
+"[b]Example:[/b] Possible return value. This means columns [code]0[/code] to "
+"[code]4[/code] should be red, and columns [code]5[/code] to the end of the "
+"line should be green:\n"
+"[codeblock]\n"
+"{\n"
+"    0: {\n"
+"        \"color\": Color(1, 0, 0)\n"
+"    },\n"
+"    5: {\n"
+"        \"color\": Color(0, 1, 0)\n"
+"    }\n"
+"}\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce i dati di evidenziazione della sintassi per una singola riga. Se "
+"la riga non è memorizzata nella cache, chiama [method "
+"_get_line_syntax_highlighting] per calcolare i dati.\n"
+"Il [Dictionary] restituito è il numero di colonna da [Dictionary]. Il numero "
+"di colonna indica l'inizio di una regione, la regione terminerà se si trova "
+"un'altra regione o alla fine della riga. Il [Dictionary] nidificato contiene "
+"i dati per quella regione, attualmente è supportata solo la chiave "
+"[code]\"color\"[/code].\n"
+"[b]Esempio:[/b] Possibile valore restituito. Ciò significa che le colonne da "
+"[code]0[/code] a [code]4[/code] dovrebbero essere rosse e le colonne da "
+"[code]5[/code] alla fine della riga dovrebbero essere verdi:\n"
+"[codeblock]\n"
+"var color_map = {\n"
+"    0: {\n"
+"        \"color\": Color(1, 0, 0)\n"
+"    },\n"
+"    5: {\n"
+"        \"color\": Color(0, 1, 0)\n"
+"    }\n"
+"}\n"
+"[/codeblock]"
+
 msgid "Returns the associated [TextEdit] node."
 msgstr "Restituisce il nodo [TextEdit] associato."
 
@@ -126392,6 +150273,42 @@ msgstr ""
 "Avvia una modifica in più parti. Tutte le modifiche saranno trattate come "
 "un'unica azione finché non viene chiamato [method end_complex_operation]."
 
+msgid ""
+"Starts an edit for multiple carets. The edit must be ended with [method "
+"end_multicaret_edit]. Multicaret edits can be used to edit text at multiple "
+"carets and delay merging the carets until the end, so the caret indexes "
+"aren't affected immediately. [method begin_multicaret_edit] and [method "
+"end_multicaret_edit] can be nested, and the merge will happen at the last "
+"[method end_multicaret_edit].\n"
+"[codeblock]\n"
+"begin_complex_operation()\n"
+"begin_multicaret_edit()\n"
+"for i in range(get_caret_count()):\n"
+"    if multicaret_edit_ignore_caret(i):\n"
+"        continue\n"
+"    # Logic here.\n"
+"end_multicaret_edit()\n"
+"end_complex_operation()\n"
+"[/codeblock]"
+msgstr ""
+"Avvia una modifica per più cursori. La modifica deve essere terminata con "
+"[method end_multicaret_edit]. Le modifiche per più cursori possono essere "
+"usate per modificare il testo in più cursori e ritardare l'unione dei cursori "
+"fino alla fine, in modo che gli indici dei cursori non siano influenzati "
+"immediatamente. È possibile annidare [method begin_multicaret_edit] e [method "
+"end_multicaret_edit] e l'unione avverrà all'ultimo [method "
+"end_multicaret_edit].\n"
+"[codeblock]\n"
+"begin_complex_operation()\n"
+"begin_multicaret_edit()\n"
+"for i in range(get_caret_count()):\n"
+"    if multicaret_edit_ignore_caret(i):\n"
+"        continue\n"
+"    # Logica qui.\n"
+"end_multicaret_edit()\n"
+"end_complex_operation()\n"
+"[/codeblock]"
+
 msgid ""
 "Centers the viewport on the line the editing caret is at. This also resets "
 "the [member scroll_horizontal] value to [code]0[/code]."
@@ -126497,6 +150414,14 @@ msgid "Returns the wrap index the editing caret is on."
 msgstr ""
 "Restituisce l'indice di avvolgimento su cui si trova il cursore di modifica."
 
+msgid ""
+"Returns the first column containing a non-whitespace character on the given "
+"line. If there is only whitespace, returns the number of characters."
+msgstr ""
+"Restituisce la prima colonna contenente un carattere diverso da uno spazio "
+"vuoto sulla riga specificata. Se c'è solo spazio vuoto, restituisce il numero "
+"di caratteri."
+
 msgid "Returns the first visible line."
 msgstr "Restituisce la prima riga visibile."
 
@@ -126538,6 +150463,29 @@ msgstr "Restituisce l'ultima riga non nascosta nell'intero [TextEdit]."
 msgid "Returns the text of a specific line."
 msgstr "Restituisce il testo per la riga specificata."
 
+msgid ""
+"Returns the custom background color of the given line. If no color is set, "
+"returns [code]Color(0, 0, 0, 0)[/code]."
+msgstr ""
+"Restituisce il colore di sfondo personalizzato della riga specificata. Se "
+"nessun colore è impostato, restituisce [code]Color(0, 0, 0, 0)[/code]."
+
+msgid ""
+"Returns the line and column at the given position. In the returned vector, "
+"[code]x[/code] is the column and [code]y[/code] is the line.\n"
+"If [param clamp_line] is [code]false[/code] and [param position] is below the "
+"last line, [code]Vector2i(-1, -1)[/code] is returned.\n"
+"If [param clamp_column] is [code]false[/code] and [param position] is outside "
+"the column range of the line, [code]Vector2i(-1, -1)[/code] is returned."
+msgstr ""
+"Restituisce la riga e la colonna nella posizione specificata. Nel vettore "
+"restituito, [code]x[/code] è la colonna e [code]y[/code] è la riga.\n"
+"Se [param clamp_line] è [code]false[/code] e [param position] è sotto "
+"l'ultima riga, viene restituito [code]Vector2i(-1, -1)[/code].\n"
+"Se [param clamp_column] è [code]false[/code] e [param position] è al di fuori "
+"dell'intervallo di colonne della riga, viene restituito [code]Vector2i(-1, -1)"
+"[/code]."
+
 msgid "Returns the number of lines in the text."
 msgstr "Restituisce il numero di righe nel testo."
 
@@ -126605,6 +150553,13 @@ msgstr ""
 msgid "Returns the number of times the given line is wrapped."
 msgstr "Restituisce il numero di volte che la riga fornita è avvolta."
 
+msgid ""
+"Returns the wrap index of the given column on the given line. This ranges "
+"from [code]0[/code] to [method get_line_wrap_count]."
+msgstr ""
+"Restituisce l'indice di avvolgimento della colonna specificata sulla riga "
+"specificata. Questo varia da [code]0[/code] a [method get_line_wrap_count]."
+
 msgid "Returns an array of [String]s representing each wrapped index."
 msgstr ""
 "Restituisce un array di [String] che rappresentano ciascun indice avvolto."
@@ -126873,6 +150828,10 @@ msgstr ""
 msgid "Returns the [TextEdit]'s' tab size."
 msgstr "Restituisce la dimensione delle schede del [TextEdit]."
 
+msgid "Returns the total width of all gutters and internal padding."
+msgstr ""
+"Restituisce la larghezza totale di tutti i gutter e imbottitura interna."
+
 msgid "Returns the [VScrollBar] of the [TextEdit]."
 msgstr "Restituisce la [VScrollBar] del [TextEdit]."
 
@@ -126883,6 +150842,13 @@ msgstr ""
 "Restituisce la versione corrente del [TextEdit]. La versione è un conteggio "
 "delle operazioni registrate dalla cronologia annulla/ripristina."
 
+msgid ""
+"Returns the number of lines that can visually fit, rounded down, based on "
+"this control's height."
+msgstr ""
+"Restituisce il numero di righe che è possibile inserire visualmente, "
+"arrotondato per difetto, in base all'altezza di questo controllo."
+
 msgid "Returns the word at [param position]."
 msgstr "Restituisce la parola alla posizione [param position]."
 
@@ -126931,6 +150897,27 @@ msgstr ""
 "Restituisce [code]true[/code] se l'utente sta trascinando il mouse per "
 "scorrere, selezionare, o trascinare il testo."
 
+msgid ""
+"Returns [code]true[/code] if the gutter at the given index is clickable. See "
+"[method set_gutter_clickable]."
+msgstr ""
+"Restituisce [code]true[/code] se il gutter all'indice specificato è "
+"cliccabile. Vedi [method set_gutter_clickable]."
+
+msgid ""
+"Returns [code]true[/code] if the gutter at the given index is currently "
+"drawn. See [method set_gutter_draw]."
+msgstr ""
+"Restituisce [code]true[/code] se il gutter all'indice specificato è "
+"attualmente disegnato. Vedi [method set_gutter_draw]."
+
+msgid ""
+"Returns [code]true[/code] if the gutter at the given index is overwritable. "
+"See [method set_gutter_overwritable]."
+msgstr ""
+"Restituisce [code]true[/code] se il gutter all'indice specificato è "
+"sovrascrivibile. Vedi [method set_gutter_overwritable]."
+
 msgid ""
 "Returns [code]true[/code] if a [method begin_multicaret_edit] has been called "
 "and [method end_multicaret_edit] has not yet been called."
@@ -126938,9 +150925,47 @@ msgstr ""
 "Restituisce [code]true[/code] se [method start_multicaret_edit] è stato "
 "chiamato e [method end_multicaret_edit] non è ancora stato chiamato."
 
+msgid ""
+"Returns [code]true[/code] if the gutter at the given index on the given line "
+"is clickable. See [method set_line_gutter_clickable]."
+msgstr ""
+"Restituisce [code]true[/code] se il gutter all'indice specificato sulla riga "
+"specificata è cliccabile. Vedi [method set_line_gutter_clickable]."
+
 msgid "Returns if the given line is wrapped."
 msgstr "Restituisce se la riga specificata è avvolta."
 
+msgid ""
+"Returns [code]true[/code] if the menu is visible. Use this instead of "
+"[code]get_menu().visible[/code] to improve performance (so the creation of "
+"the menu is avoided). See [method get_menu]."
+msgstr ""
+"Restituisce se il menù è visibile. Usa questo invece di [code]get_menu()."
+"visible[/code] per migliorare le prestazioni (in modo da evitare la creazione "
+"del menu). Vedi [method get_menu]."
+
+msgid ""
+"Returns [code]true[/code] if the mouse is over a selection. If [param edges] "
+"is [code]true[/code], the edges are considered part of the selection."
+msgstr ""
+"Restituisce [code]true[/code] se il mouse è sopra una selezione. Se [param "
+"edges] è [code]true[/code], i bordi sono considerati parte della selezione."
+
+msgid ""
+"Returns [code]true[/code] if overtype mode is enabled. See [method "
+"set_overtype_mode_enabled]."
+msgstr ""
+"Restituisce [code]true[/code] se la modalità sovrascrittura è abilitata. Vedi "
+"[method set_overtype_mode_enabled]."
+
+msgid ""
+"Merge the gutters from [param from_line] into [param to_line]. Only "
+"overwritable gutters will be copied. See [method set_gutter_overwritable]."
+msgstr ""
+"Unisci i gutter dalla riga [param from_line] alla riga [param to_line]. "
+"Saranno copiati solo i gutter sovrascrivibili. Vedi [method "
+"set_gutter_overwritable]."
+
 msgid ""
 "Merges any overlapping carets. Will favor the newest caret, or the caret with "
 "a selection.\n"
@@ -126995,6 +151020,9 @@ msgstr ""
 "[b]Nota:[/b] Ciò può comportare l'aggiustamento di tutti gli altri indici dei "
 "cursori."
 
+msgid "Removes the gutter at the given index."
+msgstr "Rimuove il gutter all'indice specificato."
+
 msgid ""
 "Removes the line of text at [param line]. Carets on this line will attempt to "
 "match their previous visual x position.\n"
@@ -127139,6 +151167,32 @@ msgstr ""
 "[b]Nota:[/b] Se si supportano più cursori, i cursori si potrebbero "
 "sovrapporre. Vedi [method merge_overlapping_carets]."
 
+msgid ""
+"Set a custom draw callback for the gutter at the given index. [param "
+"draw_callback] must take the following arguments: A line index [int], a "
+"gutter index [int], and an area [Rect2]. This callback only works when the "
+"gutter type is [constant GUTTER_TYPE_CUSTOM] (see [method set_gutter_type])."
+msgstr ""
+"Imposta un metodo di disegno personalizzato per il gutter. [param "
+"draw_callback] deve accettare i seguenti argomenti: Un indice di riga [int], "
+"un indice di gutter [int] e un area [Rect2]. Questo callback funziona solo "
+"quando il tipo di gutter è [constant GUTTER_TYPE_CUSTOM] (vedi [method "
+"set_gutter_type])."
+
+msgid "Sets the name of the gutter at the given index."
+msgstr "Imposta il nome del gutter all'indice specificato."
+
+msgid ""
+"Sets the type of gutter at the given index. Gutters can contain icons, text, "
+"or custom visuals. See [enum TextEdit.GutterType] for options."
+msgstr ""
+"Imposta il tipo di gutter all'indice specificato. I gutter possono contenere "
+"icone, testo o elementi visivi personalizzati. Vedi [enum TextEdit."
+"GutterType] per le opzioni."
+
+msgid "Set the width of the gutter at the given index."
+msgstr "Imposta la larghezza del gutter all'indice specificato."
+
 msgid ""
 "Sets the text for a specific [param line].\n"
 "Carets on the line will attempt to keep their visual x position."
@@ -127369,6 +151423,17 @@ msgstr ""
 "Il testo visualizzato quando il [TextEdit] è vuoto. [b]Non[/b] è il valore "
 "predefinito del [TextEdit] (vedi [member text])."
 
+msgid ""
+"If [code]true[/code], [TextEdit] will disable vertical scroll and fit minimum "
+"height to the number of visible lines. When both this property and [member "
+"scroll_fit_content_width] are [code]true[/code], no scrollbars will be "
+"displayed."
+msgstr ""
+"Se [code]true[/code], il [TextEdit] disabiliterà lo scorrimento verticale e "
+"adatterà l'altezza minima al numero di righe visibili. Se sia questa "
+"proprietà sia [member scroll_fit_content_width] sono [code]true[/code], non "
+"verranno visualizzate barre di scorrimento."
+
 msgid ""
 "If there is a horizontal scrollbar, this determines the current horizontal "
 "scroll value in pixels."
@@ -127407,6 +151472,15 @@ msgstr ""
 "Se [code]false[/code], il testo non può essere selezionato dall'utente o dai "
 "metodi [method select] o [method select_all]."
 
+msgid ""
+"The syntax highlighter to use.\n"
+"[b]Note:[/b] A [SyntaxHighlighter] instance should not be used across "
+"multiple [TextEdit] nodes."
+msgstr ""
+"L'evidenziatore di sintassi da usare.\n"
+"[b]Nota:[/b] Un'istanza di [SyntaxHighlighter] non deve essere utilizzata su "
+"più nodi [TextEdit]."
+
 msgid "String value of the [TextEdit]."
 msgstr "Valore stringa del [TextEdit]."
 
@@ -128168,10 +152242,10 @@ msgid "Returns font embolden strength."
 msgstr "Restituisce l'intensità del grassetto del font."
 
 msgid "Returns bitmap font fixed size."
-msgstr "Restituisce la dimensione fissa della font bitmap."
+msgstr "Restituisce la dimensione fissa di una font bitmap."
 
 msgid "Returns bitmap font scaling mode."
-msgstr "Restituisce la modalità di scalatura della font bitmap."
+msgstr "Restituisce la modalità di ridimensionamento di una font bitmap."
 
 msgid "Returns [code]true[/code] if font texture mipmap generation is enabled."
 msgstr ""
@@ -128225,6 +152299,9 @@ msgstr ""
 "Restituisce la larghezza dell'intervallo attorno alla forma tra la distanza "
 "minima e massima con segno rappresentabile."
 
+msgid "Returns an array containing all glyph indices in the font."
+msgstr "Restituisce un array contenente tutti gli indici dei glifi nel font."
+
 msgid "Returns font cache texture image data."
 msgstr ""
 "Restituisce i dati dell'immagine della texture nella cache dei caratteri."
@@ -128299,6 +152376,19 @@ msgstr ""
 "font_set_face_index], [method font_set_variation_coordinates] o [method "
 "font_set_transform]."
 
+msgid ""
+"Sets the font style flags, see [enum FontStyle].\n"
+"[b]Note:[/b] This value is used for font matching only and will not affect "
+"font rendering. Use [method font_set_face_index], [method "
+"font_set_variation_coordinates], [method font_set_embolden], or [method "
+"font_set_transform] instead."
+msgstr ""
+"Imposta i flag di stile del font, vedi [enum FontStyle].\n"
+"[b]Nota:[/b] Questo valore è usato solo per l'abbinamento dei font e non "
+"influirà sul rendering del font. Usa invece [method font_set_face_index], "
+"[method font_set_variation_coordinates], [method font_set_embolden] o [method "
+"font_set_transform]."
+
 msgid "Sets the font style name."
 msgstr "Imposta il nome dello stile dei caratteri."
 
@@ -128375,6 +152465,13 @@ msgstr ""
 msgid "Returns the name of the server interface."
 msgstr "Restituisce il nome dell'interfaccia del server."
 
+msgid ""
+"Returns default TextServer database (e.g. ICU break iterators and "
+"dictionaries)."
+msgstr ""
+"Restituisce il database (ad esempio, iteratori di interruzione ICU e "
+"dizionari) del TextServer predefinito."
+
 msgid ""
 "Returns default TextServer database (e.g. ICU break iterators and "
 "dictionaries) filename."
@@ -128744,6 +152841,19 @@ msgstr ""
 "per la suddivisione delle parole. Se impostato su una stringa vuota, vengono "
 "utilizzati i valori predefiniti del server."
 
+msgid ""
+"Sets desired text direction. If set to [constant DIRECTION_AUTO], direction "
+"will be detected based on the buffer contents and current locale.\n"
+"[b]Note:[/b] Direction is ignored if server does not support [constant "
+"FEATURE_BIDI_LAYOUT] feature (supported by [TextServerAdvanced])."
+msgstr ""
+"Imposta la direzione del testo desiderata. Se impostato su [constant "
+"DIRECTION_AUTO], la direzione verrà rilevata in base al contenuto nel buffer "
+"e alla localizzazione attuale.\n"
+"[b]Nota:[/b] La direzione è ignorata se il server non supporta la "
+"funzionalità [constant FEATURE_BIDI_LAYOUT] (supportata da "
+"[TextServerAdvanced])."
+
 msgid ""
 "Sets desired text orientation.\n"
 "[b]Note:[/b] Orientation is ignored if server does not support [constant "
@@ -128806,6 +152916,58 @@ msgstr ""
 "[b]Nota:[/b] Restituisce sempre [code]false[/code] se il server non supporta "
 "la funzionalità [constant FEATURE_UNICODE_SECURITY]."
 
+msgid ""
+"Returns array of the composite character boundaries.\n"
+"[codeblock]\n"
+"var ts = TextServerManager.get_primary_interface()\n"
+"print(ts.string_get_character_breaks(\"Test ❤️‍🔥 Test\")) # Prints [1, 2, 3, "
+"4, 5, 9, 10, 11, 12, 13, 14]\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce un array dei confini dei caratteri compositi.\n"
+"[codeblock]\n"
+"var ts = TextServerManager.get_primary_interface()\n"
+"print(ts.string_get_word_breaks(\"Test ❤️‍🔥 Test\")) # Stampa [1, 2, 3, 4, 5, "
+"9, 10, 11, 12, 13, 14]\n"
+"[/codeblock]"
+
+msgid ""
+"Returns an array of the word break boundaries. Elements in the returned array "
+"are the offsets of the start and end of words. Therefore the length of the "
+"array is always even.\n"
+"When [param chars_per_line] is greater than zero, line break boundaries are "
+"returned instead.\n"
+"[codeblock]\n"
+"var ts = TextServerManager.get_primary_interface()\n"
+"# Corresponds to the substrings \"The\", \"Godot\", \"Engine\", and \"4\".\n"
+"print(ts.string_get_word_breaks(\"The Godot Engine, 4\")) # Prints [0, 3, 4, "
+"9, 10, 16, 18, 19]\n"
+"# Corresponds to the substrings \"The\", \"Godot\", \"Engin\", and \"e, 4\".\n"
+"print(ts.string_get_word_breaks(\"The Godot Engine, 4\", \"en\", 5)) # Prints "
+"[0, 3, 4, 9, 10, 15, 15, 19]\n"
+"# Corresponds to the substrings \"The Godot\" and \"Engine, 4\".\n"
+"print(ts.string_get_word_breaks(\"The Godot Engine, 4\", \"en\", 10)) # "
+"Prints [0, 9, 10, 19]\n"
+"[/codeblock]"
+msgstr ""
+"Restituisce un array dei confini di interruzione delle parole. Gli elementi "
+"nell'array restituito sono gli offset dell'inizio e della fine delle parole. "
+"Pertanto la lunghezza dell'array è sempre pari.\n"
+"Quando [param chars_per_line] è maggiore di zero, vengono invece restituiti i "
+"confini di interruzione delle righe.\n"
+"[codeblock]\n"
+"var ts = TextServerManager.get_primary_interface()\n"
+"# Corrisponde alle sottostringhe \"The\", \"Godot\", \"Engine\" e \"4\".\n"
+"print(ts.string_get_word_breaks(\"The Godot Engine, 4\")) # Stampa [0, 3, 4, "
+"9, 10, 16, 18, 19]\n"
+"# Corrisponde alle sottostringhe \"The\", \"Godot\", \"Engin\" e \"e, 4\".\n"
+"print(ts.string_get_word_breaks(\"The Godot Engine, 4\", \"en\", 5)) # Stampa "
+"[0, 3, 4, 9, 10, 15, 15, 19]\n"
+"# Corrisponde alle sottostringhe \"The Godot\" e \"Engine, 4\".\n"
+"print(ts.string_get_word_breaks(\"The Godot Engine, 4\", \"en\", 10)) # "
+"Stampa [0, 9, 10, 19]\n"
+"[/codeblock]"
+
 msgid ""
 "Returns the string converted to lowercase.\n"
 "[b]Note:[/b] Casing is locale dependent and context sensitive if server "
@@ -128875,6 +153037,19 @@ msgstr ""
 "I glifi dei font sono rasterizzati come bitmap con anti-alias in scala di "
 "grigi a 8 bit."
 
+msgid ""
+"Font glyphs are rasterized for LCD screens.\n"
+"LCD subpixel layout is determined by the value of [code]gui/theme/"
+"lcd_subpixel_layout[/code] project settings.\n"
+"LCD subpixel anti-aliasing mode is suitable only for rendering horizontal, "
+"unscaled text in 2D."
+msgstr ""
+"I glifi dei font sono rasterizzati per gli schermi LCD.\n"
+"Il layout dei subpixel LCD è determinato dal valore delle impostazioni del "
+"progetto [code]gui/theme/lcd_subpixel_layout[/code].\n"
+"La modalità anti-aliasing dei subpixel LCD è adatta solo per renderizzare "
+"testo in 2D, orizzontale e non ridimensionato."
+
 msgid "Represents the size of the [enum FontLCDSubpixelLayout] enum."
 msgstr ""
 "Rappresenta la dimensione dell'enumerazione [enum FontLCDSubpixelLayout]."
@@ -129007,6 +153182,20 @@ msgstr ""
 "Sottrai la larghezza del rientro della prima riga da tutte le righe "
 "successive alla prima."
 
+msgid ""
+"Trims text before the shaping. e.g, increasing [member Label."
+"visible_characters] or [member RichTextLabel.visible_characters] value is "
+"visually identical to typing the text.\n"
+"[b]Note:[/b] In this mode, trimmed text is not processed at all. It is not "
+"accounted for in line breaking and size calculations."
+msgstr ""
+"Ritaglia il testo prima della modellazione. Ad esempio, aumentare il valore "
+"[member Label.visible_characters] o [member RichTextLabel.visible_characters] "
+"è visivamente identico alla digitazione del testo.\n"
+"[b]Nota:[/b] In questa modalità, il testo ritagliato non viene elaborato "
+"affatto. Non viene preso in considerazione per calcolare le interruzioni di "
+"riga e le dimensioni."
+
 msgid ""
 "Displays glyphs that are mapped to the first [member Label."
 "visible_characters] or [member RichTextLabel.visible_characters] characters "
@@ -129333,6 +153522,12 @@ msgstr "Sovrascrittura BiDi per il percorso di file."
 msgid "BiDi override for email."
 msgstr "Sovrascrittura BiDi per l'email."
 
+msgid ""
+"BiDi override for lists. Structured text options: list separator [String]."
+msgstr ""
+"Sovrascrittura BiDi per le liste. Opzioni di testo strutturato: separatore di "
+"lista [String]."
+
 msgid "BiDi override for GDScript."
 msgstr "Sovrascrittura BiDi per GDScript."
 
@@ -129423,7 +153618,7 @@ msgstr ""
 
 msgid "Base class for custom [TextServer] implementations (plugins)."
 msgstr ""
-"Classe di base per implementazioni [TextServer] personalizzate (estensioni)."
+"Classe base per implementazioni di [TextServer] personalizzate (estensioni)."
 
 msgid "External [TextServer] implementations should inherit from this class."
 msgstr ""
@@ -129474,6 +153669,20 @@ msgstr ""
 "[b]Facoltativo.[/b]\n"
 "Restituisce un indice di faccia attivo della collezione TrueType / OpenType."
 
+msgid ""
+"[b]Required.[/b]\n"
+"Returns bitmap font fixed size."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce la dimensione fissa di una font bitmap."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns bitmap font scaling mode."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce la modalità di ridimensionamento di una font bitmap."
+
 msgid ""
 "[b]Required.[/b]\n"
 "Returns glyph advance (offset of the next glyph)."
@@ -129514,6 +153723,13 @@ msgstr ""
 "Restituisce i flag dello stile del carattere, vedi [enum TextServer."
 "FontStyle]."
 
+msgid ""
+"[b]Required.[/b]\n"
+"Returns an array containing all glyph indices in the font."
+msgstr ""
+"[b]Obbligatorio.[/b]\n"
+"Restituisce un array contenente tutti gli indici dei glifi nel font."
+
 msgid ""
 "[b]Optional.[/b]\n"
 "Returns array containing glyph packing data."
@@ -129668,6 +153884,15 @@ msgstr ""
 "Restituisce il dizionario delle coordinate delle variazioni OpenType "
 "supportate."
 
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns default TextServer database (e.g. ICU break iterators and "
+"dictionaries)."
+msgstr ""
+"[b]Facoltativo.[/b]\n"
+"Restituisce il database (ad esempio, iteratori di interruzione ICU e "
+"dizionari) del TextServer predefinito."
+
 msgid ""
 "[b]Optional.[/b]\n"
 "Converts readable feature, variation, script, or language name to OpenType "
@@ -129725,6 +153950,26 @@ msgstr ""
 "Un'implementazione di riserva del server di testo di Godot, senza supporto "
 "per BiDi e layout complessi di testo."
 
+msgid ""
+"A fallback implementation of Godot's text server. This fallback is faster "
+"than [TextServerAdvanced] for processing a lot of text, but it does not "
+"support BiDi and complex text layout.\n"
+"[b]Note:[/b] This text server is not part of official Godot binaries. If you "
+"want to use it, compile the engine with the option "
+"[code]module_text_server_fb_enabled=yes[/code]. When building with "
+"[TextServerFallback], consider also disabling [TextServerAdvanced] with "
+"[code]module_text_server_adv_enabled=no[/code] to reduce binary size."
+msgstr ""
+"Un'implementazione di riserva del server di testo di Godot. Questo server è "
+"più veloce di [TextServerAdvanced] per elaborare molto testo, ma non supporta "
+"BiDi e layout complessi di testo.\n"
+"[b]Nota:[/b] Questo server di testo non fa parte degli eseguibili ufficiali "
+"di Godot. Se vuoi usarlo, compila il motore con l'opzione "
+"[code]module_text_server_fb_enabled=yes[/code]. Quando si compila con "
+"[TextServerFallback], considera anche di disabilitare [TextServerAdvanced] "
+"con [code]module_text_server_adv_enabled=no[/code] per ridurre le dimensioni "
+"dell'eseguibile."
+
 msgid "A singleton for managing [TextServer] implementations."
 msgstr "Un singleton per la gestione delle implementazioni di [TextServer]."
 
@@ -129904,6 +154149,26 @@ msgstr ""
 msgid "Returns the texture height in pixels."
 msgstr "Restituisce l'altezza della texture in pixel."
 
+msgid ""
+"Returns an [Image] that is a copy of data from this [Texture2D] (a new "
+"[Image] is created each time). [Image]s can be accessed and manipulated "
+"directly.\n"
+"[b]Note:[/b] This will return [code]null[/code] if this [Texture2D] is "
+"invalid.\n"
+"[b]Note:[/b] This will fetch the texture data from the GPU, which might cause "
+"performance problems when overused. Avoid calling [method get_image] every "
+"frame, especially on large textures."
+msgstr ""
+"Restituisce un'[Image] che è una copia dei dati da questa [Texture2D] (viene "
+"creata una nuova [Image] ogni volta). È possibile accedere alle [Image] e "
+"manipolarle direttamente.\n"
+"[b]Nota:[/b] Questo restituirà [code]null[/code] se questa [Texture2D] non è "
+"valida.\n"
+"[b]Nota:[/b] Questo recupererà i dati della texture dalla GPU, il che "
+"potrebbe causare problemi di prestazioni in caso di uso eccessivo. Evita di "
+"chiamare [method get_image] ad ogni frame, soprattutto su texture di grandi "
+"dimensioni."
+
 msgid "Returns the texture size in pixels."
 msgstr "Restituisce le dimensioni della texture in pixel."
 
@@ -129920,6 +154185,40 @@ msgstr ""
 "Una singola risorsa texture che consiste di più immagini separate. Ogni "
 "immagine ha le stesse dimensioni e lo stesso numero di livelli mipmap."
 
+msgid ""
+"A Texture2DArray is different from a Texture3D: The Texture2DArray does not "
+"support trilinear interpolation between the [Image]s, i.e. no blending. See "
+"also [Cubemap] and [CubemapArray], which are texture arrays with specialized "
+"cubemap functions.\n"
+"A Texture2DArray is also different from an [AtlasTexture]: In a "
+"Texture2DArray, all images are treated separately. In an atlas, the regions "
+"(i.e. the single images) can be of different sizes. Furthermore, you usually "
+"need to add a padding around the regions, to prevent accidental UV mapping to "
+"more than one region. The same goes for mipmapping: Mipmap chains are handled "
+"separately for each layer. In an atlas, the slicing has to be done manually "
+"in the fragment shader.\n"
+"To create such a texture file yourself, reimport your image files using the "
+"Godot Editor import presets. To create a Texture2DArray from code, use "
+"[method ImageTextureLayered.create_from_images] on an instance of the "
+"Texture2DArray class."
+msgstr ""
+"Un Texture2DArray è diverso da un Texture3D: il Texture2DArray non supporta "
+"l'interpolazione trilineare tra le [Image], ovvero nessuna fusione. Vedi "
+"anche [Cubemap] e [CubemapArray], che sono array di texture con funzioni di "
+"cubemap specializzate.\n"
+"Un Texture2DArray è anche diverso da un [AtlasTexture]: in un Texture2DArray, "
+"tutte le immagini sono trattate separatamente. In un atlante, le regioni "
+"(ovvero le singole immagini) possono avere dimensioni diverse. Inoltre, di "
+"solito è necessario aggiungere un imbottitura attorno alle regioni, per "
+"evitare una mappatura UV accidentale su più di una regione. Lo stesso vale "
+"per il mipmapping: le catene di mipmap sono gestite separatamente per ogni "
+"livello. In un atlante, la suddivisione deve essere eseguita manualmente "
+"nello shader dei frammenti.\n"
+"Per creare autonomamente un file di texture di questo tipo, reimporta i file "
+"di immagine attraverso i preset di importazione dell'editor di Godot. Per "
+"creare un Texture2DArray da codice, usa [method ImageTextureLayered."
+"create_from_images] su un'istanza della classe Texture2DArray."
+
 msgid ""
 "Creates a placeholder version of this resource ([PlaceholderTexture2DArray])."
 msgstr ""
@@ -130056,6 +154355,33 @@ msgstr ""
 "Un pulsante visualizzato con una texture. Supporta gli stati Premuto, "
 "Passante, Disabilitato e Focalizzato."
 
+msgid ""
+"[TextureButton] has the same functionality as [Button], except it uses "
+"sprites instead of Godot's [Theme] resource. It is faster to create, but it "
+"doesn't support localization like more complex [Control]s.\n"
+"See also [BaseButton] which contains common properties and methods associated "
+"with this node.\n"
+"[b]Note:[/b] Setting a texture for the \"normal\" state ([member "
+"texture_normal]) is recommended. If [member texture_normal] is not set, the "
+"[TextureButton] will still receive input events and be clickable, but the "
+"user will not be able to see it unless they activate another one of its "
+"states with a texture assigned (e.g., hover over it to show [member "
+"texture_hover])."
+msgstr ""
+"[TextureButton] ha la stessa funzionalità di [Button], eccetto che usa gli "
+"sprite invece della risorsa [Theme] di Godot. È più veloce da creare, ma non "
+"supporta la localizzazione come i [Control] più complessi.\n"
+"Lo stato \"normale\" deve contenere una texture ([member texture_normal]); le "
+"altre texture sono opzionali.\n"
+"Vedi anche [BaseButton] che contiene le proprietà e i metodi comuni associati "
+"a questo nodo.\n"
+"[b]Nota:[/b] Si consiglia di impostare una texture per lo stato \"normale\" "
+"([member texture_normal]). Se [member texture_normal] non è impostato, "
+"[TextureButton] riceverà comunque eventi di input e sarà cliccabile, ma "
+"l'utente non sarà in grado di vederlo a meno che non attivi un altro dei suoi "
+"stati con una texture assegnata (ad esempio, passandoci sopra il mouse per "
+"visualizzare [member texture_hover])."
+
 msgid ""
 "If [code]true[/code], the size of the texture won't be considered for minimum "
 "size calculation, so the [TextureButton] can be shrunk down past the texture "
@@ -130082,6 +154408,36 @@ msgstr ""
 "Sulla maschera, i pixel bianchi rappresentano l'area cliccabile del pulsante. "
 "Usalo per creare pulsanti con forme curve."
 
+msgid ""
+"Texture to display when the node is disabled. See [member BaseButton."
+"disabled]. If not assigned, the [TextureButton] displays [member "
+"texture_normal] instead."
+msgstr ""
+"La texture da visualizzare quando il nodo è disabilitato. Vedi [member "
+"BaseButton.disabled]. Se non assegnato, il [TextureButton] visualizza invece "
+"[member texture_normal]."
+
+msgid ""
+"Texture to [i]overlay on the base texture[/i] when the node has mouse or "
+"keyboard focus. Because [member texture_focused] is displayed on top of the "
+"base texture, a partially transparent texture should be used to ensure the "
+"base texture remains visible. A texture that represents an outline or an "
+"underline works well for this purpose. To disable the focus visual effect, "
+"assign a fully transparent texture of any size. Note that disabling the focus "
+"visual effect will harm keyboard/controller navigation usability, so this is "
+"not recommended for accessibility reasons."
+msgstr ""
+"La texture da [i]sovrapporre alla texture di base[/i] quando il nodo ha il "
+"focus del mouse o della tastiera. Poiché [member texture_focused] viene "
+"visualizzato sopra la texture di base, si dovrebbe usare una texture "
+"parzialmente trasparente per garantire che la texture di base resti visibile. "
+"Una texture che rappresenta un contorno o una sottolineatura funziona bene "
+"per questo scopo. Per disabilitare l'effetto visivo del focus, assegna una "
+"texture totalmente trasparente di qualunque dimensione. Tieni presente che "
+"disattivare l'effetto visivo di focus ridurrà l'usabilità della navigazione "
+"tramite tastiera o controller, perciò non è consigliato per motivi di "
+"accessibilità."
+
 msgid ""
 "Texture to display by default, when the node is [b]not[/b] in the disabled, "
 "hover or pressed state. This texture is still displayed in the focused state, "
@@ -130091,6 +154447,17 @@ msgstr ""
 "disabilitato, passante o premuto. Questa texture è ancora visualizzata nello "
 "stato focalizzato, con [member texture_focused] disegnata sopra."
 
+msgid ""
+"Texture to display on mouse down over the node, if the node has keyboard "
+"focus and the player presses the Enter key or if the player presses the "
+"[member BaseButton.shortcut] key. If not assigned, the [TextureButton] "
+"displays [member texture_hover] instead when pressed."
+msgstr ""
+"La texture da visualizzare quando si passa il mouse sul nodo, se il nodo ha "
+"il focus sulla tastiera e l'utente preme il tasto Invio oppure se l'utente "
+"preme il tasto [member BaseButton.shortcut]. Se non assegnato, il "
+"[TextureButton] visualizza invece [member texture_normal]."
+
 msgid "Scale to fit the node's bounding rectangle."
 msgstr ""
 "Ridimensiona la texture per adattarla al rettangolo di delimitazione del nodo."
@@ -130298,6 +154665,39 @@ msgstr ""
 "Imposta il margine di allungamento con l'indice specificato. Vedi [member "
 "stretch_margin_bottom] e le proprietà correlate."
 
+msgid ""
+"If [code]true[/code], Godot treats the bar's textures like in "
+"[NinePatchRect]. Use the [code]stretch_margin_*[/code] properties like "
+"[member stretch_margin_bottom] to set up the nine patch's 3×3 grid. When "
+"using a radial [member fill_mode], this setting will only enable stretching "
+"for [member texture_progress], while [member texture_under] and [member "
+"texture_over] will be treated like in [NinePatchRect]."
+msgstr ""
+"Se [code]true[/code], Godot tratta le texture della barra come in "
+"[NinePatchRect]. Usa le proprietà [code]stretch_margin_*[/code] come [member "
+"stretch_margin_bottom] per impostare la griglia 3×3 del nove-sezioni. Quando "
+"si usa un [member fill_mode] radiale, questa impostazione abiliterà "
+"l'allungamento solo per [member texture_progress], mentre [member "
+"texture_under] e [member texture_over] saranno trattati come in "
+"[NinePatchRect]."
+
+msgid ""
+"Offsets [member texture_progress] if [member fill_mode] is [constant "
+"FILL_CLOCKWISE], [constant FILL_COUNTER_CLOCKWISE], or [constant "
+"FILL_CLOCKWISE_AND_COUNTER_CLOCKWISE].\n"
+"[b]Note:[/b] The effective radial center always stays within the [member "
+"texture_progress] bounds. If you need to move it outside the texture's "
+"bounds, modify the [member texture_progress] to contain additional empty "
+"space where needed."
+msgstr ""
+"Scosta [member texture_progress] se [member fill_mode] è [constant "
+"FILL_CLOCKWISE], [constant FILL_COUNTER_CLOCKWISE] o [constant "
+"FILL_CLOCKWISE_AND_COUNTER_CLOCKWISE].\n"
+"[b]Nota:[/b] Il centro radiale effettivo rimane sempre entro i limiti di "
+"[member texture_progress]. Se è necessario spostarlo fuori dai limiti della "
+"texture, modifica [member texture_progress] per contenere ulteriore spazio "
+"vuoto dove necessario."
+
 msgid ""
 "Upper limit for the fill of [member texture_progress] if [member fill_mode] "
 "is [constant FILL_CLOCKWISE], [constant FILL_COUNTER_CLOCKWISE], or [constant "
@@ -130312,6 +154712,25 @@ msgstr ""
 "la texture si riempie fino a questo angolo.\n"
 "Vedi [member Range.value], [member Range.max_value]."
 
+msgid ""
+"Starting angle for the fill of [member texture_progress] if [member "
+"fill_mode] is [constant FILL_CLOCKWISE], [constant FILL_COUNTER_CLOCKWISE], "
+"or [constant FILL_CLOCKWISE_AND_COUNTER_CLOCKWISE]. When the node's "
+"[code]value[/code] is equal to its [code]min_value[/code], the texture "
+"doesn't show up at all. When the [code]value[/code] increases, the texture "
+"fills and tends towards [member radial_fill_degrees].\n"
+"[b]Note:[/b] [member radial_initial_angle] is wrapped between [code]0[/code] "
+"and [code]360[/code] degrees (inclusive)."
+msgstr ""
+"Angolo di partenza per il riempimento di [member texture_progress] se [member "
+"fill_mode] è [constant FILL_CLOCKWISE], [constant FILL_COUNTER_CLOCKWISE] o "
+"[constant FILL_CLOCKWISE_AND_COUNTER_CLOCKWISE]. Quando il [code]value[/code] "
+"del nodo è uguale al suo [code]min_value[/code], la texture non è "
+"visualizzata affatto. Quando il [code]value[/code] aumenta, la texture si "
+"riempie e tende verso [member radial_fill_degrees].\n"
+"[b]Nota:[/b] [member radial_initial_angle] è compreso tra [code]0[/code] e "
+"[code]360[/code] gradi (inclusi)."
+
 msgid ""
 "The height of the 9-patch's bottom row. A margin of 16 means the 9-slice's "
 "bottom corners and side will have a height of 16 pixels. You can set all 4 "
@@ -131289,6 +155708,23 @@ msgstr ""
 "ThemeDB.fallback_font]).\n"
 "Usa [method has_default_font] per verificare se questo valore è valido."
 
+msgid ""
+"The default font size of this theme resource. Used as the default value when "
+"trying to fetch a font size value that doesn't exist in this theme or is in "
+"invalid state. If the default font size is also missing or invalid, the "
+"engine fallback value is used (see [member ThemeDB.fallback_font_size]).\n"
+"Values below [code]1[/code] are invalid and can be used to unset the "
+"property. Use [method has_default_font_size] to check if this value is valid."
+msgstr ""
+"La dimensione predefinita del font di questa risorsa tema. Utilizzata come "
+"valore predefinito quando si tenta di recuperare un valore di dimensione del "
+"font che non esiste in questo tema o è in uno stato non valido. Se anche la "
+"dimensione predefinita del font è mancante o non valida, viene utilizzato il "
+"valore di riserva del motore (vedi [member ThemeDB.fallback_font_size]).\n"
+"I valori inferiori a [code]1[/code] non sono validi e possono essere "
+"utilizzati per annullare l'impostazione della proprietà. Usa [method "
+"has_default_font_size] per verificare se questo valore è valido."
+
 msgid "Theme's [Color] item type."
 msgstr "Il tipo di [Color] del tema."
 
@@ -131563,6 +155999,13 @@ msgstr ""
 "Aggiunge un poligono di collisione al tassello sul livello di fisica del "
 "TileSet specificato."
 
+msgid ""
+"Adds an occlusion polygon to the tile on the TileSet occlusion layer with "
+"index [param layer_id]."
+msgstr ""
+"Aggiunge un poligono di occlusione per il tassello sul livello di occlusione "
+"con l'indice [param layer_id] del TileSet."
+
 msgid ""
 "Returns the one-way margin (for one-way platforms) of the polygon at index "
 "[param polygon_index] for TileSet physics layer with index [param layer_id]."
@@ -131599,6 +156042,14 @@ msgstr ""
 "Restituisce la velocità lineare costante applicata agli oggetti che entrano "
 "in collisione con questo tassello."
 
+msgid ""
+"Returns the custom data value for custom data layer named [param layer_name]. "
+"To check if a custom data layer exists, use [method has_custom_data]."
+msgstr ""
+"Restituisce il valore dei dati personalizzati per il livello di dati "
+"personalizzati con il nome [param layer_name]. Per verificare se esiste un "
+"livello di dati personalizzati, usa [method has_custom_data]."
+
 msgid ""
 "Returns the custom data value for custom data layer with index [param "
 "layer_id]."
@@ -131617,17 +156068,38 @@ msgstr ""
 "[param flip_h], [param flip_v] e [param transpose] consentono di trasformare "
 "il poligono restituito."
 
+msgid "Use [method get_occluder_polygon] instead."
+msgstr "Utilizza invece [method get_occluder_polygon]."
+
 msgid ""
 "Returns the occluder polygon of the tile for the TileSet occlusion layer with "
 "index [param layer_id].\n"
 "[param flip_h], [param flip_v], and [param transpose] allow transforming the "
 "returned polygon."
 msgstr ""
-"Restituisce il poligono di occlusione del tassello per il livello di "
-"occlusione del TileSet con l'indice [param layer_id].\n"
+"Restituisce il poligono occlusore del tassello per il livello di occlusione "
+"del TileSet con l'indice [param layer_id].\n"
 "[param flip_h], [param flip_v] e [param transpose] consentono di trasformare "
 "il poligono restituito."
 
+msgid ""
+"Returns the occluder polygon at index [param polygon_index] from the TileSet "
+"occlusion layer with index [param layer_id].\n"
+"The [param flip_h], [param flip_v], and [param transpose] parameters can be "
+"[code]true[/code] to transform the returned polygon."
+msgstr ""
+"Restituisce il poligono di occlusione all'indice [param polygon_index] dal "
+"livello di occlusione con l'indice [param layer_id] del TileSet.\n"
+"È possibile impostare i parametri [param flip_h], [param flip_v] e [param "
+"transpose] su [code]true[/code] per trasformare il poligono restituito."
+
+msgid ""
+"Returns the number of occluder polygons of the tile in the TileSet occlusion "
+"layer with index [param layer_id]."
+msgstr ""
+"Restituisce il numero di poligoni occlusori del tassello nel livello di "
+"occlusione con l'indice [param layer_id] del TileSet."
+
 msgid ""
 "Returns the tile's terrain bit for the given [param peering_bit] direction. "
 "To check that a direction is valid, use [method is_valid_terrain_peering_bit]."
@@ -131636,6 +156108,12 @@ msgstr ""
 "peering_bit] specificata. Per verificare che una direzione sia valida, usa "
 "[method is_valid_terrain_peering_bit]."
 
+msgid ""
+"Returns whether there exists a custom data layer named [param layer_name]."
+msgstr ""
+"Restituisce se esiste un livello di dati personalizzati con il nome [param "
+"layer_name]."
+
 msgid ""
 "Returns whether one-way collisions are enabled for the polygon at index "
 "[param polygon_index] for TileSet physics layer with index [param layer_id]."
@@ -131656,7 +156134,14 @@ msgid ""
 "with index [param layer_id]."
 msgstr ""
 "Rimuove il poligono all'indice [param polygon_index] per il livello di fisica "
-"del TileSet con l'indice [param layer_id]."
+"con l'indice [param layer_id] del TileSet."
+
+msgid ""
+"Removes the polygon at index [param polygon_index] for TileSet occlusion "
+"layer with index [param layer_id]."
+msgstr ""
+"Rimuove il poligono all'indice [param polygon_index] per il livello di "
+"occlusione con l'indice [param layer_id] del TileSet."
 
 msgid ""
 "Enables/disables one-way collisions on the polygon at index [param "
@@ -131666,6 +156151,14 @@ msgstr ""
 "[param polygon_index] per il livello di fisica del TileSet con l'indice "
 "[param layer_id]."
 
+msgid ""
+"Sets the one-way margin (for one-way platforms) of the polygon at index "
+"[param polygon_index] for TileSet physics layer with index [param layer_id]."
+msgstr ""
+"Restituisce il margine unidirezionale (per piattaforme unidirezionali) del "
+"poligono all'indice [param polygon_index] per il livello di fisica con "
+"l'indice [param layer_id] del TileSet."
+
 msgid ""
 "Sets the points of the polygon at index [param polygon_index] for TileSet "
 "physics layer with index [param layer_id]."
@@ -131717,12 +156210,29 @@ msgstr ""
 "Imposta il poligono di navigazione per il livello di navigazione del TileSet "
 "con l'indice [param layer_id]."
 
+msgid "Use [method set_occluder_polygon] instead."
+msgstr "Utilizza invece [method set_occluder_polygon]."
+
 msgid ""
 "Sets the occluder for the TileSet occlusion layer with index [param layer_id]."
 msgstr ""
 "Imposta l'occlusore per il livello di occlusione del TileSet con l'indice "
 "[param layer_id]."
 
+msgid ""
+"Sets the occluder for polygon with index [param polygon_index] in the TileSet "
+"occlusion layer with index [param layer_id]."
+msgstr ""
+"Imposta l'occlusore per il poligono all'indice [param polygon_index] nel "
+"livello di fisica con l'indice [param layer_id] del TileSet."
+
+msgid ""
+"Sets the occluder polygon count in the TileSet occlusion layer with index "
+"[param layer_id]."
+msgstr ""
+"Imposta il numero di poligoni occlusori nel livello di occlusione con "
+"l'indice [param layer_id] del TileSet."
+
 msgid ""
 "Sets the tile's terrain bit for the given [param peering_bit] direction. To "
 "check that a direction is valid, use [method is_valid_terrain_peering_bit]."
@@ -131799,6 +156309,37 @@ msgstr ""
 msgid "Node for 2D tile-based maps."
 msgstr "Nodo per mappe basate su tasselli 2D."
 
+msgid ""
+"Node for 2D tile-based maps. Tilemaps use a [TileSet] which contain a list of "
+"tiles which are used to create grid-based maps. A TileMap may have several "
+"layers, layouting tiles on top of each other.\n"
+"For performance reasons, all TileMap updates are batched at the end of a "
+"frame. Notably, this means that scene tiles from a "
+"[TileSetScenesCollectionSource] may be initialized after their parent. This "
+"is only queued when inside the scene tree.\n"
+"To force an update earlier on, call [method update_internals].\n"
+"[b]Note:[/b] For performance and compatibility reasons, the coordinates "
+"serialized by [TileMap] are limited to 16-bit signed integers, i.e. the range "
+"for X and Y coordinates is from [code]-32768[/code] to [code]32767[/code]. "
+"When saving tile data, tiles outside this range are wrapped."
+msgstr ""
+"Nodo per mappe basate su tasselli 2D. Le tilemap utilizzano un [TileSet] che "
+"contiene un elenco di tasselli che sono utilizzati per creare mappe basate su "
+"una griglia. Una TileMap può avere diversi livelli, disponendo i tasselli uno "
+"sopra l'altro.\n"
+"Per motivi di prestazioni, tutti gli aggiornamenti di TileMap sono "
+"raggruppati alla fine di un frame. In particolare, ciò significa che i "
+"tasselli di scena da un [TileSetScenesCollectionSource] possono essere "
+"inizializzate dopo il loro genitore. Ciò viene messo in coda solo quando si "
+"trova all'interno dell'albero della scena.\n"
+"Per forzare un aggiornamento in anticipo, chiamare [method "
+"update_internals].\n"
+"[b]Nota:[/b] Per motivi di prestazioni e compatibilità, le coordinate "
+"serializzate da [TileMap] sono limitate a numeri interi con segno a 16 bit, "
+"ovvero l'intervallo per le coordinate X e Y è compreso tra [code]-32768[/"
+"code] e [code]32767[/code]. Quando si salvano i dati dei tasselli, i tasselli "
+"al di fuori di questo intervallo vengono avvolti."
+
 msgid "Using Tilemaps"
 msgstr "Utilizzo dei Tilemap"
 
@@ -131999,6 +156540,13 @@ msgstr ""
 "Restituisce la modulazione di un livello TileMap.\n"
 "Se [param layer] è negativo, i livelli vengono accessi dall'ultimo."
 
+msgid ""
+"Returns a TileMap layer's name.\n"
+"If [param layer] is negative, the layers are accessed from the last one."
+msgstr ""
+"Restituisce il nome di un livello della TileMap.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo."
+
 msgid ""
 "Returns the [RID] of the [NavigationServer2D] navigation map assigned to the "
 "specified TileMap layer [param layer].\n"
@@ -132022,6 +156570,20 @@ msgstr ""
 "get_layer_navigation_map].\n"
 "Se [param layer] è negativo, i livelli vengono accessi dall'ultimo."
 
+msgid ""
+"Returns a TileMap layer's Y sort origin.\n"
+"If [param layer] is negative, the layers are accessed from the last one."
+msgstr ""
+"Restituisce l'origine di ordinamento in Y di un livello della TileMap.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo."
+
+msgid ""
+"Returns a TileMap layer's Z-index value.\n"
+"If [param layer] is negative, the layers are accessed from the last one."
+msgstr ""
+"Restituisce l'indice Z di un livello della TileMap.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo."
+
 msgid "Returns the number of layers in the TileMap."
 msgstr "Restituisce il numero di livelli nel TileMap."
 
@@ -132044,12 +156606,34 @@ msgstr ""
 "identificata dalla direzione [param neighbor]. Questo metodo tiene conto dei "
 "diversi layout che una TileMap può assumere."
 
+msgid ""
+"Creates a new [TileMapPattern] from the given layer and set of cells.\n"
+"If [param layer] is negative, the layers are accessed from the last one."
+msgstr ""
+"Crea un nuovo [TileMapPattern] dal livello e dall'insieme di celle "
+"specificati.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo."
+
 msgid ""
 "Returns the list of all neighbourings cells to the one at [param coords]."
 msgstr ""
 "Restituisce l'elenco di tutte le celle vicine a quella alle coordinate [param "
 "coords]."
 
+msgid ""
+"Returns a [Vector2i] array with the positions of all cells containing a tile "
+"in the given layer. A cell is considered empty if its source identifier "
+"equals -1, its atlas coordinates identifiers is [code]Vector2(-1, -1)[/code] "
+"and its alternative identifier is -1.\n"
+"If [param layer] is negative, the layers are accessed from the last one."
+msgstr ""
+"Restituisce un array di [Vector2i] con le posizioni di tutte le celle "
+"contenenti un tassello nel livello specificato. Una cella è considerata vuota "
+"se il suo identificatore di sorgente è uguale a -1, i suoi identificatori di "
+"coordinate nell'atlante sono [code]Vector2(-1, -1)[/code] e il suo "
+"identificatore di alternativa è -1.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo."
+
 msgid ""
 "Returns a [Vector2i] array with the positions of all cells containing a tile "
 "in the given layer. Tiles may be filtered according to their source ([param "
@@ -132084,11 +156668,51 @@ msgstr ""
 "Restituisce un rettangolo che racchiude i tasselli utilizzati (non vuoti) "
 "della mappa, inclusi tutti i livelli."
 
+msgid ""
+"Returns [code]true[/code] if the cell on layer [param layer] at coordinates "
+"[param coords] is flipped horizontally. The result is valid only for atlas "
+"sources."
+msgstr ""
+"Restituisce [code]true[/code] se la cella sul livello [param layer] alle "
+"coordinate [param coords] è ribaltata orizzontalmente. Il risultato è valido "
+"solo per le sorgenti atlante."
+
+msgid ""
+"Returns [code]true[/code] if the cell on layer [param layer] at coordinates "
+"[param coords] is flipped vertically. The result is valid only for atlas "
+"sources."
+msgstr ""
+"Restituisce [code]true[/code] se la cella sul livello [param layer] alle "
+"coordinate [param coords] è ribaltata verticalmente. Il risultato è valido "
+"solo per le sorgenti atlante."
+
+msgid ""
+"Returns [code]true[/code] if the cell on layer [param layer] at coordinates "
+"[param coords] is transposed. The result is valid only for atlas sources."
+msgstr ""
+"Restituisce [code]true[/code] se la cella sul livello [param layer] alle "
+"coordinate [param coords] è trasposta. Il risultato è valido solo per le "
+"sorgenti atlante."
+
+msgid ""
+"Returns if a layer is enabled.\n"
+"If [param layer] is negative, the layers are accessed from the last one."
+msgstr ""
+"Restituisce se un livello è abilitato.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo."
+
 msgid "Returns if a layer's built-in navigation regions generation is enabled."
 msgstr ""
 "Restituisce se è abilitata la generazione integrata delle regioni di "
 "navigazione in un livello."
 
+msgid ""
+"Returns if a layer Y-sorts its tiles.\n"
+"If [param layer] is negative, the layers are accessed from the last one."
+msgstr ""
+"Restituisce se un livello ordina in Y i suoi tasselli.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo."
+
 msgid ""
 "Returns the map coordinates of the cell containing the given [param "
 "local_position]. If [param local_position] is in global coordinates, consider "
@@ -132204,6 +156828,60 @@ msgstr ""
 "ovvero [code]-1[/code], [code]Vector2i(-1, -1)[/code] e [code]-1[/code].\n"
 "Se [param layer] è negativo, i livelli vengono accessi dall'ultimo."
 
+msgid ""
+"Update all the cells in the [param cells] coordinates array so that they use "
+"the given [param terrain] for the given [param terrain_set]. If an updated "
+"cell has the same terrain as one of its neighboring cells, this function "
+"tries to join the two. This function might update neighboring tiles if needed "
+"to create correct terrain transitions.\n"
+"If [param ignore_empty_terrains] is [code]true[/code], empty terrains will be "
+"ignored when trying to find the best fitting tile for the given terrain "
+"constraints.\n"
+"If [param layer] is negative, the layers are accessed from the last one.\n"
+"[b]Note:[/b] To work correctly, this method requires the TileMap's TileSet to "
+"have terrains set up with all required terrain combinations. Otherwise, it "
+"may produce unexpected results."
+msgstr ""
+"Aggiorna tutte le celle alle coordinate nell'array [param cells] in modo che "
+"utilizzino il terreno [param terrain] per l'insieme di terreni [param "
+"terrain_set]. Se una cella aggiornata ha lo stesso terreno di una delle celle "
+"vicine, questa funzione tenta di unirle. Questa funzione potrebbe aggiornare "
+"i tasselli vicini se necessario per creare transizioni di terreno corrette.\n"
+"Se [param ignore_empty_terrains] è [code]true[/code], i terreni vuoti "
+"verranno ignorati quando si tenta di trovare la tessera più adatta per i "
+"vincoli di terreno specificati.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo.\n"
+"[b]Nota:[/b] Per funzionare correttamente, questo metodo richiede che il "
+"TileSet di TileMap abbia terreni impostati con tutte le combinazioni "
+"richieste di terreno. Altrimenti, potrebbe produrre risultati imprevisti."
+
+msgid ""
+"Update all the cells in the [param path] coordinates array so that they use "
+"the given [param terrain] for the given [param terrain_set]. The function "
+"will also connect two successive cell in the path with the same terrain. This "
+"function might update neighboring tiles if needed to create correct terrain "
+"transitions.\n"
+"If [param ignore_empty_terrains] is [code]true[/code], empty terrains will be "
+"ignored when trying to find the best fitting tile for the given terrain "
+"constraints.\n"
+"If [param layer] is negative, the layers are accessed from the last one.\n"
+"[b]Note:[/b] To work correctly, this method requires the TileMap's TileSet to "
+"have terrains set up with all required terrain combinations. Otherwise, it "
+"may produce unexpected results."
+msgstr ""
+"Aggiorna tutte le celle alle coordinate nell'array [param cells] in modo che "
+"utilizzino il terreno [param terrain] per l'insieme di terreni [param "
+"terrain_set]. Questa funzione potrebbe anche connettere due celle successive "
+"nel percorso con lo stesso terreno. Questa funzione potrebbe aggiornare i "
+"tasselli vicini se necessario per creare transizioni di terreno corrette.\n"
+"Se [param ignore_empty_terrains] è [code]true[/code], i terreni vuoti "
+"verranno ignorati quando si tenta di trovare la tessera più adatta per i "
+"vincoli di terreno specificati.\n"
+"Se [param layer] è negativo, si accede ai livelli dall'ultimo.\n"
+"[b]Nota:[/b] Per funzionare correttamente, questo metodo richiede che il "
+"TileSet di TileMap abbia terreni impostati con tutte le combinazioni "
+"richieste di terreno. Altrimenti, potrebbe produrre risultati imprevisti."
+
 msgid ""
 "Enables or disables the layer [param layer]. A disabled layer is not "
 "processed at all (no rendering, no physics, etc.).\n"
@@ -132414,6 +157092,40 @@ msgstr "Nascondi sempre."
 msgid "Always show."
 msgstr "Mostra sempre."
 
+msgid ""
+"Node for 2D tile-based maps. A [TileMapLayer] uses a [TileSet] which contain "
+"a list of tiles which are used to create grid-based maps. Unlike the "
+"[TileMap] node, which is deprecated, [TileMapLayer] has only one layer of "
+"tiles. You can use several [TileMapLayer] to achieve the same result as a "
+"[TileMap] node.\n"
+"For performance reasons, all TileMap updates are batched at the end of a "
+"frame. Notably, this means that scene tiles from a "
+"[TileSetScenesCollectionSource] may be initialized after their parent. This "
+"is only queued when inside the scene tree.\n"
+"To force an update earlier on, call [method update_internals].\n"
+"[b]Note:[/b] For performance and compatibility reasons, the coordinates "
+"serialized by [TileMapLayer] are limited to 16-bit signed integers, i.e. the "
+"range for X and Y coordinates is from [code]-32768[/code] to [code]32767[/"
+"code]. When saving tile data, tiles outside this range are wrapped."
+msgstr ""
+"Nodo per mappe basate su tasselli 2D. Un [TileMapLayer] utilizza un [TileSet] "
+"che contiene un elenco di tasselli che sono utilizzati per creare mappe "
+"basate su griglia. A differenza del nodo [TileMap], che è deprecato, "
+"[TileMapLayer] ha un solo livello di tasselli. È possibile utilizzare diversi "
+"[TileMapLayer] per ottenere lo stesso risultato di un nodo [TileMap].\n"
+"Per motivi di prestazioni, tutti gli aggiornamenti di TileMap sono "
+"raggruppati alla fine di un frame. In particolare, ciò significa che i "
+"tasselli di scena da un [TileSetScenesCollectionSource] possono essere "
+"inizializzati dopo il loro genitore. Ciò viene messo in coda solo quando si "
+"trova all'interno dell'albero della scena.\n"
+"Per forzare un aggiornamento in anticipo, chiamare [method "
+"update_internals].\n"
+"[b]Nota:[/b] Per motivi di prestazioni e compatibilità, le coordinate "
+"serializzate da [TileMap] sono limitate a numeri interi con segno a 16 bit, "
+"ovvero l'intervallo per le coordinate X e Y è compreso tra [code]-32768[/"
+"code] e [code]32767[/code]. Quando si salvano i dati dei tasselli, i tasselli "
+"al di fuori di questo intervallo vengono avvolti."
+
 msgid ""
 "Called with a [TileData] object about to be used internally by the "
 "[TileMapLayer], allowing its modification at runtime.\n"
@@ -132591,6 +157303,27 @@ msgstr ""
 "Restituisce se il [RID] [param body] fornito appartiene a una delle celle di "
 "questo [TileMapLayer]."
 
+msgid ""
+"Returns [code]true[/code] if the cell at coordinates [param coords] is "
+"flipped horizontally. The result is valid only for atlas sources."
+msgstr ""
+"Restituisce [code]true[/code] se la cella alle coordinate [param coords] è "
+"ribaltata orizzontalmente. Il risultato è valido solo per le sorgenti atlante."
+
+msgid ""
+"Returns [code]true[/code] if the cell at coordinates [param coords] is "
+"flipped vertically. The result is valid only for atlas sources."
+msgstr ""
+"Restituisce [code]true[/code] se la cella alle coordinate [param coords] è "
+"ribaltata verticalmente. Il risultato è valido solo per le sorgenti atlante."
+
+msgid ""
+"Returns [code]true[/code] if the cell at coordinates [param coords] is "
+"transposed. The result is valid only for atlas sources."
+msgstr ""
+"Restituisce [code]true[/code] se la cella alle coordinate [param coords] è "
+"trasposta. Il risultato è valido solo per le sorgenti atlante."
+
 msgid ""
 "Returns for the given coordinates [param coords_in_pattern] in a "
 "[TileMapPattern] the corresponding cell coordinates if the pattern was pasted "
@@ -132677,6 +157410,57 @@ msgstr ""
 "identificatori impostati automaticamente sui rispettivi valori non validi, "
 "ovvero [code]-1[/code], [code]Vector2i(-1, -1)[/code] e [code]-1[/code]."
 
+msgid ""
+"Update all the cells in the [param cells] coordinates array so that they use "
+"the given [param terrain] for the given [param terrain_set]. If an updated "
+"cell has the same terrain as one of its neighboring cells, this function "
+"tries to join the two. This function might update neighboring tiles if needed "
+"to create correct terrain transitions.\n"
+"If [param ignore_empty_terrains] is [code]true[/code], empty terrains will be "
+"ignored when trying to find the best fitting tile for the given terrain "
+"constraints.\n"
+"[b]Note:[/b] To work correctly, this method requires the [TileMapLayer]'s "
+"TileSet to have terrains set up with all required terrain combinations. "
+"Otherwise, it may produce unexpected results."
+msgstr ""
+"Aggiorna tutte le celle nell'array di coordinate [param cells] in modo che "
+"usino il terreno [param terrain] per l'insieme di terreni [param "
+"terrain_set]. Se una cella aggiornata ha lo stesso terreno di una delle celle "
+"vicine, questa funzione tenta di unire le due. Questa funzione potrebbe "
+"aggiornare i tasselli vicine se necessario per creare transizioni di terreno "
+"adeguate.\n"
+"Se [param ignore_empty_terrains] è [code]true[/code], i terreni vuoti saranno "
+"ignorati quando si tenta di trovare il tassello più adatto per i vincoli di "
+"terreno specificati.\n"
+"[b]Nota:[/b] Per funzionare correttamente, questo metodo richiede che il "
+"TileSet del [TileMapLayer] abbia terreni impostati con tutte le combinazioni "
+"di terreno richieste. Altrimenti, potrebbe produrre risultati imprevisti."
+
+msgid ""
+"Update all the cells in the [param path] coordinates array so that they use "
+"the given [param terrain] for the given [param terrain_set]. The function "
+"will also connect two successive cell in the path with the same terrain. This "
+"function might update neighboring tiles if needed to create correct terrain "
+"transitions.\n"
+"If [param ignore_empty_terrains] is [code]true[/code], empty terrains will be "
+"ignored when trying to find the best fitting tile for the given terrain "
+"constraints.\n"
+"[b]Note:[/b] To work correctly, this method requires the [TileMapLayer]'s "
+"TileSet to have terrains set up with all required terrain combinations. "
+"Otherwise, it may produce unexpected results."
+msgstr ""
+"Aggiorna tutte le celle nell'array di coordinate [param path] in modo che "
+"usino il terreno [param terrain] per l'insieme di terreni [param "
+"terrain_set]. La funzione collegherà anche due celle successive nel percorso "
+"con lo stesso terreno. Questa funzione potrebbe aggiornare i tasselli vicini "
+"se necessario per creare transizioni di terreno adeguate.\n"
+"Se [param ignore_empty_terrains] è [code]true[/code], i terreni vuoti saranno "
+"ignorati quando si tenta di trovare il tassello più adatto per i vincoli di "
+"terreno specificati.\n"
+"[b]Nota:[/b] Per funzionare correttamente, questo metodo richiede che il "
+"TileSet del [TileMapLayer] abbia terreni impostati con tutte le combinazioni "
+"di terreno richieste. Altrimenti, potrebbe produrre risultati imprevisti."
+
 msgid ""
 "Sets a custom [param map] as a [NavigationServer2D] navigation map. If not "
 "set, uses the default [World2D] navigation map instead."
@@ -132745,6 +157529,9 @@ msgstr ""
 "[constant DEBUG_VISIBILITY_MODE_DEFAULT], dipende dalle impostazioni di debug "
 "della navigazione."
 
+msgid "Enable or disable light occlusion."
+msgstr "Abilita o disabilita l'occlusione di luce."
+
 msgid ""
 "The [TileMapLayer]'s quadrant size. A quadrant is a group of tiles to be "
 "drawn together on a single canvas item, for optimization purposes. [member "
@@ -132892,6 +157679,39 @@ msgstr "Imposta le dimensioni del motivo."
 msgid "Tile library for tilemaps."
 msgstr "La libreria di tasselli per i tilemap."
 
+msgid ""
+"A TileSet is a library of tiles for a [TileMapLayer]. A TileSet handles a "
+"list of [TileSetSource], each of them storing a set of tiles.\n"
+"Tiles can either be from a [TileSetAtlasSource], which renders tiles out of a "
+"texture with support for physics, navigation, etc., or from a "
+"[TileSetScenesCollectionSource], which exposes scene-based tiles.\n"
+"Tiles are referenced by using three IDs: their source ID, their atlas "
+"coordinates ID, and their alternative tile ID.\n"
+"A TileSet can be configured so that its tiles expose more or fewer "
+"properties. To do so, the TileSet resources use property layers, which you "
+"can add or remove depending on your needs.\n"
+"For example, adding a physics layer allows giving collision shapes to your "
+"tiles. Each layer has dedicated properties (physics layer and mask), so you "
+"may add several TileSet physics layers for each type of collision you need.\n"
+"See the functions to add new layers for more information."
+msgstr ""
+"Un TileSet è una libreria di tasselli per un [TileMapLayer]. Un TileSet "
+"gestisce una lista di [TileSetSource], ognuno dei quali memorizza un insieme "
+"di tasselli.\n"
+"I tasselli possono provenire da una [TileSetAtlasSource], che renderizza i "
+"tasselli da una texture con supporto per fisica, navigazione, ecc., oppure da "
+"una [TileSetScenesCollectionSource], che espone tasselli basati su scene.\n"
+"I tile vengono referenziati utilizzando tre ID: il loro ID sorgente, il loro "
+"ID di coordinate atlante e il loro ID tile alternativo.\n"
+"Un TileSet può essere configurato in modo che i suoi tasselli espongano più o "
+"meno proprietà. Per farlo, le risorse TileSet utilizzano livelli di "
+"proprietà, che puoi aggiungere o rimuovere a seconda delle tue esigenze.\n"
+"Ad esempio, l'aggiunta di un livello di fisica consente di dare forme di "
+"collisione ai tuoi tasselli. Ogni tassello ha proprietà dedicate (strati di "
+"fisica e maschera), quindi puoi aggiungere diversi livelli di fisica TileSet "
+"per ogni tipo di collisione di cui hai bisogno.\n"
+"Per ulteriori informazioni, consulta le funzioni per aggiungere nuovi livelli."
+
 msgid ""
 "Adds a custom data layer to the TileSet at the given position [param "
 "to_position] in the array. If [param to_position] is -1, adds it at the end "
@@ -133087,6 +157907,12 @@ msgstr ""
 "Restituisce la maschera di collisione dei corpi sul livello di fisica del "
 "TileSet."
 
+msgid ""
+"Returns the collision priority of bodies on the given TileSet's physics layer."
+msgstr ""
+"Restituisce la priorità di collisione dei corpi sul livello di fisica "
+"specificato del TileSet."
+
 msgid ""
 "Returns the physics material of bodies on the given TileSet's physics layer."
 msgstr ""
@@ -133141,6 +157967,11 @@ msgstr ""
 "Restituisce se esiste un proxy a livello di coordinate per gli identificatori "
 "forniti."
 
+msgid "Returns if there is a custom data layer named [param layer_name]."
+msgstr ""
+"Restituisce se è presente un livello di dati personalizzati con il nome "
+"[param layer_name]."
+
 msgid "Returns if this TileSet has a source for the given source ID."
 msgstr ""
 "Restituisce se questo TileSet ha una sorgente per l'ID di sorgente fornito."
@@ -133355,6 +158186,24 @@ msgstr ""
 "Attiva o disattiva la collisione SDF per gli occlusori nel livello di "
 "occlusione del TileSet fornito."
 
+msgid ""
+"Sets the collision layer (as in the physics server) for bodies in the given "
+"TileSet physics layer."
+msgstr ""
+"Imposta gli strati di fisica (come nel server di fisica) per i corpi nel "
+"livello di fisica specificato del TileSet."
+
+msgid "Sets the collision mask for bodies in the given TileSet physics layer."
+msgstr ""
+"Imposta la maschera di collisione per i corpi nel livello di fisica fornito "
+"del TileSet."
+
+msgid ""
+"Sets the collision priority for bodies in the given TileSet physics layer."
+msgstr ""
+"Imposta la priorità di collisione per i corpi nel livello di fisica fornito "
+"del TileSet."
+
 msgid "Sets the physics material for bodies in the given TileSet physics layer."
 msgstr ""
 "Imposta il materiale di fisica per i corpi nel livello di fisica del TileSet "
@@ -133882,6 +158731,13 @@ msgstr ""
 msgid "The atlas texture."
 msgstr "La texture d'atlante."
 
+msgid ""
+"The base tile size in the texture (in pixel). This size must be bigger than "
+"or equal to the TileSet's [code]tile_size[/code] value."
+msgstr ""
+"Le dimensioni base di un tassello nella texture (in pixel). Queste dimensioni "
+"devono essere maggiori del valore [code]tile_size[/code] del TileSet."
+
 msgid ""
 "If [code]true[/code], generates an internal texture with an additional one "
 "pixel padding around each tile. Texture padding avoids a common artifact "
@@ -134641,9 +159497,43 @@ msgstr ""
 msgid "Returns [code]true[/code] if the timer is stopped or has not started."
 msgstr "Restituisce [code]true[/code] se il timer è fermato o non è iniziato."
 
+msgid ""
+"Starts the timer, or resets the timer if it was started already. Fails if the "
+"timer is not inside the tree. If [param time_sec] is greater than [code]0[/"
+"code], this value is used for the [member wait_time].\n"
+"[b]Note:[/b] This method does not resume a paused timer. See [member paused]."
+msgstr ""
+"Avvia il timer, o reimposta il timer se è già stato avviato. Fallisce se il "
+"timer non è all'interno dell'albero. Se [param time_sec] è maggiore di "
+"[code]0[/code], questo valore viene usato per [member wait_time].\n"
+"[b]Nota:[/b] Questo metodo non riprende un timer in pausa. Vedi [member "
+"paused]."
+
 msgid "Stops the timer."
 msgstr "Arresta il timer."
 
+msgid ""
+"If [code]true[/code], the timer will start immediately when it enters the "
+"scene tree.\n"
+"[b]Note:[/b] After the timer enters the tree, this property is automatically "
+"set to [code]false[/code].\n"
+"[b]Note:[/b] This property does nothing when the timer is running in the "
+"editor."
+msgstr ""
+"Se [code]true[/code], il timer si avvierà immediatamente quando entra "
+"nell'albero di scena.\n"
+"[b]Nota:[/b] Dopo che il timer entra nell'albero, questa proprietà viene "
+"automaticamente impostata su [code]false[/code].\n"
+"[b]Nota:[/b] Questa proprietà non fa nulla quando il timer è in esecuzione "
+"nell'editor."
+
+msgid ""
+"If [code]true[/code], the timer will ignore [member Engine.time_scale] and "
+"update with the real, elapsed time."
+msgstr ""
+"Se [code]true[/code], il timer ignorerà [member Engine.time_scale] e si "
+"aggiornerà con il tempo realmente trascorso."
+
 msgid ""
 "If [code]true[/code], the timer will stop after reaching the end. Otherwise, "
 "as by default, the timer will automatically restart."
@@ -134817,6 +159707,13 @@ msgstr ""
 "Restituisce il [CryptoKey] specificato durante la creazione con [method "
 "TLSOptions.server]."
 
+msgid ""
+"Returns the CA [X509Certificate] chain specified when creating with [method "
+"TLSOptions.client] or [method TLSOptions.client_unsafe]."
+msgstr ""
+"Restituisce la catena [X509Certificate] CA specificata durante la creazione "
+"con [method TLSOptions.client] o [method TLSOptions.client_unsafe]."
+
 msgid ""
 "Returns [code]true[/code] if created with [method TLSOptions.server], "
 "[code]false[/code] otherwise."
@@ -134850,6 +159747,33 @@ msgstr "Classe che rappresenta un [PrimitiveMesh] toro."
 msgid "Button for touch screen devices for gameplay use."
 msgstr "Pulsante per dispositivi touch screen per l'utilizzo nel gioco."
 
+msgid ""
+"TouchScreenButton allows you to create on-screen buttons for touch devices. "
+"It's intended for gameplay use, such as a unit you have to touch to move. "
+"Unlike [Button], TouchScreenButton supports multitouch out of the box. "
+"Several TouchScreenButtons can be pressed at the same time with touch input.\n"
+"This node inherits from [Node2D]. Unlike with [Control] nodes, you cannot set "
+"anchors on it. If you want to create menus or user interfaces, you may want "
+"to use [Button] nodes instead. To make button nodes react to touch events, "
+"you can enable [member ProjectSettings.input_devices/pointing/"
+"emulate_mouse_from_touch] in the Project Settings.\n"
+"You can configure TouchScreenButton to be visible only on touch devices, "
+"helping you develop your game both for desktop and mobile devices."
+msgstr ""
+"TouchScreenButton consente di creare pulsanti sullo schermo per dispositivi "
+"touch. È pensato per l'uso nel gameplay, come un'unità che bisogna toccare "
+"per muoversi. A differenza di [Button], TouchScreenButton supporta il "
+"multitouch pronto all'uso. È possibile premere più TouchScreenButton allo "
+"stesso tempo con gli input di tocco.\n"
+"Questo nodo eredita da [Node2D]. A differenza dei nodi [Control], non è "
+"possibile impostare ancore su di esso. Se vuoi creare menu o interfacce "
+"utente, potresti voler usare i nodi [Button]. Per far reagire i nodi pulsante "
+"agli eventi di tocco, puoi abilitare [member ProjectSettings.input_devices/"
+"pointing/emulate_mouse_from_touch] nelle Impostazioni del progetto.\n"
+"Puoi configurare TouchScreenButton in modo che sia visibile solo sui "
+"dispositivi touch, aiutandoti a sviluppare il tuo gioco sia per i desktop sia "
+"per i dispositivi mobili."
+
 msgid "Returns [code]true[/code] if this button is currently pressed."
 msgstr "Restituisce [code]true[/code] se questo pulsante è attualmente premuto."
 
@@ -134948,6 +159872,15 @@ msgstr ""
 "tipo [Basis]. Tutte le menzioni di \"base\" si riferiscono ai componenti "
 "[member x] e [member y] di [Transform2D]."
 
+msgid ""
+"Constructs a [Transform2D] identical to [constant IDENTITY].\n"
+"[b]Note:[/b] In C#, this constructs a [Transform2D] with all of its "
+"components set to [constant Vector2.ZERO]."
+msgstr ""
+"Costruisce un [Transform2D] identico a [constant IDENTITY].\n"
+"[b]Nota:[/b] In C#, costruisce un [Transfor2D] con tutti i suoi componenti "
+"impostati su [constant Vector2.ZERO]."
+
 msgid "Constructs a [Transform2D] as a copy of the given [Transform2D]."
 msgstr "Costruisce un [Transform2D] come copia del [Transform2D] specificato."
 
@@ -134970,6 +159903,21 @@ msgstr ""
 "Costruisce un [Transform2D] da 3 valori [Vector2] che rappresentano [member "
 "x], [member y] e [member origin] (le tre colonne della matrice)."
 
+msgid ""
+"Returns the inverted version of this transform. Unlike [method inverse], this "
+"method works with almost any basis, including non-uniform ones, but is "
+"slower.\n"
+"[b]Note:[/b] For this method to return correctly, the transform's basis needs "
+"to have a determinant that is not exactly [code]0.0[/code] (see [method "
+"determinant])."
+msgstr ""
+"Restituisce la versione invertita di questa trasformazione. A differenza di "
+"[method inverse], questo metodo funziona con quasi ogni base, comprese quelle "
+"non uniformi, ma è più lento.\n"
+"[b]Nota:[/b] Affinché questo metodo restituisca correttamente, la base della "
+"trasformazione deve avere un determinante che non sia esattamente [code]0.0[/"
+"code] (vedi [method determinant])."
+
 msgid ""
 "Returns a copy of the [param v] vector, transformed (multiplied) by the "
 "transform basis's matrix. Unlike the multiplication operator ([code]*[/"
@@ -134996,6 +159944,28 @@ msgstr ""
 "ortonormale, dovrebbe essere usato [code]transform.affine_inverse()."
 "basis_xform(vector)[/code] (vedi [method affline_inverse])."
 
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/Determinant]determinant[/url] "
+"of this transform basis's matrix. For advanced math, this number can be used "
+"to determine a few attributes:\n"
+"- If the determinant is exactly [code]0.0[/code], the basis is not invertible "
+"(see [method inverse]).\n"
+"- If the determinant is a negative number, the basis represents a negative "
+"scale.\n"
+"[b]Note:[/b] If the basis's scale is the same for every axis, its determinant "
+"is always that scale by the power of 2."
+msgstr ""
+"Restituisce il [url=https://it.wikipedia.org/wiki/"
+"Determinante_(algebra)]determinante[/url] della matrice di questa base di "
+"trasformazione. Per la matematica avanzata, questo numero può essere "
+"utilizzato per determinare alcuni attributi:\n"
+"- Se il determinante è esattamente [code]0.0[/code], la base non è "
+"invertibile (vedi [method inverse]).\n"
+"- Se il determinante è un numero negativo, la base rappresenta una scala "
+"negativa.\n"
+"[b]Nota:[/b] Se la scala della base è la stessa per ogni asse, il suo "
+"determinante è sempre quella scala alla potenza di 2."
+
 msgid "Returns this transform's translation. Equivalent to [member origin]."
 msgstr ""
 "Restituisce la traslazione di questa trasformazione. Equivale a [member "
@@ -135008,6 +159978,67 @@ msgstr ""
 "Restituisce la rotazione di questa trasformazione (in radianti). Ciò equivale "
 "all'angolo di [member x] (vedi [method Vector2.angle])."
 
+msgid ""
+"Returns the length of both [member x] and [member y], as a [Vector2]. If this "
+"transform's basis is not skewed, this value is the scaling factor. It is not "
+"affected by rotation.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_transform = Transform2D(\n"
+"    Vector2(2, 0),\n"
+"    Vector2(0, 4),\n"
+"    Vector2(0, 0)\n"
+")\n"
+"# Rotating the Transform2D in any way preserves its scale.\n"
+"my_transform = my_transform.rotated(TAU / 2)\n"
+"\n"
+"print(my_transform.get_scale()) # Prints (2.0, 4.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myTransform = new Transform2D(\n"
+"    Vector3(2.0f, 0.0f),\n"
+"    Vector3(0.0f, 4.0f),\n"
+"    Vector3(0.0f, 0.0f)\n"
+");\n"
+"// Rotating the Transform2D in any way preserves its scale.\n"
+"myTransform = myTransform.Rotated(Mathf.Tau / 2.0f);\n"
+"\n"
+"GD.Print(myTransform.GetScale()); // Prints (2, 4)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If the value returned by [method determinant] is negative, the "
+"scale is also negative."
+msgstr ""
+"Restituisce la lunghezza di [member x] e [member y], come [Vector2]. Se la "
+"base di questa trasformazione non è distorta, questo valore è il fattore di "
+"scala. Non è influenzato dalla rotazione.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_transform = Transform2D(\n"
+"    Vector2(2, 0),\n"
+"    Vector2(0, 4),\n"
+"    Vector2(0, 0)\n"
+")\n"
+"# Ruotare il Transform2D in qualsiasi modo ne preserva la scala.\n"
+"my_transform = my_transform.rotated(TAU / 2)\n"
+"\n"
+"print(my_transform.get_scale()) # Stampa (2.0, 4.0).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myTransform = new Transform2D(\n"
+"    Vector3(2.0f, 0.0f),\n"
+"    Vector3(0.0f, 4.0f),\n"
+"    Vector3(0.0f, 0.0f)\n"
+");\n"
+"// Ruotare il Transform2D in qualsiasi modo ne preserva la scala.\n"
+"myTransform = myTransform.Rotated(Mathf.Tau / 2.0f);\n"
+"\n"
+"GD.Print(myTransform.GetScale()); // Stampa (2, 4).\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Se il valore restituito da [method determinant] è negativo, "
+"anche la scala è negativa."
+
 msgid "Returns this transform's skew (in radians)."
 msgstr "Restituisce l'inclinazione di questa trasformazione (in radianti)."
 
@@ -135024,6 +160055,21 @@ msgstr ""
 "code] (inclusi). I valori al di fuori di questo intervallo sono consentiti e "
 "possono essere utilizzati per eseguire un'[i]estrapolazione[/i]."
 
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/Invertible_matrix]inverted "
+"version of this transform[/url].\n"
+"[b]Note:[/b] For this method to return correctly, the transform's basis needs "
+"to be [i]orthonormal[/i] (see [method orthonormalized]). That means the basis "
+"should only represent a rotation. If it does not, use [method affine_inverse] "
+"instead."
+msgstr ""
+"Restituisce la [url=https://it.wikipedia.org/wiki/"
+"Matrice_invertibile]versione invertita di questa trasformazione[/url].\n"
+"[b]Nota:[/b] Affinché questo metodo restituisca correttamente, la base della "
+"trasformazione deve essere [i]ortonormale[/i] (vedi [method "
+"orthonormalized]). Ciò significa che la base dovrebbe rappresentare solo una "
+"rotazione. In caso contrario, usa invece [method affine_inverse]."
+
 msgid ""
 "Returns [code]true[/code] if this transform's basis is conformal. A conformal "
 "basis is both [i]orthogonal[/i] (the axes are perpendicular to each other) "
@@ -135058,6 +160104,37 @@ msgstr ""
 "Restituisce una copia della trasformazione ruotata in modo che l'asse X "
 "ruotato punti verso la posizione [param target], nello spazio globale."
 
+msgid ""
+"Returns a copy of this transform with its basis orthonormalized. An "
+"orthonormal basis is both [i]orthogonal[/i] (the axes are perpendicular to "
+"each other) and [i]normalized[/i] (the axes have a length of [code]1.0[/"
+"code]), which also means it can only represent a rotation."
+msgstr ""
+"Restituisce una copia di questa trasformazione con la sua base "
+"ortonormalizzata. Una base ortonormale è sia [i]ortogonale[/i] (gli assi sono "
+"perpendicolari tra loro) sia [i]normalizzata[/i] (gli assi hanno una "
+"lunghezza di [code]1.0[/code]), il che significa anche che può rappresentare "
+"solo una rotazione."
+
+msgid ""
+"Returns a copy of this transform rotated by the given [param angle] (in "
+"radians).\n"
+"If [param angle] is positive, the transform is rotated clockwise.\n"
+"This method is an optimized version of multiplying the given transform "
+"[code]X[/code] with a corresponding rotation transform [code]R[/code] from "
+"the left, i.e., [code]R * X[/code].\n"
+"This can be seen as transforming with respect to the global/parent frame."
+msgstr ""
+"Restituisce una copia di questa trasformazione ruotata dell'angolo [param "
+"angle] (in radianti).\n"
+"Se [param angle] è positivo, la trasformazione viene ruotata in senso "
+"orario.\n"
+"Questo metodo è una versione ottimizzata della moltiplicazione della "
+"trasformazione fornita [code]X[/code] con una corrispondente trasformazione "
+"di rotazione [code]R[/code] da sinistra, ovvero [code]R * X[/code].\n"
+"Ciò può essere visto come una trasformazione rispetto alla struttura globale/"
+"padre."
+
 msgid ""
 "Returns a copy of the transform rotated by the given [param angle] (in "
 "radians).\n"
@@ -135151,6 +160228,87 @@ msgstr ""
 "Sulla trasformazione di identità, questo vettore punta a destra ([constant "
 "Vector2.RIGHT])."
 
+msgid ""
+"The transform basis's Y axis, and the column [code]1[/code] of the matrix. "
+"Combined with [member x], this represents the transform's rotation, scale, "
+"and skew.\n"
+"On the identity transform, this vector points down ([constant Vector2.DOWN])."
+msgstr ""
+"L'asse Y della base di trasformazione e la colonna [code]1[/code] della "
+"matrice. Combinato con [member x], questo rappresenta la rotazione, la scala "
+"e l'inclinazione della trasformazione.\n"
+"Sulla trasformazione di identità, questo vettore punta in basso ([constant "
+"Vector2.DOWN])."
+
+msgid ""
+"The identity [Transform2D]. This is a transform with no translation, no "
+"rotation, and a scale of [constant Vector2.ONE]. This also means that:\n"
+"- The [member x] points right ([constant Vector2.RIGHT]);\n"
+"- The [member y] points down ([constant Vector2.DOWN]).\n"
+"[codeblock]\n"
+"var transform = Transform2D.IDENTITY\n"
+"print(\"| X | Y | Origin\")\n"
+"print(\"| %.f | %.f | %.f\" % [transform.x.x, transform.y.x, transform.origin."
+"x])\n"
+"print(\"| %.f | %.f | %.f\" % [transform.x.y, transform.y.y, transform.origin."
+"y])\n"
+"# Prints:\n"
+"# | X | Y | Origin\n"
+"# | 1 | 0 | 0\n"
+"# | 0 | 1 | 0\n"
+"[/codeblock]\n"
+"If a [Vector2], a [Rect2], a [PackedVector2Array], or another [Transform2D] "
+"is transformed (multiplied) by this constant, no transformation occurs.\n"
+"[b]Note:[/b] In GDScript, this constant is equivalent to creating a "
+"[constructor Transform2D] without any arguments. It can be used to make your "
+"code clearer, and for consistency with C#."
+msgstr ""
+"Il [Transform2D] di identità. Una trasformazione senza traslazione, senza "
+"rotazione e con una scala pari a [constant Vector2.ONE]. Ciò significa anche "
+"che:\n"
+"- La [member x] punta a destra ([constant Vector2.RIGHT]);\n"
+"- La [member y] punta in basso ([constant Vector2.DOWN]).\n"
+"[codeblock]\n"
+"var transform = Transform2D.IDENTITY\n"
+"print(\"| X | Y | Origin\")\n"
+"print(\"| %.f | %.f | %.f\" % [transform.x.x, transform.y.x, transform.origin."
+"x])\n"
+"print(\"| %.f | %.f | %.f\" % [transform.x.y, transform.y.y, transform.origin."
+"y])\n"
+"# Stampa:\n"
+"# | X | Y | Origin\n"
+"# | 1 | 0 | 0\n"
+"# | 0 | 1 | 0\n"
+"[/codeblock]\n"
+"Se un [Vector2], un [Rect2], un [PackedVector2Array] o un altro [Transform2D] "
+"viene trasformato (moltiplicato) per questa costante, non si verifica alcuna "
+"trasformazione.\n"
+"[b]Nota:[/b] In GDScript, questa costante è identica alla creazione di un "
+"[constructor Transform2D] senza alcun argomento. Questa costante può essere "
+"usata per rendere il codice più chiaro e per coerenza con C#."
+
+msgid ""
+"When any transform is multiplied by [constant FLIP_X], it negates all "
+"components of the [member x] axis (the X column).\n"
+"When [constant FLIP_X] is multiplied by any transform, it negates the [member "
+"Vector2.x] component of all axes (the X row)."
+msgstr ""
+"Quando una qualsiasi trasformazione è moltiplicata per [constant FLIP_X], "
+"nega tutti i componenti dell'asse [member x] (la colonna X).\n"
+"Quando [constant FLIP_X] è moltiplicata per qualsiasi trasformazione, nega il "
+"componente [member Vector2.x] di tutti gli assi (la riga X)."
+
+msgid ""
+"When any transform is multiplied by [constant FLIP_Y], it negates all "
+"components of the [member y] axis (the Y column).\n"
+"When [constant FLIP_Y] is multiplied by any transform, it negates the [member "
+"Vector2.y] component of all axes (the Y row)."
+msgstr ""
+"Quando una qualsiasi trasformazione è moltiplicata per [constant FLIP_Y], "
+"nega tutti i componenti dell'asse [member y] (la colonna Y).\n"
+"Quando [constant FLIP_Y] è moltiplicata per qualsiasi trasformazione, nega il "
+"componente [member Vector2.y] di tutti gli assi (la riga Y)."
+
 msgid ""
 "Returns [code]true[/code] if the components of both transforms are not "
 "equal.\n"
@@ -135286,6 +160444,16 @@ msgstr ""
 "assets_pipeline/importing_3d_scenes/model_export_considerations.html#d-asset-"
 "direction-conventions]Convenzioni sulla direzione delle risorse 3D[/url]."
 
+msgid ""
+"Constructs a [Transform3D] identical to [constant IDENTITY].\n"
+"[b]Note:[/b] In C#, this constructs a [Transform3D] with its [member origin] "
+"and the components of its [member basis] set to [constant Vector3.ZERO]."
+msgstr ""
+"Costruisce un [Transform3D] identico a [constant IDENTITY].\n"
+"[b]Nota:[/b] In C#, costruisce un [Transform3D] con il suo [member origin] e "
+"tutti i componenti della sua [member basis] impostati su [constant Vector2."
+"ZERO]."
+
 msgid "Constructs a [Transform3D] as a copy of the given [Transform3D]."
 msgstr "Costruisce un [Transform3D] come copia del [Transform3D] specificato."
 
@@ -135316,6 +160484,38 @@ msgstr ""
 "I primi tre argomenti sono gli assi della [member basis] ([member Basis.x], "
 "[member Basis.y] e [member Basis.z])."
 
+msgid ""
+"Returns the inverted version of this transform. Unlike [method inverse], this "
+"method works with almost any [member basis], including non-uniform ones, but "
+"is slower. See also [method Basis.inverse].\n"
+"[b]Note:[/b] For this method to return correctly, the transform's [member "
+"basis] needs to have a determinant that is not exactly [code]0.0[/code] (see "
+"[method Basis.determinant])."
+msgstr ""
+"Restituisce la versione invertita di questa trasformazione. A differenza di "
+"[method inverse], questo metodo funziona con quasi ogni [member basis], "
+"comprese quelle non uniformi, ma è più lento. Vedi anche [method Basis."
+"inverse].\n"
+"[b]Nota:[/b] Affinché questo metodo restituisca correttamente, la [member "
+"basis] della trasformazione deve avere un determinante che non sia "
+"esattamente [code]0.0[/code] (vedi [method Basis.determinant])."
+
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/Invertible_matrix]inverted "
+"version of this transform[/url]. See also [method Basis.inverse].\n"
+"[b]Note:[/b] For this method to return correctly, the transform's [member "
+"basis] needs to be [i]orthonormal[/i] (see [method orthonormalized]). That "
+"means the basis should only represent a rotation. If it does not, use [method "
+"affine_inverse] instead."
+msgstr ""
+"Restituisce la [url=https://it.wikipedia.org/wiki/"
+"Matrice_invertibile]versione invertita di questa trasformazione[/url]. Vedi "
+"anche [method Basis.inverse].\n"
+"[b]Nota:[/b] Affinché questo metodo restituisca correttamente, la [member "
+"basis] della trasformazione deve essere [i]ortonormale[/i] (vedi [method "
+"orthonormalized]). Ciò significa che la base dovrebbe rappresentare solo una "
+"rotazione. In caso contrario, usa invece [method affine_inverse]."
+
 msgid ""
 "Returns a copy of this transform rotated so that the forward axis (-Z) points "
 "towards the [param target] position.\n"
@@ -135338,10 +160538,67 @@ msgstr ""
 "inclinazione della trasformazione originale vengono scartate. I vettori "
 "[param target] e [param up] non possono essere zero, non possono essere "
 "paralleli tra loro e sono definiti nello spazio globale/padre.\n"
-"Se [param use_model_front] è [code]true[/code], l'asse +Z (asset front) viene "
-"trattato come anteriore (implica che +X sia a sinistra) e punta verso la "
-"posizione [param target]. Per impostazione predefinita, l'asse -Z (avanti per "
-"la telecamera) viene trattato come anteriore (implica che +X sia a destra)."
+"Se [param use_model_front] è [code]true[/code], l'asse +Z (avanti per gli "
+"asset) viene trattato come anteriore (implica che +X sia a sinistra) e punta "
+"verso la posizione [param target]. Come predefinito, l'asse -Z (avanti per la "
+"telecamera) viene trattato come anteriore (implica che +X sia a destra)."
+
+msgid ""
+"Returns a copy of this transform with its [member basis] orthonormalized. An "
+"orthonormal basis is both [i]orthogonal[/i] (the axes are perpendicular to "
+"each other) and [i]normalized[/i] (the axes have a length of [code]1.0[/"
+"code]), which also means it can only represent a rotation. See also [method "
+"Basis.orthonormalized]."
+msgstr ""
+"Restituisce una copia di questa trasformazione con la sua [member basis] "
+"ortonormalizzata. Una base ortonormale è sia [i]ortogonale[/i] (gli assi sono "
+"perpendicolari tra loro) sia [i]normalizzata[/i] (gli assi hanno una "
+"lunghezza di [code]1.0[/code]), il che significa anche che può rappresentare "
+"solo una rotazione. Vedi anche [method Basis.orthonormalized]."
+
+msgid ""
+"Returns a copy of this transform rotated around the given [param axis] by the "
+"given [param angle] (in radians).\n"
+"The [param axis] must be a normalized vector (see [method Vector3."
+"normalized]). If [param angle] is positive, the basis is rotated counter-"
+"clockwise around the axis.\n"
+"This method is an optimized version of multiplying the given transform "
+"[code]X[/code] with a corresponding rotation transform [code]R[/code] from "
+"the left, i.e., [code]R * X[/code].\n"
+"This can be seen as transforming with respect to the global/parent frame."
+msgstr ""
+"Restituisce una copia di questa trasformazione ruotata attorno all'asse "
+"[param axis] dell'angolo [param angle] (in radianti).\n"
+"L'asse [param axis] deve essere un vettore normalizzato (vedi [method Vector3."
+"normalized]). Se [param angle] è positivo, la base viene ruotata in senso "
+"antiorario attorno l'asse.\n"
+"Questo metodo è una versione ottimizzata della moltiplicazione della "
+"trasformazione fornita [code]X[/code] con una corrispondente trasformazione "
+"di rotazione [code]R[/code] da sinistra, ovvero [code]R * X[/code].\n"
+"Ciò può essere visto come una trasformazione rispetto alla struttura globale/"
+"padre."
+
+msgid ""
+"Returns a copy of this transform rotated around the given [param axis] by the "
+"given [param angle] (in radians).\n"
+"The [param axis] must be a normalized vector in the transform's local "
+"coordinate system. For example, to rotate around the local X-axis, use "
+"[constant Vector3.RIGHT].\n"
+"This method is an optimized version of multiplying the given transform "
+"[code]X[/code] with a corresponding rotation transform [code]R[/code] from "
+"the right, i.e., [code]X * R[/code].\n"
+"This can be seen as transforming with respect to the local frame."
+msgstr ""
+"Restituisce una copia di questa trasformazione ruotata attorno all'asse "
+"[param axis] dell'angolo [param angle] (in radianti).\n"
+"L'asse [param axis] deve essere un vettore normalizzato nel sistema di "
+"coordinate locali della trasformazione. Ad esempio, per ruotare attorno "
+"all'asse X locale, usa [constant Vector3.RIGHT].\n"
+"Questo metodo è una versione ottimizzata della moltiplicazione della "
+"trasformazione fornita [code]X[/code] con una corrispondente trasformazione "
+"di rotazione [code]R[/code] da destra, ovvero [code]X * R[/code].\n"
+"Questo può essere visto come una trasformazione rispetto alla struttura "
+"locale."
 
 msgid ""
 "Returns a copy of this transform scaled by the given [param scale] factor.\n"
@@ -135417,6 +160674,65 @@ msgstr ""
 "L'offset di traslazione di questa trasformazione. Nello spazio 3D, questo può "
 "essere visto come la posizione."
 
+msgid ""
+"The identity [Transform3D]. This is a transform with no translation, no "
+"rotation, and a scale of [constant Vector3.ONE]. Its [member basis] is equal "
+"to [constant Basis.IDENTITY]. This also means that:\n"
+"- Its [member Basis.x] points right ([constant Vector3.RIGHT]);\n"
+"- Its [member Basis.y] points up ([constant Vector3.UP]);\n"
+"- Its [member Basis.z] points back ([constant Vector3.BACK]).\n"
+"[codeblock]\n"
+"var transform = Transform3D.IDENTITY\n"
+"var basis = transform.basis\n"
+"print(\"| X | Y | Z | Origin\")\n"
+"print(\"| %.f | %.f | %.f | %.f\" % [basis.x.x, basis.y.x, basis.z.x, "
+"transform.origin.x])\n"
+"print(\"| %.f | %.f | %.f | %.f\" % [basis.x.y, basis.y.y, basis.z.y, "
+"transform.origin.y])\n"
+"print(\"| %.f | %.f | %.f | %.f\" % [basis.x.z, basis.y.z, basis.z.z, "
+"transform.origin.z])\n"
+"# Prints:\n"
+"# | X | Y | Z | Origin\n"
+"# | 1 | 0 | 0 | 0\n"
+"# | 0 | 1 | 0 | 0\n"
+"# | 0 | 0 | 1 | 0\n"
+"[/codeblock]\n"
+"If a [Vector3], an [AABB], a [Plane], a [PackedVector3Array], or another "
+"[Transform3D] is transformed (multiplied) by this constant, no transformation "
+"occurs.\n"
+"[b]Note:[/b] In GDScript, this constant is equivalent to creating a "
+"[constructor Transform3D] without any arguments. It can be used to make your "
+"code clearer, and for consistency with C#."
+msgstr ""
+"Il [Transform3D] di identità. Questa è una base senza rotazione, senza "
+"inclinazione, e con una scala pari a [constant Vector3.ONE]. La sua [member "
+"basis] è uguale a [constant Basis.IDENTITY]. Ciò significa anche che:\n"
+"- La sua [member Basis.x] punta a destra ([constant Vector3.RIGHT]);\n"
+"- La sua [member Basis.y] punta in alto ([constant Vector3.UP]);\n"
+"- La sua [member Basis.z] punta indietro ([constant Vector3.BACK]).\n"
+"[codeblock]\n"
+"var transform = Transform3D.IDENTITY\n"
+"var basis = transform.basis\n"
+"print(\"| X | Y | Z | Origine\")\n"
+"print(\"| %.f | %.f | %.f | %.f\" % [basis.x.x, basis.y.x, basis.z.x, "
+"transform.origin.x])\n"
+"print(\"| %.f | %.f | %.f | %.f\" % [basis.x.y, basis.y.y, basis.z.y, "
+"transform.origin.y])\n"
+"print(\"| %.f | %.f | %.f | %.f\" % [basis.x.z, basis.y.z, basis.z.z, "
+"transform.origin.z])\n"
+"# Stampa:\n"
+"# | X | Y | Z | Origine\n"
+"# | 1 | 0 | 0 | 0\n"
+"# | 0 | 1 | 0 | 0\n"
+"# | 0 | 0 | 1 | 0\n"
+"[/codeblock]\n"
+"Se un [Vector2], un [AABB], un [Plane], un [PackedVector3Array] o un altro "
+"[Transform3D] viene trasformato (moltiplicato) per questa costante, non si "
+"verifica alcuna trasformazione.\n"
+"[b]Nota:[/b] In GDScript, questa costante è identica alla creazione di un "
+"[constructor Transform3D] senza alcun argomento. Questa costante può essere "
+"usata per rendere il codice più chiaro e per coerenza con C#."
+
 msgid ""
 "[Transform3D] with mirroring applied perpendicular to the YZ plane. Its "
 "[member basis] is equal to [constant Basis.FLIP_X]."
@@ -135590,15 +160906,119 @@ msgstr "Restituisce tutti i messaggi (testo tradotto)."
 msgid "The locale of the translation."
 msgstr "La lingua della traduzione."
 
+msgid "A self-contained collection of [Translation] resources."
+msgstr "Una raccolta indipendente di risorse [Translation]."
+
+msgid "Adds a translation."
+msgstr "Aggiunge una traduzione."
+
+msgid "Removes all translations."
+msgstr "Rimuove tutte le traduzioni."
+
+msgid ""
+"Returns the [Translation] instance that best matches [param locale]. Returns "
+"[code]null[/code] if there are no matches."
+msgstr ""
+"Restituisce l'istanza [Translation] che corrisponde di più a [param locale]. "
+"Restituisce [code]null[/code] se non ci sono corrispondenze."
+
 msgid ""
 "Returns the pseudolocalized string based on the [param message] passed in."
 msgstr ""
 "Restituisce la stringa pseudolocalizzata in base al messaggio [param message] "
 "passato."
 
+msgid "Removes the given translation."
+msgstr "Restituisce la traduzione specificata."
+
+msgid ""
+"Returns the current locale's translation for the given message and context."
+msgstr ""
+"Restituisce la traduzione della localizzazione attuale per il messaggio e il "
+"contesto specificati."
+
+msgid ""
+"Returns the current locale's translation for the given message, plural "
+"message and context.\n"
+"The number [param n] is the number or quantity of the plural object. It will "
+"be used to guide the translation system to fetch the correct plural form for "
+"the selected language."
+msgstr ""
+"Restituisce la traduzione della localizzazione attuale per il messaggio, il "
+"messaggio plurale e il contesto specificati.\n"
+"Il numero [param n] è il numero o la quantità dell'oggetto plurale. Sarà "
+"usato per guidare il sistema di traduzione a recuperare la forma plurale "
+"corretta per la lingua selezionata."
+
+msgid ""
+"If [code]true[/code], enables pseudolocalization for the project. This can be "
+"used to spot untranslatable strings or layout issues that may occur once the "
+"project is localized to languages that have longer strings than the source "
+"language.\n"
+"[b]Note:[/b] Updating this property does not automatically update texts in "
+"the scene tree. Please propagate the [constant MainLoop."
+"NOTIFICATION_TRANSLATION_CHANGED] notification manually after you have "
+"finished modifying pseudolocalization related options."
+msgstr ""
+"Se [code]true[/code], abilita la pseudolocalizzazione per il progetto. Può "
+"essere utilizzata per individuare stringhe non traducibili o problemi di "
+"layout che potrebbero verificarsi una volta che il progetto è localizzato in "
+"lingue che hanno stringhe più lunghe della lingua di origine.\n"
+"[b]Nota:[/b] Aggiornando questa proprietà non si aggiorneranno "
+"automaticamente i testi nell'albero di scene. Si prega di propagare "
+"manualmente la notifica [constant MainLoop.NOTIFICATION_TRANSLATION_CHANGED] "
+"dopo aver finito di modificare le opzioni che riguardano la "
+"pseudolocalizzazione."
+
+msgid ""
+"If [code]true[/code], emulate bidirectional (right-to-left) text when "
+"pseudolocalization is enabled. This can be used to spot issues with RTL "
+"layout and UI mirroring that will crop up if the project is localized to RTL "
+"languages such as Arabic or Hebrew.\n"
+"[b]Note:[/b] Updating this property does not automatically update texts in "
+"the scene tree. Please propagate the [constant MainLoop."
+"NOTIFICATION_TRANSLATION_CHANGED] notification manually after you have "
+"finished modifying pseudolocalization related options."
+msgstr ""
+"Se [code]true[/code], emula il testo bidirezionale (da destra a sinistra) "
+"quando è abilitata la pseudolocalizzazione. Questo può essere utilizzato per "
+"individuare problemi con il layout RTL e il rispecchiamento dell'interfaccia "
+"utente, i quali si presenteranno se il progetto è localizzato in lingue RTL "
+"come l'arabo o l'ebraico.\n"
+"[b]Nota:[/b] Aggiornando questa proprietà non si aggiorneranno "
+"automaticamente i testi nell'albero di scene. Si prega di propagare "
+"manualmente la notifica [constant MainLoop.NOTIFICATION_TRANSLATION_CHANGED] "
+"dopo aver finito di modificare le opzioni che riguardano la "
+"pseudolocalizzazione."
+
+msgid ""
+"Skip placeholders for string formatting like [code]%s[/code] or [code]%f[/"
+"code] during pseudolocalization. Useful to identify strings which need "
+"additional control characters to display correctly.\n"
+"[b]Note:[/b] Updating this property does not automatically update texts in "
+"the scene tree. Please propagate the [constant MainLoop."
+"NOTIFICATION_TRANSLATION_CHANGED] notification manually after you have "
+"finished modifying pseudolocalization related options."
+msgstr ""
+"Ignora i segnaposto per la formattazione delle stringhe come [code]%s[/code] "
+"o [code]%f[/code] durante la pseudolocalizzazione. Utile per identificare le "
+"stringhe che necessitano di caratteri di controllo aggiuntivi per essere "
+"visualizzate correttamente.\n"
+"[b]Nota:[/b] Aggiornando questa proprietà non si aggiorneranno "
+"automaticamente i testi nell'albero di scene. Si prega di propagare "
+"manualmente la notifica [constant MainLoop.NOTIFICATION_TRANSLATION_CHANGED] "
+"dopo aver finito di modificare le opzioni che riguardano la "
+"pseudolocalizzazione."
+
 msgid "The server responsible for language translations."
 msgstr "Il server responsabile delle traduzioni linguistiche."
 
+msgid "Adds a translation to the main translation domain."
+msgstr "Aggiunge una traduzione al dominio di traduzione principale."
+
+msgid "Removes all translations from the main translation domain."
+msgstr "Rimuove tutte le traduzioni dal dominio di traduzione principale."
+
 msgid ""
 "Compares two locales and returns a similarity score between [code]0[/code] "
 "(no match) and [code]10[/code] (full match)."
@@ -135657,6 +161077,40 @@ msgstr ""
 "[b]Nota:[/b] Quando viene chiamato da un progetto esportato, restituisce lo "
 "stesso valore di [method get_locale]."
 
+msgid ""
+"Returns the [Translation] instance that best matches [param locale] in the "
+"main translation domain. Returns [code]null[/code] if there are no matches."
+msgstr ""
+"Restituisce l'istanza [Translation] che corrisponde di più a [param locale] "
+"nel dominio di traduzione principale. Restituisce [code]null[/code] se non ci "
+"sono corrispondenze."
+
+msgid ""
+"Returns [code]true[/code] if a translation domain with the specified name "
+"exists."
+msgstr ""
+"Restituisce [code]true[/code] se esiste un dominio di traduzione con il nome "
+"specificato."
+
+msgid ""
+"Returns the pseudolocalized string based on the [param message] passed in.\n"
+"[b]Note:[/b] This method always uses the main translation domain."
+msgstr ""
+"Restituisce la stringa pseudolocalizzata in base al messaggio [param message] "
+"passato.\n"
+"[b]Nota:[/b] Questo metodo utilizza sempre il dominio di traduzione "
+"principale."
+
+msgid ""
+"Reparses the pseudolocalization options and reloads the translation for the "
+"main translation domain."
+msgstr ""
+"Riesamina le opzioni di pseudolocalizzazione e ricarica la traduzione dal "
+"dominio di traduzione principale."
+
+msgid "Removes the given translation from the main translation domain."
+msgstr "Rimuove la traduzione specificata dal dominio di traduzione principale."
+
 msgid ""
 "Sets the locale of the project. The [param locale] string will be "
 "standardized to match known locales (e.g. [code]en-US[/code] would be matched "
@@ -135670,6 +161124,53 @@ msgstr ""
 "Se sono state caricate traduzioni in precedenza per la nuova impostazione "
 "locale, saranno applicate."
 
+msgid ""
+"Returns a [param locale] string standardized to match known locales (e.g. "
+"[code]en-US[/code] would be matched to [code]en_US[/code]). If [param "
+"add_defaults] is [code]true[/code], the locale may have a default script or "
+"country added."
+msgstr ""
+"Restituisce una stringa [param locale] standardizzata per corrispondere alle "
+"localizzazioni note (ad esempio, [code]en-US[/code] sarebbe abbinato a "
+"[code]en_US[/code]). Se [param add_defaults] è [code]true[/code], è possibile "
+"che alla localizzazione venga aggiunto un alfabeto o un paese predefinito."
+
+msgid ""
+"Returns the current locale's translation for the given message and context.\n"
+"[b]Note:[/b] This method always uses the main translation domain."
+msgstr ""
+"Restituisce la traduzione locale attuale per il messaggio e il contesto "
+"specificati.\n"
+"[b]Nota:[/b] Questo metodo utilizza sempre il dominio di traduzione "
+"principale."
+
+msgid ""
+"Returns the current locale's translation for the given message, plural "
+"message and context.\n"
+"The number [param n] is the number or quantity of the plural object. It will "
+"be used to guide the translation system to fetch the correct plural form for "
+"the selected language.\n"
+"[b]Note:[/b] This method always uses the main translation domain."
+msgstr ""
+"Restituisce la traduzione della localizzazione attuale per il messaggio, il "
+"messaggio plurale e il contesto specificati.\n"
+"Il numero [param n] è il numero o la quantità dell'oggetto plurale. Sarà "
+"usato per guidare il sistema di traduzione a recuperare la forma plurale "
+"corretta per la lingua selezionata.\n"
+"Restituisce la traduzione locale attuale per il messaggio e il contesto "
+"specificati.\n"
+"[b]Nota:[/b] Questo metodo utilizza sempre il dominio di traduzione "
+"principale."
+
+msgid ""
+"If [code]true[/code], enables the use of pseudolocalization on the main "
+"translation domain. See [member ProjectSettings.internationalization/"
+"pseudolocalization/use_pseudolocalization] for details."
+msgstr ""
+"Se [code]true[/code], abilita l'uso della pseudolocalizzazione sul dominio di "
+"traduzione principale. Vedi [member ProjectSettings.internationalization/"
+"pseudolocalization/use_pseudolocalization] per i dettagli."
+
 msgid ""
 "A control used to show a set of internal [TreeItem]s in a hierarchical "
 "structure."
@@ -136354,6 +161855,18 @@ msgstr ""
 "CELL_MODE_CHECK] quando non è modificabile (vedi [method TreeItem."
 "set_editable])."
 
+msgid "Text [Color] used when the item is hovered."
+msgstr ""
+"Il [Color] del testo utilizzato quando l'elemento è passato con il mouse."
+
+msgid ""
+"Text [Color] used when the item is hovered, while a button of the same item "
+"is hovered as the same time."
+msgstr ""
+"Il [Color] del testo utilizzato quando si passa il mouse sull'elemento, "
+"mentre un pulsante dello stesso elemento è passato sopra con il mouse allo "
+"stesso tempo."
+
 msgid "Text [Color] used when the item is selected."
 msgstr "Il [Color] del testo utilizzato quando l'elemento è selezionato."
 
@@ -136593,6 +162106,10 @@ msgstr ""
 "L'icona della freccia su/giù da visualizzare per una cella nella modalità "
 "[constant TreeItem.CELL_MODE_RANGE]."
 
+msgid "[StyleBox] used when a button in the tree is hovered."
+msgstr ""
+"Lo [StyleBox] utilizzato quando si passa il mouse su un pulsante nell'albero."
+
 msgid "[StyleBox] used when a button in the tree is pressed."
 msgstr "Lo [StyleBox] utilizzato quando un pulsante nell'albero è premuto."
 
@@ -136629,6 +162146,16 @@ msgstr ""
 msgid "The focused style for the [Tree], drawn on top of everything."
 msgstr "Lo stile focalizzato per il [Tree], disegnato sopra ogni cosa."
 
+msgid "[StyleBox] for the item being hovered."
+msgstr "Lo [StyleBox] utilizzato quando si passa il mouse sull'elemento."
+
+msgid ""
+"[StyleBox] for the item being hovered, while a button of the same item is "
+"hovered as the same time."
+msgstr ""
+"Lo [StyleBox] utilizzato quando si passa il mouse sull'elemento, mentre un "
+"pulsante dello stesso elemento è passato sopra con il mouse allo stesso tempo."
+
 msgid "The background style for the [Tree]."
 msgstr "Lo stile di sfondo del [Tree]."
 
@@ -136674,6 +162201,24 @@ msgstr ""
 "bit, a differenza di [int] che è sempre a 64 bit. Variano da "
 "[code]-2147483648[/code] a [code]2147483647[/code]."
 
+msgid ""
+"Adds a button with [Texture2D] [param button] to the end of the cell at "
+"column [param column]. The [param id] is used to identify the button in the "
+"according [signal Tree.button_clicked] signal and can be different from the "
+"buttons index. If not specified, the next available index is used, which may "
+"be retrieved by calling [method get_button_count] immediately before this "
+"method. Optionally, the button can be [param disabled] and have a [param "
+"tooltip_text]."
+msgstr ""
+"Aggiunge un pulsante con [Texture2D] [param button] alla fine della cella "
+"alla colonna [param column]. L'[param id] è utilizzato per identificare il "
+"pulsante nel segnale [signal Tree.button_clicked] corrispondente e può essere "
+"diverso dall'indice del pulsante. Se non specificato, è utilizzato l'indice "
+"successivo disponibile, che può essere recuperato chiamando [method "
+"get_button_count] subito prima di questo metodo. Facoltativamente, il "
+"pulsante può essere disabilitato ([param disabled]) e avere un suggerimento "
+"([param tooltip_text])."
+
 msgid ""
 "Adds a previously unparented [TreeItem] as a direct child of this one. The "
 "[param child] item must not be a part of any [Tree] or parented to any "
@@ -136690,6 +162235,9 @@ msgstr ""
 "Chiama il metodo [param method] sul TreeItem effettivo e sui suoi figli in "
 "modo ricorsivo. Passa i parametri come un elenco separato da virgole."
 
+msgid "Removes all buttons from all columns of this item."
+msgstr "Rimuove tutti i pulsanti da tutte le colonne di questo elemento."
+
 msgid "Resets the background color for the given column to default."
 msgstr "Ripristina il colore predefinito di sfondo per la colonna specificata."
 
@@ -136716,6 +162264,9 @@ msgstr ""
 "Rimuove il pulsante all'indice [param button_index] nella colonna [param "
 "column]."
 
+msgid "Returns the column's auto translate mode."
+msgstr "Restituisce la modalità di traduzione automatica della colonna."
+
 msgid ""
 "Returns the text autowrap mode in the given [param column]. By default it is "
 "[constant TextServer.AUTOWRAP_OFF]."
@@ -136822,6 +162373,11 @@ msgstr ""
 msgid "Returns the [Color] modulating the column's icon."
 msgstr "Restituisce il [Color] che modula l'icona della colonna."
 
+msgid "Returns the given column's icon overlay [Texture2D]."
+msgstr ""
+"Restituisce la [Texture2D] di sovrapposizione dell'icona della colonna "
+"specificata."
+
 msgid "Returns the icon [Texture2D] region as [Rect2]."
 msgstr "Restituisce la regione dell'icona [Texture2D] sotto forma di [Rect2]."
 
@@ -136839,6 +162395,13 @@ msgstr ""
 "Restituisce il valore dei metadati impostato per la colonna specificata "
 "attraverso [method set_metadata]."
 
+msgid ""
+"Returns the next sibling TreeItem in the tree or a [code]null[/code] object "
+"if there is none."
+msgstr ""
+"Restituisce il TreeItem fratello successivo nell'albero oppure un oggetto "
+"[code]null[/code] se non ce n'è nessuno."
+
 msgid ""
 "Returns the next TreeItem in the tree (in the context of a depth-first "
 "search) or a [code]null[/code] object if there is none.\n"
@@ -136865,6 +162428,19 @@ msgstr ""
 "nell'albero quando viene chiamato sull'ultimo elemento, altrimenti "
 "restituisce [code]null[/code]."
 
+msgid ""
+"Returns the parent TreeItem or a [code]null[/code] object if there is none."
+msgstr ""
+"Restituisce l'oggetto TreeItem padre oppure un oggetto [code]null[/code] se "
+"non è presente."
+
+msgid ""
+"Returns the previous sibling TreeItem in the tree or a [code]null[/code] "
+"object if there is none."
+msgstr ""
+"Restituisce il TreeItem fratello precedente nell'albero oppure un oggetto "
+"[code]null[/code] se non ce n'è nessuno."
+
 msgid ""
 "Returns the previous TreeItem in the tree (in the context of a depth-first "
 "search) or a [code]null[/code] object if there is none.\n"
@@ -137195,6 +162771,16 @@ msgstr ""
 msgid "Modulates the given column's icon with [param modulate]."
 msgstr "Modula l'icona della colonna specificata con [param modulate]."
 
+msgid ""
+"Sets the given cell's icon overlay [Texture2D]. The cell has to be in "
+"[constant CELL_MODE_ICON] mode, and icon has to be set. Overlay is drawn on "
+"top of icon, in the bottom left corner."
+msgstr ""
+"Imposta l'icona [Texture2D] di sovrapposizione della cella specificata. La "
+"cella deve essere in modalità [constant CELL_MODE_ICON] e l'icona deve essere "
+"impostata. La sovrapposizione è disegnata sopra l'icona, nell'angolo in basso "
+"a sinistra."
+
 msgid "Sets the given column's icon's texture region."
 msgstr "Imposta la regione della texture dell'icona della colonna specificata."
 
@@ -137306,6 +162892,25 @@ msgstr ""
 "Nota che se un [TreeItem] è impostato per non essere visibile, nessuno dei "
 "suoi figli sarà visibile."
 
+msgid ""
+"Cell shows a string label, optionally with an icon. When editable, the text "
+"can be edited using a [LineEdit], or a [TextEdit] popup if [method "
+"set_edit_multiline] is used."
+msgstr ""
+"La cella mostra un'etichetta stringa, facoltativamente con un'icona. Quando "
+"modificabile, il testo può essere modificato attraverso un [LineEdit], o un "
+"popup [TextEdit] se viene usato [method set_edit_multiline]."
+
+msgid ""
+"Cell shows a checkbox, optionally with text and an icon. The checkbox can be "
+"pressed, released, or indeterminate (via [method set_indeterminate]). The "
+"checkbox can't be clicked unless the cell is editable."
+msgstr ""
+"La cella mostra una casella di spunta, facoltativamente con del testo e "
+"un'icona. La casella di spunta può essere premuta, rilasciata o indeterminata "
+"(tramite [method set_indeterminate]). La casella di spunta non può essere "
+"cliccata a meno che la cella non sia modificabile."
+
 msgid ""
 "Cell shows a numeric range. When editable, it can be edited using a range "
 "slider. Use [method set_range] to set the value and [method set_range_config] "
@@ -137322,6 +162927,13 @@ msgstr ""
 "assegna un testo con [method set_text]. Separare le opzioni con una virgola, "
 "ad esempio [code]\"Opzione1,Opzione2,Opzione3\"[/code]."
 
+msgid ""
+"Cell shows an icon. It can't be edited nor display text. The icon is always "
+"centered within the cell."
+msgstr ""
+"La cella mostra un'icona. Non può essere modificata né visualizzare testo. "
+"L'icona è sempre centrata all'interno della cella."
+
 msgid ""
 "Cell shows as a clickable button. It will display an arrow similar to "
 "[OptionButton], but doesn't feature a dropdown (for that you can use "
@@ -137383,6 +162995,18 @@ msgstr ""
 "essere impostato su [code]false[/code] per accelerare la generazione e il "
 "rendering quando il tappo non è mai visto dalla telecamera."
 
+msgid ""
+"Determines the radius of the tube along its length. The radius of a "
+"particular section ring is obtained by multiplying the baseline [member "
+"radius] by the value of this curve at the given distance. For values smaller "
+"than [code]0[/code], the faces will be inverted. Should be a unit [Curve]."
+msgstr ""
+"Determina il raggio del tubo lungo la sua lunghezza. Il raggio di un "
+"particolare anello di sezione si ottiene moltiplicando la linea di base "
+"[member radius] per il valore di questa curva alla distanza specificata. Per "
+"valori inferiori a [code]0[/code], le facce saranno invertite. Dovrebbe "
+"essere una [Curve] unitaria."
+
 msgid ""
 "The number of sides on the tube. For example, a value of [code]5[/code] means "
 "the tube will be pentagonal. Higher values result in a more detailed tube at "
@@ -137423,6 +163047,289 @@ msgstr ""
 "Oggetto leggero utilizzato per animazioni generiche tramite script, "
 "utilizzando i [Tweener]."
 
+msgid ""
+"Tweens are mostly useful for animations requiring a numerical property to be "
+"interpolated over a range of values. The name [i]tween[/i] comes from [i]in-"
+"betweening[/i], an animation technique where you specify [i]keyframes[/i] and "
+"the computer interpolates the frames that appear between them. Animating "
+"something with a [Tween] is called tweening.\n"
+"[Tween] is more suited than [AnimationPlayer] for animations where you don't "
+"know the final values in advance. For example, interpolating a dynamically-"
+"chosen camera zoom value is best done with a [Tween]; it would be difficult "
+"to do the same thing with an [AnimationPlayer] node. Tweens are also more "
+"light-weight than [AnimationPlayer], so they are very much suited for simple "
+"animations or general tasks that don't require visual tweaking provided by "
+"the editor. They can be used in a \"fire-and-forget\" manner for some logic "
+"that normally would be done by code. You can e.g. make something shoot "
+"periodically by using a looped [CallbackTweener] with a delay.\n"
+"A [Tween] can be created by using either [method SceneTree.create_tween] or "
+"[method Node.create_tween]. [Tween]s created manually (i.e. by using "
+"[code]Tween.new()[/code]) are invalid and can't be used for tweening values.\n"
+"A tween animation is created by adding [Tweener]s to the [Tween] object, "
+"using [method tween_property], [method tween_interval], [method "
+"tween_callback] or [method tween_method]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property($Sprite, \"modulate\", Color.RED, 1)\n"
+"tween.tween_property($Sprite, \"scale\", Vector2(), 1)\n"
+"tween.tween_callback($Sprite.queue_free)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"modulate\", Colors.Red, 1.0f);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"scale\", Vector2.Zero, 1.0f);\n"
+"tween.TweenCallback(Callable.From(GetNode(\"Sprite\").QueueFree));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This sequence will make the [code]$Sprite[/code] node turn red, then shrink, "
+"before finally calling [method Node.queue_free] to free the sprite. "
+"[Tweener]s are executed one after another by default. This behavior can be "
+"changed using [method parallel] and [method set_parallel].\n"
+"When a [Tweener] is created with one of the [code]tween_*[/code] methods, a "
+"chained method call can be used to tweak the properties of this [Tweener]. "
+"For example, if you want to set a different transition type in the above "
+"example, you can use [method set_trans]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property($Sprite, \"modulate\", Color.RED, 1).set_trans(Tween."
+"TRANS_SINE)\n"
+"tween.tween_property($Sprite, \"scale\", Vector2(), 1).set_trans(Tween."
+"TRANS_BOUNCE)\n"
+"tween.tween_callback($Sprite.queue_free)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"modulate\", Colors.Red, 1.0f)."
+"SetTrans(Tween.TransitionType.Sine);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"scale\", Vector2.Zero, 1.0f)."
+"SetTrans(Tween.TransitionType.Bounce);\n"
+"tween.TweenCallback(Callable.From(GetNode(\"Sprite\").QueueFree));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Most of the [Tween] methods can be chained this way too. In the following "
+"example the [Tween] is bound to the running script's node and a default "
+"transition is set for its [Tweener]s:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween().bind_node(self).set_trans(Tween."
+"TRANS_ELASTIC)\n"
+"tween.tween_property($Sprite, \"modulate\", Color.RED, 1)\n"
+"tween.tween_property($Sprite, \"scale\", Vector2(), 1)\n"
+"tween.tween_callback($Sprite.queue_free)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var tween = GetTree().CreateTween().BindNode(this).SetTrans(Tween."
+"TransitionType.Elastic);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"modulate\", Colors.Red, 1.0f);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"scale\", Vector2.Zero, 1.0f);\n"
+"tween.TweenCallback(Callable.From(GetNode(\"Sprite\").QueueFree));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Another interesting use for [Tween]s is animating arbitrary sets of objects:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"for sprite in get_children():\n"
+"    tween.tween_property(sprite, \"position\", Vector2(0, 0), 1)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"foreach (Node sprite in GetChildren())\n"
+"    tween.TweenProperty(sprite, \"position\", Vector2.Zero, 1.0f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In the example above, all children of a node are moved one after another to "
+"position (0, 0).\n"
+"You should avoid using more than one [Tween] per object's property. If two or "
+"more tweens animate one property at the same time, the last one created will "
+"take priority and assign the final value. If you want to interrupt and "
+"restart an animation, consider assigning the [Tween] to a variable:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween\n"
+"func animate():\n"
+"    if tween:\n"
+"        tween.kill() # Abort the previous animation.\n"
+"    tween = create_tween()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private Tween _tween;\n"
+"\n"
+"public void Animate()\n"
+"{\n"
+"    if (_tween != null)\n"
+"        _tween.Kill(); // Abort the previous animation\n"
+"    _tween = CreateTween();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Some [Tweener]s use transitions and eases. The first accepts a [enum "
+"TransitionType] constant, and refers to the way the timing of the animation "
+"is handled (see [url=https://easings.net/]easings.net[/url] for some "
+"examples). The second accepts an [enum EaseType] constant, and controls where "
+"the [code]trans_type[/code] is applied to the interpolation (in the "
+"beginning, the end, or both). If you don't know which transition and easing "
+"to pick, you can try different [enum TransitionType] constants with [constant "
+"EASE_IN_OUT], and use the one that looks best.\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"tween_cheatsheet.webp]Tween easing and transition types cheatsheet[/url]\n"
+"[b]Note:[/b] Tweens are not designed to be reused and trying to do so results "
+"in an undefined behavior. Create a new Tween for each animation and every "
+"time you replay an animation from start. Keep in mind that Tweens start "
+"immediately, so only create a Tween when you want to start animating.\n"
+"[b]Note:[/b] The tween is processed after all of the nodes in the current "
+"frame, i.e. node's [method Node._process] method would be called before the "
+"tween (or [method Node._physics_process] depending on the value passed to "
+"[method set_process_mode])."
+msgstr ""
+"I tween sono utili soprattutto per le animazioni che richiedono che una "
+"proprietà numerica sia interpolata su un intervallo di valori. Il nome "
+"[i]tween[/i] deriva da [i]in-betweening[/i], una tecnica di animazione in cui "
+"si specificano i [i]fotogrammi chiave[/i] e il computer interpola i "
+"fotogrammi che compaiono tra di essi. L'animazione di qualcosa con un [Tween] "
+"è chiamata tweening.\n"
+"[Tween] è più adatto di [AnimationPlayer] per le animazioni in cui non si "
+"conoscono in anticipo i valori finali. Ad esempio, l'interpolazione del "
+"valore di zoom di una telecamera scelta dinamicamente è meglio eseguita con "
+"un [Tween]; sarebbe difficile fare la stessa cosa con un nodo "
+"[AnimationPlayer]. I tween sono anche più leggeri di [AnimationPlayer], "
+"quindi sono molto adatti per animazioni semplici o attività generali che non "
+"richiedono modifiche visive fornite dall'editor. Possono essere utilizzati in "
+"modalità \"usa e getta\" per una logica che normalmente sarebbe eseguita dal "
+"codice. Ad esempio, puoi far in modo che qualcosa spari periodicamente "
+"tramite un [CallbackTweener] in ripetizione con un ritardo.\n"
+"Un [Tween] può essere creato usando [method SceneTree.create_tween] o [method "
+"Node.create_tween]. I [Tween] creati manualmente (ad esempio usando "
+"[code]Tween.new()[/code]) non sono validi e non possono essere usati per "
+"interpolare i valori.\n"
+"Un'animazione tween si crea aggiungendo i [Tweener] all'oggetto [Tween], "
+"tramite [method tween_property], [method tween_interval], [method "
+"tween_callback] o [method tween_method]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property($Sprite, \"modulate\", Color.RED, 1)\n"
+"tween.tween_property($Sprite, \"scale\", Vector2(), 1)\n"
+"tween.tween_callback($Sprite.queue_free)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"modulate\", Colors.Red, 1.0f);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"scale\", Vector2.Zero, 1.0f);\n"
+"tween.TweenCallback(Callable.From(GetNode(\"Sprite\").QueueFree));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Questa sequenza farà diventare rosso il nodo [code]$Sprite[/code], poi lo "
+"restringerà, prima di chiamare infine [method Node.queue_free] per liberare "
+"lo sprite. I [Tweener] sono eseguiti uno dopo l'altro come comportamento "
+"predefinito. Ciò può essere modificato tramite [method parallel] e [method "
+"set_parallel].\n"
+"Quando un [Tweener] viene creato con uno dei metodi [code]tween_*[/code], è "
+"possibile utilizzare una chiamata di metodo concatenata per modificare le "
+"proprietà di questo [Tweener]. Ad esempio, se si desidera impostare un tipo "
+"di transizione diverso nell'esempio precedente, è possibile usare [method "
+"set_trans]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_property($Sprite, \"modulate\", Color.RED, 1).set_trans(Tween."
+"TRANS_SINE)\n"
+"tween.tween_property($Sprite, \"scale\", Vector2(), 1).set_trans(Tween."
+"TRANS_BOUNCE)\n"
+"tween.tween_callback($Sprite.queue_free)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = GetTree().CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"modulate\", Colors.Red, 1.0f)."
+"SetTrans(Tween.TransitionType.Sine);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"scale\", Vector2.Zero, 1.0f)."
+"SetTrans(Tween.TransitionType.Bounce);\n"
+"tween.TweenCallback(Callable.From(GetNode(\"Sprite\").QueueFree));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Anche la maggior parte dei metodi di [Tween] possono essere concatenati in "
+"questo modo. Nell'esempio seguente, il [Tween] è associato al nodo dello "
+"script in esecuzione ed è impostata una transizione predefinita per i suoi "
+"[Tweener]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = get_tree().create_tween().bind_node(self).set_trans(Tween."
+"TRANS_ELASTIC)\n"
+"tween.tween_property($Sprite, \"modulate\", Color.RED, 1)\n"
+"tween.tween_property($Sprite, \"scale\", Vector2(), 1)\n"
+"tween.tween_callback($Sprite.queue_free)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var tween = GetTree().CreateTween().BindNode(this).SetTrans(Tween."
+"TransitionType.Elastic);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"modulate\", Colors.Red, 1.0f);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"scale\", Vector2.Zero, 1.0f);\n"
+"tween.TweenCallback(Callable.From(GetNode(\"Sprite\").QueueFree));\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Un altro uso interessante per i [Tween] è l'animazione di insiemi arbitrari "
+"di oggetti:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"for sprite in get_children():\n"
+"    tween.tween_property(sprite, \"position\", Vector2(0, 0), 1)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"foreach (Node sprite in GetChildren())\n"
+"    tween.TweenProperty(sprite, \"position\", Vector2.Zero, 1.0f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Nell'esempio precedente, tutti i figli di un nodo sono spostati uno dopo "
+"l'altro nella posizione (0, 0).\n"
+"Dovresti evitare di usare più di un [Tween] per proprietà di un oggetto. Se "
+"due o più tween animano una proprietà allo stesso tempo, l'ultimo creato avrà "
+"la priorità e assegnerà il valore finale. Se vuoi interrompere e riavviare "
+"un'animazione, considera di assegnare il [Tween] a una variabile:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween\n"
+"func animate():\n"
+"    if tween:\n"
+"        tween.kill() # Interrompe l'animazione precedente.\n"
+"    tween = create_tween()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private Tween _tween;\n"
+"\n"
+"public void Animate()\n"
+"{\n"
+"    if (_tween != null)\n"
+"        _tween.Kill(); // Interrompe l'animazione precedente.\n"
+"    _tween = CreateTween();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Alcuni [Tweener] usano transizioni e allentamenti. La prima accetta una "
+"costante [enum TransitionType] e si riferisce al modo in cui viene gestita la "
+"tempistica dell'animazione (vedi [url=https://easings.net/]easings.net[/url] "
+"per alcuni esempi). La seconda accetta una costante [enum EaseType] e "
+"controlla dove [code]trans_type[/code] viene applicato all'interpolazione "
+"(all'inizio, alla fine o in entrambi). Se non sai quale transizione e "
+"allentamento scegliere, puoi provare le diverse costanti [enum "
+"TransitionType] con [constant EASE_IN_OUT] e usare quella che sembri la "
+"migliore.\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"tween_cheatsheet.webp]Foglio riassuntivo sui tipi di transizione e di "
+"allentamento dei Tween[/url]\n"
+"[b]Nota:[/b] I Tween non sono progettati per essere riutilizzati e tentare di "
+"farlo risulta in comportamento indefinito. Crea un nuovo Tween per ogni "
+"animazione e ogni volta che riproduci un'animazione dall'inizio. Tieni "
+"presente che i Tween si avviano immediatamente, quindi crea un Tween solo "
+"quando vuoi iniziare l'animazione.\n"
+"[b]Nota:[/b] Il Tween è elaborato dopo tutti i nodi nel frame attuale, ovvero "
+"il metodo [method Node._process] del nodo sarebbe chiamato prima del Tween (o "
+"[method Node._physics_process] a seconda del valore passato a [method "
+"set_process_mode])."
+
 msgid ""
 "Binds this [Tween] with the given [param node]. [Tween]s are processed "
 "directly by the [SceneTree], so they run independently of the animated nodes. "
@@ -137582,6 +163489,45 @@ msgstr ""
 msgid "Aborts all tweening operations and invalidates the [Tween]."
 msgstr "Interrompe tutte le operazioni di tweening e invalida il [Tween]."
 
+msgid ""
+"Makes the next [Tweener] run parallelly to the previous one.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"tween.tween_property(...)\n"
+"tween.parallel().tween_property(...)\n"
+"tween.parallel().tween_property(...)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"tween.TweenProperty(...);\n"
+"tween.Parallel().TweenProperty(...);\n"
+"tween.Parallel().TweenProperty(...);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"All [Tweener]s in the example will run at the same time.\n"
+"You can make the [Tween] parallel by default by using [method set_parallel]."
+msgstr ""
+"Fa in modo che il [Tweener] successivo sia eseguito in parallelo al "
+"precedente.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"tween.tween_property(...)\n"
+"tween.parallel().tween_property(...)\n"
+"tween.parallel().tween_property(...)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"tween.TweenProperty(...);\n"
+"tween.Parallel().TweenProperty(...);\n"
+"tween.Parallel().TweenProperty(...);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Tutti i [Tweener] nell'esempio saranno eseguiti allo stesso tempo.\n"
+"Puoi rendere il [Tween] parallelo come predefinito attraverso [method "
+"set_parallel]."
+
 msgid ""
 "Pauses the tweening. The animation can be resumed by using [method play].\n"
 "[b]Note:[/b] If a Tween is paused and not bound to any node, it will exist "
@@ -137930,6 +163876,104 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Creates and appends a [PropertyTweener]. This method tweens a [param "
+"property] of an [param object] between an initial value and [param final_val] "
+"in a span of time equal to [param duration], in seconds. The initial value by "
+"default is the property's value at the time the tweening of the "
+"[PropertyTweener] starts.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"tween.tween_property($Sprite, \"position\", Vector2(100, 200), 1)\n"
+"tween.tween_property($Sprite, \"position\", Vector2(200, 300), 1)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", new Vector2(100.0f, "
+"200.0f), 1.0f);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", new Vector2(200.0f, "
+"300.0f), 1.0f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"will move the sprite to position (100, 200) and then to (200, 300). If you "
+"use [method PropertyTweener.from] or [method PropertyTweener.from_current], "
+"the starting position will be overwritten by the given value instead. See "
+"other methods in [PropertyTweener] to see how the tweening can be tweaked "
+"further.\n"
+"[b]Note:[/b] You can find the correct property name by hovering over the "
+"property in the Inspector. You can also provide the components of a property "
+"directly by using [code]\"property:component\"[/code] (eg. [code]position:x[/"
+"code]), where it would only apply to that particular component.\n"
+"[b]Example:[/b] Moving an object twice from the same position, with different "
+"transition types:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"tween.tween_property($Sprite, \"position\", Vector2.RIGHT * 300, 1)."
+"as_relative().set_trans(Tween.TRANS_SINE)\n"
+"tween.tween_property($Sprite, \"position\", Vector2.RIGHT * 300, 1)."
+"as_relative().from_current().set_trans(Tween.TRANS_EXPO)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", Vector2.Right * "
+"300.0f, 1.0f).AsRelative().SetTrans(Tween.TransitionType.Sine);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", Vector2.Right * "
+"300.0f, 1.0f).AsRelative().FromCurrent().SetTrans(Tween.TransitionType."
+"Expo);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Crea e aggiunge un [PropertyTweener]. Questo metodo interpola una proprietà "
+"con nome [param property] di un [param object] tra un valore iniziale e "
+"[param final_val] in un intervallo di tempo pari a [param duration], in "
+"secondi. Il valore iniziale predefinito è il valore della proprietà al "
+"momento in cui inizia l'interpolazione del [PropertyTweener].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"tween.tween_property($Sprite, \"position\", Vector2(100, 200), 1)\n"
+"tween.tween_property($Sprite, \"position\", Vector2(200, 300), 1)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", new Vector2(100.0f, "
+"200.0f), 1.0f);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", new Vector2(200.0f, "
+"300.0f), 1.0f);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"sposterà lo sprite in posizione (100, 200) e poi in (200, 300). Se usi "
+"[method PropertyTweener.from] o [method PropertyTweener.from_current], la "
+"posizione di partenza sarà invece sovrascritta dal valore specificato. "
+"Consulta gli altri metodi in [PropertyTweener] per vedere come il tweening "
+"può essere ulteriormente modificato.\n"
+"[b]Nota:[/b] Puoi trovare il nome corretto della proprietà passando il mouse "
+"sulla proprietà nell'Ispettore. Puoi anche fornire i componenti di una "
+"proprietà direttamente usando [code]\"property:component\"[/code] (ad esempio "
+"[code]position:x[/code]), dove si applicherebbe solo a quel particolare "
+"componente.\n"
+"[b]Esempio:[/b] Spostare un oggetto due volte dalla stessa posizione, con "
+"diversi tipi di transizione:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var tween = create_tween()\n"
+"tween.tween_property($Sprite, \"position\", Vector2.RIGHT * 300, 1)."
+"as_relative().set_trans(Tween.TRANS_SINE)\n"
+"tween.tween_property($Sprite, \"position\", Vector2.RIGHT * 300, 1)."
+"as_relative().from_current().set_trans(Tween.TRANS_EXPO)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Tween tween = CreateTween();\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", Vector2.Right * "
+"300.0f, 1.0f).AsRelative().SetTrans(Tween.TransitionType.Sine);\n"
+"tween.TweenProperty(GetNode(\"Sprite\"), \"position\", Vector2.Right * "
+"300.0f, 1.0f).AsRelative().FromCurrent().SetTrans(Tween.TransitionType."
+"Expo);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
 msgid ""
 "Emitted when the [Tween] has finished all tweening. Never emitted when the "
 "[Tween] is set to infinite looping (see [method set_loops])."
@@ -138065,6 +164109,13 @@ msgstr ""
 "momento. Un [Tweener] non può essere creato manualmente, è necessario usare "
 "un metodo dedicato da [Tween]."
 
+msgid ""
+"Emitted when the [Tweener] has just finished its job or became invalid (e.g. "
+"due to a freed object)."
+msgstr ""
+"Emesso quando il [Tweener] ha appena terminato la sua interpolazione o è "
+"diventato invalido (ad esempio a causa di un oggetto liberato)."
+
 msgid "Helper class to implement a UDP server."
 msgstr "Classe di supporto per implementare un server UDP."
 
@@ -138589,6 +164640,186 @@ msgstr ""
 "Funzioni di Universal Plug and Play (UPnP) per il rilevamento dei dispositivi "
 "di rete, l'interrogazione e il port forwarding."
 
+msgid ""
+"This class can be used to discover compatible [UPNPDevice]s on the local "
+"network and execute commands on them, like managing port mappings (for port "
+"forwarding/NAT traversal) and querying the local and remote network IP "
+"address. Note that methods on this class are synchronous and block the "
+"calling thread.\n"
+"To forward a specific port (here [code]7777[/code], note both [method "
+"discover] and [method add_port_mapping] can return errors that should be "
+"checked):\n"
+"[codeblock]\n"
+"var upnp = UPNP.new()\n"
+"upnp.discover()\n"
+"upnp.add_port_mapping(7777)\n"
+"[/codeblock]\n"
+"To close a specific port (e.g. after you have finished using it):\n"
+"[codeblock]\n"
+"upnp.delete_port_mapping(port)\n"
+"[/codeblock]\n"
+"[b]Note:[/b] UPnP discovery blocks the current thread. To perform discovery "
+"without blocking the main thread, use [Thread]s like this:\n"
+"[codeblock]\n"
+"# Emitted when UPnP port mapping setup is completed (regardless of success or "
+"failure).\n"
+"signal upnp_completed(error)\n"
+"\n"
+"# Replace this with your own server port number between 1024 and 65535.\n"
+"const SERVER_PORT = 3928\n"
+"var thread = null\n"
+"\n"
+"func _upnp_setup(server_port):\n"
+"    # UPNP queries take some time.\n"
+"    var upnp = UPNP.new()\n"
+"    var err = upnp.discover()\n"
+"\n"
+"    if err != OK:\n"
+"        push_error(str(err))\n"
+"        upnp_completed.emit(err)\n"
+"        return\n"
+"\n"
+"    if upnp.get_gateway() and upnp.get_gateway().is_valid_gateway():\n"
+"        upnp.add_port_mapping(server_port, server_port, ProjectSettings."
+"get_setting(\"application/config/name\"), \"UDP\")\n"
+"        upnp.add_port_mapping(server_port, server_port, ProjectSettings."
+"get_setting(\"application/config/name\"), \"TCP\")\n"
+"        upnp_completed.emit(OK)\n"
+"\n"
+"func _ready():\n"
+"    thread = Thread.new()\n"
+"    thread.start(_upnp_setup.bind(SERVER_PORT))\n"
+"\n"
+"func _exit_tree():\n"
+"    # Wait for thread finish here to handle game exit while the thread is "
+"running.\n"
+"    thread.wait_to_finish()\n"
+"[/codeblock]\n"
+"[b]Terminology:[/b] In the context of UPnP networking, \"gateway\" (or "
+"\"internet gateway device\", short IGD) refers to network devices that allow "
+"computers in the local network to access the internet (\"wide area network\", "
+"WAN). These gateways are often also called \"routers\".\n"
+"[b]Pitfalls:[/b]\n"
+"- As explained above, these calls are blocking and shouldn't be run on the "
+"main thread, especially as they can block for multiple seconds at a time. Use "
+"threading!\n"
+"- Networking is physical and messy. Packets get lost in transit or get "
+"filtered, addresses, free ports and assigned mappings change, and devices may "
+"leave or join the network at any time. Be mindful of this, be diligent when "
+"checking and handling errors, and handle these gracefully if you can: add "
+"clear error UI, timeouts and re-try handling.\n"
+"- Port mappings may change (and be removed) at any time, and the remote/"
+"external IP address of the gateway can change likewise. You should consider "
+"re-querying the external IP and try to update/refresh the port mapping "
+"periodically (for example, every 5 minutes and on networking failures).\n"
+"- Not all devices support UPnP, and some users disable UPnP support. You need "
+"to handle this (e.g. documenting and requiring the user to manually forward "
+"ports, or adding alternative methods of NAT traversal, like a relay/mirror "
+"server, or NAT hole punching, STUN/TURN, etc.).\n"
+"- Consider what happens on mapping conflicts. Maybe multiple users on the "
+"same network would like to play your game at the same time, or maybe another "
+"application uses the same port. Make the port configurable, and optimally "
+"choose a port automatically (re-trying with a different port on failure).\n"
+"[b]Further reading:[/b] If you want to know more about UPnP (and the Internet "
+"Gateway Device (IGD) and Port Control Protocol (PCP) specifically), "
+"[url=https://en.wikipedia.org/wiki/Universal_Plug_and_Play]Wikipedia[/url] is "
+"a good first stop, the specification can be found at the [url=https://"
+"openconnectivity.org/developer/specifications/upnp-resources/upnp/]Open "
+"Connectivity Foundation[/url] and Godot's implementation is based on the "
+"[url=https://github.com/miniupnp/miniupnp]MiniUPnP client[/url]."
+msgstr ""
+"Questa classe può essere utilizzata per individuare [UPNPDevice] compatibili "
+"sulla rete locale ed eseguire comandi su di essi, come per gestire la "
+"mappatura delle porte (per inoltrare le porte/NAT traversal) e per richiedere "
+"l'indirizzo IP della rete locale e remota. Nota che i metodi su questa classe "
+"sono sincroni e bloccano il thread che li chiama.\n"
+"Per inoltrare una porta specifica (qui [code]7777[/code], nota che sia "
+"[method discover] sia [method add_port_mapping] possono restituire errori che "
+"dovrebbero essere verificati):\n"
+"[codeblock]\n"
+"var upnp = UPNP.new()\n"
+"upnp.discover()\n"
+"upnp.add_port_mapping(7777)\n"
+"[/codeblock]\n"
+"Per chiudere una porta specifica (ad esempio dopo aver finito di usarla):\n"
+"[codeblock]\n"
+"upnp.delete_port_mapping(port)\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] L'individuazione UPnP blocca il thread attuale. Per eseguire "
+"l'individuazione senza bloccare il thread principale, utilizza un [Thread] in "
+"questo modo:\n"
+"[codeblock]\n"
+"# Emesso quando la configurazione della mappatura delle porte UPnP viene "
+"completata (a prescindere dal successo o dal fallimento).\n"
+"signal upnp_completed(error)\n"
+"\n"
+"# Sostituiscilo con il numero di porta del tuo server, tra 1024 e 65535.\n"
+"const SERVER_PORT = 3928\n"
+"var thread = null\n"
+"\n"
+"func _upnp_setup(server_port):\n"
+"    #Le richieste UPNP richiedono un po' di tempo.\n"
+"    var upnp = UPNP.new()\n"
+"    var err = upnp.discover()\n"
+"\n"
+"    if err != OK:\n"
+"        push_error(str(err))\n"
+"        upnp_completed.emit(OK)\n"
+"        return\n"
+"\n"
+"    if upnp.get_gateway() and upnp.get_gateway().is_valid_gateway():\n"
+"        upnp.add_port_mapping(server_port, server_port, ProjectSettings."
+"get_setting(\"application/config/name\"), \"UDP\")\n"
+"        upnp.add_port_mapping(server_port, server_port, ProjectSettings."
+"get_setting(\"application/config/name\"), \"TCP\")\n"
+"        upnp_completed.emit(OK)\n"
+"\n"
+"func _ready():\n"
+"    thread = Thread.new()\n"
+"    thread.start(_upnp_setup.bind(SERVER_PORT))\n"
+"\n"
+"func _exit_tree():\n"
+"    # Attendi la fine del thread qui, per gestire l'uscita dal gioco mentre "
+"il thread è in esecuzione.\n"
+"    thread.wait_to_finish()\n"
+"[/codeblock]\n"
+"[b]Terminologia:[/b] Nel contesto della rete UPnP, \"gateway\" (o "
+"\"dispositivo gateway Internet\", abbreviato IGD) si riferisce ai dispositivi "
+"di rete che consentono ai computer nella rete locale di accedere a Internet "
+"(\"rete WAN\"). Questi gateway sono spesso chiamati anche \"router\".\n"
+"[b]Insidie:[/b]\n"
+"- Come spiegato in precedenza, queste chiamate sono bloccanti e non "
+"dovrebbero essere eseguite sul thread principale, soprattutto perché possono "
+"bloccarsi per più secondi alla volta. Usa altri thread!\n"
+"- La rete è fisica e disordinata. I pacchetti si perdono durante il transito "
+"o sono filtrati, gli indirizzi, le porte libere e le mappature assegnate "
+"cambiano e i dispositivi possono abbandonare o unirsi alla rete in qualsiasi "
+"momento. Tieni questo presente, sii diligente quando verifichi e gestisci gli "
+"errori e gestiscili con grazia se puoi: aggiungi un'interfaccia utente di "
+"errore chiara, timeout e gestione dei nuovi tentativi.\n"
+"- Le mappature delle porte possono cambiare (ed essere rimosse) in qualsiasi "
+"momento e l'indirizzo IP remoto/esterno del gateway può cambiare allo stesso "
+"modo. Dovresti considerare di ri-interrogare l'IP esterno e provare ad "
+"aggiornare periodicamente la mappatura delle porte (ad esempio, ogni 5 minuti "
+"e in caso di guasti di rete).\n"
+"- Non tutti i dispositivi supportano UPnP e alcuni utenti disabilitano il "
+"supporto UPnP. Devi gestire questo aspetto (ad esempio documentando e "
+"richiedendo all'utente di inoltrare manualmente le porte o aggiungendo metodi "
+"alternativi di attraversamento NAT, come un server di relay/mirror o NAT hole "
+"punching, STUN/TURN, ecc.).\n"
+"- Considera cosa succede in caso di conflitti di mappatura. Forse più utenti "
+"sulla stessa rete vorrebbero giocare al tuo gioco allo stesso tempo, o forse "
+"un'altra applicazione utilizza la stessa porta. Rendi la porta configurabile "
+"e scegli automaticamente una porta in modo ottimale (riprovando con una porta "
+"diversa in caso di guasto).\n"
+"[b]Ulteriori approfondimenti:[/b] Se vuoi saperne di più su UPnP (e in "
+"particolare su Internet Gateway Device (IGD) e Port Control Protocol (PCP)), "
+"[url=https://it.wikipedia.org/wiki/Universal_Plug_and_Play]Wikipedia[/url] è "
+"un buon punto di partenza, le specifiche possono essere trovate su "
+"[url=https://openconnectivity.org/developer/specifications/upnp-resources/"
+"upnp/]Open Connectivity Foundation[/url] e l'implementazione di Godot è "
+"basata sul [url=https://github.com/miniupnp/miniupnp]client MiniUPnP[/url]."
+
 msgid "Adds the given [UPNPDevice] to the list of discovered devices."
 msgstr ""
 "Aggiunge il dispositivo [UPNPDevice] specificato alla lista dei dispositivi "
@@ -138973,6 +165204,15 @@ msgstr ""
 "Equivalente al risultato di [method @GlobalScope.atan2] quando chiamato con "
 "[member y] e [member x] del vettore come parametri: [code]atan2(y, x)[/code]."
 
+msgid ""
+"Returns the signed angle to the given vector, in radians.\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"vector2_angle_to.png]Illustration of the returned angle.[/url]"
+msgstr ""
+"Restituisce l'angolo con segno rispetto al vettore indicato, in radianti.\n"
+"[url=https://raw.githubusercontent.com/godotengine/godot-docs/master/img/"
+"vector2_angle_to.png]Illustrazione dell'angolo restituito.[/url]"
+
 msgid ""
 "Returns the angle between the line connecting the two points and the X axis, "
 "in radians.\n"
@@ -139149,6 +165389,26 @@ msgstr ""
 "Restituisce un nuovo vettore con tutti i componenti arrotondati per difetto "
 "(verso l'infinito negativo)."
 
+msgid ""
+"Creates a unit [Vector2] rotated to the given [param angle] in radians. This "
+"is equivalent to doing [code]Vector2(cos(angle), sin(angle))[/code] or "
+"[code]Vector2.RIGHT.rotated(angle)[/code].\n"
+"[codeblock]\n"
+"print(Vector2.from_angle(0)) # Prints (1.0, 0.0)\n"
+"print(Vector2(1, 0).angle()) # Prints 0.0, which is the angle used above.\n"
+"print(Vector2.from_angle(PI / 2)) # Prints (0.0, 1.0)\n"
+"[/codeblock]"
+msgstr ""
+"Crea un [Vector2] unitario ruotato all'angolo [param angle], in radianti. Ciò "
+"equivale a fare [code]Vector2(cos(angle), sin(angle))[/code] o [code]Vector2."
+"RIGHT.rotated(angle)[/code].\n"
+"[codeblock]\n"
+"print(Vector2.from_angle(0)) # Stampa (1.0, 0.0)\n"
+"print(Vector2(1, 0).angle()) # Stampa 0.0, che è l'angolo usato in "
+"precedenza.\n"
+"print(Vector2.from_angle(PI / 2)) # Stampa (0.0, 1.0)\n"
+"[/codeblock]"
+
 msgid ""
 "Returns [code]true[/code] if this vector and [param to] are approximately "
 "equal, by running [method @GlobalScope.is_equal_approx] on each component."
@@ -139206,6 +165466,13 @@ msgstr ""
 "[code]0.0[/code] e [code]1.0[/code], che rappresenta la quantità di "
 "interpolazione."
 
+msgid ""
+"Returns the vector with a maximum length by limiting its length to [param "
+"length]. If the vector is non-finite, the result is undefined."
+msgstr ""
+"Restituisce il vettore con una lunghezza massima limitandone la lunghezza a "
+"[param length]. Se il vettore non è finito, il risultato è indefinito."
+
 msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector2(maxf(x, with.x), maxf(y, with.y))[/code]."
@@ -139492,12 +165759,62 @@ msgstr ""
 "può essere utilizzato [code]transform.affine_inverse() * vector[/code]. Vedi "
 "[method Transform2D.affine_inverse]."
 
+msgid ""
+"Multiplies each component of the [Vector2] by the components of the given "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) * Vector2(3, 4)) # Prints (30.0, 80.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector2] per i componenti del [Vector2] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) * Vector2(3, 4)) # Stampa (30.0, 80.0)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector2] by the given [float]."
 msgstr "Moltiplica ogni componente del [Vector2i] per il [float] fornito."
 
 msgid "Multiplies each component of the [Vector2] by the given [int]."
 msgstr "Moltiplica ogni componente del [Vector2] per l'[int] fornito."
 
+msgid ""
+"Adds each component of the [Vector2] by the components of the given "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) + Vector2(3, 4)) # Prints (13.0, 24.0)\n"
+"[/codeblock]"
+msgstr ""
+"Aggiunge ogni componente del [Vector2] con i componenti del [Vector2] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) + Vector2(3, 4)) # Stampa (13.0, 24.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Subtracts each component of the [Vector2] by the components of the given "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) - Vector2(3, 4)) # Prints (7.0, 16.0)\n"
+"[/codeblock]"
+msgstr ""
+"Sottrae ogni componente del [Vector2] dai componenti del [Vector2] fornito.\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) - Vector2(3, 4)) # Stampa (7.0, 16.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector2] by the components of the given "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) / Vector2(2, 5)) # Prints (5.0, 4.0)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector2] per i componenti del [Vector2] fornito.\n"
+"[codeblock]\n"
+"print(Vector2(10, 20) / Vector2(2, 5)) # Stampa (5.0, 4.0)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector2] by the given [float]."
 msgstr "Divide ogni componente del [Vector2] per il [float] fornito."
 
@@ -139729,9 +166046,121 @@ msgstr ""
 msgid "Returns [code]true[/code] if the vectors are not equal."
 msgstr "Restituisce [code]true[/code] se i vettori non sono uguali."
 
+msgid ""
+"Gets the remainder of each component of the [Vector2i] with the components of "
+"the given [Vector2i]. This operation uses truncated division, which is often "
+"not desired as it does not work well with negative numbers. Consider using "
+"[method @GlobalScope.posmod] instead if you want to handle negative numbers.\n"
+"[codeblock]\n"
+"print(Vector2i(10, -20) % Vector2i(7, 8)) # Prints (3, -4)\n"
+"[/codeblock]"
+msgstr ""
+"Ottiene il resto di ogni componente di [Vector2i] con i componenti del "
+"[Vector2i] fornito. Questa operazione usa la divisione troncata, che spesso "
+"non è desiderata in quanto non funziona bene con i numeri negativi. Considera "
+"di usare [method @GlobalScope.posmod] se vuoi gestire i numeri negativi.\n"
+"[codeblock]\n"
+"print(Vector2i(10, -20) % Vector2i(7, 8)) # Stampa (3, -4)\n"
+"[/codeblock]"
+
+msgid ""
+"Gets the remainder of each component of the [Vector2i] with the given [int]. "
+"This operation uses truncated division, which is often not desired as it does "
+"not work well with negative numbers. Consider using [method @GlobalScope."
+"posmod] instead if you want to handle negative numbers.\n"
+"[codeblock]\n"
+"print(Vector2i(10, -20) % 7) # Prints (3, -6)\n"
+"[/codeblock]"
+msgstr ""
+"Ottiene il resto di ogni componente di [Vector2i] con l'[int] fornito. Questa "
+"operazione usa la divisione troncata, che spesso non è desiderata in quanto "
+"non funziona bene con i numeri negativi. Considera di usare [method "
+"@GlobalScope.posmod] se vuoi gestire i numeri negativi.\n"
+"[codeblock]\n"
+"print(Vector2i(10, -20) % 7) # Stampa (3, -6)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector2i] by the components of the given "
+"[Vector2i].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) * Vector2i(3, 4)) # Prints (30, 80)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector2i] per i componenti del [Vector2i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) * Vector2i(3, 4)) # Stampa (30, 80)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector2i] by the given [float]. Returns a "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 15) * 0.9) # Prints (9.0, 13.5)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector2i] per il [float] fornito. Restituisce "
+"un [Vector2].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 15) * 0.9) # Stampa (9.0, 13.5)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector2i] by the given [int]."
 msgstr "Moltiplica ogni componente del [Vector2i] per l'[int] fornito."
 
+msgid ""
+"Adds each component of the [Vector2i] by the components of the given "
+"[Vector2i].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) + Vector2i(3, 4)) # Prints (13, 24)\n"
+"[/codeblock]"
+msgstr ""
+"Aggiunge ogni componente del [Vector2i] con i componenti del [Vector2i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) + Vector2i(3, 4)) # Stampa (13, 24)\n"
+"[/codeblock]"
+
+msgid ""
+"Subtracts each component of the [Vector2i] by the components of the given "
+"[Vector2i].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) - Vector2i(3, 4)) # Prints (7, 16)\n"
+"[/codeblock]"
+msgstr ""
+"Sottrae ogni componente del [Vector2i] dai componenti del [Vector2i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) - Vector2i(3, 4)) # Stampa (7, 16)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector2i] by the components of the given "
+"[Vector2i].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) / Vector2i(2, 5)) # Prints (5, 4)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector2i] per i componenti del [Vector2i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) / Vector2i(2, 5)) # Stampa (5, 4)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector2i] by the given [float]. Returns a "
+"[Vector2].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) / 2.9) # Prints (5.0, 10.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector2i] per il [float] fornito. Restituisce "
+"un [Vector2].\n"
+"[codeblock]\n"
+"print(Vector2i(10, 20) / 2.9) # Stampa (5.0, 10.0)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector2i] by the given [int]."
 msgstr "Divide ogni componente del [Vector2i] per l'[int] fornito."
 
@@ -140149,9 +166578,59 @@ msgstr ""
 "può essere utilizzato [code]transform.affine_inverse() * vector[/code]. Vedi "
 "[method Transform2D.affine_inverse]."
 
+msgid ""
+"Multiplies each component of the [Vector3] by the components of the given "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) * Vector3(3, 4, 5)) # Prints (30.0, 80.0, 150.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector3] per i componenti del [Vector3] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) * Vector3(3, 4, 5)) # Stampa (30.0, 80.0, 150.0)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector3] by the given [int]."
 msgstr "Moltiplica ogni componente del [Vector3] per l'[int] fornito."
 
+msgid ""
+"Adds each component of the [Vector3] by the components of the given "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) + Vector3(3, 4, 5)) # Prints (13.0, 24.0, 35.0)\n"
+"[/codeblock]"
+msgstr ""
+"Aggiunge ogni componente del [Vector3] con i componenti del [Vector3] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) + Vector3(3, 4, 5)) # Stampa (13.0, 24.0, 35.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Subtracts each component of the [Vector3] by the components of the given "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) - Vector3(3, 4, 5)) # Prints (7.0, 16.0, 25.0)\n"
+"[/codeblock]"
+msgstr ""
+"Sottrae ogni componente del [Vector3] dai componenti del [Vector3] fornito.\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) - Vector3(3, 4, 5)) # Stampa (7.0, 16.0, 25.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector3] by the components of the given "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) / Vector3(2, 5, 3)) # Prints (5.0, 4.0, 10.0)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector3] per i componenti del [Vector3] fornito.\n"
+"[codeblock]\n"
+"print(Vector3(10, 20, 30) / Vector3(2, 5, 3)) # Stampa (5.0, 4.0, 10.0)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector3] by the given [float]."
 msgstr "Divide ogni componente del [Vector3] per il [float] fornito."
 
@@ -140359,9 +166838,121 @@ msgstr ""
 "Il vettore unitario anteriore. Rappresenta la direzione locale in avanti e la "
 "direzione globale del nord."
 
+msgid ""
+"Gets the remainder of each component of the [Vector3i] with the components of "
+"the given [Vector3i]. This operation uses truncated division, which is often "
+"not desired as it does not work well with negative numbers. Consider using "
+"[method @GlobalScope.posmod] instead if you want to handle negative numbers.\n"
+"[codeblock]\n"
+"print(Vector3i(10, -20, 30) % Vector3i(7, 8, 9)) # Prints (3, -4, 3)\n"
+"[/codeblock]"
+msgstr ""
+"Ottiene il resto di ogni componente di [Vector3i] con i componenti del "
+"[Vector3i] fornito. Questa operazione usa la divisione troncata, che spesso "
+"non è desiderata in quanto non funziona bene con i numeri negativi. Considera "
+"di usare [method @GlobalScope.posmod] se vuoi gestire i numeri negativi.\n"
+"[codeblock]\n"
+"print(Vector3i(10, -20, 30) % Vector3i(7, 8, 9)) # Stampa (3, -4, 3)\n"
+"[/codeblock]"
+
+msgid ""
+"Gets the remainder of each component of the [Vector3i] with the given [int]. "
+"This operation uses truncated division, which is often not desired as it does "
+"not work well with negative numbers. Consider using [method @GlobalScope."
+"posmod] instead if you want to handle negative numbers.\n"
+"[codeblock]\n"
+"print(Vector3i(10, -20, 30) % 7) # Prints (3, -6, 2)\n"
+"[/codeblock]"
+msgstr ""
+"Ottiene il resto di ogni componente di [Vector3i] con l'[int] fornito. Questa "
+"operazione usa la divisione troncata, che spesso non è desiderata in quanto "
+"non funziona bene con i numeri negativi. Considera di usare [method "
+"@GlobalScope.posmod] se vuoi gestire i numeri negativi.\n"
+"[codeblock]\n"
+"print(Vector3i(10, -20, 30) % 7) # Stampa (3, -6, 2)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector3i] by the components of the given "
+"[Vector3i].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) * Vector3i(3, 4, 5)) # Prints (30, 80, 150)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector3i] per i componenti del [Vector3i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) * Vector3i(3, 4, 5)) # Stampa (30, 80, 150)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector3i] by the given [float]. Returns a "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 15, 20) * 0.9) # Prints (9.0, 13.5, 18.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector3i] per il [float] fornito. Restituisce "
+"un [Vector3].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 15, 20) * 0.9) # Stampa (9.0, 13.5, 18.0)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector3i] by the given [int]."
 msgstr "Moltiplica ogni componente del [Vector3i] per l'[int] fornito."
 
+msgid ""
+"Adds each component of the [Vector3i] by the components of the given "
+"[Vector3i].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) + Vector3i(3, 4, 5)) # Prints (13, 24, 35)\n"
+"[/codeblock]"
+msgstr ""
+"Aggiunge ogni componente del [Vector3i] con i componenti del [Vector3i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) + Vector3i(3, 4, 5)) # Stampa (13, 24, 35)\n"
+"[/codeblock]"
+
+msgid ""
+"Subtracts each component of the [Vector3i] by the components of the given "
+"[Vector3i].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) - Vector3i(3, 4, 5)) # Prints (7, 16, 25)\n"
+"[/codeblock]"
+msgstr ""
+"Sottrae ogni componente del [Vector3i] dai componenti del [Vector3i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) - Vector3i(3, 4, 5)) # Stampa (7, 16, 25)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector3i] by the components of the given "
+"[Vector3i].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) / Vector3i(2, 5, 3)) # Prints (5, 4, 10)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector3i] per i componenti del [Vector3i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) / Vector3i(2, 5, 3)) # Stampa (5, 4, 10)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector3i] by the given [float]. Returns a "
+"[Vector3].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) / 2.9) # Prints (5.0, 10.0, 15.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector3i] per il [float] fornito. Restituisce "
+"un [Vector3].\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) / 2.9) # Stampa (5.0, 10.0, 15.0)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector3i] by the given [int]."
 msgstr "Divide ogni componente del [Vector3i] per l'[int] fornito."
 
@@ -140559,9 +167150,89 @@ msgstr ""
 "Per trasformare per inverso di una proiezione può essere usato "
 "[code]projection.inverse() * vector[/code]. Vedi [method Projection.inverse]."
 
+msgid ""
+"Multiplies each component of the [Vector4] by the components of the given "
+"[Vector4].\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) * Vector4(3, 4, 5, 6)) # Prints (30.0, 80.0, "
+"150.0, 240.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector4] per i componenti del [Vector4] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector3i(10, 20, 30) * Vector3i(3, 4, 5)) # Stampa (30.0, 80.0, 150.0, "
+"240.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector4] by the given [float].\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) * 2) # Prints (20.0, 40.0, 60.0, 80.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector3i] per il [float] fornito.\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) * 2) # Stampa (20.0, 40.0, 60.0, 80.0)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector4] by the given [int]."
 msgstr "Moltiplica ogni componente del [Vector4] per l'[int] fornito."
 
+msgid ""
+"Adds each component of the [Vector4] by the components of the given "
+"[Vector4].\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) + Vector4(3, 4, 5, 6)) # Prints (13.0, 24.0, "
+"35.0, 46.0)\n"
+"[/codeblock]"
+msgstr ""
+"Aggiunge ogni componente del [Vector4] con i componenti del [Vector4] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) + Vector4(3, 4, 5, 6)) # Stampa (13.0, 24.0, "
+"35.0, 46.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Subtracts each component of the [Vector4] by the components of the given "
+"[Vector4].\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) - Vector4(3, 4, 5, 6)) # Prints (7.0, 16.0, "
+"25.0, 34.0)\n"
+"[/codeblock]"
+msgstr ""
+"Sottrae ogni componente del [Vector4] dai componenti del [Vector4] fornito.\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) - Vector4(3, 4, 5, 6)) # Stampa (7.0, 16.0, "
+"25.0, 34.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector4] by the components of the given "
+"[Vector4].\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) / Vector4(2, 5, 3, 4)) # Prints (5.0, 4.0, "
+"10.0, 10.0)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector4] per i componenti del [Vector4] fornito.\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) / Vector4(2, 5, 3, 4)) # Stampa (5.0, 4.0, "
+"10.0, 10.0)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector4] by the given [float].\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) / 2) # Prints (5.0, 10.0, 15.0, 20.0)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector4] per il [float] fornito.\n"
+"[codeblock]\n"
+"print(Vector4(10, 20, 30, 40) / 2 # Stampa (5.0, 10.0, 15.0, 20.0)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector4] by the given [int]."
 msgstr "Divide ogni componente del [Vector4] per l'[int] fornito."
 
@@ -140764,9 +167435,131 @@ msgstr ""
 "[code]INT32_MAX[/code]. Può essere utilizzato come equivalente di [constant "
 "Vector4.INF] per gli interi."
 
+msgid ""
+"Gets the remainder of each component of the [Vector4i] with the components of "
+"the given [Vector4i]. This operation uses truncated division, which is often "
+"not desired as it does not work well with negative numbers. Consider using "
+"[method @GlobalScope.posmod] instead if you want to handle negative numbers.\n"
+"[codeblock]\n"
+"print(Vector4i(10, -20, 30, -40) % Vector4i(7, 8, 9, 10)) # Prints (3, -4, 3, "
+"0)\n"
+"[/codeblock]"
+msgstr ""
+"Ottiene il resto di ogni componente di [Vector4i] con i componenti del "
+"[Vector4i] fornito. Questa operazione usa la divisione troncata, che spesso "
+"non è desiderata in quanto non funziona bene con i numeri negativi. Considera "
+"di usare [method @GlobalScope.posmod] se vuoi gestire i numeri negativi.\n"
+"[codeblock]\n"
+"print(Vector4i(10, -20, 30, -40) % Vector4i(7, 8, 9, 10)) # Stampa (3, -4, 3, "
+"0)\n"
+"[/codeblock]"
+
+msgid ""
+"Gets the remainder of each component of the [Vector4i] with the given [int]. "
+"This operation uses truncated division, which is often not desired as it does "
+"not work well with negative numbers. Consider using [method @GlobalScope."
+"posmod] instead if you want to handle negative numbers.\n"
+"[codeblock]\n"
+"print(Vector4i(10, -20, 30, -40) % 7) # Prints (3, -6, 2, -5)\n"
+"[/codeblock]"
+msgstr ""
+"Ottiene il resto di ogni componente di [Vector4i] con l'[int] fornito. Questa "
+"operazione usa la divisione troncata, che spesso non è desiderata in quanto "
+"non funziona bene con i numeri negativi. Considera di usare [method "
+"@GlobalScope.posmod] se vuoi gestire i numeri negativi.\n"
+"[codeblock]\n"
+"print(Vector4i(10, -20, 30, -40) % 7) # Stampa (3, -6, 2, -5)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector4i] by the components of the given "
+"[Vector4i].\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) * Vector4i(3, 4, 5, 6)) # Prints (30, 80, 150, "
+"240)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector4i] per i componenti del [Vector4i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) * Vector4i(3, 4, 5, 6)) # Stampa (30, 80, 150, "
+"240)\n"
+"[/codeblock]"
+
+msgid ""
+"Multiplies each component of the [Vector4i] by the given [float].\n"
+"Returns a Vector4 value due to floating-point operations.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) * 2) # Prints (20.0, 40.0, 60.0, 80.0)\n"
+"[/codeblock]"
+msgstr ""
+"Moltiplica ogni componente del [Vector4i] per il [float] fornito.\n"
+"Restituisce un Vector4 a causa di operazioni in virgola mobile.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) * 2) # Stampa (20.0, 40.0, 60.0, 80.0)\n"
+"[/codeblock]"
+
 msgid "Multiplies each component of the [Vector4i] by the given [int]."
 msgstr "Moltiplica ogni componente del [Vector4i] per l'[int] fornito."
 
+msgid ""
+"Adds each component of the [Vector4i] by the components of the given "
+"[Vector4i].\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) + Vector4i(3, 4, 5, 6)) # Prints (13, 24, 35, "
+"46)\n"
+"[/codeblock]"
+msgstr ""
+"Aggiunge ogni componente del [Vector4i] con i componenti del [Vector4i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) + Vector4i(3, 4, 5, 6)) # Stampa (13, 24, 35, "
+"46)\n"
+"[/codeblock]"
+
+msgid ""
+"Subtracts each component of the [Vector4i] by the components of the given "
+"[Vector4i].\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) - Vector4i(3, 4, 5, 6)) # Prints (7, 16, 25, "
+"34)\n"
+"[/codeblock]"
+msgstr ""
+"Sottrae ogni componente del [Vector4i] dai componenti del [Vector4i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) - Vector4i(3, 4, 5, 6)) # Stampa (7, 16, 25, "
+"34)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector4i] by the components of the given "
+"[Vector4i].\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) / Vector4i(2, 5, 3, 4)) # Prints (5, 4, 10, "
+"10)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector4i] per i componenti del [Vector4i] "
+"fornito.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) / Vector4i(2, 5, 3, 4)) # Stampa (5, 4, 10, "
+"10)\n"
+"[/codeblock]"
+
+msgid ""
+"Divides each component of the [Vector4i] by the given [float].\n"
+"Returns a Vector4 value due to floating-point operations.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) / 2) # Prints (5.0, 10.0, 15.0, 20.0)\n"
+"[/codeblock]"
+msgstr ""
+"Divide ogni componente del [Vector4i] per il [float] fornito.\n"
+"Restituisce un Vector4 a causa di operazioni in virgola mobile.\n"
+"[codeblock]\n"
+"print(Vector4i(10, 20, 30, 40) / 2 # Stampa (5.0, 10.0, 15.0, 20.0)\n"
+"[/codeblock]"
+
 msgid "Divides each component of the [Vector4i] by the given [int]."
 msgstr "Divide ogni componente del [Vector4i] per l'[int] fornito."
 
@@ -140991,6 +167784,39 @@ msgstr ""
 "veicolo. Per un veicolo con una massa impostata su 1000, prova un valore "
 "nell'intervallo 25 - 30 per una frenata brusca."
 
+msgid ""
+"The damping applied to the suspension spring when being compressed, meaning "
+"when the wheel is moving up relative to the vehicle. It is measured in Newton-"
+"seconds per millimeter (N⋅s/mm), or megagrams per second (Mg/s). This value "
+"should be between 0.0 (no damping) and 1.0, but may be more. A value of 0.0 "
+"means the car will keep bouncing as the spring keeps its energy. A good value "
+"for this is around 0.3 for a normal car, 0.5 for a race car."
+msgstr ""
+"Lo smorzamento applicato alla molla quando la molla viene compressa, ovvero "
+"quando la ruota si muove verso l'alto rispetto al veicolo. Si misura in "
+"Newton-secondi per millimetro (N⋅s/mm), o megagrammi al secondo (Mg/s). "
+"Questo valore dovrebbe essere compreso tra 0,0 (nessuno smorzamento) e 1,0, "
+"ma può essere più grande. Un valore di 0,0 significa che l'auto continuerà a "
+"rimbalzare poiché la molla conserva la sua energia. Un buon valore per questo "
+"è intorno a 0,3 per un'auto normale, 0,5 per un'auto da corsa."
+
+msgid ""
+"The damping applied to the suspension spring when rebounding or extending, "
+"meaning when the wheel is moving down relative to the vehicle. It is measured "
+"in Newton-seconds per millimeter (N⋅s/mm), or megagrams per second (Mg/s). "
+"This value should be between 0.0 (no damping) and 1.0, but may be more. This "
+"value should always be slightly higher than the [member damping_compression] "
+"property. For a [member damping_compression] value of 0.3, try a relaxation "
+"value of 0.5."
+msgstr ""
+"Lo smorzamento applicato alla molla durante il rilassamento, ovvero quando la "
+"ruota si muove verso il basso rispetto al veicolo. Si misura in Newton-"
+"secondi per millimetro (N⋅s/mm), o megagrammi al secondo (Mg/s). Questo "
+"valore dovrebbe essere compreso tra 0,0 (nessuno smorzamento) e 1,0, ma può "
+"essere più grande. Questo valore dovrebbe sempre essere leggermente superiore "
+"alla proprietà [member damping_compression]. Per un valore di [member "
+"damping_compression] di 0,3, prova un valore di rilassamento di 0,5."
+
 msgid ""
 "Accelerates the wheel by applying an engine force. The wheel is only sped up "
 "if it is in contact with a surface. The [member RigidBody3D.mass] of the "
@@ -141027,6 +167853,17 @@ msgstr ""
 "la molla non sopporterà il peso del veicolo. Spesso si ottengono buoni "
 "risultati con un valore che è circa 3 o 4 volte questo numero."
 
+msgid ""
+"The stiffness of the suspension, measured in Newtons per millimeter (N/mm), "
+"or megagrams per second squared (Mg/s²). Use a value lower than 50 for an off-"
+"road car, a value between 50 and 100 for a race car and try something around "
+"200 for something like a Formula 1 car."
+msgstr ""
+"La rigidità della sospensione, misurata in Newton per millimetro (N/mm) o "
+"megagrammi al secondo quadrato (Mg/s²). Usa un valore inferiore a 50 per "
+"un'auto fuoristrada, un valore tra 50 e 100 per un'auto da corsa e prova "
+"qualcosa intorno a 200 per qualcosa come un'auto di Formula 1."
+
 msgid ""
 "This is the distance the suspension can travel. As Godot units are equivalent "
 "to meters, keep this setting relatively low. Try a value between 0.1 and 0.3 "
@@ -141194,6 +168031,25 @@ msgstr ""
 "Restituisce lo stato di riproduzione, come determinato dalle chiamate a "
 "[method _play] e [method _stop]."
 
+msgid ""
+"Called in response to [member VideoStreamPlayer.autoplay] or [method "
+"VideoStreamPlayer.play]. Note that manual playback may also invoke [method "
+"_stop] multiple times before this method is called. [method _is_playing] "
+"should return [code]true[/code] once playing."
+msgstr ""
+"Chiamato in risposta a [member VideoStreamPlayer.autoplay] o [method "
+"VideoStreamPlayer.play]. Nota che la riproduzione manuale potrebbe anche "
+"richiamare [method _stop] più volte prima che questo metodo sia chiamato. "
+"[method _is_playing] dovrebbe restituire [code]true[/code] una volta in "
+"riproduzione."
+
+msgid ""
+"Seeks to [param time] seconds. Called in response to the [member "
+"VideoStreamPlayer.stream_position] setter."
+msgstr ""
+"Ricerca a [param time] secondi. Chiamato in risposta al setter di [member "
+"VideoStreamPlayer.stream_position]."
+
 msgid ""
 "Select the audio track [param idx]. Called when playback starts, and in "
 "response to the [member VideoStreamPlayer.audio_track] setter."
@@ -141211,6 +168067,23 @@ msgstr ""
 "restituire [param paused]. Chiamato in risposta al setter di [member "
 "VideoStreamPlayer.paused]."
 
+msgid ""
+"Stops playback. May be called multiple times before [method _play], or in "
+"response to [method VideoStreamPlayer.stop]. [method _is_playing] should "
+"return [code]false[/code] once stopped."
+msgstr ""
+"Arresta la riproduzione. Può essere chiamato più volte prima di [method "
+"_play], o in risposta a [method VideoStreamPlayer.stop]. [method _is_playing] "
+"dovrebbe restituire [code]false[/code] una volta arrestato."
+
+msgid ""
+"Ticks video playback for [param delta] seconds. Called every frame as long as "
+"both [method _is_paused] and [method _is_playing] return [code]true[/code]."
+msgstr ""
+"Elabora la riproduzione video per [param delta] secondi. Chiamato ogni frame "
+"finché sia [method _is_paused] sia [method _is_playing] restituiscono "
+"[code]true[/code]."
+
 msgid ""
 "Render [param num_frames] audio frames (of [method _get_channels] floats "
 "each) from [param buffer], starting from index [param offset] in the array. "
@@ -141408,6 +168281,31 @@ msgstr ""
 "proprietà [member world_3d] di se stessa e di qualsiasi antenato della "
 "Viewport."
 
+msgid ""
+"Returns the currently active 2D audio listener. Returns [code]null[/code] if "
+"there are no active 2D audio listeners, in which case the active 2D camera "
+"will be treated as listener."
+msgstr ""
+"Restituisce l'ascoltatore audio 2D attualmente attivo. Restituisce "
+"[code]null[/code] se non ci sono ascoltatori audio 2D, nel qual caso la "
+"telecamera 2D attiva sarà trattata come ascoltatore."
+
+msgid ""
+"Returns the currently active 3D audio listener. Returns [code]null[/code] if "
+"there are no active 3D audio listeners, in which case the active 3D camera "
+"will be treated as listener."
+msgstr ""
+"Restituisce l'ascoltatore audio 3D attualmente attivo. Restituisce "
+"[code]null[/code] se non ci sono ascoltatori audio 3D, nel qual caso la "
+"telecamera 3D attiva sarà trattata come ascoltatore."
+
+msgid ""
+"Returns the currently active 2D camera. Returns [code]null[/code] if there "
+"are no active cameras."
+msgstr ""
+"Restituisce la telecamera 2D attualmente attiva. Restituisce [code]null[/"
+"code] se non ci sono telecamere attive."
+
 msgid "Returns the currently active 3D camera."
 msgstr "Restituisce la telecamera 3D attualmente attiva."
 
@@ -141457,6 +168355,34 @@ msgstr ""
 "Restituisce la trasformazione dalle coordinate della Viewport alle coordinate "
 "dello schermo della finestra di gestione finestre che la contiene."
 
+msgid ""
+"Returns the viewport's texture.\n"
+"[b]Note:[/b] When trying to store the current texture (e.g. in a file), it "
+"might be completely black or outdated if used too early, especially when used "
+"in e.g. [method Node._ready]. To make sure the texture you get is correct, "
+"you can await [signal RenderingServer.frame_post_draw] signal.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    await RenderingServer.frame_post_draw\n"
+"    $Viewport.get_texture().get_image().save_png(\"user://Screenshot.png\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] When [member use_hdr_2d] is [code]true[/code] the returned "
+"texture will be an HDR image encoded in linear space."
+msgstr ""
+"Restituisce la texture della viewport.\n"
+"[b]Nota:[/b] Quando si tenta di memorizzare la texture attuale (ad esempio in "
+"un file), potrebbe essere completamente nera o obsoleta se questo metodo è "
+"chiamato troppo presto, specialmente se chiamato ad esempio in [method Node."
+"_ready]. Per assicurarti che la texture ottenuta sia corretta, puoi attendere "
+"il segnale [signal RenderingServer.frame_post_draw].\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    await RenderingServer.frame_post_draw\n"
+"    $Viewport.get_texture().get_image().save_png(\"user://Screenshot.png\")\n"
+"[/codeblock]\n"
+"b]Nota:[/b] Quando [member use_hdr_2d] è [code]true[/code] la texture "
+"restituita sarà un'immagine HDR codificata nello spazio lineare."
+
 msgid "Returns the viewport's RID from the [RenderingServer]."
 msgstr "Restituisce il [RID] del viewport dal [RenderingServer]."
 
@@ -141464,6 +168390,14 @@ msgid "Returns the visible rectangle in global screen coordinates."
 msgstr ""
 "Restituisce il rettangolo visibile nelle coordinate globali dello schermo."
 
+msgid ""
+"Cancels the drag operation that was previously started through [method "
+"Control._get_drag_data] or forced with [method Control.force_drag]."
+msgstr ""
+"Cancella l'operazione di trascinamento che è stata cominciata in precedenza "
+"attraverso [method Control._get_drag_data] o forzata con [method Control."
+"force_drag]."
+
 msgid ""
 "Returns the drag data from the GUI, that was previously returned by [method "
 "Control._get_drag_data]."
@@ -141471,10 +168405,43 @@ msgstr ""
 "Restituisce i dati di trascinamento dalla GUI, restituiti in precedenza da "
 "[method Control._get_drag_data]."
 
+msgid ""
+"Returns the currently focused [Control] within this viewport. If no [Control] "
+"is focused, returns [code]null[/code]."
+msgstr ""
+"Restituisce il [Control] attualmente focalizzato all'interno di questa "
+"viewport. Se nessun [Control] ha il focus, restituisce [code]null[/code]."
+
+msgid ""
+"Returns the [Control] that the mouse is currently hovering over in this "
+"viewport. If no [Control] has the cursor, returns [code]null[/code].\n"
+"Typically the leaf [Control] node or deepest level of the subtree which "
+"claims hover. This is very useful when used together with [method Node."
+"is_ancestor_of] to find if the mouse is within a control tree."
+msgstr ""
+"Restituisce il [Control] su cui si trova attualmente il mouse in questa "
+"viewport. Se nessun [Control] ha il cursore, restituisce [code]null[/code].\n"
+"In genere il nodo [Control] foglia o il livello più profondo del sottoalbero "
+"che è influenzato dal passaggio del mouse. Questo è molto utile se utilizzato "
+"insieme a [method Node.is_ancestor_of] per scoprire se il mouse si trova "
+"all'interno di un albero di controlli."
+
 msgid "Returns [code]true[/code] if the drag operation is successful."
 msgstr ""
 "Restituisce [code]true[/code] se l'operazione di trascinamento ha successo."
 
+msgid ""
+"Returns [code]true[/code] if a drag operation is currently ongoing and where "
+"the drop action could happen in this viewport.\n"
+"Alternative to [constant Node.NOTIFICATION_DRAG_BEGIN] and [constant Node."
+"NOTIFICATION_DRAG_END] when you prefer polling the value."
+msgstr ""
+"Restituisce [code]true[/code] se la viewport sta attualmente effettuando "
+"un'operazione di trascinamento e dove un'azione di rilascio potrebbe "
+"occorrere in questa viewport.\n"
+"Alternativa a [constant Node.NOTIFICATION_DRAG_BEGIN] e [constant Node."
+"NOTIFICATION_DRAG_END] quando si preferisce recuperare direttamente il valore."
+
 msgid ""
 "Removes the focus from the currently focused [Control] within this viewport. "
 "If no [Control] has the focus, does nothing."
@@ -141528,7 +168495,7 @@ msgid ""
 "If none of the methods handle the event and [member physics_object_picking] "
 "is [code]true[/code], the event is used for physics object picking."
 msgstr ""
-"Attiva l'evento [param event] in questo [Viewport]. Può essere utilizzato per "
+"Attiva l'evento [param event] in questa [Viewport]. Può essere utilizzato per "
 "passare un [InputEvent] tra viewport o per applicare localmente gli input "
 "inviati tramite la rete o salvati in un file.\n"
 "Se [param in_local_coords] è [code]false[/code], la posizione dell'evento è "
@@ -141547,7 +168514,7 @@ msgstr ""
 "- [method Node._unhandled_key_input]\n"
 "- [method Node._unhandled_input]\n"
 "Se un metodo precedente contrassegna l'input come gestito tramite [method "
-"set_input_as_handled], nessun metodo successivo in questo elenco sarà "
+"set_input_as_handled], nessun metodo successivo in questo elenco verrà "
 "chiamato.\n"
 "Se nessuno dei metodi gestisce l'evento e [member physics_object_picking] è "
 "[code]true[/code], l'evento è utilizzato per la selezione degli oggetti di "
@@ -141585,7 +168552,7 @@ msgid ""
 "[b]Note:[/b] This method doesn't propagate input events to embedded [Window]s "
 "or [SubViewport]s."
 msgstr ""
-"Attiva l'evento [param event] in questo [Viewport]. Può essere utilizzato per "
+"Attiva l'evento [param event] in questa [Viewport]. Può essere utilizzato per "
 "passare un [InputEvent] tra viewport o per applicare localmente gli input "
 "inviati tramite la rete o salvati in un file.\n"
 "Se [param in_local_coords] è [code]false[/code], la posizione dell'evento è "
@@ -141598,7 +168565,7 @@ msgstr ""
 "- [method Node._unhandled_key_input]\n"
 "- [method Node._unhandled_input]\n"
 "Se un metodo precedente contrassegna l'input come gestito tramite [method "
-"set_input_as_handled], nessun metodo successivo in questo elenco sarà "
+"set_input_as_handled], nessun metodo successivo in questo elenco verrà "
 "chiamato.\n"
 "Se nessuno dei metodi gestisce l'evento e [member physics_object_picking] è "
 "[code]true[/code], l'evento è utilizzato per la selezione degli oggetti di "
@@ -141784,6 +168751,46 @@ msgstr ""
 "visibilità [GeometryInstance3D] (noti anche come LOD \"manuale\" o LOD "
 "gerarchico)."
 
+msgid ""
+"The multisample antialiasing mode for 2D/Canvas rendering. A higher number "
+"results in smoother edges at the cost of significantly worse performance. A "
+"value of [constant Viewport.MSAA_2X] or [constant Viewport.MSAA_4X] is best "
+"unless targeting very high-end systems. This has no effect on shader-induced "
+"aliasing or texture aliasing.\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/msaa_2d] and "
+"[method RenderingServer.viewport_set_msaa_2d]."
+msgstr ""
+"La modalità antialiasing multicampione per il rendering 2D/Canvas. Un numero "
+"più alto produce bordi più smussati a scapito di prestazioni notevolmente "
+"peggiori. Un valore di [constant Viewport.MSAA_2X] or [constant Viewport."
+"MSAA_4X] è il migliore, a meno che non si punti a sistemi di fascia molto "
+"alta. Questo non ha alcun effetto sull'aliasing indotto da uno shader o "
+"sull'aliasing delle texture.\n"
+"Vedi anche [member ProjectSettings.rendering/anti_aliasing/quality/msaa_2d] e "
+"[method RenderingServer.viewport_set_msaa_2d]."
+
+msgid ""
+"The multisample antialiasing mode for 3D rendering. A higher number results "
+"in smoother edges at the cost of significantly worse performance. A value of "
+"[constant Viewport.MSAA_2X] or [constant Viewport.MSAA_4X] is best unless "
+"targeting very high-end systems. See also bilinear scaling 3D [member "
+"scaling_3d_mode] for supersampling, which provides higher quality but is much "
+"more expensive. This has no effect on shader-induced aliasing or texture "
+"aliasing.\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/msaa_3d] and "
+"[method RenderingServer.viewport_set_msaa_3d]."
+msgstr ""
+"La modalità antialiasing multicampione per il rendering 3D. Un numero più "
+"alto produce bordi più smussati a scapito di prestazioni notevolmente "
+"peggiori. Un valore di [constant Viewport.MSAA_2X] or [constant Viewport."
+"MSAA_4X] è il migliore, a meno che non si punti a sistemi di fascia molto "
+"alta. Vedi anche bilinear scaling 3D [member scaling_3d_mode] per il "
+"sovracampionamento, che fornisce una qualità superiore ma è molto più "
+"costoso. Questo non ha alcun effetto sull'aliasing indotto da uno shader o "
+"sull'aliasing delle texture.\n"
+"Vedi anche [member ProjectSettings.rendering/anti_aliasing/quality/msaa_3d] e "
+"[method RenderingServer.viewport_set_msaa_3d]."
+
 msgid ""
 "If [code]true[/code], the viewport will use a unique copy of the [World3D] "
 "defined in [member world_3d]."
@@ -141873,6 +168880,27 @@ msgstr ""
 "di fascia bassa riducendo sia il carico della CPU che della GPU (poiché sono "
 "necessarie meno chiamate di disegno per disegnare la scena senza ombre)."
 
+msgid ""
+"Sets scaling 3D mode. Bilinear scaling renders at different resolution to "
+"either undersample or supersample the viewport. FidelityFX Super Resolution "
+"1.0, abbreviated to FSR, is an upscaling technology that produces high "
+"quality images at fast framerates by using a spatially aware upscaling "
+"algorithm. FSR is slightly more expensive than bilinear, but it produces "
+"significantly higher image quality. FSR should be used where possible.\n"
+"To control this property on the root viewport, set the [member "
+"ProjectSettings.rendering/scaling_3d/mode] project setting."
+msgstr ""
+"Imposta la modalità di ridimensionamento 3D. Il ridimensionamento bilineare "
+"renderizza a risoluzione diversa per sottocampionare o sovracampionare la "
+"viewport. FidelityFX Super Resolution 1.0, abbreviato in FSR, è una "
+"tecnologia di upscaling che produce immagini di alta qualità a frame rate "
+"elevati attraverso un algoritmo di upscaling consapevole dello spazio. FSR è "
+"leggermente più costoso di bilineare, ma produce una qualità dell'immagine "
+"significativamente più elevata. FSR dovrebbe essere utilizzato ove "
+"possibile.\n"
+"Per controllare questa proprietà sulla viewport radice, cambia l'impostazione "
+"del progetto [member ProjectSettings.rendering/scaling_3d/mode]."
+
 msgid ""
 "Scales the 3D render buffer based on the viewport size uses an image filter "
 "specified in [member ProjectSettings.rendering/scaling_3d/mode] to scale the "
@@ -141909,6 +168937,24 @@ msgstr ""
 "Per controllare questa proprietà nella viewport radice, cambia l'impostazione "
 "del progetto [member ProjectSettings.rendering/scaling_3d/scale]."
 
+msgid ""
+"Sets the screen-space antialiasing method used. Screen-space antialiasing "
+"works by selectively blurring edges in a post-process shader. It differs from "
+"MSAA which takes multiple coverage samples while rendering objects. Screen-"
+"space AA methods are typically faster than MSAA and will smooth out specular "
+"aliasing, but tend to make scenes appear blurry.\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/"
+"screen_space_aa] and [method RenderingServer.viewport_set_screen_space_aa]."
+msgstr ""
+"Imposta il metodo di antialiasing screen-space utilizzato. L'antialiasing "
+"screen-space funziona sfocando selettivamente i bordi in uno shader post-"
+"process. Si differenzia da MSAA che prende multipli campioni di copertura "
+"durante il rendering degli oggetti. I metodi di AA screen-space sono in "
+"genere più veloci di MSAA e smussano l'aliasing speculare, ma tendono a far "
+"apparire le scene sfocate.\n"
+"Vedi anche [member ProjectSettings.rendering/anti_aliasing/quality/"
+"screen_space_aa] e [method RenderingServer.viewport_set_screen_space_aa]."
+
 msgid ""
 "Controls how much of the original viewport's size should be covered by the 2D "
 "signed distance field. This SDF can be sampled in [CanvasItem] shaders and is "
@@ -142012,6 +169058,62 @@ msgstr ""
 "Se [code]true[/code], la viewport dovrebbe renderizzare il suo sfondo in modo "
 "trasparente."
 
+msgid ""
+"If [code]true[/code], uses a fast post-processing filter to make banding "
+"significantly less visible in 3D. 2D rendering is [i]not[/i] affected by "
+"debanding unless the [member Environment.background_mode] is [constant "
+"Environment.BG_CANVAS].\n"
+"In some cases, debanding may introduce a slightly noticeable dithering "
+"pattern. It's recommended to enable debanding only when actually needed since "
+"the dithering pattern will make lossless-compressed screenshots larger.\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/"
+"use_debanding] and [method RenderingServer.viewport_set_use_debanding]."
+msgstr ""
+"Se [code]true[/code], utilizza un filtro di post-elaborazione veloce per "
+"ridurre notevolmente la visibilità del banding in 3D. Il rendering 2D [i]non[/"
+"i] è influenzato dal debanding a meno che [member Environment."
+"background_mode] non sia [constant Environment.BG_CANVAS].\n"
+"In alcuni casi, il debanding potrebbe introdurre un leggero motivo di "
+"dithering. Si consiglia di abilitare il debanding solo quando è "
+"effettivamente necessario, poiché il motivo di dithering renderà più grandi "
+"gli screenshot compressi senza perdita di dati.\n"
+"Vedi anche [member ProjectSettings.rendering/anti_aliasing/quality/"
+"use_debanding] e [method RenderingServer.viewport_set_use_debanding]."
+
+msgid ""
+"If [code]true[/code], 2D rendering will use an high dynamic range (HDR) "
+"format framebuffer matching the bit depth of the 3D framebuffer. When using "
+"the Forward+ renderer this will be an [code]RGBA16[/code] framebuffer, while "
+"when using the Mobile renderer it will be an [code]RGB10_A2[/code] "
+"framebuffer. Additionally, 2D rendering will take place in linear color space "
+"and will be converted to sRGB space immediately before blitting to the screen "
+"(if the Viewport is attached to the screen). Practically speaking, this means "
+"that the end result of the Viewport will not be clamped into the [code]0-1[/"
+"code] range and can be used in 3D rendering without color space adjustments. "
+"This allows 2D rendering to take advantage of effects requiring high dynamic "
+"range (e.g. 2D glow) as well as substantially improves the appearance of "
+"effects requiring highly detailed gradients.\n"
+"[b]Note:[/b] This setting will have no effect when using the Compatibility "
+"renderer, which always renders in low dynamic range for performance reasons."
+msgstr ""
+"Se [code]true[/code], il rendering 2D utilizzerà un framebuffer in formato "
+"HDR (High Dynamic Range, o \"alta gamma dinamica\") corrispondente alla "
+"profondità di bit del framebuffer 3D. Quando si utilizza il renderer "
+"Forward+, questo sarà un framebuffer [code]RGBA16[/code], mentre quando si "
+"utilizza il renderer Mobile, sarà un framebuffer [code]RGB10_A2[/code]. "
+"Inoltre, il rendering 2D avverrà nello spazio colore lineare e sarà "
+"convertito nello spazio sRGB subito prima di essere visualizzato sullo "
+"schermo (se la Viewport è collegata allo schermo). In pratica, ciò significa "
+"che il risultato finale della Viewport non sarà limitato nell'intervallo "
+"[code]0-1[/code] e potrà essere utilizzato nel rendering 3D senza aggiustare "
+"lo spazio colore. Ciò consente al rendering 2D di sfruttare gli effetti che "
+"richiedono un'elevata gamma dinamica (ad esempio, il bagliore 2D) e migliora "
+"sostanzialmente l'aspetto degli effetti che richiedono gradienti molto "
+"dettagliati.\n"
+"[b]Nota:[/b] Questa impostazione non avrà alcun effetto quando si utilizza il "
+"renderer di Compatibilità, il quale renderizza sempre in una gamma dinamica "
+"bassa per motivi di prestazioni."
+
 msgid ""
 "If [code]true[/code], [OccluderInstance3D] nodes will be usable for occlusion "
 "culling in 3D for this viewport. For the root viewport, [member "
@@ -142045,6 +169147,24 @@ msgstr ""
 "essere abilitato compilando modelli di esportazione Web personalizzati con "
 "[code]module_raycast_enabled=yes[/code]."
 
+msgid ""
+"Enables temporal antialiasing for this viewport. TAA works by jittering the "
+"camera and accumulating the images of the last rendered frames, motion vector "
+"rendering is used to account for camera and object motion.\n"
+"[b]Note:[/b] The implementation is not complete yet, some visual instances "
+"such as particles and skinned meshes may show artifacts.\n"
+"See also [member ProjectSettings.rendering/anti_aliasing/quality/use_taa] and "
+"[method RenderingServer.viewport_set_use_taa]."
+msgstr ""
+"Abilita l'antialiasing temporale per questa viewport. Il TAA funziona "
+"tremolando la telecamera e accumulando le immagini degli ultimi fotogrammi "
+"renderizzati, il rendering del vettore di movimento è utilizzato per tenere "
+"conto del movimento della telecamera e degli oggetti.\n"
+"[b]Nota:[/b] L'implementazione non è ancora completa. Alcune istanze visive "
+"come particelle e mesh con skin potrebbero mostrare artefatti di ghosting.\n"
+"Vedi anche [member ProjectSettings.rendering/anti_aliasing/quality/use_taa] e "
+"[method RenderingServer.viewport_set_use_taa]."
+
 msgid ""
 "If [code]true[/code], the viewport will use the primary XR interface to "
 "render XR output. When applicable this can result in a stereoscopic image and "
@@ -142217,6 +169337,34 @@ msgstr ""
 "code] non sono supportati e sarà invece utilizzato il downsampling bilineare. "
 "Un valore di [code]1.0[/code] disabilita il ridimensionamento."
 
+msgid ""
+"Use the [url=https://developer.apple.com/documentation/metalfx/"
+"mtlfxspatialscaler#overview]MetalFX spatial upscaler[/url] for the viewport's "
+"3D buffer.\n"
+"The amount of scaling can be set using [member scaling_3d_scale].\n"
+"Values less than [code]1.0[/code] will be result in the viewport being "
+"upscaled using MetalFX. Values greater than [code]1.0[/code] are not "
+"supported and bilinear downsampling will be used instead. A value of "
+"[code]1.0[/code] disables scaling.\n"
+"More information: [url=https://developer.apple.com/documentation/"
+"metalfx]MetalFX[/url].\n"
+"[b]Note:[/b] Only supported when the Metal rendering driver is in use, which "
+"limits this scaling mode to macOS and iOS."
+msgstr ""
+"Utilizza il [url=https://developer.apple.com/documentation/metalfx/"
+"mtlfxspatialscaler#overview]MetalFX spatial upscaler[/url] per il buffer 3D "
+"della viewport.\n"
+"La quantità di ridimensionamento può essere impostata tramite [member "
+"scaling_3d_scale].\n"
+"I valori inferiori a [code]1.0[/code] risulteranno in un upscaling della "
+"viewport tramite MetalFX. I valori superiori a [code]1.0[/code] non sono "
+"supportati e sarà invece utilizzato il downsampling bilineare. Un valore di "
+"[code]1.0[/code] disabilita il ridimensionamento.\n"
+"Ulteriori information: [url=https://developer.apple.com/documentation/"
+"metalfx]MetalFX[/url].\n"
+"[b]Nota:[/b] Supportato solo quando è in uso il driver di rendering Metal, il "
+"che limita questa modalità di ridimensionamento a macOS e iOS."
+
 msgid "Represents the size of the [enum Scaling3DMode] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum Scaling3DMode]."
 
@@ -142257,6 +169405,10 @@ msgstr ""
 msgid "Represents the size of the [enum MSAA] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum MSAA]."
 
+msgid "Represents the size of the [enum AnisotropicFiltering] enum."
+msgstr ""
+"Rappresenta la dimensione dell'enumerazione [enum AnisotropicFiltering]."
+
 msgid "Represents the size of the [enum ScreenSpaceAA] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum ScreenSpaceAA]."
 
@@ -142507,6 +169659,62 @@ msgstr "Rappresenta la dimensione dell'enumerazione [enum VRSUpdateMode]."
 msgid "Provides the content of a [Viewport] as a dynamic texture."
 msgstr "Fornisce il contenuto di una [Viewport] come texture dinamica."
 
+msgid ""
+"A [ViewportTexture] provides the content of a [Viewport] as a dynamic "
+"[Texture2D]. This can be used to combine the rendering of [Control], [Node2D] "
+"and [Node3D] nodes. For example, you can use this texture to display a 3D "
+"scene inside a [TextureRect], or a 2D overlay in a [Sprite3D].\n"
+"To get a [ViewportTexture] in code, use the [method Viewport.get_texture] "
+"method on the target viewport.\n"
+"[b]Note:[/b] A [ViewportTexture] is always local to its scene (see [member "
+"Resource.resource_local_to_scene]). If the scene root is not ready, it may "
+"return incorrect data (see [signal Node.ready]).\n"
+"[b]Note:[/b] Instantiating scenes containing a high-resolution "
+"[ViewportTexture] may cause noticeable stutter.\n"
+"[b]Note:[/b] When using a [Viewport] with [member Viewport.use_hdr_2d] set to "
+"[code]true[/code], the returned texture will be an HDR image encoded in "
+"linear space. This may look darker than normal when displayed directly on "
+"screen. To convert to gamma space, you can do the following:\n"
+"[codeblock]\n"
+"img.convert(Image.FORMAT_RGBA8)\n"
+"imb.linear_to_srgb()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Some nodes such as [Decal], [Light3D], and [PointLight2D] do not "
+"support using [ViewportTexture] directly. To use texture data from a "
+"[ViewportTexture] in these nodes, you need to create an [ImageTexture] by "
+"calling [method Texture2D.get_image] on the [ViewportTexture] and passing the "
+"result to [method ImageTexture.create_from_image]. This conversion is a slow "
+"operation, so it should not be performed every frame."
+msgstr ""
+"Una [ViewportTexture] fornisce il contenuto di una [Viewport] sotto forma di "
+"una [Texture2D] dinamica. Può essere utilizzata per combinare il rendering "
+"dei nodi [Control], [Node2D] e [Node3D]. Ad esempio, è possibile utilizzare "
+"questa texture per visualizzare una scena 3D all'interno di una [TextureRect] "
+"o un overlay 2D in una [Sprite3D].\n"
+"Per ottenere una [ViewportTexture] in codice, usa il metodo [method Viewport."
+"get_texture] sulla viewport di destinazione.\n"
+"[b]Nota:[/b] Una [ViewportTexture] è sempre locale alla sua scena (vedi "
+"[member Resource.resource_local_to_scene]). Se la radice della scena non è "
+"pronta, potrebbe restituire dati non corretti (vedi [signal Node.ready]).\n"
+"[b]Nota:[/b] Istanziare scene contenenti una [ViewportTexture] ad alta "
+"risoluzione potrebbe causare un evidente scatto nelle prestazioni.\n"
+"[b]Nota:[/b] Quando si utilizza un [Viewport] con [member Viewport."
+"use_hdr_2d] impostato su [code]true[/code], la texture restituita sarà "
+"un'immagine HDR codificata nello spazio lineare. Potrebbe apparire più scura "
+"del normale se visualizzata direttamente sullo schermo. Per convertire nello "
+"spazio gamma, puoi fare quanto segue:\n"
+"[codeblock]\n"
+"img.convert(Image.FORMAT_RGBA8)\n"
+"imb.linear_to_srgb()\n"
+"[/codeblock]\n"
+"[b]Nota:[/b] Alcuni nodi come [Decal], [Light3D] e [PointLight2D] non "
+"supportano l'utilizzo diretto di [ViewportTexture]. Per utilizzare i dati di "
+"texture da una [ViewportTexture] in questi nodi, è necessario creare una "
+"[ImageTexture] chiamando [method Texture2D.get_image] sulla [ViewportTexture] "
+"e passando il risultato a [method ImageTexture.create_from_image]. Questa "
+"conversione è un'operazione lenta, quindi non dovrebbe essere eseguita a ogni "
+"fotogramma."
+
 msgid ""
 "The path to the [Viewport] node to display. This is relative to the local "
 "scene root (see [method Resource.get_local_scene]), [b]not[/b] to the nodes "
@@ -142642,6 +169850,28 @@ msgstr ""
 "Una regione rettangolare dello spazio 2D che rileva se è visibile sullo "
 "schermo."
 
+msgid ""
+"[VisibleOnScreenNotifier2D] represents a rectangular region of 2D space. When "
+"any part of this region becomes visible on screen or in a viewport, it will "
+"emit a [signal screen_entered] signal, and likewise it will emit a [signal "
+"screen_exited] signal when no part of it remains visible.\n"
+"If you want a node to be enabled automatically when this region is visible on "
+"screen, use [VisibleOnScreenEnabler2D].\n"
+"[b]Note:[/b] [VisibleOnScreenNotifier2D] uses the render culling code to "
+"determine whether it's visible on screen, so it won't function unless [member "
+"CanvasItem.visible] is set to [code]true[/code]."
+msgstr ""
+"[VisibleOnScreenEnabler2D] rappresenta una regione rettangolare nello spazio "
+"2D. Quando una parte di questa regione diventa visibile sullo schermo o in "
+"una viewport, emetterà un segnale [signal screen_entered] e, allo stesso "
+"modo, emetterà un segnale [signal screen_exited] quando nessuna parte di essa "
+"rimane visibile.\n"
+"Se vuoi che un nodo sia abilitato automaticamente quando questa regione è "
+"visibile sullo schermo, usa [VisibleOnScreenEnabler2D].\n"
+"[b]Nota:[/b] [VisibleOnScreenNotifier2D] usa il codice di culling del "
+"renderer per determinare se è visibile sullo schermo, quindi non funzionerà a "
+"meno che [member CanvasItem.visible] non sia impostato su [code]true[/code]."
+
 msgid ""
 "If [code]true[/code], the bounding rectangle is on the screen.\n"
 "[b]Note:[/b] It takes one frame for the [VisibleOnScreenNotifier2D]'s "
@@ -142670,6 +169900,30 @@ msgstr ""
 "Una regione a forma di scatola dello spazio 3D che rileva se è visibile sullo "
 "schermo."
 
+msgid ""
+"[VisibleOnScreenNotifier3D] represents a box-shaped region of 3D space. When "
+"any part of this region becomes visible on screen or in a [Camera3D]'s view, "
+"it will emit a [signal screen_entered] signal, and likewise it will emit a "
+"[signal screen_exited] signal when no part of it remains visible.\n"
+"If you want a node to be enabled automatically when this region is visible on "
+"screen, use [VisibleOnScreenEnabler3D].\n"
+"[b]Note:[/b] [VisibleOnScreenNotifier3D] uses an approximate heuristic that "
+"doesn't take walls and other occlusion into account, unless occlusion culling "
+"is used. It also won't function unless [member Node3D.visible] is set to "
+"[code]true[/code]."
+msgstr ""
+"[VisibleOnScreenEnabler3D] rappresenta una regione a forma di scatola nello "
+"spazio 3D. Quando una parte di questa regione diventa visibile sullo schermo "
+"o in una viewport, emetterà un segnale [signal screen_entered] e, allo stesso "
+"modo, emetterà un segnale [signal screen_exited] quando nessuna parte di essa "
+"rimane visibile.\n"
+"Se vuoi che un nodo sia abilitato automaticamente quando questa regione è "
+"visibile sullo schermo, usa [VisibleOnScreenEnabler3D].\n"
+"[b]Nota:[/b] [VisibleOnScreenNotifier3D] utilizza un'euristica approssimativa "
+"che non tiene conto delle pareti e di altre occlusioni, a meno che non venga "
+"utilizzato l'occlusion culling. Inoltre, non funzionerà a meno che [member "
+"Node3D.visible] non sia impostato su [code]true[/code]."
+
 msgid ""
 "Returns [code]true[/code] if the bounding box is on the screen.\n"
 "[b]Note:[/b] It takes one frame for the [VisibleOnScreenNotifier3D]'s "
@@ -142916,6 +170170,13 @@ msgstr ""
 msgid "Removes the specified node from the shader."
 msgstr "Rimuove il nodo specificato dallo shader."
 
+msgid ""
+"Removes a varying value node with the given [param name]. Prints an error if "
+"a node with this name is not found."
+msgstr ""
+"Rimuove un nodo con valore varying con il nome [param name]. Stampa un errore "
+"se non viene trovato un nodo con questo nome."
+
 msgid "Replaces the specified node with a node of new class type."
 msgstr "Sostituisce il nodo specificato con un nodo di nuovo tipo di classe."
 
@@ -143611,6 +170872,20 @@ msgstr ""
 "utilizzato se [member type] è impostato su [constant CTYPE_BOOLEAN] o "
 "[constant CTYPE_TRANSFORM]."
 
+msgid ""
+"The result will be [code]true[/code] if all components in the vector satisfy "
+"the comparison condition."
+msgstr ""
+"Il risultato sarà [code]true[/code] se tutti i componenti del vettore "
+"soddisfano la condizione del confronto."
+
+msgid ""
+"The result will be [code]true[/code] if any component in the vector satisfies "
+"the comparison condition."
+msgstr ""
+"Il risultato sarà [code]true[/code] se uno qualsiasi dei componenti del "
+"vettore soddisfa la condizione del confronto."
+
 msgid "Represents the size of the [enum Condition] enum."
 msgstr "Rappresenta la dimensione dell'enumerazione [enum Condition]."
 
@@ -144077,6 +171352,15 @@ msgid "A type of operands and returned value. See [enum OpType] for options."
 msgstr ""
 "Un tipo di operandi e valore restituito. Vedi [enum OpType] per le opzioni."
 
+msgid ""
+"Sets the level of precision to use for the derivative function. See [enum "
+"Precision] for options. When using the Compatibility renderer, this setting "
+"has no effect."
+msgstr ""
+"Imposta il livello di precisione da usare per la funzione derivata. Vedi "
+"[enum Precision] per le opzioni. Quando si usa il renderer di Compatibilità, "
+"questa impostazione non ha effetto."
+
 msgid "Sum of absolute derivative in [code]x[/code] and [code]y[/code]."
 msgstr "La somma di una derivata assoluta in [code]x[/code] e [code]y[/code]."
 
@@ -144975,6 +172259,13 @@ msgid "If [code]true[/code], the node will have a custom default value."
 msgstr ""
 "Se [code]true[/code], il nodo avrà un valore predefinito personalizzato."
 
+msgid ""
+"The names used for the enum select in the editor. [member hint] must be "
+"[constant HINT_ENUM] for this to take effect."
+msgstr ""
+"I nomi utilizzati per la selezione dell'enumerazione nell'editor. [member "
+"hint] deve essere [constant HINT_ENUM] affinché abbia effetto."
+
 msgid "Range hint of this node. Use it to customize valid parameter range."
 msgstr ""
 "Un suggerimento di intervallo di questo nodo. Usalo per personalizzare "
@@ -145022,6 +172313,12 @@ msgstr ""
 "Il valore del parametro deve essere all'interno dell'intervallo specificato, "
 "con il passo [member step] fornito tra i valori."
 
+msgid ""
+"The parameter uses an enum to associate preset values to names in the editor."
+msgstr ""
+"Il parametro utilizza un enumerazione per associare valori preimpostati a "
+"nomi nell'editor."
+
 msgid "A boolean comparison operator to be used within the visual shader graph."
 msgstr ""
 "Un operatore di confronto booleano da utilizzare all'interno del grafico di "
@@ -145449,6 +172746,33 @@ msgstr ""
 "ad esempio, è possibile modificare un valore [code]0.1[/code] a [code]-2...2[/"
 "code] ecc. Vedi [method @GlobalScope.remap] per ulteriori dettagli."
 
+msgid ""
+"The [code]value[/code] port uses a 2D vector type, while the [code]input min[/"
+"code], [code]input max[/code], [code]output min[/code], and [code]output max[/"
+"code] ports use a floating-point scalar type."
+msgstr ""
+"La porta [code]value/code] utilizza un tipo di vettore 2D, mentre le porte "
+"[code]input min[/code], [code]output min[/code] e [code]output max[/code] "
+"utilizzano un tipo di scalare in virgola mobile."
+
+msgid ""
+"The [code]value[/code] port uses a 3D vector type, while the [code]input min[/"
+"code], [code]input max[/code], [code]output min[/code], and [code]output max[/"
+"code] ports use a floating-point scalar type."
+msgstr ""
+"La porta [code]value/code] utilizza un tipo di vettore 3D, mentre le porte "
+"[code]input min[/code], [code]output min[/code] e [code]output max[/code] "
+"utilizzano un tipo di scalare in virgola mobile."
+
+msgid ""
+"The [code]value[/code] port uses a 4D vector type, while the [code]input min[/"
+"code], [code]input max[/code], [code]output min[/code], and [code]output max[/"
+"code] ports use a floating-point scalar type."
+msgstr ""
+"La porta [code]value/code] utilizza un tipo di vettore 4D, mentre le porte "
+"[code]input min[/code], [code]output min[/code] e [code]output max[/code] "
+"utilizzano un tipo di scalare in virgola mobile."
+
 msgid ""
 "A node that allows rerouting a connection within the visual shader graph."
 msgstr ""
@@ -147431,6 +174755,14 @@ msgstr ""
 msgid "Returns the connection state. See [enum ConnectionState]."
 msgstr "Restituisce lo stato di connessione. Vedi [enum ConnectionState]."
 
+msgid ""
+"Returns the ICE [enum GatheringState] of the connection. This lets you "
+"detect, for example, when collection of ICE candidates has finished."
+msgstr ""
+"Restituisce lo stato di raccolta ICE ([enum GatheringState]) della "
+"connessione. Ciò consente di rilevare, ad esempio, quando la raccolta dei "
+"candidati ICE è terminata."
+
 msgid ""
 "Returns the signaling state on the local end of the connection while "
 "connecting or reconnecting to another peer."
@@ -147884,6 +175216,45 @@ msgstr ""
 "stato. Si prega di fare riferimento alla documentazione specifica del browser "
 "per ulteriori dettagli."
 
+msgid ""
+"Connects to the given URL. TLS certificates will be verified against the "
+"hostname when connecting using the [code]wss://[/code] protocol. You can pass "
+"the optional [param tls_client_options] parameter to customize the trusted "
+"certification authorities, or disable the common name verification. See "
+"[method TLSOptions.client] and [method TLSOptions.client_unsafe].\n"
+"[b]Note:[/b] This method is non-blocking, and will return [constant OK] "
+"before the connection is established as long as the provided parameters are "
+"valid and the peer is not in an invalid state (e.g. already connected). "
+"Regularly call [method poll] (e.g. during [Node] process) and check the "
+"result of [method get_ready_state] to know whether the connection succeeds or "
+"fails.\n"
+"[b]Note:[/b] To avoid mixed content warnings or errors in Web, you may have "
+"to use a [param url] that starts with [code]wss://[/code] (secure) instead of "
+"[code]ws://[/code]. When doing so, make sure to use the fully qualified "
+"domain name that matches the one defined in the server's TLS certificate. Do "
+"not connect directly via the IP address for [code]wss://[/code] connections, "
+"as it won't match with the TLS certificate."
+msgstr ""
+"Si collega all'URL indicato. I certificati TLS saranno verificati contro il "
+"nome host durante la connessione utilizzando il protocollo [code]wss://[/"
+"code]. È possibile passare il parametro opzionale [param tls_client_options] "
+"per personalizzare le autorità di certificazione attendibili, o disabilitare "
+"la verifica dei nomi comuni. Vedi [method TLSOptions.client] e [method "
+"TLSOptions.client_unsafe].\n"
+"[b]Nota:[/b] Questo metodo non è bloccante e restituirà [costante OK] prima "
+"che la connessione venga stabilita, a patto che i parametri forniti siano "
+"validi e il peer non si trovi in uno stato non valido (ad esempio, già "
+"connesso). Chiama regolarmente [method poll] (ad esempio, durante il processo "
+"di un [Node]) e controlla il risultato di [method get_ready_state] per sapere "
+"se la connessione riesce o fallisce.\n"
+"[b]Nota:[/b] Per evitare avvisi o errori di contenuti misti in Web, potresti "
+"dover usare un [param url] che inizia con [code]wss://[/code] (sicuro) invece "
+"di [code]ws://[/code]. In questo modo, assicurati di utilizzare il nome di "
+"dominio completamente qualificato che corrisponde a quello definito nel "
+"certificato TLS del server. Non collegare direttamente tramite l'indirizzo IP "
+"per le connessioni [code]wss://[/code], in quanto non corrisponde al "
+"certificato TLS."
+
 msgid ""
 "Returns the received WebSocket close frame status code, or [code]-1[/code] "
 "when the connection was not cleanly closed. Only call this method when "
@@ -148664,6 +176035,9 @@ msgstr ""
 msgid "Emitted when [member visibility_state] has changed."
 msgstr "Emesso quando [member visibility_state] è cambiato."
 
+msgid "We don't know the target ray mode."
+msgstr "Non conosciamo la modalità del raggio di destinazione."
+
 msgid ""
 "Target ray originates at the viewer's eyes and points in the direction they "
 "are looking."
@@ -149223,6 +176597,15 @@ msgstr ""
 "ridimensionato. L'aspetto di base è determinato da [member "
 "content_scale_size]."
 
+msgid ""
+"Specifies the base scale of [Window]'s content when its [member size] is "
+"equal to [member content_scale_size]. See also [method Viewport."
+"get_stretch_transform]."
+msgstr ""
+"Specifica la scala di base del contenuto di [Window] quando la sua [member "
+"size] è uguale a [member content_scale_size]. Vedi anche [method Viewport."
+"get_stretch_transform]."
+
 msgid "Specifies how the content is scaled when the [Window] is resized."
 msgstr ""
 "Specifica come il contenuto viene scalato quando il [Window] viene "
@@ -149343,6 +176726,76 @@ msgstr ""
 "Windows.\n"
 "[b]Nota:[/b] Questa proprietà funziona solamente con le finestre native."
 
+msgid ""
+"Sets a polygonal region of the window which accepts mouse events. Mouse "
+"events outside the region will be passed through.\n"
+"Passing an empty array will disable passthrough support (all mouse events "
+"will be intercepted by the window, which is the default behavior).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Set region, using Path2D node.\n"
+"$Window.mouse_passthrough_polygon = $Path2D.curve.get_baked_points()\n"
+"\n"
+"# Set region, using Polygon2D node.\n"
+"$Window.mouse_passthrough_polygon = $Polygon2D.polygon\n"
+"\n"
+"# Reset region to default.\n"
+"$Window.mouse_passthrough_polygon = []\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Set region, using Path2D node.\n"
+"GetNode<Window>(\"Window\").MousePassthroughPolygon = "
+"GetNode<Path2D>(\"Path2D\").Curve.GetBakedPoints();\n"
+"\n"
+"// Set region, using Polygon2D node.\n"
+"GetNode<Window>(\"Window\").MousePassthroughPolygon = "
+"GetNode<Polygon2D>(\"Polygon2D\").Polygon;\n"
+"\n"
+"// Reset region to default.\n"
+"GetNode<Window>(\"Window\").MousePassthroughPolygon = [];\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] This property is ignored if [member mouse_passthrough] is set to "
+"[code]true[/code].\n"
+"[b]Note:[/b] On Windows, the portion of a window that lies outside the region "
+"is not drawn, while on Linux (X11) and macOS it is.\n"
+"[b]Note:[/b] This property is implemented on Linux (X11), macOS and Windows."
+msgstr ""
+"Imposta una regione poligonale della finestra che accetta eventi del mouse. "
+"Gli eventi del mouse fuori dalla regione saranno passati attraverso.\n"
+"Passare un array vuoto disattiva questa funzionalità (tutti gli eventi del "
+"mouse saranno intercettati dalla finestra, che è il comportamento "
+"predefinito).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Imposta la regione, usando un nodo Path2D.\n"
+"$Window.mouse_passthrough_polygon = $Path2D.curve.get_baked_points()\n"
+"\n"
+"# Imposta la regione, usando un nodo Polygon2D.\n"
+"$Window.mouse_passthrough_polygon = $Polygon2D.polygon\n"
+"\n"
+"# Ripristina la regione al valore predefinito.\n"
+"$Window.mouse_passthrough_polygon = []\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Imposta la regione, usando un nodo Path2D.\n"
+"GetNode<Window>(\"Window\").MousePassthroughPolygon = "
+"GetNode<Path2D>(\"Path2D\").Curve.GetBakedPoints();\n"
+"\n"
+"// Imposta la regione, usando un nodo Polygon2D.\n"
+"GetNode<Window>(\"Window\").MousePassthroughPolygon = "
+"GetNode<Polygon2D>(\"Polygon2D\").Polygon;\n"
+"\n"
+"// Ripristina la regione al valore predefinito.\n"
+"GetNode<Window>(\"Window\").MousePassthroughPolygon = [];\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Nota:[/b] Questa proprietà è ignorata se [member mouse_passthrough] è "
+"impostato su [code]true[/code].\n"
+"[b]Nota:[/b] Su Windows, la porzione di una finestra che si trova al di fuori "
+"della regione non è disegnata, mentre lo è su Linux (X11) e macOS.\n"
+"[b]Nota:[/b] Questa proprietà è implementata su Linux (X11), macOS e Windows."
+
 msgid ""
 "If [code]true[/code], the [Window] will be considered a popup. Popups are sub-"
 "windows that don't show as separate windows in system's window manager's "
@@ -149373,6 +176826,17 @@ msgstr ""
 "[b]Nota:[/b] Questa proprietà funziona solo se [member inizial_position] è "
 "impostato su [constant WINDOW_INITIAL_POSITION_ABSOLUTE]."
 
+msgid ""
+"If [code]true[/code], the [Window] will override the OS window style to "
+"display sharp corners.\n"
+"[b]Note:[/b] This property is implemented only on Windows (11).\n"
+"[b]Note:[/b] This property only works with native windows."
+msgstr ""
+"Se [code]true[/code], il [Window] sostituirà lo stile della finestra per "
+"visualizzare angoli acuti.\n"
+"[b]Nota:[/b] Questa proprietà è implementata solo su Windows (11).\n"
+"[b]Nota:[/b] Questa proprietà funziona solamente con le finestre native."
+
 msgid "The window's size in pixels."
 msgstr "Le dimensioni della finestra in pixel."
 
@@ -149498,6 +176962,34 @@ msgstr ""
 "a una risoluzione inferiore).\n"
 "[b]Nota:[/b] Implementato solo su macOS."
 
+msgid ""
+"Emitted when files are dragged from the OS file manager and dropped in the "
+"game window. The argument is a list of file paths.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    get_window().files_dropped.connect(on_files_dropped)\n"
+"\n"
+"func on_files_dropped(files):\n"
+"    print(files)\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This signal only works with native windows, i.e. the main window "
+"and [Window]-derived nodes when [member Viewport.gui_embed_subwindows] is "
+"disabled in the main viewport."
+msgstr ""
+"Emesso quando dei file sono trascinati dal gestore di file del sistema "
+"operativo e rilasciati nella finestra di gioco. L'argomento è una lista di "
+"percorsi dei file.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    get_viewport().files_dropped.connect(on_files_dropped)\n"
+"\n"
+"func on_files_dropped(files):\n"
+"    print(files)\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Questo segnale funziona solo con le finestre native, cioè la "
+"finestra principale e nodi derivati da [Window] quando [member Viewport."
+"gui_embed_subwindows] è disabilitato nella viewport principale."
+
 msgid "Emitted when the [Window] gains focus."
 msgstr "Emesso quando il [Window] viene focalizzato."
 
@@ -149534,6 +177026,10 @@ msgstr ""
 "Viewport.gui_disable_input] è [code]false[/code] e indipendentemente se è "
 "attualmente focalizzata o meno."
 
+msgid "Emitted when window title bar text is changed."
+msgstr ""
+"Emesso quando il testo nella barra del titolo della finestra viene modificato."
+
 msgid ""
 "Emitted when window title bar decorations are changed, e.g. macOS window "
 "enter/exit full screen mode, or extend-to-title flag is changed."
@@ -149583,6 +177079,46 @@ msgstr ""
 "scene. Invece, tutti gli aggiornamenti degli elementi del tema possono essere "
 "applicati subito quando il nodo entra nell'albero di scene."
 
+msgid ""
+"A single window full screen mode. This mode has less overhead, but only one "
+"window can be open on a given screen at a time (opening a child window or "
+"application switching will trigger a full screen transition).\n"
+"Full screen window covers the entire display area of a screen and has no "
+"border or decorations. The display's video mode is not changed.\n"
+"[b]On Android:[/b] This enables immersive mode.\n"
+"[b]On Windows:[/b] Depending on video driver, full screen transition might "
+"cause screens to go black for a moment.\n"
+"[b]On macOS:[/b] A new desktop is used to display the running project. "
+"Exclusive full screen mode prevents Dock and Menu from showing up when the "
+"mouse pointer is hovering the edge of the screen.\n"
+"[b]On Linux (X11):[/b] Exclusive full screen mode bypasses compositor.\n"
+"[b]Note:[/b] Regardless of the platform, enabling full screen will change the "
+"window size to match the monitor's size. Therefore, make sure your project "
+"supports [url=$DOCS_URL/tutorials/rendering/multiple_resolutions."
+"html]multiple resolutions[/url] when enabling full screen mode."
+msgstr ""
+"Modalità a schermo intero con una sola finestra. Questa modalità è più "
+"efficiente, ma può essere aperta solo una finestra alla volta su un "
+"determinato schermo (l'apertura di una finestra secondaria o il cambio di "
+"applicazione attiverà una transizione dallo schermo intero).\n"
+"La finestra a schermo intero copre l'intera area di visualizzazione di uno "
+"schermo e non ha bordi o decorazioni. La modalità video del display non "
+"cambia.\n"
+"[b]Su Android:[/b] Questo abilita la modalità immersiva.\n"
+"[b]Su Windows:[/b] A seconda del driver video, la transizione allo schermo "
+"intero potrebbe causare lo spegnimento momentaneo dello schermo.\n"
+"[b]Su macOS:[/b] È utilizzato un nuovo desktop per visualizzare il progetto "
+"in esecuzione. La modalità a schermo intero esclusiva impedisce che Dock e "
+"Menu vengano visualizzati quando il puntatore del mouse passa sul bordo dello "
+"schermo.\n"
+"[b]Su Linux (X11):[/b] La modalità a schermo intero esclusiva ignora il "
+"compositore.\n"
+"[b]Nota:[/b] A prescindere dalla piattaforma, abilitando lo schermo intero si "
+"modificheranno le dimensioni della finestra in modo che corrispondano alle "
+"dimensioni del monitor. Pertanto, assicurati che il tuo progetto supporti "
+"[url=$DOCS_URL/tutorials/rendering/multiple_resolutions.html]diverse "
+"risoluzioni[/url] quando abiliti la modalità a schermo intero."
+
 msgid ""
 "The window can't be resized by dragging its resize grip. It's still possible "
 "to resize the window using [member size]. This flag is ignored for full "
@@ -149624,8 +177160,9 @@ msgid ""
 "The window can't be focused. No-focus window will ignore all input, except "
 "mouse clicks. Set with [member unfocusable]."
 msgstr ""
-"La finestra non può essere focalizzata. La finestra senza focus ignorerà "
-"tutti gli input, tranne i clic del mouse. Impostato con [member unfocusable]."
+"La finestra non può essere focalizzata. La finestra impossibile da "
+"focalizzare ignorerà tutti gli input, tranne i clic del mouse. Impostato con "
+"[member unfocusable]."
 
 msgid ""
 "Window is part of menu or [OptionButton] dropdown. This flag can't be changed "
@@ -149671,6 +177208,15 @@ msgstr ""
 "stessa applicazione.\n"
 "[b]Nota:[/b] Questa opzione non ha effetto nelle finestre integrate."
 
+msgid ""
+"Window style is overridden, forcing sharp corners.\n"
+"[b]Note:[/b] This flag has no effect in embedded windows.\n"
+"[b]Note:[/b] This flag is implemented only on Windows (11)."
+msgstr ""
+"Lo stile della finestra è sostituito, forzando angoli acuti.\n"
+"[b]Nota:[/b] Questo flag non ha effetto nelle finestre incorporate.\n"
+"[b]Nota:[/b] Questo flag è implementato solo su Windows (11)."
+
 msgid "Max value of the [enum Flags]."
 msgstr "Valore massimo del [enum Flags]."
 
@@ -149766,6 +177312,10 @@ msgid "Automatic layout direction, determined from the current locale."
 msgstr ""
 "Direzione di layout automatica, determinata dalla localizzazione attuale."
 
+msgid "Automatic layout direction, determined from the system locale."
+msgstr ""
+"Direzione di layout automatica, determinata dalla localizzazione del sistema."
+
 msgid "Initial window position is determined by [member position]."
 msgstr ""
 "La posizione iniziale della finestra è determinata da [member position]."
@@ -150235,6 +177785,31 @@ msgstr ""
 "Una forma di confine del mondo 3D (mezzo spazio) utilizzata per la collisione "
 "fisica."
 
+msgid ""
+"A 3D world boundary shape, intended for use in physics. "
+"[WorldBoundaryShape3D] works like an infinite plane that forces all physics "
+"bodies to stay above it. The [member plane]'s normal determines which "
+"direction is considered as \"above\" and in the editor, the line over the "
+"plane represents this direction. It can for example be used for endless flat "
+"floors.\n"
+"[b]Note:[/b] When the physics engine is set to [b]Jolt Physics[/b] in the "
+"project settings ([member ProjectSettings.physics/3d/physics_engine]), "
+"[WorldBoundaryShape3D] has a finite size (centered at the shape's origin). It "
+"can be adjusted by changing [member ProjectSettings.physics/jolt_physics_3d/"
+"limits/world_boundary_shape_size]."
+msgstr ""
+"Una forma di confine 3D del mondo, pensata per l'uso in fisica. "
+"[WorldBoundaryShape3D] funziona come una linea retta infinita che costringe "
+"tutti i corpi fisici a rimanere sopra di essa. La normale del [member plane] "
+"determina quale direzione è considerata \"sopra\" e nell'editor, la linea "
+"sopra il piano rappresenta questa direzione. Può essere utilizzata, ad "
+"esempio, per pavimenti piatti infiniti.\n"
+"[b]Nota:[/b] quando il motore fisico è impostato su [b]Jolt Physics[/b] nelle "
+"impostazioni del progetto ([member ProjectSettings.physics/3d/"
+"physics_engine]), [WorldBoundaryShape3D] ha una dimensione finita (centrata "
+"sull'origine della forma). Può essere regolata modificando [member "
+"ProjectSettings.physics/jolt_physics_3d/limits/world_boundary_shape_size]."
+
 msgid "The [Plane] used by the [WorldBoundaryShape3D] for collision."
 msgstr "Il [Plane] usato dal [WorldBoundaryShape3D] per la collisione."
 
@@ -150763,9 +178338,21 @@ msgstr "Articolazione della punta della testa."
 msgid "Left shoulder joint."
 msgstr "Articolazione della spalla sinistra."
 
+msgid "Left upper arm joint."
+msgstr "Articolazione del braccio superiore sinistro."
+
+msgid "Left lower arm joint."
+msgstr "Articolazione dell'avambraccio sinistro."
+
 msgid "Right shoulder joint."
 msgstr "Articolazione della spalla destra."
 
+msgid "Right upper arm joint."
+msgstr "Articolazione del braccio superiore destro."
+
+msgid "Right lower arm joint."
+msgstr "Articolazione dell'avambraccio destro."
+
 msgid "Left upper leg joint."
 msgstr "Articolazione della coscia sinistra."
 
@@ -150982,6 +178569,64 @@ msgstr ""
 "Un nodo telecamera con alcune regole predefinite per AR/VR applicate, come il "
 "tracciamento della posizione."
 
+msgid ""
+"This is a helper 3D node for our camera. Note that, if stereoscopic rendering "
+"is applicable (VR-HMD), most of the camera properties are ignored, as the HMD "
+"information overrides them. The only properties that can be trusted are the "
+"near and far planes.\n"
+"The position and orientation of this node is automatically updated by the XR "
+"Server to represent the location of the HMD if such tracking is available and "
+"can thus be used by game logic. Note that, in contrast to the XR Controller, "
+"the render thread has access to the most up-to-date tracking data of the HMD "
+"and the location of the XRCamera3D can lag a few milliseconds behind what is "
+"used for rendering as a result."
+msgstr ""
+"Questo è un nodo 3D di supporto per la nostra telecamera; si noti che, se è "
+"applicabile il rendering stereoscopico (VR-HMD), la maggior parte delle "
+"proprietà della telecamera saranno ignorate, poiché le informazioni HMD le "
+"sovrascrivono. Le uniche proprietà di cui ci si può fidare sono i piani "
+"vicino e lontano.\n"
+"La posizione e l'orientamento di questo nodo sono aggiornati automaticamente "
+"dal server XR per rappresentare la posizione dell'HMD se tale tracciamento è "
+"disponibile e può quindi essere utilizzato dalla logica di gioco. Si noti "
+"che, a differenza del controller XR, il thread di rendering ha accesso ai "
+"dati di tracciamento più aggiornati dell'HMD e la posizione di XRCamera3D può "
+"essere in ritardo di alcuni millisecondi rispetto a ciò che è utilizzato per "
+"il rendering."
+
+msgid "A 3D node representing a spatially-tracked controller."
+msgstr "Un nodo 3D che rappresenta un controller tracciato nello spazio."
+
+msgid ""
+"This is a helper 3D node that is linked to the tracking of controllers. It "
+"also offers several handy passthroughs to the state of buttons and such on "
+"the controllers.\n"
+"Controllers are linked by their ID. You can create controller nodes before "
+"the controllers are available. If your game always uses two controllers (one "
+"for each hand), you can predefine the controllers with ID 1 and 2; they will "
+"become active as soon as the controllers are identified. If you expect "
+"additional controllers to be used, you should react to the signals and add "
+"XRController3D nodes to your scene.\n"
+"The position of the controller node is automatically updated by the "
+"[XRServer]. This makes this node ideal to add child nodes to visualize the "
+"controller.\n"
+"As many XR runtimes now use a configurable action map all inputs are named."
+msgstr ""
+"Questo è un nodo 3D di supporto collegato al tracciamento dei controller. "
+"Offre anche diversi utili passthrough allo stato dei pulsanti e simili sui "
+"controller.\n"
+"I controller sono collegati tramite il loro ID. È possibile creare nodi "
+"controller prima che i controller siano disponibili. Se il tuo gioco utilizza "
+"sempre due controller (uno per ogni mano), puoi predefinire i controller con "
+"ID 1 e 2; diventeranno attivi non appena i controller saranno identificati. "
+"Se prevedi che siano utilizzati controller aggiuntivi, dovresti reagire ai "
+"segnali e aggiungere nodi XRController3D alla tua scena.\n"
+"La posizione del nodo controller è aggiornata automaticamente dal [XRServer]. "
+"Ciò rende questo nodo ideale per aggiungere nodi figlio per visualizzare il "
+"controller.\n"
+"Poiché molti runtime di XR ora utilizzano una mappa di azioni configurabile, "
+"tutti gli input hanno un nome."
+
 msgid ""
 "Returns a numeric value for the input with the given [param name]. This is "
 "used for triggers and grip sensors."
@@ -151952,6 +179597,46 @@ msgid "Returns [code]true[/code] if this interface supports passthrough."
 msgstr ""
 "Restituisce [code]true[/code] se questa interfaccia supporta il passthrough."
 
+msgid ""
+"Sets the active environment blend mode.\n"
+"[param mode] is the environment blend mode starting with the next frame.\n"
+"[b]Note:[/b] Not all runtimes support all environment blend modes, so it is "
+"important to check this at startup. For example:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    var xr_interface = XRServer.find_interface(\"OpenXR\")\n"
+"    if xr_interface and xr_interface.is_initialized():\n"
+"        var vp = get_viewport()\n"
+"        vp.use_xr = true\n"
+"        var acceptable_modes = [XRInterface.XR_ENV_BLEND_MODE_OPAQUE, "
+"XRInterface.XR_ENV_BLEND_MODE_ADDITIVE]\n"
+"        var modes = xr_interface.get_supported_environment_blend_modes()\n"
+"        for mode in acceptable_modes:\n"
+"            if mode in modes:\n"
+"                xr_interface.set_environment_blend_mode(mode)\n"
+"                break\n"
+"[/codeblock]"
+msgstr ""
+"Imposta la modalità di fusione dell'ambiente attivo.\n"
+"[param mode] è la modalità di fusione dell'ambiente a partire dal fotogramma "
+"successivo.\n"
+"[b]Nota:[/b] Non tutti i runtime supportano tutte le modalità di fusione "
+"dell'ambiente, quindi è importante verificarlo all'avvio. Ad esempio:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    var xr_interface = XRServer.find_interface(\"OpenXR\")\n"
+"    if xr_interface and xr_interface.is_initialized():\n"
+"        var vp = get_viewport()\n"
+"        vp.use_xr = true\n"
+"        var acceptable_modes = [XRInterface.XR_ENV_BLEND_MODE_OPAQUE, "
+"XRInterface.XR_ENV_BLEND_MODE_ADDITIVE]\n"
+"        var modes = xr_interface.get_supported_environment_blend_modes()\n"
+"        for mode in acceptable_modes:\n"
+"            if mode in modes:\n"
+"                xr_interface.set_environment_blend_mode(mode)\n"
+"                break\n"
+"[/codeblock]"
+
 msgid ""
 "Sets the active play area mode, will return [code]false[/code] if the mode "
 "can't be used with this interface.\n"
@@ -152369,6 +180054,10 @@ msgstr ""
 "Restituisce un [RID] valido per una texture su cui dovremmo renderizzare il "
 "frame attuale, se supportato dall'interfaccia."
 
+msgid "A 3D node that has its position automatically updated by the [XRServer]."
+msgstr ""
+"Un nodo 3D la cui posizione è aggiornata automaticamente dal [XRServer]."
+
 msgid ""
 "This node can be bound to a specific pose of a [XRPositionalTracker] and will "
 "automatically have its [member Node3D.transform] updated by the [XRServer]. "
@@ -152552,6 +180241,30 @@ msgstr ""
 msgid "The linear velocity of this pose."
 msgstr "La velocità lineare di questa posa."
 
+msgid ""
+"The name of this pose. Usually, this name is derived from an action map set "
+"up by the user. Godot also suggests some pose names that [XRInterface] "
+"objects are expected to implement:\n"
+"- [code]root[/code] is the root location, often used for tracked objects that "
+"do not have further nodes.\n"
+"- [code]aim[/code] is the tip of a controller with its orientation pointing "
+"outwards, often used for raycasts.\n"
+"- [code]grip[/code] is the location where the user grips the controller.\n"
+"- [code]skeleton[/code] is the root location for a hand mesh, when using hand "
+"tracking and an animated skeleton is supplied by the XR runtime."
+msgstr ""
+"Il nome di questa posa. Di solito, questo nome è derivato da una mappa di "
+"azioni configurata dall'utente. Godot suggerisce inoltre alcuni nomi di pose "
+"che gli oggetti [XRInterface] dovrebbero implementare:\n"
+"- [code]root[/code] è la posizione radice, spesso utilizzata per gli oggetti "
+"tracciati che non hanno ulteriori nodi.\n"
+"- [code]aim[/code] è la punta di un controller con l'orientamento rivolto "
+"verso l'esterno, spesso usato per i raycast.\n"
+"- [code]grip[/code] è la posizione in cui l'utente afferra il controller\n"
+"- [code]skeleton[/code] è la posizione radice di una mesh di mano, quando si "
+"utilizza il tracciamento della mano e uno scheletro animato è fornito dal "
+"runtime XR."
+
 msgid ""
 "The tracking confidence for this pose, provides insight on how accurate the "
 "spatial positioning of this record is."
@@ -153043,6 +180756,44 @@ msgstr ""
 "L'intensità utilizzata per calcolare la mappa di densità VRS. Maggiore è "
 "questo valore, più evidente è la VRS."
 
+msgid "Allows the creation of ZIP files."
+msgstr "Consente la creazione di file ZIP."
+
+msgid ""
+"This class implements a writer that allows storing the multiple blobs in a "
+"ZIP archive. See also [ZIPReader] and [PCKPacker].\n"
+"[codeblock]\n"
+"# Create a ZIP archive with a single file at its root.\n"
+"func write_zip_file():\n"
+"    var writer = ZIPPacker.new()\n"
+"    var err = writer.open(\"user://archive.zip\")\n"
+"    if err != OK:\n"
+"        return err\n"
+"    writer.start_file(\"hello.txt\")\n"
+"    writer.write_file(\"Hello World\".to_utf8_buffer())\n"
+"    writer.close_file()\n"
+"\n"
+"    writer.close()\n"
+"    return OK\n"
+"[/codeblock]"
+msgstr ""
+"Questa classe implementa uno scrittore che permette di memorizzare vari blob "
+"in un archivio ZIP. Vedi anche [ZIPReader] e [PCKPacker]\n"
+"[codeblock]\n"
+"# Crea un archivio ZIP con un solo file nella sua radice.\n"
+"func write_zip_file():\n"
+"    var writer = ZIPPacker.new()\n"
+"    var err = writer.open(\"user://archive.zip\")\n"
+"    if err != OK:\n"
+"        return err\n"
+"    writer.start_file(\"hello.txt\")\n"
+"    writer.write_file(\"Hello World\".to_utf8_buffer())\n"
+"    writer.close_file()\n"
+"\n"
+"    writer.close()\n"
+"    return OK\n"
+"[/codeblock]"
+
 msgid "Closes the underlying resources used by this instance."
 msgstr "Chiude le risorse sottostanti utilizzate da questa istanza."
 
@@ -153091,6 +180842,9 @@ msgstr ""
 msgid "Add new files to the existing zip archive at the given path."
 msgstr "Aggiunge nuovi file all'archivio zip esistente al percorso dato."
 
+msgid "Allows reading the content of a ZIP file."
+msgstr "Consente di leggere il contenuto di un file ZIP."
+
 msgid ""
 "Returns [code]true[/code] if the file exists in the loaded zip archive.\n"
 "Must be called after [method open]."
diff --git a/engine/doc/translations/ru.po b/engine/doc/translations/ru.po
new file mode 100644
index 00000000..7a1dfbc8
--- /dev/null
+++ b/engine/doc/translations/ru.po
@@ -0,0 +1,38583 @@
+# Russian translation of the Godot Engine class reference.
+# Copyright (c) 2014-present Godot Engine contributors.
+# Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.
+# This file is distributed under the same license as the Godot source code.
+#
+# Alex <Alex.Gorichev@protonmail.com>, 2020.
+# Nikita <Kulacnikita@ya.ru>, 2020.
+# Алексей Смирнов <tir74@mail.ru>, 2020, 2021, 2022.
+# Chaosus89 <chaosus89@gmail.com>, 2020.
+# John Smith <19georginos97@gmail.com>, 2020.
+# NeoLan Qu <it.bulla@mail.ru>, 2020.
+# Danil Alexeev <danil@alexeev.xyz>, 2020, 2021, 2023.
+# Mazhar Gören <mazhargoren3@gmail.com>, 2020.
+# Valentine <hehboe@gmail.com>, 2020.
+# GreyCat <grey_cat0@mail.ru>, 2020.
+# Pierre Stempin <pierre.stempin@gmail.com>, 2020.
+# Ilya Brin <wim-norder@yandex.com>, 2020.
+# Artroms <artromskiy.git@gmail.com>, 2021.
+# narrnika <narr13niki@gmail.com>, 2021.
+# TB Designes <tb.designes@gmail.com>, 2021.
+# Alex Ty <drowerer@gmail.com>, 2021.
+# Anna Malinovskaia <tacitcoast@gmail.com>, 2021.
+# Poq Xert <poqxert@poqxert.ru>, 2021.
+# Чтабс <chtabs2k19@gmail.com>, 2021.
+# Nikita Blizniuk <BliznyukNM@gmail.com>, 2021.
+# Сергей Волков <zerosar4@gmail.com>, 2021.
+# Alexander Sinitsyn <almoig747@gmail.com>, 2021, 2022.
+# Толя Богомолов <tolya.bogomolov2004@gmail.com>, 2021.
+# Rustam Alieskerov <rustam.aleskerov7@gmail.com>, 2021, 2022.
+# Vladimir Svity <development.openworld@gmail.com>, 2021.
+# SuperProCoolName <minzatov.2004@mail.ru>, 2021.
+# GameOverCode <thefguyplayeriwbt@gmail.com>, 2021.
+# trolley813 <trolleybus.1329@gmail.com>, 2021.
+# artem <artem999.r@protonmail.com>, 2021.
+# Werryx <artoops@mail.ru>, 2022.
+# Eugene <oukey311@gmail.com>, 2022.
+# 140bpmdubstep <maksim.afonin.1927@bk.ru>, 2022.
+# Алексей Зотов <ancrad@yandex.ru>, 2022.
+# Russkikh Michail <summersay415@gmail.com>, 2022.
+# Kirill Slesarenok <s.k.s.10.09.2001@gmail.com>, 2022.
+# Иван Гай <yfrde615@gmail.com>, 2022.
+# Bebihindra <denisk.chebotarev@mail.ru>, 2022.
+# Alex_Faction <creeponedead@gmail.com>, 2022, 2024.
+# Turok Chukchin <chukchinturok@gmail.com>, 2022.
+# Rish Alternative <ii4526668@gmail.com>, 2022.
+# Andrey <stre10k@mail.ru>, 2022.
+# Smadjavul <o1985af@gmail.com>, 2022.
+# Bozhko Artyom Dmitrievich <jek_sun@mail.ru>, 2022.
+# FuzzMix <fmwolfiechad@gmail.com>, 2022.
+# МАН69К <weblate@mah69k.net>, 2022.
+# Vadim Mitroshkin <Vadim7540@yandex.ru>, 2022.
+# SonicStalker Games <dmitriyusolsev1971@gmail.com>, 2022.
+# Kedr <lava20121991@gmail.com>, 2022.
+# Lost Net <pc.mirkn@gmail.com>, 2022, 2023.
+# Vladimir Kirillovskiy <vladimir.kirillovskiy@gmail.com>, 2022.
+# motismob <evt.mixail@ya.ru>, 2022.
+# Handsless coder <yfintktajy1@gmail.com>, 2022.
+# Evgeniy Khramov <thejenjagamertjg@gmail.com>, 2022, 2023.
+# Григорий <bolon667@gmail.com>, 2022.
+# Artur Leonov (Depish) <depish.eskry@yandex.ru>, 2022.
+# Patrik <avdmur@gmail.com>, 2022, 2023.
+# Alexander Alexeev <dergluck@gmail.com>, 2023.
+# Playmore Dev <playmoredevelop@gmail.com>, 2023.
+# Alexandr Lis <WhiteTailledFox@ya.ru>, 2023.
+# Yunis Nabiyev <yunisnabiyev2@gmail.com>, 2023.
+# Vladislav Pesterev <vlad171vlad@gmail.com>, 2023.
+# Кордис Ди <psevdoejik@gmail.com>, 2023.
+# Eugene One <elevencupoftea@gmail.com>, 2023.
+# Animaliss <Zernon001@mail.ru>, 2023.
+# W Red <elyeen777greating@gmail.com>, 2023.
+# Nikita <svinuhov.nikita@gmail.com>, 2023.
+# Огненный рыцарь <demon776854@gmail.com>, 2023.
+# ZIP2020 <folstagking@gmail.com>, 2023.
+# Plizik <channelofplizik@gmail.com>, 2023.
+# Kulagin Daniel <ksda989@gmail.com>, 2023.
+# MaksKraft <makskraft35@gmail.com>, 2023.
+# Jester1337 <gaymer56channel@gmail.com>, 2023.
+# Maxim Raklo <raklovus@yandex.ru>, 2023.
+# Daniil Zimchuk <danrus228zk@gmail.com>, 2023.
+# Hunter342 <www.Hunter342@yandex.ru>, 2023.
+# Rodion Furtov <rodionfurtov@yandex.ru>, 2023.
+# Ilia Brykin <brykin.ilia@gmail.com>, 2023.
+# Mikhail Sychev <m.w.s@bk.ru>, 2023.
+# Ruslan <vovavalenkov15@gmail.com>, 2023, 2024.
+# DLushin <dmiyashyt@gmail.com>, 2023.
+# Maxi fox <oleksijyerukh@gmail.com>, 2023.
+# Blezz Rot <markus.jenya04@yandex.ru>, 2023.
+# a-d-polevoi <a.d.polevoi@gmail.com>, 2023.
+# Affir Vega <feskow.ilya@ya.ru>, 2023.
+# Atom-FG <PochemuchkaSP@yandex.ru>, 2023.
+# Kirill <kiriiri@bk.ru>, 2023.
+# suprohub <suprohub@gmail.com>, 2024.
+# Saveliy <jitropolit@gmail.com>, 2024.
+# Ivan Oranchuk <oranchukivan@gmail.com>, 2024.
+# Danil Fadeev <fadeev-da26@yandex.ru>, 2024.
+# ShaniZ <dmitry.prihodko2007@mail.ru>, 2024.
+# vvv331 <vvv331vvv@gmail.com>, 2024.
+# Val Zay <valervalerkin@gmail.com>, 2024.
+# viktordino <truehorrorwebsite@gmail.com>, 2024.
+# Evgeniy Khramov <65224669+thejenja@users.noreply.github.com>, 2024.
+# qvapelsin <ya.yaroshko@gmail.com>, 2024.
+# Ipwnik ЗАКРЫТО <mineconhoogy@gmail.com>, 2024.
+# Error <72194218+DARK-coder-create@users.noreply.github.com>, 2024.
+# Dauren <xizet7@gmail.com>, 2024.
+# Wertyfire <sw405@yandex.ru>, 2024.
+# EVOR <evormen@gmail.com>, 2024.
+# Vyber <vyber777@gmail.com>, 2024.
+# Даниил Магомедов <magomedov.daniil.72@gmail.com>, 2024.
+# Vladimir Chistov <wchistow@yandex.ru>, 2024.
+# Александр Лис <a.shinakov@it366.ru>, 2024.
+# UltraTaber <ultra_taber@mail.ru>, 2024.
+# Nick Sabinin <sabnk.optictelecom@gmail.com>, 2024.
+# Kira Young <kirayoung1007@gmail.com>, 2024.
+# qwojj <budakovnikita2006@gmail.com>, 2024, 2025.
+# Dainis K <bonanzaaa.mad@gmail.com>, 2024.
+# name <marsapo4ta@yandex.ru>, 2024.
+# VladnotVlad <vladislavfarulin567@gmail.com>, 2024.
+# Dimas007 <dima.shturmavik@gmail.com>, 2024.
+# EdwardBrok <edikbrok@yandex.ru>, 2024.
+# СТАРЫЙ ХЛЕБ <ctapiuxleb1@gmail.com>, 2024.
+# Kiril Yakymchuk <stbestich@gmail.com>, 2025.
+# Arseniy <arseniy-selin-2004@yandex.ru>, 2025.
+# arkology <arkology11@gmail.com>, 2025.
+# Unkwealth <unkwealth@users.noreply.hosted.weblate.org>, 2025.
+# Kirill Sergeev <thepunkoff@gmail.com>, 2025.
+# ghKoty <kirabovkun09@gmail.com>, 2025.
+# Mister Ky <afanasievsergiy3524@gmail.com>, 2025.
+# Belonogov Nikolay <nikolai.belonogov@vk.team>, 2025.
+# Andrey Razin <AndreyRazinWork@yandex.ru>, 2025.
+# Deniil <danpko@ya.ru>, 2025.
+# spantamano <i.m.promo@bk.ru>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: Godot Engine class reference\n"
+"Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
+"PO-Revision-Date: 2025-03-19 05:10+0000\n"
+"Last-Translator: Deniil <danpko@ya.ru>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
+"godot-class-reference/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.11-dev\n"
+
+msgid "All classes"
+msgstr "Все классы"
+
+msgid "Globals"
+msgstr "Глобальные"
+
+msgid "Nodes"
+msgstr "Узлы"
+
+msgid "Resources"
+msgstr "Ресурсы"
+
+msgid "Editor-only"
+msgstr "Только для редактора"
+
+msgid "Other objects"
+msgstr "Другие объекты"
+
+msgid "Variant types"
+msgstr "Вариативные типы"
+
+msgid "Description"
+msgstr "Описание"
+
+msgid "Tutorials"
+msgstr "Обучающие материалы"
+
+msgid "Properties"
+msgstr "Свойства"
+
+msgid "Constructors"
+msgstr "Конструкторы"
+
+msgid "Methods"
+msgstr "Методы"
+
+msgid "Operators"
+msgstr "Операторы"
+
+msgid "Theme Properties"
+msgstr "Свойства темы"
+
+msgid "Signals"
+msgstr "Сигналы"
+
+msgid "Enumerations"
+msgstr "Перечисления"
+
+msgid "Constants"
+msgstr "Константы"
+
+msgid "Annotations"
+msgstr "Аннотации"
+
+msgid "Property Descriptions"
+msgstr "Описания свойств"
+
+msgid "Constructor Descriptions"
+msgstr "Описания конструктора"
+
+msgid "Method Descriptions"
+msgstr "Описания метода"
+
+msgid "Operator Descriptions"
+msgstr "Описания оператора"
+
+msgid "Theme Property Descriptions"
+msgstr "Описания свойств темы"
+
+msgid "Inherits:"
+msgstr "Наследует:"
+
+msgid "Inherited By:"
+msgstr "Наследуется от:"
+
+msgid "(overrides %s)"
+msgstr "(переопределяет %s)"
+
+msgid "Default"
+msgstr "По умолчанию"
+
+msgid "Setter"
+msgstr "Сеттер"
+
+msgid "value"
+msgstr "значение"
+
+msgid "Getter"
+msgstr "Геттер"
+
+msgid ""
+"This method should typically be overridden by the user to have any effect."
+msgstr ""
+"Этот метод обычно должен быть переопределен пользователем, чтобы иметь какой-"
+"либо эффект."
+
+msgid ""
+"This method has no side effects. It doesn't modify any of the instance's "
+"member variables."
+msgstr ""
+"Этот метод не имеет побочных эффектов. Он не изменяет ни одну из переменных-"
+"членов экземпляра."
+
+msgid ""
+"This method accepts any number of arguments after the ones described here."
+msgstr "Этот метод принимает любое количество аргументов после описанных здесь."
+
+msgid "This method is used to construct a type."
+msgstr "Этот метод используется для создания типа."
+
+msgid ""
+"This method doesn't need an instance to be called, so it can be called "
+"directly using the class name."
+msgstr ""
+"Этот метод не нуждается в вызове экземпляра, поэтому его можно вызвать "
+"напрямую, используя имя класса."
+
+msgid ""
+"This method describes a valid operator to use with this type as left-hand "
+"operand."
+msgstr ""
+"Этот метод описывает допустимый оператор для использования с этим типом в "
+"качестве левого операнда."
+
+msgid "This value is an integer composed as a bitmask of the following flags."
+msgstr ""
+"Это значение является целым числом, составленным как битовая маска следующих "
+"флагов."
+
+msgid "No return value."
+msgstr "Нет возвращаемого значения."
+
+msgid ""
+"There is currently no description for this class. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания класса нет. Пожалуйста помогите нам :ref:`предложив "
+"таковой <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this signal. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этого сигнала нет. Пожалуйста помогите нам :ref:"
+"`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this enum. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этого сигнала нет. Пожалуйста помогите нам :ref:"
+"`предложив <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this constant. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этой константы нет. Пожалуйста помогите нам :ref:"
+"`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this annotation. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этой аннотации нет. Пожалуйста помогите нам :ref:"
+"`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this property. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этого свойства нет. Пожалуйста помогите нам :ref:"
+"`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this constructor. Please help us by :"
+"ref:`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этого конструктора нет. Пожалуйста помогите нам :"
+"ref:`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this method. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этого метода нет. Пожалуйста помогите нам :ref:"
+"`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this operator. Please help us by :ref:"
+"`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этого оператора нет. Пожалуйста помогите нам :ref:"
+"`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There is currently no description for this theme property. Please help us by :"
+"ref:`contributing one <doc_updating_the_class_reference>`!"
+msgstr ""
+"На данный момент описания этого параметра темы нет. Пожалуйста помогите нам :"
+"ref:`предложив таковое <doc_updating_the_class_reference>`!"
+
+msgid ""
+"There are notable differences when using this API with C#. See :ref:"
+"`doc_c_sharp_differences` for more information."
+msgstr ""
+"Существуют заметные различия при использовании данного API с C#. Подробнее "
+"см. :ref:`doc_c_sharp_differences`."
+
+msgid "Deprecated:"
+msgstr "Устарело:"
+
+msgid "Experimental:"
+msgstr "Экспериментальное:"
+
+msgid "This signal may be changed or removed in future versions."
+msgstr "Этот сигнал может быть изменён или удалён в будущих версиях."
+
+msgid "This constant may be changed or removed in future versions."
+msgstr "Эта постоянная может быть изменена или удалена в будущих версиях."
+
+msgid "This property may be changed or removed in future versions."
+msgstr "Это свойство может быть изменено или удалено в будущих версиях."
+
+msgid "This constructor may be changed or removed in future versions."
+msgstr "Этот конструктор может быть изменён или удалён в будущих версиях."
+
+msgid "This method may be changed or removed in future versions."
+msgstr "Этот метод может быть изменён или удалён в будущих версиях."
+
+msgid "This operator may be changed or removed in future versions."
+msgstr "Этот оператор может быть изменён или удалён в будущих версиях."
+
+msgid "This theme property may be changed or removed in future versions."
+msgstr "Это свойство темы может быть изменено или удалено в будущих версиях."
+
+msgid "Built-in GDScript constants, functions, and annotations."
+msgstr "Встроенные в GDScript константы, функции и аннотации."
+
+msgid ""
+"A list of utility functions and annotations accessible from any script "
+"written in GDScript.\n"
+"For the list of global functions and constants that can be accessed in any "
+"scripting language, see [@GlobalScope]."
+msgstr ""
+"Список служебных функций и аннотаций, доступных из любого скрипта, "
+"написанного на GDScript.\n"
+"Список глобальных функций и констант, к которым можно обращаться в любом "
+"скриптовом языке, см. в [@GlobalScope]."
+
+msgid "GDScript exports"
+msgstr "Экспорт GDScript"
+
+msgid "Use [method Color.from_rgba8] instead."
+msgstr "Вместо этого используйте [method Color.from_rgba8]."
+
+msgid ""
+"Returns a [Color] constructed from red ([param r8]), green ([param g8]), blue "
+"([param b8]), and optionally alpha ([param a8]) integer channels, each "
+"divided by [code]255.0[/code] for their final value. Using [method Color8] "
+"instead of the standard [Color] constructor is useful when you need to match "
+"exact color values in an [Image].\n"
+"[codeblock]\n"
+"var red = Color8(255, 0, 0)             # Same as Color(1, 0, 0).\n"
+"var dark_blue = Color8(0, 0, 51)        # Same as Color(0, 0, 0.2).\n"
+"var my_color = Color8(306, 255, 0, 102) # Same as Color(1.2, 1, 0, 0.4).\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Due to the lower precision of [method Color8] compared to the "
+"standard [Color] constructor, a color created with [method Color8] will "
+"generally not be equal to the same color created with the standard [Color] "
+"constructor. Use [method Color.is_equal_approx] for comparisons to avoid "
+"issues with floating-point precision error."
+msgstr ""
+"Возвращает [Цвет], построенный из красного ([параметр r8]), зеленого "
+"([параметр g8]), синего ([параметр b8]) и, по желанию, альфа ([параметр a8]) "
+"целочисленных каналов, каждый делится на [code]255.0[/code] для получения "
+"конечного значения. Использование [метода Color8] вместо стандартного "
+"конструктора [Color] полезно когда нужно точно соответствовать значения цвета "
+"в [Image].\n"
+"[codeblock].\n"
+"var red = Color8(255, 0, 0)                            # То же самое, что "
+"Color(1, 0, 0).\n"
+"var dark_blue = Color8(0, 0, 51)                # То же, что Color(0, 0, "
+"0.2).\n"
+"var my_color = Color8(306, 255, 0, 102) # То же, что Color(1.2, 1, 0, 0.4).\n"
+"[/codeblock].\n"
+"[b]Примечание:[/b] Из-за меньшей точности [метода Color8] по сравнению со "
+"стандартным конструктором [Color], цвет созданный с [метода Color8] обычно не "
+"будет равен тому же цвету созданному с помощью стандартного конструктора "
+"[Color]. Используйте [методa Color.is_equal_approx] для сравнений чтобы "
+"избежать проблем с ошибкой точности плавающей точки."
+
+msgid ""
+"Asserts that the [param condition] is [code]true[/code]. If the [param "
+"condition] is [code]false[/code], an error is generated. When running from "
+"the editor, the running project will also be paused until you resume it. This "
+"can be used as a stronger form of [method @GlobalScope.push_error] for "
+"reporting errors to project developers or add-on users.\n"
+"An optional [param message] can be shown in addition to the generic "
+"\"Assertion failed\" message. You can use this to provide additional details "
+"about why the assertion failed.\n"
+"[b]Warning:[/b] For performance reasons, the code inside [method assert] is "
+"only executed in debug builds or when running the project from the editor. "
+"Don't include code that has side effects in an [method assert] call. "
+"Otherwise, the project will behave differently when exported in release "
+"mode.\n"
+"[codeblock]\n"
+"# Imagine we always want speed to be between 0 and 20.\n"
+"var speed = -10\n"
+"assert(speed < 20) # True, the program will continue.\n"
+"assert(speed >= 0) # False, the program will stop.\n"
+"assert(speed >= 0 and speed < 20) # You can also combine the two conditional "
+"statements in one check.\n"
+"assert(speed < 20, \"the speed limit is 20\") # Show a message.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] [method assert] is a keyword, not a function. So you cannot "
+"access it as a [Callable] or use it inside expressions."
+msgstr ""
+"Проверяет, что [param condition] равно [code]true[/code]. Если [param "
+"condition] равно [code]false[/code], будет сгенерирована ошибка. Если "
+"запущено из редактора, запущенный проект также будет приостановлен, пока вы "
+"не возобновите его. Это может быть использовано как более сильная форма "
+"[method @GlobalScope.push_error] для сообщения об ошибках разработчикам "
+"проекта или пользователям дополнений.\n"
+"Необязательное [param message] может быть показано в добавление к "
+"универсальному сообщению \"Assertion failed\". Вы можете предоставить "
+"дополнительные детали о том, почему ваше утверждение не удалось.\n"
+"[b]Примечание:[/b] В целях оптимизации, код внутри [method assert] "
+"исполняется только в отладочных сборках, или когда вы запускаете проект из "
+"редактора . Не добавляйте дополнительный код, у которого есть побочные "
+"эффекты в вызове [method assert]. В противном случае, проект будет вести себя "
+"по-другому при экспорте в режиме релиза.\n"
+"[codeblock]\n"
+"# Предположим, вы хотите, чтобы скорость (speed) была между 0 и 20.\n"
+"var speed = -10\n"
+"assert(speed < 20) # True, программа продолжит выполнение.\n"
+"assert(speed >= 0) # False, программа будет остановлена.\n"
+"assert(speed >= 0 and speed < 20) # Вы также можете комбинировать два "
+"условных выражения в одной проверке.\n"
+"assert(speed < 20, \"лимит скорости равен 20\") # Показывает сообщение.\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] [method assert] это ключевое слово, а не функция. Поэтому "
+"вы не можете обращаться к нему как к [Callable] или использовать внутри "
+"выражений."
+
+msgid ""
+"Returns a single character (as a [String]) of the given Unicode code point "
+"(which is compatible with ASCII code).\n"
+"[codeblock]\n"
+"var upper = char(65)      # upper is \"A\"\n"
+"var lower = char(65 + 32) # lower is \"a\"\n"
+"var euro = char(8364)     # euro is \"€\"\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает один символ (в виде [Строки]) заданной кодовой точки Unicode "
+"(совместимой с кодом ASCII).\n"
+"[codeblock]\n"
+"var upper = char(65)      # upper is \"A\"\n"
+"var lower = char(65 + 32) # lower is \"a\"\n"
+"var euro = char(8364)     # euro is \"€\"\n"
+"[/codeblock]"
+
+msgid "Use [method @GlobalScope.type_convert] instead."
+msgstr "Вместо этого используйте [method @GlobalScope.type_convert]."
+
+msgid ""
+"Converts [param what] to [param type] in the best way possible. The [param "
+"type] uses the [enum Variant.Type] values.\n"
+"[codeblock]\n"
+"var a = [4, 2.5, 1.2]\n"
+"print(a is Array) # Prints true\n"
+"\n"
+"var b = convert(a, TYPE_PACKED_BYTE_ARRAY)\n"
+"print(b)          # Prints [4, 2, 1]\n"
+"print(b is Array) # Prints false\n"
+"[/codeblock]"
+msgstr ""
+"Преобразует [param what] в [param type] наилучшим образом. Тип [param type] "
+"использует значения [enum Variant.Type].\n"
+"[codeblock].\n"
+"var a = [4, 2.5, 1.2]\n"
+"print(a is Array) # Выводит true\n"
+"\n"
+"var b = convert(a, TYPE_PACKED_BYTE_ARRAY)\n"
+"print(b)                 # Выводит [4, 2, 1]\n"
+"print(b is Array) # Выводит false\n"
+"[/codeblock]"
+
+msgid ""
+"Consider using [method JSON.to_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Вместо этого используйте [метод JSON.to_native] или [метод Object."
+"get_property_list]."
+
+msgid ""
+"Converts a [param dictionary] (created with [method inst_to_dict]) back to an "
+"Object instance. Can be useful for deserializing."
+msgstr ""
+"Преобразует словарь [param dictionary] (ранее созданный с помощью [method "
+"inst_to_dict]) обратно в экземпляр объекта. Полезно для десериализации."
+
+msgid ""
+"Returns an array of dictionaries representing the current call stack. See "
+"also [method print_stack].\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    foo()\n"
+"\n"
+"func foo():\n"
+"    bar()\n"
+"\n"
+"func bar():\n"
+"    print(get_stack())\n"
+"[/codeblock]\n"
+"Starting from [code]_ready()[/code], [code]bar()[/code] would print:\n"
+"[codeblock lang=text]\n"
+"[{function:bar, line:12, source:res://script.gd}, {function:foo, line:9, "
+"source:res://script.gd}, {function:_ready, line:6, source:res://script.gd}]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This function only works if the running instance is connected to "
+"a debugging server (i.e. an editor instance). [method get_stack] will not "
+"work in projects exported in release mode, or in projects exported in debug "
+"mode if not connected to a debugging server.\n"
+"[b]Note:[/b] Calling this function from a [Thread] is not supported. Doing so "
+"will return an empty array."
+msgstr ""
+"Возвращает массив словарей, представляющий текущий стек вызовов. См. также "
+"[method print_stack].\n"
+"[codeblock]\n"
+"func _ready()\n"
+"        foo()\n"
+"\n"
+"func foo():\n"
+"\tbar()\n"
+"\n"
+"func bar():\n"
+"\tprint(get_stack())\n"
+"[/codeblock]\n"
+"Начиная с [code]_ready()[/code], [code]bar()[/code] выведет:\n"
+"[codeblock]\n"
+"[{function:bar, line:12, source:res://script.gd}, {function:foo, line:9, "
+"source:res://script.gd}, {function:_ready, line:6, source:res://script.gd}]\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Эта функция работает только при подключенном сервере "
+"отладки (например в редакторе). [method get_stack] не будет работать в "
+"проектах, экспортированных в режиме релиза или в проектах экспортированных в "
+"режиме отладки, если они не подключены к серверу отладки.\n"
+"[b]Примечание:[/b] Вызов этой функции из потока невозможен, будет возвращён "
+"пустой список."
+
+msgid ""
+"Consider using [method JSON.from_native] or [method Object.get_property_list] "
+"instead."
+msgstr ""
+"Вместо этого используйте [метод JSON.from_native] или [метод Object."
+"get_property_list]."
+
+msgid ""
+"Returns the passed [param instance] converted to a Dictionary. Can be useful "
+"for serializing.\n"
+"[codeblock]\n"
+"var foo = \"bar\"\n"
+"func _ready():\n"
+"    var d = inst_to_dict(self)\n"
+"    print(d.keys())\n"
+"    print(d.values())\n"
+"[/codeblock]\n"
+"Prints out:\n"
+"[codeblock lang=text]\n"
+"[@subpath, @path, foo]\n"
+"[, res://test.gd, bar]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This function can only be used to serialize objects with an "
+"attached [GDScript] stored in a separate file. Objects without an attached "
+"script, with a script written in another language, or with a built-in script "
+"are not supported.\n"
+"[b]Note:[/b] This function is not recursive, which means that nested objects "
+"will not be represented as dictionaries. Also, properties passed by reference "
+"([Object], [Dictionary], [Array], and packed arrays) are copied by reference, "
+"not duplicated."
+msgstr ""
+"Возвращает переданный [param instance], преобразованный в словарь. Может быть "
+"полезен для сериализации.\n"
+"[codeblock].\n"
+"var foo = «bar»\n"
+"func _ready():\n"
+"    var d = inst_to_dict(self)\n"
+"    print(d.keys())\n"
+"    print(d.values())\n"
+"[/codeblock].\n"
+"Выводит:\n"
+"[codeblock lang=text]\n"
+"[@subpath, @path, foo]\n"
+"[, res://test.gd, bar]\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Эта функция может быть использована только для "
+"сериализации объектов с вложенным [GDScript], хранящимся в отдельном файле. "
+"Объекты без вложенного скрипта, со скриптом, написанным на другом языке, или "
+"со встроенным скриптом не поддерживаются.\n"
+"[b]Примечание:[/b] Эта функция не является рекурсивной, что означает, что "
+"вложенные объекты не будут представлены в виде словарей. Кроме того, "
+"свойства, передаваемые по ссылке ([Object], [Dictionary], [Array] и "
+"упакованные массивы), копируются по ссылке, а не дублируются."
+
+msgid ""
+"Returns [code]true[/code] if [param value] is an instance of [param type]. "
+"The [param type] value must be one of the following:\n"
+"- A constant from the [enum Variant.Type] enumeration, for example [constant "
+"TYPE_INT].\n"
+"- An [Object]-derived class which exists in [ClassDB], for example [Node].\n"
+"- A [Script] (you can use any class, including inner one).\n"
+"Unlike the right operand of the [code]is[/code] operator, [param type] can be "
+"a non-constant value. The [code]is[/code] operator supports more features "
+"(such as typed arrays). Use the operator instead of this method if you do not "
+"need dynamic type checking.\n"
+"[b]Examples:[/b]\n"
+"[codeblock]\n"
+"print(is_instance_of(a, TYPE_INT))\n"
+"print(is_instance_of(a, Node))\n"
+"print(is_instance_of(a, MyClass))\n"
+"print(is_instance_of(a, MyClass.InnerClass))\n"
+"[/codeblock]\n"
+"[b]Note:[/b] If [param value] and/or [param type] are freed objects (see "
+"[method @GlobalScope.is_instance_valid]), or [param type] is not one of the "
+"above options, this method will raise a runtime error.\n"
+"See also [method @GlobalScope.typeof], [method type_exists], [method Array."
+"is_same_typed] (and other [Array] methods)."
+msgstr ""
+"Возвращает [code]true[/code] если [param value] является экземпляром [param "
+"type]. Значение [param type] должно быть одним из следующих:\n"
+"- Константа из [enum Variant.Type] перечисляемого, для примера [constant "
+"TYPE_INT].\n"
+"- [Object]-производный класс, который существует в [ClassDB], для примера "
+"[Node].\n"
+"- [Script] (Вы можете использовать любой класс, включая внутренний).\n"
+"В отличии от правильного операнда оператора [code]is[/code], [param type] "
+"может быть изменяемым значением. Оператор [code]is[/code] поддерживает больше "
+"функций (такие как типизированные множества) и это болеe производительное. "
+"Используйте оператор вместо этого метода если Вам не нужна динамическая "
+"проверка типов.\n"
+"[b]Примеры:[/b]\n"
+"[codeblock]\n"
+"print(is_instance_of(a, TYPE_INT))\n"
+"print(is_instance_of(a, Node))\n"
+"print(is_instance_of(a, MyClass))\n"
+"print(is_instance_of(a, MyClass.InnerClass))\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Если [param value] и/или [param type] освобожденные "
+"объекты (смотри [method @GlobalScope.is_instance_valid]), или [param type] не "
+"из опций сверху, этот метод создаст ошибку запуска.\n"
+"Смотрите также [method @GlobalScope.typeof], [method type_exists], [method "
+"Array.is_same_typed] (И другие методы [Array])."
+
+msgid ""
+"Returns the length of the given Variant [param var]. The length can be the "
+"character count of a [String] or [StringName], the element count of any array "
+"type, or the size of a [Dictionary]. For every other Variant type, a run-time "
+"error is generated and execution is stopped.\n"
+"[codeblock]\n"
+"var a = [1, 2, 3, 4]\n"
+"len(a) # Returns 4\n"
+"\n"
+"var b = \"Hello!\"\n"
+"len(b) # Returns 6\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает длину указанного Variant [param var]. Длина может быть количеством "
+"символов [String] или [StringName], количеством элементов любого типа массива "
+"или размером [Dictionary]. Для любого другого типа Variant генерируется "
+"ошибка времени выполнения и выполнение останавливается.\n"
+"[codeblock]\n"
+"a = [1, 2, 3, 4]\n"
+"len(a) # Вернёт 4\n"
+"\n"
+"b = \"Hello!\"\n"
+"len(b) # Вернёт 6\n"
+"[/codeblock]"
+
+msgid ""
+"Returns a [Resource] from the filesystem located at the absolute [param "
+"path]. Unless it's already referenced elsewhere (such as in another script or "
+"in the scene), the resource is loaded from disk on function call, which might "
+"cause a slight delay, especially when loading large scenes. To avoid "
+"unnecessary delays when loading something multiple times, either store the "
+"resource in a variable or use [method preload]. This method is equivalent of "
+"using [method ResourceLoader.load] with [constant ResourceLoader."
+"CACHE_MODE_REUSE].\n"
+"[b]Note:[/b] Resource paths can be obtained by right-clicking on a resource "
+"in the FileSystem dock and choosing \"Copy Path\", or by dragging the file "
+"from the FileSystem dock into the current script.\n"
+"[codeblock]\n"
+"# Load a scene called \"main\" located in the root of the project directory "
+"and cache it in a variable.\n"
+"var main = load(\"res://main.tscn\") # main will contain a PackedScene "
+"resource.\n"
+"[/codeblock]\n"
+"[b]Important:[/b] Relative paths are [i]not[/i] relative to the script "
+"calling this method, instead it is prefixed with [code]\"res://\"[/code]. "
+"Loading from relative paths might not work as expected.\n"
+"This function is a simplified version of [method ResourceLoader.load], which "
+"can be used for more advanced scenarios.\n"
+"[b]Note:[/b] Files have to be imported into the engine first to load them "
+"using this function. If you want to load [Image]s at run-time, you may use "
+"[method Image.load]. If you want to import audio files, you can use the "
+"snippet described in [member AudioStreamMP3.data].\n"
+"[b]Note:[/b] If [member ProjectSettings.editor/export/"
+"convert_text_resources_to_binary] is [code]true[/code], [method @GDScript."
+"load] will not be able to read converted files in an exported project. If you "
+"rely on run-time loading of files present within the PCK, set [member "
+"ProjectSettings.editor/export/convert_text_resources_to_binary] to "
+"[code]false[/code]."
+msgstr ""
+"Возвращает данные вида [Resource] из файловой системы, расположенный по "
+"абсолютному адресу [param path]. Если на ресурс уже присутствуют ссылки в "
+"другом месте (например, в другом скрипте или сцене), он загружается с диска "
+"при вызове функции, что может вызвать небольшую задержку, особенно при "
+"загрузке больших сцен. Чтобы избежать ненужных задержек при многократной "
+"загрузке, храните ресурс в переменной, либо используйте [method preload]. "
+"Этот способ является эквивалентом [method ResourceLoader.load] с параметром "
+"[constant ResourceLoader.CACHE_MODE_REUSE].\n"
+"[b]Примечание:[/b] Пути к ресурсам можно получить, щелкнув правой кнопкой "
+"мыши на нужном ресурсе в окне файлов проекта и выбрав опцию \"Скопировать "
+"путь\", или перетащив файл из окна файлов проекта в текущий сценарий.\n"
+"[codeblock]\n"
+"# Загрузите сцену с наименованием \"main\", расположенную в корне каталога "
+"проекта, и кэшируйте ее в переменную.\n"
+"var main = load(\"res://main.tscn\") # main будет содержать ресурс типа "
+"\"Сжатая сцена\".\n"
+"[/codeblock]\n"
+"[b]Важно:[/b] Относительные пути [i] не [/i] относятся к скрипту, вызывающему "
+"этот метод, вместо этого он имеет префикс [code]\"res://\"[/code]. Загрузка "
+"из относительных путей может работать не так, как ожидалось.\n"
+"Данная функция является упрощенной версией [method ResourceLoader.load], "
+"которую можно использовать для более сложных сценариев.\n"
+"[b]Примечание:[/b] Для загрузки файлов с помощью этой функции, их необходимо "
+"предварительно импортировать в движок. Если требуется загрузить [Image] во "
+"время выполнения, можно использовать [method Image.load]. Если вам необходимо "
+"импортировать аудиофайлы, вы можете воспользоваться фрагментом, описанным в "
+"[member AudioStreamMP3.data].\n"
+"[b]Примечание:[/b] Если параметр [member ProjectSettings.editor/export/"
+"convert_text_resources_to_binary] имеет значение [code]true[/code], то "
+"[method @GDScript.load] не сможет прочитать преобразованные файлы в "
+"экспортируемом проекте. Если вы полагаетесь на подгрузку по ходу работы "
+"проекта файлов, присутствующих в пакете \"PCK\", во время выполнения проекта, "
+"установите параметр [member ProjectSettings.editor/export/"
+"convert_text_resources_to_binary] как [code]false[/code]."
+
+msgid ""
+"Returns a [Resource] from the filesystem located at [param path]. During run-"
+"time, the resource is loaded when the script is being parsed. This function "
+"effectively acts as a reference to that resource. Note that this function "
+"requires [param path] to be a constant [String]. If you want to load a "
+"resource from a dynamic/variable path, use [method load].\n"
+"[b]Note:[/b] Resource paths can be obtained by right-clicking on a resource "
+"in the Assets Panel and choosing \"Copy Path\", or by dragging the file from "
+"the FileSystem dock into the current script.\n"
+"[codeblock]\n"
+"# Create instance of a scene.\n"
+"var diamond = preload(\"res://diamond.tscn\").instantiate()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] [method preload] is a keyword, not a function. So you cannot "
+"access it as a [Callable]."
+msgstr ""
+"Возвращает ресурс [Resource] из файловой системы, расположенной по адресу "
+"[param path]. Во время выполнения скрипта ресурс загружается при разборе "
+"скрипта. Эта функция фактически выступает в качестве ссылки на этот ресурс. "
+"Обратите внимание, что данная функция требует, чтобы [param path] был "
+"константой [String]. Если необходимо загрузить ресурс из динамического/"
+"переменного пути, используйте [method load].\n"
+"[b]Примечание:[/b] Пути к ресурсам можно получить, щелкнув правой кнопкой "
+"мыши на ресурсе в панели активов и выбрав \"Copy Path\", или перетащив файл "
+"из дока FileSystem в текущий скрипт.\n"
+"[codeblock]\n"
+"# Создаем экземпляр сцены.\n"
+"var diamond = preload(\"res://diamond.tscn\").instantiate()\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] [method preload] - это ключевое слово, а не функция. "
+"Поэтому вы не можете получить к нему доступ как к [Callable]."
+
+msgid ""
+"Like [method @GlobalScope.print], but includes the current stack frame when "
+"running with the debugger turned on.\n"
+"The output in the console may look like the following:\n"
+"[codeblock lang=text]\n"
+"Test print\n"
+"At: res://test.gd:15:_process()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Calling this function from a [Thread] is not supported. Doing so "
+"will instead print the thread ID."
+msgstr ""
+"Аналогично методу @GlobalScope.print, но при выполнении с включенным "
+"отладчиком включает текущий кадр стека.\n"
+"Вывод в консоль может выглядеть следующим образом:\n"
+"[codeblock].\n"
+"Тестовая печать\n"
+"At: res://test.gd:15:_process()\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Вызов этой функции из [Thread] не поддерживается. Вместо "
+"этого будет выведен идентификатор потока."
+
+msgid ""
+"Prints a stack trace at the current code location. See also [method "
+"get_stack].\n"
+"The output in the console may look like the following:\n"
+"[codeblock lang=text]\n"
+"Frame 0 - res://test.gd:16 in function '_process'\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This function only works if the running instance is connected to "
+"a debugging server (i.e. an editor instance). [method print_stack] will not "
+"work in projects exported in release mode, or in projects exported in debug "
+"mode if not connected to a debugging server.\n"
+"[b]Note:[/b] Calling this function from a [Thread] is not supported. Doing so "
+"will instead print the thread ID."
+msgstr ""
+"Выводит трассировку стека в текущем месте кода. См. также [method "
+"get_stack].\n"
+"Вывод в консоль может выглядеть следующим образом:\n"
+"[codeblock].\n"
+"Кадр 0 - res://test.gd:16 в функции '_process'\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Эта функция работает только в том случае, если запущенный "
+"экземпляр подключен к отладочному серверу (т.е. к экземпляру редактора). "
+"[method print_stack] не будет работать в проектах, экспортированных в режиме "
+"release, или в проектах, экспортированных в режиме debug, если они не "
+"подключены к отладочному серверу.\n"
+"[b]Примечание:[/b] Вызов этой функции из [Thread] не поддерживается. Вместо "
+"этого будет выведен идентификатор потока."
+
+msgid ""
+"Returns an array with the given range. [method range] can be called in three "
+"ways:\n"
+"[code]range(n: int)[/code]: Starts from 0, increases by steps of 1, and stops "
+"[i]before[/i] [code]n[/code]. The argument [code]n[/code] is [b]exclusive[/"
+"b].\n"
+"[code]range(b: int, n: int)[/code]: Starts from [code]b[/code], increases by "
+"steps of 1, and stops [i]before[/i] [code]n[/code]. The arguments [code]b[/"
+"code] and [code]n[/code] are [b]inclusive[/b] and [b]exclusive[/b], "
+"respectively.\n"
+"[code]range(b: int, n: int, s: int)[/code]: Starts from [code]b[/code], "
+"increases/decreases by steps of [code]s[/code], and stops [i]before[/i] "
+"[code]n[/code]. The arguments [code]b[/code] and [code]n[/code] are "
+"[b]inclusive[/b] and [b]exclusive[/b], respectively. The argument [code]s[/"
+"code] [b]can[/b] be negative, but not [code]0[/code]. If [code]s[/code] is "
+"[code]0[/code], an error message is printed.\n"
+"[method range] converts all arguments to [int] before processing.\n"
+"[b]Note:[/b] Returns an empty array if no value meets the value constraint (e."
+"g. [code]range(2, 5, -1)[/code] or [code]range(5, 5, 1)[/code]).\n"
+"[b]Examples:[/b]\n"
+"[codeblock]\n"
+"print(range(4))        # Prints [0, 1, 2, 3]\n"
+"print(range(2, 5))     # Prints [2, 3, 4]\n"
+"print(range(0, 6, 2))  # Prints [0, 2, 4]\n"
+"print(range(4, 1, -1)) # Prints [4, 3, 2]\n"
+"[/codeblock]\n"
+"To iterate over an [Array] backwards, use:\n"
+"[codeblock]\n"
+"var array = [3, 6, 9]\n"
+"for i in range(array.size() - 1, -1, -1):\n"
+"    print(array[i])\n"
+"[/codeblock]\n"
+"Output:\n"
+"[codeblock lang=text]\n"
+"9\n"
+"6\n"
+"3\n"
+"[/codeblock]\n"
+"To iterate over [float], convert them in the loop.\n"
+"[codeblock]\n"
+"for i in range (3, 0, -1):\n"
+"    print(i / 10.0)\n"
+"[/codeblock]\n"
+"Output:\n"
+"[codeblock lang=text]\n"
+"0.3\n"
+"0.2\n"
+"0.1\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает массив с указанным диапазоном. [method range] можно вызвать тремя "
+"способами:\n"
+"[code]range(n: int)[/code]: Начинается с 0, увеличивается с шагом 1 и "
+"останавливается [i]перед[/i] [code]n[/code]. Аргумент [code]n[/code] является "
+"[b]исключающим[/b].\n"
+"[code]range(b: int, n: int)[/code]: начинается с [code]b[/code], "
+"увеличивается с шагом 1 и останавливается [i]перед[/i] [code]n[/code]. "
+"Аргументы [code]b[/code] и [code]n[/code] являются [b]включающими[/b] и "
+"[b]исключающими[/b] соответственно.\n"
+"[code]range(b: int, n: int, s: int)[/code]: Начинается с [code]b[/code], "
+"увеличивается/уменьшается с шагом [code]s[/code] и останавливается [i]перед[/"
+"i] [code]n[/code]. Аргументы [code]b[/code] и [code]n[/code] являются "
+"[b]включающими[/b] и [b]исключающими[/b] соответственно. Аргумент [code]s[/"
+"code] [b]может[/b] быть отрицательным, но не [code]0[/code]. Если [code]s[/"
+"code] равен [code]0[/code], выводится сообщение об ошибке.\n"
+"[method range] преобразует все аргументы в [int] перед обработкой.\n"
+"[b]Примечание:[/b] Возвращает пустой массив, если ни одно значение не "
+"соответствует ограничению значения (например, [code]range(2, 5, -1)[/code] "
+"или [code]range(5, 5, 1)[/code]).\n"
+"[b]Примеры:[/b]\n"
+"[codeblock]\n"
+"print(range(4))        # Prints [0, 1, 2, 3]\n"
+"print(range(2, 5))     # Prints [2, 3, 4]\n"
+"print(range(0, 6, 2))  # Prints [0, 2, 4]\n"
+"print(range(4, 1, -1)) # Prints [4, 3, 2]\n"
+"[/codeblock]\n"
+"Чтобы выполнить итерацию по [Array] в обратном направлении, используйте:\n"
+"[codeblock]\n"
+"var array = [3, 6, 9]\n"
+"for i in range(array.size() - 1, -1, -1):\n"
+"    print(array[i])\n"
+"[/codeblock]\n"
+"Получаем на выходе:\n"
+"[codeblock lang=text]\n"
+"9\n"
+"6\n"
+"3\n"
+"[/codeblock]\n"
+"Чтобы выполнить итерацию по [float], преобразуйте их в цикле.\n"
+"[codeblock]\n"
+"for i in range (3, 0, -1):\n"
+"    print(i / 10.0)\n"
+"[/codeblock]\n"
+"Получаем на выходе:\n"
+"[codeblock lang=text]\n"
+"0.3\n"
+"0.2\n"
+"0.1\n"
+"[/codeblock]"
+
+msgid ""
+"Returns [code]true[/code] if the given [Object]-derived class exists in "
+"[ClassDB]. Note that [Variant] data types are not registered in [ClassDB].\n"
+"[codeblock]\n"
+"type_exists(\"Sprite2D\") # Returns true\n"
+"type_exists(\"NonExistentClass\") # Returns false\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает[code]true[/code], если данный [Object]-производный класс "
+"существует ли данный класс в [ClassDB]. Учитывайте, что [Variant] типы данных "
+"не зарегестрированны в [ClassDB].\n"
+"[codeblock]\n"
+"type_exists(\"Sprite2D\") # Возвращает true\n"
+"type_exists(\"NonExistentClass\") # Возвращает false\n"
+"[/codeblock]"
+
+msgid ""
+"Constant that represents how many times the diameter of a circle fits around "
+"its perimeter. This is equivalent to [code]TAU / 2[/code], or 180 degrees in "
+"rotations."
+msgstr ""
+"Константа, которая показывает, сколько раз диаметр окружности укладывается "
+"вокруг её периметра. Это эквивалентно [code]TAU / 2[/code], или повороту на "
+"180 градусов."
+
+msgid ""
+"The circle constant, the circumference of the unit circle in radians. This is "
+"equivalent to [code]PI * 2[/code], or 360 degrees in rotations."
+msgstr ""
+"Константа окружности, длина окружности круга в радианах. Это эквивалентно "
+"числу [code]PI * 2[/code], или повороту в 360 градусов."
+
+msgid ""
+"Positive floating-point infinity. This is the result of floating-point "
+"division when the divisor is [code]0.0[/code]. For negative infinity, use "
+"[code]-INF[/code]. Dividing by [code]-0.0[/code] will result in negative "
+"infinity if the numerator is positive, so dividing by [code]0.0[/code] is not "
+"the same as dividing by [code]-0.0[/code] (despite [code]0.0 == -0.0[/code] "
+"returning [code]true[/code]).\n"
+"[b]Warning:[/b] Numeric infinity is only a concept with floating-point "
+"numbers, and has no equivalent for integers. Dividing an integer number by "
+"[code]0[/code] will not result in [constant INF] and will result in a run-"
+"time error instead."
+msgstr ""
+"Положительная бесконечность с плавающей точкой. Это результат деления с "
+"плавающей точкой, когда делитель равен [code]0.0[/code]. Для отрицательной "
+"бесконечности, используйте [code]-INF[/code]. Деление на [code]-0.0[/code] "
+"приведет к отрицательной бесконечности, если числитель положительный, поэтому "
+"деление на [code]0.0[/code] не то же самое, что деление на [code]-0.0[/code] "
+"(несмотря на то, что [code]0.0 == -0.0[/code] возвращает [code]true[/code]).\n"
+"[b]Внимание:[/b] Числовая бесконечность является понятием только для чисел с "
+"плавающей точкой и не имеет эквивалента для целых чисел. Деление целого числа "
+"на [code]0[/code] не приведет к [constant INF] и вместо этого приведет к "
+"ошибке времени выполнения."
+
+msgid ""
+"\"Not a Number\", an invalid floating-point value. [constant NAN] has special "
+"properties, including that [code]!=[/code] always returns [code]true[/code], "
+"while other comparison operators always return [code]false[/code]. This is "
+"true even when comparing with itself ([code]NAN == NAN[/code] returns "
+"[code]false[/code] and [code]NAN != NAN[/code] returns [code]true[/code]). It "
+"is returned by some invalid operations, such as dividing floating-point "
+"[code]0.0[/code] by [code]0.0[/code].\n"
+"[b]Warning:[/b] \"Not a Number\" is only a concept with floating-point "
+"numbers, and has no equivalent for integers. Dividing an integer [code]0[/"
+"code] by [code]0[/code] will not result in [constant NAN] and will result in "
+"a run-time error instead."
+msgstr ""
+"\"Не число\" (или NaN), недопустимое значение с плавающей точкой. [константа "
+"NAN] обладает особыми свойствами, включая то, что [code]!=[/code] всегда "
+"возвращает результат [code]true[/code], пока другие операторы сравнения "
+"всегда возвращают [code]false[/code]. Это правда даже при сравнении самой "
+"константы с собой ([code]NAN == NAN[/code] возвращает [code]false[/code] и "
+"[code]NAN != NAN[/code] возвращает [code]true[/code]). Она выводится "
+"некоторыми недопустимыми операциями, например, делением числа с плавающей "
+"точкой [code]0.0[/code] на [code]0.0[/code].\n"
+"[b]Внимание:[/b] \"Не число\" (или NaN) является понятием только для чисел с "
+"плавающей точкой и не имеет эквивалента для целых чисел. Деление целого числа "
+"[code]0[/code] на [code]0[/code] не приведет к [constant NAN] и вместо этого "
+"приведет к ошибке времени выполнения."
+
+msgid ""
+"Mark the following property as exported (editable in the Inspector dock and "
+"saved to disk). To control the type of the exported property, use the type "
+"hint notation.\n"
+"[codeblock]\n"
+"extends Node\n"
+"\n"
+"enum Direction {LEFT, RIGHT, UP, DOWN}\n"
+"\n"
+"# Built-in types.\n"
+"@export var string = \"\"\n"
+"@export var int_number = 5\n"
+"@export var float_number: float = 5\n"
+"\n"
+"# Enums.\n"
+"@export var type: Variant.Type\n"
+"@export var format: Image.Format\n"
+"@export var direction: Direction\n"
+"\n"
+"# Resources.\n"
+"@export var image: Image\n"
+"@export var custom_resource: CustomResource\n"
+"\n"
+"# Nodes.\n"
+"@export var node: Node\n"
+"@export var custom_node: CustomNode\n"
+"\n"
+"# Typed arrays.\n"
+"@export var int_array: Array[int]\n"
+"@export var direction_array: Array[Direction]\n"
+"@export var image_array: Array[Image]\n"
+"@export var node_array: Array[Node]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Custom resources and nodes should be registered as global "
+"classes using [code]class_name[/code], since the Inspector currently only "
+"supports global classes. Otherwise, a less specific type will be exported "
+"instead.\n"
+"[b]Note:[/b] Node export is only supported in [Node]-derived classes and has "
+"a number of other limitations."
+msgstr ""
+"Отметьте следующее свойство как экспортированное (его можно редактировать в "
+"панели инспектора и сохранить на диске). Для управления типом экспортируемого "
+"свойства используйте нотацию подсказки типа.\n"
+"[codeblock]\n"
+"extends Node\n"
+"\n"
+"направление перечисления {влево, вправо, вверх, вниз}\n"
+"\n"
+"# встроенных типов.\n"
+"@export var string = \"\"\n"
+"@export var int_number = 5\n"
+"@export var float_number: float = 5\n"
+"\n"
+"# Перечисления\n"
+"@export var type: Variant.Type\n"
+"@export var format: Image.Format\n"
+"@export var direction: Direction\n"
+"\n"
+"# Ресурсы.\n"
+"@export var image: Image\n"
+"@export var custom_resource: CustomResource\n"
+"\n"
+"# Узлы.\n"
+"@export var node: Node\n"
+"@export var custom_node: CustomNode\n"
+"\n"
+"# Типизированные массивы.\n"
+"@export var int_array: Array[int]\n"
+"@export var direction_array: Array[Direction]\n"
+"@export var image_array: Array[Image]\n"
+"@export var node_array: Array[Node]\n"
+"[/codeblock]\n"
+"[b]Примечание.[/b] Пользовательские ресурсы и узлы должны быть "
+"зарегистрированы как глобальные классы с использованием [code]имя_класса[/"
+"code].\n"
+"[b]Примечание:[/b] Экспорт узлов поддерживается только в классах, производных "
+"от [Node], и имеет ряд других ограничений."
+
+msgid ""
+"Define a new category for the following exported properties. This helps to "
+"organize properties in the Inspector dock.\n"
+"See also [constant PROPERTY_USAGE_CATEGORY].\n"
+"[codeblock]\n"
+"@export_category(\"Statistics\")\n"
+"@export var hp = 30\n"
+"@export var speed = 1.25\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Categories in the Inspector dock's list usually divide "
+"properties coming from different classes (Node, Node2D, Sprite, etc.). For "
+"better clarity, it's recommended to use [annotation @export_group] and "
+"[annotation @export_subgroup], instead."
+msgstr ""
+"Определяет новую категорию для следующих экспортируемых свойств. Помогает "
+"организовать свойства в Инспекторском доке.\n"
+"Также просмотрите [constant PROPERTY_USAGE_CATEGORY].\n"
+"[codeblock]\n"
+"@export_category(\"Statistics\")\n"
+"@export var hp = 30\n"
+"@export var speed = 1.25\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Категории в листе Инспекторского дока обычно разделяют "
+"свойства с других классов (Node, Node2D, Sprite, и др.). Для лучшего "
+"понимания, вместо этого рекомендуется использовать [annotation @export_group] "
+"и [annotation @export_subgroup]."
+
+msgid ""
+"Export a [Color], [Array][lb][Color][rb], or [PackedColorArray] property "
+"without allowing its transparency ([member Color.a]) to be edited.\n"
+"See also [constant PROPERTY_HINT_COLOR_NO_ALPHA].\n"
+"[codeblock]\n"
+"@export_color_no_alpha var dye_color: Color\n"
+"@export_color_no_alpha var dye_colors: Array[Color]\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт свойства [Color] без разрешения редактирования его прозрачности "
+"([member Color.a])\n"
+"См. также [constant PROPERTY_HINT_COLOR_NO_ALPHA].\n"
+"[codeblock]\n"
+"@export_color_no_alpha var dye_color: Color\n"
+"@export_color_no_alpha var dye_colors: Array[Color]\n"
+"[/codeblock]"
+
+msgid ""
+"Allows you to set a custom hint, hint string, and usage flags for the "
+"exported property. Note that there's no validation done in GDScript, it will "
+"just pass the parameters to the editor.\n"
+"[codeblock]\n"
+"@export_custom(PROPERTY_HINT_NONE, \"suffix:m\") var suffix: Vector3\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Regardless of the [param usage] value, the [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] flag is always added, as with any explicitly "
+"declared script variable."
+msgstr ""
+"Позволяет устанавливать пользовательскую подсказку, строку подсказки и флаги "
+"использования для экспортируемого свойства. Обратите внимание, что в GDScript "
+"нет проверки, он просто передает параметры в редактор.\n"
+"[codeblock]\n"
+"@export_custom(PROPERTY_HINT_NODE, \"suffix:m\") var suffix: Vector3\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Независимо от значения [param usage] флаг [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] всегда добавляется, как и в случае с любой, "
+"явно объявленной переменной скрипта."
+
+msgid ""
+"Export a [String], [Array][lb][String][rb], or [PackedStringArray] property "
+"as a path to a directory. The path will be limited to the project folder and "
+"its subfolders. See [annotation @export_global_dir] to allow picking from the "
+"entire filesystem.\n"
+"See also [constant PROPERTY_HINT_DIR].\n"
+"[codeblock]\n"
+"@export_dir var sprite_folder_path: String\n"
+"@export_dir var sprite_folder_paths: Array[String]\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт свойства [Sting] как путь к каталогу. Путь будет ограничен папой "
+"проекта и ее вложенными папками. Смотрите [annotation @export_global_dir] для "
+"возможности выбора из всей файловой системы.\n"
+"См. также [constant PROPERTY_HINT_DIR]\n"
+"[codeblock]\n"
+"@export_dir var sprite_folder_path: String\n"
+"@export_dir var sprite_folder_paths: Array[String]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an [int], [String], [Array][lb][int][rb], [Array][lb][String][rb], "
+"[PackedByteArray], [PackedInt32Array], [PackedInt64Array], or "
+"[PackedStringArray] property as an enumerated list of options (or an array of "
+"options). If the property is an [int], then the index of the value is stored, "
+"in the same order the values are provided. You can add explicit values using "
+"a colon. If the property is a [String], then the value is stored.\n"
+"See also [constant PROPERTY_HINT_ENUM].\n"
+"[codeblock]\n"
+"@export_enum(\"Warrior\", \"Magician\", \"Thief\") var character_class: int\n"
+"@export_enum(\"Slow:30\", \"Average:60\", \"Very Fast:200\") var "
+"character_speed: int\n"
+"@export_enum(\"Rebecca\", \"Mary\", \"Leah\") var character_name: String\n"
+"\n"
+"@export_enum(\"Sword\", \"Spear\", \"Mace\") var character_items: Array[int]\n"
+"@export_enum(\"double_jump\", \"climb\", \"dash\") var character_skills: "
+"Array[String]\n"
+"[/codeblock]\n"
+"If you want to set an initial value, you must specify it explicitly:\n"
+"[codeblock]\n"
+"@export_enum(\"Rebecca\", \"Mary\", \"Leah\") var character_name: String = "
+"\"Rebecca\"\n"
+"[/codeblock]\n"
+"If you want to use named GDScript enums, then use [annotation @export] "
+"instead:\n"
+"[codeblock]\n"
+"enum CharacterName {REBECCA, MARY, LEAH}\n"
+"@export var character_name: CharacterName\n"
+"\n"
+"enum CharacterItem {SWORD, SPEAR, MACE}\n"
+"@export var character_items: Array[CharacterItem]\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт [int] или [String] свойства как пронумерованный лист опций. Если "
+"свойство является [int], тогда индекс значения хранится в таком же порядке, "
+"как и предоставлены значения. Вы можете добавить явные значения, используя "
+"двоеточие. Если свойство является [String], тогда значение хранится.\n"
+"Также просмотрите [constant PROPERTY_HINT_ENUM].\n"
+"[codeblock]\n"
+"@export_enum(\"Warrior\", \"Magician\", \"Thief\") var character_class: int\n"
+"@export_enum(\"Slow:30\", \"Average:60\", \"Very Fast:200\") var "
+"character_speed: int\n"
+"@export_enum(\"Rebecca\", \"Mary\", \"Leah\") var character_name: String\n"
+"\n"
+"[/codeblock]\n"
+"Если вы хотите поставить изначальное значение, вы должны указать его явно:\n"
+"[codeblock]\n"
+"@export_enum(\"Rebecca\", \"Mary\", \"Leah\") var character_name: String = "
+"\"Rebecca\"\n"
+"[/codeblock]\n"
+"Если вы хотите использовать перечисления GDScript, тогда используйте вместо "
+"этого [annotation @export].\n"
+"[codeblock]\n"
+"enum CharacterName {REBECCA, MARY, LEAH}\n"
+"@export var character_name: CharacterName\n"
+"\n"
+"enum CharacterItem {SWORD, SPEAR, MACE}\n"
+"@export var character_items: Array[CharacterItem]\n"
+"[/codeblock]"
+
+msgid ""
+"Export a floating-point property with an easing editor widget. Additional "
+"hints can be provided to adjust the behavior of the widget. "
+"[code]\"attenuation\"[/code] flips the curve, which makes it more intuitive "
+"for editing attenuation properties. [code]\"positive_only\"[/code] limits "
+"values to only be greater than or equal to zero.\n"
+"See also [constant PROPERTY_HINT_EXP_EASING].\n"
+"[codeblock]\n"
+"@export_exp_easing var transition_speed\n"
+"@export_exp_easing(\"attenuation\") var fading_attenuation\n"
+"@export_exp_easing(\"positive_only\") var effect_power\n"
+"@export_exp_easing var speeds: Array[float]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует свойство с плавающей точкой с помощью виджета редактора "
+"плавности. Дополнительные подсказки могут быть предоставлены, чтобы "
+"подкорректировать действия виджета. [code]\"attenuation\"[/code] "
+"(\"затухание\") переворачивает ломаную, что делает её более интуитивной для "
+"редактирования свойств затухания. [code]\"positive_only\"[/code] "
+"(\"только_положительные\") ограничивает диапазон значений до 0, тем самым "
+"оставляя только 0 и числа больше 0.\n"
+"Также просмотрите [constant PROPERTY_HINT_EXP_EASING].\n"
+"[codeblock]\n"
+"@export_exp_easing var transition_speed\n"
+"@export_exp_easing(\"attenuation\") var fading_attenuation\n"
+"@export_exp_easing(\"positive_only\") var effect_power\n"
+"@export_exp_easing var speeds: Array[float]\n"
+"[/codeblock]"
+
+msgid ""
+"Export a [String], [Array][lb][String][rb], or [PackedStringArray] property "
+"as a path to a file. The path will be limited to the project folder and its "
+"subfolders. See [annotation @export_global_file] to allow picking from the "
+"entire filesystem.\n"
+"If [param filter] is provided, only matching files will be available for "
+"picking.\n"
+"See also [constant PROPERTY_HINT_FILE].\n"
+"[codeblock]\n"
+"@export_file var sound_effect_path: String\n"
+"@export_file(\"*.txt\") var notes_path: String\n"
+"@export_file var level_paths: Array[String]\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт свойства [string] в виде пути к файл будет ограничен папкой проекта и "
+"ее вложенными папками. Смотрите [annotation @export_global_file] чтобы "
+"разрешить выбор из всей файловой системы.\n"
+"Если указан [param filter], то для выбора будут доступны только подходящие "
+"файлы.\n"
+"См. также [constant PROPERTY_HINT_FILE].\n"
+"[codeblock]\n"
+"@export_file var sound_effect_path: String\n"
+"@export_file(\"*.txt\") var notes_path: String\n"
+"@export_file var level_paths: Array[String]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field. This allows to store several "
+"\"checked\" or [code]true[/code] values with one property, and comfortably "
+"select them from the Inspector dock.\n"
+"See also [constant PROPERTY_HINT_FLAGS].\n"
+"[codeblock]\n"
+"@export_flags(\"Fire\", \"Water\", \"Earth\", \"Wind\") var spell_elements = "
+"0\n"
+"[/codeblock]\n"
+"You can add explicit values using a colon:\n"
+"[codeblock]\n"
+"@export_flags(\"Self:4\", \"Allies:8\", \"Foes:16\") var spell_targets = 0\n"
+"[/codeblock]\n"
+"You can also combine several flags:\n"
+"[codeblock]\n"
+"@export_flags(\"Self:4\", \"Allies:8\", \"Self and Allies:12\", \"Foes:16\")\n"
+"var spell_targets = 0\n"
+"[/codeblock]\n"
+"[b]Note:[/b] A flag value must be at least [code]1[/code] and at most [code]2 "
+"** 32 - 1[/code].\n"
+"[b]Note:[/b] Unlike [annotation @export_enum], the previous explicit value is "
+"not taken into account. In the following example, A is 16, B is 2, C is 4.\n"
+"[codeblock]\n"
+"@export_flags(\"A:16\", \"B\", \"C\") var x\n"
+"[/codeblock]\n"
+"You can also use the annotation on [Array][lb][int][rb], [PackedByteArray], "
+"[PackedInt32Array], and [PackedInt64Array]\n"
+"[codeblock]\n"
+"@export_flags(\"Fire\", \"Water\", \"Earth\", \"Wind\") var phase_elements: "
+"Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт целочисленного свойства в виде поля битового флага. Это позволяет "
+"хранить несколько значений \"checked\" или [code]true[/code] в одном "
+"свойстве, и удобно выбирать их из вкладки дока.\n"
+"См. также [константа PROPERTY_HINT_FLAGS].\n"
+"[codeblock]\n"
+"@export_flags(\"Fire\", \"Water\", \"Earth\", \"Wind\") var spell_elements = "
+"0\n"
+"[/codeblock].\n"
+"Вы можете добавить явные значения с помощью двоеточия:\n"
+"[codeblock]\n"
+"@export_flags(\"Self:4\", \"Allies:8\", \"Foes:16\") var spell_targets = 0\n"
+"[/codeblock].\n"
+"Вы также можете комбинировать несколько флагов:\n"
+"[codeblock]\n"
+"@export_flags(\"Self:4\", \"Allies:8\", \"Self and Allies:12\", \"Foes:16\")\n"
+"var spell_targets = 0\n"
+"[/codeblock].\n"
+"[b]Примечание:[/b] Значение флага должно быть не менее [code]1[/code] и не "
+"более [code]2 ** 32 - 1[/code].\n"
+"[b]Примечание:[/b] В отличие от [annotation @export_enum], предыдущее явное "
+"значение не учитывается. В следующем примере A равно 16, B равно 2, C равно "
+"4.\n"
+"[codeblock]\n"
+"@export_flags(\"A:16\", \"B\", \"C\") var x\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field for 2D navigation layers. The "
+"widget in the Inspector dock will use the layer names defined in [member "
+"ProjectSettings.layer_names/2d_navigation/layer_1].\n"
+"See also [constant PROPERTY_HINT_LAYERS_2D_NAVIGATION].\n"
+"[codeblock]\n"
+"@export_flags_2d_navigation var navigation_layers: int\n"
+"@export_flags_2d_navigation var navigation_layers_array: Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует свойство целого числа как поле битового флага для 2D слоев "
+"навигации. Виджет в вкладке инспектора будет использовать имена слоев, "
+"определённых в [member ProjectSettings.layer_names/2d_navigation/layer_1].\n"
+"Также просмотрите [constant PROPERTY_HINT_LAYERS_2D_NAVIGATION].\n"
+"[codeblock]\n"
+"@export_flags_2d_navigation var navigation_layers: int\n"
+"@export_flags_2d_navigation var navigation_layers_array: Array[int]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field for 2D physics layers. The "
+"widget in the Inspector dock will use the layer names defined in [member "
+"ProjectSettings.layer_names/2d_physics/layer_1].\n"
+"See also [constant PROPERTY_HINT_LAYERS_2D_PHYSICS].\n"
+"[codeblock]\n"
+"@export_flags_2d_physics var physics_layers: int\n"
+"@export_flags_2d_physics var physics_layers_array: Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует свойство целого числа как поле битового флага для 2D физики "
+"слоев. Виджет в окне Инспектора будет использовать имена слоев, определённых "
+"в [member ProjectSettings.layer_names/2d_physics/layer_1].\n"
+"Также просмотрите [constant PROPERTY_HINT_LAYERS_2D_PHYSICS].\n"
+"[codeblock]\n"
+"@export_flags_2d_physics var physics_layers: int\n"
+"@export_flags_2d_physics var physics_layers_array: Array[int]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field for 2D render layers. The "
+"widget in the Inspector dock will use the layer names defined in [member "
+"ProjectSettings.layer_names/2d_render/layer_1].\n"
+"See also [constant PROPERTY_HINT_LAYERS_2D_RENDER].\n"
+"[codeblock]\n"
+"@export_flags_2d_render var render_layers: int\n"
+"@export_flags_2d_render var render_layers_array: Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует свойство целого числа как поле битового флага для рендеринга 2D "
+"слоев. Виджет в окне Инспектора будет использовать имена слоев, указанных в "
+"[member ProjectSettings.layer_names/2d_render/layer_1].\n"
+"Также просмотрите [constant PROPERTY_HINT_LAYERS_2D_RENDER].\n"
+"[codeblock]\n"
+"@export_flags_2d_render var render_layers: int\n"
+"@export_flags_2d_render var render_layers_array: Array[int]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field for 3D navigation layers. The "
+"widget in the Inspector dock will use the layer names defined in [member "
+"ProjectSettings.layer_names/3d_navigation/layer_1].\n"
+"See also [constant PROPERTY_HINT_LAYERS_3D_NAVIGATION].\n"
+"[codeblock]\n"
+"@export_flags_3d_navigation var navigation_layers: int\n"
+"@export_flags_3d_navigation var navigation_layers_array: Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует свойство целого числа как поле битового флага для 3D слоёв "
+"навигации. Виджет в Инспекторском доке будет использовать имена слоёв, "
+"указанных в [member ProjectSettings.layer_names/3d_navigation/layer_1].\n"
+"Также просмотрите [constant PROPERTY_HINT_LAYERS_3D_NAVIGATION].\n"
+"[codeblock]\n"
+"@export_flags_3d_navigation var navigation_layers: int\n"
+"@export_flags_3d_navigation var navigation_layers_array: Array[int]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field for 3D physics layers. The "
+"widget in the Inspector dock will use the layer names defined in [member "
+"ProjectSettings.layer_names/3d_physics/layer_1].\n"
+"See also [constant PROPERTY_HINT_LAYERS_3D_PHYSICS].\n"
+"[codeblock]\n"
+"@export_flags_3d_physics var physics_layers: int\n"
+"@export_flags_3d_physics var physics_layers_array: Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует свойство целого числа как поле битового флага для 3D физических "
+"слоев. Виджет в Инспекторском доке будет использовать имена слоёв, указанных "
+"в [member ProjectSettings.layer_names/3d_physics/layer_1].\n"
+"Также посмотрите [constant PROPERTY_HINT_LAYERS_3D_PHYSICS].\n"
+"[codeblock]\n"
+"@export_flags_3d_physics var physics_layers: int\n"
+"@export_flags_3d_physics var physics_layers_array: Array[int]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field for 3D render layers. The "
+"widget in the Inspector dock will use the layer names defined in [member "
+"ProjectSettings.layer_names/3d_render/layer_1].\n"
+"See also [constant PROPERTY_HINT_LAYERS_3D_RENDER].\n"
+"[codeblock]\n"
+"@export_flags_3d_render var render_layers: int\n"
+"@export_flags_3d_render var render_layers_array: Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует свойство целого числа как поле битового флага для рендеринга 3D "
+"слоев. Виджет в Инспекторском доке будет использовать имена слоёв, указанных "
+"в [member ProjectSettings.layer_names/3d_render/layer_1].\n"
+"Также посмотрите [constant PROPERTY_HINT_LAYERS_3D_RENDER].\n"
+"[codeblock]\n"
+"@export_flags_3d_render var render_layers: int\n"
+"@export_flags_3d_render var render_layers_array: Array[int]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an integer property as a bit flag field for navigation avoidance "
+"layers. The widget in the Inspector dock will use the layer names defined in "
+"[member ProjectSettings.layer_names/avoidance/layer_1].\n"
+"See also [constant PROPERTY_HINT_LAYERS_AVOIDANCE].\n"
+"[codeblock]\n"
+"@export_flags_avoidance var avoidance_layers: int\n"
+"@export_flags_avoidance var avoidance_layers_array: Array[int]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует целочисленное свойство как поле битового флага для навигационных "
+"слоёв избегания. Виджет в Инспекторском доке будет использовать имена слоёв, "
+"объявленных в [member ProjectSettings.layer_names/avoidance/layer_1].\n"
+"Также посмотрите [constant PROPERTY_HINT_LAYERS_AVOIDANCE].\n"
+"[codeblock]\n"
+"@export_flags_avoidance var avoidance_layers: int\n"
+"@export_flags_avoidance var avoidance_layers_array: Array[int]\n"
+"[/codeblock]"
+
+msgid ""
+"Export a [String], [Array][lb][String][rb], or [PackedStringArray] property "
+"as an absolute path to a directory. The path can be picked from the entire "
+"filesystem. See [annotation @export_dir] to limit it to the project folder "
+"and its subfolders.\n"
+"See also [constant PROPERTY_HINT_GLOBAL_DIR].\n"
+"[codeblock]\n"
+"@export_global_dir var sprite_folder_path: String\n"
+"@export_global_dir var sprite_folder_paths: Array[String]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует строковое выражение как абсолютную ссылку на путь к папке. Путь "
+"может быть взят из всей файловой системы. Чтобы ограничиться папкой проекта и "
+"ее вложенными папками, смотрите [annotation @export_dir].\n"
+"Также просмотрите [constant PROPERTY_HINT_GLOBAL_DIR].\n"
+"[codeblock]\n"
+"@export_global_dir var sprite_folder_path: String\n"
+"@export_global_dir var sprite_folder_paths: Array[String]\n"
+"[/codeblock]"
+
+msgid ""
+"Export a [String], [Array][lb][String][rb], or [PackedStringArray] property "
+"as an absolute path to a file. The path can be picked from the entire "
+"filesystem. See [annotation @export_file] to limit it to the project folder "
+"and its subfolders.\n"
+"If [param filter] is provided, only matching files will be available for "
+"picking.\n"
+"See also [constant PROPERTY_HINT_GLOBAL_FILE].\n"
+"[codeblock]\n"
+"@export_global_file var sound_effect_path: String\n"
+"@export_global_file(\"*.txt\") var notes_path: String\n"
+"@export_global_file var multiple_paths: Array[String]\n"
+"[/codeblock]"
+msgstr ""
+"Экспортирует [String] выражение как абсолютный путь к файлу. Путь может быть "
+"взят из всей файловой системы. Используйте [annotation @export_file], чтобы "
+"ограничить его до папок проекта или его подпапок.\n"
+"Если указан [param filter], то для выборки будут доступны только совпадающие "
+"файлы.\n"
+"Также просмотрите [constant PROPERTY_HINT_GLOBAL_FILE].\n"
+"[codeblock]\n"
+"@export_global_file var sound_effect_path: String\n"
+"@export_global_file(\"*.txt\") var notes_path: String\n"
+"@export_global_file var multiple_paths: Array[String]\n"
+"[/codeblock]"
+
+msgid ""
+"Define a new group for the following exported properties. This helps to "
+"organize properties in the Inspector dock. Groups can be added with an "
+"optional [param prefix], which would make group to only consider properties "
+"that have this prefix. The grouping will break on the first property that "
+"doesn't have a prefix. The prefix is also removed from the property's name in "
+"the Inspector dock.\n"
+"If no [param prefix] is provided, then every following property will be added "
+"to the group. The group ends when then next group or category is defined. You "
+"can also force end a group by using this annotation with empty strings for "
+"parameters, [code]@export_group(\"\", \"\")[/code].\n"
+"Groups cannot be nested, use [annotation @export_subgroup] to add subgroups "
+"within groups.\n"
+"See also [constant PROPERTY_USAGE_GROUP].\n"
+"[codeblock]\n"
+"@export_group(\"Racer Properties\")\n"
+"@export var nickname = \"Nick\"\n"
+"@export var age = 26\n"
+"\n"
+"@export_group(\"Car Properties\", \"car_\")\n"
+"@export var car_label = \"Speedy\"\n"
+"@export var car_number = 3\n"
+"\n"
+"@export_group(\"\", \"\")\n"
+"@export var ungrouped_number = 3\n"
+"[/codeblock]"
+msgstr ""
+"Определите новую группу для следующих экспортированных свойств. Это поможет "
+"упорядочить свойства в доке Инспектора. Группы могут быть добавлены с "
+"необязательным префиксом [param prefix], который заставит группу учитывать "
+"только те свойства, которые имеют этот префикс. Группировка прервется на "
+"первом свойстве, не имеющем префикса. Префикс также будет удален из имени "
+"свойства в доке Инспектора.\n"
+"Если префикс [param prefix] не указан, то каждое следующее свойство будет "
+"добавлено в группу. Группа заканчивается, когда определяется следующая группа "
+"или категория. Вы также можете принудительно завершить группу, используя эту "
+"аннотацию с пустыми строками в качестве параметров, [code]@export_group(\"\", "
+"\"\")[/code].\n"
+"Группы не могут быть вложенными, используйте [аннотацию @export_subgroup] для "
+"добавления подгрупп внутри групп.\n"
+"См. также [константа PROPERTY_USAGE_GROUP].\n"
+"[codeblock]\n"
+"@export_group(\"Racer Properties\")\n"
+"@export var nickname = \"Nick\"\n"
+"@export var age = 26\n"
+"\n"
+"@export_group(\"Car Properties\", \"car_\")\n"
+"@export var car_label = \"Speedy\"\n"
+"@export var car_number = 3\n"
+"\n"
+"@export_group(\"\", \"\")\n"
+"@export var ungrouped_number = 3\n"
+"[/codeblock]"
+
+msgid ""
+"Export a [String], [Array][lb][String][rb], [PackedStringArray], [Dictionary] "
+"or [Array][lb][Dictionary][rb] property with a large [TextEdit] widget "
+"instead of a [LineEdit]. This adds support for multiline content and makes it "
+"easier to edit large amount of text stored in the property.\n"
+"See also [constant PROPERTY_HINT_MULTILINE_TEXT].\n"
+"[codeblock]\n"
+"@export_multiline var character_biography\n"
+"@export_multiline var npc_dialogs: Array[String]\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт свойства [String] с большим виджетом [TextEdit] вместо [LineEdit]. "
+"Это добавляет поддержку многострочного содержимого и облегчает редактирование "
+"большого объема текста, хранящегося в свойстве.\n"
+"См. также [константа PROPERTY_HINT_MULTILINE_TEXT].\n"
+"[codeblock]\n"
+"@export_multiline var character_biography\n"
+"@export_multiline var npc_dialogs: Array[String]\n"
+"[/codeblock]"
+
+msgid ""
+"Export a [NodePath] or [Array][lb][NodePath][rb] property with a filter for "
+"allowed node types.\n"
+"See also [constant PROPERTY_HINT_NODE_PATH_VALID_TYPES].\n"
+"[codeblock]\n"
+"@export_node_path(\"Button\", \"TouchScreenButton\") var some_button\n"
+"@export_node_path(\"Button\", \"TouchScreenButton\") var many_buttons: "
+"Array[NodePath]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] The type must be a native class or a globally registered script "
+"(using the [code]class_name[/code] keyword) that inherits [Node]."
+msgstr ""
+"Экспорт свойства [NodePath] с фильтром по допустимым типам узлов.\n"
+"См. также [константа PROPERTY_HINT_NODE_PATH_VALID_TYPES].\n"
+"[codeblock]\n"
+"@export_node_path(\"Button\", \"TouchScreenButton\") var some_button\n"
+"@export_node_path(\"Button\", \"TouchScreenButton\") var many_buttons: "
+"Array[NodePath]\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Тип должен быть собственным классом или глобально "
+"зарегистрированным скриптом (с помощью ключевого слова [code]class_name[/"
+"code]), который наследует [Node]."
+
+msgid ""
+"Export a [String], [Array][lb][String][rb], or [PackedStringArray] property "
+"with a placeholder text displayed in the editor widget when no value is "
+"present.\n"
+"See also [constant PROPERTY_HINT_PLACEHOLDER_TEXT].\n"
+"[codeblock]\n"
+"@export_placeholder(\"Name in lowercase\") var character_id: String\n"
+"@export_placeholder(\"Name in lowercase\") var friend_ids: Array[String]\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт свойства [String] с текстом-заполнителем, отображаемым в виджете "
+"редактора при отсутствии значения.\n"
+"См. также [константа PROPERTY_HINT_PLACEHOLDER_TEXT].\n"
+"[codeblock]\n"
+"@export_placeholder(\"Имя в нижнем регистре\") var character_id: String\n"
+"@export_placeholder(\"Имя в нижнем регистре\") var friend_ids: Array[String]\n"
+"[/codeblock]"
+
+msgid ""
+"Export an [int], [float], [Array][lb][int][rb], [Array][lb][float][rb], "
+"[PackedByteArray], [PackedInt32Array], [PackedInt64Array], "
+"[PackedFloat32Array], or [PackedFloat64Array] property as a range value. The "
+"range must be defined by [param min] and [param max], as well as an optional "
+"[param step] and a variety of extra hints. The [param step] defaults to "
+"[code]1[/code] for integer properties. For floating-point numbers this value "
+"depends on your [member EditorSettings.interface/inspector/"
+"default_float_step] setting.\n"
+"If hints [code]\"or_greater\"[/code] and [code]\"or_less\"[/code] are "
+"provided, the editor widget will not cap the value at range boundaries. The "
+"[code]\"exp\"[/code] hint will make the edited values on range to change "
+"exponentially. The [code]\"hide_slider\"[/code] hint will hide the slider "
+"element of the editor widget.\n"
+"Hints also allow to indicate the units for the edited value. Using "
+"[code]\"radians_as_degrees\"[/code] you can specify that the actual value is "
+"in radians, but should be displayed in degrees in the Inspector dock (the "
+"range values are also in degrees). [code]\"degrees\"[/code] allows to add a "
+"degree sign as a unit suffix (the value is unchanged). Finally, a custom "
+"suffix can be provided using [code]\"suffix:unit\"[/code], where \"unit\" can "
+"be any string.\n"
+"See also [constant PROPERTY_HINT_RANGE].\n"
+"[codeblock]\n"
+"@export_range(0, 20) var number\n"
+"@export_range(-10, 20) var number\n"
+"@export_range(-10, 20, 0.2) var number: float\n"
+"@export_range(0, 20) var numbers: Array[float]\n"
+"\n"
+"@export_range(0, 100, 1, \"or_greater\") var power_percent\n"
+"@export_range(0, 100, 1, \"or_greater\", \"or_less\") var health_delta\n"
+"\n"
+"@export_range(-180, 180, 0.001, \"radians_as_degrees\") var angle_radians\n"
+"@export_range(0, 360, 1, \"degrees\") var angle_degrees\n"
+"@export_range(-8, 8, 2, \"suffix:px\") var target_offset\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт свойств [int] или [float] в виде диапазона значений. Диапазон должен "
+"быть задан параметрами [param min] и [param max], а также необязательным "
+"параметром [param step] и различными дополнительными подсказками. Шаг [param "
+"step] по умолчанию равен [code]1[/code] для целочисленных свойств. Для чисел "
+"с плавающей запятой это значение зависит от настройки [member EditorSettings."
+"interface/inspector/default_float_step]\n"
+"Если указаны подсказки [code]\"or_greater\"[/code] и [code]\"or_less\"[/"
+"code], виджет редактора не будет ограничивать значение на границах диапазона. "
+"Подсказка [code]\"exp\"[/code] заставит редактируемые значения в диапазоне "
+"изменяться экспоненциально. Подсказка [code]\"hide_slider\"[/code] скроет "
+"элемент ползунка виджета редактора.\n"
+"Подсказки также позволяют указать единицы измерения для редактируемого "
+"значения. С помощью [code]\"radians_as_degrees\"[/code] вы можете указать, "
+"что фактическое значение находится в радианах, но должно отображаться в "
+"градусах в доке инспектора (значения диапазона также должны быть в градусах). "
+"[code]\"degrees\"[/code] позволяет добавить знак градуса в качестве суффикса "
+"единицы измерения (значение при этом не изменяется). Наконец, "
+"пользовательский суффикс может быть задан с помощью [code]\"suffix:unit\"[/"
+"code], где \"unit\" может быть любой строкой.\n"
+"См. также [константа PROPERTY_HINT_RANGE].\n"
+"[codeblock]\n"
+"@export_range(0, 20) var number\n"
+"@export_range(-10, 20) var number\n"
+"@export_range(-10, 20, 0.2) var number: float\n"
+"@export_range(0, 20) var numbers: Array[float]\n"
+"\n"
+"@export_range(0, 100, 1, \"or_greater\") var power_percent\n"
+"@export_range(0, 100, 1, \"or_greater\", \"or_less\") var health_delta\n"
+"\n"
+"@export_range(-180, 180, 0.001, \"radians_as_degrees\") var angle_radians\n"
+"@export_range(0, 360, 1, \"degrees\") var angle_degrees\n"
+"@export_range(-8, 8, 2, \"suffix:px\") var target_offset\n"
+"[/codeblock]"
+
+msgid ""
+"Export a property with [constant PROPERTY_USAGE_STORAGE] flag. The property "
+"is not displayed in the editor, but it is serialized and stored in the scene "
+"or resource file. This can be useful for [annotation @tool] scripts. Also the "
+"property value is copied when [method Resource.duplicate] or [method Node."
+"duplicate] is called, unlike non-exported variables.\n"
+"[codeblock]\n"
+"var a # Not stored in the file, not displayed in the editor.\n"
+"@export_storage var b # Stored in the file, not displayed in the editor.\n"
+"@export var c: int # Stored in the file, displayed in the editor.\n"
+"[/codeblock]"
+msgstr ""
+"Экспорт свойства с [constant PROPERTY_USAGE_STORAGE] флажком. Свойство не "
+"отображается в редакторе, но оно сериализуется и сохраняется в сцене или "
+"файле ресурсов. Это может быть полезно для [annotation @tool] скриптов. Так "
+"же значение свойства копируется, когда [method Resource.duplicate] или "
+"[method Node.duplicate] вызывается, в отличии от не экспортируемых "
+"переменных\n"
+"[codeblock]\n"
+"var a # Не хранится в файле, не отображается в редакторе .\n"
+"@export_storage var b # Хранится в файле, не отображается в редакторе.\n"
+"@export var c: int # Хранится в файле, отображается в редакторе.\n"
+"[/codeblock]"
+
+msgid ""
+"Define a new subgroup for the following exported properties. This helps to "
+"organize properties in the Inspector dock. Subgroups work exactly like "
+"groups, except they need a parent group to exist. See [annotation "
+"@export_group].\n"
+"See also [constant PROPERTY_USAGE_SUBGROUP].\n"
+"[codeblock]\n"
+"@export_group(\"Racer Properties\")\n"
+"@export var nickname = \"Nick\"\n"
+"@export var age = 26\n"
+"\n"
+"@export_subgroup(\"Car Properties\", \"car_\")\n"
+"@export var car_label = \"Speedy\"\n"
+"@export var car_number = 3\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Subgroups cannot be nested, but you can use the slash separator "
+"([code]/[/code]) to achieve the desired effect:\n"
+"[codeblock]\n"
+"@export_group(\"Car Properties\")\n"
+"@export_subgroup(\"Wheels\", \"wheel_\")\n"
+"@export_subgroup(\"Wheels/Front\", \"front_wheel_\")\n"
+"@export var front_wheel_strength = 10\n"
+"@export var front_wheel_mobility = 5\n"
+"@export_subgroup(\"Wheels/Rear\", \"rear_wheel_\")\n"
+"@export var rear_wheel_strength = 8\n"
+"@export var rear_wheel_mobility = 3\n"
+"@export_subgroup(\"Wheels\", \"wheel_\")\n"
+"@export var wheel_material: PhysicsMaterial\n"
+"[/codeblock]"
+msgstr ""
+"Определите новую подгруппу для следующих экспортируемых свойств. Это поможет "
+"упорядочить свойства в доке Инспектора. Подгруппы работают точно так же, как "
+"и группы, за исключением того, что для их существования необходима "
+"родительская группа. См. [аннотация @export_group].\n"
+"См. также [константа PROPERTY_USAGE_SUBGROUP].\n"
+"[codeblock]\n"
+"@export_group(\"Racer Properties\")\n"
+"@export var nickname = \"Nick\"\n"
+"@export var age = 26\n"
+"\n"
+"@export_subgroup(\"Car Properties\", \"car_\")\n"
+"@export var car_label = \"Speedy\"\n"
+"@export var car_number = 3\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Подгруппы не могут быть вложенными, они обеспечивают "
+"только один дополнительный уровень глубины. Как следующая группа завершает "
+"предыдущую, так и последующие подгруппы завершают ее.\n"
+"[codeblock]\n"
+"@export_group(\"Car Properties\")\n"
+"@export_subgroup(\"Wheels\", \"wheel_\")\n"
+"@export_subgroup(\"Wheels/Front\", \"front_wheel_\")\n"
+"@export var front_wheel_strength = 10\n"
+"@export var front_wheel_mobility = 5\n"
+"@export_subgroup(\"Wheels/Rear\", \"rear_wheel_\")\n"
+"@export var rear_wheel_strength = 8\n"
+"@export var rear_wheel_mobility = 3\n"
+"@export_subgroup(\"Wheels\", \"wheel_\")\n"
+"@export var wheel_material: PhysicsMaterial\n"
+"[/codeblock]"
+
+msgid ""
+"Export a [Callable] property as a clickable button with the label [param "
+"text]. When the button is pressed, the callable is called.\n"
+"If [param icon] is specified, it is used to fetch an icon for the button via "
+"[method Control.get_theme_icon], from the [code]\"EditorIcons\"[/code] theme "
+"type. If [param icon] is omitted, the default [code]\"Callable\"[/code] icon "
+"is used instead.\n"
+"Consider using the [EditorUndoRedoManager] to allow the action to be reverted "
+"safely.\n"
+"See also [constant PROPERTY_HINT_TOOL_BUTTON].\n"
+"[codeblock]\n"
+"@tool\n"
+"extends Sprite2D\n"
+"\n"
+"@export_tool_button(\"Hello\") var hello_action = hello\n"
+"@export_tool_button(\"Randomize the color!\", \"ColorRect\")\n"
+"var randomize_color_action = randomize_color\n"
+"\n"
+"func hello():\n"
+"    print(\"Hello world!\")\n"
+"\n"
+"func randomize_color():\n"
+"    var undo_redo = EditorInterface.get_editor_undo_redo()\n"
+"    undo_redo.create_action(\"Randomized Sprite2D Color\")\n"
+"    undo_redo.add_do_property(self, &\"self_modulate\", Color(randf(), "
+"randf(), randf()))\n"
+"    undo_redo.add_undo_property(self, &\"self_modulate\", self_modulate)\n"
+"    undo_redo.commit_action()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] The property is exported without the [constant "
+"PROPERTY_USAGE_STORAGE] flag because a [Callable] cannot be properly "
+"serialized and stored in a file.\n"
+"[b]Note:[/b] In an exported project neither [EditorInterface] nor "
+"[EditorUndoRedoManager] exist, which may cause some scripts to break. To "
+"prevent this, you can use [method Engine.get_singleton] and omit the static "
+"type from the variable declaration:\n"
+"[codeblock]\n"
+"var undo_redo = Engine.get_singleton(&\"EditorInterface\")."
+"get_editor_undo_redo()\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Avoid storing lambda callables in member variables of "
+"[RefCounted]-based classes (e.g. resources), as this can lead to memory "
+"leaks. Use only method callables and optionally [method Callable.bind] or "
+"[method Callable.unbind]."
+msgstr ""
+"Экспортируйте свойство [Callable] как нажимаемую кнопку с меткой [param "
+"text]. При нажатии кнопки вызывается вызываемое свойство.\n"
+"Если указан [param icon], он используется для получения значка для кнопки "
+"через [method Control.get_theme_icon] из типа темы [code]\"EditorIcons\"[/"
+"code]. Если [param icon] опущен, вместо него используется значок по умолчанию "
+"[code]\"Callable\"[/code].\n"
+"Рассмотрите возможность использования [EditorUndoRedoManager], чтобы "
+"обеспечить безопасную отмену действия.\n"
+"Смотрите также [constant PROPERTY_HINT_TOOL_BUTTON].\n"
+"[codeblock]\n"
+"@tool\n"
+"extends Sprite2D\n"
+"\n"
+"@export_tool_button(\"Hello\") var hello_action = hello\n"
+"@export_tool_button(\"Randomize the color!\", \"ColorRect\")\n"
+"var randomize_color_action = randomize_color\n"
+"\n"
+"func hello():\n"
+"    print(\"Hello world!\")\n"
+"\n"
+"func randomize_color():\n"
+"    var undo_redo = EditorInterface.get_editor_undo_redo()\n"
+"    undo_redo.create_action(\"Randomized Sprite2D Color\")\n"
+"    undo_redo.add_do_property(self, &\"self_modulate\", Color(randf(), "
+"randf(), randf()))\n"
+"    undo_redo.add_undo_property(self, &\"self_modulate\", self_modulate)\n"
+"    undo_redo.commit_action()\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Свойство экспортируется без флага [constant "
+"PROPERTY_USAGE_STORAGE], поскольку [Callable] не может быть правильно "
+"сериализован и сохранен в файле.\n"
+"[b]Примечание:[/b] В экспортированном проекте нет ни [EditorInterface], ни "
+"[EditorUndoRedoManager], что может привести к поломке некоторых скриптов. "
+"Чтобы предотвратить это, можно использовать [method Engine.get_singleton] и "
+"опустить статический тип из объявления переменной:\n"
+"[codeblock]\n"
+"var undo_redo = Engine.get_singleton(&\"EditorInterface\")."
+"get_editor_undo_redo()\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Избегайте хранения вызываемых лямбда-функций в переменных-"
+"членах классов на основе [RefCounted] (например, ресурсов), так как это может "
+"привести к утечкам памяти. Используйте только вызываемые методы и, по "
+"желанию, [method Callable.bind] или [method Callable.unbind]."
+
+msgid ""
+"Add a custom icon to the current script. The icon specified at [param "
+"icon_path] is displayed in the Scene dock for every node of that class, as "
+"well as in various editor dialogs.\n"
+"[codeblock]\n"
+"@icon(\"res://path/to/class/icon.svg\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Only the script can have a custom icon. Inner classes are not "
+"supported.\n"
+"[b]Note:[/b] As annotations describe their subject, the [annotation @icon] "
+"annotation must be placed before the class definition and inheritance.\n"
+"[b]Note:[/b] Unlike most other annotations, the argument of the [annotation "
+"@icon] annotation must be a string literal (constant expressions are not "
+"supported)."
+msgstr ""
+"Добавить пользовательский значок в текущий скрипт. Значок, указанный в [param "
+"icon_path], отображается в доке сцены для каждого узла этого класса, а также "
+"в различных диалоговых окнах редактора.\n"
+"[codeblock]\n"
+"@icon(\"res://path/to/class/icon.svg\")\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Только скрипт может иметь свой значок. Внутренние классы "
+"не поддерживаются.\n"
+"[b]Примечание:[/b] Поскольку аннотации описывают свой предмет, аннотация "
+"[annotation @icon] должна быть размещена перед определением класса и "
+"наследованием.\n"
+"[b]Примечание:[/b] В отличие от большинства других аннотаций, аргумент "
+"аннотации [annotation @icon] должен быть строковым литералом (константные "
+"выражения не поддерживаются)."
+
+msgid ""
+"Mark the following property as assigned when the [Node] is ready. Values for "
+"these properties are not assigned immediately when the node is initialized "
+"([method Object._init]), and instead are computed and stored right before "
+"[method Node._ready].\n"
+"[codeblock]\n"
+"@onready var character_name = $Label\n"
+"[/codeblock]"
+msgstr ""
+"Отметьте следующее свойство как назначенное, когда [Node] готов. Значения для "
+"этих свойств не назначаются немедленно при инициализации узла ([method Object."
+"_init]), а вместо этого вычисляются и сохраняются непосредственно перед "
+"[method Node._ready].\n"
+"[codeblock]\n"
+"@onready var character_name: Label = $Label\n"
+"[/codeblock]"
+
+msgid ""
+"Mark the following method for remote procedure calls. See [url=$DOCS_URL/"
+"tutorials/networking/high_level_multiplayer.html]High-level multiplayer[/"
+"url].\n"
+"If [param mode] is set as [code]\"any_peer\"[/code], allows any peer to call "
+"this RPC function. Otherwise, only the authority peer is allowed to call it "
+"and [param mode] should be kept as [code]\"authority\"[/code]. When "
+"configuring functions as RPCs with [method Node.rpc_config], each of these "
+"modes respectively corresponds to the [constant MultiplayerAPI."
+"RPC_MODE_AUTHORITY] and [constant MultiplayerAPI.RPC_MODE_ANY_PEER] RPC "
+"modes. See [enum MultiplayerAPI.RPCMode]. If a peer that is not the authority "
+"tries to call a function that is only allowed for the authority, the function "
+"will not be executed. If the error can be detected locally (when the RPC "
+"configuration is consistent between the local and the remote peer), an error "
+"message will be displayed on the sender peer. Otherwise, the remote peer will "
+"detect the error and print an error there.\n"
+"If [param sync] is set as [code]\"call_remote\"[/code], the function will "
+"only be executed on the remote peer, but not locally. To run this function "
+"locally too, set [param sync] to [code]\"call_local\"[/code]. When "
+"configuring functions as RPCs with [method Node.rpc_config], this is "
+"equivalent to setting [code]call_local[/code] to [code]true[/code].\n"
+"The [param transfer_mode] accepted values are [code]\"unreliable\"[/code], "
+"[code]\"unreliable_ordered\"[/code], or [code]\"reliable\"[/code]. It sets "
+"the transfer mode of the underlying [MultiplayerPeer]. See [member "
+"MultiplayerPeer.transfer_mode].\n"
+"The [param transfer_channel] defines the channel of the underlying "
+"[MultiplayerPeer]. See [member MultiplayerPeer.transfer_channel].\n"
+"The order of [param mode], [param sync] and [param transfer_mode] does not "
+"matter, but values related to the same argument must not be used more than "
+"once. [param transfer_channel] always has to be the 4th argument (you must "
+"specify 3 preceding arguments).\n"
+"[codeblock]\n"
+"@rpc\n"
+"func fn(): pass\n"
+"\n"
+"@rpc(\"any_peer\", \"unreliable_ordered\")\n"
+"func fn_update_pos(): pass\n"
+"\n"
+"@rpc(\"authority\", \"call_remote\", \"unreliable\", 0) # Equivalent to @rpc\n"
+"func fn_default(): pass\n"
+"[/codeblock]"
+msgstr ""
+"Отметьте следующий метод для удаленных вызовов процедур. См. раздел "
+"[url=$DOCS_URL/tutorials/networking/high_level_multiplayer."
+"html]Высокоуровневый мультиплеер[/url].\n"
+"Если [param mode] установлен как [code]\"any_peer\"[/code], это позволяет "
+"любому пиру вызывать эту RPC-функцию. В противном случае ее может вызывать "
+"только авторитетный пир, и [param mode] следует оставить как "
+"[code]\"authority\"[/code]. При конфигурировании функций как RPC с помощью "
+"[method Node.rpc_config], каждый из этих режимов соответственно соответствует "
+"режимам RPC [constant MultiplayerAPI.RPC_MODE_AUTHORITY] и [constant "
+"MultiplayerAPI.RPC_MODE_ANY_PEER]. См. раздел [enum MultiplayerAPI.RPCMode]. "
+"Если пир, не являющийся авторитетом, пытается вызвать функцию, разрешенную "
+"только для авторитета, функция не будет выполнена. Если ошибка может быть "
+"обнаружена локально (когда конфигурация RPC согласуется между локальным и "
+"удаленным пиром), сообщение об ошибке будет отображено на пире-отправителе. В "
+"противном случае удаленный пир обнаружит ошибку и выведет сообщение об "
+"ошибке.\n"
+"Если параметр [param sync] установлен как [code]\"call_remote\"[/code], "
+"функция будет выполняться только на удаленном пире, но не локально. Чтобы "
+"запустить эту функцию и локально, установите [param sync] в "
+"[code]\"call_local\"[/code]. При конфигурировании функций как RPC с помощью "
+"[method Node.rpc_config] это эквивалентно установке [code]call_local[/code] в "
+"[code]true[/code].\n"
+"Принимаемые значения [param transfer_mode]: [code]\"unreliable\"[/code], "
+"[code]\"unreliable_ordered\"[/code] или [code]\"reliable\"[/code]. "
+"Устанавливает режим передачи данных базового [MultiplayerPeer]. См. раздел "
+"[member MultiplayerPeer.transfer_mode].\n"
+"Параметр [param transfer_channel] определяет канал базового "
+"[MultiplayerPeer]. См. раздел [member MultiplayerPeer.transfer_channel].\n"
+"Порядок следования [param mode], [param sync] и [param transfer_mode] не "
+"имеет значения, но значения, относящиеся к одному и тому же аргументу, не "
+"должны использоваться более одного раза. [param transfer_channel] всегда "
+"должен быть 4-м аргументом (вы должны указать 3 предыдущих аргумента).\n"
+"[codeblock]\n"
+"@rpc\n"
+"func fn(): pass\n"
+"\n"
+"@rpc(\"any_peer\", \"unreliable_ordered\")\n"
+"func fn_update_pos(): pass\n"
+"\n"
+"@rpc(\"authority\", \"call_remote\", \"unreliable\", 0) # Эквивалентно @rpc\n"
+"func fn_default(): pass\n"
+"[/codeblock]"
+
+msgid ""
+"Make a script with static variables to not persist after all references are "
+"lost. If the script is loaded again the static variables will revert to their "
+"default values.\n"
+"[b]Note:[/b] As annotations describe their subject, the [annotation "
+"@static_unload] annotation must be placed before the class definition and "
+"inheritance.\n"
+"[b]Warning:[/b] Currently, due to a bug, scripts are never freed, even if "
+"[annotation @static_unload] annotation is used."
+msgstr ""
+"Делает так, чтобы скрипт со статическими переменными не сохранялся после "
+"потери всех ссылок. При повторной загрузке скрипта статическим переменным "
+"будут установлены значения по умолчанию.\n"
+"[b]Примечание: [/b] Поскольку аннотации описывают собственный предмет, "
+"аннотация [annotation @static_unload] должна быть помещена перед объявлением "
+"класса и наследованием.\n"
+"[b]Предупреждение:[/b] В настоящее время, из-за ошибки скрипты никогда не "
+"освобождаются, даже если используется аннотация [annotation @static_unload]."
+
+msgid ""
+"Mark the current script as a tool script, allowing it to be loaded and "
+"executed by the editor. See [url=$DOCS_URL/tutorials/plugins/"
+"running_code_in_the_editor.html]Running code in the editor[/url].\n"
+"[codeblock]\n"
+"@tool\n"
+"extends Node\n"
+"[/codeblock]\n"
+"[b]Note:[/b] As annotations describe their subject, the [annotation @tool] "
+"annotation must be placed before the class definition and inheritance."
+msgstr ""
+"Отметьте текущий скрипт как скрипт-инструмент, позволяя редактору загружать и "
+"выполнять его. См. [url=$DOCS_URL/tutorials/plugins/"
+"running_code_in_the_editor.html]Запуск кода в редакторе[/url]\n"
+"[codeblock]\n"
+"@tool\n"
+"extends Node\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Поскольку аннотации описывают свой предмет, аннотация "
+"[annotation @tool] должна быть помещена перед определением и наследованием "
+"класса."
+
+msgid ""
+"Mark the following statement to ignore the specified [param warning]. See "
+"[url=$DOCS_URL/tutorials/scripting/gdscript/warning_system.html]GDScript "
+"warning system[/url].\n"
+"[codeblock]\n"
+"func test():\n"
+"    print(\"hello\")\n"
+"    return\n"
+"    @warning_ignore(\"unreachable_code\")\n"
+"    print(\"unreachable\")\n"
+"[/codeblock]\n"
+"See also [annotation @warning_ignore_start] and [annotation "
+"@warning_ignore_restore]."
+msgstr ""
+"Отметьте следующее утверждение, чтобы игнорировать указанное [param warning]. "
+"См. [url=$DOCS_URL/tutorials/scripting/gdscript/warning_system.html]Система "
+"предупреждений GDScript[/url].\n"
+"[codeblock]\n"
+"func test():\n"
+"    print(\"hello\")\n"
+"    return\n"
+"    @warning_ignore(\"unreachable_code\")\n"
+"    print(\"unreachable\")\n"
+"[/codeblock]\n"
+"См. также [annotation @warning_ignore_start] и [annotation "
+"@warning_ignore_restore]."
+
+msgid ""
+"Stops ignoring the listed warning types after [annotation "
+"@warning_ignore_start]. Ignoring the specified warning types will be reset to "
+"Project Settings. This annotation can be omitted to ignore the warning types "
+"until the end of the file.\n"
+"[b]Note:[/b] Unlike most other annotations, arguments of the [annotation "
+"@warning_ignore_restore] annotation must be string literals (constant "
+"expressions are not supported)."
+msgstr ""
+"Прекращает игнорировать перечисленные типы предупреждений после [annotation "
+"@warning_ignore_start]. Игнорирование указанных типов предупреждений будет "
+"сброшено до настроек проекта. Эту аннотацию можно опустить, чтобы "
+"игнорировать типы предупреждений до конца файла.\n"
+"[b]Примечание:[/b] В отличие от большинства других аннотаций, аргументы "
+"аннотации [annotation @warning_ignore_restore] должны быть строковыми "
+"литералами (константные выражения не поддерживаются)."
+
+msgid ""
+"Starts ignoring the listed warning types until the end of the file or the "
+"[annotation @warning_ignore_restore] annotation with the given warning type.\n"
+"[codeblock]\n"
+"func test():\n"
+"    var a = 1 # Warning (if enabled in the Project Settings).\n"
+"    @warning_ignore_start(\"unused_variable\")\n"
+"    var b = 2 # No warning.\n"
+"    var c = 3 # No warning.\n"
+"    @warning_ignore_restore(\"unused_variable\")\n"
+"    var d = 4 # Warning (if enabled in the Project Settings).\n"
+"[/codeblock]\n"
+"[b]Note:[/b] To suppress a single warning, use [annotation @warning_ignore] "
+"instead.\n"
+"[b]Note:[/b] Unlike most other annotations, arguments of the [annotation "
+"@warning_ignore_start] annotation must be string literals (constant "
+"expressions are not supported)."
+msgstr ""
+"Начинает игнорировать перечисленные типы предупреждений до конца файла или "
+"аннотации [annotation @warning_ignore_restore] с указанным типом "
+"предупреждения.\n"
+"[codeblock]\n"
+"func test():\n"
+"    var a = 1 # Warning (if enabled in the Project Settings).\n"
+"    @warning_ignore_start(\"unused_variable\")\n"
+"    var b = 2 # No warning.\n"
+"    var c = 3 # No warning.\n"
+"    @warning_ignore_restore(\"unused_variable\")\n"
+"    var d = 4 # Warning (if enabled in the Project Settings).\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Чтобы подавить одно предупреждение, используйте вместо "
+"этого [annotation @warning_ignore].\n"
+"[b]Примечание:[/b] В отличие от большинства других аннотаций, аргументы "
+"аннотации [annotation @warning_ignore_start] должны быть строковыми "
+"литералами (константные выражения не поддерживаются)."
+
+msgid "Global scope constants and functions."
+msgstr "Константы и функции глобальной области видимости."
+
+msgid ""
+"A list of global scope enumerated constants and built-in functions. This is "
+"all that resides in the globals, constants regarding error codes, keycodes, "
+"property hints, etc.\n"
+"Singletons are also documented here, since they can be accessed from "
+"anywhere.\n"
+"For the entries that can only be accessed from scripts written in GDScript, "
+"see [@GDScript]."
+msgstr ""
+"Список глобальных областей видимости, перечисленных констант и встроенных "
+"функций. Это все, что находится в глобальных, константах, касающихся кодов "
+"ошибок, кодов клавиш, подсказок свойств и т. д.\n"
+"Здесь также документируются синглтоны, поскольку к ним можно получить доступ "
+"из любой точки мира.\n"
+"Информацию о записях, доступ к которым возможен только из скриптов, "
+"написанных на GDScript, см. в [@GDScript]."
+
+msgid "Random number generation"
+msgstr "Генерация случайных чисел"
+
+msgid ""
+"Returns the absolute value of a [Variant] parameter [param x] (i.e. non-"
+"negative value). Supported types: [int], [float], [Vector2], [Vector2i], "
+"[Vector3], [Vector3i], [Vector4], [Vector4i].\n"
+"[codeblock]\n"
+"var a = abs(-1)\n"
+"# a is 1\n"
+"\n"
+"var b = abs(-1.2)\n"
+"# b is 1.2\n"
+"\n"
+"var c = abs(Vector2(-3.5, -4))\n"
+"# c is (3.5, 4)\n"
+"\n"
+"var d = abs(Vector2i(-5, -6))\n"
+"# d is (5, 6)\n"
+"\n"
+"var e = abs(Vector3(-7, 8.5, -3.8))\n"
+"# e is (7, 8.5, 3.8)\n"
+"\n"
+"var f = abs(Vector3i(-7, -8, -9))\n"
+"# f is (7, 8, 9)\n"
+"[/codeblock]\n"
+"[b]Note:[/b] For better type safety, use [method absf], [method absi], "
+"[method Vector2.abs], [method Vector2i.abs], [method Vector3.abs], [method "
+"Vector3i.abs], [method Vector4.abs], or [method Vector4i.abs]."
+msgstr ""
+"Возвращает абсолютное значение [Variant] параметра [param x] (т.е "
+"положительное значение). Поддерживаемые типы данных: [int], [float], "
+"[Vector2], [Vector2i], [Vector3], [Vector3i], [Vector4], [Vector4i].\n"
+"[codeblock]\n"
+"var a = abs(-1)\n"
+"# a это 1\n"
+"\n"
+"var b = abs(-1.2)\n"
+"# b это 1.2\n"
+"\n"
+"var c = abs(Vector2(-3.5, -4))\n"
+"# c это (3.5, 4)\n"
+"\n"
+"var d = abs(Vector2i(-5, -6))\n"
+"# d это (5, 6)\n"
+"\n"
+"var e = abs(Vector3(-7, 8.5, -3.8))\n"
+"# e это (7, 8.5, 3.8)\n"
+"\n"
+"var f = abs(Vector3i(-7, -8, -9))\n"
+"# f это (7, 8, 9)\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Для лучшей безопасности типов, используйте методы [method "
+"absf], [method absi], [method Vector2.abs], [method Vector2i.abs], [method "
+"Vector3.abs], [method Vector3i.abs], [method Vector4.abs], или [method "
+"Vector4i.abs]."
+
+msgid ""
+"Returns the absolute value of float parameter [param x] (i.e. positive "
+"value).\n"
+"[codeblock]\n"
+"# a is 1.2\n"
+"var a = absf(-1.2)\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает абсолютное значение параметра float [param x] (т.е. положительное "
+"значение).\n"
+"[codeblock]\n"
+"# a is 1.2\n"
+"var a = absf(-1.2)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the absolute value of int parameter [param x] (i.e. positive value).\n"
+"[codeblock]\n"
+"# a is 1\n"
+"var a = absi(-1)\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает абсолютное значение параметра int [param x] (т.е. положительное "
+"значение).\n"
+"[codeblock]\n"
+"# a is 1\n"
+"var a = absi(-1)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the arc cosine of [param x] in radians. Use to get the angle of "
+"cosine [param x]. [param x] will be clamped between [code]-1.0[/code] and "
+"[code]1.0[/code] (inclusive), in order to prevent [method acos] from "
+"returning [constant @GDScript.NAN].\n"
+"[codeblock]\n"
+"# c is 0.523599 or 30 degrees if converted with rad_to_deg(c)\n"
+"var c = acos(0.866025)\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает арккосинус [param x] в радианах. Используйте для получения угла "
+"косинуса [param x]. [param x] будет ограничено между [code]-1.0[/code] и "
+"[code]1.0[/code] (включительно), чтобы предотвратить возврат [method acos] "
+"[constant @GDScript.NAN].\n"
+"[codeblock]\n"
+"# c равен 0,523599 или 30 градусов, если преобразовано с помощью "
+"rad_to_deg(c)\n"
+"var c = acos(0.866025)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the hyperbolic arc (also called inverse) cosine of [param x], "
+"returning a value in radians. Use it to get the angle from an angle's cosine "
+"in hyperbolic space if [param x] is larger or equal to 1. For values of "
+"[param x] lower than 1, it will return 0, in order to prevent [method acosh] "
+"from returning [constant @GDScript.NAN].\n"
+"[codeblock]\n"
+"var a = acosh(2) # Returns 1.31695789692482\n"
+"cosh(a) # Returns 2\n"
+"\n"
+"var b = acosh(-1) # Returns 0\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает гиперболический дуговой (также называемый обратным) косинус [param "
+"x], возвращая значение в радианах. Используйте его для получения угла из "
+"косинуса угла в гиперболическом пространстве, если [param x] больше или равен "
+"1. Для значений [param x] меньше 1 он вернет 0, чтобы предотвратить возврат "
+"[method acosh] [constant @GDScript.NAN].\n"
+"[codeblock]\n"
+"var a = acosh(2) # Returns 1.31695789692482\n"
+"cosh(a) # Returns 2\n"
+"\n"
+"var b = acosh(-1) # Returns 0\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the difference between the two angles (in radians), in the range of "
+"[code][-PI, +PI][/code]. When [param from] and [param to] are opposite, "
+"returns [code]-PI[/code] if [param from] is smaller than [param to], or "
+"[code]PI[/code] otherwise."
+msgstr ""
+"Возвращает разницу между двумя углами (в радианах) в диапазоне [code][-PI, "
+"+PI[/code]. Когда [param from] и [param to] противоположны, возвращает [code]-"
+"PI[/code], если [param from] меньше, чем [param to], или [code]ПИ[/code] в "
+"противном случае."
+
+msgid ""
+"Returns the arc sine of [param x] in radians. Use to get the angle of sine "
+"[param x]. [param x] will be clamped between [code]-1.0[/code] and [code]1.0[/"
+"code] (inclusive), in order to prevent [method asin] from returning [constant "
+"@GDScript.NAN].\n"
+"[codeblock]\n"
+"# s is 0.523599 or 30 degrees if converted with rad_to_deg(s)\n"
+"var s = asin(0.5)\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает арксинус [param x] в радианах. Используйте для получения угла "
+"синуса [param x]. [param x] будет ограничено между [code]-1.0[/code] и "
+"[code]1.0[/code] (включительно), чтобы предотвратить возврат [method asin] "
+"[constant @GDScript.NAN].\n"
+"[codeblock]\n"
+"# s равен 0,523599 или 30 градусам, если преобразовано с помощью "
+"rad_to_deg(s)\n"
+"var s = asin(0.5)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the hyperbolic arc (also called inverse) sine of [param x], returning "
+"a value in radians. Use it to get the angle from an angle's sine in "
+"hyperbolic space.\n"
+"[codeblock]\n"
+"var a = asinh(0.9) # Returns 0.8088669356527824\n"
+"sinh(a) # Returns 0.9\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает гиперболический дуговой (также называемый обратным) синус [param "
+"x], возвращая значение в радианах. Используйте его, чтобы получить угол из "
+"синуса угла в гиперболическом пространстве.\n"
+"[codeblock]\n"
+"var a = asinh(0.9) # Returns 0.8088669356527824\n"
+"sinh(a) # Returns 0.9\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the arc tangent of [param x] in radians. Use it to get the angle from "
+"an angle's tangent in trigonometry.\n"
+"The method cannot know in which quadrant the angle should fall. See [method "
+"atan2] if you have both [code]y[/code] and [code skip-lint]x[/code].\n"
+"[codeblock]\n"
+"var a = atan(0.5) # a is 0.463648\n"
+"[/codeblock]\n"
+"If [param x] is between [code]-PI / 2[/code] and [code]PI / 2[/code] "
+"(inclusive), [code]atan(tan(x))[/code] is equal to [param x]."
+msgstr ""
+"Возвращает арктангенс [param x] в радианах. Используйте его для получения "
+"угла из тангенса угла в тригонометрии.\n"
+"Метод не может знать, в какой квадрант должен попасть угол. Смотрите [method "
+"atan2], если у вас есть и [code]y[/code], и [code skip-lint]x[/code].\n"
+"[codeblock]\n"
+"var a = atan(0.5) # a is 0.463648\n"
+"[/codeblock]\n"
+"Если [param x] находится между [code]-PI / 2[/code] и [code]PI / 2[/code] "
+"(включительно), [code]atan(tan(x))[/code] равен [param x]."
+
+msgid ""
+"Returns the arc tangent of [code]y/x[/code] in radians. Use to get the angle "
+"of tangent [code]y/x[/code]. To compute the value, the method takes into "
+"account the sign of both arguments in order to determine the quadrant.\n"
+"Important note: The Y coordinate comes first, by convention.\n"
+"[codeblock]\n"
+"var a = atan2(0, -1) # a is 3.141593\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает арктангенс [code]y/x[/code] в радианах. Используйте для получения "
+"угла тангенса [code]y/x[/code]. Для вычисления значения метод учитывает знак "
+"обоих аргументов, чтобы определить квадрант.\n"
+"Важное примечание: по соглашению координата Y идет первой.\n"
+"[codeblock]\n"
+"var a = atan2(0, -1) # a is 3.141593\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the hyperbolic arc (also called inverse) tangent of [param x], "
+"returning a value in radians. Use it to get the angle from an angle's tangent "
+"in hyperbolic space if [param x] is between -1 and 1 (non-inclusive).\n"
+"In mathematics, the inverse hyperbolic tangent is only defined for -1 < "
+"[param x] < 1 in the real set, so values equal or lower to -1 for [param x] "
+"return negative [constant @GDScript.INF] and values equal or higher than 1 "
+"return positive [constant @GDScript.INF] in order to prevent [method atanh] "
+"from returning [constant @GDScript.NAN].\n"
+"[codeblock]\n"
+"var a = atanh(0.9) # Returns 1.47221948958322\n"
+"tanh(a) # Returns 0.9\n"
+"\n"
+"var b = atanh(-2) # Returns -inf\n"
+"tanh(b) # Returns -1\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает тангенс гиперболической дуги (также называемой обратной) к [param "
+"x], возвращая значение в радианах. Используется для получения угла из "
+"тангенса угла в гиперболическом пространстве, если [param x] находится в "
+"диапазоне от -1 до 1 (не включительно).\n"
+"В математике обратный гиперболический тангенс определен только для -1 < "
+"[param x] < 1 в вещественном множестве, поэтому значения, равные или меньшие "
+"-1 для [param x], возвращают отрицательные [constant @GDScript.INF], а "
+"значения, равные или большие 1, возвращают положительные [method @GDScript."
+"INF], чтобы [метод atanh] не возвращал [constant @GDScript.NAN].\n"
+"[codeblock].\n"
+"var a = atanh(0.9) # Возвращает 1.47221948958322\n"
+"tanh(a) # Возвращает 0.9\n"
+"\n"
+"var b = atanh(-2) # Возвращает -inf\n"
+"tanh(b) # Возвращает -1\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the derivative at the given [param t] on a one-dimensional "
+"[url=https://en.wikipedia.org/wiki/B%C3%A9zier_curve]Bézier curve[/url] "
+"defined by the given [param control_1], [param control_2], and [param end] "
+"points."
+msgstr ""
+"Возвращает производную при заданном [param t] на одномерной [url=https://ru."
+"wikipedia.org/wiki/Кривая_Безье]кривой Безье[/url], заданной точками [param "
+"control_1], [param control_2] и [param end]."
+
+msgid ""
+"Returns the point at the given [param t] on a one-dimensional [url=https://en."
+"wikipedia.org/wiki/B%C3%A9zier_curve]Bézier curve[/url] defined by the given "
+"[param control_1], [param control_2], and [param end] points."
+msgstr ""
+"Возвращает точку в заданной точке [param t] на одномерной [url=https://ru."
+"wikipedia.org/wiki/Кривая_Безье]кривой Безье[/url], определяемой заданными "
+"точками [param control_1], [param control_2] и [param end]."
+
+msgid ""
+"Decodes a byte array back to a [Variant] value, without decoding objects.\n"
+"[b]Note:[/b] If you need object deserialization, see [method "
+"bytes_to_var_with_objects]."
+msgstr ""
+"Декодирует байтовый массив обратно в значение [Variant], без декодирования "
+"объектов.\n"
+"[b]Примечание:[/b] Если вам нужна десериализация объектов, смотрите [method "
+"bytes_to_var_with_objects]."
+
+msgid ""
+"Decodes a byte array back to a [Variant] value. Decoding objects is allowed.\n"
+"[b]Warning:[/b] Deserialized object can contain code which gets executed. Do "
+"not use this option if the serialized object comes from untrusted sources to "
+"avoid potential security threats (remote code execution)."
+msgstr ""
+"Декодирует массив байтов обратно в значение [Variant]. Декодирование объектов "
+"разрешено.\n"
+"[b]Предупреждение:[/b] Десериализованный объект может содержать код, который "
+"будет выполнен. Не используйте эту опцию, если сериализованный объект получен "
+"из ненадежных источников, чтобы избежать потенциальных угроз безопасности "
+"(удаленное выполнение кода)."
+
+msgid ""
+"Rounds [param x] upward (towards positive infinity), returning the smallest "
+"whole number that is not less than [param x]. Supported types: [int], "
+"[float], [Vector2], [Vector2i], [Vector3], [Vector3i], [Vector4], "
+"[Vector4i].\n"
+"[codeblock]\n"
+"var i = ceil(1.45) # i is 2.0\n"
+"i = ceil(1.001)    # i is 2.0\n"
+"[/codeblock]\n"
+"See also [method floor], [method round], and [method snapped].\n"
+"[b]Note:[/b] For better type safety, use [method ceilf], [method ceili], "
+"[method Vector2.ceil], [method Vector3.ceil], or [method Vector4.ceil]."
+msgstr ""
+"Округляет [param x] в большую сторону (в сторону положительной "
+"бесконечности), возвращая наименьшее целое число, которое не меньше [param "
+"x]. Поддерживаемые типы: [int], [float], [Vector2], [Vector2i], [Vector3], "
+"[Vector3i], [Vector4], [Vector4i].\n"
+"[codeblock]\n"
+"var i = ceil(1.45) # i is 2.0\n"
+"i = ceil(1.001)    # i is 2.0\n"
+"[/codeblock]\n"
+"См. также [method floor], [method round], и [method snapped].\n"
+"[b]Примечание:[/b] Для лучшей безопасности типов используйте [method ceilf], "
+"[method ceili], [method Vector2.ceil], [method Vector3.ceil], или [method "
+"Vector4.ceil]."
+
+msgid ""
+"Rounds [param x] upward (towards positive infinity), returning the smallest "
+"whole number that is not less than [param x].\n"
+"A type-safe version of [method ceil], returning a [float]."
+msgstr ""
+"Округляет [param x] в большую сторону (в сторону положительной "
+"бесконечности), возвращая наименьшее целое число, которое не меньше [param "
+"x].\n"
+"Типобезопасная версия [method ceil], возвращающая [float]."
+
+msgid ""
+"Clamps the [param value], returning a [Variant] not less than [param min] and "
+"not more than [param max]. Any values that can be compared with the less than "
+"and greater than operators will work.\n"
+"[codeblock]\n"
+"var a = clamp(-10, -1, 5)\n"
+"# a is -1\n"
+"\n"
+"var b = clamp(8.1, 0.9, 5.5)\n"
+"# b is 5.5\n"
+"[/codeblock]\n"
+"[b]Note:[/b] For better type safety, use [method clampf], [method clampi], "
+"[method Vector2.clamp], [method Vector2i.clamp], [method Vector3.clamp], "
+"[method Vector3i.clamp], [method Vector4.clamp], [method Vector4i.clamp], or "
+"[method Color.clamp] (not currently supported by this method).\n"
+"[b]Note:[/b] When using this on vectors it will [i]not[/i] perform component-"
+"wise clamping, and will pick [param min] if [code]value < min[/code] or "
+"[param max] if [code]value > max[/code]. To perform component-wise clamping "
+"use the methods listed above."
+msgstr ""
+"Фиксирует [значение параметра], возвращая [Variant] не меньше [param min] и "
+"не больше [param max]. Будут работать любые значения, которые можно сравнить "
+"с операторами «меньше» и «больше».\n"
+"[codeblock]\n"
+"var a = clamp(-10, -1, 5)\n"
+"# a is -1\n"
+"\n"
+"var b = clamp(8.1, 0.9, 5.5)\n"
+"# b is 5.5\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Для лучшей безопасности типов используйте [method clampf], "
+"[method clampi], [method Vector2.clamp], [method Vector2i.clamp], [method "
+"Vector3.clamp], [method Vector3i.clamp], [method Vector4.clamp], [method "
+"Vector4i.clamp] или [method Color.clamp] (в настоящее время не поддерживается "
+"этим методом).\n"
+"[b]Примечание:[/b] При использовании этого на векторах он [i]не[/i] будет "
+"выполнять покомпонентное ограничение, а выберет [param min], если [code]value "
+"< min[/code] или [param max], если [code]value > max[/code]. Для выполнения "
+"покомпонентного ограничения используйте методы, перечисленные выше."
+
+msgid ""
+"Clamps the [param value], returning a [float] not less than [param min] and "
+"not more than [param max].\n"
+"[codeblock]\n"
+"var speed = 42.1\n"
+"var a = clampf(speed, 1.0, 20.5) # a is 20.5\n"
+"\n"
+"speed = -10.0\n"
+"var b = clampf(speed, -1.0, 1.0) # b is -1.0\n"
+"[/codeblock]"
+msgstr ""
+"Ограничивает [param value], возвращая [float] не меньше [param min] и не "
+"больше [param max].\n"
+"[codeblock].\n"
+"var speed = 42.1\n"
+"var a = clampf(speed, 1.0, 20.5) # a равно 20.5\n"
+"\n"
+"speed = -10.0\n"
+"var b = clampf(speed, -1.0, 1.0) # b равно -1.0\n"
+"[/codeblock]"
+
+msgid ""
+"Clamps the [param value], returning an [int] not less than [param min] and "
+"not more than [param max].\n"
+"[codeblock]\n"
+"var speed = 42\n"
+"var a = clampi(speed, 1, 20) # a is 20\n"
+"\n"
+"speed = -10\n"
+"var b = clampi(speed, -1, 1) # b is -1\n"
+"[/codeblock]"
+msgstr ""
+"Зажимает [param value], возвращая [int] не меньше [param min] и не больше "
+"[param max].\n"
+"[codeblock].\n"
+"var speed = 42\n"
+"var a = clampi(speed, 1, 20) # a равно 20\n"
+"\n"
+"speed = -10\n"
+"var b = clampi(speed, -1, 1) # b равно -1\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the cosine of angle [param angle_rad] in radians.\n"
+"[codeblock]\n"
+"cos(PI * 2)         # Returns 1.0\n"
+"cos(PI)             # Returns -1.0\n"
+"cos(deg_to_rad(90)) # Returns 0.0\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает косинус угла [param angle_rad] в радианах.\n"
+"[codeblock].\n"
+"cos(PI * 2)         # Возвращает 1.0\n"
+"cos(PI)             # Возвращает -1.0\n"
+"cos(deg_to_rad(90)) # Возвращает 0.0\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the hyperbolic cosine of [param x] in radians.\n"
+"[codeblock]\n"
+"print(cosh(1)) # Prints 1.543081\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает гиперболический косинус [param x] в радианах.\n"
+"[codeblock]\n"
+"print(cosh(1)) # Prints 1.543081\n"
+"[/codeblock]"
+
+msgid ""
+"Cubic interpolates between two values by the factor defined in [param weight] "
+"with [param pre] and [param post] values."
+msgstr ""
+"Кубическая интерполяция между двумя значениями по коэффициенту, определенному "
+"в [param weight], и значениями [param pre] и [param post]."
+
+msgid ""
+"Cubic interpolates between two rotation values with shortest path by the "
+"factor defined in [param weight] with [param pre] and [param post] values. "
+"See also [method lerp_angle]."
+msgstr ""
+"Кубическая интерполяция между двумя значениями вращения с кратчайшим путем по "
+"коэффициенту, определенному в [param weight] со значениями [param pre] и "
+"[param post]. См. также [method lerp_angle]."
+
+msgid ""
+"Cubic interpolates between two rotation values with shortest path by the "
+"factor defined in [param weight] with [param pre] and [param post] values. "
+"See also [method lerp_angle].\n"
+"It can perform smoother interpolation than [method cubic_interpolate] by the "
+"time values."
+msgstr ""
+"Кубическая интерполяция между двумя значениями вращения с кратчайшим путем по "
+"коэффициенту, определенному в [param weight] со значениями [param pre] и "
+"[param post]. См. также [method lerp_angle].\n"
+"Он может выполнять более плавную интерполяцию, чем [method cubic_interpolate] "
+"по значениям времени."
+
+msgid ""
+"Cubic interpolates between two values by the factor defined in [param weight] "
+"with [param pre] and [param post] values.\n"
+"It can perform smoother interpolation than [method cubic_interpolate] by the "
+"time values."
+msgstr ""
+"Кубическая интерполяция между двумя значениями с помощью коэффициента, "
+"определенного в [param weight] со значениями [param pre] и [param post].\n"
+"Он может выполнять более плавную интерполяцию, чем [method cubic_interpolate] "
+"по значениям времени."
+
+msgid "Converts from decibels to linear energy (audio)."
+msgstr "Преобразует децибелы в линейную энергию (аудио)."
+
+msgid ""
+"Converts an angle expressed in degrees to radians.\n"
+"[codeblock]\n"
+"var r = deg_to_rad(180) # r is 3.141593\n"
+"[/codeblock]"
+msgstr ""
+"Преобразует угол, выраженный в градусах, в радианы.\n"
+"[codeblock]\n"
+"r = deg2rad(180) # r = 3.141593\n"
+"[/codeblock]"
+
+msgid ""
+"Returns a human-readable name for the given [enum Error] code.\n"
+"[codeblock]\n"
+"print(OK)                              # Prints 0\n"
+"print(error_string(OK))                # Prints \"OK\"\n"
+"print(error_string(ERR_BUSY))          # Prints \"Busy\"\n"
+"print(error_string(ERR_OUT_OF_MEMORY)) # Prints \"Out of memory\"\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает понятное человеку имя для указанного кода [enum Error].\n"
+"[codeblock]\n"
+"print(OK)                              # Prints 0\n"
+"print(error_string(OK))                # Prints \"OK\"\n"
+"print(error_string(ERR_BUSY))          # Prints \"Busy\"\n"
+"print(error_string(ERR_OUT_OF_MEMORY)) # Prints \"Out of memory\"\n"
+"[/codeblock]"
+
+msgid ""
+"The natural exponential function. It raises the mathematical constant [i]e[/"
+"i] to the power of [param x] and returns it.\n"
+"[i]e[/i] has an approximate value of 2.71828, and can be obtained with "
+"[code]exp(1)[/code].\n"
+"For exponents to other bases use the method [method pow].\n"
+"[codeblock]\n"
+"var a = exp(2) # Approximately 7.39\n"
+"[/codeblock]"
+msgstr ""
+"Естественная показательная функция. Возводит математическую константу [i]e[/"
+"i] в степень [param x] и возвращает ее.\n"
+"[i]e[/i] имеет приблизительное значение 2,71828 и может быть получено с "
+"помощью [code]exp(1)[/code].\n"
+"Для возведения в степень с другими основаниями используйте method [method "
+"pow].\n"
+"[codeblock]\n"
+"var a = exp(2) # Примерно 7.39\n"
+"[/codeblock]"
+
+msgid ""
+"Rounds [param x] downward (towards negative infinity), returning the largest "
+"whole number that is not more than [param x].\n"
+"A type-safe version of [method floor], returning a [float]."
+msgstr ""
+"Округляет [param x] в сторону уменьшения (к отрицательной бесконечности), "
+"возвращая наибольшее целое число, которое не больше, чем [param x].\n"
+"Безопасная для типов версия [method floor], возвращающая [float]."
+
+msgid ""
+"Returns [code]true[/code] if [param x] is a NaN (\"Not a Number\" or invalid) "
+"value."
+msgstr ""
+"Возвращает [code]true[/code] если значением [param x] является NaN (\"Not a "
+"Number\" – недопустимое число или значение)."
+
+msgid ""
+"Returns [code]true[/code] if [param x] is zero or almost zero. The comparison "
+"is done using a tolerance calculation with a small internal epsilon.\n"
+"This function is faster than using [method is_equal_approx] with one value as "
+"zero."
+msgstr ""
+"Возвращает [code]true[/code], если [param x] равен или приблизительно равен "
+"нулю. Сравнивается используя расчет допуска с небольшим внутренним эпсилон.\n"
+"Эта функция работает быстрее, чем использование [method is_equal_approx] с "
+"одним значением, равным нулю."
+
+msgid ""
+"Returns the maximum of the given numeric values. This function can take any "
+"number of arguments.\n"
+"[codeblock]\n"
+"max(1, 7, 3, -6, 5) # Returns 7\n"
+"[/codeblock]\n"
+"[b]Note:[/b] When using this on vectors it will [i]not[/i] perform component-"
+"wise maximum, and will pick the largest value when compared using [code]x < "
+"y[/code]. To perform component-wise maximum, use [method Vector2.max], "
+"[method Vector2i.max], [method Vector3.max], [method Vector3i.max], [method "
+"Vector4.max], and [method Vector4i.max]."
+msgstr ""
+"Возвращает наибольшее из указанных числовых значений. Эта функция может "
+"принимать любое количество аргументов.\n"
+"[codeblock]\n"
+"max(1, 7, 3, -6, 5) # Возвращает 7\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] При использовании этой функции для векторов она [i]не[/i] "
+"вернет максимальный из компонентов, а выберет наибольшее значение, путем "
+"сравнения [code]x < y [/code]. Чтобы найти максимальный из компонентов "
+"используйте [method Vector2.max], [method Vector2i.max], [method Vector3."
+"max], [method Vector3i.max], [method Vector4.max], and [method Vector4i.max]."
+
+msgid ""
+"Returns the minimum of the given numeric values. This function can take any "
+"number of arguments.\n"
+"[codeblock]\n"
+"min(1, 7, 3, -6, 5) # Returns -6\n"
+"[/codeblock]\n"
+"[b]Note:[/b] When using this on vectors it will [i]not[/i] perform component-"
+"wise minimum, and will pick the smallest value when compared using [code]x < "
+"y[/code]. To perform component-wise minimum, use [method Vector2.min], "
+"[method Vector2i.min], [method Vector3.min], [method Vector3i.min], [method "
+"Vector4.min], and [method Vector4i.min]."
+msgstr ""
+"Возвращает наименьшее из указанных числовых значений. Эта функция может "
+"принимать любое количество аргументов.\n"
+"[codeblock]\n"
+"min(1, 7, 3, -6, 5) # Возвращает -6\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] При использовании этой функции для векторов она [i]не[/i] "
+"вернет минимальный из компонентов, а выберет наименьшее значение, путем "
+"сравнения [code]x < y [/code]. Чтобы найти минимальный из компонентов "
+"используйте [method Vector2.min], [method Vector2i.min], [method Vector3."
+"min], [method Vector3i.min], [method Vector4.min], and [method Vector4i.min]."
+
+msgid ""
+"Randomizes the seed (or the internal state) of the random number generator. "
+"The current implementation uses a number based on the device's time.\n"
+"[b]Note:[/b] This function is called automatically when the project is run. "
+"If you need to fix the seed to have consistent, reproducible results, use "
+"[method seed] to initialize the random number generator."
+msgstr ""
+"Рандомизирует начальное число (или внутреннее состояние) генератора случайных "
+"чисел. Текущая реализация использует число, основанное на времени "
+"устройства.\n"
+"[b]Примечание:[/b] Эта функция вызывается автоматически при запуске проекта. "
+"Если вам нужно исправить начальное число, чтобы получить последовательные и "
+"воспроизводимые результаты, используйте [method seed] для инициализации "
+"генератора случайных чисел."
+
+msgid ""
+"Rotates [param from] toward [param to] by the [param delta] amount. Will not "
+"go past [param to].\n"
+"Similar to [method move_toward], but interpolates correctly when the angles "
+"wrap around [constant @GDScript.TAU].\n"
+"If [param delta] is negative, this function will rotate away from [param to], "
+"toward the opposite angle, and will not go past the opposite angle."
+msgstr ""
+"Поворачивает [param from] в сторону [param to] на величину [param delta]. Не "
+"пройдет мимо [param to].\n"
+"Похож на [метод move_toward], но интерполирует правильно, когда углы "
+"оборачиваются вокруг [constant @GDScript.TAU].\n"
+"Если [param delta] отрицательное значение, эта функция будет поворачиваться "
+"от [param to] к противоположному углу и не будет выходить за пределы "
+"противоположного угла."
+
+msgid ""
+"Rounds [param x] to the nearest whole number, with halfway cases rounded away "
+"from 0.\n"
+"A type-safe version of [method round], returning a [float]."
+msgstr ""
+"Округляет [param x] до ближайшего целого числа, при этом средние значения "
+"округляются от 0.\n"
+"Типо-безопасная версия [метода round], возвращающая [float]."
+
+msgid ""
+"Rounds [param x] to the nearest whole number, with halfway cases rounded away "
+"from 0.\n"
+"A type-safe version of [method round], returning an [int]."
+msgstr ""
+"Округляет [param x] до ближайшего целого числа, при этом промежуточные "
+"значения округляются от 0.\n"
+"Безопасная версия для типов [метод round], возвращающая [int]."
+
+msgid ""
+"Sets the seed for the random number generator to [param base]. Setting the "
+"seed manually can ensure consistent, repeatable results for most random "
+"functions.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_seed = \"Godot Rocks\".hash()\n"
+"seed(my_seed)\n"
+"var a = randf() + randi()\n"
+"seed(my_seed)\n"
+"var b = randf() + randi()\n"
+"# a and b are now identical\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"ulong mySeed = (ulong)GD.Hash(\"Godot Rocks\");\n"
+"GD.Seed(mySeed);\n"
+"var a = GD.Randf() + GD.Randi();\n"
+"GD.Seed(mySeed);\n"
+"var b = GD.Randf() + GD.Randi();\n"
+"// a and b are now identical\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Устанавливает начальное значение для генератора случайных чисел в [param "
+"base]. Установка начального числа вручную может обеспечить согласованные и "
+"повторяемые результаты для большинства случайных функций.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_seed = \"Godot Rocks\".hash()\n"
+"seed(my_seed)\n"
+"var a = randf() + randi()\n"
+"seed(my_seed)\n"
+"var b = randf() + randi()\n"
+"# a и b теперь идентичны\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"ulong mySeed = (ulong)GD.Hash(\"Godot Rocks\");\n"
+"GD.Seed(mySeed);\n"
+"var a = GD.Randf() + GD.Randi();\n"
+"GD.Seed(mySeed);\n"
+"var b = GD.Randf() + GD.Randi();\n"
+"// a и b теперь идентичны\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Converts the given [param variant] to the given [param type], using the [enum "
+"Variant.Type] values. This method is generous with how it handles types, it "
+"can automatically convert between array types, convert numeric [String]s to "
+"[int], and converting most things to [String].\n"
+"If the type conversion cannot be done, this method will return the default "
+"value for that type, for example converting [Rect2] to [Vector2] will always "
+"return [constant Vector2.ZERO]. This method will never show error messages as "
+"long as [param type] is a valid Variant type.\n"
+"The returned value is a [Variant], but the data inside and its type will be "
+"the same as the requested type.\n"
+"[codeblock]\n"
+"type_convert(\"Hi!\", TYPE_INT) # Returns 0\n"
+"type_convert(\"123\", TYPE_INT) # Returns 123\n"
+"type_convert(123.4, TYPE_INT) # Returns 123\n"
+"type_convert(5, TYPE_VECTOR2) # Returns (0, 0)\n"
+"type_convert(\"Hi!\", TYPE_NIL) # Returns null\n"
+"[/codeblock]"
+msgstr ""
+"Преобразует заданный [param variant] в заданный [param type], используя "
+"значения [enum Variant.Type]. Этот метод щедро обрабатывает типы: он может "
+"автоматически преобразовывать типы массивов, преобразовывать числовые "
+"значения [String] в [int] и преобразовывать большинство объектов в [String].\n"
+"Если преобразование типа невозможно выполнить, этот метод вернет значение по "
+"умолчанию для этого типа, например, преобразование [Rect2] в [Vector2] всегда "
+"будет возвращать [constant Vector2.ZERO]. Этот метод никогда не будет "
+"отображать сообщения об ошибках, пока [param type] является допустимым типом "
+"варианта.\n"
+"Возвращаемое значение — [Variant], но данные внутри и их тип будут такими же, "
+"как запрошенный тип.\n"
+"[codeblock]\n"
+"type_convert(\"Hi!\", TYPE_INT) # Возвращает 0\n"
+"type_convert(\"123\", TYPE_INT) # Возвращает 123\n"
+"type_convert(123.4, TYPE_INT) # Возвращает 123\n"
+"type_convert(5, TYPE_VECTOR2) # Returns (0, 0)\n"
+"type_convert(\"Hi!\", TYPE_NIL) # Возвращает null\n"
+"[/codeblock]"
+
+msgid ""
+"Encodes a [Variant] value to a byte array, without encoding objects. "
+"Deserialization can be done with [method bytes_to_var].\n"
+"[b]Note:[/b] If you need object serialization, see [method "
+"var_to_bytes_with_objects].\n"
+"[b]Note:[/b] Encoding [Callable] is not supported and will result in an empty "
+"value, regardless of the data."
+msgstr ""
+"Кодирует значение [Variant] в массив байтов без кодирования объектов. "
+"Десериализацию можно выполнить с помощью [method bytes_to_var].\n"
+"[b]Примечание:[/b] Если вам нужна сериализация объектов, см. [method "
+"var_to_bytes_with_objects].\n"
+"[b]Примечание:[/b] Кодировка [Callable] не поддерживается и приведет к "
+"пустому значению независимо от данных."
+
+msgid ""
+"Encodes a [Variant] value to a byte array. Encoding objects is allowed (and "
+"can potentially include executable code). Deserialization can be done with "
+"[method bytes_to_var_with_objects].\n"
+"[b]Note:[/b] Encoding [Callable] is not supported and will result in an empty "
+"value, regardless of the data."
+msgstr ""
+"Кодирует значение [Variant] в массив байтов. Кодирование объектов разрешено "
+"(и потенциально может включать исполняемый код).\n"
+"Десериализацию можно выполнить с помощью [method bytes_to_var_with_objects].\n"
+"[b]Примечание:[/b] Кодировка [Callable] не поддерживается и приведет к "
+"пустому значению независимо от данных."
+
+msgid ""
+"Wraps the [Variant] [param value] between [param min] and [param max]. Can be "
+"used for creating loop-alike behavior or infinite surfaces.\n"
+"Variant types [int] and [float] are supported. If any of the arguments is "
+"[float] this function returns a [float], otherwise it returns an [int].\n"
+"[codeblock]\n"
+"var a = wrap(4, 5, 10)\n"
+"# a is 9 (int)\n"
+"\n"
+"var a = wrap(7, 5, 10)\n"
+"# a is 7 (int)\n"
+"\n"
+"var a = wrap(10.5, 5, 10)\n"
+"# a is 5.5 (float)\n"
+"[/codeblock]"
+msgstr ""
+"Оборачивает [Variant] [param value] между [param min] и [param max]. Может "
+"использоваться для создания поведения, схожего с циклом, или бесконечных "
+"поверхностей.\n"
+"Поддерживаются [int] и [float] типы данных. Если какой-либо аргумент является "
+"[float] то функция возвращает [float], в противном случае возвращает [int].\n"
+"[codeblock]\n"
+"var a = wrap(4, 5, 10)\n"
+"# a is 9 (int)\n"
+"\n"
+"var a = wrap(7, 5, 10)\n"
+"# a is 7 (int)\n"
+"\n"
+"var a = wrap(10.5, 5, 10)\n"
+"# a is 5.5 (float)\n"
+"[/codeblock]"
+
+msgid "The [AudioServer] singleton."
+msgstr "Синглтон [AudioServer]."
+
+msgid "The [CameraServer] singleton."
+msgstr "Синглтон [CameraServer]."
+
+msgid "The [ClassDB] singleton."
+msgstr "Синглтон [ClassDB]."
+
+msgid "The [Engine] singleton."
+msgstr "Синглтон [Engine]."
+
+msgid "The [IP] singleton."
+msgstr "Синглтон [IP]."
+
+msgid "The [Input] singleton."
+msgstr "Синглтон [Input]."
+
+msgid "The [InputMap] singleton."
+msgstr "Синглтон [InputMap]."
+
+msgid ""
+"The [JavaClassWrapper] singleton.\n"
+"[b]Note:[/b] Only implemented on Android."
+msgstr ""
+"Синглтон [JavaClassWrapper].\n"
+"[b]Примечание:[/b] Реализовано только на Android."
+
+msgid "The [Marshalls] singleton."
+msgstr "Синглтон [Marshalls]."
+
+msgid "The [NavigationMeshGenerator] singleton."
+msgstr "Синглтон [NavigationMeshGenerator]."
+
+msgid "The [OS] singleton."
+msgstr "Синглтон [OS]."
+
+msgid "The [Performance] singleton."
+msgstr "Синглтон [Performance]."
+
+msgid "The [ProjectSettings] singleton."
+msgstr "Синглтон [ProjectSettings]."
+
+msgid "The [ResourceLoader] singleton."
+msgstr "Синглтон [ResourceLoader]."
+
+msgid "The [ResourceSaver] singleton."
+msgstr "Синглтон [ResourceSaver]."
+
+msgid "The [Time] singleton."
+msgstr "Синглтон [Time]."
+
+msgid "The [TranslationServer] singleton."
+msgstr "Синглтон [TranslationServer]."
+
+msgid "Top-left corner."
+msgstr "Верхний левый угол."
+
+msgid "Top-right corner."
+msgstr "Верхний правый угол."
+
+msgid "Bottom-right corner."
+msgstr "Нижний правый угол."
+
+msgid "Bottom-left corner."
+msgstr "Нижний левый угол."
+
+msgid ""
+"General vertical alignment, usually used for [Separator], [ScrollBar], "
+"[Slider], etc."
+msgstr ""
+"Общее вертикальное выравнивание, обычно используется для [Separator], "
+"[ScrollBar], [Slider] и т.д."
+
+msgid ""
+"General horizontal alignment, usually used for [Separator], [ScrollBar], "
+"[Slider], etc."
+msgstr ""
+"Общее горизонтальное выравнивание, обычно используется для [Separator], "
+"[ScrollBar], [Slider] и т.д."
+
+msgid ""
+"Clockwise rotation. Used by some methods (e.g. [method Image.rotate_90])."
+msgstr ""
+"Вращение по часовой стрелке. Используется некоторыми методами (например "
+"[method Image.rotate_90])."
+
+msgid "Horizontal left alignment, usually for text-derived classes."
+msgstr ""
+"Горизонтальное выравнивание по левому краю, обычно для классов, содержащих "
+"текст."
+
+msgid "Horizontal center alignment, usually for text-derived classes."
+msgstr ""
+"Горизонтальное выравнивание по центру, обычно для классов, содержащих текст."
+
+msgid "Horizontal right alignment, usually for text-derived classes."
+msgstr ""
+"Горизонтальное выравнивание по правому краю, обычно для классов, содержащих "
+"текст."
+
+msgid "Vertical top alignment, usually for text-derived classes."
+msgstr "Вертикальное выравнивание сверху, обычно для классов, содержащих текст."
+
+msgid "Vertical center alignment, usually for text-derived classes."
+msgstr ""
+"Вертикальное выравнивание по центру, обычно для классов, содержащих текст."
+
+msgid "Vertical bottom alignment, usually for text-derived classes."
+msgstr "Вертикальное выравнивание снизу, обычно для классов, содержащих текст."
+
+msgid ""
+"Aligns the top of the inline object (e.g. image, table) to the position of "
+"the text specified by [code]INLINE_ALIGNMENT_TO_*[/code] constant."
+msgstr ""
+"Выравнивает верх встроенного объекта (например, изображения, таблицы) к "
+"позиции текста, определённой константой [code]INLINE_ALIGNMENT_TO_*[/code]."
+
+msgid ""
+"Aligns the center of the inline object (e.g. image, table) to the position of "
+"the text specified by [code]INLINE_ALIGNMENT_TO_*[/code] constant."
+msgstr ""
+"Выравнивает центр встроенного объекта (например, изображения, таблицы) к "
+"позиции текста, определённой константой [code]INLINE_ALIGNMENT_TO_*[/code]."
+
+msgid ""
+"Aligns the baseline (user defined) of the inline object (e.g. image, table) "
+"to the position of the text specified by [code]INLINE_ALIGNMENT_TO_*[/code] "
+"constant."
+msgstr ""
+"Выравнивает базовую линию (определенную пользователем) встроенного объекта "
+"(например, изображение, таблица), относительно положения текста, указанного "
+"константой [code]INLINE_ALIGNMENT_TO_*[/code] ."
+
+msgid ""
+"Aligns the bottom of the inline object (e.g. image, table) to the position of "
+"the text specified by [code]INLINE_ALIGNMENT_TO_*[/code] constant."
+msgstr ""
+"Выравнивает низ встроенного объекта (например, изображения, таблицы) к "
+"позиции текста, определённой константой [code]INLINE_ALIGNMENT_TO_*[/code]."
+
+msgid ""
+"Aligns the position of the inline object (e.g. image, table) specified by "
+"[code]INLINE_ALIGNMENT_*_TO[/code] constant to the top of the text."
+msgstr ""
+"Выравнивает позицию встроенного объекта (например, изображения, таблицы), "
+"определённой константой [code]INLINE_ALIGNMENT_*_TO[/code] к верху текста."
+
+msgid ""
+"Aligns the position of the inline object (e.g. image, table) specified by "
+"[code]INLINE_ALIGNMENT_*_TO[/code] constant to the center of the text."
+msgstr ""
+"Выравнивает позицию встроенного объекта (например, изображения, таблицы), "
+"определённой константой [code]INLINE_ALIGNMENT_*_TO[/code] к центру текста."
+
+msgid ""
+"Aligns the position of the inline object (e.g. image, table) specified by "
+"[code]INLINE_ALIGNMENT_*_TO[/code] constant to the baseline of the text."
+msgstr ""
+"Выравнивает положение встроенного объекта (например, изображение, таблица) "
+"указанного константой [code]INLINE_ALIGNMENT_*_TO[/code], относительно "
+"базовой линии текста."
+
+msgid "Aligns inline object (e.g. image, table) to the bottom of the text."
+msgstr ""
+"Выравнивает встроенный объект (например, изображение, таблица) по нижней "
+"части текста."
+
+msgid ""
+"Aligns top of the inline object (e.g. image, table) to the top of the text. "
+"Equivalent to [code]INLINE_ALIGNMENT_TOP_TO | INLINE_ALIGNMENT_TO_TOP[/code]."
+msgstr ""
+"Выравнивает верхнюю часть встроенного объекта (например, изображение, "
+"таблица) относительно верхней части текста. Аналогично "
+"[code]INLINE_ALIGNMENT_TOP_TO | INLINE_ALIGNMENT_TO_TOP[/code]."
+
+msgid ""
+"Aligns center of the inline object (e.g. image, table) to the center of the "
+"text. Equivalent to [code]INLINE_ALIGNMENT_CENTER_TO | "
+"INLINE_ALIGNMENT_TO_CENTER[/code]."
+msgstr ""
+"Выравнивает центр встроенного объекта (например, изображение, таблица) по "
+"центру текста. Аналогично [code]INLINE_ALIGNMENT_CENTER_TO | "
+"INLINE_ALIGNMENT_TO_CENTER[/code]."
+
+msgid ""
+"Aligns bottom of the inline object (e.g. image, table) to the bottom of the "
+"text. Equivalent to [code]INLINE_ALIGNMENT_BOTTOM_TO | "
+"INLINE_ALIGNMENT_TO_BOTTOM[/code]."
+msgstr ""
+"Выравнивает нижнюю часть встроенного объекта (например, изображение, таблица) "
+"по нижней части текста. Аналогично [code]INLINE_ALIGNMENT_BOTTOM_TO | "
+"INLINE_ALIGNMENT_TO_BOTTOM[/code]."
+
+msgid "A bit mask for [code]INLINE_ALIGNMENT_*_TO[/code] alignment constants."
+msgstr ""
+"Битовая маска для констант выравнивания [code]INLINE_ALIGNMENT_*_TO[/code]."
+
+msgid "A bit mask for [code]INLINE_ALIGNMENT_TO_*[/code] alignment constants."
+msgstr ""
+"Битовая маска для констант выравнивания [code]INLINE_ALIGNMENT_*_TO[/code]."
+
+msgid ""
+"Specifies that Euler angles should be in XYZ order. When composing, the order "
+"is X, Y, Z. When decomposing, the order is reversed, first Z, then Y, and X "
+"last."
+msgstr ""
+"Указывает что углы Эйлера должны быть в порядке XYZ. При составлении порядок "
+"X, Y, Z. А при разложении порядок меняется на противоположный, сначала Z, "
+"потом Y, а в конце X."
+
+msgid ""
+"Specifies that Euler angles should be in XZY order. When composing, the order "
+"is X, Z, Y. When decomposing, the order is reversed, first Y, then Z, and X "
+"last."
+msgstr ""
+"Указывает что углы Эйлера должны быть в порядке XZY. При составлении порядок "
+"X, Z, Y. А при разложении порядок меняется на противоположный, сначала Y, "
+"потом Z, а в конце X."
+
+msgid ""
+"Specifies that Euler angles should be in YXZ order. When composing, the order "
+"is Y, X, Z. When decomposing, the order is reversed, first Z, then X, and Y "
+"last."
+msgstr ""
+"Указывает что углы Эйлера должны быть в порядке YXZ. При составлении порядок "
+"Y,X,Z. А при разложении порядок меняется на противоположный, сначала Z, потом "
+"X, а в конце Y."
+
+msgid ""
+"Specifies that Euler angles should be in YZX order. When composing, the order "
+"is Y, Z, X. When decomposing, the order is reversed, first X, then Z, and Y "
+"last."
+msgstr ""
+"Указывает что углы Эйлера должны быть в порядке YZX. При составлении порядок "
+"Y, Z, X. А при разложении порядок меняется на противоположный, сначала X, "
+"потом Z, а в конце X."
+
+msgid ""
+"Specifies that Euler angles should be in ZXY order. When composing, the order "
+"is Z, X, Y. When decomposing, the order is reversed, first Y, then X, and Z "
+"last."
+msgstr ""
+"Указывает что углы Эйлера должны быть в порядке ZXY. При составлении порядок "
+"Z, X, Y. А при разложении порядок меняется на противоположный, сначала Y, "
+"потом X, а в конце Z."
+
+msgid ""
+"Specifies that Euler angles should be in ZYX order. When composing, the order "
+"is Z, Y, X. When decomposing, the order is reversed, first X, then Y, and Z "
+"last."
+msgstr ""
+"Указывает что углы Эйлера должны быть в порядке ZYX. При составлении порядок "
+"Z, Y, X. А при разложении порядок меняется на противоположный, сначала X, "
+"потом Y, а в конце Z."
+
+msgid ""
+"Enum value which doesn't correspond to any key. This is used to initialize "
+"[enum Key] properties with a generic state."
+msgstr ""
+"Значение перечисления, которые не соответствует ни одному ключу. Это "
+"используется для инициализации свойств [enum Key] с общим состоянием."
+
+msgid "Escape key."
+msgstr "Клавиша Escape."
+
+msgid "Tab key."
+msgstr "Клавиша Tab."
+
+msgid "Backspace key."
+msgstr "Клавиша Backspace."
+
+msgid "Return key (on the main keyboard)."
+msgstr "Клавиша возврата (на основной клавиатуре)."
+
+msgid "Enter key on the numeric keypad."
+msgstr "Клавиша ввода на цифровой клавиатуре."
+
+msgid "Insert key."
+msgstr "Клавиша Insert."
+
+msgid "Delete key."
+msgstr "Клавиша Delete."
+
+msgid "Pause key."
+msgstr "Клавиша Pause."
+
+msgid "Print Screen key."
+msgstr "Клавиша Print Screen."
+
+msgid "System Request key."
+msgstr "Клавиша System Request."
+
+msgid "Clear key."
+msgstr "Клавиша очистки."
+
+msgid "Home key."
+msgstr "Клавиша Home."
+
+msgid "End key."
+msgstr "Клавиша End."
+
+msgid "Left arrow key."
+msgstr "Клавиша со стрелкой влево."
+
+msgid "Up arrow key."
+msgstr "Клавиша со стрелкой вверх."
+
+msgid "Right arrow key."
+msgstr "Клавиша со стрелкой вправо."
+
+msgid "Down arrow key."
+msgstr "Клавиша со стрелкой вниз."
+
+msgid "Page Up key."
+msgstr "Клавиша Page Up."
+
+msgid "Page Down key."
+msgstr "Клавиша Page Down."
+
+msgid "Shift key."
+msgstr "Клавиша Shift."
+
+msgid "Control key."
+msgstr "Клавиша Control."
+
+msgid "Meta key."
+msgstr "Клавиша Meta."
+
+msgid "Alt key."
+msgstr "Клавиша Alt."
+
+msgid "Caps Lock key."
+msgstr "Клавиша Caps Lock."
+
+msgid "Num Lock key."
+msgstr "Клавиша Num Lock."
+
+msgid "Scroll Lock key."
+msgstr "Клавиша Scroll Lock."
+
+msgid "F1 key."
+msgstr "Клавиша F1."
+
+msgid "F2 key."
+msgstr "Клавиша F2."
+
+msgid "F3 key."
+msgstr "Клавиша F3."
+
+msgid "F4 key."
+msgstr "Клавиша F4."
+
+msgid "F5 key."
+msgstr "Клавиша F5."
+
+msgid "F6 key."
+msgstr "Клавиша F6."
+
+msgid "F7 key."
+msgstr "Клавиша F7."
+
+msgid "F8 key."
+msgstr "Клавиша F8."
+
+msgid "F9 key."
+msgstr "Клавиша F9."
+
+msgid "F10 key."
+msgstr "Клавиша F10."
+
+msgid "F11 key."
+msgstr "Клавиша F11."
+
+msgid "F12 key."
+msgstr "Клавиша F12."
+
+msgid "F13 key."
+msgstr "Клавиша F13."
+
+msgid "F14 key."
+msgstr "Клавиша F14."
+
+msgid "F15 key."
+msgstr "Клавиша F15."
+
+msgid "F16 key."
+msgstr "Клавиша F16."
+
+msgid "F17 key."
+msgstr "Клавиша F17."
+
+msgid "F18 key."
+msgstr "Клавиша F18."
+
+msgid "F19 key."
+msgstr "Клавиша F19."
+
+msgid "F20 key."
+msgstr "Клавиша F20."
+
+msgid "F21 key."
+msgstr "Клавиша F21."
+
+msgid "F22 key."
+msgstr "Клавиша F22."
+
+msgid "F23 key."
+msgstr "Клавиша F23."
+
+msgid "F24 key."
+msgstr "Клавиша F24."
+
+msgid "F25 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F25. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F26 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F26. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F27 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F27. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F28 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F28. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F29 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F29. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F30 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F30. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F31 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F31. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F32 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F32. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F33 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F33. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F34 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F34. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "F35 key. Only supported on macOS and Linux due to a Windows limitation."
+msgstr ""
+"Клавиша F35. Поддерживается только в macOS и Linux, из-за ограничений Windows."
+
+msgid "Multiply (*) key on the numeric keypad."
+msgstr "Клавиша умножения (*) на цифровой клавиатуре."
+
+msgid "Divide (/) key on the numeric keypad."
+msgstr "Клавиша деления (/) на цифровой клавиатуре."
+
+msgid "Subtract (-) key on the numeric keypad."
+msgstr "Клавиша вычитания (-) на цифровой клавиатуре."
+
+msgid "Period (.) key on the numeric keypad."
+msgstr "Клавиша точки (.) на цифровой клавиатуре."
+
+msgid "Add (+) key on the numeric keypad."
+msgstr "Клавиша сложения (+) на цифровой клавиатуре."
+
+msgid "Number 0 on the numeric keypad."
+msgstr "Цифра 0 на цифровой клавиатуре."
+
+msgid "Number 1 on the numeric keypad."
+msgstr "Цифра 1 на цифровой клавиатуре."
+
+msgid "Number 2 on the numeric keypad."
+msgstr "Цифра 2 на цифровой клавиатуре."
+
+msgid "Number 3 on the numeric keypad."
+msgstr "Цифра 3 на цифровой клавиатуре."
+
+msgid "Number 4 on the numeric keypad."
+msgstr "Цифра 4 на цифровой клавиатуре."
+
+msgid "Number 5 on the numeric keypad."
+msgstr "Цифра 5 на цифровой клавиатуре."
+
+msgid "Number 6 on the numeric keypad."
+msgstr "Цифра 6 на цифровой клавиатуре."
+
+msgid "Number 7 on the numeric keypad."
+msgstr "Цифра 7 на цифровой клавиатуре."
+
+msgid "Number 8 on the numeric keypad."
+msgstr "Цифра 8 на цифровой клавиатуре."
+
+msgid "Number 9 on the numeric keypad."
+msgstr "Цифра 9 на цифровой клавиатуре."
+
+msgid "Context menu key."
+msgstr "Клавиша контекстного меню."
+
+msgid "Hyper key. (On Linux/X11 only)."
+msgstr "Гипер ключ. (Только в Linux/X11)."
+
+msgid "Help key."
+msgstr "Клавиша помощи."
+
+msgid "Media stop key."
+msgstr "Клавиша остановки мультимедиа."
+
+msgid "Volume down key."
+msgstr "Клавиша уменьшения громкости."
+
+msgid "Mute volume key."
+msgstr "Клавиша отключения звука."
+
+msgid "Volume up key."
+msgstr "Клавиша увеличения громкости."
+
+msgid "Favorites key."
+msgstr "Клавиша \"Избранное\"."
+
+msgid "Search key."
+msgstr "Клавиша поиска."
+
+msgid "Standby key."
+msgstr "Клавиша выключения."
+
+msgid "Open URL / Launch Browser key."
+msgstr "Клавиша «Открыть URL / Запустить браузер»."
+
+msgid "Launch Shortcut 0 key."
+msgstr "Клавиша запуска 0."
+
+msgid "Launch Shortcut 1 key."
+msgstr "Клавиша запуска 1."
+
+msgid "Launch Shortcut 2 key."
+msgstr "Клавиша запуска 2."
+
+msgid "Launch Shortcut 3 key."
+msgstr "Клавиша запуска 3."
+
+msgid "Launch Shortcut 4 key."
+msgstr "Клавиша запуска 4."
+
+msgid "Launch Shortcut 5 key."
+msgstr "Клавиша запуска 5."
+
+msgid "Launch Shortcut 6 key."
+msgstr "Клавиша запуска 6."
+
+msgid "Launch Shortcut 7 key."
+msgstr "Клавиша запуска 7."
+
+msgid "Launch Shortcut 8 key."
+msgstr "Клавиша запуска 8."
+
+msgid "Launch Shortcut 9 key."
+msgstr "Клавиша запуска 9."
+
+msgid "Launch Shortcut A key."
+msgstr "Клавиша запуска A."
+
+msgid "Launch Shortcut B key."
+msgstr "Клавиша запуска B."
+
+msgid "Launch Shortcut C key."
+msgstr "Клавиша запуска C."
+
+msgid "Launch Shortcut D key."
+msgstr "Клавиша запуска D."
+
+msgid "Launch Shortcut E key."
+msgstr "Клавиша запуска E."
+
+msgid "Launch Shortcut F key."
+msgstr "Клавиша запуска F."
+
+msgid "Unknown key."
+msgstr "Неизвестная клавиша."
+
+msgid "Space key."
+msgstr "Клавиша пробела."
+
+msgid "Number 3 key."
+msgstr "Клавиша 3."
+
+msgid "Number 4 key."
+msgstr "Клавиша 4."
+
+msgid "Number 5 key."
+msgstr "Клавиша 5."
+
+msgid "Number 6 key."
+msgstr "Клавиша 6."
+
+msgid "Number 7 key."
+msgstr "Клавиша 7."
+
+msgid "Number 8 key."
+msgstr "Клавиша 8."
+
+msgid "Number 9 key."
+msgstr "Клавиша 9."
+
+msgid "A key."
+msgstr "Клавиша A."
+
+msgid "B key."
+msgstr "Клавиша B."
+
+msgid "C key."
+msgstr "Клавиша C."
+
+msgid "D key."
+msgstr "Клавиша D."
+
+msgid "E key."
+msgstr "Клавиша E."
+
+msgid "F key."
+msgstr "Клавиша F."
+
+msgid "G key."
+msgstr "Клавиша G."
+
+msgid "H key."
+msgstr "Клавиша H."
+
+msgid "I key."
+msgstr "Клавиша I."
+
+msgid "J key."
+msgstr "Клавиша J."
+
+msgid "K key."
+msgstr "Клавиша K."
+
+msgid "L key."
+msgstr "Клавиша L."
+
+msgid "M key."
+msgstr "Клавиша M."
+
+msgid "N key."
+msgstr "Клавиша N."
+
+msgid "O key."
+msgstr "Клавиша O."
+
+msgid "P key."
+msgstr "Клавиша P."
+
+msgid "Q key."
+msgstr "Клавиша Q."
+
+msgid "R key."
+msgstr "Клавиша R."
+
+msgid "S key."
+msgstr "Клавиша S."
+
+msgid "T key."
+msgstr "Клавиша T."
+
+msgid "U key."
+msgstr "Клавиша U."
+
+msgid "V key."
+msgstr "Клавиша V."
+
+msgid "W key."
+msgstr "Клавиша W."
+
+msgid "X key."
+msgstr "Клавиша X."
+
+msgid "Y key."
+msgstr "Клавиша Y."
+
+msgid "Z key."
+msgstr "Клавиша Z."
+
+msgid "Backslash ([code]\\[/code]) key."
+msgstr "Клавиша обратной косой черты (Backslash key) ([code]\\[/code])."
+
+msgid "Vertical bar or [i]pipe[/i] ([code]|[/code]) key."
+msgstr "Вертикальная черта или [i]pipe[/i] ([code]|[/code])."
+
+msgid ""
+"Automatically remapped to [constant KEY_META] on macOS and [constant "
+"KEY_CTRL] on other platforms, this mask is never set in the actual events, "
+"and should be used for key mapping only."
+msgstr ""
+"Автоматически переназначается на [constant KEY_META] на macOS и на [constant "
+"KEY_CTRL] на других платформах, эта маска никогда не устанавливается в "
+"реальных событиях и должна использоваться только для сопоставления ключей."
+
+msgid "Shift key mask."
+msgstr "Маска клавиши Shift."
+
+msgid "Alt or Option (on macOS) key mask."
+msgstr "Маска клавиш Alr или Option (на macOS)."
+
+msgid "Keypad key mask."
+msgstr "Маска клавиш цифровой клавиатуры."
+
+msgid "Group Switch key mask."
+msgstr "Маска клавиш группового переключатель."
+
+msgid ""
+"Used for keys which only appear once, or when a comparison doesn't need to "
+"differentiate the [code]LEFT[/code] and [code]RIGHT[/code] versions.\n"
+"For example, when using [method InputEvent.is_match], an event which has "
+"[constant KEY_LOCATION_UNSPECIFIED] will match any [enum KeyLocation] on the "
+"passed event."
+msgstr ""
+"Используется для клавиш, которые появляются только один раз, или когда при "
+"сравнении не требуется различать [code] LEFT[/code] и [code]RIGHT [/code] "
+"версий.\n"
+"Например, при использовании [method InputEvent.is_match], событие которые, "
+"имеет [constant KEY_LOCATION_UNSPECIFIED] будет соответствовать любому [enum "
+"KeyLocation] в переданном событии."
+
+msgid "A key which is to the left of its twin."
+msgstr "Клавиша, которая находится слева от своего двойника."
+
+msgid "A key which is to the right of its twin."
+msgstr "Клавиша, которая находится справа от своего двойника."
+
+msgid ""
+"Enum value which doesn't correspond to any mouse button. This is used to "
+"initialize [enum MouseButton] properties with a generic state."
+msgstr ""
+"Значение перечисления, которое не соответствует ни одной кнопке мыши. Это "
+"используется для инициализации свойств [enum MouseButton] с помощью общего "
+"состояния."
+
+msgid "Primary mouse button, usually assigned to the left button."
+msgstr "Основная кнопка мыши, обычно назначаемая левой кнопке."
+
+msgid "Secondary mouse button, usually assigned to the right button."
+msgstr "Дополнительная кнопка мыши, обычно назначаемая правой."
+
+msgid "Middle mouse button."
+msgstr "Средняя кнопка мыши."
+
+msgid "Primary mouse button mask, usually for the left button."
+msgstr "Маска основной кнопки мыши, обычно для левой кнопки."
+
+msgid "Secondary mouse button mask, usually for the right button."
+msgstr "Маска дополнительной кнопки мыши, обычно для правой кнопки."
+
+msgid "Middle mouse button mask."
+msgstr "Маска средней кнопки мыши."
+
+msgid ""
+"Game controller SDL button A. Corresponds to the bottom action button: Sony "
+"Cross, Xbox A, Nintendo B."
+msgstr ""
+"Кнопка А игрового контроллера SDL. Соответствует нижней кнопке действия: "
+"Крестик на контроллерах Sony, А на контроллерах Xbox, B на контроллерах "
+"Nintendo."
+
+msgid ""
+"Game controller SDL button B. Corresponds to the right action button: Sony "
+"Circle, Xbox B, Nintendo A."
+msgstr ""
+"Кнопка B игрового контроллера SDL. Соответствует правой кнопке действия: "
+"Кружок на контроллерах Sony, B на контроллерах Xbox, A на контроллерах "
+"Nintendo."
+
+msgid ""
+"Game controller SDL button X. Corresponds to the left action button: Sony "
+"Square, Xbox X, Nintendo Y."
+msgstr ""
+"Кнопка X игрового контроллера SDL. Соответствует левой кнопке действия: "
+"Квадрат на контроллерах Sony, X на контроллерах Xbox, Y на контроллерах "
+"Nintendo."
+
+msgid ""
+"Game controller SDL button Y. Corresponds to the top action button: Sony "
+"Triangle, Xbox Y, Nintendo X."
+msgstr ""
+"Кнопка Y игрового контроллера SDL. Соответствует верхней кнопке действия: "
+"Треугольник на контроллерах Sony, Y на контроллерах Xbox, X на контроллерах "
+"Nintendo."
+
+msgid ""
+"Game controller SDL back button. Corresponds to the Sony Select, Xbox Back, "
+"Nintendo - button."
+msgstr ""
+"Кнопка возврата игрового контроллера SDL. Соответствует кнопкам: Выбор на "
+"контроллерах Sony, Возврат на Xbox, \"-\" на контроллерах Nintendo."
+
+msgid ""
+"Game controller SDL guide button. Corresponds to the Sony PS, Xbox Home "
+"button."
+msgstr ""
+"Кнопка управления игрового контроллера SDL. Соответствует кнопкам Sony PS и "
+"Xbox Home."
+
+msgid ""
+"Game controller SDL start button. Corresponds to the Sony Options, Xbox Menu, "
+"Nintendo + button."
+msgstr ""
+"Кнопка запуска игрового контроллера SDL. Соответствует кнопкам: Настройки на "
+"контроллерах Sony, Меню на контроллерах Xbox, \"+\" на контроллерах Nintendo."
+
+msgid ""
+"Game controller SDL left stick button. Corresponds to the Sony L3, Xbox L/LS "
+"button."
+msgstr ""
+"Левый стик игрового контроллера SDL. Соответствует кнопкам: L3 на Sony, L/LS "
+"на Xbox."
+
+msgid ""
+"Game controller SDL right stick button. Corresponds to the Sony R3, Xbox R/RS "
+"button."
+msgstr ""
+"Правый стик игрового контроллера SDL. Соответствует кнопкам: R3 на Sony, R/RS "
+"на Xbox."
+
+msgid ""
+"Game controller SDL left shoulder button. Corresponds to the Sony L1, Xbox LB "
+"button."
+msgstr ""
+"Левая плечевая кнопка игрового контроллера SDL. Соответствует кнопкам: L1 на "
+"Sony и LB на Xbox."
+
+msgid ""
+"Game controller SDL right shoulder button. Corresponds to the Sony R1, Xbox "
+"RB button."
+msgstr ""
+"Правая плечевая кнопка игрового контроллера SDL. Соответствует кнопкам: R1 на "
+"Sony и RB на Xbox."
+
+msgid ""
+"Game controller SDL miscellaneous button. Corresponds to Xbox share button, "
+"PS5 microphone button, Nintendo Switch capture button."
+msgstr ""
+"Кнопка разное на игровом контроллере SDL. Соответствует кнопкам: поделиться "
+"на Xbox, микрофон на PS5, захват на Nintendo Switch."
+
+msgid "The number of SDL game controller axes."
+msgstr "Количество осей игрового контроллера SDL."
+
+msgid ""
+"The maximum number of game controller axes: OpenVR supports up to 5 Joysticks "
+"making a total of 10 axes."
+msgstr ""
+"Максимальное количество игрового котроллера: OpenVR поддерживает до 5 "
+"Джойстиков, что в итоге дает 10 осей."
+
+msgid ""
+"Does not correspond to any MIDI message. This is the default value of [member "
+"InputEventMIDI.message]."
+msgstr ""
+"Не соответствует ни одному MIDI-сообщению. Это значение по умолчанию для "
+"[member InputEventMIDI.message]."
+
+msgid "MIDI message sent when a note is pressed."
+msgstr "MIDI-сообщение, отправляемое при нажатии на ноту."
+
+msgid ""
+"MIDI message sent to indicate a change in pressure while a note is being "
+"pressed down, also called aftertouch."
+msgstr ""
+"MIDI-сообщение, отправляемое для указания изменения давления при нажатии "
+"ноты, также называемое aftertouch."
+
+msgid ""
+"MIDI message sent when a controller value changes. In a MIDI device, a "
+"controller is any input that doesn't play notes. These may include sliders "
+"for volume, balance, and panning, as well as switches and pedals. See the "
+"[url=https://en.wikipedia.org/wiki/General_MIDI#Controller_events]General "
+"MIDI specification[/url] for a small list."
+msgstr ""
+"MIDI-сообщение, отправляемое после изменения значения контроллера. В MIDI "
+"устройстве, контроллер — любое устройство, которое не проигрывает ноты. К ним "
+"могут относиться ползунки для регулировки громкости звука, регулировки "
+"баланса и панорамирования, а также переключатели и педали. Подробнее о них "
+"смотрите по ссылке: [url=https://en.wikipedia.org/wiki/"
+"General_MIDI#Controller_events]General MIDI specification[/url]."
+
+msgid ""
+"MIDI message sent when the MIDI device changes its current instrument (also "
+"called [i]program[/i] or [i]preset[/i])."
+msgstr ""
+"MIDI-сообщение, отправляемое после изменения MIDI-устройством своего "
+"инструмента (также называется [i]программой[/i] или [i]предустановкой[/i])."
+
+msgid ""
+"MIDI message sent to indicate a change in pressure for the whole channel. "
+"Some MIDI devices may send this instead of [constant MIDI_MESSAGE_AFTERTOUCH]."
+msgstr ""
+"MIDI-сообщение, отправляемое для указания изменения давления для всего "
+"канала. Некоторые MIDI-устройства могут отправлять его вместо [constant "
+"MIDI_MESSAGE_AFTERTOUCH]."
+
+msgid ""
+"MIDI message sent when the value of the pitch bender changes, usually a wheel "
+"on the MIDI device."
+msgstr ""
+"MIDI-сообщение, отправляемое после изменения значения питч-бендера, обычно "
+"колесиком, расположенным на MIDI-устройстве."
+
+msgid ""
+"MIDI system exclusive (SysEx) message. This type of message is not "
+"standardized and it's highly dependent on the MIDI device sending it.\n"
+"[b]Note:[/b] Getting this message's data from [InputEventMIDI] is not "
+"implemented."
+msgstr ""
+"Системное эксклюзивное сообщение MIDI (SysEx). Этот тип сообщения не является "
+"стандартным и во многом зависит от отправляющего его MIDI-устройства.\n"
+"[b]Примечание:[/b] Получение данных этого сообщения через [InputEventMIDI] не "
+"реализовано."
+
+msgid ""
+"MIDI message sent every quarter frame to keep connected MIDI devices "
+"synchronized. Related to [constant MIDI_MESSAGE_TIMING_CLOCK].\n"
+"[b]Note:[/b] Getting this message's data from [InputEventMIDI] is not "
+"implemented."
+msgstr ""
+"MIDI-сообщение, отправляемое каждую четверть кадра для синхронизации "
+"подключенных MIDI-устройств. Связано с [constant MIDI_MESSAGE_TIMING_CLOCK].\n"
+"[b]Примечание:[/b] Получение данных этого сообщения через [InputEventMIDI] не "
+"реализовано."
+
+msgid ""
+"MIDI message sent to jump onto a new position in the current sequence or "
+"song.\n"
+"[b]Note:[/b] Getting this message's data from [InputEventMIDI] is not "
+"implemented."
+msgstr ""
+"MIDI-сообщение, отправляемое для перехода на новую позицию в текущей "
+"секвенции или песне.\n"
+"[b]Примечание:[/b] Получение данных этого сообщения через [InputEventMIDI] не "
+"реализовано."
+
+msgid ""
+"MIDI message sent to request a tuning calibration. Used on analog "
+"synthesizers. Most modern MIDI devices do not need this message."
+msgstr ""
+"MIDI-сообщение, отправляемое для запроса калибровки настройки. Используется в "
+"аналоговых синтезаторах. Большинству современных MIDI-устройств это сообщение "
+"не требуется."
+
+msgid ""
+"MIDI message sent 24 times after [constant MIDI_MESSAGE_QUARTER_FRAME], to "
+"keep connected MIDI devices synchronized."
+msgstr ""
+"MIDI-сообщение, отправляемое 24 раза после [constant "
+"MIDI_MESSAGE_QUARTER_FRAME], для синхронизации подключенных MIDI-устройств."
+
+msgid ""
+"MIDI message sent to resume from the point the current sequence or song was "
+"paused."
+msgstr ""
+"MIDI-сообщение, отправляемое для возобновления воспроизведения с того "
+"момента, когда текущая секвенция или песня была приостановлена."
+
+msgid ""
+"MIDI message sent repeatedly while the MIDI device is idle, to tell the "
+"receiver that the connection is alive. Most MIDI devices do not send this "
+"message."
+msgstr ""
+"MIDI-сообщение, многократно отправляемое во время бездействия MIDI-устройства "
+"для того, чтобы сообщить приемнику, что связь поддерживается. Большинство "
+"MIDI-устройств это сообщение не отправляется."
+
+msgid ""
+"MIDI message sent to reset a MIDI device to its default state, as if it was "
+"just turned on. It should not be sent when the MIDI device is being turned on."
+msgstr ""
+"MIDI-сообщение, отправляемое для возврата MIDI-устройства в состояние по "
+"умолчанию, как если бы оно было только что включено. Его нельзя отправлять, "
+"когда MIDI-устройство включено."
+
+msgid "Generic error."
+msgstr "Общая ошибка."
+
+msgid "Unavailable error."
+msgstr "Ошибка \"Недоступно\"."
+
+msgid "Unconfigured error."
+msgstr "Ошибка \"Не настроено\"."
+
+msgid "Unauthorized error."
+msgstr "Ошибка \"Не авторизовано\"."
+
+msgid "File: Not found error."
+msgstr "Ошибка \"Файл: Не найден\"."
+
+msgid "File: Bad drive error."
+msgstr "Ошибка \"Файл: Недопустимый диск\"."
+
+msgid "File: Bad path error."
+msgstr "Ошибка \"Файл: Неверный путь\"."
+
+msgid "File: No permission error."
+msgstr "Ошибка \"Файл: Нет разрешения\"."
+
+msgid "File: Already in use error."
+msgstr "Ошибка \"Файл: Уже используется\"."
+
+msgid "File: Can't open error."
+msgstr "Ошибка \"Файл: Невозможно открыть\"."
+
+msgid "File: Can't write error."
+msgstr "Ошибка \"Файл: Невозможно записать\"."
+
+msgid "File: Can't read error."
+msgstr "Ошибка \"Файл: Невозможно прочитать\"."
+
+msgid "File: Unrecognized error."
+msgstr "Ошибка \"Файл: Не распознан\"."
+
+msgid "File: Corrupt error."
+msgstr "Ошибка \"Файл: Повреждён\"."
+
+msgid "File: Missing dependencies error."
+msgstr "Ошибка \"Файл: Отсутствуют зависимости\"."
+
+msgid "File: End of file (EOF) error."
+msgstr "Ошибка \"Файл: Конец файла (EOF)\"."
+
+msgid "Can't open error."
+msgstr "Ошибка \"Невозможно открыть\"."
+
+msgid "Can't create error."
+msgstr "Ошибка \"Невозможно создать\"."
+
+msgid "Query failed error."
+msgstr "Ошибка \"Не удалось выполнить запрос\"."
+
+msgid "Already in use error."
+msgstr "Ошибка \"Уже используется\"."
+
+msgid "Locked error."
+msgstr "Ошибка \"Заблокировано\"."
+
+msgid "Timeout error."
+msgstr "Ошибка \"Время ожидания истекло\"."
+
+msgid "Can't connect error."
+msgstr "Ошибка \"Невозможно подключиться\"."
+
+msgid "Can't resolve error."
+msgstr "Ошибка \"Невозможно разрешить\"."
+
+msgid "Connection error."
+msgstr "Ошибка подключения."
+
+msgid "Can't acquire resource error."
+msgstr "Ошибка \"Невозможно получить ресурс\"."
+
+msgid "Invalid data error."
+msgstr "Ошибка неверных данных."
+
+msgid "Invalid parameter error."
+msgstr "Ошибка неверного параметра."
+
+msgid "Already exists error."
+msgstr "Ошибка \"Уже существует\"."
+
+msgid "Does not exist error."
+msgstr "Ошибка \"Не существует\"."
+
+msgid "Database: Read error."
+msgstr "База данных: Ошибка чтения."
+
+msgid "Database: Write error."
+msgstr "База данных: Ошибка записи."
+
+msgid "Compilation failed error."
+msgstr "Ошибка компиляции."
+
+msgid "Method not found error."
+msgstr "Ошибка \"Метод не найден\"."
+
+msgid "Linking failed error."
+msgstr "Ошибка линковки."
+
+msgid "Invalid declaration error."
+msgstr "Ошибка \"Недопустимое определение\"."
+
+msgid "Duplicate symbol error."
+msgstr "Ошибка \"Повторяющийся символ\"."
+
+msgid "Parse error."
+msgstr "Ошибка синтаксического разбора."
+
+msgid "Busy error."
+msgstr "Ошибка \"Занято\"."
+
+msgid "Skip error."
+msgstr "Ошибка \"Пропущено\"."
+
+msgid ""
+"Help error. Used internally when passing [code]--version[/code] or [code]--"
+"help[/code] as executable options."
+msgstr ""
+"Ошибка при получении справки. Служит для внутреннего использования при "
+"передаче [code]--version[/code] или [code]--help[/code] в качестве опций "
+"исполняемого файла."
+
+msgid ""
+"Bug error, caused by an implementation issue in the method.\n"
+"[b]Note:[/b] If a built-in method returns this code, please open an issue on "
+"[url=https://github.com/godotengine/godot/issues]the GitHub Issue Tracker[/"
+"url]."
+msgstr ""
+"Ошибка, вызванная проблемой реализации метода.\n"
+"[b]Примечание:[/b] Если встроенный метод возвращает этот код, пожалуйста, "
+"откройте проблему на [url=https://github.com/godotengine/godot/issues]трекере "
+"проблем GitHub[/url]."
+
+msgid "The property has no hint for the editor."
+msgstr "Свойство не имеет подсказку в редакторе."
+
+msgid ""
+"Hints that an [int] or [String] property is an enumerated value to pick in a "
+"list specified via a hint string.\n"
+"The hint string is a comma separated list of names such as [code]\"Hello,"
+"Something,Else\"[/code]. Whitespaces are [b]not[/b] removed from either end "
+"of a name. For integer properties, the first name in the list has value 0, "
+"the next 1, and so on. Explicit values can also be specified by appending "
+"[code]:integer[/code] to the name, e.g. [code]\"Zero,One,Three:3,Four,"
+"Six:6\"[/code]."
+msgstr ""
+"Указывает, что свойство [int] или [String] является перечисляемым значением, "
+"которое нужно выбрать из списка, заданного в строке подсказки.\n"
+"Строка подсказки представляет собой список имен, разделенных запятыми, "
+"например [code]«Hello,Something,Else»[/code]. С обоих концов имени пробелы "
+"[b]не удаляются[/b]. Для целых значений первое имя в списке имеет значение 0, "
+"следующее - 1 и так далее. Выраженные значения также можно указать, добавив к "
+"имени [code]:integer[/code], например, [code]«Zero,One,Three:3,Four,Six:6»[/"
+"code]."
+
+msgid ""
+"Hints that a [String] property can be an enumerated value to pick in a list "
+"specified via a hint string such as [code]\"Hello,Something,Else\"[/code].\n"
+"Unlike [constant PROPERTY_HINT_ENUM], a property with this hint still accepts "
+"arbitrary values and can be empty. The list of values serves to suggest "
+"possible values."
+msgstr ""
+"Указывает, что свойство [String] может быть перечисляемым значением, которое "
+"нужно выбрать из списка, заданного в строке подсказки, например, "
+"[code]\"Hello,Something,Else\"[/code].\n"
+"В отличие от [constant PROPERTY_HINT_ENUM], свойство с этой подсказкой по-"
+"прежнему принимает произвольные значения и может быть пустым. Список значений "
+"служит для предложения возможных значений."
+
+msgid ""
+"Hints that a vector property should allow its components to be linked. For "
+"example, this allows [member Vector2.x] and [member Vector2.y] to be edited "
+"together."
+msgstr ""
+"Указывает, что векторное свойство позволяет связать его компоненты. Например, "
+"это позволяет редактировать [member Vector2.x] и [member Vector2.y] вместе."
+
+msgid ""
+"Hints that an [int] property is a bitmask with named bit flags.\n"
+"The hint string is a comma separated list of names such as [code]\"Bit0,Bit1,"
+"Bit2,Bit3\"[/code]. Whitespaces are [b]not[/b] removed from either end of a "
+"name. The first name in the list has value 1, the next 2, then 4, 8, 16 and "
+"so on. Explicit values can also be specified by appending [code]:integer[/"
+"code] to the name, e.g. [code]\"A:4,B:8,C:16\"[/code]. You can also combine "
+"several flags ([code]\"A:4,B:8,AB:12,C:16\"[/code]).\n"
+"[b]Note:[/b] A flag value must be at least [code]1[/code] and at most [code]2 "
+"** 32 - 1[/code].\n"
+"[b]Note:[/b] Unlike [constant PROPERTY_HINT_ENUM], the previous explicit "
+"value is not taken into account. For the hint [code]\"A:16,B,C\"[/code], A is "
+"16, B is 2, C is 4."
+msgstr ""
+"Указывает, что свойство типа [int] - это битовая маска с именованными "
+"битовыми флагами.\n"
+"Текст подсказки - это разделенный запятыми список идентификаторов, таких как "
+"[code]\"Bit0,Bit1,Bit2,Bit3\"[/code]. Пробелы [b]не[/b] удаляются ни с одной "
+"из сторон идентификатора. У первого идентификатора в списке - значение 1, у "
+"следующего - 2, дальше - 4, 8, 16, и так далее. Также можно указать явные "
+"значения, добавив [code]:integer[/code] к идентификатору, например, "
+"[code]\"A:4,B:8,C:16\"[/code]. Также можно сочетать несколько флагов "
+"([code]\"A:4,B:8,AB:12,C:16\"[/code]).\n"
+"[b]Примечание:[/b] Значение флага должно быть как минимум [code]1[/code] и "
+"как максимум [code]2 ** 32 - 1[/code].\n"
+"[b]Примечание:[/b] В отличие от [constant PROPERTY_HINT_ENUM], предыдущее "
+"явное значение не переносится на идентификатор, стоящий следом. Для подсказки "
+"с текстом [code]\"A:16,B,C\"[/code], A будет 16, B - 2, C - 4."
+
+msgid "Hints that a [String] property is an [Expression]."
+msgstr "Указывает, что свойство [String] является [Expression]."
+
+msgid ""
+"Hints that the property's value is an object encoded as object ID, with its "
+"type specified in the hint string. Used by the debugger."
+msgstr ""
+"Указывает, что значение свойства - это объект, представленный как ID объекта, "
+"тип которого указан в строке подсказки. Используется отладчиком."
+
+msgid ""
+"If a property is [String], hints that the property represents a particular "
+"type (class). This allows to select a type from the create dialog. The "
+"property will store the selected type as a string.\n"
+"If a property is [Array], hints the editor how to show elements. The "
+"[code]hint_string[/code] must encode nested types using [code]\":\"[/code] "
+"and [code]\"/\"[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Array of elem_type.\n"
+"hint_string = \"%d:\" % [elem_type]\n"
+"hint_string = \"%d/%d:%s\" % [elem_type, elem_hint, elem_hint_string]\n"
+"# Two-dimensional array of elem_type (array of arrays of elem_type).\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d/%d:%s\" % [TYPE_ARRAY, elem_type, elem_hint, "
+"elem_hint_string]\n"
+"# Three-dimensional array of elem_type (array of arrays of arrays of "
+"elem_type).\n"
+"hint_string = \"%d:%d:%d:\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d:%d/%d:%s\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type, "
+"elem_hint, elem_hint_string]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Array of elemType.\n"
+"hintString = $\"{elemType:D}:\";\n"
+"hintString = $\"{elemType:}/{elemHint:D}:{elemHintString}\";\n"
+"// Two-dimensional array of elemType (array of arrays of elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}:\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}/{elemHint:D}:"
+"{elemHintString}\";\n"
+"// Three-dimensional array of elemType (array of arrays of arrays of "
+"elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}:"
+"\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}/"
+"{elemHint:D}:{elemHintString}\";\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Examples:[/b]\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"hint_string = \"%d:\" % [TYPE_INT] # Array of integers.\n"
+"hint_string = \"%d/%d:1,10,1\" % [TYPE_INT, PROPERTY_HINT_RANGE] # Array of "
+"integers (in range from 1 to 10).\n"
+"hint_string = \"%d/%d:Zero,One,Two\" % [TYPE_INT, PROPERTY_HINT_ENUM] # Array "
+"of integers (an enum).\n"
+"hint_string = \"%d/%d:Zero,One,Three:3,Six:6\" % [TYPE_INT, "
+"PROPERTY_HINT_ENUM] # Array of integers (an enum).\n"
+"hint_string = \"%d/%d:*.png\" % [TYPE_STRING, PROPERTY_HINT_FILE] # Array of "
+"strings (file paths).\n"
+"hint_string = \"%d/%d:Texture2D\" % [TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Array of textures.\n"
+"\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, TYPE_FLOAT] # Two-dimensional array "
+"of floats.\n"
+"hint_string = \"%d:%d/%d:\" % [TYPE_ARRAY, TYPE_STRING, "
+"PROPERTY_HINT_MULTILINE_TEXT] # Two-dimensional array of multiline strings.\n"
+"hint_string = \"%d:%d/%d:-1,1,0.1\" % [TYPE_ARRAY, TYPE_FLOAT, "
+"PROPERTY_HINT_RANGE] # Two-dimensional array of floats (in range from -1 to "
+"1).\n"
+"hint_string = \"%d:%d/%d:Texture2D\" % [TYPE_ARRAY, TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Two-dimensional array of textures.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Range:D}:1,10,1\"; // "
+"Array of integers (in range from 1 to 10).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,One,Two\"; // "
+"Array of integers (an enum).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,One,Three:3,"
+"Six:6\"; // Array of integers (an enum).\n"
+"hintString = $\"{Variant.Type.String:D}/{PropertyHint.File:D}:*.png\"; // "
+"Array of strings (file paths).\n"
+"hintString = $\"{Variant.Type.Object:D}/{PropertyHint.ResourceType:D}:"
+"Texture2D\"; // Array of textures.\n"
+"\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}:\"; // Two-"
+"dimensional array of floats.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.String:D}/{PropertyHint."
+"MultilineText:D}:\"; // Two-dimensional array of multiline strings.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}/{PropertyHint."
+"Range:D}:-1,1,0.1\"; // Two-dimensional array of floats (in range from -1 to "
+"1).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Object:D}/{PropertyHint."
+"ResourceType:D}:Texture2D\"; // Two-dimensional array of textures.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] The trailing colon is required for properly detecting built-in "
+"types."
+msgstr ""
+"Если свойство — [String], это намекает, что свойство представляет "
+"определенный тип (класс). Это позволяет выбрать тип из диалогового окна "
+"создания. Свойство сохранит выбранный тип как строку.\n"
+"Если свойство — [Array], подсказывает редактору, как показывать элементы. "
+"[code]hint_string[/code] должен кодировать вложенные типы с помощью [code]\":"
+"\"[/code] и [code]\"/\"[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Массив elem_type.\n"
+"hint_string = \"%d:\" % [elem_type]\n"
+"hint_string = \"%d/%d:%s\" % [elem_type, elem_hint, elem_hint_string]\n"
+"# Двумерный массив elem_type (массив массивов elem_type).\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d/%d:%s\" % [TYPE_ARRAY, elem_type, elem_hint, "
+"elem_hint_string]\n"
+"#Трехмерный массив elem_type (array of arrays of arrays of elem_type).\n"
+"hint_string = \"%d:%d:%d:\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type]\n"
+"hint_string = \"%d:%d:%d/%d:%s\" % [TYPE_ARRAY, TYPE_ARRAY, elem_type, "
+"elem_hint, elem_hint_string]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Массив elemType.\n"
+"hintString = $\"{elemType:D}:\";\n"
+"hintString = $\"{elemType:}/{elemHint:D}:{elemHintString}\";\n"
+"// Двумерный массив elemType (array of arrays of elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}:\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{elemType:D}/{elemHint:D}:"
+"{elemHintString}\";\n"
+"// Трехмерный массив elemType (array of arrays of arrays of elemType).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}:"
+"\";\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Array:D}:{elemType:D}/"
+"{elemHint:D}:{elemHintString}\";\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примеры:[/b]\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"hint_string = \"%d:\" % [TYPE_INT] # Array of integers.\n"
+"hint_string = \"%d/%d:1,10,1\" % [TYPE_INT, PROPERTY_HINT_RANGE] # Array of "
+"integers (in range from 1 to 10).\n"
+"hint_string = \"%d/%d:Zero,One,Two\" % [TYPE_INT, PROPERTY_HINT_ENUM] # Array "
+"of integers (an enum).\n"
+"hint_string = \"%d/%d:Zero,One,Three:3,Six:6\" % [TYPE_INT, "
+"PROPERTY_HINT_ENUM] # Array of integers (an enum).\n"
+"hint_string = \"%d/%d:*.png\" % [TYPE_STRING, PROPERTY_HINT_FILE] # Array of "
+"strings (file paths).\n"
+"hint_string = \"%d/%d:Texture2D\" % [TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Array of textures.\n"
+"\n"
+"hint_string = \"%d:%d:\" % [TYPE_ARRAY, TYPE_FLOAT] # Two-dimensional array "
+"of floats.\n"
+"hint_string = \"%d:%d/%d:\" % [TYPE_ARRAY, TYPE_STRING, "
+"PROPERTY_HINT_MULTILINE_TEXT] # Two-dimensional array of multiline strings.\n"
+"hint_string = \"%d:%d/%d:-1,1,0.1\" % [TYPE_ARRAY, TYPE_FLOAT, "
+"PROPERTY_HINT_RANGE] # Two-dimensional array of floats (in range from -1 to "
+"1).\n"
+"hint_string = \"%d:%d/%d:Texture2D\" % [TYPE_ARRAY, TYPE_OBJECT, "
+"PROPERTY_HINT_RESOURCE_TYPE] # Two-dimensional array of textures.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Range:D}:1,10,1\"; // "
+"Array of integers (in range from 1 to 10).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,One,Two\"; // "
+"Array of integers (an enum).\n"
+"hintString = $\"{Variant.Type.Int:D}/{PropertyHint.Enum:D}:Zero,One,Three:3,"
+"Six:6\"; // Array of integers (an enum).\n"
+"hintString = $\"{Variant.Type.String:D}/{PropertyHint.File:D}:*.png\"; // "
+"Array of strings (file paths).\n"
+"hintString = $\"{Variant.Type.Object:D}/{PropertyHint.ResourceType:D}:"
+"Texture2D\"; // Array of textures.\n"
+"\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}:\"; // Two-"
+"dimensional array of floats.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.String:D}/{PropertyHint."
+"MultilineText:D}:\"; // Two-dimensional array of multiline strings.\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Float:D}/{PropertyHint."
+"Range:D}:-1,1,0.1\"; // Two-dimensional array of floats (in range from -1 to "
+"1).\n"
+"hintString = $\"{Variant.Type.Array:D}:{Variant.Type.Object:D}/{PropertyHint."
+"ResourceType:D}:Texture2D\"; // Two-dimensional array of textures.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Завершающее двоеточие необходимо для правильного "
+"определения встроенных типов."
+
+msgid "Hints that an object is too big to be sent via the debugger."
+msgstr "Указывает, что обьект слишком большой для отправки через отладчик."
+
+msgid ""
+"Hints that the hint string specifies valid node types for property of type "
+"[NodePath]."
+msgstr ""
+"Подсказка о том, что строка подсказки указывает допустимые типы узлов для "
+"свойства типа [NodePath]."
+
+msgid ""
+"Hints that a property is an [Array] with the stored type specified in the "
+"hint string."
+msgstr ""
+"Подсказывает, что свойство представляет собой [Array] с сохраненным типом, "
+"указанным в строке подсказки."
+
+msgid ""
+"Hints that a property is a [Dictionary] with the stored types specified in "
+"the hint string."
+msgstr ""
+"Подсказывает, что свойство представляет собой [Словарь] с сохраненными "
+"типами, указанными в строке подсказки."
+
+msgid ""
+"Hints that a dictionary property is string translation map. Dictionary keys "
+"are locale codes and, values are translated strings."
+msgstr ""
+"Подсказки, что свойство словаря — это карта перевода строк. Ключи словаря — "
+"это коды локалей, а значения — это переведенные строки."
+
+msgid ""
+"Hints that a quaternion property should disable the temporary euler editor."
+msgstr ""
+"Подсказка о том, что свойство кватерниона должно отключать временный редактор "
+"Эйлера."
+
+msgid ""
+"Hints that a string property is a password, and every character is replaced "
+"with the secret character."
+msgstr ""
+"Указывает, что строковое свойство является паролем и каждый символ заменяется "
+"секретным символом."
+
+msgid ""
+"Hints that a [Callable] property should be displayed as a clickable button. "
+"When the button is pressed, the callable is called. The hint string specifies "
+"the button text and optionally an icon from the [code]\"EditorIcons\"[/code] "
+"theme type.\n"
+"[codeblock lang=text]\n"
+"\"Click me!\" - A button with the text \"Click me!\" and the default "
+"\"Callable\" icon.\n"
+"\"Click me!,ColorRect\" - A button with the text \"Click me!\" and the "
+"\"ColorRect\" icon.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] A [Callable] cannot be properly serialized and stored in a file, "
+"so it is recommended to use [constant PROPERTY_USAGE_EDITOR] instead of "
+"[constant PROPERTY_USAGE_DEFAULT]."
+msgstr ""
+"Подсказки, что свойство [Callable] должно отображаться как кнопка, на которую "
+"можно нажать. При нажатии кнопки вызывается вызываемый объект. Строка "
+"подсказки указывает текст кнопки и, при необходимости, значок из типа темы "
+"[code]\"EditorIcons\"[/code].\n"
+"[codeblock lang=text]\n"
+"\"Click me!\" - A button with the text \"Click me!\" and the default "
+"\"Callable\" icon.\n"
+"\"Click me!,ColorRect\" - A button with the text \"Click me!\" and the "
+"\"ColorRect\" icon.\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] [Callable] не может быть правильно сериализован "
+"(serialized) и сохранен в файле, поэтому рекомендуется использовать [constant "
+"PROPERTY_USAGE_EDITOR] вместо [constant PROPERTY_USAGE_DEFAULT]."
+
+msgid ""
+"Hints that a property will be changed on its own after setting, such as "
+"[member AudioStreamPlayer.playing] or [member GPUParticles3D.emitting]."
+msgstr ""
+"Подсказки о том, что свойство будет изменено само по себе после настройки, "
+"например [member AudioStreamPlayer.playing] или [member GPUParticles3D."
+"emitting]."
+
+msgid ""
+"The property is not stored, and does not display in the editor. This is the "
+"default for non-exported properties."
+msgstr ""
+"Свойство не сохраняется и не отображается в редакторе. Это значение по "
+"умолчанию для неэкспортируемых свойств."
+
+msgid "Used to categorize properties together in the editor."
+msgstr "Используется для категоризации свойств в редакторе."
+
+msgid ""
+"The property is a bitfield, i.e. it contains multiple flags represented as "
+"bits."
+msgstr ""
+"Свойство является битовым полем, т.е. оно содержит несколько флагов, "
+"представленных в виде битов."
+
+msgid "The property does not save its state in [PackedScene]."
+msgstr "Свойство не сохраняет свое состояние в [PackedScene]."
+
+msgid "Editing the property prompts the user for restarting the editor."
+msgstr ""
+"При редактировании свойства пользователю предлагается перезапустить редактор."
+
+msgid ""
+"The property is a script variable. [constant PROPERTY_USAGE_SCRIPT_VARIABLE] "
+"can be used to distinguish between exported script variables from built-in "
+"variables (which don't have this usage flag). By default, [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] is [b]not[/b] applied to variables that are "
+"created by overriding [method Object._get_property_list] in a script."
+msgstr ""
+"Свойство является переменной скрипта. [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] может использоваться для различения "
+"экспортированных переменных скрипта от встроенных переменных (которые не "
+"имеют этого флага использования). По умолчанию [constant "
+"PROPERTY_USAGE_SCRIPT_VARIABLE] [b]не[/b] применяется к переменным, которые "
+"создаются путем переопределения [method Object._get_property_list] в скрипте."
+
+msgid ""
+"The property value of type [Object] will be stored even if its value is "
+"[code]null[/code]."
+msgstr ""
+"Значение свойства типа [Object] будет сохранено, даже если его значение равно "
+"[code]null[/code]."
+
+msgid "If this property is modified, all inspector fields will be refreshed."
+msgstr "Если это свойство изменено, все поля инспектора будут обновлены."
+
+msgid "This flag is not used by the engine."
+msgstr "Этот флаг не используется движком."
+
+msgid ""
+"If property has [code]nil[/code] as default value, its type will be [Variant]."
+msgstr ""
+"Если свойство имеет значение по умолчанию [code]nil[/code], его тип будет "
+"[Variant]."
+
+msgid ""
+"When duplicating a resource with [method Resource.duplicate], and this flag "
+"is set on a property of that resource, the property should always be "
+"duplicated, regardless of the [code]subresources[/code] bool parameter."
+msgstr ""
+"При дублировании ресурса с помощью [метода Resource.duplicate] и установке "
+"этого флага для свойства этого ресурса свойство всегда должно дублироваться, "
+"независимо от параметра [code]subresources[/code] bool."
+
+msgid ""
+"When duplicating a resource with [method Resource.duplicate], and this flag "
+"is set on a property of that resource, the property should never be "
+"duplicated, regardless of the [code]subresources[/code] bool parameter."
+msgstr ""
+"При дублировании ресурса с помощью [метода Resource.duplicate] и установке "
+"этого флага для свойства этого ресурса свойство никогда не должно "
+"дублироваться, независимо от параметра [code]subresources[/code] bool."
+
+msgid ""
+"The property is only shown in the editor if modern renderers are supported "
+"(the Compatibility rendering method is excluded)."
+msgstr ""
+"Свойство отображается в редакторе только если поддерживаются современные "
+"методы отрисовки (метод отрисовки Совместимость исключен)."
+
+msgid ""
+"The [NodePath] property will always be relative to the scene's root. Mostly "
+"useful for local resources."
+msgstr ""
+"Свойство [NodePath] всегда будет относительным к корню сцены. В основном "
+"полезно для локальных ресурсов."
+
+msgid ""
+"Use when a resource is created on the fly, i.e. the getter will always return "
+"a different instance. [ResourceSaver] needs this information to properly save "
+"such resources."
+msgstr ""
+"Используйте, когда ресурс создается «на лету», т. е. геттер всегда будет "
+"возвращать другой экземпляр. [ResourceSaver] нуждается в этой информации для "
+"правильного сохранения таких ресурсов."
+
+msgid ""
+"Inserting an animation key frame of this property will automatically "
+"increment the value, allowing to easily keyframe multiple values in a row."
+msgstr ""
+"Вставка ключевого кадра анимации этого свойства автоматически увеличит "
+"значение, что позволит легко создавать ключевые кадры для нескольких значений "
+"подряд."
+
+msgid ""
+"When this property is a [Resource] and base object is a [Node], a resource "
+"instance will be automatically created whenever the node is created in the "
+"editor."
+msgstr ""
+"Если это свойство — [Resource], а базовый объект — [Node], экземпляр ресурса "
+"будет автоматически создаваться всякий раз, когда узел создается в редакторе."
+
+msgid ""
+"The property is considered a basic setting and will appear even when advanced "
+"mode is disabled. Used for project settings."
+msgstr ""
+"Свойство считается базовой настройкой и будет отображаться даже при "
+"отключенном расширенном режиме. Используется для настроек проекта."
+
+msgid "The property is read-only in the [EditorInspector]."
+msgstr "Свойство доступно только для чтения в инспекторе редактора."
+
+msgid ""
+"An export preset property with this flag contains confidential information "
+"and is stored separately from the rest of the export preset configuration."
+msgstr ""
+"Свойство предустановки экспорта с этим флагом содержит конфиденциальную "
+"информацию и хранится отдельно от остальной конфигурации предустановки "
+"экспорта."
+
+msgid "Flag for a normal method."
+msgstr "Флаг для обычного метода."
+
+msgid "Flag for an editor method."
+msgstr "Флаг для метода редактора."
+
+msgid "Flag for a virtual method."
+msgstr "Флаг для виртуального метода."
+
+msgid "Flag for a method with a variable number of arguments."
+msgstr "Флаг для метода с переменным числом аргументов."
+
+msgid ""
+"Used internally. Allows to not dump core virtual methods (such as [method "
+"Object._notification]) to the JSON API."
+msgstr ""
+"Используется внутри. Позволяет не выгружать основные виртуальные методы "
+"(такие как [method Object._notification]) в JSON API."
+
+msgid "Variable is [code]null[/code]."
+msgstr "Переменная равна [code]null[/code]."
+
+msgid "Variable is of type [bool]."
+msgstr "Переменная типа [bool]."
+
+msgid "Variable is of type [int]."
+msgstr "Переменная типа [int]."
+
+msgid "Variable is of type [String]."
+msgstr "Переменная типа [String]."
+
+msgid "Variable is of type [Vector2]."
+msgstr "Переменная типа [Vector2]."
+
+msgid "Variable is of type [Rect2]."
+msgstr "Переменная типа [Rect2]."
+
+msgid "Variable is of type [Vector3]."
+msgstr "Переменная типа [Vector3]."
+
+msgid "Variable is of type [Transform2D]."
+msgstr "Переменная типа [Transform2D]."
+
+msgid "Variable is of type [Plane]."
+msgstr "Переменная типа [Plane]."
+
+msgid "Variable is of type [AABB]."
+msgstr "Переменная типа [AABB]."
+
+msgid "Variable is of type [Basis]."
+msgstr "Переменная типа [Basis]."
+
+msgid "Variable is of type [Color]."
+msgstr "Переменная типа [Color]."
+
+msgid "Variable is of type [NodePath]."
+msgstr "Переменная типа [NodePath]."
+
+msgid "Variable is of type [RID]."
+msgstr "Переменная типа [RID]."
+
+msgid "Variable is of type [Object]."
+msgstr "Переменная типа [Object]."
+
+msgid "Variable is of type [Dictionary]."
+msgstr "Переменная типа [Dictionary]."
+
+msgid "Variable is of type [Array]."
+msgstr "Переменная типа [Array]."
+
+msgid "Represents the size of the [enum Variant.Type] enum."
+msgstr "Представляет размер перечисления [enum Variant.Type]."
+
+msgid "Equality operator ([code]==[/code])."
+msgstr "Оператор \"Равно\" ([code]==[/code])."
+
+msgid "Inequality operator ([code]!=[/code])."
+msgstr "Оператор \"Не равно\" ([code]!=[/code])."
+
+msgid "Less than operator ([code]<[/code])."
+msgstr "Оператор \"Меньше чем\" ([code]<[/code])."
+
+msgid "Less than or equal operator ([code]<=[/code])."
+msgstr "Оператор \"Меньше чем или равно\" ([code]<=[/code])."
+
+msgid "Greater than operator ([code]>[/code])."
+msgstr "Оператор \"Больше чем\" ([code]>[/code])."
+
+msgid "Greater than or equal operator ([code]>=[/code])."
+msgstr "Оператор \"Больше чем или равно\" ([code]>=[/code])."
+
+msgid "Addition operator ([code]+[/code])."
+msgstr "Оператор сложения ([code]+[/code])."
+
+msgid "Subtraction operator ([code]-[/code])."
+msgstr "Оператор вычитания ([code]-[/code])."
+
+msgid "Multiplication operator ([code]*[/code])."
+msgstr "Оператор умножения ([code]*[/code])."
+
+msgid "Division operator ([code]/[/code])."
+msgstr "Оператор деления ([code]/[/code])."
+
+msgid "Unary negation operator ([code]-[/code])."
+msgstr "Унарный оператор отрицания ([code]-[/code])."
+
+msgid "Unary plus operator ([code]+[/code])."
+msgstr "Унарный оператор \"Плюс\" ([code]+[/code])."
+
+msgid "Remainder/modulo operator ([code]%[/code])."
+msgstr "Оператор остатка/модуля ([code]%[/code])."
+
+msgid "Left shift operator ([code]<<[/code])."
+msgstr "Оператор сдвига влево ([code]<<[/code])."
+
+msgid "Right shift operator ([code]>>[/code])."
+msgstr "Оператор сдвига вправо ([code]>>[/code])."
+
+msgid "Bitwise AND operator ([code]&[/code])."
+msgstr "Побитовый оператор И ([code]&[/code])."
+
+msgid "Bitwise OR operator ([code]|[/code])."
+msgstr "Побитовый оператор ИЛИ ([code]|[/code])."
+
+msgid "Bitwise XOR operator ([code]^[/code])."
+msgstr "Побитовый оператор Исключающее ИЛИ ([code]^[/code])."
+
+msgid "Bitwise NOT operator ([code]~[/code])."
+msgstr "Побитовый оператор НЕ ([code]~[/code])."
+
+msgid "Logical AND operator ([code]and[/code] or [code]&&[/code])."
+msgstr "Оператор \"Логическое И\" ([code]and[/code] или [code]&&[/code])."
+
+msgid "Logical OR operator ([code]or[/code] or [code]||[/code])."
+msgstr "Логический оператор ИЛИ ([code]or[/code] или [code]||[/code])."
+
+msgid "Logical XOR operator (not implemented in GDScript)."
+msgstr "Логический оператор Исключающее ИЛИ (не реализован в GDScript)."
+
+msgid "Logical NOT operator ([code]not[/code] or [code]![/code])."
+msgstr "Логический оператор НЕ ([code]not[/code] или [code]![/code])."
+
+msgid "Logical IN operator ([code]in[/code])."
+msgstr "Логический оператор В ([code]in[/code])."
+
+msgid "Represents the size of the [enum Variant.Operator] enum."
+msgstr "Представляет размер перечисления [enum Variant.Operator]."
+
+msgid ""
+"The [AABB] built-in [Variant] type represents an axis-aligned bounding box in "
+"a 3D space. It is defined by its [member position] and [member size], which "
+"are [Vector3]. It is frequently used for fast overlap tests (see [method "
+"intersects]). Although [AABB] itself is axis-aligned, it can be combined with "
+"[Transform3D] to represent a rotated or skewed bounding box.\n"
+"It uses floating-point coordinates. The 2D counterpart to [AABB] is [Rect2]. "
+"There is no version of [AABB] that uses integer coordinates.\n"
+"[b]Note:[/b] Negative values for [member size] are not supported. With "
+"negative size, most [AABB] methods do not work correctly. Use [method abs] to "
+"get an equivalent [AABB] with a non-negative size.\n"
+"[b]Note:[/b] In a boolean context, a [AABB] evaluates to [code]false[/code] "
+"if both [member position] and [member size] are zero (equal to [constant "
+"Vector3.ZERO]). Otherwise, it always evaluates to [code]true[/code]."
+msgstr ""
+"Встроенный тип [Variant] [AABB] представляет собой выровненный по осям "
+"ограничивающий прямоугольник в трехмерном пространстве. Он определяется его "
+"[положением члена] и [размером члена], которые являются [Vector3]. Он часто "
+"используется для быстрых тестов на перекрытие (см. [метод пересекает]). Хотя "
+"сам [AABB] выровнен по осям, его можно объединить с [Transform3D] для "
+"представления повернутого или наклоненного ограничивающего прямоугольника.\n"
+"Он использует координаты с плавающей точкой. Двумерным аналогом [AABB] "
+"является [Rect2]. Версии [AABB], которая использует целочисленные координаты, "
+"не существует.\n"
+"[b]Примечание:[/b] Отрицательные значения для [member size] не "
+"поддерживаются. При отрицательном размере большинство методов [AABB] работают "
+"неправильно. Используйте [method abs], чтобы получить эквивалентный [AABB] с "
+"неотрицательным размером.\n"
+"[b]Примечание:[/b] В булевом контексте [AABB] оценивается как [code]false[/"
+"code], если и [member position], и [member size] равны нулю (равны [constant "
+"Vector3.ZERO]). В противном случае он всегда оценивается как [code]true[/"
+"code]."
+
+msgid "Math documentation index"
+msgstr "Каталог математической документации"
+
+msgid "Vector math"
+msgstr "Векторная математика"
+
+msgid "Advanced vector math"
+msgstr "Расширенная векторная математика"
+
+msgid ""
+"Constructs an [AABB] with its [member position] and [member size] set to "
+"[constant Vector3.ZERO]."
+msgstr ""
+"Создает [AABB] с его [позицией элемента] и [размером элемента], "
+"установленными на [константа Vector3.ZERO]."
+
+msgid ""
+"Returns an [AABB] equivalent to this bounding box, with its width, height, "
+"and depth modified to be non-negative values.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(5, 0, 5), Vector3(-20, -10, -5))\n"
+"var absolute = box.abs()\n"
+"print(absolute.position) # Prints (-15.0, -10.0, 0.0)\n"
+"print(absolute.size)     # Prints (20.0, 10.0, 5.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(5, 0, 5), new Vector3(-20, -10, -5));\n"
+"var absolute = box.Abs();\n"
+"GD.Print(absolute.Position); // Prints (-15, -10, 0)\n"
+"GD.Print(absolute.Size);     // Prints (20, 10, 5)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] It's recommended to use this method when [member size] is "
+"negative, as most other methods in Godot assume that the [member size]'s "
+"components are greater than [code]0[/code]."
+msgstr ""
+"Возвращает эквивалент [AABB] для данного ограничивающего прямоугольника, "
+"ширина, высота и глубина которого изменены так, чтобы они были "
+"неотрицательными значениями.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(5, 0, 5), Vector3(-20, -10, -5))\n"
+"var absolute = box.abs()\n"
+"print(absolute.position) # Prints (-15.0, -10.0, 0.0)\n"
+"print(absolute.size)     # Prints (20.0, 10.0, 5.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(5, 0, 5), new Vector3(-20, -10, -5));\n"
+"var absolute = box.Abs();\n"
+"GD.Print(absolute.Position); // Prints (-15, -10, 0)\n"
+"GD.Print(absolute.Size);     // Prints (20, 10, 5)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Рекомендуется использовать этот метод, когда [размер "
+"члена] отрицательный, так как большинство других методов в Godot "
+"предполагают, что компоненты [размера члена] больше, чем [code]0[/code]."
+
+msgid ""
+"Returns [code]true[/code] if this bounding box [i]completely[/i] encloses the "
+"[param with] box. The edges of both boxes are included.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var a = AABB(Vector3(0, 0, 0), Vector3(4, 4, 4))\n"
+"var b = AABB(Vector3(1, 1, 1), Vector3(3, 3, 3))\n"
+"var c = AABB(Vector3(2, 2, 2), Vector3(8, 8, 8))\n"
+"\n"
+"print(a.encloses(a)) # Prints true\n"
+"print(a.encloses(b)) # Prints true\n"
+"print(a.encloses(c)) # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var a = new Aabb(new Vector3(0, 0, 0), new Vector3(4, 4, 4));\n"
+"var b = new Aabb(new Vector3(1, 1, 1), new Vector3(3, 3, 3));\n"
+"var c = new Aabb(new Vector3(2, 2, 2), new Vector3(8, 8, 8));\n"
+"\n"
+"GD.Print(a.Encloses(a)); // Prints True\n"
+"GD.Print(a.Encloses(b)); // Prints True\n"
+"GD.Print(a.Encloses(c)); // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает [code]true[/code], если этот ограничивающий прямоугольник "
+"[i]полностью[/i] охватывает прямоугольник [param with]. Края обоих "
+"прямоугольников включены.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var a = AABB(Vector3(0, 0, 0), Vector3(4, 4, 4))\n"
+"var b = AABB(Vector3(1, 1, 1), Vector3(3, 3, 3))\n"
+"var c = AABB(Vector3(2, 2, 2), Vector3(8, 8, 8))\n"
+"\n"
+"print(a.encloses(a)) # Prints true\n"
+"print(a.encloses(b)) # Prints true\n"
+"print(a.encloses(c)) # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var a = new Aabb(new Vector3(0, 0, 0), new Vector3(4, 4, 4));\n"
+"var b = new Aabb(new Vector3(1, 1, 1), new Vector3(3, 3, 3));\n"
+"var c = new Aabb(new Vector3(2, 2, 2), new Vector3(8, 8, 8));\n"
+"\n"
+"GD.Print(a.Encloses(a)); // Prints True\n"
+"GD.Print(a.Encloses(b)); // Prints True\n"
+"GD.Print(a.Encloses(c)); // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the position of one of the 8 vertices that compose this bounding box. "
+"With a [param idx] of [code]0[/code] this is the same as [member position], "
+"and a [param idx] of [code]7[/code] is the same as [member end]."
+msgstr ""
+"Возвращает позицию одной из 8 вершин, составляющих этот ограничивающий "
+"прямоугольник. С [param idx] [code]0[/code] это то же самое, что и [member "
+"position], а [param idx] [code]7[/code] это то же самое, что и [member end]."
+
+msgid ""
+"Returns the longest normalized axis of this bounding box's [member size], as "
+"a [Vector3] ([constant Vector3.RIGHT], [constant Vector3.UP], or [constant "
+"Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_longest_axis())       # Prints (0.0, 0.0, 1.0)\n"
+"print(box.get_longest_axis_index()) # Prints 2\n"
+"print(box.get_longest_axis_size())  # Prints 8.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetLongestAxis());      // Prints (0, 0, 1)\n"
+"GD.Print(box.GetLongestAxisIndex()); // Prints Z\n"
+"GD.Print(box.GetLongestAxisSize());  // Prints 8\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method get_longest_axis_index] and [method get_longest_axis_size]."
+msgstr ""
+"Возвращает самую длинную нормализованную ось [размера элемента] этого "
+"ограничивающего прямоугольника в виде [Vector3] ([константа Vector3.RIGHT], "
+"[константа Vector3.UP] или [константа Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_longest_axis())       # Prints (0.0, 0.0, 1.0)\n"
+"print(box.get_longest_axis_index()) # Prints 2\n"
+"print(box.get_longest_axis_size())  # Prints 8.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetLongestAxis());      // Prints (0, 0, 1)\n"
+"GD.Print(box.GetLongestAxisIndex()); // Prints Z\n"
+"GD.Print(box.GetLongestAxisSize());  // Prints 8\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"См. также [method get_longest_axis_index] и [method get_longest_axis_size]."
+
+msgid ""
+"Returns the index to the longest axis of this bounding box's [member size] "
+"(see [constant Vector3.AXIS_X], [constant Vector3.AXIS_Y], and [constant "
+"Vector3.AXIS_Z]).\n"
+"For an example, see [method get_longest_axis]."
+msgstr ""
+"Возвращает индекс самой длинной оси [размера элемента] этого ограничивающего "
+"прямоугольника (см. [константа Vector3.AXIS_X], [константа Vector3.AXIS_Y] и "
+"[константа Vector3.AXIS_Z]).\n"
+"Пример см. в [методе get_longest_axis]."
+
+msgid ""
+"Returns the longest dimension of this bounding box's [member size].\n"
+"For an example, see [method get_longest_axis]."
+msgstr ""
+"Возвращает самое длинное измерение [размера элемента] этого ограничивающего "
+"прямоугольника.\n"
+"Пример см. в [методе get_longest_axis]."
+
+msgid ""
+"Returns the shortest normalized axis of this bounding box's [member size], as "
+"a [Vector3] ([constant Vector3.RIGHT], [constant Vector3.UP], or [constant "
+"Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_shortest_axis())       # Prints (1.0, 0.0, 0.0)\n"
+"print(box.get_shortest_axis_index()) # Prints 0\n"
+"print(box.get_shortest_axis_size())  # Prints 2.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetShortestAxis());      // Prints (1, 0, 0)\n"
+"GD.Print(box.GetShortestAxisIndex()); // Prints X\n"
+"GD.Print(box.GetShortestAxisSize());  // Prints 2\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method get_shortest_axis_index] and [method get_shortest_axis_size]."
+msgstr ""
+"Возвращает самую короткую нормализованную ось [размера элемента] этого "
+"ограничивающего прямоугольника в виде [Vector3] ([constant Vector3.RIGHT], "
+"[constant Vector3.UP] или [constant Vector3.BACK]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box = AABB(Vector3(0, 0, 0), Vector3(2, 4, 8))\n"
+"\n"
+"print(box.get_shortest_axis())       # Prints (1.0, 0.0, 0.0)\n"
+"print(box.get_shortest_axis_index()) # Prints 0\n"
+"print(box.get_shortest_axis_size())  # Prints 2.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box = new Aabb(new Vector3(0, 0, 0), new Vector3(2, 4, 8));\n"
+"\n"
+"GD.Print(box.GetShortestAxis());      // Prints (1, 0, 0)\n"
+"GD.Print(box.GetShortestAxisIndex()); // Prints X\n"
+"GD.Print(box.GetShortestAxisSize());  // Prints 2\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"См. также [метод get_shortest_axis_index] и [метод get_shortest_axis_size]."
+
+msgid ""
+"Returns the index to the shortest axis of this bounding box's [member size] "
+"(see [constant Vector3.AXIS_X], [constant Vector3.AXIS_Y], and [constant "
+"Vector3.AXIS_Z]).\n"
+"For an example, see [method get_shortest_axis]."
+msgstr ""
+"Возвращает индекс самой короткой оси [размера элемента] этого ограничивающего "
+"прямоугольника (см. [константа Vector3.AXIS_X], [константа Vector3.AXIS_Y] и "
+"[константа Vector3.AXIS_Z]).\n"
+"Пример см. в [методе get_shortest_axis]."
+
+msgid ""
+"Returns the shortest dimension of this bounding box's [member size].\n"
+"For an example, see [method get_shortest_axis]."
+msgstr ""
+"Возвращает наименьшее измерение [размера элемента] этого ограничивающего "
+"прямоугольника.\n"
+"Пример см. в [методе get_shortest_axis]."
+
+msgid ""
+"Returns [code]true[/code] if the bounding box contains the given [param "
+"point]. By convention, points exactly on the right, top, and front sides are "
+"[b]not[/b] included.\n"
+"[b]Note:[/b] This method is not reliable for [AABB] with a [i]negative[/i] "
+"[member size]. Use [method abs] first to get a valid bounding box."
+msgstr ""
+"Возвращает [code]true[/code], если ограничивающий прямоугольник содержит "
+"заданный [param point]. По соглашению, точки точно на правой, верхней и "
+"передней сторонах [b]не[/b] включены.\n"
+"[b]Примечание:[/b] Этот метод ненадежен для [AABB] с [i]отрицательным[/i] "
+"[размером элемента]. Сначала используйте [method abs], чтобы получить "
+"допустимый ограничивающий прямоугольник."
+
+msgid ""
+"Returns the intersection between this bounding box and [param with]. If the "
+"boxes do not intersect, returns an empty [AABB]. If the boxes intersect at "
+"the edge, returns a flat [AABB] with no volume (see [method has_surface] and "
+"[method has_volume]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box1 = AABB(Vector3(0, 0, 0), Vector3(5, 2, 8))\n"
+"var box2 = AABB(Vector3(2, 0, 2), Vector3(8, 4, 4))\n"
+"\n"
+"var intersection = box1.intersection(box2)\n"
+"print(intersection.position) # Prints (2.0, 0.0, 2.0)\n"
+"print(intersection.size)     # Prints (3.0, 2.0, 4.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box1 = new Aabb(new Vector3(0, 0, 0), new Vector3(5, 2, 8));\n"
+"var box2 = new Aabb(new Vector3(2, 0, 2), new Vector3(8, 4, 4));\n"
+"\n"
+"var intersection = box1.Intersection(box2);\n"
+"GD.Print(intersection.Position); // Prints (2, 0, 2)\n"
+"GD.Print(intersection.Size);     // Prints (3, 2, 4)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you only need to know whether two bounding boxes are "
+"intersecting, use [method intersects], instead."
+msgstr ""
+"Возвращает пересечение между этим ограничивающим прямоугольником и [param "
+"with]. Если прямоугольники не пересекаются, возвращает пустой [AABB]. Если "
+"прямоугольники пересекаются по краю, возвращает плоский [AABB] без объема "
+"(см. [method has_surface] и [method has_volume]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var box1 = AABB(Vector3(0, 0, 0), Vector3(5, 2, 8))\n"
+"var box2 = AABB(Vector3(2, 0, 2), Vector3(8, 4, 4))\n"
+"\n"
+"var intersection = box1.intersection(box2)\n"
+"print(intersection.position) # Prints (2.0, 0.0, 2.0)\n"
+"print(intersection.size)     # Prints (3.0, 2.0, 4.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var box1 = new Aabb(new Vector3(0, 0, 0), new Vector3(5, 2, 8));\n"
+"var box2 = new Aabb(new Vector3(2, 0, 2), new Vector3(8, 4, 4));\n"
+"\n"
+"var intersection = box1.Intersection(box2);\n"
+"GD.Print(intersection.Position); // Prints (2, 0, 2)\n"
+"GD.Print(intersection.Size);     // Prints (3, 2, 4)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Если вам нужно только узнать, пересекаются ли два "
+"ограничивающих прямоугольника, используйте вместо этого [метод intersects]."
+
+msgid ""
+"Returns the first point where this bounding box and the given ray intersect, "
+"as a [Vector3]. If no intersection occurs, returns [code]null[/code].\n"
+"The ray begin at [param from], faces [param dir] and extends towards infinity."
+msgstr ""
+"Возвращает первую точку пересечения этого ограничивающего прямоугольника и "
+"заданного луча в виде [Vector3]. Если пересечения не происходит, возвращает "
+"[code]null[/code].\n"
+"Луч начинается в [param from], смотрит в [param dir] и простирается в "
+"бесконечность."
+
+msgid ""
+"Returns the first point where this bounding box and the given segment "
+"intersect, as a [Vector3]. If no intersection occurs, returns [code]null[/"
+"code].\n"
+"The segment begins at [param from] and ends at [param to]."
+msgstr ""
+"Возвращает первую точку пересечения этого ограничивающего прямоугольника и "
+"заданного сегмента в виде [Vector3]. Если пересечения не происходит, "
+"возвращает [code]null[/code].\n"
+"Сегмент начинается в [param from] и заканчивается в [param to]."
+
+msgid ""
+"Returns an [AABB] that encloses both this bounding box and [param with] "
+"around the edges. See also [method encloses]."
+msgstr ""
+"Возвращает [AABB], который охватывает как этот ограничивающий прямоугольник, "
+"так и [param with] по краям. См. также [method encludes]."
+
+msgid ""
+"The origin point. This is usually the corner on the bottom-left and forward "
+"of the bounding box."
+msgstr ""
+"Начальная точка. Обычно это нижний левый угол спереди ограничивающей рамки."
+
+msgid ""
+"The bounding box's width, height, and depth starting from [member position]. "
+"Setting this value also affects the [member end] point.\n"
+"[b]Note:[/b] It's recommended setting the width, height, and depth to non-"
+"negative values. This is because most methods in Godot assume that the "
+"[member position] is the bottom-left-forward corner, and the [member end] is "
+"the top-right-back corner. To get an equivalent bounding box with non-"
+"negative size, use [method abs]."
+msgstr ""
+"Ширина, высота и глубина ограничивающего прямоугольника, начиная с [member "
+"position]. Установка этого значения также влияет на точку [member end].\n"
+"[b]Примечание:[/b] Рекомендуется устанавливать ширину, высоту и глубину на "
+"неотрицательные значения. Это связано с тем, что большинство методов в Godot "
+"предполагают, что [member position] — это нижний левый передний угол, а "
+"[member end] — это верхний правый задний угол. Чтобы получить эквивалентный "
+"ограничивающий прямоугольник с неотрицательным размером, используйте [method "
+"abs]."
+
+msgid ""
+"Inversely transforms (multiplies) the [AABB] by the given [Transform3D] "
+"transformation matrix, under the assumption that the transformation basis is "
+"orthonormal (i.e. rotation/reflection is fine, scaling/skew is not).\n"
+"[code]aabb * transform[/code] is equivalent to [code]transform.inverse() * "
+"aabb[/code]. See [method Transform3D.inverse].\n"
+"For transforming by inverse of an affine transformation (e.g. with scaling) "
+"[code]transform.affine_inverse() * aabb[/code] can be used instead. See "
+"[method Transform3D.affine_inverse]."
+msgstr ""
+"Обратно преобразует (умножает) [AABB] на заданную матрицу преобразования "
+"[Transform3D], при условии, что базис преобразования ортонормален (т. е. "
+"поворот/отражение хороши, масштабирование/перекос — нет).\n"
+"[code]aabb * transform[/code] эквивалентно [code]transform.inverse() * aabb[/"
+"code]. См. [method Transform3D.inverse].\n"
+"Для преобразования с помощью обратного аффинного преобразования (например, с "
+"масштабированием) вместо этого можно использовать [code]transform."
+"affine_inverse() * aabb[/code]. См. [method Transform3D.affine_inverse]."
+
+msgid ""
+"The default use of [AcceptDialog] is to allow it to only be accepted or "
+"closed, with the same result. However, the [signal confirmed] and [signal "
+"canceled] signals allow to make the two actions different, and the [method "
+"add_button] method allows to add custom buttons and actions."
+msgstr ""
+"Использование [AcceptDialog] по умолчанию — разрешить только принять или "
+"закрыть его, с тем же результатом. Однако сигналы [signal confirmed] и "
+"[signal canceled] позволяют сделать эти два действия разными, а метод [method "
+"add_button] позволяет добавлять пользовательские кнопки и действия."
+
+msgid ""
+"Returns the label used for built-in text.\n"
+"[b]Warning:[/b] This is a required internal node, removing and freeing it may "
+"cause a crash. If you wish to hide it or any of its children, use their "
+"[member CanvasItem.visible] property."
+msgstr ""
+"Возвращает метку, используемую для встроенного текста.\n"
+"[b]Предупреждение:[/b] Это обязательный внутренний узел, его удаление и "
+"освобождение может привести к сбою. Если вы хотите скрыть его или любой из "
+"его дочерних элементов, используйте их свойство [member CanvasItem.visible]."
+
+msgid ""
+"Returns the OK [Button] instance.\n"
+"[b]Warning:[/b] This is a required internal node, removing and freeing it may "
+"cause a crash. If you wish to hide it or any of its children, use their "
+"[member CanvasItem.visible] property."
+msgstr ""
+"Возвращает экземпляр кнопки OK [Button].\n"
+"[b]Предупреждение:[/b] Это обязательный внутренний узел, его удаление и "
+"освобождение может привести к сбою. Если вы хотите скрыть его или любой из "
+"его дочерних элементов, используйте их свойство [member CanvasItem.visible]."
+
+msgid ""
+"Registers a [LineEdit] in the dialog. When the enter key is pressed, the "
+"dialog will be accepted."
+msgstr ""
+"Регистрирует [LineEdit] в диалоге. При нажатии клавиши ввода диалог будет "
+"принят."
+
+msgid "Sets autowrapping for the text in the dialog."
+msgstr "Устанавливает автоматический перенос текста в диалоге."
+
+msgid ""
+"If [code]true[/code], the dialog is hidden when the OK button is pressed. You "
+"can set it to [code]false[/code] if you want to do e.g. input validation when "
+"receiving the [signal confirmed] signal, and handle hiding the dialog in your "
+"own logic.\n"
+"[b]Note:[/b] Some nodes derived from this class can have a different default "
+"value, and potentially their own built-in logic overriding this setting. For "
+"example [FileDialog] defaults to [code]false[/code], and has its own input "
+"validation code that is called when you press OK, which eventually hides the "
+"dialog if the input is valid. As such, this property can't be used in "
+"[FileDialog] to disable hiding the dialog when pressing OK."
+msgstr ""
+"Если [code]true[/code], диалоговое окно будет скрыто при нажатии кнопки OK. "
+"Вы можете установить значение в [code]false[/code] если хотите, например, "
+"сделать проверку ввода при получении сигнала [signal confirmed], и обработать "
+"сокрытие диалога в своей собственной логике.\n"
+"[b]Примечание:[/b] Некоторые узлы, производные от этого класса, могут иметь "
+"другое значение по умолчанию, и потенциально их собственная встроенная логика "
+"переопределяет этот параметр. Например, [FileDialog] имеет значение по "
+"умолчанию [code]false[/code] и собственный код проверки ввода, который "
+"вызывается при нажатии кнопки OK, который в конечном итоге скрывает диалог, "
+"если ввод является допустимым. Как таковое, это свойство не может быть "
+"использовано в [FileDialog] для отключения скрытия диалога при нажатии OK."
+
+msgid "The text displayed by the dialog."
+msgstr "Текст, отображаемый в диалоговом окне."
+
+msgid "The text displayed by the OK button (see [method get_ok_button])."
+msgstr "Текст, отображаемый кнопкой ОК (см. [method get_ok_button])."
+
+msgid "Emitted when the dialog is accepted, i.e. the OK button is pressed."
+msgstr "Излучается при принятии диалога, т.е. когда нажата кнопка OK."
+
+msgid "Emitted when a custom button is pressed. See [method add_button]."
+msgstr ""
+"Излучается при нажатии пользовательской кнопки. Смотрите [method add_button]."
+
+msgid ""
+"The minimum height of each button in the bottom row (such as OK/Cancel) in "
+"pixels. This can be increased to make buttons with short texts easier to "
+"click/tap."
+msgstr ""
+"Минимальная высота каждой кнопки в нижнем ряду (например, OK/Отмена) в "
+"пикселях. Ее можно увеличить, чтобы кнопки с коротким текстом было легче "
+"нажимать/касать."
+
+msgid ""
+"The minimum width of each button in the bottom row (such as OK/Cancel) in "
+"pixels. This can be increased to make buttons with short texts easier to "
+"click/tap."
+msgstr ""
+"Минимальная ширина каждой кнопки в нижнем ряду (например, OK/Отмена) в "
+"пикселях. Ее можно увеличить, чтобы кнопки с коротким текстом было легче "
+"нажимать/касать."
+
+msgid ""
+"The size of the vertical space between the dialog's content and the button "
+"row."
+msgstr ""
+"Размер вертикального пространства между содержимым диалогового окна и рядом "
+"кнопок."
+
+msgid "The panel that fills the background of the window."
+msgstr "Панель которая заполняет задний план окна."
+
+msgid "Provides access to AES encryption/decryption of raw data."
+msgstr ""
+"Предоставляет доступ к шифрованию/дешифрованию необработанных данных по "
+"алгоритму AES."
+
+msgid "Close this AES context so it can be started again. See [method start]."
+msgstr ""
+"Закрыть данный AES-контекст, чтобы его можно было запустить заново. См. "
+"раздел [method start]."
+
+msgid ""
+"Get the current IV state for this context (IV gets updated when calling "
+"[method update]). You normally don't need this function.\n"
+"[b]Note:[/b] This function only makes sense when the context is started with "
+"[constant MODE_CBC_ENCRYPT] or [constant MODE_CBC_DECRYPT]."
+msgstr ""
+"Получить текущее IV состояние для данного контекста (IV обновляется при "
+"вызове [method update]). Обычно эта функция вам не нужна.\n"
+"[b]Примечание:[/b] Эта функция имеет смысл только тогда, когда контекст "
+"запущен с [constant MODE_CBC_ENCRYPT] или [constant MODE_CBC_DECRYPT]."
+
+msgid "AES electronic codebook encryption mode."
+msgstr "AES режим шифрования электронной кодовой книги."
+
+msgid "AES electronic codebook decryption mode."
+msgstr "AES режим дешифрования электронной кодовой книги."
+
+msgid "AES cipher blocker chaining encryption mode."
+msgstr ""
+"AES шифрование режимом сцепления блоков шифротекста Cipher Block Chaining "
+"(CBC)."
+
+msgid "AES cipher blocker chaining decryption mode."
+msgstr ""
+"AES дешифрование режимом сцепления блоков шифротекста Cipher Block Chaining "
+"(CBC)."
+
+msgid "Maximum value for the mode enum."
+msgstr "Максимальное значение для режима перечисления."
+
+msgid ""
+"A 2D physics body that can't be moved by external forces. When moved "
+"manually, it affects other bodies in its path."
+msgstr ""
+"Двумерное физическое тело, которое не перемещается под действием внешних сил. "
+"При перемещении вручную оно влияет на другие тела на своем пути."
+
+msgid ""
+"An animatable 2D physics body. It can't be moved by external forces or "
+"contacts, but can be moved manually by other means such as code, "
+"[AnimationMixer]s (with [member AnimationMixer.callback_mode_process] set to "
+"[constant AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_PHYSICS]), and "
+"[RemoteTransform2D].\n"
+"When [AnimatableBody2D] is moved, its linear and angular velocity are "
+"estimated and used to affect other physics bodies in its path. This makes it "
+"useful for moving platforms, doors, and other moving objects."
+msgstr ""
+"Анимируемое 2D физическое тело. Его нельзя перемещать внешними силами или "
+"контактами, но можно перемещать вручную другими способами, такими как код, "
+"[AnimationMixer]s (с [member AnimationMixer.callback_mode_process] "
+"установленным на [constant AnimationMixer."
+"ANIMATION_CALLBACK_MODE_PROCESS_PHYSICS]) и [RemoteTransform2D].\n"
+"Когда [AnimatableBody2D] перемещается, его линейная и угловая скорости "
+"оцениваются и используются для воздействия на другие физические тела на его "
+"пути. Это делает его полезным для перемещения платформ, дверей и других "
+"движущихся объектов."
+
+msgid ""
+"If [code]true[/code], the body's movement will be synchronized to the physics "
+"frame. This is useful when animating movement via [AnimationPlayer], for "
+"example on moving platforms. Do [b]not[/b] use together with [method "
+"PhysicsBody2D.move_and_collide]."
+msgstr ""
+"Если [code]true[/code], движение тела будет синхронизировано с физическим "
+"кадром. Это полезно при анимации движения через [AnimationPlayer], например, "
+"на движущихся платформах. [b]Не[/b] используйте вместе с [method "
+"PhysicsBody2D.move_and_collide]."
+
+msgid ""
+"A 3D physics body that can't be moved by external forces. When moved "
+"manually, it affects other bodies in its path."
+msgstr ""
+"Физическое тело 3D, которое не может быть перемещено внешними силами. При "
+"перемещении вручную оно влияет на другие тела на своем пути."
+
+msgid ""
+"An animatable 3D physics body. It can't be moved by external forces or "
+"contacts, but can be moved manually by other means such as code, "
+"[AnimationMixer]s (with [member AnimationMixer.callback_mode_process] set to "
+"[constant AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_PHYSICS]), and "
+"[RemoteTransform3D].\n"
+"When [AnimatableBody3D] is moved, its linear and angular velocity are "
+"estimated and used to affect other physics bodies in its path. This makes it "
+"useful for moving platforms, doors, and other moving objects."
+msgstr ""
+"Анимируемое физическое тело 3D. Его нельзя перемещать внешними силами или "
+"контактами, но можно перемещать вручную другими способами, такими как код, "
+"[AnimationMixer]s (с [member AnimationMixer.callback_mode_process] "
+"установленным на [constant AnimationMixer."
+"ANIMATION_CALLBACK_MODE_PROCESS_PHYSICS]) и [RemoteTransform3D].\n"
+"При перемещении [AnimatableBody3D] его линейная и угловая скорости "
+"оцениваются и используются для воздействия на другие физические тела на его "
+"пути. Это делает его полезным для перемещения платформ, дверей и других "
+"движущихся объектов."
+
+msgid "3D Physics Tests Demo"
+msgstr "Демонстрация 3D-физических тестов"
+
+msgid "Third Person Shooter (TPS) Demo"
+msgstr "Демонстрация шутера от третьего лица (TPS)"
+
+msgid "3D Voxel Demo"
+msgstr "Демоверсия 3D вокселей"
+
+msgid ""
+"If [code]true[/code], the body's movement will be synchronized to the physics "
+"frame. This is useful when animating movement via [AnimationPlayer], for "
+"example on moving platforms. Do [b]not[/b] use together with [method "
+"PhysicsBody3D.move_and_collide]."
+msgstr ""
+"Если [code]true[/code], движение тела будет синхронизировано с физическим "
+"кадром. Это полезно при анимации движения через [AnimationPlayer], например, "
+"на движущихся платформах. Не [b][/b] используйте вместе с [method "
+"PhysicsBody3D.move_and_collide]."
+
+msgid ""
+"Sprite node that contains multiple textures as frames to play for animation."
+msgstr ""
+"Узел спрайта, содержащий несколько текстур в качестве кадров для анимации."
+
+msgid "2D Sprite animation"
+msgstr "Анимация 2D спрайтов"
+
+msgid "2D Dodge The Creeps Demo"
+msgstr "2D Dodge The Creeps Демо"
+
+msgid ""
+"Pauses the currently playing animation. The [member frame] and [member "
+"frame_progress] will be kept and calling [method play] or [method "
+"play_backwards] without arguments will resume the animation from the current "
+"playback position.\n"
+"See also [method stop]."
+msgstr ""
+"Приостанавливает текущую воспроизводимую анимацию. [Member frame] и [member "
+"frame_progress] будут сохранены, а вызов [method play] или [method "
+"play_backwards] без аргументов возобновит анимацию с текущей позиции "
+"воспроизведения.\n"
+"См. также [method stop]."
+
+msgid ""
+"Plays the animation with key [param name]. If [param custom_speed] is "
+"negative and [param from_end] is [code]true[/code], the animation will play "
+"backwards (which is equivalent to calling [method play_backwards]).\n"
+"If this method is called with that same animation [param name], or with no "
+"[param name] parameter, the assigned animation will resume playing if it was "
+"paused."
+msgstr ""
+"Воспроизводит анимацию с ключом [имя параметра]. Если [параметр custom_speed] "
+"отрицательный, а [параметр from_end] равен [код]истина[/код], анимация будет "
+"воспроизводиться в обратном направлении (что эквивалентно вызову [метода "
+"play_backwards]).\n"
+"Если этот метод вызывается с той же анимацией [имя параметра] или без "
+"параметра [имя параметра], назначенная анимация возобновит воспроизведение, "
+"если она была приостановлена."
+
+msgid ""
+"Sets [member frame] the [member frame_progress] to the given values. Unlike "
+"setting [member frame], this method does not reset the [member "
+"frame_progress] to [code]0.0[/code] implicitly.\n"
+"[b]Example:[/b] Change the animation while keeping the same [member frame] "
+"and [member frame_progress]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_frame = animated_sprite.get_frame()\n"
+"var current_progress = animated_sprite.get_frame_progress()\n"
+"animated_sprite.play(\"walk_another_skin\")\n"
+"animated_sprite.set_frame_and_progress(current_frame, current_progress)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Устанавливает [member frame] [member frame_progress] на заданные значения. В "
+"отличие от установки [member frame], этот метод не сбрасывает [member "
+"frame_progress] на [code]0.0[/code] неявно.\n"
+"[b]Пример:[/b] Измените анимацию, сохранив те же [member frame] и [member "
+"frame_progress]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_frame = animated_sprite.get_frame()\n"
+"var current_progress = animated_sprite.get_frame_progress()\n"
+"animated_sprite.play(\"walk_another_skin\")\n"
+"animated_sprite.set_frame_and_progress(current_frame, current_progress)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Stops the currently playing animation. The animation position is reset to "
+"[code]0[/code] and the [code]custom_speed[/code] is reset to [code]1.0[/"
+"code]. See also [method pause]."
+msgstr ""
+"Останавливает текущую воспроизводимую анимацию. Позиция анимации сбрасывается "
+"на [code]0[/code], а [code]custom_speed[/code] сбрасывается на [code]1.0[/"
+"code]. См. также [method pause]."
+
+msgid "The key of the animation to play when the scene loads."
+msgstr "Ключ анимации, воспроизводимой при загрузке сцены."
+
+msgid ""
+"If [code]true[/code], texture will be centered.\n"
+"[b]Note:[/b] For games with a pixel art aesthetic, textures may appear "
+"deformed when centered. This is caused by their position being between "
+"pixels. To prevent this, set this property to [code]false[/code], or consider "
+"enabling [member ProjectSettings.rendering/2d/snap/snap_2d_vertices_to_pixel] "
+"and [member ProjectSettings.rendering/2d/snap/snap_2d_transforms_to_pixel]."
+msgstr ""
+"Если [code]true[/code], текстура будет центрирована.\n"
+"[b]Примечание:[/b] В играх с пиксельной эстетикой текстуры могут выглядеть "
+"деформированными при центрировании. Это вызвано их положением между "
+"пикселями. Чтобы предотвратить это, установите это свойство на [code]false[/"
+"code] или рассмотрите возможность включения [member ProjectSettings."
+"rendering/2d/snap/snap_2d_vertices_to_pixel] и [member ProjectSettings."
+"rendering/2d/snap/snap_2d_transforms_to_pixel]."
+
+msgid "If [code]true[/code], texture is flipped horizontally."
+msgstr "Если [code]true[/code], текстура отражена по горизонтали."
+
+msgid "If [code]true[/code], texture is flipped vertically."
+msgstr "Если [code]true[/code], текстура отражена по вертикали."
+
+msgid ""
+"The displayed animation frame's index. Setting this property also resets "
+"[member frame_progress]. If this is not desired, use [method "
+"set_frame_and_progress]."
+msgstr ""
+"Индекс отображаемого кадра анимации. Установка этого свойства также "
+"сбрасывает [member frame_progress]. Если это нежелательно, используйте "
+"[method set_frame_and_progress]."
+
+msgid ""
+"The progress value between [code]0.0[/code] and [code]1.0[/code] until the "
+"current frame transitions to the next frame. If the animation is playing "
+"backwards, the value transitions from [code]1.0[/code] to [code]0.0[/code]."
+msgstr ""
+"Значение прогресса между [code]0.0[/code] и [code]1.0[/code] до тех пор, пока "
+"текущий кадр не перейдет к следующему кадру. Если анимация воспроизводится в "
+"обратном направлении, значение переходит от [code]1.0[/code] к [code]0.0[/"
+"code]."
+
+msgid "The texture's drawing offset."
+msgstr "Смещение текстуры."
+
+msgid ""
+"The speed scaling ratio. For example, if this value is [code]1[/code], then "
+"the animation plays at normal speed. If it's [code]0.5[/code], then it plays "
+"at half speed. If it's [code]2[/code], then it plays at double speed.\n"
+"If set to a negative value, the animation is played in reverse. If set to "
+"[code]0[/code], the animation will not advance."
+msgstr ""
+"Коэффициент масштабирования скорости. Например, если это значение равно "
+"[code]1[/code], то анимация воспроизводится с нормальной скоростью. Если это "
+"[code]0.5[/code], то она воспроизводится с половинной скоростью. Если это "
+"[code]2[/code], то она воспроизводится с двойной скоростью.\n"
+"Если установлено отрицательное значение, анимация воспроизводится в обратном "
+"направлении. Если установлено значение [code]0[/code], анимация не будет "
+"продвигаться."
+
+msgid ""
+"The [SpriteFrames] resource containing the animation(s). Allows you the "
+"option to load, edit, clear, make unique and save the states of the "
+"[SpriteFrames] resource."
+msgstr ""
+"Ресурс [SpriteFrames], содержащий анимацию(и). Позволяет загружать, "
+"редактировать, очищать, делать уникальными и сохранять состояния ресурса "
+"[SpriteFrames]."
+
+msgid ""
+"2D sprite node in 3D world, that can use multiple 2D textures for animation."
+msgstr ""
+"Узел 2D спрайта в 3D мире, который может использовать несколько 2D текстур "
+"для анимации."
+
+msgid "2D Sprite animation (also applies to 3D)"
+msgstr "Анимация 2D-спрайта (также применимо к 3D)"
+
+msgid ""
+"This class does not work properly in current versions and may be removed in "
+"the future. There is currently no equivalent workaround."
+msgstr ""
+"Этот класс не работает должным образом в текущих версиях и может быть удален "
+"в будущем. В настоящее время нет эквивалентного обходного пути."
+
+msgid "Proxy texture for simple frame-based animations."
+msgstr "Прокси-текстура для простых покадровых анимаций."
+
+msgid ""
+"[AnimatedTexture] is a resource format for frame-based animations, where "
+"multiple textures can be chained automatically with a predefined delay for "
+"each frame. Unlike [AnimationPlayer] or [AnimatedSprite2D], it isn't a "
+"[Node], but has the advantage of being usable anywhere a [Texture2D] resource "
+"can be used, e.g. in a [TileSet].\n"
+"The playback of the animation is controlled by the [member speed_scale] "
+"property, as well as each frame's duration (see [method set_frame_duration]). "
+"The animation loops, i.e. it will restart at frame 0 automatically after "
+"playing the last frame.\n"
+"[AnimatedTexture] currently requires all frame textures to have the same "
+"size, otherwise the bigger ones will be cropped to match the smallest one.\n"
+"[b]Note:[/b] AnimatedTexture doesn't support using [AtlasTexture]s. Each "
+"frame needs to be a separate [Texture2D].\n"
+"[b]Warning:[/b] The current implementation is not efficient for the modern "
+"renderers."
+msgstr ""
+"[AnimatedTexture] — это формат ресурса для покадровых анимаций, где несколько "
+"текстур могут быть автоматически сцеплены с предопределенной задержкой для "
+"каждого кадра. В отличие от [AnimationPlayer] или [AnimatedSprite2D], не "
+"является [Node], и имеет преимущество в том, что может быть использован "
+"везде, где может быть использован ресурс [Texture2D], например в [TileSet].\n"
+"Воспроизведение анимации контролируется свойством [member speed_scale], а "
+"также опциональной задержкой каждого кадра (см. [method set_frame_duration]). "
+"Анимация зациклена, т.е. после проигрывания последнего кадра она "
+"автоматически перезапускается на 0 кадр.\n"
+"В настоящее время [AnimatedTexture] требует, чтобы все текстуры кадров имели "
+"одинаковый размер, в противном случае более крупные будут обрезаны в "
+"соответствии с наименьшим кадром.\n"
+"[b]Примечание:[/b] [AnimatedTexture] не поддерживает [AtlasTexture]. Каждый "
+"кадр должен быть отдельным [Texture2D].\n"
+"[b]Предупреждение:[/b] Текущая реализация для современных методов отрисовки "
+"неэффективна."
+
+msgid ""
+"Sets the duration of any given [param frame]. The final duration is affected "
+"by the [member speed_scale]. If set to [code]0[/code], the frame is skipped "
+"during playback."
+msgstr ""
+"Устанавливает длительность любого заданного [param frame]. Окончательная "
+"длительность зависит от [member speed_scale]. Если установлено значение "
+"[code]0[/code], кадр пропускается во время воспроизведения."
+
+msgid ""
+"Sets the currently visible frame of the texture. Setting this frame while "
+"playing resets the current frame time, so the newly selected frame plays for "
+"its whole configured frame duration."
+msgstr ""
+"Устанавливает текущий видимый кадр текстуры. Установка этого кадра во время "
+"воспроизведения сбрасывает текущее время кадра, поэтому вновь выбранный кадр "
+"воспроизводится в течение всей настроенной длительности кадра."
+
+msgid ""
+"Number of frames to use in the animation. While you can create the frames "
+"independently with [method set_frame_texture], you need to set this value for "
+"the animation to take new frames into account. The maximum number of frames "
+"is [constant MAX_FRAMES]."
+msgstr ""
+"Количество кадров, используемых в анимации. Хотя кадры можно создавать "
+"самостоятельно с помощью [method set_frame_texture], необходимо установить "
+"это значение, чтобы анимация учитывала новые кадры. Максимальное количество "
+"кадров - [constant MAX_FRAMES]."
+
+msgid ""
+"If [code]true[/code], the animation will only play once and will not loop "
+"back to the first frame after reaching the end. Note that reaching the end "
+"will not set [member pause] to [code]true[/code]."
+msgstr ""
+"Если [code]true[/code], анимация будет воспроизводиться только один раз и не "
+"будет возвращаться к первому кадру после достижения конца. Обратите внимание, "
+"что достижение конца не установит [member pause] в [code]true[/code]."
+
+msgid ""
+"If [code]true[/code], the animation will pause where it currently is (i.e. at "
+"[member current_frame]). The animation will continue from where it was paused "
+"when changing this property to [code]false[/code]."
+msgstr ""
+"Если [code]true[/code], анимация приостанавливается там, где она находится в "
+"данный момент (т.е. на [member current_frame]). При изменении этого свойства "
+"на [code]false[/code] анимация продолжится с того места, где она была "
+"приостановлена."
+
+msgid "Adds a track to the Animation."
+msgstr "Добавляет дорожку в анимацию."
+
+msgid ""
+"Sets whether the track will be blended with other animations. If [code]true[/"
+"code], the audio playback volume changes depending on the blend value."
+msgstr ""
+"Устанавливает, будет ли трек смешиваться с другими анимациями. Если "
+"[code]true[/code], громкость воспроизведения звука меняется в зависимости от "
+"значения смешивания."
+
+msgid ""
+"Inserts a Bezier Track key at the given [param time] in seconds. The [param "
+"track_idx] must be the index of a Bezier Track.\n"
+"[param in_handle] is the left-side weight of the added Bezier curve point, "
+"[param out_handle] is the right-side one, while [param value] is the actual "
+"value at this point."
+msgstr ""
+"Вставляет ключ дорожки Безье в указанное [param time] в секундах. [param "
+"track_idx] должен быть индексом дорожки Безье.\n"
+"[param in_handle] — вес левой стороны добавленной точки кривой Безье, [param "
+"out_handle] — вес правой стороны, а [param value] — фактическое значение в "
+"этой точке."
+
+msgid "Inserts a key in a given blend shape track. Returns the key index."
+msgstr "Вставляет ключ в заданную дорожку blend shape. Возвращает индекс ключа."
+
+msgid "Clear the animation (clear all tracks and reset all)."
+msgstr "Очистить анимацию (удалить все дорожки и сбросить всё)."
+
+msgid ""
+"Compress the animation and all its tracks in-place. This will make [method "
+"track_is_compressed] return [code]true[/code] once called on this "
+"[Animation]. Compressed tracks require less memory to be played, and are "
+"designed to be used for complex 3D animations (such as cutscenes) imported "
+"from external 3D software. Compression is lossy, but the difference is "
+"usually not noticeable in real world conditions.\n"
+"[b]Note:[/b] Compressed tracks have various limitations (such as not being "
+"editable from the editor), so only use compressed animations if you actually "
+"need them."
+msgstr ""
+"Сжать анимацию и все ее дорожки на месте. Это заставит [method "
+"track_is_compressed] возвращать [code]true[/code] после вызова этой "
+"[Animation]. Сжатые дорожки требуют меньше памяти для воспроизведения и "
+"предназначены для использования в сложных 3D-анимациях (например, катсценах), "
+"импортированных из внешнего 3D-программного обеспечения. Сжатие происходит с "
+"потерями, но разница обычно не заметна в реальных условиях.\n"
+"[b]Примечание:[/b] Сжатые дорожки имеют различные ограничения (например, "
+"невозможность редактирования в редакторе), поэтому используйте сжатые "
+"анимации только в том случае, если они вам действительно нужны."
+
+msgid ""
+"Returns the index of the specified track. If the track is not found, return "
+"-1."
+msgstr ""
+"Возвращает индекс указанной дорожки. Если дорожка не найдена, возвращает -1."
+
+msgid ""
+"Returns the closest marker that comes after the given time. If no such marker "
+"exists, an empty string is returned."
+msgstr ""
+"Возвращает ближайший маркер, который следует после указанного времени. Если "
+"такого маркера не существует, возвращается пустая строка."
+
+msgid ""
+"Returns the closest marker that comes before the given time. If no such "
+"marker exists, an empty string is returned."
+msgstr ""
+"Возвращает ближайший маркер, который предшествует указанному времени. Если "
+"такого маркера не существует, возвращается пустая строка."
+
+msgid "Returns the amount of tracks in the animation."
+msgstr "Возвращает количество дорожек в анимации."
+
+msgid "Returns the method name of a method track."
+msgstr "Возвращает имя метода для дорожки методов."
+
+msgid ""
+"Returns the arguments values to be called on a method track for a given key "
+"in a given track."
+msgstr ""
+"Возвращает значения аргументов, которые необходимо вызвать в дорожке метода "
+"для заданного ключа в заданной дорожке."
+
+msgid ""
+"Optimize the animation and all its tracks in-place. This will preserve only "
+"as many keys as are necessary to keep the animation within the specified "
+"bounds."
+msgstr ""
+"Оптимизируйте анимацию и все ее дорожки на месте. Это сохранит только столько "
+"ключей, сколько необходимо для удержания анимации в указанных границах."
+
+msgid "Inserts a key in a given 3D position track. Returns the key index."
+msgstr "Вставляет ключ в заданную 3D-трек позиции. Возвращает индекс ключа."
+
+msgid "Removes a track by specifying the track index."
+msgstr "Удаляет дорожку, указав индекс дорожки."
+
+msgid "Inserts a key in a given 3D rotation track. Returns the key index."
+msgstr "Вставляет ключ в заданную 3D-дорожку вращения. Возвращает индекс ключа."
+
+msgid "Inserts a key in a given 3D scale track. Returns the key index."
+msgstr "Вставляет ключ в заданную 3D-шкалу трека. Возвращает индекс ключа."
+
+msgid ""
+"Finds the key index by time in a given track. Optionally, only find it if the "
+"approx/exact time is given.\n"
+"If [param limit] is [code]true[/code], it does not return keys outside the "
+"animation range.\n"
+"If [param backward] is [code]true[/code], the direction is reversed in "
+"methods that rely on one directional processing.\n"
+"For example, in case [param find_mode] is [constant FIND_MODE_NEAREST], if "
+"there is no key in the current position just after seeked, the first key "
+"found is retrieved by searching before the position, but if [param backward] "
+"is [code]true[/code], the first key found is retrieved after the position."
+msgstr ""
+"Находит индекс ключа по времени в заданном треке. При желании находит его "
+"только в том случае, если указано приблизительное/точное время.\n"
+"Если [param limit] равно [code]true[/code], он не возвращает ключи за "
+"пределами диапазона анимации.\n"
+"Если [param backward] равно [code]true[/code], направление меняется на "
+"противоположное в методах, которые полагаются на однонаправленную обработку.\n"
+"Например, в случае, если [param find_mode] равно [constant "
+"FIND_MODE_NEAREST], если в текущей позиции сразу после искомого нет ключа, "
+"первый найденный ключ извлекается путем поиска перед позицией, но если [param "
+"backward] равно [code]true[/code], первый найденный ключ извлекается после "
+"позиции."
+
+msgid ""
+"Returns [code]true[/code] if the track at [param track_idx] wraps the "
+"interpolation loop. New tracks wrap the interpolation loop by default."
+msgstr ""
+"Возвращает [code]true[/code], если дорожка в [param track_idx] оборачивает "
+"цикл интерполяции. Новые дорожки оборачивают цикл интерполяции по умолчанию."
+
+msgid "Returns the interpolation type of a given track."
+msgstr "Возвращает тип интерполяции данной дорожки."
+
+msgid "Returns the time at which the key is located."
+msgstr "Возвращает время, в котором расположен ключ."
+
+msgid ""
+"Returns the transition curve (easing) for a specific key (see the built-in "
+"math function [method @GlobalScope.ease])."
+msgstr ""
+"Возвращает кривую перехода (плавность) для определенной клавиши (см. "
+"встроенную математическую функцию [метод @GlobalScope.ease])."
+
+msgid "Returns the value of a given key in a given track."
+msgstr "Возвращает значение заданной клавиши в заданной дорожке."
+
+msgid ""
+"Gets the path of a track. For more information on the path format, see "
+"[method track_set_path]."
+msgstr ""
+"Получает путь к дорожке. Для получения дополнительной информации о формате "
+"пути см. [ метод track_set_path]."
+
+msgid "Gets the type of a track."
+msgstr "Получает тип дорожки."
+
+msgid ""
+"Returns [code]true[/code] if the given track is imported. Else, return "
+"[code]false[/code]."
+msgstr ""
+"Возвращает [code]true[/code], если указанная дорожка импортирована. В "
+"противном случае возвращает [code]false[/code]."
+
+msgid "Moves a track down."
+msgstr "Перемещает дорожку вниз."
+
+msgid ""
+"Changes the index position of track [param track_idx] to the one defined in "
+"[param to_idx]."
+msgstr ""
+"Изменяет индексную позицию дорожки [param track_idx] на ту, которая "
+"определена в [param to_idx]."
+
+msgid "Moves a track up."
+msgstr "Перемещает дорожку вверх."
+
+msgid "Removes a key by index in a given track."
+msgstr "Удаляет ключ по индексу из данной дорожки."
+
+msgid "Enables/disables the given track. Tracks are enabled by default."
+msgstr "Включает/отключает данную дорожку. По умолчанию дорожки включены."
+
+msgid "Sets the given track as imported or not."
+msgstr "Устанавливает, импортирован ли данная дорожка."
+
+msgid "Sets the time of an existing key."
+msgstr "Устанавливает время существующего ключа."
+
+msgid ""
+"Sets the transition curve (easing) for a specific key (see the built-in math "
+"function [method @GlobalScope.ease])."
+msgstr ""
+"Устанавливает кривую перехода (плавность) для определенной клавиши (см. "
+"встроенную математическую функцию [метод @GlobalScope.ease])."
+
+msgid "Sets the value of an existing key."
+msgstr "Устанавливает значение существующего ключа."
+
+msgid ""
+"Sets the path of a track. Paths must be valid scene-tree paths to a node and "
+"must be specified starting from the [member AnimationMixer.root_node] that "
+"will reproduce the animation. Tracks that control properties or bones must "
+"append their name after the path, separated by [code]\":\"[/code].\n"
+"For example, [code]\"character/skeleton:ankle\"[/code] or [code]\"character/"
+"mesh:transform/local\"[/code]."
+msgstr ""
+"Устанавливает путь дорожки. Пути должны быть допустимыми путями дерева сцены "
+"к узлу и должны быть указаны, начиная с [member AnimationMixer.root_node], "
+"который будет воспроизводить анимацию. Дорожки, которые управляют свойствами "
+"или костями, должны добавлять свое имя после пути, разделенного [code]\":\"[/"
+"code]. \n"
+"Например, [code]\"character/skeleton:ankle\"[/code] или [code]\"character/"
+"mesh:transform/local\"[/code]."
+
+msgid ""
+"Swaps the track [param track_idx]'s index position with the track [param "
+"with_idx]."
+msgstr ""
+"Меняет индексную позицию дорожки [param track_idx] на дорожку [param "
+"with_idx]."
+
+msgid ""
+"Returns the interpolated value at the given time (in seconds). The [param "
+"track_idx] must be the index of a value track.\n"
+"A [param backward] mainly affects the direction of key retrieval of the track "
+"with [constant UPDATE_DISCRETE] converted by [constant AnimationMixer."
+"ANIMATION_CALLBACK_MODE_DISCRETE_FORCE_CONTINUOUS] to match the result with "
+"[method track_find_key]."
+msgstr ""
+"Возвращает интерполированное значение в указанное время (в секундах). "
+"[Параметр track_idx] должен быть индексом значения track.\n"
+"[Параметр backward] в основном влияет на направление извлечения ключа track с "
+"[constant UPDATE_DISCRETE], преобразованным [constant AnimationMixer."
+"ANIMATION_CALLBACK_MODE_DISCRETE_FORCE_CONTINUOUS] для соответствия "
+"результату с [method track_find_key]."
+
+msgid ""
+"The total length of the animation (in seconds).\n"
+"[b]Note:[/b] Length is not delimited by the last key, as this one may be "
+"before or after the end to ensure correct interpolation and looping."
+msgstr ""
+"Общая длина анимации (в секундах).\n"
+"[b]Замечание:[/b] Длина не ограничена последним ключом, так как он может "
+"находиться до или после конца для обеспечения корректной интерполяции и "
+"зацикливания."
+
+msgid ""
+"Determines the behavior of both ends of the animation timeline during "
+"animation playback. This is used for correct interpolation of animation "
+"cycles, and for hinting the player that it must restart the animation."
+msgstr ""
+"Определяет поведение обоих концов временной шкалы анимации во время "
+"воспроизведения анимации. Используется для корректной интерполяции циклов "
+"анимации и для подсказки игроку, что необходимо перезапустить анимацию."
+
+msgid "The animation step value."
+msgstr "Значение шага анимации."
+
+msgid ""
+"Value tracks set values in node properties, but only those which can be "
+"interpolated. For 3D position/rotation/scale, using the dedicated [constant "
+"TYPE_POSITION_3D], [constant TYPE_ROTATION_3D] and [constant TYPE_SCALE_3D] "
+"track types instead of [constant TYPE_VALUE] is recommended for performance "
+"reasons."
+msgstr ""
+"Значение отслеживает заданные значения в свойствах узла, но только те, "
+"которые можно интерполировать. Для 3D-позиции/вращения/масштаба рекомендуется "
+"использовать выделенных дорожек треков [constant TYPE_POSITION_3D], "
+"[константа TYPE_ROTATION_3D] и [константа TYPE_SCALE_3D] вместо [константы "
+"TYPE_VALUE] по соображениям производительности."
+
+msgid "3D position track (values are stored in [Vector3]s)."
+msgstr "Трехмерная дорожка положения (значения хранятся в [Vector3])."
+
+msgid "3D rotation track (values are stored in [Quaternion]s)."
+msgstr "Трехмерная дорожка вращения (значения хранятся в [Quaternion]s)."
+
+msgid "3D scale track (values are stored in [Vector3]s)."
+msgstr "Дорожка 3D-масштаба (значения хранятся в [Vector3])."
+
+msgid "Blend shape track."
+msgstr "Орбита смешанной формы."
+
+msgid "No interpolation (nearest value)."
+msgstr "Без интерполяции (ближайшее значение)."
+
+msgid "Linear interpolation."
+msgstr "Линейная интерполяция."
+
+msgid ""
+"Cubic interpolation. This looks smoother than linear interpolation, but is "
+"more expensive to interpolate. Stick to [constant INTERPOLATION_LINEAR] for "
+"complex 3D animations imported from external software, even if it requires "
+"using a higher animation framerate in return."
+msgstr ""
+"Кубическая интерполяция. Выглядит более гладко, чем линейная интерполяция, но "
+"интерполяция более затратна. Придерживайтесь [константы INTERPOLATION_LINEAR] "
+"для сложных 3D-анимаций, импортированных из внешнего программного "
+"обеспечения, даже если это требует использования более высокой частоты кадров "
+"анимации взамен."
+
+msgid ""
+"Linear interpolation with shortest path rotation.\n"
+"[b]Note:[/b] The result value is always normalized and may not match the key "
+"value."
+msgstr ""
+"Линейная интерполяция с вращением по кратчайшему пути.\n"
+"[b]Примечание:[/b] Значение результата всегда нормализовано и может не "
+"совпадать со значением ключа."
+
+msgid ""
+"Cubic interpolation with shortest path rotation.\n"
+"[b]Note:[/b] The result value is always normalized and may not match the key "
+"value."
+msgstr ""
+"Кубическая интерполяция с вращением по кратчайшему пути.\n"
+"[b]Примечание:[/b] Значение результата всегда нормализовано и может не "
+"совпадать со значением ключа."
+
+msgid "Update between keyframes and hold the value."
+msgstr "Обновляйте между ключевыми кадрами и сохраняйте значение."
+
+msgid "Update at the keyframes."
+msgstr "Обновление на ключевых кадрах."
+
+msgid ""
+"Same as [constant UPDATE_CONTINUOUS] but works as a flag to capture the value "
+"of the current object and perform interpolation in some methods. See also "
+"[method AnimationMixer.capture], [member AnimationPlayer."
+"playback_auto_capture], and [method AnimationPlayer.play_with_capture]."
+msgstr ""
+"То же, что и [constant UPDATE_CONTINUOUS], но работает как флаг для захвата "
+"значения текущего объекта и выполнения интерполяции в некоторых методах. См. "
+"также [method AnimationMixer.capture], [member AnimationPlayer."
+"playback_auto_capture] и [method AnimationPlayer.play_with_capture]."
+
+msgid "At both ends of the animation, the animation will stop playing."
+msgstr "В обоих случаях воспроизведение анимации остановится."
+
+msgid ""
+"At both ends of the animation, the animation will be repeated without "
+"changing the playback direction."
+msgstr ""
+"В обоих концах анимации она будет повторяться без изменения направления "
+"воспроизведения."
+
+msgid "Repeats playback and reverse playback at both ends of the animation."
+msgstr ""
+"Повторяет воспроизведение и обратное воспроизведение в обоих концах анимации."
+
+msgid "This flag indicates that the animation proceeds without any looping."
+msgstr "Этот флаг указывает, что анимация выполняется без зацикливания."
+
+msgid ""
+"This flag indicates that the animation has reached the end of the animation "
+"and just after loop processed."
+msgstr ""
+"Этот флаг указывает на то, что анимация достигла конца и сразу после "
+"обработки цикла."
+
+msgid ""
+"This flag indicates that the animation has reached the start of the animation "
+"and just after loop processed."
+msgstr ""
+"Этот флаг указывает на то, что анимация достигла начала анимации и сразу "
+"после обработки цикла."
+
+msgid "Finds only the key with approximating the time."
+msgstr "Находит только ключ с приблизительным временем."
+
+msgid "Finds only the key with matching the time."
+msgstr "Находит только ключ с соответствующим временем."
+
+msgid "Container for [Animation] resources."
+msgstr "Контейнер для ресурсов [Анимации]."
+
+msgid ""
+"An animation library stores a set of animations accessible through "
+"[StringName] keys, for use with [AnimationPlayer] nodes."
+msgstr ""
+"Библиотека анимации хранит набор анимаций, доступных через ключи "
+"[StringName], для использования с узлами [AnimationPlayer]."
+
+msgid "Animation tutorial index"
+msgstr "Каталог уроков по анимации"
+
+msgid ""
+"Adds the [param animation] to the library, accessible by the key [param name]."
+msgstr ""
+"Добавляет [param animation] в библиотеку, доступную по ключу [param name]."
+
+msgid ""
+"Changes the key of the [Animation] associated with the key [param name] to "
+"[param newname]."
+msgstr ""
+"Изменяет ключ [Animation], связанный с ключом [param name], на [param "
+"newname]."
+
+msgid "Emitted when an [Animation] is added, under the key [param name]."
+msgstr "Выдается при добавлении [Animation] под ключом [имя параметра]."
+
+msgid ""
+"Emitted when there's a change in one of the animations, e.g. tracks are "
+"added, moved or have changed paths. [param name] is the key of the animation "
+"that was changed.\n"
+"See also [signal Resource.changed], which this acts as a relay for."
+msgstr ""
+"Выдается при изменении одной из анимаций, например, при добавлении, "
+"перемещении или изменении путей треков. [имя параметра] — это ключ анимации, "
+"которая была изменена.\n"
+"См. также [сигнал Resource.changed], для которого он действует как реле."
+
+msgid "Emitted when an [Animation] stored with the key [param name] is removed."
+msgstr ""
+"Вызывается при удалении [Animation], сохраненной с ключом [имя параметра]."
+
+msgid ""
+"Emitted when the key for an [Animation] is changed, from [param name] to "
+"[param to_name]."
+msgstr ""
+"Вызывается при изменении ключа для [Animation] с [параметра name] на "
+"[параметр to_name]."
+
+msgid "Base class for [AnimationPlayer] and [AnimationTree]."
+msgstr "Базовый класс для [AnimationPlayer] и [AnimationTree]."
+
+msgid ""
+"Base class for [AnimationPlayer] and [AnimationTree] to manage animation "
+"lists. It also has general properties and methods for playback and blending.\n"
+"After instantiating the playback information data within the extended class, "
+"the blending is processed by the [AnimationMixer]."
+msgstr ""
+"Базовый класс для [AnimationPlayer] и [AnimationTree] для управления списками "
+"анимации. Он также имеет общие свойства и методы для воспроизведения и "
+"смешивания.\n"
+"После создания экземпляра данных информации о воспроизведении в расширенном "
+"классе смешивание обрабатывается [AnimationMixer]."
+
+msgid "Migrating Animations from Godot 4.0 to 4.3"
+msgstr "Перенос анимации из Godot 4.0 в 4.3"
+
+msgid "A virtual function for processing after getting a key during playback."
+msgstr ""
+"Виртуальная функция для обработки после получения ключа во время "
+"воспроизведения."
+
+msgid ""
+"Adds [param library] to the animation player, under the key [param name].\n"
+"AnimationMixer has a global library by default with an empty string as key. "
+"For adding an animation to the global library:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var global_library = mixer.get_animation_library(\"\")\n"
+"global_library.add_animation(\"animation_name\", animation_resource)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Добавляет [param library] в проигрыватель анимации под ключом [param name].\n"
+"AnimationMixer имеет глобальную библиотеку по умолчанию с пустой строкой в "
+"качестве ключа. Для добавления анимации в глобальную библиотеку:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var global_library = mixer.get_animation_library(\"\")\n"
+"global_library.add_animation(\"animation_name\", animation_resource)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid "Manually advance the animations by the specified time (in seconds)."
+msgstr "Вручную продвиньте анимацию на указанное время (в секундах)."
+
+msgid ""
+"If the animation track specified by [param name] has an option [constant "
+"Animation.UPDATE_CAPTURE], stores current values of the objects indicated by "
+"the track path as a cache. If there is already a captured cache, the old "
+"cache is discarded.\n"
+"After this it will interpolate with current animation blending result during "
+"the playback process for the time specified by [param duration], working like "
+"a crossfade.\n"
+"You can specify [param trans_type] as the curve for the interpolation. For "
+"better results, it may be appropriate to specify [constant Tween."
+"TRANS_LINEAR] for cases where the first key of the track begins with a non-"
+"zero value or where the key value does not change, and [constant Tween."
+"TRANS_QUAD] for cases where the key value changes linearly."
+msgstr ""
+"Если анимационная дорожка, указанная [param name], имеет опцию [constant "
+"Animation.UPDATE_CAPTURE], сохраняет текущие значения объектов, указанных "
+"путем дорожки, как кэш. Если уже есть захваченный кэш, старый кэш "
+"отбрасывается.\n"
+"После этого он будет интерполироваться с текущим результатом смешивания "
+"анимации во время процесса воспроизведения в течение времени, указанного "
+"[param duration], работая как кроссфейд.\n"
+"Вы можете указать [param trans_type] в качестве кривой для интерполяции. Для "
+"лучших результатов может быть целесообразно указать [constant Tween."
+"TRANS_LINEAR] для случаев, когда первый ключ дорожки начинается с ненулевого "
+"значения или когда значение ключа не меняется, и [constant Tween.TRANS_QUAD] "
+"для случаев, когда значение ключа изменяется линейно."
+
+msgid ""
+"[AnimationMixer] caches animated nodes. It may not notice if a node "
+"disappears; [method clear_caches] forces it to update the cache again."
+msgstr ""
+"[AnimationMixer] кэширует анимированные узлы. Он может не заметить, если узел "
+"исчезнет; [method clear_caches] заставляет его обновить кэш снова."
+
+msgid ""
+"Returns the key of [param animation] or an empty [StringName] if not found."
+msgstr ""
+"Возвращает ключ [param animation] или пустой [StringName], если он не найден."
+
+msgid ""
+"Returns the key for the [AnimationLibrary] that contains [param animation] or "
+"an empty [StringName] if not found."
+msgstr ""
+"Возвращает ключ для [AnimationLibrary], содержащий [param animation], или "
+"пустой [StringName], если он не найден."
+
+msgid ""
+"Retrieve the motion delta of position with the [member root_motion_track] as "
+"a [Vector3] that can be used elsewhere.\n"
+"If [member root_motion_track] is not a path to a track of type [constant "
+"Animation.TYPE_POSITION_3D], returns [code]Vector3(0, 0, 0)[/code].\n"
+"See also [member root_motion_track] and [RootMotionView].\n"
+"The most basic example is applying position to [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_rotation\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_rotation = get_quaternion()\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var velocity = current_rotation * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"By using this in combination with [method "
+"get_root_motion_rotation_accumulator], you can apply the root motion position "
+"more correctly to account for the rotation of the node.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = (animation_tree.get_root_motion_rotation_accumulator()."
+"inverse() * get_quaternion()) * animation_tree.get_root_motion_position() / "
+"delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"If [member root_motion_local] is [code]true[/code], return the pre-multiplied "
+"translation value with the inverted rotation.\n"
+"In this case, the code can be written as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = get_quaternion() * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Извлеките дельту движения позиции с [элементом root_motion_track] как "
+"[Vector3], который можно использовать в другом месте.\n"
+"Если [элемент root_motion_track] не является путем к треку типа [constant "
+"Animation.TYPE_POSITION_3D], возвращает [code]Vector3(0, 0, 0)[/code].\n"
+"См. также [элемент root_motion_track] и [RootMotionView].\n"
+"Самый простой пример — применение позиции к [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_rotation\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_rotation = get_quaternion()\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var velocity = current_rotation * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Используя это в сочетании с [методом get_root_motion_rotation_accumulator], "
+"вы можете более правильно применить положение движения корня для учета "
+"вращения узла.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = (animation_tree.get_root_motion_rotation_accumulator()."
+"inverse() * get_quaternion()) * animation_tree.get_root_motion_position() / "
+"delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Если [member root_motion_local] равен [code]true[/code], верните "
+"предварительно умноженное значение перевода с инвертированным вращением.\n"
+"В этом случае код можно записать следующим образом:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"    var velocity = get_quaternion() * animation_tree."
+"get_root_motion_position() / delta\n"
+"    set_velocity(velocity)\n"
+"    move_and_slide()\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Retrieve the blended value of the position tracks with the [member "
+"root_motion_track] as a [Vector3] that can be used elsewhere.\n"
+"This is useful in cases where you want to respect the initial key values of "
+"the animation.\n"
+"For example, if an animation with only one key [code]Vector3(0, 0, 0)[/code] "
+"is played in the previous frame and then an animation with only one key "
+"[code]Vector3(1, 0, 1)[/code] is played in the next frame, the difference can "
+"be calculated as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_position_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_position_accumulator = animation_tree."
+"get_root_motion_position_accumulator()\n"
+"    var difference = current_root_motion_position_accumulator - "
+"prev_root_motion_position_accumulator\n"
+"    prev_root_motion_position_accumulator = "
+"current_root_motion_position_accumulator\n"
+"    transform.origin += difference\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"However, if the animation loops, an unintended discrete change may occur, so "
+"this is only useful for some simple use cases."
+msgstr ""
+"Получите смешанное значение треков положения с [элементом root_motion_track] "
+"как [Vector3], которое можно использовать в другом месте.\n"
+"Это полезно в случаях, когда вы хотите соблюдать начальные ключевые значения "
+"анимации.\n"
+"Например, если анимация только с одним ключом [code]Vector3(0, 0, 0)[/code] "
+"воспроизводится в предыдущем кадре, а затем анимация только с одним ключом "
+"[code]Vector3(1, 0, 1)[/code] воспроизводится в следующем кадре, разницу "
+"можно вычислить следующим образом:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_position_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_position_accumulator = animation_tree."
+"get_root_motion_position_accumulator()\n"
+"    var difference = current_root_motion_position_accumulator - "
+"prev_root_motion_position_accumulator\n"
+"    prev_root_motion_position_accumulator = "
+"current_root_motion_position_accumulator\n"
+"    transform.origin += difference\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Однако если анимация зацикливается, может произойти непреднамеренное "
+"дискретное изменение, поэтому это полезно только для некоторых простых "
+"случаев использования."
+
+msgid ""
+"Retrieve the motion delta of rotation with the [member root_motion_track] as "
+"a [Quaternion] that can be used elsewhere.\n"
+"If [member root_motion_track] is not a path to a track of type [constant "
+"Animation.TYPE_ROTATION_3D], returns [code]Quaternion(0, 0, 0, 1)[/code].\n"
+"See also [member root_motion_track] and [RootMotionView].\n"
+"The most basic example is applying rotation to [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Извлеките дельту движения вращения с [элементом root_motion_track] как "
+"[Quaternion], который можно использовать в другом месте.\n"
+"Если [элемент root_motion_track] не является путем к треку типа [constant "
+"Animation.TYPE_ROTATION_3D], возвращает [code]Quaternion(0, 0, 0, 1)[/code].\n"
+"См. также [элемент root_motion_track] и [RootMotionView].\n"
+"Самый простой пример — применение вращения к [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    set_quaternion(get_quaternion() * animation_tree."
+"get_root_motion_rotation())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Retrieve the blended value of the rotation tracks with the [member "
+"root_motion_track] as a [Quaternion] that can be used elsewhere.\n"
+"This is necessary to apply the root motion position correctly, taking "
+"rotation into account. See also [method get_root_motion_position].\n"
+"Also, this is useful in cases where you want to respect the initial key "
+"values of the animation.\n"
+"For example, if an animation with only one key [code]Quaternion(0, 0, 0, 1)[/"
+"code] is played in the previous frame and then an animation with only one key "
+"[code]Quaternion(0, 0.707, 0, 0.707)[/code] is played in the next frame, the "
+"difference can be calculated as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_rotation_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_rotation_accumulator = animation_tree."
+"get_root_motion_rotation_accumulator()\n"
+"    var difference = prev_root_motion_rotation_accumulator.inverse() * "
+"current_root_motion_rotation_accumulator\n"
+"    prev_root_motion_rotation_accumulator = "
+"current_root_motion_rotation_accumulator\n"
+"    transform.basis *=  Basis(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"However, if the animation loops, an unintended discrete change may occur, so "
+"this is only useful for some simple use cases."
+msgstr ""
+"Извлеките смешанное значение треков вращения с [элементом root_motion_track] "
+"как [Quaternion], которое можно использовать в другом месте.\n"
+"Это необходимо для правильного применения корневой позиции движения с учетом "
+"вращения. См. также [method get_root_motion_position].\n"
+"Кроме того, это полезно в случаях, когда вы хотите соблюдать начальные "
+"ключевые значения анимации.\n"
+"Например, если анимация только с одним ключом [code]Quaternion(0, 0, 0, 1)[/"
+"code] воспроизводится в предыдущем кадре, а затем анимация только с одним "
+"ключом [code]Quaternion(0, 0.707, 0, 0.707)[/code] воспроизводится в "
+"следующем кадре, разницу можно вычислить следующим образом:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_rotation_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_rotation_accumulator = animation_tree."
+"get_root_motion_rotation_accumulator()\n"
+"    var difference = prev_root_motion_rotation_accumulator.inverse() * "
+"current_root_motion_rotation_accumulator\n"
+"    prev_root_motion_rotation_accumulator = "
+"current_root_motion_rotation_accumulator\n"
+"    transform.basis *=  Basis(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Однако если анимация зацикливается, может произойти непреднамеренное "
+"дискретное изменение, поэтому это полезно только для некоторых простых "
+"случаев использования."
+
+msgid ""
+"Retrieve the motion delta of scale with the [member root_motion_track] as a "
+"[Vector3] that can be used elsewhere.\n"
+"If [member root_motion_track] is not a path to a track of type [constant "
+"Animation.TYPE_SCALE_3D], returns [code]Vector3(0, 0, 0)[/code].\n"
+"See also [member root_motion_track] and [RootMotionView].\n"
+"The most basic example is applying scale to [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_scale = Vector3(1, 1, 1)\n"
+"var scale_accum = Vector3(1, 1, 1)\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_scale = get_scale()\n"
+"        scale_accum = Vector3(1, 1, 1)\n"
+"        state_machine.travel(\"Animate\")\n"
+"    scale_accum += animation_tree.get_root_motion_scale()\n"
+"    set_scale(current_scale * scale_accum)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Извлеките дельту движения масштаба с [элементом root_motion_track] как "
+"[Vector3], который можно использовать в другом месте.\n"
+"Если [элемент root_motion_track] не является путем к треку типа [constant "
+"Animation.TYPE_SCALE_3D], возвращает [code]Vector3(0, 0, 0)[/code].\n"
+"См. также [элемент root_motion_track] и [RootMotionView].\n"
+"Самый простой пример — применение масштаба к [CharacterBody3D]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var current_scale = Vector3(1, 1, 1)\n"
+"var scale_accum = Vector3(1, 1, 1)\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        current_scale = get_scale()\n"
+"        scale_accum = Vector3(1, 1, 1)\n"
+"        state_machine.travel(\"Animate\")\n"
+"    scale_accum += animation_tree.get_root_motion_scale()\n"
+"    set_scale(current_scale * scale_accum)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Retrieve the blended value of the scale tracks with the [member "
+"root_motion_track] as a [Vector3] that can be used elsewhere.\n"
+"For example, if an animation with only one key [code]Vector3(1, 1, 1)[/code] "
+"is played in the previous frame and then an animation with only one key "
+"[code]Vector3(2, 2, 2)[/code] is played in the next frame, the difference can "
+"be calculated as follows:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_scale_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_scale_accumulator = animation_tree."
+"get_root_motion_scale_accumulator()\n"
+"    var difference = current_root_motion_scale_accumulator - "
+"prev_root_motion_scale_accumulator\n"
+"    prev_root_motion_scale_accumulator = "
+"current_root_motion_scale_accumulator\n"
+"    transform.basis = transform.basis.scaled(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"However, if the animation loops, an unintended discrete change may occur, so "
+"this is only useful for some simple use cases."
+msgstr ""
+"Получите смешанное значение треков масштабирования с [элементом "
+"root_motion_track] как [Vector3], которое можно использовать в другом месте.\n"
+"Например, если анимация только с одним ключом [code]Vector3(1, 1, 1)[/code] "
+"воспроизводится в предыдущем кадре, а затем анимация только с одним ключом "
+"[code]Vector3(2, 2, 2)[/code] воспроизводится в следующем кадре, разницу "
+"можно рассчитать следующим образом:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var prev_root_motion_scale_accumulator\n"
+"\n"
+"func _process(delta):\n"
+"    if Input.is_action_just_pressed(\"animate\"):\n"
+"        state_machine.travel(\"Animate\")\n"
+"    var current_root_motion_scale_accumulator = animation_tree."
+"get_root_motion_scale_accumulator()\n"
+"    var difference = current_root_motion_scale_accumulator - "
+"prev_root_motion_scale_accumulator\n"
+"    prev_root_motion_scale_accumulator = "
+"current_root_motion_scale_accumulator\n"
+"    transform.basis = transform.basis.scaled(difference)\n"
+"[/gdscript]\n"
+"[/codeblocks]\n"
+"Однако если анимация зацикливается, может произойти непреднамеренное "
+"дискретное изменение, поэтому это полезно только для некоторых простых "
+"случаев использования."
+
+msgid "Removes the [AnimationLibrary] associated with the key [param name]."
+msgstr "Удаляет [AnimationLibrary], связанный с ключом [param name]."
+
+msgid ""
+"Moves the [AnimationLibrary] associated with the key [param name] to the key "
+"[param newname]."
+msgstr ""
+"Перемещает [AnimationLibrary], связанный с ключом [param name], в ключ [param "
+"newname]."
+
+msgid ""
+"The number of possible simultaneous sounds for each of the assigned "
+"AudioStreamPlayers.\n"
+"For example, if this value is [code]32[/code] and the animation has two audio "
+"tracks, the two [AudioStreamPlayer]s assigned can play simultaneously up to "
+"[code]32[/code] voices each."
+msgstr ""
+"Количество возможных одновременных звуков для каждого из назначенных "
+"AudioStreamPlayers.\n"
+"Например, если это значение равно [code]32[/code] и анимация имеет две "
+"аудиодорожки, два назначенных [AudioStreamPlayer] могут одновременно "
+"воспроизводить до [code]32[/code] голосов каждый."
+
+msgid ""
+"Ordinarily, tracks can be set to [constant Animation.UPDATE_DISCRETE] to "
+"update infrequently, usually when using nearest interpolation.\n"
+"However, when blending with [constant Animation.UPDATE_CONTINUOUS] several "
+"results are considered. The [member callback_mode_discrete] specify it "
+"explicitly. See also [enum AnimationCallbackModeDiscrete].\n"
+"To make the blended results look good, it is recommended to set this to "
+"[constant ANIMATION_CALLBACK_MODE_DISCRETE_FORCE_CONTINUOUS] to update every "
+"frame during blending. Other values exist for compatibility and they are fine "
+"if there is no blending, but not so, may produce artifacts."
+msgstr ""
+"Обычно дорожки можно установить на [constant Animation.UPDATE_DISCRETE] для "
+"редкого обновления, обычно при использовании ближайшей интерполяции.\n"
+"Однако при смешивании с [constant Animation.UPDATE_CONTINUOUS] "
+"рассматриваются несколько результатов. [Member callback_mode_discrete] "
+"указывает это явно. См. также [enum AnimationCallbackModeDiscrete].\n"
+"Чтобы смешанные результаты выглядели хорошо, рекомендуется установить это на "
+"[constant ANIMATION_CALLBACK_MODE_DISCRETE_FORCE_CONTINUOUS] для обновления "
+"каждого кадра во время смешивания. Существуют другие значения для "
+"совместимости, и они хороши, если смешивания нет, но не так, могут создавать "
+"артефакты."
+
+msgid "The call mode used for \"Call Method\" tracks."
+msgstr "Режим вызова, используемый для треков «Метод вызова»."
+
+msgid "The process notification in which to update animations."
+msgstr "Уведомление о процессе, в котором необходимо обновить анимацию."
+
+msgid ""
+"If [code]true[/code], the blending uses the deterministic algorithm. The "
+"total weight is not normalized and the result is accumulated with an initial "
+"value ([code]0[/code] or a [code]\"RESET\"[/code] animation if present).\n"
+"This means that if the total amount of blending is [code]0.0[/code], the "
+"result is equal to the [code]\"RESET\"[/code] animation.\n"
+"If the number of tracks between the blended animations is different, the "
+"animation with the missing track is treated as if it had the initial value.\n"
+"If [code]false[/code], The blend does not use the deterministic algorithm. "
+"The total weight is normalized and always [code]1.0[/code]. If the number of "
+"tracks between the blended animations is different, nothing is done about the "
+"animation that is missing a track.\n"
+"[b]Note:[/b] In [AnimationTree], the blending with [AnimationNodeAdd2], "
+"[AnimationNodeAdd3], [AnimationNodeSub2] or the weight greater than "
+"[code]1.0[/code] may produce unexpected results.\n"
+"For example, if [AnimationNodeAdd2] blends two nodes with the amount "
+"[code]1.0[/code], then total weight is [code]2.0[/code] but it will be "
+"normalized to make the total amount [code]1.0[/code] and the result will be "
+"equal to [AnimationNodeBlend2] with the amount [code]0.5[/code]."
+msgstr ""
+"Если [code]true[/code], смешивание использует детерминированный алгоритм. "
+"Общий вес не нормализуется, а результат накапливается с начальным значением "
+"([code]0[/code] или анимацией [code]\"RESET\"[/code], если она "
+"присутствует).\n"
+"Это означает, что если общий объем смешивания равен [code]0.0[/code], "
+"результат равен анимации [code]\"RESET\"[/code]. \n"
+"Если количество дорожек между смешанными анимациями отличается, анимация с "
+"отсутствующей дорожкой обрабатывается так, как если бы она имела начальное "
+"значение.\n"
+"Если [code]false[/code], смешивание не использует детерминированный алгоритм. "
+"Общий вес нормализуется и всегда [code]1.0[/code]. Если количество дорожек "
+"между смешанными анимациями отличается, ничего не делается для анимации, в "
+"которой отсутствует дорожка.\n"
+"[b]Примечание:[/b] В [AnimationTree] смешивание с [AnimationNodeAdd2], "
+"[AnimationNodeAdd3], [AnimationNodeSub2] или весом больше [code]1.0[/code] "
+"может привести к неожиданным результатам.\n"
+"Например, если [AnimationNodeAdd2] смешивает два узла с количеством "
+"[code]1.0[/code], то общий вес составит [code]2.0[/code], но он будет "
+"нормализован, чтобы сделать общее количество [code]1.0[/code], а результат "
+"будет равен [AnimationNodeBlend2] с количеством [code]0.5[/code]."
+
+msgid ""
+"This is used by the editor. If set to [code]true[/code], the scene will be "
+"saved with the effects of the reset animation (the animation with the key "
+"[code]\"RESET\"[/code]) applied as if it had been seeked to time 0, with the "
+"editor keeping the values that the scene had before saving.\n"
+"This makes it more convenient to preview and edit animations in the editor, "
+"as changes to the scene will not be saved as long as they are set in the "
+"reset animation."
+msgstr ""
+"Это используется редактором. Если установлено значение [code]true[/code], "
+"сцена будет сохранена с эффектами анимации сброса (анимация с ключом "
+"[code]\"RESET\"[/code]), примененными так, как если бы она была перенесена на "
+"время 0, при этом редактор сохраняет значения, которые сцена имела до "
+"сохранения. \n"
+"Это делает более удобным предварительный просмотр и редактирование анимаций в "
+"редакторе, поскольку изменения в сцене не будут сохранены, пока они "
+"установлены в анимации сброса."
+
+msgid ""
+"If [code]true[/code], [method get_root_motion_position] value is extracted as "
+"a local translation value before blending. In other words, it is treated like "
+"the translation is done after the rotation."
+msgstr ""
+"Если [code]true[/code], значение [method get_root_motion_position] "
+"извлекается как локальное значение перевода перед смешиванием. Другими "
+"словами, оно обрабатывается так, как будто перевод выполняется после поворота."
+
+msgid ""
+"The path to the Animation track used for root motion. Paths must be valid "
+"scene-tree paths to a node, and must be specified starting from the parent "
+"node of the node that will reproduce the animation. The [member "
+"root_motion_track] uses the same format as [method Animation.track_set_path], "
+"but note that a bone must be specified.\n"
+"If the track has type [constant Animation.TYPE_POSITION_3D], [constant "
+"Animation.TYPE_ROTATION_3D], or [constant Animation.TYPE_SCALE_3D] the "
+"transformation will be canceled visually, and the animation will appear to "
+"stay in place. See also [method get_root_motion_position], [method "
+"get_root_motion_rotation], [method get_root_motion_scale], and "
+"[RootMotionView]."
+msgstr ""
+"Путь к дорожке анимации, используемой для корневого движения. Пути должны "
+"быть допустимыми путями дерева сцены к узлу и должны быть указаны, начиная с "
+"родительского узла узла, который будет воспроизводить анимацию. [Member "
+"root_motion_track] использует тот же формат, что и [method Animation."
+"track_set_path], но обратите внимание, что должна быть указана кость.\n"
+"Если дорожка имеет тип [constant Animation.TYPE_POSITION_3D], [constant "
+"Animation.TYPE_ROTATION_3D] или [constant Animation.TYPE_SCALE_3D], "
+"преобразование будет визуально отменено, и анимация будет казаться оставшейся "
+"на месте. См. также [method get_root_motion_position], [method "
+"get_root_motion_rotation], [method get_root_motion_scale] и [RootMotionView]."
+
+msgid "The node which node path references will travel from."
+msgstr "Узел, на который ссылается путь узла, будет отправлен."
+
+msgid ""
+"Notifies when an animation finished playing.\n"
+"[b]Note:[/b] This signal is not emitted if an animation is looping."
+msgstr ""
+"Уведомляет об окончании воспроизведения анимации.\n"
+"[b]Примечание:[/b] Этот сигнал не выдается, если анимация зацикливается."
+
+msgid "Notifies when the animation libraries have changed."
+msgstr "Уведомляет об изменении библиотек анимации."
+
+msgid "Notifies when an animation list is changed."
+msgstr "Уведомляет об изменении списка анимаций."
+
+msgid "Notifies when an animation starts playing."
+msgstr "Уведомляет о начале воспроизведения анимации."
+
+msgid ""
+"Notifies when the caches have been cleared, either automatically, or manually "
+"via [method clear_caches]."
+msgstr ""
+"Уведомляет об очистке кэшей автоматически или вручную с помощью [метода "
+"clear_caches]."
+
+msgid ""
+"Notifies when the blending result related have been applied to the target "
+"objects."
+msgstr ""
+"Уведомляет, когда соответствующий результат смешивания был применен к целевым "
+"объектам."
+
+msgid "Notifies when the property related process have been updated."
+msgstr "Уведомляет об обновлении процесса, связанного с недвижимостью."
+
+msgid ""
+"Process animation during physics frames (see [constant Node."
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS]). This is especially useful when "
+"animating physics bodies."
+msgstr ""
+"Анимация процесса во время физических кадров (см. [constant Node."
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS]). Это особенно полезно при анимации "
+"физических тел."
+
+msgid ""
+"Process animation during process frames (see [constant Node."
+"NOTIFICATION_INTERNAL_PROCESS])."
+msgstr ""
+"Анимация процесса во время кадров процесса (см. [constant Node."
+"NOTIFICATION_INTERNAL_PROCESS])."
+
+msgid ""
+"Do not process animation. Use [method advance] to process the animation "
+"manually."
+msgstr ""
+"Не обрабатывать анимацию. Используйте [method advance] для ручной обработки "
+"анимации."
+
+msgid ""
+"Batch method calls during the animation process, then do the calls after "
+"events are processed. This avoids bugs involving deleting nodes or modifying "
+"the AnimationPlayer while playing."
+msgstr ""
+"Пакетные вызовы методов во время процесса анимации, затем вызовы после "
+"обработки событий. Это позволяет избежать ошибок, связанных с удалением узлов "
+"или изменением AnimationPlayer во время воспроизведения."
+
+msgid "Make method calls immediately when reached in the animation."
+msgstr "Вызывайте методы немедленно при достижении их в анимации."
+
+msgid ""
+"An [constant Animation.UPDATE_DISCRETE] track value takes precedence when "
+"blending [constant Animation.UPDATE_CONTINUOUS] or [constant Animation."
+"UPDATE_CAPTURE] track values and [constant Animation.UPDATE_DISCRETE] track "
+"values."
+msgstr ""
+"Значение дорожки [constant Animation.UPDATE_DISCRETE] имеет приоритет при "
+"смешивании значений дорожки [constant Animation.UPDATE_CONTINUOUS] или "
+"[constant Animation.UPDATE_CAPTURE] и значений дорожки [constant Animation."
+"UPDATE_DISCRETE]."
+
+msgid ""
+"An [constant Animation.UPDATE_CONTINUOUS] or [constant Animation."
+"UPDATE_CAPTURE] track value takes precedence when blending the [constant "
+"Animation.UPDATE_CONTINUOUS] or [constant Animation.UPDATE_CAPTURE] track "
+"values and the [constant Animation.UPDATE_DISCRETE] track values. This is the "
+"default behavior for [AnimationPlayer]."
+msgstr ""
+"Значение дорожки [constant Animation.UPDATE_CONTINUOUS] или [constant "
+"Animation.UPDATE_CAPTURE] имеет приоритет при смешивании значений дорожки "
+"[constant Animation.UPDATE_CONTINUOUS] или [constant Animation."
+"UPDATE_CAPTURE] и значений дорожки [constant Animation.UPDATE_DISCRETE]. Это "
+"поведение по умолчанию для [AnimationPlayer]."
+
+msgid ""
+"Always treat the [constant Animation.UPDATE_DISCRETE] track value as "
+"[constant Animation.UPDATE_CONTINUOUS] with [constant Animation."
+"INTERPOLATION_NEAREST]. This is the default behavior for [AnimationTree].\n"
+"If a value track has un-interpolatable type key values, it is internally "
+"converted to use [constant ANIMATION_CALLBACK_MODE_DISCRETE_RECESSIVE] with "
+"[constant Animation.UPDATE_DISCRETE].\n"
+"Un-interpolatable type list:\n"
+"- [constant @GlobalScope.TYPE_NIL]\n"
+"- [constant @GlobalScope.TYPE_NODE_PATH]\n"
+"- [constant @GlobalScope.TYPE_RID]\n"
+"- [constant @GlobalScope.TYPE_OBJECT]\n"
+"- [constant @GlobalScope.TYPE_CALLABLE]\n"
+"- [constant @GlobalScope.TYPE_SIGNAL]\n"
+"- [constant @GlobalScope.TYPE_DICTIONARY]\n"
+"- [constant @GlobalScope.TYPE_PACKED_BYTE_ARRAY]\n"
+"[constant @GlobalScope.TYPE_BOOL] and [constant @GlobalScope.TYPE_INT] are "
+"treated as [constant @GlobalScope.TYPE_FLOAT] during blending and rounded "
+"when the result is retrieved.\n"
+"It is same for arrays and vectors with them such as [constant @GlobalScope."
+"TYPE_PACKED_INT32_ARRAY] or [constant @GlobalScope.TYPE_VECTOR2I], they are "
+"treated as [constant @GlobalScope.TYPE_PACKED_FLOAT32_ARRAY] or [constant "
+"@GlobalScope.TYPE_VECTOR2]. Also note that for arrays, the size is also "
+"interpolated.\n"
+"[constant @GlobalScope.TYPE_STRING] and [constant @GlobalScope."
+"TYPE_STRING_NAME] are interpolated between character codes and lengths, but "
+"note that there is a difference in algorithm between interpolation between "
+"keys and interpolation by blending."
+msgstr ""
+"Всегда обрабатывайте значение дорожки [constant Animation.UPDATE_DISCRETE] "
+"как [constant Animation.UPDATE_CONTINUOUS] с [constant Animation."
+"INTERPOLATION_NEAREST]. Это поведение по умолчанию для [AnimationTree].\n"
+"Если дорожка значений имеет неинтерполируемые значения типа ключа, она "
+"внутренне преобразуется для использования [constant "
+"ANIMATION_CALLBACK_MODE_DISCRETE_RECESSIVE] с [constant Animation."
+"UPDATE_DISCRETE].\n"
+"Список неинтерполируемых типов:\n"
+"- [constant @GlobalScope.TYPE_NIL]\n"
+"- [constant @GlobalScope.TYPE_NODE_PATH]\n"
+"- [constant @GlobalScope.TYPE_RID]\n"
+"- [constant @GlobalScope.TYPE_OBJECT]\n"
+"- [constant @GlobalScope.TYPE_CALLABLE]\n"
+"- [constant @GlobalScope.TYPE_SIGNAL]\n"
+"- [constant @GlobalScope.TYPE_DICTIONARY]\n"
+"- [constant @GlobalScope.TYPE_PACKED_BYTE_ARRAY]\n"
+"[constant @GlobalScope.TYPE_BOOL] и [constant @GlobalScope.TYPE_INT] "
+"обрабатываются как [constant @GlobalScope.TYPE_FLOAT] во время смешивания и "
+"округляются при получении результата.\n"
+"То же самое касается массивов и векторов с ними, например, [константа "
+"@GlobalScope.TYPE_PACKED_INT32_ARRAY] или [константа @GlobalScope."
+"TYPE_VECTOR2I], они обрабатываются как [константа @GlobalScope."
+"TYPE_PACKED_FLOAT32_ARRAY] или [константа @GlobalScope.TYPE_VECTOR2]. Также "
+"обратите внимание, что для массивов размер также интерполируется.\n"
+"[константа @GlobalScope.TYPE_STRING] и [константа @GlobalScope."
+"TYPE_STRING_NAME] интерполируются между кодами символов и длинами, но "
+"обратите внимание, что есть разница в алгоритме между интерполяцией между "
+"ключами и интерполяцией путем смешивания."
+
+msgid "Base class for [AnimationTree] nodes. Not related to scene nodes."
+msgstr "Базовый класс для узлов [AnimationTree]. Не относится к узлам сцены."
+
+msgid ""
+"Base resource for [AnimationTree] nodes. In general, it's not used directly, "
+"but you can create custom ones with custom blending formulas.\n"
+"Inherit this when creating animation nodes mainly for use in "
+"[AnimationNodeBlendTree], otherwise [AnimationRootNode] should be used "
+"instead.\n"
+"You can access the time information as read-only parameter which is processed "
+"and stored in the previous frame for all nodes except [AnimationNodeOutput].\n"
+"[b]Note:[/b] If multiple inputs exist in the [AnimationNode], which time "
+"information takes precedence depends on the type of [AnimationNode].\n"
+"[codeblock]\n"
+"var current_length = $AnimationTree[parameters/AnimationNodeName/"
+"current_length]\n"
+"var current_position = $AnimationTree[parameters/AnimationNodeName/"
+"current_position]\n"
+"var current_delta = $AnimationTree[parameters/AnimationNodeName/"
+"current_delta]\n"
+"[/codeblock]"
+msgstr ""
+"Базовый ресурс для узлов [AnimationTree]. Обычно он не используется напрямую, "
+"но вы можете создавать собственные с помощью собственных формул смешивания.\n"
+"Наследуйте его при создании узлов анимации, в основном для использования в "
+"[AnimationNodeBlendTree], в противном случае вместо него следует использовать "
+"[AnimationRootNode].\n"
+"Вы можете получить доступ к информации о времени как к параметру только для "
+"чтения, который обрабатывается и сохраняется в предыдущем кадре для всех "
+"узлов, кроме [AnimationNodeOutput].\n"
+"[b]Примечание:[/b] Если в [AnimationNode] существует несколько входов, то "
+"приоритет информации о времени зависит от типа [AnimationNode].\n"
+"[codeblock]\n"
+"var current_length = $AnimationTree[parameters/AnimationNodeName/"
+"current_length]\n"
+"var current_position = $AnimationTree[parameters/AnimationNodeName/"
+"current_position]\n"
+"var current_delta = $AnimationTree[parameters/AnimationNodeName/"
+"current_delta]\n"
+"[/codeblock]"
+
+msgid "Using AnimationTree"
+msgstr "Использование дерева анимации"
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"override the text caption for this animation node."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод, "
+"чтобы переопределить текстовую подпись для этого узла анимации."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return a child animation node by its [param name]."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод для "
+"возврата дочернего узла анимации по его [имя параметра]."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return all child animation nodes in order as a [code]name: node[/code] "
+"dictionary."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод для "
+"возврата всех дочерних узлов анимации в порядке словаря [code]name: node[/"
+"code]."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return the default value of a [param parameter]. Parameters are custom local "
+"memory used for your animation nodes, given a resource can be reused in "
+"multiple trees."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод для "
+"возврата значения по умолчанию параметра [param]. Параметры — это "
+"настраиваемая локальная память, используемая для ваших узлов анимации, "
+"учитывая, что ресурс может быть повторно использован в нескольких деревьях."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return a list of the properties on this animation node. Parameters are custom "
+"local memory used for your animation nodes, given a resource can be reused in "
+"multiple trees. Format is similar to [method Object.get_property_list]."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод для "
+"возврата списка свойств этого узла анимации. Параметры — это настраиваемая "
+"локальная память, используемая для ваших узлов анимации, учитывая, что ресурс "
+"может быть повторно использован в нескольких деревьях. Формат аналогичен "
+"[method Object.get_property_list]."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return whether the blend tree editor should display filter editing on this "
+"animation node."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод, "
+"чтобы узнать, должен ли редактор смешанного дерева отображать редактирование "
+"фильтра на этом узле анимации."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"return whether the [param parameter] is read-only. Parameters are custom "
+"local memory used for your animation nodes, given a resource can be reused in "
+"multiple trees."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод, "
+"чтобы вернуть, является ли параметр [param] доступным только для чтения. "
+"Параметры — это настраиваемая локальная память, используемая для ваших узлов "
+"анимации, учитывая, что ресурс может быть повторно использован в нескольких "
+"деревьях."
+
+msgid ""
+"Currently this is mostly useless as there is a lack of many APIs to extend "
+"AnimationNode by GDScript. It is planned that a more flexible API using "
+"structures will be provided in the future."
+msgstr ""
+"В настоящее время это в основном бесполезно, поскольку не хватает многих API "
+"для расширения AnimationNode с помощью GDScript. Планируется, что в будущем "
+"будет предоставлен более гибкий API с использованием структур."
+
+msgid ""
+"When inheriting from [AnimationRootNode], implement this virtual method to "
+"run some code when this animation node is processed. The [param time] "
+"parameter is a relative delta, unless [param seek] is [code]true[/code], in "
+"which case it is absolute.\n"
+"Here, call the [method blend_input], [method blend_node] or [method "
+"blend_animation] functions. You can also use [method get_parameter] and "
+"[method set_parameter] to modify local memory.\n"
+"This function should return the delta."
+msgstr ""
+"При наследовании от [AnimationRootNode] реализуйте этот виртуальный метод для "
+"запуска некоторого кода при обработке этого узла анимации. Параметр [param "
+"time] является относительной дельтой, если только [param seek] не является "
+"[code]true[/code], в этом случае он является абсолютным.\n"
+"Здесь вызовите функции [method blend_input], [method blend_node] или [method "
+"blend_animation]. Вы также можете использовать [method get_parameter] и "
+"[method set_parameter] для изменения локальной памяти.\n"
+"Эта функция должна возвращать дельту."
+
+msgid ""
+"Adds an input to the animation node. This is only useful for animation nodes "
+"created for use in an [AnimationNodeBlendTree]. If the addition fails, "
+"returns [code]false[/code]."
+msgstr ""
+"Добавляет вход в узел анимации. Это полезно только для узлов анимации, "
+"созданных для использования в [AnimationNodeBlendTree]. Если добавление не "
+"удается, возвращает [code]false[/code]."
+
+msgid ""
+"Blend an animation by [param blend] amount (name must be valid in the linked "
+"[AnimationPlayer]). A [param time] and [param delta] may be passed, as well "
+"as whether [param seeked] happened.\n"
+"A [param looped_flag] is used by internal processing immediately after the "
+"loop. See also [enum Animation.LoopedFlag]."
+msgstr ""
+"Смешайте анимацию на величину [param blend] (имя должно быть допустимым в "
+"связанном [AnimationPlayer]). Могут быть переданы [param time] и [param "
+"delta], а также произошло ли [param seeked].\n"
+"[param looped_flag] используется внутренней обработкой сразу после цикла. См. "
+"также [enum Animation.LoopedFlag]."
+
+msgid ""
+"Blend an input. This is only useful for animation nodes created for an "
+"[AnimationNodeBlendTree]. The [param time] parameter is a relative delta, "
+"unless [param seek] is [code]true[/code], in which case it is absolute. A "
+"filter mode may be optionally passed (see [enum FilterAction] for options)."
+msgstr ""
+"Смешайте входные данные. Это полезно только для узлов анимации, созданных для "
+"[AnimationNodeBlendTree]. Параметр [param time] является относительной "
+"дельтой, если только [param seek] не является [code]true[/code], в этом "
+"случае он является абсолютным. Режим фильтра может быть передан опционально "
+"(см. [enum FilterAction] для опций)."
+
+msgid ""
+"Blend another animation node (in case this animation node contains child "
+"animation nodes). This function is only useful if you inherit from "
+"[AnimationRootNode] instead, otherwise editors will not display your "
+"animation node for addition."
+msgstr ""
+"Смешайте другой узел анимации (в случае, если этот узел анимации содержит "
+"дочерние узлы анимации). Эта функция полезна только если вы наследуете от "
+"[AnimationRootNode], в противном случае редакторы не будут отображать ваш "
+"узел анимации для добавления."
+
+msgid ""
+"Amount of inputs in this animation node, only useful for animation nodes that "
+"go into [AnimationNodeBlendTree]."
+msgstr ""
+"Количество входов в этом узле анимации, полезно только для узлов анимации, "
+"которые входят в [AnimationNodeBlendTree]."
+
+msgid "Gets the name of an input by index."
+msgstr "Получает имя ввода по индексу."
+
+msgid ""
+"Gets the value of a parameter. Parameters are custom local memory used for "
+"your animation nodes, given a resource can be reused in multiple trees."
+msgstr ""
+"Получает значение параметра. Параметры — это настраиваемая локальная память, "
+"используемая для ваших узлов анимации, учитывая, что ресурс может быть "
+"повторно использован в нескольких деревьях."
+
+msgid ""
+"Returns the object id of the [AnimationTree] that owns this node.\n"
+"[b]Note:[/b] This method should only be called from within the [method "
+"AnimationNodeExtension._process_animation_node] method, and will return an "
+"invalid id otherwise."
+msgstr ""
+"Возвращает идентификатор объекта [AnimationTree], которому принадлежит этот "
+"узел.\n"
+"[b]Примечание:[/b] Этот метод следует вызывать только из метода [method "
+"AnimationNodeExtension._process_animation_node], в противном случае он вернет "
+"недействительный идентификатор."
+
+msgid ""
+"Sets the name of the input at the given [param input] index. If the setting "
+"fails, returns [code]false[/code]."
+msgstr ""
+"Устанавливает имя входа по указанному индексу [param input]. Если настройка "
+"не удалась, возвращает [code]false[/code]."
+
+msgid ""
+"Sets a custom parameter. These are used as local memory, because resources "
+"can be reused across the tree or scenes."
+msgstr ""
+"Устанавливает пользовательский параметр. Они используются как локальная "
+"память, поскольку ресурсы могут повторно использоваться по всему дереву или "
+"сценам."
+
+msgid "If [code]true[/code], filtering is enabled."
+msgstr "Если [code]true[/code], фильтрация включена."
+
+msgid ""
+"Emitted by nodes that inherit from this class and that have an internal tree "
+"when one of their animation nodes removes. The animation nodes that emit this "
+"signal are [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], "
+"[AnimationNodeStateMachine], and [AnimationNodeBlendTree]."
+msgstr ""
+"Выдается узлами, которые наследуют этот класс и имеют внутреннее дерево, "
+"когда один из их узлов анимации удаляется. Узлы анимации, которые выдают этот "
+"сигнал – [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], "
+"[AnimationNodeStateMachine] и [AnimationNodeBlendTree]."
+
+msgid ""
+"Emitted by nodes that inherit from this class and that have an internal tree "
+"when one of their animation node names changes. The animation nodes that emit "
+"this signal are [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], "
+"[AnimationNodeStateMachine], and [AnimationNodeBlendTree]."
+msgstr ""
+"Выпускается узлами, которые наследуют этот класс и имеют внутреннее дерево, "
+"когда изменяется одно из имен их узлов анимации. Узлы анимации, которые "
+"выдают этот сигнал – [AnimationNodeBlendSpace1D], "
+"[AnimationNodeBlendSpace2D], [AnimationNodeStateMachine] и "
+"[AnimationNodeBlendTree]."
+
+msgid ""
+"Emitted by nodes that inherit from this class and that have an internal tree "
+"when one of their animation nodes changes. The animation nodes that emit this "
+"signal are [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], "
+"[AnimationNodeStateMachine], [AnimationNodeBlendTree] and "
+"[AnimationNodeTransition]."
+msgstr ""
+"Выпускается узлами, которые наследуют этот класс и имеют внутреннее дерево, "
+"когда один из их узлов анимации изменяется. Узлы анимации, которые выдают "
+"этот сигнал – [AnimationNodeBlendSpace1D], [AnimationNodeBlendSpace2D], "
+"[AnimationNodeStateMachine], [AnimationNodeBlendTree] и "
+"[AnimationNodeTransition]."
+
+msgid "Do not use filtering."
+msgstr "Не использовать фильтрацию."
+
+msgid "Paths matching the filter will be allowed to pass."
+msgstr "Пути, соответствующие фильтру, будут пропущены."
+
+msgid "Paths matching the filter will be discarded."
+msgstr "Пути, соответствующие фильтру, будут отброшены."
+
+msgid "Paths matching the filter will be blended (by the blend value)."
+msgstr "Пути, соответствующие фильтру, будут смешаны (по значению смешивания)."
+
+msgid "Blends two animations additively inside of an [AnimationNodeBlendTree]."
+msgstr "Смешивает две анимации аддитивно внутри [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Blends two animations "
+"additively based on the amount value.\n"
+"If the amount is greater than [code]1.0[/code], the animation connected to "
+"\"in\" port is blended with the amplified animation connected to \"add\" "
+"port.\n"
+"If the amount is less than [code]0.0[/code], the animation connected to "
+"\"in\" port is blended with the inverted animation connected to \"add\" port."
+msgstr ""
+"Ресурс для добавления в [AnimationNodeBlendTree]. Смешивает две анимации "
+"аддитивно на основе значения количества.\n"
+"Если количество больше [code]1.0[/code], анимация, подключенная к порту "
+"\"in\", смешивается с усиленной анимацией, подключенной к порту \"add\".\n"
+"Если количество меньше [code]0.0[/code], анимация, подключенная к порту "
+"\"in\", смешивается с инвертированной анимацией, подключенной к порту \"add\"."
+
+msgid ""
+"Blends two of three animations additively inside of an "
+"[AnimationNodeBlendTree]."
+msgstr ""
+"Смешивает две из трех анимаций аддитивно внутри [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Blends two animations out "
+"of three additively out of three based on the amount value.\n"
+"This animation node has three inputs:\n"
+"- The base animation to add to\n"
+"- A \"-add\" animation to blend with when the blend amount is negative\n"
+"- A \"+add\" animation to blend with when the blend amount is positive\n"
+"If the absolute value of the amount is greater than [code]1.0[/code], the "
+"animation connected to \"in\" port is blended with the amplified animation "
+"connected to \"-add\"/\"+add\" port."
+msgstr ""
+"Ресурс для добавления в [AnimationNodeBlendTree]. Смешивает две анимации из "
+"трех аддитивно из трех на основе значения количества.\n"
+"Этот узел анимации имеет три входа:\n"
+"- Базовая анимация для добавления\n"
+"- Анимация \"-add\" для смешивания, когда количество смешивания отрицательно\n"
+"- Анимация \"+add\" для смешивания, когда количество смешивания положительно\n"
+"Если абсолютное значение количества больше [code]1.0[/code], анимация, "
+"подключенная к порту \"in\", смешивается с усиленной анимацией, подключенной "
+"к порту \"-add\"/\"+add\"."
+
+msgid "An input animation for an [AnimationNodeBlendTree]."
+msgstr "Входная анимация для [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Only has one output port "
+"using the [member animation] property. Used as an input for [AnimationNode]s "
+"that blend animations together."
+msgstr ""
+"Ресурс для добавления в [AnimationNodeBlendTree]. Имеет только один выходной "
+"порт, использующий свойство [member animation]. Используется как вход для "
+"[AnimationNode], которые смешивают анимации."
+
+msgid "3D Platformer Demo"
+msgstr "Демо-версия 3D-платформера"
+
+msgid ""
+"If [code]true[/code], on receiving a request to play an animation from the "
+"start, the first frame is not drawn, but only processed, and playback starts "
+"from the next frame.\n"
+"See also the notes of [method AnimationPlayer.play]."
+msgstr ""
+"Если [code]true[/code], при получении запроса на воспроизведение анимации с "
+"начала первый кадр не отрисовывается, а только обрабатывается, и "
+"воспроизведение начинается со следующего кадра.\n"
+"См. также примечания к [методу AnimationPlayer.play]."
+
+msgid ""
+"Animation to use as an output. It is one of the animations provided by "
+"[member AnimationTree.anim_player]."
+msgstr ""
+"Анимация для использования в качестве вывода. Это одна из анимаций, "
+"предоставленных [member AnimationTree.anim_player]."
+
+msgid ""
+"If [member use_custom_timeline] is [code]true[/code], override the loop "
+"settings of the original [Animation] resource with the value.\n"
+"[b]Note:[/b] If the [member Animation.loop_mode] isn't set to looping, the "
+"[method Animation.track_set_interpolation_loop_wrap] option will not be "
+"respected. If you cannot get the expected behavior, consider duplicating the "
+"[Animation] resource and changing the loop settings."
+msgstr ""
+"Если [member use_custom_timeline] равен [code]true[/code], переопределите "
+"настройки цикла исходного ресурса [Animation] на значение.\n"
+"[b]Примечание:[/b] Если [member Animation.loop_mode] не установлен на цикл, "
+"параметр [method Animation.track_set_interpolation_loop_wrap] не будет "
+"учитываться. Если вы не можете получить ожидаемое поведение, рассмотрите "
+"возможность дублирования ресурса [Animation] и изменения настроек цикла."
+
+msgid ""
+"If [member use_custom_timeline] is [code]true[/code], offset the start "
+"position of the animation.\n"
+"This is useful for adjusting which foot steps first in 3D walking animations."
+msgstr ""
+"Если [member use_custom_timeline] равно [code]true[/code], сместите начальную "
+"позицию анимации. \n"
+"Это полезно для настройки того, какая нога ступает первой в 3D-анимации "
+"ходьбы."
+
+msgid ""
+"If [code]true[/code], scales the time so that the length specified in [member "
+"timeline_length] is one cycle.\n"
+"This is useful for matching the periods of walking and running animations.\n"
+"If [code]false[/code], the original animation length is respected. If you set "
+"the loop to [member loop_mode], the animation will loop in [member "
+"timeline_length]."
+msgstr ""
+"Если [code]true[/code], масштабирует время так, чтобы длина, указанная в "
+"[member timeline_length], была одним циклом.\n"
+"Это полезно для сопоставления периодов анимации ходьбы и бега.\n"
+"Если [code]false[/code], исходная длина анимации соблюдается. Если установить "
+"цикл на [member loop_mode], анимация будет циклично повторяться в [member "
+"timeline_length]."
+
+msgid ""
+"If [member use_custom_timeline] is [code]true[/code], offset the start "
+"position of the animation."
+msgstr ""
+"Если [member use_custom_timeline] равно [code]true[/code], сместите начальную "
+"позицию анимации."
+
+msgid "Plays animation in forward direction."
+msgstr "Воспроизводит анимацию в прямом направлении."
+
+msgid "Plays animation in backward direction."
+msgstr "Воспроизводит анимацию в обратном направлении."
+
+msgid "Blends two animations linearly inside of an [AnimationNodeBlendTree]."
+msgstr "Смешивает две анимации линейно внутри [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Blends two animations "
+"linearly based on the amount value.\n"
+"In general, the blend value should be in the [code][0.0, 1.0][/code] range. "
+"Values outside of this range can blend amplified or inverted animations, "
+"however, [AnimationNodeAdd2] works better for this purpose."
+msgstr ""
+"Ресурс для добавления в [AnimationNodeBlendTree]. Смешивает две анимации "
+"линейно на основе значения количества.\n"
+"В общем случае значение смешивания должно быть в диапазоне [code][0.0, 1.0][/"
+"code]. Значения за пределами этого диапазона могут смешивать усиленные или "
+"инвертированные анимации, однако [AnimationNodeAdd2] подходит для этой цели "
+"лучше."
+
+msgid ""
+"Blends two of three animations linearly inside of an [AnimationNodeBlendTree]."
+msgstr "Смешивает две из трех анимаций линейно внутри [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Blends two animations out "
+"of three linearly out of three based on the amount value.\n"
+"This animation node has three inputs:\n"
+"- The base animation to blend with\n"
+"- A \"-blend\" animation to blend with when the blend amount is negative "
+"value\n"
+"- A \"+blend\" animation to blend with when the blend amount is positive "
+"value\n"
+"In general, the blend value should be in the [code][-1.0, 1.0][/code] range. "
+"Values outside of this range can blend amplified animations, however, "
+"[AnimationNodeAdd3] works better for this purpose."
+msgstr ""
+"Ресурс для добавления в [AnimationNodeBlendTree]. Смешивает две анимации из "
+"трех линейно из трех на основе значения количества.\n"
+"Этот узел анимации имеет три входа:\n"
+"- Базовая анимация для смешивания\n"
+"- Анимация \"-blend\" для смешивания, когда количество смешивания "
+"отрицательное\n"
+"- Анимация \"+blend\" для смешивания, когда количество смешивания "
+"положительное\n"
+"В общем, значение смешивания должно быть в диапазоне [code][-1.0, 1.0][/"
+"code]. Значения за пределами этого диапазона могут смешивать усиленные "
+"анимации, однако [AnimationNodeAdd3] подходит для этой цели лучше."
+
+msgid ""
+"A set of [AnimationRootNode]s placed on a virtual axis, crossfading between "
+"the two adjacent ones. Used by [AnimationTree]."
+msgstr ""
+"Набор [AnimationRootNode], размещенных на виртуальной оси, плавно переходящих "
+"между двумя соседними. Используется [AnimationTree]."
+
+msgid ""
+"A resource used by [AnimationNodeBlendTree].\n"
+"[AnimationNodeBlendSpace1D] represents a virtual axis on which any type of "
+"[AnimationRootNode]s can be added using [method add_blend_point]. Outputs the "
+"linear blend of the two [AnimationRootNode]s adjacent to the current value.\n"
+"You can set the extents of the axis with [member min_space] and [member "
+"max_space]."
+msgstr ""
+"Ресурс, используемый [AnimationNodeBlendTree].\n"
+"[AnimationNodeBlendSpace1D] представляет собой виртуальную ось, на которую "
+"можно добавить любой тип [AnimationRootNode] с помощью [method "
+"add_blend_point]. Выводит линейную смесь двух [AnimationRootNode], смежных с "
+"текущим значением.\n"
+"Вы можете задать пределы оси с помощью [member min_space] и [member "
+"max_space]."
+
+msgid ""
+"Adds a new point that represents a [param node] on the virtual axis at a "
+"given position set by [param pos]. You can insert it at a specific index "
+"using the [param at_index] argument. If you use the default value for [param "
+"at_index], the point is inserted at the end of the blend points array."
+msgstr ""
+"Добавляет новую точку, которая представляет [param node] на виртуальной оси в "
+"заданной позиции, заданной [param pos]. Вы можете вставить ее в определенный "
+"индекс, используя аргумент [param at_index]. Если вы используете значение по "
+"умолчанию для [param at_index], точка вставляется в конец массива точек "
+"смешивания."
+
+msgid "Returns the number of points on the blend axis."
+msgstr "Возвращает количество точек на оси смешивания."
+
+msgid ""
+"Changes the [AnimationNode] referenced by the point at index [param point]."
+msgstr ""
+"Изменяет [AnimationNode], на который ссылается точка с индексом [param point]."
+
+msgid ""
+"Controls the interpolation between animations. See [enum BlendMode] constants."
+msgstr ""
+"Управляет интерполяцией между анимациями. См. константы [enum BlendMode]."
+
+msgid ""
+"The blend space's axis's upper limit for the points' position. See [method "
+"add_blend_point]."
+msgstr ""
+"Верхний предел оси пространства смешивания для положения точек. См. [метод "
+"add_blend_point]."
+
+msgid ""
+"The blend space's axis's lower limit for the points' position. See [method "
+"add_blend_point]."
+msgstr ""
+"Нижний предел оси пространства смешивания для положения точек. См. [метод "
+"add_blend_point]."
+
+msgid "Position increment to snap to when moving a point on the axis."
+msgstr "Приращение позиции для привязки при перемещении точки по оси."
+
+msgid ""
+"If [code]false[/code], the blended animations' frame are stopped when the "
+"blend value is [code]0[/code].\n"
+"If [code]true[/code], forcing the blended animations to advance frame."
+msgstr ""
+"Если [code]false[/code], кадр смешанной анимации останавливается, когда "
+"значение смешивания равно [code]0[/code]. \n"
+"Если [code]true[/code], смешанная анимация принудительно переходит на "
+"следующий кадр."
+
+msgid "Label of the virtual axis of the blend space."
+msgstr "Метка виртуальной оси пространства смешивания."
+
+msgid "The interpolation between animations is linear."
+msgstr "Интерполяция между анимациями линейная."
+
+msgid ""
+"The blend space plays the animation of the animation node which blending "
+"position is closest to. Useful for frame-by-frame 2D animations."
+msgstr ""
+"Пространство смешивания воспроизводит анимацию узла анимации, к которому "
+"ближе всего позиция смешивания. Полезно для покадровой 2D-анимации."
+
+msgid ""
+"Similar to [constant BLEND_MODE_DISCRETE], but starts the new animation at "
+"the last animation's playback position."
+msgstr ""
+"Аналогично [constant BLEND_MODE_DISCRETE], но запускает новую анимацию с "
+"позиции воспроизведения последней анимации."
+
+msgid ""
+"A set of [AnimationRootNode]s placed on 2D coordinates, crossfading between "
+"the three adjacent ones. Used by [AnimationTree]."
+msgstr ""
+"Набор [AnimationRootNode], размещенных в 2D-координатах, плавно переходящих "
+"между тремя соседними. Используется [AnimationTree]."
+
+msgid ""
+"A resource used by [AnimationNodeBlendTree].\n"
+"[AnimationNodeBlendSpace2D] represents a virtual 2D space on which "
+"[AnimationRootNode]s are placed. Outputs the linear blend of the three "
+"adjacent animations using a [Vector2] weight. Adjacent in this context means "
+"the three [AnimationRootNode]s making up the triangle that contains the "
+"current value.\n"
+"You can add vertices to the blend space with [method add_blend_point] and "
+"automatically triangulate it by setting [member auto_triangles] to "
+"[code]true[/code]. Otherwise, use [method add_triangle] and [method "
+"remove_triangle] to triangulate the blend space by hand."
+msgstr ""
+"Ресурс, используемый [AnimationNodeBlendTree].\n"
+"[AnimationNodeBlendSpace2D] представляет собой виртуальное 2D-пространство, "
+"на котором размещены [AnimationRootNode]. Выводит линейное смешивание трех "
+"смежных анимаций с использованием веса [Vector2]. Смежный в этом контексте "
+"означает три [AnimationRootNode], составляющие треугольник, содержащий "
+"текущее значение.\n"
+"Вы можете добавить вершины в пространство смешивания с помощью [method "
+"add_blend_point] и автоматически триангулировать его, установив [member "
+"auto_triangles] на [code]true[/code]. В противном случае используйте [method "
+"add_triangle] и [method remove_triangle] для триангуляции пространства "
+"смешивания вручную."
+
+msgid ""
+"Adds a new point that represents a [param node] at the position set by [param "
+"pos]. You can insert it at a specific index using the [param at_index] "
+"argument. If you use the default value for [param at_index], the point is "
+"inserted at the end of the blend points array."
+msgstr ""
+"Добавляет новую точку, которая представляет [param node] в позиции, заданной "
+"[param pos]. Вы можете вставить ее в определенный индекс, используя аргумент "
+"[param at_index]. Если вы используете значение по умолчанию для [param "
+"at_index], точка вставляется в конец массива точек смешивания."
+
+msgid ""
+"Creates a new triangle using three points [param x], [param y], and [param "
+"z]. Triangles can overlap. You can insert the triangle at a specific index "
+"using the [param at_index] argument. If you use the default value for [param "
+"at_index], the point is inserted at the end of the blend points array."
+msgstr ""
+"Создает новый треугольник, используя три точки [param x], [param y] и [param "
+"z]. Треугольники могут перекрываться. Вы можете вставить треугольник в "
+"определенный индекс, используя аргумент [param at_index]. Если вы используете "
+"значение по умолчанию для [param at_index], точка вставляется в конец массива "
+"точек смешивания."
+
+msgid "Returns the number of points in the blend space."
+msgstr "Возвращает количество точек в пространстве смешивания."
+
+msgid "Returns the number of triangles in the blend space."
+msgstr "Возвращает количество треугольников в пространстве смешивания."
+
+msgid ""
+"If [code]true[/code], the blend space is triangulated automatically. The mesh "
+"updates every time you add or remove points with [method add_blend_point] and "
+"[method remove_blend_point]."
+msgstr ""
+"Если [code]true[/code], пространство смешивания триангулируется "
+"автоматически. Сетка обновляется каждый раз, когда вы добавляете или удаляете "
+"точки с помощью [method add_blend_point] и [method remove_blend_point]."
+
+msgid ""
+"The blend space's X and Y axes' upper limit for the points' position. See "
+"[method add_blend_point]."
+msgstr ""
+"Верхний предел осей X и Y пространства смешивания для положения точек. См. "
+"[метод add_blend_point]."
+
+msgid ""
+"The blend space's X and Y axes' lower limit for the points' position. See "
+"[method add_blend_point]."
+msgstr ""
+"Нижний предел осей X и Y пространства смешивания для положения точек. См. "
+"[метод add_blend_point]."
+
+msgid "Position increment to snap to when moving a point."
+msgstr "Приращение позиции для привязки при перемещении точки."
+
+msgid "Name of the blend space's X axis."
+msgstr "Имя оси X пространства смешивания."
+
+msgid "Name of the blend space's Y axis."
+msgstr "Имя оси Y пространства смешивания."
+
+msgid ""
+"Emitted every time the blend space's triangles are created, removed, or when "
+"one of their vertices changes position."
+msgstr ""
+"Вызывается каждый раз, когда создаются, удаляются треугольники пространства "
+"смешивания или когда одна из их вершин меняет положение."
+
+msgid ""
+"A sub-tree of many type [AnimationNode]s used for complex animations. Used by "
+"[AnimationTree]."
+msgstr ""
+"Поддерево многих типов [AnimationNode], используемых для сложных анимаций. "
+"Используется [AnimationTree]."
+
+msgid ""
+"This animation node may contain a sub-tree of any other type animation nodes, "
+"such as [AnimationNodeTransition], [AnimationNodeBlend2], "
+"[AnimationNodeBlend3], [AnimationNodeOneShot], etc. This is one of the most "
+"commonly used animation node roots.\n"
+"An [AnimationNodeOutput] node named [code]output[/code] is created by default."
+msgstr ""
+"Этот узел анимации может содержать поддерево любых других узлов анимации, "
+"таких как [AnimationNodeTransition], [AnimationNodeBlend2], "
+"[AnimationNodeBlend3], [AnimationNodeOneShot] и т. д. Это один из наиболее "
+"часто используемых корней узлов анимации.\n"
+"Узел [AnimationNodeOutput] с именем [code]output[/code] создается по "
+"умолчанию."
+
+msgid ""
+"Adds an [AnimationNode] at the given [param position]. The [param name] is "
+"used to identify the created sub animation node later."
+msgstr ""
+"Добавляет [AnimationNode] в указанную [позицию параметра]. [Имя параметра] "
+"используется для идентификации созданного подузла анимации в дальнейшем."
+
+msgid ""
+"Connects the output of an [AnimationNode] as input for another "
+"[AnimationNode], at the input port specified by [param input_index]."
+msgstr ""
+"Подключает выход [AnimationNode] в качестве входа для другого [AnimationNode] "
+"к порту входа, указанному [param input_index]."
+
+msgid "Disconnects the animation node connected to the specified input."
+msgstr "Отключает узел анимации, подключенный к указанному входу."
+
+msgid "Removes a sub animation node."
+msgstr "Удаляет подузел анимации."
+
+msgid "The global offset of all sub animation nodes."
+msgstr "Глобальное смещение всех узлов поданимации."
+
+msgid "The connection was successful."
+msgstr "Соединение было успешно установлено."
+
+msgid "The input node is [code]null[/code]."
+msgstr "Входной узел — [code]null[/code]."
+
+msgid "The specified input port is out of range."
+msgstr "Указанный входной порт находится вне диапазона."
+
+msgid "The output node is [code]null[/code]."
+msgstr "Выходной узел — [code]null[/code]."
+
+msgid "Input and output nodes are the same."
+msgstr "Входные и выходные узлы одинаковы."
+
+msgid "The specified connection already exists."
+msgstr "Указанное соединение уже существует."
+
+msgid "Base class for extending [AnimationRootNode]s from GDScript, C#, or C++."
+msgstr ""
+"Базовый класс для расширения [AnimationRootNode] из GDScript, C# или C++."
+
+msgid ""
+"[AnimationNodeExtension] exposes the APIs of [AnimationRootNode] to allow "
+"users to extend it from GDScript, C#, or C++. This class is not meant to be "
+"used directly, but to be extended by other classes. It is used to create "
+"custom nodes for the [AnimationTree] system."
+msgstr ""
+"[AnimationNodeExtension] раскрывает API [AnimationRootNode], позволяя "
+"пользователям расширять его из GDScript, C# или C++. Этот класс не "
+"предназначен для прямого использования, а для расширения другими классами. Он "
+"используется для создания пользовательских узлов для системы [AnimationTree]."
+
+msgid ""
+"A version of the [method AnimationNode._process] method that is meant to be "
+"overridden by custom nodes. It returns a [PackedFloat32Array] with the "
+"processed animation data.\n"
+"The [PackedFloat64Array] parameter contains the playback information, "
+"containing the following values encoded as floating point numbers (in order): "
+"playback time and delta, start and end times, whether a seek was requested "
+"(encoded as a float greater than [code]0[/code]), whether the seek request "
+"was externally requested (encoded as a float greater than [code]0[/code]), "
+"the current [enum Animation.LoopedFlag] (encoded as a float), and the current "
+"blend weight.\n"
+"The function must return a [PackedFloat32Array] of the node's time info, "
+"containing the following values (in order): animation length, time position, "
+"delta, [enum Animation.LoopMode] (encoded as a float), whether the animation "
+"is about to end (encoded as a float greater than [code]0[/code]) and whether "
+"the animation is infinite (encoded as a float greater than [code]0[/code]). "
+"All values must be included in the returned array."
+msgstr ""
+"Версия метода [method AnimationNode._process], которая должна быть "
+"переопределена пользовательскими узлами. Возвращает [PackedFloat32Array] с "
+"обработанными данными анимации.\n"
+"Параметр [PackedFloat64Array] содержит информацию о воспроизведении, "
+"включающую следующие значения, закодированные как числа с плавающей точкой "
+"(по порядку): время воспроизведения и дельта, время начала и окончания, был "
+"ли запрошен поиск (закодирован как число с плавающей точкой больше [code]0[/"
+"code]), был ли запрос поиска запрошен извне (закодирован как число с "
+"плавающей точкой больше [code]0[/code]), текущий [enum Animation.LoopedFlag] "
+"(закодирован как число с плавающей точкой) и текущий вес смешивания.\n"
+"Функция должна возвращать [PackedFloat32Array] временной информации узла, "
+"содержащей следующие значения (по порядку): длина анимации, временная "
+"позиция, дельта, [enum Animation.LoopMode] (закодировано как float), "
+"заканчивается ли анимация (закодировано как float больше [code]0[/code]) и "
+"бесконечна ли анимация (закодировано как float больше [code]0[/code]). Все "
+"значения должны быть включены в возвращаемый массив."
+
+msgid ""
+"Returns the animation's remaining time for the given node info. For looping "
+"animations, it will only return the remaining time if [param break_loop] is "
+"[code]true[/code], a large integer value will be returned otherwise."
+msgstr ""
+"Возвращает оставшееся время анимации для заданной информации узла. Для "
+"циклических анимаций оставшееся время будет возвращено только если [param "
+"break_loop] равен [code]true[/code], в противном случае будет возвращено "
+"большое целочисленное значение."
+
+msgid "Plays an animation once in an [AnimationNodeBlendTree]."
+msgstr "Воспроизводит анимацию один раз в [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. This animation node will "
+"execute a sub-animation and return once it finishes. Blend times for fading "
+"in and out can be customized, as well as filters.\n"
+"After setting the request and changing the animation playback, the one-shot "
+"node automatically clears the request on the next process frame by setting "
+"its [code]request[/code] value to [constant ONE_SHOT_REQUEST_NONE].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Play child animation connected to \"shot\" port.\n"
+"animation_tree.set(\"parameters/OneShot/request\", AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FIRE)\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/OneShot/request\"] = AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FIRE\n"
+"\n"
+"# Abort child animation connected to \"shot\" port.\n"
+"animation_tree.set(\"parameters/OneShot/request\", AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_ABORT)\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/OneShot/request\"] = AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_ABORT\n"
+"\n"
+"# Abort child animation with fading out connected to \"shot\" port.\n"
+"animation_tree.set(\"parameters/OneShot/request\", AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FADE_OUT)\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/OneShot/request\"] = AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FADE_OUT\n"
+"\n"
+"# Get current state (read-only).\n"
+"animation_tree.get(\"parameters/OneShot/active\")\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/OneShot/active\"]\n"
+"\n"
+"# Get current internal state (read-only).\n"
+"animation_tree.get(\"parameters/OneShot/internal_active\")\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/OneShot/internal_active\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Play child animation connected to \"shot\" port.\n"
+"animationTree.Set(\"parameters/OneShot/request\", (int)AnimationNodeOneShot."
+"OneShotRequest.Fire);\n"
+"\n"
+"// Abort child animation connected to \"shot\" port.\n"
+"animationTree.Set(\"parameters/OneShot/request\", (int)AnimationNodeOneShot."
+"OneShotRequest.Abort);\n"
+"\n"
+"// Abort child animation with fading out connected to \"shot\" port.\n"
+"animationTree.Set(\"parameters/OneShot/request\", (int)AnimationNodeOneShot."
+"OneShotRequest.FadeOut);\n"
+"\n"
+"// Get current state (read-only).\n"
+"animationTree.Get(\"parameters/OneShot/active\");\n"
+"\n"
+"// Get current internal state (read-only).\n"
+"animationTree.Get(\"parameters/OneShot/internal_active\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Ресурс для добавления в [AnimationNodeBlendTree]. Этот узел анимации выполнит "
+"поданимацию и вернется после ее завершения. Можно настроить время смешивания "
+"для появления и исчезновения, а также фильтры.\n"
+"После установки запроса и изменения воспроизведения анимации узел one-shot "
+"автоматически очищает запрос на следующем кадре процесса, устанавливая его "
+"значение [code]request[/code] на [constant ONE_SHOT_REQUEST_NONE].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Воспроизвести дочернюю анимацию, подключенную к порту \"shot\".\n"
+"animation_tree.set(\"parameters/OneShot/request\", AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FIRE)\n"
+"Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/OneShot/request\"] = AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FIRE\n"
+"\n"
+"# Прервать дочернюю анимацию, подключенную к порту «выстрел».\n"
+"animation_tree.set(\"parameters/OneShot/request\", AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_ABORT)\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/OneShot/request\"] = AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_ABORT\n"
+"\n"
+"# Отменить дочернюю анимацию с затуханием, подключенным к порту «выстрел».\n"
+"animation_tree.set(\"parameters/OneShot/request\", AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FADE_OUT)\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/OneShot/request\"] = AnimationNodeOneShot."
+"ONE_SHOT_REQUEST_FADE_OUT\n"
+"\n"
+"# Получить текущее состояние (только чтение).\n"
+"animation_tree.get(\"parameters/OneShot/active\")\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/OneShot/active\"]\n"
+"\n"
+"# Получить текущее внутреннее состояние (только для чтения).\n"
+"animation_tree.get(\"parameters/OneShot/internal_active\")\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/OneShot/internal_active\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Воспроизвести дочернюю анимацию, подключенную к порту «выстрел».\n"
+"animationTree.Set(\"parameters/OneShot/request\", (int)AnimationNodeOneShot."
+"OneShotRequest.Fire);\n"
+"\n"
+"//Прервать дочернюю анимацию, подключенную к порту «shot».\n"
+"animationTree.Set(\"parameters/OneShot/request\", (int)AnimationNodeOneShot."
+"OneShotRequest.Abort);\n"
+"\n"
+"// Прервать дочернюю анимацию с затуханием, подключенную к порту «shot».\n"
+"animationTree.Set(\"parameters/OneShot/request\", (int)AnimationNodeOneShot."
+"OneShotRequest.FadeOut);\n"
+"\n"
+"// Получить текущее состояние (только чтение).\n"
+"animationTree.Get(\"parameters/OneShot/active\");\n"
+"\n"
+"// Получить текущее внутреннее состояние (только для чтения).\n"
+"animationTree.Get(\"parameters/OneShot/internal_active\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"If [code]true[/code], the sub-animation will restart automatically after "
+"finishing.\n"
+"In other words, to start auto restarting, the animation must be played once "
+"with the [constant ONE_SHOT_REQUEST_FIRE] request. The [constant "
+"ONE_SHOT_REQUEST_ABORT] request stops the auto restarting, but it does not "
+"disable the [member autorestart] itself. So, the [constant "
+"ONE_SHOT_REQUEST_FIRE] request will start auto restarting again."
+msgstr ""
+"Если [code]true[/code], суб-анимация автоматически перезапустится после "
+"завершения.\n"
+"Другими словами, чтобы начать автоматический перезапуск, анимация должна быть "
+"воспроизведена один раз с запросом [constant ONE_SHOT_REQUEST_FIRE]. Запрос "
+"[constant ONE_SHOT_REQUEST_ABORT] останавливает автоматический перезапуск, но "
+"он не отключает сам [member autorestart]. Таким образом, запрос [constant "
+"ONE_SHOT_REQUEST_FIRE] снова запустит автоматический перезапуск."
+
+msgid "The delay after which the automatic restart is triggered, in seconds."
+msgstr ""
+"Задержка, после которой срабатывает автоматический перезапуск, в секундах."
+
+msgid ""
+"If [member autorestart] is [code]true[/code], a random additional delay (in "
+"seconds) between 0 and this value will be added to [member autorestart_delay]."
+msgstr ""
+"Если [member autorestart] имеет значение [code]true[/code], к [member "
+"autorestart_delay] будет добавлена случайная дополнительная задержка (в "
+"секундах) между 0 и этим значением."
+
+msgid ""
+"If [code]true[/code], breaks the loop at the end of the loop cycle for "
+"transition, even if the animation is looping."
+msgstr ""
+"Если [code]true[/code], прерывает цикл в конце цикла перехода, даже если "
+"анимация зациклена."
+
+msgid ""
+"Determines how cross-fading between animations is eased. If empty, the "
+"transition will be linear. Should be a unit [Curve]."
+msgstr ""
+"Определяет, как плавно смягчается перекрестное затухание между анимациями. "
+"Если пусто, переход будет линейным. Должен быть единицей [Curve]."
+
+msgid ""
+"The fade-in duration. For example, setting this to [code]1.0[/code] for a 5 "
+"second length animation will produce a cross-fade that starts at 0 second and "
+"ends at 1 second during the animation.\n"
+"[b]Note:[/b] [AnimationNodeOneShot] transitions the current state after the "
+"end of the fading. When [AnimationNodeOutput] is considered as the most "
+"upstream, so the [member fadein_time] is scaled depending on the downstream "
+"delta. For example, if this value is set to [code]1.0[/code] and a "
+"[AnimationNodeTimeScale] with a value of [code]2.0[/code] is chained "
+"downstream, the actual processing time will be 0.5 second."
+msgstr ""
+"Длительность затухания. Например, если задать это значение [code]1.0[/code] "
+"для анимации длиной 5 секунд, то будет создано перекрестное затухание, "
+"которое начинается с 0 секунды и заканчивается на 1 секунде во время "
+"анимации.\n"
+"[b]Примечание:[/b] [AnimationNodeOneShot] переводит текущее состояние после "
+"окончания затухания. Когда [AnimationNodeOutput] считается самым верхним по "
+"потоку, то [member fadein_time] масштабируется в зависимости от дельты "
+"нижнего потока. Например, если это значение установлено на [code]1.0[/code], "
+"а [AnimationNodeTimeScale] со значением [code]2.0[/code] присоединен ниже по "
+"потоку, фактическое время обработки составит 0,5 секунды."
+
+msgid ""
+"The fade-out duration. For example, setting this to [code]1.0[/code] for a 5 "
+"second length animation will produce a cross-fade that starts at 4 second and "
+"ends at 5 second during the animation.\n"
+"[b]Note:[/b] [AnimationNodeOneShot] transitions the current state after the "
+"end of the fading. When [AnimationNodeOutput] is considered as the most "
+"upstream, so the [member fadeout_time] is scaled depending on the downstream "
+"delta. For example, if this value is set to [code]1.0[/code] and an "
+"[AnimationNodeTimeScale] with a value of [code]2.0[/code] is chained "
+"downstream, the actual processing time will be 0.5 second."
+msgstr ""
+"Длительность затухания. Например, если задать это значение [code]1.0[/code] "
+"для анимации длиной 5 секунд, то будет создано перекрестное затухание, "
+"которое начинается на 4 секунде и заканчивается на 5 секунде во время "
+"анимации.\n"
+"[b]Примечание:[/b] [AnimationNodeOneShot] переводит текущее состояние после "
+"окончания затухания. Когда [AnimationNodeOutput] считается самым верхним по "
+"потоку, то [member fadeout_time] масштабируется в зависимости от дельты "
+"нижнего потока. Например, если это значение установлено на [code]1.0[/code], "
+"а [AnimationNodeTimeScale] со значением [code]2.0[/code] присоединен ниже по "
+"потоку, фактическое время обработки составит 0,5 секунды."
+
+msgid "The default state of the request. Nothing is done."
+msgstr "Состояние запроса по умолчанию. Ничего не сделано."
+
+msgid "The request to play the animation connected to \"shot\" port."
+msgstr "Запрос на воспроизведение анимации подключен к порту \"shot\"."
+
+msgid "The request to stop the animation connected to \"shot\" port."
+msgstr "Запрос на остановку анимации подключен к порту \"shot\"."
+
+msgid "The request to fade out the animation connected to \"shot\" port."
+msgstr "Запрос на затухание анимации, подключенной к порту \"shot\"."
+
+msgid "Blends two animations. See also [AnimationNodeBlend2]."
+msgstr "Смешивает две анимации. См. также [AnimationNodeBlend2]."
+
+msgid "Blends two animations additively. See also [AnimationNodeAdd2]."
+msgstr "Смешивает две анимации аддитивно. См. также [AnimationNodeAdd2]."
+
+msgid "The animation output node of an [AnimationNodeBlendTree]."
+msgstr "Узел вывода анимации [AnimationNodeBlendTree]."
+
+msgid ""
+"A node created automatically in an [AnimationNodeBlendTree] that outputs the "
+"final animation."
+msgstr ""
+"Узел, автоматически созданный в [AnimationNodeBlendTree], который выводит "
+"окончательную анимацию."
+
+msgid ""
+"A state machine with multiple [AnimationRootNode]s, used by [AnimationTree]."
+msgstr ""
+"Конечный автомат с несколькими [AnimationRootNode], используемый "
+"[AnimationTree]."
+
+msgid ""
+"Contains multiple [AnimationRootNode]s representing animation states, "
+"connected in a graph. State transitions can be configured to happen "
+"automatically or via code, using a shortest-path algorithm. Retrieve the "
+"[AnimationNodeStateMachinePlayback] object from the [AnimationTree] node to "
+"control it programmatically.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\") as AnimationNodeStateMachinePlayback;\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Содержит несколько [AnimationRootNode], представляющих состояния анимации, "
+"соединенные в граф. Переходы состояний можно настроить так, чтобы они "
+"происходили автоматически или через код, используя алгоритм кратчайшего пути. "
+"Извлеките объект [AnimationNodeStateMachinePlayback] из узла [AnimationTree], "
+"чтобы управлять им программно.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\") as AnimationNodeStateMachinePlayback;\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Adds a new animation node to the graph. The [param position] is used for "
+"display in the editor."
+msgstr ""
+"Добавляет новый узел анимации в график. [Позиция параметра] используется для "
+"отображения в редакторе."
+
+msgid "Returns the draw offset of the graph. Used for display in the editor."
+msgstr ""
+"Возвращает смещение отрисовки графика. Используется для отображения в "
+"редакторе."
+
+msgid "Returns the animation node with the given name."
+msgstr "Возвращает узел анимации с заданным именем."
+
+msgid "Returns the given animation node's name."
+msgstr "Возвращает имя указанного узла анимации."
+
+msgid "Returns the given transition."
+msgstr "Возвращает указанный переход."
+
+msgid "Returns the number of connections in the graph."
+msgstr "Возвращает количество соединений в графике."
+
+msgid "Returns the given transition's start node."
+msgstr "Возвращает начальный узел указанного перехода."
+
+msgid "Returns the given transition's end node."
+msgstr "Возвращает конечный узел указанного перехода."
+
+msgid "Deletes the given transition by index."
+msgstr "Удаляет указанный переход по индексу."
+
+msgid "Sets the draw offset of the graph. Used for display in the editor."
+msgstr ""
+"Устанавливает смещение отрисовки графика. Используется для отображения в "
+"редакторе."
+
+msgid "Sets the animation node's coordinates. Used for display in the editor."
+msgstr ""
+"Задает координаты узла анимации. Используется для отображения в редакторе."
+
+msgid ""
+"If [code]true[/code], allows teleport to the self state with [method "
+"AnimationNodeStateMachinePlayback.travel]. When the reset option is enabled "
+"in [method AnimationNodeStateMachinePlayback.travel], the animation is "
+"restarted. If [code]false[/code], nothing happens on the teleportation to the "
+"self state."
+msgstr ""
+"Если [code]true[/code], разрешает телепортацию в собственное состояние с "
+"помощью [method AnimationNodeStateMachinePlayback.travel]. Когда опция сброса "
+"включена в [method AnimationNodeStateMachinePlayback.travel], анимация "
+"перезапускается. Если [code]false[/code], при телепортации в собственное "
+"состояние ничего не происходит."
+
+msgid ""
+"If [code]true[/code], treat the cross-fade to the start and end nodes as a "
+"blend with the RESET animation.\n"
+"In most cases, when additional cross-fades are performed in the parent "
+"[AnimationNode] of the state machine, setting this property to [code]false[/"
+"code] and matching the cross-fade time of the parent [AnimationNode] and the "
+"state machine's start node and end node gives good results."
+msgstr ""
+"Если [code]true[/code], обрабатывайте кроссфейд (cross-fade) к начальному и "
+"конечному узлам как смешение с анимацией RESET.\n"
+"В большинстве случаев, когда дополнительные кроссфейды выполняются в "
+"родительском [AnimationNode] конечного автомата, установка этого свойства в "
+"[code]false[/code] и сопоставление времени кроссфейда родительского "
+"[AnimationNode] и начального и конечного узлов конечного автомата дает "
+"хорошие результаты."
+
+msgid ""
+"This property can define the process of transitions for different use cases. "
+"See also [enum AnimationNodeStateMachine.StateMachineType]."
+msgstr ""
+"Это свойство может определять процесс переходов для различных вариантов "
+"использования. См. также [enum AnimationNodeStateMachine.StateMachineType]."
+
+msgid ""
+"Seeking to the beginning is treated as playing from the start state. "
+"Transition to the end state is treated as exiting the state machine."
+msgstr ""
+"Переход к началу рассматривается как воспроизведение с начального состояния. "
+"Переход к конечному состоянию рассматривается как выход из конечного автомата."
+
+msgid ""
+"Seeking to the beginning is treated as seeking to the beginning of the "
+"animation in the current state. Transition to the end state, or the absence "
+"of transitions in each state, is treated as exiting the state machine."
+msgstr ""
+"Поиск начала рассматривается как поиск начала анимации в текущем состоянии. "
+"Переход в конечное состояние или отсутствие переходов в каждом состоянии "
+"рассматривается как выход из конечного автомата."
+
+msgid ""
+"This is a grouped state machine that can be controlled from a parent state "
+"machine. It does not work independently. There must be a state machine with "
+"[member state_machine_type] of [constant STATE_MACHINE_TYPE_ROOT] or "
+"[constant STATE_MACHINE_TYPE_NESTED] in the parent or ancestor."
+msgstr ""
+"Это сгруппированный конечный автомат, которым можно управлять из "
+"родительского конечного автомата. Он не работает независимо. Должен быть "
+"конечный автомат с [member state_machine_type] [constant "
+"STATE_MACHINE_TYPE_ROOT] или [constant STATE_MACHINE_TYPE_NESTED] в "
+"родительском или предковом объекте."
+
+msgid "Provides playback control for an [AnimationNodeStateMachine]."
+msgstr ""
+"Обеспечивает управление воспроизведением для [AnimationNodeStateMachine]."
+
+msgid ""
+"Allows control of [AnimationTree] state machines created with "
+"[AnimationNodeStateMachine]. Retrieve with [code]$AnimationTree."
+"get(\"parameters/playback\")[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\").As<AnimationNodeStateMachinePlayback>();\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Позволяет управлять конечными автоматами [AnimationTree], созданными с "
+"помощью [AnimationNodeStateMachine]. Извлечь с помощью [code]$AnimationTree."
+"get(\"parameters/playback\")[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var state_machine = $AnimationTree.get(\"parameters/playback\")\n"
+"state_machine.travel(\"some_state\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var stateMachine = GetNode<AnimationTree>(\"AnimationTree\").Get(\"parameters/"
+"playback\").As<AnimationNodeStateMachinePlayback>();\n"
+"stateMachine.Travel(\"some_state\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the current state length.\n"
+"[b]Note:[/b] It is possible that any [AnimationRootNode] can be nodes as well "
+"as animations. This means that there can be multiple animations within a "
+"single state. Which animation length has priority depends on the nodes "
+"connected inside it. Also, if a transition does not reset, the remaining "
+"length at that point will be returned."
+msgstr ""
+"Возвращает текущую длину состояния.\n"
+"[b]Примечание:[/b] Возможно, что любой [AnimationRootNode] может быть как "
+"узлами, так и анимациями. Это означает, что в одном состоянии может быть "
+"несколько анимаций. Какая длина анимации имеет приоритет, зависит от узлов, "
+"подключенных внутри него. Кроме того, если переход не сбрасывается, будет "
+"возвращена оставшаяся длина в этой точке."
+
+msgid ""
+"Returns the currently playing animation state.\n"
+"[b]Note:[/b] When using a cross-fade, the current state changes to the next "
+"state immediately after the cross-fade begins."
+msgstr ""
+"Возвращает текущее состояние воспроизводимой анимации.\n"
+"[b]Примечание:[/b] При использовании кроссфейда текущее состояние меняется на "
+"следующее состояние сразу после начала кроссфейда."
+
+msgid "Returns the playback position within the current animation state."
+msgstr "Возвращает позицию воспроизведения в текущем состоянии анимации."
+
+msgid ""
+"Returns the current travel path as computed internally by the A* algorithm."
+msgstr ""
+"Возвращает текущий путь перемещения, рассчитанный внутренним алгоритмом A*."
+
+msgid "Returns [code]true[/code] if an animation is playing."
+msgstr "Возвращает [code]true[/code], если анимация воспроизводится."
+
+msgid ""
+"If there is a next path by travel or auto advance, immediately transitions "
+"from the current state to the next state."
+msgstr ""
+"Если есть следующий путь посредством перемещения или автоматического "
+"продвижения, немедленно переходит из текущего состояния в следующее состояние."
+
+msgid ""
+"Starts playing the given animation.\n"
+"If [param reset] is [code]true[/code], the animation is played from the "
+"beginning."
+msgstr ""
+"Начинает воспроизведение заданной анимации.\n"
+"Если [param reset] равен [code]true[/code], анимация воспроизводится с начала."
+
+msgid "Stops the currently playing animation."
+msgstr "Останавливает текущую анимацию."
+
+msgid ""
+"Transitions from the current state to another one, following the shortest "
+"path.\n"
+"If the path does not connect from the current state, the animation will play "
+"after the state teleports.\n"
+"If [param reset_on_teleport] is [code]true[/code], the animation is played "
+"from the beginning when the travel cause a teleportation."
+msgstr ""
+"Переход из текущего состояния в другое по кратчайшему пути.\n"
+"Если путь не соединяется с текущим состоянием, анимация будет "
+"воспроизводиться после телепортации состояния.\n"
+"Если [param reset_on_teleport] равен [code]true[/code], анимация "
+"воспроизводится с начала, когда путешествие вызывает телепортацию."
+
+msgid ""
+"A transition within an [AnimationNodeStateMachine] connecting two "
+"[AnimationRootNode]s."
+msgstr ""
+"Переход внутри [AnimationNodeStateMachine], соединяющий два "
+"[AnimationRootNode]-ов."
+
+msgid ""
+"The path generated when using [method AnimationNodeStateMachinePlayback."
+"travel] is limited to the nodes connected by "
+"[AnimationNodeStateMachineTransition].\n"
+"You can set the timing and conditions of the transition in detail."
+msgstr ""
+"Путь, сгенерированный при использовании [метода "
+"AnimationNodeStateMachinePlayback.travel], ограничен узлами, соединенными "
+"[AnimationNodeStateMachineTransition].\n"
+"Вы можете подробно задать время и условия перехода."
+
+msgid ""
+"Turn on auto advance when this condition is set. The provided name will "
+"become a boolean parameter on the [AnimationTree] that can be controlled from "
+"code (see [url=$DOCS_URL/tutorials/animation/animation_tree.html#controlling-"
+"from-code]Using AnimationTree[/url]). For example, if [member AnimationTree."
+"tree_root] is an [AnimationNodeStateMachine] and [member advance_condition] "
+"is set to [code]\"idle\"[/code]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"$animation_tree.set(\"parameters/conditions/idle\", is_on_floor and "
+"(linear_velocity.x == 0))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetNode<AnimationTree>(\"animation_tree\").Set(\"parameters/conditions/"
+"idle\", IsOnFloor && (LinearVelocity.X == 0));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Включите автоматическое продвижение, когда задано это условие. "
+"Предоставленное имя станет булевым параметром в [AnimationTree], которым "
+"можно управлять из кода (см. [url=$DOCS_URL/tutorials/animation/"
+"animation_tree.html#controlling-from-code]Использование AnimationTree[/url]). "
+"Например, если [member AnimationTree.tree_root] является "
+"[AnimationNodeStateMachine], а [member advance_condition] установлен в "
+"[code]\"idle\"[/code]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"$animation_tree.set(\"parameters/conditions/idle\", is_on_floor and "
+"(linear_velocity.x == 0))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetNode<AnimationTree>(\"animation_tree\").Set(\"parameters/conditions/"
+"idle\", IsOnFloor && (LinearVelocity.X == 0));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Use an expression as a condition for state machine transitions. It is "
+"possible to create complex animation advance conditions for switching between "
+"states and gives much greater flexibility for creating complex state machines "
+"by directly interfacing with the script code."
+msgstr ""
+"Используйте выражение как условие для переходов между состояниями машины. "
+"Можно создавать сложные условия продвижения анимации для переключения между "
+"состояниями и обеспечивает гораздо большую гибкость для создания сложных "
+"машин состояний путем прямого взаимодействия с кодом скрипта."
+
+msgid ""
+"Determines whether the transition should be disabled, enabled when using "
+"[method AnimationNodeStateMachinePlayback.travel], or traversed automatically "
+"if the [member advance_condition] and [member advance_expression] checks are "
+"[code]true[/code] (if assigned)."
+msgstr ""
+"Определяет, следует ли отключить переход, включить его при использовании "
+"[метода AnimationNodeStateMachinePlayback.travel] или выполнить переход "
+"автоматически, если проверки [member advance_condition] и [member "
+"advance_expression] равны [code]true[/code] (если назначено)."
+
+msgid ""
+"Lower priority transitions are preferred when travelling through the tree via "
+"[method AnimationNodeStateMachinePlayback.travel] or [member advance_mode] is "
+"set to [constant ADVANCE_MODE_AUTO]."
+msgstr ""
+"Переходы с более низким приоритетом предпочтительны при перемещении по дереву "
+"с помощью [метода AnimationNodeStateMachinePlayback.travel] или [элемент "
+"advance_mode] установлен в [константу ADVANCE_MODE_AUTO]."
+
+msgid "The transition type."
+msgstr "Тип перехода."
+
+msgid ""
+"Ease curve for better control over cross-fade between this state and the "
+"next. Should be a unit [Curve]."
+msgstr ""
+"Кривая плавности для лучшего контроля над кроссфейдом (cross-fade) между этим "
+"состоянием и следующим. Должна быть единицей [Кривая]."
+
+msgid ""
+"The time to cross-fade between this state and the next.\n"
+"[b]Note:[/b] [AnimationNodeStateMachine] transitions the current state "
+"immediately after the start of the fading. The precise remaining time can "
+"only be inferred from the main animation. When [AnimationNodeOutput] is "
+"considered as the most upstream, so the [member xfade_time] is not scaled "
+"depending on the downstream delta. See also [member AnimationNodeOneShot."
+"fadeout_time]."
+msgstr ""
+"Время для перехода между этим состоянием и следующим.\n"
+"[b]Примечание:[/b] [AnimationNodeStateMachine] переходит в текущее состояние "
+"сразу после начала перехода. Точное оставшееся время можно вывести только из "
+"основной анимации. Когда [AnimationNodeOutput] считается самым верхним по "
+"потоку, то [member xfade_time] не масштабируется в зависимости от дельты "
+"нижнего потока. См. также [member AnimationNodeOneShot.fadeout_time]."
+
+msgid "Emitted when [member advance_condition] is changed."
+msgstr "Вызывается при изменении [member advance_condition]."
+
+msgid ""
+"Switch to the next state immediately. The current state will end and blend "
+"into the beginning of the new one."
+msgstr ""
+"Немедленно переключиться на следующее состояние. Текущее состояние закончится "
+"и сольется с началом нового."
+
+msgid ""
+"Switch to the next state immediately, but will seek the new state to the "
+"playback position of the old state."
+msgstr ""
+"Немедленно переключиться на следующее состояние, но новое состояние будет "
+"искаться в позиции воспроизведения старого состояния."
+
+msgid ""
+"Wait for the current state playback to end, then switch to the beginning of "
+"the next state animation."
+msgstr ""
+"Дождитесь окончания воспроизведения текущего состояния, затем переключитесь "
+"на начало анимации следующего состояния."
+
+msgid "Don't use this transition."
+msgstr "Не используйте этот переход."
+
+msgid ""
+"Only use this transition during [method AnimationNodeStateMachinePlayback."
+"travel]."
+msgstr ""
+"Используйте этот переход только во время [метода "
+"AnimationNodeStateMachinePlayback.travel]."
+
+msgid ""
+"Automatically use this transition if the [member advance_condition] and "
+"[member advance_expression] checks are [code]true[/code] (if assigned)."
+msgstr ""
+"Автоматически использовать этот переход, если проверки [member "
+"advance_condition] и [member advance_expression] равны [code]true[/code] "
+"(если назначено)."
+
+msgid ""
+"Blends two animations subtractively inside of an [AnimationNodeBlendTree]."
+msgstr ""
+"Смешивает две анимации методом вычитания внутри [AnimationNodeBlendTree]."
+
+msgid ""
+"A resource to add to an [AnimationNodeBlendTree]. Blends two animations "
+"subtractively based on the amount value.\n"
+"This animation node is usually used for pre-calculation to cancel out any "
+"extra poses from the animation for the \"add\" animation source in "
+"[AnimationNodeAdd2] or [AnimationNodeAdd3].\n"
+"In general, the blend value should be in the [code][0.0, 1.0][/code] range, "
+"but values outside of this range can be used for amplified or inverted "
+"animations.\n"
+"[b]Note:[/b] This calculation is different from using a negative value in "
+"[AnimationNodeAdd2], since the transformation matrices do not satisfy the "
+"commutative law. [AnimationNodeSub2] multiplies the transformation matrix of "
+"the inverted animation from the left side, while negative [AnimationNodeAdd2] "
+"multiplies it from the right side."
+msgstr ""
+"Ресурс для добавления в [AnimationNodeBlendTree]. Смешивает две анимации "
+"вычитающим образом на основе значения количества.\n"
+"Этот узел анимации обычно используется для предварительного расчета, чтобы "
+"отменить любые дополнительные позы из анимации для источника анимации «add» в "
+"[AnimationNodeAdd2] или [AnimationNodeAdd3].\n"
+"В общем случае значение смешивания должно находиться в диапазоне [code][0.0, "
+"1.0][/code], но значения за пределами этого диапазона могут использоваться "
+"для усиленных или инвертированных анимаций.\n"
+"[b]Примечание:[/b] Это вычисление отличается от использования отрицательного "
+"значения в [AnimationNodeAdd2], поскольку матрицы преобразования не "
+"удовлетворяют коммутативному закону. [AnimationNodeSub2] умножает матрицу "
+"преобразования инвертированной анимации с левой стороны, тогда как "
+"отрицательное [AnimationNodeAdd2] умножает ее с правой стороны."
+
+msgid "AnimationTree"
+msgstr "Дерево анимации"
+
+msgid ""
+"Base class for [AnimationNode]s with multiple input ports that must be "
+"synchronized."
+msgstr ""
+"Базовый класс для [AnimationNode] с несколькими входными портами, которые "
+"необходимо синхронизировать."
+
+msgid ""
+"An animation node used to combine, mix, or blend two or more animations "
+"together while keeping them synchronized within an [AnimationTree]."
+msgstr ""
+"Узел анимации, используемый для объединения, смешивания или комбинирования "
+"двух или более анимаций, сохраняя их синхронизированными в [AnimationTree]."
+
+msgid "A time-scaling animation node used in [AnimationTree]."
+msgstr "Узел анимации масштабирования времени, используемый в [AnimationTree]."
+
+msgid ""
+"Allows to scale the speed of the animation (or reverse it) in any child "
+"[AnimationNode]s. Setting it to [code]0.0[/code] will pause the animation."
+msgstr ""
+"Позволяет масштабировать скорость анимации (или обратить ее вспять) в любом "
+"дочернем [AnimationNode]. Установка его в [code]0.0[/code] приостановит "
+"анимацию."
+
+msgid "A time-seeking animation node used in [AnimationTree]."
+msgstr "Узел анимации поиска по времени, используемый в [AnimationTree]."
+
+msgid ""
+"This animation node can be used to cause a seek command to happen to any sub-"
+"children of the animation graph. Use to play an [Animation] from the start or "
+"a certain playback position inside the [AnimationNodeBlendTree].\n"
+"After setting the time and changing the animation playback, the time seek "
+"node automatically goes into sleep mode on the next process frame by setting "
+"its [code]seek_request[/code] value to [code]-1.0[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Play child animation from the start.\n"
+"animation_tree.set(\"parameters/TimeSeek/seek_request\", 0.0)\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/TimeSeek/seek_request\"] = 0.0\n"
+"\n"
+"# Play child animation from 12 second timestamp.\n"
+"animation_tree.set(\"parameters/TimeSeek/seek_request\", 12.0)\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/TimeSeek/seek_request\"] = 12.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Play child animation from the start.\n"
+"animationTree.Set(\"parameters/TimeSeek/seek_request\", 0.0);\n"
+"\n"
+"// Play child animation from 12 second timestamp.\n"
+"animationTree.Set(\"parameters/TimeSeek/seek_request\", 12.0);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Этот узел анимации может использоваться для того, чтобы команда seek "
+"выполнялась для любых дочерних элементов графика анимации. Используйте для "
+"воспроизведения [Animation] с начала или с определенной позиции "
+"воспроизведения внутри [AnimationNodeBlendTree].\n"
+"После установки времени и изменения воспроизведения анимации узел поиска "
+"времени автоматически переходит в спящий режим на следующем кадре процесса, "
+"устанавливая его значение [code]seek_request[/code] на [code]-1.0[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Включайте детскую анимацию с самого начала.\n"
+"animation_tree.set(\"parameters/TimeSeek/seek_request\", 0.0)\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/TimeSeek/seek_request\"] = 0.0\n"
+"\n"
+"# Воспроизвести детскую анимацию с 12-секундной отметки времени.\n"
+"animation_tree.set(\"parameters/TimeSeek/seek_request\", 12.0)\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/TimeSeek/seek_request\"] = 12.0\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"//Включайте детскую анимацию с самого начала.\n"
+"animationTree.Set(\"parameters/TimeSeek/seek_request\", 0.0);\n"
+"\n"
+"// Воспроизвести детскую анимацию с 12-секундной отметки времени.\n"
+"animationTree.Set(\"parameters/TimeSeek/seek_request\", 12.0);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"If [code]true[/code], some processes are executed to handle keys between "
+"seeks, such as calculating root motion and finding the nearest discrete key."
+msgstr ""
+"Если [code]true[/code], выполняются некоторые процессы для обработки ключей "
+"между поисками, такие как вычисление корневого движения и поиск ближайшего "
+"дискретного ключа."
+
+msgid "A transition within an [AnimationTree] connecting two [AnimationNode]s."
+msgstr "Переход внутри [AnimationTree], соединяющий две [AnimationNode]-ы."
+
+msgid ""
+"Simple state machine for cases which don't require a more advanced "
+"[AnimationNodeStateMachine]. Animations can be connected to the inputs and "
+"transition times can be specified.\n"
+"After setting the request and changing the animation playback, the transition "
+"node automatically clears the request on the next process frame by setting "
+"its [code]transition_request[/code] value to empty.\n"
+"[b]Note:[/b] When using a cross-fade, [code]current_state[/code] and "
+"[code]current_index[/code] change to the next state immediately after the "
+"cross-fade begins.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Play child animation connected to \"state_2\" port.\n"
+"animation_tree.set(\"parameters/Transition/transition_request\", "
+"\"state_2\")\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/Transition/transition_request\"] = \"state_2\"\n"
+"\n"
+"# Get current state name (read-only).\n"
+"animation_tree.get(\"parameters/Transition/current_state\")\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/Transition/current_state\"]\n"
+"\n"
+"# Get current state index (read-only).\n"
+"animation_tree.get(\"parameters/Transition/current_index\")\n"
+"# Alternative syntax (same result as above).\n"
+"animation_tree[\"parameters/Transition/current_index\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Play child animation connected to \"state_2\" port.\n"
+"animationTree.Set(\"parameters/Transition/transition_request\", "
+"\"state_2\");\n"
+"\n"
+"// Get current state name (read-only).\n"
+"animationTree.Get(\"parameters/Transition/current_state\");\n"
+"\n"
+"// Get current state index (read-only).\n"
+"animationTree.Get(\"parameters/Transition/current_index\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Простой конечный автомат для случаев, не требующих более продвинутого "
+"[AnimationNodeStateMachine]. Анимации можно подключать к входам и можно "
+"указывать время перехода.\n"
+"После установки запроса и изменения воспроизведения анимации узел перехода "
+"автоматически очищает запрос на следующем кадре процесса, устанавливая его "
+"значение [code]transition_request[/code] пустым.\n"
+"[b]Примечание:[/b] При использовании кросс-фейда [code]current_state[/code] и "
+"[code]current_index[/code] изменяются на следующее состояние сразу после "
+"начала кросс-фейда.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Воспроизвести дочернюю анимацию, подключенную к порту «state_2».\n"
+"animation_tree.set(\"parameters/Transition/transition_request\", "
+"\"state_2\")\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/Transition/transition_request\"] = \"state_2\"\n"
+"\n"
+"# Получить название текущего состояния (только для чтения).\n"
+"animation_tree.get(\"parameters/Transition/current_state\")\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/Transition/current_state\"]\n"
+"\n"
+"# Получить текущий индекс состояния (только для чтения).\n"
+"animation_tree.get(\"parameters/Transition/current_index\")\n"
+"# Альтернативный синтаксис (тот же результат, что и выше).\n"
+"animation_tree[\"parameters/Transition/current_index\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Воспроизвести дочернюю анимацию, подключенную к порту «state_2».\n"
+"animationTree.Set(\"parameters/Transition/transition_request\", "
+"\"state_2\");\n"
+"\n"
+"// Получить название текущего состояния (только для чтения).\n"
+"animationTree.Get(\"parameters/Transition/current_state\");\n"
+"\n"
+"// Получить текущий индекс состояния (только для чтения).\n"
+"animationTree.Get(\"parameters/Transition/current_index\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Enables or disables auto-advance for the given [param input] index. If "
+"enabled, state changes to the next input after playing the animation once. If "
+"enabled for the last input state, it loops to the first."
+msgstr ""
+"Включает или отключает автоматическое продвижение для заданного индекса "
+"[param input]. Если включено, состояние изменяется на следующий ввод после "
+"однократного воспроизведения анимации. Если включено для последнего состояния "
+"ввода, оно циклически возвращается к первому."
+
+msgid ""
+"If [code]true[/code], allows transition to the self state. When the reset "
+"option is enabled in input, the animation is restarted. If [code]false[/"
+"code], nothing happens on the transition to the self state."
+msgstr ""
+"Если [code]true[/code], разрешает переход в состояние self. Когда опция "
+"сброса включена во входных данных, анимация перезапускается. Если "
+"[code]false[/code], при переходе в состояние self ничего не происходит."
+
+msgid ""
+"Cross-fading time (in seconds) between each animation connected to the "
+"inputs.\n"
+"[b]Note:[/b] [AnimationNodeTransition] transitions the current state "
+"immediately after the start of the fading. The precise remaining time can "
+"only be inferred from the main animation. When [AnimationNodeOutput] is "
+"considered as the most upstream, so the [member xfade_time] is not scaled "
+"depending on the downstream delta. See also [member AnimationNodeOneShot."
+"fadeout_time]."
+msgstr ""
+"Время кросс-фейдинга (в секундах) между каждой анимацией, подключенной к "
+"входам.\n"
+"[b]Примечание:[/b] [AnimationNodeTransition] переходит в текущее состояние "
+"сразу после начала затухания. Точное оставшееся время можно вывести только из "
+"основной анимации. Когда [AnimationNodeOutput] считается самым верхним по "
+"потоку, то [member xfade_time] не масштабируется в зависимости от дельты "
+"нижнего потока. См. также [member AnimationNodeOneShot.fadeout_time]."
+
+msgid "A node used for animation playback."
+msgstr "Узел, используемый для воспроизведения анимации."
+
+msgid ""
+"Triggers the [param animation_to] animation when the [param animation_from] "
+"animation completes."
+msgstr ""
+"Запускает анимацию [param animation_to] после завершения анимации [param "
+"animation_from]."
+
+msgid "Clears all queued, unplayed animations."
+msgstr "Очищает все поставленные в очередь невоспроизведенные анимации."
+
+msgid "Use [member AnimationMixer.callback_mode_method] instead."
+msgstr "Вместо этого используйте [member AnimationMixer.callback_mode_method]."
+
+msgid "Use [member AnimationMixer.callback_mode_process] instead."
+msgstr "Вместо этого используйте [member AnimationMixer.callback_mode_process]."
+
+msgid "Use [member AnimationMixer.root_node] instead."
+msgstr "Вместо этого используйте [member AnimationMixer.root_node]."
+
+msgid ""
+"Pauses the currently playing animation. The [member "
+"current_animation_position] will be kept and calling [method play] or [method "
+"play_backwards] without arguments or with the same animation name as [member "
+"assigned_animation] will resume the animation.\n"
+"See also [method stop]."
+msgstr ""
+"Приостанавливает текущую воспроизводимую анимацию. [Member "
+"current_animation_position] будет сохранен, а вызов [method play] или [method "
+"play_backwards] без аргументов или с тем же именем анимации, что и [member "
+"assignment_animation], возобновит анимацию.\n"
+"См. также [method stop]."
+
+msgid ""
+"Plays the animation with key [param name] and the section starting from "
+"[param start_time] and ending on [param end_time]. See also [method play].\n"
+"Setting [param start_time] to a value outside the range of the animation "
+"means the start of the animation will be used instead, and setting [param "
+"end_time] to a value outside the range of the animation means the end of the "
+"animation will be used instead. [param start_time] cannot be equal to [param "
+"end_time]."
+msgstr ""
+"Воспроизводит анимацию с ключом [param name] и разделом, начинающимся с "
+"[param start_time] и заканчивающимся на [param end_time]. См. также [method "
+"play].\n"
+"Установка [param start_time] на значение вне диапазона анимации означает, что "
+"вместо этого будет использоваться начало анимации, а установка [param "
+"end_time] на значение вне диапазона анимации означает, что вместо этого будет "
+"использоваться конец анимации. [param start_time] не может быть равен [param "
+"end_time]."
+
+msgid ""
+"Plays the animation with key [param name] and the section starting from "
+"[param start_marker] and ending on [param end_marker].\n"
+"If the start marker is empty, the section starts from the beginning of the "
+"animation. If the end marker is empty, the section ends on the end of the "
+"animation. See also [method play]."
+msgstr ""
+"Воспроизводит анимацию с ключом [param name] и разделом, начинающимся с "
+"[param start_marker] и заканчивающимся на [param end_marker].\n"
+"Если начальный маркер пуст, раздел начинается с начала анимации. Если "
+"конечный маркер пуст, раздел заканчивается в конце анимации. См. также "
+"[method play]."
+
+msgid ""
+"See also [method AnimationMixer.capture].\n"
+"You can use this method to use more detailed options for capture than those "
+"performed by [member playback_auto_capture]. When [member "
+"playback_auto_capture] is [code]false[/code], this method is almost the same "
+"as the following:\n"
+"[codeblock]\n"
+"capture(name, duration, trans_type, ease_type)\n"
+"play(name, custom_blend, custom_speed, from_end)\n"
+"[/codeblock]\n"
+"If [param name] is blank, it specifies [member assigned_animation].\n"
+"If [param duration] is a negative value, the duration is set to the interval "
+"between the current position and the first key, when [param from_end] is "
+"[code]true[/code], uses the interval between the current position and the "
+"last key instead.\n"
+"[b]Note:[/b] The [param duration] takes [member speed_scale] into account, "
+"but [param custom_speed] does not, because the capture cache is interpolated "
+"with the blend result and the result may contain multiple animations."
+msgstr ""
+"См. также [метод AnimationMixer.capture].\n"
+"Вы можете использовать этот метод для использования более подробных "
+"параметров захвата, чем те, которые выполняются [member "
+"playback_auto_capture]. Когда [member playback_auto_capture] имеет значение "
+"[code]false[/code], этот метод почти такой же, как следующий:\n"
+"[codeblock]\n"
+"capture(name, duration, trans_type, ease_type)\n"
+"play(name, custom_blend, custom_speed, from_end)\n"
+"[/codeblock]\n"
+"Если [param name] пусто, он указывает [member assignment_animation].\n"
+"Если [param duration] отрицательное значение, длительность устанавливается на "
+"интервал между текущей позицией и первым ключом, когда [param from_end] равен "
+"[code]true[/code], вместо этого используется интервал между текущей позицией "
+"и последним ключом.\n"
+"[b]Примечание:[/b] [param duration] учитывает [member speed_scale], но [param "
+"custom_speed] — нет, поскольку кэш захвата интерполируется с результатом "
+"смешивания, и результат может содержать несколько анимаций."
+
+msgid ""
+"Seeks the animation to the [param seconds] point in time (in seconds). If "
+"[param update] is [code]true[/code], the animation updates too, otherwise it "
+"updates at process time. Events between the current frame and [param seconds] "
+"are skipped.\n"
+"If [param update_only] is [code]true[/code], the method / audio / animation "
+"playback tracks will not be processed.\n"
+"[b]Note:[/b] Seeking to the end of the animation doesn't emit [signal "
+"AnimationMixer.animation_finished]. If you want to skip animation and emit "
+"the signal, use [method AnimationMixer.advance]."
+msgstr ""
+"Ищет анимацию до момента времени [param seconds] (в секундах). Если [param "
+"update] равен [code]true[/code], анимация также обновляется, в противном "
+"случае она обновляется во время процесса. События между текущим кадром и "
+"[param seconds] пропускаются.\n"
+"Если [param update_only] равен [code]true[/code], метод / аудио / дорожки "
+"воспроизведения анимации не будут обработаны.\n"
+"[b]Примечание:[/b] Поиск до конца анимации не выдает [сигнал AnimationMixer."
+"animation_finished]. Если вы хотите пропустить анимацию и выдать сигнал, "
+"используйте [method AnimationMixer.advance]."
+
+msgid "Sets the process notification in which to update animations."
+msgstr ""
+"Устанавливает уведомление о процессе, в котором необходимо обновить анимацию."
+
+msgid ""
+"Changes the start and end times of the section being played. The current "
+"playback position will be clamped within the new section. See also [method "
+"play_section]."
+msgstr ""
+"Изменяет время начала и окончания воспроизводимого раздела. Текущая позиция "
+"воспроизведения будет зафиксирована в новом разделе. См. также [метод "
+"play_section]."
+
+msgid ""
+"Changes the start and end markers of the section being played. The current "
+"playback position will be clamped within the new section. See also [method "
+"play_section_with_markers].\n"
+"If the argument is empty, the section uses the beginning or end of the "
+"animation. If both are empty, it means that the section is not set."
+msgstr ""
+"Изменяет начальный и конечный маркеры воспроизводимого раздела. Текущая "
+"позиция воспроизведения будет зафиксирована в новом разделе. См. также "
+"[method play_section_with_markers].\n"
+"Если аргумент пустой, раздел использует начало или конец анимации. Если оба "
+"пусты, это означает, что раздел не установлен."
+
+msgid ""
+"Stops the currently playing animation. The animation position is reset to "
+"[code]0[/code] and the [code]custom_speed[/code] is reset to [code]1.0[/"
+"code]. See also [method pause].\n"
+"If [param keep_state] is [code]true[/code], the animation state is not "
+"updated visually.\n"
+"[b]Note:[/b] The method / audio / animation playback tracks will not be "
+"processed by this method."
+msgstr ""
+"Останавливает текущую воспроизводимую анимацию. Позиция анимации сбрасывается "
+"на [code]0[/code], а [code]custom_speed[/code] сбрасывается на [code]1.0[/"
+"code]. См. также [method pause].\n"
+"Если [param keep_state] равен [code]true[/code], состояние анимации визуально "
+"не обновляется.\n"
+"[b]Примечание:[/b] Метод / аудио / дорожки воспроизведения анимации не будут "
+"обрабатываться этим методом."
+
+msgid ""
+"If playing, the current animation's key, otherwise, the animation last "
+"played. When set, this changes the animation, but will not play it unless "
+"already playing. See also [member current_animation]."
+msgstr ""
+"Если воспроизводится, ключ текущей анимации, в противном случае — последняя "
+"воспроизведенная анимация. Если установлено, это изменяет анимацию, но не "
+"воспроизводит ее, если она уже не воспроизводится. См. также [member "
+"current_animation]."
+
+msgid "The length (in seconds) of the currently playing animation."
+msgstr "Продолжительность (в секундах) текущей воспроизводимой анимации."
+
+msgid "The position (in seconds) of the currently playing animation."
+msgstr "Позиция (в секундах) текущей воспроизводимой анимации."
+
+msgid ""
+"If [code]true[/code] and the engine is running in Movie Maker mode (see "
+"[MovieWriter]), exits the engine with [method SceneTree.quit] as soon as an "
+"animation is done playing in this [AnimationPlayer]. A message is printed "
+"when the engine quits for this reason.\n"
+"[b]Note:[/b] This obeys the same logic as the [signal AnimationMixer."
+"animation_finished] signal, so it will not quit the engine if the animation "
+"is set to be looping."
+msgstr ""
+"Если [code]true[/code] и движок работает в режиме Movie Maker (см. "
+"[MovieWriter]), выходит из движка с помощью [method SceneTree.quit], как "
+"только анимация завершит воспроизведение в этом [AnimationPlayer]. Сообщение "
+"выводится, когда движок завершает работу по этой причине.\n"
+"[b]Примечание:[/b] Это подчиняется той же логике, что и сигнал [signal "
+"AnimationMixer.animation_finished], поэтому он не выйдет из движка, если "
+"анимация установлена как циклическая."
+
+msgid ""
+"If [code]true[/code], performs [method AnimationMixer.capture] before "
+"playback automatically. This means just [method play_with_capture] is "
+"executed with default arguments instead of [method play].\n"
+"[b]Note:[/b] Capture interpolation is only performed if the animation "
+"contains a capture track. See also [constant Animation.UPDATE_CAPTURE]."
+msgstr ""
+"Если [code]true[/code], выполняет [method AnimationMixer.capture] перед "
+"воспроизведением автоматически. Это означает, что выполняется только [method "
+"play_with_capture] с аргументами по умолчанию вместо [method play].\n"
+"[b]Примечание:[/b] Интерполяция захвата выполняется только в том случае, если "
+"анимация содержит трек захвата. См. также [constant Animation.UPDATE_CAPTURE]."
+
+msgid ""
+"See also [method play_with_capture] and [method AnimationMixer.capture].\n"
+"If [member playback_auto_capture_duration] is negative value, the duration is "
+"set to the interval between the current position and the first key."
+msgstr ""
+"См. также [метод play_with_capture] и [метод AnimationMixer.capture].\n"
+"Если [член playback_auto_capture_duration] имеет отрицательное значение, "
+"длительность устанавливается на интервал между текущей позицией и первым "
+"ключом."
+
+msgid ""
+"The ease type of the capture interpolation. See also [enum Tween.EaseType]."
+msgstr "Тип легкости интерполяции захвата. См. также [enum Tween.EaseType]."
+
+msgid ""
+"The transition type of the capture interpolation. See also [enum Tween."
+"TransitionType]."
+msgstr ""
+"Тип перехода интерполяции захвата. См. также [enum Tween.TransitionType]."
+
+msgid ""
+"The default time in which to blend animations. Ranges from 0 to 4096 with "
+"0.01 precision."
+msgstr ""
+"Время по умолчанию для смешивания анимаций. Диапазон от 0 до 4096 с точностью "
+"0,01."
+
+msgid ""
+"Emitted when a queued animation plays after the previous animation finished. "
+"See also [method AnimationPlayer.queue].\n"
+"[b]Note:[/b] The signal is not emitted when the animation is changed via "
+"[method AnimationPlayer.play] or by an [AnimationTree]."
+msgstr ""
+"Вызывается, когда анимация в очереди воспроизводится после завершения "
+"предыдущей анимации. См. также [метод AnimationPlayer.queue].\n"
+"[b]Примечание:[/b] Сигнал не вызывается, когда анимация изменяется через "
+"[метод AnimationPlayer.play] или [AnimationTree]."
+
+msgid "See [constant AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_PHYSICS]."
+msgstr "См. [константу AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_PHYSICS]."
+
+msgid "See [constant AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_IDLE]."
+msgstr "См. [constant AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_IDLE]."
+
+msgid "See [constant AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_MANUAL]."
+msgstr "См. [constant AnimationMixer.ANIMATION_CALLBACK_MODE_PROCESS_MANUAL]."
+
+msgid "See [constant AnimationMixer.ANIMATION_CALLBACK_MODE_METHOD_DEFERRED]."
+msgstr "См. [constant AnimationMixer.ANIMATION_CALLBACK_MODE_METHOD_DEFERRED]."
+
+msgid "See [constant AnimationMixer.ANIMATION_CALLBACK_MODE_METHOD_IMMEDIATE]."
+msgstr "См. [constant AnimationMixer.ANIMATION_CALLBACK_MODE_METHOD_IMMEDIATE]."
+
+msgid ""
+"Base class for [AnimationNode]s that hold one or multiple composite "
+"animations. Usually used for [member AnimationTree.tree_root]."
+msgstr ""
+"Базовый класс для [AnimationNode], которые содержат одну или несколько "
+"составных анимаций. Обычно используется для [member AnimationTree.tree_root]."
+
+msgid ""
+"[AnimationRootNode] is a base class for [AnimationNode]s that hold a complete "
+"animation. A complete animation refers to the output of an "
+"[AnimationNodeOutput] in an [AnimationNodeBlendTree] or the output of another "
+"[AnimationRootNode]. Used for [member AnimationTree.tree_root] or in other "
+"[AnimationRootNode]s.\n"
+"Examples of built-in root nodes include [AnimationNodeBlendTree] (allows "
+"blending nodes between each other using various modes), "
+"[AnimationNodeStateMachine] (allows to configure blending and transitions "
+"between nodes using a state machine pattern), [AnimationNodeBlendSpace2D] "
+"(allows linear blending between [b]three[/b] [AnimationNode]s), "
+"[AnimationNodeBlendSpace1D] (allows linear blending only between [b]two[/b] "
+"[AnimationNode]s)."
+msgstr ""
+"[AnimationRootNode] — это базовый класс для [AnimationNode], которые содержат "
+"полную анимацию. Полная анимация относится к выходу [AnimationNodeOutput] в "
+"[AnimationNodeBlendTree] или выходу другого [AnimationRootNode]. Используется "
+"для [member AnimationTree.tree_root] или в других [AnimationRootNode].\n"
+"Примерами встроенных корневых узлов являются [AnimationNodeBlendTree] "
+"(позволяет смешивать узлы между собой с использованием различных режимов), "
+"[AnimationNodeStateMachine] (позволяет настраивать смешивание и переходы "
+"между узлами с использованием шаблона конечного автомата), "
+"[AnimationNodeBlendSpace2D] (позволяет линейное смешивание между [b]тремя[/b] "
+"[AnimationNode]-ми), [AnimationNodeBlendSpace1D] (позволяет линейное "
+"смешивание только между [b]двумя[/b] [AnimationNode]-ми)."
+
+msgid "A node used for advanced animation transitions in an [AnimationPlayer]."
+msgstr ""
+"Узел, используемый для расширенных анимационных переходов в [AnimationPlayer]."
+
+msgid ""
+"A node used for advanced animation transitions in an [AnimationPlayer].\n"
+"[b]Note:[/b] When linked with an [AnimationPlayer], several properties and "
+"methods of the corresponding [AnimationPlayer] will not function as expected. "
+"Playback and transitions should be handled using only the [AnimationTree] and "
+"its constituent [AnimationNode](s). The [AnimationPlayer] node should be used "
+"solely for adding, deleting, and editing animations."
+msgstr ""
+"Узел, используемый для расширенных анимационных переходов в "
+"[AnimationPlayer].\n"
+"[b]Примечание:[/b] При связывании с [AnimationPlayer] несколько свойств и "
+"методов соответствующего [AnimationPlayer] не будут работать так, как "
+"ожидается. Воспроизведение и переходы должны обрабатываться только с "
+"использованием [AnimationTree] и его составляющих [AnimationNode]. Узел "
+"[AnimationPlayer] должен использоваться исключительно для добавления, "
+"удаления и редактирования анимаций."
+
+msgid ""
+"The path to the [Node] used to evaluate the [AnimationNode] [Expression] if "
+"one is not explicitly specified internally."
+msgstr ""
+"Путь к [Node], используемый для оценки [AnimationNode] [Expression], если он "
+"явно не указан внутри."
+
+msgid "The path to the [AnimationPlayer] used for animating."
+msgstr "Путь к [AnimationPlayer], используемому для анимации."
+
+msgid ""
+"The root animation node of this [AnimationTree]. See [AnimationRootNode]."
+msgstr "Корневой узел анимации этого [AnimationTree]. См. [AnimationRootNode]."
+
+msgid ""
+"A region of 2D space that detects other [CollisionObject2D]s entering or "
+"exiting it."
+msgstr ""
+"Область 2D пространства, которая обнаруживает другие [CollisionObject2D], "
+"входящие в нее или выходящие из нее."
+
+msgid ""
+"[Area2D] is a region of 2D space defined by one or multiple "
+"[CollisionShape2D] or [CollisionPolygon2D] child nodes. It detects when other "
+"[CollisionObject2D]s enter or exit it, and it also keeps track of which "
+"collision objects haven't exited it yet (i.e. which one are overlapping it).\n"
+"This node can also locally alter or override physics parameters (gravity, "
+"damping) and route audio to custom audio buses.\n"
+"[b]Note:[/b] Areas and bodies created with [PhysicsServer2D] might not "
+"interact as expected with [Area2D]s, and might not emit signals or track "
+"objects correctly."
+msgstr ""
+"[Area2D] — это область двумерного пространства, определяемая одним или "
+"несколькими дочерними узлами [CollisionShape2D] или [CollisionPolygon2D]. Он "
+"определяет, когда другие [CollisionObject2D] входят в него или выходят из "
+"него, а также отслеживает, какие объекты столкновения еще не вышли из него "
+"(т. е. какие из них перекрывают его).\n"
+"Этот узел также может локально изменять или переопределять физические "
+"параметры (гравитация, затухание) и направлять звук на пользовательские "
+"аудиошины.\n"
+"[b]Примечание:[/b] Области и тела, созданные с помощью [PhysicsServer2D], "
+"могут не взаимодействовать с [Area2D]-ми так, как ожидается, и могут не "
+"испускать сигналы или не отслеживать объекты правильно."
+
+msgid "Using Area2D"
+msgstr "Использование Area2D"
+
+msgid "2D Pong Demo"
+msgstr "Демоверсия 2D-понга"
+
+msgid "2D Platformer Demo"
+msgstr "Демоверсия 2D-платформера"
+
+msgid ""
+"Returns a list of intersecting [Area2D]s. The overlapping area's [member "
+"CollisionObject2D.collision_layer] must be part of this area's [member "
+"CollisionObject2D.collision_mask] in order to be detected.\n"
+"For performance reasons (collisions are all processed at the same time) this "
+"list is modified once during the physics step, not immediately after objects "
+"are moved. Consider using signals instead."
+msgstr ""
+"Возвращает список пересекающихся [Area2D]. [Member CollisionObject2D."
+"collision_layer] перекрывающейся области должен быть частью [member "
+"CollisionObject2D.collision_mask] этой области, чтобы быть обнаруженным.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) этот список изменяется один раз во время шага физики, а не "
+"сразу после перемещения объектов. Рассмотрите возможность использования "
+"сигналов вместо этого."
+
+msgid ""
+"Returns a list of intersecting [PhysicsBody2D]s and [TileMap]s. The "
+"overlapping body's [member CollisionObject2D.collision_layer] must be part of "
+"this area's [member CollisionObject2D.collision_mask] in order to be "
+"detected.\n"
+"For performance reasons (collisions are all processed at the same time) this "
+"list is modified once during the physics step, not immediately after objects "
+"are moved. Consider using signals instead."
+msgstr ""
+"Возвращает список пересекающихся [PhysicsBody2D] и [TileMap]. [Member "
+"CollisionObject2D.collision_layer] перекрывающегося тела должен быть частью "
+"[member CollisionObject2D.collision_mask] этой области, чтобы быть "
+"обнаруженным.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) этот список изменяется один раз во время шага физики, а не "
+"сразу после перемещения объектов. Рассмотрите возможность использования "
+"сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if intersecting any [Area2D]s, otherwise returns "
+"[code]false[/code]. The overlapping area's [member CollisionObject2D."
+"collision_layer] must be part of this area's [member CollisionObject2D."
+"collision_mask] in order to be detected.\n"
+"For performance reasons (collisions are all processed at the same time) the "
+"list of overlapping areas is modified once during the physics step, not "
+"immediately after objects are moved. Consider using signals instead."
+msgstr ""
+"Возвращает [code]true[/code], если пересекает какие-либо [Area2D]-ы, в "
+"противном случае возвращает [code]false[/code]. [Member CollisionObject2D."
+"collision_layer] перекрывающейся области должен быть частью [member "
+"CollisionObject2D.collision_mask] этой области, чтобы быть обнаруженным.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) список перекрывающихся областей изменяется один раз во время "
+"шага физики, а не сразу после перемещения объектов. Рассмотрите возможность "
+"использования сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if intersecting any [PhysicsBody2D]s or [TileMap]s, "
+"otherwise returns [code]false[/code]. The overlapping body's [member "
+"CollisionObject2D.collision_layer] must be part of this area's [member "
+"CollisionObject2D.collision_mask] in order to be detected.\n"
+"For performance reasons (collisions are all processed at the same time) the "
+"list of overlapping bodies is modified once during the physics step, not "
+"immediately after objects are moved. Consider using signals instead."
+msgstr ""
+"Возвращает [code]true[/code], если пересекает любые [PhysicsBody2D]-ы или "
+"[TileMap]-ми, в противном случае возвращает [code]false[/code]. [Member "
+"CollisionObject2D.collision_layer] перекрывающего тела должен быть частью "
+"[member CollisionObject2D.collision_mask] этой области, чтобы быть "
+"обнаруженным.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) список перекрывающихся тел изменяется один раз во время шага "
+"физики, а не сразу после перемещения объектов. Рассмотрите возможность "
+"использования сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if the given [Area2D] intersects or overlaps this "
+"[Area2D], [code]false[/code] otherwise.\n"
+"[b]Note:[/b] The result of this test is not immediate after moving objects. "
+"For performance, the list of overlaps is updated once per frame and before "
+"the physics step. Consider using signals instead."
+msgstr ""
+"Возвращает [code]true[/code], если заданная [Area2D] пересекает или "
+"перекрывает эту [Area2D], [code]false[/code] в противном случае.\n"
+"[b]Примечание:[/b] Результат этого теста не появляется сразу после "
+"перемещения объектов. Для производительности список перекрытий обновляется "
+"один раз за кадр и перед шагом физики. Рассмотрите возможность использования "
+"сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if the given physics body intersects or overlaps "
+"this [Area2D], [code]false[/code] otherwise.\n"
+"[b]Note:[/b] The result of this test is not immediate after moving objects. "
+"For performance, list of overlaps is updated once per frame and before the "
+"physics step. Consider using signals instead.\n"
+"The [param body] argument can either be a [PhysicsBody2D] or a [TileMap] "
+"instance. While TileMaps are not physics bodies themselves, they register "
+"their tiles with collision shapes as a virtual physics body."
+msgstr ""
+"Возвращает [code]true[/code], если заданное физическое тело пересекает или "
+"перекрывает это [Area2D], [code]false[/code] в противном случае.\n"
+"[b]Примечание:[/b] Результат этого теста не появляется немедленно после "
+"перемещения объектов. Для производительности список перекрытий обновляется "
+"один раз за кадр и перед шагом физики. Рассмотрите возможность использования "
+"сигналов вместо этого.\n"
+"Аргумент [param body] может быть либо экземпляром [PhysicsBody2D], либо "
+"[TileMap]. Хотя TileMaps сами по себе не являются физическими телами, они "
+"регистрируют свои плитки с формами столкновений как виртуальное физическое "
+"тело."
+
+msgid ""
+"The rate at which objects stop spinning in this area. Represents the angular "
+"velocity lost per second.\n"
+"See [member ProjectSettings.physics/2d/default_angular_damp] for more details "
+"about damping."
+msgstr ""
+"Скорость, с которой объекты прекращают вращаться в этой области. Представляет "
+"угловую скорость, потерянную в секунду.\n"
+"Подробнее о затухании см. [member ProjectSettings.physics/2d/"
+"default_angular_damp]."
+
+msgid ""
+"Override mode for angular damping calculations within this area. See [enum "
+"SpaceOverride] for possible values."
+msgstr ""
+"Режим переопределения для расчетов углового затухания в этой области. См. "
+"[enum SpaceOverride] для возможных значений."
+
+msgid ""
+"If [code]true[/code], the area's audio bus overrides the default audio bus."
+msgstr ""
+"Если [code]true[/code], аудиошина области переопределяет аудиошину по "
+"умолчанию."
+
+msgid ""
+"The area's gravity intensity (in pixels per second squared). This value "
+"multiplies the gravity direction. This is useful to alter the force of "
+"gravity without altering its direction."
+msgstr ""
+"Интенсивность гравитации области (в пикселях в секунду в квадрате). Это "
+"значение умножает направление гравитации. Это полезно для изменения силы "
+"гравитации без изменения ее направления."
+
+msgid "The area's gravity vector (not normalized)."
+msgstr "Вектор силы тяжести области (не нормализован)."
+
+msgid ""
+"If [code]true[/code], gravity is calculated from a point (set via [member "
+"gravity_point_center]). See also [member gravity_space_override]."
+msgstr ""
+"Если [code]true[/code], гравитация рассчитывается из точки (задается через "
+"[member gravity_point_center]). См. также [member gravity_space_override]."
+
+msgid ""
+"If gravity is a point (see [member gravity_point]), this will be the point of "
+"attraction."
+msgstr ""
+"Если гравитация — это точка (см. [membergravity_point]), то это будет точка "
+"притяжения."
+
+msgid ""
+"The distance at which the gravity strength is equal to [member gravity]. For "
+"example, on a planet 100 pixels in radius with a surface gravity of 4.0 px/"
+"s², set the [member gravity] to 4.0 and the unit distance to 100.0. The "
+"gravity will have falloff according to the inverse square law, so in the "
+"example, at 200 pixels from the center the gravity will be 1.0 px/s² (twice "
+"the distance, 1/4th the gravity), at 50 pixels it will be 16.0 px/s² (half "
+"the distance, 4x the gravity), and so on.\n"
+"The above is true only when the unit distance is a positive number. When this "
+"is set to 0.0, the gravity will be constant regardless of distance."
+msgstr ""
+"Расстояние, на котором сила гравитации равна [силе гравитации элемента]. "
+"Например, на планете радиусом 100 пикселей с поверхностной силой гравитации "
+"4,0 px/s² установите [силу гравитации элемента] на 4,0, а единичное "
+"расстояние на 100,0. Сила гравитации будет уменьшаться в соответствии с "
+"законом обратных квадратов, поэтому в этом примере на расстоянии 200 пикселей "
+"от центра сила гравитации будет равна 1,0 px/s² (в два раза больше "
+"расстояния, 1/4 силы гравитации), на расстоянии 50 пикселей она будет равна "
+"16,0 px/s² (в два раза больше расстояния, 4x силы гравитации) и т. д. \n"
+"Вышесказанное верно только в том случае, если единичное расстояние является "
+"положительным числом. Если установлено значение 0,0, сила гравитации будет "
+"постоянной независимо от расстояния."
+
+msgid ""
+"Override mode for gravity calculations within this area. See [enum "
+"SpaceOverride] for possible values."
+msgstr ""
+"Режим переопределения для гравитационных расчетов в этой области. См. [enum "
+"SpaceOverride] для возможных значений."
+
+msgid ""
+"The rate at which objects stop moving in this area. Represents the linear "
+"velocity lost per second.\n"
+"See [member ProjectSettings.physics/2d/default_linear_damp] for more details "
+"about damping."
+msgstr ""
+"Скорость, с которой объекты прекращают движение в этой области. Представляет "
+"собой потерю линейной скорости в секунду.\n"
+"Подробнее о затухании см. [member ProjectSettings.physics/2d/"
+"default_linear_damp]."
+
+msgid ""
+"Override mode for linear damping calculations within this area. See [enum "
+"SpaceOverride] for possible values."
+msgstr ""
+"Режим переопределения для расчетов линейного затухания в этой области. См. "
+"[enum SpaceOverride] для возможных значений."
+
+msgid "If [code]true[/code], other monitoring areas can detect this area."
+msgstr ""
+"Если [code]true[/code], другие области мониторинга могут обнаружить эту "
+"область."
+
+msgid ""
+"If [code]true[/code], the area detects bodies or areas entering and exiting "
+"it."
+msgstr ""
+"Если [code]true[/code], область обнаруживает входящие и выходящие из нее тела "
+"или области."
+
+msgid ""
+"The area's priority. Higher priority areas are processed first. The "
+"[World2D]'s physics is always processed last, after all areas."
+msgstr ""
+"Приоритет области. Области с более высоким приоритетом обрабатываются в "
+"первую очередь. Физика [World2D] всегда обрабатывается в последнюю очередь, "
+"после всех областей."
+
+msgid ""
+"Emitted when the received [param area] enters this area. Requires [member "
+"monitoring] to be set to [code]true[/code]."
+msgstr ""
+"Выдается, когда полученный [param area] входит в эту область. Требуется, "
+"чтобы [member monitoring] был установлен в [code]true[/code]."
+
+msgid ""
+"Emitted when the received [param area] exits this area. Requires [member "
+"monitoring] to be set to [code]true[/code]."
+msgstr ""
+"Выдается, когда полученная [param area] выходит из этой области. Требует, "
+"чтобы [member monitoring] был установлен на [code]true[/code]."
+
+msgid ""
+"Emitted when a [Shape2D] of the received [param area] enters a shape of this "
+"area. Requires [member monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param area_shape_index] contain indices of the "
+"interacting shapes from this area and the other area, respectively. [param "
+"area_rid] contains the [RID] of the other area. These values can be used with "
+"the [PhysicsServer2D].\n"
+"[b]Example:[/b] Get the [CollisionShape2D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Выдается, когда [Shape2D] полученного [param area] входит в форму этой "
+"области. Требует, чтобы [member monitoring] был установлен в [code]true[/"
+"code].\n"
+"[param local_shape_index] и [param area_shape_index] содержат индексы "
+"взаимодействующих фигур из этой области и другой области соответственно. "
+"[param area_rid] содержит [RID] другой области. Эти значения можно "
+"использовать с [PhysicsServer2D].\n"
+"[b]Пример:[/b] Получить узел [CollisionShape2D] из индекса формы:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Emitted when a [Shape2D] of the received [param area] exits a shape of this "
+"area. Requires [member monitoring] to be set to [code]true[/code].\n"
+"See also [signal area_shape_entered]."
+msgstr ""
+"Выдается, когда [Shape2D] полученной [param area] выходит из формы этой "
+"области. Требует, чтобы [member monitoring] был установлен на [code]true[/"
+"code].\n"
+"См. также [signal area_shape_entered]."
+
+msgid ""
+"Emitted when the received [param body] enters this area. [param body] can be "
+"a [PhysicsBody2D] or a [TileMap]. [TileMap]s are detected if their [TileSet] "
+"has collision shapes configured. Requires [member monitoring] to be set to "
+"[code]true[/code]."
+msgstr ""
+"Вызывается, когда полученное [param body] попадает в эту область. [param "
+"body] может быть [PhysicsBody2D] или [TileMap]. [TileMap] обнаруживаются, "
+"если их [TileSet] имеет настроенные формы столкновений. Требует, чтобы "
+"[member monitoring] был установлен на [code]true[/code]."
+
+msgid ""
+"Emitted when the received [param body] exits this area. [param body] can be a "
+"[PhysicsBody2D] or a [TileMap]. [TileMap]s are detected if their [TileSet] "
+"has collision shapes configured. Requires [member monitoring] to be set to "
+"[code]true[/code]."
+msgstr ""
+"Вызывается, когда полученное [param body] покидает эту область. [param body] "
+"может быть [PhysicsBody2D] или [TileMap]. [TileMap] обнаруживаются, если их "
+"[TileSet] имеет настроенные формы столкновений. Требует, чтобы [member "
+"monitoring] был установлен на [code]true[/code]."
+
+msgid ""
+"Emitted when a [Shape2D] of the received [param body] enters a shape of this "
+"area. [param body] can be a [PhysicsBody2D] or a [TileMap]. [TileMap]s are "
+"detected if their [TileSet] has collision shapes configured. Requires [member "
+"monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param body_shape_index] contain indices of the "
+"interacting shapes from this area and the interacting body, respectively. "
+"[param body_rid] contains the [RID] of the body. These values can be used "
+"with the [PhysicsServer2D].\n"
+"[b]Example:[/b] Get the [CollisionShape2D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Вызывается, когда [Shape2D] полученного [param body] входит в форму этой "
+"области. [param body] может быть [PhysicsBody2D] или [TileMap]. [TileMap] "
+"обнаруживаются, если их [TileSet] имеет настроенные формы столкновений. "
+"Требует, чтобы [member monitoring] был установлен на [code]true[/code].\n"
+"[param local_shape_index] и [param body_shape_index] содержат индексы "
+"взаимодействующих фигур из этой области и взаимодействующего тела "
+"соответственно. [param body_rid] содержит [RID] тела. Эти значения можно "
+"использовать с [PhysicsServer2D].\n"
+"[b]Пример:[/b] Получить узел [CollisionShape2D] из индекса формы:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Emitted when a [Shape2D] of the received [param body] exits a shape of this "
+"area. [param body] can be a [PhysicsBody2D] or a [TileMap]. [TileMap]s are "
+"detected if their [TileSet] has collision shapes configured. Requires [member "
+"monitoring] to be set to [code]true[/code].\n"
+"See also [signal body_shape_entered]."
+msgstr ""
+"Выдается, когда [Shape2D] полученного [param body] выходит из формы этой "
+"области. [param body] может быть [PhysicsBody2D] или [TileMap]. [TileMap] "
+"обнаруживаются, если их [TileSet] имеет настроенные формы столкновений. "
+"Требует, чтобы [member monitoring] был установлен на [code]true[/code].\n"
+"См. также [signal body_shape_entered]."
+
+msgid "This area does not affect gravity/damping."
+msgstr "Эта область не влияет на гравитацию/демпфирование."
+
+msgid ""
+"This area adds its gravity/damping values to whatever has been calculated so "
+"far (in [member priority] order)."
+msgstr ""
+"Эта область добавляет свои значения гравитации/затухания ко всему, что было "
+"рассчитано до сих пор (в порядке [приоритет участника])."
+
+msgid ""
+"This area adds its gravity/damping values to whatever has been calculated so "
+"far (in [member priority] order), ignoring any lower priority areas."
+msgstr ""
+"Эта область добавляет свои значения гравитации/демпфирования ко всему, что "
+"было рассчитано до сих пор (в порядке [приоритет элемента]), игнорируя любые "
+"области с более низким приоритетом."
+
+msgid ""
+"This area replaces any gravity/damping, even the defaults, ignoring any lower "
+"priority areas."
+msgstr ""
+"Эта область заменяет любую гравитацию/демпфирование, даже значения по "
+"умолчанию, игнорируя любые области с более низким приоритетом."
+
+msgid ""
+"This area replaces any gravity/damping calculated so far (in [member "
+"priority] order), but keeps calculating the rest of the areas."
+msgstr ""
+"Эта область заменяет все рассчитанные до сих пор значения гравитации/"
+"демпфирования (в порядке [приоритет участника]), но продолжает рассчитывать "
+"остальные области."
+
+msgid ""
+"A region of 3D space that detects other [CollisionObject3D]s entering or "
+"exiting it."
+msgstr ""
+"Область трехмерного пространства, которая обнаруживает другие "
+"[CollisionObject3D], входящие в нее или выходящие из нее."
+
+msgid ""
+"[Area3D] is a region of 3D space defined by one or multiple "
+"[CollisionShape3D] or [CollisionPolygon3D] child nodes. It detects when other "
+"[CollisionObject3D]s enter or exit it, and it also keeps track of which "
+"collision objects haven't exited it yet (i.e. which one are overlapping it).\n"
+"This node can also locally alter or override physics parameters (gravity, "
+"damping) and route audio to custom audio buses.\n"
+"[b]Note:[/b] Areas and bodies created with [PhysicsServer3D] might not "
+"interact as expected with [Area3D]s, and might not emit signals or track "
+"objects correctly.\n"
+"[b]Warning:[/b] Using a [ConcavePolygonShape3D] inside a [CollisionShape3D] "
+"child of this node (created e.g. by using the [b]Create Trimesh Collision "
+"Sibling[/b] option in the [b]Mesh[/b] menu that appears when selecting a "
+"[MeshInstance3D] node) may give unexpected results, since this collision "
+"shape is hollow. If this is not desired, it has to be split into multiple "
+"[ConvexPolygonShape3D]s or primitive shapes like [BoxShape3D], or in some "
+"cases it may be replaceable by a [CollisionPolygon3D]."
+msgstr ""
+"[Area3D] — это область трехмерного пространства, определяемая одним или "
+"несколькими дочерними узлами [CollisionShape3D] или [CollisionPolygon3D]. Он "
+"определяет, когда другие [CollisionObject3D] входят в него или выходят из "
+"него, а также отслеживает, какие объекты столкновения еще не вышли из него "
+"(т. е. какие из них перекрывают его).\n"
+"Этот узел также может локально изменять или переопределять физические "
+"параметры (гравитация, затухание) и направлять звук на пользовательские "
+"аудиошины.\n"
+"[b]Примечание:[/b] Области и тела, созданные с помощью [PhysicsServer3D], "
+"могут не взаимодействовать с [Area3D] так, как ожидается, и могут не "
+"испускать сигналы или не отслеживать объекты правильно.\n"
+"[b]Предупреждение:[/b] Использование [ConcavePolygonShape3D] внутри дочернего "
+"узла [CollisionShape3D] этого узла (созданного, например, с помощью параметра "
+"[b]Create Trimesh Collision Sibling[/b] в меню [b]Mesh[/b], которое "
+"появляется при выборе узла [MeshInstance3D]) может дать неожиданные "
+"результаты, поскольку эта форма столкновения полая. Если это нежелательно, ее "
+"следует разделить на несколько [ConvexPolygonShape3D] или примитивных форм, "
+"таких как [BoxShape3D], или в некоторых случаях ее можно заменить на "
+"[CollisionPolygon3D]."
+
+msgid ""
+"Returns a list of intersecting [Area3D]s. The overlapping area's [member "
+"CollisionObject3D.collision_layer] must be part of this area's [member "
+"CollisionObject3D.collision_mask] in order to be detected.\n"
+"For performance reasons (collisions are all processed at the same time) this "
+"list is modified once during the physics step, not immediately after objects "
+"are moved. Consider using signals instead."
+msgstr ""
+"Возвращает список пересекающихся [Area3D]-ов. [Member CollisionObject3D."
+"collision_layer] перекрывающейся области должен быть частью [member "
+"CollisionObject3D.collision_mask] этой области, чтобы быть обнаруженным.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) этот список изменяется один раз во время шага физики, а не "
+"сразу после перемещения объектов. Рассмотрите возможность использования "
+"сигналов вместо этого."
+
+msgid ""
+"Returns a list of intersecting [PhysicsBody3D]s and [GridMap]s. The "
+"overlapping body's [member CollisionObject3D.collision_layer] must be part of "
+"this area's [member CollisionObject3D.collision_mask] in order to be "
+"detected.\n"
+"For performance reasons (collisions are all processed at the same time) this "
+"list is modified once during the physics step, not immediately after objects "
+"are moved. Consider using signals instead."
+msgstr ""
+"Возвращает список пересекающихся [PhysicsBody3D]-ов и [GridMap]-ов. [Member "
+"CollisionObject3D.collision_layer] перекрывающегося тела должен быть частью "
+"[member CollisionObject3D.collision_mask] этой области, чтобы его можно было "
+"обнаружить.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) этот список изменяется один раз во время шага физики, а не "
+"сразу после перемещения объектов. Рассмотрите возможность использования "
+"сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if intersecting any [Area3D]s, otherwise returns "
+"[code]false[/code]. The overlapping area's [member CollisionObject3D."
+"collision_layer] must be part of this area's [member CollisionObject3D."
+"collision_mask] in order to be detected.\n"
+"For performance reasons (collisions are all processed at the same time) the "
+"list of overlapping areas is modified once during the physics step, not "
+"immediately after objects are moved. Consider using signals instead."
+msgstr ""
+"Возвращает [code]true[/code], если пересекает какие-либо [Area3D], в "
+"противном случае возвращает [code]false[/code]. [Member CollisionObject3D."
+"collision_layer] перекрывающейся области должен быть частью [member "
+"CollisionObject3D.collision_mask] этой области, чтобы быть обнаруженным.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) список перекрывающихся областей изменяется один раз во время "
+"шага физики, а не сразу после перемещения объектов. Рассмотрите возможность "
+"использования сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if intersecting any [PhysicsBody3D]s or [GridMap]s, "
+"otherwise returns [code]false[/code]. The overlapping body's [member "
+"CollisionObject3D.collision_layer] must be part of this area's [member "
+"CollisionObject3D.collision_mask] in order to be detected.\n"
+"For performance reasons (collisions are all processed at the same time) the "
+"list of overlapping bodies is modified once during the physics step, not "
+"immediately after objects are moved. Consider using signals instead."
+msgstr ""
+"Возвращает [code]true[/code], если пересекает любые [PhysicsBody3D] или "
+"[GridMap], в противном случае возвращает [code]false[/code]. [Member "
+"CollisionObject3D.collision_layer] перекрывающегося тела должен быть частью "
+"[member CollisionObject3D.collision_mask] этой области, чтобы быть "
+"обнаруженным.\n"
+"Из соображений производительности (все столкновения обрабатываются "
+"одновременно) список перекрывающихся тел изменяется один раз во время шага "
+"физики, а не сразу после перемещения объектов. Рассмотрите возможность "
+"использования сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if the given [Area3D] intersects or overlaps this "
+"[Area3D], [code]false[/code] otherwise.\n"
+"[b]Note:[/b] The result of this test is not immediate after moving objects. "
+"For performance, list of overlaps is updated once per frame and before the "
+"physics step. Consider using signals instead."
+msgstr ""
+"Возвращает [code]true[/code], если заданная [Area3D] пересекает или "
+"перекрывает эту [Area3D], [code]false[/code] в противном случае.\n"
+"[b]Примечание:[/b] Результат этого теста не появляется сразу после "
+"перемещения объектов. Для производительности список перекрытий обновляется "
+"один раз за кадр и перед шагом физики. Рассмотрите возможность использования "
+"сигналов вместо этого."
+
+msgid ""
+"Returns [code]true[/code] if the given physics body intersects or overlaps "
+"this [Area3D], [code]false[/code] otherwise.\n"
+"[b]Note:[/b] The result of this test is not immediate after moving objects. "
+"For performance, list of overlaps is updated once per frame and before the "
+"physics step. Consider using signals instead.\n"
+"The [param body] argument can either be a [PhysicsBody3D] or a [GridMap] "
+"instance. While GridMaps are not physics body themselves, they register their "
+"tiles with collision shapes as a virtual physics body."
+msgstr ""
+"Возвращает [code]true[/code], если заданное физическое тело пересекает или "
+"перекрывает это [Area3D], [code]false[/code] в противном случае.\n"
+"[b]Примечание:[/b] Результат этого теста не появляется немедленно после "
+"перемещения объектов. Для производительности список перекрытий обновляется "
+"один раз за кадр и перед шагом физики. Рассмотрите возможность использования "
+"сигналов вместо этого.\n"
+"Аргумент [param body] может быть либо экземпляром [PhysicsBody3D], либо "
+"[GridMap]. Хотя GridMaps сами по себе не являются физическими телами, они "
+"регистрируют свои плитки с формами столкновений как виртуальные физические "
+"тела."
+
+msgid ""
+"The rate at which objects stop spinning in this area. Represents the angular "
+"velocity lost per second.\n"
+"See [member ProjectSettings.physics/3d/default_angular_damp] for more details "
+"about damping."
+msgstr ""
+"Скорость, с которой объекты прекращают вращаться в этой области. Представляет "
+"угловую скорость, потерянную в секунду.\n"
+"Подробнее о затухании см. [member ProjectSettings.physics/3d/"
+"default_angular_damp]."
+
+msgid ""
+"The area's gravity intensity (in meters per second squared). This value "
+"multiplies the gravity direction. This is useful to alter the force of "
+"gravity without altering its direction."
+msgstr ""
+"Интенсивность гравитации области (в метрах в секунду в квадрате). Это "
+"значение умножает направление гравитации. Это полезно для изменения силы "
+"гравитации без изменения ее направления."
+
+msgid ""
+"The distance at which the gravity strength is equal to [member gravity]. For "
+"example, on a planet 100 meters in radius with a surface gravity of 4.0 m/s², "
+"set the [member gravity] to 4.0 and the unit distance to 100.0. The gravity "
+"will have falloff according to the inverse square law, so in the example, at "
+"200 meters from the center the gravity will be 1.0 m/s² (twice the distance, "
+"1/4th the gravity), at 50 meters it will be 16.0 m/s² (half the distance, 4x "
+"the gravity), and so on.\n"
+"The above is true only when the unit distance is a positive number. When this "
+"is set to 0.0, the gravity will be constant regardless of distance."
+msgstr ""
+"Расстояние, на котором сила гравитации равна [силе гравитации члена]. "
+"Например, на планете радиусом 100 метров с поверхностной силой гравитации 4,0 "
+"м/с² установите [силу гравитации члена] на 4,0, а единичное расстояние на "
+"100,0. Сила гравитации будет падать в соответствии с законом обратных "
+"квадратов, поэтому в этом примере на расстоянии 200 метров от центра сила "
+"гравитации составит 1,0 м/с² (в два раза больше расстояния, 1/4 силы "
+"гравитации), на расстоянии 50 метров она составит 16,0 м/с² (в два раза "
+"больше расстояния, 4x силы гравитации) и т. д. \n"
+"Вышесказанное верно только тогда, когда единичное расстояние является "
+"положительным числом. Если оно установлено на 0,0, сила гравитации будет "
+"постоянной независимо от расстояния."
+
+msgid ""
+"The rate at which objects stop moving in this area. Represents the linear "
+"velocity lost per second.\n"
+"See [member ProjectSettings.physics/3d/default_linear_damp] for more details "
+"about damping."
+msgstr ""
+"Скорость, с которой объекты прекращают движение в этой области. Представляет "
+"собой потерю линейной скорости в секунду.\n"
+"Подробнее о затухании см. [member ProjectSettings.physics/3d/"
+"default_linear_damp]."
+
+msgid ""
+"The area's priority. Higher priority areas are processed first. The "
+"[World3D]'s physics is always processed last, after all areas."
+msgstr ""
+"Приоритет области. Области с более высоким приоритетом обрабатываются в "
+"первую очередь. Физика [World3D] всегда обрабатывается в последнюю очередь, "
+"после всех областей."
+
+msgid ""
+"The degree to which this area applies reverb to its associated audio. Ranges "
+"from [code]0[/code] to [code]1[/code] with [code]0.1[/code] precision."
+msgstr ""
+"Степень, в которой эта область применяет реверберацию к связанному с ней "
+"аудио. Диапазон от [code]0[/code] до [code]1[/code] с точностью [code]0.1[/"
+"code]."
+
+msgid "If [code]true[/code], the area applies reverb to its associated audio."
+msgstr ""
+"Если [code]true[/code], область применяет реверберацию (reverb) к связанному "
+"с ней звуку."
+
+msgid "The name of the reverb bus to use for this area's associated audio."
+msgstr ""
+"Имя шины реверберации, используемой для звука, связанного с этой областью."
+
+msgid ""
+"The degree to which this area's reverb is a uniform effect. Ranges from "
+"[code]0[/code] to [code]1[/code] with [code]0.1[/code] precision."
+msgstr ""
+"Степень, в которой реверберация этой области является равномерным эффектом. "
+"Диапазон от [code]0[/code] до [code]1[/code] с точностью [code]0.1[/code]."
+
+msgid ""
+"The exponential rate at which wind force decreases with distance from its "
+"origin.\n"
+"[b]Note:[/b] This wind force only applies to [SoftBody3D] nodes. Other "
+"physics bodies are currently not affected by wind."
+msgstr ""
+"Экспоненциальная скорость, с которой сила ветра уменьшается с расстоянием от "
+"ее источника.\n"
+"[b]Примечание:[/b] Эта сила ветра применяется только к узлам [SoftBody3D]. "
+"Другие физические тела в настоящее время не подвержены влиянию ветра."
+
+msgid ""
+"The magnitude of area-specific wind force.\n"
+"[b]Note:[/b] This wind force only applies to [SoftBody3D] nodes. Other "
+"physics bodies are currently not affected by wind."
+msgstr ""
+"Величина силы ветра, специфичной для данной области.\n"
+"[b]Примечание:[/b] Эта сила ветра применяется только к узлам [SoftBody3D]. "
+"Другие физические тела в настоящее время не подвержены влиянию ветра."
+
+msgid ""
+"The [Node3D] which is used to specify the direction and origin of an area-"
+"specific wind force. The direction is opposite to the z-axis of the "
+"[Node3D]'s local transform, and its origin is the origin of the [Node3D]'s "
+"local transform.\n"
+"[b]Note:[/b] This wind force only applies to [SoftBody3D] nodes. Other "
+"physics bodies are currently not affected by wind."
+msgstr ""
+"[Node3D], который используется для указания направления и источника силы "
+"ветра, специфичной для области. Направление противоположно оси z локального "
+"преобразования [Node3D], а его источник является источником локального "
+"преобразования [Node3D].\n"
+"[b]Примечание:[/b] Эта сила ветра применяется только к узлам [SoftBody3D]. "
+"Другие физические тела в настоящее время не подвержены влиянию ветра."
+
+msgid ""
+"Emitted when a [Shape3D] of the received [param area] enters a shape of this "
+"area. Requires [member monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param area_shape_index] contain indices of the "
+"interacting shapes from this area and the other area, respectively. [param "
+"area_rid] contains the [RID] of the other area. These values can be used with "
+"the [PhysicsServer3D].\n"
+"[b]Example:[/b] Get the [CollisionShape3D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Выдается, когда [Shape3D] полученного [param area] входит в форму этой "
+"области. Требует, чтобы [member monitoring] был установлен в [code]true[/"
+"code].\n"
+"[param local_shape_index] и [param area_shape_index] содержат индексы "
+"взаимодействующих фигур из этой области и другой области соответственно. "
+"[param area_rid] содержит [RID] другой области. Эти значения можно "
+"использовать с [PhysicsServer3D].\n"
+"[b]Пример:[/b] Получить узел [CollisionShape3D] из индекса формы:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var other_shape_owner = area.shape_find_owner(area_shape_index)\n"
+"var other_shape_node = area.shape_owner_get_owner(other_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Emitted when a [Shape3D] of the received [param area] exits a shape of this "
+"area. Requires [member monitoring] to be set to [code]true[/code].\n"
+"See also [signal area_shape_entered]."
+msgstr ""
+"Выдается, когда [Shape3D] полученной [param area] выходит из формы этой "
+"области. Требует, чтобы [member monitoring] был установлен на [code]true[/"
+"code].\n"
+"См. также [signal area_shape_entered]."
+
+msgid ""
+"Emitted when the received [param body] enters this area. [param body] can be "
+"a [PhysicsBody3D] or a [GridMap]. [GridMap]s are detected if their "
+"[MeshLibrary] has collision shapes configured. Requires [member monitoring] "
+"to be set to [code]true[/code]."
+msgstr ""
+"Вызывается, когда полученное [param body] попадает в эту область. [param "
+"body] может быть [PhysicsBody3D] или [GridMap]. [GridMap] обнаруживаются, "
+"если в их [MeshLibrary] настроены формы столкновений. Требуется, чтобы "
+"[member monitoring] был установлен на [code]true[/code]."
+
+msgid ""
+"Emitted when the received [param body] exits this area. [param body] can be a "
+"[PhysicsBody3D] or a [GridMap]. [GridMap]s are detected if their "
+"[MeshLibrary] has collision shapes configured. Requires [member monitoring] "
+"to be set to [code]true[/code]."
+msgstr ""
+"Вызывается, когда полученное [param body] покидает эту область. [param body] "
+"может быть [PhysicsBody3D] или [GridMap]. [GridMap] обнаруживаются, если в их "
+"[MeshLibrary] настроены формы столкновений. Требуется, чтобы [member "
+"monitoring] был установлен на [code]true[/code]."
+
+msgid ""
+"Emitted when a [Shape3D] of the received [param body] enters a shape of this "
+"area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are "
+"detected if their [MeshLibrary] has collision shapes configured. Requires "
+"[member monitoring] to be set to [code]true[/code].\n"
+"[param local_shape_index] and [param body_shape_index] contain indices of the "
+"interacting shapes from this area and the interacting body, respectively. "
+"[param body_rid] contains the [RID] of the body. These values can be used "
+"with the [PhysicsServer3D].\n"
+"[b]Example:[/b] Get the [CollisionShape3D] node from the shape index:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Выдается, когда [Shape3D] полученного [param body] входит в форму этой "
+"области. [param body] может быть [PhysicsBody3D] или [GridMap]. [GridMap] "
+"обнаруживаются, если в их [MeshLibrary] настроены формы столкновений. "
+"Требует, чтобы [member monitoring] был установлен на [code]true[/code].\n"
+"[param local_shape_index] и [param body_shape_index] содержат индексы "
+"взаимодействующих форм из этой области и взаимодействующего тела "
+"соответственно. [param body_rid] содержит [RID] тела. Эти значения можно "
+"использовать с [PhysicsServer3D].\n"
+"[b]Пример:[/b] Получите узел [CollisionShape3D] из индекса формы:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var body_shape_owner = body.shape_find_owner(body_shape_index)\n"
+"var body_shape_node = body.shape_owner_get_owner(body_shape_owner)\n"
+"\n"
+"var local_shape_owner = shape_find_owner(local_shape_index)\n"
+"var local_shape_node = shape_owner_get_owner(local_shape_owner)\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Emitted when a [Shape3D] of the received [param body] exits a shape of this "
+"area. [param body] can be a [PhysicsBody3D] or a [GridMap]. [GridMap]s are "
+"detected if their [MeshLibrary] has collision shapes configured. Requires "
+"[member monitoring] to be set to [code]true[/code].\n"
+"See also [signal body_shape_entered]."
+msgstr ""
+"Выдается, когда [Shape3D] полученного [param body] выходит из формы этой "
+"области. [param body] может быть [PhysicsBody3D] или [GridMap]. [GridMap] "
+"обнаруживаются, если в их [MeshLibrary] настроены формы столкновений. "
+"Требуется, чтобы [member monitoring] был установлен на [code]true[/code].\n"
+"См. также [signal body_shape_entered]."
+
+msgid "A built-in data structure that holds a sequence of elements."
+msgstr "Встроенная структура данных, содержащая последовательность элементов."
+
+msgid ""
+"Creates a typed array from the [param base] array. A typed array can only "
+"contain elements of the given type, or that inherit from the given class, as "
+"described by this constructor's parameters:\n"
+"- [param type] is the built-in [Variant] type, as one the [enum Variant.Type] "
+"constants.\n"
+"- [param class_name] is the built-in class name (see [method Object."
+"get_class]).\n"
+"- [param script] is the associated script. It must be a [Script] instance or "
+"[code]null[/code].\n"
+"If [param type] is not [constant TYPE_OBJECT], [param class_name] must be an "
+"empty [StringName] and [param script] must be [code]null[/code].\n"
+"[codeblock]\n"
+"class_name Sword\n"
+"extends Node\n"
+"\n"
+"class Stats:\n"
+"    pass\n"
+"\n"
+"func _ready():\n"
+"    var a = Array([], TYPE_INT, \"\", null)               # Array[int]\n"
+"    var b = Array([], TYPE_OBJECT, \"Node\", null)        # Array[Node]\n"
+"    var c = Array([], TYPE_OBJECT, \"Node\", Sword)       # Array[Sword]\n"
+"    var d = Array([], TYPE_OBJECT, \"RefCounted\", Stats) # Array[Stats]\n"
+"[/codeblock]\n"
+"The [param base] array's elements are converted when necessary. If this is "
+"not possible or [param base] is already typed, this constructor fails and "
+"returns an empty [Array].\n"
+"In GDScript, this constructor is usually not necessary, as it is possible to "
+"create a typed array through static typing:\n"
+"[codeblock]\n"
+"var numbers: Array[float] = []\n"
+"var children: Array[Node] = [$Node, $Sprite2D, $RigidBody3D]\n"
+"\n"
+"var integers: Array[int] = [0.2, 4.5, -2.0]\n"
+"print(integers) # Prints [0, 4, -2]\n"
+"[/codeblock]"
+msgstr ""
+"Создает типизированный массив из массива [param base]. Типизированный массив "
+"может содержать только элементы заданного типа или те, которые наследуются от "
+"заданного класса, как описано в параметрах этого конструктора:\n"
+"- [param type] — встроенный тип [Variant], как одна из констант [enum Variant."
+"Type].\n"
+"- [param class_name] — имя встроенного класса (см. [method Object."
+"get_class]).\n"
+"- [param script] — связанный скрипт. Он должен быть экземпляром [Script] или "
+"[code]null[/code].\n"
+"Если [param type] не является [constant TYPE_OBJECT], [param class_name] "
+"должен быть пустым [StringName], а [param script] должен быть [code]null[/"
+"code].\n"
+"[codeblock]\n"
+"class_name Sword\n"
+"extends Node\n"
+"\n"
+"class Stats:\n"
+"    pass\n"
+"\n"
+"func _ready():\n"
+"    var a = Array([], TYPE_INT, \"\", null)               # Array[int]\n"
+"    var b = Array([], TYPE_OBJECT, \"Node\", null)        # Array[Node]\n"
+"    var c = Array([], TYPE_OBJECT, \"Node\", Sword)       # Array[Sword]\n"
+"    var d = Array([], TYPE_OBJECT, \"RefCounted\", Stats) # Array[Stats]\n"
+"[/codeblock]\n"
+"Элементы массива [param base] преобразуются при необходимости. Если это "
+"невозможно или [param base] уже типизирован, этот конструктор завершается "
+"ошибкой и возвращает пустой [Array].\n"
+"В GDScript этот конструктор обычно не нужен, так как можно создать "
+"типизированный массив посредством статической типизации:\n"
+"[codeblock]\n"
+"var numbers: Array[float] = []\n"
+"var children: Array[Node] = [$Node, $Sprite2D, $RigidBody3D]\n"
+"\n"
+"var integers: Array[int] = [0.2, 4.5, -2.0]\n"
+"print(integers) # Prints [0, 4, -2]\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the same array as [param from]. If you need a copy of the array, use "
+"[method duplicate]."
+msgstr ""
+"Возвращает тот же массив, что и [param from]. Если вам нужна копия массива, "
+"используйте [method duplicate]."
+
+msgid ""
+"Calls the given [Callable] on each element in the array and returns "
+"[code]true[/code] if the [Callable] returns [code]true[/code] for [i]all[/i] "
+"elements in the array. If the [Callable] returns [code]false[/code] for one "
+"array element or more, this method returns [code]false[/code].\n"
+"The [param method] should take one [Variant] parameter (the current array "
+"element) and return a [bool].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].all(greater_than_5)) # Prints true (3/3 elements "
+"evaluate to true).\n"
+"    print([4, 10, 4].all(greater_than_5)) # Prints false (1/3 elements "
+"evaluate to true).\n"
+"    print([4, 4, 4].all(greater_than_5))  # Prints false (0/3 elements "
+"evaluate to true).\n"
+"    print([].all(greater_than_5))         # Prints true (0/0 elements "
+"evaluate to true).\n"
+"\n"
+"    # Same as the first line above, but using a lambda function.\n"
+"    print([6, 10, 6].all(func(element): return element > 5)) # Prints true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private static bool GreaterThan5(int number)\n"
+"{\n"
+"    return number > 5;\n"
+"}\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Prints True (3/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }."
+"All(GreaterThan5));\n"
+"    // Prints False (1/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 10, 4 }."
+"All(GreaterThan5));\n"
+"    // Prints False (0/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 4, 4 }."
+"All(GreaterThan5));\n"
+"    // Prints True (0/0 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { }.All(GreaterThan5));\n"
+"\n"
+"    // Same as the first line above, but using a lambda function.\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }.All(element => "
+"element > 5)); // Prints True\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method any], [method filter], [method map] and [method reduce].\n"
+"[b]Note:[/b] Unlike relying on the size of an array returned by [method "
+"filter], this method will return as early as possible to improve performance "
+"(especially with large arrays).\n"
+"[b]Note:[/b] For an empty array, this method [url=https://en.wikipedia.org/"
+"wiki/Vacuous_truth]always[/url] returns [code]true[/code]."
+msgstr ""
+"Вызывает заданный [Callable] для каждого элемента массива и возвращает "
+"[code]true[/code], если [Callable] возвращает [code]true[/code] для [i]всех[/"
+"i] элементов массива. Если [Callable] возвращает [code]false[/code] для "
+"одного элемента массива или более, этот метод возвращает [code]false[/code].\n"
+"Метод [param] должен принимать один параметр [Variant] (текущий элемент "
+"массива) и возвращать [bool].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].all(greater_than_5)) # Prints true (3/3 элементы "
+"оцениваются как true).\n"
+"    print([4, 10, 4].all(greater_than_5)) # Prints false (1/3 элементы "
+"оцениваются как true).\n"
+"    print([4, 4, 4].all(greater_than_5))  # Prints false (0/3 элементы "
+"оцениваются как true).\n"
+"    print([].all(greater_than_5))         # Prints true (0/0 элементы "
+"оцениваются как true).\n"
+"\n"
+"    # То же, что и в первой строке выше, но с использованием лямбда-функции.\n"
+"    print([6, 10, 6].all(func(element): return element > 5)) # Prints true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"private static bool GreaterThan5(int number)\n"
+"{\n"
+"    return number > 5;\n"
+"}\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Prints True (3/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }."
+"All(GreaterThan5));\n"
+"    // Prints False (1/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 10, 4 }."
+"All(GreaterThan5));\n"
+"    // Prints False (0/3 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { 4, 4, 4 }."
+"All(GreaterThan5));\n"
+"    // Prints True (0/0 elements evaluate to true).\n"
+"    GD.Print(new Godot.Collections.Array>int< { }.All(GreaterThan5));\n"
+"\n"
+"    // То же, что и в первой строке выше, но с использованием лямбда-"
+"функции.\n"
+"    GD.Print(new Godot.Collections.Array>int< { 6, 10, 6 }.All(element => "
+"element > 5)); // Prints True\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"См. также [method any], [method filter], [method map] и [method reduce].\n"
+"[b]Примечание:[/b] В отличие от использования размера массива, возвращаемого "
+"[method filter], этот метод вернет управление как можно раньше, чтобы "
+"повысить производительность (особенно с большими массивами).\n"
+"[b]Примечание:[/b] Для пустого массива этот метод [url=https://en.wikipedia."
+"org/wiki/Vacuous_truth]всегда[/url] возвращает [code]true[/code]."
+
+msgid ""
+"Calls the given [Callable] on each element in the array and returns "
+"[code]true[/code] if the [Callable] returns [code]true[/code] for [i]one or "
+"more[/i] elements in the array. If the [Callable] returns [code]false[/code] "
+"for all elements in the array, this method returns [code]false[/code].\n"
+"The [param method] should take one [Variant] parameter (the current array "
+"element) and return a [bool].\n"
+"[codeblock]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].any(greater_than_5)) # Prints true (3 elements evaluate "
+"to true).\n"
+"    print([4, 10, 4].any(greater_than_5)) # Prints true (1 elements evaluate "
+"to true).\n"
+"    print([4, 4, 4].any(greater_than_5))  # Prints false (0 elements evaluate "
+"to true).\n"
+"    print([].any(greater_than_5))         # Prints false (0 elements evaluate "
+"to true).\n"
+"\n"
+"    # Same as the first line above, but using a lambda function.\n"
+"    print([6, 10, 6].any(func(number): return number > 5)) # Prints true\n"
+"[/codeblock]\n"
+"See also [method all], [method filter], [method map] and [method reduce].\n"
+"[b]Note:[/b] Unlike relying on the size of an array returned by [method "
+"filter], this method will return as early as possible to improve performance "
+"(especially with large arrays).\n"
+"[b]Note:[/b] For an empty array, this method always returns [code]false[/"
+"code]."
+msgstr ""
+"Вызывает заданный [Callable] для каждого элемента в массиве и возвращает "
+"[code]true[/code], если [Callable] возвращает [code]true[/code] для [i]одного "
+"или более[/i] элементов в массиве. Если [Callable] возвращает [code]false[/"
+"code] для всех элементов в массиве, этот метод возвращает [code]false[/"
+"code].\n"
+"Метод [param] должен принимать один параметр [Variant] (текущий элемент "
+"массива) и возвращать [bool].\n"
+"[codeblock]\n"
+"func greater_than_5(number):\n"
+"    return number > 5\n"
+"\n"
+"func _ready():\n"
+"    print([6, 10, 6].any(greater_than_5)) # Prints true (3 элементы "
+"оцениваются как true).\n"
+"    print([4, 10, 4].any(greater_than_5)) # Prints true (1 элементы "
+"оцениваются как true).\n"
+"    print([4, 4, 4].any(greater_than_5))  # Prints false (0 элементы "
+"оцениваются как true).\n"
+"    print([].any(greater_than_5))         # Prints false (0 элементы "
+"оцениваются как true).\n"
+"\n"
+"    # То же, что и в первой строке выше, но с использованием лямбда-функции.\n"
+"    print([6, 10, 6].any(func(number): return number > 5)) # Prints true\n"
+"[/codeblock]\n"
+"См. также [method all], [method filter], [method map] и [method reduce].\n"
+"[b]Примечание:[/b] В отличие от использования размера массива, возвращаемого "
+"[method filter], этот метод вернет управление как можно раньше, чтобы "
+"повысить производительность (особенно с большими массивами).\n"
+"[b]Примечание:[/b] Для пустого массива этот метод всегда возвращает "
+"[code]false[/code]."
+
+msgid ""
+"Appends another [param array] at the end of this array.\n"
+"[codeblock]\n"
+"var numbers = [1, 2, 3]\n"
+"var extra = [4, 5, 6]\n"
+"numbers.append_array(extra)\n"
+"print(numbers) # Prints [1, 2, 3, 4, 5, 6]\n"
+"[/codeblock]"
+msgstr ""
+"Добавляет еще один [param array] в конец этого массива.\n"
+"[codeblock]\n"
+"var numbers = [1, 2, 3]\n"
+"var extra = [4, 5, 6]\n"
+"numbers.append_array(extra)\n"
+"print(numbers) # Prints [1, 2, 3, 4, 5, 6]\n"
+"[/codeblock]"
+
+msgid ""
+"Assigns elements of another [param array] into the array. Resizes the array "
+"to match [param array]. Performs type conversions if the array is typed."
+msgstr ""
+"Назначает элементы другого [param array] в массив. Изменяет размер массива "
+"для соответствия [param array]. Выполняет преобразования типов, если массив "
+"типизирован."
+
+msgid ""
+"Returns the last element of the array. If the array is empty, fails and "
+"returns [code]null[/code]. See also [method front].\n"
+"[b]Note:[/b] Unlike with the [code][][/code] operator ([code]array[-1][/"
+"code]), an error is generated without stopping project execution."
+msgstr ""
+"Возвращает последний элемент массива. Если массив пуст, происходит сбой и "
+"возвращается [code]null[/code]. См. также [method front].\n"
+"[b]Примечание:[/b] В отличие от оператора [code][][/code] ([code]array[-1][/"
+"code]), ошибка генерируется без остановки выполнения проекта."
+
+msgid ""
+"Returns the index of [param value] in the sorted array. If it cannot be "
+"found, returns where [param value] should be inserted to keep the array "
+"sorted. The algorithm used is [url=https://en.wikipedia.org/wiki/"
+"Binary_search_algorithm]binary search[/url].\n"
+"If [param before] is [code]true[/code] (as by default), the returned index "
+"comes before all existing elements equal to [param value] in the array.\n"
+"[codeblock]\n"
+"var numbers = [2, 4, 8, 10]\n"
+"var idx = numbers.bsearch(7)\n"
+"\n"
+"numbers.insert(idx, 7)\n"
+"print(numbers) # Prints [2, 4, 7, 8, 10]\n"
+"\n"
+"var fruits = [\"Apple\", \"Lemon\", \"Lemon\", \"Orange\"]\n"
+"print(fruits.bsearch(\"Lemon\", true))  # Prints 1, points at the first "
+"\"Lemon\".\n"
+"print(fruits.bsearch(\"Lemon\", false)) # Prints 3, points at \"Orange\".\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Calling [method bsearch] on an [i]unsorted[/i] array will result "
+"in unexpected behavior. Use [method sort] before calling this method."
+msgstr ""
+"Возвращает индекс [param value] в отсортированном массиве. Если его не "
+"удается найти, возвращает место, где следует вставить [param value], чтобы "
+"сохранить массив отсортированным. Используемый алгоритм — [url=https://en."
+"wikipedia.org/wiki/Binary_search_algorithm]бинарный поиск[/url].\n"
+"Если [param before] равен [code]true[/code] (как по умолчанию), возвращаемый "
+"индекс предшествует всем существующим элементам, равным [param value] в "
+"массиве.\n"
+"[codeblock]\n"
+"var numbers = [2, 4, 8, 10]\n"
+"var idx = numbers.bsearch(7)\n"
+"\n"
+"numbers.insert(idx, 7)\n"
+"print(numbers) # Prints [2, 4, 7, 8, 10]\n"
+"\n"
+"var fruits = [\"Apple\", \"Lemon\", \"Lemon\", \"Orange\"]\n"
+"print(fruits.bsearch(\"Lemon\", true))  # Prints 1, points at the first "
+"\"Lemon\".\n"
+"print(fruits.bsearch(\"Lemon\", false)) # Prints 3, points at \"Orange\".\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Вызов [метода bsearch] для [i]unsorted (несортированного)[/"
+"i] массива приведет к неожиданному поведению. Используйте [method sort] перед "
+"вызовом этого метода."
+
+msgid ""
+"Returns the index of [param value] in the sorted array. If it cannot be "
+"found, returns where [param value] should be inserted to keep the array "
+"sorted (using [param func] for the comparisons). The algorithm used is "
+"[url=https://en.wikipedia.org/wiki/Binary_search_algorithm]binary search[/"
+"url].\n"
+"Similar to [method sort_custom], [param func] is called as many times as "
+"necessary, receiving one array element and [param value] as arguments. The "
+"function should return [code]true[/code] if the array element should be "
+"[i]behind[/i] [param value], otherwise it should return [code]false[/code].\n"
+"If [param before] is [code]true[/code] (as by default), the returned index "
+"comes before all existing elements equal to [param value] in the array.\n"
+"[codeblock]\n"
+"func sort_by_amount(a, b):\n"
+"    if a[1] < b[1]:\n"
+"        return true\n"
+"    return false\n"
+"\n"
+"func _ready():\n"
+"    var my_items = [[\"Tomato\", 2], [\"Kiwi\", 5], [\"Rice\", 9]]\n"
+"\n"
+"    var apple = [\"Apple\", 5]\n"
+"    # \"Apple\" is inserted before \"Kiwi\".\n"
+"    my_items.insert(my_items.bsearch_custom(apple, sort_by_amount, true), "
+"apple)\n"
+"\n"
+"    var banana = [\"Banana\", 5]\n"
+"    # \"Banana\" is inserted after \"Kiwi\".\n"
+"    my_items.insert(my_items.bsearch_custom(banana, sort_by_amount, false), "
+"banana)\n"
+"\n"
+"    # Prints [[\"Tomato\", 2], [\"Apple\", 5], [\"Kiwi\", 5], [\"Banana\", "
+"5], [\"Rice\", 9]]\n"
+"    print(my_items)\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Calling [method bsearch_custom] on an [i]unsorted[/i] array will "
+"result in unexpected behavior. Use [method sort_custom] with [param func] "
+"before calling this method."
+msgstr ""
+"Возвращает индекс [param value] в отсортированном массиве. Если его не "
+"удается найти, возвращает, куда следует вставить [param value], чтобы "
+"сохранить массив отсортированным (используя [param func] для сравнений). "
+"Используемый алгоритм — [url=https://en.wikipedia.org/wiki/"
+"Binary_search_algorithm]бинарный поиск[/url].\n"
+"Подобно [method sort_custom], [param func] вызывается столько раз, сколько "
+"необходимо, получая один элемент массива и [param value] в качестве "
+"аргументов. Функция должна возвращать [code]true[/code], если элемент массива "
+"должен быть [i]behind (позади)[/i] [param value], в противном случае она "
+"должна возвращать [code]false[/code].\n"
+"Если [param before] равен [code]true[/code] (как по умолчанию), возвращаемый "
+"индекс предшествует всем существующим элементам, равным [param value] в "
+"массиве.\n"
+"[codeblock]\n"
+"func sort_by_amount(a, b):\n"
+"    if a[1] < b[1]:\n"
+"        return true\n"
+"    return false\n"
+"\n"
+"func _ready():\n"
+"    var my_items = [[\"Tomato\", 2], [\"Kiwi\", 5], [\"Rice\", 9]]\n"
+"\n"
+"    var apple = [\"Apple\", 5]\n"
+"    # \"Apple\" is inserted before \"Kiwi\".\n"
+"    my_items.insert(my_items.bsearch_custom(apple, sort_by_amount, true), "
+"apple)\n"
+"\n"
+"    var banana = [\"Banana\", 5]\n"
+"    # \"Banana\" is inserted after \"Kiwi\".\n"
+"    my_items.insert(my_items.bsearch_custom(banana, sort_by_amount, false), "
+"banana)\n"
+"\n"
+"    # Prints [[\"Tomato\", 2], [\"Apple\", 5], [\"Kiwi\", 5], [\"Banana\", "
+"5], [\"Rice\", 9]]\n"
+"    print(my_items)\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Вызов [method bsearch_custom] для [i]несортированного[/i] "
+"массива приведет к неожиданному поведению. Используйте [method sort_custom] с "
+"[param func] перед вызовом этого метода."
+
+msgid ""
+"Returns the number of times an element is in the array.\n"
+"To count how many elements in an array satisfy a condition, see [method "
+"reduce]."
+msgstr ""
+"Возвращает количество раз, когда элемент встречается в массиве.\n"
+"Чтобы подсчитать, сколько элементов в массиве удовлетворяют условию, см. "
+"[метод reduce]."
+
+msgid ""
+"Returns a new copy of the array.\n"
+"By default, a [b]shallow[/b] copy is returned: all nested [Array] and "
+"[Dictionary] elements are shared with the original array. Modifying them in "
+"one array will also affect them in the other.[br]If [param deep] is "
+"[code]true[/code], a [b]deep[/b] copy is returned: all nested arrays and "
+"dictionaries are also duplicated (recursively)."
+msgstr ""
+"Возвращает новую копию массива.\n"
+"По умолчанию возвращается [b]поверхностная[/b] копия: все вложенные элементы "
+"[Array] и [Dictionary] являются общими с исходным массивом. Изменение их в "
+"одном массиве также повлияет на них в другом.[br]Если [param deep] равен "
+"[code]true[/code], возвращается [b]глубокая[/b] копия: все вложенные массивы "
+"и словари также дублируются (рекурсивно)."
+
+msgid ""
+"Finds and removes the first occurrence of [param value] from the array. If "
+"[param value] does not exist in the array, nothing happens. To remove an "
+"element by index, use [method remove_at] instead.\n"
+"[b]Note:[/b] This method shifts every element's index after the removed "
+"[param value] back, which may have a noticeable performance cost, especially "
+"on larger arrays.\n"
+"[b]Note:[/b] Erasing elements while iterating over arrays is [b]not[/b] "
+"supported and will result in unpredictable behavior."
+msgstr ""
+"Находит и удаляет первое вхождение [param value] из массива. Если [param "
+"value] отсутствует в массиве, ничего не происходит. Чтобы удалить элемент по "
+"индексу, используйте [method remove_at].\n"
+"[b]Примечание:[/b] Этот метод сдвигает индекс каждого элемента после "
+"удаленного [param value] назад, что может иметь заметные издержки "
+"производительности, особенно для больших массивов.\n"
+"[b]Примечание:[/b] Удаление элементов при итерации по массивам [b]не[/b] "
+"поддерживается и приведет к непредсказуемому поведению."
+
+msgid ""
+"Assigns the given [param value] to all elements in the array.\n"
+"This method can often be combined with [method resize] to create an array "
+"with a given size and initialized elements:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = []\n"
+"array.resize(5)\n"
+"array.fill(2)\n"
+"print(array) # Prints [2, 2, 2, 2, 2]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [];\n"
+"array.Resize(5);\n"
+"array.Fill(2);\n"
+"GD.Print(array); // Prints [2, 2, 2, 2, 2]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If [param value] is a [Variant] passed by reference ([Object]-"
+"derived, [Array], [Dictionary], etc.), the array will be filled with "
+"references to the same [param value], which are not duplicates."
+msgstr ""
+"Назначает заданное [значение параметра] всем элементам массива. \n"
+"Этот метод часто можно комбинировать с [методом resize] для создания массива "
+"с заданным размером и инициализированными элементами:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array = []\n"
+"array.resize(5)\n"
+"array.fill(2)\n"
+"print(array) # Prints [2, 2, 2, 2, 2]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [];\n"
+"array.Resize(5);\n"
+"array.Fill(2);\n"
+"GD.Print(array); // Prints [2, 2, 2, 2, 2]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Если [значение параметра] является [Вариантом], переданным "
+"по ссылке (производным от [Объекта], [Массив], [Словарь] и т. д.), массив "
+"будет заполнен ссылками на одно и то же [значение параметра], которые не "
+"являются дубликатами."
+
+msgid ""
+"Calls the given [Callable] on each element in the array and returns a new, "
+"filtered [Array].\n"
+"The [param method] receives one of the array elements as an argument, and "
+"should return [code]true[/code] to add the element to the filtered array, or "
+"[code]false[/code] to exclude it.\n"
+"[codeblock]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    print([1, 4, 5, 8].filter(is_even)) # Prints [4, 8]\n"
+"\n"
+"    # Same as above, but using a lambda function.\n"
+"    print([1, 4, 5, 8].filter(func(number): return number % 2 == 0))\n"
+"[/codeblock]\n"
+"See also [method any], [method all], [method map] and [method reduce]."
+msgstr ""
+"Вызывает заданный [Callable] для каждого элемента в массиве и возвращает "
+"новый, отфильтрованный [Array].\n"
+"Метод [param] получает один из элементов массива в качестве аргумента и "
+"должен возвращать [code]true[/code] для добавления элемента в отфильтрованный "
+"массив или [code]false[/code] для его исключения.\n"
+"[codeblock]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    print([1, 4, 5, 8].filter(is_even)) # Prints [4, 8]\n"
+"\n"
+"    # Same as above, but using a lambda function.\n"
+"    print([1, 4, 5, 8].filter(func(number): return number % 2 == 0))\n"
+"[/codeblock]\n"
+"См. также [метод any], [метод all], [метод map] и [метод reduce]."
+
+msgid ""
+"Returns the index of the [b]first[/b] occurrence of [param what] in this "
+"array, or [code]-1[/code] if there are none. The search's start can be "
+"specified with [param from], continuing to the end of the array.\n"
+"[b]Note:[/b] If you just want to know whether the array contains [param "
+"what], use [method has] ([code]Contains[/code] in C#). In GDScript, you may "
+"also use the [code]in[/code] operator.\n"
+"[b]Note:[/b] For performance reasons, the search is affected by [param "
+"what]'s [enum Variant.Type]. For example, [code]7[/code] ([int]) and "
+"[code]7.0[/code] ([float]) are not considered equal for this method."
+msgstr ""
+"Возвращает индекс [b]first (первого)[/b] вхождения [param what] в этом "
+"массиве или [code]-1[/code], если их нет. Начало поиска можно указать с "
+"помощью [param from], продолжая до конца массива.\n"
+"[b]Примечание:[/b] Если вы просто хотите узнать, содержит ли массив [param "
+"what], используйте [method has] ([code]Contains[/code] в C#). В GDScript вы "
+"также можете использовать оператор [code]in[/code].\n"
+"[b]Примечание:[/b] Из соображений производительности на поиск влияет [enum "
+"Variant.Type] [param what]. Например, [code]7[/code] ([int]) и [code]7.0[/"
+"code] ([float]) не считаются равными для этого метода."
+
+msgid ""
+"Returns the index of the [b]first[/b] element in the array that causes [param "
+"method] to return [code]true[/code], or [code]-1[/code] if there are none. "
+"The search's start can be specified with [param from], continuing to the end "
+"of the array.\n"
+"[param method] is a callable that takes an element of the array, and returns "
+"a [bool].\n"
+"[b]Note:[/b] If you just want to know whether the array contains [i]anything[/"
+"i] that satisfies [param method], use [method any].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    print([1, 3, 4, 7].find_custom(is_even.bind())) # Prints 2\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает индекс [b]первого[/b] элемента в массиве, который заставляет "
+"[param method] вернуть [code]true[/code] или [code]-1[/code], если их нет. "
+"Начало поиска можно указать с помощью [param from], продолжая до конца "
+"массива.\n"
+"[param method] — это вызываемый объект, который принимает элемент массива и "
+"возвращает [bool].\n"
+"[b]Примечание:[/b] Если вы просто хотите узнать, содержит ли массив [i]что-"
+"либо[/i], удовлетворяющее [param method], используйте [method any].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    print([1, 3, 4, 7].find_custom(is_even.bind())) # Prints 2\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the built-in [Variant] type of the typed array as a [enum Variant."
+"Type] constant. If the array is not typed, returns [constant TYPE_NIL]. See "
+"also [method is_typed]."
+msgstr ""
+"Возвращает встроенный тип [Variant] типизированного массива как константу "
+"[enum Variant.Type]. Если массив не типизирован, возвращает [константу "
+"TYPE_NIL]. См. также [метод is_typed]."
+
+msgid ""
+"Returns the [b]built-in[/b] class name of the typed array, if the built-in "
+"[Variant] type [constant TYPE_OBJECT]. Otherwise, returns an empty "
+"[StringName]. See also [method is_typed] and [method Object.get_class]."
+msgstr ""
+"Возвращает [b]встроенное[/b] имя класса типизированного массива, если "
+"встроенный [Variant] тип [константа TYPE_OBJECT]. В противном случае "
+"возвращает пустой [StringName]. См. также [метод is_typed] и [метод Object."
+"get_class]."
+
+msgid ""
+"Returns [code]true[/code] if the array contains the given [param value].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print([\"inside\", 7].has(\"inside\"))  # Prints true\n"
+"print([\"inside\", 7].has(\"outside\")) # Prints false\n"
+"print([\"inside\", 7].has(7))         # Prints true\n"
+"print([\"inside\", 7].has(\"7\"))       # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array arr = [\"inside\", 7];\n"
+"// By C# convention, this method is renamed to `Contains`.\n"
+"GD.Print(arr.Contains(\"inside\"));  // Prints True\n"
+"GD.Print(arr.Contains(\"outside\")); // Prints False\n"
+"GD.Print(arr.Contains(7));         // Prints True\n"
+"GD.Print(arr.Contains(\"7\"));       // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, this is equivalent to the [code]in[/code] operator:\n"
+"[codeblock]\n"
+"if 4 in [2, 4, 6, 8]:\n"
+"    print(\"4 is here!\") # Will be printed.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] For performance reasons, the search is affected by the [param "
+"value]'s [enum Variant.Type]. For example, [code]7[/code] ([int]) and "
+"[code]7.0[/code] ([float]) are not considered equal for this method."
+msgstr ""
+"Возвращает [код]true[/код], если массив содержит указанное [значение "
+"параметра].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print([\"inside\", 7].has(\"inside\"))  # Prints true\n"
+"print([\"inside\", 7].has(\"outside\")) # Prints false\n"
+"print([\"inside\", 7].has(7))         # Prints true\n"
+"print([\"inside\", 7].has(\"7\"))       # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array arr = [\"inside\", 7];\n"
+"// By C# convention, this method is renamed to `Contains`.\n"
+"GD.Print(arr.Contains(\"inside\"));  // Prints True\n"
+"GD.Print(arr.Contains(\"outside\")); // Prints False\n"
+"GD.Print(arr.Contains(7));         // Prints True\n"
+"GD.Print(arr.Contains(\"7\"));       // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, this is equivalent to the [code]in[/code] operator:\n"
+"[codeblock]\n"
+"if 4 in [2, 4, 6, 8]:\n"
+"    print(\"4 is here!\") # Will be printed.\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Из соображений производительности на поиск влияет "
+"[значение параметра] [enum Variant.Type]. Например, [code]7[/code] ([int]) и "
+"[code]7.0[/code] ([float]) не считаются равными для этого метода."
+
+msgid ""
+"Returns a hashed 32-bit integer value representing the array and its "
+"contents.\n"
+"[b]Note:[/b] Arrays with equal hash values are [i]not[/i] guaranteed to be "
+"the same, as a result of hash collisions. On the countrary, arrays with "
+"different hash values are guaranteed to be different."
+msgstr ""
+"Возвращает хешированное 32-битное целое значение, представляющее массив и его "
+"содержимое.\n"
+"[b]Примечание:[/b] Массивы с одинаковыми значениями хэша [i]не[/i] "
+"гарантированно будут одинаковыми из-за коллизий хэшей. В стране массивы с "
+"разными значениями хэшей гарантированно будут разными."
+
+msgid ""
+"Inserts a new element ([param value]) at a given index ([param position]) in "
+"the array. [param position] should be between [code]0[/code] and the array's "
+"[method size].\n"
+"Returns [constant OK] on success, or one of the other [enum Error] constants "
+"if this method fails.\n"
+"[b]Note:[/b] Every element's index after [param position] needs to be shifted "
+"forward, which may have a noticeable performance cost, especially on larger "
+"arrays."
+msgstr ""
+"Вставляет новый элемент ([param value]) по указанному индексу ([param "
+"position]) в массиве. [param position] должен быть между [code]0[/code] и "
+"[method size] массива.\n"
+"Возвращает [constant OK] в случае успеха или одну из других констант [enum "
+"Error], если этот метод не выполняется.\n"
+"[b]Примечание:[/b] Индекс каждого элемента после [param position] необходимо "
+"сместить вперед, что может иметь заметные потери производительности, особенно "
+"в больших массивах."
+
+msgid ""
+"Returns [code]true[/code] if the array is read-only. See [method "
+"make_read_only].\n"
+"In GDScript, arrays are automatically read-only if declared with the "
+"[code]const[/code] keyword."
+msgstr ""
+"Возвращает [code]true[/code], если массив доступен только для чтения. См. "
+"[method make_read_only].\n"
+"В GDScript массивы автоматически доступны только для чтения, если объявлены с "
+"ключевым словом [code]const[/code]."
+
+msgid ""
+"Returns [code]true[/code] if the array is typed. Typed arrays can only "
+"contain elements of a specific type, as defined by the typed array "
+"constructor. The methods of a typed array are still expected to return a "
+"generic [Variant].\n"
+"In GDScript, it is possible to define a typed array with static typing:\n"
+"[codeblock]\n"
+"var numbers: Array[float] = [0.2, 4.2, -2.0]\n"
+"print(numbers.is_typed()) # Prints true\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает [code]true[/code], если массив типизирован. Типизированные массивы "
+"могут содержать только элементы определенного типа, как определено "
+"конструктором типизированного массива. Методы типизированного массива по-"
+"прежнему должны возвращать обобщенный [Variant].\n"
+"В GDScript можно определить типизированный массив со статической типизацией:\n"
+"[codeblock]\n"
+"var numbers: Array[float] = [0.2, 4.2, -2.0]\n"
+"print(numbers.is_typed()) # Prints true\n"
+"[/codeblock]"
+
+msgid ""
+"Makes the array read-only. The array's elements cannot be overridden with "
+"different values, and their order cannot change. Does not apply to nested "
+"elements, such as dictionaries.\n"
+"In GDScript, arrays are automatically read-only if declared with the "
+"[code]const[/code] keyword."
+msgstr ""
+"Делает массив доступным только для чтения. Элементы массива не могут быть "
+"переопределены другими значениями, и их порядок не может быть изменен. Не "
+"применяется к вложенным элементам, таким как словари.\n"
+"В GDScript массивы автоматически доступны только для чтения, если объявлены с "
+"ключевым словом [code]const[/code]."
+
+msgid ""
+"Calls the given [Callable] for each element in the array and returns a new "
+"array filled with values returned by the [param method].\n"
+"The [param method] should take one [Variant] parameter (the current array "
+"element) and can return any [Variant].\n"
+"[codeblock]\n"
+"func double(number):\n"
+"    return number * 2\n"
+"\n"
+"func _ready():\n"
+"    print([1, 2, 3].map(double)) # Prints [2, 4, 6]\n"
+"\n"
+"    # Same as above, but using a lambda function.\n"
+"    print([1, 2, 3].map(func(element): return element * 2))\n"
+"[/codeblock]\n"
+"See also [method filter], [method reduce], [method any] and [method all]."
+msgstr ""
+"Вызывает заданный [Callable] для каждого элемента в массиве и возвращает "
+"новый массив, заполненный значениями, возвращаемыми [param method]. \n"
+"[param method] должен принимать один параметр [Variant] (текущий элемент "
+"массива) и может возвращать любой [Variant].\n"
+"[codeblock]\n"
+"func double(number):\n"
+"    return number * 2\n"
+"\n"
+"func _ready():\n"
+"    print([1, 2, 3].map(double)) # Prints [2, 4, 6]\n"
+"\n"
+"    # Same as above, but using a lambda function.\n"
+"    print([1, 2, 3].map(func(element): return element * 2))\n"
+"[/codeblock]\n"
+"См. также [метод filter], [метод reduce], [метод any] и [метод all]."
+
+msgid ""
+"Returns a random element from the array. Generates an error and returns "
+"[code]null[/code] if the array is empty.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# May print 1, 2, 3.25, or \"Hi\".\n"
+"print([1, 2, 3.25, \"Hi\"].pick_random())\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [1, 2, 3.25f, \"Hi\"];\n"
+"GD.Print(array.PickRandom()); // May print 1, 2, 3.25, or \"Hi\".\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Like many similar functions in the engine (such as [method "
+"@GlobalScope.randi] or [method shuffle]), this method uses a common, global "
+"random seed. To get a predictable outcome from this method, see [method "
+"@GlobalScope.seed]."
+msgstr ""
+"Возвращает случайный элемент из массива. Генерирует ошибку и возвращает "
+"[code]null[/code], если массив пуст.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# May print 1, 2, 3.25, or \"Hi\".\n"
+"print([1, 2, 3.25, \"Hi\"].pick_random())\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array array = [1, 2, 3.25f, \"Hi\"];\n"
+"GD.Print(array.PickRandom()); // May print 1, 2, 3.25, or \"Hi\".\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Как и многие подобные функции в движке (например, [метод "
+"@GlobalScope.randi] или [метод shuffle]), этот метод использует общее "
+"глобальное случайное начальное число. Чтобы получить предсказуемый результат "
+"от этого метода, см. [метод @GlobalScope.seed]."
+
+msgid ""
+"Removes and returns the element of the array at index [param position]. If "
+"negative, [param position] is considered relative to the end of the array. "
+"Returns [code]null[/code] if the array is empty. If [param position] is out "
+"of bounds, an error message is also generated.\n"
+"[b]Note:[/b] This method shifts every element's index after [param position] "
+"back, which may have a noticeable performance cost, especially on larger "
+"arrays."
+msgstr ""
+"Удаляет и возвращает элемент массива с индексом [param position]. Если "
+"отрицательно, [param position] считается относительно конца массива. "
+"Возвращает [code]null[/code], если массив пуст. Если [param position] выходит "
+"за пределы, также генерируется сообщение об ошибке.\n"
+"[b]Примечание:[/b] Этот метод сдвигает индекс каждого элемента после [param "
+"position] назад, что может иметь заметные потери производительности, особенно "
+"в больших массивах."
+
+msgid ""
+"Adds an element at the beginning of the array. See also [method push_back].\n"
+"[b]Note:[/b] This method shifts every other element's index forward, which "
+"may have a noticeable performance cost, especially on larger arrays."
+msgstr ""
+"Добавляет элемент в начало массива. См. также [метод push_back].\n"
+"[b]Примечание:[/b] Этот метод сдвигает индекс каждого другого элемента "
+"вперед, что может иметь заметные издержки производительности, особенно в "
+"больших массивах."
+
+msgid ""
+"Calls the given [Callable] for each element in array, accumulates the result "
+"in [param accum], then returns it.\n"
+"The [param method] takes two arguments: the current value of [param accum] "
+"and the current array element. If [param accum] is [code]null[/code] (as by "
+"default), the iteration will start from the second element, with the first "
+"one used as initial value of [param accum].\n"
+"[codeblock]\n"
+"func sum(accum, number):\n"
+"    return accum + number\n"
+"\n"
+"func _ready():\n"
+"    print([1, 2, 3].reduce(sum, 0))  # Prints 6\n"
+"    print([1, 2, 3].reduce(sum, 10)) # Prints 16\n"
+"\n"
+"    # Same as above, but using a lambda function.\n"
+"    print([1, 2, 3].reduce(func(accum, number): return accum + number, 10))\n"
+"[/codeblock]\n"
+"If [method max] is not desirable, this method may also be used to implement a "
+"custom comparator:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    var arr = [Vector2i(5, 0), Vector2i(3, 4), Vector2i(1, 2)]\n"
+"\n"
+"    var longest_vec = arr.reduce(func(max, vec): return vec if "
+"is_length_greater(vec, max) else max)\n"
+"    print(longest_vec) # Prints (3, 4)\n"
+"\n"
+"func is_length_greater(a, b):\n"
+"    return a.length() > b.length()\n"
+"[/codeblock]\n"
+"This method can also be used to count how many elements in an array satisfy a "
+"certain condition, similar to [method count]:\n"
+"[codeblock]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    var arr = [1, 2, 3, 4, 5]\n"
+"    # If the current element is even, increment count, otherwise leave count "
+"the same.\n"
+"    var even_count = arr.reduce(func(count, next): return count + 1 if "
+"is_even(next) else count, 0)\n"
+"    print(even_count) # Prints 2\n"
+"[/codeblock]\n"
+"See also [method map], [method filter], [method any], and [method all]."
+msgstr ""
+"Вызывает заданный [Callable] для каждого элемента в массиве, накапливает "
+"результат в [param accum], затем возвращает его.\n"
+"Метод [param] принимает два аргумента: текущее значение [param accum] и "
+"текущий элемент массива. Если [param accum] равен [code]null[/code] (как по "
+"умолчанию), итерация начнется со второго элемента, а первый будет "
+"использоваться как начальное значение [param accum].\n"
+"[codeblock]\n"
+"func sum(accum, number):\n"
+"    return accum + number\n"
+"\n"
+"func _ready():\n"
+"    print([1, 2, 3].reduce(sum, 0))  # Prints 6\n"
+"    print([1, 2, 3].reduce(sum, 10)) # Prints 16\n"
+"\n"
+"    # Same as above, but using a lambda function.\n"
+"    print([1, 2, 3].reduce(func(accum, number): return accum + number, 10))\n"
+"[/codeblock]\n"
+"Если [метод max] нежелателен, этот метод также можно использовать для "
+"реализации пользовательского компаратора:\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    var arr = [Vector2i(5, 0), Vector2i(3, 4), Vector2i(1, 2)]\n"
+"\n"
+"    var longest_vec = arr.reduce(func(max, vec): return vec if "
+"is_length_greater(vec, max) else max)\n"
+"    print(longest_vec) # Prints (3, 4)\n"
+"\n"
+"func is_length_greater(a, b):\n"
+"    return a.length() > b.length()\n"
+"[/codeblock]\n"
+"Этот метод также можно использовать для подсчета количества элементов в "
+"массиве, удовлетворяющих определенному условию, аналогично [методу count]:\n"
+"[codeblock]\n"
+"func is_even(number):\n"
+"    return number % 2 == 0\n"
+"\n"
+"func _ready():\n"
+"    var arr = [1, 2, 3, 4, 5]\n"
+"    # Если текущий элемент четный, увеличиваем count, в противном случае "
+"оставляем count прежним.\n"
+"    var even_count = arr.reduce(func(count, next): return count + 1 if "
+"is_even(next) else count, 0)\n"
+"    print(even_count) # Prints 2\n"
+"[/codeblock]\n"
+"См. также [метод map], [метод filter], [метод any] и [метод all]."
+
+msgid ""
+"Removes the element from the array at the given index ([param position]). If "
+"the index is out of bounds, this method fails.\n"
+"If you need to return the removed element, use [method pop_at]. To remove an "
+"element by value, use [method erase] instead.\n"
+"[b]Note:[/b] This method shifts every element's index after [param position] "
+"back, which may have a noticeable performance cost, especially on larger "
+"arrays.\n"
+"[b]Note:[/b] The [param position] cannot be negative. To remove an element "
+"relative to the end of the array, use [code]arr.remove_at(arr.size() - (i + "
+"1))[/code]. To remove the last element from the array, use [code]arr."
+"resize(arr.size() - 1)[/code]."
+msgstr ""
+"Удаляет элемент из массива по указанному индексу ([param position]). Если "
+"индекс выходит за пределы, этот метод завершается ошибкой.\n"
+"Если вам нужно вернуть удаленный элемент, используйте [method pop_at]. Чтобы "
+"удалить элемент по значению, используйте [method erasure].\n"
+"[b]Примечание:[/b] Этот метод сдвигает индекс каждого элемента после [param "
+"position] назад, что может иметь заметные потери производительности, особенно "
+"в больших массивах.\n"
+"[b]Примечание:[/b] [param position] не может быть отрицательным. Чтобы "
+"удалить элемент относительно конца массива, используйте [code]arr."
+"remove_at(arr.size() - (i + 1))[/code]. Чтобы удалить последний элемент из "
+"массива, используйте [code]arr.resize(arr.size() - 1)[/code]."
+
+msgid ""
+"Returns the index of the [b]last[/b] occurrence of [param what] in this "
+"array, or [code]-1[/code] if there are none. The search's start can be "
+"specified with [param from], continuing to the beginning of the array. This "
+"method is the reverse of [method find]."
+msgstr ""
+"Возвращает индекс [b]последнего[/b] вхождения [param what] в этом массиве или "
+"[code]-1[/code], если их нет. Начало поиска можно указать с помощью [param "
+"from], продолжая до начала массива. Этот метод является обратным [method "
+"find]."
+
+msgid ""
+"Returns the index of the [b]last[/b] element of the array that causes [param "
+"method] to return [code]true[/code], or [code]-1[/code] if there are none. "
+"The search's start can be specified with [param from], continuing to the "
+"beginning of the array. This method is the reverse of [method find_custom]."
+msgstr ""
+"Возвращает индекс [b]последнего[/b] элемента массива, который заставляет "
+"[param method] возвращать [code]true[/code] или [code]-1[/code], если их нет. "
+"Начало поиска можно указать с помощью [param from], продолжая до начала "
+"массива. Этот метод является обратным [method find_custom]."
+
+msgid ""
+"Sets the value of the element at the given [param index] to the given [param "
+"value]. This will not change the size of the array, it only changes the value "
+"at an index already in the array. This is the same as using the [code][][/"
+"code] operator ([code]array[index] = value[/code])."
+msgstr ""
+"Устанавливает значение элемента с указанным [param index] на указанное [param "
+"value]. Это не изменит размер массива, а только изменит значение с индексом, "
+"уже имеющимся в массиве. Это то же самое, что использовать оператор [code][][/"
+"code] ([code]array[index] = value[/code])."
+
+msgid ""
+"Shuffles all elements of the array in a random order.\n"
+"[b]Note:[/b] Like many similar functions in the engine (such as [method "
+"@GlobalScope.randi] or [method pick_random]), this method uses a common, "
+"global random seed. To get a predictable outcome from this method, see "
+"[method @GlobalScope.seed]."
+msgstr ""
+"Перемешивает все элементы массива в случайном порядке.\n"
+"[b]Примечание:[/b] Как и многие подобные функции в движке (например, [метод "
+"@GlobalScope.randi] или [метод pick_random]), этот метод использует общее "
+"глобальное случайное начальное число. Чтобы получить предсказуемый результат "
+"от этого метода, см. [метод @GlobalScope.seed]."
+
+msgid ""
+"Returns a new [Array] containing this array's elements, from index [param "
+"begin] (inclusive) to [param end] (exclusive), every [param step] elements.\n"
+"If either [param begin] or [param end] are negative, their value is relative "
+"to the end of the array.\n"
+"If [param step] is negative, this method iterates through the array in "
+"reverse, returning a slice ordered backwards. For this to work, [param begin] "
+"must be greater than [param end].\n"
+"If [param deep] is [code]true[/code], all nested [Array] and [Dictionary] "
+"elements in the slice are duplicated from the original, recursively. See also "
+"[method duplicate]).\n"
+"[codeblock]\n"
+"var letters = [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\"]\n"
+"\n"
+"print(letters.slice(0, 2))  # Prints [\"A\", \"B\"]\n"
+"print(letters.slice(2, -2)) # Prints [\"C\", \"D\"]\n"
+"print(letters.slice(-2, 6)) # Prints [\"E\", \"F\"]\n"
+"\n"
+"print(letters.slice(0, 6, 2))  # Prints [\"A\", \"C\", \"E\"]\n"
+"print(letters.slice(4, 1, -1)) # Prints [\"E\", \"D\", \"C\"]\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает новый [Array], содержащий элементы этого массива, от индекса "
+"[param begin] (включительно) до [param end] (исключительно), каждые [param "
+"step] элементов.\n"
+"Если [param begin] или [param end] отрицательны, их значение относительно "
+"конца массива.\n"
+"Если [param step] отрицателен, этот метод выполняет итерацию по массиву в "
+"обратном порядке, возвращая срез, упорядоченный в обратном порядке. Чтобы это "
+"работало, [param begin] должен быть больше, чем [param end].\n"
+"Если [param deep] равен [code]true[/code], все вложенные элементы [Array] и "
+"[Dictionary] в срезе дублируются из оригинала, рекурсивно. См. также [method "
+"duplicate]).\n"
+"[codeblock]\n"
+"var letters = [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\"]\n"
+"\n"
+"print(letters.slice(0, 2))  # Prints [\"A\", \"B\"]\n"
+"print(letters.slice(2, -2)) # Prints [\"C\", \"D\"]\n"
+"print(letters.slice(-2, 6)) # Prints [\"E\", \"F\"]\n"
+"\n"
+"print(letters.slice(0, 6, 2))  # Prints [\"A\", \"C\", \"E\"]\n"
+"print(letters.slice(4, 1, -1)) # Prints [\"E\", \"D\", \"C\"]\n"
+"[/codeblock]"
+
+msgid ""
+"Sorts the array in ascending order. The final order is dependent on the "
+"\"less than\" ([code]<[/code]) comparison between elements.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var numbers = [10, 5, 2.5, 8]\n"
+"numbers.sort()\n"
+"print(numbers) # Prints [2.5, 5, 8, 10]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array numbers = [10, 5, 2.5, 8];\n"
+"numbers.Sort();\n"
+"GD.Print(numbers); // Prints [2.5, 5, 8, 10]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] The sorting algorithm used is not [url=https://en.wikipedia.org/"
+"wiki/Sorting_algorithm#Stability]stable[/url]. This means that equivalent "
+"elements (such as [code]2[/code] and [code]2.0[/code]) may have their order "
+"changed when calling [method sort]."
+msgstr ""
+"Сортирует массив в порядке возрастания. Окончательный порядок зависит от "
+"сравнения \"меньше\" ([code]<[/code]) между элементами.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var numbers = [10, 5, 2.5, 8]\n"
+"numbers.sort()\n"
+"print(numbers) # Prints [2.5, 5, 8, 10]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Godot.Collections.Array numbers = [10, 5, 2.5, 8];\n"
+"numbers.Sort();\n"
+"GD.Print(numbers); // Prints [2.5, 5, 8, 10]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Используемый алгоритм сортировки не является [url=https://"
+"en.wikipedia.org/wiki/Sorting_algorithm#Stability]стабильным[/url]. Это "
+"означает, что эквивалентные элементы (такие как [code]2[/code] и [code]2.0[/"
+"code]) могут иметь измененный порядок при вызове [метода sort]."
+
+msgid ""
+"Sorts the array using a custom [Callable].\n"
+"[param func] is called as many times as necessary, receiving two array "
+"elements as arguments. The function should return [code]true[/code] if the "
+"first element should be moved [i]before[/i] the second one, otherwise it "
+"should return [code]false[/code].\n"
+"[codeblock]\n"
+"func sort_ascending(a, b):\n"
+"    if a[1] < b[1]:\n"
+"        return true\n"
+"    return false\n"
+"\n"
+"func _ready():\n"
+"    var my_items = [[\"Tomato\", 5], [\"Apple\", 9], [\"Rice\", 4]]\n"
+"    my_items.sort_custom(sort_ascending)\n"
+"    print(my_items) # Prints [[\"Rice\", 4], [\"Tomato\", 5], [\"Apple\", "
+"9]]\n"
+"\n"
+"    # Sort descending, using a lambda function.\n"
+"    my_items.sort_custom(func(a, b): return a[1] > b[1])\n"
+"    print(my_items) # Prints [[\"Apple\", 9], [\"Tomato\", 5], [\"Rice\", "
+"4]]\n"
+"[/codeblock]\n"
+"It may also be necessary to use this method to sort strings by natural order, "
+"with [method String.naturalnocasecmp_to], as in the following example:\n"
+"[codeblock]\n"
+"var files = [\"newfile1\", \"newfile2\", \"newfile10\", \"newfile11\"]\n"
+"files.sort_custom(func(a, b): return a.naturalnocasecmp_to(b) < 0)\n"
+"print(files) # Prints [\"newfile1\", \"newfile2\", \"newfile10\", "
+"\"newfile11\"]\n"
+"[/codeblock]\n"
+"[b]Note:[/b] In C#, this method is not supported.\n"
+"[b]Note:[/b] The sorting algorithm used is not [url=https://en.wikipedia.org/"
+"wiki/Sorting_algorithm#Stability]stable[/url]. This means that values "
+"considered equal may have their order changed when calling this method.\n"
+"[b]Note:[/b] You should not randomize the return value of [param func], as "
+"the heapsort algorithm expects a consistent result. Randomizing the return "
+"value will result in unexpected behavior."
+msgstr ""
+"Сортирует массив с использованием пользовательского [Callable].\n"
+"[param func] вызывается столько раз, сколько необходимо, получая два элемента "
+"массива в качестве аргументов. Функция должна возвращать [code]true[/code], "
+"если первый элемент должен быть перемещен [i]перед[/i] вторым, в противном "
+"случае она должна возвращать [code]false[/code].\n"
+"[codeblock]\n"
+"func sort_ascending(a, b):\n"
+"    if a[1] < b[1]:\n"
+"        return true\n"
+"    return false\n"
+"\n"
+"func _ready():\n"
+"    var my_items = [[\"Tomato\", 5], [\"Apple\", 9], [\"Rice\", 4]]\n"
+"    my_items.sort_custom(sort_ascending)\n"
+"    print(my_items) # Prints [[\"Rice\", 4], [\"Tomato\", 5], [\"Apple\", "
+"9]]\n"
+"\n"
+"    #Сортировка по убыванию с использованием лямбда-функции.\n"
+"    my_items.sort_custom(func(a, b): return a[1] > b[1])\n"
+"    print(my_items) # Prints [[\"Apple\", 9], [\"Tomato\", 5], [\"Rice\", "
+"4]]\n"
+"[/codeblock]\n"
+"Также может потребоваться использовать этот метод для сортировки строк в "
+"естественном порядке с помощью [метода String.naturalnocasecmp_to], как в "
+"следующем примере:\n"
+"[codeblock]\n"
+"var files = [\"newfile1\", \"newfile2\", \"newfile10\", \"newfile11\"]\n"
+"files.sort_custom(func(a, b): return a.naturalnocasecmp_to(b) < 0)\n"
+"print(files) # Prints [\"newfile1\", \"newfile2\", \"newfile10\", "
+"\"newfile11\"]\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] В C# этот метод не поддерживается.\n"
+"[b]Примечание:[/b] Используемый алгоритм сортировки не является [url=https://"
+"en.wikipedia.org/wiki/Sorting_algorithm#Stability]стабильным[/url]. Это "
+"означает, что значения, считающиеся равными, могут иметь измененный порядок "
+"при вызове этого метода.\n"
+"[b]Примечание:[/b] Не следует рандомизировать возвращаемое значение [param "
+"func], так как алгоритм пирамидальной сортировки ожидает согласованного "
+"результата. Рандомизация возвращаемого значения приведет к неожиданному "
+"поведению."
+
+msgid ""
+"Appends the [param right] array to the left operand, creating a new [Array]. "
+"This is also known as an array concatenation.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array1 = [\"One\", 2]\n"
+"var array2 = [3, \"Four\"]\n"
+"print(array1 + array2) # Prints [\"One\", 2, 3, \"Four\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Note that concatenation is not possible with C#'s native Array type.\n"
+"Godot.Collections.Array array1 = [\"One\", 2];\n"
+"Godot.Collections.Array array2 = [3, \"Four\"];\n"
+"GD.Print(array1 + array2); // Prints [\"One\", 2, 3, \"Four\"]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] For existing arrays, [method append_array] is much more "
+"efficient than concatenation and assignment with the [code]+=[/code] operator."
+msgstr ""
+"Добавляет массив [param right] к левому операнду, создавая новый [Array]. Это "
+"также известно как конкатенация массивов.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var array1 = [\"One\", 2]\n"
+"var array2 = [3, \"Four\"]\n"
+"print(array1 + array2) # Prints [\"One\", 2, 3, \"Four\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Обратите внимание, что конкатенация невозможна с собственным типом массива "
+"C#.\n"
+"Godot.Collections.Array array1 = [\"One\", 2];\n"
+"Godot.Collections.Array array2 = [3, \"Four\"];\n"
+"GD.Print(array1 + array2); // Prints [\"One\", 2, 3, \"Four\"]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Для существующих массивов [метод append_array] гораздо "
+"эффективнее, чем конкатенация и присваивание с помощью оператора [code]+=[/"
+"code]."
+
+msgid ""
+"Compares the elements of both arrays in order, starting from index [code]0[/"
+"code] and ending on the last index in common between both arrays. For each "
+"pair of elements, returns [code]true[/code] if this array's element is less "
+"than [param right]'s, [code]false[/code] if this element is greater. "
+"Otherwise, continues to the next pair.\n"
+"If all searched elements are equal, returns [code]true[/code] if this array's "
+"size is less than [param right]'s, otherwise returns [code]false[/code]."
+msgstr ""
+"Сравнивает элементы обоих массивов по порядку, начиная с индекса [code]0[/"
+"code] и заканчивая последним общим индексом для обоих массивов. Для каждой "
+"пары элементов возвращает [code]true[/code], если элемент этого массива "
+"меньше, чем [param right], [code]false[/code], если этот элемент больше. В "
+"противном случае переходит к следующей паре.\n"
+"Если все искомые элементы равны, возвращает [code]true[/code], если размер "
+"этого массива меньше, чем [param right], в противном случае возвращает "
+"[code]false[/code]."
+
+msgid ""
+"Compares the elements of both arrays in order, starting from index [code]0[/"
+"code] and ending on the last index in common between both arrays. For each "
+"pair of elements, returns [code]true[/code] if this array's element is less "
+"than [param right]'s, [code]false[/code] if this element is greater. "
+"Otherwise, continues to the next pair.\n"
+"If all searched elements are equal, returns [code]true[/code] if this array's "
+"size is less or equal to [param right]'s, otherwise returns [code]false[/"
+"code]."
+msgstr ""
+"Сравнивает элементы обоих массивов по порядку, начиная с индекса [code]0[/"
+"code] и заканчивая последним общим индексом для обоих массивов. Для каждой "
+"пары элементов возвращает [code]true[/code], если элемент этого массива "
+"меньше, чем [param right], [code]false[/code], если этот элемент больше. В "
+"противном случае переходит к следующей паре.\n"
+"Если все искомые элементы равны, возвращает [code]true[/code], если размер "
+"этого массива меньше или равен [param right], в противном случае возвращает "
+"[code]false[/code]."
+
+msgid ""
+"Compares the left operand [Array] against the [param right] [Array]. Returns "
+"[code]true[/code] if the sizes and contents of the arrays are equal, "
+"[code]false[/code] otherwise."
+msgstr ""
+"Сравнивает левый операнд [Array] с [param right] [Array]. Возвращает "
+"[code]true[/code], если размеры и содержимое массивов равны, в противном "
+"случае [code]false[/code] ."
+
+msgid ""
+"Compares the elements of both arrays in order, starting from index [code]0[/"
+"code] and ending on the last index in common between both arrays. For each "
+"pair of elements, returns [code]true[/code] if this array's element is "
+"greater than [param right]'s, [code]false[/code] if this element is less. "
+"Otherwise, continues to the next pair.\n"
+"If all searched elements are equal, returns [code]true[/code] if this array's "
+"size is greater than [param right]'s, otherwise returns [code]false[/code]."
+msgstr ""
+"Сравнивает элементы обоих массивов по порядку, начиная с индекса [code]0[/"
+"code] и заканчивая последним общим индексом для обоих массивов. Для каждой "
+"пары элементов возвращает [code]true[/code], если элемент этого массива "
+"больше, чем [param right], [code]false[/code], если этот элемент меньше. В "
+"противном случае переходит к следующей паре.\n"
+"Если все искомые элементы равны, возвращает [code]true[/code], если размер "
+"этого массива больше, чем [param right], в противном случае возвращает "
+"[code]false[/code]."
+
+msgid ""
+"Compares the elements of both arrays in order, starting from index [code]0[/"
+"code] and ending on the last index in common between both arrays. For each "
+"pair of elements, returns [code]true[/code] if this array's element is "
+"greater than [param right]'s, [code]false[/code] if this element is less. "
+"Otherwise, continues to the next pair.\n"
+"If all searched elements are equal, returns [code]true[/code] if this array's "
+"size is greater or equal to [param right]'s, otherwise returns [code]false[/"
+"code]."
+msgstr ""
+"Сравнивает элементы обоих массивов по порядку, начиная с индекса [code]0[/"
+"code] и заканчивая последним общим индексом для обоих массивов. Для каждой "
+"пары элементов возвращает [code]true[/code], если элемент этого массива "
+"больше, чем [param right], [code]false[/code], если этот элемент меньше. В "
+"противном случае переходит к следующей паре.\n"
+"Если все искомые элементы равны, возвращает [code]true[/code], если размер "
+"этого массива больше или равен [param right], в противном случае возвращает "
+"[code]false[/code]."
+
+msgid ""
+"Returns the [Variant] element at the specified [param index]. Arrays start at "
+"index 0. If [param index] is greater or equal to [code]0[/code], the element "
+"is fetched starting from the beginning of the array. If [param index] is a "
+"negative value, the element is fetched starting from the end. Accessing an "
+"array out-of-bounds will cause a run-time error, pausing the project "
+"execution if run from the editor."
+msgstr ""
+"Возвращает элемент [Variant] по указанному [param index]. Массивы начинаются "
+"с индекса 0. Если [param index] больше или равен [code]0[/code], элемент "
+"извлекается, начиная с начала массива. Если [param index] — отрицательное "
+"значение, элемент извлекается, начиная с конца. Доступ к массиву за пределами "
+"границ вызовет ошибку времени выполнения, приостанавливая выполнение проекта, "
+"если он запущен из редактора."
+
+msgid ""
+"[Mesh] type that provides utility for constructing a surface from arrays."
+msgstr ""
+"Тип [Mesh], предоставляющий утилиту для построения поверхности из массивов."
+
+msgid ""
+"The [ArrayMesh] is used to construct a [Mesh] by specifying the attributes as "
+"arrays.\n"
+"The most basic example is the creation of a single triangle:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var vertices = PackedVector3Array()\n"
+"vertices.push_back(Vector3(0, 1, 0))\n"
+"vertices.push_back(Vector3(1, 0, 0))\n"
+"vertices.push_back(Vector3(0, 0, 1))\n"
+"\n"
+"# Initialize the ArrayMesh.\n"
+"var arr_mesh = ArrayMesh.new()\n"
+"var arrays = []\n"
+"arrays.resize(Mesh.ARRAY_MAX)\n"
+"arrays[Mesh.ARRAY_VERTEX] = vertices\n"
+"\n"
+"# Create the Mesh.\n"
+"arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)\n"
+"var m = MeshInstance3D.new()\n"
+"m.mesh = arr_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Vector3[] vertices =\n"
+"[\n"
+"    new Vector3(0, 1, 0),\n"
+"    new Vector3(1, 0, 0),\n"
+"    new Vector3(0, 0, 1),\n"
+"];\n"
+"\n"
+"// Initialize the ArrayMesh.\n"
+"var arrMesh = new ArrayMesh();\n"
+"Godot.Collections.Array arrays = [];\n"
+"arrays.Resize((int)Mesh.ArrayType.Max);\n"
+"arrays[(int)Mesh.ArrayType.Vertex] = vertices;\n"
+"\n"
+"// Create the Mesh.\n"
+"arrMesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, arrays);\n"
+"var m = new MeshInstance3D();\n"
+"m.Mesh = arrMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The [MeshInstance3D] is ready to be added to the [SceneTree] to be shown.\n"
+"See also [ImmediateMesh], [MeshDataTool] and [SurfaceTool] for procedural "
+"geometry generation.\n"
+"[b]Note:[/b] Godot uses clockwise [url=https://learnopengl.com/Advanced-"
+"OpenGL/Face-culling]winding order[/url] for front faces of triangle primitive "
+"modes."
+msgstr ""
+"[ArrayMesh] используется для построения [Mesh] путем указания атрибутов как "
+"массивов.\n"
+"Самый простой пример — создание одного треугольника:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var vertices = PackedVector3Array()\n"
+"vertices.push_back(Vector3(0, 1, 0))\n"
+"vertices.push_back(Vector3(1, 0, 0))\n"
+"vertices.push_back(Vector3(0, 0, 1))\n"
+"\n"
+"#Инициализируйте ArrayMesh.\n"
+"var arr_mesh = ArrayMesh.new()\n"
+"var arrays = []\n"
+"arrays.resize(Mesh.ARRAY_MAX)\n"
+"arrays[Mesh.ARRAY_VERTEX] = vertices\n"
+"\n"
+"# Создать сетку.\n"
+"arr_mesh.add_surface_from_arrays(Mesh.PRIMITIVE_TRIANGLES, arrays)\n"
+"var m = MeshInstance3D.new()\n"
+"m.mesh = arr_mesh\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Vector3[] vertices =\n"
+"[\n"
+"    new Vector3(0, 1, 0),\n"
+"    new Vector3(1, 0, 0),\n"
+"    new Vector3(0, 0, 1),\n"
+"];\n"
+"\n"
+"// Инициализируйте ArrayMesh.\n"
+"var arrMesh = new ArrayMesh();\n"
+"Godot.Collections.Array arrays = [];\n"
+"arrays.Resize((int)Mesh.ArrayType.Max);\n"
+"arrays[(int)Mesh.ArrayType.Vertex] = vertices;\n"
+"\n"
+"// Создать сетку.\n"
+"arrMesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, arrays);\n"
+"var m = new MeshInstance3D();\n"
+"m.Mesh = arrMesh;\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[MeshInstance3D] готов к добавлению в [SceneTree] для отображения.\n"
+"См. также [ImmediateMesh], [MeshDataTool] и [SurfaceTool] для создания "
+"процедурной геометрии.\n"
+"[b]Примечание:[/b] Годо использует [url=https://learnopengl.com/Advanced-"
+"OpenGL/Face-culling]порядок намотки[/url] по часовой стрелке для передних "
+"граней примитивных режимов треугольника."
+
+msgid "Procedural geometry using the ArrayMesh"
+msgstr "Процедурная геометрия с использованием ArrayMesh"
+
+msgid ""
+"Adds name for a blend shape that will be added with [method "
+"add_surface_from_arrays]. Must be called before surface is added."
+msgstr ""
+"Добавляет имя для формы смешивания, которая будет добавлена с помощью [метода "
+"add_surface_from_arrays]. Необходимо вызвать перед добавлением поверхности."
+
+msgid ""
+"Creates a new surface. [method Mesh.get_surface_count] will become the "
+"[code]surf_idx[/code] for this new surface.\n"
+"Surfaces are created to be rendered using a [param primitive], which may be "
+"any of the values defined in [enum Mesh.PrimitiveType].\n"
+"The [param arrays] argument is an array of arrays. Each of the [constant Mesh."
+"ARRAY_MAX] elements contains an array with some of the mesh data for this "
+"surface as described by the corresponding member of [enum Mesh.ArrayType] or "
+"[code]null[/code] if it is not used by the surface. For example, "
+"[code]arrays[0][/code] is the array of vertices. That first vertex sub-array "
+"is always required; the others are optional. Adding an index array puts this "
+"surface into \"index mode\" where the vertex and other arrays become the "
+"sources of data and the index array defines the vertex order. All sub-arrays "
+"must have the same length as the vertex array (or be an exact multiple of the "
+"vertex array's length, when multiple elements of a sub-array correspond to a "
+"single vertex) or be empty, except for [constant Mesh.ARRAY_INDEX] if it is "
+"used.\n"
+"The [param blend_shapes] argument is an array of vertex data for each blend "
+"shape. Each element is an array of the same structure as [param arrays], but "
+"[constant Mesh.ARRAY_VERTEX], [constant Mesh.ARRAY_NORMAL], and [constant "
+"Mesh.ARRAY_TANGENT] are set if and only if they are set in [param arrays] and "
+"all other entries are [code]null[/code].\n"
+"The [param lods] argument is a dictionary with [float] keys and "
+"[PackedInt32Array] values. Each entry in the dictionary represents an LOD "
+"level of the surface, where the value is the [constant Mesh.ARRAY_INDEX] "
+"array to use for the LOD level and the key is roughly proportional to the "
+"distance at which the LOD stats being used. I.e., increasing the key of an "
+"LOD also increases the distance that the objects has to be from the camera "
+"before the LOD is used.\n"
+"The [param flags] argument is the bitwise OR of, as required: One value of "
+"[enum Mesh.ArrayCustomFormat] left shifted by "
+"[code]ARRAY_FORMAT_CUSTOMn_SHIFT[/code] for each custom channel in use, "
+"[constant Mesh.ARRAY_FLAG_USE_DYNAMIC_UPDATE], [constant Mesh."
+"ARRAY_FLAG_USE_8_BONE_WEIGHTS], or [constant Mesh."
+"ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY].\n"
+"[b]Note:[/b] When using indices, it is recommended to only use points, lines, "
+"or triangles."
+msgstr ""
+"Создает новую поверхность. [method Mesh.get_surface_count] станет "
+"[code]surf_idx[/code] для этой новой поверхности.\n"
+"Поверхности создаются для визуализации с использованием [param primitive], "
+"который может быть любым из значений, определенных в [enum Mesh."
+"PrimitiveType].\n"
+"Аргумент [param arrays] — это массив массивов. Каждый из элементов [constant "
+"Mesh.ARRAY_MAX] содержит массив с некоторыми данными сетки для этой "
+"поверхности, как описано соответствующим членом [enum Mesh.ArrayType] или "
+"[code]null[/code], если он не используется поверхностью. Например, "
+"[code]arrays[0][/code] — это массив вершин. Этот первый подмассив вершин "
+"всегда обязателен; остальные необязательны. Добавление индексного массива "
+"переводит эту поверхность в «индексный режим», где вершины и другие массивы "
+"становятся источниками данных, а индексный массив определяет порядок вершин. "
+"Все подмассивы должны иметь ту же длину, что и массив вершин (или быть "
+"кратными длине массива вершин, когда несколько элементов подмассива "
+"соответствуют одной вершине) или быть пустыми, за исключением [constant Mesh."
+"ARRAY_INDEX], если он используется.\n"
+"Аргумент [param blend_shapes] — это массив данных вершин для каждой формы "
+"смешивания. Каждый элемент — это массив той же структуры, что и [param "
+"arrays], но [constant Mesh.ARRAY_VERTEX], [constant Mesh.ARRAY_NORMAL] и "
+"[constant Mesh.ARRAY_TANGENT] устанавливаются тогда и только тогда, когда они "
+"установлены в [param arrays], а все остальные записи — [code]null[/code].\n"
+"Аргумент [param lods] — это словарь с ключами [float] и значениями "
+"[PackedInt32Array]. Каждая запись в словаре представляет уровень детализации "
+"поверхности, где значение — это массив [constant Mesh.ARRAY_INDEX], "
+"используемый для уровня детализации, а ключ примерно пропорционален "
+"расстоянию, на котором используются характеристики детализации. То есть, "
+"увеличение ключа детализации также увеличивает расстояние, на котором объекты "
+"должны находиться от камеры, прежде чем будет использован детализация.\n"
+"Аргумент [param flags] представляет собой побитовое ИЛИ, при необходимости: "
+"одного значения [enum Mesh.ArrayCustomFormat], сдвинутого влево на "
+"[code]ARRAY_FORMAT_CUSTOMn_SHIFT[/code] для каждого используемого "
+"пользовательского канала, [constant Mesh.ARRAY_FLAG_USE_DYNAMIC_UPDATE], "
+"[constant Mesh.ARRAY_FLAG_USE_8_BONE_WEIGHTS] или [constant Mesh."
+"ARRAY_FLAG_USES_EMPTY_VERTEX_ARRAY].\n"
+"[b]Примечание:[/b] При использовании индексов рекомендуется использовать "
+"только точки, линии или треугольники."
+
+msgid "Removes all blend shapes from this [ArrayMesh]."
+msgstr "Удаляет все смешанные фигуры из этого [ArrayMesh]."
+
+msgid "Removes all surfaces from this [ArrayMesh]."
+msgstr "Удаляет все поверхности из этого [ArrayMesh]."
+
+msgid "Returns the number of blend shapes that the [ArrayMesh] holds."
+msgstr "Возвращает количество смешанных фигур, хранящихся в [ArrayMesh]."
+
+msgid "Returns the name of the blend shape at this index."
+msgstr "Возвращает имя формы смешивания по данному индексу."
+
+msgid ""
+"Performs a UV unwrap on the [ArrayMesh] to prepare the mesh for lightmapping."
+msgstr ""
+"Выполняет UV-развертку на [ArrayMesh], чтобы подготовить сетку для светового "
+"отображения."
+
+msgid ""
+"Returns the index of the first surface with this name held within this "
+"[ArrayMesh]. If none are found, -1 is returned."
+msgstr ""
+"Возвращает индекс первой поверхности с этим именем, хранящейся в этом "
+"[ArrayMesh]. Если ничего не найдено, возвращается -1."
+
+msgid ""
+"Returns the length in indices of the index array in the requested surface "
+"(see [method add_surface_from_arrays])."
+msgstr ""
+"Возвращает длину в индексах массива индексов в запрошенной поверхности (см. "
+"[метод add_surface_from_arrays])."
+
+msgid ""
+"Returns the length in vertices of the vertex array in the requested surface "
+"(see [method add_surface_from_arrays])."
+msgstr ""
+"Возвращает длину в вершинах массива вершин в запрошенной поверхности (см. "
+"[метод add_surface_from_arrays])."
+
+msgid ""
+"Returns the format mask of the requested surface (see [method "
+"add_surface_from_arrays])."
+msgstr ""
+"Возвращает маску формата запрошенной поверхности (см. [метод "
+"add_surface_from_arrays])."
+
+msgid "Gets the name assigned to this surface."
+msgstr "Получает имя, назначенное этой поверхности."
+
+msgid ""
+"Returns the primitive type of the requested surface (see [method "
+"add_surface_from_arrays])."
+msgstr ""
+"Возвращает примитивный тип запрошенной поверхности (см. [метод "
+"add_surface_from_arrays])."
+
+msgid ""
+"Removes the surface at the given index from the Mesh, shifting surfaces with "
+"higher index down by one."
+msgstr ""
+"Удаляет поверхность с указанным индексом из сетки, сдвигая поверхности с "
+"более высоким индексом на одну единицу вниз."
+
+msgid "Sets a name for a given surface."
+msgstr "Задает имя для данной поверхности."
+
+msgid "Sets the blend shape mode to one of [enum Mesh.BlendShapeMode]."
+msgstr ""
+"Устанавливает один из режимов смешивания форм [enum Mesh.BlendShapeMode]."
+
+msgid ""
+"Overrides the [AABB] with one defined by user for use with frustum culling. "
+"Especially useful to avoid unexpected culling when using a shader to offset "
+"vertices."
+msgstr ""
+"Переопределяет [AABB] на определенный пользователем для использования с "
+"отсечением по усеченной пирамиде. Особенно полезно для избежания неожиданного "
+"отсечения при использовании шейдера для смещения вершин."
+
+msgid ""
+"An optional mesh which can be used for rendering shadows and the depth "
+"prepass. Can be used to increase performance by supplying a mesh with fused "
+"vertices and only vertex position data (without normals, UVs, colors, etc.).\n"
+"[b]Note:[/b] This mesh must have exactly the same vertex positions as the "
+"source mesh (including the source mesh's LODs, if present). If vertex "
+"positions differ, then the mesh will not draw correctly."
+msgstr ""
+"Необязательная сетка, которая может использоваться для рендеринга теней и "
+"предварительного прохода глубины. Может использоваться для повышения "
+"производительности путем предоставления сетки с объединенными вершинами и "
+"только данными о положении вершин (без нормалей, UV, цветов и т. д.).\n"
+"[b]Примечание:[/b] Эта сетка должна иметь точно такие же положения вершин, "
+"как и исходная сетка (включая LOD исходной сетки, если они есть). Если "
+"положения вершин отличаются, то сетка не будет отрисовываться правильно."
+
+msgid "3D polygon shape for use with occlusion culling in [OccluderInstance3D]."
+msgstr ""
+"Трехмерная многоугольная форма для использования с отбраковкой окклюзии в "
+"[OccluderInstance3D]."
+
+msgid ""
+"[ArrayOccluder3D] stores an arbitrary 3D polygon shape that can be used by "
+"the engine's occlusion culling system. This is analogous to [ArrayMesh], but "
+"for occluders.\n"
+"See [OccluderInstance3D]'s documentation for instructions on setting up "
+"occlusion culling."
+msgstr ""
+"[ArrayOccluder3D] хранит произвольную форму 3D-полигона, которая может "
+"использоваться системой отсечения окклюзии движка. Это аналогично "
+"[ArrayMesh], но для окклюдеров.\n"
+"Инструкции по настройке отсечения окклюзии см. в документации "
+"[OccluderInstance3D]."
+
+msgid "Occlusion culling"
+msgstr "Отбраковка окклюзии"
+
+msgid ""
+"Sets [member indices] and [member vertices], while updating the final "
+"occluder only once after both values are set."
+msgstr ""
+"Устанавливает [индексы элементов] и [вершины элементов], при этом обновляя "
+"окончательный окклюдер только один раз после установки обоих значений."
+
+msgid ""
+"The occluder's index position. Indices determine which points from the "
+"[member vertices] array should be drawn, and in which order.\n"
+"[b]Note:[/b] The occluder is always updated after setting this value. If "
+"creating occluders procedurally, consider using [method set_arrays] instead "
+"to avoid updating the occluder twice when it's created."
+msgstr ""
+"Положение индекса окклюдера. Индексы определяют, какие точки из массива "
+"[member vertices] должны быть нарисованы и в каком порядке.\n"
+"[b]Примечание:[/b] Окклюдер всегда обновляется после установки этого "
+"значения. Если вы создаете окклюдеры процедурно, рассмотрите возможность "
+"использования [method set_arrays] вместо этого, чтобы избежать обновления "
+"окклюдера дважды при его создании."
+
+msgid ""
+"The occluder's vertex positions in local 3D coordinates.\n"
+"[b]Note:[/b] The occluder is always updated after setting this value. If "
+"creating occluders procedurally, consider using [method set_arrays] instead "
+"to avoid updating the occluder twice when it's created."
+msgstr ""
+"Положения вершин окклюдера в локальных 3D-координатах.\n"
+"[b]Примечание:[/b] Окклюдер всегда обновляется после установки этого "
+"значения. Если вы создаете окклюдеры процедурно, рассмотрите возможность "
+"использования [метода set_arrays] вместо этого, чтобы избежать обновления "
+"окклюдера дважды при его создании."
+
+msgid "A container that preserves the proportions of its child controls."
+msgstr "Контейнер, сохраняющий пропорции своих дочерних элементов управления."
+
+msgid ""
+"A container type that arranges its child controls in a way that preserves "
+"their proportions automatically when the container is resized. Useful when a "
+"container has a dynamic size and the child nodes must adjust their sizes "
+"accordingly without losing their aspect ratios."
+msgstr ""
+"Тип контейнера, который размещает свои дочерние элементы управления таким "
+"образом, чтобы автоматически сохранять их пропорции при изменении размера "
+"контейнера. Полезно, когда контейнер имеет динамический размер, а дочерние "
+"узлы должны соответствующим образом корректировать свои размеры, не теряя "
+"пропорций."
+
+msgid "Specifies the horizontal relative position of child controls."
+msgstr ""
+"Задает горизонтальное относительное положение дочерних элементов управления."
+
+msgid "Specifies the vertical relative position of child controls."
+msgstr ""
+"Задает вертикальное относительное положение дочерних элементов управления."
+
+msgid ""
+"The aspect ratio to enforce on child controls. This is the width divided by "
+"the height. The ratio depends on the [member stretch_mode]."
+msgstr ""
+"Соотношение сторон, применяемое к дочерним элементам управления. Это ширина, "
+"деленная на высоту. Соотношение зависит от [member stretch_mode]."
+
+msgid "The stretch mode used to align child controls."
+msgstr ""
+"Режим растяжения, используемый для выравнивания дочерних элементов управления."
+
+msgid ""
+"The height of child controls is automatically adjusted based on the width of "
+"the container."
+msgstr ""
+"Высота дочерних элементов управления автоматически регулируется в зависимости "
+"от ширины контейнера."
+
+msgid ""
+"The width of child controls is automatically adjusted based on the height of "
+"the container."
+msgstr ""
+"Ширина дочерних элементов управления автоматически регулируется в зависимости "
+"от высоты контейнера."
+
+msgid ""
+"The bounding rectangle of child controls is automatically adjusted to fit "
+"inside the container while keeping the aspect ratio."
+msgstr ""
+"Ограничивающий прямоугольник дочерних элементов управления автоматически "
+"подстраивается под размер контейнера, сохраняя при этом соотношение сторон."
+
+msgid ""
+"The width and height of child controls is automatically adjusted to make "
+"their bounding rectangle cover the entire area of the container while keeping "
+"the aspect ratio.\n"
+"When the bounding rectangle of child controls exceed the container's size and "
+"[member Control.clip_contents] is enabled, this allows to show only the "
+"container's area restricted by its own bounding rectangle."
+msgstr ""
+"Ширина и высота дочерних элементов управления автоматически настраивается "
+"так, чтобы их ограничивающий прямоугольник покрывал всю область контейнера, "
+"сохраняя при этом соотношение сторон.\n"
+"Когда ограничивающий прямоугольник дочерних элементов управления превышает "
+"размер контейнера и включен [member Control.clip_contents], это позволяет "
+"отображать только область контейнера, ограниченную его собственным "
+"ограничивающим прямоугольником."
+
+msgid "Aligns child controls with the beginning (left or top) of the container."
+msgstr ""
+"Выравнивает дочерние элементы управления по началу (слева или сверху) "
+"контейнера."
+
+msgid "Aligns child controls with the center of the container."
+msgstr "Выравнивает дочерние элементы управления по центру контейнера."
+
+msgid "Aligns child controls with the end (right or bottom) of the container."
+msgstr ""
+"Выравнивает дочерние элементы управления по краю (справа или снизу) "
+"контейнера."
+
+msgid ""
+"An implementation of A* for finding the shortest path between two vertices on "
+"a connected graph in 2D space."
+msgstr ""
+"Реализация A* для поиска кратчайшего пути между двумя вершинами связного "
+"графа в двумерном пространстве."
+
+msgid ""
+"An implementation of the A* algorithm, used to find the shortest path between "
+"two vertices on a connected graph in 2D space.\n"
+"See [AStar3D] for a more thorough explanation on how to use this class. "
+"[AStar2D] is a wrapper for [AStar3D] that enforces 2D coordinates."
+msgstr ""
+"Реализация алгоритма A*, используемого для поиска кратчайшего пути между "
+"двумя вершинами на связном графе в двумерном пространстве.\n"
+"Более подробное объяснение использования этого класса см. в [AStar3D]. "
+"[AStar2D] — это оболочка для [AStar3D], которая обеспечивает двумерные "
+"координаты."
+
+msgid ""
+"Called when computing the cost between two connected points.\n"
+"Note that this function is hidden in the default [AStar2D] class."
+msgstr ""
+"Вызывается при вычислении стоимости между двумя соединенными точками.\n"
+"Обратите внимание, что эта функция скрыта в классе по умолчанию [AStar2D]."
+
+msgid ""
+"Called when estimating the cost between a point and the path's ending point.\n"
+"Note that this function is hidden in the default [AStar2D] class."
+msgstr ""
+"Вызывается при оценке стоимости между точкой и конечной точкой пути.\n"
+"Обратите внимание, что эта функция скрыта в классе по умолчанию [AStar2D]."
+
+msgid ""
+"Adds a new point at the given position with the given identifier. The [param "
+"id] must be 0 or larger, and the [param weight_scale] must be 0.0 or "
+"greater.\n"
+"The [param weight_scale] is multiplied by the result of [method "
+"_compute_cost] when determining the overall cost of traveling across a "
+"segment from a neighboring point to this point. Thus, all else being equal, "
+"the algorithm prefers points with lower [param weight_scale]s to form a "
+"path.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(1, 0), 4) # Adds the point (1, 0) with "
+"weight_scale 4 and id 1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(1, 0), 4); // Adds the point (1, 0) with "
+"weight_scale 4 and id 1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If there already exists a point for the given [param id], its position and "
+"weight scale are updated to the given values."
+msgstr ""
+"Добавляет новую точку в указанной позиции с указанным идентификатором. [param "
+"id] должен быть 0 или больше, а [param weight_scale] должен быть 0.0 или "
+"больше.\n"
+"[param weight_scale] умножается на результат [method _compute_cost] при "
+"определении общей стоимости перемещения по сегменту от соседней точки до этой "
+"точки. Таким образом, при прочих равных условиях алгоритм предпочитает точки "
+"с меньшими [param weight_scale] для формирования пути.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(1, 0), 4) # Adds the point (1, 0) with "
+"weight_scale 4 and id 1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(1, 0), 4); // Adds the point (1, 0) with "
+"weight_scale 4 and id 1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Если точка для указанного [param id] уже существует, ее положение и шкала "
+"веса обновляются до указанных значений."
+
+msgid ""
+"Returns whether there is a connection/segment between the given points. If "
+"[param bidirectional] is [code]false[/code], returns whether movement from "
+"[param id] to [param to_id] is possible through this segment."
+msgstr ""
+"Возвращает, есть ли соединение/сегмент между заданными точками. Если [param "
+"bidirectional] равен [code]false[/code], возвращает, возможно ли движение от "
+"[param id] до [param to_id] через этот сегмент."
+
+msgid "Clears all the points and segments."
+msgstr "Очищает все точки и сегменты."
+
+msgid ""
+"Creates a segment between the given points. If [param bidirectional] is "
+"[code]false[/code], only movement from [param id] to [param to_id] is "
+"allowed, not the reverse direction.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(1, 1))\n"
+"astar.add_point(2, Vector2(0, 5))\n"
+"astar.connect_points(1, 2, false)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(1, 1));\n"
+"astar.AddPoint(2, new Vector2(0, 5));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает сегмент между заданными точками. Если [param bidirectional] равен "
+"[code]false[/code], разрешено только движение от [param id] до [param to_id], "
+"но не в обратном направлении.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(1, 1))\n"
+"astar.add_point(2, Vector2(0, 5))\n"
+"astar.connect_points(1, 2, false)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(1, 1));\n"
+"astar.AddPoint(2, new Vector2(0, 5));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Deletes the segment between the given points. If [param bidirectional] is "
+"[code]false[/code], only movement from [param id] to [param to_id] is "
+"prevented, and a unidirectional segment possibly remains."
+msgstr ""
+"Удаляет сегмент между заданными точками. Если [param bidirectional] равен "
+"[code]false[/code], предотвращается только движение от [param id] до [param "
+"to_id], и возможно остается однонаправленный сегмент."
+
+msgid "Returns the next available point ID with no point associated to it."
+msgstr ""
+"Возвращает следующий доступный идентификатор точки без связанной с ним точки."
+
+msgid ""
+"Returns the ID of the closest point to [param to_position], optionally taking "
+"disabled points into account. Returns [code]-1[/code] if there are no points "
+"in the points pool.\n"
+"[b]Note:[/b] If several points are the closest to [param to_position], the "
+"one with the smallest ID will be returned, ensuring a deterministic result."
+msgstr ""
+"Возвращает идентификатор ближайшей точки к [param to_position], при "
+"необходимости принимая во внимание отключенные точки. Возвращает [code]-1[/"
+"code], если в пуле точек нет точек.\n"
+"[b]Примечание:[/b] Если несколько точек являются ближайшими к [param "
+"to_position], будет возвращена точка с наименьшим идентификатором, что "
+"гарантирует детерминированный результат."
+
+msgid ""
+"Returns the closest position to [param to_position] that resides inside a "
+"segment between two connected points.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 5))\n"
+"astar.connect_points(1, 2)\n"
+"var res = astar.get_closest_position_in_segment(Vector2(3, 3)) # Returns (0, "
+"3)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 5));\n"
+"astar.ConnectPoints(1, 2);\n"
+"Vector2 res = astar.GetClosestPositionInSegment(new Vector2(3, 3)); // "
+"Returns (0, 3)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The result is in the segment that goes from [code]y = 0[/code] to [code]y = "
+"5[/code]. It's the closest position in the segment to the given point."
+msgstr ""
+"Возвращает ближайшую позицию к [param to_position], которая находится внутри "
+"сегмента между двумя соединенными точками.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar2D.new()\n"
+"astar.add_point(1, Vector2(0, 0))\n"
+"astar.add_point(2, Vector2(0, 5))\n"
+"astar.connect_points(1, 2)\n"
+"var res = astar.get_closest_position_in_segment(Vector2(3, 3)) # Returns (0, "
+"3)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar2D();\n"
+"astar.AddPoint(1, new Vector2(0, 0));\n"
+"astar.AddPoint(2, new Vector2(0, 5));\n"
+"astar.ConnectPoints(1, 2);\n"
+"Vector2 res = astar.GetClosestPositionInSegment(new Vector2(3, 3)); // "
+"Returns (0, 3)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Результат находится в сегменте, который идет от [code]y = 0[/code] до [code]y "
+"= 5[/code]. Это ближайшая позиция в сегменте к заданной точке."
+
+msgid ""
+"Returns the capacity of the structure backing the points, useful in "
+"conjunction with [method reserve_space]."
+msgstr ""
+"Возвращает емкость структуры, поддерживающей точки, полезно в сочетании с "
+"[методом reserve_space]."
+
+msgid "Returns the number of points currently in the points pool."
+msgstr "Возвращает текущее количество баллов в пуле баллов."
+
+msgid ""
+"Returns an array with the points that are in the path found by AStar2D "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it "
+"will return an empty array and will print an error message.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish."
+msgstr ""
+"Возвращает массив с точками, которые находятся на пути, найденном AStar2D "
+"между заданными точками. Массив упорядочен от начальной точки до конечной "
+"точки пути.\n"
+"Если нет допустимого пути к цели, а [param allow_partial_path] равен "
+"[code]true[/code], возвращает путь к ближайшей к цели точке, до которой можно "
+"добраться.\n"
+"[b]Примечание:[/b] Этот метод не является потокобезопасным. При вызове из "
+"[Thread] он вернет пустой массив и выведет сообщение об ошибке.\n"
+"Кроме того, когда [param allow_partial_path] равен [code]true[/code], а "
+"[param to_id] отключен, поиск может занять необычно много времени для "
+"завершения."
+
+msgid ""
+"Returns whether a point is disabled or not for pathfinding. By default, all "
+"points are enabled."
+msgstr ""
+"Возвращает, отключена ли точка для поиска пути. По умолчанию все точки "
+"включены."
+
+msgid ""
+"Reserves space internally for [param num_nodes] points. Useful if you're "
+"adding a known large number of points at once, such as points on a grid. The "
+"new capacity must be greater or equal to the old capacity."
+msgstr ""
+"Резервирует внутреннее пространство для точек [param num_nodes]. Полезно, "
+"если вы добавляете известное большое количество точек одновременно, например, "
+"точек на сетке. Новая емкость должна быть больше или равна старой емкости."
+
+msgid ""
+"Disables or enables the specified point for pathfinding. Useful for making a "
+"temporary obstacle."
+msgstr ""
+"Отключает или включает указанную точку для поиска пути. Полезно для создания "
+"временного препятствия."
+
+msgid ""
+"Sets the [param weight_scale] for the point with the given [param id]. The "
+"[param weight_scale] is multiplied by the result of [method _compute_cost] "
+"when determining the overall cost of traveling across a segment from a "
+"neighboring point to this point."
+msgstr ""
+"Устанавливает [param weight_scale] для точки с заданным [param id]. [param "
+"weight_scale] умножается на результат [method _compute_cost] при определении "
+"общей стоимости перемещения по сегменту от соседней точки до этой точки."
+
+msgid ""
+"An implementation of A* for finding the shortest path between two vertices on "
+"a connected graph in 3D space."
+msgstr ""
+"Реализация A* для поиска кратчайшего пути между двумя вершинами связного "
+"графа в трехмерном пространстве."
+
+msgid ""
+"A* (A star) is a computer algorithm used in pathfinding and graph traversal, "
+"the process of plotting short paths among vertices (points), passing through "
+"a given set of edges (segments). It enjoys widespread use due to its "
+"performance and accuracy. Godot's A* implementation uses points in 3D space "
+"and Euclidean distances by default.\n"
+"You must add points manually with [method add_point] and create segments "
+"manually with [method connect_points]. Once done, you can test if there is a "
+"path between two points with the [method are_points_connected] function, get "
+"a path containing indices by [method get_id_path], or one containing actual "
+"coordinates with [method get_point_path].\n"
+"It is also possible to use non-Euclidean distances. To do so, create a script "
+"that extends [AStar3D] and override the methods [method _compute_cost] and "
+"[method _estimate_cost]. Both should take two point IDs and return the "
+"distance between the corresponding points.\n"
+"[b]Example:[/b] Use Manhattan distance instead of Euclidean distance:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"class_name MyAStar3D\n"
+"extends AStar3D\n"
+"\n"
+"func _compute_cost(u, v):\n"
+"    var u_pos = get_point_position(u)\n"
+"    var v_pos = get_point_position(v)\n"
+"    return abs(u_pos.x - v_pos.x) + abs(u_pos.y - v_pos.y) + abs(u_pos.z - "
+"v_pos.z)\n"
+"\n"
+"func _estimate_cost(u, v):\n"
+"    var u_pos = get_point_position(u)\n"
+"    var v_pos = get_point_position(v)\n"
+"    return abs(u_pos.x - v_pos.x) + abs(u_pos.y - v_pos.y) + abs(u_pos.z - "
+"v_pos.z)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[GlobalClass]\n"
+"public partial class MyAStar3D : AStar3D\n"
+"{\n"
+"    public override float _ComputeCost(long fromId, long toId)\n"
+"    {\n"
+"        Vector3 fromPoint = GetPointPosition(fromId);\n"
+"        Vector3 toPoint = GetPointPosition(toId);\n"
+"\n"
+"        return Mathf.Abs(fromPoint.X - toPoint.X) + Mathf.Abs(fromPoint.Y - "
+"toPoint.Y) + Mathf.Abs(fromPoint.Z - toPoint.Z);\n"
+"    }\n"
+"\n"
+"    public override float _EstimateCost(long fromId, long toId)\n"
+"    {\n"
+"        Vector3 fromPoint = GetPointPosition(fromId);\n"
+"        Vector3 toPoint = GetPointPosition(toId);\n"
+"        return Mathf.Abs(fromPoint.X - toPoint.X) + Mathf.Abs(fromPoint.Y - "
+"toPoint.Y) + Mathf.Abs(fromPoint.Z - toPoint.Z);\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[method _estimate_cost] should return a lower bound of the distance, i.e. "
+"[code]_estimate_cost(u, v) <= _compute_cost(u, v)[/code]. This serves as a "
+"hint to the algorithm because the custom [method _compute_cost] might be "
+"computation-heavy. If this is not the case, make [method _estimate_cost] "
+"return the same value as [method _compute_cost] to provide the algorithm with "
+"the most accurate information.\n"
+"If the default [method _estimate_cost] and [method _compute_cost] methods are "
+"used, or if the supplied [method _estimate_cost] method returns a lower bound "
+"of the cost, then the paths returned by A* will be the lowest-cost paths. "
+"Here, the cost of a path equals the sum of the [method _compute_cost] results "
+"of all segments in the path multiplied by the [code]weight_scale[/code]s of "
+"the endpoints of the respective segments. If the default methods are used and "
+"the [code]weight_scale[/code]s of all points are set to [code]1.0[/code], "
+"then this equals the sum of Euclidean distances of all segments in the path."
+msgstr ""
+"A* (звезда) — это компьютерный алгоритм, используемый в поиске пути и обходе "
+"графа, процессе построения коротких путей между вершинами (точками), "
+"проходящих через заданный набор ребер (сегментов). Он широко используется "
+"благодаря своей производительности и точности. Реализация Godot's A* по "
+"умолчанию использует точки в трехмерном пространстве и евклидовы расстояния.\n"
+"Вы должны вручную добавлять точки с помощью [method add_point] и вручную "
+"создавать сегменты с помощью [method connect_points]. После этого вы можете "
+"проверить, есть ли путь между двумя точками, с помощью функции [method "
+"are_points_connected], получить путь, содержащий индексы, с помощью [method "
+"get_id_path] или путь, содержащий фактические координаты, с помощью [method "
+"get_point_path].\n"
+"Также возможно использовать неевклидовы расстояния. Для этого создайте "
+"скрипт, который расширяет [AStar3D] и переопределяет методы [method "
+"_compute_cost] и [method _estimate_cost]. Оба должны принимать два "
+"идентификатора точек и возвращать расстояние между соответствующими точками.\n"
+"[b]Пример:[/b] Используйте Манхэттенское (Manhattan) расстояние вместо "
+"евклидова расстояния:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"class_name MyAStar3D\n"
+"extends AStar3D\n"
+"\n"
+"func _compute_cost(u, v):\n"
+"    var u_pos = get_point_position(u)\n"
+"    var v_pos = get_point_position(v)\n"
+"    return abs(u_pos.x - v_pos.x) + abs(u_pos.y - v_pos.y) + abs(u_pos.z - "
+"v_pos.z)\n"
+"\n"
+"func _estimate_cost(u, v):\n"
+"    var u_pos = get_point_position(u)\n"
+"    var v_pos = get_point_position(v)\n"
+"    return abs(u_pos.x - v_pos.x) + abs(u_pos.y - v_pos.y) + abs(u_pos.z - "
+"v_pos.z)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[GlobalClass]\n"
+"public partial class MyAStar3D : AStar3D\n"
+"{\n"
+"    public override float _ComputeCost(long fromId, long toId)\n"
+"    {\n"
+"        Vector3 fromPoint = GetPointPosition(fromId);\n"
+"        Vector3 toPoint = GetPointPosition(toId);\n"
+"\n"
+"        return Mathf.Abs(fromPoint.X - toPoint.X) + Mathf.Abs(fromPoint.Y - "
+"toPoint.Y) + Mathf.Abs(fromPoint.Z - toPoint.Z);\n"
+"    }\n"
+"\n"
+"    public override float _EstimateCost(long fromId, long toId)\n"
+"    {\n"
+"        Vector3 fromPoint = GetPointPosition(fromId);\n"
+"        Vector3 toPoint = GetPointPosition(toId);\n"
+"        return Mathf.Abs(fromPoint.X - toPoint.X) + Mathf.Abs(fromPoint.Y - "
+"toPoint.Y) + Mathf.Abs(fromPoint.Z - toPoint.Z);\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[method _estimate_cost] должен возвращать нижнюю границу расстояния, т. е. "
+"[code]_estimate_cost(u, v) <= _compute_cost(u, v)[/code]. Это служит "
+"подсказкой для алгоритма, поскольку пользовательский [method _compute_cost] "
+"может быть вычислительно интенсивным. Если это не так, заставьте [method "
+"_estimate_cost] возвращать то же значение, что и [method _compute_cost], "
+"чтобы предоставить алгоритму наиболее точную информацию.\n"
+"Если используются методы по умолчанию [method _estimate_cost] и [method "
+"_compute_cost] или если предоставленный метод [method _estimate_cost] "
+"возвращает нижнюю границу стоимости, то пути, возвращаемые A*, будут путями с "
+"наименьшей стоимостью. Здесь стоимость пути равна сумме результатов [method "
+"_compute_cost] всех сегментов в пути, умноженных на [code]weight_scale[/"
+"code]s конечных точек соответствующих сегментов. Если используются методы по "
+"умолчанию и [code]weight_scale[/code]s всех точек установлены на [code]1.0[/"
+"code], то это равно сумме евклидовых расстояний всех сегментов в пути."
+
+msgid ""
+"Called when computing the cost between two connected points.\n"
+"Note that this function is hidden in the default [AStar3D] class."
+msgstr ""
+"Вызывается при вычислении стоимости между двумя соединенными точками.\n"
+"Обратите внимание, что эта функция скрыта в классе по умолчанию [AStar3D]."
+
+msgid ""
+"Called when estimating the cost between a point and the path's ending point.\n"
+"Note that this function is hidden in the default [AStar3D] class."
+msgstr ""
+"Вызывается при оценке стоимости между точкой и конечной точкой пути.\n"
+"Обратите внимание, что эта функция скрыта в классе по умолчанию [AStar3D]."
+
+msgid ""
+"Adds a new point at the given position with the given identifier. The [param "
+"id] must be 0 or larger, and the [param weight_scale] must be 0.0 or "
+"greater.\n"
+"The [param weight_scale] is multiplied by the result of [method "
+"_compute_cost] when determining the overall cost of traveling across a "
+"segment from a neighboring point to this point. Thus, all else being equal, "
+"the algorithm prefers points with lower [param weight_scale]s to form a "
+"path.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(1, 0, 0), 4) # Adds the point (1, 0, 0) with "
+"weight_scale 4 and id 1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(1, 0, 0), 4); // Adds the point (1, 0, 0) with "
+"weight_scale 4 and id 1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If there already exists a point for the given [param id], its position and "
+"weight scale are updated to the given values."
+msgstr ""
+"Добавляет новую точку в указанной позиции с указанным идентификатором. [param "
+"id] должен быть 0 или больше, а [param weight_scale] должен быть 0.0 или "
+"больше.\n"
+"[param weight_scale] умножается на результат [method _compute_cost] при "
+"определении общей стоимости перемещения по сегменту от соседней точки до этой "
+"точки. Таким образом, при прочих равных условиях алгоритм предпочитает точки "
+"с меньшими [param weight_scale] для формирования пути.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(1, 0, 0), 4) # Adds the point (1, 0, 0) with "
+"weight_scale 4 and id 1\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(1, 0, 0), 4); // Adds the point (1, 0, 0) with "
+"weight_scale 4 and id 1\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Если точка для указанного [param id] уже существует, ее положение и шкала "
+"веса обновляются до указанных значений."
+
+msgid ""
+"Returns whether the two given points are directly connected by a segment. If "
+"[param bidirectional] is [code]false[/code], returns whether movement from "
+"[param id] to [param to_id] is possible through this segment."
+msgstr ""
+"Возвращает, соединены ли две заданные точки напрямую сегментом. Если [param "
+"bidirectional] равен [code]false[/code], возвращает, возможно ли движение из "
+"[param id] в [param to_id] через этот сегмент."
+
+msgid ""
+"Creates a segment between the given points. If [param bidirectional] is "
+"[code]false[/code], only movement from [param id] to [param to_id] is "
+"allowed, not the reverse direction.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(1, 1, 0))\n"
+"astar.add_point(2, Vector3(0, 5, 0))\n"
+"astar.connect_points(1, 2, false)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 5, 0));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает сегмент между заданными точками. Если [param bidirectional] равен "
+"[code]false[/code], разрешено только движение от [param id] до [param to_id], "
+"но не в обратном направлении.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(1, 1, 0))\n"
+"astar.add_point(2, Vector3(0, 5, 0))\n"
+"astar.connect_points(1, 2, false)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(1, 1, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 5, 0));\n"
+"astar.ConnectPoints(1, 2, false);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the closest position to [param to_position] that resides inside a "
+"segment between two connected points.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 5, 0))\n"
+"astar.connect_points(1, 2)\n"
+"var res = astar.get_closest_position_in_segment(Vector3(3, 3, 0)) # Returns "
+"(0, 3, 0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 5, 0));\n"
+"astar.ConnectPoints(1, 2);\n"
+"Vector3 res = astar.GetClosestPositionInSegment(new Vector3(3, 3, 0)); // "
+"Returns (0, 3, 0)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The result is in the segment that goes from [code]y = 0[/code] to [code]y = "
+"5[/code]. It's the closest position in the segment to the given point."
+msgstr ""
+"Возвращает ближайшую позицию к [param to_position], которая находится внутри "
+"сегмента между двумя соединенными точками.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar = AStar3D.new()\n"
+"astar.add_point(1, Vector3(0, 0, 0))\n"
+"astar.add_point(2, Vector3(0, 5, 0))\n"
+"astar.connect_points(1, 2)\n"
+"var res = astar.get_closest_position_in_segment(Vector3(3, 3, 0)) # Returns "
+"(0, 3, 0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var astar = new AStar3D();\n"
+"astar.AddPoint(1, new Vector3(0, 0, 0));\n"
+"astar.AddPoint(2, new Vector3(0, 5, 0));\n"
+"astar.ConnectPoints(1, 2);\n"
+"Vector3 res = astar.GetClosestPositionInSegment(new Vector3(3, 3, 0)); // "
+"Returns (0, 3, 0)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Результат находится в сегменте, который идет от [code]y = 0[/code] до [code]y "
+"= 5[/code]. Это ближайшая позиция в сегменте к заданной точке."
+
+msgid ""
+"Returns an array with the points that are in the path found by AStar3D "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it "
+"will return an empty array and will print an error message.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is disabled the search may take an unusually long time to finish."
+msgstr ""
+"Возвращает массив с точками, которые находятся на пути, найденном AStar3D "
+"между заданными точками. Массив упорядочен от начальной точки до конечной "
+"точки пути.\n"
+"Если допустимого пути к цели нет, а [param allow_partial_path] равен "
+"[code]true[/code], возвращает путь к ближайшей к цели точке, до которой можно "
+"добраться.\n"
+"[b]Примечание:[/b] Этот метод не является потоко-безопасным. Если он вызван "
+"из [Thread], он вернет пустой массив и выведет сообщение об ошибке.\n"
+"Кроме того, когда [param allow_partial_path] имеет значение [code]true[/"
+"code], а [param to_id] отключен, поиск может занять необычно много времени."
+
+msgid ""
+"Reserves space internally for [param num_nodes] points. Useful if you're "
+"adding a known large number of points at once, such as points on a grid. New "
+"capacity must be greater or equals to old capacity."
+msgstr ""
+"Резервирует внутреннее пространство для точек [param num_nodes]. Полезно, "
+"если вы добавляете известное большое количество точек одновременно, например, "
+"точек на сетке. Новая емкость должна быть больше или равна старой емкости."
+
+msgid ""
+"An implementation of A* for finding the shortest path between two points on a "
+"partial 2D grid."
+msgstr ""
+"Реализация A* для поиска кратчайшего пути между двумя точками на частичной "
+"двумерной сетке."
+
+msgid ""
+"[AStarGrid2D] is a variant of [AStar2D] that is specialized for partial 2D "
+"grids. It is simpler to use because it doesn't require you to manually create "
+"points and connect them together. This class also supports multiple types of "
+"heuristics, modes for diagonal movement, and a jumping mode to speed up "
+"calculations.\n"
+"To use [AStarGrid2D], you only need to set the [member region] of the grid, "
+"optionally set the [member cell_size], and then call the [method update] "
+"method:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar_grid = AStarGrid2D.new()\n"
+"astar_grid.region = Rect2i(0, 0, 32, 32)\n"
+"astar_grid.cell_size = Vector2(16, 16)\n"
+"astar_grid.update()\n"
+"print(astar_grid.get_id_path(Vector2i(0, 0), Vector2i(3, 4))) # Prints [(0, "
+"0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"print(astar_grid.get_point_path(Vector2i(0, 0), Vector2i(3, 4))) # Prints "
+"[(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"AStarGrid2D astarGrid = new AStarGrid2D();\n"
+"astarGrid.Region = new Rect2I(0, 0, 32, 32);\n"
+"astarGrid.CellSize = new Vector2I(16, 16);\n"
+"astarGrid.Update();\n"
+"GD.Print(astarGrid.GetIdPath(Vector2I.Zero, new Vector2I(3, 4))); // Prints "
+"[(0, 0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"GD.Print(astarGrid.GetPointPath(Vector2I.Zero, new Vector2I(3, 4))); // "
+"Prints [(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To remove a point from the pathfinding grid, it must be set as \"solid\" with "
+"[method set_point_solid]."
+msgstr ""
+"[AStarGrid2D] — это вариант [AStar2D], который специализирован для частичных "
+"2D-сеток. Он проще в использовании, поскольку не требует ручного создания "
+"точек и их соединения. Этот класс также поддерживает несколько типов "
+"эвристик, режимы для диагонального перемещения и режим прыжка для ускорения "
+"вычислений.\n"
+"Чтобы использовать [AStarGrid2D], вам нужно только задать [member region] "
+"сетки, опционально задать [member cell_size], а затем вызвать метод [method "
+"update]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var astar_grid = AStarGrid2D.new()\n"
+"astar_grid.region = Rect2i(0, 0, 32, 32)\n"
+"astar_grid.cell_size = Vector2(16, 16)\n"
+"astar_grid.update()\n"
+"print(astar_grid.get_id_path(Vector2i(0, 0), Vector2i(3, 4))) # Prints [(0, "
+"0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"print(astar_grid.get_point_path(Vector2i(0, 0), Vector2i(3, 4))) # Prints "
+"[(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"AStarGrid2D astarGrid = new AStarGrid2D();\n"
+"astarGrid.Region = new Rect2I(0, 0, 32, 32);\n"
+"astarGrid.CellSize = new Vector2I(16, 16);\n"
+"astarGrid.Update();\n"
+"GD.Print(astarGrid.GetIdPath(Vector2I.Zero, new Vector2I(3, 4))); // Prints "
+"[(0, 0), (1, 1), (2, 2), (3, 3), (3, 4)]\n"
+"GD.Print(astarGrid.GetPointPath(Vector2I.Zero, new Vector2I(3, 4))); // "
+"Prints [(0, 0), (16, 16), (32, 32), (48, 48), (48, 64)]\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Чтобы удалить точку из сетки поиска пути, ее необходимо сделать «сплошной» с "
+"помощью [метода set_point_solid]."
+
+msgid ""
+"Called when computing the cost between two connected points.\n"
+"Note that this function is hidden in the default [AStarGrid2D] class."
+msgstr ""
+"Вызывается при вычислении стоимости между двумя соединенными точками.\n"
+"Обратите внимание, что эта функция скрыта по умолчанию в классе [AStarGrid2D]."
+
+msgid ""
+"Called when estimating the cost between a point and the path's ending point.\n"
+"Note that this function is hidden in the default [AStarGrid2D] class."
+msgstr ""
+"Вызывается при оценке стоимости между точкой и конечной точкой пути.\n"
+"Обратите внимание, что эта функция скрыта по умолчанию в классе [AStarGrid2D]."
+
+msgid ""
+"Clears the grid and sets the [member region] to [code]Rect2i(0, 0, 0, 0)[/"
+"code]."
+msgstr ""
+"Очищает сетку и устанавливает [member region] на [code]Rect2i(0, 0, 0, 0)[/"
+"code]."
+
+msgid ""
+"Fills the given [param region] on the grid with the specified value for the "
+"solid flag.\n"
+"[b]Note:[/b] Calling [method update] is not needed after the call of this "
+"function."
+msgstr ""
+"Заполняет указанную [область параметров] на сетке указанным значением для "
+"флага сплошной заливки.\n"
+"[b]Примечание:[/b] Вызов [метода обновления] не требуется после вызова этой "
+"функции."
+
+msgid ""
+"Fills the given [param region] on the grid with the specified value for the "
+"weight scale.\n"
+"[b]Note:[/b] Calling [method update] is not needed after the call of this "
+"function."
+msgstr ""
+"Заполняет указанную [область параметров] на сетке указанным значением для "
+"весовой шкалы.\n"
+"[b]Примечание:[/b] Вызов [обновления метода] не требуется после вызова этой "
+"функции."
+
+msgid ""
+"Returns an array with the IDs of the points that form the path found by "
+"AStar2D between the given points. The array is ordered from the starting "
+"point to the ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] When [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is solid the search may take an unusually long time to finish."
+msgstr ""
+"Возвращает массив с идентификаторами точек, которые формируют путь, найденный "
+"AStar2D между заданными точками. Массив упорядочен от начальной точки до "
+"конечной точки пути.\n"
+"Если нет допустимого пути к цели, а [param allow_partial_path] равен "
+"[code]true[/code], возвращает путь к ближайшей к цели точке, до которой можно "
+"добраться.\n"
+"[b]Примечание:[/b] Когда [param allow_partial_path] равен [code]true[/code], "
+"а [param to_id] — сплошной, поиск может занять необычно много времени."
+
+msgid ""
+"Returns an array of dictionaries with point data ([code]id[/code]: "
+"[Vector2i], [code]position[/code]: [Vector2], [code]solid[/code]: [bool], "
+"[code]weight_scale[/code]: [float]) within a [param region]."
+msgstr ""
+"Возвращает массив словарей с данными точек ([code]id[/code]: [Vector2i], "
+"[code]position[/code]: [Vector2], [code]solid[/code]: [bool], "
+"[code]weight_scale[/code]: [float]) в области [param]."
+
+msgid ""
+"Returns an array with the points that are in the path found by [AStarGrid2D] "
+"between the given points. The array is ordered from the starting point to the "
+"ending point of the path.\n"
+"If there is no valid path to the target, and [param allow_partial_path] is "
+"[code]true[/code], returns a path to the point closest to the target that can "
+"be reached.\n"
+"[b]Note:[/b] This method is not thread-safe. If called from a [Thread], it "
+"will return an empty array and will print an error message.\n"
+"Additionally, when [param allow_partial_path] is [code]true[/code] and [param "
+"to_id] is solid the search may take an unusually long time to finish."
+msgstr ""
+"Возвращает массив с точками, которые находятся на пути, найденном "
+"[AStarGrid2D] между заданными точками. Массив упорядочен от начальной точки "
+"до конечной точки пути.\n"
+"Если нет допустимого пути к цели, а [param allow_partial_path] равен "
+"[code]true[/code], возвращает путь к ближайшей к цели точке, до которой можно "
+"добраться.\n"
+"[b]Примечание:[/b] Этот метод не является потокобезопасным. При вызове из "
+"[Thread] он вернет пустой массив и выведет сообщение об ошибке.\n"
+"Кроме того, когда [param allow_partial_path] равен [code]true[/code], а "
+"[param to_id] является сплошным, поиск может занять необычно много времени "
+"для завершения."
+
+msgid ""
+"Indicates that the grid parameters were changed and [method update] needs to "
+"be called."
+msgstr ""
+"Указывает, что параметры сетки были изменены и необходимо вызвать [метод "
+"update]."
+
+msgid ""
+"Disables or enables the specified point for pathfinding. Useful for making an "
+"obstacle. By default, all points are enabled.\n"
+"[b]Note:[/b] Calling [method update] is not needed after the call of this "
+"function."
+msgstr ""
+"Отключает или включает указанную точку для поиска пути. Полезно для создания "
+"препятствия. По умолчанию включены все точки.\n"
+"[b]Примечание:[/b] Вызов [method update] не требуется после вызова этой "
+"функции."
+
+msgid ""
+"Sets the [param weight_scale] for the point with the given [param id]. The "
+"[param weight_scale] is multiplied by the result of [method _compute_cost] "
+"when determining the overall cost of traveling across a segment from a "
+"neighboring point to this point.\n"
+"[b]Note:[/b] Calling [method update] is not needed after the call of this "
+"function."
+msgstr ""
+"Устанавливает [param weight_scale] для точки с заданным [param id]. [param "
+"weight_scale] умножается на результат [method _compute_cost] при определении "
+"общей стоимости перемещения по сегменту от соседней точки до этой точки.\n"
+"[b]Примечание:[/b] Вызов [method update] не требуется после вызова этой "
+"функции."
+
+msgid ""
+"Updates the internal state of the grid according to the parameters to prepare "
+"it to search the path. Needs to be called if parameters like [member region], "
+"[member cell_size] or [member offset] are changed. [method is_dirty] will "
+"return [code]true[/code] if this is the case and this needs to be called.\n"
+"[b]Note:[/b] All point data (solidity and weight scale) will be cleared."
+msgstr ""
+"Обновляет внутреннее состояние сетки в соответствии с параметрами, чтобы "
+"подготовить ее к поиску пути. Необходимо вызывать, если параметры, такие как "
+"[member region], [member cell_size] или [member offset], изменены. [method "
+"is_dirty] вернет [code]true[/code], если это так и это необходимо вызвать.\n"
+"[b]Примечание:[/b] Все данные точек (твердость и шкала веса) будут очищены."
+
+msgid ""
+"The cell shape. Affects how the positions are placed in the grid. If changed, "
+"[method update] needs to be called before finding the next path."
+msgstr ""
+"Форма ячейки. Влияет на то, как позиции размещаются в сетке. Если изменено, "
+"необходимо вызвать [метод update] перед поиском следующего пути."
+
+msgid ""
+"The size of the point cell which will be applied to calculate the resulting "
+"point position returned by [method get_point_path]. If changed, [method "
+"update] needs to be called before finding the next path."
+msgstr ""
+"Размер ячейки точки, который будет применен для расчета результирующей "
+"позиции точки, возвращаемой [методом get_point_path]. Если изменено, [метод "
+"update] необходимо вызвать перед поиском следующего пути."
+
+msgid ""
+"The default [enum Heuristic] which will be used to calculate the cost between "
+"two points if [method _compute_cost] was not overridden."
+msgstr ""
+"Значение по умолчанию [enum Heuristic], которое будет использоваться для "
+"расчета стоимости между двумя точками, если [method _compute_cost] не был "
+"переопределен."
+
+msgid ""
+"The default [enum Heuristic] which will be used to calculate the cost between "
+"the point and the end point if [method _estimate_cost] was not overridden."
+msgstr ""
+"Значение по умолчанию [enum Heuristic], которое будет использоваться для "
+"расчета стоимости между точкой и конечной точкой, если [method "
+"_estimate_cost] не был переопределен."
+
+msgid ""
+"A specific [enum DiagonalMode] mode which will force the path to avoid or "
+"accept the specified diagonals."
+msgstr ""
+"Конкретный режим [enum DiagonalMode], который заставит путь избегать или "
+"принимать указанные диагонали."
+
+msgid ""
+"Enables or disables jumping to skip up the intermediate points and speeds up "
+"the searching algorithm.\n"
+"[b]Note:[/b] Currently, toggling it on disables the consideration of weight "
+"scaling in pathfinding."
+msgstr ""
+"Включает или отключает возможность перехода через промежуточные точки и "
+"ускоряет алгоритм поиска.\n"
+"[b]Примечание:[/b] В настоящее время включение отключает учет масштабирования "
+"веса при поиске пути."
+
+msgid ""
+"The offset of the grid which will be applied to calculate the resulting point "
+"position returned by [method get_point_path]. If changed, [method update] "
+"needs to be called before finding the next path."
+msgstr ""
+"Смещение сетки, которое будет применено для расчета результирующего положения "
+"точки, возвращаемого [методом get_point_path]. Если изменено, [метод update] "
+"необходимо вызвать перед поиском следующего пути."
+
+msgid ""
+"The region of grid cells available for pathfinding. If changed, [method "
+"update] needs to be called before finding the next path."
+msgstr ""
+"Область ячеек сетки, доступная для поиска пути. Если изменено, необходимо "
+"вызвать [метод update] перед поиском следующего пути."
+
+msgid "Use [member region] instead."
+msgstr "Вместо этого используйте [member region]."
+
+msgid ""
+"The size of the grid (number of cells of size [member cell_size] on each "
+"axis). If changed, [method update] needs to be called before finding the next "
+"path."
+msgstr ""
+"Размер сетки (количество ячеек размером [member cell_size] на каждой оси). "
+"Если изменено, необходимо вызвать [method update] перед поиском следующего "
+"пути."
+
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/Euclidean_distance]Euclidean "
+"heuristic[/url] to be used for the pathfinding using the following formula:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"result = sqrt(dx * dx + dy * dy)\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This is also the internal heuristic used in [AStar3D] and "
+"[AStar2D] by default (with the inclusion of possible z-axis coordinate)."
+msgstr ""
+"[url=https://en.wikipedia.org/wiki/Euclidean_distance]Евклидова эвристика "
+"(Euclidean heuristic) [/url], используемая для поиска пути, по следующей "
+"формуле:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"result = sqrt(dx * dx + dy * dy)\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Это также внутренняя эвристика, используемая в [AStar3D] и "
+"[AStar2D] по умолчанию (с включением возможной координаты оси z)."
+
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/Taxicab_geometry]Manhattan heuristic[/"
+"url] to be used for the pathfinding using the following formula:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"result = dx + dy\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This heuristic is intended to be used with 4-side orthogonal "
+"movements, provided by setting the [member diagonal_mode] to [constant "
+"DIAGONAL_MODE_NEVER]."
+msgstr ""
+"[url=https://en.wikipedia.org/wiki/Taxicab_geometry]Manhattan heuristic[/url] "
+"для использования при поиске пути с использованием следующей формулы:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"result = dx + dy\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Эта эвристика предназначена для использования с 4-"
+"сторонними ортогональными движениями, обеспечиваемыми установкой [member "
+"dialog_mode] на [constant DIAGONAL_MODE_NEVER]."
+
+msgid ""
+"The Octile heuristic to be used for the pathfinding using the following "
+"formula:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"f = sqrt(2) - 1\n"
+"result = (dx < dy) ? f * dx + dy : f * dy + dx;\n"
+"[/codeblock]"
+msgstr ""
+"Эвристика Octile, используемая для поиска пути, использует следующую "
+"формулу:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"f = sqrt(2) - 1\n"
+"result = (dx < dy) ? f * dx + dy : f * dy + dx;\n"
+"[/codeblock]"
+
+msgid ""
+"The [url=https://en.wikipedia.org/wiki/Chebyshev_distance]Chebyshev "
+"heuristic[/url] to be used for the pathfinding using the following formula:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"result = max(dx, dy)\n"
+"[/codeblock]"
+msgstr ""
+"[url=https://en.wikipedia.org/wiki/Chebyshev_distance]Chebyshev heuristic[/"
+"url] для использования при поиске пути с использованием следующей формулы:\n"
+"[codeblock]\n"
+"dx = abs(to_id.x - from_id.x)\n"
+"dy = abs(to_id.y - from_id.y)\n"
+"result = max(dx, dy)\n"
+"[/codeblock]"
+
+msgid ""
+"The pathfinding algorithm will ignore solid neighbors around the target cell "
+"and allow passing using diagonals."
+msgstr ""
+"Алгоритм поиска пути будет игнорировать сплошных соседей вокруг целевой "
+"ячейки и разрешать проход по диагоналям."
+
+msgid ""
+"The pathfinding algorithm will ignore all diagonals and the way will be "
+"always orthogonal."
+msgstr ""
+"Алгоритм поиска пути будет игнорировать все диагонали, и путь всегда будет "
+"ортогональным."
+
+msgid ""
+"The pathfinding algorithm will avoid using diagonals if at least two "
+"obstacles have been placed around the neighboring cells of the specific path "
+"segment."
+msgstr ""
+"Алгоритм поиска пути избегает использования диагоналей, если вокруг соседних "
+"ячеек определенного сегмента пути размещено не менее двух препятствий."
+
+msgid ""
+"The pathfinding algorithm will avoid using diagonals if any obstacle has been "
+"placed around the neighboring cells of the specific path segment."
+msgstr ""
+"Алгоритм поиска пути избегает использования диагоналей, если вокруг соседних "
+"ячеек определенного сегмента пути размещено какое-либо препятствие."
+
+msgid ""
+"Diamond cell shape (for isometric look). Cell coordinates layout where the "
+"horizontal axis goes up-right, and the vertical one goes down-right."
+msgstr ""
+"Форма ячейки ромба (для изометрического вида). Координаты ячейки, где "
+"горизонтальная ось идет вверх-вправо, а вертикальная — вниз-вправо."
+
+msgid ""
+"Diamond cell shape (for isometric look). Cell coordinates layout where the "
+"horizontal axis goes down-right, and the vertical one goes down-left."
+msgstr ""
+"Форма ячейки ромба (для изометрического вида). Координаты ячейки, где "
+"горизонтальная ось идет вниз-вправо, а вертикальная — вниз-влево."
+
+msgid "A texture that crops out part of another Texture2D."
+msgstr "Текстура, которая вырезает часть другой Texture2D."
+
+msgid ""
+"[Texture2D] resource that draws only part of its [member atlas] texture, as "
+"defined by the [member region]. An additional [member margin] can also be "
+"set, which is useful for small adjustments.\n"
+"Multiple [AtlasTexture] resources can be cropped from the same [member "
+"atlas]. Packing many smaller textures into a singular large texture helps to "
+"optimize video memory costs and render calls.\n"
+"[b]Note:[/b] [AtlasTexture] cannot be used in an [AnimatedTexture], and will "
+"not tile properly in nodes such as [TextureRect] or [Sprite2D]. To tile an "
+"[AtlasTexture], modify its [member region] instead."
+msgstr ""
+"Ресурс [Texture2D], который рисует только часть своей текстуры [member "
+"atlas], как определено [member region]. Также можно задать дополнительное "
+"[member margin], что полезно для небольших корректировок.\n"
+"Множественные ресурсы [AtlasTexture] можно обрезать из одного [member atlas]. "
+"Упаковка множества меньших текстур в одну большую текстуру помогает "
+"оптимизировать затраты видеопамяти и вызовы рендеринга.\n"
+"[b]Примечание:[/b] [AtlasTexture] нельзя использовать в [AnimatedTexture], и "
+"он не будет правильно размещаться в таких узлах, как [TextureRect] или "
+"[Sprite2D]. Чтобы разместить [AtlasTexture], измените его [member region]."
+
+msgid ""
+"The texture that contains the atlas. Can be any type inheriting from "
+"[Texture2D], including another [AtlasTexture]."
+msgstr ""
+"Текстура, содержащая атлас. Может быть любого типа, наследуемого от "
+"[Texture2D], включая другой [AtlasTexture]."
+
+msgid ""
+"If [code]true[/code], the area outside of the [member region] is clipped to "
+"avoid bleeding of the surrounding texture pixels."
+msgstr ""
+"Если [code]true[/code], область за пределами [member region] обрезается, "
+"чтобы избежать утечки окружающих пикселей текстуры."
+
+msgid ""
+"The margin around the [member region]. Useful for small adjustments. If the "
+"[member Rect2.size] of this property (\"w\" and \"h\" in the editor) is set, "
+"the drawn texture is resized to fit within the margin."
+msgstr ""
+"Поле вокруг [member region]. Полезно для небольших корректировок. Если задано "
+"[member Rect2.size] этого свойства (\"w\" и \"h\" в редакторе), нарисованная "
+"текстура изменяет размер, чтобы вписаться в поле."
+
+msgid ""
+"The region used to draw the [member atlas]. If either dimension of the "
+"region's size is [code]0[/code], the value from [member atlas] size will be "
+"used for that axis instead."
+msgstr ""
+"Регион, используемый для рисования [member atlas]. Если какое-либо измерение "
+"размера региона равно [code]0[/code], вместо этого для этой оси будет "
+"использоваться значение из [member atlas]."
+
+msgid "Stores information about the audio buses."
+msgstr "Сохраняет информацию об аудио шинах."
+
+msgid ""
+"Stores position, muting, solo, bypass, effects, effect position, volume, and "
+"the connections between buses. See [AudioServer] for usage."
+msgstr ""
+"Сохраняет позицию, отключение звука, соло, обход, эффекты, позицию эффекта, "
+"громкость и соединения между шинами. См. [AudioServer] для использования."
+
+msgid ""
+"The base [Resource] for every audio effect. In the editor, an audio effect "
+"can be added to the current bus layout through the Audio panel. At run-time, "
+"it is also possible to manipulate audio effects through [method AudioServer."
+"add_bus_effect], [method AudioServer.remove_bus_effect], and [method "
+"AudioServer.get_bus_effect].\n"
+"When applied on a bus, an audio effect creates a corresponding "
+"[AudioEffectInstance]. The instance is directly responsible for manipulating "
+"the sound, based on the original audio effect's properties."
+msgstr ""
+"Базовый [Ресурс] для каждого аудио-эффекта. В редакторе аудио-эффект можно "
+"добавить к текущему макету шины через панель Аудио. Во время выполнения также "
+"можно управлять аудио-эффектами через [метод AudioServer.add_bus_effect], "
+"[метод AudioServer.remove_bus_effect] и [метод AudioServer.get_bus_effect].\n"
+"При применении к шине аудио-эффект создает соответствующий "
+"[AudioEffectInstance]. Экземпляр напрямую отвечает за управление звуком на "
+"основе свойств исходного аудио-эффекта."
+
+msgid "Audio buses"
+msgstr "Аудиошины"
+
+msgid ""
+"Override this method to customize the [AudioEffectInstance] created when this "
+"effect is applied on a bus in the editor's Audio panel, or through [method "
+"AudioServer.add_bus_effect].\n"
+"[codeblock]\n"
+"extends AudioEffect\n"
+"\n"
+"@export var strength = 4.0\n"
+"\n"
+"func _instantiate():\n"
+"    var effect = CustomAudioEffectInstance.new()\n"
+"    effect.base = self\n"
+"\n"
+"    return effect\n"
+"[/codeblock]\n"
+"[b]Note:[/b] It is recommended to keep a reference to the original "
+"[AudioEffect] in the new instance. Depending on the implementation this "
+"allows the effect instance to listen for changes at run-time and be modified "
+"accordingly."
+msgstr ""
+"Переопределите этот метод, чтобы настроить [AudioEffectInstance], создаваемый "
+"при применении этого эффекта к шине на панели «Аудио» редактора или через "
+"[method AudioServer.add_bus_effect].\n"
+"[codeblock]\n"
+"extends AudioEffect\n"
+"\n"
+"@export var strength = 4.0\n"
+"\n"
+"func _instantiate():\n"
+"    var effect = CustomAudioEffectInstance.new()\n"
+"    effect.base = self\n"
+"\n"
+"    return effect\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Рекомендуется сохранить ссылку на оригинальный "
+"[AudioEffect] в новом экземпляре. В зависимости от реализации это позволяет "
+"экземпляру эффекта прослушивать изменения во время выполнения и изменяться "
+"соответствующим образом."
+
+msgid "Adds an amplifying audio effect to an audio bus."
+msgstr "Добавляет эффект усиления звука к аудио-шине."
+
+msgid "Increases or decreases the volume being routed through the audio bus."
+msgstr "Увеличивает или уменьшает громкость, передаваемую через аудио-шину."
+
+msgid ""
+"Amount of amplification in decibels. Positive values make the sound louder, "
+"negative values make it quieter. Value can range from -80 to 24."
+msgstr ""
+"Величина усиления в децибелах. Положительные значения делают звук громче, "
+"отрицательные — тише. Значение может быть в диапазоне от -80 до 24."
+
+msgid ""
+"Amount of amplification as a linear value.\n"
+"[b]Note:[/b] This member modifies [member volume_db] for convenience. The "
+"returned value is equivalent to the result of [method @GlobalScope."
+"db_to_linear] on [member volume_db]. Setting this member is equivalent to "
+"setting [member volume_db] to the result of [method @GlobalScope."
+"linear_to_db] on a value."
+msgstr ""
+"Величина усиления как линейное значение.\n"
+"[b]Примечание:[/b] Этот член изменяет [member volume_db] для удобства. "
+"Возвращаемое значение эквивалентно результату [method @GlobalScope."
+"db_to_linear] для [member volume_db]. Установка этого члена эквивалентна "
+"установке [member volume_db] на результат [method @GlobalScope.linear_to_db] "
+"для значения."
+
+msgid "Adds a band limit filter to the audio bus."
+msgstr "Добавляет фильтр ограничения полосы пропускания к аудио-шине."
+
+msgid ""
+"Limits the frequencies in a range around the [member AudioEffectFilter."
+"cutoff_hz] and allows frequencies outside of this range to pass."
+msgstr ""
+"Ограничивает частоты в диапазоне вокруг [member AudioEffectFilter.cutoff_hz] "
+"и пропускает частоты за пределами этого диапазона."
+
+msgid "Adds a band pass filter to the audio bus."
+msgstr "Добавляет полосовой фильтр к аудио-шине."
+
+msgid ""
+"Attenuates the frequencies inside of a range around the [member "
+"AudioEffectFilter.cutoff_hz] and cuts frequencies outside of this band."
+msgstr ""
+"Ослабляет частоты внутри диапазона вокруг [элемента AudioEffectFilter."
+"cutoff_hz] и обрезает частоты за пределами этой полосы."
+
+msgid "Captures audio from an audio bus in real-time."
+msgstr "Захватывает звук с аудио-шины в режиме реального времени."
+
+msgid ""
+"AudioEffectCapture is an AudioEffect which copies all audio frames from the "
+"attached audio effect bus into its internal ring buffer.\n"
+"Application code should consume these audio frames from this ring buffer "
+"using [method get_buffer] and process it as needed, for example to capture "
+"data from an [AudioStreamMicrophone], implement application-defined effects, "
+"or to transmit audio over the network. When capturing audio data from a "
+"microphone, the format of the samples will be stereo 32-bit floating-point "
+"PCM.\n"
+"Unlike [AudioEffectRecord], this effect only returns the raw audio samples "
+"instead of encoding them into an [AudioStream]."
+msgstr ""
+"AudioEffectCapture — это AudioEffect, который копирует все аудио-кадры из "
+"подключенной шины аудио-эффектов в свой внутренний кольцевой буфер.\n"
+"Код приложения должен потреблять эти аудио-кадры из этого кольцевого буфера с "
+"помощью [method get_buffer] и обрабатывать их по мере необходимости, "
+"например, для захвата данных из [AudioStreamMicrophone], реализации эффектов, "
+"определяемых приложением, или для передачи звука по сети. При захвате "
+"аудиоданных с микрофона формат сэмплов будет стерео PCM 32-бит с плавающей "
+"точкой.\n"
+"В отличие от [AudioEffectRecord], этот эффект возвращает только "
+"необработанные аудио-сэмплы, а не кодирует их в [AudioStream]."
+
+msgid ""
+"Clears the internal ring buffer.\n"
+"[b]Note:[/b] Calling this during a capture can cause the loss of samples "
+"which causes popping in the playback."
+msgstr ""
+"Очищает внутренний кольцевой буфер.\n"
+"[b]Примечание:[/b] Вызов этого во время захвата может привести к потере "
+"сэмплов, что приведет к хлопкам при воспроизведении."
+
+msgid ""
+"Gets the next [param frames] audio samples from the internal ring buffer.\n"
+"Returns a [PackedVector2Array] containing exactly [param frames] audio "
+"samples if available, or an empty [PackedVector2Array] if insufficient data "
+"was available.\n"
+"The samples are signed floating-point PCM between [code]-1[/code] and "
+"[code]1[/code]. You will have to scale them if you want to use them as 8 or "
+"16-bit integer samples. ([code]v = 0x7fff * samples[0].x[/code])"
+msgstr ""
+"Получает следующие [param frames] аудиосэмплов из внутреннего кольцевого "
+"буфера.\n"
+"Возвращает [PackedVector2Array], содержащий ровно [param frames] "
+"аудиосэмплов, если они доступны, или пустой [PackedVector2Array], если данных "
+"было недостаточно.\n"
+"Сэмплы представляют собой PCM с плавающей точкой со знаком между [code]-1[/"
+"code] и [code]1[/code]. Вам придется масштабировать их, если вы хотите "
+"использовать их как 8- или 16-битные целочисленные сэмплы. ([code]v = 0x7fff "
+"* samples[0].x[/code])"
+
+msgid ""
+"Returns the number of audio frames discarded from the audio bus due to full "
+"buffer."
+msgstr ""
+"Возвращает количество аудио-кадров, отброшенных из аудио-шины из-за "
+"заполнения буфера."
+
+msgid ""
+"Length of the internal ring buffer, in seconds. Setting the buffer length "
+"will have no effect if already initialized."
+msgstr ""
+"Длина внутреннего кольцевого буфера в секундах. Установка длины буфера не "
+"даст никакого эффекта, если она уже инициализирована."
+
+msgid "Adds a chorus audio effect."
+msgstr "Добавляет звуковой эффект хора."
+
+msgid ""
+"Adds a chorus audio effect. The effect applies a filter with voices to "
+"duplicate the audio source and manipulate it through the filter."
+msgstr ""
+"Добавляет эффект хора. Эффект применяет фильтр с голосами для дублирования "
+"источника звука и манипулирования им через фильтр."
+
+msgid "The effect's raw signal."
+msgstr "Исходный сигнал эффекта."
+
+msgid "The voice's cutoff frequency."
+msgstr "Частота среза голоса."
+
+msgid "The voice's signal delay."
+msgstr "Задержка голосового сигнала."
+
+msgid "The voice filter's depth."
+msgstr "Глубина голосового фильтра."
+
+msgid "The voice's volume."
+msgstr "Громкость голоса."
+
+msgid "The voice's pan level."
+msgstr "Уровень панорамирования голоса."
+
+msgid "The voice's filter rate."
+msgstr "Скорость фильтрации голоса."
+
+msgid ""
+"Adds a compressor audio effect to an audio bus.\n"
+"Reduces sounds that exceed a certain threshold level, smooths out the "
+"dynamics and increases the overall volume."
+msgstr ""
+"Добавляет эффект компрессора звука к аудиошине.\n"
+"Уменьшает звуки, превышающие определенный пороговый уровень, сглаживает "
+"динамику и увеличивает общую громкость."
+
+msgid ""
+"Dynamic range compressor reduces the level of the sound when the amplitude "
+"goes over a certain threshold in Decibels. One of the main uses of a "
+"compressor is to increase the dynamic range by clipping as little as possible "
+"(when sound goes over 0dB).\n"
+"Compressor has many uses in the mix:\n"
+"- In the Master bus to compress the whole output (although an "
+"[AudioEffectLimiter] is probably better).\n"
+"- In voice channels to ensure they sound as balanced as possible.\n"
+"- Sidechained. This can reduce the sound level sidechained with another audio "
+"bus for threshold detection. This technique is common in video game mixing to "
+"the level of music and SFX while voices are being heard.\n"
+"- Accentuates transients by using a wider attack, making effects sound more "
+"punchy."
+msgstr ""
+"Компрессор динамического диапазона уменьшает уровень звука, когда амплитуда "
+"превышает определенный порог в децибелах. Одно из основных назначений "
+"компрессора - увеличение динамического диапазона за счет минимального "
+"клиппирования (когда звук превышает 0 дБ).\n"
+"Компрессор имеет множество применений в миксе:\n"
+"- В мастер-шине для сжатия всего выхода (хотя [AudioEffectLimiter], вероятно, "
+"лучше).\n"
+"- В голосовых каналах для обеспечения их максимально сбалансированного "
+"звучания.\n"
+"- В сайдчейне. Это позволяет снизить уровень звука при боковом подключении к "
+"другой аудиошине для определения порога. Эта техника распространена в "
+"микшировании видеоигр для снижения уровня музыки и SFX во время звучания "
+"голосов.\n"
+"- Подчеркивает переходные процессы за счет более широкой атаки, заставляя "
+"эффекты звучать более напористо."
+
+msgid ""
+"Compressor's reaction time when the signal exceeds the threshold, in "
+"microseconds. Value can range from 20 to 2000."
+msgstr ""
+"Время реакции компрессора при превышении сигналом порогового значения, в "
+"микросекундах. Значение может быть от 20 до 2000."
+
+msgid "Gain applied to the output signal."
+msgstr "Усиление, применяемое к выходному сигналу."
+
+msgid ""
+"Balance between original signal and effect signal. Value can range from 0 "
+"(totally dry) to 1 (totally wet)."
+msgstr ""
+"Баланс между исходным сигналом и сигналом эффекта. Значение может "
+"варьироваться от 0 (полностью сухой) до 1 (полностью влажный)."
+
+msgid ""
+"Amount of compression applied to the audio once it passes the threshold "
+"level. The higher the ratio, the more the loud parts of the audio will be "
+"compressed. Value can range from 1 to 48."
+msgstr ""
+"Степень сжатия, применяемая к аудио, как только оно проходит пороговый "
+"уровень. Чем выше отношение, тем сильнее будут сжаты громкие части аудио. "
+"Значение может быть в диапазоне от 1 до 48."
+
+msgid ""
+"Compressor's delay time to stop reducing the signal after the signal level "
+"falls below the threshold, in milliseconds. Value can range from 20 to 2000."
+msgstr ""
+"Время задержки компрессора для остановки снижения сигнала после того, как "
+"уровень сигнала падает ниже порогового значения, в миллисекундах. Значение "
+"может быть в диапазоне от 20 до 2000."
+
+msgid "Reduce the sound level using another audio bus for threshold detection."
+msgstr ""
+"Уменьшите уровень звука, используя другую аудиошину для обнаружения порога."
+
+msgid ""
+"The level above which compression is applied to the audio. Value can range "
+"from -60 to 0."
+msgstr ""
+"Уровень, выше которого к аудио применяется сжатие. Значение может быть в "
+"диапазоне от -60 до 0."
+
+msgid ""
+"Adds a delay audio effect to an audio bus. Plays input signal back after a "
+"period of time.\n"
+"Two tap delay and feedback options."
+msgstr ""
+"Добавляет эффект задержки звука к аудиошине. Воспроизводит входной сигнал "
+"через определенный промежуток времени.\n"
+"Два варианта задержки и обратной связи."
+
+msgid ""
+"Plays input signal back after a period of time. The delayed signal may be "
+"played back multiple times to create the sound of a repeating, decaying echo. "
+"Delay effects range from a subtle echo effect to a pronounced blending of "
+"previous sounds with new sounds."
+msgstr ""
+"Воспроизводит входной сигнал обратно через определенный промежуток времени. "
+"Задержанный сигнал может воспроизводиться несколько раз, чтобы создать звук "
+"повторяющегося, затухающего эха. Эффекты задержки варьируются от едва "
+"заметного эффекта эха до выраженного смешивания предыдущих звуков с новыми "
+"звуками."
+
+msgid ""
+"Output percent of original sound. At 0, only delayed sounds are output. Value "
+"can range from 0 to 1."
+msgstr ""
+"Процент выходного сигнала от исходного звука. При значении 0 выводятся только "
+"задержанные звуки. Значение может быть от 0 до 1."
+
+msgid "If [code]true[/code], feedback is enabled."
+msgstr "Если [code]true[/code], обратная связь включена."
+
+msgid "Feedback delay time in milliseconds."
+msgstr "Время задержки обратной связи в миллисекундах."
+
+msgid "Sound level for feedback."
+msgstr "Уровень звука для обратной связи."
+
+msgid ""
+"Low-pass filter for feedback, in Hz. Frequencies below this value are "
+"filtered out of the source signal."
+msgstr ""
+"Фильтр нижних частот для обратной связи, в Гц. Частоты ниже этого значения "
+"отфильтровываются из исходного сигнала."
+
+msgid "First tap delay time in milliseconds."
+msgstr "Время задержки первого нажатия в миллисекундах."
+
+msgid "Sound level for the first tap."
+msgstr "Уровень звука при первом нажатии."
+
+msgid ""
+"Pan position for the first tap. Value can range from -1 (fully left) to 1 "
+"(fully right)."
+msgstr ""
+"Положение панорамирования для первого нажатия. Значение может быть в "
+"диапазоне от -1 (полностью левое) до 1 (полностью правое)."
+
+msgid "Second tap delay time in milliseconds."
+msgstr "Время задержки второго нажатия в миллисекундах."
+
+msgid "Sound level for the second tap."
+msgstr "Уровень звука для второго нажатия."
+
+msgid ""
+"Pan position for the second tap. Value can range from -1 (fully left) to 1 "
+"(fully right)."
+msgstr ""
+"Положение панорамы для второго нажатия. Значение может быть в диапазоне от -1 "
+"(полностью влево) до 1 (полностью вправо)."
+
+msgid ""
+"Adds a distortion audio effect to an Audio bus.\n"
+"Modifies the sound to make it distorted."
+msgstr ""
+"Добавляет эффект искажения звука к аудио-шине.\n"
+"Изменяет звук, делая его искаженным."
+
+msgid ""
+"Different types are available: clip, tan, lo-fi (bit crushing), overdrive, or "
+"waveshape.\n"
+"By distorting the waveform the frequency content changes, which will often "
+"make the sound \"crunchy\" or \"abrasive\". For games, it can simulate sound "
+"coming from some saturated device or speaker very efficiently."
+msgstr ""
+"Доступны различные типы: clip, tan, lo-fi (bit crushing), overdrive, или "
+"waveshape.\n"
+"При искажении формы волны изменяется частотный состав, что часто делает звук "
+"«хрустящим» или «абразивным». Для игр он может очень эффективно имитировать "
+"звук, исходящий от какого-то насыщенного устройства или динамика."
+
+msgid "Distortion power. Value can range from 0 to 1."
+msgstr "Сила искажения. Значение может варьироваться от 0 до 1."
+
+msgid ""
+"High-pass filter, in Hz. Frequencies higher than this value will not be "
+"affected by the distortion. Value can range from 1 to 20000."
+msgstr ""
+"Фильтр высоких частот, в Гц. Частоты выше этого значения не будут подвержены "
+"искажением. Значение может варьироваться от 1 до 20000."
+
+msgid "Distortion type."
+msgstr "Тип искажения."
+
+msgid ""
+"Increases or decreases the volume after the effect, in decibels. Value can "
+"range from -80 to 24."
+msgstr ""
+"Увеличивает или уменьшает громкость после эффекта, в децибелах. Значение "
+"может быть в диапазоне от -80 до 24."
+
+msgid ""
+"Increases or decreases the volume before the effect, in decibels. Value can "
+"range from -60 to 60."
+msgstr ""
+"Увеличивает или уменьшает громкость перед эффектом в децибелах. Значение "
+"может быть в диапазоне от -60 до 60."
+
+msgid ""
+"Digital distortion effect which cuts off peaks at the top and bottom of the "
+"waveform."
+msgstr ""
+"Эффект цифрового искажения, который обрезает пики в верхней и нижней части "
+"формы волны."
+
+msgid ""
+"Low-resolution digital distortion effect (bit depth reduction). You can use "
+"it to emulate the sound of early digital audio devices."
+msgstr ""
+"Эффект цифрового искажения низкого разрешения (уменьшение битовой глубины). "
+"Вы можете использовать его для эмуляции звука ранних цифровых аудиоустройств."
+
+msgid ""
+"Emulates the warm distortion produced by a field effect transistor, which is "
+"commonly used in solid-state musical instrument amplifiers. The [member "
+"drive] property has no effect in this mode."
+msgstr ""
+"Эмулирует теплое искажение, создаваемое полевым транзистором, который обычно "
+"используется в твердотельных усилителях музыкальных инструментов. Свойство "
+"[member drive] не имеет эффекта в этом режиме."
+
+msgid ""
+"Waveshaper distortions are used mainly by electronic musicians to achieve an "
+"extra-abrasive sound."
+msgstr ""
+"Искажения Waveshaper используются в основном электронными музыкантами для "
+"достижения сверхрезкого звука."
+
+msgid ""
+"Base class for audio equalizers. Gives you control over frequencies.\n"
+"Use it to create a custom equalizer if [AudioEffectEQ6], [AudioEffectEQ10] or "
+"[AudioEffectEQ21] don't fit your needs."
+msgstr ""
+"Базовый класс для аудиоэквалайзеров. Дает вам контроль над частотами.\n"
+"Используйте его для создания собственного эквалайзера, если [AudioEffectEQ6], "
+"[AudioEffectEQ10] или [AudioEffectEQ21] не соответствуют вашим потребностям."
+
+msgid ""
+"AudioEffectEQ gives you control over frequencies. Use it to compensate for "
+"existing deficiencies in audio. AudioEffectEQs are useful on the Master bus "
+"to completely master a mix and give it more character. They are also useful "
+"when a game is run on a mobile device, to adjust the mix to that kind of "
+"speakers (it can be added but disabled when headphones are plugged)."
+msgstr ""
+"AudioEffectEQ дает вам контроль над частотами. Используйте его для "
+"компенсации существующих недостатков звука. AudioEffectEQ полезны на шине "
+"Master для полного мастеринга микса и придания ему большего характера. Они "
+"также полезны, когда игра запущена на мобильном устройстве, для настройки "
+"микса под этот тип динамиков (его можно добавить, но отключить, если "
+"подключены наушники)."
+
+msgid "Returns the number of bands of the equalizer."
+msgstr "Возвращает количество полос эквалайзера."
+
+msgid "Returns the band's gain at the specified index, in dB."
+msgstr "Возвращает усиление полосы по указанному индексу в дБ."
+
+msgid "Sets band's gain at the specified index, in dB."
+msgstr "Устанавливает усиление полосы по указанному индексу в дБ."
+
+msgid ""
+"Adds a 10-band equalizer audio effect to an Audio bus. Gives you control over "
+"frequencies from 31 Hz to 16000 Hz.\n"
+"Each frequency can be modulated between -60/+24 dB."
+msgstr ""
+"Добавляет 10-полосный эквалайзер аудиоэффекта к аудиошине. Дает вам контроль "
+"над частотами от 31 Гц до 16000 Гц.\n"
+"Каждая частота может быть модулирована в диапазоне от -60/+24 дБ."
+
+msgid ""
+"Frequency bands:\n"
+"Band 1: 31 Hz\n"
+"Band 2: 62 Hz\n"
+"Band 3: 125 Hz\n"
+"Band 4: 250 Hz\n"
+"Band 5: 500 Hz\n"
+"Band 6: 1000 Hz\n"
+"Band 7: 2000 Hz\n"
+"Band 8: 4000 Hz\n"
+"Band 9: 8000 Hz\n"
+"Band 10: 16000 Hz\n"
+"See also [AudioEffectEQ], [AudioEffectEQ6], [AudioEffectEQ21]."
+msgstr ""
+"Частотные диапазоны:\n"
+"Полоса 1: 31 Гц\n"
+"Полоса 2: 62 Гц\n"
+"Полоса 3: 125 Гц\n"
+"Полоса 4: 250 Гц\n"
+"Полоса 5: 500 Гц\n"
+"Полоса 6: 1000 Гц\n"
+"Полоса 7: 2000 Гц\n"
+"Полоса 8: 4000 Гц\n"
+"Полоса 9: 8000 Гц\n"
+"Полоса 10: 16000 Гц\n"
+"См. также [AudioEffectEQ], [AudioEffectEQ6], [AudioEffectEQ21]."
+
+msgid ""
+"Adds a 21-band equalizer audio effect to an Audio bus. Gives you control over "
+"frequencies from 22 Hz to 22000 Hz.\n"
+"Each frequency can be modulated between -60/+24 dB."
+msgstr ""
+"Добавляет аудиоэффект 21-полосного эквалайзера к аудиошине. Дает вам контроль "
+"над частотами от 22 Гц до 22000 Гц.\n"
+"Каждая частота может быть модулирована в диапазоне -60/+24 дБ."
+
+msgid ""
+"Frequency bands:\n"
+"Band 1: 22 Hz\n"
+"Band 2: 32 Hz\n"
+"Band 3: 44 Hz\n"
+"Band 4: 63 Hz\n"
+"Band 5: 90 Hz\n"
+"Band 6: 125 Hz\n"
+"Band 7: 175 Hz\n"
+"Band 8: 250 Hz\n"
+"Band 9: 350 Hz\n"
+"Band 10: 500 Hz\n"
+"Band 11: 700 Hz\n"
+"Band 12: 1000 Hz\n"
+"Band 13: 1400 Hz\n"
+"Band 14: 2000 Hz\n"
+"Band 15: 2800 Hz\n"
+"Band 16: 4000 Hz\n"
+"Band 17: 5600 Hz\n"
+"Band 18: 8000 Hz\n"
+"Band 19: 11000 Hz\n"
+"Band 20: 16000 Hz\n"
+"Band 21: 22000 Hz\n"
+"See also [AudioEffectEQ], [AudioEffectEQ6], [AudioEffectEQ10]."
+msgstr ""
+"Частотные диапазоны:\n"
+"Полоса 1: 22 Гц\n"
+"Полоса 2: 32 Гц\n"
+"Полоса 3: 44 Гц\n"
+"Полоса 4: 63 Гц\n"
+"Полоса 5: 90 Гц\n"
+"Полоса 6: 125 Гц\n"
+"Полоса 7: 175 Гц\n"
+"Полоса 8: 250 Гц\n"
+"Полоса 9: 350 Гц\n"
+"Полоса 10: 500 Гц\n"
+"Полоса 11: 700 Гц\n"
+"Полоса 12: 1000 Гц\n"
+"Полоса 13: 1400 Гц\n"
+"Полоса 14: 2000 Гц\n"
+"Полоса 15: 2800 Гц\n"
+"Полоса 16: 4000 Гц\n"
+"Полоса 17: 5600 Гц\n"
+"Полоса 18: 8000 Гц\n"
+"Полоса 19: 11000 Гц\n"
+"Полоса 20: 16000 Гц\n"
+"Полоса 21: 22000 Гц\n"
+"См. также [AudioEffectEQ], [AudioEffectEQ6], [AudioEffectEQ10]."
+
+msgid ""
+"Adds a 6-band equalizer audio effect to an audio bus. Gives you control over "
+"frequencies from 32 Hz to 10000 Hz.\n"
+"Each frequency can be modulated between -60/+24 dB."
+msgstr ""
+"Добавляет аудиоэффект 6-полосного эквалайзера к аудиошине. Дает вам контроль "
+"над частотами от 32 Гц до 10000 Гц.\n"
+"Каждую частоту можно модулировать в диапазоне -60/+24 дБ."
+
+msgid ""
+"Frequency bands:\n"
+"Band 1: 32 Hz\n"
+"Band 2: 100 Hz\n"
+"Band 3: 320 Hz\n"
+"Band 4: 1000 Hz\n"
+"Band 5: 3200 Hz\n"
+"Band 6: 10000 Hz\n"
+"See also [AudioEffectEQ], [AudioEffectEQ10], [AudioEffectEQ21]."
+msgstr ""
+"Частотные диапазоны:\n"
+"Полоса 1: 32 Гц\n"
+"Полоса 2: 100 Гц\n"
+"Полоса 3: 320 Гц\n"
+"Полоса 4: 1000 Гц\n"
+"Полоса 5: 3200 Гц\n"
+"Полоса 6: 10000 Гц\n"
+"См. также [AudioEffectEQ], [AudioEffectEQ10], [AudioEffectEQ21]."
+
+msgid "Adds a filter to the audio bus."
+msgstr "Добавляет фильтр к аудиошине."
+
+msgid "Allows frequencies other than the [member cutoff_hz] to pass."
+msgstr "Позволяет пропускать частоты, отличные от [member cutoff_hz]."
+
+msgid "Threshold frequency for the filter, in Hz."
+msgstr "Пороговая частота фильтра, в Гц."
+
+msgid ""
+"Steepness of the cutoff curve in dB per octave, also known as the order of "
+"the filter. Higher orders have a more aggressive cutoff."
+msgstr ""
+"Крутизна кривой среза в дБ на октаву, также известная как порядок фильтра. "
+"Более высокие порядки имеют более агрессивный срез."
+
+msgid "Gain amount of the frequencies after the filter."
+msgstr "Усиление частот после фильтра."
+
+msgid "Amount of boost in the frequency range near the cutoff frequency."
+msgstr "Величина усиления в диапазоне частот вблизи частоты среза."
+
+msgid "Cutting off at 6dB per octave."
+msgstr "Срез 6 дБ на октаву."
+
+msgid "Cutting off at 12dB per octave."
+msgstr "Срез 12 дБ на октаву."
+
+msgid "Cutting off at 18dB per octave."
+msgstr "Срез 18 дБ на октаву."
+
+msgid "Cutting off at 24dB per octave."
+msgstr "Срез 24 дБ на октаву."
+
+msgid ""
+"A limiter is an effect designed to disallow sound from going over a given dB "
+"threshold. Hard limiters predict volume peaks, and will smoothly apply gain "
+"reduction when a peak crosses the ceiling threshold to prevent clipping and "
+"distortion. It preserves the waveform and prevents it from crossing the "
+"ceiling threshold. Adding one in the Master bus is recommended as a safety "
+"measure to prevent sudden volume peaks from occurring, and to prevent "
+"distortion caused by clipping."
+msgstr ""
+"Ограничитель — это эффект, предназначенный для того, чтобы не допустить "
+"превышения звуком заданного порога дБ. Жесткие ограничители предсказывают "
+"пики громкости и плавно применяют снижение усиления, когда пик пересекает "
+"порог потолка, чтобы предотвратить ограничение и искажение. Он сохраняет "
+"форму волны и не дает ей пересекать порог потолка. Добавление его в Master "
+"bus рекомендуется в качестве меры безопасности для предотвращения внезапных "
+"пиков громкости и искажений, вызванных ограничением."
+
+msgid ""
+"The waveform's maximum allowed value, in decibels. This value can range from "
+"[code]-24.0[/code] to [code]0.0[/code].\n"
+"The default value of [code]-0.3[/code] prevents potential inter-sample peaks "
+"(ISP) from crossing over 0 dB, which can cause slight distortion on some "
+"older hardware."
+msgstr ""
+"Максимально допустимое значение формы сигнала в децибелах. Это значение может "
+"находиться в диапазоне от [code]-24,0[/code] до [code]0,0[/code].\n"
+"Значение по умолчанию [code]-0,3[/code] предотвращает пересечение 0 дБ "
+"потенциальными межвыборочными пиками (ISP), что может вызвать небольшие "
+"искажения на некотором старом оборудовании."
+
+msgid "Gain to apply before limiting, in decibels."
+msgstr "Усиление, применяемое перед ограничением, в децибелах."
+
+msgid "Time it takes in seconds for the gain reduction to fully release."
+msgstr "Время в секундах, необходимое для полного снятия снижения усиления."
+
+msgid "Adds a high-pass filter to the audio bus."
+msgstr "Добавляет фильтр верхних частот к аудиошине."
+
+msgid ""
+"Cuts frequencies lower than the [member AudioEffectFilter.cutoff_hz] and "
+"allows higher frequencies to pass."
+msgstr ""
+"Обрезает частоты ниже [элемента AudioEffectFilter.cutoff_hz] и пропускает "
+"более высокие частоты."
+
+msgid "Adds a high-shelf filter to the audio bus."
+msgstr "Добавляет высокочастотный фильтр к аудиошине."
+
+msgid "Reduces all frequencies above the [member AudioEffectFilter.cutoff_hz]."
+msgstr "Уменьшает все частоты выше [элемента AudioEffectFilter.cutoff_hz]."
+
+msgid "Manipulates the audio it receives for a given effect."
+msgstr "Манипулирует получаемым звуком для достижения заданного эффекта."
+
+msgid ""
+"An audio effect instance manipulates the audio it receives for a given "
+"effect. This instance is automatically created by an [AudioEffect] when it is "
+"added to a bus, and should usually not be created directly. If necessary, it "
+"can be fetched at run-time with [method AudioServer.get_bus_effect_instance]."
+msgstr ""
+"Экземпляр аудиоэффекта управляет аудио, которое он получает для данного "
+"эффекта. Этот экземпляр автоматически создается [AudioEffect] при добавлении "
+"его в шину и обычно не должен создаваться напрямую. При необходимости его "
+"можно получить во время выполнения с помощью [method AudioServer."
+"get_bus_effect_instance]."
+
+msgid ""
+"Called by the [AudioServer] to process this effect. When [method "
+"_process_silence] is not overridden or it returns [code]false[/code], this "
+"method is called only when the bus is active.\n"
+"[b]Note:[/b] It is not useful to override this method in GDScript or C#. Only "
+"GDExtension can take advantage of it."
+msgstr ""
+"Вызывается [AudioServer] для обработки этого эффекта. Когда [method "
+"_process_silence] не переопределен или возвращает [code]false[/code], этот "
+"метод вызывается только тогда, когда шина активна.\n"
+"[b]Примечание:[/b] Не имеет смысла переопределять этот метод в GDScript или "
+"C#. Только GDExtension может воспользоваться им."
+
+msgid ""
+"Override this method to customize the processing behavior of this effect "
+"instance.\n"
+"Should return [code]true[/code] to force the [AudioServer] to always call "
+"[method _process], even if the bus has been muted or cannot otherwise be "
+"heard."
+msgstr ""
+"Переопределить этот метод, чтобы настроить поведение обработки этого "
+"экземпляра эффекта.\n"
+"Следует вернуть [code]true[/code], чтобы заставить [AudioServer] всегда "
+"вызывать [method _process], даже если шина была отключена или не может быть "
+"услышана иным образом."
+
+msgid "Adds a soft-clip limiter audio effect to an Audio bus."
+msgstr ""
+"Добавляет звуковой эффект ограничителя с мягким ограничением к аудиошине."
+
+msgid ""
+"A limiter is similar to a compressor, but it's less flexible and designed to "
+"disallow sound going over a given dB threshold. Adding one in the Master bus "
+"is always recommended to reduce the effects of clipping.\n"
+"Soft clipping starts to reduce the peaks a little below the threshold level "
+"and progressively increases its effect as the input level increases such that "
+"the threshold is never exceeded."
+msgstr ""
+"Ограничитель похож на компрессор, но он менее гибкий и предназначен для того, "
+"чтобы не допустить превышения звуком заданного порога дБ. Добавление его в "
+"Master шину всегда рекомендуется для уменьшения эффектов ограничения.\n"
+"Мягкое ограничение начинает уменьшать пики немного ниже порогового уровня и "
+"постепенно увеличивает свой эффект по мере увеличения входного уровня, так "
+"что порог никогда не будет превышен."
+
+msgid ""
+"The waveform's maximum allowed value, in decibels. Value can range from -20 "
+"to -0.1."
+msgstr ""
+"Максимально допустимое значение формы волны в децибелах. Значение может быть "
+"в диапазоне от -20 до -0,1."
+
+msgid ""
+"Applies a gain to the limited waves, in decibels. Value can range from 0 to 6."
+msgstr ""
+"Применяет усиление к ограниченным волнам в децибелах. Значение может быть от "
+"0 до 6."
+
+msgid ""
+"Threshold from which the limiter begins to be active, in decibels. Value can "
+"range from -30 to 0."
+msgstr ""
+"Порог, с которого начинает действовать ограничитель, в децибелах. Значение "
+"может быть в диапазоне от -30 до 0."
+
+msgid ""
+"Cuts frequencies higher than the [member AudioEffectFilter.cutoff_hz] and "
+"allows lower frequencies to pass."
+msgstr ""
+"Обрезает частоты выше [элемент AudioEffectFilter.cutoff_hz] и пропускает "
+"более низкие частоты."
+
+msgid "Adds a low-shelf filter to the audio bus."
+msgstr "Добавляет фильтр нижних частот к аудиошине."
+
+msgid "Reduces all frequencies below the [member AudioEffectFilter.cutoff_hz]."
+msgstr "Уменьшает все частоты ниже [member AudioEffectFilter.cutoff_hz]."
+
+msgid "Adds a notch filter to the Audio bus."
+msgstr "Добавляет режекторный (полосно-заграждающий) фильтр к аудиошине."
+
+msgid ""
+"Attenuates frequencies in a narrow band around the [member AudioEffectFilter."
+"cutoff_hz] and cuts frequencies outside of this range."
+msgstr ""
+"Ослабляет частоты в узкой полосе вокруг [элемента AudioEffectFilter."
+"cutoff_hz] и обрезает частоты за пределами этого диапазона."
+
+msgid "Adds a panner audio effect to an audio bus. Pans sound left or right."
+msgstr ""
+"Добавляет эффект панорамирования звука к аудиошине. Панорамирует звук влево "
+"или вправо."
+
+msgid ""
+"Determines how much of an audio signal is sent to the left and right buses."
+msgstr ""
+"Определяет, какая часть аудиосигнала отправляется на левую и правую шины."
+
+msgid "Pan position. Value can range from -1 (fully left) to 1 (fully right)."
+msgstr ""
+"Положение панорамы. Значение может быть в диапазоне от -1 (полностью левое) "
+"до 1 (полностью правое)."
+
+msgid ""
+"Adds a phaser audio effect to an audio bus.\n"
+"Combines the original signal with a copy that is slightly out of phase with "
+"the original."
+msgstr ""
+"Добавляет эффект фазера к аудиошине.\n"
+"Объединяет исходный сигнал с копией, которая немного не совпадает по фазе с "
+"оригиналом."
+
+msgid ""
+"Combines phase-shifted signals with the original signal. The movement of the "
+"phase-shifted signals is controlled using a low-frequency oscillator."
+msgstr ""
+"Объединяет сдвинутые по фазе сигналы с исходным сигналом. Движение сдвинутых "
+"по фазе сигналов управляется с помощью низкочастотного генератора."
+
+msgid ""
+"Governs how high the filter frequencies sweep. Low value will primarily "
+"affect bass frequencies. High value can sweep high into the treble. Value can "
+"range from 0.1 to 4."
+msgstr ""
+"Управляет тем, насколько высоко поднимаются частоты фильтра. Низкое значение "
+"в первую очередь повлияет на низкие частоты. Высокое значение может поднять "
+"высокие частоты до высоких. Значение может находиться в диапазоне от 0,1 до 4."
+
+msgid "Output percent of modified sound. Value can range from 0.1 to 0.9."
+msgstr ""
+"Процент выходного измененного звука. Значение может быть в диапазоне от 0,1 "
+"до 0,9."
+
+msgid ""
+"Determines the maximum frequency affected by the LFO modulations, in Hz. "
+"Value can range from 10 to 10000."
+msgstr ""
+"Определяет максимальную частоту, на которую влияют модуляции LFO, в Гц. "
+"Значение может быть в диапазоне от 10 до 10000."
+
+msgid ""
+"Determines the minimum frequency affected by the LFO modulations, in Hz. "
+"Value can range from 10 to 10000."
+msgstr ""
+"Определяет минимальную частоту, на которую влияют модуляции LFO, в Гц. "
+"Значение может быть в диапазоне от 10 до 10000."
+
+msgid ""
+"Adjusts the rate in Hz at which the effect sweeps up and down across the "
+"frequency range."
+msgstr ""
+"Регулирует скорость в Гц, с которой эффект распространяется вверх и вниз по "
+"диапазону частот."
+
+msgid ""
+"Adds a pitch-shifting audio effect to an audio bus.\n"
+"Raises or lowers the pitch of original sound."
+msgstr ""
+"Добавляет звуковой эффект изменения высоты тона к звуковой шине.\n"
+"Повышает или понижает высоту исходного звука."
+
+msgid ""
+"Allows modulation of pitch independently of tempo. All frequencies can be "
+"increased/decreased with minimal effect on transients."
+msgstr ""
+"Позволяет модулировать высоту тона независимо от темпа. Все частоты могут "
+"быть увеличены/уменьшены с минимальным влиянием на переходные процессы."
+
+msgid ""
+"The size of the [url=https://en.wikipedia.org/wiki/"
+"Fast_Fourier_transform]Fast Fourier transform[/url] buffer. Higher values "
+"smooth out the effect over time, but have greater latency. The effects of "
+"this higher latency are especially noticeable on sounds that have sudden "
+"amplitude changes."
+msgstr ""
+"Размер буфера [url=https://en.wikipedia.org/wiki/"
+"Fast_Fourier_transform]Быстрого преобразования Фурье (Fourier)[/url]. Более "
+"высокие значения сглаживают эффект с течением времени, но имеют большую "
+"задержку. Эффект этой большей задержки особенно заметен на звуках с резкими "
+"изменениями амплитуды."
+
+msgid ""
+"The oversampling factor to use. Higher values result in better quality, but "
+"are more demanding on the CPU and may cause audio cracking if the CPU can't "
+"keep up."
+msgstr ""
+"Коэффициент передискретизации (oversampling), который следует использовать. "
+"Более высокие значения обеспечивают лучшее качество, но более требовательны к "
+"ЦП и могут вызвать потрескивание звука, если ЦП не справляется."
+
+msgid ""
+"The pitch scale to use. [code]1.0[/code] is the default pitch and plays "
+"sounds unaffected. [member pitch_scale] can range from [code]0.0[/code] "
+"(infinitely low pitch, inaudible) to [code]16[/code] (16 times higher than "
+"the initial pitch)."
+msgstr ""
+"Используемая шкала высоты тона. [code]1.0[/code] — это высота тона по "
+"умолчанию, которая воспроизводит звуки без изменений. [member pitch_scale] "
+"может находиться в диапазоне от [code]0.0[/code] (бесконечно низкая высота "
+"тона, неслышимая) до [code]16[/code] (в 16 раз выше начальной высоты тона)."
+
+msgid ""
+"Use a buffer of 256 samples for the Fast Fourier transform. Lowest latency, "
+"but least stable over time."
+msgstr ""
+"Используйте буфер из 256 выборок для быстрого преобразования Фурье. Самая "
+"низкая задержка, но наименее стабильная во времени."
+
+msgid ""
+"Use a buffer of 512 samples for the Fast Fourier transform. Low latency, but "
+"less stable over time."
+msgstr ""
+"Используйте буфер из 512 выборок для быстрого преобразования Фурье. Низкая "
+"задержка, но менее стабильная с течением времени."
+
+msgid ""
+"Use a buffer of 1024 samples for the Fast Fourier transform. This is a "
+"compromise between latency and stability over time."
+msgstr ""
+"Используйте буфер из 1024 выборок для быстрого преобразования Фурье. Это "
+"компромисс между задержкой и стабильностью во времени."
+
+msgid ""
+"Use a buffer of 2048 samples for the Fast Fourier transform. High latency, "
+"but stable over time."
+msgstr ""
+"Используйте буфер из 2048 выборок для быстрого преобразования Фурье. Высокая "
+"задержка, но стабильная во времени."
+
+msgid ""
+"Use a buffer of 4096 samples for the Fast Fourier transform. Highest latency, "
+"but most stable over time."
+msgstr ""
+"Используйте буфер из 4096 выборок для быстрого преобразования Фурье. Самая "
+"высокая задержка, но самая стабильная во времени."
+
+msgid "Audio effect used for recording the sound from an audio bus."
+msgstr "Аудиоэффект, используемый для записи звука с аудиошины."
+
+msgid ""
+"Allows the user to record the sound from an audio bus into an "
+"[AudioStreamWAV]. When used on the \"Master\" audio bus, this includes all "
+"audio output by Godot.\n"
+"Unlike [AudioEffectCapture], this effect encodes the recording with the given "
+"format (8-bit, 16-bit, or compressed) instead of giving access to the raw "
+"audio samples.\n"
+"Can be used (with an [AudioStreamMicrophone]) to record from a microphone.\n"
+"[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be "
+"[code]true[/code] for audio input to work. See also that setting's "
+"description for caveats related to permissions and operating system privacy "
+"settings."
+msgstr ""
+"Позволяет пользователю записывать звук с аудиошины в [AudioStreamWAV]. При "
+"использовании на аудиошине «Master» это включает весь аудиовыход Godot.\n"
+"В отличие от [AudioEffectCapture], этот эффект кодирует запись в заданном "
+"формате (8-битный, 16-битный или сжатый) вместо предоставления доступа к "
+"необработанным аудиосэмплам.\n"
+"Может использоваться (с [AudioStreamMicrophone]) для записи с микрофона.\n"
+"[b]Примечание:[/b] [member ProjectSettings.audio/driver/enable_input] должен "
+"быть [code]true[/code] для работы аудиовхода. См. также описание этого "
+"параметра для предостережений, связанных с разрешениями и настройками "
+"конфиденциальности операционной системы."
+
+msgid "Recording with microphone"
+msgstr "Запись с микрофона"
+
+msgid "Returns the recorded sample."
+msgstr "Возвращает записанный образец."
+
+msgid "Returns whether the recording is active or not."
+msgstr "Возвращает, активна ли запись или нет."
+
+msgid ""
+"If [code]true[/code], the sound will be recorded. Note that restarting the "
+"recording will remove the previously recorded sample."
+msgstr ""
+"Если [code]true[/code], звук будет записан. Обратите внимание, что перезапуск "
+"записи удалит ранее записанный сэмпл."
+
+msgid ""
+"Specifies the format in which the sample will be recorded. See [enum "
+"AudioStreamWAV.Format] for available formats."
+msgstr ""
+"Указывает формат, в котором будет записан сэмпл. См. [enum AudioStreamWAV."
+"Format] для доступных форматов."
+
+msgid "Adds a reverberation audio effect to an Audio bus."
+msgstr "Добавляет эффект реверберации к аудиошине."
+
+msgid ""
+"Simulates the sound of acoustic environments such as rooms, concert halls, "
+"caverns, or an open spaces."
+msgstr ""
+"Имитирует звук акустических сред, таких как комнаты, концертные залы, пещеры "
+"или открытые пространства."
+
+msgid ""
+"Defines how reflective the imaginary room's walls are. Value can range from 0 "
+"to 1."
+msgstr ""
+"Определяет, насколько отражающими являются стены воображаемой комнаты. "
+"Значение может быть от 0 до 1."
+
+msgid ""
+"Output percent of original sound. At 0, only modified sound is outputted. "
+"Value can range from 0 to 1."
+msgstr ""
+"Вывод процентов исходного звука. При 0 выводится только измененный звук. "
+"Значение может быть от 0 до 1."
+
+msgid ""
+"High-pass filter passes signals with a frequency higher than a certain cutoff "
+"frequency and attenuates signals with frequencies lower than the cutoff "
+"frequency. Value can range from 0 to 1."
+msgstr ""
+"Фильтр верхних частот пропускает сигналы с частотой выше определенной частоты "
+"среза и ослабляет сигналы с частотой ниже частоты среза. Значение может быть "
+"в диапазоне от 0 до 1."
+
+msgid "Output percent of predelay. Value can range from 0 to 1."
+msgstr ""
+"Процент выходного сигнала предварительной задержки. Значение может быть от 0 "
+"до 1."
+
+msgid ""
+"Time between the original signal and the early reflections of the reverb "
+"signal, in milliseconds."
+msgstr ""
+"Время между исходным сигналом и ранними отражениями сигнала реверберации в "
+"миллисекундах."
+
+msgid ""
+"Dimensions of simulated room. Bigger means more echoes. Value can range from "
+"0 to 1."
+msgstr ""
+"Размеры имитируемой комнаты. Больше — больше эхо. Значение может быть от 0 до "
+"1."
+
+msgid ""
+"Widens or narrows the stereo image of the reverb tail. 1 means fully widens. "
+"Value can range from 0 to 1."
+msgstr ""
+"Расширяет или сужает стереоизображение хвоста реверберации. 1 означает полное "
+"расширение. Значение может быть от 0 до 1."
+
+msgid ""
+"Output percent of modified sound. At 0, only original sound is outputted. "
+"Value can range from 0 to 1."
+msgstr ""
+"Вывести процент измененного звука. При 0 выводится только оригинальный звук. "
+"Значение может быть от 0 до 1."
+
+msgid "Audio effect that can be used for real-time audio visualizations."
+msgstr ""
+"Аудиоэффект, который можно использовать для аудиовизуализации в реальном "
+"времени."
+
+msgid ""
+"This audio effect does not affect sound output, but can be used for real-time "
+"audio visualizations.\n"
+"This resource configures an [AudioEffectSpectrumAnalyzerInstance], which "
+"performs the actual analysis at runtime. An instance can be obtained with "
+"[method AudioServer.get_bus_effect_instance].\n"
+"See also [AudioStreamGenerator] for procedurally generating sounds."
+msgstr ""
+"Этот звуковой эффект не влияет на вывод звука, но может использоваться для "
+"визуализации звука в реальном времени.\n"
+"Этот ресурс настраивает [AudioEffectSpectrumAnalyzerInstance], который "
+"выполняет фактический анализ во время выполнения. Экземпляр можно получить с "
+"помощью [method AudioServer.get_bus_effect_instance].\n"
+"См. также [AudioStreamGenerator] для процедурной генерации звуков."
+
+msgid ""
+"The length of the buffer to keep (in seconds). Higher values keep data around "
+"for longer, but require more memory."
+msgstr ""
+"Длина буфера для хранения (в секундах). Более высокие значения сохраняют "
+"данные дольше, но требуют больше памяти."
+
+msgid ""
+"The size of the [url=https://en.wikipedia.org/wiki/"
+"Fast_Fourier_transform]Fast Fourier transform[/url] buffer. Higher values "
+"smooth out the spectrum analysis over time, but have greater latency. The "
+"effects of this higher latency are especially noticeable with sudden "
+"amplitude changes."
+msgstr ""
+"Размер буфера [url=https://en.wikipedia.org/wiki/"
+"Fast_Fourier_transform]Быстрого преобразования Фурье (Fast Fourier transform)"
+"[/url]. Более высокие значения сглаживают спектральный анализ с течением "
+"времени, но имеют большую задержку. Эффект этой большей задержки особенно "
+"заметен при резких изменениях амплитуды."
+
+msgid "Queryable instance of an [AudioEffectSpectrumAnalyzer]."
+msgstr "Запрашиваемый экземпляр [AudioEffectSpectrumAnalyzer]."
+
+msgid ""
+"The runtime part of an [AudioEffectSpectrumAnalyzer], which can be used to "
+"query the magnitude of a frequency range on its host bus.\n"
+"An instance of this class can be obtained with [method AudioServer."
+"get_bus_effect_instance]."
+msgstr ""
+"Часть времени выполнения [AudioEffectSpectrumAnalyzer], которую можно "
+"использовать для запроса величины частотного диапазона на его хост-шине. \n"
+"Экземпляр этого класса можно получить с помощью [method AudioServer."
+"get_bus_effect_instance]."
+
+msgid ""
+"Returns the magnitude of the frequencies from [param from_hz] to [param "
+"to_hz] in linear energy as a Vector2. The [code]x[/code] component of the "
+"return value represents the left stereo channel, and [code]y[/code] "
+"represents the right channel.\n"
+"[param mode] determines how the frequency range will be processed. See [enum "
+"MagnitudeMode]."
+msgstr ""
+"Возвращает величину частот от [param from_hz] до [param to_hz] в линейной "
+"энергии как Vector2. Компонент [code]x[/code] возвращаемого значения "
+"представляет левый стереоканал, а [code]y[/code] представляет правый канал.\n"
+"[param mode] определяет, как будет обрабатываться диапазон частот. См. [enum "
+"MagnitudeMode]."
+
+msgid "Use the average value across the frequency range as magnitude."
+msgstr ""
+"В качестве величины используйте среднее значение по всему диапазону частот."
+
+msgid ""
+"An audio effect that can be used to adjust the intensity of stereo panning."
+msgstr ""
+"Аудиоэффект, который можно использовать для регулировки интенсивности "
+"стереопанорамирования."
+
+msgid ""
+"Amplifies the difference between stereo channels, increasing or decreasing "
+"existing panning. A value of 0.0 will downmix stereo to mono. Does not affect "
+"a mono signal."
+msgstr ""
+"Усиливает разницу между стереоканалами, увеличивая или уменьшая существующее "
+"панорамирование. Значение 0,0 понижает стерео до моно. Не влияет на "
+"моносигнал."
+
+msgid ""
+"Widens sound stage through phase shifting in conjunction with [member "
+"time_pullout_ms]. Just pans sound to the left channel if [member "
+"time_pullout_ms] is 0."
+msgstr ""
+"Расширяет звуковую сцену посредством сдвига фаз в сочетании с [member "
+"time_pullout_ms]. Просто панорамирует звук в левый канал, если [member "
+"time_pullout_ms] равен 0."
+
+msgid ""
+"Widens sound stage through phase shifting in conjunction with [member "
+"surround]. Just delays the right channel if [member surround] is 0."
+msgstr ""
+"Расширяет звуковую сцену посредством сдвига фаз в сочетании с [member "
+"surround]. Просто задерживает правый канал, если [member surround] равен 0."
+
+msgid "Overrides the location sounds are heard from."
+msgstr "Переопределяет местоположение, откуда слышны звуки."
+
+msgid ""
+"Once added to the scene tree and enabled using [method make_current], this "
+"node will override the location sounds are heard from. Only one "
+"[AudioListener2D] can be current. Using [method make_current] will disable "
+"the previous [AudioListener2D].\n"
+"If there is no active [AudioListener2D] in the current [Viewport], center of "
+"the screen will be used as a hearing point for the audio. [AudioListener2D] "
+"needs to be inside [SceneTree] to function."
+msgstr ""
+"После добавления в дерево сцены и включения с помощью [method make_current] "
+"этот узел переопределит местоположение, из которого слышны звуки. Текущим "
+"может быть только один [AudioListener2D]. Использование [method make_current] "
+"отключит предыдущий [AudioListener2D].\n"
+"Если в текущем [Viewport] нет активного [AudioListener2D], центр экрана будет "
+"использоваться в качестве точки прослушивания звука. [AudioListener2D] должен "
+"находиться внутри [SceneTree] для работы."
+
+msgid ""
+"Disables the [AudioListener2D]. If it's not set as current, this method will "
+"have no effect."
+msgstr ""
+"Отключает [AudioListener2D]. Если он не установлен как текущий, этот метод не "
+"будет иметь никакого эффекта."
+
+msgid ""
+"Makes the [AudioListener2D] active, setting it as the hearing point for the "
+"sounds. If there is already another active [AudioListener2D], it will be "
+"disabled.\n"
+"This method will have no effect if the [AudioListener2D] is not added to "
+"[SceneTree]."
+msgstr ""
+"Делает [AudioListener2D] активным, устанавливая его в качестве точки "
+"прослушивания звуков. Если уже есть другой активный [AudioListener2D], он "
+"будет отключен.\n"
+"Этот метод не будет иметь эффекта, если [AudioListener2D] не добавлен в "
+"[SceneTree]."
+
+msgid ""
+"Once added to the scene tree and enabled using [method make_current], this "
+"node will override the location sounds are heard from. This can be used to "
+"listen from a location different from the [Camera3D]."
+msgstr ""
+"После добавления в дерево сцены и включения с помощью [method make_current] "
+"этот узел переопределит местоположение, из которого слышны звуки. Это можно "
+"использовать для прослушивания из местоположения, отличного от [Camera3D]."
+
+msgid "Disables the listener to use the current camera's listener instead."
+msgstr ""
+"Отключает прослушиватель, чтобы вместо него использовать прослушиватель "
+"текущей камеры."
+
+msgid ""
+"Returns [code]true[/code] if the listener was made current using [method "
+"make_current], [code]false[/code] otherwise.\n"
+"[b]Note:[/b] There may be more than one AudioListener3D marked as \"current\" "
+"in the scene tree, but only the one that was made current last will be used."
+msgstr ""
+"Возвращает [code]true[/code], если прослушиватель был сделан текущим с "
+"помощью [method make_current], [code]false[/code] в противном случае.\n"
+"[b]Примечание:[/b] В дереве сцены может быть несколько AudioListener3D, "
+"помеченных как «текущий», но будет использоваться только тот, который был "
+"сделан текущим последним."
+
+msgid "Enables the listener. This will override the current camera's listener."
+msgstr ""
+"Включает прослушиватель. Это переопределит прослушиватель текущей камеры."
+
+msgid "Server interface for low-level audio access."
+msgstr "Серверный интерфейс для низкоуровневого доступа к звуку."
+
+msgid ""
+"[AudioServer] is a low-level server interface for audio access. It is in "
+"charge of creating sample data (playable audio) as well as its playback via a "
+"voice interface."
+msgstr ""
+"[AudioServer] — это низкоуровневый серверный интерфейс для доступа к аудио. "
+"Он отвечает за создание сэмплов данных (воспроизводимого аудио), а также за "
+"их воспроизведение через голосовой интерфейс."
+
+msgid "Audio Device Changer Demo"
+msgstr "Демонстрация Audio Device Changer"
+
+msgid "Adds a bus at [param at_position]."
+msgstr "Добавляет шину в [param at_position]."
+
+msgid ""
+"Adds an [AudioEffect] effect to the bus [param bus_idx] at [param "
+"at_position]."
+msgstr ""
+"Добавляет эффект [AudioEffect] к шине [param bus_idx] в [param at_position]."
+
+msgid "Generates an [AudioBusLayout] using the available buses and effects."
+msgstr "Генерирует [AudioBusLayout] с использованием доступных шин и эффектов."
+
+msgid ""
+"Returns the [AudioEffect] at position [param effect_idx] in bus [param "
+"bus_idx]."
+msgstr ""
+"Возвращает [AudioEffect] в позиции [param effect_idx] на шине [param bus_idx]."
+
+msgid ""
+"Returns the [AudioEffectInstance] assigned to the given bus and effect "
+"indices (and optionally channel)."
+msgstr ""
+"Возвращает [AudioEffectInstance], назначенный заданным индексам шины и "
+"эффекта (и, возможно, канала)."
+
+msgid ""
+"Returns the peak volume of the left speaker at bus index [param bus_idx] and "
+"channel index [param channel]."
+msgstr ""
+"Возвращает пиковую громкость левого динамика с индексом шины [param bus_idx] "
+"и индексом канала [param channel]."
+
+msgid ""
+"Returns the peak volume of the right speaker at bus index [param bus_idx] and "
+"channel index [param channel]."
+msgstr ""
+"Возвращает пиковую громкость правого динамика с индексом шины [param bus_idx] "
+"и индексом канала [param channel]."
+
+msgid ""
+"Returns the volume of the bus at index [param bus_idx] as a linear value.\n"
+"[b]Note:[/b] The returned value is equivalent to the result of [method "
+"@GlobalScope.db_to_linear] on the result of [method get_bus_volume_db]."
+msgstr ""
+"Возвращает громкость шины по индексу [param bus_idx] как линейное значение.\n"
+"[b]Примечание:[/b] Возвращаемое значение эквивалентно результату [method "
+"@GlobalScope.db_to_linear] на результате [method get_bus_volume_db]."
+
+msgid ""
+"Returns the name of the current audio driver. The default usually depends on "
+"the operating system, but may be overridden via the [code]--audio-driver[/"
+"code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line "
+"argument[/url]. [code]--headless[/code] also automatically sets the audio "
+"driver to [code]Dummy[/code]. See also [member ProjectSettings.audio/driver/"
+"driver]."
+msgstr ""
+"Возвращает имя текущего аудиодрайвера. Значение по умолчанию обычно зависит "
+"от операционной системы, но может быть переопределено с помощью [code]--audio-"
+"driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]аргумента командной строки[/url]. [code]--headless[/code] также "
+"автоматически устанавливает аудиодрайвер в [code]Dummy[/code]. См. также "
+"[member ProjectSettings.audio/driver/driver]."
+
+msgid ""
+"Returns the names of all audio input devices detected on the system.\n"
+"[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be "
+"[code]true[/code] for audio input to work. See also that setting's "
+"description for caveats related to permissions and operating system privacy "
+"settings."
+msgstr ""
+"Возвращает имена всех аудиовходных устройств, обнаруженных в системе.\n"
+"[b]Примечание:[/b] [member ProjectSettings.audio/driver/enable_input] должен "
+"быть [code]true[/code] для работы аудиовхода. См. также описание этого "
+"параметра для предупреждений, связанных с разрешениями и настройками "
+"конфиденциальности операционной системы."
+
+msgid "Returns the sample rate at the output of the [AudioServer]."
+msgstr "Возвращает частоту дискретизации на выходе [AudioServer]."
+
+msgid ""
+"Returns the audio driver's effective output latency. This is based on [member "
+"ProjectSettings.audio/driver/output_latency], but the exact returned value "
+"will differ depending on the operating system and audio driver.\n"
+"[b]Note:[/b] This can be expensive; it is not recommended to call [method "
+"get_output_latency] every frame."
+msgstr ""
+"Возвращает эффективную задержку вывода аудиодрайвера. Она основана на [member "
+"ProjectSettings.audio/driver/output_latency], но точное возвращаемое значение "
+"будет отличаться в зависимости от операционной системы и аудиодрайвера.\n"
+"[b]Примечание:[/b] Это может быть затратно; не рекомендуется вызывать [method "
+"get_output_latency] каждый кадр."
+
+msgid "Returns the speaker configuration."
+msgstr "Возвращает конфигурацию динамиков."
+
+msgid "Returns the relative time since the last mix occurred."
+msgstr "Возвращает относительное время с момента последнего смешивания."
+
+msgid "Returns the relative time until the next mix occurs."
+msgstr "Возвращает относительное время до следующего микширования."
+
+msgid ""
+"If [code]true[/code], the effect at index [param effect_idx] on the bus at "
+"index [param bus_idx] is enabled."
+msgstr ""
+"Если [code]true[/code], эффект с индексом [param effect_idx] на шине с "
+"индексом [param bus_idx] включен."
+
+msgid ""
+"If [code]true[/code], the stream is registered as a sample. The engine will "
+"not have to register it before playing the sample.\n"
+"If [code]false[/code], the stream will have to be registered before playing "
+"it. To prevent lag spikes, register the stream as sample with [method "
+"register_stream_as_sample]."
+msgstr ""
+"Если [code]true[/code], поток регистрируется как образец. Движку не придется "
+"регистрировать его перед воспроизведением образца.\n"
+"Если [code]false[/code], поток придется регистрировать перед его "
+"воспроизведением. Чтобы предотвратить скачки задержек, зарегистрируйте поток "
+"как образец с помощью [method register_stream_as_sample]."
+
+msgid ""
+"Locks the audio driver's main loop.\n"
+"[b]Note:[/b] Remember to unlock it afterwards."
+msgstr ""
+"Блокирует основной цикл аудиодрайвера.\n"
+"[b]Примечание:[/b] Не забудьте разблокировать его после этого."
+
+msgid "Moves the bus from index [param index] to index [param to_index]."
+msgstr "Перемещает шину с индекса [param index] на индекс [param to_index]."
+
+msgid ""
+"Forces the registration of a stream as a sample.\n"
+"[b]Note:[/b] Lag spikes may occur when calling this method, especially on "
+"single-threaded builds. It is suggested to call this method while loading "
+"assets, where the lag spike could be masked, instead of registering the "
+"sample right before it needs to be played."
+msgstr ""
+"Принудительно регистрирует поток как образец.\n"
+"[b]Примечание:[/b] При вызове этого метода могут возникать скачки задержки, "
+"особенно в однопоточных сборках. Рекомендуется вызывать этот метод во время "
+"загрузки ресурсов, где скачок задержки может быть замаскирован, вместо "
+"регистрации образца непосредственно перед его воспроизведением."
+
+msgid ""
+"Removes the effect at index [param effect_idx] from the bus at index [param "
+"bus_idx]."
+msgstr ""
+"Удаляет эффект с индексом [param effect_idx] из шины с индексом [param "
+"bus_idx]."
+
+msgid "Overwrites the currently used [AudioBusLayout]."
+msgstr "Перезаписывает текущий используемый [AudioBusLayout]."
+
+msgid ""
+"Connects the output of the bus at [param bus_idx] to the bus named [param "
+"send]."
+msgstr "Подключает выход шины [param bus_idx] к шине с именем [param send]."
+
+msgid ""
+"Sets the volume in decibels of the bus at index [param bus_idx] to [param "
+"volume_db]."
+msgstr ""
+"Устанавливает громкость в децибелах шины с индексом [param bus_idx] на [param "
+"volume_db]."
+
+msgid ""
+"Sets the volume as a linear value of the bus at index [param bus_idx] to "
+"[param volume_linear].\n"
+"[b]Note:[/b] Using this method is equivalent to calling [method "
+"set_bus_volume_db] with the result of [method @GlobalScope.linear_to_db] on a "
+"value."
+msgstr ""
+"Устанавливает громкость как линейное значение шины с индексом [param bus_idx] "
+"по [param volume_linear].\n"
+"[b]Примечание:[/b] Использование этого метода эквивалентно вызову [method "
+"set_bus_volume_db] с результатом [method @GlobalScope.linear_to_db] для "
+"значения."
+
+msgid ""
+"If set to [code]true[/code], all instances of [AudioStreamPlayback] will call "
+"[method AudioStreamPlayback._tag_used_streams] every mix step.\n"
+"[b]Note:[/b] This is enabled by default in the editor, as it is used by "
+"editor plugins for the audio stream previews."
+msgstr ""
+"Если установлено значение [code]true[/code], все экземпляры "
+"[AudioStreamPlayback] будут вызывать [method AudioStreamPlayback."
+"_tag_used_streams] на каждом шаге микширования.\n"
+"[b]Примечание:[/b] Это включено по умолчанию в редакторе, так как "
+"используется плагинами редактора для предпросмотра аудиопотока."
+
+msgid ""
+"Unlocks the audio driver's main loop. (After locking it, you should always "
+"unlock it.)"
+msgstr ""
+"Разблокирует основной цикл аудиодрайвера. (После блокировки его всегда "
+"следует разблокировать.)"
+
+msgid "Number of available audio buses."
+msgstr "Количество доступных аудиошин."
+
+msgid ""
+"Name of the current device for audio input (see [method "
+"get_input_device_list]). On systems with multiple audio inputs (such as "
+"analog, USB and HDMI audio), this can be used to select the audio input "
+"device. The value [code]\"Default\"[/code] will record audio on the system-"
+"wide default audio input. If an invalid device name is set, the value will be "
+"reverted back to [code]\"Default\"[/code].\n"
+"[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be "
+"[code]true[/code] for audio input to work. See also that setting's "
+"description for caveats related to permissions and operating system privacy "
+"settings."
+msgstr ""
+"Имя текущего устройства для аудиовхода (см. [method get_input_device_list]). "
+"В системах с несколькими аудиовходами (например, аналоговыми, USB и HDMI "
+"аудио) это можно использовать для выбора устройства аудиовхода. Значение "
+"[code]\"Default\"[/code] будет записывать звук на общесистемном аудиовходе по "
+"умолчанию. Если задано недопустимое имя устройства, значение будет возвращено "
+"к [code]\"Default\"[/code].\n"
+"[b]Примечание:[/b] [member ProjectSettings.audio/driver/enable_input] должно "
+"быть [code]true[/code] для работы аудиовхода. См. также описание этого "
+"параметра для предостережений, связанных с разрешениями и настройками "
+"конфиденциальности операционной системы."
+
+msgid ""
+"Name of the current device for audio output (see [method "
+"get_output_device_list]). On systems with multiple audio outputs (such as "
+"analog, USB and HDMI audio), this can be used to select the audio output "
+"device. The value [code]\"Default\"[/code] will play audio on the system-wide "
+"default audio output. If an invalid device name is set, the value will be "
+"reverted back to [code]\"Default\"[/code]."
+msgstr ""
+"Имя текущего устройства для аудиовыхода (см. [method "
+"get_output_device_list]). В системах с несколькими аудиовыходами (например, "
+"аналоговым, USB и HDMI аудио) это можно использовать для выбора устройства "
+"аудиовыхода. Значение [code]\"Default\"[/code] будет воспроизводить звук на "
+"общесистемном аудиовыходе по умолчанию. Если задано недопустимое имя "
+"устройства, значение будет возвращено к [code]\"Default\"[/code]."
+
+msgid ""
+"Scales the rate at which audio is played (i.e. setting it to [code]0.5[/code] "
+"will make the audio be played at half its speed). See also [member Engine."
+"time_scale] to affect the general simulation speed, which is independent from "
+"[member AudioServer.playback_speed_scale]."
+msgstr ""
+"Масштабирует скорость воспроизведения звука (например, если установить его на "
+"[code]0.5[/code], звук будет воспроизводиться с половинной скоростью). См. "
+"также [member Engine.time_scale], чтобы повлиять на общую скорость симуляции, "
+"которая не зависит от [member AudioServer.playback_speed_scale]."
+
+msgid ""
+"Emitted when the audio bus at [param bus_index] is renamed from [param "
+"old_name] to [param new_name]."
+msgstr ""
+"Вызывается, когда аудиошина в [param bus_index] переименовывается из [param "
+"old_name] в [param new_name]."
+
+msgid "Two or fewer speakers were detected."
+msgstr "Обнаруживает двух или менее говорящих."
+
+msgid "A 3.1 channel surround setup was detected."
+msgstr "Обнаружена конфигурация объемного звучания 3.1."
+
+msgid "A 5.1 channel surround setup was detected."
+msgstr "Обнаружена 5.1-канальная система объемного звучания."
+
+msgid "A 7.1 channel surround setup was detected."
+msgstr "Обнаружена конфигурация объемного звучания 7.1 каналов."
+
+msgid ""
+"The playback will be considered of the type declared at [member "
+"ProjectSettings.audio/general/default_playback_type]."
+msgstr ""
+"Воспроизведение будет считаться воспроизведением типа, объявленного в [member "
+"ProjectSettings.audio/general/default_playback_type]."
+
+msgid "Force the playback to be considered as a stream."
+msgstr "Принудительно рассматривать воспроизведение как поток."
+
+msgid ""
+"Force the playback to be considered as a sample. This can provide lower "
+"latency and more stable playback (with less risk of audio crackling), at the "
+"cost of having less flexibility.\n"
+"[b]Note:[/b] Only currently supported on the web platform.\n"
+"[b]Note:[/b] [AudioEffect]s are not supported when playback is considered as "
+"a sample."
+msgstr ""
+"Принудительно считать воспроизведение образцом. Это может обеспечить меньшую "
+"задержку и более стабильное воспроизведение (с меньшим риском потрескивания "
+"звука) за счет меньшей гибкости.\n"
+"[b]Примечание:[/b] В настоящее время поддерживается только на веб-платформе.\n"
+"[b]Примечание:[/b] [AudioEffect]-ы не поддерживаются, когда воспроизведение "
+"рассматривается как образец."
+
+msgid "Base class for audio streams."
+msgstr "Базовый класс для аудиопотоков."
+
+msgid ""
+"Base class for audio streams. Audio streams are used for sound effects and "
+"music playback, and support WAV (via [AudioStreamWAV]) and Ogg (via "
+"[AudioStreamOggVorbis]) file formats."
+msgstr ""
+"Базовый класс для аудиопотоков. Аудиопотоки используются для звуковых "
+"эффектов и воспроизведения музыки и поддерживают форматы файлов WAV (через "
+"[AudioStream WAV]) и Ogg (через [AudioStream Ogg Vorbis])."
+
+msgid "Audio streams"
+msgstr "Аудиопотоки"
+
+msgid "Audio Generator Demo"
+msgstr "Демонстрация звукового генератора"
+
+msgid "Override this method to return the bar beats of this stream."
+msgstr "Переопределите этот метод, чтобы вернуть тактовые доли этого потока."
+
+msgid ""
+"Overridable method. Should return the total number of beats of this audio "
+"stream. Used by the engine to determine the position of every beat.\n"
+"Ideally, the returned value should be based off the stream's sample rate "
+"([member AudioStreamWAV.mix_rate], for example)."
+msgstr ""
+"Переопределяемый метод. Должен возвращать общее количество тактов этого "
+"аудиопотока. Используется движком для определения позиции каждого такта.\n"
+"В идеале возвращаемое значение должно основываться на частоте дискретизации "
+"потока (например, [member AudioStreamWAV.mix_rate])."
+
+msgid ""
+"Overridable method. Should return the tempo of this audio stream, in beats "
+"per minute (BPM). Used by the engine to determine the position of every "
+"beat.\n"
+"Ideally, the returned value should be based off the stream's sample rate "
+"([member AudioStreamWAV.mix_rate], for example)."
+msgstr ""
+"Переопределяемый метод. Должен возвращать темп этого аудиопотока в ударах в "
+"минуту (BPM). Используется движком для определения позиции каждого удара.\n"
+"В идеале возвращаемое значение должно основываться на частоте дискретизации "
+"потока (например, [member AudioStreamWAV.mix_rate])."
+
+msgid ""
+"Override this method to customize the returned value of [method get_length]. "
+"Should return the length of this audio stream, in seconds."
+msgstr ""
+"Переопределите этот метод, чтобы настроить возвращаемое значение [method "
+"get_length]. Должен возвращать длину этого аудиопотока в секундах."
+
+msgid ""
+"Return the controllable parameters of this stream. This array contains "
+"dictionaries with a property info description format (see [method Object."
+"get_property_list]). Additionally, the default value for this parameter must "
+"be added tho each dictionary in \"default_value\" field."
+msgstr ""
+"Верните контролируемые параметры этого потока. Этот массив содержит словари с "
+"форматом описания информации о свойствах (см. [метод Object."
+"get_property_list]). Кроме того, значение по умолчанию для этого параметра "
+"должно быть добавлено в каждый словарь в поле \"default_value\"."
+
+msgid ""
+"Override this method to customize the name assigned to this audio stream. "
+"Unused by the engine."
+msgstr ""
+"Переопределите этот метод, чтобы настроить имя, назначенное этому "
+"аудиопотоку. Не используется движком."
+
+msgid ""
+"Override this method to customize the returned value of [method "
+"instantiate_playback]. Should return a new [AudioStreamPlayback] created when "
+"the stream is played (such as by an [AudioStreamPlayer])."
+msgstr ""
+"Переопределите этот метод, чтобы настроить возвращаемое значение [method "
+"instantiate_playback]. Должен возвращать новый [AudioStreamPlayback], "
+"созданный при воспроизведении потока (например, [AudioStreamPlayer])."
+
+msgid ""
+"Override this method to customize the returned value of [method "
+"is_monophonic]. Should return [code]true[/code] if this audio stream only "
+"supports one channel."
+msgstr ""
+"Переопределите этот метод, чтобы настроить возвращаемое значение [method "
+"is_monophonic]. Должен возвращать [code]true[/code], если этот аудиопоток "
+"поддерживает только один канал."
+
+msgid ""
+"Returns if the current [AudioStream] can be used as a sample. Only static "
+"streams can be sampled."
+msgstr ""
+"Возвращает, если текущий [AudioStream] может быть использован в качестве "
+"образца. Только статические потоки могут быть сэмплированы."
+
+msgid "Returns the length of the audio stream in seconds."
+msgstr "Возвращает длительность аудиопотока в секундах."
+
+msgid ""
+"Returns a newly created [AudioStreamPlayback] intended to play this audio "
+"stream. Useful for when you want to extend [method _instantiate_playback] but "
+"call [method instantiate_playback] from an internally held AudioStream "
+"subresource. An example of this can be found in the source code for "
+"[code]AudioStreamRandomPitch::instantiate_playback[/code]."
+msgstr ""
+"Возвращает недавно созданный [AudioStreamPlayback], предназначенный для "
+"воспроизведения этого аудиопотока. Полезно, когда вы хотите расширить [method "
+"_instantiate_playback], но вызвать [method instantiate_playback] из "
+"внутреннего подресурса AudioStream. Пример этого можно найти в исходном коде "
+"для [code]AudioStreamRandomPitch::instantiate_playback[/code]."
+
+msgid ""
+"Returns [code]true[/code] if the stream is a collection of other streams, "
+"[code]false[/code] otherwise."
+msgstr ""
+"Возвращает [code]true[/code], если поток является набором других потоков, и "
+"[code]false[/code] в противном случае."
+
+msgid ""
+"Returns [code]true[/code] if this audio stream only supports one channel "
+"([i]monophony[/i]), or [code]false[/code] if the audio stream supports two or "
+"more channels ([i]polyphony[/i])."
+msgstr ""
+"Возвращает [code]true[/code], если этот аудиопоток поддерживает только один "
+"канал ([i]монофония (monophony)[/i]), или [code]false[/code], если аудиопоток "
+"поддерживает два или более каналов ([i]полифония (polyphony)[/i])."
+
+msgid "An audio stream with utilities for procedural sound generation."
+msgstr "Аудиопоток с утилитами для процедурной генерации звука."
+
+msgid ""
+"[AudioStreamGenerator] is a type of audio stream that does not play back "
+"sounds on its own; instead, it expects a script to generate audio data for "
+"it. See also [AudioStreamGeneratorPlayback].\n"
+"Here's a sample on how to use it to generate a sine wave:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var playback # Will hold the AudioStreamGeneratorPlayback.\n"
+"@onready var sample_hz = $AudioStreamPlayer.stream.mix_rate\n"
+"var pulse_hz = 440.0 # The frequency of the sound wave.\n"
+"var phase = 0.0\n"
+"\n"
+"func _ready():\n"
+"    $AudioStreamPlayer.play()\n"
+"    playback = $AudioStreamPlayer.get_stream_playback()\n"
+"    fill_buffer()\n"
+"\n"
+"func fill_buffer():\n"
+"    var increment = pulse_hz / sample_hz\n"
+"    var frames_available = playback.get_frames_available()\n"
+"\n"
+"    for i in range(frames_available):\n"
+"        playback.push_frame(Vector2.ONE * sin(phase * TAU))\n"
+"        phase = fmod(phase + increment, 1.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export] public AudioStreamPlayer Player { get; set; }\n"
+"\n"
+"private AudioStreamGeneratorPlayback _playback; // Will hold the "
+"AudioStreamGeneratorPlayback.\n"
+"private float _sampleHz;\n"
+"private float _pulseHz = 440.0f; // The frequency of the sound wave.\n"
+"private double phase = 0.0;\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    if (Player.Stream is AudioStreamGenerator generator) // Type as a "
+"generator to access MixRate.\n"
+"    {\n"
+"        _sampleHz = generator.MixRate;\n"
+"        Player.Play();\n"
+"        _playback = (AudioStreamGeneratorPlayback)Player."
+"GetStreamPlayback();\n"
+"        FillBuffer();\n"
+"    }\n"
+"}\n"
+"\n"
+"public void FillBuffer()\n"
+"{\n"
+"    float increment = _pulseHz / _sampleHz;\n"
+"    int framesAvailable = _playback.GetFramesAvailable();\n"
+"\n"
+"    for (int i = 0; i < framesAvailable; i++)\n"
+"    {\n"
+"        _playback.PushFrame(Vector2.One * (float)Mathf.Sin(phase * Mathf."
+"Tau));\n"
+"        phase = Mathf.PosMod(phase + increment, 1.0);\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In the example above, the \"AudioStreamPlayer\" node must use an "
+"[AudioStreamGenerator] as its stream. The [code]fill_buffer[/code] function "
+"provides audio data for approximating a sine wave.\n"
+"See also [AudioEffectSpectrumAnalyzer] for performing real-time audio "
+"spectrum analysis.\n"
+"[b]Note:[/b] Due to performance constraints, this class is best used from C# "
+"or from a compiled language via GDExtension. If you still want to use this "
+"class from GDScript, consider using a lower [member mix_rate] such as 11,025 "
+"Hz or 22,050 Hz."
+msgstr ""
+"[AudioStreamGenerator] — это тип аудиопотока, который не воспроизводит звуки "
+"сам по себе; вместо этого он ожидает, что скрипт сгенерирует для него "
+"аудиоданные. См. также [AudioStreamGeneratorPlayback].\n"
+"Вот пример того, как использовать его для генерации синусоидальной волны:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var playback # Будет содержать AudioStreamGeneratorPlayback.\n"
+"@onready var sample_hz = $AudioStreamPlayer.stream.mix_rate\n"
+"var pulse_hz = 440.0 # Частота звуковой волны.\n"
+"var phase = 0.0\n"
+"\n"
+"func _ready():\n"
+"    $AudioStreamPlayer.play()\n"
+"    playback = $AudioStreamPlayer.get_stream_playback()\n"
+"    fill_buffer()\n"
+"\n"
+"func fill_buffer():\n"
+"    var increment = pulse_hz / sample_hz\n"
+"    var frames_available = playback.get_frames_available()\n"
+"\n"
+"    for i in range(frames_available):\n"
+"        playback.push_frame(Vector2.ONE * sin(phase * TAU))\n"
+"        phase = fmod(phase + increment, 1.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export] public AudioStreamPlayer Player { get; set; }\n"
+"\n"
+"private AudioStreamGeneratorPlayback _playback; // Будет содержать "
+"AudioStreamGeneratorPlayback.\n"
+"private float _sampleHz;\n"
+"private float _pulseHz = 440.0f; // Частота звуковой волны.\n"
+"private double phase = 0.0;\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    if (Player.Stream is AudioStreamGenerator generator) // Введите в "
+"качестве генератора для доступа к MixRate.\n"
+"    {\n"
+"        _sampleHz = generator.MixRate;\n"
+"        Player.Play();\n"
+"        _playback = (AudioStreamGeneratorPlayback)Player."
+"GetStreamPlayback();\n"
+"        FillBuffer();\n"
+"    }\n"
+"}\n"
+"\n"
+"public void FillBuffer()\n"
+"{\n"
+"    float increment = _pulseHz / _sampleHz;\n"
+"    int framesAvailable = _playback.GetFramesAvailable();\n"
+"\n"
+"    for (int i = 0; i < framesAvailable; i++)\n"
+"    {\n"
+"        _playback.PushFrame(Vector2.One * (float)Mathf.Sin(phase * Mathf."
+"Tau));\n"
+"        phase = Mathf.PosMod(phase + increment, 1.0);\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"В приведенном выше примере узел \"AudioStreamPlayer\" должен использовать "
+"[AudioStreamGenerator] в качестве своего потока. Функция [code]fill_buffer[/"
+"code] предоставляет аудиоданные для аппроксимации синусоидальной волны.\n"
+"См. также [AudioEffectSpectrumAnalyzer] для выполнения анализа аудиоспектра в "
+"реальном времени.\n"
+"[b]Примечание:[/b] Из-за ограничений производительности этот класс лучше "
+"всего использовать из C# или из скомпилированного языка через GDExtension. "
+"Если вы все еще хотите использовать этот класс из GDScript, рассмотрите "
+"возможность использования более низкого [member mix_rate], например 11 025 Гц "
+"или 22 050 Гц."
+
+msgid ""
+"The length of the buffer to generate (in seconds). Lower values result in "
+"less latency, but require the script to generate audio data faster, resulting "
+"in increased CPU usage and more risk for audio cracking if the CPU can't keep "
+"up."
+msgstr ""
+"Длина буфера для генерации (в секундах). Более низкие значения приводят к "
+"меньшей задержке, но требуют, чтобы скрипт генерировал аудиоданные быстрее, "
+"что приводит к увеличению использования ЦП и большему риску взлома звука, "
+"если ЦП не справляется."
+
+msgid ""
+"The sample rate to use (in Hz). Higher values are more demanding for the CPU "
+"to generate, but result in better quality.\n"
+"In games, common sample rates in use are [code]11025[/code], [code]16000[/"
+"code], [code]22050[/code], [code]32000[/code], [code]44100[/code], and "
+"[code]48000[/code].\n"
+"According to the [url=https://en.wikipedia.org/wiki/"
+"Nyquist%E2%80%93Shannon_sampling_theorem]Nyquist-Shannon sampling theorem[/"
+"url], there is no quality difference to human hearing when going past 40,000 "
+"Hz (since most humans can only hear up to ~20,000 Hz, often less). If you are "
+"generating lower-pitched sounds such as voices, lower sample rates such as "
+"[code]32000[/code] or [code]22050[/code] may be usable with no loss in "
+"quality.\n"
+"[b]Note:[/b] [AudioStreamGenerator] is not automatically resampling input "
+"data, to produce expected result [member mix_rate_mode] should match the "
+"sampling rate of input data.\n"
+"[b]Note:[/b] If you are using [AudioEffectCapture] as the source of your "
+"data, set [member mix_rate_mode] to [constant MIX_RATE_INPUT] or [constant "
+"MIX_RATE_OUTPUT] to automatically match current [AudioServer] mixing rate."
+msgstr ""
+"Частота дискретизации для использования (в Гц). Более высокие значения более "
+"требовательны к ЦП для генерации, но приводят к лучшему качеству.\n"
+"В играх обычно используются частоты дискретизации [code]11025[/code], "
+"[code]16000[/code], [code]22050[/code], [code]32000[/code], [code]44100[/"
+"code] и [code]48000[/code].\n"
+"Согласно [url=https://en.wikipedia.org/wiki/"
+"Nyquist%E2%80%93Shannon_sampling_theorem]теореме дискретизации Найквиста-"
+"Шеннона[/url], для человеческого слуха нет никакой разницы в качестве при "
+"выходе за пределы 40 000 Гц (поскольку большинство людей могут слышать только "
+"до ~20 000 Гц, часто меньше). Если вы генерируете более низкие звуки, такие "
+"как голоса, можно использовать более низкие частоты дискретизации, такие как "
+"[code]32000[/code] или [code]22050[/code] без потери качества.\n"
+"[b]Примечание:[/b] [AudioStreamGenerator] не выполняет автоматическую "
+"передискретизацию (resampling) входных данных, для получения ожидаемого "
+"результата [member mix_rate_mode] должен соответствовать частоте "
+"дискретизации входных данных.\n"
+"[b]Примечание:[/b] Если вы используете [AudioEffectCapture] в качестве "
+"источника данных, установите [member mix_rate_mode] на [constant "
+"MIX_RATE_INPUT] или [constant MIX_RATE_OUTPUT], чтобы автоматически "
+"соответствовать текущей частоте микширования [AudioServer]."
+
+msgid ""
+"Mixing rate mode. If set to [constant MIX_RATE_CUSTOM], [member mix_rate] is "
+"used, otherwise current [AudioServer] mixing rate is used."
+msgstr ""
+"Режим скорости смешивания. Если установлено значение [constant "
+"MIX_RATE_CUSTOM], используется [member mix_rate], в противном случае "
+"используется текущая скорость смешивания [AudioServer]."
+
+msgid "Custom mixing rate, specified by [member mix_rate]."
+msgstr "Пользовательская скорость смешивания, указанная [member mix_rate]."
+
+msgid "Plays back audio generated using [AudioStreamGenerator]."
+msgstr "Воспроизводит звук, созданный с помощью [AudioStreamGenerator]."
+
+msgid ""
+"This class is meant to be used with [AudioStreamGenerator] to play back the "
+"generated audio in real-time."
+msgstr ""
+"Этот класс предназначен для использования с [AudioStreamGenerator] для "
+"воспроизведения сгенерированного звука в реальном времени."
+
+msgid "Godot 3.2 will get new audio features"
+msgstr "Godot 3.2 получит новые аудиофункции"
+
+msgid "Clears the audio sample data buffer."
+msgstr "Очищает буфер данных аудиосэмпла."
+
+msgid ""
+"Returns the number of times the playback skipped due to a buffer underrun in "
+"the audio sample data. This value is reset at the start of the playback."
+msgstr ""
+"Возвращает количество пропусков воспроизведения из-за опустошения буфера в "
+"данных аудиосэмпла. Это значение сбрасывается в начале воспроизведения."
+
+msgid ""
+"Pushes several audio data frames to the buffer. This is usually more "
+"efficient than [method push_frame] in C# and compiled languages via "
+"GDExtension, but [method push_buffer] may be [i]less[/i] efficient in "
+"GDScript."
+msgstr ""
+"Помещает несколько аудиокадров данных в буфер. Обычно это эффективнее, чем "
+"[method push_frame] в C# и компилируемых языках через GDExtension, но [method "
+"push_buffer] может быть [i]менее[/i] эффективным в GDScript."
+
+msgid ""
+"Pushes a single audio data frame to the buffer. This is usually less "
+"efficient than [method push_buffer] in C# and compiled languages via "
+"GDExtension, but [method push_frame] may be [i]more[/i] efficient in GDScript."
+msgstr ""
+"Помещает один аудио-фрейм данных в буфер. Обычно это менее эффективно, чем "
+"[метод push_buffer] в C# и компилируемых языках через GDExtension, но [метод "
+"push_frame] может быть [i]более[/i] эффективным в GDScript."
+
+msgid ""
+"Audio stream that can playback music interactively, combining clips and a "
+"transition table."
+msgstr ""
+"Аудиопоток, который может воспроизводить музыку в интерактивном режиме, "
+"объединяя клипы и таблицу переходов."
+
+msgid ""
+"This is an audio stream that can playback music interactively, combining "
+"clips and a transition table. Clips must be added first, and then the "
+"transition rules via the [method add_transition]. Additionally, this stream "
+"exports a property parameter to control the playback via [AudioStreamPlayer], "
+"[AudioStreamPlayer2D], or [AudioStreamPlayer3D].\n"
+"The way this is used is by filling a number of clips, then configuring the "
+"transition table. From there, clips are selected for playback and the music "
+"will smoothly go from the current to the new one while using the "
+"corresponding transition rule defined in the transition table."
+msgstr ""
+"Это аудиопоток, который может воспроизводить музыку интерактивно, объединяя "
+"клипы и таблицу переходов. Сначала необходимо добавить клипы, а затем правила "
+"перехода через [метод add_transition]. Кроме того, этот поток экспортирует "
+"параметр свойства для управления воспроизведением через [AudioStreamPlayer], "
+"[AudioStreamPlayer2D] или [AudioStreamPlayer3D].\n"
+"Это используется путем заполнения ряда клипов, а затем настройки таблицы "
+"переходов. Оттуда клипы выбираются для воспроизведения, и музыка будет плавно "
+"переходить от текущего к новому, используя соответствующее правило перехода, "
+"определенное в таблице переходов."
+
+msgid ""
+"Add a transition between two clips. Provide the indices of the source and "
+"destination clips, or use the [constant CLIP_ANY] constant to indicate that "
+"transition happens to/from any clip to this one.\n"
+"* [param from_time] indicates the moment in the current clip the transition "
+"will begin after triggered.\n"
+"* [param to_time] indicates the time in the next clip that the playback will "
+"start from.\n"
+"* [param fade_mode] indicates how the fade will happen between clips. If "
+"unsure, just use [constant FADE_AUTOMATIC] which uses the most common type of "
+"fade for each situation.\n"
+"* [param fade_beats] indicates how many beats the fade will take. Using "
+"decimals is allowed.\n"
+"* [param use_filler_clip] indicates that there will be a filler clip used "
+"between the source and destination clips.\n"
+"* [param filler_clip] the index of the filler clip.\n"
+"* If [param hold_previous] is used, then this clip will be remembered. This "
+"can be used together with [constant AUTO_ADVANCE_RETURN_TO_HOLD] to return to "
+"this clip after another is done playing."
+msgstr ""
+"Добавьте переход между двумя клипами. Укажите индексы исходного и конечного "
+"клипов или используйте константу [constant CLIP_ANY], чтобы указать, что "
+"переход происходит из/в любой клип к этому.\n"
+"* [param from_time] указывает момент в текущем клипе, после срабатывания "
+"которого начнется переход.\n"
+"* [param to_time] указывает время в следующем клипе, с которого начнется "
+"воспроизведение.\n"
+"* [param fade_mode] указывает, как будет происходить затухание между клипами. "
+"Если вы не уверены, просто используйте [constant FADE_AUTOMATIC], который "
+"использует наиболее распространенный тип затухания для каждой ситуации.\n"
+"*[param fade_beats] указывает, сколько ударов займет затухание. Разрешено "
+"использование десятичных дробей.\n"
+"* [param use_filler_clip] указывает, что между исходным и конечным клипами "
+"будет использоваться клип-заполнитель.\n"
+"* [param filler_clip] индекс клипа-заполнителя.\n"
+"* Если используется [param hold_previous], то этот клип будет запомнен. Это "
+"можно использовать вместе с [constant AUTO_ADVANCE_RETURN_TO_HOLD], чтобы "
+"вернуться к этому клипу после завершения воспроизведения другого."
+
+msgid ""
+"Erase a transition by providing [param from_clip] and [param to_clip] clip "
+"indices. [constant CLIP_ANY] can be used for either argument or both."
+msgstr ""
+"Удалите переход, указав индексы клипов [param from_clip] и [param to_clip]. "
+"[constant CLIP_ANY] можно использовать для любого из аргументов или для обоих."
+
+msgid ""
+"Return whether a clip has auto-advance enabled. See [method "
+"set_clip_auto_advance]."
+msgstr ""
+"Возвращает, включено ли для клипа автоматическое продвижение. См. [метод "
+"set_clip_auto_advance]."
+
+msgid ""
+"Return the clip towards which the clip referenced by [param clip_index] will "
+"auto-advance to."
+msgstr ""
+"Возвращает клип, к которому будет автоматически переходить клип, указанный в "
+"[param clip_index]."
+
+msgid ""
+"Return whether a transition uses the [i]hold previous[/i] functionality (see "
+"[method add_transition])."
+msgstr ""
+"Возвращает, использует ли переход функциональность [i]удержания предыдущего "
+"(hold previous)[/i] (см. [method add_transition])."
+
+msgid ""
+"Return whether a transition uses the [i]filler clip[/i] functionality (see "
+"[method add_transition])."
+msgstr ""
+"Возвращает, использует ли переход функциональность [i]заполнителя (filler "
+"clip)[/i] (см. [метод add_transition])."
+
+msgid "Set whether a clip will auto-advance by changing the auto-advance mode."
+msgstr ""
+"Укажите, будет ли клип автоматически перематываться, изменив режим "
+"автоматического перематывания."
+
+msgid ""
+"Set the index of the next clip towards which this clip will auto advance to "
+"when finished. If the clip being played loops, then auto-advance will be "
+"ignored."
+msgstr ""
+"Установите индекс следующего клипа, к которому этот клип будет автоматически "
+"переходить по завершении. Если воспроизводимый клип зацикливается, то "
+"автоматическое перемещение будет игнорироваться."
+
+msgid "Amount of clips contained in this interactive player."
+msgstr "Количество клипов, содержащихся в этом интерактивном плеере."
+
+msgid ""
+"Index of the initial clip, which will be played first when this stream is "
+"played."
+msgstr ""
+"Индекс начального клипа, который будет воспроизведен первым при "
+"воспроизведении данного потока."
+
+msgid ""
+"Start transition as soon as possible, don't wait for any specific time "
+"position."
+msgstr ""
+"Начните переход как можно скорее, не ждите какого-то определенного времени."
+
+msgid "Transition when the clip playback position reaches the next beat."
+msgstr ""
+"Переход, когда позиция воспроизведения клипа достигает следующего такта."
+
+msgid "Transition when the clip playback position reaches the next bar."
+msgstr ""
+"Переход, когда позиция воспроизведения клипа достигает следующего такта."
+
+msgid "Transition when the current clip finished playing."
+msgstr "Переход после завершения воспроизведения текущего клипа."
+
+msgid ""
+"Transition to the same position in the destination clip. This is useful when "
+"both clips have exactly the same length and the music should fade between "
+"them."
+msgstr ""
+"Переход к той же позиции в клипе назначения. Это полезно, когда оба клипа "
+"имеют одинаковую длину и музыка должна плавно переходить между ними."
+
+msgid "Transition to the start of the destination clip."
+msgstr "Переход к началу целевого клипа."
+
+msgid ""
+"Do not use fade for the transition. This is useful when transitioning from a "
+"clip-end to clip-beginning, and each clip has their begin/end."
+msgstr ""
+"Не используйте затухание для перехода. Это полезно при переходе от конца "
+"клипа к началу клипа, и у каждого клипа есть свое начало/конец."
+
+msgid "Use a fade-in in the next clip, let the current clip finish."
+msgstr ""
+"Используйте плавное появление следующего клипа, дайте текущему клипу "
+"закончиться."
+
+msgid "Use a fade-out in the current clip, the next clip will start by itself."
+msgstr ""
+"Используйте затухание в текущем клипе, следующий клип начнется сам собой."
+
+msgid "Use a cross-fade between clips."
+msgstr "Используйте плавный переход между клипами."
+
+msgid ""
+"Use automatic fade logic depending on the transition from/to. It is "
+"recommended to use this by default."
+msgstr ""
+"Использовать автоматическую логику затухания в зависимости от перехода от/к. "
+"Рекомендуется использовать это по умолчанию."
+
+msgid "Disable auto-advance (default)."
+msgstr "Отключить автопереход (по умолчанию)."
+
+msgid "Enable auto-advance, a clip must be specified."
+msgstr "Для включения автоматического перехода необходимо указать клип."
+
+msgid ""
+"Enable auto-advance, but instead of specifying a clip, the playback will "
+"return to hold (see [method add_transition])."
+msgstr ""
+"Включить автопереход, но вместо указания клипа воспроизведение вернется в "
+"режим паузы (см. [метод add_transition])."
+
+msgid ""
+"This constant describes that any clip is valid for a specific transition as "
+"either source or destination."
+msgstr ""
+"Эта константа описывает, что любой клип действителен для определенного "
+"перехода как источник или как место назначения."
+
+msgid "Plays real-time audio input data."
+msgstr "Воспроизводит входные аудиоданные в реальном времени."
+
+msgid ""
+"When used directly in an [AudioStreamPlayer] node, [AudioStreamMicrophone] "
+"plays back microphone input in real-time. This can be used in conjunction "
+"with [AudioEffectCapture] to process the data or save it.\n"
+"[b]Note:[/b] [member ProjectSettings.audio/driver/enable_input] must be "
+"[code]true[/code] for audio input to work. See also that setting's "
+"description for caveats related to permissions and operating system privacy "
+"settings."
+msgstr ""
+"При использовании непосредственно в узле [AudioStreamPlayer] "
+"[AudioStreamMicrophone] воспроизводит вход микрофона в реальном времени. Это "
+"можно использовать вместе с [AudioEffectCapture] для обработки данных или их "
+"сохранения.\n"
+"[b]Примечание:[/b] [member ProjectSettings.audio/driver/enable_input] должен "
+"быть [code]true[/code] для работы аудиовхода. См. также описание этого "
+"параметра для предостережений, связанных с разрешениями и настройками "
+"конфиденциальности операционной системы."
+
+msgid "Audio Mic Record Demo"
+msgstr "Audio Mic Record Демо"
+
+msgid "MP3 audio stream driver."
+msgstr "MP3 audio stream драйвер."
+
+msgid ""
+"MP3 audio stream driver. See [member data] if you want to load an MP3 file at "
+"run-time.\n"
+"[b]Note:[/b] This class can optionally support legacy MP1 and MP2 formats, "
+"provided that the engine is compiled with the "
+"[code]minimp3_extra_formats=yes[/code] SCons option. These extra formats are "
+"not enabled by default."
+msgstr ""
+"Драйвер аудиопотока MP3. См. [member data], если вы хотите загрузить файл MP3 "
+"во время выполнения.\n"
+"[b]Примечание:[/b] Этот класс может опционально поддерживать устаревшие "
+"форматы MP1 и MP2, при условии, что движок скомпилирован с опцией "
+"[code]minimp3_extra_formats=yes[/code] SCons. Эти дополнительные форматы не "
+"включены по умолчанию."
+
+msgid ""
+"Creates a new [AudioStreamMP3] instance from the given buffer. The buffer "
+"must contain MP3 data."
+msgstr ""
+"Создает новый экземпляр [AudioStreamMP3] из указанного буфера. Буфер должен "
+"содержать данные MP3."
+
+msgid ""
+"Creates a new [AudioStreamMP3] instance from the given file path. The file "
+"must be in MP3 format."
+msgstr ""
+"Создает новый экземпляр [AudioStreamMP3] из указанного пути к файлу. Файл "
+"должен быть в формате MP3."
+
+msgid ""
+"Contains the audio data in bytes.\n"
+"You can load a file without having to import it beforehand using the code "
+"snippet below. Keep in mind that this snippet loads the whole file into "
+"memory and may not be ideal for huge files (hundreds of megabytes or more).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func load_mp3(path):\n"
+"    var file = FileAccess.open(path, FileAccess.READ)\n"
+"    var sound = AudioStreamMP3.new()\n"
+"    sound.data = file.get_buffer(file.get_length())\n"
+"    return sound\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public AudioStreamMP3 LoadMP3(string path)\n"
+"{\n"
+"    using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"    var sound = new AudioStreamMP3();\n"
+"    sound.Data = file.GetBuffer(file.GetLength());\n"
+"    return sound;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Содержит аудиоданные в байтах.\n"
+"Вы можете загрузить файл без необходимости его предварительного импорта, "
+"используя фрагмент кода ниже. Имейте в виду, что этот фрагмент загружает весь "
+"файл в память и может быть неидеальным для огромных файлов (сотни мегабайт и "
+"более).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func load_mp3(path):\n"
+"    var file = FileAccess.open(path, FileAccess.READ)\n"
+"    var sound = AudioStreamMP3.new()\n"
+"    sound.data = file.get_buffer(file.get_length())\n"
+"    return sound\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public AudioStreamMP3 LoadMP3(string path)\n"
+"{\n"
+"    using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"    var sound = new AudioStreamMP3();\n"
+"    sound.Data = file.GetBuffer(file.GetLength());\n"
+"    return sound;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"If [code]true[/code], the stream will automatically loop when it reaches the "
+"end."
+msgstr ""
+"Если [code]true[/code], поток автоматически зациклится, когда достигнет конца."
+
+msgid "Time in seconds at which the stream starts after being looped."
+msgstr ""
+"Время в секундах, через которое начинается трансляция после зацикливания."
+
+msgid "A class representing an Ogg Vorbis audio stream."
+msgstr "Класс, представляющий аудиопоток Ogg Vorbis."
+
+msgid ""
+"The AudioStreamOggVorbis class is a specialized [AudioStream] for handling "
+"Ogg Vorbis file formats. It offers functionality for loading and playing back "
+"Ogg Vorbis files, as well as managing looping and other playback properties. "
+"This class is part of the audio stream system, which also supports WAV files "
+"through the [AudioStreamWAV] class."
+msgstr ""
+"Класс AudioStreamOggVorbis — это специализированный [AudioStream] для "
+"обработки форматов файлов Ogg Vorbis. Он предлагает функциональность для "
+"загрузки и воспроизведения файлов Ogg Vorbis, а также управления циклами и "
+"другими свойствами воспроизведения. Этот класс является частью системы "
+"аудиопотока, которая также поддерживает файлы WAV через класс "
+"[AudioStreamWAV]."
+
+msgid "Runtime file loading and saving"
+msgstr "Загрузка и сохранение файла времени выполнения"
+
+msgid ""
+"Creates a new [AudioStreamOggVorbis] instance from the given buffer. The "
+"buffer must contain Ogg Vorbis data."
+msgstr ""
+"Создает новый экземпляр [AudioStreamOggVorbis] из указанного буфера. Буфер "
+"должен содержать данные Ogg Vorbis."
+
+msgid ""
+"Creates a new [AudioStreamOggVorbis] instance from the given file path. The "
+"file must be in Ogg Vorbis format."
+msgstr ""
+"Создает новый экземпляр [AudioStreamOggVorbis] из указанного пути к файлу. "
+"Файл должен быть в формате Ogg Vorbis."
+
+msgid ""
+"If [code]true[/code], the audio will play again from the specified [member "
+"loop_offset] once it is done playing. Useful for ambient sounds and "
+"background music."
+msgstr ""
+"Если [code]true[/code], аудио будет воспроизводиться снова с указанного "
+"[member loop_offset] после завершения воспроизведения. Полезно для окружающих "
+"звуков и фоновой музыки."
+
+msgid "Contains the raw Ogg data for this stream."
+msgstr "Содержит необработанные данные Ogg для этого потока."
+
+msgid "Meta class for playing back audio."
+msgstr "Метакласс для воспроизведения звука."
+
+msgid ""
+"Can play, loop, pause a scroll through audio. See [AudioStream] and "
+"[AudioStreamOggVorbis] for usage."
+msgstr ""
+"Может воспроизводить, зацикливать, приостанавливать прокрутку аудио. См. "
+"[AudioStream] и [AudioStreamOggVorbis] для использования."
+
+msgid ""
+"Overridable method. Should return how many times this audio stream has "
+"looped. Most built-in playbacks always return [code]0[/code]."
+msgstr ""
+"Переопределяемый метод. Должен возвращать, сколько раз этот аудиопоток был "
+"зациклен. Большинство встроенных воспроизведений всегда возвращают [code]0[/"
+"code]."
+
+msgid ""
+"Overridable method. Should return the current progress along the audio "
+"stream, in seconds."
+msgstr ""
+"Переопределяемый метод. Должен возвращать текущий прогресс по аудиопотоку в "
+"секундах."
+
+msgid ""
+"Overridable method. Should return [code]true[/code] if this playback is "
+"active and playing its audio stream."
+msgstr ""
+"Переопределяемый метод. Должен возвращать [code]true[/code], если это "
+"воспроизведение активно и воспроизводит свой аудиопоток."
+
+msgid ""
+"Override this method to customize how the audio stream is mixed. This method "
+"is called even if the playback is not active.\n"
+"[b]Note:[/b] It is not useful to override this method in GDScript or C#. Only "
+"GDExtension can take advantage of it."
+msgstr ""
+"Переопределите этот метод, чтобы настроить способ микширования аудиопотока. "
+"Этот метод вызывается, даже если воспроизведение не активно.\n"
+"[b]Примечание:[/b] Не имеет смысла переопределять этот метод в GDScript или "
+"C#. Только GDExtension может воспользоваться им."
+
+msgid ""
+"Override this method to customize what happens when seeking this audio stream "
+"at the given [param position], such as by calling [method AudioStreamPlayer."
+"seek]."
+msgstr ""
+"Переопределите этот метод, чтобы настроить действия при поиске аудиопотока в "
+"указанной [позиции параметра], например, вызвав [метод AudioStreamPlayer."
+"seek]."
+
+msgid ""
+"Set the current value of a playback parameter by name (see [method "
+"AudioStream._get_parameter_list])."
+msgstr ""
+"Установить текущее значение параметра воспроизведения по имени (см. [метод "
+"AudioStream._get_parameter_list])."
+
+msgid ""
+"Override this method to customize what happens when the playback starts at "
+"the given position, such as by calling [method AudioStreamPlayer.play]."
+msgstr ""
+"Переопределите этот метод, чтобы настроить то, что происходит при запуске "
+"воспроизведения в заданной позиции, например, вызвав [метод AudioStreamPlayer."
+"play]."
+
+msgid ""
+"Override this method to customize what happens when the playback is stopped, "
+"such as by calling [method AudioStreamPlayer.stop]."
+msgstr ""
+"Переопределите этот метод, чтобы настроить действия, которые будут "
+"происходить при остановке воспроизведения, например, вызвав [метод "
+"AudioStreamPlayer.stop]."
+
+msgid ""
+"Overridable method. Called whenever the audio stream is mixed if the playback "
+"is active and [method AudioServer.set_enable_tagging_used_audio_streams] has "
+"been set to [code]true[/code]. Editor plugins may use this method to \"tag\" "
+"the current position along the audio stream and display it in a preview."
+msgstr ""
+"Переопределяемый метод. Вызывается всякий раз, когда аудиопоток микшируется, "
+"если воспроизведение активно и [method AudioServer."
+"set_enable_tagging_used_audio_streams] установлен в [code]true[/code]. "
+"Плагины редактора могут использовать этот метод для «тегирования» текущей "
+"позиции вдоль аудиопотока и отображения ее в предварительном просмотре."
+
+msgid ""
+"Returns the [AudioSamplePlayback] associated with this [AudioStreamPlayback] "
+"for playing back the audio sample of this stream."
+msgstr ""
+"Возвращает [AudioSamplePlayback], связанный с этим [AudioStreamPlayback], для "
+"воспроизведения аудиосэмпла этого потока."
+
+msgid ""
+"Mixes up to [param frames] of audio from the stream from the current "
+"position, at a rate of [param rate_scale], advancing the stream.\n"
+"Returns a [PackedVector2Array] where each element holds the left and right "
+"channel volume levels of each frame.\n"
+"[b]Note:[/b] Can return fewer frames than requested, make sure to use the "
+"size of the return value."
+msgstr ""
+"Смешивает до [param frames] аудио из потока из текущей позиции со скоростью "
+"[param rate_scale], продвигая поток.\n"
+"Возвращает [PackedVector2Array], где каждый элемент содержит уровни громкости "
+"левого и правого каналов каждого кадра.\n"
+"[b]Примечание:[/b] Может возвращать меньше кадров, чем запрошено, обязательно "
+"используйте размер возвращаемого значения."
+
+msgid ""
+"Associates [AudioSamplePlayback] to this [AudioStreamPlayback] for playing "
+"back the audio sample of this stream."
+msgstr ""
+"Связывает [AudioSamplePlayback] с этим [AudioStreamPlayback] для "
+"воспроизведения аудиосэмпла этого потока."
+
+msgid "Playback component of [AudioStreamInteractive]."
+msgstr "Компонент воспроизведения [AudioStreamInteractive]."
+
+msgid ""
+"Playback component of [AudioStreamInteractive]. Contains functions to change "
+"the currently played clip."
+msgstr ""
+"Компонент воспроизведения [AudioStreamInteractive]. Содержит функции для "
+"изменения текущего воспроизводимого клипа."
+
+msgid ""
+"Return the index of the currently playing clip. You can use this to get the "
+"name of the currently playing clip with [method AudioStreamInteractive."
+"get_clip_name].\n"
+"[b]Example:[/b] Get the currently playing clip name from inside an "
+"[AudioStreamPlayer] node.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var playing_clip_name = stream.get_clip_name(get_stream_playback()."
+"get_current_clip_index())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+msgstr ""
+"Верните индекс текущего воспроизводимого клипа. Вы можете использовать это, "
+"чтобы получить имя текущего воспроизводимого клипа с помощью [метода "
+"AudioStreamInteractive.get_clip_name].\n"
+"[b]Пример:[/b] Получите имя текущего воспроизводимого клипа из узла "
+"[AudioStreamPlayer].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var playing_clip_name = stream.get_clip_name(get_stream_playback()."
+"get_current_clip_index())\n"
+"[/gdscript]\n"
+"[/codeblocks]"
+
+msgid "Switch to a clip (by name)."
+msgstr "Переключиться на клип (по названию)."
+
+msgid "Playback class used for [AudioStreamPlaylist]."
+msgstr "Класс воспроизведения, используемый для [AudioStreamPlaylist]."
+
+msgid "Playback instance for [AudioStreamPolyphonic]."
+msgstr "Экземпляр воспроизведения для [AudioStreamPolyphonic]."
+
+msgid ""
+"Playback instance for [AudioStreamPolyphonic]. After setting the "
+"[code]stream[/code] property of [AudioStreamPlayer], [AudioStreamPlayer2D], "
+"or [AudioStreamPlayer3D], the playback instance can be obtained by calling "
+"[method AudioStreamPlayer.get_stream_playback], [method AudioStreamPlayer2D."
+"get_stream_playback] or [method AudioStreamPlayer3D.get_stream_playback] "
+"methods."
+msgstr ""
+"Экземпляр воспроизведения для [AudioStreamPolyphonic]. После установки "
+"свойства [code]stream[/code] для [AudioStreamPlayer], [AudioStreamPlayer2D] "
+"или [AudioStreamPlayer3D] экземпляр воспроизведения можно получить, вызвав "
+"методы [method AudioStreamPlayer.get_stream_playback], [method "
+"AudioStreamPlayer2D.get_stream_playback] или [method AudioStreamPlayer3D."
+"get_stream_playback]."
+
+msgid ""
+"Play an [AudioStream] at a given offset, volume, pitch scale, playback type, "
+"and bus. Playback starts immediately.\n"
+"The return value is a unique integer ID that is associated to this playback "
+"stream and which can be used to control it.\n"
+"This ID becomes invalid when the stream ends (if it does not loop), when the "
+"[AudioStreamPlaybackPolyphonic] is stopped, or when [method stop_stream] is "
+"called.\n"
+"This function returns [constant INVALID_ID] if the amount of streams "
+"currently playing equals [member AudioStreamPolyphonic.polyphony]. If you "
+"need a higher amount of maximum polyphony, raise this value."
+msgstr ""
+"Воспроизвести [AudioStream] с заданным смещением, громкостью, высотой тона, "
+"типом воспроизведения и шиной. Воспроизведение начинается немедленно.\n"
+"Возвращаемое значение — уникальный целочисленный идентификатор, связанный с "
+"этим потоком воспроизведения и который можно использовать для управления им.\n"
+"Этот идентификатор становится недействительным, когда поток заканчивается "
+"(если он не зацикливается), когда останавливается "
+"[AudioStreamPlaybackPolyphonic] или когда вызывается [method stop_stream].\n"
+"Эта функция возвращает [constant INVALID_ID], если количество потоков, "
+"воспроизводимых в данный момент, равно [member AudioStreamPolyphonic."
+"polyphony]. Если вам требуется большее количество максимальной полифонии, "
+"увеличьте это значение."
+
+msgid ""
+"Change the stream pitch scale. The [param stream] argument is an integer ID "
+"returned by [method play_stream]."
+msgstr ""
+"Изменить масштаб тона потока. Аргумент [param stream] — это целочисленный "
+"идентификатор, возвращаемый [method play_stream]."
+
+msgid ""
+"Change the stream volume (in db). The [param stream] argument is an integer "
+"ID returned by [method play_stream]."
+msgstr ""
+"Изменить громкость потока (в БД). Аргумент [param stream] — это целочисленный "
+"идентификатор, возвращаемый [method play_stream]."
+
+msgid ""
+"Stop a stream. The [param stream] argument is an integer ID returned by "
+"[method play_stream], which becomes invalid after calling this function."
+msgstr ""
+"Остановить поток. Аргумент [param stream] — это целочисленный идентификатор, "
+"возвращаемый [method play_stream], который становится недействительным после "
+"вызова этой функции."
+
+msgid ""
+"Returned by [method play_stream] in case it could not allocate a stream for "
+"playback."
+msgstr ""
+"Возвращается [методом play_stream] в случае, если не удалось выделить поток "
+"для воспроизведения."
+
+msgid "A node for audio playback."
+msgstr "Узел для воспроизведения звука."
+
+msgid ""
+"The [AudioStreamPlayer] node plays an audio stream non-positionally. It is "
+"ideal for user interfaces, menus, or background music.\n"
+"To use this node, [member stream] needs to be set to a valid [AudioStream] "
+"resource. Playing more than one sound at the same time is also supported, see "
+"[member max_polyphony].\n"
+"If you need to play audio at a specific position, use [AudioStreamPlayer2D] "
+"or [AudioStreamPlayer3D] instead."
+msgstr ""
+"Узел [AudioStreamPlayer] воспроизводит аудиопоток непозиционно. Он идеально "
+"подходит для пользовательских интерфейсов, меню или фоновой музыки.\n"
+"Чтобы использовать этот узел, [member stream] необходимо установить на "
+"допустимый ресурс [AudioStream]. Также поддерживается воспроизведение более "
+"одного звука одновременно, см. [member max_polyphony].\n"
+"Если вам нужно воспроизвести звук в определенной позиции, используйте вместо "
+"этого [AudioStreamPlayer2D] или [AudioStreamPlayer3D]."
+
+msgid ""
+"Returns the position in the [AudioStream] of the latest sound, in seconds. "
+"Returns [code]0.0[/code] if no sounds are playing.\n"
+"[b]Note:[/b] The position is not always accurate, as the [AudioServer] does "
+"not mix audio every processed frame. To get more accurate results, add "
+"[method AudioServer.get_time_since_last_mix] to the returned position.\n"
+"[b]Note:[/b] This method always returns [code]0.0[/code] if the [member "
+"stream] is an [AudioStreamInteractive], since it can have multiple clips "
+"playing at once."
+msgstr ""
+"Возвращает позицию в [AudioStream] последнего звука в секундах. Возвращает "
+"[code]0.0[/code], если звуки не воспроизводятся.\n"
+"[b]Примечание:[/b] Позиция не всегда точна, так как [AudioServer] не "
+"микширует звук в каждом обработанном кадре. Чтобы получить более точные "
+"результаты, добавьте [method AudioServer.get_time_since_last_mix] к "
+"возвращаемой позиции.\n"
+"[b]Примечание:[/b] Этот метод всегда возвращает [code]0.0[/code], если "
+"[member stream] является [AudioStreamInteractive], так как он может "
+"воспроизводить несколько клипов одновременно."
+
+msgid ""
+"Returns the latest [AudioStreamPlayback] of this node, usually the most "
+"recently created by [method play]. If no sounds are playing, this method "
+"fails and returns an empty playback."
+msgstr ""
+"Возвращает последний [AudioStreamPlayback] этого узла, обычно последний "
+"созданный [method play]. Если звуки не воспроизводятся, этот метод "
+"завершается ошибкой и возвращает пустое воспроизведение."
+
+msgid ""
+"Restarts all sounds to be played from the given [param to_position], in "
+"seconds. Does nothing if no sounds are playing."
+msgstr ""
+"Перезапускает все звуки, которые должны быть воспроизведены с указанного "
+"[param to_position], в секундах. Ничего не делает, если звуки не "
+"воспроизводятся."
+
+msgid ""
+"The target bus name. All sounds from this node will be playing on this bus.\n"
+"[b]Note:[/b] At runtime, if no bus with the given name exists, all sounds "
+"will fall back on [code]\"Master\"[/code]. See also [method AudioServer."
+"get_bus_name]."
+msgstr ""
+"Имя целевой шины. Все звуки из этого узла будут воспроизводиться на этой "
+"шине.\n"
+"[b]Примечание:[/b] Во время выполнения, если шины с указанным именем не "
+"существует, все звуки будут возвращаться на [code]\"Master\"[/code]. См. "
+"также [method AudioServer.get_bus_name]."
+
+msgid ""
+"The maximum number of sounds this node can play at the same time. Calling "
+"[method play] after this value is reached will cut off the oldest sounds."
+msgstr ""
+"Максимальное количество звуков, которые этот узел может воспроизводить "
+"одновременно. Вызов [method play] после достижения этого значения отсечет "
+"самые старые звуки."
+
+msgid ""
+"The mix target channels, as one of the [enum MixTarget] constants. Has no "
+"effect when two speakers or less are detected (see [enum AudioServer."
+"SpeakerMode])."
+msgstr ""
+"Каналы микширования, как одна из констант [enum MixTarget]. Не имеет эффекта, "
+"если обнаружено два динамика или меньше (см. [enum AudioServer.SpeakerMode])."
+
+msgid ""
+"The audio's pitch and tempo, as a multiplier of the [member stream]'s sample "
+"rate. A value of [code]2.0[/code] doubles the audio's pitch, while a value of "
+"[code]0.5[/code] halves the pitch."
+msgstr ""
+"Высота и темп аудио, как множитель частоты дискретизации [member stream]. "
+"Значение [code]2.0[/code] удваивает высоту аудио, а значение [code]0.5[/code] "
+"уменьшает высоту вдвое."
+
+msgid ""
+"The playback type of the stream player. If set other than to the default "
+"value, it will force that playback type."
+msgstr ""
+"Тип воспроизведения потокового проигрывателя. Если установлено значение, "
+"отличное от значения по умолчанию, будет принудительно выбран этот тип "
+"воспроизведения."
+
+msgid ""
+"If [code]true[/code], this node is playing sounds. Setting this property has "
+"the same effect as [method play] and [method stop]."
+msgstr ""
+"Если [code]true[/code], этот узел воспроизводит звуки. Установка этого "
+"свойства имеет тот же эффект, что и [method play] и [method stop]."
+
+msgid ""
+"The [AudioStream] resource to be played. Setting this property stops all "
+"currently playing sounds. If left empty, the [AudioStreamPlayer] does not "
+"work."
+msgstr ""
+"Ресурс [AudioStream] для воспроизведения. Установка этого свойства "
+"останавливает все воспроизводимые в данный момент звуки. Если оставить "
+"пустым, [AudioStreamPlayer] не будет работать."
+
+msgid ""
+"If [code]true[/code], the sounds are paused. Setting [member stream_paused] "
+"to [code]false[/code] resumes all sounds.\n"
+"[b]Note:[/b] This property is automatically changed when exiting or entering "
+"the tree, or this node is paused (see [member Node.process_mode])."
+msgstr ""
+"Если [code]true[/code], звуки приостанавливаются. Установка [member "
+"stream_paused] в [code]false[/code] возобновляет все звуки.\n"
+"[b]Примечание:[/b] Это свойство автоматически изменяется при выходе или входе "
+"в дерево, или этот узел приостанавливается (см. [member Node.process_mode])."
+
+msgid ""
+"Volume of sound, in decibels. This is an offset of the [member stream]'s "
+"volume.\n"
+"[b]Note:[/b] To convert between decibel and linear energy (like most volume "
+"sliders do), use [member volume_linear], or [method @GlobalScope."
+"db_to_linear] and [method @GlobalScope.linear_to_db]."
+msgstr ""
+"Громкость звука в децибелах. Это смещение громкости [member stream].\n"
+"[b]Примечание:[/b] Для преобразования между децибелами и линейной энергией "
+"(как это делают большинство ползунков громкости) используйте [member "
+"volume_linear] или [метод @GlobalScope.db_to_linear] и [метод @GlobalScope."
+"linear_to_db]."
+
+msgid ""
+"Volume of sound, as a linear value.\n"
+"[b]Note:[/b] This member modifies [member volume_db] for convenience. The "
+"returned value is equivalent to the result of [method @GlobalScope."
+"db_to_linear] on [member volume_db]. Setting this member is equivalent to "
+"setting [member volume_db] to the result of [method @GlobalScope."
+"linear_to_db] on a value."
+msgstr ""
+"Громкость звука, как линейное значение.\n"
+"[b]Примечание:[/b] Этот член изменяет [member volume_db] для удобства. "
+"Возвращаемое значение эквивалентно результату [method @GlobalScope."
+"db_to_linear] для [member volume_db]. Установка этого члена эквивалентна "
+"установке [member volume_db] на результат [method @GlobalScope.linear_to_db] "
+"для значения."
+
+msgid ""
+"Emitted when a sound finishes playing without interruptions. This signal is "
+"[i]not[/i] emitted when calling [method stop], or when exiting the tree while "
+"sounds are playing."
+msgstr ""
+"Выдается, когда звук заканчивается без прерываний. Этот сигнал [i]не[/i] "
+"выдается при вызове [метода stop] или при выходе из дерева во время "
+"воспроизведения звуков."
+
+msgid "The audio will be played only on the first channel. This is the default."
+msgstr ""
+"Звук будет воспроизводиться только на первом канале. Это значение по "
+"умолчанию."
+
+msgid "The audio will be played on all surround channels."
+msgstr "Звук будет воспроизводиться на всех каналах объемного звучания."
+
+msgid ""
+"The audio will be played on the second channel, which is usually the center."
+msgstr ""
+"Звук будет воспроизводиться на втором канале, который обычно является "
+"центральным."
+
+msgid "Plays positional sound in 2D space."
+msgstr "Воспроизводит позиционный звук в 2D-пространстве."
+
+msgid ""
+"Plays audio that is attenuated with distance to the listener.\n"
+"By default, audio is heard from the screen center. This can be changed by "
+"adding an [AudioListener2D] node to the scene and enabling it by calling "
+"[method AudioListener2D.make_current] on it.\n"
+"See also [AudioStreamPlayer] to play a sound non-positionally.\n"
+"[b]Note:[/b] Hiding an [AudioStreamPlayer2D] node does not disable its audio "
+"output. To temporarily disable an [AudioStreamPlayer2D]'s audio output, set "
+"[member volume_db] to a very low value like [code]-100[/code] (which isn't "
+"audible to human hearing)."
+msgstr ""
+"Воспроизводит звук, который ослабевает с расстоянием до слушателя.\n"
+"По умолчанию звук слышен из центра экрана. Это можно изменить, добавив узел "
+"[AudioListener2D] к сцене и включив его, вызвав [method AudioListener2D."
+"make_current] для него.\n"
+"См. также [AudioStreamPlayer], чтобы воспроизвести звук непозиционно.\n"
+"[b]Примечание:[/b] Скрытие узла [AudioStreamPlayer2D] не отключает его "
+"аудиовыход. Чтобы временно отключить аудиовыход [AudioStreamPlayer2D], "
+"установите [member volume_db] на очень низкое значение, например [code]-100[/"
+"code] (которое не слышно человеческому слуху)."
+
+msgid "Returns the position in the [AudioStream]."
+msgstr "Возвращает позицию в [AudioStream]."
+
+msgid ""
+"Returns the [AudioStreamPlayback] object associated with this "
+"[AudioStreamPlayer2D]."
+msgstr ""
+"Возвращает объект [AudioStreamPlayback], связанный с этим "
+"[AudioStreamPlayer2D]."
+
+msgid ""
+"Returns whether the [AudioStreamPlayer] can return the [AudioStreamPlayback] "
+"object or not."
+msgstr ""
+"Возвращает, может ли [AudioStreamPlayer] вернуть объект [AudioStreamPlayback] "
+"или нет."
+
+msgid ""
+"Queues the audio to play on the next physics frame, from the given position "
+"[param from_position], in seconds."
+msgstr ""
+"Ставит звук в очередь для воспроизведения в следующем физическом кадре, "
+"начиная с указанной позиции [параметр from_position] в секундах."
+
+msgid "Sets the position from which audio will be played, in seconds."
+msgstr ""
+"Устанавливает позицию, с которой будет воспроизводиться звук, в секундах."
+
+msgid "Stops the audio."
+msgstr "Остановка звука."
+
+msgid ""
+"Determines which [Area2D] layers affect the sound for reverb and audio bus "
+"effects. Areas can be used to redirect [AudioStream]s so that they play in a "
+"certain audio bus. An example of how you might use this is making a \"water\" "
+"area so that sounds played in the water are redirected through an audio bus "
+"to make them sound like they are being played underwater."
+msgstr ""
+"Определяет, какие слои [Area2D] влияют на звук для эффектов реверберации и "
+"аудиошины. Области можно использовать для перенаправления [AudioStream]s так, "
+"чтобы они воспроизводились на определенной аудиошине. Примером того, как это "
+"можно использовать, является создание области «воды», чтобы звуки, "
+"воспроизводимые в воде, перенаправлялись через аудиошину, чтобы они звучали "
+"так, как будто они воспроизводятся под водой."
+
+msgid "The volume is attenuated over distance with this as an exponent."
+msgstr ""
+"Громкость звука уменьшается с расстоянием, причем показатель степени равен "
+"этому показателю."
+
+msgid "If [code]true[/code], audio plays when added to scene tree."
+msgstr ""
+"Если [code]true[/code], звук воспроизводится при добавлении в дерево сцен."
+
+msgid ""
+"Bus on which this audio is playing.\n"
+"[b]Note:[/b] When setting this property, keep in mind that no validation is "
+"performed to see if the given name matches an existing bus. This is because "
+"audio bus layouts might be loaded after this property is set. If this given "
+"name can't be resolved at runtime, it will fall back to [code]\"Master\"[/"
+"code]."
+msgstr ""
+"Шина, на которой воспроизводится этот звук.\n"
+"[b]Примечание:[/b] При установке этого свойства имейте в виду, что проверка "
+"соответствия данного имени существующей шине не выполняется. Это связано с "
+"тем, что макеты аудиошин могут быть загружены после установки этого свойства. "
+"Если данное имя не может быть разрешено во время выполнения, оно вернется к "
+"[code]\"Master\"[/code]."
+
+msgid "Maximum distance from which audio is still hearable."
+msgstr "Максимальное расстояние при котором можно услышать аудио."
+
+msgid ""
+"The maximum number of sounds this node can play at the same time. Playing "
+"additional sounds after this value is reached will cut off the oldest sounds."
+msgstr ""
+"Максимальное количество звуков, которые этот узел может воспроизводить "
+"одновременно. Воспроизведение дополнительных звуков после достижения этого "
+"значения приведет к отключению самых старых звуков."
+
+msgid ""
+"Scales the panning strength for this node by multiplying the base [member "
+"ProjectSettings.audio/general/2d_panning_strength] with this factor. Higher "
+"values will pan audio from left to right more dramatically than lower values."
+msgstr ""
+"Масштабирует силу панорамирования для этого узла, умножая базу [member "
+"ProjectSettings.audio/general/2d_panning_strength] на этот коэффициент. Более "
+"высокие значения будут панорамировать аудио слева направо более драматично, "
+"чем более низкие значения."
+
+msgid ""
+"The pitch and the tempo of the audio, as a multiplier of the audio sample's "
+"sample rate."
+msgstr ""
+"Высота тона и темп звука как множитель частоты дискретизации аудиосэмпла."
+
+msgid ""
+"If [code]true[/code], audio is playing or is queued to be played (see [method "
+"play])."
+msgstr ""
+"Если [code]true[/code], звук воспроизводится или поставлен в очередь на "
+"воспроизведение (см. [метод play])."
+
+msgid "The [AudioStream] object to be played."
+msgstr "Объект [AudioStream] для воспроизведения."
+
+msgid ""
+"If [code]true[/code], the playback is paused. You can resume it by setting "
+"[member stream_paused] to [code]false[/code]."
+msgstr ""
+"Если [code]true[/code], воспроизведение приостанавливается. Вы можете "
+"возобновить его, установив [member stream_paused] на [code]false[/code]."
+
+msgid "Base volume before attenuation, in decibels."
+msgstr "Базовая громкость до затухания, в децибелах."
+
+msgid ""
+"Base volume before attenuation, as a linear value.\n"
+"[b]Note:[/b] This member modifies [member volume_db] for convenience. The "
+"returned value is equivalent to the result of [method @GlobalScope."
+"db_to_linear] on [member volume_db]. Setting this member is equivalent to "
+"setting [member volume_db] to the result of [method @GlobalScope."
+"linear_to_db] on a value."
+msgstr ""
+"Базовый объем до затухания, как линейное значение.\n"
+"[b]Примечание:[/b] Этот член изменяет [member volume_db] для удобства. "
+"Возвращаемое значение эквивалентно результату [method @GlobalScope."
+"db_to_linear] для [member volume_db]. Установка этого члена эквивалентна "
+"установке [member volume_db] на результат [method @GlobalScope.linear_to_db] "
+"для значения."
+
+msgid "Emitted when the audio stops playing."
+msgstr "Издается, когда прекращается воспроизведение звука."
+
+msgid "Plays positional sound in 3D space."
+msgstr "Воспроизводит позиционный звук в трехмерном пространстве."
+
+msgid ""
+"Plays audio with positional sound effects, based on the relative position of "
+"the audio listener. Positional effects include distance attenuation, "
+"directionality, and the Doppler effect. For greater realism, a low-pass "
+"filter is applied to distant sounds. This can be disabled by setting [member "
+"attenuation_filter_cutoff_hz] to [code]20500[/code].\n"
+"By default, audio is heard from the camera position. This can be changed by "
+"adding an [AudioListener3D] node to the scene and enabling it by calling "
+"[method AudioListener3D.make_current] on it.\n"
+"See also [AudioStreamPlayer] to play a sound non-positionally.\n"
+"[b]Note:[/b] Hiding an [AudioStreamPlayer3D] node does not disable its audio "
+"output. To temporarily disable an [AudioStreamPlayer3D]'s audio output, set "
+"[member volume_db] to a very low value like [code]-100[/code] (which isn't "
+"audible to human hearing)."
+msgstr ""
+"Воспроизводит аудио с позиционными звуковыми эффектами, основанными на "
+"относительном положении слушателя аудио. Позиционные эффекты включают "
+"затухание на расстоянии, направленность и эффект Доплера. Для большей "
+"реалистичности к удаленным звукам применяется фильтр нижних частот. Это можно "
+"отключить, установив [member attenuation_filter_cutoff_hz] на [code]20500[/"
+"code].\n"
+"По умолчанию звук слышен из положения камеры. Это можно изменить, добавив "
+"узел [AudioListener3D] в сцену и включив его, вызвав [method AudioListener3D."
+"make_current] для него.\n"
+"См. также [AudioStreamPlayer], чтобы воспроизвести звук непозиционно.\n"
+"[b]Примечание:[/b] Скрытие узла [AudioStreamPlayer3D] не отключает его "
+"аудиовыход. Чтобы временно отключить аудиовыход [AudioStreamPlayer3D], "
+"установите для [member volume_db] очень низкое значение, например [code]-100[/"
+"code] (которое не слышно человеческому уху)."
+
+msgid ""
+"Returns the [AudioStreamPlayback] object associated with this "
+"[AudioStreamPlayer3D]."
+msgstr ""
+"Возвращает объект [AudioStreamPlayback], связанный с этим "
+"[AudioStreamPlayer3D]."
+
+msgid ""
+"Determines which [Area3D] layers affect the sound for reverb and audio bus "
+"effects. Areas can be used to redirect [AudioStream]s so that they play in a "
+"certain audio bus. An example of how you might use this is making a \"water\" "
+"area so that sounds played in the water are redirected through an audio bus "
+"to make them sound like they are being played underwater."
+msgstr ""
+"Определяет, какие слои [Area3D] влияют на звук для эффектов реверберации и "
+"аудиошины. Области можно использовать для перенаправления [AudioStream]s так, "
+"чтобы они воспроизводились на определенной аудиошине. Примером того, как это "
+"можно использовать, является создание области «воды», чтобы звуки, "
+"воспроизводимые в воде, перенаправлялись через аудиошину, чтобы они звучали "
+"так, как будто они воспроизводятся под водой."
+
+msgid ""
+"The cutoff frequency of the attenuation low-pass filter, in Hz. A sound above "
+"this frequency is attenuated more than a sound below this frequency. To "
+"disable this effect, set this to [code]20500[/code] as this frequency is "
+"above the human hearing limit."
+msgstr ""
+"Частота среза фильтра нижних частот ослабления в Гц. Звук выше этой частоты "
+"ослабляется сильнее, чем звук ниже этой частоты. Чтобы отключить этот эффект, "
+"установите его на [code]20500[/code], так как эта частота выше предела "
+"человеческого слуха."
+
+msgid "Amount how much the filter affects the loudness, in decibels."
+msgstr "Величина, в которой фильтр влияет на громкость, в децибелах."
+
+msgid ""
+"Decides if audio should get quieter with distance linearly, quadratically, "
+"logarithmically, or not be affected by distance, effectively disabling "
+"attenuation."
+msgstr ""
+"Решает, должен ли звук становиться тише с расстоянием линейно, квадратично, "
+"логарифмически или не зависеть от расстояния, эффективно отключая затухание."
+
+msgid ""
+"If [code]true[/code], audio plays when the AudioStreamPlayer3D node is added "
+"to scene tree."
+msgstr ""
+"Если [code]true[/code], звук воспроизводится при добавлении узла "
+"AudioStreamPlayer3D в дерево сцены."
+
+msgid ""
+"The bus on which this audio is playing.\n"
+"[b]Note:[/b] When setting this property, keep in mind that no validation is "
+"performed to see if the given name matches an existing bus. This is because "
+"audio bus layouts might be loaded after this property is set. If this given "
+"name can't be resolved at runtime, it will fall back to [code]\"Master\"[/"
+"code]."
+msgstr ""
+"Шина, на которой воспроизводится этот звук.\n"
+"[b]Примечание:[/b] При установке этого свойства имейте в виду, что проверка "
+"соответствия данного имени существующей шине не выполняется. Это связано с "
+"тем, что макеты аудиошин могут быть загружены после установки этого свойства. "
+"Если данное имя не может быть разрешено во время выполнения, оно вернется к "
+"[code]\"Master\"[/code]."
+
+msgid "Decides in which step the Doppler effect should be calculated."
+msgstr "Решает, на каком этапе следует рассчитывать эффект Доплера."
+
+msgid "The angle in which the audio reaches a listener unattenuated."
+msgstr "Угол, под которым звук достигает слушателя без ослабления."
+
+msgid ""
+"Attenuation factor used if listener is outside of [member "
+"emission_angle_degrees] and [member emission_angle_enabled] is set, in "
+"decibels."
+msgstr ""
+"Коэффициент затухания, используемый, если слушатель находится за пределами "
+"[member emission_angle_degrees] и задан [member emission_angle_enabled], в "
+"децибелах."
+
+msgid ""
+"The distance past which the sound can no longer be heard at all. Only has an "
+"effect if set to a value greater than [code]0.0[/code]. [member max_distance] "
+"works in tandem with [member unit_size]. However, unlike [member unit_size] "
+"whose behavior depends on the [member attenuation_model], [member "
+"max_distance] always works in a linear fashion. This can be used to prevent "
+"the [AudioStreamPlayer3D] from requiring audio mixing when the listener is "
+"far away, which saves CPU resources."
+msgstr ""
+"Расстояние, за пределами которого звук больше не слышен. Действует только "
+"если установлено значение больше [code]0.0[/code]. [member max_distance] "
+"работает в паре с [member unit_size]. Однако, в отличие от [member "
+"unit_size], поведение которого зависит от [member attenuation_model], [member "
+"max_distance] всегда работает линейно. Это можно использовать для "
+"предотвращения необходимости микширования звука [AudioStreamPlayer3D], когда "
+"слушатель находится далеко, что экономит ресурсы ЦП."
+
+msgid ""
+"Scales the panning strength for this node by multiplying the base [member "
+"ProjectSettings.audio/general/3d_panning_strength] with this factor. Higher "
+"values will pan audio from left to right more dramatically than lower values."
+msgstr ""
+"Масштабирует силу панорамирования для этого узла, умножая базу [member "
+"ProjectSettings.audio/general/3d_panning_strength] на этот коэффициент. Более "
+"высокие значения будут панорамировать аудио слева направо более драматично, "
+"чем более низкие значения."
+
+msgid "The [AudioStream] resource to be played."
+msgstr "Ресурс [AudioStream] для воспроизведения."
+
+msgid ""
+"The factor for the attenuation effect. Higher values make the sound audible "
+"over a larger distance."
+msgstr ""
+"Фактор эффекта затухания. Более высокие значения делают звук слышимым на "
+"большем расстоянии."
+
+msgid "The base sound level before attenuation, in decibels."
+msgstr "Базовый уровень звука до затухания, в децибелах."
+
+msgid ""
+"The base sound level before attenuation, as a linear value.\n"
+"[b]Note:[/b] This member modifies [member volume_db] for convenience. The "
+"returned value is equivalent to the result of [method @GlobalScope."
+"db_to_linear] on [member volume_db]. Setting this member is equivalent to "
+"setting [member volume_db] to the result of [method @GlobalScope."
+"linear_to_db] on a value."
+msgstr ""
+"Базовый уровень звука до затухания, как линейное значение.\n"
+"[b]Примечание:[/b] Этот член изменяет [member volume_db] для удобства. "
+"Возвращаемое значение эквивалентно результату [method @GlobalScope."
+"db_to_linear] для [member volume_db]. Установка этого члена эквивалентна "
+"установке [member volume_db] на результат [method @GlobalScope.linear_to_db] "
+"для значения."
+
+msgid "Attenuation of loudness according to linear distance."
+msgstr "Ослабление громкости в зависимости от линейного расстояния."
+
+msgid "Attenuation of loudness according to squared distance."
+msgstr "Ослабление громкости пропорционально квадрату расстояния."
+
+msgid "Attenuation of loudness according to logarithmic distance."
+msgstr "Ослабление громкости в зависимости от логарифмического расстояния."
+
+msgid ""
+"No attenuation of loudness according to distance. The sound will still be "
+"heard positionally, unlike an [AudioStreamPlayer]. [constant "
+"ATTENUATION_DISABLED] can be combined with a [member max_distance] value "
+"greater than [code]0.0[/code] to achieve linear attenuation clamped to a "
+"sphere of a defined size."
+msgstr ""
+"Нет ослабления громкости в зависимости от расстояния. Звук все равно будет "
+"слышен позиционно, в отличие от [AudioStreamPlayer]. [constant "
+"ATTENUATION_DISABLED] можно объединить со значением [member max_distance], "
+"большим, чем [code]0.0[/code], чтобы добиться линейного затухания, "
+"привязанного к сфере определенного размера."
+
+msgid "Disables doppler tracking."
+msgstr "Откл. доплеровского слежения."
+
+msgid ""
+"Executes doppler tracking during process frames (see [constant Node."
+"NOTIFICATION_INTERNAL_PROCESS])."
+msgstr ""
+"Выполняет доплеровское отслеживание во время кадров процесса (см. [constant "
+"Node.NOTIFICATION_INTERNAL_PROCESS])."
+
+msgid ""
+"Executes doppler tracking during physics frames (see [constant Node."
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS])."
+msgstr ""
+"Выполняет доплеровское отслеживание во время физических кадров (см. [constant "
+"Node.NOTIFICATION_INTERNAL_PHYSICS_PROCESS])."
+
+msgid ""
+"[AudioStream] that includes sub-streams and plays them back like a playlist."
+msgstr ""
+"[AudioStream], который включает в себя подпотоки и воспроизводит их как "
+"плейлист."
+
+msgid ""
+"Returns the BPM of the playlist, which can vary depending on the clip being "
+"played."
+msgstr ""
+"Возвращает BPM плейлиста, который может меняться в зависимости от "
+"воспроизводимого клипа."
+
+msgid ""
+"Fade time used when a stream ends, when going to the next one. Streams are "
+"expected to have an extra bit of audio after the end to help with fading."
+msgstr ""
+"Время затухания, используемое при завершении потока, при переходе к "
+"следующему. Ожидается, что потоки будут иметь дополнительный бит аудио после "
+"окончания, чтобы помочь с затуханием."
+
+msgid "Maximum amount of streams supported in the playlist."
+msgstr "Максимальное количество потоков, поддерживаемых в плейлисте."
+
+msgid ""
+"AudioStream that lets the user play custom streams at any time from code, "
+"simultaneously using a single player."
+msgstr ""
+"AudioStream, который позволяет пользователю воспроизводить пользовательские "
+"потоки в любое время из кода, одновременно используя один проигрыватель."
+
+msgid ""
+"AudioStream that lets the user play custom streams at any time from code, "
+"simultaneously using a single player.\n"
+"Playback control is done via the [AudioStreamPlaybackPolyphonic] instance set "
+"inside the player, which can be obtained via [method AudioStreamPlayer."
+"get_stream_playback], [method AudioStreamPlayer2D.get_stream_playback] or "
+"[method AudioStreamPlayer3D.get_stream_playback] methods. Obtaining the "
+"playback instance is only valid after the [code]stream[/code] property is set "
+"as an [AudioStreamPolyphonic] in those players."
+msgstr ""
+"AudioStream, который позволяет пользователю воспроизводить пользовательские "
+"потоки в любое время из кода, одновременно используя один проигрыватель.\n"
+"Управление воспроизведением осуществляется через экземпляр "
+"[AudioStreamPlaybackPolyphonic], установленный внутри проигрывателя, который "
+"можно получить с помощью методов [method AudioStreamPlayer."
+"get_stream_playback], [method AudioStreamPlayer2D.get_stream_playback] или "
+"[method AudioStreamPlayer3D.get_stream_playback]. Получение экземпляра "
+"воспроизведения допустимо только после того, как свойство [code]stream[/code] "
+"установлено как [AudioStreamPolyphonic] в этих проигрывателях."
+
+msgid "Maximum amount of simultaneous streams that can be played."
+msgstr ""
+"Максимальное количество одновременных потоков, которые можно воспроизводить."
+
+msgid "Wraps a pool of audio streams with pitch and volume shifting."
+msgstr "Объединяет пул аудиопотоков с изменением высоты тона и громкости."
+
+msgid ""
+"Picks a random AudioStream from the pool, depending on the playback mode, and "
+"applies random pitch shifting and volume shifting during playback."
+msgstr ""
+"Выбирает случайный аудиопоток из пула в зависимости от режима воспроизведения "
+"и применяет случайное смещение высоты тона и громкости во время "
+"воспроизведения."
+
+msgid ""
+"Insert a stream at the specified index. If the index is less than zero, the "
+"insertion occurs at the end of the underlying pool."
+msgstr ""
+"Вставить поток по указанному индексу. Если индекс меньше нуля, вставка "
+"происходит в конец базового пула."
+
+msgid "Move a stream from one index to another."
+msgstr "Переместить поток из одного индекса в другой."
+
+msgid ""
+"Set the probability weight of the stream at the specified index. The higher "
+"this value, the more likely that the randomizer will choose this stream "
+"during random playback modes."
+msgstr ""
+"Установить вес вероятности потока по указанному индексу. Чем выше это "
+"значение, тем больше вероятность, что рандомизатор выберет этот поток во "
+"время случайных режимов воспроизведения."
+
+msgid ""
+"Controls how this AudioStreamRandomizer picks which AudioStream to play next."
+msgstr ""
+"Управляет тем, как AudioStream Randomizer выбирает, какой AudioStream "
+"воспроизводить следующим."
+
+msgid ""
+"The intensity of random pitch variation. A value of 1 means no variation."
+msgstr ""
+"Интенсивность случайного изменения высоты тона. Значение 1 означает "
+"отсутствие изменения."
+
+msgid ""
+"The intensity of random volume variation. A value of 0 means no variation."
+msgstr ""
+"Интенсивность случайного изменения объема. Значение 0 означает отсутствие "
+"изменения."
+
+msgid ""
+"Pick a stream at random according to the probability weights chosen for each "
+"stream, but avoid playing the same stream twice in a row whenever possible. "
+"If only 1 sound is present in the pool, the same sound will always play, "
+"effectively allowing repeats to occur."
+msgstr ""
+"Выбирайте поток случайным образом в соответствии с весами вероятности, "
+"выбранными для каждого потока, но избегайте воспроизведения одного и того же "
+"потока дважды подряд, когда это возможно. Если в пуле присутствует только 1 "
+"звук, всегда будет воспроизводиться один и тот же звук, что фактически "
+"позволяет происходить повторам."
+
+msgid ""
+"Pick a stream at random according to the probability weights chosen for each "
+"stream. If only 1 sound is present in the pool, the same sound will always "
+"play."
+msgstr ""
+"Выберите поток случайным образом в соответствии с весами вероятности, "
+"выбранными для каждого потока. Если в пуле присутствует только 1 звук, всегда "
+"будет воспроизводиться один и тот же звук."
+
+msgid ""
+"Play streams in the order they appear in the stream pool. If only 1 sound is "
+"present in the pool, the same sound will always play."
+msgstr ""
+"Воспроизведение потоков в том порядке, в котором они появляются в пуле "
+"потоков. Если в пуле присутствует только 1 звук, всегда будет "
+"воспроизводиться один и тот же звук."
+
+msgid ""
+"Stream that can be fitted with sub-streams, which will be played in-sync."
+msgstr ""
+"Поток, который может быть дополнен подпотоками, которые будут "
+"воспроизводиться синхронно."
+
+msgid ""
+"This is a stream that can be fitted with sub-streams, which will be played in-"
+"sync. The streams begin at exactly the same time when play is pressed, and "
+"will end when the last of them ends. If one of the sub-streams loops, then "
+"playback will continue."
+msgstr ""
+"Это поток, который может быть оснащен подпотоками, которые будут "
+"воспроизводиться синхронно. Потоки начинаются в одно и то же время при "
+"нажатии кнопки воспроизведения и заканчиваются, когда заканчивается последний "
+"из них. Если один из подпотоков зацикливается, воспроизведение продолжается."
+
+msgid "Get one of the synchronized streams, by index."
+msgstr "Получить один из синхронизированных потоков по индексу."
+
+msgid "Get the volume of one of the synchronized streams, by index."
+msgstr "Получить громкость одного из синхронизированных потоков по индексу."
+
+msgid "Set the volume of one of the synchronized streams, by index."
+msgstr "Установите громкость одного из синхронизированных потоков по индексу."
+
+msgid "Set the total amount of streams that will be played back synchronized."
+msgstr ""
+"Установите общее количество потоков, которые будут воспроизводиться синхронно."
+
+msgid "Maximum amount of streams that can be synchronized."
+msgstr "Максимальное количество потоков, которые можно синхронизировать."
+
+msgid "Stores audio data loaded from WAV files."
+msgstr "Сохраняет аудиоданные, загруженные из WAV-файлов."
+
+msgid ""
+"AudioStreamWAV stores sound samples loaded from WAV files. To play the stored "
+"sound, use an [AudioStreamPlayer] (for non-positional audio) or "
+"[AudioStreamPlayer2D]/[AudioStreamPlayer3D] (for positional audio). The sound "
+"can be looped.\n"
+"This class can also be used to store dynamically-generated PCM audio data. "
+"See also [AudioStreamGenerator] for procedural audio generation."
+msgstr ""
+"AudioStreamWAV хранит звуковые образцы, загруженные из файлов WAV. Для "
+"воспроизведения сохраненного звука используйте [AudioStreamPlayer] (для "
+"непозиционного звука) или [AudioStreamPlayer2D]/[AudioStreamPlayer3D] (для "
+"позиционного звука). Звук может быть зациклен.\n"
+"Этот класс также можно использовать для хранения динамически сгенерированных "
+"аудиоданных PCM. См. также [AudioStreamGenerator] для процедурной генерации "
+"звука."
+
+msgid ""
+"Creates a new [AudioStreamWAV] instance from the given buffer. The buffer "
+"must contain WAV data.\n"
+"The keys and values of [param options] match the properties of "
+"[ResourceImporterWAV]. The usage of [param options] is identical to [method "
+"AudioStreamWAV.load_from_file]."
+msgstr ""
+"Создает новый экземпляр [AudioStreamWAV] из указанного буфера. Буфер должен "
+"содержать данные WAV.\n"
+"Ключи и значения [param options] соответствуют свойствам "
+"[ResourceImporterWAV]. Использование [param options] идентично [method "
+"AudioStreamWAV.load_from_file]."
+
+msgid ""
+"Creates a new [AudioStreamWAV] instance from the given file path. The file "
+"must be in WAV format.\n"
+"The keys and values of [param options] match the properties of "
+"[ResourceImporterWAV].\n"
+"[b]Example:[/b] Load the first file dropped as a WAV and play it:\n"
+"[codeblock]\n"
+"@onready var audio_player = $AudioStreamPlayer\n"
+"\n"
+"func _ready():\n"
+"    get_window().files_dropped.connect(_on_files_dropped)\n"
+"\n"
+"func _on_files_dropped(files):\n"
+"    if files[0].get_extension() == \"wav\":\n"
+"        audio_player.stream = AudioStreamWAV.load_from_file(files[0], {\n"
+"                \"force/max_rate\": true,\n"
+"                \"force/max_rate_hz\": 11025\n"
+"            })\n"
+"        audio_player.play()\n"
+"[/codeblock]"
+msgstr ""
+"Создает новый экземпляр [AudioStreamWAV] из указанного пути к файлу. Файл "
+"должен быть в формате WAV.\n"
+"Ключи и значения [param options] соответствуют свойствам "
+"[ResourceImporterWAV].\n"
+"[b]Пример:[/b] Загрузите первый перетащенный файл как WAV и воспроизведите "
+"его:\n"
+"[codeblock]\n"
+"@onready var audio_player = $AudioStreamPlayer\n"
+"\n"
+"func _ready():\n"
+"    get_window().files_dropped.connect(_on_files_dropped)\n"
+"\n"
+"func _on_files_dropped(files):\n"
+"    if files[0].get_extension() == \"wav\":\n"
+"        audio_player.stream = AudioStreamWAV.load_from_file(files[0], {\n"
+"                \"force/max_rate\": true,\n"
+"                \"force/max_rate_hz\": 11025\n"
+"            })\n"
+"        audio_player.play()\n"
+"[/codeblock]"
+
+msgid ""
+"Saves the AudioStreamWAV as a WAV file to [param path]. Samples with IMA "
+"ADPCM or Quite OK Audio formats can't be saved.\n"
+"[b]Note:[/b] A [code].wav[/code] extension is automatically appended to "
+"[param path] if it is missing."
+msgstr ""
+"Сохраняет AudioStreamWAV как файл WAV в [param path]. Сэмплы с форматами IMA "
+"ADPCM или Quite OK Audio не могут быть сохранены.\n"
+"[b]Примечание:[/b] Расширение [code].wav[/code] автоматически добавляется к "
+"[param path], если оно отсутствует."
+
+msgid ""
+"Contains the audio data in bytes.\n"
+"[b]Note:[/b] If [member format] is set to [constant FORMAT_8_BITS], this "
+"property expects signed 8-bit PCM data. To convert from unsigned 8-bit PCM, "
+"subtract 128 from each byte.\n"
+"[b]Note:[/b] If [member format] is set to [constant FORMAT_QOA], this "
+"property expects data from a full QOA file."
+msgstr ""
+"Содержит аудиоданные в байтах.\n"
+"[b]Примечание:[/b] Если [формат элемента] установлен на [константа "
+"FORMAT_8_BITS], это свойство ожидает данные PCM со знаком 8 бит. Для "
+"преобразования из беззнаковых 8 бит PCM вычтите 128 из каждого байта.\n"
+"[b]Примечание:[/b] Если [формат элемента] установлен на [константа "
+"FORMAT_QOA], это свойство ожидает данные из полного файла QOA."
+
+msgid "Audio format. See [enum Format] constants for values."
+msgstr "Формат аудио. См. константы [enum Format] для значений."
+
+msgid ""
+"The loop start point (in number of samples, relative to the beginning of the "
+"stream)."
+msgstr ""
+"Начальная точка цикла (в количестве сэмплов относительно начала потока)."
+
+msgid ""
+"The loop end point (in number of samples, relative to the beginning of the "
+"stream)."
+msgstr "Конечная точка цикла (в количестве сэмплов относительно начала потока)."
+
+msgid ""
+"The sample rate for mixing this audio. Higher values require more storage "
+"space, but result in better quality.\n"
+"In games, common sample rates in use are [code]11025[/code], [code]16000[/"
+"code], [code]22050[/code], [code]32000[/code], [code]44100[/code], and "
+"[code]48000[/code].\n"
+"According to the [url=https://en.wikipedia.org/wiki/"
+"Nyquist%E2%80%93Shannon_sampling_theorem]Nyquist-Shannon sampling theorem[/"
+"url], there is no quality difference to human hearing when going past 40,000 "
+"Hz (since most humans can only hear up to ~20,000 Hz, often less). If you are "
+"using lower-pitched sounds such as voices, lower sample rates such as "
+"[code]32000[/code] or [code]22050[/code] may be usable with no loss in "
+"quality."
+msgstr ""
+"Частота дискретизации для микширования этого звука. Более высокие значения "
+"требуют больше места для хранения, но приводят к лучшему качеству.\n"
+"В играх обычно используются следующие частоты дискретизации: [code]11025[/"
+"code], [code]16000[/code], [code]22050[/code], [code]32000[/code], "
+"[code]44100[/code] и [code]48000[/code].\n"
+"Согласно [url=https://en.wikipedia.org/wiki/"
+"Nyquist%E2%80%93Shannon_sampling_theorem]теореме дискретизации Найквиста-"
+"Шеннона[/url], для человеческого слуха нет никакой разницы в качестве при "
+"выходе за пределы 40 000 Гц (поскольку большинство людей могут слышать только "
+"до ~20 000 Гц, часто меньше). Если вы используете более низкие звуки, такие "
+"как голоса, можно использовать более низкие частоты дискретизации, такие как "
+"[code]32000[/code] или [code]22050[/code], без потери качества."
+
+msgid "If [code]true[/code], audio is stereo."
+msgstr "Если [code]true[/code], звук стерео."
+
+msgid "Audio is lossily compressed as IMA ADPCM."
+msgstr "Аудио сжимается с потерями по методу IMA ADPCM."
+
+msgid ""
+"Audio is lossily compressed as [url=https://qoaformat.org/]Quite OK Audio[/"
+"url]."
+msgstr ""
+"Аудио сжато с потерями как [url=https://qoaformat.org/]Quite OK Audio[/url]."
+
+msgid "Audio does not loop."
+msgstr "Звук не зацикливается."
+
+msgid ""
+"Audio loops the data between [member loop_begin] and [member loop_end], "
+"playing forward only."
+msgstr ""
+"Аудио зацикливает данные между [member loop_begin] и [member loop_end], "
+"воспроизводя только вперед."
+
+msgid ""
+"Audio loops the data between [member loop_begin] and [member loop_end], "
+"playing back and forth."
+msgstr ""
+"Аудио циклически воспроизводит данные между [member loop_begin] и [member "
+"loop_end], воспроизводя их вперед и назад."
+
+msgid ""
+"Audio loops the data between [member loop_begin] and [member loop_end], "
+"playing backward only."
+msgstr ""
+"Аудио зацикливает данные между [member loop_begin] и [member loop_end], "
+"воспроизводя их только в обратном порядке."
+
+msgid ""
+"A node that copies a region of the screen to a buffer for access in shader "
+"code."
+msgstr ""
+"Узел, который копирует область экрана в буфер для доступа в коде шейдера."
+
+msgid ""
+"Node for back-buffering the currently-displayed screen. The region defined in "
+"the [BackBufferCopy] node is buffered with the content of the screen it "
+"covers, or the entire screen according to the [member copy_mode]. It can be "
+"accessed in shader scripts using the screen texture (i.e. a uniform sampler "
+"with [code]hint_screen_texture[/code]).\n"
+"[b]Note:[/b] Since this node inherits from [Node2D] (and not [Control]), "
+"anchors and margins won't apply to child [Control]-derived nodes. This can be "
+"problematic when resizing the window. To avoid this, add [Control]-derived "
+"nodes as [i]siblings[/i] to the [BackBufferCopy] node instead of adding them "
+"as children."
+msgstr ""
+"Узел для буферизации текущего отображаемого экрана. Регион, определенный в "
+"узле [BackBufferCopy], буферизуется содержимым экрана, который он покрывает, "
+"или всем экраном в соответствии с [member copy_mode]. К нему можно получить "
+"доступ в скриптах шейдера с помощью текстуры экрана (т. е. однородного "
+"сэмплера с [code]hint_screen_texture[/code]).\n"
+"[b]Примечание:[/b] Поскольку этот узел наследуется от [Node2D] (а не от "
+"[Control]), якоря и поля не будут применяться к дочерним узлам, производным "
+"от [Control]. Это может быть проблематично при изменении размера окна. Чтобы "
+"избежать этого, добавьте узлы, производные от [Control], как [i]родственные[/"
+"i] узлы в узел [BackBufferCopy] вместо того, чтобы добавлять их как дочерние."
+
+msgid "Screen-reading shaders"
+msgstr "Шейдеры чтения экрана"
+
+msgid "Buffer mode. See [enum CopyMode] constants."
+msgstr "Режим буфера. См. константы [enum CopyMode]."
+
+msgid ""
+"The area covered by the [BackBufferCopy]. Only used if [member copy_mode] is "
+"[constant COPY_MODE_RECT]."
+msgstr ""
+"Область, охватываемая [BackBufferCopy]. Используется только если [member "
+"copy_mode] равен [constant COPY_MODE_RECT]."
+
+msgid ""
+"Disables the buffering mode. This means the [BackBufferCopy] node will "
+"directly use the portion of screen it covers."
+msgstr ""
+"Отключает режим буферизации. Это означает, что узел [BackBufferCopy] будет "
+"напрямую использовать часть экрана, которую он покрывает."
+
+msgid "[BackBufferCopy] buffers a rectangular region."
+msgstr "[BackBufferCopy] буферизует прямоугольную область."
+
+msgid "[BackBufferCopy] buffers the entire screen."
+msgstr "[BackBufferCopy] буферизует весь экран."
+
+msgid ""
+"[BaseButton] is an abstract base class for GUI buttons. It doesn't display "
+"anything by itself."
+msgstr ""
+"[BaseButton] — абстрактный базовый класс для кнопок GUI. Сам по себе он "
+"ничего не отображает."
+
+msgid ""
+"Called when the button is pressed. If you need to know the button's pressed "
+"state (and [member toggle_mode] is active), use [method _toggled] instead."
+msgstr ""
+"Вызывается при нажатии кнопки. Если вам нужно узнать нажатое состояние кнопки "
+"(и [member toggle_mode] активен), используйте вместо этого [method _toggled]."
+
+msgid ""
+"Called when the button is toggled (only if [member toggle_mode] is active)."
+msgstr ""
+"Вызывается при переключении кнопки (только если активен [member toggle_mode])."
+
+msgid ""
+"Returns the visual state used to draw the button. This is useful mainly when "
+"implementing your own draw code by either overriding _draw() or connecting to "
+"\"draw\" signal. The visual state of the button is defined by the [enum "
+"DrawMode] enum."
+msgstr ""
+"Возвращает визуальное состояние, используемое для отрисовки кнопки. Это "
+"полезно в основном при реализации собственного кода отрисовки путем "
+"переопределения _draw() или подключения к сигналу \"draw\". Визуальное "
+"состояние кнопки определяется перечислением [enum DrawMode]."
+
+msgid ""
+"Returns [code]true[/code] if the mouse has entered the button and has not "
+"left it yet."
+msgstr ""
+"Возвращает [code]true[/code], если мышь вошла в кнопку и еще не покинула ее."
+
+msgid ""
+"Changes the [member button_pressed] state of the button, without emitting "
+"[signal toggled]. Use when you just want to change the state of the button "
+"without sending the pressed event (e.g. when initializing scene). Only works "
+"if [member toggle_mode] is [code]true[/code].\n"
+"[b]Note:[/b] This method doesn't unpress other buttons in [member "
+"button_group]."
+msgstr ""
+"Изменяет состояние [member button_pressed] кнопки, не выдавая [signal "
+"toggled]. Используйте, когда вы просто хотите изменить состояние кнопки, не "
+"отправляя событие нажатия (например, при инициализации сцены). Работает "
+"только если [member toggle_mode] равно [code]true[/code].\n"
+"[b]Примечание:[/b] Этот метод не отжимает другие кнопки в [member "
+"button_group]."
+
+msgid ""
+"Determines when the button is considered clicked, one of the [enum "
+"ActionMode] constants."
+msgstr ""
+"Определяет, когда кнопка считается нажатой, одна из констант [enum "
+"ActionMode]."
+
+msgid ""
+"The [ButtonGroup] associated with the button. Not to be confused with node "
+"groups.\n"
+"[b]Note:[/b] The button will be configured as a radio button if a "
+"[ButtonGroup] is assigned to it."
+msgstr ""
+"[ButtonGroup], связанная с кнопкой. Не путать с группами узлов.\n"
+"[b]Примечание:[/b] Кнопка будет настроена как радиокнопка, если ей назначена "
+"[ButtonGroup]."
+
+msgid ""
+"Binary mask to choose which mouse buttons this button will respond to.\n"
+"To allow both left-click and right-click, use [code]MOUSE_BUTTON_MASK_LEFT | "
+"MOUSE_BUTTON_MASK_RIGHT[/code]."
+msgstr ""
+"Двоичная маска для выбора кнопок мыши, на которые будет реагировать эта "
+"кнопка.\n"
+"Чтобы разрешить как левый, так и правый щелчок, используйте "
+"[code]MOUSE_BUTTON_MASK_LEFT | MOUSE_BUTTON_MASK_RIGHT[/code]."
+
+msgid ""
+"If [code]true[/code], the button's state is pressed. Means the button is "
+"pressed down or toggled (if [member toggle_mode] is active). Only works if "
+"[member toggle_mode] is [code]true[/code].\n"
+"[b]Note:[/b] Changing the value of [member button_pressed] will result in "
+"[signal toggled] to be emitted. If you want to change the pressed state "
+"without emitting that signal, use [method set_pressed_no_signal]."
+msgstr ""
+"Если [code]true[/code], состояние кнопки нажато. Означает, что кнопка нажата "
+"или переключена (если [member toggle_mode] активен). Работает только если "
+"[member toggle_mode] равен [code]true[/code].\n"
+"[b]Примечание:[/b] Изменение значения [member button_pressed] приведет к "
+"отправке [signal toggled]. Если вы хотите изменить состояние нажатия без "
+"отправки этого сигнала, используйте [method set_pressed_no_signal]."
+
+msgid ""
+"If [code]true[/code], the button is in disabled state and can't be clicked or "
+"toggled."
+msgstr ""
+"Если [code]true[/code], кнопка находится в отключенном состоянии и не может "
+"быть нажата или переключена."
+
+msgid ""
+"If [code]true[/code], the button stays pressed when moving the cursor outside "
+"the button while pressing it.\n"
+"[b]Note:[/b] This property only affects the button's visual appearance. "
+"Signals will be emitted at the same moment regardless of this property's "
+"value."
+msgstr ""
+"Если [code]true[/code], кнопка остается нажатой при перемещении курсора за "
+"пределы кнопки во время нажатия на нее.\n"
+"[b]Примечание:[/b] Это свойство влияет только на внешний вид кнопки. Сигналы "
+"будут выдаваться в тот же момент, независимо от значения этого свойства."
+
+msgid "[Shortcut] associated to the button."
+msgstr "[Ярлык (Shortcut)], связанный с кнопкой."
+
+msgid ""
+"If [code]true[/code], the button will highlight for a short amount of time "
+"when its shortcut is activated. If [code]false[/code] and [member "
+"toggle_mode] is [code]false[/code], the shortcut will activate without any "
+"visual feedback."
+msgstr ""
+"Если [code]true[/code], кнопка будет подсвечена на короткое время, когда ее "
+"ярлык активирован. Если [code]false[/code] и [member toggle_mode] равен "
+"[code]false[/code], ярлык активируется без какой-либо визуальной обратной "
+"связи."
+
+msgid ""
+"If [code]true[/code], the button will add information about its shortcut in "
+"the tooltip.\n"
+"[b]Note:[/b] This property does nothing when the tooltip control is "
+"customized using [method Control._make_custom_tooltip]."
+msgstr ""
+"Если [code]true[/code], кнопка добавит информацию о своем сочетании клавиш в "
+"подсказку.\n"
+"[b]Примечание:[/b] Это свойство ничего не делает, когда элемент управления "
+"подсказкой настраивается с помощью [method Control._make_custom_tooltip]."
+
+msgid ""
+"If [code]true[/code], the button is in toggle mode. Makes the button flip "
+"state between pressed and unpressed each time its area is clicked."
+msgstr ""
+"Если [code]true[/code], кнопка находится в режиме переключения. Заставляет "
+"кнопку переключать состояние между нажатым и ненажатым каждый раз, когда "
+"нажимается ее область."
+
+msgid "Emitted when the button starts being held down."
+msgstr "Издается при нажатии кнопки."
+
+msgid "Emitted when the button stops being held down."
+msgstr "Издается, когда кнопка перестает удерживаться."
+
+msgid ""
+"Emitted when the button is toggled or pressed. This is on [signal "
+"button_down] if [member action_mode] is [constant ACTION_MODE_BUTTON_PRESS] "
+"and on [signal button_up] otherwise.\n"
+"If you need to know the button's pressed state (and [member toggle_mode] is "
+"active), use [signal toggled] instead."
+msgstr ""
+"Выдается, когда кнопка переключается или нажимается. Это происходит при "
+"[сигнале button_down], если [member action_mode] равно [constant "
+"ACTION_MODE_BUTTON_PRESS], и при [сигнале button_up] в противном случае.\n"
+"Если вам нужно узнать нажатое состояние кнопки (и [member toggle_mode] "
+"активен), используйте вместо этого [сигнал toggled]."
+
+msgid ""
+"Emitted when the button was just toggled between pressed and normal states "
+"(only if [member toggle_mode] is active). The new state is contained in the "
+"[param toggled_on] argument."
+msgstr ""
+"Выдается, когда кнопка была просто переключена между нажатым и нормальным "
+"состояниями (только если [member toggle_mode] активен). Новое состояние "
+"содержится в аргументе [param toggled_on]."
+
+msgid ""
+"The normal state (i.e. not pressed, not hovered, not toggled and enabled) of "
+"buttons."
+msgstr ""
+"Нормальное состояние кнопок (т. е. не нажато, не наведено, не переключено и "
+"не включено)."
+
+msgid "The state of buttons are pressed."
+msgstr "Состояние кнопок нажато."
+
+msgid "The state of buttons are hovered."
+msgstr "Состояние кнопок наведено."
+
+msgid "The state of buttons are disabled."
+msgstr "Состояние кнопок — отключено."
+
+msgid "The state of buttons are both hovered and pressed."
+msgstr "Состояние кнопок — наведенное и нажатое."
+
+msgid "Require just a press to consider the button clicked."
+msgstr "Для того, чтобы кнопка считалась нажатой, достаточно одного нажатия."
+
+msgid ""
+"Require a press and a subsequent release before considering the button "
+"clicked."
+msgstr ""
+"Требуйте нажатия и последующего отпускания кнопки, прежде чем считать нажатие "
+"на нее выполненным."
+
+msgid ""
+"This class serves as a default material with a wide variety of rendering "
+"features and properties without the need to write shader code. See the "
+"tutorial below for details."
+msgstr ""
+"Этот класс служит материалом по умолчанию с широким спектром функций и "
+"свойств рендеринга без необходимости писать код шейдера. Подробности смотрите "
+"в руководстве ниже."
+
+msgid "Standard Material 3D and ORM Material 3D"
+msgstr "Стандартный материал 3D и материал ORM 3D"
+
+msgid "Returns [code]true[/code], if the specified [enum Feature] is enabled."
+msgstr "Возвращает [code]true[/code], если указанная [enum Feature] включена."
+
+msgid ""
+"Returns [code]true[/code], if the specified flag is enabled. See [enum Flags] "
+"enumerator for options."
+msgstr ""
+"Возвращает [code]true[/code], если указанный флаг включен. Смотрите "
+"перечислитель [enum Flags] для опций."
+
+msgid ""
+"If [code]true[/code], enables the specified [enum Feature]. Many features "
+"that are available in [BaseMaterial3D]s need to be enabled before use. This "
+"way the cost for using the feature is only incurred when specified. Features "
+"can also be enabled by setting the corresponding member to [code]true[/code]."
+msgstr ""
+"Если [code]true[/code], включает указанный [enum Feature]. Многие функции, "
+"доступные в [BaseMaterial3D], необходимо включить перед использованием. Таким "
+"образом, стоимость использования функции взимается только при ее указании. "
+"Функции также можно включить, установив соответствующий член в [code]true[/"
+"code]."
+
+msgid ""
+"If [code]true[/code], enables the specified flag. Flags are optional behavior "
+"that can be turned on and off. Only one flag can be enabled at a time with "
+"this function, the flag enumerators cannot be bit-masked together to enable "
+"or disable multiple flags at once. Flags can also be enabled by setting the "
+"corresponding member to [code]true[/code]. See [enum Flags] enumerator for "
+"options."
+msgstr ""
+"Если [code]true[/code], включает указанный флаг. Флаги — это необязательное "
+"поведение, которое можно включать и выключать. С помощью этой функции можно "
+"включить только один флаг за раз, перечислители флагов не могут быть "
+"маскированы битами вместе для включения или отключения нескольких флагов "
+"одновременно. Флаги также можно включить, установив соответствующий член в "
+"[code]true[/code]. См. перечислитель [enum Flags] для опций."
+
+msgid ""
+"The material's base color.\n"
+"[b]Note:[/b] If [member detail_enabled] is [code]true[/code] and a [member "
+"detail_albedo] texture is specified, [member albedo_color] will [i]not[/i] "
+"modulate the detail texture. This can be used to color partial areas of a "
+"material by not specifying an albedo texture and using a transparent [member "
+"detail_albedo] texture instead."
+msgstr ""
+"Базовый цвет материала.\n"
+"[b]Примечание:[/b] Если [member detail_enabled] имеет значение [code]true[/"
+"code] и указана текстура [member detail_albedo], [member albedo_color] будет "
+"[i]не[/i] модулировать текстуру детализации. Это можно использовать для "
+"окрашивания частичных областей материала, не указывая текстуру альбедо и "
+"используя вместо нее прозрачную текстуру [member detail_albedo]."
+
+msgid ""
+"Texture to multiply by [member albedo_color]. Used for basic texturing of "
+"objects.\n"
+"If the texture appears unexpectedly too dark or too bright, check [member "
+"albedo_texture_force_srgb]."
+msgstr ""
+"Текстура для умножения на [member albedo_color]. Используется для базового "
+"текстурирования объектов.\n"
+"Если текстура неожиданно выглядит слишком темной или слишком яркой, проверьте "
+"[member albedo_texture_force_srgb]."
+
+msgid ""
+"If [code]true[/code], forces a conversion of the [member albedo_texture] from "
+"sRGB color space to linear color space. See also [member "
+"vertex_color_is_srgb].\n"
+"This should only be enabled when needed (typically when using a "
+"[ViewportTexture] as [member albedo_texture]). If [member "
+"albedo_texture_force_srgb] is [code]true[/code] when it shouldn't be, the "
+"texture will appear to be too dark. If [member albedo_texture_force_srgb] is "
+"[code]false[/code] when it shouldn't be, the texture will appear to be too "
+"bright."
+msgstr ""
+"Если [code]true[/code], принудительно преобразует [member albedo_texture] из "
+"цветового пространства sRGB в линейное цветовое пространство. См. также "
+"[member vertex_color_is_srgb]. \n"
+"Это следует включать только при необходимости (обычно при использовании "
+"[ViewportTexture] в качестве [member albedo_texture]). Если [member "
+"albedo_texture_force_srgb] равно [code]true[/code], когда это не должно быть, "
+"текстура будет казаться слишком темной. Если [member "
+"albedo_texture_force_srgb] равно [code]false[/code], когда это не должно "
+"быть, текстура будет казаться слишком яркой."
+
+msgid ""
+"Enables multichannel signed distance field rendering shader. Use [member "
+"msdf_pixel_range] and [member msdf_outline_size] to configure MSDF parameters."
+msgstr ""
+"Включает многоканальный шейдер рендеринга поля со знаком. Используйте [member "
+"msdf_pixel_range] и [member msdf_outline_size] для настройки параметров MSDF."
+
+msgid "Threshold at which antialiasing will be applied on the alpha channel."
+msgstr "Порог, при котором к альфа-каналу будет применено сглаживание."
+
+msgid "The type of alpha antialiasing to apply. See [enum AlphaAntiAliasing]."
+msgstr ""
+"Тип альфа-сглаживания, который следует применять. См. [enum "
+"AlphaAntiAliasing]."
+
+msgid ""
+"Threshold at which the alpha scissor will discard values. Higher values will "
+"result in more pixels being discarded. If the material becomes too opaque at "
+"a distance, try increasing [member alpha_scissor_threshold]. If the material "
+"disappears at a distance, try decreasing [member alpha_scissor_threshold]."
+msgstr ""
+"Порог, при котором альфа-ножницы будут отбрасывать значения. Более высокие "
+"значения приведут к отбрасыванию большего количества пикселей. Если материал "
+"становится слишком непрозрачным на расстоянии, попробуйте увеличить [member "
+"alpha_scissor_threshold]. Если материал исчезает на расстоянии, попробуйте "
+"уменьшить [member alpha_scissor_threshold]."
+
+msgid ""
+"The strength of the anisotropy effect. This is multiplied by [member "
+"anisotropy_flowmap]'s alpha channel if a texture is defined there and the "
+"texture contains an alpha channel."
+msgstr ""
+"Сила эффекта анизотропии. Она умножается на альфа-канал [member "
+"anisotropy_flowmap], если там определена текстура и текстура содержит альфа-"
+"канал."
+
+msgid ""
+"If [code]true[/code], anisotropy is enabled. Anisotropy changes the shape of "
+"the specular blob and aligns it to tangent space. This is useful for brushed "
+"aluminum and hair reflections.\n"
+"[b]Note:[/b] Mesh tangents are needed for anisotropy to work. If the mesh "
+"does not contain tangents, the anisotropy effect will appear broken.\n"
+"[b]Note:[/b] Material anisotropy should not to be confused with anisotropic "
+"texture filtering, which can be enabled by setting [member texture_filter] to "
+"[constant TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC]."
+msgstr ""
+"Если [code]true[/code], анизотропия включена. Анизотропия изменяет форму "
+"зеркального пятна и выравнивает его по касательному пространству. Это полезно "
+"для матового алюминия и отражений волос.\n"
+"[b]Примечание:[/b] Для работы анизотропии необходимы касательные сетки. Если "
+"сетка не содержит касательных, эффект анизотропии будет выглядеть сломанным.\n"
+"[b]Примечание:[/b] Анизотропию материала не следует путать с анизотропной "
+"фильтрацией текстур, которую можно включить, установив [member "
+"texture_filter] на [constant TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC]."
+
+msgid ""
+"Texture that offsets the tangent map for anisotropy calculations and "
+"optionally controls the anisotropy effect (if an alpha channel is present). "
+"The flowmap texture is expected to be a derivative map, with the red channel "
+"representing distortion on the X axis and green channel representing "
+"distortion on the Y axis. Values below 0.5 will result in negative "
+"distortion, whereas values above 0.5 will result in positive distortion.\n"
+"If present, the texture's alpha channel will be used to multiply the strength "
+"of the [member anisotropy] effect. Fully opaque pixels will keep the "
+"anisotropy effect's original strength while fully transparent pixels will "
+"disable the anisotropy effect entirely. The flowmap texture's blue channel is "
+"ignored."
+msgstr ""
+"Текстура, которая смещает карту касательных для расчетов анизотропии и "
+"опционально управляет эффектом анизотропии (если присутствует альфа-канал). "
+"Ожидается, что текстура flowmap будет производной картой, где красный канал "
+"представляет искажение по оси X, а зеленый канал представляет искажение по "
+"оси Y. Значения ниже 0,5 приведут к отрицательному искажению, тогда как "
+"значения выше 0,5 приведут к положительному искажению.\n"
+"Если присутствует, альфа-канал текстуры будет использоваться для умножения "
+"силы эффекта [member anisotropy]. Полностью непрозрачные пиксели сохранят "
+"исходную силу эффекта анизотропии, в то время как полностью прозрачные "
+"пиксели полностью отключат эффект анизотропии. Синий канал текстуры flowmap "
+"игнорируется."
+
+msgid ""
+"If [code]true[/code], ambient occlusion is enabled. Ambient occlusion darkens "
+"areas based on the [member ao_texture]."
+msgstr ""
+"Если [code]true[/code], включено фоновое затенение. Фоновое затенение "
+"затемняет области на основе [member ao_texture]."
+
+msgid ""
+"Amount that ambient occlusion affects lighting from lights. If [code]0[/"
+"code], ambient occlusion only affects ambient light. If [code]1[/code], "
+"ambient occlusion affects lights just as much as it affects ambient light. "
+"This can be used to impact the strength of the ambient occlusion effect, but "
+"typically looks unrealistic."
+msgstr ""
+"Степень влияния окклюзии окружающего света на освещение от источников света. "
+"Если [code]0[/code], окклюзия окружающего света влияет только на окружающее "
+"освещение. Если [code]1[/code], окклюзия окружающего света влияет на "
+"освещение так же, как и на окружающее освещение. Это можно использовать для "
+"воздействия на силу эффекта окклюзии окружающего света, но обычно выглядит "
+"нереалистично."
+
+msgid ""
+"If [code]true[/code], use [code]UV2[/code] coordinates to look up from the "
+"[member ao_texture]."
+msgstr ""
+"Если [code]true[/code], используйте координаты [code]UV2[/code] для поиска от "
+"[элемента ao_texture]."
+
+msgid ""
+"Texture that defines the amount of ambient occlusion for a given point on the "
+"object."
+msgstr ""
+"Текстура, определяющая степень окклюзии окружающего света для заданной точки "
+"объекта."
+
+msgid ""
+"Specifies the channel of the [member ao_texture] in which the ambient "
+"occlusion information is stored. This is useful when you store the "
+"information for multiple effects in a single texture. For example if you "
+"stored metallic in the red channel, roughness in the blue, and ambient "
+"occlusion in the green you could reduce the number of textures you use."
+msgstr ""
+"Указывает канал [member ao_texture], в котором хранится информация об "
+"окружающем преграждении. Это полезно, когда вы храните информацию для "
+"нескольких эффектов в одной текстуре. Например, если вы сохранили металлик в "
+"красном канале, шероховатость в синем и окружающее преграждение в зеленом, вы "
+"можете сократить количество используемых текстур."
+
+msgid ""
+"The color used by the backlight effect. Represents the light passing through "
+"an object."
+msgstr ""
+"Цвет, используемый эффектом подсветки. Представляет свет, проходящий через "
+"объект."
+
+msgid ""
+"If [code]true[/code], the backlight effect is enabled. See also [member "
+"subsurf_scatter_transmittance_enabled]."
+msgstr ""
+"Если [code]true[/code], эффект подсветки включен. См. также [member "
+"subsurf_scatter_transmittance_enabled]."
+
+msgid ""
+"Texture used to control the backlight effect per-pixel. Added to [member "
+"backlight]."
+msgstr ""
+"Текстура, используемая для управления эффектом подсветки по пикселям. "
+"Добавлено в [member backlight]."
+
+msgid ""
+"Controls how the object faces the camera. See [enum BillboardMode].\n"
+"[b]Note:[/b] Billboard mode is not suitable for VR because the left-right "
+"vector of the camera is not horizontal when the screen is attached to your "
+"head instead of on the table. See [url=https://github.com/godotengine/godot/"
+"issues/41567]GitHub issue #41567[/url] for details."
+msgstr ""
+"Управляет тем, как объект смотрит на камеру. См. [enum BillboardMode].\n"
+"[b]Примечание:[/b] Режим Billboard не подходит для VR, поскольку вектор "
+"камеры влево-вправо не горизонтален, когда экран прикреплен к голове, а не к "
+"столу. Подробности см. в [url=https://github.com/godotengine/godot/"
+"issues/41567]GitHub issue #41567[/url]."
+
+msgid ""
+"The material's blend mode.\n"
+"[b]Note:[/b] Values other than [code]Mix[/code] force the object into the "
+"transparent pipeline. See [enum BlendMode]."
+msgstr ""
+"Режим смешивания материала.\n"
+"[b]Примечание:[/b] Значения, отличные от [code]Mix[/code], принудительно "
+"помещают объект в прозрачный конвейер. См. [enum BlendMode]."
+
+msgid ""
+"Sets the strength of the clearcoat effect. Setting to [code]0[/code] looks "
+"the same as disabling the clearcoat effect."
+msgstr ""
+"Устанавливает силу эффекта прозрачного покрытия. Установка на [code]0[/code] "
+"выглядит так же, как отключение эффекта прозрачного покрытия."
+
+msgid ""
+"If [code]true[/code], clearcoat rendering is enabled. Adds a secondary "
+"transparent pass to the lighting calculation resulting in an added specular "
+"blob. This makes materials appear as if they have a clear layer on them that "
+"can be either glossy or rough.\n"
+"[b]Note:[/b] Clearcoat rendering is not visible if the material's [member "
+"shading_mode] is [constant SHADING_MODE_UNSHADED]."
+msgstr ""
+"Если [code]true[/code], включен рендеринг прозрачного покрытия. Добавляет "
+"вторичный прозрачный проход к расчету освещения, что приводит к добавлению "
+"зеркального пятна. Это заставляет материалы выглядеть так, как будто на них "
+"есть прозрачный слой, который может быть как глянцевым, так и шероховатым.\n"
+"[b]Примечание:[/b] Рендеринг прозрачного покрытия не виден, если [member "
+"shading_mode] материала равен [constant SHADING_MODE_UNSHADED]."
+
+msgid ""
+"Sets the roughness of the clearcoat pass. A higher value results in a rougher "
+"clearcoat while a lower value results in a smoother clearcoat."
+msgstr ""
+"Устанавливает шероховатость прохода лака. Более высокое значение приводит к "
+"более грубому лаку, а более низкое значение — к более гладкому лаку."
+
+msgid ""
+"Texture that defines the strength of the clearcoat effect and the glossiness "
+"of the clearcoat. Strength is specified in the red channel while glossiness "
+"is specified in the green channel."
+msgstr ""
+"Текстура, которая определяет силу эффекта прозрачного лака и его "
+"глянцевитость. Прочность указывается в красном канале, а глянцевитость — в "
+"зеленом канале."
+
+msgid ""
+"Determines which side of the triangle to cull depending on whether the "
+"triangle faces towards or away from the camera. See [enum CullMode]."
+msgstr ""
+"Определяет, какую сторону треугольника отбрасывать, в зависимости от того, "
+"обращен ли треугольник к камере или от нее. См. [enum CullMode]."
+
+msgid ""
+"Determines when depth rendering takes place. See [enum DepthDrawMode]. See "
+"also [member transparency]."
+msgstr ""
+"Определяет, когда происходит рендеринг глубины. См. [enum DepthDrawMode]. См. "
+"также [member transparent]."
+
+msgid ""
+"Texture that specifies the color of the detail overlay. [member "
+"detail_albedo]'s alpha channel is used as a mask, even when the material is "
+"opaque. To use a dedicated texture as a mask, see [member detail_mask].\n"
+"[b]Note:[/b] [member detail_albedo] is [i]not[/i] modulated by [member "
+"albedo_color]."
+msgstr ""
+"Текстура, которая определяет цвет наложения деталей. Альфа-канал [member "
+"detail_albedo] используется как маска, даже если материал непрозрачен. Чтобы "
+"использовать выделенную текстуру в качестве маски, см. [member detail_mask].\n"
+"[b]Примечание:[/b] [member detail_albedo] [i]не[/i] модулируется [member "
+"albedo_color]."
+
+msgid ""
+"Specifies how the [member detail_albedo] should blend with the current "
+"[code]ALBEDO[/code]. See [enum BlendMode] for options."
+msgstr ""
+"Указывает, как [member detail_albedo] должен смешиваться с текущим "
+"[code]ALBEDO[/code]. См. [enum BlendMode] для опций."
+
+msgid ""
+"If [code]true[/code], enables the detail overlay. Detail is a second texture "
+"that gets mixed over the surface of the object based on [member detail_mask] "
+"and [member detail_albedo]'s alpha channel. This can be used to add variation "
+"to objects, or to blend between two different albedo/normal textures."
+msgstr ""
+"Если [code]true[/code], включается наложение деталей. Деталь — это вторая "
+"текстура, которая смешивается с поверхностью объекта на основе [member "
+"detail_mask] и альфа-канала [member detail_albedo]. Это можно использовать "
+"для добавления вариаций к объектам или для смешивания двух разных текстур "
+"альбедо/нормалей."
+
+msgid ""
+"Texture used to specify how the detail textures get blended with the base "
+"textures. [member detail_mask] can be used together with [member "
+"detail_albedo]'s alpha channel (if any)."
+msgstr ""
+"Текстура используется для указания того, как текстуры деталей смешиваются с "
+"базовыми текстурами. [member detail_mask] можно использовать вместе с альфа-"
+"каналом [member detail_albedo] (если есть)."
+
+msgid ""
+"Texture that specifies the per-pixel normal of the detail overlay. The "
+"[member detail_normal] texture only uses the red and green channels; the blue "
+"and alpha channels are ignored. The normal read from [member detail_normal] "
+"is oriented around the surface normal provided by the [Mesh].\n"
+"[b]Note:[/b] Godot expects the normal map to use X+, Y+, and Z+ coordinates. "
+"See [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates]this page[/url] for a "
+"comparison of normal map coordinates expected by popular engines."
+msgstr ""
+"Текстура, которая определяет попиксельную нормаль наложения деталей. Текстура "
+"[member detail_normal] использует только красный и зеленый каналы; синий и "
+"альфа-каналы игнорируются. Нормаль, считанная из [member detail_normal], "
+"ориентирована вокруг нормали поверхности, предоставленной [Mesh].\n"
+"[b]Примечание:[/b] Godot ожидает, что карта нормалей будет использовать "
+"координаты X+, Y+ и Z+. См. [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates] эту страницу [/url] "
+"для сравнения координат карты нормалей, ожидаемых популярными движками."
+
+msgid ""
+"Specifies whether to use [code]UV[/code] or [code]UV2[/code] for the detail "
+"layer. See [enum DetailUV] for options."
+msgstr ""
+"Указывает, использовать ли [code]UV[/code] или [code]UV2[/code] для слоя "
+"детализации. См. [enum DetailUV] для опций."
+
+msgid "The algorithm used for diffuse light scattering. See [enum DiffuseMode]."
+msgstr ""
+"Алгоритм, используемый для диффузного рассеяния света. См. [enum DiffuseMode]."
+
+msgid "If [code]true[/code], the object receives no ambient light."
+msgstr "Если [code]true[/code], объект не получает окружающего света."
+
+msgid ""
+"If [code]true[/code], the object will not be affected by fog (neither "
+"volumetric nor depth fog). This is useful for unshaded or transparent "
+"materials (e.g. particles), which without this setting will be affected even "
+"if fully transparent."
+msgstr ""
+"Если [code]true[/code], объект не будет затронут туманом (ни объемным, ни "
+"глубинным). Это полезно для незатененных или прозрачных материалов (например, "
+"частиц), которые без этой настройки будут затронуты даже если полностью "
+"прозрачны."
+
+msgid ""
+"If [code]true[/code], the object receives no shadow that would otherwise be "
+"cast onto it."
+msgstr ""
+"Если [code]true[/code], объект не получает тени, которая в противном случае "
+"отбрасывалась бы на него."
+
+msgid ""
+"Distance at which the object appears fully opaque.\n"
+"[b]Note:[/b] If [member distance_fade_max_distance] is less than [member "
+"distance_fade_min_distance], the behavior will be reversed. The object will "
+"start to fade away at [member distance_fade_max_distance] and will fully "
+"disappear once it reaches [member distance_fade_min_distance]."
+msgstr ""
+"Расстояние, на котором объект кажется полностью непрозрачным.\n"
+"[b]Примечание:[/b] Если [member distance_fade_max_distance] меньше, чем "
+"[member distance_fade_min_distance], поведение будет обратным. Объект начнет "
+"исчезать на [member distance_fade_max_distance] и полностью исчезнет, как "
+"только достигнет [member distance_fade_min_distance]."
+
+msgid ""
+"Distance at which the object starts to become visible. If the object is less "
+"than this distance away, it will be invisible.\n"
+"[b]Note:[/b] If [member distance_fade_min_distance] is greater than [member "
+"distance_fade_max_distance], the behavior will be reversed. The object will "
+"start to fade away at [member distance_fade_max_distance] and will fully "
+"disappear once it reaches [member distance_fade_min_distance]."
+msgstr ""
+"Расстояние, на котором объект начинает становиться видимым. Если объект "
+"находится меньше этого расстояния, он будет невидимым.\n"
+"[b]Примечание:[/b] Если [member distance_fade_min_distance] больше, чем "
+"[member distance_fade_max_distance], поведение будет обратным. Объект начнет "
+"исчезать на [member distance_fade_max_distance] и полностью исчезнет, как "
+"только достигнет [member distance_fade_min_distance]."
+
+msgid ""
+"Specifies which type of fade to use. Can be any of the [enum "
+"DistanceFadeMode]s."
+msgstr ""
+"Указывает, какой тип затухания использовать. Может быть любым из [enum "
+"DistanceFadeMode]."
+
+msgid "The emitted light's color. See [member emission_enabled]."
+msgstr "Цвет излучаемого света. См. [member emission_enabled]."
+
+msgid ""
+"If [code]true[/code], the body emits light. Emitting light makes the object "
+"appear brighter. The object can also cast light on other objects if a "
+"[VoxelGI], SDFGI, or [LightmapGI] is used and this object is used in baked "
+"lighting."
+msgstr ""
+"Если [code]true[/code], тело излучает свет. Излучение света делает объект "
+"ярче. Объект также может излучать свет на другие объекты, если используется "
+"[VoxelGI], SDFGI или [LightmapGI] и этот объект используется в запеченном "
+"освещении."
+
+msgid "Multiplier for emitted light. See [member emission_enabled]."
+msgstr "Множитель для испускаемого света. См. [member emission_enabled]."
+
+msgid ""
+"Luminance of emitted light, measured in nits (candela per square meter). Only "
+"available when [member ProjectSettings.rendering/lights_and_shadows/"
+"use_physical_light_units] is enabled. The default is roughly equivalent to an "
+"indoor lightbulb."
+msgstr ""
+"Яркость излучаемого света, измеряемая в нитах (nits) (кандела на квадратный "
+"метр). Доступно только при включенном [member ProjectSettings.rendering/"
+"lights_and_shadows/use_physical_light_units]. Значение по умолчанию примерно "
+"эквивалентно лампочке в помещении."
+
+msgid "Use [code]UV2[/code] to read from the [member emission_texture]."
+msgstr "Используйте [code]UV2[/code] для чтения из [member emission_texture]."
+
+msgid ""
+"Sets how [member emission] interacts with [member emission_texture]. Can "
+"either add or multiply. See [enum EmissionOperator] for options."
+msgstr ""
+"Устанавливает, как [member emission] взаимодействует с [member "
+"emission_texture]. Может либо складывать, либо умножать. См. [enum "
+"EmissionOperator] для опций."
+
+msgid "Texture that specifies how much surface emits light at a given point."
+msgstr ""
+"Текстура, определяющая, какая часть поверхности излучает свет в данной точке."
+
+msgid ""
+"If [code]true[/code], the object is rendered at the same size regardless of "
+"distance."
+msgstr ""
+"Если [code]true[/code], объект отображается одинакового размера независимо от "
+"расстояния."
+
+msgid ""
+"If [code]true[/code], enables the vertex grow setting. This can be used to "
+"create mesh-based outlines using a second material pass and its [member "
+"cull_mode] set to [constant CULL_FRONT]. See also [member grow_amount].\n"
+"[b]Note:[/b] Vertex growth cannot create new vertices, which means that "
+"visible gaps may occur in sharp corners. This can be alleviated by designing "
+"the mesh to use smooth normals exclusively using [url=http://wiki.polycount."
+"com/wiki/Face_weighted_normals]face weighted normals[/url] in the 3D "
+"authoring software. In this case, grow will be able to join every outline "
+"together, just like in the original mesh."
+msgstr ""
+"Если [code]true[/code], включает настройку роста вершин. Это можно "
+"использовать для создания контуров на основе сетки с использованием второго "
+"прохода материала и его [member cull_mode], установленного на [constant "
+"CULL_FRONT]. См. также [member grow_amount].\n"
+"[b]Примечание:[/b] Рост вершин не может создавать новые вершины, что "
+"означает, что в острых углах могут возникать видимые зазоры. Это можно "
+"устранить, спроектировав сетку для использования исключительно сглаженных "
+"нормалей с использованием [url=http://wiki.polycount.com/wiki/"
+"Face_weighted_normals]нормалей взвешенных граней[/url] в программном "
+"обеспечении для 3D-дизайна. В этом случае рост сможет объединить все контуры "
+"вместе, как в исходной сетке."
+
+msgid ""
+"Grows object vertices in the direction of their normals. Only effective if "
+"[member grow] is [code]true[/code]."
+msgstr ""
+"Растет вершины объекта в направлении их нормалей. Эффективно только если "
+"[member grow] равен [code]true[/code]."
+
+msgid ""
+"If [code]true[/code], uses parallax occlusion mapping to represent depth in "
+"the material instead of simple offset mapping (see [member "
+"heightmap_enabled]). This results in a more convincing depth effect, but is "
+"much more expensive on the GPU. Only enable this on materials where it makes "
+"a significant visual difference."
+msgstr ""
+"Если [code]true[/code], то для представления глубины в материале используется "
+"отображение параллакса окклюзии вместо простого отображения смещения (см. "
+"[member heightmap_enabled]). Это приводит к более убедительному эффекту "
+"глубины, но намного более затратно для графического процессора. Включайте это "
+"только для материалов, где это создает существенную визуальную разницу."
+
+msgid ""
+"If [code]true[/code], height mapping is enabled (also called \"parallax "
+"mapping\" or \"depth mapping\"). See also [member normal_enabled]. Height "
+"mapping is a demanding feature on the GPU, so it should only be used on "
+"materials where it makes a significant visual difference.\n"
+"[b]Note:[/b] Height mapping is not supported if triplanar mapping is used on "
+"the same material. The value of [member heightmap_enabled] will be ignored if "
+"[member uv1_triplanar] is enabled."
+msgstr ""
+"Если [code]true[/code], отображение высоты включено (также называется "
+"«отображением параллакса» или «отображением глубины»). См. также [member "
+"normal_enabled]. Отображение высоты — это требовательная функция графического "
+"процессора, поэтому ее следует использовать только для материалов, где она "
+"создает существенную визуальную разницу.\n"
+"[b]Примечание:[/b] Отображение высоты не поддерживается, если для того же "
+"материала используется трипланарное отображение. Значение [member "
+"heightmap_enabled] будет игнорироваться, если включен [member uv1_triplanar]."
+
+msgid ""
+"If [code]true[/code], flips the mesh's binormal vectors when interpreting the "
+"height map. If the heightmap effect looks strange when the camera moves (even "
+"with a reasonable [member heightmap_scale]), try setting this to [code]true[/"
+"code]."
+msgstr ""
+"Если [code]true[/code], переворачивает бинормальные векторы сетки при "
+"интерпретации карты высот. Если эффект карты высот выглядит странно при "
+"движении камеры (даже с разумным [member heightmap_scale]), попробуйте "
+"установить это в [code]true[/code]."
+
+msgid ""
+"If [code]true[/code], flips the mesh's tangent vectors when interpreting the "
+"height map. If the heightmap effect looks strange when the camera moves (even "
+"with a reasonable [member heightmap_scale]), try setting this to [code]true[/"
+"code]."
+msgstr ""
+"Если [code]true[/code], переворачивает касательные векторы сетки при "
+"интерпретации карты высот. Если эффект карты высот выглядит странно при "
+"движении камеры (даже с разумным [member heightmap_scale]), попробуйте "
+"установить это в [code]true[/code]."
+
+msgid ""
+"If [code]true[/code], interprets the height map texture as a depth map, with "
+"brighter values appearing to be \"lower\" in altitude compared to darker "
+"values.\n"
+"This can be enabled for compatibility with some materials authored for Godot "
+"3.x. This is not necessary if the Invert import option was used to invert the "
+"depth map in Godot 3.x, in which case [member heightmap_flip_texture] should "
+"remain [code]false[/code]."
+msgstr ""
+"Если [code]true[/code], то текстура карты высот интерпретируется как карта "
+"глубины, при этом более яркие значения кажутся «ниже» по высоте по сравнению "
+"с более темными значениями. \n"
+"Это можно включить для совместимости с некоторыми материалами, созданными для "
+"Godot 3.x. Это не обязательно, если опция импорта Invert использовалась для "
+"инвертирования карты глубины в Godot 3.x, в этом случае [member "
+"heightmap_flip_texture] должен оставаться [code]false[/code]."
+
+msgid ""
+"The number of layers to use for parallax occlusion mapping when the camera is "
+"up close to the material. Higher values result in a more convincing depth "
+"effect, especially in materials that have steep height changes. Higher values "
+"have a significant cost on the GPU, so it should only be increased on "
+"materials where it makes a significant visual difference.\n"
+"[b]Note:[/b] Only effective if [member heightmap_deep_parallax] is "
+"[code]true[/code]."
+msgstr ""
+"Количество слоев, используемых для отображения параллаксной окклюзии, когда "
+"камера находится близко к материалу. Более высокие значения приводят к более "
+"убедительному эффекту глубины, особенно в материалах с резкими перепадами "
+"высоты. Более высокие значения оказывают значительное влияние на графический "
+"процессор, поэтому их следует увеличивать только для материалов, где они "
+"создают значительную визуальную разницу.\n"
+"[b]Примечание:[/b] Эффективно только если [member heightmap_deep_parallax] "
+"равно [code]true[/code]."
+
+msgid ""
+"The number of layers to use for parallax occlusion mapping when the camera is "
+"far away from the material. Higher values result in a more convincing depth "
+"effect, especially in materials that have steep height changes. Higher values "
+"have a significant cost on the GPU, so it should only be increased on "
+"materials where it makes a significant visual difference.\n"
+"[b]Note:[/b] Only effective if [member heightmap_deep_parallax] is "
+"[code]true[/code]."
+msgstr ""
+"Количество слоев, используемых для отображения параллаксной окклюзии, когда "
+"камера находится далеко от материала. Более высокие значения приводят к более "
+"убедительному эффекту глубины, особенно в материалах с резкими перепадами "
+"высоты. Более высокие значения оказывают значительное влияние на графический "
+"процессор, поэтому их следует увеличивать только для материалов, где они "
+"создают значительную визуальную разницу.\n"
+"[b]Примечание:[/b] Эффективно только если [member heightmap_deep_parallax] "
+"равно [code]true[/code]."
+
+msgid ""
+"The heightmap scale to use for the parallax effect (see [member "
+"heightmap_enabled]). The default value is tuned so that the highest point "
+"(value = 255) appears to be 5 cm higher than the lowest point (value = 0). "
+"Higher values result in a deeper appearance, but may result in artifacts "
+"appearing when looking at the material from oblique angles, especially when "
+"the camera moves. Negative values can be used to invert the parallax effect, "
+"but this is different from inverting the texture using [member "
+"heightmap_flip_texture] as the material will also appear to be \"closer\" to "
+"the camera. In most cases, [member heightmap_scale] should be kept to a "
+"positive value.\n"
+"[b]Note:[/b] If the height map effect looks strange regardless of this value, "
+"try adjusting [member heightmap_flip_binormal] and [member "
+"heightmap_flip_tangent]. See also [member heightmap_texture] for "
+"recommendations on authoring heightmap textures, as the way the heightmap "
+"texture is authored affects how [member heightmap_scale] behaves."
+msgstr ""
+"Масштаб карты высот для использования в эффекте параллакса (см. [member "
+"heightmap_enabled]). Значение по умолчанию настроено таким образом, что самая "
+"высокая точка (значение = 255) кажется на 5 см выше самой низкой точки "
+"(значение = 0). Более высокие значения дают более глубокий вид, но могут "
+"привести к появлению артефактов при взгляде на материал под косыми углами, "
+"особенно при движении камеры. Отрицательные значения можно использовать для "
+"инвертирования эффекта параллакса, но это отличается от инвертирования "
+"текстуры с помощью [member heightmap_flip_texture], поскольку материал также "
+"будет казаться «ближе» к камере. В большинстве случаев [member "
+"heightmap_scale] следует сохранять положительным значением.\n"
+"[b]Примечание:[/b] Если эффект карты высот выглядит странно независимо от "
+"этого значения, попробуйте настроить [member heightmap_flip_binormal] и "
+"[member heightmap_flip_tangent]. См. также [member heightmap_texture] для "
+"рекомендаций по созданию текстур карты высот, поскольку способ создания "
+"текстуры карты высот влияет на поведение [member heightmap_scale]."
+
+msgid ""
+"The texture to use as a height map. See also [member heightmap_enabled].\n"
+"For best results, the texture should be normalized (with [member "
+"heightmap_scale] reduced to compensate). In [url=https://gimp.org]GIMP[/url], "
+"this can be done using [b]Colors > Auto > Equalize[/b]. If the texture only "
+"uses a small part of its available range, the parallax effect may look "
+"strange, especially when the camera moves.\n"
+"[b]Note:[/b] To reduce memory usage and improve loading times, you may be "
+"able to use a lower-resolution heightmap texture as most heightmaps are only "
+"comprised of low-frequency data."
+msgstr ""
+"Текстура, используемая в качестве карты высот. См. также [member "
+"heightmap_enabled].\n"
+"Для достижения наилучших результатов текстуру следует нормализовать (с "
+"уменьшением [member heightmap_scale] для компенсации). В [url=https://gimp."
+"org]GIMP[/url] это можно сделать с помощью [b]Цвета > Авто > Выровнять[/b]. "
+"Если текстура использует только небольшую часть своего доступного диапазона, "
+"эффект параллакса может выглядеть странно, особенно при движении камеры.\n"
+"[b]Примечание:[/b] Чтобы уменьшить использование памяти и улучшить время "
+"загрузки, вы можете использовать текстуру карты высот с более низким "
+"разрешением, поскольку большинство карт высот состоят только из "
+"низкочастотных данных."
+
+msgid ""
+"A high value makes the material appear more like a metal. Non-metals use "
+"their albedo as the diffuse color and add diffuse to the specular reflection. "
+"With non-metals, the reflection appears on top of the albedo color. Metals "
+"use their albedo as a multiplier to the specular reflection and set the "
+"diffuse color to black resulting in a tinted reflection. Materials work "
+"better when fully metal or fully non-metal, values between [code]0[/code] and "
+"[code]1[/code] should only be used for blending between metal and non-metal "
+"sections. To alter the amount of reflection use [member roughness]."
+msgstr ""
+"Высокое значение делает материал более похожим на металл. Неметаллы "
+"используют свое альбедо в качестве диффузного цвета и добавляют диффузное к "
+"зеркальному отражению. У неметаллов отражение появляется поверх цвета "
+"альбедо. Металлы используют свое альбедо в качестве множителя для зеркального "
+"отражения и устанавливают диффузный цвет на черный, что приводит к "
+"тонированному отражению. Материалы работают лучше, когда полностью "
+"металлические или полностью неметаллические, значения между [code]0[/code] и "
+"[code]1[/code] следует использовать только для смешивания между "
+"металлическими и неметаллическими секциями. Чтобы изменить величину "
+"отражения, используйте [member roughness]."
+
+msgid ""
+"Adjusts the strength of specular reflections. Specular reflections are "
+"composed of scene reflections and the specular lobe which is the bright spot "
+"that is reflected from light sources. When set to [code]0.0[/code], no "
+"specular reflections will be visible. This differs from the [constant "
+"SPECULAR_DISABLED] [enum SpecularMode] as [constant SPECULAR_DISABLED] only "
+"applies to the specular lobe from the light source.\n"
+"[b]Note:[/b] Unlike [member metallic], this is not energy-conserving, so it "
+"should be left at [code]0.5[/code] in most cases. See also [member roughness]."
+msgstr ""
+"Регулирует силу зеркальных отражений. Зеркальные отражения состоят из "
+"отражений сцены и зеркального лепестка, который является ярким пятном, "
+"отраженным от источников света. Если установлено значение [code]0.0[/code], "
+"зеркальные отражения не будут видны. Это отличается от [constant "
+"SPECULAR_DISABLED] [enum SpecularMode], поскольку [constant "
+"SPECULAR_DISABLED] применяется только к зеркальному лепестку от источника "
+"света.\n"
+"[b]Примечание:[/b] В отличие от [member metallic], это не энергосберегающее, "
+"поэтому в большинстве случаев его следует оставить на [code]0.5[/code]. См. "
+"также [member roughness]."
+
+msgid ""
+"Texture used to specify metallic for an object. This is multiplied by [member "
+"metallic]."
+msgstr ""
+"Текстура, используемая для указания металличности объекта. Она умножается на "
+"[member metallic]."
+
+msgid ""
+"Specifies the channel of the [member metallic_texture] in which the metallic "
+"information is stored. This is useful when you store the information for "
+"multiple effects in a single texture. For example if you stored metallic in "
+"the red channel, roughness in the blue, and ambient occlusion in the green "
+"you could reduce the number of textures you use."
+msgstr ""
+"Указывает канал [member metallic_texture], в котором хранится информация о "
+"металле. Это полезно, когда вы храните информацию для нескольких эффектов в "
+"одной текстуре. Например, если вы сохранили металл в красном канале, "
+"шероховатость в синем и окклюзию окружения в зеленом, вы можете сократить "
+"количество используемых текстур."
+
+msgid ""
+"The width of the range around the shape between the minimum and maximum "
+"representable signed distance."
+msgstr ""
+"Ширина диапазона вокруг фигуры между минимальным и максимальным представимым "
+"знакомым расстоянием."
+
+msgid ""
+"If [code]true[/code], depth testing is disabled and the object will be drawn "
+"in render order."
+msgstr ""
+"Если [code]true[/code], проверка глубины отключена, и объект будет отрисован "
+"в порядке рендеринга."
+
+msgid ""
+"If [code]true[/code], normal mapping is enabled. This has a slight "
+"performance cost, especially on mobile GPUs."
+msgstr ""
+"Если [code]true[/code], нормальное отображение включено. Это немного снижает "
+"производительность, особенно на мобильных GPU."
+
+msgid "The strength of the normal map's effect."
+msgstr "Сила эффекта карты нормалей."
+
+msgid ""
+"Texture used to specify the normal at a given pixel. The [member "
+"normal_texture] only uses the red and green channels; the blue and alpha "
+"channels are ignored. The normal read from [member normal_texture] is "
+"oriented around the surface normal provided by the [Mesh].\n"
+"[b]Note:[/b] The mesh must have both normals and tangents defined in its "
+"vertex data. Otherwise, the normal map won't render correctly and will only "
+"appear to darken the whole surface. If creating geometry with [SurfaceTool], "
+"you can use [method SurfaceTool.generate_normals] and [method SurfaceTool."
+"generate_tangents] to automatically generate normals and tangents "
+"respectively.\n"
+"[b]Note:[/b] Godot expects the normal map to use X+, Y+, and Z+ coordinates. "
+"See [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates]this page[/url] for a "
+"comparison of normal map coordinates expected by popular engines.\n"
+"[b]Note:[/b] If [member detail_enabled] is [code]true[/code], the [member "
+"detail_albedo] texture is drawn [i]below[/i] the [member normal_texture]. To "
+"display a normal map [i]above[/i] the [member detail_albedo] texture, use "
+"[member detail_normal] instead."
+msgstr ""
+"Текстура используется для указания нормали в заданном пикселе. [Member "
+"normal_texture] использует только красный и зеленый каналы; синий и альфа-"
+"каналы игнорируются. Нормаль, считанная из [member normal_texture], "
+"ориентирована вокруг нормали поверхности, предоставленной [Mesh].\n"
+"[b]Примечание:[/b] Сетка должна иметь как нормали, так и касательные, "
+"определенные в ее данных вершин. В противном случае карта нормалей не будет "
+"отображаться правильно и будет только затемнять всю поверхность. При создании "
+"геометрии с помощью [SurfaceTool] можно использовать [method SurfaceTool."
+"generate_normals] и [method SurfaceTool.generate_tangents] для автоматической "
+"генерации нормалей и касательных соответственно.\n"
+"[b]Примечание:[/b] Godot ожидает, что карта нормалей будет использовать "
+"координаты X+, Y+ и Z+. См. [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates]эту страницу[/url] "
+"для сравнения координат карты нормалей, ожидаемых популярными движками.\n"
+"[b]Примечание:[/b] Если [member detail_enabled] равно [code]true[/code], "
+"текстура [member detail_albedo] отрисовывается [i]ниже[/i] [member "
+"normal_texture]. Чтобы отобразить карту нормалей [i]выше[/i] текстуры [member "
+"detail_albedo], используйте вместо нее [member detail_normal]."
+
+msgid ""
+"The Occlusion/Roughness/Metallic texture to use. This is a more efficient "
+"replacement of [member ao_texture], [member roughness_texture] and [member "
+"metallic_texture] in [ORMMaterial3D]. Ambient occlusion is stored in the red "
+"channel. Roughness map is stored in the green channel. Metallic map is stored "
+"in the blue channel. The alpha channel is ignored."
+msgstr ""
+"Текстура Occlusion/Roughness/Metallic для использования. Это более "
+"эффективная замена [member ao_texture], [member roughness_texture] и [member "
+"metallic_texture] в [ORMMaterial3D]. Окружающая окклюзия хранится в красном "
+"канале. Карта шероховатости хранится в зеленом канале. Карта Metallic "
+"хранится в синем канале. Альфа-канал игнорируется."
+
+msgid ""
+"The number of horizontal frames in the particle sprite sheet. Only enabled "
+"when using [constant BILLBOARD_PARTICLES]. See [member billboard_mode]."
+msgstr ""
+"Количество горизонтальных кадров в листе спрайтов частиц. Включено только при "
+"использовании [constant BILLBOARD_PARTICLES]. См. [member billboard_mode]."
+
+msgid ""
+"If [code]true[/code], particle animations are looped. Only enabled when using "
+"[constant BILLBOARD_PARTICLES]. See [member billboard_mode]."
+msgstr ""
+"Если [code]true[/code], анимация частиц зацикливается. Включено только при "
+"использовании [constant BILLBOARD_PARTICLES]. См. [member billboard_mode]."
+
+msgid ""
+"The number of vertical frames in the particle sprite sheet. Only enabled when "
+"using [constant BILLBOARD_PARTICLES]. See [member billboard_mode]."
+msgstr ""
+"Количество вертикальных кадров в листе спрайтов частиц. Включено только при "
+"использовании [constant BILLBOARD_PARTICLES]. См. [member billboard_mode]."
+
+msgid "The point size in pixels. See [member use_point_size]."
+msgstr "Размер точки в пикселях. См. [member use_point_size]."
+
+msgid ""
+"Distance over which the fade effect takes place. The larger the distance the "
+"longer it takes for an object to fade."
+msgstr ""
+"Расстояние, на котором происходит эффект затухания. Чем больше расстояние, "
+"тем больше времени требуется для затухания объекта."
+
+msgid ""
+"If [code]true[/code], the proximity fade effect is enabled. The proximity "
+"fade effect fades out each pixel based on its distance to another object."
+msgstr ""
+"Если [code]true[/code], эффект затухания близости включен. Эффект затухания "
+"близости затухает каждый пиксель в зависимости от его расстояния до другого "
+"объекта."
+
+msgid ""
+"If [code]true[/code], the refraction effect is enabled. Distorts transparency "
+"based on light from behind the object.\n"
+"[b]Note:[/b] Refraction is implemented using the screen texture. Only opaque "
+"materials will appear in the refraction, since transparent materials do not "
+"appear in the screen texture."
+msgstr ""
+"Если [code]true[/code], эффект преломления включен. Искажает прозрачность на "
+"основе света из-за объекта.\n"
+"[b]Примечание:[/b] Преломление реализовано с использованием текстуры экрана. "
+"В преломлении будут отображаться только непрозрачные материалы, поскольку "
+"прозрачные материалы не отображаются в текстуре экрана."
+
+msgid "The strength of the refraction effect."
+msgstr "Сила эффекта преломления."
+
+msgid ""
+"Texture that controls the strength of the refraction per-pixel. Multiplied by "
+"[member refraction_scale]."
+msgstr ""
+"Текстура, которая контролирует силу преломления на пиксель. Умножается на "
+"[member Refraction_scale]."
+
+msgid ""
+"Specifies the channel of the [member refraction_texture] in which the "
+"refraction information is stored. This is useful when you store the "
+"information for multiple effects in a single texture. For example if you "
+"stored refraction in the red channel, roughness in the blue, and ambient "
+"occlusion in the green you could reduce the number of textures you use."
+msgstr ""
+"Указывает канал [member Refraction_texture], в котором хранится информация о "
+"преломлении. Это полезно, когда вы храните информацию для нескольких эффектов "
+"в одной текстуре. Например, если вы сохранили преломление в красном канале, "
+"шероховатость в синем и окклюзию окружающего пространства в зеленом, вы "
+"можете сократить количество используемых текстур."
+
+msgid "Sets the strength of the rim lighting effect."
+msgstr "Устанавливает интенсивность эффекта подсветки кромки."
+
+msgid ""
+"If [code]true[/code], rim effect is enabled. Rim lighting increases the "
+"brightness at glancing angles on an object.\n"
+"[b]Note:[/b] Rim lighting is not visible if the material's [member "
+"shading_mode] is [constant SHADING_MODE_UNSHADED]."
+msgstr ""
+"Если [code]true[/code], эффект обода включен. Освещение обода увеличивает "
+"яркость при скользящих углах на объекте.\n"
+"[b]Примечание:[/b] Освещение обода не видно, если [member shading_mode] "
+"материала — [constant SHADING_MODE_UNSHADED]."
+
+msgid ""
+"Texture used to set the strength of the rim lighting effect per-pixel. "
+"Multiplied by [member rim]."
+msgstr ""
+"Текстура, используемая для установки силы эффекта освещения обода на пиксель. "
+"Умножается на [member rim]."
+
+msgid ""
+"The amount of to blend light and albedo color when rendering rim effect. If "
+"[code]0[/code] the light color is used, while [code]1[/code] means albedo "
+"color is used. An intermediate value generally works best."
+msgstr ""
+"Количество для смешивания света и цвета альбедо при визуализации эффекта "
+"обода. Если [code]0[/code], то используется цвет света, а [code]1[/code] "
+"означает, что используется цвет альбедо. Промежуточное значение обычно "
+"работает лучше всего."
+
+msgid ""
+"Surface reflection. A value of [code]0[/code] represents a perfect mirror "
+"while a value of [code]1[/code] completely blurs the reflection. See also "
+"[member metallic]."
+msgstr ""
+"Поверхностное отражение. Значение [code]0[/code] представляет идеальное "
+"зеркало, а значение [code]1[/code] полностью размывает отражение. См. также "
+"[member metallic]."
+
+msgid ""
+"Texture used to control the roughness per-pixel. Multiplied by [member "
+"roughness]."
+msgstr ""
+"Текстура, используемая для управления шероховатостью на пиксель. Умножается "
+"на [шероховатость элемента]."
+
+msgid ""
+"Specifies the channel of the [member roughness_texture] in which the "
+"roughness information is stored. This is useful when you store the "
+"information for multiple effects in a single texture. For example if you "
+"stored metallic in the red channel, roughness in the blue, and ambient "
+"occlusion in the green you could reduce the number of textures you use."
+msgstr ""
+"Указывает канал [member roughness_texture], в котором хранится информация о "
+"шероховатости. Это полезно, когда вы храните информацию для нескольких "
+"эффектов в одной текстуре. Например, если вы сохранили металлик в красном "
+"канале, шероховатость в синем и окружающее затенение в зеленом, вы можете "
+"сократить количество используемых текстур."
+
+msgid ""
+"Sets whether the shading takes place, per-pixel, per-vertex or unshaded. Per-"
+"vertex lighting is faster, making it the best choice for mobile applications, "
+"however it looks considerably worse than per-pixel. Unshaded rendering is the "
+"fastest, but disables all interactions with lights."
+msgstr ""
+"Устанавливает, будет ли затенение попиксельным, повершинным или незатененным. "
+"Освещение повершинным быстрее, что делает его лучшим выбором для мобильных "
+"приложений, однако выглядит значительно хуже, чем попиксельное. Рендеринг без "
+"затенения самый быстрый, но отключает все взаимодействия с источниками света."
+
+msgid ""
+"If [code]true[/code], enables the \"shadow to opacity\" render mode where "
+"lighting modifies the alpha so shadowed areas are opaque and non-shadowed "
+"areas are transparent. Useful for overlaying shadows onto a camera feed in AR."
+msgstr ""
+"Если [code]true[/code], включает режим рендеринга \"от тени к "
+"непрозрачности\", где освещение изменяет альфу, так что затененные области "
+"становятся непрозрачными, а незатененные области — прозрачными. Полезно для "
+"наложения теней на поток камеры в AR."
+
+msgid ""
+"If [code]true[/code], subsurface scattering is enabled. Emulates light that "
+"penetrates an object's surface, is scattered, and then emerges. Subsurface "
+"scattering quality is controlled by [member ProjectSettings.rendering/"
+"environment/subsurface_scattering/subsurface_scattering_quality]."
+msgstr ""
+"Если [code]true[/code], включено подповерхностное рассеивание. Эмулирует "
+"свет, который проникает сквозь поверхность объекта, рассеивается и затем "
+"выходит наружу. Качество подповерхностного рассеивания контролируется [member "
+"ProjectSettings.rendering/environment/subsurface_scattering/"
+"subsurface_scattering_quality]."
+
+msgid ""
+"If [code]true[/code], subsurface scattering will use a special mode optimized "
+"for the color and density of human skin, such as boosting the intensity of "
+"the red channel in subsurface scattering."
+msgstr ""
+"Если [code]true[/code], подповерхностное рассеяние будет использовать "
+"специальный режим, оптимизированный для цвета и плотности человеческой кожи, "
+"например, усиление интенсивности красного канала при подповерхностном "
+"рассеянии."
+
+msgid ""
+"The strength of the subsurface scattering effect. The depth of the effect is "
+"also controlled by [member ProjectSettings.rendering/environment/"
+"subsurface_scattering/subsurface_scattering_scale], which is set globally."
+msgstr ""
+"Сила эффекта подповерхностного рассеивания. Глубина эффекта также "
+"контролируется [member ProjectSettings.rendering/environment/"
+"subsurface_scattering/subsurface_scattering_scale], который задается "
+"глобально."
+
+msgid ""
+"Texture used to control the subsurface scattering strength. Stored in the red "
+"texture channel. Multiplied by [member subsurf_scatter_strength]."
+msgstr ""
+"Текстура, используемая для управления силой подповерхностного рассеивания. "
+"Хранится в красном канале текстуры. Умножается на [member "
+"subsurf_scatter_strength]."
+
+msgid "The intensity of the subsurface scattering transmittance effect."
+msgstr "Интенсивность эффекта пропускания подповерхностного рассеяния."
+
+msgid ""
+"The color to multiply the subsurface scattering transmittance effect with. "
+"Ignored if [member subsurf_scatter_skin_mode] is [code]true[/code]."
+msgstr ""
+"Цвет, на который умножается эффект пропускания подповерхностного рассеивания. "
+"Игнорируется, если [member subsurf_scatter_skin_mode] равен [code]true[/code]."
+
+msgid "The depth of the subsurface scattering transmittance effect."
+msgstr "Глубина эффекта пропускания подповерхностного рассеяния."
+
+msgid ""
+"If [code]true[/code], enables subsurface scattering transmittance. Only "
+"effective if [member subsurf_scatter_enabled] is [code]true[/code]. See also "
+"[member backlight_enabled]."
+msgstr ""
+"Если [code]true[/code], включает пропускание подповерхностного рассеяния. "
+"Действует только если [member subsurf_scatter_enabled] равно [code]true[/"
+"code]. См. также [member backlight_enabled]."
+
+msgid ""
+"The texture to use for multiplying the intensity of the subsurface scattering "
+"transmittance intensity. See also [member subsurf_scatter_texture]. Ignored "
+"if [member subsurf_scatter_skin_mode] is [code]true[/code]."
+msgstr ""
+"Текстура, используемая для умножения интенсивности пропускания "
+"подповерхностного рассеивания. См. также [member subsurf_scatter_texture]. "
+"Игнорируется, если [member subsurf_scatter_skin_mode] равен [code]true[/code]."
+
+msgid ""
+"Filter flags for the texture. See [enum TextureFilter] for options.\n"
+"[b]Note:[/b] [member heightmap_texture] is always sampled with linear "
+"filtering, even if nearest-neighbor filtering is selected here. This is to "
+"ensure the heightmap effect looks as intended. If you need sharper height "
+"transitions between pixels, resize the heightmap texture in an image editor "
+"with nearest-neighbor filtering."
+msgstr ""
+"Флаги фильтра для текстуры. См. [enum TextureFilter] для опций.\n"
+"[b]Примечание:[/b] [member heightmap_texture] всегда выбирается с линейной "
+"фильтрацией, даже если здесь выбрана фильтрация по ближайшему соседу. Это "
+"необходимо для того, чтобы эффект карты высот выглядел так, как задумано. "
+"Если вам нужны более резкие переходы высоты между пикселями, измените размер "
+"текстуры карты высот в редакторе изображений с фильтрацией по ближайшему "
+"соседу."
+
+msgid "Repeat flags for the texture. See [enum TextureFilter] for options."
+msgstr "Повторите флаги для текстуры. Смотрите [enum TextureFilter] для опций."
+
+msgid ""
+"The material's transparency mode. Some transparency modes will disable shadow "
+"casting. Any transparency mode other than [constant TRANSPARENCY_DISABLED] "
+"has a greater performance impact compared to opaque rendering. See also "
+"[member blend_mode]."
+msgstr ""
+"Режим прозрачности материала. Некоторые режимы прозрачности отключают "
+"отбрасывание теней. Любой режим прозрачности, кроме [constant "
+"TRANSPARENCY_DISABLED], оказывает большее влияние на производительность по "
+"сравнению с непрозрачным рендерингом. См. также [member blend_mode]."
+
+msgid ""
+"If [code]true[/code], enables parts of the shader required for "
+"[GPUParticles3D] trails to function. This also requires using a mesh with "
+"appropriate skinning, such as [RibbonTrailMesh] or [TubeTrailMesh]. Enabling "
+"this feature outside of materials used in [GPUParticles3D] meshes will break "
+"material rendering."
+msgstr ""
+"Если [code]true[/code], то включается часть шейдера, необходимая для работы "
+"следов [GPUParticles3D]. Это также требует использования сетки с "
+"соответствующим скиннингом (skinning), например [RibbonTrailMesh] или "
+"[TubeTrailMesh]. Включение этой функции вне материалов, используемых в сетках "
+"[GPUParticles3D], нарушит рендеринг материалов."
+
+msgid ""
+"If [code]true[/code], render point size can be changed.\n"
+"[b]Note:[/b] This is only effective for objects whose geometry is point-based "
+"rather than triangle-based. See also [member point_size]."
+msgstr ""
+"Если [code]true[/code], размер точки рендеринга можно изменить.\n"
+"[b]Примечание:[/b] Это эффективно только для объектов, геометрия которых "
+"основана на точках, а не на треугольниках. См. также [member point_size]."
+
+msgid ""
+"How much to offset the [code]UV[/code] coordinates. This amount will be added "
+"to [code]UV[/code] in the vertex function. This can be used to offset a "
+"texture. The Z component is used when [member uv1_triplanar] is enabled, but "
+"it is not used anywhere else."
+msgstr ""
+"Насколько смещать координаты [code]UV[/code]. Эта величина будет добавлена к "
+"[code]UV[/code] в функции вершины. Это можно использовать для смещения "
+"текстуры. Компонент Z используется, когда включен [member uv1_triplanar], но "
+"больше нигде не используется."
+
+msgid ""
+"How much to scale the [code]UV[/code] coordinates. This is multiplied by "
+"[code]UV[/code] in the vertex function. The Z component is used when [member "
+"uv1_triplanar] is enabled, but it is not used anywhere else."
+msgstr ""
+"Насколько масштабировать координаты [code]UV[/code]. Это умножается на "
+"[code]UV[/code] в функции вершины. Компонент Z используется, когда включен "
+"[member uv1_triplanar], но больше нигде не используется."
+
+msgid ""
+"If [code]true[/code], instead of using [code]UV[/code] textures will use a "
+"triplanar texture lookup to determine how to apply textures. Triplanar uses "
+"the orientation of the object's surface to blend between texture coordinates. "
+"It reads from the source texture 3 times, once for each axis and then blends "
+"between the results based on how closely the pixel aligns with each axis. "
+"This is often used for natural features to get a realistic blend of "
+"materials. Because triplanar texturing requires many more texture reads per-"
+"pixel it is much slower than normal UV texturing. Additionally, because it is "
+"blending the texture between the three axes, it is unsuitable when you are "
+"trying to achieve crisp texturing."
+msgstr ""
+"Если [code]true[/code], вместо использования текстур [code]UV[/code] будет "
+"использоваться поиск трипланарной текстуры для определения способа применения "
+"текстур. Трипланарность использует ориентацию поверхности объекта для "
+"смешивания между координатами текстуры. Он считывает исходную текстуру 3 "
+"раза, по одному разу для каждой оси, а затем смешивает результаты на основе "
+"того, насколько близко пиксель совпадает с каждой осью. Это часто "
+"используется для естественных особенностей, чтобы получить реалистичное "
+"смешивание материалов. Поскольку трипланарное текстурирование требует гораздо "
+"большего количества считываний текстуры на пиксель, оно намного медленнее "
+"обычного UV-текстурирования. Кроме того, поскольку оно смешивает текстуру "
+"между тремя осями, оно не подходит, когда вы пытаетесь добиться четкого "
+"текстурирования."
+
+msgid ""
+"A lower number blends the texture more softly while a higher number blends "
+"the texture more sharply.\n"
+"[b]Note:[/b] [member uv1_triplanar_sharpness] is clamped between [code]0.0[/"
+"code] and [code]150.0[/code] (inclusive) as values outside that range can "
+"look broken depending on the mesh."
+msgstr ""
+"Меньшее число смешивает текстуру более мягко, а большее число смешивает "
+"текстуру более резко.\n"
+"[b]Примечание:[/b] [member uv1_triplanar_sharpness] ограничено между "
+"[code]0.0[/code] и [code]150.0[/code] (включительно), так как значения за "
+"пределами этого диапазона могут выглядеть сломанными в зависимости от сетки."
+
+msgid ""
+"If [code]true[/code], triplanar mapping for [code]UV[/code] is calculated in "
+"world space rather than object local space. See also [member uv1_triplanar]."
+msgstr ""
+"Если [code]true[/code], трипланарное (triplanar) отображение для [code]UV[/"
+"code] вычисляется в мировом пространстве, а не в локальном пространстве "
+"объекта. См. также [member uv1_triplanar]."
+
+msgid ""
+"How much to offset the [code]UV2[/code] coordinates. This amount will be "
+"added to [code]UV2[/code] in the vertex function. This can be used to offset "
+"a texture. The Z component is used when [member uv2_triplanar] is enabled, "
+"but it is not used anywhere else."
+msgstr ""
+"Насколько смещать координаты [code]UV2[/code]. Эта величина будет добавлена к "
+"[code]UV2[/code] в функции вершины. Это можно использовать для смещения "
+"текстуры. Компонент Z используется, когда включен [member uv2_triplanar], но "
+"больше нигде не используется."
+
+msgid ""
+"How much to scale the [code]UV2[/code] coordinates. This is multiplied by "
+"[code]UV2[/code] in the vertex function. The Z component is used when [member "
+"uv2_triplanar] is enabled, but it is not used anywhere else."
+msgstr ""
+"Насколько масштабировать координаты [code]UV2[/code]. Это умножается на "
+"[code]UV2[/code] в функции вершины. Компонент Z используется, когда включен "
+"[member uv2_triplanar], но больше нигде не используется."
+
+msgid ""
+"If [code]true[/code], instead of using [code]UV2[/code] textures will use a "
+"triplanar texture lookup to determine how to apply textures. Triplanar uses "
+"the orientation of the object's surface to blend between texture coordinates. "
+"It reads from the source texture 3 times, once for each axis and then blends "
+"between the results based on how closely the pixel aligns with each axis. "
+"This is often used for natural features to get a realistic blend of "
+"materials. Because triplanar texturing requires many more texture reads per-"
+"pixel it is much slower than normal UV texturing. Additionally, because it is "
+"blending the texture between the three axes, it is unsuitable when you are "
+"trying to achieve crisp texturing."
+msgstr ""
+"Если [code]true[/code], вместо использования текстур [code]UV2[/code] будет "
+"использоваться поиск трипланарной текстуры для определения способа применения "
+"текстур. Трипланарность использует ориентацию поверхности объекта для "
+"смешивания между координатами текстуры. Он считывает исходную текстуру 3 "
+"раза, по одному разу для каждой оси, а затем смешивает результаты на основе "
+"того, насколько близко пиксель совпадает с каждой осью. Это часто "
+"используется для естественных особенностей, чтобы получить реалистичное "
+"смешивание материалов. Поскольку трипланарное текстурирование требует гораздо "
+"большего количества считываний текстуры на пиксель, оно намного медленнее "
+"обычного UV-текстурирования. Кроме того, поскольку оно смешивает текстуру "
+"между тремя осями, оно не подходит, когда вы пытаетесь добиться четкого "
+"текстурирования."
+
+msgid ""
+"A lower number blends the texture more softly while a higher number blends "
+"the texture more sharply.\n"
+"[b]Note:[/b] [member uv2_triplanar_sharpness] is clamped between [code]0.0[/"
+"code] and [code]150.0[/code] (inclusive) as values outside that range can "
+"look broken depending on the mesh."
+msgstr ""
+"Меньшее число смешивает текстуру более мягко, а большее число смешивает "
+"текстуру более резко.\n"
+"[b]Примечание:[/b] [member uv2_triplanar_sharpness] ограничено между "
+"[code]0.0[/code] и [code]150.0[/code] (включительно), так как значения за "
+"пределами этого диапазона могут выглядеть сломанными в зависимости от сетки."
+
+msgid ""
+"If [code]true[/code], triplanar mapping for [code]UV2[/code] is calculated in "
+"world space rather than object local space. See also [member uv2_triplanar]."
+msgstr ""
+"Если [code]true[/code], трипланарное отображение для [code]UV2[/code] "
+"вычисляется в мировом пространстве, а не в локальном пространстве объекта. "
+"См. также [member uv2_triplanar]."
+
+msgid ""
+"If [code]true[/code], vertex colors are considered to be stored in sRGB color "
+"space and are converted to linear color space during rendering. If "
+"[code]false[/code], vertex colors are considered to be stored in linear color "
+"space and are rendered as-is. See also [member albedo_texture_force_srgb].\n"
+"[b]Note:[/b] Only effective when using the Forward+ and Mobile rendering "
+"methods, not Compatibility."
+msgstr ""
+"Если [code]true[/code], цвета вершин считаются сохраненными в цветовом "
+"пространстве sRGB и преобразуются в линейное цветовое пространство во время "
+"рендеринга. Если [code]false[/code], цвета вершин считаются сохраненными в "
+"линейном цветовом пространстве и преобразуются как есть. См. также [member "
+"albedo_texture_force_srgb].\n"
+"[b]Примечание:[/b] Действует только при использовании методов рендеринга "
+"Forward+ и Mobile, а не Compatibility."
+
+msgid "If [code]true[/code], the vertex color is used as albedo color."
+msgstr "Если [code]true[/code], цвет вершины используется как цвет альбедо."
+
+msgid "Texture specifying per-pixel color."
+msgstr "Текстура, определяющая цвет каждого пикселя."
+
+msgid "Texture specifying per-pixel metallic value."
+msgstr "Текстура, определяющая попиксельное значение металличности."
+
+msgid "Texture specifying per-pixel roughness value."
+msgstr "Текстура, задающая значение шероховатости на пиксель."
+
+msgid "Texture specifying per-pixel emission color."
+msgstr "Текстура, задающая цвет излучения попиксельно."
+
+msgid "Texture specifying per-pixel normal vector."
+msgstr "Текстура, задающая попиксельный вектор нормали."
+
+msgid "Texture specifying per-pixel rim value."
+msgstr "Текстура, задающая попиксельное значение обода."
+
+msgid "Texture specifying per-pixel clearcoat value."
+msgstr "Текстура, определяющая значение прозрачного слоя на пиксель."
+
+msgid ""
+"Texture specifying per-pixel flowmap direction for use with [member "
+"anisotropy]."
+msgstr ""
+"Текстура, задающая направление карты потоков по пикселям для использования с "
+"[анизотропией элемента]."
+
+msgid "Texture specifying per-pixel ambient occlusion value."
+msgstr ""
+"Текстура, задающая значение окклюзии окружающего света для каждого пикселя."
+
+msgid "Texture specifying per-pixel height."
+msgstr "Текстура, определяющая высоту каждого пикселя."
+
+msgid "Texture specifying per-pixel subsurface scattering."
+msgstr "Текстура, задающая попиксельное подповерхностное рассеивание."
+
+msgid "Texture specifying per-pixel transmittance for subsurface scattering."
+msgstr ""
+"Текстура, определяющая попиксельную пропускаемость для подповерхностного "
+"рассеяния."
+
+msgid "Texture specifying per-pixel backlight color."
+msgstr "Текстура, определяющая цвет подсветки каждого пикселя."
+
+msgid "Texture specifying per-pixel refraction strength."
+msgstr "Текстура, определяющая силу преломления для каждого пикселя."
+
+msgid "Texture specifying per-pixel detail mask blending value."
+msgstr "Текстура, задающая значение смешивания маски детализации попиксельно."
+
+msgid "Texture specifying per-pixel detail color."
+msgstr "Текстура, определяющая цвет пиксельной детализации."
+
+msgid "Texture holding ambient occlusion, roughness, and metallic."
+msgstr ""
+"Текстура, содержащая окклюзию окружающего пространства, шероховатость и "
+"металличность."
+
+msgid "Represents the size of the [enum TextureParam] enum."
+msgstr "Представляет размер перечисления [enum TextureParam]."
+
+msgid ""
+"The texture filter reads from the nearest pixel only. This makes the texture "
+"look pixelated from up close, and grainy from a distance (due to mipmaps not "
+"being sampled)."
+msgstr ""
+"Фильтр текстуры считывает только ближайший пиксель. Это делает текстуру "
+"пикселизированной вблизи и зернистой на расстоянии (из-за того, что mip-карты "
+"не сэмплируются)."
+
+msgid ""
+"The texture filter blends between the nearest 4 pixels. This makes the "
+"texture look smooth from up close, and grainy from a distance (due to mipmaps "
+"not being sampled)."
+msgstr ""
+"Фильтр текстуры смешивает ближайшие 4 пикселя. Это делает текстуру гладкой "
+"вблизи и зернистой на расстоянии (из-за того, что mip-карты не сэмплируются)."
+
+msgid ""
+"The texture filter reads from the nearest pixel and blends between the "
+"nearest 2 mipmaps (or uses the nearest mipmap if [member ProjectSettings."
+"rendering/textures/default_filters/use_nearest_mipmap_filter] is [code]true[/"
+"code]). This makes the texture look pixelated from up close, and smooth from "
+"a distance."
+msgstr ""
+"Фильтр текстуры считывает данные с ближайшего пикселя и смешивает их между "
+"двумя ближайшими mip-картами (или использует ближайшую mip-карту, если "
+"[member ProjectSettings.rendering/textures/default_filters/"
+"use_nearest_mipmap_filter] имеет значение [code]true[/code]). Это делает "
+"текстуру пикселизированной вблизи и гладкой на расстоянии."
+
+msgid ""
+"The texture filter blends between the nearest 4 pixels and between the "
+"nearest 2 mipmaps (or uses the nearest mipmap if [member ProjectSettings."
+"rendering/textures/default_filters/use_nearest_mipmap_filter] is [code]true[/"
+"code]). This makes the texture look smooth from up close, and smooth from a "
+"distance."
+msgstr ""
+"Фильтр текстуры смешивает ближайшие 4 пикселя и ближайшие 2 mip-карты (или "
+"использует ближайшую mip-карту, если [member ProjectSettings.rendering/"
+"textures/default_filters/use_nearest_mipmap_filter] имеет значение "
+"[code]true[/code]). Это делает текстуру гладкой вблизи и гладкой на "
+"расстоянии."
+
+msgid ""
+"The texture filter reads from the nearest pixel and blends between 2 mipmaps "
+"(or uses the nearest mipmap if [member ProjectSettings.rendering/textures/"
+"default_filters/use_nearest_mipmap_filter] is [code]true[/code]) based on the "
+"angle between the surface and the camera view. This makes the texture look "
+"pixelated from up close, and smooth from a distance. Anisotropic filtering "
+"improves texture quality on surfaces that are almost in line with the camera, "
+"but is slightly slower. The anisotropic filtering level can be changed by "
+"adjusting [member ProjectSettings.rendering/textures/default_filters/"
+"anisotropic_filtering_level]."
+msgstr ""
+"Фильтр текстуры считывает данные с ближайшего пикселя и смешивает два mip-"
+"текстурных отображения (или использует ближайшее mip-текстурное отображение, "
+"если [member ProjectSettings.rendering/textures/default_filters/"
+"use_nearest_mipmap_filter] имеет значение [code]true[/code]) на основе угла "
+"между поверхностью и видом камеры. Это делает текстуру пикселизированной "
+"вблизи и гладкой на расстоянии. Анизотропная фильтрация улучшает качество "
+"текстуры на поверхностях, которые почти совпадают с камерой, но работает "
+"немного медленнее. Уровень анизотропной фильтрации можно изменить, "
+"отрегулировав [member ProjectSettings.rendering/textures/default_filters/"
+"anisotropic_filtering_level]."
+
+msgid ""
+"The texture filter blends between the nearest 4 pixels and blends between 2 "
+"mipmaps (or uses the nearest mipmap if [member ProjectSettings.rendering/"
+"textures/default_filters/use_nearest_mipmap_filter] is [code]true[/code]) "
+"based on the angle between the surface and the camera view. This makes the "
+"texture look smooth from up close, and smooth from a distance. Anisotropic "
+"filtering improves texture quality on surfaces that are almost in line with "
+"the camera, but is slightly slower. The anisotropic filtering level can be "
+"changed by adjusting [member ProjectSettings.rendering/textures/"
+"default_filters/anisotropic_filtering_level]."
+msgstr ""
+"Фильтр текстуры смешивает ближайшие 4 пикселя и смешивает 2 mip-карты (или "
+"использует ближайшую mip-карту, если [member ProjectSettings.rendering/"
+"textures/default_filters/use_nearest_mipmap_filter] имеет значение "
+"[code]true[/code]) на основе угла между поверхностью и видом камеры. Это "
+"делает текстуру гладкой вблизи и гладкой на расстоянии. Анизотропная "
+"фильтрация улучшает качество текстуры на поверхностях, которые почти "
+"совпадают с камерой, но немного медленнее. Уровень анизотропной фильтрации "
+"можно изменить, настроив [member ProjectSettings.rendering/textures/"
+"default_filters/anisotropic_filtering_level]."
+
+msgid "Use [code]UV[/code] with the detail texture."
+msgstr "Используйте [code]UV[/code] с детализированной текстурой."
+
+msgid "Use [code]UV2[/code] with the detail texture."
+msgstr "Используйте [code]UV2[/code] с детальной текстурой."
+
+msgid "The material will not use transparency. This is the fastest to render."
+msgstr ""
+"Материал не будет использовать прозрачность. Это самый быстрый рендеринг."
+
+msgid ""
+"The material will use the texture's alpha values for transparency. This is "
+"the slowest to render, and disables shadow casting."
+msgstr ""
+"Материал будет использовать альфа-значения текстуры для прозрачности. Это "
+"самый медленный рендеринг и отключает отбрасывание теней."
+
+msgid ""
+"The material will cut off all values below a threshold, the rest will remain "
+"opaque. The opaque portions will be rendered in the depth prepass. This is "
+"faster to render than alpha blending, but slower than opaque rendering. This "
+"also supports casting shadows."
+msgstr ""
+"Материал отсечет все значения ниже порогового значения, остальные останутся "
+"непрозрачными. Непрозрачные части будут визуализированы в предварительном "
+"проходе глубины. Это быстрее для визуализации, чем альфа-смешивание, но "
+"медленнее, чем непрозрачный рендеринг. Это также поддерживает отбрасывание "
+"теней."
+
+msgid ""
+"The material will cut off all values below a spatially-deterministic "
+"threshold, the rest will remain opaque. This is faster to render than alpha "
+"blending, but slower than opaque rendering. This also supports casting "
+"shadows. Alpha hashing is suited for hair rendering."
+msgstr ""
+"Материал отсекает все значения ниже пространственно-детерминированного "
+"порога, остальные остаются непрозрачными. Это быстрее для рендеринга, чем "
+"альфа-смешивание, но медленнее, чем непрозрачный рендеринг. Это также "
+"поддерживает отбрасывание теней. Альфа-хеширование подходит для рендеринга "
+"волос."
+
+msgid ""
+"The material will use the texture's alpha value for transparency, but will "
+"discard fragments with an alpha of less than 0.99 during the depth prepass "
+"and fragments with an alpha less than 0.1 during the shadow pass. This also "
+"supports casting shadows."
+msgstr ""
+"Материал будет использовать альфа-значение текстуры для прозрачности, но "
+"отбросит фрагменты с альфа-значением менее 0,99 во время предварительного "
+"прохода глубины и фрагменты с альфа-значением менее 0,1 во время прохода "
+"тени. Это также поддерживает отбрасывание теней."
+
+msgid ""
+"The object will not receive shadows. This is the fastest to render, but it "
+"disables all interactions with lights."
+msgstr ""
+"Объект не получит тени. Это самый быстрый рендеринг, но он отключает все "
+"взаимодействия с источниками света."
+
+msgid ""
+"The object will be shaded per pixel. Useful for realistic shading effects."
+msgstr ""
+"Объект будет затенен попиксельно. Полезно для реалистичных эффектов затенения."
+
+msgid ""
+"The object will be shaded per vertex. Useful when you want cheaper shaders "
+"and do not care about visual quality."
+msgstr ""
+"Объект будет затенен по вершинам. Полезно, когда вам нужны более дешевые "
+"шейдеры и вас не волнует визуальное качество."
+
+msgid "Constant for setting [member emission_enabled]."
+msgstr "Константа для настройки [member emission_enabled]."
+
+msgid "Constant for setting [member normal_enabled]."
+msgstr "Константа для настройки [member normal_enabled]."
+
+msgid "Constant for setting [member rim_enabled]."
+msgstr "Константа для настройки [member rim_enabled]."
+
+msgid "Constant for setting [member clearcoat_enabled]."
+msgstr "Константа для настройки [member clearcoat_enabled]."
+
+msgid "Constant for setting [member anisotropy_enabled]."
+msgstr "Константа для настройки [member anisotropy_enabled]."
+
+msgid "Constant for setting [member ao_enabled]."
+msgstr "Константа для настройки [member ao_enabled]."
+
+msgid "Constant for setting [member heightmap_enabled]."
+msgstr "Константа для настройки [member heightmap_enabled]."
+
+msgid "Constant for setting [member subsurf_scatter_enabled]."
+msgstr "Константа для настройки [member subsurf_scatter_enabled]."
+
+msgid "Constant for setting [member subsurf_scatter_transmittance_enabled]."
+msgstr "Константа для настройки [member subsurf_scatter_transmittance_enabled]."
+
+msgid "Constant for setting [member backlight_enabled]."
+msgstr "Константа для настройки [member backlight_enabled]."
+
+msgid "Constant for setting [member refraction_enabled]."
+msgstr "Константа для настройки [member refraction_enabled]."
+
+msgid "Constant for setting [member detail_enabled]."
+msgstr "Константа для настройки [member detail_enabled]."
+
+msgid "Represents the size of the [enum Feature] enum."
+msgstr "Представляет размер перечисления [enum Feature]."
+
+msgid ""
+"Default blend mode. The color of the object is blended over the background "
+"based on the object's alpha value."
+msgstr ""
+"Режим смешивания по умолчанию. Цвет объекта смешивается с фоном на основе "
+"альфа-значения объекта."
+
+msgid "The color of the object is added to the background."
+msgstr "Цвет объекта добавляется к фону."
+
+msgid "The color of the object is subtracted from the background."
+msgstr "Цвет объекта вычитается из фона."
+
+msgid "The color of the object is multiplied by the background."
+msgstr "Цвет объекта умножается на фон."
+
+msgid ""
+"The color of the object is added to the background and the alpha channel is "
+"used to mask out the background. This is effectively a hybrid of the blend "
+"mix and add modes, useful for effects like fire where you want the flame to "
+"add but the smoke to mix. By default, this works with unshaded materials "
+"using premultiplied textures. For shaded materials, use the "
+"[code]PREMUL_ALPHA_FACTOR[/code] built-in so that lighting can be modulated "
+"as well."
+msgstr ""
+"Цвет объекта добавляется к фону, а альфа-канал используется для маскировки "
+"фона. Это фактически гибрид режимов смешивания и добавления, полезный для "
+"таких эффектов, как огонь, где вы хотите, чтобы пламя добавлялось, а дым "
+"смешивался. По умолчанию это работает с незатененными материалами, "
+"использующими предварительно умноженные текстуры. Для затененных материалов "
+"используйте встроенный [code]PREMUL_ALPHA_FACTOR[/code], чтобы можно было "
+"также модулировать освещение."
+
+msgid "Disables Alpha AntiAliasing for the material."
+msgstr "Отключает альфа-сглаживание для материала."
+
+msgid ""
+"Enables AlphaToCoverage. Alpha values in the material are passed to the "
+"AntiAliasing sample mask."
+msgstr ""
+"Включает AlphaToCoverage. Значения альфа в материале передаются в маску "
+"выборки AntiAliasing."
+
+msgid ""
+"Enables AlphaToCoverage and forces all non-zero alpha values to [code]1[/"
+"code]. Alpha values in the material are passed to the AntiAliasing sample "
+"mask."
+msgstr ""
+"Включает AlphaToCoverage и принудительно устанавливает все ненулевые значения "
+"альфа на [code]1[/code]. Значения альфа в материале передаются в маску "
+"выборки AntiAliasing."
+
+msgid ""
+"Default depth draw mode. Depth is drawn only for opaque objects during the "
+"opaque prepass (if any) and during the opaque pass."
+msgstr ""
+"Режим рисования глубины по умолчанию. Глубина рисуется только для "
+"непрозрачных объектов во время непрозрачного предварительного прохода (если "
+"таковой имеется) и во время непрозрачного прохода."
+
+msgid ""
+"Objects will write to depth during the opaque and the transparent passes. "
+"Transparent objects that are close to the camera may obscure other "
+"transparent objects behind them.\n"
+"[b]Note:[/b] This does not influence whether transparent objects are included "
+"in the depth prepass or not. For that, see [enum Transparency]."
+msgstr ""
+"Объекты будут записывать в глубину во время непрозрачных и прозрачных "
+"проходов. Прозрачные объекты, которые находятся близко к камере, могут "
+"затенять другие прозрачные объекты позади них.\n"
+"[b]Примечание:[/b] Это не влияет на то, включены ли прозрачные объекты в "
+"предварительный проход глубины или нет. Для этого см. [enum Transparency]."
+
+msgid ""
+"Objects will not write their depth to the depth buffer, even during the depth "
+"prepass (if enabled)."
+msgstr ""
+"Объекты не будут записывать свою глубину в буфер глубины даже во время "
+"предварительного прохода глубины (если он включен)."
+
+msgid ""
+"Default cull mode. The back of the object is culled when not visible. Back "
+"face triangles will be culled when facing the camera. This results in only "
+"the front side of triangles being drawn. For closed-surface meshes, this "
+"means that only the exterior of the mesh will be visible."
+msgstr ""
+"Режим отбраковки по умолчанию. Задняя часть объекта отбраковывается, когда "
+"она не видна. Треугольники задней стороны будут отбраковываться, когда они "
+"обращены к камере. Это приводит к тому, что отрисовывается только передняя "
+"сторона треугольников. Для сеток с замкнутой поверхностью это означает, что "
+"будет видна только внешняя часть сетки."
+
+msgid ""
+"Front face triangles will be culled when facing the camera. This results in "
+"only the back side of triangles being drawn. For closed-surface meshes, this "
+"means that the interior of the mesh will be drawn instead of the exterior."
+msgstr ""
+"Треугольники передней грани будут отбракованы при взгляде на камеру. Это "
+"приведет к тому, что будет отрисована только задняя сторона треугольников. "
+"Для сеток с замкнутой поверхностью это означает, что внутренняя часть сетки "
+"будет отрисована вместо внешней."
+
+msgid ""
+"No face culling is performed; both the front face and back face will be "
+"visible."
+msgstr ""
+"Отбраковка граней не производится; будут видны как передняя, так и задняя "
+"грань."
+
+msgid ""
+"Disables the depth test, so this object is drawn on top of all others drawn "
+"before it. This puts the object in the transparent draw pass where it is "
+"sorted based on distance to camera. Objects drawn after it in the draw order "
+"may cover it. This also disables writing to depth."
+msgstr ""
+"Отключает тест глубины, поэтому этот объект рисуется поверх всех остальных, "
+"нарисованных до него. Это помещает объект в прозрачный проход рисования, где "
+"он сортируется на основе расстояния до камеры. Объекты, нарисованные после "
+"него в порядке рисования, могут его перекрывать. Это также отключает запись в "
+"глубину."
+
+msgid "Set [code]ALBEDO[/code] to the per-vertex color specified in the mesh."
+msgstr "Установите [code]ALBEDO[/code] на цвет вершины, указанный в сетке."
+
+msgid ""
+"Vertex colors are considered to be stored in sRGB color space and are "
+"converted to linear color space during rendering. See also [member "
+"vertex_color_is_srgb].\n"
+"[b]Note:[/b] Only effective when using the Forward+ and Mobile rendering "
+"methods."
+msgstr ""
+"Цвета вершин считаются сохраненными в цветовом пространстве sRGB и "
+"преобразуются в линейное цветовое пространство во время рендеринга. См. также "
+"[member vertex_color_is_srgb].\n"
+"[b]Примечание:[/b] Эффективно только при использовании методов рендеринга "
+"Forward+ и Mobile."
+
+msgid ""
+"Uses point size to alter the size of primitive points. Also changes the "
+"albedo texture lookup to use [code]POINT_COORD[/code] instead of [code]UV[/"
+"code]."
+msgstr ""
+"Использует размер точки для изменения размера примитивных точек. Также "
+"изменяет поиск текстуры альбедо для использования [code]POINT_COORD[/code] "
+"вместо [code]UV[/code]."
+
+msgid ""
+"Object is scaled by depth so that it always appears the same size on screen."
+msgstr ""
+"Объект масштабируется по глубине, чтобы он всегда отображался на экране "
+"одного и того же размера."
+
+msgid ""
+"Shader will keep the scale set for the mesh. Otherwise the scale is lost when "
+"billboarding. Only applies when [member billboard_mode] is [constant "
+"BILLBOARD_ENABLED]."
+msgstr ""
+"Шейдер сохранит масштаб, установленный для сетки. В противном случае масштаб "
+"теряется при билбординге. Применяется только когда [member billboard_mode] "
+"равен [constant BILLBOARD_ENABLED]."
+
+msgid ""
+"Use triplanar texture lookup for all texture lookups that would normally use "
+"[code]UV[/code]."
+msgstr ""
+"Используйте поиск трехплоскостной текстуры для всех поисков текстуры, которые "
+"обычно используют [code]UV[/code]."
+
+msgid ""
+"Use triplanar texture lookup for all texture lookups that would normally use "
+"[code]UV2[/code]."
+msgstr ""
+"Используйте поиск трехмерной текстуры для всех поисков текстуры, которые "
+"обычно используют [code]UV2[/code]."
+
+msgid ""
+"Use [code]UV2[/code] coordinates to look up from the [member ao_texture]."
+msgstr ""
+"Используйте координаты [code]UV2[/code] для поиска от [member ao_texture]."
+
+msgid ""
+"Use [code]UV2[/code] coordinates to look up from the [member "
+"emission_texture]."
+msgstr ""
+"Используйте координаты [code]UV2[/code] для поиска от [member "
+"emission_texture]."
+
+msgid ""
+"Forces the shader to convert albedo from sRGB space to linear space. See also "
+"[member albedo_texture_force_srgb]."
+msgstr ""
+"Заставляет шейдер преобразовывать альбедо из пространства sRGB в линейное "
+"пространство. См. также [member albedo_texture_force_srgb]."
+
+msgid "Disables receiving shadows from other objects."
+msgstr "Отключает получение теней от других объектов."
+
+msgid "Disables receiving ambient light."
+msgstr "Отключает прием окружающего света."
+
+msgid "Enables the shadow to opacity feature."
+msgstr "Включает функцию непрозрачности тени."
+
+msgid ""
+"Enables the texture to repeat when UV coordinates are outside the 0-1 range. "
+"If using one of the linear filtering modes, this can result in artifacts at "
+"the edges of a texture when the sampler filters across the edges of the "
+"texture."
+msgstr ""
+"Позволяет текстуре повторяться, когда координаты UV выходят за пределы "
+"диапазона 0-1. При использовании одного из режимов линейной фильтрации это "
+"может привести к появлению артефактов на краях текстуры, когда сэмплер "
+"фильтрует края текстуры."
+
+msgid ""
+"Invert values read from a depth texture to convert them to height values "
+"(heightmap)."
+msgstr ""
+"Инвертировать значения, считанные из текстуры глубины, чтобы преобразовать их "
+"в значения высоты (карту высот)."
+
+msgid ""
+"Enables the skin mode for subsurface scattering which is used to improve the "
+"look of subsurface scattering when used for human skin."
+msgstr ""
+"Включает режим кожи для подповерхностного рассеивания, который используется "
+"для улучшения внешнего вида подповерхностного рассеивания при использовании "
+"для кожи человека."
+
+msgid ""
+"Enables parts of the shader required for [GPUParticles3D] trails to function. "
+"This also requires using a mesh with appropriate skinning, such as "
+"[RibbonTrailMesh] or [TubeTrailMesh]. Enabling this feature outside of "
+"materials used in [GPUParticles3D] meshes will break material rendering."
+msgstr ""
+"Включает части шейдера, необходимые для функционирования следов "
+"[GPUParticles3D]. Это также требует использования сетки с соответствующим "
+"скиннингом, например [RibbonTrailMesh] или [TubeTrailMesh]. Включение этой "
+"функции вне материалов, используемых в сетках [GPUParticles3D], нарушит "
+"рендеринг материалов."
+
+msgid "Enables multichannel signed distance field rendering shader."
+msgstr "Включает многоканальный шейдер рендеринга поля расстояний со знаком."
+
+msgid "Disables receiving depth-based or volumetric fog."
+msgstr "Отключает прием глубинного или объемного тумана."
+
+msgid "Represents the size of the [enum Flags] enum."
+msgstr "Представляет размер перечисления [enum Flags]."
+
+msgid "Default diffuse scattering algorithm."
+msgstr "Алгоритм диффузного рассеяния по умолчанию."
+
+msgid "Diffuse scattering ignores roughness."
+msgstr "Диффузное рассеяние игнорирует шероховатость."
+
+msgid "Extends Lambert to cover more than 90 degrees when roughness increases."
+msgstr ""
+"Расширяет диапазон Ламберта до более чем 90 градусов при увеличении "
+"неровностей."
+
+msgid "Uses a hard cut for lighting, with smoothing affected by roughness."
+msgstr "Для освещения используется жесткий срез, сглаживающий неровности."
+
+msgid "Default specular blob."
+msgstr "Спекулярное пятно по умол."
+
+msgid "Toon blob which changes size based on roughness."
+msgstr "Мультяшная капля, которая меняет размер в зависимости от неровности."
+
+msgid ""
+"No specular blob. This is slightly faster to render than other specular modes."
+msgstr ""
+"Нет блика. Это немного быстрее для рендеринга, чем другие бликовые режимы."
+
+msgid "Billboard mode is disabled."
+msgstr "Режим рекламного щита отключен."
+
+msgid "The object's Z axis will always face the camera."
+msgstr "Ось Z объекта всегда будет направлена в сторону камеры."
+
+msgid "The object's X axis will always face the camera."
+msgstr "Ось X объекта всегда будет направлена в сторону камеры."
+
+msgid ""
+"Used for particle systems when assigned to [GPUParticles3D] and "
+"[CPUParticles3D] nodes (flipbook animation). Enables [code]particles_anim_*[/"
+"code] properties.\n"
+"The [member ParticleProcessMaterial.anim_speed_min] or [member CPUParticles3D."
+"anim_speed_min] should also be set to a value bigger than zero for the "
+"animation to play."
+msgstr ""
+"Используется для систем частиц при назначении узлам [GPUParticles3D] и "
+"[CPUParticles3D] (анимация перелистывания). Включает свойства "
+"[code]particles_anim_*[/code]. \n"
+"Для воспроизведения анимации [member ParticleProcessMaterial.anim_speed_min] "
+"или [member CPUParticles3D.anim_speed_min] также следует задать значение "
+"больше нуля."
+
+msgid "Used to read from the red channel of a texture."
+msgstr "Используется для считывания красного канала текстуры."
+
+msgid "Used to read from the green channel of a texture."
+msgstr "Используется для считывания зеленого канала текстуры."
+
+msgid "Used to read from the blue channel of a texture."
+msgstr "Используется для чтения из синего канала текстуры."
+
+msgid "Used to read from the alpha channel of a texture."
+msgstr "Используется для чтения из альфа-канала текстуры."
+
+msgid ""
+"Used to read from the linear (non-perceptual) average of the red, green and "
+"blue channels of a texture."
+msgstr ""
+"Используется для считывания линейного (невоспринимаемого) среднего значения "
+"красного, зеленого и синего каналов текстуры."
+
+msgid "Adds the emission color to the color from the emission texture."
+msgstr "Добавляет цвет излучения к цвету из текстуры излучения."
+
+msgid "Multiplies the emission color by the color from the emission texture."
+msgstr "Умножает цвет излучения на цвет из текстуры излучения."
+
+msgid "Do not use distance fade."
+msgstr "Не используйте затухание на расстоянии."
+
+msgid ""
+"Smoothly fades the object out based on each pixel's distance from the camera "
+"using the alpha channel."
+msgstr ""
+"Плавно затухает объект в зависимости от расстояния каждого пикселя от камеры "
+"с использованием альфа-канала."
+
+msgid ""
+"Smoothly fades the object out based on each pixel's distance from the camera "
+"using a dithering approach. Dithering discards pixels based on a set pattern "
+"to smoothly fade without enabling transparency. On certain hardware, this can "
+"be faster than [constant DISTANCE_FADE_PIXEL_ALPHA]."
+msgstr ""
+"Плавно затухает объект на основе расстояния каждого пикселя от камеры с "
+"использованием подхода сглаживания. Сглаживание отбрасывает пиксели на основе "
+"заданного шаблона для плавного затухания без включения прозрачности. На "
+"определенном оборудовании это может быть быстрее, чем [константа "
+"DISTANCE_FADE_PIXEL_ALPHA]."
+
+msgid ""
+"Smoothly fades the object out based on the object's distance from the camera "
+"using a dithering approach. Dithering discards pixels based on a set pattern "
+"to smoothly fade without enabling transparency. On certain hardware, this can "
+"be faster than [constant DISTANCE_FADE_PIXEL_ALPHA] and [constant "
+"DISTANCE_FADE_PIXEL_DITHER]."
+msgstr ""
+"Плавно затухает объект на основе расстояния объекта от камеры с "
+"использованием подхода сглаживания. Сглаживание отбрасывает пиксели на основе "
+"установленного шаблона для плавного затухания без включения прозрачности. На "
+"определенном оборудовании это может быть быстрее, чем [constant "
+"DISTANCE_FADE_PIXEL_ALPHA] и [constant DISTANCE_FADE_PIXEL_DITHER]."
+
+msgid "A 3×3 matrix for representing 3D rotation and scale."
+msgstr "Матрица 3×3 для представления трехмерного вращения и масштаба."
+
+msgid ""
+"The [Basis] built-in [Variant] type is a 3×3 [url=https://en.wikipedia.org/"
+"wiki/Matrix_(mathematics)]matrix[/url] used to represent 3D rotation, scale, "
+"and shear. It is frequently used within a [Transform3D].\n"
+"A [Basis] is composed by 3 axis vectors, each representing a column of the "
+"matrix: [member x], [member y], and [member z]. The length of each axis "
+"([method Vector3.length]) influences the basis's scale, while the direction "
+"of all axes influence the rotation. Usually, these axes are perpendicular to "
+"one another. However, when you rotate any axis individually, the basis "
+"becomes sheared. Applying a sheared basis to a 3D model will make the model "
+"appear distorted.\n"
+"A [Basis] is:\n"
+"- [b]Orthogonal[/b] if its axes are perpendicular to each other.\n"
+"- [b]Normalized[/b] if the length of every axis is [code]1.0[/code].\n"
+"- [b]Uniform[/b] if all axes share the same length (see [method get_scale]).\n"
+"- [b]Orthonormal[/b] if it is both orthogonal and normalized, which allows it "
+"to only represent rotations (see [method orthonormalized]).\n"
+"- [b]Conformal[/b] if it is both orthogonal and uniform, which ensures it is "
+"not distorted.\n"
+"For a general introduction, see the [url=$DOCS_URL/tutorials/math/"
+"matrices_and_transforms.html]Matrices and transforms[/url] tutorial.\n"
+"[b]Note:[/b] Godot uses a [url=https://en.wikipedia.org/wiki/Right-"
+"hand_rule]right-handed coordinate system[/url], which is a common standard. "
+"For directions, the convention for built-in types like [Camera3D] is for -Z "
+"to point forward (+X is right, +Y is up, and +Z is back). Other objects may "
+"use different direction conventions. For more information, see the "
+"[url=$DOCS_URL/tutorials/assets_pipeline/importing_3d_scenes/"
+"model_export_considerations.html#d-asset-direction-conventions]3D asset "
+"direction conventions[/url] tutorial.\n"
+"[b]Note:[/b] The basis matrices are exposed as [url=https://www.mindcontrol."
+"org/~hplus/graphics/matrix-layout.html]column-major[/url] order, which is the "
+"same as OpenGL. However, they are stored internally in row-major order, which "
+"is the same as DirectX."
+msgstr ""
+"Встроенный тип [Variant] [Basis] — это [url=https://en.wikipedia.org/wiki/"
+"Matrix_(mathematics)]матрица[/url] размером 3×3, используемая для "
+"представления вращения, масштаба и сдвига в 3D. Она часто используется в "
+"[Transform3D].\n"
+"[Basis] состоит из 3 векторов осей, каждый из которых представляет столбец "
+"матрицы: [member x], [member y] и [member z]. Длина каждой оси ([method "
+"Vector3.length]) влияет на масштаб базиса, а направление всех осей влияет на "
+"вращение. Обычно эти оси перпендикулярны друг другу. Однако при повороте "
+"любой оси по отдельности базис становится сдвинутым. Применение сдвинутого "
+"базиса к 3D-модели приведет к тому, что модель будет выглядеть искаженной.\n"
+"[Basis]— это:\n"
+"- [b]Ортогональный[/b], если его оси перпендикулярны друг другу.\n"
+"- [b]Нормализовано[/b], если длина каждой оси равна [code]1.0[/code].\n"
+"- [b]Равномерно[/b], если все оси имеют одинаковую длину (см. [метод "
+"get_scale]).\n"
+"- [b]Ортонормальный[/b], если он одновременно ортогонален и нормализован, что "
+"позволяет ему представлять только вращения (см. [метод orthonormalized]).\n"
+"- [b]Конформный[/b], если он одновременно ортогонален и однороден, что "
+"гарантирует отсутствие искажений.\n"
+"Для общего введения см. учебник [url=$DOCS_URL/tutorials/math/"
+"matrices_and_transforms.html]Матрицы и преобразования[/url].\n"
+"[b]Примечание:[/b] Godot использует [url=https://en.wikipedia.org/wiki/Right-"
+"hand_rule]правостороннюю систему координат[/url], что является общепринятым "
+"стандартом. Для направлений соглашение для встроенных типов, таких как "
+"[Camera3D], заключается в том, что -Z указывает вперед (+X — направо, +Y — "
+"вверх, а +Z — назад). Другие объекты могут использовать другие соглашения о "
+"направлении. Для получения дополнительной информации см. [url=$DOCS_URL/"
+"tutorials/assets_pipeline/importing_3d_scenes/model_export_considerations."
+"html#d-asset-direction-conventions]Соглашения о направлении 3D-активов[/url] "
+"учебник.\n"
+"[b]Примечание:[/b] Базисные матрицы представлены в порядке [url=https://www."
+"mindcontrol.org/~hplus/graphics/matrix-layout.html]column-major[/url], что "
+"совпадает с порядком OpenGL. Однако внутри они хранятся в порядке row-major, "
+"что совпадает с порядком DirectX."
+
+msgid "Matrices and transforms"
+msgstr "Матрицы и преобразования"
+
+msgid "Using 3D transforms"
+msgstr "Использование 3D-преобразований"
+
+msgid "Matrix Transform Demo"
+msgstr "Демонстрация матричных преобразований"
+
+msgid ""
+"Constructs a [Basis] identical to [constant IDENTITY].\n"
+"[b]Note:[/b] In C#, this constructs a [Basis] with all of its components set "
+"to [constant Vector3.ZERO]."
+msgstr ""
+"Создает [Basis], идентичный [constant IDENTITY].\n"
+"[b]Примечание:[/b] В C# это создает [Basis], все компоненты которого "
+"установлены в [constant Vector3.ZERO]."
+
+msgid ""
+"Constructs a [Basis] that only represents rotation, rotated around the [param "
+"axis] by the given [param angle], in radians. The axis must be a normalized "
+"vector.\n"
+"[b]Note:[/b] This is the same as using [method rotated] on the [constant "
+"IDENTITY] basis. With more than one angle consider using [method from_euler], "
+"instead."
+msgstr ""
+"Создает [Basis], который представляет только вращение, повернутое вокруг "
+"[param axis] на заданный [param angle] в радианах. Ось должна быть "
+"нормализованным вектором.\n"
+"[b]Примечание:[/b] Это то же самое, что использовать [method rotated] на "
+"[constant IDENTITY] основе. При наличии более одного угла рассмотрите "
+"возможность использования [method from_euler] вместо этого."
+
+msgid ""
+"Constructs a [Basis] that only represents rotation from the given "
+"[Quaternion].\n"
+"[b]Note:[/b] Quaternions [i]only[/i] store rotation, not scale. Because of "
+"this, conversions from [Basis] to [Quaternion] cannot always be reversed."
+msgstr ""
+"Создает [Basis], который представляет только вращение из заданного "
+"[Quaternion].\n"
+"[b]Примечание:[/b] Кватернионы [i]только[/i] хранят вращение, а не масштаб. "
+"Из-за этого преобразования из [Basis] в [Quaternion] не всегда могут быть "
+"обратными."
+
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/Determinant]determinant[/url] "
+"of this basis's matrix. For advanced math, this number can be used to "
+"determine a few attributes:\n"
+"- If the determinant is exactly [code]0.0[/code], the basis is not invertible "
+"(see [method inverse]).\n"
+"- If the determinant is a negative number, the basis represents a negative "
+"scale.\n"
+"[b]Note:[/b] If the basis's scale is the same for every axis, its determinant "
+"is always that scale by the power of 2."
+msgstr ""
+"Возвращает [url=https://en.wikipedia.org/wiki/Determinant]определитель[/url] "
+"матрицы этого базиса. Для продвинутой математики это число может "
+"использоваться для определения нескольких атрибутов:\n"
+"- Если определитель равен точно [code]0.0[/code], базис необратим (см. "
+"[method inverse]).\n"
+"- Если определитель — отрицательное число, базис представляет собой "
+"отрицательный масштаб.\n"
+"[b]Примечание:[/b] Если масштаб базиса одинаков для каждой оси, его "
+"определитель всегда равен этому масштабу в степени 2."
+
+msgid ""
+"Constructs a new [Basis] that only represents rotation from the given "
+"[Vector3] of [url=https://en.wikipedia.org/wiki/Euler_angles]Euler angles[/"
+"url], in radians.\n"
+"- The [member Vector3.x] should contain the angle around the [member x] axis "
+"(pitch);\n"
+"- The [member Vector3.y] should contain the angle around the [member y] axis "
+"(yaw);\n"
+"- The [member Vector3.z] should contain the angle around the [member z] axis "
+"(roll).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Creates a Basis whose z axis points down.\n"
+"var my_basis = Basis.from_euler(Vector3(TAU / 4, 0, 0))\n"
+"\n"
+"print(my_basis.z) # Prints (0.0, -1.0, 0.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Creates a Basis whose z axis points down.\n"
+"var myBasis = Basis.FromEuler(new Vector3(Mathf.Tau / 4.0f, 0.0f, 0.0f));\n"
+"\n"
+"GD.Print(myBasis.Z); // Prints (0, -1, 0)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The order of each consecutive rotation can be changed with [param order] (see "
+"[enum EulerOrder] constants). By default, the YXZ convention is used "
+"([constant EULER_ORDER_YXZ]): the basis rotates first around the Y axis "
+"(yaw), then X (pitch), and lastly Z (roll). When using the opposite method "
+"[method get_euler], this order is reversed."
+msgstr ""
+"Создает новый [Basis], который представляет только вращение из заданного "
+"[Vector3] [url=https://en.wikipedia.org/wiki/Euler_angles]углов Эйлера[/url] "
+"в радианах.\n"
+"- [Member Vector3.x] должен содержать угол вокруг оси [member x] (тангаж);\n"
+"- [Member Vector3.y] должен содержать угол вокруг оси [member y] (рыскание);\n"
+"- [Member Vector3.z] должен содержать угол вокруг оси [member z] (крен).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Создает базис, ось z которого направлена вниз.\n"
+"var my_basis = Basis.from_euler(Vector3(TAU / 4, 0, 0))\n"
+"\n"
+"print(my_basis.z) # Prints (0.0, -1.0, 0.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Создает базис, ось z которого направлена вниз.\n"
+"var myBasis = Basis.FromEuler(new Vector3(Mathf.Tau / 4.0f, 0.0f, 0.0f));\n"
+"\n"
+"GD.Print(myBasis.Z); // Prints (0, -1, 0)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Порядок каждого последовательного вращения можно изменить с помощью [param "
+"order] (см. константы [enum EulerOrder]). По умолчанию используется "
+"соглашение YXZ ([constant EULER_ORDER_YXZ]): базис сначала вращается вокруг "
+"оси Y (рыскание), затем вокруг оси X (тангаж) и, наконец, вокруг оси Z "
+"(крен). При использовании противоположного метода [method get_euler] этот "
+"порядок меняется на обратный."
+
+msgid ""
+"Constructs a new [Basis] that only represents scale, with no rotation or "
+"shear, from the given [param scale] vector.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.from_scale(Vector3(2, 4, 8))\n"
+"\n"
+"print(my_basis.x) # Prints (2.0, 0.0, 0.0)\n"
+"print(my_basis.y) # Prints (0.0, 4.0, 0.0)\n"
+"print(my_basis.z) # Prints (0.0, 0.0, 8.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.FromScale(new Vector3(2.0f, 4.0f, 8.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (2, 0, 0)\n"
+"GD.Print(myBasis.Y); // Prints (0, 4, 0)\n"
+"GD.Print(myBasis.Z); // Prints (0, 0, 8)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] In linear algebra, the matrix of this basis is also known as a "
+"[url=https://en.wikipedia.org/wiki/Diagonal_matrix]diagonal matrix[/url]."
+msgstr ""
+"Создает новый [Basis], который представляет только масштаб, без вращения или "
+"сдвига, из заданного вектора [param scale].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.from_scale(Vector3(2, 4, 8))\n"
+"\n"
+"print(my_basis.x) # Prints (2.0, 0.0, 0.0)\n"
+"print(my_basis.y) # Prints (0.0, 4.0, 0.0)\n"
+"print(my_basis.z) # Prints (0.0, 0.0, 8.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.FromScale(new Vector3(2.0f, 4.0f, 8.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (2, 0, 0)\n"
+"GD.Print(myBasis.Y); // Prints (0, 4, 0)\n"
+"GD.Print(myBasis.Z); // Prints (0, 0, 8)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] В линейной алгебре матрица этого базиса также известна как "
+"[url=https://en.wikipedia.org/wiki/Diagonal_matrix]диагональная матрица[/url]."
+
+msgid ""
+"Returns this basis's rotation as a [Vector3] of [url=https://en.wikipedia.org/"
+"wiki/Euler_angles]Euler angles[/url], in radians. For the returned value:\n"
+"- The [member Vector3.x] contains the angle around the [member x] axis "
+"(pitch);\n"
+"- The [member Vector3.y] contains the angle around the [member y] axis "
+"(yaw);\n"
+"- The [member Vector3.z] contains the angle around the [member z] axis "
+"(roll).\n"
+"The order of each consecutive rotation can be changed with [param order] (see "
+"[enum EulerOrder] constants). By default, the YXZ convention is used "
+"([constant EULER_ORDER_YXZ]): Z (roll) is calculated first, then X (pitch), "
+"and lastly Y (yaw). When using the opposite method [method from_euler], this "
+"order is reversed.\n"
+"[b]Note:[/b] For this method to return correctly, the basis needs to be "
+"[i]orthonormal[/i] (see [method orthonormalized]).\n"
+"[b]Note:[/b] Euler angles are much more intuitive but are not suitable for 3D "
+"math. Because of this, consider using the [method get_rotation_quaternion] "
+"method instead, which returns a [Quaternion].\n"
+"[b]Note:[/b] In the Inspector dock, a basis's rotation is often displayed in "
+"Euler angles (in degrees), as is the case with the [member Node3D.rotation] "
+"property."
+msgstr ""
+"Возвращает вращение этого базиса как [Vector3] [url=https://en.wikipedia.org/"
+"wiki/Euler_angles]углов Эйлера[/url] в радианах. Для возвращаемого значения:\n"
+"- [member Vector3.x] содержит угол вокруг оси [member x] (тангаж);\n"
+"- [member Vector3.y] содержит угол вокруг оси [member y] (рыскание);\n"
+"- [member Vector3.z] содержит угол вокруг оси [member z] (крен).\n"
+"Порядок каждого последовательного вращения можно изменить с помощью [param "
+"order] (см. константы [enum EulerOrder]). По умолчанию используется "
+"соглашение YXZ ([constant EULER_ORDER_YXZ]): сначала вычисляется Z (крен), "
+"затем X (тангаж) и, наконец, Y (рыскание). При использовании противоположного "
+"метода [method from_euler] этот порядок меняется на обратный.\n"
+"[b]Примечание:[/b] Чтобы этот метод возвращал правильный результат, базис "
+"должен быть [i]ортонормальным[/i] (см. [method orthonormalized]).\n"
+"[b]Примечание:[/b] Углы Эйлера гораздо более интуитивны, но не подходят для "
+"3D-математики. Из-за этого рассмотрите возможность использования метода "
+"[method get_rotation_quaternion], который возвращает [Quaternion].\n"
+"[b]Примечание:[/b] В доке Inspector вращение базиса часто отображается в "
+"углах Эйлера (в градусах), как в случае со свойством [member Node3D.rotation]."
+
+msgid ""
+"Returns this basis's rotation as a [Quaternion].\n"
+"[b]Note:[/b] Quaternions are much more suitable for 3D math but are less "
+"intuitive. For user interfaces, consider using the [method get_euler] method, "
+"which returns Euler angles."
+msgstr ""
+"Возвращает вращение этого базиса как [Кватернион].\n"
+"[b]Примечание:[/b] Кватернионы гораздо больше подходят для 3D-математики, но "
+"менее интуитивно понятны. Для пользовательских интерфейсов рассмотрите "
+"возможность использования метода [method get_euler], который возвращает углы "
+"Эйлера."
+
+msgid ""
+"Returns the length of each axis of this basis, as a [Vector3]. If the basis "
+"is not sheared, this value is the scaling factor. It is not affected by "
+"rotation.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(2, 0, 0),\n"
+"    Vector3(0, 4, 0),\n"
+"    Vector3(0, 0, 8)\n"
+")\n"
+"# Rotating the Basis in any way preserves its scale.\n"
+"my_basis = my_basis.rotated(Vector3.UP, TAU / 2)\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, TAU / 4)\n"
+"\n"
+"print(my_basis.get_scale()) # Prints (2.0, 4.0, 8.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    Vector3(2.0f, 0.0f, 0.0f),\n"
+"    Vector3(0.0f, 4.0f, 0.0f),\n"
+"    Vector3(0.0f, 0.0f, 8.0f)\n"
+");\n"
+"// Rotating the Basis in any way preserves its scale.\n"
+"myBasis = myBasis.Rotated(Vector3.Up, Mathf.Tau / 2.0f);\n"
+"myBasis = myBasis.Rotated(Vector3.Right, Mathf.Tau / 4.0f);\n"
+"\n"
+"GD.Print(myBasis.Scale); // Prints (2, 4, 8)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If the value returned by [method determinant] is negative, the "
+"scale is also negative."
+msgstr ""
+"Возвращает длину каждой оси этого базиса как [Vector3]. Если базис не "
+"сдвинут, это значение является коэффициентом масштабирования. Оно не зависит "
+"от вращения.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(2, 0, 0),\n"
+"    Vector3(0, 4, 0),\n"
+"    Vector3(0, 0, 8)\n"
+")\n"
+"#При любом повороте Базиса его масштаб сохраняется.\n"
+"my_basis = my_basis.rotated(Vector3.UP, TAU / 2)\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, TAU / 4)\n"
+"\n"
+"print(my_basis.get_scale()) # Prints (2.0, 4.0, 8.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    Vector3(2.0f, 0.0f, 0.0f),\n"
+"    Vector3(0.0f, 4.0f, 0.0f),\n"
+"    Vector3(0.0f, 0.0f, 8.0f)\n"
+");\n"
+"// При любом повороте Базиса его масштаб сохраняется.\n"
+"myBasis = myBasis.Rotated(Vector3.Up, Mathf.Tau / 2.0f);\n"
+"myBasis = myBasis.Rotated(Vector3.Right, Mathf.Tau / 4.0f);\n"
+"\n"
+"GD.Print(myBasis.Scale); // Prints (2, 4, 8)\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Если значение, возвращаемое [определителем метода], "
+"отрицательное, масштаб также будет отрицательным."
+
+msgid ""
+"Returns the [url=https://en.wikipedia.org/wiki/Invertible_matrix]inverse of "
+"this basis's matrix[/url]."
+msgstr ""
+"Возвращает [url=https://en.wikipedia.org/wiki/Invertible_matrix]обратную "
+"матрицу данного базиса[/url]."
+
+msgid ""
+"Returns [code]true[/code] if this basis is conformal. A conformal basis is "
+"both [i]orthogonal[/i] (the axes are perpendicular to each other) and "
+"[i]uniform[/i] (the axes share the same length). This method can be "
+"especially useful during physics calculations."
+msgstr ""
+"Возвращает [code]true[/code], если этот базис конформный. Конформный базис "
+"является как [i]ортогональным[/i] (оси перпендикулярны друг другу), так и "
+"[i]равномерным[/i] (оси имеют одинаковую длину). Этот метод может быть "
+"особенно полезен при физических расчетах."
+
+msgid ""
+"Returns [code]true[/code] if this basis and [param b] are approximately "
+"equal, by calling [method @GlobalScope.is_equal_approx] on all vector "
+"components."
+msgstr ""
+"Возвращает [code]true[/code], если этот базис и [param b] приблизительно "
+"равны, вызывая [метод @GlobalScope.is_equal_approx] для всех компонентов "
+"вектора."
+
+msgid ""
+"Returns [code]true[/code] if this basis is finite, by calling [method "
+"@GlobalScope.is_finite] on all vector components."
+msgstr ""
+"Возвращает [code]true[/code], если этот базис конечен, вызывая [метод "
+"@GlobalScope.is_finite] для всех компонентов вектора."
+
+msgid ""
+"Creates a new [Basis] with a rotation such that the forward axis (-Z) points "
+"towards the [param target] position.\n"
+"By default, the -Z axis (camera forward) is treated as forward (implies +X is "
+"right). If [param use_model_front] is [code]true[/code], the +Z axis (asset "
+"front) is treated as forward (implies +X is left) and points toward the "
+"[param target] position.\n"
+"The up axis (+Y) points as close to the [param up] vector as possible while "
+"staying perpendicular to the forward axis. The returned basis is "
+"orthonormalized (see [method orthonormalized]).\n"
+"The [param target] and the [param up] cannot be [constant Vector3.ZERO], and "
+"shouldn't be colinear to avoid unintended rotation around local Z axis."
+msgstr ""
+"Создает новый [Basis] с поворотом таким образом, что прямая ось (-Z) "
+"указывает на позицию [param target].\n"
+"По умолчанию ось -Z (камера вперед) рассматривается как прямая "
+"(подразумевается, что +X находится справа). Если [param use_model_front] "
+"равно [code]true[/code], ось +Z (ассет спереди) рассматривается как прямая "
+"(подразумевается, что +X находится слева) и указывает на позицию [param "
+"target].\n"
+"Верхняя ось (+Y) указывает как можно ближе к вектору [param up], оставаясь "
+"перпендикулярной прямой оси. Возвращаемый базис ортонормализован (см. [method "
+"orthonormalized]).\n"
+"[param target] и [param up] не могут быть [constant Vector3.ZERO] и не должны "
+"быть коллинеарными, чтобы избежать непреднамеренного поворота вокруг "
+"локальной оси Z."
+
+msgid ""
+"Returns the orthonormalized version of this basis. An orthonormal basis is "
+"both [i]orthogonal[/i] (the axes are perpendicular to each other) and "
+"[i]normalized[/i] (the axes have a length of [code]1.0[/code]), which also "
+"means it can only represent a rotation.\n"
+"It is often useful to call this method to avoid rounding errors on a rotating "
+"basis:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Rotate this Node3D every frame.\n"
+"func _process(delta):\n"
+"    basis = basis.rotated(Vector3.UP, TAU * delta)\n"
+"    basis = basis.rotated(Vector3.RIGHT, TAU * delta)\n"
+"\n"
+"    basis = basis.orthonormalized()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Rotate this Node3D every frame.\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    Basis = Basis.Rotated(Vector3.Up, Mathf.Tau * (float)delta)\n"
+"                 .Rotated(Vector3.Right, Mathf.Tau * (float)delta)\n"
+"                 .Orthonormalized();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает ортонормированную версию этого базиса. Ортонормированный базис "
+"является как [i]ортогональным[/i] (оси перпендикулярны друг другу), так и "
+"[i]нормализованным[/i] (оси имеют длину [code]1.0[/code]), что также "
+"означает, что он может представлять только поворот.\n"
+"Часто бывает полезно вызывать этот метод, чтобы избежать ошибок округления на "
+"основе поворота:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Вращайте этот Node3D каждый кадр.\n"
+"func _process(delta):\n"
+"    basis = basis.rotated(Vector3.UP, TAU * delta)\n"
+"    basis = basis.rotated(Vector3.RIGHT, TAU * delta)\n"
+"\n"
+"    basis = basis.orthonormalized()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Вращайте этот Node3D каждый кадр.\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    Basis = Basis.Rotated(Vector3.Up, Mathf.Tau * (float)delta)\n"
+"                 .Rotated(Vector3.Right, Mathf.Tau * (float)delta)\n"
+"                 .Orthonormalized();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns a copy of this basis rotated around the given [param axis] by the "
+"given [param angle] (in radians).\n"
+"The [param axis] must be a normalized vector (see [method Vector3."
+"normalized]). If [param angle] is positive, the basis is rotated counter-"
+"clockwise around the axis.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.IDENTITY\n"
+"var angle = TAU / 2\n"
+"\n"
+"my_basis = my_basis.rotated(Vector3.UP, angle)    # Rotate around the up axis "
+"(yaw).\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, angle) # Rotate around the right "
+"axis (pitch).\n"
+"my_basis = my_basis.rotated(Vector3.BACK, angle)  # Rotate around the back "
+"axis (roll).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.Identity;\n"
+"var angle = Mathf.Tau / 2.0f;\n"
+"\n"
+"myBasis = myBasis.Rotated(Vector3.Up, angle);    // Rotate around the up axis "
+"(yaw).\n"
+"myBasis = myBasis.Rotated(Vector3.Right, angle); // Rotate around the right "
+"axis (pitch).\n"
+"myBasis = myBasis.Rotated(Vector3.Back, angle);  // Rotate around the back "
+"axis (roll).\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает копию этого базиса, повернутую вокруг заданной [param axis] на "
+"заданный [param angle] (в радианах). \n"
+"[Param axis] должен быть нормализованным вектором (см. [method Vector3."
+"normalized]). Если [param angle] положительный, базис поворачивается против "
+"часовой стрелки вокруг оси.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis.IDENTITY\n"
+"var angle = TAU / 2\n"
+"\n"
+"my_basis = my_basis.rotated(Vector3.UP, angle)    # Rotate around the up axis "
+"(yaw).\n"
+"my_basis = my_basis.rotated(Vector3.RIGHT, angle) # Rotate around the right "
+"axis (pitch).\n"
+"my_basis = my_basis.rotated(Vector3.BACK, angle)  # Rotate around the back "
+"axis (roll).\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = Basis.Identity;\n"
+"var angle = Mathf.Tau / 2.0f;\n"
+"\n"
+"myBasis = myBasis.Rotated(Vector3.Up, angle);    // Rotate around the up axis "
+"(yaw).\n"
+"myBasis = myBasis.Rotated(Vector3.Right, angle); // Rotate around the right "
+"axis (pitch).\n"
+"myBasis = myBasis.Rotated(Vector3.Back, angle);  // Rotate around the back "
+"axis (roll).\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns this basis with each axis's components scaled by the given [param "
+"scale]'s components.\n"
+"The basis matrix's rows are multiplied by [param scale]'s components. This "
+"operation is a global scale (relative to the parent).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 1, 1),\n"
+"    Vector3(2, 2, 2),\n"
+"    Vector3(3, 3, 3)\n"
+")\n"
+"my_basis = my_basis.scaled(Vector3(0, 2, -2))\n"
+"\n"
+"print(my_basis.x) # Prints (0.0, 2.0, -2.0)\n"
+"print(my_basis.y) # Prints (0.0, 4.0, -4.0)\n"
+"print(my_basis.z) # Prints (0.0, 6.0, -6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 1.0f, 1.0f),\n"
+"    new Vector3(2.0f, 2.0f, 2.0f),\n"
+"    new Vector3(3.0f, 3.0f, 3.0f)\n"
+");\n"
+"myBasis = myBasis.Scaled(new Vector3(0.0f, 2.0f, -2.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (0, 2, -2)\n"
+"GD.Print(myBasis.Y); // Prints (0, 4, -4)\n"
+"GD.Print(myBasis.Z); // Prints (0, 6, -6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает этот базис с компонентами каждой оси, масштабированными по "
+"заданным компонентам [param scale].\n"
+"Строки матрицы базиса умножаются на компоненты [param scale]. Эта операция "
+"является глобальной шкалой (относительно родителя).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 1, 1),\n"
+"    Vector3(2, 2, 2),\n"
+"    Vector3(3, 3, 3)\n"
+")\n"
+"my_basis = my_basis.scaled(Vector3(0, 2, -2))\n"
+"\n"
+"print(my_basis.x) # Prints (0.0, 2.0, -2.0)\n"
+"print(my_basis.y) # Prints (0.0, 4.0, -4.0)\n"
+"print(my_basis.z) # Prints (0.0, 6.0, -6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 1.0f, 1.0f),\n"
+"    new Vector3(2.0f, 2.0f, 2.0f),\n"
+"    new Vector3(3.0f, 3.0f, 3.0f)\n"
+");\n"
+"myBasis = myBasis.Scaled(new Vector3(0.0f, 2.0f, -2.0f));\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (0, 2, -2)\n"
+"GD.Print(myBasis.Y); // Prints (0, 4, -4)\n"
+"GD.Print(myBasis.Z); // Prints (0, 6, -6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Performs a spherical-linear interpolation with the [param to] basis, given a "
+"[param weight]. Both this basis and [param to] should represent a rotation.\n"
+"[b]Example:[/b] Smoothly rotate a [Node3D] to the target basis over time, "
+"with a [Tween]:\n"
+"[codeblock]\n"
+"var start_basis = Basis.IDENTITY\n"
+"var target_basis = Basis.IDENTITY.rotated(Vector3.UP, TAU / 2)\n"
+"\n"
+"func _ready():\n"
+"    create_tween().tween_method(interpolate, 0.0, 1.0, 5.0).set_trans(Tween."
+"TRANS_EXPO)\n"
+"\n"
+"func interpolate(weight):\n"
+"    basis = start_basis.slerp(target_basis, weight)\n"
+"[/codeblock]"
+msgstr ""
+"Выполняет сферически-линейную интерполяцию с базисом [param to], заданным "
+"[param weight]. И этот базис, и [param to] должны представлять поворот.\n"
+"[b]Пример:[/b] Плавно повернуть [Node3D] к целевому базису с течением времени "
+"с [Tween]:\n"
+"[codeblock]\n"
+"var start_basis = Basis.IDENTITY\n"
+"var target_basis = Basis.IDENTITY.rotated(Vector3.UP, TAU / 2)\n"
+"\n"
+"func _ready():\n"
+"    create_tween().tween_method(interpolate, 0.0, 1.0, 5.0).set_trans(Tween."
+"TRANS_EXPO)\n"
+"\n"
+"func interpolate(weight):\n"
+"    basis = start_basis.slerp(target_basis, weight)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the transposed dot product between [param with] and the [member x] "
+"axis (see [method transposed]).\n"
+"This is equivalent to [code]basis.x.dot(vector)[/code]."
+msgstr ""
+"Возвращает транспонированное скалярное произведение между [param with] и осью "
+"[member x] (см. [method transposed]). \n"
+"Это эквивалентно [code]basis.x.dot(vector)[/code]."
+
+msgid ""
+"Returns the transposed dot product between [param with] and the [member y] "
+"axis (see [method transposed]).\n"
+"This is equivalent to [code]basis.y.dot(vector)[/code]."
+msgstr ""
+"Возвращает транспонированное скалярное произведение между [параметром с] и "
+"осью [член y] (см. [метод транспонирования]).\n"
+"Это эквивалентно [code]basis.y.dot(vector)[/code]."
+
+msgid ""
+"Returns the transposed dot product between [param with] and the [member z] "
+"axis (see [method transposed]).\n"
+"This is equivalent to [code]basis.z.dot(vector)[/code]."
+msgstr ""
+"Возвращает транспонированное скалярное произведение между [параметром с] и "
+"осью [член z] (см. [метод транспонирования]). \n"
+"Это эквивалентно [code]basis.z.dot(vector)[/code]."
+
+msgid ""
+"Returns the transposed version of this basis. This turns the basis matrix's "
+"columns into rows, and its rows into columns.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 2, 3),\n"
+"    Vector3(4, 5, 6),\n"
+"    Vector3(7, 8, 9)\n"
+")\n"
+"my_basis = my_basis.transposed()\n"
+"\n"
+"print(my_basis.x) # Prints (1.0, 4.0, 7.0)\n"
+"print(my_basis.y) # Prints (2.0, 5.0, 8.0)\n"
+"print(my_basis.z) # Prints (3.0, 6.0, 9.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 2.0f, 3.0f),\n"
+"    new Vector3(4.0f, 5.0f, 6.0f),\n"
+"    new Vector3(7.0f, 8.0f, 9.0f)\n"
+");\n"
+"myBasis = myBasis.Transposed();\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (1, 4, 7)\n"
+"GD.Print(myBasis.Y); // Prints (2, 5, 8)\n"
+"GD.Print(myBasis.Z); // Prints (3, 6, 9)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает транспонированную версию этого базиса. Это превращает столбцы "
+"матрицы базиса в строки, а ее строки в столбцы.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_basis = Basis(\n"
+"    Vector3(1, 2, 3),\n"
+"    Vector3(4, 5, 6),\n"
+"    Vector3(7, 8, 9)\n"
+")\n"
+"my_basis = my_basis.transposed()\n"
+"\n"
+"print(my_basis.x) # Prints (1.0, 4.0, 7.0)\n"
+"print(my_basis.y) # Prints (2.0, 5.0, 8.0)\n"
+"print(my_basis.z) # Prints (3.0, 6.0, 9.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myBasis = new Basis(\n"
+"    new Vector3(1.0f, 2.0f, 3.0f),\n"
+"    new Vector3(4.0f, 5.0f, 6.0f),\n"
+"    new Vector3(7.0f, 8.0f, 9.0f)\n"
+");\n"
+"myBasis = myBasis.Transposed();\n"
+"\n"
+"GD.Print(myBasis.X); // Prints (1, 4, 7)\n"
+"GD.Print(myBasis.Y); // Prints (2, 5, 8)\n"
+"GD.Print(myBasis.Z); // Prints (3, 6, 9)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"The basis's X axis, and the column [code]0[/code] of the matrix.\n"
+"On the identity basis, this vector points right ([constant Vector3.RIGHT])."
+msgstr ""
+"Ось X базиса и столбец [code]0[/code] матрицы.\n"
+"На основе тождества этот вектор указывает вправо ([constant Vector3.RIGHT])."
+
+msgid ""
+"The basis's Y axis, and the column [code]1[/code] of the matrix.\n"
+"On the identity basis, this vector points up ([constant Vector3.UP])."
+msgstr ""
+"Ось Y базиса и столбец [code]1[/code] матрицы.\n"
+"На основе тождества этот вектор направлен вверх ([constant Vector3.UP])."
+
+msgid ""
+"The basis's Z axis, and the column [code]2[/code] of the matrix.\n"
+"On the identity basis, this vector points back ([constant Vector3.BACK])."
+msgstr ""
+"Ось Z базиса и столбец [code]2[/code] матрицы.\n"
+"На основе тождества этот вектор указывает назад ([constant Vector3.BACK])."
+
+msgid ""
+"The identity [Basis]. This is an orthonormal basis with no rotation, no "
+"shear, and a scale of [constant Vector3.ONE]. This also means that:\n"
+"- The [member x] points right ([constant Vector3.RIGHT]);\n"
+"- The [member y] points up ([constant Vector3.UP]);\n"
+"- The [member z] points back ([constant Vector3.BACK]).\n"
+"[codeblock]\n"
+"var basis = Basis.IDENTITY\n"
+"print(\"| X | Y | Z\")\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.x, basis.y.x, basis.z.x])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.y, basis.y.y, basis.z.y])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.z, basis.y.z, basis.z.z])\n"
+"# Prints:\n"
+"# | X | Y | Z\n"
+"# | 1 | 0 | 0\n"
+"# | 0 | 1 | 0\n"
+"# | 0 | 0 | 1\n"
+"[/codeblock]\n"
+"If a [Vector3] or another [Basis] is transformed (multiplied) by this "
+"constant, no transformation occurs.\n"
+"[b]Note:[/b] In GDScript, this constant is equivalent to creating a "
+"[constructor Basis] without any arguments. It can be used to make your code "
+"clearer, and for consistency with C#."
+msgstr ""
+"Тождество [Basis]. Это ортонормальный базис без вращения, без сдвига и "
+"масштабом [constant Vector3.ONE]. Это также означает, что:\n"
+"- [член x] указывает вправо ([constant Vector3.RIGHT]);\n"
+"- [член y] указывает вверх ([constant Vector3.UP]);\n"
+"- [член z] указывает назад ([constant Vector3.BACK]).\n"
+"[codeblock]\n"
+"var basis = Basis.IDENTITY\n"
+"print(\"| X | Y | Z\")\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.x, basis.y.x, basis.z.x])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.y, basis.y.y, basis.z.y])\n"
+"print(\"| %.f | %.f | %.f\" % [basis.x.z, basis.y.z, basis.z.z])\n"
+"# Prints:\n"
+"# | X | Y | Z\n"
+"# | 1 | 0 | 0\n"
+"# | 0 | 1 | 0\n"
+"# | 0 | 0 | 1\n"
+"[/codeblock]\n"
+"Если [Vector3] или другой [Basis] преобразуется (умножается) на эту "
+"константу, то преобразование не происходит.\n"
+"[b]Примечание:[/b] В GDScript эта константа эквивалентна созданию "
+"[конструктора Basis] без каких-либо аргументов. Ее можно использовать для "
+"того, чтобы сделать ваш код более понятным и для согласованности с C#."
+
+msgid ""
+"When any basis is multiplied by [constant FLIP_X], it negates all components "
+"of the [member x] axis (the X column).\n"
+"When [constant FLIP_X] is multiplied by any basis, it negates the [member "
+"Vector3.x] component of all axes (the X row)."
+msgstr ""
+"Когда любой базис умножается на [константу FLIP_X], он инвертирует все "
+"компоненты оси [элемент x] (столбец X).\n"
+"Когда [константа FLIP_X] умножается на любой базис, он инвертирует компонент "
+"[элемент Vector3.x] всех осей (строка X)."
+
+msgid ""
+"When any basis is multiplied by [constant FLIP_Y], it negates all components "
+"of the [member y] axis (the Y column).\n"
+"When [constant FLIP_Y] is multiplied by any basis, it negates the [member "
+"Vector3.y] component of all axes (the Y row)."
+msgstr ""
+"Когда любой базис умножается на [константу FLIP_Y], он инвертирует все "
+"компоненты оси [элемент y] (столбец Y).\n"
+"Когда [константа FLIP_Y] умножается на любой базис, он инвертирует компонент "
+"[элемент Vector3.y] всех осей (строка Y)."
+
+msgid ""
+"When any basis is multiplied by [constant FLIP_Z], it negates all components "
+"of the [member z] axis (the Z column).\n"
+"When [constant FLIP_Z] is multiplied by any basis, it negates the [member "
+"Vector3.z] component of all axes (the Z row)."
+msgstr ""
+"Когда любой базис умножается на [константу FLIP_Z], он инвертирует все "
+"компоненты оси [элемент z] (столбец Z).\n"
+"Когда [константа FLIP_Z] умножается на любой базис, он инвертирует компонент "
+"[элемент Vector3.z] всех осей (строка Z)."
+
+msgid ""
+"Transforms (multiplies) the [param right] basis by this basis.\n"
+"This is the operation performed between parent and child [Node3D]s."
+msgstr ""
+"Преобразует (умножает) базис [param right] на этот базис. \n"
+"Это операция, выполняемая между родительским и дочерним [Node3D]."
+
+msgid ""
+"Transforms (multiplies) the [param right] vector by this basis, returning a "
+"[Vector3].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Basis that swaps the X/Z axes and doubles the scale.\n"
+"var my_basis = Basis(Vector3(0, 2, 0), Vector3(2, 0, 0), Vector3(0, 0, 2))\n"
+"print(my_basis * Vector3(1, 2, 3)) # Prints (4.0, 2.0, 6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Basis that swaps the X/Z axes and doubles the scale.\n"
+"var myBasis = new Basis(new Vector3(0, 2, 0), new Vector3(2, 0, 0), new "
+"Vector3(0, 0, 2));\n"
+"GD.Print(myBasis * new Vector3(1, 2, 3)); // Prints (4, 2, 6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Преобразует (умножает) вектор [param right] на этот базис, возвращая "
+"[Vector3].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Базис, который меняет местами оси X/Z и удваивает масштаб.\n"
+"var my_basis = Basis(Vector3(0, 2, 0), Vector3(2, 0, 0), Vector3(0, 0, 2))\n"
+"print(my_basis * Vector3(1, 2, 3)) # Prints (4.0, 2.0, 6.0)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Базис, который меняет местами оси X/Z и удваивает масштаб.\n"
+"var myBasis = new Basis(new Vector3(0, 2, 0), new Vector3(2, 0, 0), new "
+"Vector3(0, 0, 2));\n"
+"GD.Print(myBasis * new Vector3(1, 2, 3)); // Prints (4, 2, 6)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Multiplies all components of the [Basis] by the given [float]. This affects "
+"the basis's scale uniformly, resizing all 3 axes by the [param right] value."
+msgstr ""
+"Умножает все компоненты [Basis] на заданный [float]. Это влияет на масштаб "
+"базиса равномерно, изменяя размер всех 3 осей на значение [param right]."
+
+msgid ""
+"Multiplies all components of the [Basis] by the given [int]. This affects the "
+"basis's scale uniformly, resizing all 3 axes by the [param right] value."
+msgstr ""
+"Умножает все компоненты [Basis] на заданное [int]. Это влияет на масштаб "
+"базиса равномерно, изменяя размер всех 3 осей на значение [param right]."
+
+msgid ""
+"Divides all components of the [Basis] by the given [float]. This affects the "
+"basis's scale uniformly, resizing all 3 axes by the [param right] value."
+msgstr ""
+"Делит все компоненты [Basis] на заданный [float]. Это влияет на масштаб "
+"базиса равномерно, изменяя размер всех 3 осей на значение [param right]."
+
+msgid ""
+"Divides all components of the [Basis] by the given [int]. This affects the "
+"basis's scale uniformly, resizing all 3 axes by the [param right] value."
+msgstr ""
+"Делит все компоненты [Basis] на заданное [int]. Это влияет на масштаб базиса "
+"равномерно, изменяя размер всех 3 осей на значение [param right]."
+
+msgid ""
+"Returns [code]true[/code] if the components of both [Basis] matrices are "
+"exactly equal.\n"
+"[b]Note:[/b] Due to floating-point precision errors, consider using [method "
+"is_equal_approx] instead, which is more reliable."
+msgstr ""
+"Возвращает [code]true[/code], если компоненты обеих матриц [Basis] в точности "
+"равны.\n"
+"[b]Примечание:[/b] Из-за ошибок точности с плавающей точкой рассмотрите "
+"возможность использования [method is_equal_approx], который более надежен."
+
+msgid ""
+"Accesses each axis (column) of this basis by their index. Index [code]0[/"
+"code] is the same as [member x], index [code]1[/code] is the same as [member "
+"y], and index [code]2[/code] is the same as [member z].\n"
+"[b]Note:[/b] In C++, this operator accesses the rows of the basis matrix, "
+"[i]not[/i] the columns. For the same behavior as scripting languages, use the "
+"[code]set_column[/code] and [code]get_column[/code] methods."
+msgstr ""
+"Доступ к каждой оси (столбцу) этого базиса по их индексу. Индекс [code]0[/"
+"code] такой же, как [элемент x], индекс [code]1[/code] такой же, как [элемент "
+"y], а индекс [code]2[/code] такой же, как [элемент z].\n"
+"[b]Примечание:[/b] В C++ этот оператор обращается к строкам матрицы базиса, "
+"[i]не[/i] к столбцам. Для того же поведения, что и в языках сценариев, "
+"используйте методы [code]set_column[/code] и [code]get_column[/code] ."
+
+msgid "Boolean matrix."
+msgstr "Логическая матрица."
+
+msgid ""
+"A two-dimensional array of boolean values, can be used to efficiently store a "
+"binary matrix (every matrix element takes only one bit) and query the values "
+"using natural cartesian coordinates."
+msgstr ""
+"Двумерный массив логических значений можно использовать для эффективного "
+"хранения двоичной матрицы (каждый элемент матрицы занимает только один бит) и "
+"запроса значений с использованием естественных декартовых координат."
+
+msgid ""
+"Returns an image of the same size as the bitmap and with a [enum Image."
+"Format] of type [constant Image.FORMAT_L8]. [code]true[/code] bits of the "
+"bitmap are being converted into white pixels, and [code]false[/code] bits "
+"into black."
+msgstr ""
+"Возвращает изображение того же размера, что и растровое изображение, и с "
+"[enum Image.Format] типа [constant Image.FORMAT_L8]. [code]true[/code] бит "
+"растрового изображения преобразуются в белые пиксели, а [code]false[/code] "
+"бит — в черные."
+
+msgid ""
+"Creates a bitmap with the specified size, filled with [code]false[/code]."
+msgstr ""
+"Создает растровое изображение указанного размера, заполненное [code]false[/"
+"code]."
+
+msgid ""
+"Creates a bitmap that matches the given image dimensions, every element of "
+"the bitmap is set to [code]false[/code] if the alpha value of the image at "
+"that position is equal to [param threshold] or less, and [code]true[/code] in "
+"other case."
+msgstr ""
+"Создает растровое изображение, которое соответствует заданным размерам "
+"изображения. Каждому элементу растрового изображения присваивается значение "
+"[code]false[/code], если альфа-значение изображения в этой позиции равно "
+"[порогу параметра] или меньше, и [code]true[/code] в противном случае."
+
+msgid "Returns bitmap's value at the specified position."
+msgstr "Возвращает значение растрового изображения в указанной позиции."
+
+msgid "Returns bitmap's dimensions."
+msgstr "Возвращает размеры изображения."
+
+msgid ""
+"Applies morphological dilation or erosion to the bitmap. If [param pixels] is "
+"positive, dilation is applied to the bitmap. If [param pixels] is negative, "
+"erosion is applied to the bitmap. [param rect] defines the area where the "
+"morphological operation is applied. Pixels located outside the [param rect] "
+"are unaffected by [method grow_mask]."
+msgstr ""
+"Применяет морфологическое расширение или эрозию к битовой карте. Если [param "
+"pixels] положительный, к битовой карте применяется расширение. Если [param "
+"pixels] отрицательный, к битовой карте применяется эрозия. [param rect] "
+"определяет область, к которой применяется морфологическая операция. Пиксели, "
+"расположенные за пределами [param rect], не затрагиваются [method grow_mask]."
+
+msgid ""
+"Creates an [Array] of polygons covering a rectangular portion of the bitmap. "
+"It uses a marching squares algorithm, followed by Ramer-Douglas-Peucker (RDP) "
+"reduction of the number of vertices. Each polygon is described as a "
+"[PackedVector2Array] of its vertices.\n"
+"To get polygons covering the whole bitmap, pass:\n"
+"[codeblock]\n"
+"Rect2(Vector2(), get_size())\n"
+"[/codeblock]\n"
+"[param epsilon] is passed to RDP to control how accurately the polygons cover "
+"the bitmap: a lower [param epsilon] corresponds to more points in the "
+"polygons."
+msgstr ""
+"Создает [Array] полигонов, покрывающих прямоугольную часть битовой карты. Он "
+"использует алгоритм марширующих квадратов, за которым следует сокращение "
+"числа вершин по Рамеру-Дугласу-Пейкеру (RDP). Каждый полигон описывается как "
+"[PackedVector2Array] его вершин.\n"
+"Чтобы получить полигоны, покрывающие всю битовую карту, передайте:\n"
+"[codeblock]\n"
+"Rect2(Vector2(), get_size())\n"
+"[/codeblock]\n"
+"[param epsilon] передается в RDP для управления точностью покрытия битовой "
+"карты полигонами: более низкий [param epsilon] соответствует большему "
+"количеству точек в полигонах."
+
+msgid ""
+"Sets the bitmap's element at the specified position, to the specified value."
+msgstr ""
+"Устанавливает элемент растрового изображения в указанной позиции в указанное "
+"значение."
+
+msgid "Sets a rectangular portion of the bitmap to the specified value."
+msgstr ""
+"Устанавливает прямоугольную часть растрового изображения на указанное "
+"значение."
+
+msgid "A joint used with [Skeleton2D] to control and animate other nodes."
+msgstr ""
+"Соединение, используемое совместно с [Skeleton2D] для управления и анимации "
+"других узлов."
+
+msgid ""
+"A hierarchy of [Bone2D]s can be bound to a [Skeleton2D] to control and "
+"animate other [Node2D] nodes.\n"
+"You can use [Bone2D] and [Skeleton2D] nodes to animate 2D meshes created with "
+"the [Polygon2D] UV editor.\n"
+"Each bone has a [member rest] transform that you can reset to with [method "
+"apply_rest]. These rest poses are relative to the bone's parent.\n"
+"If in the editor, you can set the rest pose of an entire skeleton using a "
+"menu option, from the code, you need to iterate over the bones to set their "
+"individual rest poses."
+msgstr ""
+"Иерархию [Bone2D] можно привязать к [Skeleton2D] для управления и анимации "
+"других узлов [Node2D].\n"
+"Вы можете использовать узлы [Bone2D] и [Skeleton2D] для анимации 2D-сеток, "
+"созданных с помощью UV-редактора [Polygon2D].\n"
+"У каждой кости есть преобразование [member rest], которое можно сбросить с "
+"помощью [method apply_rest]. Эти позы покоя относятся к родительской кости.\n"
+"Если в редакторе вы можете задать позу покоя всего скелета с помощью пункта "
+"меню, из кода вам нужно будет перебрать кости, чтобы задать их индивидуальные "
+"позы покоя."
+
+msgid ""
+"Returns whether this [Bone2D] is going to autocalculate its length and bone "
+"angle using its first [Bone2D] child node, if one exists. If there are no "
+"[Bone2D] children, then it cannot autocalculate these values and will print a "
+"warning."
+msgstr ""
+"Возвращает, будет ли этот [Bone2D] автоматически вычислять свою длину и угол "
+"кости, используя свой первый дочерний узел [Bone2D], если таковой существует. "
+"Если дочерних узлов [Bone2D] нет, то он не может автоматически вычислить эти "
+"значения и выведет предупреждение."
+
+msgid ""
+"Returns the angle of the bone in the [Bone2D].\n"
+"[b]Note:[/b] This is different from the [Bone2D]'s rotation. The bone's angle "
+"is the rotation of the bone shown by the gizmo, which is unaffected by the "
+"[Bone2D]'s [member Node2D.transform]."
+msgstr ""
+"Возвращает угол кости в [Bone2D].\n"
+"[b]Примечание:[/b] Это отличается от поворота [Bone2D]. Угол кости — это "
+"поворот кости, показанный гизмо (gizmo), на который не влияет [member Node2D."
+"transform] [Bone2D]."
+
+msgid ""
+"Returns the node's index as part of the entire skeleton. See [Skeleton2D]."
+msgstr "Возвращает индекс узла как часть всего скелета. См. [Skeleton2D]."
+
+msgid ""
+"Returns the node's [member rest] [Transform2D] if it doesn't have a parent, "
+"or its rest pose relative to its parent."
+msgstr ""
+"Возвращает [member rest] [Transform2D] узла, если у него нет родителя, или "
+"его позу покоя относительно родителя."
+
+msgid ""
+"When set to [code]true[/code], the [Bone2D] node will attempt to "
+"automatically calculate the bone angle and length using the first child "
+"[Bone2D] node, if one exists. If none exist, the [Bone2D] cannot "
+"automatically calculate these values and will print a warning."
+msgstr ""
+"Если установлено значение [code]true[/code], узел [Bone2D] попытается "
+"автоматически рассчитать угол и длину кости, используя первый дочерний узел "
+"[Bone2D], если таковой существует. Если таковых нет, [Bone2D] не сможет "
+"автоматически рассчитать эти значения и выведет предупреждение."
+
+msgid ""
+"Sets the bone angle for the [Bone2D]. This is typically set to the rotation "
+"from the [Bone2D] to a child [Bone2D] node.\n"
+"[b]Note:[/b] This is different from the [Bone2D]'s rotation. The bone's angle "
+"is the rotation of the bone shown by the gizmo, which is unaffected by the "
+"[Bone2D]'s [member Node2D.transform]."
+msgstr ""
+"Устанавливает угол кости для [Bone2D]. Обычно устанавливается на поворот от "
+"[Bone2D] к дочернему узлу [Bone2D].\n"
+"[b]Примечание:[/b] Это отличается от поворота [Bone2D]. Угол кости — это "
+"поворот кости, показанный гизмо (gizmo), на который не влияет [member Node2D."
+"transform] [Bone2D]."
+
+msgid ""
+"Rest transform of the bone. You can reset the node's transforms to this value "
+"using [method apply_rest]."
+msgstr ""
+"Остаточное преобразование кости. Вы можете сбросить преобразования узла на "
+"это значение, используя [метод apply_rest]."
+
+msgid ""
+"А node that dynamically copies or overrides the 3D transform of a bone in its "
+"parent [Skeleton3D]."
+msgstr ""
+"Узел, который динамически копирует или переопределяет 3D-преобразование кости "
+"в ее родителе [Skeleton3D]."
+
+msgid ""
+"This node selects a bone in a [Skeleton3D] and attaches to it. This means "
+"that the [BoneAttachment3D] node will either dynamically copy or override the "
+"3D transform of the selected bone."
+msgstr ""
+"Этот узел выбирает кость в [Skeleton3D] и присоединяется к ней. Это означает, "
+"что узел [BoneAttachment3D] будет либо динамически копировать, либо "
+"переопределять 3D-преобразование выбранной кости."
+
+msgid ""
+"Returns the [NodePath] to the external [Skeleton3D] node, if one has been set."
+msgstr "Возвращает [NodePath] к внешнему узлу [Skeleton3D], если он был задан."
+
+msgid "Get parent or external [Skeleton3D] node if found."
+msgstr "Получить родительский или внешний узел [Skeleton3D], если он найден."
+
+msgid ""
+"Returns whether the BoneAttachment3D node is using an external [Skeleton3D] "
+"rather than attempting to use its parent node as the [Skeleton3D]."
+msgstr ""
+"Возвращает, использует ли узел BoneAttachment3D внешний [Skeleton3D] вместо "
+"попытки использовать свой родительский узел в качестве [Skeleton3D]."
+
+msgid ""
+"A function that is called automatically when the [Skeleton3D] is updated. "
+"This function is where the [BoneAttachment3D] node updates its position so it "
+"is correctly bound when it is [i]not[/i] set to override the bone pose."
+msgstr ""
+"Функция, которая вызывается автоматически при обновлении [Skeleton3D]. Эта "
+"функция — то, где узел [BoneAttachment3D] обновляет свое положение, чтобы оно "
+"было правильно привязано, когда он [i]не[/i] настроен на переопределение позы "
+"кости."
+
+msgid ""
+"Sets the [NodePath] to the external skeleton that the BoneAttachment3D node "
+"should use. See [method set_use_external_skeleton] to enable the external "
+"[Skeleton3D] node."
+msgstr ""
+"Устанавливает [NodePath] на внешний скелет, который должен использовать узел "
+"BoneAttachment3D. См. [method set_use_external_skeleton], чтобы включить "
+"внешний узел [Skeleton3D]."
+
+msgid ""
+"Sets whether the BoneAttachment3D node will use an external [Skeleton3D] node "
+"rather than attempting to use its parent node as the [Skeleton3D]. When set "
+"to [code]true[/code], the BoneAttachment3D node will use the external "
+"[Skeleton3D] node set in [method set_external_skeleton]."
+msgstr ""
+"Устанавливает, будет ли узел BoneAttachment3D использовать внешний узел "
+"[Skeleton3D] вместо попытки использовать его родительский узел как "
+"[Skeleton3D]. Если установлено значение [code]true[/code], узел "
+"BoneAttachment3D будет использовать внешний узел [Skeleton3D], установленный "
+"в [method set_external_skeleton]."
+
+msgid "The name of the attached bone."
+msgstr "Название прикрепленной кости."
+
+msgid ""
+"Whether the BoneAttachment3D node will override the bone pose of the bone it "
+"is attached to. When set to [code]true[/code], the BoneAttachment3D node can "
+"change the pose of the bone. When set to [code]false[/code], the "
+"BoneAttachment3D will always be set to the bone's transform.\n"
+"[b]Note:[/b] This override performs interruptively in the skeleton update "
+"process using signals due to the old design. It may cause unintended behavior "
+"when used at the same time with [SkeletonModifier3D]."
+msgstr ""
+"Будет ли узел BoneAttachment3D переопределять позу кости, к которой он "
+"прикреплен. Если установлено значение [code]true[/code], узел "
+"BoneAttachment3D может изменить позу кости. Если установлено значение "
+"[code]false[/code], BoneAttachment3D всегда будет устанавливаться на "
+"преобразование кости.\n"
+"[b]Примечание:[/b] Это переопределение выполняется прерывающимся образом в "
+"процессе обновления скелета с использованием сигналов из-за старого дизайна. "
+"Это может вызвать непреднамеренное поведение при одновременном использовании "
+"с [SkeletonModifier3D]."
+
+msgid ""
+"Describes a mapping of bone names for retargeting [Skeleton3D] into common "
+"names defined by a [SkeletonProfile]."
+msgstr ""
+"Описывает сопоставление названий костей для перенацеливания [Skeleton3D] на "
+"общие названия, определяемые [SkeletonProfile]."
+
+msgid ""
+"This class contains a dictionary that uses a list of bone names in "
+"[SkeletonProfile] as key names.\n"
+"By assigning the actual [Skeleton3D] bone name as the key value, it maps the "
+"[Skeleton3D] to the [SkeletonProfile]."
+msgstr ""
+"Этот класс содержит словарь, который использует список имен костей в "
+"[SkeletonProfile] в качестве имен ключей.\n"
+"Назначая фактическое имя кости [Skeleton3D] в качестве значения ключа, он "
+"сопоставляет [Skeleton3D] с [SkeletonProfile]."
+
+msgid "Retargeting 3D Skeletons"
+msgstr "Ретаргетинг 3D-скелетов"
+
+msgid ""
+"Returns a profile bone name having [param skeleton_bone_name]. If not found, "
+"an empty [StringName] will be returned.\n"
+"In the retargeting process, the returned bone name is the bone name of the "
+"target skeleton."
+msgstr ""
+"Возвращает имя кости профиля, имеющее [param skeleton_bone_name]. Если не "
+"найдено, будет возвращено пустое [StringName].\n"
+"В процессе перенацеливания возвращаемое имя кости — это имя кости целевого "
+"скелета."
+
+msgid ""
+"Returns a skeleton bone name is mapped to [param profile_bone_name].\n"
+"In the retargeting process, the returned bone name is the bone name of the "
+"source skeleton."
+msgstr ""
+"Возвращает имя кости скелета, сопоставленное с [param profile_bone_name].\n"
+"В процессе перенацеливания возвращаемое имя кости является именем кости "
+"исходного скелета."
+
+msgid ""
+"Maps a skeleton bone name to [param profile_bone_name].\n"
+"In the retargeting process, the setting bone name is the bone name of the "
+"source skeleton."
+msgstr ""
+"Сопоставляет имя кости скелета с [param profile_bone_name].\n"
+"В процессе перенацеливания имя кости настройки — это имя кости исходного "
+"скелета."
+
+msgid ""
+"A [SkeletonProfile] of the mapping target. Key names in the [BoneMap] are "
+"synchronized with it."
+msgstr ""
+"[SkeletonProfile] цели отображения. Ключевые имена в [BoneMap] "
+"синхронизированы с ним."
+
+msgid ""
+"This signal is emitted when change the key value in the [BoneMap]. This is "
+"used to validate mapping and to update [BoneMap] editor."
+msgstr ""
+"Этот сигнал выдается при изменении значения ключа в [BoneMap]. Он "
+"используется для проверки сопоставления и обновления редактора [BoneMap]."
+
+msgid ""
+"This signal is emitted when change the value in profile or change the "
+"reference of profile. This is used to update key names in the [BoneMap] and "
+"to redraw the [BoneMap] editor."
+msgstr ""
+"Этот сигнал выдается при изменении значения в профиле или изменении ссылки на "
+"профиль. Он используется для обновления имен ключей в [BoneMap] и для "
+"перерисовки редактора [BoneMap]."
+
+msgid "A built-in boolean type."
+msgstr "Встроенный логический тип."
+
+msgid ""
+"The [bool] is a built-in [Variant] type that may only store one of two "
+"values: [code]true[/code] or [code]false[/code]. You can imagine it as a "
+"switch that can be either turned on or off, or as a binary digit that can "
+"either be 1 or 0.\n"
+"Booleans can be directly used in [code]if[/code], and other conditional "
+"statements:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var can_shoot = true\n"
+"if can_shoot:\n"
+"    launch_bullet()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"bool canShoot = true;\n"
+"if (canShoot)\n"
+"{\n"
+"    LaunchBullet();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"All comparison operators return booleans ([code]==[/code], [code]>[/code], "
+"[code]<=[/code], etc.). As such, it is not necessary to compare booleans "
+"themselves. You do not need to add [code]== true[/code] or [code]== false[/"
+"code].\n"
+"Booleans can be combined with the logical operators [code]and[/code], "
+"[code]or[/code], [code]not[/code] to create complex conditions:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"if bullets > 0 and not is_reloading():\n"
+"    launch_bullet()\n"
+"\n"
+"if bullets == 0 or is_reloading():\n"
+"    play_clack_sound()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"if (bullets > 0 && !IsReloading())\n"
+"{\n"
+"    LaunchBullet();\n"
+"}\n"
+"\n"
+"if (bullets == 0 || IsReloading())\n"
+"{\n"
+"    PlayClackSound();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] In modern programming languages, logical operators are evaluated "
+"in order. All remaining conditions are skipped if their result would have no "
+"effect on the final value. This concept is known as [url=https://en.wikipedia."
+"org/wiki/Short-circuit_evaluation]short-circuit evaluation[/url] and can be "
+"useful to avoid evaluating expensive conditions in some performance-critical "
+"cases.\n"
+"[b]Note:[/b] By convention, built-in methods and properties that return "
+"booleans are usually defined as yes-no questions, single adjectives, or "
+"similar ([method String.is_empty], [method Node.can_process], [member "
+"Camera2D.enabled], etc.)."
+msgstr ""
+"[bool] — это встроенный тип [Variant], который может хранить только одно из "
+"двух значений: [code]true[/code] или [code]false[/code]. Вы можете "
+"представить его как переключатель, который может быть включен или выключен, "
+"или как двоичную цифру, которая может быть 1 или 0.\n"
+"Булевы значения можно напрямую использовать в [code]if[/code] и других "
+"условных операторах:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var can_shoot = true\n"
+"if can_shoot:\n"
+"    launch_bullet()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"bool canShoot = true;\n"
+"if (canShoot)\n"
+"{\n"
+"    LaunchBullet();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Все операторы сравнения возвращают логические значения ([code]==[/code], "
+"[code]>[/code], [code]<=[/code] и т. д.). Таким образом, нет необходимости "
+"сравнивать сами логические значения. Вам не нужно добавлять [code]== true[/"
+"code] или [code]== false[/code].\n"
+"Логические значения можно комбинировать с логическими операторами [code]and[/"
+"code], [code]or[/code], [code]not[/code] для создания сложных условий:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"if bullets > 0 and not is_reloading():\n"
+"    launch_bullet()\n"
+"\n"
+"if bullets == 0 or is_reloading():\n"
+"    play_clack_sound()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"if (bullets > 0 && !IsReloading())\n"
+"{\n"
+"    LaunchBullet();\n"
+"}\n"
+"\n"
+"if (bullets == 0 || IsReloading())\n"
+"{\n"
+"    PlayClackSound();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] В современных языках программирования логические операторы "
+"оцениваются по порядку. Все оставшиеся условия пропускаются, если их "
+"результат не повлияет на конечное значение. Эта концепция известна как "
+"[url=https://en.wikipedia.org/wiki/Short-circuit_evaluation]оценка короткого "
+"замыкания[/url] и может быть полезна для избежания оценки дорогостоящих "
+"условий в некоторых критических для производительности случаях.\n"
+"[b]Примечание:[/b] По соглашению встроенные методы и свойства, возвращающие "
+"логические значения, обычно определяются как вопросы типа «да-нет», отдельные "
+"прилагательные или тому подобное ([method String.is_empty], [method Node."
+"can_process], [member Camera2D.enabled] и т. д.)."
+
+msgid ""
+"Cast a [float] value to a boolean value. Returns [code]false[/code] if [param "
+"from] is equal to [code]0.0[/code] (including [code]-0.0[/code]), and "
+"[code]true[/code] for all other values (including [constant @GDScript.INF] "
+"and [constant @GDScript.NAN])."
+msgstr ""
+"Привести значение [float] к логическому значению. Возвращает [code]false[/"
+"code], если [param from] равен [code]0.0[/code] (включая [code]-0.0[/code]), "
+"и [code]true[/code] для всех других значений (включая [constant @GDScript."
+"INF] и [constant @GDScript.NAN])."
+
+msgid ""
+"Cast an [int] value to a boolean value. Returns [code]false[/code] if [param "
+"from] is equal to [code]0[/code], and [code]true[/code] for all other values."
+msgstr ""
+"Привести значение [int] к логическому значению. Возвращает [code]false[/"
+"code], если [param from] равен [code]0[/code], и [code]true[/code] для всех "
+"остальных значений."
+
+msgid "A container that arranges its child controls horizontally or vertically."
+msgstr ""
+"Контейнер, который располагает свои дочерние элементы управления "
+"горизонтально или вертикально."
+
+msgid ""
+"A container that arranges its child controls horizontally or vertically, "
+"rearranging them automatically when their minimum size changes."
+msgstr ""
+"Контейнер, который располагает свои дочерние элементы управления "
+"горизонтально или вертикально, автоматически перестраивая их при изменении их "
+"минимального размера."
+
+msgid ""
+"Adds a [Control] node to the box as a spacer. If [param begin] is [code]true[/"
+"code], it will insert the [Control] node in front of all other children."
+msgstr ""
+"Добавляет узел [Control] в поле в качестве разделителя. Если [param begin] "
+"равен [code]true[/code], он вставит узел [Control] перед всеми остальными "
+"дочерними элементами."
+
+msgid ""
+"The alignment of the container's children (must be one of [constant "
+"ALIGNMENT_BEGIN], [constant ALIGNMENT_CENTER], or [constant ALIGNMENT_END])."
+msgstr ""
+"Выравнивание дочерних элементов контейнера (должно быть одним из [константа "
+"ALIGNMENT_BEGIN], [константа ALIGNMENT_CENTER] или [константа ALIGNMENT_END])."
+
+msgid ""
+"If [code]true[/code], the [BoxContainer] will arrange its children "
+"vertically, rather than horizontally.\n"
+"Can't be changed when using [HBoxContainer] and [VBoxContainer]."
+msgstr ""
+"Если [code]true[/code], [BoxContainer] расположит свои дочерние элементы "
+"вертикально, а не горизонтально.\n"
+"Нельзя изменить при использовании [HBoxContainer] и [VBoxContainer]."
+
+msgid ""
+"The child controls will be arranged at the beginning of the container, i.e. "
+"top if orientation is vertical, left if orientation is horizontal (right for "
+"RTL layout)."
+msgstr ""
+"Дочерние элементы управления будут расположены в начале контейнера, т. е. "
+"сверху, если ориентация вертикальная, слева, если ориентация горизонтальная "
+"(справа для макета RTL)."
+
+msgid "The child controls will be centered in the container."
+msgstr "Дочерние элементы управления будут размещены в центре контейнера."
+
+msgid ""
+"The child controls will be arranged at the end of the container, i.e. bottom "
+"if orientation is vertical, right if orientation is horizontal (left for RTL "
+"layout)."
+msgstr ""
+"Дочерние элементы управления будут располагаться в конце контейнера, т. е. "
+"внизу, если ориентация вертикальная, справа, если ориентация горизонтальная "
+"(слева для макета RTL)."
+
+msgid "The space between the [BoxContainer]'s elements, in pixels."
+msgstr "Расстояние между элементами [BoxContainer] в пикселях."
+
+msgid "Generate an axis-aligned box [PrimitiveMesh]."
+msgstr "Создаёт выровненный по осям куб [PrimitiveMesh]."
+
+msgid ""
+"Generate an axis-aligned box [PrimitiveMesh].\n"
+"The box's UV layout is arranged in a 3×2 layout that allows texturing each "
+"face individually. To apply the same texture on all faces, change the "
+"material's UV property to [code]Vector3(3, 2, 1)[/code]. This is equivalent "
+"to adding [code]UV *= vec2(3.0, 2.0)[/code] in a vertex shader.\n"
+"[b]Note:[/b] When using a large textured [BoxMesh] (e.g. as a floor), you may "
+"stumble upon UV jittering issues depending on the camera angle. To solve "
+"this, increase [member subdivide_depth], [member subdivide_height] and "
+"[member subdivide_width] until you no longer notice UV jittering."
+msgstr ""
+"Создайте выровненный по осям ящик [PrimitiveMesh].\n"
+"UV-макет ящика организован в макете 3×2, что позволяет текстурировать каждую "
+"грань по отдельности. Чтобы применить одну и ту же текстуру ко всем граням, "
+"измените свойство UV материала на [code]Vector3(3, 2, 1)[/code]. Это "
+"эквивалентно добавлению [code]UV *= vec2(3.0, 2.0)[/code] в вершинный "
+"шейдер.\n"
+"[b]Примечание:[/b] При использовании большого текстурированного [BoxMesh] "
+"(например, в качестве пола) вы можете столкнуться с проблемами дрожания UV в "
+"зависимости от угла камеры. Чтобы решить эту проблему, увеличивайте [member "
+"subdivide_depth], [member subdivide_height] и [member subdivide_width] до тех "
+"пор, пока вы не перестанете замечать дрожание UV."
+
+msgid "The box's width, height and depth."
+msgstr "Ширина, высота и глубина коробки."
+
+msgid "Number of extra edge loops inserted along the Z axis."
+msgstr "Количество дополнительных краевых петель, вставленных вдоль оси Z."
+
+msgid "Number of extra edge loops inserted along the Y axis."
+msgstr "Количество дополнительных краевых петель, вставленных вдоль оси Y."
+
+msgid "Number of extra edge loops inserted along the X axis."
+msgstr "Количество дополнительных краевых петель, вставленных вдоль оси X."
+
+msgid "Cuboid shape for use with occlusion culling in [OccluderInstance3D]."
+msgstr ""
+"Кубовидная форма для использования с отбраковкой окклюзии в "
+"[OccluderInstance3D]."
+
+msgid ""
+"[BoxOccluder3D] stores a cuboid shape that can be used by the engine's "
+"occlusion culling system.\n"
+"See [OccluderInstance3D]'s documentation for instructions on setting up "
+"occlusion culling."
+msgstr ""
+"[BoxOccluder3D] хранит кубоидную форму, которую может использовать система "
+"отсечения окклюзии движка.\n"
+"Инструкции по настройке отсечения окклюзии см. в документации "
+"[OccluderInstance3D]."
+
+msgid "The box's size in 3D units."
+msgstr "Размер коробки в 3D-единицах."
+
+msgid "A 3D box shape used for physics collision."
+msgstr "Трехмерная форма куба, используемая для физического столкновения."
+
+msgid ""
+"A 3D box shape, intended for use in physics. Usually used to provide a shape "
+"for a [CollisionShape3D].\n"
+"[b]Performance:[/b] [BoxShape3D] is fast to check collisions against. It is "
+"faster than [CapsuleShape3D] and [CylinderShape3D], but slower than "
+"[SphereShape3D]."
+msgstr ""
+"Форма 3D-коробки, предназначенная для использования в физике. Обычно "
+"используется для предоставления формы для [CollisionShape3D].\n"
+"[b]Производительность:[/b] [BoxShape3D] быстро проверяет столкновения. Он "
+"быстрее, чем [CapsuleShape3D] и [CylinderShape3D], но медленнее, чем "
+"[SphereShape3D]."
+
+msgid "3D Kinematic Character Demo"
+msgstr "Демонстрация 3D-кинематического персонажа"
+
+msgid "A themed button that can contain text and an icon."
+msgstr "Тематическая кнопка, которая может содержать текст и значок."
+
+msgid "Operating System Testing Demo"
+msgstr "Демонстрация тестирования операционной системы"
+
+msgid ""
+"Text alignment policy for the button's text, use one of the [enum "
+"HorizontalAlignment] constants."
+msgstr ""
+"Политика выравнивания текста кнопки использует одну из констант [enum "
+"HorizontalAlignment]."
+
+msgid ""
+"If set to something other than [constant TextServer.AUTOWRAP_OFF], the text "
+"gets wrapped inside the node's bounding rectangle."
+msgstr ""
+"Если задано значение, отличное от [constant TextServer.AUTOWRAP_OFF], текст "
+"будет заключен внутри ограничивающего прямоугольника узла."
+
+msgid ""
+"If [code]true[/code], text that is too large to fit the button is clipped "
+"horizontally. If [code]false[/code], the button will always be wide enough to "
+"hold the text. The text is not vertically clipped, and the button's height is "
+"not affected by this property."
+msgstr ""
+"Если [code]true[/code], текст, который слишком велик для кнопки, обрезается "
+"по горизонтали. Если [code]false[/code], кнопка всегда будет достаточно "
+"широкой, чтобы вместить текст. Текст не обрезается по вертикали, и высота "
+"кнопки не зависит от этого свойства."
+
+msgid ""
+"When enabled, the button's icon will expand/shrink to fit the button's size "
+"while keeping its aspect. See also [theme_item icon_max_width]."
+msgstr ""
+"При включении значок кнопки будет расширяться/уменьшаться, чтобы "
+"соответствовать размеру кнопки, сохраняя при этом ее аспект. См. также "
+"[theme_item icon_max_width]."
+
+msgid "Flat buttons don't display decoration."
+msgstr "Плоские кнопки не имеющие декора."
+
+msgid ""
+"Button's icon, if text is present the icon will be placed before the text.\n"
+"To edit margin and spacing of the icon, use [theme_item h_separation] theme "
+"property and [code]content_margin_*[/code] properties of the used "
+"[StyleBox]es."
+msgstr ""
+"Значок кнопки, если текст присутствует, значок будет помещен перед текстом.\n"
+"Чтобы изменить поле и интервал значка, используйте свойство темы [theme_item "
+"h_separation] и свойства [code]content_margin_*[/code] используемых "
+"[StyleBox]es."
+
+msgid ""
+"Specifies if the icon should be aligned horizontally to the left, right, or "
+"center of a button. Uses the same [enum HorizontalAlignment] constants as the "
+"text alignment. If centered horizontally and vertically, text will draw on "
+"top of the icon."
+msgstr ""
+"Указывает, должен ли значок быть выровнен горизонтально по левому, правому "
+"или центру кнопки. Использует те же константы [enum HorizontalAlignment], что "
+"и выравнивание текста. Если центрировать по горизонтали и вертикали, текст "
+"будет отрисован поверх значка."
+
+msgid ""
+"Language code used for line-breaking and text shaping algorithms, if left "
+"empty current locale is used instead."
+msgstr ""
+"Код языка, используемый для алгоритмов переноса строк и формирования текста. "
+"Если оставить его пустым, вместо него будет использоваться текущая локаль "
+"(место действия)."
+
+msgid "The button's text that will be displayed inside the button's area."
+msgstr "Текст кнопки, который будет отображаться внутри области кнопки."
+
+msgid "Base text writing direction."
+msgstr "Направление написания базового текста."
+
+msgid ""
+"Sets the clipping behavior when the text exceeds the node's bounding "
+"rectangle. See [enum TextServer.OverrunBehavior] for a description of all "
+"modes."
+msgstr ""
+"Устанавливает поведение обрезки, когда текст выходит за пределы "
+"ограничивающего прямоугольника узла. См. [enum TextServer.OverrunBehavior] "
+"для описания всех режимов."
+
+msgid ""
+"Specifies if the icon should be aligned vertically to the top, bottom, or "
+"center of a button. Uses the same [enum VerticalAlignment] constants as the "
+"text alignment. If centered horizontally and vertically, text will draw on "
+"top of the icon."
+msgstr ""
+"Указывает, должен ли значок быть выровнен вертикально по верху, низу или "
+"центру кнопки. Использует те же константы [enum VerticalAlignment], что и "
+"выравнивание текста. Если центрировать по горизонтали и вертикали, текст "
+"будет отрисован поверх значка."
+
+msgid "Default text [Color] of the [Button]."
+msgstr "Текст по умолчанию [Цвет] [Кнопки]."
+
+msgid "Text [Color] used when the [Button] is disabled."
+msgstr "Текст [Цвет] используется, когда [Кнопка] отключена."
+
+msgid ""
+"Text [Color] used when the [Button] is focused. Only replaces the normal text "
+"color of the button. Disabled, hovered, and pressed states take precedence "
+"over this color."
+msgstr ""
+"Текст [Цвет], используемый, когда [Кнопка] находится в фокусе. Заменяет "
+"только обычный цвет текста кнопки. Отключенные, наведенные и нажатые "
+"состояния имеют приоритет над этим цветом."
+
+msgid "Text [Color] used when the [Button] is being hovered."
+msgstr "Текст [Цвет], используемый при наведении курсора на [Кнопку]."
+
+msgid "Text [Color] used when the [Button] is being pressed."
+msgstr "Текст [Цвет], используемый при нажатии [Кнопки]."
+
+msgid "Icon modulate [Color] used when the [Button] is disabled."
+msgstr "Значок модуляции [Цвета] используется, когда [Кнопка] отключена."
+
+msgid ""
+"Icon modulate [Color] used when the [Button] is focused. Only replaces the "
+"normal modulate color of the button. Disabled, hovered, and pressed states "
+"take precedence over this color."
+msgstr ""
+"Значок modulate [Color] используется, когда [Button] находится в фокусе. "
+"Заменяет только обычный цвет modulate кнопки. Отключенные, наведенные и "
+"нажатые состояния имеют приоритет над этим цветом."
+
+msgid "Icon modulate [Color] used when the [Button] is being hovered."
+msgstr ""
+"Значок модуляции [Цвета], используемый при наведении курсора на [Кнопку]."
+
+msgid ""
+"Icon modulate [Color] used when the [Button] is being hovered and pressed."
+msgstr ""
+"Значок модуляции [Цвета], используемый при наведении и нажатии [Кнопки]."
+
+msgid "Default icon modulate [Color] of the [Button]."
+msgstr "Значок по умолчанию модулирует [Цвет] [Кнопки]."
+
+msgid ""
+"This constant acts as a boolean. If [code]true[/code], the minimum size of "
+"the button and text/icon alignment is always based on the largest stylebox "
+"margins, otherwise it's based on the current button state stylebox margins."
+msgstr ""
+"Эта константа действует как логическое значение. Если [code]true[/code], "
+"минимальный размер кнопки и выравнивание текста/значка всегда основаны на "
+"самых больших полях stylebox, в противном случае они основаны на полях "
+"stylebox текущего состояния кнопки."
+
+msgid ""
+"The horizontal space between [Button]'s icon and text. Negative values will "
+"be treated as [code]0[/code] when used."
+msgstr ""
+"Горизонтальное пространство между значком [Button] и текстом. Отрицательные "
+"значения будут рассматриваться как [code]0[/code] при использовании."
+
+msgid ""
+"The maximum allowed width of the [Button]'s icon. This limit is applied on "
+"top of the default size of the icon, or its expanded size if [member "
+"expand_icon] is [code]true[/code]. The height is adjusted according to the "
+"icon's ratio. If the button has additional icons (e.g. [CheckBox]), they will "
+"also be limited."
+msgstr ""
+"Максимально допустимая ширина значка [Button]. Это ограничение применяется "
+"поверх размера значка по умолчанию или его расширенного размера, если [member "
+"expand_icon] равно [code]true[/code]. Высота регулируется в соответствии с "
+"соотношением значка. Если у кнопки есть дополнительные значки (например, "
+"[CheckBox]), они также будут ограничены."
+
+msgid ""
+"Additional vertical spacing between lines (in pixels), spacing is added to "
+"line descent. This value can be negative."
+msgstr ""
+"Дополнительный вертикальный интервал между строками (в пикселях), интервал "
+"добавляется к спуску строки. Это значение может быть отрицательным."
+
+msgid ""
+"The size of the text outline.\n"
+"[b]Note:[/b] If using a font with [member FontFile."
+"multichannel_signed_distance_field] enabled, its [member FontFile."
+"msdf_pixel_range] must be set to at least [i]twice[/i] the value of "
+"[theme_item outline_size] for outline rendering to look correct. Otherwise, "
+"the outline may appear to be cut off earlier than intended."
+msgstr ""
+"Размер контура текста.\n"
+"[b]Примечание:[/b] При использовании шрифта с включенным [member FontFile."
+"multichannel_signed_distance_field] его [member FontFile.msdf_pixel_range] "
+"должен быть установлен как минимум в [i]дважды[/i] значения [theme_item "
+"outline_size], чтобы контур выглядел правильно. В противном случае контур "
+"может оказаться обрезанным раньше, чем предполагалось."
+
+msgid "[Font] of the [Button]'s text."
+msgstr "[Шрифт] текста [Кнопки]."
+
+msgid ""
+"Default icon for the [Button]. Appears only if [member icon] is not assigned."
+msgstr ""
+"Значок по умолчанию для [Кнопки]. Появляется только если [значок участника] "
+"не назначен."
+
+msgid "[StyleBox] used when the [Button] is disabled."
+msgstr "[StyleBox] используется, когда [Button] отключена."
+
+msgid ""
+"[StyleBox] used when the [Button] is focused. The [theme_item focus] "
+"[StyleBox] is displayed [i]over[/i] the base [StyleBox], so a partially "
+"transparent [StyleBox] should be used to ensure the base [StyleBox] remains "
+"visible. A [StyleBox] that represents an outline or an underline works well "
+"for this purpose. To disable the focus visual effect, assign a "
+"[StyleBoxEmpty] resource. Note that disabling the focus visual effect will "
+"harm keyboard/controller navigation usability, so this is not recommended for "
+"accessibility reasons."
+msgstr ""
+"[StyleBox] используется, когда [Button] находится в фокусе. [Theme_item "
+"focus] [StyleBox] отображается [i]над[/i] базовым [StyleBox], поэтому следует "
+"использовать частично прозрачный [StyleBox], чтобы базовый [StyleBox] "
+"оставался видимым. [StyleBox], представляющий контур или подчеркивание, "
+"хорошо подходит для этой цели. Чтобы отключить визуальный эффект фокуса, "
+"назначьте ресурс [StyleBoxEmpty]. Обратите внимание, что отключение "
+"визуального эффекта фокуса навредит удобству использования навигации с "
+"помощью клавиатуры/контроллера, поэтому это не рекомендуется по соображениям "
+"доступности."
+
+msgid "[StyleBox] used when the [Button] is being hovered."
+msgstr "[StyleBox] используется при наведении курсора на [Кнопку]."
+
+msgid ""
+"[StyleBox] used when the [Button] is being pressed and hovered at the same "
+"time (for right-to-left layouts)."
+msgstr ""
+"[StyleBox] используется при одновременном нажатии и наведении курсора на "
+"[Кнопка] (для макетов с направлением справа налево)."
+
+msgid "Default [StyleBox] for the [Button]."
+msgstr "[StyleBox] по умолчанию для [Кнопки]."
+
+msgid "Default [StyleBox] for the [Button] (for right-to-left layouts)."
+msgstr "[StyleBox] по умолчанию для [Кнопки] (для макетов справа налево)."
+
+msgid "[StyleBox] used when the [Button] is being pressed."
+msgstr "[StyleBox] используется при нажатии [Кнопки]."
+
+msgid ""
+"A group of buttons that doesn't allow more than one button to be pressed at a "
+"time."
+msgstr "Группа кнопок, не позволяющая нажимать более одной кнопки одновременно."
+
+msgid ""
+"A group of [BaseButton]-derived buttons. The buttons in a [ButtonGroup] are "
+"treated like radio buttons: No more than one button can be pressed at a time. "
+"Some types of buttons (such as [CheckBox]) may have a special appearance in "
+"this state.\n"
+"Every member of a [ButtonGroup] should have [member BaseButton.toggle_mode] "
+"set to [code]true[/code]."
+msgstr ""
+"Группа кнопок, производных от [BaseButton]. Кнопки в [ButtonGroup] "
+"рассматриваются как радиокнопки: одновременно можно нажать не более одной "
+"кнопки. Некоторые типы кнопок (например, [CheckBox]) могут иметь особый вид в "
+"этом состоянии.\n"
+"Каждый член [ButtonGroup] должен иметь [member BaseButton.toggle_mode], "
+"установленный на [code]true[/code]."
+
+msgid ""
+"Returns an [Array] of [Button]s who have this as their [ButtonGroup] (see "
+"[member BaseButton.button_group])."
+msgstr ""
+"Возвращает [массив] [Кнопок], у которых это значение равно [ButtonGroup] (см. "
+"[member BaseButton.button_group])."
+
+msgid "Returns the current pressed button."
+msgstr "Возвращает текущую нажатую кнопку."
+
+msgid "A built-in type representing a method or a standalone function."
+msgstr "Встроенный тип, представляющий метод или отдельную функцию."
+
+msgid ""
+"[Callable] is a built-in [Variant] type that represents a function. It can "
+"either be a method within an [Object] instance, or a custom callable used for "
+"different purposes (see [method is_custom]). Like all [Variant] types, it can "
+"be stored in variables and passed to other functions. It is most commonly "
+"used for signal callbacks.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func print_args(arg1, arg2, arg3 = \"\"):\n"
+"    prints(arg1, arg2, arg3)\n"
+"\n"
+"func test():\n"
+"    var callable = Callable(self, \"print_args\")\n"
+"    callable.call(\"hello\", \"world\")  # Prints \"hello world \".\n"
+"    callable.call(Vector2.UP, 42, callable)  # Prints \"(0.0, -1.0) 42 "
+"Node(node.gd)::print_args\"\n"
+"    callable.call(\"invalid\")  # Invalid call, should have at least 2 "
+"arguments.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Default parameter values are not supported.\n"
+"public void PrintArgs(Variant arg1, Variant arg2, Variant arg3 = default)\n"
+"{\n"
+"    GD.PrintS(arg1, arg2, arg3);\n"
+"}\n"
+"\n"
+"public void Test()\n"
+"{\n"
+"    // Invalid calls fail silently.\n"
+"    Callable callable = new Callable(this, MethodName.PrintArgs);\n"
+"    callable.Call(\"hello\", \"world\"); // Default parameter values are not "
+"supported, should have 3 arguments.\n"
+"    callable.Call(Vector2.Up, 42, callable); // Prints \"(0, -1) 42 Node(Node."
+"cs)::PrintArgs\"\n"
+"    callable.Call(\"invalid\"); // Invalid call, should have 3 arguments.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, it's possible to create lambda functions within a method. Lambda "
+"functions are custom callables that are not associated with an [Object] "
+"instance. Optionally, lambda functions can also be named. The name will be "
+"displayed in the debugger, or when calling [method get_method].\n"
+"[codeblock]\n"
+"func _init():\n"
+"    var my_lambda = func (message):\n"
+"        print(message)\n"
+"\n"
+"    # Prints \"Hello everyone!\"\n"
+"    my_lambda.call(\"Hello everyone!\")\n"
+"\n"
+"    # Prints \"Attack!\", when the button_pressed signal is emitted.\n"
+"    button_pressed.connect(func(): print(\"Attack!\"))\n"
+"[/codeblock]\n"
+"In GDScript, you can access methods and global functions as [Callable]s:\n"
+"[codeblock]\n"
+"tween.tween_callback(node.queue_free)  # Object methods.\n"
+"tween.tween_callback(array.clear)  # Methods of built-in types.\n"
+"tween.tween_callback(print.bind(\"Test\"))  # Global functions.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] [Dictionary] does not support the above due to ambiguity with "
+"keys.\n"
+"[codeblock]\n"
+"var dictionary = {\"hello\": \"world\"}\n"
+"\n"
+"# This will not work, `clear` is treated as a key.\n"
+"tween.tween_callback(dictionary.clear)\n"
+"\n"
+"# This will work.\n"
+"tween.tween_callback(Callable.create(dictionary, \"clear\"))\n"
+"[/codeblock]"
+msgstr ""
+"[Callable] — это встроенный тип [Variant], представляющий функцию. Это может "
+"быть либо метод внутри экземпляра [Object], либо пользовательский вызываемый "
+"объект, используемый для различных целей (см. [method is_custom]). Как и все "
+"типы [Variant], его можно хранить в переменных и передавать в другие функции. "
+"Чаще всего он используется для обратных вызовов сигналов.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func print_args(arg1, arg2, arg3 = \"\"):\n"
+"    prints(arg1, arg2, arg3)\n"
+"\n"
+"func test():\n"
+"    var callable = Callable(self, \"print_args\")\n"
+"    callable.call(\"hello\", \"world\")  # Prints \"hello world \".\n"
+"    callable.call(Vector2.UP, 42, callable)  # Prints \"(0.0, -1.0) 42 "
+"Node(node.gd)::print_args\"\n"
+"    callable.call(\"invalid\")  # Invalid call, should have at least 2 "
+"arguments.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Значения параметров по умолчанию не поддерживаются.\n"
+"public void PrintArgs(Variant arg1, Variant arg2, Variant arg3 = default)\n"
+"{\n"
+"    GD.PrintS(arg1, arg2, arg3);\n"
+"}\n"
+"\n"
+"public void Test()\n"
+"{\n"
+"    // Недействительные вызовы автоматически завершаются ошибкой.\n"
+"    Callable callable = new Callable(this, MethodName.PrintArgs);\n"
+"    callable.Call(\"hello\", \"world\"); // Значения параметров по умолчанию "
+"не поддерживаются, должно быть 3 аргумента.\n"
+"    callable.Call(Vector2.Up, 42, callable); // Prints \"(0, -1) 42 Node(Node."
+"cs)::PrintArgs\"\n"
+"    callable.Call(\"invalid\"); // Неверный вызов, должно быть 3 аргумента.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"В GDScript можно создавать лямбда-функции внутри метода. Лямбда-функции — это "
+"пользовательские вызываемые объекты, которые не связаны с экземпляром "
+"[Object]. При желании лямбда-функции также можно называть. Имя будет "
+"отображаться в отладчике или при вызове [method get_method].\n"
+"[codeblock]\n"
+"func _init():\n"
+"    var my_lambda = func (message):\n"
+"        print(message)\n"
+"\n"
+"    # Печать \"Всем привет!\"\n"
+"    my_lambda.call(\"Hello everyone!\")\n"
+"\n"
+"    # Выводит сообщение «Атака!» при подаче сигнала button_pressed.\n"
+"    button_pressed.connect(func(): print(\"Attack!\"))\n"
+"[/codeblock]\n"
+"В GDScript вы можете получить доступ к методам и глобальным функциям как к "
+"[Callable]-ы:\n"
+"[codeblock]\n"
+"tween.tween_callback(node.queue_free)  # Методы объекта.\n"
+"tween.tween_callback(array.clear)  # Методы встроенных типов.\n"
+"tween.tween_callback(print.bind(\"Test\"))  # Глобальные функции.\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] [Словарь] не поддерживает вышеуказанное из-за "
+"неоднозначности ключей.\n"
+"[codeblock]\n"
+"var dictionary = {\"hello\": \"world\"}\n"
+"\n"
+"# Это не сработает, `clear` рассматривается как ключ.\n"
+"tween.tween_callback(dictionary.clear)\n"
+"\n"
+"# Это сработает.\n"
+"tween.tween_callback(Callable.create(dictionary, \"clear\"))\n"
+"[/codeblock]"
+
+msgid "Constructs an empty [Callable], with no object nor method bound."
+msgstr "Создает пустой [Callable] без привязанных объектов и методов."
+
+msgid ""
+"Creates a new [Callable] for the method named [param method] in the specified "
+"[param object].\n"
+"[b]Note:[/b] For methods of built-in [Variant] types, use [method create] "
+"instead."
+msgstr ""
+"Создает новый [Callable] для метода с именем [param method] в указанном "
+"[param object].\n"
+"[b]Примечание:[/b] Для методов встроенных типов [Variant] используйте вместо "
+"этого [method create]."
+
+msgid ""
+"Returns a copy of this [Callable] with one or more arguments bound. When "
+"called, the bound arguments are passed [i]after[/i] the arguments supplied by "
+"[method call]. See also [method unbind].\n"
+"[b]Note:[/b] When this method is chained with other similar methods, the "
+"order in which the argument list is modified is read from right to left."
+msgstr ""
+"Возвращает копию этого [Callable] с одним или несколькими связанными "
+"аргументами. При вызове связанные аргументы передаются [i]после[/i] "
+"аргументов, предоставленных [method call]. См. также [method unbind].\n"
+"[b]Примечание:[/b] Когда этот метод связан с другими похожими методами, "
+"порядок изменения списка аргументов считывается справа налево."
+
+msgid ""
+"Returns a copy of this [Callable] with one or more arguments bound, reading "
+"them from an array. When called, the bound arguments are passed [i]after[/i] "
+"the arguments supplied by [method call]. See also [method unbind].\n"
+"[b]Note:[/b] When this method is chained with other similar methods, the "
+"order in which the argument list is modified is read from right to left."
+msgstr ""
+"Возвращает копию этого [Callable] с одним или несколькими связанными "
+"аргументами, считывая их из массива. При вызове связанные аргументы "
+"передаются [i]после[/i] аргументов, предоставленных [method call]. См. также "
+"[method unbind].\n"
+"[b]Примечание:[/b] Когда этот метод связан с другими похожими методами, "
+"порядок изменения списка аргументов считывается справа налево."
+
+msgid ""
+"Calls the method represented by this [Callable]. Arguments can be passed and "
+"should match the method's signature."
+msgstr ""
+"Вызывает метод, представленный этим [Callable]. Аргументы могут быть переданы "
+"и должны соответствовать сигнатуре метода."
+
+msgid ""
+"Calls the method represented by this [Callable] in deferred mode, i.e. at the "
+"end of the current frame. Arguments can be passed and should match the "
+"method's signature.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    grab_focus.call_deferred()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    Callable.From(GrabFocus).CallDeferred();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Deferred calls are processed at idle time. Idle time happens "
+"mainly at the end of process and physics frames. In it, deferred calls will "
+"be run until there are none left, which means you can defer calls from other "
+"deferred calls and they'll still be run in the current idle time cycle. This "
+"means you should not call a method deferred from itself (or from a method "
+"called by it), as this causes infinite recursion the same way as if you had "
+"called the method directly.\n"
+"See also [method Object.call_deferred]."
+msgstr ""
+"Вызывает метод, представленный этим [Callable], в отложенном режиме, т. е. в "
+"конце текущего кадра. Аргументы могут быть переданы и должны соответствовать "
+"сигнатуре метода.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    grab_focus.call_deferred()\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    Callable.From(GrabFocus).CallDeferred();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Отложенные вызовы обрабатываются во время простоя. Время "
+"простоя в основном происходит в конце кадров процесса и физики. В нем "
+"отложенные вызовы будут выполняться до тех пор, пока не останется ни одного, "
+"что означает, что вы можете отложить вызовы из других отложенных вызовов, и "
+"они все равно будут выполняться в текущем цикле времени простоя. Это "
+"означает, что вы не должны вызывать метод, отложенный из самого себя (или из "
+"метода, вызванного им), так как это вызывает бесконечную рекурсию так же, как "
+"если бы вы вызвали метод напрямую.\n"
+"См. также [method Object.call_deferred]."
+
+msgid ""
+"Calls the method represented by this [Callable]. Unlike [method call], this "
+"method expects all arguments to be contained inside the [param arguments] "
+"[Array]."
+msgstr ""
+"Вызывает метод, представленный этим [Callable]. В отличие от [method call], "
+"этот метод ожидает, что все аргументы будут содержаться внутри [param "
+"arguments] [Array]."
+
+msgid ""
+"Creates a new [Callable] for the method named [param method] in the specified "
+"[param variant]. To represent a method of a built-in [Variant] type, a custom "
+"callable is used (see [method is_custom]). If [param variant] is [Object], "
+"then a standard callable will be created instead.\n"
+"[b]Note:[/b] This method is always necessary for the [Dictionary] type, as "
+"property syntax is used to access its entries. You may also use this method "
+"when [param variant]'s type is not known in advance (for polymorphism)."
+msgstr ""
+"Создает новый [Callable] для метода с именем [param method] в указанном "
+"[param variation]. Для представления метода встроенного типа [Variant] "
+"используется пользовательский вызываемый объект (см. [method is_custom]). "
+"Если [param variation] — это [Object], то вместо него будет создан "
+"стандартный вызываемый объект.\n"
+"[b]Примечание:[/b] Этот метод всегда необходим для типа [Dictionary], так как "
+"для доступа к его записям используется синтаксис свойств. Вы также можете "
+"использовать этот метод, когда тип [param variation] заранее неизвестен (для "
+"полиморфизма)."
+
+msgid ""
+"Returns the total number of arguments this [Callable] should take, including "
+"optional arguments. This means that any arguments bound with [method bind] "
+"are [i]subtracted[/i] from the result, and any arguments unbound with [method "
+"unbind] are [i]added[/i] to the result."
+msgstr ""
+"Возвращает общее количество аргументов, которые должен принимать этот "
+"[Callable], включая необязательные аргументы. Это означает, что любые "
+"аргументы, связанные с [method bind], [i]вычитаются[/i] из результата, а "
+"любые аргументы, несвязанные с [method unbind], [i]добавляются[/i] к "
+"результату."
+
+msgid ""
+"Returns the array of arguments bound via successive [method bind] or [method "
+"unbind] calls. These arguments will be added [i]after[/i] the arguments "
+"passed to the call, from which [method get_unbound_arguments_count] arguments "
+"on the right have been previously excluded.\n"
+"[codeblock]\n"
+"func get_effective_arguments(callable, call_args):\n"
+"    assert(call_args.size() - callable.get_unbound_arguments_count() >= 0)\n"
+"    var result = call_args.slice(0, call_args.size() - callable."
+"get_unbound_arguments_count())\n"
+"    result.append_array(callable.get_bound_arguments())\n"
+"    return result\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает массив аргументов, связанных через последовательные вызовы [method "
+"bind] или [method unbind]. Эти аргументы будут добавлены [i]после[/i] "
+"аргументов, переданных вызову, из которого [method "
+"get_unbound_arguments_count] аргументов справа были ранее исключены.\n"
+"[codeblock]\n"
+"func get_effective_arguments(callable, call_args):\n"
+"    assert(call_args.size() - callable.get_unbound_arguments_count() >= 0)\n"
+"    var result = call_args.slice(0, call_args.size() - callable."
+"get_unbound_arguments_count())\n"
+"    result.append_array(callable.get_bound_arguments())\n"
+"    return result\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the total amount of arguments bound via successive [method bind] or "
+"[method unbind] calls. This is the same as the size of the array returned by "
+"[method get_bound_arguments]. See [method get_bound_arguments] for details.\n"
+"[b]Note:[/b] The [method get_bound_arguments_count] and [method "
+"get_unbound_arguments_count] methods can both return positive values."
+msgstr ""
+"Возвращает общее количество аргументов, связанных через последовательные "
+"вызовы [method bind] или [method unbind]. Это то же самое, что и размер "
+"массива, возвращаемого [method get_bound_arguments]. Подробности см. в "
+"[method get_bound_arguments].\n"
+"[b]Примечание:[/b] Методы [method get_bound_arguments_count] и [method "
+"get_unbound_arguments_count] могут возвращать положительные значения."
+
+msgid ""
+"Returns the name of the method represented by this [Callable]. If the "
+"callable is a GDScript lambda function, returns the function's name or "
+"[code]\"<anonymous lambda>\"[/code]."
+msgstr ""
+"Возвращает имя метода, представленного этим [Callable]. Если вызываемый "
+"объект является лямбда-функцией GDScript, возвращает имя функции или "
+"[code]\"<anonymous lambda>\"[/code]."
+
+msgid ""
+"Returns the total amount of arguments unbound via successive [method bind] or "
+"[method unbind] calls. See [method get_bound_arguments] for details.\n"
+"[b]Note:[/b] The [method get_bound_arguments_count] and [method "
+"get_unbound_arguments_count] methods can both return positive values."
+msgstr ""
+"Возвращает общее количество аргументов, освобожденных с помощью "
+"последовательных вызовов [method bind] или [method unbind]. Подробности см. в "
+"[method get_bound_arguments].\n"
+"[b]Примечание:[/b] Методы [method get_bound_arguments_count] и [method "
+"get_unbound_arguments_count] могут возвращать положительные значения."
+
+msgid ""
+"Returns the 32-bit hash value of this [Callable]'s object.\n"
+"[b]Note:[/b] [Callable]s with equal content will always produce identical "
+"hash values. However, the reverse is not true. Returning identical hash "
+"values does [i]not[/i] imply the callables are equal, because different "
+"callables can have identical hash values due to hash collisions. The engine "
+"uses a 32-bit hash algorithm for [method hash]."
+msgstr ""
+"Возвращает 32-битное хэш-значение этого объекта [Callable].\n"
+"[b]Примечание:[/b] [Callable] с одинаковым содержимым всегда будут выдавать "
+"идентичные хэш-значения. Однако обратное неверно. Возврат идентичных хэш-"
+"значений не [i][/i] означает, что вызываемые объекты равны, поскольку разные "
+"вызываемые объекты могут иметь идентичные хэш-значения из-за коллизий хэшей. "
+"Движок использует 32-битный хэш-алгоритм для [method hash]."
+
+msgid ""
+"Returns [code]true[/code] if this [Callable] is a custom callable. Custom "
+"callables are used:\n"
+"- for binding/unbinding arguments (see [method bind] and [method unbind]);\n"
+"- for representing methods of built-in [Variant] types (see [method "
+"create]);\n"
+"- for representing global, lambda, and RPC functions in GDScript;\n"
+"- for other purposes in the core, GDExtension, and C#."
+msgstr ""
+"Возвращает [code]true[/code], если этот [Callable] является пользовательским "
+"вызываемым. Пользовательские вызываемые используются:\n"
+"- для привязки/отмены привязки аргументов (см. [method bind] и [method "
+"unbind]);\n"
+"- для представления методов встроенных типов [Variant] (см. [method "
+"create]);\n"
+"- для представления глобальных, лямбда-функций и функций RPC в GDScript;\n"
+"- для других целей в ядре, GDExtension и C#."
+
+msgid ""
+"Returns [code]true[/code] if this [Callable] has no target to call the method "
+"on. Equivalent to [code]callable == Callable()[/code].\n"
+"[b]Note:[/b] This is [i]not[/i] the same as [code]not is_valid()[/code] and "
+"using [code]not is_null()[/code] will [i]not[/i] guarantee that this callable "
+"can be called. Use [method is_valid] instead."
+msgstr ""
+"Возвращает [code]true[/code], если у этого [Callable] нет цели для вызова "
+"метода. Эквивалентно [code]callable == Callable()[/code].\n"
+"[b]Примечание:[/b] Это [i]не[/i] то же самое, что [code]not is_valid()[/"
+"code], и использование [code]not is_null()[/code] [i]не[/i] гарантирует, что "
+"этот вызываемый может быть вызван. Вместо этого используйте [method is_valid]."
+
+msgid ""
+"Returns [code]true[/code] if this [Callable] is a standard callable. This "
+"method is the opposite of [method is_custom]. Returns [code]false[/code] if "
+"this callable is a lambda function."
+msgstr ""
+"Возвращает [code]true[/code], если этот [Callable] является стандартным "
+"вызываемым. Этот метод противоположен [method is_custom]. Возвращает "
+"[code]false[/code], если этот вызываемый является лямбда-функцией."
+
+msgid ""
+"Perform an RPC (Remote Procedure Call) on all connected peers. This is used "
+"for multiplayer and is normally not available, unless the function being "
+"called has been marked as [i]RPC[/i] (using [annotation @GDScript.@rpc] or "
+"[method Node.rpc_config]). Calling this method on unsupported functions will "
+"result in an error. See [method Node.rpc]."
+msgstr ""
+"Выполнить RPC (удаленный вызов процедуры) на всех подключенных пирах. Это "
+"используется для многопользовательской игры и обычно недоступно, если только "
+"вызываемая функция не помечена как [i]RPC[/i] (используя [аннотацию @GDScript."
+"@rpc] или [метод Node.rpc_config]). Вызов этого метода для неподдерживаемых "
+"функций приведет к ошибке. См. [метод Node.rpc]."
+
+msgid ""
+"Perform an RPC (Remote Procedure Call) on a specific peer ID (see multiplayer "
+"documentation for reference). This is used for multiplayer and is normally "
+"not available unless the function being called has been marked as [i]RPC[/i] "
+"(using [annotation @GDScript.@rpc] or [method Node.rpc_config]). Calling this "
+"method on unsupported functions will result in an error. See [method Node."
+"rpc_id]."
+msgstr ""
+"Выполнить RPC (удаленный вызов процедуры) для определенного идентификатора "
+"однорангового сервера (см. документацию по многопользовательской игре для "
+"справки). Это используется для многопользовательской игры и обычно "
+"недоступно, если вызываемая функция не помечена как [i]RPC[/i] (используя "
+"[аннотацию @GDScript.@rpc] или [метод Node.rpc_config]). Вызов этого метода "
+"для неподдерживаемых функций приведет к ошибке. См. [метод Node.rpc_id]."
+
+msgid ""
+"Returns a copy of this [Callable] with a number of arguments unbound. In "
+"other words, when the new callable is called the last few arguments supplied "
+"by the user are ignored, according to [param argcount]. The remaining "
+"arguments are passed to the callable. This allows to use the original "
+"callable in a context that attempts to pass more arguments than this callable "
+"can handle, e.g. a signal with a fixed number of arguments. See also [method "
+"bind].\n"
+"[b]Note:[/b] When this method is chained with other similar methods, the "
+"order in which the argument list is modified is read from right to left.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    foo.unbind(1).call(1, 2) # Calls foo(1).\n"
+"    foo.bind(3, 4).unbind(1).call(1, 2) # Calls foo(1, 3, 4), note that it "
+"does not change the arguments from bind.\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает копию этого [Callable] с несколькими несвязанными аргументами. "
+"Другими словами, когда вызывается новый вызываемый, последние несколько "
+"аргументов, предоставленных пользователем, игнорируются в соответствии с "
+"[param argcount]. Оставшиеся аргументы передаются вызываемому. Это позволяет "
+"использовать исходный вызываемый в контексте, который пытается передать "
+"больше аргументов, чем этот вызываемый может обработать, например, сигнал с "
+"фиксированным количеством аргументов. См. также [method bind].\n"
+"[b]Примечание:[/b] Когда этот метод связан с другими похожими методами, "
+"порядок, в котором изменяется список аргументов, считывается справа налево.\n"
+"[codeblock]\n"
+"func _ready():\n"
+"    foo.unbind(1).call(1, 2) # Calls foo(1).\n"
+"    foo.bind(3, 4).unbind(1).call(1, 2) # Calls foo(1, 3, 4), note that it "
+"does not change the arguments from bind.\n"
+"[/codeblock]"
+
+msgid "Calls the specified method after optional delay."
+msgstr "Вызывает указанный метод после необязательной задержки."
+
+msgid ""
+"[CallbackTweener] is used to call a method in a tweening sequence. See "
+"[method Tween.tween_callback] for more usage information.\n"
+"The tweener will finish automatically if the callback's target object is "
+"freed.\n"
+"[b]Note:[/b] [method Tween.tween_callback] is the only correct way to create "
+"[CallbackTweener]. Any [CallbackTweener] created manually will not function "
+"correctly."
+msgstr ""
+"[CallbackTweener] используется для вызова метода в последовательности "
+"tweening. См. [method Tween.tween_callback] для получения дополнительной "
+"информации об использовании.\n"
+"Tweener завершится автоматически, если целевой объект обратного вызова будет "
+"освобожден.\n"
+"[b]Примечание:[/b] [method Tween.tween_callback] — единственный правильный "
+"способ создания [CallbackTweener]. Любой [CallbackTweener], созданный "
+"вручную, не будет работать правильно."
+
+msgid ""
+"Makes the callback call delayed by given time in seconds.\n"
+"[b]Example:[/b] Call [method Node.queue_free] after 2 seconds:\n"
+"[codeblock]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_callback(queue_free).set_delay(2)\n"
+"[/codeblock]"
+msgstr ""
+"Делает вызов обратного вызова задержанным на указанное время в секундах.\n"
+"[b]Пример:[/b] Вызов [метода Node.queue_free] через 2 секунды:\n"
+"[codeblock]\n"
+"var tween = get_tree().create_tween()\n"
+"tween.tween_callback(queue_free).set_delay(2)\n"
+"[/codeblock]"
+
+msgid "Camera node for 2D scenes."
+msgstr "Узел камеры для двумерных сцен."
+
+msgid "2D Isometric Demo"
+msgstr "Изометрическая 2D-демо"
+
+msgid "Aligns the camera to the tracked node."
+msgstr "Выравнивает камеру по отслеживаемому узлу."
+
+msgid "Forces the camera to update scroll immediately."
+msgstr "Заставляет камеру немедленно обновить прокрутку."
+
+msgid ""
+"Returns the specified [enum Side]'s margin. See also [member "
+"drag_bottom_margin], [member drag_top_margin], [member drag_left_margin], and "
+"[member drag_right_margin]."
+msgstr ""
+"Возвращает указанное поле [enum Side]. См. также [member drag_bottom_margin], "
+"[member drag_top_margin], [member drag_left_margin] и [member "
+"drag_right_margin]."
+
+msgid ""
+"Returns the center of the screen from this camera's point of view, in global "
+"coordinates.\n"
+"[b]Note:[/b] The exact targeted position of the camera may be different. See "
+"[method get_target_position]."
+msgstr ""
+"Возвращает центр экрана с точки зрения этой камеры в глобальных координатах.\n"
+"[b]Примечание:[/b] Точное целевое положение камеры может отличаться. См. "
+"[метод get_target_position]."
+
+msgid ""
+"Returns this camera's target position, in global coordinates.\n"
+"[b]Note:[/b] The returned value is not the same as [member Node2D."
+"global_position], as it is affected by the drag properties. It is also not "
+"the same as the current position if [member position_smoothing_enabled] is "
+"[code]true[/code] (see [method get_screen_center_position])."
+msgstr ""
+"Возвращает целевое положение этой камеры в глобальных координатах.\n"
+"[b]Примечание:[/b] Возвращаемое значение не совпадает с [member Node2D."
+"global_position], так как на него влияют свойства перетаскивания. Оно также "
+"не совпадает с текущим положением, если [member position_smoothing_enabled] "
+"равно [code]true[/code] (см. [method get_screen_center_position])."
+
+msgid ""
+"Forces this [Camera2D] to become the current active one. [member enabled] "
+"must be [code]true[/code]."
+msgstr ""
+"Делает [Camera2D] текущей активной камерой. [member enabled] должно быть "
+"[code]true[/code]."
+
+msgid ""
+"Sets the camera's position immediately to its current smoothing destination.\n"
+"This method has no effect if [member position_smoothing_enabled] is "
+"[code]false[/code]."
+msgstr ""
+"Устанавливает положение камеры немедленно в текущее место назначения "
+"сглаживания.\n"
+"Этот метод не имеет эффекта, если [member position_smoothing_enabled] имеет "
+"значение [code]false[/code]."
+
+msgid ""
+"Sets the specified [enum Side]'s margin. See also [member "
+"drag_bottom_margin], [member drag_top_margin], [member drag_left_margin], and "
+"[member drag_right_margin]."
+msgstr ""
+"Устанавливает указанное поле [enum Side]. См. также [member "
+"drag_bottom_margin], [member drag_top_margin], [member drag_left_margin] и "
+"[member drag_right_margin]."
+
+msgid ""
+"Sets the camera limit for the specified [enum Side]. See also [member "
+"limit_bottom], [member limit_top], [member limit_left], and [member "
+"limit_right]."
+msgstr ""
+"Устанавливает ограничение камеры для указанного [enum Side]. См. также "
+"[member limit_bottom], [member limit_top], [member limit_left] и [member "
+"limit_right]."
+
+msgid "The Camera2D's anchor point. See [enum AnchorMode] constants."
+msgstr "Точка привязки Camera2D. См. константы [enum AnchorMode]."
+
+msgid ""
+"The custom [Viewport] node attached to the [Camera2D]. If [code]null[/code] "
+"or not a [Viewport], uses the default viewport instead."
+msgstr ""
+"Пользовательский узел [Viewport], прикрепленный к [Camera2D]. Если "
+"[code]null[/code] или не является [Viewport], вместо этого используется "
+"viewport по умолчанию."
+
+msgid ""
+"Bottom margin needed to drag the camera. A value of [code]1[/code] makes the "
+"camera move only when reaching the bottom edge of the screen."
+msgstr ""
+"Нижнее поле, необходимое для перетаскивания камеры. Значение [code]1[/code] "
+"заставляет камеру двигаться только при достижении нижнего края экрана."
+
+msgid ""
+"If [code]true[/code], the camera only moves when reaching the horizontal "
+"(left and right) drag margins. If [code]false[/code], the camera moves "
+"horizontally regardless of margins."
+msgstr ""
+"Если [code]true[/code], камера движется только при достижении горизонтальных "
+"(левых и правых) границ перетаскивания. Если [code]false[/code], камера "
+"движется горизонтально независимо от границ."
+
+msgid ""
+"The relative horizontal drag offset of the camera between the right "
+"([code]-1[/code]) and left ([code]1[/code]) drag margins.\n"
+"[b]Note:[/b] Used to set the initial horizontal drag offset; determine the "
+"current offset; or force the current offset. It's not automatically updated "
+"when [member drag_horizontal_enabled] is [code]true[/code] or the drag "
+"margins are changed."
+msgstr ""
+"Относительное горизонтальное смещение перетаскивания камеры между правым "
+"([code]-1[/code]) и левым ([code]1[/code]) полями перетаскивания.\n"
+"[b]Примечание:[/b] Используется для установки начального горизонтального "
+"смещения перетаскивания; определения текущего смещения; или принудительного "
+"задания текущего смещения. Оно не обновляется автоматически, когда [member "
+"drag_horizontal_enabled] имеет значение [code]true[/code] или поля "
+"перетаскивания изменяются."
+
+msgid ""
+"Left margin needed to drag the camera. A value of [code]1[/code] makes the "
+"camera move only when reaching the left edge of the screen."
+msgstr ""
+"Левое поле, необходимое для перетаскивания камеры. Значение [code]1[/code] "
+"заставляет камеру двигаться только при достижении левого края экрана."
+
+msgid ""
+"Right margin needed to drag the camera. A value of [code]1[/code] makes the "
+"camera move only when reaching the right edge of the screen."
+msgstr ""
+"Правое поле, необходимое для перетаскивания камеры. Значение [code]1[/code] "
+"заставляет камеру двигаться только при достижении правого края экрана."
+
+msgid ""
+"Top margin needed to drag the camera. A value of [code]1[/code] makes the "
+"camera move only when reaching the top edge of the screen."
+msgstr ""
+"Верхнее поле, необходимое для перемещения камеры. Значение [code]1[/code] "
+"заставляет камеру двигаться только при достижении верхнего края экрана."
+
+msgid ""
+"If [code]true[/code], the camera only moves when reaching the vertical (top "
+"and bottom) drag margins. If [code]false[/code], the camera moves vertically "
+"regardless of the drag margins."
+msgstr ""
+"Если [code]true[/code], камера движется только при достижении вертикальных "
+"(верхних и нижних) границ перетаскивания. Если [code]false[/code], камера "
+"движется вертикально независимо от границ перетаскивания."
+
+msgid ""
+"The relative vertical drag offset of the camera between the bottom ([code]-1[/"
+"code]) and top ([code]1[/code]) drag margins.\n"
+"[b]Note:[/b] Used to set the initial vertical drag offset; determine the "
+"current offset; or force the current offset. It's not automatically updated "
+"when [member drag_vertical_enabled] is [code]true[/code] or the drag margins "
+"are changed."
+msgstr ""
+"Относительное вертикальное смещение перетаскивания камеры между нижним "
+"([code]-1[/code]) и верхним ([code]1[/code]) полями перетаскивания.\n"
+"[b]Примечание:[/b] Используется для установки начального вертикального "
+"смещения перетаскивания; определения текущего смещения; или принудительного "
+"задания текущего смещения. Оно не обновляется автоматически, когда [member "
+"drag_vertical_enabled] имеет значение [code]true[/code] или поля "
+"перетаскивания изменяются."
+
+msgid ""
+"If [code]true[/code], draws the camera's drag margin rectangle in the editor."
+msgstr ""
+"Если [code]true[/code], рисует прямоугольник перетаскиваемого поля камеры в "
+"редакторе."
+
+msgid "If [code]true[/code], draws the camera's limits rectangle in the editor."
+msgstr "Если [code]true[/code], рисует прямоугольник границ камеры в редакторе."
+
+msgid "If [code]true[/code], draws the camera's screen rectangle in the editor."
+msgstr "Если [code]true[/code], рисует прямоугольник экрана камеры в редакторе."
+
+msgid ""
+"Controls whether the camera can be active or not. If [code]true[/code], the "
+"[Camera2D] will become the main camera when it enters the scene tree and "
+"there is no active camera currently (see [method Viewport.get_camera_2d]).\n"
+"When the camera is currently active and [member enabled] is set to "
+"[code]false[/code], the next enabled [Camera2D] in the scene tree will become "
+"active."
+msgstr ""
+"Управляет тем, может ли камера быть активной или нет. Если [code]true[/code], "
+"[Camera2D] станет основной камерой, когда она войдет в дерево сцены и в "
+"данный момент нет активной камеры (см. [method Viewport.get_camera_2d]).\n"
+"Когда камера в данный момент активна и [member enabled] установлен на "
+"[code]false[/code], следующая включенная [Camera2D] в дереве сцены станет "
+"активной."
+
+msgid ""
+"If [code]true[/code], the camera's rendered view is not affected by its "
+"[member Node2D.rotation] and [member Node2D.global_rotation]."
+msgstr ""
+"Если [code]true[/code], на визуализируемый вид камеры не влияют ее [member "
+"Node2D.rotation] и [member Node2D.global_rotation]."
+
+msgid ""
+"Bottom scroll limit in pixels. The camera stops moving when reaching this "
+"value, but [member offset] can push the view past the limit."
+msgstr ""
+"Нижний предел прокрутки в пикселях. Камера останавливается при достижении "
+"этого значения, но [member offset] может вывести вид за пределы предела."
+
+msgid ""
+"Left scroll limit in pixels. The camera stops moving when reaching this "
+"value, but [member offset] can push the view past the limit."
+msgstr ""
+"Предел прокрутки слева в пикселях. Камера останавливается при достижении "
+"этого значения, но [смещение члена] может вывести вид за пределы предела."
+
+msgid ""
+"Right scroll limit in pixels. The camera stops moving when reaching this "
+"value, but [member offset] can push the view past the limit."
+msgstr ""
+"Предел прокрутки вправо в пикселях. Камера останавливается при достижении "
+"этого значения, но [смещение члена] может вывести вид за пределы предела."
+
+msgid ""
+"If [code]true[/code], the camera smoothly stops when reaches its limits.\n"
+"This property has no effect if [member position_smoothing_enabled] is "
+"[code]false[/code].\n"
+"[b]Note:[/b] To immediately update the camera's position to be within limits "
+"without smoothing, even with this setting enabled, invoke [method "
+"reset_smoothing]."
+msgstr ""
+"Если [code]true[/code], камера плавно останавливается при достижении своих "
+"пределов.\n"
+"Это свойство не имеет эффекта, если [member position_smoothing_enabled] равно "
+"[code]false[/code].\n"
+"[b]Примечание:[/b] Чтобы немедленно обновить положение камеры, чтобы оно "
+"находилось в пределах ограничений без сглаживания, даже если эта настройка "
+"включена, вызовите [method reset_smoothing]."
+
+msgid ""
+"Top scroll limit in pixels. The camera stops moving when reaching this value, "
+"but [member offset] can push the view past the limit."
+msgstr ""
+"Верхний предел прокрутки в пикселях. Камера останавливается при достижении "
+"этого значения, но [member offset] может вывести вид за пределы предела."
+
+msgid ""
+"The camera's relative offset. Useful for looking around or camera shake "
+"animations. The offsetted camera can go past the limits defined in [member "
+"limit_top], [member limit_bottom], [member limit_left] and [member "
+"limit_right]."
+msgstr ""
+"Относительное смещение камеры. Полезно для осмотра или анимации дрожания "
+"камеры. Смещенная камера может выходить за пределы, определенные в [member "
+"limit_top], [member limit_bottom], [member limit_left] и [member limit_right]."
+
+msgid ""
+"Speed in pixels per second of the camera's smoothing effect when [member "
+"position_smoothing_enabled] is [code]true[/code]."
+msgstr ""
+"Скорость эффекта сглаживания камеры в пикселях в секунду, когда [member "
+"position_smoothing_enabled] имеет значение [code]true[/code]."
+
+msgid "The camera's process callback. See [enum Camera2DProcessCallback]."
+msgstr "Обратный вызов процесса камеры. См. [enum Camera2DProcessCallback]."
+
+msgid ""
+"If [code]true[/code], the camera's view smoothly rotates, via asymptotic "
+"smoothing, to align with its target rotation at [member "
+"rotation_smoothing_speed].\n"
+"[b]Note:[/b] This property has no effect if [member ignore_rotation] is "
+"[code]true[/code]."
+msgstr ""
+"Если [code]true[/code], вид камеры плавно вращается с помощью "
+"асимптотического сглаживания, чтобы совпасть с целевым вращением на [member "
+"rotation_smoothing_speed].\n"
+"[b]Примечание:[/b] Это свойство не имеет эффекта, если [member "
+"ignore_rotation] равно [code]true[/code]."
+
+msgid ""
+"The angular, asymptotic speed of the camera's rotation smoothing effect when "
+"[member rotation_smoothing_enabled] is [code]true[/code]."
+msgstr ""
+"Угловая асимптотическая скорость эффекта сглаживания вращения камеры, когда "
+"[member rotation_smoothing_enabled] имеет значение [code]true[/code]."
+
+msgid ""
+"The camera's zoom. A zoom of [code]Vector(2, 2)[/code] doubles the size seen "
+"in the viewport. A zoom of [code]Vector(0.5, 0.5)[/code] halves the size seen "
+"in the viewport.\n"
+"[b]Note:[/b] [member FontFile.oversampling] does [i]not[/i] take [Camera2D] "
+"zoom into account. This means that zooming in/out will cause bitmap fonts and "
+"rasterized (non-MSDF) dynamic fonts to appear blurry or pixelated unless the "
+"font is part of a [CanvasLayer] that makes it ignore camera zoom. To ensure "
+"text remains crisp regardless of zoom, you can enable MSDF font rendering by "
+"enabling [member ProjectSettings.gui/theme/"
+"default_font_multichannel_signed_distance_field] (applies to the default "
+"project font only), or enabling [b]Multichannel Signed Distance Field[/b] in "
+"the import options of a DynamicFont for custom fonts. On system fonts, "
+"[member SystemFont.multichannel_signed_distance_field] can be enabled in the "
+"inspector."
+msgstr ""
+"Масштаб камеры. Масштаб [code]Vector(2, 2)[/code] удваивает размер, видимый в "
+"области просмотра. Масштаб [code]Vector(0.5, 0.5)[/code] уменьшает размер, "
+"видимый в области просмотра, вдвое.\n"
+"[b]Примечание:[/b] [member FontFile.oversampling] [i]не[/i] учитывает масштаб "
+"[Camera2D]. Это означает, что увеличение/уменьшение масштаба приведет к тому, "
+"что растровые шрифты и растрированные (не MSDF) динамические шрифты будут "
+"выглядеть размытыми или пикселизированными, если только шрифт не является "
+"частью [CanvasLayer], который заставляет его игнорировать масштаб камеры. "
+"Чтобы текст оставался четким независимо от масштаба, можно включить рендеринг "
+"шрифтов MSDF, включив [member ProjectSettings.gui/theme/"
+"default_font_multichannel_signed_distance_field] (применяется только к шрифту "
+"проекта по умолчанию) или включив [b]Multichannel Signed Distance Field[/b] в "
+"параметрах импорта DynamicFont для пользовательских шрифтов. Для системных "
+"шрифтов [member SystemFont.multichannel_signed_distance_field] можно включить "
+"в инспекторе."
+
+msgid ""
+"The camera's position is fixed so that the top-left corner is always at the "
+"origin."
+msgstr ""
+"Положение камеры фиксировано таким образом, что верхний левый угол всегда "
+"находится в начале координат."
+
+msgid ""
+"The camera's position takes into account vertical/horizontal offsets and the "
+"screen size."
+msgstr ""
+"Положение камеры учитывает вертикальное/горизонтальное смещение и размер "
+"экрана."
+
+msgid ""
+"The camera updates during physics frames (see [constant Node."
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS])."
+msgstr ""
+"Камера обновляется во время физических кадров (см. [constant Node."
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS])."
+
+msgid ""
+"The camera updates during process frames (see [constant Node."
+"NOTIFICATION_INTERNAL_PROCESS])."
+msgstr ""
+"Камера обновляется во время обработки кадров (см. [constant Node."
+"NOTIFICATION_INTERNAL_PROCESS])."
+
+msgid "Camera node, displays from a point of view."
+msgstr "Узел камеры, отображает точку обзора."
+
+msgid ""
+"[Camera3D] is a special node that displays what is visible from its current "
+"location. Cameras register themselves in the nearest [Viewport] node (when "
+"ascending the tree). Only one camera can be active per viewport. If no "
+"viewport is available ascending the tree, the camera will register in the "
+"global viewport. In other words, a camera just provides 3D display "
+"capabilities to a [Viewport], and, without one, a scene registered in that "
+"[Viewport] (or higher viewports) can't be displayed."
+msgstr ""
+"[Camera3D] — это специальный узел, который отображает то, что видно из его "
+"текущего местоположения. Камеры регистрируются в ближайшем узле [Viewport] "
+"(при подъеме по дереву). Только одна камера может быть активна для каждого "
+"viewport. Если viewport не доступен при подъеме по дереву, камера "
+"зарегистрируется в глобальном viewport. Другими словами, камера просто "
+"предоставляет возможности 3D-отображения для [Viewport], и без него сцена, "
+"зарегистрированная в этом [Viewport] (или в более высоких viewport), не может "
+"быть отображена."
+
+msgid ""
+"If this is the current camera, remove it from being current. If [param "
+"enable_next] is [code]true[/code], request to make the next camera current, "
+"if any."
+msgstr ""
+"Если это текущая камера, удалить ее из списка текущих. Если [param "
+"enable_next] равен [code]true[/code], запросить сделать текущей следующую "
+"камеру, если таковая имеется."
+
+msgid ""
+"Returns the projection matrix that this camera uses to render to its "
+"associated viewport. The camera must be part of the scene tree to function."
+msgstr ""
+"Возвращает проекционную матрицу, которую эта камера использует для рендеринга "
+"в связанном с ней окне просмотра. Для работы камера должна быть частью дерева "
+"сцены."
+
+msgid ""
+"Returns the transform of the camera plus the vertical ([member v_offset]) and "
+"horizontal ([member h_offset]) offsets; and any other adjustments made to the "
+"position and orientation of the camera by subclassed cameras such as "
+"[XRCamera3D]."
+msgstr ""
+"Возвращает преобразование камеры плюс вертикальное ([member v_offset]) и "
+"горизонтальное ([member h_offset]) смещения; и любые другие корректировки, "
+"внесенные в положение и ориентацию камеры подклассами камер, такими как "
+"[XRCamera3D]."
+
+msgid ""
+"Returns whether or not the specified layer of the [member cull_mask] is "
+"enabled, given a [param layer_number] between 1 and 20."
+msgstr ""
+"Возвращает, включен ли указанный слой [member cull_mask], учитывая [param "
+"layer_number] от 1 до 20."
+
+msgid ""
+"Returns the camera's frustum planes in world space units as an array of "
+"[Plane]s in the following order: near, far, left, top, right, bottom. Not to "
+"be confused with [member frustum_offset]."
+msgstr ""
+"Возвращает плоскости усеченной пирамиды камеры в единицах мирового "
+"пространства как массив [Plane] в следующем порядке: ближний, дальний, левый, "
+"верхний, правый, нижний. Не путать с [member frustum_offset]."
+
+msgid ""
+"Returns the RID of a pyramid shape encompassing the camera's view frustum, "
+"ignoring the camera's near plane. The tip of the pyramid represents the "
+"position of the camera."
+msgstr ""
+"Возвращает RID пирамидальной формы, охватывающей усеченную пирамиду обзора "
+"камеры, игнорируя ближнюю плоскость камеры. Верхушка пирамиды представляет "
+"положение камеры."
+
+msgid ""
+"Returns [code]true[/code] if the given position is behind the camera (the "
+"blue part of the linked diagram). [url=https://raw.githubusercontent.com/"
+"godotengine/godot-docs/master/img/camera3d_position_frustum.png]See this "
+"diagram[/url] for an overview of position query methods.\n"
+"[b]Note:[/b] A position which returns [code]false[/code] may still be outside "
+"the camera's field of view."
+msgstr ""
+"Возвращает [code]true[/code], если заданная позиция находится за камерой "
+"(синяя часть связанной диаграммы). [url=https://raw.githubusercontent.com/"
+"godotengine/godot-docs/master/img/camera3d_position_frustum.png]См. эту "
+"диаграмму[/url] для обзора методов запроса позиции.\n"
+"[b]Примечание:[/b] Позиция, которая возвращает [code]false[/code], может все "
+"еще находиться за пределами поля зрения камеры."
+
+msgid ""
+"Returns [code]true[/code] if the given position is inside the camera's "
+"frustum (the green part of the linked diagram). [url=https://raw."
+"githubusercontent.com/godotengine/godot-docs/master/img/"
+"camera3d_position_frustum.png]See this diagram[/url] for an overview of "
+"position query methods."
+msgstr ""
+"Возвращает [code]true[/code], если заданная позиция находится внутри пирамиды "
+"видимости камеры (зеленая часть связанной диаграммы). [url=https://raw."
+"githubusercontent.com/godotengine/godot-docs/master/img/"
+"camera3d_position_frustum.png]См. эту диаграмму[/url] для обзора методов "
+"запроса позиции."
+
+msgid ""
+"Makes this camera the current camera for the [Viewport] (see class "
+"description). If the camera node is outside the scene tree, it will attempt "
+"to become current once it's added."
+msgstr ""
+"Делает эту камеру текущей камерой для [Viewport] (см. описание класса). Если "
+"узел камеры находится вне дерева сцены, он попытается стать текущим после "
+"добавления."
+
+msgid ""
+"Returns a normal vector from the screen point location directed along the "
+"camera. Orthogonal cameras are normalized. Perspective cameras account for "
+"perspective, screen width/height, etc."
+msgstr ""
+"Возвращает нормальный вектор из точки экрана, направленный вдоль камеры. "
+"Ортогональные камеры нормализуются. Перспективные камеры учитывают "
+"перспективу, ширину/высоту экрана и т. д."
+
+msgid ""
+"Returns the 3D point in world space that maps to the given 2D coordinate in "
+"the [Viewport] rectangle on a plane that is the given [param z_depth] "
+"distance into the scene away from the camera."
+msgstr ""
+"Возвращает трехмерную точку в мировом пространстве, которая сопоставляется с "
+"заданной двухмерной координатой в прямоугольнике [Viewport] на плоскости, "
+"которая находится на заданном расстоянии [param z_depth] от камеры вглубь "
+"сцены."
+
+msgid ""
+"Returns a normal vector in world space, that is the result of projecting a "
+"point on the [Viewport] rectangle by the inverse camera projection. This is "
+"useful for casting rays in the form of (origin, normal) for object "
+"intersection or picking."
+msgstr ""
+"Возвращает вектор нормали в мировом пространстве, который является "
+"результатом проецирования точки на прямоугольник [Viewport] обратной "
+"проекцией камеры. Это полезно для отбрасывания лучей в форме (origin, normal) "
+"для пересечения или выбора объектов."
+
+msgid ""
+"Returns a 3D position in world space, that is the result of projecting a "
+"point on the [Viewport] rectangle by the inverse camera projection. This is "
+"useful for casting rays in the form of (origin, normal) for object "
+"intersection or picking."
+msgstr ""
+"Возвращает 3D-позицию в мировом пространстве, которая является результатом "
+"проецирования точки на прямоугольник [Viewport] обратной проекцией камеры. "
+"Это полезно для отбрасывания лучей в форме (origin, normal) для пересечения "
+"или выбора объектов."
+
+msgid ""
+"Based on [param value], enables or disables the specified layer in the "
+"[member cull_mask], given a [param layer_number] between 1 and 20."
+msgstr ""
+"На основе [значения параметра] включает или отключает указанный слой в "
+"[маске_отсечения_элемента] при заданном [номер_параметра] от 1 до 20."
+
+msgid ""
+"Sets the camera projection to frustum mode (see [constant "
+"PROJECTION_FRUSTUM]), by specifying a [param size], an [param offset], and "
+"the [param z_near] and [param z_far] clip planes in world space units. See "
+"also [member frustum_offset]."
+msgstr ""
+"Устанавливает проекцию камеры в режим усеченной пирамиды (см. [constant "
+"PROJECTION_FRUSTUM]), указывая [param size], [param offset] и плоскости "
+"отсечения [param z_near] и [param z_far] в единицах мирового пространства. "
+"См. также [member frustum_offset]."
+
+msgid ""
+"Sets the camera projection to orthogonal mode (see [constant "
+"PROJECTION_ORTHOGONAL]), by specifying a [param size], and the [param z_near] "
+"and [param z_far] clip planes in world space units. (As a hint, 2D games "
+"often use this projection, with values specified in pixels.)"
+msgstr ""
+"Устанавливает проекцию камеры в ортогональный режим (см. [константу "
+"PROJECTION_ORTHOGONAL]), указывая [размер параметра] и плоскости отсечения "
+"[параметр z_near] и [параметр z_far] в единицах мирового пространства. (В "
+"качестве подсказки: 2D-игры часто используют эту проекцию со значениями, "
+"указанными в пикселях.)"
+
+msgid ""
+"Sets the camera projection to perspective mode (see [constant "
+"PROJECTION_PERSPECTIVE]), by specifying a [param fov] (field of view) angle "
+"in degrees, and the [param z_near] and [param z_far] clip planes in world "
+"space units."
+msgstr ""
+"Устанавливает проекцию камеры в режим перспективы (см. [константа "
+"PROJECTION_PERSPECTIVE]), указывая угол [param fov] (поле зрения) в градусах, "
+"а также плоскости отсечения [param z_near] и [param z_far] в единицах "
+"мирового пространства."
+
+msgid ""
+"Returns the 2D coordinate in the [Viewport] rectangle that maps to the given "
+"3D point in world space.\n"
+"[b]Note:[/b] When using this to position GUI elements over a 3D viewport, use "
+"[method is_position_behind] to prevent them from appearing if the 3D point is "
+"behind the camera:\n"
+"[codeblock]\n"
+"# This code block is part of a script that inherits from Node3D.\n"
+"# `control` is a reference to a node inheriting from Control.\n"
+"control.visible = not get_viewport().get_camera_3d()."
+"is_position_behind(global_transform.origin)\n"
+"control.position = get_viewport().get_camera_3d()."
+"unproject_position(global_transform.origin)\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает 2D-координату в прямоугольнике [Viewport], которая сопоставляется "
+"с заданной 3D-точкой в мировом пространстве.\n"
+"[b]Примечание:[/b] При использовании этого для позиционирования элементов GUI "
+"в 3D-окне просмотра используйте [method is_position_behind], чтобы "
+"предотвратить их появление, если 3D-точка находится за камерой:\n"
+"[codeblock]\n"
+"# Этот блок кода является частью скрипта, наследуемого от Node3D.\n"
+"# `control` — это ссылка на узел, наследуемый от Control.\n"
+"control.visible = not get_viewport().get_camera_3d()."
+"is_position_behind(global_transform.origin)\n"
+"control.position = get_viewport().get_camera_3d()."
+"unproject_position(global_transform.origin)\n"
+"[/codeblock]"
+
+msgid "The [CameraAttributes] to use for this camera."
+msgstr "[CameraAttributes] для использования с этой камерой."
+
+msgid ""
+"The culling mask that describes which [member VisualInstance3D.layers] are "
+"rendered by this camera. By default, all 20 user-visible layers are "
+"rendered.\n"
+"[b]Note:[/b] Since the [member cull_mask] allows for 32 layers to be stored "
+"in total, there are an additional 12 layers that are only used internally by "
+"the engine and aren't exposed in the editor. Setting [member cull_mask] using "
+"a script allows you to toggle those reserved layers, which can be useful for "
+"editor plugins.\n"
+"To adjust [member cull_mask] more easily using a script, use [method "
+"get_cull_mask_value] and [method set_cull_mask_value].\n"
+"[b]Note:[/b] [VoxelGI], SDFGI and [LightmapGI] will always take all layers "
+"into account to determine what contributes to global illumination. If this is "
+"an issue, set [member GeometryInstance3D.gi_mode] to [constant "
+"GeometryInstance3D.GI_MODE_DISABLED] for meshes and [member Light3D."
+"light_bake_mode] to [constant Light3D.BAKE_DISABLED] for lights to exclude "
+"them from global illumination."
+msgstr ""
+"Маска отбраковки, описывающая, какие [member VisualInstance3D.layers] "
+"визуализируются этой камерой. По умолчанию визуализируются все 20 видимых "
+"пользователю слоев.\n"
+"[b]Примечание:[/b] Поскольку [member cull_mask] позволяет хранить в общей "
+"сложности 32 слоя, есть еще 12 слоев, которые используются только внутренне "
+"движком и не отображаются в редакторе. Установка [member cull_mask] с помощью "
+"скрипта позволяет переключать эти зарезервированные слои, что может быть "
+"полезно для плагинов редактора.\n"
+"Чтобы упростить настройку [member cull_mask] с помощью скрипта, используйте "
+"[method get_cull_mask_value] и [method set_cull_mask_value].\n"
+"[b]Примечание:[/b] [VoxelGI], SDFGI и [LightmapGI] всегда будут учитывать все "
+"слои, чтобы определить, что влияет на глобальное освещение. Если это "
+"проблема, установите [member GeometryInstance3D.gi_mode] на [constant "
+"GeometryInstance3D.GI_MODE_DISABLED] для сеток и [member Light3D."
+"light_bake_mode] на [constant Light3D.BAKE_DISABLED] для источников света, "
+"чтобы исключить их из глобального освещения."
+
+msgid ""
+"If [code]true[/code], the ancestor [Viewport] is currently using this "
+"camera.\n"
+"If multiple cameras are in the scene, one will always be made current. For "
+"example, if two [Camera3D] nodes are present in the scene and only one is "
+"current, setting one camera's [member current] to [code]false[/code] will "
+"cause the other camera to be made current."
+msgstr ""
+"Если [code]true[/code], предок [Viewport] в данный момент использует эту "
+"камеру.\n"
+"Если в сцене несколько камер, одна из них всегда будет текущей. Например, "
+"если в сцене присутствуют два узла [Camera3D] и только один из них является "
+"текущим, установка [member current] одной камеры на [code]false[/code] "
+"приведет к тому, что другая камера станет текущей."
+
+msgid ""
+"If not [constant DOPPLER_TRACKING_DISABLED], this camera will simulate the "
+"[url=https://en.wikipedia.org/wiki/Doppler_effect]Doppler effect[/url] for "
+"objects changed in particular [code]_process[/code] methods. See [enum "
+"DopplerTracking] for possible values."
+msgstr ""
+"Если не [constant DOPPLER_TRACKING_DISABLED], эта камера будет имитировать "
+"[url=https://en.wikipedia.org/wiki/Doppler_effect]эффект Доплера[/url] для "
+"объектов, измененных в определенных методах [code]_process[/code]. См. [enum "
+"DopplerTracking] для возможных значений."
+
+msgid "The [Environment] to use for this camera."
+msgstr "[Окружение], используемое для этой камеры."
+
+msgid ""
+"The distance to the far culling boundary for this camera relative to its "
+"local Z axis. Higher values allow the camera to see further away, while "
+"decreasing [member far] can improve performance if it results in objects "
+"being partially or fully culled."
+msgstr ""
+"Расстояние до дальней границы отбраковки для этой камеры относительно ее "
+"локальной оси Z. Более высокие значения позволяют камере видеть дальше, в то "
+"время как уменьшение [member far] может улучшить производительность, если это "
+"приводит к частичной или полной отбраковке объектов."
+
+msgid ""
+"The camera's field of view angle (in degrees). Only applicable in perspective "
+"mode. Since [member keep_aspect] locks one axis, [member fov] sets the other "
+"axis' field of view angle.\n"
+"For reference, the default vertical field of view value ([code]75.0[/code]) "
+"is equivalent to a horizontal FOV of:\n"
+"- ~91.31 degrees in a 4:3 viewport\n"
+"- ~101.67 degrees in a 16:10 viewport\n"
+"- ~107.51 degrees in a 16:9 viewport\n"
+"- ~121.63 degrees in a 21:9 viewport"
+msgstr ""
+"Угол поля зрения камеры (в градусах). Применимо только в режиме перспективы. "
+"Поскольку [member keep_aspect] блокирует одну ось, [member fov] задает угол "
+"поля зрения другой оси.\n"
+"Для справки, значение вертикального поля зрения по умолчанию ([code]75.0[/"
+"code]) эквивалентно горизонтальному FOV:\n"
+"- ~91,31 градуса в окне просмотра 4:3\n"
+"- ~101,67 градуса в окне просмотра 16:10\n"
+"- ~107,51 градуса в окне просмотра 16:9\n"
+"- ~121,63 градуса в окне просмотра 21:9"
+
+msgid ""
+"The camera's frustum offset. This can be changed from the default to create "
+"\"tilted frustum\" effects such as [url=https://zdoom.org/wiki/Y-shearing]Y-"
+"shearing[/url].\n"
+"[b]Note:[/b] Only effective if [member projection] is [constant "
+"PROJECTION_FRUSTUM]."
+msgstr ""
+"Смещение фрустума камеры. Его можно изменить со значения по умолчанию, чтобы "
+"создать эффекты «наклонного фрустума», такие как [url=https://zdoom.org/wiki/"
+"Y-shearing]Y-shearing[/url].\n"
+"[b]Примечание:[/b] Действует только если [проекция члена] равна [константе "
+"PROJECTION_FRUSTUM]."
+
+msgid "The horizontal (X) offset of the camera viewport."
+msgstr "Горизонтальное (X) смещение области просмотра камеры."
+
+msgid ""
+"The axis to lock during [member fov]/[member size] adjustments. Can be either "
+"[constant KEEP_WIDTH] or [constant KEEP_HEIGHT]."
+msgstr ""
+"Ось для блокировки во время настроек [member fov]/[member size]. Может быть "
+"либо [constant KEEP_WIDTH], либо [constant KEEP_HEIGHT]."
+
+msgid ""
+"The distance to the near culling boundary for this camera relative to its "
+"local Z axis. Lower values allow the camera to see objects more up close to "
+"its origin, at the cost of lower precision across the [i]entire[/i] range. "
+"Values lower than the default can lead to increased Z-fighting."
+msgstr ""
+"Расстояние до ближайшей границы отбраковки для этой камеры относительно ее "
+"локальной оси Z. Более низкие значения позволяют камере видеть объекты ближе "
+"к ее началу координат, за счет более низкой точности по всему [i]всему[/i] "
+"диапазону. Значения ниже значения по умолчанию могут привести к увеличению Z-"
+"борьбы."
+
+msgid ""
+"The camera's projection mode. In [constant PROJECTION_PERSPECTIVE] mode, "
+"objects' Z distance from the camera's local space scales their perceived size."
+msgstr ""
+"Режим проекции камеры. В режиме [constant PROJECTION_PERSPECTIVE] расстояние "
+"Z объектов от локального пространства камеры масштабирует их воспринимаемый "
+"размер."
+
+msgid ""
+"The camera's size in meters measured as the diameter of the width or height, "
+"depending on [member keep_aspect]. Only applicable in orthogonal and frustum "
+"modes."
+msgstr ""
+"Размер камеры в метрах, измеряемый как диаметр ширины или высоты, в "
+"зависимости от [member keep_aspect]. Применимо только в ортогональном и "
+"усеченном режимах."
+
+msgid "The vertical (Y) offset of the camera viewport."
+msgstr "Вертикальное (Y) смещение области просмотра камеры."
+
+msgid ""
+"Perspective projection. Objects on the screen becomes smaller when they are "
+"far away."
+msgstr ""
+"Перспективная проекция. Объекты на экране становятся меньше по мере их "
+"удаления."
+
+msgid ""
+"Orthogonal projection, also known as orthographic projection. Objects remain "
+"the same size on the screen no matter how far away they are."
+msgstr ""
+"Ортогональная проекция, также известная как ортографическая проекция. Объекты "
+"остаются того же размера на экране, независимо от того, как далеко они "
+"находятся."
+
+msgid ""
+"Frustum projection. This mode allows adjusting [member frustum_offset] to "
+"create \"tilted frustum\" effects."
+msgstr ""
+"Усеченная проекция. Этот режим позволяет настраивать [member frustum_offset] "
+"для создания эффектов «наклонной усеченной пирамиды»."
+
+msgid ""
+"Preserves the horizontal aspect ratio; also known as Vert- scaling. This is "
+"usually the best option for projects running in portrait mode, as taller "
+"aspect ratios will benefit from a wider vertical FOV."
+msgstr ""
+"Сохраняет горизонтальное соотношение сторон; также известно как Vert-"
+"масштабирование. Обычно это лучший вариант для проектов, работающих в "
+"портретном режиме, так как более высокие соотношения сторон выиграют от более "
+"широкого вертикального FOV."
+
+msgid ""
+"Preserves the vertical aspect ratio; also known as Hor+ scaling. This is "
+"usually the best option for projects running in landscape mode, as wider "
+"aspect ratios will automatically benefit from a wider horizontal FOV."
+msgstr ""
+"Сохраняет вертикальное соотношение сторон; также известно как масштабирование "
+"Hor+. Обычно это лучший вариант для проектов, работающих в ландшафтном "
+"режиме, поскольку более широкие соотношения сторон автоматически выигрывают "
+"от более широкого горизонтального поля зрения (FOV)."
+
+msgid ""
+"Disables [url=https://en.wikipedia.org/wiki/Doppler_effect]Doppler effect[/"
+"url] simulation (default)."
+msgstr ""
+"Отключает имитацию [url=https://en.wikipedia.org/wiki/Doppler_effect]эффекта "
+"Доплера[/url] (по умолчанию)."
+
+msgid ""
+"Simulate [url=https://en.wikipedia.org/wiki/Doppler_effect]Doppler effect[/"
+"url] by tracking positions of objects that are changed in [code]_process[/"
+"code]. Changes in the relative velocity of this camera compared to those "
+"objects affect how audio is perceived (changing the audio's [member "
+"AudioStreamPlayer3D.pitch_scale])."
+msgstr ""
+"Имитация [url=https://en.wikipedia.org/wiki/Doppler_effect]эффекта Доплера[/"
+"url] путем отслеживания положений объектов, которые изменяются в "
+"[code]_process[/code]. Изменения относительной скорости этой камеры по "
+"сравнению с этими объектами влияют на восприятие звука (изменяя [member "
+"AudioStreamPlayer3D.pitch_scale] звука)."
+
+msgid ""
+"Simulate [url=https://en.wikipedia.org/wiki/Doppler_effect]Doppler effect[/"
+"url] by tracking positions of objects that are changed in "
+"[code]_physics_process[/code]. Changes in the relative velocity of this "
+"camera compared to those objects affect how audio is perceived (changing the "
+"audio's [member AudioStreamPlayer3D.pitch_scale])."
+msgstr ""
+"Имитация [url=https://en.wikipedia.org/wiki/Doppler_effect]эффекта Доплера[/"
+"url] путем отслеживания положений объектов, которые изменяются в "
+"[code]_physics_process[/code]. Изменения относительной скорости этой камеры "
+"по сравнению с этими объектами влияют на восприятие звука (изменяя [member "
+"AudioStreamPlayer3D.pitch_scale] звука)."
+
+msgid "Parent class for camera settings."
+msgstr "Родительский класс для настроек камеры."
+
+msgid ""
+"Controls camera-specific attributes such as depth of field and exposure "
+"override.\n"
+"When used in a [WorldEnvironment] it provides default settings for exposure, "
+"auto-exposure, and depth of field that will be used by all cameras without "
+"their own [CameraAttributes], including the editor camera. When used in a "
+"[Camera3D] it will override any [CameraAttributes] set in the "
+"[WorldEnvironment]. When used in [VoxelGI] or [LightmapGI], only the exposure "
+"settings will be used.\n"
+"See also [Environment] for general 3D environment settings.\n"
+"This is a pure virtual class that is inherited by [CameraAttributesPhysical] "
+"and [CameraAttributesPractical]."
+msgstr ""
+"Управляет атрибутами камеры, такими как глубина резкости и переопределение "
+"экспозиции.\n"
+"При использовании в [WorldEnvironment] он предоставляет настройки по "
+"умолчанию для экспозиции, автоэкспозиции и глубины резкости, которые будут "
+"использоваться всеми камерами без их собственных [CameraAttributes], включая "
+"камеру редактора. При использовании в [Camera3D] он переопределяет любые "
+"[CameraAttributes], установленные в [WorldEnvironment]. При использовании в "
+"[VoxelGI] или [LightmapGI] будут использоваться только настройки экспозиции.\n"
+"См. также [Environment] для общих настроек 3D-среды.\n"
+"Это чисто виртуальный класс, который наследуется [CameraAttributesPhysical] и "
+"[CameraAttributesPractical]."
+
+msgid ""
+"If [code]true[/code], enables the tonemapping auto exposure mode of the scene "
+"renderer. If [code]true[/code], the renderer will automatically determine the "
+"exposure setting to adapt to the scene's illumination and the observed light."
+msgstr ""
+"Если [code]true[/code], включает режим автоэкспозиции тональной компрессии "
+"рендерера сцены. Если [code]true[/code], рендерер автоматически определит "
+"настройку экспозиции для адаптации к освещению сцены и наблюдаемому свету."
+
+msgid ""
+"The scale of the auto exposure effect. Affects the intensity of auto exposure."
+msgstr "Масштаб эффекта автоэкспозиции. Влияет на интенсивность автоэкспозиции."
+
+msgid ""
+"The speed of the auto exposure effect. Affects the time needed for the camera "
+"to perform auto exposure."
+msgstr ""
+"Скорость эффекта автоэкспозиции. Влияет на время, необходимое камере для "
+"выполнения автоэкспозиции."
+
+msgid ""
+"Multiplier for the exposure amount. A higher value results in a brighter "
+"image."
+msgstr ""
+"Множитель для величины экспозиции. Более высокое значение дает более яркое "
+"изображение."
+
+msgid ""
+"Sensitivity of camera sensors, measured in ISO. A higher sensitivity results "
+"in a brighter image.\n"
+"If [member auto_exposure_enabled] is [code]true[/code], this can be used as a "
+"method of exposure compensation, doubling the value will increase the "
+"exposure value (measured in EV100) by 1 stop.\n"
+"[b]Note:[/b] Only available when [member ProjectSettings.rendering/"
+"lights_and_shadows/use_physical_light_units] is enabled."
+msgstr ""
+"Чувствительность сенсоров камеры, измеряемая в ISO. Более высокая "
+"чувствительность приводит к более яркому изображению.\n"
+"Если [member auto_exposure_enabled] имеет значение [code]true[/code], это "
+"можно использовать как метод компенсации экспозиции, удвоение значения "
+"увеличит значение экспозиции (измеряемое в EV100) на 1 ступень.\n"
+"[b]Примечание:[/b] Доступно только при включенном [member ProjectSettings."
+"rendering/lights_and_shadows/use_physical_light_units]."
+
+msgid "Physically-based camera settings."
+msgstr "Настройки камеры на основе физики."
+
+msgid ""
+"[CameraAttributesPhysical] is used to set rendering settings based on a "
+"physically-based camera's settings. It is responsible for exposure, auto-"
+"exposure, and depth of field.\n"
+"When used in a [WorldEnvironment] it provides default settings for exposure, "
+"auto-exposure, and depth of field that will be used by all cameras without "
+"their own [CameraAttributes], including the editor camera. When used in a "
+"[Camera3D] it will override any [CameraAttributes] set in the "
+"[WorldEnvironment] and will override the [Camera3D]s [member Camera3D.far], "
+"[member Camera3D.near], [member Camera3D.fov], and [member Camera3D."
+"keep_aspect] properties. When used in [VoxelGI] or [LightmapGI], only the "
+"exposure settings will be used.\n"
+"The default settings are intended for use in an outdoor environment, tips for "
+"settings for use in an indoor environment can be found in each setting's "
+"documentation.\n"
+"[b]Note:[/b] Depth of field blur is only supported in the Forward+ and Mobile "
+"rendering methods, not Compatibility."
+msgstr ""
+"[CameraAttributesPhysical] используется для установки параметров рендеринга "
+"на основе физических настроек камеры. Он отвечает за экспозицию, "
+"автоэкспозицию и глубину резкости.\n"
+"При использовании в [WorldEnvironment] он предоставляет настройки по "
+"умолчанию для экспозиции, автоэкспозиции и глубины резкости, которые будут "
+"использоваться всеми камерами без их собственных [CameraAttributes], включая "
+"камеру редактора. При использовании в [Camera3D] он переопределит любые "
+"[CameraAttributes], установленные в [WorldEnvironment], и переопределит "
+"свойства [Camera3D] [member Camera3D.far], [member Camera3D.near], [member "
+"Camera3D.fov] и [member Camera3D.keep_aspect]. При использовании в [VoxelGI] "
+"или [LightmapGI] будут использоваться только настройки экспозиции.\n"
+"Настройки по умолчанию предназначены для использования на открытом воздухе, "
+"советы по настройкам для использования в помещении можно найти в документации "
+"к каждому параметру.\n"
+"[b]Примечание:[/b] Размытие глубины резкости поддерживается только в методах "
+"рендеринга Forward+ и Mobile, а не Compatibility."
+
+msgid "Physical light and camera units"
+msgstr "Физические световые и камерные блоки"
+
+msgid ""
+"Returns the vertical field of view that corresponds to the [member "
+"frustum_focal_length]. This value is calculated internally whenever [member "
+"frustum_focal_length] is changed."
+msgstr ""
+"Возвращает вертикальное поле зрения, которое соответствует [member "
+"frustum_focal_length]. Это значение вычисляется внутренне всякий раз, когда "
+"изменяется [member frustum_focal_length]."
+
+msgid ""
+"The maximum luminance (in EV100) used when calculating auto exposure. When "
+"calculating scene average luminance, color values will be clamped to at least "
+"this value. This limits the auto-exposure from exposing below a certain "
+"brightness, resulting in a cut off point where the scene will remain bright."
+msgstr ""
+"Максимальная яркость (в EV100), используемая при расчете автоэкспозиции. При "
+"расчете средней яркости сцены цветовые значения будут ограничены по крайней "
+"мере этим значением. Это ограничивает автоэкспозицию от экспонирования ниже "
+"определенной яркости, что приводит к точке отсечения, в которой сцена "
+"останется яркой."
+
+msgid ""
+"The minimum luminance (in EV100) used when calculating auto exposure. When "
+"calculating scene average luminance, color values will be clamped to at least "
+"this value. This limits the auto-exposure from exposing above a certain "
+"brightness, resulting in a cut off point where the scene will remain dark."
+msgstr ""
+"Минимальная яркость (в EV100), используемая при расчете автоэкспозиции. При "
+"расчете средней яркости сцены цветовые значения будут ограничены по крайней "
+"мере этим значением. Это ограничивает автоэкспозицию от экспонирования выше "
+"определенной яркости, что приводит к точке отсечения, в которой сцена "
+"останется темной."
+
+msgid ""
+"Size of the aperture of the camera, measured in f-stops. An f-stop is a "
+"unitless ratio between the focal length of the camera and the diameter of the "
+"aperture. A high aperture setting will result in a smaller aperture which "
+"leads to a dimmer image and sharper focus. A low aperture results in a wide "
+"aperture which lets in more light resulting in a brighter, less-focused "
+"image. Default is appropriate for outdoors at daytime (i.e. for use with a "
+"default [DirectionalLight3D]), for indoor lighting, a value between 2 and 4 "
+"is more appropriate.\n"
+"Only available when [member ProjectSettings.rendering/lights_and_shadows/"
+"use_physical_light_units] is enabled."
+msgstr ""
+"Размер апертуры камеры, измеряемый в f-ступенях. F-ступень — это безразмерное "
+"отношение фокусного расстояния камеры к диаметру апертуры. Высокая настройка "
+"апертуры приведет к меньшей апертуре, что приведет к более тусклому "
+"изображению и более четкому фокусу. Низкая настройка апертуры приведет к "
+"широкой апертуре, которая пропускает больше света, что приведет к более "
+"яркому, менее сфокусированному изображению. Значение по умолчанию подходит "
+"для наружного освещения в дневное время (т. е. для использования с "
+"[DirectionalLight3D] по умолчанию), для внутреннего освещения более "
+"подходящим является значение от 2 до 4.\n"
+"Доступно только при включенном [member ProjectSettings.rendering/"
+"lights_and_shadows/use_physical_light_units]."
+
+msgid ""
+"Time for shutter to open and close, evaluated as [code]1 / shutter_speed[/"
+"code] seconds. A higher value will allow less light (leading to a darker "
+"image), while a lower value will allow more light (leading to a brighter "
+"image).\n"
+"Only available when [member ProjectSettings.rendering/lights_and_shadows/"
+"use_physical_light_units] is enabled."
+msgstr ""
+"Время открытия и закрытия затвора, оцениваемое как [code]1 / shutter_speed[/"
+"code] секунд. Более высокое значение допускает меньше света (что приводит к "
+"более темному изображению), а более низкое значение допускает больше света "
+"(что приводит к более яркому изображению).\n"
+"Доступно только при включенном [member ProjectSettings.rendering/"
+"lights_and_shadows/use_physical_light_units]."
+
+msgid ""
+"Override value for [member Camera3D.far]. Used internally when calculating "
+"depth of field. When attached to a [Camera3D] as its [member Camera3D."
+"attributes], it will override the [member Camera3D.far] property."
+msgstr ""
+"Переопределить значение для [member Camera3D.far]. Используется внутренне при "
+"расчете глубины резкости. При присоединении к [Camera3D] в качестве его "
+"[member Camera3D.attributes] переопределит свойство [member Camera3D.far]."
+
+msgid ""
+"Distance between camera lens and camera aperture, measured in millimeters. "
+"Controls field of view and depth of field. A larger focal length will result "
+"in a smaller field of view and a narrower depth of field meaning fewer "
+"objects will be in focus. A smaller focal length will result in a wider field "
+"of view and a larger depth of field meaning more objects will be in focus. "
+"When attached to a [Camera3D] as its [member Camera3D.attributes], it will "
+"override the [member Camera3D.fov] property and the [member Camera3D."
+"keep_aspect] property."
+msgstr ""
+"Расстояние между объективом камеры и апертурой камеры, измеряется в "
+"миллиметрах. Управляет полем зрения и глубиной резкости. Большее фокусное "
+"расстояние приведет к меньшему полю зрения и меньшей глубине резкости, что "
+"означает, что меньше объектов будет в фокусе. Меньшее фокусное расстояние "
+"приведет к более широкому полю зрения и большей глубине резкости, что "
+"означает, что больше объектов будет в фокусе. При присоединении к [Camera3D] "
+"в качестве его [member Camera3D.attributes] он переопределит свойство [member "
+"Camera3D.fov] и свойство [member Camera3D.keep_aspect]."
+
+msgid ""
+"Distance from camera of object that will be in focus, measured in meters. "
+"Internally this will be clamped to be at least 1 millimeter larger than "
+"[member frustum_focal_length]."
+msgstr ""
+"Расстояние от камеры до объекта, который будет в фокусе, измеряется в метрах. "
+"Внутренне это будет ограничено как минимум на 1 миллиметр больше, чем [member "
+"frustum_focal_length]."
+
+msgid ""
+"Override value for [member Camera3D.near]. Used internally when calculating "
+"depth of field. When attached to a [Camera3D] as its [member Camera3D."
+"attributes], it will override the [member Camera3D.near] property."
+msgstr ""
+"Переопределяет значение для [member Camera3D.near]. Используется внутренне "
+"при расчете глубины резкости. При присоединении к [Camera3D] в качестве его "
+"[member Camera3D.attributes] переопределяет свойство [member Camera3D.near]."
+
+msgid "Camera settings in an easy to use format."
+msgstr "Настройки камеры в удобном формате."
+
+msgid ""
+"Controls camera-specific attributes such as auto-exposure, depth of field, "
+"and exposure override.\n"
+"When used in a [WorldEnvironment] it provides default settings for exposure, "
+"auto-exposure, and depth of field that will be used by all cameras without "
+"their own [CameraAttributes], including the editor camera. When used in a "
+"[Camera3D] it will override any [CameraAttributes] set in the "
+"[WorldEnvironment]. When used in [VoxelGI] or [LightmapGI], only the exposure "
+"settings will be used."
+msgstr ""
+"Управляет атрибутами камеры, такими как автоэкспозиция, глубина резкости и "
+"переопределение экспозиции.\n"
+"При использовании в [WorldEnvironment] он предоставляет настройки по "
+"умолчанию для экспозиции, автоэкспозиции и глубины резкости, которые будут "
+"использоваться всеми камерами без их собственных [CameraAttributes], включая "
+"камеру редактора. При использовании в [Camera3D] он переопределяет любые "
+"[CameraAttributes], установленные в [WorldEnvironment]. При использовании в "
+"[VoxelGI] или [LightmapGI] будут использоваться только настройки экспозиции."
+
+msgid ""
+"The maximum sensitivity (in ISO) used when calculating auto exposure. When "
+"calculating scene average luminance, color values will be clamped to at least "
+"this value. This limits the auto-exposure from exposing below a certain "
+"brightness, resulting in a cut off point where the scene will remain bright."
+msgstr ""
+"Максимальная чувствительность (в ISO), используемая при расчете "
+"автоэкспозиции. При расчете средней яркости сцены цветовые значения будут "
+"ограничены по крайней мере этим значением. Это ограничивает автоэкспозицию от "
+"экспонирования ниже определенной яркости, что приводит к точке отсечения, в "
+"которой сцена останется яркой."
+
+msgid ""
+"The minimum sensitivity (in ISO) used when calculating auto exposure. When "
+"calculating scene average luminance, color values will be clamped to at least "
+"this value. This limits the auto-exposure from exposing above a certain "
+"brightness, resulting in a cut off point where the scene will remain dark."
+msgstr ""
+"Минимальная чувствительность (в ISO), используемая при расчете "
+"автоэкспозиции. При расчете средней яркости сцены цветовые значения будут "
+"ограничены по крайней мере этим значением. Это ограничивает автоэкспозицию от "
+"экспонирования выше определенной яркости, что приводит к точке отсечения, в "
+"которой сцена останется темной."
+
+msgid ""
+"Sets the maximum amount of blur. When using physically-based blur amounts, "
+"will instead act as a multiplier. High values lead to an increased amount of "
+"blurriness, but can be much more expensive to calculate. It is best to keep "
+"this as low as possible for a given art style."
+msgstr ""
+"Устанавливает максимальное количество размытия. При использовании физически "
+"обоснованных значений размытия будет действовать как множитель. Высокие "
+"значения приводят к увеличению количества размытия, но могут быть намного "
+"более затратными для расчета. Лучше всего поддерживать это значение как можно "
+"ниже для данного стиля искусства."
+
+msgid ""
+"Objects further from the [Camera3D] by this amount will be blurred by the "
+"depth of field effect. Measured in meters."
+msgstr ""
+"Объекты, находящиеся дальше от [Camera3D] на эту величину, будут размыты "
+"эффектом глубины резкости. Измеряется в метрах."
+
+msgid ""
+"Enables depth of field blur for objects further than [member "
+"dof_blur_far_distance]. Strength of blur is controlled by [member "
+"dof_blur_amount] and modulated by [member dof_blur_far_transition].\n"
+"[b]Note:[/b] Depth of field blur is only supported in the Forward+ and Mobile "
+"rendering methods, not Compatibility."
+msgstr ""
+"Включает размытие глубины резкости для объектов, находящихся дальше, чем "
+"[member dof_blur_far_distance]. Сила размытия контролируется [member "
+"dof_blur_amount] и модулируется [member dof_blur_far_transition].\n"
+"[b]Примечание:[/b] Размытие глубины резкости поддерживается только в методах "
+"рендеринга Forward+ и Mobile, но не Compatibility."
+
+msgid ""
+"When positive, distance over which (starting from [member "
+"dof_blur_far_distance]) blur effect will scale from 0 to [member "
+"dof_blur_amount]. When negative, uses physically-based scaling so depth of "
+"field effect will scale from 0 at [member dof_blur_far_distance] and will "
+"increase in a physically accurate way as objects get further from the "
+"[Camera3D]."
+msgstr ""
+"При положительном значении расстояние, на котором (начиная с [member "
+"dof_blur_far_distance]) эффект размытия будет масштабироваться от 0 до "
+"[member dof_blur_amount]. При отрицательном значении используется физически "
+"обоснованное масштабирование, поэтому эффект глубины резкости будет "
+"масштабироваться от 0 при [member dof_blur_far_distance] и будет "
+"увеличиваться физически точным образом по мере удаления объектов от "
+"[Camera3D]."
+
+msgid ""
+"Objects closer from the [Camera3D] by this amount will be blurred by the "
+"depth of field effect. Measured in meters."
+msgstr ""
+"Объекты, расположенные ближе к [Camera3D] на эту величину, будут размыты "
+"эффектом глубины резкости. Измеряется в метрах."
+
+msgid ""
+"Enables depth of field blur for objects closer than [member "
+"dof_blur_near_distance]. Strength of blur is controlled by [member "
+"dof_blur_amount] and modulated by [member dof_blur_near_transition].\n"
+"[b]Note:[/b] Depth of field blur is only supported in the Forward+ and Mobile "
+"rendering methods, not Compatibility."
+msgstr ""
+"Включает размытие глубины резкости для объектов ближе, чем [member "
+"dof_blur_near_distance]. Сила размытия контролируется [member "
+"dof_blur_amount] и модулируется [member dof_blur_near_transition].\n"
+"[b]Примечание:[/b] Размытие глубины резкости поддерживается только в методах "
+"рендеринга Forward+ и Mobile, но не Compatibility."
+
+msgid ""
+"When positive, distance over which blur effect will scale from 0 to [member "
+"dof_blur_amount], ending at [member dof_blur_near_distance]. When negative, "
+"uses physically-based scaling so depth of field effect will scale from 0 at "
+"[member dof_blur_near_distance] and will increase in a physically accurate "
+"way as objects get closer to the [Camera3D]."
+msgstr ""
+"При положительном значении расстояние, на котором эффект размытия будет "
+"масштабироваться от 0 до [member dof_blur_amount], заканчиваясь на [member "
+"dof_blur_near_distance]. При отрицательном значении используется физически "
+"обоснованное масштабирование, поэтому эффект глубины резкости будет "
+"масштабироваться от 0 до [member dof_blur_near_distance] и будет "
+"увеличиваться физически точным образом по мере приближения объектов к "
+"[Camera3D]."
+
+msgid ""
+"A camera feed gives you access to a single physical camera attached to your "
+"device."
+msgstr ""
+"Видеопоток с камеры обеспечивает вам доступ к одной физической камере, "
+"подключенной к вашему устройству."
+
+msgid ""
+"A camera feed gives you access to a single physical camera attached to your "
+"device. When enabled, Godot will start capturing frames from the camera which "
+"can then be used. See also [CameraServer].\n"
+"[b]Note:[/b] Many cameras will return YCbCr images which are split into two "
+"textures and need to be combined in a shader. Godot does this automatically "
+"for you if you set the environment to show the camera image in the "
+"background.\n"
+"[b]Note:[/b] This class is currently only implemented on Linux, macOS, and "
+"iOS. On other platforms no [CameraFeed]s will be available. To get a "
+"[CameraFeed] on iOS, the camera plugin from [url=https://github.com/"
+"godotengine/godot-ios-plugins]godot-ios-plugins[/url] is required."
+msgstr ""
+"Канал камеры дает вам доступ к одной физической камере, подключенной к вашему "
+"устройству. При включении Godot начнет захватывать кадры с камеры, которые "
+"затем можно использовать. См. также [CameraServer].\n"
+"[b]Примечание:[/b] Многие камеры возвращают изображения YCbCr, которые "
+"разделены на две текстуры и должны быть объединены в шейдере. Godot делает "
+"это автоматически, если вы настроите среду для показа изображения камеры в "
+"фоновом режиме.\n"
+"[b]Примечание:[/b] Этот класс в настоящее время реализован только в Linux, "
+"macOS и iOS. На других платформах [CameraFeed]-ы будут недоступны. Чтобы "
+"получить [CameraFeed] на iOS, требуется плагин камеры из [url=https://github."
+"com/godotengine/godot-ios-plugins]godot-ios-plugins[/url]."
+
+msgid ""
+"Returns the texture backend ID (usable by some external libraries that need a "
+"handle to a texture to write data)."
+msgstr ""
+"Возвращает идентификатор бэкэнда текстуры (может использоваться некоторыми "
+"внешними библиотеками, которым требуется дескриптор текстуры для записи "
+"данных)."
+
+msgid "Sets the feed as external feed provided by another library."
+msgstr ""
+"Устанавливает канал как внешний канал, предоставляемый другой библиотекой."
+
+msgid ""
+"Sets the feed format parameters for the given index in the [member formats] "
+"array. Returns [code]true[/code] on success. By default YUYV encoded stream "
+"is transformed to FEED_RGB. YUYV encoded stream output format can be changed "
+"with [param parameters].output value:\n"
+"[code]separate[/code] will result in FEED_YCBCR_SEP\n"
+"[code]grayscale[/code] will result in desaturated FEED_RGB\n"
+"[code]copy[/code] will result in FEED_YCBCR"
+msgstr ""
+"Устанавливает параметры формата фида для указанного индекса в массиве [member "
+"formats]. Возвращает [code]true[/code] в случае успеха. По умолчанию поток, "
+"закодированный YUYV, преобразуется в FEED_RGB. Формат выходного потока, "
+"закодированного YUYV, можно изменить с помощью [param options].output value:\n"
+"[code]separate (отдельный)[/code] приведет к FEED_YCBCR_SEP\n"
+"[code]grayscale (оттенки серого)[/code] приведет к ненасыщенности FEED_RGB\n"
+"[code]copy (копия)[/code] приведет к FEED_YCBCR"
+
+msgid "The transform applied to the camera's image."
+msgstr "Преобразование, примененное к изображению с камеры."
+
+msgid ""
+"Formats supported by the feed. Each entry is a [Dictionary] describing format "
+"parameters."
+msgstr ""
+"Форматы, поддерживаемые каналом. Каждая запись — это [Словарь (Dictionary)], "
+"описывающий параметры формата."
+
+msgid "Feed supplies RGB images."
+msgstr "Канал поставляет изображения RGB."
+
+msgid "Feed supplies YCbCr images that need to be converted to RGB."
+msgstr ""
+"Канал поставляет изображения YCbCr, которые необходимо преобразовать в RGB."
+
+msgid ""
+"Feed supplies separate Y and CbCr images that need to be combined and "
+"converted to RGB."
+msgstr ""
+"Канал поставляет отдельные изображения Y и CbCr, которые необходимо "
+"объединить и преобразовать в RGB."
+
+msgid "Feed supplies external image."
+msgstr "Канал поставляет внешнее изображение."
+
+msgid "Unspecified position."
+msgstr "Неуказанная должность."
+
+msgid "Camera is mounted at the front of the device."
+msgstr "Камера установлена на передней части устройства."
+
+msgid "Camera is mounted at the back of the device."
+msgstr "Камера установлена на задней панели устройства."
+
+msgid "Server keeping track of different cameras accessible in Godot."
+msgstr "Сервер отслеживает различные камеры, доступные в Godot."
+
+msgid ""
+"The [CameraServer] keeps track of different cameras accessible in Godot. "
+"These are external cameras such as webcams or the cameras on your phone.\n"
+"It is notably used to provide AR modules with a video feed from the camera.\n"
+"[b]Note:[/b] This class is currently only implemented on Linux, macOS, and "
+"iOS. On other platforms no [CameraFeed]s will be available. To get a "
+"[CameraFeed] on iOS, the camera plugin from [url=https://github.com/"
+"godotengine/godot-ios-plugins]godot-ios-plugins[/url] is required."
+msgstr ""
+"[CameraServer] отслеживает различные камеры, доступные в Godot. Это внешние "
+"камеры, такие как веб-камеры или камеры на вашем телефоне.\n"
+"Он в частности используется для предоставления AR-модулям видеопотока с "
+"камеры.\n"
+"[b]Примечание:[/b] Этот класс в настоящее время реализован только в Linux, "
+"macOS и iOS. На других платформах [CameraFeed]s будут недоступны. Чтобы "
+"получить [CameraFeed] на iOS, требуется плагин камеры из [url=https://github."
+"com/godotengine/godot-ios-plugins]godot-ios-plugins[/url]."
+
+msgid "Returns an array of [CameraFeed]s."
+msgstr "Возвращает массив [CameraFeed]-ов."
+
+msgid "Returns the number of [CameraFeed]s registered."
+msgstr "Возвращает количество зарегистрированных [CameraFeed]-ов."
+
+msgid "Emitted when a [CameraFeed] is added (e.g. a webcam is plugged in)."
+msgstr ""
+"Выдается при добавлении [CameraFeed] (например, при подключении веб-камеры)."
+
+msgid "Emitted when a [CameraFeed] is removed (e.g. a webcam is unplugged)."
+msgstr ""
+"Выдается при отключении [CameraFeed] (например, при отключении веб-камеры)."
+
+msgid "The RGBA camera image."
+msgstr "Изображение с камеры RGBA."
+
+msgid "The [url=https://en.wikipedia.org/wiki/YCbCr]YCbCr[/url] camera image."
+msgstr ""
+"Изображение с камеры [url=https://en.wikipedia.org/wiki/YCbCr]YCbCr[/url]."
+
+msgid "The Y component camera image."
+msgstr "Изображение камеры Y-компоненты."
+
+msgid "The CbCr component camera image."
+msgstr "Изображение с камеры компонента CbCr."
+
+msgid "Texture provided by a [CameraFeed]."
+msgstr "Текстура предоставлена [CameraFeed]."
+
+msgid ""
+"This texture gives access to the camera texture provided by a [CameraFeed].\n"
+"[b]Note:[/b] Many cameras supply YCbCr images which need to be converted in a "
+"shader."
+msgstr ""
+"Эта текстура дает доступ к текстуре камеры, предоставленной [CameraFeed].\n"
+"[b]Примечание:[/b] Многие камеры предоставляют изображения YCbCr, которые "
+"необходимо преобразовать в шейдере."
+
+msgid "The ID of the [CameraFeed] for which we want to display the image."
+msgstr ""
+"Идентификатор [CameraFeed], для которого мы хотим отобразить изображение."
+
+msgid ""
+"Convenience property that gives access to the active property of the "
+"[CameraFeed]."
+msgstr ""
+"Удобное свойство, которое предоставляет доступ к активному свойству "
+"[CameraFeed]."
+
+msgid ""
+"Which image within the [CameraFeed] we want access to, important if the "
+"camera image is split in a Y and CbCr component."
+msgstr ""
+"К какому изображению в [CameraFeed] мы хотим получить доступ, важно, если "
+"изображение с камеры разделено на компоненты Y и CbCr."
+
+msgid "Merges several 2D nodes into a single draw operation."
+msgstr "Объединяет несколько 2D-узлов в одну операцию рисования."
+
+msgid ""
+"Child [CanvasItem] nodes of a [CanvasGroup] are drawn as a single object. It "
+"allows to e.g. draw overlapping translucent 2D nodes without blending (set "
+"[member CanvasItem.self_modulate] property of [CanvasGroup] to achieve this "
+"effect).\n"
+"[b]Note:[/b] The [CanvasGroup] uses a custom shader to read from the "
+"backbuffer to draw its children. Assigning a [Material] to the [CanvasGroup] "
+"overrides the builtin shader. To duplicate the behavior of the builtin shader "
+"in a custom [Shader] use the following:\n"
+"[codeblock]\n"
+"shader_type canvas_item;\n"
+"render_mode unshaded;\n"
+"\n"
+"uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, "
+"filter_nearest;\n"
+"\n"
+"void fragment() {\n"
+"    vec4 c = textureLod(screen_texture, SCREEN_UV, 0.0);\n"
+"\n"
+"    if (c.a > 0.0001) {\n"
+"        c.rgb /= c.a;\n"
+"    }\n"
+"\n"
+"    COLOR *= c;\n"
+"}\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Since [CanvasGroup] and [member CanvasItem.clip_children] both "
+"utilize the backbuffer, children of a [CanvasGroup] who have their [member "
+"CanvasItem.clip_children] set to anything other than [constant CanvasItem."
+"CLIP_CHILDREN_DISABLED] will not function correctly."
+msgstr ""
+"Дочерние узлы [CanvasItem] [CanvasGroup] рисуются как один объект. Это "
+"позволяет, например, рисовать перекрывающиеся полупрозрачные 2D-узлы без "
+"смешивания (задайте свойство [member CanvasItem.self_modulate] [CanvasGroup], "
+"чтобы добиться этого эффекта).\n"
+"[b]Примечание:[/b] [CanvasGroup] использует пользовательский шейдер для "
+"чтения из буфера заднего плана для рисования своих дочерних элементов. "
+"Назначение [Material] [CanvasGroup] переопределяет встроенный шейдер. Чтобы "
+"дублировать поведение встроенного шейдера в пользовательском [Shader], "
+"используйте следующее:\n"
+"[codeblock]\n"
+"shader_type canvas_item;\n"
+"render_mode unshaded;\n"
+"\n"
+"uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, "
+"filter_nearest;\n"
+"\n"
+"void fragment() {\n"
+"    vec4 c = textureLod(screen_texture, SCREEN_UV, 0.0);\n"
+"\n"
+"    if (c.a > 0.0001) {\n"
+"        c.rgb /= c.a;\n"
+"    }\n"
+"\n"
+"    COLOR *= c;\n"
+"}\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Поскольку [CanvasGroup] и [member CanvasItem."
+"clip_children] используют фоновый буфер, дочерние элементы [CanvasGroup], у "
+"которых [member CanvasItem.clip_children] установлен на что-либо, кроме "
+"[constant CanvasItem.CLIP_CHILDREN_DISABLED], не будут работать правильно."
+
+msgid ""
+"Sets the size of the margin used to expand the clearing rect of this "
+"[CanvasGroup]. This expands the area of the backbuffer that will be used by "
+"the [CanvasGroup]. A smaller margin will reduce the area of the backbuffer "
+"used which can increase performance, however if [member use_mipmaps] is "
+"enabled, a small margin may result in mipmap errors at the edge of the "
+"[CanvasGroup]. Accordingly, this should be left as small as possible, but "
+"should be increased if artifacts appear along the edges of the canvas group."
+msgstr ""
+"Устанавливает размер поля, используемого для расширения очищаемого "
+"прямоугольника этого [CanvasGroup]. Это расширяет область заднего буфера, "
+"которая будет использоваться [CanvasGroup]. Меньшее поле уменьшит область "
+"используемого заднего буфера, что может повысить производительность, однако, "
+"если включен [member use_mipmaps], небольшое поле может привести к ошибкам "
+"mipmap на краю [CanvasGroup]. Соответственно, его следует оставить как можно "
+"меньше, но следует увеличить, если по краям группы холстов появляются "
+"артефакты."
+
+msgid ""
+"Sets the size of a margin used to expand the drawable rect of this "
+"[CanvasGroup]. The size of the [CanvasGroup] is determined by fitting a rect "
+"around its children then expanding that rect by [member fit_margin]. This "
+"increases both the backbuffer area used and the area covered by the "
+"[CanvasGroup] both of which can reduce performance. This should be kept as "
+"small as possible and should only be expanded when an increased size is "
+"needed (e.g. for custom shader effects)."
+msgstr ""
+"Устанавливает размер поля, используемого для расширения отрисовываемого "
+"прямоугольника этого [CanvasGroup]. Размер [CanvasGroup] определяется путем "
+"подгонки прямоугольника вокруг его дочерних элементов, а затем расширения "
+"этого прямоугольника на [member fit_margin]. Это увеличивает как используемую "
+"область заднего буфера, так и область, охватываемую [CanvasGroup], что может "
+"снизить производительность. Это должно быть как можно меньше и должно "
+"расширяться только тогда, когда требуется увеличенный размер (например, для "
+"пользовательских эффектов шейдера)."
+
+msgid ""
+"If [code]true[/code], calculates mipmaps for the backbuffer before drawing "
+"the [CanvasGroup] so that mipmaps can be used in a custom [ShaderMaterial] "
+"attached to the [CanvasGroup]. Generating mipmaps has a performance cost so "
+"this should not be enabled unless required."
+msgstr ""
+"Если [code]true[/code], вычисляет mip-карты для заднего буфера перед "
+"рисованием [CanvasGroup], чтобы mip-карты можно было использовать в "
+"пользовательском [ShaderMaterial], прикрепленном к [CanvasGroup]. Генерация "
+"mip-карт снижает производительность, поэтому ее не следует включать, если это "
+"не требуется."
+
+msgid ""
+"Abstract base class for everything in 2D space. Canvas items are laid out in "
+"a tree; children inherit and extend their parent's transform. [CanvasItem] is "
+"extended by [Control] for GUI-related nodes, and by [Node2D] for 2D game "
+"objects.\n"
+"Any [CanvasItem] can draw. For this, [method queue_redraw] is called by the "
+"engine, then [constant NOTIFICATION_DRAW] will be received on idle time to "
+"request a redraw. Because of this, canvas items don't need to be redrawn on "
+"every frame, improving the performance significantly. Several functions for "
+"drawing on the [CanvasItem] are provided (see [code]draw_*[/code] functions). "
+"However, they can only be used inside [method _draw], its corresponding "
+"[method Object._notification] or methods connected to the [signal draw] "
+"signal.\n"
+"Canvas items are drawn in tree order on their canvas layer. By default, "
+"children are on top of their parents, so a root [CanvasItem] will be drawn "
+"behind everything. This behavior can be changed on a per-item basis.\n"
+"A [CanvasItem] can be hidden, which will also hide its children. By adjusting "
+"various other properties of a [CanvasItem], you can also modulate its color "
+"(via [member modulate] or [member self_modulate]), change its Z-index, blend "
+"mode, and more.\n"
+"Note that properties like transform, modulation, and visibility are only "
+"propagated to [i]direct[/i] [CanvasItem] child nodes. If there is a non-"
+"[CanvasItem] node in between, like [Node] or [AnimationPlayer], the "
+"[CanvasItem] nodes below will have an independent position and [member "
+"modulate] chain. See also [member top_level]."
+msgstr ""
+"Абстрактный базовый класс для всего в 2D-пространстве. Элементы холста "
+"располагаются в дереве; дочерние элементы наследуют и расширяют "
+"преобразование своего родителя. [CanvasItem] расширяется [Control] для узлов, "
+"связанных с GUI, и [Node2D] для 2D-игровых объектов.\n"
+"Любой [CanvasItem] может рисовать. Для этого движок вызывает [method "
+"queue_redraw], затем во время простоя будет получена [constant "
+"NOTIFICATION_DRAW] для запроса перерисовки. Благодаря этому элементы холста "
+"не нужно перерисовывать в каждом кадре, что значительно повышает "
+"производительность. Предоставляется несколько функций для рисования на "
+"[CanvasItem] (см. функции [code]draw_*[/code]). Однако их можно использовать "
+"только внутри [method _draw], соответствующего ему [method Object."
+"_notification] или методов, связанных с сигналом [signal draw].\n"
+"Элементы холста рисуются в древовидном порядке на своем слое холста. По "
+"умолчанию дочерние элементы находятся поверх своих родителей, поэтому "
+"корневой [CanvasItem] будет отрисован позади всего. Это поведение можно "
+"изменить для каждого элемента.\n"
+"[CanvasItem] может быть скрыт, что также скроет его дочерние элементы. "
+"Изменяя различные другие свойства [CanvasItem], вы также можете модулировать "
+"его цвет (через [member modulate] или [member self_modulate]), изменять его Z-"
+"индекс, режим смешивания и многое другое.\n"
+"Обратите внимание, что такие свойства, как преобразование, модуляция и "
+"видимость, распространяются только на [i]direct[/i] дочерние узлы "
+"[CanvasItem]. Если между ними есть узел, не являющийся [CanvasItem], например "
+"[Node] или [AnimationPlayer], то узлы [CanvasItem] ниже будут иметь "
+"независимую позицию и цепочку [member modulate]. См. также [member top_level]."
+
+msgid "Viewport and canvas transforms"
+msgstr "Преобразования области просмотра и холста"
+
+msgid "Custom drawing in 2D"
+msgstr "Индивидуальный рисунок в 2D"
+
+msgid ""
+"Called when [CanvasItem] has been requested to redraw (after [method "
+"queue_redraw] is called, either manually or by the engine).\n"
+"Corresponds to the [constant NOTIFICATION_DRAW] notification in [method "
+"Object._notification]."
+msgstr ""
+"Вызывается, когда [CanvasItem] был запрошен для перерисовки (после вызова "
+"[method queue_redraw], вручную или движком).\n"
+"Соответствует уведомлению [constant NOTIFICATION_DRAW] в [method Object."
+"_notification]."
+
+msgid ""
+"Subsequent drawing commands will be ignored unless they fall within the "
+"specified animation slice. This is a faster way to implement animations that "
+"loop on background rather than redrawing constantly."
+msgstr ""
+"Последующие команды рисования будут игнорироваться, если они не попадают в "
+"указанный фрагмент анимации. Это более быстрый способ реализовать анимацию, "
+"которая зацикливается на фоне, а не перерисовывается постоянно."
+
+msgid ""
+"Draws an unfilled arc between the given angles with a uniform [param color] "
+"and [param width] and optional antialiasing (supported only for positive "
+"[param width]). The larger the value of [param point_count], the smoother the "
+"curve. See also [method draw_circle].\n"
+"If [param width] is negative, it will be ignored and the arc will be drawn "
+"using [constant RenderingServer.PRIMITIVE_LINE_STRIP]. This means that when "
+"the CanvasItem is scaled, the arc will remain thin. If this behavior is not "
+"desired, then pass a positive [param width] like [code]1.0[/code].\n"
+"The arc is drawn from [param start_angle] towards the value of [param "
+"end_angle] so in clockwise direction if [code]start_angle < end_angle[/code] "
+"and counter-clockwise otherwise. Passing the same angles but in reversed "
+"order will produce the same arc. If absolute difference of [param "
+"start_angle] and [param end_angle] is greater than [constant @GDScript.TAU] "
+"radians, then a full circle arc is drawn (i.e. arc will not overlap itself)."
+msgstr ""
+"Рисует незаполненную дугу между заданными углами с равномерным [param color] "
+"и [param width] и необязательным сглаживанием (поддерживается только для "
+"положительных [param width]). Чем больше значение [param point_count], тем "
+"более плавной будет кривая. См. также [method draw_circle].\n"
+"Если [param width] отрицательно, оно будет проигнорировано, и дуга будет "
+"нарисована с использованием [constant RenderingServer.PRIMITIVE_LINE_STRIP]. "
+"Это означает, что при масштабировании CanvasItem дуга останется тонкой. Если "
+"такое поведение нежелательно, передайте положительное [param width], например "
+"[code]1.0[/code].\n"
+"Дуга рисуется от [param start_angle] к значению [param end_angle], то есть по "
+"часовой стрелке, если [code]start_angle < end_angle[/code], и против часовой "
+"стрелки в противном случае. Передача тех же углов, но в обратном порядке, "
+"даст ту же дугу. Если абсолютная разница [param start_angle] и [param "
+"end_angle] больше, чем [constant @GDScript.TAU] радиан, то рисуется полная "
+"дуга окружности (т.е. дуга не будет перекрывать сама себя)."
+
+msgid "Draws a string first character using a custom font."
+msgstr "Рисует первый символ строки, используя пользовательский шрифт."
+
+msgid "Draws a string first character outline using a custom font."
+msgstr "Рисует контур первого символа строки, используя пользовательский шрифт."
+
+msgid ""
+"Draws a circle. See also [method draw_arc], [method draw_polyline], and "
+"[method draw_polygon].\n"
+"If [param filled] is [code]true[/code], the circle will be filled with the "
+"[param color] specified. If [param filled] is [code]false[/code], the circle "
+"will be drawn as a stroke with the [param color] and [param width] "
+"specified.\n"
+"If [param width] is negative, then two-point primitives will be drawn instead "
+"of a four-point ones. This means that when the CanvasItem is scaled, the "
+"lines will remain thin. If this behavior is not desired, then pass a positive "
+"[param width] like [code]1.0[/code].\n"
+"If [param antialiased] is [code]true[/code], half transparent \"feathers\" "
+"will be attached to the boundary, making outlines smooth.\n"
+"[b]Note:[/b] [param width] is only effective if [param filled] is "
+"[code]false[/code]."
+msgstr ""
+"Рисует круг. См. также [method draw_arc], [method draw_polyline] и [method "
+"draw_polygon].\n"
+"Если [param filled] имеет значение [code]true[/code], круг будет заполнен "
+"указанным [param color]. Если [param filled] имеет значение [code]false[/"
+"code], круг будет нарисован как штрих с указанными [param color] и [param "
+"width].\n"
+"Если [param width] имеет отрицательное значение, то будут нарисованы "
+"двухточечные примитивы вместо четырехточечных. Это означает, что при "
+"масштабировании CanvasItem линии останутся тонкими. Если такое поведение "
+"нежелательно, то передайте положительное значение [param width], например "
+"[code]1.0[/code].\n"
+"Если [param antialiased] имеет значение [code]true[/code], то к границе будут "
+"прикреплены полупрозрачные «перья», что сделает контуры плавными.\n"
+"[b]Примечание:[/b] [ширина параметра] эффективна только в том случае, если "
+"[заполненный параметр] имеет значение [code]false[/code]."
+
+msgid ""
+"Draws a colored polygon of any number of points, convex or concave. Unlike "
+"[method draw_polygon], a single color must be specified for the whole "
+"polygon.\n"
+"[b]Note:[/b] If you frequently redraw the same polygon with a large number of "
+"vertices, consider pre-calculating the triangulation with [method Geometry2D."
+"triangulate_polygon] and using [method draw_mesh], [method draw_multimesh], "
+"or [method RenderingServer.canvas_item_add_triangle_array]."
+msgstr ""
+"Рисует цветной многоугольник из любого количества точек, выпуклый или "
+"вогнутый. В отличие от [method draw_polygon], для всего многоугольника должен "
+"быть указан один цвет.\n"
+"[b]Примечание:[/b] Если вы часто перерисовываете один и тот же многоугольник "
+"с большим количеством вершин, рассмотрите возможность предварительного "
+"расчета триангуляции с помощью [method Geometry2D.triangulate_polygon] и "
+"использования [method draw_mesh], [method draw_multimesh] или [method "
+"RenderingServer.canvas_item_add_triangle_array]."
+
+msgid ""
+"Draws a dashed line from a 2D point to another, with a given color and width. "
+"See also [method draw_line], [method draw_multiline], and [method "
+"draw_polyline].\n"
+"If [param width] is negative, then a two-point primitives will be drawn "
+"instead of a four-point ones. This means that when the CanvasItem is scaled, "
+"the line parts will remain thin. If this behavior is not desired, then pass a "
+"positive [param width] like [code]1.0[/code].\n"
+"[param dash] is the length of each dash in pixels, with the gap between each "
+"dash being the same length. If [param aligned] is [code]true[/code], the "
+"length of the first and last dashes may be shortened or lengthened to allow "
+"the line to begin and end at the precise points defined by [param from] and "
+"[param to]. Both ends are always symmetrical when [param aligned] is "
+"[code]true[/code]. If [param aligned] is [code]false[/code], all dashes will "
+"have the same length, but the line may appear incomplete at the end due to "
+"the dash length not dividing evenly into the line length. Only full dashes "
+"are drawn when [param aligned] is [code]false[/code].\n"
+"If [param antialiased] is [code]true[/code], half transparent \"feathers\" "
+"will be attached to the boundary, making outlines smooth.\n"
+"[b]Note:[/b] [param antialiased] is only effective if [param width] is "
+"greater than [code]0.0[/code]."
+msgstr ""
+"Рисует пунктирную линию от 2D-точки до другой с заданным цветом и шириной. "
+"См. также [method draw_line], [method draw_multiline] и [method "
+"draw_polyline].\n"
+"Если [param width] отрицательный, то вместо четырехточечных примитивов будут "
+"нарисованы двухточечные. Это означает, что при масштабировании CanvasItem "
+"части линии останутся тонкими. Если такое поведение нежелательно, передайте "
+"положительное значение [param width], например [code]1.0[/code].\n"
+"[param dash] — длина каждого штриха в пикселях, при этом зазор между каждым "
+"штрихом будет иметь одинаковую длину. Если [paramalign] равен [code]true[/"
+"code], длина первого и последнего штрихов может быть укорочена или удлинёна, "
+"чтобы линия могла начинаться и заканчиваться в точных точках, заданных [param "
+"from] и [param to]. Оба конца всегда симметричны, если [paramalign] равен "
+"[code]true[/code]. Если [paramalign] равно [code]false[/code], все штрихи "
+"будут иметь одинаковую длину, но линия может выглядеть неполной в конце из-за "
+"того, что длина штриха не делится равномерно на длину линии. Только полные "
+"штрихи рисуются, когда [paramalign] равно [code]false[/code].\n"
+"Если [paramantialiased] равно [code]true[/code], к границе будут прикреплены "
+"полупрозрачные «перья», что сделает контуры плавными.\n"
+"[b]Примечание:[/b] [paramantialiased] эффективен только в том случае, если "
+"[paramwidth] больше [code]0.0[/code]."
+
+msgid ""
+"After submitting all animations slices via [method draw_animation_slice], "
+"this function can be used to revert drawing to its default state (all "
+"subsequent drawing commands will be visible). If you don't care about this "
+"particular use case, usage of this function after submitting the slices is "
+"not required."
+msgstr ""
+"После отправки всех фрагментов анимации через [метод draw_animation_slice] "
+"эта функция может быть использована для возврата рисования в состояние по "
+"умолчанию (все последующие команды рисования будут видны). Если вас не "
+"интересует этот конкретный вариант использования, использование этой функции "
+"после отправки фрагментов не требуется."
+
+msgid ""
+"Draws a textured rectangle region of the font texture with LCD subpixel anti-"
+"aliasing at a given position, optionally modulated by a color.\n"
+"Texture is drawn using the following blend operation, blend mode of the "
+"[CanvasItemMaterial] is ignored:\n"
+"[codeblock]\n"
+"dst.r = texture.r * modulate.r * modulate.a + dst.r * (1.0 - texture.r * "
+"modulate.a);\n"
+"dst.g = texture.g * modulate.g * modulate.a + dst.g * (1.0 - texture.g * "
+"modulate.a);\n"
+"dst.b = texture.b * modulate.b * modulate.a + dst.b * (1.0 - texture.b * "
+"modulate.a);\n"
+"dst.a = modulate.a + dst.a * (1.0 - modulate.a);\n"
+"[/codeblock]"
+msgstr ""
+"Рисует текстурированную прямоугольную область текстуры шрифта с ЖК-"
+"субпиксельным сглаживанием в заданной позиции, опционально модулируемую "
+"цветом. \n"
+"Текстура рисуется с использованием следующей операции смешивания, режим "
+"смешивания [CanvasItemMaterial] игнорируется:\n"
+"[codeblock]\n"
+"dst.r = texture.r * modulate.r * modulate.a + dst.r * (1.0 - texture.r * "
+"modulate.a);\n"
+"dst.g = texture.g * modulate.g * modulate.a + dst.g * (1.0 - texture.g * "
+"modulate.a);\n"
+"dst.b = texture.b * modulate.b * modulate.a + dst.b * (1.0 - texture.b * "
+"modulate.a);\n"
+"dst.a = modulate.a + dst.a * (1.0 - modulate.a);\n"
+"[/codeblock]"
+
+msgid ""
+"Draws a line from a 2D point to another, with a given color and width. It can "
+"be optionally antialiased. See also [method draw_dashed_line], [method "
+"draw_multiline], and [method draw_polyline].\n"
+"If [param width] is negative, then a two-point primitive will be drawn "
+"instead of a four-point one. This means that when the CanvasItem is scaled, "
+"the line will remain thin. If this behavior is not desired, then pass a "
+"positive [param width] like [code]1.0[/code]."
+msgstr ""
+"Рисует линию из 2D-точки в другую с заданным цветом и шириной. При желании ее "
+"можно сгладить. См. также [method draw_dashed_line], [method draw_multiline] "
+"и [method draw_polyline].\n"
+"Если [param width] отрицательный, то вместо четырехточечного примитива будет "
+"нарисован двухточечный. Это означает, что при масштабировании CanvasItem "
+"линия останется тонкой. Если такое поведение нежелательно, то передайте "
+"положительное значение [param width], например [code]1.0[/code]."
+
+msgid ""
+"Draws a [Mesh] in 2D, using the provided texture. See [MeshInstance2D] for "
+"related documentation."
+msgstr ""
+"Рисует [Mesh] в 2D, используя предоставленную текстуру. См. [MeshInstance2D] "
+"для соответствующей документации."
+
+msgid ""
+"Draws a textured rectangle region of the multi-channel signed distance field "
+"texture at a given position, optionally modulated by a color. See [member "
+"FontFile.multichannel_signed_distance_field] for more information and caveats "
+"about MSDF font rendering.\n"
+"If [param outline] is positive, each alpha channel value of pixel in region "
+"is set to maximum value of true distance in the [param outline] radius.\n"
+"Value of the [param pixel_range] should the same that was used during "
+"distance field texture generation."
+msgstr ""
+"Рисует текстурированную прямоугольную область многоканальной подписанной "
+"текстуры поля расстояний в заданной позиции, опционально модулированную "
+"цветом. См. [member FontFile.multichannel_signed_distance_field] для "
+"получения дополнительной информации и предостережений о рендеринге шрифтов "
+"MSDF.\n"
+"Если [param outline] положительный, каждое значение альфа-канала пикселя в "
+"области устанавливается на максимальное значение истинного расстояния в "
+"радиусе [param outline].\n"
+"Значение [param pixel_range] должно быть таким же, как и использовавшееся при "
+"генерации текстуры поля расстояний."
+
+msgid ""
+"Draws multiple disconnected lines with a uniform [param width] and [param "
+"color]. Each line is defined by two consecutive points from [param points] "
+"array, i.e. i-th segment consists of [code]points[2 * i][/code], "
+"[code]points[2 * i + 1][/code] endpoints. When drawing large amounts of "
+"lines, this is faster than using individual [method draw_line] calls. To draw "
+"interconnected lines, use [method draw_polyline] instead.\n"
+"If [param width] is negative, then two-point primitives will be drawn instead "
+"of a four-point ones. This means that when the CanvasItem is scaled, the "
+"lines will remain thin. If this behavior is not desired, then pass a positive "
+"[param width] like [code]1.0[/code].\n"
+"[b]Note:[/b] [param antialiased] is only effective if [param width] is "
+"greater than [code]0.0[/code]."
+msgstr ""
+"Рисует несколько разрозненных линий с одинаковыми [param width] и [param "
+"color]. Каждая линия определяется двумя последовательными точками из массива "
+"[param points], т. е. i-й сегмент состоит из [code]points[2 * i][/code], "
+"[code]points[2 * i + 1][/code] конечных точек. При рисовании большого "
+"количества линий это быстрее, чем использование отдельных вызовов [method "
+"draw_line]. Чтобы нарисовать взаимосвязанные линии, используйте [method "
+"draw_polyline].\n"
+"Если [param width] отрицательный, то вместо четырехточечных примитивов будут "
+"нарисованы двухточечные. Это означает, что при масштабировании CanvasItem "
+"линии останутся тонкими. Если такое поведение нежелательно, передайте "
+"положительное значение [param width], например [code]1.0[/code].\n"
+"[b]Примечание:[/b] [param antialiased] эффективен только в том случае, если "
+"[param width] больше [code]0.0[/code]."
+
+msgid ""
+"Draws multiple disconnected lines with a uniform [param width] and segment-by-"
+"segment coloring. Each segment is defined by two consecutive points from "
+"[param points] array and a corresponding color from [param colors] array, i."
+"e. i-th segment consists of [code]points[2 * i][/code], [code]points[2 * i + "
+"1][/code] endpoints and has [code]colors[i][/code] color. When drawing large "
+"amounts of lines, this is faster than using individual [method draw_line] "
+"calls. To draw interconnected lines, use [method draw_polyline_colors] "
+"instead.\n"
+"If [param width] is negative, then two-point primitives will be drawn instead "
+"of a four-point ones. This means that when the CanvasItem is scaled, the "
+"lines will remain thin. If this behavior is not desired, then pass a positive "
+"[param width] like [code]1.0[/code].\n"
+"[b]Note:[/b] [param antialiased] is only effective if [param width] is "
+"greater than [code]0.0[/code]."
+msgstr ""
+"Рисует несколько несвязанных линий с единой [шириной параметра] и "
+"посегментной раскраской. Каждый сегмент определяется двумя последовательными "
+"точками из массива [шириной параметра] и соответствующим цветом из массива "
+"[цветами параметра], т. е. i-й сегмент состоит из [code]точек[2 * i][/code], "
+"[code]точек[2 * i + 1][/code] конечных точек и имеет цвет [code]colors[i][/"
+"code]. При рисовании большого количества линий это быстрее, чем использование "
+"отдельных вызовов [метода draw_line]. Чтобы нарисовать взаимосвязанные линии, "
+"используйте [метод draw_polyline_colors].\n"
+"Если [ширина параметра] отрицательна, то вместо четырехточечных примитивов "
+"будут нарисованы двухточечные. Это означает, что при масштабировании "
+"CanvasItem линии останутся тонкими. Если такое поведение нежелательно, "
+"передайте положительное значение [ширины параметра], например [code]1.0[/"
+"code].\n"
+"[b]Примечание:[/b] [param antialiased] эффективен только в том случае, если "
+"[param width] больше, чем [code]0.0[/code]."
+
+msgid ""
+"Breaks [param text] into lines and draws it using the specified [param font] "
+"at the [param pos] (top-left corner). The text will have its color multiplied "
+"by [param modulate]. If [param width] is greater than or equal to 0, the text "
+"will be clipped if it exceeds the specified width."
+msgstr ""
+"Разбивает [param text] на строки и рисует их, используя указанный [param "
+"font] в [param pos] (верхний левый угол). Цвет текста будет умножен на [param "
+"modulate]. Если [param width] больше или равно 0, текст будет обрезан, если "
+"он превысит указанную ширину."
+
+msgid ""
+"Breaks [param text] to the lines and draws text outline using the specified "
+"[param font] at the [param pos] (top-left corner). The text will have its "
+"color multiplied by [param modulate]. If [param width] is greater than or "
+"equal to 0, the text will be clipped if it exceeds the specified width."
+msgstr ""
+"Разбивает [param text] на строки и рисует контур текста, используя указанный "
+"[param font] в [param pos] (верхний левый угол). Цвет текста будет умножен на "
+"[param modulate]. Если [param width] больше или равно 0, текст будет обрезан, "
+"если он превысит указанную ширину."
+
+msgid ""
+"Draws a [MultiMesh] in 2D with the provided texture. See "
+"[MultiMeshInstance2D] for related documentation."
+msgstr ""
+"Рисует [MultiMesh] в 2D с предоставленной текстурой. См. "
+"[MultiMeshInstance2D] для соответствующей документации."
+
+msgid ""
+"Draws a solid polygon of any number of points, convex or concave. Unlike "
+"[method draw_colored_polygon], each point's color can be changed "
+"individually. See also [method draw_polyline] and [method "
+"draw_polyline_colors]. If you need more flexibility (such as being able to "
+"use bones), use [method RenderingServer.canvas_item_add_triangle_array] "
+"instead.\n"
+"[b]Note:[/b] If you frequently redraw the same polygon with a large number of "
+"vertices, consider pre-calculating the triangulation with [method Geometry2D."
+"triangulate_polygon] and using [method draw_mesh], [method draw_multimesh], "
+"or [method RenderingServer.canvas_item_add_triangle_array]."
+msgstr ""
+"Рисует сплошной многоугольник из любого количества точек, выпуклых или "
+"вогнутых. В отличие от [method draw_colored_polygon], цвет каждой точки можно "
+"менять индивидуально. См. также [method draw_polyline] и [method "
+"draw_polyline_colors]. Если вам нужна большая гибкость (например, возможность "
+"использовать кости), используйте вместо этого [method RenderingServer."
+"canvas_item_add_triangle_array].\n"
+"[b]Примечание:[/b] Если вы часто перерисовываете один и тот же многоугольник "
+"с большим количеством вершин, рассмотрите возможность предварительного "
+"расчета триангуляции с помощью [method Geometry2D.triangulate_polygon] и "
+"использования [method draw_mesh], [method draw_multimesh] или [method "
+"RenderingServer.canvas_item_add_triangle_array]."
+
+msgid ""
+"Draws interconnected line segments with a uniform [param color] and [param "
+"width] and optional antialiasing (supported only for positive [param width]). "
+"When drawing large amounts of lines, this is faster than using individual "
+"[method draw_line] calls. To draw disconnected lines, use [method "
+"draw_multiline] instead. See also [method draw_polygon].\n"
+"If [param width] is negative, it will be ignored and the polyline will be "
+"drawn using [constant RenderingServer.PRIMITIVE_LINE_STRIP]. This means that "
+"when the CanvasItem is scaled, the polyline will remain thin. If this "
+"behavior is not desired, then pass a positive [param width] like [code]1.0[/"
+"code]."
+msgstr ""
+"Рисует взаимосвязанные сегменты линий с одинаковым [param color] и [param "
+"width] и необязательным сглаживанием (поддерживается только для "
+"положительного [param width]). При рисовании большого количества линий это "
+"быстрее, чем использование отдельных вызовов [method draw_line]. Чтобы "
+"нарисовать несвязанные линии, используйте вместо этого [method "
+"draw_multiline]. См. также [method draw_polygon].\n"
+"Если [param width] отрицательный, он будет проигнорирован, и полилиния "
+"(polyline) будет нарисована с использованием [constant RenderingServer."
+"PRIMITIVE_LINE_STRIP]. Это означает, что при масштабировании CanvasItem "
+"полилиния останется тонкой. Если такое поведение нежелательно, передайте "
+"положительное [param width], например [code]1.0[/code]."
+
+msgid ""
+"Draws interconnected line segments with a uniform [param width], point-by-"
+"point coloring, and optional antialiasing (supported only for positive [param "
+"width]). Colors assigned to line points match by index between [param points] "
+"and [param colors], i.e. each line segment is filled with a gradient between "
+"the colors of the endpoints. When drawing large amounts of lines, this is "
+"faster than using individual [method draw_line] calls. To draw disconnected "
+"lines, use [method draw_multiline_colors] instead. See also [method "
+"draw_polygon].\n"
+"If [param width] is negative, it will be ignored and the polyline will be "
+"drawn using [constant RenderingServer.PRIMITIVE_LINE_STRIP]. This means that "
+"when the CanvasItem is scaled, the polyline will remain thin. If this "
+"behavior is not desired, then pass a positive [param width] like [code]1.0[/"
+"code]."
+msgstr ""
+"Рисует взаимосвязанные сегменты линий с единообразной [шириной параметра], "
+"поточечной раскраской и необязательным сглаживанием (поддерживается только "
+"для положительного [ширины параметра]). Цвета, назначенные точкам линии, "
+"соответствуют индексу между [точками параметра] и [цветами параметра], т. е. "
+"каждый сегмент линии заполняется градиентом между цветами конечных точек. При "
+"рисовании большого количества линий это быстрее, чем использование отдельных "
+"вызовов [метода draw_line]. Чтобы нарисовать несвязанные линии, используйте "
+"[метод draw_multiline_colors]. См. также [метод draw_polygon].\n"
+"Если [ширина параметра] отрицательна, она будет проигнорирована, и полилиния "
+"будет нарисована с использованием [константы RenderingServer."
+"PRIMITIVE_LINE_STRIP]. Это означает, что при масштабировании CanvasItem "
+"полилиния останется тонкой. Если такое поведение нежелательно, передайте "
+"положительное значение [ширины параметра], например [code]1.0[/code]."
+
+msgid ""
+"Draws a custom primitive. 1 point for a point, 2 points for a line, 3 points "
+"for a triangle, and 4 points for a quad. If 0 points or more than 4 points "
+"are specified, nothing will be drawn and an error message will be printed. "
+"See also [method draw_line], [method draw_polyline], [method draw_polygon], "
+"and [method draw_rect]."
+msgstr ""
+"Рисует пользовательский примитив. 1 точка для точки, 2 точки для линии, 3 "
+"точки для треугольника и 4 точки для четырехугольника. Если указано 0 точек "
+"или более 4 точек, ничего не будет нарисовано и будет выведено сообщение об "
+"ошибке. См. также [method draw_line], [method draw_polyline], [method "
+"draw_polygon] и [method draw_rect]."
+
+msgid ""
+"Draws a rectangle. If [param filled] is [code]true[/code], the rectangle will "
+"be filled with the [param color] specified. If [param filled] is [code]false[/"
+"code], the rectangle will be drawn as a stroke with the [param color] and "
+"[param width] specified. See also [method draw_texture_rect].\n"
+"If [param width] is negative, then two-point primitives will be drawn instead "
+"of a four-point ones. This means that when the CanvasItem is scaled, the "
+"lines will remain thin. If this behavior is not desired, then pass a positive "
+"[param width] like [code]1.0[/code].\n"
+"If [param antialiased] is [code]true[/code], half transparent \"feathers\" "
+"will be attached to the boundary, making outlines smooth.\n"
+"[b]Note:[/b] [param width] is only effective if [param filled] is "
+"[code]false[/code].\n"
+"[b]Note:[/b] Unfilled rectangles drawn with a negative [param width] may not "
+"display perfectly. For example, corners may be missing or brighter due to "
+"overlapping lines (for a translucent [param color])."
+msgstr ""
+"Рисует прямоугольник. Если [param filled] равно [code]true[/code], "
+"прямоугольник будет заполнен указанным [param color]. Если [param filled] "
+"равно [code]false[/code], прямоугольник будет нарисован как штрих с "
+"указанными [param color] и [param width]. См. также [method "
+"draw_texture_rect].\n"
+"Если [param width] отрицательно, то будут нарисованы двухточечные примитивы "
+"вместо четырехточечных. Это означает, что при масштабировании CanvasItem "
+"линии останутся тонкими. Если такое поведение нежелательно, то передайте "
+"положительное [param width], например [code]1.0[/code].\n"
+"Если [param antialiased] равно [code]true[/code], то к границе будут "
+"прикреплены полупрозрачные «перья», что сделает контуры плавными.\n"
+"[b]Примечание:[/b] [param width] эффективен только в том случае, если [param "
+"filled] равно [code]false[/code].\n"
+"[b]Примечание:[/b] Незаполненные прямоугольники, нарисованные с отрицательным "
+"[param width], могут отображаться некорректно. Например, углы могут "
+"отсутствовать или быть ярче из-за перекрывающихся линий (для полупрозрачного "
+"[param color])."
+
+msgid ""
+"Sets a custom transform for drawing via components. Anything drawn afterwards "
+"will be transformed by this.\n"
+"[b]Note:[/b] [member FontFile.oversampling] does [i]not[/i] take [param "
+"scale] into account. This means that scaling up/down will cause bitmap fonts "
+"and rasterized (non-MSDF) dynamic fonts to appear blurry or pixelated. To "
+"ensure text remains crisp regardless of scale, you can enable MSDF font "
+"rendering by enabling [member ProjectSettings.gui/theme/"
+"default_font_multichannel_signed_distance_field] (applies to the default "
+"project font only), or enabling [b]Multichannel Signed Distance Field[/b] in "
+"the import options of a DynamicFont for custom fonts. On system fonts, "
+"[member SystemFont.multichannel_signed_distance_field] can be enabled in the "
+"inspector."
+msgstr ""
+"Устанавливает пользовательское преобразование для рисования через компоненты. "
+"Все, что будет нарисовано после этого, будет преобразовано этим.\n"
+"[b]Примечание:[/b] [member FontFile.oversampling] [i]не[/i] учитывает [param "
+"scale]. Это означает, что масштабирование вверх/вниз приведет к тому, что "
+"растровые шрифты и растрированные (не MSDF) динамические шрифты будут "
+"выглядеть размытыми или пикселизированными. Чтобы текст оставался четким "
+"независимо от масштаба, вы можете включить рендеринг шрифтов MSDF, включив "
+"[member ProjectSettings.gui/theme/"
+"default_font_multichannel_signed_distance_field] (применяется только к шрифту "
+"проекта по умолчанию) или включив [b]Multichannel Signed Distance Field[/b] в "
+"параметрах импорта DynamicFont для пользовательских шрифтов. В системных "
+"шрифтах [member SystemFont.multichannel_signed_distance_field] можно включить "
+"в инспекторе."
+
+msgid ""
+"Sets a custom transform for drawing via matrix. Anything drawn afterwards "
+"will be transformed by this."
+msgstr ""
+"Устанавливает пользовательское преобразование для рисования через матрицу. "
+"Все, что будет нарисовано после этого, будет преобразовано этим."
+
+msgid ""
+"Draws [param text] using the specified [param font] at the [param pos] "
+"(bottom-left corner using the baseline of the font). The text will have its "
+"color multiplied by [param modulate]. If [param width] is greater than or "
+"equal to 0, the text will be clipped if it exceeds the specified width.\n"
+"[b]Example:[/b] Draw \"Hello world\", using the project's default font:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# If using this method in a script that redraws constantly, move the\n"
+"# `default_font` declaration to a member variable assigned in `_ready()`\n"
+"# so the Control is only created once.\n"
+"var default_font = ThemeDB.fallback_font\n"
+"var default_font_size = ThemeDB.fallback_font_size\n"
+"draw_string(default_font, Vector2(64, 64), \"Hello world\", "
+"HORIZONTAL_ALIGNMENT_LEFT, -1, default_font_size)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// If using this method in a script that redraws constantly, move the\n"
+"// `default_font` declaration to a member variable assigned in `_Ready()`\n"
+"// so the Control is only created once.\n"
+"Font defaultFont = ThemeDB.FallbackFont;\n"
+"int defaultFontSize = ThemeDB.FallbackFontSize;\n"
+"DrawString(defaultFont, new Vector2(64, 64), \"Hello world\", "
+"HORIZONTAL_ALIGNMENT_LEFT, -1, defaultFontSize);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See also [method Font.draw_string]."
+msgstr ""
+"Рисует [param text] с использованием указанного [param font] в [param pos] "
+"(нижний левый угол с использованием базовой линии шрифта). Цвет текста будет "
+"умножен на [param modulate]. Если [param width] больше или равно 0, текст "
+"будет обрезан, если он превысит указанную ширину.\n"
+"[b]Пример:[/b] Рисуем \"Hello world\" с использованием шрифта проекта по "
+"умолчанию:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# При использовании этого метода в скрипте, который постоянно "
+"перерисовывается, переместите\n"
+"# объявление `default_font` в переменную-член, назначенную в `_ready()`\n"
+"# чтобы элемент управления создавался только один раз.\n"
+"var default_font = ThemeDB.fallback_font\n"
+"var default_font_size = ThemeDB.fallback_font_size\n"
+"draw_string(default_font, Vector2(64, 64), \"Hello world\", "
+"HORIZONTAL_ALIGNMENT_LEFT, -1, default_font_size)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"//При использовании этого метода в скрипте, который постоянно "
+"перерисовывается, переместите\n"
+"// объявление `default_font` в переменную-член, назначенную в `_ready()`\n"
+"// чтобы элемент управления создавался только один раз.\n"
+"Font defaultFont = ThemeDB.FallbackFont;\n"
+"int defaultFontSize = ThemeDB.FallbackFontSize;\n"
+"DrawString(defaultFont, new Vector2(64, 64), \"Hello world\", "
+"HORIZONTAL_ALIGNMENT_LEFT, -1, defaultFontSize);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"См. также [метод Font.draw_string]."
+
+msgid ""
+"Draws [param text] outline using the specified [param font] at the [param "
+"pos] (bottom-left corner using the baseline of the font). The text will have "
+"its color multiplied by [param modulate]. If [param width] is greater than or "
+"equal to 0, the text will be clipped if it exceeds the specified width."
+msgstr ""
+"Рисует контур [param text], используя указанный [param font] в [param pos] "
+"(нижний левый угол, используя базовую линию шрифта). Цвет текста будет "
+"умножен на [param modulate]. Если [param width] больше или равно 0, текст "
+"будет обрезан, если он превысит указанную ширину."
+
+msgid "Draws a styled rectangle."
+msgstr "Рисует стилизованный прямоугольник."
+
+msgid "Draws a texture at a given position."
+msgstr "Рисует текстуру в заданной позиции."
+
+msgid ""
+"Draws a textured rectangle at a given position, optionally modulated by a "
+"color. If [param transpose] is [code]true[/code], the texture will have its X "
+"and Y coordinates swapped. See also [method draw_rect] and [method "
+"draw_texture_rect_region]."
+msgstr ""
+"Рисует текстурированный прямоугольник в заданной позиции, опционально "
+"модулируемый цветом. Если [param transpose] равен [code]true[/code], то у "
+"текстуры будут поменяны координаты X и Y. См. также [method draw_rect] и "
+"[method draw_texture_rect_region]."
+
+msgid ""
+"Draws a textured rectangle from a texture's region (specified by [param "
+"src_rect]) at a given position, optionally modulated by a color. If [param "
+"transpose] is [code]true[/code], the texture will have its X and Y "
+"coordinates swapped. See also [method draw_texture_rect]."
+msgstr ""
+"Рисует текстурированный прямоугольник из области текстуры (указанной [param "
+"src_rect]) в заданной позиции, опционально модулируемый цветом. Если [param "
+"transpose] равен [code]true[/code], то у текстуры будут поменяны координаты X "
+"и Y. См. также [method draw_texture_rect]."
+
+msgid ""
+"Forces the transform to update. Transform changes in physics are not instant "
+"for performance reasons. Transforms are accumulated and then set. Use this if "
+"you need an up-to-date transform when doing physics operations."
+msgstr ""
+"Заставляет преобразование обновляться. Изменения преобразования в физике не "
+"происходят мгновенно по причинам производительности. Преобразования "
+"накапливаются, а затем устанавливаются. Используйте это, если вам нужно "
+"актуальное преобразование при выполнении физических операций."
+
+msgid "Returns the [RID] of the [World2D] canvas where this item is in."
+msgstr "Возвращает [RID] холста [World2D], в котором находится этот элемент."
+
+msgid "Returns the canvas item RID used by [RenderingServer] for this item."
+msgstr ""
+"Возвращает RID элемента холста, используемый [RenderingServer] для этого "
+"элемента."
+
+msgid ""
+"Returns the transform from the coordinate system of the canvas, this item is "
+"in, to the [Viewport]s coordinate system."
+msgstr ""
+"Возвращает преобразование из системы координат холста, в котором находится "
+"данный элемент, в систему координат [Viewport]-ов."
+
+msgid ""
+"Returns the mouse's position in the [CanvasLayer] that this [CanvasItem] is "
+"in using the coordinate system of the [CanvasLayer].\n"
+"[b]Note:[/b] For screen-space coordinates (e.g. when using a non-embedded "
+"[Popup]), you can use [method DisplayServer.mouse_get_position]."
+msgstr ""
+"Возвращает позицию мыши в [CanvasLayer], в которой находится этот "
+"[CanvasItem], используя систему координат [CanvasLayer].\n"
+"[b]Примечание:[/b] Для координат экранного пространства (например, при "
+"использовании невстроенного [Popup]) можно использовать [метод DisplayServer."
+"mouse_get_position]."
+
+msgid ""
+"Returns the global transform matrix of this item, i.e. the combined transform "
+"up to the topmost [CanvasItem] node. The topmost item is a [CanvasItem] that "
+"either has no parent, has non-[CanvasItem] parent or it has [member "
+"top_level] enabled."
+msgstr ""
+"Возвращает глобальную матрицу преобразования этого элемента, т. е. "
+"объединенное преобразование до самого верхнего узла [CanvasItem]. Самый "
+"верхний элемент — это [CanvasItem], у которого либо нет родителя, либо есть "
+"родитель, отличный от [CanvasItem], либо включен [member top_level]."
+
+msgid ""
+"Returns the transform from the local coordinate system of this [CanvasItem] "
+"to the [Viewport]s coordinate system."
+msgstr ""
+"Возвращает преобразование из локальной системы координат этого [CanvasItem] в "
+"систему координат [Viewport]-ов."
+
+msgid "Get the value of a shader parameter as set on this instance."
+msgstr ""
+"Получить значение параметра шейдера, установленное для данного экземпляра."
+
+msgid ""
+"Returns the mouse's position in this [CanvasItem] using the local coordinate "
+"system of this [CanvasItem]."
+msgstr ""
+"Возвращает положение мыши в этом [CanvasItem], используя локальную систему "
+"координат этого [CanvasItem]."
+
+msgid ""
+"Returns the transform of this [CanvasItem] in global screen coordinates (i.e. "
+"taking window position into account). Mostly useful for editor plugins.\n"
+"Equals to [method get_global_transform] if the window is embedded (see "
+"[member Viewport.gui_embed_subwindows])."
+msgstr ""
+"Возвращает преобразование этого [CanvasItem] в глобальных координатах экрана "
+"(т. е. с учетом положения окна). В основном полезно для плагинов редактора.\n"
+"Равно [method get_global_transform], если окно встроено (см. [member Viewport."
+"gui_embed_subwindows])."
+
+msgid "Returns the transform matrix of this item."
+msgstr "Возвращает матрицу преобразования этого элемента."
+
+msgid "Returns the viewport's boundaries as a [Rect2]."
+msgstr "Возвращает границы области просмотра как [Rect2]."
+
+msgid ""
+"Returns the transform from the coordinate system of the canvas, this item is "
+"in, to the [Viewport]s embedders coordinate system."
+msgstr ""
+"Возвращает преобразование из системы координат холста, в котором находится "
+"этот элемент, в систему координат средства внедрения [Viewport]."
+
+msgid "Returns an individual bit on the rendering visibility layer."
+msgstr "Возвращает отдельный бит на слое видимости рендеринга."
+
+msgid "Returns the [World2D] where this item is in."
+msgstr "Возвращает [World2D], в котором находится этот элемент."
+
+msgid ""
+"Returns [code]true[/code] if local transform notifications are communicated "
+"to children."
+msgstr ""
+"Возвращает [code]true[/code], если локальные уведомления о преобразованиях "
+"передаются дочерним элементам."
+
+msgid ""
+"Returns [code]true[/code] if global transform notifications are communicated "
+"to children."
+msgstr ""
+"Возвращает [code]true[/code], если глобальные уведомления о преобразованиях "
+"передаются дочерним элементам."
+
+msgid ""
+"Returns [code]true[/code] if the node is present in the [SceneTree], its "
+"[member visible] property is [code]true[/code] and all its ancestors are also "
+"visible. If any ancestor is hidden, this node will not be visible in the "
+"scene tree, and is therefore not drawn (see [method _draw]).\n"
+"Visibility is checked only in parent nodes that inherit from [CanvasItem], "
+"[CanvasLayer], and [Window]. If the parent is of any other type (such as "
+"[Node], [AnimationPlayer], or [Node3D]), it is assumed to be visible.\n"
+"[b]Note:[/b] This method does not take [member visibility_layer] into "
+"account, so even if this method returns [code]true[/code], the node might end "
+"up not being rendered."
+msgstr ""
+"Возвращает [code]true[/code], если узел присутствует в [SceneTree], его "
+"свойство [member visible] равно [code]true[/code] и все его предки также "
+"видны. Если какой-либо предок скрыт, этот узел не будет виден в дереве сцены "
+"и, следовательно, не будет отрисован (см. [method _draw]).\n"
+"Видимость проверяется только в родительских узлах, которые наследуются от "
+"[CanvasItem], [CanvasLayer] и [Window]. Если родительский узел имеет любой "
+"другой тип (например, [Node], [AnimationPlayer] или [Node3D]), он считается "
+"видимым.\n"
+"[b]Примечание:[/b] Этот метод не учитывает [member visible_layer], поэтому "
+"даже если этот метод возвращает [code]true[/code], узел может оказаться "
+"неотрисованным."
+
+msgid ""
+"Transforms [param viewport_point] from the viewport's coordinates to this "
+"node's local coordinates.\n"
+"For the opposite operation, use [method get_global_transform_with_canvas].\n"
+"[codeblock]\n"
+"var viewport_point = get_global_transform_with_canvas() * local_point\n"
+"[/codeblock]"
+msgstr ""
+"Преобразует [param viewport_point] из координат области просмотра в локальные "
+"координаты этого узла.\n"
+"Для противоположной операции используйте [method "
+"get_global_transform_with_canvas].\n"
+"[codeblock]\n"
+"var viewport_point = get_global_transform_with_canvas() * local_point\n"
+"[/codeblock]"
+
+msgid ""
+"Transformations issued by [param event]'s inputs are applied in local space "
+"instead of global space."
+msgstr ""
+"Преобразования, создаваемые входными данными [param event], применяются в "
+"локальном пространстве, а не в глобальном."
+
+msgid ""
+"Moves this node to display on top of its siblings.\n"
+"Internally, the node is moved to the bottom of parent's child list. The "
+"method has no effect on nodes without a parent."
+msgstr ""
+"Перемещает этот узел для отображения поверх своих братьев и сестер.\n"
+"Внутри узел перемещается в конец списка дочерних элементов родителя. Метод не "
+"влияет на узлы без родителя."
+
+msgid ""
+"Queues the [CanvasItem] to redraw. During idle time, if [CanvasItem] is "
+"visible, [constant NOTIFICATION_DRAW] is sent and [method _draw] is called. "
+"This only occurs [b]once[/b] per frame, even if this method has been called "
+"multiple times."
+msgstr ""
+"Ставит в очередь [CanvasItem] для перерисовки. Во время простоя, если "
+"[CanvasItem] виден, отправляется [constant NOTIFICATION_DRAW] и вызывается "
+"[method _draw]. Это происходит только [b]один раз[/b] за кадр, даже если этот "
+"метод вызывался несколько раз."
+
+msgid ""
+"Set the value of a shader uniform for this instance only ([url=$DOCS_URL/"
+"tutorials/shaders/shader_reference/shading_language.html#per-instance-"
+"uniforms]per-instance uniform[/url]). See also [method ShaderMaterial."
+"set_shader_parameter] to assign a uniform on all instances using the same "
+"[ShaderMaterial].\n"
+"[b]Note:[/b] For a shader uniform to be assignable on a per-instance basis, "
+"it [i]must[/i] be defined with [code]instance uniform ...[/code] rather than "
+"[code]uniform ...[/code] in the shader code.\n"
+"[b]Note:[/b] [param name] is case-sensitive and must match the name of the "
+"uniform in the code exactly (not the capitalized name in the inspector)."
+msgstr ""
+"Установите значение шейдерной униформы только для этого экземпляра "
+"([url=$DOCS_URL/tutorials/shaders/shader_reference/shading_language.html#per-"
+"instance-uniforms]per-instance uniform[/url]). См. также [method "
+"ShaderMaterial.set_shader_parameter], чтобы назначить униформу для всех "
+"экземпляров, использующих один и тот же [ShaderMaterial].\n"
+"[b]Примечание:[/b] Чтобы шейдерную униформу можно было назначать для каждого "
+"экземпляра, она [i]должна[/i] быть определена с помощью [code]instance "
+"uniform ...[/code], а не [code]uniform ...[/code] в коде шейдера.\n"
+"[b]Примечание:[/b] [param name] чувствительна к регистру и должна точно "
+"соответствовать имени униформы в коде (а не заглавному имени в инспекторе)."
+
+msgid ""
+"If [param enable] is [code]true[/code], this node will receive [constant "
+"NOTIFICATION_LOCAL_TRANSFORM_CHANGED] when its local transform changes."
+msgstr ""
+"Если [param enable] имеет значение [code]true[/code], этот узел будет "
+"получать [constant NOTIFICATION_LOCAL_TRANSFORM_CHANGED] при изменении его "
+"локального преобразования."
+
+msgid ""
+"If [param enable] is [code]true[/code], this node will receive [constant "
+"NOTIFICATION_TRANSFORM_CHANGED] when its global transform changes."
+msgstr ""
+"Если [param enable] имеет значение [code]true[/code], этот узел получит "
+"[constant NOTIFICATION_TRANSFORM_CHANGED] при изменении его глобального "
+"преобразования."
+
+msgid ""
+"Set/clear individual bits on the rendering visibility layer. This simplifies "
+"editing this [CanvasItem]'s visibility layer."
+msgstr ""
+"Установить/сбросить отдельные биты на слое видимости рендеринга. Это упрощает "
+"редактирование слоя видимости этого [CanvasItem]."
+
+msgid ""
+"Show the [CanvasItem] if it's currently hidden. This is equivalent to setting "
+"[member visible] to [code]true[/code]. For controls that inherit [Popup], the "
+"correct way to make them visible is to call one of the multiple [code]popup*()"
+"[/code] functions instead."
+msgstr ""
+"Показывать [CanvasItem], если он в данный момент скрыт. Это эквивалентно "
+"установке [member visible] в [code]true[/code]. Для элементов управления, "
+"которые наследуют [Popup], правильный способ сделать их видимыми — вызвать "
+"вместо этого одну из нескольких функций [code]popup*()[/code]."
+
+msgid ""
+"Allows the current node to clip child nodes, essentially acting as a mask.\n"
+"[b]Note:[/b] Clipping nodes cannot be nested or placed within [CanvasGroup]s. "
+"If an ancestor of this node clips its children or is a [CanvasGroup], then "
+"this node's clip mode should be set to [constant CLIP_CHILDREN_DISABLED] to "
+"avoid unexpected behavior."
+msgstr ""
+"Позволяет текущему узлу обрезать дочерние узлы, по сути, действуя как маска.\n"
+"[b]Примечание:[/b] Узлы обрезки не могут быть вложенными или размещены внутри "
+"[CanvasGroup]. Если предок этого узла обрезает своих дочерних узлов или "
+"является [CanvasGroup], то режим обрезки этого узла должен быть установлен на "
+"[constant CLIP_CHILDREN_DISABLED], чтобы избежать непредвиденного поведения."
+
+msgid ""
+"The rendering layers in which this [CanvasItem] responds to [Light2D] nodes."
+msgstr ""
+"Слои рендеринга, в которых этот [CanvasItem] реагирует на узлы [Light2D]."
+
+msgid "The material applied to this [CanvasItem]."
+msgstr "Материал, примененный к этому [CanvasItem]."
+
+msgid ""
+"The color applied to this [CanvasItem]. This property does affect child "
+"[CanvasItem]s, unlike [member self_modulate] which only affects the node "
+"itself."
+msgstr ""
+"Цвет, примененный к этому [CanvasItem]. Это свойство влияет на дочерние "
+"[CanvasItem], в отличие от [member self_modulate], которое влияет только на "
+"сам узел."
+
+msgid ""
+"The color applied to this [CanvasItem]. This property does [b]not[/b] affect "
+"child [CanvasItem]s, unlike [member modulate] which affects both the node "
+"itself and its children.\n"
+"[b]Note:[/b] Internal children (e.g. sliders in [ColorPicker] or tab bar in "
+"[TabContainer]) are also not affected by this property (see "
+"[code]include_internal[/code] parameter of [method Node.get_child] and other "
+"similar methods)."
+msgstr ""
+"Цвет, примененный к этому [CanvasItem]. Это свойство [b]не[/b] влияет на "
+"дочерние [CanvasItem], в отличие от [member modulate], которое влияет как на "
+"сам узел, так и на его дочерние элементы.\n"
+"[b]Примечание:[/b] Внутренние дочерние элементы (например, ползунки в "
+"[ColorPicker] или панель вкладок в [TabContainer]) также не затрагиваются "
+"этим свойством (см. параметр [code]include_internal[/code] [method Node."
+"get_child] и другие подобные методы)."
+
+msgid "If [code]true[/code], the object draws behind its parent."
+msgstr "Если [code]true[/code], объект отрисовывается позади своего родителя."
+
+msgid "The texture filtering mode to use on this [CanvasItem]."
+msgstr "Режим фильтрации текстуры, используемый для этого [CanvasItem]."
+
+msgid "The texture repeating mode to use on this [CanvasItem]."
+msgstr "Режим повторения текстуры, используемый для этого [CanvasItem]."
+
+msgid ""
+"If [code]true[/code], this [CanvasItem] will [i]not[/i] inherit its transform "
+"from parent [CanvasItem]s. Its draw order will also be changed to make it "
+"draw on top of other [CanvasItem]s that do not have [member top_level] set to "
+"[code]true[/code]. The [CanvasItem] will effectively act as if it was placed "
+"as a child of a bare [Node]."
+msgstr ""
+"Если [code]true[/code], этот [CanvasItem] [i]не[/i] унаследует свое "
+"преобразование от родительских [CanvasItem]. Его порядок отрисовки также "
+"будет изменен, чтобы он отрисовывался поверх других [CanvasItem], у которых "
+"[member top_level] не установлен на [code]true[/code]. [CanvasItem] будет "
+"фактически действовать так, как если бы он был помещен в качестве дочернего "
+"элемента пустого [Node]."
+
+msgid ""
+"If [code]true[/code], the parent [CanvasItem]'s [member material] property is "
+"used as this one's material."
+msgstr ""
+"Если [code]true[/code], свойство [member material] родительского [CanvasItem] "
+"используется в качестве материала этого элемента."
+
+msgid ""
+"The rendering layer in which this [CanvasItem] is rendered by [Viewport] "
+"nodes. A [Viewport] will render a [CanvasItem] if it and all its parents "
+"share a layer with the [Viewport]'s canvas cull mask."
+msgstr ""
+"Слой рендеринга, в котором этот [CanvasItem] рендерится узлами [Viewport]. "
+"[Viewport] будет рендерить [CanvasItem], если он и все его родители разделяют "
+"слой с маской отбраковки холста [Viewport]."
+
+msgid ""
+"If [code]true[/code], this [CanvasItem] may be drawn. Whether this "
+"[CanvasItem] is actually drawn depends on the visibility of all of its "
+"[CanvasItem] ancestors. In other words: this [CanvasItem] will be drawn when "
+"[method is_visible_in_tree] returns [code]true[/code] and all [CanvasItem] "
+"ancestors share at least one [member visibility_layer] with this "
+"[CanvasItem].\n"
+"[b]Note:[/b] For controls that inherit [Popup], the correct way to make them "
+"visible is to call one of the multiple [code]popup*()[/code] functions "
+"instead."
+msgstr ""
+"Если [code]true[/code], этот [CanvasItem] может быть нарисован. Будет ли этот "
+"[CanvasItem] нарисован на самом деле, зависит от видимости всех его предков "
+"[CanvasItem]. Другими словами: этот [CanvasItem] будет нарисован, когда "
+"[method is_visible_in_tree] вернет [code]true[/code] и все предки "
+"[CanvasItem] разделят по крайней мере один [member vision_layer] с этим "
+"[CanvasItem].\n"
+"[b]Примечание:[/b] Для элементов управления, которые наследуют [Popup], "
+"правильный способ сделать их видимыми — вызвать вместо этого одну из "
+"нескольких функций [code]popup*()[/code]."
+
+msgid ""
+"If [code]true[/code], this and child [CanvasItem] nodes with a higher Y "
+"position are rendered in front of nodes with a lower Y position. If "
+"[code]false[/code], this and child [CanvasItem] nodes are rendered normally "
+"in scene tree order.\n"
+"With Y-sorting enabled on a parent node ('A') but disabled on a child node "
+"('B'), the child node ('B') is sorted but its children ('C1', 'C2', etc.) "
+"render together on the same Y position as the child node ('B'). This allows "
+"you to organize the render order of a scene without changing the scene tree.\n"
+"Nodes sort relative to each other only if they are on the same [member "
+"z_index]."
+msgstr ""
+"Если [code]true[/code], этот и дочерние узлы [CanvasItem] с более высокой "
+"позицией Y отображаются перед узлами с более низкой позицией Y. Если "
+"[code]false[/code], этот и дочерние узлы [CanvasItem] отображаются нормально "
+"в порядке дерева сцены.\n"
+"При включенной сортировке Y на родительском узле ('A'), но отключенной на "
+"дочернем узле ('B'), дочерний узел ('B') сортируется, но его дочерние узлы "
+"('C1', 'C2' и т. д.) отображаются вместе на той же позиции Y, что и дочерний "
+"узел ('B'). Это позволяет организовать порядок рендеринга сцены, не изменяя "
+"дерево сцены.\n"
+"Узлы сортируются относительно друг друга, только если они находятся на одном "
+"и том же [member z_index]."
+
+msgid ""
+"If [code]true[/code], the node's Z index is relative to its parent's Z index. "
+"If this node's Z index is 2 and its parent's effective Z index is 3, then "
+"this node's effective Z index will be 2 + 3 = 5."
+msgstr ""
+"Если [code]true[/code], индекс Z узла относится к индексу Z его родителя. "
+"Если индекс Z этого узла равен 2, а эффективный индекс Z его родителя равен "
+"3, то эффективный индекс Z этого узла будет равен 2 + 3 = 5."
+
+msgid ""
+"Controls the order in which the nodes render. A node with a higher Z index "
+"will display in front of others. Must be between [constant RenderingServer."
+"CANVAS_ITEM_Z_MIN] and [constant RenderingServer.CANVAS_ITEM_Z_MAX] "
+"(inclusive).\n"
+"[b]Note:[/b] Changing the Z index of a [Control] only affects the drawing "
+"order, not the order in which input events are handled. This can be useful to "
+"implement certain UI animations, e.g. a menu where hovered items are scaled "
+"and should overlap others."
+msgstr ""
+"Управляет порядком, в котором отображаются узлы. Узел с более высоким "
+"индексом Z будет отображаться поверх других. Должен быть между [constant "
+"RenderingServer.CANVAS_ITEM_Z_MIN] и [constant RenderingServer."
+"CANVAS_ITEM_Z_MAX] (включительно).\n"
+"[b]Примечание:[/b] Изменение индекса Z [Control] влияет только на порядок "
+"отрисовки, а не на порядок обработки событий ввода. Это может быть полезно "
+"для реализации определенных анимаций пользовательского интерфейса, например, "
+"меню, в котором наведенные элементы масштабируются и должны перекрывать "
+"другие."
+
+msgid ""
+"Emitted when the [CanvasItem] must redraw, [i]after[/i] the related [constant "
+"NOTIFICATION_DRAW] notification, and [i]before[/i] [method _draw] is called.\n"
+"[b]Note:[/b] Deferred connections do not allow drawing through the "
+"[code]draw_*[/code] methods."
+msgstr ""
+"Вызывается, когда [CanvasItem] должен перерисоваться, [i]после[/i] "
+"соответствующего уведомления [constant NOTIFICATION_DRAW] и [i]до[/i] вызова "
+"[method _draw].\n"
+"[b]Примечание:[/b] Отложенные соединения не позволяют рисовать через методы "
+"[code]draw_*[/code]."
+
+msgid ""
+"Emitted when the [CanvasItem] is hidden, i.e. it's no longer visible in the "
+"tree (see [method is_visible_in_tree])."
+msgstr ""
+"Генерируется, когда [CanvasItem] скрыт, т.е. он больше не виден в дереве (см. "
+"[метод is_visible_in_tree])."
+
+msgid ""
+"Emitted when the [CanvasItem]'s boundaries (position or size) change, or when "
+"an action took place that may have affected these boundaries (e.g. changing "
+"[member Sprite2D.texture])."
+msgstr ""
+"Вызывается при изменении границ [CanvasItem] (положения или размера) или при "
+"выполнении действия, которое могло повлиять на эти границы (например, "
+"изменение [member Sprite2D.texture])."
+
+msgid ""
+"Emitted when the [CanvasItem]'s visibility changes, either because its own "
+"[member visible] property changed or because its visibility in the tree "
+"changed (see [method is_visible_in_tree])."
+msgstr ""
+"Вызывается при изменении видимости [CanvasItem], либо из-за изменения его "
+"собственного свойства [member visible], либо из-за изменения его видимости в "
+"дереве (см. [метод is_visible_in_tree])."
+
+msgid ""
+"The [CanvasItem]'s global transform has changed. This notification is only "
+"received if enabled by [method set_notify_transform]."
+msgstr ""
+"Глобальное преобразование [CanvasItem] изменилось. Это уведомление "
+"принимается только если включено [методом set_notify_transform]."
+
+msgid ""
+"The [CanvasItem]'s local transform has changed. This notification is only "
+"received if enabled by [method set_notify_local_transform]."
+msgstr ""
+"Локальное преобразование [CanvasItem] изменилось. Это уведомление принимается "
+"только если включено [методом set_notify_local_transform]."
+
+msgid "The [CanvasItem] is requested to draw (see [method _draw])."
+msgstr "[CanvasItem] запрашивается для рисования (см. [метод _draw])."
+
+msgid "The [CanvasItem]'s visibility has changed."
+msgstr "Видимость [CanvasItem] изменилась."
+
+msgid "The [CanvasItem] has entered the canvas."
+msgstr "[CanvasItem] вошел в холст."
+
+msgid "The [CanvasItem] has exited the canvas."
+msgstr "[CanvasItem] вышел за пределы холста."
+
+msgid "The [CanvasItem]'s active [World2D] changed."
+msgstr "Активный [World2D] [CanvasItem] изменился."
+
+msgid "The [CanvasItem] will inherit the filter from its parent."
+msgstr "[CanvasItem] унаследует фильтр от своего родителя."
+
+msgid ""
+"The texture filter reads from the nearest pixel and blends between the "
+"nearest 2 mipmaps (or uses the nearest mipmap if [member ProjectSettings."
+"rendering/textures/default_filters/use_nearest_mipmap_filter] is [code]true[/"
+"code]). This makes the texture look pixelated from up close, and smooth from "
+"a distance.\n"
+"Use this for non-pixel art textures that may be viewed at a low scale (e.g. "
+"due to [Camera2D] zoom or sprite scaling), as mipmaps are important to smooth "
+"out pixels that are smaller than on-screen pixels."
+msgstr ""
+"Фильтр текстуры считывает данные с ближайшего пикселя и смешивает данные "
+"между двумя ближайшими mip-картами (или использует ближайшую mip-карту, если "
+"[member ProjectSettings.rendering/textures/default_filters/"
+"use_nearest_mipmap_filter] имеет значение [code]true[/code]). Это делает "
+"текстуру пикселизированной вблизи и гладкой на расстоянии. \n"
+"Используйте это для текстур, не являющихся пиксельным искусством, которые "
+"можно просматривать в низком масштабе (например, из-за масштабирования "
+"[Camera2D] или масштабирования спрайтов), поскольку mip-карты важны для "
+"сглаживания пикселей, которые меньше пикселей на экране."
+
+msgid ""
+"The texture filter blends between the nearest 4 pixels and between the "
+"nearest 2 mipmaps (or uses the nearest mipmap if [member ProjectSettings."
+"rendering/textures/default_filters/use_nearest_mipmap_filter] is [code]true[/"
+"code]). This makes the texture look smooth from up close, and smooth from a "
+"distance.\n"
+"Use this for non-pixel art textures that may be viewed at a low scale (e.g. "
+"due to [Camera2D] zoom or sprite scaling), as mipmaps are important to smooth "
+"out pixels that are smaller than on-screen pixels."
+msgstr ""
+"Фильтр текстуры смешивает ближайшие 4 пикселя и ближайшие 2 mip-карты (или "
+"использует ближайшую mip-карту, если [member ProjectSettings.rendering/"
+"textures/default_filters/use_nearest_mipmap_filter] имеет значение "
+"[code]true[/code]). Это делает текстуру гладкой вблизи и гладкой на "
+"расстоянии. \n"
+"Используйте это для текстур непиксельной графики, которые можно просматривать "
+"в низком масштабе (например, из-за масштабирования [Camera2D] или "
+"масштабирования спрайтов), поскольку mip-карты важны для сглаживания "
+"пикселей, которые меньше пикселей на экране."
+
+msgid ""
+"The texture filter reads from the nearest pixel and blends between 2 mipmaps "
+"(or uses the nearest mipmap if [member ProjectSettings.rendering/textures/"
+"default_filters/use_nearest_mipmap_filter] is [code]true[/code]) based on the "
+"angle between the surface and the camera view. This makes the texture look "
+"pixelated from up close, and smooth from a distance. Anisotropic filtering "
+"improves texture quality on surfaces that are almost in line with the camera, "
+"but is slightly slower. The anisotropic filtering level can be changed by "
+"adjusting [member ProjectSettings.rendering/textures/default_filters/"
+"anisotropic_filtering_level].\n"
+"[b]Note:[/b] This texture filter is rarely useful in 2D projects. [constant "
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS] is usually more appropriate in this case."
+msgstr ""
+"Текстурный фильтр считывает данные с ближайшего пикселя и смешивает два mip-"
+"текстурных отображения (или использует ближайшее mip-текстурное отображение, "
+"если [member ProjectSettings.rendering/textures/default_filters/"
+"use_nearest_mipmap_filter] имеет значение [code]true[/code]) на основе угла "
+"между поверхностью и видом камеры. Это делает текстуру пикселизированной "
+"вблизи и гладкой на расстоянии. Анизотропная фильтрация улучшает качество "
+"текстуры на поверхностях, которые почти совпадают с камерой, но работает "
+"немного медленнее. Уровень анизотропной фильтрации можно изменить, настроив "
+"[member ProjectSettings.rendering/textures/default_filters/"
+"anisotropic_filtering_level].\n"
+"[b]Примечание:[/b] Этот текстурный фильтр редко бывает полезен в 2D-проектах. "
+"[constant TEXTURE_FILTER_NEAREST_WITH_MIPMAPS] обычно более подходит в этом "
+"случае."
+
+msgid ""
+"The texture filter blends between the nearest 4 pixels and blends between 2 "
+"mipmaps (or uses the nearest mipmap if [member ProjectSettings.rendering/"
+"textures/default_filters/use_nearest_mipmap_filter] is [code]true[/code]) "
+"based on the angle between the surface and the camera view. This makes the "
+"texture look smooth from up close, and smooth from a distance. Anisotropic "
+"filtering improves texture quality on surfaces that are almost in line with "
+"the camera, but is slightly slower. The anisotropic filtering level can be "
+"changed by adjusting [member ProjectSettings.rendering/textures/"
+"default_filters/anisotropic_filtering_level].\n"
+"[b]Note:[/b] This texture filter is rarely useful in 2D projects. [constant "
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS] is usually more appropriate in this case."
+msgstr ""
+"Фильтр текстуры смешивает ближайшие 4 пикселя и смешивает 2 mip-карты (или "
+"использует ближайшую mip-карту, если [member ProjectSettings.rendering/"
+"textures/default_filters/use_nearest_mipmap_filter] имеет значение "
+"[code]true[/code]) на основе угла между поверхностью и видом камеры. Это "
+"делает текстуру гладкой вблизи и гладкой на расстоянии. Анизотропная "
+"фильтрация улучшает качество текстуры на поверхностях, которые почти "
+"совпадают с камерой, но немного медленнее. Уровень анизотропной фильтрации "
+"можно изменить, настроив [member ProjectSettings.rendering/textures/"
+"default_filters/anisotropic_filtering_level].\n"
+"[b]Примечание:[/b] Этот фильтр текстуры редко полезен в 2D-проектах. "
+"[constant TEXTURE_FILTER_LINEAR_WITH_MIPMAPS] обычно более подходит в этом "
+"случае."
+
+msgid "Texture will not repeat."
+msgstr "Текстура не повторяется."
+
+msgid "Texture will repeat normally."
+msgstr "Текстура будет повторяться нормально."
+
+msgid ""
+"Texture will repeat in a 2×2 tiled mode, where elements at even positions are "
+"mirrored."
+msgstr ""
+"Текстура будет повторяться в мозаичном режиме 2×2, где элементы на четных "
+"позициях будут зеркально отображены."
+
+msgid "Child draws over parent and is not clipped."
+msgstr "Дочерний элемент рисуется поверх родительского и не обрезается."
+
+msgid ""
+"Parent is used for the purposes of clipping only. Child is clipped to the "
+"parent's visible area, parent is not drawn."
+msgstr ""
+"Parent используется только для обрезки. Child обрезается до видимой области "
+"родителя, родитель не рисуется."
+
+msgid ""
+"Parent is used for clipping child, but parent is also drawn underneath child "
+"as normal before clipping child to its visible area."
+msgstr ""
+"Родительский элемент используется для обрезки дочернего элемента, но "
+"родительский элемент также рисуется под дочерним элементом, как обычно, перед "
+"обрезкой дочернего элемента до его видимой области."
+
+msgid "A material for [CanvasItem]s."
+msgstr "Материал для [CanvasItem]-ов."
+
+msgid ""
+"[CanvasItemMaterial]s provide a means of modifying the textures associated "
+"with a CanvasItem. They specialize in describing blend and lighting behaviors "
+"for textures. Use a [ShaderMaterial] to more fully customize a material's "
+"interactions with a [CanvasItem]."
+msgstr ""
+"[CanvasItemMaterial]-ы предоставляют средства изменения текстур, связанных с "
+"CanvasItem. Они специализируются на описании поведения смешивания и освещения "
+"для текстур. Используйте [ShaderMaterial] для более полной настройки "
+"взаимодействия материала с [CanvasItem]."
+
+msgid ""
+"The manner in which a material's rendering is applied to underlying textures."
+msgstr "Способ, которым рендеринг материала применяется к базовым текстурам."
+
+msgid "The manner in which material reacts to lighting."
+msgstr "Способ, которым материал реагирует на освещение."
+
+msgid ""
+"The number of columns in the spritesheet assigned as [Texture2D] for a "
+"[GPUParticles2D] or [CPUParticles2D].\n"
+"[b]Note:[/b] This property is only used and visible in the editor if [member "
+"particles_animation] is [code]true[/code]."
+msgstr ""
+"Количество столбцов в таблице спрайтов, назначенных как [Texture2D] для "
+"[GPUParticles2D] или [CPUParticles2D].\n"
+"[b]Примечание:[/b] Это свойство используется и отображается в редакторе "
+"только в том случае, если [member parts_animation] имеет значение [code]true[/"
+"code]."
+
+msgid ""
+"If [code]true[/code], the particles animation will loop.\n"
+"[b]Note:[/b] This property is only used and visible in the editor if [member "
+"particles_animation] is [code]true[/code]."
+msgstr ""
+"Если [code]true[/code], анимация частиц будет зациклена.\n"
+"[b]Примечание:[/b] Это свойство используется и отображается в редакторе "
+"только в том случае, если [member parts_animation] имеет значение [code]true[/"
+"code]."
+
+msgid ""
+"The number of rows in the spritesheet assigned as [Texture2D] for a "
+"[GPUParticles2D] or [CPUParticles2D].\n"
+"[b]Note:[/b] This property is only used and visible in the editor if [member "
+"particles_animation] is [code]true[/code]."
+msgstr ""
+"Количество строк в таблице спрайтов, назначенных как [Texture2D] для "
+"[GPUParticles2D] или [CPUParticles2D].\n"
+"[b]Примечание:[/b] Это свойство используется и отображается в редакторе "
+"только в том случае, если [member parts_animation] имеет значение [code]true[/"
+"code]."
+
+msgid ""
+"If [code]true[/code], enable spritesheet-based animation features when "
+"assigned to [GPUParticles2D] and [CPUParticles2D] nodes. The [member "
+"ParticleProcessMaterial.anim_speed_max] or [member CPUParticles2D."
+"anim_speed_max] should also be set to a positive value for the animation to "
+"play.\n"
+"This property (and other [code]particles_anim_*[/code] properties that depend "
+"on it) has no effect on other types of nodes."
+msgstr ""
+"Если [code]true[/code], включите функции анимации на основе спрайт-листа при "
+"назначении узлам [GPUParticles2D] и [CPUParticles2D]. [member "
+"ParticleProcessMaterial.anim_speed_max] или [member CPUParticles2D."
+"anim_speed_max] также должны быть установлены на положительное значение для "
+"воспроизведения анимации. \n"
+"Это свойство (и другие свойства [code]particles_anim_*[/code], которые "
+"зависят от него) не влияет на другие типы узлов."
+
+msgid ""
+"Mix blending mode. Colors are assumed to be independent of the alpha "
+"(opacity) value."
+msgstr ""
+"Режим смешивания. Предполагается, что цвета не зависят от значения альфа "
+"(непрозрачности)."
+
+msgid "Additive blending mode."
+msgstr "Аддитивный режим смешивания."
+
+msgid "Subtractive blending mode."
+msgstr "Режим вычитающего смешивания."
+
+msgid "Multiplicative blending mode."
+msgstr "Многократное смешивание."
+
+msgid ""
+"Mix blending mode. Colors are assumed to be premultiplied by the alpha "
+"(opacity) value."
+msgstr ""
+"Режим смешивания. Предполагается, что цвета предварительно умножаются на "
+"значение альфа (непрозрачности)."
+
+msgid ""
+"Render the material using both light and non-light sensitive material "
+"properties."
+msgstr ""
+"Визуализируйте материал, используя как светочувствительные, так и "
+"несветочувствительные свойства материала."
+
+msgid "Render the material as if there were no light."
+msgstr "Визуализируйте материал так, как будто бы света нет."
+
+msgid "Render the material as if there were only light."
+msgstr "Визуализируйте материал так, как будто есть только свет."
+
+msgid "A node used for independent rendering of objects within a 2D scene."
+msgstr "Узел, используемый для независимой визуализации объектов в 2D-сцене."
+
+msgid ""
+"[CanvasItem]-derived nodes that are direct or indirect children of a "
+"[CanvasLayer] will be drawn in that layer. The layer is a numeric index that "
+"defines the draw order. The default 2D scene renders with index [code]0[/"
+"code], so a [CanvasLayer] with index [code]-1[/code] will be drawn below, and "
+"a [CanvasLayer] with index [code]1[/code] will be drawn above. This order "
+"will hold regardless of the [member CanvasItem.z_index] of the nodes within "
+"each layer.\n"
+"[CanvasLayer]s can be hidden and they can also optionally follow the "
+"viewport. This makes them useful for HUDs like health bar overlays (on layers "
+"[code]1[/code] and higher) or backgrounds (on layers [code]-1[/code] and "
+"lower).\n"
+"[b]Note:[/b] Embedded [Window]s are placed on layer [code]1024[/code]. "
+"[CanvasItem]s on layers [code]1025[/code] and higher appear in front of "
+"embedded windows.\n"
+"[b]Note:[/b] Each [CanvasLayer] is drawn on one specific [Viewport] and "
+"cannot be shared between multiple [Viewport]s, see [member custom_viewport]. "
+"When using multiple [Viewport]s, for example in a split-screen game, you need "
+"create an individual [CanvasLayer] for each [Viewport] you want it to be "
+"drawn on."
+msgstr ""
+"Узлы, производные от [CanvasItem], которые являются прямыми или косвенными "
+"потомками [CanvasLayer], будут отрисованы в этом слое. Слой — это числовой "
+"индекс, который определяет порядок отрисовки. 2D-сцена по умолчанию "
+"визуализируется с индексом [code]0[/code], поэтому [CanvasLayer] с индексом "
+"[code]-1[/code] будет отрисован ниже, а [CanvasLayer] с индексом [code]1[/"
+"code] будет отрисован выше. Этот порядок будет сохраняться независимо от "
+"[member CanvasItem.z_index] узлов в каждом слое.\n"
+"[CanvasLayer] могут быть скрыты, и они также могут опционально следовать за "
+"областью просмотра. Это делает их полезными для HUD, таких как наложения "
+"полос здоровья (на слоях [code]1[/code] и выше) или фонов (на слоях [code]-1[/"
+"code] и ниже). \n"
+"[b]Примечание:[/b] Встроенные [Window] размещаются на слое [code]1024[/code]. "
+"[CanvasItem] на слоях [code]1025[/code] и выше отображаются поверх встроенных "
+"окон.\n"
+"[b]Примечание:[/b] Каждый [CanvasLayer] рисуется на одном определенном "
+"[Viewport] и не может совместно использоваться несколькими [Viewport], см. "
+"[member custom_viewport]. При использовании нескольких [Viewport], например, "
+"в игре с разделенным экраном, вам необходимо создать отдельный [CanvasLayer] "
+"для каждого [Viewport], на котором вы хотите его нарисовать."
+
+msgid "Canvas layers"
+msgstr "Слои холста"
+
+msgid "Returns the RID of the canvas used by this layer."
+msgstr "Возвращает RID холста, используемого этим слоем."
+
+msgid ""
+"Returns the transform from the [CanvasLayer]s coordinate system to the "
+"[Viewport]s coordinate system."
+msgstr ""
+"Возвращает преобразование из системы координат [CanvasLayer]-ов в систему "
+"координат [Viewport]-ов."
+
+msgid ""
+"The custom [Viewport] node assigned to the [CanvasLayer]. If [code]null[/"
+"code], uses the default viewport instead."
+msgstr ""
+"Пользовательский узел [Viewport], назначенный [CanvasLayer]. Если [code]null[/"
+"code], вместо этого используется viewport по умолчанию."
+
+msgid ""
+"If enabled, the [CanvasLayer] stays in a fixed position on the screen. If "
+"disabled, the [CanvasLayer] maintains its position in world space.\n"
+"Together with [member follow_viewport_scale], this can be used for a "
+"pseudo-3D effect."
+msgstr ""
+"Если включено, [CanvasLayer] остается в фиксированном положении на экране. "
+"Если отключено, [CanvasLayer] сохраняет свое положение в мировом "
+"пространстве.\n"
+"Вместе с [member follow_viewport_scale] это можно использовать для псевдо-3D-"
+"эффекта."
+
+msgid ""
+"Scales the layer when using [member follow_viewport_enabled]. Layers moving "
+"into the foreground should have increasing scales, while layers moving into "
+"the background should have decreasing scales."
+msgstr ""
+"Масштабирует слой при использовании [member follow_viewport_enabled]. Слои, "
+"перемещающиеся на передний план, должны иметь увеличивающиеся масштабы, а "
+"слои, перемещающиеся на задний план, должны иметь уменьшающиеся масштабы."
+
+msgid ""
+"Layer index for draw order. Lower values are drawn behind higher values.\n"
+"[b]Note:[/b] If multiple CanvasLayers have the same layer index, [CanvasItem] "
+"children of one CanvasLayer are drawn behind the [CanvasItem] children of the "
+"other CanvasLayer. Which CanvasLayer is drawn in front is non-deterministic."
+msgstr ""
+"Индекс слоя для порядка отрисовки. Более низкие значения рисуются позади "
+"более высоких значений.\n"
+"[b]Примечание:[/b] Если несколько CanvasLayers имеют одинаковый индекс слоя, "
+"то дочерние элементы [CanvasItem] одного CanvasLayer рисуются позади дочерних "
+"элементов [CanvasItem] другого CanvasLayer. Какой CanvasLayer рисуется "
+"впереди, не определено."
+
+msgid "The layer's base offset."
+msgstr "Смещение базы слоя."
+
+msgid "The layer's rotation in radians."
+msgstr "Вращение слоя в радианах."
+
+msgid "The layer's scale."
+msgstr "Масштаб слоя."
+
+msgid "The layer's transform."
+msgstr "Трансформация слоя."
+
+msgid ""
+"If [code]false[/code], any [CanvasItem] under this [CanvasLayer] will be "
+"hidden.\n"
+"Unlike [member CanvasItem.visible], visibility of a [CanvasLayer] isn't "
+"propagated to underlying layers."
+msgstr ""
+"Если [code]false[/code], любой [CanvasItem] под этим [CanvasLayer] будет "
+"скрыт.\n"
+"В отличие от [member CanvasItem.visible], видимость [CanvasLayer] не "
+"распространяется на нижележащие слои."
+
+msgid "A node that applies a color tint to a canvas."
+msgstr "Узел, который применяет цветовой оттенок к холсту."
+
+msgid ""
+"[CanvasModulate] applies a color tint to all nodes on a canvas. Only one can "
+"be used to tint a canvas, but [CanvasLayer]s can be used to render things "
+"independently."
+msgstr ""
+"[CanvasModulate] применяет цветовой оттенок ко всем узлам на холсте. Только "
+"один может быть использован для тонирования холста, но [CanvasLayer]s могут "
+"использоваться для независимого рендеринга вещей."
+
+msgid "2D lights and shadows"
+msgstr "2D свет и тени"
+
+msgid "The tint color to apply."
+msgstr "Цвет оттенка, который следует применить."
+
+msgid "Texture with optional normal and specular maps for use in 2D rendering."
+msgstr ""
+"Текстура с дополнительными картами нормалей и отражений для использования в "
+"2D-рендеринге."
+
+msgid ""
+"[CanvasTexture] is an alternative to [ImageTexture] for 2D rendering. It "
+"allows using normal maps and specular maps in any node that inherits from "
+"[CanvasItem]. [CanvasTexture] also allows overriding the texture's filter and "
+"repeat mode independently of the node's properties (or the project "
+"settings).\n"
+"[b]Note:[/b] [CanvasTexture] cannot be used in 3D. It will not display "
+"correctly when applied to any [VisualInstance3D], such as [Sprite3D] or "
+"[Decal]. For physically-based materials in 3D, use [BaseMaterial3D] instead."
+msgstr ""
+"[CanvasTexture] — это альтернатива [ImageTexture] для 2D-рендеринга. Она "
+"позволяет использовать карты нормалей и карты отражений в любом узле, который "
+"наследует от [CanvasItem]. [CanvasTexture] также позволяет переопределять "
+"фильтр текстуры и режим повторения независимо от свойств узла (или настроек "
+"проекта).\n"
+"[b]Примечание:[/b] [CanvasTexture] нельзя использовать в 3D. Она не будет "
+"отображаться правильно при применении к любому [VisualInstance3D], например "
+"[Sprite3D] или [Decal]. Для физически обоснованных материалов в 3D "
+"используйте вместо этого [BaseMaterial3D]."
+
+msgid ""
+"The diffuse (color) texture to use. This is the main texture you want to set "
+"in most cases."
+msgstr ""
+"Диффузная (цветная) текстура для использования. Это основная текстура, "
+"которую вы хотите установить в большинстве случаев."
+
+msgid ""
+"The normal map texture to use. Only has a visible effect if [Light2D]s are "
+"affecting this [CanvasTexture].\n"
+"[b]Note:[/b] Godot expects the normal map to use X+, Y+, and Z+ coordinates. "
+"See [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates]this page[/url] for a "
+"comparison of normal map coordinates expected by popular engines."
+msgstr ""
+"Текстура карты нормалей для использования. Имеет видимый эффект, только если "
+"[Light2D]s влияют на эту [CanvasTexture].\n"
+"[b]Примечание:[/b] Godot ожидает, что карта нормалей будет использовать "
+"координаты X+, Y+ и Z+. См. [url=http://wiki.polycount.com/wiki/"
+"Normal_Map_Technical_Details#Common_Swizzle_Coordinates]эту страницу[/url] "
+"для сравнения координат карты нормалей, ожидаемых популярными движками."
+
+msgid ""
+"The multiplier for specular reflection colors. The [Light2D]'s color is also "
+"taken into account when determining the reflection color. Only has a visible "
+"effect if [Light2D]s are affecting this [CanvasTexture]."
+msgstr ""
+"Множитель для цветов зеркального отражения. Цвет [Light2D] также учитывается "
+"при определении цвета отражения. Имеет видимый эффект только в том случае, "
+"если [Light2D] влияют на эту [CanvasTexture]."
+
+msgid ""
+"The specular exponent for [Light2D] specular reflections. Higher values "
+"result in a more glossy/\"wet\" look, with reflections becoming more "
+"localized and less visible overall. The default value of [code]1.0[/code] "
+"disables specular reflections entirely. Only has a visible effect if "
+"[Light2D]s are affecting this [CanvasTexture]."
+msgstr ""
+"Зеркальный показатель для зеркальных отражений [Light2D]. Более высокие "
+"значения приводят к более глянцевому/\"мокрому\" виду, при этом отражения "
+"становятся более локализованными и менее заметными в целом. Значение по "
+"умолчанию [code]1.0[/code] полностью отключает зеркальные отражения. "
+"Оказывает видимый эффект, только если [Light2D] влияют на эту [CanvasTexture]."
+
+msgid ""
+"The specular map to use for [Light2D] specular reflections. This should be a "
+"grayscale or colored texture, with brighter areas resulting in a higher "
+"[member specular_shininess] value. Using a colored [member specular_texture] "
+"allows controlling specular shininess on a per-channel basis. Only has a "
+"visible effect if [Light2D]s are affecting this [CanvasTexture]."
+msgstr ""
+"Карта отражений, используемая для зеркальных отражений [Light2D]. Это должна "
+"быть текстура в оттенках серого или цветная, с более яркими областями, "
+"дающими более высокое значение [member specular_shininess]. Использование "
+"цветной [member specular_texture] позволяет управлять зеркальным блеском на "
+"основе каждого канала. Имеет видимый эффект, только если [Light2D] влияют на "
+"эту [CanvasTexture]."
+
+msgid "The texture filtering mode to use when drawing this [CanvasTexture]."
+msgstr "Режим фильтрации текстуры, используемый при рисовании [CanvasTexture]."
+
+msgid "The texture repeat mode to use when drawing this [CanvasTexture]."
+msgstr "Режим повторения текстуры, используемый при рисовании [CanvasTexture]."
+
+msgid "Class representing a capsule-shaped [PrimitiveMesh]."
+msgstr "Класс, представляющий собой капсулообразную [PrimitiveMesh]."
+
+msgid "Total height of the capsule mesh (including the hemispherical ends)."
+msgstr "Общая высота капсульной сетки (включая полусферические концы)."
+
+msgid "Number of radial segments on the capsule mesh."
+msgstr "Число радиальных сегментов на сетке капсулы."
+
+msgid "Radius of the capsule mesh."
+msgstr "Радиус ячейки капсулы."
+
+msgid "Number of rings along the height of the capsule."
+msgstr "Количество колец по высоте капсулы."
+
+msgid "A 2D capsule shape used for physics collision."
+msgstr "Форма 2D-капсулы, используемая для физического столкновения."
+
+msgid ""
+"A 2D capsule shape, intended for use in physics. Usually used to provide a "
+"shape for a [CollisionShape2D].\n"
+"[b]Performance:[/b] [CapsuleShape2D] is fast to check collisions against, but "
+"it is slower than [RectangleShape2D] and [CircleShape2D]."
+msgstr ""
+"Форма капсулы 2D, предназначенная для использования в физике. Обычно "
+"используется для предоставления формы для [CollisionShape2D].\n"
+"[b]Производительность:[/b] [CapsuleShape2D] быстро проверяет столкновения, но "
+"медленнее, чем [RectangleShape2D] и [CircleShape2D]."
+
+msgid "The capsule's height."
+msgstr "Высота капсулы."
+
+msgid "The capsule's radius."
+msgstr "Радиус капсулы."
+
+msgid "A 3D capsule shape used for physics collision."
+msgstr "Форма 3D-капсулы, используемая для физического столкновения."
+
+msgid ""
+"A 3D capsule shape, intended for use in physics. Usually used to provide a "
+"shape for a [CollisionShape3D].\n"
+"[b]Performance:[/b] [CapsuleShape3D] is fast to check collisions against. It "
+"is faster than [CylinderShape3D], but slower than [SphereShape3D] and "
+"[BoxShape3D]."
+msgstr ""
+"Форма капсулы 3D, предназначенная для использования в физике. Обычно "
+"используется для предоставления формы для [CollisionShape3D].\n"
+"[b]Производительность:[/b] [CapsuleShape3D] быстро проверяет столкновения. Он "
+"быстрее, чем [CylinderShape3D], но медленнее, чем [SphereShape3D] и "
+"[BoxShape3D]."
+
+msgid "A container that keeps child controls in its center."
+msgstr "Контейнер, в центре которого находятся дочерние элементы управления."
+
+msgid ""
+"[CenterContainer] is a container that keeps all of its child controls in its "
+"center at their minimum size."
+msgstr ""
+"[CenterContainer] — это контейнер, который сохраняет все дочерние элементы "
+"управления в центре при их минимальном размере."
+
+msgid ""
+"If [code]true[/code], centers children relative to the [CenterContainer]'s "
+"top left corner."
+msgstr ""
+"Если [code]true[/code], то дочерние элементы центрируются относительно "
+"верхнего левого угла [CenterContainer]."
+
+msgid "A 2D physics body specialized for characters moved by script."
+msgstr ""
+"Двухмерное физическое тело, специально предназначенное для персонажей, "
+"перемещаемых по сценарию."
+
+msgid ""
+"[CharacterBody2D] is a specialized class for physics bodies that are meant to "
+"be user-controlled. They are not affected by physics at all, but they affect "
+"other physics bodies in their path. They are mainly used to provide high-"
+"level API to move objects with wall and slope detection ([method "
+"move_and_slide] method) in addition to the general collision detection "
+"provided by [method PhysicsBody2D.move_and_collide]. This makes it useful for "
+"highly configurable physics bodies that must move in specific ways and "
+"collide with the world, as is often the case with user-controlled "
+"characters.\n"
+"For game objects that don't require complex movement or collision detection, "
+"such as moving platforms, [AnimatableBody2D] is simpler to configure."
+msgstr ""
+"[CharacterBody2D] — это специализированный класс для физических тел, которые "
+"должны контролироваться пользователем. Они вообще не подвержены влиянию "
+"физики, но влияют на другие физические тела на своем пути. Они в основном "
+"используются для предоставления высокоуровневого API для перемещения объектов "
+"с обнаружением стен и наклонов (метод [method move_and_slide]) в дополнение к "
+"общему обнаружению столкновений, предоставляемому [method PhysicsBody2D."
+"move_and_collide]. Это делает его полезным для высоконастраиваемых физических "
+"тел, которые должны двигаться определенным образом и сталкиваться с миром, "
+"как это часто бывает с персонажами, контролируемыми пользователем.\n"
+"Для игровых объектов, которые не требуют сложного движения или обнаружения "
+"столкновений, таких как движущиеся платформы, [AnimatableBody2D] проще в "
+"настройке."
+
+msgid "Kinematic character (2D)"
+msgstr "Кинематический персонаж (2D)"
+
+msgid "Using CharacterBody2D"
+msgstr "Использование CharacterBody2D"
+
+msgid "2D Kinematic Character Demo"
+msgstr "2D Kinematic Character Дэмо"
+
+msgid ""
+"Allows to manually apply a snap to the floor regardless of the body's "
+"velocity. This function does nothing when [method is_on_floor] returns "
+"[code]true[/code]."
+msgstr ""
+"Позволяет вручную применить привязку к полу независимо от скорости тела. Эта "
+"функция ничего не делает, когда [method is_on_floor] возвращает [code]true[/"
+"code]."
+
+msgid ""
+"Returns the floor's collision angle at the last collision point according to "
+"[param up_direction], which is [constant Vector2.UP] by default. This value "
+"is always positive and only valid after calling [method move_and_slide] and "
+"when [method is_on_floor] returns [code]true[/code]."
+msgstr ""
+"Возвращает угол столкновения пола в последней точке столкновения в "
+"соответствии с [param up_direction], который по умолчанию равен [constant "
+"Vector2.UP]. Это значение всегда положительно и действительно только после "
+"вызова [method move_and_slide] и когда [method is_on_floor] возвращает "
+"[code]true[/code]."
+
+msgid ""
+"Returns the collision normal of the floor at the last collision point. Only "
+"valid after calling [method move_and_slide] and when [method is_on_floor] "
+"returns [code]true[/code].\n"
+"[b]Warning:[/b] The collision normal is not always the same as the surface "
+"normal."
+msgstr ""
+"Возвращает нормаль столкновения пола в последней точке столкновения. "
+"Действительно только после вызова [method move_and_slide] и когда [method "
+"is_on_floor] возвращает [code]true[/code].\n"
+"[b]Предупреждение:[/b] Нормаль столкновения не всегда совпадает с нормалью "
+"поверхности."
+
+msgid ""
+"Returns the last motion applied to the [CharacterBody2D] during the last call "
+"to [method move_and_slide]. The movement can be split into multiple motions "
+"when sliding occurs, and this method return the last one, which is useful to "
+"retrieve the current direction of the movement."
+msgstr ""
+"Возвращает последнее движение, примененное к [CharacterBody2D] во время "
+"последнего вызова [method move_and_slide]. Движение может быть разделено на "
+"несколько движений, когда происходит скольжение, и этот метод возвращает "
+"последнее, что полезно для получения текущего направления движения."
+
+msgid ""
+"Returns a [KinematicCollision2D], which contains information about the latest "
+"collision that occurred during the last call to [method move_and_slide]."
+msgstr ""
+"Возвращает [KinematicCollision2D], содержащий информацию о последнем "
+"столкновении, произошедшем во время последнего вызова [метода move_and_slide]."
+
+msgid ""
+"Returns the linear velocity of the platform at the last collision point. Only "
+"valid after calling [method move_and_slide]."
+msgstr ""
+"Возвращает линейную скорость платформы в последней точке столкновения. "
+"Действительно только после вызова [метода move_and_slide]."
+
+msgid ""
+"Returns the travel (position delta) that occurred during the last call to "
+"[method move_and_slide]."
+msgstr ""
+"Возвращает перемещение (дельту положения), произошедшее во время последнего "
+"вызова [method move_and_slide]."
+
+msgid ""
+"Returns the current real velocity since the last call to [method "
+"move_and_slide]. For example, when you climb a slope, you will move "
+"diagonally even though the velocity is horizontal. This method returns the "
+"diagonal movement, as opposed to [member velocity] which returns the "
+"requested velocity."
+msgstr ""
+"Возвращает текущую реальную скорость с момента последнего вызова [method "
+"move_and_slide]. Например, когда вы поднимаетесь по склону, вы будете "
+"двигаться по диагонали, даже если скорость горизонтальная. Этот метод "
+"возвращает диагональное движение, в отличие от [member velocity], который "
+"возвращает запрошенную скорость."
+
+msgid ""
+"Returns a [KinematicCollision2D], which contains information about a "
+"collision that occurred during the last call to [method move_and_slide]. "
+"Since the body can collide several times in a single call to [method "
+"move_and_slide], you must specify the index of the collision in the range 0 "
+"to ([method get_slide_collision_count] - 1).\n"
+"[b]Example:[/b] Iterate through the collisions with a [code]for[/code] loop:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in get_slide_collision_count():\n"
+"    var collision = get_slide_collision(i)\n"
+"    print(\"Collided with: \", collision.get_collider().name)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < GetSlideCollisionCount(); i++)\n"
+"{\n"
+"    KinematicCollision2D collision = GetSlideCollision(i);\n"
+"    GD.Print(\"Collided with: \", (collision.GetCollider() as Node).Name);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает [KinematicCollision2D], который содержит информацию о "
+"столкновении, произошедшем во время последнего вызова [method "
+"move_and_slide]. Поскольку тело может столкнуться несколько раз за один вызов "
+"[method move_and_slide], необходимо указать индекс столкновения в диапазоне "
+"от 0 до ([method get_slide_collision_count] - 1).\n"
+"[b]Пример:[/b] Перебрать столкновения с помощью цикла [code]for[/code]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in get_slide_collision_count():\n"
+"    var collision = get_slide_collision(i)\n"
+"    print(\"Collided with: \", collision.get_collider().name)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < GetSlideCollisionCount(); i++)\n"
+"{\n"
+"    KinematicCollision2D collision = GetSlideCollision(i);\n"
+"    GD.Print(\"Collided with: \", (collision.GetCollider() as Node).Name);\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the number of times the body collided and changed direction during "
+"the last call to [method move_and_slide]."
+msgstr ""
+"Возвращает количество столкновений тела и изменение его направления во время "
+"последнего вызова [метода move_and_slide]."
+
+msgid ""
+"Returns the collision normal of the wall at the last collision point. Only "
+"valid after calling [method move_and_slide] and when [method is_on_wall] "
+"returns [code]true[/code].\n"
+"[b]Warning:[/b] The collision normal is not always the same as the surface "
+"normal."
+msgstr ""
+"Возвращает нормаль столкновения стены в последней точке столкновения. "
+"Действительно только после вызова [method move_and_slide] и когда [method "
+"is_on_wall] возвращает [code]true[/code].\n"
+"[b]Предупреждение:[/b] Нормаль столкновения не всегда совпадает с нормалью "
+"поверхности."
+
+msgid ""
+"Returns [code]true[/code] if the body collided with the ceiling on the last "
+"call of [method move_and_slide]. Otherwise, returns [code]false[/code]. The "
+"[member up_direction] and [member floor_max_angle] are used to determine "
+"whether a surface is \"ceiling\" or not."
+msgstr ""
+"Возвращает [code]true[/code], если тело столкнулось с потолком при последнем "
+"вызове [method move_and_slide]. В противном случае возвращает [code]false[/"
+"code]. [Member up_direction] и [member floor_max_angle] используются для "
+"определения того, является ли поверхность «потолком» или нет."
+
+msgid ""
+"Returns [code]true[/code] if the body collided only with the ceiling on the "
+"last call of [method move_and_slide]. Otherwise, returns [code]false[/code]. "
+"The [member up_direction] and [member floor_max_angle] are used to determine "
+"whether a surface is \"ceiling\" or not."
+msgstr ""
+"Возвращает [code]true[/code], если тело столкнулось только с потолком при "
+"последнем вызове [method move_and_slide]. В противном случае возвращает "
+"[code]false[/code]. [Member up_direction] и [member floor_max_angle] "
+"используются для определения того, является ли поверхность «потолком» или нет."
+
+msgid ""
+"Returns [code]true[/code] if the body collided with the floor on the last "
+"call of [method move_and_slide]. Otherwise, returns [code]false[/code]. The "
+"[member up_direction] and [member floor_max_angle] are used to determine "
+"whether a surface is \"floor\" or not."
+msgstr ""
+"Возвращает [code]true[/code], если тело столкнулось с полом при последнем "
+"вызове [method move_and_slide]. В противном случае возвращает [code]false[/"
+"code]. [Member up_direction] и [member floor_max_angle] используются для "
+"определения того, является ли поверхность «полом» или нет."
+
+msgid ""
+"Returns [code]true[/code] if the body collided only with the floor on the "
+"last call of [method move_and_slide]. Otherwise, returns [code]false[/code]. "
+"The [member up_direction] and [member floor_max_angle] are used to determine "
+"whether a surface is \"floor\" or not."
+msgstr ""
+"Возвращает [code]true[/code], если тело столкнулось только с полом при "
+"последнем вызове [method move_and_slide]. В противном случае возвращает "
+"[code]false[/code]. [Member up_direction] и [member floor_max_angle] "
+"используются для определения того, является ли поверхность «полом» или нет."
+
+msgid ""
+"Returns [code]true[/code] if the body collided with a wall on the last call "
+"of [method move_and_slide]. Otherwise, returns [code]false[/code]. The "
+"[member up_direction] and [member floor_max_angle] are used to determine "
+"whether a surface is \"wall\" or not."
+msgstr ""
+"Возвращает [code]true[/code], если тело столкнулось со стеной при последнем "
+"вызове [method move_and_slide]. В противном случае возвращает [code]false[/"
+"code]. [Member up_direction] и [member floor_max_angle] используются для "
+"определения того, является ли поверхность «стеной» или нет."
+
+msgid ""
+"Returns [code]true[/code] if the body collided only with a wall on the last "
+"call of [method move_and_slide]. Otherwise, returns [code]false[/code]. The "
+"[member up_direction] and [member floor_max_angle] are used to determine "
+"whether a surface is \"wall\" or not."
+msgstr ""
+"Возвращает [code]true[/code], если тело столкнулось только со стеной при "
+"последнем вызове [method move_and_slide]. В противном случае возвращает "
+"[code]false[/code]. [Member up_direction] и [member floor_max_angle] "
+"используются для определения того, является ли поверхность «стеной» или нет."
+
+msgid ""
+"Moves the body based on [member velocity]. If the body collides with another, "
+"it will slide along the other body (by default only on floor) rather than "
+"stop immediately. If the other body is a [CharacterBody2D] or [RigidBody2D], "
+"it will also be affected by the motion of the other body. You can use this to "
+"make moving and rotating platforms, or to make nodes push other nodes.\n"
+"Modifies [member velocity] if a slide collision occurred. To get the latest "
+"collision call [method get_last_slide_collision], for detailed information "
+"about collisions that occurred, use [method get_slide_collision].\n"
+"When the body touches a moving platform, the platform's velocity is "
+"automatically added to the body motion. If a collision occurs due to the "
+"platform's motion, it will always be first in the slide collisions.\n"
+"The general behavior and available properties change according to the [member "
+"motion_mode].\n"
+"Returns [code]true[/code] if the body collided, otherwise, returns "
+"[code]false[/code]."
+msgstr ""
+"Перемещает тело на основе [скорости члена]. Если тело сталкивается с другим, "
+"оно будет скользить вдоль другого тела (по умолчанию только по полу), а не "
+"останавливаться немедленно. Если другое тело — [CharacterBody2D] или "
+"[RigidBody2D], оно также будет затронуто движением другого тела. Вы можете "
+"использовать это, чтобы создавать движущиеся и вращающиеся платформы или "
+"заставлять узлы толкать другие узлы.\n"
+"Изменяет [member velocity], если произошло столкновение слайда. Чтобы "
+"получить последнее столкновение, вызовите [method get_last_slide_collision], "
+"для получения подробной информации о произошедших столкновениях используйте "
+"[method get_slide_collision].\n"
+"Когда тело касается движущейся платформы, скорость платформы автоматически "
+"добавляется к движению тела. Если столкновение происходит из-за движения "
+"платформы, оно всегда будет первым в столкновениях скольжения.\n"
+"Общее поведение и доступные свойства изменяются в соответствии с [member "
+"motion_mode].\n"
+"Возвращает [code]true[/code], если тело столкнулось, в противном случае "
+"возвращает [code]false[/code]."
+
+msgid ""
+"If [code]true[/code], the body will be able to move on the floor only. This "
+"option avoids to be able to walk on walls, it will however allow to slide "
+"down along them."
+msgstr ""
+"Если [code]true[/code], тело сможет двигаться только по полу. Эта опция "
+"исключает возможность ходить по стенам, однако позволяет скользить по ним."
+
+msgid ""
+"If [code]false[/code] (by default), the body will move faster on downward "
+"slopes and slower on upward slopes.\n"
+"If [code]true[/code], the body will always move at the same speed on the "
+"ground no matter the slope. Note that you need to use [member "
+"floor_snap_length] to stick along a downward slope at constant speed."
+msgstr ""
+"Если [code]false[/code] (по умолчанию), тело будет двигаться быстрее на "
+"спусках и медленнее на подъемах.\n"
+"Если [code]true[/code], тело всегда будет двигаться с одинаковой скоростью на "
+"земле, независимо от уклона. Обратите внимание, что вам нужно использовать "
+"[member floor_snap_length], чтобы придерживаться спуска с постоянной "
+"скоростью."
+
+msgid ""
+"Maximum angle (in radians) where a slope is still considered a floor (or a "
+"ceiling), rather than a wall, when calling [method move_and_slide]. The "
+"default value equals 45 degrees."
+msgstr ""
+"Максимальный угол (в радианах), при котором наклон все еще считается полом "
+"(или потолком), а не стеной, при вызове [метода move_and_slide]. Значение по "
+"умолчанию равно 45 градусам."
+
+msgid ""
+"Sets a snapping distance. When set to a value different from [code]0.0[/"
+"code], the body is kept attached to slopes when calling [method "
+"move_and_slide]. The snapping vector is determined by the given distance "
+"along the opposite direction of the [member up_direction].\n"
+"As long as the snapping vector is in contact with the ground and the body "
+"moves against [member up_direction], the body will remain attached to the "
+"surface. Snapping is not applied if the body moves along [member "
+"up_direction], meaning it contains vertical rising velocity, so it will be "
+"able to detach from the ground when jumping or when the body is pushed up by "
+"something. If you want to apply a snap without taking into account the "
+"velocity, use [method apply_floor_snap]."
+msgstr ""
+"Устанавливает расстояние привязки. Если установлено значение, отличное от "
+"[code]0.0[/code], тело остается прикрепленным к склонам при вызове [method "
+"move_and_slide]. Вектор привязки определяется заданным расстоянием вдоль "
+"противоположного направления [member up_direction].\n"
+"Пока вектор привязки находится в контакте с землей и тело движется против "
+"[member up_direction], тело будет оставаться прикрепленным к поверхности. "
+"Привязка не применяется, если тело движется вдоль [member up_direction], то "
+"есть оно содержит вертикальную скорость подъема, поэтому оно сможет "
+"оторваться от земли при прыжке или когда тело что-то толкает вверх. Если вы "
+"хотите применить привязку без учета скорости, используйте [method "
+"apply_floor_snap]."
+
+msgid ""
+"If [code]true[/code], the body will not slide on slopes when calling [method "
+"move_and_slide] when the body is standing still.\n"
+"If [code]false[/code], the body will slide on floor's slopes when [member "
+"velocity] applies a downward force."
+msgstr ""
+"Если [code]true[/code], тело не будет скользить по склонам при вызове [method "
+"move_and_slide], когда тело стоит на месте.\n"
+"Если [code]false[/code], тело будет скользить по склонам пола, когда [member "
+"velocity] прикладывает направленную вниз силу."
+
+msgid ""
+"Maximum number of times the body can change direction before it stops when "
+"calling [method move_and_slide]."
+msgstr ""
+"Максимальное количество раз, которое тело может изменить направление, прежде "
+"чем оно остановится при вызове [метода move_and_slide]."
+
+msgid ""
+"Sets the motion mode which defines the behavior of [method move_and_slide]. "
+"See [enum MotionMode] constants for available modes."
+msgstr ""
+"Устанавливает режим движения, который определяет поведение [метода "
+"move_and_slide]. См. константы [enum MotionMode] для доступных режимов."
+
+msgid ""
+"Collision layers that will be included for detecting floor bodies that will "
+"act as moving platforms to be followed by the [CharacterBody2D]. By default, "
+"all floor bodies are detected and propagate their velocity."
+msgstr ""
+"Слои столкновений, которые будут включены для обнаружения напольных тел, "
+"которые будут действовать как движущиеся платформы, за которыми будет "
+"следовать [CharacterBody2D]. По умолчанию все напольные тела обнаруживаются и "
+"распространяют свою скорость."
+
+msgid ""
+"Sets the behavior to apply when you leave a moving platform. By default, to "
+"be physically accurate, when you leave the last platform velocity is applied. "
+"See [enum PlatformOnLeave] constants for available behavior."
+msgstr ""
+"Устанавливает поведение, применяемое при покидании движущейся платформы. По "
+"умолчанию, для физической точности, при покидании применяется последняя "
+"скорость платформы. См. константы [enum PlatformOnLeave] для доступного "
+"поведения."
+
+msgid ""
+"Collision layers that will be included for detecting wall bodies that will "
+"act as moving platforms to be followed by the [CharacterBody2D]. By default, "
+"all wall bodies are ignored."
+msgstr ""
+"Слои столкновений, которые будут включены для обнаружения тел стен, которые "
+"будут действовать как движущиеся платформы, за которыми будет следовать "
+"[CharacterBody2D]. По умолчанию все тела стен игнорируются."
+
+msgid ""
+"Extra margin used for collision recovery when calling [method "
+"move_and_slide].\n"
+"If the body is at least this close to another body, it will consider them to "
+"be colliding and will be pushed away before performing the actual motion.\n"
+"A higher value means it's more flexible for detecting collision, which helps "
+"with consistently detecting walls and floors.\n"
+"A lower value forces the collision algorithm to use more exact detection, so "
+"it can be used in cases that specifically require precision, e.g at very low "
+"scale to avoid visible jittering, or for stability with a stack of character "
+"bodies."
+msgstr ""
+"Дополнительный запас используется для восстановления столкновений при вызове "
+"[method move_and_slide].\n"
+"Если тело находится как минимум на таком расстоянии от другого тела, оно "
+"будет считать их сталкивающимися и будет оттолкнуто перед выполнением "
+"фактического движения.\n"
+"Более высокое значение означает большую гибкость для обнаружения "
+"столкновений, что помогает последовательно обнаруживать стены и полы.\n"
+"Более низкое значение заставляет алгоритм столкновений использовать более "
+"точное обнаружение, поэтому его можно использовать в случаях, когда требуется "
+"особая точность, например, в очень низком масштабе, чтобы избежать видимого "
+"дрожания, или для стабильности со стопкой тел персонажей."
+
+msgid ""
+"If [code]true[/code], during a jump against the ceiling, the body will slide, "
+"if [code]false[/code] it will be stopped and will fall vertically."
+msgstr ""
+"Если [code]true[/code], то при прыжке у потолка тело будет скользить, если "
+"[code]false[/code] — остановится и упадет вертикально."
+
+msgid ""
+"Vector pointing upwards, used to determine what is a wall and what is a floor "
+"(or a ceiling) when calling [method move_and_slide]. Defaults to [constant "
+"Vector2.UP]. As the vector will be normalized it can't be equal to [constant "
+"Vector2.ZERO], if you want all collisions to be reported as walls, consider "
+"using [constant MOTION_MODE_FLOATING] as [member motion_mode]."
+msgstr ""
+"Вектор, направленный вверх, используется для определения того, что является "
+"стеной, а что полом (или потолком) при вызове [метода move_and_slide]. По "
+"умолчанию [константа Vector2.UP]. Поскольку вектор будет нормализован, он не "
+"может быть равен [константе Vector2.ZERO], если вы хотите, чтобы все "
+"столкновения были зарегистрированы как стены, рассмотрите возможность "
+"использования [константы MOTION_MODE_FLOATING] в качестве [элемента "
+"motion_mode]."
+
+msgid ""
+"Current velocity vector in pixels per second, used and modified during calls "
+"to [method move_and_slide]."
+msgstr ""
+"Текущий вектор скорости в пикселях в секунду, используемый и изменяемый во "
+"время вызовов [метода move_and_slide]."
+
+msgid ""
+"Minimum angle (in radians) where the body is allowed to slide when it "
+"encounters a slope. The default value equals 15 degrees. This property only "
+"affects movement when [member motion_mode] is [constant MOTION_MODE_FLOATING]."
+msgstr ""
+"Минимальный угол (в радианах), под которым тело может скользить при "
+"столкновении со склоном. Значение по умолчанию равно 15 градусам. Это "
+"свойство влияет на движение только тогда, когда [member motion_mode] равно "
+"[constant MOTION_MODE_FLOATING]."
+
+msgid ""
+"Apply when notions of walls, ceiling and floor are relevant. In this mode the "
+"body motion will react to slopes (acceleration/slowdown). This mode is "
+"suitable for sided games like platformers."
+msgstr ""
+"Применять, когда важны понятия стен, потолка и пола. В этом режиме движение "
+"тела будет реагировать на наклоны (ускорение/замедление). Этот режим подходит "
+"для односторонних игр, таких как платформеры."
+
+msgid ""
+"Apply when there is no notion of floor or ceiling. All collisions will be "
+"reported as [code]on_wall[/code]. In this mode, when you slide, the speed "
+"will always be constant. This mode is suitable for top-down games."
+msgstr ""
+"Применять, когда нет понятия пола или потолка. Все столкновения будут "
+"сообщаться как [code]on_wall[/code]. В этом режиме при скольжении скорость "
+"всегда будет постоянной. Этот режим подходит для игр сверху вниз."
+
+msgid ""
+"Add the last platform velocity to the [member velocity] when you leave a "
+"moving platform."
+msgstr ""
+"Добавьте последнюю скорость платформы к [скорости члена], когда вы покидаете "
+"движущуюся платформу."
+
+msgid ""
+"Add the last platform velocity to the [member velocity] when you leave a "
+"moving platform, but any downward motion is ignored. It's useful to keep full "
+"jump height even when the platform is moving down."
+msgstr ""
+"Добавьте последнюю скорость платформы к [скорости члена], когда вы покидаете "
+"движущуюся платформу, но любое движение вниз игнорируется. Полезно сохранять "
+"полную высоту прыжка, даже когда платформа движется вниз."
+
+msgid "Do nothing when leaving a platform."
+msgstr "Покидая платформу, не предпринимайте никаких действий."
+
+msgid "A 3D physics body specialized for characters moved by script."
+msgstr ""
+"Трехмерное физическое тело, специально разработанное для персонажей, "
+"перемещаемых по сценарию."
+
+msgid ""
+"[CharacterBody3D] is a specialized class for physics bodies that are meant to "
+"be user-controlled. They are not affected by physics at all, but they affect "
+"other physics bodies in their path. They are mainly used to provide high-"
+"level API to move objects with wall and slope detection ([method "
+"move_and_slide] method) in addition to the general collision detection "
+"provided by [method PhysicsBody3D.move_and_collide]. This makes it useful for "
+"highly configurable physics bodies that must move in specific ways and "
+"collide with the world, as is often the case with user-controlled "
+"characters.\n"
+"For game objects that don't require complex movement or collision detection, "
+"such as moving platforms, [AnimatableBody3D] is simpler to configure."
+msgstr ""
+"[CharacterBody3D] — это специализированный класс для физических тел, которые "
+"должны контролироваться пользователем. Они вообще не подвержены влиянию "
+"физики, но влияют на другие физические тела на своем пути. Они в основном "
+"используются для предоставления высокоуровневого API для перемещения объектов "
+"с обнаружением стен и склонов (метод [method move_and_slide]) в дополнение к "
+"общему обнаружению столкновений, предоставляемому [method PhysicsBody3D."
+"move_and_collide]. Это делает его полезным для высоконастраиваемых физических "
+"тел, которые должны двигаться определенным образом и сталкиваться с миром, "
+"как это часто бывает с персонажами, контролируемыми пользователем.\n"
+"Для игровых объектов, которые не требуют сложного движения или обнаружения "
+"столкновений, таких как движущиеся платформы, [AnimatableBody3D] проще в "
+"настройке."
+
+msgid ""
+"Returns the floor's collision angle at the last collision point according to "
+"[param up_direction], which is [constant Vector3.UP] by default. This value "
+"is always positive and only valid after calling [method move_and_slide] and "
+"when [method is_on_floor] returns [code]true[/code]."
+msgstr ""
+"Возвращает угол столкновения пола в последней точке столкновения в "
+"соответствии с [param up_direction], который по умолчанию равен [constant "
+"Vector3.UP]. Это значение всегда положительно и действительно только после "
+"вызова [method move_and_slide] и когда [method is_on_floor] возвращает "
+"[code]true[/code]."
+
+msgid ""
+"Returns the last motion applied to the [CharacterBody3D] during the last call "
+"to [method move_and_slide]. The movement can be split into multiple motions "
+"when sliding occurs, and this method return the last one, which is useful to "
+"retrieve the current direction of the movement."
+msgstr ""
+"Возвращает последнее движение, примененное к [CharacterBody3D] во время "
+"последнего вызова [method move_and_slide]. Движение может быть разделено на "
+"несколько движений, когда происходит скольжение, и этот метод возвращает "
+"последнее, что полезно для получения текущего направления движения."
+
+msgid ""
+"Returns a [KinematicCollision3D], which contains information about the latest "
+"collision that occurred during the last call to [method move_and_slide]."
+msgstr ""
+"Возвращает [KinematicCollision3D], содержащий информацию о последнем "
+"столкновении, произошедшем во время последнего вызова [метода move_and_slide]."
+
+msgid ""
+"Returns the angular velocity of the platform at the last collision point. "
+"Only valid after calling [method move_and_slide]."
+msgstr ""
+"Возвращает угловую скорость платформы в последней точке столкновения. "
+"Действует только после вызова [метода move_and_slide]."
+
+msgid ""
+"Returns a [KinematicCollision3D], which contains information about a "
+"collision that occurred during the last call to [method move_and_slide]. "
+"Since the body can collide several times in a single call to [method "
+"move_and_slide], you must specify the index of the collision in the range 0 "
+"to ([method get_slide_collision_count] - 1)."
+msgstr ""
+"Возвращает [KinematicCollision3D], содержащий информацию о столкновении, "
+"произошедшем во время последнего вызова [method move_and_slide]. Поскольку "
+"тело может столкнуться несколько раз за один вызов [method move_and_slide], "
+"необходимо указать индекс столкновения в диапазоне от 0 до ([method "
+"get_slide_collision_count] - 1)."
+
+msgid ""
+"Moves the body based on [member velocity]. If the body collides with another, "
+"it will slide along the other body rather than stop immediately. If the other "
+"body is a [CharacterBody3D] or [RigidBody3D], it will also be affected by the "
+"motion of the other body. You can use this to make moving and rotating "
+"platforms, or to make nodes push other nodes.\n"
+"Modifies [member velocity] if a slide collision occurred. To get the latest "
+"collision call [method get_last_slide_collision], for more detailed "
+"information about collisions that occurred, use [method "
+"get_slide_collision].\n"
+"When the body touches a moving platform, the platform's velocity is "
+"automatically added to the body motion. If a collision occurs due to the "
+"platform's motion, it will always be first in the slide collisions.\n"
+"Returns [code]true[/code] if the body collided, otherwise, returns "
+"[code]false[/code]."
+msgstr ""
+"Перемещает тело на основе [скорости члена]. Если тело сталкивается с другим, "
+"оно будет скользить вдоль другого тела, а не останавливаться немедленно. Если "
+"другое тело является [CharacterBody3D] или [RigidBody3D], оно также будет "
+"затронуто движением другого тела. Вы можете использовать это, чтобы заставить "
+"движущиеся и вращающиеся платформы или заставить узлы толкать другие узлы.\n"
+"Изменяет [скорость члена], если произошло столкновение скольжения. Чтобы "
+"получить последнее столкновение, вызовите [метод get_last_slide_collision], "
+"для получения более подробной информации о произошедших столкновениях "
+"используйте [метод get_slide_collision].\n"
+"Когда тело касается движущейся платформы, скорость платформы автоматически "
+"добавляется к движению тела. Если столкновение происходит из-за движения "
+"платформы, оно всегда будет первым в столкновениях скольжения.\n"
+"Возвращает [code]true[/code], если тело столкнулось, в противном случае "
+"возвращает [code]false[/code]."
+
+msgid ""
+"Collision layers that will be included for detecting floor bodies that will "
+"act as moving platforms to be followed by the [CharacterBody3D]. By default, "
+"all floor bodies are detected and propagate their velocity."
+msgstr ""
+"Слои столкновений, которые будут включены для обнаружения тел пола, которые "
+"будут действовать как движущиеся платформы, за которыми будет следовать "
+"[CharacterBody3D]. По умолчанию все тела пола обнаруживаются и распространяют "
+"свою скорость."
+
+msgid ""
+"Collision layers that will be included for detecting wall bodies that will "
+"act as moving platforms to be followed by the [CharacterBody3D]. By default, "
+"all wall bodies are ignored."
+msgstr ""
+"Слои столкновений, которые будут включены для обнаружения тел стен, которые "
+"будут действовать как движущиеся платформы, за которыми будет следовать "
+"[CharacterBody3D]. По умолчанию все тела стен игнорируются."
+
+msgid ""
+"Vector pointing upwards, used to determine what is a wall and what is a floor "
+"(or a ceiling) when calling [method move_and_slide]. Defaults to [constant "
+"Vector3.UP]. As the vector will be normalized it can't be equal to [constant "
+"Vector3.ZERO], if you want all collisions to be reported as walls, consider "
+"using [constant MOTION_MODE_FLOATING] as [member motion_mode]."
+msgstr ""
+"Вектор, направленный вверх, используется для определения того, что является "
+"стеной, а что полом (или потолком) при вызове [метода move_and_slide]. По "
+"умолчанию [константа Vector3.UP]. Поскольку вектор будет нормализован, он не "
+"может быть равен [константе Vector3.ZERO], если вы хотите, чтобы все "
+"столкновения были зарегистрированы как стены, рассмотрите возможность "
+"использования [константы MOTION_MODE_FLOATING] в качестве [элемента "
+"motion_mode]."
+
+msgid ""
+"Current velocity vector (typically meters per second), used and modified "
+"during calls to [method move_and_slide]."
+msgstr ""
+"Текущий вектор скорости (обычно метры в секунду), используемый и изменяемый "
+"во время вызовов [метода move_and_slide]."
+
+msgid ""
+"Minimum angle (in radians) where the body is allowed to slide when it "
+"encounters a slope. The default value equals 15 degrees. When [member "
+"motion_mode] is [constant MOTION_MODE_GROUNDED], it only affects movement if "
+"[member floor_block_on_wall] is [code]true[/code]."
+msgstr ""
+"Минимальный угол (в радианах), под которым тело может скользить при "
+"столкновении со склоном. Значение по умолчанию равно 15 градусам. Когда "
+"[member motion_mode] равно [constant MOTION_MODE_GROUNDED], это влияет на "
+"движение только в том случае, если [member floor_block_on_wall] равно "
+"[code]true[/code]."
+
+msgid ""
+"Apply when notions of walls, ceiling and floor are relevant. In this mode the "
+"body motion will react to slopes (acceleration/slowdown). This mode is "
+"suitable for grounded games like platformers."
+msgstr ""
+"Применять, когда важны понятия стен, потолка и пола. В этом режиме движение "
+"тела будет реагировать на наклоны (ускорение/замедление). Этот режим подходит "
+"для игр с приземлением, таких как платформеры."
+
+msgid ""
+"Apply when there is no notion of floor or ceiling. All collisions will be "
+"reported as [code]on_wall[/code]. In this mode, when you slide, the speed "
+"will always be constant. This mode is suitable for games without ground like "
+"space games."
+msgstr ""
+"Применять, когда нет понятия пола или потолка. Все столкновения будут "
+"сообщаться как [code]on_wall[/code]. В этом режиме при скольжении скорость "
+"всегда будет постоянной. Этот режим подходит для игр без земли, например, "
+"космических игр."
+
+msgid ""
+"Controls how an individual character will be displayed in a [RichTextEffect]."
+msgstr ""
+"Управляет тем, как будет отображаться отдельный символ в [RichTextEffect]."
+
+msgid ""
+"By setting various properties on this object, you can control how individual "
+"characters will be displayed in a [RichTextEffect]."
+msgstr ""
+"Задавая различные свойства этого объекта, вы можете управлять тем, как будут "
+"отображаться отдельные символы в [RichTextEffect]."
+
+msgid "BBCode in RichTextLabel"
+msgstr "BBCode в RichTextLabel"
+
+msgid "The color the character will be drawn with."
+msgstr "Цвет, которым будет нарисован персонаж."
+
+msgid ""
+"The time elapsed since the [RichTextLabel] was added to the scene tree (in "
+"seconds). Time stops when the [RichTextLabel] is paused (see [member Node."
+"process_mode]). Resets when the text in the [RichTextLabel] is changed.\n"
+"[b]Note:[/b] Time still passes while the [RichTextLabel] is hidden."
+msgstr ""
+"Время, прошедшее с момента добавления [RichTextLabel] в дерево сцены (в "
+"секундах). Время останавливается, когда [RichTextLabel] приостанавливается "
+"(см. [member Node.process_mode]). Сбрасывается, когда текст в [RichTextLabel] "
+"изменяется.\n"
+"[b]Примечание:[/b] Время все еще идет, пока [RichTextLabel] скрыт."
+
+msgid ""
+"Contains the arguments passed in the opening BBCode tag. By default, "
+"arguments are strings; if their contents match a type such as [bool], [int] "
+"or [float], they will be converted automatically. Color codes in the form "
+"[code]#rrggbb[/code] or [code]#rgb[/code] will be converted to an opaque "
+"[Color]. String arguments may not contain spaces, even if they're quoted. If "
+"present, quotes will also be present in the final string.\n"
+"For example, the opening BBCode tag [code][example foo=hello bar=true baz=42 "
+"color=#ffffff][/code] will map to the following [Dictionary]:\n"
+"[codeblock]\n"
+"{\"foo\": \"hello\", \"bar\": true, \"baz\": 42, \"color\": Color(1, 1, 1, "
+"1)}\n"
+"[/codeblock]"
+msgstr ""
+"Содержит аргументы, переданные в открывающем теге BBCode. По умолчанию "
+"аргументы являются строками; если их содержимое соответствует типу, например "
+"[bool], [int] или [float], они будут преобразованы автоматически. Цветовые "
+"коды в форме [code]#rrggbb[/code] или [code]#rgb[/code] будут преобразованы в "
+"непрозрачный [Color]. Строковые аргументы не могут содержать пробелы, даже "
+"если они заключены в кавычки. \n"
+"Если они присутствуют, кавычки также будут присутствовать в конечной строке. "
+"Например, открывающий тег BBCode [code][example foo=hello bar=true baz=42 "
+"color=#ffffff][/code] будет сопоставлен со следующим [Dictionary]:\n"
+"[codeblock]\n"
+"{\"foo\": \"hello\", \"bar\": true, \"baz\": 42, \"color\": Color(1, 1, 1, "
+"1)}\n"
+"[/codeblock]"
+
+msgid ""
+"[TextServer] RID of the font used to render glyph, this value can be used "
+"with [code]TextServer.font_*[/code] methods to retrieve font information.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"[TextServer] RID шрифта, используемого для отображения глифа, это значение "
+"можно использовать с методами [code]TextServer.font_*[/code] для получения "
+"информации о шрифте.\n"
+"[b]Примечание:[/b] Только для чтения. Установка этого свойства не повлияет на "
+"рисование."
+
+msgid ""
+"Number of glyphs in the grapheme cluster. This value is set in the first "
+"glyph of a cluster.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Количество глифов в кластере графем. Это значение задается в первом глифе "
+"кластера.\n"
+"[b]Примечание:[/b] Только для чтения. Установка этого свойства не повлияет на "
+"рисование."
+
+msgid ""
+"Glyph flags. See [enum TextServer.GraphemeFlag] for more info.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Флаги глифов. См. [enum TextServer.GraphemeFlag] для получения дополнительной "
+"информации.\n"
+"[b]Примечание:[/b] Только для чтения. Установка этого свойства не повлияет на "
+"рисование."
+
+msgid ""
+"Glyph index specific to the [member font]. If you want to replace this glyph, "
+"use [method TextServer.font_get_glyph_index] with [member font] to get a new "
+"glyph index for a single character."
+msgstr ""
+"Индекс глифа, специфичный для [шрифта-члена]. Если вы хотите заменить этот "
+"глиф, используйте [метод TextServer.font_get_glyph_index] с [шрифтом-членом], "
+"чтобы получить новый индекс глифа для одного символа."
+
+msgid "The position offset the character will be drawn with (in pixels)."
+msgstr "Смещение позиции, с которой будет нарисован символ (в пикселях)."
+
+msgid ""
+"If [code]true[/code], FX transform is called for outline drawing.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Если [code]true[/code], FX-преобразование вызывается для контурного "
+"рисования.\n"
+"[b]Примечание:[/b] Только для чтения. Установка этого свойства не повлияет на "
+"рисование."
+
+msgid ""
+"Absolute character range in the string, corresponding to the glyph.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Абсолютный диапазон символов в строке, соответствующий глифу.\n"
+"[b]Примечание:[/b] Только для чтения. Установка этого свойства не повлияет на "
+"рисование."
+
+msgid ""
+"The character offset of the glyph, relative to the current [RichTextEffect] "
+"custom block.\n"
+"[b]Note:[/b] Read-only. Setting this property won't affect drawing."
+msgstr ""
+"Смещение символа глифа относительно текущего пользовательского блока "
+"[RichTextEffect].\n"
+"[b]Примечание:[/b] Только для чтения. Установка этого свойства не повлияет на "
+"рисование."
+
+msgid ""
+"The current transform of the current glyph. It can be overridden (for "
+"example, by driving the position and rotation from a curve). You can also "
+"alter the existing value to apply transforms on top of other effects."
+msgstr ""
+"Текущее преобразование текущего глифа. Его можно переопределить (например, "
+"управляя положением и вращением из кривой). Вы также можете изменить "
+"существующее значение, чтобы применить преобразования поверх других эффектов."
+
+msgid ""
+"If [code]true[/code], the character will be drawn. If [code]false[/code], the "
+"character will be hidden. Characters around hidden characters will reflow to "
+"take the space of hidden characters. If this is not desired, set their "
+"[member color] to [code]Color(1, 1, 1, 0)[/code] instead."
+msgstr ""
+"Если [code]true[/code], символ будет нарисован. Если [code]false[/code], "
+"символ будет скрыт. Символы вокруг скрытых символов будут переформатированы, "
+"чтобы занять пространство скрытых символов. Если это нежелательно, вместо "
+"этого установите их [member color] на [code]Color(1, 1, 1, 0)[/code]."
+
+msgid "A button that represents a binary choice."
+msgstr "Кнопка, представляющая бинарный выбор."
+
+msgid ""
+"[CheckBox] allows the user to choose one of only two possible options. It's "
+"similar to [CheckButton] in functionality, but it has a different appearance. "
+"To follow established UX patterns, it's recommended to use [CheckBox] when "
+"toggling it has [b]no[/b] immediate effect on something. For example, it "
+"could be used when toggling it will only do something once a confirmation "
+"button is pressed.\n"
+"See also [BaseButton] which contains common properties and methods associated "
+"with this node.\n"
+"When [member BaseButton.button_group] specifies a [ButtonGroup], [CheckBox] "
+"changes its appearance to that of a radio button and uses the various "
+"[code]radio_*[/code] theme properties."
+msgstr ""
+"[CheckBox] позволяет пользователю выбрать один из двух возможных вариантов. "
+"Он похож на [CheckButton] по функциональности, но имеет другой внешний вид. "
+"Чтобы следовать установленным шаблонам UX, рекомендуется использовать "
+"[CheckBox], когда переключение [b]не[/b] оказывает немедленного эффекта на "
+"что-либо. Например, его можно использовать, когда переключение будет "
+"выполнять что-либо только после нажатия кнопки подтверждения.\n"
+"См. также [BaseButton], который содержит общие свойства и методы, связанные с "
+"этим узлом.\n"
+"Когда [member BaseButton.button_group] указывает [ButtonGroup], [CheckBox] "
+"меняет свой внешний вид на вид переключателя и использует различные свойства "
+"темы [code]radio_*[/code]."
+
+msgid "The vertical offset used when rendering the check icons (in pixels)."
+msgstr ""
+"Вертикальное смещение, используемое при отрисовке значков галочек (в "
+"пикселях)."
+
+msgid "The check icon to display when the [CheckBox] is checked."
+msgstr "Значок галочки, отображаемый при установке флажка [CheckBox]."
+
+msgid ""
+"The check icon to display when the [CheckBox] is checked and is disabled."
+msgstr "Значок галочки, отображаемый, когда [CheckBox] отмечен и отключен."
+
+msgid ""
+"The check icon to display when the [CheckBox] is configured as a radio button "
+"and is checked."
+msgstr ""
+"Значок галочки, отображаемый, когда [CheckBox] настроен как переключатель и "
+"отмечен."
+
+msgid ""
+"The check icon to display when the [CheckBox] is configured as a radio "
+"button, is disabled, and is unchecked."
+msgstr ""
+"Значок галочки, отображаемый, когда [CheckBox] настроен как переключатель, "
+"отключен и не отмечен."
+
+msgid ""
+"The check icon to display when the [CheckBox] is configured as a radio button "
+"and is unchecked."
+msgstr ""
+"Значок галочки, отображаемый, когда [CheckBox] настроен как переключатель и "
+"не отмечен."
+
+msgid "The check icon to display when the [CheckBox] is unchecked."
+msgstr "Значок галочки, отображаемый, когда флажок [CheckBox] не отмечен."
+
+msgid ""
+"The check icon to display when the [CheckBox] is unchecked and is disabled."
+msgstr ""
+"Значок галочки, отображаемый, когда флажок [CheckBox] не отмечен и отключен."
+
+msgid ""
+"[CheckButton] is a toggle button displayed as a check field. It's similar to "
+"[CheckBox] in functionality, but it has a different appearance. To follow "
+"established UX patterns, it's recommended to use [CheckButton] when toggling "
+"it has an [b]immediate[/b] effect on something. For example, it can be used "
+"when pressing it shows or hides advanced settings, without asking the user to "
+"confirm this action.\n"
+"See also [BaseButton] which contains common properties and methods associated "
+"with this node."
+msgstr ""
+"[CheckButton] — это кнопка-переключатель, отображаемая как поле для флажка. "
+"По функциональности она похожа на [CheckBox], но имеет другой внешний вид. "
+"Чтобы следовать установленным шаблонам UX, рекомендуется использовать "
+"[CheckButton], когда переключение оказывает [b]немедленный[/b] эффект на что-"
+"либо. Например, ее можно использовать, когда нажатие показывает или скрывает "
+"расширенные настройки, не запрашивая у пользователя подтверждения этого "
+"действия.\n"
+"См. также [BaseButton], который содержит общие свойства и методы, связанные с "
+"этим узлом."
+
+msgid "The vertical offset used when rendering the toggle icons (in pixels)."
+msgstr ""
+"Вертикальное смещение, используемое при отрисовке значков переключения (в "
+"пикселях)."
+
+msgid ""
+"The icon to display when the [CheckButton] is checked (for left-to-right "
+"layouts)."
+msgstr ""
+"Значок, отображаемый при установке флажка [CheckButton] (для макетов слева "
+"направо)."
+
+msgid ""
+"The icon to display when the [CheckButton] is checked and disabled (for left-"
+"to-right layouts)."
+msgstr ""
+"Значок, отображаемый, когда [CheckButton] отмечен и отключен (для макетов "
+"слева направо)."
+
+msgid ""
+"The icon to display when the [CheckButton] is checked and disabled (for right-"
+"to-left layouts)."
+msgstr ""
+"Значок, отображаемый, когда [CheckButton] отмечен и отключен (для макетов с "
+"письмом справа налево)."
+
+msgid ""
+"The icon to display when the [CheckButton] is checked (for right-to-left "
+"layouts)."
+msgstr ""
+"Значок, отображаемый при установке флажка [CheckButton] (для макетов с "
+"письмом справа налево)."
+
+msgid ""
+"The icon to display when the [CheckButton] is unchecked (for left-to-right "
+"layouts)."
+msgstr ""
+"Значок, отображаемый при снятом флажке [CheckButton] (для макетов слева "
+"направо)."
+
+msgid ""
+"The icon to display when the [CheckButton] is unchecked and disabled (for "
+"left-to-right layouts)."
+msgstr ""
+"Значок, отображаемый, когда [CheckButton] не отмечен и отключен (для макетов "
+"слева направо)."
+
+msgid ""
+"The icon to display when the [CheckButton] is unchecked and disabled (for "
+"right-to-left layouts)."
+msgstr ""
+"Значок, отображаемый, когда [CheckButton] не отмечен и отключен (для макетов "
+"с письмом справа налево)."
+
+msgid ""
+"The icon to display when the [CheckButton] is unchecked (for right-to-left "
+"layouts)."
+msgstr ""
+"Значок, отображаемый при снятом флажке [CheckButton] (для макетов с письмом "
+"справа налево)."
+
+msgid "A 2D circle shape used for physics collision."
+msgstr "2D круглая форма, используемая для физического столкновения."
+
+msgid ""
+"A 2D circle shape, intended for use in physics. Usually used to provide a "
+"shape for a [CollisionShape2D].\n"
+"[b]Performance:[/b] [CircleShape2D] is fast to check collisions against. It "
+"is faster than [RectangleShape2D] and [CapsuleShape2D]."
+msgstr ""
+"Двумерная круглая форма, предназначенная для использования в физике. Обычно "
+"используется для предоставления формы для [CollisionShape2D].\n"
+"[b]Производительность:[/b] [CircleShape2D] быстро проверяет столкновения. Он "
+"быстрее, чем [RectangleShape2D] и [CapsuleShape2D]."
+
+msgid "The circle's radius."
+msgstr "Радиус окружности."
+
+msgid "Provides access to metadata stored for every available class."
+msgstr ""
+"Предоставляет доступ к метаданным, хранящимся для каждого доступного класса."
+
+msgid ""
+"Returns [code]true[/code] if objects can be instantiated from the specified "
+"[param class], otherwise returns [code]false[/code]."
+msgstr ""
+"Возвращает [code]true[/code], если объекты могут быть созданы из указанного "
+"[param class], в противном случае возвращает [code]false[/code]."
+
+msgid ""
+"Returns an array with all the keys in [param enum] of [param class] or its "
+"ancestry."
+msgstr ""
+"Возвращает массив со всеми ключами в [param enum] [param class] или его "
+"предке."
+
+msgid "Returns an array with all the enums of [param class] or its ancestry."
+msgstr ""
+"Возвращает массив со всеми перечислениями [param class] или его предков."
+
+msgid ""
+"Returns the value of the integer constant [param name] of [param class] or "
+"its ancestry. Always returns 0 when the constant could not be found."
+msgstr ""
+"Возвращает значение целочисленной константы [имя параметра] [класс параметра] "
+"или ее предка. Всегда возвращает 0, если константа не может быть найдена."
+
+msgid ""
+"Returns an array with the names all the integer constants of [param class] or "
+"its ancestry."
+msgstr ""
+"Возвращает массив с именами всех целочисленных констант [класса параметров] "
+"или его предков."
+
+msgid ""
+"Returns the number of arguments of the method [param method] of [param class] "
+"or its ancestry if [param no_inheritance] is [code]false[/code]."
+msgstr ""
+"Возвращает количество аргументов метода [param method] из [param class] или "
+"его предка, если [param no_inheritance] равно [code]false[/code]."
+
+msgid ""
+"Returns an array with all the methods of [param class] or its ancestry if "
+"[param no_inheritance] is [code]false[/code]. Every element of the array is a "
+"[Dictionary] with the following keys: [code]args[/code], [code]default_args[/"
+"code], [code]flags[/code], [code]id[/code], [code]name[/code], [code]return: "
+"(class_name, hint, hint_string, name, type, usage)[/code].\n"
+"[b]Note:[/b] In exported release builds the debug info is not available, so "
+"the returned dictionaries will contain only method names."
+msgstr ""
+"Возвращает массив со всеми методами [param class] или его предка, если [param "
+"no_inheritance] равен [code]false[/code]. Каждый элемент массива — это "
+"[Dictionary] со следующими ключами: [code]args[/code], [code]default_args[/"
+"code], [code]flags[/code], [code]id[/code], [code]name[/code], [code]return: "
+"(class_name, hint, hint_string, name, type, usage)[/code].\n"
+"[b]Примечание:[/b] В экспортированных сборках релиза отладочная информация "
+"недоступна, поэтому возвращаемые словари будут содержать только имена методов."
+
+msgid "Returns the value of [param property] of [param object] or its ancestry."
+msgstr ""
+"Возвращает значение [свойства параметра] [объекта параметра] или его предка."
+
+msgid "Returns the getter method name of [param property] of [param class]."
+msgstr ""
+"Возвращает имя метода получения [свойства параметра] из [класса параметров]."
+
+msgid ""
+"Returns an array with all the properties of [param class] or its ancestry if "
+"[param no_inheritance] is [code]false[/code]."
+msgstr ""
+"Возвращает массив со всеми свойствами [param class] или его предка, если "
+"[param no_inheritance] равен [code]false[/code]."
+
+msgid "Returns the setter method name of [param property] of [param class]."
+msgstr ""
+"Возвращает имя метода установки [свойства параметра] из [класса параметров]."
+
+msgid ""
+"Returns the [param signal] data of [param class] or its ancestry. The "
+"returned value is a [Dictionary] with the following keys: [code]args[/code], "
+"[code]default_args[/code], [code]flags[/code], [code]id[/code], [code]name[/"
+"code], [code]return: (class_name, hint, hint_string, name, type, usage)[/"
+"code]."
+msgstr ""
+"Возвращает данные [param signal] [param class] или его предка. Возвращаемое "
+"значение — [Dictionary] со следующими ключами: [code]args[/code], "
+"[code]default_args[/code], [code]flags[/code], [code]id[/code], [code]name[/"
+"code], [code]return: (class_name, hint, hint_string, name, type, usage)[/"
+"code]."
+
+msgid ""
+"Returns an array with all the signals of [param class] or its ancestry if "
+"[param no_inheritance] is [code]false[/code]. Every element of the array is a "
+"[Dictionary] as described in [method class_get_signal]."
+msgstr ""
+"Возвращает массив со всеми сигналами [param class] или его предка, если "
+"[param no_inheritance] равен [code]false[/code]. Каждый элемент массива "
+"является [Dictionary], как описано в [method class_get_signal]."
+
+msgid ""
+"Returns whether [param class] or its ancestry has an enum called [param name] "
+"or not."
+msgstr ""
+"Возвращает, имеет ли [класс параметров] или его предок перечисление с именем "
+"[имя параметра] или нет."
+
+msgid ""
+"Returns whether [param class] or its ancestry has an integer constant called "
+"[param name] or not."
+msgstr ""
+"Возвращает, имеет ли [класс параметров] или его предок целочисленную "
+"константу с именем [имя параметра] или нет."
+
+msgid ""
+"Returns whether [param class] (or its ancestry if [param no_inheritance] is "
+"[code]false[/code]) has a method called [param method] or not."
+msgstr ""
+"Возвращает, имеет ли [param class] (или его предок, если [param "
+"no_inheritance] равен [code]false[/code]) метод с именем [param method] или "
+"нет."
+
+msgid ""
+"Returns whether [param class] or its ancestry has a signal called [param "
+"signal] or not."
+msgstr ""
+"Возвращает, имеет ли [param class] или его предок сигнал с именем [param "
+"signal] или нет."
+
+msgid "Sets [param property] value of [param object] to [param value]."
+msgstr ""
+"Устанавливает значение [параметры свойства] для [параметры объекта] равным "
+"[параметры значению]."
+
+msgid "Returns the names of all the classes available."
+msgstr "Возвращает имена всех доступных классов."
+
+msgid ""
+"Returns the names of all the classes that directly or indirectly inherit from "
+"[param class]."
+msgstr ""
+"Возвращает имена всех классов, которые напрямую или косвенно наследуют от "
+"[param class]."
+
+msgid "Returns the parent class of [param class]."
+msgstr "Возвращает родительский класс [param class]."
+
+msgid "Creates an instance of [param class]."
+msgstr "Создает экземпляр [класс параметров]."
+
+msgid "Returns whether this [param class] is enabled or not."
+msgstr "Возвращает, включен ли этот [класс параметров] или нет."
+
+msgid ""
+"Returns whether [param class] (or its ancestor classes if [param "
+"no_inheritance] is [code]false[/code]) has an enum called [param enum] that "
+"is a bitfield."
+msgstr ""
+"Возвращает, имеет ли [param class] (или его предковые классы, если [param "
+"no_inheritance] равен [code]false[/code]) перечисление с именем [param enum], "
+"которое является битовым полем."
+
+msgid "Returns whether [param inherits] is an ancestor of [param class] or not."
+msgstr "Возвращает, является ли [param inherits] предком [param class] или нет."
+
+msgid "Native Core class type."
+msgstr "Тип класса Native Core."
+
+msgid "Native Editor class type."
+msgstr "Тип класса Собственного Редактора."
+
+msgid "GDExtension class type."
+msgstr "Тип класса GDExtension."
+
+msgid "GDExtension Editor class type."
+msgstr "Тип класса редактора GDExtension."
+
+msgid "Unknown class type."
+msgstr "Неизвестный тип класса."
+
+msgid "A multiline text editor designed for editing code."
+msgstr ""
+"Многострочный текстовый редактор, предназначенный для редактирования кода."
+
+msgid ""
+"CodeEdit is a specialized [TextEdit] designed for editing plain text code "
+"files. It has many features commonly found in code editors such as line "
+"numbers, line folding, code completion, indent management, and string/comment "
+"management.\n"
+"[b]Note:[/b] Regardless of locale, [CodeEdit] will by default always use left-"
+"to-right text direction to correctly display source code."
+msgstr ""
+"CodeEdit — это специализированный [TextEdit], разработанный для "
+"редактирования файлов с простым текстовым кодом. Он обладает множеством "
+"функций, обычно встречающихся в редакторах кода, таких как номера строк, "
+"перенос строк, автодополнение кода, управление отступами и управление "
+"строками/комментариями.\n"
+"[b]Примечание:[/b] Независимо от локали, [CodeEdit] по умолчанию всегда будет "
+"использовать направление текста слева направо для правильного отображения "
+"исходного кода."
+
+msgid ""
+"Override this method to define how the selected entry should be inserted. If "
+"[param replace] is [code]true[/code], any existing text should be replaced."
+msgstr ""
+"Переопределить этот метод, чтобы определить, как следует вставлять выбранную "
+"запись. Если [param replace] равен [code]true[/code], любой существующий "
+"текст должен быть заменен."
+
+msgid ""
+"Override this method to define what items in [param candidates] should be "
+"displayed.\n"
+"Both [param candidates] and the return is a [Array] of [Dictionary], see "
+"[method get_code_completion_option] for [Dictionary] content."
+msgstr ""
+"Переопределите этот метод, чтобы определить, какие элементы в [param "
+"candidates] должны отображаться.\n"
+"Оба [param candidates] и возвращаемый результат — [Array] из [Dictionary], "
+"см. [method get_code_completion_option] для содержимого [Dictionary]."
+
+msgid ""
+"Override this method to define what happens when the user requests code "
+"completion. If [param force] is [code]true[/code], any checks should be "
+"bypassed."
+msgstr ""
+"Переопределите этот метод, чтобы определить, что произойдет, когда "
+"пользователь запрашивает завершение кода. Если [param force] равен "
+"[code]true[/code], любые проверки следует обойти."
+
+msgid ""
+"Adds a brace pair.\n"
+"Both the start and end keys must be symbols. Only the start key has to be "
+"unique."
+msgstr ""
+"Добавляет пару скобок.\n"
+"Начальный и конечный ключи должны быть символами. Только начальный ключ "
+"должен быть уникальным."
+
+msgid ""
+"Submits an item to the queue of potential candidates for the autocomplete "
+"menu. Call [method update_code_completion_options] to update the list.\n"
+"[param location] indicates location of the option relative to the location of "
+"the code completion query. See [enum CodeEdit.CodeCompletionLocation] for how "
+"to set this value.\n"
+"[b]Note:[/b] This list will replace all current candidates."
+msgstr ""
+"Отправляет элемент в очередь потенциальных кандидатов для меню "
+"автозаполнения. Вызовите [method update_code_completion_options], чтобы "
+"обновить список.\n"
+"[param location] указывает расположение параметра относительно местоположения "
+"запроса на завершение кода. См. [enum CodeEdit.CodeCompletionLocation], чтобы "
+"узнать, как задать это значение.\n"
+"[b]Примечание:[/b] Этот список заменит всех текущих кандидатов."
+
+msgid ""
+"Adds a comment delimiter from [param start_key] to [param end_key]. Both keys "
+"should be symbols, and [param start_key] must not be shared with other "
+"delimiters.\n"
+"If [param line_only] is [code]true[/code] or [param end_key] is an empty "
+"[String], the region does not carry over to the next line."
+msgstr ""
+"Добавляет разделитель комментариев от [param start_key] до [param end_key]. "
+"Оба ключа должны быть символами, и [param start_key] не должен использоваться "
+"совместно с другими разделителями.\n"
+"Если [param line_only] — это [code]true[/code] или [param end_key] — это "
+"пустая [String], область не переносится на следующую строку."
+
+msgid ""
+"Defines a string delimiter from [param start_key] to [param end_key]. Both "
+"keys should be symbols, and [param start_key] must not be shared with other "
+"delimiters.\n"
+"If [param line_only] is [code]true[/code] or [param end_key] is an empty "
+"[String], the region does not carry over to the next line."
+msgstr ""
+"Определяет разделитель строк от [param start_key] до [param end_key]. Оба "
+"ключа должны быть символами, и [param start_key] не должен использоваться "
+"совместно с другими разделителями.\n"
+"Если [param line_only] — [code]true[/code], или [param end_key] — это пустая "
+"[String], область не переносится на следующую строку."
+
+msgid ""
+"Returns [code]true[/code] if the given line is foldable. A line is foldable "
+"if it is the start of a valid code region (see [method "
+"get_code_region_start_tag]), if it is the start of a comment or string block, "
+"or if the next non-empty line is more indented (see [method TextEdit."
+"get_indent_level])."
+msgstr ""
+"Возвращает [code]true[/code], если заданная строка является сворачиваемой. "
+"Строка является сворачиваемой, если она является началом допустимой области "
+"кода (см. [метод get_code_region_start_tag]), если она является началом "
+"комментария или блока строки, или если следующая непустая строка имеет "
+"больший отступ (см. [метод TextEdit.get_indent_level])."
+
+msgid "Cancels the autocomplete menu."
+msgstr "Отменяет меню автозаполнения."
+
+msgid "Clears all bookmarked lines."
+msgstr "Очищает все отмеченные строки."
+
+msgid "Clears all breakpointed lines."
+msgstr "Очистить все линии точек останова."
+
+msgid "Removes all comment delimiters."
+msgstr "Удаляет все разделители комментариев."
+
+msgid "Clears all executed lines."
+msgstr "Очищает все выполненные строки."
+
+msgid "Removes all string delimiters."
+msgstr "Удаляет все разделители строк."
+
+msgid ""
+"Inserts the selected entry into the text. If [param replace] is [code]true[/"
+"code], any existing text is replaced rather than merged."
+msgstr ""
+"Вставляет выбранную запись в текст. Если [param replace] равен [code]true[/"
+"code], любой существующий текст заменяется, а не объединяется."
+
+msgid ""
+"Converts the indents of lines between [param from_line] and [param to_line] "
+"to tabs or spaces as set by [member indent_use_spaces].\n"
+"Values of [code]-1[/code] convert the entire text."
+msgstr ""
+"Преобразует отступы строк между [param from_line] и [param to_line] в "
+"табуляции или пробелы, как установлено [member indent_use_spaces]. \n"
+"Значения [code]-1[/code] преобразуют весь текст."
+
+msgid ""
+"Creates a new code region with the selection. At least one single line "
+"comment delimiter have to be defined (see [method add_comment_delimiter]).\n"
+"A code region is a part of code that is highlighted when folded and can help "
+"organize your script.\n"
+"Code region start and end tags can be customized (see [method "
+"set_code_region_tags]).\n"
+"Code regions are delimited using start and end tags (respectively "
+"[code]region[/code] and [code]endregion[/code] by default) preceded by one "
+"line comment delimiter. (eg. [code]#region[/code] and [code]#endregion[/code])"
+msgstr ""
+"Создает новую область кода с выбранным фрагментом. Необходимо определить хотя "
+"бы один разделитель комментариев в одну строку (см. [method "
+"add_comment_delimiter]).\n"
+"Область кода — это часть кода, которая выделяется при сворачивании и может "
+"помочь организовать ваш скрипт.\n"
+"Начальные и конечные теги области кода можно настроить (см. [method "
+"set_code_region_tags]).\n"
+"Области кода разделяются с помощью начальных и конечных тегов (соответственно "
+"[code]region[/code] и [code]endregion[/code] по умолчанию), которым "
+"предшествует разделитель комментариев в одну строку. (например, "
+"[code]#region[/code] и [code]#endregion[/code])"
+
+msgid "Deletes all lines that are selected or have a caret on them."
+msgstr "Удаляет все выделенные строки или строки, на которых установлен курсор."
+
+msgid ""
+"If there is no selection, indentation is inserted at the caret. Otherwise, "
+"the selected lines are indented like [method indent_lines]. Equivalent to the "
+"[member ProjectSettings.input/ui_text_indent] action. The indentation "
+"characters used depend on [member indent_use_spaces] and [member indent_size]."
+msgstr ""
+"Если выделения нет, отступ вставляется в каретку. В противном случае "
+"выбранные строки отступают как [method indent_lines]. Эквивалентно действию "
+"[member ProjectSettings.input/ui_text_indent]. Используемые символы отступа "
+"зависят от [member indent_use_spaces] и [member indent_size]."
+
+msgid ""
+"Duplicates all lines currently selected with any caret. Duplicates the entire "
+"line beneath the current one no matter where the caret is within the line."
+msgstr ""
+"Дублирует все строки, выбранные в данный момент с любым курсором. Дублирует "
+"всю строку под текущей, независимо от того, где в строке находится курсор."
+
+msgid ""
+"Duplicates all selected text and duplicates all lines with a caret on them."
+msgstr ""
+"Дублирует весь выделенный текст и все строки, на которых установлен курсор."
+
+msgid ""
+"Folds all lines that are possible to be folded (see [method can_fold_line])."
+msgstr ""
+"Складывает все линии, которые можно сложить (см. [метод can_fold_line])."
+
+msgid "Folds the given line, if possible (see [method can_fold_line])."
+msgstr ""
+"Складывает заданную строку, если это возможно (см. [метод can_fold_line])."
+
+msgid "Gets the matching auto brace close key for [param open_key]."
+msgstr ""
+"Получает соответствующий ключ закрытия автоматической скобки для [param "
+"open_key]."
+
+msgid "Gets all bookmarked lines."
+msgstr "Получает все отмеченные закладками строки."
+
+msgid "Gets all breakpointed lines."
+msgstr "Получает все контрольные точки строк."
+
+msgid ""
+"Gets the completion option at [param index]. The return [Dictionary] has the "
+"following key-values:\n"
+"[code]kind[/code]: [enum CodeCompletionKind]\n"
+"[code]display_text[/code]: Text that is shown on the autocomplete menu.\n"
+"[code]insert_text[/code]: Text that is to be inserted when this item is "
+"selected.\n"
+"[code]font_color[/code]: Color of the text on the autocomplete menu.\n"
+"[code]icon[/code]: Icon to draw on the autocomplete menu.\n"
+"[code]default_value[/code]: Value of the symbol."
+msgstr ""
+"Получает параметр завершения в [param index]. Возвращаемый [Словарь] имеет "
+"следующие ключевые значения:\n"
+"[code]kind[/code]: [enum CodeCompletionKind]\n"
+"[code]display_text[/code]: Текст, отображаемый в меню автозаполнения.\n"
+"[code]insert_text[/code]: Текст, который должен быть вставлен при выборе "
+"этого элемента.\n"
+"[code]font_color[/code]: Цвет текста в меню автозаполнения.\n"
+"[code]icon[/code]: Значок для рисования в меню автозаполнения.\n"
+"[code]default_value[/code]: Значение символа."
+
+msgid ""
+"Gets all completion options, see [method get_code_completion_option] for "
+"return content."
+msgstr ""
+"Получает все параметры завершения, см. [method get_code_completion_option] "
+"для получения информации о возвращаемом содержимом."
+
+msgid "Gets the end key for a string or comment region index."
+msgstr "Получает конечный ключ для индекса строки или области комментариев."
+
+msgid ""
+"If [param line] [param column] is in a string or comment, returns the end "
+"position of the region. If not or no end could be found, both [Vector2] "
+"values will be [code]-1[/code]."
+msgstr ""
+"Если [параметр строк] [параметр столбов] находится в строке или комментарии, "
+"возвращает конечную позицию региона. Если нет или конец не найден, оба "
+"значения [Vector2] будут [code]-1[/code]."
+
+msgid "Gets the start key for a string or comment region index."
+msgstr "Получает начальный ключ для индекса строки или области комментариев."
+
+msgid ""
+"If [param line] [param column] is in a string or comment, returns the start "
+"position of the region. If not or no start could be found, both [Vector2] "
+"values will be [code]-1[/code]."
+msgstr ""
+"Если [параметр строк] [параметр столбов] находится в строке или комментарии, "
+"возвращает начальную позицию региона. Если нет или начало не найдено, оба "
+"значения [Vector2] будут [code]-1[/code]."
+
+msgid "Gets all executing lines."
+msgstr "Получает все исполняемые строки."
+
+msgid ""
+"Indents all lines that are selected or have a caret on them. Uses spaces or a "
+"tab depending on [member indent_use_spaces]. See [method unindent_lines]."
+msgstr ""
+"Делает отступы во всех строках, которые выбраны или на которых есть курсор. "
+"Использует пробелы или табуляцию в зависимости от [member indent_use_spaces]. "
+"См. [method unindent_lines]."
+
+msgid ""
+"Returns delimiter index if [param line] [param column] is in a comment. If "
+"[param column] is not provided, will return delimiter index if the entire "
+"[param line] is a comment. Otherwise [code]-1[/code]."
+msgstr ""
+"Возвращает индекс разделителя, если [param line] [param column] находится в "
+"комментарии. Если [param column] не указан, вернет индекс разделителя, если "
+"вся [param line] является комментарием. В противном случае [code]-1[/code]."
+
+msgid ""
+"Returns the delimiter index if [param line] [param column] is in a string. If "
+"[param column] is not provided, will return the delimiter index if the entire "
+"[param line] is a string. Otherwise [code]-1[/code]."
+msgstr ""
+"Возвращает индекс разделителя, если [param line] [param column] находится в "
+"строке. Если [param column] не указан, вернет индекс разделителя, если вся "
+"[param line] является строкой. В противном случае [code]-1[/code]."
+
+msgid "Moves all lines down that are selected or have a caret on them."
+msgstr "Перемещает вниз все выделенные или имеющие курсор строки."
+
+msgid "Removes the comment delimiter with [param start_key]."
+msgstr "Удаляет разделитель комментариев с помощью [param start_key]."
+
+msgid "Removes the string delimiter with [param start_key]."
+msgstr "Удаляет разделитель строки с помощью [param start_key]."
+
+msgid ""
+"Emits [signal code_completion_requested], if [param force] is [code]true[/"
+"code] will bypass all checks. Otherwise will check that the caret is in a "
+"word or in front of a prefix. Will ignore the request if all current options "
+"are of type file path, node path, or signal."
+msgstr ""
+"Выдает [signal code_completion_requested], если [param force] равен "
+"[code]true[/code], то все проверки будут пропущены. В противном случае будет "
+"проверяться, находится ли каретка в слове или перед префиксом. Будет "
+"игнорировать запрос, если все текущие параметры имеют тип file path, node "
+"path или signal."
+
+msgid "Sets the code hint text. Pass an empty string to clear."
+msgstr "Задает текст подсказки кода. Передайте пустую строку для очистки."
+
+msgid ""
+"If [code]true[/code], the code hint will draw below the main caret. If "
+"[code]false[/code], the code hint will draw above the main caret. See [method "
+"set_code_hint]."
+msgstr ""
+"Если [code]true[/code], подсказка кода будет нарисована под основным "
+"курсором. Если [code]false[/code], подсказка кода будет нарисована над "
+"основным курсором. См. [method set_code_hint]."
+
+msgid "Sets the code region start and end tags (without comment delimiter)."
+msgstr ""
+"Устанавливает начальный и конечный теги области кода (без разделителя "
+"комментариев)."
+
+msgid ""
+"Sets the given line as bookmarked. If [code]true[/code] and [member "
+"gutters_draw_bookmarks] is [code]true[/code], draws the [theme_item bookmark] "
+"icon in the gutter for this line. See [method get_bookmarked_lines] and "
+"[method is_line_bookmarked]."
+msgstr ""
+"Устанавливает заданную строку как закладку. Если [code]true[/code] и [member "
+"gutters_draw_bookmarks] равно [code]true[/code], рисует значок [theme_item "
+"bookmark] в желобе для этой строки. См. [method get_bookmarked_lines] и "
+"[method is_line_bookmarked]."
+
+msgid ""
+"Sets the given line as a breakpoint. If [code]true[/code] and [member "
+"gutters_draw_breakpoints_gutter] is [code]true[/code], draws the [theme_item "
+"breakpoint] icon in the gutter for this line. See [method "
+"get_breakpointed_lines] and [method is_line_breakpointed]."
+msgstr ""
+"Устанавливает заданную строку как точку останова. Если [code]true[/code] и "
+"[member gutters_draw_breakpoints_gutter] равно [code]true[/code], рисует "
+"значок [theme_item breakpoint] в желобе для этой строки. См. [method "
+"get_breakpointed_lines] и [method is_line_breakpointed]."
+
+msgid ""
+"Sets the given line as executing. If [code]true[/code] and [member "
+"gutters_draw_executing_lines] is [code]true[/code], draws the [theme_item "
+"executing_line] icon in the gutter for this line. See [method "
+"get_executing_lines] and [method is_line_executing]."
+msgstr ""
+"Устанавливает заданную строку как исполняемую. Если [code]true[/code] и "
+"[member gutters_draw_executing_lines] равно [code]true[/code], рисует значок "
+"[theme_item executing_line] в желобе для этой строки. См. [method "
+"get_executing_lines] и [method is_line_executing]."
+
+msgid "Sets the symbol emitted by [signal symbol_validate] as a valid lookup."
+msgstr ""
+"Устанавливает символ, выданный [signal symbol_validate], как допустимый поиск."
+
+msgid "Toggle the folding of the code block at the given line."
+msgstr "Переключить сворачивание блока кода на указанной строке."
+
+msgid "Toggle the folding of the code block on all lines with a caret on them."
+msgstr ""
+"Включает/выключает сворачивание блока кода на всех строках, на которых "
+"установлена каретка."
+
+msgid ""
+"Unfolds the given line if it is folded or if it is hidden under a folded line."
+msgstr ""
+"Разворачивает заданную линию, если она сложена или скрыта под сложенной "
+"линией."
+
+msgid ""
+"Unindents all lines that are selected or have a caret on them. Uses spaces or "
+"a tab depending on [member indent_use_spaces]. Equivalent to the [member "
+"ProjectSettings.input/ui_text_dedent] action. See [method indent_lines]."
+msgstr ""
+"Удаляет отступы всех выбранных или отмеченных курсором строк. Использует "
+"пробелы или табуляцию в зависимости от [member indent_use_spaces]. "
+"Эквивалентно действию [member ProjectSettings.input/ui_text_dedent]. См. "
+"[method indent_lines]."
+
+msgid ""
+"Submits all completion options added with [method "
+"add_code_completion_option]. Will try to force the autocomplete menu to "
+"popup, if [param force] is [code]true[/code].\n"
+"[b]Note:[/b] This will replace all current candidates."
+msgstr ""
+"Отправляет все варианты завершения, добавленные с помощью [method "
+"add_code_completion_option]. Попытается принудительно открыть меню "
+"автозаполнения, если [param force] равен [code]true[/code].\n"
+"[b]Примечание:[/b] Это заменит всех текущих кандидатов."
+
+msgid ""
+"If [code]true[/code], uses [member auto_brace_completion_pairs] to "
+"automatically insert the closing brace when the opening brace is inserted by "
+"typing or autocompletion. Also automatically removes the closing brace when "
+"using backspace on the opening brace."
+msgstr ""
+"Если [code]true[/code], использует [member auto_brace_completion_pairs] для "
+"автоматической вставки закрывающей скобки, когда открывающая скобка "
+"вставляется при вводе или автодополнении. Также автоматически удаляет "
+"закрывающую скобку при использовании backspace на открывающей скобке."
+
+msgid ""
+"If [code]true[/code], highlights brace pairs when the caret is on either one, "
+"using [member auto_brace_completion_pairs]. If matching, the pairs will be "
+"underlined. If a brace is unmatched, it is colored with [theme_item "
+"brace_mismatch_color]."
+msgstr ""
+"Если [code]true[/code], выделяет пары фигурных скобок, когда курсор находится "
+"на одной из них, используя [member auto_brace_completion_pairs]. Если пары "
+"совпадают, они будут подчеркнуты. Если фигурная скобка не совпадает, она "
+"окрашивается в [theme_item brace_mismatch_color]."
+
+msgid ""
+"Sets the brace pairs to be autocompleted. For each entry in the dictionary, "
+"the key is the opening brace and the value is the closing brace that matches "
+"it. A brace is a [String] made of symbols. See [member "
+"auto_brace_completion_enabled] and [member "
+"auto_brace_completion_highlight_matching]."
+msgstr ""
+"Устанавливает пары фигурных скобок для автозаполнения. Для каждой записи в "
+"словаре ключом является открывающая фигурная скобка, а значением — "
+"закрывающая фигурная скобка, которая ей соответствует. Фигурная скобка — это "
+"[Строка], состоящая из символов. См. [member auto_brace_completion_enabled] и "
+"[member auto_brace_completion_highlight_matching]."
+
+msgid ""
+"If [code]true[/code], the [member ProjectSettings.input/"
+"ui_text_completion_query] action requests code completion. To handle it, see "
+"[method _request_code_completion] or [signal code_completion_requested]."
+msgstr ""
+"Если [code]true[/code], действие [member ProjectSettings.input/"
+"ui_text_completion_query] запрашивает автодополнение кода. Чтобы справиться с "
+"этим, см. [method _request_code_completion] или [signal "
+"code_completion_requested]."
+
+msgid "Sets prefixes that will trigger code completion."
+msgstr "Устанавливает префиксы, которые будут запускать автодополнение кода."
+
+msgid ""
+"Sets the comment delimiters. All existing comment delimiters will be removed."
+msgstr ""
+"Устанавливает разделители комментариев. Все существующие разделители "
+"комментариев будут удалены."
+
+msgid ""
+"Sets the string delimiters. All existing string delimiters will be removed."
+msgstr ""
+"Устанавливает разделители строк. Все существующие разделители строк будут "
+"удалены."
+
+msgid ""
+"If [code]true[/code], bookmarks are drawn in the gutter. This gutter is "
+"shared with breakpoints and executing lines. See [method "
+"set_line_as_bookmarked]."
+msgstr ""
+"Если [code]true[/code], закладки рисуются в желобе. Этот желоб используется "
+"совместно с точками останова и исполняемыми строками. См. [method "
+"set_line_as_bookmarked]."
+
+msgid ""
+"If [code]true[/code], breakpoints are drawn in the gutter. This gutter is "
+"shared with bookmarks and executing lines. Clicking the gutter will toggle "
+"the breakpoint for the line, see [method set_line_as_breakpoint]."
+msgstr ""
+"Если [code]true[/code], точки останова рисуются в желобе. Этот желоб "
+"используется совместно с закладками и выполняемыми строками. Щелчок по желобу "
+"переключит точку останова для строки, см. [method set_line_as_breakpoint]."
+
+msgid ""
+"If [code]true[/code], executing lines are marked in the gutter. This gutter "
+"is shared with breakpoints and bookmarks. See [method set_line_as_executing]."
+msgstr ""
+"Если [code]true[/code], то исполняемые строки отмечаются в желобе. Этот желоб "
+"используется совместно с точками останова и закладками. См. [method "
+"set_line_as_executing]."
+
+msgid ""
+"If [code]true[/code], the fold gutter is drawn. In this gutter, the "
+"[theme_item can_fold_code_region] icon is drawn for each foldable line (see "
+"[method can_fold_line]) and the [theme_item folded_code_region] icon is drawn "
+"for each folded line (see [method is_line_folded]). These icons can be "
+"clicked to toggle the fold state, see [method toggle_foldable_line]. [member "
+"line_folding] must be [code]true[/code] to show icons."
+msgstr ""
+"Если [code]true[/code], рисуется желоб сгиба. В этом желобе значок "
+"[theme_item can_fold_code_region] рисуется для каждой сгибаемой линии (см. "
+"[method can_fold_line]), а значок [theme_item folded_code_region] рисуется "
+"для каждой сгибаемой линии (см. [method is_line_folded]). Эти значки можно "
+"щелкнуть, чтобы переключить состояние сгиба, см. [method "
+"toggle_foldable_line]. [member line_folding] должен быть [code]true[/code] "
+"для отображения значков."
+
+msgid ""
+"If [code]true[/code], the line number gutter is drawn. Line numbers start at "
+"[code]1[/code] and are incremented for each line of text. Clicking and "
+"dragging in the line number gutter will select entire lines of text."
+msgstr ""
+"Если [code]true[/code], рисуется разделитель номеров строк. Номера строк "
+"начинаются с [code]1[/code] и увеличиваются для каждой строки текста. Щелчок "
+"и перетаскивание разделителя номеров строк выделит целые строки текста."
+
+msgid ""
+"If [code]true[/code], line numbers drawn in the gutter are zero padded based "
+"on the total line count. Requires [member gutters_draw_line_numbers] to be "
+"set to [code]true[/code]."
+msgstr ""
+"Если [code]true[/code], номера строк, нарисованные в желобе, дополняются "
+"нулями на основе общего количества строк. Требует, чтобы [member "
+"gutters_draw_line_numbers] был установлен на [code]true[/code]."
+
+msgid ""
+"If [code]true[/code], an extra indent is automatically inserted when a new "
+"line is added and a prefix in [member indent_automatic_prefixes] is found. If "
+"a brace pair opening key is found, the matching closing brace will be moved "
+"to another new line (see [member auto_brace_completion_pairs])."
+msgstr ""
+"Если [code]true[/code], дополнительный отступ автоматически вставляется при "
+"добавлении новой строки и нахождении префикса в [member "
+"indent_automatic_prefixes]. Если найден открывающий ключ пары фигурных "
+"скобок, соответствующая закрывающая фигурная скобка будет перемещена на "
+"другую новую строку (см. [member auto_brace_completion_pairs])."
+
+msgid ""
+"Prefixes to trigger an automatic indent. Used when [member indent_automatic] "
+"is set to [code]true[/code]."
+msgstr ""
+"Префиксы для автоматического отступа. Используется, когда [member "
+"indent_automatic] установлен в [code]true[/code]."
+
+msgid ""
+"Size of the tabulation indent (one [kbd]Tab[/kbd] press) in characters. If "
+"[member indent_use_spaces] is enabled the number of spaces to use."
+msgstr ""
+"Размер отступа табуляции (одно нажатие [kbd]Tab[/kbd]) в символах. Если "
+"включено [member indent_use_spaces], то количество используемых пробелов."
+
+msgid "Use spaces instead of tabs for indentation."
+msgstr "Для отступов используйте пробелы вместо табуляции."
+
+msgid ""
+"If [code]true[/code], lines can be folded. Otherwise, line folding methods "
+"like [method fold_line] will not work and [method can_fold_line] will always "
+"return [code]false[/code]. See [member gutters_draw_fold_gutter]."
+msgstr ""
+"Если [code]true[/code], линии могут быть свернуты. В противном случае методы "
+"сворачивания линий, такие как [method fold_line], не будут работать, а "
+"[method can_fold_line] всегда будет возвращать [code]false[/code]. См. "
+"[member gutters_draw_fold_gutter]."
+
+msgid ""
+"Draws vertical lines at the provided columns. The first entry is considered a "
+"main hard guideline and is draw more prominently."
+msgstr ""
+"Рисует вертикальные линии в предоставленных столбцах. Первая запись считается "
+"основной жесткой направляющей и рисуется более заметно."
+
+msgid ""
+"Set when a validated word from [signal symbol_validate] is clicked, the "
+"[signal symbol_lookup] should be emitted."
+msgstr ""
+"Устанавливается при щелчке по проверенному слову из [signal symbol_validate], "
+"должен быть выдан [signal symbol_lookup]."
+
+msgid ""
+"Set when a word is hovered, the [signal symbol_hovered] should be emitted."
+msgstr ""
+"Устанавливается при наведении курсора на слово, должен подаваться [сигнал "
+"symbol_hovered]."
+
+msgid ""
+"Emitted when a breakpoint is added or removed from a line. If the line is "
+"moved via backspace a removed is emitted at the old line."
+msgstr ""
+"Вызывается при добавлении или удалении точки останова из строки. Если строка "
+"перемещается с помощью backspace, на старой строке выдается removed."
+
+msgid ""
+"Emitted when the user requests code completion. This signal will not be sent "
+"if [method _request_code_completion] is overridden or [member "
+"code_completion_enabled] is [code]false[/code]."
+msgstr ""
+"Выдается, когда пользователь запрашивает автодополнение кода. Этот сигнал не "
+"будет отправлен, если [method _request_code_completion] переопределен или "
+"[member code_completion_enabled] равен [code]false[/code]."
+
+msgid ""
+"Emitted when the user hovers over a symbol. Unlike [signal Control."
+"mouse_entered], this signal is not emitted immediately, but when the cursor "
+"is over the symbol for [member ProjectSettings.gui/timers/tooltip_delay_sec] "
+"seconds.\n"
+"[b]Note:[/b] [member symbol_tooltip_on_hover] must be [code]true[/code] for "
+"this signal to be emitted."
+msgstr ""
+"Выдается, когда пользователь наводит курсор на символ. В отличие от [signal "
+"Control.mouse_entered], этот сигнал выдается не сразу, а когда курсор "
+"находится над символом в течение [member ProjectSettings.gui/timers/"
+"tooltip_delay_sec] секунд.\n"
+"[b]Примечание:[/b] [member symbol_tooltip_on_hover] должен быть [code]true[/"
+"code] для выдачи этого сигнала."
+
+msgid "Emitted when the user has clicked on a valid symbol."
+msgstr "Генерируется, когда пользователь нажимает на допустимый символ."
+
+msgid ""
+"Emitted when the user hovers over a symbol. The symbol should be validated "
+"and responded to, by calling [method set_symbol_lookup_word_as_valid].\n"
+"[b]Note:[/b] [member symbol_lookup_on_click] must be [code]true[/code] for "
+"this signal to be emitted."
+msgstr ""
+"Вызывается, когда пользователь наводит курсор на символ. Символ должен быть "
+"проверен и на него должен быть дан ответ, вызвав [method "
+"set_symbol_lookup_word_as_valid].\n"
+"[b]Примечание:[/b] [member symbol_lookup_on_click] должен быть [code]true[/"
+"code] для выдачи этого сигнала."
+
+msgid "Marks the option as a class."
+msgstr "Отмечает опцию как класс."
+
+msgid "Marks the option as a function."
+msgstr "Отмечает опцию как функцию."
+
+msgid "Marks the option as a Godot signal."
+msgstr "Отмечает опцию как сигнал Годо."
+
+msgid "Marks the option as a variable."
+msgstr "Отмечает опцию как переменную."
+
+msgid "Marks the option as a member."
+msgstr "Отмечает вариант как член."
+
+msgid "Marks the option as a constant."
+msgstr "Отмечает опцию как константу."
+
+msgid "Marks the option as a Godot node path."
+msgstr "Отмечает опцию как путь к узлу Godot."
+
+msgid "Marks the option as a file path."
+msgstr "Отмечает опцию как путь к файлу."
+
+msgid "Marks the option as unclassified or plain text."
+msgstr "Отмечает параметр как неклассифицированный или как обычный текст."
+
+msgid ""
+"The option is local to the location of the code completion query - e.g. a "
+"local variable. Subsequent value of location represent options from the outer "
+"class, the exact value represent how far they are (in terms of inner classes)."
+msgstr ""
+"Параметр является локальным по отношению к местоположению запроса на "
+"автодополнение кода - например, локальной переменной. Последующее значение "
+"местоположения представляет параметры из внешнего класса, точное значение "
+"представляет, насколько они далеки (с точки зрения внутренних классов)."
+
+msgid ""
+"The option is from the containing class or a parent class, relative to the "
+"location of the code completion query. Perform a bitwise OR with the class "
+"depth (e.g. [code]0[/code] for the local class, [code]1[/code] for the "
+"parent, [code]2[/code] for the grandparent, etc.) to store the depth of an "
+"option in the class or a parent class."
+msgstr ""
+"Опция из содержащего класса или родительского класса относительно "
+"расположения запроса на автодополнение кода. Выполните побитовое ИЛИ с "
+"глубиной класса (например, [code]0[/code] для локального класса, [code]1[/"
+"code] для родительского, [code]2[/code] для прародительского и т. д.), чтобы "
+"сохранить глубину опции в классе или родительском классе."
+
+msgid ""
+"The option is from user code which is not local and not in a derived class (e."
+"g. Autoload Singletons)."
+msgstr ""
+"Опция взята из пользовательского кода, который не является локальным и не "
+"находится в производном классе (например, Autoload Singletons)."
+
+msgid ""
+"The option is from other engine code, not covered by the other enum constants "
+"- e.g. built-in classes."
+msgstr ""
+"Опция взята из другого кода движка, не охваченного другими константами "
+"перечисления, например, встроенными классами."
+
+msgid "[Color] of the bookmark icon for bookmarked lines."
+msgstr "[Color] значка закладки для строк, отмеченных закладками."
+
+msgid "[Color] of the text to highlight mismatched braces."
+msgstr "[Color] текста для выделения несовпадающих скобок."
+
+msgid "[Color] of the breakpoint icon for bookmarked lines."
+msgstr "[Color] значка точки останова для строк, отмеченных закладками."
+
+msgid "[Color] for all icons related to line folding."
+msgstr "[Color] для всех значков, связанных с переносом строк."
+
+msgid "Sets the background [Color] for the code completion popup."
+msgstr "Устанавливает фон [Color] для всплывающего окна автодополнения кода."
+
+msgid ""
+"Background highlight [Color] for matching text in code completion options."
+msgstr ""
+"Подсветка фона [Цвет] для сопоставления текста в параметрах автодополнения "
+"кода."
+
+msgid "[Color] of the scrollbar in the code completion popup."
+msgstr "[Цвет] полосы прокрутки во всплывающем окне автодополнения кода."
+
+msgid "[Color] of the scrollbar in the code completion popup when hovered."
+msgstr ""
+"[Цвет] полосы прокрутки во всплывающем окне автодополнения кода при наведении "
+"курсора."
+
+msgid ""
+"Background highlight [Color] for the current selected option item in the code "
+"completion popup."
+msgstr ""
+"Подсветка фона [Цвет] для текущего выбранного элемента опции во всплывающем "
+"окне автодополнения кода."
+
+msgid "[Color] of the executing icon for executing lines."
+msgstr "[Цвет] значка выполнения для выполнения линий."
+
+msgid "[Color] of background line highlight for folded code region."
+msgstr "[Цвет] подсветки фоновой линии для области свернутого кода."
+
+msgid ""
+"[Color] of the main line length guideline, secondary guidelines will have 50% "
+"alpha applied."
+msgstr ""
+"[Цвет] основной направляющей длины линии, для второстепенных направляющих "
+"будет применено значение альфа 50%."
+
+msgid "Sets the [Color] of line numbers."
+msgstr "Устанавливает [Цвет] номеров строк."
+
+msgid ""
+"Max number of options to display in the code completion popup at any one time."
+msgstr ""
+"Максимальное количество вариантов, отображаемых во всплывающем окне "
+"автодополнения кода одновременно."
+
+msgid ""
+"Max width of options in the code completion popup. Options longer than this "
+"will be cut off."
+msgstr ""
+"Максимальная ширина опций во всплывающем окне автодополнения кода. Опции "
+"длиннее будут обрезаны."
+
+msgid "Width of the scrollbar in the code completion popup."
+msgstr "Ширина полосы прокрутки во всплывающем окне автодополнения кода."
+
+msgid ""
+"Sets a custom [Texture2D] to draw in the bookmark gutter for bookmarked lines."
+msgstr ""
+"Устанавливает пользовательскую [Texture2D] для рисования в области закладок "
+"для строк, отмеченных закладками."
+
+msgid ""
+"Sets a custom [Texture2D] to draw in the breakpoint gutter for breakpointed "
+"lines."
+msgstr ""
+"Устанавливает пользовательскую [Texture2D] для рисования в контрольных точек "
+"области для контрольных точек линий."
+
+msgid ""
+"Sets a custom [Texture2D] to draw in the line folding gutter when a line can "
+"be folded."
+msgstr ""
+"Устанавливает пользовательскую [Texture2D] для рисования в области сгиба "
+"линии, когда линию можно согнуть."
+
+msgid ""
+"Sets a custom [Texture2D] to draw in the line folding gutter when a code "
+"region can be folded."
+msgstr ""
+"Устанавливает пользовательскую [Texture2D] для отрисовки в области сгиба "
+"строк, когда область кода может быть свернута."
+
+msgid ""
+"Background panel for the color preview box in autocompletion (visible when "
+"the color is translucent)."
+msgstr ""
+"Фоновая панель для окна предварительного просмотра цвета в автодополнении "
+"(видима, когда цвет полупрозрачен)."
+
+msgid "Icon to draw in the executing gutter for executing lines."
+msgstr "Значок для рисования в области выполнения линий выполнения."
+
+msgid ""
+"Sets a custom [Texture2D] to draw in the line folding gutter when a line is "
+"folded and can be unfolded."
+msgstr ""
+"Устанавливает пользовательскую [Texture2D] для отрисовки в области сгиба "
+"линии, когда линия сложена и может быть развернута."
+
+msgid ""
+"Sets a custom [Texture2D] to draw in the line folding gutter when a code "
+"region is folded and can be unfolded."
+msgstr ""
+"Устанавливает пользовательскую [Texture2D] для отрисовки в области сгиба "
+"строк, когда область кода свернута и может быть развернута."
+
+msgid "Sets a custom [Texture2D] to draw at the end of a folded line."
+msgstr ""
+"Устанавливает пользовательскую [Texture2D] для рисования в конце сложенной "
+"линии."
+
+msgid "[StyleBox] for the code completion popup."
+msgstr "[StyleBox] для всплывающего окна автодополнения кода."
+
+msgid "A syntax highlighter intended for code."
+msgstr "Подсветка синтаксиса, предназначенная для кода."
+
+msgid ""
+"By adjusting various properties of this resource, you can change the colors "
+"of strings, comments, numbers, and other text patterns inside a [TextEdit] "
+"control."
+msgstr ""
+"Изменяя различные свойства этого ресурса, вы можете изменять цвета строк, "
+"комментариев, чисел и других текстовых шаблонов внутри элемента управления "
+"[TextEdit]."
+
+msgid ""
+"Adds a color region (such as for comments or strings) from [param start_key] "
+"to [param end_key]. Both keys should be symbols, and [param start_key] must "
+"not be shared with other delimiters.\n"
+"If [param line_only] is [code]true[/code] or [param end_key] is an empty "
+"[String], the region does not carry over to the next line."
+msgstr ""
+"Добавляет цветовую область (например, для комментариев или строк) от [param "
+"start_key] до [param end_key]. Оба ключа должны быть символами, и [param "
+"start_key] не должен использоваться совместно с другими разделителями.\n"
+"Если [param line_only] — это [code]true[/code] или [param end_key] — это "
+"пустая [String], область не переносится на следующую строку."
+
+msgid ""
+"Sets the color for a keyword.\n"
+"The keyword cannot contain any symbols except '_'."
+msgstr ""
+"Устанавливает цвет для ключевого слова.\n"
+"Ключевое слово не может содержать никаких символов, кроме '_'."
+
+msgid ""
+"Sets the color for a member keyword.\n"
+"The member keyword cannot contain any symbols except '_'.\n"
+"It will not be highlighted if preceded by a '.'."
+msgstr ""
+"Задает цвет для ключевого слова участника.\n"
+"Ключевое слово участника не может содержать никаких символов, кроме '_'.\n"
+"Оно не будет выделено, если ему предшествует '.'."
+
+msgid "Removes all color regions."
+msgstr "Удаляет все цветные области."
+
+msgid "Removes all keywords."
+msgstr "Удалить все ключевые слова."
+
+msgid "Removes all member keywords."
+msgstr "Удаляет все ключевые слова участников."
+
+msgid "Returns the color for a keyword."
+msgstr "Возвращает цвет для ключевого слова."
+
+msgid "Returns the color for a member keyword."
+msgstr "Возвращает цвет для ключевого слова члена."
+
+msgid ""
+"Returns [code]true[/code] if the start key exists, else [code]false[/code]."
+msgstr ""
+"Возвращает [code]true[/code], если начальный ключ существует, в противном "
+"случае [code]false[/code]."
+
+msgid ""
+"Returns [code]true[/code] if the keyword exists, else [code]false[/code]."
+msgstr ""
+"Возвращает [code]true[/code], если ключевое слово существует, в противном "
+"случае [code]false[/code]."
+
+msgid ""
+"Returns [code]true[/code] if the member keyword exists, else [code]false[/"
+"code]."
+msgstr ""
+"Возвращает [code]true[/code], если ключевое слово члена существует, в "
+"противном случае — [code]false[/code]."
+
+msgid "Removes the color region that uses that start key."
+msgstr "Удаляет цветовую область, использующую эту клавишу запуска."
+
+msgid "Removes the keyword."
+msgstr "Удаляет ключевое слово."
+
+msgid "Removes the member keyword."
+msgstr "Удаляет ключевое слово участника."
+
+msgid ""
+"Sets the color regions. All existing regions will be removed. The "
+"[Dictionary] key is the region start and end key, separated by a space. The "
+"value is the region color."
+msgstr ""
+"Устанавливает цветовые регионы. Все существующие регионы будут удалены. Ключ "
+"[Dictionary] — это начальный и конечный ключ региона, разделенные пробелом. "
+"Значение — цвет региона."
+
+msgid ""
+"Sets color for functions. A function is a non-keyword string followed by a "
+"'('."
+msgstr ""
+"Устанавливает цвет для функций. Функция — это строка, не являющаяся ключевым "
+"словом, за которой следует '('."
+
+msgid ""
+"Sets the keyword colors. All existing keywords will be removed. The "
+"[Dictionary] key is the keyword. The value is the keyword color."
+msgstr ""
+"Устанавливает цвета ключевых слов. Все существующие ключевые слова будут "
+"удалены. Ключ [Dictionary] — это ключевое слово. Значение — это цвет "
+"ключевого слова."
+
+msgid ""
+"Sets the member keyword colors. All existing member keyword will be removed. "
+"The [Dictionary] key is the member keyword. The value is the member keyword "
+"color."
+msgstr ""
+"Устанавливает цвета ключевых слов-членов. Все существующие ключевые слова-"
+"члены будут удалены. Ключ [Dictionary] — это ключевое слово-член. Значение — "
+"это цвет ключевого слова-члена."
+
+msgid ""
+"Sets color for member variables. A member variable is non-keyword, non-"
+"function string proceeded with a '.'."
+msgstr ""
+"Устанавливает цвет для переменных-членов. Переменная-член — это не ключевое "
+"слово, нефункциональная строка, начинающаяся с '.'."
+
+msgid "Sets the color for symbols."
+msgstr "Устанавливает цвет символов."
+
+msgid ""
+"Abstract base class for 2D physics objects. [CollisionObject2D] can hold any "
+"number of [Shape2D]s for collision. Each shape must be assigned to a [i]shape "
+"owner[/i]. Shape owners are not nodes and do not appear in the editor, but "
+"are accessible through code using the [code]shape_owner_*[/code] methods.\n"
+"[b]Note:[/b] Only collisions between objects within the same canvas "
+"([Viewport] canvas or [CanvasLayer]) are supported. The behavior of "
+"collisions between objects in different canvases is undefined."
+msgstr ""
+"Абстрактный базовый класс для 2D-объектов физики. [CollisionObject2D] может "
+"содержать любое количество [Shape2D] для столкновения. Каждая форма должна "
+"быть назначена [i]владельцу формы[/i]. Владельцы формы не являются узлами и "
+"не отображаются в редакторе, но доступны через код с использованием методов "
+"[code]shape_owner_*[/code].\n"
+"[b]Примечание:[/b] Поддерживаются только столкновения между объектами в "
+"пределах одного холста (холст [Viewport] или [CanvasLayer]). Поведение "
+"столкновений между объектами в разных холстах не определено."
+
+msgid ""
+"Accepts unhandled [InputEvent]s. [param shape_idx] is the child index of the "
+"clicked [Shape2D]. Connect to [signal input_event] to easily pick up these "
+"events.\n"
+"[b]Note:[/b] [method _input_event] requires [member input_pickable] to be "
+"[code]true[/code] and at least one [member collision_layer] bit to be set."
+msgstr ""
+"Принимает необработанные [InputEvent]. [param shape_idx] — это дочерний "
+"индекс нажатого [Shape2D]. Подключитесь к [signal input_event], чтобы легко "
+"получать эти события.\n"
+"[b]Примечание:[/b] [method _input_event] требует, чтобы [member "
+"input_pickable] был [code]true[/code] и был установлен хотя бы один бит "
+"[member collision_layer]."
+
+msgid ""
+"Called when the mouse pointer enters any of this object's shapes. Requires "
+"[member input_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set. Note that moving between different shapes "
+"within a single [CollisionObject2D] won't cause this function to be called."
+msgstr ""
+"Вызывается, когда указатель мыши входит в любую из фигур этого объекта. "
+"Требует, чтобы [member input_pickable] был [code]true[/code] и был установлен "
+"хотя бы один бит [member collision_layer]. Обратите внимание, что перемещение "
+"между различными фигурами в пределах одного [CollisionObject2D] не приведет к "
+"вызову этой функции."
+
+msgid ""
+"Called when the mouse pointer exits all this object's shapes. Requires "
+"[member input_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set. Note that moving between different shapes "
+"within a single [CollisionObject2D] won't cause this function to be called."
+msgstr ""
+"Вызывается, когда указатель мыши покидает все формы этого объекта. Требует, "
+"чтобы [member input_pickable] был [code]true[/code] и был установлен хотя бы "
+"один бит [member collision_layer]. Обратите внимание, что перемещение между "
+"различными формами в пределах одного [CollisionObject2D] не приведет к вызову "
+"этой функции."
+
+msgid ""
+"Called when the mouse pointer enters any of this object's shapes or moves "
+"from one shape to another. [param shape_idx] is the child index of the newly "
+"entered [Shape2D]. Requires [member input_pickable] to be [code]true[/code] "
+"and at least one [member collision_layer] bit to be called."
+msgstr ""
+"Вызывается, когда указатель мыши входит в любую из фигур этого объекта или "
+"перемещается из одной фигуры в другую. [param shape_idx] — это дочерний "
+"индекс вновь введенного [Shape2D]. Требует, чтобы [member input_pickable] был "
+"[code]true[/code] и был вызван хотя бы один бит [member collision_layer]."
+
+msgid ""
+"Called when the mouse pointer exits any of this object's shapes. [param "
+"shape_idx] is the child index of the exited [Shape2D]. Requires [member "
+"input_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be called."
+msgstr ""
+"Вызывается, когда указатель мыши покидает любую из фигур этого объекта. "
+"[param shape_idx] — это дочерний индекс выведенного [Shape2D]. Требует, чтобы "
+"[member input_pickable] был [code]true[/code] и был вызван хотя бы один бит "
+"[member collision_layer]."
+
+msgid ""
+"Creates a new shape owner for the given object. Returns [code]owner_id[/code] "
+"of the new owner for future reference."
+msgstr ""
+"Создает нового владельца формы для данного объекта. Возвращает "
+"[code]owner_id[/code] нового владельца для дальнейшего использования."
+
+msgid ""
+"Returns whether or not the specified layer of the [member collision_layer] is "
+"enabled, given a [param layer_number] between 1 and 32."
+msgstr ""
+"Возвращает, включен ли указанный слой [member collision_layer], учитывая "
+"[param layer_number] от 1 до 32."
+
+msgid ""
+"Returns whether or not the specified layer of the [member collision_mask] is "
+"enabled, given a [param layer_number] between 1 and 32."
+msgstr ""
+"Возвращает, включен ли указанный слой [member collision_mask], учитывая "
+"[param layer_number] от 1 до 32."
+
+msgid "Returns the object's [RID]."
+msgstr "Возвращает [RID] объекта."
+
+msgid ""
+"Returns the [code]one_way_collision_margin[/code] of the shape owner "
+"identified by given [param owner_id]."
+msgstr ""
+"Возвращает [code]one_way_collision_margin[/code] владельца фигуры, "
+"идентифицированного заданным [param owner_id]."
+
+msgid ""
+"Returns an [Array] of [code]owner_id[/code] identifiers. You can use these "
+"ids in other methods that take [code]owner_id[/code] as an argument."
+msgstr ""
+"Возвращает [Array] идентификаторов [code]owner_id[/code]. Вы можете "
+"использовать эти идентификаторы в других методах, которые принимают "
+"[code]owner_id[/code] в качестве аргумента."
+
+msgid "If [code]true[/code], the shape owner and its shapes are disabled."
+msgstr "Если [code]true[/code], владелец фигуры и его фигуры отключены."
+
+msgid ""
+"Returns [code]true[/code] if collisions for the shape owner originating from "
+"this [CollisionObject2D] will not be reported to collided with "
+"[CollisionObject2D]s."
+msgstr ""
+"Возвращает [code]true[/code], если столкновения для владельца фигуры, "
+"происходящие из этого [CollisionObject2D], не будут сообщаться о "
+"столкновениях с [CollisionObject2D]."
+
+msgid "Removes the given shape owner."
+msgstr "Удаляет указанного владельца фигуры."
+
+msgid ""
+"Based on [param value], enables or disables the specified layer in the "
+"[member collision_layer], given a [param layer_number] between 1 and 32."
+msgstr ""
+"На основе [param value] включает или отключает указанный слой в [member "
+"collision_layer], учитывая [param layer_number] от 1 до 32."
+
+msgid ""
+"Based on [param value], enables or disables the specified layer in the "
+"[member collision_mask], given a [param layer_number] between 1 and 32."
+msgstr ""
+"На основе [param value] включает или отключает указанный слой в [member "
+"collision_mask] при заданном [param layer_number] от 1 до 32."
+
+msgid "Returns the [code]owner_id[/code] of the given shape."
+msgstr "Возвращает [code]owner_id[/code] заданной фигуры."
+
+msgid "Adds a [Shape2D] to the shape owner."
+msgstr "Добавляет [Shape2D] к владельцу фигуры."
+
+msgid "Removes all shapes from the shape owner."
+msgstr "Удаляет все фигуры у владельца фигуры."
+
+msgid "Returns the parent object of the given shape owner."
+msgstr "Возвращает родительский объект указанного владельца фигуры."
+
+msgid "Returns the [Shape2D] with the given ID from the given shape owner."
+msgstr ""
+"Возвращает [Shape2D] с указанным идентификатором от указанного владельца "
+"фигуры."
+
+msgid "Returns the number of shapes the given shape owner contains."
+msgstr "Возвращает количество фигур, содержащихся в заданном владельце фигуры."
+
+msgid ""
+"Returns the child index of the [Shape2D] with the given ID from the given "
+"shape owner."
+msgstr ""
+"Возвращает дочерний индекс [Shape2D] с указанным идентификатором от "
+"указанного владельца фигуры."
+
+msgid "Returns the shape owner's [Transform2D]."
+msgstr "Возвращает [Transform2D] владельца фигуры."
+
+msgid "Removes a shape from the given shape owner."
+msgstr "Удаляет фигуру у указанного владельца фигуры."
+
+msgid "If [code]true[/code], disables the given shape owner."
+msgstr "Если [code]true[/code], отключает владельца данной фигуры."
+
+msgid ""
+"If [param enable] is [code]true[/code], collisions for the shape owner "
+"originating from this [CollisionObject2D] will not be reported to collided "
+"with [CollisionObject2D]s."
+msgstr ""
+"Если [param enable] имеет значение [code]true[/code], столкновения для "
+"владельца фигуры, происходящие от этого [CollisionObject2D], не будут "
+"сообщаться о столкновениях с [CollisionObject2D]."
+
+msgid ""
+"Sets the [code]one_way_collision_margin[/code] of the shape owner identified "
+"by given [param owner_id] to [param margin] pixels."
+msgstr ""
+"Устанавливает [code]one_way_collision_margin[/code] владельца фигуры, "
+"идентифицированного заданным [param owner_id], на [param margin] пикселей."
+
+msgid "Sets the [Transform2D] of the given shape owner."
+msgstr "Устанавливает [Transform2D] для данного владельца фигуры."
+
+msgid ""
+"The physics layers this CollisionObject2D is in. Collision objects can exist "
+"in one or more of 32 different layers. See also [member collision_mask].\n"
+"[b]Note:[/b] Object A can detect a contact with object B only if object B is "
+"in any of the layers that object A scans. See [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Collision layers "
+"and masks[/url] in the documentation for more information."
+msgstr ""
+"Физические слои, в которых находится CollisionObject2D. Объекты столкновений "
+"могут существовать в одном или нескольких из 32 различных слоев. См. также "
+"[member collision_mask].\n"
+"[b]Примечание:[/b] Объект A может обнаружить контакт с объектом B, только "
+"если объект B находится в любом из слоев, которые сканирует объект A. См. "
+"[url=$DOCS_URL/tutorials/physics/physics_introduction.html#collision-layers-"
+"and-masks]Слои и маски столкновений[/url] в документации для получения "
+"дополнительной информации."
+
+msgid ""
+"The physics layers this CollisionObject2D scans. Collision objects can scan "
+"one or more of 32 different layers. See also [member collision_layer].\n"
+"[b]Note:[/b] Object A can detect a contact with object B only if object B is "
+"in any of the layers that object A scans. See [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Collision layers "
+"and masks[/url] in the documentation for more information."
+msgstr ""
+"Физические слои, которые сканирует CollisionObject2D. Объекты столкновений "
+"могут сканировать один или несколько из 32 различных слоев. См. также [member "
+"collision_layer].\n"
+"[b]Примечание:[/b] Объект A может обнаружить контакт с объектом B, только "
+"если объект B находится в любом из слоев, которые сканирует объект A. См. "
+"[url=$DOCS_URL/tutorials/physics/physics_introduction.html#collision-layers-"
+"and-masks]Слои и маски столкновений[/url] в документации для получения "
+"дополнительной информации."
+
+msgid ""
+"The priority used to solve colliding when occurring penetration. The higher "
+"the priority is, the lower the penetration into the object will be. This can "
+"for example be used to prevent the player from breaking through the "
+"boundaries of a level."
+msgstr ""
+"Приоритет, используемый для решения столкновений при возникновении "
+"проникновения. Чем выше приоритет, тем ниже будет проникновение в объект. Это "
+"может быть использовано, например, для предотвращения прорыва игрока через "
+"границы уровня."
+
+msgid ""
+"Defines the behavior in physics when [member Node.process_mode] is set to "
+"[constant Node.PROCESS_MODE_DISABLED]. See [enum DisableMode] for more "
+"details about the different modes."
+msgstr ""
+"Определяет поведение в физике, когда [member Node.process_mode] установлен в "
+"[constant Node.PROCESS_MODE_DISABLED]. См. [enum DisableMode] для получения "
+"более подробной информации о различных режимах."
+
+msgid ""
+"If [code]true[/code], this object is pickable. A pickable object can detect "
+"the mouse pointer entering/leaving, and if the mouse is inside it, report "
+"input events. Requires at least one [member collision_layer] bit to be set."
+msgstr ""
+"Если [code]true[/code], этот объект можно выбрать. Можно выбрать, обнаружив "
+"вход/выход указателя мыши, и если мышь находится внутри него, сообщать о "
+"событиях ввода. Требуется установить хотя бы один бит [member "
+"collision_layer]."
+
+msgid ""
+"Emitted when an input event occurs. Requires [member input_pickable] to be "
+"[code]true[/code] and at least one [member collision_layer] bit to be set. "
+"See [method _input_event] for details."
+msgstr ""
+"Вызывается при возникновении события ввода. Требует, чтобы [member "
+"input_pickable] был [code]true[/code] и был установлен хотя бы один бит "
+"[member collision_layer]. Подробности см. в [method _input_event]."
+
+msgid ""
+"Emitted when the mouse pointer enters any of this object's shapes. Requires "
+"[member input_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set. Note that moving between different shapes "
+"within a single [CollisionObject2D] won't cause this signal to be emitted.\n"
+"[b]Note:[/b] Due to the lack of continuous collision detection, this signal "
+"may not be emitted in the expected order if the mouse moves fast enough and "
+"the [CollisionObject2D]'s area is small. This signal may also not be emitted "
+"if another [CollisionObject2D] is overlapping the [CollisionObject2D] in "
+"question."
+msgstr ""
+"Выдается, когда указатель мыши входит в любую из фигур этого объекта. "
+"Требует, чтобы [member input_pickable] был [code]true[/code] и был установлен "
+"хотя бы один бит [member collision_layer]. Обратите внимание, что перемещение "
+"между различными фигурами в пределах одного [CollisionObject2D] не приведет к "
+"выдаче этого сигнала.\n"
+"[b]Примечание:[/b] Из-за отсутствия непрерывного обнаружения столкновений "
+"этот сигнал может не выдаваться в ожидаемом порядке, если мышь движется "
+"достаточно быстро, а область [CollisionObject2D] мала. Этот сигнал также "
+"может не выдаваться, если другой [CollisionObject2D] перекрывает "
+"рассматриваемый [CollisionObject2D]."
+
+msgid ""
+"Emitted when the mouse pointer exits all this object's shapes. Requires "
+"[member input_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set. Note that moving between different shapes "
+"within a single [CollisionObject2D] won't cause this signal to be emitted.\n"
+"[b]Note:[/b] Due to the lack of continuous collision detection, this signal "
+"may not be emitted in the expected order if the mouse moves fast enough and "
+"the [CollisionObject2D]'s area is small. This signal may also not be emitted "
+"if another [CollisionObject2D] is overlapping the [CollisionObject2D] in "
+"question."
+msgstr ""
+"Выдается, когда указатель мыши покидает все формы этого объекта. Требует, "
+"чтобы [member input_pickable] был [code]true[/code] и был установлен хотя бы "
+"один бит [member collision_layer]. Обратите внимание, что перемещение между "
+"различными формами в пределах одного [CollisionObject2D] не приведет к выдаче "
+"этого сигнала.\n"
+"[b]Примечание:[/b] Из-за отсутствия непрерывного обнаружения столкновений "
+"этот сигнал может не выдаваться в ожидаемом порядке, если мышь движется "
+"достаточно быстро, а область [CollisionObject2D] мала. Этот сигнал также "
+"может не выдаваться, если другой [CollisionObject2D] перекрывает "
+"рассматриваемый [CollisionObject2D]."
+
+msgid ""
+"Emitted when the mouse pointer enters any of this object's shapes or moves "
+"from one shape to another. [param shape_idx] is the child index of the newly "
+"entered [Shape2D]. Requires [member input_pickable] to be [code]true[/code] "
+"and at least one [member collision_layer] bit to be set."
+msgstr ""
+"Вызывается, когда указатель мыши входит в любую из фигур этого объекта или "
+"перемещается из одной фигуры в другую. [param shape_idx] — это дочерний "
+"индекс вновь введенного [Shape2D]. Требует, чтобы [member input_pickable] был "
+"[code]true[/code] и был установлен хотя бы один бит [member collision_layer]."
+
+msgid ""
+"Emitted when the mouse pointer exits any of this object's shapes. [param "
+"shape_idx] is the child index of the exited [Shape2D]. Requires [member "
+"input_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set."
+msgstr ""
+"Вызывается, когда указатель мыши покидает любую из фигур этого объекта. "
+"[param shape_idx] — это дочерний индекс выведенного [Shape2D]. Требует, чтобы "
+"[member input_pickable] был [code]true[/code] и был установлен хотя бы один "
+"бит [member collision_layer]."
+
+msgid ""
+"When [member Node.process_mode] is set to [constant Node."
+"PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
+"physics interactions with this [CollisionObject2D].\n"
+"Automatically re-added to the physics simulation when the [Node] is processed "
+"again."
+msgstr ""
+"Когда [member Node.process_mode] установлен на [constant Node."
+"PROCESS_MODE_DISABLED], удалить из симуляции физики, чтобы остановить все "
+"физические взаимодействия с этим [CollisionObject2D].\n"
+"Автоматически повторно добавляется в симуляцию физики, когда [Node] "
+"обрабатывается снова."
+
+msgid ""
+"When [member Node.process_mode] is set to [constant Node."
+"PROCESS_MODE_DISABLED], make the body static. Doesn't affect [Area2D]. "
+"[PhysicsBody2D] can't be affected by forces or other bodies while static.\n"
+"Automatically set [PhysicsBody2D] back to its original mode when the [Node] "
+"is processed again."
+msgstr ""
+"Когда [member Node.process_mode] установлен на [constant Node."
+"PROCESS_MODE_DISABLED], сделайте тело статичным. Не влияет на [Area2D]. "
+"[PhysicsBody2D] не может быть подвержен воздействию сил или других тел, пока "
+"он статичен.\n"
+"Автоматически верните [PhysicsBody2D] в исходный режим, когда [Node] "
+"обрабатывается снова."
+
+msgid ""
+"When [member Node.process_mode] is set to [constant Node."
+"PROCESS_MODE_DISABLED], do not affect the physics simulation."
+msgstr ""
+"Если [member Node.process_mode] установлен в [constant Node."
+"PROCESS_MODE_DISABLED], это не влияет на физическую симуляцию."
+
+msgid ""
+"Abstract base class for 3D physics objects. [CollisionObject3D] can hold any "
+"number of [Shape3D]s for collision. Each shape must be assigned to a [i]shape "
+"owner[/i]. Shape owners are not nodes and do not appear in the editor, but "
+"are accessible through code using the [code]shape_owner_*[/code] methods.\n"
+"[b]Warning:[/b] With a non-uniform scale, this node will likely not behave as "
+"expected. It is advised to keep its scale the same on all axes and adjust its "
+"collision shape(s) instead."
+msgstr ""
+"Абстрактный базовый класс для 3D-физических объектов. [CollisionObject3D] "
+"может содержать любое количество [Shape3D] для столкновения. Каждая форма "
+"должна быть назначена [i]владельцу формы[/i]. Владельцы формы не являются "
+"узлами и не отображаются в редакторе, но доступны через код с использованием "
+"методов [code]shape_owner_*[/code].\n"
+"[b]Предупреждение:[/b] При неравномерном масштабе этот узел, скорее всего, "
+"будет вести себя не так, как ожидалось. Рекомендуется сохранить его масштаб "
+"одинаковым по всем осям и вместо этого настроить его форму(ы) столкновения."
+
+msgid ""
+"Receives unhandled [InputEvent]s. [param event_position] is the location in "
+"world space of the mouse pointer on the surface of the shape with index "
+"[param shape_idx] and [param normal] is the normal vector of the surface at "
+"that point. Connect to the [signal input_event] signal to easily pick up "
+"these events.\n"
+"[b]Note:[/b] [method _input_event] requires [member input_ray_pickable] to be "
+"[code]true[/code] and at least one [member collision_layer] bit to be set."
+msgstr ""
+"Получает необработанные [InputEvent]. [param event_position] — это "
+"местоположение указателя мыши в мировом пространстве на поверхности фигуры с "
+"индексом [param shape_idx], а [param normal] — это вектор нормали поверхности "
+"в этой точке. Подключитесь к сигналу [signal input_event], чтобы легко "
+"получить эти события.\n"
+"[b]Примечание:[/b] [method _input_event] требует, чтобы [member "
+"input_ray_pickable] был [code]true[/code] и был установлен хотя бы один бит "
+"[member collision_layer]."
+
+msgid ""
+"Called when the mouse pointer enters any of this object's shapes. Requires "
+"[member input_ray_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set. Note that moving between different shapes "
+"within a single [CollisionObject3D] won't cause this function to be called."
+msgstr ""
+"Вызывается, когда указатель мыши входит в любую из фигур этого объекта. "
+"Требует, чтобы [member input_ray_pickable] был [code]true[/code] и был "
+"установлен хотя бы один бит [member collision_layer]. Обратите внимание, что "
+"перемещение между различными фигурами в пределах одного [CollisionObject3D] "
+"не приведет к вызову этой функции."
+
+msgid ""
+"Called when the mouse pointer exits all this object's shapes. Requires "
+"[member input_ray_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set. Note that moving between different shapes "
+"within a single [CollisionObject3D] won't cause this function to be called."
+msgstr ""
+"Вызывается, когда указатель мыши покидает все формы этого объекта. Требует, "
+"чтобы [member input_ray_pickable] был [code]true[/code] и был установлен хотя "
+"бы один бит [member collision_layer]. Обратите внимание, что перемещение "
+"между различными формами в пределах одного [CollisionObject3D] не приведет к "
+"вызову этой функции."
+
+msgid ""
+"The physics layers this CollisionObject3D [b]is in[/b]. Collision objects can "
+"exist in one or more of 32 different layers. See also [member "
+"collision_mask].\n"
+"[b]Note:[/b] Object A can detect a contact with object B only if object B is "
+"in any of the layers that object A scans. See [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Collision layers "
+"and masks[/url] in the documentation for more information."
+msgstr ""
+"Физические слои, в которых находится CollisionObject3D [b][/b]. Объекты "
+"столкновений могут существовать в одном или нескольких из 32 различных слоев. "
+"См. также [member collision_mask].\n"
+"[b]Примечание:[/b] Объект A может обнаружить контакт с объектом B, только "
+"если объект B находится в любом из слоев, которые сканирует объект A. См. "
+"[url=$DOCS_URL/tutorials/physics/physics_introduction.html#collision-layers-"
+"and-masks]Слои и маски столкновений[/url] в документации для получения "
+"дополнительной информации."
+
+msgid ""
+"The physics layers this CollisionObject3D [b]scans[/b]. Collision objects can "
+"scan one or more of 32 different layers. See also [member collision_layer].\n"
+"[b]Note:[/b] Object A can detect a contact with object B only if object B is "
+"in any of the layers that object A scans. See [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Collision layers "
+"and masks[/url] in the documentation for more information."
+msgstr ""
+"Слои физики этот CollisionObject3D [b]сканирует[/b]. Объекты столкновений "
+"могут сканировать один или несколько из 32 различных слоев. См. также [member "
+"collision_layer].\n"
+"[b]Примечание:[/b] Объект A может обнаружить контакт с объектом B, только "
+"если объект B находится в любом из слоев, которые сканирует объект A. См. "
+"[url=$DOCS_URL/tutorials/physics/physics_introduction.html#collision-layers-"
+"and-masks]Слои и маски столкновений[/url] в документации для получения "
+"дополнительной информации."
+
+msgid ""
+"Emitted when the object receives an unhandled [InputEvent]. [param "
+"event_position] is the location in world space of the mouse pointer on the "
+"surface of the shape with index [param shape_idx] and [param normal] is the "
+"normal vector of the surface at that point."
+msgstr ""
+"Генерируется, когда объект получает необработанное [InputEvent]. [param "
+"event_position] — это местоположение указателя мыши в мировом пространстве на "
+"поверхности фигуры с индексом [param shape_idx], а [param normal] — это "
+"вектор нормали поверхности в этой точке."
+
+msgid ""
+"Emitted when the mouse pointer enters any of this object's shapes. Requires "
+"[member input_ray_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set.\n"
+"[b]Note:[/b] Due to the lack of continuous collision detection, this signal "
+"may not be emitted in the expected order if the mouse moves fast enough and "
+"the [CollisionObject3D]'s area is small. This signal may also not be emitted "
+"if another [CollisionObject3D] is overlapping the [CollisionObject3D] in "
+"question."
+msgstr ""
+"Выдается, когда указатель мыши входит в любую из форм этого объекта. Требует, "
+"чтобы [member input_ray_pickable] был [code]true[/code] и был установлен хотя "
+"бы один бит [member collision_layer].\n"
+"[b]Примечание:[/b] Из-за отсутствия непрерывного обнаружения столкновений "
+"этот сигнал может не выдаваться в ожидаемом порядке, если мышь движется "
+"достаточно быстро, а область [CollisionObject3D] мала. Этот сигнал также "
+"может не выдаваться, если другой [CollisionObject3D] перекрывает "
+"рассматриваемый [CollisionObject3D]."
+
+msgid ""
+"Emitted when the mouse pointer exits all this object's shapes. Requires "
+"[member input_ray_pickable] to be [code]true[/code] and at least one [member "
+"collision_layer] bit to be set.\n"
+"[b]Note:[/b] Due to the lack of continuous collision detection, this signal "
+"may not be emitted in the expected order if the mouse moves fast enough and "
+"the [CollisionObject3D]'s area is small. This signal may also not be emitted "
+"if another [CollisionObject3D] is overlapping the [CollisionObject3D] in "
+"question."
+msgstr ""
+"Выдается, когда указатель мыши выходит за пределы всех форм этого объекта. "
+"Требует, чтобы [member input_ray_pickable] был [code]true[/code] и был "
+"установлен хотя бы один бит [member collision_layer].\n"
+"[b]Примечание:[/b] Из-за отсутствия непрерывного обнаружения столкновений "
+"этот сигнал может не выдаваться в ожидаемом порядке, если мышь движется "
+"достаточно быстро, а область [CollisionObject3D] мала. Этот сигнал также "
+"может не выдаваться, если другой [CollisionObject3D] перекрывает "
+"рассматриваемый [CollisionObject3D]."
+
+msgid ""
+"When [member Node.process_mode] is set to [constant Node."
+"PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
+"physics interactions with this [CollisionObject3D].\n"
+"Automatically re-added to the physics simulation when the [Node] is processed "
+"again."
+msgstr ""
+"Когда [member Node.process_mode] установлен на [constant Node."
+"PROCESS_MODE_DISABLED], удалить из моделирования физики, чтобы остановить все "
+"физические взаимодействия с этим [CollisionObject3D].\n"
+"Автоматически повторно добавляется в моделирование физики, когда [Node] "
+"обрабатывается снова."
+
+msgid ""
+"When [member Node.process_mode] is set to [constant Node."
+"PROCESS_MODE_DISABLED], make the body static. Doesn't affect [Area3D]. "
+"[PhysicsBody3D] can't be affected by forces or other bodies while static.\n"
+"Automatically set [PhysicsBody3D] back to its original mode when the [Node] "
+"is processed again."
+msgstr ""
+"Когда [member Node.process_mode] установлен на [constant Node."
+"PROCESS_MODE_DISABLED], сделайте тело статичным. Не влияет на [Area3D]. "
+"[PhysicsBody3D] не может быть подвержен воздействию сил или других тел, пока "
+"он статичен.\n"
+"Автоматически верните [PhysicsBody3D] в исходный режим, когда [Node] "
+"обрабатывается снова."
+
+msgid "A node that provides a polygon shape to a [CollisionObject2D] parent."
+msgstr ""
+"Узел, который придает многоугольную форму родительскому объекту "
+"[CollisionObject2D]."
+
+msgid ""
+"A node that provides a polygon shape to a [CollisionObject2D] parent and "
+"allows to edit it. The polygon can be concave or convex. This can give a "
+"detection shape to an [Area2D], turn [PhysicsBody2D] into a solid object, or "
+"give a hollow shape to a [StaticBody2D].\n"
+"[b]Warning:[/b] A non-uniformly scaled [CollisionPolygon2D] will likely not "
+"behave as expected. Make sure to keep its scale the same on all axes and "
+"adjust its polygon instead."
+msgstr ""
+"Узел, который предоставляет форму многоугольника для родительского "
+"[CollisionObject2D] и позволяет редактировать его. Многоугольник может быть "
+"вогнутым или выпуклым. Это может дать форму обнаружения для [Area2D], "
+"превратить [PhysicsBody2D] в сплошной объект или дать полую форму для "
+"[StaticBody2D].\n"
+"[b]Предупреждение:[/b] Неравномерно масштабированный [CollisionPolygon2D], "
+"скорее всего, не будет вести себя так, как ожидается. Убедитесь, что его "
+"масштаб одинаковый по всем осям, и вместо этого настройте его многоугольник."
+
+msgid "Collision build mode. Use one of the [enum BuildMode] constants."
+msgstr ""
+"Режим построения коллизии. Используйте одну из констант [enum BuildMode]."
+
+msgid "If [code]true[/code], no collisions will be detected."
+msgstr "Если [code]true[/code], то никаких столкновений обнаружено не будет."
+
+msgid ""
+"If [code]true[/code], only edges that face up, relative to "
+"[CollisionPolygon2D]'s rotation, will collide with other objects.\n"
+"[b]Note:[/b] This property has no effect if this [CollisionPolygon2D] is a "
+"child of an [Area2D] node."
+msgstr ""
+"Если [code]true[/code], только ребра, обращенные вверх относительно поворота "
+"[CollisionPolygon2D], будут сталкиваться с другими объектами.\n"
+"[b]Примечание:[/b] Это свойство не имеет эффекта, если этот "
+"[CollisionPolygon2D] является дочерним узлом [Area2D]."
+
+msgid ""
+"The margin used for one-way collision (in pixels). Higher values will make "
+"the shape thicker, and work better for colliders that enter the polygon at a "
+"high velocity."
+msgstr ""
+"Поле, используемое для одностороннего столкновения (в пикселях). Более "
+"высокие значения сделают форму толще и будут лучше работать для коллайдеров, "
+"которые входят в полигон на высокой скорости."
+
+msgid ""
+"The polygon's list of vertices. Each point will be connected to the next, and "
+"the final point will be connected to the first.\n"
+"[b]Note:[/b] The returned vertices are in the local coordinate space of the "
+"given [CollisionPolygon2D]."
+msgstr ""
+"Список вершин полигона. Каждая точка будет соединена со следующей, а "
+"последняя точка будет соединена с первой.\n"
+"[b]Примечание:[/b] Возвращаемые вершины находятся в локальном координатном "
+"пространстве заданного [CollisionPolygon2D]."
+
+msgid ""
+"Collisions will include the polygon and its contained area. In this mode the "
+"node has the same effect as several [ConvexPolygonShape2D] nodes, one for "
+"each convex shape in the convex decomposition of the polygon (but without the "
+"overhead of multiple nodes)."
+msgstr ""
+"Столкновения будут включать полигон и его содержащуюся область. В этом режиме "
+"узел имеет тот же эффект, что и несколько узлов [ConvexPolygonShape2D], по "
+"одному для каждой выпуклой формы в выпуклом разложении полигона (но без "
+"накладных расходов нескольких узлов)."
+
+msgid ""
+"Collisions will only include the polygon edges. In this mode the node has the "
+"same effect as a single [ConcavePolygonShape2D] made of segments, with the "
+"restriction that each segment (after the first one) starts where the previous "
+"one ends, and the last one ends where the first one starts (forming a closed "
+"but hollow polygon)."
+msgstr ""
+"Столкновения будут включать только края полигона. В этом режиме узел имеет "
+"тот же эффект, что и один [ConcavePolygonShape2D], состоящий из сегментов, с "
+"ограничением, что каждый сегмент (после первого) начинается там, где "
+"заканчивается предыдущий, а последний заканчивается там, где начинается "
+"первый (образуя замкнутый, но полый полигон)."
+
+msgid ""
+"A node that provides a thickened polygon shape (a prism) to a "
+"[CollisionObject3D] parent."
+msgstr ""
+"Узел, который придает утолщенную форму многоугольника (призму) родительскому "
+"объекту [CollisionObject3D]."
+
+msgid ""
+"A node that provides a thickened polygon shape (a prism) to a "
+"[CollisionObject3D] parent and allows to edit it. The polygon can be concave "
+"or convex. This can give a detection shape to an [Area3D] or turn "
+"[PhysicsBody3D] into a solid object.\n"
+"[b]Warning:[/b] A non-uniformly scaled [CollisionShape3D] will likely not "
+"behave as expected. Make sure to keep its scale the same on all axes and "
+"adjust its shape resource instead."
+msgstr ""
+"Узел, который предоставляет утолщенную форму многоугольника (призму) "
+"родительскому [CollisionObject3D] и позволяет редактировать ее. Многоугольник "
+"может быть вогнутым или выпуклым. Это может дать форму обнаружения [Area3D] "
+"или превратить [PhysicsBody3D] в сплошной объект.\n"
+"[b]Предупреждение:[/b] Неравномерно масштабированный [CollisionShape3D], "
+"скорее всего, не будет вести себя так, как ожидается. Убедитесь, что его "
+"масштаб одинаковый по всем осям, и вместо этого настройте его ресурс формы."
+
+msgid ""
+"The collision shape color that is displayed in the editor, or in the running "
+"project if [b]Debug > Visible Collision Shapes[/b] is checked at the top of "
+"the editor.\n"
+"[b]Note:[/b] The default value is [member ProjectSettings.debug/shapes/"
+"collision/shape_color]. The [code]Color(0, 0, 0, 0)[/code] value documented "
+"here is a placeholder, and not the actual default debug color."
+msgstr ""
+"Цвет формы столкновения, отображаемый в редакторе или в запущенном проекте, "
+"если [b]Отладка > Видимые формы столкновения[/b] отмечены в верхней части "
+"редактора.\n"
+"[b]Примечание:[/b] Значение по умолчанию — [member ProjectSettings.debug/"
+"shapes/collision/shape_color]. Значение [code]Color(0, 0, 0, 0)[/code], "
+"задокументированное здесь, является заполнителем, а не фактическим цветом "
+"отладки по умолчанию."
+
+msgid ""
+"If [code]true[/code], when the shape is displayed, it will show a solid fill "
+"color in addition to its wireframe."
+msgstr ""
+"Если [code]true[/code], при отображении фигуры в дополнение к ее каркасу "
+"будет отображаться сплошной цвет заливки."
+
+msgid ""
+"Length that the resulting collision extends in either direction perpendicular "
+"to its 2D polygon."
+msgstr ""
+"Длина, на которую распространяется полученное столкновение в любом "
+"направлении, перпендикулярном его двумерному многоугольнику."
+
+msgid "If [code]true[/code], no collision will be produced."
+msgstr "Если [code]true[/code], столкновения не произойдет."
+
+msgid ""
+"The collision margin for the generated [Shape3D]. See [member Shape3D.margin] "
+"for more details."
+msgstr ""
+"Поле столкновения для сгенерированного [Shape3D]. См. [member Shape3D.margin] "
+"для получения более подробной информации."
+
+msgid "Array of vertices which define the 2D polygon in the local XY plane."
+msgstr "Массив вершин, определяющих 2D-полигон в локальной плоскости XY."
+
+msgid "A node that provides a [Shape2D] to a [CollisionObject2D] parent."
+msgstr ""
+"Узел, который предоставляет [Shape2D] родительскому [CollisionObject2D]."
+
+msgid ""
+"A node that provides a [Shape2D] to a [CollisionObject2D] parent and allows "
+"to edit it. This can give a detection shape to an [Area2D] or turn a "
+"[PhysicsBody2D] into a solid object."
+msgstr ""
+"Узел, который предоставляет [Shape2D] родителю [CollisionObject2D] и "
+"позволяет редактировать его. Это может дать форму обнаружения [Area2D] или "
+"превратить [PhysicsBody2D] в твердый объект."
+
+msgid "Physics introduction"
+msgstr "Введение в физику"
+
+msgid ""
+"A disabled collision shape has no effect in the world. This property should "
+"be changed with [method Object.set_deferred]."
+msgstr ""
+"Отключенная форма столкновения не имеет эффекта в мире. Это свойство должно "
+"быть изменено с помощью [method Object.set_deferred]."
+
+msgid ""
+"Sets whether this collision shape should only detect collision on one side "
+"(top or bottom).\n"
+"[b]Note:[/b] This property has no effect if this [CollisionShape2D] is a "
+"child of an [Area2D] node."
+msgstr ""
+"Устанавливает, должна ли эта форма столкновения обнаруживать столкновение "
+"только с одной стороны (сверху или снизу).\n"
+"[b]Примечание:[/b] Это свойство не имеет эффекта, если этот "
+"[CollisionShape2D] является дочерним узлом [Area2D]."
+
+msgid ""
+"The margin used for one-way collision (in pixels). Higher values will make "
+"the shape thicker, and work better for colliders that enter the shape at a "
+"high velocity."
+msgstr ""
+"Поле, используемое для одностороннего столкновения (в пикселях). Более "
+"высокие значения сделают форму толще и лучше подходят для коллайдеров, "
+"которые входят в форму с высокой скоростью."
+
+msgid "The actual shape owned by this collision shape."
+msgstr "Фактическая форма, принадлежащая этой форме столкновения."
+
+msgid "A node that provides a [Shape3D] to a [CollisionObject3D] parent."
+msgstr ""
+"Узел, который предоставляет [Shape3D] родительскому элементу "
+"[CollisionObject3D]."
+
+msgid ""
+"A node that provides a [Shape3D] to a [CollisionObject3D] parent and allows "
+"to edit it. This can give a detection shape to an [Area3D] or turn a "
+"[PhysicsBody3D] into a solid object.\n"
+"[b]Warning:[/b] A non-uniformly scaled [CollisionShape3D] will likely not "
+"behave as expected. Make sure to keep its scale the same on all axes and "
+"adjust its [member shape] resource instead."
+msgstr ""
+"Узел, который предоставляет [Shape3D] родительскому [CollisionObject3D] и "
+"позволяет редактировать его. Это может дать форму обнаружения [Area3D] или "
+"превратить [PhysicsBody3D] в сплошной объект.\n"
+"[b]Предупреждение:[/b] Неравномерно масштабированный [CollisionShape3D] "
+"скорее всего не будет вести себя так, как ожидается. Убедитесь, что его "
+"масштаб одинаковый по всем осям, и вместо этого настройте его ресурс [member "
+"shape]."
+
+msgid ""
+"Sets the collision shape's shape to the addition of all its convexed "
+"[MeshInstance3D] siblings geometry."
+msgstr ""
+"Устанавливает форму формы столкновения на основе всех ее выпуклых родственных "
+"геометрий [MeshInstance3D]."
+
+msgid "Use [signal Resource.changed] instead."
+msgstr "Вместо этого используйте [signal Resource.changed]."
+
+msgid "This method does nothing."
+msgstr "Этот метод ничего не даёт."
+
+msgid "A disabled collision shape has no effect in the world."
+msgstr "Отключенная форма столкновения не оказывает никакого влияния на мир."
+
+msgid "A color represented in RGBA format."
+msgstr "Цвет, представленный в формате RGBA."
+
+msgid "2D GD Paint Demo"
+msgstr "2D GD Paint Дэмо"
+
+msgid "GUI Drag And Drop Demo"
+msgstr "GUI Drag And Drop Демо"
+
+msgid ""
+"Constructs a default [Color] from opaque black. This is the same as [constant "
+"BLACK].\n"
+"[b]Note:[/b] In C#, this constructs a [Color] with all of its components set "
+"to [code]0.0[/code] (transparent black)."
+msgstr ""
+"Создает [Color] по умолчанию из непрозрачного черного. Это то же самое, что и "
+"[constant BLACK].\n"
+"[b]Примечание:[/b] В C# это создает [Color] со всеми его компонентами, "
+"установленными на [code]0.0[/code] (прозрачный черный)."
+
+msgid ""
+"Constructs a [Color] from the existing color, with [member a] set to the "
+"given [param alpha] value.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var red = Color(Color.RED, 0.2) # 20% opaque red.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var red = new Color(Colors.Red, 0.2f); // 20% opaque red.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает [Цвет] из существующего цвета, при этом [член a] устанавливается на "
+"заданное значение [параметр alpha].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var red = Color(Color.RED, 0.2) # 20% opaque red.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var red = new Color(Colors.Red, 0.2f); // 20% opaque red.\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Constructs a [Color] either from an HTML color code or from a standardized "
+"color name. The supported color names are the same as the constants."
+msgstr ""
+"Создает [Color] либо из кода цвета HTML, либо из стандартизированного имени "
+"цвета. Поддерживаемые имена цветов совпадают с константами."
+
+msgid ""
+"Constructs a [Color] either from an HTML color code or from a standardized "
+"color name, with [param alpha] on the range of 0.0 to 1.0. The supported "
+"color names are the same as the constants."
+msgstr ""
+"Создает [Color] либо из кода цвета HTML, либо из стандартизированного имени "
+"цвета с [param alpha] в диапазоне от 0,0 до 1,0. Поддерживаемые имена цветов "
+"совпадают с константами."
+
+msgid ""
+"Constructs a [Color] from RGB values, typically between 0.0 and 1.0. [member "
+"a] is set to 1.0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7) # Similar to `Color8(51, 255, 178, 255)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f); // Similar to `Color.Color8(51, 255, "
+"178, 255)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает [Цвет] из значений RGB, обычно от 0,0 до 1,0. [член a] имеет значение "
+"1,0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7) # Similar to `Color8(51, 255, 178, 255)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f); // Similar to `Color.Color8(51, 255, "
+"178, 255)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Constructs a [Color] from RGBA values, typically between 0.0 and 1.0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7, 0.8) # Similar to `Color8(51, 255, 178, "
+"204)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f, 0.8f); // Similar to `Color."
+"Color8(51, 255, 178, 255, 204)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает [Цвет] из значений RGBA, обычно от 0,0 до 1,0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(0.2, 1.0, 0.7, 0.8) # Similar to `Color8(51, 255, 178, "
+"204)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(0.2f, 1.0f, 0.7f, 0.8f); // Similar to `Color."
+"Color8(51, 255, 178, 255, 204)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns a new color resulting from overlaying this color over the given "
+"color. In a painting program, you can imagine it as the [param over] color "
+"painted over this color (including alpha).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var bg = Color(0.0, 1.0, 0.0, 0.5) # Green with alpha of 50%\n"
+"var fg = Color(1.0, 0.0, 0.0, 0.5) # Red with alpha of 50%\n"
+"var blended_color = bg.blend(fg) # Brown with alpha of 75%\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var bg = new Color(0.0f, 1.0f, 0.0f, 0.5f); // Green with alpha of 50%\n"
+"var fg = new Color(1.0f, 0.0f, 0.0f, 0.5f); // Red with alpha of 50%\n"
+"Color blendedColor = bg.Blend(fg); // Brown with alpha of 75%\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает новый цвет, полученный в результате наложения этого цвета на "
+"заданный цвет. В программе рисования вы можете представить его как цвет "
+"[param over], нарисованный поверх этого цвета (включая альфу).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var bg = Color(0.0, 1.0, 0.0, 0.5) # Зеленый с альфа 50%\n"
+"var fg = Color(1.0, 0.0, 0.0, 0.5) # Красный с альфой 50%\n"
+"var blended_color = bg.blend(fg) # Коричневый с альфа 75%\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var bg = new Color(0.0f, 1.0f, 0.0f, 0.5f); // Зеленый с альфа 50%\n"
+"var fg = new Color(1.0f, 0.0f, 0.0f, 0.5f); // Красный с альфой 50%\n"
+"Color blendedColor = bg.Blend(fg); // Коричневый с альфа 75%\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns a new color with all components clamped between the components of "
+"[param min] and [param max], by running [method @GlobalScope.clamp] on each "
+"component."
+msgstr ""
+"Возвращает новый цвет со всеми компонентами, зажатыми между компонентами "
+"[param min] и [param max], путем запуска [метода @GlobalScope.clamp] для "
+"каждого компонента."
+
+msgid ""
+"Returns a new color resulting from making this color darker by the specified "
+"[param amount] (ratio from 0.0 to 1.0). See also [method lightened].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var green = Color(0.0, 1.0, 0.0)\n"
+"var darkgreen = green.darkened(0.2) # 20% darker than regular green\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var green = new Color(0.0f, 1.0f, 0.0f);\n"
+"Color darkgreen = green.Darkened(0.2f); // 20% darker than regular green\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает новый цвет, полученный в результате затемнения этого цвета на "
+"указанное [param amount] (соотношение от 0,0 до 1,0). См. также [method "
+"lightened].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var green = Color(0.0, 1.0, 0.0)\n"
+"var darkgreen = green.darkened(0.2) # на 20% темнее обычного зеленого\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var green = new Color(0.0f, 1.0f, 0.0f);\n"
+"Color darkgreen = green.Darkened(0.2f); // на 20% темнее обычного зеленого\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Constructs a color from an [url=https://en.wikipedia.org/wiki/HSL_and_HSV]HSV "
+"profile[/url]. The hue ([param h]), saturation ([param s]), and value ([param "
+"v]) are typically between 0.0 and 1.0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color.from_hsv(0.58, 0.5, 0.79, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = Color.FromHsv(0.58f, 0.5f, 0.79f, 0.8f);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает цвет из [url=https://en.wikipedia.org/wiki/HSL_and_HSV]профиля HSV[/"
+"url]. Оттенок ([param h]), насыщенность ([param s]) и значение ([param v]) "
+"обычно находятся в диапазоне от 0,0 до 1,0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color.from_hsv(0.58, 0.5, 0.79, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = Color.FromHsv(0.58f, 0.5f, 0.79f, 0.8f);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Constructs a color from an [url=https://bottosson.github.io/posts/"
+"colorpicker/]OK HSL profile[/url]. The hue ([param h]), saturation ([param "
+"s]), and lightness ([param l]) are typically between 0.0 and 1.0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color.from_ok_hsl(0.58, 0.5, 0.79, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = Color.FromOkHsl(0.58f, 0.5f, 0.79f, 0.8f);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает цвет из [url=https://bottosson.github.io/posts/colorpicker/]OK HSL-"
+"профиля[/url]. Оттенок ([param h]), насыщенность ([param s]) и яркость "
+"([param l]) обычно находятся в диапазоне от 0,0 до 1,0.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color.from_ok_hsl(0.58, 0.5, 0.79, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = Color.FromOkHsl(0.58f, 0.5f, 0.79f, 0.8f);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Decodes a [Color] from an RGBE9995 format integer. See [constant Image."
+"FORMAT_RGBE9995]."
+msgstr ""
+"Декодирует [Color] из целого числа формата RGBE9995. См. [константа Image."
+"FORMAT_RGBE9995]."
+
+msgid ""
+"Creates a [Color] from the given string, which can be either an HTML color "
+"code or a named color (case-insensitive). Returns [param default] if the "
+"color cannot be inferred from the string.\n"
+"If you want to create a color from String in a constant expression, use the "
+"equivalent constructor instead (i.e. [code]Color(\"color string\")[/code])."
+msgstr ""
+"Создает [Color] из заданной строки, которая может быть либо кодом цвета HTML, "
+"либо именованным цветом (без учета регистра). Возвращает [param default], "
+"если цвет не может быть выведен из строки.\n"
+"Если вы хотите создать цвет из String в константном выражении, используйте "
+"вместо этого эквивалентный конструктор (т. е. [code]Color(\"color string\")[/"
+"code])."
+
+msgid ""
+"Returns the light intensity of the color, as a value between 0.0 and 1.0 "
+"(inclusive). This is useful when determining light or dark color. Colors with "
+"a luminance smaller than 0.5 can be generally considered dark.\n"
+"[b]Note:[/b] [method get_luminance] relies on the color being in the linear "
+"color space to return an accurate relative luminance value. If the color is "
+"in the sRGB color space, use [method srgb_to_linear] to convert it to the "
+"linear color space first."
+msgstr ""
+"Возвращает интенсивность света цвета как значение от 0,0 до 1,0 "
+"(включительно). Это полезно при определении светлого или темного цвета. Цвета "
+"с яркостью меньше 0,5 обычно можно считать темными.\n"
+"[b]Примечание:[/b] [метод get_luminance] полагается на то, что цвет находится "
+"в линейном цветовом пространстве, чтобы вернуть точное относительное значение "
+"яркости. Если цвет находится в цветовом пространстве sRGB, используйте [метод "
+"srgb_to_linear], чтобы сначала преобразовать его в линейное цветовое "
+"пространство."
+
+msgid ""
+"Returns the [Color] associated with the provided [param hex] integer in 32-"
+"bit RGBA format (8 bits per channel). This method is the inverse of [method "
+"to_rgba32].\n"
+"In GDScript and C#, the [int] is best visualized with hexadecimal notation "
+"([code]\"0x\"[/code] prefix, making it [code]\"0xRRGGBBAA\"[/code]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var red = Color.hex(0xff0000ff)\n"
+"var dark_cyan = Color.hex(0x008b8bff)\n"
+"var my_color = Color.hex(0xbbefd2a4)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var red = new Color(0xff0000ff);\n"
+"var dark_cyan = new Color(0x008b8bff);\n"
+"var my_color = new Color(0xbbefd2a4);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If you want to use hex notation in a constant expression, use the equivalent "
+"constructor instead (i.e. [code]Color(0xRRGGBBAA)[/code])."
+msgstr ""
+"Возвращает [Color], связанный с предоставленным целым числом [param hex] в 32-"
+"битном формате RGBA (8 бит на канал). Этот метод является обратным [method "
+"to_rgba32].\n"
+"В GDScript и C# [int] лучше всего визуализировать с помощью шестнадцатеричной "
+"записи (префикс [code]\"0x\"[/code], что делает его [code]\"0xRRGGBBAA\"[/"
+"code]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var red = Color.hex(0xff0000ff)\n"
+"var dark_cyan = Color.hex(0x008b8bff)\n"
+"var my_color = Color.hex(0xbbefd2a4)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var red = new Color(0xff0000ff);\n"
+"var dark_cyan = new Color(0x008b8bff);\n"
+"var my_color = new Color(0xbbefd2a4);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Если вы хотите использовать шестнадцатеричную запись в константном выражении, "
+"используйте вместо этого эквивалентный конструктор (т. е. "
+"[code]Color(0xRRGGBBAA)[/code])."
+
+msgid ""
+"Returns the [Color] associated with the provided [param hex] integer in 64-"
+"bit RGBA format (16 bits per channel). This method is the inverse of [method "
+"to_rgba64].\n"
+"In GDScript and C#, the [int] is best visualized with hexadecimal notation "
+"([code]\"0x\"[/code] prefix, making it [code]\"0xRRRRGGGGBBBBAAAA\"[/code])."
+msgstr ""
+"Возвращает [Color], связанный с предоставленным целым числом [param hex] в 64-"
+"битном формате RGBA (16 бит на канал). Этот метод является обратным [method "
+"to_rgba64].\n"
+"В GDScript и C# [int] лучше всего визуализировать с помощью шестнадцатеричной "
+"записи (префикс [code]\"0x\"[/code], что делает его "
+"[code]\"0xRRRRGGGGBBBBAAAA\"[/code])."
+
+msgid ""
+"Returns a new color from [param rgba], an HTML hexadecimal color string. "
+"[param rgba] is not case-sensitive, and may be prefixed by a hash sign "
+"([code]#[/code]).\n"
+"[param rgba] must be a valid three-digit or six-digit hexadecimal color "
+"string, and may contain an alpha channel value. If [param rgba] does not "
+"contain an alpha channel value, an alpha channel value of 1.0 is applied. If "
+"[param rgba] is invalid, returns an empty color.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var blue = Color.html(\"#0000ff\") # blue is Color(0.0, 0.0, 1.0, 1.0)\n"
+"var green = Color.html(\"#0F0\")   # green is Color(0.0, 1.0, 0.0, 1.0)\n"
+"var col = Color.html(\"663399cc\") # col is Color(0.4, 0.2, 0.6, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var blue = Color.FromHtml(\"#0000ff\"); // blue is Color(0.0, 0.0, 1.0, 1.0)\n"
+"var green = Color.FromHtml(\"#0F0\");   // green is Color(0.0, 1.0, 0.0, "
+"1.0)\n"
+"var col = Color.FromHtml(\"663399cc\"); // col is Color(0.4, 0.2, 0.6, 0.8)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает новый цвет из [param rgba], шестнадцатеричной строки цвета HTML. "
+"[param rgba] не чувствителен к регистру и может иметь префикс в виде знака "
+"решетки ([code]#[/code]).\n"
+"[param rgba] должен быть допустимой трехзначной или шестизначной "
+"шестнадцатеричной строкой цвета и может содержать значение альфа-канала. Если "
+"[param rgba] не содержит значение альфа-канала, применяется значение альфа-"
+"канала 1.0. Если [param rgba] недопустим, возвращает пустой цвет.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var blue = Color.html(\"#0000ff\") # blue is Color(0.0, 0.0, 1.0, 1.0)\n"
+"var green = Color.html(\"#0F0\")   # green is Color(0.0, 1.0, 0.0, 1.0)\n"
+"var col = Color.html(\"663399cc\") # col is Color(0.4, 0.2, 0.6, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var blue = Color.FromHtml(\"#0000ff\"); // blue is Color(0.0, 0.0, 1.0, 1.0)\n"
+"var green = Color.FromHtml(\"#0F0\");   // green is Color(0.0, 1.0, 0.0, "
+"1.0)\n"
+"var col = Color.FromHtml(\"663399cc\"); // col is Color(0.4, 0.2, 0.6, 0.8)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns [code]true[/code] if [param color] is a valid HTML hexadecimal color "
+"string. The string must be a hexadecimal value (case-insensitive) of either "
+"3, 4, 6 or 8 digits, and may be prefixed by a hash sign ([code]#[/code]). "
+"This method is identical to [method String.is_valid_html_color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"Color.html_is_valid(\"#55aaFF\")   # Returns true\n"
+"Color.html_is_valid(\"#55AAFF20\") # Returns true\n"
+"Color.html_is_valid(\"55AAFF\")    # Returns true\n"
+"Color.html_is_valid(\"#F2C\")      # Returns true\n"
+"\n"
+"Color.html_is_valid(\"#AABBC\")    # Returns false\n"
+"Color.html_is_valid(\"#55aaFF5\")  # Returns false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Color.HtmlIsValid(\"#55AAFF\");   // Returns true\n"
+"Color.HtmlIsValid(\"#55AAFF20\"); // Returns true\n"
+"Color.HtmlIsValid(\"55AAFF\");    // Returns true\n"
+"Color.HtmlIsValid(\"#F2C\");      // Returns true\n"
+"\n"
+"Color.HtmlIsValid(\"#AABBC\");    // Returns false\n"
+"Color.HtmlIsValid(\"#55aaFF5\");  // Returns false\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает [code]true[/code], если [param color] является допустимой "
+"шестнадцатеричной строкой цвета HTML. Строка должна быть шестнадцатеричным "
+"значением (без учета регистра) из 3, 4, 6 или 8 цифр и может иметь префикс в "
+"виде знака решетки ([code]#[/code]). Этот метод идентичен [method String."
+"is_valid_html_color].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"Color.html_is_valid(\"#55aaFF\")   # Returns true\n"
+"Color.html_is_valid(\"#55AAFF20\") # Returns true\n"
+"Color.html_is_valid(\"55AAFF\")    # Returns true\n"
+"Color.html_is_valid(\"#F2C\")      # Returns true\n"
+"\n"
+"Color.html_is_valid(\"#AABBC\")    # Returns false\n"
+"Color.html_is_valid(\"#55aaFF5\")  # Returns false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"Color.HtmlIsValid(\"#55AAFF\");   // Returns true\n"
+"Color.HtmlIsValid(\"#55AAFF20\"); // Returns true\n"
+"Color.HtmlIsValid(\"55AAFF\");    // Returns true\n"
+"Color.HtmlIsValid(\"#F2C\");      // Returns true\n"
+"\n"
+"Color.HtmlIsValid(\"#AABBC\");    // Returns false\n"
+"Color.HtmlIsValid(\"#55aaFF5\");  // Returns false\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color with its [member r], [member g], and [member b] components "
+"inverted ([code](1 - r, 1 - g, 1 - b, a)[/code]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var black = Color.WHITE.inverted()\n"
+"var color = Color(0.3, 0.4, 0.9)\n"
+"var inverted_color = color.inverted() # Equivalent to `Color(0.7, 0.6, 0.1)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var black = Colors.White.Inverted();\n"
+"var color = new Color(0.3f, 0.4f, 0.9f);\n"
+"Color invertedColor = color.Inverted(); // Equivalent to `new Color(0.7f, "
+"0.6f, 0.1f)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет с инвертированными компонентами [элемент r], [элемент g] и "
+"[элемент b]. ([code](1 - r, 1 - g, 1 - b, a)[/code]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var black = Color.WHITE.inverted()\n"
+"var color = Color(0.3, 0.4, 0.9)\n"
+"var inverted_color = color.inverted() # Equivalent to `Color(0.7, 0.6, 0.1)`\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var black = Colors.White.Inverted();\n"
+"var color = new Color(0.3f, 0.4f, 0.9f);\n"
+"Color invertedColor = color.Inverted(); // Equivalent to `new Color(0.7f, "
+"0.6f, 0.1f)`\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the linear interpolation between this color's components and [param "
+"to]'s components. The interpolation factor [param weight] should be between "
+"0.0 and 1.0 (inclusive). See also [method @GlobalScope.lerp].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var red = Color(1.0, 0.0, 0.0)\n"
+"var aqua = Color(0.0, 1.0, 0.8)\n"
+"\n"
+"red.lerp(aqua, 0.2) # Returns Color(0.8, 0.2, 0.16)\n"
+"red.lerp(aqua, 0.5) # Returns Color(0.5, 0.5, 0.4)\n"
+"red.lerp(aqua, 1.0) # Returns Color(0.0, 1.0, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var red = new Color(1.0f, 0.0f, 0.0f);\n"
+"var aqua = new Color(0.0f, 1.0f, 0.8f);\n"
+"\n"
+"red.Lerp(aqua, 0.2f); // Returns Color(0.8f, 0.2f, 0.16f)\n"
+"red.Lerp(aqua, 0.5f); // Returns Color(0.5f, 0.5f, 0.4f)\n"
+"red.Lerp(aqua, 1.0f); // Returns Color(0.0f, 1.0f, 0.8f)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает линейную интерполяцию между компонентами этого цвета и "
+"компонентами [param to]. Коэффициент интерполяции [param weight] должен быть "
+"между 0,0 и 1,0 (включительно). См. также [метод @GlobalScope.lerp].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var red = Color(1.0, 0.0, 0.0)\n"
+"var aqua = Color(0.0, 1.0, 0.8)\n"
+"\n"
+"red.lerp(aqua, 0.2) # Returns Color(0.8, 0.2, 0.16)\n"
+"red.lerp(aqua, 0.5) # Returns Color(0.5, 0.5, 0.4)\n"
+"red.lerp(aqua, 1.0) # Returns Color(0.0, 1.0, 0.8)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var red = new Color(1.0f, 0.0f, 0.0f);\n"
+"var aqua = new Color(0.0f, 1.0f, 0.8f);\n"
+"\n"
+"red.Lerp(aqua, 0.2f); // Returns Color(0.8f, 0.2f, 0.16f)\n"
+"red.Lerp(aqua, 0.5f); // Returns Color(0.5f, 0.5f, 0.4f)\n"
+"red.Lerp(aqua, 1.0f); // Returns Color(0.0f, 1.0f, 0.8f)\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns a new color resulting from making this color lighter by the specified "
+"[param amount], which should be a ratio from 0.0 to 1.0. See also [method "
+"darkened].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var green = Color(0.0, 1.0, 0.0)\n"
+"var light_green = green.lightened(0.2) # 20% lighter than regular green\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var green = new Color(0.0f, 1.0f, 0.0f);\n"
+"Color lightGreen = green.Lightened(0.2f); // 20% lighter than regular green\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает новый цвет, полученный в результате осветления этого цвета на "
+"указанное [param amount], которое должно быть отношением от 0,0 до 1,0. См. "
+"также [method darkened].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var green = Color(0.0, 1.0, 0.0)\n"
+"var light_green = green.lightened(0.2) # На 20% светлее обычного зеленого\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var green = new Color(0.0f, 1.0f, 0.0f);\n"
+"Color lightGreen = green.Lightened(0.2f); // На 20% светлее обычного "
+"зеленого\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color converted to the [url=https://en.wikipedia.org/wiki/"
+"SRGB]sRGB[/url] color space. This method assumes the original color is in the "
+"linear color space. See also [method srgb_to_linear] which performs the "
+"opposite operation."
+msgstr ""
+"Возвращает цвет, преобразованный в цветовое пространство [url=https://en."
+"wikipedia.org/wiki/SRGB]sRGB[/url]. Этот метод предполагает, что исходный "
+"цвет находится в линейном цветовом пространстве. См. также [метод "
+"srgb_to_linear], который выполняет противоположную операцию."
+
+msgid ""
+"Returns the color converted to the linear color space. This method assumes "
+"the original color already is in the sRGB color space. See also [method "
+"linear_to_srgb] which performs the opposite operation."
+msgstr ""
+"Возвращает цвет, преобразованный в линейное цветовое пространство. Этот метод "
+"предполагает, что исходный цвет уже находится в цветовом пространстве sRGB. "
+"См. также [метод linear_to_srgb], который выполняет противоположную операцию."
+
+msgid ""
+"Returns the color converted to a 32-bit integer in ABGR format (each "
+"component is 8 bits). ABGR is the reversed version of the default RGBA "
+"format.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_abgr32()) # Prints 4281565439\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToAbgr32()); // Prints 4281565439\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет, преобразованный в 32-битное целое число в формате ABGR "
+"(каждый компонент — 8 бит). ABGR — это обратная версия формата RGBA по "
+"умолчанию.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_abgr32()) # Prints 4281565439\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToAbgr32()); // Prints 4281565439\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color converted to a 64-bit integer in ABGR format (each "
+"component is 16 bits). ABGR is the reversed version of the default RGBA "
+"format.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_abgr64()) # Prints -225178692812801\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToAbgr64()); // Prints -225178692812801\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет, преобразованный в 64-битное целое число в формате ABGR "
+"(каждый компонент — 16 бит). ABGR — это обратная версия формата RGBA по "
+"умолчанию.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_abgr64()) # Prints -225178692812801\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToAbgr64()); // Prints -225178692812801\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color converted to a 32-bit integer in ARGB format (each "
+"component is 8 bits). ARGB is more compatible with DirectX.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_argb32()) # Prints 4294934323\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToArgb32()); // Prints 4294934323\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет, преобразованный в 32-битное целое число в формате ARGB "
+"(каждый компонент — 8 бит). ARGB более совместим с DirectX.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_argb32()) # Prints 4294934323\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToArgb32()); // Prints 4294934323\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color converted to a 64-bit integer in ARGB format (each "
+"component is 16 bits). ARGB is more compatible with DirectX.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_argb64()) # Prints -2147470541\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToArgb64()); // Prints -2147470541\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет, преобразованный в 64-битное целое число в формате ARGB "
+"(каждый компонент — 16 бит). ARGB более совместим с DirectX.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_argb64()) # Prints -2147470541\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1.0f, 0.5f, 0.2f);\n"
+"GD.Print(color.ToArgb64()); // Prints -2147470541\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color converted to an HTML hexadecimal color [String] in RGBA "
+"format, without the hash ([code]#[/code]) prefix.\n"
+"Setting [param with_alpha] to [code]false[/code], excludes alpha from the "
+"hexadecimal string, using RGB format instead of RGBA format.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var white = Color(1, 1, 1, 0.5)\n"
+"var with_alpha = white.to_html() # Returns \"ffffff7f\"\n"
+"var without_alpha = white.to_html(false) # Returns \"ffffff\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var white = new Color(1, 1, 1, 0.5f);\n"
+"string withAlpha = white.ToHtml(); // Returns \"ffffff7f\"\n"
+"string withoutAlpha = white.ToHtml(false); // Returns \"ffffff\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет, преобразованный в шестнадцатеричный цвет HTML [String] в "
+"формате RGBA, без префикса решетки ([code]#[/code]). \n"
+"Установка [param with_alpha] в [code]false[/code] исключает альфа из "
+"шестнадцатеричной строки, используя формат RGB вместо формата RGBA.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var white = Color(1, 1, 1, 0.5)\n"
+"var with_alpha = white.to_html() # Returns \"ffffff7f\"\n"
+"var without_alpha = white.to_html(false) # Returns \"ffffff\"\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var white = new Color(1, 1, 1, 0.5f);\n"
+"string withAlpha = white.ToHtml(); // Returns \"ffffff7f\"\n"
+"string withoutAlpha = white.ToHtml(false); // Returns \"ffffff\"\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color converted to a 32-bit integer in RGBA format (each "
+"component is 8 bits). RGBA is Godot's default format. This method is the "
+"inverse of [method hex].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_rgba32()) # Prints 4286526463\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1, 0.5f, 0.2f);\n"
+"GD.Print(color.ToRgba32()); // Prints 4286526463\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет, преобразованный в 32-битное целое число в формате RGBA "
+"(каждый компонент — 8 бит). RGBA — формат Godot по умолчанию. Этот метод "
+"является обратным [методу hex].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_rgba32()) # Prints 4286526463\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1, 0.5f, 0.2f);\n"
+"GD.Print(color.ToRgba32()); // Prints 4286526463\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the color converted to a 64-bit integer in RGBA format (each "
+"component is 16 bits). RGBA is Godot's default format. This method is the "
+"inverse of [method hex64].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_rgba64()) # Prints -140736629309441\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1, 0.5f, 0.2f);\n"
+"GD.Print(color.ToRgba64()); // Prints -140736629309441\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает цвет, преобразованный в 64-битное целое число в формате RGBA "
+"(каждый компонент — 16 бит). RGBA — формат Godot по умолчанию. Этот метод "
+"является обратным [методу hex64].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var color = Color(1, 0.5, 0.2)\n"
+"print(color.to_rgba64()) # Prints -140736629309441\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var color = new Color(1, 0.5f, 0.2f);\n"
+"GD.Print(color.ToRgba64()); // Prints -140736629309441\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"The color's alpha component, typically on the range of 0 to 1. A value of 0 "
+"means that the color is fully transparent. A value of 1 means that the color "
+"is fully opaque."
+msgstr ""
+"Альфа-компонента цвета, обычно в диапазоне от 0 до 1. Значение 0 означает, "
+"что цвет полностью прозрачен. Значение 1 означает, что цвет полностью "
+"непрозрачен."
+
+msgid "Wrapper for [member a] that uses the range 0 to 255, instead of 0 to 1."
+msgstr ""
+"Оболочка для [member a], которая использует диапазон от 0 до 255 вместо 0 до "
+"1."
+
+msgid "The color's blue component, typically on the range of 0 to 1."
+msgstr "Синяя составляющая цвета, обычно в диапазоне от 0 до 1."
+
+msgid "Wrapper for [member b] that uses the range 0 to 255, instead of 0 to 1."
+msgstr ""
+"Оболочка для [элемента b], которая использует диапазон от 0 до 255 вместо 0 "
+"до 1."
+
+msgid "The color's green component, typically on the range of 0 to 1."
+msgstr "Зеленый компонент цвета, обычно в диапазоне от 0 до 1."
+
+msgid "Wrapper for [member g] that uses the range 0 to 255, instead of 0 to 1."
+msgstr ""
+"Оболочка для [member g], которая использует диапазон от 0 до 255 вместо 0 до "
+"1."
+
+msgid "The HSV hue of this color, on the range 0 to 1."
+msgstr "Оттенок HSV этого цвета в диапазоне от 0 до 1."
+
+msgid "The OKHSL lightness of this color, on the range 0 to 1."
+msgstr "Яркость OKHSL этого цвета в диапазоне от 0 до 1."
+
+msgid "The OKHSL saturation of this color, on the range 0 to 1."
+msgstr "Насыщенность OKHSL этого цвета в диапазоне от 0 до 1."
+
+msgid "The color's red component, typically on the range of 0 to 1."
+msgstr "Красный компонент цвета, обычно в диапазоне от 0 до 1."
+
+msgid "Wrapper for [member r] that uses the range 0 to 255, instead of 0 to 1."
+msgstr ""
+"Оболочка для [member r], которая использует диапазон от 0 до 255 вместо 0 до "
+"1."
+
+msgid "The HSV saturation of this color, on the range 0 to 1."
+msgstr "Насыщенность HSV этого цвета в диапазоне от 0 до 1."
+
+msgid "The HSV value (brightness) of this color, on the range 0 to 1."
+msgstr "Значение HSV (яркость) данного цвета в диапазоне от 0 до 1."
+
+msgid "Alice blue color."
+msgstr "Синяя Элис."
+
+msgid "Antique white color."
+msgstr "Античный белый."
+
+msgid "Aqua color."
+msgstr "Цвет аква."
+
+msgid "Aquamarine color."
+msgstr "Цвет аквамарина."
+
+msgid "Azure color."
+msgstr "Лазурный цвет."
+
+msgid "Beige color."
+msgstr "Бежевый цвет."
+
+msgid "Bisque color."
+msgstr "Цвет бисквита."
+
+msgid "Black color. In GDScript, this is the default value of any color."
+msgstr "Черный цвет. В GDScript это значение по умолчанию для любого цвета."
+
+msgid "Blue color."
+msgstr "Синий цвет."
+
+msgid "Blue violet color."
+msgstr "Сине-фиолетовый."
+
+msgid "Brown color."
+msgstr "Коричневый цвет."
+
+msgid "Burlywood color."
+msgstr "Цвет бурливуда."
+
+msgid "Cadet blue color."
+msgstr "Серо-синий."
+
+msgid "Chartreuse color."
+msgstr "Цвет шартрез."
+
+msgid "Chocolate color."
+msgstr "Шоколадный цвет."
+
+msgid "Coral color."
+msgstr "Коралловый цвет."
+
+msgid "Crimson color."
+msgstr "Багровый цвет."
+
+msgid "Cyan color."
+msgstr "Голубой цвет."
+
+msgid "Dark blue color."
+msgstr "Темно-синий цвет."
+
+msgid "Dark cyan color."
+msgstr "Тёмный циан."
+
+msgid "Dark goldenrod color."
+msgstr "Темно-золотистый."
+
+msgid "Dark gray color."
+msgstr "Темно-серый."
+
+msgid "Dark green color."
+msgstr "Темно-зеленый."
+
+msgid "Dark khaki color."
+msgstr "Темный хаки."
+
+msgid "Dark magenta color."
+msgstr "Тёмный фуксин."
+
+msgid "Dark olive green color."
+msgstr "Цвет темно-оливково-зеленый."
+
+msgid "Dark orange color."
+msgstr "Темно-оранжевый."
+
+msgid "Dark orchid color."
+msgstr "Темно-лиловый."
+
+msgid "Dark red color."
+msgstr "Темно-красный."
+
+msgid "Dark salmon color."
+msgstr "Тёмная лососина."
+
+msgid "Dark sea green color."
+msgstr "Цвет темно-зеленой морской волны."
+
+msgid "Dark slate blue color."
+msgstr "Цвет темно-синий."
+
+msgid "Dark slate gray color."
+msgstr "Цвет темно-серый."
+
+msgid "Dark turquoise color."
+msgstr "Темно-бирюзовый."
+
+msgid "Dark violet color."
+msgstr "Темно-фиолетовый цвет."
+
+msgid "Deep pink color."
+msgstr "Пурпурно-розовый."
+
+msgid "Deep sky blue color."
+msgstr "Насыщенный небесно-голубой цвет."
+
+msgid "Dim gray color."
+msgstr "Тускло-серый."
+
+msgid "Dodger blue color."
+msgstr "Защитно-синий."
+
+msgid "Firebrick color."
+msgstr "Кирпичный цвет."
+
+msgid "Floral white color."
+msgstr "Цветочно-белый."
+
+msgid "Forest green color."
+msgstr "Лесная зелень."
+
+msgid "Fuchsia color."
+msgstr "Цвет фуксии."
+
+msgid "Gainsboro color."
+msgstr "Цвет Гейнсборо."
+
+msgid "Ghost white color."
+msgstr "Призрачно-белый."
+
+msgid "Gold color."
+msgstr "Золотой цвет."
+
+msgid "Goldenrod color."
+msgstr "Золотисто-рыжий цвет."
+
+msgid "Gray color."
+msgstr "Серый цвет."
+
+msgid "Green color."
+msgstr "Зеленый цвет."
+
+msgid "Green yellow color."
+msgstr "Жёлто-зелёный."
+
+msgid "Honeydew color."
+msgstr "Цвет медовой росы."
+
+msgid "Hot pink color."
+msgstr "Ярко-розовый."
+
+msgid "Indian red color."
+msgstr "Индийский красный."
+
+msgid "Indigo color."
+msgstr "Цвет индиго."
+
+msgid "Ivory color."
+msgstr "Цвет слоновой кости."
+
+msgid "Khaki color."
+msgstr "Цвет хаки."
+
+msgid "Lavender color."
+msgstr "Цвет лаванды."
+
+msgid "Lavender blush color."
+msgstr "Лавандовый румянец."
+
+msgid "Lawn green color."
+msgstr "Зеленый газон."
+
+msgid "Lemon chiffon color."
+msgstr "Лимонный шифон."
+
+msgid "Light blue color."
+msgstr "Светло-голубой."
+
+msgid "Light coral color."
+msgstr "Светло-коралловый."
+
+msgid "Light cyan color."
+msgstr "Светло-синий."
+
+msgid "Light goldenrod color."
+msgstr "Светло-золотистый."
+
+msgid "Light gray color."
+msgstr "Светло-серый цвет."
+
+msgid "Light green color."
+msgstr "Светло-зеленый."
+
+msgid "Light pink color."
+msgstr "Светло-розовый."
+
+msgid "Light salmon color."
+msgstr "Светло-лососевый."
+
+msgid "Light sea green color."
+msgstr "Цвет светло-зеленой морской волны."
+
+msgid "Light sky blue color."
+msgstr "Цвет светло-голубой."
+
+msgid "Light slate gray color."
+msgstr "Цвет светло-серый."
+
+msgid "Light steel blue color."
+msgstr "Цвет светло-стальной синевы."
+
+msgid "Light yellow color."
+msgstr "Светло-желтый."
+
+msgid "Lime color."
+msgstr "Цвет лайма."
+
+msgid "Lime green color."
+msgstr "Зеленый лайм."
+
+msgid "Linen color."
+msgstr "Цвет льна."
+
+msgid "Magenta color."
+msgstr "Пурпурный цвет."
+
+msgid "Maroon color."
+msgstr "Бордовый цвет."
+
+msgid "Medium aquamarine color."
+msgstr "Умеренный аквамарин."
+
+msgid "Medium blue color."
+msgstr "Умеренно-синий."
+
+msgid "Medium orchid color."
+msgstr "Умеренный лиловый."
+
+msgid "Medium purple color."
+msgstr "Средне-фиолетовый."
+
+msgid "Medium sea green color."
+msgstr "Цвет морской волны средней насыщенности."
+
+msgid "Medium slate blue color."
+msgstr "Цвет средне-синий."
+
+msgid "Medium spring green color."
+msgstr "Цвет средне-весенне-зеленый."
+
+msgid "Medium turquoise color."
+msgstr "Средне-бирюзовый."
+
+msgid "Medium violet red color."
+msgstr "Цвет средне-фиолетово-красный."
+
+msgid "Midnight blue color."
+msgstr "Полуночно-синий."
+
+msgid "Mint cream color."
+msgstr "Мятно-кремовый."
+
+msgid "Misty rose color."
+msgstr "Туманно-розовый."
+
+msgid "Moccasin color."
+msgstr "Цвет мокасин."
+
+msgid "Navajo white color."
+msgstr "Белый навахо."
+
+msgid "Navy blue color."
+msgstr "Темно-синий."
+
+msgid "Old lace color."
+msgstr "Старое кружево."
+
+msgid "Olive color."
+msgstr "Оливковый цвет."
+
+msgid "Olive drab color."
+msgstr "Нежно-оливковый."
+
+msgid "Orange color."
+msgstr "Оранжевый цвет."
+
+msgid "Orange red color."
+msgstr "Оранжево-красный."
+
+msgid "Orchid color."
+msgstr "Цвет орхидеи."
+
+msgid "Pale goldenrod color."
+msgstr "Бледно-золотистый."
+
+msgid "Pale green color."
+msgstr "Бледно-зеленый."
+
+msgid "Pale turquoise color."
+msgstr "Бледно-бирюзовый."
+
+msgid "Pale violet red color."
+msgstr "Бледно-фиолетово-красный цвет."
+
+msgid "Papaya whip color."
+msgstr "Побег папайи."
+
+msgid "Peach puff color."
+msgstr "Тёмно-персиковый."
+
+msgid "Peru color."
+msgstr "Перуанский цвет."
+
+msgid "Pink color."
+msgstr "Розовый цвет."
+
+msgid "Plum color."
+msgstr "Цвет сливы."
+
+msgid "Powder blue color."
+msgstr "Зеленовато-голубой."
+
+msgid "Purple color."
+msgstr "Фиолетовый цвет."
+
+msgid "Rebecca purple color."
+msgstr "Фиолетовый Ребекки."
+
+msgid "Red color."
+msgstr "Красный цвет."
+
+msgid "Rosy brown color."
+msgstr "Розово-коричневый."
+
+msgid "Royal blue color."
+msgstr "Королевский синий."
+
+msgid "Saddle brown color."
+msgstr "Кожаного седла."
+
+msgid "Salmon color."
+msgstr "Цвет лосося."
+
+msgid "Sandy brown color."
+msgstr "Рыжеватый."
+
+msgid "Sea green color."
+msgstr "Морской волны."
+
+msgid "Seashell color."
+msgstr "Цвет морской раковины."
+
+msgid "Sienna color."
+msgstr "Цвет сиены."
+
+msgid "Silver color."
+msgstr "Серебряный цвет."
+
+msgid "Sky blue color."
+msgstr "Небесно-голубой цвет."
+
+msgid "Slate blue color."
+msgstr "Аспидно-синий."
+
+msgid "Slate gray color."
+msgstr "Серый шифер."
+
+msgid "Snow color."
+msgstr "Цвет снега."
+
+msgid "Spring green color."
+msgstr "Зелёная весна."
+
+msgid "Steel blue color."
+msgstr "Голубовато-стальной."
+
+msgid "Tan color."
+msgstr "Цвет загара."
+
+msgid "Teal color."
+msgstr "Цвет тила."
+
+msgid "Thistle color."
+msgstr "Цвет чертополоха."
+
+msgid "Tomato color."
+msgstr "Цвет томатов."
+
+msgid "Transparent color (white with zero alpha)."
+msgstr "Прозрачный цвет (белый с нулевой альфа-каналом)."
+
+msgid "Turquoise color."
+msgstr "Бирюзовый цвет."
+
+msgid "Violet color."
+msgstr "Фиолетовый цвет."
+
+msgid "Web gray color."
+msgstr "Серый."
+
+msgid "Web green color."
+msgstr "Зеленый."
+
+msgid "Web maroon color."
+msgstr "Бордовый."
+
+msgid "Web purple color."
+msgstr "Пурпурный."
+
+msgid "Wheat color."
+msgstr "Цвет пшеницы."
+
+msgid "White color."
+msgstr "Белый цвет."
+
+msgid "White smoke color."
+msgstr "Дымчатый."
+
+msgid "Yellow color."
+msgstr "Желтый цвет."
+
+msgid "Yellow green color."
+msgstr "Желто-зеленый."
+
+msgid ""
+"Returns [code]true[/code] if the colors are not exactly equal.\n"
+"[b]Note:[/b] Due to floating-point precision errors, consider using [method "
+"is_equal_approx] instead, which is more reliable."
+msgstr ""
+"Возвращает [code]true[/code], если цвета не совсем равны.\n"
+"[b]Примечание:[/b] Из-за ошибок точности с плавающей точкой рассмотрите "
+"возможность использования [method is_equal_approx] вместо этого, что более "
+"надежно."
+
+msgid ""
+"Multiplies each component of the [Color] by the components of the given "
+"[Color]."
+msgstr "Умножает каждый компонент [Цвета] на компоненты заданного [Цвета]."
+
+msgid "Multiplies each component of the [Color] by the given [float]."
+msgstr "Умножает каждый компонент [Color] на заданное [float]."
+
+msgid "Multiplies each component of the [Color] by the given [int]."
+msgstr "Умножает каждый компонент [Color] на заданное [int]."
+
+msgid ""
+"Adds each component of the [Color] with the components of the given [Color]."
+msgstr "Складывает каждый компонент [Цвета] с компонентами указанного [Цвета]."
+
+msgid ""
+"Subtracts each component of the [Color] by the components of the given "
+"[Color]."
+msgstr "Вычитает каждый компонент [Цвета] из компонентов заданного [Цвета]."
+
+msgid ""
+"Divides each component of the [Color] by the components of the given [Color]."
+msgstr "Делит каждый компонент [Color] на компоненты заданного [Color]."
+
+msgid "Divides each component of the [Color] by the given [float]."
+msgstr ""
+"Делит каждый компонент [Color] на заданное [float - число с плавающей точкой]."
+
+msgid "Divides each component of the [Color] by the given [int]."
+msgstr "Делит каждый компонент [Color] на заданное [int]."
+
+msgid ""
+"Returns [code]true[/code] if the colors are exactly equal.\n"
+"[b]Note:[/b] Due to floating-point precision errors, consider using [method "
+"is_equal_approx] instead, which is more reliable."
+msgstr ""
+"Возвращает [code]true[/code], если цвета точно равны.\n"
+"[b]Примечание:[/b] Из-за ошибок точности с плавающей точкой рассмотрите "
+"возможность использования [method is_equal_approx] вместо этого, что более "
+"надежно."
+
+msgid ""
+"Access color components using their index. [code][0][/code] is equivalent to "
+"[member r], [code][1][/code] is equivalent to [member g], [code][2][/code] is "
+"equivalent to [member b], and [code][3][/code] is equivalent to [member a]."
+msgstr ""
+"Доступ к компонентам цвета осуществляется с помощью их индекса. [code][0][/"
+"code] эквивалентно [member r], [code][1][/code] эквивалентно [member g], "
+"[code][2][/code] эквивалентно [member b], а [code][3][/code] эквивалентно "
+"[member a]."
+
+msgid ""
+"Returns the same value as if the [code]+[/code] was not there. Unary [code]+[/"
+"code] does nothing, but sometimes it can make your code more readable."
+msgstr ""
+"Возвращает то же значение, как если бы [code]+[/code] не было. Унарный "
+"[code]+[/code] ничего не делает, но иногда он может сделать ваш код более "
+"читаемым."
+
+msgid ""
+"Inverts the given color. This is equivalent to [code]Color.WHITE - c[/code] "
+"or [code]Color(1 - c.r, 1 - c.g, 1 - c.b, 1 - c.a)[/code]. Unlike with "
+"[method inverted], the [member a] component is inverted, too."
+msgstr ""
+"Инвертирует заданный цвет. Это эквивалентно [code]Color.WHITE - c[/code] или "
+"[code]Color(1 - c.r, 1 - c.g, 1 - c.b, 1 - c.a)[/code]. В отличие от [method "
+"inverted], компонент [member a] также инвертируется."
+
+msgid ""
+"A resource class for managing a palette of colors, which can be loaded and "
+"saved using [ColorPicker]."
+msgstr ""
+"Класс ресурсов для управления палитрой цветов, которую можно загрузить и "
+"сохранить с помощью [ColorPicker]."
+
+msgid ""
+"The [ColorPalette] resource is designed to store and manage a collection of "
+"colors. This resource is useful in scenarios where a predefined set of colors "
+"is required, such as for creating themes, designing user interfaces, or "
+"managing game assets. The built-in [ColorPicker] control can also make use of "
+"[ColorPalette] without additional code."
+msgstr ""
+"Ресурс [ColorPalette] предназначен для хранения и управления коллекцией "
+"цветов. Этот ресурс полезен в сценариях, где требуется предопределенный набор "
+"цветов, например, для создания тем, проектирования пользовательских "
+"интерфейсов или управления игровыми ресурсами. Встроенный элемент управления "
+"[ColorPicker] также может использовать [ColorPalette] без дополнительного "
+"кода."
+
+msgid "A widget that provides an interface for selecting or modifying a color."
+msgstr "Виджет, предоставляющий интерфейс для выбора или изменения цвета."
+
+msgid ""
+"A widget that provides an interface for selecting or modifying a color. It "
+"can optionally provide functionalities like a color sampler (eyedropper), "
+"color modes, and presets.\n"
+"[b]Note:[/b] This control is the color picker widget itself. You can use a "
+"[ColorPickerButton] instead if you need a button that brings up a "
+"[ColorPicker] in a popup."
+msgstr ""
+"Виджет, предоставляющий интерфейс для выбора или изменения цвета. Он может "
+"дополнительно предоставлять такие функции, как сэмплер цвета (пипетка), "
+"цветовые режимы и предустановки.\n"
+"[b]Примечание:[/b] Этот элемент управления сам по себе является виджетом "
+"выбора цвета. Вы можете использовать [ColorPickerButton] вместо этого, если "
+"вам нужна кнопка, которая вызывает [ColorPicker] во всплывающем окне."
+
+msgid ""
+"Adds the given color to a list of color presets. The presets are displayed in "
+"the color picker and the user will be able to select them.\n"
+"[b]Note:[/b] The presets list is only for [i]this[/i] color picker."
+msgstr ""
+"Добавляет заданный цвет в список цветовых предустановок. Предустановки "
+"отображаются в палитре цветов, и пользователь может их выбрать.\n"
+"[b]Примечание:[/b] Список предустановок предназначен только для [i]этой[/i] "
+"палитры цветов."
+
+msgid ""
+"Adds the given color to a list of color recent presets so that it can be "
+"picked later. Recent presets are the colors that were picked recently, a new "
+"preset is automatically created and added to recent presets when you pick a "
+"new color.\n"
+"[b]Note:[/b] The recent presets list is only for [i]this[/i] color picker."
+msgstr ""
+"Добавляет заданный цвет в список недавних предустановок цвета, чтобы его "
+"можно было выбрать позже. Недавние предустановки — это цвета, которые были "
+"выбраны недавно, новая предустановка автоматически создается и добавляется в "
+"недавние предустановки, когда вы выбираете новый цвет.\n"
+"[b]Примечание:[/b] Список недавних предустановок предназначен только для "
+"[i]этого[/i] селектора цветов."
+
+msgid ""
+"Removes the given color from the list of color presets of this color picker."
+msgstr ""
+"Удаляет указанный цвет из списка цветовых предустановок данной палитры цветов."
+
+msgid ""
+"Removes the given color from the list of color recent presets of this color "
+"picker."
+msgstr ""
+"Удаляет указанный цвет из списка последних предустановок цветов этой палитры "
+"цветов."
+
+msgid "Returns the list of colors in the presets of the color picker."
+msgstr "Возвращает список цветов в предустановках палитры цветов."
+
+msgid ""
+"If [code]true[/code], it's possible to add presets under Swatches. If "
+"[code]false[/code], the button to add presets is disabled."
+msgstr ""
+"Если [code]true[/code], можно добавлять пресеты в Swatches. Если [code]false[/"
+"code], кнопка добавления пресетов отключена."
+
+msgid "The currently selected color."
+msgstr "Текущий выбранный цвет."
+
+msgid "The currently selected color mode. See [enum ColorModeType]."
+msgstr "Текущий выбранный цветовой режим. См. [enum ColorModeType]."
+
+msgid ""
+"If [code]true[/code], the color will apply only after the user releases the "
+"mouse button, otherwise it will apply immediately even in mouse motion event "
+"(which can cause performance issues)."
+msgstr ""
+"Если [code]true[/code], цвет будет применен только после того, как "
+"пользователь отпустит кнопку мыши, в противном случае он будет применен "
+"немедленно, даже при событии движения мыши (что может вызвать проблемы с "
+"производительностью)."
+
+msgid "The shape of the color space view. See [enum PickerShapeType]."
+msgstr "Форма представления цветового пространства. См. [enum PickerShapeType]."
+
+msgid "Emitted when the color is changed."
+msgstr "Излучается при изменении цвета."
+
+msgid "Emitted when a preset is added."
+msgstr "Выдается при добавлении пресета."
+
+msgid "Emitted when a preset is removed."
+msgstr "Выдается при удалении предустановки."
+
+msgid "Allows editing the color with Red/Green/Blue sliders."
+msgstr "Позволяет редактировать цвет с помощью ползунков Красный/Зеленый/Синий."
+
+msgid "Allows editing the color with Hue/Saturation/Value sliders."
+msgstr ""
+"Позволяет редактировать цвет с помощью ползунков «Оттенок/Насыщенность/"
+"Значение»."
+
+msgid ""
+"Allows the color R, G, B component values to go beyond 1.0, which can be used "
+"for certain special operations that require it (like tinting without "
+"darkening or rendering sprites in HDR)."
+msgstr ""
+"Позволяет значениям компонентов цвета R, G, B выходить за пределы 1,0, что "
+"может использоваться для некоторых специальных операций, требующих этого "
+"(например, тонирование без затемнения или рендеринг спрайтов в HDR)."
+
+msgid ""
+"Allows editing the color with Hue/Saturation/Lightness sliders.\n"
+"OKHSL is a new color space similar to HSL but that better match perception by "
+"leveraging the Oklab color space which is designed to be simple to use, while "
+"doing a good job at predicting perceived lightness, chroma and hue.\n"
+"[url=https://bottosson.github.io/posts/colorpicker/]Okhsv and Okhsl color "
+"spaces[/url]"
+msgstr ""
+"Позволяет редактировать цвет с помощью ползунков Hue/Saturation/Lightness.\n"
+"OKHSL — это новое цветовое пространство, похожее на HSL, но лучше "
+"соответствующее восприятию за счет использования цветового пространства "
+"Oklab, которое разработано для простоты использования, при этом хорошо "
+"предсказывая воспринимаемую светлоту, цветность и оттенок.\n"
+"[url=https://bottosson.github.io/posts/colorpicker/]Цветовые пространства "
+"Okhsv и Okhsl[/url]"
+
+msgid "HSV Color Model rectangle color space with a wheel."
+msgstr "Цветовая модель HSV — прямоугольное цветовое пространство с кругом."
+
+msgid "HSV Color Model circle color space. Use Saturation as a radius."
+msgstr ""
+"Круговое цветовое пространство HSV Color Model. Используйте Saturation в "
+"качестве радиуса."
+
+msgid "HSL OK Color Model circle color space."
+msgstr "Круговое цветовое пространство модели HSL OK Color."
+
+msgid ""
+"The color space shape and the shape select button are hidden. Can't be "
+"selected from the shapes popup."
+msgstr ""
+"Форма цветового пространства и кнопка выбора формы скрыты. Невозможно выбрать "
+"из всплывающего окна форм."
+
+msgid ""
+"Overrides the [theme_item Slider.center_grabber] theme property of the "
+"sliders."
+msgstr ""
+"Переопределяет свойство темы [theme_item Slider.center_grabber] ползунков."
+
+msgid "The width of the hue selection slider."
+msgstr "Ширина ползунка выбора оттенка."
+
+msgid "The minimum width of the color labels next to sliders."
+msgstr "Минимальная ширина цветных меток рядом с ползунками."
+
+msgid "The margin around the [ColorPicker]."
+msgstr "Поле вокруг [ColorPicker]."
+
+msgid "The height of the saturation-value selection box."
+msgstr "Высота поля выбора значения насыщенности."
+
+msgid "The width of the saturation-value selection box."
+msgstr "Ширина поля выбора значения насыщенности."
+
+msgid "The icon for the \"Add Preset\" button."
+msgstr "Значок кнопки «Добавить предустановку»."
+
+msgid "The texture for the arrow grabber."
+msgstr "Текстура для захвата стрел (arrow grabber)."
+
+msgid "Custom texture for the hue selection slider on the right."
+msgstr "Пользовательская текстура для ползунка выбора оттенка справа."
+
+msgid "The icon for color preset drop down menu when expanded."
+msgstr "Значок раскрывающегося меню предустановок цвета в развернутом виде."
+
+msgid "The icon for color preset drop down menu when folded."
+msgstr "Значок раскрывающегося меню предустановок цвета в сложенном виде."
+
+msgid "The icon for color preset option menu."
+msgstr "Значок меню параметров предустановки цвета."
+
+msgid ""
+"The indicator used to signalize that the color value is outside the 0-1 range."
+msgstr ""
+"Индикатор, используемый для сигнализации о том, что значение цвета находится "
+"за пределами диапазона 0-1."
+
+msgid ""
+"The image displayed over the color box/circle (depending on the [member "
+"picker_shape]), marking the currently selected color."
+msgstr ""
+"Изображение, отображаемое поверх цветового поля/круга (в зависимости от "
+"[member picker_shape]), обозначающее текущий выбранный цвет."
+
+msgid "The fill image displayed behind the picker cursor."
+msgstr "Изображение заливки, отображаемое за курсором выбора."
+
+msgid ""
+"Background panel for the color preview box (visible when the color is "
+"translucent)."
+msgstr ""
+"Фоновая панель для окна предварительного просмотра цвета (видима, когда цвет "
+"полупрозрачен)."
+
+msgid ""
+"The icon for the revert button (visible on the middle of the \"old\" color "
+"when it differs from the currently selected color). This icon is modulated "
+"with a dark color if the \"old\" color is bright enough, so the icon should "
+"be bright to ensure visibility in both scenarios."
+msgstr ""
+"Значок кнопки возврата (виден в середине «старого» цвета, когда он отличается "
+"от текущего выбранного цвета). Этот значок модулируется темным цветом, если "
+"«старый» цвет достаточно яркий, поэтому значок должен быть ярким, чтобы "
+"обеспечить видимость в обоих сценариях."
+
+msgid "The icon for the screen color picker button."
+msgstr "Значок кнопки выбора цвета экрана."
+
+msgid "The icon for circular picker shapes."
+msgstr "Значок для круглой формы инструмента выбора."
+
+msgid "The icon for rectangular picker shapes."
+msgstr "Значок для прямоугольных фигур выбора."
+
+msgid "The icon for rectangular wheel picker shapes."
+msgstr "Значок для прямоугольных форм колесного подборщика."
+
+msgid "A button that brings up a [ColorPicker] when pressed."
+msgstr "Кнопка, при нажатии которой открывается [ColorPicker]."
+
+msgid ""
+"Encapsulates a [ColorPicker], making it accessible by pressing a button. "
+"Pressing the button will toggle the [ColorPicker]'s visibility.\n"
+"See also [BaseButton] which contains common properties and methods associated "
+"with this node.\n"
+"[b]Note:[/b] By default, the button may not be wide enough for the color "
+"preview swatch to be visible. Make sure to set [member Control."
+"custom_minimum_size] to a big enough value to give the button enough space."
+msgstr ""
+"Инкапсулирует [ColorPicker], делая его доступным при нажатии кнопки. Нажатие "
+"кнопки переключит видимость [ColorPicker].\n"
+"См. также [BaseButton], который содержит общие свойства и методы, связанные с "
+"этим узлом.\n"
+"[b]Примечание:[/b] По умолчанию кнопка может быть недостаточно широкой для "
+"отображения образца предварительного просмотра цвета. Обязательно установите "
+"[member Control.custom_minimum_size] на достаточно большое значение, чтобы "
+"предоставить кнопке достаточно места."
+
+msgid ""
+"Returns the [ColorPicker] that this node toggles.\n"
+"[b]Warning:[/b] This is a required internal node, removing and freeing it may "
+"cause a crash. If you wish to hide it or any of its children, use their "
+"[member CanvasItem.visible] property."
+msgstr ""
+"Возвращает [ColorPicker], который переключает этот узел.\n"
+"[b]Предупреждение:[/b] Это обязательный внутренний узел, его удаление и "
+"освобождение может привести к сбою. Если вы хотите скрыть его или любой из "
+"его дочерних элементов, используйте их свойство [member CanvasItem.visible]."
+
+msgid ""
+"Returns the control's [PopupPanel] which allows you to connect to popup "
+"signals. This allows you to handle events when the ColorPicker is shown or "
+"hidden.\n"
+"[b]Warning:[/b] This is a required internal node, removing and freeing it may "
+"cause a crash. If you wish to hide it or any of its children, use their "
+"[member Window.visible] property."
+msgstr ""
+"Возвращает [PopupPanel] элемента управления, который позволяет подключаться к "
+"всплывающим сигналам. Это позволяет обрабатывать события, когда ColorPicker "
+"отображается или скрывается.\n"
+"[b]Предупреждение:[/b] Это обязательный внутренний узел, его удаление и "
+"освобождение может привести к сбою. Если вы хотите скрыть его или любой из "
+"его дочерних элементов, используйте их свойство [member Window.visible]."
+
+msgid ""
+"If [code]true[/code], the alpha channel in the displayed [ColorPicker] will "
+"be visible."
+msgstr ""
+"Если [code]true[/code], альфа-канал в отображаемом [ColorPicker] будет виден."
+
+msgid "Emitted when the color changes."
+msgstr "Излучается при изменении цвета."
+
+msgid ""
+"Emitted when the [ColorPicker] is created (the button is pressed for the "
+"first time)."
+msgstr "Генерируется при создании [ColorPicker] (кнопка нажата в первый раз)."
+
+msgid "Emitted when the [ColorPicker] is closed."
+msgstr "Выдается при закрытии [ColorPicker]."
+
+msgid "The background of the color preview rect on the button."
+msgstr "Фон прямоугольника предварительного просмотра цвета на кнопке."
+
+msgid "A control that displays a solid color rectangle."
+msgstr "Элемент управления, отображающий сплошной цветной прямоугольник."
+
+msgid ""
+"Displays a rectangle filled with a solid [member color]. If you need to "
+"display the border alone, consider using a [Panel] instead."
+msgstr ""
+"Отображает прямоугольник, заполненный сплошным [цветом элемента]. Если вам "
+"нужно отобразить только границу, рассмотрите возможность использования "
+"[Panel]."
+
+msgid "The fill color of the rectangle."
+msgstr "Цвет заливки прямоугольника."
+
+msgid ""
+"More customization of the rendering pipeline will be added in the future."
+msgstr ""
+"В будущем будут добавлены дополнительные возможности настройки конвейера "
+"рендеринга."
+
+msgid "Stores attributes used to customize how a Viewport is rendered."
+msgstr ""
+"Сохраняет атрибуты, используемые для настройки способа визуализации области "
+"просмотра."
+
+msgid ""
+"The compositor resource stores attributes used to customize how a [Viewport] "
+"is rendered."
+msgstr ""
+"Ресурс композитора хранит атрибуты, используемые для настройки способа "
+"визуализации [Viewport]."
+
+msgid "The Compositor"
+msgstr "Композитор"
+
+msgid ""
+"The custom [CompositorEffect]s that are applied during rendering of viewports "
+"using this compositor."
+msgstr ""
+"Пользовательские [CompositorEffect]-ы, которые применяются во время "
+"рендеринга видовых экранов с использованием этого композитора."
+
+msgid ""
+"The implementation may change as more of the rendering internals are exposed "
+"over time."
+msgstr ""
+"Реализация может измениться, поскольку со временем внутренние механизмы "
+"рендеринга будут раскрыты."
+
+msgid "This resource allows for creating a custom rendering effect."
+msgstr "Этот ресурс позволяет создавать индивидуальный эффект рендеринга."
+
+msgid ""
+"This resource defines a custom rendering effect that can be applied to "
+"[Viewport]s through the viewports' [Environment]. You can implement a "
+"callback that is called during rendering at a given stage of the rendering "
+"pipeline and allows you to insert additional passes. Note that this callback "
+"happens on the rendering thread. CompositorEffect is an abstract base class "
+"and must be extended to implement specific rendering logic."
+msgstr ""
+"Этот ресурс определяет пользовательский эффект рендеринга, который может быть "
+"применен к [Viewport] через [Environment] видовых экранов. Вы можете "
+"реализовать обратный вызов, который вызывается во время рендеринга на "
+"заданном этапе конвейера рендеринга и позволяет вставлять дополнительные "
+"проходы. Обратите внимание, что этот обратный вызов происходит в потоке "
+"рендеринга. CompositorEffect — это абстрактный базовый класс, который должен "
+"быть расширен для реализации определенной логики рендеринга."
+
+msgid ""
+"Implement this function with your custom rendering code. [param "
+"effect_callback_type] should always match the effect callback type you've "
+"specified in [member effect_callback_type]. [param render_data] provides "
+"access to the rendering state, it is only valid during rendering and should "
+"not be stored."
+msgstr ""
+"Реализуйте эту функцию с помощью своего пользовательского кода рендеринга. "
+"[param effect_callback_type] всегда должен соответствовать типу обратного "
+"вызова эффекта, указанному вами в [member effect_callback_type]. [param "
+"render_data] предоставляет доступ к состоянию рендеринга, он действителен "
+"только во время рендеринга и не должен сохраняться."
+
+msgid ""
+"If [code]true[/code] and MSAA is enabled, this will trigger a color buffer "
+"resolve before the effect is run.\n"
+"[b]Note:[/b] In [method _render_callback], to access the resolved buffer "
+"use:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var color_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"color\")\n"
+"[/codeblock]"
+msgstr ""
+"Если [code]true[/code] и MSAA включен, это вызовет разрешение буфера цвета "
+"перед запуском эффекта.\n"
+"[b]Примечание:[/b] В [method _render_callback] для доступа к разрешенному "
+"буферу используйте:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var color_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"color\")\n"
+"[/codeblock]"
+
+msgid ""
+"If [code]true[/code] and MSAA is enabled, this will trigger a depth buffer "
+"resolve before the effect is run.\n"
+"[b]Note:[/b] In [method _render_callback], to access the resolved buffer "
+"use:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var depth_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"depth\")\n"
+"[/codeblock]"
+msgstr ""
+"Если [code]true[/code] и MSAA включен, это запустит разрешение буфера глубины "
+"перед запуском эффекта.\n"
+"[b]Примечание:[/b] В [method _render_callback] для доступа к разрешенному "
+"буферу используйте:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var depth_buffer = render_scene_buffers.get_texture(\"render_buffers\", "
+"\"depth\")\n"
+"[/codeblock]"
+
+msgid ""
+"The type of effect that is implemented, determines at what stage of rendering "
+"the callback is called."
+msgstr ""
+"Тип реализуемого эффекта определяет, на каком этапе рендеринга будет вызван "
+"обратный вызов."
+
+msgid ""
+"If [code]true[/code] this rendering effect is applied to any viewport it is "
+"added to."
+msgstr ""
+"Если [code]true[/code], этот эффект рендеринга применяется к любой области "
+"просмотра, к которой он добавлен."
+
+msgid ""
+"If [code]true[/code] this triggers motion vectors being calculated during the "
+"opaque render state.\n"
+"[b]Note:[/b] In [method _render_callback], to access the motion vector buffer "
+"use:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var motion_buffer = render_scene_buffers.get_velocity_texture()\n"
+"[/codeblock]"
+msgstr ""
+"Если [code]true[/code], это запускает вычисление векторов движения во время "
+"непрозрачного состояния рендеринга.\n"
+"[b]Примечание:[/b] В [method _render_callback] для доступа к буферу векторов "
+"движения используйте:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var motion_buffer = render_scene_buffers.get_velocity_texture()\n"
+"[/codeblock]"
+
+msgid ""
+"If [code]true[/code] this triggers normal and roughness data to be output "
+"during our depth pre-pass, only applicable for the Forward+ renderer.\n"
+"[b]Note:[/b] In [method _render_callback], to access the roughness buffer "
+"use:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var roughness_buffer = render_scene_buffers."
+"get_texture(\"forward_clustered\", \"normal_roughness\")\n"
+"[/codeblock]\n"
+"The raw normal and roughness buffer is stored in an optimized format, "
+"different than the one available in Spatial shaders. When sampling the "
+"buffer, a conversion function must be applied. Use this function, copied from "
+"[url=https://github.com/godotengine/godot/blob/"
+"da5f39889f155658cef7f7ec3cc1abb94e17d815/servers/rendering/renderer_rd/"
+"shaders/forward_clustered/scene_forward_clustered_inc.glsl#L334-L341]here[/"
+"url]:\n"
+"[codeblock]\n"
+"vec4 normal_roughness_compatibility(vec4 p_normal_roughness) {\n"
+"    float roughness = p_normal_roughness.w;\n"
+"    if (roughness > 0.5) {\n"
+"        roughness = 1.0 - roughness;\n"
+"    }\n"
+"    roughness /= (127.0 / 255.0);\n"
+"    return vec4(normalize(p_normal_roughness.xyz * 2.0 - 1.0) * 0.5 + 0.5, "
+"roughness);\n"
+"}\n"
+"[/codeblock]"
+msgstr ""
+"Если [code]true[/code], это запускает вывод данных нормали и шероховатости во "
+"время нашего предварительного прохода глубины, применимо только для рендерера "
+"Forward+.\n"
+"[b]Примечание:[/b] В [method _render_callback] для доступа к буферу "
+"шероховатости используйте:\n"
+"[codeblock]\n"
+"var render_scene_buffers = render_data.get_render_scene_buffers()\n"
+"var roughness_buffer = render_scene_buffers."
+"get_texture(\"forward_clustered\", \"normal_roughness\")\n"
+"[/codeblock]\n"
+"Необработанный буфер нормалей и шероховатости хранится в оптимизированном "
+"формате, отличном от того, который доступен в пространственных шейдерах. При "
+"сэмплировании буфера необходимо применить функцию преобразования. Используйте "
+"эту функцию, скопированную от [url=https://github.com/godotengine/godot/blob/"
+"da5f39889f155658cef7f7ec3cc1abb94e17d815/servers/rendering/renderer_rd/"
+"shaders/forward_clustered/scene_forward_clustered_inc.glsl#L334-L341]сюда[/"
+"url]:\n"
+"[codeblock]\n"
+"vec4 normal_roughness_compatibility(vec4 p_normal_roughness) {\n"
+"    float roughness = p_normal_roughness.w;\n"
+"    if (roughness > 0.5) {\n"
+"        roughness = 1.0 - roughness;\n"
+"    }\n"
+"    roughness /= (127.0 / 255.0);\n"
+"    return vec4(normalize(p_normal_roughness.xyz * 2.0 - 1.0) * 0.5 + 0.5, "
+"roughness);\n"
+"}\n"
+"[/codeblock]"
+
+msgid ""
+"If [code]true[/code] this triggers specular data being rendered to a separate "
+"buffer and combined after effects have been applied, only applicable for the "
+"Forward+ renderer."
+msgstr ""
+"Если [code]true[/code], это запускает рендеринг зеркальных данных в отдельный "
+"буфер и их объединение после применения эффектов, применимо только для "
+"рендерера Forward+."
+
+msgid ""
+"The callback is called before our opaque rendering pass, but after depth "
+"prepass (if applicable)."
+msgstr ""
+"Обратный вызов выполняется перед нашим проходом рендеринга непрозрачности, но "
+"после предварительного прохода глубины (если применимо)."
+
+msgid ""
+"The callback is called after our opaque rendering pass, but before our sky is "
+"rendered."
+msgstr ""
+"Обратный вызов выполняется после прохода рендеринга непрозрачности, но до "
+"рендеринга неба."
+
+msgid ""
+"The callback is called after our sky is rendered, but before our back buffers "
+"are created (and if enabled, before subsurface scattering and/or screen space "
+"reflections)."
+msgstr ""
+"Обратный вызов вызывается после того, как наше небо отрисовано, но до "
+"создания наших обратных буферов (и, если они включены, до подповерхностного "
+"рассеивания и/или отражений в пространстве экрана)."
+
+msgid ""
+"The callback is called before our transparent rendering pass, but after our "
+"sky is rendered and we've created our back buffers."
+msgstr ""
+"Обратный вызов выполняется до прохода прозрачного рендеринга, но после того, "
+"как небо отрисовано и мы создали обратные буферы."
+
+msgid ""
+"The callback is called after our transparent rendering pass, but before any "
+"built-in post-processing effects and output to our render target."
+msgstr ""
+"Обратный вызов выполняется после прохода прозрачного рендеринга, но до любых "
+"встроенных эффектов постобработки и вывода на нашу цель рендеринга."
+
+msgid "Represents the size of the [enum EffectCallbackType] enum."
+msgstr "Представляет размер перечисления [enum EffectCallbackType]."
+
+msgid "An optionally compressed [Cubemap]."
+msgstr "Опционально сжатая [Cubemap]."
+
+msgid ""
+"A cubemap that is loaded from a [code].ccube[/code] file. This file format is "
+"internal to Godot; it is created by importing other image formats with the "
+"import system. [CompressedCubemap] can use one of 4 compression methods:\n"
+"- Lossless (WebP or PNG, uncompressed on the GPU)\n"
+"- Lossy (WebP, uncompressed on the GPU)\n"
+"- VRAM Compressed (compressed on the GPU)\n"
+"- VRAM Uncompressed (uncompressed on the GPU)\n"
+"- Basis Universal (compressed on the GPU. Lower file sizes than VRAM "
+"Compressed, but slower to compress and lower quality than VRAM Compressed)\n"
+"Only [b]VRAM Compressed[/b] actually reduces the memory usage on the GPU. The "
+"[b]Lossless[/b] and [b]Lossy[/b] compression methods will reduce the required "
+"storage on disk, but they will not reduce memory usage on the GPU as the "
+"texture is sent to the GPU uncompressed.\n"
+"Using [b]VRAM Compressed[/b] also improves loading times, as VRAM-compressed "
+"textures are faster to load compared to textures using lossless or lossy "
+"compression. VRAM compression can exhibit noticeable artifacts and is "
+"intended to be used for 3D rendering, not 2D.\n"
+"See [Cubemap] for a general description of cubemaps."
+msgstr ""
+"Кубическая карта, загруженная из файла [code].ccube[/code]. Этот формат файла "
+"является внутренним для Godot; он создается путем импорта других форматов "
+"изображений с помощью системы импорта. [CompressedCubemap] может использовать "
+"один из 4 методов сжатия:\n"
+"-Lossless (WebP или PNG, несжатый на GPU)\n"
+"- Lossy (WebP, несжатый на GPU)\n"
+"- VRAM Compressed (сжато на GPU)\n"
+"- VRAM Uncompressed (несжато на GPU)\n"
+"-Basis Universal (сжато на GPU. Меньшие размеры файлов, чем VRAM Compressed, "
+"но сжимается медленнее и качество ниже, чем VRAM Compressed)\n"
+"Только [b]VRAM Compressed[/b] на самом деле уменьшает использование памяти на "
+"GPU. Методы сжатия [b]Lossless[/b] и [b]Lossy[/b] уменьшат требуемое "
+"хранилище на диске, но они не уменьшат использование памяти на GPU, поскольку "
+"текстура отправляется на GPU в несжатом виде.\n"
+"Использование [b]VRAM Compressed[/b] также сокращает время загрузки, "
+"поскольку текстуры, сжатые VRAM, загружаются быстрее по сравнению с "
+"текстурами, использующими сжатие без потерь или с потерями. Сжатие VRAM может "
+"вызывать заметные артефакты и предназначено для использования в 3D-"
+"рендеринге, а не в 2D.\n"
+"Общее описание кубических карт см. в разделе [Cubemap]."
+
+msgid "An optionally compressed [CubemapArray]."
+msgstr "Необязательно сжатый [CubemapArray]."
+
+msgid ""
+"A cubemap array that is loaded from a [code].ccubearray[/code] file. This "
+"file format is internal to Godot; it is created by importing other image "
+"formats with the import system. [CompressedCubemapArray] can use one of 4 "
+"compression methods:\n"
+"- Lossless (WebP or PNG, uncompressed on the GPU)\n"
+"- Lossy (WebP, uncompressed on the GPU)\n"
+"- VRAM Compressed (compressed on the GPU)\n"
+"- VRAM Uncompressed (uncompressed on the GPU)\n"
+"- Basis Universal (compressed on the GPU. Lower file sizes than VRAM "
+"Compressed, but slower to compress and lower quality than VRAM Compressed)\n"
+"Only [b]VRAM Compressed[/b] actually reduces the memory usage on the GPU. The "
+"[b]Lossless[/b] and [b]Lossy[/b] compression methods will reduce the required "
+"storage on disk, but they will not reduce memory usage on the GPU as the "
+"texture is sent to the GPU uncompressed.\n"
+"Using [b]VRAM Compressed[/b] also improves loading times, as VRAM-compressed "
+"textures are faster to load compared to textures using lossless or lossy "
+"compression. VRAM compression can exhibit noticeable artifacts and is "
+"intended to be used for 3D rendering, not 2D.\n"
+"See [CubemapArray] for a general description of cubemap arrays."
+msgstr ""
+"Массив кубических карт, загруженный из файла [code].ccubearray[/code]. Этот "
+"формат файла является внутренним для Godot; он создается путем импорта других "
+"форматов изображений с помощью системы импорта. [CompressedCubemapArray] "
+"может использовать один из 4 методов сжатия:\n"
+"- Lossless (WebP или PNG, несжатый на GPU)\n"
+"- Lossy (WebP, несжатый на GPU)\n"
+"- VRAM Compressed (сжатый на GPU)\n"
+"- VRAM Uncompressed (несжатый на GPU)\n"
+"- Basis Universal (сжато на GPU. Меньшие размеры файлов, чем VRAM Compressed, "
+"но сжимается медленнее и качество ниже, чем VRAM Compressed)\n"
+"Только [b]VRAM Compressed[/b] на самом деле уменьшает использование памяти на "
+"GPU. Методы сжатия [b]Lossless[/b] и [b]Lossy[/b] уменьшат требуемое "
+"хранилище на диске, но они не уменьшат использование памяти на GPU, поскольку "
+"текстура отправляется на GPU в несжатом виде.\n"
+"Использование [b]VRAM Compressed[/b] также сокращает время загрузки, "
+"поскольку текстуры, сжатые VRAM, загружаются быстрее по сравнению с "
+"текстурами, использующими сжатие без потерь или с потерями. Сжатие VRAM может "
+"вызывать заметные артефакты и предназначено для использования в 3D-"
+"рендеринге, а не в 2D.\n"
+"Общее описание массивов кубических карт см. в [CubemapArray]."
+
+msgid "Texture with 2 dimensions, optionally compressed."
+msgstr "Текстура с 2 измерениями, опционально сжатая."
+
+msgid ""
+"A texture that is loaded from a [code].ctex[/code] file. This file format is "
+"internal to Godot; it is created by importing other image formats with the "
+"import system. [CompressedTexture2D] can use one of 4 compression methods "
+"(including a lack of any compression):\n"
+"- Lossless (WebP or PNG, uncompressed on the GPU)\n"
+"- Lossy (WebP, uncompressed on the GPU)\n"
+"- VRAM Compressed (compressed on the GPU)\n"
+"- VRAM Uncompressed (uncompressed on the GPU)\n"
+"- Basis Universal (compressed on the GPU. Lower file sizes than VRAM "
+"Compressed, but slower to compress and lower quality than VRAM Compressed)\n"
+"Only [b]VRAM Compressed[/b] actually reduces the memory usage on the GPU. The "
+"[b]Lossless[/b] and [b]Lossy[/b] compression methods will reduce the required "
+"storage on disk, but they will not reduce memory usage on the GPU as the "
+"texture is sent to the GPU uncompressed.\n"
+"Using [b]VRAM Compressed[/b] also improves loading times, as VRAM-compressed "
+"textures are faster to load compared to textures using lossless or lossy "
+"compression. VRAM compression can exhibit noticeable artifacts and is "
+"intended to be used for 3D rendering, not 2D."
+msgstr ""
+"Текстура, загружаемая из файла [code].ctex[/code]. Этот формат файла является "
+"внутренним для Godot; он создается путем импорта других форматов изображений "
+"с помощью системы импорта. [CompressedTexture2D] может использовать один из 4 "
+"методов сжатия (включая отсутствие какого-либо сжатия):\n"
+"- Lossless (WebP or PNG, uncompressed on the GPU)\n"
+"- Lossy (WebP, несжатый на GPU)\n"
+"- VRAM Compressed (сжатый на GPU)\n"
+"- VRAM Uncompressed (сжатый на GPU)\n"
+"- Basis Universal (сжатый на GPU. Меньшие размеры файлов, чем VRAM "
+"Compressed, но медленнее сжимается и имеет более низкое качество, чем VRAM "
+"Compressed)\n"
+"Только [b]VRAM Compressed[/b] на самом деле уменьшает использование памяти на "
+"GPU. Методы сжатия [b]Lossless[/b] и [b]Lossy[/b] уменьшат требуемое "
+"хранилище на диске, но они не уменьшат использование памяти на GPU, поскольку "
+"текстура отправляется на GPU в несжатом виде.\n"
+"Использование [b]VRAM Compressed[/b] также сокращает время загрузки, "
+"поскольку текстуры, сжатые VRAM, загружаются быстрее по сравнению с "
+"текстурами, использующими сжатие без потерь или с потерями. Сжатие VRAM может "
+"демонстрировать заметные артефакты и предназначено для использования при 3D-"
+"рендеринге, а не 2D."
+
+msgid "Loads the texture from the specified [param path]."
+msgstr "Загружает текстуру из указанного [param path]."
+
+msgid "Array of 2-dimensional textures, optionally compressed."
+msgstr "Массив двумерных текстур, опционально сжатых."
+
+msgid ""
+"A texture array that is loaded from a [code].ctexarray[/code] file. This file "
+"format is internal to Godot; it is created by importing other image formats "
+"with the import system. [CompressedTexture2DArray] can use one of 4 "
+"compression methods:\n"
+"- Lossless (WebP or PNG, uncompressed on the GPU)\n"
+"- Lossy (WebP, uncompressed on the GPU)\n"
+"- VRAM Compressed (compressed on the GPU)\n"
+"- VRAM Uncompressed (uncompressed on the GPU)\n"
+"- Basis Universal (compressed on the GPU. Lower file sizes than VRAM "
+"Compressed, but slower to compress and lower quality than VRAM Compressed)\n"
+"Only [b]VRAM Compressed[/b] actually reduces the memory usage on the GPU. The "
+"[b]Lossless[/b] and [b]Lossy[/b] compression methods will reduce the required "
+"storage on disk, but they will not reduce memory usage on the GPU as the "
+"texture is sent to the GPU uncompressed.\n"
+"Using [b]VRAM Compressed[/b] also improves loading times, as VRAM-compressed "
+"textures are faster to load compared to textures using lossless or lossy "
+"compression. VRAM compression can exhibit noticeable artifacts and is "
+"intended to be used for 3D rendering, not 2D.\n"
+"See [Texture2DArray] for a general description of texture arrays."
+msgstr ""
+"Массив текстур, загружаемый из файла [code].ctexarray[/code]. Этот формат "
+"файла является внутренним для Godot; он создается путем импорта других "
+"форматов изображений с помощью системы импорта. [CompressedTexture2DArray] "
+"может использовать один из 4 методов сжатия:\n"
+"-Lossless (WebP или PNG, несжатые на GPU)\n"
+"- Lossy (WebP, несжатые на GPU)\n"
+"- VRAM Compressed (сжатые на GPU)\n"
+"- VRAM Uncompressed (сжатые на GPU)\n"
+"- Basis Universal (сжатые на GPU. Меньшие размеры файлов, чем VRAM "
+"Compressed, но медленнее сжимаются и качество ниже, чем VRAM Compressed)\n"
+"Только [b]VRAM Compressed[/b] на самом деле уменьшает использование памяти на "
+"GPU. Методы сжатия [b]Lossless[/b] и [b]Lossy[/b] уменьшат требуемое "
+"хранилище на диске, но они не уменьшат использование памяти на GPU, поскольку "
+"текстура отправляется на GPU несжатой.\n"
+"Использование [b]VRAM Compressed[/b] также сокращает время загрузки, "
+"поскольку текстуры, сжатые VRAM, загружаются быстрее по сравнению с "
+"текстурами, использующими сжатие без потерь или с потерями. Сжатие VRAM может "
+"демонстрировать заметные артефакты и предназначено для использования для 3D-"
+"рендеринга, а не 2D.\n"
+"Общее описание массивов текстур см. в [Texture2DArray]."
+
+msgid "Texture with 3 dimensions, optionally compressed."
+msgstr "Текстура с 3 измерениями, опционально сжатая."
+
+msgid ""
+"[CompressedTexture3D] is the VRAM-compressed counterpart of [ImageTexture3D]. "
+"The file extension for [CompressedTexture3D] files is [code].ctex3d[/code]. "
+"This file format is internal to Godot; it is created by importing other image "
+"formats with the import system.\n"
+"[CompressedTexture3D] uses VRAM compression, which allows to reduce memory "
+"usage on the GPU when rendering the texture. This also improves loading "
+"times, as VRAM-compressed textures are faster to load compared to textures "
+"using lossless compression. VRAM compression can exhibit noticeable artifacts "
+"and is intended to be used for 3D rendering, not 2D.\n"
+"See [Texture3D] for a general description of 3D textures."
+msgstr ""
+"[CompressedTexture3D] — это сжатый VRAM аналог [ImageTexture3D]. Расширение "
+"файла для файлов [CompressedTexture3D] — [code].ctex3d[/code]. Этот формат "
+"файла является внутренним для Godot; он создается путем импорта других "
+"форматов изображений с помощью системы импорта.\n"
+"[CompressedTexture3D] использует сжатие VRAM, что позволяет сократить "
+"использование памяти на GPU при рендеринге текстуры. Это также сокращает "
+"время загрузки, поскольку текстуры, сжатые VRAM, загружаются быстрее по "
+"сравнению с текстурами, использующими сжатие без потерь. Сжатие VRAM может "
+"демонстрировать заметные артефакты и предназначено для использования при 3D-"
+"рендеринге, а не 2D.\n"
+"См. [Texture3D] для общего описания 3D-текстур."
+
+msgid "The [CompressedTexture3D]'s file path to a [code].ctex3d[/code] file."
+msgstr "Путь к файлу [CompressedTexture3D] к файлу [code].ctex3d[/code]."
+
+msgid "Base class for texture arrays that can optionally be compressed."
+msgstr ""
+"Базовый класс для массивов текстур, которые при необходимости можно сжать."
+
+msgid ""
+"Base class for [CompressedTexture2DArray] and [CompressedTexture3D]. Cannot "
+"be used directly, but contains all the functions necessary for accessing the "
+"derived resource types. See also [TextureLayered]."
+msgstr ""
+"Базовый класс для [CompressedTexture2DArray] и [CompressedTexture3D]. Не "
+"может использоваться напрямую, но содержит все функции, необходимые для "
+"доступа к производным типам ресурсов. См. также [TextureLayered]."
+
+msgid "Loads the texture at [param path]."
+msgstr "Загружает текстуру по адресу [param path]."
+
+msgid "The path the texture should be loaded from."
+msgstr "Путь, по которому должна быть загружена текстура."
+
+msgid "A 2D polyline shape used for physics collision."
+msgstr "Двумерная полилиния, используемая для физического столкновения."
+
+msgid ""
+"A 2D polyline shape, intended for use in physics. Used internally in "
+"[CollisionPolygon2D] when it's in [constant CollisionPolygon2D."
+"BUILD_SEGMENTS] mode.\n"
+"Being just a collection of interconnected line segments, "
+"[ConcavePolygonShape2D] is the most freely configurable single 2D shape. It "
+"can be used to form polygons of any nature, or even shapes that don't enclose "
+"an area. However, [ConcavePolygonShape2D] is [i]hollow[/i] even if the "
+"interconnected line segments do enclose an area, which often makes it "
+"unsuitable for physics or detection.\n"
+"[b]Note:[/b] When used for collision, [ConcavePolygonShape2D] is intended to "
+"work with static [CollisionShape2D] nodes like [StaticBody2D] and will likely "
+"not behave well for [CharacterBody2D]s or [RigidBody2D]s in a mode other than "
+"Static.\n"
+"[b]Warning:[/b] Physics bodies that are small have a chance to clip through "
+"this shape when moving fast. This happens because on one frame, the physics "
+"body may be on the \"outside\" of the shape, and on the next frame it may be "
+"\"inside\" it. [ConcavePolygonShape2D] is hollow, so it won't detect a "
+"collision.\n"
+"[b]Performance:[/b] Due to its complexity, [ConcavePolygonShape2D] is the "
+"slowest 2D collision shape to check collisions against. Its use should "
+"generally be limited to level geometry. If the polyline is closed, "
+"[CollisionPolygon2D]'s [constant CollisionPolygon2D.BUILD_SOLIDS] mode can be "
+"used, which decomposes the polygon into convex ones; see "
+"[ConvexPolygonShape2D]'s documentation for instructions."
+msgstr ""
+"Форма 2D-полилинии, предназначенная для использования в физике. Используется "
+"внутри [CollisionPolygon2D], когда он находится в режиме [constant "
+"CollisionPolygon2D.BUILD_SEGMENTS].\n"
+"Будучи просто набором взаимосвязанных сегментов линий, "
+"[ConcavePolygonShape2D] является наиболее свободно настраиваемой отдельной 2D-"
+"формой. Ее можно использовать для формирования полигонов любой природы или "
+"даже форм, которые не охватывают область. Однако [ConcavePolygonShape2D] "
+"является [i]полой[/i], даже если взаимосвязанные сегменты линий охватывают "
+"область, что часто делает ее непригодной для физики или обнаружения.\n"
+"[b]Примечание:[/b] При использовании для столкновений [ConcavePolygonShape2D] "
+"предназначен для работы со статическими узлами [CollisionShape2D], такими как "
+"[StaticBody2D], и, скорее всего, не будет хорошо себя вести для "
+"[CharacterBody2D] или [RigidBody2D] в режиме, отличном от Static.\n"
+"[b]Предупреждение:[/b] Физические тела, которые имеют небольшой размер, имеют "
+"шанс прорезать эту форму при быстром движении. Это происходит, потому что в "
+"одном кадре физическое тело может находиться «снаружи» формы, а в следующем "
+"кадре оно может оказаться «внутри» нее. [ConcavePolygonShape2D] является "
+"полым, поэтому он не обнаружит столкновение.\n"
+"[b]Производительность:[/b] Из-за своей сложности [ConcavePolygonShape2D] "
+"является самой медленной двумерной формой столкновения для проверки "
+"столкновений. Его использование, как правило, должно быть ограничено "
+"геометрией уровня. Если полилиния замкнута, можно использовать режим "
+"[constant CollisionPolygon2D.BUILD_SOLIDS] [CollisionPolygon2D], который "
+"разбивает многоугольник на выпуклые; инструкции см. в документации "
+"[ConvexPolygonShape2D]."
+
+msgid ""
+"The array of points that make up the [ConcavePolygonShape2D]'s line segments. "
+"The array (of length divisible by two) is naturally divided into pairs (one "
+"pair for each segment); each pair consists of the starting point of a segment "
+"and the endpoint of a segment."
+msgstr ""
+"Массив точек, которые составляют сегменты линии [ConcavePolygonShape2D]. "
+"Массив (длины, делящейся на два) естественным образом делится на пары (по "
+"одной паре на каждый сегмент); каждая пара состоит из начальной точки "
+"сегмента и конечной точки сегмента."
+
+msgid "A 3D trimesh shape used for physics collision."
+msgstr "Трехмерная сетка, используемая для физики столкновений."
+
+msgid ""
+"A 3D trimesh shape, intended for use in physics. Usually used to provide a "
+"shape for a [CollisionShape3D].\n"
+"Being just a collection of interconnected triangles, [ConcavePolygonShape3D] "
+"is the most freely configurable single 3D shape. It can be used to form "
+"polyhedra of any nature, or even shapes that don't enclose a volume. However, "
+"[ConcavePolygonShape3D] is [i]hollow[/i] even if the interconnected triangles "
+"do enclose a volume, which often makes it unsuitable for physics or "
+"detection.\n"
+"[b]Note:[/b] When used for collision, [ConcavePolygonShape3D] is intended to "
+"work with static [CollisionShape3D] nodes like [StaticBody3D] and will likely "
+"not behave well for [CharacterBody3D]s or [RigidBody3D]s in a mode other than "
+"Static.\n"
+"[b]Warning:[/b] Physics bodies that are small have a chance to clip through "
+"this shape when moving fast. This happens because on one frame, the physics "
+"body may be on the \"outside\" of the shape, and on the next frame it may be "
+"\"inside\" it. [ConcavePolygonShape3D] is hollow, so it won't detect a "
+"collision.\n"
+"[b]Performance:[/b] Due to its complexity, [ConcavePolygonShape3D] is the "
+"slowest 3D collision shape to check collisions against. Its use should "
+"generally be limited to level geometry. For convex geometry, "
+"[ConvexPolygonShape3D] should be used. For dynamic physics bodies that need "
+"concave collision, several [ConvexPolygonShape3D]s can be used to represent "
+"its collision by using convex decomposition; see [ConvexPolygonShape3D]'s "
+"documentation for instructions."
+msgstr ""
+"Трехмерная тримеш-форма, предназначенная для использования в физике. Обычно "
+"используется для предоставления формы для [CollisionShape3D].\n"
+"Будучи просто набором взаимосвязанных треугольников, [ConcavePolygonShape3D] "
+"является наиболее свободно настраиваемой отдельной трехмерной формой. Ее "
+"можно использовать для формирования многогранников любой природы или даже "
+"форм, которые не охватывают объем. Однако [ConcavePolygonShape3D] является "
+"[i]полой[/i], даже если взаимосвязанные треугольники охватывают объем, что "
+"часто делает ее непригодной для физики или обнаружения.\n"
+"[b]Примечание:[/b] При использовании для столкновений [ConcavePolygonShape3D] "
+"предназначен для работы со статическими узлами [CollisionShape3D], такими как "
+"[StaticBody3D], и, скорее всего, не будет хорошо себя вести для "
+"[CharacterBody3D] или [RigidBody3D] в режиме, отличном от Static.\n"
+"[b]Предупреждение:[/b] Физические тела небольшого размера имеют шанс пройти "
+"сквозь эту форму при быстром движении. Это происходит, потому что в одном "
+"кадре физическое тело может находиться «снаружи» формы, а в следующем кадре — "
+"«внутри» нее. [ConcavePolygonShape3D] — полый, поэтому он не обнаружит "
+"столкновение.\n"
+"[b]Производительность:[/b] Из-за своей сложности [ConcavePolygonShape3D] "
+"является самой медленной 3D-формой столкновений для проверки столкновений. Ее "
+"использование, как правило, должно быть ограничено геометрией уровня. Для "
+"выпуклой геометрии следует использовать [ConvexPolygonShape3D]. Для "
+"динамических физических тел, которым требуется вогнутое столкновение, можно "
+"использовать несколько [ConvexPolygonShape3D] для представления его "
+"столкновения с помощью выпуклого разложения; см. документацию "
+"[ConvexPolygonShape3D] для получения инструкций."
+
+msgid ""
+"Returns the faces of the trimesh shape as an array of vertices. The array (of "
+"length divisible by three) is naturally divided into triples; each triple of "
+"vertices defines a triangle."
+msgstr ""
+"Возвращает грани формы тримеша как массив вершин. Массив (длины, делящейся на "
+"три) естественным образом делится на тройки; каждая тройка вершин определяет "
+"треугольник."
+
+msgid ""
+"Sets the faces of the trimesh shape from an array of vertices. The [param "
+"faces] array should be composed of triples such that each triple of vertices "
+"defines a triangle."
+msgstr ""
+"Устанавливает грани формы тримеша (trimesh) из массива вершин. Массив [param "
+"faces] должен состоять из троек таким образом, чтобы каждая тройка вершин "
+"определяла треугольник."
+
+msgid ""
+"If set to [code]true[/code], collisions occur on both sides of the concave "
+"shape faces. Otherwise they occur only along the face normals."
+msgstr ""
+"Если установлено значение [code]true[/code], столкновения происходят по обе "
+"стороны граней вогнутой формы. В противном случае они происходят только вдоль "
+"нормалей граней."
+
+msgid ""
+"A physics joint that connects two 3D physics bodies in a way that simulates a "
+"ball-and-socket joint."
+msgstr ""
+"Физический шарнир, соединяющий два трехмерных физических тела таким образом, "
+"что он имитирует шаровой шарнир."
+
+msgid ""
+"A physics joint that connects two 3D physics bodies in a way that simulates a "
+"ball-and-socket joint. The twist axis is initiated as the X axis of the "
+"[ConeTwistJoint3D]. Once the physics bodies swing, the twist axis is "
+"calculated as the middle of the X axes of the joint in the local space of the "
+"two physics bodies. Useful for limbs like shoulders and hips, lamps hanging "
+"off a ceiling, etc."
+msgstr ""
+"Физический сустав, который соединяет два 3D физических тела таким образом, "
+"что имитирует шаровой шарнир. Ось скручивания инициируется как ось X "
+"[ConeTwistJoint3D]. После того, как физические тела качаются, ось скручивания "
+"вычисляется как середина осей X сустава в локальном пространстве двух "
+"физических тел. Полезно для конечностей, таких как плечи и бедра, ламп, "
+"свисающих с потолка и т. д."
+
+msgid "Returns the value of the specified parameter."
+msgstr "Возвращает значение указанного параметра."
+
+msgid "Sets the value of the specified parameter."
+msgstr "Устанавливает значение указанного параметра."
+
+msgid ""
+"The speed with which the swing or twist will take place.\n"
+"The higher, the faster."
+msgstr ""
+"Скорость, с которой будет происходить взмах или поворот.\n"
+"Чем выше, тем быстрее."
+
+msgid ""
+"Defines, how fast the swing- and twist-speed-difference on both sides gets "
+"synced."
+msgstr ""
+"Определяет, насколько быстро синхронизируется разница в скорости замаха и "
+"поворота с обеих сторон."
+
+msgid ""
+"The ease with which the joint starts to twist. If it's too low, it takes more "
+"force to start twisting the joint."
+msgstr ""
+"Легкость, с которой сустав начинает скручиваться. Если она слишком низкая, "
+"требуется больше силы, чтобы начать скручивать сустав."
+
+msgid ""
+"Swing is rotation from side to side, around the axis perpendicular to the "
+"twist axis.\n"
+"The swing span defines, how much rotation will not get corrected along the "
+"swing axis.\n"
+"Could be defined as looseness in the [ConeTwistJoint3D].\n"
+"If below 0.05, this behavior is locked."
+msgstr ""
+"Качание — это вращение из стороны в сторону вокруг оси, перпендикулярной оси "
+"скручивания.\n"
+"Размах качания определяет, насколько вращение не будет исправлено вдоль оси "
+"качания.\n"
+"Может быть определено как ослабление в [ConeTwistJoint3D].\n"
+"Если ниже 0,05, это поведение заблокировано."
+
+msgid ""
+"Twist is the rotation around the twist axis, this value defined how far the "
+"joint can twist.\n"
+"Twist is locked if below 0.05."
+msgstr ""
+"Скручивание — это вращение вокруг оси скручивания, это значение определяет, "
+"насколько далеко может скручиваться соединение. \n"
+"Скручивание блокируется, если ниже 0,05."
+
+msgid "Represents the size of the [enum Param] enum."
+msgstr "Представляет размер перечисления [enum Param]."
+
+msgid "Helper class to handle INI-style files."
+msgstr "Вспомогательный класс для обработки файлов в стиле INI."
+
+msgid ""
+"This helper class can be used to store [Variant] values on the filesystem "
+"using INI-style formatting. The stored values are identified by a section and "
+"a key:\n"
+"[codeblock lang=text]\n"
+"[section]\n"
+"some_key=42\n"
+"string_example=\"Hello World3D!\"\n"
+"a_vector=Vector3(1, 0, 2)\n"
+"[/codeblock]\n"
+"The stored data can be saved to or parsed from a file, though ConfigFile "
+"objects can also be used directly without accessing the filesystem.\n"
+"The following example shows how to create a simple [ConfigFile] and save it "
+"on disc:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Create new ConfigFile object.\n"
+"var config = ConfigFile.new()\n"
+"\n"
+"# Store some values.\n"
+"config.set_value(\"Player1\", \"player_name\", \"Steve\")\n"
+"config.set_value(\"Player1\", \"best_score\", 10)\n"
+"config.set_value(\"Player2\", \"player_name\", \"V3geta\")\n"
+"config.set_value(\"Player2\", \"best_score\", 9001)\n"
+"\n"
+"# Save it to a file (overwrite if already exists).\n"
+"config.save(\"user://scores.cfg\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Create new ConfigFile object.\n"
+"var config = new ConfigFile();\n"
+"\n"
+"// Store some values.\n"
+"config.SetValue(\"Player1\", \"player_name\", \"Steve\");\n"
+"config.SetValue(\"Player1\", \"best_score\", 10);\n"
+"config.SetValue(\"Player2\", \"player_name\", \"V3geta\");\n"
+"config.SetValue(\"Player2\", \"best_score\", 9001);\n"
+"\n"
+"// Save it to a file (overwrite if already exists).\n"
+"config.Save(\"user://scores.cfg\");\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"This example shows how the above file could be loaded:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var score_data = {}\n"
+"var config = ConfigFile.new()\n"
+"\n"
+"# Load data from a file.\n"
+"var err = config.load(\"user://scores.cfg\")\n"
+"\n"
+"# If the file didn't load, ignore it.\n"
+"if err != OK:\n"
+"    return\n"
+"\n"
+"# Iterate over all sections.\n"
+"for player in config.get_sections():\n"
+"    # Fetch the data for each section.\n"
+"    var player_name = config.get_value(player, \"player_name\")\n"
+"    var player_score = config.get_value(player, \"best_score\")\n"
+"    score_data[player_name] = player_score\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var score_data = new Godot.Collections.Dictionary();\n"
+"var config = new ConfigFile();\n"
+"\n"
+"// Load data from a file.\n"
+"Error err = config.Load(\"user://scores.cfg\");\n"
+"\n"
+"// If the file didn't load, ignore it.\n"
+"if (err != Error.Ok)\n"
+"{\n"
+"    return;\n"
+"}\n"
+"\n"
+"// Iterate over all sections.\n"
+"foreach (String player in config.GetSections())\n"
+"{\n"
+"    // Fetch the data for each section.\n"
+"    var player_name = (String)config.GetValue(player, \"player_name\");\n"
+"    var player_score = (int)config.GetValue(player, \"best_score\");\n"
+"    score_data[player_name] = player_score;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Any operation that mutates the ConfigFile such as [method set_value], [method "
+"clear], or [method erase_section], only changes what is loaded in memory. If "
+"you want to write the change to a file, you have to save the changes with "
+"[method save], [method save_encrypted], or [method save_encrypted_pass].\n"
+"Keep in mind that section and property names can't contain spaces. Anything "
+"after a space will be ignored on save and on load.\n"
+"ConfigFiles can also contain manually written comment lines starting with a "
+"semicolon ([code];[/code]). Those lines will be ignored when parsing the "
+"file. Note that comments will be lost when saving the ConfigFile. This can "
+"still be useful for dedicated server configuration files, which are typically "
+"never overwritten without explicit user action.\n"
+"[b]Note:[/b] The file extension given to a ConfigFile does not have any "
+"impact on its formatting or behavior. By convention, the [code].cfg[/code] "
+"extension is used here, but any other extension such as [code].ini[/code] is "
+"also valid. Since neither [code].cfg[/code] nor [code].ini[/code] are "
+"standardized, Godot's ConfigFile formatting may differ from files written by "
+"other programs."
+msgstr ""
+"Этот вспомогательный класс может использоваться для хранения значений "
+"[Variant] в файловой системе с использованием форматирования в стиле INI. "
+"Сохраненные значения идентифицируются разделом и ключом:\n"
+"[codeblock lang=text]\n"
+"[section]\n"
+"some_key=42\n"
+"string_example=\"Hello World3D!\"\n"
+"a_vector=Vector3(1, 0, 2)\n"
+"[/codeblock]\n"
+"Сохраненные данные можно сохранить в файл или проанализировать из него, хотя "
+"объекты ConfigFile также можно использовать напрямую, без доступа к файловой "
+"системе.\n"
+"В следующем примере показано, как создать простой [ConfigFile] и сохранить "
+"его на диске:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Создайте новый объект ConfigFile.\n"
+"var config = ConfigFile.new()\n"
+"\n"
+"# Сохраните некоторые значения.\n"
+"config.set_value(\"Player1\", \"player_name\", \"Steve\")\n"
+"config.set_value(\"Player1\", \"best_score\", 10)\n"
+"config.set_value(\"Player2\", \"player_name\", \"V3geta\")\n"
+"config.set_value(\"Player2\", \"best_score\", 9001)\n"
+"\n"
+"# Сохраните его в файле (перезапишите, если он уже существует).\n"
+"config.save(\"user://scores.cfg\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Создайте новый объект ConfigFile.\n"
+"var config = new ConfigFile();\n"
+"\n"
+"// Сохраните некоторые значения.\n"
+"config.SetValue(\"Player1\", \"player_name\", \"Steve\");\n"
+"config.SetValue(\"Player1\", \"best_score\", 10);\n"
+"config.SetValue(\"Player2\", \"player_name\", \"V3geta\");\n"
+"config.SetValue(\"Player2\", \"best_score\", 9001);\n"
+"\n"
+"// Сохраните его в файле (перезапишите, если он уже существует).\n"
+"config.Save(\"user://scores.cfg\");\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"В этом примере показано, как можно загрузить указанный выше файл:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var score_data = {}\n"
+"var config = ConfigFile.new()\n"
+"\n"
+"# Загрузить данные из файла.\n"
+"var err = config.load(\"user://scores.cfg\")\n"
+"\n"
+"# Если файл не загрузился, игнорируйте его.\n"
+"if err != OK:\n"
+"    return\n"
+"\n"
+"# Повторите все разделы.\n"
+"for player in config.get_sections():\n"
+"    # Получите данные для каждого раздела.\n"
+"    var player_name = config.get_value(player, \"player_name\")\n"
+"    var player_score = config.get_value(player, \"best_score\")\n"
+"    score_data[player_name] = player_score\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var score_data = new Godot.Collections.Dictionary();\n"
+"var config = new ConfigFile();\n"
+"\n"
+"// Загрузить данные из файла.\n"
+"Error err = config.Load(\"user://scores.cfg\");\n"
+"\n"
+"// Если файл не загрузился, игнорируйте его.\n"
+"if (err != Error.Ok)\n"
+"{\n"
+"    return;\n"
+"}\n"
+"\n"
+"// Повторите все разделы.\n"
+"foreach (String player in config.GetSections())\n"
+"{\n"
+"    // Получите данные для каждого раздела.\n"
+"    var player_name = (String)config.GetValue(player, \"player_name\");\n"
+"    var player_score = (int)config.GetValue(player, \"best_score\");\n"
+"    score_data[player_name] = player_score;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Любая операция, которая изменяет ConfigFile, например [method set_value], "
+"[method clear] или [method erasure_section], изменяет только то, что "
+"загружено в память. Если вы хотите записать изменение в файл, вам нужно "
+"сохранить изменения с помощью [method save], [method save_encrypted] или "
+"[method save_encrypted_pass].\n"
+"Помните, что имена разделов и свойств не могут содержать пробелы. Все, что "
+"находится после пробела, будет проигнорировано при сохранении и загрузке.\n"
+"Файлы конфигурации также могут содержать вручную написанные строки "
+"комментариев, начинающиеся с точки с запятой ([code];[/code]). Эти строки "
+"будут проигнорированы при разборе файла. Обратите внимание, что комментарии "
+"будут потеряны при сохранении файла конфигурации. Это может быть полезно для "
+"выделенных файлов конфигурации сервера, которые обычно никогда не "
+"перезаписываются без явного действия пользователя.\n"
+"[b]Примечание:[/b] Расширение файла, присвоенное ConfigFile, не влияет на его "
+"форматирование или поведение. По соглашению здесь используется расширение "
+"[code].cfg[/code], но любое другое расширение, например [code].ini[/code], "
+"также допустимо. Поскольку ни [code].cfg[/code], ни [code].ini[/code] не "
+"стандартизированы, форматирование ConfigFile Godot может отличаться от "
+"файлов, написанных другими программами."
+
+msgid "Removes the entire contents of the config."
+msgstr "Удаляет все содержимое конфигурации."
+
+msgid ""
+"Obtain the text version of this config file (the same text that would be "
+"written to a file)."
+msgstr ""
+"Получите текстовую версию этого файла конфигурации (тот же текст, который "
+"будет записан в файл)."
+
+msgid ""
+"Deletes the specified section along with all the key-value pairs inside. "
+"Raises an error if the section does not exist."
+msgstr ""
+"Удаляет указанный раздел вместе со всеми парами ключ-значение внутри. Выдает "
+"ошибку, если раздел не существует."
+
+msgid ""
+"Deletes the specified key in a section. Raises an error if either the section "
+"or the key do not exist."
+msgstr ""
+"Удаляет указанный ключ в разделе. Выдает ошибку, если раздел или ключ не "
+"существуют."
+
+msgid ""
+"Returns an array of all defined key identifiers in the specified section. "
+"Raises an error and returns an empty array if the section does not exist."
+msgstr ""
+"Возвращает массив всех определенных идентификаторов ключей в указанном "
+"разделе. Вызывает ошибку и возвращает пустой массив, если раздел не "
+"существует."
+
+msgid "Returns an array of all defined section identifiers."
+msgstr "Возвращает массив всех определенных идентификаторов разделов."
+
+msgid ""
+"Returns the current value for the specified section and key. If either the "
+"section or the key do not exist, the method returns the fallback [param "
+"default] value. If [param default] is not specified or set to [code]null[/"
+"code], an error is also raised."
+msgstr ""
+"Возвращает текущее значение для указанного раздела и ключа. Если раздел или "
+"ключ не существуют, метод возвращает резервное значение [param default]. Если "
+"[param default] не указан или установлен в [code]null[/code], также возникает "
+"ошибка."
+
+msgid "Returns [code]true[/code] if the specified section exists."
+msgstr "Возвращает [code]true[/code], если указанный раздел существует."
+
+msgid "Returns [code]true[/code] if the specified section-key pair exists."
+msgstr ""
+"Возвращает [code]true[/code], если указанная пара раздел-ключ существует."
+
+msgid ""
+"Loads the config file specified as a parameter. The file's contents are "
+"parsed and loaded in the [ConfigFile] object which the method was called on.\n"
+"Returns [constant OK] on success, or one of the other [enum Error] values if "
+"the operation failed."
+msgstr ""
+"Загружает файл конфигурации, указанный в качестве параметра. Содержимое файла "
+"анализируется и загружается в объект [ConfigFile], для которого был вызван "
+"метод. \n"
+"Возвращает [constant OK] в случае успеха или одно из других значений [enum "
+"Error], если операция завершилась неудачей."
+
+msgid ""
+"Loads the encrypted config file specified as a parameter, using the provided "
+"[param key] to decrypt it. The file's contents are parsed and loaded in the "
+"[ConfigFile] object which the method was called on.\n"
+"Returns [constant OK] on success, or one of the other [enum Error] values if "
+"the operation failed."
+msgstr ""
+"Загружает зашифрованный файл конфигурации, указанный в качестве параметра, "
+"используя предоставленный [param key] для его расшифровки. Содержимое файла "
+"анализируется и загружается в объект [ConfigFile], для которого был вызван "
+"метод. \n"
+"Возвращает [constant OK] в случае успеха или одно из других значений [enum "
+"Error], если операция не удалась."
+
+msgid ""
+"Loads the encrypted config file specified as a parameter, using the provided "
+"[param password] to decrypt it. The file's contents are parsed and loaded in "
+"the [ConfigFile] object which the method was called on.\n"
+"Returns [constant OK] on success, or one of the other [enum Error] values if "
+"the operation failed."
+msgstr ""
+"Загружает зашифрованный файл конфигурации, указанный в качестве параметра, "
+"используя предоставленный [param password] для его расшифровки. Содержимое "
+"файла анализируется и загружается в объект [ConfigFile], для которого был "
+"вызван метод. \n"
+"Возвращает [constant OK] в случае успеха или одно из других значений [enum "
+"Error], если операция не удалась."
+
+msgid ""
+"Parses the passed string as the contents of a config file. The string is "
+"parsed and loaded in the ConfigFile object which the method was called on.\n"
+"Returns [constant OK] on success, or one of the other [enum Error] values if "
+"the operation failed."
+msgstr ""
+"Анализирует переданную строку как содержимое файла конфигурации. Строка "
+"анализируется и загружается в объект ConfigFile, для которого был вызван "
+"метод. \n"
+"Возвращает [constant OK] в случае успеха или одно из других значений [enum "
+"Error], если операция не удалась."
+
+msgid ""
+"Saves the contents of the [ConfigFile] object to the file specified as a "
+"parameter. The output file uses an INI-style structure.\n"
+"Returns [constant OK] on success, or one of the other [enum Error] values if "
+"the operation failed."
+msgstr ""
+"Сохраняет содержимое объекта [ConfigFile] в файл, указанный в качестве "
+"параметра. Выходной файл использует структуру в стиле INI.\n"
+"Возвращает [constant OK] в случае успеха или одно из других значений [enum "
+"Error], если операция не удалась."
+
+msgid ""
+"Saves the contents of the [ConfigFile] object to the AES-256 encrypted file "
+"specified as a parameter, using the provided [param key] to encrypt it. The "
+"output file uses an INI-style structure.\n"
+"Returns [constant OK] on success, or one of the other [enum Error] values if "
+"the operation failed."
+msgstr ""
+"Сохраняет содержимое объекта [ConfigFile] в зашифрованном файле AES-256, "
+"указанном в качестве параметра, используя предоставленный [param key] для его "
+"шифрования. Выходной файл использует структуру в стиле INI.\n"
+"Возвращает [constant OK] в случае успеха или одно из других значений [enum "
+"Error], если операция не удалась."
+
+msgid ""
+"Saves the contents of the [ConfigFile] object to the AES-256 encrypted file "
+"specified as a parameter, using the provided [param password] to encrypt it. "
+"The output file uses an INI-style structure.\n"
+"Returns [constant OK] on success, or one of the other [enum Error] values if "
+"the operation failed."
+msgstr ""
+"Сохраняет содержимое объекта [ConfigFile] в зашифрованном файле AES-256, "
+"указанном в качестве параметра, используя предоставленный [param password] "
+"для его шифрования. Выходной файл использует структуру в стиле INI.\n"
+"Возвращает [constant OK] в случае успеха или одно из других значений [enum "
+"Error], если операция не удалась."
+
+msgid ""
+"Assigns a value to the specified key of the specified section. If either the "
+"section or the key do not exist, they are created. Passing a [code]null[/"
+"code] value deletes the specified key if it exists, and deletes the section "
+"if it ends up empty once the key has been removed."
+msgstr ""
+"Присваивает значение указанному ключу указанного раздела. Если раздел или "
+"ключ не существуют, они создаются. Передача значения [code]null[/code] "
+"удаляет указанный ключ, если он существует, и удаляет раздел, если он "
+"оказывается пустым после удаления ключа."
+
+msgid "A dialog used for confirmation of actions."
+msgstr "Диалог, используемый для подтверждения действий."
+
+msgid ""
+"A dialog used for confirmation of actions. This window is similar to "
+"[AcceptDialog], but pressing its Cancel button can have a different outcome "
+"from pressing the OK button. The order of the two buttons varies depending on "
+"the host OS.\n"
+"To get cancel action, you can use:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"get_cancel_button().pressed.connect(_on_canceled)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetCancelButton().Pressed += OnCanceled;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Диалог, используемый для подтверждения действий. Это окно похоже на "
+"[AcceptDialog], но нажатие его кнопки Cancel может иметь другой результат, "
+"чем нажатие кнопки OK. Порядок двух кнопок различается в зависимости от ОС "
+"хоста.\n"
+"Чтобы получить действие отмены, вы можете использовать:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"get_cancel_button().pressed.connect(_on_canceled)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GetCancelButton().Pressed += OnCanceled;\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns the cancel button.\n"
+"[b]Warning:[/b] This is a required internal node, removing and freeing it may "
+"cause a crash. If you wish to hide it or any of its children, use their "
+"[member CanvasItem.visible] property."
+msgstr ""
+"Возвращает кнопку отмены.\n"
+"[b]Предупреждение:[/b] Это обязательный внутренний узел, его удаление и "
+"освобождение может привести к сбою. Если вы хотите скрыть его или любой из "
+"его дочерних элементов, используйте их свойство [member CanvasItem.visible]."
+
+msgid ""
+"The text displayed by the cancel button (see [method get_cancel_button])."
+msgstr "Текст, отображаемый кнопкой отмены (см. [method get_cancel_button])."
+
+msgid "Base class for all GUI containers."
+msgstr "Базовый класс для всех контейнеров GUI."
+
+msgid ""
+"Base class for all GUI containers. A [Container] automatically arranges its "
+"child controls in a certain way. This class can be inherited to make custom "
+"container types."
+msgstr ""
+"Базовый класс для всех контейнеров GUI. [Контейнер] автоматически "
+"упорядочивает свои дочерние элементы управления определенным образом. Этот "
+"класс может быть унаследован для создания пользовательских типов контейнеров."
+
+msgid ""
+"Implement to return a list of allowed horizontal [enum Control.SizeFlags] for "
+"child nodes. This doesn't technically prevent the usages of any other size "
+"flags, if your implementation requires that. This only limits the options "
+"available to the user in the Inspector dock.\n"
+"[b]Note:[/b] Having no size flags is equal to having [constant Control."
+"SIZE_SHRINK_BEGIN]. As such, this value is always implicitly allowed."
+msgstr ""
+"Реализуйте возврат списка разрешенных горизонтальных [enum Control.SizeFlags] "
+"для дочерних узлов. Это технически не препятствует использованию любых других "
+"флагов размера, если ваша реализация требует этого. Это только ограничивает "
+"возможности, доступные пользователю в доке Inspector.\n"
+"[b]Примечание:[/b] Отсутствие флагов размера равнозначно наличию [constant "
+"Control.SIZE_SHRINK_BEGIN]. Таким образом, это значение всегда неявно "
+"разрешено."
+
+msgid ""
+"Implement to return a list of allowed vertical [enum Control.SizeFlags] for "
+"child nodes. This doesn't technically prevent the usages of any other size "
+"flags, if your implementation requires that. This only limits the options "
+"available to the user in the Inspector dock.\n"
+"[b]Note:[/b] Having no size flags is equal to having [constant Control."
+"SIZE_SHRINK_BEGIN]. As such, this value is always implicitly allowed."
+msgstr ""
+"Реализуйте возврат списка разрешенных вертикальных [enum Control.SizeFlags] "
+"для дочерних узлов. Это технически не препятствует использованию любых других "
+"флагов размера, если ваша реализация требует этого. Это только ограничивает "
+"возможности, доступные пользователю в доке Inspector.\n"
+"[b]Примечание:[/b] Отсутствие флагов размера равнозначно наличию [constant "
+"Control.SIZE_SHRINK_BEGIN]. Таким образом, это значение всегда неявно "
+"разрешено."
+
+msgid ""
+"Fit a child control in a given rect. This is mainly a helper for creating "
+"custom container classes."
+msgstr ""
+"Вписать дочерний элемент управления в заданный прямоугольник. Это в основном "
+"помощник для создания пользовательских классов контейнеров."
+
+msgid ""
+"Queue resort of the contained children. This is called automatically anyway, "
+"but can be called upon request."
+msgstr ""
+"Очередь курорта содержащихся потомков. Это вызывается автоматически в любом "
+"случае, но может быть вызвано по запросу."
+
+msgid "Emitted when children are going to be sorted."
+msgstr "Выдается, когда дочерние собираются сортироваться."
+
+msgid "Emitted when sorting the children is needed."
+msgstr "Выдается, когда требуется сортировка дочерних элементов."
+
+msgid ""
+"Notification just before children are going to be sorted, in case there's "
+"something to process beforehand."
+msgstr ""
+"Уведомление непосредственно перед сортировкой детей на случай, если что-то "
+"нужно обработать заранее."
+
+msgid ""
+"Notification for when sorting the children, it must be obeyed immediately."
+msgstr ""
+"Уведомление о необходимости немедленного выполнения при сортировке детей."
+
+msgid ""
+"Base class for all GUI controls. Adapts its position and size based on its "
+"parent control."
+msgstr ""
+"Базовый класс для всех элементов управления GUI. Адаптирует свое положение и "
+"размер на основе родительского элемента управления."
+
+msgid ""
+"Base class for all UI-related nodes. [Control] features a bounding rectangle "
+"that defines its extents, an anchor position relative to its parent control "
+"or the current viewport, and offsets relative to the anchor. The offsets "
+"update automatically when the node, any of its parents, or the screen size "
+"change.\n"
+"For more information on Godot's UI system, anchors, offsets, and containers, "
+"see the related tutorials in the manual. To build flexible UIs, you'll need a "
+"mix of UI elements that inherit from [Control] and [Container] nodes.\n"
+"[b]Note:[/b] Since both [Node2D] and [Control] inherit from [CanvasItem], "
+"they share several concepts from the class such as the [member CanvasItem."
+"z_index] and [member CanvasItem.visible] properties.\n"
+"[b]User Interface nodes and input[/b]\n"
+"Godot propagates input events via viewports. Each [Viewport] is responsible "
+"for propagating [InputEvent]s to their child nodes. As the [member SceneTree."
+"root] is a [Window], this already happens automatically for all UI elements "
+"in your game.\n"
+"Input events are propagated through the [SceneTree] from the root node to all "
+"child nodes by calling [method Node._input]. For UI elements specifically, it "
+"makes more sense to override the virtual method [method _gui_input], which "
+"filters out unrelated input events, such as by checking z-order, [member "
+"mouse_filter], focus, or if the event was inside of the control's bounding "
+"box.\n"
+"Call [method accept_event] so no other node receives the event. Once you "
+"accept an input, it becomes handled so [method Node._unhandled_input] will "
+"not process it.\n"
+"Only one [Control] node can be in focus. Only the node in focus will receive "
+"events. To get the focus, call [method grab_focus]. [Control] nodes lose "
+"focus when another node grabs it, or if you hide the node in focus.\n"
+"Sets [member mouse_filter] to [constant MOUSE_FILTER_IGNORE] to tell a "
+"[Control] node to ignore mouse or touch events. You'll need it if you place "
+"an icon on top of a button.\n"
+"[Theme] resources change the control's appearance. The [member theme] of a "
+"[Control] node affects all of its direct and indirect children (as long as a "
+"chain of controls is uninterrupted). To override some of the theme items, "
+"call one of the [code]add_theme_*_override[/code] methods, like [method "
+"add_theme_font_override]. You can also override theme items in the "
+"Inspector.\n"
+"[b]Note:[/b] Theme items are [i]not[/i] [Object] properties. This means you "
+"can't access their values using [method Object.get] and [method Object.set]. "
+"Instead, use the [code]get_theme_*[/code] and [code]add_theme_*_override[/"
+"code] methods provided by this class."
+msgstr ""
+"Базовый класс для всех узлов, связанных с пользовательским интерфейсом. "
+"[Control] содержит ограничивающий прямоугольник, который определяет его "
+"пределы, позицию привязки относительно родительского элемента управления или "
+"текущего окна просмотра и смещения относительно привязки. Смещения "
+"автоматически обновляются при изменении узла, любого из его родителей или "
+"размера экрана.\n"
+"Для получения дополнительной информации о системе пользовательского "
+"интерфейса Godot, якорях, смещениях и контейнерах см. соответствующие "
+"руководства в руководстве. Для создания гибких пользовательских интерфейсов "
+"вам понадобится сочетание элементов пользовательского интерфейса, которые "
+"наследуются от узлов [Control] и [Container].\n"
+"[b]Примечание:[/b] Поскольку и [Node2D], и [Control] наследуют от "
+"[CanvasItem], они разделяют несколько концепций из класса, таких как свойства "
+"[member CanvasItem.z_index] и [member CanvasItem.visible].\n"
+"[b]Узлы пользовательского интерфейса и ввод[/b]\n"
+"Godot распространяет события ввода через вьюпорты. Каждый [Viewport] отвечает "
+"за распространение [InputEvent] на свои дочерние узлы. Поскольку [member "
+"SceneTree.root] является [Window], это уже происходит автоматически для всех "
+"элементов пользовательского интерфейса в вашей игре.\n"
+"События ввода распространяются через [SceneTree] от корневого узла ко всем "
+"дочерним узлам путем вызова [method Node._input]. Для элементов "
+"пользовательского интерфейса, в частности, имеет смысл переопределить "
+"виртуальный метод [method _gui_input], который отфильтровывает несвязанные "
+"события ввода, например, путем проверки z-порядка, [member mouse_filter], "
+"фокуса или нахождения события внутри ограничивающего прямоугольника элемента "
+"управления.\n"
+"Вызовите [method accept_event], чтобы никакой другой узел не получил событие. "
+"Как только вы принимаете ввод, он становится обработанным, поэтому [method "
+"Node._unhandled_input] не будет его обрабатывать.\n"
+"Только один узел [Control] может быть в фокусе. Только узел в фокусе будет "
+"получать события. Чтобы получить фокус, вызовите [method grab_focus]. Узлы "
+"[Control] теряют фокус, когда другой узел захватывает их или если вы "
+"скрываете узел в фокусе.\n"
+"Устанавливает [member mouse_filter] в [constant MOUSE_FILTER_IGNORE], чтобы "
+"сообщить узлу [Control] игнорировать события мыши или касания. Вам это "
+"понадобится, если вы поместите значок поверх кнопки.\n"
+"Ресурсы [Theme] изменяют внешний вид элемента управления. [Member theme] узла "
+"[Control] влияет на все его прямые и косвенные дочерние элементы (при "
+"условии, что цепочка элементов управления не прерывается). Чтобы "
+"переопределить некоторые элементы темы, вызовите один из методов "
+"[code]add_theme_*_override[/code], например [method add_theme_font_override]. "
+"Вы также можете переопределить элементы темы в инспекторе.\n"
+"[b]Примечание:[/b] Элементы темы [i]не[/i] свойства [Object]. Это означает, "
+"что вы не можете получить доступ к их значениям с помощью [method Object.get] "
+"и [method Object.set]. Вместо этого используйте методы [code]get_theme_*[/"
+"code] и [code]add_theme_*_override[/code], предоставляемые этим классом."
+
+msgid "GUI documentation index"
+msgstr "Каталог документации GUI"
+
+msgid "Control node gallery"
+msgstr "Галерея узлов управления"
+
+msgid "Multiple resolutions"
+msgstr "Несколько резолюций"
+
+msgid "All GUI Demos"
+msgstr "Демоверсии всех GUI"
+
+msgid ""
+"Godot calls this method to test if [param data] from a control's [method "
+"_get_drag_data] can be dropped at [param at_position]. [param at_position] is "
+"local to this control.\n"
+"This method should only be used to test the data. Process the data in [method "
+"_drop_data].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _can_drop_data(position, data):\n"
+"    # Check position if it is relevant to you\n"
+"    # Otherwise, just check data\n"
+"    return typeof(data) == TYPE_DICTIONARY and data.has(\"expected\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override bool _CanDropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    // Check position if it is relevant to you\n"
+"    // Otherwise, just check data\n"
+"    return data.VariantType == Variant.Type.Dictionary && data."
+"AsGodotDictionary().ContainsKey(\"expected\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Godot вызывает этот метод, чтобы проверить, можно ли сбросить [param data] из "
+"[method _get_drag_data] элемента управления в [param at_position]. [param "
+"at_position] является локальным для этого элемента управления. Этот метод "
+"следует использовать только для проверки данных. \n"
+"Обработайте данные в [method _drop_data].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _can_drop_data(position, data):\n"
+"    # Проверьте позицию, если она имеет к вам отношение\n"
+"    # В противном случае просто проверьте данные.\n"
+"    return typeof(data) == TYPE_DICTIONARY and data.has(\"expected\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override bool _CanDropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    // Проверьте позицию, если она имеет к вам отношение\n"
+"    // В противном случае просто проверьте данные.\n"
+"    return data.VariantType == Variant.Type.Dictionary && data."
+"AsGodotDictionary().ContainsKey(\"expected\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Godot calls this method to pass you the [param data] from a control's [method "
+"_get_drag_data] result. Godot first calls [method _can_drop_data] to test if "
+"[param data] is allowed to drop at [param at_position] where [param "
+"at_position] is local to this control.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _can_drop_data(position, data):\n"
+"    return typeof(data) == TYPE_DICTIONARY and data.has(\"color\")\n"
+"\n"
+"func _drop_data(position, data):\n"
+"    var color = data[\"color\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override bool _CanDropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    return data.VariantType == Variant.Type.Dictionary && data."
+"AsGodotDictionary().ContainsKey(\"color\");\n"
+"}\n"
+"\n"
+"public override void _DropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    Color color = data.AsGodotDictionary()[\"color\"].AsColor();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Godot вызывает этот метод, чтобы передать вам [param data] из результата "
+"[method _get_drag_data] элемента управления. Godot сначала вызывает [method "
+"_can_drop_data], чтобы проверить, разрешено ли [param data] сбрасывать в "
+"[param at_position], где [param at_position] является локальным для этого "
+"элемента управления.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _can_drop_data(position, data):\n"
+"    return typeof(data) == TYPE_DICTIONARY and data.has(\"color\")\n"
+"\n"
+"func _drop_data(position, data):\n"
+"    var color = data[\"color\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override bool _CanDropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    return data.VariantType == Variant.Type.Dictionary && data."
+"AsGodotDictionary().ContainsKey(\"color\");\n"
+"}\n"
+"\n"
+"public override void _DropData(Vector2 atPosition, Variant data)\n"
+"{\n"
+"    Color color = data.AsGodotDictionary()[\"color\"].AsColor();\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Godot calls this method to get data that can be dragged and dropped onto "
+"controls that expect drop data. Returns [code]null[/code] if there is no data "
+"to drag. Controls that want to receive drop data should implement [method "
+"_can_drop_data] and [method _drop_data]. [param at_position] is local to this "
+"control. Drag may be forced with [method force_drag].\n"
+"A preview that will follow the mouse that should represent the data can be "
+"set with [method set_drag_preview]. A good time to set the preview is in this "
+"method.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _get_drag_data(position):\n"
+"    var mydata = make_data() # This is your custom method generating the drag "
+"data.\n"
+"    set_drag_preview(make_preview(mydata)) # This is your custom method "
+"generating the preview of the drag data.\n"
+"    return mydata\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Variant _GetDragData(Vector2 atPosition)\n"
+"{\n"
+"    var myData = MakeData(); // This is your custom method generating the "
+"drag data.\n"
+"    SetDragPreview(MakePreview(myData)); // This is your custom method "
+"generating the preview of the drag data.\n"
+"    return myData;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Godot вызывает этот метод для получения данных, которые можно перетаскивать "
+"на элементы управления, ожидающие данные перетаскивания. Возвращает "
+"[code]null[/code], если нет данных для перетаскивания. Элементы управления, "
+"которые хотят получать данные перетаскивания, должны реализовывать [method "
+"_can_drop_data] и [method _drop_data]. [param at_position] является локальным "
+"для этого элемента управления. Перетаскивание может быть принудительно "
+"выполнено с помощью [method force_drag].\n"
+"Предварительный просмотр, который будет следовать за мышью, которая должна "
+"отображать данные, можно задать с помощью [метода set_drag_preview]. Хорошее "
+"время для настройки предварительного просмотра — этот метод.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _get_drag_data(position):\n"
+"    var mydata = make_data() # Это ваш пользовательский метод генерации "
+"данных перетаскивания.\n"
+"    set_drag_preview(make_preview(mydata)) # Это ваш пользовательский метод, "
+"генерирующий предварительный просмотр данных перетаскивания.\n"
+"    return mydata\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Variant _GetDragData(Vector2 atPosition)\n"
+"{\n"
+"    var myData = MakeData(); // Это ваш пользовательский метод генерации "
+"данных перетаскивания.\n"
+"    SetDragPreview(MakePreview(myData)); // TЭто ваш пользовательский метод, "
+"генерирующий предварительный просмотр данных перетаскивания.\n"
+"    return myData;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Virtual method to be implemented by the user. Returns the minimum size for "
+"this control. Alternative to [member custom_minimum_size] for controlling "
+"minimum size via code. The actual minimum size will be the max value of these "
+"two (in each axis separately).\n"
+"If not overridden, defaults to [constant Vector2.ZERO].\n"
+"[b]Note:[/b] This method will not be called when the script is attached to a "
+"[Control] node that already overrides its minimum size (e.g. [Label], "
+"[Button], [PanelContainer] etc.). It can only be used with most basic GUI "
+"nodes, like [Control], [Container], [Panel] etc."
+msgstr ""
+"Виртуальный метод, реализуемый пользователем. Возвращает минимальный размер "
+"для этого элемента управления. Альтернатива [member custom_minimum_size] для "
+"управления минимальным размером через код. Фактический минимальный размер "
+"будет максимальным значением этих двух (по каждой оси отдельно).\n"
+"Если не переопределено, по умолчанию [constant Vector2.ZERO].\n"
+"[b]Примечание:[/b] Этот метод не будет вызван, если скрипт прикреплен к узлу "
+"[Control], который уже переопределяет его минимальный размер (например, "
+"[Label], [Button], [PanelContainer] и т. д.). Его можно использовать только с "
+"большинством базовых узлов GUI, таких как [Control], [Container], [Panel] и "
+"т. д."
+
+msgid ""
+"Virtual method to be implemented by the user. Returns the tooltip text for "
+"the position [param at_position] in control's local coordinates, which will "
+"typically appear when the cursor is resting over this control. See [method "
+"get_tooltip].\n"
+"[b]Note:[/b] If this method returns an empty [String] and [method "
+"_make_custom_tooltip] is not overridden, no tooltip is displayed."
+msgstr ""
+"Виртуальный метод, реализуемый пользователем. Возвращает текст подсказки для "
+"позиции [param at_position] в локальных координатах элемента управления, "
+"который обычно отображается, когда курсор находится над этим элементом "
+"управления. См. [method get_tooltip].\n"
+"[b]Примечание:[/b] Если этот метод возвращает пустую [String] и [method "
+"_make_custom_tooltip] не переопределен, подсказка не отображается."
+
+msgid ""
+"Virtual method to be implemented by the user. Override this method to handle "
+"and accept inputs on UI elements. See also [method accept_event].\n"
+"[b]Example:[/b] Click on the control to print a message:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _gui_input(event):\n"
+"    if event is InputEventMouseButton:\n"
+"        if event.button_index == MOUSE_BUTTON_LEFT and event.pressed:\n"
+"            print(\"I've been clicked D:\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _GuiInput(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseButton mb)\n"
+"    {\n"
+"        if (mb.ButtonIndex == MouseButton.Left && mb.Pressed)\n"
+"        {\n"
+"            GD.Print(\"I've been clicked D:\");\n"
+"        }\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"If the [param event] inherits [InputEventMouse], this method will [b]not[/b] "
+"be called when:\n"
+"- the control's [member mouse_filter] is set to [constant "
+"MOUSE_FILTER_IGNORE];\n"
+"- the control is obstructed by another control on top, that doesn't have "
+"[member mouse_filter] set to [constant MOUSE_FILTER_IGNORE];\n"
+"- the control's parent has [member mouse_filter] set to [constant "
+"MOUSE_FILTER_STOP] or has accepted the event;\n"
+"- the control's parent has [member clip_contents] enabled and the [param "
+"event]'s position is outside the parent's rectangle;\n"
+"- the [param event]'s position is outside the control (see [method "
+"_has_point]).\n"
+"[b]Note:[/b] The [param event]'s position is relative to this control's "
+"origin."
+msgstr ""
+"Виртуальный метод, реализуемый пользователем. Переопределите этот метод для "
+"обработки и принятия ввода в элементах пользовательского интерфейса. См. "
+"также [метод accept_event].\n"
+"[b]Пример:[/b] Щелкните элемент управления, чтобы напечатать сообщение:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _gui_input(event):\n"
+"    if event is InputEventMouseButton:\n"
+"        if event.button_index == MOUSE_BUTTON_LEFT and event.pressed:\n"
+"            print(\"I've been clicked D:\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _GuiInput(InputEvent @event)\n"
+"{\n"
+"    if (@event is InputEventMouseButton mb)\n"
+"    {\n"
+"        if (mb.ButtonIndex == MouseButton.Left && mb.Pressed)\n"
+"        {\n"
+"            GD.Print(\"I've been clicked D:\");\n"
+"        }\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Если [param event] наследует [InputEventMouse], этот метод [b]не[/b] будет "
+"вызван, когда:\n"
+"- элемент управления [member mouse_filter] установлен на [constant "
+"MOUSE_FILTER_IGNORE];\n"
+"- элемент управления перекрыт другим элементом управления сверху, у которого "
+"[member mouse_filter] не установлен на [constant MOUSE_FILTER_IGNORE];\n"
+"- родительский элемент управления имеет [member mouse_filter] установлен на "
+"[constant MOUSE_FILTER_STOP] или принял событие;\n"
+"- родительский элемент управления имеет [member clip_contents], а положение "
+"[param event] находится вне прямоугольника родителя;\n"
+"- положение [param event] находится вне элемента управления (см. [method "
+"_has_point]).\n"
+"[b]Примечание:[/b] Положение [param event] определяется относительно начала "
+"координат этого элемента управления."
+
+msgid ""
+"Virtual method to be implemented by the user. Returns whether the given "
+"[param point] is inside this control.\n"
+"If not overridden, default behavior is checking if the point is within "
+"control's Rect.\n"
+"[b]Note:[/b] If you want to check if a point is inside the control, you can "
+"use [code]Rect2(Vector2.ZERO, size).has_point(point)[/code]."
+msgstr ""
+"Виртуальный метод, реализуемый пользователем. Возвращает, находится ли "
+"заданный [param point] внутри этого элемента управления.\n"
+"Если не переопределено, поведение по умолчанию — проверка того, находится ли "
+"точка внутри Rect элемента управления.\n"
+"[b]Примечание:[/b] Если вы хотите проверить, находится ли точка внутри "
+"элемента управления, вы можете использовать [code]Rect2(Vector2.ZERO, size)."
+"has_point(point)[/code]."
+
+msgid ""
+"Virtual method to be implemented by the user. Returns a [Control] node that "
+"should be used as a tooltip instead of the default one. [param for_text] is "
+"the return value of [method get_tooltip].\n"
+"The returned node must be of type [Control] or Control-derived. It can have "
+"child nodes of any type. It is freed when the tooltip disappears, so make "
+"sure you always provide a new instance (if you want to use a pre-existing "
+"node from your scene tree, you can duplicate it and pass the duplicated "
+"instance). When [code]null[/code] or a non-Control node is returned, the "
+"default tooltip will be used instead.\n"
+"The returned node will be added as child to a [PopupPanel], so you should "
+"only provide the contents of that panel. That [PopupPanel] can be themed "
+"using [method Theme.set_stylebox] for the type [code]\"TooltipPanel\"[/code] "
+"(see [member tooltip_text] for an example).\n"
+"[b]Note:[/b] The tooltip is shrunk to minimal size. If you want to ensure "
+"it's fully visible, you might want to set its [member custom_minimum_size] to "
+"some non-zero value.\n"
+"[b]Note:[/b] The node (and any relevant children) should have their [member "
+"CanvasItem.visible] set to [code]true[/code] when returned, otherwise, the "
+"viewport that instantiates it will not be able to calculate its minimum size "
+"reliably.\n"
+"[b]Note:[/b] If overridden, this method is called even if [method "
+"get_tooltip] returns an empty string. When this happens with the default "
+"tooltip, it is not displayed. To copy this behavior, return [code]null[/code] "
+"in this method when [param for_text] is empty.\n"
+"[b]Example:[/b] Use a constructed node as a tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var label = Label.new()\n"
+"    label.text = for_text\n"
+"    return label\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    var label = new Label();\n"
+"    label.Text = forText;\n"
+"    return label;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Example:[/b] Usa a scene instance as a tooltip:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var tooltip = preload(\"res://some_tooltip_scene.tscn\").instantiate()\n"
+"    tooltip.get_node(\"Label\").text = for_text\n"
+"    return tooltip\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    Node tooltip = ResourceLoader.Load<PackedScene>(\"res://"
+"some_tooltip_scene.tscn\").Instantiate();\n"
+"    tooltip.GetNode<Label>(\"Label\").Text = forText;\n"
+"    return tooltip;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Виртуальный метод, реализуемый пользователем. Возвращает узел [Control], "
+"который следует использовать в качестве подсказки вместо подсказки по "
+"умолчанию. [param for_text] — возвращаемое значение [method get_tooltip].\n"
+"Возвращаемый узел должен иметь тип [Control] или Control-derived. Он может "
+"иметь дочерние узлы любого типа. Он освобождается, когда подсказка исчезает, "
+"поэтому убедитесь, что вы всегда предоставляете новый экземпляр (если вы "
+"хотите использовать уже существующий узел из дерева сцены, вы можете "
+"продублировать его и передать продублированный экземпляр). Когда возвращается "
+"[code]null[/code] или не-Control узел, вместо него будет использоваться "
+"подсказка по умолчанию.\n"
+"Возвращенный узел будет добавлен как дочерний к [PopupPanel], поэтому вам "
+"следует предоставить только содержимое этой панели. Эта [PopupPanel] может "
+"быть тематически оформлена с помощью [метода Theme.set_stylebox] для типа "
+"[code]\"TooltipPanel\"[/code] (см. [member tooltip_text] для примера).\n"
+"[b]Примечание:[/b] Подсказка сжата до минимального размера. Если вы хотите, "
+"чтобы она была полностью видна, вам может понадобиться установить ее [member "
+"custom_minimum_size] на некоторое ненулевое значение.\n"
+"[b]Примечание:[/b] Узел (и все соответствующие дочерние элементы) должны "
+"иметь свой [member CanvasItem.visible], установленный на [code]true[/code] "
+"при возврате, в противном случае область просмотра, которая создает его "
+"экземпляр, не сможет надежно вычислить его минимальный размер.\n"
+"[b]Примечание:[/b] При переопределении этот метод вызывается, даже если "
+"[method get_tooltip] возвращает пустую строку. Когда это происходит с "
+"подсказкой по умолчанию, она не отображается. Чтобы скопировать это "
+"поведение, верните [code]null[/code] в этом методе, когда [param for_text] "
+"пуст.\n"
+"[b]Пример:[/b] Использование сконструированного узла в качестве подсказки:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var label = Label.new()\n"
+"    label.text = for_text\n"
+"    return label\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    var label = new Label();\n"
+"    label.Text = forText;\n"
+"    return label;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Пример:[/b] Использование экземпляра сцены в качестве подсказки:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _make_custom_tooltip(for_text):\n"
+"    var tooltip = preload(\"res://some_tooltip_scene.tscn\").instantiate()\n"
+"    tooltip.get_node(\"Label\").text = for_text\n"
+"    return tooltip\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Control _MakeCustomTooltip(string forText)\n"
+"{\n"
+"    Node tooltip = ResourceLoader.Load<PackedScene>(\"res://"
+"some_tooltip_scene.tscn\").Instantiate();\n"
+"    tooltip.GetNode<Label>(\"Label\").Text = forText;\n"
+"    return tooltip;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"User defined BiDi algorithm override function.\n"
+"Returns an [Array] of [Vector3i] text ranges and text base directions, in the "
+"left-to-right order. Ranges should cover full source [param text] without "
+"overlaps. BiDi algorithm will be used on each range separately."
+msgstr ""
+"Функция переопределения пользовательского алгоритма BiDi.\n"
+"Возвращает [Array] из [Vector3i] текстовых диапазонов и направлений баз "
+"текста в порядке слева направо. Диапазоны должны охватывать весь исходный "
+"[param text] без перекрытий. Алгоритм BiDi будет использоваться для каждого "
+"диапазона отдельно."
+
+msgid ""
+"Marks an input event as handled. Once you accept an input event, it stops "
+"propagating, even to nodes listening to [method Node._unhandled_input] or "
+"[method Node._unhandled_key_input].\n"
+"[b]Note:[/b] This does not affect the methods in [Input], only the way events "
+"are propagated."
+msgstr ""
+"Отмечает событие ввода как обработанное. После того, как вы принимаете "
+"событие ввода, оно перестает распространяться, даже на узлы, прослушивающие "
+"[method Node._unhandled_input] или [method Node._unhandled_key_input].\n"
+"[b]Примечание:[/b] Это не влияет на методы в [Input], а только на способ "
+"распространения событий."
+
+msgid ""
+"Creates a local override for a theme [Color] with the specified [param name]. "
+"Local overrides always take precedence when fetching theme items for the "
+"control. An override can be removed with [method "
+"remove_theme_color_override].\n"
+"See also [method get_theme_color].\n"
+"[b]Example:[/b] Override a [Label]'s color and reset it later:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Given the child Label node \"MyLabel\", override its font color with a "
+"custom value.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", Color(1, 0.5, 0))\n"
+"# Reset the font color of the child label.\n"
+"$MyLabel.remove_theme_color_override(\"font_color\")\n"
+"# Alternatively it can be overridden with the default value from the Label "
+"type.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", "
+"get_theme_color(\"font_color\", \"Label\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Given the child Label node \"MyLabel\", override its font color with a "
+"custom value.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", new "
+"Color(1, 0.5f, 0));\n"
+"// Reset the font color of the child label.\n"
+"GetNode<Label>(\"MyLabel\").RemoveThemeColorOverride(\"font_color\");\n"
+"// Alternatively it can be overridden with the default value from the Label "
+"type.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", "
+"GetThemeColor(\"font_color\", \"Label\"));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает локальное переопределение для темы [Color] с указанным [param name]. "
+"Локальные переопределения всегда имеют приоритет при извлечении элементов "
+"темы для элемента управления. Переопределение можно удалить с помощью [method "
+"remove_theme_color_override].\n"
+"С. также [method get_theme_color].\n"
+"[b]Пример:[/b] Переопределить цвет [Label] и сбросить его позже:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# Для дочернего узла Label «MyLabel» переопределите цвет его шрифта с помощью "
+"пользовательского значения.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", Color(1, 0.5, 0))\n"
+"# Сбросить цвет шрифта дочерней метки.\n"
+"$MyLabel.remove_theme_color_override(\"font_color\")\n"
+"# В качестве альтернативы его можно переопределить значением по умолчанию из "
+"типа метки.\n"
+"$MyLabel.add_theme_color_override(\"font_color\", "
+"get_theme_color(\"font_color\", \"Label\"))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Для дочернего узла Label «MyLabel» переопределите цвет его шрифта с "
+"помощью пользовательского значения.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", new "
+"Color(1, 0.5f, 0));\n"
+"// Сбросить цвет шрифта дочерней метки.\n"
+"GetNode<Label>(\"MyLabel\").RemoveThemeColorOverride(\"font_color\");\n"
+"// В качестве альтернативы его можно переопределить значением по умолчанию из "
+"типа метки.\n"
+"GetNode<Label>(\"MyLabel\").AddThemeColorOverride(\"font_color\", "
+"GetThemeColor(\"font_color\", \"Label\"));\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Creates a local override for a theme constant with the specified [param "
+"name]. Local overrides always take precedence when fetching theme items for "
+"the control. An override can be removed with [method "
+"remove_theme_constant_override].\n"
+"See also [method get_theme_constant]."
+msgstr ""
+"Создает локальное переопределение для константы темы с указанным [имя "
+"параметра]. Локальные переопределения всегда имеют приоритет при извлечении "
+"элементов темы для элемента управления. Переопределение можно удалить с "
+"помощью [метода remove_theme_constant_override].\n"
+"См. также [метод get_theme_constant]."
+
+msgid ""
+"Creates a local override for a theme [Font] with the specified [param name]. "
+"Local overrides always take precedence when fetching theme items for the "
+"control. An override can be removed with [method "
+"remove_theme_font_override].\n"
+"See also [method get_theme_font]."
+msgstr ""
+"Создает локальное переопределение для темы [Font] с указанным [param name]. "
+"Локальные переопределения всегда имеют приоритет при извлечении элементов "
+"темы для элемента управления. Переопределение можно удалить с помощью [method "
+"remove_theme_font_override].\n"
+"См. также [method get_theme_font]."
+
+msgid ""
+"Creates a local override for a theme font size with the specified [param "
+"name]. Local overrides always take precedence when fetching theme items for "
+"the control. An override can be removed with [method "
+"remove_theme_font_size_override].\n"
+"See also [method get_theme_font_size]."
+msgstr ""
+"Создает локальное переопределение для размера шрифта темы с указанным [param "
+"name]. Локальные переопределения всегда имеют приоритет при извлечении "
+"элементов темы для элемента управления. Переопределение можно удалить с "
+"помощью [method remove_theme_font_size_override].\n"
+"См. также [method get_theme_font_size]."
+
+msgid ""
+"Creates a local override for a theme icon with the specified [param name]. "
+"Local overrides always take precedence when fetching theme items for the "
+"control. An override can be removed with [method "
+"remove_theme_icon_override].\n"
+"See also [method get_theme_icon]."
+msgstr ""
+"Создает локальное переопределение для значка темы с указанным [param name]. "
+"Локальные переопределения всегда имеют приоритет при извлечении элементов "
+"темы для элемента управления. Переопределение можно удалить с помощью [method "
+"remove_theme_icon_override].\n"
+"См. также [method get_theme_icon]."
+
+msgid ""
+"Creates a local override for a theme [StyleBox] with the specified [param "
+"name]. Local overrides always take precedence when fetching theme items for "
+"the control. An override can be removed with [method "
+"remove_theme_stylebox_override].\n"
+"See also [method get_theme_stylebox].\n"
+"[b]Example:[/b] Modify a property in a [StyleBox] by duplicating it:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# The snippet below assumes the child node \"MyButton\" has a StyleBoxFlat "
+"assigned.\n"
+"# Resources are shared across instances, so we need to duplicate it\n"
+"# to avoid modifying the appearance of all other buttons.\n"
+"var new_stylebox_normal = $MyButton.get_theme_stylebox(\"normal\")."
+"duplicate()\n"
+"new_stylebox_normal.border_width_top = 3\n"
+"new_stylebox_normal.border_color = Color(0, 1, 0.5)\n"
+"$MyButton.add_theme_stylebox_override(\"normal\", new_stylebox_normal)\n"
+"# Remove the stylebox override.\n"
+"$MyButton.remove_theme_stylebox_override(\"normal\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// The snippet below assumes the child node \"MyButton\" has a StyleBoxFlat "
+"assigned.\n"
+"// Resources are shared across instances, so we need to duplicate it\n"
+"// to avoid modifying the appearance of all other buttons.\n"
+"StyleBoxFlat newStyleboxNormal = GetNode<Button>(\"MyButton\")."
+"GetThemeStylebox(\"normal\").Duplicate() as StyleBoxFlat;\n"
+"newStyleboxNormal.BorderWidthTop = 3;\n"
+"newStyleboxNormal.BorderColor = new Color(0, 1, 0.5f);\n"
+"GetNode<Button>(\"MyButton\").AddThemeStyleboxOverride(\"normal\", "
+"newStyleboxNormal);\n"
+"// Remove the stylebox override.\n"
+"GetNode<Button>(\"MyButton\").RemoveThemeStyleboxOverride(\"normal\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает локальное переопределение для темы [StyleBox] с указанным [param "
+"name]. Локальные переопределения всегда имеют приоритет при извлечении "
+"элементов темы для элемента управления. Переопределение можно удалить с "
+"помощью [method remove_theme_stylebox_override].\n"
+"См. также [method get_theme_stylebox].\n"
+"[b]Пример:[/b] Измените свойство в [StyleBox], продублировав его:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# В приведенном ниже фрагменте предполагается, что дочернему узлу «MyButton» "
+"назначен StyleBoxFlat.\n"
+"# Ресурсы являются общими для всех экземпляров, поэтому нам нужно их "
+"дублировать.\n"
+"# чтобы избежать изменения внешнего вида всех остальных кнопок.\n"
+"var new_stylebox_normal = $MyButton.get_theme_stylebox(\"normal\")."
+"duplicate()\n"
+"new_stylebox_normal.border_width_top = 3\n"
+"new_stylebox_normal.border_color = Color(0, 1, 0.5)\n"
+"$MyButton.add_theme_stylebox_override(\"normal\", new_stylebox_normal)\n"
+"# Удалить переопределение stylebox.\n"
+"$MyButton.remove_theme_stylebox_override(\"normal\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// В приведенном ниже фрагменте предполагается, что дочернему узлу «MyButton» "
+"назначен StyleBoxFlat.\n"
+"// Ресурсы являются общими для всех экземпляров, поэтому нам нужно их "
+"дублировать.\n"
+"// чтобы избежать изменения внешнего вида всех остальных кнопок.\n"
+"StyleBoxFlat newStyleboxNormal = GetNode<Button>(\"MyButton\")."
+"GetThemeStylebox(\"normal\").Duplicate() as StyleBoxFlat;\n"
+"newStyleboxNormal.BorderWidthTop = 3;\n"
+"newStyleboxNormal.BorderColor = new Color(0, 1, 0.5f);\n"
+"GetNode<Button>(\"MyButton\").AddThemeStyleboxOverride(\"normal\", "
+"newStyleboxNormal);\n"
+"// Удалить переопределение stylebox.\n"
+"GetNode<Button>(\"MyButton\").RemoveThemeStyleboxOverride(\"normal\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Prevents [code]*_theme_*_override[/code] methods from emitting [constant "
+"NOTIFICATION_THEME_CHANGED] until [method end_bulk_theme_override] is called."
+msgstr ""
+"Запрещает методам [code]*_theme_*_override[/code] выдавать [constant "
+"NOTIFICATION_THEME_CHANGED] до тех пор, пока не будет вызван [method "
+"end_bulk_theme_override]."
+
+msgid ""
+"Ends a bulk theme override update. See [method begin_bulk_theme_override]."
+msgstr ""
+"Завершает массовое обновление переопределения темы. См. [method "
+"begin_bulk_theme_override]."
+
+msgid "Finds the next (below in the tree) [Control] that can receive the focus."
+msgstr ""
+"Находит следующий (ниже в дереве) [Control], который может получить фокус."
+
+msgid ""
+"Finds the previous (above in the tree) [Control] that can receive the focus."
+msgstr ""
+"Находит предыдущий (выше в дереве) [Control], который может получить фокус."
+
+msgid ""
+"Finds the next [Control] that can receive the focus on the specified [enum "
+"Side].\n"
+"[b]Note:[/b] This is different from [method get_focus_neighbor], which "
+"returns the path of a specified focus neighbor."
+msgstr ""
+"Находит следующий [Control], который может получить фокус на указанной [enum "
+"Side].\n"
+"[b]Примечание:[/b] Это отличается от [method get_focus_neighbor], который "
+"возвращает путь указанного соседа фокуса."
+
+msgid ""
+"Forces drag and bypasses [method _get_drag_data] and [method "
+"set_drag_preview] by passing [param data] and [param preview]. Drag will "
+"start even if the mouse is neither over nor pressed on this control.\n"
+"The methods [method _can_drop_data] and [method _drop_data] must be "
+"implemented on controls that want to receive drop data."
+msgstr ""
+"Принудительно перетаскивает и обходит [method _get_drag_data] и [method "
+"set_drag_preview], передавая [param data] и [param preview]. Перетаскивание "
+"начнется, даже если мышь не находится над этим элементом управления и не "
+"нажата на него.\n"
+"Методы [method _can_drop_data] и [method _drop_data] должны быть реализованы "
+"в элементах управления, которые хотят получать данные перетаскивания."
+
+msgid ""
+"Returns the anchor for the specified [enum Side]. A getter method for [member "
+"anchor_bottom], [member anchor_left], [member anchor_right] and [member "
+"anchor_top]."
+msgstr ""
+"Возвращает якорь для указанного [enum Side]. Метод получения для [member "
+"anchor_bottom], [member anchor_left], [member anchor_right] и [member "
+"anchor_top]."
+
+msgid ""
+"Returns [member offset_left] and [member offset_top]. See also [member "
+"position]."
+msgstr ""
+"Возвращает [member offset_left] и [member offset_top]. См. также [member "
+"position]."
+
+msgid ""
+"Returns combined minimum size from [member custom_minimum_size] and [method "
+"get_minimum_size]."
+msgstr ""
+"Возвращает объединенный минимальный размер из [member custom_minimum_size] и "
+"[method get_minimum_size]."
+
+msgid ""
+"Returns the mouse cursor shape the control displays on mouse hover. See [enum "
+"CursorShape]."
+msgstr ""
+"Возвращает форму курсора мыши, которую элемент управления отображает при "
+"наведении мыши. См. [enum CursorShape]."
+
+msgid "Returns [member offset_right] and [member offset_bottom]."
+msgstr "Возвращает [элемент offset_right] и [элемент offset_bottom]."
+
+msgid ""
+"Returns the focus neighbor for the specified [enum Side]. A getter method for "
+"[member focus_neighbor_bottom], [member focus_neighbor_left], [member "
+"focus_neighbor_right] and [member focus_neighbor_top].\n"
+"[b]Note:[/b] To find the next [Control] on the specific [enum Side], even if "
+"a neighbor is not assigned, use [method find_valid_focus_neighbor]."
+msgstr ""
+"Возвращает соседа фокуса для указанного [enum Side]. Метод получения для "
+"[member focus_neighbor_bottom], [member focus_neighbor_left], [member "
+"focus_neighbor_right] и [member focus_neighbor_top].\n"
+"[b]Примечание:[/b] Чтобы найти следующий [Control] на указанном [enum Side], "
+"даже если сосед не назначен, используйте [method find_valid_focus_neighbor]."
+
+msgid ""
+"Returns the position and size of the control relative to the containing "
+"canvas. See [member global_position] and [member size].\n"
+"[b]Note:[/b] If the node itself or any parent [CanvasItem] between the node "
+"and the canvas have a non default rotation or skew, the resulting size is "
+"likely not meaningful.\n"
+"[b]Note:[/b] Setting [member Viewport.gui_snap_controls_to_pixels] to "
+"[code]true[/code] can lead to rounding inaccuracies between the displayed "
+"control and the returned [Rect2]."
+msgstr ""
+"Возвращает положение и размер элемента управления относительно содержащего "
+"его холста. См. [member global_position] и [member size].\n"
+"[b]Примечание:[/b] Если сам узел или любой родительский [CanvasItem] между "
+"узлом и холстом имеет нестандартный поворот или наклон, то результирующий "
+"размер, скорее всего, не имеет смысла.\n"
+"[b]Примечание:[/b] Установка [member Viewport.gui_snap_controls_to_pixels] в "
+"[code]true[/code] может привести к неточностям округления между отображаемым "
+"элементом управления и возвращаемым [Rect2]."
+
+msgid ""
+"Returns the minimum size for this control. See [member custom_minimum_size]."
+msgstr ""
+"Возвращает минимальный размер для этого элемента управления. См. [member "
+"custom_minimum_size]."
+
+msgid ""
+"Returns the offset for the specified [enum Side]. A getter method for [member "
+"offset_bottom], [member offset_left], [member offset_right] and [member "
+"offset_top]."
+msgstr ""
+"Возвращает смещение для указанного [enum Side]. Метод получения для [member "
+"offset_bottom], [member offset_left], [member offset_right] и [member "
+"offset_top]."
+
+msgid "Returns the width/height occupied in the parent control."
+msgstr "Возвращает ширину/высоту, занимаемую родительским элементом управления."
+
+msgid "Returns the parent control node."
+msgstr "Возвращает родительский управляющий узел."
+
+msgid ""
+"Returns the position and size of the control in the coordinate system of the "
+"containing node. See [member position], [member scale] and [member size].\n"
+"[b]Note:[/b] If [member rotation] is not the default rotation, the resulting "
+"size is not meaningful.\n"
+"[b]Note:[/b] Setting [member Viewport.gui_snap_controls_to_pixels] to "
+"[code]true[/code] can lead to rounding inaccuracies between the displayed "
+"control and the returned [Rect2]."
+msgstr ""
+"Возвращает положение и размер элемента управления в системе координат "
+"содержащего узла. См. [member position], [member scale] и [member size].\n"
+"[b]Примечание:[/b] Если [member rotation] не является поворотом по умолчанию, "
+"результирующий размер не имеет смысла.\n"
+"[b]Примечание:[/b] Установка [member Viewport.gui_snap_controls_to_pixels] в "
+"[code]true[/code] может привести к неточностям округления между отображаемым "
+"элементом управления и возвращаемым [Rect2]."
+
+msgid ""
+"Returns the position of this [Control] in global screen coordinates (i.e. "
+"taking window position into account). Mostly useful for editor plugins.\n"
+"Equals to [member global_position] if the window is embedded (see [member "
+"Viewport.gui_embed_subwindows]).\n"
+"[b]Example:[/b] Show a popup at the mouse position:\n"
+"[codeblock]\n"
+"popup_menu.position = get_screen_position() + get_local_mouse_position()\n"
+"popup_menu.reset_size()\n"
+"popup_menu.popup()\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает позицию этого [Control] в глобальных координатах экрана (т. е. с "
+"учетом позиции окна). В основном полезно для плагинов редактора.\n"
+"Равно [member global_position], если окно встроено (см. [member Viewport."
+"gui_embed_subwindows]).\n"
+"[b]Пример:[/b] Показать всплывающее окно в позиции мыши:\n"
+"[codeblock]\n"
+"popup_menu.position = get_screen_position() + get_local_mouse_position()\n"
+"popup_menu.reset_size()\n"
+"popup_menu.popup()\n"
+"[/codeblock]"
+
+msgid ""
+"Returns a [Color] from the first matching [Theme] in the tree if that [Theme] "
+"has a color item with the specified [param name] and [param theme_type]. If "
+"[param theme_type] is omitted the class name of the current control is used "
+"as the type, or [member theme_type_variation] if it is defined. If the type "
+"is a class name its parent classes are also checked, in order of inheritance. "
+"If the type is a variation its base types are checked, in order of "
+"dependency, then the control's class name and its parent classes are "
+"checked.\n"
+"For the current control its local overrides are considered first (see [method "
+"add_theme_color_override]), then its assigned [member theme]. After the "
+"current control, each parent control and its assigned [member theme] are "
+"considered; controls without a [member theme] assigned are skipped. If no "
+"matching [Theme] is found in the tree, the custom project [Theme] (see "
+"[member ProjectSettings.gui/theme/custom]) and the default [Theme] are used "
+"(see [ThemeDB]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    # Get the font color defined for the current Control's class, if it "
+"exists.\n"
+"    modulate = get_theme_color(\"font_color\")\n"
+"    # Get the font color defined for the Button class.\n"
+"    modulate = get_theme_color(\"font_color\", \"Button\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Get the font color defined for the current Control's class, if it "
+"exists.\n"
+"    Modulate = GetThemeColor(\"font_color\");\n"
+"    // Get the font color defined for the Button class.\n"
+"    Modulate = GetThemeColor(\"font_color\", \"Button\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает [Color] из первой совпадающей [Theme] в дереве, если эта [Theme] "
+"имеет элемент цвета с указанными [param name] и [param theme_type]. Если "
+"[param theme_type] опущен, в качестве типа используется имя класса текущего "
+"элемента управления или [member theme_type_variation], если он определен. "
+"Если тип является именем класса, его родительские классы также проверяются в "
+"порядке наследования. Если тип является вариацией, его базовые типы "
+"проверяются в порядке зависимости, затем проверяются имя класса элемента "
+"управления и его родительские классы.\n"
+"Для текущего элемента управления сначала рассматриваются его локальные "
+"переопределения (см. [method add_theme_color_override]), затем его "
+"назначенная [member theme]. После текущего элемента управления "
+"рассматриваются каждый родительский элемент управления и назначенная ему "
+"[member theme]; элементы управления без назначенной [member theme] "
+"пропускаются. Если в дереве не найдено соответствующей [Theme], используются "
+"пользовательский проект [Theme] (см. [member ProjectSettings.gui/theme/"
+"custom]) и [Theme] по умолчанию (см. [ThemeDB]).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _ready():\n"
+"    # Получить цвет шрифта, определенный для текущего класса элемента "
+"управления, если он существует.\n"
+"    modulate = get_theme_color(\"font_color\")\n"
+"    # Получите цвет шрифта, определенный для класса Button.\n"
+"    modulate = get_theme_color(\"font_color\", \"Button\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Ready()\n"
+"{\n"
+"    // Получить цвет шрифта, определенный для текущего класса элемента "
+"управления, если он существует.\n"
+"    Modulate = GetThemeColor(\"font_color\");\n"
+"    // Получите цвет шрифта, определенный для класса Button.\n"
+"    Modulate = GetThemeColor(\"font_color\", \"Button\");\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Returns a constant from the first matching [Theme] in the tree if that "
+"[Theme] has a constant item with the specified [param name] and [param "
+"theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает константу из первой совпадающей [Theme] в дереве, если эта [Theme] "
+"имеет константный элемент с указанными [param name] и [param theme_type].\n"
+"Подробности см. в [method get_theme_color]."
+
+msgid ""
+"Returns the default base scale value from the first matching [Theme] in the "
+"tree if that [Theme] has a valid [member Theme.default_base_scale] value.\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает базовое значение масштаба по умолчанию из первой соответствующей "
+"[Theme] в дереве, если эта [Theme] имеет допустимое значение [member Theme."
+"default_base_scale].\n"
+"Подробнее см. в [method get_theme_color]."
+
+msgid ""
+"Returns the default font from the first matching [Theme] in the tree if that "
+"[Theme] has a valid [member Theme.default_font] value.\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает шрифт по умолчанию из первой соответствующей [Theme] в дереве, "
+"если эта [Theme] имеет допустимое значение [member Theme.default_font].\n"
+"Подробности см. в [method get_theme_color]."
+
+msgid ""
+"Returns the default font size value from the first matching [Theme] in the "
+"tree if that [Theme] has a valid [member Theme.default_font_size] value.\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает значение размера шрифта по умолчанию из первой соответствующей "
+"[Theme] в дереве, если эта [Theme] имеет допустимое значение [member Theme."
+"default_font_size].\n"
+"Подробности см. в [method get_theme_color]."
+
+msgid ""
+"Returns a [Font] from the first matching [Theme] in the tree if that [Theme] "
+"has a font item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [Font] из первой соответствующей [Theme] в дереве, если эта "
+"[Theme] имеет элемент шрифта с указанными [param name] и [param name].\n"
+"Подробности см. в [method get_theme_color]."
+
+msgid ""
+"Returns a font size from the first matching [Theme] in the tree if that "
+"[Theme] has a font size item with the specified [param name] and [param "
+"theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает размер шрифта из первой соответствующей [Theme] в дереве, если эта "
+"[Theme] имеет элемент размера шрифта с указанными [param name] и [param "
+"theme_type].\n"
+"Подробности см. в [method get_theme_color]."
+
+msgid ""
+"Returns an icon from the first matching [Theme] in the tree if that [Theme] "
+"has an icon item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает значок из первой соответствующей [Theme] в дереве, если эта "
+"[Theme] имеет элемент значка с указанными [param name] и [param theme_type].\n"
+"Подробности см. в [method get_theme_color]."
+
+msgid ""
+"Returns a [StyleBox] from the first matching [Theme] in the tree if that "
+"[Theme] has a stylebox item with the specified [param name] and [param "
+"theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [StyleBox] из первой соответствующей [Theme] в дереве, если эта "
+"[Theme] имеет элемент stylebox с указанными [param name] и [param "
+"theme_type].\n"
+"Подробнее см. [method get_theme_color]."
+
+msgid ""
+"Returns the tooltip text for the position [param at_position] in control's "
+"local coordinates, which will typically appear when the cursor is resting "
+"over this control. By default, it returns [member tooltip_text].\n"
+"This method can be overridden to customize its behavior. See [method "
+"_get_tooltip].\n"
+"[b]Note:[/b] If this method returns an empty [String] and [method "
+"_make_custom_tooltip] is not overridden, no tooltip is displayed."
+msgstr ""
+"Возвращает текст подсказки для позиции [param at_position] в локальных "
+"координатах элемента управления, который обычно отображается, когда курсор "
+"находится над этим элементом управления. По умолчанию он возвращает [member "
+"tooltip_text].\n"
+"Этот метод можно переопределить, чтобы настроить его поведение. См. [method "
+"_get_tooltip].\n"
+"[b]Примечание:[/b] Если этот метод возвращает пустую [String] и [method "
+"_make_custom_tooltip] не переопределен, подсказка не отображается."
+
+msgid ""
+"Creates an [InputEventMouseButton] that attempts to click the control. If the "
+"event is received, the control gains focus.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    grab_click_focus() # When clicking another Control node, this node will "
+"be clicked instead.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    GrabClickFocus(); // When clicking another Control node, this node will "
+"be clicked instead.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Создает [InputEventMouseButton], который пытается щелкнуть элемент "
+"управления. Если событие получено, элемент управления получает фокус.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _process(delta):\n"
+"    grab_click_focus() # При щелчке по другому узлу управления вместо него "
+"будет выполнен щелчок по этому узлу.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override void _Process(double delta)\n"
+"{\n"
+"    GrabClickFocus(); // При щелчке по другому узлу управления вместо него "
+"будет выполнен щелчок по этому узлу.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Steal the focus from another control and become the focused control (see "
+"[member focus_mode]).\n"
+"[b]Note:[/b] Using this method together with [method Callable.call_deferred] "
+"makes it more reliable, especially when called inside [method Node._ready]."
+msgstr ""
+"Перехватите фокус у другого элемента управления и станьте сфокусированным "
+"элементом управления (см. [member focus_mode]).\n"
+"[b]Примечание:[/b] Использование этого метода вместе с [method Callable."
+"call_deferred] делает его более надежным, особенно при вызове внутри [method "
+"Node._ready]."
+
+msgid ""
+"Returns [code]true[/code] if this is the current focused control. See [member "
+"focus_mode]."
+msgstr ""
+"Возвращает [code]true[/code], если это текущий сфокусированный элемент "
+"управления. См. [member focus_mode]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a color item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующая [Theme], "
+"которая имеет элемент цвета с указанными [param name] и [param theme_type].\n"
+"Подробнее см. [method get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a local override for a theme [Color] "
+"with the specified [param name] in this [Control] node.\n"
+"See [method add_theme_color_override]."
+msgstr ""
+"Возвращает [code]true[/code], если есть локальное переопределение для темы "
+"[Color] с указанным [param name] в этом узле [Control].\n"
+"См. [method add_theme_color_override]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a constant item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующая [Theme], "
+"которая имеет постоянный элемент с указанными [param name] и [param "
+"theme_type].\n"
+"Подробнее см. [method get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a local override for a theme constant "
+"with the specified [param name] in this [Control] node.\n"
+"See [method add_theme_constant_override]."
+msgstr ""
+"Возвращает [code]true[/code], если есть локальное переопределение для "
+"константы темы с указанным [param name] в этом узле [Control].\n"
+"См. [method add_theme_constant_override]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a font item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующая [Theme], "
+"которая имеет элемент шрифта с указанными [param name] и [param theme_type].\n"
+"Подробнее см. [method get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a local override for a theme [Font] "
+"with the specified [param name] in this [Control] node.\n"
+"See [method add_theme_font_override]."
+msgstr ""
+"Возвращает [code]true[/code], если есть локальное переопределение для темы "
+"[Font] с указанным [param name] в этом узле [Control].\n"
+"См. [method add_theme_font_override]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a font size item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующая [Theme], "
+"которая имеет элемент размера шрифта с указанными [param name] и [param "
+"theme_type].\n"
+"Подробности см. в [method get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a local override for a theme font size "
+"with the specified [param name] in this [Control] node.\n"
+"See [method add_theme_font_size_override]."
+msgstr ""
+"Возвращает [code]true[/code], если есть локальное переопределение для размера "
+"шрифта темы с указанным [param name] в этом узле [Control].\n"
+"См. [method add_theme_font_size_override]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"an icon item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующая [Theme], "
+"которая имеет элемент значка с указанными [param name] и [param theme_type].\n"
+"Подробнее см. [method get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a local override for a theme icon with "
+"the specified [param name] in this [Control] node.\n"
+"See [method add_theme_icon_override]."
+msgstr ""
+"Возвращает [code]true[/code], если есть локальное переопределение для значка "
+"темы с указанным [param name] в этом узле [Control].\n"
+"См. [method add_theme_icon_override]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a stylebox item with the specified [param name] and [param theme_type].\n"
+"See [method get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующая [Theme], "
+"которая имеет элемент stylebox с указанными [param name] и [param "
+"theme_type].\n"
+"Подробнее см. [method get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a local override for a theme [StyleBox] "
+"with the specified [param name] in this [Control] node.\n"
+"See [method add_theme_stylebox_override]."
+msgstr ""
+"Возвращает [code]true[/code], если есть локальное переопределение для темы "
+"[StyleBox] с указанным [param name] в этом узле [Control].\n"
+"См. [method add_theme_stylebox_override]."
+
+msgid ""
+"Returns [code]true[/code] if a drag operation is successful. Alternative to "
+"[method Viewport.gui_is_drag_successful].\n"
+"Best used with [constant Node.NOTIFICATION_DRAG_END]."
+msgstr ""
+"Возвращает [code]true[/code], если операция перетаскивания прошла успешно. "
+"Альтернатива [method Viewport.gui_is_drag_successful].\n"
+"Лучше всего использовать с [constant Node.NOTIFICATION_DRAG_END]."
+
+msgid ""
+"Returns [code]true[/code] if layout is right-to-left. See also [member "
+"layout_direction]."
+msgstr ""
+"Возвращает [code]true[/code], если макет справа налево. См. также [member "
+"layout_direction]."
+
+msgid "Give up the focus. No other control will be able to receive input."
+msgstr ""
+"Откажитесь от фокуса. Никакой другой элемент управления не сможет получить "
+"входные данные."
+
+msgid ""
+"Removes a local override for a theme [Color] with the specified [param name] "
+"previously added by [method add_theme_color_override] or via the Inspector "
+"dock."
+msgstr ""
+"Удаляет локальное переопределение для темы [Color] с указанным [param name], "
+"ранее добавленное с помощью [method add_theme_color_override] или через "
+"панель инспектора."
+
+msgid ""
+"Removes a local override for a theme constant with the specified [param name] "
+"previously added by [method add_theme_constant_override] or via the Inspector "
+"dock."
+msgstr ""
+"Удаляет локальное переопределение для константы темы с указанным [param "
+"name], ранее добавленное [method add_theme_constant_override] или через "
+"панель инспектора."
+
+msgid ""
+"Removes a local override for a theme [Font] with the specified [param name] "
+"previously added by [method add_theme_font_override] or via the Inspector "
+"dock."
+msgstr ""
+"Удаляет локальное переопределение для темы [Font] с указанным [param name], "
+"ранее добавленное [method add_theme_font_override] или через панель "
+"инспектора."
+
+msgid ""
+"Removes a local override for a theme font size with the specified [param "
+"name] previously added by [method add_theme_font_size_override] or via the "
+"Inspector dock."
+msgstr ""
+"Удаляет локальное переопределение размера шрифта темы с указанным [param "
+"name], ранее добавленное [method add_theme_font_size_override] или через "
+"панель инспектора."
+
+msgid ""
+"Removes a local override for a theme icon with the specified [param name] "
+"previously added by [method add_theme_icon_override] or via the Inspector "
+"dock."
+msgstr ""
+"Удаляет локальное переопределение для значка темы с указанным [param name], "
+"ранее добавленное [method add_theme_icon_override] или через панель "
+"инспектора."
+
+msgid ""
+"Removes a local override for a theme [StyleBox] with the specified [param "
+"name] previously added by [method add_theme_stylebox_override] or via the "
+"Inspector dock."
+msgstr ""
+"Удаляет локальное переопределение для темы [StyleBox] с указанным [param "
+"name], ранее добавленное [method add_theme_stylebox_override] или через "
+"панель инспектора."
+
+msgid ""
+"Resets the size to [method get_combined_minimum_size]. This is equivalent to "
+"calling [code]set_size(Vector2())[/code] (or any size below the minimum)."
+msgstr ""
+"Сбрасывает размер до [method get_combined_minimum_size]. Это эквивалентно "
+"вызову [code]set_size(Vector2())[/code] (или любого размера ниже "
+"минимального)."
+
+msgid ""
+"Sets the anchor for the specified [enum Side] to [param anchor]. A setter "
+"method for [member anchor_bottom], [member anchor_left], [member "
+"anchor_right] and [member anchor_top].\n"
+"If [param keep_offset] is [code]true[/code], offsets aren't updated after "
+"this operation.\n"
+"If [param push_opposite_anchor] is [code]true[/code] and the opposite anchor "
+"overlaps this anchor, the opposite one will have its value overridden. For "
+"example, when setting left anchor to 1 and the right anchor has value of 0.5, "
+"the right anchor will also get value of 1. If [param push_opposite_anchor] "
+"was [code]false[/code], the left anchor would get value 0.5."
+msgstr ""
+"Устанавливает якорь для указанного [enum Side] на [param anchor]. Метод "
+"установки для [member anchor_bottom], [member anchor_left], [member "
+"anchor_right] и [member anchor_top].\n"
+"Если [param keep_offset] равен [code]true[/code], смещения не обновляются "
+"после этой операции.\n"
+"Если [param push_opposite_anchor] равен [code]true[/code] и противоположный "
+"якорь перекрывает этот якорь, противоположный якорь будет иметь "
+"переопределенное значение. Например, если установить левый якорь на 1, а "
+"правый якорь имеет значение 0,5, правый якорь также получит значение 1. Если "
+"[param push_opposite_anchor] равен [code]false[/code], левый якорь получит "
+"значение 0,5."
+
+msgid ""
+"Works the same as [method set_anchor], but instead of [code]keep_offset[/"
+"code] argument and automatic update of offset, it allows to set the offset "
+"yourself (see [method set_offset])."
+msgstr ""
+"Работает так же, как [method set_anchor], но вместо аргумента "
+"[code]keep_offset[/code] и автоматического обновления смещения, он позволяет "
+"установить смещение самостоятельно (см. [method set_offset])."
+
+msgid ""
+"Sets both anchor preset and offset preset. See [method set_anchors_preset] "
+"and [method set_offsets_preset]."
+msgstr ""
+"Устанавливает как предустановку якоря, так и предустановку смещения. См. "
+"[method set_anchors_preset] и [method set_offsets_preset]."
+
+msgid ""
+"Sets the anchors to a [param preset] from [enum Control.LayoutPreset] enum. "
+"This is the code equivalent to using the Layout menu in the 2D editor.\n"
+"If [param keep_offsets] is [code]true[/code], control's position will also be "
+"updated."
+msgstr ""
+"Устанавливает якоря на [param preset] из [enum Control.LayoutPreset] enum. "
+"Это код, эквивалентный использованию меню Layout в 2D-редакторе.\n"
+"Если [param keep_offsets] равен [code]true[/code], положение элемента "
+"управления также будет обновлено."
+
+msgid ""
+"Sets [member offset_left] and [member offset_top] at the same time. "
+"Equivalent of changing [member position]."
+msgstr ""
+"Устанавливает [member offset_left] и [member offset_top] одновременно. "
+"Эквивалентно изменению [member position]."
+
+msgid ""
+"Sets the given callables to be used instead of the control's own drag-and-"
+"drop virtual methods. If a callable is empty, its respective virtual method "
+"is used as normal.\n"
+"The arguments for each callable should be exactly the same as their "
+"respective virtual methods, which would be:\n"
+"- [param drag_func] corresponds to [method _get_drag_data] and requires a "
+"[Vector2];\n"
+"- [param can_drop_func] corresponds to [method _can_drop_data] and requires "
+"both a [Vector2] and a [Variant];\n"
+"- [param drop_func] corresponds to [method _drop_data] and requires both a "
+"[Vector2] and a [Variant]."
+msgstr ""
+"Устанавливает заданные вызываемые объекты для использования вместо "
+"собственных виртуальных методов перетаскивания элемента управления. Если "
+"вызываемый объект пуст, соответствующий ему виртуальный метод используется "
+"как обычно.\n"
+"Аргументы для каждого вызываемого объекта должны быть точно такими же, как и "
+"соответствующие им виртуальные методы, которые будут:\n"
+"- [param drag_func] соответствует [method _get_drag_data] и требует "
+"[Vector2];\n"
+"- [param can_drop_func] соответствует [method _can_drop_data] и требует как "
+"[Vector2], так и [Variant];\n"
+"- [param drop_func] соответствует [method _drop_data] и требует как "
+"[Vector2], так и [Variant]."
+
+msgid ""
+"Shows the given control at the mouse pointer. A good time to call this method "
+"is in [method _get_drag_data]. The control must not be in the scene tree. You "
+"should not free the control, and you should not keep a reference to the "
+"control beyond the duration of the drag. It will be deleted automatically "
+"after the drag has ended.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@export var color = Color(1, 0, 0, 1)\n"
+"\n"
+"func _get_drag_data(position):\n"
+"    # Use a control that is not in the tree\n"
+"    var cpb = ColorPickerButton.new()\n"
+"    cpb.color = color\n"
+"    cpb.size = Vector2(50, 50)\n"
+"    set_drag_preview(cpb)\n"
+"    return color\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export]\n"
+"private Color _color = new Color(1, 0, 0, 1);\n"
+"\n"
+"public override Variant _GetDragData(Vector2 atPosition)\n"
+"{\n"
+"    // Use a control that is not in the tree\n"
+"    var cpb = new ColorPickerButton();\n"
+"    cpb.Color = _color;\n"
+"    cpb.Size = new Vector2(50, 50);\n"
+"    SetDragPreview(cpb);\n"
+"    return _color;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Показывает заданный элемент управления на указателе мыши. Хорошее время для "
+"вызова этого метода — в [method _get_drag_data]. Элемент управления не должен "
+"находиться в дереве сцены. Вы не должны освобождать элемент управления и не "
+"должны сохранять ссылку на элемент управления после окончания перетаскивания. "
+"Он будет автоматически удален после завершения перетаскивания.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@export var color = Color(1, 0, 0, 1)\n"
+"\n"
+"func _get_drag_data(position):\n"
+"    # Используйте элемент управления, которого нет в дереве\n"
+"    var cpb = ColorPickerButton.new()\n"
+"    cpb.color = color\n"
+"    cpb.size = Vector2(50, 50)\n"
+"    set_drag_preview(cpb)\n"
+"    return color\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export]\n"
+"private Color _color = new Color(1, 0, 0, 1);\n"
+"\n"
+"public override Variant _GetDragData(Vector2 atPosition)\n"
+"{\n"
+"    // Используйте элемент управления, которого нет в дереве\n"
+"    var cpb = new ColorPickerButton();\n"
+"    cpb.Color = _color;\n"
+"    cpb.Size = new Vector2(50, 50);\n"
+"    SetDragPreview(cpb);\n"
+"    return _color;\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid "Sets [member offset_right] and [member offset_bottom] at the same time."
+msgstr ""
+"Устанавливает [member offset_right] и [member offset_bottom] одновременно."
+
+msgid ""
+"Sets the focus neighbor for the specified [enum Side] to the [Control] at "
+"[param neighbor] node path. A setter method for [member "
+"focus_neighbor_bottom], [member focus_neighbor_left], [member "
+"focus_neighbor_right] and [member focus_neighbor_top]."
+msgstr ""
+"Устанавливает соседа фокуса для указанного [enum Side] на [Control] в [param "
+"neighbor] пути узла. Метод установки для [member focus_neighbor_bottom], "
+"[member focus_neighbor_left], [member focus_neighbor_right] и [member "
+"focus_neighbor_top]."
+
+msgid ""
+"Sets the [member global_position] to given [param position].\n"
+"If [param keep_offsets] is [code]true[/code], control's anchors will be "
+"updated instead of offsets."
+msgstr ""
+"Устанавливает [member global_position] на заданное [param position].\n"
+"Если [param keep_offsets] равно [code]true[/code], вместо смещений будут "
+"обновлены якоря элемента управления."
+
+msgid ""
+"Sets the offset for the specified [enum Side] to [param offset]. A setter "
+"method for [member offset_bottom], [member offset_left], [member "
+"offset_right] and [member offset_top]."
+msgstr ""
+"Устанавливает смещение для указанного [enum Side] на [param offset]. Метод "
+"установки для [member offset_bottom], [member offset_left], [member "
+"offset_right] и [member offset_top]."
+
+msgid ""
+"Sets the offsets to a [param preset] from [enum Control.LayoutPreset] enum. "
+"This is the code equivalent to using the Layout menu in the 2D editor.\n"
+"Use parameter [param resize_mode] with constants from [enum Control."
+"LayoutPresetMode] to better determine the resulting size of the [Control]. "
+"Constant size will be ignored if used with presets that change size, e.g. "
+"[constant PRESET_LEFT_WIDE].\n"
+"Use parameter [param margin] to determine the gap between the [Control] and "
+"the edges."
+msgstr ""
+"Устанавливает смещения на [param preset] из [enum Control.LayoutPreset]. Это "
+"код, эквивалентный использованию меню Layout в 2D-редакторе.\n"
+"Используйте параметр [param resize_mode] с константами из [enum Control."
+"LayoutPresetMode], чтобы лучше определить результирующий размер [Control]. "
+"Постоянный размер будет игнорироваться, если используется с предустановками, "
+"которые изменяют размер, например, [constant PRESET_LEFT_WIDE].\n"
+"Используйте параметр [param margin], чтобы определить зазор между [Control] и "
+"краями."
+
+msgid ""
+"Sets the [member position] to given [param position].\n"
+"If [param keep_offsets] is [code]true[/code], control's anchors will be "
+"updated instead of offsets."
+msgstr ""
+"Устанавливает [member position] на заданное [param position].\n"
+"Если [param keep_offsets] равно [code]true[/code], то вместо смещений будут "
+"обновлены якоря элемента управления."
+
+msgid ""
+"Sets the size (see [member size]).\n"
+"If [param keep_offsets] is [code]true[/code], control's anchors will be "
+"updated instead of offsets."
+msgstr ""
+"Устанавливает размер (см. [member size]).\n"
+"Если [param keep_offsets] равен [code]true[/code], вместо смещений будут "
+"обновлены якоря элемента управления."
+
+msgid ""
+"Invalidates the size cache in this node and in parent nodes up to top level. "
+"Intended to be used with [method get_minimum_size] when the return value is "
+"changed. Setting [member custom_minimum_size] directly calls this method "
+"automatically."
+msgstr ""
+"Делает недействительным кэш размера в этом узле и в родительских узлах до "
+"верхнего уровня. Предназначено для использования с [method get_minimum_size] "
+"при изменении возвращаемого значения. Установка [member custom_minimum_size] "
+"напрямую вызывает этот метод автоматически."
+
+msgid ""
+"Moves the mouse cursor to [param position], relative to [member position] of "
+"this [Control].\n"
+"[b]Note:[/b] [method warp_mouse] is only supported on Windows, macOS and "
+"Linux. It has no effect on Android, iOS and Web."
+msgstr ""
+"Перемещает курсор мыши в [param position], относительно [member position] "
+"этого [Control].\n"
+"[b]Примечание:[/b] [method warp_mouse] поддерживается только в Windows, macOS "
+"и Linux. Он не действует на Android, iOS и Web."
+
+msgid ""
+"Anchors the bottom edge of the node to the origin, the center, or the end of "
+"its parent control. It changes how the bottom offset updates when the node "
+"moves or changes size. You can use one of the [enum Anchor] constants for "
+"convenience."
+msgstr ""
+"Прикрепляет нижний край узла к началу координат, центру или концу его "
+"родительского элемента управления. Изменяет способ обновления нижнего "
+"смещения при перемещении узла или изменении его размера. Для удобства можно "
+"использовать одну из констант [enum Anchor]."
+
+msgid ""
+"Anchors the left edge of the node to the origin, the center or the end of its "
+"parent control. It changes how the left offset updates when the node moves or "
+"changes size. You can use one of the [enum Anchor] constants for convenience."
+msgstr ""
+"Привязывает левый край узла к началу координат, центру или концу его "
+"родительского элемента управления. Изменяет способ обновления левого смещения "
+"при перемещении узла или изменении размера. Для удобства можно использовать "
+"одну из констант [enum Anchor]."
+
+msgid ""
+"Anchors the right edge of the node to the origin, the center or the end of "
+"its parent control. It changes how the right offset updates when the node "
+"moves or changes size. You can use one of the [enum Anchor] constants for "
+"convenience."
+msgstr ""
+"Привязывает правый край узла к началу координат, центру или концу его "
+"родительского элемента управления. Изменяет способ обновления правого "
+"смещения при перемещении узла или изменении его размера. Для удобства можно "
+"использовать одну из констант [enum Anchor]."
+
+msgid ""
+"Anchors the top edge of the node to the origin, the center or the end of its "
+"parent control. It changes how the top offset updates when the node moves or "
+"changes size. You can use one of the [enum Anchor] constants for convenience."
+msgstr ""
+"Прикрепляет верхний край узла к началу координат, центру или концу его "
+"родительского элемента управления. Изменяет способ обновления верхнего "
+"смещения при перемещении узла или изменении его размера. Для удобства можно "
+"использовать одну из констант [enum Anchor]."
+
+msgid "Use [member Node.auto_translate_mode] instead."
+msgstr "Вместо этого используйте [member Node.auto_translate_mode]."
+
+msgid ""
+"Toggles if any text should automatically change to its translated version "
+"depending on the current locale."
+msgstr ""
+"Включает/выключает автоматическую замену текста на переведенную версию в "
+"зависимости от текущей локали."
+
+msgid ""
+"Enables whether rendering of [CanvasItem] based children should be clipped to "
+"this control's rectangle. If [code]true[/code], parts of a child which would "
+"be visibly outside of this control's rectangle will not be rendered and won't "
+"receive input."
+msgstr ""
+"Включает, следует ли обрезать отрисовку дочерних элементов на основе "
+"[CanvasItem] до прямоугольника этого элемента управления. Если [code]true[/"
+"code], части дочернего элемента, которые будут видны за пределами "
+"прямоугольника этого элемента управления, не будут отрисовываться и не будут "
+"получать входные данные."
+
+msgid ""
+"The minimum size of the node's bounding rectangle. If you set it to a value "
+"greater than [code](0, 0)[/code], the node's bounding rectangle will always "
+"have at least this size. Note that [Control] nodes have their internal "
+"minimum size returned by [method get_minimum_size]. It depends on the "
+"control's contents, like text, textures, or style boxes. The actual minimum "
+"size is the maximum value of this property and the internal minimum size (see "
+"[method get_combined_minimum_size])."
+msgstr ""
+"Минимальный размер ограничивающего прямоугольника узла. Если вы установите "
+"его на значение больше, чем [code](0, 0)[/code], ограничивающий прямоугольник "
+"узла всегда будет иметь по крайней мере этот размер. Обратите внимание, что "
+"узлы [Control] имеют свой внутренний минимальный размер, возвращаемый [method "
+"get_minimum_size]. Он зависит от содержимого элемента управления, такого как "
+"текст, текстуры или поля стилей. Фактический минимальный размер — это "
+"максимальное значение этого свойства и внутренний минимальный размер (см. "
+"[method get_combined_minimum_size])."
+
+msgid ""
+"The focus access mode for the control (None, Click or All). Only one Control "
+"can be focused at the same time, and it will receive keyboard, gamepad, and "
+"mouse signals."
+msgstr ""
+"Режим доступа к фокусу для элемента управления (None, Click or All). Только "
+"один элемент управления может быть сфокусирован одновременно, и он будет "
+"получать сигналы клавиатуры, геймпада и мыши."
+
+msgid ""
+"Tells Godot which node it should give focus to if the user presses the down "
+"arrow on the keyboard or down on a gamepad by default. You can change the key "
+"by editing the [member ProjectSettings.input/ui_down] input action. The node "
+"must be a [Control]. If this property is not set, Godot will give focus to "
+"the closest [Control] to the bottom of this one."
+msgstr ""
+"Сообщает Godot, какому узлу следует передать фокус, если пользователь "
+"нажимает стрелку вниз на клавиатуре или вниз на геймпаде по умолчанию. Вы "
+"можете изменить клавишу, отредактировав действие ввода [member "
+"ProjectSettings.input/ui_down]. Узел должен быть [Control]. Если это свойство "
+"не задано, Godot передаст фокус ближайшему [Control] к нижней части этого."
+
+msgid ""
+"Tells Godot which node it should give focus to if the user presses the left "
+"arrow on the keyboard or left on a gamepad by default. You can change the key "
+"by editing the [member ProjectSettings.input/ui_left] input action. The node "
+"must be a [Control]. If this property is not set, Godot will give focus to "
+"the closest [Control] to the left of this one."
+msgstr ""
+"Сообщает Godot, какому узлу следует передать фокус, если пользователь "
+"нажимает левую стрелку на клавиатуре или левую на геймпаде по умолчанию. Вы "
+"можете изменить клавишу, отредактировав действие ввода [member "
+"ProjectSettings.input/ui_left]. Узел должен быть [Control]. Если это свойство "
+"не задано, Godot передаст фокус ближайшему [Control] слева от этого."
+
+msgid ""
+"Tells Godot which node it should give focus to if the user presses the right "
+"arrow on the keyboard or right on a gamepad by default. You can change the "
+"key by editing the [member ProjectSettings.input/ui_right] input action. The "
+"node must be a [Control]. If this property is not set, Godot will give focus "
+"to the closest [Control] to the right of this one."
+msgstr ""
+"Сообщает Godot, какому узлу следует передать фокус, если пользователь "
+"нажимает стрелку вправо на клавиатуре или вправо на геймпаде по умолчанию. Вы "
+"можете изменить клавишу, отредактировав действие ввода [member "
+"ProjectSettings.input/ui_right]. Узел должен быть [Control]. Если это "
+"свойство не задано, Godot передаст фокус ближайшему [Control] справа от этого."
+
+msgid ""
+"Tells Godot which node it should give focus to if the user presses the top "
+"arrow on the keyboard or top on a gamepad by default. You can change the key "
+"by editing the [member ProjectSettings.input/ui_up] input action. The node "
+"must be a [Control]. If this property is not set, Godot will give focus to "
+"the closest [Control] to the top of this one."
+msgstr ""
+"Сообщает Godot, какому узлу следует передать фокус, если пользователь "
+"нажимает верхнюю стрелку на клавиатуре или верхнюю на геймпаде по умолчанию. "
+"Вы можете изменить клавишу, отредактировав действие ввода [member "
+"ProjectSettings.input/ui_up]. Узел должен быть [Control]. Если это свойство "
+"не задано, Godot передаст фокус ближайшему [Control] к верхней части этого."
+
+msgid ""
+"Tells Godot which node it should give focus to if the user presses [kbd]Tab[/"
+"kbd] on a keyboard by default. You can change the key by editing the [member "
+"ProjectSettings.input/ui_focus_next] input action.\n"
+"If this property is not set, Godot will select a \"best guess\" based on "
+"surrounding nodes in the scene tree."
+msgstr ""
+"Сообщает Godot, на какой узел следует направить фокус, если пользователь "
+"нажимает [kbd]Tab[/kbd] на клавиатуре по умолчанию. Вы можете изменить "
+"клавишу, отредактировав действие ввода [member ProjectSettings.input/"
+"ui_focus_next]. \n"
+"Если это свойство не задано, Godot выберет «лучшее предположение» на основе "
+"окружающих узлов в дереве сцены."
+
+msgid ""
+"Tells Godot which node it should give focus to if the user presses [kbd]Shift "
+"+ Tab[/kbd] on a keyboard by default. You can change the key by editing the "
+"[member ProjectSettings.input/ui_focus_prev] input action.\n"
+"If this property is not set, Godot will select a \"best guess\" based on "
+"surrounding nodes in the scene tree."
+msgstr ""
+"Сообщает Godot, на какой узел следует направить фокус, если пользователь "
+"нажимает [kbd]Shift + Tab[/kbd] на клавиатуре по умолчанию. Вы можете "
+"изменить клавишу, отредактировав действие ввода [member ProjectSettings.input/"
+"ui_focus_prev]. \n"
+"Если это свойство не задано, Godot выберет «лучшее предположение» на основе "
+"окружающих узлов в дереве сцены."
+
+msgid ""
+"The node's global position, relative to the world (usually to the "
+"[CanvasLayer])."
+msgstr ""
+"Глобальное положение узла относительно мира (обычно по отношению к "
+"[CanvasLayer])."
+
+msgid ""
+"Controls the direction on the horizontal axis in which the control should "
+"grow if its horizontal minimum size is changed to be greater than its current "
+"size, as the control always has to be at least the minimum size."
+msgstr ""
+"Управляет направлением по горизонтальной оси, в котором должен увеличиваться "
+"элемент управления, если его минимальный горизонтальный размер изменяется и "
+"становится больше текущего размера, поскольку элемент управления всегда "
+"должен иметь размер не меньше минимального."
+
+msgid ""
+"Controls the direction on the vertical axis in which the control should grow "
+"if its vertical minimum size is changed to be greater than its current size, "
+"as the control always has to be at least the minimum size."
+msgstr ""
+"Управляет направлением по вертикальной оси, в котором должен увеличиваться "
+"элемент управления, если его минимальный вертикальный размер изменяется и "
+"становится больше текущего размера, поскольку элемент управления всегда "
+"должен иметь размер не меньше минимального."
+
+msgid ""
+"Controls layout direction and text writing direction. Right-to-left layouts "
+"are necessary for certain languages (e.g. Arabic and Hebrew). See also "
+"[method is_layout_rtl]."
+msgstr ""
+"Управляет направлением макета и направлением написания текста. Для некоторых "
+"языков (например, арабского и иврита) необходимы макеты справа налево. См. "
+"также [method is_layout_rtl]."
+
+msgid ""
+"If [code]true[/code], automatically converts code line numbers, list indices, "
+"[SpinBox] and [ProgressBar] values from the Western Arabic (0..9) to the "
+"numeral systems used in current locale.\n"
+"[b]Note:[/b] Numbers within the text are not automatically converted, it can "
+"be done manually, using [method TextServer.format_number]."
+msgstr ""
+"Если [code]true[/code], автоматически преобразует номера строк кода, индексы "
+"списков, значения [SpinBox] и [ProgressBar] из западно-арабской системы "
+"счисления (0..9) в системы счисления, используемые в текущей локали.\n"
+"[b]Примечание:[/b] Числа в тексте не преобразуются автоматически, это можно "
+"сделать вручную, используя [method TextServer.format_number]."
+
+msgid ""
+"The default cursor shape for this control. Useful for Godot plugins and "
+"applications or games that use the system's mouse cursors.\n"
+"[b]Note:[/b] On Linux, shapes may vary depending on the cursor theme of the "
+"system."
+msgstr ""
+"Форма курсора по умолчанию для этого элемента управления. Полезно для "
+"плагинов Godot и приложений или игр, которые используют системные курсоры "
+"мыши.\n"
+"[b]Примечание:[/b] В Linux формы могут различаться в зависимости от темы "
+"курсора системы."
+
+msgid ""
+"Controls whether the control will be able to receive mouse button input "
+"events through [method _gui_input] and how these events should be handled. "
+"Also controls whether the control can receive the [signal mouse_entered], and "
+"[signal mouse_exited] signals. See the constants to learn what each does."
+msgstr ""
+"Управляет тем, сможет ли элемент управления получать события ввода кнопки "
+"мыши через [method _gui_input] и как эти события должны обрабатываться. Также "
+"управляет тем, может ли элемент управления получать сигналы [signal "
+"mouse_entered] и [signal mouse_exited]. См. константы, чтобы узнать, что "
+"делает каждая из них."
+
+msgid ""
+"When enabled, scroll wheel events processed by [method _gui_input] will be "
+"passed to the parent control even if [member mouse_filter] is set to "
+"[constant MOUSE_FILTER_STOP].\n"
+"You should disable it on the root of your UI if you do not want scroll events "
+"to go to the [method Node._unhandled_input] processing.\n"
+"[b]Note:[/b] Because this property defaults to [code]true[/code], this allows "
+"nested scrollable containers to work out of the box."
+msgstr ""
+"При включении события колеса прокрутки, обработанные [method _gui_input], "
+"будут передаваться родительскому элементу управления, даже если [member "
+"mouse_filter] установлен на [constant MOUSE_FILTER_STOP].\n"
+"Вы должны отключить его в корне вашего пользовательского интерфейса, если вы "
+"не хотите, чтобы события прокрутки передавались в обработку [method Node."
+"_unhandled_input].\n"
+"[b]Примечание:[/b] Поскольку это свойство по умолчанию равно [code]true[/"
+"code], это позволяет вложенным прокручиваемым контейнерам работать из коробки."
+
+msgid ""
+"Distance between the node's bottom edge and its parent control, based on "
+"[member anchor_bottom].\n"
+"Offsets are often controlled by one or multiple parent [Container] nodes, so "
+"you should not modify them manually if your node is a direct child of a "
+"[Container]. Offsets update automatically when you move or resize the node."
+msgstr ""
+"Расстояние между нижним краем узла и его родительским элементом управления, "
+"основанное на [member anchor_bottom].\n"
+"Смещения часто контролируются одним или несколькими родительскими узлами "
+"[Container], поэтому вам не следует изменять их вручную, если ваш узел "
+"является прямым потомком [Container]. Смещения обновляются автоматически при "
+"перемещении или изменении размера узла."
+
+msgid ""
+"Distance between the node's left edge and its parent control, based on "
+"[member anchor_left].\n"
+"Offsets are often controlled by one or multiple parent [Container] nodes, so "
+"you should not modify them manually if your node is a direct child of a "
+"[Container]. Offsets update automatically when you move or resize the node."
+msgstr ""
+"Расстояние между левым краем узла и его родительским элементом управления, "
+"основанное на [member anchor_left]. \n"
+"Смещения часто контролируются одним или несколькими родительскими узлами "
+"[Container], поэтому вам не следует изменять их вручную, если ваш узел "
+"является прямым потомком [Container]. Смещения обновляются автоматически при "
+"перемещении или изменении размера узла."
+
+msgid ""
+"Distance between the node's right edge and its parent control, based on "
+"[member anchor_right].\n"
+"Offsets are often controlled by one or multiple parent [Container] nodes, so "
+"you should not modify them manually if your node is a direct child of a "
+"[Container]. Offsets update automatically when you move or resize the node."
+msgstr ""
+"Расстояние между правым краем узла и его родительским элементом управления, "
+"основанное на [member anchor_right]. \n"
+"Смещения часто контролируются одним или несколькими родительскими узлами "
+"[Container], поэтому вам не следует изменять их вручную, если ваш узел "
+"является прямым потомком [Container]. Смещения обновляются автоматически при "
+"перемещении или изменении размера узла."
+
+msgid ""
+"Distance between the node's top edge and its parent control, based on [member "
+"anchor_top].\n"
+"Offsets are often controlled by one or multiple parent [Container] nodes, so "
+"you should not modify them manually if your node is a direct child of a "
+"[Container]. Offsets update automatically when you move or resize the node."
+msgstr ""
+"Расстояние между верхним краем узла и его родительским элементом управления, "
+"основанное на [member anchor_top].\n"
+"Смещения часто контролируются одним или несколькими родительскими узлами "
+"[Container], поэтому вам не следует изменять их вручную, если ваш узел "
+"является прямым потомком [Container]. Смещения обновляются автоматически при "
+"перемещении или изменении размера узла."
+
+msgid ""
+"By default, the node's pivot is its top-left corner. When you change its "
+"[member rotation] or [member scale], it will rotate or scale around this "
+"pivot. Set this property to [member size] / 2 to pivot around the Control's "
+"center."
+msgstr ""
+"По умолчанию точкой опоры узла является его верхний левый угол. При изменении "
+"его [member rotation] или [member scale] он будет поворачиваться или "
+"масштабироваться вокруг этой точки опоры. Установите это свойство на [member "
+"size] / 2, чтобы вращаться вокруг центра элемента Control."
+
+msgid ""
+"The node's position, relative to its containing node. It corresponds to the "
+"rectangle's top-left corner. The property is not affected by [member "
+"pivot_offset]."
+msgstr ""
+"Положение узла относительно содержащего его узла. Соответствует верхнему "
+"левому углу прямоугольника. Свойство не зависит от [member pivot_offset]."
+
+msgid ""
+"The node's rotation around its pivot, in radians. See [member pivot_offset] "
+"to change the pivot's position.\n"
+"[b]Note:[/b] This property is edited in the inspector in degrees. If you want "
+"to use degrees in a script, use [member rotation_degrees]."
+msgstr ""
+"Вращение узла вокруг его опорной точки в радианах. См. [member pivot_offset], "
+"чтобы изменить положение опорной точки.\n"
+"[b]Примечание:[/b] Это свойство редактируется в инспекторе в градусах. Если "
+"вы хотите использовать градусы в скрипте, используйте [member "
+"rotation_degrees]."
+
+msgid ""
+"Helper property to access [member rotation] in degrees instead of radians."
+msgstr ""
+"Вспомогательное свойство для доступа к [member rotation] в градусах вместо "
+"радиан."
+
+msgid ""
+"The [Node] which must be a parent of the focused [Control] for the shortcut "
+"to be activated. If [code]null[/code], the shortcut can be activated when any "
+"control is focused (a global shortcut). This allows shortcuts to be accepted "
+"only when the user has a certain area of the GUI focused."
+msgstr ""
+"[Node], который должен быть родителем сфокусированного [Control], чтобы "
+"сочетание клавиш было активировано. Если [code]null[/code], сочетание клавиш "
+"может быть активировано, когда любой элемент управления находится в фокусе "
+"(глобальное сочетание клавиш). Это позволяет принимать сочетания клавиш "
+"только тогда, когда пользователь сфокусировал определенную область "
+"графического интерфейса."
+
+msgid ""
+"The size of the node's bounding rectangle, in the node's coordinate system. "
+"[Container] nodes update this property automatically."
+msgstr ""
+"Размер ограничивающего прямоугольника узла в системе координат узла. Узлы "
+"[Container] обновляют это свойство автоматически."
+
+msgid ""
+"Tells the parent [Container] nodes how they should resize and place the node "
+"on the X axis. Use a combination of the [enum SizeFlags] constants to change "
+"the flags. See the constants to learn what each does."
+msgstr ""
+"Сообщает родительским узлам [Container], как они должны изменить размер и "
+"разместить узел на оси X. Используйте комбинацию констант [enum SizeFlags], "
+"чтобы изменить флаги. Посмотрите константы, чтобы узнать, что делает каждая "
+"из них."
+
+msgid ""
+"If the node and at least one of its neighbors uses the [constant SIZE_EXPAND] "
+"size flag, the parent [Container] will let it take more or less space "
+"depending on this property. If this node has a stretch ratio of 2 and its "
+"neighbor a ratio of 1, this node will take two thirds of the available space."
+msgstr ""
+"Если узел и хотя бы один из его соседей используют флаг размера [constant "
+"SIZE_EXPAND], родительский [Container] позволит ему занять больше или меньше "
+"места в зависимости от этого свойства. Если этот узел имеет коэффициент "
+"растяжения 2, а его сосед — коэффициент 1, этот узел займет две трети "
+"доступного пространства."
+
+msgid ""
+"Tells the parent [Container] nodes how they should resize and place the node "
+"on the Y axis. Use a combination of the [enum SizeFlags] constants to change "
+"the flags. See the constants to learn what each does."
+msgstr ""
+"Сообщает родительским узлам [Container], как они должны изменить размер и "
+"разместить узел на оси Y. Используйте комбинацию констант [enum SizeFlags], "
+"чтобы изменить флаги. Посмотрите константы, чтобы узнать, что делает каждая "
+"из них."
+
+msgid ""
+"The [Theme] resource this node and all its [Control] and [Window] children "
+"use. If a child node has its own [Theme] resource set, theme items are merged "
+"with child's definitions having higher priority.\n"
+"[b]Note:[/b] [Window] styles will have no effect unless the window is "
+"embedded."
+msgstr ""
+"Ресурс [Theme], который использует этот узел и все его дочерние элементы "
+"[Control] и [Window]. Если дочерний узел имеет свой собственный набор "
+"ресурсов [Theme], элементы темы объединяются с определениями дочернего "
+"элемента, имеющими более высокий приоритет.\n"
+"[b]Примечание:[/b] Стили [Window] не будут иметь никакого эффекта, если окно "
+"не встроено."
+
+msgid ""
+"The name of a theme type variation used by this [Control] to look up its own "
+"theme items. When empty, the class name of the node is used (e.g. [code skip-"
+"lint]Button[/code] for the [Button] control), as well as the class names of "
+"all parent classes (in order of inheritance).\n"
+"When set, this property gives the highest priority to the type of the "
+"specified name. This type can in turn extend another type, forming a "
+"dependency chain. See [method Theme.set_type_variation]. If the theme item "
+"cannot be found using this type or its base types, lookup falls back on the "
+"class names.\n"
+"[b]Note:[/b] To look up [Control]'s own items use various [code]get_theme_*[/"
+"code] methods without specifying [code]theme_type[/code].\n"
+"[b]Note:[/b] Theme items are looked for in the tree order, from branch to "
+"root, where each [Control] node is checked for its [member theme] property. "
+"The earliest match against any type/class name is returned. The project-level "
+"Theme and the default Theme are checked last."
+msgstr ""
+"Имя вариации типа темы, используемой этим [Control] для поиска собственных "
+"элементов темы. Если пусто, используется имя класса узла (например, [code "
+"skip-lint]Button[/code] для элемента управления [Button]), а также имена "
+"классов всех родительских классов (в порядке наследования).\n"
+"Если установлено, это свойство дает наивысший приоритет типу указанного "
+"имени. Этот тип, в свою очередь, может расширять другой тип, образуя цепочку "
+"зависимостей. См. [method Theme.set_type_variation]. Если элемент темы не "
+"может быть найден с помощью этого типа или его базовых типов, поиск "
+"возвращается к именам классов.\n"
+"[b]Примечание:[/b] Для поиска собственных элементов [Control] используйте "
+"различные методы [code]get_theme_*[/code] без указания [code]theme_type[/"
+"code].\n"
+"[b]Примечание:[/b] Элементы темы ищутся в порядке дерева, от ветви к корню, "
+"где каждый узел [Control] проверяется на предмет его свойства [member theme]. "
+"Возвращается самое раннее совпадение с любым именем типа/класса. Тема уровня "
+"проекта и тема по умолчанию проверяются последними."
+
+msgid ""
+"Defines if tooltip text should automatically change to its translated version "
+"depending on the current locale. Uses the same auto translate mode as this "
+"control when set to [constant Node.AUTO_TRANSLATE_MODE_INHERIT].\n"
+"[b]Note:[/b] Tooltips customized using [method _make_custom_tooltip] do not "
+"use this auto translate mode automatically."
+msgstr ""
+"Определяет, должен ли текст подсказки автоматически меняться на переведенную "
+"версию в зависимости от текущей локали. Использует тот же режим "
+"автоматического перевода, что и этот элемент управления, если задано значение "
+"[constant Node.AUTO_TRANSLATE_MODE_INHERIT].\n"
+"[b]Примечание:[/b] Подсказки, настроенные с помощью [method "
+"_make_custom_tooltip], не используют этот режим автоматического перевода "
+"автоматически."
+
+msgid "Emitted when the node receives an [InputEvent]."
+msgstr "Вызывается, когда узел получает [InputEvent]."
+
+msgid "Emitted when the node's minimum size changes."
+msgstr "Вызывается при изменении минимального размера узла."
+
+msgid ""
+"Emitted when the mouse cursor enters the control's (or any child control's) "
+"visible area, that is not occluded behind other Controls or Windows, provided "
+"its [member mouse_filter] lets the event reach it and regardless if it's "
+"currently focused or not.\n"
+"[b]Note:[/b] [member CanvasItem.z_index] doesn't affect, which Control "
+"receives the signal."
+msgstr ""
+"Вызывается, когда курсор мыши попадает в видимую область элемента управления "
+"(или любого дочернего элемента управления), которая не перекрыта другими "
+"элементами управления или окнами, при условии, что его [member mouse_filter] "
+"позволяет событию достичь его, и независимо от того, находится ли он в фокусе "
+"в данный момент или нет.\n"
+"[b]Примечание:[/b] [member CanvasItem.z_index] не влияет на то, какой элемент "
+"управления получает сигнал."
+
+msgid ""
+"Emitted when the mouse cursor leaves the control's (and all child control's) "
+"visible area, that is not occluded behind other Controls or Windows, provided "
+"its [member mouse_filter] lets the event reach it and regardless if it's "
+"currently focused or not.\n"
+"[b]Note:[/b] [member CanvasItem.z_index] doesn't affect, which Control "
+"receives the signal.\n"
+"[b]Note:[/b] If you want to check whether the mouse truly left the area, "
+"ignoring any top nodes, you can use code like this:\n"
+"[codeblock]\n"
+"func _on_mouse_exited():\n"
+"    if not Rect2(Vector2(), size).has_point(get_local_mouse_position()):\n"
+"        # Not hovering over area.\n"
+"[/codeblock]"
+msgstr ""
+"Вызывается, когда курсор мыши покидает видимую область элемента управления (и "
+"всех дочерних элементов управления), которая не перекрыта другими элементами "
+"управления или окнами, при условии, что его [member mouse_filter] позволяет "
+"событию достичь его, и независимо от того, находится ли он в фокусе в данный "
+"момент или нет.\n"
+"[b]Примечание:[/b] [member CanvasItem.z_index] не влияет на то, какой элемент "
+"управления получает сигнал.\n"
+"[b]Примечание:[/b] Если вы хотите проверить, действительно ли мышь покинула "
+"область, игнорируя любые верхние узлы, вы можете использовать такой код:\n"
+"[codeblock]\n"
+"func _on_mouse_exited():\n"
+"    if not Rect2(Vector2(), size).has_point(get_local_mouse_position()):\n"
+"        # Не зависает над областью.\n"
+"[/codeblock]"
+
+msgid "Emitted when the control changes size."
+msgstr "Вызывается при изменении размера элемента управления."
+
+msgid ""
+"Emitted when one of the size flags changes. See [member "
+"size_flags_horizontal] and [member size_flags_vertical]."
+msgstr ""
+"Выдается при изменении одного из флагов размера. См. [member "
+"size_flags_horizontal] и [member size_flags_vertical]."
+
+msgid ""
+"Emitted when the [constant NOTIFICATION_THEME_CHANGED] notification is sent."
+msgstr ""
+"Вызывается при отправке уведомления [constant NOTIFICATION_THEME_CHANGED]."
+
+msgid "The node cannot grab focus. Use with [member focus_mode]."
+msgstr "Узел не может захватить фокус. Используйте с [member focus_mode]."
+
+msgid ""
+"The node can only grab focus on mouse clicks. Use with [member focus_mode]."
+msgstr ""
+"Узел может захватывать фокус только по щелчкам мыши. Используйте с [member "
+"focus_mode]."
+
+msgid ""
+"The node can grab focus on mouse click, using the arrows and the Tab keys on "
+"the keyboard, or using the D-pad buttons on a gamepad. Use with [member "
+"focus_mode]."
+msgstr ""
+"Узел может захватывать фокус по щелчку мыши, используя стрелки и клавиши Tab "
+"на клавиатуре или кнопки D-pad на геймпаде. Используйте с [member focus_mode]."
+
+msgid "Sent when the node changes size. Use [member size] to get the new size."
+msgstr ""
+"Отправляется, когда узел меняет размер. Используйте [member size], чтобы "
+"получить новый размер."
+
+msgid ""
+"Sent when the mouse cursor enters the control's (or any child control's) "
+"visible area, that is not occluded behind other Controls or Windows, provided "
+"its [member mouse_filter] lets the event reach it and regardless if it's "
+"currently focused or not.\n"
+"[b]Note:[/b] [member CanvasItem.z_index] doesn't affect which Control "
+"receives the notification.\n"
+"See also [constant NOTIFICATION_MOUSE_ENTER_SELF]."
+msgstr ""
+"Отправляется, когда курсор мыши попадает в видимую область элемента "
+"управления (или любого дочернего элемента управления), которая не перекрыта "
+"другими элементами управления или окнами, при условии, что его [member "
+"mouse_filter] позволяет событию достичь его, и независимо от того, находится "
+"ли он в фокусе в данный момент или нет.\n"
+"[b]Примечание:[/b] [member CanvasItem.z_index] не влияет на то, какой элемент "
+"управления получает уведомление.\n"
+"См. также [constant NOTIFICATION_MOUSE_ENTER_SELF]."
+
+msgid ""
+"Sent when the mouse cursor leaves the control's (and all child control's) "
+"visible area, that is not occluded behind other Controls or Windows, provided "
+"its [member mouse_filter] lets the event reach it and regardless if it's "
+"currently focused or not.\n"
+"[b]Note:[/b] [member CanvasItem.z_index] doesn't affect which Control "
+"receives the notification.\n"
+"See also [constant NOTIFICATION_MOUSE_EXIT_SELF]."
+msgstr ""
+"Отправляется, когда курсор мыши покидает видимую область элемента управления "
+"(и всех дочерних элементов управления), которая не перекрыта другими "
+"элементами управления или окнами, при условии, что его [member mouse_filter] "
+"позволяет событию достичь его, и независимо от того, находится ли он в фокусе "
+"в данный момент или нет.\n"
+"[b]Примечание:[/b] [member CanvasItem.z_index] не влияет на то, какой элемент "
+"управления получает уведомление.\n"
+"См. также [constant NOTIFICATION_MOUSE_EXIT_SELF]."
+
+msgid "The reason this notification is sent may change in the future."
+msgstr "Причина отправки данного уведомления может измениться в будущем."
+
+msgid ""
+"Sent when the mouse cursor enters the control's visible area, that is not "
+"occluded behind other Controls or Windows, provided its [member mouse_filter] "
+"lets the event reach it and regardless if it's currently focused or not.\n"
+"[b]Note:[/b] [member CanvasItem.z_index] doesn't affect which Control "
+"receives the notification.\n"
+"See also [constant NOTIFICATION_MOUSE_ENTER]."
+msgstr ""
+"Sent when the mouse cursor enters the control's visible area, that is not "
+"occluded behind other Controls or Windows, provided its [member mouse_filter] "
+"lets the event reach it and regardless if it's currently focused or not.\n"
+"[b]Note:[/b] [member CanvasItem.z_index] doesn't affect which Control "
+"receives the notification.\n"
+"См. также [constant NOTIFICATION_MOUSE_ENTER]."
+
+msgid ""
+"Sent when the mouse cursor leaves the control's visible area, that is not "
+"occluded behind other Controls or Windows, provided its [member mouse_filter] "
+"lets the event reach it and regardless if it's currently focused or not.\n"
+"[b]Note:[/b] [member CanvasItem.z_index] doesn't affect which Control "
+"receives the notification.\n"
+"See also [constant NOTIFICATION_MOUSE_EXIT]."
+msgstr ""
+"Отправляется, когда курсор мыши покидает видимую область элемента управления, "
+"которая не перекрыта другими элементами управления или окнами, при условии, "
+"что его [member mouse_filter] позволяет событию достичь его, и независимо от "
+"того, находится ли он в фокусе в данный момент или нет.\n"
+"[b]Примечание:[/b] [member CanvasItem.z_index] не влияет на то, какой элемент "
+"управления получит уведомление.\n"
+"См. также [constant NOTIFICATION_MOUSE_EXIT]."
+
+msgid "Sent when the node grabs focus."
+msgstr "Отправляется, когда узел захватывает фокус."
+
+msgid "Sent when the node loses focus."
+msgstr "Отправляется, когда узел теряет фокус."
+
+msgid ""
+"Sent when the node needs to refresh its theme items. This happens in one of "
+"the following cases:\n"
+"- The [member theme] property is changed on this node or any of its "
+"ancestors.\n"
+"- The [member theme_type_variation] property is changed on this node.\n"
+"- One of the node's theme property overrides is changed.\n"
+"- The node enters the scene tree.\n"
+"[b]Note:[/b] As an optimization, this notification won't be sent from changes "
+"that occur while this node is outside of the scene tree. Instead, all of the "
+"theme item updates can be applied at once when the node enters the scene "
+"tree.\n"
+"[b]Note:[/b] This notification is received alongside [constant Node."
+"NOTIFICATION_ENTER_TREE], so if you are instantiating a scene, the child "
+"nodes will not be initialized yet. You can use it to setup theming for this "
+"node, child nodes created from script, or if you want to access child nodes "
+"added in the editor, make sure the node is ready using [method Node."
+"is_node_ready].\n"
+"[codeblock]\n"
+"func _notification(what):\n"
+"    if what == NOTIFICATION_THEME_CHANGED:\n"
+"        if not is_node_ready():\n"
+"            await ready # Wait until ready signal.\n"
+"        $Label.add_theme_color_override(\"font_color\", Color.YELLOW)\n"
+"[/codeblock]"
+msgstr ""
+"Отправляется, когда узлу необходимо обновить элементы темы. Это происходит в "
+"одном из следующих случаев:\n"
+"- Свойство [member theme] изменено на этом узле или любом из его предков.\n"
+"- Свойство [member theme_type_variation] изменено на этом узле.\n"
+"- Изменено одно из переопределений свойств темы узла.\n"
+"- Узел входит в дерево сцены.\n"
+"[b]Примечание:[/b] В качестве оптимизации это уведомление не будет отправлено "
+"из изменений, которые происходят, пока этот узел находится вне дерева сцены. "
+"Вместо этого все обновления элементов темы могут быть применены одновременно, "
+"когда узел входит в дерево сцены.\n"
+"[b]Примечание:[/b] Это уведомление получено вместе с [constant Node."
+"NOTIFICATION_ENTER_TREE], поэтому, если вы создаете сцену, дочерние узлы еще "
+"не будут инициализированы. Вы можете использовать его для настройки тем для "
+"этого узла, дочерних узлов, созданных из скрипта, или, если вы хотите "
+"получить доступ к дочерним узлам, добавленным в редакторе, убедитесь, что "
+"узел готов, используя [method Node.is_node_ready].\n"
+"[codeblock]\n"
+"func _notification(what):\n"
+"    if what == NOTIFICATION_THEME_CHANGED:\n"
+"        if not is_node_ready():\n"
+"            await ready # Wait until ready signal.\n"
+"        $Label.add_theme_color_override(\"font_color\", Color.YELLOW)\n"
+"[/codeblock]"
+
+msgid ""
+"Sent when this node is inside a [ScrollContainer] which has begun being "
+"scrolled when dragging the scrollable area [i]with a touch event[/i]. This "
+"notification is [i]not[/i] sent when scrolling by dragging the scrollbar, "
+"scrolling with the mouse wheel or scrolling with keyboard/gamepad events.\n"
+"[b]Note:[/b] This signal is only emitted on Android or iOS, or on desktop/web "
+"platforms when [member ProjectSettings.input_devices/pointing/"
+"emulate_touch_from_mouse] is enabled."
+msgstr ""
+"Отправляется, когда этот узел находится внутри [ScrollContainer], который "
+"начал прокручиваться при перетаскивании прокручиваемой области [i]с помощью "
+"события касания[/i]. Это уведомление [i]не[/i] отправляется при прокрутке "
+"путем перетаскивания полосы прокрутки, прокрутки колесиком мыши или прокрутки "
+"с помощью событий клавиатуры/геймпада.\n"
+"[b]Примечание:[/b] Этот сигнал выдается только на Android или iOS, или на "
+"настольных/веб-платформах, когда включен [member ProjectSettings."
+"input_devices/pointing/emulate_touch_from_mouse]."
+
+msgid ""
+"Sent when this node is inside a [ScrollContainer] which has stopped being "
+"scrolled when dragging the scrollable area [i]with a touch event[/i]. This "
+"notification is [i]not[/i] sent when scrolling by dragging the scrollbar, "
+"scrolling with the mouse wheel or scrolling with keyboard/gamepad events.\n"
+"[b]Note:[/b] This signal is only emitted on Android or iOS, or on desktop/web "
+"platforms when [member ProjectSettings.input_devices/pointing/"
+"emulate_touch_from_mouse] is enabled."
+msgstr ""
+"Отправляется, когда этот узел находится внутри [ScrollContainer], который "
+"перестал прокручиваться при перетаскивании прокручиваемой области [i]событием "
+"касания[/i]. Это уведомление [i]не[/i] отправляется при прокрутке путем "
+"перетаскивания полосы прокрутки, прокрутки колесиком мыши или прокрутки с "
+"помощью событий клавиатуры/геймпада.\n"
+"[b]Примечание:[/b] Этот сигнал выдается только на Android или iOS, или на "
+"настольных/веб-платформах, когда включен [member ProjectSettings."
+"input_devices/pointing/emulate_touch_from_mouse]."
+
+msgid ""
+"Sent when the control layout direction is changed from LTR or RTL or vice "
+"versa. This notification is propagated to child Control nodes as result of a "
+"change to [member layout_direction]."
+msgstr ""
+"Отправляется, когда направление макета элемента управления изменяется с LTR "
+"или RTL или наоборот. Это уведомление распространяется на дочерние узлы "
+"Control в результате изменения [member layout_direction]."
+
+msgid ""
+"Show the system's arrow mouse cursor when the user hovers the node. Use with "
+"[member mouse_default_cursor_shape]."
+msgstr ""
+"Показывать системный курсор мыши в виде стрелки, когда пользователь наводит "
+"курсор на узел. Использовать с [member mouse_default_cursor_shape]."
+
+msgid ""
+"Show the system's I-beam mouse cursor when the user hovers the node. The I-"
+"beam pointer has a shape similar to \"I\". It tells the user they can "
+"highlight or insert text."
+msgstr ""
+"Показывать системный I-образный курсор мыши, когда пользователь наводит "
+"курсор на узел. I-образный указатель имеет форму, похожую на \"I\". Он "
+"сообщает пользователю, что он может выделить или вставить текст."
+
+msgid ""
+"Show the system's pointing hand mouse cursor when the user hovers the node."
+msgstr ""
+"Показывать курсор мыши в виде указывающей руки системы, когда пользователь "
+"наводит курсор на узел."
+
+msgid "Show the system's cross mouse cursor when the user hovers the node."
+msgstr ""
+"Показывать системный курсор мыши в виде крестика, когда пользователь наводит "
+"курсор на узел."
+
+msgid ""
+"Show the system's wait mouse cursor when the user hovers the node. Often an "
+"hourglass."
+msgstr ""
+"Показывать курсор мыши ожидания системы, когда пользователь наводит курсор на "
+"узел. Часто песочные часы."
+
+msgid ""
+"Show the system's busy mouse cursor when the user hovers the node. Often an "
+"arrow with a small hourglass."
+msgstr ""
+"Показывать занятый курсор мыши системы, когда пользователь наводит его на "
+"узел. Часто стрелка с маленькими песочными часами."
+
+msgid ""
+"Show the system's drag mouse cursor, often a closed fist or a cross symbol, "
+"when the user hovers the node. It tells the user they're currently dragging "
+"an item, like a node in the Scene dock."
+msgstr ""
+"Показывать системный курсор мыши для перетаскивания, часто сжатый кулак или "
+"символ креста, когда пользователь наводит курсор на узел. Он сообщает "
+"пользователю, что в данный момент он перетаскивает элемент, например узел в "
+"доке сцены."
+
+msgid ""
+"Show the system's drop mouse cursor when the user hovers the node. It can be "
+"an open hand. It tells the user they can drop an item they're currently "
+"grabbing, like a node in the Scene dock."
+msgstr ""
+"Показывать системный курсор мыши, когда пользователь наводит курсор на узел. "
+"Это может быть открытая ладонь. Он сообщает пользователю, что он может "
+"отпустить элемент, который он в данный момент захватывает, например, узел в "
+"доке сцены."
+
+msgid ""
+"Show the system's forbidden mouse cursor when the user hovers the node. Often "
+"a crossed circle."
+msgstr ""
+"Показывать запрещенный системой курсор мыши, когда пользователь наводит его "
+"на узел. Часто перечеркнутый круг."
+
+msgid ""
+"Show the system's vertical resize mouse cursor when the user hovers the node. "
+"A double-headed vertical arrow. It tells the user they can resize the window "
+"or the panel vertically."
+msgstr ""
+"Показывать вертикальный курсор мыши системы изменения размера, когда "
+"пользователь наводит его на узел. Двунаправленная вертикальная стрелка. Она "
+"сообщает пользователю, что он может изменять размер окна или панели по "
+"вертикали."
+
+msgid ""
+"Show the system's horizontal resize mouse cursor when the user hovers the "
+"node. A double-headed horizontal arrow. It tells the user they can resize the "
+"window or the panel horizontally."
+msgstr ""
+"Показывать горизонтальный курсор мыши системы изменения размера, когда "
+"пользователь наводит его на узел. Двунаправленная горизонтальная стрелка. Она "
+"сообщает пользователю, что он может изменять размер окна или панели по "
+"горизонтали."
+
+msgid ""
+"Show the system's window resize mouse cursor when the user hovers the node. "
+"The cursor is a double-headed arrow that goes from the bottom left to the top "
+"right. It tells the user they can resize the window or the panel both "
+"horizontally and vertically."
+msgstr ""
+"Показывать курсор мыши для изменения размера окна системы, когда пользователь "
+"наводит его на узел. Курсор — это двунаправленная стрелка, которая идет из "
+"нижнего левого угла в верхний правый угол. Он сообщает пользователю, что он "
+"может изменять размер окна или панели как по горизонтали, так и по вертикали."
+
+msgid ""
+"Show the system's window resize mouse cursor when the user hovers the node. "
+"The cursor is a double-headed arrow that goes from the top left to the bottom "
+"right, the opposite of [constant CURSOR_BDIAGSIZE]. It tells the user they "
+"can resize the window or the panel both horizontally and vertically."
+msgstr ""
+"Показывать курсор мыши для изменения размера окна системы, когда пользователь "
+"наводит его на узел. Курсор — это двунаправленная стрелка, которая идет из "
+"верхнего левого угла в нижний правый угол, противоположность [constant "
+"CURSOR_BDIAGSIZE]. Он сообщает пользователю, что он может изменять размер "
+"окна или панели как по горизонтали, так и по вертикали."
+
+msgid ""
+"Show the system's move mouse cursor when the user hovers the node. It shows 2 "
+"double-headed arrows at a 90 degree angle. It tells the user they can move a "
+"UI element freely."
+msgstr ""
+"Показывать курсор мыши перемещения системы, когда пользователь наводит его на "
+"узел. Он показывает 2 двунаправленные стрелки под углом 90 градусов. Он "
+"сообщает пользователю, что он может свободно перемещать элемент "
+"пользовательского интерфейса."
+
+msgid ""
+"Show the system's vertical split mouse cursor when the user hovers the node. "
+"On Windows, it's the same as [constant CURSOR_VSIZE]."
+msgstr ""
+"Показывать вертикальный разделенный курсор мыши системы, когда пользователь "
+"наводит курсор на узел. В Windows это то же самое, что и [constant "
+"CURSOR_VSIZE]."
+
+msgid ""
+"Show the system's horizontal split mouse cursor when the user hovers the "
+"node. On Windows, it's the same as [constant CURSOR_HSIZE]."
+msgstr ""
+"Показывать горизонтальный разделенный курсор мыши системы, когда пользователь "
+"наводит курсор на узел. В Windows это то же самое, что и [constant "
+"CURSOR_HSIZE]."
+
+msgid ""
+"Show the system's help mouse cursor when the user hovers the node, a question "
+"mark."
+msgstr ""
+"Показывать системную справку: курсор мыши при наведении на узел - "
+"вопросительный знак."
+
+msgid ""
+"Snap all 4 anchors to the top-left of the parent control's bounds. Use with "
+"[method set_anchors_preset]."
+msgstr ""
+"Прикрепить все 4 якоря к верхнему левому углу границ родительского элемента "
+"управления. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the top-right of the parent control's bounds. Use with "
+"[method set_anchors_preset]."
+msgstr ""
+"Прикрепить все 4 якоря к правому верхнему краю границ родительского элемента "
+"управления. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the bottom-left of the parent control's bounds. Use "
+"with [method set_anchors_preset]."
+msgstr ""
+"Прикрепить все 4 якоря к нижнему левому углу границ родительского элемента "
+"управления. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the bottom-right of the parent control's bounds. Use "
+"with [method set_anchors_preset]."
+msgstr ""
+"Прикрепить все 4 якоря к нижнему правому краю границ родительского элемента "
+"управления. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the center of the left edge of the parent control's "
+"bounds. Use with [method set_anchors_preset]."
+msgstr ""
+"Привязать все 4 якоря к центру левого края границ родительского элемента "
+"управления. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the center of the top edge of the parent control's "
+"bounds. Use with [method set_anchors_preset]."
+msgstr ""
+"Привяжите все 4 якоря к центру верхнего края границ родительского элемента "
+"управления. Используйте с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the center of the right edge of the parent control's "
+"bounds. Use with [method set_anchors_preset]."
+msgstr ""
+"Привязать все 4 якоря к центру правого края границ родительского элемента "
+"управления. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the center of the bottom edge of the parent control's "
+"bounds. Use with [method set_anchors_preset]."
+msgstr ""
+"Привяжите все 4 якоря к центру нижнего края границ родительского элемента "
+"управления. Используйте с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the center of the parent control's bounds. Use with "
+"[method set_anchors_preset]."
+msgstr ""
+"Привязать все 4 якоря к центру границ родительского элемента управления. "
+"Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the left edge of the parent control. The left offset "
+"becomes relative to the left edge and the top offset relative to the top left "
+"corner of the node's parent. Use with [method set_anchors_preset]."
+msgstr ""
+"Привязать все 4 якоря к левому краю родительского элемента управления. Левое "
+"смещение становится относительным к левому краю, а верхнее смещение — "
+"относительно верхнего левого угла родительского узла. Использовать с [method "
+"set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the top edge of the parent control. The left offset "
+"becomes relative to the top left corner, the top offset relative to the top "
+"edge, and the right offset relative to the top right corner of the node's "
+"parent. Use with [method set_anchors_preset]."
+msgstr ""
+"Привязать все 4 якоря к верхнему краю родительского элемента управления. "
+"Левое смещение становится относительно верхнего левого угла, верхнее смещение "
+"относительно верхнего края, а правое смещение относительно верхнего правого "
+"угла родительского узла. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the right edge of the parent control. The right offset "
+"becomes relative to the right edge and the top offset relative to the top "
+"right corner of the node's parent. Use with [method set_anchors_preset]."
+msgstr ""
+"Привязать все 4 якоря к правому краю родительского элемента управления. "
+"Правое смещение становится относительным к правому краю, а верхнее смещение — "
+"относительно верхнего правого угла родителя узла. Использовать с [method "
+"set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the bottom edge of the parent control. The left offset "
+"becomes relative to the bottom left corner, the bottom offset relative to the "
+"bottom edge, and the right offset relative to the bottom right corner of the "
+"node's parent. Use with [method set_anchors_preset]."
+msgstr ""
+"Привязать все 4 якоря к нижнему краю родительского элемента управления. Левое "
+"смещение становится относительно нижнего левого угла, нижнее смещение "
+"относительно нижнего края, а правое смещение относительно нижнего правого "
+"угла родительского узла. Использовать с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to a vertical line that cuts the parent control in half. "
+"Use with [method set_anchors_preset]."
+msgstr ""
+"Привяжите все 4 якоря к вертикальной линии, которая разрезает родительский "
+"элемент управления пополам. Используйте с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to a horizontal line that cuts the parent control in half. "
+"Use with [method set_anchors_preset]."
+msgstr ""
+"Привяжите все 4 якоря к горизонтальной линии, которая разрезает родительский "
+"элемент управления пополам. Используйте с [method set_anchors_preset]."
+
+msgid ""
+"Snap all 4 anchors to the respective corners of the parent control. Set all 4 "
+"offsets to 0 after you applied this preset and the [Control] will fit its "
+"parent control. Use with [method set_anchors_preset]."
+msgstr ""
+"Привяжите все 4 якоря к соответствующим углам родительского элемента "
+"управления. Установите все 4 смещения на 0 после применения этого пресета, и "
+"[Control] будет соответствовать своему родительскому элементу управления. "
+"Используйте с [method set_anchors_preset]."
+
+msgid "The control will be resized to its minimum size."
+msgstr "Размер элемента управления будет изменен до минимального."
+
+msgid "The control's width will not change."
+msgstr "Ширина элемента управления не изменится."
+
+msgid "The control's height will not change."
+msgstr "Высота элемента управления не изменится."
+
+msgid "The control's size will not change."
+msgstr "Размер элемента управления не изменится."
+
+msgid ""
+"Tells the parent [Container] to align the node with its start, either the top "
+"or the left edge. It is mutually exclusive with [constant SIZE_FILL] and "
+"other shrink size flags, but can be used with [constant SIZE_EXPAND] in some "
+"containers. Use with [member size_flags_horizontal] and [member "
+"size_flags_vertical].\n"
+"[b]Note:[/b] Setting this flag is equal to not having any size flags."
+msgstr ""
+"Сообщает родительскому [Container] о необходимости выровнять узел по его "
+"началу, либо по верхнему, либо по левому краю. Это взаимоисключающе с "
+"[constant SIZE_FILL] и другими флагами размера сжатия, но может "
+"использоваться с [constant SIZE_EXPAND] в некоторых контейнерах. Используйте "
+"с [member size_flags_horizontal] и [member size_flags_vertical].\n"
+"[b]Примечание:[/b] Установка этого флага эквивалентна отсутствию флагов "
+"размера."
+
+msgid ""
+"Tells the parent [Container] to expand the bounds of this node to fill all "
+"the available space without pushing any other node. It is mutually exclusive "
+"with shrink size flags. Use with [member size_flags_horizontal] and [member "
+"size_flags_vertical]."
+msgstr ""
+"Сообщает родительскому [Container] расширить границы этого узла, чтобы "
+"заполнить все доступное пространство, не выталкивая другие узлы. Это "
+"взаимоисключающе с флагами размера сжатия. Используйте с [member "
+"size_flags_horizontal] и [member size_flags_vertical]."
+
+msgid ""
+"Tells the parent [Container] to let this node take all the available space on "
+"the axis you flag. If multiple neighboring nodes are set to expand, they'll "
+"share the space based on their stretch ratio. See [member "
+"size_flags_stretch_ratio]. Use with [member size_flags_horizontal] and "
+"[member size_flags_vertical]."
+msgstr ""
+"Сообщает родительскому [Container] разрешить этому узлу занять все доступное "
+"пространство на помеченной вами оси. Если несколько соседних узлов настроены "
+"на расширение, они будут делить пространство на основе их коэффициента "
+"растяжения. См. [member size_flags_stretch_ratio]. Используйте с [member "
+"size_flags_horizontal] и [member size_flags_vertical]."
+
+msgid ""
+"Sets the node's size flags to both fill and expand. See [constant SIZE_FILL] "
+"and [constant SIZE_EXPAND] for more information."
+msgstr ""
+"Устанавливает флаги размера узла для заполнения и расширения. См. [constant "
+"SIZE_FILL] и [constant SIZE_EXPAND] для получения дополнительной информации."
+
+msgid ""
+"Tells the parent [Container] to center the node in the available space. It is "
+"mutually exclusive with [constant SIZE_FILL] and other shrink size flags, but "
+"can be used with [constant SIZE_EXPAND] in some containers. Use with [member "
+"size_flags_horizontal] and [member size_flags_vertical]."
+msgstr ""
+"Сообщает родительскому [Container] центрировать узел в доступном "
+"пространстве. Является взаимоисключающим с [constant SIZE_FILL] и другими "
+"флагами размера сжатия, но может использоваться с [constant SIZE_EXPAND] в "
+"некоторых контейнерах. Используйте с [member size_flags_horizontal] и [member "
+"size_flags_vertical]."
+
+msgid ""
+"Tells the parent [Container] to align the node with its end, either the "
+"bottom or the right edge. It is mutually exclusive with [constant SIZE_FILL] "
+"and other shrink size flags, but can be used with [constant SIZE_EXPAND] in "
+"some containers. Use with [member size_flags_horizontal] and [member "
+"size_flags_vertical]."
+msgstr ""
+"Сообщает родительскому [Container] о необходимости выровнять узел по его "
+"концу, либо по нижнему, либо по правому краю. Является взаимоисключающим с "
+"[constant SIZE_FILL] и другими флагами размера сжатия, но может "
+"использоваться с [constant SIZE_EXPAND] в некоторых контейнерах. Используйте "
+"с [member size_flags_horizontal] и [member size_flags_vertical]."
+
+msgid ""
+"The control will receive mouse movement input events and mouse button input "
+"events if clicked on through [method _gui_input]. The control will also "
+"receive the [signal mouse_entered] and [signal mouse_exited] signals. These "
+"events are automatically marked as handled, and they will not propagate "
+"further to other controls. This also results in blocking signals in other "
+"controls."
+msgstr ""
+"Элемент управления будет получать события ввода движения мыши и события ввода "
+"кнопки мыши, если щелкнуть по нему через [method _gui_input]. Элемент "
+"управления также будет получать сигналы [signal mouse_entered] и [signal "
+"mouse_exited]. Эти события автоматически помечаются как обработанные и не "
+"будут распространяться дальше на другие элементы управления. Это также "
+"приводит к блокировке сигналов в других элементах управления."
+
+msgid ""
+"The control will receive mouse movement input events and mouse button input "
+"events if clicked on through [method _gui_input]. The control will also "
+"receive the [signal mouse_entered] and [signal mouse_exited] signals.\n"
+"If this control does not handle the event, the event will propagate up to its "
+"parent control if it has one. The event is bubbled up the node hierarchy "
+"until it reaches a non-[CanvasItem], a control with [constant "
+"MOUSE_FILTER_STOP], or a [CanvasItem] with [member CanvasItem.top_level] "
+"enabled. This will allow signals to fire in all controls it reaches. If no "
+"control handled it, the event will be passed to [method Node._shortcut_input] "
+"for further processing."
+msgstr ""
+"Элемент управления будет получать события ввода движения мыши и события ввода "
+"кнопки мыши, если на него нажато через [method _gui_input]. Элемент "
+"управления также получит сигналы [signal mouse_entered] и [signal "
+"mouse_exited].\n"
+"Если этот элемент управления не обрабатывает событие, событие будет "
+"распространяться вверх к его родительскому элементу управления, если он есть. "
+"Событие всплывает вверх по иерархии узлов, пока не достигнет не-[CanvasItem], "
+"элемента управления с [constant MOUSE_FILTER_STOP] или [CanvasItem] с "
+"включенным [member CanvasItem.top_level]. Это позволит сигналам срабатывать "
+"во всех элементах управления, которых он достигает. Если ни один элемент "
+"управления не обработал его, событие будет передано в [method Node."
+"_shortcut_input] для дальнейшей обработки."
+
+msgid ""
+"The control will not receive any mouse movement input events nor mouse button "
+"input events through [method _gui_input]. The control will also not receive "
+"the [signal mouse_entered] nor [signal mouse_exited] signals. This will not "
+"block other controls from receiving these events or firing the signals. "
+"Ignored events will not be handled automatically. If a child has [constant "
+"MOUSE_FILTER_PASS] and an event was passed to this control, the event will "
+"further propagate up to the control's parent.\n"
+"[b]Note:[/b] If the control has received [signal mouse_entered] but not "
+"[signal mouse_exited], changing the [member mouse_filter] to [constant "
+"MOUSE_FILTER_IGNORE] will cause [signal mouse_exited] to be emitted."
+msgstr ""
+"Элемент управления не будет получать никаких событий ввода движения мыши или "
+"событий ввода кнопки мыши через [method _gui_input]. Элемент управления также "
+"не будет получать сигналы [signal mouse_entered] или [signal mouse_exited]. "
+"Это не помешает другим элементам управления получать эти события или подавать "
+"сигналы. Проигнорированные события не будут обрабатываться автоматически. "
+"Если у дочернего элемента есть [constant MOUSE_FILTER_PASS] и этому элементу "
+"управления было передано событие, событие будет далее распространяться до "
+"родительского элемента управления.\n"
+"[b]Примечание:[/b] Если элемент управления получил [signal mouse_entered], но "
+"не [signal mouse_exited], изменение [member mouse_filter] на [constant "
+"MOUSE_FILTER_IGNORE] приведет к испусканию [signal mouse_exited]."
+
+msgid ""
+"The control will grow to the left or top to make up if its minimum size is "
+"changed to be greater than its current size on the respective axis."
+msgstr ""
+"Элемент управления будет увеличиваться влево или вверх, если его минимальный "
+"размер изменится и станет больше текущего размера по соответствующей оси."
+
+msgid ""
+"The control will grow to the right or bottom to make up if its minimum size "
+"is changed to be greater than its current size on the respective axis."
+msgstr ""
+"Элемент управления будет увеличиваться вправо или вниз, если его минимальный "
+"размер изменится и станет больше текущего размера по соответствующей оси."
+
+msgid ""
+"The control will grow in both directions equally to make up if its minimum "
+"size is changed to be greater than its current size."
+msgstr ""
+"Элемент управления будет одинаково увеличиваться в обоих направлениях, чтобы "
+"компенсировать изменение его минимального размера и увеличение его текущего "
+"размера."
+
+msgid ""
+"Snaps one of the 4 anchor's sides to the origin of the node's [code]Rect[/"
+"code], in the top left. Use it with one of the [code]anchor_*[/code] member "
+"variables, like [member anchor_left]. To change all 4 anchors at once, use "
+"[method set_anchors_preset]."
+msgstr ""
+"Привязывает одну из 4 сторон якоря к началу координат [code]Rect[/code] узла "
+"в левом верхнем углу. Используйте его с одной из переменных-членов "
+"[code]anchor_*[/code], например [member anchor_left]. Чтобы изменить все 4 "
+"якоря одновременно, используйте [method set_anchors_preset]."
+
+msgid ""
+"Snaps one of the 4 anchor's sides to the end of the node's [code]Rect[/code], "
+"in the bottom right. Use it with one of the [code]anchor_*[/code] member "
+"variables, like [member anchor_left]. To change all 4 anchors at once, use "
+"[method set_anchors_preset]."
+msgstr ""
+"Привязывает одну из 4 сторон якоря к концу [code]Rect[/code] узла в правом "
+"нижнем углу. Используйте его с одной из переменных-членов [code]anchor_*[/"
+"code], например [member anchor_left]. Чтобы изменить все 4 якоря "
+"одновременно, используйте [method set_anchors_preset]."
+
+msgid ""
+"Automatic layout direction, determined from the parent control layout "
+"direction."
+msgstr ""
+"Автоматическое направление макета, определяемое на основе направления макета "
+"родительского элемента управления."
+
+msgid ""
+"Automatic layout direction, determined from the current locale. Right-to-left "
+"layout direction is automatically used for languages that require it such as "
+"Arabic and Hebrew, but only if a valid translation file is loaded for the "
+"given language (unless said language is configured as a fallback in [member "
+"ProjectSettings.internationalization/locale/fallback]). For all other "
+"languages (or if no valid translation file is found by Godot), left-to-right "
+"layout direction is used. If using [TextServerFallback] ([member "
+"ProjectSettings.internationalization/rendering/text_driver]), left-to-right "
+"layout direction is always used regardless of the language. Right-to-left "
+"layout direction can also be forced using [member ProjectSettings."
+"internationalization/rendering/force_right_to_left_layout_direction]."
+msgstr ""
+"Автоматическое направление макета, определяемое текущей локалью. Направление "
+"макета справа налево автоматически используется для языков, которым оно "
+"требуется, таких как арабский и иврит, но только если загружен допустимый "
+"файл перевода для данного языка (если только указанный язык не настроен как "
+"резервный в [member ProjectSettings.internationalization/locale/fallback]). "
+"Для всех других языков (или если Godot не нашел допустимый файл перевода) "
+"используется направление макета слева направо. При использовании "
+"[TextServerFallback] ([member ProjectSettings.internationalization/rendering/"
+"text_driver]) всегда используется направление макета слева направо независимо "
+"от языка. Направление макета справа налево также можно принудительно "
+"установить с помощью [member ProjectSettings.internationalization/rendering/"
+"force_right_to_left_layout_direction]."
+
+msgid "Right-to-left layout direction."
+msgstr "Направление раскладки справа налево."
+
+msgid ""
+"Automatic layout direction, determined from the system locale. Right-to-left "
+"layout direction is automatically used for languages that require it such as "
+"Arabic and Hebrew, but only if a valid translation file is loaded for the "
+"given language.. For all other languages (or if no valid translation file is "
+"found by Godot), left-to-right layout direction is used. If using "
+"[TextServerFallback] ([member ProjectSettings.internationalization/rendering/"
+"text_driver]), left-to-right layout direction is always used regardless of "
+"the language."
+msgstr ""
+"Автоматическое направление макета, определяемое системной локалью. "
+"Направление макета справа налево автоматически используется для языков, "
+"которым оно требуется, таких как арабский и иврит, но только если загружен "
+"допустимый файл перевода для данного языка. Для всех других языков (или если "
+"Godot не нашел допустимого файла перевода) используется направление макета "
+"слева направо. При использовании [TextServerFallback] ([member "
+"ProjectSettings.internationalization/rendering/text_driver]) всегда "
+"используется направление макета слева направо независимо от языка."
+
+msgid "Use [constant LAYOUT_DIRECTION_APPLICATION_LOCALE] instead."
+msgstr ""
+"Вместо этого используйте [constant LAYOUT_DIRECTION_APPLICATION_LOCALE]."
+
+msgid ""
+"Automatic text writing direction, determined from the current locale and text "
+"content."
+msgstr ""
+"Автоматическое направление написания текста, определяемое на основе текущей "
+"локали и содержимого текста."
+
+msgid "Left-to-right text writing direction."
+msgstr "Направление написания текста слева направо."
+
+msgid "Right-to-left text writing direction."
+msgstr "Направление текста справа налево."
+
+msgid "A 2D convex polygon shape used for physics collision."
+msgstr ""
+"Выпуклая двухмерная многоугольная форма, используемая для физического "
+"столкновения."
+
+msgid ""
+"A 2D convex polygon shape, intended for use in physics. Used internally in "
+"[CollisionPolygon2D] when it's in [constant CollisionPolygon2D.BUILD_SOLIDS] "
+"mode.\n"
+"[ConvexPolygonShape2D] is [i]solid[/i], which means it detects collisions "
+"from objects that are fully inside it, unlike [ConcavePolygonShape2D] which "
+"is hollow. This makes it more suitable for both detection and physics.\n"
+"[b]Convex decomposition:[/b] A concave polygon can be split up into several "
+"convex polygons. This allows dynamic physics bodies to have complex concave "
+"collisions (at a performance cost) and can be achieved by using several "
+"[ConvexPolygonShape2D] nodes or by using the [CollisionPolygon2D] node in "
+"[constant CollisionPolygon2D.BUILD_SOLIDS] mode. To generate a collision "
+"polygon from a sprite, select the [Sprite2D] node, go to the [b]Sprite2D[/b] "
+"menu that appears above the viewport, and choose [b]Create Polygon2D Sibling[/"
+"b].\n"
+"[b]Performance:[/b] [ConvexPolygonShape2D] is faster to check collisions "
+"against compared to [ConcavePolygonShape2D], but it is slower than primitive "
+"collision shapes such as [CircleShape2D] and [RectangleShape2D]. Its use "
+"should generally be limited to medium-sized objects that cannot have their "
+"collision accurately represented by primitive shapes."
+msgstr ""
+"Форма 2D выпуклого многоугольника, предназначенная для использования в "
+"физике. Используется внутри в [CollisionPolygon2D], когда он находится в "
+"режиме [constant CollisionPolygon2D.BUILD_SOLIDS].\n"
+"[ConvexPolygonShape2D] является [i]твердым[/i], что означает, что он "
+"обнаруживает столкновения от объектов, которые полностью находятся внутри "
+"него, в отличие от [ConcavePolygonShape2D], который является полым. Это "
+"делает его более подходящим как для обнаружения, так и для физики.\n"
+"[b]Выпуклая декомпозиция:[/b] Вогнутый полигон может быть разделен на "
+"несколько выпуклых полигонов. Это позволяет динамическим физическим телам "
+"иметь сложные вогнутые столкновения (за счет производительности) и может быть "
+"достигнуто с помощью нескольких узлов [ConvexPolygonShape2D] или с помощью "
+"узла [CollisionPolygon2D] в режиме [constant CollisionPolygon2D."
+"BUILD_SOLIDS]. Чтобы сгенерировать полигон столкновения из спрайта, выберите "
+"узел [Sprite2D], перейдите в меню [b]Sprite2D[/b], которое появляется над "
+"областью просмотра, и выберите [b]Создать Polygon2D Sibling[/b].\n"
+"[b]Производительность:[/b] [ConvexPolygonShape2D] быстрее проверяет "
+"столкновения по сравнению с [ConcavePolygonShape2D], но медленнее, чем "
+"примитивные формы столкновений, такие как [CircleShape2D] и "
+"[RectangleShape2D]. Его использование, как правило, должно быть ограничено "
+"объектами среднего размера, столкновения которых не могут быть точно "
+"представлены примитивными формами."
+
+msgid ""
+"Based on the set of points provided, this assigns the [member points] "
+"property using the convex hull algorithm, removing all unneeded points. See "
+"[method Geometry2D.convex_hull] for details."
+msgstr ""
+"На основе предоставленного набора точек это назначает свойство [member "
+"points] с использованием алгоритма выпуклой оболочки, удаляя все ненужные "
+"точки. Подробности см. в [method Geometry2D.convex_hull]."
+
+msgid ""
+"The polygon's list of vertices that form a convex hull. Can be in either "
+"clockwise or counterclockwise order.\n"
+"[b]Warning:[/b] Only set this property to a list of points that actually form "
+"a convex hull. Use [method set_point_cloud] to generate the convex hull of an "
+"arbitrary set of points."
+msgstr ""
+"Список вершин многоугольника, образующих выпуклую оболочку. Может быть в "
+"порядке по часовой стрелке или против часовой стрелки.\n"
+"[b]Предупреждение:[/b] Устанавливайте это свойство только для списка точек, "
+"которые фактически образуют выпуклую оболочку. Используйте [method "
+"set_point_cloud] для генерации выпуклой оболочки произвольного набора точек."
+
+msgid "A 3D convex polyhedron shape used for physics collision."
+msgstr ""
+"Трехмерная выпуклая многогранная форма, используемая для физического "
+"столкновения."
+
+msgid ""
+"A 3D convex polyhedron shape, intended for use in physics. Usually used to "
+"provide a shape for a [CollisionShape3D].\n"
+"[ConvexPolygonShape3D] is [i]solid[/i], which means it detects collisions "
+"from objects that are fully inside it, unlike [ConcavePolygonShape3D] which "
+"is hollow. This makes it more suitable for both detection and physics.\n"
+"[b]Convex decomposition:[/b] A concave polyhedron can be split up into "
+"several convex polyhedra. This allows dynamic physics bodies to have complex "
+"concave collisions (at a performance cost) and can be achieved by using "
+"several [ConvexPolygonShape3D] nodes. To generate a convex decomposition from "
+"a mesh, select the [MeshInstance3D] node, go to the [b]Mesh[/b] menu that "
+"appears above the viewport, and choose [b]Create Multiple Convex Collision "
+"Siblings[/b]. Alternatively, [method MeshInstance3D."
+"create_multiple_convex_collisions] can be called in a script to perform this "
+"decomposition at run-time.\n"
+"[b]Performance:[/b] [ConvexPolygonShape3D] is faster to check collisions "
+"against compared to [ConcavePolygonShape3D], but it is slower than primitive "
+"collision shapes such as [SphereShape3D] and [BoxShape3D]. Its use should "
+"generally be limited to medium-sized objects that cannot have their collision "
+"accurately represented by primitive shapes."
+msgstr ""
+"Трехмерная выпуклая многогранная форма, предназначенная для использования в "
+"физике. Обычно используется для предоставления формы для [CollisionShape3D].\n"
+"[ConvexPolygonShape3D] является [i]сплошным[/i], что означает, что он "
+"обнаруживает столкновения от объектов, которые полностью находятся внутри "
+"него, в отличие от [ConcavePolygonShape3D], который является полым. Это "
+"делает его более подходящим как для обнаружения, так и для физики.\n"
+"[b]Выпуклая декомпозиция:[/b] Вогнутый многогранник можно разбить на "
+"несколько выпуклых многогранников. Это позволяет динамическим физическим "
+"телам иметь сложные вогнутые столкновения (за счет производительности) и "
+"может быть достигнуто с помощью нескольких узлов [ConvexPolygonShape3D]. "
+"Чтобы сгенерировать выпуклую декомпозицию из сетки, выберите узел "
+"[MeshInstance3D], перейдите в меню [b]Mesh[/b], которое появляется над "
+"областью просмотра, и выберите [b]Create Multiple Convex Collision Siblings[/"
+"b]. В качестве альтернативы, [method MeshInstance3D."
+"create_multiple_convex_collisions] можно вызвать в скрипте для выполнения "
+"этой декомпозиции во время выполнения.\n"
+"[b]Производительность:[/b] [ConvexPolygonShape3D] быстрее проверяет "
+"столкновения по сравнению с [ConcavePolygonShape3D], но медленнее, чем "
+"примитивные формы столкновений, такие как [SphereShape3D] и [BoxShape3D]. Его "
+"использование, как правило, должно быть ограничено объектами среднего "
+"размера, столкновения которых не могут быть точно представлены примитивными "
+"формами."
+
+msgid "The list of 3D points forming the convex polygon shape."
+msgstr "Список 3D точек, образующих выпуклую многоугольную форму."
+
+msgid ""
+"CPU-based 2D particle node used to create a variety of particle systems and "
+"effects.\n"
+"See also [GPUParticles2D], which provides the same functionality with "
+"hardware acceleration, but may not run on older devices."
+msgstr ""
+"Узел 2D-частиц на базе ЦП, используемый для создания различных систем частиц "
+"и эффектов.\n"
+"См. также [GPUParticles2D], который обеспечивает ту же функциональность с "
+"аппаратным ускорением, но может не работать на старых устройствах."
+
+msgid "Particle systems (2D)"
+msgstr "Системы частиц (2D)"
+
+msgid ""
+"Sets this node's properties to match a given [GPUParticles2D] node with an "
+"assigned [ParticleProcessMaterial]."
+msgstr ""
+"Устанавливает свойства этого узла для соответствия заданному узлу "
+"[GPUParticles2D] с назначенным [ParticleProcessMaterial]."
+
+msgid "Returns the [Curve] of the parameter specified by [enum Parameter]."
+msgstr "Возвращает [Curve] параметра, указанного в [enum Parameter]."
+
+msgid ""
+"Returns the enabled state of the given particle flag (see [enum "
+"ParticleFlags] for options)."
+msgstr ""
+"Возвращает включенное состояние заданного флага частицы (параметры см. в "
+"[enum ParticleFlags])."
+
+msgid ""
+"Requests the particles to process for extra process time during a single "
+"frame.\n"
+"Useful for particle playback, if used in combination with [member "
+"use_fixed_seed] or by calling [method restart] with parameter "
+"[code]keep_seed[/code] set to [code]true[/code]."
+msgstr ""
+"Запрашивает обработку частиц для дополнительного времени процесса в течение "
+"одного кадра.\n"
+"Полезно для воспроизведения частиц, если используется в сочетании с [member "
+"use_fixed_seed] или путем вызова [method restart] с параметром "
+"[code]keep_seed[/code], установленным на [code]true[/code]."
+
+msgid ""
+"Restarts the particle emitter.\n"
+"If [param keep_seed] is [code]true[/code], the current random seed will be "
+"preserved. Useful for seeking and playback."
+msgstr ""
+"Перезапускает излучатель частиц.\n"
+"Если [param keep_seed] равен [code]true[/code], текущее случайное семя будет "
+"сохранено. Полезно для поиска и воспроизведения."
+
+msgid ""
+"Enables or disables the given flag (see [enum ParticleFlags] for options)."
+msgstr ""
+"Включает или отключает указанный флаг (опции см. в [enum ParticleFlags])."
+
+msgid "Number of particles emitted in one emission cycle."
+msgstr "Количество частиц, выбрасываемых за один цикл выброса."
+
+msgid ""
+"Each particle's rotation will be animated along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Вращение каждой частицы будет анимировано вдоль этой [Curve]. Должна быть "
+"единица [Curve]."
+
+msgid "Maximum initial rotation applied to each particle, in degrees."
+msgstr ""
+"Максимальное начальное вращение, применяемое к каждой частице, в градусах."
+
+msgid "Minimum equivalent of [member angle_max]."
+msgstr "Минимальный эквивалент [member angle_max]."
+
+msgid ""
+"Each particle's angular velocity will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Угловая скорость каждой частицы будет меняться вдоль этой [Кривой]. Должна "
+"быть единицей [Кривой]."
+
+msgid ""
+"Maximum initial angular velocity (rotation speed) applied to each particle in "
+"[i]degrees[/i] per second."
+msgstr ""
+"Максимальная начальная угловая скорость (ск. вращения), приложенная к каждой "
+"частице в [i]градусах[/i] в секунду."
+
+msgid "Minimum equivalent of [member angular_velocity_max]."
+msgstr "Минимальный эквивалент [member angular_velocity_max]."
+
+msgid ""
+"Each particle's animation offset will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Смещение анимации каждой частицы будет меняться вдоль этой [Curve]. Должно "
+"быть единицей [Curve]."
+
+msgid ""
+"Maximum animation offset that corresponds to frame index in the texture. "
+"[code]0[/code] is the first frame, [code]1[/code] is the last one. See "
+"[member CanvasItemMaterial.particles_animation]."
+msgstr ""
+"Максимальное смещение анимации, соответствующее индексу кадра в текстуре. "
+"[code]0[/code] — первый кадр, [code]1[/code] — последний. См. [member "
+"CanvasItemMaterial.particles_animation]."
+
+msgid "Minimum equivalent of [member anim_offset_max]."
+msgstr "Минимальный эквивалент [member anim_offset_max]."
+
+msgid ""
+"Each particle's animation speed will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Скорость анимации каждой частицы будет меняться вдоль этой [Кривой]. Должна "
+"быть единицей [Кривой]."
+
+msgid ""
+"Maximum particle animation speed. Animation speed of [code]1[/code] means "
+"that the particles will make full [code]0[/code] to [code]1[/code] offset "
+"cycle during lifetime, [code]2[/code] means [code]2[/code] cycles etc.\n"
+"With animation speed greater than [code]1[/code], remember to enable [member "
+"CanvasItemMaterial.particles_anim_loop] property if you want the animation to "
+"repeat."
+msgstr ""
+"Максимальная скорость анимации частиц. Скорость анимации [code]1[/code] "
+"означает, что частицы будут делать полный цикл смещения от [code]0[/code] до "
+"[code]1[/code] в течение жизни, [code]2[/code] означает [code]2[/code] циклов "
+"и т. д. \n"
+"При скорости анимации больше [code]1[/code] не забудьте включить свойство "
+"[member CanvasItemMaterial.particles_anim_loop], если вы хотите, чтобы "
+"анимация повторялась."
+
+msgid "Minimum equivalent of [member anim_speed_max]."
+msgstr "Минимальный эквивалент [member anim_speed_max]."
+
+msgid ""
+"Each particle's initial color. If [member texture] is defined, it will be "
+"multiplied by this color."
+msgstr ""
+"Начальный цвет каждой частицы. Если [member texture] определена, она будет "
+"умножена на этот цвет."
+
+msgid ""
+"Each particle's initial color will vary along this [Gradient] (multiplied "
+"with [member color])."
+msgstr ""
+"Первоначальный цвет каждой частицы будет меняться в соответствии с этим "
+"[Gradient] (умноженным на [цвет элемента])."
+
+msgid ""
+"Each particle's color will vary along this [Gradient] over its lifetime "
+"(multiplied with [member color])."
+msgstr ""
+"Цвет каждой частицы будет меняться в соответствии с этим [Gradient] в течение "
+"ее жизни (умноженным на [цвет элемента])."
+
+msgid "Damping will vary along this [Curve]. Should be a unit [Curve]."
+msgstr ""
+"Затухание будет меняться вдоль этой [Curve]. Должно быть единицей [Curve]."
+
+msgid ""
+"The maximum rate at which particles lose velocity. For example value of "
+"[code]100[/code] means that the particle will go from [code]100[/code] "
+"velocity to [code]0[/code] in [code]1[/code] second."
+msgstr ""
+"Максимальная скорость, с которой частицы теряют скорость. Например, значение "
+"[code]100[/code] означает, что частица перейдет от скорости [code]100[/code] "
+"до [code]0[/code] за [code]1[/code] секунду."
+
+msgid "Minimum equivalent of [member damping_max]."
+msgstr "Минимальный эквивалент [member damping_max]."
+
+msgid "Unit vector specifying the particles' emission direction."
+msgstr "Единичный вектор, задающий направление испускания частиц."
+
+msgid "Particle draw order. Uses [enum DrawOrder] values."
+msgstr "Порядок отрисовки частиц. Использует значения [enum DrawOrder]."
+
+msgid ""
+"Sets the [Color]s to modulate particles by when using [constant "
+"EMISSION_SHAPE_POINTS] or [constant EMISSION_SHAPE_DIRECTED_POINTS]."
+msgstr ""
+"Устанавливает [Color]s для модуляции частиц при использовании [constant "
+"EMISSION_SHAPE_POINTS] или [constant EMISSION_SHAPE_DIRECTED_POINTS]."
+
+msgid ""
+"Sets the direction the particles will be emitted in when using [constant "
+"EMISSION_SHAPE_DIRECTED_POINTS]."
+msgstr ""
+"Задает направление, в котором будут испускаться частицы при использовании "
+"[constant EMISSION_SHAPE_DIRECTED_POINTS]."
+
+msgid ""
+"Sets the initial positions to spawn particles when using [constant "
+"EMISSION_SHAPE_POINTS] or [constant EMISSION_SHAPE_DIRECTED_POINTS]."
+msgstr ""
+"Устанавливает начальные позиции для создания частиц при использовании "
+"[constant EMISSION_SHAPE_POINTS] или [constant "
+"EMISSION_SHAPE_DIRECTED_POINTS]."
+
+msgid ""
+"The rectangle's extents if [member emission_shape] is set to [constant "
+"EMISSION_SHAPE_RECTANGLE]."
+msgstr ""
+"Границы прямоугольника, если [member emission_shape] установлен в [constant "
+"EMISSION_SHAPE_RECTANGLE]."
+
+msgid ""
+"Particles will be emitted inside this region. See [enum EmissionShape] for "
+"possible values."
+msgstr ""
+"Частицы будут испускаться внутри этой области. См. [enum EmissionShape] для "
+"возможных значений."
+
+msgid ""
+"The sphere's radius if [member emission_shape] is set to [constant "
+"EMISSION_SHAPE_SPHERE]."
+msgstr ""
+"Радиус сферы, если [member emission_shape] установлен в [constant "
+"EMISSION_SHAPE_SPHERE]."
+
+msgid ""
+"If [code]true[/code], particles are being emitted. [member emitting] can be "
+"used to start and stop particles from emitting. However, if [member one_shot] "
+"is [code]true[/code] setting [member emitting] to [code]true[/code] will not "
+"restart the emission cycle until after all active particles finish "
+"processing. You can use the [signal finished] signal to be notified once all "
+"active particles finish processing."
+msgstr ""
+"Если [code]true[/code], частицы испускаются. [member emitting] можно "
+"использовать для запуска и остановки испускания частиц. Однако, если [member "
+"one_shot] равно [code]true[/code], установка [member emitting] в [code]true[/"
+"code] не перезапустит цикл испускания, пока все активные частицы не закончат "
+"обработку. Вы можете использовать сигнал [signalfinished], чтобы получать "
+"уведомления, как только все активные частицы закончат обработку."
+
+msgid ""
+"How rapidly particles in an emission cycle are emitted. If greater than "
+"[code]0[/code], there will be a gap in emissions before the next cycle begins."
+msgstr ""
+"Насколько быстро выбрасываются частицы в цикле эмиссии. Если больше [code]0[/"
+"code], то будет разрыв в эмиссии до начала следующего цикла."
+
+msgid ""
+"The particle system's frame rate is fixed to a value. For example, changing "
+"the value to 2 will make the particles render at 2 frames per second. Note "
+"this does not slow down the simulation of the particle system itself."
+msgstr ""
+"Частота кадров системы частиц зафиксирована на значении. Например, изменение "
+"значения на 2 заставит частицы рендериться со скоростью 2 кадра в секунду. "
+"Обратите внимание, что это не замедляет симуляцию самой системы частиц."
+
+msgid ""
+"If [code]true[/code], results in fractional delta calculation which has a "
+"smoother particles display effect."
+msgstr ""
+"Если [code]true[/code], то выполняется дробный расчет дельты, который "
+"обеспечивает более плавный эффект отображения частиц."
+
+msgid "Gravity applied to every particle."
+msgstr "Гравитация действует на каждую частицу."
+
+msgid ""
+"Each particle's hue will vary along this [Curve]. Should be a unit [Curve]."
+msgstr ""
+"Оттенок каждой частицы будет меняться вдоль этой [Curve]. Должна быть единица "
+"[Curve]."
+
+msgid ""
+"Maximum initial hue variation applied to each particle. It will shift the "
+"particle color's hue."
+msgstr ""
+"Максимальное начальное изменение оттенка, применяемое к каждой частице. Это "
+"изменит оттенок цвета частицы."
+
+msgid "Minimum equivalent of [member hue_variation_max]."
+msgstr "Минимальный эквивалент [member hue_variation_max]."
+
+msgid ""
+"Maximum initial velocity magnitude for each particle. Direction comes from "
+"[member direction] and [member spread]."
+msgstr ""
+"Максимальная начальная величина скорости для каждой частицы. Направление "
+"определяется из [member direction] и [member spread]."
+
+msgid "Minimum equivalent of [member initial_velocity_max]."
+msgstr "Минимальный эквивалент [member initial_velocity_max]."
+
+msgid "Amount of time each particle will exist."
+msgstr ""
+"Количество времени, в течение которого каждая частица будет существовать."
+
+msgid "Particle lifetime randomness ratio."
+msgstr "Коэффициент случайности времени жизни частицы."
+
+msgid ""
+"Each particle's linear acceleration will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Линейное ускорение каждой частицы будет изменяться вдоль этой [Curve]. Должно "
+"быть единицей [Curve]."
+
+msgid ""
+"Maximum linear acceleration applied to each particle in the direction of "
+"motion."
+msgstr ""
+"Максимальное линейное ускорение, приложенное к каждой частице в направлении "
+"движения."
+
+msgid "Minimum equivalent of [member linear_accel_max]."
+msgstr "Минимальный эквивалент [member linear_accel_max]."
+
+msgid ""
+"If [code]true[/code], particles use the parent node's coordinate space (known "
+"as local coordinates). This will cause particles to move and rotate along the "
+"[CPUParticles2D] node (and its parents) when it is moved or rotated. If "
+"[code]false[/code], particles use global coordinates; they will not move or "
+"rotate along the [CPUParticles2D] node (and its parents) when it is moved or "
+"rotated."
+msgstr ""
+"Если [code]true[/code], частицы используют координатное пространство "
+"родительского узла (известное как локальные координаты). Это заставит частицы "
+"двигаться и вращаться вдоль узла [CPUParticles2D] (и его родителей) при его "
+"перемещении или повороте. Если [code]false[/code], частицы используют "
+"глобальные координаты; они не будут двигаться или вращаться вдоль узла "
+"[CPUParticles2D] (и его родителей) при его перемещении или повороте."
+
+msgid ""
+"If [code]true[/code], only one emission cycle occurs. If set [code]true[/"
+"code] during a cycle, emission will stop at the cycle's end."
+msgstr ""
+"Если [code]true[/code], происходит только один цикл эмиссии. Если установить "
+"[code]true[/code] во время цикла, эмиссия прекратится в конце цикла."
+
+msgid ""
+"Each particle's orbital velocity will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Орбитальная скорость каждой частицы будет меняться вдоль этой [Curve]. Должна "
+"быть единицей [Curve]."
+
+msgid ""
+"Maximum orbital velocity applied to each particle. Makes the particles circle "
+"around origin. Specified in number of full rotations around origin per second."
+msgstr ""
+"Максимальная орбитальная скорость, применяемая к каждой частице. Заставляет "
+"частицы вращаться вокруг начала координат. Указывается в количестве полных "
+"оборотов вокруг начала координат в секунду."
+
+msgid "Minimum equivalent of [member orbit_velocity_max]."
+msgstr "Минимальный эквивалент [member orbit_velocity_max]."
+
+msgid "Align Y axis of particle with the direction of its velocity."
+msgstr "Совместите ось Y частицы с направлением ее скорости."
+
+msgid "Particle system starts as if it had already run for this many seconds."
+msgstr ""
+"Система частиц запускается так, как будто она уже проработала указанное "
+"количество секунд."
+
+msgid ""
+"Each particle's radial acceleration will vary along this [Curve]. Should be a "
+"unit [Curve]."
+msgstr ""
+"Радиальное ускорение каждой частицы будет изменяться вдоль этой [Curve]. "
+"Должно быть единицей [Curve]."
+
+msgid ""
+"Maximum radial acceleration applied to each particle. Makes particle "
+"accelerate away from the origin or towards it if negative."
+msgstr ""
+"Максимальное радиальное ускорение, применяемое к каждой частице. Заставляет "
+"частицу ускоряться от начала координат или к нему, если отрицательно."
+
+msgid "Minimum equivalent of [member radial_accel_max]."
+msgstr "Минимальный эквивалент [member radial_accel_max]."
+
+msgid "Emission lifetime randomness ratio."
+msgstr "Коэффициент случайности времени жизни излучения."
+
+msgid ""
+"Each particle's scale will vary along this [Curve]. Should be a unit [Curve]."
+msgstr ""
+"Масштаб каждой частицы будет меняться вдоль этой [Curve]. Должен быть "
+"единицей [Curve]."
+
+msgid "Maximum initial scale applied to each particle."
+msgstr "Максимальный начальный масштаб, применяемый к каждой частице."
+
+msgid "Minimum equivalent of [member scale_amount_max]."
+msgstr "Минимальный эквивалент [member scale_amount_max]."
+
+msgid ""
+"Each particle's horizontal scale will vary along this [Curve]. Should be a "
+"unit [Curve].\n"
+"[member split_scale] must be enabled."
+msgstr ""
+"Горизонтальный масштаб каждой частицы будет меняться вдоль этой [Curve]. "
+"Должен быть единичным [Curve]. \n"
+"[member split_scale] должен быть включен."
+
+msgid ""
+"Each particle's vertical scale will vary along this [Curve]. Should be a unit "
+"[Curve].\n"
+"[member split_scale] must be enabled."
+msgstr ""
+"Вертикальный масштаб каждой частицы будет меняться вдоль этой [Curve]. Должен "
+"быть единичным [Curve]. \n"
+"[member split_scale] должен быть включен."
+
+msgid ""
+"Sets the random seed used by the particle system. Only effective if [member "
+"use_fixed_seed] is [code]true[/code]."
+msgstr ""
+"Устанавливает случайное семя, используемое системой частиц. Действует только "
+"если [member use_fixed_seed] равен [code]true[/code]."
+
+msgid ""
+"Particle system's running speed scaling ratio. A value of [code]0[/code] can "
+"be used to pause the particles."
+msgstr ""
+"Коэффициент масштабирования скорости работы системы частиц. Значение [code]0[/"
+"code] может использоваться для остановки частиц."
+
+msgid ""
+"If [code]true[/code], the scale curve will be split into x and y components. "
+"See [member scale_curve_x] and [member scale_curve_y]."
+msgstr ""
+"Если [code]true[/code], кривая шкалы будет разделена на компоненты x и y. См. "
+"[member scale_curve_x] и [member scale_curve_y]."
+
+msgid ""
+"Each particle's initial direction range from [code]+spread[/code] to [code]-"
+"spread[/code] degrees."
+msgstr ""
+"Начальное направление каждой частицы варьируется от [code]+распространение[/"
+"code] до [code]-распространение[/code] градусов."
+
+msgid ""
+"Each particle's tangential acceleration will vary along this [Curve]. Should "
+"be a unit [Curve]."
+msgstr ""
+"Тангенциальное ускорение каждой частицы будет меняться вдоль этой [Curve]. "
+"Должно быть единицей [Curve]."
+
+msgid ""
+"Maximum tangential acceleration applied to each particle. Tangential "
+"acceleration is perpendicular to the particle's velocity giving the particles "
+"a swirling motion."
+msgstr ""
+"Максимальное тангенциальное ускорение, приложенное к каждой частице. "
+"Тангенциальное ускорение перпендикулярно скорости частицы, что придает "
+"частицам вихревое движение."
+
+msgid "Minimum equivalent of [member tangential_accel_max]."
+msgstr "Минимальный эквивалент [member tangential_accel_max]."
+
+msgid "Particle texture. If [code]null[/code], particles will be squares."
+msgstr "Текстура частиц. Если [code]null[/code], частицы будут квадратными."
+
+msgid ""
+"If [code]true[/code], particles will use the same seed for every simulation "
+"using the seed defined in [member seed]. This is useful for situations where "
+"the visual outcome should be consistent across replays, for example when "
+"using Movie Maker mode."
+msgstr ""
+"Если [code]true[/code], частицы будут использовать одно и то же семя для "
+"каждой симуляции, используя семя, определенное в [member seed]. Это полезно в "
+"ситуациях, когда визуальный результат должен быть согласованным между "
+"повторами, например, при использовании режима Movie Maker."
+
+msgid ""
+"Emitted when all active particles have finished processing. When [member "
+"one_shot] is disabled, particles will process continuously, so this is never "
+"emitted."
+msgstr ""
+"Выпускается, когда все активные частицы завершили обработку. Когда [member "
+"one_shot] отключен, частицы будут обрабатываться непрерывно, поэтому это "
+"никогда не выпускается."
+
+msgid "Particles are drawn in the order emitted."
+msgstr "Частицы рисуются в порядке испускания."
+
+msgid ""
+"Particles are drawn in order of remaining lifetime. In other words, the "
+"particle with the highest lifetime is drawn at the front."
+msgstr ""
+"Частицы рисуются в порядке оставшегося времени жизни. Другими словами, "
+"частица с наибольшим временем жизни рисуется спереди."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set initial velocity properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки начальных свойств скорости."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set angular velocity properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств угловой скорости."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set orbital velocity properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для задания свойств орбитальной скорости."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set linear acceleration properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств линейного ускорения."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set radial acceleration properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств радиального ускорения."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set tangential acceleration properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств тангенциального ускорения."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set damping properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств демпфирования."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set angle properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств угла."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set scale properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств масштаба."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set hue variation properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств изменения оттенка."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set animation speed properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств скорости анимации."
+
+msgid ""
+"Use with [method set_param_min], [method set_param_max], and [method "
+"set_param_curve] to set animation offset properties."
+msgstr ""
+"Используйте с [method set_param_min], [method set_param_max] и [method "
+"set_param_curve] для установки свойств смещения анимации."
+
+msgid "Represents the size of the [enum Parameter] enum."
+msgstr "Представляет размер перечисления [enum Parameter]."
+
+msgid ""
+"Use with [method set_particle_flag] to set [member particle_flag_align_y]."
+msgstr ""
+"Используйте с [method set_particle_flag] для установки [member "
+"partial_flag_align_y]."
+
+msgid "Present for consistency with 3D particle nodes, not used in 2D."
+msgstr ""
+"Присутствует для согласованности с узлами 3D-частиц, не используется в 2D."
+
+msgid "All particles will be emitted from a single point."
+msgstr "Все частицы будут испускаться из одной точки."
+
+msgid ""
+"Particles will be emitted in the volume of a sphere flattened to two "
+"dimensions."
+msgstr "Частицы будут испускаться в объеме сферы, сплющенной в двух измерениях."
+
+msgid ""
+"Particles will be emitted on the surface of a sphere flattened to two "
+"dimensions."
+msgstr ""
+"Частицы будут испускаться на поверхности сферы, сплющенной в двух измерениях."
+
+msgid "Particles will be emitted in the area of a rectangle."
+msgstr "Частицы будут испускаться в области прямоугольника."
+
+msgid ""
+"Particles will be emitted at a position chosen randomly among [member "
+"emission_points]. Particle color will be modulated by [member "
+"emission_colors]."
+msgstr ""
+"Частицы будут испускаться в точке, выбранной случайным образом среди [member "
+"emission_points]. Цвет частиц будет модулироваться [member emission_colors]."
+
+msgid ""
+"Particles will be emitted at a position chosen randomly among [member "
+"emission_points]. Particle velocity and rotation will be set based on [member "
+"emission_normals]. Particle color will be modulated by [member "
+"emission_colors]."
+msgstr ""
+"Частицы будут испускаться в позиции, выбранной случайным образом среди "
+"[member emission_points]. Скорость и вращение частиц будут установлены на "
+"основе [member emission_normals]. Цвет частиц будет модулироваться [member "
+"emission_colors]."
+
+msgid "Represents the size of the [enum EmissionShape] enum."
+msgstr "Представляет размер перечисления [enum EmissionShape]."
+
+msgid "A CPU-based 3D particle emitter."
+msgstr "3D-излучатель частиц на базе процессора."
+
+msgid ""
+"CPU-based 3D particle node used to create a variety of particle systems and "
+"effects.\n"
+"See also [GPUParticles3D], which provides the same functionality with "
+"hardware acceleration, but may not run on older devices."
+msgstr ""
+"Узел 3D-частиц на базе ЦП, используемый для создания различных систем частиц "
+"и эффектов.\n"
+"См. также [GPUParticles3D], который обеспечивает ту же функциональность с "
+"аппаратным ускорением, но может не работать на старых устройствах."
+
+msgid "Particle systems (3D)"
+msgstr "Системы частиц (3D)"
+
+msgid ""
+"Returns the axis-aligned bounding box that contains all the particles that "
+"are active in the current frame."
+msgstr ""
+"Возвращает выровненный по осям ограничивающий прямоугольник, содержащий все "
+"частицы, активные в текущем кадре."
+
+msgid ""
+"Sets this node's properties to match a given [GPUParticles3D] node with an "
+"assigned [ParticleProcessMaterial]."
+msgstr ""
+"Устанавливает свойства этого узла для соответствия заданному узлу "
+"[GPUParticles3D] с назначенным [ParticleProcessMaterial]."
+
+msgid ""
+"Enables or disables the given particle flag (see [enum ParticleFlags] for "
+"options)."
+msgstr ""
+"Включает или отключает заданный флаг частицы (опции см. в [enum "
+"ParticleFlags])."
+
+msgid "Maximum angle."
+msgstr "Максимальный угол."
+
+msgid "Minimum angle."
+msgstr "Минимальный угол."
+
+msgid ""
+"Each particle's angular velocity (rotation speed) will vary along this "
+"[Curve] over its lifetime. Should be a unit [Curve]."
+msgstr ""
+"Угловая скорость каждой частицы (скорость вращения) будет изменяться вдоль "
+"этой [Curve] в течение ее жизни. Должна быть единицей [Curve]."
+
+msgid ""
+"Minimum initial angular velocity (rotation speed) applied to each particle in "
+"[i]degrees[/i] per second."
+msgstr ""
+"Минимальная начальная угловая скорость (ск. вращения), приложенная к каждой "
+"частице в [i]градусах[/i] в секунду."
+
+msgid "Maximum animation offset."
+msgstr "Максимальное смещение анимации."
+
+msgid "Minimum animation offset."
+msgstr "Минимальное смещение анимации."
+
+msgid "Maximum particle animation speed."
+msgstr "Максимальная скорость анимации частиц."
+
+msgid "Minimum particle animation speed."
+msgstr "Минимальная скорость анимации частиц."
+
+msgid ""
+"Each particle's initial color.\n"
+"[b]Note:[/b] [member color] multiplies the particle mesh's vertex colors. To "
+"have a visible effect on a [BaseMaterial3D], [member BaseMaterial3D."
+"vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. For a "
+"[ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in the "
+"shader's [code]fragment()[/code] function. Otherwise, [member color] will "
+"have no visible effect."
+msgstr ""
+"Начальный цвет каждой частицы.\n"
+"[b]Примечание:[/b] [member color] умножает цвета вершин сетки частиц. Чтобы "
+"иметь видимый эффект на [BaseMaterial3D], [member BaseMaterial3D."
+"vertex_color_use_as_albedo] [i]должен[/i] быть [code]true[/code]. Для "
+"[ShaderMaterial] [code]ALBEDO *= COLOR.rgb;[/code] должен быть вставлен в "
+"функцию шейдера [code]fragment()[/code]. В противном случае [member color] не "
+"будет иметь видимого эффекта."
+
+msgid ""
+"Each particle's initial color will vary along this [Gradient] (multiplied "
+"with [member color]).\n"
+"[b]Note:[/b] [member color_initial_ramp] multiplies the particle mesh's "
+"vertex colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"color_initial_ramp] will have no visible effect."
+msgstr ""
+"Начальный цвет каждой частицы будет меняться вдоль этого [Gradient] "
+"(умноженного на [member color]).\n"
+"[b]Примечание:[/b] [member color_initial_ramp] умножает цвета вершин сетки "
+"частиц. Чтобы иметь видимый эффект на [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]должен[/i] быть [code]true[/"
+"code]. Для [ShaderMaterial] [code]ALBEDO *= COLOR.rgb;[/code] должен быть "
+"вставлен в функцию шейдера [code]fragment()[/code]. В противном случае "
+"[member color_initial_ramp] не будет иметь видимого эффекта."
+
+msgid ""
+"Each particle's color will vary along this [Gradient] over its lifetime "
+"(multiplied with [member color]).\n"
+"[b]Note:[/b] [member color_ramp] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member color_ramp] "
+"will have no visible effect."
+msgstr ""
+"Цвет каждой частицы будет меняться по этому [Gradient] в течение ее жизни "
+"(умножается на [member color]).\n"
+"[b]Примечание:[/b] [member color_ramp] умножает цвета вершин сетки частицы. "
+"Чтобы иметь видимый эффект на [BaseMaterial3D], [member BaseMaterial3D."
+"vertex_color_use_as_albedo] [i]должен[/i] быть [code]true[/code]. Для "
+"[ShaderMaterial] [code]ALBEDO *= COLOR.rgb;[/code] должен быть вставлен в "
+"функцию шейдера [code]fragment()[/code]. В противном случае [member "
+"color_ramp] не будет иметь видимого эффекта."
+
+msgid "Maximum damping."
+msgstr "Максимальное демпфирование."
+
+msgid "Minimum damping."
+msgstr "Минимальное затухание."
+
+msgid ""
+"The rectangle's extents if [member emission_shape] is set to [constant "
+"EMISSION_SHAPE_BOX]."
+msgstr ""
+"Размеры прямоугольника, если [member emission_shape] установлен в [constant "
+"EMISSION_SHAPE_BOX]."
+
+msgid ""
+"Sets the [Color]s to modulate particles by when using [constant "
+"EMISSION_SHAPE_POINTS] or [constant EMISSION_SHAPE_DIRECTED_POINTS].\n"
+"[b]Note:[/b] [member emission_colors] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"emission_colors] will have no visible effect."
+msgstr ""
+"Устанавливает [Цвет]-а для модуляции частиц при использовании [constant "
+"EMISSION_SHAPE_POINTS] или [constant EMISSION_SHAPE_DIRECTED_POINTS].\n"
+"[b]Примечание:[/b] [member emission_colors] умножает цвета вершин сетки "
+"частиц. Чтобы иметь видимый эффект на [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]должен[/i] быть [code]true[/"
+"code]. Для [ShaderMaterial] [code]ALBEDO *= COLOR.rgb;[/code] должен быть "
+"вставлен в функцию шейдера [code]fragment()[/code]. В противном случае "
+"[member emission_colors] не будет иметь видимого эффекта."
+
+msgid ""
+"The axis of the ring when using the emitter [constant EMISSION_SHAPE_RING]."
+msgstr "Ось кольца при использовании излучателя [constant EMISSION_SHAPE_RING]."
+
+msgid ""
+"The angle of the cone when using the emitter [constant EMISSION_SHAPE_RING]. "
+"The default angle of 90 degrees results in a ring, while an angle of 0 "
+"degrees results in a cone. Intermediate values will result in a ring where "
+"one end is larger than the other.\n"
+"[b]Note:[/b] Depending on [member emission_ring_height], the angle may be "
+"clamped if the ring's end is reached to form a perfect cone."
+msgstr ""
+"Угол конуса при использовании эмиттера [constant EMISSION_SHAPE_RING]. Угол "
+"по умолчанию 90 градусов приводит к кольцу, а угол 0 градусов приводит к "
+"конусу. Промежуточные значения приведут к кольцу, где один конец больше "
+"другого.\n"
+"[b]Примечание:[/b] В зависимости от [member emission_ring_height] угол может "
+"быть зафиксирован, если конец кольца достигнут, чтобы сформировать идеальный "
+"конус."
+
+msgid ""
+"The height of the ring when using the emitter [constant EMISSION_SHAPE_RING]."
+msgstr ""
+"Высота кольца при использовании излучателя [constant EMISSION_SHAPE_RING]."
+
+msgid ""
+"The inner radius of the ring when using the emitter [constant "
+"EMISSION_SHAPE_RING]."
+msgstr ""
+"Внутренний радиус кольца при использовании излучателя [constant "
+"EMISSION_SHAPE_RING]."
+
+msgid ""
+"The radius of the ring when using the emitter [constant EMISSION_SHAPE_RING]."
+msgstr ""
+"Радиус кольца при использовании излучателя [constant EMISSION_SHAPE_RING]."
+
+msgid ""
+"The sphere's radius if [enum EmissionShape] is set to [constant "
+"EMISSION_SHAPE_SPHERE]."
+msgstr ""
+"Радиус сферы, если [enum EmissionShape] установлен на [constant "
+"EMISSION_SHAPE_SPHERE]."
+
+msgid ""
+"The particle system's frame rate is fixed to a value. For example, changing "
+"the value to 2 will make the particles render at 2 frames per second. Note "
+"this does not slow down the particle system itself."
+msgstr ""
+"Частота кадров системы частиц зафиксирована на значении. Например, изменение "
+"значения на 2 заставит частицы рендериться со скоростью 2 кадра в секунду. "
+"Обратите внимание, что это не замедляет саму систему частиц."
+
+msgid ""
+"Amount of [member spread] in Y/Z plane. A value of [code]1[/code] restricts "
+"particles to X/Z plane."
+msgstr ""
+"Величина [member spread] в плоскости Y/Z. Значение [code]1[/code] "
+"ограничивает частицы плоскостью X/Z."
+
+msgid "Maximum hue variation."
+msgstr "Макс. вариативность оттенков."
+
+msgid "Minimum hue variation."
+msgstr "Мин. вариативность оттенков."
+
+msgid "Maximum value of the initial velocity."
+msgstr "Максимальное значение начальной скорости."
+
+msgid "Minimum value of the initial velocity."
+msgstr "Минимальное значение начальной скорости."
+
+msgid "Maximum linear acceleration."
+msgstr "Макс. линейное ускорение."
+
+msgid "Minimum linear acceleration."
+msgstr "Мин. линейное ускорение."
+
+msgid ""
+"If [code]true[/code], particles use the parent node's coordinate space (known "
+"as local coordinates). This will cause particles to move and rotate along the "
+"[CPUParticles3D] node (and its parents) when it is moved or rotated. If "
+"[code]false[/code], particles use global coordinates; they will not move or "
+"rotate along the [CPUParticles3D] node (and its parents) when it is moved or "
+"rotated."
+msgstr ""
+"Если [code]true[/code], частицы используют координатное пространство "
+"родительского узла (известное как локальные координаты). Это заставит частицы "
+"двигаться и вращаться вдоль узла [CPUParticles3D] (и его родителей) при его "
+"перемещении или повороте. Если [code]false[/code], частицы используют "
+"глобальные координаты; они не будут двигаться или вращаться вдоль узла "
+"[CPUParticles3D] (и его родителей) при его перемещении или повороте."
+
+msgid ""
+"The [Mesh] used for each particle. If [code]null[/code], particles will be "
+"spheres."
+msgstr ""
+"[Mesh] используется для каждой частицы. Если [code]null[/code], частицы будут "
+"сферами."
+
+msgid "Maximum orbit velocity."
+msgstr "Макс. орбитальная скорость."
+
+msgid "Minimum orbit velocity."
+msgstr "Мин. орбитальная скорость."
+
+msgid "If [code]true[/code], particles will not move on the Z axis."
+msgstr "Если [code]true[/code], частицы не будут двигаться по оси Z."
+
+msgid ""
+"If [code]true[/code], particles rotate around Y axis by [member angle_min]."
+msgstr ""
+"Если [code]true[/code], частицы вращаются вокруг оси Y на [member angle_min]."
+
+msgid "Maximum radial acceleration."
+msgstr "Макс. радиальное ускорение."
+
+msgid "Minimum radial acceleration."
+msgstr "Мин. радиальное ускорение."
+
+msgid "Maximum scale."
+msgstr "Макс. масштаб."
+
+msgid "Minimum scale."
+msgstr "Миним. масштаб."
+
+msgid "Curve for the scale over life, along the x axis."
+msgstr "Кривая шкалы на протяжении жизни по оси x."
+
+msgid "Curve for the scale over life, along the y axis."
+msgstr "Кривая шкалы на протяжении жизни по оси y."
+
+msgid "Curve for the scale over life, along the z axis."
+msgstr "Кривая шкалы на протяжении жизни по оси z."
+
+msgid ""
+"If set to [code]true[/code], three different scale curves can be specified, "
+"one per scale axis."
+msgstr ""
+"Если задано значение [code]true[/code], можно указать три различные кривые "
+"шкалы, по одной на каждую ось шкалы."
+
+msgid ""
+"Each particle's initial direction range from [code]+spread[/code] to [code]-"
+"spread[/code] degrees. Applied to X/Z plane and Y/Z planes."
+msgstr ""
+"Начальный диапазон направления каждой частицы составляет от [code]+spread[/"
+"code] до [code]-spread[/code] градусов. Применяется к плоскостям X/Z и Y/Z."
+
+msgid "Maximum tangent acceleration."
+msgstr "Макс. касательное ускорение."
+
+msgid "Minimum tangent acceleration."
+msgstr "Мин. касательное ускорение."
+
+msgid ""
+"The [AABB] that determines the node's region which needs to be visible on "
+"screen for the particle system to be active.\n"
+"Grow the box if particles suddenly appear/disappear when the node enters/"
+"exits the screen. The [AABB] can be grown via code or with the [b]Particles → "
+"Generate AABB[/b] editor tool."
+msgstr ""
+"[AABB], который определяет область узла, которая должна быть видна на экране, "
+"чтобы система частиц была активной.\n"
+"Увеличьте поле, если частицы внезапно появляются/исчезают, когда узел входит/"
+"выходит из экрана. [AABB] можно увеличить с помощью кода или с помощью "
+"инструмента редактора [b]Particles → Generate AABB[[/b]."
+
+msgid "Particles are drawn in order of depth."
+msgstr "Частицы рисуются в порядке глубины."
+
+msgid ""
+"Use with [method set_particle_flag] to set [member particle_flag_rotate_y]."
+msgstr ""
+"Используйте с [method set_particle_flag] для установки [member "
+"partial_flag_rotate_y]."
+
+msgid ""
+"Use with [method set_particle_flag] to set [member particle_flag_disable_z]."
+msgstr ""
+"Используйте с [method set_particle_flag] для установки [member "
+"particle_flag_disable_z]."
+
+msgid "Particles will be emitted in the volume of a sphere."
+msgstr "Частицы будут испускаться в объеме сферы."
+
+msgid "Particles will be emitted on the surface of a sphere."
+msgstr "Частицы будут испускаться на поверхность сферы."
+
+msgid "Particles will be emitted in the volume of a box."
+msgstr "Частицы будут испускаться в объеме коробки."
+
+msgid "Particles will be emitted in a ring or cylinder."
+msgstr "Частицы будут выбрасываться в кольцо или цилиндр."
+
+msgid "Provides access to advanced cryptographic functionalities."
+msgstr "Предоставляет доступ к расширенным криптографическим функциям."
+
+msgid ""
+"The Crypto class provides access to advanced cryptographic functionalities.\n"
+"Currently, this includes asymmetric key encryption/decryption, signing/"
+"verification, and generating cryptographically secure random bytes, RSA keys, "
+"HMAC digests, and self-signed [X509Certificate]s.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var crypto = Crypto.new()\n"
+"\n"
+"# Generate new RSA key.\n"
+"var key = crypto.generate_rsa(4096)\n"
+"\n"
+"# Generate new self-signed certificate with the given key.\n"
+"var cert = crypto.generate_self_signed_certificate(key, \"CN=mydomain.com,"
+"O=My Game Company,C=IT\")\n"
+"\n"
+"# Save key and certificate in the user folder.\n"
+"key.save(\"user://generated.key\")\n"
+"cert.save(\"user://generated.crt\")\n"
+"\n"
+"# Encryption\n"
+"var data = \"Some data\"\n"
+"var encrypted = crypto.encrypt(key, data.to_utf8_buffer())\n"
+"\n"
+"# Decryption\n"
+"var decrypted = crypto.decrypt(key, encrypted)\n"
+"\n"
+"# Signing\n"
+"var signature = crypto.sign(HashingContext.HASH_SHA256, data.sha256_buffer(), "
+"key)\n"
+"\n"
+"# Verifying\n"
+"var verified = crypto.verify(HashingContext.HASH_SHA256, data."
+"sha256_buffer(), signature, key)\n"
+"\n"
+"# Checks\n"
+"assert(verified)\n"
+"assert(data.to_utf8_buffer() == decrypted)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"using System.Diagnostics;\n"
+"\n"
+"Crypto crypto = new Crypto();\n"
+"\n"
+"// Generate new RSA key.\n"
+"CryptoKey key = crypto.GenerateRsa(4096);\n"
+"\n"
+"// Generate new self-signed certificate with the given key.\n"
+"X509Certificate cert = crypto.GenerateSelfSignedCertificate(key, "
+"\"CN=mydomain.com,O=My Game Company,C=IT\");\n"
+"\n"
+"// Save key and certificate in the user folder.\n"
+"key.Save(\"user://generated.key\");\n"
+"cert.Save(\"user://generated.crt\");\n"
+"\n"
+"// Encryption\n"
+"string data = \"Some data\";\n"
+"byte[] encrypted = crypto.Encrypt(key, data.ToUtf8Buffer());\n"
+"\n"
+"// Decryption\n"
+"byte[] decrypted = crypto.Decrypt(key, encrypted);\n"
+"\n"
+"// Signing\n"
+"byte[] signature = crypto.Sign(HashingContext.HashType.Sha256, Data."
+"Sha256Buffer(), key);\n"
+"\n"
+"// Verifying\n"
+"bool verified = crypto.Verify(HashingContext.HashType.Sha256, Data."
+"Sha256Buffer(), signature, key);\n"
+"\n"
+"// Checks\n"
+"Debug.Assert(verified);\n"
+"Debug.Assert(data.ToUtf8Buffer() == decrypted);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Класс Crypto обеспечивает доступ к расширенным криптографическим функциям.\n"
+"В настоящее время сюда входят асимметричное шифрование/дешифрование ключей, "
+"подписание/проверка и генерация криптографически безопасных случайных байтов, "
+"ключей RSA, дайджестов HMAC и самоподписанных [X509Certificate].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var crypto = Crypto.new()\n"
+"\n"
+"# Сгенерируйте новый ключ RSA.\n"
+"var key = crypto.generate_rsa(4096)\n"
+"\n"
+"# Сгенерировать новый самоподписанный сертификат с указанным ключом.\n"
+"var cert = crypto.generate_self_signed_certificate(key, \"CN=mydomain.com,"
+"O=My Game Company,C=IT\")\n"
+"\n"
+"# Сохраните ключ и сертификат в папке пользователя.\n"
+"key.save(\"user://generated.key\")\n"
+"cert.save(\"user://generated.crt\")\n"
+"\n"
+"# Шифрование\n"
+"var data = \"Some data\"\n"
+"var encrypted = crypto.encrypt(key, data.to_utf8_buffer())\n"
+"\n"
+"# Расшифровка\n"
+"var decrypted = crypto.decrypt(key, encrypted)\n"
+"\n"
+"#Подписание\n"
+"var signature = crypto.sign(HashingContext.HASH_SHA256, data.sha256_buffer(), "
+"key)\n"
+"\n"
+"# Проверка\n"
+"var verified = crypto.verify(HashingContext.HASH_SHA256, data."
+"sha256_buffer(), signature, key)\n"
+"\n"
+"# Проверки\n"
+"assert(verified)\n"
+"assert(data.to_utf8_buffer() == decrypted)\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"using System.Diagnostics;\n"
+"\n"
+"Crypto crypto = new Crypto();\n"
+"\n"
+"// Сгенерируйте новый ключ RSA.\n"
+"CryptoKey key = crypto.GenerateRsa(4096);\n"
+"\n"
+"// Сгенерировать новый самоподписанный сертификат с указанным ключом.\n"
+"X509Certificate cert = crypto.GenerateSelfSignedCertificate(key, "
+"\"CN=mydomain.com,O=My Game Company,C=IT\");\n"
+"\n"
+"// Сохраните ключ и сертификат в папке пользователя.\n"
+"key.Save(\"user://generated.key\");\n"
+"cert.Save(\"user://generated.crt\");\n"
+"\n"
+"// Шифрование\n"
+"string data = \"Some data\";\n"
+"byte[] encrypted = crypto.Encrypt(key, data.ToUtf8Buffer());\n"
+"\n"
+"// Расшифровка\n"
+"byte[] decrypted = crypto.Decrypt(key, encrypted);\n"
+"\n"
+"// Подписание\n"
+"byte[] signature = crypto.Sign(HashingContext.HashType.Sha256, Data."
+"Sha256Buffer(), key);\n"
+"\n"
+"// Проверка\n"
+"bool verified = crypto.Verify(HashingContext.HashType.Sha256, Data."
+"Sha256Buffer(), signature, key);\n"
+"\n"
+"// Проверки\n"
+"Debug.Assert(verified);\n"
+"Debug.Assert(data.ToUtf8Buffer() == decrypted);\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Compares two [PackedByteArray]s for equality without leaking timing "
+"information in order to prevent timing attacks.\n"
+"See [url=https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-"
+"string-comparison-with-double-hmac-strategy]this blog post[/url] for more "
+"information."
+msgstr ""
+"Сравнивает два [PackedByteArray] на равенство без утечки информации о "
+"времени, чтобы предотвратить атаки по времени.\n"
+"См. [url=https://paragonie.com/blog/2015/11/preventing-timing-attacks-on-"
+"string-comparison-with-double-hmac-strategy]эту запись в блоге[/url] для "
+"получения дополнительной информации."
+
+msgid ""
+"Decrypt the given [param ciphertext] with the provided private [param key].\n"
+"[b]Note:[/b] The maximum size of accepted ciphertext is limited by the key "
+"size."
+msgstr ""
+"Расшифруйте заданный [param ciphertext] с помощью предоставленного закрытого "
+"[param key].\n"
+"[b]Примечание:[/b] Максимальный размер принятого шифротекста ограничен "
+"размером ключа."
+
+msgid ""
+"Encrypt the given [param plaintext] with the provided public [param key].\n"
+"[b]Note:[/b] The maximum size of accepted plaintext is limited by the key "
+"size."
+msgstr ""
+"Зашифруйте указанный [param plaintext] с помощью предоставленного открытого "
+"[param key].\n"
+"[b]Примечание:[/b] Максимальный размер принятого открытого текста ограничен "
+"размером ключа."
+
+msgid ""
+"Generates a [PackedByteArray] of cryptographically secure random bytes with "
+"given [param size]."
+msgstr ""
+"Генерирует [PackedByteArray] криптографически безопасных случайных байтов с "
+"заданным [размером параметра]."
+
+msgid ""
+"Generates an RSA [CryptoKey] that can be used for creating self-signed "
+"certificates and passed to [method StreamPeerTLS.accept_stream]."
+msgstr ""
+"Генерирует RSA [CryptoKey], который можно использовать для создания "
+"самоподписанных сертификатов и передавать в [метод StreamPeerTLS."
+"accept_stream]."
+
+msgid ""
+"Generates a self-signed [X509Certificate] from the given [CryptoKey] and "
+"[param issuer_name]. The certificate validity will be defined by [param "
+"not_before] and [param not_after] (first valid date and last valid date). The "
+"[param issuer_name] must contain at least \"CN=\" (common name, i.e. the "
+"domain name), \"O=\" (organization, i.e. your company name), \"C=\" (country, "
+"i.e. 2 lettered ISO-3166 code of the country the organization is based in).\n"
+"A small example to generate an RSA key and an X509 self-signed certificate.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var crypto = Crypto.new()\n"
+"# Generate 4096 bits RSA key.\n"
+"var key = crypto.generate_rsa(4096)\n"
+"# Generate self-signed certificate using the given key.\n"
+"var cert = crypto.generate_self_signed_certificate(key, \"CN=example.com,O=A "
+"Game Company,C=IT\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var crypto = new Crypto();\n"
+"// Generate 4096 bits RSA key.\n"
+"CryptoKey key = crypto.GenerateRsa(4096);\n"
+"// Generate self-signed certificate using the given key.\n"
+"X509Certificate cert = crypto.GenerateSelfSignedCertificate(key, "
+"\"CN=mydomain.com,O=My Game Company,C=IT\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Генерирует самоподписанный [X509Certificate] из заданного [CryptoKey] и "
+"[param issuer_name]. Действительность сертификата будет определяться [param "
+"not_before] и [param not_after] (первая действительная дата и последняя "
+"действительная дата). [param issuer_name] должен содержать как минимум "
+"\"CN=\" (общее имя, т. е. доменное имя), \"O=\" (организация, т. е. название "
+"вашей компании), \"C=\" (страна, т. е. двухбуквенный код ISO-3166 страны, в "
+"которой находится организация).\n"
+"Небольшой пример генерации ключа RSA и самоподписанного сертификата X509.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var crypto = Crypto.new()\n"
+"# Сгенерируйте 4096-битный ключ RSA.\n"
+"var key = crypto.generate_rsa(4096)\n"
+"# Сгенерировать самоподписанный сертификат, используя указанный ключ.\n"
+"var cert = crypto.generate_self_signed_certificate(key, \"CN=example.com,O=A "
+"Game Company,C=IT\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var crypto = new Crypto();\n"
+"// Сгенерируйте 4096-битный ключ RSA.\n"
+"CryptoKey key = crypto.GenerateRsa(4096);\n"
+"// Сгенерировать самоподписанный сертификат, используя указанный ключ.\n"
+"X509Certificate cert = crypto.GenerateSelfSignedCertificate(key, "
+"\"CN=mydomain.com,O=My Game Company,C=IT\");\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Generates an [url=https://en.wikipedia.org/wiki/HMAC]HMAC[/url] digest of "
+"[param msg] using [param key]. The [param hash_type] parameter is the hashing "
+"algorithm that is used for the inner and outer hashes.\n"
+"Currently, only [constant HashingContext.HASH_SHA256] and [constant "
+"HashingContext.HASH_SHA1] are supported."
+msgstr ""
+"Генерирует [url=https://en.wikipedia.org/wiki/HMAC]HMAC[/url] дайджест [param "
+"msg] с использованием [param key]. Параметр [param hash_type] — это алгоритм "
+"хеширования, который используется для внутренних и внешних хешей.\n"
+"В настоящее время поддерживаются только [constant HashingContext.HASH_SHA256] "
+"и [constant HashingContext.HASH_SHA1]."
+
+msgid ""
+"Sign a given [param hash] of type [param hash_type] with the provided private "
+"[param key]."
+msgstr ""
+"Подписать заданный [param hash] типа [param hash_type] с помощью "
+"предоставленного закрытого [param key]."
+
+msgid ""
+"Verify that a given [param signature] for [param hash] of type [param "
+"hash_type] against the provided public [param key]."
+msgstr ""
+"Проверьте, что заданная [подпись параметра] для [хэш параметра] типа "
+"[тип_хэша_параметра] соответствует предоставленному открытому [ключу "
+"параметра]."
+
+msgid "A cryptographic key (RSA or elliptic-curve)."
+msgstr "Криптографический ключ (RSA или эллиптическая кривая)."
+
+msgid ""
+"The CryptoKey class represents a cryptographic key. Keys can be loaded and "
+"saved like any other [Resource].\n"
+"They can be used to generate a self-signed [X509Certificate] via [method "
+"Crypto.generate_self_signed_certificate] and as private key in [method "
+"StreamPeerTLS.accept_stream] along with the appropriate certificate."
+msgstr ""
+"Класс CryptoKey представляет собой криптографический ключ. Ключи можно "
+"загружать и сохранять, как и любой другой [Resource].\n"
+"Их можно использовать для генерации самоподписанного [X509Certificate] через "
+"[method Crypto.generate_self_signed_certificate] и как закрытый ключ в "
+"[method StreamPeerTLS.accept_stream] вместе с соответствующим сертификатом."
+
+msgid "SSL certificates"
+msgstr "SSL сертификаты"
+
+msgid ""
+"Returns [code]true[/code] if this CryptoKey only has the public part, and not "
+"the private one."
+msgstr ""
+"Возвращает [code]true[/code], если этот CryptoKey имеет только открытую "
+"часть, но не закрытую."
+
+msgid ""
+"Loads a key from [param path]. If [param public_only] is [code]true[/code], "
+"only the public key will be loaded.\n"
+"[b]Note:[/b] [param path] should be a \"*.pub\" file if [param public_only] "
+"is [code]true[/code], a \"*.key\" file otherwise."
+msgstr ""
+"Загружает ключ из [param path]. Если [param public_only] равен [code]true[/"
+"code], будет загружен только открытый ключ.\n"
+"[b]Примечание:[/b] [param path] должен быть файлом \"*.pub\", если [param "
+"public_only] равен [code]true[/code], в противном случае файлом \"*.key\"."
+
+msgid ""
+"Loads a key from the given [param string_key]. If [param public_only] is "
+"[code]true[/code], only the public key will be loaded."
+msgstr ""
+"Загружает ключ из указанного [param string_key]. Если [param public_only] "
+"равен [code]true[/code], будет загружен только открытый ключ."
+
+msgid ""
+"Saves a key to the given [param path]. If [param public_only] is [code]true[/"
+"code], only the public key will be saved.\n"
+"[b]Note:[/b] [param path] should be a \"*.pub\" file if [param public_only] "
+"is [code]true[/code], a \"*.key\" file otherwise."
+msgstr ""
+"Сохраняет ключ в указанном [param path]. Если [param public_only] равен "
+"[code]true[/code], будет сохранен только открытый ключ.\n"
+"[b]Примечание:[/b] [param path] должен быть файлом \"*.pub\", если [param "
+"public_only] равен [code]true[/code], в противном случае файлом \"*.key\"."
+
+msgid ""
+"Returns a string containing the key in PEM format. If [param public_only] is "
+"[code]true[/code], only the public key will be included."
+msgstr ""
+"Возвращает строку, содержащую ключ в формате PEM. Если [param public_only] "
+"равен [code]true[/code], будет включен только открытый ключ."
+
+msgid "A CSG Box shape."
+msgstr "Форма CSG-коробки."
+
+msgid ""
+"This node allows you to create a box for use with the CSG system.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Этот узел позволяет вам создать ящик для использования с системой CSG.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG имеет значительные затраты ЦП по "
+"сравнению с созданием [MeshInstance3D] с [PrimitiveMesh]. Перемещение узла "
+"CSG в другой узел CSG также имеет значительные затраты ЦП, поэтому его "
+"следует избегать во время игры."
+
+msgid "Prototyping levels with CSG"
+msgstr "Прототипирование уровней с помощью CSG"
+
+msgid "The material used to render the box."
+msgstr "Материал, использованный для изготовления коробки."
+
+msgid "A CSG node that allows you to combine other CSG modifiers."
+msgstr "Узел CSG, позволяющий комбинировать другие модификаторы CSG."
+
+msgid ""
+"For complex arrangements of shapes, it is sometimes needed to add structure "
+"to your CSG nodes. The CSGCombiner3D node allows you to create this "
+"structure. The node encapsulates the result of the CSG operations of its "
+"children. In this way, it is possible to do operations on one set of shapes "
+"that are children of one CSGCombiner3D node, and a set of separate operations "
+"on a second set of shapes that are children of a second CSGCombiner3D node, "
+"and then do an operation that takes the two end results as its input to "
+"create the final shape.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Для сложных расположений фигур иногда требуется добавить структуру к узлам "
+"CSG. Узел CSGCombiner3D позволяет вам создать эту структуру. Узел "
+"инкапсулирует результат операций CSG своих потомков. Таким образом, можно "
+"выполнять операции над одним набором фигур, которые являются потомками одного "
+"узла CSGCombiner3D, и набор отдельных операций над вторым набором фигур, "
+"которые являются потомками второго узла CSGCombiner3D, а затем выполнять "
+"операцию, которая принимает два конечных результата в качестве входных данных "
+"для создания окончательной фигуры.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG имеет значительные затраты "
+"процессора по сравнению с созданием [MeshInstance3D] с [PrimitiveMesh]. "
+"Перемещение узла CSG в пределах другого узла CSG также имеет значительные "
+"затраты процессора, поэтому его следует избегать во время игры."
+
+msgid "A CSG Cylinder shape."
+msgstr "Форма цилиндра CSG."
+
+msgid ""
+"This node allows you to create a cylinder (or cone) for use with the CSG "
+"system.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Этот узел позволяет создать цилиндр (или конус) для использования с системой "
+"CSG.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG требует значительных затрат "
+"ресурсов ЦП по сравнению с созданием [MeshInstance3D] с [PrimitiveMesh]. "
+"Перемещение узла CSG в пределах другого узла CSG также требует значительных "
+"затрат ресурсов ЦП, поэтому его следует избегать во время игры."
+
+msgid ""
+"If [code]true[/code] a cone is created, the [member radius] will only apply "
+"to one side."
+msgstr ""
+"Если [code]true[/code] создается конус, [member radius] будет применяться "
+"только к одной стороне."
+
+msgid "The height of the cylinder."
+msgstr "Высота цилиндра."
+
+msgid "The material used to render the cylinder."
+msgstr "Материал, используемый для изготовления цилиндра."
+
+msgid "The radius of the cylinder."
+msgstr "Радиус цилиндра."
+
+msgid ""
+"The number of sides of the cylinder, the higher this number the more detail "
+"there will be in the cylinder."
+msgstr ""
+"Число сторон цилиндра. Чем больше это число, тем больше деталей будет в "
+"цилиндре."
+
+msgid ""
+"If [code]true[/code] the normals of the cylinder are set to give a smooth "
+"effect making the cylinder seem rounded. If [code]false[/code] the cylinder "
+"will have a flat shaded look."
+msgstr ""
+"Если [code]true[/code], нормали цилиндра устанавливаются так, чтобы придать "
+"сглаженный эффект, делая цилиндр округлым. Если [code]false[/code], цилиндр "
+"будет иметь плоский затененный вид."
+
+msgid "A CSG Mesh shape that uses a mesh resource."
+msgstr "Форма сетки CSG, использующая ресурс сетки."
+
+msgid ""
+"This CSG node allows you to use any mesh resource as a CSG shape, provided it "
+"is [i]manifold[/i]. A manifold shape is closed, does not self-intersect, does "
+"not contain internal faces and has no edges that connect to more than two "
+"faces. See also [CSGPolygon3D] for drawing 2D extruded polygons to be used as "
+"CSG nodes.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Этот узел CSG позволяет использовать любой ресурс сетки в качестве формы CSG, "
+"при условии, что он [i]многообразный[/i]. Форма многообразия замкнута, не "
+"пересекается сама с собой, не содержит внутренних граней и не имеет ребер, "
+"которые соединяются более чем с двумя гранями. См. также [CSGPolygon3D] для "
+"рисования 2D-выдавленных полигонов, которые будут использоваться в качестве "
+"узлов CSG.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG требует значительных затрат "
+"ресурсов ЦП по сравнению с созданием [MeshInstance3D] с помощью "
+"[PrimitiveMesh]. Перемещение узла CSG внутри другого узла CSG также требует "
+"значительных затрат ресурсов ЦП, поэтому его следует избегать во время игры."
+
+msgid "The [Material] used in drawing the CSG shape."
+msgstr "[Material], используемый при рисовании формы CSG."
+
+msgid ""
+"The [Mesh] resource to use as a CSG shape.\n"
+"[b]Note:[/b] Some [Mesh] types such as [PlaneMesh], [PointMesh], [QuadMesh], "
+"and [RibbonTrailMesh] are excluded from the type hint for this property, as "
+"these primitives are non-[i]manifold[/i] and thus not compatible with the CSG "
+"algorithm.\n"
+"[b]Note:[/b] When using an [ArrayMesh], all vertex attributes except "
+"[constant Mesh.ARRAY_VERTEX], [constant Mesh.ARRAY_NORMAL] and [constant Mesh."
+"ARRAY_TEX_UV] are left unused. Only [constant Mesh.ARRAY_VERTEX] and "
+"[constant Mesh.ARRAY_TEX_UV] will be passed to the GPU.\n"
+"[constant Mesh.ARRAY_NORMAL] is only used to determine which faces require "
+"the use of flat shading. By default, CSGMesh will ignore the mesh's vertex "
+"normals, recalculate them for each vertex and use a smooth shader. If a flat "
+"shader is required for a face, ensure that all vertex normals of the face are "
+"approximately equal."
+msgstr ""
+"Ресурс [Mesh] для использования в качестве формы CSG.\n"
+"[b]Примечание:[/b] Некоторые типы [Mesh], такие как [PlaneMesh], [PointMesh], "
+"[QuadMesh] и [RibbonTrailMesh], исключены из подсказки типа для этого "
+"свойства, так как эти примитивы не являются [i]manifold[/i] и, таким образом, "
+"несовместимы с алгоритмом CSG.\n"
+"[b]Примечание:[/b] При использовании [ArrayMesh] все атрибуты вершин, кроме "
+"[constant Mesh.ARRAY_VERTEX], [constant Mesh.ARRAY_NORMAL] и [constant Mesh."
+"ARRAY_TEX_UV], остаются неиспользованными. Только [constant Mesh."
+"ARRAY_VERTEX] и [constant Mesh.ARRAY_TEX_UV] будут переданы в графический "
+"процессор.\n"
+"[константа Mesh.ARRAY_NORMAL] используется только для определения того, какие "
+"грани требуют использования плоского затенения. По умолчанию CSGMesh будет "
+"игнорировать нормали вершин сетки, пересчитывать их для каждой вершины и "
+"использовать сглаженный шейдер. Если для грани требуется плоский шейдер, "
+"убедитесь, что все нормали вершин грани приблизительно равны."
+
+msgid "Extrudes a 2D polygon shape to create a 3D mesh."
+msgstr "Выдавливает 2D-многоугольник для создания 3D-сетки."
+
+msgid ""
+"An array of 2D points is extruded to quickly and easily create a variety of "
+"3D meshes. See also [CSGMesh3D] for using 3D meshes as CSG nodes.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Массив 2D-точек выдавливается для быстрого и легкого создания различных 3D-"
+"сеток. См. также [CSGMesh3D] для использования 3D-сеток в качестве узлов "
+"CSG.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG требует значительных затрат "
+"ресурсов ЦП по сравнению с созданием [MeshInstance3D] с [PrimitiveMesh]. "
+"Перемещение узла CSG в пределах другого узла CSG также требует значительных "
+"затрат ресурсов ЦП, поэтому его следует избегать во время игры."
+
+msgid "When [member mode] is [constant MODE_DEPTH], the depth of the extrusion."
+msgstr "Если [member mode] равен [constant MODE_DEPTH], глубина выдавливания."
+
+msgid ""
+"Material to use for the resulting mesh. The UV maps the top half of the "
+"material to the extruded shape (U along the length of the extrusions and V "
+"around the outline of the [member polygon]), the bottom-left quarter to the "
+"front end face, and the bottom-right quarter to the back end face."
+msgstr ""
+"Материал для использования в результирующей сетке. UV сопоставляет верхнюю "
+"половину материала с выдавленной формой (U по длине выдавливаний и V вокруг "
+"контура [многоугольника-члена]), нижнюю левую четверть с передней торцевой "
+"поверхностью, а нижнюю правую четверть с задней торцевой поверхностью."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], by default, the top half of the "
+"[member material] is stretched along the entire length of the extruded shape. "
+"If [code]false[/code] the top half of the material is repeated every step of "
+"the extrusion."
+msgstr ""
+"Когда [member mode] равен [constant MODE_PATH], по умолчанию верхняя половина "
+"[member material] растягивается по всей длине выдавленной формы. Если "
+"[code]false[/code], верхняя половина материала повторяется на каждом этапе "
+"выдавливания."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], this will determine if the "
+"interval should be by distance ([constant PATH_INTERVAL_DISTANCE]) or "
+"subdivision fractions ([constant PATH_INTERVAL_SUBDIVIDE])."
+msgstr ""
+"Если [member mode] равен [constant MODE_PATH], это определит, должен ли "
+"интервал быть рассчитан по расстоянию ([constant PATH_INTERVAL_DISTANCE]) или "
+"по дробям подразделения ([constant PATH_INTERVAL_SUBDIVIDE])."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], if [code]true[/code] the ends of "
+"the path are joined, by adding an extrusion between the last and first points "
+"of the path."
+msgstr ""
+"Когда [member mode] равен [constant MODE_PATH], если [code]true[/code], концы "
+"пути соединяются путем добавления выдавливания между последней и первой "
+"точками пути."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], if [code]true[/code] the "
+"[Transform3D] of the [CSGPolygon3D] is used as the starting point for the "
+"extrusions, not the [Transform3D] of the [member path_node]."
+msgstr ""
+"Когда [member mode] равен [constant MODE_PATH], если [code]true[/code], то в "
+"качестве начальной точки для выдавливания используется [Transform3D] из "
+"[CSGPolygon3D], а не [Transform3D] из [member path_node]."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], the location of the [Path3D] "
+"object used to extrude the [member polygon]."
+msgstr ""
+"Если [режим элемента] равен [constant MODE_PATH], местоположение объекта "
+"[Path3D], используемого для выдавливания [member polygon]."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], the path rotation method used to "
+"rotate the [member polygon] as it is extruded."
+msgstr ""
+"Если [member mode] равен [constant MODE_PATH], метод поворота траектории, "
+"используемый для поворота [member polygon] при его выдавливании."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], if [code]true[/code] the polygon "
+"will be rotated according to the proper tangent of the path at the sampled "
+"points. If [code]false[/code] an approximation is used, which decreases in "
+"accuracy as the number of subdivisions decreases."
+msgstr ""
+"Когда [member mode] равен [constant MODE_PATH], если [code]true[/code], "
+"многоугольник будет повернут в соответствии с правильной касательной пути в "
+"выбранных точках. Если [code]false[/code], используется приближение, точность "
+"которого уменьшается по мере уменьшения количества подразделений."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], extrusions that are less than "
+"this angle, will be merged together to reduce polygon count."
+msgstr ""
+"Если [member mode] равен [constant MODE_PATH], выдавливания, которые меньше "
+"этого угла, будут объединены вместе для уменьшения количества полигонов."
+
+msgid ""
+"When [member mode] is [constant MODE_PATH], this is the distance along the "
+"path, in meters, the texture coordinates will tile. When set to 0, texture "
+"coordinates will match geometry exactly with no tiling."
+msgstr ""
+"Когда [member mode] равен [constant MODE_PATH], это расстояние вдоль пути в "
+"метрах, координаты текстуры будут замощены. Если установлено значение 0, "
+"координаты текстуры будут точно соответствовать геометрии без замощения."
+
+msgid ""
+"The point array that defines the 2D polygon that is extruded. This can be a "
+"convex or concave polygon with 3 or more points. The polygon must [i]not[/i] "
+"have any intersecting edges. Otherwise, triangulation will fail and no mesh "
+"will be generated.\n"
+"[b]Note:[/b] If only 1 or 2 points are defined in [member polygon], no mesh "
+"will be generated."
+msgstr ""
+"Массив точек, определяющий выдавливаемый 2D-полигон. Это может быть выпуклый "
+"или вогнутый полигон с 3 или более точками. Полигон не должен [i]иметь[/i] "
+"пересекающихся ребер. В противном случае триангуляция не будет выполнена, и "
+"сетка не будет создана.\n"
+"[b]Примечание:[/b] Если в [member polygon] определены только 1 или 2 точки, "
+"сетка не будет создана."
+
+msgid "If [code]true[/code], applies smooth shading to the extrusions."
+msgstr ""
+"Если [code]true[/code], к выдавливаниям (extrusions) применяется плавное "
+"затенение."
+
+msgid ""
+"When [member mode] is [constant MODE_SPIN], the total number of degrees the "
+"[member polygon] is rotated when extruding."
+msgstr ""
+"Если [member mode] равен [constant MODE_SPIN], общее число градусов, на "
+"которое поворачивается [member polygon] при выдавливании."
+
+msgid "The [member polygon] shape is extruded along the negative Z axis."
+msgstr "Форма [member polygon] выдавливается вдоль отрицательной оси Z."
+
+msgid "The [member polygon] shape is extruded by rotating it around the Y axis."
+msgstr "Форма [member polygon] выдавливается путем вращения вокруг оси Y."
+
+msgid ""
+"The [member polygon] shape is extruded along the [Path3D] specified in "
+"[member path_node]."
+msgstr ""
+"Фигура [member polygon] выдавливается вдоль [Path3D], указанного в [member "
+"path_node]."
+
+msgid ""
+"The [member polygon] shape is not rotated.\n"
+"[b]Note:[/b] Requires the path Z coordinates to continually decrease to "
+"ensure viable shapes."
+msgstr ""
+"Форма [member polygon] не повернута.\n"
+"[b]Примечание:[/b] Требует, чтобы координаты Z траектории постоянно "
+"уменьшались для обеспечения жизнеспособных форм."
+
+msgid ""
+"The [member polygon] shape is rotated along the path, but it is not rotated "
+"around the path axis.\n"
+"[b]Note:[/b] Requires the path Z coordinates to continually decrease to "
+"ensure viable shapes."
+msgstr ""
+"Фигура [member polygon] вращается вдоль пути, но не вращается вокруг оси "
+"пути.\n"
+"[b]Примечание:[/b] Требует, чтобы координаты Z пути постоянно уменьшались для "
+"обеспечения жизнеспособных форм."
+
+msgid ""
+"The [member polygon] shape follows the path and its rotations around the path "
+"axis."
+msgstr ""
+"Форма [многоугольника-члена] следует траектории и ее вращениям вокруг оси "
+"траектории."
+
+msgid ""
+"When [member mode] is set to [constant MODE_PATH], [member path_interval] "
+"will determine the distance, in meters, each interval of the path will "
+"extrude."
+msgstr ""
+"Если [member mode] установлен на [constant MODE_PATH], [member path_interval] "
+"будет определять расстояние в метрах, на которое будет выдавливаться каждый "
+"интервал пути."
+
+msgid ""
+"When [member mode] is set to [constant MODE_PATH], [member path_interval] "
+"will subdivide the polygons along the path."
+msgstr ""
+"Если [member mode] установлен на [constant MODE_PATH], [member path_interval] "
+"будет подразделять полигоны вдоль пути."
+
+msgid "Base class for CSG primitives."
+msgstr "Базовый класс для примитивов CSG."
+
+msgid ""
+"Parent class for various CSG primitives. It contains code and functionality "
+"that is common between them. It cannot be used directly. Instead use one of "
+"the various classes that inherit from it.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Родительский класс для различных примитивов CSG. Он содержит код и "
+"функциональность, которые являются общими для них. Его нельзя использовать "
+"напрямую. Вместо этого используйте один из различных классов, которые "
+"наследуют от него.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG имеет значительные затраты ЦП по "
+"сравнению с созданием [MeshInstance3D] с [PrimitiveMesh]. Перемещение узла "
+"CSG внутри другого узла CSG также имеет значительные затраты ЦП, поэтому его "
+"следует избегать во время игры."
+
+msgid ""
+"If set, the order of the vertices in each triangle are reversed resulting in "
+"the backside of the mesh being drawn."
+msgstr ""
+"Если установлено, порядок вершин в каждом треугольнике меняется на обратный, "
+"в результате чего отрисовывается задняя сторона сетки."
+
+msgid "The CSG base class."
+msgstr "Базовый класс CSG."
+
+msgid ""
+"This is the CSG base class that provides CSG operation support to the various "
+"CSG nodes in Godot.\n"
+"[b]Performance:[/b] CSG nodes are only intended for prototyping as they have "
+"a significant CPU performance cost.\n"
+"Consider baking final CSG operation results into static geometry that "
+"replaces the CSG nodes.\n"
+"Individual CSG root node results can be baked to nodes with static resources "
+"with the editor menu that appears when a CSG root node is selected.\n"
+"Individual CSG root nodes can also be baked to static resources with scripts "
+"by calling [method bake_static_mesh] for the visual mesh or [method "
+"bake_collision_shape] for the physics collision.\n"
+"Entire scenes of CSG nodes can be baked to static geometry and exported with "
+"the editor gltf scene exporter."
+msgstr ""
+"Это базовый класс CSG, который обеспечивает поддержку операций CSG для "
+"различных узлов CSG в Godot.\n"
+"[b]Производительность:[/b] Узлы CSG предназначены только для "
+"прототипирования, поскольку они имеют значительные затраты производительности "
+"ЦП.\n"
+"Рассмотрите возможность запекания окончательных результатов операций CSG в "
+"статическую геометрию, которая заменяет узлы CSG.\n"
+"Отдельные результаты корневых узлов CSG можно запекать в узлы со статическими "
+"ресурсами с помощью меню редактора, которое появляется при выборе корневого "
+"узла CSG.\n"
+"Отдельные корневые узлы CSG также можно запекать в статические ресурсы с "
+"помощью скриптов, вызывая [method bake_static_mesh] для визуальной сетки или "
+"[method bake_collision_shape] для физического столкновения.\n"
+"Все сцены узлов CSG можно запекать в статическую геометрию и экспортировать с "
+"помощью редактора экспортера сцен gltf."
+
+msgid ""
+"Returns a baked physics [ConcavePolygonShape3D] of this node's CSG operation "
+"result. Returns an empty shape if the node is not a CSG root node or has no "
+"valid geometry.\n"
+"[b]Performance:[/b] If the CSG operation results in a very detailed geometry "
+"with many faces physics performance will be very slow. Concave shapes should "
+"in general only be used for static level geometry and not with dynamic "
+"objects that are moving."
+msgstr ""
+"Возвращает запеченную физику [ConcavePolygonShape3D] результата операции CSG "
+"этого узла. Возвращает пустую форму, если узел не является корневым узлом CSG "
+"или не имеет допустимой геометрии.\n"
+"[b]Производительность:[/b] Если операция CSG приводит к очень подробной "
+"геометрии со многими гранями, производительность физики будет очень низкой. "
+"Вогнутые формы, как правило, следует использовать только для статической "
+"геометрии уровня, а не с динамическими объектами, которые движутся."
+
+msgid ""
+"Returns a baked static [ArrayMesh] of this node's CSG operation result. "
+"Materials from involved CSG nodes are added as extra mesh surfaces. Returns "
+"an empty mesh if the node is not a CSG root node or has no valid geometry."
+msgstr ""
+"Возвращает запеченный статический [ArrayMesh] результата операции CSG этого "
+"узла. Материалы из задействованных узлов CSG добавляются как дополнительные "
+"поверхности сетки. Возвращает пустую сетку, если узел не является корневым "
+"узлом CSG или не имеет допустимой геометрии."
+
+msgid ""
+"Returns an [Array] with two elements, the first is the [Transform3D] of this "
+"node and the second is the root [Mesh] of this node. Only works when this "
+"node is the root shape."
+msgstr ""
+"Возвращает [Array] с двумя элементами, первый из которых — [Transform3D] "
+"этого узла, а второй — корень [Mesh] этого узла. Работает только тогда, когда "
+"этот узел является корневой формой."
+
+msgid ""
+"Returns [code]true[/code] if this is a root shape and is thus the object that "
+"is rendered."
+msgstr ""
+"Возвращает [code]true[/code], если это корневая форма и, следовательно, "
+"объект, который визуализируется."
+
+msgid ""
+"Calculate tangents for the CSG shape which allows the use of normal maps. "
+"This is only applied on the root shape, this setting is ignored on any child."
+msgstr ""
+"Вычислить касательные для формы CSG, что позволяет использовать карты "
+"нормалей. Это применяется только к корневой форме, эта настройка игнорируется "
+"для любого потомка."
+
+msgid ""
+"The physics layers this area is in.\n"
+"Collidable objects can exist in any of 32 different layers. These layers work "
+"like a tagging system, and are not visual. A collidable can use these layers "
+"to select with which objects it can collide, using the collision_mask "
+"property.\n"
+"A contact is detected if object A is in any of the layers that object B "
+"scans, or object B is in any layer scanned by object A. See [url=$DOCS_URL/"
+"tutorials/physics/physics_introduction.html#collision-layers-and-"
+"masks]Collision layers and masks[/url] in the documentation for more "
+"information."
+msgstr ""
+"Слои физики, в которых находится эта область.\n"
+"Объекты, способные сталкиваться, могут существовать в любом из 32 различных "
+"слоев. Эти слои работают как система тегов и не являются визуальными. "
+"Сталкивающийся объект может использовать эти слои для выбора объектов, с "
+"которыми он может столкнуться, используя свойство collision_mask.\n"
+"Контакт обнаруживается, если объект A находится в любом из слоев, которые "
+"сканирует объект B, или объект B находится в любом слое, сканируемом объектом "
+"A. Для получения дополнительной информации см. [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Слои и маски "
+"столкновений[/url] в документации."
+
+msgid ""
+"The physics layers this CSG shape scans for collisions. Only effective if "
+"[member use_collision] is [code]true[/code]. See [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Collision layers "
+"and masks[/url] in the documentation for more information."
+msgstr ""
+"Слои физики этой формы CSG сканируют на предмет столкновений. Действует "
+"только если [member use_collision] равно [code]true[/code]. Для получения "
+"дополнительной информации см. [url=$DOCS_URL/tutorials/physics/"
+"physics_introduction.html#collision-layers-and-masks]Слои и маски "
+"столкновений[/url] в документации."
+
+msgid ""
+"The priority used to solve colliding when occurring penetration. Only "
+"effective if [member use_collision] is [code]true[/code]. The higher the "
+"priority is, the lower the penetration into the object will be. This can for "
+"example be used to prevent the player from breaking through the boundaries of "
+"a level."
+msgstr ""
+"Приоритет, используемый для решения столкновения при возникновении "
+"проникновения. Действует только если [member use_collision] равно [code]true[/"
+"code]. Чем выше приоритет, тем ниже будет проникновение в объект. Это может "
+"быть использовано, например, для предотвращения прорыва игрока через границы "
+"уровня."
+
+msgid ""
+"The operation that is performed on this shape. This is ignored for the first "
+"CSG child node as the operation is between this node and the previous child "
+"of this nodes parent."
+msgstr ""
+"Операция, которая выполняется над этой формой. Это игнорируется для первого "
+"дочернего узла CSG, поскольку операция выполняется между этим узлом и "
+"предыдущим дочерним узлом этого родительского узла."
+
+msgid "The CSG library no longer uses snapping."
+msgstr "Библиотека CSG больше не использует привязку."
+
+msgid ""
+"Adds a collision shape to the physics engine for our CSG shape. This will "
+"always act like a static body. Note that the collision shape is still active "
+"even if the CSG shape itself is hidden. See also [member collision_mask] and "
+"[member collision_priority]."
+msgstr ""
+"Добавляет форму столкновения в физический движок для нашей формы CSG. Это "
+"всегда будет действовать как статическое тело. Обратите внимание, что форма "
+"столкновения все еще активна, даже если сама форма CSG скрыта. См. также "
+"[member collision_mask] и [member collision_priority]."
+
+msgid "Geometry of both primitives is merged, intersecting geometry is removed."
+msgstr ""
+"Геометрия обоих примитивов объединяется, пересекающаяся геометрия удаляется."
+
+msgid "Only intersecting geometry remains, the rest is removed."
+msgstr "Остается только пересекающаяся геометрия, остальное удаляется."
+
+msgid ""
+"The second shape is subtracted from the first, leaving a dent with its shape."
+msgstr "Вторая форма вычитается из первой, оставляя вмятину на ее форме."
+
+msgid "A CSG Sphere shape."
+msgstr "Форма сферы CSG."
+
+msgid ""
+"This node allows you to create a sphere for use with the CSG system.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Этот узел позволяет вам создать сферу для использования с системой CSG.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG имеет значительные затраты ЦП по "
+"сравнению с созданием [MeshInstance3D] с [PrimitiveMesh]. Перемещение узла "
+"CSG в другой узел CSG также имеет значительные затраты ЦП, поэтому его "
+"следует избегать во время игры."
+
+msgid "The material used to render the sphere."
+msgstr "Материал, используемый для визуализации сферы."
+
+msgid "Number of vertical slices for the sphere."
+msgstr "Количество вертикальных срезов сферы."
+
+msgid "Radius of the sphere."
+msgstr "Радиус сферы."
+
+msgid "Number of horizontal slices for the sphere."
+msgstr "Количество горизонтальных срезов сферы."
+
+msgid ""
+"If [code]true[/code] the normals of the sphere are set to give a smooth "
+"effect making the sphere seem rounded. If [code]false[/code] the sphere will "
+"have a flat shaded look."
+msgstr ""
+"Если [code]true[/code], нормали сферы устанавливаются так, чтобы придать "
+"плавный эффект, делая сферу кажущейся округлой. Если [code]false[/code], "
+"сфера будет иметь плоский затененный вид."
+
+msgid "A CSG Torus shape."
+msgstr "Форма тора CSG."
+
+msgid ""
+"This node allows you to create a torus for use with the CSG system.\n"
+"[b]Note:[/b] CSG nodes are intended to be used for level prototyping. "
+"Creating CSG nodes has a significant CPU cost compared to creating a "
+"[MeshInstance3D] with a [PrimitiveMesh]. Moving a CSG node within another CSG "
+"node also has a significant CPU cost, so it should be avoided during gameplay."
+msgstr ""
+"Этот узел позволяет вам создать тор для использования с системой CSG.\n"
+"[b]Примечание:[/b] Узлы CSG предназначены для использования при "
+"прототипировании уровней. Создание узлов CSG имеет значительные затраты ЦП по "
+"сравнению с созданием [MeshInstance3D] с [PrimitiveMesh]. Перемещение узла "
+"CSG в другой узел CSG также имеет значительные затраты ЦП, поэтому его "
+"следует избегать во время игры."
+
+msgid "The inner radius of the torus."
+msgstr "Внутренний радиус торуса."
+
+msgid "The material used to render the torus."
+msgstr "Материал, используемый для визуализации торуса."
+
+msgid "The outer radius of the torus."
+msgstr "Внешний радиус торуса."
+
+msgid "The number of edges each ring of the torus is constructed of."
+msgstr "Число ребер, из которых построено каждое кольцо торуса."
+
+msgid "The number of slices the torus is constructed of."
+msgstr "Количество срезов, из которых построен торус."
+
+msgid ""
+"If [code]true[/code] the normals of the torus are set to give a smooth effect "
+"making the torus seem rounded. If [code]false[/code] the torus will have a "
+"flat shaded look."
+msgstr ""
+"Если [code]true[/code], то нормали тора устанавливаются так, чтобы придать "
+"гладкий эффект, делая тор скругленным. Если [code]false[/code], то тор будет "
+"иметь плоский затененный вид."
+
+msgid ""
+"A script implemented in the C# programming language, saved with the [code]."
+"cs[/code] extension (Mono-enabled builds only)."
+msgstr ""
+"Скрипт, реализованный на языке программирования C#, сохраненный с расширением "
+"[code].cs[/code] (только для сборок с поддержкой Mono)."
+
+msgid ""
+"This class represents a C# script. It is the C# equivalent of the [GDScript] "
+"class and is only available in Mono-enabled Godot builds."
+msgstr ""
+"Этот класс представляет собой скрипт C#. Это эквивалент класса [GDScript] на "
+"C#, доступный только в сборках Godot с поддержкой Mono."
+
+msgid "C# documentation index"
+msgstr "Индекс документации по C#"
+
+msgid "Returns a new instance of the script."
+msgstr "Возвращает новый экземпляр скрипта."
+
+msgid ""
+"Six square textures representing the faces of a cube. Commonly used as a "
+"skybox."
+msgstr ""
+"Шесть квадратных текстур, представляющих грани куба. Обычно используются как "
+"скайбокс."
+
+msgid ""
+"A cubemap is made of 6 textures organized in layers. They are typically used "
+"for faking reflections in 3D rendering (see [ReflectionProbe]). It can be "
+"used to make an object look as if it's reflecting its surroundings. This "
+"usually delivers much better performance than other reflection methods.\n"
+"This resource is typically used as a uniform in custom shaders. Few core "
+"Godot methods make use of [Cubemap] resources.\n"
+"To create such a texture file yourself, reimport your image files using the "
+"Godot Editor import presets. To create a Cubemap from code, use [method "
+"ImageTextureLayered.create_from_images] on an instance of the Cubemap class.\n"
+"The expected image order is X+, X-, Y+, Y-, Z+, Z- (in Godot's coordinate "
+"system, so Y+ is \"up\" and Z- is \"forward\"). You can use one of the "
+"following templates as a base:\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]2×3 cubemap template "
+"(default layout option)[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]3×2 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]1×6 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]6×1 cubemap template[/"
+"url]\n"
+"[b]Note:[/b] Godot doesn't support using cubemaps in a [PanoramaSkyMaterial]. "
+"To use a cubemap as a skybox, convert the default [PanoramaSkyMaterial] to a "
+"[ShaderMaterial] using the [b]Convert to ShaderMaterial[/b] resource dropdown "
+"option, then replace its code with the following:\n"
+"[codeblock lang=text]\n"
+"shader_type sky;\n"
+"\n"
+"uniform samplerCube source_panorama : filter_linear, source_color, "
+"hint_default_black;\n"
+"uniform float exposure : hint_range(0, 128) = 1.0;\n"
+"\n"
+"void sky() {\n"
+"    // If importing a cubemap from another engine, you may need to flip one "
+"of the `EYEDIR` components below\n"
+"    // by replacing it with `-EYEDIR`.\n"
+"    vec3 eyedir = vec3(EYEDIR.x, EYEDIR.y, EYEDIR.z);\n"
+"    COLOR = texture(source_panorama, eyedir).rgb * exposure;\n"
+"}\n"
+"[/codeblock]\n"
+"After replacing the shader code and saving, specify the imported Cubemap "
+"resource in the Shader Parameters section of the ShaderMaterial in the "
+"inspector.\n"
+"Alternatively, you can use [url=https://danilw.github.io/GLSL-howto/"
+"cubemap_to_panorama_js/cubemap_to_panorama.html]this tool[/url] to convert a "
+"cubemap to an equirectangular sky map and use [PanoramaSkyMaterial] as usual."
+msgstr ""
+"Кубическая карта состоит из 6 текстур, организованных в слои. Обычно они "
+"используются для имитации отражений в 3D-рендеринге (см. [ReflectionProbe]). "
+"Ее можно использовать, чтобы заставить объект выглядеть так, как будто он "
+"отражает свое окружение. Обычно это обеспечивает гораздо лучшую "
+"производительность, чем другие методы отражения.\n"
+"Этот ресурс обычно используется как униформа в пользовательских шейдерах. "
+"Несколько основных методов Godot используют ресурсы [Cubemap].\n"
+"Чтобы создать такой файл текстуры самостоятельно, повторно импортируйте файлы "
+"изображений с помощью предустановок импорта редактора Godot. Чтобы создать "
+"Cubemap из кода, используйте [метод ImageTextureLayered.create_from_images] "
+"для экземпляра класса Cubemap.\n"
+"Ожидаемый порядок изображений: X+, X-, Y+, Y-, Z+, Z- (в системе координат "
+"Godo, поэтому Y+ — «вверх», а Z- — «вперед»). Вы можете использовать один из "
+"следующих шаблонов в качестве основы:\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]2×3 cubemap template "
+"(default layout option)[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]3×2 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]1×6 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]6×1 cubemap template[/"
+"url]\n"
+"[b]Примечание:[/b] Godot не поддерживает использование кубических карт в "
+"[PanoramaSkyMaterial]. Чтобы использовать кубическую карту в качестве "
+"скайбокса, преобразуйте [PanoramaSkyMaterial] по умолчанию в [ShaderMaterial] "
+"с помощью раскрывающегося списка ресурсов [b]Преобразовать в ShaderMaterial[/"
+"b], затем замените его код следующим:\n"
+"[codeblock lang=text]\n"
+"shader_type sky;\n"
+"\n"
+"uniform samplerCube source_panorama : filter_linear, source_color, "
+"hint_default_black;\n"
+"uniform float exposure : hint_range(0, 128) = 1.0;\n"
+"\n"
+"void sky() {\n"
+"    //При импорте кубической карты из другого движка вам может потребоваться "
+"перевернуть один из компонентов `EYEDIR` ниже.\n"
+"    // заменив его на `-EYEDIR`.\n"
+"    vec3 eyedir = vec3(EYEDIR.x, EYEDIR.y, EYEDIR.z);\n"
+"    COLOR = texture(source_panorama, eyedir).rgb * exposure;\n"
+"}\n"
+"[/codeblock]\n"
+"После замены кода шейдера и сохранения укажите импортированный ресурс Cubemap "
+"в разделе Shader Parameters ShaderMaterial в инспекторе.\n"
+"В качестве альтернативы вы можете использовать [url=https://danilw.github.io/"
+"GLSL-howto/cubemap_to_panorama_js/cubemap_to_panorama.html]этот инструмент[/"
+"url] для преобразования кубической карты в равнопрямоугольную карту неба и "
+"использовать [PanoramaSkyMaterial] как обычно."
+
+msgid "Creates a placeholder version of this resource ([PlaceholderCubemap])."
+msgstr "Создает версию-заполнитель этого ресурса ([PlaceholderCubemap])."
+
+msgid "An array of [Cubemap]s, stored together and with a single reference."
+msgstr "Массивы [Cubemap]-ы, хранящихся вместе и имеющих одну ссылку."
+
+msgid ""
+"[CubemapArray]s are made of an array of [Cubemap]s. Like [Cubemap]s, they are "
+"made of multiple textures, the amount of which must be divisible by 6 (one "
+"for each face of the cube).\n"
+"The primary benefit of [CubemapArray]s is that they can be accessed in shader "
+"code using a single texture reference. In other words, you can pass multiple "
+"[Cubemap]s into a shader using a single [CubemapArray]. [Cubemap]s are "
+"allocated in adjacent cache regions on the GPU, which makes [CubemapArray]s "
+"the most efficient way to store multiple [Cubemap]s.\n"
+"Godot uses [CubemapArray]s internally for many effects, including the [Sky] "
+"if you set [member ProjectSettings.rendering/reflections/sky_reflections/"
+"texture_array_reflections] to [code]true[/code].\n"
+"To create such a texture file yourself, reimport your image files using the "
+"Godot Editor import presets. To create a CubemapArray from code, use [method "
+"ImageTextureLayered.create_from_images] on an instance of the CubemapArray "
+"class.\n"
+"The expected image order is X+, X-, Y+, Y-, Z+, Z- (in Godot's coordinate "
+"system, so Y+ is \"up\" and Z- is \"forward\"). You can use one of the "
+"following templates as a base:\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]2×3 cubemap template "
+"(default layout option)[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]3×2 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]1×6 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]6×1 cubemap template[/"
+"url]\n"
+"Multiple layers are stacked on top of each other when using the default "
+"vertical import option (with the first layer at the top). Alternatively, you "
+"can choose an horizontal layout in the import options (with the first layer "
+"at the left).\n"
+"[b]Note:[/b] [CubemapArray] is not supported in the Compatibility renderer "
+"due to graphics API limitations."
+msgstr ""
+"[CubemapArray]-ы сделаны из массива [Cubemap]-ов. Как и [Cubemap]-ы, они "
+"сделаны из нескольких текстур, количество которых должно делиться на 6 (по "
+"одной на каждую грань куба).\n"
+"Основное преимущество [CubemapArray]-ов заключается в том, что к ним можно "
+"получить доступ в коде шейдера, используя одну ссылку на текстуру. Другими "
+"словами, вы можете передать несколько [Cubemap]-ов в шейдер, используя один "
+"[CubemapArray]. [Cubemap]-ы размещаются в соседних областях кэша на GPU, что "
+"делает [CubemapArray]-ы наиболее эффективным способом хранения нескольких "
+"[Cubemap]-ы.\n"
+"Godot использует [CubemapArray]-ы для многих внутренних эффектов, включая "
+"[Sky], если вы установите [member ProjectSettings.rendering/reflections/"
+"sky_reflections/texture_array_reflections] на [code]true[/code].\n"
+"Чтобы создать такой файл текстуры самостоятельно, повторно импортируйте файлы "
+"изображений с помощью предустановок импорта Godot Editor. Чтобы создать "
+"CubemapArray из кода, используйте [метод ImageTextureLayered."
+"create_from_images] на экземпляре класса CubemapArray.\n"
+"Ожидаемый порядок изображений: X+, X-, Y+, Y-, Z+, Z- (в системе координат "
+"Godo, поэтому Y+ — «вверх», а Z- — «вперед»). Вы можете использовать один из "
+"следующих шаблонов в качестве основы:\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]2×3 шаблон кубической "
+"карты (вариант макета по умолчанию)[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]3×2 шаблон кубической "
+"карты[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]1×6 шаблон кубической "
+"карты[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]6×1 шаблон кубической "
+"карты[/url]\n"
+"Несколько слоев накладываются друг на друга при использовании вертикальной "
+"опции импорта по умолчанию (первый слой сверху). В качестве альтернативы вы "
+"можете выбрать горизонтальную компоновку в опциях импорта (первый слой "
+"слева).\n"
+"[b]Примечание:[/b] [CubemapArray] не поддерживается в рендерере совместимости "
+"из-за ограничений графического API."
+
+msgid ""
+"Creates a placeholder version of this resource ([PlaceholderCubemapArray])."
+msgstr "Создает версию-заполнитель этого ресурса ([PlaceholderCubemapArray])."
+
+msgid "A mathematical curve."
+msgstr "Математическая кривая."
+
+msgid ""
+"This resource describes a mathematical curve by defining a set of points and "
+"tangents at each point. By default, it ranges between [code]0[/code] and "
+"[code]1[/code] on the X and Y axes, but these ranges can be changed.\n"
+"Please note that many resources and nodes assume they are given [i]unit "
+"curves[/i]. A unit curve is a curve whose domain (the X axis) is between "
+"[code]0[/code] and [code]1[/code]. Some examples of unit curve usage are "
+"[member CPUParticles2D.angle_curve] and [member Line2D.width_curve]."
+msgstr ""
+"Этот ресурс описывает математическую кривую, определяя набор точек и "
+"касательных в каждой точке. По умолчанию он находится в диапазоне между "
+"[code]0[/code] и [code]1[/code] по осям X и Y, но эти диапазоны можно "
+"изменить.\n"
+"Обратите внимание, что многие ресурсы и узлы предполагают, что им заданы "
+"[i]единичные кривые[/i]. Единичная кривая — это кривая, область определения "
+"(ось X) которой находится между [code]0[/code] и [code]1[/code]. Некоторые "
+"примеры использования единичной кривой: [member CPUParticles2D.angle_curve] и "
+"[member Line2D.width_curve]."
+
+msgid ""
+"Adds a point to the curve. For each side, if the [code]*_mode[/code] is "
+"[constant TANGENT_LINEAR], the [code]*_tangent[/code] angle (in degrees) uses "
+"the slope of the curve halfway to the adjacent point. Allows custom "
+"assignments to the [code]*_tangent[/code] angle if [code]*_mode[/code] is set "
+"to [constant TANGENT_FREE]."
+msgstr ""
+"Добавляет точку к кривой. Для каждой стороны, если [code]*_mode[/code] равно "
+"[constant TANGENT_LINEAR], угол [code]*_tangent[/code] (в градусах) "
+"использует наклон кривой на полпути к соседней точке. Позволяет настраивать "
+"назначения угла [code]*_tangent[/code], если [code]*_mode[/code] равно "
+"[constant TANGENT_FREE]."
+
+msgid "Recomputes the baked cache of points for the curve."
+msgstr "Пересчитывает запеченный кэш точек для кривой."
+
+msgid ""
+"Removes duplicate points, i.e. points that are less than 0.00001 units "
+"(engine epsilon value) away from their neighbor on the curve."
+msgstr ""
+"Удаляет дублирующиеся точки, т. е. точки, которые находятся на расстоянии "
+"менее 0,00001 единицы (значение эпсилон двигателя) от своего соседа на кривой."
+
+msgid "Removes all points from the curve."
+msgstr "Удаляет все точки из кривой."
+
+msgid ""
+"Returns the difference between [member min_domain] and [member max_domain]."
+msgstr "Возвращает разницу между [member min_domain] и [member max_domain]."
+
+msgid "Returns the left [enum TangentMode] for the point at [param index]."
+msgstr "Возвращает левый [enum TangentMode] для точки с [param index]."
+
+msgid ""
+"Returns the left tangent angle (in degrees) for the point at [param index]."
+msgstr ""
+"Возвращает левый угол касательной (в градусах) для точки с [param index]."
+
+msgid "Returns the curve coordinates for the point at [param index]."
+msgstr "Возвращает координаты кривой для точки с [param index]."
+
+msgid "Returns the right [enum TangentMode] for the point at [param index]."
+msgstr "Возвращает правильный [enum TangentMode] для точки с [param index]."
+
+msgid ""
+"Returns the right tangent angle (in degrees) for the point at [param index]."
+msgstr ""
+"Возвращает угол прямого тангенса (в градусах) для точки с [индексом "
+"параметра]."
+
+msgid ""
+"Returns the difference between [member min_value] and [member max_value]."
+msgstr "Возвращает разницу между [member min_value]] и [member max_value]."
+
+msgid "Removes the point at [param index] from the curve."
+msgstr "Удаляет точку с [param index] из кривой."
+
+msgid ""
+"Returns the Y value for the point that would exist at the X position [param "
+"offset] along the curve."
+msgstr ""
+"Возвращает значение Y для точки, которая будет находиться в позиции X [param "
+"offset] вдоль кривой."
+
+msgid ""
+"Returns the Y value for the point that would exist at the X position [param "
+"offset] along the curve using the baked cache. Bakes the curve's points if "
+"not already baked."
+msgstr ""
+"Возвращает значение Y для точки, которая будет существовать в позиции X "
+"[param offset] вдоль кривой, используя запеченный кэш. Запекает точки кривой, "
+"если они еще не запечены."
+
+msgid ""
+"Sets the left [enum TangentMode] for the point at [param index] to [param "
+"mode]."
+msgstr ""
+"Устанавливает левый [enum TangentMode] для точки с [param index] в [param "
+"mode]."
+
+msgid ""
+"Sets the left tangent angle for the point at [param index] to [param tangent]."
+msgstr ""
+"Устанавливает левый угол касательной для точки с [param index] на [param "
+"tangent]."
+
+msgid "Sets the offset from [code]0.5[/code]."
+msgstr "Устанавливает смещение от [code]0.5[/code]."
+
+msgid ""
+"Sets the right [enum TangentMode] for the point at [param index] to [param "
+"mode]."
+msgstr ""
+"Устанавливает правильный [enum TangentMode] для точки с [param index] в "
+"[param mode]."
+
+msgid ""
+"Sets the right tangent angle for the point at [param index] to [param "
+"tangent]."
+msgstr ""
+"Устанавливает прямой угол касательной для точки с [param index] на [param "
+"tangent]."
+
+msgid "Assigns the vertical position [param y] to the point at [param index]."
+msgstr "Присваивает вертикальное положение [param y] точке с [param index]."
+
+msgid "The number of points to include in the baked (i.e. cached) curve data."
+msgstr ""
+"Количество точек, включаемых в запеченные (т.е. кэшированные) данные кривой."
+
+msgid ""
+"The maximum value (y-coordinate) that points can have. Tangents can cause "
+"higher values between points."
+msgstr ""
+"Максимальное значение (координата Y), которое могут иметь точки. Касательные "
+"могут вызывать более высокие значения между точками."
+
+msgid "The minimum domain (x-coordinate) that points can have."
+msgstr "Минимальная область (координата x), которую могут иметь точки."
+
+msgid ""
+"The minimum value (y-coordinate) that points can have. Tangents can cause "
+"lower values between points."
+msgstr ""
+"Минимальное значение (координата Y), которое могут иметь точки. Касательные "
+"могут вызывать более низкие значения между точками."
+
+msgid "Emitted when [member max_value] or [member min_value] is changed."
+msgstr "Выдается при изменении [member max_value] или [member min_value]."
+
+msgid "The tangent on this side of the point is user-defined."
+msgstr "Касательная по эту сторону точки определяется пользователем."
+
+msgid ""
+"The curve calculates the tangent on this side of the point as the slope "
+"halfway towards the adjacent point."
+msgstr ""
+"Кривая вычисляет касательную по эту сторону от точки как наклон на полпути к "
+"соседней точке."
+
+msgid "The total number of available tangent modes."
+msgstr "Общее количество доступных касательных мод."
+
+msgid "Describes a Bézier curve in 2D space."
+msgstr "Описывает кривую Безье в 2D пространстве."
+
+msgid ""
+"This class describes a Bézier curve in 2D space. It is mainly used to give a "
+"shape to a [Path2D], but can be manually sampled for other purposes.\n"
+"It keeps a cache of precalculated points along the curve, to speed up further "
+"calculations."
+msgstr ""
+"Этот класс описывает кривую Безье в 2D-пространстве. В основном он "
+"используется для придания формы [Path2D], но может быть вручную выбран для "
+"других целей.\n"
+"Он хранит кэш предварительно рассчитанных точек вдоль кривой для ускорения "
+"дальнейших вычислений."
+
+msgid ""
+"Adds a point with the specified [param position] relative to the curve's own "
+"position, with control points [param in] and [param out]. Appends the new "
+"point at the end of the point list.\n"
+"If [param index] is given, the new point is inserted before the existing "
+"point identified by index [param index]. Every existing point starting from "
+"[param index] is shifted further down the list of points. The index must be "
+"greater than or equal to [code]0[/code] and must not exceed the number of "
+"existing points in the line. See [member point_count]."
+msgstr ""
+"Добавляет точку с указанным [param position] относительно собственного "
+"положения кривой с контрольными точками [param in] и [param out]. Добавляет "
+"новую точку в конец списка точек.\n"
+"Если задан [param index], новая точка вставляется перед существующей точкой, "
+"идентифицированной индексом [param index]. Каждая существующая точка, начиная "
+"с [param index], смещается дальше вниз по списку точек. Индекс должен быть "
+"больше или равен [code]0[/code] и не должен превышать количество существующих "
+"точек в строке. См. [member point_count]."
+
+msgid ""
+"Returns the total length of the curve, based on the cached points. Given "
+"enough density (see [member bake_interval]), it should be approximate enough."
+msgstr ""
+"Возвращает общую длину кривой на основе кэшированных точек. При достаточной "
+"плотности (см. [member bake_interval]) она должна быть достаточно "
+"приблизительной."
+
+msgid ""
+"Returns the closest offset to [param to_point]. This offset is meant to be "
+"used in [method sample_baked].\n"
+"[param to_point] must be in this curve's local space."
+msgstr ""
+"Возвращает ближайшее смещение к [param to_point]. Это смещение предназначено "
+"для использования в [method sample_baked].\n"
+"[param to_point] должен находиться в локальном пространстве этой кривой."
+
+msgid ""
+"Returns the closest point on baked segments (in curve's local space) to "
+"[param to_point].\n"
+"[param to_point] must be in this curve's local space."
+msgstr ""
+"Возвращает ближайшую точку на запеченных сегментах (в локальном пространстве "
+"кривой) к [param to_point].\n"
+"[param to_point] должен находиться в локальном пространстве этой кривой."
+
+msgid ""
+"Returns the position of the control point leading to the vertex [param idx]. "
+"The returned position is relative to the vertex [param idx]. If the index is "
+"out of bounds, the function sends an error to the console, and returns [code]"
+"(0, 0)[/code]."
+msgstr ""
+"Возвращает позицию контрольной точки, ведущей к вершине [param idx]. "
+"Возвращаемая позиция является относительной вершины [param idx]. Если индекс "
+"выходит за пределы, функция отправляет ошибку на консоль и возвращает [code]"
+"(0, 0)[/code]."
+
+msgid ""
+"Returns the position of the control point leading out of the vertex [param "
+"idx]. The returned position is relative to the vertex [param idx]. If the "
+"index is out of bounds, the function sends an error to the console, and "
+"returns [code](0, 0)[/code]."
+msgstr ""
+"Возвращает позицию контрольной точки, выходящей из вершины [param idx]. "
+"Возвращаемая позиция является относительной вершины [param idx]. Если индекс "
+"выходит за пределы, функция отправляет ошибку на консоль и возвращает [code]"
+"(0, 0)[/code]."
+
+msgid ""
+"Returns the position of the vertex [param idx]. If the index is out of "
+"bounds, the function sends an error to the console, and returns [code](0, 0)[/"
+"code]."
+msgstr ""
+"Возвращает позицию вершины [param idx]. Если индекс выходит за пределы, "
+"функция отправляет ошибку на консоль и возвращает [code](0, 0)[/code]."
+
+msgid ""
+"Deletes the point [param idx] from the curve. Sends an error to the console "
+"if [param idx] is out of bounds."
+msgstr ""
+"Удаляет точку [param idx] из кривой. Отправляет ошибку на консоль, если "
+"[param idx] выходит за пределы."
+
+msgid ""
+"Returns the position between the vertex [param idx] and the vertex [code]idx "
+"+ 1[/code], where [param t] controls if the point is the first vertex "
+"([code]t = 0.0[/code]), the last vertex ([code]t = 1.0[/code]), or in "
+"between. Values of [param t] outside the range ([code]0.0 <= t <= 1.0[/code]) "
+"give strange, but predictable results.\n"
+"If [param idx] is out of bounds it is truncated to the first or last vertex, "
+"and [param t] is ignored. If the curve has no points, the function sends an "
+"error to the console, and returns [code](0, 0)[/code]."
+msgstr ""
+"Возвращает позицию между вершиной [param idx] и вершиной [code]idx + 1[/"
+"code], где [param t] контролирует, является ли точка первой вершиной ([code]t "
+"= 0.0[/code]), последней вершиной ([code]t = 1.0[/code]) или находится между "
+"ними. Значения [param t] вне диапазона ([code]0.0 <= t <= 1.0[/code]) дают "
+"странные, но предсказуемые результаты.\n"
+"Если [param idx] выходит за пределы, он усекается до первой или последней "
+"вершины, а [param t] игнорируется. Если у кривой нет точек, функция "
+"отправляет ошибку на консоль и возвращает [code](0, 0)[/code]."
+
+msgid ""
+"Returns a point within the curve at position [param offset], where [param "
+"offset] is measured as a pixel distance along the curve.\n"
+"To do that, it finds the two cached points where the [param offset] lies "
+"between, then interpolates the values. This interpolation is cubic if [param "
+"cubic] is set to [code]true[/code], or linear if set to [code]false[/code].\n"
+"Cubic interpolation tends to follow the curves better, but linear is faster "
+"(and often, precise enough)."
+msgstr ""
+"Возвращает точку внутри кривой в позиции [param offset], где [param offset] "
+"измеряется как расстояние в пикселях вдоль кривой.\n"
+"Для этого он находит две кэшированные точки, между которыми находится [param "
+"offset], затем интерполирует значения. Эта интерполяция является кубической, "
+"если [param cubic] установлен на [code]true[/code], или линейной, если "
+"установлен на [code]false[/code].\n"
+"Кубическая интерполяция имеет тенденцию лучше следовать кривым, но линейная "
+"быстрее (и часто достаточно точна)."
+
+msgid ""
+"Similar to [method sample_baked], but returns [Transform2D] that includes a "
+"rotation along the curve, with [member Transform2D.origin] as the point "
+"position and the [member Transform2D.x] vector pointing in the direction of "
+"the path at that point. Returns an empty transform if the length of the curve "
+"is [code]0[/code].\n"
+"[codeblock]\n"
+"var baked = curve.sample_baked_with_rotation(offset)\n"
+"# The returned Transform2D can be set directly.\n"
+"transform = baked\n"
+"# You can also read the origin and rotation separately from the returned "
+"Transform2D.\n"
+"position = baked.get_origin()\n"
+"rotation = baked.get_rotation()\n"
+"[/codeblock]"
+msgstr ""
+"Аналогично [method sample_baked], но возвращает [Transform2D], который "
+"включает вращение вдоль кривой, с [member Transform2D.origin] в качестве "
+"положения точки и вектором [member Transform2D.x], указывающим в направлении "
+"пути в этой точке. Возвращает пустое преобразование, если длина кривой равна "
+"[code]0[/code].\n"
+"[codeblock]\n"
+"var baked = curve.sample_baked_with_rotation(offset)\n"
+"# Возвращаемый Transform2D можно задать напрямую.\n"
+"transform = baked\n"
+"# Вы также можете прочитать начало координат и поворот отдельно из "
+"возвращаемого Transform2D.\n"
+"position = baked.get_origin()\n"
+"rotation = baked.get_rotation()\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the position at the vertex [param fofs]. It calls [method sample] "
+"using the integer part of [param fofs] as [code]idx[/code], and its "
+"fractional part as [code]t[/code]."
+msgstr ""
+"Возвращает позицию в вершине [param fofs]. Он вызывает [method sample], "
+"используя целую часть [param fofs] как [code]idx[/code], а его дробную часть "
+"как [code]t[/code]."
+
+msgid ""
+"Sets the position of the control point leading to the vertex [param idx]. If "
+"the index is out of bounds, the function sends an error to the console. The "
+"position is relative to the vertex."
+msgstr ""
+"Устанавливает позицию контрольной точки, ведущей к вершине [param idx]. Если "
+"индекс выходит за пределы, функция отправляет ошибку на консоль. Позиция "
+"указывается относительно вершины."
+
+msgid ""
+"Sets the position of the control point leading out of the vertex [param idx]. "
+"If the index is out of bounds, the function sends an error to the console. "
+"The position is relative to the vertex."
+msgstr ""
+"Устанавливает позицию контрольной точки, выходящей из вершины [param idx]. "
+"Если индекс выходит за пределы, функция отправляет ошибку на консоль. Позиция "
+"указывается относительно вершины."
+
+msgid ""
+"Sets the position for the vertex [param idx]. If the index is out of bounds, "
+"the function sends an error to the console."
+msgstr ""
+"Устанавливает позицию для вершины [param idx]. Если индекс выходит за "
+"пределы, функция отправляет ошибку на консоль."
+
+msgid ""
+"Returns a list of points along the curve, with a curvature controlled point "
+"density. That is, the curvier parts will have more points than the straighter "
+"parts.\n"
+"This approximation makes straight segments between each point, then "
+"subdivides those segments until the resulting shape is similar enough.\n"
+"[param max_stages] controls how many subdivisions a curve segment may face "
+"before it is considered approximate enough. Each subdivision splits the "
+"segment in half, so the default 5 stages may mean up to 32 subdivisions per "
+"curve segment. Increase with care!\n"
+"[param tolerance_degrees] controls how many degrees the midpoint of a segment "
+"may deviate from the real curve, before the segment has to be subdivided."
+msgstr ""
+"Возвращает список точек вдоль кривой с контролируемой кривизной плотностью "
+"точек. То есть, более кривые части будут иметь больше точек, чем более прямые "
+"части.\n"
+"Это приближение создает прямые сегменты между каждой точкой, затем "
+"подразделяет эти сегменты до тех пор, пока результирующая форма не станет "
+"достаточно похожей.\n"
+"[param max_stages] управляет количеством подразделений, с которыми может "
+"столкнуться сегмент кривой, прежде чем он будет считаться достаточно "
+"приближенным. Каждое подразделение делит сегмент пополам, поэтому 5 стадий по "
+"умолчанию могут означать до 32 подразделений на сегмент кривой. Увеличивайте "
+"с осторожностью!\n"
+"[param capacity_degrees] управляет тем, на сколько градусов средняя точка "
+"сегмента может отклоняться от реальной кривой, прежде чем сегмент придется "
+"подразделять."
+
+msgid ""
+"Returns a list of points along the curve, with almost uniform density. [param "
+"max_stages] controls how many subdivisions a curve segment may face before it "
+"is considered approximate enough. Each subdivision splits the segment in "
+"half, so the default 5 stages may mean up to 32 subdivisions per curve "
+"segment. Increase with care!\n"
+"[param tolerance_length] controls the maximal distance between two "
+"neighboring points, before the segment has to be subdivided."
+msgstr ""
+"Возвращает список точек вдоль кривой с почти равномерной плотностью. [param "
+"max_stages] управляет количеством подразделений, с которыми может столкнуться "
+"сегмент кривой, прежде чем он будет считаться достаточно приближенным. Каждое "
+"подразделение делит сегмент пополам, поэтому 5 стадий по умолчанию могут "
+"означать до 32 подразделений на сегмент кривой. Увеличивайте с "
+"осторожностью!\n"
+"[param capacity_length] управляет максимальным расстоянием между двумя "
+"соседними точками, прежде чем сегмент придется подразделять."
+
+msgid ""
+"The distance in pixels between two adjacent cached points. Changing it forces "
+"the cache to be recomputed the next time the [method get_baked_points] or "
+"[method get_baked_length] function is called. The smaller the distance, the "
+"more points in the cache and the more memory it will consume, so use with "
+"care."
+msgstr ""
+"Расстояние в пикселях между двумя соседними кэшированными точками. Его "
+"изменение приводит к пересчету кэша при следующем вызове функции [method "
+"get_baked_points] или [method get_baked_length]. Чем меньше расстояние, тем "
+"больше точек в кэше и тем больше памяти он будет потреблять, поэтому "
+"используйте с осторожностью."
+
+msgid "Describes a Bézier curve in 3D space."
+msgstr "Описывает кривую Безье в 3D пространстве."
+
+msgid ""
+"This class describes a Bézier curve in 3D space. It is mainly used to give a "
+"shape to a [Path3D], but can be manually sampled for other purposes.\n"
+"It keeps a cache of precalculated points along the curve, to speed up further "
+"calculations."
+msgstr ""
+"Этот класс описывает кривую Безье в 3D пространстве. В основном он "
+"используется для придания формы [Path3D], но может быть вручную выбран для "
+"других целей.\n"
+"Он хранит кэш предварительно рассчитанных точек вдоль кривой для ускорения "
+"дальнейших вычислений."
+
+msgid ""
+"Returns the cache of up vectors as a [PackedVector3Array].\n"
+"If [member up_vector_enabled] is [code]false[/code], the cache will be empty."
+msgstr ""
+"Возвращает кэш векторов up как [PackedVector3Array].\n"
+"Если [member up_vector_enabled] равен [code]false[/code], кэш будет пуст."
+
+msgid ""
+"Returns the closest offset to [param to_point]. This offset is meant to be "
+"used in [method sample_baked] or [method sample_baked_up_vector].\n"
+"[param to_point] must be in this curve's local space."
+msgstr ""
+"Возвращает ближайшее смещение к [param to_point]. Это смещение предназначено "
+"для использования в [method sample_baked] или [method "
+"sample_baked_up_vector].\n"
+"[param to_point] должен находиться в локальном пространстве этой кривой."
+
+msgid ""
+"Returns the position of the control point leading to the vertex [param idx]. "
+"The returned position is relative to the vertex [param idx]. If the index is "
+"out of bounds, the function sends an error to the console, and returns [code]"
+"(0, 0, 0)[/code]."
+msgstr ""
+"Возвращает позицию контрольной точки, ведущей к вершине [param idx]. "
+"Возвращаемая позиция является относительной вершины [param idx]. Если индекс "
+"выходит за пределы, функция отправляет ошибку на консоль и возвращает [code]"
+"(0, 0, 0)[/code]."
+
+msgid ""
+"Returns the position of the control point leading out of the vertex [param "
+"idx]. The returned position is relative to the vertex [param idx]. If the "
+"index is out of bounds, the function sends an error to the console, and "
+"returns [code](0, 0, 0)[/code]."
+msgstr ""
+"Возвращает позицию контрольной точки, выходящей из вершины [param idx]. "
+"Возвращаемая позиция является относительной вершины [param idx]. Если индекс "
+"выходит за пределы, функция отправляет ошибку на консоль и возвращает [code]"
+"(0, 0, 0)[/code]."
+
+msgid ""
+"Returns the position of the vertex [param idx]. If the index is out of "
+"bounds, the function sends an error to the console, and returns [code](0, 0, "
+"0)[/code]."
+msgstr ""
+"Возвращает позицию вершины [param idx]. Если индекс выходит за пределы, "
+"функция отправляет ошибку на консоль и возвращает [code](0, 0, 0)[/code]."
+
+msgid ""
+"Returns the tilt angle in radians for the point [param idx]. If the index is "
+"out of bounds, the function sends an error to the console, and returns "
+"[code]0[/code]."
+msgstr ""
+"Возвращает угол наклона в радианах для точки [param idx]. Если индекс выходит "
+"за пределы, функция отправляет ошибку на консоль и возвращает [code]0[/code]."
+
+msgid ""
+"Returns the position between the vertex [param idx] and the vertex [code]idx "
+"+ 1[/code], where [param t] controls if the point is the first vertex "
+"([code]t = 0.0[/code]), the last vertex ([code]t = 1.0[/code]), or in "
+"between. Values of [param t] outside the range ([code]0.0 >= t <=1[/code]) "
+"give strange, but predictable results.\n"
+"If [param idx] is out of bounds it is truncated to the first or last vertex, "
+"and [param t] is ignored. If the curve has no points, the function sends an "
+"error to the console, and returns [code](0, 0, 0)[/code]."
+msgstr ""
+"Возвращает позицию между вершиной [param idx] и вершиной [code]idx + 1[/"
+"code], где [param t] контролирует, является ли точка первой вершиной ([code]t "
+"= 0.0[/code]), последней вершиной ([code]t = 1.0[/code]) или находится между "
+"ними. Значения [param t] вне диапазона ([code]0.0 >= t <=1[/code]) дают "
+"странные, но предсказуемые результаты.\n"
+"Если [param idx] выходит за пределы, он усекается до первой или последней "
+"вершины, а [param t] игнорируется. Если у кривой нет точек, функция "
+"отправляет ошибку на консоль и возвращает [code](0, 0, 0)[/code]."
+
+msgid ""
+"Returns a point within the curve at position [param offset], where [param "
+"offset] is measured as a distance in 3D units along the curve. To do that, it "
+"finds the two cached points where the [param offset] lies between, then "
+"interpolates the values. This interpolation is cubic if [param cubic] is set "
+"to [code]true[/code], or linear if set to [code]false[/code].\n"
+"Cubic interpolation tends to follow the curves better, but linear is faster "
+"(and often, precise enough)."
+msgstr ""
+"Возвращает точку внутри кривой в позиции [param offset], где [param offset] "
+"измеряется как расстояние в трехмерных единицах вдоль кривой. Для этого он "
+"находит две кэшированные точки, между которыми находится [param offset], а "
+"затем интерполирует значения. Эта интерполяция является кубической, если "
+"[param cubic] установлен в [code]true[/code], или линейной, если установлен в "
+"[code]false[/code].\n"
+"Кубическая интерполяция имеет тенденцию лучше следовать кривым, но линейная "
+"быстрее (и часто достаточно точна)."
+
+msgid ""
+"Returns an up vector within the curve at position [param offset], where "
+"[param offset] is measured as a distance in 3D units along the curve. To do "
+"that, it finds the two cached up vectors where the [param offset] lies "
+"between, then interpolates the values. If [param apply_tilt] is [code]true[/"
+"code], an interpolated tilt is applied to the interpolated up vector.\n"
+"If the curve has no up vectors, the function sends an error to the console, "
+"and returns [code](0, 1, 0)[/code]."
+msgstr ""
+"Возвращает вектор вверх внутри кривой в позиции [param offset], где [param "
+"offset] измеряется как расстояние в трехмерных единицах вдоль кривой. Для "
+"этого он находит два кэшированных вектора вверх, между которыми находится "
+"[param offset], затем интерполирует значения. Если [param apply_tilt] равен "
+"[code]true[/code], к интерполированному вектору вверх применяется "
+"интерполированный наклон. \n"
+"Если у кривой нет векторов вверх, функция отправляет ошибку на консоль и "
+"возвращает [code](0, 1, 0)[/code]."
+
+msgid ""
+"Returns a [Transform3D] with [code]origin[/code] as point position, "
+"[code]basis.x[/code] as sideway vector, [code]basis.y[/code] as up vector, "
+"[code]basis.z[/code] as forward vector. When the curve length is 0, there is "
+"no reasonable way to calculate the rotation, all vectors aligned with global "
+"space axes. See also [method sample_baked]."
+msgstr ""
+"Возвращает [Transform3D] с [code]origin[/code] в качестве позиции точки, "
+"[code]basis.x[/code] в качестве бокового вектора, [code]basis.y[/code] в "
+"качестве верхнего вектора, [code]basis.z[/code] в качестве прямого вектора. "
+"Когда длина кривой равна 0, нет разумного способа вычислить поворот, все "
+"векторы выровнены с глобальными пространственными осями. См. также [method "
+"sample_baked]."
+
+msgid ""
+"Sets the tilt angle in radians for the point [param idx]. If the index is out "
+"of bounds, the function sends an error to the console.\n"
+"The tilt controls the rotation along the look-at axis an object traveling the "
+"path would have. In the case of a curve controlling a [PathFollow3D], this "
+"tilt is an offset over the natural tilt the [PathFollow3D] calculates."
+msgstr ""
+"Устанавливает угол наклона в радианах для точки [param idx]. Если индекс "
+"выходит за пределы, функция отправляет ошибку на консоль.\n"
+"Наклон управляет вращением вдоль оси взгляда, которое будет иметь объект, "
+"движущийся по пути. В случае кривой, управляющей [PathFollow3D], этот наклон "
+"является смещением относительно естественного наклона, который вычисляет "
+"[PathFollow3D]."
+
+msgid ""
+"The distance in meters between two adjacent cached points. Changing it forces "
+"the cache to be recomputed the next time the [method get_baked_points] or "
+"[method get_baked_length] function is called. The smaller the distance, the "
+"more points in the cache and the more memory it will consume, so use with "
+"care."
+msgstr ""
+"Расстояние в метрах между двумя соседними кэшированными точками. Его "
+"изменение приводит к пересчету кэша при следующем вызове функции [method "
+"get_baked_points] или [method get_baked_length]. Чем меньше расстояние, тем "
+"больше точек в кэше и тем больше памяти он будет потреблять, поэтому "
+"используйте с осторожностью."
+
+msgid ""
+"If [code]true[/code], and the curve has more than 2 control points, the last "
+"point and the first one will be connected in a loop."
+msgstr ""
+"Если [code]true[/code], а кривая имеет более 2 контрольных точек, то "
+"последняя и первая точки будут соединены в петлю."
+
+msgid ""
+"If [code]true[/code], the curve will bake up vectors used for orientation. "
+"This is used when [member PathFollow3D.rotation_mode] is set to [constant "
+"PathFollow3D.ROTATION_ORIENTED]. Changing it forces the cache to be "
+"recomputed."
+msgstr ""
+"Если [code]true[/code], кривая запечет векторы, используемые для ориентации. "
+"Это используется, когда [member PathFollow3D.rotation_mode] установлен в "
+"[constant PathFollow3D.ROTATION_ORIENTED]. Изменение этого параметра приводит "
+"к пересчету кэша."
+
+msgid "A 1D texture where pixel brightness corresponds to points on a curve."
+msgstr ""
+"Одномерная текстура, в которой яркость пикселей соответствует точкам на "
+"кривой."
+
+msgid ""
+"A 1D texture where pixel brightness corresponds to points on a unit [Curve] "
+"resource, either in grayscale or in red. This visual representation "
+"simplifies the task of saving curves as image files.\n"
+"If you need to store up to 3 curves within a single texture, use "
+"[CurveXYZTexture] instead. See also [GradientTexture1D] and "
+"[GradientTexture2D]."
+msgstr ""
+"1D-текстура, где яркость пикселей соответствует точкам на единичном ресурсе "
+"[Curve], либо в оттенках серого, либо в красном цвете. Это визуальное "
+"представление упрощает задачу сохранения кривых в виде файлов изображений.\n"
+"Если вам нужно сохранить до 3 кривых в одной текстуре, используйте вместо "
+"этого [CurveXYZTexture]. См. также [GradientTexture1D] и [GradientTexture2D]."
+
+msgid ""
+"The format the texture should be generated with. When passing a CurveTexture "
+"as an input to a [Shader], this may need to be adjusted."
+msgstr ""
+"Формат, в котором должна быть сгенерирована текстура. При передаче "
+"CurveTexture в качестве входных данных в [Shader] это может потребоваться "
+"скорректировать."
+
+msgid ""
+"The width of the texture (in pixels). Higher values make it possible to "
+"represent high-frequency data better (such as sudden direction changes), at "
+"the cost of increased generation time and memory usage."
+msgstr ""
+"Ширина текстуры (в пикселях). Более высокие значения позволяют лучше "
+"представлять высокочастотные данные (например, резкие изменения направления) "
+"за счет увеличения времени генерации и использования памяти."
+
+msgid ""
+"Store the curve equally across the red, green and blue channels. This uses "
+"more video memory, but is more compatible with shaders that only read the "
+"green and blue values."
+msgstr ""
+"Сохраните кривую равномерно по красному, зеленому и синему каналам. Это "
+"использует больше видеопамяти, но более совместимо с шейдерами, которые "
+"считывают только значения зеленого и синего."
+
+msgid ""
+"Store the curve only in the red channel. This saves video memory, but some "
+"custom shaders may not be able to work with this."
+msgstr ""
+"Сохраняйте кривую только в красном канале. Это экономит видеопамять, но "
+"некоторые пользовательские шейдеры могут не работать с этим."
+
+msgid ""
+"A 1D texture where the red, green, and blue color channels correspond to "
+"points on 3 curves."
+msgstr ""
+"Одномерная текстура, в которой каналы красного, зеленого и синего цветов "
+"соответствуют точкам на трех кривых."
+
+msgid ""
+"A 1D texture where the red, green, and blue color channels correspond to "
+"points on 3 unit [Curve] resources. Compared to using separate "
+"[CurveTexture]s, this further simplifies the task of saving curves as image "
+"files.\n"
+"If you only need to store one curve within a single texture, use "
+"[CurveTexture] instead. See also [GradientTexture1D] and [GradientTexture2D]."
+msgstr ""
+"1D-текстура, в которой каналы красного, зеленого и синего цветов "
+"соответствуют точкам на 3-х единичных ресурсах [Curve]. По сравнению с "
+"использованием отдельных [CurveTexture], это еще больше упрощает задачу "
+"сохранения кривых в виде файлов изображений.\n"
+"Если вам нужно сохранить только одну кривую в одной текстуре, используйте "
+"вместо этого [CurveTexture]. См. также [GradientTexture1D] и "
+"[GradientTexture2D]."
+
+msgid ""
+"The [Curve] that is rendered onto the texture's red channel. Should be a unit "
+"[Curve]."
+msgstr ""
+"[Curve], которая отображается на красном канале текстуры. Должна быть "
+"единицей [Curve]."
+
+msgid ""
+"The [Curve] that is rendered onto the texture's green channel. Should be a "
+"unit [Curve]."
+msgstr ""
+"[Curve], которая отображается на зеленом канале текстуры. Должна быть "
+"единицей [Curve]."
+
+msgid ""
+"The [Curve] that is rendered onto the texture's blue channel. Should be a "
+"unit [Curve]."
+msgstr ""
+"[Curve], которая отображается на синем канале текстуры. Должна быть единицей "
+"[Curve]."
+
+msgid "Class representing a cylindrical [PrimitiveMesh]."
+msgstr "Класс, представляющий цилиндрическую [PrimitiveMesh]."
+
+msgid ""
+"Class representing a cylindrical [PrimitiveMesh]. This class can be used to "
+"create cones by setting either the [member top_radius] or [member "
+"bottom_radius] properties to [code]0.0[/code]."
+msgstr ""
+"Класс, представляющий цилиндрическую [PrimitiveMesh]. Этот класс можно "
+"использовать для создания конусов, установив свойства [member top_radius] или "
+"[member bottom_radius] на [code]0.0[/code]."
+
+msgid ""
+"Bottom radius of the cylinder. If set to [code]0.0[/code], the bottom faces "
+"will not be generated, resulting in a conic shape. See also [member "
+"cap_bottom]."
+msgstr ""
+"Нижний радиус цилиндра. Если задано значение [code]0.0[/code], нижние грани "
+"не будут созданы, что приведет к конической форме. См. также [member "
+"cap_bottom]."
+
+msgid ""
+"If [code]true[/code], generates a cap at the bottom of the cylinder. This can "
+"be set to [code]false[/code] to speed up generation and rendering when the "
+"cap is never seen by the camera. See also [member bottom_radius].\n"
+"[b]Note:[/b] If [member bottom_radius] is [code]0.0[/code], cap generation is "
+"always skipped even if [member cap_bottom] is [code]true[/code]."
+msgstr ""
+"Если [code]true[/code], генерирует колпачок в нижней части цилиндра. Это "
+"можно установить на [code]false[/code], чтобы ускорить генерацию и рендеринг, "
+"когда колпачок никогда не виден камере. См. также [member bottom_radius].\n"
+"[b]Примечание:[/b] Если [member bottom_radius] равен [code]0.0[/code], "
+"генерация колпачка всегда пропускается, даже если [member cap_bottom] равен "
+"[code]true[/code]."
+
+msgid ""
+"If [code]true[/code], generates a cap at the top of the cylinder. This can be "
+"set to [code]false[/code] to speed up generation and rendering when the cap "
+"is never seen by the camera. See also [member top_radius].\n"
+"[b]Note:[/b] If [member top_radius] is [code]0.0[/code], cap generation is "
+"always skipped even if [member cap_top] is [code]true[/code]."
+msgstr ""
+"Если [code]true[/code], генерирует колпачок в верхней части цилиндра. Это "
+"можно установить на [code]false[/code], чтобы ускорить генерацию и рендеринг, "
+"когда колпачок никогда не виден камере. См. также [member top_radius].\n"
+"[b]Примечание:[/b] Если [member top_radius] равен [code]0.0[/code], генерация "
+"колпачка всегда пропускается, даже если [member cap_top] равен [code]true[/"
+"code]."
+
+msgid "Full height of the cylinder."
+msgstr "Полная высота цилиндра."
+
+msgid ""
+"Number of radial segments on the cylinder. Higher values result in a more "
+"detailed cylinder/cone at the cost of performance."
+msgstr ""
+"Количество радиальных сегментов на цилиндре. Более высокие значения приводят "
+"к более детализированному цилиндру/конусу за счет производительности."
+
+msgid ""
+"Number of edge rings along the height of the cylinder. Changing [member "
+"rings] does not have any visual impact unless a shader or procedural mesh "
+"tool is used to alter the vertex data. Higher values result in more "
+"subdivisions, which can be used to create smoother-looking effects with "
+"shaders or procedural mesh tools (at the cost of performance). When not "
+"altering the vertex data using a shader or procedural mesh tool, [member "
+"rings] should be kept to its default value."
+msgstr ""
+"Количество колец ребер по высоте цилиндра. Изменение [колец-членов] не "
+"оказывает визуального воздействия, если только для изменения данных вершин не "
+"используется шейдер или инструмент процедурной сетки. Более высокие значения "
+"приводят к большему количеству подразделений, что может быть использовано для "
+"создания более плавных эффектов с помощью шейдеров или инструментов "
+"процедурной сетки (за счет производительности). Если данные вершин не "
+"изменяются с помощью шейдера или инструмента процедурной сетки, [member "
+"rings] следует оставить на значении по умолчанию."
+
+msgid ""
+"Top radius of the cylinder. If set to [code]0.0[/code], the top faces will "
+"not be generated, resulting in a conic shape. See also [member cap_top]."
+msgstr ""
+"Верхний радиус цилиндра. Если задано значение [code]0.0[/code], верхние грани "
+"не будут созданы, что приведет к конической форме. См. также [member cap_top]."
+
+msgid "A 3D cylinder shape used for physics collision."
+msgstr ""
+"Трехмерная цилиндрическая форма, используемая для физического столкновения."
+
+msgid ""
+"A 3D cylinder shape, intended for use in physics. Usually used to provide a "
+"shape for a [CollisionShape3D].\n"
+"[b]Note:[/b] There are several known bugs with cylinder collision shapes. "
+"Using [CapsuleShape3D] or [BoxShape3D] instead is recommended.\n"
+"[b]Performance:[/b] [CylinderShape3D] is fast to check collisions against, "
+"but it is slower than [CapsuleShape3D], [BoxShape3D], and [SphereShape3D]."
+msgstr ""
+"Форма цилиндра 3D, предназначенная для использования в физике. Обычно "
+"используется для предоставления формы для [CollisionShape3D].\n"
+"[b]Примечание:[/b] Известно несколько ошибок с формами столкновений "
+"цилиндров. Вместо этого рекомендуется использовать [CapsuleShape3D] или "
+"[BoxShape3D].\n"
+"[b]Производительность:[/b] [CylinderShape3D] быстро проверяет столкновения, "
+"но медленнее, чем [CapsuleShape3D], [BoxShape3D] и [SphereShape3D]."
+
+msgid "The cylinder's height."
+msgstr "Высота цилиндра."
+
+msgid "The cylinder's radius."
+msgstr "Радиус цилиндра."
+
+msgid ""
+"A physics joint that connects two 2D physics bodies with a spring-like force."
+msgstr ""
+"Физический шарнир, соединяющий два двумерных физических тела с помощью "
+"пружинообразной силы."
+
+msgid ""
+"A physics joint that connects two 2D physics bodies with a spring-like force. "
+"This resembles a spring that always wants to stretch to a given length."
+msgstr ""
+"Физический сустав, который соединяет два 2D физических тела с помощью "
+"пружинообразной силы. Это напоминает пружину, которая всегда стремится "
+"растянуться до заданной длины."
+
+msgid ""
+"The spring joint's damping ratio. A value between [code]0[/code] and [code]1[/"
+"code]. When the two bodies move into different directions the system tries to "
+"align them to the spring axis again. A high [member damping] value forces the "
+"attached bodies to align faster."
+msgstr ""
+"Коэффициент демпфирования пружинного соединения. Значение между [code]0[/"
+"code] и [code]1[/code]. Когда два тела движутся в разных направлениях, "
+"система пытается снова выровнять их по оси пружины. Высокое значение "
+"[dempting member] заставляет прикрепленные тела выравниваться быстрее."
+
+msgid ""
+"The spring joint's maximum length. The two attached bodies cannot stretch it "
+"past this value."
+msgstr ""
+"Максимальная длина пружинного соединения. Два присоединенных тела не могут "
+"растянуть его больше этого значения."
+
+msgid ""
+"When the bodies attached to the spring joint move they stretch or squash it. "
+"The joint always tries to resize towards this length."
+msgstr ""
+"Когда тела, прикрепленные к пружинному соединению, движутся, они растягивают "
+"или сжимают его. Соединение всегда пытается изменить размер в сторону этой "
+"длины."
+
+msgid ""
+"The higher the value, the less the bodies attached to the joint will deform "
+"it. The joint applies an opposing force to the bodies, the product of the "
+"stiffness multiplied by the size difference from its resting length."
+msgstr ""
+"Чем выше значение, тем меньше тела, прикрепленные к суставу, будут его "
+"деформировать. Сустав прикладывает к телам противодействующую силу, которая "
+"является произведением жесткости, умноженной на разницу размеров от его длины "
+"покоя."
+
+msgid "Node that projects a texture onto a [MeshInstance3D]."
+msgstr "Узел, который проецирует текстуру на [MeshInstance3D]."
+
+msgid ""
+"[Decal]s are used to project a texture onto a [Mesh] in the scene. Use Decals "
+"to add detail to a scene without affecting the underlying [Mesh]. They are "
+"often used to add weathering to building, add dirt or mud to the ground, or "
+"add variety to props. Decals can be moved at any time, making them suitable "
+"for things like blob shadows or laser sight dots.\n"
+"They are made of an [AABB] and a group of [Texture2D]s specifying [Color], "
+"normal, ORM (ambient occlusion, roughness, metallic), and emission. Decals "
+"are projected within their [AABB] so altering the orientation of the Decal "
+"affects the direction in which they are projected. By default, Decals are "
+"projected down (i.e. from positive Y to negative Y).\n"
+"The [Texture2D]s associated with the Decal are automatically stored in a "
+"texture atlas which is used for drawing the decals so all decals can be drawn "
+"at once. Godot uses clustered decals, meaning they are stored in cluster data "
+"and drawn when the mesh is drawn, they are not drawn as a post-processing "
+"effect after.\n"
+"[b]Note:[/b] Decals cannot affect an underlying material's transparency, "
+"regardless of its transparency mode (alpha blend, alpha scissor, alpha hash, "
+"opaque pre-pass). This means translucent or transparent areas of a material "
+"will remain translucent or transparent even if an opaque decal is applied on "
+"them.\n"
+"[b]Note:[/b] Decals are only supported in the Forward+ and Mobile rendering "
+"methods, not Compatibility. When using the Mobile rendering method, only 8 "
+"decals can be displayed on each mesh resource. Attempting to display more "
+"than 8 decals on a single mesh resource will result in decals flickering in "
+"and out as the camera moves.\n"
+"[b]Note:[/b] When using the Mobile rendering method, decals will only "
+"correctly affect meshes whose visibility AABB intersects with the decal's "
+"AABB. If using a shader to deform the mesh in a way that makes it go outside "
+"its AABB, [member GeometryInstance3D.extra_cull_margin] must be increased on "
+"the mesh. Otherwise, the decal may not be visible on the mesh."
+msgstr ""
+"[Decals]-ы используются для проецирования текстуры на [Mesh] в сцене. "
+"Используйте Decals, чтобы добавить детали к сцене, не затрагивая базовую "
+"[Mesh]. Они часто используются для добавления выветривания к зданию, "
+"добавления грязи или ила на землю или добавления разнообразия к реквизиту. "
+"Decals можно перемещать в любое время, что делает их подходящими для таких "
+"вещей, как тени-капли или точки лазерного прицела.\n"
+"Они сделаны из [AABB] и группы [Texture2D], определяющих [Color], normal, ORM "
+"(окклюзия окружения, шероховатость, металлик) и излучение. Декали "
+"проецируются в пределах их [AABB], поэтому изменение ориентации декали влияет "
+"на направление, в котором они проецируются. По умолчанию декали проецируются "
+"вниз (т. е. от положительного Y к отрицательному Y).\n"
+"[Texture2D]-ы, связанные с Decal, автоматически сохраняются в атласе текстур, "
+"который используется для рисования декалей, чтобы все декали можно было "
+"нарисовать одновременно. Godot использует кластеризованные декали, то есть "
+"они хранятся в кластерных данных и рисуются при рисовании сетки, а не "
+"рисуются как эффект постобработки после.\n"
+"[b]Примечание:[/b] Декали не могут влиять на прозрачность базового материала, "
+"независимо от его режима прозрачности (альфа-смешивание, альфа-ножницы, альфа-"
+"хеш, непрозрачный предварительный проход). Это означает, что полупрозрачные "
+"или прозрачные области материала останутся полупрозрачными или прозрачными, "
+"даже если на них нанесена непрозрачная декаль.\n"
+"[b]Примечание:[/b] Декали поддерживаются только в методах рендеринга Forward+ "
+"и Mobile, а не Compatibility. При использовании метода рендеринга Mobile на "
+"каждом ресурсе сетки может отображаться только 8 декалей. Попытка отобразить "
+"более 8 декалей на одном ресурсе сетки приведет к мерцанию декалей при "
+"движении камеры.\n"
+"[b]Примечание:[/b] При использовании метода рендеринга Mobile декали будут "
+"правильно влиять только на сетки, видимость AABB которых пересекается с AABB "
+"декали. Если используется шейдер для деформации сетки таким образом, что она "
+"выходит за пределы AABB, [member GeometryInstance3D.extra_cull_margin] должен "
+"быть увеличен на сетке. В противном случае декаль может быть не видна на "
+"сетке."
+
+msgid ""
+"Returns the [Texture2D] associated with the specified [enum DecalTexture]. "
+"This is a convenience method, in most cases you should access the texture "
+"directly.\n"
+"For example, instead of [code]albedo_tex = $Decal.get_texture(Decal."
+"TEXTURE_ALBEDO)[/code], use [code]albedo_tex = $Decal.texture_albedo[/code].\n"
+"One case where this is better than accessing the texture directly is when you "
+"want to copy one Decal's textures to another. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in Decal.TEXTURE_MAX:\n"
+"    $NewDecal.set_texture(i, $OldDecal.get_texture(i))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < (int)Decal.DecalTexture.Max; i++)\n"
+"{\n"
+"    GetNode<Decal>(\"NewDecal\").SetTexture(i, GetNode<Decal>(\"OldDecal\")."
+"GetTexture(i));\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Возвращает [Texture2D], связанный с указанным [enum DecalTexture]. Это "
+"удобный метод, в большинстве случаев вам следует обращаться к текстуре "
+"напрямую.\n"
+"Например, вместо [code]albedo_tex = $Decal.get_texture(Decal.TEXTURE_ALBEDO)[/"
+"code], используйте [code]albedo_tex = $Decal.texture_albedo[/code].\n"
+"Один случай, когда это лучше, чем прямой доступ к текстуре, — это когда вы "
+"хотите скопировать текстуры одной Decal в другую. Например:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in Decal.TEXTURE_MAX:\n"
+"    $NewDecal.set_texture(i, $OldDecal.get_texture(i))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < (int)Decal.DecalTexture.Max; i++)\n"
+"{\n"
+"    GetNode<Decal>(\"NewDecal\").SetTexture(i, GetNode<Decal>(\"OldDecal\")."
+"GetTexture(i));\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Sets the [Texture2D] associated with the specified [enum DecalTexture]. This "
+"is a convenience method, in most cases you should access the texture "
+"directly.\n"
+"For example, instead of [code]$Decal.set_texture(Decal.TEXTURE_ALBEDO, "
+"albedo_tex)[/code], use [code]$Decal.texture_albedo = albedo_tex[/code].\n"
+"One case where this is better than accessing the texture directly is when you "
+"want to copy one Decal's textures to another. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in Decal.TEXTURE_MAX:\n"
+"    $NewDecal.set_texture(i, $OldDecal.get_texture(i))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < (int)Decal.DecalTexture.Max; i++)\n"
+"{\n"
+"    GetNode<Decal>(\"NewDecal\").SetTexture(i, GetNode<Decal>(\"OldDecal\")."
+"GetTexture(i));\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+msgstr ""
+"Устанавливает [Texture2D], связанный с указанным [enum DecalTexture]. Это "
+"удобный метод, в большинстве случаев вам следует обращаться к текстуре "
+"напрямую.\n"
+"Например, вместо [code]$Decal.set_texture(Decal.TEXTURE_ALBEDO, albedo_tex)[/"
+"code], используйте [code]$Decal.texture_albedo = albedo_tex[/code].\n"
+"Один случай, когда это лучше, чем прямой доступ к текстуре, — это когда вы "
+"хотите скопировать текстуры одной Decal в другую. Например:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"for i in Decal.TEXTURE_MAX:\n"
+"    $NewDecal.set_texture(i, $OldDecal.get_texture(i))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"for (int i = 0; i < (int)Decal.DecalTexture.Max; i++)\n"
+"{\n"
+"    GetNode<Decal>(\"NewDecal\").SetTexture(i, GetNode<Decal>(\"OldDecal\")."
+"GetTexture(i));\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]"
+
+msgid ""
+"Blends the albedo [Color] of the decal with albedo [Color] of the underlying "
+"mesh. This can be set to [code]0.0[/code] to create a decal that only affects "
+"normal or ORM. In this case, an albedo texture is still required as its alpha "
+"channel will determine where the normal and ORM will be overridden. See also "
+"[member modulate]."
+msgstr ""
+"Смешивает альбедо [Color] декали с альбедо [Color] базовой сетки. Это можно "
+"установить на [code]0.0[/code], чтобы создать декаль, которая влияет только "
+"на нормаль или ORM. В этом случае текстура альбедо все еще требуется, так как "
+"ее альфа-канал определит, где будут переопределены нормаль и ORM. См. также "
+"[member modulate]."
+
+msgid ""
+"Specifies which [member VisualInstance3D.layers] this decal will project on. "
+"By default, Decals affect all layers. This is used so you can specify which "
+"types of objects receive the Decal and which do not. This is especially "
+"useful so you can ensure that dynamic objects don't accidentally receive a "
+"Decal intended for the terrain under them."
+msgstr ""
+"Указывает, на какой [member VisualInstance3D.layers] будет проецироваться эта "
+"декаль. По умолчанию Decals влияет на все слои. Это используется, чтобы вы "
+"могли указать, какие типы объектов получают Decal, а какие нет. Это особенно "
+"полезно, чтобы вы могли гарантировать, что динамические объекты случайно не "
+"получат Decal, предназначенный для ландшафта под ними."
+
+msgid ""
+"The distance from the camera at which the Decal begins to fade away (in 3D "
+"units)."
+msgstr ""
+"Расстояние от камеры, на котором декаль начинает исчезать (в 3D-единицах)."
+
+msgid ""
+"If [code]true[/code], decals will smoothly fade away when far from the active "
+"[Camera3D] starting at [member distance_fade_begin]. The Decal will fade out "
+"over [member distance_fade_begin] + [member distance_fade_length], after "
+"which it will be culled and not sent to the shader at all. Use this to reduce "
+"the number of active Decals in a scene and thus improve performance."
+msgstr ""
+"Если [code]true[/code], декали будут плавно исчезать при удалении от активной "
+"[Camera3D], начиная с [member distance_fade_begin]. Декаль будет исчезать "
+"через [member distance_fade_begin] + [member distance_fade_length], после "
+"чего она будет отбракована и вообще не отправлена в шейдер. Используйте это, "
+"чтобы уменьшить количество активных декалей в сцене и тем самым повысить "
+"производительность."
+
+msgid ""
+"The distance over which the Decal fades (in 3D units). The Decal becomes "
+"slowly more transparent over this distance and is completely invisible at the "
+"end. Higher values result in a smoother fade-out transition, which is more "
+"suited when the camera moves fast."
+msgstr ""
+"Расстояние, на котором декаль исчезает (в 3D-единицах). Декаль постепенно "
+"становится более прозрачной на этом расстоянии и полностью невидимой в конце. "
+"Более высокие значения приводят к более плавному переходу затухания, что "
+"больше подходит для случаев, когда камера движется быстро."
+
+msgid ""
+"Energy multiplier for the emission texture. This will make the decal emit "
+"light at a higher or lower intensity, independently of the albedo color. See "
+"also [member modulate]."
+msgstr ""
+"Множитель энергии для текстуры излучения. Это заставит декаль излучать свет с "
+"большей или меньшей интенсивностью, независимо от цвета альбедо. См. также "
+"[member modulate]."
+
+msgid ""
+"Sets the curve over which the decal will fade as the surface gets further "
+"from the center of the [AABB]. Only positive values are valid (negative "
+"values will be clamped to [code]0.0[/code]). See also [member upper_fade]."
+msgstr ""
+"Устанавливает кривую, по которой декаль будет исчезать по мере удаления "
+"поверхности от центра [AABB]. Допустимы только положительные значения "
+"(отрицательные значения будут ограничены [code]0.0[/code]). См. также [member "
+"upper_fade]."
+
+msgid ""
+"Changes the [Color] of the Decal by multiplying the albedo and emission "
+"colors with this value. The alpha component is only taken into account when "
+"multiplying the albedo color, not the emission color. See also [member "
+"emission_energy] and [member albedo_mix] to change the emission and albedo "
+"intensity independently of each other."
+msgstr ""
+"Изменяет [Color] декали, умножая цвета альбедо и излучения на это значение. "
+"Альфа-компонент учитывается только при умножении цвета альбедо, а не цвета "
+"излучения. См. также [member emission_energy] и [member albedo_mix], чтобы "
+"изменить интенсивность излучения и альбедо независимо друг от друга."
+
+msgid ""
+"Fades the Decal if the angle between the Decal's [AABB] and the target "
+"surface becomes too large. A value of [code]0[/code] projects the Decal "
+"regardless of angle, a value of [code]1[/code] limits the Decal to surfaces "
+"that are nearly perpendicular.\n"
+"[b]Note:[/b] Setting [member normal_fade] to a value greater than [code]0.0[/"
+"code] has a small performance cost due to the added normal angle computations."
+msgstr ""
+"Затемняет декаль, если угол между [AABB] декали и целевой поверхностью "
+"становится слишком большим. Значение [code]0[/code] проецирует декаль "
+"независимо от угла, значение [code]1[/code] ограничивает декаль "
+"поверхностями, которые почти перпендикулярны.\n"
+"[b]Примечание:[/b] Установка [member normal_fade] на значение больше "
+"[code]0.0[/code] имеет небольшие затраты производительности из-за "
+"дополнительных вычислений угла нормали."
+
+msgid ""
+"Sets the size of the [AABB] used by the decal. All dimensions must be set to "
+"a value greater than zero (they will be clamped to [code]0.001[/code] if this "
+"is not the case). The AABB goes from [code]-size/2[/code] to [code]size/2[/"
+"code].\n"
+"[b]Note:[/b] To improve culling efficiency of \"hard surface\" decals, set "
+"their [member upper_fade] and [member lower_fade] to [code]0.0[/code] and set "
+"the Y component of the [member size] as low as possible. This will reduce the "
+"decals' AABB size without affecting their appearance."
+msgstr ""
+"Устанавливает размер [AABB], используемый наклейкой. Все размеры должны быть "
+"установлены на значение больше нуля (они будут ограничены [code]0.001[/code], "
+"если это не так). AABB изменяется от [code]-size/2[/code] до [code]size/2[/"
+"code].\n"
+"[b]Примечание:[/b] Чтобы повысить эффективность отбраковки наклеек «твердой "
+"поверхности», установите их [member upper_fade] и [member lower_fade] на "
+"[code]0.0[/code] и установите компонент Y [member size] как можно ниже. Это "
+"уменьшит размер AABB наклеек, не влияя на их внешний вид."
+
+msgid ""
+"[Texture2D] with the base [Color] of the Decal. Either this or the [member "
+"texture_emission] must be set for the Decal to be visible. Use the alpha "
+"channel like a mask to smoothly blend the edges of the decal with the "
+"underlying object.\n"
+"[b]Note:[/b] Unlike [BaseMaterial3D] whose filter mode can be adjusted on a "
+"per-material basis, the filter mode for [Decal] textures is set globally with "
+"[member ProjectSettings.rendering/textures/decals/filter]."
+msgstr ""
+"[Texture2D] с базовым [Color] Decal. Либо это, либо [member texture_emission] "
+"должно быть установлено, чтобы Decal был видимым. Используйте альфа-канал как "
+"маску, чтобы плавно смешать края decal с базовым объектом.\n"
+"[b]Примечание:[/b] В отличие от [BaseMaterial3D], режим фильтра которого "
+"можно настраивать для каждого материала, режим фильтра для текстур [Decal] "
+"устанавливается глобально с помощью [member ProjectSettings.rendering/"
+"textures/decals/filter]."
+
+msgid ""
+"[Texture2D] with the emission [Color] of the Decal. Either this or the "
+"[member texture_albedo] must be set for the Decal to be visible. Use the "
+"alpha channel like a mask to smoothly blend the edges of the decal with the "
+"underlying object.\n"
+"[b]Note:[/b] Unlike [BaseMaterial3D] whose filter mode can be adjusted on a "
+"per-material basis, the filter mode for [Decal] textures is set globally with "
+"[member ProjectSettings.rendering/textures/decals/filter]."
+msgstr ""
+"[Texture2D] с излучением [Color] Decal. Либо это, либо [member "
+"texture_albedo] должно быть установлено, чтобы Decal был видимым. Используйте "
+"альфа-канал как маску, чтобы плавно смешать края decal с нижележащим "
+"объектом.\n"
+"[b]Примечание:[/b] В отличие от [BaseMaterial3D], режим фильтра которого "
+"можно настраивать для каждого материала, режим фильтра для текстур [Decal] "
+"устанавливается глобально с помощью [member ProjectSettings.rendering/"
+"textures/decals/filter]."
+
+msgid ""
+"[Texture2D] with the per-pixel normal map for the decal. Use this to add "
+"extra detail to decals.\n"
+"[b]Note:[/b] Unlike [BaseMaterial3D] whose filter mode can be adjusted on a "
+"per-material basis, the filter mode for [Decal] textures is set globally with "
+"[member ProjectSettings.rendering/textures/decals/filter].\n"
+"[b]Note:[/b] Setting this texture alone will not result in a visible decal, "
+"as [member texture_albedo] must also be set. To create a normal-only decal, "
+"load an albedo texture into [member texture_albedo] and set [member "
+"albedo_mix] to [code]0.0[/code]. The albedo texture's alpha channel will be "
+"used to determine where the underlying surface's normal map should be "
+"overridden (and its intensity)."
+msgstr ""
+"[Texture2D] с попиксельной картой нормалей для декали. Используйте это, чтобы "
+"добавить дополнительную детализацию к декалям.\n"
+"[b]Примечание:[/b] В отличие от [BaseMaterial3D], режим фильтра которого "
+"можно настраивать для каждого материала, режим фильтра для текстур [Decal] "
+"устанавливается глобально с помощью [member ProjectSettings.rendering/"
+"textures/decals/filter].\n"
+"[b]Примечание:[/b] Установка только этой текстуры не приведет к появлению "
+"видимой декали, так как [member texture_albedo] также должен быть установлен. "
+"Чтобы создать декаль только для нормалей, загрузите текстуру альбедо в "
+"[member texture_albedo] и установите [member albedo_mix] на [code]0.0[/code]. "
+"Альфа-канал текстуры альбедо будет использоваться для определения того, где "
+"должна быть переопределена карта нормалей базовой поверхности (и ее "
+"интенсивность)."
+
+msgid ""
+"[Texture2D] storing ambient occlusion, roughness, and metallic for the decal. "
+"Use this to add extra detail to decals.\n"
+"[b]Note:[/b] Unlike [BaseMaterial3D] whose filter mode can be adjusted on a "
+"per-material basis, the filter mode for [Decal] textures is set globally with "
+"[member ProjectSettings.rendering/textures/decals/filter].\n"
+"[b]Note:[/b] Setting this texture alone will not result in a visible decal, "
+"as [member texture_albedo] must also be set. To create an ORM-only decal, "
+"load an albedo texture into [member texture_albedo] and set [member "
+"albedo_mix] to [code]0.0[/code]. The albedo texture's alpha channel will be "
+"used to determine where the underlying surface's ORM map should be overridden "
+"(and its intensity)."
+msgstr ""
+"[Texture2D] сохраняет окружающее затенение, шероховатость и металл для "
+"декали. Используйте это, чтобы добавить дополнительную детализацию к "
+"декалям.\n"
+"[b]Примечание:[/b] В отличие от [BaseMaterial3D], режим фильтра которого "
+"можно настраивать для каждого материала, режим фильтра для текстур [Decal] "
+"устанавливается глобально с помощью [member ProjectSettings.rendering/"
+"textures/decals/filter].\n"
+"[b]Примечание:[/b] Установка только этой текстуры не приведет к появлению "
+"видимой декали, так как [member texture_albedo] также должен быть установлен. "
+"Чтобы создать декаль только для ORM, загрузите текстуру альбедо в [member "
+"texture_albedo] и установите [member albedo_mix] на [code]0.0[/code]. Альфа-"
+"канал текстуры альбедо будет использоваться для определения того, где должна "
+"быть переопределена карта ORM подстилающей поверхности (и ее интенсивность)."
+
+msgid ""
+"Sets the curve over which the decal will fade as the surface gets further "
+"from the center of the [AABB]. Only positive values are valid (negative "
+"values will be clamped to [code]0.0[/code]). See also [member lower_fade]."
+msgstr ""
+"Устанавливает кривую, по которой декаль будет исчезать по мере удаления "
+"поверхности от центра [AABB]. Допустимы только положительные значения "
+"(отрицательные значения будут ограничены [code]0.0[/code]). См. также [member "
+"lower_fade]."
+
+msgid "[Texture2D] corresponding to [member texture_albedo]."
+msgstr "[Texture2D] соответствует [member texture_albedo]."
+
+msgid "[Texture2D] corresponding to [member texture_normal]."
+msgstr "[Texture2D] соответствует [member texture_normal]."
+
+msgid "[Texture2D] corresponding to [member texture_orm]."
+msgstr "[Texture2D] соответствует [member texture_orm]."
+
+msgid "[Texture2D] corresponding to [member texture_emission]."
+msgstr "[Texture2D] соответствует [member texture_emission]."
+
+msgid "A built-in data structure that holds key-value pairs."
+msgstr "Встроенная структура данных, содержащая пары ключ-значение."
+
+msgid ""
+"Dictionaries are associative containers that contain values referenced by "
+"unique keys. Dictionaries will preserve the insertion order when adding new "
+"entries. In other programming languages, this data structure is often "
+"referred to as a hash map or an associative array.\n"
+"You can define a dictionary by placing a comma-separated list of [code]key: "
+"value[/code] pairs inside curly braces [code]{}[/code].\n"
+"Creating a dictionary:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {} # Creates an empty dictionary.\n"
+"\n"
+"var dict_variable_key = \"Another key name\"\n"
+"var dict_variable_value = \"value2\"\n"
+"var another_dict = {\n"
+"    \"Some key name\": \"value1\",\n"
+"    dict_variable_key: dict_variable_value,\n"
+"}\n"
+"\n"
+"var points_dict = {\"White\": 50, \"Yellow\": 75, \"Orange\": 100}\n"
+"\n"
+"# Alternative Lua-style syntax.\n"
+"# Doesn't require quotes around keys, but only string constants can be used "
+"as key names.\n"
+"# Additionally, key names must start with a letter or an underscore.\n"
+"# Here, `some_key` is a string literal, not a variable!\n"
+"another_dict = {\n"
+"    some_key = 42,\n"
+"}\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary(); // Creates an empty "
+"dictionary.\n"
+"var pointsDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"White\", 50},\n"
+"    {\"Yellow\", 75},\n"
+"    {\"Orange\", 100}\n"
+"};\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"You can access a dictionary's value by referencing its corresponding key. In "
+"the above example, [code]points_dict[\"White\"][/code] will return [code]50[/"
+"code]. You can also write [code]points_dict.White[/code], which is "
+"equivalent. However, you'll have to use the bracket syntax if the key you're "
+"accessing the dictionary with isn't a fixed string (such as a number or "
+"variable).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@export_enum(\"White\", \"Yellow\", \"Orange\") var my_color: String\n"
+"var points_dict = {\"White\": 50, \"Yellow\": 75, \"Orange\": 100}\n"
+"func _ready():\n"
+"    # We can't use dot syntax here as `my_color` is a variable.\n"
+"    var points = points_dict[my_color]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export(PropertyHint.Enum, \"White,Yellow,Orange\")]\n"
+"public string MyColor { get; set; }\n"
+"private Godot.Collections.Dictionary _pointsDict = new Godot.Collections."
+"Dictionary\n"
+"{\n"
+"    {\"White\", 50},\n"
+"    {\"Yellow\", 75},\n"
+"    {\"Orange\", 100}\n"
+"};\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    int points = (int)_pointsDict[MyColor];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In the above code, [code]points[/code] will be assigned the value that is "
+"paired with the appropriate color selected in [code]my_color[/code].\n"
+"Dictionaries can contain more complex data:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {\n"
+"    \"First Array\": [1, 2, 3, 4] # Assigns an Array to a String key.\n"
+"}\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"First Array\", new Godot.Collections.Array{1, 2, 3, 4}}\n"
+"};\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To add a key to an existing dictionary, access it like an existing key and "
+"assign to it:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var points_dict = {\"White\": 50, \"Yellow\": 75, \"Orange\": 100}\n"
+"points_dict[\"Blue\"] = 150 # Add \"Blue\" as a key and assign 150 as its "
+"value.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var pointsDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"White\", 50},\n"
+"    {\"Yellow\", 75},\n"
+"    {\"Orange\", 100}\n"
+"};\n"
+"pointsDict[\"Blue\"] = 150; // Add \"Blue\" as a key and assign 150 as its "
+"value.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Finally, dictionaries can contain different types of keys and values in the "
+"same dictionary:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# This is a valid dictionary.\n"
+"# To access the string \"Nested value\" below, use `my_dict.sub_dict.sub_key` "
+"or `my_dict[\"sub_dict\"][\"sub_key\"]`.\n"
+"# Indexing styles can be mixed and matched depending on your needs.\n"
+"var my_dict = {\n"
+"    \"String Key\": 5,\n"
+"    4: [1, 2, 3],\n"
+"    7: \"Hello\",\n"
+"    \"sub_dict\": {\"sub_key\": \"Nested value\"},\n"
+"}\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// This is a valid dictionary.\n"
+"// To access the string \"Nested value\" below, use `((Godot.Collections."
+"Dictionary)myDict[\"sub_dict\"])[\"sub_key\"]`.\n"
+"var myDict = new Godot.Collections.Dictionary {\n"
+"    {\"String Key\", 5},\n"
+"    {4, new Godot.Collections.Array{1,2,3}},\n"
+"    {7, \"Hello\"},\n"
+"    {\"sub_dict\", new Godot.Collections.Dictionary{{\"sub_key\", \"Nested "
+"value\"}}}\n"
+"};\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"The keys of a dictionary can be iterated with the [code]for[/code] keyword:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var groceries = {\"Orange\": 20, \"Apple\": 2, \"Banana\": 4}\n"
+"for fruit in groceries:\n"
+"    var amount = groceries[fruit]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var groceries = new Godot.Collections.Dictionary{{\"Orange\", 20}, "
+"{\"Apple\", 2}, {\"Banana\", 4}};\n"
+"foreach (var (fruit, amount) in groceries)\n"
+"{\n"
+"    // `fruit` is the key, `amount` is the value.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Dictionaries are always passed by reference. To get a copy of a "
+"dictionary which can be modified independently of the original dictionary, "
+"use [method duplicate].\n"
+"[b]Note:[/b] Erasing elements while iterating over dictionaries is [b]not[/b] "
+"supported and will result in unpredictable behavior."
+msgstr ""
+"Словари — это ассоциативные контейнеры, которые содержат значения, на которые "
+"ссылаются уникальные ключи. Словари сохраняют порядок вставки при добавлении "
+"новых записей. В других языках программирования эта структура данных часто "
+"называется хэш-картой или ассоциативным массивом.\n"
+"Вы можете определить словарь, поместив разделенный запятыми список пар "
+"[code]ключ: значение[/code] внутри фигурных скобок [code]{}[/code].\n"
+"Создание словаря:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {} # Создает пустой словарь.\n"
+"\n"
+"var dict_variable_key = \"Another key name\"\n"
+"var dict_variable_value = \"value2\"\n"
+"var another_dict = {\n"
+"    \"Some key name\": \"value1\",\n"
+"    dict_variable_key: dict_variable_value,\n"
+"}\n"
+"\n"
+"var points_dict = {\"White\": 50, \"Yellow\": 75, \"Orange\": 100}\n"
+"\n"
+"# Альтернативный синтаксис в стиле Lua.\n"
+"# Не требует заключения ключей в кавычки, но в качестве имен ключей можно "
+"использовать только строковые константы.\n"
+"# Кроме того, имена ключей должны начинаться с буквы или символа "
+"подчеркивания.\n"
+"# Здесь `some_key` — это строковый литерал, а не переменная!\n"
+"another_dict = {\n"
+"    some_key = 42,\n"
+"}\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary(); // Создает пустой словарь.\n"
+"var pointsDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"White\", 50},\n"
+"    {\"Yellow\", 75},\n"
+"    {\"Orange\", 100}\n"
+"};\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Вы можете получить доступ к значению словаря, ссылаясь на его соответствующий "
+"ключ. В приведенном выше примере [code]points_dict[\"White\"][/code] вернет "
+"[code]50[/code]. Вы также можете написать [code]points_dict.White[/code], что "
+"эквивалентно. Однако вам придется использовать синтаксис квадратных скобок, "
+"если ключ, с помощью которого вы обращаетесь к словарю, не является "
+"фиксированной строкой (например, числом или переменной).\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@export_enum(\"White\", \"Yellow\", \"Orange\") var my_color: String\n"
+"var points_dict = {\"White\": 50, \"Yellow\": 75, \"Orange\": 100}\n"
+"func _ready():\n"
+"    # Здесь мы не можем использовать точечный синтаксис, поскольку `my_color` "
+"— это переменная.\n"
+"    var points = points_dict[my_color]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"[Export(PropertyHint.Enum, \"White,Yellow,Orange\")]\n"
+"public string MyColor { get; set; }\n"
+"private Godot.Collections.Dictionary _pointsDict = new Godot.Collections."
+"Dictionary\n"
+"{\n"
+"    {\"White\", 50},\n"
+"    {\"Yellow\", 75},\n"
+"    {\"Orange\", 100}\n"
+"};\n"
+"\n"
+"public override void _Ready()\n"
+"{\n"
+"    int points = (int)_pointsDict[MyColor];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"В приведенном выше коде [code]points[/code] будет присвоено значение, которое "
+"сопряжено с соответствующим цветом, выбранным в [code]my_color[/code].\n"
+"Словари могут содержать более сложные данные:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {\n"
+"    \"First Array\": [1, 2, 3, 4] # Назначает массив ключу строки.\n"
+"}\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"First Array\", new Godot.Collections.Array{1, 2, 3, 4}}\n"
+"};\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Чтобы добавить ключ в существующий словарь, откройте его как существующий "
+"ключ и назначьте ему:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var points_dict = {\"White\": 50, \"Yellow\": 75, \"Orange\": 100}\n"
+"points_dict[\"Blue\"] = 150 # Добавьте «Синий» в качестве ключа и присвойте "
+"ему значение 150.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var pointsDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    {\"White\", 50},\n"
+"    {\"Yellow\", 75},\n"
+"    {\"Orange\", 100}\n"
+"};\n"
+"pointsDict[\"Blue\"] = 150; // Добавьте «Синий» в качестве ключа и присвойте "
+"ему значение 150.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Finally, dictionaries can contain different types of keys and values in the "
+"same dictionary:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# TЭто допустимый словарь.\n"
+"# Чтобы получить доступ к строке «Вложенное значение» ниже, используйте "
+"`my_dict.sub_dict.sub_key` или `my_dict[\"sub_dict\"][\"sub_key\"]`.\n"
+"# Стили индексирования можно смешивать и подбирать в зависимости от ваших "
+"потребностей.\n"
+"var my_dict = {\n"
+"    \"String Key\": 5,\n"
+"    4: [1, 2, 3],\n"
+"    7: \"Hello\",\n"
+"    \"sub_dict\": {\"sub_key\": \"Nested value\"},\n"
+"}\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// Это допустимый словарь.\n"
+"// Чтобы получить доступ к строке \"Вложенное значение\" ниже, используйте "
+"`((Godot.Collections.Dictionary)myDict[\"sub_dict\"])[\"sub_key\"]`.\n"
+"var myDict = new Godot.Collections.Dictionary {\n"
+"    {\"String Key\", 5},\n"
+"    {4, new Godot.Collections.Array{1,2,3}},\n"
+"    {7, \"Hello\"},\n"
+"    {\"sub_dict\", new Godot.Collections.Dictionary{{\"sub_key\", \"Nested "
+"value\"}}}\n"
+"};\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Ключи словаря можно перебирать с помощью ключевого слова [code]for[/code]:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var groceries = {\"Orange\": 20, \"Apple\": 2, \"Banana\": 4}\n"
+"for fruit in groceries:\n"
+"    var amount = groceries[fruit]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var groceries = new Godot.Collections.Dictionary{{\"Orange\", 20}, "
+"{\"Apple\", 2}, {\"Banana\", 4}};\n"
+"foreach (var (fruit, amount) in groceries)\n"
+"{\n"
+"    // `fruit` is the key, `amount` is the value.\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Словари всегда передаются по ссылке. Чтобы получить копию "
+"словаря, которую можно изменять независимо от исходного словаря, используйте "
+"[method duplicate].\n"
+"[b]Примечание:[/b] Удаление элементов при итерации по словарям [b]не[/b] "
+"поддерживается и приведет к непредсказуемому поведению."
+
+msgid "GDScript basics: Dictionary"
+msgstr "Основы GDScript: Словарь"
+
+msgid ""
+"Creates a typed dictionary from the [param base] dictionary. A typed "
+"dictionary can only contain keys and values of the given types, or that "
+"inherit from the given classes, as described by this constructor's parameters."
+msgstr ""
+"Создает типизированный словарь из словаря [param base]. Типизированный "
+"словарь может содержать только ключи и значения указанных типов или "
+"наследуемые от указанных классов, как описано параметрами этого конструктора."
+
+msgid ""
+"Returns the same dictionary as [param from]. If you need a copy of the "
+"dictionary, use [method duplicate]."
+msgstr ""
+"Возвращает тот же словарь, что и [param from]. Если вам нужна копия словаря, "
+"используйте [method duplicate]."
+
+msgid ""
+"Assigns elements of another [param dictionary] into the dictionary. Resizes "
+"the dictionary to match [param dictionary]. Performs type conversions if the "
+"dictionary is typed."
+msgstr ""
+"Назначает элементы другого [param dictionary] в словарь. Изменяет размер "
+"словаря для соответствия [param dictionary]. Выполняет преобразования типов, "
+"если словарь типизирован."
+
+msgid "Clears the dictionary, removing all entries from it."
+msgstr "Очищает словарь, удаляя из него все записи."
+
+msgid ""
+"Creates and returns a new copy of the dictionary. If [param deep] is "
+"[code]true[/code], inner [Dictionary] and [Array] keys and values are also "
+"copied, recursively."
+msgstr ""
+"Создает и возвращает новую копию словаря. Если [param deep] равен [code]true[/"
+"code], внутренние ключи и значения [Dictionary] и [Array] также копируются "
+"рекурсивно."
+
+msgid ""
+"Finds and returns the first key whose associated value is equal to [param "
+"value], or [code]null[/code] if it is not found.\n"
+"[b]Note:[/b] [code]null[/code] is also a valid key. If inside the dictionary, "
+"[method find_key] may give misleading results."
+msgstr ""
+"Находит и возвращает первый ключ, связанное значение которого равно [param "
+"value] или [code]null[/code], если он не найден.\n"
+"[b]Примечание:[/b] [code]null[/code] также является допустимым ключом. Если "
+"внутри словаря, [method find_key] может дать вводящие в заблуждение "
+"результаты."
+
+msgid ""
+"Returns the corresponding value for the given [param key] in the dictionary. "
+"If the [param key] does not exist, returns [param default], or [code]null[/"
+"code] if the parameter is omitted."
+msgstr ""
+"Возвращает соответствующее значение для указанного [param key] в словаре. "
+"Если [param key] не существует, возвращает [param default] или [code]null[/"
+"code], если параметр пропущен."
+
+msgid ""
+"Gets a value and ensures the key is set. If the [param key] exists in the "
+"dictionary, this behaves like [method get]. Otherwise, the [param default] "
+"value is inserted into the dictionary and returned."
+msgstr ""
+"Получает значение и обеспечивает установку ключа. Если [param key] существует "
+"в словаре, это ведет себя как [method get]. В противном случае значение "
+"[param default] вставляется в словарь и возвращается."
+
+msgid ""
+"Returns the built-in [Variant] type of the typed dictionary's keys as a [enum "
+"Variant.Type] constant. If the keys are not typed, returns [constant "
+"TYPE_NIL]. See also [method is_typed_key]."
+msgstr ""
+"Возвращает встроенный тип [Variant] ключей типизированного словаря как "
+"константу [enum Variant.Type]. Если ключи не типизированы, возвращает "
+"[constant TYPE_NIL]. См. также [method is_typed_key]."
+
+msgid ""
+"Returns the [b]built-in[/b] class name of the typed dictionary's keys, if the "
+"built-in [Variant] type is [constant TYPE_OBJECT]. Otherwise, returns an "
+"empty [StringName]. See also [method is_typed_key] and [method Object."
+"get_class]."
+msgstr ""
+"Возвращает [b]встроенное[/b] имя класса ключей типизированного словаря, если "
+"встроенный тип [Variant] — [constant TYPE_OBJECT]. В противном случае "
+"возвращает пустой [StringName]. См. также [method is_typed_key] и [method "
+"Object.get_class]."
+
+msgid ""
+"Returns the built-in [Variant] type of the typed dictionary's values as a "
+"[enum Variant.Type] constant. If the values are not typed, returns [constant "
+"TYPE_NIL]. See also [method is_typed_value]."
+msgstr ""
+"Возвращает встроенный тип [Variant] значений типизированного словаря как "
+"константу [enum Variant.Type]. Если значения не типизированы, возвращает "
+"[constant TYPE_NIL]. См. также [method is_typed_value]."
+
+msgid ""
+"Returns the [b]built-in[/b] class name of the typed dictionary's values, if "
+"the built-in [Variant] type is [constant TYPE_OBJECT]. Otherwise, returns an "
+"empty [StringName]. See also [method is_typed_value] and [method Object."
+"get_class]."
+msgstr ""
+"Возвращает [b]встроенное[/b] имя класса значений типизированного словаря, "
+"если встроенный тип [Variant] — [constant TYPE_OBJECT]. В противном случае "
+"возвращает пустой [StringName]. См. также [method is_typed_value] и [method "
+"Object.get_class]."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary contains an entry with the given "
+"[param key].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {\n"
+"    \"Godot\" : 4,\n"
+"    210 : null,\n"
+"}\n"
+"\n"
+"print(my_dict.has(\"Godot\")) # Prints true\n"
+"print(my_dict.has(210))     # Prints true\n"
+"print(my_dict.has(4))       # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    { \"Godot\", 4 },\n"
+"    { 210, default },\n"
+"};\n"
+"\n"
+"GD.Print(myDict.ContainsKey(\"Godot\")); // Prints True\n"
+"GD.Print(myDict.ContainsKey(210));     // Prints True\n"
+"GD.Print(myDict.ContainsKey(4));       // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, this is equivalent to the [code]in[/code] operator:\n"
+"[codeblock]\n"
+"if \"Godot\" in {\"Godot\": 4}:\n"
+"    print(\"The key is here!\") # Will be printed.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] This method returns [code]true[/code] as long as the [param key] "
+"exists, even if its corresponding value is [code]null[/code]."
+msgstr ""
+"Возвращает [code]true[/code], если словарь содержит запись с указанным [param "
+"key].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var my_dict = {\n"
+"    \"Godot\" : 4,\n"
+"    210 : null,\n"
+"}\n"
+"\n"
+"print(my_dict.has(\"Godot\")) # Prints true\n"
+"print(my_dict.has(210))     # Prints true\n"
+"print(my_dict.has(4))       # Prints false\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var myDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    { \"Godot\", 4 },\n"
+"    { 210, default },\n"
+"};\n"
+"\n"
+"GD.Print(myDict.ContainsKey(\"Godot\")); // Prints True\n"
+"GD.Print(myDict.ContainsKey(210));     // Prints True\n"
+"GD.Print(myDict.ContainsKey(4));       // Prints False\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"In GDScript, this is equivalent to the [code]in[/code] operator:\n"
+"[codeblock]\n"
+"if \"Godot\" in {\"Godot\": 4}:\n"
+"    print(\"The key is here!\") # Будет напечатано.\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Этот метод возвращает [code]true[/code] до тех пор, пока "
+"существует [param key], даже если его соответствующее значение равно "
+"[code]null[/code]."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary contains all keys in the given "
+"[param keys] array.\n"
+"[codeblock]\n"
+"var data = {\"width\" : 10, \"height\" : 20}\n"
+"data.has_all([\"height\", \"width\"]) # Returns true\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает [code]true[/code], если словарь содержит все ключи в заданном "
+"массиве [param keys].\n"
+"[codeblock]\n"
+"var data = {\"width\" : 10, \"height\" : 20}\n"
+"data.has_all([\"height\", \"width\"]) # Возвращает true\n"
+"[/codeblock]"
+
+msgid ""
+"Returns a hashed 32-bit integer value representing the dictionary contents.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var dict1 = {\"A\": 10, \"B\": 2}\n"
+"var dict2 = {\"A\": 10, \"B\": 2}\n"
+"\n"
+"print(dict1.hash() == dict2.hash()) # Prints true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var dict1 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"var dict2 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"\n"
+"// Godot.Collections.Dictionary has no Hash() method. Use GD.Hash() instead.\n"
+"GD.Print(GD.Hash(dict1) == GD.Hash(dict2)); // Prints True\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] Dictionaries with the same entries but in a different order will "
+"not have the same hash.\n"
+"[b]Note:[/b] Dictionaries with equal hash values are [i]not[/i] guaranteed to "
+"be the same, because of hash collisions. On the contrary, dictionaries with "
+"different hash values are guaranteed to be different."
+msgstr ""
+"Возвращает хешированное 32-битное целочисленное значение, представляющее "
+"содержимое словаря.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var dict1 = {\"A\": 10, \"B\": 2}\n"
+"var dict2 = {\"A\": 10, \"B\": 2}\n"
+"\n"
+"print(dict1.hash() == dict2.hash()) # Prints true\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var dict1 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"var dict2 = new Godot.Collections.Dictionary{{\"A\", 10}, {\"B\", 2}};\n"
+"\n"
+"// Godot.Collections.Dictionary has no Hash() method. Use GD.Hash() instead.\n"
+"GD.Print(GD.Hash(dict1) == GD.Hash(dict2)); // Prints True\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] Словари с одинаковыми записями, но в разном порядке, не "
+"будут иметь одинаковый хеш.\n"
+"[b]Примечание:[/b] Словари с одинаковыми значениями хеша [i]не[/i] "
+"гарантированно будут одинаковыми из-за коллизий хеша. Напротив, словари с "
+"разными значениями хеша гарантированно будут разными."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary is read-only. See [method "
+"make_read_only]. Dictionaries are automatically read-only if declared with "
+"[code]const[/code] keyword."
+msgstr ""
+"Возвращает [code]true[/code], если словарь доступен только для чтения. См. "
+"[method make_read_only]. Словари автоматически доступны только для чтения, "
+"если объявлены с ключевым словом [code]const[/code]."
+
+msgid ""
+"Returns [code]true[/code] if the dictionary is typed. Typed dictionaries can "
+"only store keys/values of their associated type and provide type safety for "
+"the [code][][/code] operator. Methods of typed dictionary still return "
+"[Variant]."
+msgstr ""
+"Возвращает [code]true[/code], если словарь типизирован. Типизированные "
+"словари могут хранить только ключи/значения своего связанного типа и "
+"обеспечивают безопасность типов для оператора [code][][/code]. Методы "
+"типизированного словаря по-прежнему возвращают [Variant]."
+
+msgid ""
+"Makes the dictionary read-only, i.e. disables modification of the "
+"dictionary's contents. Does not apply to nested content, e.g. content of "
+"nested dictionaries."
+msgstr ""
+"Делает словарь доступным только для чтения, т. е. отключает возможность "
+"изменения содержимого словаря. Не применяется к вложенному содержимому, "
+"например, содержимому вложенных словарей."
+
+msgid ""
+"Adds entries from [param dictionary] to this dictionary. By default, "
+"duplicate keys are not copied over, unless [param overwrite] is [code]true[/"
+"code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var dict = { \"item\": \"sword\", \"quantity\": 2 }\n"
+"var other_dict = { \"quantity\": 15, \"color\": \"silver\" }\n"
+"\n"
+"# Overwriting of existing keys is disabled by default.\n"
+"dict.merge(other_dict)\n"
+"print(dict)  # { \"item\": \"sword\", \"quantity\": 2, \"color\": "
+"\"silver\" }\n"
+"\n"
+"# With overwriting of existing keys enabled.\n"
+"dict.merge(other_dict, true)\n"
+"print(dict)  # { \"item\": \"sword\", \"quantity\": 15, \"color\": "
+"\"silver\" }\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var dict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    [\"item\"] = \"sword\",\n"
+"    [\"quantity\"] = 2,\n"
+"};\n"
+"\n"
+"var otherDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    [\"quantity\"] = 15,\n"
+"    [\"color\"] = \"silver\",\n"
+"};\n"
+"\n"
+"// Overwriting of existing keys is disabled by default.\n"
+"dict.Merge(otherDict);\n"
+"GD.Print(dict); // { \"item\": \"sword\", \"quantity\": 2, \"color\": "
+"\"silver\" }\n"
+"\n"
+"// With overwriting of existing keys enabled.\n"
+"dict.Merge(otherDict, true);\n"
+"GD.Print(dict); // { \"item\": \"sword\", \"quantity\": 15, \"color\": "
+"\"silver\" }\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] [method merge] is [i]not[/i] recursive. Nested dictionaries are "
+"considered as keys that can be overwritten or not depending on the value of "
+"[param overwrite], but they will never be merged together."
+msgstr ""
+"Добавляет записи из [param dictionary] в этот словарь. По умолчанию "
+"дублирующиеся ключи не копируются, если только [param overwrite] не равен "
+"[code]true[/code].\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"var dict = { \"item\": \"sword\", \"quantity\": 2 }\n"
+"var other_dict = { \"quantity\": 15, \"color\": \"silver\" }\n"
+"\n"
+"# Перезапись существующих ключей по умолчанию отключена.\n"
+"dict.merge(other_dict)\n"
+"print(dict)  # { \"item\": \"sword\", \"quantity\": 2, \"color\": "
+"\"silver\" }\n"
+"\n"
+"# С возможностью перезаписи существующих ключей.\n"
+"dict.merge(other_dict, true)\n"
+"print(dict)  # { \"item\": \"sword\", \"quantity\": 15, \"color\": "
+"\"silver\" }\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"var dict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    [\"item\"] = \"sword\",\n"
+"    [\"quantity\"] = 2,\n"
+"};\n"
+"\n"
+"var otherDict = new Godot.Collections.Dictionary\n"
+"{\n"
+"    [\"quantity\"] = 15,\n"
+"    [\"color\"] = \"silver\",\n"
+"};\n"
+"\n"
+"// Перезапись существующих ключей по умолчанию отключена.\n"
+"dict.Merge(otherDict);\n"
+"GD.Print(dict); // { \"item\": \"sword\", \"quantity\": 2, \"color\": "
+"\"silver\" }\n"
+"\n"
+"// С возможностью перезаписи существующих ключей.\n"
+"dict.Merge(otherDict, true);\n"
+"GD.Print(dict); // { \"item\": \"sword\", \"quantity\": 15, \"color\": "
+"\"silver\" }\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Примечание:[/b] [method merge] [i]не[/i] рекурсивен. Вложенные словари "
+"рассматриваются как ключи, которые могут быть перезаписаны или нет в "
+"зависимости от значения [param overwrite], но они никогда не будут объединены "
+"вместе."
+
+msgid ""
+"Returns a copy of this dictionary merged with the other [param dictionary]. "
+"By default, duplicate keys are not copied over, unless [param overwrite] is "
+"[code]true[/code]. See also [method merge].\n"
+"This method is useful for quickly making dictionaries with default values:\n"
+"[codeblock]\n"
+"var base = { \"fruit\": \"apple\", \"vegetable\": \"potato\" }\n"
+"var extra = { \"fruit\": \"orange\", \"dressing\": \"vinegar\" }\n"
+"# Prints { \"fruit\": \"orange\", \"vegetable\": \"potato\", \"dressing\": "
+"\"vinegar\" }\n"
+"print(extra.merged(base))\n"
+"# Prints { \"fruit\": \"apple\", \"vegetable\": \"potato\", \"dressing\": "
+"\"vinegar\" }\n"
+"print(extra.merged(base, true))\n"
+"[/codeblock]"
+msgstr ""
+"Возвращает копию этого словаря, объединенную с другим [param dictionary]. По "
+"умолчанию дублирующиеся ключи не копируются, если только [param overwrite] не "
+"равна [code]true[/code]. См. также [method merge]. \n"
+"Этот метод полезен для быстрого создания словарей со значениями по "
+"умолчанию:\n"
+"[codeblock]\n"
+"var base = { \"fruit\": \"apple\", \"vegetable\": \"potato\" }\n"
+"var extra = { \"fruit\": \"orange\", \"dressing\": \"vinegar\" }\n"
+"# Prints { \"fruit\": \"orange\", \"vegetable\": \"potato\", \"dressing\": "
+"\"vinegar\" }\n"
+"print(extra.merged(base))\n"
+"# Prints { \"fruit\": \"apple\", \"vegetable\": \"potato\", \"dressing\": "
+"\"vinegar\" }\n"
+"print(extra.merged(base, true))\n"
+"[/codeblock]"
+
+msgid ""
+"Sets the value of the element at the given [param key] to the given [param "
+"value]. This is the same as using the [code][][/code] operator "
+"([code]array[index] = value[/code])."
+msgstr ""
+"Устанавливает значение элемента с указанным [param key] на указанное [param "
+"value]. Это то же самое, что использовать оператор [code][][/code] "
+"([code]array[index] = value[/code])."
+
+msgid ""
+"Returns the number of entries in the dictionary. Empty dictionaries ([code]{ }"
+"[/code]) always return [code]0[/code]. See also [method is_empty]."
+msgstr ""
+"Возвращает количество записей в словаре. Пустые словари ([code]{ }[/code]) "
+"всегда возвращают [code]0[/code]. См. также [method is_empty]."
+
+msgid ""
+"Sorts the dictionary in-place by key. This can be used to ensure dictionaries "
+"with the same contents produce equivalent results when getting the [method "
+"keys], getting the [method values], and converting to a string. This is also "
+"useful when wanting a JSON representation consistent with what is in memory, "
+"and useful for storing on a database that requires dictionaries to be sorted."
+msgstr ""
+"Сортирует словарь на месте по ключу. Это можно использовать для обеспечения "
+"того, чтобы словари с одинаковым содержимым выдавали эквивалентные результаты "
+"при получении [method keys], получении [method values] и преобразовании в "
+"строку. Это также полезно, когда требуется представление JSON, "
+"соответствующее тому, что находится в памяти, и полезно для хранения в базе "
+"данных, которая требует сортировки словарей."
+
+msgid ""
+"Returns [code]true[/code] if the two dictionaries contain the same keys and "
+"values. The order of the entries does not matter.\n"
+"[b]Note:[/b] In C#, by convention, this operator compares by [b]reference[/"
+"b]. If you need to compare by value, iterate over both dictionaries."
+msgstr ""
+"Возвращает [code]true[/code], если два словаря содержат одинаковые ключи и "
+"значения. Порядок записей не имеет значения.\n"
+"[b]Примечание:[/b] В C# по соглашению этот оператор сравнивает по [b]ссылке[/"
+"b]. Если вам нужно сравнить по значению, выполните итерацию по обоим словарям."
+
+msgid ""
+"Returns the corresponding value for the given [param key] in the dictionary. "
+"If the entry does not exist, fails and returns [code]null[/code]. For safe "
+"access, use [method get] or [method has]."
+msgstr ""
+"Возвращает соответствующее значение для указанного [param key] в словаре. "
+"Если запись не существует, происходит сбой и возвращается [code]null[/code]. "
+"Для безопасного доступа используйте [method get] или [method has]."
+
+msgid "Provides methods for managing directories and their content."
+msgstr "Предоставляет методы управления каталогами и их содержимым."
+
+msgid ""
+"This class is used to manage directories and their content, even outside of "
+"the project folder.\n"
+"[DirAccess] can't be instantiated directly. Instead it is created with a "
+"static method that takes a path for which it will be opened.\n"
+"Most of the methods have a static alternative that can be used without "
+"creating a [DirAccess]. Static methods only support absolute paths (including "
+"[code]res://[/code] and [code]user://[/code]).\n"
+"[codeblock]\n"
+"# Standard\n"
+"var dir = DirAccess.open(\"user://levels\")\n"
+"dir.make_dir(\"world1\")\n"
+"# Static\n"
+"DirAccess.make_dir_absolute(\"user://levels/world1\")\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Accessing project (\"res://\") directories once exported may "
+"behave unexpectedly as some files are converted to engine-specific formats "
+"and their original source files may not be present in the expected PCK "
+"package. Because of this, to access resources in an exported project, it is "
+"recommended to use [ResourceLoader] instead of [FileAccess].\n"
+"Here is an example on how to iterate through the files of a directory:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func dir_contents(path):\n"
+"    var dir = DirAccess.open(path)\n"
+"    if dir:\n"
+"        dir.list_dir_begin()\n"
+"        var file_name = dir.get_next()\n"
+"        while file_name != \"\":\n"
+"            if dir.current_is_dir():\n"
+"                print(\"Found directory: \" + file_name)\n"
+"            else:\n"
+"                print(\"Found file: \" + file_name)\n"
+"            file_name = dir.get_next()\n"
+"    else:\n"
+"        print(\"An error occurred when trying to access the path.\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public void DirContents(string path)\n"
+"{\n"
+"    using var dir = DirAccess.Open(path);\n"
+"    if (dir != null)\n"
+"    {\n"
+"        dir.ListDirBegin();\n"
+"        string fileName = dir.GetNext();\n"
+"        while (fileName != \"\")\n"
+"        {\n"
+"            if (dir.CurrentIsDir())\n"
+"            {\n"
+"                GD.Print($\"Found directory: {fileName}\");\n"
+"            }\n"
+"            else\n"
+"            {\n"
+"                GD.Print($\"Found file: {fileName}\");\n"
+"            }\n"
+"            fileName = dir.GetNext();\n"
+"        }\n"
+"    }\n"
+"    else\n"
+"    {\n"
+"        GD.Print(\"An error occurred when trying to access the path.\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Keep in mind that file names may change or be remapped after export. If you "
+"want to see the actual resource file list as it appears in the editor, use "
+"[method ResourceLoader.list_directory] instead."
+msgstr ""
+"Этот класс используется для управления каталогами и их содержимым, даже за "
+"пределами папки проекта.\n"
+"[DirAccess] нельзя создать напрямую. Вместо этого он создается с помощью "
+"статического метода, который принимает путь, по которому он будет открыт.\n"
+"Большинство методов имеют статическую альтернативу, которую можно "
+"использовать без создания [DirAccess]. Статические методы поддерживают только "
+"абсолютные пути (включая [code]res://[/code] и [code]user://[/code]).\n"
+"[codeblock]\n"
+"# Стандарт\n"
+"var dir = DirAccess.open(\"user://levels\")\n"
+"dir.make_dir(\"world1\")\n"
+"# Статичный\n"
+"DirAccess.make_dir_absolute(\"user://levels/world1\")\n"
+"[/codeblock]\n"
+"[b]Примечание:[/b] Доступ к каталогам проекта (\"res://\") после экспорта "
+"может вести себя непредсказуемо, поскольку некоторые файлы преобразуются в "
+"форматы, специфичные для движка, и их исходные файлы могут отсутствовать в "
+"ожидаемом пакете PCK. Из-за этого для доступа к ресурсам в экспортированном "
+"проекте рекомендуется использовать [ResourceLoader] вместо [FileAccess].\n"
+"Вот пример того, как перебирать файлы каталога:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func dir_contents(path):\n"
+"    var dir = DirAccess.open(path)\n"
+"    if dir:\n"
+"        dir.list_dir_begin()\n"
+"        var file_name = dir.get_next()\n"
+"        while file_name != \"\":\n"
+"            if dir.current_is_dir():\n"
+"                print(\"Found directory: \" + file_name)\n"
+"            else:\n"
+"                print(\"Found file: \" + file_name)\n"
+"            file_name = dir.get_next()\n"
+"    else:\n"
+"        print(\"An error occurred when trying to access the path.\")\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public void DirContents(string path)\n"
+"{\n"
+"    using var dir = DirAccess.Open(path);\n"
+"    if (dir != null)\n"
+"    {\n"
+"        dir.ListDirBegin();\n"
+"        string fileName = dir.GetNext();\n"
+"        while (fileName != \"\")\n"
+"        {\n"
+"            if (dir.CurrentIsDir())\n"
+"            {\n"
+"                GD.Print($\"Found directory: {fileName}\");\n"
+"            }\n"
+"            else\n"
+"            {\n"
+"                GD.Print($\"Found file: {fileName}\");\n"
+"            }\n"
+"            fileName = dir.GetNext();\n"
+"        }\n"
+"    }\n"
+"    else\n"
+"    {\n"
+"        GD.Print(\"An error occurred when trying to access the path.\");\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Имейте в виду, что имена файлов могут измениться или быть переназначены после "
+"экспорта. Если вы хотите увидеть фактический список файлов ресурсов, как он "
+"отображается в редакторе, используйте вместо этого [method ResourceLoader."
+"list_directory]."
+
+msgid "File system"
+msgstr "Файловая система"
+
+msgid ""
+"Changes the currently opened directory to the one passed as an argument. The "
+"argument can be relative to the current directory (e.g. [code]newdir[/code] "
+"or [code]../newdir[/code]), or an absolute path (e.g. [code]/tmp/newdir[/"
+"code] or [code]res://somedir/newdir[/code]).\n"
+"Returns one of the [enum Error] code constants ([constant OK] on success).\n"
+"[b]Note:[/b] The new directory must be within the same scope, e.g. when you "
+"had opened a directory inside [code]res://[/code], you can't change it to "
+"[code]user://[/code] directory. If you need to open a directory in another "
+"access scope, use [method open] to create a new instance instead."
+msgstr ""
+"Изменяет текущий открытый каталог на тот, который передан в качестве "
+"аргумента. Аргумент может быть относительным к текущему каталогу (например, "
+"[code]newdir[/code] или [code]../newdir[/code]) или абсолютным путем "
+"(например, [code]/tmp/newdir[/code] или [code]res://somedir/newdir[/code]).\n"
+"Возвращает одну из констант кода [enum Error] ([constant OK] при успешном "
+"выполнении).\n"
+"[b]Примечание:[/b] Новый каталог должен находиться в той же области, "
+"например, если вы открыли каталог внутри [code]res://[/code], вы не можете "
+"изменить его на каталог [code]user://[/code]. Если вам нужно открыть каталог "
+"в другой области доступа, используйте [method open] для создания нового "
+"экземпляра."
+
+msgid ""
+"Copies the [param from] file to the [param to] destination. Both arguments "
+"should be paths to files, either relative or absolute. If the destination "
+"file exists and is not access-protected, it will be overwritten.\n"
+"If [param chmod_flags] is different than [code]-1[/code], the Unix "
+"permissions for the destination path will be set to the provided value, if "
+"available on the current operating system.\n"
+"Returns one of the [enum Error] code constants ([constant OK] on success)."
+msgstr ""
+"Копирует файл [param from] в место назначения [param to]. Оба аргумента "
+"должны быть путями к файлам, относительными или абсолютными. Если файл "
+"назначения существует и не защищен от доступа, он будет перезаписан.\n"
+"Если [param chmod_flags] отличается от [code]-1[/code], разрешения Unix для "
+"пути назначения будут установлены на указанное значение, если оно доступно в "
+"текущей операционной системе.\n"
+"Возвращает одну из констант кода [enum Error] ([constant OK] при успешном "
+"выполнении)."
+
+msgid ""
+"Returns the on-screen keyboard's height in pixels. Returns 0 if there is no "
+"keyboard or if it is currently hidden."
+msgstr ""
+"Возвращает высоту экранной клавиатура в пикселях. Возвращает 0 если "
+"отсутствует или в данный момент клавиатура скрыта."
+
+msgid "Hides the virtual keyboard if it is shown, does nothing otherwise."
+msgstr ""
+"Скрывает виртуальную клавиатуру если она видима, иначе ничего не делает."
+
+msgid ""
+"Returns ID of the active popup window, or [constant INVALID_WINDOW_ID] if "
+"there is none."
+msgstr ""
+"Возвращает ИД активного всплывающего окна, или [constant INVALID_WINDOW_ID] "
+"если такого окна нет."
+
+msgid ""
+"Sets the title of the given window to [param title].\n"
+"[b]Note:[/b] It's recommended to change this value using [member Window."
+"title] instead.\n"
+"[b]Note:[/b] Avoid changing the window title every frame, as this can cause "
+"performance issues on certain window managers. Try to change the window title "
+"only a few times per second at most."
+msgstr ""
+"Устанавливает тутул данного окна [param title].\n"
+"[b]Примечание:[/b] Рекомендуется менять это значение через [member Window."
+"title]\n"
+"[b]Примечание:[/b] Избегайте изменения титула каждый кадр, так как это может "
+"негативно сказаться на производительность некоторых менеджеров окон. "
+"Постарайтесь менять титул окна не более несколько раз в секунду."
+
+msgid ""
+"Sets the V-Sync mode of the given window. See also [member ProjectSettings."
+"display/window/vsync/vsync_mode].\n"
+"See [enum DisplayServer.VSyncMode] for possible values and how they affect "
+"the behavior of your application.\n"
+"Depending on the platform and used renderer, the engine will fall back to "
+"[constant VSYNC_ENABLED] if the desired mode is not supported.\n"
+"[b]Note:[/b] V-Sync modes other than [constant VSYNC_ENABLED] are only "
+"supported in the Forward+ and Mobile rendering methods, not Compatibility."
+msgstr ""
+"Устанавливает режим Верт. Синхронизации окна. Просмотрите также [member "
+"ProjectSettings.display/window/vsync/vsync_mode].\n"
+"Просмотрите [enum DisplayServer.VSyncMode] для возможных значений и как они "
+"влияют на поведение приложения.\n"
+"В зависимости от платформы и отрисовки, движок будет опираться на [constant "
+"VSYNC_ENABLED}, если выбранный режим не поддерживается.\n"
+"[b]Примечание:[/b] Режимы Верт. Синхронизации кроме [constant VSYNC_ENABLED] "
+"работают только в способах отрисовки Forward+ и Мобильный , но не "
+"Совместимость."
+
+msgid "Bottom edge of a window."
+msgstr "Нижний край окна."
+
+msgid "Bottom-right edge of a window."
+msgstr "Нижний правый угол окна."
+
+msgid ""
+"No vertical synchronization, which means the engine will display frames as "
+"fast as possible (tearing may be visible). Framerate is unlimited (regardless "
+"of [member Engine.max_fps])."
+msgstr ""
+"Вертикальная синхронизация отключена, это означает что движок будет пытаться "
+"обновлять кадры как можно чаще (из-за этого могут быть заметны разрывы "
+"изображения). Частота кадров неограничена (независимо от [member Engine."
+"max_fps])."
+
+msgid "Exporter for Android."
+msgstr "Экспортер для ОС Android."
+
+msgid "Exporting for Android"
+msgstr "Экспортирование для ОС Android"
+
+msgid ""
+"See [url=https://developer.android.com/reference/android/Manifest."
+"permission#MASTER_CLEAR]MASTER_CLEAR[/url]."
+msgstr ""
+"См. [url=https://developer.android.com/reference/android/Manifest."
+"permission#MASTER_CLEAR]MASTER_CLEAR[/url]."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns export platform name."
+msgstr "Возвращает название платформы для экспорта."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns target OS name."
+msgstr ""
+"[b]Обязательный.[/b]\n"
+"Возвращает название целевой операционной системы."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns array of platform specific features."
+msgstr ""
+"[b]Обязательный.[/b]\n"
+"Возвращает массив специфичных для платформы функций."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns [code]true[/code] if export configuration is valid."
+msgstr ""
+"[b]Обязательный.[/b]\n"
+"Возвращает [code]true[/code] если настройки экспорта корректны."
+
+msgid ""
+"[b]Required.[/b]\n"
+"Returns [code]true[/code] if project configuration is valid."
+msgstr ""
+"[b]Обязательный.[/b]\n"
+"Возвращает [code]true[/code] если конфигурация проекта корректна."
+
+msgid ""
+"[b]Optional.[/b]\n"
+"Returns [code]true[/code] if specified file is a valid executable (native "
+"executable or script) for the target platform."
+msgstr ""
+"[b]Обязательный.[/b]\n"
+"Возвращает [code]true[/code] если указанный файл является исполняемым "
+"(нативным или скриптом) для целевой платформы."
+
+msgid "Exporter for iOS."
+msgstr "Экспортер для iOS."
+
+msgid "Exporting for iOS"
+msgstr "Экспорт для iOS"
+
+msgid "Supported device family."
+msgstr "Поддерживаемое семейство устройств."
+
+msgid "Exporter for Linux/BSD."
+msgstr "Экспортер для Linux/BSD."
+
+msgid "Exporting for Linux"
+msgstr "Экспорт для Linux"
+
+msgid "Exporter for macOS."
+msgstr "Экспортер для macOS."
+
+msgid "Exporting for macOS"
+msgstr "Экспорт для macOS"
+
+msgid "Application distribution target."
+msgstr "Цель распространения приложения."
+
+msgid "Exporting for Windows"
+msgstr "Экспортирование для Windows"
+
+msgid "Exporter for Windows."
+msgstr "Экспортер для Windows."
+
+msgid "Import plugins"
+msgstr "Импорт плагинов"
+
+msgid "Inspector plugins"
+msgstr "Плагины инспектора"
+
+msgid "Godot editor's interface."
+msgstr "Интерфейс редактора Godot."
+
+msgid "Node3D gizmo plugins"
+msgstr "Гизмо плагин Node3D"
+
+msgid "Clear the selection."
+msgstr "Снять выделение."
+
+msgid "Creates a new branch named [param branch_name] in the VCS."
+msgstr ""
+"Создает новую ветку с именем [param branch_name] в системе контроля версий"
+
+msgid "Total data sent."
+msgstr "Всего передано данных."
+
+msgid "Total data received."
+msgstr "Всего получено данных."
+
+msgid "High-level multiplayer"
+msgstr "Высокоуровневый мультиплеер"
+
+msgid "Packet loss variance."
+msgstr "Коэффициент потери пакетов."
+
+msgid "Environment and post-processing"
+msgstr "Окружающая среда и постобработка"
+
+msgid "Evaluating Expressions"
+msgstr "Оценка выражений"
+
+msgid "No fractal noise."
+msgstr "Отсутствие фрактального шума."
+
+msgid "Divides two floats."
+msgstr "Делит два числа с плавающей точкой."
+
+msgid "Sets glyph size."
+msgstr "Задает размер глифа."
+
+msgid "Font anti-aliasing mode."
+msgstr "Способ сглаживания шрифтов."
+
+msgid "Font family name."
+msgstr "Название семейства шрифтов."
+
+msgid "Font style name."
+msgstr "Имя стиля шрифта."
+
+msgid "GDScript documentation index"
+msgstr "Индекс документации по GDScript"
+
+msgid "[GLTFDocument] extension class."
+msgstr "Класс расширения [GLTFDocument]."
+
+msgid "The specular-glossiness texture."
+msgstr "Текстура зеркального блеска."
+
+msgid "2D Particles Demo"
+msgstr "Демонстрация 2D-частиц"
+
+msgid "Emission randomness ratio."
+msgstr "Коэффициент случайности излучения."
+
+msgid "Cubic interpolation."
+msgstr "Кубическая интерполяция."
+
+msgid "sRGB color space."
+msgstr "Цветовое пространство sRGB."
+
+msgid "The scroll offset."
+msgstr "Смещение прокрутки."
+
+msgid "Using gridmaps"
+msgstr "Использование карт сетки"
+
+msgid "Clear all cells."
+msgstr "Очистить все ячейки."
+
+msgid "The assigned [MeshLibrary]."
+msgstr "Присвоенный [MeshLibrary]."
+
+msgid "Hashing algorithm: MD5."
+msgstr "Алгоритм хэширования: MD5."
+
+msgid "Hashing algorithm: SHA-1."
+msgstr "Алгоритм хэширования: SHA-1."
+
+msgid "Hashing algorithm: SHA-256."
+msgstr "Алгоритм хэширования: SHA-256."
+
+msgid "HTTP client class"
+msgstr "Класс HTTP-клиента"
+
+msgid "TLS certificates"
+msgstr "TLS-сертификаты"
+
+msgid "Status: Connection established."
+msgstr "Статус: Соединение установлено."
+
+msgid "Making HTTP requests"
+msgstr "Выполнение HTTP-запросов"
+
+msgid "Request successful."
+msgstr "Запрос успешен."
+
+msgid "Image datatype."
+msgstr "Тип данных изображения."
+
+msgid "Importing images"
+msgstr "Импорт изображений"
+
+msgid "Image uses alpha."
+msgstr "Изображ. исп. альфа-канал."
+
+msgid "Use S3TC compression."
+msgstr "Исп. S3TC компрессию."
+
+msgid "Use ETC compression."
+msgstr "Исп. ETC компрессию."
+
+msgid "Use ETC2 compression."
+msgstr "Исп. ETC2 компрессию."
+
+msgid "Use BPTC compression."
+msgstr "Использовать BPTC компрессию."
+
+msgid "Use ASTC compression."
+msgstr "Используйте ASTC компрессию."
+
+msgid "Clear all surfaces."
+msgstr "Очистить все поверхности."
+
+msgid "Inputs documentation index"
+msgstr "Указатель документации ввода"
+
+msgid "Using InputEvent: Actions"
+msgstr "Использование InputEvent: Действия"
+
+msgid "Address type: None."
+msgstr "Тип адреса: Нет."
+
+msgid "Address type: Any."
+msgstr "Тип адреса: Любой."
+
+msgid "Creating Android plugins"
+msgstr "Создание плагинов для ОС Android"
+
+msgid "Text outline size."
+msgstr "Размер обводки текста."
+
+msgid "Text width (in pixels), used for autowrap and fill alignment."
+msgstr ""
+"Ширина текста (в пикселях), используемая для автоматического переноса и "
+"выравнивания заливки."
+
+msgid "The Light2D's [Color]."
+msgstr "[Color] в Light2D."
+
+msgid ""
+"String value of the [LineEdit].\n"
+"[b]Note:[/b] Changing text using this property won't emit the [signal "
+"text_changed] signal."
+msgstr ""
+"Строковое значение [LineEdit].\n"
+"[b]Примечание:[/b] Изменение текста с использованием этого свойства не будет "
+"генерировать сигнал [signal text_changed]."
+
+msgid ""
+"If [code]true[/code], the native virtual keyboard is shown when focused on "
+"platforms that support it."
+msgstr ""
+"Если [code]true[/code], встроенная виртуальная клавиатура будет отображена на "
+"платформах, которые поддерживают это."
+
+msgid "Specifies the type of virtual keyboard to show."
+msgstr "Указывает тип отображаемой виртуальной клавиатуры."
+
+msgid ""
+"Emitted when appending text that overflows the [member max_length]. The "
+"appended text is truncated to fit [member max_length], and the part that "
+"couldn't fit is passed as the [param rejected_substring] argument."
+msgstr ""
+"Вызывается при добавлении текста, который выходит за пределы [member "
+"max_length]. Добавленный текст усекается, чтобы соответствовать [member "
+"max_length], а часть, которая не помещается, передается как аргумент[param "
+"rejected_substring]."
+
+msgid "Default font color."
+msgstr "Цвет шрифта по умолч."
+
+msgid "2D meshes"
+msgstr "2D-сетки"
+
+msgid "Library of meshes."
+msgstr "Библиотека мешей."
+
+msgid "Clears the library."
+msgstr "Очистить библиотеку."
+
+msgid "Removes the item."
+msgstr "Удаление элемента."
+
+msgid "Using MultiMeshInstance"
+msgstr "Использовать MultiMeshInstance"
+
+msgid "Optimization using MultiMeshes"
+msgstr "Оптимизация с использованием мультисеток"
+
+msgid "Using multiple threads"
+msgstr "Использование многопоточности"
+
+msgid "Thread-safe APIs"
+msgstr "Потокобезопасные API"
+
+msgid "Using NavigationObstacles"
+msgstr "Использовать NavigationObstacles"
+
+msgid "Using NavigationPathQueryObjects"
+msgstr "Использовать NavigationPathQueryObjects"
+
+msgid "Creates the agent."
+msgstr "Создает агента."
+
+msgid "Base class for all scene objects."
+msgstr "Базовый класс для всех объектов."
+
+msgid "All Demos"
+msgstr "Все демонстрации"
+
+msgid "All 2D Demos"
+msgstr "Все демоверсии 2D"
+
+msgid "Most basic 3D game object, parent of all 3D-related nodes."
+msgstr ""
+"Базовый объект для 3D-игр, наследуемый всеми узлами, предназначенными для 3D-"
+"сцен."
+
+msgid "Introduction to 3D"
+msgstr "Введение в 3D"
+
+msgid "All 3D Demos"
+msgstr "Все демоверсии 3D"
+
+msgid ""
+"Determines whether the noise image is calculated in 3D space. May result in "
+"reduced contrast."
+msgstr ""
+"Определяет, вычисляется ли шумовое изображение в трехмерном пространстве. "
+"Может привести к снижению контрастности."
+
+msgid ""
+"If [code]true[/code], the noise image coming from the noise generator is "
+"normalized to the range [code]0.0[/code] to [code]1.0[/code].\n"
+"Turning normalization off can affect the contrast and allows you to generate "
+"non repeating tileable noise textures."
+msgstr ""
+"Если [code]true[/code], шумовое изображение, поступающее от генератора шума, "
+"нормализуется в диапазоне от [code]0.0[/code] до [code]1.0[/code].\n"
+"Отключение нормализации может повлиять на контрастность и позволит создавать "
+"неповторяющиеся мозаичные текстуры шума."
+
+msgid "Object class introduction"
+msgstr "Введение класса объекта"
+
+msgid "Object notifications"
+msgstr "Уведомления объекта"
+
+msgid "See [enum ShadowMode]."
+msgstr "См. [enum ShadowMode]."
+
+msgid "An OpenXR action."
+msgstr "Действие OpenXR."
+
+msgid "Add an action set."
+msgstr "Добавить набор действий."
+
+msgid "Add an interaction profile."
+msgstr "Добавить профиль взаимодействия."
+
+msgid "Our OpenXR interface."
+msgstr "Интерфейс OpenXR."
+
+msgid "Setting up XR"
+msgstr "Настройка XR"
+
+msgid ""
+"Appends an element at the end of the array (alias of [method push_back])."
+msgstr "Добавляет элемент в конец массива (псевдоним [method push_back])."
+
+msgid ""
+"Clears the array. This is equivalent to using [method resize] with a size of "
+"[code]0[/code]."
+msgstr ""
+"Очищает массив. Это эквивалентно использованию [method resize] с размером "
+"[code]0[/code]."
+
+msgid "Returns the number of times an element is in the array."
+msgstr "Возвращает количество раз когда элемент встречается в массиве."
+
+msgid "Returns [code]true[/code] if the array is empty."
+msgstr "Возвращает [code]true[/code] если массив пустой."
+
+msgid "Appends an element at the end of the array."
+msgstr "Добавляет элемент в конец массива."
+
+msgid "Removes an element from the array by index."
+msgstr "Удаляет элемент из массива по индексу."
+
+msgid "Reverses the order of the elements in the array."
+msgstr "Инвертирует порядок элементов в массиве."
+
+msgid "Returns the number of elements in the array."
+msgstr "Возвращает число элементов в массиве."
+
+msgid "DTLS packet peer."
+msgstr "Пакетный пир DTLS."
+
+msgid "UDP packet peer."
+msgstr "Одноранговый UDP-пакет."
+
+msgid "Exposes performance-related data."
+msgstr "Раскрытие данных о производительности."
+
+msgid ""
+"Returns the value of custom monitor with given [param id]. The callable is "
+"called to get the value of custom monitor. See also [method "
+"has_custom_monitor]. Prints an error if the given [param id] is absent."
+msgstr ""
+"Возвращает значение пользовательского монитора с заданным [param id]. "
+"Вызываемый объект вызывается для получения значения пользовательского "
+"монитора. Смотрите также [method has_custom_monitor]. Выводит сообщение об "
+"ошибке, если заданный [param id] отсутствует."
+
+msgid ""
+"Returns the value of one of the available built-in monitors. You should "
+"provide one of the [enum Monitor] constants as the argument, like this:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(Performance.get_monitor(Performance.TIME_FPS)) # Prints the FPS to the "
+"console.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(Performance.GetMonitor(Performance.Monitor.TimeFps)); // Prints the "
+"FPS to the console.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"See [method get_custom_monitor] to query custom performance monitors' values."
+msgstr ""
+"Возвращает значение одного из доступных встроенных мониторов. В качестве "
+"аргумента следует указать одну из констант [enum Monitor], например, такую:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"print(Performance.get_monitor(Performance.TIME_FPS)) # Выводит значение FPS "
+"на консоль.\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"GD.Print(Производительность.Получить монитор(Performance.Monitor."
+"TimeFps)); // Выводит значение FPS на консоль.\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"Смотрите [method get_custom_monitor] для запроса значений пользовательских "
+"мониторов производительности."
+
+msgid ""
+"Returns the last tick in which custom monitor was added/removed (in "
+"microseconds since the engine started). This is set to [method Time."
+"get_ticks_usec] when the monitor is updated."
+msgstr ""
+"Возвращает последний тик, в течение которого пользовательский монитор был "
+"добавлен/удален (в микросекундах с момента запуска движка). При обновлении "
+"монитора устанавливается значение [method Time.get_ticks_usec]."
+
+msgid "The body's mass."
+msgstr "Масса тела."
+
+msgid "Ray-casting"
+msgstr "Трассировка лучей"
+
+msgid "A 2D polygon."
+msgstr "Двумерный полигон."
+
+msgid "Stores globally-accessible variables."
+msgstr "Хранит глобально доступные переменные."
+
+msgid ""
+"If [code]true[/code], the application automatically accepts quitting requests."
+msgstr ""
+"Если [code]включено[/code], приложение будет автоматически подтверждать выход."
+
+msgid ""
+"The project's description, displayed as a tooltip in the Project Manager when "
+"hovering the project."
+msgstr ""
+"Описание проекта, отображаемое в виде всплывающей подсказки в Менеджере "
+"Проектов при наведении на проект."
+
+msgid ""
+"Icon used for the project, set when project loads. Exporters will also use "
+"this icon as a fallback if necessary."
+msgstr ""
+"Иконка, используемая для проекта, устанавливается при загрузке проекта. При "
+"необходимости экспортеры также будут использовать этот значок в качестве "
+"запасного варианта."
+
+msgid ""
+"Icon set in [code].icns[/code] format used on macOS to set the game's icon. "
+"This is done automatically on start by calling [method DisplayServer."
+"set_native_icon]."
+msgstr ""
+"Установить иконку в формате [code].icns[/code], используемую в macOS в "
+"качестве иконки приложения. Это делается автоматически при запуске путем "
+"вызова метода [method DisplayServer.set_native_icon]."
+
+msgid ""
+"The project's name. It is used both by the Project Manager and by exporters. "
+"The project name can be translated by translating its value in localization "
+"files. The window title will be set to match the project name automatically "
+"on startup.\n"
+"[b]Note:[/b] Changing this value will also change the user data folder's path "
+"if [member application/config/use_custom_user_dir] is [code]false[/code]. "
+"After renaming the project, you will no longer be able to access existing "
+"data in [code]user://[/code] unless you rename the old folder to match the "
+"new project name. See [url=$DOCS_URL/tutorials/io/data_paths.html]Data paths[/"
+"url] in the documentation for more information."
+msgstr ""
+"Название проекта. Используется как менеджером проекта, так и при экспорте. "
+"Имя проекта может быть переведено путем перевода его названия в файлах "
+"локализации. При запуске заголовок окна автоматически устанавливается в "
+"соответствии с названием проекта.\n"
+"[b]Примечание:[/b] Изменение этого значения также изменит путь к папке данных "
+"пользователя, если параметр [member application/config/use_custom_user_dir] "
+"имеет значение [code]выключен[/code]. После переименования проекта вы больше "
+"не сможете получить доступ к существующим данным в [code]user://[/code], если "
+"не переименуете старую папку в соответствии с новым именем проекта. "
+"Дополнительные сведения см. в разделе [url=$DOCS_URL/tutorials/io/data_paths."
+"html]Пути данных[/url] в документации."
+
+msgid ""
+"Translations of the project's name. This setting is used by OS tools to "
+"translate application name on Android, iOS and macOS."
+msgstr ""
+"Локализированное названия проекта. Эта настройка используется инструментами "
+"ОС для перевода названия приложения на Android, iOS и macOS."
+
+msgid ""
+"If [code]true[/code], the application quits automatically when navigating "
+"back (e.g. using the system \"Back\" button on Android)."
+msgstr ""
+"Если [code]включено[/code], приложение автоматически закроется при переходе "
+"назад (например, с помощью системной кнопки \"Назад\" на Android)."
+
+msgid ""
+"If [code]true[/code], the project will save user data to its own user "
+"directory. If [member application/config/custom_user_dir_name] is empty, "
+"[code]<OS user data directory>/<project name>[/code] directory will be used. "
+"If [code]false[/code], the project will save user data to [code]<OS user data "
+"directory>/Godot/app_userdata/<project name>[/code].\n"
+"See also [url=$DOCS_URL/tutorials/io/data_paths.html#accessing-persistent-"
+"user-data-user]File paths in Godot projects[/url]. This setting is only "
+"effective on desktop platforms."
+msgstr ""
+"Если [code]включено[/code], проект будет сохранять данные пользователя в свою "
+"собственную директорию. Если поле [member application/config/"
+"custom_user_dir_name] пусто, будет использоваться директория [code]<OS user "
+"data directory>/<project name>[/code]. Если [code]выключено[/code], проект "
+"будет сохранять данные пользователя в [code]<OS user data directory>/Godot/"
+"app_userdata/<project name>[/code].\n"
+"См. также [url=$DOCS_URL/tutorials/io/data_paths.html#accessing-persistent-"
+"user-data-user]Пути к файлам в проектах Godot[/url]. Эта настройка действует "
+"только на настольных платформах."
+
+msgid ""
+"The project's human-readable version identifier. This is used by exporters if "
+"the version identifier isn't overridden there. If [member application/config/"
+"version] is an empty string and the version identifier isn't overridden in an "
+"exporter, the exporter will use [code]1.0.0[/code] as a version identifier."
+msgstr ""
+"Идентификатор версии проекта. Он используется экспортерами, если версия не "
+"настроена в них. Если в [member application/config/version] - пустая строка и "
+"версия не настроена в экспортере, экспортер будет использовать [code]1.0.0[/"
+"code] в качестве версии."
+
+msgid ""
+"Icon set in [code].ico[/code] format used on Windows to set the game's icon. "
+"This is done automatically on start by calling [method DisplayServer."
+"set_native_icon]."
+msgstr ""
+"Установить иконку в формате [code].ico[/code], используемую в Windows в "
+"качестве иконки приложения. Это делается автоматически при запуске путем "
+"вызова метода [method DisplayServer.set_native_icon]."
+
+msgid ""
+"If [code]true[/code], flushes the standard output stream every time a line is "
+"printed. This affects both terminal logging and file logging.\n"
+"When running a project, this setting must be enabled if you want logs to be "
+"collected by service managers such as systemd/journalctl. This setting is "
+"disabled by default on release builds, since flushing on every printed line "
+"will negatively affect performance if lots of lines are printed in a rapid "
+"succession. Also, if this setting is enabled, logged files will still be "
+"written successfully if the application crashes or is otherwise killed by the "
+"user (without being closed \"normally\").\n"
+"[b]Note:[/b] Regardless of this setting, the standard error stream "
+"([code]stderr[/code]) is always flushed when a line is printed to it.\n"
+"Changes to this setting will only be applied upon restarting the application."
+msgstr ""
+"Если [code]true[/code], то поток стандартного вывода очищается каждый раз, "
+"когда печатается строка. Это влияет как на ведение журналов в терминале, так "
+"и на ведение журналов в файлах.\n"
+"При запуске проекта этот параметр должен быть включен, если вы хотите, чтобы "
+"журналы собирались менеджерами служб, такими как systemd/journalctl. Эта "
+"настройка отключена по умолчанию в сборках релизов, поскольку промывка каждой "
+"напечатанной строки негативно скажется на производительности, если много "
+"строк печатается в быстрой последовательности. Кроме того, если эта настройка "
+"включена, файлы журналов будут успешно записаны, если приложение аварийно "
+"завершено или иным образом убито пользователем (не будучи закрытым "
+"\"нормально\").\n"
+"[b]Примечание:[/b] Независимо от этой настройки, стандартный поток ошибок "
+"([code]stderr[/code]) всегда промывается, когда в него печатается строка.\n"
+"Изменения в этой настройке будут применены только после перезапуска "
+"приложения."
+
+msgid "Path to the main scene file that will be loaded when the project runs."
+msgstr "Путь к главной сцене, которая будет загружена при запуске проекта."
+
+msgid "Custom image for the mouse cursor (limited to 256×256)."
+msgstr "Ваше собственное изображение для курсора мыши (макс. размер 256×256)."
+
+msgid "Attachment is unused."
+msgstr "Вложение не используется."
+
+msgid "The uniform's binding."
+msgstr "Привязка униформы."
+
+msgid "Reflection probes"
+msgstr "Датчики отражения"
+
+msgid "Using compute shaders"
+msgstr "Применение вычислительных шейдеров"
+
+msgid "Compute barrier mask."
+msgstr "Вычислить барьерную маску."
+
+msgid "Transfer barrier mask."
+msgstr "Перенос барьерной маски."
+
+msgid "Uniform buffer uniform."
+msgstr "Унифицированная буферная униформа."
+
+msgid ""
+"[url=https://vkguide.dev/docs/chapter-4/storage_buffers/]Storage buffer[/url] "
+"uniform."
+msgstr ""
+"[url=https://vkguide.dev/docs/chapter-4/storage_buffers/]Буфер хранения[/url] "
+"униформа."
+
+msgid "Input attachment uniform."
+msgstr "вставка для ввода униформы."
+
+msgid "\"Less than\" comparison."
+msgstr "Сравнение \"меньше, чем\"."
+
+msgid "\"Equal\" comparison."
+msgstr "\"Равноценное\" сравнение."
+
+msgid "\"Less than or equal\" comparison."
+msgstr "Сравнение \"меньше или равно\"."
+
+msgid "\"Greater than\" comparison."
+msgstr "Сравнение \"больше, чем\"."
+
+msgid "\"Not equal\" comparison."
+msgstr "Сравнение \"Не равно\"."
+
+msgid "AND logic operation."
+msgstr "Логическая операция И."
+
+msgid "OR logic operation."
+msgstr "Логическая операция ИЛИ."
+
+msgid "Boolean specialization constant."
+msgstr "Константа логической специализации."
+
+msgid "Integer specialization constant."
+msgstr "Целочисленная константа специализации."
+
+msgid "Floating-point specialization constant."
+msgstr "Константа специализации с плавающей точкой."
+
+msgid "Optimization using Servers"
+msgstr "Оптимизация с помощью серверов"
+
+msgid ""
+"Sets the canvas light's shadow's filter, see [enum CanvasLightShadowFilter] "
+"constants."
+msgstr ""
+"Устанавливает фильтр тень холста, см. константы [enum "
+"CanvasLightShadowFilter]."
+
+msgid "Sets the [Transform2D] for a specific bone of this skeleton."
+msgstr "Устанавливает [Transform2D] для определенной кости этого скелета."
+
+msgid "The light's range."
+msgstr "Радиус охвата света."
+
+msgid "The light's attenuation."
+msgstr "Затухание света."
+
+msgid "The spotlight's angle."
+msgstr "Угол освещения."
+
+msgid "The spotlight's attenuation."
+msgstr "Ослабление точечного света."
+
+msgid "Disable ambient light."
+msgstr "Отключить внешнее освещение."
+
+msgid "Disable reflections."
+msgstr "Отключить отражение."
+
+msgid "The instance is a particle emitter."
+msgstr "Данный экземпляр - источник частиц."
+
+msgid "The instance is a reflection probe."
+msgstr "Данный экземпляр - проба отражения."
+
+msgid "Disable shadows from this instance."
+msgstr "Отключает тени в данном экземпляре."
+
+msgid ""
+"Path to the atlas spritesheet. This [i]must[/i] be set to valid path to a PNG "
+"image. Otherwise, the atlas will fail to import."
+msgstr ""
+"Путь к листу спрайтов атласа. Этот путь [i]должен[/i] быть установлен на "
+"действительный путь к PNG-изображению. В противном случае атлас не будет "
+"импортирован."
+
+msgid "Bundles external resources."
+msgstr "Пакеты внешних ресурсов."
+
+msgid "A 2D physics body that is moved by a physics simulation."
+msgstr ""
+"Двухмерное физическое тело, которое перемещается с помощью симуляции физики."
+
+msgid "Instancing Demo"
+msgstr "Демонстрация экземпляра"
+
+msgid "The grid's color."
+msgstr "Цвет сетки."
+
+msgid "SceneTree"
+msgstr "Дерево сцены"
+
+msgid ""
+"If [code]true[/code], curves from [Path2D] and [Path3D] nodes will be visible "
+"when running the game from the editor for debugging purposes.\n"
+"[b]Note:[/b] This property is not designed to be changed at run-time. "
+"Changing the value of [member debug_paths_hint] while the project is running "
+"will not have the desired effect."
+msgstr ""
+"Если [code]true[/code], кривые от [Path2D] и [Path3D] будут видимы во время "
+"работы игры из редактора для откладки.\n"
+"[b]Примечание:[/b] Это свойство не изменяемо по время выполнения. Попытки "
+"изменить значение [member debug_paths_hint] пока проект выполняется не "
+"приведёт к желательному эффекту."
+
+msgid "One-shot timer."
+msgstr "Таймер на один снимок."
+
+msgid "Scripting documentation index"
+msgstr "Индекс документации по написанию скриптов"
+
+msgid "The ray's length."
+msgstr "Длина луча."
+
+msgid "Shaders documentation index"
+msgstr "Индекс документации по шейдерам"
+
+msgid "Shader preprocessor"
+msgstr "Шейдерный препроцессор"
+
+msgid "GDScript Basics"
+msgstr "Основы GDScript"
+
+msgid "2D skeletons"
+msgstr "2D-скелеты"
+
+msgid "A factor applied to the all rotation in the limits."
+msgstr "Фактор, применяемый ко всем вращениям в пределах лимитов."
+
+msgid ""
+"A factor applied to the all rotation across axes orthogonal to the slider."
+msgstr ""
+"Фактор, применяемый ко всем вращениям вдоль осей, ортогональных слайдеру."
+
+msgid ""
+"The amount of damping that happens once the limit defined by [member "
+"linear_limit/lower_distance] and [member linear_limit/upper_distance] is "
+"surpassed."
+msgstr ""
+"Количество затухания, которое происходит после превышения предела, "
+"определенного [member linear_limit/lower_distance] и [member linear_limit/"
+"upper_distance]."
+
+msgid "A deformable 3D physics mesh."
+msgstr "Деформируемая 3D физическая сетка."
+
+msgid "SoftBody"
+msgstr "SoftBody"
+
+msgid "Returns local translation of a vertex in the surface array."
+msgstr "Возвращает локальное смещение вершины в массиве поверхности."
+
+msgid "Returns [code]true[/code] if vertex is set to pinned."
+msgstr ""
+"Возвращает [code]true[/code], если вершина установлена в закрепленное "
+"состояние."
+
+msgid ""
+"Sets the pinned state of a surface vertex. When set to [code]true[/code], the "
+"optional [param attachment_path] can define a [Node3D] the pinned vertex will "
+"be attached to."
+msgstr ""
+"Устанавливает состояние закрепления вершины поверхности. Когда установлено "
+"значение [code]true[/code], необязательный параметр [param attachment_path] "
+"может определить [Node3D], к которому будет прикреплена закрепленная вершина."
+
+msgid ""
+"The physics layers this SoftBody3D [b]is in[/b]. Collision objects can exist "
+"in one or more of 32 different layers. See also [member collision_mask].\n"
+"[b]Note:[/b] Object A can detect a contact with object B only if object B is "
+"in any of the layers that object A scans. See [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Collision layers "
+"and masks[/url] in the documentation for more information."
+msgstr ""
+"Физические слои, в которых находится данный SoftBody3D. Коллизионные объекты "
+"могут существовать в одном или нескольких из 32 различных слоев. См. также "
+"[member collision_mask].\n"
+"[b]Примечание:[/b] Объект A может обнаружить контакт с объектом B только в "
+"том случае, если объект B находится в любом из слоев, которые сканирует "
+"объект A. Дополнительную информацию см. в разделе [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Слои и маски "
+"столкновений.[/url] в документации."
+
+msgid ""
+"The physics layers this SoftBody3D [b]scans[/b]. Collision objects can scan "
+"one or more of 32 different layers. See also [member collision_layer].\n"
+"[b]Note:[/b] Object A can detect a contact with object B only if object B is "
+"in any of the layers that object A scans. See [url=$DOCS_URL/tutorials/"
+"physics/physics_introduction.html#collision-layers-and-masks]Collision layers "
+"and masks[/url] in the documentation for more information."
+msgstr ""
+"Слои физических объектов, которые сканирует SoftBody3D. Коллизионные объекты "
+"могут сканировать один или несколько из 32 различных слоев. Смотрите также "
+"[member collision_layer].\n"
+"Примечание: Объект A может обнаружить контакт с объектом B только если объект "
+"B находится в любом из слоев, которые сканирует объект A. Дополнительную "
+"информацию можно посмотреть в документации, перейдя по ссылке [url=$DOCS_URL/"
+"tutorials/physics/physics_introduction.html#collision-layers-and-"
+"masks]Collision layers and masks[/url]."
+
+msgid ""
+"Higher values will result in a stiffer body, while lower values will increase "
+"the body's ability to bend. The value can be between [code]0.0[/code] and "
+"[code]1.0[/code] (inclusive)."
+msgstr ""
+"Более высокие значения приведут к более жесткому телу, а более низкие "
+"значения повысят способность тела гнуться. Значение может быть в диапазоне от "
+"[code] 0.0 [/code] до [code] 1.0 [/code] (включительно)."
+
+msgid ""
+"[NodePath] to a [CollisionObject3D] this SoftBody3D should avoid clipping."
+msgstr ""
+"[NodePath] к [CollisionObject3D], из которого SoftBody3D должен избегать "
+"пересечения."
+
+msgid "If [code]true[/code], the [SoftBody3D] will respond to [RayCast3D]s."
+msgstr "Если [code]true[/code], [SoftBody3D] будет реагировать на [RayCast3D]."
+
+msgid ""
+"Increasing this value will improve the resulting simulation, but can affect "
+"performance. Use with care."
+msgstr ""
+"Увеличение этого значения улучшит результаты моделирования, но может повлиять "
+"на производительность. Используйте с осторожностью."
+
+msgid "The SoftBody3D's mass."
+msgstr "Масса SoftBody3D."
+
+msgid ""
+"When [member Node.process_mode] is set to [constant Node."
+"PROCESS_MODE_DISABLED], remove from the physics simulation to stop all "
+"physics interactions with this [SoftBody3D].\n"
+"Automatically re-added to the physics simulation when the [Node] is processed "
+"again."
+msgstr ""
+"Когда [member Node.process_mode] установлен в [constant Node."
+"PROCESS_MODE_DISABLED], объект [SoftBody3D] удаляется из физического "
+"моделирования, чтобы остановить все физические взаимодействия с ним.\n"
+"Автоматически добавляется обратно в физическое моделирование, когда [Node] "
+"обрабатывается снова."
+
+msgid "Class representing a spherical [PrimitiveMesh]."
+msgstr "Класс, представляющий собой сферическую [PrimitiveMesh]."
+
+msgid "Full height of the sphere."
+msgstr "Полная высота сферы."
+
+msgid ""
+"If [code]true[/code], a hemisphere is created rather than a full sphere.\n"
+"[b]Note:[/b] To get a regular hemisphere, the height and radius of the sphere "
+"must be equal."
+msgstr ""
+"Если [code]true[/code], создается полушарие вместо полной сферы.\n"
+"[b]Примечание:[/b] Чтобы получить обычное полушарие, высота и радиус сферы "
+"должны быть равны."
+
+msgid "Number of radial segments on the sphere."
+msgstr "Количество радиальных сегментов на сфере."
+
+msgid "Radius of sphere."
+msgstr "Радиус сферы."
+
+msgid "Number of segments along the height of the sphere."
+msgstr "Количество сегментов вдоль высоты сферы."
+
+msgid "Spherical shape for use with occlusion culling in [OccluderInstance3D]."
+msgstr ""
+"Сферическая форма для использования с отсечением окклюзии в "
+"[OccluderInstance3D]."
+
+msgid ""
+"[SphereOccluder3D] stores a sphere shape that can be used by the engine's "
+"occlusion culling system.\n"
+"See [OccluderInstance3D]'s documentation for instructions on setting up "
+"occlusion culling."
+msgstr ""
+"[SphereOccluder3D] хранит сферическую форму, которая может быть использована "
+"системой отсечения окклюзии движка.\n"
+"См. документацию [OccluderInstance3D] для инструкций по настройке отсечения "
+"окклюзии."
+
+msgid "The sphere's radius in 3D units."
+msgstr "Радиус сферы в 3D единицах."
+
+msgid "A 3D sphere shape used for physics collision."
+msgstr "Форма 3D сферы, используемая для физических столкновений."
+
+msgid ""
+"A 3D sphere shape, intended for use in physics. Usually used to provide a "
+"shape for a [CollisionShape3D].\n"
+"[b]Performance:[/b] [SphereShape3D] is fast to check collisions against. It "
+"is faster than [BoxShape3D], [CapsuleShape3D], and [CylinderShape3D]."
+msgstr ""
+"Форма 3D сферы, предназначенная для использования в физике. Обычно "
+"используется для предоставления формы для [CollisionShape3D].\n"
+"[b]Производительность:[/b] [SphereShape3D] быстро проверяет коллизии. Он "
+"быстрее, чем [BoxShape3D], [CapsuleShape3D] и [CylinderShape3D]."
+
+msgid "The sphere's radius. The shape's diameter is double the radius."
+msgstr "Радиус сферы. Диаметр формы вдвое больше радиуса."
+
+msgid "Applies the current value of this [SpinBox]."
+msgstr "Применяет текущее значение [SpinBox]."
+
+msgid ""
+"Returns the [LineEdit] instance from this [SpinBox]. You can use it to access "
+"properties and methods of [LineEdit].\n"
+"[b]Warning:[/b] This is a required internal node, removing and freeing it may "
+"cause a crash. If you wish to hide it or any of its children, use their "
+"[member CanvasItem.visible] property."
+msgstr ""
+"Возвращает экземпляр [LineEdit] из этого [SpinBox]. Вы можете использовать "
+"его для доступа к свойствам и методам [LineEdit].\n"
+"[b]Предупреждение:[/b] Это обязательный внутренний узел, удаление и "
+"освобождение которого может привести к сбою. Если вы хотите скрыть его или "
+"любого из его дочерних элементов, используйте свойство [member CanvasItem."
+"visible]."
+
+msgid "Changes the alignment of the underlying [LineEdit]."
+msgstr "Изменяет выравнивание базового [LineEdit]."
+
+msgid ""
+"If [code]true[/code], the [SpinBox] will be editable. Otherwise, it will be "
+"read only."
+msgstr ""
+"Если [code]true[/code], [SpinBox] будет доступен для редактирования. В "
+"противном случае он будет только для чтения."
+
+msgid ""
+"If [code]true[/code], the [SpinBox] will select the whole text when the "
+"[LineEdit] gains focus. Clicking the up and down arrows won't trigger this "
+"behavior."
+msgstr ""
+"Если [code]true[/code], [SpinBox] будет выбирать весь текст, когда [LineEdit] "
+"получает фокус. Нажатие на кнопки вверх и вниз не вызовет это поведение."
+
+msgid ""
+"Sets the value of the [Range] for this [SpinBox] when the [LineEdit] text is "
+"[i]changed[/i] instead of [i]submitted[/i]. See [signal LineEdit."
+"text_changed] and [signal LineEdit.text_submitted]."
+msgstr ""
+"Устанавливает значение [Range] для этого [SpinBox], когда текст [LineEdit] "
+"[i]изменяется[/i] вместо [i]представления[/i]. См. [signal LineEdit."
+"text_changed] и [signal LineEdit.text_submitted]."
+
+msgid ""
+"A container that splits two child controls horizontally or vertically and "
+"provides a grabber for adjusting the split ratio."
+msgstr ""
+"Контейнер, который разбивает два дочерних элемента по горизонтали или "
+"вертикали и предоставляет захват для настройки отношения разделения."
+
+msgid "General-purpose sprite node."
+msgstr "Универсальный узел спрайта."
+
+msgid "If [code]true[/code], texture will be centered."
+msgstr "Если [code]true[/code], текстура будет центрирована."
+
+msgid "Disconnects from host."
+msgstr "Отключение от хоста."
+
+msgid "GDScript format strings"
+msgstr "Форматирование строки GDScript"
+
+msgid "The line's color."
+msgstr "Цвет линии."
+
+msgid "Using Viewports"
+msgstr "Использовать Viewports"
+
+msgid "Screen Capture Demo"
+msgstr "Демо-версия захвата экрана"
+
+msgid "Clears all tabs."
+msgstr "Очищает все вкладки."
+
+msgid "A TCP server."
+msgstr "TCP-сервер."
+
+msgid "Stops listening."
+msgstr "Перестает слушать."
+
+msgid "Perform redo operation."
+msgstr "Выполните операцию Вперёд."
+
+msgid "Perform undo operation."
+msgstr "Выполните операцию Назад."
+
+msgid "A typing action."
+msgstr "Действие ввода текста."
+
+msgid "Step (in pixels) used to approximate Bézier curves."
+msgstr "Шаг (в пикселях), используемый для аппроксимации кривых Безье."
+
+msgid "The size of one pixel's width on the text to scale it in 3D."
+msgstr "Размер ширины одного пикселя текста для его масштабирования в 3D."
+
+msgid "Removes dropcap."
+msgstr "Удаляет начальную букву капитель (dropcap)."
+
+msgid "Paragraph horizontal alignment."
+msgstr "Горизонтальное выравнивание абзаца."
+
+msgid "Paragraph width."
+msgstr "Ширина абзаца."
+
+msgid "Autowrap is disabled."
+msgstr "Автообертывание отключено."
+
+msgid "Grapheme is whitespace."
+msgstr "Графема - пробел."
+
+msgid "Grapheme is kashida."
+msgstr "Графема - кашида."
+
+msgid "Font is bold."
+msgstr "Жирный шрифт."
+
+msgid "GUI skinning"
+msgstr "GUI скины"
+
+msgid "Using Tilemaps"
+msgstr "Использование тайловых карт"
+
+msgid "2D Hexagonal Demo"
+msgstr "2D демонстрация шестиугольных форм"
+
+msgid "Clears all cells."
+msgstr "Очистка всех ячеек."
+
+msgid "The tile shape."
+msgstr "Форма тайла."
+
+msgid "Rectangular tile shape."
+msgstr "Четырёхугольный тайл."
+
+msgid "Hexagonal tile shape."
+msgstr "Шестиугольный тайл."
+
+msgid "A countdown timer."
+msgstr "Обратный таймер."
+
+msgid "Stops the timer."
+msgstr "Остановка таймера."
+
+msgid "The button's bitmask."
+msgstr "Битмаска кнопки."
+
+msgid "The button's shape."
+msgstr "Форма кнопки."
+
+msgid "Always visible."
+msgstr "Всегда видно."
+
+msgid "Internationalizing games"
+msgstr "Интернационализация игр"
+
+msgid "Locales"
+msgstr "Локали"
+
+msgid "Erases a message."
+msgstr "Стереть сообщение."
+
+msgid "Internal mesh type."
+msgstr "Тип внутренней сетки."
+
+msgid "Inconsistent parameters."
+msgstr "Несоответствующие параметры."
+
+msgid "The action failed."
+msgstr "Действие не удалось."
+
+msgid "Invalid gateway."
+msgstr "Неверный шлюз."
+
+msgid "Invalid port."
+msgstr "Неверный порт."
+
+msgid "Invalid protocol."
+msgstr "Неверный протокол."
+
+msgid "Invalid duration."
+msgstr "Неверная продолжительность."
+
+msgid "Invalid arguments."
+msgstr "Недопустимые аргументы."
+
+msgid "Invalid response."
+msgstr "Неверный ответ."
+
+msgid "Invalid parameter."
+msgstr "Недопустимый параметр."
+
+msgid "HTTP error."
+msgstr "Ошибка HTTP."
+
+msgid "Socket error."
+msgstr "Ошибка сокета."
+
+msgid "Error allocating memory."
+msgstr "Ошибка выделения памяти."
+
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
+
+msgid "IDG control URL."
+msgstr "IDG контрольный URL."
+
+msgid "IGD service type."
+msgstr "Тип службы IGD."
+
+msgid "Service type."
+msgstr "Тип услуг."
+
+msgid "OK."
+msgstr "OK."
+
+msgid "Empty HTTP response."
+msgstr "Пустой HTTP-ответ."
+
+msgid "Disconnected."
+msgstr "Отключен."
+
+msgid "Unknown device."
+msgstr "Неизвестное устройство."
+
+msgid "Invalid control."
+msgstr "Неверный контроль."
+
+msgid "Memory allocation error."
+msgstr "Ошибка распределения памяти."
+
+msgid "Variant class introduction"
+msgstr "Введение вариативных классов"
+
+msgid ""
+"Returns a new vector with all components in absolute values (i.e. positive)."
+msgstr ""
+"Возвращает новый вектор в котором все компоненты будут абсолютными значениями "
+"(т.е положительными)."
+
+msgid ""
+"Returns the squared length (squared magnitude) of this vector.\n"
+"This method runs faster than [method length], so prefer it if you need to "
+"compare vectors or need the squared distance for some formula."
+msgstr ""
+"Возвращает длину данного вектора в квадрате.\n"
+"Этот метод выполняется быстрее, чем [method length], поэтому он "
+"предпочтительнее если вам нужно сравнить векторы или нужно расстояние в "
+"квадрате для какой-либо формулы."
+
+msgid ""
+"The vector's X component. Also accessible by using the index position [code]"
+"[0][/code]."
+msgstr "X компонент вектора. Может быть доступен через индекс [code][0][/code]."
+
+msgid ""
+"The vector's Y component. Also accessible by using the index position [code]"
+"[1][/code]."
+msgstr "Y компонент вектора. Может быть доступен через индекс [code][1][/code]."
+
+msgid "Zero vector, a vector with all components set to [code]0[/code]."
+msgstr "Нулевой вектор — вектор у которого все координаты равны [code]0[/code]."
+
+msgid "One vector, a vector with all components set to [code]1[/code]."
+msgstr "Вектор-единица — вектор у которого все координаты равны [code]1[/code]."
+
+msgid ""
+"The vector's Z component. Also accessible by using the index position [code]"
+"[2][/code]."
+msgstr ""
+"Z компонент вектора. Также может быть доступен по индексу [code][2][/code]."
+
+msgid "Up unit vector."
+msgstr "Верхний единичный вектор."
+
+msgid "Down unit vector."
+msgstr "Нижний единичный вектор."
+
+msgid "Audio volume in dB."
+msgstr "Громкость звука в дБ."
+
+msgid "A floating-point scalar."
+msgstr "Скаляр с плавающей запятой."
+
+msgid "An integer scalar."
+msgstr "Целочисленный скаляр."
+
+msgid "Converts HSV vector to RGB equivalent."
+msgstr "Конвертирует вектор HSV в RGB эквивалент."
+
+msgid "Converts RGB vector to HSV equivalent."
+msgstr "Конвертирует вектор RGB в HSV эквивалент."
+
+msgid "A boolean type."
+msgstr "Логический тип."
+
+msgid "The source texture."
+msgstr "Исходная текстура."
+
+msgid "Visual Shader plugins"
+msgstr "Плагины визуальных шейдеров"
+
+msgid ""
+"The distance fade effect fades out each pixel based on its distance to "
+"another object."
+msgstr ""
+"Эффект затухания от расстояния. Затухает каждый пиксель в зависимости от "
+"расстояния до другого объекта."
+
+msgid "No hint used."
+msgstr "Нет подсказки."
+
+msgid ""
+"Returns falloff based on the dot product of surface normal and view direction "
+"of camera (pass associated inputs to it)."
+msgstr ""
+"Возвращает падение на основе точечного произведения нормальной поверхности и "
+"направления обзора камеры (пропустите соответствующие входы к ней)."
+
+msgid "Shading reference index"
+msgstr "Индекс опорного затенения"
+
+msgid ""
+"The proximity fade effect fades out each pixel based on its distance to "
+"another object."
+msgstr ""
+"Эффект затухания сближения. Затухает каждый пиксель в зависимости от "
+"расстояния до другого объекта."
+
+msgid "Returns the opposite value of the parameter."
+msgstr "Возвращает значение, противоположное параметру."
+
+msgid "Returns [code]1/vector[/code]."
+msgstr "Возвращает [code]1/вектор[/code]."
+
+msgid "Returns the absolute value of the parameter."
+msgstr "Возвращает абсолютное значение параметра."
+
+msgid "Returns the arc-cosine of the parameter."
+msgstr "Возвращает арккосинус параметра."
+
+msgid "Returns the inverse hyperbolic cosine of the parameter."
+msgstr "Возвращает обратный гиперболический косинус параметра."
+
+msgid "Returns the arc-sine of the parameter."
+msgstr "Возвращает арксинус параметра."
+
+msgid "Returns the inverse hyperbolic sine of the parameter."
+msgstr "Возвращает обратный гиперболический синус параметра."
+
+msgid "Returns the arc-tangent of the parameter."
+msgstr "Возвращает арктангенс параметра."
+
+msgid "Returns the inverse hyperbolic tangent of the parameter."
+msgstr "Возвращает обратный гиперболический тангенс параметра."
+
+msgid ""
+"Finds the nearest integer that is greater than or equal to the parameter."
+msgstr "Находит ближайшее целое, которое больше или равно параметра."
+
+msgid "Returns the cosine of the parameter."
+msgstr "Возвращает косинус параметра."
+
+msgid "Returns the hyperbolic cosine of the parameter."
+msgstr "Возвращает гиперболический косинус параметра."
+
+msgid "Converts a quantity in radians to degrees."
+msgstr "Переводит значение из радиан в градусы."
+
+msgid "Base-e Exponential."
+msgstr "Экспонента с основанием e."
+
+msgid "Base-2 Exponential."
+msgstr "Экспонента с основанием 2."
+
+msgid "Finds the nearest integer less than or equal to the parameter."
+msgstr "Находит ближайшее целое, меньшее или равное аргументу."
+
+msgid "Computes the fractional part of the argument."
+msgstr "Вычисляет дробную часть аргумента."
+
+msgid "Returns the inverse of the square root of the parameter."
+msgstr "Возвращает обратный квадратный корень из аргумента."
+
+msgid "Natural logarithm."
+msgstr "Натуральный логарифм."
+
+msgid "Base-2 logarithm."
+msgstr "Логарифм по основанию 2."
+
+msgid "Converts a quantity in degrees to radians."
+msgstr "Переводит значение из градусов в радианы."
+
+msgid "Finds the nearest integer to the parameter."
+msgstr "Находит ближайшее к параметру целое число."
+
+msgid "Finds the nearest even integer to the parameter."
+msgstr "Находит ближайшее чётное число к параметру."
+
+msgid "Returns the sine of the parameter."
+msgstr "Возвращает синус параметра."
+
+msgid "Returns the hyperbolic sine of the parameter."
+msgstr "Возвращает гиперболический синус параметра."
+
+msgid "Returns the square root of the parameter."
+msgstr "Возвращает квадратный корень из параметра."
+
+msgid "Returns the tangent of the parameter."
+msgstr "Возвращает тангенс параметра."
+
+msgid "Returns the hyperbolic tangent of the parameter."
+msgstr "Возвращает гиперболический тангенс параметра."
+
+msgid "Adds two vectors."
+msgstr "Складывает два вектора."
+
+msgid "Subtracts a vector from a vector."
+msgstr "Вычитает из вектора вектор."
+
+msgid "Multiplies two vectors."
+msgstr "Перемножает два вектора."
+
+msgid "Divides vector by vector."
+msgstr "Делит вектор на вектор."
+
+msgid "Returns the remainder of the two vectors."
+msgstr "Возвращает остаток от двух векторов."
+
+msgid ""
+"Returns the value of the first parameter raised to the power of the second, "
+"for each component of the vectors."
+msgstr ""
+"Возвращает значение первого параметра, возведенного в степень второго, для "
+"каждого компонента векторов."
+
+msgid "Returns the greater of two values, for each component of the vectors."
+msgstr ""
+"Возвращает наибольшее из двух значений, для каждого компонента векторов."
+
+msgid "Returns the lesser of two values, for each component of the vectors."
+msgstr ""
+"Возвращает наименьшее из двух значений, для каждого компонента векторов."
+
+msgid "Calculates the cross product of two vectors."
+msgstr "Вычисляет векторное произведение двух векторов."
+
+msgid "Returns the arc-tangent of the parameters."
+msgstr "Возвращает арктангенс параметров."
+
+msgid "Use 256 subdivisions."
+msgstr "Использовать 256 делений."
+
+msgid "Reserved, but not used for now."
+msgstr "Зарезервировано, в данный момент не используется."
+
+msgid "A WebSocket connection."
+msgstr "Соединение WebSocket."
+
+msgid ""
+"Returns the default font from the first matching [Theme] in the tree if that "
+"[Theme] has a valid [member Theme.default_font] value.\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает значение по умолчанию для font из первого подходящего [Theme] в "
+"дереве, если [Theme] имеет допустимое значение [member Theme.default].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns the default font size value from the first matching [Theme] in the "
+"tree if that [Theme] has a valid [member Theme.default_font_size] value.\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает значение по умолчанию для font size из первого подходящего [Theme] "
+"в дереве, если [Theme] имеет допустимое значение [member Theme."
+"default_font_size].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns a [Font] from the first matching [Theme] in the tree if that [Theme] "
+"has a font item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [Font] из первого подходящего [Theme] в дереве, если в [Theme] "
+"есть элемент font с указанными [param name] и [param theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns a font size from the first matching [Theme] in the tree if that "
+"[Theme] has a font size item with the specified [param name] and [param "
+"theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает font size из первого подходящего [Theme] в дереве, если в [Theme] "
+"есть элемент font size с указанными [param name] и [param theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns an icon from the first matching [Theme] in the tree if that [Theme] "
+"has an icon item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает icon из первого подходящего [Theme] в дереве, если в [Theme] есть "
+"элемент icon с указанными [param name] и [param theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns a [StyleBox] from the first matching [Theme] in the tree if that "
+"[Theme] has a stylebox item with the specified [param name] and [param "
+"theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [StyleBox] из первого подходящего [Theme] в дереве, если в [Theme] "
+"есть элемент stylebox с указанными [param name] и [param theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a color item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующий [Theme], в "
+"котором есть элемент color с указанными [param name] и [param theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a constant item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующий [Theme], в "
+"котором есть элемент constant с указанными [param name] и [param "
+"theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a font item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующий [Theme], в "
+"котором есть элемент font с указанными [param name] и [param theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a font size item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующий [Theme], в "
+"котором есть элемент font size с указанными [param name] и [param "
+"theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"an icon item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующий [Theme], в "
+"котором есть элемент icon с указанными [param name] и [param theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"Returns [code]true[/code] if there is a matching [Theme] in the tree that has "
+"a stylebox item with the specified [param name] and [param theme_type].\n"
+"See [method Control.get_theme_color] for details."
+msgstr ""
+"Возвращает [code]true[/code], если в дереве есть соответствующий [Theme], в "
+"котором есть элемент stylebox с указанными [param name] и [param "
+"theme_type].\n"
+"Подробности смотрите в [method Control.get_theme_color]."
+
+msgid ""
+"If [code]true[/code], the [Window] contents is expanded to the full size of "
+"the window, window title bar is transparent.\n"
+"[b]Note:[/b] This property is implemented only on macOS.\n"
+"[b]Note:[/b] This property only works with native windows."
+msgstr ""
+"Если [code]true[/code], содержимое [Window] расширяется до полного размера "
+"окна, строка заголовка окна становится прозрачной.\n"
+"[b]Примечание:[/b] Это свойство реализовано только в macOS.\n"
+"[b] Примечание:[/b] Это свойство работает только в Windows."
+
+msgid ""
+"If [code]true[/code], all mouse events will be passed to the underlying "
+"window of the same application. See also [member mouse_passthrough_polygon].\n"
+"[b]Note:[/b] This property is implemented on Linux (X11), macOS and Windows.\n"
+"[b]Note:[/b] This property only works with native windows."
+msgstr ""
+"Если [code]true[/code], все события, связанные с мышью, будут передаваться в "
+"основное окно того же приложения. Смотрите также [member "
+"mouse_passthrough_polygon].\n"
+"[b]Примечание:[/b] Это свойство реализовано в Linux (X11), macOS и Windows.\n"
+"[b] Примечание:[/b] Это свойство работает только в операционной системе "
+"Windows."
+
+msgid ""
+"Emitted when the [Window] is currently focused and receives any input, "
+"passing the received event as an argument. The event's position, if present, "
+"is in the embedder's coordinate system."
+msgstr ""
+"Генерируется, когда [Window] в данный момент сфокусировано и принимает какие-"
+"либо входные данные, передавая полученное событие в качестве аргумента. "
+"Положение события, если оно присутствует, находится в системе координат "
+"внедренца."
+
+msgid ""
+"Emitted when [Window]'s visibility changes, right before [signal "
+"visibility_changed]."
+msgstr ""
+"Испускается при изменении видимости [Window], непосредственно перед [signal "
+"visibility_changed]."
+
+msgid ""
+"Sent when the node needs to refresh its theme items. This happens in one of "
+"the following cases:\n"
+"- The [member theme] property is changed on this node or any of its "
+"ancestors.\n"
+"- The [member theme_type_variation] property is changed on this node.\n"
+"- The node enters the scene tree.\n"
+"[b]Note:[/b] As an optimization, this notification won't be sent from changes "
+"that occur while this node is outside of the scene tree. Instead, all of the "
+"theme item updates can be applied at once when the node enters the scene tree."
+msgstr ""
+"Отправляется, когда узлу необходимо обновить элементы своей темы. Это "
+"происходит в одном из следующих случаев:\n"
+"- Свойство [member theme] изменено на этом узле или любом из его предков.\n"
+"- Свойство [member theme_type_variation] изменено на этом узле.\n"
+"- Узел входит в дерево сцен.\n"
+"[b]Примечание:[/b] В качестве оптимизации это уведомление не будет отправлено "
+"из-за изменений, которые происходят, когда этот узел находится за пределами "
+"дерева сцен. Вместо этого все обновления элементов темы могут быть применены "
+"сразу, когда узел входит в дерево сцены."
+
+msgid ""
+"The window can't be resized by dragging its resize grip. It's still possible "
+"to resize the window using [member size]. This flag is ignored for full "
+"screen windows. Set with [member unresizable]."
+msgstr ""
+"Размер окна нельзя изменить, перетаскивая его ручку изменения размера. По-"
+"прежнему можно изменить размер окна, используя [member size]. Этот флаг "
+"игнорируется для полноэкранных окон. Устанавливается с помощью [member "
+"unresizable]."
+
+msgid ""
+"The window do not have native title bar and other decorations. This flag is "
+"ignored for full-screen windows. Set with [member borderless]."
+msgstr ""
+"Окно не имеет встроенной строки заголовка и другого декора. Этот флаг "
+"игнорируется для полноэкранных окон. Устанавливается с помощью [member "
+"borderless]."
+
+msgid ""
+"The window is floating on top of all other windows. This flag is ignored for "
+"full-screen windows. Set with [member always_on_top]."
+msgstr ""
+"Окно плавает поверх всех остальных окон. Этот флаг игнорируется для "
+"полноэкранных окон. Устанавливается с помощью [member always_on_top]."
+
+msgid ""
+"The window background can be transparent. Set with [member transparent].\n"
+"[b]Note:[/b] This flag has no effect if either [member ProjectSettings."
+"display/window/per_pixel_transparency/allowed], or the window's [member "
+"Viewport.transparent_bg] is set to [code]false[/code]."
+msgstr ""
+"Фон окна может быть прозрачным. Задается с помощью [member transparent].\n"
+"[b]Примечание:[/b] Этот флаг не действует, если [member ProjectSettings."
+"display/window/per_pixel_transparency/allowed], либо для окна [member "
+"Viewport.transparent_bg] установлено значение [code]false[/code]."
+
+msgid ""
+"The window can't be focused. No-focus window will ignore all input, except "
+"mouse clicks. Set with [member unfocusable]."
+msgstr ""
+"Окно не может быть сфокусировано. Окно без фокуса будет игнорировать все "
+"вводимые данные, кроме щелчков мыши. Задано с помощью [member unfocusable]."
+
+msgid ""
+"Window is part of menu or [OptionButton] dropdown. This flag can't be changed "
+"when the window is visible. An active popup window will exclusively receive "
+"all input, without stealing focus from its parent. Popup windows are "
+"automatically closed when uses click outside it, or when an application is "
+"switched. Popup window must have transient parent set (see [member "
+"transient]).\n"
+"[b]Note:[/b] This flag has no effect in embedded windows (unless said window "
+"is a [Popup])."
+msgstr ""
+"Window является частью выпадающего списка меню или кнопки выбора. Этот флаг "
+"нельзя изменить, когда окно видно. Активное всплывающее окно будет получать "
+"все вводимые данные единолично, не отвлекая внимание от своего родительского "
+"элемента. Всплывающие окна автоматически закрываются, когда пользователь "
+"нажимает за их пределами или когда приложение переключается. У всплывающего "
+"окна должен быть установлен временный родительский набор (см. переходный "
+"элемент).\n"
+"[b]Примечание:[/b] Этот флаг не действует во встроенных окнах (если только "
+"указанное окно не является всплывающим)."
+
+msgid ""
+"Window content is expanded to the full size of the window. Unlike borderless "
+"window, the frame is left intact and can be used to resize the window, title "
+"bar is transparent, but have minimize/maximize/close buttons. Set with "
+"[member extend_to_title].\n"
+"[b]Note:[/b] This flag is implemented only on macOS.\n"
+"[b]Note:[/b] This flag has no effect in embedded windows."
+msgstr ""
+"Содержимое окна расширяется до полного размера окна. В отличие от окна без "
+"полей, рамка остается нетронутой и может использоваться для изменения размера "
+"окна, строка заголовка прозрачна, но имеет кнопки сворачивания/максимизации/"
+"закрытия. Устанавливается с помощью [элемент extend_to_title].\n"
+"[b]Примечание:[/b] Этот флаг реализован только в macOS.\n"
+"[b] Примечание:[/b] Этот флаг не действует во встроенной Windows."
+
+msgid ""
+"All mouse events are passed to the underlying window of the same "
+"application.\n"
+"[b]Note:[/b] This flag has no effect in embedded windows."
+msgstr ""
+"Все события мыши передаются в базовое окно того же приложения.\n"
+"[b]Примечание:[/b] Этот флаг не действует во встроенных окнах."
+
+msgid "The content will not be scaled to match the [Window]'s size."
+msgstr "Содержимое не будет масштабироваться в соответствии с размером [окна]."
+
+msgid ""
+"The content will be rendered at the target size. This is more performance-"
+"expensive than [constant CONTENT_SCALE_MODE_VIEWPORT], but provides better "
+"results."
+msgstr ""
+"Содержимое будет отображаться в целевом размере. Это более затратно по "
+"производительности, чем [constant CONTENT_SCALE_MODE_VIEWPORT], но "
+"обеспечивает лучшие результаты."
+
+msgid ""
+"The content will be rendered at the base size and then scaled to the target "
+"size. More performant than [constant CONTENT_SCALE_MODE_CANVAS_ITEMS], but "
+"results in pixelated image."
+msgstr ""
+"Содержимое будет отображено в базовом размере, а затем масштабировано до "
+"целевого размера. Более производительно, чем [constant "
+"CONTENT_SCALE_MODE_CANVAS_ITEMS], но приводит к пикселизации изображения."
+
+msgid ""
+"The aspect will be ignored. Scaling will simply stretch the content to fit "
+"the target size."
+msgstr ""
+"Аспект будет проигнорирован. Масштабирование просто растянет содержимое в "
+"соответствии с целевым размером."
+
+msgid ""
+"The content's aspect will be preserved. If the target size has different "
+"aspect from the base one, the image will be centered and black bars will "
+"appear on left and right sides."
+msgstr ""
+"Формат содержимого будет сохранен. Если целевой размер отличается от "
+"базового, изображение будет отцентрировано, а с левой и правой сторон "
+"появятся черные полосы."
+
+msgid ""
+"The content can be expanded vertically. Scaling horizontally will result in "
+"keeping the width ratio and then black bars on left and right sides."
+msgstr ""
+"Содержимое можно развернуть по вертикали. Масштабирование по горизонтали "
+"приведет к сохранению соотношения ширины, а затем черных полос с левой и "
+"правой сторон."
+
+msgid ""
+"The content can be expanded horizontally. Scaling vertically will result in "
+"keeping the height ratio and then black bars on top and bottom sides."
+msgstr ""
+"Содержимое можно развернуть по горизонтали. Масштабирование по вертикали "
+"приведет к сохранению соотношения высот, а затем черных полос сверху и снизу."
+
+msgid ""
+"The content's aspect will be preserved. If the target size has different "
+"aspect from the base one, the content will stay in the top-left corner and "
+"add an extra visible area in the stretched space."
+msgstr ""
+"Формат содержимого будет сохранен. Если целевой размер отличается от "
+"базового, содержимое останется в верхнем левом углу и добавит дополнительную "
+"видимую область в растянутом пространстве."
+
+msgid ""
+"The content will be stretched according to a fractional factor. This fills "
+"all the space available in the window, but allows \"pixel wobble\" to occur "
+"due to uneven pixel scaling."
+msgstr ""
+"Содержимое будет растянуто в соответствии с дробным коэффициентом. Это "
+"заполняет все доступное пространство в окне, но допускает \"колебание "
+"пикселя\" из-за неравномерного масштабирования пикселей."
+
+msgid ""
+"The content will be stretched only according to an integer factor, preserving "
+"sharp pixels. This may leave a black background visible on the window's edges "
+"depending on the window size."
+msgstr ""
+"Содержимое будет растянуто только в соответствии с целым коэффициентом, "
+"сохраняя четкие пиксели. В зависимости от размера окна по краям окна может "
+"быть виден черный фон."
+
+msgid ""
+"Automatic layout direction, determined from the parent window layout "
+"direction."
+msgstr ""
+"Автоматическое направление компоновки, определяемое по направлению компоновки "
+"родительского окна."
+
+msgid "Initial window position is determined by [member position]."
+msgstr "Начальное положение окна определяется [положением элемента]."
+
+msgid "Initial window position is the center of [member current_screen] screen."
+msgstr "Начальная позиция окна - это центр экрана [member current_screen]."
+
+msgid ""
+"Initial window position is the center of the screen containing the mouse "
+"pointer."
+msgstr ""
+"Начальным положением окна является центр экрана, на котором находится "
+"указатель мыши."
+
+msgid ""
+"Initial window position is the center of the screen containing the window "
+"with the keyboard focus."
+msgstr ""
+"Начальное положение окна - это центр экрана, содержащий окно с фокусом "
+"клавиатуры."
+
+msgid ""
+"Default environment properties for the entire scene (post-processing effects, "
+"lighting and background settings)."
+msgstr ""
+"Свойства среды по умолчанию для всей сцены (эффекты постобработки, настройки "
+"освещения и фона)."
+
+msgid ""
+"The [Environment] resource used by this [WorldEnvironment], defining the "
+"default properties."
+msgstr ""
+"Ресурс [Environment], используемый этим [WorldEnvironment], определяющий "
+"свойства по умолчанию."
+
+msgid ""
+"Returns [code]true[/code] if the currently parsed element is empty, e.g. "
+"[code]<element />[/code]."
+msgstr ""
+"Возвращает [code]true[/code], если текущий обработанный элемент пуст, "
+"например [code]<element />[/code]."
+
+msgid "There's no node (no file or buffer opened)."
+msgstr "Нет узла (файл или буфер не открыты)."
+
+msgid "XR documentation index"
+msgstr "Индекс документации XR"
+
+msgid "Stops passthrough."
+msgstr "Остановить прохождение."
+
+msgid "No XR capabilities."
+msgstr "Отсутствуют возможности XR."
+
+msgid "Uninitialize the interface."
+msgstr "Разблокировать интерфейс."
+
+msgid "A tracked object."
+msgstr "Отслеживаемый объект."
+
+msgid "Returns the primary interface's transformation."
+msgstr "Возвращает преобразование основного интерфейса."
+
+msgid ""
+"Returns the interface registered at the given [param idx] index in the list "
+"of interfaces."
+msgstr ""
+"Возвращает интерфейс, зарегистрированный по заданному [param idx] индексу в "
+"списке интерфейсов."
+
+msgid ""
+"Returns the number of interfaces currently registered with the AR/VR server. "
+"If your project supports multiple AR/VR platforms, you can look through the "
+"available interface, and either present the user with a selection or simply "
+"try to initialize each interface and use the first one that returns "
+"[code]true[/code]."
+msgstr ""
+"Возвращает количество интерфейсов, зарегистрированных в настоящее время на AR/"
+"VR-сервере. Если ваш проект поддерживает несколько AR/VR-платформ, вы можете "
+"просмотреть все доступные интерфейсы и либо предложить пользователю выбор, "
+"либо просто попытаться инициализировать каждый интерфейс и использовать "
+"первый, который вернет [code]true[/code]."
+
+msgid ""
+"Returns a list of available interfaces the ID and name of each interface."
+msgstr ""
+"Возвращает список доступных интерфейсов с указанием идентификатора и названия "
+"каждого интерфейса."
+
+msgid ""
+"Returns the reference frame transform. Mostly used internally and exposed for "
+"GDExtension build interfaces."
+msgstr ""
+"Возвращает преобразование системы отсчета. В основном используется для "
+"внутренних целей и используется для интерфейсов сборки GDExtension."
+
+msgid "Returns a dictionary of trackers for [param tracker_types]."
+msgstr "Возвращает словарь трекеров для [param tracker_types]."
+
+msgid "Removes this [param interface]."
+msgstr "Удаляет этот [param interface]."
+
+msgid "The primary [XRInterface] currently bound to the [XRServer]."
+msgstr "Основной [XRInterface], связанный в данный момент с [XRServer]."
+
+msgid ""
+"The current origin of our tracking space in the virtual world. This is used "
+"by the renderer to properly position the camera with new tracking data.\n"
+"[b]Note:[/b] This property is managed by the current [XROrigin3D] node. It is "
+"exposed for access from GDExtensions."
+msgstr ""
+"Текущее начало пространства отслеживания в виртуальном мире. Оно используется "
+"рендерером для правильного позиционирования камеры с новыми данными "
+"отслеживания.\n"
+"[b]Примечание:[/b] Это свойство управляется текущим узлом [XROrigin3D]. Оно "
+"открыто для доступа из GDExtensions."
+
+msgid ""
+"The scale of the game world compared to the real world. By default, most AR/"
+"VR platforms assume that 1 game unit corresponds to 1 real world meter."
+msgstr ""
+"Масштаб игрового мира по сравнению с реальным. По умолчанию, большинство AR/"
+"VR-платформ считают, что 1 игровая единица соответствует 1 метру реального "
+"мира."
+
+msgid ""
+"Emitted when a new tracker has been added. If you don't use a fixed number of "
+"controllers or if you're using [XRAnchor3D]s for an AR solution, it is "
+"important to react to this signal to add the appropriate [XRController3D] or "
+"[XRAnchor3D] nodes related to this new tracker."
+msgstr ""
+"Генерируется при добавлении нового трекера. Если вы не используете "
+"фиксированное количество контроллеров или используете якоря [XRAnchor3D] для "
+"AR-решения, важно отреагировать на этот сигнал, чтобы добавить "
+"соответствующие узлы [XRController3D] или [XRAnchor3D], относящиеся к этому "
+"новому трекеру."
+
+msgid ""
+"Emitted when a tracker is removed. You should remove any [XRController3D] or "
+"[XRAnchor3D] points if applicable. This is not mandatory, the nodes simply "
+"become inactive and will be made active again when a new tracker becomes "
+"available (i.e. a new controller is switched on that takes the place of the "
+"previous one)."
+msgstr ""
+"Генерируется при удалении трекера. Вам следует удалить все точки "
+"[XRController3D] или [XRAnchor3D], если это применимо. Это не обязательно, "
+"узлы просто становятся неактивными и будут снова активны, когда появится "
+"новый трекер (т. е. включится новый контроллер, который заменит предыдущий)."
+
+msgid ""
+"Emitted when an existing tracker has been updated. This can happen if the "
+"user switches controllers."
+msgstr ""
+"Генерируется при обновлении существующего трекера. Это может произойти, если "
+"пользователь переключит контроллеры."
+
+msgid ""
+"The tracker tracks the location of the players head. This is usually a "
+"location centered between the players eyes. Note that for handheld AR devices "
+"this can be the current location of the device."
+msgstr ""
+"Трекер отслеживает положение головы игрока. Обычно это место, расположенное в "
+"центре между глазами игрока. Обратите внимание, что для портативных AR-"
+"устройств это может быть текущее местоположение устройства."
+
+msgid "The tracker tracks the location of a controller."
+msgstr "Трекер отслеживает местоположение контроллера."
+
+msgid "The tracker tracks the location of a base station."
+msgstr "Трекер отслеживает местоположение базовой станции."
+
+msgid "The tracker tracks the location and size of an AR anchor."
+msgstr "Трекер отслеживает местоположение и размер AR-якоря."
+
+msgid "The tracker tracks the location and joints of a hand."
+msgstr "Трекер отслеживает местоположение и суставы руки."
+
+msgid "The tracker tracks the location and joints of a body."
+msgstr "Трекер отслеживает местоположение и суставы тела."
+
+msgid "The tracker tracks the expressions of a face."
+msgstr "Трекер отслеживает выражение лица."
+
+msgid "Used internally to filter trackers of any known type."
+msgstr "Используется для внутренней фильтрации трекеров любого известного типа."
+
+msgid "Used internally if we haven't set the tracker type yet."
+msgstr "Используется, если мы еще не установили тип трекера."
+
+msgid "Used internally to select all trackers."
+msgstr "Используется для выбора всех трекеров."
+
+msgid ""
+"Fully reset the orientation of the HMD. Regardless of what direction the user "
+"is looking to in the real world. The user will look dead ahead in the virtual "
+"world."
+msgstr ""
+"Полностью сбрасывает ориентацию HMD. Независимо от того, в какую сторону "
+"смотрит пользователь в реальном мире. В виртуальном мире пользователь будет "
+"смотреть вперед."
+
+msgid ""
+"Resets the orientation but keeps the tilt of the device. So if we're looking "
+"down, we keep looking down but heading will be reset."
+msgstr ""
+"Сбрасывает ориентацию, но сохраняет наклон устройства. Поэтому, если мы "
+"смотрим вниз, мы продолжаем смотреть вниз, но направление будет сброшено."
+
+msgid ""
+"Does not reset the orientation of the HMD, only the position of the player "
+"gets centered."
+msgstr "Не сбрасывает ориентацию HMD, центрируется только положение игрока."
+
+msgid ""
+"The unique name of this tracker. The trackers that are available differ "
+"between various XR runtimes and can often be configured by the user. Godot "
+"maintains a number of reserved names that it expects the [XRInterface] to "
+"implement if applicable:\n"
+"- [code]head[/code] identifies the [XRPositionalTracker] of the players head\n"
+"- [code]left_hand[/code] identifies the [XRControllerTracker] in the players "
+"left hand\n"
+"- [code]right_hand[/code] identifies the [XRControllerTracker] in the players "
+"right hand\n"
+"- [code]/user/hand_tracker/left[/code] identifies the [XRHandTracker] for the "
+"players left hand\n"
+"- [code]/user/hand_tracker/right[/code] identifies the [XRHandTracker] for "
+"the players right hand\n"
+"- [code]/user/body_tracker[/code] identifies the [XRBodyTracker] for the "
+"players body\n"
+"- [code]/user/face_tracker[/code] identifies the [XRFaceTracker] for the "
+"players face"
+msgstr ""
+"Уникальное имя этого трекера. Доступные трекеры различаются в зависимости от "
+"времени выполнения XR и часто могут быть настроены пользователем. Godot "
+"поддерживает ряд зарезервированных имен, которые, как ожидается, будут "
+"реализованы в [XRInterface], если это применимо:\n"
+"- [code]head[/code] определяет [XRPositionalTracker] головы игрока\n"
+"- [code]left_hand[/code] определяет [XRControllerTracker] в левой руке "
+"игрока\n"
+"- [code]right_hand[/code] определяет[XRControllerTracker] в правой руке "
+"игрока\n"
+"- [code]/user/hand_tracker/left[/code] определяет[XRHandTracker] для левой "
+"руки игрока\n"
+"- [code]/user/hand_tracker/right[/code] определяет[XRHandTracker] для правой "
+"руки игрока\n"
+"- [code]/user/body_tracker[/code] определяет [XRBodyTracker] для тела игрока\n"
+"- [code]/user/face_tracker[/code] определяет [XRFaceTracker] для лица игрока"
+
+msgid "Helper class for XR interfaces that generates VRS images."
+msgstr ""
+"Вспомогательный класс для XR-интерфейсов, который генерирует изображения VRS."
+
+msgid ""
+"This class is used by various XR interfaces to generate VRS textures that can "
+"be used to speed up rendering."
+msgstr ""
+"Этот класс используется различными XR-интерфейсами для создания текстур VRS, "
+"которые могут быть использованы для ускорения рендеринга."
+
+msgid ""
+"Generates the VRS texture based on a render [param target_size] adjusted by "
+"our VRS tile size. For each eyes focal point passed in [param eye_foci] a "
+"layer is created. Focal point should be in NDC.\n"
+"The result will be cached, requesting a VRS texture with unchanged parameters "
+"and settings will return the cached RID."
+msgstr ""
+"Генерирует VRS текстуру, основанную на рендере [param target_size] "
+"скорректированного по размеру VRS тайла. Для каждой точки фокусировки глаза, "
+"переданной в параметре [param eye_foci], создается слой. Фокусная точна "
+"должна находиться в NDC.\n"
+"Результат будет кэширован, при запросе текстуры VRS с неизмененными "
+"параметрами и настройками будет возвращен кэшированный RID."
+
+msgid ""
+"The minimum radius around the focal point where full quality is guaranteed if "
+"VRS is used as a percentage of screen size."
+msgstr ""
+"Минимальный радиус вокруг фокусной точки, при котором гарантируется полное "
+"качество изображения, если использовать VRS в процентах от размера экрана."
+
+msgid ""
+"The strength used to calculate the VRS density map. The greater this value, "
+"the more noticeable VRS is."
+msgstr ""
+"Сила, используемая для расчета карты плотности VRS. Чем больше это значение, "
+"тем заметнее VRS."
+
+msgid ""
+"Stops writing to a file within the archive.\n"
+"It will fail if there is no open file."
+msgstr ""
+"Прекращает запись в файл внутри архива.\n"
+"Это приведет к сбою, если нет открытого файла."
+
+msgid ""
+"Opens a zip file for writing at the given path using the specified write "
+"mode.\n"
+"This must be called before everything else."
+msgstr ""
+"Открывает zip-файл для записи по указанному пути, используя указанный режим "
+"записи.\n"
+"Должен вызываться прежде всего остального."
+
+msgid ""
+"Starts writing to a file within the archive. Only one file can be written at "
+"the same time.\n"
+"Must be called after [method open]."
+msgstr ""
+"Начинает запись в файл внутри архива. Одновременно может быть записан только "
+"один файл.\n"
+"Должен вызываться после [method open]."
+
+msgid ""
+"Write the given [param data] to the file.\n"
+"Needs to be called after [method start_file]."
+msgstr ""
+"Записать полученный [param data] в файл.\n"
+"Должен вызываться после [method start_file]."
+
+msgid "Create a new zip archive at the given path."
+msgstr "Создать новый zip-архив по указанному пути."
+
+msgid ""
+"Append a new zip archive to the end of the already existing file at the given "
+"path."
+msgstr ""
+"Добавить новый zip-архив в конец существующего файла по указанному пути."
+
+msgid ""
+"Returns the list of names of all files in the loaded archive.\n"
+"Must be called after [method open]."
+msgstr ""
+"Возвращает список всех имён файлов в загруженном архиве.\n"
+"Должен быть вызван после [method open]."
+
+msgid ""
+"Loads the whole content of a file in the loaded zip archive into memory and "
+"returns it.\n"
+"Must be called after [method open]."
+msgstr ""
+"Загружает все содержимое файла из загруженного zip-архива в память и "
+"возвращает его.\n"
+"Должен вызываться после [method open]."
diff --git a/engine/doc/translations/ta.po b/engine/doc/translations/ta.po
index dac9f2e6..369bfb82 100644
--- a/engine/doc/translations/ta.po
+++ b/engine/doc/translations/ta.po
@@ -66447,13 +66447,6 @@ msgid ""
 msgstr ""
 "[LINEEDIT] க்குள் கேரட்டின் நெடுவரிசை நிலை. அமைக்கும்போது, உரை அதை இடமளிக்க உருட்டலாம்."
 
-msgid ""
-"If [code]true[/code], the [LineEdit] will always show the caret, even if "
-"focus is lost."
-msgstr ""
-"[குறியீடு] உண்மை [/குறியீடு] என்றால், கவனம் இழந்தாலும் [லைன்ச்டிட்] எப்போதும் கேரெட்டைக் "
-"காண்பிக்கும்."
-
 msgid ""
 "Allow moving caret, selecting and removing the individual composite character "
 "components.\n"
@@ -70647,13 +70640,6 @@ msgstr ""
 "உலகளாவிய பட்டியல் குறைந்தபட்ச அகலத்தை வழங்குகிறது.\n"
 " [b] குறிப்பு: [/b] இந்த முறை MACOS இல் மட்டுமே செயல்படுத்தப்படுகிறது."
 
-msgid ""
-"Returns global menu open callback.\n"
-"b]Note:[/b] This method is implemented only on macOS."
-msgstr ""
-"உலகளாவிய பட்டியல் திறந்த கால்பேக்கை வழங்குகிறது.\n"
-" b] குறிப்பு: [/b] இந்த முறை MACOS இல் மட்டுமே செயல்படுத்தப்படுகிறது."
-
 msgid ""
 "Returns global menu size.\n"
 "[b]Note:[/b] This method is implemented on macOS and Windows."
diff --git a/engine/doc/translations/uk.po b/engine/doc/translations/uk.po
index 02aa56a5..185ceac3 100644
--- a/engine/doc/translations/uk.po
+++ b/engine/doc/translations/uk.po
@@ -17,7 +17,7 @@
 # Богдан Матвіїв <bomtvv@gmail.com>, 2022.
 # Лев Дворский <ne3r0n@gmail.com>, 2022.
 # Dan <jonweblin2205@protonmail.com>, 2023.
-# Siked Siked <siked3@gmail.com>, 2023.
+# Siked Siked <siked3@gmail.com>, 2023, 2025.
 # Maxi fox <oleksijyerukh@gmail.com>, 2023.
 # "Yegor Yeriomin (Vendetta8247)" <vendetta8247@gmail.com>, 2024.
 # Evgen Zukov <searchyou13@gmail.com>, 2024.
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2025-02-26 08:20+0000\n"
+"PO-Revision-Date: 2025-03-14 17:05+0000\n"
 "Last-Translator: Максим Горпиніч <maksimgorpinic2005a@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-class-reference/uk/>\n"
@@ -41,7 +41,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10.2-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "All classes"
 msgstr "Всі класи"
@@ -1728,8 +1728,8 @@ msgstr ""
 "@export var car_number = 3 \n"
 "[/codeblock] \n"
 "[b]Примітка:[/b] Підгрупи не можуть бути вкладеними, але ви можете "
-"використовувати роздільник похилої риски ([код]/[/код]), щоб досягти бажаного "
-"ефекту: \n"
+"використовувати роздільник похилої риски ([code]/[/code]), щоб досягти "
+"бажаного ефекту: \n"
 "[codeblock] \n"
 "@export_group(\"Car Properties\") \n"
 "@export_subgroup(\"Wheels\", \"wheel_\") \n"
@@ -3504,15 +3504,15 @@ msgstr ""
 "Підтримуються такі теги BBCode: [code]b[/code], [code]i[/code], [code]u[/"
 "code], [code]s[/code], [code]indent[/code], [code]code[/code], [code]url[/"
 "code], [code]center[/code], [code]right[/code], [code]color[/code], "
-"[code]bgcolor[/code], [код]fgcolor[/code]. \n"
+"[code]bgcolor[/code], [code]fgcolor[/code]. \n"
 "URL-теги підтримують лише URL-адреси, обернені URL-тегом, а не URL-адреси з "
 "іншим заголовком. \n"
 "Під час друку на стандартний вихід підтримувана підмножина BBCode "
 "перетворюється на escape-коди ANSI для відображення емулятора терміналу. "
 "Підтримка escape-кодів ANSI відрізняється в різних емуляторах терміналу, "
-"особливо для курсиву та закресленого. У стандартному виведенні [код]код[/код] "
-"представлено розмитим текстом, але без будь-яких змін шрифту. Непідтримувані "
-"теги залишаються без змін у стандартному виведенні. \n"
+"особливо для курсиву та закресленого. У стандартному виведенні [code]код[/"
+"code] представлено розмитим текстом, але без будь-яких змін шрифту. "
+"Непідтримувані теги залишаються без змін у стандартному виведенні. \n"
 "[codeblock] \n"
 "[gdscript skip-lint] \n"
 "print_rich(\"[color=green][b]Hello world![/b][/color]\") # Prints \"Hello "
@@ -4191,7 +4191,7 @@ msgstr ""
 "і повертає [code]1[/code], коли [code]x <= to[/code], і [code]0[/code], коли "
 "[code]x >= from[/code]. \n"
 "Ця S-подібна крива є кубічним інтерполятором Ерміта, що визначається як "
-"[код]f(y) = 3*y^2 - 2*y^3[/code], де [code]y = (x-від) / (до-від)[/code]. \n"
+"[code]f(y) = 3*y^2 - 2*y^3[/code], де [code]y = (x-від) / (до-від)[/code]. \n"
 "[codeblock] \n"
 "smoothstep(0, 2, -5.0) # Returns 0.0 \n"
 "smoothstep(0, 2, 0.5) # Returns 0,15625 \n"
@@ -6996,6 +6996,9 @@ msgstr ""
 "Застосовують внутрішньо. Дозволяє не скидати основні віртуальні методи (такі "
 "як [method Object._notification]) до JSON API."
 
+msgid "Flag for a virtual method that is required."
+msgstr "Позначте потрібний віртуальний метод."
+
 msgid "Default method flags (normal)."
 msgstr "Позначка методу за замовчуванням (звичайна)."
 
@@ -7239,7 +7242,7 @@ msgid "Vector math"
 msgstr "Векторна математика"
 
 msgid "Advanced vector math"
-msgstr "Поглиблена векторна алгебра"
+msgstr "Поглиблена векторна математика"
 
 msgid ""
 "Constructs an [AABB] with its [member position] and [member size] set to "
@@ -14712,25 +14715,23 @@ msgid ""
 "changed when calling [method sort]."
 msgstr ""
 "Сортує масив у порядку зростання. Остаточний порядок залежить від порівняння "
-"\"менше ніж\" (<) між елементами.\n"
-"[codeblocks]\n"
-"[gdscript]\n"
-"var numbers = [10, 5, 2.5, 8]\n"
-"numbers.sort()\n"
-"print(numbers) # Виводить [2.5, 5, 8, 10]\n"
-"[/gdscript]\n"
-"[csharp]\n"
-"Godot.Collections.Array numbers = [10, 5, 2.5, 8];\n"
-"numbers.Sort();\n"
-"GD.Print(numbers); // Виводить [2.5, 5, 8, 10]\n"
-"[/csharp]\n"
-"[/codeblocks]\n"
-"**Примітка:** Використовуваний алгоритм сортування не є [uri=(https://en."
-"wikipedia.org/wiki/Sorting_algorithm#Stability)]стабільним[/url]. Це означає, "
-"що еквівалентні елементи (наприклад, 2 та 2.0) можуть змінити свій порядок "
-"під час виклику [method sort].Зверніть увагу, що я залишив [codeblocks] та "
-"інші елементи коду без змін, оскільки вони є частиною синтаксису та не "
-"потребують перекладу."
+"елементів \"менше\" ([code]<[/code]). \n"
+"[codeblocks] \n"
+"[gdscript] \n"
+"змінні числа = [10, 5, 2,5, 8] \n"
+"numbers.sort() \n"
+"print(numbers) # Prints [2.5, 5, 8, 10] \n"
+"[/gdscript] \n"
+"[csharp] \n"
+"Godot.Collections.Array numbers = [10, 5, 2.5, 8]; \n"
+"numbers.Sort(); \n"
+"GD.Print(числа); // Виводить [2.5, 5, 8, 10] \n"
+"[/csharp] \n"
+"[/codeblocks] \n"
+"[b]Примітка.[/b] Використаний алгоритм сортування не є [url=https://en."
+"wikipedia.org/wiki/Sorting_algorithm#Stability]стабільним[/url]. Це означає, "
+"що порядок еквівалентних елементів (таких як [code]2[/code] і [code]2.0[/"
+"code]) може змінитися під час виклику [method sort]."
 
 msgid ""
 "Sorts the array using a custom [Callable].\n"
@@ -15946,7 +15947,7 @@ msgstr ""
 "[/csharp] \n"
 "[/codeblocks] \n"
 "[метод _estimate_cost] має повертати нижню межу відстані, тобто "
-"[код]_estimate_cost(u, v) <= _compute_cost(u, v)[/code]. Це слугує підказкою "
+"[code]_estimate_cost(u, v) <= _compute_cost(u, v)[/code]. Це слугує підказкою "
 "для алгоритму, оскільки спеціальний [method _compute_cost] може бути важким "
 "для обчислення. Якщо це не так, змусьте [method _estimate_cost] повертати те "
 "саме значення, що й [method _compute_cost], щоб надати алгоритму найточнішу "
@@ -18857,9 +18858,8 @@ msgid ""
 "Audio stream that can playback music interactively, combining clips and a "
 "transition table."
 msgstr ""
-"Завантажує один кадр звукових даних у буфер. Зазвичай він менш ефективний, "
-"ніж [method push_buffer] у C# та скомпільованих мовах через GDExtension, але "
-"[method push_frame] може бути [i]більш ефективним[/i] у GDScript."
+"Аудіопотік, який може відтворювати музику в інтерактивному режимі, поєднуючи "
+"кліпи та таблицю переходів."
 
 msgid ""
 "This is an audio stream that can playback music interactively, combining "
@@ -28543,18 +28543,18 @@ msgstr ""
 "може зіткнутися кілька разів під час одного виклику [методу move_and_slide], "
 "ви повинні вказати індекс зіткнення в діапазоні від 0 до ([метод "
 "get_slide_collision_count] - 1).\n"
-"[b]Приклад використання:[/b]\n"
+"[b]Приклад:[/b] Ітерація колізій за допомогою циклу [code]for[/code]:\n"
 "[codeblocks]\n"
 "[gdscript]\n"
 "for i в get_slide_collision_count():\n"
 "    var collision = get_slide_collision(i)\n"
-"    print(\"Зіткнувся з: \", collision.get_collider().name)\n"
+"    print(\"Collision with: \", collision.get_collider().name)\n"
 "[/gdscript]\n"
 "[csharp]\n"
 "for (int i = 0; i < GetSlideCollisionCount(); i++)\n"
 "{\n"
 "    KinematicCollision2D зіткнення = GetSlideCollision(i);\n"
-"    GD.Print(\"Зіткнувся з: \", (collision.GetCollider() as Node).Name);\n"
+"    GD.Print(\"Collision with: \", (collision.GetCollider() as Node).Name);\n"
 "}\n"
 "[/csharp]\n"
 "[/codeblocks]"
@@ -34655,7 +34655,7 @@ msgstr ""
 "Віртуальний метод, який реалізує користувач. Використовуйте цей метод для "
 "обробки та прийняття вхідних даних на елементах інтерфейсу. Дивіться [method "
 "accept_event].\n"
-"[b]Example usage for clicking a control:[/b]\n"
+"[b]Приклад використання для клацання елемента керування:[/b]\n"
 "[codeblocks]\n"
 "[gdscript]\n"
 "func _gui_input(event):\n"
@@ -34681,13 +34681,13 @@ msgstr ""
 "* елемент керування має [член mouse_filter], встановлений у [константа "
 "MOUSE_FILTER_IGNORE];\n"
 "* елемент керування перекрито іншим [Control], який знаходиться над ним, але "
-"не має [member mouse_filter], встановленого на [константа "
+"[b]не[/b] має [member mouse_filter], встановленого на [константа "
 "MOUSE_FILTER_IGNORE];\n"
 "* батьківський елемент управління має [member mouse_filter] встановлений у "
 "[constant MOUSE_FILTER_STOP] або прийняв подію;\n"
 "* це відбувається за межами батьківського прямокутника і у батька увімкнено "
 "[member clip_contents].\n"
-"3[b]Примітка:4[/b] Позиція події відносно початку керування."
+"[b]Примітка:4[/b] Позиція події відносно початку керування."
 
 msgid ""
 "Virtual method to be implemented by the user. Returns whether the given "
@@ -42636,10 +42636,10 @@ msgstr ""
 "Відображає рідне діалогове вікно ОС для вибору файлів або каталогів у "
 "файловій системі.\n"
 "Кожен рядок фільтра в масиві [param filters] має бути відформатований таким "
-"чином: [код]*.png,*.jpg,*.jpeg;файли зображень;image/png,image/jpeg[/code]. "
+"чином: [code]*.png,*.jpg,*.jpeg;файли зображень;image/png,image/jpeg[/code]. "
 "Текст опису фільтра необов’язковий і його можна опустити. Рекомендується "
-"встановити як розширення файлу, так і тип MIME. Дивіться також [член "
-"FileDialog.filters].\n"
+"встановити як розширення файлу, так і тип MIME. Дивіться [член FileDialog."
+"filters].\n"
 "Зворотні виклики мають такі аргументи: [code]status: bool, selected_paths: "
 "PackedStringArray, selected_filter_index: int[/code]. [b]На Android [/b] "
 "аргумент зворотного виклику [code]selected_filter_index[/code] завжди "
@@ -42650,7 +42650,7 @@ msgstr ""
 "[b]Примітка: [/b] [param current_directory] може бути проігноровано.\n"
 "[b]Примітка.[/b] Вбудоване діалогове вікно файлів і діалогове вікно файлів "
 "Windows підтримують лише розширення файлів, тоді як діалогові вікна файлів "
-"Android, Linux і macOS також підтримують типи MIME.\n"
+"Android, Linux і macOS також підтримують типи MIME\n"
 "[b]Примітка.[/b] В Android і Linux [param show_hidden] ігнорується.\n"
 "[b]Примітка.[/b] В Android і macOS рідні діалогові вікна файлів не мають "
 "заголовків.\n"
@@ -42692,13 +42692,13 @@ msgstr ""
 "Відображає рідне діалогове вікно ОС для вибору файлів або каталогів у "
 "файловій системі з додатковими параметрами, які користувач може вибрати.\n"
 "Кожен рядок фільтра в масиві [param filters] має бути відформатований таким "
-"чином: [код]*.png,*.jpg,*.jpeg;файли зображень;image/png,image/jpeg[/code]. "
+"чином: [code]*.png,*.jpg,*.jpeg;файли зображень;image/png,image/jpeg[/code]. "
 "Текст опису фільтра необов’язковий і його можна опустити. Рекомендується "
-"встановити як розширення файлу, так і тип MIME. Дивіться також [член "
-"FileDialog.filters].\n"
+"встановити як розширення файлу, так і тип MIME. Дивіться [член FileDialog."
+"filters].\n"
 "[param options] — це масив [Dictionary] з такими ключами:\n"
-"- [код]\"назва\"[/код] - назва опції [Рядок].\n"
-"- [код]\"значення\"[/код] - [PackedStringArray] значень. Якщо пусто, "
+"- [code]\"назва\"[/code] - назва опції [Рядок].\n"
+"- [code]\"значення\"[/code] - [PackedStringArray] значень. Якщо пусто, "
 "використовується логічний параметр (прапорець).\n"
 "- [code]\"default\"[/code] - типовий індекс вибраного параметра ([int]) або "
 "типове логічне значення ([bool]).\n"
@@ -42711,7 +42711,7 @@ msgstr ""
 "[b]Примітка: [/b] [param current_directory] може бути проігноровано.\n"
 "[b]Примітка.[/b] Вбудоване діалогове вікно файлів і діалогове вікно файлів "
 "Windows підтримують лише розширення файлів, тоді як діалогові вікна файлів "
-"Android, Linux і macOS також підтримують типи MIME.\n"
+"Android, Linux і macOS також підтримують типи MIME\n"
 "[b]Примітка.[/b] У Linux (X11) [param show_hidden] ігнорується.\n"
 "[b]Примітка.[/b] У macOS рідні діалогові вікна файлів не мають заголовків.\n"
 "[b]Примітка.[/b] У macOS програми ізольованого програмного середовища "
@@ -42814,8 +42814,8 @@ msgid ""
 "screen or has no area."
 msgstr ""
 "Повертає індекс екрана, який найбільше накладається на вказаний прямокутник. "
-"Повертає [код]-1[/код], якщо прямокутник не перекривається жодним екраном або "
-"не має області."
+"Повертає [code]-1[/code], якщо прямокутник не перекривається жодним екраном "
+"або не має області."
 
 msgid ""
 "Returns [code]true[/code] if positions of [b]OK[/b] and [b]Cancel[/b] buttons "
@@ -49127,7 +49127,7 @@ msgstr ""
 "Крім того, підтримуються наступні ключі:\n"
 "- [code]підказка: PropertyHint[/code]\n"
 "- [code]hint_string: Рядок[/code]\n"
-"- [code]використання: PropertyUsageFlags[/код]\n"
+"- [code]використання: PropertyUsageFlags[/code]\n"
 "- [code]ім'я_класу: ім'я рядка[/code]\n"
 "- [code]default_value: Варіант[/code], значення властивості за "
 "замовчуванням.\n"
@@ -64202,15 +64202,15 @@ msgstr ""
 "Повертає інформацію про поточну версію двигуна як [словник], що містить такі "
 "записи: \n"
 "- [code]major[/code] - номер основної версії як int; \n"
-"- [код]мінор[/код] - номер другорядної версії як int; \n"
-"- [код]патч[/код] - номер версії латки як int; \n"
+"- [code]мінор[/code] - номер другорядної версії як int; \n"
+"- [code]патч[/code] - номер версії латки як int; \n"
 "- [code]hex[/code] - повна версія, закодована як шістнадцяткове ціле число з "
 "одним байтом (2 шістнадцяткові цифри) на число (див. приклад нижче); \n"
-"- [код]статус[/код] - статус (такий як \"бета\", \"rc1\", \"rc2\", "
+"- [code]статус[/code] - статус (такий як \"бета\", \"rc1\", \"rc2\", "
 "\"стабільний\" тощо) у вигляді рядка; \n"
 "- [code]build[/code] - назва збірки (наприклад, \"custom_build\") у вигляді "
 "рядка; \n"
-"- [код]хеш[/код] - повний хеш фіксації Git як рядок; \n"
+"- [code]хеш[/code] - повний хеш фіксації Git як рядок; \n"
 "- [code]timestamp[/code] – зберігає мітку часу UNIX дати коміту Git у "
 "секундах як int або [code]0[/code], якщо недоступний; \n"
 "- [code]рядок[/code] - [code]основний[/code], [code]мінорний[/code], "
@@ -64218,7 +64218,7 @@ msgstr ""
 "рядку. \n"
 "Значення [code]hex[/code] кодується наступним чином, зліва направо: один байт "
 "для основного, один байт для другорядного, один байт для версії виправлення. "
-"Наприклад, \"3.1.12\" буде [код]0x03010C[/код]. \n"
+"Наприклад, \"3.1.12\" буде [code]0x03010C[/code]. \n"
 "[b]Примітка: [/b] Значення [code]hex[/code] все ще внутрішньо є [int], і його "
 "друк дасть вам його десяткове представлення, що не має особливого значення. "
 "Використовуйте шістнадцяткові літерали для швидкого порівняння версій коду: \n"
@@ -66821,8 +66821,8 @@ msgstr ""
 "включено в експорт, змінивши його режим імпорту на [b]Зберігати файл "
 "(експортований як є)[/b] у док-станції «Імпорт», або, для файлів, для яких "
 "цей параметр недоступний, змініть фільтр експорту без ресурсів у діалоговому "
-"вікні «Експорт», щоб включити розширення файлу (наприклад, [код]*.txt[/"
-"код]). \n"
+"вікні «Експорт», щоб включити розширення файлу (наприклад, [code]*.txt[/"
+"code]). \n"
 "[b]Примітка: [/b] Файли автоматично закриваються, лише якщо процес "
 "завершується \"звичайним чином\" (наприклад, натисканням кнопки закриття "
 "диспетчера вікон або натисканням [b]Alt + F4[/b]). Якщо ви зупините виконання "
@@ -67340,12 +67340,12 @@ msgid ""
 "[/codeblocks]"
 msgstr ""
 "Зберігає ціле число у вигляді 16 біт у файлі.\n"
-"[b]Примітка: [/b] [значення параметра] має лежати в інтервалі [код][0, 2^16 - "
-"1][/код]. Будь-яке інше значення буде переповнюватися та обертатися.\n"
+"[b]Примітка: [/b] [значення параметра] має лежати в інтервалі [code][0, 2^16 "
+"- 1][/code]. Будь-яке інше значення буде переповнюватися та обертатися.\n"
 "[b]Примітка:[/b] Якщо виникає помилка, кінцеве значення індикатора позиції "
 "файлу є невизначеним.\n"
 "Щоб зберегти ціле число зі знаком, використовуйте [метод store_64] або "
-"збережіть ціле число зі знаком з інтервалу [код][-2^15, 2^15 - 1][/код] "
+"збережіть ціле число зі знаком з інтервалу [code][-2^15, 2^15 - 1][/code] "
 "(тобто зберігаючи один біт для знаку) і обчислюйте його знак вручну під час "
 "читання. Наприклад:\n"
 "[codeblocks]\n"
@@ -67799,8 +67799,8 @@ msgid ""
 "types."
 msgstr ""
 "Доступні фільтри типів файлів. Кожен рядок фільтра в масиві має бути "
-"відформатований таким чином: [код]*.png,*.jpg,*.jpeg;файли зображень;"
-"зображення/png,зображення/jpeg[/код]. Текст опису фільтра необов’язковий і "
+"відформатований таким чином: [code]*.png,*.jpg,*.jpeg;файли зображень;"
+"зображення/png,зображення/jpeg[/code]. Текст опису фільтра необов’язковий і "
 "його можна опустити. Слід завжди встановлювати розширення файлів і тип MIME.\n"
 "[b]Примітка.[/b] Вбудоване діалогове вікно файлів і діалогове вікно файлів "
 "Windows підтримують лише розширення файлів, тоді як діалогові вікна файлів "
@@ -70515,8 +70515,8 @@ msgid ""
 "[/codeblocks]"
 msgstr ""
 "Повертає точку перетину між двома лініями ([param from_a], [param dir_a]) і "
-"([param from_b], [param dir_b]). Повертає [Вектор2] або [код]нуль[/код], якщо "
-"лінії паралельні.\n"
+"([param from_b], [param dir_b]). Повертає [Вектор2] або [code]нуль[/code], "
+"якщо лінії паралельні.\n"
 "[code]from[/code] і [code]dir[/code] є [i]не[/i] кінцевими точками відрізка "
 "або променя, а нахилом ([code]dir[/code]) і відомою точкою ([code]from[/"
 "code]) на цій лінії.\n"
@@ -78935,9 +78935,7 @@ msgstr ""
 " {\n"
 " GD.PushError(\"Не вдалося завантажити зображення.\");\n"
 " }\n"
-"\n"
 " var texture = ImageTexture.CreateFromImage(image);\n"
-"\n"
 " // Показ зображення у вузлі TextureRect.\n"
 " var textureRect = new TextureRect();\n"
 " AddChild(textureRect);\n"
@@ -80754,7 +80752,7 @@ msgstr ""
 "у [method Image.create]. Перше зображення визначає ширину, висоту, формат "
 "зображення та параметр відображення mip. Інші зображення [i]повинні[/i] мати "
 "однакову ширину, висоту, формат зображення та параметри відображення mip. \n"
-"Кожне [Зображення] представляє один [код]шар[/код]. \n"
+"Кожне [Зображення] представляє один [code]шар[/code]. \n"
 "[codeblock] \n"
 "# Заповніть масив зображень різними кольорами. \n"
 "var image= [] \n"
@@ -83640,7 +83638,7 @@ msgid ""
 "    do_stuff() # This line will run.\n"
 "[/codeblock]"
 msgstr ""
-"Виконує порозрядну операцію [код]І[/код]. \n"
+"Виконує порозрядну операцію [code]І[/code]. \n"
 "[codeblock] \n"
 "print(0b1100 & 0b1010) # Виводить 8 (двійковий 1000) \n"
 "[/codeblock] \n"
@@ -85231,8 +85229,8 @@ msgstr ""
 "— Кінцеві коми в масивах або об’єктах ігноруються, замість того, щоб "
 "викликати помилку аналізатора. \n"
 "- Нові символи рядка та табуляції приймаються в рядкових літералах і "
-"обробляються як їхні відповідні керуючі послідовності [код]\\n[/код] і "
-"[код]\\t[/код]. \n"
+"обробляються як їхні відповідні керуючі послідовності [code]\\n[/code] і "
+"[code]\\t[/code]. \n"
 "- Числа аналізуються за допомогою [методу String.to_float], який зазвичай "
 "більш м’який, ніж специфікація JSON. \n"
 "- Певні помилки, такі як недійсні послідовності Unicode, не викликають "
@@ -88269,11 +88267,11 @@ msgstr ""
 "прокручуватися, щоб вмістити його."
 
 msgid ""
-"If [code]true[/code], the [LineEdit] will always show the caret, even if "
-"focus is lost."
+"If [code]true[/code], the [LineEdit] will always show the caret, even if not "
+"editing or focus is lost."
 msgstr ""
-"Якщо [code]true[/code], [LineEdit] завжди покаже догляд, навіть якщо фокус "
-"втрачений."
+"Якщо [code]true[/code], [LineEdit] завжди показуватиме каретку, навіть якщо "
+"не редагувати або фокус буде втрачено."
 
 msgid ""
 "Allow moving caret, selecting and removing the individual composite character "
@@ -88375,8 +88373,8 @@ msgid ""
 "[/csharp]\n"
 "[/codeblocks]"
 msgstr ""
-"Максимальна кількість символів, які можна ввести в [LineEdit]. Якщо [код]0[/"
-"код], обмежень немає. \n"
+"Максимальна кількість символів, які можна ввести в [LineEdit]. Якщо [code]0[/"
+"code], обмежень немає. \n"
 "Якщо визначено обмеження, символи, які перевищуватимуть [member max_length], "
 "скорочуються. Це відбувається як для наявного вмісту [member text] під час "
 "встановлення максимальної довжини, так і для нового тексту, вставленого в "
@@ -91398,6 +91396,45 @@ msgstr ""
 msgid "Generic mobile VR implementation."
 msgstr "Створення мобільної VR."
 
+msgid ""
+"This is a generic mobile VR implementation where you need to provide details "
+"about the phone and HMD used. It does not rely on any existing framework. "
+"This is the most basic interface we have. For the best effect, you need a "
+"mobile phone with a gyroscope and accelerometer.\n"
+"Note that even though there is no positional tracking, the camera will assume "
+"the headset is at a height of 1.85 meters. You can change this by setting "
+"[member eye_height].\n"
+"You can initialize this interface as follows:\n"
+"[codeblock]\n"
+"var interface = XRServer.find_interface(\"Native mobile\")\n"
+"if interface and interface.initialize():\n"
+"    get_viewport().use_xr = true\n"
+"[/codeblock]\n"
+"[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/"
+"enable_accelerometer], [member ProjectSettings.input_devices/sensors/"
+"enable_gravity], [member ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] and [member ProjectSettings.input_devices/sensors/"
+"enable_magnetometer] must be enabled."
+msgstr ""
+"Це загальна реалізація віртуальної реальності для мобільних пристроїв, де вам "
+"потрібно надати деталі про використовуваний телефон і HMD. Він не спирається "
+"на жодну існуючу структуру. Це найпростіший інтерфейс, який у нас є. Для "
+"кращого ефекту потрібен мобільний телефон з гіроскопом і акселерометром. \n"
+"Зауважте, що навіть якщо позиційне відстеження відсутнє, камера вважатиме, що "
+"гарнітура знаходиться на висоті 1,85 метра. Ви можете змінити це, встановивши "
+"[member eye_height]. \n"
+"Ви можете ініціалізувати цей інтерфейс наступним чином: \n"
+"[codeblock] \n"
+"var interface = XRServer.find_interface(\"Native mobile\") \n"
+"if interface and interface.initialize(): \n"
+"    get_viewport().use_xr = true \n"
+"[/codeblock] \n"
+"[b]Примітка:[/b] для Android [учасник ProjectSettings.input_devices/sensors/"
+"enable_accelerometer], [учасник ProjectSettings.input_devices/sensors/"
+"enable_gravity], [учасник ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] і [учасник ProjectSettings.input_devices/sensors/"
+"enable_magnetometer] має бути ввімкнено."
+
 msgid ""
 "The distance between the display and the lenses inside of the device in "
 "centimeters."
@@ -93698,10 +93735,10 @@ msgstr ""
 
 msgid ""
 "Returns global menu open callback.\n"
-"b]Note:[/b] This method is implemented only on macOS."
+"[b]Note:[/b] This method is implemented only on macOS."
 msgstr ""
-"Повернутися до глобального меню\n"
-"б]Примітка:[/b] Цей метод реалізується тільки на macOS."
+"Повертає зворотний виклик відкритого глобального меню.\n"
+"[b]Примітка.[/b] Цей метод реалізовано лише в macOS."
 
 msgid ""
 "Returns global menu size.\n"
@@ -99111,7 +99148,7 @@ msgstr ""
 "гарантований і може змінюватися між запусками проекту. Тому не покладайтеся "
 "на груповий порядок. \n"
 "[b]Примітка: [/b] Цей метод також може повертати назви деяких груп, які "
-"починаються з підкреслення ([код]_[/код]). Вони використовуються внутрішньо "
+"починаються з підкреслення ([code]_[/code]). Вони використовуються внутрішньо "
 "двигуном. Щоб уникнути конфліктів, не використовуйте спеціальні групи, які "
 "починаються з підкреслення. Щоб виключити внутрішні групи, перегляньте такий "
 "фрагмент коду: \n"
@@ -99284,7 +99321,7 @@ msgid ""
 "[/codeblocks]"
 msgstr ""
 "Отримує вузол і його найбільш вкладений ресурс, як зазначено в підназві "
-"[NodePath]. Повертає [Масив] розміром [код]3[/код] де: \n"
+"[NodePath]. Повертає [Масив] розміром [code]3[/code] де: \n"
 "- Елемент [code]0[/code] є [Node] або [code]null[/code], якщо не знайдено; \n"
 "- Елемент [code]1[/code] є останнім вкладеним [Resource] субназви або "
 "[code]null[/code], якщо не знайдено; \n"
@@ -100810,6 +100847,9 @@ msgstr ""
 "Viewport._disable_input] [code]false[/code] і незалежно від того, чи зараз "
 "він зосередився або ні."
 
+msgid "Notification received when the window is moved."
+msgstr "Отримано сповіщення, коли вікно переміщено."
+
 msgid ""
 "Notification received from the OS when the application is exceeding its "
 "allocated memory.\n"
@@ -101222,8 +101262,8 @@ msgid ""
 "changed to negative scales on the Y axis and a rotation of 180 degrees when "
 "decomposed."
 msgstr ""
-"Масштаб вузла відносно батьківського вузла. Немасштабоване значення: [код](1, "
-"1)[/код]. Дивіться також [member global_scale]. \n"
+"Масштаб вузла відносно батьківського вузла. Немасштабоване значення: [code]"
+"(1, 1)[/code]. Дивіться також [member global_scale]. \n"
 "[b]Примітка: [/b] Негативні шкали X у 2D не можна розкласти з матриці "
 "трансформації. Завдяки способу представлення масштабу за допомогою матриць "
 "трансформації в Godot, негативні масштаби на осі X будуть змінені на "
@@ -101924,11 +101964,11 @@ msgstr ""
 "y. \n"
 "^\"/root:size:x\" # Вказує на кореневе вікно та його ширину. \n"
 "[/codeblock] \n"
-"У деяких ситуаціях можна опустити початковий [код]:[/код] під час вказівки на "
-"властивість об’єкта. Як приклад, це випадок [method Object.set_indexed] і "
+"У деяких ситуаціях можна опустити початковий [code]:[/code] під час вказівки "
+"на властивість об’єкта. Як приклад, це випадок [method Object.set_indexed] і "
 "[method Tween.tween_property], оскільки ці методи викликають [method NodePath."
 "get_as_property_path] під капотом. Однак зазвичай рекомендується зберігати "
-"префікс [код]:[/код]. \n"
+"префікс [code]:[/code]. \n"
 "Шляхи вузлів не можуть перевірити, чи вони дійсні, і можуть вказувати на "
 "вузли або властивості, які не існують. Їхнє значення повністю залежить від "
 "контексту, у якому вони використовуються. \n"
@@ -102084,8 +102124,8 @@ msgid ""
 "[/csharp]\n"
 "[/codeblocks]"
 msgstr ""
-"Повертає всі підназви властивостей, об’єднані символом двокрапки ([код]:[/"
-"код]) як один [StringName]. \n"
+"Повертає всі підназви властивостей, об’єднані символом двокрапки ([code]:[/"
+"code]) як один [StringName]. \n"
 "[codeblocks] \n"
 "[gdscript] \n"
 "var node_path = ^\"Sprite2D:texture:resource_name\" \n"
@@ -102900,8 +102940,8 @@ msgstr ""
 "для обробки механізмом. \n"
 "Має повертати список властивостей у вигляді [масиву] словників. Результат "
 "додається до масиву [методу get_property_list] і має бути відформатований "
-"таким же чином. Кожен [Словник] має містити принаймні записи [код]ім’я[/код] "
-"і [код]тип[/код]. \n"
+"таким же чином. Кожен [Словник] має містити принаймні записи [code]ім’я[/"
+"code] і [code]тип[/code]. \n"
 "Ви можете використовувати [method _property_can_revert] і [method "
 "_property_get_revert], щоб налаштувати значення за замовчуванням "
 "властивостей, доданих цим методом. \n"
@@ -103498,29 +103538,29 @@ msgid ""
 msgstr ""
 "Додає визначений користувачем сигнал під назвою [param signal]. Необов’язкові "
 "аргументи для сигналу можна додати як [Масив] словників, кожен з яких "
-"визначає [код]ім’я[/код] [Рядок] і [код]тип[/код] [int] (див. [enum Variant."
-"Type]). Дивіться також [method has_user_signal] і [method "
+"визначає [code]ім’я[/code] [Рядок] і [code]тип[/code] [int] (див. [enum "
+"Variant.Type]). Дивіться також [method has_user_signal] і [method "
 "remove_user_signal]. \n"
 "[codeblocks] \n"
 "[gdscript] \n"
-"add_user_signal(\"пошкодити\", [ \n"
-"    { \"ім'я\": \"шкода\", \"тип\": TYPE_INT }, \n"
-"    { \"ім'я\": \"джерело\", \"тип\": TYPE_OBJECT } \n"
+"add_user_signal(\"hurt\", [\n"
+"    { \"name\": \"damage\", \"type\": TYPE_INT },\n"
+"    { \"name\": \"source\", \"type\": TYPE_OBJECT }\n"
 "])\n"
 "[/gdscript] \n"
 "[csharp] \n"
-"AddUserSignal(\"Пошкодження\", \n"
+"AddUserSignal(\"Hurt\",\n"
 "[\n"
-"    новий Godot.Collections.Dictionary() \n"
-"    { \n"
-"        { \"ім'я\", \"пошкодження\" }, \n"
-"        { \"тип\", (int)Variant.Type.Int }, \n"
-"    }, \n"
-"    новий Godot.Collections.Dictionary() \n"
-"    { \n"
-"        { \"назва\", \"джерело\" }, \n"
-"        { \"type\", (int)Variant.Type.Object }, \n"
-"    }, \n"
+"    new Godot.Collections.Dictionary()\n"
+"    {\n"
+"        { \"name\", \"damage\" },\n"
+"        { \"type\", (int)Variant.Type.Int },\n"
+"    },\n"
+"    new Godot.Collections.Dictionary()\n"
+"    {\n"
+"        { \"name\", \"source\" },\n"
+"        { \"type\", (int)Variant.Type.Object },\n"
+"    },\n"
 "]);\n"
 "[/csharp] \n"
 "[/codeblocks]"
@@ -104204,7 +104244,7 @@ msgid ""
 msgstr ""
 "Отримує властивість об’єкта, індексовану заданим [param property_path]. Шлях "
 "має бути [NodePath] відносно поточного об’єкта та може використовувати символ "
-"двокрапки ([код]:[/код]) для доступу до вкладених властивостей. \n"
+"двокрапки ([code]:[/code]) для доступу до вкладених властивостей. \n"
 "[b]Приклади:[/b] [code]\"position:x\"[/code] або [code]\"material:next_pass:"
 "blend_mode\"[/code]. \n"
 "[codeblocks] \n"
@@ -104353,7 +104393,7 @@ msgid ""
 msgstr ""
 "Повертаємо назву [Аррайс] з'єднань для вказаного [пармового сигналу]. Кожен "
 "з'єднання представлений як [Дикатарний], який містить три записи:\n"
-"- [code] пропустити lint]signal[/code] - посилання на [Signal];\n"
+"- [code skip-lint]сигнал[/code] є посиланням на [Сигнал];\n"
 "- [code]Callable[/code] - посилання на підключений [Callable];\n"
 "- [code]flags[/code] - це поєднання [enum ConnectFlags]."
 
@@ -104770,7 +104810,7 @@ msgid ""
 msgstr ""
 "Призначає нове [param value] властивості, визначеній [param property_path]. "
 "Шлях має бути [NodePath] відносно цього об’єкта та може використовувати "
-"символ двокрапки ([код]:[/код]) для доступу до вкладених властивостей. \n"
+"символ двокрапки ([code]:[/code]) для доступу до вкладених властивостей. \n"
 "[codeblocks] \n"
 "[gdscript] \n"
 "var node = Node2D.new() \n"
@@ -106559,8 +106599,8 @@ msgid ""
 "The duration of the pulse in nanoseconds. Use [code]-1[/code] for a minimum "
 "duration pulse for the current XR runtime."
 msgstr ""
-"Тривалість імпульсу в наносекундах. Використовуйте [код]-1[/код] для імпульсу "
-"мінімальної тривалості для поточного часу виконання XR."
+"Тривалість імпульсу в наносекундах. Використовуйте [code]-1[/code] для "
+"імпульсу мінімальної тривалості для поточного часу виконання XR."
 
 msgid ""
 "The frequency of the pulse in Hz. [code]0.0[/code] will let the XR runtime "
@@ -107628,7 +107668,7 @@ msgstr ""
 "Якщо процес успішно створено, цей метод повертає його ідентифікатор процесу, "
 "який ви можете використовувати для моніторингу процесу (і потенційно "
 "завершити його за допомогою [method kill]). В іншому випадку цей метод "
-"повертає [код]-1[/код]. \n"
+"повертає [code]-1[/code]. \n"
 "[b]Приклад:[/b] Запустіть інший екземпляр проекту: \n"
 "[codeblocks] \n"
 "[gdscript] \n"
@@ -107814,7 +107854,7 @@ msgstr ""
 "[code]powershell.exe[/code] у [param path], [code]-Command[/code] як перший "
 "аргумент, а потрібну команду як другий аргумент. \n"
 "[b]Примітка:[/b] Щоб виконати вбудовану команду оболонки Unix, укажіть назву "
-"виконуваного файлу оболонки в [шлях до параметрів], [код]-c[/код] як перший "
+"виконуваного файлу оболонки в [шлях до параметрів], [code]-c[/code] як перший "
 "аргумент, а потрібну команду як другий аргумент. \n"
 "[b]Примітка.[/b] У macOS програми ізольованого програмного середовища можуть "
 "запускати лише вбудовані допоміжні виконувані файли, указані під час "
@@ -107868,7 +107908,7 @@ msgstr ""
 "В іншому випадку цей метод повертає [Словник] із такими ключами: \n"
 "- [code]\"stdio\"[/code] - [FileAccess] для доступу до каналів stdin і stdout "
 "процесу (читання/запис). \n"
-"- [код]\"stderr\"[/code] - [FileAccess] для доступу до каналу stderr процесу "
+"- [code]\"stderr\"[/code] - [FileAccess] для доступу до каналу stderr процесу "
 "(тільки читання). \n"
 "- [code]\"pid\"[/code] - ID процесу як [int], який ви можете використовувати "
 "для моніторингу процесу (і потенційно завершити його за допомогою [method "
@@ -107881,7 +107921,7 @@ msgstr ""
 "[code]powershell.exe[/code] у [param path], [code]-Command[/code] як перший "
 "аргумент, а потрібну команду як другий аргумент. \n"
 "[b]Примітка:[/b] Щоб виконати вбудовану команду оболонки Unix, укажіть назву "
-"виконуваного файлу оболонки в [шлях до параметрів], [код]-c[/код] як перший "
+"виконуваного файлу оболонки в [шлях до параметрів], [code]-c[/code] як перший "
 "аргумент, а потрібну команду як другий аргумент. \n"
 "[b]Примітка.[/b] У macOS програми ізольованого програмного середовища можуть "
 "запускати лише вбудовані допоміжні виконувані файли, указані під час експорту "
@@ -108011,7 +108051,7 @@ msgstr ""
 "визначити аргументи командного рядка, які передає редактор під час запуску "
 "проекту. \n"
 "[b]Приклад:[/b] Розберіть аргументи командного рядка в [словник] за допомогою "
-"форми [код]--ключ=значення[/код] для аргументів: \n"
+"форми [code]--ключ=значення[/code] для аргументів: \n"
 "[codeblocks] \n"
 "[gdscript] \n"
 "var arguments = {} \n"
@@ -108066,7 +108106,7 @@ msgid ""
 msgstr ""
 "Повертає аргументи користувача командного рядка, передані системі. Аргументи "
 "користувача ігноруються механізмом і резервуються для користувача. Вони "
-"передаються після аргументу подвійного тире [код]--[/код]. [code]++[/code] "
+"передаються після аргументу подвійного тире [code]--[/code]. [code]++[/code] "
 "можна використовувати, коли [code]--[/code] перехоплюється іншою програмою "
 "(наприклад, [code]startx[/code]). \n"
 "[codeblock] \n"
@@ -108780,7 +108820,7 @@ msgstr ""
 "можна додати до [method get_name], щоб отримати повну, зрозумілу людині назву "
 "операційної системи та комбінацію версій операційної системи. Оновлення "
 "функцій Windows, наприклад 24H2, не містяться в отриманому рядку, але Windows "
-"Server розпізнається як таке (наприклад, [код]2025 (збірка 26100)[/код] для "
+"Server розпізнається як таке (наприклад, [code]2025 (збірка 26100)[/code] для "
 "Windows Server 2025). \n"
 "[b]Примітка.[/b] Цей метод підтримується лише в Windows і macOS. В інших "
 "операційних системах він повертає те саме значення, що й [method get_version]."
@@ -123587,7 +123627,7 @@ msgid ""
 msgstr ""
 "Подібно до [method get_setting], але застосовує заміни тегів функцій, якщо "
 "вони існують і є дійсними. \n"
-"[b]Приклад:[/b] Якщо існує заміна налаштувань [код]\"application/config/name."
+"[b]Приклад:[/b] Якщо існує заміна налаштувань [code]\"application/config/name."
 "windows\"[/code] і наступний код виконується в операційній системі "
 "[i]Windows[/i], натомість друкується замінена настройка: \n"
 "[codeblocks] \n"
@@ -132297,7 +132337,7 @@ msgstr ""
 "- [code]metal[/code], Metal (підтримується на Apple Silicon Mac та iOS). \n"
 "- [code]vulkan[/code], Vulkan (підтримується на всіх настільних і мобільних "
 "платформах). \n"
-"- [код]d3d12[/код], Direct3D 12 (підтримується в Windows). \n"
+"- [code]d3d12[/code], Direct3D 12 (підтримується в Windows). \n"
 "[b]Примітка:[/b] Доступність цих параметрів залежить від того, чи було "
 "скомпільовано систему з їх підтримкою (визначається параметрами SCons "
 "[code]vulkan[/code], [code]metal[/code] і [code]d3d12[/code]). \n"
@@ -132709,8 +132749,8 @@ msgid ""
 "snap_2d_transforms_to_pixel]."
 msgstr ""
 "Режим фільтрації текстури за замовчуванням для використання вбудованої "
-"текстури [CanvasItem]. У шейдерах ця текстура доступна як [код]ТЕКСТУРА[/"
-"код]. \n"
+"текстури [CanvasItem]. У шейдерах ця текстура доступна як [code]ТЕКСТУРА[/"
+"code]. \n"
 "[b]Примітка.[/b] Щодо естетики піксельного мистецтва див. також [member "
 "rendering/2d/snap/snap_2d_vertices_to_pixel] і [member rendering/2d/snap/"
 "snap_2d_transforms_to_pixel]."
@@ -133996,7 +134036,7 @@ msgid ""
 "[/codeblocks]"
 msgstr ""
 "Повертає випадковий індекс із нерівномірними вагами. Виводить помилку та "
-"повертає [код]-1[/код], якщо масив порожній. \n"
+"повертає [code]-1[/code], якщо масив порожній. \n"
 "[codeblocks] \n"
 "[gdscript] \n"
 "var rng = RandomNumberGenerator.new() \n"
@@ -138127,9 +138167,9 @@ msgid ""
 msgstr ""
 "Те саме, що [метод get_device_total_memory], але відфільтровано для певного "
 "типу об’єкта. \n"
-"Аргумент типу має бути в діапазоні [код][0; get_tracked_object_type_count - 1]"
-"[/code]. Якщо [метод get_tracked_object_type_count] дорівнює 0, тоді аргумент "
-"типу ігнорується та завжди повертає 0. \n"
+"Аргумент типу має бути в діапазоні [code][0; get_tracked_object_type_count - "
+"1][/code]. Якщо [метод get_tracked_object_type_count] дорівнює 0, тоді "
+"аргумент типу ігнорується та завжди повертає 0. \n"
 "Це використовується лише Vulkan у збірках для налагодження та може повертати "
 "0, якщо ця інформація не відстежується або невідома."
 
@@ -138194,9 +138234,9 @@ msgid ""
 msgstr ""
 "Те саме, що [метод get_driver_allocation_count], але фільтрується для певного "
 "типу об’єкта. \n"
-"Аргумент типу має бути в діапазоні [код][0; get_tracked_object_type_count - 1]"
-"[/code]. Якщо [метод get_tracked_object_type_count] дорівнює 0, тоді аргумент "
-"типу ігнорується та завжди повертає 0. \n"
+"Аргумент типу має бути в діапазоні [code][0; get_tracked_object_type_count - "
+"1][/code]. Якщо [метод get_tracked_object_type_count] дорівнює 0, тоді "
+"аргумент типу ігнорується та завжди повертає 0. \n"
 "Це використовується лише Vulkan у збірках для налагодження та може повертати "
 "0, якщо ця інформація не відстежується або невідома."
 
@@ -138243,9 +138283,9 @@ msgid ""
 msgstr ""
 "Те саме, що [метод get_driver_total_memory], але відфільтровано для певного "
 "типу об’єкта. \n"
-"Аргумент типу має бути в діапазоні [код][0; get_tracked_object_type_count - 1]"
-"[/code]. Якщо [метод get_tracked_object_type_count] дорівнює 0, тоді аргумент "
-"типу ігнорується та завжди повертає 0. \n"
+"Аргумент типу має бути в діапазоні [code][0; get_tracked_object_type_count - "
+"1][/code]. Якщо [метод get_tracked_object_type_count] дорівнює 0, тоді "
+"аргумент типу ігнорується та завжди повертає 0. \n"
 "Це використовується лише Vulkan у збірках для налагодження та може повертати "
 "0, якщо ця інформація не відстежується або невідома."
 
@@ -138321,7 +138361,7 @@ msgid ""
 "command_line_tutorial.html]command line argument[/url]."
 msgstr ""
 "Повертає назву типу об’єкта для заданого [param type_index]. Це значення має "
-"бути в діапазоні [код][0; get_tracked_object_type_count - 1][/code]. Якщо "
+"бути в діапазоні [code][0; get_tracked_object_type_count - 1][/code]. Якщо "
 "[method get_tracked_object_type_count] дорівнює 0, аргумент типу ігнорується "
 "та завжди повертає той самий рядок. \n"
 "Повернене значення є важливим, оскільки воно надає значення типам, переданим "
@@ -143015,7 +143055,7 @@ msgstr ""
 "Повертає словник однорідних імен шейдерів для кожного екземпляра уніформи "
 "шейдера для кожного екземпляра з указаного екземпляра елемента полотна. \n"
 "Повернений словник має формат PropertyInfo з ключами [code]назва[/code], "
-"[code]назва_класу[/code], [code]тип[/code], [код]підказка[/code], "
+"[code]назва_класу[/code], [code]тип[/code], [code]підказка[/code], "
 "[code]рядок_підказки[/code] і [code]використання[/code]."
 
 msgid ""
@@ -145278,7 +145318,7 @@ msgstr ""
 "даних) \n"
 "[/codeblock] \n"
 "Перетворення екземплярів виконуються в порядку старшого рядка. зокрема: \n"
-"- Для [Transform2D] плаваючий порядок такий: [код](x.x, y.x, padding_float, "
+"- Для [Transform2D] плаваючий порядок такий: [code](x.x, y.x, padding_float, "
 "origin.x, x.y, y.y, padding_float, origin.y)[/code]. \n"
 "- Для [Transform3D] плаваючий порядок такий: [code](basis.x.x, basis.y.x, "
 "basis.z.x, origin.x, basis.x.y, basis.y.y, basis.z.y, origin.y, basis.x.z, "
@@ -160382,8 +160422,8 @@ msgstr ""
 "[SkeletonProfile] як стиль, оптимізований для людської форми. Це існує для "
 "стандартизації, тому всі параметри доступні лише для читання. \n"
 "Профіль скелета гуманоїда містить 54 кістки, розділені на 4 групи: "
-"[код]\"Тіло\"[/code], [код]\"Обличчя\"[/code], [код]\"Ліва рука\"[/code] і "
-"[код]\"Права рука\"[/code]. Він структурований таким чином: \n"
+"[code]\"Тіло\"[/code], [code]\"Обличчя\"[/code], [code]\"Ліва рука\"[/code] і "
+"[code]\"Права рука\"[/code]. Він структурований таким чином: \n"
 "[codeblock lang=text] \n"
 "Root\n"
 "└─ Hips\n"
@@ -164113,7 +164153,8 @@ msgid ""
 "[/codeblock]"
 msgstr ""
 "Якщо рядок є дійсним ім’ям файлу або шляхом, повертає розширення файлу без "
-"початкової крапки ([код].[/код]). В іншому випадку повертає порожній рядок. \n"
+"початкової крапки ([code].[/code]). В іншому випадку повертає порожній "
+"рядок. \n"
 "[codeblock] \n"
 "var a = \"/path/to/file.txt\".get_extension() # a це \"txt\" \n"
 "var b = \"cool.txt\".get_extension() # b це \"txt\" \n"
@@ -164356,7 +164397,7 @@ msgid ""
 msgstr ""
 "Повертає [code]true[/code], якщо цей рядок є дійсним ідентифікатором ASCII. "
 "Дійсний ідентифікатор ASCII може містити лише літери, цифри та підкреслення "
-"([код]_[/код]), а перший символ не може бути цифрою. \n"
+"([code]_[/code]), а перший символ не може бути цифрою. \n"
 "[codeblock] \n"
 "print(\"node_2d\".is_valid_ascii_identifier()) # Виводить true \n"
 "print(\"TYPE_FLOAT\".is_valid_ascii_identifier()) # Виводить true \n"
@@ -164393,9 +164434,9 @@ msgstr ""
 "Повертає [code]true[/code], якщо цей рядок представляє дійсне число з "
 "плаваючою комою. Правильний float може містити лише цифри, одну десяткову "
 "крапку ([code].[/code]) і літеру експоненти ([code]e[/code]). Перед ним також "
-"може бути позитивний ([код]+[/код]) або негативний ([код]-[/код]) знак. Будь-"
-"яке дійсне ціле число також є дійсним float (див. [method is_valid_int]). "
-"Дивіться також [метод to_float]. \n"
+"може бути позитивний ([code]+[/code]) або негативний ([code]-[/code]) знак. "
+"Будь-яке дійсне ціле число також є дійсним float (див. [method "
+"is_valid_int]). Дивіться також [метод to_float]. \n"
 "[codeblock] \n"
 "print(\"1.7\".is_valid_float()) # Виводить true \n"
 "print(\"24\".is_valid_float()) # Виводить true \n"
@@ -167205,7 +167246,7 @@ msgstr ""
 "Кожен запис є номером стовпця, що містить вкладений [Словник]. Номер стовпця "
 "позначає початок регіону, регіон закінчується, якщо знайдено інший регіон, "
 "або в кінці рядка. Вкладений [Словник] містить дані для цього регіону. Наразі "
-"підтримується лише ключ [код]\"колір\"[/код]. \n"
+"підтримується лише ключ [code]\"колір\"[/code]. \n"
 "[b]Приклад:[/b] Можливе повернуте значення. Це означає, що стовпці [code]0[/"
 "code] до [code]4[/code] мають бути червоними, а стовпці [code]5[/code] до "
 "кінця рядка мають бути зеленими: \n"
@@ -168480,8 +168521,8 @@ msgid ""
 "If [param clamp_column] is [code]false[/code] and [param position] is outside "
 "the column range of the line, [code]Vector2i(-1, -1)[/code] is returned."
 msgstr ""
-"Повертає рядок і стовпець у вказаній позиції. У повернутому векторі [код]x[/"
-"code] — стовпець, а [код]y[/code] — рядок. \n"
+"Повертає рядок і стовпець у вказаній позиції. У повернутому векторі [code]x[/"
+"code] — стовпець, а [code]y[/code] — рядок. \n"
 "Якщо [param clamp_line] має значення [code]false[/code] і [param position] "
 "знаходиться під останнім рядком, повертається [code]Vector2i(-1, -1)[/"
 "code]. \n"
@@ -170329,7 +170370,7 @@ msgstr ""
 "[code]точки[/code] - [PackedVector3Array], що містить контурні точки. "
 "[code]x[/code] і [code]y[/code] – координати точки. [code]z[/code] – це тип "
 "точки з використанням значень [enum ContourPointTag]. \n"
-"[код]контури[/код] - [PackedInt32Array], що містить індекси кінцевих точок "
+"[code]контури[/code] - [PackedInt32Array], що містить індекси кінцевих точок "
 "кожного контуру. \n"
 "[code]orientation[/code] - [bool], контурна орієнтація. Якщо [code]true[/"
 "code], необхідно заповнити контури за годинниковою стрілкою. \n"
@@ -185285,7 +185326,7 @@ msgstr ""
 "буде оцінювати [code]true[/code]."
 
 msgid "3Blue1Brown Essence of Linear Algebra"
-msgstr "3Blue1Brown Єдність лінійного альгебра"
+msgstr "3Blue1Brown Сутність лінійної алгебри"
 
 msgid ""
 "Constructs a default-initialized [Vector2] with all components set to "
@@ -185365,18 +185406,20 @@ msgid ""
 "vector and the given [param control_1], [param control_2], and [param end] "
 "points."
 msgstr ""
-"Повертає похідну на даній [param t] на [url=https://en.wikipedia.org/wiki/"
-"B%C3%A9zier_curve]Безерська крива[/url], визначена цим вектором і надана "
-"[param control_1], [param control_2], і [param end] точки."
+"Повертає похідну в заданій точці [param t] на [url=https://uk.wikipedia.org/"
+"wiki/%D0%9A%D1%80%D0%B8%D0%B2%D0%B0_%D0%91%D0%B5%D0%B7%D1%8C%D1%94]Кривій "
+"Безьє[/url], визначеній цим вектором і заданими точками [param control_1], "
+"[param control_2], та [param end]."
 
 msgid ""
 "Returns the point at the given [param t] on the [url=https://en.wikipedia.org/"
 "wiki/B%C3%A9zier_curve]Bézier curve[/url] defined by this vector and the "
 "given [param control_1], [param control_2], and [param end] points."
 msgstr ""
-"Повертає точку на даній [param t] на [url=https://en.wikipedia.org/wiki/"
-"B%C3%A9zier_curve]Безерська крива[/url], визначена цим вектором і надана "
-"[param control_1], [param control_2], і [param end] точки."
+"Повертає точку в заданій точці [param t] на [url=https://uk.wikipedia.org/"
+"wiki/%D0%9A%D1%80%D0%B8%D0%B2%D0%B0_%D0%91%D0%B5%D0%B7%D1%8C%D1%94]Кривій "
+"Безьє[/url], визначеній цим вектором і заданими точками [param control_1], "
+"[param control_2], та [param end]."
 
 msgid ""
 "Returns the vector \"bounced off\" from a line defined by the given normal "
@@ -185393,24 +185436,24 @@ msgid ""
 "Returns a new vector with all components rounded up (towards positive "
 "infinity)."
 msgstr ""
-"Повертає новий вектор з усіма компонентами, що закруглюються вгору (вперед "
-"позитивну нескінченність)."
+"Повертає новий вектор, у якого всі компоненти округлені до більшого цілого "
+"(до додатної нескінченності)."
 
 msgid ""
 "Returns a new vector with all components clamped between the components of "
 "[param min] and [param max], by running [method @GlobalScope.clamp] on each "
 "component."
 msgstr ""
-"Повертає новий вектор з усіма компонентами, зафіксованими між компонентами "
-"[param min] і [param max], запустивши [метод @GlobalScope.clamp] на кожному "
-"компоненті."
+"Повертає новий вектор, у якого всі компоненти обмежені між відповідними "
+"компонентами [param min] і [param max], викликаючи [method @GlobalScope."
+"clamp] для кожного компоненту."
 
 msgid ""
 "Returns a new vector with all components clamped between [param min] and "
 "[param max], by running [method @GlobalScope.clamp] on each component."
 msgstr ""
-"Повертає новий вектор з усіма компонентами, зафіксованими між [param min] і "
-"[param max], запустивши [метод @GlobalScope.clamp] на кожному компоненті."
+"Повертає новий вектор, у якого всі компоненти обмежені між [param min] і "
+"[param max], викликаючи [method @GlobalScope.clamp] для кожного компоненту."
 
 msgid ""
 "Returns the 2D analog of the cross product for this vector and [param with].\n"
@@ -185439,10 +185482,10 @@ msgid ""
 "[param weight]. [param weight] is on the range of 0.0 to 1.0, representing "
 "the amount of interpolation."
 msgstr ""
-"Виконує кубічне міжполодження між цим вектором та [param b] за допомогою "
-"[param pre_a] та [param post_b] як ручки, і повертає результат на позицію "
-"[param вага]. [param вага] знаходиться на діапазоні 0.0 до 1,0, що "
-"представляє кількість міжполяризації."
+"Виконує кубічну інтерполяцію між цим вектором і [param b], використовуючи "
+"[param pre_a] і [param post_b] як контрольні точки, та повертає результат у "
+"позиції [param weight]. [param weight] знаходиться в діапазоні від 0.0 до 1.0 "
+"і визначає ступінь інтерполяції."
 
 msgid ""
 "Performs a cubic interpolation between this vector and [param b] using [param "
@@ -185452,29 +185495,29 @@ msgid ""
 "It can perform smoother interpolation than [method cubic_interpolate] by the "
 "time values."
 msgstr ""
-"Виконує кубічне міжполодження між цим вектором та [param b] за допомогою "
-"[param pre_a] та [param post_b] як ручки, і повертає результат на позицію "
-"[param вага]. [param вага] знаходиться на діапазоні 0.0 до 1,0, що "
-"представляє кількість міжполяризації.\n"
-"Він може виконувати плавлення, ніж [метод кубічний_інтерпольат] за значеннями "
-"часу."
+"Виконує кубічну інтерполяцію між цим вектором і [param b], використовуючи "
+"[param pre_a] і [param post_b] як контрольні точки, та повертає результат у "
+"позиції [param weight]. [param weight] знаходиться в діапазоні від 0.0 до 1.0 "
+"і визначає ступінь інтерполяції.\n"
+"Може виконувати плавнішу інтерполяцію, ніж [method cubic_interpolate]), "
+"завдяки використанню значень часу."
 
 msgid ""
 "Returns the normalized vector pointing from this vector to [param to]. This "
 "is equivalent to using [code](b - a).normalized()[/code]."
 msgstr ""
-"Повертає нормалізоване векторування з цього вектора до [пара до]. [code](b - "
-"a).normalized()[/code]."
+"Повертає нормалізований вектор, що вказує від цього вектора до [param to]. Це "
+"еквівалентно виразу [code](b - a).normalized()[/code]."
 
 msgid ""
 "Returns the squared distance between this vector and [param to].\n"
 "This method runs faster than [method distance_to], so prefer it if you need "
 "to compare vectors or need the squared distance for some formula."
 msgstr ""
-"Повертаємо квадратну відстань між цим вектором і [парм до].\n"
-"Цей метод працює швидше, ніж [метод дистанції_до], тому віддайте перевагу "
-"його, якщо потрібно порівняти вектори або потрібно квадратну відстань для "
-"деяких формул."
+"Повертає квадрат відстані між цим вектором і [param to].\n"
+"Цей метод працює швидше, ніж [method distance_to], тому надавайте йому "
+"перевагу, якщо потрібно порівнювати вектори або використовувати квадрат "
+"відстані у формулі."
 
 msgid "Returns the distance between this vector and [param to]."
 msgstr "Повертає відстань між цим вектором і [param до]."
@@ -185492,21 +185535,23 @@ msgid ""
 "aligned.\n"
 "[b]Note:[/b] [code]a.dot(b)[/code] is equivalent to [code]b.dot(a)[/code]."
 msgstr ""
-"Повертає до цього вектора і [пара з]. Це можна використовувати для порівняння "
-"кута між двома векторами. Наприклад, це може бути використаний для визначення "
-"того, чи загрожує ворога.\n"
-"Продукт точка буде [code]0[/code] для правого кута (90 градусів), більш ніж 0 "
-"для кутів вузькі, ніж 90 градусів і менше 0 для кутів ширше 90 градусів.\n"
-"При використанні блоків (нормалізовані) вектори, результат завжди буде між "
-"[code]-1.0[/code] (кут висоти 180) коли вектори облицюються протилежними "
-"напрямами, а [code]1.0[/code] (0кут ступінь) при вирівнянні векторів.\n"
-"[b]Note:[/b] [code]a.dot(b)[/code] еквівалент [code]b.dot(a)[/code]."
+"Повертає скалярний добуток цього вектора і [param with]. Це можна "
+"використовувати для порівняння кута між двома векторами. Наприклад, цей метод "
+"можна застосувати, щоб визначити, чи ворог дивиться на гравця.\n"
+"Скалярний добуток буде [code]0[/code] для прямого кута (90 градусів), більший "
+"за 0, якщо кут менший за 90 градусів і менший за 0, якщо кут більший за 90 "
+"градусів.\n"
+"При використанні одиничних (нормалізованих) векторів результат завжди буде "
+"між [code]-1.0[/code] (кут 180 градусів), коли вектори спрямовані в "
+"протилежних напрямках, та [code]1.0[/code] (кут 0 градусів), коли вектори "
+"співнаправлені.\n"
+"[b]Примітка:[/b] [code]a.dot(b)[/code] еквівалентно [code]b.dot(a)[/code]."
 
 msgid ""
 "Returns a new vector with all components rounded down (towards negative "
 "infinity)."
 msgstr ""
-"Повертає новий вектор з усіма компонентами, що закруглені вниз (до негативної "
+"Повертає новий вектор, у якого всі компоненти округлені вниз (до від'ємної "
 "нескінченності)."
 
 msgid ""
@@ -185532,22 +185577,22 @@ msgid ""
 "Returns [code]true[/code] if this vector and [param to] are approximately "
 "equal, by running [method @GlobalScope.is_equal_approx] on each component."
 msgstr ""
-"Повертає [code]true[/code], якщо цей вектор і [param to] є приблизно рівні, "
-"запустивши [метод @GlobalScope.is_equal_about] на кожному компоненті."
+"Повертає [code]true[/code], якщо цей вектор і [param to] є приблизно рівними, "
+"викликаючи [method @GlobalScope.is_equal_approx] для кожного компоненту."
 
 msgid ""
 "Returns [code]true[/code] if this vector is finite, by calling [method "
 "@GlobalScope.is_finite] on each component."
 msgstr ""
-"Повертає [code]true[/code], якщо цей вектор скінчив, викликаючи [метод "
-"@GlobalScope.is_finite] на кожному компоненті."
+"Повертає [code]true[/code], якщо цей вектор є скінченним, викликаючи [method "
+"@GlobalScope.is_finite] на кожному компоненту."
 
 msgid ""
 "Returns [code]true[/code] if the vector is normalized, i.e. its length is "
 "approximately equal to 1."
 msgstr ""
 "Повертає [code]true[/code], якщо вектор нормалізований, тобто його довжина "
-"дорівнює 1."
+"приблизно дорівнює 1."
 
 msgid ""
 "Returns [code]true[/code] if this vector's values are approximately zero, by "
@@ -185555,10 +185600,10 @@ msgid ""
 "This method is faster than using [method is_equal_approx] with one value as a "
 "zero vector."
 msgstr ""
-"Повертає [code]true[/code], якщо це значення вектора є приблизно нуль, "
-"запустивши [метод @GlobalScope.is_zero_близько] на кожному компоненті.\n"
-"Цей метод швидше, ніж використання [метод_equal_about] з одним значенням як "
-"нульовий вектор."
+"Повертає [code]true[/code], якщо значення цього вектора приблизно дорівнюють "
+"нулю, викликаючи [method @GlobalScope.is_zero_approx] на кожному компоненті.\n"
+"Цей метод працює швидше, ніж використання [method is_equal_approx], із одним "
+"значенням як нульовий вектор."
 
 msgid "Returns the length (magnitude) of this vector."
 msgstr "Повертає довжину (величину) цього вектору."
@@ -185568,19 +185613,20 @@ msgid ""
 "This method runs faster than [method length], so prefer it if you need to "
 "compare vectors or need the squared distance for some formula."
 msgstr ""
-"Повертаємо квадратну довжину (скрава величина) цього вектора.\n"
-"Цей метод працює швидше, ніж [метод довжини], тому віддайте перевагу його, "
-"якщо потрібно порівняти вектори або потрібно відстань квадрата для деяких "
-"формул."
+"Повертає квадрат довжини (квадрат величини) цього вектора.\n"
+"Цей метод працює швидше, ніж [method length], тому віддавайте йому перевагу, "
+"якщо вам потрібно порівняти вектори або потрібен квадрат відстані для якоїсь "
+"формули."
 
 msgid ""
 "Returns the result of the linear interpolation between this vector and [param "
 "to] by amount [param weight]. [param weight] is on the range of [code]0.0[/"
 "code] to [code]1.0[/code], representing the amount of interpolation."
 msgstr ""
-"Повертає результат лінійної міжполяції між цим вектором та [парм до] на суму "
-"[памна вага]. [param вага] знаходиться на діапазоні [code]0.0[/code] до "
-"[code]1.0[/code], що представляє кількість міжполяризації."
+"Повертає результат лінійної інтерполяції між цим вектором та [param to] на "
+"величину [param weight]. Значення [param weight] повинно знаходитися в "
+"діапазоні від [code]0.0[/code] до [code]1.0[/code] і представляє ступінь "
+"інтерполяції."
 
 msgid ""
 "Returns the vector with a maximum length by limiting its length to [param "
@@ -185593,8 +185639,9 @@ msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector2(maxf(x, with.x), maxf(y, with.y))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [парам з], еквівалентний "
-"[code]Vector2(maxf(x, з.x), максf(y, з.y)[/code]."
+"Повертає вектор, кожен компонент якого є максимальним серед відповідних "
+"компонентів цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector2(maxf(x, with.x), maxf(y, with.y))[/code]."
 
 msgid ""
 "Returns the axis of the vector's highest value. See [code]AXIS_*[/code] "
@@ -185607,15 +185654,16 @@ msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector2(maxf(x, with), maxf(y, with))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector2(maxf(x, з), максf(y, з))[/code]."
+"Повертає компонентний максимум цього вектора і [param with], еквівалентно "
+"[code]Vector2(maxf(x, with), maxf(y, with))[/code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector2(minf(x, with.x), minf(y, with.y))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector2(minf(x, з.x), minf(y, з.y)[/code]."
+"Повертає вектор, кожен компонент якого є мінімальним серед відповідного "
+"компонента цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector2(minf(x, with.x), minf(y, with.y))[/code]."
 
 msgid ""
 "Returns the axis of the vector's lowest value. See [code]AXIS_*[/code] "
@@ -185628,15 +185676,15 @@ msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector2(minf(x, with), minf(y, with))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector2(minf(x, з), minf(y, з))[/code]."
+"Повертає компонентний мінімум цього вектора та [param with]. Еквівалентно "
+"[code]Vector2(minf(x, with), minf(y, with))[/code]."
 
 msgid ""
 "Returns a new vector moved toward [param to] by the fixed [param delta] "
 "amount. Will not go past the final value."
 msgstr ""
-"Повертає новий вектор, який переміщається у напрямку [парам до] за фіксованою "
-"[param delta]. Не зайдемо остаточне значення."
+"Повертає новий вектор, зміщений у напрямку [param to] на фіксовану величину "
+"[param delta]. Не виходить за межі кінцевого значення."
 
 msgid ""
 "Returns the result of scaling the vector to unit length. Equivalent to "
@@ -185645,11 +185693,11 @@ msgid ""
 "[b]Note:[/b] This function may return incorrect values if the input vector "
 "length is near zero."
 msgstr ""
-"Повертає результат масштабування вектора до довжини агрегату. [code]v / v. "
-"Довжина ()[/code]. [code](0, 0)[/code] if [code]v.length() == 0[/code]. "
-"Дивись також [метод_нормалізовані].\n"
-"[b]Примітка:[/b] Ця функція може повернути некоректні значення, якщо довжина "
-"вектора знаходиться біля нуля."
+"Повертає результат масштабування вектора до одиничної довжини. Еквівалентно "
+"[code]v / v.length()[/code]. Повертає [code](0, 0)[/code], якщо [code]v."
+"length() == 0[/code]. Див. також [method is_normalized].\n"
+"[b]Примітка:[/b] Ця функція може повертати некоректні значення, якщо довжина "
+"вхідного вектора наближена до нуля."
 
 msgid ""
 "Returns a perpendicular vector rotated 90 degrees counter-clockwise compared "
@@ -185679,11 +185727,11 @@ msgid ""
 "[b]Note:[/b] If the vector [param b] is a zero vector, the components of the "
 "resulting new vector will be [constant @GDScript.NAN]."
 msgstr ""
-"Повертає новий вектор, отриманий від проектування цього вектора на заданий "
-"вектор [param b]. Отриманий новий вектор паралельно [param b]. Дивись також "
-"[Метод слайд].\n"
-"[b]Note:[/b] Якщо вектор [param b] є нульовим вектором, компоненти отриманого "
-"нового вектора будуть [constant @GDScript.NAN]."
+"Повертає новий вектор, отриманий проєкцією цього вектора на заданий вектор "
+"[param b]. Отриманий вектор буде паралельним до [param b]. Див. також [method "
+"slide].\n"
+"[b]Примітка:[/b] Якщо [param b] є нульовим вектором, компоненти отриманого "
+"вектора будуть рівні [constant @GDScript.NAN]."
 
 msgid ""
 "Returns the result of reflecting the vector from a line defined by the given "
@@ -185715,8 +185763,8 @@ msgid ""
 "Returns a new vector with all components rounded to the nearest integer, with "
 "halfway cases rounded away from zero."
 msgstr ""
-"Повертає новий вектор з усіма компонентами, що занурилися до найближчого "
-"цілого, з напівпричепом округли від нуля."
+"Повертає новий вектор, у якому всі компоненти округлені до найближчого цілого "
+"числа."
 
 msgid ""
 "Returns a new vector with each component set to [code]1.0[/code] if it's "
@@ -185724,10 +185772,10 @@ msgid ""
 "zero. The result is identical to calling [method @GlobalScope.sign] on each "
 "component."
 msgstr ""
-"Повертає новий вектор з кожним компонентом, встановленим до [code]1.0[/code], "
-"якщо це позитивне, [code]-1.0[/code], якщо це негативно, і [code]0.0[/code], "
-"якщо це нуль. Результат ідентичний виклику [метод @GlobalScope.sign] на "
-"кожному компоненті."
+"Повертає новий вектор, у якому кожен компонент приймає значення [code]1.0[/"
+"code], якщо він додатний, [code]-1.0[/code], якщо від'ємний, і [code]0.0[/"
+"code], якщо нульовий. Результат ідентичний виклику [method @GlobalScope.sign] "
+"для кожного компонента."
 
 msgid ""
 "Returns the result of spherical linear interpolation between this vector and "
@@ -185781,49 +185829,50 @@ msgid ""
 "The vector's X component. Also accessible by using the index position [code]"
 "[0][/code]."
 msgstr ""
-"Компонент вектора X. Також доступні за допомогою індексного положення [code]"
+"Векторний компонент X. Також доступний за допомогою індексної позиції [code]"
 "[0][/code]."
 
 msgid ""
 "The vector's Y component. Also accessible by using the index position [code]"
 "[1][/code]."
 msgstr ""
-"Компонент вектора Y. Також доступні за допомогою індексного положення "
-"[code]1[/code]."
+"Векторний компонент Y. Також доступний за допомогою індексної позиції [code]"
+"[1][/code]."
 
 msgid ""
 "Enumerated value for the X axis. Returned by [method max_axis_index] and "
 "[method min_axis_index]."
 msgstr ""
-"Увімкнути значення для осі X. Повернутися до [метод max_axis_index] і [метод "
-"min_axis_index]."
+"Значення переліку для осі X. Повертається методами [method max_axis_index] і "
+"[method min_axis_index]."
 
 msgid ""
 "Enumerated value for the Y axis. Returned by [method max_axis_index] and "
 "[method min_axis_index]."
 msgstr ""
-"Увімкнути значення для осі Y. Повернутися до [метод max_axis_index] і [метод "
-"min_axis_index]."
+"Значення переліку для осі Y. Повертається методами [method max_axis_index] і "
+"[method min_axis_index]."
 
 msgid "Zero vector, a vector with all components set to [code]0[/code]."
 msgstr ""
-"Вектор Zero, вектор з усіма компонентами, встановленими до [code]0[/code]."
+"Нульовий вектор — вектор, у якого всі компоненти встановлені в [code]0[/code]."
 
 msgid "One vector, a vector with all components set to [code]1[/code]."
 msgstr ""
-"Один вектор, вектор з усіма компонентами, встановленими до [code]1[/code]."
+"Одиничний вектор — вектор, у якого всі компоненти встановлені в [code]1[/"
+"code]."
 
 msgid ""
 "Infinity vector, a vector with all components set to [constant @GDScript.INF]."
 msgstr ""
-"Вектор нескінченності, вектор з усіма компонентами, встановленими до "
+"Вектор нескінченності — вектор, у якого всі компоненти встановлені в "
 "[constant @GDScript.INF]."
 
 msgid "Left unit vector. Represents the direction of left."
-msgstr "Вектор лівої одиниці. Представляє напрямок зліва."
+msgstr "Одиничний вектор ліворуч. Представляє напрямок ліворуч."
 
 msgid "Right unit vector. Represents the direction of right."
-msgstr "Вектор правого блоку. Представляє напрямок права."
+msgstr "Одиничний вектор праворуч. Представляє напрямок праворуч."
 
 msgid "Up unit vector. Y is down in 2D, so this vector points -Y."
 msgstr "Вектор блоку. Я вниз в 2D, тому це векторні точки -Y."
@@ -186077,29 +186126,31 @@ msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector2i(maxi(x, with.x), maxi(y, with.y))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector2i(maxi(x, з.x), maxi(y, з.y)[/code]."
+"Повертає вектор, кожен компонент якого є максимальним серед відповідних "
+"компонентів цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector2i(maxi(x, with.x), maxi(y, with.y))[/code]."
 
 msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector2i(maxi(x, with), maxi(y, with))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector2i(maxi(x, з), maxi(y, з))[/code]."
+"Повертає компонентний максимум цього вектора і [param with], еквівалентно "
+"[code]Vector2i(maxi(x, with), maxi(y, with))[/code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector2i(mini(x, with.x), mini(y, with.y))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector2i(mini(x, з.x), mini(y, з.y)[/code]."
+"Повертає вектор, кожен компонент якого є мінімальним серед відповідного "
+"компонента цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector2i(mini(x, with.x), mini(y, with.y))[/code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector2i(mini(x, with), mini(y, with))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector2i(mini(x, з), mini(y, з))[/code]."
+"Повертає компонентний мінімум цього вектора та [param with]. Еквівалентно "
+"[code]Vector2i(mini(x, with), mini(y, with))[/code]."
 
 msgid ""
 "Returns a new vector with each component set to [code]1[/code] if it's "
@@ -186107,10 +186158,10 @@ msgid ""
 "The result is identical to calling [method @GlobalScope.sign] on each "
 "component."
 msgstr ""
-"Повертає новий вектор з кожним компонентом, встановленим до [code]1[/code], "
-"якщо це позитивне, [code]-1[/code], якщо це негативно, і [code]0[/code], якщо "
-"це нуль. Результат ідентичний виклику [метод @GlobalScope.sign] на кожному "
-"компоненті."
+"Повертає новий вектор, у якому кожен компонент приймає значення [code]1[/"
+"code], якщо він додатний, [code]-1[/code], якщо від'ємний, і [code]0[/code], "
+"якщо нульовий. Результат ідентичний виклику [method @GlobalScope.sign] для "
+"кожного компонента."
 
 msgid ""
 "Returns a new vector with each component snapped to the closest multiple of "
@@ -186316,7 +186367,7 @@ msgstr ""
 "операція закріплює напрямок вектора, зберігаючи однакову величину."
 
 msgid "A 3D vector using floating-point coordinates."
-msgstr "Вектор 3D з використанням плаваючих координат."
+msgstr "3D-вектор, що використовує координати з рухомою комою."
 
 msgid ""
 "A 3-element structure that can be used to represent 3D coordinates or any "
@@ -186330,33 +186381,35 @@ msgid ""
 "code] if it's equal to [code]Vector3(0, 0, 0)[/code]. Otherwise, a Vector3 "
 "will always evaluate to [code]true[/code]."
 msgstr ""
-"3-оелементна структура, яка може бути використана для представлення координат "
-"3D або будь-яких інших потрійних значень.\n"
-"Використовується плаваючі координати точки. За замовчуванням ці значення "
-"плаваючі точки використовують 32-бітну точність, на відміну від [float], яка "
-"завжди 64-біт. Якщо потрібна подвійна точність, зніміть двигун за допомогою "
-"параметра [code]precision=double[/code].\n"
-"Переглянути [Vector3i] для свого цілого аналога.\n"
-"[b]Примітка:[/b] У булевому контексті Вектор3 оцінюватиме [code]false[/code], "
-"якщо це дорівнює [code]Vector3(0, 0)[/code]. Вектор 3 завжди буде оцінювати "
-"[code]true[/code]."
+"3-елементна структура, яка може використовуватися для представлення 3D-"
+"координат або будь-якої іншої трійки числових значень.\n"
+"Вона використовує координати з рухомою комою. За замовчуванням ці значення "
+"мають 32-бітну точність, на відміну від [float], який завжди має 64-бітну "
+"точність. Якщо потрібна подвійна точність, скомпілюйте рушій з опцією "
+"[code]precision=double[/code].\n"
+"Див. також [Vector3i] для цілочисельного аналога.\n"
+"[b]Примітка:[/b] У булевому контексті [Vector3] буде оцінюватися як "
+"[code]false[/code], якщо дорівнює [code]Vector3(0, 0, 0)[/code]. В інших "
+"випадках [Vector3] завжди буде оцінюватися як [code]true[/code]."
 
 msgid ""
 "Constructs a default-initialized [Vector3] with all components set to "
 "[code]0[/code]."
-msgstr "[Vector3] з усіма компонентами, встановленими до [code]0[/code]."
+msgstr ""
+"Створює стандартну ініціалізацію [Vector3] з усіма компонентами, "
+"встановленими на [code]0[/code]."
 
 msgid "Constructs a [Vector3] as a copy of the given [Vector3]."
-msgstr "[Vector3] як копія даної [Vector3]."
+msgstr "Створює [Vector3] як копію заданого [Vector3]."
 
 msgid "Constructs a new [Vector3] from [Vector3i]."
 msgstr "Створює новий [Vector3] з [Vector3i]."
 
 msgid "Returns a [Vector3] with the given components."
-msgstr "Повернення [Vector3] з заданими компонентами."
+msgstr "Повертає [Vector3] з заданими компонентами."
 
 msgid "Returns the unsigned minimum angle to the given vector, in radians."
-msgstr "Повертає невизнаний мінімальний кут до заданого вектора, в радіях."
+msgstr "Повертає невід’ємний мінімальний кут до заданого вектора, в радіанах."
 
 msgid ""
 "Returns the vector \"bounced off\" from a plane defined by the given normal "
@@ -186364,9 +186417,10 @@ msgid ""
 "[b]Note:[/b] [method bounce] performs the operation that most engines and "
 "frameworks call [code skip-lint]reflect()[/code]."
 msgstr ""
-"Повертаємо вектор «вимкнено» з площини, визначеної заданим нормам [param n].\n"
-"[b]Note:[/b] [метод bounce] виконує операцію, яка більшість двигунів і рамок "
-"виклику [код пропустити-лінт]reflect()[/код]."
+"Повертає вектор, «відбитий» від площини, визначеної заданою нормаллю [param "
+"n].\n"
+"[b]Примітка:[/b] [method bounce] виконує операцію, яку більшість рушіїв і "
+"фреймворків називають [code skip-lint]reflect()[/code]."
 
 msgid ""
 "Returns the cross product of this vector and [param with].\n"
@@ -186377,40 +186431,42 @@ msgid ""
 "this returns an empty vector, making it useful for testing if two vectors are "
 "parallel."
 msgstr ""
-"Повертає поперечний продукт цього вектора і [пара з].\n"
-"Це повертає вектор перпендикулярно як до цього, так і [парам], який стане "
-"нормальним вектором площини, визначеної двома векторами. Як є два такі "
-"вектори, в протилежних напрямках, цей метод повертає вектор, визначений "
-"координатною системою. Якщо два вектори паралельно це повертає порожній "
-"вектор, що робить його корисним для тестування, якщо два вектори паралельні."
+"Повертає векторний добуток цього вектора і [param with].\n"
+"Це повертає вектор, перпендикулярний до обох векторів (цього і [param with]), "
+"що відповідає вектору нормалі площини, визначеної цими двома векторами. "
+"Оскільки існує два таких вектори в протилежних напрямках, цей метод повертає "
+"той, що визначається правилом правої руки. Якщо два вектори паралельні, метод "
+"повертає нульовий вектор, що корисно для перевірки паралельності векторів."
 
 msgid ""
 "Returns the inverse of the vector. This is the same as [code]Vector3(1.0 / v."
 "x, 1.0 / v.y, 1.0 / v.z)[/code]."
 msgstr ""
-"Повертає попереку вектора. Це так само, як [code]Vector3(1.0 / v.x, 1.0 / v."
-"y, 1.0 / v.z)[/code]."
+"Повертає обернений вектор. Це те саме, що [code]Vector3(1.0 / v.x, 1.0 / v.y, "
+"1.0 / v.z)[/code]."
 
 msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector3(maxf(x, with.x), maxf(y, with.y), maxf(z, with.z))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний [code]Vector3 "
-"(maxf(x, з.x), максf(y, з.y), максf(z, з.z)[/code]."
+"Повертає вектор, кожен компонент якого є максимальним серед відповідних "
+"компонентів цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector3(maxf(x, with.x), maxf(y, with.y), maxf(z, with.z))[/code]."
 
 msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector3(maxf(x, with), maxf(y, with), maxf(z, with))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector3(maxf(x, з), максf(y, з), максf(z, з)[/code]."
+"Повертає компонентний максимум цього вектора і [param with], еквівалентно "
+"[code]Vector3(maxf(x, with), maxf(y, with), maxf(z, with))[/code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector3(minf(x, with.x), minf(y, with.y), minf(z, with.z))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний [code]Vector3 "
-"(minf(x, з.x), minf(y, з.y), minf(z, з.z)[/code]."
+"Повертає вектор, кожен компонент якого є мінімальним серед відповідного "
+"компонента цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector3(minf(x, with.x), minf(y, with.y), minf(z, with.z))[/code]."
 
 msgid ""
 "Returns the axis of the vector's lowest value. See [code]AXIS_*[/code] "
@@ -186423,8 +186479,8 @@ msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector3(minf(x, with), minf(y, with), minf(z, with))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector3(minf(x, з), minf(z, з)[/code]."
+"Повертає компонентний мінімум цього вектора та [param with]. Еквівалентно "
+"[code]Vector3(minf(x, with), minf(y, with), minf(z, with))[/code]."
 
 msgid ""
 "Returns the result of scaling the vector to unit length. Equivalent to "
@@ -186433,18 +186489,18 @@ msgid ""
 "[b]Note:[/b] This function may return incorrect values if the input vector "
 "length is near zero."
 msgstr ""
-"Повертає результат масштабування вектора до довжини агрегату. [code]v / v. "
-"Довжина ()[/code]. Повертаємо [code](0, 0)[/code], якщо [code]v.length() == "
-"0[/code]. Дивись також [метод_нормалізовані].\n"
-"[b]Примітка:[/b] Ця функція може повернути некоректні значення, якщо довжина "
-"вектора знаходиться біля нуля."
+"Повертає результат масштабування вектора до одиничної довжини. Еквівалентно "
+"[code]v / v.length()[/code]. Повертає [code](0, 0, 0)[/code], якщо [code]v."
+"length() == 0[/code]. Див. також [method is_normalized].\n"
+"[b]Примітка:[/b] Ця функція може повертати некоректні значення, якщо довжина "
+"вхідного вектора наближена до нуля."
 
 msgid ""
 "Returns the [Vector3] from an octahedral-compressed form created using "
 "[method octahedron_encode] (stored as a [Vector2])."
 msgstr ""
-"Повернення [Vector3] з octahedral-compressed форми, створеної за допомогою "
-"[метод octahedron_encode] (відкривається як [Vector2])."
+"Повертає [Vector3] із октаедрично стиснутої форми, створеної за допомогою "
+"[method octahedron_encode] (збереженої як [Vector2])."
 
 msgid ""
 "Returns the octahedral-encoded (oct32) form of this [Vector3] as a [Vector2]. "
@@ -186459,20 +186515,20 @@ msgid ""
 "[b]Note:[/b] Octahedral compression is [i]lossy[/i], although visual "
 "differences are rarely perceptible in real world scenarios."
 msgstr ""
-"Повернутися до октамедра-кодованого (окт32) форми цього [Vector3] як "
-"[Vector2]. Оскільки [Vector2] займає 1/3 менше пам'яті порівняно з [Vector3], "
-"ця форма стиснення може бути використана для проходження більшої кількості "
-"[метод нормалізованого] [Vector3] без збільшення потреби зберігання або "
-"пам'яті. Дивитися також [метод octahedron_decode].\n"
-"[b]Note:[/b] [метод octahedron_encode] можна використовувати тільки для "
-"векторів [метод нормалізований]. [method octahedron_encode] does [i]not[/i] "
-"перевірити, чи це [Vector3] нормалізовано, і поверне значення, яке не "
-"пригнічує до початкового значення, якщо [Vector3] не нормалізовано.\n"
-"[b]Примітка:[/b] Октамедальна компресія [i] lossy[/i], хоча візуальні "
-"відмінності рідко схильні до реальних світових сценаріїв."
+"Повертає октаедрично закодовану (oct32) форму цього [Vector3] у вигляді "
+"[Vector2]. Оскільки [Vector2] займає на 1/3 менше пам’яті порівняно з "
+"[Vector3], цей метод стиснення дозволяє передавати більшу кількість "
+"нормалізованих ([method normalized]) векторів [Vector3] без збільшення вимог "
+"до пам’яті чи сховища. Див. також [method octahedron_decode].\n"
+"[b]Примітка:[/b] [method octahedron_encode] можна застосовувати лише до "
+"нормалізованих ([method normalized]) векторів. Функція [i]не[/i] перевіряє, "
+"чи є [Vector3] нормалізованим, і поверне значення, яке не декодується у "
+"вихідний вектор, якщо вхідний [Vector3] не нормалізований.\n"
+"[b]Примітка:[/b] Октаедричне стиснення є [i]з втратами[/i], хоча візуальні "
+"відмінності зазвичай непомітні в реальних сценаріях."
 
 msgid "Returns the outer product with [param with]."
-msgstr "Повертає зовнішній продукт [param]."
+msgstr "Повертає зовнішній добуток із [param with]."
 
 msgid ""
 "Returns the result of reflecting the vector through a plane defined by the "
@@ -186485,24 +186541,24 @@ msgid ""
 "the normal. See also [method bounce] which does what most engines call [code "
 "skip-lint]reflect()[/code]."
 msgstr ""
-"Повертає результат відображення вектора через площину, визначену заданим "
-"нормальним вектором [param n].\n"
-"[b]Примітка:[/b] [метод відображення] відрізняється від того, що інші двигуни "
-"і рамки виклику [код пропустити-лінт]reflect()[/код]. В інших двигунах [код "
-"пропустити-лінт]reflect()[/код] повертає результат вектора, що відображає "
-"задану площину. Відбиття, таким чином, проходить через даній нормалі. В той "
-"час як у Godot відбиття проходить через площину і може бути думка про те, що "
-"вимовляєте нормально. Дивись також [метод bounce], що робить те, що більшість "
-"двигунів виклику [код пропустити-лінт]reflect()[/code]."
+"Повертає результат відбиття вектора через площину, визначену заданим вектором "
+"нормалі [param n].\n"
+"[b]Примітка:[/b] [method reflect] відрізняється від того, що інші рушії та "
+"фреймворки називають [code skip-lint]reflect()[/code]. В інших рушіях [code "
+"skip-lint]reflect()[/code] повертає результат вектора, відбитого заданою "
+"площиною. Таким чином, відбиття проходить через заданий вектор нормалі. Тоді "
+"як у Godot відбиття проходить через площину і може розглядатися як відскок "
+"від нормалі. Див. також [method bounce], який робить те, що більшість рушіїв "
+"називають [code skip-lint]reflect()[/code]."
 
 msgid ""
 "Returns the result of rotating this vector around a given axis by [param "
 "angle] (in radians). The axis must be a normalized vector. See also [method "
 "@GlobalScope.deg_to_rad]."
 msgstr ""
-"Повертаємо результат обертання цього вектора навколо заданої осі за допомогою "
-"[параметр] (в редисках). Ось повинна бути нормалізований вектор. Дивись також "
-"[метод @GlobalScope.deg_to_rad]."
+"Повертає результат обертання цього вектора навколо заданої осі [param axis] "
+"на кут [param angle] (у радіанах). Ось має бути нормалізованим вектором. Див. "
+"також [method @GlobalScope.deg_to_rad]."
 
 msgid ""
 "Returns the signed angle to the given vector, in radians. The sign of the "
@@ -186532,15 +186588,15 @@ msgid ""
 "The vector's Z component. Also accessible by using the index position [code]"
 "[2][/code]."
 msgstr ""
-"Вектор Z компонент. Також доступні за допомогою індексного положення [code] "
+"Векторний компонент Z. Також доступний за допомогою індексної позиції [code]"
 "[2][/code]."
 
 msgid ""
 "Enumerated value for the Z axis. Returned by [method max_axis_index] and "
 "[method min_axis_index]."
 msgstr ""
-"Увімкнути значення для осі Z. Повернутися до [метод max_axis_index] і [метод "
-"min_axis_index]."
+"Значення переліку для осі Z. Повертається методами [method max_axis_index] і "
+"[method min_axis_index]."
 
 msgid ""
 "Left unit vector. Represents the local direction of left, and the global "
@@ -186557,10 +186613,10 @@ msgstr ""
 "напрямок на схід."
 
 msgid "Up unit vector."
-msgstr "Вектор блоку."
+msgstr "Одиничний вектор вверх."
 
 msgid "Down unit vector."
-msgstr "Вектор внизу."
+msgstr "Одиничний вектор вниз."
 
 msgid ""
 "Forward unit vector. Represents the local direction of forward, and the "
@@ -186569,41 +186625,44 @@ msgid ""
 "towards the camera by convention. Use [constant Vector3.MODEL_FRONT] and "
 "similar constants when working in 3D asset space."
 msgstr ""
-"Вектор переадресного блоку. Представляє локальний напрямок експедиції та "
-"глобальний напрямок на північ. Враховуйте, що напрямок експедирування "
-"світильників, камер та ін. відрізняється від 3D-активів, таких як символи, "
-"які стикаються з камерою конвенцією. Використовуйте [constant Vector3. "
-"MODEL_FRONT] та аналогічні константи при роботі в 3D-розташуванні."
+"Одиничний вектор вперед. Представляє локальний напрямок вперед і глобальний "
+"напрямок на північ. Майте на увазі, що напрямок вперед для світла, камер тощо "
+"відрізняється від 3D-ресурсів, таких як персонажі, які за домовленістю "
+"обернені до камери. Використовуйте константи [constant Vector3.MODEL_FRONT] "
+"та подібні під час роботи в просторі 3D-ресурсів."
 
 msgid ""
 "Back unit vector. Represents the local direction of back, and the global "
 "direction of south."
 msgstr ""
-"Вектор задньої частини. Представляє місцевий напрямок спини, а також "
-"глобальний напрямок на південь."
+"Одиничний вектор назад. Представляє локальний напрямок назад і глобальний "
+"напрямок на південь."
 
 msgid "Unit vector pointing towards the left side of imported 3D assets."
-msgstr "Блок векторний натяг на ліву сторону імпортованих 3D активів."
+msgstr "Одиничний вектор, спрямований у лівий бік імпортованих 3D-ресурсів."
 
 msgid "Unit vector pointing towards the right side of imported 3D assets."
-msgstr "Блок вектора, що вказує на праву сторону імпортних активів 3D."
+msgstr "Одиничний вектор, спрямований у правий бік імпортованих 3D-ресурсів."
 
 msgid "Unit vector pointing towards the top side (up) of imported 3D assets."
-msgstr "Блок вектора, що вказує на верхній стороні (до) імпортних активів 3D."
+msgstr ""
+"Одиничний вектор, спрямований у верхній бік (вгору) імпортованих 3D-ресурсів."
 
 msgid ""
 "Unit vector pointing towards the bottom side (down) of imported 3D assets."
 msgstr ""
-"Блок векторного натягу до нижньої сторони (завантажити) імпортних активів 3D."
+"Одиничний вектор, спрямований у нижній бік (вниз) імпортованих 3D-ресурсів."
 
 msgid ""
 "Unit vector pointing towards the front side (facing forward) of imported 3D "
 "assets."
 msgstr ""
-"Блок вектора, що вказує на лицьову сторону (попередній) імпортних активів 3D."
+"Одиничний вектор, спрямований у передній бік (обличчям вперед) імпортованих "
+"3D-ресурсів."
 
 msgid "Unit vector pointing towards the rear side (back) of imported 3D assets."
-msgstr "Вектор вектора в напрямку задньої сторони (зад) імпортних активів 3D."
+msgstr ""
+"Одиничний вектор, спрямований у задній бік (назад) імпортованих 3D-ресурсів."
 
 msgid ""
 "Inversely transforms (multiplies) the [Vector3] by the given [Basis] matrix, "
@@ -186854,29 +186913,31 @@ msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector3i(maxi(x, with.x), maxi(y, with.y), maxi(z, with.z))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector3i(maxi(x, з.x), maxi(y, з.y), maxi(z, with.z)[/code]."
+"Повертає вектор, кожен компонент якого є максимальним серед відповідних "
+"компонентів цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector3i(maxi(x, with.x), maxi(y, with.y), maxi(z, with.z))[/code]."
 
 msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector3i(maxi(x, with), maxi(y, with), maxi(z, with))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector3i(maxi(x, з), maxi(y, з), maxi(z, з)[/code]."
+"Повертає компонентний максимум цього вектора і [param with], еквівалентно "
+"[code]Vector3i(maxi(x, with), maxi(y, with), maxi(z, with))[/code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector3i(mini(x, with.x), mini(y, with.y), mini(z, with.z))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector3i(mini(x, з.x), mini(y, з.y), mini(z, with.z)[/code]."
+"Повертає вектор, кожен компонент якого є мінімальним серед відповідного "
+"компонента цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector3i(mini(x, with.x), mini(y, with.y), mini(z, with.z))[/code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector3i(mini(x, with), mini(y, with), mini(z, with))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector3i(mini(x, з), mini(y, з), mini(z, з)[/code]."
+"Повертає компонентний мінімум цього вектора та [param with]. Еквівалентно "
+"[code]Vector3i(mini(x, with), mini(y, with), mini(z, with))[/code]."
 
 msgid ""
 "Min vector, a vector with all components equal to [code]INT32_MIN[/code]. Can "
@@ -186898,8 +186959,8 @@ msgid ""
 "Forward unit vector. Represents the local direction of forward, and the "
 "global direction of north."
 msgstr ""
-"Вектор переадресного блоку. Представляє локальний напрямок експедиції та "
-"глобальний напрямок на північ."
+"Одиничний вектор вперед. Представляє локальний напрямок вперед і глобальний "
+"напрямок на північ."
 
 msgid ""
 "Gets the remainder of each component of the [Vector3i] with the components of "
@@ -187130,24 +187191,29 @@ msgid ""
 "[code]Vector4(maxf(x, with.x), maxf(y, with.y), maxf(z, with.z), maxf(w, with."
 "w))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний [code]Vector4 "
-"(maxf(x, з.x), максf(y, з.y), максф(z, з.z), максф (w, з.w)[/code]."
+"Повертає вектор, кожен компонент якого є максимальним серед відповідних "
+"компонентів цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector4(maxf(x, with.x), maxf(y, with.y), maxf(z, with.z), maxf(w, with."
+"w))[/code]."
 
 msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector4(maxf(x, with), maxf(y, with), maxf(z, with), maxf(w, with))[/"
 "code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний [code]Vector4 "
-"(maxf(x, з), максf(y, з), максf(z, з), maxf(w, з)[/code]."
+"Повертає компонентний максимум цього вектора і [param with], еквівалентно "
+"[code]Vector4(maxf(x, with), maxf(y, with), maxf(z, with), maxf(w, with))[/"
+"code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector4(minf(x, with.x), minf(y, with.y), minf(z, with.z), minf(w, with."
 "w))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний [code]Vector4 "
-"(minf(x, з.x), minf(y, з.y), minf(z, з.z), minf(w, з.w)[/code]."
+"Повертає вектор, кожен компонент якого є мінімальним серед відповідного "
+"компонента цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector4(minf(x, with.x), minf(y, with.y), minf(z, with.z), minf(w, with."
+"w))[/code]."
 
 msgid ""
 "Returns the axis of the vector's lowest value. See [code]AXIS_*[/code] "
@@ -187161,8 +187227,9 @@ msgid ""
 "[code]Vector4(minf(x, with), minf(y, with), minf(z, with), minf(w, with))[/"
 "code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector4(minf(x, з), minf(z, з), minf(w, з)[/code]."
+"Повертає компонентний мінімум цього вектора та [param with]. Еквівалентно "
+"[code]Vector4(minf(x, with), minf(y, with), minf(z, with), minf(w, with))[/"
+"code]."
 
 msgid ""
 "Returns the result of scaling the vector to unit length. Equivalent to "
@@ -187171,11 +187238,11 @@ msgid ""
 "[b]Note:[/b] This function may return incorrect values if the input vector "
 "length is near zero."
 msgstr ""
-"Повертає результат масштабування вектора до довжини агрегату. [code]v / v. "
-"Довжина ()[/code]. [code](0, 0, 0)[/code] if [code]v.length() == 0[/code]. "
-"Дивись також [метод_нормалізовані].\n"
-"[b]Note:[/b] Ця функція може повернути невірні значення, якщо довжина вектора "
-"знаходиться біля нуля."
+"Повертає результат масштабування вектора до одиничної довжини. Еквівалентно "
+"[code]v / v.length()[/code]. Повертає [code](0, 0, 0, 0)[/code], якщо [code]v."
+"length() == 0[/code]. Див. також [method is_normalized].\n"
+"[b]Примітка:[/b] Ця функція може повертати некоректні значення, якщо довжина "
+"вхідного вектора наближена до нуля."
 
 msgid ""
 "The vector's W component. Also accessible by using the index position [code]"
@@ -187188,8 +187255,8 @@ msgid ""
 "Enumerated value for the W axis. Returned by [method max_axis_index] and "
 "[method min_axis_index]."
 msgstr ""
-"Увімкнути значення для вісь В. Повернутися до [метод max_axis_index] і [метод "
-"min_axis_index]."
+"Значення переліку для осі W. Повертається методами [method max_axis_index] і "
+"[method min_axis_index]."
 
 msgid ""
 "Transforms (multiplies) the [Vector4] by the transpose of the given "
@@ -187435,32 +187502,38 @@ msgid ""
 "[code]Vector4i(maxi(x, with.x), maxi(y, with.y), maxi(z, with.z), maxi(w, "
 "with.w))[/code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector4i(maxi(x, з.x), maxi(y, з.y), maxi(z, з.z), maxi(w, з.w)[/code]."
+"Повертає вектор, кожен компонент якого є максимальним серед відповідних "
+"компонентів цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector4i(maxi(x, with.x), maxi(y, with.y), maxi(z, with.z), maxi(w, "
+"with.w))[/code]."
 
 msgid ""
 "Returns the component-wise maximum of this and [param with], equivalent to "
 "[code]Vector4i(maxi(x, with), maxi(y, with), maxi(z, with), maxi(w, with))[/"
 "code]."
 msgstr ""
-"Повертає компонентний максимум цього і [пара з], еквівалентний "
-"[code]Vector4i(maxi(x, з), maxi(y, з), maxi(z, з), maxi(w, з)[/code]."
+"Повертає компонентний максимум цього вектора і [param with], еквівалентно "
+"[code]Vector4i(maxi(x, with), maxi(y, with), maxi(z, with), maxi(w, with))[/"
+"code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector4i(mini(x, with.x), mini(y, with.y), mini(z, with.z), mini(w, "
 "with.w))[/code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector4i(mini(x, з.x), mini(y, з.y), mini(z, з.z), mini(w, з.w)[/code]."
+"Повертає вектор, кожен компонент якого є мінімальним серед відповідного "
+"компонента цього вектора та вектора [param with]. Еквівалентно "
+"[code]Vector4i(mini(x, with.x), mini(y, with.y), mini(z, with.z), mini(w, "
+"with.w))[/code]."
 
 msgid ""
 "Returns the component-wise minimum of this and [param with], equivalent to "
 "[code]Vector4i(mini(x, with), mini(y, with), mini(z, with), mini(w, with))[/"
 "code]."
 msgstr ""
-"Повертає компонентний мінімум цього і [пара з], еквівалентний "
-"[code]Vector4i(mini(x, з), mini(y, з), mini(z, з), mini(w, з)[/code]."
+"Повертає компонентний мінімум цього вектора та [param with]. Еквівалентно "
+"[code]Vector4i(mini(x, with), mini(y, with), mini(z, with), mini(w, with))[/"
+"code]."
 
 msgid ""
 "Min vector, a vector with all components equal to [code]INT32_MIN[/code]. Can "
diff --git a/engine/doc/translations/zh_CN.po b/engine/doc/translations/zh_CN.po
index 4c0ed525..deaf639e 100644
--- a/engine/doc/translations/zh_CN.po
+++ b/engine/doc/translations/zh_CN.po
@@ -95,11 +95,12 @@
 # 鞲臢螽 <tbin643@gmail.com>, 2024.
 # J_aphasiac <japhasiac@163.com>, 2025.
 # SouthWolf <wp.southwolf@gmail.com>, 2025.
+# BuddhaGrape <3248882725@qq.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine class reference\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
-"PO-Revision-Date: 2025-03-02 14:20+0000\n"
+"PO-Revision-Date: 2025-03-19 02:31+0000\n"
 "Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n"
 "Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
 "projects/godot-engine/godot-class-reference/zh_Hans/>\n"
@@ -108,7 +109,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "All classes"
 msgstr "所有类"
@@ -1973,11 +1974,11 @@ msgid ""
 "@warning_ignore_restore] annotation must be string literals (constant "
 "expressions are not supported)."
 msgstr ""
-"应停止对列在[annotation @warning_ignore_start]后面的告警的忽略。对特定告警类型"
-"的忽略会被重置到工程设置。直到文件末尾之前，该注解可以被省略一边忽略这些告警类"
-"型。\n"
-"[b]注意：[/b]与大多数其他注解不同，注解[annotation @warning_ignore_restore]的"
-"参数必须是字符串字面量（常量表达式不被支持）。"
+"停止忽略列在 [annotation @warning_ignore_start] 注解后面的警告，对特定警告的忽"
+"略将重置为项目设置中的默认配置。该注解可省略，如此则会持续忽略指定警告类型直至"
+"文件末尾。\n"
+"[b]注意：[/b]与大多数其他注解不同，注解 [annotation @warning_ignore_restore] "
+"的参数必须是字符串字面量（不支持常量表达式）。"
 
 msgid ""
 "Starts ignoring the listed warning types until the end of the file or the "
@@ -1997,8 +1998,8 @@ msgid ""
 "@warning_ignore_start] annotation must be string literals (constant "
 "expressions are not supported)."
 msgstr ""
-"开始忽略列出的告警类型，直至文件末尾或带有给定告警类型的注解[annotation "
-"@warning_ignore_restore]。\n"
+"开始忽略列出的警告类型，直至文件末尾或带有给定警告类型的 [annotation "
+"@warning_ignore_restore] 注解处为止。\n"
 "[codeblock]\n"
 "func test():\n"
 "    var a = 1 # Warning (if enabled in the Project Settings).\n"
@@ -2008,9 +2009,9 @@ msgstr ""
 "    @warning_ignore_restore(\"unused_variable\")\n"
 "    var d = 4 # Warning (if enabled in the Project Settings).\n"
 "[/codeblock]\n"
-"[b]提醒：[/b]要抑制单个告警，需改用[annotation @warning_ignore]。\n"
-"[b]提醒：[/b]与大多数其他注解不同，注解[annotation @warning_ignore_start]的参"
-"数必须是字符串字面量（常量表达式不被支持）。"
+"[b]注意：[/b]要抑制单个警告，请改用 [annotation @warning_ignore] 注解。\n"
+"[b]注意：[/b]与大多数其他注解不同，注解 [annotation @warning_ignore_start] 的"
+"参数必须是字符串字面量（不支持常量表达式）。"
 
 msgid "Global scope constants and functions."
 msgstr "全局范围的常量和函数。"
@@ -6581,6 +6582,9 @@ msgstr ""
 "内部使用。允许不将核心虚拟方法（例如 [method Object._notification]）转储到 "
 "JSON API。"
 
+msgid "Flag for a virtual method that is required."
+msgstr "必选虚方法的标志。"
+
 msgid "Default method flags (normal)."
 msgstr "默认方法标志（正常）。"
 
@@ -13112,9 +13116,9 @@ msgid ""
 "[/gdscript]\n"
 "[/codeblocks]"
 msgstr ""
-"返回数组中使得 [param method] 返回 [code]true[/code] 的第一个元素的索引，若元"
-"素不存在则返回 [code]-1[/code]。搜索的起始位置可以由 [param from] 指定，搜索将"
-"继续直至数组结束。\n"
+"返回数组中使得 [param method] 返回 [code]true[/code] 的[b]第一个[/b]元素的索"
+"引，若元素不存在则返回 [code]-1[/code]。搜索的起始位置可以由 [param from] 指"
+"定，搜索将继续直至数组结束。\n"
 "[param method] 是可调用对象，接受数组元素，返回的是 [bool]。\n"
 "[b]注意：[/b]如果你只想知道数组中是否包含[i]任何[/i]能够满足 [param method] 的"
 "东西，请使用 [method any]。\n"
@@ -19601,6 +19605,25 @@ msgid ""
 "distance."
 msgstr "如果为 [code]true[/code]，则无论距离远近，对象都以相同的大小渲染。"
 
+msgid ""
+"If [code]true[/code], enables the vertex grow setting. This can be used to "
+"create mesh-based outlines using a second material pass and its [member "
+"cull_mode] set to [constant CULL_FRONT]. See also [member grow_amount].\n"
+"[b]Note:[/b] Vertex growth cannot create new vertices, which means that "
+"visible gaps may occur in sharp corners. This can be alleviated by designing "
+"the mesh to use smooth normals exclusively using [url=http://wiki.polycount."
+"com/wiki/Face_weighted_normals]face weighted normals[/url] in the 3D "
+"authoring software. In this case, grow will be able to join every outline "
+"together, just like in the original mesh."
+msgstr ""
+"如果为 [code]true[/code]，则启用顶点增长设置。可用于创建基于网格的轮廓，请在第"
+"二个材质阶段中使用，并将 [member cull_mode] 设置为 [constant CULL_FRONT]。另"
+"见 [member grow_amount]。\n"
+"[b]注意：[/b]顶点增长无法新建顶点，这意味着锐角可能会造成可见的缺口。缓解方法"
+"是在设计网格时就只用平滑的法线，在 3D 创作软件中使用 [url=http://wiki."
+"polycount.com/wiki/Face_weighted_normals]面加权法线[/url]。这样增长就能够将所"
+"有轮廓连接到一起，和原始网格一致。"
+
 msgid ""
 "Grows object vertices in the direction of their normals. Only effective if "
 "[member grow] is [code]true[/code]."
@@ -24251,6 +24274,22 @@ msgstr "返回纹理后端的 ID（可用于某些需要通过纹理句柄写入
 msgid "Sets the feed as external feed provided by another library."
 msgstr "将供给设置为由另一个库提供的外部供给。"
 
+msgid ""
+"Sets the feed format parameters for the given index in the [member formats] "
+"array. Returns [code]true[/code] on success. By default YUYV encoded stream "
+"is transformed to FEED_RGB. YUYV encoded stream output format can be changed "
+"with [param parameters].output value:\n"
+"[code]separate[/code] will result in FEED_YCBCR_SEP\n"
+"[code]grayscale[/code] will result in desaturated FEED_RGB\n"
+"[code]copy[/code] will result in FEED_YCBCR"
+msgstr ""
+"为源格式数组 [member formats] 中给定索引的元素设置格式参数。成功则返回 "
+"[code]true[/code]。默认会将 YUYV 编码的流转换为 FEED_RGB。YUYV 编码的流的输出"
+"格式可以使用 [param parameters].output 修改：\n"
+"[code]separate[/code] 得到的是 FEED_YCBCR_SEP\n"
+"[code]grayscale[/code] 得到的是降低饱和度的 FEED_RGB\n"
+"[code]copy[/code] 得到的是 FEED_YCBCR"
+
 msgid "Sets the camera's name."
 msgstr "设置相机的名称。"
 
@@ -27607,6 +27646,10 @@ msgstr ""
 "设置当来自 [signal symbol_validate] 的验证词被点击时，应发出 [signal "
 "symbol_lookup]。"
 
+msgid ""
+"Set when a word is hovered, the [signal symbol_hovered] should be emitted."
+msgstr "设置当悬停在单词上时，应发出 [signal symbol_hovered]。"
+
 msgid ""
 "Emitted when a breakpoint is added or removed from a line. If the line is "
 "moved via backspace a removed is emitted at the old line."
@@ -34848,6 +34891,19 @@ msgid ""
 "The axis of the ring when using the emitter [constant EMISSION_SHAPE_RING]."
 msgstr "使用形为 [constant EMISSION_SHAPE_RING] 的发射器时环的轴。"
 
+msgid ""
+"The angle of the cone when using the emitter [constant EMISSION_SHAPE_RING]. "
+"The default angle of 90 degrees results in a ring, while an angle of 0 "
+"degrees results in a cone. Intermediate values will result in a ring where "
+"one end is larger than the other.\n"
+"[b]Note:[/b] Depending on [member emission_ring_height], the angle may be "
+"clamped if the ring's end is reached to form a perfect cone."
+msgstr ""
+"使用形为 [constant EMISSION_SHAPE_RING] 的发射器时圆锥体的张角。默认的 90 度角"
+"会得到一个环，而 0 度角则会得到椎体。两者之间的值会得到一端大于另一端的环。\n"
+"[b]注意：[/b]根据 [member emission_ring_height] 的不同，圆环的末端形成尖顶时可"
+"能会对角度进行限制。"
+
 msgid ""
 "The height of the ring when using the emitter [constant EMISSION_SHAPE_RING]."
 msgstr "使用形为 [constant EMISSION_SHAPE_RING] 的发射器时环的高度。"
@@ -36039,6 +36095,74 @@ msgstr "创建该资源的占位符版本（[PlaceholderCubemap]）。"
 msgid "An array of [Cubemap]s, stored together and with a single reference."
 msgstr "[Cubemap] 数组，存储在一起并使用单个引用。"
 
+msgid ""
+"[CubemapArray]s are made of an array of [Cubemap]s. Like [Cubemap]s, they are "
+"made of multiple textures, the amount of which must be divisible by 6 (one "
+"for each face of the cube).\n"
+"The primary benefit of [CubemapArray]s is that they can be accessed in shader "
+"code using a single texture reference. In other words, you can pass multiple "
+"[Cubemap]s into a shader using a single [CubemapArray]. [Cubemap]s are "
+"allocated in adjacent cache regions on the GPU, which makes [CubemapArray]s "
+"the most efficient way to store multiple [Cubemap]s.\n"
+"Godot uses [CubemapArray]s internally for many effects, including the [Sky] "
+"if you set [member ProjectSettings.rendering/reflections/sky_reflections/"
+"texture_array_reflections] to [code]true[/code].\n"
+"To create such a texture file yourself, reimport your image files using the "
+"Godot Editor import presets. To create a CubemapArray from code, use [method "
+"ImageTextureLayered.create_from_images] on an instance of the CubemapArray "
+"class.\n"
+"The expected image order is X+, X-, Y+, Y-, Z+, Z- (in Godot's coordinate "
+"system, so Y+ is \"up\" and Z- is \"forward\"). You can use one of the "
+"following templates as a base:\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]2×3 cubemap template "
+"(default layout option)[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]3×2 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]1×6 cubemap template[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]6×1 cubemap template[/"
+"url]\n"
+"Multiple layers are stacked on top of each other when using the default "
+"vertical import option (with the first layer at the top). Alternatively, you "
+"can choose an horizontal layout in the import options (with the first layer "
+"at the left).\n"
+"[b]Note:[/b] [CubemapArray] is not supported in the Compatibility renderer "
+"due to graphics API limitations."
+msgstr ""
+"[CubemapArray] 由 [Cubemap] 数组组成。与 [Cubemap] 一样由多个纹理组成，纹理的"
+"数量必须能被 6 整除（对应立方体的各个面）。\n"
+"[CubemapArray] 的主要优点是可以使用单个纹理引用在着色器代码中访问。换句话说，"
+"你可以使用单个 [CubemapArray] 将多个 [Cubemap] 传递到着色器中。这些 [Cubemap] "
+"在 GPU 上会被分配到相邻缓存区域中，因此用 [CubemapArray] 存储多个 [Cubemap] 最"
+"为高效。\n"
+"Godot 内部使用 [CubemapArray] 来实现许多效果，例如将 [member ProjectSettings."
+"rendering/reflections/sky_reflections/texture_array_reflections] 设置为 "
+"[code]true[/code] 时的 [Sky]。\n"
+"要自己创建这样的纹理文件，请使用 Godot 编辑器的导入预设重新导入图像文件。要使"
+"用代码创建 CubemapArray，请在 CubemapArray 类的实例上使用 [method "
+"ImageTextureLayered.create_from_images]。\n"
+"预期的图像顺序是 X+、X-、Y+、Y-、Z+、Z-（Godot 的坐标系中 Y+ 是“上”、Z- "
+"是“前”）。你可以从下列模板中挑选一个作为基础：\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_2x3.webp]2×3 立方体贴图模板（默"
+"认布局选项）[/url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_3x2.webp]3×2 立方体贴图模板[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_1x6.webp]1×6 立方体贴图模板[/"
+"url]\n"
+"- [url=https://raw.githubusercontent.com/godotengine/godot-docs/master/"
+"tutorials/assets_pipeline/img/cubemap_template_6x1.webp]6×1 立方体贴图模板[/"
+"url]\n"
+"使用默认垂直导入选项时多个图层会相互堆叠（第一个图层位于顶部）。你也可以在导入"
+"选项中选择水平布局（第一个图层位于左侧）。\n"
+"[b]注意：[/b]由于图形 API 限制，兼容性渲染器不支持 [CubemapArray]。"
+
 msgid ""
 "Creates a placeholder version of this resource ([PlaceholderCubemapArray])."
 msgstr "创建该资源的占位符版本（[PlaceholderCubemapArray]）。"
@@ -38317,11 +38441,10 @@ msgstr ""
 "如果需要对包含内容做进一步控制，请使用 [method get_files]。\n"
 "[b]注意：[/b]在导出后的项目中对 [code]res://[/code] 使用时，只会返回确实在 "
 "PCK 的给定文件夹中存在的文件。在实践中，导入后的资源是存放在顶层的 [code]."
-"godot[/code] 文件夹中的，因此只会返回 [code]*.gd[/code] 和 [code]*.import[/"
+"godot/[/code] 文件夹中的，因此只会返回 [code].gd[/code] 和 [code].import[/"
 "code] 文件的路径（以及 [code]project.godot[/code] 或者 [code]project.binary[/"
 "code] 和项目图标等文件）。导出后的项目中，返回的列表也会因为 [member "
-"ProjectSettings.editor/export/convert_text_resources_to_binary] 是否为 "
-"[code]true[/code] 而变化。"
+"ProjectSettings.editor/export/convert_text_resources_to_binary] 而变化。"
 
 msgid ""
 "Returns the next element (file or directory) in the current directory.\n"
@@ -39031,6 +39154,14 @@ msgstr "返回主屏幕的索引。"
 msgid "Returns the number of displays available."
 msgstr "返回可用的显示器数量。"
 
+msgid ""
+"Returns the index of the screen that overlaps the most with the given "
+"rectangle. Returns [code]-1[/code] if the rectangle doesn't overlap with any "
+"screen or has no area."
+msgstr ""
+"返回与给定矩形重合最多的屏幕的索引。如果矩形没有与任何屏幕重合或面积为零，则返"
+"回 [code]-1[/code]。"
+
 msgid ""
 "Returns [code]true[/code] if positions of [b]OK[/b] and [b]Cancel[/b] buttons "
 "are swapped in dialogs. This is enabled by default on Windows to follow "
@@ -43246,6 +43377,24 @@ msgstr ""
 "[b]注意：[/b]仅当 [member EditorExportPlatformAndroid.gradle_build/"
 "use_gradle_build] 被禁用时才使用。"
 
+msgid ""
+"If [code]true[/code], [url=https://developer.android.com/design/ui/wear/"
+"guides/components/swipe-to-dismiss]Swipe to dismiss[/url] will be enabled.\n"
+"This functionality is intended for smartwatches and is generally ignored on "
+"standard Android devices. However, some devices may not ignore it. Therefore, "
+"it is recommended to keep this feature disabled for standard Android apps to "
+"avoid unexpected behavior.\n"
+"[b]Note:[/b] This is [code]false[/code] by default. To enable this behavior, "
+"[member EditorExportPlatformAndroid.gradle_build/use_gradle_build] is "
+"required."
+msgstr ""
+"如果为 [code]true[/code]，则会启用[url=https://developer.android.com/design/"
+"ui/wear/guides/components/swipe-to-dismiss]滑动关闭[/url]功能。\n"
+"该功能适用于智能手表，在标准 Android 设备上通常会被忽略。不过部分设备也可能不"
+"会忽略。因此，建议在标准 Android 应用中禁用该功能，避免意外行为。\n"
+"[b]注意：[/b]默认为 [code]false[/code]。启用该行为需要 [member "
+"EditorExportPlatformAndroid.gradle_build/use_gradle_build]。"
+
 msgid ""
 "Path to a ZIP file holding the source for the export template used in a "
 "Gradle build. If left empty, the default template is used."
@@ -43514,6 +43663,15 @@ msgstr ""
 "permission#ACCESS_LOCATION_EXTRA_COMMANDS]ACCESS_LOCATION_EXTRA_COMMANDS[/"
 "url]。"
 
+msgid ""
+"Allows an application to access any geographic locations persisted in the "
+"user's shared collection. See [url=https://developer.android.com/reference/"
+"android/Manifest.permission#ACCESS_MEDIA_LOCATION]ACCESS_MEDIA_LOCATION[/url]."
+msgstr ""
+"允许应用程序访问用户共享合集中保存的任何地理位置。见 [url=https://developer."
+"android.com/reference/android/Manifest."
+"permission#ACCESS_MEDIA_LOCATION]ACCESS_MEDIA_LOCATION[/url]。"
+
 msgid "Allows an application to create mock location providers for testing."
 msgstr "允许应用程序为测试目的创建 Mock 位置提供方。"
 
@@ -45211,6 +45369,24 @@ msgid ""
 "Path to the custom export template. If left empty, default template is used."
 msgstr "到自定义导出模板的路径。如果留空，则默认模板将被使用。"
 
+msgid ""
+"Additional data added to the root [code]<dict>[/code] section of the "
+"[url=https://developer.apple.com/documentation/bundleresources/entitlements]."
+"entitlements[/url] file. The value should be an XML section with pairs of key-"
+"value elements, for example:\n"
+"[codeblock lang=text]\n"
+"<key>key_name</key>\n"
+"<string>value</string>\n"
+"[/codeblock]"
+msgstr ""
+"添加到 [url=https://developer.apple.com/documentation/bundleresources/"
+"entitlements].entitlements[/url] 文件的根 [code]<dict>[/code] 部分的其他数据。"
+"该值应该是带有键值元素对的 XML 部分，例如：\n"
+"[codeblock lang=text]\n"
+"<key>key_name</key>\n"
+"<string>value</string>\n"
+"[/codeblock]"
+
 msgid ""
 "Enable to allow access to Game Center features. [url=https://developer.apple."
 "com/documentation/bundleresources/entitlements/com_apple_developer_game-"
@@ -45220,6 +45396,17 @@ msgstr ""
 "documentation/bundleresources/entitlements/com_apple_developer_game-"
 "center]com.apple.developer.game-center[/url]。"
 
+msgid ""
+"Enable if app may perform better with a higher memory limit. [url=https://"
+"developer.apple.com/documentation/bundleresources/entitlements/"
+"com_apple_developer_kernel_increased-memory-limit]com.apple.developer.kernel."
+"increased-memory-limit[/url]."
+msgstr ""
+"如果应用在更高的内存限制下可能表现更好，请启用该选项。[url=https://developer."
+"apple.com/documentation/bundleresources/entitlements/"
+"com_apple_developer_kernel_increased-memory-limit]com.apple.developer.kernel."
+"increased-memory-limit[/url]。"
+
 msgid ""
 "Environment for Apple Push Notification service. See [url=https://developer."
 "apple.com/documentation/bundleresources/entitlements/aps-environment]aps-"
@@ -53685,6 +53872,48 @@ msgstr ""
 "如果为 [code]true[/code]，则在 3D 编辑器中平移、视轨或使用自由观看模式时，反转"
 "鼠标垂直轴。"
 
+msgid ""
+"The navigation scheme preset to use in the 3D editor. Changing this setting "
+"will affect the mouse button and modifier keys used to navigate the 3D editor "
+"viewport.\n"
+"All schemes can use [kbd]Mouse wheel[/kbd] to zoom.\n"
+"- [b]Godot:[/b] [kbd]Middle mouse button[/kbd] to orbit. [kbd]Shift + Middle "
+"mouse button[/kbd] to pan. [kbd]Ctrl + Middle mouse button[/kbd] to zoom.\n"
+"- [b]Maya:[/b] [kbd]Alt + Left mouse button[/kbd] to orbit. [kbd]Middle mouse "
+"button[/kbd] to pan, [kbd]Shift + Middle mouse button[/kbd] to pan 10 times "
+"faster. [kbd]Alt + Right mouse button[/kbd] to zoom.\n"
+"- [b]Modo:[/b] [kbd]Alt + Left mouse button[/kbd] to orbit. [kbd]Alt + Shift "
+"+ Left mouse button[/kbd] to pan. [kbd]Ctrl + Alt + Left mouse button[/kbd] "
+"to zoom.\n"
+"- [b]Tablet/Trackpad:[/b] [kbd]Alt[/kbd] to orbit. [kbd]Shift[/kbd] to pan. "
+"[kbd]Ctrl[/kbd] to zoom. Enables 3-button mouse emulation mode.\n"
+"See also [member editors/3d/navigation/orbit_mouse_button], [member "
+"editors/3d/navigation/pan_mouse_button], [member editors/3d/navigation/"
+"zoom_mouse_button], [member editors/3d/freelook/freelook_navigation_scheme], "
+"and [member editors/3d/navigation/emulate_3_button_mouse].\n"
+"[b]Note:[/b] On certain window managers on Linux, the [kbd]Alt[/kbd] key will "
+"be intercepted by the window manager when clicking a mouse button at the same "
+"time. This means Godot will not see the modifier key as being pressed."
+msgstr ""
+"在 3D 编辑器中使用的导航方案。更改该设置会影响在 3D 编辑器视口中导航所需的鼠标"
+"按钮和修饰键。\n"
+"所有方案下都可以使用[kbd]鼠标滚轮[/kbd]进行缩放。\n"
+"- [b]Godot：[/b][kbd]鼠标中键[/kbd]进行视轨。[kbd]Shift + 鼠标中键[/kbd]进行平"
+"移。[kbd]Ctrl + 鼠标中键[/kbd]进行缩放。\n"
+"- [b]Maya：[/b][kbd]Alt + 鼠标左键[/kbd]进行视轨。[kbd]鼠标中键[/kbd]进行平"
+"移，[kbd]Shift + 鼠标中键[/kbd]提高 10 倍平移速度。[kbd]Alt + 鼠标右键[/kbd]进"
+"行缩放。\n"
+"- [b]Modo：[/b][kbd]Alt + 鼠标左键[/kbd]进行视轨。[kbd]Alt + Shift + 鼠标左键"
+"[/kbd]进行平移。 [kbd]Ctrl + Alt + 鼠标左键[/kbd]进行缩放。\n"
+"- [b]Tablet/Trackpad：[/b][kbd]Alt[/kbd]进行视轨。[kbd]Shift[/kbd]进行平移。"
+"[kbd]Ctrl[/kbd] 进行缩放。启用三键鼠标模拟模式。\n"
+"另见 [member editors/3d/navigation/orbit_mouse_button]、[member editors/3d/"
+"navigation/pan_mouse_button]、[member editors/3d/navigation/"
+"zoom_mouse_button]、[member editors/3d/freelook/freelook_navigation_scheme], "
+"and [member editors/3d/navigation/emulate_3_button_mouse]。\n"
+"[b]注意：[/b]在 Linux 的某些窗口管理器上，点击鼠标按钮的同时 [kbd]Alt[/kbd] 键"
+"会被窗口管理器拦截。这意味着 Godot 不会看到按下了该修饰键。"
+
 msgid ""
 "The mouse button that needs to be held down to orbit in the 3D editor "
 "viewport."
@@ -56302,6 +56531,9 @@ msgstr ""
 "脚本编辑器的文档注释颜色。在 GDScript 中，这被用于以 [code]##[/code] 开头的注"
 "释。在 C# 中，这被用于以 [code]///[/code] 或 [code]/**[/code] 开头的注释。"
 
+msgid "The script editor's engine type color ([Object], [Mesh], [Node], ...)."
+msgstr "脚本编辑器中引擎类型的颜色（[Object]、[Mesh]、[Node]……）。"
+
 msgid ""
 "The script editor's color for the debugger's executing line icon (displayed "
 "in the gutter)."
@@ -56580,6 +56812,233 @@ msgstr ""
 "用于添加自定义解析器，以从自定义文件（.csv、.json等）提取已翻译的字符串的插"
 "件。"
 
+msgid ""
+"[EditorTranslationParserPlugin] is invoked when a file is being parsed to "
+"extract strings that require translation. To define the parsing and string "
+"extraction logic, override the [method _parse_file] method in script.\n"
+"The return value should be an [Array] of [PackedStringArray]s, one for each "
+"extracted translatable string. Each entry should contain [code][msgid, "
+"msgctxt, msgid_plural, comment][/code], where all except [code]msgid[/code] "
+"are optional. Empty strings will be ignored.\n"
+"The extracted strings will be written into a POT file selected by user under "
+"\"POT Generation\" in \"Localization\" tab in \"Project Settings\" menu.\n"
+"Below shows an example of a custom parser that extracts strings from a CSV "
+"file to write into a POT.\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"    var ret: Array[PackedStringArray] = []\n"
+"    var file = FileAccess.open(path, FileAccess.READ)\n"
+"    var text = file.get_as_text()\n"
+"    var split_strs = text.split(\",\", false)\n"
+"    for s in split_strs:\n"
+"        ret.append(PackedStringArray([s]))\n"
+"        #print(\"Extracted string: \" + s)\n"
+"\n"
+"    return ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"    public override Godot.Collections.Array<string[]> _ParseFile(string "
+"path)\n"
+"    {\n"
+"        Godot.Collections.Array<string[]> ret;\n"
+"        using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"        string text = file.GetAsText();\n"
+"        string[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"        foreach (string s in splitStrs)\n"
+"        {\n"
+"            ret.Add([s]);\n"
+"            //GD.Print($\"Extracted string: {s}\");\n"
+"        }\n"
+"        return ret;\n"
+"    }\n"
+"\n"
+"    public override string[] _GetRecognizedExtensions()\n"
+"    {\n"
+"        return [\"csv\"];\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To add a translatable string associated with a context, plural, or comment:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", and comment \"test 1 comment\".\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\"]))\n"
+"# This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// This will add a message with msgid \"Test 1\", msgctxt \"context\", "
+"msgid_plural \"test 1 plurals\", and comment \"test 1 comment\".\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\"]);\n"
+"// This will add a message with msgid \"A test without context\" and "
+"msgid_plural \"plurals\".\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// This will add a message with msgid \"Only with context\" and msgctxt \"a "
+"friendly context\".\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]Note:[/b] If you override parsing logic for standard script types "
+"(GDScript, C#, etc.), it would be better to load the [code]path[/code] "
+"argument using [method ResourceLoader.load]. This is because built-in scripts "
+"are loaded as [Resource] type, not [FileAccess] type. For example:\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"    var res = ResourceLoader.load(path, \"Script\")\n"
+"    var text = res.source_code\n"
+"    # Parsing logic.\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"    var res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"    string text = res.SourceCode;\n"
+"    // Parsing logic.\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"    return [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"To use [EditorTranslationParserPlugin], register it using the [method "
+"EditorPlugin.add_translation_parser_plugin] method first."
+msgstr ""
+"解析文件提取需要翻译的字符串时会调用 [EditorTranslationParserPlugin]。要定义文"
+"件解析和字符串提取逻辑，请在脚本中覆盖 [method _parse_file] 方法。\n"
+"返回值应当为元素为 [PackedStringArray] 的 [Array]，每个元素对应一个提取到的可"
+"翻译字符串。每个条目都应该包含 [code][msgid, msgctxt, msgid_plural, comment][/"
+"code]，除 [code]msgid[/code] 外都是可选的。空字符串会被忽略。\n"
+"提取到的字符串会被写入到一个 POT 文件中，该文件由用户在“项目设置”菜单“本地"
+"化”选项卡的“POT 生成”中选择。\n"
+"下面是一个自定义解析器的示例，会从 CSV 文件中提取字符串，写入到 POT 文件中。\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"@tool\n"
+"extends EditorTranslationParserPlugin\n"
+"\n"
+"func _parse_file(path):\n"
+"    var ret: Array[PackedStringArray] = []\n"
+"    var file = FileAccess.open(path, FileAccess.READ)\n"
+"    var text = file.get_as_text()\n"
+"    var split_strs = text.split(\",\", false)\n"
+"    for s in split_strs:\n"
+"        ret.append(PackedStringArray([s]))\n"
+"        #print(\"提取到字符串：\" + s)\n"
+"\n"
+"    return ret\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"csv\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"using Godot;\n"
+"\n"
+"[Tool]\n"
+"public partial class CustomParser : EditorTranslationParserPlugin\n"
+"{\n"
+"    public override Godot.Collections.Array<string[]> _ParseFile(string "
+"path)\n"
+"    {\n"
+"        Godot.Collections.Array<string[]> ret;\n"
+"        using var file = FileAccess.Open(path, FileAccess.ModeFlags.Read);\n"
+"        string text = file.GetAsText();\n"
+"        string[] splitStrs = text.Split(\",\", allowEmpty: false);\n"
+"        foreach (string s in splitStrs)\n"
+"        {\n"
+"            ret.Add([s]);\n"
+"            //GD.Print($\"提取到字符串：{s}\");\n"
+"        }\n"
+"        return ret;\n"
+"    }\n"
+"\n"
+"    public override string[] _GetRecognizedExtensions()\n"
+"    {\n"
+"        return [\"csv\"];\n"
+"    }\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"添加带有上下文、复数形式、注释的可翻译字符串：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"# 添加 msgid 为“Test 1”、msgctxt 为“context”、msgid_plural 为“test 1 "
+"plurals”、注释为“test 1 comment”的消息。\n"
+"ret.append(PackedStringArray([\"Test 1\", \"context\", \"test 1 plurals\", "
+"\"test 1 comment\"]))\n"
+"# 添加 msgid 为“A test without context”、msgid_plural 为“plurals”的消息。\n"
+"ret.append(PackedStringArray([\"A test without context\", \"\", "
+"\"plurals\"]))\n"
+"# 添加 msgid 为“Only with context”、msgctxt 为“a friendly context”的消息。\n"
+"ret.append(PackedStringArray([\"Only with context\", \"a friendly "
+"context\"]))\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"// 添加 msgid 为“Test 1”、msgctxt 为“context”、msgid_plural 为“test 1 "
+"plurals”、注释为“test 1 comment”的消息。\n"
+"ret.Add([\"Test 1\", \"context\", \"test 1 plurals\", \"test 1 comment\"]);\n"
+"// 添加 msgid 为“A test without context”、msgid_plural 为“plurals”的消息。\n"
+"ret.Add([\"A test without context\", \"\", \"plurals\"]);\n"
+"// 添加 msgid 为“Only with context”、msgctxt 为“a friendly context”的消息。\n"
+"ret.Add([\"Only with context\", \"a friendly context\"]);\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"[b]注意：[/b]如果你覆盖了标准脚本类型（GDScript、C# 等）的解析逻辑，最好使用 "
+"[method ResourceLoader.load] 来加载 [code]path[/code] 参数。因为内置脚本会以 "
+"[Resource] 类型的形式加载，而非 [FileAccess] 类型。例如：\n"
+"[codeblocks]\n"
+"[gdscript]\n"
+"func _parse_file(path):\n"
+"    var res = ResourceLoader.load(path, \"Script\")\n"
+"    var text = res.source_code\n"
+"    # 解析逻辑。\n"
+"\n"
+"func _get_recognized_extensions():\n"
+"    return [\"gd\"]\n"
+"[/gdscript]\n"
+"[csharp]\n"
+"public override Godot.Collections.Array<string[]> _ParseFile(string path)\n"
+"{\n"
+"    var res = ResourceLoader.Load<Script>(path, \"Script\");\n"
+"    string text = res.SourceCode;\n"
+"    // 解析逻辑。\n"
+"}\n"
+"\n"
+"public override string[] _GetRecognizedExtensions()\n"
+"{\n"
+"    return [\"gd\"];\n"
+"}\n"
+"[/csharp]\n"
+"[/codeblocks]\n"
+"要使用 [EditorTranslationParserPlugin]，请先使用 [method EditorPlugin."
+"add_translation_parser_plugin] 方法注册。"
+
 msgid ""
 "Gets the list of file extensions to associate with this parser, e.g. [code]"
 "[\"csv\"][/code]."
@@ -58842,6 +59301,35 @@ msgstr ""
 msgid "The background mode. See [enum BGMode] for possible values."
 msgstr "背景模式。可能的取值见 [enum BGMode]。"
 
+msgid ""
+"If set above [code]0.0[/code] (exclusive), blends between the fog's color and "
+"the color of the background [Sky], as read from the radiance cubemap. This "
+"has a small performance cost when set above [code]0.0[/code]. Must have "
+"[member background_mode] set to [constant BG_SKY].\n"
+"This is useful to simulate [url=https://en.wikipedia.org/wiki/"
+"Aerial_perspective]aerial perspective[/url] in large scenes with low density "
+"fog. However, it is not very useful for high-density fog, as the sky will "
+"shine through. When set to [code]1.0[/code], the fog color comes completely "
+"from the [Sky]. If set to [code]0.0[/code], aerial perspective is disabled.\n"
+"Notice that this does not sample the [Sky] directly, but rather the radiance "
+"cubemap. The cubemap is sampled at a mipmap level depending on the depth of "
+"the rendered pixel; the farther away, the higher the resolution of the "
+"sampled mipmap. This results in the actual color being a blurred version of "
+"the sky, with more blur closer to the camera. The highest mipmap resolution "
+"is used at a depth of [member Camera3D.far]."
+msgstr ""
+"如果设置为大于 [code]0.0[/code]（不含），会在雾的颜色和背景 [Sky] 辐射率立方体"
+"贴图中的颜色之间进行混合。设置为大于 [code]0.0[/code] 时有较小的性能代价。必须"
+"将 [member background_mode] 设置为 [constant BG_SKY]。\n"
+"对于模拟雾密度较低的大场景中的[url=https://zh.wikipedia.org/wiki/"
+"%E7%A9%BA%E6%B0%94%E9%80%8F%E8%A7%86]空气透视[/url]很有用。但对于高密度的雾来"
+"说不是很有用，因为天空会被照亮。设置为 [code]1.0[/code] 时，雾的颜色完全来自 "
+"[Sky]。设置为 [code]0.0[/code] 时，会禁用空气透视。\n"
+"请注意这里采样的是辐射率立方体贴图而不是对 [Sky] 直接采样。立方体贴图采样时使"
+"用 mipmap，层级由所渲染像素的深度决定；距离越远，用于采样的 mipmap 的分辨率越"
+"高。这会导致实际颜色呈现为天空的模糊版本，离相机越近模糊程度越高。在深度为 "
+"[member Camera3D.far] 时使用的是最高的 mipmap 分辨率。"
+
 msgid ""
 "The fog density to be used. This is demonstrated in different ways depending "
 "on the [member fog_mode] mode chosen:\n"
@@ -61355,6 +61843,32 @@ msgstr ""
 "如果为 [code]true[/code]，则对话框将显示隐藏文件。\n"
 "[b]注意：[/b]Android 和 Linux 上的原生文件对话框会忽略该属性。"
 
+msgid ""
+"If [code]true[/code], and if supported by the current [DisplayServer], OS "
+"native dialog will be used instead of custom one.\n"
+"[b]Note:[/b] On Android, it is only supported when using [constant "
+"ACCESS_FILESYSTEM]. For access mode [constant ACCESS_RESOURCES] and [constant "
+"ACCESS_USERDATA], the system will fall back to custom FileDialog.\n"
+"[b]Note:[/b] On Linux and macOS, sandboxed apps always use native dialogs to "
+"access the host file system.\n"
+"[b]Note:[/b] On macOS, sandboxed apps will save security-scoped bookmarks to "
+"retain access to the opened folders across multiple sessions. Use [method OS."
+"get_granted_permissions] to get a list of saved bookmarks.\n"
+"[b]Note:[/b] Native dialogs are isolated from the base process, file dialog "
+"properties can't be modified once the dialog is shown."
+msgstr ""
+"如果为 [code]true[/code] 并且当前 [DisplayServer] 支持原生对话框，那么就会使用"
+"操作系统原生对话框代替自定义对话框。\n"
+"[b]注意：[/b]在 Android 上只有使用 [constant ACCESS_FILESYSTEM] 时才支持。使"
+"用 [constant ACCESS_RESOURCES]、[constant ACCESS_USERDATA] 等访问模式时系统会"
+"回退至自定义 FileDialog。\n"
+"[b]注意：[/b]在 Linux 和 macOS 上，沙盒应用程序始终使用原生对话框来访问主机文"
+"件系统。\n"
+"[b]注意：[/b]在 macOS 上，沙盒应用将保存安全范围的书签，以保留对跨多个会话打开"
+"的文件夹的访问权限。使用 [method OS.get_granted_permissions] 获取已保存书签的"
+"列表。\n"
+"[b]注意：[/b]原生对话框与基本进程隔离，对话框显示后，文件对话框属性无法修改。"
+
 msgid "Emitted when the user selects a directory."
 msgstr "当用户选择一个目录时触发的。"
 
@@ -63782,8 +64296,8 @@ msgid ""
 msgstr ""
 "返回直线 ([param from_a], [param dir_a]) 和直线 ([param from_b], [param "
 "dir_b]) 的交点。返回 [Vector2]，直线平行则返回 [code]null[/code]。\n"
-"[code]from[/code] 和 [code]dir[/code] 不是线段或射线的端点，而是直线的斜率"
-"（[code]dir[/code]）和直线上的一个已知点（[code]from[/code]）。\n"
+"[code]from[/code] 和 [code]dir[/code] [i]不是[/i]线段或射线的端点，而是直线的"
+"斜率（[code]dir[/code]）和直线上的一个已知点（[code]from[/code]）。\n"
 "[codeblocks]\n"
 "[gdscript]\n"
 "var from_a = Vector2.ZERO\n"
@@ -64214,6 +64728,32 @@ msgstr ""
 msgid "Visibility ranges (HLOD)"
 msgstr "可见范围（HLOD）"
 
+msgid ""
+"Set the value of a shader uniform for this instance only ([url=$DOCS_URL/"
+"tutorials/shaders/shader_reference/shading_language.html#per-instance-"
+"uniforms]per-instance uniform[/url]). See also [method ShaderMaterial."
+"set_shader_parameter] to assign a uniform on all instances using the same "
+"[ShaderMaterial].\n"
+"[b]Note:[/b] For a shader uniform to be assignable on a per-instance basis, "
+"it [i]must[/i] be defined with [code]instance uniform ...[/code] rather than "
+"[code]uniform ...[/code] in the shader code.\n"
+"[b]Note:[/b] [param name] is case-sensitive and must match the name of the "
+"uniform in the code exactly (not the capitalized name in the inspector).\n"
+"[b]Note:[/b] Per-instance shader uniforms are only available in Spatial and "
+"CanvasItem shaders, but not for Fog, Sky, or Particles shaders."
+msgstr ""
+"仅为该实例设置一个着色器 uniform 值（[url=$DOCS_URL/tutorials/shaders/"
+"shader_reference/shading_language.html#per-instance-uniforms]每实例 uniform[/"
+"url]） 。另请参阅 [method ShaderMaterial.set_shader_parameter] 以使用相同的 "
+"[ShaderMaterial] 在所有实例上分配一个 uniform。\n"
+"[b]注意：[/b]要在每个实例的基础上分配一个着色器 uniform，则[i]必须[/i]在着色器"
+"代码中，使用 [code]instance uniform ...[/code]，而不是 [code]uniform ...[/"
+"code] 来定义。\n"
+"[b]注意：[/b][param name] 是区分大小写的，并且必须与代码中的 uniform 名称完全"
+"匹配（而不是检查器中大写的名称）。\n"
+"[b]注意：[/b]逐实例着色器 uniform 仅在 Spatial 和 CanvasItem 着色器中可用，在 "
+"Fog、Sky、Particles 着色器中不可用。"
+
 msgid ""
 "The selected shadow casting flag. See [enum ShadowCastingSetting] for "
 "possible values."
@@ -64251,6 +64791,27 @@ msgstr "请改用 [member gi_lightmap_texel_scale]。"
 msgid "The texel density to use for lightmapping in [LightmapGI]."
 msgstr "[LightmapGI] 进行光照贴图时使用的纹素密度。"
 
+msgid ""
+"The texel density to use for lightmapping in [LightmapGI]. Greater scale "
+"values provide higher resolution in the lightmap, which can result in sharper "
+"shadows for lights that have both direct and indirect light baked. However, "
+"greater scale values will also increase the space taken by the mesh in the "
+"lightmap texture, which increases the memory, storage, and bake time "
+"requirements. When using a single mesh at different scales, consider "
+"adjusting this value to keep the lightmap texel density consistent across "
+"meshes.\n"
+"For example, doubling [member gi_lightmap_texel_scale] doubles the lightmap "
+"texture resolution for this object [i]on each axis[/i], so it will "
+"[i]quadruple[/i] the texel count."
+msgstr ""
+"[LightmapGI] 中用于光照贴图的纹素密度。较大的缩放值可在光照贴图中提供更高的分"
+"辨率，如果灯光同时烘焙了直接光和间接光，阴影就会更加锐利。不过较大的缩放值也会"
+"增加网格在光照贴图纹理中占用的空间，导致所需内存、存储空间、烘焙时间的增加。在"
+"不同缩放下使用同一个网格时，请考虑调整该值，让光照贴图纹素密度在不同网格之间保"
+"持一致。\n"
+"例如，将 [member gi_lightmap_texel_scale] 翻倍会让物体的光照贴图纹理[i]在每个"
+"方向上[/i]的分辨率都翻倍，导致纹素数量[i]变为原来的四倍[/i]。"
+
 msgid ""
 "The global illumination mode to use for the whole geometry. To avoid "
 "inconsistent results, use a mode that matches the purpose of the mesh during "
@@ -64869,6 +65430,38 @@ msgid ""
 msgstr ""
 "交错数据的步幅，单位为字节。如果为 [code]-1[/code]，则这个缓冲视图不是交错的。"
 
+msgid ""
+"[code]true[/code] if the GLTFBufferView's OpenGL GPU buffer type is an "
+"[code]ELEMENT_ARRAY_BUFFER[/code] used for vertex indices (integer constant "
+"[code]34963[/code]). [code]false[/code] if the buffer type is any other "
+"value. See [url=https://github.com/KhronosGroup/glTF-Tutorials/blob/master/"
+"gltfTutorial/gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffers, "
+"BufferViews, and Accessors[/url] for possible values. This property is set on "
+"import and used on export."
+msgstr ""
+"如果 GLTFBufferView 的 OpenGL GPU 缓冲区类型是用于顶点索引的 "
+"[code]ELEMENT_ARRAY_BUFFER[/code]（整数常量 [code]34963[/code]），则为 "
+"[code]true[/code]。如果该缓冲区类型是任何其他值，则为 [code]false[/code]。有关"
+"可能的值，请参阅 [url=https://github.com/KhronosGroup/glTF-Tutorials/blob/"
+"master/gltfTutorial/gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffers、"
+"BufferViews 和 Accessors[/url]。该属性在导入时设置，并在导出时使用。"
+
+msgid ""
+"[code]true[/code] if the GLTFBufferView's OpenGL GPU buffer type is an "
+"[code]ARRAY_BUFFER[/code] used for vertex attributes (integer constant "
+"[code]34962[/code]). [code]false[/code] if the buffer type is any other "
+"value. See [url=https://github.com/KhronosGroup/glTF-Tutorials/blob/master/"
+"gltfTutorial/gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffers, "
+"BufferViews, and Accessors[/url] for possible values. This property is set on "
+"import and used on export."
+msgstr ""
+"如果 GLTFBufferView 的 OpenGL GPU 缓冲区类型是用于顶点属性的 "
+"[code]ARRAY_BUFFER[/code]（整数常量 [code]34962[/code]），则为 [code]true[/"
+"code]。如果该缓冲区类型是任何其他值，则为 [code]false[/code]。有关可能的值，请"
+"参阅 [url=https://github.com/KhronosGroup/glTF-Tutorials/blob/master/"
+"gltfTutorial/gltfTutorial_005_BuffersBufferViewsAccessors.md]Buffers、"
+"BufferViews 和 Accessors[/url]。该属性在导入时设置，在导出时使用。"
+
 msgid "Represents a glTF camera."
 msgstr "代表 glTF 相机。"
 
@@ -65029,6 +65622,22 @@ msgstr ""
 "节点。\n"
 "[param bake_fps] 参数会覆盖 [param state] 中的 bake_fps。"
 
+msgid ""
+"Returns a list of all support glTF extensions, including extensions supported "
+"directly by the engine, and extensions supported by user plugins registering "
+"[GLTFDocumentExtension] classes.\n"
+"[b]Note:[/b] If this method is run before a GLTFDocumentExtension is "
+"registered, its extensions won't be included in the list. Be sure to only run "
+"this method after all extensions are registered. If you run this when the "
+"engine starts, consider waiting a frame before calling this method to ensure "
+"all extensions are registered."
+msgstr ""
+"返回所有支持的 glTF 扩展列表，包括引擎直接支持的扩展和用户插件注册的 "
+"[GLTFDocumentExtension] 类支持的扩展。\n"
+"[b]注意：[/b]如果在注册 GLTFDocumentExtension 之前运行该方法，则列表中不会包含"
+"它所对应的扩展。请确保在注册所有扩展后再运行该方法。如果在引擎启动时运行该方"
+"法，请考虑在调用g该方法之前等待一帧，确保所有扩展都已注册。"
+
 msgid ""
 "Determines a mapping between the given glTF Object Model [param json_pointer] "
 "and the corresponding Godot node path(s) in the generated Godot scene. The "
@@ -65191,6 +65800,86 @@ msgstr ""
 "node] 不可用时可能为 [code]null[/code]，例如导出不是从 Godot 场景生成的 glTF "
 "数据的场合。"
 
+msgid ""
+"Part of the export process. Allows GLTFDocumentExtension classes to provide "
+"mappings for properties of nodes in the Godot scene tree, to JSON pointers to "
+"glTF properties, as defined by the glTF object model.\n"
+"Returns a [GLTFObjectModelProperty] instance that defines how the property "
+"should be mapped. If your extension can't handle the property, return "
+"[code]null[/code] or an instance without any JSON pointers (see [method "
+"GLTFObjectModelProperty.has_json_pointers]). You should use [method "
+"GLTFObjectModelProperty.set_types] to set the types, and set the JSON "
+"pointer(s) using the [member GLTFObjectModelProperty.json_pointers] "
+"property.\n"
+"The parameters provide context for the property, including the NodePath, the "
+"Godot node, the GLTF node index, and the target object. The [param "
+"target_object] will be equal to [param godot_node] if no sub-object can be "
+"found, otherwise it will point to a sub-object. For example, if the path is "
+"[code]^\"A/B/C/MeshInstance3D:mesh:surface_0/material:emission_intensity\"[/"
+"code], it will get the node, then the mesh, and then the material, so [param "
+"target_object] will be the [Material] resource, and [param target_depth] will "
+"be 2 because 2 levels were traversed to get to the target."
+msgstr ""
+"导出过程的一部分。允许 GLTFDocumentExtension 类为 Godot 场景树中节点的属性提供"
+"映射，映射到 glTF 属性的 JSON 指针，这些属性由 glTF 对象模型定义。\n"
+"返回 [GLTFObjectModelProperty] 实例，定义属性的映射方式。如果你的扩展无法处理"
+"该属性，请返回 [code]null[/code] 或返回一个没有任何 JSON 指针的实例（见 "
+"[method GLTFObjectModelProperty.has_json_pointers]）。你应当使用 [method "
+"GLTFObjectModelProperty.set_types] 来设置类型，通过 [member "
+"GLTFObjectModelProperty.json_pointers] 属性设置 JSON 指针。\n"
+"参数为属性提供了上下文，包括 NodePath、Godot 节点、GLTF 节点索引和目标对象。如"
+"果没有找到子对象，则 [param target_object] 等于 [param godot_node]，否则将指向"
+"子对象。例如路径为 [code]^\"A/B/C/MeshInstance3D:mesh:surface_0/material:"
+"emission_intensity\"[/code] 时，会首先获取节点，然后是网格，接着是材质，因此 "
+"[param target_object] 就是 [Material] 资源，而 [param target_depth] 则为 2，因"
+"为到达目标时经过了 2 个层级。"
+
+msgid ""
+"Part of the export process. This method is run last, after all other parts of "
+"the export process.\n"
+"This method can be used to modify the final JSON of the generated glTF file."
+msgstr ""
+"导出过程的一部分。该方法在最后运行，在导出过程的所有其他部分之后。\n"
+"该方法可用于修改生成的 glTF 文件的最终 JSON。"
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_convert_scene_node] and before [method _export_preserialize].\n"
+"This method can be used to modify the converted node data structures before "
+"serialization with any additional data from the scene tree."
+msgstr ""
+"导出过程的一部分。该方法在 [method _convert_scene_node] 之后、[method "
+"_export_preserialize] 之前运行。\n"
+"该方法可用于在序列化之前修改转换后的节点数据结构，可以使用来自场景树的任何额外"
+"数据。"
+
+msgid ""
+"Part of the export process. This method is run first, before all other parts "
+"of the export process.\n"
+"The return value is used to determine if this [GLTFDocumentExtension] "
+"instance should be used for exporting a given glTF file. If [constant OK], "
+"the export will use this [GLTFDocumentExtension] instance. If not overridden, "
+"[constant OK] is returned."
+msgstr ""
+"导出过程的一部分。该方法是最先运行的，在导出过程的所有其他部分之前。\n"
+"返回值用于确定该 [GLTFDocumentExtension] 实例是否应该用于导出一个给定的 glTF "
+"文件。如果为 [constant OK]，则导出将使用该 [GLTFDocumentExtension] 实例。如果"
+"没有重写则返回 [constant OK]。"
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_export_post_convert] and before [method _get_saveable_image_formats].\n"
+"This method can be used to alter the state before performing serialization. "
+"It runs every time when generating a buffer with [method GLTFDocument."
+"generate_buffer] or writing to the file system with [method GLTFDocument."
+"write_to_filesystem]."
+msgstr ""
+"导出过程的一部分。该方法在 [method _export_post_convert] 之后、[method "
+"_get_saveable_image_formats] 之前运行。\n"
+"该方法可用于在执行序列化之前更改状态。每次使用 [method GLTFDocument."
+"generate_buffer] 生成缓冲区或使用 [method GLTFDocument.write_to_filesystem] 写"
+"入文件系统时，都会运行该方法。"
+
 msgid ""
 "Part of the import process. This method is run after [method "
 "_import_pre_generate] and before [method _import_node].\n"
@@ -65263,6 +65952,43 @@ msgstr ""
 "_import_post] 之前运行。\n"
 "该方法可用于对生成的每个 Godot 场景节点进行修改。"
 
+msgid ""
+"Part of the import process. Allows GLTFDocumentExtension classes to provide "
+"mappings for JSON pointers to glTF properties, as defined by the glTF object "
+"model, to properties of nodes in the Godot scene tree.\n"
+"Returns a [GLTFObjectModelProperty] instance that defines how the property "
+"should be mapped. If your extension can't handle the property, return "
+"[code]null[/code] or an instance without any NodePaths (see [method "
+"GLTFObjectModelProperty.has_node_paths]). You should use [method "
+"GLTFObjectModelProperty.set_types] to set the types, and [method "
+"GLTFObjectModelProperty.append_path_to_property] function is useful for most "
+"simple cases.\n"
+"In many cases, [param partial_paths] will contain the start of a path, "
+"allowing the extension to complete the path. For example, for [code]/nodes/3/"
+"extensions/MY_ext/prop[/code], Godot will pass you a NodePath that leads to "
+"node 3, so the GLTFDocumentExtension class only needs to resolve the last "
+"[code]MY_ext/prop[/code] part of the path. In this example, the extension "
+"should check [code]split.size() > 4 and split[0] == \"nodes\" and split[2] == "
+"\"extensions\" and split[3] == \"MY_ext\"[/code] at the start of the function "
+"to check if this JSON pointer applies to it, then it can use [param "
+"partial_paths] and handle [code]split[4][/code]."
+msgstr ""
+"导入过程的一部分。该功能允许 GLTFDocumentExtension 类为 JSON 指针提供映射到 "
+"glTF 属性，这些属性由 glTF 对象模型定义，并映射到 Godot 场景树中节点的属性。\n"
+"返回 [GLTFObjectModelProperty] 实例，定义属性的映射方式。如果扩展无法处理该属"
+"性，请返回 [code]null[/code] 或一个没有任何 NodePath 的实例（见 [method "
+"GLTFObjectModelProperty.has_node_paths]）。你应当使用 [method "
+"GLTFObjectModelProperty.set_types] 来设置类型，[method "
+"GLTFObjectModelProperty.append_path_to_property] 函数在大多数简单情况下非常有"
+"用。\n"
+"在许多情况下，[param partial_paths] 包含了路径的起始部分，允许扩展来补全路径。"
+"例如对于 [code]/nodes/3/extensions/MY_ext/prop[/code]，Godot 会传递给你一个指"
+"向节点 3 的 NodePath，因此 GLTFDocumentExtension 类只需解析路径最后的 "
+"[code]MY_ext/prop[/code] 部分。在这个例子中，扩展应在函数开始时检查 "
+"[code]split.size() > 4 and split[0] == \"nodes\" and split[2] == "
+"\"extensions\" and split[3] == \"MY_ext\"[/code]，确认该 JSON 指针是否适用，然"
+"后可以使用 [param partial_paths] 并处理 [code]split[4][/code]。"
+
 msgid ""
 "Part of the import process. This method is run last, after all other parts of "
 "the import process.\n"
@@ -65295,6 +66021,30 @@ msgstr ""
 "该方法可用于在解析后、生成节点并运行最终的各节点导入步骤之前，修改到目前为止导"
 "入的任何数据。"
 
+msgid ""
+"Part of the import process. This method is run first, before all other parts "
+"of the import process.\n"
+"The return value is used to determine if this [GLTFDocumentExtension] "
+"instance should be used for importing a given glTF file. If [constant OK], "
+"the import will use this [GLTFDocumentExtension] instance. If not overridden, "
+"[constant OK] is returned."
+msgstr ""
+"导入过程的一部分。该方法是最先运行的，在导入过程的所有其他部分之前。\n"
+"返回值用于确定该 [GLTFDocumentExtension] 实例是否应该用于导入一个给定的 glTF "
+"文件。如果为 [constant OK]，则导入将使用该 [GLTFDocumentExtension] 实例。如果"
+"没有重写则返回 [constant OK]。"
+
+msgid ""
+"Part of the import process. This method is run after [method "
+"_parse_node_extensions] and before [method _parse_texture_json].\n"
+"Runs when parsing image data from a glTF file. The data could be sourced from "
+"a separate file, a URI, or a buffer, and then is passed as a byte array."
+msgstr ""
+"导入过程的一部分。该方法在 [method _parse_node_extensions] 之后、[method "
+"_parse_texture_json] 之前运行。\n"
+"解析 glTF 文件中的图像数据时会执行该方法。数据可以来自单独的文件、URI 或缓冲"
+"区，然后作为字节数组传递。"
+
 msgid ""
 "Part of the import process. This method is run after [method "
 "_get_supported_extensions] and before [method _import_post_parse].\n"
@@ -65309,6 +66059,52 @@ msgstr ""
 "[method _generate_scene_node] 使用的格式。该返回值应该是 [enum Error] 枚举中的"
 "一个成员。"
 
+msgid ""
+"Part of the import process. This method is run after [method "
+"_parse_image_data] and before [method _generate_scene_node].\n"
+"Runs when parsing the texture JSON from the glTF textures array. This can be "
+"used to set the source image index to use as the texture."
+msgstr ""
+"导入过程的一部分。该方法在 [method _parse_image_data] 之后、[method "
+"_generate_scene_node] 之前运行。\n"
+"该方法在解析 glTF 纹理数组中的纹理 JSON 时执行。可以使用该方法设置作为纹理使用"
+"的源图像索引。"
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_get_saveable_image_formats] and before [method _serialize_texture_json].\n"
+"This method is run when saving images separately from the glTF file. When "
+"images are embedded, [method _serialize_image_to_bytes] runs instead. Note "
+"that these methods only run when this [GLTFDocumentExtension] is selected as "
+"the image exporter."
+msgstr ""
+"导出过程的一部分。该方法在 [method _get_saveable_image_formats] 之后、[method "
+"_serialize_texture_json] 之前运行。\n"
+"该方法在将图像单独保存到 glTF 文件时执行。当图像为嵌入图像时会改为运行 "
+"[method _serialize_image_to_bytes]。请注意，这些方法仅在选择该 "
+"[GLTFDocumentExtension] 作为图像导出器时运行。"
+
+msgid ""
+"Part of the export process. This method is run after [method "
+"_get_saveable_image_formats] and before [method _serialize_texture_json].\n"
+"This method is run when embedding images in the glTF file. When images are "
+"saved separately, [method _save_image_at_path] runs instead. Note that these "
+"methods only run when this [GLTFDocumentExtension] is selected as the image "
+"exporter.\n"
+"This method must set the image MIME type in the [param image_dict] with the "
+"[code]\"mimeType\"[/code] key. For example, for a PNG image, it would be set "
+"to [code]\"image/png\"[/code]. The return value must be a [PackedByteArray] "
+"containing the image data."
+msgstr ""
+"导出过程的一部分。该方法在 [method _get_saveable_image_formats] 之后、[method "
+"_serialize_texture_json] 之前运行。\n"
+"该方法在将图像嵌入到 glTF 文件时执行。当图像单独保存时，将改为运行 [method "
+"_save_image_at_path]。请注意，这些方法仅在选择该 [GLTFDocumentExtension] 作为"
+"图像导出器时运行。\n"
+"该方法必须在 [param image_dict] 中使用 [code]\"mimeType\"[/code] 键设置图像的 "
+"MIME 类型。例如对于 PNG 图像，应该设置为 [code]\"image/png\"[/code]。返回值必"
+"须是一个包含图像数据的 [PackedByteArray]。"
+
 msgid ""
 "Part of the export process. This method is run after [method "
 "_save_image_at_path] or [method _serialize_image_to_bytes], and before "
@@ -65497,6 +66293,24 @@ msgstr ""
 "配），而该返回值可以是你设置的任何值。如果没有设置任何值，则返回值为 "
 "[code]null[/code]。"
 
+msgid ""
+"Returns the [NodePath] that this GLTF node will have in the Godot scene tree "
+"after being imported. This is useful when importing glTF object model "
+"pointers with [GLTFObjectModelProperty], for handling extensions such as "
+"[code]KHR_animation_pointer[/code] or [code]KHR_interactivity[/code].\n"
+"If [param handle_skeletons] is [code]true[/code], paths to skeleton bone glTF "
+"nodes will be resolved properly. For example, a path that would be [code]^\"A/"
+"B/C/Bone1/Bone2/Bone3\"[/code] if [code]false[/code] will become [code]^\"A/B/"
+"C/Skeleton3D:Bone3\"[/code]."
+msgstr ""
+"返回该 GLTF 节点导入后在 Godot 场景树中的 [NodePath]。这在使用 "
+"[GLTFObjectModelProperty] 导入 glTF 对象模型指针时非常有用，可以处理 "
+"[code]KHR_animation_pointer[/code]、[code]KHR_interactivity[/code] 等扩展。\n"
+"如果 [param handle_skeletons] 为 [code]true[/code]，则会正确解析骨骼 glTF 节点"
+"的路径。例如为 [code]false[/code] 时为 [code]^\"A/B/C/Bone1/Bone2/Bone3\"[/"
+"code] 的路径在为 [code]true[/code] 时会变成 [code]^\"A/B/C/Skeleton3D:"
+"Bone3\"[/code]。"
+
 msgid ""
 "Sets additional arbitrary data in this [GLTFNode] instance. This can be used "
 "to keep per-node state data in [GLTFDocumentExtension] classes, which is "
@@ -65640,6 +66454,26 @@ msgstr ""
 "用 [method append_path_to_property]。请记得再调用一次 [method set_types]（顺序"
 "无关紧要）。"
 
+msgid ""
+"High-level wrapper over [method append_node_path] that handles the most "
+"common cases. It constructs a new [NodePath] using [param node_path] as a "
+"base and appends [param prop_name] to the subpath. Be sure to also call "
+"[method set_types] once (the order does not matter)."
+msgstr ""
+"对 [method append_node_path] 的高阶封装，能够处理最常见的情况。它会使用 "
+"[param node_path] 作为基础构造一个新的 [NodePath]，并将 [param prop_name] 附加"
+"到子路径上。请确保再调用一次 [method set_types]（顺序无关紧要）。"
+
+msgid ""
+"The GLTF accessor type associated with this property's [member "
+"object_model_type]. See [member GLTFAccessor.accessor_type] for possible "
+"values, and see [enum GLTFObjectModelType] for how the object model type maps "
+"to accessor types."
+msgstr ""
+"与该属性的 [member object_model_type] 关联的 GLTF 访问器类型。可能的值见 "
+"[member GLTFAccessor.accessor_type]，对象模型类型与访问器类型之间的映射见 "
+"[enum GLTFObjectModelType]。"
+
 msgid ""
 "Returns [code]true[/code] if [member json_pointers] is not empty. This is "
 "used during export to determine if a [GLTFObjectModelProperty] can handle "
@@ -65657,6 +66491,65 @@ msgstr ""
 "如果 [member node_paths] 非空则返回 [code]true[/code]。用于在导入过程中确定 "
 "[GLTFObjectModelProperty] 是否能够处理将 glTF 对象模型属性转换为 Godot 属性。"
 
+msgid ""
+"Sets the [member variant_type] and [member object_model_type] properties. "
+"This is a convenience method to set both properties at once, since they are "
+"almost always known at the same time. This method should be called once. "
+"Calling it again with the same values will have no effect."
+msgstr ""
+"设置 [member variant_type] 和 [member object_model_type] 属性。这是用来同时设"
+"置这两个属性的便捷方法，因为两者几乎都是一起确定的。该方法只应该调用一次。再次"
+"使用相同的值调用没有效果。"
+
+msgid ""
+"If set, this [Expression] will be used to convert the property value from the "
+"glTF object model to the value expected by the Godot property. This is useful "
+"when the glTF object model uses a different unit system, or when the data "
+"needs to be transformed in some way. If [code]null[/code], the value will be "
+"copied as-is."
+msgstr ""
+"如果设置了该 [Expression]，则会用来将 glTF 对象模型中的属性值转换为 Godot 属性"
+"所需的值。适用于 glTF 对象模型使用不同的单位系统，以及数据需要以某种方式进行转"
+"换的场合。如果为 [code]null[/code]，则会原样复制属性值。"
+
+msgid ""
+"If set, this [Expression] will be used to convert the property value from the "
+"Godot property to the value expected by the glTF object model. This is useful "
+"when the glTF object model uses a different unit system, or when the data "
+"needs to be transformed in some way. If [code]null[/code], the value will be "
+"copied as-is."
+msgstr ""
+"如果设置了该 [Expression]，则会用来将 Godot 属性中的属性值转换为 glTF 对象模型"
+"所需的值。适用于 glTF 对象模型使用不同的单位系统，以及数据需要以某种方式进行转"
+"换的场合。如果为 [code]null[/code]，则会原样复制属性值。"
+
+msgid ""
+"The glTF object model JSON pointers used to identify the property in the glTF "
+"object model. In most cases, there will be only one item in this array, but "
+"niche cases may require multiple pointers. The items are themselves arrays "
+"which represent the JSON pointer split into its components."
+msgstr ""
+"用于在 glTF 对象模型中标识属性的 glTF 对象模型 JSON 指针。大多数情况下该数组中"
+"只有一个元素，但某些特定情况可能需要多个指针。这些元素本身也是数组，表示将 "
+"JSON 指针拆分成组件。"
+
+msgid ""
+"An array of [NodePath]s that point to a property, or multiple properties, in "
+"the Godot scene tree. On import, this will either be set by [GLTFDocument], "
+"or by a [GLTFDocumentExtension] class. For simple cases, use [method "
+"append_path_to_property] to add properties to this array.\n"
+"In most cases [member node_paths] will only have one item, but in some cases "
+"a single glTF JSON pointer will map to multiple Godot properties. For "
+"example, a [GLTFCamera] or [GLTFLight] used on multiple glTF nodes will be "
+"represented by multiple Godot nodes."
+msgstr ""
+"指向 Godot 场景树中一个或多个属性的 [NodePath] 数组。导入时由 [GLTFDocument] "
+"或 [GLTFDocumentExtension] 类设置。简单情况可以使用 [method "
+"append_path_to_property] 将属性添加到该数组中。\n"
+"大多数情况下 [member node_paths] 只会有一个元素，但在某些情况下，单个 glTF "
+"JSON 指针可能映射到多个 Godot 属性。例如多个 glTF 节点上使用的同一个 "
+"[GLTFCamera] 或 [GLTFLight] 会表示为多个 Godot 节点。"
+
 msgid ""
 "The type of data stored in the glTF file as defined by the object model. This "
 "is a superset of the available accessor types, and determines the accessor "
@@ -66055,6 +66948,36 @@ msgstr ""
 "[GLTFBufferView] 的索引。如果 [param deduplication] 为 [code]true[/code]，则将"
 "首先在缓冲区中搜索重复数据，否则将始终追加新字节。"
 
+msgid ""
+"Append the given [GLTFNode] to the state, and return its new index. This can "
+"be used to export one Godot node as multiple glTF nodes, or inject new glTF "
+"nodes at import time. On import, this must be called before [method "
+"GLTFDocumentExtension._generate_scene_node] finishes for the parent node. On "
+"export, this must be called before [method GLTFDocumentExtension."
+"_export_node] runs for the parent node.\n"
+"The [param godot_scene_node] parameter is the Godot scene node that "
+"corresponds to this glTF node. This is highly recommended to be set to a "
+"valid node, but may be [code]null[/code] if there is no corresponding Godot "
+"scene node. One Godot scene node may be used for multiple glTF nodes, so if "
+"exporting multiple glTF nodes for one Godot scene node, use the same Godot "
+"scene node for each.\n"
+"The [param parent_node_index] parameter is the index of the parent [GLTFNode] "
+"in the state. If [code]-1[/code], the node will be a root node, otherwise the "
+"new node will be added to the parent's list of children. The index will also "
+"be written to the [member GLTFNode.parent] property of the new node."
+msgstr ""
+"将给定的 [GLTFNode] 追加到状态中并返回其索引。可以用来将一个 Godot 节点导出为"
+"多个 glTF 节点，或是在导入时注入新的 glTF 节点。导入时必须在父节点完成 "
+"[method GLTFDocumentExtension._generate_scene_node] 前调用。导出时父节点运行 "
+"[method GLTFDocumentExtension._export_node] 前调用。\n"
+"参数 [param godot_scene_node] 是与该 glTF 节点对应的 Godot 场景节点。强烈建议"
+"将其设为有效节点，但如果没有对应的 Godot 场景节点的话也可以设为 [code]null[/"
+"code]。一个 Godot 场景节点可以用于多个 glTF 节点，因此为单一 Godot 场景节点导"
+"出多个 glTF 节点时，每一个都可以使用相同的 Godot 场景节点。\n"
+"参数 [param parent_node_index] 是状态中父 [GLTFNode] 的索引。如果为 [code]-1[/"
+"code] 则该节点为根节点，否则会将新节点加入父节点的子节点列表。该索引也会写入新"
+"节点的 [member GLTFNode.parent] 属性。"
+
 msgid ""
 "Gets additional arbitrary data in this [GLTFState] instance. This can be used "
 "to keep per-file state data in [GLTFDocumentExtension] classes, which is "
@@ -67232,6 +68155,29 @@ msgstr ""
 "follow_camera_enabled] 为 [code]true[/code]，请考虑降低 [member resolution] 以"
 "提高性能。"
 
+msgid ""
+"The visual layers to account for when updating the heightmap. Only "
+"[MeshInstance3D]s whose [member VisualInstance3D.layers] match with this "
+"[member heightfield_mask] will be included in the heightmap collision update. "
+"By default, all 20 user-visible layers are taken into account for updating "
+"the heightmap collision.\n"
+"[b]Note:[/b] Since the [member heightfield_mask] allows for 32 layers to be "
+"stored in total, there are an additional 12 layers that are only used "
+"internally by the engine and aren't exposed in the editor. Setting [member "
+"heightfield_mask] using a script allows you to toggle those reserved layers, "
+"which can be useful for editor plugins.\n"
+"To adjust [member heightfield_mask] more easily using a script, use [method "
+"get_heightfield_mask_value] and [method set_heightfield_mask_value]."
+msgstr ""
+"更新高度图时要考虑的可视层。高度图碰撞更新中只会包含 [member VisualInstance3D."
+"layers] 与 [member heightfield_mask] 匹配的 [MeshInstance3D]。默认情况下，更新"
+"高度图碰撞时会考虑全部 20 个用户可见层。\n"
+"[b]注意：[/b]由于 [member heightfield_mask] 总共能够存储 32 个层，还有 12 个层"
+"是仅限引擎内部使用的，未在编辑器中暴露。通过脚本设置 [member "
+"heightfield_mask] 就可以开关这些保留的层，适用于编辑器插件。\n"
+"脚本中可以使用 [method get_heightfield_mask_value] 和 [method "
+"set_heightfield_mask_value] 更方便地调整 [member heightfield_mask]。"
+
 msgid ""
 "Higher resolutions can represent small details more accurately in large "
 "scenes, at the cost of lower performance. If [member update_mode] is "
@@ -72538,6 +73484,92 @@ msgstr ""
 "[Texture2DArray]、[Cubemap] 和 [CubemapArray] 的基类。不能直接使用，但包含了访"
 "问派生资源类型所需的所有函数。另请参阅 [Texture3D]。"
 
+msgid ""
+"Creates an [ImageTextureLayered] from an array of [Image]s. See [method Image."
+"create] for the expected data format. The first image decides the width, "
+"height, image format and mipmapping setting. The other images [i]must[/i] "
+"have the same width, height, image format and mipmapping setting.\n"
+"Each [Image] represents one [code]layer[/code].\n"
+"[codeblock]\n"
+"# Fill in an array of Images with different colors.\n"
+"var images = []\n"
+"const LAYERS = 6\n"
+"for i in LAYERS:\n"
+"    var image = Image.create_empty(128, 128, false, Image.FORMAT_RGB8)\n"
+"    if i % 3 == 0:\n"
+"        image.fill(Color.RED)\n"
+"    elif i % 3 == 1:\n"
+"        image.fill(Color.GREEN)\n"
+"    else:\n"
+"        image.fill(Color.BLUE)\n"
+"    images.push_back(image)\n"
+"\n"
+"# Create and save a 2D texture array. The array of images must have at least "
+"1 Image.\n"
+"var texture_2d_array = Texture2DArray.new()\n"
+"texture_2d_array.create_from_images(images)\n"
+"ResourceSaver.save(texture_2d_array, \"res://texture_2d_array.res\", "
+"ResourceSaver.FLAG_COMPRESS)\n"
+"\n"
+"# Create and save a cubemap. The array of images must have exactly 6 Images.\n"
+"# The cubemap's images are specified in this order: X+, X-, Y+, Y-, Z+, Z-\n"
+"# (in Godot's coordinate system, so Y+ is \"up\" and Z- is \"forward\").\n"
+"var cubemap = Cubemap.new()\n"
+"cubemap.create_from_images(images)\n"
+"ResourceSaver.save(cubemap, \"res://cubemap.res\", ResourceSaver."
+"FLAG_COMPRESS)\n"
+"\n"
+"# Create and save a cubemap array. The array of images must have a multiple "
+"of 6 Images.\n"
+"# Each cubemap's images are specified in this order: X+, X-, Y+, Y-, Z+, Z-\n"
+"# (in Godot's coordinate system, so Y+ is \"up\" and Z- is \"forward\").\n"
+"var cubemap_array = CubemapArray.new()\n"
+"cubemap_array.create_from_images(images)\n"
+"ResourceSaver.save(cubemap_array, \"res://cubemap_array.res\", ResourceSaver."
+"FLAG_COMPRESS)\n"
+"[/codeblock]"
+msgstr ""
+"根据 [Image] 数组创建 [ImageTextureLayered]，所需的数据格式见 [method Image."
+"create]。宽度、高度、图像格式、Mipmap 等设置由第一个图像决定，其他图像[i]必须"
+"[/i]保持一致。\n"
+"每个 [Image] 都代表一层 [code]layer[/code]。\n"
+"[codeblock]\n"
+"# 为数组中的图像填充不同的颜色。\n"
+"var images = []\n"
+"const LAYERS = 6\n"
+"for i in LAYERS:\n"
+"    var image = Image.create_empty(128, 128, false, Image.FORMAT_RGB8)\n"
+"    if i % 3 == 0:\n"
+"        image.fill(Color.RED)\n"
+"    elif i % 3 == 1:\n"
+"        image.fill(Color.GREEN)\n"
+"    else:\n"
+"        image.fill(Color.BLUE)\n"
+"    images.push_back(image)\n"
+"\n"
+"# 创建并保存 2D 纹理数组。图像数组中必须至少有 1 个图像。\n"
+"var texture_2d_array = Texture2DArray.new()\n"
+"texture_2d_array.create_from_images(images)\n"
+"ResourceSaver.save(texture_2d_array, \"res://texture_2d_array.res\", "
+"ResourceSaver.FLAG_COMPRESS)\n"
+"\n"
+"# 创建并保存立方体贴图。图像数组中图像的数量必须为 6。\n"
+"# 立方体贴图图像的顺序为：X+、X-、Y+、Y-、Z+、Z-\n"
+"# （使用 Godot 的坐标系，因此 Y+ 是“上”、Z- 是“前”）。\n"
+"var cubemap = Cubemap.new()\n"
+"cubemap.create_from_images(images)\n"
+"ResourceSaver.save(cubemap, \"res://cubemap.res\", ResourceSaver."
+"FLAG_COMPRESS)\n"
+"\n"
+"# 创建并保存立方体贴图数组。图像数组中图像的数量必须为 6 的倍数。\n"
+"# 每个立方体贴图图像的顺序为：X+、X-、Y+、Y-、Z+、Z-\n"
+"# （使用 Godot 的坐标系，因此 Y+ 是“上”、Z- 是“前”）。\n"
+"var cubemap_array = CubemapArray.new()\n"
+"cubemap_array.create_from_images(images)\n"
+"ResourceSaver.save(cubemap_array, \"res://cubemap_array.res\", ResourceSaver."
+"FLAG_COMPRESS)\n"
+"[/codeblock]"
+
 msgid ""
 "Replaces the existing [Image] data at the given [param layer] with this new "
 "image.\n"
@@ -72675,6 +73707,31 @@ msgstr ""
 msgid "Removes all surfaces and blend shapes from this [ImporterMesh]."
 msgstr "从该 [ImporterMesh] 中，移除所有表面和混合形状。"
 
+msgid ""
+"Generates all lods for this ImporterMesh.\n"
+"[param normal_merge_angle] is in degrees and used in the same way as the "
+"importer settings in [code]lods[/code].\n"
+"[param normal_split_angle] is not used and only remains for compatibility "
+"with older versions of the API.\n"
+"The number of generated lods can be accessed using [method "
+"get_surface_lod_count], and each LOD is available in [method "
+"get_surface_lod_size] and [method get_surface_lod_indices].\n"
+"[param bone_transform_array] is an [Array] which can be either empty or "
+"contain [Transform3D]s which, for each of the mesh's bone IDs, will apply "
+"mesh skinning when generating the LOD mesh variations. This is usually used "
+"to account for discrepancies in scale between the mesh itself and its "
+"skinning data."
+msgstr ""
+"为这个 ImporterMesh 生成所有 LOD。\n"
+"[param normal_merge_angle] 和 [param normal_split_angle] 以度为单位，用法与 "
+"[code]lods[/code] 的导入器设置相同。\n"
+"[param normal_split_angle] 未使用，仅为兼容旧版本 API 而保留。\n"
+"生成的 LOD 的数量可以使用 [method get_surface_lod_count] 访问，每个 LOD 在 "
+"[method get_surface_lod_size] 和 [method get_surface_lod_indices] 中可用。\n"
+"[param bone_transform_array] 是一个 [Array]，可以是空的，也可以包含 "
+"[Transform3D]，每个网格的骨骼 ID 在生成 LOD 网格变化时将应用网格蒙皮。这通常用"
+"于解释网格本身与其蒙皮数据之间的缩放差异。"
+
 msgid "Returns the number of blend shapes that the mesh holds."
 msgstr "返回该网格包含的混合形状的数量。"
 
@@ -76241,6 +77298,13 @@ msgstr ""
 "或某种[url=https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/"
 "Global_Objects/TypedArray]类型化数组对象[/url]类型，则返回 [code]true[/code]。"
 
+msgid ""
+"Returns a copy of [param javascript_buffer]'s contents as a "
+"[PackedByteArray]. See also [method is_js_buffer]."
+msgstr ""
+"以 [PackedByteArray] 的形式返回 [param javascript_buffer] 中内容的副本。另见 "
+"[method is_js_buffer]。"
+
 msgid ""
 "Returns [code]true[/code] if a new version of the progressive web app is "
 "waiting to be activated.\n"
@@ -77871,6 +78935,9 @@ msgstr ""
 "模糊阴影的边缘。可用于隐藏低分辨率阴影贴图中的像素伪影。高值会影响性能，使阴影"
 "看起来有颗粒感，并可能导致其他不需要的伪影。尽量保持接近默认值。"
 
+msgid "The light will only cast shadows using objects in the selected layers."
+msgstr "灯光只会使用选定层中的对象投射阴影。"
+
 msgid ""
 "If [code]true[/code], the light will cast real-time shadows. This has a "
 "significant performance cost. Only enable shadow rendering when it makes a "
@@ -78257,6 +79324,89 @@ msgstr ""
 "小的限制，可能无法在所有硬件上工作。如果不确定，请将 [member "
 "max_texture_size] 保留为其默认值 [code]16384[/code]。"
 
+msgid ""
+"The quality preset to use when baking lightmaps. This affects bake times, but "
+"output file sizes remain mostly identical across quality levels.\n"
+"To further speed up bake times, decrease [member bounces], disable [member "
+"use_denoiser] and/or decrease [member texel_scale].\n"
+"To further increase quality, enable [member supersampling] and/or increase "
+"[member texel_scale]."
+msgstr ""
+"烘焙光照贴图时使用的质量预设。会影响烘焙时间，但输出文件的大小在所有质量级别上"
+"基本相同。\n"
+"要进一步加快烘焙时间，请在减小 [member bounces]、禁用 [member use_denoiser] "
+"并/或减小 [member texel_scale]。\n"
+"要进一步提升质量，请启用 [member supersampling] 并/或增大 [member "
+"texel_scale]。"
+
+msgid ""
+"The shadowmasking policy to use for directional shadows on static objects "
+"that are baked with this [LightmapGI] instance.\n"
+"Shadowmasking allows [DirectionalLight3D] nodes to cast shadows even outside "
+"the range defined by their [member DirectionalLight3D."
+"directional_shadow_max_distance] property. This is done by baking a texture "
+"that contains a shadowmap for the directional light, then using this texture "
+"according to the current shadowmask mode.\n"
+"[b]Note:[/b] The shadowmask texture is only created if [member "
+"shadowmask_mode] is not [constant LightmapGIData.SHADOWMASK_MODE_NONE]. To "
+"see a difference, you need to bake lightmaps again after switching from "
+"[constant LightmapGIData.SHADOWMASK_MODE_NONE] to any other mode."
+msgstr ""
+"阴影遮罩策略，用于该 [LightmapGI] 实例烘焙的静态物体的方向阴影。\n"
+"使用阴影遮罩的 [DirectionalLight3D] 节点即便超出了 [member DirectionalLight3D."
+"directional_shadow_max_distance] 所定义的范围也能够投射阴影。原理是为平行光烘"
+"焙包含阴影贴图的纹理，然后根据当前的阴影遮罩模式使用这张纹理。\n"
+"[b]注意：[/b][member shadowmask_mode] 非 [constant LightmapGIData."
+"SHADOWMASK_MODE_NONE] 时才会创建阴影遮罩纹理。要看到区别，请将 [constant "
+"LightmapGIData.SHADOWMASK_MODE_NONE] 改为其他模式，然后重新烘焙光照贴图。"
+
+msgid ""
+"If [code]true[/code], lightmaps are baked with the texel scale multiplied "
+"with [member supersampling_factor] and downsampled before saving the lightmap "
+"(so the effective texel density is identical to having supersampling "
+"disabled).\n"
+"Supersampling provides increased lightmap quality with less noise, smoother "
+"shadows and better shadowing of small-scale features in objects. However, it "
+"may result in significantly increased bake times and memory usage while "
+"baking lightmaps. Padding is automatically adjusted to avoid increasing light "
+"leaking."
+msgstr ""
+"如果为 [code]true[/code]，则光照贴图在烘焙时会将纹素缩放值与 [member "
+"supersampling_factor] 相乘，并在保存光照贴图之前进行下采样（因此有效的纹素密度"
+"与禁用超采样时相同）。\n"
+"超采样可以提高光照贴图的质量、减少噪声、提供更平滑的阴影、更好地阴影化物体中的"
+"小规模特征。不过也可能会导致在烘焙光照贴图时显著增加烘焙时间和内存使用。会自动"
+"调整填充，避免增加光泄漏。"
+
+msgid ""
+"The factor by which the texel density is multiplied for supersampling. For "
+"best results, use an integer value. While fractional values are allowed, they "
+"can result in increased light leaking and a blurry lightmap.\n"
+"Higher values may result in better quality, but also increase bake times and "
+"memory usage while baking.\n"
+"See [member supersampling] for more information."
+msgstr ""
+"超采样时与纹素密度相乘的系数。为了获得最佳效果，建议使用整数值。虽然允许使用分"
+"数值，但可能会导致光泄漏增加、光照贴图模糊。\n"
+"较高的值可能会带来更好的质量，但在烘焙时也会增加烘焙时间和内存使用。\n"
+"详情见 [member supersampling]。"
+
+msgid ""
+"Scales the lightmap texel density of all meshes for the current bake. This is "
+"a multiplier that builds upon the existing lightmap texel size defined in "
+"each imported 3D scene, along with the per-mesh density multiplier (which is "
+"designed to be used when the same mesh is used at different scales). Lower "
+"values will result in faster bake times.\n"
+"For example, doubling [member texel_scale] doubles the lightmap texture "
+"resolution for all objects [i]on each axis[/i], so it will [i]quadruple[/i] "
+"the texel count."
+msgstr ""
+"缩放当前烘焙的所有网格的光照贴图纹素密度。这是一个乘数，基于导入的各个 3D 场景"
+"中定义的已有光照贴图纹素大小，以及各个网格的密度乘数（设计用于在不同缩放使用相"
+"同网格时使用）。值越低，烘焙时间越快。\n"
+"例如，将 [member texel_scale] 翻倍会让物体的光照贴图纹理[i]在每个方向上[/i]的"
+"分辨率都翻倍，导致纹素数量[i]变为原来的四倍[/i]。"
+
 msgid ""
 "If [code]true[/code], uses a GPU-based denoising algorithm on the generated "
 "lightmap. This eliminates most noise within the generated lightmap at the "
@@ -78493,6 +79643,48 @@ msgstr "由光照贴图器生成的光照贴图图集纹理。"
 msgid "The lightmap atlas textures generated by the lightmapper."
 msgstr "由光照贴图器生成的光照贴图图集纹理。"
 
+msgid "The shadowmask atlas textures generated by the lightmapper."
+msgstr "光照贴图器生成的阴影遮罩图集纹理。"
+
+msgid ""
+"Shadowmasking is disabled. No shadowmask texture will be created when baking "
+"lightmaps. Existing shadowmask textures will be removed during baking."
+msgstr ""
+"阴影遮罩已禁用。烘焙光照贴图时不会创建阴影遮罩纹理。烘焙时会移除现有的阴影遮罩"
+"纹理。"
+
+msgid ""
+"Shadowmasking is enabled. Directional shadows that are outside the [member "
+"DirectionalLight3D.directional_shadow_max_distance] will be rendered using "
+"the shadowmask texture. Shadows that are inside the range will be rendered "
+"using real-time shadows exclusively. This mode allows for more precise real-"
+"time shadows up close, without the potential \"smearing\" effect that can "
+"occur when using lightmaps with a high texel size. The downside is that when "
+"the camera moves fast, the transition between the real-time light and "
+"shadowmask can be obvious. Also, objects that only have shadows baked in the "
+"shadowmask (and no real-time shadows) won't display any shadows up close."
+msgstr ""
+"阴影遮罩已启用。超出 [member DirectionalLight3D."
+"directional_shadow_max_distance] 范围的方向阴影会使用阴影遮罩纹理渲染。范围内"
+"的阴影只会使用实时阴影渲染。该模式能够让较近的实时阴影更加精确，不会出现使用高"
+"纹素大小的光照贴图时可能出现的“模糊”效果。缺点是当相机快速移动时，实时光照和阴"
+"影遮罩之间的过渡可能会很明显。此外，仅在阴影遮罩中烘焙阴影（没有实时阴影）的物"
+"体在距离较近时不会显示任何阴影。"
+
+msgid ""
+"Shadowmasking is enabled. Directional shadows will be rendered with real-time "
+"shadows overlaid on top of the shadowmask texture. This mode makes for "
+"smoother shadow transitions when the camera moves fast, at the cost of a "
+"potential smearing effect for directional shadows that are up close (due to "
+"the real-time shadow being mixed with a low-resolution shadowmask). Objects "
+"that only have shadows baked in the shadowmask (and no real-time shadows) "
+"will keep their shadows up close."
+msgstr ""
+"阴影遮罩已启用。方向阴影在渲染时会在阴影遮罩纹理上叠加实时阴影。该模式在相机快"
+"速移动时可以实现更平滑的阴影过渡，但代价是近距离的方向阴影可能会出现模糊效果"
+"（因为实时阴影与低分辨率的阴影遮罩混合）。仅在阴影遮罩中烘焙阴影（没有实时阴"
+"影）的物体在距离较近时会保持阴影。"
+
 msgid "Abstract class extended by lightmappers, for use in [LightmapGI]."
 msgstr "由光照贴图器扩展的抽象类，用于 [LightmapGI]。"
 
@@ -78511,6 +79703,22 @@ msgstr ""
 msgid "The built-in GPU-based lightmapper for use with [LightmapGI]."
 msgstr "内置的基于 GPU 的光照贴图器，与 [LightmapGI] 一起使用。"
 
+msgid ""
+"LightmapperRD (\"RD\" stands for [RenderingDevice]) is the built-in GPU-based "
+"lightmapper for use with [LightmapGI]. On most dedicated GPUs, it can bake "
+"lightmaps much faster than most CPU-based lightmappers. LightmapperRD uses "
+"compute shaders to bake lightmaps, so it does not require CUDA or OpenCL "
+"libraries to be installed to be usable.\n"
+"[b]Note:[/b] Only usable when using the RenderingDevice backend (Forward+ or "
+"Mobile renderers), not Compatibility."
+msgstr ""
+"LightmapperRD（“RD”代表 [RenderingDevice]）是基于 GPU 的内置光照贴图器，可与 "
+"[LightmapGI] 一起使用。在大多数专用 GPU 上，它可以比大多数基于 CPU 的光照贴图"
+"更快地烘焙光照贴图。LightmapperRD 使用计算着色器来烘焙光照贴图，因此它不需要安"
+"装 CUDA 或 OpenCL 库即可使用。\n"
+"[b]注意：[/b]仅在使用 RenderingDevice 后端（Forward+ 或移动渲染器）时可用，使"
+"用 Compatibility 时不可用。"
+
 msgid ""
 "Represents a single manually placed probe for dynamic object lighting with "
 "[LightmapGI]."
@@ -79105,10 +80313,11 @@ msgid ""
 msgstr "[LineEdit] 中光标的列位置。设置后文本可能会滚动以适应它。"
 
 msgid ""
-"If [code]true[/code], the [LineEdit] will always show the caret, even if "
-"focus is lost."
+"If [code]true[/code], the [LineEdit] will always show the caret, even if not "
+"editing or focus is lost."
 msgstr ""
-"如果为 [code]true[/code]，则该 [LineEdit] 会始终显示光标，即使焦点丢失。"
+"如果为 [code]true[/code]，则该 [LineEdit] 会始终显示光标，即使不处于编辑模式或"
+"焦点丢失。"
 
 msgid ""
 "Allow moving caret, selecting and removing the individual composite character "
@@ -80494,6 +81703,16 @@ msgstr ""
 "为零，[PopupMenu] 外的所有子节点都无法访问。\n"
 "[b]注意：[/b]该属性会覆盖子节点的 [member PopupMenu.prefer_native_menu] 属性。"
 
+msgid ""
+"Position order in the global menu to insert [MenuBar] items at. All menu "
+"items in the [MenuBar] are always inserted as a continuous range. Menus with "
+"lower [member start_index] are inserted first. Menus with [member "
+"start_index] equal to [code]-1[/code] are inserted last."
+msgstr ""
+"在全局菜单中插入 [MenuBar] 项目的位置顺序。[MenuBar] 中的所有菜单项都始终会作"
+"为连续的范围插入。[member start_index] 较低的菜单会优先插入。[member "
+"start_index] 等于 [code]-1[/code] 的菜单会最后插入。"
+
 msgid ""
 "If [code]true[/code], when the cursor hovers above menu item, it will close "
 "the current [PopupMenu] and open the other one."
@@ -81534,6 +82753,21 @@ msgstr ""
 "[b]性能：[/b]需要从 GPU 接收 [Mesh] 数据，从而在该过程中拖延了 "
 "[RenderingServer]。"
 
+msgid ""
+"Takes a snapshot of the current animated skeleton pose of the skinned mesh "
+"and bakes it to the provided [param existing] mesh. If no [param existing] "
+"mesh is provided a new [ArrayMesh] is created, baked, and returned. Requires "
+"a skeleton with a registered skin to work. Blendshapes are ignored. Mesh "
+"surface materials are not copied.\n"
+"[b]Performance:[/b] [Mesh] data needs to be retrieved from the GPU, stalling "
+"the [RenderingServer] in the process."
+msgstr ""
+"对蒙皮网格的当前动画骨架姿势进行快照，将其烘焙至已有的 [param existing] 网格。"
+"如果未提供 [param existing] 网格，则会新建一个 [ArrayMesh] 进行烘焙并返回。骨"
+"架需要注册皮肤才能正常工作。会忽略混合形状。不会复制网格表面材质。\n"
+"[b]性能：[/b][Mesh] 数据需要从 GPU 获取，过程中会让 [RenderingServer] 产生停"
+"顿。"
+
 msgid ""
 "This helper creates a [StaticBody3D] child node with a [ConvexPolygonShape3D] "
 "collision shape calculated from the mesh geometry. It's mainly used for "
@@ -81656,6 +82890,21 @@ msgstr ""
 "将 [param blend_shape_idx] 处的混合形状的值设置为 [param value]。如果 [member "
 "mesh] 为 [code]null[/code]，或在该索引处没有混合形状，则会产生一个错误。"
 
+msgid ""
+"Sets the override [param material] for the specified [param surface] of the "
+"[Mesh] resource. This material is associated with this [MeshInstance3D] "
+"rather than with [member mesh].\n"
+"[b]Note:[/b] This assigns the [Material] associated to the [MeshInstance3D]'s "
+"Surface Material Override properties, not the material within the [Mesh] "
+"resource. To set the material within the [Mesh] resource, use [method Mesh."
+"surface_set_material] instead."
+msgstr ""
+"设置 [Mesh] 资源的指定 [param surface] 的覆盖 [param material]。该材质与该 "
+"[MeshInstance3D] 关联，而不是与 [member mesh] 关联。\n"
+"[b]注意：[/b]这将分配与 [MeshInstance3D] 的表面材质覆盖属性关联的 [Material]，"
+"而不是 [Mesh] 资源内的材质。要在 [Mesh] 资源中设置材质，请改用 [method Mesh."
+"surface_set_material]。"
+
 msgid "The [Mesh] resource for the instance."
 msgstr "该实例的 [Mesh] 资源。"
 
@@ -81698,6 +82947,13 @@ msgstr "返回正在使用的项目 ID 列表。"
 msgid "Returns the item's mesh."
 msgstr "返回该项目的网格。"
 
+msgid ""
+"Returns the item's shadow casting mode. See [enum RenderingServer."
+"ShadowCastingSetting] for possible values."
+msgstr ""
+"返回项目的阴影投射模式。可能的取值见 [enum RenderingServer."
+"ShadowCastingSetting]。"
+
 msgid "Returns the transform applied to the item's mesh."
 msgstr "返回应用到项目网格的变换。"
 
@@ -81741,6 +82997,13 @@ msgstr "删除项目。"
 msgid "Sets the item's mesh."
 msgstr "设置该项的网格。"
 
+msgid ""
+"Sets the item's shadow casting mode. See [enum RenderingServer."
+"ShadowCastingSetting] for possible values."
+msgstr ""
+"设置该项的阴影投射模式。可能的取值见 [enum RenderingServer."
+"ShadowCastingSetting]。"
+
 msgid "Sets the transform to apply to the item's mesh."
 msgstr "设置要应用到项目网格的变换。"
 
@@ -81900,6 +83163,43 @@ msgstr ""
 msgid "Generic mobile VR implementation."
 msgstr "通用移动 VR 实现。"
 
+msgid ""
+"This is a generic mobile VR implementation where you need to provide details "
+"about the phone and HMD used. It does not rely on any existing framework. "
+"This is the most basic interface we have. For the best effect, you need a "
+"mobile phone with a gyroscope and accelerometer.\n"
+"Note that even though there is no positional tracking, the camera will assume "
+"the headset is at a height of 1.85 meters. You can change this by setting "
+"[member eye_height].\n"
+"You can initialize this interface as follows:\n"
+"[codeblock]\n"
+"var interface = XRServer.find_interface(\"Native mobile\")\n"
+"if interface and interface.initialize():\n"
+"    get_viewport().use_xr = true\n"
+"[/codeblock]\n"
+"[b]Note:[/b] For Android, [member ProjectSettings.input_devices/sensors/"
+"enable_accelerometer], [member ProjectSettings.input_devices/sensors/"
+"enable_gravity], [member ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] and [member ProjectSettings.input_devices/sensors/"
+"enable_magnetometer] must be enabled."
+msgstr ""
+"这是一个通用的移动 VR 实现，你需要提供有关所用手机和 HMD 的详细信息。它不依赖"
+"于任何现有框架。这是我们拥有的最基本的接口。为了获得最佳效果，你需要一部带有陀"
+"螺仪和加速度计的手机。\n"
+"请注意，即使没有位置跟踪，相机也会假定头戴设备处于 1.85 米的高度。可以通过设"
+"置 [member eye_height] 来更改该设置。\n"
+"可以按如下方式初始化该接口：\n"
+"[codeblock]\n"
+"var interface = XRServer.find_interface(\"Native mobile\")\n"
+"if interface and interface.initialize():\n"
+"    get_viewport().use_xr = true\n"
+"[/codeblock]\n"
+"[b]注意：[/b]在 Android 上必须启用 [member ProjectSettings.input_devices/"
+"sensors/enable_accelerometer]、[member ProjectSettings.input_devices/sensors/"
+"enable_gravity]、[member ProjectSettings.input_devices/sensors/"
+"enable_gyroscope] 和 [member ProjectSettings.input_devices/sensors/"
+"enable_magnetometer]。"
+
 msgid ""
 "The distance between the display and the lenses inside of the device in "
 "centimeters."
@@ -82183,6 +83483,31 @@ msgstr "返回指定实例的 [Transform3D]。"
 msgid "Returns the [Transform2D] of a specific instance."
 msgstr "返回指定实例的 [Transform2D]。"
 
+msgid ""
+"When using [i]physics interpolation[/i], this function allows you to prevent "
+"interpolation on an instance in the current physics tick.\n"
+"This allows you to move instances instantaneously, and should usually be used "
+"when initially placing an instance such as a bullet to prevent graphical "
+"glitches."
+msgstr ""
+"使用[i]物理插值[/i]时，该函数能够让你在当前物理周期中阻止对实例进行插值。\n"
+"这样你就可以让实例瞬移，通常在初始放置子弹等实例时使用，防止出现图形问题。"
+
+msgid ""
+"An alternative to setting the [member buffer] property, which can be used "
+"with [i]physics interpolation[/i]. This method takes two arrays, and can set "
+"the data for the current and previous tick in one go. The renderer will "
+"automatically interpolate the data at each frame.\n"
+"This is useful for situations where the order of instances may change from "
+"physics tick to tick, such as particle systems.\n"
+"When the order of instances is coherent, the simpler alternative of setting "
+"[member buffer] can still be used with interpolation."
+msgstr ""
+"设置 [member buffer] 属性的替代做法，可以用于[i]物理插值[/i]。该方法接受两个数"
+"组，可以一次性设置当前周期和上一周期的数据。渲染器每一帧都会自动插值。\n"
+"适用于实例顺序每个物理周期中都经常会改变的场合，例如粒子系统。\n"
+"如果实例的顺序是连贯的，插值时还是可以用更简单的设置 [member buffer] 来代替。"
+
 msgid ""
 "Sets the color of a specific instance by [i]multiplying[/i] the mesh's "
 "existing vertex colors. This allows for different color tinting per "
@@ -83950,7 +85275,7 @@ msgstr ""
 
 msgid ""
 "Returns global menu open callback.\n"
-"b]Note:[/b] This method is implemented only on macOS."
+"[b]Note:[/b] This method is implemented only on macOS."
 msgstr ""
 "返回全局菜单的打开回调。\n"
 "[b]注意：[/b]该方法仅在 macOS 上实现。"
@@ -84192,6 +85517,18 @@ msgstr ""
 "设置全局菜单的最小宽度。\n"
 "[b]注意：[/b]该方法仅在 macOS 上实现。"
 
+msgid ""
+"Registers callable to emit when the menu is about to show.\n"
+"[b]Note:[/b] The OS can simulate menu opening to track menu item changes and "
+"global shortcuts, in which case the corresponding close callback is not "
+"triggered. Use [method is_opened] to check if the menu is currently opened.\n"
+"[b]Note:[/b] This method is implemented on macOS and Windows."
+msgstr ""
+"注册可调用体，在菜单即将显示时发出。\n"
+"[b]注意：[/b]操作系统可以模拟菜单打开来跟踪菜单项更改和全局快捷键，在这种情况"
+"下不会触发相应的关闭回调。请使用 [method is_opened] 检查菜单当前是否已打开。\n"
+"[b]注意：[/b]该方法在 macOS 和 Windows 上实现。"
+
 msgid ""
 "Registers callable to emit after the menu is closed.\n"
 "[b]Note:[/b] This method is implemented only on macOS."
@@ -89038,6 +90375,64 @@ msgstr ""
 "[b]注意：[/b]如果你获取了从唯一节点开始的相对路径，则由于添加了唯一节点的名"
 "称，该路径可能比普通的相对路径长。"
 
+msgid ""
+"Returns the time elapsed (in seconds) since the last physics callback. This "
+"value is identical to [method _physics_process]'s [code]delta[/code] "
+"parameter, and is often consistent at run-time, unless [member Engine."
+"physics_ticks_per_second] is changed. See also [constant "
+"NOTIFICATION_PHYSICS_PROCESS].\n"
+"[b]Note:[/b] The returned value will be larger than expected if running at a "
+"framerate lower than [member Engine.physics_ticks_per_second] / [member "
+"Engine.max_physics_steps_per_frame] FPS. This is done to avoid \"spiral of "
+"death\" scenarios where performance would plummet due to an ever-increasing "
+"number of physics steps per frame. This behavior affects both [method "
+"_process] and [method _physics_process]. As a result, avoid using "
+"[code]delta[/code] for time measurements in real-world seconds. Use the "
+"[Time] singleton's methods for this purpose instead, such as [method Time."
+"get_ticks_usec]."
+msgstr ""
+"返回自上次物理回调以来经过的时间（单位为秒）。这个值与 [method "
+"_physics_process] 的 [code]delta[/code] 参数相同，运行时通常是一致的，除非 "
+"[member Engine.physics_ticks_per_second] 发生了变化。另见 [constant "
+"NOTIFICATION_PHYSICS_PROCESS]。\n"
+"[b]注意：[/b]如果运行的帧率低于 [member Engine.physics_ticks_per_second] / "
+"[member Engine.max_physics_steps_per_frame] FPS，则返回的值将会比预期的要大。"
+"这是为了避免发生“死亡螺旋”的情况，此时每帧的物理步骤数量会不断增加，导致性能急"
+"剧下降。这种行为会影响 [method _process] 和 [method _physics_process]。因此，"
+"请避免根据 [code]delta[/code] 来测量真实世界的秒数。请使用 [Time] 单例的方法来"
+"实现此目的，例如 [method Time.get_ticks_usec]。"
+
+msgid ""
+"Returns the time elapsed (in seconds) since the last process callback. This "
+"value is identical to [method _process]'s [code]delta[/code] parameter, and "
+"may vary from frame to frame. See also [constant NOTIFICATION_PROCESS].\n"
+"[b]Note:[/b] The returned value will be larger than expected if running at a "
+"framerate lower than [member Engine.physics_ticks_per_second] / [member "
+"Engine.max_physics_steps_per_frame] FPS. This is done to avoid \"spiral of "
+"death\" scenarios where performance would plummet due to an ever-increasing "
+"number of physics steps per frame. This behavior affects both [method "
+"_process] and [method _physics_process]. As a result, avoid using "
+"[code]delta[/code] for time measurements in real-world seconds. Use the "
+"[Time] singleton's methods for this purpose instead, such as [method Time."
+"get_ticks_usec]."
+msgstr ""
+"返回自上次处理回调以来经过的时间（单位为秒）。这个值与 [method _process] 的 "
+"[code]delta[/code] 参数相同，每一帧都可能发生变化。另见 [constant "
+"NOTIFICATION_PROCESS]。\n"
+"[b]注意：[/b]如果运行的帧率低于 [member Engine.physics_ticks_per_second] / "
+"[member Engine.max_physics_steps_per_frame] FPS，则返回的值将会比预期的要大。"
+"这是为了避免发生“死亡螺旋”的情况，此时每帧的物理步骤数量会不断增加，导致性能急"
+"剧下降。这种行为会影响 [method _process] 和 [method _physics_process]。因此，"
+"请避免根据 [code]delta[/code] 来测量真实世界的秒数。请使用 [Time] 单例的方法来"
+"实现此目的，例如 [method Time.get_ticks_usec]。"
+
+msgid ""
+"Returns a [Dictionary] mapping method names to their RPC configuration "
+"defined for this node using [method rpc_config]."
+msgstr ""
+"返回一个 [Dictionary]，将方法名称映射到针对该节点使用 [method rpc_config] 为其"
+"定义的 RPC 配置。"
+
 msgid ""
 "Returns [code]true[/code] if this node is an instance load placeholder. See "
 "[InstancePlaceholder] and [method set_scene_instance_load_placeholder]."
@@ -89856,6 +91251,25 @@ msgstr ""
 "该节点的处理行为（请参阅 [enum ProcessMode]）。要检查该节点是否能够在当前模式"
 "下进行处理，请使用 [method can_process]。"
 
+msgid ""
+"Similar to [member process_priority] but for [constant "
+"NOTIFICATION_PHYSICS_PROCESS], [method _physics_process], or [constant "
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS]."
+msgstr ""
+"与 [member process_priority] 类似，但是作用于 [constant "
+"NOTIFICATION_PHYSICS_PROCESS]、[method _physics_process] 以及 [constant "
+"NOTIFICATION_INTERNAL_PHYSICS_PROCESS]。"
+
+msgid ""
+"The node's execution order of the process callbacks ([method _process], "
+"[constant NOTIFICATION_PROCESS], and [constant "
+"NOTIFICATION_INTERNAL_PROCESS]). Nodes whose priority value is [i]lower[/i] "
+"call their process callbacks first, regardless of tree order."
+msgstr ""
+"该节点的处理回调（[method _process]、[method _physics_process] 和 [constant "
+"NOTIFICATION_INTERNAL_PROCESS]）执行顺序。无论树顺序如何，优先级值[i]较低[/i]"
+"的节点将先调用其处理回调。"
+
 msgid ""
 "Set the process thread group for this node (basically, whether it receives "
 "[constant NOTIFICATION_PROCESS], [constant NOTIFICATION_PHYSICS_PROCESS], "
@@ -89973,6 +91387,11 @@ msgstr "子节点列表发生改变时发出。发生在添加、移动、移除
 msgid "Emitted when the node's editor description field changed."
 msgstr "当节点的编辑器描述字段更改时发出。"
 
+msgid ""
+"Emitted when an attribute of the node that is relevant to the editor is "
+"changed. Only emitted in the editor."
+msgstr "该节点与编辑器相关的属性发生更改时发出。仅在编辑器中发出。"
+
 msgid ""
 "Emitted when the node is considered ready, after [method _ready] is called."
 msgstr "在 [method _ready] 被调用后，当节点被视为就绪时发出。"
@@ -90281,6 +91700,9 @@ msgstr ""
 "[Control] 和 [Window] 遮挡的区域，并且需要 [member Viewport."
 "gui_disable_input] 为 [code]false[/code]，与当前是否持有焦点无关。"
 
+msgid "Notification received when the window is moved."
+msgstr "窗口移动时收到的通知。"
+
 msgid ""
 "Notification received from the OS when the application is exceeding its "
 "allocated memory.\n"
@@ -90767,7 +92189,7 @@ msgstr ""
 "在帧中而不是在物理周期中找到激光发射的位置。\n"
 "[b]注意：[/b]第一次对 [Node2D] 调用该函数时会产生插值跳跃，重置物理插值后也会"
 "产生这样的现象。如果在最初跟随 [Node3D] 时遇到“拖影”问题，请确保在重置 "
-"[Node3D] 的物理插值之前至少调用一次 [method "
+"[Node3D] 的物理插值[i]之前[/i]至少调用一次 [method "
 "get_global_transform_interpolated]。"
 
 msgid ""
@@ -92318,6 +93740,98 @@ msgstr ""
 "只能直接创建。使用任何其他方式（例如 [method PackedScene.instantiate] 或 "
 "[method Node.duplicate]）创建时，该脚本的初始化都将失败。"
 
+msgid ""
+"Returns the current iterable value. [param iter] stores the iteration state, "
+"but unlike [method _iter_init] and [method _iter_next] the state is supposed "
+"to be read-only, so there is no [Array] wrapper."
+msgstr ""
+"返回当前的可迭代值。[param iter] 存储迭代状态，但与 [method _iter_init] 和 "
+"[method _iter_next] 不同，此处的状态只读，因此不使用 [Array] 封装。"
+
+msgid ""
+"Initializes the iterator. [param iter] stores the iteration state. Since "
+"GDScript does not support passing arguments by reference, a single-element "
+"array is used as a wrapper. Returns [code]true[/code] so long as the iterator "
+"has not reached the end.\n"
+"Example:\n"
+"[codeblock]\n"
+"class MyRange:\n"
+"    var _from\n"
+"    var _to\n"
+"\n"
+"    func _init(from, to):\n"
+"        assert(from <= to)\n"
+"        _from = from\n"
+"        _to = to\n"
+"\n"
+"    func _iter_init(iter):\n"
+"        iter[0] = _from\n"
+"        return iter[0] < _to\n"
+"\n"
+"    func _iter_next(iter):\n"
+"        iter[0] += 1\n"
+"        return iter[0] < _to\n"
+"\n"
+"    func _iter_get(iter):\n"
+"        return iter\n"
+"\n"
+"func _ready():\n"
+"    var my_range = MyRange.new(2, 5)\n"
+"    for x in my_range:\n"
+"        print(x) # Prints 2, 3, 4.\n"
+"[/codeblock]\n"
+"[b]Note:[/b] Alternatively, you can ignore [param iter] and use the object's "
+"state instead, see [url=$DOCS_URL/tutorials/scripting/gdscript/"
+"gdscript_advanced.html#custom-iterators]online docs[/url] for an example. "
+"Note that in this case you will not be able to reuse the same iterator "
+"instance in nested loops. Also, make sure you reset the iterator state in "
+"this method if you want to reuse the same instance multiple times."
+msgstr ""
+"初始化迭代器。[param iter] 存储迭代状态。由于 GDScript 不支持按引用传递参数，"
+"这里使用单元素数组作为包装器。只要迭代器尚未到达末尾就会返回 [code]true[/"
+"code]。\n"
+"实例：\n"
+"[codeblock]\n"
+"class MyRange:\n"
+"    var _from\n"
+"    var _to\n"
+"\n"
+"    func _init(from, to):\n"
+"        assert(from <= to)\n"
+"        _from = from\n"
+"        _to = to\n"
+"\n"
+"    func _iter_init(iter):\n"
+"        iter[0] = _from\n"
+"        return iter[0] < _to\n"
+"\n"
+"    func _iter_next(iter):\n"
+"        iter[0] += 1\n"
+"        return iter[0] < _to\n"
+"\n"
+"    func _iter_get(iter):\n"
+"        return iter\n"
+"\n"
+"func _ready():\n"
+"    var my_range = MyRange.new(2, 5)\n"
+"    for x in my_range:\n"
+"        print(x) # 输出 2, 3, 4.\n"
+"[/codeblock]\n"
+"[b]注意：[/b]你也可以忽略 [param iter]，直接使用对象的状态，示例见"
+"[url=$DOCS_URL/tutorials/scripting/gdscript/gdscript_advanced.html#custom-"
+"iterators]在线文档[/url]。请注意，这种情况下无法在嵌套循环中重用相同的迭代器实"
+"例。此外，如果想要多次重用相同的实例，请确保在该方法中重置迭代器状态。"
+
+msgid ""
+"Moves the iterator to the next iteration. [param iter] stores the iteration "
+"state. Since GDScript does not support passing arguments by reference, a "
+"single-element array is used as a wrapper. Returns [code]true[/code] so long "
+"as the iterator has not reached the end."
+msgstr ""
+"将迭代器移动到下一次迭代。[param iter] 存储迭代状态。由于 GDScript 不支持按引"
+"用传递参数，这里使用单元素数组作为包装器。只要迭代器尚未到达末尾就会返回 "
+"[code]true[/code]。"
+
 msgid ""
 "Called when the object receives a notification, which can be identified in "
 "[param what] by comparing it with a constant. See also [method "
@@ -92502,6 +94016,28 @@ msgstr ""
 "[/csharp]\n"
 "[/codeblocks]"
 
+msgid ""
+"Override this method to customize the return value of [method to_string], and "
+"therefore the object's representation as a [String].\n"
+"[codeblock]\n"
+"func _to_string():\n"
+"    return \"Welcome to Godot 4!\"\n"
+"\n"
+"func _init():\n"
+"    print(self)       # Prints \"Welcome to Godot 4!\"\n"
+"    var a = str(self) # a is \"Welcome to Godot 4!\"\n"
+"[/codeblock]"
+msgstr ""
+"覆盖该方法以自定义 [method to_string] 的返回值，将对象表示为 [String]。\n"
+"[codeblock]\n"
+"func _to_string():\n"
+"    return \"欢迎来到 Godot 4！\"\n"
+"\n"
+"func _init():\n"
+"    print(self)       # 输出“欢迎来到 Godot 4！”\n"
+"    var a = str(self) # a 是“欢迎来到 Godot 4！”\n"
+"[/codeblock]"
+
 msgid ""
 "Override this method to customize existing properties. Every property info "
 "goes through this method, except properties added with [method "
@@ -94580,12 +96116,34 @@ msgid ""
 "action RID."
 msgstr "返回与给定动作 RID 对应的 [code]XrAction[/code] OpenXR 句柄。"
 
+msgid ""
+"Begins a new debug label region, this label will be reported in debug "
+"messages for any calls following this until [method end_debug_label_region] "
+"is called. Debug labels can be stacked."
+msgstr ""
+"开启新的调试标签区域，此后的调用所产生的调试信息中会汇报该标签，直到调用 "
+"[method end_debug_label_region]。可以堆叠调试标签。"
+
 msgid ""
 "Returns [code]true[/code] if OpenXR is initialized for rendering with an XR "
 "viewport."
 msgstr ""
 "如果 OpenXR 已为使用 XR 视口进行渲染而初始化，则返回 [code]true[/code]。"
 
+msgid ""
+"Marks the end of a debug label region. Removes the latest debug label region "
+"added by calling [method begin_debug_label_region]."
+msgstr ""
+"标记调试标签区域的末尾。移除最新的通过调用 [method begin_debug_label_region] "
+"添加的调试标签区域。"
+
+msgid ""
+"Returns the [RID] corresponding to an [code]Action[/code] of a matching name, "
+"optionally limited to a specified action set."
+msgstr ""
+"返回与名称匹配的[code]动作[/code]所对应的 [RID]，还可以将匹配范围限制在指定的"
+"动作集中。"
+
 msgid ""
 "Returns an error string for the given [url=https://registry.khronos.org/"
 "OpenXR/specs/1.0/man/html/XrResult.html]XrResult[/url]."
@@ -94632,6 +96190,14 @@ msgstr ""
 msgid "Returns the predicted display timing for the current frame."
 msgstr "返回当前帧的预测显示时间。"
 
+msgid ""
+"Returns a pointer to the render state's [code]XrCompositionLayerProjection[/"
+"code] struct.\n"
+"[b]Note:[/b] This method should only be called from the rendering thread."
+msgstr ""
+"返回指向渲染状态中 [code]XrCompositionLayerProjection[/code] 结构体的指针。\n"
+"[b]注意：[/b]该方法只应从渲染线程调用。"
+
 msgid ""
 "Returns the far boundary value of the camera frustum.\n"
 "[b]Note:[/b] This is only accessible in the render thread."
@@ -94666,6 +96232,16 @@ msgstr ""
 "返回系统的 id，它是一个被转换为整数的 [url=https://registry.khronos.org/"
 "OpenXR/specs/1.0/man/html/XrSystemId.html]XrSystemId[/url]。"
 
+msgid ""
+"Inserts a debug label, this label is reported in any debug message resulting "
+"from the OpenXR calls that follows, until any of [method "
+"begin_debug_label_region], [method end_debug_label_region], or [method "
+"insert_debug_label] is called."
+msgstr ""
+"插入调试标签，此后的 OpenXR 调用所产生的调试信息中会汇报该标签，直到调用 "
+"[method begin_debug_label_region]、[method end_debug_label_region] 或 [method "
+"insert_debug_label]。"
+
 msgid ""
 "Returns [enum OpenXRAPIExtension.OpenXRAlphaBlendModeSupport] denoting if "
 "[constant XRInterface.XR_ENV_BLEND_MODE_ALPHA_BLEND] is really supported, "
@@ -94711,6 +96287,11 @@ msgstr "释放给定交换链的图像。"
 msgid "Registers the given extension as a composition layer provider."
 msgstr "将给定扩展注册为组合层提供器。"
 
+msgid ""
+"Registers the given extension as a provider of additional data structures to "
+"projections views."
+msgstr "将给定的扩展注册为投影视图的附加数据结构提供器。"
+
 msgid ""
 "If set to [code]true[/code], an OpenXR extension is loaded which is capable "
 "of emulating the [constant XRInterface.XR_ENV_BLEND_MODE_ALPHA_BLEND] blend "
@@ -94719,11 +96300,29 @@ msgstr ""
 "如果设置为 [code]true[/code]，则会加载 OpenXR 扩展，该扩展能够模拟 [constant "
 "XRInterface.XR_ENV_BLEND_MODE_ALPHA_BLEND] 混合模式。"
 
+msgid ""
+"Set the object name of an OpenXR object, used for debug output. [param "
+"object_type] must be a valid OpenXR [code]XrObjectType[/code] enum and [param "
+"object_handle] must be a valid OpenXR object handle."
+msgstr ""
+"设置 OpenXR 对象的对象名称，用于调试输出。[param object_type] 必须是有效的 "
+"OpenXR [code]XrObjectType[/code] 枚举，[param object_handle] 必须是有效的 "
+"OpenXR 对象句柄。"
+
 msgid ""
 "Sets the render region to [param render_region], overriding the normal render "
 "target's rect."
 msgstr "将渲染区域设置为 [param render_region]，覆盖常规渲染目标的矩形区域。"
 
+msgid "Sets the render target of the velocity depth texture."
+msgstr "设置速度深度纹理的渲染目标。"
+
+msgid "Sets the target size of the velocity and velocity depth textures."
+msgstr "设置速度纹理和速度深度纹理的目标大小。"
+
+msgid "Sets the render target of the velocity texture."
+msgstr "设置速度纹理的渲染目标。"
+
 msgid ""
 "Creates a [Transform3D] from an [url=https://registry.khronos.org/OpenXR/"
 "specs/1.0/man/html/XrPosef.html]XrPosef[/url]."
@@ -94732,7 +96331,12 @@ msgstr ""
 "html]XrPosef[/url] 创建一个 [Transform3D] 。"
 
 msgid "Unregisters the given extension as a composition layer provider."
-msgstr "取消将给定扩展注册为组合层提供器。"
+msgstr "将给定的扩展取消注册为合成层提供器。"
+
+msgid ""
+"Unregisters the given extension as a provider of additional data structures "
+"to projections views."
+msgstr "将给定的扩展取消注册为投影视图的附加数据结构提供器。"
 
 msgid ""
 "Returns [code]true[/code] if the provided [url=https://registry.khronos.org/"
@@ -94776,6 +96380,16 @@ msgid ""
 "binding modifier editor."
 msgstr "返回该类的描述，会显示在绑定修改器编辑器的标题栏。"
 
+msgid ""
+"Returns the data that is sent to OpenXR when submitting the suggested "
+"interacting bindings this modifier is a part of.\n"
+"[b]Note:[/b] This must be data compatible with a "
+"[code]XrBindingModificationBaseHeaderKHR[/code] structure."
+msgstr ""
+"返回在提交该修改器所涉及的交互绑定时发送给 OpenXR 的数据。\n"
+"[b]注意：[/b]这必须是与 [code]XrBindingModificationBaseHeaderKHR[/code] 结构兼"
+"容的数据。"
+
 msgid "Binding modifier editor."
 msgstr "绑定修改器编辑器。"
 
@@ -94792,6 +96406,11 @@ msgid ""
 msgstr ""
 "针对给定的 [param action_map] 和 [param binding_modifier] 设置该编辑器。"
 
+msgid ""
+"Signal emitted when the user presses the delete binding modifier button for "
+"this modifier."
+msgstr "当用户按下该修改器的删除绑定修改器按钮时发出的信号。"
+
 msgid "The parent class of all OpenXR composition layer nodes."
 msgstr "所有 OpenXR 合成层节点的父类。"
 
@@ -94882,6 +96501,20 @@ msgstr ""
 "合成层的排序顺序。数字较大的层显示在数字较小的层之前。\n"
 "[b]注意：[/b]使用回退网格时无效。"
 
+msgid ""
+"If enabled, an Android surface will be created (with the dimensions from "
+"[member android_surface_size]) which will provide the 2D content for the "
+"composition layer, rather than using [member layer_viewport].\n"
+"See [method get_android_surface] for information about how to get the surface "
+"so that your application can draw to it.\n"
+"[b]Note:[/b] This will only work in Android builds."
+msgstr ""
+"如果启用，则会创建 Android 表面（大小为 [member android_surface_size]），为合"
+"成层提供 2D 内容，不使用 [member layer_viewport]。\n"
+"如何获取该表面以便应用程序在表面上进行绘制，见 [method "
+"get_android_surface]。\n"
+"[b]注意：[/b]仅在 Android 构建上有效。"
+
 msgid ""
 "An OpenXR composition layer that is rendered as an internal slice of a "
 "cylinder."
@@ -94942,6 +96575,57 @@ msgstr "四边形的尺寸。"
 msgid "The DPad binding modifier converts an axis input to a dpad output."
 msgstr "十字键绑定修改器会将轴输入转换为十字键输出。"
 
+msgid ""
+"The DPad binding modifier converts an axis input to a dpad output, emulating "
+"a DPad. New input paths for each dpad direction will be added to the "
+"interaction profile. When bound to actions the DPad emulation will be "
+"activated. You should [b]not[/b] combine dpad inputs with normal inputs in "
+"the same action set for the same control, this will result in an error being "
+"returned when suggested bindings are submitted to OpenXR.\n"
+"See [url=https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec."
+"html#XR_EXT_dpad_binding]XR_EXT_dpad_binding[/url] for in-depth details.\n"
+"[b]Note:[/b] If the DPad binding modifier extension is enabled, all dpad "
+"binding paths will be available in the action map. Adding the modifier to an "
+"interaction profile allows you to further customize the behavior."
+msgstr ""
+"十字键绑定修改器会将轴输入转换为十字键输出，模拟十字键。交互配置中会添加十字键"
+"每个方向对应的输入路径，与动作绑定后就会激活十字键模拟。[b]不应该[/b]在同一个"
+"控件的同一动作集中将十字键输入与普通输入结合使用，这会导致在绑定提交给 OpenXR "
+"时返回错误。\n"
+"详情见 [url=https://registry.khronos.org/OpenXR/specs/1.1/html/xrspec."
+"html#XR_EXT_dpad_binding]XR_EXT_dpad_binding[/url]。\n"
+"[b]注意：[/b]如果启用了十字键绑定修改器扩展，所有十字键绑定路径都将在动作映射"
+"中可用。将修改器添加到交互配置可以进一步自定义行为。"
+
+msgid "Action set for which this dpad binding modifier is active."
+msgstr "十字键绑定修改器激活的动作集。"
+
+msgid ""
+"Center region in which our center position of our dpad return [code]true[/"
+"code]."
+msgstr "中心区域，十字键的中央位置在该区域中返回 [code]true[/code]。"
+
+msgid "Input path for this dpad binding modifier."
+msgstr "十字键绑定修改器的输入路径。"
+
+msgid ""
+"If [code]false[/code], when the joystick enters a new dpad zone this becomes "
+"true.\n"
+"If [code]true[/code], when the joystick remains in active dpad zone, this "
+"remains true even if we overlap with another zone."
+msgstr ""
+"如果为 [code]false[/code]，则摇杆进入新的十字键区域时变为 true。\n"
+"如果为 [code]true[/code]，则摇杆保留在活动的十字键区域中时，即使与另一个区域重"
+"叠也仍然为 true。"
+
+msgid ""
+"When our input value is equal or larger than this value, our dpad in that "
+"direction becomes true. It stays true until it falls under the [member "
+"threshold_released] value."
+msgstr ""
+"输入值等于或大于该值时，十字键在该方向上变为 true。它会保持为 true，直到输入值"
+"低于 [member threshold_released]。"
+
 msgid ""
 "The angle of each wedge that identifies the 4 directions of the emulated dpad."
 msgstr "每个楔形的角度，用于标识模拟十字键的四个方向。"
@@ -95049,6 +96733,17 @@ msgstr "在 OpenXR 实例被销毁之前调用。"
 msgid "Called right after the main swapchains are (re)created."
 msgstr "在主交换链（重新）创建后立即调用。"
 
+msgid ""
+"Called right after the given viewport is rendered.\n"
+"[b]Note:[/b] The draw commands might only be queued at this point, not "
+"executed."
+msgstr ""
+"给定视口渲染后立即调用。\n"
+"[b]注意：[/b]此时绘制命令可能还在队列中，尚未执行。"
+
+msgid "Called right before the given viewport is rendered."
+msgstr "给定视口渲染前立即调用。"
+
 msgid "Called right before the XR viewports begin their rendering step."
 msgstr "在 XR 视口开始其渲染步进之前调用。"
 
@@ -95140,6 +96835,11 @@ msgstr "当每个手部跟踪器被创建时添加额外的数据结构。"
 msgid "Adds additional data structures when the OpenXR instance is created."
 msgstr "创建 OpenXR 实例时添加额外的数据结构。"
 
+msgid ""
+"Adds additional data structures to the projection view of the given [param "
+"view_index]."
+msgstr "为 [param view_index] 视图的投影视图添加的额外数据结构。"
+
 msgid "Adds additional data structures when the OpenXR session is created."
 msgstr "创建 OpenXR 会话时添加额外的数据结构。"
 
@@ -95847,9 +97547,27 @@ msgstr "如果设置，则角速度数据是有效的；否则，角速度数据
 msgid "Defines a binding between an [OpenXRAction] and an XR input or output."
 msgstr "定义 [OpenXRAction] 和 XR 输入或输出之间的绑定。"
 
+msgid ""
+"This binding resource binds an [OpenXRAction] to an input or output. As most "
+"controllers have left hand and right versions that are handled by the same "
+"interaction profile we can specify multiple bindings. For instance an action "
+"\"Fire\" could be bound to both \"/user/hand/left/input/trigger\" and \"/user/"
+"hand/right/input/trigger\". This would require two binding entries."
+msgstr ""
+"该绑定资源将一个 [OpenXRAction] 绑定到输入或输出。由于大多数控制器都有由相同交"
+"互配置处理的左手和右手版本，我们可以指定多个绑定。例如，“开火”动作可以同时绑定"
+"到“/user/hand/left/input/trigger”和“/user/hand/right/input/trigger”，需要两个"
+"绑定条目。"
+
+msgid "Binding is for a single path."
+msgstr "绑定针对单一路径。"
+
 msgid "Add an input/output path to this binding."
 msgstr "为该绑定添加输入/输出路径。"
 
+msgid "Get the number of binding modifiers for this binding."
+msgstr "获取该绑定中绑定修改器的数量。"
+
 msgid "Get the number of input/output paths in this binding."
 msgstr "获取该绑定中输入/输出路径的数量。"
 
@@ -95866,6 +97584,15 @@ msgstr "与绑定路径 [member binding_path] 绑定的 [OpenXRAction]。"
 msgid "Binding modifiers for this binding."
 msgstr "该绑定的绑定修改器。"
 
+msgid ""
+"Binding path that defines the input or output bound to [member action].\n"
+"[b]Note:[/b] Binding paths are suggestions, an XR runtime may choose to bind "
+"the action to a different input or output emulating this input or output."
+msgstr ""
+"绑定路径，定义与 [member action] 绑定的输入或输出。\n"
+"[b]注意：[/b]绑定路径只是建议，XR 运行时可能会选择将该动作绑定到模拟该输入或输"
+"出的不同输入或输出。"
+
 msgid "Use [member binding_path] instead."
 msgstr "请改用 [member binding_path]。"
 
@@ -95875,6 +97602,19 @@ msgstr "定义该设备上绑定的输入或输出的路径。"
 msgid "Binding modifier that applies directly on an interaction profile."
 msgstr "直接应用于某个交互配置的绑定修改器。"
 
+msgid "Draws a stereo correct visibility mask."
+msgstr "绘制立体校正可见遮罩。"
+
+msgid ""
+"The visibility mask allows us to black out the part of the render result that "
+"is invisible due to lens distortion.\n"
+"As this is rendered first, it prevents fragments with expensive lighting "
+"calculations to be processed as they are discarded through z-checking."
+msgstr ""
+"可见遮罩能够让我们遮蔽渲染结果中由于镜头畸变而不可见的部分。\n"
+"由于可见遮罩是第一个渲染的，因此可以避免处理光照计算昂贵的片段，因为这些片段会"
+"通过 Z 检查丢弃。"
+
 msgid "An optimized translation, used by default for CSV Translations."
 msgstr "经过优化的翻译，由 CSV 翻译默认使用。"
 
@@ -97504,6 +99244,39 @@ msgstr ""
 "调用 [method open_midi_inputs] 时进行。用户接受权限请求后浏览器才会处理 MIDI "
 "输入。"
 
+msgid ""
+"Reads a user input as raw data from the standard input. This operation can be "
+"[i]blocking[/i], which causes the window to freeze if [method "
+"read_string_from_stdin] is called on the main thread.\n"
+"- If standard input is console, this method will block until the program "
+"receives a line break in standard input (usually by the user pressing "
+"[kbd]Enter[/kbd]).\n"
+"- If standard input is pipe, this method will block until a specific amount "
+"of data is read or pipe is closed.\n"
+"- If standard input is a file, this method will read a specific amount of "
+"data (or less if end-of-file is reached) and return immediately.\n"
+"[b]Note:[/b] This method is implemented on Linux, macOS, and Windows.\n"
+"[b]Note:[/b] On exported Windows builds, run the console wrapper executable "
+"to access the terminal. If standard input is console, calling this method "
+"without console wrapped will freeze permanently. If standard input is pipe or "
+"file, it can be used without console wrapper. If you need a single executable "
+"with full console support, use a custom build compiled with the "
+"[code]windows_subsystem=console[/code] flag."
+msgstr ""
+"从标准输入读取用户输入的原始数据字符串。这个操作是[i]阻塞的[/i] ，如果在主线程"
+"上调用 [method read_string_from_stdin] 就会导致窗口冻结。\n"
+"- 如果标准输入为控制台，则该方法会阻塞到程序在标准输入中接收到换行（通常是用户"
+"按下了 [kbd]Enter[/kbd]）。\n"
+"- 如果标准输入为管道，则该方法会阻塞到读取指定数量的数据或管道关闭。\n"
+"- 如果标准输入为文件，则该方法会读取指定数量的数据（到达文件末尾时则不足指定数"
+"量）并立即返回。\n"
+"[b]注意：[/b]该方法在 Linux、macOS 和 Windows 上实现。\n"
+"[b]注意：[/b]在导出的 Windows 版本中，运行控制台包装器可执行文件来访问终端。如"
+"果标准输入为控制台，那么不通过控制台包装器运行就会导致卡死。如果标准输入为管道"
+"或文件，那么就可以不借助控制台包装器直接使用。如果你需要具有控制台支持的单个可"
+"执行文件，请使用启用 [code]windows_subsystem=console[/code] 标志编译的自定义构"
+"建。"
+
 msgid ""
 "Reads a user input as a UTF-8 encoded string from the standard input. This "
 "operation can be [i]blocking[/i], which causes the window to freeze if "
@@ -98019,7 +99792,7 @@ msgid ""
 "Requires at least 4 bytes of data starting at the offset, otherwise fails."
 msgstr ""
 "将字节序列解码为 [Variant] 的大小，起始位置字节偏移量为 [param byte_offset]。"
-"要求起始位置后至少有 4 个字节的数据，否则返回 [code]null[/code]。"
+"要求起始位置后至少有 4 个字节的数据，否则会失败。"
 
 msgid ""
 "Returns a new [PackedByteArray] with the data decompressed. Set [param "
@@ -100739,6 +102512,23 @@ msgid ""
 msgstr ""
 "如果为 [code]true[/code]，则启用指定的粒子标志。选项见 [enum ParticleFlags]。"
 
+msgid ""
+"The alpha value of each particle's color will be multiplied by this "
+"[CurveTexture] over its lifetime.\n"
+"[b]Note:[/b] [member alpha_curve] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"alpha_curve] will have no visible effect."
+msgstr ""
+"每个粒子的颜色的 Alpha 值将在其生命周期内与 [CurveTexture] 相乘。\n"
+"[b]注意：[/b][member alpha_curve] 乘以粒子网格的顶点颜色。要在 "
+"[BaseMaterial3D] 上产生可见效果，[member BaseMaterial3D."
+"vertex_color_use_as_albedo] [i]必须[/i]为 [code]true[/code]。对于 "
+"[ShaderMaterial]，必须在着色器的 [code]fragment()[/code] 函数中插入 "
+"[code]ALBEDO *= COLOR.rgb;[/code]。否则 [member alpha_curve] 将没有可见效果。"
+
 msgid "Each particle's rotation will be animated along this [CurveTexture]."
 msgstr "每个粒子的旋转将沿着这个 [CurveTexture] 动画。"
 
@@ -100949,6 +102739,24 @@ msgstr ""
 "[code]ALBEDO *= COLOR.rgb;[/code]。否则，[member emission_color_texture] 将没"
 "有可见效果。"
 
+msgid ""
+"Each particle's color will be multiplied by this [CurveTexture] over its "
+"lifetime.\n"
+"[b]Note:[/b] [member emission_curve] multiplies the particle mesh's vertex "
+"colors. To have a visible effect on a [BaseMaterial3D], [member "
+"BaseMaterial3D.vertex_color_use_as_albedo] [i]must[/i] be [code]true[/code]. "
+"For a [ShaderMaterial], [code]ALBEDO *= COLOR.rgb;[/code] must be inserted in "
+"the shader's [code]fragment()[/code] function. Otherwise, [member "
+"emission_curve] will have no visible effect."
+msgstr ""
+"每个粒子的颜色将在其生命周期内与 [CurveTexture] 相乘。\n"
+"[b]注意：[/b][member emission_curve] 乘以粒子网格的顶点颜色。要在 "
+"[BaseMaterial3D] 上产生可见效果，[member BaseMaterial3D."
+"vertex_color_use_as_albedo] [i]必须[/i]为 [code]true[/code]。对于 "
+"[ShaderMaterial]，必须在着色器的 [code]fragment()[/code] 函数中插入 "
+"[code]ALBEDO *= COLOR.rgb;[/code]。否则，[member emission_curve] 将没有可见效"
+"果。"
+
 msgid ""
 "Particle velocity and rotation will be set by sampling this texture at the "
 "same point as the [member emission_point_texture]. Used only in [constant "
@@ -101155,6 +102963,20 @@ msgstr ""
 "GPUParticles2D.amount] 或 [member GPUParticles3D.amount]，相对于子发射器的粒子"
 "寿命。如果超过粒子数量，则在足够的粒子过期之前，不会从子发射器中产生新的粒子。"
 
+msgid ""
+"The amount of particles to spawn from the subemitter node when the particle "
+"spawns.\n"
+"[b]Note:[/b] This value shouldn't exceed [member GPUParticles2D.amount] or "
+"[member GPUParticles3D.amount] defined on the [i]subemitter node[/i] (not the "
+"main node), relative to the subemitter's particle lifetime. If the number of "
+"particles is exceeded, no new particles will spawn from the subemitter until "
+"enough particles have expired."
+msgstr ""
+"粒子出生时从子发射器节点生成的粒子数量。\n"
+"[b]注意：[/b]该值不应超过[i]子发射器节点[/i]（不是主节点）上定义的 [member "
+"GPUParticles2D.amount] 或 [member GPUParticles3D.amount]，相对于子发射器的粒子"
+"寿命。如果超过粒子数量，则在足够的粒子过期之前，不会从子发射器中产生新的粒子。"
+
 msgid ""
 "The frequency at which particles should be emitted from the subemitter node. "
 "One particle will be spawned every [member sub_emitter_frequency] seconds.\n"
@@ -102329,6 +104151,34 @@ msgstr ""
 "标准力积分之前调用，但 [member custom_integrator] 属性允许你禁用标准力积分并对"
 "物体进行完全自定义的力积分。"
 
+msgid ""
+"Applies a directional impulse without affecting rotation.\n"
+"An impulse is time-independent! Applying an impulse every frame would result "
+"in a framerate-dependent force. For this reason, it should only be used when "
+"simulating one-time impacts (use the \"_integrate_forces\" functions "
+"otherwise).\n"
+"This is equivalent to using [method apply_impulse] at the body's center of "
+"mass."
+msgstr ""
+"施加不影响旋转的定向冲量。\n"
+"冲量与时间无关！每帧都应用冲量会产生依赖于帧率的力。因此只应该用于模拟一次性冲"
+"击（否则请使用“_integrate_forces”函数）。\n"
+"等价于在物体的质心处使用 [method apply_impulse]。"
+
+msgid ""
+"Applies a positioned impulse to the PhysicsBone3D.\n"
+"An impulse is time-independent! Applying an impulse every frame would result "
+"in a framerate-dependent force. For this reason, it should only be used when "
+"simulating one-time impacts (use the \"_integrate_forces\" functions "
+"otherwise).\n"
+"[param position] is the offset from the PhysicsBone3D origin in global "
+"coordinates."
+msgstr ""
+"施加不影响旋转的定位冲量。\n"
+"冲量与时间无关！每帧都应用冲量会产生依赖于帧率的力。因此只应该用于模拟一次性冲"
+"击（否则请使用“_integrate_forces”函数）。\n"
+"等价于在物体的质心处使用 [method apply_impulse]。"
+
 msgid "Returns the unique identifier of the PhysicsBone3D."
 msgstr "返回 PhysicsBone3D 的唯一标识符。"
 
@@ -111013,6 +112863,34 @@ msgstr ""
 "最开始激活平滑前可能会需要有若干秒的稳定帧率。只会在性能足以让渲染帧与刷新率匹"
 "配的机器上激活。"
 
+msgid ""
+"If [code]true[/code], disables printing to standard error. If [code]true[/"
+"code], this also hides error and warning messages printed by [method "
+"@GlobalScope.push_error] and [method @GlobalScope.push_warning]. See also "
+"[member application/run/disable_stdout].\n"
+"Changes to this setting will only be applied upon restarting the application. "
+"To control this at runtime, use [member Engine.print_error_messages]."
+msgstr ""
+"如果为 [code]true[/code]，则禁用输出到标准错误。如果为 [code]true[/code]，也会"
+"隐藏由 [method @GlobalScope.push_error] 和 [method @GlobalScope.push_warning] "
+"输出的错误和警告消息。另见 [member application/run/disable_stdout]。\n"
+"对该设置项的更改将只在重新启动应用程序后生效。要在运行时控制请使用 [member "
+"Engine.print_error_messages]。"
+
+msgid ""
+"If [code]true[/code], disables printing to standard output. This is "
+"equivalent to starting the editor or project with the [code]--quiet[/code] "
+"[url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]command line "
+"argument[/url]. See also [member application/run/disable_stderr].\n"
+"Changes to this setting will only be applied upon restarting the application. "
+"To control this at runtime, use [member Engine.print_to_stdout]."
+msgstr ""
+"如果为 [code]true[/code]，则禁用输出到标准输出。相当于使用 [code]--quiet[/"
+"code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]命令行参数[/"
+"url]启动编辑器或项目。另见 [member application/run/disable_stderr]。\n"
+"对该设置项的更改将只在重新启动应用程序后生效。要在运行时控制请使用 [member "
+"Engine.print_to_stdout]。"
+
 msgid ""
 "If [code]true[/code], allows the [kbd]Alt + Space[/kbd] keys to display the "
 "window menu. This menu allows the user to perform various window management "
@@ -111211,6 +113089,21 @@ msgstr ""
 "那么音频捕获只会返回静音。自 Windows 10 起，请确保在操作系统的隐私设置中允许应"
 "用对麦克风的访问。"
 
+msgid ""
+"Target mixing rate used for audio (in Hz). In general, it's better to not "
+"touch this and leave it to the host operating system.\n"
+"[b]Note:[/b] On iOS and macOS, mixing rate is determined by audio driver, "
+"this value is ignored.\n"
+"[b]Note:[/b] Input and output mixing rates might be different. Use [method "
+"AudioServer.get_mix_rate] and [method AudioServer.get_input_mix_rate] to get "
+"actual values."
+msgstr ""
+"音频使用的目标混音率（单位为赫兹）。一般来说最好不要修改这个设置，将其留给宿主"
+"操作系统处理。\n"
+"[b]注意：[/b]在 iOS 和 macOS 上，混音率由音频驱动决定，会忽略该值。\n"
+"[b]注意：[/b]输入混音率和输出混音率可能不同。请使用 [method AudioServer."
+"get_mix_rate] 和 [method AudioServer.get_input_mix_rate] 获取实际的值。"
+
 msgid ""
 "Safer override for [member audio/driver/mix_rate] in the Web platform. Here "
 "[code]0[/code] means \"let the browser choose\" (since some browsers do not "
@@ -111457,6 +113350,22 @@ msgstr ""
 "如果使用 [code]--log-file <file>[/code] [url=$DOCS_URL/tutorials/editor/"
 "command_line_tutorial.html]命令行参数[/url] ，则始终禁用日志轮转。"
 
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when an [code]assert[/code] call always evaluates to "
+"[code]false[/code]."
+msgstr ""
+"设为 [code]warn[/code] 或 [code]error[/code] 时，会在 [code]assert[/code] 调用"
+"永远求值为 [code]false[/code] 时对应产生警告或错误。"
+
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when an [code]assert[/code] call always evaluates to "
+"[code]true[/code]."
+msgstr ""
+"设为 [code]warn[/code] 或 [code]error[/code] 时，会在 [code]assert[/code] 调用"
+"永远求值为 [code]true[/code] 时对应产生警告或错误。"
+
 msgid ""
 "When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
 "error respectively when a local variable captured by a lambda is reassigned, "
@@ -111623,6 +113532,14 @@ msgstr ""
 "设置为 [code]warn[/code] 或 [code]error[/code] 时，当一个整数除以另一个整数时"
 "（小数部分将被丢弃），会分别产生一个警告或一个错误。"
 
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when the base class script has the [code]@tool[/code] "
+"annotation, but the current class script does not have it."
+msgstr ""
+"设为 [code]warn[/code] 或 [code]error[/code] 时，会在基类脚本带有 "
+"[code]@tool[/code] 注解，但当前类脚本没有该注解时对应产生警告或错误。"
+
 msgid ""
 "When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
 "error respectively when passing a floating-point value to a function that "
@@ -111699,6 +113616,22 @@ msgstr ""
 "类同名的局部变量或成员变量、信号或枚举，从而隐藏该内置函数或全局类时，会分别产"
 "生一个警告或一个错误。"
 
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when a local variable or local constant shadows a member "
+"declared in the current class."
+msgstr ""
+"设置为 [code]warn[/code] 或 [code]error[/code] 时，当局部变量或局部常量隐藏了"
+"当前类定义成员时，会对应产生警告或错误。"
+
+msgid ""
+"When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
+"error respectively when a local variable or local constant shadows a member "
+"declared in a base class."
+msgstr ""
+"设置为 [code]warn[/code] 或 [code]error[/code] 时，当局部变量或局部常量隐藏了"
+"基类定义成员时，会对应产生警告或错误。"
+
 msgid ""
 "When set to [code]warn[/code] or [code]error[/code], produces a warning or an "
 "error respectively when calling an expression that may have no effect on the "
@@ -111863,6 +113796,19 @@ msgstr ""
 msgid "Maximum call stack allowed for debugging GDScript."
 msgstr "调试 GDScript 时允许的最大调用堆栈。"
 
+msgid ""
+"If [code]true[/code], enables warnings which can help pinpoint where nodes "
+"are being incorrectly updated, which will result in incorrect interpolation "
+"and visual glitches.\n"
+"When a node is being interpolated, it is essential that the transform is set "
+"during [method Node._physics_process] (during a physics tick) rather than "
+"[method Node._process] (during a frame)."
+msgstr ""
+"如果为 [code]true[/code]，则会启用警告，帮助排查错误地更新节点的场合，错误的更"
+"新会导致插值问题和显示问题。\n"
+"对节点进行插值时，必须在 [method Node._physics_process]（在物理周期中）而不是 "
+"[method Node._process]（在帧中）设置变换。"
+
 msgid "Maximum number of functions per frame allowed when profiling."
 msgstr "分析时单帧允许的最大函数数量。"
 
@@ -112228,6 +114174,38 @@ msgstr ""
 "启用 Swappy，能够在 Android 上实现稳定帧率。强烈推荐。\n"
 "[b]注意：[/b]使用 OpenXR 时会强制关闭该选项。"
 
+msgid ""
+"Swappy mode to use. The options are:\n"
+"- pipeline_forced_on: Try to honor [member Engine.max_fps]. Pipelining is "
+"always on. This is the same behavior as Desktop PC.\n"
+"- auto_fps_pipeline_forced_on: Autocalculate max fps. Actual max_fps will be "
+"between 0 and [member Engine.max_fps]. While this sounds convenient, beware "
+"that Swappy will often downgrade max fps until it finds something that can be "
+"met and sustained. That means if your game runs between 40fps and 60fps on a "
+"60hz screen, after some time Swappy will downgrade max fps so that the game "
+"renders at perfect 30fps.\n"
+"- auto_fps_auto_pipeline: Same as auto_fps_pipeline_forced_on, but if Swappy "
+"detects that rendering is very fast (e.g. it takes < 8ms to render on a 60hz "
+"screen) Swappy will disable pipelining to minimize input latency. This is the "
+"default.\n"
+"[b]Note:[/b] If [member Engine.max_fps] is 0, actual max_fps will considered "
+"as to be the screen's refresh rate (often 60hz, 90hz or 120hz depending on "
+"device model and OS settings)."
+msgstr ""
+"要使用的 Swappy 模式。可选项有：\n"
+"- pipeline_forced_on：尝试遵循 [member Engine.max_fps]。管线始终启用。这是桌"
+"面 PC 的默认行为。\n"
+"- auto_fps_pipeline_forced_on：自动计算最大 FPS。实际的 max_fps 会在 0 到 "
+"[member Engine.max_fps] 之间。虽然听起来很方便，但请注意，在找到足够稳定的最大"
+"值之前 Swappy 经常会降低最大 FPS。也就是说，如果你的游戏在 60hz 屏幕上运行在 "
+"40fps 和 60fps 之间，那么在一段时间后 Swappy 就会将最大 FPS 降低，让游戏精准地"
+"使用 30fps 渲染。\n"
+"- auto_fps_auto_pipeline：与 auto_fps_pipeline_forced_on 相同，但是如果 "
+"Swappy 检测到渲染极快（例如在 60hz 屏幕上耗时 < 8ms），那么 Swappy 就会禁用管"
+"线，尽可能降低输入延迟。这是默认行为。\n"
+"[b]注意：[/b]如果 [member Engine.max_fps] 为 0，那么就会把屏幕的刷新率当作实际"
+"的 max_fps（通常是 60hz、90hz、120hz 之类的，取决于设备型号和操作系统设置）。"
+
 msgid ""
 "The default screen orientation to use on mobile devices. See [enum "
 "DisplayServer.ScreenOrientation] for possible values.\n"
@@ -113860,6 +115838,23 @@ msgstr ""
 "[b]注意：[/b]运行时切换平板驱动请使用 [method DisplayServer."
 "tablet_set_current_driver]。"
 
+msgid ""
+"Override for [member input_devices/pen_tablet/driver] on Windows. Supported "
+"values are:\n"
+"- [code]auto[/code] (default), uses [code]wintab[/code] if Windows Ink is "
+"disabled in the Wacom Tablet Properties or system settings, [code]winink[/"
+"code] otherwise.\n"
+"- [code]winink[/code], uses Windows native \"Windows Ink\" driver.\n"
+"- [code]wintab[/code], uses Wacom \"WinTab\" driver.\n"
+"- [code]dummy[/code], tablet input is disabled."
+msgstr ""
+"[member input_devices/pen_tablet/driver] 在 Windows 上的覆盖项。支持的值有：\n"
+"- [code]auto[/code]（默认），在 Wacom 平板属性或系统设置中禁用 Windows Ink 时"
+"使用 [code]wintab[/code]，否则使用 [code]winink[/code]。\n"
+"- [code]winink[/code]，使用 Windows 原生“Windows Ink”驱动。\n"
+"- [code]wintab[/code], 使用 Wacom“WinTab”驱动。\n"
+"- [code]dummy[/code]，禁用平板输入。"
+
 msgid ""
 "If [code]true[/code], long press events on an Android touchscreen are "
 "transformed into right click events."
@@ -114019,6 +116014,16 @@ msgstr ""
 "[b]注意：[/b]只有在项目启动时该属性才会被读取。要在运行时切换伪本地化，请改用 "
 "[member TranslationServer.pseudolocalization_enabled]。"
 
+msgid ""
+"Force layout direction and text writing direction to RTL for all controls, "
+"even if the current locale is intended to use a left-to-right layout and text "
+"writing direction. This should be enabled for testing purposes only. See also "
+"[member internationalization/pseudolocalization/fake_bidi]."
+msgstr ""
+"强制所有控件使用“从右至左”的排版方向和文字书写方向，即便当前区域设置应当使用从"
+"左至右的布局和文字书写方向。只应在测试时启用。另见 [member "
+"internationalization/pseudolocalization/fake_bidi]。"
+
 msgid ""
 "If [code]true[/code], root node will use [constant Node."
 "AUTO_TRANSLATE_MODE_ALWAYS], otherwise [constant Node."
@@ -114036,6 +116041,35 @@ msgstr ""
 msgid "Root node default layout direction."
 msgstr "根节点的默认布局方向。"
 
+msgid ""
+"Specifies the [TextServer] to use. If left empty, the default will be used.\n"
+"\"ICU / HarfBuzz / Graphite\" ([TextServerAdvanced]) is the most advanced "
+"text driver, supporting right-to-left typesetting and complex scripts (for "
+"languages like Arabic, Hebrew, etc.). The \"Fallback\" text driver "
+"([TextServerFallback]) does not support right-to-left typesetting and complex "
+"scripts.\n"
+"[b]Note:[/b] The driver in use can be overridden at runtime via the [code]--"
+"text-driver[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial."
+"html]command line argument[/url].\n"
+"[b]Note:[/b] There is an additional [code]Dummy[/code] text driver available, "
+"which disables all text rendering and font-related functionality. This driver "
+"is not listed in the project settings, but it can be enabled when running the "
+"editor or project using the [code]--text-driver Dummy[/code] [url=$DOCS_URL/"
+"tutorials/editor/command_line_tutorial.html]command line argument[/url]."
+msgstr ""
+"指定要使用的 [TextServer]。如果留空，则会使用默认服务器。\n"
+"“ICU / HarfBuzz / Graphite”（[TextServerAdvanced]）是最先进的文本驱动，支持从"
+"右至左的排版和复杂文字（用于阿拉伯语、希伯来语等语"
+"言）。“Fallback”（[TextServerFallback]）文本驱动不支持从右至左的排版和复杂文"
+"字。\n"
+"[b]注意：[/b]在运行时可以通过 [code]--text-driver[/code] [url=$DOCS_URL/"
+"tutorials/editor/command_line_tutorial.html]命令行参数[/url]覆盖使用的驱动程"
+"序。\n"
+"[b]注意：[/b]另外还提供了 [code]Dummy[/code] 文本驱动，它禁用了所有文本渲染和"
+"字体相关的功能。这个驱动没有在项目设置中列出，但可以在运行编辑器或项目时使用 "
+"[code]--text-driver Dummy[/code] [url=$DOCS_URL/tutorials/editor/"
+"command_line_tutorial.html]命令行参数[/url]启用。"
+
 msgid ""
 "Optional name for the 2D navigation layer 1. If left empty, the layer will "
 "display as \"Layer 1\"."
@@ -115141,6 +117175,27 @@ msgid ""
 "will be interrupted and an error message with explanation will be raised."
 msgstr "如果启用，当烘焙可能导致引擎崩溃时，会打断烘焙并发出错误消息进行解释。"
 
+msgid ""
+"Maximum number of threads that can run pathfinding queries simultaneously on "
+"the same pathfinding graph, for example the same navigation map. Additional "
+"threads increase memory consumption and synchronization time due to the need "
+"for extra data copies prepared for each thread. A value of [code]-1[/code] "
+"means unlimited and the maximum available OS processor count is used. "
+"Defaults to [code]1[/code] when the OS does not support threads."
+msgstr ""
+"在同一张寻路图上，例如同一张导航地图上，能够同时运行寻路查询的线程数量上限。线"
+"程越多，内存占用就越大，额外为每个线程准备数据副本也会导致同步时间的增加。取值"
+"为 [code]-1[/code] 表示数量不限，使用操作系统最大可用的处理器的数量。操作系统"
+"不支持线程时默认为 [code]1[/code]。"
+
+msgid ""
+"If enabled, navigation map synchronization uses an async process that runs on "
+"a background thread. This avoids stalling the main thread but adds an "
+"additional delay to any navigation map change."
+msgstr ""
+"如果启用，导航地图的同步会在后台线程上进行异步处理。这样能够防止阻塞主线程，但"
+"是导航地图的更改都会增加额外的延迟。"
+
 msgid ""
 "Maximum number of characters allowed to send as output from the debugger. "
 "Over this value, content is dropped. This helps not to stall the debugger "
@@ -115354,6 +117409,25 @@ msgstr ""
 "阻尼值都会有这种现象。要恢复此前的感觉，就需要修改阻尼值。修改多少并不成比例，"
 "需要根据实际情况调整。"
 
+msgid ""
+"Sets which physics engine to use for 2D physics.\n"
+"[b]DEFAULT[/b] is currently equivalent to [b]GodotPhysics2D[/b], but may "
+"change in future releases. Select an explicit implementation if you want to "
+"ensure that your project stays on the same engine.\n"
+"[b]GodotPhysics2D[/b] is Godot's internal 2D physics engine.\n"
+"[b]Dummy[/b] is a 2D physics server that does nothing and returns only dummy "
+"values, effectively disabling all 2D physics functionality.\n"
+"Third-party extensions and modules can add other physics engines to select "
+"with this setting."
+msgstr ""
+"设置用于 2D 物理的物理引擎。\n"
+"[b]DEFAULT[/b] 目前等价于 [b]GodotPhysics2D[/b]，但在未来的版本中可能会有所更"
+"改。如果希望确保项目始终使用相同的引擎，请选择明确的实现。\n"
+"[b]GodotPhysics2D[/b] 是 Godot 的内部 2D 物理引擎。\n"
+"[b]Dummy[/b] 是一个不执行任何操作、仅返回虚设值的 2D 物理服务器，实际上禁用了"
+"所有 2D 物理功能。\n"
+"第三方扩展和模块可以通过该设置添加其他可选择的物理引擎。"
+
 msgid ""
 "If [code]true[/code], the 2D physics server runs on a separate thread, making "
 "better use of multi-core CPUs. If [code]false[/code], the 2D physics server "
@@ -115599,6 +117673,48 @@ msgstr ""
 "阻尼值都会有这种现象。要恢复此前的感觉，就需要修改阻尼值。修改多少并不成比例，"
 "需要根据实际情况调整。"
 
+msgid ""
+"Sets which physics engine to use for 3D physics.\n"
+"[b]DEFAULT[/b] is currently equivalent to [b]GodotPhysics3D[/b], but may "
+"change in future releases. Select an explicit implementation if you want to "
+"ensure that your project stays on the same engine.\n"
+"[b]GodotPhysics3D[/b] is Godot's internal 3D physics engine.\n"
+"[b]Jolt Physics[/b] is an alternative physics engine that is generally faster "
+"and more reliable than [b]GodotPhysics3D[/b]. As it was recently implemented, "
+"it is currently considered experimental and its behavior may change in future "
+"releases.\n"
+"[b]Dummy[/b] is a 3D physics server that does nothing and returns only dummy "
+"values, effectively disabling all 3D physics functionality.\n"
+"Third-party extensions and modules can add other physics engines to select "
+"with this setting."
+msgstr ""
+"设置用于 3D 物理的物理引擎。\n"
+"[b]DEFAULT[/b] 目前等价于 [b]GodotPhysics3D[/b]，但在未来的版本中可能会有所更"
+"改。如果希望确保项目始终使用相同的引擎，请选择明确的实现。\n"
+"[b]GodotPhysics3D[/b] 是 Godot 的内部 3D 物理引擎。\n"
+"[b]Jolt Physics[/b] 是备选的物理引擎，通常比 [b]GodotPhysics3D[/b] 更快更可"
+"靠。由于是最近实现的，目前被视为实验性，其行为可能在未来的版本中发生变化。\n"
+"[b]Dummy[/b] 是一个不执行任何操作、仅返回虚设值的 3D 物理服务器，实际上禁用了"
+"所有 3D 物理功能。\n"
+"第三方扩展和模块可以通过该设置添加其他可选择的物理引擎。"
+
+msgid ""
+"If [code]true[/code], the 3D physics server runs on a separate thread, making "
+"better use of multi-core CPUs. If [code]false[/code], the 3D physics server "
+"runs on the main thread. Running the physics server on a separate thread can "
+"increase performance, but restricts API access to only physics process.\n"
+"[b]Note:[/b] When [member physics/3d/physics_engine] is set to [code]Jolt "
+"Physics[/code], enabling this setting will prevent the 3D physics server from "
+"being able to provide any context when reporting errors and warnings, and "
+"will instead always refer to nodes as [code]<unknown>[/code]."
+msgstr ""
+"如果为 [code]true[/code]，则 3D 物理服务器会在单独的线程上运行，能够更好地利用"
+"多核 CPU。如果为 [code]false[/code]，则 3D 物理服务器会在主线程上运行。在单独"
+"的线程上运行物理服务器能够提高性能，但会把对 API 的访问限制在物理处理中。\n"
+"[b]注意：[/b][member physics/3d/physics_engine] 为 [code]Jolt Physics[/code] "
+"时，启用该设置会导致 3D 物理服务器在报告错误和警告时无法提供任何上下文，而是始"
+"终将节点称为 [code]<unknown>[/code]。"
+
 msgid ""
 "Threshold angular velocity under which a 3D physics body will be considered "
 "inactive. See [constant PhysicsServer3D."
@@ -115696,6 +117812,54 @@ msgstr ""
 "[b]注意：[/b]这个属性只在项目启动时读取。要在运行时改变每帧模拟的最大物理步骤"
 "数，请改为设置 [member Engine.max_physics_steps_per_frame]。"
 
+msgid ""
+"If [code]true[/code], the renderer will interpolate the transforms of physics "
+"objects between the last two transforms, so that smooth motion is seen even "
+"when physics ticks do not coincide with rendered frames. See also [member "
+"Node.physics_interpolation_mode] and [method Node."
+"reset_physics_interpolation].\n"
+"[b]Note:[/b] If [code]true[/code], the physics jitter fix should be disabled "
+"by setting [member physics/common/physics_jitter_fix] to [code]0.0[/code].\n"
+"[b]Note:[/b] This property is only read when the project starts. To toggle "
+"physics interpolation at runtime, set [member SceneTree."
+"physics_interpolation] instead."
+msgstr ""
+"如果为 [code]true[/code]，则渲染器将在最后两个变换之间插入物理对象的变换，这样"
+"即使物理刻度与渲染帧不一致，也可以看到平滑的运动。另请参阅 [member Node."
+"physics_interpolation_mode] 和 [method Node.reset_physics_interpolation]。\n"
+"[b]注意：[/b]如果为 [code]true[/code]，则应通过将 [member physics/common/"
+"physics_jitter_fix] 设置为 [code]0.0[/code] 来禁用物理抖动修复。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时切换物理插值，请改为设置 "
+"[member SceneTree.physics_interpolation]。"
+
+msgid ""
+"Controls how much physics ticks are synchronized with real time. For 0 or "
+"less, the ticks are synchronized. Such values are recommended for network "
+"games, where clock synchronization matters. Higher values cause higher "
+"deviation of in-game clock and real clock, but allows smoothing out framerate "
+"jitters. The default value of 0.5 should be good enough for most; values "
+"above 2 could cause the game to react to dropped frames with a noticeable "
+"delay and are not recommended.\n"
+"[b]Note:[/b] Jitter fix is automatically disabled at runtime when [member "
+"physics/common/physics_interpolation] is enabled.\n"
+"[b]Note:[/b] When using a custom physics interpolation solution, the physics "
+"jitter fix should be disabled by setting [member physics/common/"
+"physics_jitter_fix] to [code]0.0[/code].\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the physics jitter fix at runtime, set [member Engine.physics_jitter_fix] "
+"instead."
+msgstr ""
+"控制物理周期与真实时间的同步程度。小于等于 0 时周期是同步的。对时钟同步有要求"
+"的网络游戏建议使用此类值。较高的值会导致游戏内时钟和真实时钟的较大偏差，但可以"
+"平滑帧率抖动。大多数情况下，默认值 0.5 应该足够好了；大于 2 的值可能导致游戏对"
+"丢帧作出明显延迟的反应，因此不推荐使用。\n"
+"[b]注意：[/b]启用 [member physics/common/physics_interpolation] 时会自动禁用抖"
+"动修复功能。\n"
+"[b]注意：[/b]使用自定义物理插值解决方案时应将 [member physics/common/"
+"physics_jitter_fix] 设置为 [code]0.0[/code]，禁用物理抖动修复。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。 要在运行时更改物理抖动修复，请改为设"
+"置 [member Engine.physics_jitter_fix]。"
+
 msgid ""
 "The number of fixed iterations per second. This controls how often physics "
 "simulation and [method Node._physics_process] methods are run. See also "
@@ -115722,6 +117886,354 @@ msgstr ""
 "且远大于默认值，那么建议将 [member physics/common/"
 "max_physics_steps_per_frame] 也调大。"
 
+msgid ""
+"The maximum angle, in radians, between two adjacent triangles in a "
+"[ConcavePolygonShape3D] or [HeightMapShape3D] for which the edge between "
+"those triangles is considered inactive.\n"
+"Collisions against an inactive edge will have its normal overridden to "
+"instead be the surface normal of the triangle. This can help alleviate ghost "
+"collisions.\n"
+"[b]Note:[/b] Setting this too high can result in objects not depenetrating "
+"properly.\n"
+"[b]Note:[/b] This applies to all shape queries, as well as physics bodies "
+"within the simulation.\n"
+"[b]Note:[/b] This does not apply when enabling Jolt's enhanced internal edge "
+"removal, which supersedes this.\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"在 [ConcavePolygonShape3D] 或 [HeightMapShape3D] 中两个相邻三角形之间的最大角"
+"度（单位为弧度），超过该角度的边被视为不活跃。\n"
+"与不活跃边相碰撞会将碰撞法线覆盖为三角形的表面法线。这样做有助于减轻虚假碰"
+"撞。\n"
+"[b]注意：[/b]设置得过高可能导致物体无法正确脱离重叠。\n"
+"[b]注意：[/b]该设置适用于所有形状查询，以及模拟中的物理体。\n"
+"[b]注意：[/b]启用 Jolt 的增强内部边缘移除功能时该设置不适用，该功能优先。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期内只会读取一次。"
+
+msgid ""
+"The amount of collision margin to use for certain convex collision shapes, "
+"such as [BoxShape3D], [CylinderShape3D] and [ConvexPolygonShape3D], as a "
+"fraction of the shape's shortest axis, with [member Shape3D.margin] as the "
+"upper bound. This is mainly used to speed up collision detection with convex "
+"shapes.\n"
+"[b]Note:[/b] Collision margins in Jolt do not add any extra size to the "
+"shape. Instead the shape is first shrunk by the margin and then expanded by "
+"the same amount, resulting in a shape with rounded corners.\n"
+"[b]Note:[/b] Setting this value too close to [code]0.0[/code] may also "
+"negatively affect the accuracy of the collision detection with convex "
+"shapes.\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"[BoxShape3D]、[CylinderShape3D]、[ConvexPolygonShape3D] 等凸碰撞形状使用的碰撞"
+"边距大小，是相对于该形状最短轴的比例，上限为 [member Shape3D.margin]。主要用于"
+"加速凸形状的碰撞检测。\n"
+"[b]注意：[/b]Jolt 中的碰撞边距不会为形状添加额外的大小。相反，形状会先根据边距"
+"收缩，然后再用相同的大小扩展，得到的是圆角形状。\n"
+"[b]注意：[/b]将该值设得过于接近 [code]0.0[/code] 可能也会对凸形状碰撞检测的精"
+"度产生负面影响。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期内只会读取一次。"
+
+msgid ""
+"Which of the two nodes bound by a joint should represent the world when one "
+"of the two is omitted, as either [member Joint3D.node_a] or [member Joint3D."
+"node_b]. This can be thought of as having the omitted node be a "
+"[StaticBody3D] at the joint's position. Joint limits are more easily "
+"expressed when [member Joint3D.node_a] represents the world.\n"
+"[b]Note:[/b] In Godot Physics, only [member Joint3D.node_b] can represent the "
+"world."
+msgstr ""
+"关节连接的两个节点 [member Joint3D.node_a] 和 [member Joint3D.node_b] 中，如果"
+"省略一个，那么哪个节点应当代表世界。可以理解为省略的节点是位于关节位置的 "
+"[StaticBody3D] 节点。让 [member Joint3D.node_a] 代表世界更利于关节限制的表"
+"达。\n"
+"[b]注意：[/b]在 Godot Physics 中只有 [member Joint3D.node_b] 能够代表世界。"
+
+msgid ""
+"The maximum angular velocity that a [RigidBody3D] can reach, in radians per "
+"second.\n"
+"This is mainly used as a fail-safe, to prevent the simulation from exploding, "
+"as fast-moving objects colliding with complex physics structures can "
+"otherwise cause them to go out of control. Fast-moving objects can also cause "
+"a lot of stress on the collision detection system, which can slow down the "
+"simulation considerably."
+msgstr ""
+"[RigidBody3D] 能够达到的最大角速度，单位为弧度每秒。\n"
+"主要用作安全机制，防止模拟出现崩溃，因为快速移动的物体与复杂物理结构碰撞可能会"
+"导致失控。快速移动的物体还可能对碰撞检测系统造成很大的压力，可能显著减慢模拟的"
+"速度。"
+
+msgid ""
+"The maximum number of [PhysicsBody3D] to support at the same time, awake or "
+"sleeping. When this limit is exceeded, an error is reported and anything past "
+"that point is undefined behavior.\n"
+"[b]Note:[/b] This limit also applies within the editor."
+msgstr ""
+"同时支持的 [PhysicsBody3D] 的最大数量，包括处于活动状态和休眠状态的物体。超出"
+"该限制时会报错，此后的行为均未定义。\n"
+"[b]注意：[/b]该限制也适用于编辑器。"
+
+msgid ""
+"The maximum number of body pairs to allow processing of. When this limit is "
+"exceeded, a warning is reported and collisions will randomly be ignored while "
+"bodies pass through each other."
+msgstr ""
+"允许处理的物体对的最大数量。超出该限制时会报警告，此时会随机忽略碰撞，物体相互"
+"穿透。"
+
+msgid ""
+"The maximum number of contact constraints to allow processing of. When this "
+"limit is exceeded, a warning is reported and collisions will randomly be "
+"ignored while bodies pass through each other."
+msgstr ""
+"允许处理的接触约束的最大数量。超出该限制时会报警告，此时会随机忽略碰撞，物体相"
+"互穿透。"
+
+msgid ""
+"The maximum linear velocity that a [RigidBody3D] can reach, in meters per "
+"second.\n"
+"This is mainly used as a fail-safe, to prevent the simulation from exploding, "
+"as fast-moving objects colliding with complex physics structures can "
+"otherwise cause them to go out of control. Fast-moving objects can also cause "
+"a lot of stress on the collision detection system, which can slow down the "
+"simulation considerably."
+msgstr ""
+"[RigidBody3D] 能够达到的最大线速度，单位为米每秒。\n"
+"主要用作安全机制，防止模拟出现崩溃，因为快速移动的物体与复杂物理结构碰撞可能会"
+"导致失控。快速移动的物体还可能对碰撞检测系统造成很大的压力，可能显著减慢模拟的"
+"速度。"
+
+msgid ""
+"The amount of memory to pre-allocate for the stack allocator used within "
+"Jolt, in MiB. This allocator is used within the physics step to store things "
+"that are only needed during it, like which bodies are in contact, how they "
+"form islands and the data needed to solve the contacts."
+msgstr ""
+"为 Jolt 所使用的栈分配器预分配的内存大小，单位为 MiB。物理步骤中会使用该分配器"
+"存储只有在该步骤中用到的内容，例如哪些物体发生了接触、这些物体如何分组、解决接"
+"触需要哪些数据等。"
+
+msgid ""
+"The size of [WorldBoundaryShape3D] boundaries, for all three dimensions. The "
+"plane is effectively centered within a box of this size, and anything outside "
+"of the box will not collide with it. This is necessary as "
+"[WorldBoundaryShape3D] is not unbounded when using Jolt, in order to prevent "
+"precision issues.\n"
+"[b]Note:[/b] Setting this value too high can make collision detection less "
+"accurate.\n"
+"[b]Note:[/b] Collisions against the effective edges of a "
+"[WorldBoundaryShape3D] will be inconsistent."
+msgstr ""
+"[WorldBoundaryShape3D] 三个维度的边界大小。平面实际上在该大小的立方体内居中，"
+"立方体外的物体都无法与之发生碰撞。这样做的原因是使用 Jolt 时为了防止出现精度问"
+"题，所以 [WorldBoundaryShape3D] 并不是无限延伸的。\n"
+"[b]注意：[/b]将该值设得过高可能让碰撞检测的精度降低。\n"
+"[b]注意：[/b]与 [WorldBoundaryShape3D] 实际边界的碰撞是不一致的。"
+
+msgid ""
+"Fraction of the total penetration to depenetrate per iteration during motion "
+"queries.\n"
+"[b]Note:[/b] This affects methods [method CharacterBody3D.move_and_slide], "
+"[method PhysicsBody3D.move_and_collide], [method PhysicsBody3D.test_move] and "
+"[method PhysicsServer3D.body_test_motion].\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"运动查询过程中，单次穿透修正迭代对总穿透量的修正比例。\n"
+"[b]注意：[/b]受影响的方法有 [method CharacterBody3D.move_and_slide]、[method "
+"PhysicsBody3D.move_and_collide]、[method PhysicsBody3D.test_move]、[method "
+"PhysicsServer3D.body_test_motion]。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期中只会读取一次。"
+
+msgid ""
+"The number of iterations to run when depenetrating during motion queries.\n"
+"[b]Note:[/b] This affects methods [method CharacterBody3D.move_and_slide], "
+"[method PhysicsBody3D.move_and_collide], [method PhysicsBody3D.test_move] and "
+"[method PhysicsServer3D.body_test_motion].\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"运动查询过程中，穿透修正的迭代次数。\n"
+"[b]注意：[/b]受影响的方法有 [method CharacterBody3D.move_and_slide]、[method "
+"PhysicsBody3D.move_and_collide]、[method PhysicsBody3D.test_move]、[method "
+"PhysicsServer3D.body_test_motion]。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期中只会读取一次。"
+
+msgid ""
+"If [code]true[/code], enables Jolt's enhanced internal edge removal during "
+"motion queries. This can help alleviate ghost collisions, but only with edges "
+"within a single body, meaning edges between separate bodies can still cause "
+"ghost collisions.\n"
+"[b]Note:[/b] This affects methods [method CharacterBody3D.move_and_slide], "
+"[method PhysicsBody3D.move_and_collide], [method PhysicsBody3D.test_move] and "
+"[method PhysicsServer3D.body_test_motion].\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"如果为 [code]true[/code]，则会启用 Jolt 在运动查询期间的增强内部边缘移除。这样"
+"做有利于减轻幽灵碰撞，但仅适用于单个物体内的边缘，即不同物体之间的边缘仍然可能"
+"发生幽灵碰撞。\n"
+"[b]注意：[/b][method CharacterBody3D.move_and_slide]、[method PhysicsBody3D."
+"move_and_collide]、[method PhysicsBody3D.test_move]、[method PhysicsServer3D."
+"body_test_motion] 等方法均会受到影响。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期内只会读取一次。"
+
+msgid ""
+"If [code]true[/code], populates the [code]face_index[/code] field in the "
+"results of [method PhysicsDirectSpaceState3D.intersect_ray], also accessed "
+"through [method RayCast3D.get_collision_face_index]. If [code]false[/code], "
+"the [code]face_index[/code] field will be left at its default value of "
+"[code]-1[/code].\n"
+"[b]Note:[/b] Enabling this setting will increase Jolt's memory usage for "
+"[ConcavePolygonShape3D] by around 25%.\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"如果为 [code]true[/code]，则会在 [method PhysicsDirectSpaceState3D."
+"intersect_ray] 的结果中填充 [code]face_index[/code] 字段，该字段也可以通过 "
+"[method RayCast3D.get_collision_face_index] 访问。如果为 [code]false[/code]，"
+"则 [code]face_index[/code] 字段会保持默认值 [code]-1[/code]。\n"
+"[b]注意：[/b]启用该设置会使 Jolt 对 [ConcavePolygonShape3D] 的内存使用增加约 "
+"25%。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期内只会读取一次。"
+
+msgid ""
+"If [code]true[/code], enables Jolt's enhanced internal edge removal during "
+"shape queries. This can help alleviate ghost collisions when using shape "
+"queries for things like character movement, but only with edges within a "
+"single body, meaning edges between separate bodies can still cause ghost "
+"collisions.\n"
+"[b]Note:[/b] This affects methods [method PhysicsDirectSpaceState3D."
+"cast_motion], [method PhysicsDirectSpaceState3D.collide_shape], [method "
+"PhysicsDirectSpaceState3D.get_rest_info] and [method "
+"PhysicsDirectSpaceState3D.intersect_shape].\n"
+"[b]Note:[/b] Enabling this setting can cause certain shapes to be culled from "
+"the results entirely, but you will get at least one intersection per body.\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"如果为 [code]true[/code]，则会在形状查询期间启用 Jolt 的增强内部边缘移除。这样"
+"做有利于减轻在使用形状查询进行角色移动等操作时的幽灵碰撞，但仅适用于单个物体内"
+"的边缘，即不同物体之间的边缘仍然可能发生幽灵碰撞。\n"
+"[b]注意：[/b][method PhysicsDirectSpaceState3D.cast_motion]、[method "
+"PhysicsDirectSpaceState3D.collide_shape]、[method PhysicsDirectSpaceState3D."
+"get_rest_info]、[method PhysicsDirectSpaceState3D.intersect_shape] 等方法均会"
+"受到影响。\n"
+"[b]注意：[/b]启用该设置可能导致从结果中完全剔除某些形状，但每个物体至少会得到"
+"一个交点。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期内只会读取一次。"
+
+msgid ""
+"If [code]true[/code], [RigidBody3D] nodes are allowed to go to sleep if their "
+"velocity is below the threshold defined in [member physics/jolt_physics_3d/"
+"simulation/sleep_velocity_threshold] for the duration set in [member physics/"
+"jolt_physics_3d/simulation/sleep_time_threshold]. This can improve physics "
+"simulation performance when there are non-moving [RigidBody3D] nodes, at the "
+"cost of some nodes possibly failing to wake up in certain scenarios. Consider "
+"disabling this temporarily to troubleshoot [RigidBody3D] nodes not moving "
+"when they should."
+msgstr ""
+"如果为 [code]true[/code]，则 [RigidBody3D] 节点在速度低于 [member physics/"
+"jolt_physics_3d/simulation/sleep_velocity_threshold] 中定义的阈值，并且持续时"
+"间达到 [member physics/jolt_physics_3d/simulation/sleep_time_threshold] 时，允"
+"许进入休眠状态。这样做可以在存在不移动的 [RigidBody3D] 节点时提高物理模拟性"
+"能，但可能会导致部分节点在特定场景下无法唤醒。排查 [RigidBody3D] 节点在应移动"
+"时未移动的问题时，请考虑暂时禁用该功能。"
+
+msgid ""
+"If [code]true[/code], [Area3D] nodes are able to detect overlaps with "
+"[StaticBody3D] nodes.\n"
+"[b]Note:[/b] Enabling this setting can come at a heavy CPU and memory cost if "
+"you allow many/large [Area3D] to overlap with complex static geometry, such "
+"as [ConcavePolygonShape3D] or [HeightMapShape3D]. It is strongly recommended "
+"that you set up your collision layers and masks in such a way that only a few "
+"small [Area3D] nodes can detect [StaticBody3D] nodes.\n"
+"[b]Note:[/b] This also applies to overlaps with a [RigidBody3D] frozen with "
+"[constant RigidBody3D.FREEZE_MODE_STATIC].\n"
+"[b]Note:[/b] This is not needed to detect overlaps with [AnimatableBody3D], "
+"as it is a kinematic body, despite inheriting from [StaticBody3D]."
+msgstr ""
+"如果为 [code]true[/code]，则 [Area3D] 节点能够检测与 [StaticBody3D] 节点的重"
+"叠。\n"
+"[b]注意：[/b]启用该设置可能会带来较高的 CPU 和内存开销，特别是当允许许多/大型 "
+"[Area3D] 与复杂的静态几何体（如 [ConcavePolygonShape3D] 或 "
+"[HeightMapShape3D]）重叠时。强烈建议设置碰撞层和掩码，使得只有少量小型 "
+"[Area3D] 节点能够检测到 [StaticBody3D] 节点。\n"
+"[b]注意：[/b]同样适用于与使用 [constant RigidBody3D.FREEZE_MODE_STATIC] 冻结"
+"的 [RigidBody3D] 的重叠。\n"
+"[b]注意：[/b]检测与 [AnimatableBody3D] 的重叠不需要此设置，它虽然继承自 "
+"[StaticBody3D]，但是一种运动学物体。"
+
+msgid ""
+"How much of the position error of a [RigidBody3D] to fix during a physics "
+"step, where [code]0.0[/code] is none and [code]1.0[/code] is the full amount. "
+"This affects things like how quickly bodies depenetrate.\n"
+"[b]Note:[/b] Setting this value too high can make [RigidBody3D] nodes "
+"unstable."
+msgstr ""
+"在物理步骤中修正 [RigidBody3D] 位置误差的比例，其中 [code]0.0[/code] 表示不修"
+"正， [code]1.0[/code] 表示完全修正。这个设置会影响物体脱离重叠状态的速度。\n"
+"[b]注意：[/b]将该值设置得过高可能会导致 [RigidBody3D] 节点不稳定。"
+
+msgid ""
+"The maximum relative angle by which a body pair can move and still reuse the "
+"collision results from the previous physics step, in radians."
+msgstr ""
+"一对物体可以移动的最大相对角度，移动后仍然可以重用上一个物理步骤的碰撞结果，单"
+"位为弧度。"
+
+msgid ""
+"The maximum relative distance by which a body pair can move and still reuse "
+"the collision results from the previous physics step, in meters."
+msgstr ""
+"一对物体可以移动的最大相对距离，移动后仍然可以重用上一个物理步骤的碰撞结果，单"
+"位为米。"
+
+msgid ""
+"If [code]true[/code], enables the body pair contact cache, which removes the "
+"need for potentially expensive collision detection when the relative "
+"orientation between two bodies hasn't changed much."
+msgstr ""
+"如果为 [code]true[/code]，则会启用物体对的接触缓存，这样在两个物体的相对方向变"
+"化不大时就不必再进行碰撞检测了，这种检测的开销可能很大。"
+
+msgid ""
+"The minimum velocity needed before a collision can be bouncy, in meters per "
+"second.\n"
+"[b]Note:[/b] This setting will only be read once during the lifetime of the "
+"application."
+msgstr ""
+"发生弹性碰撞所需的最小速度（单位为米每秒）。\n"
+"[b]注意：[/b]该设置在应用程序的生命周期内只会读取一次。"
+
+msgid ""
+"Fraction of a body's inner radius that may penetrate another body while using "
+"continuous collision detection."
+msgstr "使用连续碰撞检测时，一个物体的内半径能够穿透另一个物体的比例。"
+
+msgid ""
+"Fraction of a body's inner radius that the body must move per step to make "
+"use of continuous collision detection."
+msgstr "为了使用连续碰撞检测，物体每一步必须移动的内半径的比例。"
+
+msgid ""
+"If [code]true[/code], a [RigidBody3D] frozen with [constant RigidBody3D."
+"FREEZE_MODE_KINEMATIC] is able to collide with other kinematic and static "
+"bodies, and therefore generate contacts for them.\n"
+"[b]Note:[/b] This setting can come at a heavy CPU and memory cost if you "
+"allow many/large frozen kinematic bodies with a non-zero [member RigidBody3D."
+"max_contacts_reported] to overlap with complex static geometry, such as "
+"[ConcavePolygonShape3D] or [HeightMapShape3D]."
+msgstr ""
+"如果为 [code]true[/code]，则使用 [constant RigidBody3D.FREEZE_MODE_KINEMATIC] "
+"冻结的 [RigidBody3D] 能够与其他运动学物体和静态物体发生碰撞，从而生成接触"
+"点。\n"
+"[b]注意：[/b]如果允许许多/大型冻结的 [member RigidBody3D."
+"max_contacts_reported] 非零的运动学物体与 [ConcavePolygonShape3D]、"
+"[HeightMapShape3D] 等复杂的静态几何体重叠，那么这个设置可能会带来较高的 CPU 和"
+"内存开销。"
+
 msgid "How much bodies are allowed to penetrate each other, in meters."
 msgstr "允许物体相互穿透的程度，单位为米。"
 
@@ -115732,6 +118244,29 @@ msgstr ""
 "求解器的位置迭代次数。迭代次数越大，模拟精确度越高，但对 CPU 性能的消耗也越"
 "大。"
 
+msgid ""
+"Time in seconds a [RigidBody3D] will spend below the sleep velocity threshold "
+"before going to sleep."
+msgstr ""
+"[RigidBody3D] 的速度低于休眠速度阈值时，进入休眠前等待的时间，单位为秒。"
+
+msgid ""
+"The linear velocity of specific points on the bounding box of a "
+"[RigidBody3D], below which it can be put to sleep, in meters per second. "
+"These points help capture both the linear and angular motion of a "
+"[RigidBody3D]."
+msgstr ""
+"[RigidBody3D] 包围盒上指定点的线速度，单位为米每秒，低于该速度时可以将其置于休"
+"眠状态。这些点有助于捕捉 [RigidBody3D] 的线性运动和角运动。"
+
+msgid ""
+"How big the points of a [SoftBody3D] are, in meters. A higher value can "
+"prevent behavior such as cloth laying perfectly flush against other surfaces "
+"and causing Z-fighting."
+msgstr ""
+"[SoftBody3D] 的点的大小，单位为米。较高的值可以防止布料与其他表面完全贴合而导"
+"致的 Z 冲突行为。"
+
 msgid ""
 "Radius around physics bodies, inside which speculative contact points will be "
 "detected, in meters. This is mainly used to prevent tunneling/penetration for "
@@ -115746,6 +118281,18 @@ msgstr ""
 "[b]注意：[/b]设置得过高可能导致幽灵碰撞，因为推测接触是基于碰撞检测步骤中最接"
 "近的点，而在两个物体碰撞时，这些点可能并不是实际的最接近点。"
 
+msgid ""
+"If [code]true[/code], enables Jolt's enhanced internal edge removal for "
+"[RigidBody3D]. This can help alleviate ghost collisions when, for example, a "
+"[RigidBody3D] collides with the edges of two perfectly joined [BoxShape3D]. "
+"The removal only applies to edges internal to a single body, meaning edges "
+"between separate bodies can still cause ghost collisions."
+msgstr ""
+"如果为 [code]true[/code]，则会启用 Jolt 对 [RigidBody3D] 的增强内部边缘移除。"
+"这样做有利于减轻幽灵碰撞，例如在 [RigidBody3D] 与两个完美连接的 [BoxShape3D] "
+"边缘碰撞时就可能产生这样的碰撞。移除仅适用于单个物体内部的边缘，即不同物体之间"
+"的边缘仍然可能发生幽灵碰撞。"
+
 msgid ""
 "Number of solver velocity iterations. The greater the number of iterations, "
 "the more accurate the simulation will be, at the cost of CPU performance.\n"
@@ -115758,6 +118305,20 @@ msgstr ""
 "[b]注意：[/b]至少为 [code]2[/code] 阻力才会生效，因为阻力需要根据上一次迭代的"
 "非穿透冲量进行计算。"
 
+msgid ""
+"Maximum number of canvas item commands that can be batched into a single draw "
+"call."
+msgstr "可以批处理到单个绘制调用中的最大画布项目命令数量。"
+
+msgid ""
+"Maximum number of uniform sets that will be cached by the 2D renderer when "
+"batching draw calls.\n"
+"[b]Note:[/b] A project that uses a large number of unique sprite textures per "
+"frame may benefit from increasing this value."
+msgstr ""
+"在批处理绘制调用时，2D 渲染器缓存的 Uniform 集的最大数量。\n"
+"[b]注意：[/b]如果项目每帧都会使用大量不同的精灵纹理，增加该值可能会带来好处。"
+
 msgid ""
 "Controls how much of the original viewport size should be covered by the 2D "
 "signed distance field. This SDF can be sampled in [CanvasItem] shaders and is "
@@ -115868,6 +118429,128 @@ msgstr ""
 "snap_2d_transforms_to_pixel] 一起使用，因为移动可能会显得更不平滑。最好只启用"
 "该设置。"
 
+msgid ""
+"Sets the number of multisample antialiasing (MSAA) samples to use for 2D/"
+"Canvas rendering (as a power of two). MSAA is used to reduce aliasing around "
+"the edges of polygons. A higher MSAA value results in smoother edges but can "
+"be significantly slower on some hardware, especially integrated graphics due "
+"to their limited memory bandwidth. This has no effect on shader-induced "
+"aliasing or texture aliasing.\n"
+"[b]Note:[/b] MSAA is only supported in the Forward+ and Mobile rendering "
+"methods, not Compatibility.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set the "
+"number of 2D MSAA samples at runtime, set [member Viewport.msaa_2d] or use "
+"[method RenderingServer.viewport_set_msaa_2d]."
+msgstr ""
+"设置用于 2D/Canvas 渲染的多重采样抗锯齿（MSAA）采样数（为 2 的幂）。MSAA 可用"
+"于减少多边形边缘周围的锯齿。较高的 MSAA 值会产生更平滑的边缘，但在某些硬件上可"
+"能会明显变慢，尤其是显存带宽比较有限的集成显卡。这对着色器引起的锯齿或纹理锯齿"
+"无效。\n"
+"[b]注意：[/b]MSAA 仅支持 Forward+ 和 Mobile 渲染方式，不支持 Compatibility。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时设置 2D MSAA 的采样数，请设"
+"置 [member Viewport.msaa_2d] 或使用 [method RenderingServer."
+"viewport_set_msaa_2d]。"
+
+msgid ""
+"Sets the number of multisample antialiasing (MSAA) samples to use for 3D "
+"rendering (as a power of two). MSAA is used to reduce aliasing around the "
+"edges of polygons. A higher MSAA value results in smoother edges but can be "
+"significantly slower on some hardware, especially integrated graphics due to "
+"their limited memory bandwidth. See also [member rendering/scaling_3d/mode] "
+"for supersampling, which provides higher quality but is much more expensive. "
+"This has no effect on shader-induced aliasing or texture aliasing.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set the "
+"number of 3D MSAA samples at runtime, set [member Viewport.msaa_3d] or use "
+"[method RenderingServer.viewport_set_msaa_3d]."
+msgstr ""
+"设置用于 3D 渲染的多重采样抗锯齿（MSAA）采样数（为 2 的幂）。MSAA 用于减少多边"
+"形边缘周围的锯齿。较高的 MSAA 值会产生更平滑的边缘，但在某些硬件上可能会明显变"
+"慢，尤其是显存带宽比较有限的集成显卡。另见用于超级采样的双线性缩放 3d [member "
+"rendering/scaling_3d/mode]，它提供更高的质量但更昂贵。这对着色器引起的锯齿或纹"
+"理锯齿无效。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时设置 3D MSAA 的采样数，请设"
+"置 [member Viewport.msaa_3d] 或使用 [method RenderingServer."
+"viewport_set_msaa_3d]。"
+
+msgid ""
+"Sets the screen-space antialiasing mode for the default screen [Viewport]. "
+"Screen-space antialiasing works by selectively blurring edges in a post-"
+"process shader. It differs from MSAA which takes multiple coverage samples "
+"while rendering objects. Screen-space AA methods are typically faster than "
+"MSAA and will smooth out specular aliasing, but tend to make scenes appear "
+"blurry. The blurriness is partially counteracted by automatically using a "
+"negative mipmap LOD bias (see [member rendering/textures/default_filters/"
+"texture_mipmap_bias]).\n"
+"Another way to combat specular aliasing is to enable [member rendering/"
+"anti_aliasing/screen_space_roughness_limiter/enabled].\n"
+"[b]Note:[/b] Screen-space antialiasing is only supported in the Forward+ and "
+"Mobile rendering methods, not Compatibility.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set the "
+"screen-space antialiasing mode at runtime, set [member Viewport."
+"screen_space_aa] on the root [Viewport] instead, or use [method "
+"RenderingServer.viewport_set_screen_space_aa]."
+msgstr ""
+"设置默认屏幕 [Viewport] 的屏幕空间抗锯齿模式。屏幕空间抗锯齿的原理是使用后期处"
+"理着色器选择性地让边缘模糊。与 MSAA 的区别在于，MSAA 是在渲染对象时进行了多次"
+"覆盖采样。屏幕空间 AA 的方法通常比 MSAA 要快，会将镜面反射锯齿也进行平滑处理，"
+"但容易让场景变得模糊。这种模糊可以通过自动使用负的 Mipmap LOD 偏置部分缓解"
+"（见 [member rendering/textures/default_filters/texture_mipmap_bias]）。\n"
+"对抗镜面反射锯齿的另一种方法是启用 [member rendering/anti_aliasing/"
+"screen_space_roughness_limiter/enabled]。\n"
+"[b]注意：[/b]屏幕空间抗锯齿仅支持 Forward+ 和 Mobile 渲染方法，不支持 "
+"Compatibility。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时设置屏幕空间抗锯齿模式，请在"
+"根 [Viewport] 上设置 [member Viewport.screen_space_aa] 或使用 [method "
+"RenderingServer.viewport_set_screen_space_aa]。"
+
+msgid ""
+"If [code]true[/code], uses a fast post-processing filter to make banding "
+"significantly less visible in 3D. 2D rendering is [i]not[/i] affected by "
+"debanding unless the [member Environment.background_mode] is [constant "
+"Environment.BG_CANVAS].\n"
+"In some cases, debanding may introduce a slightly noticeable dithering "
+"pattern. It's recommended to enable debanding only when actually needed since "
+"the dithering pattern will make lossless-compressed screenshots larger.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set "
+"debanding at runtime, set [member Viewport.use_debanding] on the root "
+"[Viewport] instead, or use [method RenderingServer."
+"viewport_set_use_debanding]."
+msgstr ""
+"如果为 [code]true[/code]，则使用一个快速的后期处理滤镜使条带在 3D 中不那么明"
+"显。除非 [member Environment.background_mode] 为 [constant Environment."
+"BG_CANVAS]，否则 2D 渲染[i]不会[/i]受到去条带的影响。\n"
+"在某些情况下，去条带可能会引入稍微明显的抖动图案。建议只在实际需要时才启用去条"
+"带，因为抖动图案会使无损压缩的屏幕截图变大。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时设置去条带，请改为在根 "
+"[Viewport] 上设置 [member Viewport.use_debanding] 或使用 [method "
+"RenderingServer.viewport_set_use_debanding]。"
+
+msgid ""
+"Enables temporal antialiasing for the default screen [Viewport]. TAA works by "
+"jittering the camera and accumulating the images of the last rendered frames, "
+"motion vector rendering is used to account for camera and object motion. "
+"Enabling TAA can make the image blurrier, which is partially counteracted by "
+"automatically using a negative mipmap LOD bias (see [member rendering/"
+"textures/default_filters/texture_mipmap_bias]).\n"
+"[b]Note:[/b] The implementation is not complete yet. Some visual instances "
+"such as particles and skinned meshes may show ghosting artifacts in motion.\n"
+"[b]Note:[/b] TAA is only supported in the Forward+ rendering method, not "
+"Mobile or Compatibility.\n"
+"[b]Note:[/b] This property is only read when the project starts. To set TAA "
+"at runtime, set [member Viewport.use_taa] on the root [Viewport] instead, or "
+"use [method RenderingServer.viewport_set_use_taa]."
+msgstr ""
+"为默认屏幕 [Viewport] 启用时间抗锯齿（Temporal Anti-Aliasing）。TAA 的原理是让"
+"相机产生抖动并积累最近渲染的几帧图像，使用运动向量渲染让相机和对象产生运动。启"
+"用 TAA 会让图像变模糊，这种模糊可以通过自动使用负的 Mipmap LOD 偏置部分缓解"
+"（见 [member rendering/textures/default_filters/texture_mipmap_bias]）。\n"
+"[b]注意：[/b]实现尚未完成，粒子及蒙皮网格等某些视觉实例可能会显示运动中的重影"
+"伪像。\n"
+"[b]注意：[/b]TAA 只支持 Forward+ 渲染方式，不支持 Mobile 或 Compatibility。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时设置 TAA，请在根 [Viewport] "
+"上设置 [member Viewport.use_taa] 或使用 [method RenderingServer."
+"viewport_set_use_taa]。"
+
 msgid ""
 "[b]Note:[/b] This property is only read when the project starts. To control "
 "the screen-space roughness limiter at runtime, call [method RenderingServer."
@@ -116026,6 +118709,18 @@ msgstr ""
 "模糊通道数，在计算屏幕空间环境光遮蔽时使用。数值越大，外观越平滑，但计算速度会"
 "变慢，高频细节也会变少。"
 
+msgid ""
+"Distance at which the screen-space ambient occlusion effect starts to fade "
+"out. Use this hide ambient occlusion from far away."
+msgstr ""
+"屏幕空间环境光遮蔽效果开始淡出的距离。使用该属性可以在较远处隐藏环境光遮蔽。"
+
+msgid ""
+"Distance at which the screen-space ambient occlusion is fully faded out. Use "
+"this hide ambient occlusion from far away."
+msgstr ""
+"屏幕空间环境光遮蔽效果完全淡出的距离。使用该属性可以在较远处隐藏环境光遮蔽。"
+
 msgid ""
 "If [code]true[/code], screen-space ambient occlusion will be rendered at half "
 "size and then upscaled before being added to the scene. This is significantly "
@@ -116067,6 +118762,20 @@ msgstr ""
 "模糊通道数，在计算屏幕空间间接光照时使用。数值越大，外观越平滑，但计算速度会变"
 "慢，高频细节也会变少。"
 
+msgid ""
+"Distance at which the screen-space indirect lighting effect starts to fade "
+"out. Use this to hide screen-space indirect lighting from far away."
+msgstr ""
+"屏幕空间间接光照效果开始淡出的距离。使用该属性可以在较远处隐藏屏幕空间间接光"
+"照。"
+
+msgid ""
+"Distance at which the screen-space indirect lighting is fully faded out. Use "
+"this to hide screen-space indirect lighting from far away."
+msgstr ""
+"屏幕空间间接光照效果完全淡出的距离。使用该属性可以在较远处隐藏屏幕空间间接光"
+"照。"
+
 msgid ""
 "If [code]true[/code], screen-space indirect lighting will be rendered at half "
 "size and then upscaled before being added to the scene. This is significantly "
@@ -116450,6 +119159,47 @@ msgstr ""
 "[b]注意：[/b]这个属性仅在项目启动时读取。要在运行时控制 VoxelGI 的质量，请改为"
 "调用 [method RenderingServer.voxel_gi_set_quality]。"
 
+msgid ""
+"The maximum number of rays that can be thrown per pass when baking lightmaps "
+"with [LightmapGI]. Depending on the scene, adjusting this value may result in "
+"higher GPU utilization when baking lightmaps, leading to faster bake times.\n"
+"[b]Note:[/b] Using a value that is too high for your system can cause crashes "
+"due to the GPU being unresponsive for long periods of time, and the graphics "
+"driver being reset by the OS."
+msgstr ""
+"使用 [LightmapGI] 烘焙光照贴图时，每阶段可以投射的最大射线数。根据场景的不同，"
+"调整该值可能会提高烘焙光照贴图时的 GPU 利用率，从而加快烘焙时间。\n"
+"[b]注意：[/b]使用对系统而言过高的值可能会导致崩溃，因为 GPU 在长时间内无响应，"
+"操作系统会重置图形驱动程序。"
+
+msgid ""
+"The maximum number of rays that can be thrown per pass when baking dynamic "
+"object lighting in [LightmapProbe]s with [LightmapGI]. Depending on the "
+"scene, adjusting this value may result in higher GPU utilization when baking "
+"lightmaps, leading to faster bake times.\n"
+"[b]Note:[/b] Using a value that is too high for your system can cause crashes "
+"due to the GPU being unresponsive for long periods of time, and the graphics "
+"driver being reset by the OS."
+msgstr ""
+"在带有 [LightmapGI] 的 [LightmapProbe] 中烘焙动态对象光照时，每阶段可以投射的"
+"最大光线数。根据场景的不同，调整该值可能会在烘焙光照贴图时提高 GPU 利用率，从"
+"而加快烘焙时间。\n"
+"[b]注意：[/b]使用对系统而言过高的值可能会导致崩溃，因为 GPU 在长时间内无响应，"
+"操作系统会重置图形驱动程序。"
+
+msgid ""
+"The maximum number of retry rays that can be thrown per pass when hitting a "
+"transparent surface when baking lightmaps with [LightmapGI]. Depending on the "
+"scene, reducing this value may lead to faster bake times.\n"
+"[b]Note:[/b] Using a value that is too high for your system can cause crashes "
+"due to the GPU being unresponsive for long periods of time, and the graphics "
+"driver being reset by the OS."
+msgstr ""
+"使用 [LightmapGI] 烘焙光照贴图时，每阶段可以投射的最大重试射线数。根据场景的不"
+"同，降低该值可能会加快烘焙时间。\n"
+"[b]注意：[/b]使用对系统而言过高的值可能会导致崩溃，因为 GPU 在长时间内无响应，"
+"操作系统会重置图形驱动程序。"
+
 msgid ""
 "The region size to use when baking lightmaps with [LightmapGI]. The specified "
 "value is rounded up to the nearest power of 2.\n"
@@ -116744,6 +119494,19 @@ msgstr ""
 "[b]注意：[/b]该设置仅在使用 Forward+ 渲染方式时有效，对 Mobile 和 "
 "Compatibility 无效。"
 
+msgid ""
+"The maximum number of uniforms that can be used by the global shader uniform "
+"buffer. Each item takes up one slot. In other words, a single uniform float "
+"and a uniform vec4 will take the same amount of space in the buffer.\n"
+"[b]Note:[/b] When using the Compatibility renderer, most mobile devices (and "
+"all web exports) will be limited to a maximum size of 1024 due to hardware "
+"constraints."
+msgstr ""
+"全局着色器 uniform 缓冲能够使用的 uniform 的最大数量。每个条目占据一个位置。换"
+"句话说，单个 uniform float 和单个 uniform vec4 在缓冲中占据的空间是相同的。\n"
+"[b]注意：[/b]使用 Compatibility 渲染器时，由于硬件的限制，大多数移动设备（以及"
+"所有 Web 导出）对最大数量都有 1024 的上限。"
+
 msgid ""
 "Max number of omnilights and spotlights renderable per object. At the default "
 "value of 8, this means that each surface can be affected by up to 8 "
@@ -116801,6 +119564,30 @@ msgstr ""
 "在多线程上启用剔除计算时，场景中必须存在的最小实例数。如果场景的实例数少于该数"
 "量，则在单线程上完成剔除。"
 
+msgid ""
+"Maximum time (in seconds) before the [code]TIME[/code] shader built-in "
+"variable rolls over. The [code]TIME[/code] variable increments by "
+"[code]delta[/code] each frame, and when it exceeds this value, it rolls over "
+"to [code]0.0[/code]. Since large floating-point values are less precise than "
+"small floating-point values, this should be set as low as possible to "
+"maximize the precision of the [code]TIME[/code] built-in variable in shaders. "
+"This is especially important on mobile platforms where precision in shaders "
+"is significantly reduced. However, if this is set too low, shader animations "
+"may appear to restart from the beginning while the project is running.\n"
+"On desktop platforms, values below [code]4096[/code] are recommended, ideally "
+"below [code]2048[/code]. On mobile platforms, values below [code]64[/code] "
+"are recommended, ideally below [code]32[/code]."
+msgstr ""
+"[code]TIME[/code] 着色器内置变量发生环绕前所能达到的最大时间（单位为秒）。"
+"[code]TIME[/code] 变量每帧都会根据 [code]delta[/code] 增大，超过这个值后就会绕"
+"回 [code]0.0[/code]。由于浮点数在数值较大时比数值较小时的精度低，应当把这个值"
+"设得尽可能低，从而最大化 [code]TIME[/code] 着色器内置变量的精度。这一点在移动"
+"平台上尤为重要，因为移动平台上着色器的精度有显著的降低。不过如果设得太低的话，"
+"着色器动画就可能会在项目运行过程中重新开始。\n"
+"在桌面平台上建议使用低于 [code]4096[/code] 的值，低于 [code]2048[/code] 更为理"
+"想。在移动平台上建议使用低于 [code]64[/code] 的值，低于 [code]32[/code] 更为理"
+"想。"
+
 msgid ""
 "The automatic LOD bias to use for meshes rendered within the "
 "[ReflectionProbe]. Higher values will use less detailed versions of meshes "
@@ -116971,6 +119758,37 @@ msgstr ""
 "移动设备上 [member rendering/reflections/sky_reflections/"
 "texture_array_reflections] 的低端覆盖项，出于性能问题或驱动程序支持的考虑。"
 
+msgid ""
+"Sets the renderer that will be used by the project. Options are:\n"
+"[b]forward_plus[/b] (Forward+): High-end renderer designed for desktop "
+"devices. Has a higher base overhead, but scales well with complex scenes. Not "
+"suitable for older devices or mobile.\n"
+"[b]mobile[/b] (Mobile): Modern renderer designed for mobile devices. Has a "
+"lower base overhead than Forward+, but does not scale as well to large scenes "
+"with many elements.\n"
+"[b]gl_compatibility[/b] (Compatibility): Low-end renderer designed for older "
+"devices. Based on the limitations of the OpenGL 3.3 / OpenGL ES 3.0 / WebGL 2 "
+"APIs.\n"
+"This can be overridden using the [code]--rendering-method <method>[/code] "
+"command line argument.\n"
+"[b]Note:[/b] The actual rendering method may be automatically changed by the "
+"engine as a result of a fallback, or a user-specified command line argument. "
+"To get the actual rendering method that is used at runtime, use [method "
+"RenderingServer.get_current_rendering_method] instead of reading this project "
+"setting's value."
+msgstr ""
+"设置项目使用的渲染器。选项有：\n"
+"[b]forward_plus[/b]（Forward+）：为桌面设备设计的高端渲染器。有较高的基础开"
+"销，但能够很好地扩展到复杂的场景。不适合老旧设备和移动设备。\n"
+"[b]mobile[/b]（移动）：为移动设备设计的现代渲染器。基础开销比 Forward+ 低，但"
+"在处理有许多元素的大型场景时，扩展性并不理想。\n"
+"[b]gl_compatibility[/b]（兼容）：为老旧设备设计的低端渲染器。基于 OpenGL 3.3/ "
+"OpenGL ES 3.0 / WebGL 2 API 的限制。\n"
+"可以使用 [code]--rendering-method <method>[/code] 命令行参数覆盖。\n"
+"[b]注意：[/b]实际的渲染方法可能会因回退或用户指定的命令行参数而被引擎自动更"
+"改。要获取运行时使用的实际渲染方法，请使用 [method RenderingServer."
+"get_current_rendering_method]，不该读取该项目设置的值。"
+
 msgid ""
 "Override for [member rendering/renderer/rendering_method] on mobile devices."
 msgstr "移动设备的 [member rendering/renderer/rendering_method] 覆盖项。"
@@ -117022,6 +119840,154 @@ msgstr ""
 "作。\n"
 "这个值可能会降低，也可能需要提高，具体取决于场景的复杂度。"
 
+msgid ""
+"Sets the driver to be used by the renderer when using a RenderingDevice-based "
+"renderer like the Forward+ or Mobile renderers. Editing this property has no "
+"effect in the default configuration, as first-party platforms each have "
+"platform-specific overrides. Use those overrides to configure the driver for "
+"each platform.\n"
+"This can be overridden using the [code]--rendering-driver <driver>[/code] "
+"command line argument.\n"
+"Supported values are:\n"
+"- [code]metal[/code], Metal (supported on Apple Silicon Macs and iOS).\n"
+"- [code]vulkan[/code], Vulkan (supported on all desktop and mobile "
+"platforms).\n"
+"- [code]d3d12[/code], Direct3D 12 (supported on Windows).\n"
+"[b]Note:[/b] The availability of these options depends on whether the engine "
+"was compiled with support for them (determined by SCons options [code]vulkan[/"
+"code], [code]metal[/code], and [code]d3d12[/code]).\n"
+"[b]Note:[/b] If a given platform has no registered drivers, it can fall back "
+"to the Compatibility renderer (OpenGL 3) if [member rendering/"
+"rendering_device/fallback_to_opengl3] is enabled. This fallback happens "
+"automatically for the Web platform regardless of that property.\n"
+"[b]Note:[/b] The actual rendering driver may be automatically changed by the "
+"engine as a result of a fallback, or a user-specified command line argument. "
+"To get the actual rendering driver that is used at runtime, use [method "
+"RenderingServer.get_current_rendering_driver_name] instead of reading this "
+"project setting's value."
+msgstr ""
+"设置在使用 Forward+、Mobile 等基于 RenderingDevice 的渲染器时所使用的驱动程"
+"序。在默认配置中编辑该属性没有效果，因为第一方平台都有针对各自平台的覆盖项。请"
+"使用这些覆盖项来针对平台配置驱动程序。\n"
+"可以使用 [code]--rendering-driver <driver>[/code] 命令行参数进行覆盖。\n"
+"支持的值有：\n"
+"- [code]metal[/code]，Metal（在 Apple Silicon Mac 和 iOS 上支持）。\n"
+"- [code]vulkan[/code]，Vulkan（在所有桌面和移动平台上支持）。\n"
+"- [code]d3d12[/code]，Direct3D 12（在 Windows 上支持）。\n"
+"[b]注意：[/b]这些选项是否可用取决于编译引擎时是否打开了支持开关（由 SCons 选"
+"项 [code]vulkan[/code]、[code]metal[/code] 和 [code]d3d12[/code] 决定）。\n"
+"[b]注意：[/b]如果某个平台没有注册的驱动程序，那么启用了 [member rendering/"
+"rendering_device/fallback_to_opengl3] 的话就可以回退到 Compatibility 渲染器"
+"（OpenGL 3）。Web 平台会自动进行这种回退，与该属性的取值无关。\n"
+"[b]注意：[/b]实际的渲染驱动程序可能会因回退或用户指定的命令行参数而被引擎自动"
+"更改。要获取运行时使用的实际渲染驱动程序，请使用 [method RenderingServer."
+"get_current_rendering_driver_name]，不要读取该项目设置的值。"
+
+msgid ""
+"Android override for [member rendering/rendering_device/driver].\n"
+"Only one option is supported:\n"
+"- [code]vulkan[/code], Vulkan from native drivers.\n"
+"[b]Note:[/b] If Vulkan was disabled at compile time, there is no alternative "
+"RenderingDevice driver."
+msgstr ""
+"[member rendering/rendering_device/driver] 针对 Android 的覆盖项目。\n"
+"仅支持一个选项：\n"
+"- [code]vulkan[/code]，使用原生驱动程序的 Vulkan。\n"
+"[b]注意：[/b]如果编译时禁用了 Vulkan 则不会有备选的 RenderingDevice 驱动程序。"
+
+msgid ""
+"iOS override for [member rendering/rendering_device/driver].\n"
+"Two options are supported:\n"
+"- [code]metal[/code] (default), Metal from native drivers.\n"
+"- [code]vulkan[/code], Vulkan over Metal via MoltenVK."
+msgstr ""
+"[member rendering/rendering_device/driver] 针对 iOS 的覆盖项。\n"
+"支持两个选项：\n"
+"- [code]metal[/code]（默认），使用原生驱动程序的 Metal。\n"
+"- [code]vulkan[/code]，借助 MoltenVK 实现的基于 Metal 的 Vulkan。"
+
+msgid ""
+"LinuxBSD override for [member rendering/rendering_device/driver].\n"
+"Only one option is supported:\n"
+"- [code]vulkan[/code], Vulkan from native drivers.\n"
+"[b]Note:[/b] If Vulkan was disabled at compile time, there is no alternative "
+"RenderingDevice driver."
+msgstr ""
+"[member rendering/rendering_device/driver] 针对 LinuxBSD 的覆盖项。\n"
+"仅支持一个选项：\n"
+"- [code]vulkan[/code]，使用原生驱动程序的 Vulkan。\n"
+"[b]注意：[/b]如果编译时禁用了 Vulkan 则不会有备选的 RenderingDevice 驱动程序。"
+
+msgid ""
+"macOS override for [member rendering/rendering_device/driver].\n"
+"Two options are supported:\n"
+"- [code]metal[/code] (default), Metal from native drivers, only supported on "
+"Apple Silicon Macs. On Intel Macs, it will automatically fall back to "
+"[code]vulkan[/code] as Metal support is not implemented.\n"
+"- [code]vulkan[/code], Vulkan over Metal via MoltenVK, supported on both "
+"Apple Silicon and Intel Macs."
+msgstr ""
+"[member rendering/rendering_device/driver] 针对 macOS 的覆盖项。\n"
+"支持两个选项：\n"
+"- [code]metal[/code]（默认），使用原生驱动程序的 Metal，仅支持 Apple Silicon "
+"设备。在 Intel 设备上会自动回退到 [code]vulkan[/code]，因为没有实现对 Metal 的"
+"支持。\n"
+"- [code]vulkan[/code]，通过 MoltenVK 在 Metal 上使用 Vulkan，支持 Apple "
+"Silicon 和 Intel 的设备。"
+
+msgid ""
+"Windows override for [member rendering/rendering_device/driver].\n"
+"Two options are supported:\n"
+"- [code]vulkan[/code] (default), Vulkan from native drivers. If [member "
+"rendering/rendering_device/fallback_to_vulkan] is enabled, this is used as a "
+"fallback if Direct3D 12 is not supported.\n"
+"- [code]d3d12[/code], Direct3D 12 from native drivers. If [member rendering/"
+"rendering_device/fallback_to_d3d12] is enabled, this is used as a fallback if "
+"Vulkan is not supported."
+msgstr ""
+"[member rendering/rendering_device/driver] 针对 Windows 的覆盖项。\n"
+"支持两个选项：\n"
+"- [code]vulkan[/code]（默认），使用原生驱动程序的 Vulkan。如果启用了 [member "
+"rendering/rendering_device/fallback_to_vulkan]，则在不支持 Direct3D 12 时将作"
+"为回退使用。\n"
+"- [code]d3d12[/code]，使用原生驱动程序的 Direct3D 12。如果启用了 [member "
+"rendering/rendering_device/fallback_to_d3d12]，则在不支持 Vulkan 时将作为回退"
+"使用。"
+
+msgid ""
+"If [code]true[/code], the forward renderer will fall back to Direct3D 12 if "
+"Vulkan is not supported. The fallback is always attempted regardless of this "
+"setting if Vulkan driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented only on Windows."
+msgstr ""
+"如果为 [code]true[/code]，则 Forward 渲染器会在不支持 Vulkan 时回退到 "
+"Direct3D 12。如果在编译时禁用了 Vulkan 驱动程序支持则会始终尝试回退，不考虑该"
+"设置。\n"
+"[b]注意：[/b]该设置仅在 Windows 上实现。"
+
+msgid ""
+"If [code]true[/code], the forward renderer will fall back to OpenGL 3 if "
+"Direct3D 12, Metal, and Vulkan are not supported.\n"
+"[b]Note:[/b] This setting is implemented only on Windows, Android, macOS, "
+"iOS, and Linux/X11."
+msgstr ""
+"如果为 [code]true[/code]，则 Forward 渲染器在不支持 Direct3D 12、Metal、"
+"Vulkan 时会回退到 OpenGL 3。\n"
+"[b]注意：[/b]该设置仅在 Windows、Android、macOS、iOS、Linux/X11 上实现。"
+
+msgid ""
+"If [code]true[/code], the forward renderer will fall back to Vulkan if "
+"Direct3D 12 (on Windows) or Metal (on macOS x86_64) are not supported. The "
+"fallback is always attempted regardless of this setting if Direct3D 12 "
+"(Windows) or Metal (macOS) driver support was disabled at compile time.\n"
+"[b]Note:[/b] This setting is implemented only on Windows and macOS."
+msgstr ""
+"如果为 [code]true[/code]，则 Forward 渲染器在不支持 Direct3D 12（在 Windows "
+"上）或 Metal（在 macOS x86_64 上）时会回退到 Vulkan。如果编译时禁用了 "
+"Direct3D 12（Windows）或 Metal（macOS）驱动程序支持，则会始终尝试回退，不考虑"
+"该设置。\n"
+"[b]注意：[/b]该设置仅在 Windows 和 macOS 上实现。"
+
 msgid ""
 "Enable the pipeline cache that is saved to disk if the graphics API supports "
 "it.\n"
@@ -117039,6 +120005,65 @@ msgid ""
 "value, the more often it is saved."
 msgstr "决定管线缓存保存到磁盘的间隔。值越低，保存地越频繁。"
 
+msgid ""
+"The size of a block allocated in the staging buffers. Staging buffers are the "
+"intermediate resources the engine uses to upload or download data to the GPU. "
+"This setting determines the max amount of data that can be transferred in a "
+"copy operation. Increasing this will result in faster data transfers at the "
+"cost of extra memory.\n"
+"[b]Note:[/b] This property is only read when the project starts. There is "
+"currently no way to change this value at run-time."
+msgstr ""
+"在暂存缓冲区中分配的块的大小。暂存缓冲区是引擎用于上传或下载数据到 GPU 的中间"
+"资源。该设置决定了在复制操作中可以传输的最大数据量。增大该值数据传输会变快，但"
+"会占用额外的内存。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取，目前没有办法在运行时更改。"
+
+msgid ""
+"The maximum amount of memory allowed to be used by staging buffers. If the "
+"amount of data being uploaded or downloaded exceeds this amount, the GPU will "
+"stall and wait for previous frames to finish.\n"
+"[b]Note:[/b] This property is only read when the project starts. There is "
+"currently no way to change this value at run-time."
+msgstr ""
+"暂存缓冲区允许使用的最大内存量。如果上传或下载的数据量超过该限制，GPU 会停滞，"
+"等待之前的帧完成。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取，目前没有办法在运行时更改。"
+
+msgid ""
+"The region size in pixels used to download texture data from the GPU when "
+"using methods like [method RenderingDevice.texture_get_data_async].\n"
+"[b]Note:[/b] This property's upper limit is controlled by [member rendering/"
+"rendering_device/staging_buffer/block_size_kb] and whether it's possible to "
+"allocate a single block of texture data with this region size in the format "
+"that is requested.\n"
+"[b]Note:[/b] This property is only read when the project starts. There is "
+"currently no way to change this value at run-time."
+msgstr ""
+"使用 [method RenderingDevice.texture_get_data_async] 等方法从 GPU 下载纹理数据"
+"时区域的大小，单位为像素。\n"
+"[b]注意：[/b]该属性的上限由 [member rendering/rendering_device/staging_buffer/"
+"block_size_kb] 控制，并且需要考虑是否可以使用请求的格式分配一个具有该区域大小"
+"的单个纹理数据块。\n"
+"[b]注意：[/b]该属性只在项目启动时读取，目前无法在运行时修改。"
+
+msgid ""
+"The region size in pixels used to upload texture data from the GPU when using "
+"methods like [method RenderingDevice.texture_update].\n"
+"[b]Note:[/b] This property's upper limit is controlled by [member rendering/"
+"rendering_device/staging_buffer/block_size_kb] and whether it's possible to "
+"allocate a single block of texture data with this region size in the format "
+"that is requested.\n"
+"[b]Note:[/b] This property is only read when the project starts. There is "
+"currently no way to change this value at run-time."
+msgstr ""
+"使用 [method RenderingDevice.texture_update] 等方法将纹理数据上传至 GPU 时区域"
+"的大小，单位为像素。\n"
+"[b]注意：[/b]该属性的上限由 [member rendering/rendering_device/staging_buffer/"
+"block_size_kb] 控制，并且需要考虑是否可以使用请求的格式分配一个具有该区域大小"
+"的单个纹理数据块。\n"
+"[b]注意：[/b]该属性只在项目启动时读取，目前无法在运行时修改。"
+
 msgid ""
 "The number of frames to track on the CPU side before stalling to wait for the "
 "GPU.\n"
@@ -117090,6 +120115,24 @@ msgstr ""
 "[b]注意：[/b]该属性仅在项目启动时读取。目前无法在运行时更改该值。\n"
 "[b]注意：[/b]某些平台可能会限制实际值。"
 
+msgid ""
+"The number of descriptors per pool. Godot's Vulkan backend uses linear pools "
+"for descriptors that will be created and destroyed within a single frame. "
+"Instead of destroying every single descriptor every frame, they all can be "
+"destroyed at once by resetting the pool they belong to.\n"
+"A larger number is more efficient up to a limit, after that it will only "
+"waste RAM (maximum efficiency is achieved when there is no more than 1 pool "
+"per frame). A small number could end up with one pool per descriptor, which "
+"negatively impacts performance.\n"
+"[b]Note:[/b] Changing this property requires a restart to take effect."
+msgstr ""
+"每个池的描述符数量。Godot 的 Vulkan 后端针对在同一帧中创建并销毁的描述符使用的"
+"是线性池。每帧中并不会对描述符进行逐一销毁，而是会通过重置描述符所属的池来统一"
+"销毁。\n"
+"并不是值越大效率越高，超出阈值后只会浪费内存（一帧最多只有一个池最高效）。数值"
+"低到极致就是一个描述符一个池，会对性能产生负面影响。\n"
+"[b]注意：[/b]修改该属性后需要重启才能生效。"
+
 msgid ""
 "Determines how sharp the upscaled image will be when using the FSR upscaling "
 "mode. Sharpness halves with every whole number. Values go from 0.0 (sharpest) "
@@ -117119,6 +120162,22 @@ msgstr ""
 "[b]注意：[/b]FSR 只在使用 Forward+ 渲染方式时有效，对 Mobile 或 Compatibility "
 "无效。如果使用不兼容的渲染方法，FSR 将回退到双线性缩放。"
 
+msgid ""
+"iOS override for [member rendering/scaling_3d/mode]. This allows selecting "
+"the MetalFX spatial and MetalFX temporal scaling modes, which are exclusive "
+"to platforms where the Metal rendering driver is used."
+msgstr ""
+"[member rendering/scaling_3d/mode] 针对 iOS 的覆盖项。允许选择 MetalFX 空间缩"
+"放和 MetalFX 时间缩放模式，这些模式仅适用于使用 Metal 渲染驱动程序的平台。"
+
+msgid ""
+"macOS override for [member rendering/scaling_3d/mode]. This allows selecting "
+"the MetalFX spatial and MetalFX temporal scaling modes, which are exclusive "
+"to platforms where the Metal rendering driver is used."
+msgstr ""
+"[member rendering/scaling_3d/mode] 针对 macOS 的覆盖项。允许选择 MetalFX 空间"
+"缩放和 MetalFX 时间缩放模式，这些模式仅适用于使用 Metal 渲染驱动程序的平台。"
+
 msgid ""
 "Scales the 3D render buffer based on the viewport size uses an image filter "
 "specified in [member rendering/scaling_3d/mode] to scale the output image to "
@@ -117196,6 +120255,49 @@ msgstr ""
 "别由 [member rendering/textures/default_filters/anisotropic_filtering_level] "
 "控制。"
 
+msgid ""
+"Sets the maximum number of samples to take when using anisotropic filtering "
+"on textures (as a power of two). A higher sample count will result in sharper "
+"textures at oblique angles, but is more expensive to compute. A value of "
+"[code]0[/code] forcibly disables anisotropic filtering, even on materials "
+"where it is enabled.\n"
+"The anisotropic filtering level also affects decals and light projectors if "
+"they are configured to use anisotropic filtering. See [member rendering/"
+"textures/decals/filter] and [member rendering/textures/light_projectors/"
+"filter].\n"
+"[b]Note:[/b] In 3D, for this setting to have an effect, set [member "
+"BaseMaterial3D.texture_filter] to [constant BaseMaterial3D."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] or [constant BaseMaterial3D."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] on materials.\n"
+"[b]Note:[/b] In 2D, for this setting to have an effect, set [member "
+"CanvasItem.texture_filter] to [constant CanvasItem."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] or [constant CanvasItem."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC] on the [CanvasItem] node "
+"displaying the texture (or in [CanvasTexture]). However, anisotropic "
+"filtering is rarely useful in 2D, so only enable it for textures in 2D if it "
+"makes a meaningful visual difference.\n"
+"[b]Note:[/b] This property is only read when the project starts. To change "
+"the anisotropic filtering level at runtime, set [member Viewport."
+"anisotropic_filtering_level] on the root [Viewport] instead."
+msgstr ""
+"设置在纹理上使用各向异性过滤时要采用的最大样本数（作为 2 的幂）。更高的采样数"
+"将导致倾斜角度的纹理更清晰，但计算成本更高。[code]0[/code] 的值会强制禁用各向"
+"异性过滤，即使在启用它的材质上也是如此。\n"
+"如果贴花和投影器被配置为使用各向异性过滤，则各向异性过滤级别也会影响它们。请参"
+"阅 [member rendering/textures/decals/filter] and [member rendering/textures/"
+"light_projectors/filter]。\n"
+"[b]注意：[/b]要使该设置在 3D 中生效，请在材质上将 [member BaseMaterial3D."
+"texture_filter] 设置为 [constant BaseMaterial3D."
+"TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] 或 [constant BaseMaterial3D."
+"TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC]。\n"
+"[b]注意：[/b]要使该设置在 2D 中生效，请在显示纹理的 [CanvasItem] 节点上（或 "
+"[CanvasTexture] 中）将 [member CanvasItem.texture_filter] 设置为 [constant "
+"CanvasItem.TEXTURE_FILTER_LINEAR_WITH_MIPMAPS_ANISOTROPIC] 或 [constant "
+"CanvasItem.TEXTURE_FILTER_NEAREST_WITH_MIPMAPS_ANISOTROPIC]。然而各向异性过滤"
+"在 2D 中并不实用，因此在 2D 中只有在它产生有意义的视觉差异时才对纹理启用它。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时更改各向异性过滤级别，请在根 "
+"[Viewport] 上设置 [member Viewport.anisotropic_filtering_level]。"
+
 msgid ""
 "Affects the final texture sharpness by reading from a lower or higher mipmap "
 "(also called \"texture LOD bias\"). Negative values make mipmapped textures "
@@ -117348,6 +120450,38 @@ msgstr ""
 "无损 WebP 的默认压缩系数。解压速度通常不受压缩系数的影响。支持的值为 0 到 "
 "100。"
 
+msgid ""
+"If [code]true[/code], enables [member Viewport.use_hdr_2d] on the root "
+"viewport. 2D rendering will use an high dynamic range (HDR) format "
+"framebuffer matching the bit depth of the 3D framebuffer. When using the "
+"Forward+ renderer this will be an [code]RGBA16[/code] framebuffer, while when "
+"using the Mobile renderer it will be an [code]RGB10_A2[/code] framebuffer. "
+"Additionally, 2D rendering will take place in linear color space and will be "
+"converted to sRGB space immediately before blitting to the screen. "
+"Practically speaking, this means that the end result of the Viewport will not "
+"be clamped into the [code]0-1[/code] range and can be used in 3D rendering "
+"without color space adjustments. This allows 2D rendering to take advantage "
+"of effects requiring high dynamic range (e.g. 2D glow) as well as "
+"substantially improves the appearance of effects requiring highly detailed "
+"gradients.\n"
+"[b]Note:[/b] This setting will have no effect when using the Compatibility "
+"renderer, which always renders in low dynamic range for performance reasons.\n"
+"[b]Note:[/b] This property is only read when the project starts. To toggle "
+"HDR 2D at runtime, set [member Viewport.use_hdr_2d] on the root [Viewport]."
+msgstr ""
+"如果为 [code]true[/code]，则在根视口上启用 [member Viewport.use_hdr_2d]。2D 渲"
+"染将使用与 3D 帧缓冲的位深度相匹配的高动态范围（HDR）格式的帧缓冲。使用 "
+"Forward+ 渲染器时为 [code]RGBA16[/code] 帧缓冲，使用 Mobile 渲染器时为 "
+"[code]RGB10_A2[/code] 帧缓冲。此外，2D 渲染将在线性色彩空间中进行，并将在传输"
+"到屏幕之前立即转换到 sRGB 空间。实际上，这意味着 Viewport 的最终结果不会被限制"
+"在 [code]0-1[/code] 范围内，无需调整色彩空间即可在 3D 渲染中使用。这使得 2D 渲"
+"染能够利用需要高动态范围的效果（例如 2D 辉光），并显著改善需要高度详细渐变的效"
+"果的外观。\n"
+"[b]注意：[/b]使用 Compatibility 渲染器时该设置不起作用，出于性能原因，该渲染器"
+"始终在低动态范围内渲染。\n"
+"[b]注意：[/b]该属性仅在项目启动时读取。要在运行时开关 HDR 2D，请在根 "
+"[Viewport] 上设置 [member Viewport.use_hdr_2d]。"
+
 msgid ""
 "If [code]true[/code], enables [member Viewport.transparent_bg] on the root "
 "viewport. This allows per-pixel transparency to be effective after also "
@@ -117446,15 +120580,98 @@ msgstr ""
 "指定 OpenXR 应如何混合环境。针对的是部分 AR 和穿透设备，XR 合成器会混合相机图"
 "像。"
 
+msgid ""
+"Specifies the message types for which we request debug messages. Requires "
+"[member xr/openxr/extensions/debug_utils] to be set and the extension to be "
+"supported by the XR runtime."
+msgstr ""
+"指定请求调试消息的消息类型。要求设置 [member xr/openxr/extensions/"
+"debug_utils] 并且 XR 运行时支持该扩展。"
+
+msgid ""
+"Enables debug utilities on XR runtimes that supports the debug utils "
+"extension. Sets the maximum severity being reported (0 = disabled, 1 = error, "
+"2 = warning, 3 = info, 4 = verbose)."
+msgstr ""
+"启用支持调试工具扩展的 XR 运行时的调试工具。设置报告的最大严重性（0 = 禁用、1 "
+"= 错误、2 = 警告、3 = 信息、4 = 冗长）。"
+
 msgid ""
 "Specify whether to enable eye tracking for this project. Depending on the "
 "platform, additional export configuration may be needed."
 msgstr "指定是否为该项目启用眼动追踪。根据平台的不同，可能需要额外的导出配置。"
 
+msgid ""
+"If [code]true[/code] the hand interaction profile extension will be activated "
+"if supported by the platform."
+msgstr "如果为 [code]true[/code]，平台支持时会激活手部交互配置扩展。"
+
+msgid ""
+"If [code]true[/code], the hand tracking extension is enabled if available.\n"
+"[b]Note:[/b] By default hand tracking will only work for data sources chosen "
+"by the XR runtime. For SteamVR this is the controller inferred data source, "
+"for most other runtimes this is the unobstructed data source. There is no way "
+"to query this. If a runtime supports the OpenXR data source extension you can "
+"use the [member xr/openxr/extensions/hand_tracking_controller_data_source] "
+"and/or [member xr/openxr/extensions/hand_tracking_unobstructed_data_source] "
+"to indicate you wish to enable these data sources. If neither is selected the "
+"data source extension is not enabled and the XR runtimes default behavior "
+"persists."
+msgstr ""
+"如果为 [code]true[/code]，则手部跟踪扩展可用时会将其启用。\n"
+"[b]注意：[/b]默认情况下，只有 XR 运行时选择的数据源才能用于手部跟踪。SteamVR "
+"中为控制器推测的数据源，大多数其他运行时为畅通数据源。无法对此进行查询。如果运"
+"行时支持 OpenXR 数据源扩展，就可以使用 [member xr/openxr/extensions/"
+"hand_tracking_controller_data_source] 和/或 [member xr/openxr/extensions/"
+"hand_tracking_unobstructed_data_source] 表示你希望启用这些数据源。如果两者均未"
+"选中则不会启用数据源扩展，XR 运行时会继续使用默认行为。"
+
+msgid ""
+"If [code]true[/code], support for the controller inferred data source is "
+"requested. If supported, you will receive hand tracking data even if the user "
+"has a controller in hand, with finger positions automatically inferred from "
+"controller input and/or sensors.\n"
+"[b]Node:[/b] This requires the OpenXR data source extension and controller "
+"inferred handtracking to be supported by the XR runtime. If not supported "
+"this setting will be ignored. [member xr/openxr/extensions/hand_tracking] "
+"must be enabled for this setting to be used."
+msgstr ""
+"如果为 [code]true[/code]，则会请求支持控制器推测的数据源。如果支持，即便用户手"
+"中持握控制器也能够接收到手部跟踪数据，手指的位置是根据控制器的输入和/或传感器"
+"自动推测的。\n"
+"[b]注意：[/b]需要 XR 运行时支持 OpenXR 数据源扩展和控制器推测手部跟踪。如果不"
+"支持就会忽略该设置项。必须启用 [member xr/openxr/extensions/hand_tracking] 才"
+"会使用该设置项。"
+
+msgid ""
+"If [code]true[/code], support for the unobstructed data source is requested. "
+"If supported, you will receive hand tracking data based on the actual finger "
+"positions of the user often determined by optical tracking.\n"
+"[b]Node:[/b] This requires the OpenXR data source extension and unobstructed "
+"handtracking to be supported by the XR runtime. If not supported this setting "
+"will be ignored. [member xr/openxr/extensions/hand_tracking] must be enabled "
+"for this setting to be used."
+msgstr ""
+"如果为 [code]true[/code]，则会请求畅通数据源。如果支持，你就会接收到基于用户实"
+"际手指位置的手部追踪数据，这些位置通常通过光学追踪来确定。\n"
+"[b]注意：[/b]需要 XR 运行时支持 OpenXR 数据源扩展和畅通手部跟踪。如果不支持就"
+"会忽略该设置项。必须启用 [member xr/openxr/extensions/hand_tracking] 才会使用"
+"该设置项。"
+
 msgid ""
 "Specify whether OpenXR should be configured for an HMD or a hand held device."
 msgstr "指定是否应为 HMD 或手持设备配置 OpenXR。"
 
+msgid ""
+"If [code]true[/code] and foveation is supported, will automatically adjust "
+"foveation level based on framerate up to the level set on [member xr/openxr/"
+"foveation_level].\n"
+"[b]Note:[/b] Only works on the Compatibility rendering method."
+msgstr ""
+"如果为 [code]true[/code] 并且支持注视点，将根据帧速率自动调整注视点级别，直至"
+"达到 [member xr/openxr/foveation_level] 上设置的级别。\n"
+"[b]注意：[/b]仅适用于兼容性渲染方法。"
+
 msgid ""
 "Applied foveation level if supported: 0 = off, 1 = low, 2 = medium, 3 = "
 "high.\n"
@@ -119537,10 +122754,24 @@ msgid ""
 "source_tesselation_control], [member source_tesselation_evaluation] or "
 "[member source_vertex]."
 msgstr ""
-"返回指定着色器阶段 [param stage] 的源代码。等价于获取 [member "
+"返回着色器阶段 [param stage] 的源代码。等价于获取 [member source_compute]、"
+"[member source_fragment]、[member source_tesselation_control]、[member "
+"source_tesselation_evaluation] 或 [member source_vertex]。"
+
+msgid ""
+"Sets [param source] code for the specified shader [param stage]. Equivalent "
+"to setting one of [member source_compute], [member source_fragment], [member "
+"source_tesselation_control], [member source_tesselation_evaluation] or "
+"[member source_vertex].\n"
+"[b]Note:[/b] If you set the compute shader source code using this method "
+"directly, remember to remove the Godot-specific hint [code]#[compute][/code]."
+msgstr ""
+"设置着色器阶段 [param stage] 的源代码 [param source]。等价于设置 [member "
 "source_compute]、[member source_fragment]、[member "
 "source_tesselation_control]、[member source_tesselation_evaluation] 或 "
-"[member source_vertex]。"
+"[member source_vertex]。\n"
+"[b]注意：[/b]如果直接使用该方法设置计算着色器的源代码，请记得移除 Godot 专有"
+"的 [code]#[compute][/code] 提示。"
 
 msgid "The language the shader is written in."
 msgstr "着色器的编写语言。"
@@ -119796,6 +123027,25 @@ msgstr "Uniform 的数据类型。"
 msgid "Vertex attribute (used by [RenderingDevice])."
 msgstr "顶点属性（由 [RenderingDevice] 使用）。"
 
+msgid "The way that this attribute's data is interpreted when sent to a shader."
+msgstr "将属性数据发送至着色器时，对该数据的解释方式。"
+
+msgid "The rate at which this attribute is pulled from its vertex buffer."
+msgstr "从顶点缓冲中拉取该属性的频率。"
+
+msgid "The location in the shader that this attribute is bound to."
+msgstr "该属性在着色器中绑定的位置。"
+
+msgid ""
+"The number of bytes between the start of the vertex buffer and the first "
+"instance of this attribute."
+msgstr "顶点缓冲起点与该属性的第一个实例之间的字节数。"
+
+msgid ""
+"The number of bytes between the starts of consecutive instances of this "
+"attribute."
+msgstr "该属性相邻两个实例之间的字节数。"
+
 msgid "A 2D axis-aligned bounding box using floating-point coordinates."
 msgstr "使用浮点数坐标的 2D 轴对齐边界框。"
 
@@ -119932,6 +123182,13 @@ msgid ""
 "+ (size / 2.0)[/code]."
 msgstr "返回该矩形的中心点。这与 [code]position + (size / 2.0)[/code] 相同。"
 
+msgid ""
+"Returns the vertex's position of this rect that's the farthest in the given "
+"direction. This point is commonly known as the support point in collision "
+"detection algorithms."
+msgstr ""
+"返回给定方向上最远的矩形框的顶点位置。该点在碰撞检测算法中通常被称为支撑点。"
+
 msgid ""
 "Returns a copy of this rectangle extended on all sides by the given [param "
 "amount]. A negative [param amount] shrinks the rectangle instead. See also "
@@ -120556,6 +123813,9 @@ msgstr ""
 "和其他 [ReflectionProbe] 和场景（[ReflectionProbe] 的大小为 [member size] 的框"
 "之外）的其他部分进行平滑混合。"
 
+msgid "Defines the distance in meters over which a probe blends into the scene."
+msgstr "定义探针融入场景的距离，单位为米。"
+
 msgid ""
 "If [code]true[/code], enables box projection. This makes reflections look "
 "more correct in rectangle-shaped rooms by offsetting the reflection center "
@@ -121100,6 +124360,11 @@ msgid ""
 "being used to render this viewport."
 msgstr "返回 [RenderingServer] 中用来渲染这个视口的相机属性对象的 [RID]。"
 
+msgid ""
+"Returns the [RID] of the environment object in the [RenderingServer] being "
+"used to render this viewport."
+msgstr "返回用于渲染该视口的 [RenderingServer] 中环境对象的 [RID]。"
+
 msgid ""
 "Returns the [RenderSceneBuffers] object managing the scene buffers for "
 "rendering this viewport."
@@ -121242,6 +124507,70 @@ msgstr ""
 "- 绘制列表当前处于活动状态（由 [method draw_list_begin] 创建）\n"
 "- 计算列表当前处于活动状态（由 [method compute_list_begin] 创建）"
 
+msgid ""
+"Returns a copy of the data of the specified [param buffer], optionally [param "
+"offset_bytes] and [param size_bytes] can be set to copy only a portion of the "
+"buffer.\n"
+"[b]Note:[/b] This method will block the GPU from working until the data is "
+"retrieved. Refer to [method buffer_get_data_async] for an alternative that "
+"returns the data in more performant way."
+msgstr ""
+"返回指定 [param buffer] 中数据的副本，还可以设置 [param offset_bytes] 和 "
+"[param size_bytes]，仅复制缓冲区的某一部分。\n"
+"[b]注意：[/b]该方法将在获取到数据前阻塞 GPU 的工作。请参考 [method "
+"buffer_get_data_async]，该方法可以更高效地返回数据。"
+
+msgid ""
+"Asynchronous version of [method buffer_get_data]. RenderingDevice will call "
+"[param callback] in a certain amount of frames with the data the buffer had "
+"at the time of the request.\n"
+"[b]Note:[/b] At the moment, the delay corresponds to the amount of frames "
+"specified by [member ProjectSettings.rendering/rendering_device/vsync/"
+"frame_queue_size].\n"
+"[b]Note:[/b] Downloading large buffers can have a prohibitive cost for real-"
+"time even when using the asynchronous method due to hardware bandwidth "
+"limitations. When dealing with large resources, you can adjust settings such "
+"as [member ProjectSettings.rendering/rendering_device/staging_buffer/"
+"block_size_kb] to improve the transfer speed at the cost of extra memory.\n"
+"[codeblock]\n"
+"func _buffer_get_data_callback(array):\n"
+"    value = array.decode_u32(0)\n"
+"\n"
+"...\n"
+"\n"
+"rd.buffer_get_data_async(buffer, _buffer_get_data_callback)\n"
+"[/codeblock]"
+msgstr ""
+"[method buffer_get_data] 的异步版本。RenderingDevice 将在一定帧数内调用 "
+"[param callback]，提供请求时缓冲中的数据。\n"
+"[b]注意：[/b]目前延迟对应 [member ProjectSettings.rendering/rendering_device/"
+"vsync/frame_queue_size] 中指定的帧数。\n"
+"[b]注意：[/b]下载较大的缓冲可能会因硬件带宽限制而对实时性能产生巨大的影响，即"
+"便使用异步方法也是如此。在处理大型资源时，你可以调整 [member ProjectSettings."
+"rendering/rendering_device/staging_buffer/block_size_kb] 等设置，用额外的内存"
+"换取传输速度的提升。\n"
+"[codeblock]\n"
+"func _buffer_get_data_callback(array):\n"
+"    value = array.decode_u32(0)\n"
+"\n"
+"...\n"
+"\n"
+"rd.buffer_get_data_async(buffer, _buffer_get_data_callback)\n"
+"[/codeblock]"
+
+msgid ""
+"Returns the address of the given [param buffer] which can be passed to "
+"shaders in any way to access underlying data. Buffer must have been created "
+"with this feature enabled.\n"
+"[b]Note:[/b] You must check that the GPU supports this functionality by "
+"calling [method has_feature] with [constant SUPPORTS_BUFFER_DEVICE_ADDRESS] "
+"as a parameter."
+msgstr ""
+"返回缓冲区 [param buffer] 的地址，该地址可以以任何方式传递给着色器，从而访问底"
+"层数据。创建缓冲区时必须启用该功能。\n"
+"[b]注意：[/b]你必须通过调用 [method has_feature] 并将 [constant "
+"SUPPORTS_BUFFER_DEVICE_ADDRESS] 作为参数传递来检查 GPU 是否支持此功能。"
+
 msgid ""
 "Updates a region of [param size_bytes] bytes, starting at [param offset], in "
 "the buffer, with the specified [param data].\n"
@@ -121423,6 +124752,103 @@ msgstr ""
 msgid "Inserting labels no longer applies due to command reordering."
 msgstr "由于命令重新排序，插入标签不再适用。"
 
+msgid ""
+"Starts a list of raster drawing commands created with the [code]draw_*[/code] "
+"methods. The returned value should be passed to other [code]draw_list_*[/"
+"code] functions.\n"
+"Multiple draw lists cannot be created at the same time; you must finish the "
+"previous draw list first using [method draw_list_end].\n"
+"A simple drawing operation might look like this (code is not a complete "
+"example):\n"
+"[codeblock]\n"
+"var rd = RenderingDevice.new()\n"
+"var clear_colors = PackedColorArray([Color(0, 0, 0, 0), Color(0, 0, 0, 0), "
+"Color(0, 0, 0, 0)])\n"
+"var draw_list = rd.draw_list_begin(framebuffers[i], RenderingDevice."
+"CLEAR_COLOR_ALL, clear_colors, true, 1.0f, true, 0, Rect2(), RenderingDevice."
+"OPAQUE_PASS)\n"
+"\n"
+"# Draw opaque.\n"
+"rd.draw_list_bind_render_pipeline(draw_list, raster_pipeline)\n"
+"rd.draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0)\n"
+"rd.draw_list_set_push_constant(draw_list, raster_push_constant, "
+"raster_push_constant.size())\n"
+"rd.draw_list_draw(draw_list, false, 1, slice_triangle_count[i] * 3)\n"
+"# Draw wire.\n"
+"rd.draw_list_bind_render_pipeline(draw_list, raster_pipeline_wire)\n"
+"rd.draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0)\n"
+"rd.draw_list_set_push_constant(draw_list, raster_push_constant, "
+"raster_push_constant.size())\n"
+"rd.draw_list_draw(draw_list, false, 1, slice_triangle_count[i] * 3)\n"
+"\n"
+"rd.draw_list_end()\n"
+"[/codeblock]\n"
+"The [param draw_flags] indicates if the texture attachments of the "
+"framebuffer should be cleared or ignored. Only one of the two flags can be "
+"used for each individual attachment. Ignoring an attachment means that any "
+"contents that existed before the draw list will be completely discarded, "
+"reducing the memory bandwidth used by the render pass but producing garbage "
+"results if the pixels aren't replaced. The default behavior allows the engine "
+"to figure out the right operation to use if the texture is discardable, which "
+"can result in increased performance. See [RDTextureFormat] or [method "
+"texture_set_discardable].\n"
+"The [param breadcrumb] parameter can be an arbitrary 32-bit integer that is "
+"useful to diagnose GPU crashes. If Godot is built in dev or debug mode; when "
+"the GPU crashes Godot will dump all shaders that were being executed at the "
+"time of the crash and the breadcrumb is useful to diagnose what passes did "
+"those shaders belong to.\n"
+"It does not affect rendering behavior and can be set to 0. It is recommended "
+"to use [enum BreadcrumbMarker] enumerations for consistency but it's not "
+"required. It is also possible to use bitwise operations to add extra data. e."
+"g.\n"
+"[codeblock]\n"
+"rd.draw_list_begin(fb[i], RenderingDevice.CLEAR_COLOR_ALL, clear_colors, "
+"true, 1.0f, true, 0, Rect2(), RenderingDevice.OPAQUE_PASS | 5)\n"
+"[/codeblock]"
+msgstr ""
+"开始栅格绘图命令列表，命令由 [code]draw_*[/code] 方法创建。返回值应当传递给其"
+"他 [code]draw_list_*[/code] 函数。\n"
+"同一时间无法创建多个绘图列表；必须先使用 [method draw_list_end] 结束之前的绘图"
+"列表。\n"
+"简易绘图操作类似这样（代码并非完整示例）：\n"
+"[codeblock]\n"
+"var rd = RenderingDevice.new()\n"
+"var clear_colors = PackedColorArray([Color(0, 0, 0, 0), Color(0, 0, 0, 0), "
+"Color(0, 0, 0, 0)])\n"
+"var draw_list = rd.draw_list_begin(framebuffers[i], RenderingDevice."
+"CLEAR_COLOR_ALL, clear_colors, true, 1.0f, true, 0, Rect2(), RenderingDevice."
+"OPAQUE_PASS)\n"
+"\n"
+"# 实心绘图。\n"
+"rd.draw_list_bind_render_pipeline(draw_list, raster_pipeline)\n"
+"rd.draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0)\n"
+"rd.draw_list_set_push_constant(draw_list, raster_push_constant, "
+"raster_push_constant.size())\n"
+"rd.draw_list_draw(draw_list, false, 1, slice_triangle_count[i] * 3)\n"
+"# 线框绘图。\n"
+"rd.draw_list_bind_render_pipeline(draw_list, raster_pipeline_wire)\n"
+"rd.draw_list_bind_uniform_set(draw_list, raster_base_uniform, 0)\n"
+"rd.draw_list_set_push_constant(draw_list, raster_push_constant, "
+"raster_push_constant.size())\n"
+"rd.draw_list_draw(draw_list, false, 1, slice_triangle_count[i] * 3)\n"
+"\n"
+"rd.draw_list_end()\n"
+"[/codeblock]\n"
+"[param draw_flags] 表示应将帧缓冲的纹理附件清空还是忽略。每个独立的附件都只能"
+"在这两个标志中二选一。忽略附件就是完全丢弃绘图列表之前已存在的内容，能够降低渲"
+"染阶段所使用的内存带宽，但如果没有对像素进行替换就会出现垃圾结果。默认行为能够"
+"让引擎判断纹理可丢弃时的正确操作，可以提升性能。见 [RDTextureFormat] 或 "
+"[method texture_set_discardable]。\n"
+"面包屑参数 [param breadcrumb] 可以是任意 32 位整数，适用于诊断 GPU 崩溃。如果 "
+"Godot 使用开发模式或调试模式构建，GPU 崩溃时 Godot 就会转储崩溃时正在执行的所"
+"有着色器，可以使用面包屑来诊断这些着色器分别属于哪个阶段。\n"
+"该参数不会影响渲染行为，可以设为 0。建议使用 [enum BreadcrumbMarker] 枚举保持"
+"一致，不过不强制。还可以使用按位操作添加额外的数据。例如：\n"
+"[codeblock]\n"
+"rd.draw_list_begin(fb[i], RenderingDevice.CLEAR_COLOR_ALL, clear_colors, "
+"true, 1.0f, true, 0, Rect2(), RenderingDevice.OPAQUE_PASS | 5)\n"
+"[/codeblock]"
+
 msgid ""
 "High-level variant of [method draw_list_begin], with the parameters "
 "automatically being adjusted for drawing onto the window specified by the "
@@ -121475,6 +124901,19 @@ msgstr ""
 "将 [param draw_list] 提交给 GPU 渲染。相当于是栅格版本的 [method "
 "compute_list_dispatch]。"
 
+msgid ""
+"Submits [param draw_list] for rendering on the GPU with the given parameters "
+"stored in the [param buffer] at [param offset]. Parameters being integers: "
+"vertex count, instance count, first vertex, first instance. And when using "
+"indices: index count, instance count, first index, vertex offset, first "
+"instance. Buffer must have been created with [constant "
+"STORAGE_BUFFER_USAGE_DISPATCH_INDIRECT] flag."
+msgstr ""
+"将 [param draw_list] 提交给 GPU 处理，参数位于缓冲区 [param buffer] 的偏移 "
+"[param offset] 处。参数为整数：顶点数、实例数、首个顶点、首个实例。使用索引时"
+"则为：索引数、实例数、首个索引、顶点偏移、首个实例。创建缓冲区时必须使用 "
+"[constant STORAGE_BUFFER_USAGE_DISPATCH_INDIRECT] 标志。"
+
 msgid ""
 "Creates a scissor rectangle and enables it for the specified [param "
 "draw_list]. Scissor rectangles are used for clipping by discarding fragments "
@@ -121737,6 +125176,37 @@ msgstr ""
 "0。\n"
 "只有调试构建下的 Vulkan 会用到，未跟踪此信息或信息未知时可能返回 0。"
 
+msgid ""
+"Returns string report in CSV format using the following methods:\n"
+"- [method get_tracked_object_name]\n"
+"- [method get_tracked_object_type_count]\n"
+"- [method get_driver_total_memory]\n"
+"- [method get_driver_allocation_count]\n"
+"- [method get_driver_memory_by_object_type]\n"
+"- [method get_driver_allocs_by_object_type]\n"
+"- [method get_device_total_memory]\n"
+"- [method get_device_allocation_count]\n"
+"- [method get_device_memory_by_object_type]\n"
+"- [method get_device_allocs_by_object_type]\n"
+"This is only used by Vulkan in debug builds. Godot must also be started with "
+"the [code]--extra-gpu-memory-tracking[/code] [url=$DOCS_URL/tutorials/editor/"
+"command_line_tutorial.html]command line argument[/url]."
+msgstr ""
+"返回 CSV 格式的报告字符串，使用以下方法：\n"
+"- [method get_tracked_object_name]\n"
+"- [method get_tracked_object_type_count]\n"
+"- [method get_driver_total_memory]\n"
+"- [method get_driver_allocation_count]\n"
+"- [method get_driver_memory_by_object_type]\n"
+"- [method get_driver_allocs_by_object_type]\n"
+"- [method get_device_total_memory]\n"
+"- [method get_device_allocation_count]\n"
+"- [method get_device_memory_by_object_type]\n"
+"- [method get_device_allocs_by_object_type]\n"
+"仅在调试构建中由 Vulkan 使用，同时 Godot 必须使用 [code]--extra-gpu-memory-"
+"tracking[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]命"
+"令行参数[/url]启动。"
+
 msgid ""
 "Same as [method get_driver_total_memory] but filtered for a given object "
 "type.\n"
@@ -121795,6 +125265,57 @@ msgid ""
 "frame."
 msgstr "返回上一帧的性能报告字符串。每一帧都会更新。"
 
+msgid ""
+"Returns the name of the type of object for the given [param type_index]. This "
+"value must be in range [code][0; get_tracked_object_type_count - 1][/code]. "
+"If [method get_tracked_object_type_count] is 0, then type argument is ignored "
+"and always returns the same string.\n"
+"The return value is important because it gives meaning to the types passed to "
+"[method get_driver_memory_by_object_type], [method "
+"get_driver_allocs_by_object_type], [method get_device_memory_by_object_type], "
+"and [method get_device_allocs_by_object_type]. Examples of strings it can "
+"return (not exhaustive):\n"
+"- DEVICE_MEMORY\n"
+"- PIPELINE_CACHE\n"
+"- SWAPCHAIN_KHR\n"
+"- COMMAND_POOL\n"
+"Thus if e.g. [code]get_tracked_object_name(5)[/code] returns "
+"\"COMMAND_POOL\", then [code]get_device_memory_by_object_type(5)[/code] "
+"returns the bytes used by the GPU for command pools.\n"
+"This is only used by Vulkan in debug builds. Godot must also be started with "
+"the [code]--extra-gpu-memory-tracking[/code] [url=$DOCS_URL/tutorials/editor/"
+"command_line_tutorial.html]command line argument[/url]."
+msgstr ""
+"返回类索引 [param type_index] 对应的对象类型名称。该值必须在 [code][0; "
+"get_tracked_object_type_count - 1][/code] 范围内。如果 [method "
+"get_tracked_object_type_count] 为 0，则会忽略类型参数，始终返回相同的字符"
+"串。\n"
+"返回值的重要性在于它为传递给 [method get_driver_memory_by_object_type]、"
+"[method get_driver_allocs_by_object_type]、[method "
+"get_device_memory_by_object_type]、[method get_device_allocs_by_object_type] "
+"的类型赋予了含义。能够返回的字符串示例（不限于以下示例）：\n"
+"- DEVICE_MEMORY\n"
+"- PIPELINE_CACHE\n"
+"- SWAPCHAIN_KHR\n"
+"- COMMAND_POOL\n"
+"因此，如果 [code]get_tracked_object_name(5)[/code] 返回的是“COMMAND_POOL”，那"
+"么 [code]get_device_memory_by_object_type(5)[/code] 返回的就是 GPU 为命令池所"
+"使用的字节数。\n"
+"该函数仅在调试构建中由 Vulkan 使用。Godot 也必须使用 [code]--extra-gpu-memory-"
+"tracking[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]命"
+"令行参数[/url]启动。"
+
+msgid ""
+"Returns how many types of trackable objects are.\n"
+"This is only used by Vulkan in debug builds. Godot must also be started with "
+"the [code]--extra-gpu-memory-tracking[/code] [url=$DOCS_URL/tutorials/editor/"
+"command_line_tutorial.html]command line argument[/url]."
+msgstr ""
+"返回可追踪对象的类型数量。\n"
+"仅在调试构建中由 Vulkan 使用。Godot 也必须使用 [code]--extra-gpu-memory-"
+"tracking[/code] [url=$DOCS_URL/tutorials/editor/command_line_tutorial.html]命"
+"令行参数[/url]启动。"
+
 msgid ""
 "Returns [code]true[/code] if the [param feature] is supported by the GPU."
 msgstr "如果 GPU 支持 [param feature] 特性，则返回 [code]true[/code]。"
@@ -121807,6 +125328,15 @@ msgstr ""
 "新建索引数组。可以通过返回的 RID 进行访问。\n"
 "RID 使用结束后，应该使用 RenderingServer 的 [method free_rid] 方法进行释放。"
 
+msgid ""
+"Creates a new index buffer. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method."
+msgstr ""
+"新建索引缓冲。可以通过返回的 RID 进行访问。\n"
+"RID 使用结束后，应该使用 RenderingServer 的 [method free_rid] 方法进行释放。"
+
 msgid ""
 "Returns the value of the specified [param limit]. This limit varies depending "
 "on the current graphics hardware (and sometimes the driver version). If the "
@@ -122136,6 +125666,93 @@ msgid ""
 msgstr ""
 "使用指定的 [param view] 和 [param with_texture] 中的纹理信息创建共享纹理。"
 
+msgid ""
+"Creates a shared texture using the specified [param view] and the texture "
+"information from [param with_texture]'s [param layer] and [param mipmap]. The "
+"number of included mipmaps from the original texture can be controlled using "
+"the [param mipmaps] parameter. Only relevant for textures with multiple "
+"layers, such as 3D textures, texture arrays and cubemaps. For single-layer "
+"textures, use [method texture_create_shared].\n"
+"For 2D textures (which only have one layer), [param layer] must be [code]0[/"
+"code].\n"
+"[b]Note:[/b] Layer slicing is only supported for 2D texture arrays, not 3D "
+"textures or cubemaps."
+msgstr ""
+"使用视图 [param view] 和纹理 [param with_texture] 中 [param layer] 和 [param "
+"mipmap] 的信息创建共享纹理。包含的原始纹理中的 mipmap 数可以使用 [param "
+"mipmaps] 参数控制。仅适用于 3D 纹理、纹理数组、立方体贴图等多层纹理。单层纹理"
+"请使用 [method texture_create_shared]。\n"
+"如果是 2D 纹理（只有一层），则 [param layer] 必须为 [code]0[/code]。\n"
+"[b]注意：[/b]只有 2D 纹理数组支持层切片，3D 纹理和立方体贴图不支持。"
+
+msgid ""
+"Returns the [param texture] data for the specified [param layer] as raw "
+"binary data. For 2D textures (which only have one layer), [param layer] must "
+"be [code]0[/code].\n"
+"[b]Note:[/b] [param texture] can't be retrieved while a draw list that uses "
+"it as part of a framebuffer is being created. Ensure the draw list is "
+"finalized (and that the color/depth texture using it is not set to [constant "
+"FINAL_ACTION_CONTINUE]) to retrieve this texture. Otherwise, an error is "
+"printed and a empty [PackedByteArray] is returned.\n"
+"[b]Note:[/b] [param texture] requires the [constant "
+"TEXTURE_USAGE_CAN_COPY_FROM_BIT] to be retrieved. Otherwise, an error is "
+"printed and a empty [PackedByteArray] is returned.\n"
+"[b]Note:[/b] This method will block the GPU from working until the data is "
+"retrieved. Refer to [method texture_get_data_async] for an alternative that "
+"returns the data in more performant way."
+msgstr ""
+"将纹理 [param texture] 中指定层 [param layer] 的纹理数据以原始二进制数据的形式"
+"返回。2D 纹理（只有一层）的 [param layer] 必须为 [code]0[/code]。\n"
+"[b]注意：[/b]如果使用 [param texture] 纹理的绘图列表是创建的帧缓冲的一部分，则"
+"无法获取。请确保绘图列表已经完成（并且使用它的颜色/深度纹理没有设置为 "
+"[constant FINAL_ACTION_CONTINUE]），然后获取纹理。否则会输出错误并返回空的 "
+"[PackedByteArray]。\n"
+"[b]注意：[/b][param texture] 纹理需要获取 [constant "
+"TEXTURE_USAGE_CAN_COPY_FROM_BIT]。否则会输出错误并返回空的 "
+"[PackedByteArray]。\n"
+"[b]注意：[/b]该方法将在获取到数据前阻塞 GPU 的工作。请参考 [method "
+"texture_get_data_async]，该方法可以更高效地返回数据。"
+
+msgid ""
+"Asynchronous version of [method texture_get_data]. RenderingDevice will call "
+"[param callback] in a certain amount of frames with the data the texture had "
+"at the time of the request.\n"
+"[b]Note:[/b] At the moment, the delay corresponds to the amount of frames "
+"specified by [member ProjectSettings.rendering/rendering_device/vsync/"
+"frame_queue_size].\n"
+"[b]Note:[/b] Downloading large textures can have a prohibitive cost for real-"
+"time even when using the asynchronous method due to hardware bandwidth "
+"limitations. When dealing with large resources, you can adjust settings such "
+"as [member ProjectSettings.rendering/rendering_device/staging_buffer/"
+"texture_download_region_size_px] and [member ProjectSettings.rendering/"
+"rendering_device/staging_buffer/block_size_kb] to improve the transfer speed "
+"at the cost of extra memory.\n"
+"[codeblock]\n"
+"func _texture_get_data_callback(array):\n"
+"    value = array.decode_u32(0)\n"
+"\n"
+"...\n"
+"\n"
+"rd.texture_get_data_async(texture, 0, _texture_get_data_callback)\n"
+"[/codeblock]"
+msgstr ""
+"[method texture_get_data] 的异步版本。RenderingDevice 将在一定帧数内调用 "
+"[param callback]，提供请求时纹理中的数据。\n"
+"[b]注意：[/b]目前延迟对应 [member ProjectSettings.rendering/rendering_device/"
+"vsync/frame_queue_size] 中指定的帧数。\n"
+"[b]注意：[/b]下载较大的纹理可能会因硬件带宽限制而对实时性能产生巨大的影响，即"
+"便使用异步方法也是如此。在处理大型资源时，你可以调整 [member ProjectSettings."
+"rendering/rendering_device/staging_buffer/block_size_kb] 等设置，用额外的内存"
+"换取传输速度的提升。\n"
+"[codeblock]\n"
+"func _texture_get_data_callback(array):\n"
+"    value = array.decode_u32(0)\n"
+"\n"
+"...\n"
+"\n"
+"rd.texture_get_data_async(texture, 0, _texture_get_data_callback)\n"
+"[/codeblock]"
+
 msgid "Returns the data format used to create this texture."
 msgstr "返回用于创建该纹理的数据格式。"
 
@@ -122155,6 +125772,13 @@ msgstr ""
 "[b]注意：[/b]这个函数返回的是 [code]uint64_t[/code]，内部映射到 [code]GLuint[/"
 "code]（OpenGL）或 [code]VkImage[/code]（Vulkan）。"
 
+msgid ""
+"Returns [code]true[/code] if the [param texture] is discardable, [code]false[/"
+"code] otherwise. See [RDTextureFormat] or [method texture_set_discardable]."
+msgstr ""
+"如果 [param texture] 可丢弃，则返回 [code]true[/code]，否则返回 [code]false[/"
+"code]。见 [RDTextureFormat] 或 [method texture_set_discardable]。"
+
 msgid ""
 "Returns [code]true[/code] if the specified [param format] is supported for "
 "the given [param usage_flags], [code]false[/code] otherwise."
@@ -122220,6 +125844,21 @@ msgstr ""
 "[b]注意：[/b][param from_texture] 纹理必须[b]不能[/b]是多重采样，并且必须为 "
 "2D 纹理（或者是 3D/立方体贴图纹理的切片）。"
 
+msgid ""
+"Updates the discardable property of [param texture].\n"
+"If a texture is discardable, its contents do not need to be preserved between "
+"frames. This flag is only relevant when the texture is used as target in a "
+"draw list.\n"
+"This information is used by [RenderingDevice] to figure out if a texture's "
+"contents can be discarded, eliminating unnecessary writes to memory and "
+"boosting performance."
+msgstr ""
+"更新纹理 [param texture] 的可丢弃属性。\n"
+"如果纹理可丢弃，则其内容不需要在帧与帧之间持久化。纹理用作绘图列表中的目标时，"
+"该标志才有意义。\n"
+"[RenderingDevice] 会通过该信息判断纹理的内容是否可丢弃，从而消除不必要的内存写"
+"操作，提升性能。"
+
 msgid ""
 "Updates texture data with new data, replacing the previous data in place. The "
 "updated texture data must have the same dimensions and format. For 2D "
@@ -122246,6 +125885,15 @@ msgstr ""
 "[b]注意：[/b][param texture] 纹理需要获取 [constant "
 "TEXTURE_USAGE_CAN_UPDATE_BIT]。"
 
+msgid ""
+"Creates a new uniform buffer. It can be accessed with the RID that is "
+"returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method."
+msgstr ""
+"新建 uniform 缓冲。可以通过返回的 RID 进行访问。\n"
+"RID 使用结束后，应该使用 RenderingDevice 的 [method free_rid] 方法进行释放。"
+
 msgid ""
 "Creates a new uniform set. It can be accessed with the RID that is returned.\n"
 "Once finished with your RID, you will want to free the RID using the "
@@ -122264,6 +125912,14 @@ msgstr ""
 "根据给定的缓冲区创建顶点数组。还可以为各个缓冲区定义偏移量 [param offsets]（单"
 "位为字节）。"
 
+msgid ""
+"It can be accessed with the RID that is returned.\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingDevice's [method free_rid] method."
+msgstr ""
+"以通过返回的 RID 进行访问。\n"
+"RID 使用结束后，应该使用 RenderingServer 的 [method free_rid] 方法进行释放。"
+
 msgid ""
 "Creates a new vertex format with the specified [param vertex_descriptions]. "
 "Returns a unique vertex format ID corresponding to the newly created vertex "
@@ -126216,6 +129872,17 @@ msgstr ""
 "设置将受此光影响的对象的 Z 范围。相当于 [member Light2D.range_z_min] 和 "
 "[member Light2D.range_z_max]。"
 
+msgid ""
+"Transforms both the current and previous stored transform for a canvas "
+"light.\n"
+"This allows transforming a light without creating a \"glitch\" in the "
+"interpolation, which is particularly useful for large worlds utilizing a "
+"shifting origin."
+msgstr ""
+"同时变换画布灯光的当前变换和之前存储的变换。\n"
+"这样插值就可以在变换灯光的同时不产生“突变”，对于利用原点移位的大型世界特别有"
+"用。"
+
 msgid ""
 "Creates a new light occluder polygon and adds it to the RenderingServer. It "
 "can be accessed with the RID that is returned. This RID will be used in all "
@@ -126366,6 +130033,18 @@ msgstr ""
 "设置指定合成器 RID 的合成器效果。[param effects] 应该是一个包含使用 [method "
 "compositor_effect_create] 创建的 RID 的数组。"
 
+msgid ""
+"Creates a RenderingDevice that can be used to do draw and compute operations "
+"on a separate thread. Cannot draw to the screen nor share data with the "
+"global RenderingDevice.\n"
+"[b]Note:[/b] When using the OpenGL rendering driver or when running in "
+"headless mode, this function always returns [code]null[/code]."
+msgstr ""
+"创建一个 RenderingDevice，可以用来在单独的线程上进行绘制和计算操作。不能绘制到"
+"屏幕上，也不能与全局的 RenderingDevice 共享数据。\n"
+"[b]注意：[/b]使用 OpenGL 渲染驱动或在无头模式下运行时，这个函数始终返回 "
+"[code]null[/code] 。"
+
 msgid ""
 "Returns the bounding rectangle for a canvas item in local space, as "
 "calculated by the renderer. This bound is used internally for culling.\n"
@@ -126574,6 +130253,9 @@ msgstr "场景中清屏区域的颜色。仅在使用 [constant ENV_BG_COLOR] 
 msgid "Sets the intensity of the background color."
 msgstr "设置背景颜色的强度。"
 
+msgid "Sets the camera ID to be used as environment background."
+msgstr "设置用作环境背景的相机 ID。"
+
 msgid "Sets the maximum layer to use if using Canvas background mode."
 msgstr "如果使用画布背景模式，设置要使用的最大层数。"
 
@@ -127230,6 +130912,14 @@ msgstr ""
 "设置给定几何实例的可见性范围值。相当于 [member GeometryInstance3D."
 "visibility_range_begin] 和相关属性。"
 
+msgid ""
+"Prevents physics interpolation for the current physics tick.\n"
+"This is useful when moving an instance to a new location, to give an "
+"instantaneous change rather than interpolation from the previous location."
+msgstr ""
+"在当前物理周期阻止物理插值。\n"
+"适用于将实例移动到新位置的场合，可以产生瞬时变化，而不是从先前位置进行插值。"
+
 msgid ""
 "Sets the base of the instance. A base can be any of the 3D objects that are "
 "created in the RenderingServer that can be displayed. For example, any of the "
@@ -127478,6 +131168,14 @@ msgstr ""
 "如果为 [code]true[/code]，则灯光会投射阴影。相当于 [member Light3D."
 "shadow_enabled]。"
 
+msgid ""
+"Sets the shadow caster mask for this 3D light. Shadows will only be cast "
+"using objects in the selected layers. Equivalent to [member Light3D."
+"shadow_caster_mask]."
+msgstr ""
+"设置该 3D 灯光的阴影投射器掩码。只会使用选定层中的对象投射阴影。等价于 "
+"[member Light3D.shadow_caster_mask]。"
+
 msgid ""
 "Creates a new lightmap global illumination instance and adds it to the "
 "RenderingServer. It can be accessed with the RID that is returned. This RID "
@@ -127512,6 +131210,13 @@ msgstr ""
 "纹理数组。如果烘焙光照贴图纹理时的 [member LightmapGI.directional] 为 "
 "[code]true[/code]，则 [param uses_sh] 也必须为 [code]true[/code]。"
 
+msgid ""
+"Toggles whether a bicubic filter should be used when lightmaps are sampled. "
+"This smoothens their appearance at a performance cost."
+msgstr ""
+"切换在对光照贴图采样时是否使用双三次插值过滤。开启后能够让外观平滑，但会带来性"
+"能开销。"
+
 msgid ""
 "Returns a mesh of a sphere with the given number of horizontal subdivisions, "
 "vertical subdivisions and radius. See also [method get_test_cube]."
@@ -127665,6 +131370,58 @@ msgstr ""
 "[b]注意：[/b]如果缓冲位于引擎的内部缓存中，则需要从 GPU 显存获取，并且有可能需"
 "要解压。也就是说 [method multimesh_get_buffer] 可能会比较慢，应该尽可能避免。"
 
+msgid ""
+"Returns the [RenderingDevice] [RID] handle of the [MultiMesh], which can be "
+"used as any other buffer on the Rendering Device."
+msgstr ""
+"返回 [MultiMesh] 在 [RenderingDevice] 中的 [RID] 句柄，可以在 RenderingDevice "
+"上和其他缓冲一样使用。"
+
+msgid ""
+"Returns the [RenderingDevice] [RID] handle of the [MultiMesh] command buffer. "
+"This [RID] is only valid if [code]use_indirect[/code] is set to [code]true[/"
+"code] when allocating data through [method multimesh_allocate_data]. It can "
+"be used to directly modify the instance count via buffer.\n"
+"The data structure is dependent on both how many surfaces the mesh contains "
+"and whether it is indexed or not, the buffer has 5 integers in it, with the "
+"last unused if the mesh is not indexed.\n"
+"Each of the values in the buffer correspond to these options:\n"
+"[codeblock lang=text]\n"
+"Indexed:\n"
+"  0 - indexCount;\n"
+"  1 - instanceCount;\n"
+"  2 - firstIndex;\n"
+"  3 - vertexOffset;\n"
+"  4 - firstInstance;\n"
+"Non Indexed:\n"
+"  0 - vertexCount;\n"
+"  1 - instanceCount;\n"
+"  2 - firstVertex;\n"
+"  3 - firstInstance;\n"
+"  4 - unused;\n"
+"[/codeblock]"
+msgstr ""
+"返回 [MultiMesh] 命令缓冲在 [RenderingDevice] 中的 [RID] 句柄。通过 [method "
+"multimesh_allocate_data] 分配数据时，只有将 [code]use_indirect[/code] 设为 "
+"[code]true[/code]，这个 [RID] 才有效。可以用来通过缓冲直接修改实例的数量。\n"
+"数据结构依赖于网格包含的表面数量以及是否使用索引，缓冲中有 5 个整数，不使用索"
+"引时不会使用最后一个整数。\n"
+"缓冲中的值对应的选项如下：\n"
+"[codeblock lang=text]\n"
+"使用索引：\n"
+"  0 - indexCount;\n"
+"  1 - instanceCount;\n"
+"  2 - firstIndex;\n"
+"  3 - vertexOffset;\n"
+"  4 - firstInstance;\n"
+"不使用索引：\n"
+"  0 - vertexCount;\n"
+"  1 - instanceCount;\n"
+"  2 - firstVertex;\n"
+"  3 - firstInstance;\n"
+"  4 - unused;\n"
+"[/codeblock]"
+
 msgid "Returns the custom AABB defined for this MultiMesh resource."
 msgstr "返回为该 MultiMesh 资源定义的自定义 AABB。"
 
@@ -127691,6 +131448,15 @@ msgid ""
 "multimesh is set to use 2D transforms."
 msgstr "返回指定实例的 [Transform2D]。只在 multimesh 设置为使用 2D 变换时使用。"
 
+msgid ""
+"Prevents physics interpolation for the specified instance during the current "
+"physics tick.\n"
+"This is useful when moving an instance to a new location, to give an "
+"instantaneous change rather than interpolation from the previous location."
+msgstr ""
+"在当前物理周期中阻止对指定实例进行物理插值。\n"
+"适用于将实例移动到新位置的场合，可以产生瞬时变化，而不是从先前位置进行插值。"
+
 msgid ""
 "Sets the color by which this instance will be modulated. Equivalent to "
 "[method MultiMesh.set_instance_color]."
@@ -127950,6 +131716,15 @@ msgstr ""
 "于 [member GPUParticlesCollisionSDF3D.texture] 或 [member "
 "GPUParticlesAttractorVectorField3D.texture]。"
 
+msgid ""
+"Sets the heightfield [param mask] for the 3D GPU particles heightfield "
+"collision specified by the [param particles_collision] RID. Equivalent to "
+"[member GPUParticlesCollisionHeightField3D.heightfield_mask]."
+msgstr ""
+"设置 3D GPU 粒子高度图碰撞的高度图掩码 [param mask]，碰撞由 RID [param "
+"particles_collision] 指定。等价于 [member GPUParticlesCollisionHeightField3D."
+"heightfield_mask]。"
+
 msgid ""
 "Sets the heightmap [param resolution] for the 3D GPU particles heightfield "
 "collision specified by the [param particles_collision] RID. Equivalent to "
@@ -128025,6 +131800,10 @@ msgstr ""
 "instances_cull_aabb]、[method instances_cull_convex] 或 [method "
 "instances_cull_ray] 时进行。"
 
+msgid ""
+"Requests particles to process for extra process time during a single frame."
+msgstr "请求粒子在单一帧中再处理指定的时间。"
+
 msgid ""
 "Reset the particles on the next update. Equivalent to [method GPUParticles3D."
 "restart]."
@@ -128085,6 +131864,14 @@ msgstr ""
 "设置粒子节点的速度，将由 [member ParticleProcessMaterial."
 "inherit_velocity_ratio] 使用。"
 
+msgid ""
+"If [code]true[/code], particles will emit over time. Setting to [code]false[/"
+"code] does not reset the particles, but only stops their emission. Equivalent "
+"to [member GPUParticles3D.emitting]."
+msgstr ""
+"如果为 [code]true[/code]，则粒子将随时间发射。设置为 [code]false[/code] 不会重"
+"置粒子，只会停止发射。等价于 [member GPUParticles3D.emitting]。"
+
 msgid ""
 "Sets the explosiveness ratio. Equivalent to [member GPUParticles3D."
 "explosiveness]."
@@ -128227,6 +132014,9 @@ msgstr ""
 "如果为 [code]true[/code]，则反射将忽略天空的贡献。相当于 [member "
 "ReflectionProbe.interior]。"
 
+msgid "Sets the distance in meters over which a probe blends into the scene."
+msgstr "设置探针与场景融合的距离，单位为米。"
+
 msgid ""
 "Sets the render cull mask for this reflection probe. Only instances with a "
 "matching layer will be reflected by this probe. Equivalent to [member "
@@ -128379,6 +132169,20 @@ msgstr ""
 "则该图像将使用线性插值的方式进行缩放。如果 [param use_filter] 为 [code]false[/"
 "code]，则该图像将使用最近邻插值的方式进行缩放。"
 
+msgid ""
+"If [param generate] is [code]true[/code], generates debug wireframes for all "
+"meshes that are loaded when using the Compatibility renderer. By default, the "
+"engine does not generate debug wireframes at runtime, since they slow down "
+"loading of assets and take up VRAM.\n"
+"[b]Note:[/b] You must call this method before loading any meshes when using "
+"the Compatibility renderer, otherwise wireframes will not be used."
+msgstr ""
+"如果 [param generate] 为 [code]true[/code]，则在使用 Compatibility 渲染器时会"
+"为所有加载的网格生成调试线框。默认情况下，引擎在运行时不会生成调试线框，因为这"
+"会减慢资产加载速度并占用显存。\n"
+"[b]注意：[/b]使用 Compatibility 渲染器时，必须在加载任何网格之前调用此方法，否"
+"则将不会使用线框。"
+
 msgid ""
 "Sets the default clear color which is used when a specific clear color has "
 "not been selected. See also [method get_default_clear_color]."
@@ -128626,6 +132430,23 @@ msgstr ""
 "texture_2d_placeholder_create]。\n"
 "[b]注意：[/b]等价资源为 [PlaceholderTextureLayered]。"
 
+msgid ""
+"Creates a placeholder for a 2-dimensional layered texture and adds it to the "
+"RenderingServer. It can be accessed with the RID that is returned. This RID "
+"will be used in all [code]texture_2d_layered_*[/code] RenderingServer "
+"functions, although it does nothing when used. See also [method "
+"texture_2d_layered_placeholder_create].\n"
+"Once finished with your RID, you will want to free the RID using the "
+"RenderingServer's [method free_rid] method.\n"
+"[b]Note:[/b] The equivalent resource is [PlaceholderTexture2D]."
+msgstr ""
+"创建二维多层纹理的占位符并将其添加到 RenderingServer。可以通过返回的 RID 进行"
+"访问。这个 RID 会在所有 [code]texture_2d_layered_*[/code] RenderingServer 函数"
+"中使用，但使用时什么都不会发生。另见 [method "
+"texture_2d_layered_placeholder_create]。\n"
+"RID 使用结束后，应该使用 RenderingServer 的 [method free_rid] 方法进行释放。\n"
+"[b]注意：[/b]等价资源为 [PlaceholderTexture2D]。"
+
 msgid ""
 "Updates the texture specified by the [param texture] [RID] with the data in "
 "[param image]. A [param layer] must also be specified, which should be "
@@ -128800,6 +132621,37 @@ msgstr ""
 "[b]注意：[/b]需要使用 [method viewport_set_measure_render_time] 启用 [param "
 "viewport] 的测量。否则这个方法会返回 [code]0.0[/code]。"
 
+msgid ""
+"Returns the GPU time taken to render the last frame in milliseconds. To get a "
+"complete readout of GPU time spent to render the scene, sum the render times "
+"of all viewports that are drawn every frame. Unlike [method Engine."
+"get_frames_per_second], this method accurately reflects GPU utilization even "
+"if framerate is capped via V-Sync or [member Engine.max_fps]. See also "
+"[method viewport_get_measured_render_time_cpu].\n"
+"[b]Note:[/b] Requires measurements to be enabled on the specified [param "
+"viewport] using [method viewport_set_measure_render_time]. Otherwise, this "
+"method returns [code]0.0[/code].\n"
+"[b]Note:[/b] When GPU utilization is low enough during a certain period of "
+"time, GPUs will decrease their power state (which in turn decreases core and "
+"memory clock speeds). This can cause the reported GPU time to increase if GPU "
+"utilization is kept low enough by a framerate cap (compared to what it would "
+"be at the GPU's highest power state). Keep this in mind when benchmarking "
+"using [method viewport_get_measured_render_time_gpu]. This behavior can be "
+"overridden in the graphics driver settings at the cost of higher power usage."
+msgstr ""
+"返回渲染上一帧所消耗的 GPU 时间，单位为毫秒。要获取渲染场景所消耗 GPU 时间的完"
+"整读数，请将每帧绘制的所有视口的渲染时间相加。与 [method Engine."
+"get_frames_per_second] 不同，即便帧率受到垂直同步或 [member Engine.max_fps] 的"
+"限制，这个方法也会精确反映 GPU 利用率。另见 [method "
+"viewport_get_measured_render_time_cpu]。\n"
+"[b]注意：[/b]需要使用 [method viewport_set_measure_render_time] 启用 [param "
+"viewport] 的测量。否则这个方法会返回 [code]0.0[/code]。\n"
+"[b]注意：[/b]GPU 的利用率在一段时间内低到一定程度时，GPU 会降低电源状态（导致"
+"内核与内存时钟速度的降低）。这会导致 GPU 在某个帧率下保持较低利用率时，汇报的 "
+"GPU 时间增大（相对于 GPU 的最高电源状态而言）。请在使用 [method "
+"viewport_get_measured_render_time_gpu] 进行性能测试时牢记这一点。可以在显卡驱"
+"动的设置中改变这种行为，但代价是耗电量增大。"
+
 msgid ""
 "Returns a statistic about the rendering engine which can be used for "
 "performance profiling. This is separated into render pass [param type]s, each "
@@ -128991,6 +132843,26 @@ msgstr ""
 "viewport_get_measured_render_time_gpu] 进行查询返回的就是大于 [code]0.0[/"
 "code] 的值。"
 
+msgid ""
+"Sets the multisample antialiasing mode for 2D/Canvas on the specified [param "
+"viewport] RID. See [enum ViewportMSAA] for options. Equivalent to [member "
+"ProjectSettings.rendering/anti_aliasing/quality/msaa_2d] or [member Viewport."
+"msaa_2d]."
+msgstr ""
+"设置 RID 为 [param viewport] 的视口的 2D/画布多重采样抗锯齿模式。选项见 [enum "
+"ViewportMSAA]。等价于 [member ProjectSettings.rendering/anti_aliasing/quality/"
+"msaa_2d] 或 [member Viewport.msaa_2d]。"
+
+msgid ""
+"Sets the multisample antialiasing mode for 3D on the specified [param "
+"viewport] RID. See [enum ViewportMSAA] for options. Equivalent to [member "
+"ProjectSettings.rendering/anti_aliasing/quality/msaa_3d] or [member Viewport."
+"msaa_3d]."
+msgstr ""
+"设置 RID 为 [param viewport] 的视口的 3D 多重采样抗锯齿模式。选项见 [enum "
+"ViewportMSAA]。等价于 [member ProjectSettings.rendering/anti_aliasing/quality/"
+"msaa_3d] 或 [member Viewport.msaa_3d]。"
+
 msgid ""
 "Sets the [member ProjectSettings.rendering/occlusion_culling/"
 "bvh_build_quality] to use for occlusion culling. This parameter is global and "
@@ -129103,6 +132975,14 @@ msgid ""
 "environment information, reflection atlas, etc."
 msgstr "设置视口的场景。该场景包含环境、反射图集等信息。"
 
+msgid ""
+"Sets the viewport's screen-space antialiasing mode. Equivalent to [member "
+"ProjectSettings.rendering/anti_aliasing/quality/screen_space_aa] or [member "
+"Viewport.screen_space_aa]."
+msgstr ""
+"设置视口的屏幕空间抗锯齿模式。等价于 [member ProjectSettings.rendering/"
+"anti_aliasing/quality/screen_space_aa] 和 [member Viewport.screen_space_aa]。"
+
 msgid ""
 "Sets the viewport's 2D signed distance field [member ProjectSettings."
 "rendering/2d/sdf/oversize] and [member ProjectSettings.rendering/2d/sdf/"
@@ -129175,6 +133055,43 @@ msgid ""
 "constants for options."
 msgstr "设置应更新视口的时间。可选项请参阅 [enum ViewportUpdateMode] 。"
 
+msgid ""
+"If [code]true[/code], enables debanding on the specified viewport. Equivalent "
+"to [member ProjectSettings.rendering/anti_aliasing/quality/use_debanding] or "
+"[member Viewport.use_debanding]."
+msgstr ""
+"如果为 [code]true[/code]，则在指定的视口上启用去条带。等价于 [member "
+"ProjectSettings.rendering/anti_aliasing/quality/use_debanding] 或 [member "
+"Viewport.use_debanding]。"
+
+msgid ""
+"If [code]true[/code], 2D rendering will use a high dynamic range (HDR) format "
+"framebuffer matching the bit depth of the 3D framebuffer. When using the "
+"Forward+ renderer this will be an [code]RGBA16[/code] framebuffer, while when "
+"using the Mobile renderer it will be an [code]RGB10_A2[/code] framebuffer. "
+"Additionally, 2D rendering will take place in linear color space and will be "
+"converted to sRGB space immediately before blitting to the screen (if the "
+"Viewport is attached to the screen). Practically speaking, this means that "
+"the end result of the Viewport will not be clamped into the [code]0-1[/code] "
+"range and can be used in 3D rendering without color space adjustments. This "
+"allows 2D rendering to take advantage of effects requiring high dynamic range "
+"(e.g. 2D glow) as well as substantially improves the appearance of effects "
+"requiring highly detailed gradients. This setting has the same effect as "
+"[member Viewport.use_hdr_2d].\n"
+"[b]Note:[/b] This setting will have no effect when using the Compatibility "
+"renderer, which always renders in low dynamic range for performance reasons."
+msgstr ""
+"如果为 [code]true[/code]，2D 渲染将使用与 3D 帧缓冲区的位深度匹配的高动态范围"
+"（HDR）格式帧缓冲区。当使用 Forward+ 渲染器时，这将是一个 [code]RGBA16[/code] "
+"帧缓冲区，而当使用 Mobile 渲染器时，它将是一个 [code]RGB10_A2[/code] 帧缓冲"
+"区。此外，2D 渲染将在线性色彩空间中进行，并在位块传输到屏幕之前（如果视口被连"
+"接到屏幕）立即转换为 sRGB 空间。实际上，这意味着视口的最终结果不会被钳制在 "
+"[code]0-1[/code] 范围内，并且可以在不进行色彩空间调整的情况下被用于 3D 渲染。"
+"这使得 2D 渲染能够利用需要高动态范围的效果（例如 2D 辉光），并显著改善需要高度"
+"详细渐变的效果的外观。该设置与 [member Viewport.use_hdr_2d] 效果相同。\n"
+"[b]注意：[/b]使用 Compatibility 渲染器时该设置不起作用，出于性能原因，该渲染器"
+"始终在低动态范围内渲染。"
+
 msgid ""
 "If [code]true[/code], enables occlusion culling on the specified viewport. "
 "Equivalent to [member ProjectSettings.rendering/occlusion_culling/"
@@ -129183,6 +133100,15 @@ msgstr ""
 "如果为 [code]true[/code]，则在指定的视口上启用遮挡剔除。等价于 [member "
 "ProjectSettings.rendering/occlusion_culling/use_occlusion_culling]。"
 
+msgid ""
+"If [code]true[/code], use temporal antialiasing. Equivalent to [member "
+"ProjectSettings.rendering/anti_aliasing/quality/use_taa] or [member Viewport."
+"use_taa]."
+msgstr ""
+"如果为 [code]true[/code]，则在指定的视口上启用时间抗锯齿。等价于 [member "
+"ProjectSettings.rendering/anti_aliasing/quality/use_taa] 或 [member Viewport."
+"use_taa]。"
+
 msgid ""
 "If [code]true[/code], the viewport uses augmented or virtual reality "
 "technologies. See [XRInterface]."
@@ -131384,6 +135310,14 @@ msgstr ""
 "立方体贴图全局着色器参数（[code]global uniform samplerCube ...[/code]）。编辑"
 "器 UI 中以 [Cubemap] 的形式暴露。"
 
+msgid ""
+"External sampler global shader parameter ([code]global uniform "
+"samplerExternalOES ...[/code]). Exposed as a [ExternalTexture] in the editor "
+"UI."
+msgstr ""
+"外部采样器全局着色器参数（[code]global uniform samplerExternalOES ...[/"
+"code]）。编辑器 UI 中以 [ExternalTexture] 的形式暴露。"
+
 msgid "Represents the size of the [enum GlobalShaderParameterType] enum."
 msgstr "代表 [enum GlobalShaderParameterType] 枚举的大小。"
 
@@ -131528,6 +135462,9 @@ msgstr "该类允许在 GDExtension 中实现 RenderSceneBuffer。"
 msgid "Implement this in GDExtension to handle the (re)sizing of a viewport."
 msgstr "在 GDExtension 中实现它来处理视口的（重新）大小调整。"
 
+msgid "Implement this in GDExtension to change the anisotropic filtering level."
+msgstr "在 GDExtension 中实现该功能以更改各向异性过滤级别。"
+
 msgid "Implement this in GDExtension to record a new FSR sharpness value."
 msgstr "在 GDExtension 中实现该功能以记录新的 FSR 锐度值。"
 
@@ -131578,6 +135515,56 @@ msgstr ""
 "使用给定的格式创建一个新纹理，并在给定的名称下查看和缓存它。如果已有纹理已经存"
 "在，则返回该已有纹理。"
 
+msgid ""
+"Create a new texture view for an existing texture and cache this under the "
+"given [param view_name]. Will return the existing texture view if it already "
+"exists. Will error if the source texture doesn't exist."
+msgstr ""
+"为已有纹理创建一个新的纹理视图，并将其缓存在给定的 [param view_name] 下。如果"
+"已有的纹理视图已经存在，则返回该视图。如果源纹理不存在则会出错。"
+
+msgid ""
+"Returns the specified layer from the color texture we are rendering 3D "
+"content to.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"从渲染 3D 内容的颜色纹理返回指定的图层。\n"
+"如果 [param msaa] 为 [code]true[/code] 并且启用了 MSAA，则会返回缓冲的 MSAA 变"
+"种。"
+
+msgid ""
+"Returns the color texture we are rendering 3D content to. If multiview is "
+"used this will be a texture array with all views.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"返回渲染 3D 内容的颜色纹理。如果使用多视图，这将是一个包含所有视图的纹理数"
+"组。\n"
+"如果 [param msaa] 为 [code]true[/code] 并且启用了 MSAA，则会返回缓冲的 MSAA 变"
+"种。"
+
+msgid ""
+"Returns the specified layer from the depth texture we are rendering 3D "
+"content to.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"从渲染 3D 内容的深度纹理返回指定的图层。\n"
+"如果 [param msaa] 为 [code]true[/code] 并且启用了 MSAA，则会返回缓冲的 MSAA 变"
+"种。"
+
+msgid ""
+"Returns the depth texture we are rendering 3D content to. If multiview is "
+"used this will be a texture array with all views.\n"
+"If [param msaa] is [code]true[/code] and MSAA is enabled, this returns the "
+"MSAA variant of the buffer."
+msgstr ""
+"返回渲染 3D 内容的深度纹理。如果使用多视图，这将是一个包含所有视图的纹理数"
+"组。\n"
+"如果 [param msaa] 为 [code]true[/code] 并且启用了 MSAA，则会返回缓冲的 MSAA 变"
+"种。"
+
 msgid ""
 "Returns the FSR sharpness value used while rendering the 3D content (if "
 "[method get_scaling_3d_mode] is an FSR mode)."
@@ -131791,6 +135778,45 @@ msgid ""
 "Override this method to return a custom [RID] when [method get_rid] is called."
 msgstr "可以覆盖此方法，从而在调用 [method get_rid] 时返回自定义 [RID]。"
 
+msgid ""
+"For resources that use a variable number of properties, either via [method "
+"Object._validate_property] or [method Object._get_property_list], this method "
+"should be implemented to correctly clear the resource's state."
+msgstr ""
+"对于使用可变数量属性的资源，无论是通过 [method Object._validate_property] 还"
+"是 [method Object._get_property_list] 使用，都应实现该方法正确清除资源的状态。"
+
+msgid ""
+"Sets the resource's path to [param path] without involving the resource cache."
+msgstr "将资源的路径设为 [param path]，不涉及资源缓存。"
+
+msgid ""
+"Override this method to customize the newly duplicated resource created from "
+"[method PackedScene.instantiate], if the original's [member "
+"resource_local_to_scene] is set to [code]true[/code].\n"
+"[b]Example:[/b] Set a random [code]damage[/code] value to every local "
+"resource from an instantiated scene:\n"
+"[codeblock]\n"
+"extends Resource\n"
+"\n"
+"var damage = 0\n"
+"\n"
+"func _setup_local_to_scene():\n"
+"    damage = randi_range(10, 40)\n"
+"[/codeblock]"
+msgstr ""
+"如果原始资源的 [member resource_local_to_scene] 被设置为 [code]true[/code]，则"
+"覆盖该方法可以自定义从 [method PackedScene.instantiate] 创建的新复制的资源。\n"
+"[b]示例：[/b]为实例化场景中的每个本地资源设置随机 [code]damage[/code] 值：\n"
+"[codeblock]\n"
+"extends Resource\n"
+"\n"
+"var damage = 0\n"
+"\n"
+"func _setup_local_to_scene():\n"
+"    damage = randi_range(10, 40)\n"
+"[/codeblock]"
+
 msgid ""
 "Duplicates this resource, returning a new resource with its [code]export[/"
 "code]ed or [constant PROPERTY_USAGE_STORAGE] properties copied from the "
@@ -131863,6 +135889,17 @@ msgstr ""
 "返回的字符串仅由字母（[code]a[/code] 到 [code]y[/code]）和数字（[code]0[/"
 "code] 到 [code]8[/code]）组成。另请参阅 [member resource_scene_unique_id]。"
 
+msgid ""
+"Returns the unique identifier for the resource with the given [param path] "
+"from the resource cache. If the resource is not loaded and cached, an empty "
+"string is returned.\n"
+"[b]Note:[/b] This method is only implemented when running in an editor "
+"context. At runtime, it returns an empty string."
+msgstr ""
+"返回资源缓存中路径 [param path] 对应资源的唯一标识符。如果资源尚未加载和缓存，"
+"则会返回空字符串。\n"
+"[b]注意：[/b]该方法仅在编辑器环境运行时实现。运行时会返回空字符串。"
+
 msgid ""
 "If [member resource_local_to_scene] is set to [code]true[/code] and the "
 "resource has been loaded from a [PackedScene] instantiation, returns the root "
@@ -131883,6 +135920,22 @@ msgstr ""
 "储在服务器（[DisplayServer]、[RenderingServer] 等）中的资源的高级抽象，所以这"
 "个函数将返回原始的 [RID]。"
 
+msgid ""
+"Returns [code]true[/code] if the resource is built-in (from the engine) or "
+"[code]false[/code] if it is user-defined."
+msgstr ""
+"如果资源为（引擎的）内置资源则返回 [code]true[/code]，为用户定义资源则返回 "
+"[code]false[/code]。"
+
+msgid ""
+"For resources that use a variable number of properties, either via [method "
+"Object._validate_property] or [method Object._get_property_list], override "
+"[method _reset_state] to correctly clear the resource's state."
+msgstr ""
+"如果资源通过 [method Object._validate_property] 或 [method Object."
+"_get_property_list] 实现了可变数量的属性，请覆盖 [method _reset_state] 从而正"
+"确清空资源的状态。"
+
 msgid ""
 "Sets the unique identifier to [param id] for the resource with the given "
 "[param path] in the resource cache. If the unique identifier is empty, the "
@@ -132522,6 +136575,23 @@ msgstr ""
 "更多内存。只有当注意到字形渲染中明显缺乏精度时，才增加该属性的值。仅在 "
 "[member multichannel_signed_distance_field] 为 [code]true[/code] 时有效。"
 
+msgid ""
+"If set to [code]true[/code], the font will use multichannel signed distance "
+"field (MSDF) for crisp rendering at any size. Since this approach does not "
+"rely on rasterizing the font every time its size changes, this allows for "
+"resizing the font in real-time without any performance penalty. Text will "
+"also not look grainy for [Control]s that are scaled down (or for [Label3D]s "
+"viewed from a long distance).\n"
+"MSDF font rendering can be combined with [member generate_mipmaps] to further "
+"improve font rendering quality when scaled down."
+msgstr ""
+"如果设置为 [code]true[/code]，字体将使用多通道带符号距离场（MSDF），任何尺寸都"
+"能够进行清晰的渲染。由于这种方法不需要在每次字体大小更改时都对字体进行光栅化，"
+"因此可以实时调整字体大小，不会造成任何性能损失。对于按比例缩小的 [Control]（或"
+"从远距离查看的 [Label3D]），文本也不会看起来有颗粒感。\n"
+"MSDF 字体渲染可以与 [member generate_mipmaps] 结合使用，从而进一步提高缩小时的"
+"字体渲染质量。"
+
 msgid ""
 "The OpenType features to enable, disable or set a value for this font. This "
 "can be used to enable optional features provided by the font, such as "
@@ -132559,6 +136629,37 @@ msgstr ""
 "覆盖该字体支持的语言脚本列表。如果留空，则由字体元数据提供。通常无需更改该设"
 "置。另见 [member language_support]。"
 
+msgid ""
+"Subpixel positioning improves font rendering appearance, especially at "
+"smaller font sizes. The downside is that it takes more time to initially "
+"render the font, which can cause stuttering during gameplay, especially if "
+"used with large font sizes. This should be set to [b]Disabled[/b] for fonts "
+"with a pixel art appearance.\n"
+"[b]Disabled:[/b] No subpixel positioning. Lowest quality, fastest rendering.\n"
+"[b]Auto:[/b] Use subpixel positioning at small font sizes (the chosen quality "
+"varies depending on font size). Large fonts will not use subpixel "
+"positioning. This is a good tradeoff between performance and quality.\n"
+"[b]One Half of a Pixel:[/b] Always perform intermediate subpixel positioning "
+"regardless of font size. High quality, slow rendering.\n"
+"[b]One Quarter of a Pixel:[/b] Always perform precise subpixel positioning "
+"regardless of font size. Highest quality, slowest rendering.\n"
+"[b]Auto (Except Pixel Fonts):[/b] [b]Disabled[/b] for the pixel style fonts "
+"(each glyph contours contain only straight horizontal and vertical lines), "
+"[b]Auto[/b] for the other fonts."
+msgstr ""
+"子像素定位可改善字体渲染外观，尤其是在较小的字体大小下。缺点是初始渲染字体需要"
+"更多时间，这可能会导致游戏过程中出现卡顿，特别是在使用大字体时。对于具有像素艺"
+"术外观的字体，应将其设置为 [b]Disabled[/b]。\n"
+"[b]Disabled：[/b]无子像素定位。质量最低，渲染最快。\n"
+"[b]Auto：[/b]在小字体大小下使用子像素定位（所选质量根据字体大小而变化）。大字"
+"体不会使用子像素定位。这是性能和质量之间的良好权衡。\n"
+"[b]One Half of a Pixel：[/b]无论字体大小如何，始终执行中间子像素定位。质量高，"
+"渲染速度慢。\n"
+"[b]One Quarter of a Pixel：[/b]无论字体大小如何，始终执行精确的子像素定位。质"
+"量最高，渲染最慢。\n"
+"[b]Auto (Except Pixel Fonts)：[/b]像素风字体（字形轮廓中仅包含水平线或垂直线）"
+"使用 [b]Disabled[/b]，其他字体使用 [b]Auto[/b]。"
+
 msgid "Imports a image for use in scripting, with no rendering capabilities."
 msgstr "导入图像以用于脚本编写，但不具有渲染功能。"
 
@@ -132955,6 +137056,17 @@ msgstr ""
 msgid "If [code]true[/code], generates UV2 on import for [LightmapGI] baking."
 msgstr "如果为 [code]true[/code]，导入时会为烘焙 [LightmapGI] 生成 UV2。"
 
+msgid ""
+"Controls the size of each texel on the baked lightmap. A smaller value "
+"results in more precise lightmaps, at the cost of larger lightmap sizes and "
+"longer bake times.\n"
+"[b]Note:[/b] Only effective if [member generate_lightmap_uv2] is [code]true[/"
+"code]."
+msgstr ""
+"控制烘焙光照贴图上每个纹素的大小。较小的值会产生更精确的光照贴图，但代价是光照"
+"贴图尺寸更大，烘焙时间也更长。\n"
+"[b]注意：[/b]仅当 [member generate_lightmap_uv2] 为 [code]true[/code] 时有效。"
+
 msgid ""
 "If [code]true[/code], generates lower detail variants of the mesh which will "
 "be displayed in the distance to improve rendering performance. Not all meshes "
@@ -133204,6 +137316,20 @@ msgstr ""
 "型，则根节点将使用 [Node3D]。建议使用继承自 [Node3D] 的节点类型。否则，你将无"
 "法直接在 3D 编辑器中定位节点。"
 
+msgid ""
+"If [code]true[/code], use suffixes in the node names to determine the node "
+"type, such as [code]-col[/code] for collision shapes. Disabling this makes "
+"editor-imported files more similar to the original files, and more similar to "
+"importing files at runtime. See [url=$DOCS_URL/tutorials/assets_pipeline/"
+"importing_3d_scenes/node_type_customization.html]Node type customization "
+"using name suffixes[/url] for more information."
+msgstr ""
+"如果为 [code]true[/code]，则会使用节点名称的后缀来确定节点类型，例如 [code]-"
+"col[/code] 表示碰撞形状。禁用该选项会让编辑器导入的文件更接近原始文件，更类似"
+"于在运行时导入文件。详情见[url=$DOCS_URL/tutorials/assets_pipeline/"
+"importing_3d_scenes/node_type_customization.html]《使用名称后缀自定义节点类"
+"型》[/url]。"
+
 msgid ""
 "If checked, use named [Skin]s for animation. The [MeshInstance3D] node "
 "contains 3 properties of relevance here: a skeleton [NodePath] pointing to "
@@ -133453,6 +137579,34 @@ msgstr ""
 "[code]spatial[/code] 着色器中应使用 [code]render_mode blend_premul_alpha;[/"
 "code]。"
 
+msgid ""
+"If set to a value greater than [code]0[/code], the size of the texture is "
+"limited on import to a value smaller than or equal to the value specified "
+"here. For non-square textures, the size limit affects the longer dimension, "
+"with the shorter dimension scaled to preserve aspect ratio. Resizing is "
+"performed using cubic interpolation.\n"
+"This can be used to reduce memory usage without affecting the source images, "
+"or avoid issues with textures not displaying on mobile/web platforms (as "
+"these usually can't display textures larger than 4096×4096).\n"
+"[b]Note:[/b] Even if this is set to [code]0[/code], import size is limited to "
+"the following dimensions for technical reasons. Depending on [member compress/"
+"mode], textures will be downsampled on import if necessary:\n"
+"- [b]Lossy:[/b] 16383 pixels width or height, whichever is larger;\n"
+"- [b]Basis Universal:[/b] 16384 pixels width or height, whichever is larger;\n"
+"- [b]All other modes:[/b] 32768 pixels width or height, whichever is larger."
+msgstr ""
+"如果设为大于 [code]0[/code] 的值，则导入时会将纹理的大小限制为小于等于此处指定"
+"的值。如果不是正方形纹理，则大小限制影响的是长边，短边会保持纵横比缩放。调整大"
+"小时使用三次插值。\n"
+"可用于在不影响源图像的前提下减少内存占用，也可用于避免纹理在移动/Web 平台上不"
+"显示的问题（因为这些平台通常无法显示大于 4096×4096 的纹理）。\n"
+"[b]注意：[/b]由于技术原因，即便设置为 [code]0[/code]，导入的大小也会受到以下大"
+"小的限制。根据 [member compress/mode] 的不同，导入时如果必要，会对纹理进行缩小"
+"采样：\n"
+"- [b]Lossy：[/b]宽度或高度限制到 16383 像素，以长边为准；\n"
+"- [b]Basis Universal：[/b]宽度或高度限制到 16384 像素，以长边为准；\n"
+"- [b]All other modes：[/b]宽度或高度限制到 32768 像素，以长边为准。"
+
 msgid ""
 "The color channel to consider as a roughness map in this texture. Only "
 "effective if [member roughness/src_normal] is not empty."
@@ -133564,6 +137718,26 @@ msgstr ""
 "默认情况下，Godot 使用有损的 Quite OK Audio 压缩导入 WAV 文件。可以通过设置 "
 "[member compress/mode] 属性来更改。"
 
+msgid ""
+"The compression mode to use on import.\n"
+"- [b]PCM (Uncompressed):[/b] Imports audio data without any form of "
+"compression, preserving the highest possible quality. It has the lowest CPU "
+"cost, but the highest memory usage.\n"
+"- [b]IMA ADPCM:[/b] Applies fast, lossy compression during import, noticeably "
+"decreasing the quality, but with low CPU cost and memory usage. Does not "
+"support seeking and only Forward loop mode is supported.\n"
+"- [b][url=https://qoaformat.org/]Quite OK Audio[/url]:[/b] Also applies lossy "
+"compression on import, having a slightly higher CPU cost compared to IMA "
+"ADPCM, but much higher quality and the lowest memory usage."
+msgstr ""
+"导入时使用的压缩模式。\n"
+"- [b]PCM (Uncompressed)：[/b]导入音频数据，不进行压缩，保持尽可能高的质量。"
+"CPU 开销最低，但内存占用最高。\n"
+"- [b]IMA ADPCM：[/b]导入时进行快速有损压缩，显著降低质量，但是 CPU 开销和内存"
+"占用都较低。不支持跳转，仅支持 Forward 循环模式。\n"
+"- [b][url=https://qoaformat.org/]Quite OK Audio[/url]：[/b]导入时也会进行有损"
+"压缩，CPU 开销比 IMA ADPCM 略高，但是质量要高很多，内存占用也最低。"
+
 msgid ""
 "The begin loop point to use when [member edit/loop_mode] is [b]Forward[/b], "
 "[b]Ping-Pong[/b], or [b]Backward[/b]. This is set in samples after the "
@@ -133582,6 +137756,34 @@ msgstr ""
 "[b]Backward[/b] 时使用。设置的是音频文件开始之后的采样数。[code]-1[/code] 表示"
 "使用音频文件的末尾作为循环结束点。"
 
+msgid ""
+"Controls how audio should loop.\n"
+"- [b]Detect From WAV:[/b] Uses loop information from the WAV metadata.\n"
+"- [b]Disabled:[/b] Don't loop audio, even if the metadata indicates the file "
+"playback should loop.\n"
+"- [b]Forward:[/b] Standard audio looping. Plays the audio forward from the "
+"beginning to [member edit/loop_end], then returns to [member edit/loop_begin] "
+"and repeats.\n"
+"- [b]Ping-Pong:[/b] Plays the audio forward until [member edit/loop_end], "
+"then backwards to [member edit/loop_begin], repeating this cycle.\n"
+"- [b]Backward:[/b] Plays the audio backwards from [member edit/loop_end] to "
+"[member edit/loop_begin], then repeats.\n"
+"[b]Note:[/b] In [AudioStreamPlayer], the [signal AudioStreamPlayer.finished] "
+"signal won't be emitted for looping audio when it reaches the end of the "
+"audio file, as the audio will keep playing indefinitely."
+msgstr ""
+"控制音频如何循环。\n"
+"- [b]Detect From WAV：[/b]使用 WAV 元数据中的循环信息。\n"
+"- [b]Disabled：[/b]不循环音频，即便元数据显示该文件应该在播放时循环。\n"
+"- [b]Forward：[/b]标准音频循环。从头开始正向播放音频至 [member edit/"
+"loop_end]，然后回到 [member edit/loop_begin] 再进行重复。\n"
+"- [b]Ping-Pong：[/b]正向播放音频至 [member edit/loop_end]，然后逆向播放至 "
+"[member edit/loop_begin]，再重复这一循环。\n"
+"- [b]Backward：[/b]从 [member edit/loop_end] 至 [member edit/loop_begin] 逆向"
+"播放音频，再进行重复。\n"
+"[b]注意：[/b]在 [AudioStreamPlayer] 中，循环音频到达音频文件末尾时不会发出 "
+"[signal AudioStreamPlayer.finished] 信号，因为音频会无限循环播放。"
+
 msgid ""
 "If [code]true[/code], normalize the audio volume so that its peak volume is "
 "equal to 0 dB. When enabled, normalization will make audio sound louder "
@@ -133699,6 +137901,33 @@ msgstr ""
 "[b]注意：[/b]如果使用了 [method Resource.take_over_path]，则这个方法会为接管的"
 "路径返回 [code]true[/code]，即便对应的资源尚未保存（即仅存在于资源缓存中）。"
 
+msgid ""
+"Returns the cached resource reference for the given [param path].\n"
+"[b]Note:[/b] If the resource is not cached, the returned [Resource] will be "
+"invalid."
+msgstr ""
+"返回路径 [param path] 对应的资源引用缓存。\n"
+"[b]注意：[/b]如果资源尚未缓存，则会返回无效 [Resource]。"
+
+msgid ""
+"Returns the dependencies for the resource at the given [param path].\n"
+"[b]Note:[/b] The dependencies are returned with slices separated by [code]::[/"
+"code]. You can use [method String.get_slice] to get their components.\n"
+"[codeblock]\n"
+"for dependency in ResourceLoader.get_dependencies(path):\n"
+"    print(dependency.get_slice(\"::\", 0)) # Prints the UID.\n"
+"    print(dependency.get_slice(\"::\", 2)) # Prints the path.\n"
+"[/codeblock]"
+msgstr ""
+"返回位于给定路径 [param path] 的资源的依赖项。\n"
+"[b]注意：[/b]返回的单个依赖项是由 [code]::[/code] 分隔的切片。你可以使用 "
+"[method String.get_slice] 来获取每段的内容。\n"
+"[codeblock]\n"
+"for dependency in ResourceLoader.get_dependencies(path):\n"
+"    print(dependency.get_slice(\"::\", 0)) # 输出 UID。\n"
+"    print(dependency.get_slice(\"::\", 2)) # 输出路径。\n"
+"[/codeblock]"
+
 msgid "Returns the list of recognized extensions for a resource type."
 msgstr "返回资源类型的已识别扩展名列表。"
 
@@ -133720,6 +137949,14 @@ msgstr ""
 "方法将使用缓存版本。可以通过在具有相同路径的新资源上使用 [method Resource."
 "take_over_path] 来覆盖缓存资源。"
 
+msgid ""
+"Lists a directory (as example: \"res://assets/enemies\"), returning all "
+"resources contained within. The resource files are the original file names as "
+"visible in the editor before exporting."
+msgstr ""
+"列出目录（例如“res://assets/enemies”），返回目录中包含的所有资源。资源文件为原"
+"始文件名，与导出前编辑器中所显示的名称一致。"
+
 msgid ""
 "Loads a resource at the given [param path], caching the result for further "
 "access.\n"
@@ -133779,6 +138016,23 @@ msgstr ""
 "[constant THREAD_LOAD_LOADED]），则调用线程将被阻塞，直到资源加载完成。不过，"
 "建议使用 [method load_threaded_get_status] 来了解加载何时已经实际完成。"
 
+msgid ""
+"Returns the status of a threaded loading operation started with [method "
+"load_threaded_request] for the resource at [param path]. See [enum "
+"ThreadLoadStatus] for possible return values.\n"
+"An array variable can optionally be passed via [param progress], and will "
+"return a one-element array containing the ratio of completion of the threaded "
+"loading (between [code]0.0[/code] and [code]1.0[/code]).\n"
+"[b]Note:[/b] The recommended way of using this method is to call it during "
+"different frames (e.g., in [method Node._process], instead of a loop)."
+msgstr ""
+"返回使用 [method load_threaded_request] 在 [param path] 处启动的线程加载操作的"
+"状态。可能的返回值见 [enum ThreadLoadStatus]。\n"
+"还可以通过 [param progress] 传递数组变量，会返回一个包含线程加载完成比例的单元"
+"素的数组（在 [code]0.0[/code] 和 [code]1.0[/code] 之间）。\n"
+"[b]注意：[/b]该方法的推荐使用方式是在不同的帧期间调用（例如在 [method Node."
+"_process] 中，而不是循环中）。"
+
 msgid ""
 "Loads the resource using threads. If [param use_sub_threads] is [code]true[/"
 "code], multiple threads will be used to load the resource, which makes "
@@ -133893,6 +138147,16 @@ msgid ""
 "type."
 msgstr "返回可用于保存给定类型的资源的扩展列表。"
 
+msgid ""
+"Returns the resource ID for the given path. If [param generate] is "
+"[code]true[/code], a new resource ID will be generated if one for the path is "
+"not found. If [param generate] is [code]false[/code] and the path is not "
+"found, [constant ResourceUID.INVALID_ID] is returned."
+msgstr ""
+"返回路径对应的资源 ID。如果 [param generate] 为 [code]true[/code]，则路径没有"
+"对应资源 ID 时会生成一个新的。如果 [param generate] 为 [code]false[/code] 且路"
+"径未找到，则会返回 [constant ResourceUID.INVALID_ID]。"
+
 msgid "Unregisters the given [ResourceFormatSaver]."
 msgstr "取消注册给定的 [ResourceFormatSaver]。"
 
@@ -133953,6 +138217,19 @@ msgid ""
 "project."
 msgstr "管理项目中所有资源的唯一标识符的单例。"
 
+msgid ""
+"Resource UIDs (Unique IDentifiers) allow the engine to keep references "
+"between resources intact, even if files are renamed or moved. They can be "
+"accessed with [code]uid://[/code].\n"
+"[ResourceUID] keeps track of all registered resource UIDs in a project, "
+"generates new UIDs, and converts between their string and integer "
+"representations."
+msgstr ""
+"资源 UID（Unique IDentifier，唯一标识符）可以使引擎保持资源之间引用关系的完整"
+"性，即使文件发生重命名或移动。可以使用 [code]uid://[/code] 访问。\n"
+"[ResourceUID] 能够跟踪项目中所有已注册的资源 UID，生成新的 UID，也能够将标识符"
+"在字符串表示和整数表示之间进行转换。"
+
 msgid ""
 "Adds a new UID value which is mapped to the given resource path.\n"
 "Fails with an error if the UID already exists, so be sure to check [method "
@@ -134073,6 +138350,38 @@ msgstr "在 [member enable] 中设置 [constant TRANSFORM_FLAG_ROTATION]。"
 msgid "Sets [constant TRANSFORM_FLAG_SCALE] into [member enable]."
 msgstr "在 [member enable] 中设置 [constant TRANSFORM_FLAG_SCALE]。"
 
+msgid ""
+"Flags to control the process of the transform elements individually when "
+"[member use_global_pose] is disabled."
+msgstr "禁用 [member use_global_pose] 时，用于单独控制变换元素过程的标志。"
+
+msgid ""
+"[SkeletonProfile] for retargeting bones with names matching the bone list."
+msgstr "用于重定向与骨骼列表中名称匹配骨骼的 [SkeletonProfile]。"
+
+msgid ""
+"If [code]false[/code], in case the target skeleton has fewer bones than the "
+"source skeleton, the source bone parent's transform will be ignored.\n"
+"Instead, it is possible to retarget between models with different body "
+"shapes, and position, rotation, and scale can be retargeted separately.\n"
+"If [code]true[/code], retargeting is performed taking into account global "
+"pose.\n"
+"In case the target skeleton has fewer bones than the source skeleton, the "
+"source bone parent's transform is taken into account. However, bone length "
+"between skeletons must match exactly, if not, the bones will be forced to "
+"expand or shrink.\n"
+"This is useful for using dummy bone with length [code]0[/code] to match "
+"postures when retargeting between models with different number of bones."
+msgstr ""
+"如果为 [code]false[/code]，则在目标骨架的骨骼数量少于源骨架时，源骨架父级的变"
+"换将被忽略。\n"
+"这样可以在不同体型的模型之间进行重定向，位置、旋转和缩放都可以单独重定向。\n"
+"如果为 [code]true[/code]，则在重定向时会考虑全局姿势。\n"
+"在目标骨架的骨骼数量少于源骨架的情况下，会考虑源骨架父级的变换。然而，骨架之间"
+"的骨骼长度必须完全匹配，否则骨骼将被强制扩展或缩小。\n"
+"适用于在骨骼数量不同的模型之间进行重定向时使用长度为 [code]0[/code] 的虚设骨骼"
+"来匹配姿势。"
+
 msgid "If set, allows to retarget the position."
 msgstr "如果设置，则允许重定向位置。"
 
@@ -134314,6 +138623,52 @@ msgstr ""
 "[b]注意：[/b]这个方法不会影响 [member text]，如果重绘标签，其内容会重新显示。"
 "但将 [member text] 设置为空 [String] 也会清除栈。"
 
+msgid ""
+"Returns the line number of the character position provided. Line and "
+"character numbers are both zero-indexed.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回提供的字符位置的行号。行号和字符号都是从零开始索引的。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
+
+msgid ""
+"Returns the paragraph number of the character position provided. Paragraph "
+"and character numbers are both zero-indexed.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回提供的字符位置的段号。段号和字符号都是从零开始索引的。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
+
+msgid ""
+"Returns the height of the content.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回内容的高度。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
+
+msgid ""
+"Returns the width of the content.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回内容的宽度。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
+
 msgid ""
 "Returns the total number of lines in the text. Wrapped text is counted as "
 "multiple lines.\n"
@@ -134326,8 +138681,20 @@ msgstr ""
 "返回文本中的总行数。自动换行的文本计为多行。\n"
 "[b]注意：[/b]如果将 [member visible_characters_behavior] 设为 [constant "
 "TextServer.VC_CHARS_BEFORE_SHAPING]，则只会计算可见的换行。\n"
-"[b]注意：[/b]如果启用了 [member threaded]，则此方法返回的是文档已加载部分的"
-"值。请使用 [method is_ready] 或 [signal finished] 来确定文档是否已完全加载。"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
+
+msgid ""
+"Returns the vertical offset of the line found at the provided index.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回位于提供的索引处的行的垂直偏移量。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
 
 msgid ""
 "Returns the indexes of the first and last visible characters for the given "
@@ -134341,8 +138708,9 @@ msgstr ""
 "返回 [param line] 行上第一个和最后一个可见字符的索引，形式为 [Vector2i]。\n"
 "[b]注意：[/b]如果将 [member visible_characters_behavior] 设为 [constant "
 "TextServer.VC_CHARS_BEFORE_SHAPING]，则只会计算可见的换行。\n"
-"[b]注意：[/b]如果启用了 [member threaded]，则此方法返回的是文档已加载部分的"
-"值。请使用 [method is_ready] 或 [signal finished] 来确定文档是否已完全加载。"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
 
 msgid ""
 "Returns the [PopupMenu] of this [RichTextLabel]. By default, this menu is "
@@ -134443,6 +138811,17 @@ msgstr ""
 "返回段落的总数（换行符或标记栈文本标签中的 [code]p[/code] 标签）。自动换行的文"
 "本视为一个段落。"
 
+msgid ""
+"Returns the vertical offset of the paragraph found at the provided index.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回位于提供的索引处的段落的垂直偏移量。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
+
 msgid "Returns the text without BBCode mark-up."
 msgstr "返回没有 BBCode 标记的文本。"
 
@@ -134456,6 +138835,13 @@ msgstr ""
 "如果选区处于活动状态，则返回当前选区第一个字符的索引，否则返回 [code]-1[/"
 "code]。不包括 BBCode。"
 
+msgid ""
+"Returns the current selection vertical line offset if a selection is active, "
+"[code]-1.0[/code] otherwise."
+msgstr ""
+"如果选取处于活动状态，则返回当前选取的垂直线偏移量，否则返回 [code]-1.0[/"
+"code]。"
+
 msgid ""
 "Returns the current selection last character index if a selection is active, "
 "[code]-1[/code] otherwise. Does not include BBCodes."
@@ -134468,6 +138854,28 @@ msgid ""
 "BBCodes."
 msgstr "返回文本标签的总字符数。不包括 BBCode。"
 
+msgid ""
+"Returns the number of visible lines.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回可见行数。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回的是文档已加载部分的"
+"值。请使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加"
+"载。"
+
+msgid ""
+"Returns the number of visible paragraphs. A paragraph is considered visible "
+"if at least one of its lines is visible.\n"
+"[b]Note:[/b] If [member threaded] is enabled, this method returns a value for "
+"the loaded part of the document. Use [method is_finished] or [signal "
+"finished] to determine whether document is fully loaded."
+msgstr ""
+"返回可见段落的数量。认为段落可见的标准是至少有一行可见。\n"
+"[b]注意：[/b]如果启用了 [member threaded]，则该方法返回文档已加载部分的值。请"
+"使用 [method is_finished] 或 [signal finished] 来确定文档是否已完全加载。"
+
 msgid ""
 "Installs a custom effect. This can also be done in the Inspector through the "
 "[member custom_effects] property. [param effect] should be a valid "
@@ -135298,6 +139706,22 @@ msgstr ""
 "设置物体在给定轴上的速度。给定矢量轴上的速度将设置为给定向量长度。这对于跳跃行"
 "为很有用。"
 
+msgid ""
+"Damps the body's rotation. By default, the body will use the [member "
+"ProjectSettings.physics/2d/default_angular_damp] setting or any value "
+"override set by an [Area2D] the body is in. Depending on [member "
+"angular_damp_mode], you can set [member angular_damp] to be added to or to "
+"replace the body's damping value.\n"
+"See [member ProjectSettings.physics/2d/default_angular_damp] for more details "
+"about damping."
+msgstr ""
+"减缓物体的旋转。默认情况下，物体将使用 [member ProjectSettings.physics/2d/"
+"default_angular_damp] 设置，或由 [Area2D] 设置的任何值覆盖。根据 [member "
+"angular_damp_mode]，你可以设置 [member angular_damp_mode] 以添加到或替换物体的"
+"阻尼值。\n"
+"有关阻尼的更多详细信息，请参见 [member ProjectSettings.physics/2d/"
+"default_angular_damp] 。"
+
 msgid ""
 "If [code]true[/code], the body can enter sleep mode when there is no "
 "movement. See [member sleeping]."
@@ -135400,6 +139824,14 @@ msgstr ""
 "[enum FreezeMode]。\n"
 "对于始终冻结的物体，请改用 [StaticBody3D] 或 [AnimatableBody3D]。"
 
+msgid ""
+"Multiplies the gravity applied to the body. The body's gravity is calculated "
+"from the [member ProjectSettings.physics/2d/default_gravity] project setting "
+"and/or any additional gravity vector applied by [Area2D]s."
+msgstr ""
+"乘以施加在物体上的重力。物体的重力是由 [member ProjectSettings.physics/2d/"
+"default_gravity] 项目设置和/或任何由 [Area2D] 应用的额外重力向量计算出来的。"
+
 msgid ""
 "The body's moment of inertia. This is like mass, but for rotation: it "
 "determines how much torque it takes to rotate the body. The moment of inertia "
@@ -136978,11 +141410,11 @@ msgid ""
 "_process], [method Node._physics_process] and [method Node._input] callback "
 "methods may not called anymore."
 msgstr ""
-"如果为 [code]true[/code]，则该场景树被视为暂停。这会导致以下行为：\n"
-"- 2D 和 3D 物理将停止，包括碰撞检测和相关信号。\n"
-"- 根据每个节点的 [member Node.process_mode]，它们的 [method Node._process]、"
-"[method Node._physics_process] 和 [method Node._input] 回调方法可能不再被调"
-"用。"
+"如果为 [code]true[/code]，则会将场景树视为已暂停，会导致下列行为：\n"
+"- 停止 2D 和 3D 物理，包括碰撞检测和相关信号。\n"
+"- 可能不再调用每个节点的 [method Node._process]、[method Node."
+"_physics_process]、[method Node._input] 等回调方法，具体由各节点的 [member "
+"Node.process_mode] 决定。"
 
 msgid ""
 "If [code]true[/code], the renderer will interpolate the transforms of physics "
@@ -137472,6 +141904,15 @@ msgstr ""
 "从编辑器注销该 [EditorSyntaxHighlighter]。\n"
 "[b]注意：[/b]已经打开的脚本仍然适用该 [EditorSyntaxHighlighter]。"
 
+msgid ""
+"Updates the documentation for the given [param script] if the script's "
+"documentation is currently open.\n"
+"[b]Note:[/b] This should be called whenever the script is changed to keep the "
+"open documentation state up to date."
+msgstr ""
+"如果 [param script] 脚本的文档当前是打开状态，则更新该文档。\n"
+"[b]注意：[/b]每当脚本发生更改时都应调用该方法，从而保持打开文档的状态为最新。"
+
 msgid ""
 "Emitted when user changed active script. Argument is a freshly activated "
 "[Script]."
@@ -137678,6 +142119,13 @@ msgstr ""
 "[b]警告：[/b]这是一个必要的内部节点，移除和释放它可能会导致崩溃。如果你想禁用"
 "或隐藏滚动条，可以使用 [member vertical_scroll_mode]。"
 
+msgid ""
+"If [code]true[/code], [theme_item focus] is drawn when the ScrollContainer or "
+"one of its descendant nodes is focused."
+msgstr ""
+"如果为 [code]true[/code]，则当 ScrollContainer 或其子节点获得焦点时会绘制 "
+"[theme_item focus]。"
+
 msgid ""
 "If [code]true[/code], the ScrollContainer will automatically scroll to "
 "focused children (including indirect children) to make sure they are fully "
@@ -137797,6 +142245,23 @@ msgstr "启用滚动，滚动条始终可见。"
 msgid "Scrolling enabled, scrollbar will be hidden."
 msgstr "启用滚动，滚动条隐藏。"
 
+msgid ""
+"Combines [constant SCROLL_MODE_AUTO] and [constant SCROLL_MODE_SHOW_ALWAYS]. "
+"The scrollbar is only visible if necessary, but the content size is adjusted "
+"as if it was always visible. It's useful for ensuring that content size stays "
+"the same regardless if the scrollbar is visible."
+msgstr ""
+"[constant SCROLL_MODE_AUTO] 和 [constant SCROLL_MODE_SHOW_ALWAYS] 的结合。仅在"
+"必要时显示滚动条，但是会按照滚动条始终显示来调整内容的大小。适合需要保证无论滚"
+"动条是否可见，内容大小都保持一致的场合。"
+
+msgid ""
+"The focus border [StyleBox] of the [ScrollContainer]. Only used if [member "
+"draw_focus_border] is [code]true[/code]."
+msgstr ""
+"[ScrollContainer] 的聚焦边框 [StyleBox]。仅在 [member draw_focus_border] 为 "
+"[code]true[/code] 时使用。"
+
 msgid "The background [StyleBox] of the [ScrollContainer]."
 msgstr "[ScrollContainer] 的背景 [StyleBox]。"
 
@@ -137839,6 +142304,13 @@ msgstr ""
 "- [Semaphore] 的引用计数变为零，导致销毁时，没有线程在等待该信号量。\n"
 "- [Thread] 的引用计数变为零，导致销毁时，没有在等待任何信号量。"
 
+msgid ""
+"Lowers the [Semaphore], allowing one thread in, or more if [param count] is "
+"specified."
+msgstr ""
+"降低 [Semaphore]，额外允许一个线程进入，如果指定了 [param count] 则可以是更多"
+"线程。"
+
 msgid ""
 "Like [method wait], but won't block, so if the value is zero, fails "
 "immediately and returns [code]false[/code]. If non-zero, it returns "
@@ -137952,6 +142424,30 @@ msgstr ""
 msgid "Returns the shader mode for the shader."
 msgstr "返回着色器的着色器模式。"
 
+msgid ""
+"Returns the list of shader uniforms that can be assigned to a "
+"[ShaderMaterial], for use with [method ShaderMaterial.set_shader_parameter] "
+"and [method ShaderMaterial.get_shader_parameter]. The parameters returned are "
+"contained in dictionaries in a similar format to the ones returned by [method "
+"Object.get_property_list].\n"
+"If argument [param get_groups] is [code]true[/code], parameter grouping hints "
+"are also included in the list."
+msgstr ""
+"返回可以赋值给 [ShaderMaterial] 的着色器 uniform 列表，可用于 [method "
+"ShaderMaterial.set_shader_parameter] 和 [method ShaderMaterial."
+"get_shader_parameter]。返回的参数包含在字典内，与 [method Object."
+"get_property_list] 返回的格式类似。\n"
+"如果参数 [param get_groups] 为 [code]true[/code]，则列表中还会包含参数分组提"
+"示。"
+
+msgid ""
+"Only available when running in the editor. Opens a popup that visualizes the "
+"generated shader code, including all variants and internal shader code. See "
+"also [method Material.inspect_native_shader_code]."
+msgstr ""
+"仅在编辑器中运行时可用。打开一个弹出窗口，其中可视化生成的着色器代码，包括所有"
+"变体和内部着色器代码。另见 [method Material.inspect_native_shader_code]。"
+
 msgid ""
 "Sets the default texture to be used with a texture uniform. The default is "
 "used if a texture is not set in the [ShaderMaterial].\n"
@@ -140050,6 +144546,14 @@ msgid ""
 "the TwoBoneIK modification."
 msgstr "设置 TwoBoneIK 修改器中作为第二个骨骼的 [Bone2D] 节点的索引。"
 
+msgid ""
+"If [code]true[/code], the bones in the modification will bend outward as "
+"opposed to inwards when contracting. If [code]false[/code], the bones will "
+"bend inwards when contracting."
+msgstr ""
+"如果为 [code]true[/code]，则该修改中的骨骼在收缩时将向外弯曲，而不是向内弯曲。"
+"如果为 [code]false[/code]，则骨骼在收缩时会向内弯曲。"
+
 msgid ""
 "The maximum distance the target can be at. If the target is farther than this "
 "distance, the modification will solve as if it's at this maximum distance. "
@@ -141507,6 +146011,41 @@ msgstr ""
 "MOUSE_FILTER_IGNORE]。\n"
 "[b]警告：[/b]这是必要的内部节点，将其移除或释放都可能造成崩溃。"
 
+msgid ""
+"If [code]true[/code], the dragger will be disabled and the children will be "
+"sized as if the [member split_offset] was [code]0[/code]."
+msgstr ""
+"如果为 [code]true[/code]，则会禁用拖动器，子节点会根据 [member split_offset] "
+"为 [code]0[/code] 时的情况来调整大小。"
+
+msgid ""
+"Highlights the drag area [Rect2] so you can see where it is during "
+"development. The drag area is gold if [member dragging_enabled] is "
+"[code]true[/code], and red if [code]false[/code]."
+msgstr ""
+"高亮拖动区域 [Rect2]，便于在开发时查看位置。[member dragging_enabled] 为 "
+"[code]true[/code] 时拖动区域为金色，为 [code]false[/code] 时则为红色。"
+
+msgid ""
+"Reduces the size of the drag area and split bar [theme_item "
+"split_bar_background] at the beginning of the container."
+msgstr ""
+"减少可拖动区域和拆分条 [theme_item split_bar_background] 在容器起始侧的大小。"
+
+msgid ""
+"Reduces the size of the drag area and split bar [theme_item "
+"split_bar_background] at the end of the container."
+msgstr ""
+"减少可拖动区域和拆分条 [theme_item split_bar_background] 在容器结尾侧的大小。"
+
+msgid ""
+"Shifts the drag area in the axis of the container to prevent the drag area "
+"from overlapping the [ScrollBar] or other selectable [Control] of a child "
+"node."
+msgstr ""
+"将拖动区域在容器轴向上进行偏移，防止拖动区域与 [ScrollBar] 或其他子节点的可选"
+"中 [Control] 发生重叠。"
+
 msgid ""
 "Determines the dragger's visibility. See [enum DraggerVisibility] for "
 "details. This property does not determine whether dragging is enabled or not. "
@@ -141578,6 +146117,36 @@ msgstr ""
 "动隐藏。如果为 [code]0[/code]（[code]false[/code]）则始终可见。[member "
 "dragger_visibility] 必须为 [constant DRAGGER_VISIBLE]。"
 
+msgid ""
+"The minimum thickness of the area users can click on to grab the split bar. "
+"This ensures that the split bar can still be dragged if [theme_item "
+"separation] or [theme_item h_grabber] / [theme_item v_grabber]'s size is too "
+"narrow to easily select."
+msgstr ""
+"拆分条上用户可点击抓取区域的最小厚度。能够确保拆分条在 [theme_item "
+"separation] 或 [theme_item h_grabber] / [theme_item v_grabber] 过窄、难以选中"
+"时仍然可以拖动。"
+
+msgid ""
+"The split bar thickness, i.e., the gap between the two children of the "
+"container. This is overridden by the size of the grabber icon if [member "
+"dragger_visibility] is set to [constant DRAGGER_VISIBLE], or [constant "
+"DRAGGER_HIDDEN], and [theme_item separation] is smaller than the size of the "
+"grabber icon in the same axis.\n"
+"[b]Note:[/b] To obtain [theme_item separation] values less than the size of "
+"the grabber icon, for example a [code]1 px[/code] hairline, set [theme_item "
+"h_grabber] or [theme_item v_grabber] to a new [ImageTexture], which "
+"effectively sets the grabber icon size to [code]0 px[/code]."
+msgstr ""
+"拆分条的粗细，即容器中两个子节点的间隙。如果 [member dragger_visibility] 为 "
+"[constant DRAGGER_VISIBLE] 或者为 [constant DRAGGER_HIDDEN] 的同时 "
+"[theme_item separation] 比拖动器图标相应方向的大小要小，这个粗细就会被拖动器图"
+"标的大小覆盖。\n"
+"[b]注意：[/b]如果要让 [theme_item separation] 比拖动器图标大小要小，例如想要设"
+"成 [code]1 px[/code] 的细线，请将 [theme_item h_grabber] 或 [theme_item "
+"v_grabber] 设为新的 [ImageTexture]，这样就把拖动器图标的大小设为了 [code]0 "
+"px[/code]。"
+
 msgid "The icon used for the grabber drawn in the middle area."
 msgstr "在中间区域绘制的抓取图标。"
 
@@ -141769,6 +146338,35 @@ msgid ""
 "A base class of the collision that interacts with [SpringBoneSimulator3D]."
 msgstr "与 [SpringBoneSimulator3D] 交互的碰撞的基类。"
 
+msgid ""
+"A collision can be a child of [SpringBoneSimulator3D]. If it is not a child "
+"of [SpringBoneSimulator3D], it has no effect.\n"
+"The colliding and sliding are done in the [SpringBoneSimulator3D]'s "
+"modification process in order of its collision list which is set by [method "
+"SpringBoneSimulator3D.set_collision_path]. If [method SpringBoneSimulator3D."
+"are_all_child_collisions_enabled] is [code]true[/code], the order matches "
+"[SceneTree].\n"
+"If [member bone] is set, it synchronizes with the bone pose of the ancestor "
+"[Skeleton3D], which is done in before the [SpringBoneSimulator3D]'s "
+"modification process as the pre-process.\n"
+"[b]Warning:[/b] A scaled [SpringBoneCollision3D] will likely not behave as "
+"expected. Make sure that the parent [Skeleton3D] and its bones are not scaled."
+msgstr ""
+"碰撞可以是 [SpringBoneSimulator3D] 的子节点。不是 [SpringBoneSimulator3D] 的子"
+"节点就没有效果。\n"
+"碰撞和滑动是在 [SpringBoneSimulator3D] 的修改过程中按照其碰撞列表的顺序进行"
+"的，该顺序由 [method SpringBoneSimulator3D.set_collision_path] 设置。如果 "
+"[method SpringBoneSimulator3D.are_all_child_collisions_enabled] 为 "
+"[code]true[/code]，则顺序与 [SceneTree] 匹配。\n"
+"如果设置了 [member bone]，则会与祖级 [Skeleton3D] 的骨骼姿势同步，在 "
+"[SpringBoneSimulator3D] 的修改过程之前作为预处理完成。\n"
+"[b]警告：[/b]存在缩放的 [SpringBoneCollision3D] 可能产生预料之外的行为。请确保"
+"父级 [Skeleton3D] 及其骨骼没有缩放。"
+
+msgid ""
+"Get parent [Skeleton3D] node of the parent [SpringBoneSimulator3D] if found."
+msgstr "获取父级 [SpringBoneSimulator3D] 的父级 [Skeleton3D] 节点。"
+
 msgid ""
 "The offset of the position from [Skeleton3D]'s [member bone] pose position."
 msgstr "位置的偏移量，相对于 [Skeleton3D] 的 [member bone] 姿势位置。"
@@ -141780,6 +146378,86 @@ msgstr "旋转的偏移量，相对于 [Skeleton3D] 的 [member bone] 姿势旋
 msgid "A capsule shape collision that interacts with [SpringBoneSimulator3D]."
 msgstr "与 [SpringBoneSimulator3D] 交互的胶囊形状碰撞体。"
 
+msgid ""
+"If [code]true[/code], the collision acts to trap the joint within the "
+"collision."
+msgstr "如果为 [code]true[/code]，则碰撞会让关节困在碰撞中。"
+
+msgid "A infinite plane collision that interacts with [SpringBoneSimulator3D]."
+msgstr "与 [SpringBoneSimulator3D] 交互的无限延伸的平面碰撞。"
+
+msgid ""
+"A infinite plane collision that interacts with [SpringBoneSimulator3D]. It is "
+"an infinite size XZ plane, and the +Y direction is treated as normal."
+msgstr ""
+"与 [SpringBoneSimulator3D] 交互的无限延伸的平面碰撞，是无穷大的 XZ 平面，+Y 方"
+"向为法线。"
+
+msgid "A sphere shape collision that interacts with [SpringBoneSimulator3D]."
+msgstr "与 [SpringBoneSimulator3D] 交互的球形碰撞。"
+
+msgid "The sphere's radius."
+msgstr "球体的半径。"
+
+msgid "A [SkeletonModifier3D] to apply inertial wavering to bone chains."
+msgstr "对骨骼链应用惯性摆动的 [SkeletonModifier3D]。"
+
+msgid ""
+"This [SkeletonModifier3D] can be used to wiggle hair, cloth, and tails. This "
+"modifier behaves differently from [PhysicalBoneSimulator3D] as it attempts to "
+"return the original pose after modification.\n"
+"If you setup [method set_root_bone] and [method set_end_bone], it is treated "
+"as one bone chain. Note that it does not support a branched chain like Y-"
+"shaped chains.\n"
+"When a bone chain is created, an array is generated from the bones that exist "
+"in between and listed in the joint list.\n"
+"Several properties can be applied to each joint, such as [method "
+"set_joint_stiffness], [method set_joint_drag], and [method "
+"set_joint_gravity].\n"
+"For simplicity, you can set values to all joints at the same time by using a "
+"[Curve]. If you want to specify detailed values individually, set [method "
+"set_individual_config] to [code]true[/code].\n"
+"For physical simulation, [SpringBoneSimulator3D] can have children as self-"
+"standing collisions that are not related to [PhysicsServer3D], see also "
+"[SpringBoneCollision3D].\n"
+"[b]Warning:[/b] A scaled [SpringBoneSimulator3D] will likely not behave as "
+"expected. Make sure that the parent [Skeleton3D] and its bones are not scaled."
+msgstr ""
+"这种 [SkeletonModifier3D] 可以用来扭动头发、布料和尾巴，其行为与 "
+"[PhysicalBoneSimulator3D] 不同，修改后会尝试返回到原始姿势。\n"
+"如果设置了 [method set_root_bone] 和 [method set_end_bone] 就会将其视为骨骼"
+"链。请注意，不支持像 Y 形链那样的分支链。\n"
+"创建骨骼链时会根据首尾之间的骨骼生成数组，在关节列表中展示。\n"
+"每个关节都有许多属性可以应用，例如 [method set_joint_stiffness]、[method "
+"set_joint_drag] 和 [method set_joint_gravity]。\n"
+"为了简化操作，你可以使用 [Curve] 同时设置所有关节的值。如果你想单独指定详细"
+"值，请将 [method set_individual_config] 设置为 [code]true[/code]。\n"
+"物理模拟时，[SpringBoneSimulator3D] 可以有子对象作为独立的碰撞体，这些碰撞体"
+"与 [PhysicsServer3D] 无关，另见 [SpringBoneCollision3D]。\n"
+"[b]警告：[/b]缩放后的 [SpringBoneSimulator3D] 可能不会按预期行为。请确保父级 "
+"[Skeleton3D] 及其骨骼没有缩放。"
+
+msgid ""
+"Returns [code]true[/code] if the all child [SpringBoneCollision3D]s are "
+"contained in the collision list at [param index] in the settings."
+msgstr ""
+"如果所有子 [SpringBoneCollision3D] 都包含在设置中索引为 [param index] 的碰撞列"
+"表中，则返回 [code]true[/code]。"
+
+msgid ""
+"Clears all collisions from the collision list at [param index] in the "
+"settings when [method are_all_child_collisions_enabled] is [code]false[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]false[/code] 时，清空设"
+"置中索引为 [param index] 的碰撞列表中的所有碰撞。"
+
+msgid ""
+"Clears all exclude collisions from the collision list at [param index] in the "
+"settings when [method are_all_child_collisions_enabled] is [code]true[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]true[/code] 时，清空设置"
+"中索引为 [param index] 的碰撞列表中的所有排除碰撞。"
+
 msgid "Clears all settings."
 msgstr "清空所有设置。"
 
@@ -141789,12 +146467,198 @@ msgstr "返回骨骼链中间骨骼的索引。"
 msgid "Returns the center bone name of the bone chain."
 msgstr "返回骨骼链中间骨骼的名称。"
 
+msgid "Returns what the center originates from in the bone chain."
+msgstr "返回骨骼链中心的来源。"
+
+msgid "Returns the center node path of the bone chain."
+msgstr "返回骨骼链中心节点的路径。"
+
+msgid ""
+"Returns the collision count of the bone chain's collision list when [method "
+"are_all_child_collisions_enabled] is [code]false[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]false[/code] 时，返回骨"
+"骼链的碰撞列表中的碰撞数量。"
+
+msgid ""
+"Returns the node path of the [SpringBoneCollision3D] at [param collision] in "
+"the bone chain's collision list when [method "
+"are_all_child_collisions_enabled] is [code]false[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]false[/code] 时，返回骨"
+"骼链的碰撞列表中 [param collision] 的 [SpringBoneCollision3D] 节点路径。"
+
+msgid "Returns the drag force damping curve of the bone chain."
+msgstr "返回骨骼链的阻力阻尼曲线。"
+
 msgid "Returns the end bone index of the bone chain."
 msgstr "返回骨骼链末尾骨骼的索引。"
 
+msgid ""
+"Returns the end bone's tail direction of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，返回骨骼链末端骨骼的"
+"尾部方向。"
+
+msgid ""
+"Returns the end bone's tail length of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，返回骨骼链末端骨骼的"
+"尾部长度。"
+
 msgid "Returns the end bone name of the bone chain."
 msgstr "返回骨骼链末尾骨骼的名称。"
 
+msgid ""
+"Returns the exclude collision count of the bone chain's exclude collision "
+"list when [method are_all_child_collisions_enabled] is [code]true[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]true[/code] 时，返回骨骼"
+"链的排除碰撞列表中的排除碰撞数量。"
+
+msgid ""
+"Returns the node path of the [SpringBoneCollision3D] at [param collision] in "
+"the bone chain's exclude collision list when [method "
+"are_all_child_collisions_enabled] is [code]true[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]true[/code] 时，返回骨骼"
+"链的排除碰撞列表中 [param collision] 的 [SpringBoneCollision3D] 节点路径。"
+
+msgid "Returns the gravity amount of the bone chain."
+msgstr "返回骨骼链的重力强度。"
+
+msgid "Returns the gravity amount damping curve of the bone chain."
+msgstr "返回骨骼链的重力强度阻尼曲线。"
+
+msgid "Returns the gravity direction of the bone chain."
+msgstr "返回骨骼链的重力方向。"
+
+msgid "Returns the bone index at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中位于 [param joint] 的骨骼的索引。"
+
+msgid "Returns the bone name at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中位于 [param joint] 的骨骼的名称。"
+
+msgid "Returns the joint count of the bone chain's joint list."
+msgstr "返回骨骼链关节列表中的关节数量。"
+
+msgid "Returns the drag force at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 关节的阻力。"
+
+msgid ""
+"Returns the gravity amount at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 关节的重力强度。"
+
+msgid ""
+"Returns the gravity direction at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 关节的重力方向。"
+
+msgid "Returns the radius at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 关节的半径。"
+
+msgid ""
+"Returns the rotation axis at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 关节的旋转轴。"
+
+msgid ""
+"Returns the stiffness force at [param joint] in the bone chain's joint list."
+msgstr "返回骨骼链关节列表中 [param joint] 关节的刚度力。"
+
+msgid "Returns the joint radius of the bone chain."
+msgstr "返回骨骼链的关节半径。"
+
+msgid "Returns the joint radius damping curve of the bone chain."
+msgstr "返回骨骼链的关节半径阻尼曲线。"
+
+msgid "Returns the root bone index of the bone chain."
+msgstr "返回骨骼链根骨骼的索引。"
+
+msgid "Returns the root bone name of the bone chain."
+msgstr "返回骨骼链根骨骼的名称。"
+
+msgid "Returns the rotation axis of the bone chain."
+msgstr "返回骨骼链的旋转轴。"
+
+msgid "Returns the stiffness force of the bone chain."
+msgstr "返回骨骼链的刚度力。"
+
+msgid "Returns the stiffness force damping curve of the bone chain."
+msgstr "返回骨骼链的刚度力阻尼曲线。"
+
+msgid ""
+"Returns [code]true[/code] if the config can be edited individually for each "
+"joint."
+msgstr "如果可以为每个关节单独编辑配置，则返回 [code]true[/code]。"
+
+msgid "Returns [code]true[/code] if the end bone is extended to have the tail."
+msgstr "如果末端骨骼被扩展形成尾部，则返回 [code]true[/code]。"
+
+msgid ""
+"Resets a simulating state with respect to the current bone pose.\n"
+"It is useful to prevent the simulation result getting violent. For example, "
+"calling this immediately after a call to [method AnimationPlayer.play] "
+"without a fading, or within the previous [signal SkeletonModifier3D."
+"modification_processed] signal if it's condition changes significantly."
+msgstr ""
+"重置与当前骨骼姿势相关的模拟状态。\n"
+"这样做有助于防止模拟结果变得剧烈。例如在不带渐变调用 [method AnimationPlayer."
+"play] 之后立即调用该方法，或者在前一个 [signal SkeletonModifier3D."
+"modification_processed] 信号中当条件发生显著变化时调用。"
+
+msgid "Sets the center bone index of the bone chain."
+msgstr "设置骨骼链中心骨骼的索引。"
+
+msgid "Sets the center bone name of the bone chain."
+msgstr "设置骨骼链中心骨骼的名称。"
+
+msgid ""
+"Sets what the center originates from in the bone chain.\n"
+"Bone movement is calculated based on the difference in relative distance "
+"between center and bone in the previous and next frames.\n"
+"For example, if the parent [Skeleton3D] is used as the center, the bones are "
+"considered to have not moved if the [Skeleton3D] moves in the world.\n"
+"In this case, only a change in the bone pose is considered to be a bone "
+"movement."
+msgstr ""
+"设置骨骼链中心的来源。\n"
+"骨骼的移动是基于中心与骨骼在前后帧之间相对距离的变化来计算的。\n"
+"例如将父级 [Skeleton3D] 用作中心，那么 [Skeleton3D] 在世界中移动时，骨骼就会被"
+"视为没有移动。\n"
+"在这种情况下，只有骨骼姿势的变化才被视为骨骼的移动。"
+
+msgid "Sets the center node path of the bone chain."
+msgstr "设置骨骼链中心节点的路径。"
+
+msgid ""
+"Sets the number of collisions in the collision list at [param index] in the "
+"settings when [method are_all_child_collisions_enabled] is [code]false[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]false[/code] 时，设置索"
+"引为 [param index] 的碰撞列表中的碰撞数量。"
+
+msgid ""
+"Sets the node path of the [SpringBoneCollision3D] at [param collision] in the "
+"bone chain's collision list when [method are_all_child_collisions_enabled] is "
+"[code]false[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]false[/code] 时，设置骨"
+"骼链的碰撞列表中 [param collision] 的 [SpringBoneCollision3D] 节点路径。"
+
+msgid ""
+"Sets the drag force of the bone chain. The greater the value, the more "
+"suppressed the wiggling.\n"
+"The value is scaled by [method set_drag_damping_curve] and cached in each "
+"joint setting in the joint list."
+msgstr ""
+"设置骨骼链的阻力。值越大，摆动越受到抑制。\n"
+"该值由 [method set_drag_damping_curve] 进行缩放，并缓存到关节列表中每个关节的"
+"设置中。"
+
+msgid "Sets the drag force damping curve of the bone chain."
+msgstr "设置骨骼链的阻力阻尼曲线。"
+
 msgid ""
 "If sets [param enabled] to [code]true[/code], the all child "
 "[SpringBoneCollision3D]s are collided and [method set_exclude_collision_path] "
@@ -141808,6 +146672,49 @@ msgstr ""
 "如果将 [param enabled] 设置为 [code]false[/code]，则需要手动使用 [method "
 "set_collision_path] 注册所有有效的碰撞。"
 
+msgid "Sets the end bone index of the bone chain."
+msgstr "设置骨骼链中末端骨骼的索引。"
+
+msgid ""
+"Sets the end bone tail direction of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，设置骨骼链中末端骨骼"
+"的尾部方向。"
+
+msgid ""
+"Sets the end bone tail length of the bone chain when [method "
+"is_end_bone_extended] is [code]true[/code]."
+msgstr ""
+"当 [method is_end_bone_extended] 为 [code]true[/code] 时，设置骨骼链中末端骨骼"
+"的尾部长度。"
+
+msgid ""
+"Sets the end bone name of the bone chain.\n"
+"[b]Note:[/b] End bone must be the root bone or a child of the root bone. If "
+"they are the same, the tail must be extended by [method set_extend_end_bone] "
+"to jiggle the bone."
+msgstr ""
+"设置骨骼链中末端骨骼的名称。\n"
+"[b]注意：[/b] 末端骨骼必须是根骨骼或根骨骼的子骨骼。如果相同，则必须通过 "
+"[method set_extend_end_bone] 扩展尾部，使骨骼产生摆动。"
+
+msgid ""
+"Sets the number of exclude collisions in the exclude collision list at [param "
+"index] in the settings when [method are_all_child_collisions_enabled] is "
+"[code]true[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]true[/code] 时，设置索引"
+"为 [param index] 的排除碰撞列表中的排除碰撞数量。"
+
+msgid ""
+"Sets the node path of the [SpringBoneCollision3D] at [param collision] in the "
+"bone chain's exclude collision list when [method "
+"are_all_child_collisions_enabled] is [code]true[/code]."
+msgstr ""
+"当 [method are_all_child_collisions_enabled] 为 [code]true[/code] 时，设置骨骼"
+"链的排除碰撞列表中 [param collision] 的 [SpringBoneCollision3D] 节点路径。"
+
 msgid ""
 "If [param enabled] is [code]true[/code], the end bone is extended to have the "
 "tail.\n"
@@ -141853,12 +146760,97 @@ msgid ""
 msgstr ""
 "如果 [param enabled] 为 [code]true[/code]，则可以为每个关节单独编辑配置。"
 
+msgid ""
+"Sets the drag force at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"当 [method is_config_individual] 为 [code]true[/code] 时，设置骨骼链关节列表"
+"中 [param joint] 关节的阻力。"
+
+msgid ""
+"Sets the gravity amount at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"当 [method is_config_individual] 为 [code]true[/code] 时，设置骨骼链关节列表"
+"中 [param joint] 关节的重力强度。"
+
+msgid ""
+"Sets the gravity direction at [param joint] in the bone chain's joint list "
+"when [method is_config_individual] is [code]true[/code]."
+msgstr ""
+"当 [method is_config_individual] 为 [code]true[/code] 时，设置骨骼链关节列表"
+"中 [param joint] 关节的重力方向。"
+
+msgid ""
+"Sets the joint radius at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"当 [method is_config_individual] 为 [code]true[/code] 时，设置骨骼链关节列表"
+"中 [param joint] 关节的半径。"
+
+msgid ""
+"Sets the rotation axis at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"当 [method is_config_individual] 为 [code]true[/code] 时，设置骨骼链关节列表"
+"中 [param joint] 关节的旋转轴。"
+
+msgid ""
+"Sets the stiffness force at [param joint] in the bone chain's joint list when "
+"[method is_config_individual] is [code]true[/code]."
+msgstr ""
+"当 [method is_config_individual] 为 [code]true[/code] 时，设置骨骼链关节列表"
+"中 [param joint] 关节的刚度力。"
+
+msgid ""
+"Sets the joint radius of the bone chain. It is used to move and slide with "
+"the [SpringBoneCollision3D] in the collision list.\n"
+"The value is scaled by [method set_radius_damping_curve] and cached in each "
+"joint setting in the joint list."
+msgstr ""
+"设置骨骼链的关节半径，用于在碰撞列表中与 [SpringBoneCollision3D] 一起移动和滑"
+"动。\n"
+"该值由 [method set_radius_damping_curve] 进行缩放，并缓存到关节列表中每个关节"
+"的设置中。"
+
+msgid "Sets the joint radius damping curve of the bone chain."
+msgstr "设置骨骼链的关节半径阻尼曲线。"
+
 msgid "Sets the root bone index of the bone chain."
 msgstr "设置骨骼链中根骨骼的索引。"
 
 msgid "Sets the root bone name of the bone chain."
 msgstr "设置骨骼链中根骨骼的名称。"
 
+msgid ""
+"Sets the rotation axis of the bone chain. If sets a specific axis, it acts "
+"like a hinge joint.\n"
+"The value is cached in each joint setting in the joint list.\n"
+"[b]Note:[/b] The rotation axis and the forward vector shouldn't be colinear "
+"to avoid unintended rotation since [SpringBoneSimulator3D] does not factor in "
+"twisting forces."
+msgstr ""
+"设置骨骼链的旋转轴。如果设置了特定的轴，效果就会像铰链关节一样。\n"
+"该值会缓存到关节列表中的每个关节的设置中。\n"
+"[b]注意：[/b]由于 [SpringBoneSimulator3D] 不考虑扭转力，旋转轴和前进向量不应共"
+"线，以避免意外旋转。"
+
+msgid ""
+"Sets the stiffness force of the bone chain. The greater the value, the faster "
+"it recovers to its initial pose.\n"
+"If [param stiffness] is [code]0[/code], the modified pose will not return to "
+"the original pose.\n"
+"The value is scaled by [method set_stiffness_damping_curve] and cached in "
+"each joint setting in the joint list."
+msgstr ""
+"设置骨骼链的刚度力。值越大，恢复到初始姿势的速度越快。\n"
+"如果 [param stiffness] 为 [code]0[/code]，则修改后的姿势不会返回到原始姿势。\n"
+"该值由 [method set_stiffness_damping_curve] 进行缩放，并缓存到关节列表中每个关"
+"节的设置中。"
+
+msgid "Sets the stiffness force damping curve of the bone chain."
+msgstr "设置骨骼链的刚度力阻尼曲线。"
+
 msgid "The number of settings."
 msgstr "设置的数量。"
 
@@ -147913,6 +152905,20 @@ msgstr ""
 "如果鼠标位于选区之上则返回 [code]true[/code]。如果 [param edges] 为 "
 "[code]true[/code]，则边界会被认为是选区的一部分。"
 
+msgid ""
+"Returns [code]true[/code] if overtype mode is enabled. See [method "
+"set_overtype_mode_enabled]."
+msgstr ""
+"如果启用了改写模式，则返回 [code]true[/code]。见 [method "
+"set_overtype_mode_enabled]。"
+
+msgid ""
+"Merge the gutters from [param from_line] into [param to_line]. Only "
+"overwritable gutters will be copied. See [method set_gutter_overwritable]."
+msgstr ""
+"合并从 [param from_line] 到 [param to_line] 的边栏。只会复制可覆盖的边栏。见 "
+"[method set_gutter_overwritable]。"
+
 msgid ""
 "Merges any overlapping carets. Will favor the newest caret, or the caret with "
 "a selection.\n"
@@ -147960,6 +152966,9 @@ msgstr ""
 "移除给定的文本光标索引。\n"
 "[b]注意：[/b]可能导致所有其他光标索引的调整。"
 
+msgid "Removes the gutter at the given index."
+msgstr "移除给定索引的边栏。"
+
 msgid ""
 "Removes the line of text at [param line]. Carets on this line will attempt to "
 "match their previous visual x position.\n"
@@ -148093,6 +153102,26 @@ msgstr ""
 "[b]注意：[/b]如果支持多个光标，则不会检查任何重叠。请参阅 [method "
 "merge_overlapping_carets]。"
 
+msgid ""
+"If [code]true[/code], the mouse cursor will change to a pointing hand "
+"([constant Control.CURSOR_POINTING_HAND]) when hovering over the gutter at "
+"the given index. See [method is_gutter_clickable] and [method "
+"set_line_gutter_clickable]."
+msgstr ""
+"如果为 [code]true[/code]，则鼠标悬停在给定索引的边栏上时，光标会变为指点手的形"
+"状（[constant Control.CURSOR_POINTING_HAND]）。见 [method "
+"is_gutter_clickable] 和 [method set_line_gutter_clickable]。"
+
+msgid ""
+"Set a custom draw callback for the gutter at the given index. [param "
+"draw_callback] must take the following arguments: A line index [int], a "
+"gutter index [int], and an area [Rect2]. This callback only works when the "
+"gutter type is [constant GUTTER_TYPE_CUSTOM] (see [method set_gutter_type])."
+msgstr ""
+"为给定索引的边栏设置自定义的绘制回调。[param draw_callback] 必须接受以下参数："
+"行索引 [int]、边栏索引 [int]、区域 [Rect2]。仅当边栏类型为 [constant "
+"GUTTER_TYPE_CUSTOM] 时回调才有效（见 [method set_gutter_type]）。"
+
 msgid ""
 "If [code]true[/code], the gutter at the given index is drawn. The gutter type "
 "([method set_gutter_type]) determines how it is drawn. See [method "
@@ -148189,6 +153218,16 @@ msgstr ""
 "将 [param line] 上的 [param gutter] 的文本设置为 [param text]。仅当边栏类型为 "
 "[constant GUTTER_TYPE_STRING] 时才有效（请参阅 [method set_gutter_type]）。"
 
+msgid ""
+"If [code]true[/code], enables overtype mode. In this mode, typing overrides "
+"existing text instead of inserting text. The [member ProjectSettings.input/"
+"ui_text_toggle_insert_mode] action toggles overtype mode. See [method "
+"is_overtype_mode_enabled]."
+msgstr ""
+"如果为 [code]true[/code]，则启用改写模式。在改写模式下，打字会覆盖已有文本而不"
+"是插入文本。[member ProjectSettings.input/ui_text_toggle_insert_mode] 动作会开"
+"关改写模式。见 [method is_overtype_mode_enabled]。"
+
 msgid ""
 "Sets the search [param flags]. This is used with [method set_search_text] to "
 "highlight occurrences of the searched text. Search flags can be specified "
@@ -165111,6 +170150,24 @@ msgstr ""
 "如果车轮没有与表面接触，或者接触的实体不是 [PhysicsBody3D]，则返回 "
 "[code]null[/code]。"
 
+msgid ""
+"Returns the normal of the suspension's collision in world space if the wheel "
+"is in contact. If the wheel isn't in contact with anything, returns a vector "
+"pointing directly along the suspension axis toward the vehicle in world space."
+msgstr ""
+"如果轮子与物体接触，则返回悬挂碰撞的法线，使用世界空间。如果轮子没有与任何物体"
+"接触，则返回一个指向悬挂轴方向、朝向车辆的向量，使用世界空间。"
+
+msgid ""
+"Returns the point of the suspension's collision in world space if the wheel "
+"is in contact. If the wheel isn't in contact with anything, returns the "
+"maximum point of the wheel's ray cast in world space, which is defined by "
+"[code]wheel_rest_length + wheel_radius[/code]."
+msgstr ""
+"如果轮子与物体接触，则返回悬挂的碰撞点，使用世界空间。如果轮子没有与任何物体接"
+"触，则返回轮子射线投射的最大点，使用世界空间，该点由 [code]wheel_rest_length "
+"+ wheel_radius[/code] 定义。"
+
 msgid "Returns the rotational speed of the wheel in revolutions per minute."
 msgstr "返回轮子的旋转速度，单位为每分钟转数。"
 
@@ -165137,6 +170194,33 @@ msgstr ""
 "力，取决于车辆的 [member RigidBody3D.mass]。对于质量被设置为 1000 的车辆，尝试"
 "使用 25 - 30 范围内的值进行紧急制动。"
 
+msgid ""
+"The damping applied to the suspension spring when being compressed, meaning "
+"when the wheel is moving up relative to the vehicle. It is measured in Newton-"
+"seconds per millimeter (N⋅s/mm), or megagrams per second (Mg/s). This value "
+"should be between 0.0 (no damping) and 1.0, but may be more. A value of 0.0 "
+"means the car will keep bouncing as the spring keeps its energy. A good value "
+"for this is around 0.3 for a normal car, 0.5 for a race car."
+msgstr ""
+"悬挂弹簧处于压缩状态时施加的阻尼，此时的车轮在相对于车辆向上移动。单位为牛顿·"
+"秒每毫米（N⋅s/mm）或兆克每秒（Mg/s）。这个值应该在 0.0（无阻尼）和 1.0 之间，"
+"但也可能更高。值为 0.0 表示汽车会持续弹跳，因为弹簧能够保持能量。普通汽车设为 "
+"0.3 左右、赛车设为 0.5 左右比较好。"
+
+msgid ""
+"The damping applied to the suspension spring when rebounding or extending, "
+"meaning when the wheel is moving down relative to the vehicle. It is measured "
+"in Newton-seconds per millimeter (N⋅s/mm), or megagrams per second (Mg/s). "
+"This value should be between 0.0 (no damping) and 1.0, but may be more. This "
+"value should always be slightly higher than the [member damping_compression] "
+"property. For a [member damping_compression] value of 0.3, try a relaxation "
+"value of 0.5."
+msgstr ""
+"悬挂弹簧回弹或伸展时施加的阻尼，此时的车轮在相对于车辆向下移动。单位为牛顿·秒"
+"每毫米（N⋅s/mm）或兆克每秒（Mg/s）。这个值应该在 0.0（无阻尼）和 1.0 之间，但"
+"也可能更高。这个值应该始终略高于 [member damping_compression] 属性。对于 "
+"[member damping_compression] 值为 0.3 的情况，请尝试将放松值设为 0.5。"
+
 msgid ""
 "Accelerates the wheel by applying an engine force. The wheel is only sped up "
 "if it is in contact with a surface. The [member RigidBody3D.mass] of the "
@@ -165167,6 +170251,16 @@ msgstr ""
 "的四分之一，否则该弹簧无法承载车辆的重量。大约 3 到 4 倍这个数字的值通常会获得"
 "良好的结果。"
 
+msgid ""
+"The stiffness of the suspension, measured in Newtons per millimeter (N/mm), "
+"or megagrams per second squared (Mg/s²). Use a value lower than 50 for an off-"
+"road car, a value between 50 and 100 for a race car and try something around "
+"200 for something like a Formula 1 car."
+msgstr ""
+"悬挂的刚度，测量单位为牛顿每毫米（N/mm）或兆克每平方秒（Mg/s²）。越野车使用低"
+"于 50 的值，赛车使用 50 到 100 之间的值，类似于一级方程式赛车的车辆请尝试使用 "
+"200 左右的值。"
+
 msgid ""
 "This is the distance the suspension can travel. As Godot units are equivalent "
 "to meters, keep this setting relatively low. Try a value between 0.1 and 0.3 "
@@ -172132,7 +177226,7 @@ msgstr ""
 "这对已经初始化的接口没有任何影响。\n"
 "可能的值来自 [url=https://developer.mozilla.org/en-US/docs/Web/API/"
 "XRReferenceSpaceType]WebXR 的 XRReferenceSpaceType[/url]，或包含其他功能，如 "
-"[code]\"hand-tracking\"[/code] 以启用手部追踪。"
+"[code]\"hand-tracking\"[/code] 以启用手部跟踪。"
 
 msgid ""
 "The reference space type (from the list of requested types set in the [member "
@@ -172190,7 +177284,7 @@ msgstr ""
 "这对已经初始化的接口没有任何影响。\n"
 "可能的值来自 [url=https://developer.mozilla.org/en-US/docs/Web/API/"
 "XRReferenceSpaceType]WebXR 的 XRReferenceSpaceType[/url]，或包含其他功能，如 "
-"[code]\"hand-tracking\"[/code] 以启用手部追踪。"
+"[code]\"hand-tracking\"[/code] 以启用手部跟踪。"
 
 msgid ""
 "The session mode used by [method XRInterface.initialize] when setting up the "
@@ -175265,20 +180359,20 @@ msgid "Sets the transform for the given hand joint."
 msgstr "设置给定手部关节的变换。"
 
 msgid "The source of the hand tracking data."
-msgstr "手部追踪数据的来源。"
+msgstr "手部跟踪数据的来源。"
 
 msgid "If [code]true[/code], the hand tracking data is valid."
-msgstr "如果为 [code]true[/code]，则手部追踪数据有效。"
+msgstr "如果为 [code]true[/code]，则手部跟踪数据有效。"
 
 msgid "The source of hand tracking data is unknown."
-msgstr "手部追踪数据的来源未知。"
+msgstr "手部跟踪数据的来源未知。"
 
 msgid ""
 "The source of hand tracking data is unobstructed, meaning that an accurate "
 "method of hand tracking is used. These include optical hand tracking, data "
 "gloves, etc."
 msgstr ""
-"手部追踪数据来源畅通，这意味着使用了准确的手部追踪方法。其中包括光学手部追踪、"
+"手部跟踪数据来源畅通，这意味着使用了准确的手部跟踪方法。其中包括光学手部跟踪、"
 "数据手套等。"
 
 msgid ""
diff --git a/engine/doc/translations/zh_TW.po b/engine/doc/translations/zh_TW.po
index aff41ef9..22c0966d 100644
--- a/engine/doc/translations/zh_TW.po
+++ b/engine/doc/translations/zh_TW.po
@@ -45948,12 +45948,6 @@ msgid ""
 "scroll to accommodate it."
 msgstr "[LineEdit] 中游標的列位置。設定後文字可能會滾動以適應它。"
 
-msgid ""
-"If [code]true[/code], the [LineEdit] will always show the caret, even if "
-"focus is lost."
-msgstr ""
-"如果為 [code]true[/code]，則該 [LineEdit] 會始終顯示游標，即使焦點丟失。"
-
 msgid ""
 "Allow moving caret, selecting and removing the individual composite character "
 "components.\n"
diff --git a/engine/drivers/SCsub b/engine/drivers/SCsub
index 153298c9..b5624b17 100644
--- a/engine/drivers/SCsub
+++ b/engine/drivers/SCsub
@@ -26,12 +26,19 @@ if env["xaudio2"]:
         print_error("Target platform '{}' does not support the XAudio2 audio driver".format(env["platform"]))
         Exit(255)
     SConscript("xaudio2/SCsub")
+
 # Shared Apple platform drivers
 if env["platform"] in ["macos", "ios"]:
     SConscript("apple/SCsub")
+
+# Accessibility
+if env["accesskit"] and env["platform"] in ["macos", "windows", "linuxbsd"]:
+    SConscript("accesskit/SCsub")
+
 # Midi drivers
 SConscript("alsamidi/SCsub")
-SConscript("coremidi/SCsub")
+if env["platform"] in ["macos", "ios"]:
+    SConscript("coremidi/SCsub")
 SConscript("winmidi/SCsub")
 
 # Graphics drivers
diff --git a/engine/drivers/accesskit/SCsub b/engine/drivers/accesskit/SCsub
new file mode 100644
index 00000000..6365898a
--- /dev/null
+++ b/engine/drivers/accesskit/SCsub
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+# Driver source files
+env.add_source_files(env.drivers_sources, "accessibility_driver_accesskit.cpp")
+
+if env["accesskit_sdk_path"] == "":
+    if env["platform"] == "windows":
+        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-dll_wrap.c")
+    if env["platform"] == "macos":
+        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-dylib_wrap.c")
+    if env["platform"] == "linuxbsd":
+        env.add_source_files(env.drivers_sources, "dynwrappers/accesskit-so_wrap.c")
+    env.Prepend(CPPPATH=["#thirdparty/accesskit/include"])
diff --git a/engine/drivers/accesskit/accessibility_driver_accesskit.cpp b/engine/drivers/accesskit/accessibility_driver_accesskit.cpp
new file mode 100644
index 00000000..1ab3137d
--- /dev/null
+++ b/engine/drivers/accesskit/accessibility_driver_accesskit.cpp
@@ -0,0 +1,1653 @@
+/**************************************************************************/
+/*  accessibility_driver_accesskit.cpp                                    */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifdef ACCESSKIT_ENABLED
+
+#include "accessibility_driver_accesskit.h"
+
+#include "core/config/project_settings.h"
+#include "core/version.h"
+
+#include "servers/text_server.h"
+
+AccessibilityDriverAccessKit *AccessibilityDriverAccessKit::singleton = nullptr;
+
+_FORCE_INLINE_ accesskit_role AccessibilityDriverAccessKit::_accessibility_role(DisplayServer::AccessibilityRole p_role) const {
+	if (role_map.has(p_role)) {
+		return role_map[p_role];
+	}
+	return ACCESSKIT_ROLE_UNKNOWN;
+}
+
+_FORCE_INLINE_ accesskit_action AccessibilityDriverAccessKit::_accessibility_action(DisplayServer::AccessibilityAction p_action) const {
+	if (action_map.has(p_action)) {
+		return action_map[p_action];
+	}
+	return ACCESSKIT_ACTION_CLICK;
+}
+
+bool AccessibilityDriverAccessKit::window_create(DisplayServer::WindowID p_window_id, void *p_handle) {
+	ERR_FAIL_COND_V(windows.has(p_window_id), false);
+
+	WindowData &wd = windows[p_window_id];
+
+	AccessibilityElement *ae = memnew(AccessibilityElement);
+	ae->role = ACCESSKIT_ROLE_WINDOW;
+	ae->window_id = p_window_id;
+	wd.root_id = rid_owner.make_rid(ae);
+
+#ifdef WINDOWS_ENABLED
+	wd.adapter = accesskit_windows_subclassing_adapter_new(static_cast<HWND>(p_handle), &_accessibility_initial_tree_update_callback, (void *)(size_t)p_window_id, &_accessibility_action_callback, (void *)(size_t)p_window_id);
+#endif
+#ifdef MACOS_ENABLED
+	wd.adapter = accesskit_macos_subclassing_adapter_for_window(p_handle, &_accessibility_initial_tree_update_callback, (void *)(size_t)p_window_id, &_accessibility_action_callback, (void *)(size_t)p_window_id);
+#endif
+#ifdef LINUXBSD_ENABLED
+	wd.adapter = accesskit_unix_adapter_new(&_accessibility_initial_tree_update_callback, (void *)(size_t)p_window_id, &_accessibility_action_callback, (void *)(size_t)p_window_id, &_accessibility_deactivation_callback, (void *)(size_t)p_window_id);
+#endif
+
+	if (wd.adapter == nullptr) {
+		memdelete(ae);
+		rid_owner.free(wd.root_id);
+		windows.erase(p_window_id);
+
+		return false;
+	} else {
+		return true;
+	}
+}
+
+void AccessibilityDriverAccessKit::window_destroy(DisplayServer::WindowID p_window_id) {
+	WindowData *wd = windows.getptr(p_window_id);
+	ERR_FAIL_NULL(wd);
+
+#ifdef WINDOWS_ENABLED
+	accesskit_windows_subclassing_adapter_free(wd->adapter);
+#endif
+#ifdef MACOS_ENABLED
+	accesskit_macos_subclassing_adapter_free(wd->adapter);
+#endif
+#ifdef LINUXBSD_ENABLED
+	accesskit_unix_adapter_free(wd->adapter);
+#endif
+	accessibility_free_element(wd->root_id);
+
+	windows.erase(p_window_id);
+}
+
+void AccessibilityDriverAccessKit::_accessibility_deactivation_callback(void *p_user_data) {
+	// NOP
+}
+
+void AccessibilityDriverAccessKit::_accessibility_action_callback(struct accesskit_action_request *p_request, void *p_user_data) {
+	DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
+	ERR_FAIL_COND(!singleton->windows.has(window_id));
+
+	RID rid = RID::from_uint64(p_request->target);
+	AccessibilityElement *ae = singleton->rid_owner.get_or_null(rid);
+	ERR_FAIL_NULL(ae);
+
+	Variant rq_data;
+	if (!ae->actions.has(p_request->action) && ae->role == ACCESSKIT_ROLE_TEXT_RUN && p_request->action == ACCESSKIT_ACTION_SCROLL_INTO_VIEW) {
+		AccessibilityElement *root_ae = singleton->rid_owner.get_or_null(ae->parent);
+		ERR_FAIL_NULL(root_ae);
+		ae = root_ae;
+		rq_data = ae->run;
+	}
+
+	if (ae->actions.has(p_request->action)) {
+		Callable &cb = ae->actions[p_request->action];
+		if (cb.is_valid()) {
+			if (p_request->data.has_value) {
+				switch (p_request->data.value.tag) {
+					case ACCESSKIT_ACTION_DATA_CUSTOM_ACTION: {
+						rq_data = p_request->data.value.custom_action;
+					} break;
+					case ACCESSKIT_ACTION_DATA_VALUE: {
+						rq_data = String::utf8(p_request->data.value.value);
+					} break;
+					case ACCESSKIT_ACTION_DATA_NUMERIC_VALUE: {
+						rq_data = p_request->data.value.numeric_value;
+					} break;
+					case ACCESSKIT_ACTION_DATA_SCROLL_TARGET_RECT: {
+						rq_data = Rect2(p_request->data.value.scroll_target_rect.x0, p_request->data.value.scroll_target_rect.y0, p_request->data.value.scroll_target_rect.x1 - p_request->data.value.scroll_target_rect.x0, p_request->data.value.scroll_target_rect.y1 - p_request->data.value.scroll_target_rect.y0);
+					} break;
+					case ACCESSKIT_ACTION_DATA_SCROLL_TO_POINT: {
+						rq_data = Point2(p_request->data.value.scroll_to_point.x, p_request->data.value.scroll_to_point.y);
+					} break;
+					case ACCESSKIT_ACTION_DATA_SET_SCROLL_OFFSET: {
+						rq_data = Point2(p_request->data.value.set_scroll_offset.x, p_request->data.value.set_scroll_offset.y);
+					} break;
+					case ACCESSKIT_ACTION_DATA_SET_TEXT_SELECTION: {
+						Dictionary sel;
+
+						RID start_rid = RID::from_uint64(p_request->data.value.set_text_selection.anchor.node);
+						AccessibilityElement *start_ae = singleton->rid_owner.get_or_null(start_rid);
+						ERR_FAIL_NULL(start_ae);
+
+						RID end_rid = RID::from_uint64(p_request->data.value.set_text_selection.focus.node);
+						AccessibilityElement *end_ae = singleton->rid_owner.get_or_null(end_rid);
+						ERR_FAIL_NULL(end_ae);
+
+						sel["start_element"] = start_ae->parent;
+						sel["start_char"] = (int64_t)p_request->data.value.set_text_selection.anchor.character_index + start_ae->run.x;
+						sel["end_element"] = end_ae->parent;
+						sel["end_char"] = (int64_t)p_request->data.value.set_text_selection.focus.character_index + end_ae->run.x;
+						rq_data = sel;
+					} break;
+				}
+			}
+
+			cb.call_deferred(rq_data);
+		}
+	}
+}
+
+accesskit_tree_update *AccessibilityDriverAccessKit::_accessibility_initial_tree_update_callback(void *p_user_data) {
+	DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
+	WindowData *wd = singleton->windows.getptr(window_id);
+	ERR_FAIL_NULL_V(wd, nullptr);
+
+	accesskit_node *win_node = accesskit_node_new(ACCESSKIT_ROLE_WINDOW);
+	accesskit_node_set_label(win_node, "Godot Engine");
+	accesskit_node_set_busy(win_node);
+
+	accesskit_node_id win_id = (accesskit_node_id)wd->root_id.get_id();
+
+	accesskit_tree_update *tree_update = accesskit_tree_update_with_capacity_and_focus(1, win_id);
+
+	accesskit_tree_update_set_tree(tree_update, accesskit_tree_new(win_id));
+	accesskit_tree_update_push_node(tree_update, win_id, win_node);
+
+	return tree_update;
+}
+
+RID AccessibilityDriverAccessKit::accessibility_create_element(DisplayServer::WindowID p_window_id, DisplayServer::AccessibilityRole p_role) {
+	AccessibilityElement *ae = memnew(AccessibilityElement);
+	ae->role = _accessibility_role(p_role);
+	ae->window_id = p_window_id;
+	RID rid = rid_owner.make_rid(ae);
+
+	return rid;
+}
+
+RID AccessibilityDriverAccessKit::accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos) {
+	AccessibilityElement *parent_ae = rid_owner.get_or_null(p_parent_rid);
+	ERR_FAIL_NULL_V(parent_ae, RID());
+
+	WindowData *wd = windows.getptr(parent_ae->window_id);
+	ERR_FAIL_NULL_V(wd, RID());
+
+	AccessibilityElement *ae = memnew(AccessibilityElement);
+	ae->role = _accessibility_role(p_role);
+	ae->window_id = parent_ae->window_id;
+	ae->parent = p_parent_rid;
+	ae->node = accesskit_node_new(ae->role);
+	RID rid = rid_owner.make_rid(ae);
+	if (p_insert_pos == -1) {
+		parent_ae->children.push_back(rid);
+	} else {
+		parent_ae->children.insert(p_insert_pos, rid);
+	}
+	wd->update.insert(rid);
+
+	return rid;
+}
+
+RID AccessibilityDriverAccessKit::accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos) {
+	AccessibilityElement *parent_ae = rid_owner.get_or_null(p_parent_rid);
+	ERR_FAIL_NULL_V(parent_ae, RID());
+
+	WindowData *wd = windows.getptr(parent_ae->window_id);
+	ERR_FAIL_NULL_V(wd, RID());
+
+	AccessibilityElement *root_ae = memnew(AccessibilityElement);
+	root_ae->role = ACCESSKIT_ROLE_GENERIC_CONTAINER;
+	root_ae->window_id = parent_ae->window_id;
+	root_ae->parent = p_parent_rid;
+	root_ae->node = accesskit_node_new(root_ae->role);
+	RID root_rid = rid_owner.make_rid(root_ae);
+	if (p_insert_pos == -1) {
+		parent_ae->children.push_back(root_rid);
+	} else {
+		parent_ae->children.insert(p_insert_pos, root_rid);
+	}
+	wd->update.insert(root_rid);
+
+	float text_width = 0;
+	float text_height = p_min_height;
+	Vector<int32_t> words;
+	int64_t run_count = 0; // Note: runs in visual order.
+	const Glyph *gl = nullptr;
+	int64_t gl_count = 0;
+	int64_t gl_index = 0;
+	float run_off_x = 0.0;
+	Vector2i full_range;
+
+	if (p_shaped_text.is_valid()) {
+		text_width = TS->shaped_text_get_size(p_shaped_text).x;
+		text_height = MAX(text_height, TS->shaped_text_get_size(p_shaped_text).y);
+		words = TS->shaped_text_get_word_breaks(p_shaped_text);
+		run_count = TS->shaped_get_run_count(p_shaped_text);
+		gl = TS->shaped_text_get_glyphs(p_shaped_text);
+		gl_count = TS->shaped_text_get_glyph_count(p_shaped_text);
+		full_range = TS->shaped_text_get_range(p_shaped_text);
+	}
+
+	accesskit_rect root_rect;
+	root_rect.x0 = 0;
+	root_rect.y0 = 0;
+	root_rect.x1 = text_width;
+	root_rect.y1 = MAX(p_min_height, text_height);
+	accesskit_node_set_bounds(root_ae->node, root_rect);
+
+	// Create text element for each run.
+	Vector<AccessibilityElement *> text_elements;
+	for (int64_t i = 0; i < run_count; i++) {
+		const Vector2i range = TS->shaped_get_run_range(p_shaped_text, i);
+		String t = TS->shaped_get_run_text(p_shaped_text, i);
+
+		if (t.is_empty()) {
+			continue;
+		}
+
+		AccessibilityElement *ae = memnew(AccessibilityElement);
+		ae->role = ACCESSKIT_ROLE_TEXT_RUN;
+		ae->window_id = parent_ae->window_id;
+		ae->parent = root_rid;
+		ae->run = Vector3i(range.x, range.y, i);
+		ae->node = accesskit_node_new(ae->role);
+
+		text_elements.push_back(ae);
+
+		// UTF-8 text and char lengths.
+		Vector<uint8_t> char_lengths;
+		CharString text = t.utf8(&char_lengths);
+
+		accesskit_node_set_value(ae->node, text.ptr());
+		accesskit_node_set_character_lengths(ae->node, char_lengths.size(), char_lengths.ptr());
+
+		// Word sizes.
+		Vector<uint8_t> word_lengths;
+
+		int32_t prev = ae->run.x;
+		int32_t total = 0;
+		for (int j = 0; j < words.size(); j += 2) {
+			if (words[j] < ae->run.x) {
+				continue;
+			}
+			if (words[j] >= ae->run.y) {
+				break;
+			}
+			int32_t wlen = words[j] - prev;
+			while (wlen > 255) {
+				word_lengths.push_back(255);
+				wlen -= 255;
+				total += 255;
+			}
+			if (wlen > 0) {
+				word_lengths.push_back(wlen);
+				total += wlen;
+			}
+			prev = words[j];
+		}
+		if (total < t.length()) {
+			word_lengths.push_back(t.length() - total);
+		}
+		accesskit_node_set_word_lengths(ae->node, word_lengths.size(), word_lengths.ptr());
+
+		// Char widths and positions.
+		Vector<float> char_positions;
+		Vector<float> char_widths;
+
+		char_positions.resize_zeroed(t.length());
+		float *positions_ptr = char_positions.ptrw();
+
+		char_widths.resize_zeroed(t.length());
+		float *widths_ptr = char_widths.ptrw();
+
+		float size_x = 0.0;
+		for (int j = gl_index; j < gl_count; j += gl[j].count) {
+			if (gl[j].start >= ae->run.y) {
+				gl_index = j;
+				break;
+			}
+
+			float advance = 0.0; // Graphame advance.
+			for (int k = 0; k < gl[j].count; k++) {
+				advance += gl[j + k].advance;
+			}
+			int chars = gl[j].end - gl[j].start;
+			float adv_per_char = advance / (float)chars;
+
+			for (int k = 0; k < chars; k++) {
+				int index = gl[j].start + k - ae->run.x;
+				ERR_CONTINUE(index < 0 || index >= t.length());
+				positions_ptr[index] = size_x + adv_per_char * k;
+				widths_ptr[index] = adv_per_char;
+			}
+			size_x += advance * gl[j].repeat;
+		}
+		positions_ptr[t.length() - 1] = size_x;
+		widths_ptr[t.length() - 1] = 1.0;
+
+		accesskit_node_set_character_positions(ae->node, char_positions.size(), char_positions.ptr());
+		accesskit_node_set_character_widths(ae->node, char_widths.size(), char_widths.ptr());
+
+		RID font_rid = TS->shaped_get_run_font_rid(p_shaped_text, i);
+		if (font_rid != RID()) {
+			CharString font_name = TS->font_get_name(font_rid).utf8();
+			if (font_name.length() > 0) {
+				accesskit_node_set_font_family(ae->node, font_name.ptr());
+			}
+			if (TS->font_get_style(font_rid).has_flag(TextServer::FONT_BOLD)) {
+				accesskit_node_set_bold(ae->node);
+			}
+			if (TS->font_get_style(font_rid).has_flag(TextServer::FONT_ITALIC)) {
+				accesskit_node_set_italic(ae->node);
+			}
+			accesskit_node_set_font_weight(ae->node, TS->font_get_weight(font_rid));
+		}
+		accesskit_node_set_font_size(ae->node, TS->shaped_get_run_font_size(p_shaped_text, i));
+		CharString language = TS->shaped_get_run_language(p_shaped_text, i).utf8();
+		if (language.length() > 0) {
+			accesskit_node_set_language(ae->node, language.ptr());
+		}
+		accesskit_node_set_text_direction(ae->node, ACCESSKIT_TEXT_DIRECTION_LEFT_TO_RIGHT);
+
+		accesskit_rect rect;
+		rect.x0 = run_off_x;
+		rect.y0 = 0;
+		rect.x1 = run_off_x + size_x;
+		rect.y1 = text_height;
+		accesskit_node_set_bounds(ae->node, rect);
+		accesskit_node_add_action(ae->node, ACCESSKIT_ACTION_SCROLL_INTO_VIEW);
+
+		run_off_x += size_x;
+	}
+	{
+		// Add "\n" at the end.
+		AccessibilityElement *ae = memnew(AccessibilityElement);
+		ae->role = ACCESSKIT_ROLE_TEXT_RUN;
+		ae->window_id = parent_ae->window_id;
+		ae->parent = root_rid;
+		ae->run = Vector3i(full_range.y, full_range.y, run_count);
+		ae->node = accesskit_node_new(ae->role);
+
+		text_elements.push_back(ae);
+
+		Vector<uint8_t> char_lengths;
+		char_lengths.push_back(1);
+		accesskit_node_set_value(ae->node, "\n");
+		accesskit_node_set_character_lengths(ae->node, char_lengths.size(), char_lengths.ptr());
+
+		Vector<float> char_positions;
+		Vector<float> char_widths;
+		char_positions.push_back(0.0);
+		char_widths.push_back(1.0);
+
+		accesskit_node_set_character_positions(ae->node, char_positions.size(), char_positions.ptr());
+		accesskit_node_set_character_widths(ae->node, char_widths.size(), char_widths.ptr());
+		accesskit_node_set_text_direction(ae->node, ACCESSKIT_TEXT_DIRECTION_LEFT_TO_RIGHT);
+
+		accesskit_rect rect;
+		rect.x0 = run_off_x;
+		rect.y0 = 0;
+		rect.x1 = run_off_x + 1;
+		rect.y1 = text_height;
+		accesskit_node_set_bounds(ae->node, rect);
+	}
+
+	// Sort runs in logical order.
+	struct RunCompare {
+		_FORCE_INLINE_ bool operator()(const AccessibilityElement *l, const AccessibilityElement *r) const {
+			return l->run.x < r->run.x;
+		}
+	};
+	text_elements.sort_custom<RunCompare>();
+	for (AccessibilityElement *text_element : text_elements) {
+		RID rid = rid_owner.make_rid(text_element);
+		root_ae->children.push_back(rid);
+		wd->update.insert(rid);
+	}
+
+	return root_rid;
+}
+
+bool AccessibilityDriverAccessKit::accessibility_has_element(const RID &p_id) const {
+	return rid_owner.owns(p_id);
+}
+
+void AccessibilityDriverAccessKit::_free_recursive(WindowData *p_wd, const RID &p_id) {
+	if (p_wd && p_wd->update.has(p_id)) {
+		p_wd->update.erase(p_id);
+	}
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	for (const RID &rid : ae->children) {
+		_free_recursive(p_wd, rid);
+	}
+	if (ae->node) {
+		accesskit_node_free(ae->node);
+	}
+	memdelete(ae);
+	rid_owner.free(p_id);
+}
+
+void AccessibilityDriverAccessKit::accessibility_free_element(const RID &p_id) {
+	ERR_FAIL_COND_MSG(in_accessibility_update, "Element can't be removed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	if (ae) {
+		WindowData *wd = windows.getptr(ae->window_id);
+		AccessibilityElement *parent_ae = rid_owner.get_or_null(ae->parent);
+		if (parent_ae) {
+			parent_ae->children.erase(p_id);
+		}
+		_free_recursive(wd, p_id);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	ae->meta = p_meta;
+}
+
+Variant AccessibilityDriverAccessKit::accessibility_element_get_meta(const RID &p_id) const {
+	const AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL_V(ae, Variant());
+	return ae->meta;
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_focus(const RID &p_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	if (p_id.is_valid() && rid_owner.owns(p_id)) {
+		focus = p_id;
+	} else {
+		focus = RID();
+	}
+}
+
+RID AccessibilityDriverAccessKit::accessibility_get_window_root(DisplayServer::WindowID p_window_id) const {
+	const WindowData *wd = windows.getptr(p_window_id);
+	ERR_FAIL_NULL_V(wd, RID());
+
+	return wd->root_id;
+}
+
+accesskit_tree_update *AccessibilityDriverAccessKit::_accessibility_build_tree_update(void *p_user_data) {
+	DisplayServer::WindowID window_id = (DisplayServer::WindowID)(size_t)p_user_data;
+
+	ERR_FAIL_COND_V(!singleton->windows.has(window_id), nullptr);
+	WindowData &wd = singleton->windows[window_id];
+
+	singleton->in_accessibility_update = true;
+	if (singleton->update_cb.is_valid()) {
+		singleton->update_cb.call(window_id);
+	}
+	singleton->in_accessibility_update = false;
+
+	AccessibilityElement *focus_ae = singleton->rid_owner.get_or_null(singleton->focus);
+	uint32_t update_size = wd.update.size();
+
+	accesskit_node_id ac_focus = (accesskit_node_id)wd.root_id.get_id();
+	if (focus_ae && focus_ae->window_id == window_id) {
+		ac_focus = (accesskit_node_id)singleton->focus.get_id();
+	}
+
+	accesskit_tree_update *tree_update = (update_size > 0) ? accesskit_tree_update_with_capacity_and_focus(update_size, ac_focus) : accesskit_tree_update_with_focus(ac_focus);
+	for (const RID &rid : wd.update) {
+		AccessibilityElement *ae = singleton->rid_owner.get_or_null(rid);
+		if (ae && ae->node) {
+			for (const RID &child_rid : ae->children) {
+				accesskit_node_push_child(ae->node, (accesskit_node_id)child_rid.get_id());
+			}
+			accesskit_tree_update_push_node(tree_update, (accesskit_node_id)rid.get_id(), ae->node);
+			ae->node = nullptr;
+		}
+	}
+	wd.update.clear();
+
+	return tree_update;
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_if_active(const Callable &p_callable) {
+	ERR_FAIL_COND(!p_callable.is_valid());
+	update_cb = p_callable;
+	for (KeyValue<DisplayServer::WindowID, WindowData> &window : windows) {
+#ifdef WINDOWS_ENABLED
+		accesskit_windows_queued_events *events = accesskit_windows_subclassing_adapter_update_if_active(window.value.adapter, _accessibility_build_tree_update, (void *)(size_t)window.key);
+		if (events) {
+			accesskit_windows_queued_events_raise(events);
+		}
+#endif
+#ifdef MACOS_ENABLED
+		accesskit_macos_queued_events *events = accesskit_macos_subclassing_adapter_update_if_active(window.value.adapter, _accessibility_build_tree_update, (void *)(size_t)window.key);
+		if (events) {
+			accesskit_macos_queued_events_raise(events);
+		}
+#endif
+#ifdef LINUXBSD_ENABLED
+		accesskit_unix_adapter_update_if_active(window.value.adapter, _accessibility_build_tree_update, (void *)(size_t)window.key);
+#endif
+	}
+	update_cb = Callable();
+}
+
+_FORCE_INLINE_ void AccessibilityDriverAccessKit::_ensure_node(const RID &p_id, AccessibilityElement *p_ae) {
+	if (unlikely(!p_ae->node)) {
+		WindowData *wd = windows.getptr(p_ae->window_id);
+		ERR_FAIL_NULL(wd);
+
+		wd->update.insert(p_id);
+		p_ae->node = accesskit_node_new(p_ae->role);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
+#ifdef LINUXBSD_ENABLED
+	const WindowData *wd = windows.getptr(p_window_id);
+	ERR_FAIL_NULL(wd);
+
+	accesskit_rect outer_bounds = { p_rect_out.position.x, p_rect_out.position.y, p_rect_out.position.x + p_rect_out.size.width, p_rect_out.position.y + p_rect_out.size.height };
+	accesskit_rect inner_bounds = { p_rect_in.position.x, p_rect_in.position.y, p_rect_in.position.x + p_rect_in.size.width, p_rect_in.position.y + p_rect_in.size.height };
+	accesskit_unix_adapter_set_root_window_bounds(wd->adapter, outer_bounds, inner_bounds);
+#endif
+}
+
+void AccessibilityDriverAccessKit::accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) {
+	const WindowData *wd = windows.getptr(p_window_id);
+	ERR_FAIL_NULL(wd);
+
+#ifdef LINUXBSD_ENABLED
+	accesskit_unix_adapter_update_window_focus_state(wd->adapter, p_focused);
+#endif
+#ifdef MACOS_ENABLED
+	accesskit_macos_queued_events *events = accesskit_macos_subclassing_adapter_update_view_focus_state(wd->adapter, p_focused);
+	if (events != nullptr) {
+		accesskit_macos_queued_events_raise(events);
+	}
+#endif
+	// Note: On Windows, the subclassing adapter takes care of this.
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	if (ae->role == _accessibility_role(p_role)) {
+		return;
+	}
+	ae->role = _accessibility_role(p_role);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_role(ae->node, ae->role);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_name(const RID &p_id, const String &p_name) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	ae->name = p_name;
+	String full_name = ae->name + " " + ae->name_extra_info;
+	if (!full_name.is_empty()) {
+		accesskit_node_set_label(ae->node, full_name.utf8().ptr());
+	} else {
+		accesskit_node_clear_label(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	ae->name_extra_info = p_name_extra_info;
+	String full_name = ae->name + " " + ae->name_extra_info;
+	if (!full_name.is_empty()) {
+		accesskit_node_set_label(ae->node, full_name.utf8().ptr());
+	} else {
+		accesskit_node_clear_label(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_description(const RID &p_id, const String &p_description) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_description.is_empty()) {
+		accesskit_node_set_description(ae->node, p_description.utf8().ptr());
+	} else {
+		accesskit_node_clear_description(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_value(const RID &p_id, const String &p_value) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_value.is_empty()) {
+		Vector<uint8_t> ch_length;
+		accesskit_node_set_value(ae->node, p_value.utf8(&ch_length).ptr());
+		accesskit_node_set_character_lengths(ae->node, ch_length.size(), ch_length.ptr());
+	} else {
+		accesskit_node_clear_value(ae->node);
+		accesskit_node_clear_character_lengths(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_tooltip.is_empty()) {
+		accesskit_node_set_tooltip(ae->node, p_tooltip.utf8().ptr());
+	} else {
+		accesskit_node_clear_tooltip(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_rect rect;
+	rect.x0 = p_rect.position.x;
+	rect.y0 = p_rect.position.y;
+	rect.x1 = p_rect.position.x + p_rect.size.x;
+	rect.y1 = p_rect.position.y + p_rect.size.y;
+	accesskit_node_set_bounds(ae->node, rect);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_affine transform = { p_transform.columns[0][0], p_transform.columns[0][1], p_transform.columns[1][0], p_transform.columns[1][1], p_transform.columns[2][0], p_transform.columns[2][1] };
+	accesskit_node_set_transform(ae->node, transform);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_child(const RID &p_id, const RID &p_child_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_child_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_push_child(ae->node, (accesskit_node_id)p_child_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_related_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_push_controlled(ae->node, (accesskit_node_id)p_related_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_related_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_push_detail(ae->node, (accesskit_node_id)p_related_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_related_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_push_described_by(ae->node, (accesskit_node_id)p_related_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_related_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_push_flow_to(ae->node, (accesskit_node_id)p_related_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_related_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_push_labelled_by(ae->node, (accesskit_node_id)p_related_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_related_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_push_to_radio_group(ae->node, (accesskit_node_id)p_related_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_other_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_active_descendant(ae->node, (accesskit_node_id)p_other_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_other_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_next_on_line(ae->node, (accesskit_node_id)p_other_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_other_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_previous_on_line(ae->node, (accesskit_node_id)p_other_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_group_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_member_of(ae->node, (accesskit_node_id)p_group_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_other_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_in_page_link_target(ae->node, (accesskit_node_id)p_other_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *other_ae = rid_owner.get_or_null(p_other_id);
+	ERR_FAIL_NULL(other_ae);
+	ERR_FAIL_COND(other_ae->window_id != ae->window_id);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_error_message(ae->node, (accesskit_node_id)p_other_id.get_id());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	switch (p_live) {
+		case DisplayServer::AccessibilityLiveMode::LIVE_OFF: {
+			accesskit_node_set_live(ae->node, ACCESSKIT_LIVE_OFF);
+		} break;
+		case DisplayServer::AccessibilityLiveMode::LIVE_POLITE: {
+			accesskit_node_set_live(ae->node, ACCESSKIT_LIVE_POLITE);
+		} break;
+		case DisplayServer::AccessibilityLiveMode::LIVE_ASSERTIVE: {
+			accesskit_node_set_live(ae->node, ACCESSKIT_LIVE_ASSERTIVE);
+		} break;
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	ae->actions[_accessibility_action(p_action)] = p_callable;
+
+	accesskit_node_add_action(ae->node, _accessibility_action(p_action));
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_action_description.is_empty()) {
+		accesskit_custom_action ca = accesskit_custom_action_new(p_action_id, p_action_description.utf8().ptr());
+		accesskit_node_push_custom_action(ae->node, ca);
+	} else {
+		String cs_name = vformat("Custom Action %d", p_action_id);
+		accesskit_custom_action ca = accesskit_custom_action_new(p_action_id, cs_name.utf8().ptr());
+		accesskit_node_push_custom_action(ae->node, ca);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_table_row_count(const RID &p_id, int p_count) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_row_count(ae->node, p_count);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_table_column_count(const RID &p_id, int p_count) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_column_count(ae->node, p_count);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_table_row_index(const RID &p_id, int p_index) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_row_index(ae->node, p_index);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_table_column_index(const RID &p_id, int p_index) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_column_index(ae->node, p_index);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_row_index(ae->node, p_row_index);
+	accesskit_node_set_column_index(ae->node, p_column_index);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_row_span(ae->node, p_row_span);
+	accesskit_node_set_column_span(ae->node, p_column_span);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_count(const RID &p_id, int p_size) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_size_of_set(ae->node, p_size);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_index(const RID &p_id, int p_index) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_position_in_set(ae->node, p_index);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_level(const RID &p_id, int p_level) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_level(ae->node, p_level);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_selected(ae->node, p_selected);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_expanded(ae->node, p_expanded);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	switch (p_popup) {
+		case DisplayServer::AccessibilityPopupType::POPUP_UNKNOWN: {
+			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_TRUE);
+		} break;
+		case DisplayServer::AccessibilityPopupType::POPUP_MENU: {
+			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_MENU);
+		} break;
+		case DisplayServer::AccessibilityPopupType::POPUP_LIST: {
+			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_LISTBOX);
+		} break;
+		case DisplayServer::AccessibilityPopupType::POPUP_TREE: {
+			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_TREE);
+		} break;
+		case DisplayServer::AccessibilityPopupType::POPUP_DIALOG: {
+			accesskit_node_set_has_popup(ae->node, ACCESSKIT_HAS_POPUP_DIALOG);
+		} break;
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_checked(const RID &p_id, bool p_checekd) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (p_checekd) {
+		accesskit_node_set_toggled(ae->node, ACCESSKIT_TOGGLED_TRUE);
+	} else {
+		accesskit_node_set_toggled(ae->node, ACCESSKIT_TOGGLED_FALSE);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_num_value(const RID &p_id, double p_position) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_numeric_value(ae->node, p_position);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_min_numeric_value(ae->node, p_min);
+	accesskit_node_set_max_numeric_value(ae->node, p_max);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_num_step(const RID &p_id, double p_step) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_numeric_value_step(ae->node, p_step);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_num_jump(const RID &p_id, double p_jump) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_numeric_value_jump(ae->node, p_jump);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_x(const RID &p_id, double p_position) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_scroll_x(ae->node, p_position);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_scroll_x_min(ae->node, p_min);
+	accesskit_node_set_scroll_x_max(ae->node, p_max);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_y(const RID &p_id, double p_position) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_scroll_y(ae->node, p_position);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_scroll_y_min(ae->node, p_min);
+	accesskit_node_set_scroll_y_max(ae->node, p_max);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (p_underline) {
+		accesskit_node_set_underline(ae->node, ACCESSKIT_TEXT_DECORATION_SOLID);
+	} else {
+		accesskit_node_clear_underline(ae->node);
+	}
+	if (p_overline) {
+		accesskit_node_set_overline(ae->node, ACCESSKIT_TEXT_DECORATION_SOLID);
+	} else {
+		accesskit_node_clear_overline(ae->node);
+	}
+	if (p_strikethrough) {
+		accesskit_node_set_strikethrough(ae->node, ACCESSKIT_TEXT_DECORATION_SOLID);
+	} else {
+		accesskit_node_clear_strikethrough(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	switch (p_align) {
+		case HORIZONTAL_ALIGNMENT_LEFT: {
+			accesskit_node_set_text_align(ae->node, ACCESSKIT_TEXT_ALIGN_LEFT);
+		} break;
+		case HORIZONTAL_ALIGNMENT_CENTER: {
+			accesskit_node_set_text_align(ae->node, ACCESSKIT_TEXT_ALIGN_RIGHT);
+		} break;
+		case HORIZONTAL_ALIGNMENT_RIGHT: {
+			accesskit_node_set_text_align(ae->node, ACCESSKIT_TEXT_ALIGN_CENTER);
+		} break;
+		case HORIZONTAL_ALIGNMENT_FILL: {
+			accesskit_node_set_text_align(ae->node, ACCESSKIT_TEXT_ALIGN_JUSTIFY);
+		} break;
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	AccessibilityElement *start_ae = rid_owner.get_or_null(p_text_start_id);
+	ERR_FAIL_NULL(start_ae);
+	ERR_FAIL_COND(start_ae->window_id != ae->window_id);
+	AccessibilityElement *end_ae = rid_owner.get_or_null(p_text_end_id);
+	ERR_FAIL_NULL(end_ae);
+	ERR_FAIL_COND(end_ae->window_id != ae->window_id);
+
+	int start_pos = p_start_char;
+	int end_pos = p_end_char;
+	RID start_rid;
+	RID end_rid;
+	for (const RID &rid : start_ae->children) {
+		const AccessibilityElement *child_ae = rid_owner.get_or_null(rid);
+		if (child_ae && child_ae->role == ACCESSKIT_ROLE_TEXT_RUN) {
+			if (p_start_char >= child_ae->run.x && p_start_char <= child_ae->run.y) {
+				start_rid = rid;
+				start_pos = p_start_char - child_ae->run.x;
+				break;
+			}
+		}
+	}
+	for (const RID &rid : end_ae->children) {
+		const AccessibilityElement *child_ae = rid_owner.get_or_null(rid);
+		if (child_ae && child_ae->role == ACCESSKIT_ROLE_TEXT_RUN) {
+			if (p_end_char >= child_ae->run.x && p_end_char <= child_ae->run.y) {
+				end_rid = rid;
+				end_pos = p_end_char - child_ae->run.x;
+				break;
+			}
+		}
+	}
+	ERR_FAIL_COND(start_rid.is_null() && end_rid.is_null());
+	_ensure_node(p_id, ae);
+
+	accesskit_text_selection sel;
+	sel.anchor.node = (accesskit_node_id)start_rid.get_id();
+	sel.anchor.character_index = start_pos;
+	sel.focus.node = (accesskit_node_id)end_rid.get_id();
+	sel.focus.character_index = end_pos;
+	accesskit_node_set_text_selection(ae->node, sel);
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	switch (p_flag) {
+		case DisplayServer::AccessibilityFlags::FLAG_HIDDEN: {
+			if (p_value) {
+				accesskit_node_set_hidden(ae->node);
+			} else {
+				accesskit_node_clear_hidden(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_LINKED: {
+			if (p_value) {
+				accesskit_node_set_linked(ae->node);
+			} else {
+				accesskit_node_clear_linked(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_MULTISELECTABLE: {
+			if (p_value) {
+				accesskit_node_set_multiselectable(ae->node);
+			} else {
+				accesskit_node_clear_multiselectable(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_REQUIRED: {
+			if (p_value) {
+				accesskit_node_set_required(ae->node);
+			} else {
+				accesskit_node_clear_required(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_VISITED: {
+			if (p_value) {
+				accesskit_node_set_visited(ae->node);
+			} else {
+				accesskit_node_clear_visited(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_BUSY: {
+			if (p_value) {
+				accesskit_node_set_busy(ae->node);
+			} else {
+				accesskit_node_clear_busy(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_MODAL: {
+			if (p_value) {
+				accesskit_node_set_modal(ae->node);
+			} else {
+				accesskit_node_clear_modal(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_TOUCH_PASSTHROUGH: {
+			if (p_value) {
+				accesskit_node_set_touch_transparent(ae->node);
+			} else {
+				accesskit_node_clear_touch_transparent(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_READONLY: {
+			if (p_value) {
+				accesskit_node_set_read_only(ae->node);
+			} else {
+				accesskit_node_clear_read_only(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_DISABLED: {
+			if (p_value) {
+				accesskit_node_set_disabled(ae->node);
+			} else {
+				accesskit_node_clear_disabled(ae->node);
+			}
+		} break;
+		case DisplayServer::AccessibilityFlags::FLAG_CLIPS_CHILDREN: {
+			if (p_value) {
+				accesskit_node_set_clips_children(ae->node);
+			} else {
+				accesskit_node_clear_clips_children(ae->node);
+			}
+		} break;
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_classname(const RID &p_id, const String &p_classname) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_classname.is_empty()) {
+		accesskit_node_set_class_name(ae->node, p_classname.utf8().ptr());
+	} else {
+		accesskit_node_clear_class_name(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_placeholder.is_empty()) {
+		accesskit_node_set_placeholder(ae->node, p_placeholder.utf8().ptr());
+	} else {
+		accesskit_node_clear_placeholder(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_language(const RID &p_id, const String &p_language) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_language(ae->node, p_language.utf8().ptr());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (p_vertical) {
+		accesskit_node_set_text_direction(ae->node, ACCESSKIT_TEXT_DIRECTION_TOP_TO_BOTTOM);
+	} else {
+		accesskit_node_set_text_direction(ae->node, ACCESSKIT_TEXT_DIRECTION_LEFT_TO_RIGHT);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (p_vertical) {
+		accesskit_node_set_orientation(ae->node, ACCESSKIT_ORIENTATION_VERTICAL);
+	} else {
+		accesskit_node_set_orientation(ae->node, ACCESSKIT_ORIENTATION_HORIZONTAL);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_shortcut.is_empty()) {
+		accesskit_node_set_keyboard_shortcut(ae->node, p_shortcut.utf8().ptr());
+	} else {
+		accesskit_node_clear_keyboard_shortcut(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_url(const RID &p_id, const String &p_url) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_url.is_empty()) {
+		accesskit_node_set_url(ae->node, p_url.utf8().ptr());
+	} else {
+		accesskit_node_clear_url(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_role_description(const RID &p_id, const String &p_description) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_description.is_empty()) {
+		accesskit_node_set_role_description(ae->node, p_description.utf8().ptr());
+	} else {
+		accesskit_node_clear_role_description(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_state_description(const RID &p_id, const String &p_description) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	if (!p_description.is_empty()) {
+		accesskit_node_set_state_description(ae->node, p_description.utf8().ptr());
+	} else {
+		accesskit_node_clear_state_description(ae->node);
+	}
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_color_value(const RID &p_id, const Color &p_color) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_color_value(ae->node, p_color.to_rgba32());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_background_color(const RID &p_id, const Color &p_color) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_background_color(ae->node, p_color.to_rgba32());
+}
+
+void AccessibilityDriverAccessKit::accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) {
+	ERR_FAIL_COND_MSG(!in_accessibility_update, "Accessiblinity update is only allowed inside NOTIFICATION_ACCESSIBILITY_UPDATE notification.");
+
+	AccessibilityElement *ae = rid_owner.get_or_null(p_id);
+	ERR_FAIL_NULL(ae);
+	_ensure_node(p_id, ae);
+
+	accesskit_node_set_foreground_color(ae->node, p_color.to_rgba32());
+}
+
+Error AccessibilityDriverAccessKit::init() {
+#ifdef ACCESSKIT_DYNAMIC
+#ifdef DEBUG_ENABLED
+	int dylibloader_verbose = 1;
+#else
+	int dylibloader_verbose = 0;
+#endif
+	void *library_handle = nullptr;
+	String path;
+	String arch = Engine::get_singleton()->get_architecture_name();
+#ifdef LINUXBSD_ENABLED
+	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit." + arch + ".so");
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../lib").path_join("libaccesskit." + arch + ".so");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit.so");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../lib").path_join("libaccesskit.so");
+	}
+	if (!FileAccess::exists(path)) {
+		return ERR_CANT_CREATE;
+	}
+#endif
+#ifdef MACOS_ENABLED
+	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit." + arch + ".dylib");
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../Frameworks").path_join("libaccesskit." + arch + ".dylib");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("libaccesskit.dylib");
+	}
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("../Frameworks").path_join("libaccesskit.dylib");
+	}
+	if (!FileAccess::exists(path)) {
+		return ERR_CANT_CREATE;
+	}
+#endif
+#ifdef WINDOWS_ENABLED
+	path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("accesskit." + arch + ".dll");
+	if (!FileAccess::exists(path)) {
+		path = OS::get_singleton()->get_executable_path().get_base_dir().path_join("accesskit.dll");
+	}
+	if (!FileAccess::exists(path)) {
+		return ERR_CANT_CREATE;
+	}
+#endif
+
+	Error err = OS::get_singleton()->open_dynamic_library(path, library_handle);
+	if (err == OK && initialize_libaccesskit(dylibloader_verbose, library_handle) == 0) {
+		print_verbose("AccessKit loaded.");
+	} else {
+		return ERR_CANT_CREATE;
+	}
+#endif
+#ifdef MACOS_ENABLED
+	//accesskit_macos_add_focus_forwarder_to_window_class("GodotWindow");
+#endif
+	return OK;
+}
+
+AccessibilityDriverAccessKit::AccessibilityDriverAccessKit() {
+	singleton = this;
+
+	role_map[DisplayServer::AccessibilityRole::ROLE_UNKNOWN] = ACCESSKIT_ROLE_UNKNOWN;
+	role_map[DisplayServer::AccessibilityRole::ROLE_DEFAULT_BUTTON] = ACCESSKIT_ROLE_DEFAULT_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_AUDIO] = ACCESSKIT_ROLE_AUDIO;
+	role_map[DisplayServer::AccessibilityRole::ROLE_VIDEO] = ACCESSKIT_ROLE_VIDEO;
+	role_map[DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT] = ACCESSKIT_ROLE_LABEL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CONTAINER] = ACCESSKIT_ROLE_GENERIC_CONTAINER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_PANEL] = ACCESSKIT_ROLE_PANE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_BUTTON] = ACCESSKIT_ROLE_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LINK] = ACCESSKIT_ROLE_LINK;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CHECK_BOX] = ACCESSKIT_ROLE_CHECK_BOX;
+	role_map[DisplayServer::AccessibilityRole::ROLE_RADIO_BUTTON] = ACCESSKIT_ROLE_RADIO_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CHECK_BUTTON] = ACCESSKIT_ROLE_SWITCH;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SCROLL_BAR] = ACCESSKIT_ROLE_SCROLL_BAR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SCROLL_VIEW] = ACCESSKIT_ROLE_SCROLL_VIEW;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SPLITTER] = ACCESSKIT_ROLE_SPLITTER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SLIDER] = ACCESSKIT_ROLE_SLIDER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_SPIN_BUTTON] = ACCESSKIT_ROLE_SPIN_BUTTON;
+	role_map[DisplayServer::AccessibilityRole::ROLE_PROGRESS_INDICATOR] = ACCESSKIT_ROLE_PROGRESS_INDICATOR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TEXT_FIELD] = ACCESSKIT_ROLE_TEXT_INPUT;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MULTILINE_TEXT_FIELD] = ACCESSKIT_ROLE_MULTILINE_TEXT_INPUT;
+	role_map[DisplayServer::AccessibilityRole::ROLE_COLOR_PICKER] = ACCESSKIT_ROLE_COLOR_WELL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TABLE] = ACCESSKIT_ROLE_TABLE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_CELL] = ACCESSKIT_ROLE_CELL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_ROW] = ACCESSKIT_ROLE_ROW;
+	role_map[DisplayServer::AccessibilityRole::ROLE_ROW_GROUP] = ACCESSKIT_ROLE_ROW_GROUP;
+	role_map[DisplayServer::AccessibilityRole::ROLE_ROW_HEADER] = ACCESSKIT_ROLE_ROW_HEADER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_COLUMN_HEADER] = ACCESSKIT_ROLE_COLUMN_HEADER;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TREE] = ACCESSKIT_ROLE_TREE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TREE_ITEM] = ACCESSKIT_ROLE_TREE_ITEM;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST] = ACCESSKIT_ROLE_LIST;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST_ITEM] = ACCESSKIT_ROLE_LIST_ITEM;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST_BOX] = ACCESSKIT_ROLE_LIST_BOX;
+	role_map[DisplayServer::AccessibilityRole::ROLE_LIST_BOX_OPTION] = ACCESSKIT_ROLE_LIST_BOX_OPTION;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TAB_BAR] = ACCESSKIT_ROLE_TAB_LIST;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TAB] = ACCESSKIT_ROLE_TAB;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TAB_PANEL] = ACCESSKIT_ROLE_TAB_PANEL;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_BAR] = ACCESSKIT_ROLE_MENU_BAR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU] = ACCESSKIT_ROLE_MENU;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_ITEM] = ACCESSKIT_ROLE_MENU_ITEM;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_CHECK_BOX] = ACCESSKIT_ROLE_MENU_ITEM_CHECK_BOX;
+	role_map[DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_RADIO] = ACCESSKIT_ROLE_MENU_ITEM_RADIO;
+	role_map[DisplayServer::AccessibilityRole::ROLE_IMAGE] = ACCESSKIT_ROLE_IMAGE;
+	role_map[DisplayServer::AccessibilityRole::ROLE_WINDOW] = ACCESSKIT_ROLE_WINDOW;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TITLE_BAR] = ACCESSKIT_ROLE_TITLE_BAR;
+	role_map[DisplayServer::AccessibilityRole::ROLE_DIALOG] = ACCESSKIT_ROLE_DIALOG;
+	role_map[DisplayServer::AccessibilityRole::ROLE_TOOLTIP] = ACCESSKIT_ROLE_TOOLTIP;
+
+	action_map[DisplayServer::AccessibilityAction::ACTION_CLICK] = ACCESSKIT_ACTION_CLICK;
+	action_map[DisplayServer::AccessibilityAction::ACTION_FOCUS] = ACCESSKIT_ACTION_FOCUS;
+	action_map[DisplayServer::AccessibilityAction::ACTION_BLUR] = ACCESSKIT_ACTION_BLUR;
+	action_map[DisplayServer::AccessibilityAction::ACTION_COLLAPSE] = ACCESSKIT_ACTION_COLLAPSE;
+	action_map[DisplayServer::AccessibilityAction::ACTION_EXPAND] = ACCESSKIT_ACTION_EXPAND;
+	action_map[DisplayServer::AccessibilityAction::ACTION_DECREMENT] = ACCESSKIT_ACTION_DECREMENT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_INCREMENT] = ACCESSKIT_ACTION_INCREMENT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_HIDE_TOOLTIP] = ACCESSKIT_ACTION_HIDE_TOOLTIP;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SHOW_TOOLTIP] = ACCESSKIT_ACTION_SHOW_TOOLTIP;
+	//action_map[DisplayServer::AccessibilityAction::ACTION_INVALIDATE_TREE] = ACCESSKIT_ACTION_INVALIDATE_TREE;
+	//action_map[DisplayServer::AccessibilityAction::ACTION_LOAD_INLINE_TEXT_BOXES] = ACCESSKIT_ACTION_LOAD_INLINE_TEXT_BOXES;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SET_TEXT_SELECTION] = ACCESSKIT_ACTION_SET_TEXT_SELECTION;
+	action_map[DisplayServer::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT] = ACCESSKIT_ACTION_REPLACE_SELECTED_TEXT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_BACKWARD] = ACCESSKIT_ACTION_SCROLL_BACKWARD;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN] = ACCESSKIT_ACTION_SCROLL_DOWN;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_FORWARD] = ACCESSKIT_ACTION_SCROLL_FORWARD;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT] = ACCESSKIT_ACTION_SCROLL_LEFT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT] = ACCESSKIT_ACTION_SCROLL_RIGHT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_UP] = ACCESSKIT_ACTION_SCROLL_UP;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW] = ACCESSKIT_ACTION_SCROLL_INTO_VIEW;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SCROLL_TO_POINT] = ACCESSKIT_ACTION_SCROLL_TO_POINT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET] = ACCESSKIT_ACTION_SET_SCROLL_OFFSET;
+	//action_map[DisplayServer::AccessibilityAction::ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT] = ACCESSKIT_ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SET_VALUE] = ACCESSKIT_ACTION_SET_VALUE;
+	action_map[DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU] = ACCESSKIT_ACTION_SHOW_CONTEXT_MENU;
+	action_map[DisplayServer::AccessibilityAction::ACTION_CUSTOM] = ACCESSKIT_ACTION_CUSTOM_ACTION;
+}
+
+AccessibilityDriverAccessKit::~AccessibilityDriverAccessKit() {
+	singleton = nullptr;
+}
+
+#endif // ACCESSKIT_ENABLED
diff --git a/engine/drivers/accesskit/accessibility_driver_accesskit.h b/engine/drivers/accesskit/accessibility_driver_accesskit.h
new file mode 100644
index 00000000..5676ebe8
--- /dev/null
+++ b/engine/drivers/accesskit/accessibility_driver_accesskit.h
@@ -0,0 +1,197 @@
+/**************************************************************************/
+/*  accessibility_driver_accesskit.h                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#ifdef ACCESSKIT_ENABLED
+
+#include "core/templates/rid_owner.h"
+#include "servers/display_server.h"
+
+#ifdef ACCESSKIT_DYNAMIC
+#ifdef LINUXBSD_ENABLED
+#include "drivers/accesskit/dynwrappers/accesskit-so_wrap.h"
+#endif
+#ifdef MACOS_ENABLED
+#include "drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h"
+#endif
+#ifdef WINDOWS_ENABLED
+#include "drivers/accesskit/dynwrappers/accesskit-dll_wrap.h"
+#endif
+#else
+#include <accesskit.h>
+#endif
+
+class AccessibilityDriverAccessKit : public AccessibilityDriver {
+	static AccessibilityDriverAccessKit *singleton;
+
+	struct AccessibilityElement {
+		HashMap<accesskit_action, Callable> actions;
+
+		DisplayServer::WindowID window_id = DisplayServer::INVALID_WINDOW_ID;
+		RID parent;
+		LocalVector<RID> children;
+		Vector3i run;
+		Variant meta;
+		String name;
+		String name_extra_info;
+
+		accesskit_role role = ACCESSKIT_ROLE_UNKNOWN;
+		accesskit_node *node = nullptr;
+	};
+	mutable RID_PtrOwner<AccessibilityElement> rid_owner;
+
+	struct WindowData {
+		// Adapter.
+#ifdef WINDOWS_ENABLED
+		accesskit_windows_subclassing_adapter *adapter = nullptr;
+#endif
+#ifdef MACOS_ENABLED
+		accesskit_macos_subclassing_adapter *adapter = nullptr;
+#endif
+#ifdef LINUXBSD_ENABLED
+		accesskit_unix_adapter *adapter = nullptr;
+#endif
+
+		RID root_id;
+		HashSet<RID> update;
+	};
+
+	RID focus;
+
+	HashMap<DisplayServer::WindowID, WindowData> windows;
+
+	HashMap<DisplayServer::AccessibilityRole, accesskit_role> role_map;
+	HashMap<DisplayServer::AccessibilityAction, accesskit_action> action_map;
+
+	_FORCE_INLINE_ accesskit_role _accessibility_role(DisplayServer::AccessibilityRole p_role) const;
+	_FORCE_INLINE_ accesskit_action _accessibility_action(DisplayServer::AccessibilityAction p_action) const;
+
+	void _free_recursive(WindowData *p_wd, const RID &p_id);
+	_FORCE_INLINE_ void _ensure_node(const RID &p_id, AccessibilityElement *p_ae);
+
+	static void _accessibility_action_callback(struct accesskit_action_request *p_request, void *p_user_data);
+	static accesskit_tree_update *_accessibility_initial_tree_update_callback(void *p_user_data);
+	static void _accessibility_deactivation_callback(void *p_user_data);
+	static accesskit_tree_update *_accessibility_build_tree_update(void *p_user_data);
+
+	bool in_accessibility_update = false;
+	Callable update_cb;
+
+public:
+	Error init() override;
+
+	bool window_create(DisplayServer::WindowID p_window_id, void *p_handle) override;
+	void window_destroy(DisplayServer::WindowID p_window_id) override;
+
+	RID accessibility_create_element(DisplayServer::WindowID p_window_id, DisplayServer::AccessibilityRole p_role) override;
+	RID accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos = -1) override;
+	virtual RID accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1) override;
+	bool accessibility_has_element(const RID &p_id) const override;
+	void accessibility_free_element(const RID &p_id) override;
+
+	void accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) override;
+	Variant accessibility_element_get_meta(const RID &p_id) const override;
+
+	void accessibility_update_if_active(const Callable &p_callable) override;
+
+	void accessibility_update_set_focus(const RID &p_id) override;
+	RID accessibility_get_window_root(DisplayServer::WindowID p_window_id) const override;
+
+	void accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) override;
+	void accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) override;
+
+	void accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) override;
+	void accessibility_update_set_name(const RID &p_id, const String &p_name) override;
+	void accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) override;
+	void accessibility_update_set_description(const RID &p_id, const String &p_description) override;
+	void accessibility_update_set_value(const RID &p_id, const String &p_value) override;
+	void accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) override;
+	void accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) override;
+	void accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) override;
+	void accessibility_update_add_child(const RID &p_id, const RID &p_child_id) override;
+	void accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) override;
+	void accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) override;
+	void accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) override;
+	void accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) override;
+	void accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) override;
+	void accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) override;
+	void accessibility_update_set_table_row_count(const RID &p_id, int p_count) override;
+	void accessibility_update_set_table_column_count(const RID &p_id, int p_count) override;
+	void accessibility_update_set_table_row_index(const RID &p_id, int p_index) override;
+	void accessibility_update_set_table_column_index(const RID &p_id, int p_index) override;
+	void accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) override;
+	void accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) override;
+	void accessibility_update_set_list_item_count(const RID &p_id, int p_size) override;
+	void accessibility_update_set_list_item_index(const RID &p_id, int p_index) override;
+	void accessibility_update_set_list_item_level(const RID &p_id, int p_level) override;
+	void accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) override;
+	void accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) override;
+	void accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) override;
+	void accessibility_update_set_checked(const RID &p_id, bool p_checekd) override;
+	void accessibility_update_set_num_value(const RID &p_id, double p_position) override;
+	void accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) override;
+	void accessibility_update_set_num_step(const RID &p_id, double p_step) override;
+	void accessibility_update_set_num_jump(const RID &p_id, double p_jump) override;
+	void accessibility_update_set_scroll_x(const RID &p_id, double p_position) override;
+	void accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) override;
+	void accessibility_update_set_scroll_y(const RID &p_id, double p_position) override;
+	void accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) override;
+	void accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) override;
+	void accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) override;
+	void accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) override;
+	void accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) override;
+	void accessibility_update_set_classname(const RID &p_id, const String &p_classname) override;
+	void accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) override;
+	void accessibility_update_set_language(const RID &p_id, const String &p_language) override;
+	void accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) override;
+	void accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) override;
+	void accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) override;
+	void accessibility_update_set_url(const RID &p_id, const String &p_url) override;
+	void accessibility_update_set_role_description(const RID &p_id, const String &p_description) override;
+	void accessibility_update_set_state_description(const RID &p_id, const String &p_description) override;
+	void accessibility_update_set_color_value(const RID &p_id, const Color &p_color) override;
+	void accessibility_update_set_background_color(const RID &p_id, const Color &p_color) override;
+	void accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) override;
+
+	AccessibilityDriverAccessKit();
+	~AccessibilityDriverAccessKit();
+};
+
+#endif // ACCESSKIT_ENABLED
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c
new file mode 100644
index 00000000..27b23873
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.c
@@ -0,0 +1,4319 @@
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2024-12-04 13:39:52
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dll --init-name libaccesskit --output-header accesskit-dll_wrap.h --output-implementation acceskit-dll_wrap.c
+//
+
+// NOTE:
+// This has been handpatched to add WinAPI wrappers for dlfcn functions.
+
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_windows_queued_events_raise accesskit_windows_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_new accesskit_windows_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_free accesskit_windows_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_if_active accesskit_windows_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_window_focus_state accesskit_windows_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_handle_wm_getobject accesskit_windows_adapter_handle_wm_getobject_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_new accesskit_windows_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_free accesskit_windows_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_update_if_active accesskit_windows_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_linked
+#undef accesskit_node_set_linked
+#undef accesskit_node_clear_linked
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_bold
+#undef accesskit_node_set_bold
+#undef accesskit_node_clear_bold
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_lengths
+#undef accesskit_node_set_word_lengths
+#undef accesskit_node_clear_word_lengths
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_point_to_vec2
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_size_to_vec2
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_windows_queued_events_raise
+#undef accesskit_windows_adapter_new
+#undef accesskit_windows_adapter_free
+#undef accesskit_windows_adapter_update_if_active
+#undef accesskit_windows_adapter_update_window_focus_state
+#undef accesskit_windows_adapter_handle_wm_getobject
+#undef accesskit_windows_subclassing_adapter_new
+#undef accesskit_windows_subclassing_adapter_free
+#undef accesskit_windows_subclassing_adapter_update_if_active
+
+#define RTLD_LAZY 0
+
+char *dl_error = NULL;
+char dl_error_text[2048];
+
+void *dlsym(void *p_handle, const char *p_name) {
+  dl_error = NULL;
+
+  HMODULE hmodule = (HMODULE)p_handle;
+  void *f = (void *)GetProcAddress(hmodule, p_name);
+  if (!f) {
+    FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), dl_error_text, 2048, NULL);
+    dl_error = dl_error_text;
+  }
+  return f;
+}
+
+char *dlerror() {
+  return dl_error;
+}
+
+#include <stdio.h>
+accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_custom_action (*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t, const char *);
+void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+const struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const struct accesskit_custom_action *);
+void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action);
+void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+void (*accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_queued_events *);
+struct accesskit_windows_adapter *(*accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, bool, accesskit_action_handler_callback, void *);
+void (*accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *);
+struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, accesskit_tree_update_factory, void *);
+struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, bool);
+struct accesskit_opt_lresult (*accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, WPARAM, LPARAM, accesskit_activation_handler_callback, void *);
+struct accesskit_windows_subclassing_adapter *(*accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+void (*accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *);
+struct accesskit_windows_queued_events *(*accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *, accesskit_tree_update_factory, void *);
+int initialize_libaccesskit(int verbose, void *handle) {
+  char *error;
+  dlerror();
+// accesskit_node_role
+  *(void **) (&accesskit_node_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role
+  *(void **) (&accesskit_node_set_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_supports_action
+  *(void **) (&accesskit_node_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_action
+  *(void **) (&accesskit_node_add_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_action
+  *(void **) (&accesskit_node_remove_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_actions
+  *(void **) (&accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_hidden
+  *(void **) (&accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_hidden
+  *(void **) (&accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_hidden
+  *(void **) (&accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_linked
+  *(void **) (&accesskit_node_is_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_linked
+  *(void **) (&accesskit_node_set_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_linked
+  *(void **) (&accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_multiselectable
+  *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_multiselectable
+  *(void **) (&accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_multiselectable
+  *(void **) (&accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_required
+  *(void **) (&accesskit_node_is_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_required
+  *(void **) (&accesskit_node_set_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_required
+  *(void **) (&accesskit_node_clear_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_visited
+  *(void **) (&accesskit_node_is_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_visited
+  *(void **) (&accesskit_node_set_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_visited
+  *(void **) (&accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_busy
+  *(void **) (&accesskit_node_is_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_busy
+  *(void **) (&accesskit_node_set_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_busy
+  *(void **) (&accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_live_atomic
+  *(void **) (&accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live_atomic
+  *(void **) (&accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live_atomic
+  *(void **) (&accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_modal
+  *(void **) (&accesskit_node_is_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_modal
+  *(void **) (&accesskit_node_set_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_modal
+  *(void **) (&accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_touch_transparent
+  *(void **) (&accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_touch_transparent
+  *(void **) (&accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_touch_transparent
+  *(void **) (&accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_read_only
+  *(void **) (&accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_read_only
+  *(void **) (&accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_read_only
+  *(void **) (&accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_disabled
+  *(void **) (&accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_disabled
+  *(void **) (&accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_disabled
+  *(void **) (&accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_bold
+  *(void **) (&accesskit_node_is_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bold
+  *(void **) (&accesskit_node_set_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bold
+  *(void **) (&accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_italic
+  *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_italic
+  *(void **) (&accesskit_node_set_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_italic
+  *(void **) (&accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clips_children
+  *(void **) (&accesskit_node_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_clips_children
+  *(void **) (&accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_clips_children
+  *(void **) (&accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_line_breaking_object
+  *(void **) (&accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_line_breaking_object
+  *(void **) (&accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_line_breaking_object
+  *(void **) (&accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_page_breaking_object
+  *(void **) (&accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_page_breaking_object
+  *(void **) (&accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_page_breaking_object
+  *(void **) (&accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_spelling_error
+  *(void **) (&accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_spelling_error
+  *(void **) (&accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_spelling_error
+  *(void **) (&accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_grammar_error
+  *(void **) (&accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_grammar_error
+  *(void **) (&accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_grammar_error
+  *(void **) (&accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_search_match
+  *(void **) (&accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_search_match
+  *(void **) (&accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_search_match
+  *(void **) (&accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_suggestion
+  *(void **) (&accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_suggestion
+  *(void **) (&accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_suggestion
+  *(void **) (&accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_children
+  *(void **) (&accesskit_node_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_children
+  *(void **) (&accesskit_node_set_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_child
+  *(void **) (&accesskit_node_push_child_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_child");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_children
+  *(void **) (&accesskit_node_clear_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_controls
+  *(void **) (&accesskit_node_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_controls
+  *(void **) (&accesskit_node_set_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_controlled
+  *(void **) (&accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_controlled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_controls
+  *(void **) (&accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_details
+  *(void **) (&accesskit_node_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_details
+  *(void **) (&accesskit_node_set_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_detail
+  *(void **) (&accesskit_node_push_detail_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_detail");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_details
+  *(void **) (&accesskit_node_clear_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_described_by
+  *(void **) (&accesskit_node_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_described_by
+  *(void **) (&accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_described_by
+  *(void **) (&accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_described_by
+  *(void **) (&accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_flow_to
+  *(void **) (&accesskit_node_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_flow_to
+  *(void **) (&accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_flow_to
+  *(void **) (&accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_flow_to
+  *(void **) (&accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_labelled_by
+  *(void **) (&accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_labelled_by
+  *(void **) (&accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_labelled_by
+  *(void **) (&accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_labelled_by
+  *(void **) (&accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_owns
+  *(void **) (&accesskit_node_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_owns
+  *(void **) (&accesskit_node_set_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_owned
+  *(void **) (&accesskit_node_push_owned_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_owned");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_owns
+  *(void **) (&accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_radio_group
+  *(void **) (&accesskit_node_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_radio_group
+  *(void **) (&accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_to_radio_group
+  *(void **) (&accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_to_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_radio_group
+  *(void **) (&accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_active_descendant
+  *(void **) (&accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_active_descendant
+  *(void **) (&accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_active_descendant
+  *(void **) (&accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_error_message
+  *(void **) (&accesskit_node_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_error_message
+  *(void **) (&accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_error_message
+  *(void **) (&accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_in_page_link_target
+  *(void **) (&accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_in_page_link_target
+  *(void **) (&accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_in_page_link_target
+  *(void **) (&accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_member_of
+  *(void **) (&accesskit_node_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_member_of
+  *(void **) (&accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_member_of
+  *(void **) (&accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_next_on_line
+  *(void **) (&accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_next_on_line
+  *(void **) (&accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_next_on_line
+  *(void **) (&accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_previous_on_line
+  *(void **) (&accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_previous_on_line
+  *(void **) (&accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_previous_on_line
+  *(void **) (&accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_popup_for
+  *(void **) (&accesskit_node_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_popup_for
+  *(void **) (&accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_popup_for
+  *(void **) (&accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_string_free
+  *(void **) (&accesskit_string_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_string_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_label
+  *(void **) (&accesskit_node_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label
+  *(void **) (&accesskit_node_set_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_label
+  *(void **) (&accesskit_node_clear_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_description
+  *(void **) (&accesskit_node_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description
+  *(void **) (&accesskit_node_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_description
+  *(void **) (&accesskit_node_clear_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_value
+  *(void **) (&accesskit_node_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value
+  *(void **) (&accesskit_node_set_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_value
+  *(void **) (&accesskit_node_clear_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_access_key
+  *(void **) (&accesskit_node_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key
+  *(void **) (&accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_access_key
+  *(void **) (&accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_author_id
+  *(void **) (&accesskit_node_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id
+  *(void **) (&accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_author_id
+  *(void **) (&accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_class_name
+  *(void **) (&accesskit_node_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name
+  *(void **) (&accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_class_name
+  *(void **) (&accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_family
+  *(void **) (&accesskit_node_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family
+  *(void **) (&accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_family
+  *(void **) (&accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_html_tag
+  *(void **) (&accesskit_node_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag
+  *(void **) (&accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_html_tag
+  *(void **) (&accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_inner_html
+  *(void **) (&accesskit_node_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html
+  *(void **) (&accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_inner_html
+  *(void **) (&accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_keyboard_shortcut
+  *(void **) (&accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut
+  *(void **) (&accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_keyboard_shortcut
+  *(void **) (&accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_language
+  *(void **) (&accesskit_node_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language
+  *(void **) (&accesskit_node_set_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_language
+  *(void **) (&accesskit_node_clear_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_placeholder
+  *(void **) (&accesskit_node_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder
+  *(void **) (&accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_placeholder
+  *(void **) (&accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_role_description
+  *(void **) (&accesskit_node_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description
+  *(void **) (&accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_role_description
+  *(void **) (&accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_state_description
+  *(void **) (&accesskit_node_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description
+  *(void **) (&accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_state_description
+  *(void **) (&accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_tooltip
+  *(void **) (&accesskit_node_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip
+  *(void **) (&accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_tooltip
+  *(void **) (&accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_url
+  *(void **) (&accesskit_node_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url
+  *(void **) (&accesskit_node_set_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_url
+  *(void **) (&accesskit_node_clear_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index_text
+  *(void **) (&accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text
+  *(void **) (&accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index_text
+  *(void **) (&accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index_text
+  *(void **) (&accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text
+  *(void **) (&accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index_text
+  *(void **) (&accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x
+  *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x
+  *(void **) (&accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x
+  *(void **) (&accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_min
+  *(void **) (&accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_min
+  *(void **) (&accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_min
+  *(void **) (&accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_max
+  *(void **) (&accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_max
+  *(void **) (&accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_max
+  *(void **) (&accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y
+  *(void **) (&accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y
+  *(void **) (&accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y
+  *(void **) (&accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_min
+  *(void **) (&accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_min
+  *(void **) (&accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_min
+  *(void **) (&accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_max
+  *(void **) (&accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_max
+  *(void **) (&accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_max
+  *(void **) (&accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value
+  *(void **) (&accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value
+  *(void **) (&accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value
+  *(void **) (&accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_min_numeric_value
+  *(void **) (&accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_min_numeric_value
+  *(void **) (&accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_min_numeric_value
+  *(void **) (&accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_max_numeric_value
+  *(void **) (&accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_max_numeric_value
+  *(void **) (&accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_max_numeric_value
+  *(void **) (&accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_step
+  *(void **) (&accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_step
+  *(void **) (&accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_step
+  *(void **) (&accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_jump
+  *(void **) (&accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_jump
+  *(void **) (&accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_jump
+  *(void **) (&accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_size
+  *(void **) (&accesskit_node_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_size
+  *(void **) (&accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_size
+  *(void **) (&accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_weight
+  *(void **) (&accesskit_node_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_weight
+  *(void **) (&accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_weight
+  *(void **) (&accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_count
+  *(void **) (&accesskit_node_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_count
+  *(void **) (&accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_count
+  *(void **) (&accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_count
+  *(void **) (&accesskit_node_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_count
+  *(void **) (&accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_count
+  *(void **) (&accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index
+  *(void **) (&accesskit_node_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index
+  *(void **) (&accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index
+  *(void **) (&accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index
+  *(void **) (&accesskit_node_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index
+  *(void **) (&accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index
+  *(void **) (&accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_span
+  *(void **) (&accesskit_node_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_span
+  *(void **) (&accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_span
+  *(void **) (&accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_span
+  *(void **) (&accesskit_node_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_span
+  *(void **) (&accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_span
+  *(void **) (&accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_level
+  *(void **) (&accesskit_node_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_level
+  *(void **) (&accesskit_node_set_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_level
+  *(void **) (&accesskit_node_clear_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_size_of_set
+  *(void **) (&accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_size_of_set
+  *(void **) (&accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_size_of_set
+  *(void **) (&accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_position_in_set
+  *(void **) (&accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_position_in_set
+  *(void **) (&accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_position_in_set
+  *(void **) (&accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_color_value
+  *(void **) (&accesskit_node_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_color_value
+  *(void **) (&accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_color_value
+  *(void **) (&accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_background_color
+  *(void **) (&accesskit_node_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_background_color
+  *(void **) (&accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_background_color
+  *(void **) (&accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_foreground_color
+  *(void **) (&accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_foreground_color
+  *(void **) (&accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_foreground_color
+  *(void **) (&accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_overline
+  *(void **) (&accesskit_node_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_overline
+  *(void **) (&accesskit_node_set_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_overline
+  *(void **) (&accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_strikethrough
+  *(void **) (&accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_strikethrough
+  *(void **) (&accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_strikethrough
+  *(void **) (&accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_underline
+  *(void **) (&accesskit_node_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_underline
+  *(void **) (&accesskit_node_set_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_underline
+  *(void **) (&accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_lengths
+  *(void **) (&accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_lengths
+  *(void **) (&accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_lengths
+  *(void **) (&accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_word_lengths
+  *(void **) (&accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_word_lengths
+  *(void **) (&accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_word_lengths
+  *(void **) (&accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_positions
+  *(void **) (&accesskit_node_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_positions
+  *(void **) (&accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_positions
+  *(void **) (&accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_widths
+  *(void **) (&accesskit_node_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_widths
+  *(void **) (&accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_widths
+  *(void **) (&accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_expanded
+  *(void **) (&accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_expanded
+  *(void **) (&accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_expanded
+  *(void **) (&accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_selected
+  *(void **) (&accesskit_node_is_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_selected
+  *(void **) (&accesskit_node_set_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_selected
+  *(void **) (&accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_invalid
+  *(void **) (&accesskit_node_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_invalid
+  *(void **) (&accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_invalid
+  *(void **) (&accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_toggled
+  *(void **) (&accesskit_node_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_toggled
+  *(void **) (&accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_toggled
+  *(void **) (&accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_live
+  *(void **) (&accesskit_node_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live
+  *(void **) (&accesskit_node_set_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live
+  *(void **) (&accesskit_node_clear_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_direction
+  *(void **) (&accesskit_node_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_direction
+  *(void **) (&accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_direction
+  *(void **) (&accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_orientation
+  *(void **) (&accesskit_node_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_orientation
+  *(void **) (&accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_orientation
+  *(void **) (&accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_sort_direction
+  *(void **) (&accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_sort_direction
+  *(void **) (&accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_sort_direction
+  *(void **) (&accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_aria_current
+  *(void **) (&accesskit_node_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_aria_current
+  *(void **) (&accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_aria_current
+  *(void **) (&accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_auto_complete
+  *(void **) (&accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_auto_complete
+  *(void **) (&accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_auto_complete
+  *(void **) (&accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_has_popup
+  *(void **) (&accesskit_node_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_has_popup
+  *(void **) (&accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_has_popup
+  *(void **) (&accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_list_style
+  *(void **) (&accesskit_node_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_list_style
+  *(void **) (&accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_list_style
+  *(void **) (&accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_align
+  *(void **) (&accesskit_node_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_align
+  *(void **) (&accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_align
+  *(void **) (&accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_vertical_offset
+  *(void **) (&accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_vertical_offset
+  *(void **) (&accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_vertical_offset
+  *(void **) (&accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_transform
+  *(void **) (&accesskit_node_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_transform
+  *(void **) (&accesskit_node_set_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_transform
+  *(void **) (&accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_bounds
+  *(void **) (&accesskit_node_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bounds
+  *(void **) (&accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bounds
+  *(void **) (&accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_selection
+  *(void **) (&accesskit_node_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_selection
+  *(void **) (&accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_selection
+  *(void **) (&accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_new
+  *(void **) (&accesskit_custom_action_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_actions_free
+  *(void **) (&accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_actions_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_custom_actions
+  *(void **) (&accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_custom_actions
+  *(void **) (&accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_custom_action
+  *(void **) (&accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_custom_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_custom_actions
+  *(void **) (&accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_new
+  *(void **) (&accesskit_node_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_free
+  *(void **) (&accesskit_node_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_new
+  *(void **) (&accesskit_tree_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_free
+  *(void **) (&accesskit_tree_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_name
+  *(void **) (&accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name
+  *(void **) (&accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_name
+  *(void **) (&accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_version
+  *(void **) (&accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version
+  *(void **) (&accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_version
+  *(void **) (&accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_focus
+  *(void **) (&accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_capacity_and_focus
+  *(void **) (&accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_capacity_and_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_free
+  *(void **) (&accesskit_tree_update_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_push_node
+  *(void **) (&accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_push_node");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_tree
+  *(void **) (&accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_clear_tree
+  *(void **) (&accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_clear_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_focus
+  *(void **) (&accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_action_request_free
+  *(void **) (&accesskit_action_request_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_action_request_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_identity
+  *(void **) (&accesskit_affine_identity_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_identity");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_y
+  *(void **) (&accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_x
+  *(void **) (&accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale
+  *(void **) (&accesskit_affine_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale_non_uniform
+  *(void **) (&accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale_non_uniform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_translate
+  *(void **) (&accesskit_affine_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_map_unit_square
+  *(void **) (&accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_map_unit_square");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_determinant
+  *(void **) (&accesskit_affine_determinant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_determinant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_inverse
+  *(void **) (&accesskit_affine_inverse_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_inverse");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_rect_bbox
+  *(void **) (&accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_rect_bbox");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_finite
+  *(void **) (&accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_finite");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_nan
+  *(void **) (&accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_nan");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_to_vec2
+  *(void **) (&accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_points
+  *(void **) (&accesskit_rect_from_points_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_points");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_origin_size
+  *(void **) (&accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_origin_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_origin
+  *(void **) (&accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_size
+  *(void **) (&accesskit_rect_with_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_width
+  *(void **) (&accesskit_rect_width_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_width");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_height
+  *(void **) (&accesskit_rect_height_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_height");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_x
+  *(void **) (&accesskit_rect_min_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_x
+  *(void **) (&accesskit_rect_max_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_y
+  *(void **) (&accesskit_rect_min_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_y
+  *(void **) (&accesskit_rect_max_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_origin
+  *(void **) (&accesskit_rect_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_size
+  *(void **) (&accesskit_rect_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_abs
+  *(void **) (&accesskit_rect_abs_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_abs");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_area
+  *(void **) (&accesskit_rect_area_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_area");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_is_empty
+  *(void **) (&accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_is_empty");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_contains
+  *(void **) (&accesskit_rect_contains_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_contains");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union
+  *(void **) (&accesskit_rect_union_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union_pt
+  *(void **) (&accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union_pt");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_intersect
+  *(void **) (&accesskit_rect_intersect_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_intersect");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_to_vec2
+  *(void **) (&accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_point
+  *(void **) (&accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_size
+  *(void **) (&accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_queued_events_raise
+  *(void **) (&accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_queued_events_raise");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_new
+  *(void **) (&accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_free
+  *(void **) (&accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_update_if_active
+  *(void **) (&accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_update_window_focus_state
+  *(void **) (&accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_update_window_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_adapter_handle_wm_getobject
+  *(void **) (&accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_adapter_handle_wm_getobject");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_subclassing_adapter_new
+  *(void **) (&accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_subclassing_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_subclassing_adapter_free
+  *(void **) (&accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_subclassing_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_windows_subclassing_adapter_update_if_active
+  *(void **) (&accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_windows_subclassing_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+return 0;
+}
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h
new file mode 100644
index 00000000..1769778f
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dll_wrap.h
@@ -0,0 +1,1574 @@
+#ifndef DYLIBLOAD_WRAPPER_LIBACCESSKIT
+#define DYLIBLOAD_WRAPPER_LIBACCESSKIT
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2024-12-04 13:39:52
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dll --init-name libaccesskit --output-header accesskit-dll_wrap.h --output-implementation acceskit-dll_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_windows_queued_events_raise accesskit_windows_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_new accesskit_windows_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_free accesskit_windows_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_if_active accesskit_windows_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_update_window_focus_state accesskit_windows_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_windows_adapter_handle_wm_getobject accesskit_windows_adapter_handle_wm_getobject_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_new accesskit_windows_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_free accesskit_windows_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_windows_subclassing_adapter_update_if_active accesskit_windows_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_linked
+#undef accesskit_node_set_linked
+#undef accesskit_node_clear_linked
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_bold
+#undef accesskit_node_set_bold
+#undef accesskit_node_clear_bold
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_lengths
+#undef accesskit_node_set_word_lengths
+#undef accesskit_node_clear_word_lengths
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_point_to_vec2
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_size_to_vec2
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_windows_queued_events_raise
+#undef accesskit_windows_adapter_new
+#undef accesskit_windows_adapter_free
+#undef accesskit_windows_adapter_update_if_active
+#undef accesskit_windows_adapter_update_window_focus_state
+#undef accesskit_windows_adapter_handle_wm_getobject
+#undef accesskit_windows_subclassing_adapter_new
+#undef accesskit_windows_subclassing_adapter_free
+#undef accesskit_windows_subclassing_adapter_update_if_active
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define accesskit_node_role accesskit_node_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_wrapper_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_wrapper_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_queued_events_raise accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_new accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_free accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_update_if_active accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_update_window_focus_state accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_adapter_handle_wm_getobject accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_subclassing_adapter_new accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_subclassing_adapter_free accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_windows_subclassing_adapter_update_if_active accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+extern accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+extern bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+extern char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+extern void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+extern void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+extern void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+extern void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+extern void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+extern void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+extern void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+extern void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+extern void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+extern void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+extern void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+extern void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+extern void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+extern void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+extern void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_custom_action (*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t, const char *);
+extern void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+extern const struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const struct accesskit_custom_action *);
+extern void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action);
+extern void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+extern void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+extern void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+extern void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+extern void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+extern void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+extern struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+extern struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+extern struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+extern double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+extern bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+extern struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+extern double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+extern struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern void (*accesskit_windows_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_queued_events *);
+extern struct accesskit_windows_adapter *(*accesskit_windows_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, bool, accesskit_action_handler_callback, void *);
+extern void (*accesskit_windows_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *);
+extern struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, accesskit_tree_update_factory, void *);
+extern struct accesskit_windows_queued_events *(*accesskit_windows_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, bool);
+extern struct accesskit_opt_lresult (*accesskit_windows_adapter_handle_wm_getobject_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_adapter *, WPARAM, LPARAM, accesskit_activation_handler_callback, void *);
+extern struct accesskit_windows_subclassing_adapter *(*accesskit_windows_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(HWND, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+extern void (*accesskit_windows_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *);
+extern struct accesskit_windows_queued_events *(*accesskit_windows_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_windows_subclassing_adapter *, accesskit_tree_update_factory, void *);
+int initialize_libaccesskit(int verbose, void *handle);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c
new file mode 100644
index 00000000..602a287f
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.c
@@ -0,0 +1,4349 @@
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2024-12-04 13:22:22
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dylib --init-name libaccesskit --output-header accesskit-dylib_wrap.h --output-implementation accesskit-dylib_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_macos_queued_events_raise accesskit_macos_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_new accesskit_macos_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_free accesskit_macos_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_if_active accesskit_macos_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_view_focus_state accesskit_macos_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_view_children accesskit_macos_adapter_view_children_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_focus accesskit_macos_adapter_focus_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_hit_test accesskit_macos_adapter_hit_test_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_new accesskit_macos_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_for_window accesskit_macos_subclassing_adapter_for_window_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_free accesskit_macos_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_if_active accesskit_macos_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_view_focus_state accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_linked
+#undef accesskit_node_set_linked
+#undef accesskit_node_clear_linked
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_bold
+#undef accesskit_node_set_bold
+#undef accesskit_node_clear_bold
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_lengths
+#undef accesskit_node_set_word_lengths
+#undef accesskit_node_clear_word_lengths
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_point_to_vec2
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_size_to_vec2
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_macos_queued_events_raise
+#undef accesskit_macos_adapter_new
+#undef accesskit_macos_adapter_free
+#undef accesskit_macos_adapter_update_if_active
+#undef accesskit_macos_adapter_update_view_focus_state
+#undef accesskit_macos_adapter_view_children
+#undef accesskit_macos_adapter_focus
+#undef accesskit_macos_adapter_hit_test
+#undef accesskit_macos_subclassing_adapter_new
+#undef accesskit_macos_subclassing_adapter_for_window
+#undef accesskit_macos_subclassing_adapter_free
+#undef accesskit_macos_subclassing_adapter_update_if_active
+#undef accesskit_macos_subclassing_adapter_update_view_focus_state
+#undef accesskit_macos_add_focus_forwarder_to_window_class
+#include <dlfcn.h>
+#include <stdio.h>
+accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_custom_action (*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t, const char *);
+void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+const struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const struct accesskit_custom_action *);
+void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action);
+void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+void (*accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_queued_events *);
+struct accesskit_macos_adapter *(*accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit)(void *, bool, accesskit_action_handler_callback, void *);
+void (*accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *);
+struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_tree_update_factory, void *);
+struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, bool);
+void *(*accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+void *(*accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+void *(*accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, double, double, accesskit_activation_handler_callback, void *);
+struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+void (*accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *);
+struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, accesskit_tree_update_factory, void *);
+struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, bool);
+void (*accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit)(const char *);
+int initialize_libaccesskit(int verbose, void *handle) {
+  char *error;
+  dlerror();
+// accesskit_node_role
+  *(void **) (&accesskit_node_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role
+  *(void **) (&accesskit_node_set_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_supports_action
+  *(void **) (&accesskit_node_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_action
+  *(void **) (&accesskit_node_add_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_action
+  *(void **) (&accesskit_node_remove_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_actions
+  *(void **) (&accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_hidden
+  *(void **) (&accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_hidden
+  *(void **) (&accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_hidden
+  *(void **) (&accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_linked
+  *(void **) (&accesskit_node_is_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_linked
+  *(void **) (&accesskit_node_set_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_linked
+  *(void **) (&accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_multiselectable
+  *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_multiselectable
+  *(void **) (&accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_multiselectable
+  *(void **) (&accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_required
+  *(void **) (&accesskit_node_is_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_required
+  *(void **) (&accesskit_node_set_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_required
+  *(void **) (&accesskit_node_clear_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_visited
+  *(void **) (&accesskit_node_is_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_visited
+  *(void **) (&accesskit_node_set_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_visited
+  *(void **) (&accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_busy
+  *(void **) (&accesskit_node_is_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_busy
+  *(void **) (&accesskit_node_set_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_busy
+  *(void **) (&accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_live_atomic
+  *(void **) (&accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live_atomic
+  *(void **) (&accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live_atomic
+  *(void **) (&accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_modal
+  *(void **) (&accesskit_node_is_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_modal
+  *(void **) (&accesskit_node_set_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_modal
+  *(void **) (&accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_touch_transparent
+  *(void **) (&accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_touch_transparent
+  *(void **) (&accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_touch_transparent
+  *(void **) (&accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_read_only
+  *(void **) (&accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_read_only
+  *(void **) (&accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_read_only
+  *(void **) (&accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_disabled
+  *(void **) (&accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_disabled
+  *(void **) (&accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_disabled
+  *(void **) (&accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_bold
+  *(void **) (&accesskit_node_is_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bold
+  *(void **) (&accesskit_node_set_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bold
+  *(void **) (&accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_italic
+  *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_italic
+  *(void **) (&accesskit_node_set_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_italic
+  *(void **) (&accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clips_children
+  *(void **) (&accesskit_node_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_clips_children
+  *(void **) (&accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_clips_children
+  *(void **) (&accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_line_breaking_object
+  *(void **) (&accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_line_breaking_object
+  *(void **) (&accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_line_breaking_object
+  *(void **) (&accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_page_breaking_object
+  *(void **) (&accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_page_breaking_object
+  *(void **) (&accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_page_breaking_object
+  *(void **) (&accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_spelling_error
+  *(void **) (&accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_spelling_error
+  *(void **) (&accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_spelling_error
+  *(void **) (&accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_grammar_error
+  *(void **) (&accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_grammar_error
+  *(void **) (&accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_grammar_error
+  *(void **) (&accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_search_match
+  *(void **) (&accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_search_match
+  *(void **) (&accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_search_match
+  *(void **) (&accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_suggestion
+  *(void **) (&accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_suggestion
+  *(void **) (&accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_suggestion
+  *(void **) (&accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_children
+  *(void **) (&accesskit_node_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_children
+  *(void **) (&accesskit_node_set_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_child
+  *(void **) (&accesskit_node_push_child_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_child");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_children
+  *(void **) (&accesskit_node_clear_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_controls
+  *(void **) (&accesskit_node_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_controls
+  *(void **) (&accesskit_node_set_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_controlled
+  *(void **) (&accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_controlled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_controls
+  *(void **) (&accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_details
+  *(void **) (&accesskit_node_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_details
+  *(void **) (&accesskit_node_set_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_detail
+  *(void **) (&accesskit_node_push_detail_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_detail");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_details
+  *(void **) (&accesskit_node_clear_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_described_by
+  *(void **) (&accesskit_node_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_described_by
+  *(void **) (&accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_described_by
+  *(void **) (&accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_described_by
+  *(void **) (&accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_flow_to
+  *(void **) (&accesskit_node_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_flow_to
+  *(void **) (&accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_flow_to
+  *(void **) (&accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_flow_to
+  *(void **) (&accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_labelled_by
+  *(void **) (&accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_labelled_by
+  *(void **) (&accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_labelled_by
+  *(void **) (&accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_labelled_by
+  *(void **) (&accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_owns
+  *(void **) (&accesskit_node_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_owns
+  *(void **) (&accesskit_node_set_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_owned
+  *(void **) (&accesskit_node_push_owned_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_owned");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_owns
+  *(void **) (&accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_radio_group
+  *(void **) (&accesskit_node_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_radio_group
+  *(void **) (&accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_to_radio_group
+  *(void **) (&accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_to_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_radio_group
+  *(void **) (&accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_active_descendant
+  *(void **) (&accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_active_descendant
+  *(void **) (&accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_active_descendant
+  *(void **) (&accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_error_message
+  *(void **) (&accesskit_node_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_error_message
+  *(void **) (&accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_error_message
+  *(void **) (&accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_in_page_link_target
+  *(void **) (&accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_in_page_link_target
+  *(void **) (&accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_in_page_link_target
+  *(void **) (&accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_member_of
+  *(void **) (&accesskit_node_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_member_of
+  *(void **) (&accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_member_of
+  *(void **) (&accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_next_on_line
+  *(void **) (&accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_next_on_line
+  *(void **) (&accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_next_on_line
+  *(void **) (&accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_previous_on_line
+  *(void **) (&accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_previous_on_line
+  *(void **) (&accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_previous_on_line
+  *(void **) (&accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_popup_for
+  *(void **) (&accesskit_node_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_popup_for
+  *(void **) (&accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_popup_for
+  *(void **) (&accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_string_free
+  *(void **) (&accesskit_string_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_string_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_label
+  *(void **) (&accesskit_node_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label
+  *(void **) (&accesskit_node_set_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_label
+  *(void **) (&accesskit_node_clear_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_description
+  *(void **) (&accesskit_node_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description
+  *(void **) (&accesskit_node_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_description
+  *(void **) (&accesskit_node_clear_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_value
+  *(void **) (&accesskit_node_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value
+  *(void **) (&accesskit_node_set_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_value
+  *(void **) (&accesskit_node_clear_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_access_key
+  *(void **) (&accesskit_node_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key
+  *(void **) (&accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_access_key
+  *(void **) (&accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_author_id
+  *(void **) (&accesskit_node_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id
+  *(void **) (&accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_author_id
+  *(void **) (&accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_class_name
+  *(void **) (&accesskit_node_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name
+  *(void **) (&accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_class_name
+  *(void **) (&accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_family
+  *(void **) (&accesskit_node_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family
+  *(void **) (&accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_family
+  *(void **) (&accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_html_tag
+  *(void **) (&accesskit_node_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag
+  *(void **) (&accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_html_tag
+  *(void **) (&accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_inner_html
+  *(void **) (&accesskit_node_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html
+  *(void **) (&accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_inner_html
+  *(void **) (&accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_keyboard_shortcut
+  *(void **) (&accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut
+  *(void **) (&accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_keyboard_shortcut
+  *(void **) (&accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_language
+  *(void **) (&accesskit_node_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language
+  *(void **) (&accesskit_node_set_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_language
+  *(void **) (&accesskit_node_clear_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_placeholder
+  *(void **) (&accesskit_node_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder
+  *(void **) (&accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_placeholder
+  *(void **) (&accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_role_description
+  *(void **) (&accesskit_node_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description
+  *(void **) (&accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_role_description
+  *(void **) (&accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_state_description
+  *(void **) (&accesskit_node_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description
+  *(void **) (&accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_state_description
+  *(void **) (&accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_tooltip
+  *(void **) (&accesskit_node_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip
+  *(void **) (&accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_tooltip
+  *(void **) (&accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_url
+  *(void **) (&accesskit_node_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url
+  *(void **) (&accesskit_node_set_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_url
+  *(void **) (&accesskit_node_clear_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index_text
+  *(void **) (&accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text
+  *(void **) (&accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index_text
+  *(void **) (&accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index_text
+  *(void **) (&accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text
+  *(void **) (&accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index_text
+  *(void **) (&accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x
+  *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x
+  *(void **) (&accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x
+  *(void **) (&accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_min
+  *(void **) (&accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_min
+  *(void **) (&accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_min
+  *(void **) (&accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_max
+  *(void **) (&accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_max
+  *(void **) (&accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_max
+  *(void **) (&accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y
+  *(void **) (&accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y
+  *(void **) (&accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y
+  *(void **) (&accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_min
+  *(void **) (&accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_min
+  *(void **) (&accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_min
+  *(void **) (&accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_max
+  *(void **) (&accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_max
+  *(void **) (&accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_max
+  *(void **) (&accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value
+  *(void **) (&accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value
+  *(void **) (&accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value
+  *(void **) (&accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_min_numeric_value
+  *(void **) (&accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_min_numeric_value
+  *(void **) (&accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_min_numeric_value
+  *(void **) (&accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_max_numeric_value
+  *(void **) (&accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_max_numeric_value
+  *(void **) (&accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_max_numeric_value
+  *(void **) (&accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_step
+  *(void **) (&accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_step
+  *(void **) (&accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_step
+  *(void **) (&accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_jump
+  *(void **) (&accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_jump
+  *(void **) (&accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_jump
+  *(void **) (&accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_size
+  *(void **) (&accesskit_node_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_size
+  *(void **) (&accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_size
+  *(void **) (&accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_weight
+  *(void **) (&accesskit_node_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_weight
+  *(void **) (&accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_weight
+  *(void **) (&accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_count
+  *(void **) (&accesskit_node_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_count
+  *(void **) (&accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_count
+  *(void **) (&accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_count
+  *(void **) (&accesskit_node_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_count
+  *(void **) (&accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_count
+  *(void **) (&accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index
+  *(void **) (&accesskit_node_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index
+  *(void **) (&accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index
+  *(void **) (&accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index
+  *(void **) (&accesskit_node_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index
+  *(void **) (&accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index
+  *(void **) (&accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_span
+  *(void **) (&accesskit_node_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_span
+  *(void **) (&accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_span
+  *(void **) (&accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_span
+  *(void **) (&accesskit_node_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_span
+  *(void **) (&accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_span
+  *(void **) (&accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_level
+  *(void **) (&accesskit_node_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_level
+  *(void **) (&accesskit_node_set_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_level
+  *(void **) (&accesskit_node_clear_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_size_of_set
+  *(void **) (&accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_size_of_set
+  *(void **) (&accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_size_of_set
+  *(void **) (&accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_position_in_set
+  *(void **) (&accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_position_in_set
+  *(void **) (&accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_position_in_set
+  *(void **) (&accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_color_value
+  *(void **) (&accesskit_node_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_color_value
+  *(void **) (&accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_color_value
+  *(void **) (&accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_background_color
+  *(void **) (&accesskit_node_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_background_color
+  *(void **) (&accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_background_color
+  *(void **) (&accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_foreground_color
+  *(void **) (&accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_foreground_color
+  *(void **) (&accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_foreground_color
+  *(void **) (&accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_overline
+  *(void **) (&accesskit_node_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_overline
+  *(void **) (&accesskit_node_set_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_overline
+  *(void **) (&accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_strikethrough
+  *(void **) (&accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_strikethrough
+  *(void **) (&accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_strikethrough
+  *(void **) (&accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_underline
+  *(void **) (&accesskit_node_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_underline
+  *(void **) (&accesskit_node_set_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_underline
+  *(void **) (&accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_lengths
+  *(void **) (&accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_lengths
+  *(void **) (&accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_lengths
+  *(void **) (&accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_word_lengths
+  *(void **) (&accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_word_lengths
+  *(void **) (&accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_word_lengths
+  *(void **) (&accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_positions
+  *(void **) (&accesskit_node_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_positions
+  *(void **) (&accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_positions
+  *(void **) (&accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_widths
+  *(void **) (&accesskit_node_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_widths
+  *(void **) (&accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_widths
+  *(void **) (&accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_expanded
+  *(void **) (&accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_expanded
+  *(void **) (&accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_expanded
+  *(void **) (&accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_selected
+  *(void **) (&accesskit_node_is_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_selected
+  *(void **) (&accesskit_node_set_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_selected
+  *(void **) (&accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_invalid
+  *(void **) (&accesskit_node_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_invalid
+  *(void **) (&accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_invalid
+  *(void **) (&accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_toggled
+  *(void **) (&accesskit_node_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_toggled
+  *(void **) (&accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_toggled
+  *(void **) (&accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_live
+  *(void **) (&accesskit_node_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live
+  *(void **) (&accesskit_node_set_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live
+  *(void **) (&accesskit_node_clear_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_direction
+  *(void **) (&accesskit_node_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_direction
+  *(void **) (&accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_direction
+  *(void **) (&accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_orientation
+  *(void **) (&accesskit_node_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_orientation
+  *(void **) (&accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_orientation
+  *(void **) (&accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_sort_direction
+  *(void **) (&accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_sort_direction
+  *(void **) (&accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_sort_direction
+  *(void **) (&accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_aria_current
+  *(void **) (&accesskit_node_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_aria_current
+  *(void **) (&accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_aria_current
+  *(void **) (&accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_auto_complete
+  *(void **) (&accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_auto_complete
+  *(void **) (&accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_auto_complete
+  *(void **) (&accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_has_popup
+  *(void **) (&accesskit_node_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_has_popup
+  *(void **) (&accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_has_popup
+  *(void **) (&accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_list_style
+  *(void **) (&accesskit_node_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_list_style
+  *(void **) (&accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_list_style
+  *(void **) (&accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_align
+  *(void **) (&accesskit_node_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_align
+  *(void **) (&accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_align
+  *(void **) (&accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_vertical_offset
+  *(void **) (&accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_vertical_offset
+  *(void **) (&accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_vertical_offset
+  *(void **) (&accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_transform
+  *(void **) (&accesskit_node_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_transform
+  *(void **) (&accesskit_node_set_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_transform
+  *(void **) (&accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_bounds
+  *(void **) (&accesskit_node_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bounds
+  *(void **) (&accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bounds
+  *(void **) (&accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_selection
+  *(void **) (&accesskit_node_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_selection
+  *(void **) (&accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_selection
+  *(void **) (&accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_new
+  *(void **) (&accesskit_custom_action_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_actions_free
+  *(void **) (&accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_actions_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_custom_actions
+  *(void **) (&accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_custom_actions
+  *(void **) (&accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_custom_action
+  *(void **) (&accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_custom_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_custom_actions
+  *(void **) (&accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_new
+  *(void **) (&accesskit_node_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_free
+  *(void **) (&accesskit_node_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_new
+  *(void **) (&accesskit_tree_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_free
+  *(void **) (&accesskit_tree_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_name
+  *(void **) (&accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name
+  *(void **) (&accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_name
+  *(void **) (&accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_version
+  *(void **) (&accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version
+  *(void **) (&accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_version
+  *(void **) (&accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_focus
+  *(void **) (&accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_capacity_and_focus
+  *(void **) (&accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_capacity_and_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_free
+  *(void **) (&accesskit_tree_update_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_push_node
+  *(void **) (&accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_push_node");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_tree
+  *(void **) (&accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_clear_tree
+  *(void **) (&accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_clear_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_focus
+  *(void **) (&accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_action_request_free
+  *(void **) (&accesskit_action_request_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_action_request_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_identity
+  *(void **) (&accesskit_affine_identity_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_identity");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_y
+  *(void **) (&accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_x
+  *(void **) (&accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale
+  *(void **) (&accesskit_affine_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale_non_uniform
+  *(void **) (&accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale_non_uniform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_translate
+  *(void **) (&accesskit_affine_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_map_unit_square
+  *(void **) (&accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_map_unit_square");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_determinant
+  *(void **) (&accesskit_affine_determinant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_determinant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_inverse
+  *(void **) (&accesskit_affine_inverse_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_inverse");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_rect_bbox
+  *(void **) (&accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_rect_bbox");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_finite
+  *(void **) (&accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_finite");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_nan
+  *(void **) (&accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_nan");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_to_vec2
+  *(void **) (&accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_points
+  *(void **) (&accesskit_rect_from_points_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_points");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_origin_size
+  *(void **) (&accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_origin_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_origin
+  *(void **) (&accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_size
+  *(void **) (&accesskit_rect_with_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_width
+  *(void **) (&accesskit_rect_width_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_width");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_height
+  *(void **) (&accesskit_rect_height_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_height");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_x
+  *(void **) (&accesskit_rect_min_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_x
+  *(void **) (&accesskit_rect_max_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_y
+  *(void **) (&accesskit_rect_min_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_y
+  *(void **) (&accesskit_rect_max_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_origin
+  *(void **) (&accesskit_rect_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_size
+  *(void **) (&accesskit_rect_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_abs
+  *(void **) (&accesskit_rect_abs_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_abs");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_area
+  *(void **) (&accesskit_rect_area_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_area");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_is_empty
+  *(void **) (&accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_is_empty");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_contains
+  *(void **) (&accesskit_rect_contains_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_contains");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union
+  *(void **) (&accesskit_rect_union_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union_pt
+  *(void **) (&accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union_pt");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_intersect
+  *(void **) (&accesskit_rect_intersect_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_intersect");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_to_vec2
+  *(void **) (&accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_point
+  *(void **) (&accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_size
+  *(void **) (&accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_queued_events_raise
+  *(void **) (&accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_queued_events_raise");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_new
+  *(void **) (&accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_free
+  *(void **) (&accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_update_if_active
+  *(void **) (&accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_update_view_focus_state
+  *(void **) (&accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_update_view_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_view_children
+  *(void **) (&accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_view_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_focus
+  *(void **) (&accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_adapter_hit_test
+  *(void **) (&accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_adapter_hit_test");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_new
+  *(void **) (&accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_for_window
+  *(void **) (&accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_for_window");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_free
+  *(void **) (&accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_update_if_active
+  *(void **) (&accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_subclassing_adapter_update_view_focus_state
+  *(void **) (&accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_subclassing_adapter_update_view_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_macos_add_focus_forwarder_to_window_class
+  *(void **) (&accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_macos_add_focus_forwarder_to_window_class");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+return 0;
+}
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h
new file mode 100644
index 00000000..b5df5c08
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-dylib_wrap.h
@@ -0,0 +1,1594 @@
+#ifndef DYLIBLOAD_WRAPPER_LIBACCESSKIT
+#define DYLIBLOAD_WRAPPER_LIBACCESSKIT
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2024-12-04 13:22:22
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.dylib --init-name libaccesskit --output-header accesskit-dylib_wrap.h --output-implementation accesskit-dylib_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_macos_queued_events_raise accesskit_macos_queued_events_raise_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_new accesskit_macos_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_free accesskit_macos_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_if_active accesskit_macos_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_update_view_focus_state accesskit_macos_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_view_children accesskit_macos_adapter_view_children_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_focus accesskit_macos_adapter_focus_dylibloader_orig_libaccesskit
+#define accesskit_macos_adapter_hit_test accesskit_macos_adapter_hit_test_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_new accesskit_macos_subclassing_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_for_window accesskit_macos_subclassing_adapter_for_window_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_free accesskit_macos_subclassing_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_if_active accesskit_macos_subclassing_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_view_focus_state accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_orig_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_linked
+#undef accesskit_node_set_linked
+#undef accesskit_node_clear_linked
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_bold
+#undef accesskit_node_set_bold
+#undef accesskit_node_clear_bold
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_lengths
+#undef accesskit_node_set_word_lengths
+#undef accesskit_node_clear_word_lengths
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_point_to_vec2
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_size_to_vec2
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_macos_queued_events_raise
+#undef accesskit_macos_adapter_new
+#undef accesskit_macos_adapter_free
+#undef accesskit_macos_adapter_update_if_active
+#undef accesskit_macos_adapter_update_view_focus_state
+#undef accesskit_macos_adapter_view_children
+#undef accesskit_macos_adapter_focus
+#undef accesskit_macos_adapter_hit_test
+#undef accesskit_macos_subclassing_adapter_new
+#undef accesskit_macos_subclassing_adapter_for_window
+#undef accesskit_macos_subclassing_adapter_free
+#undef accesskit_macos_subclassing_adapter_update_if_active
+#undef accesskit_macos_subclassing_adapter_update_view_focus_state
+#undef accesskit_macos_add_focus_forwarder_to_window_class
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define accesskit_node_role accesskit_node_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_wrapper_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_wrapper_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_queued_events_raise accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_new accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_free accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_update_if_active accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_update_view_focus_state accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_view_children accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_focus accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_adapter_hit_test accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_new accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_for_window accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_free accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_if_active accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_subclassing_adapter_update_view_focus_state accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit
+#define accesskit_macos_add_focus_forwarder_to_window_class accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit
+extern accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+extern bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+extern char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+extern void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+extern void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+extern void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+extern void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+extern void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+extern void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+extern void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+extern void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+extern void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+extern void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+extern void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+extern void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+extern void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+extern void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+extern void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_custom_action (*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t, const char *);
+extern void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+extern const struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const struct accesskit_custom_action *);
+extern void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action);
+extern void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+extern void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+extern void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+extern void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+extern void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+extern void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+extern struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+extern struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+extern struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+extern double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+extern bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+extern struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+extern double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+extern struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern void (*accesskit_macos_queued_events_raise_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_queued_events *);
+extern struct accesskit_macos_adapter *(*accesskit_macos_adapter_new_dylibloader_wrapper_libaccesskit)(void *, bool, accesskit_action_handler_callback, void *);
+extern void (*accesskit_macos_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_tree_update_factory, void *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, bool);
+extern void *(*accesskit_macos_adapter_view_children_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+extern void *(*accesskit_macos_adapter_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, accesskit_activation_handler_callback, void *);
+extern void *(*accesskit_macos_adapter_hit_test_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_adapter *, double, double, accesskit_activation_handler_callback, void *);
+extern struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_new_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+extern struct accesskit_macos_subclassing_adapter *(*accesskit_macos_subclassing_adapter_for_window_dylibloader_wrapper_libaccesskit)(void *, accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *);
+extern void (*accesskit_macos_subclassing_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, accesskit_tree_update_factory, void *);
+extern struct accesskit_macos_queued_events *(*accesskit_macos_subclassing_adapter_update_view_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_macos_subclassing_adapter *, bool);
+extern void (*accesskit_macos_add_focus_forwarder_to_window_class_dylibloader_wrapper_libaccesskit)(const char *);
+int initialize_libaccesskit(int verbose, void *handle);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.c b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.c
new file mode 100644
index 00000000..e2095e34
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.c
@@ -0,0 +1,4250 @@
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2024-12-04 14:03:52
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.so --init-name libaccesskit --output-header accesskit-so_wrap.h --output-implementation accesskit-so_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_new accesskit_unix_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_free accesskit_unix_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_set_root_window_bounds accesskit_unix_adapter_set_root_window_bounds_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_if_active accesskit_unix_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_window_focus_state accesskit_unix_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_linked
+#undef accesskit_node_set_linked
+#undef accesskit_node_clear_linked
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_bold
+#undef accesskit_node_set_bold
+#undef accesskit_node_clear_bold
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_lengths
+#undef accesskit_node_set_word_lengths
+#undef accesskit_node_clear_word_lengths
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_point_to_vec2
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_size_to_vec2
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_unix_adapter_new
+#undef accesskit_unix_adapter_free
+#undef accesskit_unix_adapter_set_root_window_bounds
+#undef accesskit_unix_adapter_update_if_active
+#undef accesskit_unix_adapter_update_window_focus_state
+#include <dlfcn.h>
+#include <stdio.h>
+accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_custom_action (*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t, const char *);
+void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+const struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const struct accesskit_custom_action *);
+void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action);
+void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+struct accesskit_unix_adapter *(*accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit)(accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *, accesskit_deactivation_handler_callback, void *);
+void (*accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *);
+void (*accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, struct accesskit_rect, struct accesskit_rect);
+void (*accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, accesskit_tree_update_factory, void *);
+void (*accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, bool);
+int initialize_libaccesskit(int verbose, void *handle) {
+  char *error;
+  dlerror();
+// accesskit_node_role
+  *(void **) (&accesskit_node_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role
+  *(void **) (&accesskit_node_set_role_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_supports_action
+  *(void **) (&accesskit_node_supports_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_supports_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_add_action
+  *(void **) (&accesskit_node_add_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_add_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_remove_action
+  *(void **) (&accesskit_node_remove_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_remove_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_actions
+  *(void **) (&accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_hidden
+  *(void **) (&accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_hidden
+  *(void **) (&accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_hidden
+  *(void **) (&accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_hidden");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_linked
+  *(void **) (&accesskit_node_is_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_linked
+  *(void **) (&accesskit_node_set_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_linked
+  *(void **) (&accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_linked");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_multiselectable
+  *(void **) (&accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_multiselectable
+  *(void **) (&accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_multiselectable
+  *(void **) (&accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_multiselectable");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_required
+  *(void **) (&accesskit_node_is_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_required
+  *(void **) (&accesskit_node_set_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_required
+  *(void **) (&accesskit_node_clear_required_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_required");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_visited
+  *(void **) (&accesskit_node_is_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_visited
+  *(void **) (&accesskit_node_set_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_visited
+  *(void **) (&accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_visited");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_busy
+  *(void **) (&accesskit_node_is_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_busy
+  *(void **) (&accesskit_node_set_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_busy
+  *(void **) (&accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_busy");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_live_atomic
+  *(void **) (&accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live_atomic
+  *(void **) (&accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live_atomic
+  *(void **) (&accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live_atomic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_modal
+  *(void **) (&accesskit_node_is_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_modal
+  *(void **) (&accesskit_node_set_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_modal
+  *(void **) (&accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_modal");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_touch_transparent
+  *(void **) (&accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_touch_transparent
+  *(void **) (&accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_touch_transparent
+  *(void **) (&accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_touch_transparent");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_read_only
+  *(void **) (&accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_read_only
+  *(void **) (&accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_read_only
+  *(void **) (&accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_read_only");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_disabled
+  *(void **) (&accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_disabled
+  *(void **) (&accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_disabled
+  *(void **) (&accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_disabled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_bold
+  *(void **) (&accesskit_node_is_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bold
+  *(void **) (&accesskit_node_set_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bold
+  *(void **) (&accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bold");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_italic
+  *(void **) (&accesskit_node_is_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_italic
+  *(void **) (&accesskit_node_set_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_italic
+  *(void **) (&accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_italic");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clips_children
+  *(void **) (&accesskit_node_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_clips_children
+  *(void **) (&accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_clips_children
+  *(void **) (&accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_clips_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_line_breaking_object
+  *(void **) (&accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_line_breaking_object
+  *(void **) (&accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_line_breaking_object
+  *(void **) (&accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_line_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_page_breaking_object
+  *(void **) (&accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_page_breaking_object
+  *(void **) (&accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_page_breaking_object
+  *(void **) (&accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_page_breaking_object");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_spelling_error
+  *(void **) (&accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_spelling_error
+  *(void **) (&accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_spelling_error
+  *(void **) (&accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_spelling_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_grammar_error
+  *(void **) (&accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_grammar_error
+  *(void **) (&accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_grammar_error
+  *(void **) (&accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_grammar_error");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_search_match
+  *(void **) (&accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_search_match
+  *(void **) (&accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_search_match
+  *(void **) (&accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_search_match");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_suggestion
+  *(void **) (&accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_is_suggestion
+  *(void **) (&accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_is_suggestion
+  *(void **) (&accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_is_suggestion");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_children
+  *(void **) (&accesskit_node_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_children
+  *(void **) (&accesskit_node_set_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_child
+  *(void **) (&accesskit_node_push_child_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_child");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_children
+  *(void **) (&accesskit_node_clear_children_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_children");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_controls
+  *(void **) (&accesskit_node_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_controls
+  *(void **) (&accesskit_node_set_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_controlled
+  *(void **) (&accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_controlled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_controls
+  *(void **) (&accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_controls");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_details
+  *(void **) (&accesskit_node_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_details
+  *(void **) (&accesskit_node_set_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_detail
+  *(void **) (&accesskit_node_push_detail_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_detail");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_details
+  *(void **) (&accesskit_node_clear_details_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_details");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_described_by
+  *(void **) (&accesskit_node_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_described_by
+  *(void **) (&accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_described_by
+  *(void **) (&accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_described_by
+  *(void **) (&accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_described_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_flow_to
+  *(void **) (&accesskit_node_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_flow_to
+  *(void **) (&accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_flow_to
+  *(void **) (&accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_flow_to
+  *(void **) (&accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_flow_to");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_labelled_by
+  *(void **) (&accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_labelled_by
+  *(void **) (&accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_labelled_by
+  *(void **) (&accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_labelled_by
+  *(void **) (&accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_labelled_by");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_owns
+  *(void **) (&accesskit_node_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_owns
+  *(void **) (&accesskit_node_set_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_owned
+  *(void **) (&accesskit_node_push_owned_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_owned");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_owns
+  *(void **) (&accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_owns");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_radio_group
+  *(void **) (&accesskit_node_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_radio_group
+  *(void **) (&accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_to_radio_group
+  *(void **) (&accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_to_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_radio_group
+  *(void **) (&accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_radio_group");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_active_descendant
+  *(void **) (&accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_active_descendant
+  *(void **) (&accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_active_descendant
+  *(void **) (&accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_active_descendant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_error_message
+  *(void **) (&accesskit_node_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_error_message
+  *(void **) (&accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_error_message
+  *(void **) (&accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_error_message");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_in_page_link_target
+  *(void **) (&accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_in_page_link_target
+  *(void **) (&accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_in_page_link_target
+  *(void **) (&accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_in_page_link_target");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_member_of
+  *(void **) (&accesskit_node_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_member_of
+  *(void **) (&accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_member_of
+  *(void **) (&accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_member_of");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_next_on_line
+  *(void **) (&accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_next_on_line
+  *(void **) (&accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_next_on_line
+  *(void **) (&accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_next_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_previous_on_line
+  *(void **) (&accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_previous_on_line
+  *(void **) (&accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_previous_on_line
+  *(void **) (&accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_previous_on_line");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_popup_for
+  *(void **) (&accesskit_node_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_popup_for
+  *(void **) (&accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_popup_for
+  *(void **) (&accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_popup_for");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_string_free
+  *(void **) (&accesskit_string_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_string_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_label
+  *(void **) (&accesskit_node_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_label
+  *(void **) (&accesskit_node_set_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_label
+  *(void **) (&accesskit_node_clear_label_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_label");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_description
+  *(void **) (&accesskit_node_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_description
+  *(void **) (&accesskit_node_set_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_description
+  *(void **) (&accesskit_node_clear_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_value
+  *(void **) (&accesskit_node_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_value
+  *(void **) (&accesskit_node_set_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_value
+  *(void **) (&accesskit_node_clear_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_access_key
+  *(void **) (&accesskit_node_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_access_key
+  *(void **) (&accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_access_key
+  *(void **) (&accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_access_key");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_author_id
+  *(void **) (&accesskit_node_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_author_id
+  *(void **) (&accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_author_id
+  *(void **) (&accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_author_id");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_class_name
+  *(void **) (&accesskit_node_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_class_name
+  *(void **) (&accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_class_name
+  *(void **) (&accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_class_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_family
+  *(void **) (&accesskit_node_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_family
+  *(void **) (&accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_family
+  *(void **) (&accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_family");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_html_tag
+  *(void **) (&accesskit_node_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_html_tag
+  *(void **) (&accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_html_tag
+  *(void **) (&accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_html_tag");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_inner_html
+  *(void **) (&accesskit_node_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_inner_html
+  *(void **) (&accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_inner_html
+  *(void **) (&accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_inner_html");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_keyboard_shortcut
+  *(void **) (&accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_keyboard_shortcut
+  *(void **) (&accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_keyboard_shortcut
+  *(void **) (&accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_keyboard_shortcut");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_language
+  *(void **) (&accesskit_node_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_language
+  *(void **) (&accesskit_node_set_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_language
+  *(void **) (&accesskit_node_clear_language_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_language");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_placeholder
+  *(void **) (&accesskit_node_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_placeholder
+  *(void **) (&accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_placeholder
+  *(void **) (&accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_placeholder");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_role_description
+  *(void **) (&accesskit_node_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_role_description
+  *(void **) (&accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_role_description
+  *(void **) (&accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_role_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_state_description
+  *(void **) (&accesskit_node_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_state_description
+  *(void **) (&accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_state_description
+  *(void **) (&accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_state_description");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_tooltip
+  *(void **) (&accesskit_node_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_tooltip
+  *(void **) (&accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_tooltip
+  *(void **) (&accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_tooltip");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_url
+  *(void **) (&accesskit_node_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_url
+  *(void **) (&accesskit_node_set_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_url
+  *(void **) (&accesskit_node_clear_url_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_url");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index_text
+  *(void **) (&accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index_text
+  *(void **) (&accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index_text
+  *(void **) (&accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index_text
+  *(void **) (&accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index_text
+  *(void **) (&accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index_text
+  *(void **) (&accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index_text");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x
+  *(void **) (&accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x
+  *(void **) (&accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x
+  *(void **) (&accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_min
+  *(void **) (&accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_min
+  *(void **) (&accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_min
+  *(void **) (&accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_x_max
+  *(void **) (&accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_x_max
+  *(void **) (&accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_x_max
+  *(void **) (&accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_x_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y
+  *(void **) (&accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y
+  *(void **) (&accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y
+  *(void **) (&accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_min
+  *(void **) (&accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_min
+  *(void **) (&accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_min
+  *(void **) (&accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_min");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_scroll_y_max
+  *(void **) (&accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_scroll_y_max
+  *(void **) (&accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_scroll_y_max
+  *(void **) (&accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_scroll_y_max");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value
+  *(void **) (&accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value
+  *(void **) (&accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value
+  *(void **) (&accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_min_numeric_value
+  *(void **) (&accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_min_numeric_value
+  *(void **) (&accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_min_numeric_value
+  *(void **) (&accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_min_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_max_numeric_value
+  *(void **) (&accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_max_numeric_value
+  *(void **) (&accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_max_numeric_value
+  *(void **) (&accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_max_numeric_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_step
+  *(void **) (&accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_step
+  *(void **) (&accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_step
+  *(void **) (&accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_step");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_numeric_value_jump
+  *(void **) (&accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_numeric_value_jump
+  *(void **) (&accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_numeric_value_jump
+  *(void **) (&accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_numeric_value_jump");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_size
+  *(void **) (&accesskit_node_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_size
+  *(void **) (&accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_size
+  *(void **) (&accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_font_weight
+  *(void **) (&accesskit_node_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_font_weight
+  *(void **) (&accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_font_weight
+  *(void **) (&accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_font_weight");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_count
+  *(void **) (&accesskit_node_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_count
+  *(void **) (&accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_count
+  *(void **) (&accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_count
+  *(void **) (&accesskit_node_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_count
+  *(void **) (&accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_count
+  *(void **) (&accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_count");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_index
+  *(void **) (&accesskit_node_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_index
+  *(void **) (&accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_index
+  *(void **) (&accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_index
+  *(void **) (&accesskit_node_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_index
+  *(void **) (&accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_index
+  *(void **) (&accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_index");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_row_span
+  *(void **) (&accesskit_node_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_row_span
+  *(void **) (&accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_row_span
+  *(void **) (&accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_row_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_column_span
+  *(void **) (&accesskit_node_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_column_span
+  *(void **) (&accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_column_span
+  *(void **) (&accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_column_span");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_level
+  *(void **) (&accesskit_node_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_level
+  *(void **) (&accesskit_node_set_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_level
+  *(void **) (&accesskit_node_clear_level_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_level");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_size_of_set
+  *(void **) (&accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_size_of_set
+  *(void **) (&accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_size_of_set
+  *(void **) (&accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_size_of_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_position_in_set
+  *(void **) (&accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_position_in_set
+  *(void **) (&accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_position_in_set
+  *(void **) (&accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_position_in_set");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_color_value
+  *(void **) (&accesskit_node_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_color_value
+  *(void **) (&accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_color_value
+  *(void **) (&accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_color_value");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_background_color
+  *(void **) (&accesskit_node_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_background_color
+  *(void **) (&accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_background_color
+  *(void **) (&accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_background_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_foreground_color
+  *(void **) (&accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_foreground_color
+  *(void **) (&accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_foreground_color
+  *(void **) (&accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_foreground_color");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_overline
+  *(void **) (&accesskit_node_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_overline
+  *(void **) (&accesskit_node_set_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_overline
+  *(void **) (&accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_overline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_strikethrough
+  *(void **) (&accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_strikethrough
+  *(void **) (&accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_strikethrough
+  *(void **) (&accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_strikethrough");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_underline
+  *(void **) (&accesskit_node_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_underline
+  *(void **) (&accesskit_node_set_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_underline
+  *(void **) (&accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_underline");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_lengths
+  *(void **) (&accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_lengths
+  *(void **) (&accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_lengths
+  *(void **) (&accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_word_lengths
+  *(void **) (&accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_word_lengths
+  *(void **) (&accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_word_lengths
+  *(void **) (&accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_word_lengths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_positions
+  *(void **) (&accesskit_node_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_positions
+  *(void **) (&accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_positions
+  *(void **) (&accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_positions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_character_widths
+  *(void **) (&accesskit_node_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_character_widths
+  *(void **) (&accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_character_widths
+  *(void **) (&accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_character_widths");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_expanded
+  *(void **) (&accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_expanded
+  *(void **) (&accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_expanded
+  *(void **) (&accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_expanded");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_is_selected
+  *(void **) (&accesskit_node_is_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_is_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_selected
+  *(void **) (&accesskit_node_set_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_selected
+  *(void **) (&accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_selected");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_invalid
+  *(void **) (&accesskit_node_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_invalid
+  *(void **) (&accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_invalid
+  *(void **) (&accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_invalid");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_toggled
+  *(void **) (&accesskit_node_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_toggled
+  *(void **) (&accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_toggled
+  *(void **) (&accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_toggled");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_live
+  *(void **) (&accesskit_node_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_live
+  *(void **) (&accesskit_node_set_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_live
+  *(void **) (&accesskit_node_clear_live_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_live");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_direction
+  *(void **) (&accesskit_node_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_direction
+  *(void **) (&accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_direction
+  *(void **) (&accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_orientation
+  *(void **) (&accesskit_node_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_orientation
+  *(void **) (&accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_orientation
+  *(void **) (&accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_orientation");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_sort_direction
+  *(void **) (&accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_sort_direction
+  *(void **) (&accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_sort_direction
+  *(void **) (&accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_sort_direction");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_aria_current
+  *(void **) (&accesskit_node_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_aria_current
+  *(void **) (&accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_aria_current
+  *(void **) (&accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_aria_current");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_auto_complete
+  *(void **) (&accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_auto_complete
+  *(void **) (&accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_auto_complete
+  *(void **) (&accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_auto_complete");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_has_popup
+  *(void **) (&accesskit_node_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_has_popup
+  *(void **) (&accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_has_popup
+  *(void **) (&accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_has_popup");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_list_style
+  *(void **) (&accesskit_node_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_list_style
+  *(void **) (&accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_list_style
+  *(void **) (&accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_list_style");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_align
+  *(void **) (&accesskit_node_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_align
+  *(void **) (&accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_align
+  *(void **) (&accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_align");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_vertical_offset
+  *(void **) (&accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_vertical_offset
+  *(void **) (&accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_vertical_offset
+  *(void **) (&accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_vertical_offset");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_transform
+  *(void **) (&accesskit_node_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_transform
+  *(void **) (&accesskit_node_set_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_transform
+  *(void **) (&accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_transform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_bounds
+  *(void **) (&accesskit_node_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_bounds
+  *(void **) (&accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_bounds
+  *(void **) (&accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_text_selection
+  *(void **) (&accesskit_node_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_text_selection
+  *(void **) (&accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_text_selection
+  *(void **) (&accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_text_selection");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_action_new
+  *(void **) (&accesskit_custom_action_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_action_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_custom_actions_free
+  *(void **) (&accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_custom_actions_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_custom_actions
+  *(void **) (&accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_set_custom_actions
+  *(void **) (&accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_set_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_push_custom_action
+  *(void **) (&accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_push_custom_action");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_clear_custom_actions
+  *(void **) (&accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_clear_custom_actions");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_new
+  *(void **) (&accesskit_node_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_node_free
+  *(void **) (&accesskit_node_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_node_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_new
+  *(void **) (&accesskit_tree_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_free
+  *(void **) (&accesskit_tree_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_name
+  *(void **) (&accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_name
+  *(void **) (&accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_name
+  *(void **) (&accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_name");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_get_toolkit_version
+  *(void **) (&accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_get_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_set_toolkit_version
+  *(void **) (&accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_set_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_clear_toolkit_version
+  *(void **) (&accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_clear_toolkit_version");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_focus
+  *(void **) (&accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_with_capacity_and_focus
+  *(void **) (&accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_with_capacity_and_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_free
+  *(void **) (&accesskit_tree_update_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_push_node
+  *(void **) (&accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_push_node");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_tree
+  *(void **) (&accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_clear_tree
+  *(void **) (&accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_clear_tree");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_tree_update_set_focus
+  *(void **) (&accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_tree_update_set_focus");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_action_request_free
+  *(void **) (&accesskit_action_request_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_action_request_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_identity
+  *(void **) (&accesskit_affine_identity_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_identity");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_y
+  *(void **) (&accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_flip_x
+  *(void **) (&accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_flip_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale
+  *(void **) (&accesskit_affine_scale_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_scale_non_uniform
+  *(void **) (&accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_scale_non_uniform");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_translate
+  *(void **) (&accesskit_affine_translate_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_translate");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_map_unit_square
+  *(void **) (&accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_map_unit_square");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_determinant
+  *(void **) (&accesskit_affine_determinant_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_determinant");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_inverse
+  *(void **) (&accesskit_affine_inverse_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_inverse");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_transform_rect_bbox
+  *(void **) (&accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_transform_rect_bbox");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_finite
+  *(void **) (&accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_finite");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_affine_is_nan
+  *(void **) (&accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_affine_is_nan");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_point_to_vec2
+  *(void **) (&accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_point_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_points
+  *(void **) (&accesskit_rect_from_points_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_points");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_from_origin_size
+  *(void **) (&accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_from_origin_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_origin
+  *(void **) (&accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_with_size
+  *(void **) (&accesskit_rect_with_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_with_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_width
+  *(void **) (&accesskit_rect_width_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_width");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_height
+  *(void **) (&accesskit_rect_height_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_height");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_x
+  *(void **) (&accesskit_rect_min_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_x
+  *(void **) (&accesskit_rect_max_x_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_x");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_min_y
+  *(void **) (&accesskit_rect_min_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_min_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_max_y
+  *(void **) (&accesskit_rect_max_y_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_max_y");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_origin
+  *(void **) (&accesskit_rect_origin_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_origin");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_size
+  *(void **) (&accesskit_rect_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_abs
+  *(void **) (&accesskit_rect_abs_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_abs");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_area
+  *(void **) (&accesskit_rect_area_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_area");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_is_empty
+  *(void **) (&accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_is_empty");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_contains
+  *(void **) (&accesskit_rect_contains_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_contains");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union
+  *(void **) (&accesskit_rect_union_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_union_pt
+  *(void **) (&accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_union_pt");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_rect_intersect
+  *(void **) (&accesskit_rect_intersect_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_rect_intersect");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_size_to_vec2
+  *(void **) (&accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_size_to_vec2");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_point
+  *(void **) (&accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_point");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_vec2_to_size
+  *(void **) (&accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_vec2_to_size");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_new
+  *(void **) (&accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_new");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_free
+  *(void **) (&accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_free");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_set_root_window_bounds
+  *(void **) (&accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_set_root_window_bounds");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_update_if_active
+  *(void **) (&accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_update_if_active");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+// accesskit_unix_adapter_update_window_focus_state
+  *(void **) (&accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit) = dlsym(handle, "accesskit_unix_adapter_update_window_focus_state");
+  if (verbose) {
+    error = dlerror();
+    if (error != NULL) {
+      fprintf(stderr, "%s\n", error);
+    }
+  }
+return 0;
+}
diff --git a/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.h b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.h
new file mode 100644
index 00000000..5bad8bbd
--- /dev/null
+++ b/engine/drivers/accesskit/dynwrappers/accesskit-so_wrap.h
@@ -0,0 +1,1558 @@
+#ifndef DYLIBLOAD_WRAPPER_LIBACCESSKIT
+#define DYLIBLOAD_WRAPPER_LIBACCESSKIT
+// This file is generated. Do not edit!
+// see https://github.com/hpvb/dynload-wrapper for details
+// generated by generate-wrapper.py 0.6 on 2024-12-04 14:03:52
+// flags: generate-wrapper.py --include ./accesskit.h --sys-include accesskit.h --soname libaccesskit.so --init-name libaccesskit --output-header accesskit-so_wrap.h --output-implementation accesskit-so_wrap.c
+//
+#include <stdint.h>
+
+#define accesskit_node_role accesskit_node_role_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_orig_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_orig_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_orig_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_orig_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_orig_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_orig_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_orig_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_orig_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_orig_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_orig_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_orig_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_orig_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_orig_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_orig_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_orig_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_orig_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_orig_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_orig_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_orig_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_orig_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_orig_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_orig_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_orig_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_orig_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_orig_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_orig_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_orig_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_orig_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_orig_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_orig_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_orig_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_orig_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_orig_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_orig_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_orig_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_orig_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_orig_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_orig_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_orig_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_orig_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_orig_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_orig_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_orig_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_orig_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_orig_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_orig_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_orig_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_orig_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_orig_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_orig_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_orig_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_orig_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_orig_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_orig_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_orig_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_orig_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_orig_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_orig_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_orig_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_orig_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_orig_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_orig_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_orig_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_orig_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_orig_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_orig_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_orig_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_orig_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_orig_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_orig_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_orig_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_orig_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_orig_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_orig_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_orig_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_orig_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_orig_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_orig_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_orig_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_orig_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_orig_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_orig_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_orig_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_orig_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_orig_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_orig_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_orig_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_orig_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_orig_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_orig_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_orig_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_orig_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_orig_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_orig_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_orig_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_orig_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_orig_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_orig_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_orig_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_orig_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_orig_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_orig_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_orig_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_orig_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_orig_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_orig_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_orig_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_orig_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_orig_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_orig_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_orig_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_orig_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_orig_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_orig_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_orig_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_orig_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_orig_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_orig_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_orig_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_orig_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_orig_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_orig_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_orig_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_orig_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_orig_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_orig_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_orig_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_orig_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_orig_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_orig_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_orig_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_orig_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_orig_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_new accesskit_unix_adapter_new_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_free accesskit_unix_adapter_free_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_set_root_window_bounds accesskit_unix_adapter_set_root_window_bounds_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_if_active accesskit_unix_adapter_update_if_active_dylibloader_orig_libaccesskit
+#define accesskit_unix_adapter_update_window_focus_state accesskit_unix_adapter_update_window_focus_state_dylibloader_orig_libaccesskit
+#include "accesskit.h"
+#undef accesskit_node_role
+#undef accesskit_node_set_role
+#undef accesskit_node_supports_action
+#undef accesskit_node_add_action
+#undef accesskit_node_remove_action
+#undef accesskit_node_clear_actions
+#undef accesskit_node_is_hidden
+#undef accesskit_node_set_hidden
+#undef accesskit_node_clear_hidden
+#undef accesskit_node_is_linked
+#undef accesskit_node_set_linked
+#undef accesskit_node_clear_linked
+#undef accesskit_node_is_multiselectable
+#undef accesskit_node_set_multiselectable
+#undef accesskit_node_clear_multiselectable
+#undef accesskit_node_is_required
+#undef accesskit_node_set_required
+#undef accesskit_node_clear_required
+#undef accesskit_node_is_visited
+#undef accesskit_node_set_visited
+#undef accesskit_node_clear_visited
+#undef accesskit_node_is_busy
+#undef accesskit_node_set_busy
+#undef accesskit_node_clear_busy
+#undef accesskit_node_is_live_atomic
+#undef accesskit_node_set_live_atomic
+#undef accesskit_node_clear_live_atomic
+#undef accesskit_node_is_modal
+#undef accesskit_node_set_modal
+#undef accesskit_node_clear_modal
+#undef accesskit_node_is_touch_transparent
+#undef accesskit_node_set_touch_transparent
+#undef accesskit_node_clear_touch_transparent
+#undef accesskit_node_is_read_only
+#undef accesskit_node_set_read_only
+#undef accesskit_node_clear_read_only
+#undef accesskit_node_is_disabled
+#undef accesskit_node_set_disabled
+#undef accesskit_node_clear_disabled
+#undef accesskit_node_is_bold
+#undef accesskit_node_set_bold
+#undef accesskit_node_clear_bold
+#undef accesskit_node_is_italic
+#undef accesskit_node_set_italic
+#undef accesskit_node_clear_italic
+#undef accesskit_node_clips_children
+#undef accesskit_node_set_clips_children
+#undef accesskit_node_clear_clips_children
+#undef accesskit_node_is_line_breaking_object
+#undef accesskit_node_set_is_line_breaking_object
+#undef accesskit_node_clear_is_line_breaking_object
+#undef accesskit_node_is_page_breaking_object
+#undef accesskit_node_set_is_page_breaking_object
+#undef accesskit_node_clear_is_page_breaking_object
+#undef accesskit_node_is_spelling_error
+#undef accesskit_node_set_is_spelling_error
+#undef accesskit_node_clear_is_spelling_error
+#undef accesskit_node_is_grammar_error
+#undef accesskit_node_set_is_grammar_error
+#undef accesskit_node_clear_is_grammar_error
+#undef accesskit_node_is_search_match
+#undef accesskit_node_set_is_search_match
+#undef accesskit_node_clear_is_search_match
+#undef accesskit_node_is_suggestion
+#undef accesskit_node_set_is_suggestion
+#undef accesskit_node_clear_is_suggestion
+#undef accesskit_node_children
+#undef accesskit_node_set_children
+#undef accesskit_node_push_child
+#undef accesskit_node_clear_children
+#undef accesskit_node_controls
+#undef accesskit_node_set_controls
+#undef accesskit_node_push_controlled
+#undef accesskit_node_clear_controls
+#undef accesskit_node_details
+#undef accesskit_node_set_details
+#undef accesskit_node_push_detail
+#undef accesskit_node_clear_details
+#undef accesskit_node_described_by
+#undef accesskit_node_set_described_by
+#undef accesskit_node_push_described_by
+#undef accesskit_node_clear_described_by
+#undef accesskit_node_flow_to
+#undef accesskit_node_set_flow_to
+#undef accesskit_node_push_flow_to
+#undef accesskit_node_clear_flow_to
+#undef accesskit_node_labelled_by
+#undef accesskit_node_set_labelled_by
+#undef accesskit_node_push_labelled_by
+#undef accesskit_node_clear_labelled_by
+#undef accesskit_node_owns
+#undef accesskit_node_set_owns
+#undef accesskit_node_push_owned
+#undef accesskit_node_clear_owns
+#undef accesskit_node_radio_group
+#undef accesskit_node_set_radio_group
+#undef accesskit_node_push_to_radio_group
+#undef accesskit_node_clear_radio_group
+#undef accesskit_node_active_descendant
+#undef accesskit_node_set_active_descendant
+#undef accesskit_node_clear_active_descendant
+#undef accesskit_node_error_message
+#undef accesskit_node_set_error_message
+#undef accesskit_node_clear_error_message
+#undef accesskit_node_in_page_link_target
+#undef accesskit_node_set_in_page_link_target
+#undef accesskit_node_clear_in_page_link_target
+#undef accesskit_node_member_of
+#undef accesskit_node_set_member_of
+#undef accesskit_node_clear_member_of
+#undef accesskit_node_next_on_line
+#undef accesskit_node_set_next_on_line
+#undef accesskit_node_clear_next_on_line
+#undef accesskit_node_previous_on_line
+#undef accesskit_node_set_previous_on_line
+#undef accesskit_node_clear_previous_on_line
+#undef accesskit_node_popup_for
+#undef accesskit_node_set_popup_for
+#undef accesskit_node_clear_popup_for
+#undef accesskit_string_free
+#undef accesskit_node_label
+#undef accesskit_node_set_label
+#undef accesskit_node_clear_label
+#undef accesskit_node_description
+#undef accesskit_node_set_description
+#undef accesskit_node_clear_description
+#undef accesskit_node_value
+#undef accesskit_node_set_value
+#undef accesskit_node_clear_value
+#undef accesskit_node_access_key
+#undef accesskit_node_set_access_key
+#undef accesskit_node_clear_access_key
+#undef accesskit_node_author_id
+#undef accesskit_node_set_author_id
+#undef accesskit_node_clear_author_id
+#undef accesskit_node_class_name
+#undef accesskit_node_set_class_name
+#undef accesskit_node_clear_class_name
+#undef accesskit_node_font_family
+#undef accesskit_node_set_font_family
+#undef accesskit_node_clear_font_family
+#undef accesskit_node_html_tag
+#undef accesskit_node_set_html_tag
+#undef accesskit_node_clear_html_tag
+#undef accesskit_node_inner_html
+#undef accesskit_node_set_inner_html
+#undef accesskit_node_clear_inner_html
+#undef accesskit_node_keyboard_shortcut
+#undef accesskit_node_set_keyboard_shortcut
+#undef accesskit_node_clear_keyboard_shortcut
+#undef accesskit_node_language
+#undef accesskit_node_set_language
+#undef accesskit_node_clear_language
+#undef accesskit_node_placeholder
+#undef accesskit_node_set_placeholder
+#undef accesskit_node_clear_placeholder
+#undef accesskit_node_role_description
+#undef accesskit_node_set_role_description
+#undef accesskit_node_clear_role_description
+#undef accesskit_node_state_description
+#undef accesskit_node_set_state_description
+#undef accesskit_node_clear_state_description
+#undef accesskit_node_tooltip
+#undef accesskit_node_set_tooltip
+#undef accesskit_node_clear_tooltip
+#undef accesskit_node_url
+#undef accesskit_node_set_url
+#undef accesskit_node_clear_url
+#undef accesskit_node_row_index_text
+#undef accesskit_node_set_row_index_text
+#undef accesskit_node_clear_row_index_text
+#undef accesskit_node_column_index_text
+#undef accesskit_node_set_column_index_text
+#undef accesskit_node_clear_column_index_text
+#undef accesskit_node_scroll_x
+#undef accesskit_node_set_scroll_x
+#undef accesskit_node_clear_scroll_x
+#undef accesskit_node_scroll_x_min
+#undef accesskit_node_set_scroll_x_min
+#undef accesskit_node_clear_scroll_x_min
+#undef accesskit_node_scroll_x_max
+#undef accesskit_node_set_scroll_x_max
+#undef accesskit_node_clear_scroll_x_max
+#undef accesskit_node_scroll_y
+#undef accesskit_node_set_scroll_y
+#undef accesskit_node_clear_scroll_y
+#undef accesskit_node_scroll_y_min
+#undef accesskit_node_set_scroll_y_min
+#undef accesskit_node_clear_scroll_y_min
+#undef accesskit_node_scroll_y_max
+#undef accesskit_node_set_scroll_y_max
+#undef accesskit_node_clear_scroll_y_max
+#undef accesskit_node_numeric_value
+#undef accesskit_node_set_numeric_value
+#undef accesskit_node_clear_numeric_value
+#undef accesskit_node_min_numeric_value
+#undef accesskit_node_set_min_numeric_value
+#undef accesskit_node_clear_min_numeric_value
+#undef accesskit_node_max_numeric_value
+#undef accesskit_node_set_max_numeric_value
+#undef accesskit_node_clear_max_numeric_value
+#undef accesskit_node_numeric_value_step
+#undef accesskit_node_set_numeric_value_step
+#undef accesskit_node_clear_numeric_value_step
+#undef accesskit_node_numeric_value_jump
+#undef accesskit_node_set_numeric_value_jump
+#undef accesskit_node_clear_numeric_value_jump
+#undef accesskit_node_font_size
+#undef accesskit_node_set_font_size
+#undef accesskit_node_clear_font_size
+#undef accesskit_node_font_weight
+#undef accesskit_node_set_font_weight
+#undef accesskit_node_clear_font_weight
+#undef accesskit_node_row_count
+#undef accesskit_node_set_row_count
+#undef accesskit_node_clear_row_count
+#undef accesskit_node_column_count
+#undef accesskit_node_set_column_count
+#undef accesskit_node_clear_column_count
+#undef accesskit_node_row_index
+#undef accesskit_node_set_row_index
+#undef accesskit_node_clear_row_index
+#undef accesskit_node_column_index
+#undef accesskit_node_set_column_index
+#undef accesskit_node_clear_column_index
+#undef accesskit_node_row_span
+#undef accesskit_node_set_row_span
+#undef accesskit_node_clear_row_span
+#undef accesskit_node_column_span
+#undef accesskit_node_set_column_span
+#undef accesskit_node_clear_column_span
+#undef accesskit_node_level
+#undef accesskit_node_set_level
+#undef accesskit_node_clear_level
+#undef accesskit_node_size_of_set
+#undef accesskit_node_set_size_of_set
+#undef accesskit_node_clear_size_of_set
+#undef accesskit_node_position_in_set
+#undef accesskit_node_set_position_in_set
+#undef accesskit_node_clear_position_in_set
+#undef accesskit_node_color_value
+#undef accesskit_node_set_color_value
+#undef accesskit_node_clear_color_value
+#undef accesskit_node_background_color
+#undef accesskit_node_set_background_color
+#undef accesskit_node_clear_background_color
+#undef accesskit_node_foreground_color
+#undef accesskit_node_set_foreground_color
+#undef accesskit_node_clear_foreground_color
+#undef accesskit_node_overline
+#undef accesskit_node_set_overline
+#undef accesskit_node_clear_overline
+#undef accesskit_node_strikethrough
+#undef accesskit_node_set_strikethrough
+#undef accesskit_node_clear_strikethrough
+#undef accesskit_node_underline
+#undef accesskit_node_set_underline
+#undef accesskit_node_clear_underline
+#undef accesskit_node_character_lengths
+#undef accesskit_node_set_character_lengths
+#undef accesskit_node_clear_character_lengths
+#undef accesskit_node_word_lengths
+#undef accesskit_node_set_word_lengths
+#undef accesskit_node_clear_word_lengths
+#undef accesskit_node_character_positions
+#undef accesskit_node_set_character_positions
+#undef accesskit_node_clear_character_positions
+#undef accesskit_node_character_widths
+#undef accesskit_node_set_character_widths
+#undef accesskit_node_clear_character_widths
+#undef accesskit_node_is_expanded
+#undef accesskit_node_set_expanded
+#undef accesskit_node_clear_expanded
+#undef accesskit_node_is_selected
+#undef accesskit_node_set_selected
+#undef accesskit_node_clear_selected
+#undef accesskit_node_invalid
+#undef accesskit_node_set_invalid
+#undef accesskit_node_clear_invalid
+#undef accesskit_node_toggled
+#undef accesskit_node_set_toggled
+#undef accesskit_node_clear_toggled
+#undef accesskit_node_live
+#undef accesskit_node_set_live
+#undef accesskit_node_clear_live
+#undef accesskit_node_text_direction
+#undef accesskit_node_set_text_direction
+#undef accesskit_node_clear_text_direction
+#undef accesskit_node_orientation
+#undef accesskit_node_set_orientation
+#undef accesskit_node_clear_orientation
+#undef accesskit_node_sort_direction
+#undef accesskit_node_set_sort_direction
+#undef accesskit_node_clear_sort_direction
+#undef accesskit_node_aria_current
+#undef accesskit_node_set_aria_current
+#undef accesskit_node_clear_aria_current
+#undef accesskit_node_auto_complete
+#undef accesskit_node_set_auto_complete
+#undef accesskit_node_clear_auto_complete
+#undef accesskit_node_has_popup
+#undef accesskit_node_set_has_popup
+#undef accesskit_node_clear_has_popup
+#undef accesskit_node_list_style
+#undef accesskit_node_set_list_style
+#undef accesskit_node_clear_list_style
+#undef accesskit_node_text_align
+#undef accesskit_node_set_text_align
+#undef accesskit_node_clear_text_align
+#undef accesskit_node_vertical_offset
+#undef accesskit_node_set_vertical_offset
+#undef accesskit_node_clear_vertical_offset
+#undef accesskit_node_transform
+#undef accesskit_node_set_transform
+#undef accesskit_node_clear_transform
+#undef accesskit_node_bounds
+#undef accesskit_node_set_bounds
+#undef accesskit_node_clear_bounds
+#undef accesskit_node_text_selection
+#undef accesskit_node_set_text_selection
+#undef accesskit_node_clear_text_selection
+#undef accesskit_custom_action_new
+#undef accesskit_custom_actions_free
+#undef accesskit_node_custom_actions
+#undef accesskit_node_set_custom_actions
+#undef accesskit_node_push_custom_action
+#undef accesskit_node_clear_custom_actions
+#undef accesskit_node_new
+#undef accesskit_node_free
+#undef accesskit_tree_new
+#undef accesskit_tree_free
+#undef accesskit_tree_get_toolkit_name
+#undef accesskit_tree_set_toolkit_name
+#undef accesskit_tree_clear_toolkit_name
+#undef accesskit_tree_get_toolkit_version
+#undef accesskit_tree_set_toolkit_version
+#undef accesskit_tree_clear_toolkit_version
+#undef accesskit_tree_update_with_focus
+#undef accesskit_tree_update_with_capacity_and_focus
+#undef accesskit_tree_update_free
+#undef accesskit_tree_update_push_node
+#undef accesskit_tree_update_set_tree
+#undef accesskit_tree_update_clear_tree
+#undef accesskit_tree_update_set_focus
+#undef accesskit_action_request_free
+#undef accesskit_affine_identity
+#undef accesskit_affine_flip_y
+#undef accesskit_affine_flip_x
+#undef accesskit_affine_scale
+#undef accesskit_affine_scale_non_uniform
+#undef accesskit_affine_translate
+#undef accesskit_affine_map_unit_square
+#undef accesskit_affine_determinant
+#undef accesskit_affine_inverse
+#undef accesskit_affine_transform_rect_bbox
+#undef accesskit_affine_is_finite
+#undef accesskit_affine_is_nan
+#undef accesskit_point_to_vec2
+#undef accesskit_rect_from_points
+#undef accesskit_rect_from_origin_size
+#undef accesskit_rect_with_origin
+#undef accesskit_rect_with_size
+#undef accesskit_rect_width
+#undef accesskit_rect_height
+#undef accesskit_rect_min_x
+#undef accesskit_rect_max_x
+#undef accesskit_rect_min_y
+#undef accesskit_rect_max_y
+#undef accesskit_rect_origin
+#undef accesskit_rect_size
+#undef accesskit_rect_abs
+#undef accesskit_rect_area
+#undef accesskit_rect_is_empty
+#undef accesskit_rect_contains
+#undef accesskit_rect_union
+#undef accesskit_rect_union_pt
+#undef accesskit_rect_intersect
+#undef accesskit_size_to_vec2
+#undef accesskit_vec2_to_point
+#undef accesskit_vec2_to_size
+#undef accesskit_unix_adapter_new
+#undef accesskit_unix_adapter_free
+#undef accesskit_unix_adapter_set_root_window_bounds
+#undef accesskit_unix_adapter_update_if_active
+#undef accesskit_unix_adapter_update_window_focus_state
+#ifdef __cplusplus
+extern "C" {
+#endif
+#define accesskit_node_role accesskit_node_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role accesskit_node_set_role_dylibloader_wrapper_libaccesskit
+#define accesskit_node_supports_action accesskit_node_supports_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_add_action accesskit_node_add_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_remove_action accesskit_node_remove_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_actions accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_hidden accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_hidden accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_hidden accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_linked accesskit_node_is_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_linked accesskit_node_set_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_linked accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_multiselectable accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_multiselectable accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_multiselectable accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_required accesskit_node_is_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_required accesskit_node_set_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_required accesskit_node_clear_required_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_visited accesskit_node_is_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_visited accesskit_node_set_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_visited accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_busy accesskit_node_is_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_busy accesskit_node_set_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_busy accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_live_atomic accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live_atomic accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live_atomic accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_modal accesskit_node_is_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_modal accesskit_node_set_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_modal accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_touch_transparent accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_touch_transparent accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_touch_transparent accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_read_only accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_read_only accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_read_only accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_disabled accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_disabled accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_disabled accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_bold accesskit_node_is_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bold accesskit_node_set_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bold accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_italic accesskit_node_is_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_italic accesskit_node_set_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_italic accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clips_children accesskit_node_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_clips_children accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_clips_children accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_line_breaking_object accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_line_breaking_object accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_line_breaking_object accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_page_breaking_object accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_page_breaking_object accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_page_breaking_object accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_spelling_error accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_spelling_error accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_spelling_error accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_grammar_error accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_grammar_error accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_grammar_error accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_search_match accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_search_match accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_search_match accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_suggestion accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_is_suggestion accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_is_suggestion accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit
+#define accesskit_node_children accesskit_node_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_children accesskit_node_set_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_child accesskit_node_push_child_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_children accesskit_node_clear_children_dylibloader_wrapper_libaccesskit
+#define accesskit_node_controls accesskit_node_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_controls accesskit_node_set_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_controlled accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_controls accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit
+#define accesskit_node_details accesskit_node_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_details accesskit_node_set_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_detail accesskit_node_push_detail_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_details accesskit_node_clear_details_dylibloader_wrapper_libaccesskit
+#define accesskit_node_described_by accesskit_node_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_described_by accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_described_by accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_described_by accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_flow_to accesskit_node_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_flow_to accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_flow_to accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_flow_to accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit
+#define accesskit_node_labelled_by accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_labelled_by accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_labelled_by accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_labelled_by accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit
+#define accesskit_node_owns accesskit_node_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_owns accesskit_node_set_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_owned accesskit_node_push_owned_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_owns accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit
+#define accesskit_node_radio_group accesskit_node_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_radio_group accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_to_radio_group accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_radio_group accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit
+#define accesskit_node_active_descendant accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_active_descendant accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_active_descendant accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit
+#define accesskit_node_error_message accesskit_node_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_error_message accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_error_message accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit
+#define accesskit_node_in_page_link_target accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_in_page_link_target accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_in_page_link_target accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit
+#define accesskit_node_member_of accesskit_node_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_member_of accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_member_of accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit
+#define accesskit_node_next_on_line accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_next_on_line accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_next_on_line accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_previous_on_line accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_previous_on_line accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_previous_on_line accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit
+#define accesskit_node_popup_for accesskit_node_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_popup_for accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_popup_for accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit
+#define accesskit_string_free accesskit_string_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_label accesskit_node_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_label accesskit_node_set_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_label accesskit_node_clear_label_dylibloader_wrapper_libaccesskit
+#define accesskit_node_description accesskit_node_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_description accesskit_node_set_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_description accesskit_node_clear_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_value accesskit_node_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_value accesskit_node_set_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_value accesskit_node_clear_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_access_key accesskit_node_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_access_key accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_access_key accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit
+#define accesskit_node_author_id accesskit_node_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_author_id accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_author_id accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit
+#define accesskit_node_class_name accesskit_node_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_class_name accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_class_name accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_family accesskit_node_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_family accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_family accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit
+#define accesskit_node_html_tag accesskit_node_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_html_tag accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_html_tag accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit
+#define accesskit_node_inner_html accesskit_node_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_inner_html accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_inner_html accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit
+#define accesskit_node_keyboard_shortcut accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_keyboard_shortcut accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_keyboard_shortcut accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit
+#define accesskit_node_language accesskit_node_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_language accesskit_node_set_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_language accesskit_node_clear_language_dylibloader_wrapper_libaccesskit
+#define accesskit_node_placeholder accesskit_node_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_placeholder accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_placeholder accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit
+#define accesskit_node_role_description accesskit_node_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_role_description accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_role_description accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_state_description accesskit_node_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_state_description accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_state_description accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit
+#define accesskit_node_tooltip accesskit_node_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_tooltip accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_tooltip accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit
+#define accesskit_node_url accesskit_node_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_url accesskit_node_set_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_url accesskit_node_clear_url_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index_text accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index_text accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index_text accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index_text accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index_text accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index_text accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_min accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_min accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_min accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_x_max accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_x_max accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_x_max accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_min accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_min accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_min accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit
+#define accesskit_node_scroll_y_max accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_scroll_y_max accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_scroll_y_max accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_min_numeric_value accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_min_numeric_value accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_min_numeric_value accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_max_numeric_value accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_max_numeric_value accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_max_numeric_value accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_step accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_step accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_step accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit
+#define accesskit_node_numeric_value_jump accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_numeric_value_jump accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_numeric_value_jump accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_size accesskit_node_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_size accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_size accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit
+#define accesskit_node_font_weight accesskit_node_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_font_weight accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_font_weight accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_count accesskit_node_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_count accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_count accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_count accesskit_node_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_count accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_count accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_index accesskit_node_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_index accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_index accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_index accesskit_node_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_index accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_index accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit
+#define accesskit_node_row_span accesskit_node_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_row_span accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_row_span accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_column_span accesskit_node_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_column_span accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_column_span accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit
+#define accesskit_node_level accesskit_node_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_level accesskit_node_set_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_level accesskit_node_clear_level_dylibloader_wrapper_libaccesskit
+#define accesskit_node_size_of_set accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_size_of_set accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_size_of_set accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_position_in_set accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_position_in_set accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_position_in_set accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit
+#define accesskit_node_color_value accesskit_node_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_color_value accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_color_value accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit
+#define accesskit_node_background_color accesskit_node_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_background_color accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_background_color accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_foreground_color accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_foreground_color accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_foreground_color accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit
+#define accesskit_node_overline accesskit_node_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_overline accesskit_node_set_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_overline accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_strikethrough accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_strikethrough accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_strikethrough accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit
+#define accesskit_node_underline accesskit_node_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_underline accesskit_node_set_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_underline accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_lengths accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_lengths accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_lengths accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_word_lengths accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_word_lengths accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_word_lengths accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_positions accesskit_node_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_positions accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_positions accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_character_widths accesskit_node_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_character_widths accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_character_widths accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_expanded accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_expanded accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_expanded accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit
+#define accesskit_node_is_selected accesskit_node_is_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_selected accesskit_node_set_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_selected accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit
+#define accesskit_node_invalid accesskit_node_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_invalid accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_invalid accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit
+#define accesskit_node_toggled accesskit_node_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_toggled accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_toggled accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit
+#define accesskit_node_live accesskit_node_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_live accesskit_node_set_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_live accesskit_node_clear_live_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_direction accesskit_node_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_direction accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_direction accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_orientation accesskit_node_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_orientation accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_orientation accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit
+#define accesskit_node_sort_direction accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_sort_direction accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_sort_direction accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit
+#define accesskit_node_aria_current accesskit_node_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_aria_current accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_aria_current accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit
+#define accesskit_node_auto_complete accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_auto_complete accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_auto_complete accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit
+#define accesskit_node_has_popup accesskit_node_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_has_popup accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_has_popup accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit
+#define accesskit_node_list_style accesskit_node_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_list_style accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_list_style accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_align accesskit_node_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_align accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_align accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit
+#define accesskit_node_vertical_offset accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_vertical_offset accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_vertical_offset accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit
+#define accesskit_node_transform accesskit_node_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_transform accesskit_node_set_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_transform accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit
+#define accesskit_node_bounds accesskit_node_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_bounds accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_bounds accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_node_text_selection accesskit_node_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_text_selection accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_text_selection accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_action_new accesskit_custom_action_new_dylibloader_wrapper_libaccesskit
+#define accesskit_custom_actions_free accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit
+#define accesskit_node_custom_actions accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_set_custom_actions accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_push_custom_action accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit
+#define accesskit_node_clear_custom_actions accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit
+#define accesskit_node_new accesskit_node_new_dylibloader_wrapper_libaccesskit
+#define accesskit_node_free accesskit_node_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_new accesskit_tree_new_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_free accesskit_tree_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_name accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_name accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_name accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_get_toolkit_version accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_set_toolkit_version accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_clear_toolkit_version accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_focus accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_with_capacity_and_focus accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_free accesskit_tree_update_free_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_push_node accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_tree accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_clear_tree accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit
+#define accesskit_tree_update_set_focus accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit
+#define accesskit_action_request_free accesskit_action_request_free_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_identity accesskit_affine_identity_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_y accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_flip_x accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale accesskit_affine_scale_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_scale_non_uniform accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_translate accesskit_affine_translate_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_map_unit_square accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_determinant accesskit_affine_determinant_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_inverse accesskit_affine_inverse_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_transform_rect_bbox accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_finite accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit
+#define accesskit_affine_is_nan accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit
+#define accesskit_point_to_vec2 accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_points accesskit_rect_from_points_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_from_origin_size accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_origin accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_with_size accesskit_rect_with_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_width accesskit_rect_width_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_height accesskit_rect_height_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_x accesskit_rect_min_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_x accesskit_rect_max_x_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_min_y accesskit_rect_min_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_max_y accesskit_rect_max_y_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_origin accesskit_rect_origin_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_size accesskit_rect_size_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_abs accesskit_rect_abs_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_area accesskit_rect_area_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_is_empty accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_contains accesskit_rect_contains_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union accesskit_rect_union_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_union_pt accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit
+#define accesskit_rect_intersect accesskit_rect_intersect_dylibloader_wrapper_libaccesskit
+#define accesskit_size_to_vec2 accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_point accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit
+#define accesskit_vec2_to_size accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_new accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_free accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_set_root_window_bounds accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_update_if_active accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit
+#define accesskit_unix_adapter_update_window_focus_state accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit
+extern accesskit_role (*accesskit_node_role_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_role);
+extern bool (*accesskit_node_supports_action_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_add_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_remove_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_action);
+extern void (*accesskit_node_clear_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_hidden_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_hidden_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_linked_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_linked_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_multiselectable_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_multiselectable_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_required_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_required_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_visited_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_visited_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_busy_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_busy_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_live_atomic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_live_atomic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_modal_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_modal_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_touch_transparent_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_touch_transparent_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_read_only_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_read_only_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_disabled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_disabled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_bold_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_bold_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_italic_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_italic_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_clips_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_clips_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_line_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_page_breaking_object_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_spelling_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_spelling_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_grammar_error_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_grammar_error_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_search_match_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_search_match_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern bool (*accesskit_node_is_suggestion_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_node_clear_is_suggestion_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_children_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_child_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_children_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_controls_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_controlled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_controls_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_details_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_detail_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_details_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_described_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_described_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_flow_to_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_flow_to_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_labelled_by_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_labelled_by_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_owns_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_owned_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_owns_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node_ids (*accesskit_node_radio_group_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const accesskit_node_id *);
+extern void (*accesskit_node_push_to_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_radio_group_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_active_descendant_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_active_descendant_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_error_message_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_error_message_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_in_page_link_target_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_in_page_link_target_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_member_of_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_member_of_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_next_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_next_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_previous_on_line_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_previous_on_line_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_node_id (*accesskit_node_popup_for_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_node_id);
+extern void (*accesskit_node_clear_popup_for_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern void (*accesskit_string_free_dylibloader_wrapper_libaccesskit)(char *);
+extern char *(*accesskit_node_label_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_label_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_access_key_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_access_key_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_author_id_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_author_id_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_class_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_class_name_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_font_family_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_font_family_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_html_tag_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_html_tag_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_inner_html_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_inner_html_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_keyboard_shortcut_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_language_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_language_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_placeholder_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_placeholder_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_role_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_role_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_state_description_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_state_description_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_tooltip_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_tooltip_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_url_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_url_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_row_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_row_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern char *(*accesskit_node_column_index_text_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, const char *);
+extern void (*accesskit_node_clear_column_index_text_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_x_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_x_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_min_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_min_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_scroll_y_max_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_scroll_y_max_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_min_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_min_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_max_numeric_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_max_numeric_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_step_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_step_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_numeric_value_jump_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_numeric_value_jump_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_font_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_font_size_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_double (*accesskit_node_font_weight_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, double);
+extern void (*accesskit_node_clear_font_weight_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_count_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_count_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_index_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_index_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_row_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_row_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_column_span_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_column_span_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_level_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_level_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_size_of_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_size_of_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_index (*accesskit_node_position_in_set_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t);
+extern void (*accesskit_node_clear_position_in_set_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_color_value_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_color_value_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_background_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_background_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_color (*accesskit_node_foreground_color_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, uint32_t);
+extern void (*accesskit_node_clear_foreground_color_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_overline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_overline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_strikethrough_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_strikethrough_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_decoration (*accesskit_node_underline_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_decoration);
+extern void (*accesskit_node_clear_underline_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_character_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_character_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_lengths (*accesskit_node_word_lengths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const uint8_t *);
+extern void (*accesskit_node_clear_word_lengths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_positions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_positions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_coords (*accesskit_node_character_widths_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const float *);
+extern void (*accesskit_node_clear_character_widths_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_expanded_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_expanded_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_bool (*accesskit_node_is_selected_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, bool);
+extern void (*accesskit_node_clear_selected_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_invalid (*accesskit_node_invalid_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_invalid);
+extern void (*accesskit_node_clear_invalid_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_toggled (*accesskit_node_toggled_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_toggled);
+extern void (*accesskit_node_clear_toggled_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_live (*accesskit_node_live_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_live);
+extern void (*accesskit_node_clear_live_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_direction (*accesskit_node_text_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_direction);
+extern void (*accesskit_node_clear_text_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_orientation (*accesskit_node_orientation_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_orientation);
+extern void (*accesskit_node_clear_orientation_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_sort_direction (*accesskit_node_sort_direction_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_sort_direction);
+extern void (*accesskit_node_clear_sort_direction_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_aria_current (*accesskit_node_aria_current_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_aria_current);
+extern void (*accesskit_node_clear_aria_current_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_auto_complete (*accesskit_node_auto_complete_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_auto_complete);
+extern void (*accesskit_node_clear_auto_complete_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_has_popup (*accesskit_node_has_popup_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_has_popup);
+extern void (*accesskit_node_clear_has_popup_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_list_style (*accesskit_node_list_style_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_list_style);
+extern void (*accesskit_node_clear_list_style_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_align (*accesskit_node_text_align_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_text_align);
+extern void (*accesskit_node_clear_text_align_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_vertical_offset (*accesskit_node_vertical_offset_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, accesskit_vertical_offset);
+extern void (*accesskit_node_clear_vertical_offset_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern const struct accesskit_affine *(*accesskit_node_transform_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_affine);
+extern void (*accesskit_node_clear_transform_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_rect (*accesskit_node_bounds_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_rect);
+extern void (*accesskit_node_clear_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_opt_text_selection (*accesskit_node_text_selection_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_text_selection);
+extern void (*accesskit_node_clear_text_selection_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_custom_action (*accesskit_custom_action_new_dylibloader_wrapper_libaccesskit)(int32_t, const char *);
+extern void (*accesskit_custom_actions_free_dylibloader_wrapper_libaccesskit)(struct accesskit_custom_actions *);
+extern const struct accesskit_custom_actions *(*accesskit_node_custom_actions_dylibloader_wrapper_libaccesskit)(const struct accesskit_node *);
+extern void (*accesskit_node_set_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, size_t, const struct accesskit_custom_action *);
+extern void (*accesskit_node_push_custom_action_dylibloader_wrapper_libaccesskit)(struct accesskit_node *, struct accesskit_custom_action);
+extern void (*accesskit_node_clear_custom_actions_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_node *(*accesskit_node_new_dylibloader_wrapper_libaccesskit)(accesskit_role);
+extern void (*accesskit_node_free_dylibloader_wrapper_libaccesskit)(struct accesskit_node *);
+extern struct accesskit_tree *(*accesskit_tree_new_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern void (*accesskit_tree_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_name_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_clear_toolkit_name_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern char *(*accesskit_tree_get_toolkit_version_dylibloader_wrapper_libaccesskit)(const struct accesskit_tree *);
+extern void (*accesskit_tree_set_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *, const char *);
+extern void (*accesskit_tree_clear_toolkit_version_dylibloader_wrapper_libaccesskit)(struct accesskit_tree *);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_focus_dylibloader_wrapper_libaccesskit)(accesskit_node_id);
+extern struct accesskit_tree_update *(*accesskit_tree_update_with_capacity_and_focus_dylibloader_wrapper_libaccesskit)(size_t, accesskit_node_id);
+extern void (*accesskit_tree_update_free_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_push_node_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id, struct accesskit_node *);
+extern void (*accesskit_tree_update_set_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, struct accesskit_tree *);
+extern void (*accesskit_tree_update_clear_tree_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *);
+extern void (*accesskit_tree_update_set_focus_dylibloader_wrapper_libaccesskit)(struct accesskit_tree_update *, accesskit_node_id);
+extern void (*accesskit_action_request_free_dylibloader_wrapper_libaccesskit)(struct accesskit_action_request *);
+extern struct accesskit_affine (*accesskit_affine_identity_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_y_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_flip_x_dylibloader_wrapper_libaccesskit)(void);
+extern struct accesskit_affine (*accesskit_affine_scale_dylibloader_wrapper_libaccesskit)(double);
+extern struct accesskit_affine (*accesskit_affine_scale_non_uniform_dylibloader_wrapper_libaccesskit)(double, double);
+extern struct accesskit_affine (*accesskit_affine_translate_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_affine (*accesskit_affine_map_unit_square_dylibloader_wrapper_libaccesskit)(struct accesskit_rect);
+extern double (*accesskit_affine_determinant_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_affine (*accesskit_affine_inverse_dylibloader_wrapper_libaccesskit)(struct accesskit_affine);
+extern struct accesskit_rect (*accesskit_affine_transform_rect_bbox_dylibloader_wrapper_libaccesskit)(struct accesskit_affine, struct accesskit_rect);
+extern bool (*accesskit_affine_is_finite_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern bool (*accesskit_affine_is_nan_dylibloader_wrapper_libaccesskit)(const struct accesskit_affine *);
+extern struct accesskit_vec2 (*accesskit_point_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_points_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_from_origin_size_dylibloader_wrapper_libaccesskit)(struct accesskit_point, struct accesskit_size);
+extern struct accesskit_rect (*accesskit_rect_with_origin_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_with_size_dylibloader_wrapper_libaccesskit)(struct accesskit_rect, struct accesskit_size);
+extern double (*accesskit_rect_width_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_height_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_x_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_min_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_max_y_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_point (*accesskit_rect_origin_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_size (*accesskit_rect_size_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern struct accesskit_rect (*accesskit_rect_abs_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern double (*accesskit_rect_area_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_is_empty_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *);
+extern bool (*accesskit_rect_contains_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_union_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_rect (*accesskit_rect_union_pt_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_point);
+extern struct accesskit_rect (*accesskit_rect_intersect_dylibloader_wrapper_libaccesskit)(const struct accesskit_rect *, struct accesskit_rect);
+extern struct accesskit_vec2 (*accesskit_size_to_vec2_dylibloader_wrapper_libaccesskit)(struct accesskit_size);
+extern struct accesskit_point (*accesskit_vec2_to_point_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_size (*accesskit_vec2_to_size_dylibloader_wrapper_libaccesskit)(struct accesskit_vec2);
+extern struct accesskit_unix_adapter *(*accesskit_unix_adapter_new_dylibloader_wrapper_libaccesskit)(accesskit_activation_handler_callback, void *, accesskit_action_handler_callback, void *, accesskit_deactivation_handler_callback, void *);
+extern void (*accesskit_unix_adapter_free_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *);
+extern void (*accesskit_unix_adapter_set_root_window_bounds_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, struct accesskit_rect, struct accesskit_rect);
+extern void (*accesskit_unix_adapter_update_if_active_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, accesskit_tree_update_factory, void *);
+extern void (*accesskit_unix_adapter_update_window_focus_state_dylibloader_wrapper_libaccesskit)(struct accesskit_unix_adapter *, bool);
+int initialize_libaccesskit(int verbose, void *handle);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/engine/drivers/alsa/audio_driver_alsa.h b/engine/drivers/alsa/audio_driver_alsa.h
index b62d7188..7ddc82f0 100644
--- a/engine/drivers/alsa/audio_driver_alsa.h
+++ b/engine/drivers/alsa/audio_driver_alsa.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_ALSA_H
-#define AUDIO_DRIVER_ALSA_H
+#pragma once
 
 #ifdef ALSA_ENABLED
 
@@ -95,5 +94,3 @@ public:
 };
 
 #endif // ALSA_ENABLED
-
-#endif // AUDIO_DRIVER_ALSA_H
diff --git a/engine/drivers/alsamidi/midi_driver_alsamidi.h b/engine/drivers/alsamidi/midi_driver_alsamidi.h
index e906db6d..7904c558 100644
--- a/engine/drivers/alsamidi/midi_driver_alsamidi.h
+++ b/engine/drivers/alsamidi/midi_driver_alsamidi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MIDI_DRIVER_ALSAMIDI_H
-#define MIDI_DRIVER_ALSAMIDI_H
+#pragma once
 
 #ifdef ALSAMIDI_ENABLED
 
@@ -78,5 +77,3 @@ public:
 };
 
 #endif // ALSAMIDI_ENABLED
-
-#endif // MIDI_DRIVER_ALSAMIDI_H
diff --git a/engine/drivers/apple/SCsub b/engine/drivers/apple/SCsub
index 83ac27f4..4dbb462c 100644
--- a/engine/drivers/apple/SCsub
+++ b/engine/drivers/apple/SCsub
@@ -5,3 +5,4 @@ Import("env")
 
 # Driver source files
 env.add_source_files(env.drivers_sources, "*.mm")
+env.add_source_files(env.drivers_sources, "*.cpp")
diff --git a/engine/drivers/apple/joypad_apple.h b/engine/drivers/apple/joypad_apple.h
index 909648e2..10f88789 100644
--- a/engine/drivers/apple/joypad_apple.h
+++ b/engine/drivers/apple/joypad_apple.h
@@ -28,7 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include "core/input/input.h"
+#include "core/input/input_enums.h"
 
 #define Key _QKey
 #import <GameController/GameController.h>
@@ -43,6 +46,11 @@ struct GameController {
 	RumbleContext *rumble_context API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) = nil;
 	NSInteger ff_effect_timestamp = 0;
 	bool force_feedback = false;
+	bool double_nintendo_joycon_layout = false;
+	bool single_nintendo_joycon_layout = false;
+
+	bool axis_changed[(int)JoyAxis::MAX];
+	double axis_value[(int)JoyAxis::MAX];
 
 	GameController(int p_joy_id, GCController *p_controller);
 	~GameController();
diff --git a/engine/drivers/apple/joypad_apple.mm b/engine/drivers/apple/joypad_apple.mm
index 148ec4cb..fced2f31 100644
--- a/engine/drivers/apple/joypad_apple.mm
+++ b/engine/drivers/apple/joypad_apple.mm
@@ -30,7 +30,7 @@
 
 #import "joypad_apple.h"
 
-#include <CoreHaptics/CoreHaptics.h>
+#import <CoreHaptics/CoreHaptics.h>
 #import <os/log.h>
 
 #include "core/config/project_settings.h"
@@ -134,6 +134,11 @@ public:
 GameController::GameController(int p_joy_id, GCController *p_controller) :
 		joy_id(p_joy_id), controller(p_controller) {
 	force_feedback = NO;
+
+	for (int i = 0; i < (int)JoyAxis::MAX; i++) {
+		axis_changed[i] = false;
+		axis_value[i] = 0.0;
+	}
 	if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
 		if (controller.haptics != nil) {
 			// Create a rumble context for the controller.
@@ -144,6 +149,16 @@ GameController::GameController(int p_joy_id, GCController *p_controller) :
 		}
 	}
 
+	if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
+		if ([controller.productCategory isEqualToString:@"Switch Pro Controller"] || [controller.productCategory isEqualToString:@"Nintendo Switch Joy-Con (L/R)"]) {
+			double_nintendo_joycon_layout = true;
+		}
+
+		if ([controller.productCategory isEqualToString:@"Nintendo Switch Joy-Con (L)"] || [controller.productCategory isEqualToString:@"Nintendo Switch Joy-Con (R)"]) {
+			single_nintendo_joycon_layout = true;
+		}
+	}
+
 	int l_joy_id = joy_id;
 
 	auto BUTTON = [l_joy_id](JoyButton p_button) {
@@ -152,13 +167,199 @@ GameController::GameController(int p_joy_id, GCController *p_controller) :
 		};
 	};
 
-	if (controller.extendedGamepad != nil) {
+	auto JOYSTICK_LEFT = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
+		if (axis_value[(int)JoyAxis::LEFT_X] != xValue) {
+			axis_changed[(int)JoyAxis::LEFT_X] = true;
+			axis_value[(int)JoyAxis::LEFT_X] = xValue;
+		}
+		if (axis_value[(int)JoyAxis::LEFT_Y] != -yValue) {
+			axis_changed[(int)JoyAxis::LEFT_Y] = true;
+			axis_value[(int)JoyAxis::LEFT_Y] = -yValue;
+		}
+	};
+
+	auto JOYSTICK_RIGHT = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
+		if (axis_value[(int)JoyAxis::RIGHT_X] != xValue) {
+			axis_changed[(int)JoyAxis::RIGHT_X] = true;
+			axis_value[(int)JoyAxis::RIGHT_X] = xValue;
+		}
+		if (axis_value[(int)JoyAxis::RIGHT_Y] != -yValue) {
+			axis_changed[(int)JoyAxis::RIGHT_Y] = true;
+			axis_value[(int)JoyAxis::RIGHT_Y] = -yValue;
+		}
+	};
+
+	auto TRIGGER_LEFT = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
+		if (axis_value[(int)JoyAxis::TRIGGER_LEFT] != value) {
+			axis_changed[(int)JoyAxis::TRIGGER_LEFT] = true;
+			axis_value[(int)JoyAxis::TRIGGER_LEFT] = value;
+		}
+	};
+
+	auto TRIGGER_RIGHT = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
+		if (axis_value[(int)JoyAxis::TRIGGER_RIGHT] != value) {
+			axis_changed[(int)JoyAxis::TRIGGER_RIGHT] = true;
+			axis_value[(int)JoyAxis::TRIGGER_RIGHT] = value;
+		}
+	};
+
+	if (@available(macOS 11.0, iOS 14.0, tvOS 14.0, *)) {
+		if (controller.physicalInputProfile != nil) {
+			GCPhysicalInputProfile *profile = controller.physicalInputProfile;
+
+			GCControllerButtonInput *buttonA = profile.buttons[GCInputButtonA];
+			GCControllerButtonInput *buttonB = profile.buttons[GCInputButtonB];
+			GCControllerButtonInput *buttonX = profile.buttons[GCInputButtonX];
+			GCControllerButtonInput *buttonY = profile.buttons[GCInputButtonY];
+			if (double_nintendo_joycon_layout) {
+				if (buttonA) {
+					buttonA.pressedChangedHandler = BUTTON(JoyButton::B);
+				}
+				if (buttonB) {
+					buttonB.pressedChangedHandler = BUTTON(JoyButton::A);
+				}
+				if (buttonX) {
+					buttonX.pressedChangedHandler = BUTTON(JoyButton::Y);
+				}
+				if (buttonY) {
+					buttonY.pressedChangedHandler = BUTTON(JoyButton::X);
+				}
+			} else if (single_nintendo_joycon_layout) {
+				if (buttonA) {
+					buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+				}
+				if (buttonB) {
+					buttonB.pressedChangedHandler = BUTTON(JoyButton::X);
+				}
+				if (buttonX) {
+					buttonX.pressedChangedHandler = BUTTON(JoyButton::B);
+				}
+				if (buttonY) {
+					buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+				}
+			} else {
+				if (buttonA) {
+					buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+				}
+				if (buttonB) {
+					buttonB.pressedChangedHandler = BUTTON(JoyButton::B);
+				}
+				if (buttonX) {
+					buttonX.pressedChangedHandler = BUTTON(JoyButton::X);
+				}
+				if (buttonY) {
+					buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+				}
+			}
+
+			GCControllerButtonInput *leftThumbstickButton = profile.buttons[GCInputLeftThumbstickButton];
+			GCControllerButtonInput *rightThumbstickButton = profile.buttons[GCInputRightThumbstickButton];
+			if (leftThumbstickButton) {
+				leftThumbstickButton.pressedChangedHandler = BUTTON(JoyButton::LEFT_STICK);
+			}
+			if (rightThumbstickButton) {
+				rightThumbstickButton.pressedChangedHandler = BUTTON(JoyButton::RIGHT_STICK);
+			}
+
+			GCControllerButtonInput *leftShoulder = profile.buttons[GCInputLeftShoulder];
+			GCControllerButtonInput *rightShoulder = profile.buttons[GCInputRightShoulder];
+			if (leftShoulder) {
+				leftShoulder.pressedChangedHandler = BUTTON(JoyButton::LEFT_SHOULDER);
+			}
+			if (rightShoulder) {
+				rightShoulder.pressedChangedHandler = BUTTON(JoyButton::RIGHT_SHOULDER);
+			}
+
+			GCControllerButtonInput *leftTrigger = profile.buttons[GCInputLeftTrigger];
+			GCControllerButtonInput *rightTrigger = profile.buttons[GCInputRightTrigger];
+			if (leftTrigger) {
+				leftTrigger.valueChangedHandler = TRIGGER_LEFT;
+			}
+			if (rightTrigger) {
+				rightTrigger.valueChangedHandler = TRIGGER_RIGHT;
+			}
+
+			GCControllerButtonInput *buttonMenu = profile.buttons[GCInputButtonMenu];
+			GCControllerButtonInput *buttonHome = profile.buttons[GCInputButtonHome];
+			GCControllerButtonInput *buttonOptions = profile.buttons[GCInputButtonOptions];
+			if (buttonMenu) {
+				buttonMenu.pressedChangedHandler = BUTTON(JoyButton::START);
+			}
+			if (buttonHome) {
+				buttonHome.pressedChangedHandler = BUTTON(JoyButton::GUIDE);
+			}
+			if (buttonOptions) {
+				buttonOptions.pressedChangedHandler = BUTTON(JoyButton::BACK);
+			}
+
+			// Xbox controller buttons.
+			if (@available(macOS 12.0, iOS 15.0, tvOS 15.0, *)) {
+				GCControllerButtonInput *buttonShare = profile.buttons[GCInputButtonShare];
+				if (buttonShare) {
+					buttonShare.pressedChangedHandler = BUTTON(JoyButton::MISC1);
+				}
+			}
+
+			GCControllerButtonInput *paddleButton1 = profile.buttons[GCInputXboxPaddleOne];
+			GCControllerButtonInput *paddleButton2 = profile.buttons[GCInputXboxPaddleTwo];
+			GCControllerButtonInput *paddleButton3 = profile.buttons[GCInputXboxPaddleThree];
+			GCControllerButtonInput *paddleButton4 = profile.buttons[GCInputXboxPaddleFour];
+			if (paddleButton1) {
+				paddleButton1.pressedChangedHandler = BUTTON(JoyButton::PADDLE1);
+			}
+			if (paddleButton2) {
+				paddleButton2.pressedChangedHandler = BUTTON(JoyButton::PADDLE2);
+			}
+			if (paddleButton3) {
+				paddleButton3.pressedChangedHandler = BUTTON(JoyButton::PADDLE3);
+			}
+			if (paddleButton4) {
+				paddleButton4.pressedChangedHandler = BUTTON(JoyButton::PADDLE4);
+			}
+
+			GCControllerDirectionPad *leftThumbstick = profile.dpads[GCInputLeftThumbstick];
+			if (leftThumbstick) {
+				leftThumbstick.valueChangedHandler = JOYSTICK_LEFT;
+			}
+
+			GCControllerDirectionPad *rightThumbstick = profile.dpads[GCInputRightThumbstick];
+			if (rightThumbstick) {
+				rightThumbstick.valueChangedHandler = JOYSTICK_RIGHT;
+			}
+
+			GCControllerDirectionPad *dpad = nil;
+			if (controller.extendedGamepad != nil) {
+				dpad = controller.extendedGamepad.dpad;
+			} else if (controller.microGamepad != nil) {
+				dpad = controller.microGamepad.dpad;
+			}
+			if (dpad) {
+				dpad.up.pressedChangedHandler = BUTTON(JoyButton::DPAD_UP);
+				dpad.down.pressedChangedHandler = BUTTON(JoyButton::DPAD_DOWN);
+				dpad.left.pressedChangedHandler = BUTTON(JoyButton::DPAD_LEFT);
+				dpad.right.pressedChangedHandler = BUTTON(JoyButton::DPAD_RIGHT);
+			}
+		}
+	} else if (controller.extendedGamepad != nil) {
 		GCExtendedGamepad *gamepad = controller.extendedGamepad;
 
-		gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
-		gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::B);
-		gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::X);
-		gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+		if (double_nintendo_joycon_layout) {
+			gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::B);
+			gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::A);
+			gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::Y);
+			gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::X);
+		} else if (single_nintendo_joycon_layout) {
+			gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+			gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::X);
+			gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::B);
+			gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+		} else {
+			gamepad.buttonA.pressedChangedHandler = BUTTON(JoyButton::A);
+			gamepad.buttonB.pressedChangedHandler = BUTTON(JoyButton::B);
+			gamepad.buttonX.pressedChangedHandler = BUTTON(JoyButton::X);
+			gamepad.buttonY.pressedChangedHandler = BUTTON(JoyButton::Y);
+		}
+
 		gamepad.leftShoulder.pressedChangedHandler = BUTTON(JoyButton::LEFT_SHOULDER);
 		gamepad.rightShoulder.pressedChangedHandler = BUTTON(JoyButton::RIGHT_SHOULDER);
 		gamepad.dpad.up.pressedChangedHandler = BUTTON(JoyButton::DPAD_UP);
@@ -166,21 +367,10 @@ GameController::GameController(int p_joy_id, GCController *p_controller) :
 		gamepad.dpad.left.pressedChangedHandler = BUTTON(JoyButton::DPAD_LEFT);
 		gamepad.dpad.right.pressedChangedHandler = BUTTON(JoyButton::DPAD_RIGHT);
 
-		gamepad.leftThumbstick.valueChangedHandler = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
-			Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::LEFT_X, xValue);
-			Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::LEFT_Y, -yValue);
-		};
-
-		gamepad.rightThumbstick.valueChangedHandler = ^(GCControllerDirectionPad *dpad, float xValue, float yValue) {
-			Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::RIGHT_X, xValue);
-			Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::RIGHT_Y, -yValue);
-		};
-		gamepad.leftTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
-			Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::TRIGGER_LEFT, value);
-		};
-		gamepad.rightTrigger.valueChangedHandler = ^(GCControllerButtonInput *button, float value, BOOL pressed) {
-			Input::get_singleton()->joy_axis(l_joy_id, JoyAxis::TRIGGER_RIGHT, value);
-		};
+		gamepad.leftThumbstick.valueChangedHandler = JOYSTICK_LEFT;
+		gamepad.rightThumbstick.valueChangedHandler = JOYSTICK_RIGHT;
+		gamepad.leftTrigger.valueChangedHandler = TRIGGER_LEFT;
+		gamepad.rightTrigger.valueChangedHandler = TRIGGER_RIGHT;
 
 		if (@available(macOS 10.14.1, iOS 12.1, tvOS 12.1, *)) {
 			gamepad.leftThumbstickButton.pressedChangedHandler = BUTTON(JoyButton::LEFT_STICK);
@@ -313,7 +503,13 @@ void JoypadApple::add_joypad(GCController *p_controller) {
 	}
 
 	// Tell Godot about our new controller.
-	Input::get_singleton()->joy_connection_changed(joy_id, true, String::utf8(p_controller.vendorName.UTF8String));
+	char const *device_name;
+	if (@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)) {
+		device_name = p_controller.productCategory.UTF8String;
+	} else {
+		device_name = p_controller.vendorName.UTF8String;
+	}
+	Input::get_singleton()->joy_connection_changed(joy_id, true, String::utf8(device_name));
 
 	// Assign our player index.
 	joypads.insert(joy_id, memnew(GameController(joy_id, p_controller)));
@@ -404,6 +600,13 @@ void JoypadApple::process_joypads() {
 			int id = E.key;
 			GameController &joypad = *E.value;
 
+			for (int i = 0; i < (int)JoyAxis::MAX; i++) {
+				if (joypad.axis_changed[i]) {
+					joypad.axis_changed[i] = false;
+					Input::get_singleton()->joy_axis(id, (JoyAxis)i, joypad.axis_value[i]);
+				}
+			}
+
 			if (joypad.force_feedback) {
 				Input *input = Input::get_singleton();
 				uint64_t timestamp = input->get_joy_vibration_timestamp(id);
diff --git a/engine/drivers/apple/thread_apple.cpp b/engine/drivers/apple/thread_apple.cpp
new file mode 100644
index 00000000..d07aa3ac
--- /dev/null
+++ b/engine/drivers/apple/thread_apple.cpp
@@ -0,0 +1,129 @@
+/**************************************************************************/
+/*  thread_apple.cpp                                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "thread_apple.h"
+
+#include "core/error/error_macros.h"
+#include "core/object/script_language.h"
+#include "core/string/ustring.h"
+
+SafeNumeric<uint64_t> Thread::id_counter(1); // The first value after .increment() is 2, hence by default the main thread ID should be 1.
+thread_local Thread::ID Thread::caller_id = Thread::id_counter.increment();
+
+struct ThreadData {
+	Thread::Callback callback;
+	void *userdata;
+	Thread::ID caller_id;
+};
+
+void *Thread::thread_callback(void *p_data) {
+	ThreadData *thread_data = static_cast<ThreadData *>(p_data);
+
+	// Set the caller ID for this thread
+	caller_id = thread_data->caller_id;
+
+	ScriptServer::thread_enter(); // Scripts may need to attach a stack.
+
+	// Call the actual callback
+	thread_data->callback(thread_data->userdata);
+
+	ScriptServer::thread_exit();
+
+	// Clean up
+	memdelete(thread_data);
+
+	return nullptr;
+}
+
+Error Thread::set_name(const String &p_name) {
+	int err = pthread_setname_np(p_name.utf8().get_data());
+	return err == 0 ? OK : ERR_INVALID_PARAMETER;
+}
+
+Thread::ID Thread::start(Thread::Callback p_callback, void *p_user, const Settings &p_settings) {
+	ERR_FAIL_COND_V_MSG(id != UNASSIGNED_ID, UNASSIGNED_ID, "A Thread object has been re-started without wait_to_finish() having been called on it.");
+	id = id_counter.increment();
+
+	ThreadData *thread_data = memnew(ThreadData);
+	thread_data->callback = p_callback;
+	thread_data->userdata = p_user;
+	thread_data->caller_id = id;
+
+	// Create the thread
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+
+	switch (p_settings.priority) {
+		case PRIORITY_LOW:
+			pthread_attr_set_qos_class_np(&attr, QOS_CLASS_UTILITY, 0);
+			break;
+		case PRIORITY_NORMAL:
+			pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INITIATED, 0);
+			break;
+		case PRIORITY_HIGH:
+			pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INTERACTIVE, 0);
+			break;
+	}
+
+	if (p_settings.stack_size > 0) {
+		pthread_attr_setstacksize(&attr, p_settings.stack_size);
+	}
+
+	// Create the thread
+	pthread_create(&pthread, &attr, thread_callback, thread_data);
+
+	// Clean up attributes
+	pthread_attr_destroy(&attr);
+
+	return id;
+}
+
+void Thread::wait_to_finish() {
+	ERR_FAIL_COND_MSG(id == UNASSIGNED_ID, "Attempt of waiting to finish on a thread that was never started.");
+	ERR_FAIL_COND_MSG(id == get_caller_id(), "Threads can't wait to finish on themselves, another thread must wait.");
+
+	int err = pthread_join(pthread, nullptr);
+	if (err != 0) {
+		ERR_FAIL_MSG("Thread::wait_to_finish() failed to join thread.");
+	}
+	pthread = pthread_t();
+	id = UNASSIGNED_ID;
+}
+
+Thread::~Thread() {
+	if (id != UNASSIGNED_ID) {
+#ifdef DEBUG_ENABLED
+		WARN_PRINT(
+				"A Thread object is being destroyed without its completion having been realized.\n"
+				"Please call wait_to_finish() on it to ensure correct cleanup.");
+#endif
+		pthread_detach(pthread);
+	}
+}
diff --git a/engine/drivers/apple/thread_apple.h b/engine/drivers/apple/thread_apple.h
new file mode 100644
index 00000000..b6880ca3
--- /dev/null
+++ b/engine/drivers/apple/thread_apple.h
@@ -0,0 +1,110 @@
+/**************************************************************************/
+/*  thread_apple.h                                                        */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/templates/safe_refcount.h"
+#include "core/typedefs.h"
+
+#include <pthread.h>
+#include <new> // For hardware interference size
+
+class String;
+
+class Thread {
+public:
+	typedef void (*Callback)(void *p_userdata);
+
+	typedef uint64_t ID;
+
+	enum : ID {
+		UNASSIGNED_ID = 0,
+		MAIN_ID = 1
+	};
+
+	enum Priority {
+		PRIORITY_LOW,
+		PRIORITY_NORMAL,
+		PRIORITY_HIGH
+	};
+
+	struct Settings {
+		Priority priority;
+		/// Override the default stack size (0 means default)
+		uint64_t stack_size = 0;
+		Settings() { priority = PRIORITY_NORMAL; }
+	};
+
+#if defined(__cpp_lib_hardware_interference_size)
+	GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Winterference-size")
+	static constexpr size_t CACHE_LINE_BYTES = std::hardware_destructive_interference_size;
+	GODOT_GCC_WARNING_POP
+#else
+	// At a negligible memory cost, we use a conservatively high value.
+	static constexpr size_t CACHE_LINE_BYTES = 128;
+#endif
+
+private:
+	friend class Main;
+
+	ID id = UNASSIGNED_ID;
+	pthread_t pthread;
+
+	static SafeNumeric<uint64_t> id_counter;
+	static thread_local ID caller_id;
+
+	static void *thread_callback(void *p_data);
+
+	static void make_main_thread() { caller_id = MAIN_ID; }
+	static void release_main_thread() { caller_id = id_counter.increment(); }
+
+public:
+	_FORCE_INLINE_ static void yield() { pthread_yield_np(); }
+
+	_FORCE_INLINE_ ID get_id() const { return id; }
+	// get the ID of the caller thread
+	_FORCE_INLINE_ static ID get_caller_id() {
+		return caller_id;
+	}
+	// get the ID of the main thread
+	_FORCE_INLINE_ static ID get_main_id() { return MAIN_ID; }
+
+	_FORCE_INLINE_ static bool is_main_thread() { return caller_id == MAIN_ID; }
+
+	static Error set_name(const String &p_name);
+
+	ID start(Thread::Callback p_callback, void *p_user, const Settings &p_settings = Settings());
+	bool is_started() const { return id != UNASSIGNED_ID; }
+	/// Waits until thread is finished, and deallocates it.
+	void wait_to_finish();
+
+	Thread() = default;
+	~Thread();
+};
diff --git a/engine/drivers/backtrace/SCsub b/engine/drivers/backtrace/SCsub
index cc2cf0a6..0d52f951 100644
--- a/engine/drivers/backtrace/SCsub
+++ b/engine/drivers/backtrace/SCsub
@@ -26,7 +26,7 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_backtrace.Prepend(CPPPATH=[thirdparty_dir])
+env_backtrace.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 env_thirdparty = env_backtrace.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/drivers/coreaudio/audio_driver_coreaudio.h b/engine/drivers/coreaudio/audio_driver_coreaudio.h
index 54e02514..64c77fe9 100644
--- a/engine/drivers/coreaudio/audio_driver_coreaudio.h
+++ b/engine/drivers/coreaudio/audio_driver_coreaudio.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_COREAUDIO_H
-#define AUDIO_DRIVER_COREAUDIO_H
+#pragma once
 
 #ifdef COREAUDIO_ENABLED
 
@@ -126,5 +125,3 @@ public:
 };
 
 #endif // COREAUDIO_ENABLED
-
-#endif // AUDIO_DRIVER_COREAUDIO_H
diff --git a/engine/drivers/coreaudio/audio_driver_coreaudio.mm b/engine/drivers/coreaudio/audio_driver_coreaudio.mm
index 4e6ff2ed..62e0b53e 100644
--- a/engine/drivers/coreaudio/audio_driver_coreaudio.mm
+++ b/engine/drivers/coreaudio/audio_driver_coreaudio.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "audio_driver_coreaudio.h"
+#import "audio_driver_coreaudio.h"
 
 #ifdef COREAUDIO_ENABLED
 
diff --git a/engine/drivers/coremidi/SCsub b/engine/drivers/coremidi/SCsub
index 69d667c5..83ac27f4 100644
--- a/engine/drivers/coremidi/SCsub
+++ b/engine/drivers/coremidi/SCsub
@@ -4,4 +4,4 @@ from misc.utility.scons_hints import *
 Import("env")
 
 # Driver source files
-env.add_source_files(env.drivers_sources, "*.cpp")
+env.add_source_files(env.drivers_sources, "*.mm")
diff --git a/engine/drivers/coremidi/midi_driver_coremidi.h b/engine/drivers/coremidi/midi_driver_coremidi.h
index 02cbc623..bfa88344 100644
--- a/engine/drivers/coremidi/midi_driver_coremidi.h
+++ b/engine/drivers/coremidi/midi_driver_coremidi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MIDI_DRIVER_COREMIDI_H
-#define MIDI_DRIVER_COREMIDI_H
+#pragma once
 
 #ifdef COREMIDI_ENABLED
 
@@ -67,5 +66,3 @@ public:
 };
 
 #endif // COREMIDI_ENABLED
-
-#endif // MIDI_DRIVER_COREMIDI_H
diff --git a/engine/drivers/coremidi/midi_driver_coremidi.cpp b/engine/drivers/coremidi/midi_driver_coremidi.mm
similarity index 98%
rename from engine/drivers/coremidi/midi_driver_coremidi.cpp
rename to engine/drivers/coremidi/midi_driver_coremidi.mm
index f6cc5947..b280d209 100644
--- a/engine/drivers/coremidi/midi_driver_coremidi.cpp
+++ b/engine/drivers/coremidi/midi_driver_coremidi.mm
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  midi_driver_coremidi.cpp                                              */
+/*  midi_driver_coremidi.mm                                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "midi_driver_coremidi.h"
+#import "midi_driver_coremidi.h"
 
 #ifdef COREMIDI_ENABLED
 
diff --git a/engine/drivers/d3d12/SCsub b/engine/drivers/d3d12/SCsub
index beeb1339..de9a16a1 100644
--- a/engine/drivers/d3d12/SCsub
+++ b/engine/drivers/d3d12/SCsub
@@ -15,15 +15,15 @@ thirdparty_obj = []
 
 # DirectX Headers (must take precedence over Windows SDK's).
 
-env.Prepend(CPPPATH=["#thirdparty/directx_headers/include/directx"])
-env_d3d12_rdd.Prepend(CPPPATH=["#thirdparty/directx_headers/include/directx"])
-env_d3d12_rdd.Prepend(CPPPATH=["#thirdparty/directx_headers/include/dxguids"])
+env.Prepend(CPPEXTPATH=["#thirdparty/directx_headers/include/directx"])
+env_d3d12_rdd.Prepend(CPPEXTPATH=["#thirdparty/directx_headers/include/directx"])
+env_d3d12_rdd.Prepend(CPPEXTPATH=["#thirdparty/directx_headers/include/dxguids"])
 
 
 # Direct3D 12 Memory Allocator.
 
-env.Append(CPPPATH=["#thirdparty/d3d12ma"])
-env_d3d12_rdd.Append(CPPPATH=["#thirdparty/d3d12ma"])
+env.Append(CPPEXTPATH=["#thirdparty/d3d12ma"])
+env_d3d12_rdd.Append(CPPEXTPATH=["#thirdparty/d3d12ma"])
 
 
 # Agility SDK.
@@ -38,7 +38,7 @@ if env["agility_sdk_path"] != "" and os.path.exists(env["agility_sdk_path"]):
 
 if env["use_pix"]:
     env_d3d12_rdd.Append(CPPDEFINES=["PIX_ENABLED"])
-    env_d3d12_rdd.Append(CPPPATH=[env["pix_path"] + "/Include"])
+    env_d3d12_rdd.Append(CPPEXTPATH=[env["pix_path"] + "/Include"])
 
 
 # Mesa (SPIR-V to DXIL functionality).
@@ -147,7 +147,7 @@ else:
         env.Append(CCFLAGS=["-Wno-unknown-pragmas"])
 
 # This is needed since rendering_device_d3d12.cpp needs to include some Mesa internals.
-env_d3d12_rdd.Prepend(CPPPATH=mesa_private_inc_paths)
+env_d3d12_rdd.Prepend(CPPEXTPATH=mesa_private_inc_paths)
 # For the same reason as above, the defines must be the same as in the 3rd-party code itself.
 env_d3d12_rdd.Append(CPPDEFINES=extra_defines)
 
diff --git a/engine/drivers/d3d12/d3d12_godot_nir_bridge.h b/engine/drivers/d3d12/d3d12_godot_nir_bridge.h
index f66c4edf..5fd9db42 100644
--- a/engine/drivers/d3d12/d3d12_godot_nir_bridge.h
+++ b/engine/drivers/d3d12/d3d12_godot_nir_bridge.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef D3D12_GODOT_NIR_BRIDGE_H
-#define D3D12_GODOT_NIR_BRIDGE_H
+#pragma once
 
 #include <stdint.h>
 
@@ -56,5 +55,3 @@ typedef struct GodotNirCallbacks {
 #ifdef __cplusplus
 }
 #endif
-
-#endif // D3D12_GODOT_NIR_BRIDGE_H
diff --git a/engine/drivers/d3d12/d3d12ma.cpp b/engine/drivers/d3d12/d3d12ma.cpp
index fdec19f9..27f67d66 100644
--- a/engine/drivers/d3d12/d3d12ma.cpp
+++ b/engine/drivers/d3d12/d3d12ma.cpp
@@ -30,35 +30,4 @@
 
 #include "rendering_context_driver_d3d12.h"
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wswitch"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#pragma GCC diagnostic ignored "-Wduplicated-branches"
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wnonnull-compare"
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#pragma clang diagnostic ignored "-Wstring-plus-int"
-#pragma clang diagnostic ignored "-Wswitch"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wtautological-undefined-compare"
-#pragma clang diagnostic ignored "-Wunused-variable"
-#pragma clang diagnostic ignored "-Wunused-but-set-variable"
-#pragma clang diagnostic ignored "-Wunused-function"
-#pragma clang diagnostic ignored "-Wunused-private-field"
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning(disable : 4189 4505)
-#endif
-
-#include "thirdparty/d3d12ma/D3D12MemAlloc.cpp"
+#include <D3D12MemAlloc.cpp>
diff --git a/engine/drivers/d3d12/dxil_hash.h b/engine/drivers/d3d12/dxil_hash.h
index db8ee85a..8dd24835 100644
--- a/engine/drivers/d3d12/dxil_hash.h
+++ b/engine/drivers/d3d12/dxil_hash.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DXIL_HASH_H
-#define DXIL_HASH_H
+#pragma once
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 void compute_dxil_hash(const BYTE *pData, UINT byteCount, BYTE *pOutHash);
-
-#endif // DXIL_HASH_H
diff --git a/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp b/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp
index 7081d173..3d1adc0d 100644
--- a/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp
+++ b/engine/drivers/d3d12/rendering_context_driver_d3d12.cpp
@@ -37,27 +37,7 @@
 #include "core/version.h"
 #include "servers/rendering/rendering_device.h"
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wswitch"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#pragma clang diagnostic ignored "-Wstring-plus-int"
-#pragma clang diagnostic ignored "-Wswitch"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-#include "dxcapi.h"
-
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
+#include <dxcapi.h>
 
 #if !defined(_MSC_VER)
 #include <guiddef.h>
diff --git a/engine/drivers/d3d12/rendering_context_driver_d3d12.h b/engine/drivers/d3d12/rendering_context_driver_d3d12.h
index 3eed6444..234517d9 100644
--- a/engine/drivers/d3d12/rendering_context_driver_d3d12.h
+++ b/engine/drivers/d3d12/rendering_context_driver_d3d12.h
@@ -28,10 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_D3D12_H
-#define RENDERING_CONTEXT_DRIVER_D3D12_H
+#pragma once
 
-#include "core/error/error_list.h"
 #include "core/os/mutex.h"
 #include "core/string/ustring.h"
 #include "core/templates/rid_owner.h"
@@ -39,22 +37,6 @@
 #include "servers/display_server.h"
 #include "servers/rendering/rendering_context_driver.h"
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wswitch"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#pragma clang diagnostic ignored "-Wstring-plus-int"
-#pragma clang diagnostic ignored "-Wswitch"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#endif
-
 #if defined(AS)
 #undef AS
 #endif
@@ -73,20 +55,14 @@
 #include <dcomp.h>
 #endif
 
-#include "d3dx12.h"
+#include <d3dx12.h>
 #include <dxgi1_6.h>
 
 #include <wrl/client.h>
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 using Microsoft::WRL::ComPtr;
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#define ARRAY_SIZE(a) std::size(a)
 
 class RenderingContextDriverD3D12 : public RenderingContextDriver {
 	ComPtr<ID3D12DeviceFactory> device_factory;
@@ -146,5 +122,3 @@ public:
 	RenderingContextDriverD3D12();
 	virtual ~RenderingContextDriverD3D12() override;
 };
-
-#endif // RENDERING_CONTEXT_DRIVER_D3D12_H
diff --git a/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp b/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp
index 29b36f14..b964cb85 100644
--- a/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp
+++ b/engine/drivers/d3d12/rendering_device_driver_d3d12.cpp
@@ -39,44 +39,13 @@
 #include "dxil_hash.h"
 #include "rendering_context_driver_d3d12.h"
 
-// No point in fighting warnings in Mesa.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable : 4200) // "nonstandard extension used: zero-sized array in struct/union".
-#pragma warning(disable : 4806) // "'&': unsafe operation: no value of type 'bool' promoted to type 'uint32_t' can equal the given constant".
-#endif
-
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wswitch"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#pragma clang diagnostic ignored "-Wstring-plus-int"
-#pragma clang diagnostic ignored "-Wswitch"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-#include "nir_spirv.h"
-#include "nir_to_dxil.h"
-#include "spirv_to_dxil.h"
+#include <nir_spirv.h>
+#include <nir_to_dxil.h>
+#include <spirv_to_dxil.h>
 extern "C" {
-#include "dxil_spirv_nir.h"
+#include <dxil_spirv_nir.h>
 }
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
 #if !defined(_MSC_VER)
 #include <guiddef.h>
 
@@ -332,6 +301,20 @@ const RenderingDeviceDriverD3D12::D3D12Format RenderingDeviceDriverD3D12::RD_TO_
 	/* DATA_FORMAT_G16_B16_R16_3PLANE_422_UNORM */ {},
 	/* DATA_FORMAT_G16_B16R16_2PLANE_422_UNORM */ {},
 	/* DATA_FORMAT_G16_B16_R16_3PLANE_444_UNORM */ {},
+	/* DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK*/ {},
+	/* DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK */ {},
+	/* DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK */ {},
 };
 
 Error RenderingDeviceDriverD3D12::DescriptorsHeap::allocate(ID3D12Device *p_device, D3D12_DESCRIPTOR_HEAP_TYPE p_type, uint32_t p_descriptor_count, bool p_for_gpu) {
@@ -1208,7 +1191,7 @@ RDD::TextureID RenderingDeviceDriverD3D12::texture_create(const TextureFormat &p
 	if ((p_format.usage_bits & TEXTURE_USAGE_STORAGE_BIT)) {
 		resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS;
 	}
-	if ((p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT)) {
+	if ((p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) && (p_format.usage_bits & TEXTURE_USAGE_VRS_FRAGMENT_SHADING_RATE_BIT)) {
 		// For VRS images we can't use the typeless format.
 		resource_desc.Format = DXGI_FORMAT_R8_UINT;
 	}
@@ -1353,14 +1336,9 @@ RDD::TextureID RenderingDeviceDriverD3D12::texture_create(const TextureFormat &p
 	}
 	tex_info->states_ptr = &tex_info->owner_info.states;
 	tex_info->format = p_format.format;
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif
+	GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wstrict-aliasing")
 	tex_info->desc = *(CD3DX12_RESOURCE_DESC *)&resource_desc;
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+	GODOT_GCC_WARNING_POP
 	tex_info->base_layer = 0;
 	tex_info->layers = resource_desc.ArraySize();
 	tex_info->base_mip = 0;
@@ -1813,8 +1791,11 @@ static D3D12_BARRIER_ACCESS _rd_texture_layout_access_mask(RDD::TextureLayout p_
 			return D3D12_BARRIER_ACCESS_RESOLVE_SOURCE;
 		case RDD::TEXTURE_LAYOUT_RESOLVE_DST_OPTIMAL:
 			return D3D12_BARRIER_ACCESS_RESOLVE_DEST;
-		case RDD::TEXTURE_LAYOUT_VRS_ATTACHMENT_OPTIMAL:
+		case RDD::TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL:
 			return D3D12_BARRIER_ACCESS_SHADING_RATE_SOURCE;
+		case RDD::TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL:
+			DEV_ASSERT(false && "Fragment density maps are not supported in D3D12.");
+			return D3D12_BARRIER_ACCESS_NO_ACCESS;
 		default:
 			return D3D12_BARRIER_ACCESS_NO_ACCESS;
 	}
@@ -1933,7 +1914,7 @@ static void _rd_stages_to_d3d12(BitField<RDD::PipelineStageBits> p_stages, D3D12
 			r_sync |= D3D12_BARRIER_SYNC_VERTEX_SHADING;
 		}
 
-		if (p_stages.has_flag(RDD::PIPELINE_STAGE_FRAGMENT_SHADER_BIT)) {
+		if (p_stages.has_flag(RDD::PIPELINE_STAGE_FRAGMENT_SHADER_BIT) || p_stages.has_flag(RDD::PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT)) {
 			r_sync |= D3D12_BARRIER_SYNC_PIXEL_SHADING;
 		}
 
@@ -2028,8 +2009,11 @@ static D3D12_BARRIER_LAYOUT _rd_texture_layout_to_d3d12_barrier_layout(RDD::Text
 			return D3D12_BARRIER_LAYOUT_RESOLVE_SOURCE;
 		case RDD::TEXTURE_LAYOUT_RESOLVE_DST_OPTIMAL:
 			return D3D12_BARRIER_LAYOUT_RESOLVE_DEST;
-		case RDD::TEXTURE_LAYOUT_VRS_ATTACHMENT_OPTIMAL:
+		case RDD::TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL:
 			return D3D12_BARRIER_LAYOUT_SHADING_RATE_SOURCE;
+		case RDD::TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL:
+			DEV_ASSERT(false && "Fragment density maps are not supported in D3D12.");
+			return D3D12_BARRIER_LAYOUT_UNDEFINED;
 		default:
 			DEV_ASSERT(false && "Unknown texture layout.");
 			return D3D12_BARRIER_LAYOUT_UNDEFINED;
@@ -2437,7 +2421,7 @@ RDD::SwapChainID RenderingDeviceDriverD3D12::swap_chain_create(RenderingContextD
 	color_ref.aspect.set_flag(RDD::TEXTURE_ASPECT_COLOR_BIT);
 	subpass.color_references.push_back(color_ref);
 
-	RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1);
+	RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1, AttachmentReference());
 	ERR_FAIL_COND_V(!render_pass, SwapChainID());
 
 	// Create the empty swap chain until it is resized.
@@ -2797,8 +2781,8 @@ RDD::FramebufferID RenderingDeviceDriverD3D12::_framebuffer_create(RenderPassID
 
 	uint32_t vrs_index = UINT32_MAX;
 	for (const Subpass &E : pass_info->subpasses) {
-		if (E.vrs_reference.attachment != AttachmentReference::UNUSED) {
-			vrs_index = E.vrs_reference.attachment;
+		if (E.fragment_shading_rate_reference.attachment != AttachmentReference::UNUSED) {
+			vrs_index = E.fragment_shading_rate_reference.attachment;
 		}
 	}
 
@@ -3074,7 +3058,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec
 
 	// Translate SPIR-V shaders to DXIL, and collect shader info from the new representation.
 	HashMap<ShaderStage, Vector<uint8_t>> dxil_blobs;
-	BitField<ShaderStage> stages_processed;
+	BitField<ShaderStage> stages_processed = {};
 	{
 		HashMap<int, nir_shader *> stages_nir_shaders;
 
@@ -3529,7 +3513,7 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::shader_compile_binary_from_spirv(Vec
 		ComPtr<ID3DBlob> error_blob;
 		HRESULT res = D3DX12SerializeVersionedRootSignature(context_driver->lib_d3d12, &root_sig_desc, D3D_ROOT_SIGNATURE_VERSION_1_1, root_sig_blob.GetAddressOf(), error_blob.GetAddressOf());
 		ERR_FAIL_COND_V_MSG(!SUCCEEDED(res), Vector<uint8_t>(),
-				"Serialization of root signature failed with error " + vformat("0x%08ux", (uint64_t)res) + " and the following message:\n" + String((char *)error_blob->GetBufferPointer(), error_blob->GetBufferSize()));
+				"Serialization of root signature failed with error " + vformat("0x%08ux", (uint64_t)res) + " and the following message:\n" + String::ascii(Span((char *)error_blob->GetBufferPointer(), error_blob->GetBufferSize())));
 
 		binary_data.root_signature_crc = crc32(0, nullptr, 0);
 		binary_data.root_signature_crc = crc32(binary_data.root_signature_crc, (const Bytef *)root_sig_blob->GetBufferPointer(), root_sig_blob->GetBufferSize());
@@ -3677,7 +3661,8 @@ RDD::ShaderID RenderingDeviceDriverD3D12::shader_create_from_bytecode(const Vect
 	read_offset += sizeof(uint32_t) * 3 + bin_data_size;
 
 	if (binary_data.shader_name_len) {
-		r_name.parse_utf8((const char *)(binptr + read_offset), binary_data.shader_name_len);
+		r_name.clear();
+		r_name.append_utf8((const char *)(binptr + read_offset), binary_data.shader_name_len);
 		read_offset += STEPIFY(binary_data.shader_name_len, 4);
 	}
 
@@ -4949,7 +4934,9 @@ Vector<uint8_t> RenderingDeviceDriverD3D12::pipeline_cache_serialize() {
 
 // ----- SUBPASS -----
 
-RDD::RenderPassID RenderingDeviceDriverD3D12::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) {
+RDD::RenderPassID RenderingDeviceDriverD3D12::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) {
+	ERR_FAIL_COND_V_MSG(p_fragment_density_map_attachment.attachment != AttachmentReference::UNUSED, RenderPassID(), "Fragment density maps are not supported in D3D12.");
+
 	// Pre-bookkeep.
 	RenderPassInfo *pass_info = VersatileResource::allocate<RenderPassInfo>(resources_allocator);
 
@@ -5050,7 +5037,7 @@ void RenderingDeviceDriverD3D12::command_begin_render_pass(CommandBufferID p_cmd
 		}
 	}
 
-	if (fb_info->vrs_attachment && vrs_capabilities.ss_image_supported) {
+	if (fb_info->vrs_attachment && fsr_capabilities.attachment_supported) {
 		ComPtr<ID3D12GraphicsCommandList5> cmd_list_5;
 		cmd_buf_info->cmd_list->QueryInterface(cmd_list_5.GetAddressOf());
 		if (cmd_list_5) {
@@ -5170,7 +5157,7 @@ void RenderingDeviceDriverD3D12::command_end_render_pass(CommandBufferID p_cmd_b
 	const FramebufferInfo *fb_info = cmd_buf_info->render_pass_state.fb_info;
 	const RenderPassInfo *pass_info = cmd_buf_info->render_pass_state.pass_info;
 
-	if (vrs_capabilities.ss_image_supported) {
+	if (fsr_capabilities.attachment_supported) {
 		ComPtr<ID3D12GraphicsCommandList5> cmd_list_5;
 		cmd_buf_info->cmd_list->QueryInterface(cmd_list_5.GetAddressOf());
 		if (cmd_list_5) {
@@ -6218,6 +6205,8 @@ uint64_t RenderingDeviceDriverD3D12::limit_get(Limit p_limit) {
 			return D3D12_CS_THREAD_GROUP_MAX_Y;
 		case LIMIT_MAX_COMPUTE_WORKGROUP_SIZE_Z:
 			return D3D12_CS_THREAD_GROUP_MAX_Z;
+		case LIMIT_MAX_COMPUTE_SHARED_MEMORY_SIZE:
+			return D3D12_CS_TGSM_REGISTER_COUNT * sizeof(float);
 		case LIMIT_SUBGROUP_SIZE:
 		// Note in min/max. Shader model 6.6 supports it (see https://microsoft.github.io/DirectX-Specs/d3d/HLSL_SM_6_6_WaveSize.html),
 		// but at this time I don't know the implications on the transpilation to DXIL, etc.
@@ -6228,12 +6217,6 @@ uint64_t RenderingDeviceDriverD3D12::limit_get(Limit p_limit) {
 			return subgroup_capabilities.supported_stages_flags_rd();
 		case LIMIT_SUBGROUP_OPERATIONS:
 			return subgroup_capabilities.supported_operations_flags_rd();
-		case LIMIT_VRS_TEXEL_WIDTH:
-		case LIMIT_VRS_TEXEL_HEIGHT:
-			return vrs_capabilities.ss_image_tile_size;
-		case LIMIT_VRS_MAX_FRAGMENT_WIDTH:
-		case LIMIT_VRS_MAX_FRAGMENT_HEIGHT:
-			return vrs_capabilities.ss_max_fragment_size;
 		case LIMIT_MAX_SHADER_VARYINGS:
 			return MIN(D3D12_VS_OUTPUT_REGISTER_COUNT, D3D12_PS_INPUT_REGISTER_COUNT);
 		default: {
@@ -6270,12 +6253,8 @@ uint64_t RenderingDeviceDriverD3D12::api_trait_get(ApiTrait p_trait) {
 
 bool RenderingDeviceDriverD3D12::has_feature(Features p_feature) {
 	switch (p_feature) {
-		case SUPPORTS_MULTIVIEW:
-			return multiview_capabilities.is_supported && multiview_capabilities.max_view_count > 1;
 		case SUPPORTS_FSR_HALF_FLOAT:
 			return shader_capabilities.native_16bit_ops && storage_buffer_capabilities.storage_buffer_16_bit_access_is_supported;
-		case SUPPORTS_ATTACHMENT_VRS:
-			return vrs_capabilities.ss_image_supported;
 		case SUPPORTS_FRAGMENT_SHADER_WITH_ONLY_SIDE_EFFECTS:
 			return true;
 		case SUPPORTS_BUFFER_DEVICE_ADDRESS:
@@ -6289,6 +6268,14 @@ const RDD::MultiviewCapabilities &RenderingDeviceDriverD3D12::get_multiview_capa
 	return multiview_capabilities;
 }
 
+const RDD::FragmentShadingRateCapabilities &RenderingDeviceDriverD3D12::get_fragment_shading_rate_capabilities() {
+	return fsr_capabilities;
+}
+
+const RDD::FragmentDensityMapCapabilities &RenderingDeviceDriverD3D12::get_fragment_density_map_capabilities() {
+	return fdm_capabilities;
+}
+
 String RenderingDeviceDriverD3D12::get_api_name() const {
 	return "D3D12";
 }
@@ -6450,12 +6437,6 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
 	device_capabilities.version_minor = feature_level % 10;
 
 	// Assume not supported until proven otherwise.
-	vrs_capabilities.draw_call_supported = false;
-	vrs_capabilities.primitive_supported = false;
-	vrs_capabilities.primitive_in_multiviewport = false;
-	vrs_capabilities.ss_image_supported = false;
-	vrs_capabilities.ss_image_tile_size = 1;
-	vrs_capabilities.additional_rates_supported = false;
 	multiview_capabilities.is_supported = false;
 	multiview_capabilities.geometry_shader_is_supported = false;
 	multiview_capabilities.tessellation_shader_is_supported = false;
@@ -6546,14 +6527,12 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
 	res = device->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS6, &options6, sizeof(options6));
 	if (SUCCEEDED(res)) {
 		if (options6.VariableShadingRateTier >= D3D12_VARIABLE_SHADING_RATE_TIER_1) {
-			vrs_capabilities.draw_call_supported = true;
+			fsr_capabilities.pipeline_supported = true;
 			if (options6.VariableShadingRateTier >= D3D12_VARIABLE_SHADING_RATE_TIER_2) {
-				vrs_capabilities.primitive_supported = true;
-				vrs_capabilities.primitive_in_multiviewport = options6.PerPrimitiveShadingRateSupportedWithViewportIndexing;
-				vrs_capabilities.ss_image_supported = true;
-				vrs_capabilities.ss_image_tile_size = options6.ShadingRateImageTileSize;
-				vrs_capabilities.ss_max_fragment_size = 8; // TODO figure out if this is supplied and/or needed
-				vrs_capabilities.additional_rates_supported = options6.AdditionalShadingRatesSupported;
+				fsr_capabilities.primitive_supported = true;
+				fsr_capabilities.attachment_supported = true;
+				fsr_capabilities.min_texel_size = Size2i(options6.ShadingRateImageTileSize, options6.ShadingRateImageTileSize);
+				fsr_capabilities.max_texel_size = Size2i(8, 8);
 			}
 		}
 	}
@@ -6565,19 +6544,16 @@ Error RenderingDeviceDriverD3D12::_check_capabilities() {
 		barrier_capabilities.enhanced_barriers_supported = options12.EnhancedBarriersSupported;
 	}
 
-	if (vrs_capabilities.draw_call_supported || vrs_capabilities.primitive_supported || vrs_capabilities.ss_image_supported) {
+	if (fsr_capabilities.pipeline_supported || fsr_capabilities.primitive_supported || fsr_capabilities.attachment_supported) {
 		print_verbose("- D3D12 Variable Rate Shading supported:");
-		if (vrs_capabilities.draw_call_supported) {
+		if (fsr_capabilities.pipeline_supported) {
 			print_verbose("  Draw call");
 		}
-		if (vrs_capabilities.primitive_supported) {
-			print_verbose(String("  Per-primitive (multi-viewport: ") + (vrs_capabilities.primitive_in_multiviewport ? "yes" : "no") + ")");
+		if (fsr_capabilities.primitive_supported) {
+			print_verbose("  Primitive");
 		}
-		if (vrs_capabilities.ss_image_supported) {
-			print_verbose(String("  Screen-space image (tile size: ") + itos(vrs_capabilities.ss_image_tile_size) + ")");
-		}
-		if (vrs_capabilities.additional_rates_supported) {
-			print_verbose(String("  Additional rates: ") + (vrs_capabilities.additional_rates_supported ? "yes" : "no"));
+		if (fsr_capabilities.attachment_supported) {
+			print_verbose(String("  Screen-space image (tile size: ") + itos(fsr_capabilities.min_texel_size.x) + ")");
 		}
 	} else {
 		print_verbose("- D3D12 Variable Rate Shading not supported");
diff --git a/engine/drivers/d3d12/rendering_device_driver_d3d12.h b/engine/drivers/d3d12/rendering_device_driver_d3d12.h
index 50d0f2cd..bc5ccc01 100644
--- a/engine/drivers/d3d12/rendering_device_driver_d3d12.h
+++ b/engine/drivers/d3d12/rendering_device_driver_d3d12.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_DRIVER_D3D12_H
-#define RENDERING_DEVICE_DRIVER_D3D12_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "core/templates/paged_allocator.h"
@@ -41,26 +40,10 @@
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
 #endif
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#pragma GCC diagnostic ignored "-Wshadow"
-#pragma GCC diagnostic ignored "-Wswitch"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#elif defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#pragma clang diagnostic ignored "-Wstring-plus-int"
-#pragma clang diagnostic ignored "-Wswitch"
-#pragma clang diagnostic ignored "-Wmissing-field-initializers"
-#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
-#endif
-
-#include "d3dx12.h"
+#include <d3dx12.h>
 #include <dxgi1_6.h>
 #define D3D12MA_D3D12_HEADERS_ALREADY_INCLUDED
-#include "D3D12MemAlloc.h"
+#include <D3D12MemAlloc.h>
 
 #include <wrl/client.h>
 
@@ -69,12 +52,6 @@
 #undef MemoryBarrier
 #endif
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#elif defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
 using Microsoft::WRL::ComPtr;
 
 #define D3D12_BITCODE_OFFSETS_NUM_STAGES 3
@@ -116,16 +93,6 @@ class RenderingDeviceDriverD3D12 : public RenderingDeviceDriver {
 		uint32_t supported_operations_flags_rd() const;
 	};
 
-	struct VRSCapabilities {
-		bool draw_call_supported = false; // We can specify our fragment rate on a draw call level.
-		bool primitive_supported = false; // We can specify our fragment rate on each drawcall.
-		bool primitive_in_multiviewport = false;
-		bool ss_image_supported = false; // We can provide a density map attachment on our framebuffer.
-		uint32_t ss_image_tile_size = 0;
-		uint32_t ss_max_fragment_size = 0;
-		bool additional_rates_supported = false;
-	};
-
 	struct ShaderCapabilities {
 		D3D_SHADER_MODEL shader_model = (D3D_SHADER_MODEL)0;
 		bool native_16bit_ops = false;
@@ -157,7 +124,8 @@ class RenderingDeviceDriverD3D12 : public RenderingDeviceDriver {
 	uint32_t feature_level = 0; // Major * 10 + minor.
 	SubgroupCapabilities subgroup_capabilities;
 	RDD::MultiviewCapabilities multiview_capabilities;
-	VRSCapabilities vrs_capabilities;
+	FragmentShadingRateCapabilities fsr_capabilities;
+	FragmentDensityMapCapabilities fdm_capabilities;
 	ShaderCapabilities shader_capabilities;
 	StorageBufferCapabilities storage_buffer_capabilities;
 	FormatCapabilities format_capabilities;
@@ -834,7 +802,7 @@ private:
 	};
 
 public:
-	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) override final;
+	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) override final;
 	virtual void render_pass_free(RenderPassID p_render_pass) override final;
 
 	// ----- COMMANDS -----
@@ -1002,6 +970,8 @@ public:
 	virtual uint64_t api_trait_get(ApiTrait p_trait) override final;
 	virtual bool has_feature(Features p_feature) override final;
 	virtual const MultiviewCapabilities &get_multiview_capabilities() override final;
+	virtual const FragmentShadingRateCapabilities &get_fragment_shading_rate_capabilities() override final;
+	virtual const FragmentDensityMapCapabilities &get_fragment_density_map_capabilities() override final;
 	virtual String get_api_name() const override final;
 	virtual String get_api_version() const override final;
 	virtual String get_pipeline_cache_uuid() const override final;
@@ -1036,5 +1006,3 @@ public:
 	RenderingDeviceDriverD3D12(RenderingContextDriverD3D12 *p_context_driver);
 	virtual ~RenderingDeviceDriverD3D12();
 };
-
-#endif // RENDERING_DEVICE_DRIVER_D3D12_H
diff --git a/engine/drivers/egl/egl_manager.cpp b/engine/drivers/egl/egl_manager.cpp
index c545de39..5f7aca41 100644
--- a/engine/drivers/egl/egl_manager.cpp
+++ b/engine/drivers/egl/egl_manager.cpp
@@ -151,7 +151,7 @@ int EGLManager::_get_gldisplay_id(void *p_display) {
 String EGLManager::shader_cache_dir;
 
 void EGLManager::_set_cache(const void *p_key, EGLsizeiANDROID p_key_size, const void *p_value, EGLsizeiANDROID p_value_size) {
-	String name = CryptoCore::b64_encode_str((const uint8_t *)p_key, p_key_size).replace("/", "_");
+	String name = CryptoCore::b64_encode_str((const uint8_t *)p_key, p_key_size).replace_char('/', '_');
 	String path = shader_cache_dir.path_join(name) + ".cache";
 
 	Error err = OK;
@@ -163,7 +163,7 @@ void EGLManager::_set_cache(const void *p_key, EGLsizeiANDROID p_key_size, const
 }
 
 EGLsizeiANDROID EGLManager::_get_cache(const void *p_key, EGLsizeiANDROID p_key_size, void *p_value, EGLsizeiANDROID p_value_size) {
-	String name = CryptoCore::b64_encode_str((const uint8_t *)p_key, p_key_size).replace("/", "_");
+	String name = CryptoCore::b64_encode_str((const uint8_t *)p_key, p_key_size).replace_char('/', '_');
 	String path = shader_cache_dir.path_join(name) + ".cache";
 
 	Error err = OK;
diff --git a/engine/drivers/egl/egl_manager.h b/engine/drivers/egl/egl_manager.h
index f8ef5ca8..bd18e182 100644
--- a/engine/drivers/egl/egl_manager.h
+++ b/engine/drivers/egl/egl_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EGL_MANAGER_H
-#define EGL_MANAGER_H
+#pragma once
 
 #ifdef EGL_ENABLED
 
@@ -119,5 +118,3 @@ public:
 };
 
 #endif // EGL_ENABLED
-
-#endif // EGL_MANAGER_H
diff --git a/engine/drivers/gl_context/SCsub b/engine/drivers/gl_context/SCsub
index a2ba4259..92b32d36 100644
--- a/engine/drivers/gl_context/SCsub
+++ b/engine/drivers/gl_context/SCsub
@@ -13,12 +13,7 @@ if env["platform"] in ["macos", "windows", "linuxbsd"]:
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    # Treat glad headers as system headers to avoid raising warnings. Not supported on MSVC.
-    if not env.msvc:
-        env.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
-    else:
-        env.Prepend(CPPPATH=[thirdparty_dir])
-
+    env.Prepend(CPPEXTPATH=[thirdparty_dir])
     env.Append(CPPDEFINES=["GLAD_ENABLED"])
     env.Append(CPPDEFINES=["EGL_ENABLED"])
 
diff --git a/engine/drivers/gles3/effects/copy_effects.cpp b/engine/drivers/gles3/effects/copy_effects.cpp
index 47ca832b..4d74a499 100644
--- a/engine/drivers/gles3/effects/copy_effects.cpp
+++ b/engine/drivers/gles3/effects/copy_effects.cpp
@@ -243,7 +243,7 @@ void CopyEffects::gaussian_blur(GLuint p_source_texture, int p_mipmap_count, con
 
 		glBindTexture(GL_TEXTURE_2D, p_source_texture);
 		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, i - 1);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, i - 1);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, i);
 		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, p_source_texture, i);
 #ifdef DEV_ENABLED
 		GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
diff --git a/engine/drivers/gles3/effects/copy_effects.h b/engine/drivers/gles3/effects/copy_effects.h
index 1f7b3ee6..e78d887d 100644
--- a/engine/drivers/gles3/effects/copy_effects.h
+++ b/engine/drivers/gles3/effects/copy_effects.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COPY_EFFECTS_GLES3_H
-#define COPY_EFFECTS_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -77,5 +76,3 @@ public:
 } //namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // COPY_EFFECTS_GLES3_H
diff --git a/engine/drivers/gles3/effects/cubemap_filter.cpp b/engine/drivers/gles3/effects/cubemap_filter.cpp
index 685fee6d..a21a02fc 100644
--- a/engine/drivers/gles3/effects/cubemap_filter.cpp
+++ b/engine/drivers/gles3/effects/cubemap_filter.cpp
@@ -91,7 +91,7 @@ CubemapFilter::~CubemapFilter() {
 
 Vector3 importance_sample_GGX(Vector2 xi, float roughness4) {
 	// Compute distribution direction
-	float phi = 2.0 * Math_PI * xi.x;
+	float phi = 2.0 * Math::PI * xi.x;
 	float cos_theta = sqrt((1.0 - xi.y) / (1.0 + (roughness4 - 1.0) * xi.y));
 	float sin_theta = sqrt(1.0 - cos_theta * cos_theta);
 
@@ -107,7 +107,7 @@ Vector3 importance_sample_GGX(Vector2 xi, float roughness4) {
 float distribution_GGX(float NdotH, float roughness4) {
 	float NdotH2 = NdotH * NdotH;
 	float denom = (NdotH2 * (roughness4 - 1.0) + 1.0);
-	denom = Math_PI * denom * denom;
+	denom = Math::PI * denom * denom;
 
 	return roughness4 / denom;
 }
@@ -157,7 +157,7 @@ void CubemapFilter::filter_radiance(GLuint p_source_cubemap, GLuint p_dest_cubem
 		float roughness4 = roughness * roughness;
 		roughness4 *= roughness4;
 
-		float solid_angle_texel = 4.0 * Math_PI / float(6 * size * size);
+		float solid_angle_texel = 4.0 * Math::PI / float(6 * size * size);
 
 		LocalVector<float> sample_directions;
 		sample_directions.resize(4 * sample_count);
diff --git a/engine/drivers/gles3/effects/cubemap_filter.h b/engine/drivers/gles3/effects/cubemap_filter.h
index eaaa6f40..9f2adfe4 100644
--- a/engine/drivers/gles3/effects/cubemap_filter.h
+++ b/engine/drivers/gles3/effects/cubemap_filter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CUBEMAP_FILTER_GLES3_H
-#define CUBEMAP_FILTER_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -66,5 +65,3 @@ public:
 } //namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // CUBEMAP_FILTER_GLES3_H
diff --git a/engine/drivers/gles3/effects/feed_effects.h b/engine/drivers/gles3/effects/feed_effects.h
index 7943a447..255fd80c 100644
--- a/engine/drivers/gles3/effects/feed_effects.h
+++ b/engine/drivers/gles3/effects/feed_effects.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FEED_EFFECTS_GLES3_H
-#define FEED_EFFECTS_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -65,5 +64,3 @@ private:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // FEED_EFFECTS_GLES3_H
diff --git a/engine/drivers/gles3/effects/glow.h b/engine/drivers/gles3/effects/glow.h
index a1be6e1f..faeb99e8 100644
--- a/engine/drivers/gles3/effects/glow.h
+++ b/engine/drivers/gles3/effects/glow.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLOW_GLES3_H
-#define GLOW_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -85,5 +84,3 @@ public:
 } //namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // GLOW_GLES3_H
diff --git a/engine/drivers/gles3/effects/post_effects.h b/engine/drivers/gles3/effects/post_effects.h
index 916d29a0..e6a836c3 100644
--- a/engine/drivers/gles3/effects/post_effects.h
+++ b/engine/drivers/gles3/effects/post_effects.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POST_EFFECTS_GLES3_H
-#define POST_EFFECTS_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -65,5 +64,3 @@ public:
 } //namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // POST_EFFECTS_GLES3_H
diff --git a/engine/drivers/gles3/environment/fog.h b/engine/drivers/gles3/environment/fog.h
index 15179e60..9db34eae 100644
--- a/engine/drivers/gles3/environment/fog.h
+++ b/engine/drivers/gles3/environment/fog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FOG_GLES3_H
-#define FOG_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -55,5 +54,3 @@ public:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // FOG_GLES3_H
diff --git a/engine/drivers/gles3/environment/gi.h b/engine/drivers/gles3/environment/gi.h
index 630f7d85..efd10976 100644
--- a/engine/drivers/gles3/environment/gi.h
+++ b/engine/drivers/gles3/environment/gi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GI_GLES3_H
-#define GI_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -87,5 +86,3 @@ public:
 }; // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // GI_GLES3_H
diff --git a/engine/drivers/gles3/rasterizer_canvas_gles3.cpp b/engine/drivers/gles3/rasterizer_canvas_gles3.cpp
index 0ca013ab..17dc7be2 100644
--- a/engine/drivers/gles3/rasterizer_canvas_gles3.cpp
+++ b/engine/drivers/gles3/rasterizer_canvas_gles3.cpp
@@ -1152,6 +1152,12 @@ void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_rend
 					// Reset base data.
 					_update_transform_2d_to_mat2x3(base_transform * draw_transform, state.instance_data_array[r_index].world);
 					_prepare_canvas_texture(state.canvas_instance_batches[state.current_batch_index].tex, state.canvas_instance_batches[state.current_batch_index].filter, state.canvas_instance_batches[state.current_batch_index].repeat, r_index, texpixel_size);
+					state.instance_data_array[r_index].lights[0] = lights[0];
+					state.instance_data_array[r_index].lights[1] = lights[1];
+					state.instance_data_array[r_index].lights[2] = lights[2];
+					state.instance_data_array[r_index].lights[3] = lights[3];
+					state.instance_data_array[r_index].flags = base_flags;
+					state.instance_data_array[r_index].instance_uniforms_ofs = p_item->instance_allocated_shader_uniforms_offset;
 
 					for (uint32_t j = 0; j < 3; j++) {
 						int offset = j == 0 ? 0 : 1;
@@ -1289,7 +1295,7 @@ void RasterizerCanvasGLES3::_record_item_commands(const Item *p_item, RID p_rend
 
 _FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
 	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 
@@ -1566,7 +1572,7 @@ void RasterizerCanvasGLES3::_add_to_batch(uint32_t &r_index, bool &r_batch_broke
 }
 
 void RasterizerCanvasGLES3::_new_batch(bool &r_batch_broken) {
-	if (state.canvas_instance_batches.size() == 0) {
+	if (state.canvas_instance_batches.is_empty()) {
 		Batch new_batch;
 		new_batch.instance_buffer_index = state.current_instance_buffer_index;
 		state.canvas_instance_batches.push_back(new_batch);
@@ -1686,7 +1692,7 @@ void RasterizerCanvasGLES3::light_update_shadow(RID p_rid, int p_shadow_index, c
 	}
 
 	// Precomputed:
-	// Vector3 cam_target = Basis::from_euler(Vector3(0, 0, Math_TAU * ((i + 3) / 4.0))).xform(Vector3(0, 1, 0));
+	// Vector3 cam_target = Basis::from_euler(Vector3(0, 0, Math::TAU * ((i + 3) / 4.0))).xform(Vector3(0, 1, 0));
 	// projection = projection * Projection(Transform3D().looking_at(cam_targets[i], Vector3(0, 0, -1)).affine_inverse());
 	const Projection projections[4] = {
 		projection * Projection(Vector4(0, 0, -1, 0), Vector4(1, 0, 0, 0), Vector4(0, -1, 0, 0), Vector4(0, 0, 0, 1)),
@@ -1761,7 +1767,7 @@ void RasterizerCanvasGLES3::light_update_directional_shadow(RID p_rid, int p_sha
 
 	Vector2 center = p_clip_rect.get_center();
 
-	float to_edge_distance = ABS(light_dir.dot(p_clip_rect.get_support(-light_dir)) - light_dir.dot(center));
+	float to_edge_distance = Math::abs(light_dir.dot(p_clip_rect.get_support(-light_dir)) - light_dir.dot(center));
 
 	Vector2 from_pos = center - light_dir * (to_edge_distance + p_cull_distance);
 	float distance = to_edge_distance * 2.0 + p_cull_distance;
diff --git a/engine/drivers/gles3/rasterizer_canvas_gles3.h b/engine/drivers/gles3/rasterizer_canvas_gles3.h
index bf4783e7..f68c319c 100644
--- a/engine/drivers/gles3/rasterizer_canvas_gles3.h
+++ b/engine/drivers/gles3/rasterizer_canvas_gles3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RASTERIZER_CANVAS_GLES3_H
-#define RASTERIZER_CANVAS_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -388,5 +387,3 @@ public:
 };
 
 #endif // GLES3_ENABLED
-
-#endif // RASTERIZER_CANVAS_GLES3_H
diff --git a/engine/drivers/gles3/rasterizer_gles3.cpp b/engine/drivers/gles3/rasterizer_gles3.cpp
index 8b389f73..8e09a65c 100644
--- a/engine/drivers/gles3/rasterizer_gles3.cpp
+++ b/engine/drivers/gles3/rasterizer_gles3.cpp
@@ -55,6 +55,7 @@
 #define _EXT_DEBUG_TYPE_PORTABILITY_ARB 0x824F
 #define _EXT_DEBUG_TYPE_PERFORMANCE_ARB 0x8250
 #define _EXT_DEBUG_TYPE_OTHER_ARB 0x8251
+#define _EXT_DEBUG_TYPE_MARKER_ARB 0x8268
 #define _EXT_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143
 #define _EXT_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144
 #define _EXT_DEBUG_LOGGED_MESSAGES_ARB 0x9145
@@ -140,7 +141,7 @@ void RasterizerGLES3::clear_depth(float p_depth) {
 #ifdef CAN_DEBUG
 static void GLAPIENTRY _gl_debug_print(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const GLvoid *userParam) {
 	// These are ultimately annoying, so removing for now.
-	if (type == _EXT_DEBUG_TYPE_OTHER_ARB || type == _EXT_DEBUG_TYPE_PERFORMANCE_ARB) {
+	if (type == _EXT_DEBUG_TYPE_OTHER_ARB || type == _EXT_DEBUG_TYPE_PERFORMANCE_ARB || type == _EXT_DEBUG_TYPE_MARKER_ARB) {
 		return;
 	}
 
diff --git a/engine/drivers/gles3/rasterizer_gles3.h b/engine/drivers/gles3/rasterizer_gles3.h
index abda2a5e..563d2c2b 100644
--- a/engine/drivers/gles3/rasterizer_gles3.h
+++ b/engine/drivers/gles3/rasterizer_gles3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RASTERIZER_GLES3_H
-#define RASTERIZER_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -105,6 +104,7 @@ public:
 
 	void blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount);
 
+	bool is_opengl() { return true; }
 	void gl_end_frame(bool p_swap_buffers);
 	void end_frame(bool p_swap_buffers);
 
@@ -141,5 +141,3 @@ public:
 };
 
 #endif // GLES3_ENABLED
-
-#endif // RASTERIZER_GLES3_H
diff --git a/engine/drivers/gles3/rasterizer_scene_gles3.cpp b/engine/drivers/gles3/rasterizer_scene_gles3.cpp
index 41fa943c..e23e3b93 100644
--- a/engine/drivers/gles3/rasterizer_scene_gles3.cpp
+++ b/engine/drivers/gles3/rasterizer_scene_gles3.cpp
@@ -708,12 +708,7 @@ void RasterizerSceneGLES3::_setup_sky(const RenderDataGLES3 *p_render_data, cons
 				sky_light_data.enabled = true;
 
 				float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
-				if (angular_diameter > 0.0) {
-					angular_diameter = Math::tan(Math::deg_to_rad(angular_diameter));
-				} else {
-					angular_diameter = 0.0;
-				}
-				sky_light_data.size = angular_diameter;
+				sky_light_data.size = Math::deg_to_rad(angular_diameter);
 				sky_globals.directional_light_count++;
 				if (sky_globals.directional_light_count >= sky_globals.max_directional_lights) {
 					break;
@@ -1224,7 +1219,7 @@ void RasterizerSceneGLES3::voxel_gi_set_quality(RS::VoxelGIQuality) {
 
 _FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
 	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 void RasterizerSceneGLES3::_fill_render_list(RenderListType p_render_list, const RenderDataGLES3 *p_render_data, PassMode p_pass_mode, bool p_append) {
@@ -1677,7 +1672,7 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 				if (is_using_physical_light_units()) {
 					light_data.energy *= light_storage->light_get_param(base, RS::LIGHT_PARAM_INTENSITY);
 				} else {
-					light_data.energy *= Math_PI;
+					light_data.energy *= Math::PI;
 				}
 
 				if (p_render_data->camera_attributes.is_valid()) {
@@ -1867,14 +1862,14 @@ void RasterizerSceneGLES3::_setup_lights(const RenderDataGLES3 *p_render_data, b
 
 			// Convert from Luminous Power to Luminous Intensity
 			if (type == RS::LIGHT_OMNI) {
-				energy *= 1.0 / (Math_PI * 4.0);
+				energy *= 1.0 / (Math::PI * 4.0);
 			} else {
 				// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 				// We make this assumption to keep them easy to control.
-				energy *= 1.0 / Math_PI;
+				energy *= 1.0 / Math::PI;
 			}
 		} else {
-			energy *= Math_PI;
+			energy *= Math::PI;
 		}
 
 		if (p_render_data->camera_attributes.is_valid()) {
@@ -3223,11 +3218,11 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 						spec_constants |= SceneShaderGLES3::DISABLE_LIGHT_DIRECTIONAL;
 						spec_constants |= SceneShaderGLES3::DISABLE_LIGHTMAP;
 					} else {
-						if (inst->omni_light_gl_cache.size() == 0) {
+						if (inst->omni_light_gl_cache.is_empty()) {
 							spec_constants |= SceneShaderGLES3::DISABLE_LIGHT_OMNI;
 						}
 
-						if (inst->spot_light_gl_cache.size() == 0) {
+						if (inst->spot_light_gl_cache.is_empty()) {
 							spec_constants |= SceneShaderGLES3::DISABLE_LIGHT_SPOT;
 						}
 
@@ -3235,7 +3230,7 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
 							spec_constants |= SceneShaderGLES3::DISABLE_LIGHT_DIRECTIONAL;
 						}
 
-						if (inst->reflection_probe_rid_cache.size() == 0) {
+						if (inst->reflection_probe_rid_cache.is_empty()) {
 							// We don't have any probes.
 							spec_constants |= SceneShaderGLES3::DISABLE_REFLECTION_PROBE;
 						} else if (inst->reflection_probe_rid_cache.size() > 1) {
diff --git a/engine/drivers/gles3/rasterizer_scene_gles3.h b/engine/drivers/gles3/rasterizer_scene_gles3.h
index 4d7a319f..aa0923fe 100644
--- a/engine/drivers/gles3/rasterizer_scene_gles3.h
+++ b/engine/drivers/gles3/rasterizer_scene_gles3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RASTERIZER_SCENE_GLES3_H
-#define RASTERIZER_SCENE_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -740,7 +739,7 @@ protected:
 		float baked_exposure = 1.0;
 
 		//State to track when radiance cubemap needs updating
-		GLES3::SkyMaterialData *prev_material;
+		GLES3::SkyMaterialData *prev_material = nullptr;
 		Vector3 prev_position = Vector3(0.0, 0.0, 0.0);
 		float prev_time = 0.0f;
 	};
@@ -879,5 +878,3 @@ public:
 };
 
 #endif // GLES3_ENABLED
-
-#endif // RASTERIZER_SCENE_GLES3_H
diff --git a/engine/drivers/gles3/shader_gles3.cpp b/engine/drivers/gles3/shader_gles3.cpp
index 1537035c..d7070d52 100644
--- a/engine/drivers/gles3/shader_gles3.cpp
+++ b/engine/drivers/gles3/shader_gles3.cpp
@@ -73,7 +73,7 @@ void ShaderGLES3::_add_stage(const char *p_code, StageType p_stage_type) {
 		} else if (l.begins_with("#CODE")) {
 			chunk.type = StageTemplate::Chunk::TYPE_CODE;
 			push_chunk = true;
-			chunk.code = l.replace_first("#CODE", String()).replace(":", "").strip_edges().to_upper();
+			chunk.code = l.replace_first("#CODE", String()).remove_char(':').strip_edges().to_upper();
 		} else {
 			text += l + "\n";
 		}
@@ -690,7 +690,7 @@ void ShaderGLES3::_save_to_cache(Version *p_version) {
 
 void ShaderGLES3::_clear_version(Version *p_version) {
 	// Variants not compiled yet, just return
-	if (p_version->variants.size() == 0) {
+	if (p_version->variants.is_empty()) {
 		return;
 	}
 
diff --git a/engine/drivers/gles3/shader_gles3.h b/engine/drivers/gles3/shader_gles3.h
index cb92a03f..bfa2ebb4 100644
--- a/engine/drivers/gles3/shader_gles3.h
+++ b/engine/drivers/gles3/shader_gles3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_GLES3_H
-#define SHADER_GLES3_H
+#pragma once
 
 #include "core/math/projection.h"
 #include "core/os/mutex.h"
@@ -189,7 +188,7 @@ protected:
 		Version *version = version_owner.get_or_null(p_version);
 		ERR_FAIL_NULL_V(version, false);
 
-		if (version->variants.size() == 0) {
+		if (version->variants.is_empty()) {
 			_initialize_version(version); //may lack initialization
 		}
 
@@ -258,5 +257,3 @@ public:
 };
 
 #endif // GLES3_ENABLED
-
-#endif // SHADER_GLES3_H
diff --git a/engine/drivers/gles3/storage/config.cpp b/engine/drivers/gles3/storage/config.cpp
index f561cdac..4dd38d77 100644
--- a/engine/drivers/gles3/storage/config.cpp
+++ b/engine/drivers/gles3/storage/config.cpp
@@ -78,8 +78,8 @@ Config::Config() {
 #endif
 
 	bptc_supported = extensions.has("GL_ARB_texture_compression_bptc") || extensions.has("EXT_texture_compression_bptc");
-	astc_supported = extensions.has("GL_KHR_texture_compression_astc") || extensions.has("GL_OES_texture_compression_astc") || extensions.has("GL_KHR_texture_compression_astc_ldr") || extensions.has("GL_KHR_texture_compression_astc_hdr");
 	astc_hdr_supported = extensions.has("GL_KHR_texture_compression_astc_hdr");
+	astc_supported = astc_hdr_supported || extensions.has("GL_KHR_texture_compression_astc") || extensions.has("GL_OES_texture_compression_astc") || extensions.has("GL_KHR_texture_compression_astc_ldr") || extensions.has("WEBGL_compressed_texture_astc");
 	astc_layered_supported = extensions.has("GL_KHR_texture_compression_astc_sliced_3d");
 
 	if (RasterizerGLES3::is_gles_over_gl()) {
@@ -226,7 +226,7 @@ Config::Config() {
 		// OpenGL ES 3.0 V@331.0 (GIT@35e467f, Ice9844a736) (Date:04/15/19)
 		// OpenGL ES 3.0 V@415.0 (GIT@d39f783, I79de86aa2c, 1591296226) (Date:06/04/20)
 		// OpenGL ES 3.0 V@0502.0 (GIT@09fef447e8, I1fe547a144, 1661493934) (Date:08/25/22)
-		String driver_version = gl_version.get_slice("V@", 1).get_slice(" ", 0);
+		String driver_version = gl_version.get_slice("V@", 1).get_slicec(' ', 0);
 		if (driver_version.is_valid_float() && driver_version.to_float() >= 331.0) {
 			flip_xy_workaround = false;
 
diff --git a/engine/drivers/gles3/storage/config.h b/engine/drivers/gles3/storage/config.h
index 9727346c..531c7400 100644
--- a/engine/drivers/gles3/storage/config.h
+++ b/engine/drivers/gles3/storage/config.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONFIG_GLES3_H
-#define CONFIG_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -123,5 +122,3 @@ public:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // CONFIG_GLES3_H
diff --git a/engine/drivers/gles3/storage/light_storage.cpp b/engine/drivers/gles3/storage/light_storage.cpp
index 36c2514c..b7cd22de 100644
--- a/engine/drivers/gles3/storage/light_storage.cpp
+++ b/engine/drivers/gles3/storage/light_storage.cpp
@@ -1181,7 +1181,7 @@ void LightStorage::lightmap_tap_sh_light(RID p_lightmap, const Vector3 &p_point,
 		return; // Nothing could be done.
 	}
 
-	node = ABS(node) - 1;
+	node = Math::abs(node) - 1;
 
 	uint32_t *tetrahedron = (uint32_t *)&lm->tetrahedra[node * 4];
 	Vector3 points[4] = { lm->points[tetrahedron[0]], lm->points[tetrahedron[1]], lm->points[tetrahedron[2]], lm->points[tetrahedron[3]] };
diff --git a/engine/drivers/gles3/storage/light_storage.h b/engine/drivers/gles3/storage/light_storage.h
index ddd1d797..1e7dc195 100644
--- a/engine/drivers/gles3/storage/light_storage.h
+++ b/engine/drivers/gles3/storage/light_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_STORAGE_GLES3_H
-#define LIGHT_STORAGE_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -909,5 +908,3 @@ public:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // LIGHT_STORAGE_GLES3_H
diff --git a/engine/drivers/gles3/storage/material_storage.cpp b/engine/drivers/gles3/storage/material_storage.cpp
index 85183451..ff92b1b0 100644
--- a/engine/drivers/gles3/storage/material_storage.cpp
+++ b/engine/drivers/gles3/storage/material_storage.cpp
@@ -1143,9 +1143,9 @@ MaterialStorage::MaterialStorage() {
 		actions.renames["CANVAS_MATRIX"] = "canvas_transform";
 		actions.renames["SCREEN_MATRIX"] = "screen_transform";
 		actions.renames["TIME"] = "time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["AT_LIGHT_PASS"] = "false";
 		actions.renames["INSTANCE_CUSTOM"] = "instance_custom";
 
@@ -1238,9 +1238,9 @@ MaterialStorage::MaterialStorage() {
 
 		actions.renames["TIME"] = "scene_data.time";
 		actions.renames["EXPOSURE"] = "(1.0 / scene_data.emissive_exposure_normalization)";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["OUTPUT_IS_SRGB"] = "SHADER_IS_SRGB";
 		actions.renames["CLIP_SPACE_FAR"] = "SHADER_SPACE_FAR";
 		actions.renames["VIEWPORT_SIZE"] = "scene_data.viewport_size";
@@ -1406,9 +1406,9 @@ MaterialStorage::MaterialStorage() {
 		}
 		actions.renames["TRANSFORM"] = "xform";
 		actions.renames["TIME"] = "time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["LIFETIME"] = "lifetime";
 		actions.renames["DELTA"] = "local_delta";
 		actions.renames["NUMBER"] = "particle_number";
@@ -1463,9 +1463,9 @@ MaterialStorage::MaterialStorage() {
 		actions.renames["SCREEN_UV"] = "uv";
 		actions.renames["TIME"] = "time";
 		actions.renames["FRAGCOORD"] = "gl_FragCoord";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["HALF_RES_COLOR"] = "half_res_color";
 		actions.renames["QUARTER_RES_COLOR"] = "quarter_res_color";
 		actions.renames["RADIANCE"] = "radiance";
@@ -1925,7 +1925,7 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 
 	for (const PropertyInfo &E : settings) {
 		if (E.name.begins_with("shader_globals/")) {
-			StringName name = E.name.get_slice("/", 1);
+			StringName name = E.name.get_slicec('/', 1);
 			Dictionary d = GLOBAL_GET(E.name);
 
 			ERR_CONTINUE(!d.has("type"));
diff --git a/engine/drivers/gles3/storage/material_storage.h b/engine/drivers/gles3/storage/material_storage.h
index edc469dc..0d7fc215 100644
--- a/engine/drivers/gles3/storage/material_storage.h
+++ b/engine/drivers/gles3/storage/material_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATERIAL_STORAGE_GLES3_H
-#define MATERIAL_STORAGE_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -634,5 +633,3 @@ public:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // MATERIAL_STORAGE_GLES3_H
diff --git a/engine/drivers/gles3/storage/mesh_storage.h b/engine/drivers/gles3/storage/mesh_storage.h
index 3b9084a0..05de4a58 100644
--- a/engine/drivers/gles3/storage/mesh_storage.h
+++ b/engine/drivers/gles3/storage/mesh_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_STORAGE_GLES3_H
-#define MESH_STORAGE_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -604,5 +603,3 @@ public:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // MESH_STORAGE_GLES3_H
diff --git a/engine/drivers/gles3/storage/particles_storage.cpp b/engine/drivers/gles3/storage/particles_storage.cpp
index 73d7e340..599412c5 100644
--- a/engine/drivers/gles3/storage/particles_storage.cpp
+++ b/engine/drivers/gles3/storage/particles_storage.cpp
@@ -513,7 +513,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 	GLES3::TextureStorage *texture_storage = GLES3::TextureStorage::get_singleton();
 	GLES3::MaterialStorage *material_storage = GLES3::MaterialStorage::get_singleton();
 
-	double new_phase = Math::fmod(p_particles->phase + (p_delta / p_particles->lifetime) * p_particles->speed_scale, 1.0);
+	double new_phase = Math::fmod(p_particles->phase + (p_delta / p_particles->lifetime), 1.0);
 
 	//update current frame
 	ParticlesFrameParams frame_params;
@@ -534,7 +534,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 	p_particles->phase = new_phase;
 
 	frame_params.time = RSG::rasterizer->get_total_time();
-	frame_params.delta = p_delta * p_particles->speed_scale;
+	frame_params.delta = p_delta;
 	frame_params.random_seed = p_particles->random_seed;
 	frame_params.explosiveness = p_particles->explosiveness;
 	frame_params.randomness = p_particles->randomness;
@@ -1097,8 +1097,6 @@ void ParticlesStorage::update_particles() {
 			fixed_fps = particles->fixed_fps;
 		}
 
-		bool zero_time_scale = Engine::get_singleton()->get_time_scale() <= 0.0;
-
 		if (particles->clear && particles->pre_process_time > 0.0) {
 			double frame_time;
 			if (fixed_fps > 0) {
@@ -1115,37 +1113,27 @@ void ParticlesStorage::update_particles() {
 			}
 		}
 
+		double time_scale = MAX(particles->speed_scale, 0.0);
+
 		if (fixed_fps > 0) {
-			double frame_time;
-			double decr;
-			if (zero_time_scale) {
-				frame_time = 0.0;
-				decr = 1.0 / fixed_fps;
-			} else {
-				frame_time = 1.0 / fixed_fps;
-				decr = frame_time;
-			}
+			double frame_time = 1.0 / fixed_fps;
 			double delta = RSG::rasterizer->get_frame_delta_time();
 			if (delta > 0.1) { //avoid recursive stalls if fps goes below 10
 				delta = 0.1;
 			} else if (delta <= 0.0) { //unlikely but..
 				delta = 0.001;
 			}
-			double todo = particles->frame_remainder + delta;
+			double todo = particles->frame_remainder + delta * time_scale;
 
 			while (todo >= frame_time) {
 				_particles_process(particles, frame_time);
-				todo -= decr;
+				todo -= frame_time;
 			}
 
 			particles->frame_remainder = todo;
 
 		} else {
-			if (zero_time_scale) {
-				_particles_process(particles, 0.0);
-			} else {
-				_particles_process(particles, RSG::rasterizer->get_frame_delta_time());
-			}
+			_particles_process(particles, RSG::rasterizer->get_frame_delta_time() * time_scale);
 		}
 
 		if (particles->request_process_time > 0.0) {
diff --git a/engine/drivers/gles3/storage/particles_storage.h b/engine/drivers/gles3/storage/particles_storage.h
index 382364ab..2c96e37a 100644
--- a/engine/drivers/gles3/storage/particles_storage.h
+++ b/engine/drivers/gles3/storage/particles_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLES_STORAGE_GLES3_H
-#define PARTICLES_STORAGE_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -460,5 +459,3 @@ public:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // PARTICLES_STORAGE_GLES3_H
diff --git a/engine/drivers/gles3/storage/render_scene_buffers_gles3.h b/engine/drivers/gles3/storage/render_scene_buffers_gles3.h
index f69c7fb5..a20d373b 100644
--- a/engine/drivers/gles3/storage/render_scene_buffers_gles3.h
+++ b/engine/drivers/gles3/storage/render_scene_buffers_gles3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_SCENE_BUFFERS_GLES3_H
-#define RENDER_SCENE_BUFFERS_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -164,5 +163,3 @@ public:
 };
 
 #endif // GLES3_ENABLED
-
-#endif // RENDER_SCENE_BUFFERS_GLES3_H
diff --git a/engine/drivers/gles3/storage/texture_storage.cpp b/engine/drivers/gles3/storage/texture_storage.cpp
index de593817..72f16cf1 100644
--- a/engine/drivers/gles3/storage/texture_storage.cpp
+++ b/engine/drivers/gles3/storage/texture_storage.cpp
@@ -1468,8 +1468,8 @@ void TextureStorage::texture_debug_usage(List<RS::TextureInfo> *r_info) {
 	List<RID> textures;
 	texture_owner.get_owned_list(&textures);
 
-	for (List<RID>::Element *E = textures.front(); E; E = E->next()) {
-		Texture *t = texture_owner.get_or_null(E->get());
+	for (const RID &rid : textures) {
+		Texture *t = texture_owner.get_or_null(rid);
 		if (!t) {
 			continue;
 		}
diff --git a/engine/drivers/gles3/storage/texture_storage.h b/engine/drivers/gles3/storage/texture_storage.h
index 492ad450..afa548b4 100644
--- a/engine/drivers/gles3/storage/texture_storage.h
+++ b/engine/drivers/gles3/storage/texture_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_STORAGE_GLES3_H
-#define TEXTURE_STORAGE_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -730,5 +729,3 @@ inline String TextureStorage::get_framebuffer_error(GLenum p_status) {
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // TEXTURE_STORAGE_GLES3_H
diff --git a/engine/drivers/gles3/storage/utilities.cpp b/engine/drivers/gles3/storage/utilities.cpp
index 4fa64444..b096a8a7 100644
--- a/engine/drivers/gles3/storage/utilities.cpp
+++ b/engine/drivers/gles3/storage/utilities.cpp
@@ -421,6 +421,9 @@ bool Utilities::has_os_feature(const String &p_feature) const {
 	if (p_feature == "etc2") {
 		return config->etc2_supported;
 	}
+	if (p_feature == "astc_hdr") {
+		return config->astc_hdr_supported;
+	}
 
 	return false;
 }
diff --git a/engine/drivers/gles3/storage/utilities.h b/engine/drivers/gles3/storage/utilities.h
index 6be733b2..9e40d596 100644
--- a/engine/drivers/gles3/storage/utilities.h
+++ b/engine/drivers/gles3/storage/utilities.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UTILITIES_GLES3_H
-#define UTILITIES_GLES3_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -233,5 +232,3 @@ public:
 } // namespace GLES3
 
 #endif // GLES3_ENABLED
-
-#endif // UTILITIES_GLES3_H
diff --git a/engine/drivers/metal/SCsub b/engine/drivers/metal/SCsub
index f5975807..ced6dfbb 100644
--- a/engine/drivers/metal/SCsub
+++ b/engine/drivers/metal/SCsub
@@ -22,7 +22,7 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_metal.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"])
+env_metal.Prepend(CPPEXTPATH=[thirdparty_dir, thirdparty_dir + "/include"])
 
 # Must enable exceptions for SPIRV-Cross; otherwise, it will abort the process on errors.
 if "-fno-exceptions" in env_metal["CXXFLAGS"]:
diff --git a/engine/drivers/metal/inflection_map.h b/engine/drivers/metal/inflection_map.h
index fbed021b..ee426194 100644
--- a/engine/drivers/metal/inflection_map.h
+++ b/engine/drivers/metal/inflection_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INFLECTION_MAP_H
-#define INFLECTION_MAP_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
@@ -121,5 +120,3 @@ protected:
 	HashMap<KeyType, IndexValue> _inflection_indexes;
 	IndexValue _linear_indexes[LinearCount];
 };
-
-#endif // INFLECTION_MAP_H
diff --git a/engine/drivers/metal/metal_device_properties.h b/engine/drivers/metal/metal_device_properties.h
index 2f87f10e..49441b64 100644
--- a/engine/drivers/metal/metal_device_properties.h
+++ b/engine/drivers/metal/metal_device_properties.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 /**************************************************************************/
 /*                                                                        */
 /* Portions of this code were derived from MoltenVK.                      */
@@ -48,9 +50,6 @@
 /* permissions and limitations under the License.                         */
 /**************************************************************************/
 
-#ifndef METAL_DEVICE_PROPERTIES_H
-#define METAL_DEVICE_PROPERTIES_H
-
 #import "servers/rendering/rendering_device.h"
 
 #import <Foundation/Foundation.h>
@@ -125,6 +124,7 @@ struct MetalLimits {
 	uint32_t maxVertexInputBindingStride;
 	uint32_t maxDrawIndexedIndexValue;
 	uint32_t maxShaderVaryings;
+	uint32_t maxThreadGroupMemoryAllocation;
 
 	double temporalScalerInputContentMinScale;
 	double temporalScalerInputContentMaxScale;
@@ -152,5 +152,3 @@ public:
 private:
 	static const SampleCount sample_count[RenderingDevice::TextureSamples::TEXTURE_SAMPLES_MAX];
 };
-
-#endif // METAL_DEVICE_PROPERTIES_H
diff --git a/engine/drivers/metal/metal_device_properties.mm b/engine/drivers/metal/metal_device_properties.mm
index 2c7ff576..713f69e4 100644
--- a/engine/drivers/metal/metal_device_properties.mm
+++ b/engine/drivers/metal/metal_device_properties.mm
@@ -305,6 +305,14 @@ void MetalDeviceProperties::init_limits(id<MTLDevice> p_device) {
 	limits.maxVertexInputBindingStride = (2 * KIBI);
 	limits.maxShaderVaryings = 31; // Accurate on Apple4 and above. See: https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf
 
+	if ([p_device supportsFamily:MTLGPUFamilyApple4]) {
+		limits.maxThreadGroupMemoryAllocation = 32768;
+	} else if ([p_device supportsFamily:MTLGPUFamilyApple3]) {
+		limits.maxThreadGroupMemoryAllocation = 16384;
+	} else {
+		limits.maxThreadGroupMemoryAllocation = 16352;
+	}
+
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
 	limits.minUniformBufferOffsetAlignment = 64;
 #endif
diff --git a/engine/drivers/metal/metal_objects.h b/engine/drivers/metal/metal_objects.h
index 67bb15a3..3966d2e8 100644
--- a/engine/drivers/metal/metal_objects.h
+++ b/engine/drivers/metal/metal_objects.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 /**************************************************************************/
 /*                                                                        */
 /* Portions of this code were derived from MoltenVK.                      */
@@ -48,14 +50,11 @@
 /* permissions and limitations under the License.                         */
 /**************************************************************************/
 
-#ifndef METAL_OBJECTS_H
-#define METAL_OBJECTS_H
-
 #import "metal_device_properties.h"
 #import "metal_utils.h"
 #import "pixel_formats.h"
 
-#import "servers/rendering/rendering_device_driver.h"
+#include "servers/rendering/rendering_device_driver.h"
 
 #import <CommonCrypto/CommonDigest.h>
 #import <Foundation/Foundation.h>
@@ -787,20 +786,20 @@ struct BoundUniformSet {
 
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDUniformSet {
 private:
-	void bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::RenderState &p_state);
-	void bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::RenderState &p_state);
-	void bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state);
-	void bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state);
+	void bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index);
+	void bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index);
+	void bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index);
+	void bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index);
 
 public:
 	uint32_t index;
 	LocalVector<RDD::BoundUniform> uniforms;
 	HashMap<MDShader *, BoundUniformSet> bound_uniforms;
 
-	void bind_uniforms(MDShader *p_shader, MDCommandBuffer::RenderState &p_state);
-	void bind_uniforms(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state);
+	void bind_uniforms(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index);
+	void bind_uniforms(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index);
 
-	BoundUniformSet &bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage);
+	BoundUniformSet &bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage, uint32_t p_set_index);
 };
 
 class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) MDPipeline {
@@ -975,5 +974,3 @@ auto release(RDD::ID p_id) {
 }
 
 } // namespace rid
-
-#endif // METAL_OBJECTS_H
diff --git a/engine/drivers/metal/metal_objects.mm b/engine/drivers/metal/metal_objects.mm
index cc08e047..22d88b15 100644
--- a/engine/drivers/metal/metal_objects.mm
+++ b/engine/drivers/metal/metal_objects.mm
@@ -213,36 +213,38 @@ void MDCommandBuffer::render_bind_uniform_set(RDD::UniformSetID p_uniform_set, R
 	DEV_ASSERT(type == MDCommandBufferStateType::Render);
 
 	MDUniformSet *set = (MDUniformSet *)(p_uniform_set.id);
-	if (render.uniform_sets.size() <= set->index) {
+	if (render.uniform_sets.size() <= p_set_index) {
 		uint32_t s = render.uniform_sets.size();
-		render.uniform_sets.resize(set->index + 1);
+		render.uniform_sets.resize(p_set_index + 1);
 		// Set intermediate values to null.
-		std::fill(&render.uniform_sets[s], &render.uniform_sets[set->index] + 1, nullptr);
+		std::fill(&render.uniform_sets[s], &render.uniform_sets[p_set_index] + 1, nullptr);
 	}
 
-	if (render.uniform_sets[set->index] != set) {
+	if (render.uniform_sets[p_set_index] != set) {
 		render.dirty.set_flag(RenderState::DIRTY_UNIFORMS);
-		render.uniform_set_mask |= 1ULL << set->index;
-		render.uniform_sets[set->index] = set;
+		render.uniform_set_mask |= 1ULL << p_set_index;
+		render.uniform_sets[p_set_index] = set;
 	}
 }
 
 void MDCommandBuffer::render_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count) {
 	DEV_ASSERT(type == MDCommandBufferStateType::Render);
 
-	for (size_t i = 0u; i < p_set_count; ++i) {
+	for (size_t i = 0; i < p_set_count; ++i) {
 		MDUniformSet *set = (MDUniformSet *)(p_uniform_sets[i].id);
-		if (render.uniform_sets.size() <= set->index) {
+
+		uint32_t index = p_first_set_index + i;
+		if (render.uniform_sets.size() <= index) {
 			uint32_t s = render.uniform_sets.size();
-			render.uniform_sets.resize(set->index + 1);
+			render.uniform_sets.resize(index + 1);
 			// Set intermediate values to null.
-			std::fill(&render.uniform_sets[s], &render.uniform_sets[set->index] + 1, nullptr);
+			std::fill(&render.uniform_sets[s], &render.uniform_sets[index] + 1, nullptr);
 		}
 
-		if (render.uniform_sets[set->index] != set) {
+		if (render.uniform_sets[index] != set) {
 			render.dirty.set_flag(RenderState::DIRTY_UNIFORMS);
-			render.uniform_set_mask |= 1ULL << set->index;
-			render.uniform_sets[set->index] = set;
+			render.uniform_set_mask |= 1ULL << index;
+			render.uniform_sets[index] = set;
 		}
 	}
 }
@@ -474,14 +476,14 @@ void MDCommandBuffer::_render_bind_uniform_sets() {
 
 	while (set_uniforms != 0) {
 		// Find the index of the next set bit.
-		int index = __builtin_ctzll(set_uniforms);
+		uint32_t index = (uint32_t)__builtin_ctzll(set_uniforms);
 		// Clear the set bit.
 		set_uniforms &= (set_uniforms - 1);
 		MDUniformSet *set = render.uniform_sets[index];
-		if (set == nullptr || set->index >= (uint32_t)shader->sets.size()) {
+		if (set == nullptr || index >= (uint32_t)shader->sets.size()) {
 			continue;
 		}
-		set->bind_uniforms(shader, render);
+		set->bind_uniforms(shader, render, index);
 	}
 }
 
@@ -610,7 +612,7 @@ void MDCommandBuffer::_render_clear_render_area() {
 	bool shouldClearStencil = (ds_index != RDD::AttachmentReference::UNUSED && pass.attachments[ds_index].shouldClear(subpass, true));
 	if (shouldClearDepth || shouldClearStencil) {
 		MDAttachment const &attachment = pass.attachments[ds_index];
-		BitField<RDD::TextureAspectBits> bits;
+		BitField<RDD::TextureAspectBits> bits = {};
 		if (shouldClearDepth && attachment.type & MDAttachmentType::Depth) {
 			bits.set_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT);
 		}
@@ -955,7 +957,7 @@ void MDCommandBuffer::compute_bind_uniform_set(RDD::UniformSetID p_uniform_set,
 
 	MDShader *shader = (MDShader *)(p_shader.id);
 	MDUniformSet *set = (MDUniformSet *)(p_uniform_set.id);
-	set->bind_uniforms(shader, compute);
+	set->bind_uniforms(shader, compute, p_set_index);
 }
 
 void MDCommandBuffer::compute_bind_uniform_sets(VectorView<RDD::UniformSetID> p_uniform_sets, RDD::ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count) {
@@ -966,7 +968,7 @@ void MDCommandBuffer::compute_bind_uniform_sets(VectorView<RDD::UniformSetID> p_
 	// TODO(sgc): Bind multiple buffers using [encoder setBuffers:offsets:withRange:]
 	for (size_t i = 0u; i < p_set_count; ++i) {
 		MDUniformSet *set = (MDUniformSet *)(p_uniform_sets[i].id);
-		set->bind_uniforms(shader, compute);
+		set->bind_uniforms(shader, compute, p_first_set_index + i);
 	}
 }
 
@@ -1052,50 +1054,50 @@ void MDRenderShader::encode_push_constant_data(VectorView<uint32_t> p_data, MDCo
 	}
 }
 
-void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::RenderState &p_state) {
+void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index) {
 	DEV_ASSERT(p_shader->uses_argument_buffers);
 	DEV_ASSERT(p_state.encoder != nil);
 
-	UniformSet const &set_info = p_shader->sets[index];
+	UniformSet const &set_info = p_shader->sets[p_set_index];
 
 	id<MTLRenderCommandEncoder> __unsafe_unretained enc = p_state.encoder;
 	id<MTLDevice> __unsafe_unretained device = enc.device;
 
-	BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage);
+	BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage, p_set_index);
 
 	// Set the buffer for the vertex stage.
 	{
 		uint32_t const *offset = set_info.offsets.getptr(RDD::SHADER_STAGE_VERTEX);
 		if (offset) {
-			[enc setVertexBuffer:bus.buffer offset:*offset atIndex:index];
+			[enc setVertexBuffer:bus.buffer offset:*offset atIndex:p_set_index];
 		}
 	}
 	// Set the buffer for the fragment stage.
 	{
 		uint32_t const *offset = set_info.offsets.getptr(RDD::SHADER_STAGE_FRAGMENT);
 		if (offset) {
-			[enc setFragmentBuffer:bus.buffer offset:*offset atIndex:index];
+			[enc setFragmentBuffer:bus.buffer offset:*offset atIndex:p_set_index];
 		}
 	}
 }
 
-void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::RenderState &p_state) {
+void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index) {
 	DEV_ASSERT(!p_shader->uses_argument_buffers);
 	DEV_ASSERT(p_state.encoder != nil);
 
 	id<MTLRenderCommandEncoder> __unsafe_unretained enc = p_state.encoder;
 
-	UniformSet const &set = p_shader->sets[index];
+	UniformSet const &set = p_shader->sets[p_set_index];
 
 	for (uint32_t i = 0; i < MIN(uniforms.size(), set.uniforms.size()); i++) {
 		RDD::BoundUniform const &uniform = uniforms[i];
-		UniformInfo ui = set.uniforms[i];
+		const UniformInfo &ui = set.uniforms[i];
 
 		static const RDC::ShaderStage stage_usages[2] = { RDC::ShaderStage::SHADER_STAGE_VERTEX, RDC::ShaderStage::SHADER_STAGE_FRAGMENT };
 		for (const RDC::ShaderStage stage : stage_usages) {
 			ShaderStageUsage const stage_usage = ShaderStageUsage(1 << stage);
 
-			BindingInfo *bi = ui.bindings.getptr(stage);
+			const BindingInfo *bi = ui.bindings.getptr(stage);
 			if (bi == nullptr) {
 				// No binding for this stage.
 				continue;
@@ -1129,7 +1131,7 @@ void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::Ren
 						samplers[j] = sampler;
 						textures[j] = texture;
 					}
-					BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
+					const BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
 					if (sbi) {
 						if (stage == RDD::SHADER_STAGE_VERTEX) {
 							[enc setVertexSamplerStates:samplers withRange:NSMakeRange(sbi->index, count)];
@@ -1175,7 +1177,7 @@ void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::Ren
 							[enc setFragmentTexture:obj atIndex:bi->index];
 						}
 
-						BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
+						const BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
 						if (sbi) {
 							id<MTLTexture> tex = obj.parentTexture ? obj.parentTexture : obj;
 							id<MTLBuffer> buf = tex.buffer;
@@ -1256,47 +1258,47 @@ void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::Ren
 	}
 }
 
-void MDUniformSet::bind_uniforms(MDShader *p_shader, MDCommandBuffer::RenderState &p_state) {
+void MDUniformSet::bind_uniforms(MDShader *p_shader, MDCommandBuffer::RenderState &p_state, uint32_t p_set_index) {
 	if (p_shader->uses_argument_buffers) {
-		bind_uniforms_argument_buffers(p_shader, p_state);
+		bind_uniforms_argument_buffers(p_shader, p_state, p_set_index);
 	} else {
-		bind_uniforms_direct(p_shader, p_state);
+		bind_uniforms_direct(p_shader, p_state, p_set_index);
 	}
 }
 
-void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state) {
+void MDUniformSet::bind_uniforms_argument_buffers(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index) {
 	DEV_ASSERT(p_shader->uses_argument_buffers);
 	DEV_ASSERT(p_state.encoder != nil);
 
-	UniformSet const &set_info = p_shader->sets[index];
+	UniformSet const &set_info = p_shader->sets[p_set_index];
 
 	id<MTLComputeCommandEncoder> enc = p_state.encoder;
 	id<MTLDevice> device = enc.device;
 
-	BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage);
+	BoundUniformSet &bus = bound_uniform_set(p_shader, device, p_state.resource_usage, p_set_index);
 
 	uint32_t const *offset = set_info.offsets.getptr(RDD::SHADER_STAGE_COMPUTE);
 	if (offset) {
-		[enc setBuffer:bus.buffer offset:*offset atIndex:index];
+		[enc setBuffer:bus.buffer offset:*offset atIndex:p_set_index];
 	}
 }
 
-void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state) {
+void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index) {
 	DEV_ASSERT(!p_shader->uses_argument_buffers);
 	DEV_ASSERT(p_state.encoder != nil);
 
 	id<MTLComputeCommandEncoder> __unsafe_unretained enc = p_state.encoder;
 
-	UniformSet const &set = p_shader->sets[index];
+	UniformSet const &set = p_shader->sets[p_set_index];
 
 	for (uint32_t i = 0; i < uniforms.size(); i++) {
 		RDD::BoundUniform const &uniform = uniforms[i];
-		UniformInfo ui = set.uniforms[i];
+		const UniformInfo &ui = set.uniforms[i];
 
 		const RDC::ShaderStage stage = RDC::ShaderStage::SHADER_STAGE_COMPUTE;
 		const ShaderStageUsage stage_usage = ShaderStageUsage(1 << stage);
 
-		BindingInfo *bi = ui.bindings.getptr(stage);
+		const BindingInfo *bi = ui.bindings.getptr(stage);
 		if (bi == nullptr) {
 			// No binding for this stage.
 			continue;
@@ -1326,7 +1328,7 @@ void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::Com
 					samplers[j] = sampler;
 					textures[j] = texture;
 				}
-				BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
+				const BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
 				if (sbi) {
 					[enc setSamplerStates:samplers withRange:NSMakeRange(sbi->index, count)];
 				}
@@ -1352,7 +1354,7 @@ void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::Com
 					id<MTLTexture> obj = rid::get(uniform.ids[0]);
 					[enc setTexture:obj atIndex:bi->index];
 
-					BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
+					const BindingInfo *sbi = ui.bindings_secondary.getptr(stage);
 					if (sbi) {
 						id<MTLTexture> tex = obj.parentTexture ? obj.parentTexture : obj;
 						id<MTLBuffer> buf = tex.buffer;
@@ -1407,22 +1409,22 @@ void MDUniformSet::bind_uniforms_direct(MDShader *p_shader, MDCommandBuffer::Com
 	}
 }
 
-void MDUniformSet::bind_uniforms(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state) {
+void MDUniformSet::bind_uniforms(MDShader *p_shader, MDCommandBuffer::ComputeState &p_state, uint32_t p_set_index) {
 	if (p_shader->uses_argument_buffers) {
-		bind_uniforms_argument_buffers(p_shader, p_state);
+		bind_uniforms_argument_buffers(p_shader, p_state, p_set_index);
 	} else {
-		bind_uniforms_direct(p_shader, p_state);
+		bind_uniforms_direct(p_shader, p_state, p_set_index);
 	}
 }
 
-BoundUniformSet &MDUniformSet::bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage) {
+BoundUniformSet &MDUniformSet::bound_uniform_set(MDShader *p_shader, id<MTLDevice> p_device, ResourceUsageMap &p_resource_usage, uint32_t p_set_index) {
 	BoundUniformSet *sus = bound_uniforms.getptr(p_shader);
 	if (sus != nullptr) {
 		sus->merge_into(p_resource_usage);
 		return *sus;
 	}
 
-	UniformSet const &set = p_shader->sets[index];
+	UniformSet const &set = p_shader->sets[p_set_index];
 
 	HashMap<id<MTLResource>, StageResourceUsage> bound_resources;
 	auto add_usage = [&bound_resources](id<MTLResource> __unsafe_unretained res, RDD::ShaderStage stage, MTLResourceUsage usage) {
diff --git a/engine/drivers/metal/metal_utils.h b/engine/drivers/metal/metal_utils.h
index 6bb2e2dd..8f2f3119 100644
--- a/engine/drivers/metal/metal_utils.h
+++ b/engine/drivers/metal/metal_utils.h
@@ -28,11 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef METAL_UTILS_H
-#define METAL_UTILS_H
+#pragma once
 
 #import <os/log.h>
 
+#import <functional>
+
 #pragma mark - Boolean flags
 
 namespace flags {
@@ -101,5 +102,3 @@ private:
 extern os_log_t LOG_DRIVER;
 // Used for dynamic tracing.
 extern os_log_t LOG_INTERVALS;
-
-#endif // METAL_UTILS_H
diff --git a/engine/drivers/metal/pixel_formats.h b/engine/drivers/metal/pixel_formats.h
index 296e91e7..2db9be25 100644
--- a/engine/drivers/metal/pixel_formats.h
+++ b/engine/drivers/metal/pixel_formats.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 /**************************************************************************/
 /*                                                                        */
 /* Portions of this code were derived from MoltenVK.                      */
@@ -48,16 +50,14 @@
 /* permissions and limitations under the License.                         */
 /**************************************************************************/
 
-#ifndef PIXEL_FORMATS_H
-#define PIXEL_FORMATS_H
+#include "core/typedefs.h"
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations")
 
 #import "inflection_map.h"
 #import "metal_device_properties.h"
 
-#import "servers/rendering/rendering_device.h"
+#include "servers/rendering/rendering_device.h"
 
 #import <Metal/Metal.h>
 
@@ -408,6 +408,4 @@ protected:
 	TightLocalVector<MTLFormatDesc> _mtl_vertex_format_descs;
 };
 
-#pragma clang diagnostic pop
-
-#endif // PIXEL_FORMATS_H
+GODOT_CLANG_WARNING_POP
diff --git a/engine/drivers/metal/pixel_formats.mm b/engine/drivers/metal/pixel_formats.mm
index c9226590..86924c65 100644
--- a/engine/drivers/metal/pixel_formats.mm
+++ b/engine/drivers/metal/pixel_formats.mm
@@ -450,8 +450,7 @@ void PixelFormats::initDataFormatCapabilities() {
 
 	addDataFormatDesc(X8_D24_UNORM_PACK32, Invalid, Depth24Unorm_Stencil8, Invalid, Invalid, 1, 1, 4, DepthStencil);
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 
 	addDataFormatDesc(BC1_RGB_UNORM_BLOCK, BC1_RGBA, Invalid, Invalid, Invalid, 4, 4, 8, Compressed);
 	addDataFormatDesc(BC1_RGB_SRGB_BLOCK, BC1_RGBA_sRGB, Invalid, Invalid, Invalid, 4, 4, 8, Compressed);
@@ -476,7 +475,7 @@ void PixelFormats::initDataFormatCapabilities() {
 	addDataFormatDesc(BC7_UNORM_BLOCK, BC7_RGBAUnorm, Invalid, Invalid, Invalid, 4, 4, 16, Compressed);
 	addDataFormatDesc(BC7_SRGB_BLOCK, BC7_RGBAUnorm_sRGB, Invalid, Invalid, Invalid, 4, 4, 16, Compressed);
 
-#pragma clang diagnostic pop
+	GODOT_CLANG_WARNING_POP
 
 	addDataFormatDesc(ETC2_R8G8B8_UNORM_BLOCK, ETC2_RGB8, Invalid, Invalid, Invalid, 4, 4, 8, Compressed);
 	addDataFormatDesc(ETC2_R8G8B8_SRGB_BLOCK, ETC2_RGB8_sRGB, Invalid, Invalid, Invalid, 4, 4, 8, Compressed);
@@ -493,32 +492,46 @@ void PixelFormats::initDataFormatCapabilities() {
 	addDataFormatDesc(EAC_R11G11_SNORM_BLOCK, EAC_RG11Snorm, Invalid, Invalid, Invalid, 4, 4, 16, Compressed);
 
 	addDataFormatDesc(ASTC_4x4_UNORM_BLOCK, ASTC_4x4_LDR, Invalid, Invalid, Invalid, 4, 4, 16, Compressed);
+	addDataFormatDesc(ASTC_4x4_SFLOAT_BLOCK, ASTC_4x4_HDR, Invalid, Invalid, Invalid, 4, 4, 16, Compressed);
 	addDataFormatDesc(ASTC_4x4_SRGB_BLOCK, ASTC_4x4_sRGB, Invalid, Invalid, Invalid, 4, 4, 16, Compressed);
 	addDataFormatDesc(ASTC_5x4_UNORM_BLOCK, ASTC_5x4_LDR, Invalid, Invalid, Invalid, 5, 4, 16, Compressed);
+	addDataFormatDesc(ASTC_5x4_SFLOAT_BLOCK, ASTC_5x4_HDR, Invalid, Invalid, Invalid, 5, 4, 16, Compressed);
 	addDataFormatDesc(ASTC_5x4_SRGB_BLOCK, ASTC_5x4_sRGB, Invalid, Invalid, Invalid, 5, 4, 16, Compressed);
 	addDataFormatDesc(ASTC_5x5_UNORM_BLOCK, ASTC_5x5_LDR, Invalid, Invalid, Invalid, 5, 5, 16, Compressed);
+	addDataFormatDesc(ASTC_5x5_SFLOAT_BLOCK, ASTC_5x5_HDR, Invalid, Invalid, Invalid, 5, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_5x5_SRGB_BLOCK, ASTC_5x5_sRGB, Invalid, Invalid, Invalid, 5, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_6x5_UNORM_BLOCK, ASTC_6x5_LDR, Invalid, Invalid, Invalid, 6, 5, 16, Compressed);
+	addDataFormatDesc(ASTC_6x5_SFLOAT_BLOCK, ASTC_6x5_HDR, Invalid, Invalid, Invalid, 6, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_6x5_SRGB_BLOCK, ASTC_6x5_sRGB, Invalid, Invalid, Invalid, 6, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_6x6_UNORM_BLOCK, ASTC_6x6_LDR, Invalid, Invalid, Invalid, 6, 6, 16, Compressed);
+	addDataFormatDesc(ASTC_6x6_SFLOAT_BLOCK, ASTC_6x6_HDR, Invalid, Invalid, Invalid, 6, 6, 16, Compressed);
 	addDataFormatDesc(ASTC_6x6_SRGB_BLOCK, ASTC_6x6_sRGB, Invalid, Invalid, Invalid, 6, 6, 16, Compressed);
 	addDataFormatDesc(ASTC_8x5_UNORM_BLOCK, ASTC_8x5_LDR, Invalid, Invalid, Invalid, 8, 5, 16, Compressed);
+	addDataFormatDesc(ASTC_8x5_SFLOAT_BLOCK, ASTC_8x5_HDR, Invalid, Invalid, Invalid, 8, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_8x5_SRGB_BLOCK, ASTC_8x5_sRGB, Invalid, Invalid, Invalid, 8, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_8x6_UNORM_BLOCK, ASTC_8x6_LDR, Invalid, Invalid, Invalid, 8, 6, 16, Compressed);
+	addDataFormatDesc(ASTC_8x6_SFLOAT_BLOCK, ASTC_8x6_HDR, Invalid, Invalid, Invalid, 8, 6, 16, Compressed);
 	addDataFormatDesc(ASTC_8x6_SRGB_BLOCK, ASTC_8x6_sRGB, Invalid, Invalid, Invalid, 8, 6, 16, Compressed);
 	addDataFormatDesc(ASTC_8x8_UNORM_BLOCK, ASTC_8x8_LDR, Invalid, Invalid, Invalid, 8, 8, 16, Compressed);
+	addDataFormatDesc(ASTC_8x8_SFLOAT_BLOCK, ASTC_8x8_HDR, Invalid, Invalid, Invalid, 8, 8, 16, Compressed);
 	addDataFormatDesc(ASTC_8x8_SRGB_BLOCK, ASTC_8x8_sRGB, Invalid, Invalid, Invalid, 8, 8, 16, Compressed);
 	addDataFormatDesc(ASTC_10x5_UNORM_BLOCK, ASTC_10x5_LDR, Invalid, Invalid, Invalid, 10, 5, 16, Compressed);
+	addDataFormatDesc(ASTC_10x5_SFLOAT_BLOCK, ASTC_10x5_HDR, Invalid, Invalid, Invalid, 10, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_10x5_SRGB_BLOCK, ASTC_10x5_sRGB, Invalid, Invalid, Invalid, 10, 5, 16, Compressed);
 	addDataFormatDesc(ASTC_10x6_UNORM_BLOCK, ASTC_10x6_LDR, Invalid, Invalid, Invalid, 10, 6, 16, Compressed);
+	addDataFormatDesc(ASTC_10x6_SFLOAT_BLOCK, ASTC_10x6_HDR, Invalid, Invalid, Invalid, 10, 6, 16, Compressed);
 	addDataFormatDesc(ASTC_10x6_SRGB_BLOCK, ASTC_10x6_sRGB, Invalid, Invalid, Invalid, 10, 6, 16, Compressed);
 	addDataFormatDesc(ASTC_10x8_UNORM_BLOCK, ASTC_10x8_LDR, Invalid, Invalid, Invalid, 10, 8, 16, Compressed);
+	addDataFormatDesc(ASTC_10x8_SFLOAT_BLOCK, ASTC_10x8_HDR, Invalid, Invalid, Invalid, 10, 8, 16, Compressed);
 	addDataFormatDesc(ASTC_10x8_SRGB_BLOCK, ASTC_10x8_sRGB, Invalid, Invalid, Invalid, 10, 8, 16, Compressed);
 	addDataFormatDesc(ASTC_10x10_UNORM_BLOCK, ASTC_10x10_LDR, Invalid, Invalid, Invalid, 10, 10, 16, Compressed);
+	addDataFormatDesc(ASTC_10x10_SFLOAT_BLOCK, ASTC_10x10_HDR, Invalid, Invalid, Invalid, 10, 10, 16, Compressed);
 	addDataFormatDesc(ASTC_10x10_SRGB_BLOCK, ASTC_10x10_sRGB, Invalid, Invalid, Invalid, 10, 10, 16, Compressed);
 	addDataFormatDesc(ASTC_12x10_UNORM_BLOCK, ASTC_12x10_LDR, Invalid, Invalid, Invalid, 12, 10, 16, Compressed);
+	addDataFormatDesc(ASTC_12x10_SFLOAT_BLOCK, ASTC_12x10_HDR, Invalid, Invalid, Invalid, 12, 10, 16, Compressed);
 	addDataFormatDesc(ASTC_12x10_SRGB_BLOCK, ASTC_12x10_sRGB, Invalid, Invalid, Invalid, 12, 10, 16, Compressed);
 	addDataFormatDesc(ASTC_12x12_UNORM_BLOCK, ASTC_12x12_LDR, Invalid, Invalid, Invalid, 12, 12, 16, Compressed);
+	addDataFormatDesc(ASTC_12x12_SFLOAT_BLOCK, ASTC_12x12_HDR, Invalid, Invalid, Invalid, 12, 12, 16, Compressed);
 	addDataFormatDesc(ASTC_12x12_SRGB_BLOCK, ASTC_12x12_sRGB, Invalid, Invalid, Invalid, 12, 12, 16, Compressed);
 
 	addDfFormatDescChromaSubsampling(G8B8G8R8_422_UNORM, GBGR422, 1, 8, 2, 1, 4);
@@ -715,8 +728,7 @@ void PixelFormats::initMTLPixelFormatCapabilities() {
 	addMTLPixelFormatDescSRGB(ASTC_12x12_sRGB, ASTC_12x12, RF, ASTC_12x12_LDR);
 	addMTLPixelFormatDesc(ASTC_12x12_HDR, ASTC_12x12, RF);
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 
 	addMTLPixelFormatDesc(BC1_RGBA, BC1_RGBA, RF);
 	addMTLPixelFormatDescSRGB(BC1_RGBA_sRGB, BC1_RGBA, RF, BC1_RGBA);
@@ -733,7 +745,7 @@ void PixelFormats::initMTLPixelFormatCapabilities() {
 	addMTLPixelFormatDesc(BC7_RGBAUnorm, BC7_RGBA, RF);
 	addMTLPixelFormatDescSRGB(BC7_RGBAUnorm_sRGB, BC7_RGBA, RF, BC7_RGBAUnorm);
 
-#pragma clang diagnostic pop
+	GODOT_CLANG_WARNING_POP
 
 	// YUV pixel formats
 	addMTLPixelFormatDesc(GBGR422, None, RF);
@@ -954,8 +966,7 @@ void PixelFormats::modifyMTLFormatCapabilities(const MetalFeatures &p_feat) {
 	setMTLPixFmtCapsIf(noHDR_ASTC, ASTC_12x10_HDR, None);
 	setMTLPixFmtCapsIf(noHDR_ASTC, ASTC_12x12_HDR, None);
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 
 	bool noBC = !p_feat.supportsBCTextureCompression;
 	setMTLPixFmtCapsIf(noBC, BC1_RGBA, None);
@@ -973,7 +984,7 @@ void PixelFormats::modifyMTLFormatCapabilities(const MetalFeatures &p_feat) {
 	setMTLPixFmtCapsIf(noBC, BC7_RGBAUnorm, None);
 	setMTLPixFmtCapsIf(noBC, BC7_RGBAUnorm_sRGB, None);
 
-#pragma clang diagnostic pop
+	GODOT_CLANG_WARNING_POP
 
 	setMTLPixFmtCapsIf(iosOnly2, BGRA10_XR, None);
 	setMTLPixFmtCapsIf(iosOnly2, BGRA10_XR_sRGB, None);
diff --git a/engine/drivers/metal/rendering_context_driver_metal.h b/engine/drivers/metal/rendering_context_driver_metal.h
index 2f6d46d7..d346c42e 100644
--- a/engine/drivers/metal/rendering_context_driver_metal.h
+++ b/engine/drivers/metal/rendering_context_driver_metal.h
@@ -28,13 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_METAL_H
-#define RENDERING_CONTEXT_DRIVER_METAL_H
+#pragma once
 
 #ifdef METAL_ENABLED
 
-#import "servers/rendering/rendering_context_driver.h"
-#import "servers/rendering/rendering_device_driver.h"
+#include "servers/rendering/rendering_context_driver.h"
+#include "servers/rendering/rendering_device_driver.h"
 
 #import <CoreGraphics/CGGeometry.h>
 
@@ -143,5 +142,3 @@ public:
 };
 
 #endif // METAL_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_METAL_H
diff --git a/engine/drivers/metal/rendering_device_driver_metal.h b/engine/drivers/metal/rendering_device_driver_metal.h
index 5ac1bab4..b4e5b6e7 100644
--- a/engine/drivers/metal/rendering_device_driver_metal.h
+++ b/engine/drivers/metal/rendering_device_driver_metal.h
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_DRIVER_METAL_H
-#define RENDERING_DEVICE_DRIVER_METAL_H
+#pragma once
 
 #import "metal_objects.h"
 
-#import "servers/rendering/rendering_device_driver.h"
+#include "servers/rendering/rendering_device_driver.h"
 
 #import <Metal/Metal.h>
 #import <variant>
@@ -66,6 +65,8 @@ class API_AVAILABLE(macos(11.0), ios(14.0), tvos(14.0)) RenderingDeviceDriverMet
 
 	RDD::Capabilities capabilities;
 	RDD::MultiviewCapabilities multiview_capabilities;
+	RDD::FragmentShadingRateCapabilities fsr_capabilities;
+	RDD::FragmentDensityMapCapabilities fdm_capabilities;
 
 	id<MTLBinaryArchive> archive = nil;
 	uint32_t archive_count = 0;
@@ -316,7 +317,7 @@ public:
 
 	// ----- SUBPASS -----
 
-	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) override final;
+	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) override final;
 	virtual void render_pass_free(RenderPassID p_render_pass) override final;
 
 	// ----- COMMANDS -----
@@ -421,6 +422,8 @@ public:
 	virtual uint64_t api_trait_get(ApiTrait p_trait) override final;
 	virtual bool has_feature(Features p_feature) override final;
 	virtual const MultiviewCapabilities &get_multiview_capabilities() override final;
+	virtual const FragmentShadingRateCapabilities &get_fragment_shading_rate_capabilities() override final;
+	virtual const FragmentDensityMapCapabilities &get_fragment_density_map_capabilities() override final;
 	virtual String get_api_name() const override final { return "Metal"; }
 	virtual String get_api_version() const override final;
 	virtual String get_pipeline_cache_uuid() const override final;
@@ -444,5 +447,3 @@ public:
 	RenderingDeviceDriverMetal(RenderingContextDriverMetal *p_context_driver);
 	~RenderingDeviceDriverMetal();
 };
-
-#endif // RENDERING_DEVICE_DRIVER_METAL_H
diff --git a/engine/drivers/metal/rendering_device_driver_metal.mm b/engine/drivers/metal/rendering_device_driver_metal.mm
index 6c170034..cdae0f93 100644
--- a/engine/drivers/metal/rendering_device_driver_metal.mm
+++ b/engine/drivers/metal/rendering_device_driver_metal.mm
@@ -53,10 +53,10 @@
 #import "pixel_formats.h"
 #import "rendering_context_driver_metal.h"
 
-#import "core/io/compression.h"
-#import "core/io/marshalls.h"
-#import "core/string/ustring.h"
-#import "core/templates/hash_map.h"
+#include "core/io/compression.h"
+#include "core/io/marshalls.h"
+#include "core/string/ustring.h"
+#include "core/templates/hash_map.h"
 
 #import <Metal/MTLTexture.h>
 #import <Metal/Metal.h>
@@ -405,6 +405,15 @@ RDD::TextureID RenderingDeviceDriverMetal::texture_create_from_extension(uint64_
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) {
 	id<MTLTexture> src_texture = rid::get(p_original_texture);
 
+	NSUInteger slices = src_texture.arrayLength;
+	if (src_texture.textureType == MTLTextureTypeCube) {
+		// Metal expects Cube textures to have a slice count of 6.
+		slices = 6;
+	} else if (src_texture.textureType == MTLTextureTypeCubeArray) {
+		// Metal expects Cube Array textures to have 6 slices per layer.
+		slices *= 6;
+	}
+
 #if DEV_ENABLED
 	if (src_texture.sampleCount > 1) {
 		// TODO(sgc): is it ok to create a shared texture from a multi-sample texture?
@@ -434,7 +443,7 @@ RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared(TextureID p_ori
 	id<MTLTexture> obj = [src_texture newTextureViewWithPixelFormat:format
 														textureType:src_texture.textureType
 															 levels:NSMakeRange(0, src_texture.mipmapLevelCount)
-															 slices:NSMakeRange(0, src_texture.arrayLength)
+															 slices:NSMakeRange(0, slices)
 															swizzle:swizzle];
 	ERR_FAIL_NULL_V_MSG(obj, TextureID(), "Unable to create shared texture");
 	return rid::make(obj);
@@ -566,7 +575,14 @@ void RenderingDeviceDriverMetal::texture_get_copyable_layout(TextureID p_texture
 		r_layout->size = get_image_format_required_size(format, sz.width, sz.height, sz.depth, 1, &sbw, &sbh);
 		r_layout->row_pitch = r_layout->size / ((sbh / bh) * sz.depth);
 		r_layout->depth_pitch = r_layout->size / sz.depth;
-		r_layout->layer_pitch = r_layout->size / obj.arrayLength;
+
+		uint32_t array_length = obj.arrayLength;
+		if (obj.textureType == MTLTextureTypeCube) {
+			array_length = 6;
+		} else if (obj.textureType == MTLTextureTypeCubeArray) {
+			array_length *= 6;
+		}
+		r_layout->layer_pitch = r_layout->size / array_length;
 	} else {
 		CRASH_NOW_MSG("need to calculate layout for shared texture");
 	}
@@ -974,7 +990,7 @@ RDD::SwapChainID RenderingDeviceDriverMetal::swap_chain_create(RenderingContextD
 	color_ref.aspect.set_flag(RDD::TEXTURE_ASPECT_COLOR_BIT);
 	subpass.color_references.push_back(color_ref);
 
-	RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1);
+	RenderPassID render_pass = render_pass_create(attachment, subpass, {}, 1, RDD::AttachmentReference());
 	ERR_FAIL_COND_V(!render_pass, SwapChainID());
 
 	// Create the empty swap chain until it is resized.
@@ -2460,6 +2476,8 @@ RDD::ShaderID RenderingDeviceDriverMetal::shader_create_from_bytecode(const Vect
 	HashMap<ShaderStage, MDLibrary *> libraries;
 
 	for (ShaderStageData &shader_data : binary_data.stages) {
+		r_shader_desc.stages.push_back(shader_data.stage);
+
 		SHA256Digest key = SHA256Digest(shader_data.source.ptr(), shader_data.source.length());
 
 		if (ShaderCacheEntry **p = _shader_cache.getptr(key); p != nullptr) {
@@ -2506,7 +2524,7 @@ RDD::ShaderID RenderingDeviceDriverMetal::shader_create_from_bytecode(const Vect
 			su.writable = uniform.writable;
 			su.length = uniform.length;
 			su.binding = uniform.binding;
-			su.stages = uniform.stages;
+			su.stages = (ShaderStage)(uint8_t)uniform.stages;
 			uset.write[i] = su;
 
 			UniformInfo ui;
@@ -2572,7 +2590,7 @@ RDD::ShaderID RenderingDeviceDriverMetal::shader_create_from_bytecode(const Vect
 		sc.type = c.type;
 		sc.constant_id = c.constant_id;
 		sc.int_value = c.int_value;
-		sc.stages = c.stages;
+		sc.stages = (ShaderStage)(uint8_t)c.stages;
 		r_shader_desc.specialization_constants.write[i] = sc;
 	}
 
@@ -3044,7 +3062,7 @@ void RenderingDeviceDriverMetal::command_bind_push_constants(CommandBufferID p_c
 
 String RenderingDeviceDriverMetal::_pipeline_get_cache_path() const {
 	String path = OS::get_singleton()->get_user_data_dir() + "/metal/pipelines";
-	path += "." + context_device.name.validate_filename().replace(" ", "_").to_lower();
+	path += "." + context_device.name.validate_filename().replace_char(' ', '_').to_lower();
 	if (Engine::get_singleton()->is_editor_hint()) {
 		path += ".editor";
 	}
@@ -3102,7 +3120,7 @@ Vector<uint8_t> RenderingDeviceDriverMetal::pipeline_cache_serialize() {
 
 // ----- SUBPASS -----
 
-RDD::RenderPassID RenderingDeviceDriverMetal::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) {
+RDD::RenderPassID RenderingDeviceDriverMetal::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) {
 	PixelFormats &pf = *pixel_formats;
 
 	size_t subpass_count = p_subpasses.size();
@@ -3899,16 +3917,16 @@ uint64_t RenderingDeviceDriverMetal::get_lazily_memory_used() {
 uint64_t RenderingDeviceDriverMetal::limit_get(Limit p_limit) {
 	MetalDeviceProperties const &props = (*device_properties);
 	MetalLimits const &limits = props.limits;
-
+	uint64_t safe_unbounded = ((uint64_t)1 << 30);
 #if defined(DEV_ENABLED)
 #define UNKNOWN(NAME)                                                            \
 	case NAME:                                                                   \
 		WARN_PRINT_ONCE("Returning maximum value for unknown limit " #NAME "."); \
-		return (uint64_t)1 << 30;
+		return safe_unbounded;
 #else
 #define UNKNOWN(NAME) \
 	case NAME:        \
-		return (uint64_t)1 << 30
+		return safe_unbounded
 #endif
 
 	// clang-format off
@@ -3981,6 +3999,8 @@ uint64_t RenderingDeviceDriverMetal::limit_get(Limit p_limit) {
 			return limits.maxThreadsPerThreadGroup.height;
 		case LIMIT_MAX_COMPUTE_WORKGROUP_SIZE_Z:
 			return limits.maxThreadsPerThreadGroup.depth;
+		case LIMIT_MAX_COMPUTE_SHARED_MEMORY_SIZE:
+			return limits.maxThreadGroupMemoryAllocation;
 		case LIMIT_MAX_VIEWPORT_DIMENSIONS_X:
 			return limits.maxViewportDimensionX;
 		case LIMIT_MAX_VIEWPORT_DIMENSIONS_Y:
@@ -4002,12 +4022,12 @@ uint64_t RenderingDeviceDriverMetal::limit_get(Limit p_limit) {
 			return (uint64_t)((1.0 / limits.temporalScalerInputContentMinScale) * 1000'000);
 		case LIMIT_MAX_SHADER_VARYINGS:
 			return limits.maxShaderVaryings;
-		UNKNOWN(LIMIT_VRS_TEXEL_WIDTH);
-		UNKNOWN(LIMIT_VRS_TEXEL_HEIGHT);
-		UNKNOWN(LIMIT_VRS_MAX_FRAGMENT_WIDTH);
-		UNKNOWN(LIMIT_VRS_MAX_FRAGMENT_HEIGHT);
-		default:
-			ERR_FAIL_V(0);
+		default: {
+#ifdef DEV_ENABLED
+			WARN_PRINT("Returning maximum value for unknown limit " + itos(p_limit) + ".");
+#endif
+			return safe_unbounded;
+		}
 	}
 	// clang-format on
 	return 0;
@@ -4024,17 +4044,8 @@ uint64_t RenderingDeviceDriverMetal::api_trait_get(ApiTrait p_trait) {
 
 bool RenderingDeviceDriverMetal::has_feature(Features p_feature) {
 	switch (p_feature) {
-		case SUPPORTS_MULTIVIEW:
-			return multiview_capabilities.is_supported;
 		case SUPPORTS_FSR_HALF_FLOAT:
 			return true;
-		case SUPPORTS_ATTACHMENT_VRS:
-			// TODO(sgc): Maybe supported via https://developer.apple.com/documentation/metal/render_passes/rendering_at_different_rasterization_rates?language=objc
-			// See also:
-			//
-			// * https://forum.beyond3d.com/threads/variable-rate-shading-vs-variable-rate-rasterization.62243/post-2191363
-			//
-			return false;
 		case SUPPORTS_FRAGMENT_SHADER_WITH_ONLY_SIDE_EFFECTS:
 			return true;
 		case SUPPORTS_BUFFER_DEVICE_ADDRESS:
@@ -4052,6 +4063,14 @@ const RDD::MultiviewCapabilities &RenderingDeviceDriverMetal::get_multiview_capa
 	return multiview_capabilities;
 }
 
+const RDD::FragmentShadingRateCapabilities &RenderingDeviceDriverMetal::get_fragment_shading_rate_capabilities() {
+	return fsr_capabilities;
+}
+
+const RDD::FragmentDensityMapCapabilities &RenderingDeviceDriverMetal::get_fragment_density_map_capabilities() {
+	return fdm_capabilities;
+}
+
 String RenderingDeviceDriverMetal::get_api_version() const {
 	return vformat("%d.%d", version_major, version_minor);
 }
diff --git a/engine/drivers/png/SCsub b/engine/drivers/png/SCsub
index 4d9e61de..9d3b3eff 100644
--- a/engine/drivers/png/SCsub
+++ b/engine/drivers/png/SCsub
@@ -30,9 +30,9 @@ if env["builtin_libpng"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_png.Prepend(CPPPATH=[thirdparty_dir])
+    env_png.Prepend(CPPEXTPATH=[thirdparty_dir])
     # Needed for drivers includes and in platform/web.
-    env.Prepend(CPPPATH=[thirdparty_dir])
+    env.Prepend(CPPEXTPATH=[thirdparty_dir])
 
     env_thirdparty = env_png.Clone()
     env_thirdparty.disable_warnings()
diff --git a/engine/drivers/png/image_loader_png.h b/engine/drivers/png/image_loader_png.h
index ecce9a40..e5e6a89f 100644
--- a/engine/drivers/png/image_loader_png.h
+++ b/engine/drivers/png/image_loader_png.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_PNG_H
-#define IMAGE_LOADER_PNG_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -45,5 +44,3 @@ public:
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	ImageLoaderPNG();
 };
-
-#endif // IMAGE_LOADER_PNG_H
diff --git a/engine/drivers/png/png_driver_common.h b/engine/drivers/png/png_driver_common.h
index 423a3b5b..dea72292 100644
--- a/engine/drivers/png/png_driver_common.h
+++ b/engine/drivers/png/png_driver_common.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PNG_DRIVER_COMMON_H
-#define PNG_DRIVER_COMMON_H
+#pragma once
 
 #include "core/io/image.h"
 
@@ -42,5 +41,3 @@ Error png_to_image(const uint8_t *p_source, size_t p_size, bool p_force_linear,
 // Contents of p_buffer is unspecified if error returned.
 Error image_to_png(const Ref<Image> &p_image, Vector<uint8_t> &p_buffer);
 } // namespace PNGDriverCommon
-
-#endif // PNG_DRIVER_COMMON_H
diff --git a/engine/drivers/png/resource_saver_png.h b/engine/drivers/png/resource_saver_png.h
index 2c240080..49a4ffce 100644
--- a/engine/drivers/png/resource_saver_png.h
+++ b/engine/drivers/png/resource_saver_png.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_SAVER_PNG_H
-#define RESOURCE_SAVER_PNG_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/io/resource_saver.h"
@@ -45,5 +44,3 @@ public:
 
 	ResourceSaverPNG();
 };
-
-#endif // RESOURCE_SAVER_PNG_H
diff --git a/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp
index 7198f4dd..0c517f4a 100644
--- a/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp
+++ b/engine/drivers/pulseaudio/audio_driver_pulseaudio.cpp
@@ -312,11 +312,11 @@ Error AudioDriverPulseAudio::init() {
 
 	String context_name;
 	if (Engine::get_singleton()->is_editor_hint()) {
-		context_name = VERSION_NAME " Editor";
+		context_name = GODOT_VERSION_NAME " Editor";
 	} else {
 		context_name = GLOBAL_GET("application/config/name");
 		if (context_name.is_empty()) {
-			context_name = VERSION_NAME " Project";
+			context_name = GODOT_VERSION_NAME " Project";
 		}
 	}
 
diff --git a/engine/drivers/pulseaudio/audio_driver_pulseaudio.h b/engine/drivers/pulseaudio/audio_driver_pulseaudio.h
index 6456467c..ce29a55c 100644
--- a/engine/drivers/pulseaudio/audio_driver_pulseaudio.h
+++ b/engine/drivers/pulseaudio/audio_driver_pulseaudio.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_PULSEAUDIO_H
-#define AUDIO_DRIVER_PULSEAUDIO_H
+#pragma once
 
 #ifdef PULSEAUDIO_ENABLED
 
@@ -128,5 +127,3 @@ public:
 };
 
 #endif // PULSEAUDIO_ENABLED
-
-#endif // AUDIO_DRIVER_PULSEAUDIO_H
diff --git a/engine/drivers/register_driver_types.h b/engine/drivers/register_driver_types.h
index 32c020df..02ccdaf6 100644
--- a/engine/drivers/register_driver_types.h
+++ b/engine/drivers/register_driver_types.h
@@ -28,13 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_DRIVER_TYPES_H
-#define REGISTER_DRIVER_TYPES_H
+#pragma once
 
 void register_core_driver_types();
 void unregister_core_driver_types();
 
 void register_driver_types();
 void unregister_driver_types();
-
-#endif // REGISTER_DRIVER_TYPES_H
diff --git a/engine/drivers/unix/dir_access_unix.cpp b/engine/drivers/unix/dir_access_unix.cpp
index b1139b7e..93491a96 100644
--- a/engine/drivers/unix/dir_access_unix.cpp
+++ b/engine/drivers/unix/dir_access_unix.cpp
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <sys/statvfs.h>
 
 #ifdef HAVE_MNTENT
@@ -256,7 +257,7 @@ static void _get_drives(List<String> *list) {
 				// Parse only file:// links
 				if (strncmp(string, "file://", 7) == 0) {
 					// Strip any unwanted edges on the strings and push_back if it's not a duplicate.
-					String fpath = String::utf8(string + 7).strip_edges().split_spaces()[0].uri_decode();
+					String fpath = String::utf8(string + 7).strip_edges().split_spaces()[0].uri_file_decode();
 					if (!list->find(fpath)) {
 						list->push_back(fpath);
 					}
@@ -342,7 +343,7 @@ Error DirAccessUnix::change_dir(String p_dir) {
 	String prev_dir;
 	char real_current_dir_name[2048];
 	ERR_FAIL_NULL_V(getcwd(real_current_dir_name, 2048), ERR_BUG);
-	if (prev_dir.parse_utf8(real_current_dir_name) != OK) {
+	if (prev_dir.append_utf8(real_current_dir_name) != OK) {
 		prev_dir = real_current_dir_name; //no utf8, maybe latin?
 	}
 
@@ -365,7 +366,7 @@ Error DirAccessUnix::change_dir(String p_dir) {
 	if (!base.is_empty() && !try_dir.begins_with(base)) {
 		ERR_FAIL_NULL_V(getcwd(real_current_dir_name, 2048), ERR_BUG);
 		String new_dir;
-		new_dir.parse_utf8(real_current_dir_name);
+		new_dir.append_utf8(real_current_dir_name);
 
 		if (!new_dir.begins_with(base)) {
 			try_dir = current_dir; //revert
@@ -383,7 +384,7 @@ String DirAccessUnix::get_current_dir(bool p_include_drive) const {
 	if (!base.is_empty()) {
 		String bd = current_dir.replace_first(base, "");
 		if (bd.begins_with("/")) {
-			return _get_root_string() + bd.substr(1, bd.length());
+			return _get_root_string() + bd.substr(1);
 		} else {
 			return _get_root_string() + bd;
 		}
@@ -486,7 +487,7 @@ String DirAccessUnix::read_link(String p_file) {
 	ssize_t len = readlink(p_file.utf8().get_data(), buf, sizeof(buf));
 	String link;
 	if (len > 0) {
-		link.parse_utf8(buf, len);
+		link.append_utf8(buf, len);
 	}
 	return link;
 }
@@ -544,6 +545,24 @@ bool DirAccessUnix::is_case_sensitive(const String &p_path) const {
 	return true;
 }
 
+bool DirAccessUnix::is_equivalent(const String &p_path_a, const String &p_path_b) const {
+	String f1 = fix_path(p_path_a);
+	struct stat st1 = {};
+	int err = stat(f1.utf8().get_data(), &st1);
+	if (err) {
+		return DirAccess::is_equivalent(p_path_a, p_path_b);
+	}
+
+	String f2 = fix_path(p_path_b);
+	struct stat st2 = {};
+	err = stat(f2.utf8().get_data(), &st2);
+	if (err) {
+		return DirAccess::is_equivalent(p_path_a, p_path_b);
+	}
+
+	return (st1.st_dev == st2.st_dev) && (st1.st_ino == st2.st_ino);
+}
+
 DirAccessUnix::DirAccessUnix() {
 	dir_stream = nullptr;
 	_cisdir = false;
@@ -553,7 +572,8 @@ DirAccessUnix::DirAccessUnix() {
 	// set current directory to an absolute path of the current directory
 	char real_current_dir_name[2048];
 	ERR_FAIL_NULL(getcwd(real_current_dir_name, 2048));
-	if (current_dir.parse_utf8(real_current_dir_name) != OK) {
+	current_dir.clear();
+	if (current_dir.append_utf8(real_current_dir_name) != OK) {
 		current_dir = real_current_dir_name;
 	}
 
diff --git a/engine/drivers/unix/dir_access_unix.h b/engine/drivers/unix/dir_access_unix.h
index adf1fa80..b6833461 100644
--- a/engine/drivers/unix/dir_access_unix.h
+++ b/engine/drivers/unix/dir_access_unix.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIR_ACCESS_UNIX_H
-#define DIR_ACCESS_UNIX_H
+#pragma once
 
 #if defined(UNIX_ENABLED)
 
@@ -41,6 +40,7 @@
 #include <unistd.h>
 
 class DirAccessUnix : public DirAccess {
+	GDSOFTCLASS(DirAccessUnix, DirAccess);
 	DIR *dir_stream = nullptr;
 
 	bool _cisdir = false;
@@ -86,6 +86,7 @@ public:
 	virtual Error create_link(String p_source, String p_target) override;
 
 	virtual bool is_case_sensitive(const String &p_path) const override;
+	virtual bool is_equivalent(const String &p_path_a, const String &p_path_b) const override;
 
 	virtual uint64_t get_space_left() override;
 
@@ -96,5 +97,3 @@ public:
 };
 
 #endif // UNIX_ENABLED
-
-#endif // DIR_ACCESS_UNIX_H
diff --git a/engine/drivers/unix/file_access_unix.cpp b/engine/drivers/unix/file_access_unix.cpp
index 9999a319..32d6d072 100644
--- a/engine/drivers/unix/file_access_unix.cpp
+++ b/engine/drivers/unix/file_access_unix.cpp
@@ -211,7 +211,7 @@ String FileAccessUnix::get_real_path() const {
 	}
 
 	String result;
-	Error parse_ok = result.parse_utf8(resolved_path);
+	Error parse_ok = result.append_utf8(resolved_path);
 	::free(resolved_path);
 
 	if (parse_ok != OK) {
@@ -336,16 +336,19 @@ bool FileAccessUnix::file_exists(const String &p_path) {
 
 uint64_t FileAccessUnix::_get_modified_time(const String &p_file) {
 	String file = fix_path(p_file);
-	struct stat status = {};
-	int err = stat(file.utf8().get_data(), &status);
+	struct stat st = {};
+	int err = stat(file.utf8().get_data(), &st);
 
 	if (!err) {
-		uint64_t modified_time = status.st_mtime;
+		uint64_t modified_time = 0;
+		if ((st.st_mode & S_IFMT) == S_IFLNK || (st.st_mode & S_IFMT) == S_IFREG || (st.st_mode & S_IFDIR) == S_IFDIR) {
+			modified_time = st.st_mtime;
+		}
 #ifdef ANDROID_ENABLED
 		// Workaround for GH-101007
 		//FIXME: After saving, all timestamps (st_mtime, st_ctime, st_atime) are set to the same value.
 		// After exporting or after some time, only 'modified_time' resets to a past timestamp.
-		uint64_t created_time = status.st_ctime;
+		uint64_t created_time = st.st_ctime;
 		if (modified_time < created_time) {
 			modified_time = created_time;
 		}
@@ -356,6 +359,32 @@ uint64_t FileAccessUnix::_get_modified_time(const String &p_file) {
 	}
 }
 
+uint64_t FileAccessUnix::_get_access_time(const String &p_file) {
+	String file = fix_path(p_file);
+	struct stat st = {};
+	int err = stat(file.utf8().get_data(), &st);
+
+	if (!err) {
+		if ((st.st_mode & S_IFMT) == S_IFLNK || (st.st_mode & S_IFMT) == S_IFREG || (st.st_mode & S_IFDIR) == S_IFDIR) {
+			return st.st_atime;
+		}
+	}
+	ERR_FAIL_V_MSG(0, "Failed to get access time for: " + p_file + "");
+}
+
+int64_t FileAccessUnix::_get_size(const String &p_file) {
+	String file = fix_path(p_file);
+	struct stat st = {};
+	int err = stat(file.utf8().get_data(), &st);
+
+	if (!err) {
+		if ((st.st_mode & S_IFMT) == S_IFLNK || (st.st_mode & S_IFMT) == S_IFREG) {
+			return st.st_size;
+		}
+	}
+	ERR_FAIL_V_MSG(-1, "Failed to get size for: " + p_file + "");
+}
+
 BitField<FileAccess::UnixPermissionFlags> FileAccessUnix::_get_unix_permissions(const String &p_file) {
 	String file = fix_path(p_file);
 	struct stat status = {};
diff --git a/engine/drivers/unix/file_access_unix.h b/engine/drivers/unix/file_access_unix.h
index fb9d6847..0860b370 100644
--- a/engine/drivers/unix/file_access_unix.h
+++ b/engine/drivers/unix/file_access_unix.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_UNIX_H
-#define FILE_ACCESS_UNIX_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/os/memory.h"
@@ -39,6 +38,7 @@
 #if defined(UNIX_ENABLED)
 
 class FileAccessUnix : public FileAccess {
+	GDSOFTCLASS(FileAccessUnix, FileAccess);
 	FILE *f = nullptr;
 	int flags = 0;
 	void check_errors(bool p_write = false) const;
@@ -81,6 +81,8 @@ public:
 	virtual bool file_exists(const String &p_path) override; ///< return true if a file exists
 
 	virtual uint64_t _get_modified_time(const String &p_file) override;
+	virtual uint64_t _get_access_time(const String &p_file) override;
+	virtual int64_t _get_size(const String &p_file) override;
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override;
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override;
 
@@ -96,5 +98,3 @@ public:
 };
 
 #endif // UNIX_ENABLED
-
-#endif // FILE_ACCESS_UNIX_H
diff --git a/engine/drivers/unix/file_access_unix_pipe.cpp b/engine/drivers/unix/file_access_unix_pipe.cpp
index 56be559a..7d32a1b4 100644
--- a/engine/drivers/unix/file_access_unix_pipe.cpp
+++ b/engine/drivers/unix/file_access_unix_pipe.cpp
@@ -67,7 +67,7 @@ Error FileAccessUnixPipe::open_internal(const String &p_path, int p_mode_flags)
 	path_src = p_path;
 	ERR_FAIL_COND_V_MSG(fd[0] >= 0 || fd[1] >= 0, ERR_ALREADY_IN_USE, "Pipe is already in use.");
 
-	path = String("/tmp/") + p_path.replace("pipe://", "").replace("/", "_");
+	path = String("/tmp/") + p_path.replace("pipe://", "").replace_char('/', '_');
 	const CharString path_utf8 = path.utf8();
 
 	struct stat st = {};
diff --git a/engine/drivers/unix/file_access_unix_pipe.h b/engine/drivers/unix/file_access_unix_pipe.h
index b1633db0..4081f6d7 100644
--- a/engine/drivers/unix/file_access_unix_pipe.h
+++ b/engine/drivers/unix/file_access_unix_pipe.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_UNIX_PIPE_H
-#define FILE_ACCESS_UNIX_PIPE_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/os/memory.h"
@@ -39,6 +38,7 @@
 #if defined(UNIX_ENABLED)
 
 class FileAccessUnixPipe : public FileAccess {
+	GDSOFTCLASS(FileAccessUnixPipe, FileAccess);
 	bool unlink_on_close = false;
 
 	int fd[2] = { -1, -1 };
@@ -76,6 +76,8 @@ public:
 	virtual bool file_exists(const String &p_path) override { return false; }
 
 	virtual uint64_t _get_modified_time(const String &p_file) override { return 0; }
+	virtual uint64_t _get_access_time(const String &p_file) override { return 0; }
+	virtual int64_t _get_size(const String &p_file) override { return -1; }
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override { return 0; }
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override { return ERR_UNAVAILABLE; }
 
@@ -91,5 +93,3 @@ public:
 };
 
 #endif // UNIX_ENABLED
-
-#endif // FILE_ACCESS_UNIX_PIPE_H
diff --git a/engine/drivers/unix/ip_unix.h b/engine/drivers/unix/ip_unix.h
index 0d404e27..d82fa9cf 100644
--- a/engine/drivers/unix/ip_unix.h
+++ b/engine/drivers/unix/ip_unix.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IP_UNIX_H
-#define IP_UNIX_H
+#pragma once
 
 #if defined(UNIX_ENABLED) && !defined(UNIX_SOCKET_UNAVAILABLE)
 
@@ -50,5 +49,3 @@ public:
 };
 
 #endif // UNIX_ENABLED
-
-#endif // IP_UNIX_H
diff --git a/engine/drivers/unix/net_socket_unix.cpp b/engine/drivers/unix/net_socket_unix.cpp
index 3eaf1b28..06a1d42b 100644
--- a/engine/drivers/unix/net_socket_unix.cpp
+++ b/engine/drivers/unix/net_socket_unix.cpp
@@ -135,10 +135,7 @@ NetSocketUnix::~NetSocketUnix() {
 
 // Silence a warning reported in GH-27594.
 // EAGAIN and EWOULDBLOCK have the same value on most platforms, but it's not guaranteed.
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wlogical-op"
-#endif
+GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wlogical-op")
 
 NetSocketUnix::NetError NetSocketUnix::_get_socket_error() const {
 	if (errno == EISCONN) {
@@ -163,9 +160,7 @@ NetSocketUnix::NetError NetSocketUnix::_get_socket_error() const {
 	return ERR_NET_OTHER;
 }
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+GODOT_GCC_WARNING_POP
 
 bool NetSocketUnix::_can_use_ip(const IPAddress &p_ip, const bool p_for_bind) const {
 	if (p_for_bind && !(p_ip.is_valid() || p_ip.is_wildcard())) {
diff --git a/engine/drivers/unix/net_socket_unix.h b/engine/drivers/unix/net_socket_unix.h
index 08c45f2a..84a87254 100644
--- a/engine/drivers/unix/net_socket_unix.h
+++ b/engine/drivers/unix/net_socket_unix.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NET_SOCKET_UNIX_H
-#define NET_SOCKET_UNIX_H
+#pragma once
 
 #if defined(UNIX_ENABLED) && !defined(UNIX_SOCKET_UNAVAILABLE)
 
@@ -98,5 +97,3 @@ public:
 };
 
 #endif // UNIX_ENABLED && !UNIX_SOCKET_UNAVAILABLE
-
-#endif // NET_SOCKET_UNIX_H
diff --git a/engine/drivers/unix/os_unix.cpp b/engine/drivers/unix/os_unix.cpp
index a70be932..10f8b0ba 100644
--- a/engine/drivers/unix/os_unix.cpp
+++ b/engine/drivers/unix/os_unix.cpp
@@ -580,6 +580,126 @@ Dictionary OS_Unix::get_memory_info() const {
 	return meminfo;
 }
 
+#ifndef __GLIBC__
+void OS_Unix::_load_iconv() {
+#if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
+	String iconv_lib_aliases[] = { "/usr/lib/libiconv.2.dylib" };
+	String iconv_func_aliases[] = { "iconv" };
+	String charset_lib_aliases[] = { "/usr/lib/libcharset.1.dylib" };
+#else
+	String iconv_lib_aliases[] = { "", "libiconv.2.so", "libiconv.so" };
+	String iconv_func_aliases[] = { "libiconv", "iconv", "bsd_iconv", "rpl_iconv" };
+	String charset_lib_aliases[] = { "", "libcharset.1.so", "libcharset.so" };
+#endif
+
+	for (size_t i = 0; i < sizeof(iconv_lib_aliases) / sizeof(iconv_lib_aliases[0]); i++) {
+		void *iconv_lib = iconv_lib_aliases[i].is_empty() ? RTLD_NEXT : dlopen(iconv_lib_aliases[i].utf8().get_data(), RTLD_NOW);
+		if (iconv_lib) {
+			for (size_t j = 0; j < sizeof(iconv_func_aliases) / sizeof(iconv_func_aliases[0]); j++) {
+				gd_iconv_open = (PIConvOpen)dlsym(iconv_lib, (iconv_func_aliases[j] + "_open").utf8().get_data());
+				gd_iconv = (PIConv)dlsym(iconv_lib, (iconv_func_aliases[j]).utf8().get_data());
+				gd_iconv_close = (PIConvClose)dlsym(iconv_lib, (iconv_func_aliases[j] + "_close").utf8().get_data());
+				if (gd_iconv_open && gd_iconv && gd_iconv_close) {
+					break;
+				}
+			}
+			if (gd_iconv_open && gd_iconv && gd_iconv_close) {
+				break;
+			}
+			if (!iconv_lib_aliases[i].is_empty()) {
+				dlclose(iconv_lib);
+			}
+		}
+	}
+
+	for (size_t i = 0; i < sizeof(charset_lib_aliases) / sizeof(charset_lib_aliases[0]); i++) {
+		void *cs_lib = charset_lib_aliases[i].is_empty() ? RTLD_NEXT : dlopen(charset_lib_aliases[i].utf8().get_data(), RTLD_NOW);
+		if (cs_lib) {
+			gd_locale_charset = (PIConvLocaleCharset)dlsym(cs_lib, "locale_charset");
+			if (gd_locale_charset) {
+				break;
+			}
+			if (!charset_lib_aliases[i].is_empty()) {
+				dlclose(cs_lib);
+			}
+		}
+	}
+	_iconv_ok = gd_iconv_open && gd_iconv && gd_iconv_close && gd_locale_charset;
+}
+#endif
+
+String OS_Unix::multibyte_to_string(const String &p_encoding, const PackedByteArray &p_array) const {
+	ERR_FAIL_COND_V_MSG(!_iconv_ok, String(), "Conversion failed: Unable to load libiconv");
+
+	LocalVector<char> chars;
+#ifdef __GLIBC__
+	gd_iconv_t ctx = gd_iconv_open("UTF-8", p_encoding.is_empty() ? nl_langinfo(CODESET) : p_encoding.utf8().get_data());
+#else
+	gd_iconv_t ctx = gd_iconv_open("UTF-8", p_encoding.is_empty() ? gd_locale_charset() : p_encoding.utf8().get_data());
+#endif
+	ERR_FAIL_COND_V_MSG(ctx == (gd_iconv_t)(-1), String(), "Conversion failed: Unknown encoding");
+
+	char *in_ptr = (char *)p_array.ptr();
+	size_t in_size = p_array.size();
+
+	chars.resize(in_size);
+	char *out_ptr = (char *)chars.ptr();
+	size_t out_size = chars.size();
+
+	while (gd_iconv(ctx, &in_ptr, &in_size, &out_ptr, &out_size) == (size_t)-1) {
+		if (errno != E2BIG) {
+			gd_iconv_close(ctx);
+			ERR_FAIL_V_MSG(String(), vformat("Conversion failed: %d - %s", errno, strerror(errno)));
+		}
+		int64_t rate = (chars.size()) / (p_array.size() - in_size);
+		size_t oldpos = chars.size() - out_size;
+		chars.resize(chars.size() + in_size * rate);
+		out_ptr = (char *)chars.ptr() + oldpos;
+		out_size = chars.size() - oldpos;
+	}
+	chars.resize(chars.size() - out_size);
+	gd_iconv_close(ctx);
+
+	return String::utf8((const char *)chars.ptr(), chars.size());
+}
+
+PackedByteArray OS_Unix::string_to_multibyte(const String &p_encoding, const String &p_string) const {
+	ERR_FAIL_COND_V_MSG(!_iconv_ok, PackedByteArray(), "Conversion failed: Unable to load libiconv");
+
+	CharString charstr = p_string.utf8();
+
+	PackedByteArray ret;
+#ifdef __GLIBC__
+	gd_iconv_t ctx = gd_iconv_open(p_encoding.is_empty() ? nl_langinfo(CODESET) : p_encoding.utf8().get_data(), "UTF-8");
+#else
+	gd_iconv_t ctx = gd_iconv_open(p_encoding.is_empty() ? gd_locale_charset() : p_encoding.utf8().get_data(), "UTF-8");
+#endif
+	ERR_FAIL_COND_V_MSG(ctx == (gd_iconv_t)(-1), PackedByteArray(), "Conversion failed: Unknown encoding");
+
+	char *in_ptr = (char *)charstr.ptr();
+	size_t in_size = charstr.size();
+
+	ret.resize(in_size);
+	char *out_ptr = (char *)ret.ptrw();
+	size_t out_size = ret.size();
+
+	while (gd_iconv(ctx, &in_ptr, &in_size, &out_ptr, &out_size) == (size_t)-1) {
+		if (errno != E2BIG) {
+			gd_iconv_close(ctx);
+			ERR_FAIL_V_MSG(PackedByteArray(), vformat("Conversion failed: %d - %s", errno, strerror(errno)));
+		}
+		int64_t rate = (ret.size()) / (charstr.size() - in_size);
+		size_t oldpos = ret.size() - out_size;
+		ret.resize(ret.size() + in_size * rate);
+		out_ptr = (char *)ret.ptrw() + oldpos;
+		out_size = ret.size() - oldpos;
+	}
+	ret.resize(ret.size() - out_size);
+	gd_iconv_close(ctx);
+
+	return ret;
+}
+
 Dictionary OS_Unix::execute_with_pipe(const String &p_path, const List<String> &p_arguments, bool p_blocking) {
 #define CLEAN_PIPES           \
 	if (pipe_in[0] >= 0) {    \
@@ -685,6 +805,57 @@ Dictionary OS_Unix::execute_with_pipe(const String &p_path, const List<String> &
 #endif
 }
 
+int OS_Unix::_wait_for_pid_completion(const pid_t p_pid, int *r_status, int p_options) {
+	while (true) {
+		if (waitpid(p_pid, r_status, p_options) != -1) {
+			// Thread exited normally.
+			return 0;
+		}
+		const int error = errno;
+		if (error == EINTR) {
+			// We're in a debugger, should call waitpid again.
+			// See https://stackoverflow.com/a/45472920/730797.
+			continue;
+		}
+		return error;
+	}
+}
+
+bool OS_Unix::_check_pid_is_running(const pid_t p_pid, int *r_status) const {
+	const ProcessInfo *pi = process_map->getptr(p_pid);
+
+	if (pi && !pi->is_running) {
+		// Can return cached value.
+		if (r_status) {
+			*r_status = pi->exit_code;
+		}
+		return false;
+	}
+
+	int status = 0;
+	const int result = _wait_for_pid_completion(p_pid, &status, WNOHANG);
+	if (result == 0) {
+		// Thread is still running.
+		return true;
+	}
+
+	ERR_FAIL_COND_V_MSG(result == -1, false, vformat("Thread %d exited with errno: %d", (int)p_pid, errno));
+	// Thread exited normally.
+
+	status = WIFEXITED(status) ? WEXITSTATUS(status) : status;
+
+	if (pi) {
+		pi->is_running = false;
+		pi->exit_code = status;
+	}
+
+	if (r_status) {
+		*r_status = status;
+	}
+
+	return false;
+}
+
 Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, String *r_pipe, int *r_exitcode, bool read_stderr, Mutex *p_pipe_mutex, bool p_open_console) {
 #ifdef __EMSCRIPTEN__
 	// Don't compile this code at all to avoid undefined references.
@@ -710,7 +881,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, St
 				p_pipe_mutex->lock();
 			}
 			String pipe_out;
-			if (pipe_out.parse_utf8(buf) == OK) {
+			if (pipe_out.append_utf8(buf) == OK) {
 				(*r_pipe) += pipe_out;
 			} else {
 				(*r_pipe) += String(buf); // If not valid UTF-8 try decode as Latin-1
@@ -750,12 +921,12 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, St
 		raise(SIGKILL);
 	}
 
-	int status;
-	waitpid(pid, &status, 0);
+	int status = 0;
+	const int result = _wait_for_pid_completion(pid, &status, 0);
 	if (r_exitcode) {
 		*r_exitcode = WIFEXITED(status) ? WEXITSTATUS(status) : status;
 	}
-	return OK;
+	return result ? FAILED : OK;
 #endif
 }
 
@@ -809,7 +980,7 @@ Error OS_Unix::kill(const ProcessID &p_pid) {
 	if (!ret) {
 		//avoid zombie process
 		int st;
-		::waitpid(p_pid, &st, 0);
+		_wait_for_pid_completion(p_pid, &st, 0);
 	}
 	return ret ? ERR_INVALID_PARAMETER : OK;
 }
@@ -820,42 +991,19 @@ int OS_Unix::get_process_id() const {
 
 bool OS_Unix::is_process_running(const ProcessID &p_pid) const {
 	MutexLock lock(process_map_mutex);
-	const ProcessInfo *pi = process_map->getptr(p_pid);
-
-	if (pi && !pi->is_running) {
-		return false;
-	}
-
-	int status = 0;
-	if (waitpid(p_pid, &status, WNOHANG) != 0) {
-		if (pi) {
-			pi->is_running = false;
-			pi->exit_code = status;
-		}
-		return false;
-	}
-
-	return true;
+	return _check_pid_is_running(p_pid, nullptr);
 }
 
 int OS_Unix::get_process_exit_code(const ProcessID &p_pid) const {
 	MutexLock lock(process_map_mutex);
-	const ProcessInfo *pi = process_map->getptr(p_pid);
 
-	if (pi && !pi->is_running) {
-		return pi->exit_code;
+	int exit_code = 0;
+	if (_check_pid_is_running(p_pid, &exit_code)) {
+		// Thread is still running
+		return -1;
 	}
 
-	int status = 0;
-	if (waitpid(p_pid, &status, WNOHANG) != 0) {
-		status = WIFEXITED(status) ? WEXITSTATUS(status) : status;
-		if (pi) {
-			pi->is_running = false;
-			pi->exit_code = status;
-		}
-		return status;
-	}
-	return -1;
+	return exit_code;
 }
 
 String OS_Unix::get_locale() const {
@@ -942,7 +1090,7 @@ String OS_Unix::get_environment(const String &p_var) const {
 		return "";
 	}
 	String s;
-	if (s.parse_utf8(val) == OK) {
+	if (s.append_utf8(val) == OK) {
 		return s;
 	}
 	return String(val); // Not valid UTF-8, so return as-is
@@ -971,7 +1119,7 @@ String OS_Unix::get_executable_path() const {
 	ssize_t len = readlink("/proc/self/exe", buf, sizeof(buf));
 	String b;
 	if (len > 0) {
-		b.parse_utf8(buf, len);
+		b.append_utf8(buf, len);
 	}
 	if (b.is_empty()) {
 		WARN_PRINT("Couldn't get executable path from /proc/self/exe, using argv[0]");
@@ -1007,9 +1155,8 @@ String OS_Unix::get_executable_path() const {
 		WARN_PRINT("Couldn't get executable path from sysctl");
 		return OS::get_executable_path();
 	}
-	String b;
-	b.parse_utf8(buf);
-	return b;
+
+	return String::utf8(buf);
 #elif defined(__APPLE__)
 	char temp_path[1];
 	uint32_t buff_size = 1;
@@ -1082,6 +1229,10 @@ void UnixTerminalLogger::log_error(const char *p_function, const char *p_file, i
 UnixTerminalLogger::~UnixTerminalLogger() {}
 
 OS_Unix::OS_Unix() {
+#ifndef __GLIBC__
+	_load_iconv();
+#endif
+
 	Vector<Logger *> loggers;
 	loggers.push_back(memnew(UnixTerminalLogger));
 	_set_logger(memnew(CompositeLogger(loggers)));
diff --git a/engine/drivers/unix/os_unix.h b/engine/drivers/unix/os_unix.h
index fa6eaef6..febc7c79 100644
--- a/engine/drivers/unix/os_unix.h
+++ b/engine/drivers/unix/os_unix.h
@@ -28,14 +28,28 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_UNIX_H
-#define OS_UNIX_H
+#pragma once
 
 #ifdef UNIX_ENABLED
 
 #include "core/os/os.h"
 #include "drivers/unix/ip_unix.h"
 
+#ifdef __GLIBC__
+#include <iconv.h>
+#include <langinfo.h>
+#define gd_iconv_t iconv_t
+#define gd_iconv_open iconv_open
+#define gd_iconv iconv
+#define gd_iconv_close iconv_close
+#else
+typedef void *gd_iconv_t;
+typedef gd_iconv_t (*PIConvOpen)(const char *, const char *);
+typedef size_t (*PIConv)(gd_iconv_t, char **, size_t *, char **, size_t *);
+typedef int (*PIConvClose)(gd_iconv_t);
+typedef const char *(*PIConvLocaleCharset)(void);
+#endif
+
 class OS_Unix : public OS {
 	struct ProcessInfo {
 		mutable bool is_running = true;
@@ -44,6 +58,22 @@ class OS_Unix : public OS {
 	HashMap<ProcessID, ProcessInfo> *process_map = nullptr;
 	Mutex process_map_mutex;
 
+#ifdef __GLIBC__
+	bool _iconv_ok = true;
+#else
+	bool _iconv_ok = false;
+
+	PIConvOpen gd_iconv_open = nullptr;
+	PIConv gd_iconv = nullptr;
+	PIConvClose gd_iconv_close = nullptr;
+	PIConvLocaleCharset gd_locale_charset = nullptr;
+
+	void _load_iconv();
+#endif
+
+	static int _wait_for_pid_completion(const pid_t p_pid, int *r_status, int p_options);
+	bool _check_pid_is_running(const pid_t p_pid, int *r_status) const;
+
 protected:
 	// UNIX only handles the core functions.
 	// inheriting platforms under unix (eg. X11) should handle the rest
@@ -88,6 +118,9 @@ public:
 
 	virtual Dictionary get_memory_info() const override;
 
+	virtual String multibyte_to_string(const String &p_encoding, const PackedByteArray &p_array) const override;
+	virtual PackedByteArray string_to_multibyte(const String &p_encoding, const String &p_string) const override;
+
 	virtual Error execute(const String &p_path, const List<String> &p_arguments, String *r_pipe = nullptr, int *r_exitcode = nullptr, bool read_stderr = false, Mutex *p_pipe_mutex = nullptr, bool p_open_console = false) override;
 	virtual Dictionary execute_with_pipe(const String &p_path, const List<String> &p_arguments, bool p_blocking = true) override;
 	virtual Error create_process(const String &p_path, const List<String> &p_arguments, ProcessID *r_child_id = nullptr, bool p_open_console = false) override;
@@ -116,5 +149,3 @@ public:
 };
 
 #endif // UNIX_ENABLED
-
-#endif // OS_UNIX_H
diff --git a/engine/drivers/unix/syslog_logger.h b/engine/drivers/unix/syslog_logger.h
index f91d539a..4d4caccd 100644
--- a/engine/drivers/unix/syslog_logger.h
+++ b/engine/drivers/unix/syslog_logger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SYSLOG_LOGGER_H
-#define SYSLOG_LOGGER_H
+#pragma once
 
 #ifdef UNIX_ENABLED
 
@@ -44,5 +43,3 @@ public:
 };
 
 #endif // UNIX_ENABLED
-
-#endif // SYSLOG_LOGGER_H
diff --git a/engine/drivers/unix/thread_posix.cpp b/engine/drivers/unix/thread_posix.cpp
index 7f3b9e97..885f865b 100644
--- a/engine/drivers/unix/thread_posix.cpp
+++ b/engine/drivers/unix/thread_posix.cpp
@@ -35,6 +35,11 @@
 #include "core/os/thread.h"
 #include "core/string/ustring.h"
 
+#if defined(PLATFORM_THREAD_OVERRIDE) && defined(__APPLE__)
+void init_thread_posix() {
+}
+#else
+
 #ifdef PTHREAD_BSD_SET_NAME
 #include <pthread_np.h>
 #endif
@@ -73,4 +78,6 @@ void init_thread_posix() {
 	Thread::_set_platform_functions({ .set_name = set_name });
 }
 
+#endif // PLATFORM_THREAD_OVERRIDE && __APPLE__
+
 #endif // UNIX_ENABLED
diff --git a/engine/drivers/unix/thread_posix.h b/engine/drivers/unix/thread_posix.h
index acd9a0e9..e0d36c56 100644
--- a/engine/drivers/unix/thread_posix.h
+++ b/engine/drivers/unix/thread_posix.h
@@ -28,9 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THREAD_POSIX_H
-#define THREAD_POSIX_H
+#pragma once
 
 void init_thread_posix();
-
-#endif // THREAD_POSIX_H
diff --git a/engine/drivers/vulkan/SCsub b/engine/drivers/vulkan/SCsub
index 6ea7cc9a..6751e638 100644
--- a/engine/drivers/vulkan/SCsub
+++ b/engine/drivers/vulkan/SCsub
@@ -8,11 +8,11 @@ thirdparty_dir = "#thirdparty/vulkan"
 thirdparty_volk_dir = "#thirdparty/volk"
 
 # Use bundled Vulkan headers
-env.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"])
+env.Prepend(CPPEXTPATH=[thirdparty_dir, thirdparty_dir + "/include"])
 
 if env["use_volk"]:
     env.AppendUnique(CPPDEFINES=["USE_VOLK"])
-    env.Prepend(CPPPATH=[thirdparty_volk_dir])
+    env.Prepend(CPPEXTPATH=[thirdparty_volk_dir])
 
 if env["platform"] == "android":
     env.AppendUnique(CPPDEFINES=["VK_USE_PLATFORM_ANDROID_KHR"])
diff --git a/engine/drivers/vulkan/godot_vulkan.h b/engine/drivers/vulkan/godot_vulkan.h
index f911c552..d2e3bdd3 100644
--- a/engine/drivers/vulkan/godot_vulkan.h
+++ b/engine/drivers/vulkan/godot_vulkan.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_VULKAN_H
-#define GODOT_VULKAN_H
+#pragma once
 
 #ifdef USE_VOLK
 #include <volk.h>
@@ -38,5 +37,3 @@
 #define VK_NO_STDINT_H
 #include <vulkan/vulkan.h>
 #endif
-
-#endif // GODOT_VULKAN_H
diff --git a/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp b/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp
index 3c1aa323..f702cf23 100644
--- a/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp
+++ b/engine/drivers/vulkan/rendering_context_driver_vulkan.cpp
@@ -686,8 +686,8 @@ Error RenderingContextDriverVulkan::_initialize_instance() {
 	VkApplicationInfo app_info = {};
 	app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
 	app_info.pApplicationName = cs.get_data();
-	app_info.pEngineName = VERSION_NAME;
-	app_info.engineVersion = VK_MAKE_VERSION(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
+	app_info.pEngineName = GODOT_VERSION_NAME;
+	app_info.engineVersion = VK_MAKE_VERSION(GODOT_VERSION_MAJOR, GODOT_VERSION_MINOR, GODOT_VERSION_PATCH);
 	app_info.apiVersion = application_api_version;
 
 	TightLocalVector<const char *> enabled_layer_names;
diff --git a/engine/drivers/vulkan/rendering_context_driver_vulkan.h b/engine/drivers/vulkan/rendering_context_driver_vulkan.h
index 26de3862..2881a17c 100644
--- a/engine/drivers/vulkan/rendering_context_driver_vulkan.h
+++ b/engine/drivers/vulkan/rendering_context_driver_vulkan.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_H
-#define RENDERING_CONTEXT_DRIVER_VULKAN_H
+#pragma once
 
 #ifdef VULKAN_ENABLED
 
@@ -206,5 +205,3 @@ public:
 };
 
 #endif // VULKAN_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_VULKAN_H
diff --git a/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp b/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp
index ae15191d..b62d39d1 100644
--- a/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp
+++ b/engine/drivers/vulkan/rendering_device_driver_vulkan.cpp
@@ -45,7 +45,7 @@
 #include "thirdparty/swappy-frame-pacing/swappyVk.h"
 #endif
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#define ARRAY_SIZE(a) std::size(a)
 
 #define PRINT_NATIVE_COMMANDS 0
 
@@ -276,6 +276,20 @@ static const VkFormat RD_TO_VK_FORMAT[RDD::DATA_FORMAT_MAX] = {
 	VK_FORMAT_G16_B16_R16_3PLANE_422_UNORM,
 	VK_FORMAT_G16_B16R16_2PLANE_422_UNORM,
 	VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM,
+	VK_FORMAT_ASTC_4x4_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_5x4_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_5x5_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_6x5_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_6x6_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_8x5_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_8x6_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_8x8_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_10x5_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_10x6_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_10x8_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_10x10_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_12x10_SFLOAT_BLOCK,
+	VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK,
 };
 
 static VkImageLayout RD_TO_VK_LAYOUT[RDD::TEXTURE_LAYOUT_MAX] = {
@@ -290,7 +304,8 @@ static VkImageLayout RD_TO_VK_LAYOUT[RDD::TEXTURE_LAYOUT_MAX] = {
 	VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, // TEXTURE_LAYOUT_COPY_DST_OPTIMAL
 	VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, // TEXTURE_LAYOUT_RESOLVE_SRC_OPTIMAL
 	VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, // TEXTURE_LAYOUT_RESOLVE_DST_OPTIMAL
-	VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR, // TEXTURE_LAYOUT_VRS_ATTACHMENT_OPTIMAL
+	VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR, // TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL
+	VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT, // TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL
 };
 
 static VkPipelineStageFlags _rd_to_vk_pipeline_stages(BitField<RDD::PipelineStageBits> p_stages) {
@@ -504,6 +519,7 @@ Error RenderingDeviceDriverVulkan::_initialize_device_extensions() {
 	_register_requested_device_extension(VK_KHR_SWAPCHAIN_EXTENSION_NAME, true);
 	_register_requested_device_extension(VK_KHR_MULTIVIEW_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME, false);
+	_register_requested_device_extension(VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME, false);
@@ -514,6 +530,11 @@ Error RenderingDeviceDriverVulkan::_initialize_device_extensions() {
 	_register_requested_device_extension(VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_EXT_ASTC_DECODE_MODE_EXTENSION_NAME, false);
 	_register_requested_device_extension(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME, false);
+	_register_requested_device_extension(VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME, false);
+
+	// We don't actually use this extension, but some runtime components on some platforms
+	// can and will fill the validation layers with useless info otherwise if not enabled.
+	_register_requested_device_extension(VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME, false);
 
 	if (Engine::get_singleton()->is_generate_spirv_debug_info_enabled()) {
 		_register_requested_device_extension(VK_KHR_SHADER_NON_SEMANTIC_INFO_EXTENSION_NAME, true);
@@ -732,7 +753,8 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 		VkPhysicalDeviceVulkan12Features device_features_vk_1_2 = {};
 		VkPhysicalDeviceShaderFloat16Int8FeaturesKHR shader_features = {};
 		VkPhysicalDeviceBufferDeviceAddressFeaturesKHR buffer_device_address_features = {};
-		VkPhysicalDeviceFragmentShadingRateFeaturesKHR vrs_features = {};
+		VkPhysicalDeviceFragmentShadingRateFeaturesKHR fsr_features = {};
+		VkPhysicalDeviceFragmentDensityMapFeaturesEXT fdm_features = {};
 		VkPhysicalDevice16BitStorageFeaturesKHR storage_feature = {};
 		VkPhysicalDeviceMultiviewFeatures multiview_features = {};
 		VkPhysicalDevicePipelineCreationCacheControlFeatures pipeline_cache_control_features = {};
@@ -756,9 +778,15 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 		}
 
 		if (enabled_device_extension_names.has(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME)) {
-			vrs_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR;
-			vrs_features.pNext = next_features;
-			next_features = &vrs_features;
+			fsr_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR;
+			fsr_features.pNext = next_features;
+			next_features = &fsr_features;
+		}
+
+		if (enabled_device_extension_names.has(VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME)) {
+			fdm_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT;
+			fdm_features.pNext = next_features;
+			next_features = &fdm_features;
 		}
 
 		if (enabled_device_extension_names.has(VK_KHR_16BIT_STORAGE_EXTENSION_NAME)) {
@@ -806,11 +834,21 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 		}
 
 		if (enabled_device_extension_names.has(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME)) {
-			vrs_capabilities.pipeline_vrs_supported = vrs_features.pipelineFragmentShadingRate;
-			vrs_capabilities.primitive_vrs_supported = vrs_features.primitiveFragmentShadingRate;
-			vrs_capabilities.attachment_vrs_supported = vrs_features.attachmentFragmentShadingRate;
+			fsr_capabilities.pipeline_supported = fsr_features.pipelineFragmentShadingRate;
+			fsr_capabilities.primitive_supported = fsr_features.primitiveFragmentShadingRate;
+			fsr_capabilities.attachment_supported = fsr_features.attachmentFragmentShadingRate;
 		}
 
+		if (enabled_device_extension_names.has(VK_EXT_FRAGMENT_DENSITY_MAP_EXTENSION_NAME)) {
+			fdm_capabilities.attachment_supported = fdm_features.fragmentDensityMap;
+			fdm_capabilities.dynamic_attachment_supported = fdm_features.fragmentDensityMapDynamic;
+			fdm_capabilities.non_subsampled_images_supported = fdm_features.fragmentDensityMapNonSubsampledImages;
+		}
+
+		// Multiple VRS techniques can't co-exist during the existence of one device, so we must
+		// choose one at creation time and only report one of them as available.
+		_choose_vrs_capabilities();
+
 		if (enabled_device_extension_names.has(VK_KHR_MULTIVIEW_EXTENSION_NAME)) {
 			multiview_capabilities.is_supported = multiview_features.multiview;
 			multiview_capabilities.geometry_shader_is_supported = multiview_features.multiviewGeometryShader;
@@ -840,7 +878,8 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 
 	if (functions.GetPhysicalDeviceProperties2 != nullptr) {
 		void *next_properties = nullptr;
-		VkPhysicalDeviceFragmentShadingRatePropertiesKHR vrs_properties = {};
+		VkPhysicalDeviceFragmentShadingRatePropertiesKHR fsr_properties = {};
+		VkPhysicalDeviceFragmentDensityMapPropertiesEXT fdm_properties = {};
 		VkPhysicalDeviceMultiviewProperties multiview_properties = {};
 		VkPhysicalDeviceSubgroupProperties subgroup_properties = {};
 		VkPhysicalDeviceSubgroupSizeControlProperties subgroup_size_control_properties = {};
@@ -866,10 +905,16 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 			next_properties = &multiview_properties;
 		}
 
-		if (vrs_capabilities.attachment_vrs_supported) {
-			vrs_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR;
-			vrs_properties.pNext = next_properties;
-			next_properties = &vrs_properties;
+		if (fsr_capabilities.attachment_supported) {
+			fsr_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR;
+			fsr_properties.pNext = next_properties;
+			next_properties = &fsr_properties;
+		}
+
+		if (fdm_capabilities.attachment_supported) {
+			fdm_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_PROPERTIES_EXT;
+			fdm_properties.pNext = next_properties;
+			next_properties = &fdm_properties;
 		}
 
 		physical_device_properties_2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
@@ -892,33 +937,53 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 			subgroup_capabilities.max_size = subgroup_size_control_properties.maxSubgroupSize;
 		}
 
-		if (vrs_capabilities.pipeline_vrs_supported || vrs_capabilities.primitive_vrs_supported || vrs_capabilities.attachment_vrs_supported) {
-			print_verbose("- Vulkan Variable Rate Shading supported:");
-			if (vrs_capabilities.pipeline_vrs_supported) {
+		if (fsr_capabilities.pipeline_supported || fsr_capabilities.primitive_supported || fsr_capabilities.attachment_supported) {
+			print_verbose("- Vulkan Fragment Shading Rate supported:");
+			if (fsr_capabilities.pipeline_supported) {
 				print_verbose("  Pipeline fragment shading rate");
 			}
-			if (vrs_capabilities.primitive_vrs_supported) {
+			if (fsr_capabilities.primitive_supported) {
 				print_verbose("  Primitive fragment shading rate");
 			}
-			if (vrs_capabilities.attachment_vrs_supported) {
+			if (fsr_capabilities.attachment_supported) {
 				// TODO: Expose these somehow to the end user.
-				vrs_capabilities.min_texel_size.x = vrs_properties.minFragmentShadingRateAttachmentTexelSize.width;
-				vrs_capabilities.min_texel_size.y = vrs_properties.minFragmentShadingRateAttachmentTexelSize.height;
-				vrs_capabilities.max_texel_size.x = vrs_properties.maxFragmentShadingRateAttachmentTexelSize.width;
-				vrs_capabilities.max_texel_size.y = vrs_properties.maxFragmentShadingRateAttachmentTexelSize.height;
-				vrs_capabilities.max_fragment_size.x = vrs_properties.maxFragmentSize.width; // either 4 or 8
-				vrs_capabilities.max_fragment_size.y = vrs_properties.maxFragmentSize.height; // generally the same as width
+				fsr_capabilities.min_texel_size.x = fsr_properties.minFragmentShadingRateAttachmentTexelSize.width;
+				fsr_capabilities.min_texel_size.y = fsr_properties.minFragmentShadingRateAttachmentTexelSize.height;
+				fsr_capabilities.max_texel_size.x = fsr_properties.maxFragmentShadingRateAttachmentTexelSize.width;
+				fsr_capabilities.max_texel_size.y = fsr_properties.maxFragmentShadingRateAttachmentTexelSize.height;
+				fsr_capabilities.max_fragment_size.x = fsr_properties.maxFragmentSize.width; // either 4 or 8
+				fsr_capabilities.max_fragment_size.y = fsr_properties.maxFragmentSize.height; // generally the same as width
 
-				// We'll attempt to default to a texel size of 16x16.
-				vrs_capabilities.texel_size = Vector2i(16, 16).clamp(vrs_capabilities.min_texel_size, vrs_capabilities.max_texel_size);
-
-				print_verbose(String("  Attachment fragment shading rate") + String(", min texel size: (") + itos(vrs_capabilities.min_texel_size.x) + String(", ") + itos(vrs_capabilities.min_texel_size.y) + String(")") + String(", max texel size: (") + itos(vrs_capabilities.max_texel_size.x) + String(", ") + itos(vrs_capabilities.max_texel_size.y) + String(")") + String(", max fragment size: (") + itos(vrs_capabilities.max_fragment_size.x) + String(", ") + itos(vrs_capabilities.max_fragment_size.y) + String(")"));
+				print_verbose(String("  Attachment fragment shading rate") +
+						String(", min texel size: (") + itos(fsr_capabilities.min_texel_size.x) + String(", ") + itos(fsr_capabilities.min_texel_size.y) + String(")") +
+						String(", max texel size: (") + itos(fsr_capabilities.max_texel_size.x) + String(", ") + itos(fsr_capabilities.max_texel_size.y) + String(")") +
+						String(", max fragment size: (") + itos(fsr_capabilities.max_fragment_size.x) + String(", ") + itos(fsr_capabilities.max_fragment_size.y) + String(")"));
 			}
 
 		} else {
 			print_verbose("- Vulkan Variable Rate Shading not supported");
 		}
 
+		if (fdm_capabilities.attachment_supported || fdm_capabilities.dynamic_attachment_supported || fdm_capabilities.non_subsampled_images_supported) {
+			print_verbose("- Vulkan Fragment Density Map supported");
+
+			fdm_capabilities.min_texel_size.x = fdm_properties.minFragmentDensityTexelSize.width;
+			fdm_capabilities.min_texel_size.y = fdm_properties.minFragmentDensityTexelSize.height;
+			fdm_capabilities.max_texel_size.x = fdm_properties.maxFragmentDensityTexelSize.width;
+			fdm_capabilities.max_texel_size.y = fdm_properties.maxFragmentDensityTexelSize.height;
+			fdm_capabilities.invocations_supported = fdm_properties.fragmentDensityInvocations;
+
+			if (fdm_capabilities.dynamic_attachment_supported) {
+				print_verbose("  - dynamic fragment density map supported");
+			}
+
+			if (fdm_capabilities.non_subsampled_images_supported) {
+				print_verbose("  - non-subsampled images supported");
+			}
+		} else {
+			print_verbose("- Vulkan Fragment Density Map not supported");
+		}
+
 		if (multiview_capabilities.is_supported) {
 			multiview_capabilities.max_view_count = multiview_properties.maxMultiviewViewCount;
 			multiview_capabilities.max_instance_count = multiview_properties.maxMultiviewInstanceIndex;
@@ -944,6 +1009,22 @@ Error RenderingDeviceDriverVulkan::_check_device_capabilities() {
 	return OK;
 }
 
+void RenderingDeviceDriverVulkan::_choose_vrs_capabilities() {
+	bool prefer_fdm_on_qualcomm = physical_device_properties.vendorID == RenderingContextDriver::Vendor::VENDOR_QUALCOMM;
+	if (fdm_capabilities.attachment_supported && (!fsr_capabilities.attachment_supported || prefer_fdm_on_qualcomm)) {
+		// If available, we prefer using fragment density maps on Qualcomm as they adjust tile distribution when using
+		// this technique. Performance as a result is higher than when using fragment shading rate.
+		fsr_capabilities = FragmentShadingRateCapabilities();
+	} else if (fsr_capabilities.attachment_supported) {
+		// Disable any possibility of fragment density maps being used.
+		fdm_capabilities = FragmentDensityMapCapabilities();
+	} else {
+		// Do not report or enable any VRS capabilities if attachment is not supported.
+		fsr_capabilities = FragmentShadingRateCapabilities();
+		fdm_capabilities = FragmentDensityMapCapabilities();
+	}
+}
+
 Error RenderingDeviceDriverVulkan::_add_queue_create_info(LocalVector<VkDeviceQueueCreateInfo> &r_queue_create_info) {
 	uint32_t queue_family_count = queue_family_properties.size();
 	queue_families.resize(queue_family_count);
@@ -994,14 +1075,24 @@ Error RenderingDeviceDriverVulkan::_initialize_device(const LocalVector<VkDevice
 		create_info_next = &buffer_device_address_features;
 	}
 
-	VkPhysicalDeviceFragmentShadingRateFeaturesKHR vrs_features = {};
-	if (vrs_capabilities.pipeline_vrs_supported || vrs_capabilities.primitive_vrs_supported || vrs_capabilities.attachment_vrs_supported) {
-		vrs_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR;
-		vrs_features.pNext = create_info_next;
-		vrs_features.pipelineFragmentShadingRate = vrs_capabilities.pipeline_vrs_supported;
-		vrs_features.primitiveFragmentShadingRate = vrs_capabilities.primitive_vrs_supported;
-		vrs_features.attachmentFragmentShadingRate = vrs_capabilities.attachment_vrs_supported;
-		create_info_next = &vrs_features;
+	VkPhysicalDeviceFragmentShadingRateFeaturesKHR fsr_features = {};
+	if (fsr_capabilities.pipeline_supported || fsr_capabilities.primitive_supported || fsr_capabilities.attachment_supported) {
+		fsr_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_FEATURES_KHR;
+		fsr_features.pNext = create_info_next;
+		fsr_features.pipelineFragmentShadingRate = fsr_capabilities.pipeline_supported;
+		fsr_features.primitiveFragmentShadingRate = fsr_capabilities.primitive_supported;
+		fsr_features.attachmentFragmentShadingRate = fsr_capabilities.attachment_supported;
+		create_info_next = &fsr_features;
+	}
+
+	VkPhysicalDeviceFragmentDensityMapFeaturesEXT fdm_features = {};
+	if (fdm_capabilities.attachment_supported || fdm_capabilities.dynamic_attachment_supported || fdm_capabilities.non_subsampled_images_supported) {
+		fdm_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT;
+		fdm_features.pNext = create_info_next;
+		fdm_features.fragmentDensityMap = fdm_capabilities.attachment_supported;
+		fdm_features.fragmentDensityMapDynamic = fdm_capabilities.dynamic_attachment_supported;
+		fdm_features.fragmentDensityMapNonSubsampledImages = fdm_capabilities.non_subsampled_images_supported;
+		create_info_next = &fdm_features;
 	}
 
 	VkPhysicalDevicePipelineCreationCacheControlFeatures pipeline_cache_control_features = {};
@@ -1107,6 +1198,7 @@ Error RenderingDeviceDriverVulkan::_initialize_device(const LocalVector<VkDevice
 
 		if (enabled_device_extension_names.has(VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME)) {
 			device_functions.CreateRenderPass2KHR = PFN_vkCreateRenderPass2KHR(functions.GetDeviceProcAddr(vk_device, "vkCreateRenderPass2KHR"));
+			device_functions.EndRenderPass2KHR = PFN_vkCmdEndRenderPass2KHR(functions.GetDeviceProcAddr(vk_device, "vkCmdEndRenderPass2KHR"));
 		}
 
 		// Debug marker extensions.
@@ -1547,6 +1639,10 @@ RDD::BufferID RenderingDeviceDriverVulkan::buffer_create(uint64_t p_size, BitFie
 		} break;
 		case MEMORY_ALLOCATION_TYPE_GPU: {
 			vma_usage = VMA_MEMORY_USAGE_AUTO_PREFER_DEVICE;
+			if (!Engine::get_singleton()->is_extra_gpu_memory_tracking_enabled()) {
+				// We must set it right now or else vmaFindMemoryTypeIndexForBufferInfo will use wrong parameters.
+				alloc_create_info.usage = vma_usage;
+			}
 			alloc_create_info.preferredFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
 			if (p_size <= SMALL_ALLOCATION_MAX_SIZE) {
 				uint32_t mem_type_index = 0;
@@ -1770,9 +1866,12 @@ RDD::TextureID RenderingDeviceDriverVulkan::texture_create(const TextureFormat &
 	if ((p_format.usage_bits & TEXTURE_USAGE_INPUT_ATTACHMENT_BIT)) {
 		create_info.usage |= VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT;
 	}
-	if ((p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT)) {
+	if ((p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) && (p_format.usage_bits & TEXTURE_USAGE_VRS_FRAGMENT_SHADING_RATE_BIT)) {
 		create_info.usage |= VK_IMAGE_USAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR;
 	}
+	if ((p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) && (p_format.usage_bits & TEXTURE_USAGE_VRS_FRAGMENT_DENSITY_MAP_BIT)) {
+		create_info.usage |= VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT;
+	}
 	if ((p_format.usage_bits & TEXTURE_USAGE_CAN_UPDATE_BIT)) {
 		create_info.usage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
 	}
@@ -2140,6 +2239,10 @@ void RenderingDeviceDriverVulkan::texture_unmap(TextureID p_texture) {
 }
 
 BitField<RDD::TextureUsageBits> RenderingDeviceDriverVulkan::texture_get_usages_supported_by_format(DataFormat p_format, bool p_cpu_readable) {
+	if (p_format >= DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK && p_format <= DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK && !enabled_device_extension_names.has(VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME)) {
+		// Formats that were introduced later with extensions must not reach vkGetPhysicalDeviceFormatProperties if the extension isn't available. This means it's not supported.
+		return 0;
+	}
 	VkFormatProperties properties = {};
 	vkGetPhysicalDeviceFormatProperties(physical_device, RD_TO_VK_FORMAT[p_format], &properties);
 
@@ -2163,8 +2266,7 @@ BitField<RDD::TextureUsageBits> RenderingDeviceDriverVulkan::texture_get_usages_
 	if (!(flags & VK_FORMAT_FEATURE_STORAGE_IMAGE_ATOMIC_BIT)) {
 		supported.clear_flag(TEXTURE_USAGE_STORAGE_ATOMIC_BIT);
 	}
-	// Validation via VK_FORMAT_FEATURE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR fails if VRS attachment is not supported.
-	if (p_format != DATA_FORMAT_R8_UINT) {
+	if (p_format != DATA_FORMAT_R8_UINT && p_format != DATA_FORMAT_R8G8_UNORM) {
 		supported.clear_flag(TEXTURE_USAGE_VRS_ATTACHMENT_BIT);
 	}
 
@@ -2298,6 +2400,8 @@ static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_COMPUTE_SHADER_BIT, VK_PIPE
 static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT, VK_PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT_EXT));
 
 // RDD::BarrierAccessBits == VkAccessFlagBits.
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_INDIRECT_COMMAND_READ_BIT, VK_ACCESS_INDIRECT_COMMAND_READ_BIT));
@@ -2316,6 +2420,7 @@ static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_HOST_WRITE_BIT, VK_ACCESS_H
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_MEMORY_READ_BIT, VK_ACCESS_MEMORY_READ_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_MEMORY_WRITE_BIT, VK_ACCESS_MEMORY_WRITE_BIT));
 static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT, VK_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR));
+static_assert(ENUM_MEMBERS_EQUAL(RDD::BARRIER_ACCESS_FRAGMENT_DENSITY_MAP_ATTACHMENT_READ_BIT, VK_ACCESS_FRAGMENT_DENSITY_MAP_READ_BIT_EXT));
 
 void RenderingDeviceDriverVulkan::command_pipeline_barrier(
 		CommandBufferID p_cmd_buffer,
@@ -2381,8 +2486,9 @@ void RenderingDeviceDriverVulkan::command_pipeline_barrier(
 	}
 #endif
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	vkCmdPipelineBarrier(
-			(VkCommandBuffer)p_cmd_buffer.id,
+			command_buffer->vk_command_buffer,
 			_rd_to_vk_pipeline_stages(p_src_stages),
 			_rd_to_vk_pipeline_stages(p_dst_stages),
 			0,
@@ -2487,7 +2593,7 @@ RDD::CommandQueueFamilyID RenderingDeviceDriverVulkan::command_queue_family_get(
 		// Preferring a queue with less bits will get us closer to getting a queue that performs better for our requirements.
 		// For example, dedicated compute and transfer queues are usually indicated as such.
 		const VkQueueFlags option_queue_flags = queue_family_properties[i].queueFlags;
-		const bool includes_all_bits = (option_queue_flags & p_cmd_queue_family_bits) == p_cmd_queue_family_bits;
+		const bool includes_all_bits = p_cmd_queue_family_bits.get_shared(option_queue_flags) == p_cmd_queue_family_bits;
 		const bool prefer_less_bits = option_queue_flags < picked_queue_flags;
 		if (includes_all_bits && prefer_less_bits) {
 			picked_family_index = i;
@@ -2581,7 +2687,8 @@ Error RenderingDeviceDriverVulkan::command_queue_execute_and_present(CommandQueu
 		signal_semaphores.clear();
 
 		for (uint32_t i = 0; i < p_cmd_buffers.size(); i++) {
-			command_buffers.push_back(VkCommandBuffer(p_cmd_buffers[i].id));
+			const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)(p_cmd_buffers[i].id);
+			command_buffers.push_back(command_buffer->vk_command_buffer);
 		}
 
 		for (uint32_t i = 0; i < p_cmd_semaphores.size(); i++) {
@@ -2791,6 +2898,10 @@ void RenderingDeviceDriverVulkan::command_pool_free(CommandPoolID p_cmd_pool) {
 	DEV_ASSERT(p_cmd_pool);
 
 	CommandPool *command_pool = (CommandPool *)(p_cmd_pool.id);
+	for (CommandBufferInfo *command_buffer : command_pool->command_buffers_created) {
+		VersatileResource::free(resources_allocator, command_buffer);
+	}
+
 	vkDestroyCommandPool(vk_device, command_pool->vk_command_pool, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_COMMAND_POOL));
 	memdelete(command_pool);
 }
@@ -2800,7 +2911,7 @@ void RenderingDeviceDriverVulkan::command_pool_free(CommandPoolID p_cmd_pool) {
 RDD::CommandBufferID RenderingDeviceDriverVulkan::command_buffer_create(CommandPoolID p_cmd_pool) {
 	DEV_ASSERT(p_cmd_pool);
 
-	const CommandPool *command_pool = (const CommandPool *)(p_cmd_pool.id);
+	CommandPool *command_pool = (CommandPool *)(p_cmd_pool.id);
 	VkCommandBufferAllocateInfo cmd_buf_info = {};
 	cmd_buf_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO;
 	cmd_buf_info.commandPool = command_pool->vk_command_pool;
@@ -2812,19 +2923,24 @@ RDD::CommandBufferID RenderingDeviceDriverVulkan::command_buffer_create(CommandP
 		cmd_buf_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
 	}
 
-	VkCommandBuffer vk_cmd_buffer = VK_NULL_HANDLE;
-	VkResult err = vkAllocateCommandBuffers(vk_device, &cmd_buf_info, &vk_cmd_buffer);
+	VkCommandBuffer vk_command_buffer = VK_NULL_HANDLE;
+	VkResult err = vkAllocateCommandBuffers(vk_device, &cmd_buf_info, &vk_command_buffer);
 	ERR_FAIL_COND_V_MSG(err, CommandBufferID(), "vkAllocateCommandBuffers failed with error " + itos(err) + ".");
 
-	return CommandBufferID(vk_cmd_buffer);
+	CommandBufferInfo *command_buffer = VersatileResource::allocate<CommandBufferInfo>(resources_allocator);
+	command_buffer->vk_command_buffer = vk_command_buffer;
+	command_pool->command_buffers_created.push_back(command_buffer);
+	return CommandBufferID(command_buffer);
 }
 
 bool RenderingDeviceDriverVulkan::command_buffer_begin(CommandBufferID p_cmd_buffer) {
+	CommandBufferInfo *command_buffer = (CommandBufferInfo *)(p_cmd_buffer.id);
+
 	VkCommandBufferBeginInfo cmd_buf_begin_info = {};
 	cmd_buf_begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
 	cmd_buf_begin_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
 
-	VkResult err = vkBeginCommandBuffer((VkCommandBuffer)p_cmd_buffer.id, &cmd_buf_begin_info);
+	VkResult err = vkBeginCommandBuffer(command_buffer->vk_command_buffer, &cmd_buf_begin_info);
 	ERR_FAIL_COND_V_MSG(err, false, "vkBeginCommandBuffer failed with error " + itos(err) + ".");
 
 	return true;
@@ -2832,10 +2948,12 @@ bool RenderingDeviceDriverVulkan::command_buffer_begin(CommandBufferID p_cmd_buf
 
 bool RenderingDeviceDriverVulkan::command_buffer_begin_secondary(CommandBufferID p_cmd_buffer, RenderPassID p_render_pass, uint32_t p_subpass, FramebufferID p_framebuffer) {
 	Framebuffer *framebuffer = (Framebuffer *)(p_framebuffer.id);
+	RenderPassInfo *render_pass = (RenderPassInfo *)(p_render_pass.id);
+	CommandBufferInfo *command_buffer = (CommandBufferInfo *)(p_cmd_buffer.id);
 
 	VkCommandBufferInheritanceInfo inheritance_info = {};
 	inheritance_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO;
-	inheritance_info.renderPass = (VkRenderPass)p_render_pass.id;
+	inheritance_info.renderPass = render_pass->vk_render_pass;
 	inheritance_info.subpass = p_subpass;
 	inheritance_info.framebuffer = framebuffer->vk_framebuffer;
 
@@ -2844,18 +2962,27 @@ bool RenderingDeviceDriverVulkan::command_buffer_begin_secondary(CommandBufferID
 	cmd_buf_begin_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT | VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT;
 	cmd_buf_begin_info.pInheritanceInfo = &inheritance_info;
 
-	VkResult err = vkBeginCommandBuffer((VkCommandBuffer)p_cmd_buffer.id, &cmd_buf_begin_info);
+	VkResult err = vkBeginCommandBuffer(command_buffer->vk_command_buffer, &cmd_buf_begin_info);
 	ERR_FAIL_COND_V_MSG(err, false, "vkBeginCommandBuffer failed with error " + itos(err) + ".");
 
 	return true;
 }
 
 void RenderingDeviceDriverVulkan::command_buffer_end(CommandBufferID p_cmd_buffer) {
-	vkEndCommandBuffer((VkCommandBuffer)p_cmd_buffer.id);
+	CommandBufferInfo *command_buffer = (CommandBufferInfo *)(p_cmd_buffer.id);
+	vkEndCommandBuffer(command_buffer->vk_command_buffer);
 }
 
 void RenderingDeviceDriverVulkan::command_buffer_execute_secondary(CommandBufferID p_cmd_buffer, VectorView<CommandBufferID> p_secondary_cmd_buffers) {
-	vkCmdExecuteCommands((VkCommandBuffer)p_cmd_buffer.id, p_secondary_cmd_buffers.size(), (const VkCommandBuffer *)p_secondary_cmd_buffers.ptr());
+	thread_local LocalVector<VkCommandBuffer> secondary_command_buffers;
+	CommandBufferInfo *command_buffer = (CommandBufferInfo *)(p_cmd_buffer.id);
+	secondary_command_buffers.resize(p_secondary_cmd_buffers.size());
+	for (uint32_t i = 0; i < p_secondary_cmd_buffers.size(); i++) {
+		CommandBufferInfo *secondary_command_buffer = (CommandBufferInfo *)(p_secondary_cmd_buffers[i].id);
+		secondary_command_buffers[i] = secondary_command_buffer->vk_command_buffer;
+	}
+
+	vkCmdExecuteCommands(command_buffer->vk_command_buffer, p_secondary_cmd_buffers.size(), secondary_command_buffers.ptr());
 }
 
 /********************/
@@ -2967,15 +3094,18 @@ RenderingDeviceDriver::SwapChainID RenderingDeviceDriverVulkan::swap_chain_creat
 	pass_info.subpassCount = 1;
 	pass_info.pSubpasses = &subpass;
 
-	VkRenderPass render_pass = VK_NULL_HANDLE;
-	err = _create_render_pass(vk_device, &pass_info, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS), &render_pass);
+	VkRenderPass vk_render_pass = VK_NULL_HANDLE;
+	err = _create_render_pass(vk_device, &pass_info, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS), &vk_render_pass);
 	ERR_FAIL_COND_V(err != VK_SUCCESS, SwapChainID());
 
+	RenderPassInfo *render_pass_info = VersatileResource::allocate<RenderPassInfo>(resources_allocator);
+	render_pass_info->vk_render_pass = vk_render_pass;
+
 	SwapChain *swap_chain = memnew(SwapChain);
 	swap_chain->surface = p_surface;
 	swap_chain->format = format;
 	swap_chain->color_space = color_space;
-	swap_chain->render_pass = RenderPassID(render_pass);
+	swap_chain->render_pass = RenderPassID(render_pass_info);
 	return SwapChainID(swap_chain);
 }
 
@@ -3207,9 +3337,10 @@ Error RenderingDeviceDriverVulkan::swap_chain_resize(CommandQueueID p_cmd_queue,
 
 	swap_chain->framebuffers.reserve(image_count);
 
+	const RenderPassInfo *render_pass = (const RenderPassInfo *)(swap_chain->render_pass.id);
 	VkFramebufferCreateInfo fb_create_info = {};
 	fb_create_info.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-	fb_create_info.renderPass = VkRenderPass(swap_chain->render_pass.id);
+	fb_create_info.renderPass = render_pass->vk_render_pass;
 	fb_create_info.attachmentCount = 1;
 	fb_create_info.width = surface->width;
 	fb_create_info.height = surface->height;
@@ -3350,8 +3481,8 @@ void RenderingDeviceDriverVulkan::swap_chain_free(SwapChainID p_swap_chain) {
 	SwapChain *swap_chain = (SwapChain *)(p_swap_chain.id);
 	_swap_chain_release(swap_chain);
 
-	if (swap_chain->render_pass.id != 0) {
-		vkDestroyRenderPass(vk_device, VkRenderPass(swap_chain->render_pass.id), VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS));
+	if (swap_chain->render_pass) {
+		render_pass_free(swap_chain->render_pass);
 	}
 
 	memdelete(swap_chain);
@@ -3362,14 +3493,23 @@ void RenderingDeviceDriverVulkan::swap_chain_free(SwapChainID p_swap_chain) {
 /*********************/
 
 RDD::FramebufferID RenderingDeviceDriverVulkan::framebuffer_create(RenderPassID p_render_pass, VectorView<TextureID> p_attachments, uint32_t p_width, uint32_t p_height) {
+	RenderPassInfo *render_pass = (RenderPassInfo *)(p_render_pass.id);
+
+	uint32_t fragment_density_map_offsets_layers = 0;
 	VkImageView *vk_img_views = ALLOCA_ARRAY(VkImageView, p_attachments.size());
 	for (uint32_t i = 0; i < p_attachments.size(); i++) {
-		vk_img_views[i] = ((const TextureInfo *)p_attachments[i].id)->vk_view;
+		const TextureInfo *texture = (const TextureInfo *)p_attachments[i].id;
+		vk_img_views[i] = texture->vk_view;
+
+		if (render_pass->uses_fragment_density_map_offsets && (texture->vk_create_info.usage & VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT)) {
+			// If the render pass uses the FDM and the usage fits, we store the amount of layers to use it later on the render pass's end.
+			fragment_density_map_offsets_layers = texture->vk_create_info.arrayLayers;
+		}
 	}
 
 	VkFramebufferCreateInfo framebuffer_create_info = {};
 	framebuffer_create_info.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-	framebuffer_create_info.renderPass = (VkRenderPass)p_render_pass.id;
+	framebuffer_create_info.renderPass = render_pass->vk_render_pass;
 	framebuffer_create_info.attachmentCount = p_attachments.size();
 	framebuffer_create_info.pAttachments = vk_img_views;
 	framebuffer_create_info.width = p_width;
@@ -3390,6 +3530,7 @@ RDD::FramebufferID RenderingDeviceDriverVulkan::framebuffer_create(RenderPassID
 
 	Framebuffer *framebuffer = memnew(Framebuffer);
 	framebuffer->vk_framebuffer = vk_framebuffer;
+	framebuffer->fragment_density_map_offsets_layers = fragment_density_map_offsets_layers;
 	return FramebufferID(framebuffer);
 }
 
@@ -3626,7 +3767,8 @@ RDD::ShaderID RenderingDeviceDriverVulkan::shader_create_from_bytecode(const Vec
 	read_offset += sizeof(uint32_t) * 4 + bin_data_size;
 
 	if (binary_data.shader_name_len) {
-		r_name.parse_utf8((const char *)(binptr + read_offset), binary_data.shader_name_len);
+		r_name.clear();
+		r_name.append_utf8((const char *)(binptr + read_offset), binary_data.shader_name_len);
 		read_offset += STEPIFY(binary_data.shader_name_len, 4);
 	}
 
@@ -4347,14 +4489,16 @@ static void _texture_copy_region_to_vk(const RDD::TextureCopyRegion &p_copy_regi
 }
 
 void RenderingDeviceDriverVulkan::command_clear_buffer(CommandBufferID p_cmd_buffer, BufferID p_buffer, uint64_t p_offset, uint64_t p_size) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *buf_info = (const BufferInfo *)p_buffer.id;
-	vkCmdFillBuffer((VkCommandBuffer)p_cmd_buffer.id, buf_info->vk_buffer, p_offset, p_size, 0);
+	vkCmdFillBuffer(command_buffer->vk_command_buffer, buf_info->vk_buffer, p_offset, p_size, 0);
 }
 
 void RenderingDeviceDriverVulkan::command_copy_buffer(CommandBufferID p_cmd_buffer, BufferID p_src_buffer, BufferID p_dst_buffer, VectorView<BufferCopyRegion> p_regions) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *src_buf_info = (const BufferInfo *)p_src_buffer.id;
 	const BufferInfo *dst_buf_info = (const BufferInfo *)p_dst_buffer.id;
-	vkCmdCopyBuffer((VkCommandBuffer)p_cmd_buffer.id, src_buf_info->vk_buffer, dst_buf_info->vk_buffer, p_regions.size(), (const VkBufferCopy *)p_regions.ptr());
+	vkCmdCopyBuffer(command_buffer->vk_command_buffer, src_buf_info->vk_buffer, dst_buf_info->vk_buffer, p_regions.size(), (const VkBufferCopy *)p_regions.ptr());
 }
 
 void RenderingDeviceDriverVulkan::command_copy_texture(CommandBufferID p_cmd_buffer, TextureID p_src_texture, TextureLayout p_src_texture_layout, TextureID p_dst_texture, TextureLayout p_dst_texture_layout, VectorView<TextureCopyRegion> p_regions) {
@@ -4363,6 +4507,7 @@ void RenderingDeviceDriverVulkan::command_copy_texture(CommandBufferID p_cmd_buf
 		_texture_copy_region_to_vk(p_regions[i], &vk_copy_regions[i]);
 	}
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const TextureInfo *src_tex_info = (const TextureInfo *)p_src_texture.id;
 	const TextureInfo *dst_tex_info = (const TextureInfo *)p_dst_texture.id;
 
@@ -4375,10 +4520,11 @@ void RenderingDeviceDriverVulkan::command_copy_texture(CommandBufferID p_cmd_buf
 	}
 #endif
 
-	vkCmdCopyImage((VkCommandBuffer)p_cmd_buffer.id, src_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_src_texture_layout], dst_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_dst_texture_layout], p_regions.size(), vk_copy_regions);
+	vkCmdCopyImage(command_buffer->vk_command_buffer, src_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_src_texture_layout], dst_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_dst_texture_layout], p_regions.size(), vk_copy_regions);
 }
 
 void RenderingDeviceDriverVulkan::command_resolve_texture(CommandBufferID p_cmd_buffer, TextureID p_src_texture, TextureLayout p_src_texture_layout, uint32_t p_src_layer, uint32_t p_src_mipmap, TextureID p_dst_texture, TextureLayout p_dst_texture_layout, uint32_t p_dst_layer, uint32_t p_dst_mipmap) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const TextureInfo *src_tex_info = (const TextureInfo *)p_src_texture.id;
 	const TextureInfo *dst_tex_info = (const TextureInfo *)p_dst_texture.id;
 
@@ -4404,7 +4550,7 @@ void RenderingDeviceDriverVulkan::command_resolve_texture(CommandBufferID p_cmd_
 	}
 #endif
 
-	vkCmdResolveImage((VkCommandBuffer)p_cmd_buffer.id, src_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_src_texture_layout], dst_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_dst_texture_layout], 1, &vk_resolve);
+	vkCmdResolveImage(command_buffer->vk_command_buffer, src_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_src_texture_layout], dst_tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_dst_texture_layout], 1, &vk_resolve);
 }
 
 void RenderingDeviceDriverVulkan::command_clear_color_texture(CommandBufferID p_cmd_buffer, TextureID p_texture, TextureLayout p_texture_layout, const Color &p_color, const TextureSubresourceRange &p_subresources) {
@@ -4414,13 +4560,14 @@ void RenderingDeviceDriverVulkan::command_clear_color_texture(CommandBufferID p_
 	VkImageSubresourceRange vk_subresources = {};
 	_texture_subresource_range_to_vk(p_subresources, &vk_subresources);
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const TextureInfo *tex_info = (const TextureInfo *)p_texture.id;
 #ifdef DEBUG_ENABLED
 	if (tex_info->transient) {
 		ERR_PRINT("TEXTURE_USAGE_TRANSIENT_BIT p_texture must not be used in command_clear_color_texture. Use a clear store action pass instead.");
 	}
 #endif
-	vkCmdClearColorImage((VkCommandBuffer)p_cmd_buffer.id, tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_texture_layout], &vk_color, 1, &vk_subresources);
+	vkCmdClearColorImage(command_buffer->vk_command_buffer, tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_texture_layout], &vk_color, 1, &vk_subresources);
 }
 
 void RenderingDeviceDriverVulkan::command_copy_buffer_to_texture(CommandBufferID p_cmd_buffer, BufferID p_src_buffer, TextureID p_dst_texture, TextureLayout p_dst_texture_layout, VectorView<BufferTextureCopyRegion> p_regions) {
@@ -4429,6 +4576,7 @@ void RenderingDeviceDriverVulkan::command_copy_buffer_to_texture(CommandBufferID
 		_buffer_texture_copy_region_to_vk(p_regions[i], &vk_copy_regions[i]);
 	}
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *buf_info = (const BufferInfo *)p_src_buffer.id;
 	const TextureInfo *tex_info = (const TextureInfo *)p_dst_texture.id;
 #ifdef DEBUG_ENABLED
@@ -4436,7 +4584,7 @@ void RenderingDeviceDriverVulkan::command_copy_buffer_to_texture(CommandBufferID
 		ERR_PRINT("TEXTURE_USAGE_TRANSIENT_BIT p_dst_texture must not be used in command_copy_buffer_to_texture.");
 	}
 #endif
-	vkCmdCopyBufferToImage((VkCommandBuffer)p_cmd_buffer.id, buf_info->vk_buffer, tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_dst_texture_layout], p_regions.size(), vk_copy_regions);
+	vkCmdCopyBufferToImage(command_buffer->vk_command_buffer, buf_info->vk_buffer, tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_dst_texture_layout], p_regions.size(), vk_copy_regions);
 }
 
 void RenderingDeviceDriverVulkan::command_copy_texture_to_buffer(CommandBufferID p_cmd_buffer, TextureID p_src_texture, TextureLayout p_src_texture_layout, BufferID p_dst_buffer, VectorView<BufferTextureCopyRegion> p_regions) {
@@ -4445,6 +4593,7 @@ void RenderingDeviceDriverVulkan::command_copy_texture_to_buffer(CommandBufferID
 		_buffer_texture_copy_region_to_vk(p_regions[i], &vk_copy_regions[i]);
 	}
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const TextureInfo *tex_info = (const TextureInfo *)p_src_texture.id;
 	const BufferInfo *buf_info = (const BufferInfo *)p_dst_buffer.id;
 #ifdef DEBUG_ENABLED
@@ -4452,7 +4601,7 @@ void RenderingDeviceDriverVulkan::command_copy_texture_to_buffer(CommandBufferID
 		ERR_PRINT("TEXTURE_USAGE_TRANSIENT_BIT p_src_texture must not be used in command_copy_texture_to_buffer.");
 	}
 #endif
-	vkCmdCopyImageToBuffer((VkCommandBuffer)p_cmd_buffer.id, tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_src_texture_layout], buf_info->vk_buffer, p_regions.size(), vk_copy_regions);
+	vkCmdCopyImageToBuffer(command_buffer->vk_command_buffer, tex_info->vk_view_create_info.image, RD_TO_VK_LAYOUT[p_src_texture_layout], buf_info->vk_buffer, p_regions.size(), vk_copy_regions);
 }
 
 /******************/
@@ -4466,8 +4615,9 @@ void RenderingDeviceDriverVulkan::pipeline_free(PipelineID p_pipeline) {
 // ----- BINDING -----
 
 void RenderingDeviceDriverVulkan::command_bind_push_constants(CommandBufferID p_cmd_buffer, ShaderID p_shader, uint32_t p_dst_first_index, VectorView<uint32_t> p_data) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
-	vkCmdPushConstants((VkCommandBuffer)p_cmd_buffer.id, shader_info->vk_pipeline_layout, shader_info->vk_push_constant_stages, p_dst_first_index * sizeof(uint32_t), p_data.size() * sizeof(uint32_t), p_data.ptr());
+	vkCmdPushConstants(command_buffer->vk_command_buffer, shader_info->vk_pipeline_layout, shader_info->vk_push_constant_stages, p_dst_first_index * sizeof(uint32_t), p_data.size() * sizeof(uint32_t), p_data.ptr());
 }
 
 // ----- CACHE -----
@@ -4598,7 +4748,7 @@ static void _attachment_reference_to_vk(const RDD::AttachmentReference &p_attach
 	r_vk_attachment_reference->aspectMask = (VkImageAspectFlags)p_attachment_reference.aspect;
 }
 
-RDD::RenderPassID RenderingDeviceDriverVulkan::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) {
+RDD::RenderPassID RenderingDeviceDriverVulkan::render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) {
 	// These are only used if we use multiview but we need to define them in scope.
 	const uint32_t view_mask = (1 << p_view_count) - 1;
 	const uint32_t correlation_mask = (1 << p_view_count) - 1;
@@ -4653,22 +4803,22 @@ RDD::RenderPassID RenderingDeviceDriverVulkan::render_pass_create(VectorView<Att
 		vk_subpasses[i].preserveAttachmentCount = p_subpasses[i].preserve_attachments.size();
 		vk_subpasses[i].pPreserveAttachments = p_subpasses[i].preserve_attachments.ptr();
 
-		// VRS.
-		if (vrs_capabilities.attachment_vrs_supported && p_subpasses[i].vrs_reference.attachment != AttachmentReference::UNUSED) {
-			VkAttachmentReference2KHR *vk_subpass_vrs_attachment = ALLOCA_SINGLE(VkAttachmentReference2KHR);
-			*vk_subpass_vrs_attachment = {};
-			vk_subpass_vrs_attachment->sType = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2_KHR;
-			vk_subpass_vrs_attachment->attachment = p_subpasses[i].vrs_reference.attachment;
-			vk_subpass_vrs_attachment->layout = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR;
+		// Fragment shading rate.
+		if (fsr_capabilities.attachment_supported && p_subpasses[i].fragment_shading_rate_reference.attachment != AttachmentReference::UNUSED) {
+			VkAttachmentReference2KHR *vk_subpass_fsr_attachment = ALLOCA_SINGLE(VkAttachmentReference2KHR);
+			*vk_subpass_fsr_attachment = {};
+			vk_subpass_fsr_attachment->sType = VK_STRUCTURE_TYPE_ATTACHMENT_REFERENCE_2_KHR;
+			vk_subpass_fsr_attachment->attachment = p_subpasses[i].fragment_shading_rate_reference.attachment;
+			vk_subpass_fsr_attachment->layout = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR;
 
-			VkFragmentShadingRateAttachmentInfoKHR *vk_vrs_info = ALLOCA_SINGLE(VkFragmentShadingRateAttachmentInfoKHR);
-			*vk_vrs_info = {};
-			vk_vrs_info->sType = VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR;
-			vk_vrs_info->pFragmentShadingRateAttachment = vk_subpass_vrs_attachment;
-			vk_vrs_info->shadingRateAttachmentTexelSize.width = vrs_capabilities.texel_size.x;
-			vk_vrs_info->shadingRateAttachmentTexelSize.height = vrs_capabilities.texel_size.y;
+			VkFragmentShadingRateAttachmentInfoKHR *vk_fsr_info = ALLOCA_SINGLE(VkFragmentShadingRateAttachmentInfoKHR);
+			*vk_fsr_info = {};
+			vk_fsr_info->sType = VK_STRUCTURE_TYPE_FRAGMENT_SHADING_RATE_ATTACHMENT_INFO_KHR;
+			vk_fsr_info->pFragmentShadingRateAttachment = vk_subpass_fsr_attachment;
+			vk_fsr_info->shadingRateAttachmentTexelSize.width = p_subpasses[i].fragment_shading_rate_texel_size.x;
+			vk_fsr_info->shadingRateAttachmentTexelSize.height = p_subpasses[i].fragment_shading_rate_texel_size.y;
 
-			vk_subpasses[i].pNext = vk_vrs_info;
+			vk_subpasses[i].pNext = vk_fsr_info;
 		}
 	}
 
@@ -4717,15 +4867,30 @@ RDD::RenderPassID RenderingDeviceDriverVulkan::render_pass_create(VectorView<Att
 		create_info.pNext = multiview_create_info;
 	}
 
+	// Fragment density map.
+	bool uses_fragment_density_map = fdm_capabilities.attachment_supported && p_fragment_density_map_attachment.attachment != AttachmentReference::UNUSED;
+	if (uses_fragment_density_map) {
+		VkRenderPassFragmentDensityMapCreateInfoEXT *vk_fdm_info = ALLOCA_SINGLE(VkRenderPassFragmentDensityMapCreateInfoEXT);
+		vk_fdm_info->sType = VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT;
+		vk_fdm_info->fragmentDensityMapAttachment.attachment = p_fragment_density_map_attachment.attachment;
+		vk_fdm_info->fragmentDensityMapAttachment.layout = RD_TO_VK_LAYOUT[p_fragment_density_map_attachment.layout];
+		vk_fdm_info->pNext = create_info.pNext;
+		create_info.pNext = vk_fdm_info;
+	}
+
 	VkRenderPass vk_render_pass = VK_NULL_HANDLE;
 	VkResult res = _create_render_pass(vk_device, &create_info, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS), &vk_render_pass);
 	ERR_FAIL_COND_V_MSG(res, RenderPassID(), "vkCreateRenderPass2KHR failed with error " + itos(res) + ".");
 
-	return RenderPassID(vk_render_pass);
+	RenderPassInfo *render_pass = VersatileResource::allocate<RenderPassInfo>(resources_allocator);
+	render_pass->vk_render_pass = vk_render_pass;
+	return RenderPassID(render_pass);
 }
 
 void RenderingDeviceDriverVulkan::render_pass_free(RenderPassID p_render_pass) {
-	vkDestroyRenderPass(vk_device, (VkRenderPass)p_render_pass.id, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS));
+	RenderPassInfo *render_pass = (RenderPassInfo *)(p_render_pass.id);
+	vkDestroyRenderPass(vk_device, render_pass->vk_render_pass, VKC::get_allocation_callbacks(VK_OBJECT_TYPE_RENDER_PASS));
+	VersatileResource::free<RenderPassInfo>(resources_allocator, render_pass);
 }
 
 // ----- COMMANDS -----
@@ -4733,7 +4898,10 @@ void RenderingDeviceDriverVulkan::render_pass_free(RenderPassID p_render_pass) {
 static_assert(ARRAYS_COMPATIBLE_FIELDWISE(RDD::RenderPassClearValue, VkClearValue));
 
 void RenderingDeviceDriverVulkan::command_begin_render_pass(CommandBufferID p_cmd_buffer, RenderPassID p_render_pass, FramebufferID p_framebuffer, CommandBufferType p_cmd_buffer_type, const Rect2i &p_rect, VectorView<RenderPassClearValue> p_clear_values) {
+	CommandBufferInfo *command_buffer = (CommandBufferInfo *)(p_cmd_buffer.id);
+	RenderPassInfo *render_pass = (RenderPassInfo *)(p_render_pass.id);
 	Framebuffer *framebuffer = (Framebuffer *)(p_framebuffer.id);
+
 	if (framebuffer->swap_chain_acquired) {
 		// Insert a barrier to wait for the acquisition of the framebuffer before the render pass begins.
 		VkImageMemoryBarrier image_barrier = {};
@@ -4744,13 +4912,13 @@ void RenderingDeviceDriverVulkan::command_begin_render_pass(CommandBufferID p_cm
 		image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
 		image_barrier.image = framebuffer->swap_chain_image;
 		image_barrier.subresourceRange = framebuffer->swap_chain_image_subresource_range;
-		vkCmdPipelineBarrier((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, 0, nullptr, 0, nullptr, 1, &image_barrier);
+		vkCmdPipelineBarrier(command_buffer->vk_command_buffer, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, 0, nullptr, 0, nullptr, 1, &image_barrier);
 		framebuffer->swap_chain_acquired = false;
 	}
 
 	VkRenderPassBeginInfo render_pass_begin = {};
 	render_pass_begin.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO;
-	render_pass_begin.renderPass = (VkRenderPass)p_render_pass.id;
+	render_pass_begin.renderPass = render_pass->vk_render_pass;
 	render_pass_begin.framebuffer = framebuffer->vk_framebuffer;
 
 	render_pass_begin.renderArea.offset.x = p_rect.position.x;
@@ -4762,7 +4930,10 @@ void RenderingDeviceDriverVulkan::command_begin_render_pass(CommandBufferID p_cm
 	render_pass_begin.pClearValues = (const VkClearValue *)p_clear_values.ptr();
 
 	VkSubpassContents vk_subpass_contents = p_cmd_buffer_type == COMMAND_BUFFER_TYPE_PRIMARY ? VK_SUBPASS_CONTENTS_INLINE : VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS;
-	vkCmdBeginRenderPass((VkCommandBuffer)p_cmd_buffer.id, &render_pass_begin, vk_subpass_contents);
+	vkCmdBeginRenderPass(command_buffer->vk_command_buffer, &render_pass_begin, vk_subpass_contents);
+
+	command_buffer->active_framebuffer = framebuffer;
+	command_buffer->active_render_pass = render_pass;
 
 #if PRINT_NATIVE_COMMANDS
 	print_line(vformat("vkCmdBeginRenderPass Pass 0x%uX Framebuffer 0x%uX", p_render_pass.id, p_framebuffer.id));
@@ -4770,7 +4941,14 @@ void RenderingDeviceDriverVulkan::command_begin_render_pass(CommandBufferID p_cm
 }
 
 void RenderingDeviceDriverVulkan::command_end_render_pass(CommandBufferID p_cmd_buffer) {
-	vkCmdEndRenderPass((VkCommandBuffer)p_cmd_buffer.id);
+	CommandBufferInfo *command_buffer = (CommandBufferInfo *)(p_cmd_buffer.id);
+	DEV_ASSERT(command_buffer->active_framebuffer != nullptr && "A framebuffer must be active.");
+	DEV_ASSERT(command_buffer->active_render_pass != nullptr && "A render pass must be active.");
+
+	vkCmdEndRenderPass(command_buffer->vk_command_buffer);
+
+	command_buffer->active_render_pass = nullptr;
+	command_buffer->active_framebuffer = nullptr;
 
 #if PRINT_NATIVE_COMMANDS
 	print_line("vkCmdEndRenderPass");
@@ -4778,11 +4956,13 @@ void RenderingDeviceDriverVulkan::command_end_render_pass(CommandBufferID p_cmd_
 }
 
 void RenderingDeviceDriverVulkan::command_next_render_subpass(CommandBufferID p_cmd_buffer, CommandBufferType p_cmd_buffer_type) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	VkSubpassContents vk_subpass_contents = p_cmd_buffer_type == COMMAND_BUFFER_TYPE_PRIMARY ? VK_SUBPASS_CONTENTS_INLINE : VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS;
-	vkCmdNextSubpass((VkCommandBuffer)p_cmd_buffer.id, vk_subpass_contents);
+	vkCmdNextSubpass(command_buffer->vk_command_buffer, vk_subpass_contents);
 }
 
 void RenderingDeviceDriverVulkan::command_render_set_viewport(CommandBufferID p_cmd_buffer, VectorView<Rect2i> p_viewports) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	VkViewport *vk_viewports = ALLOCA_ARRAY(VkViewport, p_viewports.size());
 	for (uint32_t i = 0; i < p_viewports.size(); i++) {
 		vk_viewports[i] = {};
@@ -4793,14 +4973,17 @@ void RenderingDeviceDriverVulkan::command_render_set_viewport(CommandBufferID p_
 		vk_viewports[i].minDepth = 0.0f;
 		vk_viewports[i].maxDepth = 1.0f;
 	}
-	vkCmdSetViewport((VkCommandBuffer)p_cmd_buffer.id, 0, p_viewports.size(), vk_viewports);
+	vkCmdSetViewport(command_buffer->vk_command_buffer, 0, p_viewports.size(), vk_viewports);
 }
 
 void RenderingDeviceDriverVulkan::command_render_set_scissor(CommandBufferID p_cmd_buffer, VectorView<Rect2i> p_scissors) {
-	vkCmdSetScissor((VkCommandBuffer)p_cmd_buffer.id, 0, p_scissors.size(), (VkRect2D *)p_scissors.ptr());
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdSetScissor(command_buffer->vk_command_buffer, 0, p_scissors.size(), (VkRect2D *)p_scissors.ptr());
 }
 
 void RenderingDeviceDriverVulkan::command_render_clear_attachments(CommandBufferID p_cmd_buffer, VectorView<AttachmentClear> p_attachment_clears, VectorView<Rect2i> p_rects) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+
 	VkClearAttachment *vk_clears = ALLOCA_ARRAY(VkClearAttachment, p_attachment_clears.size());
 	for (uint32_t i = 0; i < p_attachment_clears.size(); i++) {
 		vk_clears[i] = {};
@@ -4820,17 +5003,19 @@ void RenderingDeviceDriverVulkan::command_render_clear_attachments(CommandBuffer
 		vk_rects[i].layerCount = 1;
 	}
 
-	vkCmdClearAttachments((VkCommandBuffer)p_cmd_buffer.id, p_attachment_clears.size(), vk_clears, p_rects.size(), vk_rects);
+	vkCmdClearAttachments(command_buffer->vk_command_buffer, p_attachment_clears.size(), vk_clears, p_rects.size(), vk_rects);
 }
 
 void RenderingDeviceDriverVulkan::command_bind_render_pipeline(CommandBufferID p_cmd_buffer, PipelineID p_pipeline) {
-	vkCmdBindPipeline((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_BIND_POINT_GRAPHICS, (VkPipeline)p_pipeline.id);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdBindPipeline(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, (VkPipeline)p_pipeline.id);
 }
 
 void RenderingDeviceDriverVulkan::command_bind_render_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
 	const UniformSetInfo *usi = (const UniformSetInfo *)p_uniform_set.id;
-	vkCmdBindDescriptorSets((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_BIND_POINT_GRAPHICS, shader_info->vk_pipeline_layout, p_set_index, 1, &usi->vk_descriptor_set, 0, nullptr);
+	vkCmdBindDescriptorSets(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, shader_info->vk_pipeline_layout, p_set_index, 1, &usi->vk_descriptor_set, 0, nullptr);
 }
 
 void RenderingDeviceDriverVulkan::command_bind_render_uniform_sets(CommandBufferID p_cmd_buffer, VectorView<UniformSetID> p_uniform_sets, ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count) {
@@ -4846,59 +5031,71 @@ void RenderingDeviceDriverVulkan::command_bind_render_uniform_sets(CommandBuffer
 		sets[i] = ((const UniformSetInfo *)p_uniform_sets[i].id)->vk_descriptor_set;
 	}
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
-	vkCmdBindDescriptorSets((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_BIND_POINT_GRAPHICS, shader_info->vk_pipeline_layout, p_first_set_index, p_set_count, &sets[0], 0, nullptr);
+	vkCmdBindDescriptorSets(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, shader_info->vk_pipeline_layout, p_first_set_index, p_set_count, &sets[0], 0, nullptr);
 }
 
 void RenderingDeviceDriverVulkan::command_render_draw(CommandBufferID p_cmd_buffer, uint32_t p_vertex_count, uint32_t p_instance_count, uint32_t p_base_vertex, uint32_t p_first_instance) {
-	vkCmdDraw((VkCommandBuffer)p_cmd_buffer.id, p_vertex_count, p_instance_count, p_base_vertex, p_first_instance);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdDraw(command_buffer->vk_command_buffer, p_vertex_count, p_instance_count, p_base_vertex, p_first_instance);
 }
 
 void RenderingDeviceDriverVulkan::command_render_draw_indexed(CommandBufferID p_cmd_buffer, uint32_t p_index_count, uint32_t p_instance_count, uint32_t p_first_index, int32_t p_vertex_offset, uint32_t p_first_instance) {
-	vkCmdDrawIndexed((VkCommandBuffer)p_cmd_buffer.id, p_index_count, p_instance_count, p_first_index, p_vertex_offset, p_first_instance);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdDrawIndexed(command_buffer->vk_command_buffer, p_index_count, p_instance_count, p_first_index, p_vertex_offset, p_first_instance);
 }
 
 void RenderingDeviceDriverVulkan::command_render_draw_indexed_indirect(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *buf_info = (const BufferInfo *)p_indirect_buffer.id;
-	vkCmdDrawIndexedIndirect((VkCommandBuffer)p_cmd_buffer.id, buf_info->vk_buffer, p_offset, p_draw_count, p_stride);
+	vkCmdDrawIndexedIndirect(command_buffer->vk_command_buffer, buf_info->vk_buffer, p_offset, p_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverVulkan::command_render_draw_indexed_indirect_count(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *indirect_buf_info = (const BufferInfo *)p_indirect_buffer.id;
 	const BufferInfo *count_buf_info = (const BufferInfo *)p_count_buffer.id;
-	vkCmdDrawIndexedIndirectCount((VkCommandBuffer)p_cmd_buffer.id, indirect_buf_info->vk_buffer, p_offset, count_buf_info->vk_buffer, p_count_buffer_offset, p_max_draw_count, p_stride);
+	vkCmdDrawIndexedIndirectCount(command_buffer->vk_command_buffer, indirect_buf_info->vk_buffer, p_offset, count_buf_info->vk_buffer, p_count_buffer_offset, p_max_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverVulkan::command_render_draw_indirect(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *buf_info = (const BufferInfo *)p_indirect_buffer.id;
-	vkCmdDrawIndirect((VkCommandBuffer)p_cmd_buffer.id, buf_info->vk_buffer, p_offset, p_draw_count, p_stride);
+	vkCmdDrawIndirect(command_buffer->vk_command_buffer, buf_info->vk_buffer, p_offset, p_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverVulkan::command_render_draw_indirect_count(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset, BufferID p_count_buffer, uint64_t p_count_buffer_offset, uint32_t p_max_draw_count, uint32_t p_stride) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *indirect_buf_info = (const BufferInfo *)p_indirect_buffer.id;
 	const BufferInfo *count_buf_info = (const BufferInfo *)p_count_buffer.id;
-	vkCmdDrawIndirectCount((VkCommandBuffer)p_cmd_buffer.id, indirect_buf_info->vk_buffer, p_offset, count_buf_info->vk_buffer, p_count_buffer_offset, p_max_draw_count, p_stride);
+	vkCmdDrawIndirectCount(command_buffer->vk_command_buffer, indirect_buf_info->vk_buffer, p_offset, count_buf_info->vk_buffer, p_count_buffer_offset, p_max_draw_count, p_stride);
 }
 
 void RenderingDeviceDriverVulkan::command_render_bind_vertex_buffers(CommandBufferID p_cmd_buffer, uint32_t p_binding_count, const BufferID *p_buffers, const uint64_t *p_offsets) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+
 	VkBuffer *vk_buffers = ALLOCA_ARRAY(VkBuffer, p_binding_count);
 	for (uint32_t i = 0; i < p_binding_count; i++) {
 		vk_buffers[i] = ((const BufferInfo *)p_buffers[i].id)->vk_buffer;
 	}
-	vkCmdBindVertexBuffers((VkCommandBuffer)p_cmd_buffer.id, 0, p_binding_count, vk_buffers, p_offsets);
+	vkCmdBindVertexBuffers(command_buffer->vk_command_buffer, 0, p_binding_count, vk_buffers, p_offsets);
 }
 
 void RenderingDeviceDriverVulkan::command_render_bind_index_buffer(CommandBufferID p_cmd_buffer, BufferID p_buffer, IndexBufferFormat p_format, uint64_t p_offset) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *buf_info = (const BufferInfo *)p_buffer.id;
-	vkCmdBindIndexBuffer((VkCommandBuffer)p_cmd_buffer.id, buf_info->vk_buffer, p_offset, p_format == INDEX_BUFFER_FORMAT_UINT16 ? VK_INDEX_TYPE_UINT16 : VK_INDEX_TYPE_UINT32);
+	vkCmdBindIndexBuffer(command_buffer->vk_command_buffer, buf_info->vk_buffer, p_offset, p_format == INDEX_BUFFER_FORMAT_UINT16 ? VK_INDEX_TYPE_UINT16 : VK_INDEX_TYPE_UINT32);
 }
 
 void RenderingDeviceDriverVulkan::command_render_set_blend_constants(CommandBufferID p_cmd_buffer, const Color &p_constants) {
-	vkCmdSetBlendConstants((VkCommandBuffer)p_cmd_buffer.id, p_constants.components);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdSetBlendConstants(command_buffer->vk_command_buffer, p_constants.components);
 }
 
 void RenderingDeviceDriverVulkan::command_render_set_line_width(CommandBufferID p_cmd_buffer, float p_width) {
-	vkCmdSetLineWidth((VkCommandBuffer)p_cmd_buffer.id, p_width);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdSetLineWidth(command_buffer->vk_command_buffer, p_width);
 }
 
 // ----- PIPELINE -----
@@ -5170,23 +5367,22 @@ RDD::PipelineID RenderingDeviceDriverVulkan::render_pipeline_create(
 	dynamic_state_create_info.dynamicStateCount = vk_dynamic_states_count;
 	dynamic_state_create_info.pDynamicStates = vk_dynamic_states;
 
-	// VRS.
-
 	void *graphics_pipeline_nextptr = nullptr;
 
-	if (vrs_capabilities.attachment_vrs_supported) {
-		// If VRS is used, this defines how the different VRS types are combined.
-		// combinerOps[0] decides how we use the output of pipeline and primitive (drawcall) VRS.
-		// combinerOps[1] decides how we use the output of combinerOps[0] and our attachment VRS.
+	if (fsr_capabilities.attachment_supported) {
+		// Fragment shading rate.
+		// If FSR is used, this defines how the different FSR types are combined.
+		// combinerOps[0] decides how we use the output of pipeline and primitive (drawcall) FSR.
+		// combinerOps[1] decides how we use the output of combinerOps[0] and our attachment FSR.
 
-		VkPipelineFragmentShadingRateStateCreateInfoKHR *vrs_create_info = ALLOCA_SINGLE(VkPipelineFragmentShadingRateStateCreateInfoKHR);
-		*vrs_create_info = {};
-		vrs_create_info->sType = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR;
-		vrs_create_info->fragmentSize = { 4, 4 };
-		vrs_create_info->combinerOps[0] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR; // We don't use pipeline/primitive VRS so this really doesn't matter.
-		vrs_create_info->combinerOps[1] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_REPLACE_KHR; // Always use the outcome of attachment VRS if enabled.
+		VkPipelineFragmentShadingRateStateCreateInfoKHR *fsr_create_info = ALLOCA_SINGLE(VkPipelineFragmentShadingRateStateCreateInfoKHR);
+		*fsr_create_info = {};
+		fsr_create_info->sType = VK_STRUCTURE_TYPE_PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR;
+		fsr_create_info->fragmentSize = { 4, 4 };
+		fsr_create_info->combinerOps[0] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_KEEP_KHR; // We don't use pipeline/primitive FSR so this really doesn't matter.
+		fsr_create_info->combinerOps[1] = VK_FRAGMENT_SHADING_RATE_COMBINER_OP_REPLACE_KHR; // Always use the outcome of attachment FSR if enabled.
 
-		graphics_pipeline_nextptr = vrs_create_info;
+		graphics_pipeline_nextptr = fsr_create_info;
 	}
 
 	// Finally, pipeline create info.
@@ -5226,6 +5422,7 @@ RDD::PipelineID RenderingDeviceDriverVulkan::render_pipeline_create(
 		}
 	}
 
+	const RenderPassInfo *render_pass = (const RenderPassInfo *)(p_render_pass.id);
 	pipeline_create_info.pStages = vk_pipeline_stages;
 	pipeline_create_info.pVertexInputState = vertex_input_state_create_info;
 	pipeline_create_info.pInputAssemblyState = &input_assembly_create_info;
@@ -5237,7 +5434,7 @@ RDD::PipelineID RenderingDeviceDriverVulkan::render_pipeline_create(
 	pipeline_create_info.pColorBlendState = &color_blend_state_create_info;
 	pipeline_create_info.pDynamicState = &dynamic_state_create_info;
 	pipeline_create_info.layout = shader_info->vk_pipeline_layout;
-	pipeline_create_info.renderPass = (VkRenderPass)p_render_pass.id;
+	pipeline_create_info.renderPass = render_pass->vk_render_pass;
 	pipeline_create_info.subpass = p_render_subpass;
 
 	// ---
@@ -5256,13 +5453,15 @@ RDD::PipelineID RenderingDeviceDriverVulkan::render_pipeline_create(
 // ----- COMMANDS -----
 
 void RenderingDeviceDriverVulkan::command_bind_compute_pipeline(CommandBufferID p_cmd_buffer, PipelineID p_pipeline) {
-	vkCmdBindPipeline((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_BIND_POINT_COMPUTE, (VkPipeline)p_pipeline.id);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdBindPipeline(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, (VkPipeline)p_pipeline.id);
 }
 
 void RenderingDeviceDriverVulkan::command_bind_compute_uniform_set(CommandBufferID p_cmd_buffer, UniformSetID p_uniform_set, ShaderID p_shader, uint32_t p_set_index) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
 	const UniformSetInfo *usi = (const UniformSetInfo *)p_uniform_set.id;
-	vkCmdBindDescriptorSets((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_BIND_POINT_COMPUTE, shader_info->vk_pipeline_layout, p_set_index, 1, &usi->vk_descriptor_set, 0, nullptr);
+	vkCmdBindDescriptorSets(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, shader_info->vk_pipeline_layout, p_set_index, 1, &usi->vk_descriptor_set, 0, nullptr);
 }
 
 void RenderingDeviceDriverVulkan::command_bind_compute_uniform_sets(CommandBufferID p_cmd_buffer, VectorView<UniformSetID> p_uniform_sets, ShaderID p_shader, uint32_t p_first_set_index, uint32_t p_set_count) {
@@ -5278,17 +5477,20 @@ void RenderingDeviceDriverVulkan::command_bind_compute_uniform_sets(CommandBuffe
 		sets[i] = ((const UniformSetInfo *)p_uniform_sets[i].id)->vk_descriptor_set;
 	}
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const ShaderInfo *shader_info = (const ShaderInfo *)p_shader.id;
-	vkCmdBindDescriptorSets((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_BIND_POINT_COMPUTE, shader_info->vk_pipeline_layout, p_first_set_index, p_set_count, &sets[0], 0, nullptr);
+	vkCmdBindDescriptorSets(command_buffer->vk_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, shader_info->vk_pipeline_layout, p_first_set_index, p_set_count, &sets[0], 0, nullptr);
 }
 
 void RenderingDeviceDriverVulkan::command_compute_dispatch(CommandBufferID p_cmd_buffer, uint32_t p_x_groups, uint32_t p_y_groups, uint32_t p_z_groups) {
-	vkCmdDispatch((VkCommandBuffer)p_cmd_buffer.id, p_x_groups, p_y_groups, p_z_groups);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdDispatch(command_buffer->vk_command_buffer, p_x_groups, p_y_groups, p_z_groups);
 }
 
 void RenderingDeviceDriverVulkan::command_compute_dispatch_indirect(CommandBufferID p_cmd_buffer, BufferID p_indirect_buffer, uint64_t p_offset) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const BufferInfo *buf_info = (const BufferInfo *)p_indirect_buffer.id;
-	vkCmdDispatchIndirect((VkCommandBuffer)p_cmd_buffer.id, buf_info->vk_buffer, p_offset);
+	vkCmdDispatchIndirect(command_buffer->vk_command_buffer, buf_info->vk_buffer, p_offset);
 }
 
 // ----- PIPELINE -----
@@ -5387,11 +5589,13 @@ uint64_t RenderingDeviceDriverVulkan::timestamp_query_result_to_time(uint64_t p_
 }
 
 void RenderingDeviceDriverVulkan::command_timestamp_query_pool_reset(CommandBufferID p_cmd_buffer, QueryPoolID p_pool_id, uint32_t p_query_count) {
-	vkCmdResetQueryPool((VkCommandBuffer)p_cmd_buffer.id, (VkQueryPool)p_pool_id.id, 0, p_query_count);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdResetQueryPool(command_buffer->vk_command_buffer, (VkQueryPool)p_pool_id.id, 0, p_query_count);
 }
 
 void RenderingDeviceDriverVulkan::command_timestamp_write(CommandBufferID p_cmd_buffer, QueryPoolID p_pool_id, uint32_t p_index) {
-	vkCmdWriteTimestamp((VkCommandBuffer)p_cmd_buffer.id, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, (VkQueryPool)p_pool_id.id, p_index);
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
+	vkCmdWriteTimestamp(command_buffer->vk_command_buffer, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, (VkQueryPool)p_pool_id.id, p_index);
 }
 
 /****************/
@@ -5399,6 +5603,7 @@ void RenderingDeviceDriverVulkan::command_timestamp_write(CommandBufferID p_cmd_
 /****************/
 
 void RenderingDeviceDriverVulkan::command_begin_label(CommandBufferID p_cmd_buffer, const char *p_label_name, const Color &p_color) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const RenderingContextDriverVulkan::Functions &functions = context_driver->functions_get();
 	if (!functions.CmdBeginDebugUtilsLabelEXT) {
 		if (functions.CmdDebugMarkerBeginEXT) {
@@ -5411,7 +5616,7 @@ void RenderingDeviceDriverVulkan::command_begin_label(CommandBufferID p_cmd_buff
 			marker.color[1] = p_color[1];
 			marker.color[2] = p_color[2];
 			marker.color[3] = p_color[3];
-			functions.CmdDebugMarkerBeginEXT((VkCommandBuffer)p_cmd_buffer.id, &marker);
+			functions.CmdDebugMarkerBeginEXT(command_buffer->vk_command_buffer, &marker);
 		}
 		return;
 	}
@@ -5423,19 +5628,20 @@ void RenderingDeviceDriverVulkan::command_begin_label(CommandBufferID p_cmd_buff
 	label.color[1] = p_color[1];
 	label.color[2] = p_color[2];
 	label.color[3] = p_color[3];
-	functions.CmdBeginDebugUtilsLabelEXT((VkCommandBuffer)p_cmd_buffer.id, &label);
+	functions.CmdBeginDebugUtilsLabelEXT(command_buffer->vk_command_buffer, &label);
 }
 
 void RenderingDeviceDriverVulkan::command_end_label(CommandBufferID p_cmd_buffer) {
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	const RenderingContextDriverVulkan::Functions &functions = context_driver->functions_get();
 	if (!functions.CmdEndDebugUtilsLabelEXT) {
 		if (functions.CmdDebugMarkerEndEXT) {
 			// Debug marker extensions.
-			functions.CmdDebugMarkerEndEXT((VkCommandBuffer)p_cmd_buffer.id);
+			functions.CmdDebugMarkerEndEXT(command_buffer->vk_command_buffer);
 		}
 		return;
 	}
-	functions.CmdEndDebugUtilsLabelEXT((VkCommandBuffer)p_cmd_buffer.id);
+	functions.CmdEndDebugUtilsLabelEXT(command_buffer->vk_command_buffer);
 }
 
 /****************/
@@ -5447,6 +5653,7 @@ void RenderingDeviceDriverVulkan::command_insert_breadcrumb(CommandBufferID p_cm
 		return;
 	}
 
+	const CommandBufferInfo *command_buffer = (const CommandBufferInfo *)p_cmd_buffer.id;
 	if (Engine::get_singleton()->is_accurate_breadcrumbs_enabled()) {
 		// Force a full barrier so commands are not executed in parallel.
 		// This will mean that the last breadcrumb to see was actually the
@@ -5486,7 +5693,7 @@ void RenderingDeviceDriverVulkan::command_insert_breadcrumb(CommandBufferID p_cm
 				VK_ACCESS_HOST_WRITE_BIT;
 
 		vkCmdPipelineBarrier(
-				(VkCommandBuffer)p_cmd_buffer.id,
+				command_buffer->vk_command_buffer,
 				VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 				VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
 				0, 1u, &memoryBarrier, 0u, nullptr, 0u, nullptr);
@@ -5494,8 +5701,8 @@ void RenderingDeviceDriverVulkan::command_insert_breadcrumb(CommandBufferID p_cm
 
 	// We write to a circular buffer. If you're getting barrier sync errors here,
 	// increase the value of BREADCRUMB_BUFFER_ENTRIES.
-	vkCmdFillBuffer((VkCommandBuffer)p_cmd_buffer.id, ((BufferInfo *)breadcrumb_buffer.id)->vk_buffer, breadcrumb_offset, sizeof(uint32_t), breadcrumb_id++);
-	vkCmdFillBuffer((VkCommandBuffer)p_cmd_buffer.id, ((BufferInfo *)breadcrumb_buffer.id)->vk_buffer, breadcrumb_offset + sizeof(uint32_t), sizeof(uint32_t), p_data);
+	vkCmdFillBuffer(command_buffer->vk_command_buffer, ((BufferInfo *)breadcrumb_buffer.id)->vk_buffer, breadcrumb_offset, sizeof(uint32_t), breadcrumb_id++);
+	vkCmdFillBuffer(command_buffer->vk_command_buffer, ((BufferInfo *)breadcrumb_buffer.id)->vk_buffer, breadcrumb_offset + sizeof(uint32_t), sizeof(uint32_t), p_data);
 	breadcrumb_offset += sizeof(uint32_t) * 2u;
 	if (breadcrumb_offset >= BREADCRUMB_BUFFER_ENTRIES * sizeof(uint32_t) * 2u) {
 		breadcrumb_offset = 0u;
@@ -5828,6 +6035,7 @@ uint64_t RenderingDeviceDriverVulkan::get_lazily_memory_used() {
 
 uint64_t RenderingDeviceDriverVulkan::limit_get(Limit p_limit) {
 	const VkPhysicalDeviceLimits &limits = physical_device_properties.limits;
+	uint64_t safe_unbounded = ((uint64_t)1 << 30);
 	switch (p_limit) {
 		case LIMIT_MAX_BOUND_UNIFORM_SETS:
 			return limits.maxBoundDescriptorSets;
@@ -5897,6 +6105,8 @@ uint64_t RenderingDeviceDriverVulkan::limit_get(Limit p_limit) {
 			return limits.maxComputeWorkGroupSize[1];
 		case LIMIT_MAX_COMPUTE_WORKGROUP_SIZE_Z:
 			return limits.maxComputeWorkGroupSize[2];
+		case LIMIT_MAX_COMPUTE_SHARED_MEMORY_SIZE:
+			return limits.maxComputeSharedMemorySize;
 		case LIMIT_MAX_VIEWPORT_DIMENSIONS_X:
 			return limits.maxViewportDimensions[0];
 		case LIMIT_MAX_VIEWPORT_DIMENSIONS_Y:
@@ -5911,20 +6121,16 @@ uint64_t RenderingDeviceDriverVulkan::limit_get(Limit p_limit) {
 			return subgroup_capabilities.supported_stages_flags_rd();
 		case LIMIT_SUBGROUP_OPERATIONS:
 			return subgroup_capabilities.supported_operations_flags_rd();
-		case LIMIT_VRS_TEXEL_WIDTH:
-			return vrs_capabilities.texel_size.x;
-		case LIMIT_VRS_TEXEL_HEIGHT:
-			return vrs_capabilities.texel_size.y;
-		case LIMIT_VRS_MAX_FRAGMENT_WIDTH:
-			return vrs_capabilities.max_fragment_size.x;
-		case LIMIT_VRS_MAX_FRAGMENT_HEIGHT:
-			return vrs_capabilities.max_fragment_size.y;
 		case LIMIT_MAX_SHADER_VARYINGS:
 			// The Vulkan spec states that built in varyings like gl_FragCoord should count against this, but in
 			// practice, that doesn't seem to be the case. The validation layers don't even complain.
 			return MIN(limits.maxVertexOutputComponents / 4, limits.maxFragmentInputComponents / 4);
-		default:
-			ERR_FAIL_V(0);
+		default: {
+#ifdef DEV_ENABLED
+			WARN_PRINT("Returning maximum value for unknown limit " + itos(p_limit) + ".");
+#endif
+			return safe_unbounded;
+		}
 	}
 }
 
@@ -5941,12 +6147,8 @@ uint64_t RenderingDeviceDriverVulkan::api_trait_get(ApiTrait p_trait) {
 
 bool RenderingDeviceDriverVulkan::has_feature(Features p_feature) {
 	switch (p_feature) {
-		case SUPPORTS_MULTIVIEW:
-			return multiview_capabilities.is_supported && multiview_capabilities.max_view_count > 1;
 		case SUPPORTS_FSR_HALF_FLOAT:
 			return shader_capabilities.shader_float16_is_supported && physical_device_features.shaderInt16 && storage_buffer_capabilities.storage_buffer_16_bit_access_is_supported;
-		case SUPPORTS_ATTACHMENT_VRS:
-			return vrs_capabilities.attachment_vrs_supported && physical_device_features.shaderStorageImageExtendedFormats;
 		case SUPPORTS_FRAGMENT_SHADER_WITH_ONLY_SIDE_EFFECTS:
 			return true;
 		case SUPPORTS_BUFFER_DEVICE_ADDRESS:
@@ -5960,6 +6162,14 @@ const RDD::MultiviewCapabilities &RenderingDeviceDriverVulkan::get_multiview_cap
 	return multiview_capabilities;
 }
 
+const RDD::FragmentShadingRateCapabilities &RenderingDeviceDriverVulkan::get_fragment_shading_rate_capabilities() {
+	return fsr_capabilities;
+}
+
+const RDD::FragmentDensityMapCapabilities &RenderingDeviceDriverVulkan::get_fragment_density_map_capabilities() {
+	return fdm_capabilities;
+}
+
 String RenderingDeviceDriverVulkan::get_api_name() const {
 	return "Vulkan";
 }
diff --git a/engine/drivers/vulkan/rendering_device_driver_vulkan.h b/engine/drivers/vulkan/rendering_device_driver_vulkan.h
index ea12450a..d3a7bd3a 100644
--- a/engine/drivers/vulkan/rendering_device_driver_vulkan.h
+++ b/engine/drivers/vulkan/rendering_device_driver_vulkan.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_DRIVER_VULKAN_H
-#define RENDERING_DEVICE_DRIVER_VULKAN_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "core/templates/paged_allocator.h"
@@ -54,6 +53,9 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 
 	struct CommandQueue;
 	struct SwapChain;
+	struct CommandBufferInfo;
+	struct RenderPassInfo;
+	struct Framebuffer;
 
 	struct Queue {
 		VkQueue queue = VK_NULL_HANDLE;
@@ -76,18 +78,6 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 		String supported_operations_desc() const;
 	};
 
-	struct VRSCapabilities {
-		bool pipeline_vrs_supported = false; // We can specify our fragment rate on a pipeline level.
-		bool primitive_vrs_supported = false; // We can specify our fragment rate on each drawcall.
-		bool attachment_vrs_supported = false; // We can provide a density map attachment on our framebuffer.
-
-		Size2i min_texel_size;
-		Size2i max_texel_size;
-		Size2i max_fragment_size;
-
-		Size2i texel_size; // The texel size we'll use
-	};
-
 	struct ShaderCapabilities {
 		bool shader_float16_is_supported = false;
 		bool shader_int8_is_supported = false;
@@ -107,6 +97,7 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 		PFN_vkAcquireNextImageKHR AcquireNextImageKHR = nullptr;
 		PFN_vkQueuePresentKHR QueuePresentKHR = nullptr;
 		PFN_vkCreateRenderPass2KHR CreateRenderPass2KHR = nullptr;
+		PFN_vkCmdEndRenderPass2KHR EndRenderPass2KHR = nullptr;
 
 		// Debug marker extensions.
 		PFN_vkCmdDebugMarkerBeginEXT CmdDebugMarkerBeginEXT = nullptr;
@@ -135,7 +126,8 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 	RDD::Capabilities device_capabilities;
 	SubgroupCapabilities subgroup_capabilities;
 	MultiviewCapabilities multiview_capabilities;
-	VRSCapabilities vrs_capabilities;
+	FragmentShadingRateCapabilities fsr_capabilities;
+	FragmentDensityMapCapabilities fdm_capabilities;
 	ShaderCapabilities shader_capabilities;
 	StorageBufferCapabilities storage_buffer_capabilities;
 	bool buffer_device_address_support = false;
@@ -155,6 +147,7 @@ class RenderingDeviceDriverVulkan : public RenderingDeviceDriver {
 	Error _initialize_device_extensions();
 	Error _check_device_features();
 	Error _check_device_capabilities();
+	void _choose_vrs_capabilities();
 	Error _add_queue_create_info(LocalVector<VkDeviceQueueCreateInfo> &r_queue_create_info);
 	Error _initialize_device(const LocalVector<VkDeviceQueueCreateInfo> &p_queue_create_info);
 	Error _initialize_allocator();
@@ -332,6 +325,7 @@ private:
 	struct CommandPool {
 		VkCommandPool vk_command_pool = VK_NULL_HANDLE;
 		CommandBufferType buffer_type = COMMAND_BUFFER_TYPE_PRIMARY;
+		LocalVector<CommandBufferInfo *> command_buffers_created;
 	};
 
 public:
@@ -339,8 +333,16 @@ public:
 	virtual bool command_pool_reset(CommandPoolID p_cmd_pool) override final;
 	virtual void command_pool_free(CommandPoolID p_cmd_pool) override final;
 
+private:
 	// ----- BUFFER -----
 
+	struct CommandBufferInfo {
+		VkCommandBuffer vk_command_buffer = VK_NULL_HANDLE;
+		Framebuffer *active_framebuffer = nullptr;
+		RenderPassInfo *active_render_pass = nullptr;
+	};
+
+public:
 	virtual CommandBufferID command_buffer_create(CommandPoolID p_cmd_pool) override final;
 	virtual bool command_buffer_begin(CommandBufferID p_cmd_buffer) override final;
 	virtual bool command_buffer_begin_secondary(CommandBufferID p_cmd_buffer, RenderPassID p_render_pass, uint32_t p_subpass, FramebufferID p_framebuffer) override final;
@@ -382,6 +384,7 @@ public:
 	virtual void swap_chain_set_max_fps(SwapChainID p_swap_chain, int p_max_fps) override final;
 	virtual void swap_chain_free(SwapChainID p_swap_chain) override final;
 
+private:
 	/*********************/
 	/**** FRAMEBUFFER ****/
 	/*********************/
@@ -389,12 +392,16 @@ public:
 	struct Framebuffer {
 		VkFramebuffer vk_framebuffer = VK_NULL_HANDLE;
 
+		// Only filled in if the framebuffer uses a fragment density map with offsets. Unused otherwise.
+		uint32_t fragment_density_map_offsets_layers = 0;
+
 		// Only filled in by a framebuffer created by a swap chain. Unused otherwise.
 		VkImage swap_chain_image = VK_NULL_HANDLE;
 		VkImageSubresourceRange swap_chain_image_subresource_range = {};
 		bool swap_chain_acquired = false;
 	};
 
+public:
 	virtual FramebufferID framebuffer_create(RenderPassID p_render_pass, VectorView<TextureID> p_attachments, uint32_t p_width, uint32_t p_height) override final;
 	virtual void framebuffer_free(FramebufferID p_framebuffer) override final;
 
@@ -572,9 +579,16 @@ public:
 	/**** RENDERING ****/
 	/*******************/
 
+private:
 	// ----- SUBPASS -----
 
-	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) override final;
+	struct RenderPassInfo {
+		VkRenderPass vk_render_pass = VK_NULL_HANDLE;
+		bool uses_fragment_density_map_offsets = false;
+	};
+
+public:
+	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) override final;
 	virtual void render_pass_free(RenderPassID p_render_pass) override final;
 
 	// ----- COMMANDS -----
@@ -692,6 +706,8 @@ public:
 	virtual uint64_t api_trait_get(ApiTrait p_trait) override final;
 	virtual bool has_feature(Features p_feature) override final;
 	virtual const MultiviewCapabilities &get_multiview_capabilities() override final;
+	virtual const FragmentShadingRateCapabilities &get_fragment_shading_rate_capabilities() override final;
+	virtual const FragmentDensityMapCapabilities &get_fragment_density_map_capabilities() override final;
 	virtual String get_api_name() const override final;
 	virtual String get_api_version() const override final;
 	virtual String get_pipeline_cache_uuid() const override final;
@@ -709,7 +725,9 @@ private:
 			TextureInfo,
 			VertexFormatInfo,
 			ShaderInfo,
-			UniformSetInfo>;
+			UniformSetInfo,
+			RenderPassInfo,
+			CommandBufferInfo>;
 	PagedAllocator<VersatileResource, true> resources_allocator;
 
 	/******************/
@@ -720,5 +738,3 @@ public:
 };
 
 using VKC = RenderingContextDriverVulkan;
-
-#endif // RENDERING_DEVICE_DRIVER_VULKAN_H
diff --git a/engine/drivers/vulkan/vulkan_hooks.h b/engine/drivers/vulkan/vulkan_hooks.h
index 82bcc9a0..62eccc46 100644
--- a/engine/drivers/vulkan/vulkan_hooks.h
+++ b/engine/drivers/vulkan/vulkan_hooks.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VULKAN_HOOKS_H
-#define VULKAN_HOOKS_H
+#pragma once
 
 #include "drivers/vulkan/godot_vulkan.h"
 
@@ -46,5 +45,3 @@ public:
 	virtual void set_direct_queue_family_and_index(uint32_t p_queue_family_index, uint32_t p_queue_index) = 0;
 	static VulkanHooks *get_singleton() { return singleton; }
 };
-
-#endif // VULKAN_HOOKS_H
diff --git a/engine/drivers/wasapi/audio_driver_wasapi.cpp b/engine/drivers/wasapi/audio_driver_wasapi.cpp
index 28b3a3b6..bbccc6f2 100644
--- a/engine/drivers/wasapi/audio_driver_wasapi.cpp
+++ b/engine/drivers/wasapi/audio_driver_wasapi.cpp
@@ -35,8 +35,6 @@
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
 
-#include <stdint.h> // INT32_MAX
-
 #include <functiondiscoverykeys.h>
 
 #include <wrl/client.h>
@@ -128,11 +126,7 @@ static bool default_input_device_changed = false;
 static int output_reinit_countdown = 0;
 static int input_reinit_countdown = 0;
 
-// Silence warning due to a COM API weirdness (GH-35194).
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#endif
+GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor") // Silence warning due to a COM API weirdness (GH-35194).
 
 class CMMNotificationClient : public IMMNotificationClient {
 	LONG _cRef = 1;
@@ -198,9 +192,7 @@ public:
 	}
 };
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+GODOT_GCC_WARNING_POP
 
 static CMMNotificationClient notif_client;
 
@@ -458,7 +450,7 @@ Error AudioDriverWASAPI::audio_device_init(AudioDeviceWASAPI *p_device, bool p_i
 		// so we need to select the closest multiple to the user-specified latency.
 		UINT32 desired_period_frames = target_latency_ms * mix_rate / 1000;
 		UINT32 period_frames = (desired_period_frames / fundamental_period_frames) * fundamental_period_frames;
-		if (ABS((int64_t)period_frames - (int64_t)desired_period_frames) > ABS((int64_t)(period_frames + fundamental_period_frames) - (int64_t)desired_period_frames)) {
+		if (Math::abs((int64_t)period_frames - (int64_t)desired_period_frames) > Math::abs((int64_t)(period_frames + fundamental_period_frames) - (int64_t)desired_period_frames)) {
 			period_frames = period_frames + fundamental_period_frames;
 		}
 		period_frames = CLAMP(period_frames, min_period_frames, max_period_frames);
diff --git a/engine/drivers/wasapi/audio_driver_wasapi.h b/engine/drivers/wasapi/audio_driver_wasapi.h
index 367c3060..8a820e8f 100644
--- a/engine/drivers/wasapi/audio_driver_wasapi.h
+++ b/engine/drivers/wasapi/audio_driver_wasapi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_WASAPI_H
-#define AUDIO_DRIVER_WASAPI_H
+#pragma once
 
 #ifdef WASAPI_ENABLED
 
@@ -123,5 +122,3 @@ public:
 };
 
 #endif // WASAPI_ENABLED
-
-#endif // AUDIO_DRIVER_WASAPI_H
diff --git a/engine/drivers/windows/dir_access_windows.cpp b/engine/drivers/windows/dir_access_windows.cpp
index 3ddbde72..141d2010 100644
--- a/engine/drivers/windows/dir_access_windows.cpp
+++ b/engine/drivers/windows/dir_access_windows.cpp
@@ -70,17 +70,17 @@ struct DirAccessWindowsPrivate {
 };
 
 String DirAccessWindows::fix_path(const String &p_path) const {
-	String r_path = DirAccess::fix_path(p_path.trim_prefix(R"(\\?\)").replace("\\", "/"));
+	String r_path = DirAccess::fix_path(p_path.trim_prefix(R"(\\?\)").replace_char('\\', '/'));
 	if (r_path.ends_with(":")) {
 		r_path += "/";
 	}
 	if (r_path.is_relative_path()) {
-		r_path = current_dir.trim_prefix(R"(\\?\)").replace("\\", "/").path_join(r_path);
+		r_path = current_dir.trim_prefix(R"(\\?\)").replace_char('\\', '/').path_join(r_path);
 	} else if (r_path == ".") {
-		r_path = current_dir.trim_prefix(R"(\\?\)").replace("\\", "/");
+		r_path = current_dir.trim_prefix(R"(\\?\)").replace_char('\\', '/');
 	}
 	r_path = r_path.simplify_path();
-	r_path = r_path.replace("/", "\\");
+	r_path = r_path.replace_char('/', '\\');
 	if (!r_path.is_network_share_path() && !r_path.begins_with(R"(\\?\)")) {
 		r_path = R"(\\?\)" + r_path;
 	}
@@ -167,7 +167,7 @@ Error DirAccessWindows::change_dir(String p_dir) {
 		str_len = GetCurrentDirectoryW(0, nullptr);
 		real_current_dir_name.resize(str_len + 1);
 		GetCurrentDirectoryW(real_current_dir_name.size(), (LPWSTR)real_current_dir_name.ptrw());
-		String new_dir = String::utf16((const char16_t *)real_current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace("\\", "/");
+		String new_dir = String::utf16((const char16_t *)real_current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace_char('\\', '/');
 		if (!new_dir.begins_with(base)) {
 			worked = false;
 		}
@@ -215,12 +215,12 @@ Error DirAccessWindows::make_dir(String p_dir) {
 }
 
 String DirAccessWindows::get_current_dir(bool p_include_drive) const {
-	String cdir = current_dir.trim_prefix(R"(\\?\)").replace("\\", "/");
+	String cdir = current_dir.trim_prefix(R"(\\?\)").replace_char('\\', '/');
 	String base = _get_root_path();
 	if (!base.is_empty()) {
 		String bd = cdir.replace_first(base, "");
 		if (bd.begins_with("/")) {
-			return _get_root_string() + bd.substr(1, bd.length());
+			return _get_root_string() + bd.substr(1);
 		} else {
 			return _get_root_string() + bd;
 		}
@@ -391,6 +391,38 @@ bool DirAccessWindows::is_case_sensitive(const String &p_path) const {
 	}
 }
 
+typedef struct {
+	ULONGLONG LowPart;
+	ULONGLONG HighPart;
+} GD_FILE_ID_128;
+
+typedef struct {
+	ULONGLONG VolumeSerialNumber;
+	GD_FILE_ID_128 FileId;
+} GD_FILE_ID_INFO;
+
+bool DirAccessWindows::is_equivalent(const String &p_path_a, const String &p_path_b) const {
+	String f1 = fix_path(p_path_a);
+	GD_FILE_ID_INFO st1;
+	HANDLE h1 = ::CreateFileW((LPCWSTR)(f1.utf16().get_data()), FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+	if (h1 == INVALID_HANDLE_VALUE) {
+		return DirAccess::is_equivalent(p_path_a, p_path_b);
+	}
+	::GetFileInformationByHandleEx(h1, (FILE_INFO_BY_HANDLE_CLASS)0x12 /*FileIdInfo*/, &st1, sizeof(st1));
+	::CloseHandle(h1);
+
+	String f2 = fix_path(p_path_b);
+	GD_FILE_ID_INFO st2;
+	HANDLE h2 = ::CreateFileW((LPCWSTR)(f2.utf16().get_data()), FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+	if (h2 == INVALID_HANDLE_VALUE) {
+		return DirAccess::is_equivalent(p_path_a, p_path_b);
+	}
+	::GetFileInformationByHandleEx(h2, (FILE_INFO_BY_HANDLE_CLASS)0x12 /*FileIdInfo*/, &st2, sizeof(st2));
+	::CloseHandle(h2);
+
+	return (st1.VolumeSerialNumber == st2.VolumeSerialNumber) && (st1.FileId.LowPart == st2.FileId.LowPart) && (st1.FileId.HighPart == st2.FileId.HighPart);
+}
+
 bool DirAccessWindows::is_link(String p_file) {
 	String f = fix_path(p_file);
 
@@ -419,7 +451,7 @@ String DirAccessWindows::read_link(String p_file) {
 	GetFinalPathNameByHandleW(hfile, (LPWSTR)cs.ptrw(), ret, VOLUME_NAME_DOS | FILE_NAME_NORMALIZED);
 	CloseHandle(hfile);
 
-	return String::utf16((const char16_t *)cs.ptr(), ret).trim_prefix(R"(\\?\)").replace("\\", "/");
+	return String::utf16((const char16_t *)cs.ptr(), ret).trim_prefix(R"(\\?\)").replace_char('\\', '/');
 }
 
 Error DirAccessWindows::create_link(String p_source, String p_target) {
diff --git a/engine/drivers/windows/dir_access_windows.h b/engine/drivers/windows/dir_access_windows.h
index 46755cbf..9bc4bc7c 100644
--- a/engine/drivers/windows/dir_access_windows.h
+++ b/engine/drivers/windows/dir_access_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIR_ACCESS_WINDOWS_H
-#define DIR_ACCESS_WINDOWS_H
+#pragma once
 
 #ifdef WINDOWS_ENABLED
 
@@ -38,6 +37,7 @@
 struct DirAccessWindowsPrivate;
 
 class DirAccessWindows : public DirAccess {
+	GDSOFTCLASS(DirAccessWindows, DirAccess);
 	enum {
 		MAX_DRIVES = 26
 	};
@@ -85,11 +85,10 @@ public:
 
 	virtual String get_filesystem_type() const override;
 	virtual bool is_case_sensitive(const String &p_path) const override;
+	virtual bool is_equivalent(const String &p_path_a, const String &p_path_b) const override;
 
 	DirAccessWindows();
 	~DirAccessWindows();
 };
 
 #endif // WINDOWS_ENABLED
-
-#endif // DIR_ACCESS_WINDOWS_H
diff --git a/engine/drivers/windows/file_access_windows.cpp b/engine/drivers/windows/file_access_windows.cpp
index a8e2a685..c7f7ddd7 100644
--- a/engine/drivers/windows/file_access_windows.cpp
+++ b/engine/drivers/windows/file_access_windows.cpp
@@ -87,10 +87,10 @@ String FileAccessWindows::fix_path(const String &p_path) const {
 		size_t str_len = GetCurrentDirectoryW(0, nullptr);
 		current_dir_name.resize(str_len + 1);
 		GetCurrentDirectoryW(current_dir_name.size(), (LPWSTR)current_dir_name.ptrw());
-		r_path = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace("\\", "/").path_join(r_path);
+		r_path = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace_char('\\', '/').path_join(r_path);
 	}
 	r_path = r_path.simplify_path();
-	r_path = r_path.replace("/", "\\");
+	r_path = r_path.replace_char('/', '\\');
 	if (!r_path.is_network_share_path() && !r_path.begins_with(R"(\\?\)")) {
 		r_path = R"(\\?\)" + r_path;
 	}
@@ -282,7 +282,7 @@ String FileAccessWindows::get_path() const {
 }
 
 String FileAccessWindows::get_path_absolute() const {
-	return path.trim_prefix(R"(\\?\)").replace("\\", "/");
+	return path.trim_prefix(R"(\\?\)").replace_char('\\', '/');
 }
 
 bool FileAccessWindows::is_open() const {
@@ -418,7 +418,7 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
 		file = file.substr(0, file.length() - 1);
 	}
 
-	HANDLE handle = CreateFileW((LPCWSTR)(file.utf16().get_data()), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+	HANDLE handle = CreateFileW((LPCWSTR)(file.utf16().get_data()), FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
 
 	if (handle != INVALID_HANDLE_VALUE) {
 		FILETIME ft_create, ft_write;
@@ -453,6 +453,78 @@ uint64_t FileAccessWindows::_get_modified_time(const String &p_file) {
 	return 0;
 }
 
+uint64_t FileAccessWindows::_get_access_time(const String &p_file) {
+	if (is_path_invalid(p_file)) {
+		return 0;
+	}
+
+	String file = fix_path(p_file);
+	if (file.ends_with("\\") && file != "\\") {
+		file = file.substr(0, file.length() - 1);
+	}
+
+	HANDLE handle = CreateFileW((LPCWSTR)(file.utf16().get_data()), FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+
+	if (handle != INVALID_HANDLE_VALUE) {
+		FILETIME ft_create, ft_access;
+
+		bool status = GetFileTime(handle, &ft_create, &ft_access, nullptr);
+
+		CloseHandle(handle);
+
+		if (status) {
+			uint64_t ret = 0;
+
+			// If access time is invalid, fallback to creation time.
+			if (ft_access.dwHighDateTime == 0 && ft_access.dwLowDateTime == 0) {
+				ret = ft_create.dwHighDateTime;
+				ret <<= 32;
+				ret |= ft_create.dwLowDateTime;
+			} else {
+				ret = ft_access.dwHighDateTime;
+				ret <<= 32;
+				ret |= ft_access.dwLowDateTime;
+			}
+
+			const uint64_t WINDOWS_TICKS_PER_SECOND = 10000000;
+			const uint64_t TICKS_TO_UNIX_EPOCH = 116444736000000000LL;
+
+			if (ret >= TICKS_TO_UNIX_EPOCH) {
+				return (ret - TICKS_TO_UNIX_EPOCH) / WINDOWS_TICKS_PER_SECOND;
+			}
+		}
+	}
+
+	ERR_FAIL_V_MSG(0, "Failed to get access time for: " + p_file + "");
+}
+
+int64_t FileAccessWindows::_get_size(const String &p_file) {
+	if (is_path_invalid(p_file)) {
+		return 0;
+	}
+
+	String file = fix_path(p_file);
+	if (file.ends_with("\\") && file != "\\") {
+		file = file.substr(0, file.length() - 1);
+	}
+
+	DWORD file_attr = GetFileAttributesW((LPCWSTR)(file.utf16().get_data()));
+	HANDLE handle = CreateFileW((LPCWSTR)(file.utf16().get_data()), FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+
+	if (handle != INVALID_HANDLE_VALUE && !(file_attr & FILE_ATTRIBUTE_DIRECTORY)) {
+		LARGE_INTEGER fsize;
+
+		bool status = GetFileSizeEx(handle, &fsize);
+
+		CloseHandle(handle);
+
+		if (status) {
+			return (int64_t)fsize.QuadPart;
+		}
+	}
+	ERR_FAIL_V_MSG(-1, "Failed to get size for: " + p_file + "");
+}
+
 BitField<FileAccess::UnixPermissionFlags> FileAccessWindows::_get_unix_permissions(const String &p_file) {
 	return 0;
 }
diff --git a/engine/drivers/windows/file_access_windows.h b/engine/drivers/windows/file_access_windows.h
index bf848d63..706fcd0c 100644
--- a/engine/drivers/windows/file_access_windows.h
+++ b/engine/drivers/windows/file_access_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_WINDOWS_H
-#define FILE_ACCESS_WINDOWS_H
+#pragma once
 
 #ifdef WINDOWS_ENABLED
 
@@ -39,6 +38,7 @@
 #include <stdio.h>
 
 class FileAccessWindows : public FileAccess {
+	GDSOFTCLASS(FileAccessWindows, FileAccess);
 	FILE *f = nullptr;
 	int flags = 0;
 	void check_errors(bool p_write = false) const;
@@ -80,6 +80,8 @@ public:
 	virtual bool file_exists(const String &p_name) override; ///< return true if a file exists
 
 	uint64_t _get_modified_time(const String &p_file) override;
+	uint64_t _get_access_time(const String &p_file) override;
+	int64_t _get_size(const String &p_file) override;
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override;
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override;
 
@@ -98,5 +100,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED
-
-#endif // FILE_ACCESS_WINDOWS_H
diff --git a/engine/drivers/windows/file_access_windows_pipe.cpp b/engine/drivers/windows/file_access_windows_pipe.cpp
index 6960e9d7..94dec737 100644
--- a/engine/drivers/windows/file_access_windows_pipe.cpp
+++ b/engine/drivers/windows/file_access_windows_pipe.cpp
@@ -60,7 +60,7 @@ Error FileAccessWindowsPipe::open_internal(const String &p_path, int p_mode_flag
 	path_src = p_path;
 	ERR_FAIL_COND_V_MSG(fd[0] != nullptr || fd[1] != nullptr, ERR_ALREADY_IN_USE, "Pipe is already in use.");
 
-	path = String("\\\\.\\pipe\\LOCAL\\") + p_path.replace("pipe://", "").replace("/", "_");
+	path = String("\\\\.\\pipe\\LOCAL\\") + p_path.replace("pipe://", "").replace_char('/', '_');
 
 	HANDLE h = CreateFileW((LPCWSTR)path.utf16().get_data(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
 	if (h == INVALID_HANDLE_VALUE) {
diff --git a/engine/drivers/windows/file_access_windows_pipe.h b/engine/drivers/windows/file_access_windows_pipe.h
index 0eb570ae..38a5d452 100644
--- a/engine/drivers/windows/file_access_windows_pipe.h
+++ b/engine/drivers/windows/file_access_windows_pipe.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_WINDOWS_PIPE_H
-#define FILE_ACCESS_WINDOWS_PIPE_H
+#pragma once
 
 #ifdef WINDOWS_ENABLED
 
@@ -38,7 +37,9 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
 class FileAccessWindowsPipe : public FileAccess {
+	GDSOFTCLASS(FileAccessWindowsPipe, FileAccess);
 	HANDLE fd[2] = { nullptr, nullptr };
 
 	mutable Error last_error = OK;
@@ -75,6 +76,8 @@ public:
 	virtual bool file_exists(const String &p_name) override { return false; }
 
 	uint64_t _get_modified_time(const String &p_file) override { return 0; }
+	virtual uint64_t _get_access_time(const String &p_file) override { return 0; }
+	virtual int64_t _get_size(const String &p_file) override { return -1; }
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override { return 0; }
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override { return ERR_UNAVAILABLE; }
 
@@ -90,5 +93,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED
-
-#endif // FILE_ACCESS_WINDOWS_PIPE_H
diff --git a/engine/drivers/windows/ip_windows.h b/engine/drivers/windows/ip_windows.h
index 5788d33e..4123b41c 100644
--- a/engine/drivers/windows/ip_windows.h
+++ b/engine/drivers/windows/ip_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IP_WINDOWS_H
-#define IP_WINDOWS_H
+#pragma once
 
 #if defined(WINDOWS_ENABLED)
 
@@ -50,5 +49,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED
-
-#endif // IP_WINDOWS_H
diff --git a/engine/drivers/windows/net_socket_winsock.h b/engine/drivers/windows/net_socket_winsock.h
index 5c3445b8..af6a74c6 100644
--- a/engine/drivers/windows/net_socket_winsock.h
+++ b/engine/drivers/windows/net_socket_winsock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NET_SOCKET_WINSOCK_H
-#define NET_SOCKET_WINSOCK_H
+#pragma once
 
 #ifdef WINDOWS_ENABLED
 
@@ -98,5 +97,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED
-
-#endif // NET_SOCKET_WINSOCK_H
diff --git a/engine/drivers/windows/thread_windows.h b/engine/drivers/windows/thread_windows.h
index 1d6ab2c4..bed1d353 100644
--- a/engine/drivers/windows/thread_windows.h
+++ b/engine/drivers/windows/thread_windows.h
@@ -28,13 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THREAD_WINDOWS_H
-#define THREAD_WINDOWS_H
+#pragma once
 
 #ifdef WINDOWS_ENABLED
 
 void init_thread_win();
 
 #endif // WINDOWS_ENABLED
-
-#endif // THREAD_WINDOWS_H
diff --git a/engine/drivers/winmidi/midi_driver_winmidi.h b/engine/drivers/winmidi/midi_driver_winmidi.h
index 7a752522..cfda2e96 100644
--- a/engine/drivers/winmidi/midi_driver_winmidi.h
+++ b/engine/drivers/winmidi/midi_driver_winmidi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MIDI_DRIVER_WINMIDI_H
-#define MIDI_DRIVER_WINMIDI_H
+#pragma once
 
 #ifdef WINMIDI_ENABLED
 
@@ -56,5 +55,3 @@ public:
 };
 
 #endif // WINMIDI_ENABLED
-
-#endif // MIDI_DRIVER_WINMIDI_H
diff --git a/engine/drivers/xaudio2/audio_driver_xaudio2.h b/engine/drivers/xaudio2/audio_driver_xaudio2.h
index c659b6ff..1946cdb5 100644
--- a/engine/drivers/xaudio2/audio_driver_xaudio2.h
+++ b/engine/drivers/xaudio2/audio_driver_xaudio2.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_XAUDIO2_H
-#define AUDIO_DRIVER_XAUDIO2_H
+#pragma once
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
@@ -108,5 +107,3 @@ public:
 	AudioDriverXAudio2();
 	~AudioDriverXAudio2() {}
 };
-
-#endif // AUDIO_DRIVER_XAUDIO2_H
diff --git a/engine/editor/SCsub b/engine/editor/SCsub
index 9fcaf612..bcd6492d 100644
--- a/engine/editor/SCsub
+++ b/engine/editor/SCsub
@@ -5,7 +5,6 @@ Import("env")
 
 env.editor_sources = []
 
-import glob
 import os
 
 import editor_builders
@@ -17,17 +16,16 @@ if env.editor_build:
     def doc_data_class_path_builder(target, source, env):
         paths = dict(sorted(source[0].read().items()))
         data = "\n".join([f'\t{{"{key}", "{value}"}},' for key, value in paths.items()])
-        with methods.generated_wrapper(target) as file:
+        with methods.generated_wrapper(str(target[0])) as file:
             file.write(
                 f"""\
-static const int _doc_data_class_path_count = {len(paths)};
-
 struct _DocDataClassPath {{
 	const char *name;
 	const char *path;
 }};
 
-static const _DocDataClassPath _doc_data_class_paths[{len(env.doc_class_path) + 1}] = {{
+inline constexpr int _doc_data_class_path_count = {len(paths)};
+inline constexpr _DocDataClassPath _doc_data_class_paths[{len(env.doc_class_path) + 1}] = {{
 {data}
 	{{nullptr, nullptr}},
 }};
@@ -42,7 +40,7 @@ static const _DocDataClassPath _doc_data_class_paths[{len(env.doc_class_path) +
         exp_inc = "\n".join([f'#include "platform/{p}/export/export.h"' for p in platforms])
         exp_reg = "\n".join([f"\tregister_{p}_exporter();" for p in platforms])
         exp_type = "\n".join([f"\tregister_{p}_exporter_types();" for p in platforms])
-        with methods.generated_wrapper(target) as file:
+        with methods.generated_wrapper(str(target[0])) as file:
             file.write(
                 f"""\
 #include "register_exporters.h"
@@ -83,7 +81,6 @@ void register_exporter_types() {{
             docs += Glob(d + "/*.xml")  # Custom.
 
     docs = sorted(docs)
-    env.Depends("#editor/doc_data_compressed.gen.h", docs)
     env.CommandNoCache(
         "#editor/doc_data_compressed.gen.h",
         docs,
@@ -97,40 +94,31 @@ void register_exporter_types() {{
     # Generated with `make include-list` for each resource.
 
     # Editor translations
-    tlist = glob.glob(env.Dir("#editor/translations/editor").abspath + "/*.po")
-    env.Depends("#editor/editor_translations.gen.h", tlist)
     env.CommandNoCache(
         "#editor/editor_translations.gen.h",
-        tlist,
-        env.Run(editor_builders.make_editor_translations_header),
+        Glob("#editor/translations/editor/*"),
+        env.Run(editor_builders.make_translations_header),
     )
 
     # Property translations
-    tlist = glob.glob(env.Dir("#editor/translations/properties").abspath + "/*.po")
-    env.Depends("#editor/property_translations.gen.h", tlist)
     env.CommandNoCache(
         "#editor/property_translations.gen.h",
-        tlist,
-        env.Run(editor_builders.make_property_translations_header),
+        Glob("#editor/translations/properties/*"),
+        env.Run(editor_builders.make_translations_header),
     )
 
     # Documentation translations
-    tlist = glob.glob(env.Dir("#doc/translations").abspath + "/*.po")
-    env.Depends("#editor/doc_translations.gen.h", tlist)
     env.CommandNoCache(
         "#editor/doc_translations.gen.h",
-        tlist,
-        env.Run(editor_builders.make_doc_translations_header),
+        Glob("#doc/translations/*"),
+        env.Run(editor_builders.make_translations_header),
     )
 
     # Extractable translations
-    tlist = glob.glob(env.Dir("#editor/translations/extractable").abspath + "/*.po")
-    tlist.extend(glob.glob(env.Dir("#editor/translations/extractable").abspath + "/extractable.pot"))
-    env.Depends("#editor/extractable_translations.gen.h", tlist)
     env.CommandNoCache(
         "#editor/extractable_translations.gen.h",
-        tlist,
-        env.Run(editor_builders.make_extractable_translations_header),
+        Glob("#editor/translations/extractable/*"),
+        env.Run(editor_builders.make_translations_header),
     )
 
     env.add_source_files(env.editor_sources, "*.cpp")
diff --git a/engine/editor/action_map_editor.cpp b/engine/editor/action_map_editor.cpp
index b830c71c..bcf8309a 100644
--- a/engine/editor/action_map_editor.cpp
+++ b/engine/editor/action_map_editor.cpp
@@ -257,6 +257,8 @@ Variant ActionMapEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
 	label->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	action_tree->set_drag_preview(label);
 
+	get_viewport()->gui_set_drag_description(vformat(RTR("Action %s"), name));
+
 	Dictionary drag_data;
 
 	if (selected->has_meta("__action")) {
@@ -267,6 +269,8 @@ Variant ActionMapEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
 		drag_data["input_type"] = "event";
 	}
 
+	drag_data["source"] = selected->get_instance_id();
+
 	action_tree->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN);
 
 	return drag_data;
@@ -278,9 +282,11 @@ bool ActionMapEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
 		return false;
 	}
 
+	TreeItem *source = Object::cast_to<TreeItem>(ObjectDB::get_instance(d["source"].operator ObjectID()));
 	TreeItem *selected = action_tree->get_selected();
-	TreeItem *item = action_tree->get_item_at_position(p_point);
-	if (!selected || !item || item == selected) {
+
+	TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? selected : action_tree->get_item_at_position(p_point);
+	if (!selected || !item || item == source) {
 		return false;
 	}
 
@@ -303,13 +309,13 @@ void ActionMapEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data,
 	}
 
 	TreeItem *selected = action_tree->get_selected();
-	TreeItem *target = action_tree->get_item_at_position(p_point);
-	bool drop_above = action_tree->get_drop_section_at_position(p_point) == -1;
-
+	TreeItem *target = (p_point == Vector2(Math::INF, Math::INF)) ? selected : action_tree->get_item_at_position(p_point);
 	if (!target) {
 		return;
 	}
 
+	bool drop_above = ((p_point == Vector2(Math::INF, Math::INF)) ? action_tree->get_drop_section_at_position(action_tree->get_item_rect(target).position) : action_tree->get_drop_section_at_position(p_point)) == -1;
+
 	Dictionary d = p_data;
 	if (d["input_type"] == "action") {
 		// Change action order.
@@ -501,8 +507,8 @@ void ActionMapEditor::update_action_list(const Vector<ActionInfo> &p_action_info
 			}
 
 			// Third Column - Buttons
-			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Edit")), BUTTON_EDIT_EVENT, false, TTR("Edit Event"));
-			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Remove")), BUTTON_REMOVE_EVENT, false, TTR("Remove Event"));
+			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Edit")), BUTTON_EDIT_EVENT, false, TTR("Edit Event"), TTR("Edit Event"));
+			event_item->add_button(2, action_tree->get_editor_theme_icon(SNAME("Remove")), BUTTON_REMOVE_EVENT, false, TTR("Remove Event"), TTR("Remove Event"));
 			event_item->set_button_color(2, 0, Color(1, 1, 1, 0.75));
 			event_item->set_button_color(2, 1, Color(1, 1, 1, 0.75));
 		}
@@ -543,6 +549,7 @@ ActionMapEditor::ActionMapEditor() {
 	action_list_search = memnew(LineEdit);
 	action_list_search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	action_list_search->set_placeholder(TTR("Filter by Name"));
+	action_list_search->set_accessibility_name(TTRC("Filter by Name"));
 	action_list_search->set_clear_button_enabled(true);
 	action_list_search->connect(SceneStringName(text_changed), callable_mp(this, &ActionMapEditor::_search_term_updated));
 	top_hbox->add_child(action_list_search);
@@ -550,6 +557,7 @@ ActionMapEditor::ActionMapEditor() {
 	action_list_search_by_event = memnew(EventListenerLineEdit);
 	action_list_search_by_event->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	action_list_search_by_event->set_stretch_ratio(0.75);
+	action_list_search_by_event->set_accessibility_name(TTRC("Action Event"));
 	action_list_search_by_event->connect("event_changed", callable_mp(this, &ActionMapEditor::_search_by_event));
 	action_list_search_by_event->connect(SceneStringName(focus_entered), callable_mp(this, &ActionMapEditor::_on_filter_focused));
 	action_list_search_by_event->connect(SceneStringName(focus_exited), callable_mp(this, &ActionMapEditor::_on_filter_unfocused));
@@ -569,6 +577,7 @@ ActionMapEditor::ActionMapEditor() {
 	add_edit = memnew(LineEdit);
 	add_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	add_edit->set_placeholder(TTR("Add New Action"));
+	add_edit->set_accessibility_name(TTRC("Add New Action"));
 	add_edit->set_clear_button_enabled(true);
 	add_edit->set_keep_editing_on_text_submit(true);
 	add_edit->connect(SceneStringName(text_changed), callable_mp(this, &ActionMapEditor::_add_edit_text_changed));
@@ -597,6 +606,7 @@ ActionMapEditor::ActionMapEditor() {
 	// Action Editor Tree
 	action_tree = memnew(Tree);
 	action_tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	action_tree->set_accessibility_name(TTRC("Action Map"));
 	action_tree->set_columns(3);
 	action_tree->set_hide_root(true);
 	action_tree->set_column_titles_visible(true);
diff --git a/engine/editor/action_map_editor.h b/engine/editor/action_map_editor.h
index 017296bf..09b7c7f8 100644
--- a/engine/editor/action_map_editor.h
+++ b/engine/editor/action_map_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ACTION_MAP_EDITOR_H
-#define ACTION_MAP_EDITOR_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -132,5 +131,3 @@ public:
 
 	ActionMapEditor();
 };
-
-#endif // ACTION_MAP_EDITOR_H
diff --git a/engine/editor/add_metadata_dialog.cpp b/engine/editor/add_metadata_dialog.cpp
index b9136d2f..921df291 100644
--- a/engine/editor/add_metadata_dialog.cpp
+++ b/engine/editor/add_metadata_dialog.cpp
@@ -41,11 +41,13 @@ AddMetadataDialog::AddMetadataDialog() {
 	hbc->add_child(memnew(Label(TTR("Name:"))));
 
 	add_meta_name = memnew(LineEdit);
+	add_meta_name->set_accessibility_name(TTRC("Name:"));
 	add_meta_name->set_custom_minimum_size(Size2(200 * EDSCALE, 1));
 	hbc->add_child(add_meta_name);
 	hbc->add_child(memnew(Label(TTR("Type:"))));
 
 	add_meta_type = memnew(OptionButton);
+	add_meta_type->set_accessibility_name(TTRC("Type:"));
 
 	hbc->add_child(add_meta_type);
 
diff --git a/engine/editor/add_metadata_dialog.h b/engine/editor/add_metadata_dialog.h
index 30c198e4..b613df4e 100644
--- a/engine/editor/add_metadata_dialog.h
+++ b/engine/editor/add_metadata_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ADD_METADATA_DIALOG_H
-#define ADD_METADATA_DIALOG_H
+#pragma once
 
 #include "editor/gui/editor_validation_panel.h"
 #include "scene/gui/dialogs.h"
@@ -56,4 +55,3 @@ private:
 	OptionButton *add_meta_type = nullptr;
 	EditorValidationPanel *validation_panel = nullptr;
 };
-#endif // ADD_METADATA_DIALOG_H
diff --git a/engine/editor/animation_bezier_editor.cpp b/engine/editor/animation_bezier_editor.cpp
index 2c8fa257..a71e55e2 100644
--- a/engine/editor/animation_bezier_editor.cpp
+++ b/engine/editor/animation_bezier_editor.cpp
@@ -60,8 +60,12 @@ void AnimationBezierTrackEdit::_draw_track(int p_track, const Color &p_color) {
 
 	for (int i = 0; i < animation->track_get_key_count(p_track); i++) {
 		real_t ofs = animation->track_get_key_time(p_track, i);
-		if (moving_selection && selection.has(IntPair(p_track, i))) {
-			ofs += moving_selection_offset.x;
+		if (selection.has(IntPair(p_track, i))) {
+			if (moving_selection) {
+				ofs += moving_selection_offset.x;
+			} else if (scaling_selection) {
+				ofs += -scaling_selection_offset.x + (ofs - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+			}
 		}
 
 		key_order[ofs] = i;
@@ -83,9 +87,14 @@ void AnimationBezierTrackEdit::_draw_track(int p_track, const Color &p_color) {
 			out_handle = moving_handle_right;
 		}
 
-		if (moving_selection && selection.has(IntPair(p_track, i))) {
-			offset += moving_selection_offset.x;
-			height += moving_selection_offset.y;
+		if (selection.has(IntPair(p_track, i))) {
+			if (moving_selection) {
+				offset += moving_selection_offset.x;
+				height += moving_selection_offset.y;
+			} else if (scaling_selection) {
+				offset += -scaling_selection_offset.x + (offset - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+				height += -scaling_selection_offset.y + (height - scaling_selection_pivot.y) * (scaling_selection_scale.y - 1);
+			}
 		}
 
 		out_handle += Vector2(offset, height);
@@ -97,9 +106,14 @@ void AnimationBezierTrackEdit::_draw_track(int p_track, const Color &p_color) {
 			in_handle = moving_handle_left;
 		}
 
-		if (moving_selection && selection.has(IntPair(p_track, i_n))) {
-			offset_n += moving_selection_offset.x;
-			height_n += moving_selection_offset.y;
+		if (selection.has(IntPair(p_track, i_n))) {
+			if (moving_selection) {
+				offset_n += moving_selection_offset.x;
+				height_n += moving_selection_offset.y;
+			} else if (scaling_selection) {
+				offset_n += -scaling_selection_offset.x + (offset_n - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+				height_n += -scaling_selection_offset.y + (height_n - scaling_selection_pivot.y) * (scaling_selection_scale.y - 1);
+			}
 		}
 
 		in_handle += Vector2(offset_n, height_n);
@@ -231,6 +245,15 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 			selected_icon = get_editor_theme_icon(SNAME("KeyBezierSelected"));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation bezier track editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (animation.is_null()) {
 				return;
@@ -506,29 +529,46 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 				}
 			}
 
+			const bool draw_selection_handles = selection.size() > 1;
+			LocalVector<Point2> selected_pos;
+
 			// Draw editor handles.
 			{
 				edit_points.clear();
 				float scale = timeline->get_zoom_scale();
 
 				for (int i = 0; i < track_count; ++i) {
-					if (!_is_track_curves_displayed(i) || locked_tracks.has(i)) {
+					bool draw_track = _is_track_curves_displayed(i) && !locked_tracks.has(i);
+					if (!draw_selection_handles && !draw_track) {
 						continue;
 					}
 
 					int key_count = animation->track_get_key_count(i);
-
 					for (int j = 0; j < key_count; ++j) {
 						float offset = animation->track_get_key_time(i, j);
 						float value = animation->bezier_track_get_key_value(i, j);
+						bool is_selected = selection.has(IntPair(i, j));
 
-						if (moving_selection && selection.has(IntPair(i, j))) {
-							offset += moving_selection_offset.x;
-							value += moving_selection_offset.y;
+						if (is_selected) {
+							if (moving_selection) {
+								offset += moving_selection_offset.x;
+								value += moving_selection_offset.y;
+							} else if (scaling_selection) {
+								offset += -scaling_selection_offset.x + (offset - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+								value += -scaling_selection_offset.y + (value - scaling_selection_pivot.y) * (scaling_selection_scale.y - 1);
+							}
 						}
 
 						Vector2 pos((offset - timeline->get_value()) * scale + limit, _bezier_h_to_pixel(value));
 
+						if (draw_selection_handles && is_selected) {
+							selected_pos.push_back(pos);
+						}
+
+						if (!draw_track) {
+							continue;
+						}
+
 						Vector2 in_vec = animation->bezier_track_get_key_in_handle(i, j);
 
 						if ((moving_handle == 1 || moving_handle == -1) && moving_handle_track == i && moving_handle_key == j) {
@@ -544,7 +584,7 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 
 						Vector2 pos_out(((offset + out_vec.x) - timeline->get_value()) * scale + limit, _bezier_h_to_pixel(value + out_vec.y));
 
-						if (i == selected_track || selection.has(IntPair(i, j))) {
+						if (i == selected_track || is_selected) {
 							_draw_line_clipped(pos, pos_in, accent, limit, right_limit);
 							_draw_line_clipped(pos, pos_out, accent, limit, right_limit);
 						}
@@ -555,7 +595,7 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 						if (pos.x >= limit && pos.x <= right_limit) {
 							ep.point_rect.position = (pos - bezier_icon->get_size() / 2.0).floor();
 							ep.point_rect.size = bezier_icon->get_size();
-							if (selection.has(IntPair(i, j))) {
+							if (is_selected) {
 								draw_texture(selected_icon, ep.point_rect.position);
 								draw_string(font, ep.point_rect.position + Vector2(8, -font->get_height(font_size) - 8), TTR("Time:") + " " + TS->format_number(rtos(Math::snapped(offset, 0.0001))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, accent);
 								draw_string(font, ep.point_rect.position + Vector2(8, -8), TTR("Value:") + " " + TS->format_number(rtos(Math::snapped(value, 0.001))), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, accent);
@@ -570,7 +610,7 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 						}
 						ep.point_rect = ep.point_rect.grow(ep.point_rect.size.width * 0.5);
 
-						if (i == selected_track || selection.has(IntPair(i, j))) {
+						if (i == selected_track || is_selected) {
 							if (animation->bezier_track_get_key_handle_mode(i, j) != Animation::HANDLE_MODE_LINEAR) {
 								if (pos_in.x >= limit && pos_in.x <= right_limit) {
 									ep.in_rect.position = (pos_in - bezier_handle_icon->get_size() / 2.0).floor();
@@ -601,6 +641,34 @@ void AnimationBezierTrackEdit::_notification(int p_what) {
 				}
 			}
 
+			selection_rect = Rect2();
+			selection_handles_rect = Rect2();
+			// Draw scale handles.
+			if (draw_selection_handles) {
+				selection_rect.position = selected_pos[0];
+				selected_pos.remove_at(0);
+				for (const Point2 &pos : selected_pos) {
+					selection_rect = selection_rect.expand(pos);
+				}
+
+				const int outer_ofs = Math::round(12 * EDSCALE);
+				const int inner_ofs = Math::round(outer_ofs / 2.0);
+
+				// Draw horizontal handles.
+				if (selection_rect.size.height > CMP_EPSILON) {
+					_draw_line_clipped(selection_rect.position - Vector2(inner_ofs, inner_ofs), selection_rect.position + Vector2(selection_rect.size.width + inner_ofs, -inner_ofs), accent, limit, right_limit);
+					_draw_line_clipped(selection_rect.position + Vector2(-inner_ofs, selection_rect.size.height + inner_ofs), selection_rect.position + selection_rect.size + Vector2(inner_ofs, inner_ofs), accent, limit, right_limit);
+				}
+				// Draw vertical handles.
+				if (selection_rect.size.width > CMP_EPSILON) {
+					_draw_line_clipped(selection_rect.position - Vector2(inner_ofs, inner_ofs), selection_rect.position + Vector2(-inner_ofs, selection_rect.size.height + inner_ofs), accent, limit, right_limit);
+					_draw_line_clipped(selection_rect.position + Vector2(selection_rect.size.width + inner_ofs, -inner_ofs), selection_rect.position + selection_rect.size + Vector2(inner_ofs, inner_ofs), accent, limit, right_limit);
+				}
+
+				selection_handles_rect.position = selection_rect.position - Vector2(outer_ofs, outer_ofs);
+				selection_handles_rect.size = selection_rect.size + Vector2(outer_ofs, outer_ofs) * 2;
+			}
+
 			if (box_selecting) {
 				Vector2 bs_from = box_selection_from;
 				Vector2 bs_to = box_selection_to;
@@ -756,8 +824,8 @@ void AnimationBezierTrackEdit::set_filtered(bool p_filtered) {
 
 void AnimationBezierTrackEdit::auto_fit_vertically() {
 	int track_count = animation->get_track_count();
-	real_t minimum_value = INFINITY;
-	real_t maximum_value = -INFINITY;
+	real_t minimum_value = Math::INF;
+	real_t maximum_value = -Math::INF;
 
 	int nb_track_visible = 0;
 	for (int i = 0; i < track_count; ++i) {
@@ -968,10 +1036,10 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 				return;
 			}
 
-			real_t minimum_time = INFINITY;
-			real_t maximum_time = -INFINITY;
-			real_t minimum_value = INFINITY;
-			real_t maximum_value = -INFINITY;
+			real_t minimum_time = Math::INF;
+			real_t maximum_time = -Math::INF;
+			real_t minimum_value = Math::INF;
+			real_t maximum_value = -Math::INF;
 
 			for (const IntPair &E : focused_keys) {
 				IntPair key_pair = E;
@@ -1193,15 +1261,17 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			}
 		}
 
+		// Check this first, to allow manipulating key handles while ignoring keyframes before scaling/moving.
+		bool inside_selection_handles_rect = !read_only && selection_handles_rect.has_point(mb->get_position());
+
 		// First, check keyframe.
 		// Command/Control makes it ignore the keyframe, so control point editors can be force-edited.
-		if (!mb->is_command_or_control_pressed()) {
+		if (!inside_selection_handles_rect && !mb->is_command_or_control_pressed()) {
 			if (_try_select_at_ui_pos(mb->get_position(), mb->is_shift_pressed(), true)) {
 				return;
 			}
 		}
-
-		// Second, check handles.
+		// Second, check key handles.
 		for (int i = 0; i < edit_points.size(); i++) {
 			if (!read_only) {
 				if (edit_points[i].in_rect.has_point(mb->get_position())) {
@@ -1226,6 +1296,50 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			}
 		}
 
+		// Box scaling/movement.
+		if (inside_selection_handles_rect) {
+			const Vector2i rel_pos = mb->get_position() - selection_rect.position;
+			scaling_selection_handles = Vector2i();
+
+			// Check which scaling handles are available.
+			if (selection_rect.size.width > CMP_EPSILON) {
+				if (rel_pos.x <= 0) {
+					scaling_selection_handles.x = -1;
+				} else if (rel_pos.x >= selection_rect.size.width) {
+					scaling_selection_handles.x = 1;
+				}
+			}
+			if (selection_rect.size.height > CMP_EPSILON) {
+				if (rel_pos.y <= 0) {
+					scaling_selection_handles.y = -1;
+				} else if (rel_pos.y >= selection_rect.size.height) {
+					scaling_selection_handles.y = 1;
+				}
+			}
+
+			if (scaling_selection_handles != Vector2i()) {
+				scaling_selection = true;
+
+				const float time = ((selection_rect.position.x - limit) / timeline->get_zoom_scale()) + timeline->get_value();
+				const float h = (get_size().height / 2.0 - selection_rect.position.y) * timeline_v_zoom + timeline_v_scroll;
+				scaling_selection_pivot = Point2(time, h);
+
+				return;
+			}
+
+			// If not scaling, that means we're moving.
+			moving_selection_attempt = true;
+			moving_selection = false;
+			moving_selection_mouse_begin = mb->get_position();
+			// The pivot will be from the mouse click location, not a specific key.
+			moving_selection_from_key = -1;
+			moving_selection_from_track = selected_track;
+			moving_selection_offset = Vector2();
+			select_single_attempt = IntPair(-1, -1);
+
+			return;
+		}
+
 		// Insert new point.
 		if (mb->get_position().x >= limit && mb->get_position().x < get_size().width && mb->is_command_or_control_pressed()) {
 			float h = (get_size().height / 2.0 - mb->get_position().y) * timeline_v_zoom + timeline_v_scroll;
@@ -1250,7 +1364,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 			moving_selection_attempt = true;
 			moving_selection = false;
-			moving_selection_mouse_begin_x = mb->get_position().x;
+			moving_selection_mouse_begin = mb->get_position();
 			moving_selection_from_key = index;
 			moving_selection_from_track = selected_track;
 			moving_selection_offset = Vector2();
@@ -1285,12 +1399,12 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			if (bs_from.y > bs_to.y) {
 				SWAP(bs_from.y, bs_to.y);
 			}
-			Rect2 selection_rect(bs_from, bs_to - bs_from);
+			Rect2 rect(bs_from, bs_to - bs_from);
 
 			bool track_set = false;
 			int j = 0;
 			for (int i = 0; i < edit_points.size(); i++) {
-				if (edit_points[i].point_rect.intersects(selection_rect)) {
+				if (edit_points[i].point_rect.intersects(rect)) {
 					_select_at_anim(animation, edit_points[i].track, animation->track_get_key_time(edit_points[i].track, edit_points[i].key), j == 0 && !box_selecting_add);
 					if (!track_set) {
 						track_set = true;
@@ -1335,8 +1449,7 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 	if (moving_selection_attempt && mb.is_valid() && !mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
 		if (!read_only) {
 			if (moving_selection && (abs(moving_selection_offset.x) > CMP_EPSILON || abs(moving_selection_offset.y) > CMP_EPSILON)) {
-				//combit it
-
+				// Commit it.
 				EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 				undo_redo->create_action(TTR("Move Bezier Points"));
 
@@ -1459,11 +1572,141 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 			moving_selection = false;
 			moving_selection_attempt = false;
-			moving_selection_mouse_begin_x = 0.0;
+			moving_selection_mouse_begin = Point2();
 			queue_redraw();
 		}
 	}
 
+	if (scaling_selection && mb.is_valid() && !read_only && !mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
+		if (abs(scaling_selection_scale.x - 1) > CMP_EPSILON || abs(scaling_selection_scale.y - 1) > CMP_EPSILON) {
+			// Scale it.
+			EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+			undo_redo->create_action(TTR("Scale Bezier Points"));
+
+			List<AnimMoveRestore> to_restore;
+			List<Animation::HandleMode> to_restore_handle_modes;
+			// 1 - Remove the keys.
+			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+				undo_redo->add_do_method(animation.ptr(), "track_remove_key", E->get().first, E->get().second);
+			}
+			// 2 - Remove overlapped keys.
+			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+				real_t newtime = animation->track_get_key_time(E->get().first, E->get().second);
+				newtime += -scaling_selection_offset.x + (newtime - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+
+				int idx = animation->track_find_key(E->get().first, newtime, Animation::FIND_MODE_APPROX);
+				if (idx == -1) {
+					continue;
+				}
+
+				if (selection.has(IntPair(E->get().first, idx))) {
+					continue; // Already in selection, don't save.
+				}
+
+				undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_time", E->get().first, newtime);
+				AnimMoveRestore amr;
+
+				amr.key = animation->track_get_key_value(E->get().first, idx);
+				amr.track = E->get().first;
+				amr.time = newtime;
+
+				to_restore.push_back(amr);
+				to_restore_handle_modes.push_back(animation->bezier_track_get_key_handle_mode(E->get().first, idx));
+			}
+
+			// 3 - Scale the keys (re-insert them).
+			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+				real_t newpos = animation->track_get_key_time(E->get().first, E->get().second);
+				newpos += -scaling_selection_offset.x + (newpos - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+
+				Array key = animation->track_get_key_value(E->get().first, E->get().second);
+				real_t h = key[0];
+				h += -scaling_selection_offset.y + (h - scaling_selection_pivot.y) * (scaling_selection_scale.y - 1);
+				key[0] = h;
+
+				undo_redo->add_do_method(
+						this,
+						"_bezier_track_insert_key_at_anim",
+						animation,
+						E->get().first,
+						newpos,
+						key[0],
+						Vector2(key[1], key[2]),
+						Vector2(key[3], key[4]),
+						animation->bezier_track_get_key_handle_mode(E->get().first, E->get().second));
+			}
+
+			// 4 - (undo) Remove inserted keys.
+			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+				real_t newpos = animation->track_get_key_time(E->get().first, E->get().second);
+				newpos += -scaling_selection_offset.x + (newpos - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+				undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_time", E->get().first, newpos);
+			}
+
+			// 5 - (undo) Reinsert keys.
+			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+				real_t oldpos = animation->track_get_key_time(E->get().first, E->get().second);
+				Array key = animation->track_get_key_value(E->get().first, E->get().second);
+				undo_redo->add_undo_method(
+						this,
+						"_bezier_track_insert_key_at_anim",
+						animation,
+						E->get().first,
+						oldpos,
+						key[0],
+						Vector2(key[1], key[2]),
+						Vector2(key[3], key[4]),
+						animation->bezier_track_get_key_handle_mode(E->get().first, E->get().second));
+			}
+
+			// 6 - (undo) Reinsert overlapped keys.
+			List<AnimMoveRestore>::ConstIterator restore_itr = to_restore.begin();
+			List<Animation::HandleMode>::ConstIterator handle_itr = to_restore_handle_modes.begin();
+			for (; restore_itr != to_restore.end() && handle_itr != to_restore_handle_modes.end(); ++restore_itr, ++handle_itr) {
+				const AnimMoveRestore &amr = *restore_itr;
+				Array key = amr.key;
+				undo_redo->add_undo_method(animation.ptr(), "track_insert_key", amr.track, amr.time, amr.key, 1);
+				undo_redo->add_undo_method(
+						this,
+						"_bezier_track_insert_key_at_anim",
+						animation,
+						amr.track,
+						amr.time,
+						key[0],
+						Vector2(key[1], key[2]),
+						Vector2(key[3], key[4]),
+						*handle_itr);
+			}
+
+			undo_redo->add_do_method(this, "_clear_selection_for_anim", animation);
+			undo_redo->add_undo_method(this, "_clear_selection_for_anim", animation);
+
+			// 7 - Reselect.
+			int i = 0;
+			for (SelectionSet::Element *E = selection.back(); E; E = E->prev()) {
+				real_t oldpos = animation->track_get_key_time(E->get().first, E->get().second);
+				real_t newpos = animation->track_get_key_time(E->get().first, E->get().second);
+				newpos += -scaling_selection_offset.x + (newpos - scaling_selection_pivot.x) * (scaling_selection_scale.x - 1);
+
+				undo_redo->add_do_method(this, "_select_at_anim", animation, E->get().first, newpos, i == 0);
+				undo_redo->add_undo_method(this, "_select_at_anim", animation, E->get().first, oldpos, i == 0);
+				i++;
+			}
+
+			AnimationPlayerEditor *ape = AnimationPlayerEditor::get_singleton();
+			if (ape) {
+				undo_redo->add_do_method(ape, "_animation_update_key_frame");
+				undo_redo->add_undo_method(ape, "_animation_update_key_frame");
+			}
+			undo_redo->commit_action();
+		}
+
+		scaling_selection = false;
+		scaling_selection_scale = Vector2(1, 1);
+		scaling_selection_offset = Vector2();
+		queue_redraw();
+	}
+
 	Ref<InputEventMouseMotion> mm = p_event;
 	if (moving_selection_attempt && mm.is_valid()) {
 		if (!moving_selection) {
@@ -1473,9 +1716,9 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 		if (!read_only) {
 			float y = (get_size().height / 2.0 - mm->get_position().y) * timeline_v_zoom + timeline_v_scroll;
-			float moving_selection_begin_time = ((moving_selection_mouse_begin_x - limit) / timeline->get_zoom_scale()) + timeline->get_value();
+			float moving_selection_begin_time = ((moving_selection_mouse_begin.x - limit) / timeline->get_zoom_scale()) + timeline->get_value();
 			float new_time = ((mm->get_position().x - limit) / timeline->get_zoom_scale()) + timeline->get_value();
-			float moving_selection_pivot = animation->track_get_key_time(moving_selection_from_track, moving_selection_from_key);
+			float moving_selection_pivot = moving_selection_from_key != -1 ? animation->track_get_key_time(moving_selection_from_track, moving_selection_from_key) : 0;
 			float time_delta = new_time - moving_selection_begin_time;
 
 			float snapped_time = editor->snap_time(moving_selection_pivot + time_delta);
@@ -1483,9 +1726,15 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 			if (abs(moving_selection_offset.x) > CMP_EPSILON || (snapped_time > moving_selection_pivot && time_delta > CMP_EPSILON) || (snapped_time < moving_selection_pivot && time_delta < -CMP_EPSILON)) {
 				time_offset = snapped_time - moving_selection_pivot;
 			}
-			float moving_selection_begin_value = animation->bezier_track_get_key_value(moving_selection_from_track, moving_selection_from_key);
-			float y_offset = y - moving_selection_begin_value;
 
+			float moving_selection_begin_value;
+			if (moving_selection_from_key == -1) {
+				moving_selection_begin_value = (get_size().height / 2.0 - moving_selection_mouse_begin.y) * timeline_v_zoom + timeline_v_scroll;
+			} else {
+				moving_selection_begin_value = animation->bezier_track_get_key_value(moving_selection_from_track, moving_selection_from_key);
+			}
+
+			float y_offset = y - moving_selection_begin_value;
 			moving_selection_offset = Vector2(time_offset, y_offset);
 		}
 
@@ -1505,11 +1754,82 @@ void AnimationBezierTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 		queue_redraw();
 	}
 
+	if (scaling_selection && mm.is_valid() && !read_only) {
+		Point2 mp = mm->get_position();
+		const int handle_length = Math::round((selection_handles_rect.size.width - selection_rect.size.width) / 4.0);
+		Point2 rel_pos;
+
+		// Calculate the scale according with the distance between the mouse's position (adjusted so that the cursor appears inside the handles)
+		// and the opposite end of the `selection_rect`.
+
+		if (scaling_selection_handles.x != 0) {
+			if (scaling_selection_handles.x == 1) { // Right Handle
+				const int handle_adjust = Math::round(mp.x - (scaling_selection_scale.x >= 0 ? selection_rect.position.x : (selection_rect.position.x + selection_rect.size.width)));
+				mp.x -= MIN(Math::abs(handle_adjust), handle_length) * scaling_selection_handles.x * SIGN(handle_adjust);
+
+				if (editor->is_snap_keys_enabled()) {
+					mp.x = editor->snap_time((mp.x - limit) / timeline->get_zoom_scale(), true) + timeline->get_value();
+					mp.x = (mp.x - timeline->get_value()) * timeline->get_zoom_scale() + limit;
+				}
+
+				rel_pos.x = scaling_selection_scale.x >= 0 ? (mp.x - selection_rect.position.x) : selection_rect.position.x + selection_rect.size.width - mp.x;
+			} else { // Left Handle
+				const int handle_adjust = Math::round((scaling_selection_scale.x >= 0 ? (selection_rect.position.x + selection_rect.size.width) : selection_rect.position.x) - mp.x);
+				mp.x -= MIN(Math::abs(handle_adjust), handle_length) * scaling_selection_handles.x * SIGN(handle_adjust);
+
+				const float x = editor->snap_time((mp.x - limit) / timeline->get_zoom_scale(), true) + timeline->get_value();
+				if (editor->is_snap_keys_enabled()) {
+					mp.x = (x - timeline->get_value()) * timeline->get_zoom_scale() + limit;
+				}
+
+				rel_pos.x = scaling_selection_scale.x >= 0 ? (selection_rect.position.x + selection_rect.size.width - mp.x) : (mp.x - selection_rect.position.x);
+				scaling_selection_offset.x = scaling_selection_pivot.x - x;
+			}
+
+			scaling_selection_scale.x *= rel_pos.x / selection_rect.size.width;
+			if (scaling_selection_scale.x == 0) {
+				scaling_selection_scale.x = CMP_EPSILON;
+			}
+		}
+
+		if (scaling_selection_handles.y != 0) {
+			if (scaling_selection_handles.y == 1) { // Bottom Handle
+				const int handle_adjust = Math::round(mp.y - (scaling_selection_scale.y >= 0 ? selection_rect.position.y : (selection_rect.position.y + selection_rect.size.height)));
+				mp.y -= MIN(Math::abs(handle_adjust), handle_length) * scaling_selection_handles.y * SIGN(handle_adjust);
+
+				if (scaling_selection_scale.y >= 0) {
+					rel_pos.y = mp.y - selection_rect.position.y;
+				} else {
+					rel_pos.y = selection_rect.position.y + selection_rect.size.height - mp.y;
+				}
+			} else { // Top Handle
+				const int handle_adjust = Math::round((scaling_selection_scale.y >= 0 ? (selection_rect.position.y + selection_rect.size.height) : selection_rect.position.y) - mp.y);
+				mp.y -= MIN(Math::abs(handle_adjust), handle_length) * scaling_selection_handles.y * SIGN(handle_adjust);
+
+				if (scaling_selection_scale.y >= 0) {
+					rel_pos.y = selection_rect.position.y + selection_rect.size.height - mp.y;
+				} else {
+					rel_pos.y = mp.y - selection_rect.position.y;
+				}
+
+				const float h = (get_size().height / 2.0 - mp.y) * timeline_v_zoom + timeline_v_scroll;
+				scaling_selection_offset.y = scaling_selection_pivot.y - h;
+			}
+
+			scaling_selection_scale.y *= rel_pos.y / selection_rect.size.height;
+			if (scaling_selection_scale.y == 0) {
+				scaling_selection_scale.y = CMP_EPSILON;
+			}
+		}
+
+		queue_redraw();
+	}
+
 	if ((moving_handle == 1 || moving_handle == -1) && mm.is_valid()) {
 		float y = (get_size().height / 2.0 - mm->get_position().y) * timeline_v_zoom + timeline_v_scroll;
-		float x = editor->snap_time((mm->get_position().x - timeline->get_name_limit()) / timeline->get_zoom_scale()) + timeline->get_value();
+		float x = editor->snap_time((mm->get_position().x - limit) / timeline->get_zoom_scale()) + timeline->get_value();
 
-		Vector2 key_pos = Vector2(animation->track_get_key_time(selected_track, moving_handle_key), animation->bezier_track_get_key_value(selected_track, moving_handle_key));
+		Vector2 key_pos = Vector2(animation->track_get_key_time(moving_handle_track, moving_handle_key), animation->bezier_track_get_key_value(moving_handle_track, moving_handle_key));
 
 		Vector2 moving_handle_value = Vector2(x, y) - key_pos;
 
@@ -1601,7 +1921,7 @@ bool AnimationBezierTrackEdit::_try_select_at_ui_pos(const Point2 &p_pos, bool p
 					moving_selection_attempt = true;
 					moving_selection_from_key = pair.second;
 					moving_selection_from_track = pair.first;
-					moving_selection_mouse_begin_x = p_pos.x;
+					moving_selection_mouse_begin = p_pos;
 					moving_selection_offset = Vector2();
 					moving_handle_track = pair.first;
 					moving_handle_left = animation->bezier_track_get_key_in_handle(pair.first, pair.second);
@@ -1731,7 +2051,7 @@ void AnimationBezierTrackEdit::_menu_selected(int p_index) {
 }
 
 void AnimationBezierTrackEdit::duplicate_selected_keys(real_t p_ofs, bool p_ofs_valid) {
-	if (selection.size() == 0) {
+	if (selection.is_empty()) {
 		return;
 	}
 
diff --git a/engine/editor/animation_bezier_editor.h b/engine/editor/animation_bezier_editor.h
index dd7e8758..46ac16eb 100644
--- a/engine/editor/animation_bezier_editor.h
+++ b/engine/editor/animation_bezier_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_BEZIER_EDITOR_H
-#define ANIMATION_BEZIER_EDITOR_H
+#pragma once
 
 #include "animation_track_editor.h"
 #include "core/templates/hashfuncs.h"
@@ -109,7 +108,7 @@ class AnimationBezierTrackEdit : public Control {
 	typedef Pair<int, int> IntPair;
 
 	bool moving_selection_attempt = false;
-	float moving_selection_mouse_begin_x = 0.0;
+	Point2 moving_selection_mouse_begin;
 	IntPair select_single_attempt;
 	bool moving_selection = false;
 	int moving_selection_from_key = 0;
@@ -123,6 +122,15 @@ class AnimationBezierTrackEdit : public Control {
 	Vector2 box_selection_from;
 	Vector2 box_selection_to;
 
+	Rect2 selection_rect;
+	Rect2 selection_handles_rect;
+
+	bool scaling_selection = false;
+	Vector2i scaling_selection_handles;
+	Vector2 scaling_selection_scale = Vector2(1, 1);
+	Vector2 scaling_selection_offset;
+	Point2 scaling_selection_pivot;
+
 	int moving_handle = 0; //0 no move -1 or +1 out, 2 both (drawing only)
 	int moving_handle_key = 0;
 	int moving_handle_track = 0;
@@ -225,5 +233,3 @@ public:
 
 	AnimationBezierTrackEdit();
 };
-
-#endif // ANIMATION_BEZIER_EDITOR_H
diff --git a/engine/editor/animation_track_editor.cpp b/engine/editor/animation_track_editor.cpp
index dbb23d6f..7df40cfe 100644
--- a/engine/editor/animation_track_editor.cpp
+++ b/engine/editor/animation_track_editor.cpp
@@ -221,10 +221,10 @@ bool AnimationTrackKeyEdit::_set(const StringName &p_name, const Variant &p_valu
 				change_notify_deserved = true;
 			} else if (name.begins_with("args/")) {
 				Vector<Variant> args = d_old["args"];
-				int idx = name.get_slice("/", 1).to_int();
+				int idx = name.get_slicec('/', 1).to_int();
 				ERR_FAIL_INDEX_V(idx, args.size(), false);
 
-				String what = name.get_slice("/", 2);
+				String what = name.get_slicec('/', 2);
 				if (what == "type") {
 					Variant::Type t = Variant::Type(int(p_value));
 
@@ -478,10 +478,10 @@ bool AnimationTrackKeyEdit::_get(const StringName &p_name, Variant &r_ret) const
 			}
 
 			if (name.begins_with("args/")) {
-				int idx = name.get_slice("/", 1).to_int();
+				int idx = name.get_slicec('/', 1).to_int();
 				ERR_FAIL_INDEX_V(idx, args.size(), false);
 
-				String what = name.get_slice("/", 2);
+				String what = name.get_slicec('/', 2);
 				if (what == "type") {
 					r_ret = args[idx].get_type();
 					return true;
@@ -833,10 +833,10 @@ bool AnimationMultiTrackKeyEdit::_set(const StringName &p_name, const Variant &p
 						change_notify_deserved = true;
 					} else if (name.begins_with("args/")) {
 						Vector<Variant> args = d_old["args"];
-						int idx = name.get_slice("/", 1).to_int();
+						int idx = name.get_slicec('/', 1).to_int();
 						ERR_FAIL_INDEX_V(idx, args.size(), false);
 
-						String what = name.get_slice("/", 2);
+						String what = name.get_slicec('/', 2);
 						if (what == "type") {
 							Variant::Type t = Variant::Type(int(p_value));
 
@@ -1055,10 +1055,10 @@ bool AnimationMultiTrackKeyEdit::_get(const StringName &p_name, Variant &r_ret)
 					}
 
 					if (name.begins_with("args/")) {
-						int idx = name.get_slice("/", 1).to_int();
+						int idx = name.get_slicec('/', 1).to_int();
 						ERR_FAIL_INDEX_V(idx, args.size(), false);
 
-						String what = name.get_slice("/", 2);
+						String what = name.get_slicec('/', 2);
 						if (what == "type") {
 							r_ret = args[idx].get_type();
 							return true;
@@ -1251,12 +1251,12 @@ void AnimationMultiTrackKeyEdit::_get_property_list(List<PropertyInfo> *p_list)
 					if (ap) {
 						List<StringName> anims;
 						ap->get_animation_list(&anims);
-						for (List<StringName>::Element *G = anims.front(); G; G = G->next()) {
+						for (const StringName &anim : anims) {
 							if (!animations.is_empty()) {
 								animations += ",";
 							}
 
-							animations += String(G->get());
+							animations += String(anim);
 						}
 					}
 				}
@@ -1485,6 +1485,15 @@ void AnimationTimelineEdit::_notification(int p_what) {
 			len_hb->set_size(Size2(get_buttons_width(), get_size().height));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation timeline editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			int key_range = get_size().width - get_buttons_width() - get_name_limit();
 
@@ -2008,10 +2017,12 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
 	expander->set_h_size_flags(SIZE_EXPAND_FILL);
 	expander->set_mouse_filter(MOUSE_FILTER_IGNORE);
 	len_hb->add_child(expander);
+
 	time_icon = memnew(TextureRect);
 	time_icon->set_v_size_flags(SIZE_SHRINK_CENTER);
 	time_icon->set_tooltip_text(TTR("Animation length (seconds)"));
 	len_hb->add_child(time_icon);
+
 	length = memnew(EditorSpinSlider);
 	length->set_min(SECOND_DECIMAL);
 	length->set_max(36000);
@@ -2020,11 +2031,14 @@ AnimationTimelineEdit::AnimationTimelineEdit() {
 	length->set_custom_minimum_size(Vector2(70 * EDSCALE, 0));
 	length->set_hide_slider(true);
 	length->set_tooltip_text(TTR("Animation length (seconds)"));
+	length->set_accessibility_name(TTRC("Animation length"));
 	length->connect(SceneStringName(value_changed), callable_mp(this, &AnimationTimelineEdit::_anim_length_changed));
 	len_hb->add_child(length);
+
 	loop = memnew(Button);
 	loop->set_flat(true);
 	loop->set_tooltip_text(TTR("Animation Looping"));
+	loop->set_accessibility_name(TTRC("Animation Looping"));
 	loop->connect(SceneStringName(pressed), callable_mp(this, &AnimationTimelineEdit::_anim_loop_pressed));
 	loop->set_toggle_mode(true);
 	len_hb->add_child(loop);
@@ -2056,6 +2070,15 @@ void AnimationTrackEdit::_notification(int p_what) {
 			selected_icon = get_editor_theme_icon(SNAME("KeySelected"));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation track editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (animation.is_null()) {
 				return;
@@ -2235,8 +2258,21 @@ void AnimationTrackEdit::_notification(int p_what) {
 							offset_n = offset_n + editor->get_moving_selection_offset();
 						}
 						offset_n = offset_n * scale + limit;
-
+						float offset_last = limit_end;
+						if (i < animation->track_get_key_count(track) - 2) {
+							offset_last = animation->track_get_key_time(track, i + 2) - timeline->get_value();
+							if (editor->is_key_selected(track, i + 2) && editor->is_moving_selection()) {
+								offset_last = offset_last + editor->get_moving_selection_offset();
+							}
+							offset_last = offset_last * scale + limit;
+						}
+						int limit_string = (editor->is_key_selected(track, i + 1) && editor->is_moving_selection()) ? int(offset_last) : int(offset_n);
+						if (editor->is_key_selected(track, i) && editor->is_moving_selection()) {
+							limit_string = int(MAX(limit_end, offset_last));
+						}
 						draw_key_link(i, scale, int(offset), int(offset_n), limit, limit_end);
+						draw_key(i, scale, int(offset), editor->is_key_selected(track, i), limit, limit_string);
+						continue;
 					}
 
 					draw_key(i, scale, int(offset), editor->is_key_selected(track, i), limit, limit_end);
@@ -2541,7 +2577,8 @@ void AnimationTrackEdit::draw_key(int p_index, float p_pixels_sec, int p_x, bool
 		}
 		text += ")";
 
-		int limit = MAX(0, p_clip_right - p_x - icon_to_draw->get_width());
+		int limit = ((p_selected && editor->is_moving_selection()) || editor->is_function_name_pressed()) ? 0 : MAX(0, p_clip_right - p_x - icon_to_draw->get_width() * 2);
+
 		if (limit > 0) {
 			draw_string(font, Vector2(p_x + icon_to_draw->get_width(), int(get_size().height - font->get_height(font_size)) / 2 + font->get_ascent(font_size)), text, HORIZONTAL_ALIGNMENT_LEFT, limit, font_size, color);
 		}
@@ -2792,7 +2829,7 @@ String AnimationTrackEdit::get_tooltip(const Point2 &p_pos) const {
 
 			if (rect.has_point(p_pos)) {
 				if (const_cast<AnimationTrackEdit *>(this)->is_key_selectable_by_distance()) {
-					float distance = ABS(offset - p_pos.x);
+					float distance = Math::abs(offset - p_pos.x);
 					if (key_idx == -1 || distance < key_distance) {
 						key_idx = i;
 						key_distance = distance;
@@ -3197,7 +3234,7 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 					if (rect.has_point(pos)) {
 						if (is_key_selectable_by_distance()) {
-							const float distance = ABS(offset - pos.x);
+							const float distance = Math::abs(offset - pos.x);
 							if (key_idx == -1 || distance < key_distance) {
 								key_idx = i;
 								key_distance = distance;
@@ -3261,7 +3298,7 @@ bool AnimationTrackEdit::_try_select_at_ui_pos(const Point2 &p_pos, bool p_aggre
 
 				if (rect.has_point(p_pos)) {
 					if (is_key_selectable_by_distance()) {
-						float distance = ABS(offset - p_pos.x);
+						float distance = Math::abs(offset - p_pos.x);
 						if (key_idx == -1 || distance < key_distance) {
 							key_idx = i;
 							key_distance = distance;
@@ -3324,7 +3361,7 @@ Variant AnimationTrackEdit::get_drag_data(const Point2 &p_point) {
 	Dictionary drag_data;
 	drag_data["type"] = "animation_track";
 	String base_path = animation->track_get_path(track);
-	base_path = base_path.get_slice(":", 0); // Remove sub-path.
+	base_path = base_path.get_slicec(':', 0); // Remove sub-path.
 	drag_data["group"] = base_path;
 	drag_data["index"] = track;
 
@@ -3355,7 +3392,7 @@ bool AnimationTrackEdit::can_drop_data(const Point2 &p_point, const Variant &p_d
 	// Don't allow moving tracks outside their groups.
 	if (get_editor()->is_grouping_tracks()) {
 		String base_path = animation->track_get_path(track);
-		base_path = base_path.get_slice(":", 0); // Remove sub-path.
+		base_path = base_path.get_slicec(':', 0); // Remove sub-path.
 		if (d["group"] != base_path) {
 			return false;
 		}
@@ -3386,7 +3423,7 @@ void AnimationTrackEdit::drop_data(const Point2 &p_point, const Variant &p_data)
 	// Don't allow moving tracks outside their groups.
 	if (get_editor()->is_grouping_tracks()) {
 		String base_path = animation->track_get_path(track);
-		base_path = base_path.get_slice(":", 0); // Remove sub-path.
+		base_path = base_path.get_slicec(':', 0); // Remove sub-path.
 		if (d["group"] != base_path) {
 			return;
 		}
@@ -3590,6 +3627,15 @@ void AnimationTrackEditGroup::_notification(int p_what) {
 			icon_size = Vector2(1, 1) * get_theme_constant(SNAME("class_icon_size"), EditorStringName(Editor));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation track group")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			const Ref<Font> font = get_theme_font(SceneStringName(font), SNAME("Label"));
 			const int font_size = get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
@@ -3894,6 +3940,7 @@ bool AnimationTrackEditor::has_keying() const {
 Dictionary AnimationTrackEditor::get_state() const {
 	Dictionary state;
 	state["fps_mode"] = timeline->is_using_fps();
+	state["fps_compat"] = fps_compat->is_pressed();
 	state["zoom"] = zoom->get_value();
 	state["offset"] = timeline->get_value();
 	state["v_scroll"] = scroll->get_v_scroll_bar()->get_value();
@@ -3909,27 +3956,34 @@ void AnimationTrackEditor::set_state(const Dictionary &p_state) {
 			snap_mode->select(0);
 		}
 		_snap_mode_changed(snap_mode->get_selected());
-	} else {
-		snap_mode->select(0);
-		_snap_mode_changed(snap_mode->get_selected());
 	}
+
+	if (p_state.has("fps_compat")) {
+		fps_compat->set_pressed(p_state["fps_compat"]);
+	}
+
 	if (p_state.has("zoom")) {
 		zoom->set_value(p_state["zoom"]);
-	} else {
-		zoom->set_value(1.0);
 	}
+
 	if (p_state.has("offset")) {
 		timeline->set_value(p_state["offset"]);
-	} else {
-		timeline->set_value(0);
 	}
+
 	if (p_state.has("v_scroll")) {
 		scroll->get_v_scroll_bar()->set_value(p_state["v_scroll"]);
-	} else {
-		scroll->get_v_scroll_bar()->set_value(0);
 	}
 }
 
+void AnimationTrackEditor::clear() {
+	snap_mode->select(EDITOR_GET("editors/animation/default_fps_mode"));
+	_snap_mode_changed(snap_mode->get_selected());
+	fps_compat->set_pressed(EDITOR_GET("editors/animation/default_fps_compatibility"));
+	zoom->set_value(1.0);
+	timeline->set_value(0);
+	scroll->get_v_scroll_bar()->set_value(0);
+}
+
 void AnimationTrackEditor::cleanup() {
 	set_animation(Ref<Animation>(), read_only);
 }
@@ -4662,7 +4716,7 @@ AnimationTrackEditor::TrackIndices AnimationTrackEditor::_confirm_insert(InsertD
 				for (int i = 0; i < subindices.size(); i++) {
 					InsertData id = p_id;
 					id.type = Animation::TYPE_BEZIER;
-					id.value = subindices[i].is_empty() ? p_id.value : p_id.value.get(subindices[i].substr(1, subindices[i].length()));
+					id.value = subindices[i].is_empty() ? p_id.value : p_id.value.get(subindices[i].substr(1));
 					id.path = String(p_id.path) + subindices[i];
 					p_next_tracks = _confirm_insert(id, p_next_tracks, p_reset_wanted, p_reset_anim, false);
 				}
@@ -4935,7 +4989,7 @@ void AnimationTrackEditor::_update_tracks() {
 
 		if (use_grouping) {
 			String base_path = animation->track_get_path(i);
-			base_path = base_path.get_slice(":", 0); // Remove sub-path.
+			base_path = base_path.get_slicec(':', 0); // Remove sub-path.
 
 			if (!group_sort.has(base_path)) {
 				AnimationTrackEditGroup *g = memnew(AnimationTrackEditGroup);
@@ -5088,7 +5142,7 @@ void AnimationTrackEditor::_update_nearest_fps_label() {
 		nearest_fps_label->hide();
 	} else {
 		nearest_fps_label->show();
-		nearest_fps_label->set_text("Nearest FPS: " + itos(nearest_fps));
+		nearest_fps_label->set_text(vformat(TTR("Nearest FPS: %d"), nearest_fps));
 	}
 }
 
@@ -5154,6 +5208,7 @@ void AnimationTrackEditor::_notification(int p_what) {
 			snap_keys->set_button_icon(get_editor_theme_icon(SNAME("SnapKeys")));
 			fps_compat->set_button_icon(get_editor_theme_icon(SNAME("FPS")));
 			view_group->set_button_icon(get_editor_theme_icon(view_group->is_pressed() ? SNAME("AnimationTrackList") : SNAME("AnimationTrackGroup")));
+			function_name_toggler->set_button_icon(get_editor_theme_icon(SNAME("MemberMethod")));
 			selected_filter->set_button_icon(get_editor_theme_icon(SNAME("AnimationFilter")));
 			imported_anim_warning->set_button_icon(get_editor_theme_icon(SNAME("NodeWarning")));
 			dummy_player_warning->set_button_icon(get_editor_theme_icon(SNAME("NodeWarning")));
@@ -5168,6 +5223,8 @@ void AnimationTrackEditor::_notification(int p_what) {
 
 			const int track_separation = get_theme_constant(SNAME("track_v_separation"), SNAME("AnimationTrackEditor"));
 			track_vbox->add_theme_constant_override("separation", track_separation);
+
+			function_name_toggler->add_theme_color_override("icon_pressed_color", get_theme_color("icon_disabled_color", EditorStringName(Editor)));
 		} break;
 
 		case NOTIFICATION_READY: {
@@ -5628,17 +5685,16 @@ void AnimationTrackEditor::_add_method_key(const String &p_method) {
 			Dictionary d;
 			d["method"] = p_method;
 			Array params;
-			int first_defarg = E.arguments.size() - E.default_arguments.size();
+			int64_t first_defarg = E.arguments.size() - E.default_arguments.size();
 
-			int i = 0;
-			for (List<PropertyInfo>::ConstIterator itr = E.arguments.begin(); itr != E.arguments.end(); ++itr, ++i) {
+			for (int64_t i = 0; i < E.arguments.size(); ++i) {
 				if (i >= first_defarg) {
 					Variant arg = E.default_arguments[i - first_defarg];
 					params.push_back(arg);
 				} else {
 					Callable::CallError ce;
 					Variant arg;
-					Variant::construct(itr->type, arg, nullptr, 0, ce);
+					Variant::construct(E.arguments[i].type, arg, nullptr, 0, ce);
 					params.push_back(arg);
 				}
 			}
@@ -6515,7 +6571,7 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
 					text = path;
 					int sep = text.find_char(':');
 					if (sep != -1) {
-						text = text.substr(sep + 1, text.length());
+						text = text.substr(sep + 1);
 					}
 				}
 
@@ -6599,7 +6655,7 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
 			}
 		} break;
 		case EDIT_PASTE_TRACKS: {
-			if (track_clipboard.size() == 0) {
+			if (track_clipboard.is_empty()) {
 				EditorNode::get_singleton()->show_warning(TTR("Clipboard is empty!"));
 				break;
 			}
@@ -6713,7 +6769,7 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
 				to_restore.push_back(amr);
 			}
 
-#define NEW_POS(m_ofs) (((s > 0) ? m_ofs : from_t + (len - (m_ofs - from_t))) - pivot) * ABS(s) + from_t
+#define NEW_POS(m_ofs) (((s > 0) ? m_ofs : from_t + (len - (m_ofs - from_t))) - pivot) * Math::abs(s) + from_t
 			// 3 - Move the keys (re insert them).
 			for (RBMap<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) {
 				float newpos = NEW_POS(E->get().pos);
@@ -6874,8 +6930,8 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
 						if (is_using_angle) {
 							real_t a = from_v;
 							real_t b = to_v;
-							real_t to_diff = fmod(b - a, Math_TAU);
-							to_v = a + fmod(2.0 * to_diff, Math_TAU) - to_diff;
+							real_t to_diff = fmod(b - a, Math::TAU);
+							to_v = a + fmod(2.0 * to_diff, Math::TAU) - to_diff;
 						}
 						Variant delta_v = Animation::subtract_variant(to_v, from_v);
 						double duration = to_t - from_t;
@@ -7338,6 +7394,10 @@ void AnimationTrackEditor::_cleanup_animation(Ref<Animation> p_animation) {
 	_update_tracks();
 }
 
+void AnimationTrackEditor::_toggle_function_names() {
+	_redraw_tracks();
+}
+
 void AnimationTrackEditor::_view_group_toggle() {
 	_update_tracks();
 	view_group->set_button_icon(get_editor_theme_icon(view_group->is_pressed() ? SNAME("AnimationTrackList") : SNAME("AnimationTrackGroup")));
@@ -7352,6 +7412,10 @@ bool AnimationTrackEditor::is_grouping_tracks() {
 	return !view_group->is_pressed();
 }
 
+bool AnimationTrackEditor::is_function_name_pressed() {
+	return function_name_toggler->is_pressed();
+}
+
 void AnimationTrackEditor::_auto_fit() {
 	timeline->auto_fit();
 }
@@ -7642,14 +7706,26 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	bezier_edit_icon->set_toggle_mode(true);
 	bezier_edit_icon->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_toggle_bezier_edit));
 	bezier_edit_icon->set_tooltip_text(TTR("Toggle between the bezier curve editor and track editor."));
+	bezier_edit_icon->set_accessibility_name(TTRC("Bezier Curve Editor"));
 
 	bottom_hf->add_child(bezier_edit_icon);
 
+	function_name_toggler = memnew(Button);
+	function_name_toggler->set_flat(true);
+	function_name_toggler->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_toggle_function_names));
+	function_name_toggler->set_shortcut(ED_SHORTCUT("animation_editor/toggle_function_names", TTRC("Toggle method names")));
+	function_name_toggler->set_toggle_mode(true);
+	function_name_toggler->set_shortcut_in_tooltip(false);
+	function_name_toggler->set_tooltip_text(TTRC("Toggle function names in the track editor."));
+
+	bottom_hf->add_child(function_name_toggler);
+
 	selected_filter = memnew(Button);
 	selected_filter->set_flat(true);
 	selected_filter->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_view_group_toggle)); // Same function works the same.
 	selected_filter->set_toggle_mode(true);
 	selected_filter->set_tooltip_text(TTR("Only show tracks from nodes selected in tree."));
+	selected_filter->set_accessibility_name(TTRC("Show Tracks from Selected Nodes"));
 
 	bottom_hf->add_child(selected_filter);
 
@@ -7658,6 +7734,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	view_group->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_view_group_toggle));
 	view_group->set_toggle_mode(true);
 	view_group->set_tooltip_text(TTR("Group tracks by node or display them as plain list."));
+	view_group->set_accessibility_name(TTRC("Group Tracks by Node"));
 
 	bottom_hf->add_child(view_group);
 	bottom_hf->add_child(memnew(VSeparator));
@@ -7669,6 +7746,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	snap_timeline->set_toggle_mode(true);
 	snap_timeline->set_pressed(false);
 	snap_timeline->set_tooltip_text(TTR("Apply snapping to timeline cursor."));
+	snap_timeline->set_accessibility_name(TTRC("Apply Snapping to Cursor"));
 
 	snap_keys = memnew(Button);
 	snap_keys->set_flat(true);
@@ -7677,6 +7755,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	snap_keys->set_toggle_mode(true);
 	snap_keys->set_pressed(true);
 	snap_keys->set_tooltip_text(TTR("Apply snapping to selected key(s)."));
+	snap_keys->set_accessibility_name(TTRC("Apply Snapping to Selected Key"));
 
 	fps_compat = memnew(Button);
 	fps_compat->set_flat(true);
@@ -7685,9 +7764,11 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	fps_compat->set_toggle_mode(true);
 	fps_compat->set_pressed(true);
 	fps_compat->set_tooltip_text(TTR("Apply snapping to the nearest integer FPS."));
+	fps_compat->set_accessibility_name(TTRC("Apply Snapping to Nearest Integer FPS"));
 	fps_compat->connect(SceneStringName(toggled), callable_mp(this, &AnimationTrackEditor::_update_fps_compat_mode));
 
 	nearest_fps_label = memnew(Label);
+	nearest_fps_label->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	bottom_hf->add_child(nearest_fps_label);
 
 	step = memnew(EditorSpinSlider);
@@ -7697,6 +7778,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	step->set_hide_slider(true);
 	step->set_custom_minimum_size(Size2(100, 0) * EDSCALE);
 	step->set_tooltip_text(TTR("Animation step value."));
+	step->set_accessibility_name(TTRC("Animation Step Value"));
 	bottom_hf->add_child(step);
 	step->connect(SceneStringName(value_changed), callable_mp(this, &AnimationTrackEditor::_update_step));
 	step->set_read_only(true);
@@ -7704,9 +7786,10 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	snap_mode = memnew(OptionButton);
 	snap_mode->add_item(TTR("Seconds"));
 	snap_mode->add_item(TTR("FPS"));
+	snap_mode->set_accessibility_name(TTRC("Snap Mode"));
+	snap_mode->set_disabled(true);
 	bottom_hf->add_child(snap_mode);
 	snap_mode->connect(SceneStringName(item_selected), callable_mp(this, &AnimationTrackEditor::_snap_mode_changed));
-	snap_mode->set_disabled(true);
 
 	bottom_hf->add_child(memnew(VSeparator));
 
@@ -7721,6 +7804,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	zoom->set_value(1.0);
 	zoom->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
 	zoom->set_v_size_flags(SIZE_SHRINK_CENTER);
+	zoom->set_accessibility_name(TTRC("Zoom"));
 	zoom_hb->add_child(zoom);
 	bottom_hf->add_child(zoom_hb);
 	timeline->set_zoom(zoom);
@@ -7731,6 +7815,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	auto_fit->set_flat(true);
 	auto_fit->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_auto_fit));
 	auto_fit->set_shortcut(ED_GET_SHORTCUT("animation_editor/auto_fit"));
+	auto_fit->set_accessibility_name(TTRC("Auto Fit"));
 	bottom_hf->add_child(auto_fit);
 
 	auto_fit_bezier = memnew(Button);
@@ -7738,6 +7823,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	auto_fit_bezier->set_visible(false);
 	auto_fit_bezier->connect(SceneStringName(pressed), callable_mp(this, &AnimationTrackEditor::_auto_fit_bezier));
 	auto_fit_bezier->set_shortcut(ED_GET_SHORTCUT("animation_editor/auto_fit"));
+	auto_fit_bezier->set_accessibility_name(TTRC("Auto Fit Bezier"));
 	bottom_hf->add_child(auto_fit_bezier);
 
 	edit = memnew(MenuButton);
@@ -7746,6 +7832,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	edit->set_flat(false);
 	edit->set_disabled(true);
 	edit->set_tooltip_text(TTR("Animation properties."));
+	edit->set_accessibility_name(TTRC("Animation Properties"));
 	edit->get_popup()->add_item(TTR("Copy Tracks..."), EDIT_COPY_TRACKS);
 	edit->get_popup()->add_item(TTR("Paste Tracks"), EDIT_PASTE_TRACKS);
 	edit->get_popup()->add_separator();
@@ -7790,10 +7877,12 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	prop_selector = memnew(PropertySelector);
 	add_child(prop_selector);
 	prop_selector->connect("selected", callable_mp(this, &AnimationTrackEditor::_new_track_property_selected));
+	prop_selector->set_accessibility_name(TTRC("Track Property"));
 
 	method_selector = memnew(PropertySelector);
 	add_child(method_selector);
 	method_selector->connect("selected", callable_mp(this, &AnimationTrackEditor::_add_method_key));
+	method_selector->set_accessibility_name(TTRC("Method Key"));
 
 	insert_confirm = memnew(ConfirmationDialog);
 	add_child(insert_confirm);
@@ -7838,18 +7927,21 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	optimize_velocity_error->set_min(0.001);
 	optimize_velocity_error->set_step(0.001);
 	optimize_velocity_error->set_value(0.01);
+	optimize_velocity_error->set_accessibility_name(TTRC("Max Velocity Error"));
 	optimize_vb->add_margin_child(TTR("Max Velocity Error:"), optimize_velocity_error);
 	optimize_angular_error = memnew(SpinBox);
 	optimize_angular_error->set_max(1.0);
 	optimize_angular_error->set_min(0.001);
 	optimize_angular_error->set_step(0.001);
 	optimize_angular_error->set_value(0.01);
+	optimize_angular_error->set_accessibility_name(TTRC("Max Angular Error"));
 	optimize_vb->add_margin_child(TTR("Max Angular Error:"), optimize_angular_error);
 	optimize_precision_error = memnew(SpinBox);
 	optimize_precision_error->set_max(6);
 	optimize_precision_error->set_min(1);
 	optimize_precision_error->set_step(1);
 	optimize_precision_error->set_value(3);
+	optimize_precision_error->set_accessibility_name(TTRC("Max Precision Error"));
 	optimize_vb->add_margin_child(TTR("Max Precision Error:"), optimize_precision_error);
 
 	optimize_dialog->set_ok_button_text(TTR("Optimize"));
@@ -7900,6 +7992,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	scale->set_max(99999);
 	scale->set_step(0.001);
 	scale->set_select_all_on_focus(true);
+	scale->set_accessibility_name(TTRC("Scale Ratio"));
 	vbc->add_margin_child(TTR("Scale Ratio:"), scale);
 	scale_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_SCALE_CONFIRM), CONNECT_DEFERRED);
 	add_child(scale_dialog);
@@ -7915,6 +8008,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	ease_grid->set_columns(2);
 	ease_dialog->add_child(ease_grid);
 	transition_selection = memnew(OptionButton);
+	transition_selection->set_accessibility_name(TTRC("Transition Type"));
 	transition_selection->add_item(TTR("Linear", "Transition Type"), Tween::TRANS_LINEAR);
 	transition_selection->add_item(TTR("Sine", "Transition Type"), Tween::TRANS_SINE);
 	transition_selection->add_item(TTR("Quint", "Transition Type"), Tween::TRANS_QUINT);
@@ -7930,6 +8024,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	transition_selection->select(Tween::TRANS_LINEAR); // Default
 	transition_selection->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Translation context is needed.
 	ease_selection = memnew(OptionButton);
+	ease_selection->set_accessibility_name(TTRC("Ease Type"));
 	ease_selection->add_item(TTR("In", "Ease Type"), Tween::EASE_IN);
 	ease_selection->add_item(TTR("Out", "Ease Type"), Tween::EASE_OUT);
 	ease_selection->add_item(TTR("InOut", "Ease Type"), Tween::EASE_IN_OUT);
@@ -7941,6 +8036,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	ease_fps->set_max(999);
 	ease_fps->set_step(FPS_DECIMAL);
 	ease_fps->set_value(30); // Default
+	ease_fps->set_accessibility_name(TTRC("FPS"));
 	ease_grid->add_child(memnew(Label(TTR("Transition Type:"))));
 	ease_grid->add_child(transition_selection);
 	ease_grid->add_child(memnew(Label(TTR("Ease Type:"))));
@@ -7957,12 +8053,16 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	bake_grid->set_columns(2);
 	bake_dialog->add_child(bake_grid);
 	bake_trs = memnew(CheckBox);
+	bake_trs->set_accessibility_name(TTRC("3D Pos/Rot/Scl Track"));
 	bake_trs->set_pressed(true);
 	bake_blendshape = memnew(CheckBox);
+	bake_blendshape->set_accessibility_name(TTRC("Blendshape Track"));
 	bake_blendshape->set_pressed(true);
 	bake_value = memnew(CheckBox);
+	bake_value->set_accessibility_name(TTRC("Value Track"));
 	bake_value->set_pressed(true);
 	bake_fps = memnew(SpinBox);
+	bake_fps->set_accessibility_name(TTRC("FPS"));
 	bake_fps->set_min(FPS_DECIMAL);
 	bake_fps->set_max(999);
 	bake_fps->set_step(FPS_DECIMAL);
@@ -7990,6 +8090,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
 	track_copy_vbox->add_child(select_all_button);
 
 	track_copy_select = memnew(Tree);
+	track_copy_select->set_accessibility_name(TTRC("Copy Selection"));
 	track_copy_select->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	track_copy_select->set_h_size_flags(SIZE_EXPAND_FILL);
 	track_copy_select->set_v_size_flags(SIZE_EXPAND_FILL);
@@ -8110,9 +8211,6 @@ AnimationTrackKeyEditEditor::AnimationTrackKeyEditEditor(Ref<Animation> p_animat
 	spinner->connect("value_focus_exited", callable_mp(this, &AnimationTrackKeyEditEditor::_time_edit_exited), CONNECT_DEFERRED);
 }
 
-AnimationTrackKeyEditEditor::~AnimationTrackKeyEditEditor() {
-}
-
 void AnimationMarkerEdit::_zoom_changed() {
 	queue_redraw();
 	play_position->queue_redraw();
@@ -8329,6 +8427,15 @@ void AnimationMarkerEdit::_notification(int p_what) {
 			selected_icon = get_editor_theme_icon(SNAME("MarkerSelected"));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Animation marker editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (animation.is_null()) {
 				return;
@@ -8635,7 +8742,7 @@ String AnimationMarkerEdit::get_tooltip(const Point2 &p_pos) const {
 
 			if (rect.has_point(p_pos)) {
 				if (const_cast<AnimationMarkerEdit *>(this)->is_key_selectable_by_distance()) {
-					float distance = ABS(offset - p_pos.x);
+					float distance = Math::abs(offset - p_pos.x);
 					if (key_idx == -1 || distance < key_distance) {
 						key_idx = i;
 						key_distance = distance;
@@ -8684,8 +8791,8 @@ PackedStringArray AnimationMarkerEdit::get_selected_section() const {
 		PackedStringArray arr;
 		arr.push_back(""); // Marker with smallest time.
 		arr.push_back(""); // Marker with largest time.
-		double min_time = INFINITY;
-		double max_time = -INFINITY;
+		double min_time = Math::INF;
+		double max_time = -Math::INF;
 		for (const StringName &marker_name : selection) {
 			double time = animation->get_marker_time(marker_name);
 			if (time < min_time) {
@@ -9101,9 +9208,6 @@ AnimationMarkerEdit::AnimationMarkerEdit() {
 	marker_rename_confirm->add_child(marker_rename_error_dialog);
 }
 
-AnimationMarkerEdit::~AnimationMarkerEdit() {
-}
-
 float AnimationMarkerKeyEdit::get_time() const {
 	return animation->get_marker_time(marker_name);
 }
@@ -9291,6 +9395,3 @@ AnimationMarkerKeyEditEditor::AnimationMarkerKeyEditEditor(Ref<Animation> p_anim
 	spinner->connect("ungrabbed", callable_mp(this, &AnimationMarkerKeyEditEditor::_time_edit_exited), CONNECT_DEFERRED);
 	spinner->connect("value_focus_exited", callable_mp(this, &AnimationMarkerKeyEditEditor::_time_edit_exited), CONNECT_DEFERRED);
 }
-
-AnimationMarkerKeyEditEditor::~AnimationMarkerKeyEditEditor() {
-}
diff --git a/engine/editor/animation_track_editor.h b/engine/editor/animation_track_editor.h
index 5d998aed..fa6a143f 100644
--- a/engine/editor/animation_track_editor.h
+++ b/engine/editor/animation_track_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_TRACK_EDITOR_H
-#define ANIMATION_TRACK_EDITOR_H
+#pragma once
 
 #include "editor/editor_data.h"
 #include "editor/editor_properties.h"
@@ -404,7 +403,6 @@ public:
 	void _clear_selection(bool p_update);
 
 	AnimationMarkerEdit();
-	~AnimationMarkerEdit();
 };
 
 class AnimationTrackEdit : public Control {
@@ -803,6 +801,9 @@ class AnimationTrackEditor : public VBoxContainer {
 
 	void _anim_paste_keys(float p_ofs, bool p_ofs_valid, int p_track);
 
+	void _toggle_function_names();
+	Button *function_name_toggler = nullptr;
+
 	void _view_group_toggle();
 	Button *view_group = nullptr;
 	Button *selected_filter = nullptr;
@@ -916,6 +917,7 @@ public:
 
 	Dictionary get_state() const;
 	void set_state(const Dictionary &p_state);
+	void clear();
 
 	void cleanup();
 
@@ -947,6 +949,7 @@ public:
 	bool is_marker_selected(const StringName &p_marker) const;
 	bool is_marker_moving_selection() const;
 	float get_marker_moving_selection_offset() const;
+	bool is_function_name_pressed();
 
 	/** If `p_from_mouse_event` is `true`, handle Shift key presses for precise snapping. */
 	void goto_prev_step(bool p_from_mouse_event);
@@ -983,7 +986,6 @@ class AnimationTrackKeyEditEditor : public EditorProperty {
 
 public:
 	AnimationTrackKeyEditEditor(Ref<Animation> p_animation, int p_track, real_t p_key_ofs, bool p_use_fps);
-	~AnimationTrackKeyEditEditor();
 };
 
 // AnimationMarkerKeyEditEditorPlugin
@@ -1001,7 +1003,4 @@ class AnimationMarkerKeyEditEditor : public EditorProperty {
 
 public:
 	AnimationMarkerKeyEditEditor(Ref<Animation> p_animation, const StringName &p_name, bool p_use_fps);
-	~AnimationMarkerKeyEditEditor();
 };
-
-#endif // ANIMATION_TRACK_EDITOR_H
diff --git a/engine/editor/animation_track_editor_plugins.cpp b/engine/editor/animation_track_editor_plugins.cpp
index cad4a975..3bb10755 100644
--- a/engine/editor/animation_track_editor_plugins.cpp
+++ b/engine/editor/animation_track_editor_plugins.cpp
@@ -1051,13 +1051,13 @@ void AnimationTrackEditTypeAudio::gui_input(const Ref<InputEvent> &p_event) {
 
 			int end = ofs + len * get_timeline()->get_zoom_scale();
 
-			if (end >= get_timeline()->get_name_limit() && end <= get_size().width - get_timeline()->get_buttons_width() && ABS(mm->get_position().x - end) < 5 * EDSCALE) {
+			if (end >= get_timeline()->get_name_limit() && end <= get_size().width - get_timeline()->get_buttons_width() && Math::abs(mm->get_position().x - end) < 5 * EDSCALE) {
 				len_resizing_start = false;
 				use_hsize_cursor = true;
 				len_resizing_index = i;
 			}
 
-			if (ofs >= get_timeline()->get_name_limit() && ofs <= get_size().width - get_timeline()->get_buttons_width() && ABS(mm->get_position().x - ofs) < 5 * EDSCALE) {
+			if (ofs >= get_timeline()->get_name_limit() && ofs <= get_size().width - get_timeline()->get_buttons_width() && Math::abs(mm->get_position().x - ofs) < 5 * EDSCALE) {
 				len_resizing_start = true;
 				use_hsize_cursor = true;
 				len_resizing_index = i;
@@ -1322,9 +1322,6 @@ void AnimationTrackEditTypeAnimation::set_node(Object *p_object) {
 	id = p_object->get_instance_id();
 }
 
-AnimationTrackEditTypeAnimation::AnimationTrackEditTypeAnimation() {
-}
-
 /////////
 AnimationTrackEdit *AnimationTrackEditDefaultPlugin::create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage) {
 	if (p_property == "playing" && (p_object->is_class("AudioStreamPlayer") || p_object->is_class("AudioStreamPlayer2D") || p_object->is_class("AudioStreamPlayer3D"))) {
diff --git a/engine/editor/animation_track_editor_plugins.h b/engine/editor/animation_track_editor_plugins.h
index 7ddbae1b..3b598b5d 100644
--- a/engine/editor/animation_track_editor_plugins.h
+++ b/engine/editor/animation_track_editor_plugins.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_TRACK_EDITOR_PLUGINS_H
-#define ANIMATION_TRACK_EDITOR_PLUGINS_H
+#pragma once
 
 #include "editor/animation_track_editor.h"
 
@@ -88,8 +87,6 @@ public:
 
 	void set_node(Object *p_object);
 	void set_as_coords();
-
-	AnimationTrackEditSpriteFrame() {}
 };
 
 class AnimationTrackEditSubAnim : public AnimationTrackEdit {
@@ -146,7 +143,6 @@ public:
 	virtual void draw_key(int p_index, float p_pixels_sec, int p_x, bool p_selected, int p_clip_left, int p_clip_right) override;
 
 	void set_node(Object *p_object);
-	AnimationTrackEditTypeAnimation();
 };
 
 class AnimationTrackEditVolumeDB : public AnimationTrackEdit {
@@ -167,5 +163,3 @@ public:
 	virtual AnimationTrackEdit *create_audio_track_edit() override;
 	virtual AnimationTrackEdit *create_animation_track_edit(Object *p_object) override;
 };
-
-#endif // ANIMATION_TRACK_EDITOR_PLUGINS_H
diff --git a/engine/editor/audio_stream_preview.h b/engine/editor/audio_stream_preview.h
index 2b9416ea..47be73b0 100644
--- a/engine/editor/audio_stream_preview.h
+++ b/engine/editor/audio_stream_preview.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_PREVIEW_H
-#define AUDIO_STREAM_PREVIEW_H
+#pragma once
 
 #include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
@@ -104,5 +103,3 @@ public:
 
 	AudioStreamPreviewGenerator();
 };
-
-#endif // AUDIO_STREAM_PREVIEW_H
diff --git a/engine/editor/code_editor.cpp b/engine/editor/code_editor.cpp
index 50f21533..b1b18eec 100644
--- a/engine/editor/code_editor.cpp
+++ b/engine/editor/code_editor.cpp
@@ -123,6 +123,7 @@ GotoLinePopup::GotoLinePopup() {
 	line_input->set_select_all_on_focus(true);
 	line_input->connect(SceneStringName(text_changed), callable_mp(this, &GotoLinePopup::_goto_line).unbind(1));
 	line_input->connect(SceneStringName(text_submitted), callable_mp(this, &GotoLinePopup::_submit).unbind(1));
+	line_input->set_accessibility_name(TTRC("Line Number"));
 	vbc->add_child(line_input);
 }
 
@@ -144,6 +145,11 @@ void FindReplaceBar::_notification(int p_what) {
 			_update_toggle_replace_button(replace_text->is_visible_in_tree());
 		} break;
 
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			_update_toggle_replace_button(replace_text->is_visible_in_tree());
+		} break;
+
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			set_process_input(is_visible_in_tree());
 		} break;
@@ -748,6 +754,7 @@ void FindReplaceBar::_bind_methods() {
 FindReplaceBar::FindReplaceBar() {
 	toggle_replace_button = memnew(Button);
 	add_child(toggle_replace_button);
+	toggle_replace_button->set_accessibility_name(TTRC("Replace Mode"));
 	toggle_replace_button->set_flat(true);
 	toggle_replace_button->set_focus_mode(FOCUS_NONE);
 	toggle_replace_button->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_toggle_replace_pressed));
@@ -779,6 +786,7 @@ FindReplaceBar::FindReplaceBar() {
 	vbc_lineedit->add_child(search_text);
 	search_text->set_placeholder(TTR("Find"));
 	search_text->set_tooltip_text(TTR("Find"));
+	search_text->set_accessibility_name(TTRC("Find"));
 	search_text->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
 	search_text->connect(SceneStringName(text_changed), callable_mp(this, &FindReplaceBar::_search_text_changed));
 	search_text->connect(SceneStringName(text_submitted), callable_mp(this, &FindReplaceBar::_search_text_submitted));
@@ -790,6 +798,7 @@ FindReplaceBar::FindReplaceBar() {
 	find_prev = memnew(Button);
 	find_prev->set_flat(true);
 	find_prev->set_tooltip_text(TTR("Previous Match"));
+	find_prev->set_accessibility_name(TTRC("Previous Match"));
 	hbc_button_search->add_child(find_prev);
 	find_prev->set_focus_mode(FOCUS_NONE);
 	find_prev->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::search_prev));
@@ -797,6 +806,7 @@ FindReplaceBar::FindReplaceBar() {
 	find_next = memnew(Button);
 	find_next->set_flat(true);
 	find_next->set_tooltip_text(TTR("Next Match"));
+	find_next->set_accessibility_name(TTRC("Next Match"));
 	hbc_button_search->add_child(find_next);
 	find_next->set_focus_mode(FOCUS_NONE);
 	find_next->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::search_next));
@@ -818,6 +828,7 @@ FindReplaceBar::FindReplaceBar() {
 	vbc_lineedit->add_child(replace_text);
 	replace_text->set_placeholder(TTR("Replace"));
 	replace_text->set_tooltip_text(TTR("Replace"));
+	replace_text->set_accessibility_name(TTRC("Replace"));
 	replace_text->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
 	replace_text->connect(SceneStringName(text_submitted), callable_mp(this, &FindReplaceBar::_replace_text_submitted));
 
@@ -840,6 +851,7 @@ FindReplaceBar::FindReplaceBar() {
 	hide_button = memnew(TextureButton);
 	add_child(hide_button);
 	hide_button->set_tooltip_text(TTR("Hide"));
+	hide_button->set_accessibility_name(TTRC("Hide"));
 	hide_button->set_focus_mode(FOCUS_NONE);
 	hide_button->connect(SceneStringName(pressed), callable_mp(this, &FindReplaceBar::_hide_bar));
 	hide_button->set_v_size_flags(SIZE_SHRINK_CENTER);
@@ -1622,10 +1634,10 @@ void CodeTextEditor::_set_show_warnings_panel(bool p_show) {
 	emit_signal(SNAME("show_warnings_panel"), p_show);
 }
 
-void CodeTextEditor::_toggle_scripts_pressed() {
-	ERR_FAIL_NULL(toggle_scripts_list);
-	toggle_scripts_list->set_visible(!toggle_scripts_list->is_visible());
-	update_toggle_scripts_button();
+void CodeTextEditor::_toggle_files_pressed() {
+	ERR_FAIL_NULL(toggle_files_list);
+	toggle_files_list->set_visible(!toggle_files_list->is_visible());
+	update_toggle_files_button();
 }
 
 void CodeTextEditor::_error_pressed(const Ref<InputEvent> &p_event) {
@@ -1643,15 +1655,22 @@ void CodeTextEditor::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
-			if (toggle_scripts_button->is_visible()) {
-				update_toggle_scripts_button();
+			if (toggle_files_button->is_visible()) {
+				update_toggle_files_button();
 			}
 			_update_text_editor_theme();
 		} break;
 
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			if (toggle_files_button->is_visible()) {
+				update_toggle_files_button();
+			}
+		} break;
+
 		case NOTIFICATION_VISIBILITY_CHANGED: {
-			if (toggle_scripts_button->is_visible()) {
-				update_toggle_scripts_button();
+			if (toggle_files_button->is_visible()) {
+				update_toggle_files_button();
 			}
 			set_process_input(is_visible_in_tree());
 		} break;
@@ -1718,7 +1737,7 @@ void CodeTextEditor::toggle_bookmark() {
 
 void CodeTextEditor::goto_next_bookmark() {
 	PackedInt32Array bmarks = text_editor->get_bookmarked_lines();
-	if (bmarks.size() <= 0) {
+	if (bmarks.is_empty()) {
 		return;
 	}
 
@@ -1734,7 +1753,7 @@ void CodeTextEditor::goto_next_bookmark() {
 
 void CodeTextEditor::goto_prev_bookmark() {
 	PackedInt32Array bmarks = text_editor->get_bookmarked_lines();
-	if (bmarks.size() <= 0) {
+	if (bmarks.is_empty()) {
 		return;
 	}
 
@@ -1808,18 +1827,18 @@ void CodeTextEditor::set_code_complete_func(CodeTextEditorCodeCompleteFunc p_cod
 }
 
 void CodeTextEditor::set_toggle_list_control(Control *p_control) {
-	toggle_scripts_list = p_control;
+	toggle_files_list = p_control;
 }
 
-void CodeTextEditor::show_toggle_scripts_button() {
-	toggle_scripts_button->show();
+void CodeTextEditor::show_toggle_files_button() {
+	toggle_files_button->show();
 }
 
-void CodeTextEditor::update_toggle_scripts_button() {
-	ERR_FAIL_NULL(toggle_scripts_list);
-	bool forward = toggle_scripts_list->is_visible() == is_layout_rtl();
-	toggle_scripts_button->set_button_icon(get_editor_theme_icon(forward ? SNAME("Forward") : SNAME("Back")));
-	toggle_scripts_button->set_tooltip_text(vformat("%s (%s)", TTR("Toggle Scripts Panel"), ED_GET_SHORTCUT("script_editor/toggle_scripts_panel")->get_as_text()));
+void CodeTextEditor::update_toggle_files_button() {
+	ERR_FAIL_NULL(toggle_files_list);
+	bool forward = toggle_files_list->is_visible() == is_layout_rtl();
+	toggle_files_button->set_button_icon(get_editor_theme_icon(forward ? SNAME("Forward") : SNAME("Back")));
+	toggle_files_button->set_tooltip_text(vformat("%s (%s)", TTR("Toggle Files Panel"), ED_GET_SHORTCUT("script_editor/toggle_files_panel")->get_as_text()));
 }
 
 CodeTextEditor::CodeTextEditor() {
@@ -1856,12 +1875,13 @@ CodeTextEditor::CodeTextEditor() {
 	error_line = 0;
 	error_column = 0;
 
-	toggle_scripts_button = memnew(Button);
-	toggle_scripts_button->set_flat(true);
-	toggle_scripts_button->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
-	toggle_scripts_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_toggle_scripts_pressed));
-	status_bar->add_child(toggle_scripts_button);
-	toggle_scripts_button->hide();
+	toggle_files_button = memnew(Button);
+	toggle_files_button->set_flat(true);
+	toggle_files_button->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
+	toggle_files_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_toggle_files_pressed));
+	toggle_files_button->set_accessibility_name(TTRC("Scripts"));
+	status_bar->add_child(toggle_files_button);
+	toggle_files_button->hide();
 
 	// Error
 	ScrollContainer *scroll = memnew(ScrollContainer);
@@ -1884,6 +1904,7 @@ CodeTextEditor::CodeTextEditor() {
 	error_button->set_default_cursor_shape(CURSOR_POINTING_HAND);
 	error_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_error_button_pressed));
 	error_button->set_tooltip_text(TTR("Errors"));
+	error_button->set_accessibility_name(TTRC("Errors"));
 
 	// Warnings
 	warning_button = memnew(Button);
@@ -1893,6 +1914,7 @@ CodeTextEditor::CodeTextEditor() {
 	warning_button->set_default_cursor_shape(CURSOR_POINTING_HAND);
 	warning_button->connect(SceneStringName(pressed), callable_mp(this, &CodeTextEditor::_warning_button_pressed));
 	warning_button->set_tooltip_text(TTR("Warnings"));
+	warning_button->set_accessibility_name(TTRC("Warnings"));
 
 	status_bar->add_child(memnew(VSeparator));
 
@@ -1906,9 +1928,10 @@ CodeTextEditor::CodeTextEditor() {
 			// TRANSLATORS: The placeholders are keyboard shortcuts. The first one is in the form of "Ctrl+"/"Cmd+".
 			vformat(TTR("%sMouse wheel, %s/%s: Finetune\n%s: Reset"), keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL), ED_GET_SHORTCUT("script_editor/zoom_in")->get_as_text(), ED_GET_SHORTCUT("script_editor/zoom_out")->get_as_text(), ED_GET_SHORTCUT("script_editor/reset_zoom")->get_as_text()));
 	zoom_button->set_text("100 %");
+	zoom_button->set_accessibility_name(TTRC("Zoom Factor"));
 
 	PopupMenu *zoom_menu = zoom_button->get_popup();
-	int preset_count = sizeof(ZOOM_FACTOR_PRESETS) / sizeof(float);
+	constexpr int preset_count = std::size(ZOOM_FACTOR_PRESETS);
 
 	for (int i = 0; i < preset_count; i++) {
 		float z = ZOOM_FACTOR_PRESETS[i];
@@ -1925,6 +1948,7 @@ CodeTextEditor::CodeTextEditor() {
 	status_bar->add_child(line_and_col_txt);
 	line_and_col_txt->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
 	line_and_col_txt->set_tooltip_text(TTR("Line and column numbers."));
+	line_and_col_txt->set_accessibility_name(TTRC("Line and Column Numbers"));
 	line_and_col_txt->set_mouse_filter(MOUSE_FILTER_STOP);
 
 	status_bar->add_child(memnew(VSeparator));
@@ -1934,21 +1958,14 @@ CodeTextEditor::CodeTextEditor() {
 	status_bar->add_child(indentation_txt);
 	indentation_txt->set_v_size_flags(SIZE_EXPAND | SIZE_SHRINK_CENTER);
 	indentation_txt->set_tooltip_text(TTR("Indentation"));
+	indentation_txt->set_accessibility_name(TTRC("Indentation"));
 	indentation_txt->set_mouse_filter(MOUSE_FILTER_STOP);
 
 	text_editor->connect(SceneStringName(gui_input), callable_mp(this, &CodeTextEditor::_text_editor_gui_input));
 	text_editor->connect("caret_changed", callable_mp(this, &CodeTextEditor::_line_col_changed));
 	text_editor->connect(SceneStringName(text_changed), callable_mp(this, &CodeTextEditor::_text_changed));
 	text_editor->connect("code_completion_requested", callable_mp(this, &CodeTextEditor::_complete_request));
-	TypedArray<String> cs;
-	cs.push_back(".");
-	cs.push_back(",");
-	cs.push_back("(");
-	cs.push_back("=");
-	cs.push_back("$");
-	cs.push_back("@");
-	cs.push_back("\"");
-	cs.push_back("\'");
+	TypedArray<String> cs = { ".", ",", "(", "=", "$", "@", "\"", "\'" };
 	text_editor->set_code_completion_prefixes(cs);
 	idle->connect("timeout", callable_mp(this, &CodeTextEditor::_text_changed_idle_timeout));
 
diff --git a/engine/editor/code_editor.h b/engine/editor/code_editor.h
index d60d6b4d..082dca7a 100644
--- a/engine/editor/code_editor.h
+++ b/engine/editor/code_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CODE_EDITOR_H
-#define CODE_EDITOR_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -166,8 +165,8 @@ class CodeTextEditor : public VBoxContainer {
 	FindReplaceBar *find_replace_bar = nullptr;
 	HBoxContainer *status_bar = nullptr;
 
-	Button *toggle_scripts_button = nullptr;
-	Control *toggle_scripts_list = nullptr;
+	Button *toggle_files_button = nullptr;
+	Control *toggle_files_list = nullptr;
 	Button *error_button = nullptr;
 	Button *warning_button = nullptr;
 
@@ -221,7 +220,7 @@ class CodeTextEditor : public VBoxContainer {
 
 	void _zoom_popup_id_pressed(int p_idx);
 
-	void _toggle_scripts_pressed();
+	void _toggle_files_pressed();
 
 protected:
 	virtual void _load_theme_settings() {}
@@ -299,10 +298,8 @@ public:
 	void validate_script();
 
 	void set_toggle_list_control(Control *p_control);
-	void show_toggle_scripts_button();
-	void update_toggle_scripts_button();
+	void show_toggle_files_button();
+	void update_toggle_files_button();
 
 	CodeTextEditor();
 };
-
-#endif // CODE_EDITOR_H
diff --git a/engine/editor/connections_dialog.cpp b/engine/editor/connections_dialog.cpp
index dca43411..66c1c573 100644
--- a/engine/editor/connections_dialog.cpp
+++ b/engine/editor/connections_dialog.cpp
@@ -81,7 +81,7 @@ public:
 		String name = p_name;
 
 		if (name.begins_with("bind/argument_")) {
-			int which = name.get_slice("_", 1).to_int() - 1;
+			int which = name.get_slicec('_', 1).to_int() - 1;
 			ERR_FAIL_INDEX_V(which, params.size(), false);
 			params.write[which] = p_value;
 		} else {
@@ -95,7 +95,7 @@ public:
 		String name = p_name;
 
 		if (name.begins_with("bind/argument_")) {
-			int which = name.get_slice("_", 1).to_int() - 1;
+			int which = name.get_slicec('_', 1).to_int() - 1;
 			ERR_FAIL_INDEX_V(which, params.size(), false);
 			r_ret = params[which];
 		} else {
@@ -224,7 +224,7 @@ void ConnectDialog::_remove_bind() {
 	if (st.is_empty()) {
 		return;
 	}
-	int idx = st.get_slice("/", 1).to_int() - 1;
+	int idx = st.get_slicec('/', 1).to_int() - 1;
 
 	ERR_FAIL_INDEX(idx, cdbinds->params.size());
 	cdbinds->params.remove_at(idx);
@@ -255,10 +255,12 @@ StringName ConnectDialog::generate_method_callback_name(Node *p_source, const St
 	subst["NodeName"] = node_name.to_pascal_case();
 	subst["nodeName"] = node_name.to_camel_case();
 	subst["node_name"] = node_name.to_snake_case();
+	subst["node-name"] = node_name.to_kebab_case();
 
 	subst["SignalName"] = p_signal_name.to_pascal_case();
 	subst["signalName"] = p_signal_name.to_camel_case();
 	subst["signal_name"] = p_signal_name.to_snake_case();
+	subst["signal-name"] = p_signal_name.to_kebab_case();
 
 	String dst_method;
 	if (p_source == p_target) {
@@ -282,10 +284,11 @@ List<MethodInfo> ConnectDialog::_filter_method_list(const List<MethodInfo> &p_me
 	bool check_signal = compatible_methods_only->is_pressed();
 	List<MethodInfo> ret;
 
-	List<Pair<Variant::Type, StringName>> effective_args;
+	LocalVector<Pair<Variant::Type, StringName>> effective_args;
 	int unbind = get_unbinds();
-	for (int i = 0; i < p_signal.arguments.size() - unbind; i++) {
-		PropertyInfo pi = p_signal.arguments.get(i);
+	effective_args.reserve(p_signal.arguments.size() - unbind);
+	for (int64_t i = 0; i < p_signal.arguments.size() - unbind; i++) {
+		PropertyInfo pi = p_signal.arguments[i];
 		effective_args.push_back(Pair(pi.type, pi.class_name));
 	}
 	if (unbind == 0) {
@@ -312,17 +315,16 @@ List<MethodInfo> ConnectDialog::_filter_method_list(const List<MethodInfo> &p_me
 			}
 
 			bool type_mismatch = false;
-			const List<Pair<Variant::Type, StringName>>::Element *E = effective_args.front();
-			for (const List<PropertyInfo>::Element *F = mi.arguments.front(); F; F = F->next(), E = E->next()) {
-				Variant::Type stype = E->get().first;
-				Variant::Type mtype = F->get().type;
+			for (int64_t i = 0; i < mi.arguments.size(); ++i) {
+				Variant::Type stype = effective_args[i].first;
+				Variant::Type mtype = mi.arguments[i].type;
 
 				if (stype != Variant::NIL && mtype != Variant::NIL && stype != mtype) {
 					type_mismatch = true;
 					break;
 				}
 
-				if (stype == Variant::OBJECT && mtype == Variant::OBJECT && !ClassDB::is_parent_class(E->get().second, F->get().class_name)) {
+				if (stype == Variant::OBJECT && mtype == Variant::OBJECT && !ClassDB::is_parent_class(effective_args[i].second, mi.arguments[i].class_name)) {
 					type_mismatch = true;
 					break;
 				}
@@ -453,7 +455,13 @@ void ConnectDialog::_update_ok_enabled() {
 }
 
 void ConnectDialog::_update_warning_label() {
-	Ref<Script> scr = source->get_node(dst_path)->get_script();
+	Node *dst = source->get_node(dst_path);
+	if (dst == nullptr) {
+		warning_label->set_visible(false);
+		return;
+	}
+
+	Ref<Script> scr = dst->get_script();
 	if (scr.is_null()) {
 		warning_label->set_visible(false);
 		return;
@@ -546,13 +554,12 @@ String ConnectDialog::get_signature(const MethodInfo &p_method, PackedStringArra
 	signature.append(p_method.name);
 	signature.append("(");
 
-	int i = 0;
-	for (List<PropertyInfo>::ConstIterator itr = p_method.arguments.begin(); itr != p_method.arguments.end(); ++itr, ++i) {
-		if (itr != p_method.arguments.begin()) {
+	for (int64_t i = 0; i < p_method.arguments.size(); ++i) {
+		if (i > 0) {
 			signature.append(", ");
 		}
 
-		const PropertyInfo &pi = *itr;
+		const PropertyInfo &pi = p_method.arguments[i];
 		String type_name;
 		switch (pi.type) {
 			case Variant::NIL:
@@ -575,8 +582,8 @@ String ConnectDialog::get_signature(const MethodInfo &p_method, PackedStringArra
 			case Variant::DICTIONARY:
 				type_name = "Dictionary";
 				if (pi.hint == PROPERTY_HINT_DICTIONARY_TYPE && !pi.hint_string.is_empty()) {
-					String key_hint = pi.hint_string.get_slice(";", 0);
-					String value_hint = pi.hint_string.get_slice(";", 1);
+					String key_hint = pi.hint_string.get_slicec(';', 0);
+					String value_hint = pi.hint_string.get_slicec(';', 1);
 					if (key_hint.is_empty() || key_hint.begins_with("res://")) {
 						key_hint = "Variant";
 					}
@@ -731,6 +738,7 @@ ConnectDialog::ConnectDialog() {
 	vbc_left->set_custom_minimum_size(Vector2(400 * EDSCALE, 0));
 
 	from_signal = memnew(LineEdit);
+	from_signal->set_accessibility_name(TTRC("From Signal"));
 	vbc_left->add_margin_child(TTR("From Signal:"), from_signal);
 	from_signal->set_editable(false);
 
@@ -749,6 +757,7 @@ ConnectDialog::ConnectDialog() {
 	hbc_filter->add_child(filter_nodes);
 	filter_nodes->set_h_size_flags(Control::SIZE_FILL | Control::SIZE_EXPAND);
 	filter_nodes->set_placeholder(TTR("Filter Nodes"));
+	filter_nodes->set_accessibility_name(TTRC("Filter Nodes"));
 	filter_nodes->set_clear_button_enabled(true);
 	filter_nodes->connect(SceneStringName(text_changed), callable_mp(tree, &SceneTreeEditor::set_filter));
 
@@ -781,11 +790,13 @@ ConnectDialog::ConnectDialog() {
 	method_search = memnew(LineEdit);
 	method_vbc->add_child(method_search);
 	method_search->set_placeholder(TTR("Filter Methods"));
+	method_search->set_accessibility_name(TTRC("Filter Methods"));
 	method_search->set_clear_button_enabled(true);
 	method_search->connect(SceneStringName(text_changed), callable_mp(this, &ConnectDialog::_update_method_tree).unbind(1));
 
 	method_tree = memnew(Tree);
 	method_vbc->add_child(method_tree);
+	method_tree->set_accessibility_name(TTRC("Methods"));
 	method_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	method_tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	method_tree->set_hide_root(true);
@@ -819,6 +830,7 @@ ConnectDialog::ConnectDialog() {
 	HBoxContainer *add_bind_hb = memnew(HBoxContainer);
 
 	type_list = memnew(OptionButton);
+	type_list->set_accessibility_name(TTRC("Type"));
 	type_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	add_bind_hb->add_child(type_list);
 	for (int i = 0; i < Variant::VARIANT_MAX; i++) {
@@ -846,12 +858,14 @@ ConnectDialog::ConnectDialog() {
 	vbc_right->add_margin_child(TTR("Add Extra Call Argument:"), add_bind_hb);
 
 	bind_editor = memnew(EditorInspector);
+	bind_editor->set_accessibility_name(TTRC("Extra Call Arguments"));
 	bind_controls.push_back(bind_editor);
 
 	vbc_right->add_margin_child(TTR("Extra Call Arguments:"), bind_editor, true);
 
 	unbind_count = memnew(SpinBox);
 	unbind_count->set_tooltip_text(TTR("Allows to drop arguments sent by signal emitter."));
+	unbind_count->set_accessibility_name(TTRC("Unbind Signal Arguments"));
 	unbind_count->connect(SceneStringName(value_changed), callable_mp(this, &ConnectDialog::_unbind_count_changed));
 
 	vbc_right->add_margin_child(TTR("Unbind Signal Arguments:"), unbind_count);
@@ -860,14 +874,14 @@ ConnectDialog::ConnectDialog() {
 	vbc_left->add_margin_child(TTR("Receiver Method:"), hbc_method);
 
 	dst_method = memnew(LineEdit);
+	dst_method->set_accessibility_name(TTRC("Receiver Method"));
 	dst_method->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	dst_method->connect(SceneStringName(text_changed), callable_mp(method_tree, &Tree::deselect_all).unbind(1));
 	hbc_method->add_child(dst_method);
 	register_text_enter(dst_method);
 
-	open_method_tree = memnew(Button);
+	open_method_tree = memnew(Button(TTRC("Pick")));
 	hbc_method->add_child(open_method_tree);
-	open_method_tree->set_text("Pick");
 	open_method_tree->connect(SceneStringName(pressed), callable_mp(this, &ConnectDialog::_open_method_popup));
 
 	advanced = memnew(CheckButton(TTR("Advanced")));
@@ -1287,11 +1301,14 @@ void ConnectionsDock::_slot_menu_about_to_popup() {
 }
 
 void ConnectionsDock::_tree_gui_input(const Ref<InputEvent> &p_event) {
+	TreeItem *item = nullptr;
+	Point2 item_pos;
+
 	const Ref<InputEventKey> &key = p_event;
 
 	if (key.is_valid() && key->is_pressed() && !key->is_echo()) {
 		if (ED_IS_SHORTCUT("connections_editor/disconnect", p_event)) {
-			TreeItem *item = tree->get_selected();
+			item = tree->get_selected();
 			if (item && _get_item_type(*item) == TREE_ITEM_TYPE_CONNECTION) {
 				Connection connection = item->get_metadata(0);
 				_disconnect(connection);
@@ -1309,22 +1326,32 @@ void ConnectionsDock::_tree_gui_input(const Ref<InputEvent> &p_event) {
 			return;
 		}
 	}
+	if (key.is_valid() && key->is_pressed() && key->is_action("ui_menu", true)) {
+		item = tree->get_selected();
+		if (!item) {
+			return;
+		}
+		item_pos = tree->get_item_rect(item).position;
+	}
 
 	// Handle RMB press.
 	const Ref<InputEventMouseButton> &mb_event = p_event;
 
 	if (mb_event.is_valid() && mb_event->is_pressed() && mb_event->get_button_index() == MouseButton::RIGHT) {
-		TreeItem *item = tree->get_item_at_position(mb_event->get_position());
+		item = tree->get_item_at_position(mb_event->get_position());
 		if (!item) {
 			return;
 		}
+		item_pos = mb_event->get_position();
+	}
 
+	if (item) {
 		if (item->is_selectable(0)) {
 			// Update selection now, before `about_to_popup` signal. Needed for SIGNAL and CONNECTION context menus.
 			tree->set_selected(item);
 		}
 
-		Vector2 screen_position = tree->get_screen_position() + mb_event->get_position();
+		Vector2 screen_position = tree->get_screen_position() + item_pos;
 
 		switch (_get_item_type(*item)) {
 			case TREE_ITEM_TYPE_ROOT:
@@ -1459,8 +1486,8 @@ void ConnectionsDock::update_tree() {
 				List<MethodInfo> base_signals;
 				base->get_script_signal_list(&base_signals);
 				HashSet<String> base_signal_names;
-				for (List<MethodInfo>::Element *F = base_signals.front(); F; F = F->next()) {
-					base_signal_names.insert(F->get().name);
+				for (const MethodInfo &signal : base_signals) {
+					base_signal_names.insert(signal.name);
 				}
 				for (List<MethodInfo>::Element *F = class_signals.front(); F; F = F->next()) {
 					if (base_signal_names.has(F->get().name)) {
@@ -1597,11 +1624,13 @@ ConnectionsDock::ConnectionsDock() {
 	search_box = memnew(LineEdit);
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	search_box->set_placeholder(TTR("Filter Signals"));
+	search_box->set_accessibility_name(TTRC("Filter Signals"));
 	search_box->set_clear_button_enabled(true);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &ConnectionsDock::_filter_changed));
 	vbc->add_child(search_box);
 
 	tree = memnew(ConnectionsDockTree);
+	tree->set_accessibility_name(TTRC("Connections"));
 	tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	tree->set_columns(1);
 	tree->set_select_mode(Tree::SELECT_ROW);
@@ -1612,6 +1641,7 @@ ConnectionsDock::ConnectionsDock() {
 	tree->set_allow_rmb_select(true);
 
 	connect_button = memnew(Button);
+	connect_button->set_accessibility_name(TTRC("Connect"));
 	HBoxContainer *hb = memnew(HBoxContainer);
 	vbc->add_child(hb);
 	hb->add_spacer();
@@ -1658,6 +1688,3 @@ ConnectionsDock::ConnectionsDock() {
 
 	add_theme_constant_override("separation", 3 * EDSCALE);
 }
-
-ConnectionsDock::~ConnectionsDock() {
-}
diff --git a/engine/editor/connections_dialog.h b/engine/editor/connections_dialog.h
index 78f1b76e..442b9fc1 100644
--- a/engine/editor/connections_dialog.h
+++ b/engine/editor/connections_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONNECTIONS_DIALOG_H
-#define CONNECTIONS_DIALOG_H
+#pragma once
 
 #include "scene/gui/check_button.h"
 #include "scene/gui/dialogs.h"
@@ -269,7 +268,4 @@ public:
 	void update_tree();
 
 	ConnectionsDock();
-	~ConnectionsDock();
 };
-
-#endif // CONNECTIONS_DIALOG_H
diff --git a/engine/editor/create_dialog.cpp b/engine/editor/create_dialog.cpp
index 5eebb1c4..09768382 100644
--- a/engine/editor/create_dialog.cpp
+++ b/engine/editor/create_dialog.cpp
@@ -83,8 +83,7 @@ void CreateDialog::_fill_type_list() {
 
 	EditorData &ed = EditorNode::get_editor_data();
 
-	for (List<StringName>::Element *I = complete_type_list.front(); I; I = I->next()) {
-		StringName type = I->get();
+	for (const StringName &type : complete_type_list) {
 		if (!_should_hide_type(type)) {
 			type_list.push_back(type);
 
@@ -216,8 +215,7 @@ void CreateDialog::_update_search() {
 	float highest_score = 0.0f;
 	StringName best_match;
 
-	for (List<StringName>::Element *I = type_list.front(); I; I = I->next()) {
-		StringName candidate = I->get();
+	for (const StringName &candidate : type_list) {
 		if (empty_search || search_text.is_subsequence_ofn(candidate)) {
 			_add_type(candidate, ClassDB::class_exists(candidate) ? TypeCategory::CPP_TYPE : TypeCategory::OTHER_TYPE);
 
@@ -637,7 +635,7 @@ void CreateDialog::_favorite_activated() {
 }
 
 Variant CreateDialog::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
-	TreeItem *ti = favorites->get_item_at_position(p_point);
+	TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? favorites->get_selected() : favorites->get_item_at_position(p_point);
 	if (ti) {
 		Dictionary d;
 		d["type"] = "create_favorite_drag";
@@ -669,13 +667,13 @@ bool CreateDialog::can_drop_data_fw(const Point2 &p_point, const Variant &p_data
 void CreateDialog::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
 	Dictionary d = p_data;
 
-	TreeItem *ti = favorites->get_item_at_position(p_point);
+	TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? favorites->get_selected() : favorites->get_item_at_position(p_point);
 	if (!ti) {
 		return;
 	}
 
 	String drop_at = ti->get_text(0);
-	int ds = favorites->get_drop_section_at_position(p_point);
+	int ds = (p_point == Vector2(Math::INF, Math::INF)) ? favorites->get_drop_section_at_position(favorites->get_item_rect(ti).position) : favorites->get_drop_section_at_position(p_point);
 
 	int drop_idx = favorite_list.find(drop_at);
 	if (drop_idx < 0) {
@@ -789,6 +787,7 @@ CreateDialog::CreateDialog() {
 	vsc->add_child(fav_vb);
 
 	favorites = memnew(Tree);
+	favorites->set_accessibility_name(TTRC("Favorites"));
 	favorites->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	favorites->set_hide_root(true);
 	favorites->set_hide_folding(true);
@@ -806,6 +805,7 @@ CreateDialog::CreateDialog() {
 	rec_vb->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 
 	recent = memnew(ItemList);
+	recent->set_accessibility_name(TTRC("Recent"));
 	recent->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	rec_vb->add_margin_child(TTR("Recent:"), recent, true);
 	recent->set_allow_reselect(true);
@@ -820,6 +820,7 @@ CreateDialog::CreateDialog() {
 	hsc->add_child(vbc);
 
 	search_box = memnew(LineEdit);
+	search_box->set_accessibility_name(TTRC("Search"));
 	search_box->set_clear_button_enabled(true);
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &CreateDialog::_text_changed));
@@ -831,11 +832,13 @@ CreateDialog::CreateDialog() {
 	favorite = memnew(Button);
 	favorite->set_toggle_mode(true);
 	favorite->set_tooltip_text(TTR("(Un)favorite selected item."));
+	favorite->set_accessibility_name(TTRC("(Un)favorite"));
 	favorite->connect(SceneStringName(pressed), callable_mp(this, &CreateDialog::_favorite_toggled));
 	search_hb->add_child(favorite);
 	vbc->add_margin_child(TTR("Search:"), search_hb);
 
 	search_options = memnew(Tree);
+	search_options->set_accessibility_name(TTRC("Matches"));
 	search_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	search_options->connect("item_activated", callable_mp(this, &CreateDialog::_confirmed));
 	search_options->connect("cell_selected", callable_mp(this, &CreateDialog::_item_selected));
@@ -843,6 +846,7 @@ CreateDialog::CreateDialog() {
 	vbc->add_margin_child(TTR("Matches:"), search_options, true);
 
 	help_bit = memnew(EditorHelpBit);
+	help_bit->set_accessibility_name(TTRC("Description"));
 	help_bit->set_content_height_limits(80 * EDSCALE, 80 * EDSCALE);
 	help_bit->connect("request_hide", callable_mp(this, &CreateDialog::_hide_requested));
 	vbc->add_margin_child(TTR("Description:"), help_bit);
diff --git a/engine/editor/create_dialog.h b/engine/editor/create_dialog.h
index 39e9802e..6c49e510 100644
--- a/engine/editor/create_dialog.h
+++ b/engine/editor/create_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CREATE_DIALOG_H
-#define CREATE_DIALOG_H
+#pragma once
 
 #include "editor/editor_help.h"
 #include "scene/gui/button.h"
@@ -124,5 +123,3 @@ public:
 
 	CreateDialog();
 };
-
-#endif // CREATE_DIALOG_H
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp b/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp
index 30abbbce..b6e9dd0b 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_parser.cpp
@@ -144,9 +144,7 @@ Dictionary DebugAdapterParser::req_initialize(const Dictionary &p_params) const
 		// Send all current breakpoints
 		List<String> breakpoints;
 		ScriptEditor::get_singleton()->get_breakpoints(&breakpoints);
-		for (List<String>::Element *E = breakpoints.front(); E; E = E->next()) {
-			String breakpoint = E->get();
-
+		for (const String &breakpoint : breakpoints) {
 			String path = breakpoint.left(breakpoint.find_char(':', 6)); // Skip initial part of path, aka "res://"
 			int line = breakpoint.substr(path.size()).to_int();
 
@@ -301,12 +299,11 @@ Dictionary DebugAdapterParser::req_threads(const Dictionary &p_params) const {
 	Dictionary response = prepare_success_response(p_params), body;
 	response["body"] = body;
 
-	Array arr;
 	DAP::Thread thread;
 
 	thread.id = 1; // Hardcoded because Godot only supports debugging one thread at the moment
 	thread.name = "Main";
-	arr.push_back(thread.to_json());
+	Array arr = { thread.to_json() };
 	body["threads"] = arr;
 
 	return response;
@@ -325,8 +322,7 @@ Dictionary DebugAdapterParser::req_stackTrace(const Dictionary &p_params) const
 
 	Array arr;
 	DebugAdapterProtocol *dap = DebugAdapterProtocol::get_singleton();
-	for (const KeyValue<DAP::StackFrame, List<int>> &E : dap->stackframe_list) {
-		DAP::StackFrame sf = E.key;
+	for (DAP::StackFrame sf : dap->stackframe_list) {
 		if (!lines_at_one) {
 			sf.line--;
 		}
@@ -360,7 +356,7 @@ Dictionary DebugAdapterParser::req_setBreakpoints(const Dictionary &p_params) co
 
 	// If path contains \, it's a Windows path, so we need to convert it to /, and make the drive letter uppercase
 	if (source.path.contains_char('\\')) {
-		source.path = source.path.replace("\\", "/");
+		source.path = source.path.replace_char('\\', '/');
 		source.path = source.path.substr(0, 1).to_upper() + source.path.substr(1);
 	}
 
@@ -372,6 +368,8 @@ Dictionary DebugAdapterParser::req_setBreakpoints(const Dictionary &p_params) co
 		lines.push_back(breakpoint.line + !lines_at_one);
 	}
 
+	// Always update the source checksum for the requested path, as it might have been modified externally.
+	DebugAdapterProtocol::get_singleton()->update_source(source.path);
 	Array updated_breakpoints = DebugAdapterProtocol::get_singleton()->update_breakpoints(source.path, lines);
 	body["breakpoints"] = updated_breakpoints;
 
@@ -383,13 +381,12 @@ Dictionary DebugAdapterParser::req_breakpointLocations(const Dictionary &p_param
 	response["body"] = body;
 	Dictionary args = p_params["arguments"];
 
-	Array locations;
 	DAP::BreakpointLocation location;
 	location.line = args["line"];
 	if (args.has("endLine")) {
 		location.endLine = args["endLine"];
 	}
-	locations.push_back(location.to_json());
+	Array locations = { location.to_json() };
 
 	body["breakpoints"] = locations;
 	return response;
@@ -403,15 +400,13 @@ Dictionary DebugAdapterParser::req_scopes(const Dictionary &p_params) const {
 	int frame_id = args["frameId"];
 	Array scope_list;
 
-	DAP::StackFrame frame;
-	frame.id = frame_id;
-	HashMap<DAP::StackFrame, List<int>, DAP::StackFrame>::Iterator E = DebugAdapterProtocol::get_singleton()->stackframe_list.find(frame);
+	HashMap<DebugAdapterProtocol::DAPStackFrameID, Vector<int>>::Iterator E = DebugAdapterProtocol::get_singleton()->scope_list.find(frame_id);
 	if (E) {
-		ERR_FAIL_COND_V(E->value.size() != 3, prepare_error_response(p_params, DAP::ErrorType::UNKNOWN));
-		List<int>::ConstIterator itr = E->value.begin();
-		for (int i = 0; i < 3; ++itr, ++i) {
+		const Vector<int> &scope_ids = E->value;
+		ERR_FAIL_COND_V(scope_ids.size() != 3, prepare_error_response(p_params, DAP::ErrorType::UNKNOWN));
+		for (int i = 0; i < 3; ++i) {
 			DAP::Scope scope;
-			scope.variablesReference = *itr;
+			scope.variablesReference = scope_ids[i];
 			switch (i) {
 				case 0:
 					scope.name = "Locals";
@@ -595,8 +590,7 @@ Dictionary DebugAdapterParser::ev_stopped_breakpoint(const int &p_id) const {
 	body["reason"] = "breakpoint";
 	body["description"] = "Breakpoint";
 
-	Array breakpoints;
-	breakpoints.push_back(p_id);
+	Array breakpoints = { p_id };
 	body["hitBreakpointIds"] = breakpoints;
 
 	return event;
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_parser.h b/engine/editor/debugger/debug_adapter/debug_adapter_parser.h
index 61cd6c7f..0691e87f 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_parser.h
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_parser.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEBUG_ADAPTER_PARSER_H
-#define DEBUG_ADAPTER_PARSER_H
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "core/debugger/remote_debugger.h"
@@ -49,7 +48,7 @@ private:
 		// If path contains \, it's a Windows path, so we need to convert it to /, and check as case-insensitive.
 		if (p_path.contains_char('\\')) {
 			String project_path = ProjectSettings::get_singleton()->get_resource_path();
-			String path = p_path.replace("\\", "/");
+			String path = p_path.replace_char('\\', '/');
 			return path.containsn(project_path);
 		}
 		return p_path.begins_with(ProjectSettings::get_singleton()->get_resource_path());
@@ -103,5 +102,3 @@ public:
 	Dictionary ev_custom_data(const String &p_msg, const Array &p_data) const;
 	Dictionary ev_breakpoint(const DAP::Breakpoint &p_breakpoint, const bool &p_enabled) const;
 };
-
-#endif // DEBUG_ADAPTER_PARSER_H
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp
index ba4c078d..e01bb29f 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.cpp
@@ -66,8 +66,7 @@ Error DAPeer::handle_data() {
 			// End of headers
 			if (l > 3 && r[l] == '\n' && r[l - 1] == '\r' && r[l - 2] == '\n' && r[l - 3] == '\r') {
 				r[l - 3] = '\0'; // Null terminate to read string
-				String header;
-				header.parse_utf8(r);
+				String header = String::utf8(r);
 				content_length = header.substr(16).to_int();
 				has_header = true;
 				req_pos = 0;
@@ -93,8 +92,7 @@ Error DAPeer::handle_data() {
 		}
 
 		// Parse data
-		String msg;
-		msg.parse_utf8((const char *)req_buf, req_pos);
+		String msg = String::utf8((const char *)req_buf, req_pos);
 
 		// Apply a timestamp if it there's none yet
 		if (!timestamp) {
@@ -118,12 +116,12 @@ Error DAPeer::send_data() {
 		if (!data.has("seq")) {
 			data["seq"] = ++seq;
 		}
-		String formatted_data = format_output(data);
+		const Vector<uint8_t> &formatted_data = format_output(data);
 
 		int data_sent = 0;
-		while (data_sent < formatted_data.length()) {
+		while (data_sent < formatted_data.size()) {
 			int curr_sent = 0;
-			Error err = connection->put_partial_data((const uint8_t *)formatted_data.utf8().get_data(), formatted_data.size() - data_sent - 1, curr_sent);
+			Error err = connection->put_partial_data(formatted_data.ptr() + data_sent, formatted_data.size() - data_sent, curr_sent);
 			if (err != OK) {
 				return err;
 			}
@@ -134,15 +132,12 @@ Error DAPeer::send_data() {
 	return OK;
 }
 
-String DAPeer::format_output(const Dictionary &p_params) const {
-	String response = Variant(p_params).to_json_string();
-	String header = "Content-Length: ";
-	CharString charstr = response.utf8();
-	size_t len = charstr.length();
-	header += itos(len);
-	header += "\r\n\r\n";
+Vector<uint8_t> DAPeer::format_output(const Dictionary &p_params) const {
+	const Vector<uint8_t> &content = Variant(p_params).to_json_string().to_utf8_buffer();
+	Vector<uint8_t> response = vformat("Content-Length: %d\r\n\r\n", content.size()).to_utf8_buffer();
 
-	return header + response;
+	response.append_array(content);
+	return response;
 }
 
 Error DebugAdapterProtocol::on_client_connected() {
@@ -176,6 +171,7 @@ void DebugAdapterProtocol::reset_current_info() {
 void DebugAdapterProtocol::reset_ids() {
 	breakpoint_id = 0;
 	breakpoint_list.clear();
+	breakpoint_source_list.clear();
 
 	reset_stack_info();
 }
@@ -185,6 +181,7 @@ void DebugAdapterProtocol::reset_stack_info() {
 	variable_id = 1;
 
 	stackframe_list.clear();
+	scope_list.clear();
 	variable_list.clear();
 	object_list.clear();
 	object_pending_set.clear();
@@ -205,9 +202,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			x.value = rtos(vec.x);
 			y.value = rtos(vec.y);
 
-			Array arr;
-			arr.push_back(x.to_json());
-			arr.push_back(y.to_json());
+			Array arr = { x.to_json(), y.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -230,11 +225,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			w.value = rtos(rect.size.x);
 			h.value = rtos(rect.size.y);
 
-			Array arr;
-			arr.push_back(x.to_json());
-			arr.push_back(y.to_json());
-			arr.push_back(w.to_json());
-			arr.push_back(h.to_json());
+			Array arr = { x.to_json(), y.to_json(), w.to_json(), h.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -254,10 +245,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			y.value = rtos(vec.y);
 			z.value = rtos(vec.z);
 
-			Array arr;
-			arr.push_back(x.to_json());
-			arr.push_back(y.to_json());
-			arr.push_back(z.to_json());
+			Array arr = { x.to_json(), y.to_json(), z.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -279,10 +267,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			y.variablesReference = parse_variant(transform.columns[1]);
 			origin.variablesReference = parse_variant(transform.columns[2]);
 
-			Array arr;
-			arr.push_back(x.to_json());
-			arr.push_back(y.to_json());
-			arr.push_back(origin.to_json());
+			Array arr = { x.to_json(), y.to_json(), origin.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -298,9 +283,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			normal.value = plane.normal;
 			normal.variablesReference = parse_variant(plane.normal);
 
-			Array arr;
-			arr.push_back(d.to_json());
-			arr.push_back(normal.to_json());
+			Array arr = { d.to_json(), normal.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -322,11 +305,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			z.value = rtos(quat.z);
 			w.value = rtos(quat.w);
 
-			Array arr;
-			arr.push_back(x.to_json());
-			arr.push_back(y.to_json());
-			arr.push_back(z.to_json());
-			arr.push_back(w.to_json());
+			Array arr = { x.to_json(), y.to_json(), z.to_json(), w.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -344,9 +323,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			position.variablesReference = parse_variant(aabb.position);
 			size.variablesReference = parse_variant(aabb.size);
 
-			Array arr;
-			arr.push_back(position.to_json());
-			arr.push_back(size.to_json());
+			Array arr = { position.to_json(), size.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -368,10 +345,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			y.variablesReference = parse_variant(basis.rows[1]);
 			z.variablesReference = parse_variant(basis.rows[2]);
 
-			Array arr;
-			arr.push_back(x.to_json());
-			arr.push_back(y.to_json());
-			arr.push_back(z.to_json());
+			Array arr = { x.to_json(), y.to_json(), z.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -388,9 +362,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			basis.variablesReference = parse_variant(transform.basis);
 			origin.variablesReference = parse_variant(transform.origin);
 
-			Array arr;
-			arr.push_back(basis.to_json());
-			arr.push_back(origin.to_json());
+			Array arr = { basis.to_json(), origin.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -412,11 +384,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			b.value = rtos(color.b);
 			a.value = rtos(color.a);
 
-			Array arr;
-			arr.push_back(r.to_json());
-			arr.push_back(g.to_json());
-			arr.push_back(b.to_json());
-			arr.push_back(a.to_json());
+			Array arr = { r.to_json(), g.to_json(), b.to_json(), a.to_json() };
 			variable_list.insert(id, arr);
 			return id;
 		}
@@ -428,8 +396,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -447,10 +414,10 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			Dictionary dictionary = p_var;
 			Array arr;
 
-			for (int i = 0; i < dictionary.size(); i++) {
+			for (const KeyValue<Variant, Variant> &kv : dictionary) {
 				DAP::Variable var;
-				var.name = dictionary.get_key_at_index(i);
-				Variant value = dictionary.get_value_at_index(i);
+				var.name = kv.key;
+				Variant value = kv.value;
 				var.type = Variant::get_type_name(value.get_type());
 				var.value = value;
 				var.variablesReference = parse_variant(value);
@@ -467,8 +434,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -488,8 +454,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -509,8 +474,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -530,8 +494,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -551,8 +514,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -572,8 +534,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -593,8 +554,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -615,8 +575,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -637,8 +596,7 @@ int DebugAdapterProtocol::parse_variant(const Variant &p_var) {
 			size.type = Variant::get_type_name(Variant::INT);
 			size.value = itos(array.size());
 
-			Array arr;
-			arr.push_back(size.to_json());
+			Array arr = { size.to_json() };
 
 			for (int i = 0; i < array.size(); i++) {
 				DAP::Variable var;
@@ -843,7 +801,9 @@ bool DebugAdapterProtocol::request_remote_object(const ObjectID &p_object_id) {
 		return false;
 	}
 
-	EditorDebuggerNode::get_singleton()->get_default_debugger()->request_remote_object(p_object_id);
+	TypedArray<uint64_t> arr;
+	arr.append(p_object_id);
+	EditorDebuggerNode::get_singleton()->get_default_debugger()->request_remote_objects(arr);
 	object_pending_set.insert(p_object_id);
 
 	return true;
@@ -861,6 +821,30 @@ bool DebugAdapterProtocol::request_remote_evaluate(const String &p_eval, int p_s
 	return true;
 }
 
+const DAP::Source &DebugAdapterProtocol::fetch_source(const String &p_path) {
+	const String &global_path = ProjectSettings::get_singleton()->globalize_path(p_path);
+
+	HashMap<String, DAP::Source>::Iterator E = breakpoint_source_list.find(global_path);
+	if (E != breakpoint_source_list.end()) {
+		return E->value;
+	}
+	DAP::Source &added_source = breakpoint_source_list.insert(global_path, DAP::Source())->value;
+	added_source.name = global_path.get_file();
+	added_source.path = global_path;
+	added_source.compute_checksums();
+
+	return added_source;
+}
+
+void DebugAdapterProtocol::update_source(const String &p_path) {
+	const String &global_path = ProjectSettings::get_singleton()->globalize_path(p_path);
+
+	HashMap<String, DAP::Source>::Iterator E = breakpoint_source_list.find(global_path);
+	if (E != breakpoint_source_list.end()) {
+		E->value.compute_checksums();
+	}
+}
+
 bool DebugAdapterProtocol::process_message(const String &p_text) {
 	JSON json;
 	ERR_FAIL_COND_V_MSG(json.parse(p_text) != OK, true, "Malformed message!");
@@ -878,8 +862,7 @@ bool DebugAdapterProtocol::process_message(const String &p_text) {
 	if (parser->has_method(command)) {
 		_current_request = params["command"];
 
-		Array args;
-		args.push_back(params);
+		Array args = { params };
 		Dictionary response = parser->callv(command, args);
 		if (!response.is_empty()) {
 			_current_peer->res_queue.push_front(response);
@@ -904,66 +887,66 @@ void DebugAdapterProtocol::notify_process() {
 	String launch_mode = _current_peer->attached ? "attach" : "launch";
 
 	Dictionary event = parser->ev_process(launch_mode);
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		E->get()->res_queue.push_back(event);
+	for (const Ref<DAPeer> &peer : clients) {
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_terminated() {
 	Dictionary event = parser->ev_terminated();
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		if ((_current_request == "launch" || _current_request == "restart") && _current_peer == E->get()) {
+	for (const Ref<DAPeer> &peer : clients) {
+		if ((_current_request == "launch" || _current_request == "restart") && _current_peer == peer) {
 			continue;
 		}
-		E->get()->res_queue.push_back(event);
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_exited(const int &p_exitcode) {
 	Dictionary event = parser->ev_exited(p_exitcode);
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		if ((_current_request == "launch" || _current_request == "restart") && _current_peer == E->get()) {
+	for (const Ref<DAPeer> &peer : clients) {
+		if ((_current_request == "launch" || _current_request == "restart") && _current_peer == peer) {
 			continue;
 		}
-		E->get()->res_queue.push_back(event);
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_stopped_paused() {
 	Dictionary event = parser->ev_stopped_paused();
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		E->get()->res_queue.push_back(event);
+	for (const Ref<DAPeer> &peer : clients) {
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_stopped_exception(const String &p_error) {
 	Dictionary event = parser->ev_stopped_exception(p_error);
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		E->get()->res_queue.push_back(event);
+	for (const Ref<DAPeer> &peer : clients) {
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_stopped_breakpoint(const int &p_id) {
 	Dictionary event = parser->ev_stopped_breakpoint(p_id);
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		E->get()->res_queue.push_back(event);
+	for (const Ref<DAPeer> &peer : clients) {
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_stopped_step() {
 	Dictionary event = parser->ev_stopped_step();
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		E->get()->res_queue.push_back(event);
+	for (const Ref<DAPeer> &peer : clients) {
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_continued() {
 	Dictionary event = parser->ev_continued();
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		if (_current_request == "continue" && E->get() == _current_peer) {
+	for (const Ref<DAPeer> &peer : clients) {
+		if (_current_request == "continue" && peer == _current_peer) {
 			continue;
 		}
-		E->get()->res_queue.push_back(event);
+		peer->res_queue.push_back(event);
 	}
 
 	reset_stack_info();
@@ -971,15 +954,14 @@ void DebugAdapterProtocol::notify_continued() {
 
 void DebugAdapterProtocol::notify_output(const String &p_message, RemoteDebugger::MessageType p_type) {
 	Dictionary event = parser->ev_output(p_message, p_type);
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		E->get()->res_queue.push_back(event);
+	for (const Ref<DAPeer> &peer : clients) {
+		peer->res_queue.push_back(event);
 	}
 }
 
 void DebugAdapterProtocol::notify_custom_data(const String &p_msg, const Array &p_data) {
 	Dictionary event = parser->ev_custom_data(p_msg, p_data);
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		Ref<DAPeer> peer = E->get();
+	for (const Ref<DAPeer> &peer : clients) {
 		if (peer->supportsCustomData) {
 			peer->res_queue.push_back(event);
 		}
@@ -988,11 +970,11 @@ void DebugAdapterProtocol::notify_custom_data(const String &p_msg, const Array &
 
 void DebugAdapterProtocol::notify_breakpoint(const DAP::Breakpoint &p_breakpoint, const bool &p_enabled) {
 	Dictionary event = parser->ev_breakpoint(p_breakpoint, p_enabled);
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		if (_current_request == "setBreakpoints" && E->get() == _current_peer) {
+	for (const Ref<DAPeer> &peer : clients) {
+		if (_current_request == "setBreakpoints" && peer == _current_peer) {
 			continue;
 		}
-		E->get()->res_queue.push_back(event);
+		peer->res_queue.push_back(event);
 	}
 }
 
@@ -1001,23 +983,40 @@ Array DebugAdapterProtocol::update_breakpoints(const String &p_path, const Array
 
 	// Add breakpoints
 	for (int i = 0; i < p_lines.size(); i++) {
-		EditorDebuggerNode::get_singleton()->get_default_debugger()->_set_breakpoint(p_path, p_lines[i], true);
-		DAP::Breakpoint breakpoint;
+		DAP::Breakpoint breakpoint(fetch_source(p_path));
 		breakpoint.line = p_lines[i];
-		breakpoint.source.path = p_path;
 
-		ERR_FAIL_COND_V(!breakpoint_list.find(breakpoint), Array());
-		updated_breakpoints.push_back(breakpoint_list.find(breakpoint)->get().to_json());
+		// Avoid duplicated entries.
+		List<DAP::Breakpoint>::Element *E = breakpoint_list.find(breakpoint);
+		if (E) {
+			updated_breakpoints.push_back(E->get().to_json());
+			continue;
+		}
+
+		EditorDebuggerNode::get_singleton()->get_default_debugger()->_set_breakpoint(p_path, p_lines[i], true);
+
+		// Breakpoints are inserted at the end of the breakpoint list.
+		List<DAP::Breakpoint>::Element *added_breakpoint = breakpoint_list.back();
+		ERR_FAIL_NULL_V(added_breakpoint, Array());
+		ERR_FAIL_COND_V(!(added_breakpoint->get() == breakpoint), Array());
+		updated_breakpoints.push_back(added_breakpoint->get().to_json());
 	}
 
 	// Remove breakpoints
-	for (List<DAP::Breakpoint>::Element *E = breakpoint_list.front(); E; E = E->next()) {
-		DAP::Breakpoint b = E->get();
-		if (b.source.path == p_path && !p_lines.has(b.line)) {
-			EditorDebuggerNode::get_singleton()->get_default_debugger()->_set_breakpoint(p_path, b.line, false);
+	// Must be deferred because we are iterating the breakpoint list.
+	Vector<int> to_remove;
+
+	for (const DAP::Breakpoint &b : breakpoint_list) {
+		if (b.source->path == p_path && !p_lines.has(b.line)) {
+			to_remove.push_back(b.line);
 		}
 	}
 
+	// Safe to remove queued data now.
+	for (const int &line : to_remove) {
+		EditorDebuggerNode::get_singleton()->get_default_debugger()->_set_breakpoint(p_path, line, false);
+	}
+
 	return updated_breakpoints;
 }
 
@@ -1032,6 +1031,7 @@ void DebugAdapterProtocol::on_debug_paused() {
 void DebugAdapterProtocol::on_debug_stopped() {
 	notify_exited();
 	notify_terminated();
+	reset_ids();
 }
 
 void DebugAdapterProtocol::on_debug_output(const String &p_message, int p_type) {
@@ -1059,10 +1059,8 @@ void DebugAdapterProtocol::on_debug_breaked(const bool &p_reallydid, const bool
 }
 
 void DebugAdapterProtocol::on_debug_breakpoint_toggled(const String &p_path, const int &p_line, const bool &p_enabled) {
-	DAP::Breakpoint breakpoint;
+	DAP::Breakpoint breakpoint(fetch_source(p_path));
 	breakpoint.verified = true;
-	breakpoint.source.path = ProjectSettings::get_singleton()->globalize_path(p_path);
-	breakpoint.source.compute_checksums();
 	breakpoint.line = p_line;
 
 	if (p_enabled) {
@@ -1085,8 +1083,7 @@ void DebugAdapterProtocol::on_debug_stack_dump(const Array &p_stack_dump) {
 	if (_processing_breakpoint && !p_stack_dump.is_empty()) {
 		// Find existing breakpoint
 		Dictionary d = p_stack_dump[0];
-		DAP::Breakpoint breakpoint;
-		breakpoint.source.path = ProjectSettings::get_singleton()->globalize_path(d["file"]);
+		DAP::Breakpoint breakpoint(fetch_source(d["file"]));
 		breakpoint.line = d["line"];
 
 		List<DAP::Breakpoint>::Element *E = breakpoint_list.find(breakpoint);
@@ -1099,25 +1096,26 @@ void DebugAdapterProtocol::on_debug_stack_dump(const Array &p_stack_dump) {
 
 	stackframe_id = 0;
 	stackframe_list.clear();
+	scope_list.clear();
 
 	// Fill in stacktrace information
 	for (int i = 0; i < p_stack_dump.size(); i++) {
 		Dictionary stack_info = p_stack_dump[i];
-		DAP::StackFrame stackframe;
+
+		DAP::StackFrame stackframe(fetch_source(stack_info["file"]));
 		stackframe.id = stackframe_id++;
 		stackframe.name = stack_info["function"];
 		stackframe.line = stack_info["line"];
 		stackframe.column = 0;
-		stackframe.source.path = ProjectSettings::get_singleton()->globalize_path(stack_info["file"]);
-		stackframe.source.compute_checksums();
 
 		// Information for "Locals", "Members" and "Globals" variables respectively
-		List<int> scope_ids;
+		Vector<int> scope_ids;
 		for (int j = 0; j < 3; j++) {
 			scope_ids.push_back(variable_id++);
 		}
 
-		stackframe_list.insert(stackframe, scope_ids);
+		stackframe_list.push_back(stackframe);
+		scope_list.insert(stackframe.id, scope_ids);
 	}
 
 	_current_frame = 0;
@@ -1126,12 +1124,9 @@ void DebugAdapterProtocol::on_debug_stack_dump(const Array &p_stack_dump) {
 
 void DebugAdapterProtocol::on_debug_stack_frame_vars(const int &p_size) {
 	_remaining_vars = p_size;
-	DAP::StackFrame frame;
-	frame.id = _current_frame;
-	ERR_FAIL_COND(!stackframe_list.has(frame));
-	List<int> scope_ids = stackframe_list.find(frame)->value;
-	for (List<int>::Element *E = scope_ids.front(); E; E = E->next()) {
-		int var_id = E->get();
+	ERR_FAIL_COND(!scope_list.has(_current_frame));
+	Vector<int> scope_ids = scope_list.find(_current_frame)->value;
+	for (const int &var_id : scope_ids) {
 		if (variable_list.has(var_id)) {
 			variable_list.find(var_id)->value.clear();
 		} else {
@@ -1144,11 +1139,9 @@ void DebugAdapterProtocol::on_debug_stack_frame_var(const Array &p_data) {
 	DebuggerMarshalls::ScriptStackVariable stack_var;
 	stack_var.deserialize(p_data);
 
-	ERR_FAIL_COND(stackframe_list.is_empty());
-	DAP::StackFrame frame;
-	frame.id = _current_frame;
+	ERR_FAIL_COND(!scope_list.has(_current_frame));
+	Vector<int> scope_ids = scope_list.find(_current_frame)->value;
 
-	List<int> scope_ids = stackframe_list.find(frame)->value;
 	ERR_FAIL_COND(scope_ids.size() != 3);
 	ERR_FAIL_INDEX(stack_var.type, 4);
 	int var_id = scope_ids.get(stack_var.type);
@@ -1192,8 +1185,7 @@ void DebugAdapterProtocol::poll() {
 		on_client_connected();
 	}
 	List<Ref<DAPeer>> to_delete;
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		Ref<DAPeer> peer = E->get();
+	for (const Ref<DAPeer> &peer : clients) {
 		peer->connection->poll();
 		StreamPeerTCP::Status status = peer->connection->get_status();
 		if (status == StreamPeerTCP::STATUS_NONE || status == StreamPeerTCP::STATUS_ERROR) {
@@ -1211,8 +1203,8 @@ void DebugAdapterProtocol::poll() {
 		}
 	}
 
-	for (List<Ref<DAPeer>>::Element *E = to_delete.front(); E; E = E->next()) {
-		on_client_disconnected(E->get());
+	for (const Ref<DAPeer> &peer : to_delete) {
+		on_client_disconnected(peer);
 	}
 	to_delete.clear();
 }
@@ -1225,8 +1217,8 @@ Error DebugAdapterProtocol::start(int p_port, const IPAddress &p_bind_ip) {
 }
 
 void DebugAdapterProtocol::stop() {
-	for (List<Ref<DAPeer>>::Element *E = clients.front(); E; E = E->next()) {
-		E->get()->connection->disconnect_from_host();
+	for (const Ref<DAPeer> &peer : clients) {
+		peer->connection->disconnect_from_host();
 	}
 
 	clients.clear();
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h
index 1d1e1838..9cd5741b 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_protocol.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEBUG_ADAPTER_PROTOCOL_H
-#define DEBUG_ADAPTER_PROTOCOL_H
+#pragma once
 
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/stream_peer_tcp.h"
@@ -68,7 +67,7 @@ struct DAPeer : RefCounted {
 
 	Error handle_data();
 	Error send_data();
-	String format_output(const Dictionary &p_params) const;
+	Vector<uint8_t> format_output(const Dictionary &p_params) const;
 };
 
 class DebugAdapterProtocol : public Object {
@@ -77,6 +76,7 @@ class DebugAdapterProtocol : public Object {
 	friend class DebugAdapterParser;
 
 	using DAPVarID = int;
+	using DAPStackFrameID = int;
 
 private:
 	static DebugAdapterProtocol *singleton;
@@ -110,6 +110,9 @@ private:
 	bool request_remote_object(const ObjectID &p_object_id);
 	bool request_remote_evaluate(const String &p_eval, int p_stack_frame);
 
+	const DAP::Source &fetch_source(const String &p_path);
+	void update_source(const String &p_path);
+
 	bool _initialized = false;
 	bool _processing_breakpoint = false;
 	bool _stepping = false;
@@ -126,7 +129,9 @@ private:
 	int stackframe_id = 0;
 	DAPVarID variable_id = 0;
 	List<DAP::Breakpoint> breakpoint_list;
-	HashMap<DAP::StackFrame, List<int>, DAP::StackFrame> stackframe_list;
+	HashMap<String, DAP::Source> breakpoint_source_list;
+	List<DAP::StackFrame> stackframe_list;
+	HashMap<DAPStackFrameID, Vector<int>> scope_list;
 	HashMap<DAPVarID, Array> variable_list;
 
 	HashMap<ObjectID, DAPVarID> object_list;
@@ -168,5 +173,3 @@ public:
 	DebugAdapterProtocol();
 	~DebugAdapterProtocol();
 };
-
-#endif // DEBUG_ADAPTER_PROTOCOL_H
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_server.h b/engine/editor/debugger/debug_adapter/debug_adapter_server.h
index 52271b16..3f5160d6 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_server.h
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEBUG_ADAPTER_SERVER_H
-#define DEBUG_ADAPTER_SERVER_H
+#pragma once
 
 #include "debug_adapter_protocol.h"
 #include "editor/plugins/editor_plugin.h"
@@ -54,5 +53,3 @@ public:
 	void start();
 	void stop();
 };
-
-#endif // DEBUG_ADAPTER_SERVER_H
diff --git a/engine/editor/debugger/debug_adapter/debug_adapter_types.h b/engine/editor/debugger/debug_adapter/debug_adapter_types.h
index c8de8319..895bd3b7 100644
--- a/engine/editor/debugger/debug_adapter/debug_adapter_types.h
+++ b/engine/editor/debugger/debug_adapter/debug_adapter_types.h
@@ -28,11 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEBUG_ADAPTER_TYPES_H
-#define DEBUG_ADAPTER_TYPES_H
+#pragma once
 
-#include "core/io/json.h"
-#include "core/variant/dictionary.h"
+#include "core/io/file_access.h"
 
 namespace DAP {
 
@@ -69,6 +67,8 @@ public:
 	void compute_checksums() {
 		ERR_FAIL_COND(path.is_empty());
 
+		_checksums.clear();
+
 		// MD5
 		Checksum md5;
 		md5.algorithm = "MD5";
@@ -102,18 +102,24 @@ public:
 struct Breakpoint {
 	int id = 0;
 	bool verified = false;
-	Source source;
+	const Source *source = nullptr;
 	int line = 0;
 
+	Breakpoint() = default; // Empty constructor is invalid, but is necessary because Godot's collections don't support rvalues.
+	Breakpoint(const Source &p_source) :
+			source(&p_source) {}
+
 	bool operator==(const Breakpoint &p_other) const {
-		return source.path == p_other.source.path && line == p_other.line;
+		return source == p_other.source && line == p_other.line;
 	}
 
 	_FORCE_INLINE_ Dictionary to_json() const {
 		Dictionary dict;
 		dict["id"] = id;
 		dict["verified"] = verified;
-		dict["source"] = source.to_json();
+		if (source) {
+			dict["source"] = source->to_json();
+		}
 		dict["line"] = line;
 
 		return dict;
@@ -159,9 +165,7 @@ struct Capabilities {
 		dict["supportsTerminateRequest"] = supportsTerminateRequest;
 		dict["supportsBreakpointLocationsRequest"] = supportsBreakpointLocationsRequest;
 
-		Array arr;
-		arr.push_back(supportedChecksumAlgorithms[0]);
-		arr.push_back(supportedChecksumAlgorithms[1]);
+		Array arr = { supportedChecksumAlgorithms[0], supportedChecksumAlgorithms[1] };
 		dict["supportedChecksumAlgorithms"] = arr;
 
 		return dict;
@@ -215,30 +219,25 @@ struct SourceBreakpoint {
 struct StackFrame {
 	int id = 0;
 	String name;
-	Source source;
+	const Source *source = nullptr;
 	int line = 0;
 	int column = 0;
 
+	StackFrame() = default; // Empty constructor is invalid, but is necessary because Godot's collections don't support rvalues.
+	StackFrame(const Source &p_source) :
+			source(&p_source) {}
+
 	static uint32_t hash(const StackFrame &p_frame) {
 		return hash_murmur3_one_32(p_frame.id);
 	}
-	bool operator==(const StackFrame &p_other) const {
-		return id == p_other.id;
-	}
-
-	_FORCE_INLINE_ void from_json(const Dictionary &p_params) {
-		id = p_params["id"];
-		name = p_params["name"];
-		source.from_json(p_params["source"]);
-		line = p_params["line"];
-		column = p_params["column"];
-	}
 
 	_FORCE_INLINE_ Dictionary to_json() const {
 		Dictionary dict;
 		dict["id"] = id;
 		dict["name"] = name;
-		dict["source"] = source.to_json();
+		if (source) {
+			dict["source"] = source->to_json();
+		}
 		dict["line"] = line;
 		dict["column"] = column;
 
@@ -277,5 +276,3 @@ struct Variable {
 };
 
 } // namespace DAP
-
-#endif // DEBUG_ADAPTER_TYPES_H
diff --git a/engine/editor/debugger/editor_debugger_inspector.cpp b/engine/editor/debugger/editor_debugger_inspector.cpp
index 7a1435e9..121378a7 100644
--- a/engine/editor/debugger/editor_debugger_inspector.cpp
+++ b/engine/editor/debugger/editor_debugger_inspector.cpp
@@ -33,29 +33,57 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/io/marshalls.h"
 #include "editor/editor_node.h"
+#include "editor/editor_undo_redo_manager.h"
+#include "editor/inspector_dock.h"
 #include "scene/debugger/scene_debugger.h"
 
-bool EditorDebuggerRemoteObject::_set(const StringName &p_name, const Variant &p_value) {
-	if (!prop_values.has(p_name) || String(p_name).begins_with("Constants/")) {
+bool EditorDebuggerRemoteObjects::_set(const StringName &p_name, const Variant &p_value) {
+	return _set_impl(p_name, p_value, "");
+}
+
+bool EditorDebuggerRemoteObjects::_set_impl(const StringName &p_name, const Variant &p_value, const String &p_field) {
+	String name = p_name;
+
+	if (name.begins_with("Metadata/")) {
+		name = name.replace_first("Metadata/", "metadata/");
+	}
+	if (!prop_values.has(name) || String(name).begins_with("Constants/")) {
 		return false;
 	}
 
-	prop_values[p_name] = p_value;
-	emit_signal(SNAME("value_edited"), remote_object_id, p_name, p_value);
+	Dictionary &values = prop_values[p_name];
+	Dictionary old_values = values.duplicate();
+	for (const uint64_t key : values.keys()) {
+		values.set(key, p_value);
+	}
+
+	EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
+	const int size = remote_object_ids.size();
+	ur->create_action(size == 1 ? vformat(TTR("Set %s"), name) : vformat(TTR("Set %s on %d objects"), name, size), UndoRedo::MERGE_ENDS);
+
+	ur->add_do_method(this, SNAME("emit_signal"), SNAME("values_edited"), name, values, p_field);
+	ur->add_undo_method(this, SNAME("emit_signal"), SNAME("values_edited"), name, old_values, p_field);
+	ur->commit_action();
+
 	return true;
 }
 
-bool EditorDebuggerRemoteObject::_get(const StringName &p_name, Variant &r_ret) const {
-	if (!prop_values.has(p_name)) {
+bool EditorDebuggerRemoteObjects::_get(const StringName &p_name, Variant &r_ret) const {
+	String name = p_name;
+
+	if (name.begins_with("Metadata/")) {
+		name = name.replace_first("Metadata/", "metadata/");
+	}
+	if (!prop_values.has(name)) {
 		return false;
 	}
 
-	r_ret = prop_values[p_name];
+	r_ret = prop_values[p_name][remote_object_ids[0]];
 	return true;
 }
 
-void EditorDebuggerRemoteObject::_get_property_list(List<PropertyInfo> *p_list) const {
-	p_list->clear(); // Sorry, no want category.
+void EditorDebuggerRemoteObjects::_get_property_list(List<PropertyInfo> *p_list) const {
+	p_list->clear(); // Sorry, don't want any categories.
 	for (const PropertyInfo &prop : prop_list) {
 		if (prop.name == "script") {
 			// Skip the script property, it's always added by the non-virtual method.
@@ -66,31 +94,35 @@ void EditorDebuggerRemoteObject::_get_property_list(List<PropertyInfo> *p_list)
 	}
 }
 
-String EditorDebuggerRemoteObject::get_title() {
-	if (remote_object_id.is_valid()) {
-		return vformat(TTR("Remote %s:"), String(type_name)) + " " + itos(remote_object_id);
-	} else {
-		return "<null>";
-	}
+void EditorDebuggerRemoteObjects::set_property_field(const StringName &p_property, const Variant &p_value, const String &p_field) {
+	_set_impl(p_property, p_value, p_field);
 }
 
-Variant EditorDebuggerRemoteObject::get_variant(const StringName &p_name) {
+String EditorDebuggerRemoteObjects::get_title() {
+	if (!remote_object_ids.is_empty() && ObjectID(remote_object_ids[0].operator uint64_t()).is_valid()) {
+		const int size = remote_object_ids.size();
+		return size == 1 ? vformat(TTR("Remote %s: %d"), type_name, remote_object_ids[0]) : vformat(TTR("Remote %s (%d Selected)"), type_name, size);
+	}
+
+	return "<null>";
+}
+
+Variant EditorDebuggerRemoteObjects::get_variant(const StringName &p_name) {
 	Variant var;
 	_get(p_name, var);
 	return var;
 }
 
-void EditorDebuggerRemoteObject::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_title"), &EditorDebuggerRemoteObject::get_title);
-	ClassDB::bind_method(D_METHOD("get_variant"), &EditorDebuggerRemoteObject::get_variant);
-	ClassDB::bind_method(D_METHOD("clear"), &EditorDebuggerRemoteObject::clear);
-	ClassDB::bind_method(D_METHOD("get_remote_object_id"), &EditorDebuggerRemoteObject::get_remote_object_id);
+void EditorDebuggerRemoteObjects::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("get_title"), &EditorDebuggerRemoteObjects::get_title);
 
-	ADD_SIGNAL(MethodInfo("value_edited", PropertyInfo(Variant::INT, "object_id"), PropertyInfo(Variant::STRING, "property"), PropertyInfo("value")));
+	ADD_SIGNAL(MethodInfo("values_edited", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::DICTIONARY, "values", PROPERTY_HINT_DICTIONARY_TYPE, "uint64_t:Variant"), PropertyInfo(Variant::STRING, "field")));
 }
 
+/// EditorDebuggerInspector
+
 EditorDebuggerInspector::EditorDebuggerInspector() {
-	variables = memnew(EditorDebuggerRemoteObject);
+	variables = memnew(EditorDebuggerRemoteObjects);
 }
 
 EditorDebuggerInspector::~EditorDebuggerInspector() {
@@ -100,7 +132,7 @@ EditorDebuggerInspector::~EditorDebuggerInspector() {
 
 void EditorDebuggerInspector::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("object_selected", PropertyInfo(Variant::INT, "id")));
-	ADD_SIGNAL(MethodInfo("object_edited", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::STRING, "property"), PropertyInfo("value")));
+	ADD_SIGNAL(MethodInfo("objects_edited", PropertyInfo(Variant::ARRAY, "ids"), PropertyInfo(Variant::STRING, "property"), PropertyInfo("value"), PropertyInfo(Variant::STRING, "field")));
 	ADD_SIGNAL(MethodInfo("object_property_updated", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::STRING, "property")));
 }
 
@@ -111,50 +143,143 @@ void EditorDebuggerInspector::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
+			variables->remote_object_ids.append(0);
 			edit(variables);
 		} break;
 	}
 }
 
-void EditorDebuggerInspector::_object_edited(ObjectID p_id, const String &p_prop, const Variant &p_value) {
-	emit_signal(SNAME("object_edited"), p_id, p_prop, p_value);
+void EditorDebuggerInspector::_objects_edited(const String &p_prop, const TypedDictionary<uint64_t, Variant> &p_values, const String &p_field) {
+	emit_signal(SNAME("objects_edited"), p_prop, p_values, p_field);
 }
 
 void EditorDebuggerInspector::_object_selected(ObjectID p_object) {
 	emit_signal(SNAME("object_selected"), p_object);
 }
 
-ObjectID EditorDebuggerInspector::add_object(const Array &p_arr) {
-	EditorDebuggerRemoteObject *debug_obj = nullptr;
+EditorDebuggerRemoteObjects *EditorDebuggerInspector::set_objects(const Array &p_arr) {
+	ERR_FAIL_COND_V(p_arr.is_empty(), nullptr);
 
-	SceneDebuggerObject obj;
-	obj.deserialize(p_arr);
-	ERR_FAIL_COND_V(obj.id.is_null(), ObjectID());
+	TypedArray<uint64_t> ids;
+	LocalVector<SceneDebuggerObject> objects;
+	for (const Array arr : p_arr) {
+		SceneDebuggerObject obj;
+		obj.deserialize(arr);
+		if (obj.id.is_valid()) {
+			ids.push_back((uint64_t)obj.id);
+			objects.push_back(obj);
+		}
+	}
+	ERR_FAIL_COND_V(ids.is_empty(), nullptr);
 
-	if (remote_objects.has(obj.id)) {
-		debug_obj = remote_objects[obj.id];
-	} else {
-		debug_obj = memnew(EditorDebuggerRemoteObject);
-		debug_obj->remote_object_id = obj.id;
-		debug_obj->type_name = obj.class_name;
-		remote_objects[obj.id] = debug_obj;
-		debug_obj->connect("value_edited", callable_mp(this, &EditorDebuggerInspector::_object_edited));
+	// Sorting is necessary, as selected nodes in the remote tree are ordered by index.
+	ids.sort();
+
+	EditorDebuggerRemoteObjects *remote_objects = nullptr;
+	for (EditorDebuggerRemoteObjects *robjs : remote_objects_list) {
+		if (robjs->remote_object_ids == ids) {
+			remote_objects = robjs;
+			break;
+		}
 	}
 
-	int old_prop_size = debug_obj->prop_list.size();
+	if (!remote_objects) {
+		remote_objects = memnew(EditorDebuggerRemoteObjects);
+		remote_objects->remote_object_ids = ids;
+		remote_objects->remote_object_ids.make_read_only();
+		remote_objects->connect("values_edited", callable_mp(this, &EditorDebuggerInspector::_objects_edited));
+		remote_objects_list.push_back(remote_objects);
+	}
 
-	debug_obj->prop_list.clear();
+	StringName class_name = objects[0].class_name;
+	if (class_name != SNAME("Object")) {
+		// Search for the common class between all selected objects.
+		bool check_type_again = true;
+		while (check_type_again) {
+			check_type_again = false;
+
+			if (class_name == SNAME("Object") || class_name == StringName()) {
+				// All objects inherit from Object, so no need to continue checking.
+				class_name = SNAME("Object");
+				break;
+			}
+
+			// Check that all objects inherit from type_name.
+			for (const SceneDebuggerObject &obj : objects) {
+				if (obj.class_name == class_name || ClassDB::is_parent_class(obj.class_name, class_name)) {
+					continue; // class_name is the same or a parent of the object's class.
+				}
+
+				// class_name is not a parent of the node's class, so check again with the parent class.
+				class_name = ClassDB::get_parent_class(class_name);
+				check_type_again = true;
+				break;
+			}
+		}
+	}
+	remote_objects->type_name = class_name;
+
+	// Search for properties that are present in all selected objects.
+	struct UsageData {
+		int qty = 0;
+		SceneDebuggerObject::SceneDebuggerProperty prop;
+		TypedDictionary<uint64_t, Variant> values;
+	};
+	HashMap<String, UsageData> usage;
+	int nc = 0;
+	for (const SceneDebuggerObject &obj : objects) {
+		for (const SceneDebuggerObject::SceneDebuggerProperty &prop : obj.properties) {
+			PropertyInfo pinfo = prop.first;
+			if (pinfo.name == "script") {
+				continue; // Added later manually, since this is intercepted before being set (check Variant Object::get()).
+			} else if (pinfo.name.begins_with("metadata/")) {
+				pinfo.name = pinfo.name.replace_first("metadata/", "Metadata/"); // Trick to not get actual metadata edited from EditorDebuggerRemoteObjects.
+			}
+
+			if (!usage.has(pinfo.name)) {
+				UsageData usage_dt;
+				usage_dt.prop = prop;
+				usage_dt.prop.first.name = pinfo.name;
+				usage_dt.values[obj.id] = prop.second;
+				usage[pinfo.name] = usage_dt;
+			}
+
+			// Make sure only properties with the same exact PropertyInfo data will appear.
+			if (usage[pinfo.name].prop.first == pinfo) {
+				usage[pinfo.name].qty++;
+				usage[pinfo.name].values[obj.id] = prop.second;
+			}
+		}
+
+		nc++;
+	}
+	for (HashMap<String, UsageData>::Iterator E = usage.begin(); E;) {
+		HashMap<String, UsageData>::Iterator next = E;
+		++next;
+
+		UsageData usage_dt = E->value;
+		if (nc != usage_dt.qty) {
+			// Doesn't appear on all of them, remove it.
+			usage.erase(E->key);
+		}
+
+		E = next;
+	}
+
+	int old_prop_size = remote_objects->prop_list.size();
+
+	remote_objects->prop_list.clear();
 	int new_props_added = 0;
 	HashSet<String> changed;
-	for (SceneDebuggerObject::SceneDebuggerProperty &property : obj.properties) {
-		PropertyInfo &pinfo = property.first;
-		Variant &var = property.second;
+	for (KeyValue<String, UsageData> &KV : usage) {
+		const PropertyInfo &pinfo = KV.value.prop.first;
+		Variant var = KV.value.values[remote_objects->remote_object_ids[0]];
 
 		if (pinfo.type == Variant::OBJECT) {
 			if (var.is_string()) {
 				String path = var;
 				if (path.contains("::")) {
-					// built-in resource
+					// Built-in resource.
 					String base_path = path.get_slice("::", 0);
 					Ref<Resource> dependency = ResourceLoader::load(base_path);
 					if (dependency.is_valid()) {
@@ -162,15 +287,16 @@ ObjectID EditorDebuggerInspector::add_object(const Array &p_arr) {
 					}
 				}
 				var = ResourceLoader::load(path);
+				KV.value.values[remote_objects->remote_object_ids[0]] = var;
 
 				if (pinfo.hint_string == "Script") {
-					if (debug_obj->get_script() != var) {
-						debug_obj->set_script(Ref<RefCounted>());
+					if (remote_objects->get_script() != var) {
+						remote_objects->set_script(Ref<RefCounted>());
 						Ref<Script> scr(var);
 						if (scr.is_valid()) {
-							ScriptInstance *scr_instance = scr->placeholder_instance_create(debug_obj);
+							ScriptInstance *scr_instance = scr->placeholder_instance_create(remote_objects);
 							if (scr_instance) {
-								debug_obj->set_script_and_instance(var, scr_instance);
+								remote_objects->set_script_and_instance(var, scr_instance);
 							}
 						}
 					}
@@ -178,49 +304,67 @@ ObjectID EditorDebuggerInspector::add_object(const Array &p_arr) {
 			}
 		}
 
-		//always add the property, since props may have been added or removed
-		debug_obj->prop_list.push_back(pinfo);
+		// Always add the property, since props may have been added or removed.
+		remote_objects->prop_list.push_back(pinfo);
 
-		if (!debug_obj->prop_values.has(pinfo.name)) {
+		if (!remote_objects->prop_values.has(pinfo.name)) {
 			new_props_added++;
-			debug_obj->prop_values[pinfo.name] = var;
-		} else {
-			if (bool(Variant::evaluate(Variant::OP_NOT_EQUAL, debug_obj->prop_values[pinfo.name], var))) {
-				debug_obj->prop_values[pinfo.name] = var;
-				changed.insert(pinfo.name);
-			}
+		} else if (bool(Variant::evaluate(Variant::OP_NOT_EQUAL, remote_objects->prop_values[pinfo.name], var))) {
+			changed.insert(pinfo.name);
 		}
+
+		remote_objects->prop_values[pinfo.name] = KV.value.values;
 	}
 
-	if (old_prop_size == debug_obj->prop_list.size() && new_props_added == 0) {
-		//only some may have changed, if so, then update those, if exist
+	if (old_prop_size == remote_objects->prop_list.size() && new_props_added == 0) {
+		// Only some may have changed, if so, then update those, if they exist.
 		for (const String &E : changed) {
-			emit_signal(SNAME("object_property_updated"), debug_obj->remote_object_id, E);
+			emit_signal(SNAME("object_property_updated"), remote_objects->get_instance_id(), E);
 		}
 	} else {
-		//full update, because props were added or removed
-		debug_obj->update();
+		// Full update, because props were added or removed.
+		remote_objects->update();
+	}
+
+	return remote_objects;
+}
+
+void EditorDebuggerInspector::clear_remote_inspector() {
+	if (remote_objects_list.is_empty()) {
+		return;
+	}
+
+	const Object *obj = InspectorDock::get_inspector_singleton()->get_edited_object();
+	// Check if the inspector holds remote items, and take it out if so.
+	if (Object::cast_to<EditorDebuggerRemoteObjects>(obj)) {
+		EditorNode::get_singleton()->push_item(nullptr);
 	}
-	return obj.id;
 }
 
 void EditorDebuggerInspector::clear_cache() {
-	for (const KeyValue<ObjectID, EditorDebuggerRemoteObject *> &E : remote_objects) {
-		EditorNode *editor = EditorNode::get_singleton();
-		if (editor->get_editor_selection_history()->get_current() == E.value->get_instance_id()) {
-			editor->push_item(nullptr);
-		}
-		memdelete(E.value);
+	clear_remote_inspector();
+
+	for (EditorDebuggerRemoteObjects *robjs : remote_objects_list) {
+		memdelete(robjs);
 	}
-	remote_objects.clear();
+	remote_objects_list.clear();
+
 	remote_dependencies.clear();
 }
 
-Object *EditorDebuggerInspector::get_object(ObjectID p_id) {
-	if (remote_objects.has(p_id)) {
-		return remote_objects[p_id];
+void EditorDebuggerInspector::invalidate_selection_from_cache(const TypedArray<uint64_t> &p_ids) {
+	for (EditorDebuggerRemoteObjects *robjs : remote_objects_list) {
+		if (robjs->remote_object_ids == p_ids) {
+			const Object *obj = InspectorDock::get_inspector_singleton()->get_edited_object();
+			if (obj == robjs) {
+				EditorNode::get_singleton()->push_item(nullptr);
+			}
+
+			remote_objects_list.erase(robjs);
+			memdelete(robjs);
+			break;
+		}
 	}
-	return nullptr;
 }
 
 void EditorDebuggerInspector::add_stack_variable(const Array &p_array, int p_offset) {
@@ -270,7 +414,7 @@ void EditorDebuggerInspector::add_stack_variable(const Array &p_array, int p_off
 		}
 		variables->prop_list.insert_before(current, pinfo);
 	}
-	variables->prop_values[type + n] = v;
+	variables->prop_values[type + n][0] = v;
 	variables->update();
 	edit(variables);
 
@@ -288,9 +432,9 @@ void EditorDebuggerInspector::clear_stack_variables() {
 }
 
 String EditorDebuggerInspector::get_stack_variable(const String &p_var) {
-	for (KeyValue<StringName, Variant> &E : variables->prop_values) {
+	for (KeyValue<StringName, TypedDictionary<uint64_t, Variant>> &E : variables->prop_values) {
 		String v = E.key.operator String();
-		if (v.get_slice("/", 1) == p_var) {
+		if (v.get_slicec('/', 1) == p_var) {
 			return variables->get_variant(v);
 		}
 	}
diff --git a/engine/editor/debugger/editor_debugger_inspector.h b/engine/editor/debugger/editor_debugger_inspector.h
index 860c2bf5..c7399610 100644
--- a/engine/editor/debugger/editor_debugger_inspector.h
+++ b/engine/editor/debugger/editor_debugger_inspector.h
@@ -28,13 +28,18 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DEBUGGER_INSPECTOR_H
-#define EDITOR_DEBUGGER_INSPECTOR_H
+#pragma once
 
+#include "core/variant/typed_dictionary.h"
 #include "editor/editor_inspector.h"
 
-class EditorDebuggerRemoteObject : public Object {
-	GDCLASS(EditorDebuggerRemoteObject, Object);
+class SceneDebuggerObject;
+
+class EditorDebuggerRemoteObjects : public Object {
+	GDCLASS(EditorDebuggerRemoteObjects, Object);
+
+private:
+	bool _set_impl(const StringName &p_name, const Variant &p_value, const String &p_field);
 
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
@@ -43,14 +48,13 @@ protected:
 	static void _bind_methods();
 
 public:
-	ObjectID remote_object_id;
+	TypedArray<uint64_t> remote_object_ids;
 	String type_name;
 	List<PropertyInfo> prop_list;
-	HashMap<StringName, Variant> prop_values;
+	HashMap<StringName, TypedDictionary<uint64_t, Variant>> prop_values;
 
-	ObjectID get_remote_object_id() { return remote_object_id; }
+	void set_property_field(const StringName &p_property, const Variant &p_value, const String &p_field);
 	String get_title();
-
 	Variant get_variant(const StringName &p_name);
 
 	void clear() {
@@ -59,21 +63,18 @@ public:
 	}
 
 	void update() { notify_property_list_changed(); }
-
-	EditorDebuggerRemoteObject() {}
 };
 
 class EditorDebuggerInspector : public EditorInspector {
 	GDCLASS(EditorDebuggerInspector, EditorInspector);
 
 private:
-	ObjectID inspected_object_id;
-	HashMap<ObjectID, EditorDebuggerRemoteObject *> remote_objects;
+	LocalVector<EditorDebuggerRemoteObjects *> remote_objects_list;
 	HashSet<Ref<Resource>> remote_dependencies;
-	EditorDebuggerRemoteObject *variables = nullptr;
+	EditorDebuggerRemoteObjects *variables = nullptr;
 
 	void _object_selected(ObjectID p_object);
-	void _object_edited(ObjectID p_id, const String &p_prop, const Variant &p_value);
+	void _objects_edited(const String &p_prop, const TypedDictionary<uint64_t, Variant> &p_values, const String &p_field);
 
 protected:
 	void _notification(int p_what);
@@ -84,14 +85,13 @@ public:
 	~EditorDebuggerInspector();
 
 	// Remote Object cache
-	ObjectID add_object(const Array &p_arr);
-	Object *get_object(ObjectID p_id);
+	EditorDebuggerRemoteObjects *set_objects(const Array &p_array);
+	void clear_remote_inspector();
 	void clear_cache();
+	void invalidate_selection_from_cache(const TypedArray<uint64_t> &p_ids);
 
 	// Stack Dump variables
 	String get_stack_variable(const String &p_var);
 	void add_stack_variable(const Array &p_arr, int p_offset = -1);
 	void clear_stack_variables();
 };
-
-#endif // EDITOR_DEBUGGER_INSPECTOR_H
diff --git a/engine/editor/debugger/editor_debugger_node.cpp b/engine/editor/debugger/editor_debugger_node.cpp
index 75fed9e0..04cf6426 100644
--- a/engine/editor/debugger/editor_debugger_node.cpp
+++ b/engine/editor/debugger/editor_debugger_node.cpp
@@ -82,7 +82,8 @@ EditorDebuggerNode::EditorDebuggerNode() {
 
 	// Remote scene tree
 	remote_scene_tree = memnew(EditorDebuggerTree);
-	remote_scene_tree->connect("object_selected", callable_mp(this, &EditorDebuggerNode::_remote_object_requested));
+	remote_scene_tree->connect("objects_selected", callable_mp(this, &EditorDebuggerNode::_remote_objects_requested));
+	remote_scene_tree->connect("selection_cleared", callable_mp(this, &EditorDebuggerNode::_remote_selection_cleared));
 	remote_scene_tree->connect("save_node", callable_mp(this, &EditorDebuggerNode::_save_node_requested));
 	remote_scene_tree->connect("button_clicked", callable_mp(this, &EditorDebuggerNode::_remote_tree_button_pressed));
 	SceneTreeDock::get_singleton()->add_remote_tree_editor(remote_scene_tree);
@@ -109,11 +110,13 @@ ScriptEditorDebugger *EditorDebuggerNode::_add_debugger() {
 	node->connect("breakpoint_selected", callable_mp(this, &EditorDebuggerNode::_error_selected).bind(id));
 	node->connect("clear_execution", callable_mp(this, &EditorDebuggerNode::_clear_execution));
 	node->connect("breaked", callable_mp(this, &EditorDebuggerNode::_breaked).bind(id));
+	node->connect("debug_data", callable_mp(this, &EditorDebuggerNode::_debug_data).bind(id));
 	node->connect("remote_tree_select_requested", callable_mp(this, &EditorDebuggerNode::_remote_tree_select_requested).bind(id));
+	node->connect("remote_tree_clear_selection_requested", callable_mp(this, &EditorDebuggerNode::_remote_tree_clear_selection_requested).bind(id));
 	node->connect("remote_tree_updated", callable_mp(this, &EditorDebuggerNode::_remote_tree_updated).bind(id));
-	node->connect("remote_object_updated", callable_mp(this, &EditorDebuggerNode::_remote_object_updated).bind(id));
+	node->connect("remote_objects_updated", callable_mp(this, &EditorDebuggerNode::_remote_objects_updated).bind(id));
 	node->connect("remote_object_property_updated", callable_mp(this, &EditorDebuggerNode::_remote_object_property_updated).bind(id));
-	node->connect("remote_object_requested", callable_mp(this, &EditorDebuggerNode::_remote_object_requested).bind(id));
+	node->connect("remote_objects_requested", callable_mp(this, &EditorDebuggerNode::_remote_objects_requested).bind(id));
 	node->connect("set_breakpoint", callable_mp(this, &EditorDebuggerNode::_breakpoint_set_in_tree).bind(id));
 	node->connect("clear_breakpoints", callable_mp(this, &EditorDebuggerNode::_breakpoints_cleared_in_tree).bind(id));
 	node->connect("errors_cleared", callable_mp(this, &EditorDebuggerNode::_update_errors));
@@ -222,10 +225,6 @@ void EditorDebuggerNode::register_undo_redo(UndoRedo *p_undo_redo) {
 	p_undo_redo->set_property_notify_callback(_properties_changed, this);
 }
 
-EditorDebuggerRemoteObject *EditorDebuggerNode::get_inspected_remote_object() {
-	return Object::cast_to<EditorDebuggerRemoteObject>(ObjectDB::get_instance(EditorNode::get_singleton()->get_editor_selection_history()->get_current()));
-}
-
 ScriptEditorDebugger *EditorDebuggerNode::get_debugger(int p_id) const {
 	return Object::cast_to<ScriptEditorDebugger>(tabs->get_tab_control(p_id));
 }
@@ -292,6 +291,10 @@ void EditorDebuggerNode::stop(bool p_force) {
 	if (keep_open && !p_force) {
 		return;
 	}
+
+	remote_scene_tree_wait = false;
+	inspect_edited_object_wait = false;
+
 	current_uri.clear();
 	if (server.is_valid()) {
 		server->stop();
@@ -304,6 +307,7 @@ void EditorDebuggerNode::stop(bool p_force) {
 
 		server.unref();
 	}
+
 	// Also close all debugging sessions.
 	_for_all(tabs, [&](ScriptEditorDebugger *dbg) {
 		if (dbg->is_session_active()) {
@@ -351,21 +355,29 @@ void EditorDebuggerNode::_notification(int p_what) {
 
 			_update_errors();
 
-			// Remote scene tree update
-			remote_scene_tree_timeout -= get_process_delta_time();
-			if (remote_scene_tree_timeout < 0) {
-				remote_scene_tree_timeout = EDITOR_GET("debugger/remote_scene_tree_refresh_interval");
-				if (remote_scene_tree->is_visible_in_tree()) {
-					get_current_debugger()->request_remote_tree();
+			// Remote scene tree update.
+			if (!remote_scene_tree_wait) {
+				remote_scene_tree_timeout -= get_process_delta_time();
+				if (remote_scene_tree_timeout < 0) {
+					remote_scene_tree_timeout = EDITOR_GET("debugger/remote_scene_tree_refresh_interval");
+
+					if (remote_scene_tree->is_visible_in_tree()) {
+						remote_scene_tree_wait = true;
+						get_current_debugger()->request_remote_tree();
+					}
 				}
 			}
 
-			// Remote inspector update
-			inspect_edited_object_timeout -= get_process_delta_time();
-			if (inspect_edited_object_timeout < 0) {
-				inspect_edited_object_timeout = EDITOR_GET("debugger/remote_inspect_refresh_interval");
-				if (EditorDebuggerRemoteObject *obj = get_inspected_remote_object()) {
-					get_current_debugger()->request_remote_object(obj->remote_object_id);
+			// Remote inspector update.
+			if (!inspect_edited_object_wait) {
+				inspect_edited_object_timeout -= get_process_delta_time();
+				if (inspect_edited_object_timeout < 0) {
+					inspect_edited_object_timeout = EDITOR_GET("debugger/remote_inspect_refresh_interval");
+
+					if (EditorDebuggerRemoteObjects *robjs = Object::cast_to<EditorDebuggerRemoteObjects>(InspectorDock::get_inspector_singleton()->get_edited_object())) {
+						inspect_edited_object_wait = true;
+						get_current_debugger()->request_remote_objects(robjs->remote_object_ids, false);
+					}
 				}
 			}
 
@@ -467,21 +479,26 @@ void EditorDebuggerNode::_debugger_stopped(int p_id) {
 
 void EditorDebuggerNode::_debugger_wants_stop(int p_id) {
 	// Ask editor to kill PID.
-	int pid = get_debugger(p_id)->get_remote_pid();
-	if (pid) {
+	if (int pid = get_debugger(p_id)->get_remote_pid()) {
 		callable_mp(EditorNode::get_singleton(), &EditorNode::stop_child_process).call_deferred(pid);
 	}
 }
 
 void EditorDebuggerNode::_debugger_changed(int p_tab) {
-	if (get_inspected_remote_object()) {
-		// Clear inspected object, you can only inspect objects in selected debugger.
-		// Hopefully, in the future, we will have one inspector per debugger.
-		EditorNode::get_singleton()->push_item(nullptr);
+	remote_scene_tree_wait = false;
+	inspect_edited_object_wait = false;
+
+	if (Object *robjs = InspectorDock::get_inspector_singleton()->get_edited_object()) {
+		if (Object::cast_to<EditorDebuggerRemoteObjects>(robjs)) {
+			// Clear inspected object, you can only inspect objects in selected debugger.
+			// Hopefully, in the future, we will have one inspector per debugger.
+			EditorNode::get_singleton()->push_item(nullptr);
+		}
 	}
 
-	if (get_previous_debugger()) {
-		_text_editor_stack_clear(get_previous_debugger());
+	if (ScriptEditorDebugger *prev_debug = get_previous_debugger()) {
+		prev_debug->clear_inspector();
+		_text_editor_stack_clear(prev_debug);
 	}
 	if (remote_scene_tree->is_visible_in_tree()) {
 		get_current_debugger()->request_remote_tree();
@@ -493,6 +510,18 @@ void EditorDebuggerNode::_debugger_changed(int p_tab) {
 	_break_state_changed();
 }
 
+void EditorDebuggerNode::_debug_data(const String &p_msg, const Array &p_data, int p_debugger) {
+	if (p_debugger != tabs->get_current_tab()) {
+		return;
+	}
+
+	if (p_msg == "scene:scene_tree") {
+		remote_scene_tree_wait = false;
+	} else if (p_msg == "scene:inspect_objects") {
+		inspect_edited_object_wait = false;
+	}
+}
+
 void EditorDebuggerNode::set_script_debug_button(MenuButton *p_button) {
 	script_menu = p_button;
 	script_menu->set_text(TTR("Debug"));
@@ -587,6 +616,10 @@ bool EditorDebuggerNode::is_skip_breakpoints() const {
 	return get_current_debugger()->is_skip_breakpoints();
 }
 
+bool EditorDebuggerNode::is_ignore_error_breaks() const {
+	return get_default_debugger()->is_ignore_error_breaks();
+}
+
 void EditorDebuggerNode::set_breakpoint(const String &p_path, int p_line, bool p_enabled) {
 	breakpoints[Breakpoint(p_path, p_line)] = p_enabled;
 	_for_all(tabs, [&](ScriptEditorDebugger *dbg) {
@@ -646,11 +679,39 @@ void EditorDebuggerNode::request_remote_tree() {
 	get_current_debugger()->request_remote_tree();
 }
 
-void EditorDebuggerNode::_remote_tree_select_requested(ObjectID p_id, int p_debugger) {
+void EditorDebuggerNode::set_remote_selection(const TypedArray<int64_t> &p_ids) {
+	stop_waiting_inspection();
+	get_current_debugger()->request_remote_objects(p_ids);
+}
+
+void EditorDebuggerNode::clear_remote_tree_selection() {
+	remote_scene_tree->clear_selection();
+	get_current_debugger()->clear_inspector(remote_scene_tree_clear_msg);
+}
+
+void EditorDebuggerNode::stop_waiting_inspection() {
+	inspect_edited_object_timeout = EDITOR_GET("debugger/remote_inspect_refresh_interval");
+	inspect_edited_object_wait = false;
+}
+
+bool EditorDebuggerNode::match_remote_selection(const TypedArray<uint64_t> &p_ids) const {
+	return p_ids == remote_scene_tree->get_selection();
+}
+
+void EditorDebuggerNode::_remote_tree_select_requested(const TypedArray<int64_t> &p_ids, int p_debugger) {
+	if (p_debugger == tabs->get_current_tab()) {
+		remote_scene_tree->select_nodes(p_ids);
+	}
+}
+
+void EditorDebuggerNode::_remote_tree_clear_selection_requested(int p_debugger) {
 	if (p_debugger != tabs->get_current_tab()) {
 		return;
 	}
-	remote_scene_tree->select_node(p_id);
+	remote_scene_tree->clear_selection();
+	remote_scene_tree_clear_msg = false;
+	get_current_debugger()->clear_inspector(false);
+	remote_scene_tree_clear_msg = true;
 }
 
 void EditorDebuggerNode::_remote_tree_updated(int p_debugger) {
@@ -679,37 +740,37 @@ void EditorDebuggerNode::_remote_tree_button_pressed(Object *p_item, int p_colum
 	}
 }
 
-void EditorDebuggerNode::_remote_object_updated(ObjectID p_id, int p_debugger) {
-	if (p_debugger != tabs->get_current_tab()) {
-		return;
+void EditorDebuggerNode::_remote_objects_updated(EditorDebuggerRemoteObjects *p_objs, int p_debugger) {
+	if (p_debugger == tabs->get_current_tab() && p_objs != InspectorDock::get_inspector_singleton()->get_edited_object()) {
+		EditorNode::get_singleton()->push_item(p_objs);
 	}
-	if (EditorDebuggerRemoteObject *obj = get_inspected_remote_object()) {
-		if (obj->remote_object_id == p_id) {
-			return; // Already being edited
-		}
-	}
-
-	EditorNode::get_singleton()->push_item(get_current_debugger()->get_remote_object(p_id));
 }
 
 void EditorDebuggerNode::_remote_object_property_updated(ObjectID p_id, const String &p_property, int p_debugger) {
 	if (p_debugger != tabs->get_current_tab()) {
 		return;
 	}
-	if (EditorDebuggerRemoteObject *obj = get_inspected_remote_object()) {
-		if (obj->remote_object_id != p_id) {
-			return;
-		}
+
+	Object *obj = InspectorDock::get_inspector_singleton()->get_edited_object();
+	if (obj && obj->get_instance_id() == p_id) {
 		InspectorDock::get_inspector_singleton()->update_property(p_property);
 	}
 }
 
-void EditorDebuggerNode::_remote_object_requested(ObjectID p_id, int p_debugger) {
+void EditorDebuggerNode::_remote_objects_requested(const TypedArray<uint64_t> &p_ids, int p_debugger) {
 	if (p_debugger != tabs->get_current_tab()) {
 		return;
 	}
-	inspect_edited_object_timeout = 0.7; // Temporarily disable timeout to avoid multiple requests.
-	get_current_debugger()->request_remote_object(p_id);
+	stop_waiting_inspection();
+	get_current_debugger()->request_remote_objects(p_ids);
+}
+
+void EditorDebuggerNode::_remote_selection_cleared(int p_debugger) {
+	if (p_debugger != tabs->get_current_tab()) {
+		return;
+	}
+	stop_waiting_inspection();
+	get_current_debugger()->clear_inspector();
 }
 
 void EditorDebuggerNode::_save_node_requested(ObjectID p_id, const String &p_file, int p_debugger) {
@@ -809,6 +870,17 @@ void EditorDebuggerNode::live_debug_reparent_node(const NodePath &p_at, const No
 	});
 }
 
+void EditorDebuggerNode::set_debug_mute_audio(bool p_mute) {
+	_for_all(tabs, [&](ScriptEditorDebugger *dbg) {
+		dbg->set_debug_mute_audio(p_mute);
+	});
+	debug_mute_audio = p_mute;
+}
+
+bool EditorDebuggerNode::get_debug_mute_audio() const {
+	return debug_mute_audio;
+}
+
 void EditorDebuggerNode::set_camera_override(CameraOverride p_override) {
 	_for_all(tabs, [&](ScriptEditorDebugger *dbg) {
 		dbg->set_camera_override(p_override);
diff --git a/engine/editor/debugger/editor_debugger_node.h b/engine/editor/debugger/editor_debugger_node.h
index 12c0d30c..7e573368 100644
--- a/engine/editor/debugger/editor_debugger_node.h
+++ b/engine/editor/debugger/editor_debugger_node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DEBUGGER_NODE_H
-#define EDITOR_DEBUGGER_NODE_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "editor/debugger/editor_debugger_server.h"
@@ -39,7 +38,7 @@ class Button;
 class DebugAdapterParser;
 class EditorDebuggerPlugin;
 class EditorDebuggerTree;
-class EditorDebuggerRemoteObject;
+class EditorDebuggerRemoteObjects;
 class MenuButton;
 class ScriptEditorDebugger;
 class TabContainer;
@@ -103,21 +102,25 @@ private:
 	int last_error_count = 0;
 	int last_warning_count = 0;
 
+	bool inspect_edited_object_wait = false;
 	float inspect_edited_object_timeout = 0;
 	EditorDebuggerTree *remote_scene_tree = nullptr;
+	bool remote_scene_tree_wait = false;
 	float remote_scene_tree_timeout = 0.0;
+	bool remote_scene_tree_clear_msg = true;
 	bool auto_switch_remote_scene_tree = false;
 	bool debug_with_external_editor = false;
 	bool keep_open = false;
 	String current_uri;
 
+	bool debug_mute_audio = false;
+
 	CameraOverride camera_override = OVERRIDE_NONE;
 	HashMap<Breakpoint, bool, Breakpoint> breakpoints;
 
 	HashSet<Ref<EditorDebuggerPlugin>> debugger_plugins;
 
 	ScriptEditorDebugger *_add_debugger();
-	EditorDebuggerRemoteObject *get_inspected_remote_object();
 	void _update_errors();
 
 	friend class DebuggerEditorPlugin;
@@ -129,12 +132,15 @@ protected:
 	void _debugger_stopped(int p_id);
 	void _debugger_wants_stop(int p_id);
 	void _debugger_changed(int p_tab);
-	void _remote_tree_select_requested(ObjectID p_id, int p_debugger);
+	void _debug_data(const String &p_msg, const Array &p_data, int p_debugger);
+	void _remote_tree_select_requested(const TypedArray<int64_t> &p_ids, int p_debugger);
+	void _remote_tree_clear_selection_requested(int p_debugger);
 	void _remote_tree_updated(int p_debugger);
 	void _remote_tree_button_pressed(Object *p_item, int p_column, int p_id, MouseButton p_button);
-	void _remote_object_updated(ObjectID p_id, int p_debugger);
+	void _remote_objects_updated(EditorDebuggerRemoteObjects *p_objs, int p_debugger);
 	void _remote_object_property_updated(ObjectID p_id, const String &p_property, int p_debugger);
-	void _remote_object_requested(ObjectID p_id, int p_debugger);
+	void _remote_objects_requested(const TypedArray<uint64_t> &p_ids, int p_debugger);
+	void _remote_selection_cleared(int p_debugger);
 	void _save_node_requested(ObjectID p_id, const String &p_file, int p_debugger);
 
 	void _breakpoint_set_in_tree(Ref<RefCounted> p_script, int p_line, bool p_enabled, int p_debugger);
@@ -184,6 +190,7 @@ public:
 	bool get_debug_with_external_editor() { return debug_with_external_editor; }
 
 	bool is_skip_breakpoints() const;
+	bool is_ignore_error_breaks() const;
 	void set_breakpoint(const String &p_path, int p_line, bool p_enabled);
 	void set_breakpoints(const String &p_path, const Array &p_lines);
 	void reload_all_scripts();
@@ -191,6 +198,10 @@ public:
 
 	// Remote inspector/edit.
 	void request_remote_tree();
+	void set_remote_selection(const TypedArray<int64_t> &p_ids);
+	void clear_remote_tree_selection();
+	void stop_waiting_inspection();
+	bool match_remote_selection(const TypedArray<uint64_t> &p_ids) const;
 	static void _methods_changed(void *p_ud, Object *p_base, const StringName &p_name, const Variant **p_args, int p_argcount);
 	static void _properties_changed(void *p_ud, Object *p_base, const StringName &p_property, const Variant &p_value);
 
@@ -205,6 +216,9 @@ public:
 	void live_debug_duplicate_node(const NodePath &p_at, const String &p_new_name);
 	void live_debug_reparent_node(const NodePath &p_at, const NodePath &p_new_place, const String &p_new_name, int p_at_pos);
 
+	void set_debug_mute_audio(bool p_mute);
+	bool get_debug_mute_audio() const;
+
 	void set_camera_override(CameraOverride p_override);
 	CameraOverride get_camera_override();
 
@@ -218,5 +232,3 @@ public:
 	void add_debugger_plugin(const Ref<EditorDebuggerPlugin> &p_plugin);
 	void remove_debugger_plugin(const Ref<EditorDebuggerPlugin> &p_plugin);
 };
-
-#endif // EDITOR_DEBUGGER_NODE_H
diff --git a/engine/editor/debugger/editor_debugger_server.h b/engine/editor/debugger/editor_debugger_server.h
index e171f0fd..a5799291 100644
--- a/engine/editor/debugger/editor_debugger_server.h
+++ b/engine/editor/debugger/editor_debugger_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DEBUGGER_SERVER_H
-#define EDITOR_DEBUGGER_SERVER_H
+#pragma once
 
 #include "core/debugger/remote_debugger_peer.h"
 #include "core/object/ref_counted.h"
@@ -56,5 +55,3 @@ public:
 	virtual bool is_connection_available() const = 0;
 	virtual Ref<RemoteDebuggerPeer> take_connection() = 0;
 };
-
-#endif // EDITOR_DEBUGGER_SERVER_H
diff --git a/engine/editor/debugger/editor_debugger_tree.cpp b/engine/editor/debugger/editor_debugger_tree.cpp
index 24c505ae..bda6d992 100644
--- a/engine/editor/debugger/editor_debugger_tree.cpp
+++ b/engine/editor/debugger/editor_debugger_tree.cpp
@@ -35,6 +35,7 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/gui/editor_toaster.h"
 #include "editor/scene_tree_dock.h"
 #include "scene/debugger/scene_debugger.h"
 #include "scene/gui/texture_rect.h"
@@ -44,6 +45,7 @@
 EditorDebuggerTree::EditorDebuggerTree() {
 	set_v_size_flags(SIZE_EXPAND_FILL);
 	set_allow_rmb_select(true);
+	set_select_mode(SELECT_MULTI);
 
 	// Popup
 	item_menu = memnew(PopupMenu);
@@ -54,6 +56,9 @@ EditorDebuggerTree::EditorDebuggerTree() {
 	file_dialog = memnew(EditorFileDialog);
 	file_dialog->connect("file_selected", callable_mp(this, &EditorDebuggerTree::_file_selected));
 	add_child(file_dialog);
+
+	accept = memnew(AcceptDialog);
+	add_child(accept);
 }
 
 void EditorDebuggerTree::_notification(int p_what) {
@@ -61,7 +66,8 @@ void EditorDebuggerTree::_notification(int p_what) {
 		case NOTIFICATION_POSTINITIALIZE: {
 			set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 
-			connect("cell_selected", callable_mp(this, &EditorDebuggerTree::_scene_tree_selected));
+			connect("multi_selected", callable_mp(this, &EditorDebuggerTree::_scene_tree_selection_changed));
+			connect("nothing_selected", callable_mp(this, &EditorDebuggerTree::_scene_tree_nothing_selected));
 			connect("item_collapsed", callable_mp(this, &EditorDebuggerTree::_scene_tree_folded));
 			connect("item_mouse_selected", callable_mp(this, &EditorDebuggerTree::_scene_tree_rmb_selected));
 		} break;
@@ -73,24 +79,57 @@ void EditorDebuggerTree::_notification(int p_what) {
 }
 
 void EditorDebuggerTree::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("object_selected", PropertyInfo(Variant::INT, "object_id"), PropertyInfo(Variant::INT, "debugger")));
+	ADD_SIGNAL(MethodInfo("objects_selected", PropertyInfo(Variant::ARRAY, "object_ids"), PropertyInfo(Variant::INT, "debugger")));
+	ADD_SIGNAL(MethodInfo("selection_cleared", PropertyInfo(Variant::INT, "debugger")));
 	ADD_SIGNAL(MethodInfo("save_node", PropertyInfo(Variant::INT, "object_id"), PropertyInfo(Variant::STRING, "filename"), PropertyInfo(Variant::INT, "debugger")));
 	ADD_SIGNAL(MethodInfo("open"));
 }
 
-void EditorDebuggerTree::_scene_tree_selected() {
-	if (updating_scene_tree) {
+void EditorDebuggerTree::_scene_tree_selection_changed(TreeItem *p_item, int p_column, bool p_selected) {
+	if (updating_scene_tree || !p_item) {
 		return;
 	}
 
-	TreeItem *item = get_selected();
-	if (!item) {
-		return;
+	uint64_t id = uint64_t(p_item->get_metadata(0));
+	if (p_selected) {
+		if (inspected_object_ids.size() == (int)EDITOR_GET("debugger/max_node_selection")) {
+			selection_surpassed_limit = true;
+			p_item->deselect(0);
+			return;
+		}
+
+		if (!inspected_object_ids.has(id)) {
+			inspected_object_ids.append(id);
+		}
+	} else if (inspected_object_ids.has(id)) {
+		inspected_object_ids.erase(id);
 	}
 
-	inspected_object_id = uint64_t(item->get_metadata(0));
+	if (!notify_selection_queued) {
+		callable_mp(this, &EditorDebuggerTree::_notify_selection_changed).call_deferred();
+		notify_selection_queued = true;
+	}
+}
 
-	emit_signal(SNAME("object_selected"), inspected_object_id, debugger_id);
+void EditorDebuggerTree::_scene_tree_nothing_selected() {
+	deselect_all();
+	inspected_object_ids.clear();
+	emit_signal(SNAME("selection_cleared"), debugger_id);
+}
+
+void EditorDebuggerTree::_notify_selection_changed() {
+	notify_selection_queued = false;
+
+	if (inspected_object_ids.is_empty()) {
+		emit_signal(SNAME("selection_cleared"), debugger_id);
+	} else {
+		emit_signal(SNAME("objects_selected"), inspected_object_ids.duplicate(), debugger_id);
+	}
+
+	if (selection_surpassed_limit) {
+		selection_surpassed_limit = false;
+		EditorToaster::get_singleton()->popup_str(vformat(TTR("Some remote nodes were not selected, as the configured maximum selection is %d. This can be changed at \"debugger/max_node_selection\" in the Editor Settings."), EDITOR_GET("debugger/max_node_selection")), EditorToaster::SEVERITY_WARNING);
+	}
 }
 
 void EditorDebuggerTree::_scene_tree_folded(Object *p_obj) {
@@ -124,7 +163,7 @@ void EditorDebuggerTree::_scene_tree_rmb_selected(const Vector2 &p_position, Mou
 	item->select(0);
 
 	item_menu->clear();
-	item_menu->add_icon_item(get_editor_theme_icon(SNAME("CreateNewSceneFrom")), TTR("Save Branch as Scene"), ITEM_MENU_SAVE_REMOTE_NODE);
+	item_menu->add_icon_item(get_editor_theme_icon(SNAME("CreateNewSceneFrom")), TTR("Save Branch as Scene..."), ITEM_MENU_SAVE_REMOTE_NODE);
 	item_menu->add_icon_item(get_editor_theme_icon(SNAME("CopyNodePath")), TTR("Copy Node Path"), ITEM_MENU_COPY_NODE_PATH);
 	item_menu->add_icon_item(get_editor_theme_icon(SNAME("Collapse")), TTR("Expand/Collapse Branch"), ITEM_MENU_EXPAND_COLLAPSE);
 	item_menu->set_position(get_screen_position() + get_local_mouse_position());
@@ -152,12 +191,13 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 	updating_scene_tree = true;
 	const String last_path = get_selected_path();
 	const String filter = SceneTreeDock::get_singleton()->get_filter();
-	TreeItem *select_item = nullptr;
+	LocalVector<TreeItem *> select_items;
 	bool hide_filtered_out_parents = EDITOR_GET("docks/scene_tree/hide_filtered_out_parents");
 
 	bool should_scroll = scrolling_to_item || filter != last_filter;
 	scrolling_to_item = false;
 	TreeItem *scroll_item = nullptr;
+	TypedArray<uint64_t> ids_present;
 
 	// Nodes are in a flatten list, depth first. Use a stack of parents, avoid recursion.
 	List<ParentItem> parents;
@@ -216,9 +256,11 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 		}
 		item->set_meta("node_path", current_path + "/" + item->get_text(0));
 
-		// Select previously selected node.
+		// Select previously selected nodes.
 		if (debugger_id == p_debugger) { // Can use remote id.
-			if (node.id == inspected_object_id) {
+			if (inspected_object_ids.has(uint64_t(node.id))) {
+				ids_present.append(node.id);
+
 				if (selection_uncollapse_all) {
 					selection_uncollapse_all = false;
 
@@ -228,14 +270,14 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 					updating_scene_tree = true;
 				}
 
-				select_item = item;
+				select_items.push_back(item);
 				if (should_scroll) {
 					scroll_item = item;
 				}
 			}
 		} else if (last_path == (String)item->get_meta("node_path")) { // Must use path.
-			updating_scene_tree = false; // Force emission of new selection.
-			select_item = item;
+			updating_scene_tree = false; // Force emission of new selections.
+			select_items.push_back(item);
 			if (should_scroll) {
 				scroll_item = item;
 			}
@@ -280,12 +322,12 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 					break; // Filter matches, must survive.
 				}
 
-				parent->remove_child(item);
-				memdelete(item);
-				if (select_item == item || scroll_item == item) {
-					select_item = nullptr;
+				if (select_items.has(item) || scroll_item == item) {
+					select_items.resize(select_items.size() - 1);
 					scroll_item = nullptr;
 				}
+				parent->remove_child(item);
+				memdelete(item);
 
 				if (had_siblings) {
 					break; // Parent must survive.
@@ -316,18 +358,20 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 
 				from->get_parent()->remove_child(from);
 				memdelete(from);
-				if (select_item == from || scroll_item == from) {
-					select_item = nullptr;
+				if (select_items.has(from) || scroll_item == from) {
+					select_items.erase(from);
 					scroll_item = nullptr;
 				}
 			}
 		}
 	}
 
+	inspected_object_ids = ids_present;
+
 	debugger_id = p_debugger; // Needed by hook, could be avoided if every debugger had its own tree.
 
-	if (select_item) {
-		select_item->select(0);
+	for (TreeItem *item : select_items) {
+		item->select(0);
 	}
 	if (scroll_item) {
 		scroll_to_item(scroll_item, false);
@@ -337,12 +381,22 @@ void EditorDebuggerTree::update_scene_tree(const SceneDebuggerTree *p_tree, int
 	updating_scene_tree = false;
 }
 
-void EditorDebuggerTree::select_node(ObjectID p_id) {
+void EditorDebuggerTree::select_nodes(const TypedArray<int64_t> &p_ids) {
 	// Manually select, as the tree control may be out-of-date for some reason (e.g. not shown yet).
 	selection_uncollapse_all = true;
-	inspected_object_id = uint64_t(p_id);
+	inspected_object_ids = p_ids;
 	scrolling_to_item = true;
-	emit_signal(SNAME("object_selected"), inspected_object_id, debugger_id);
+
+	if (!updating_scene_tree) {
+		// Request a tree refresh.
+		EditorDebuggerNode::get_singleton()->request_remote_tree();
+	}
+	// Set the value immediately, so no update flooding happens and causes a crash.
+	updating_scene_tree = true;
+}
+
+void EditorDebuggerTree::clear_selection() {
+	inspected_object_ids.clear();
 
 	if (!updating_scene_tree) {
 		// Request a tree refresh.
@@ -453,8 +507,11 @@ void EditorDebuggerTree::_item_menu_id_pressed(int p_option) {
 }
 
 void EditorDebuggerTree::_file_selected(const String &p_file) {
-	if (inspected_object_id.is_null()) {
+	if (inspected_object_ids.size() != 1) {
+		accept->set_text(vformat(TTR("Saving the branch as a scene requires selecting only one node, but you have selected %d nodes."), inspected_object_ids.size()));
+		accept->popup_centered();
 		return;
 	}
-	emit_signal(SNAME("save_node"), inspected_object_id, p_file, debugger_id);
+
+	emit_signal(SNAME("save_node"), inspected_object_ids[0], p_file, debugger_id);
 }
diff --git a/engine/editor/debugger/editor_debugger_tree.h b/engine/editor/debugger/editor_debugger_tree.h
index 46893d6d..0281722c 100644
--- a/engine/editor/debugger/editor_debugger_tree.h
+++ b/engine/editor/debugger/editor_debugger_tree.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DEBUGGER_TREE_H
-#define EDITOR_DEBUGGER_TREE_H
+#pragma once
 
 #include "scene/gui/tree.h"
 
+class AcceptDialog;
 class SceneDebuggerTree;
 class EditorFileDialog;
 
@@ -58,18 +58,23 @@ private:
 		ITEM_MENU_EXPAND_COLLAPSE,
 	};
 
-	ObjectID inspected_object_id;
+	TypedArray<uint64_t> inspected_object_ids;
 	int debugger_id = 0;
 	bool updating_scene_tree = false;
 	bool scrolling_to_item = false;
+	bool notify_selection_queued = false;
+	bool selection_surpassed_limit = false;
 	bool selection_uncollapse_all = false;
 	HashSet<ObjectID> unfold_cache;
 	PopupMenu *item_menu = nullptr;
 	EditorFileDialog *file_dialog = nullptr;
+	AcceptDialog *accept = nullptr;
 	String last_filter;
 
 	void _scene_tree_folded(Object *p_obj);
-	void _scene_tree_selected();
+	void _scene_tree_selection_changed(TreeItem *p_item, int p_column, bool p_selected);
+	void _scene_tree_nothing_selected();
+	void _notify_selection_changed();
 	void _scene_tree_rmb_selected(const Vector2 &p_position, MouseButton p_button);
 	void _item_menu_id_pressed(int p_option);
 	void _file_selected(const String &p_file);
@@ -90,9 +95,10 @@ public:
 	String get_selected_path();
 	ObjectID get_selected_object();
 	int get_current_debugger(); // Would love to have one tree for every debugger.
+	inline TypedArray<uint64_t> get_selection() const { return inspected_object_ids.duplicate(); }
 	void update_scene_tree(const SceneDebuggerTree *p_tree, int p_debugger);
-	void select_node(ObjectID p_id);
+	void select_nodes(const TypedArray<int64_t> &p_ids);
+	void clear_selection();
+
 	EditorDebuggerTree();
 };
-
-#endif // EDITOR_DEBUGGER_TREE_H
diff --git a/engine/editor/debugger/editor_expression_evaluator.cpp b/engine/editor/debugger/editor_expression_evaluator.cpp
index 369361cd..2c6a6df6 100644
--- a/engine/editor/debugger/editor_expression_evaluator.cpp
+++ b/engine/editor/debugger/editor_expression_evaluator.cpp
@@ -74,7 +74,8 @@ void EditorExpressionEvaluator::_clear() {
 }
 
 void EditorExpressionEvaluator::_remote_object_selected(ObjectID p_id) {
-	editor_debugger->emit_signal(SNAME("remote_object_requested"), p_id);
+	Array arr = { p_id };
+	editor_debugger->emit_signal(SNAME("remote_objects_requested"), arr);
 }
 
 void EditorExpressionEvaluator::_on_expression_input_changed(const String &p_expression) {
@@ -109,6 +110,7 @@ EditorExpressionEvaluator::EditorExpressionEvaluator() {
 	expression_input = memnew(LineEdit);
 	expression_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	expression_input->set_placeholder(TTR("Expression to evaluate"));
+	expression_input->set_accessibility_name(TTRC("Expression"));
 	expression_input->set_clear_button_enabled(true);
 	expression_input->connect(SceneStringName(text_submitted), callable_mp(this, &EditorExpressionEvaluator::_evaluate).unbind(1));
 	expression_input->connect(SceneStringName(text_changed), callable_mp(this, &EditorExpressionEvaluator::_on_expression_input_changed));
diff --git a/engine/editor/debugger/editor_expression_evaluator.h b/engine/editor/debugger/editor_expression_evaluator.h
index 05487846..3153d2d6 100644
--- a/engine/editor/debugger/editor_expression_evaluator.h
+++ b/engine/editor/debugger/editor_expression_evaluator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_EXPRESSION_EVALUATOR_H
-#define EDITOR_EXPRESSION_EVALUATOR_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 
@@ -73,5 +72,3 @@ public:
 
 	EditorExpressionEvaluator();
 };
-
-#endif // EDITOR_EXPRESSION_EVALUATOR_H
diff --git a/engine/editor/debugger/editor_file_server.cpp b/engine/editor/debugger/editor_file_server.cpp
index 35b570ca..999bb68f 100644
--- a/engine/editor/debugger/editor_file_server.cpp
+++ b/engine/editor/debugger/editor_file_server.cpp
@@ -78,7 +78,7 @@ void EditorFileServer::_scan_files_changed(EditorFileSystemDirectory *efd, const
 					uint64_t mt = FileAccess::get_modified_time(remapped_path);
 					_add_file(remapped_path, mt, files_to_send, cached_files);
 				} else if (remap.begins_with("path.")) {
-					String feature = remap.get_slice(".", 1);
+					String feature = remap.get_slicec('.', 1);
 					if (p_tags.has(feature)) {
 						String remapped_path = cf->get_value("remap", remap);
 						uint64_t mt = FileAccess::get_modified_time(remapped_path);
@@ -200,7 +200,7 @@ void EditorFileServer::poll() {
 	// Scan files to send.
 	_scan_files_changed(EditorFileSystem::get_singleton()->get_filesystem(), tags, files_to_send, cached_files);
 	// Add forced export files
-	Vector<String> forced_export = EditorExportPlatform::get_forced_export_files();
+	Vector<String> forced_export = EditorExportPlatform::get_forced_export_files(Ref<EditorExportPreset>());
 	for (int i = 0; i < forced_export.size(); i++) {
 		_add_custom_file(forced_export[i], files_to_send, cached_files);
 	}
diff --git a/engine/editor/debugger/editor_file_server.h b/engine/editor/debugger/editor_file_server.h
index 2e3046b8..c1e22f12 100644
--- a/engine/editor/debugger/editor_file_server.h
+++ b/engine/editor/debugger/editor_file_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_FILE_SERVER_H
-#define EDITOR_FILE_SERVER_H
+#pragma once
 
 #include "core/io/tcp_server.h"
 #include "core/os/thread.h"
@@ -55,5 +54,3 @@ public:
 	EditorFileServer();
 	~EditorFileServer();
 };
-
-#endif // EDITOR_FILE_SERVER_H
diff --git a/engine/editor/debugger/editor_performance_profiler.cpp b/engine/editor/debugger/editor_performance_profiler.cpp
index 41e7d402..aac95b87 100644
--- a/engine/editor/debugger/editor_performance_profiler.cpp
+++ b/engine/editor/debugger/editor_performance_profiler.cpp
@@ -37,8 +37,6 @@
 #include "editor/themes/editor_theme_manager.h"
 #include "main/performance.h"
 
-EditorPerformanceProfiler::Monitor::Monitor() {}
-
 EditorPerformanceProfiler::Monitor::Monitor(const String &p_name, const String &p_base, int p_frame_index, Performance::MonitorType p_type, TreeItem *p_item) {
 	type = p_type;
 	item = p_item;
diff --git a/engine/editor/debugger/editor_performance_profiler.h b/engine/editor/debugger/editor_performance_profiler.h
index 635110e8..6b671038 100644
--- a/engine/editor/debugger/editor_performance_profiler.h
+++ b/engine/editor/debugger/editor_performance_profiler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PERFORMANCE_PROFILER_H
-#define EDITOR_PERFORMANCE_PROFILER_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "main/performance.h"
@@ -52,7 +51,7 @@ private:
 		Performance::MonitorType type = Performance::MONITOR_TYPE_QUANTITY;
 		int frame_index = 0;
 
-		Monitor();
+		Monitor() {}
 		Monitor(const String &p_name, const String &p_base, int p_frame_index, Performance::MonitorType p_type, TreeItem *p_item);
 		void update_value(float p_value);
 		void reset();
@@ -88,5 +87,3 @@ public:
 	List<float> *get_monitor_data(const StringName &p_name);
 	EditorPerformanceProfiler();
 };
-
-#endif // EDITOR_PERFORMANCE_PROFILER_H
diff --git a/engine/editor/debugger/editor_profiler.cpp b/engine/editor/debugger/editor_profiler.cpp
index 8406984b..741c2cfa 100644
--- a/engine/editor/debugger/editor_profiler.cpp
+++ b/engine/editor/debugger/editor_profiler.cpp
@@ -146,7 +146,7 @@ String EditorProfiler::_get_time_as_text(const Metric &m, float p_time, int p_ca
 
 Color EditorProfiler::_get_color_from_signature(const StringName &p_signature) const {
 	Color bc = get_theme_color(SNAME("error_color"), EditorStringName(Editor));
-	double rot = ABS(double(p_signature.hash()) / double(0x7FFFFFFF));
+	double rot = Math::abs(double(p_signature.hash()) / double(0x7FFFFFFF));
 	Color c;
 	c.set_hsv(rot, bc.get_s(), bc.get_v());
 	return c.lerp(get_theme_color(SNAME("base_color"), EditorStringName(Editor)), 0.07);
@@ -694,6 +694,7 @@ EditorProfiler::EditorProfiler() {
 	hb_measure->add_child(memnew(Label(TTR("Measure:"))));
 
 	display_mode = memnew(OptionButton);
+	display_mode->set_accessibility_name(TTRC("Measure"));
 	display_mode->add_item(TTR("Frame Time (ms)"));
 	display_mode->add_item(TTR("Average Time (ms)"));
 	display_mode->add_item(TTR("Frame %"));
@@ -709,6 +710,7 @@ EditorProfiler::EditorProfiler() {
 	hb_time->add_child(memnew(Label(TTR("Time:"))));
 
 	display_time = memnew(OptionButton);
+	display_time->set_accessibility_name(TTRC("Time"));
 	// TRANSLATORS: This is an option in the profiler to display the time spent in a function, including the time spent in other functions called by that function.
 	display_time->add_item(TTR("Inclusive"));
 	// TRANSLATORS: This is an option in the profiler to display the time spent in a function, exincluding the time spent in other functions called by that function.
@@ -731,6 +733,7 @@ EditorProfiler::EditorProfiler() {
 	hb_frame->add_child(memnew(Label(TTR("Frame #:"))));
 
 	cursor_metric_edit = memnew(SpinBox);
+	cursor_metric_edit->set_accessibility_name(TTRC("Frame"));
 	cursor_metric_edit->set_h_size_flags(SIZE_FILL);
 	cursor_metric_edit->set_value(0);
 	cursor_metric_edit->set_editable(false);
diff --git a/engine/editor/debugger/editor_profiler.h b/engine/editor/debugger/editor_profiler.h
index c9a18e3f..0c4f2c45 100644
--- a/engine/editor/debugger/editor_profiler.h
+++ b/engine/editor/debugger/editor_profiler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PROFILER_H
-#define EDITOR_PROFILER_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -186,5 +185,3 @@ public:
 
 	EditorProfiler();
 };
-
-#endif // EDITOR_PROFILER_H
diff --git a/engine/editor/debugger/editor_visual_profiler.cpp b/engine/editor/debugger/editor_visual_profiler.cpp
index 05e135ca..1f41ee2b 100644
--- a/engine/editor/debugger/editor_visual_profiler.cpp
+++ b/engine/editor/debugger/editor_visual_profiler.cpp
@@ -136,7 +136,7 @@ String EditorVisualProfiler::_get_time_as_text(float p_time) {
 
 Color EditorVisualProfiler::_get_color_from_signature(const StringName &p_signature) const {
 	Color bc = get_theme_color(SNAME("error_color"), EditorStringName(Editor));
-	double rot = ABS(double(p_signature.hash()) / double(0x7FFFFFFF));
+	double rot = Math::abs(double(p_signature.hash()) / double(0x7FFFFFFF));
 	Color c;
 	c.set_hsv(rot, bc.get_s(), bc.get_v());
 	return c.lerp(get_theme_color(SNAME("base_color"), EditorStringName(Editor)), 0.07);
@@ -362,7 +362,7 @@ void EditorVisualProfiler::_update_frame(bool p_focus_selected) {
 			stack.push_back(category);
 			categories.push_back(category);
 
-			name = name.substr(1, name.length());
+			name = name.substr(1);
 
 			category->set_text(0, name);
 			category->set_metadata(1, cpu_time);
@@ -778,6 +778,7 @@ EditorVisualProfiler::EditorVisualProfiler() {
 	hb_measure->add_child(memnew(Label(TTR("Measure:"))));
 
 	display_mode = memnew(OptionButton);
+	display_mode->set_accessibility_name(TTRC("Measure"));
 	display_mode->add_item(TTR("Frame Time (ms)"));
 	display_mode->add_item(TTR("Frame %"));
 	display_mode->connect(SceneStringName(item_selected), callable_mp(this, &EditorVisualProfiler::_combo_changed));
@@ -801,6 +802,7 @@ EditorVisualProfiler::EditorVisualProfiler() {
 	hb_frame->add_child(memnew(Label(TTR("Frame #:"))));
 
 	cursor_metric_edit = memnew(SpinBox);
+	cursor_metric_edit->set_accessibility_name(TTRC("Frame"));
 	cursor_metric_edit->set_h_size_flags(SIZE_FILL);
 	hb_frame->add_child(cursor_metric_edit);
 	cursor_metric_edit->connect(SceneStringName(value_changed), callable_mp(this, &EditorVisualProfiler::_cursor_metric_changed));
diff --git a/engine/editor/debugger/editor_visual_profiler.h b/engine/editor/debugger/editor_visual_profiler.h
index 5ef45fcc..b4a8b1a6 100644
--- a/engine/editor/debugger/editor_visual_profiler.h
+++ b/engine/editor/debugger/editor_visual_profiler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_VISUAL_PROFILER_H
-#define EDITOR_VISUAL_PROFILER_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -153,5 +152,3 @@ public:
 
 	EditorVisualProfiler();
 };
-
-#endif // EDITOR_VISUAL_PROFILER_H
diff --git a/engine/editor/debugger/script_editor_debugger.cpp b/engine/editor/debugger/script_editor_debugger.cpp
index c4242f7d..6efe1be8 100644
--- a/engine/editor/debugger/script_editor_debugger.cpp
+++ b/engine/editor/debugger/script_editor_debugger.cpp
@@ -30,13 +30,10 @@
 
 #include "script_editor_debugger.h"
 
-#include "core/config/project_settings.h"
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/remote_debugger.h"
-#include "core/io/marshalls.h"
 #include "core/string/ustring.h"
 #include "core/version.h"
-#include "editor/debugger/debug_adapter/debug_adapter_protocol.h"
 #include "editor/debugger/editor_expression_evaluator.h"
 #include "editor/debugger/editor_performance_profiler.h"
 #include "editor/debugger/editor_profiler.h"
@@ -47,7 +44,9 @@
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_string_names.h"
+#include "editor/filesystem_dock.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/gui/editor_toaster.h"
 #include "editor/inspector_dock.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/editor_debugger_plugin.h"
@@ -56,6 +55,7 @@
 #include "main/performance.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/debugger/scene_debugger.h"
+#include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
@@ -73,11 +73,9 @@ using CameraOverride = EditorDebuggerNode::CameraOverride;
 void ScriptEditorDebugger::_put_msg(const String &p_message, const Array &p_data, uint64_t p_thread_id) {
 	ERR_FAIL_COND(p_thread_id == Thread::UNASSIGNED_ID);
 	if (is_session_active()) {
-		Array msg;
-		msg.push_back(p_message);
-		msg.push_back(p_thread_id);
-		msg.push_back(p_data);
-		peer->put_message(msg);
+		Array msg = { p_message, p_thread_id, p_data };
+		Error err = peer->put_message(msg);
+		ERR_FAIL_COND_MSG(err != OK, vformat("Failed to send message %d", err));
 	}
 }
 
@@ -97,11 +95,22 @@ void ScriptEditorDebugger::debug_skip_breakpoints() {
 		skip_breakpoints->set_button_icon(get_editor_theme_icon(SNAME("DebugSkipBreakpointsOff")));
 	}
 
-	Array msg;
-	msg.push_back(skip_breakpoints_value);
+	Array msg = { skip_breakpoints_value };
 	_put_msg("set_skip_breakpoints", msg, debugging_thread_id != Thread::UNASSIGNED_ID ? debugging_thread_id : Thread::MAIN_ID);
 }
 
+void ScriptEditorDebugger::debug_ignore_error_breaks() {
+	ignore_error_breaks_value = !ignore_error_breaks_value;
+	if (ignore_error_breaks_value) {
+		ignore_error_breaks->set_button_icon(get_theme_icon(SNAME("NotificationDisabled"), SNAME("EditorIcons")));
+	} else {
+		ignore_error_breaks->set_button_icon(get_theme_icon(SNAME("Notification"), SNAME("EditorIcons")));
+	}
+
+	Array msg = { ignore_error_breaks_value };
+	_put_msg("set_ignore_error_breaks", msg);
+}
+
 void ScriptEditorDebugger::debug_next() {
 	ERR_FAIL_COND(!is_breaked());
 
@@ -156,9 +165,7 @@ void ScriptEditorDebugger::clear_style() {
 }
 
 void ScriptEditorDebugger::save_node(ObjectID p_id, const String &p_file) {
-	Array msg;
-	msg.push_back(p_id);
-	msg.push_back(p_file);
+	Array msg = { p_id, p_file };
 	_put_msg("scene:save_node", msg);
 }
 
@@ -251,38 +258,43 @@ const SceneDebuggerTree *ScriptEditorDebugger::get_remote_tree() {
 }
 
 void ScriptEditorDebugger::request_remote_evaluate(const String &p_expression, int p_stack_frame) {
-	Array msg;
-	msg.push_back(p_expression);
-	msg.push_back(p_stack_frame);
+	Array msg = { p_expression, p_stack_frame };
 	_put_msg("evaluate", msg);
 }
 
-void ScriptEditorDebugger::update_remote_object(ObjectID p_obj_id, const String &p_prop, const Variant &p_value) {
-	Array msg;
-	msg.push_back(p_obj_id);
-	msg.push_back(p_prop);
-	msg.push_back(p_value);
-	_put_msg("scene:set_object_property", msg);
+void ScriptEditorDebugger::update_remote_object(ObjectID p_obj_id, const String &p_prop, const Variant &p_value, const String &p_field) {
+	Array msg = { p_obj_id, p_prop, p_value };
+	if (p_field.is_empty()) {
+		_put_msg("scene:set_object_property", msg);
+	} else {
+		msg.push_back(p_field);
+		_put_msg("scene:set_object_property_field", msg);
+	}
 }
 
-void ScriptEditorDebugger::request_remote_object(ObjectID p_obj_id) {
-	ERR_FAIL_COND(p_obj_id.is_null());
-	Array msg;
-	msg.push_back(p_obj_id);
-	_put_msg("scene:inspect_object", msg);
+void ScriptEditorDebugger::request_remote_objects(const TypedArray<uint64_t> &p_obj_ids, bool p_update_selection) {
+	ERR_FAIL_COND(p_obj_ids.is_empty());
+	Array msg = { p_obj_ids.duplicate(), p_update_selection };
+	_put_msg("scene:inspect_objects", msg);
 }
 
-Object *ScriptEditorDebugger::get_remote_object(ObjectID p_id) {
-	return inspector->get_object(p_id);
+void ScriptEditorDebugger::clear_inspector(bool p_send_msg) {
+	inspector->clear_remote_inspector();
+	if (p_send_msg) {
+		_put_msg("scene:clear_selection", Array());
+	}
 }
 
 void ScriptEditorDebugger::_remote_object_selected(ObjectID p_id) {
-	emit_signal(SNAME("remote_object_requested"), p_id);
+	Array arr = { p_id };
+	emit_signal(SNAME("remote_objects_requested"), arr);
 }
 
-void ScriptEditorDebugger::_remote_object_edited(ObjectID p_id, const String &p_prop, const Variant &p_value) {
-	update_remote_object(p_id, p_prop, p_value);
-	request_remote_object(p_id);
+void ScriptEditorDebugger::_remote_objects_edited(const String &p_prop, const TypedDictionary<uint64_t, Variant> &p_values, const String &p_field) {
+	for (const KeyValue<Variant, Variant> &kv : p_values) {
+		update_remote_object(ObjectID(static_cast<uint64_t>(kv.key)), p_prop, kv.value, p_field);
+	}
+	request_remote_objects(p_values.keys(), false);
 }
 
 void ScriptEditorDebugger::_remote_object_property_updated(ObjectID p_id, const String &p_property) {
@@ -324,511 +336,581 @@ void ScriptEditorDebugger::_select_thread(int p_index) {
 	_thread_debug_enter(debugging_thread_id);
 }
 
-void ScriptEditorDebugger::_parse_message(const String &p_msg, uint64_t p_thread_id, const Array &p_data) {
-	emit_signal(SNAME("debug_data"), p_msg, p_data);
-	if (p_msg == "debug_enter") {
-		ERR_FAIL_COND(p_data.size() != 4);
+void ScriptEditorDebugger::_msg_debug_enter(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.size() != 4);
 
-		ThreadDebugged td;
-		td.name = p_data[3];
-		td.error = p_data[1];
-		td.can_debug = p_data[0];
-		td.has_stackdump = p_data[2];
-		td.thread_id = p_thread_id;
-		static uint32_t order_inc = 0;
-		td.debug_order = order_inc++;
+	const Thread::ID caller_id = p_data[3];
 
-		threads_debugged.insert(p_thread_id, td);
+	ThreadDebugged td;
+	td.name = (caller_id == Thread::get_main_id()) ? TTR("Main Thread") : itos(caller_id);
+	td.error = p_data[1];
+	td.can_debug = p_data[0];
+	td.has_stackdump = p_data[2];
+	td.thread_id = p_thread_id;
+	static uint32_t order_inc = 0;
+	td.debug_order = order_inc++;
 
-		if (threads_debugged.size() == 1) {
-			// First thread that requests debug
-			debugging_thread_id = p_thread_id;
-			_thread_debug_enter(p_thread_id);
-			can_request_idle_draw = true;
-			if (is_move_to_foreground()) {
-				DisplayServer::get_singleton()->window_move_to_foreground();
-			}
-			profiler->set_enabled(false, false);
-			visual_profiler->set_enabled(false);
-		}
-		_update_buttons_state();
+	threads_debugged.insert(p_thread_id, td);
 
-	} else if (p_msg == "debug_exit") {
-		threads_debugged.erase(p_thread_id);
-		if (p_thread_id == debugging_thread_id) {
-			_clear_execution();
-			if (threads_debugged.size() == 0) {
-				debugging_thread_id = Thread::UNASSIGNED_ID;
-			} else {
-				// Find next thread to debug.
-				uint32_t min_order = 0xFFFFFFFF;
-				uint64_t next_thread = Thread::UNASSIGNED_ID;
-				for (KeyValue<uint64_t, ThreadDebugged> T : threads_debugged) {
-					if (T.value.debug_order < min_order) {
-						min_order = T.value.debug_order;
-						next_thread = T.key;
-					}
-				}
-
-				debugging_thread_id = next_thread;
-			}
-
-			if (debugging_thread_id == Thread::UNASSIGNED_ID) {
-				// Nothing else to debug.
-				profiler->set_enabled(true, false);
-				profiler->disable_seeking();
-
-				visual_profiler->set_enabled(true);
-
-				_set_reason_text(TTR("Execution resumed."), MESSAGE_SUCCESS);
-				emit_signal(SNAME("breaked"), false, false, "", false);
-
-				_update_buttons_state();
-			} else {
-				_thread_debug_enter(debugging_thread_id);
-			}
-		} else {
-			_update_buttons_state();
-		}
-
-	} else if (p_msg == "set_pid") {
-		ERR_FAIL_COND(p_data.is_empty());
-		remote_pid = p_data[0];
-	} else if (p_msg == "scene:click_ctrl") {
-		ERR_FAIL_COND(p_data.size() < 2);
-		clicked_ctrl->set_text(p_data[0]);
-		clicked_ctrl_type->set_text(p_data[1]);
-	} else if (p_msg == "scene:scene_tree") {
-		scene_tree->nodes.clear();
-		scene_tree->deserialize(p_data);
-		emit_signal(SNAME("remote_tree_updated"));
-		_update_buttons_state();
-	} else if (p_msg == "scene:inspect_object") {
-		ObjectID id = inspector->add_object(p_data);
-		if (id.is_valid()) {
-			emit_signal(SNAME("remote_object_updated"), id);
-		}
-	} else if (p_msg == "servers:memory_usage") {
-		vmem_tree->clear();
-		TreeItem *root = vmem_tree->create_item();
-		ServersDebugger::ResourceUsage usage;
-		usage.deserialize(p_data);
-
-		uint64_t total = 0;
-
-		for (const ServersDebugger::ResourceInfo &E : usage.infos) {
-			TreeItem *it = vmem_tree->create_item(root);
-			String type = E.type;
-			int bytes = E.vram;
-			it->set_text(0, E.path);
-			it->set_text(1, type);
-			it->set_text(2, E.format);
-			it->set_text(3, String::humanize_size(bytes));
-			total += bytes;
-
-			if (has_theme_icon(type, EditorStringName(EditorIcons))) {
-				it->set_icon(0, get_editor_theme_icon(type));
-			}
-		}
-
-		vmem_total->set_tooltip_text(TTR("Bytes:") + " " + itos(total));
-		vmem_total->set_text(String::humanize_size(total));
-	} else if (p_msg == "servers:drawn") {
+	if (threads_debugged.size() == 1) {
+		// First thread that requests debug
+		debugging_thread_id = p_thread_id;
+		_thread_debug_enter(p_thread_id);
 		can_request_idle_draw = true;
-	} else if (p_msg == "stack_dump") {
-		DebuggerMarshalls::ScriptStackDump stack;
-		stack.deserialize(p_data);
-
-		stack_dump->clear();
-		inspector->clear_stack_variables();
-		TreeItem *r = stack_dump->create_item();
-
-		Array stack_dump_info;
-
-		int i = 0;
-		for (List<ScriptLanguage::StackInfo>::Iterator itr = stack.frames.begin(); itr != stack.frames.end(); ++itr, ++i) {
-			TreeItem *s = stack_dump->create_item(r);
-			Dictionary d;
-			d["frame"] = i;
-			d["file"] = itr->file;
-			d["function"] = itr->func;
-			d["line"] = itr->line;
-			stack_dump_info.push_back(d);
-			s->set_metadata(0, d);
-
-			String line = itos(i) + " - " + String(d["file"]) + ":" + itos(d["line"]) + " - at function: " + String(d["function"]);
-			s->set_text(0, line);
-
-			if (i == 0) {
-				s->select(0);
-			}
+		if (is_move_to_foreground()) {
+			DisplayServer::get_singleton()->window_move_to_foreground();
 		}
-		emit_signal(SNAME("stack_dump"), stack_dump_info);
-	} else if (p_msg == "stack_frame_vars") {
-		inspector->clear_stack_variables();
-		ERR_FAIL_COND(p_data.size() != 1);
-		emit_signal(SNAME("stack_frame_vars"), p_data[0]);
-	} else if (p_msg == "stack_frame_var") {
-		inspector->add_stack_variable(p_data);
-		emit_signal(SNAME("stack_frame_var"), p_data);
-	} else if (p_msg == "output") {
-		ERR_FAIL_COND(p_data.size() != 2);
+		profiler->set_enabled(false, false);
+		visual_profiler->set_enabled(false);
+	}
+	_update_buttons_state();
+}
 
-		ERR_FAIL_COND(p_data[0].get_type() != Variant::PACKED_STRING_ARRAY);
-		Vector<String> output_strings = p_data[0];
-
-		ERR_FAIL_COND(p_data[1].get_type() != Variant::PACKED_INT32_ARRAY);
-		Vector<int> output_types = p_data[1];
-
-		ERR_FAIL_COND(output_strings.size() != output_types.size());
-
-		for (int i = 0; i < output_strings.size(); i++) {
-			RemoteDebugger::MessageType type = (RemoteDebugger::MessageType)(int)(output_types[i]);
-			EditorLog::MessageType msg_type;
-			switch (type) {
-				case RemoteDebugger::MESSAGE_TYPE_LOG: {
-					msg_type = EditorLog::MSG_TYPE_STD;
-				} break;
-				case RemoteDebugger::MESSAGE_TYPE_LOG_RICH: {
-					msg_type = EditorLog::MSG_TYPE_STD_RICH;
-				} break;
-				case RemoteDebugger::MESSAGE_TYPE_ERROR: {
-					msg_type = EditorLog::MSG_TYPE_ERROR;
-				} break;
-				default: {
-					WARN_PRINT("Unhandled script debugger message type: " + itos(type));
-					msg_type = EditorLog::MSG_TYPE_STD;
-				} break;
-			}
-			EditorNode::get_log()->add_message(output_strings[i], msg_type);
-			emit_signal(SceneStringName(output), output_strings[i], msg_type);
-		}
-	} else if (p_msg == "performance:profile_frame") {
-		Vector<float> frame_data;
-		frame_data.resize(p_data.size());
-		for (int i = 0; i < p_data.size(); i++) {
-			frame_data.write[i] = p_data[i];
-		}
-		performance_profiler->add_profile_frame(frame_data);
-	} else if (p_msg == "visual:hardware_info") {
-		const String cpu_name = p_data[0];
-		const String gpu_name = p_data[1];
-		visual_profiler->set_hardware_info(cpu_name, gpu_name);
-	} else if (p_msg == "visual:profile_frame") {
-		ServersDebugger::VisualProfilerFrame frame;
-		frame.deserialize(p_data);
-
-		EditorVisualProfiler::Metric metric;
-		metric.areas.resize(frame.areas.size());
-		metric.frame_number = frame.frame_number;
-		metric.valid = true;
-
-		{
-			EditorVisualProfiler::Metric::Area *areas_ptr = metric.areas.ptrw();
-			for (int i = 0; i < frame.areas.size(); i++) {
-				areas_ptr[i].name = frame.areas[i].name;
-				areas_ptr[i].cpu_time = frame.areas[i].cpu_msec;
-				areas_ptr[i].gpu_time = frame.areas[i].gpu_msec;
-			}
-		}
-		visual_profiler->add_frame_metric(metric);
-	} else if (p_msg == "error") {
-		DebuggerMarshalls::OutputError oe;
-		ERR_FAIL_COND_MSG(oe.deserialize(p_data) == false, "Failed to deserialize error message");
-
-		// Format time.
-		Array time_vals;
-		time_vals.push_back(oe.hr);
-		time_vals.push_back(oe.min);
-		time_vals.push_back(oe.sec);
-		time_vals.push_back(oe.msec);
-		bool e;
-		String time = String("%d:%02d:%02d:%03d").sprintf(time_vals, &e);
-
-		// Rest of the error data.
-		bool source_is_project_file = oe.source_file.begins_with("res://");
-
-		// Metadata to highlight error line in scripts.
-		Array source_meta;
-		source_meta.push_back(oe.source_file);
-		source_meta.push_back(oe.source_line);
-
-		// Create error tree to display above error or warning details.
-		TreeItem *r = error_tree->get_root();
-		if (!r) {
-			r = error_tree->create_item();
-		}
-
-		// Also provide the relevant details as tooltip to quickly check without
-		// uncollapsing the tree.
-		String tooltip = oe.warning ? TTR("Warning:") : TTR("Error:");
-
-		TreeItem *error = error_tree->create_item(r);
-		if (oe.warning) {
-			error->set_meta("_is_warning", true);
+void ScriptEditorDebugger::_msg_debug_exit(uint64_t p_thread_id, const Array &p_data) {
+	threads_debugged.erase(p_thread_id);
+	if (p_thread_id == debugging_thread_id) {
+		_clear_execution();
+		if (threads_debugged.is_empty()) {
+			debugging_thread_id = Thread::UNASSIGNED_ID;
 		} else {
-			error->set_meta("_is_error", true);
-		}
-		error->set_collapsed(true);
-
-		error->set_icon(0, get_editor_theme_icon(oe.warning ? SNAME("Warning") : SNAME("Error")));
-		error->set_text(0, time);
-		error->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
-
-		const Color color = get_theme_color(oe.warning ? SNAME("warning_color") : SNAME("error_color"), EditorStringName(Editor));
-		error->set_custom_color(0, color);
-		error->set_custom_color(1, color);
-
-		String error_title;
-		if (!oe.source_func.is_empty() && source_is_project_file) {
-			// If source function is inside the project file.
-			error_title += oe.source_func + ": ";
-		} else if (oe.callstack.size() > 0) {
-			// Otherwise, if available, use the script's stack in the error title.
-			error_title = _format_frame_text(&oe.callstack[0]) + ": ";
-		} else if (!oe.source_func.is_empty()) {
-			// Otherwise try to use the C++ source function.
-			error_title += oe.source_func + ": ";
-		}
-		// If we have a (custom) error message, use it as title, and add a C++ Error
-		// item with the original error condition.
-		error_title += oe.error_descr.is_empty() ? oe.error : oe.error_descr;
-		error->set_text(1, error_title);
-		tooltip += " " + error_title + "\n";
-
-		// Find the language of the error's source file.
-		String source_language_name = "C++"; // Default value is the old hard-coded one.
-		const String source_file_extension = oe.source_file.get_extension();
-		for (int i = 0; i < ScriptServer::get_language_count(); ++i) {
-			ScriptLanguage *script_language = ScriptServer::get_language(i);
-			if (source_file_extension == script_language->get_extension()) {
-				source_language_name = script_language->get_name();
-				break;
-			}
-		}
-
-		if (!oe.error_descr.is_empty()) {
-			// Add item for C++ error condition.
-			TreeItem *cpp_cond = error_tree->create_item(error);
-			// TRANSLATORS: %s is the name of a language, e.g. C++.
-			cpp_cond->set_text(0, "<" + vformat(TTR("%s Error"), source_language_name) + ">");
-			cpp_cond->set_text(1, oe.error);
-			cpp_cond->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
-			tooltip += vformat(TTR("%s Error:"), source_language_name) + " " + oe.error + "\n";
-			if (source_is_project_file) {
-				cpp_cond->set_metadata(0, source_meta);
-			}
-		}
-		Vector<uint8_t> v;
-		v.resize(100);
-
-		// Source of the error.
-		String source_txt = (source_is_project_file ? oe.source_file.get_file() : oe.source_file) + ":" + itos(oe.source_line);
-		if (!oe.source_func.is_empty()) {
-			source_txt += " @ " + oe.source_func;
-			if (!oe.source_func.ends_with(")")) {
-				source_txt += "()";
-			}
-		}
-
-		TreeItem *cpp_source = error_tree->create_item(error);
-		// TRANSLATORS: %s is the name of a language, e.g. C++.
-		cpp_source->set_text(0, "<" + vformat(TTR("%s Source"), source_language_name) + ">");
-		cpp_source->set_text(1, source_txt);
-		cpp_source->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
-		tooltip += vformat(TTR("%s Source:"), source_language_name) + " " + source_txt + "\n";
-
-		// Set metadata to highlight error line in scripts.
-		if (source_is_project_file) {
-			error->set_metadata(0, source_meta);
-			cpp_source->set_metadata(0, source_meta);
-		}
-
-		// Format stack trace.
-		// stack_items_count is the number of elements to parse, with 3 items per frame
-		// of the stack trace (script, method, line).
-		const ScriptLanguage::StackInfo *infos = oe.callstack.ptr();
-		for (unsigned int i = 0; i < (unsigned int)oe.callstack.size(); i++) {
-			TreeItem *stack_trace = error_tree->create_item(error);
-
-			Array meta;
-			meta.push_back(infos[i].file);
-			meta.push_back(infos[i].line);
-			stack_trace->set_metadata(0, meta);
-
-			if (i == 0) {
-				stack_trace->set_text(0, "<" + TTR("Stack Trace") + ">");
-				stack_trace->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
-				if (!source_is_project_file) {
-					// Only override metadata if the source is not inside the project.
-					error->set_metadata(0, meta);
+			// Find next thread to debug.
+			uint32_t min_order = 0xFFFFFFFF;
+			uint64_t next_thread = Thread::UNASSIGNED_ID;
+			for (KeyValue<uint64_t, ThreadDebugged> T : threads_debugged) {
+				if (T.value.debug_order < min_order) {
+					min_order = T.value.debug_order;
+					next_thread = T.key;
 				}
-				tooltip += TTR("Stack Trace:") + "\n";
 			}
 
-			String frame_txt = _format_frame_text(&infos[i]);
-			tooltip += frame_txt + "\n";
-			stack_trace->set_text(1, frame_txt);
+			debugging_thread_id = next_thread;
 		}
 
-		error->set_tooltip_text(0, tooltip);
-		error->set_tooltip_text(1, tooltip);
+		if (debugging_thread_id == Thread::UNASSIGNED_ID) {
+			// Nothing else to debug.
+			profiler->set_enabled(true, false);
+			profiler->disable_seeking();
 
-		if (warning_count == 0 && error_count == 0) {
-			expand_all_button->set_disabled(false);
-			collapse_all_button->set_disabled(false);
-			clear_button->set_disabled(false);
-		}
+			visual_profiler->set_enabled(true);
 
-		if (oe.warning) {
-			warning_count++;
+			_set_reason_text(TTR("Execution resumed."), MESSAGE_SUCCESS);
+			emit_signal(SNAME("breaked"), false, false, "", false);
+
+			_update_buttons_state();
 		} else {
-			error_count++;
+			_thread_debug_enter(debugging_thread_id);
 		}
-	} else if (p_msg == "servers:function_signature") {
-		// Cache a profiler signature.
-		ServersDebugger::ScriptFunctionSignature sig;
-		sig.deserialize(p_data);
-		profiler_signature[sig.id] = sig.name;
-	} else if (p_msg == "servers:profile_frame" || p_msg == "servers:profile_total") {
-		EditorProfiler::Metric metric;
-		ServersDebugger::ServersProfilerFrame frame;
-		frame.deserialize(p_data);
-		metric.valid = true;
-		metric.frame_number = frame.frame_number;
-		metric.frame_time = frame.frame_time;
-		metric.process_time = frame.process_time;
-		metric.physics_time = frame.physics_time;
-		metric.physics_frame_time = frame.physics_frame_time;
+	} else {
+		_update_buttons_state();
+	}
+}
 
-		if (frame.servers.size()) {
-			EditorProfiler::Metric::Category frame_time;
-			frame_time.signature = "category_frame_time";
-			frame_time.name = "Frame Time";
-			frame_time.total_time = metric.frame_time;
+void ScriptEditorDebugger::_msg_set_pid(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.is_empty());
+	remote_pid = p_data[0];
+}
 
+void ScriptEditorDebugger::_msg_scene_click_ctrl(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.size() < 2);
+	clicked_ctrl->set_text(p_data[0]);
+	clicked_ctrl_type->set_text(p_data[1]);
+}
+
+void ScriptEditorDebugger::_msg_scene_scene_tree(uint64_t p_thread_id, const Array &p_data) {
+	scene_tree->nodes.clear();
+	scene_tree->deserialize(p_data);
+	emit_signal(SNAME("remote_tree_updated"));
+	_update_buttons_state();
+}
+
+void ScriptEditorDebugger::_msg_scene_inspect_objects(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.is_empty());
+	EditorDebuggerRemoteObjects *objs = inspector->set_objects(p_data);
+	if (objs && EditorDebuggerNode::get_singleton()->match_remote_selection(objs->remote_object_ids)) {
+		EditorDebuggerNode::get_singleton()->stop_waiting_inspection();
+
+		emit_signal(SNAME("remote_objects_updated"), objs);
+	}
+}
+
+void ScriptEditorDebugger::_msg_servers_memory_usage(uint64_t p_thread_id, const Array &p_data) {
+	vmem_tree->clear();
+	TreeItem *root = vmem_tree->create_item();
+	ServersDebugger::ResourceUsage usage;
+	usage.deserialize(p_data);
+
+	uint64_t total = 0;
+
+	for (const ServersDebugger::ResourceInfo &E : usage.infos) {
+		TreeItem *it = vmem_tree->create_item(root);
+		String type = E.type;
+		int bytes = E.vram;
+		it->set_text(0, E.path);
+		it->set_text(1, type);
+		it->set_text(2, E.format);
+		it->set_text(3, String::humanize_size(bytes));
+		total += bytes;
+
+		if (has_theme_icon(type, EditorStringName(EditorIcons))) {
+			it->set_icon(0, get_editor_theme_icon(type));
+		}
+	}
+
+	vmem_total->set_tooltip_text(TTR("Bytes:") + " " + itos(total));
+	vmem_total->set_text(String::humanize_size(total));
+}
+
+void ScriptEditorDebugger::_msg_servers_drawn(uint64_t p_thread_id, const Array &p_data) {
+	can_request_idle_draw = true;
+}
+
+void ScriptEditorDebugger::_msg_stack_dump(uint64_t p_thread_id, const Array &p_data) {
+	DebuggerMarshalls::ScriptStackDump stack;
+	stack.deserialize(p_data);
+
+	stack_dump->clear();
+	inspector->clear_stack_variables();
+	TreeItem *r = stack_dump->create_item();
+
+	Array stack_dump_info;
+
+	int i = 0;
+	for (List<ScriptLanguage::StackInfo>::Iterator itr = stack.frames.begin(); itr != stack.frames.end(); ++itr, ++i) {
+		TreeItem *s = stack_dump->create_item(r);
+		Dictionary d;
+		d["frame"] = i;
+		d["file"] = itr->file;
+		d["function"] = itr->func;
+		d["line"] = itr->line;
+		stack_dump_info.push_back(d);
+		s->set_metadata(0, d);
+
+		String line = itos(i) + " - " + String(d["file"]) + ":" + itos(d["line"]) + " - at function: " + String(d["function"]);
+		s->set_text(0, line);
+
+		if (i == 0) {
+			s->select(0);
+		}
+	}
+	emit_signal(SNAME("stack_dump"), stack_dump_info);
+}
+
+void ScriptEditorDebugger::_msg_stack_frame_vars(uint64_t p_thread_id, const Array &p_data) {
+	inspector->clear_stack_variables();
+	ERR_FAIL_COND(p_data.size() != 1);
+	emit_signal(SNAME("stack_frame_vars"), p_data[0]);
+}
+
+void ScriptEditorDebugger::_msg_stack_frame_var(uint64_t p_thread_id, const Array &p_data) {
+	inspector->add_stack_variable(p_data);
+	emit_signal(SNAME("stack_frame_var"), p_data);
+}
+
+void ScriptEditorDebugger::_msg_output(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.size() != 2);
+
+	ERR_FAIL_COND(p_data[0].get_type() != Variant::PACKED_STRING_ARRAY);
+	Vector<String> output_strings = p_data[0];
+
+	ERR_FAIL_COND(p_data[1].get_type() != Variant::PACKED_INT32_ARRAY);
+	Vector<int> output_types = p_data[1];
+
+	ERR_FAIL_COND(output_strings.size() != output_types.size());
+
+	for (int i = 0; i < output_strings.size(); i++) {
+		RemoteDebugger::MessageType type = (RemoteDebugger::MessageType)(int)(output_types[i]);
+		EditorLog::MessageType msg_type;
+		switch (type) {
+			case RemoteDebugger::MESSAGE_TYPE_LOG: {
+				msg_type = EditorLog::MSG_TYPE_STD;
+			} break;
+			case RemoteDebugger::MESSAGE_TYPE_LOG_RICH: {
+				msg_type = EditorLog::MSG_TYPE_STD_RICH;
+			} break;
+			case RemoteDebugger::MESSAGE_TYPE_ERROR: {
+				msg_type = EditorLog::MSG_TYPE_ERROR;
+			} break;
+			default: {
+				WARN_PRINT("Unhandled script debugger message type: " + itos(type));
+				msg_type = EditorLog::MSG_TYPE_STD;
+			} break;
+		}
+		EditorNode::get_log()->add_message(output_strings[i], msg_type);
+		emit_signal(SceneStringName(output), output_strings[i], msg_type);
+	}
+}
+
+void ScriptEditorDebugger::_msg_performance_profile_frame(uint64_t p_thread_id, const Array &p_data) {
+	Vector<float> frame_data;
+	frame_data.resize(p_data.size());
+	for (int i = 0; i < p_data.size(); i++) {
+		frame_data.write[i] = p_data[i];
+	}
+	performance_profiler->add_profile_frame(frame_data);
+}
+
+void ScriptEditorDebugger::_msg_visual_hardware_info(uint64_t p_thread_id, const Array &p_data) {
+	const String cpu_name = p_data[0];
+	const String gpu_name = p_data[1];
+	visual_profiler->set_hardware_info(cpu_name, gpu_name);
+}
+
+void ScriptEditorDebugger::_msg_visual_profile_frame(uint64_t p_thread_id, const Array &p_data) {
+	ServersDebugger::VisualProfilerFrame frame;
+	frame.deserialize(p_data);
+
+	EditorVisualProfiler::Metric metric;
+	metric.areas.resize(frame.areas.size());
+	metric.frame_number = frame.frame_number;
+	metric.valid = true;
+
+	{
+		EditorVisualProfiler::Metric::Area *areas_ptr = metric.areas.ptrw();
+		for (int i = 0; i < frame.areas.size(); i++) {
+			areas_ptr[i].name = frame.areas[i].name;
+			areas_ptr[i].cpu_time = frame.areas[i].cpu_msec;
+			areas_ptr[i].gpu_time = frame.areas[i].gpu_msec;
+		}
+	}
+	visual_profiler->add_frame_metric(metric);
+}
+
+void ScriptEditorDebugger::_msg_error(uint64_t p_thread_id, const Array &p_data) {
+	DebuggerMarshalls::OutputError oe;
+	ERR_FAIL_COND_MSG(oe.deserialize(p_data) == false, "Failed to deserialize error message");
+
+	// Format time.
+	Array time_vals = { oe.hr, oe.min, oe.sec, oe.msec };
+	bool e;
+	String time = String("%d:%02d:%02d:%03d").sprintf(time_vals, &e);
+
+	// Rest of the error data.
+	bool source_is_project_file = oe.source_file.begins_with("res://");
+
+	// Metadata to highlight error line in scripts.
+	Array source_meta = { oe.source_file, oe.source_line };
+
+	// Create error tree to display above error or warning details.
+	TreeItem *r = error_tree->get_root();
+	if (!r) {
+		r = error_tree->create_item();
+	}
+
+	// Also provide the relevant details as tooltip to quickly check without
+	// uncollapsing the tree.
+	String tooltip = oe.warning ? TTR("Warning:") : TTR("Error:");
+
+	TreeItem *error = error_tree->create_item(r);
+	if (oe.warning) {
+		error->set_meta("_is_warning", true);
+	} else {
+		error->set_meta("_is_error", true);
+	}
+	error->set_collapsed(true);
+
+	error->set_icon(0, get_editor_theme_icon(oe.warning ? SNAME("Warning") : SNAME("Error")));
+	error->set_text(0, time);
+	error->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
+
+	const Color color = get_theme_color(oe.warning ? SNAME("warning_color") : SNAME("error_color"), EditorStringName(Editor));
+	error->set_custom_color(0, color);
+	error->set_custom_color(1, color);
+
+	String error_title;
+	if (!oe.source_func.is_empty() && source_is_project_file) {
+		// If source function is inside the project file.
+		error_title += oe.source_func + ": ";
+	} else if (oe.callstack.size() > 0) {
+		// Otherwise, if available, use the script's stack in the error title.
+		error_title = _format_frame_text(&oe.callstack[0]) + ": ";
+	} else if (!oe.source_func.is_empty()) {
+		// Otherwise try to use the C++ source function.
+		error_title += oe.source_func + ": ";
+	}
+	// If we have a (custom) error message, use it as title, and add a C++ Error
+	// item with the original error condition.
+	error_title += oe.error_descr.is_empty() ? oe.error : oe.error_descr;
+	error->set_text(1, error_title);
+	tooltip += " " + error_title + "\n";
+
+	// Find the language of the error's source file.
+	String source_language_name = "C++"; // Default value is the old hard-coded one.
+	const String source_file_extension = oe.source_file.get_extension();
+	for (int i = 0; i < ScriptServer::get_language_count(); ++i) {
+		ScriptLanguage *script_language = ScriptServer::get_language(i);
+		if (source_file_extension == script_language->get_extension()) {
+			source_language_name = script_language->get_name();
+			break;
+		}
+	}
+
+	if (!oe.error_descr.is_empty()) {
+		// Add item for C++ error condition.
+		TreeItem *cpp_cond = error_tree->create_item(error);
+		// TRANSLATORS: %s is the name of a language, e.g. C++.
+		cpp_cond->set_text(0, "<" + vformat(TTR("%s Error"), source_language_name) + ">");
+		cpp_cond->set_text(1, oe.error);
+		cpp_cond->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
+		tooltip += vformat(TTR("%s Error:"), source_language_name) + " " + oe.error + "\n";
+		if (source_is_project_file) {
+			cpp_cond->set_metadata(0, source_meta);
+		}
+	}
+	Vector<uint8_t> v;
+	v.resize(100);
+
+	// Source of the error.
+	String source_txt = (source_is_project_file ? oe.source_file.get_file() : oe.source_file) + ":" + itos(oe.source_line);
+	if (!oe.source_func.is_empty()) {
+		source_txt += " @ " + oe.source_func;
+		if (!oe.source_func.ends_with(")")) {
+			source_txt += "()";
+		}
+	}
+
+	TreeItem *cpp_source = error_tree->create_item(error);
+	// TRANSLATORS: %s is the name of a language, e.g. C++.
+	cpp_source->set_text(0, "<" + vformat(TTR("%s Source"), source_language_name) + ">");
+	cpp_source->set_text(1, source_txt);
+	cpp_source->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
+	tooltip += vformat(TTR("%s Source:"), source_language_name) + " " + source_txt + "\n";
+
+	// Set metadata to highlight error line in scripts.
+	if (source_is_project_file) {
+		error->set_metadata(0, source_meta);
+		cpp_source->set_metadata(0, source_meta);
+	}
+
+	// Format stack trace.
+	// stack_items_count is the number of elements to parse, with 3 items per frame
+	// of the stack trace (script, method, line).
+	const ScriptLanguage::StackInfo *infos = oe.callstack.ptr();
+	for (unsigned int i = 0; i < (unsigned int)oe.callstack.size(); i++) {
+		TreeItem *stack_trace = error_tree->create_item(error);
+
+		Array meta = { infos[i].file, infos[i].line };
+		stack_trace->set_metadata(0, meta);
+
+		if (i == 0) {
+			stack_trace->set_text(0, "<" + TTR("Stack Trace") + ">");
+			stack_trace->set_text_alignment(0, HORIZONTAL_ALIGNMENT_LEFT);
+			if (!source_is_project_file) {
+				// Only override metadata if the source is not inside the project.
+				error->set_metadata(0, meta);
+			}
+			tooltip += TTR("Stack Trace:") + "\n";
+		}
+
+		String frame_txt = _format_frame_text(&infos[i]);
+		tooltip += frame_txt + "\n";
+		stack_trace->set_text(1, frame_txt);
+	}
+
+	error->set_tooltip_text(0, tooltip);
+	error->set_tooltip_text(1, tooltip);
+
+	if (warning_count == 0 && error_count == 0) {
+		expand_all_button->set_disabled(false);
+		collapse_all_button->set_disabled(false);
+		clear_button->set_disabled(false);
+	}
+
+	if (oe.warning) {
+		warning_count++;
+	} else {
+		error_count++;
+	}
+}
+
+void ScriptEditorDebugger::_msg_servers_function_signature(uint64_t p_thread_id, const Array &p_data) {
+	// Cache a profiler signature.
+	ServersDebugger::ScriptFunctionSignature sig;
+	sig.deserialize(p_data);
+	profiler_signature[sig.id] = sig.name;
+}
+
+void ScriptEditorDebugger::_msg_servers_profile_common(const Array &p_data, const bool p_final) {
+	EditorProfiler::Metric metric;
+	ServersDebugger::ServersProfilerFrame frame;
+	frame.deserialize(p_data);
+	metric.valid = true;
+	metric.frame_number = frame.frame_number;
+	metric.frame_time = frame.frame_time;
+	metric.process_time = frame.process_time;
+	metric.physics_time = frame.physics_time;
+	metric.physics_frame_time = frame.physics_frame_time;
+
+	if (frame.servers.size()) {
+		EditorProfiler::Metric::Category frame_time;
+		frame_time.signature = "category_frame_time";
+		frame_time.name = "Frame Time";
+		frame_time.total_time = metric.frame_time;
+
+		EditorProfiler::Metric::Category::Item item;
+		item.calls = 1;
+		item.line = 0;
+
+		item.name = "Physics Time";
+		item.total = metric.physics_time;
+		item.self = item.total;
+		item.signature = "physics_time";
+
+		frame_time.items.push_back(item);
+
+		item.name = "Process Time";
+		item.total = metric.process_time;
+		item.self = item.total;
+		item.signature = "process_time";
+
+		frame_time.items.push_back(item);
+
+		item.name = "Physics Frame Time";
+		item.total = metric.physics_frame_time;
+		item.self = item.total;
+		item.signature = "physics_frame_time";
+
+		frame_time.items.push_back(item);
+
+		metric.categories.push_back(frame_time);
+	}
+
+	for (const ServersDebugger::ServerInfo &srv : frame.servers) {
+		EditorProfiler::Metric::Category c;
+		const String name = srv.name;
+		c.name = EditorPropertyNameProcessor::get_singleton()->process_name(name, EditorPropertyNameProcessor::STYLE_CAPITALIZED);
+		c.items.resize(srv.functions.size());
+		c.total_time = 0;
+		c.signature = "categ::" + name;
+		int j = 0;
+		for (List<ServersDebugger::ServerFunctionInfo>::ConstIterator itr = srv.functions.begin(); itr != srv.functions.end(); ++itr, ++j) {
 			EditorProfiler::Metric::Category::Item item;
 			item.calls = 1;
 			item.line = 0;
-
-			item.name = "Physics Time";
-			item.total = metric.physics_time;
-			item.self = item.total;
-			item.signature = "physics_time";
-
-			frame_time.items.push_back(item);
-
-			item.name = "Process Time";
-			item.total = metric.process_time;
-			item.self = item.total;
-			item.signature = "process_time";
-
-			frame_time.items.push_back(item);
-
-			item.name = "Physics Frame Time";
-			item.total = metric.physics_frame_time;
-			item.self = item.total;
-			item.signature = "physics_frame_time";
-
-			frame_time.items.push_back(item);
-
-			metric.categories.push_back(frame_time);
+			item.name = itr->name;
+			item.self = itr->time;
+			item.total = item.self;
+			item.signature = "categ::" + name + "::" + item.name;
+			item.name = EditorPropertyNameProcessor::get_singleton()->process_name(item.name, EditorPropertyNameProcessor::STYLE_CAPITALIZED);
+			c.total_time += item.total;
+			c.items.write[j] = item;
 		}
+		metric.categories.push_back(c);
+	}
 
-		for (const ServersDebugger::ServerInfo &srv : frame.servers) {
-			EditorProfiler::Metric::Category c;
-			const String name = srv.name;
-			c.name = EditorPropertyNameProcessor::get_singleton()->process_name(name, EditorPropertyNameProcessor::STYLE_CAPITALIZED);
-			c.items.resize(srv.functions.size());
-			c.total_time = 0;
-			c.signature = "categ::" + name;
-			int j = 0;
-			for (List<ServersDebugger::ServerFunctionInfo>::ConstIterator itr = srv.functions.begin(); itr != srv.functions.end(); ++itr, ++j) {
-				EditorProfiler::Metric::Category::Item item;
-				item.calls = 1;
-				item.line = 0;
-				item.name = itr->name;
-				item.self = itr->time;
-				item.total = item.self;
-				item.signature = "categ::" + name + "::" + item.name;
-				item.name = EditorPropertyNameProcessor::get_singleton()->process_name(item.name, EditorPropertyNameProcessor::STYLE_CAPITALIZED);
-				c.total_time += item.total;
-				c.items.write[j] = item;
-			}
-			metric.categories.push_back(c);
-		}
+	EditorProfiler::Metric::Category funcs;
+	funcs.total_time = frame.script_time;
+	funcs.items.resize(frame.script_functions.size());
+	funcs.name = "Script Functions";
+	funcs.signature = "script_functions";
+	for (int i = 0; i < frame.script_functions.size(); i++) {
+		int signature = frame.script_functions[i].sig_id;
+		int calls = frame.script_functions[i].call_count;
+		float total = frame.script_functions[i].total_time;
+		float self = frame.script_functions[i].self_time;
+		float internal = frame.script_functions[i].internal_time;
 
-		EditorProfiler::Metric::Category funcs;
-		funcs.total_time = frame.script_time;
-		funcs.items.resize(frame.script_functions.size());
-		funcs.name = "Script Functions";
-		funcs.signature = "script_functions";
-		for (int i = 0; i < frame.script_functions.size(); i++) {
-			int signature = frame.script_functions[i].sig_id;
-			int calls = frame.script_functions[i].call_count;
-			float total = frame.script_functions[i].total_time;
-			float self = frame.script_functions[i].self_time;
-			float internal = frame.script_functions[i].internal_time;
+		EditorProfiler::Metric::Category::Item item;
+		if (profiler_signature.has(signature)) {
+			item.signature = profiler_signature[signature];
 
-			EditorProfiler::Metric::Category::Item item;
-			if (profiler_signature.has(signature)) {
-				item.signature = profiler_signature[signature];
-
-				String name = profiler_signature[signature];
-				Vector<String> strings = name.split("::");
-				if (strings.size() == 3) {
-					item.name = strings[2];
-					item.script = strings[0];
-					item.line = strings[1].to_int();
-				} else if (strings.size() == 4) { //Built-in scripts have an :: in their name
-					item.name = strings[3];
-					item.script = strings[0] + "::" + strings[1];
-					item.line = strings[2].to_int();
-				}
-
-			} else {
-				item.name = "SigErr " + itos(signature);
+			String name = profiler_signature[signature];
+			Vector<String> strings = name.split("::");
+			if (strings.size() == 3) {
+				item.name = strings[2];
+				item.script = strings[0];
+				item.line = strings[1].to_int();
+			} else if (strings.size() == 4) { //Built-in scripts have an :: in their name
+				item.name = strings[3];
+				item.script = strings[0] + "::" + strings[1];
+				item.line = strings[2].to_int();
 			}
 
-			item.calls = calls;
-			item.self = self;
-			item.total = total;
-			item.internal = internal;
-			funcs.items.write[i] = item;
-		}
-
-		metric.categories.push_back(funcs);
-
-		if (p_msg == "servers:profile_frame") {
-			profiler->add_frame_metric(metric, false);
 		} else {
-			profiler->add_frame_metric(metric, true);
+			item.name = "SigErr " + itos(signature);
 		}
-	} else if (p_msg == "request_quit") {
-		emit_signal(SNAME("stop_requested"));
-		_stop_and_notify();
-	} else if (p_msg == "remote_node_clicked") {
-		if (!p_data.is_empty()) {
-			emit_signal(SNAME("remote_tree_select_requested"), p_data[0]);
-		}
-	} else if (p_msg == "performance:profile_names") {
-		Vector<StringName> monitors;
-		monitors.resize(p_data.size());
-		for (int i = 0; i < p_data.size(); i++) {
-			ERR_FAIL_COND(p_data[i].get_type() != Variant::STRING_NAME);
-			monitors.set(i, p_data[i]);
-		}
-		performance_profiler->update_monitors(monitors);
-	} else if (p_msg == "filesystem:update_file") {
-		ERR_FAIL_COND(p_data.is_empty());
-		if (EditorFileSystem::get_singleton()) {
-			EditorFileSystem::get_singleton()->update_file(p_data[0]);
-		}
-	} else if (p_msg == "evaluation_return") {
-		expression_evaluator->add_value(p_data);
-	} else if (p_msg == "window:title") {
-		ERR_FAIL_COND(p_data.size() != 1);
-		emit_signal(SNAME("remote_window_title_changed"), p_data[0]);
+
+		item.calls = calls;
+		item.self = self;
+		item.total = total;
+		item.internal = internal;
+		funcs.items.write[i] = item;
+	}
+
+	metric.categories.push_back(funcs);
+
+	profiler->add_frame_metric(metric, p_final);
+}
+
+void ScriptEditorDebugger::_msg_servers_profile_frame(uint64_t p_thread_id, const Array &p_data) {
+	_msg_servers_profile_common(p_data, false);
+}
+void ScriptEditorDebugger::_msg_servers_profile_total(uint64_t p_thread_id, const Array &p_data) {
+	_msg_servers_profile_common(p_data, true);
+}
+
+void ScriptEditorDebugger::_msg_request_quit(uint64_t p_thread_id, const Array &p_data) {
+	emit_signal(SNAME("stop_requested"));
+	_stop_and_notify();
+}
+
+void ScriptEditorDebugger::_msg_remote_objects_selected(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.is_empty());
+	EditorDebuggerRemoteObjects *objs = inspector->set_objects(p_data);
+	if (objs) {
+		EditorDebuggerNode::get_singleton()->stop_waiting_inspection();
+
+		emit_signal(SNAME("remote_objects_updated"), objs);
+		emit_signal(SNAME("remote_tree_select_requested"), objs->remote_object_ids.duplicate());
+	}
+}
+
+void ScriptEditorDebugger::_msg_remote_nothing_selected(uint64_t p_thread_id, const Array &p_data) {
+	EditorDebuggerNode::get_singleton()->stop_waiting_inspection();
+
+	emit_signal(SNAME("remote_tree_clear_selection_requested"));
+}
+
+void ScriptEditorDebugger::_msg_remote_selection_invalidated(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.is_empty());
+	inspector->invalidate_selection_from_cache(p_data[0]);
+}
+
+void ScriptEditorDebugger::_msg_show_selection_limit_warning(uint64_t p_thread_id, const Array &p_data) {
+	EditorToaster::get_singleton()->popup_str(vformat(TTR("Some remote nodes were not selected, as the configured maximum selection is %d. This can be changed at \"debugger/max_node_selection\" in the Editor Settings."), EDITOR_GET("debugger/max_node_selection")), EditorToaster::SEVERITY_WARNING);
+}
+
+void ScriptEditorDebugger::_msg_performance_profile_names(uint64_t p_thread_id, const Array &p_data) {
+	Vector<StringName> monitors;
+	monitors.resize(p_data.size());
+	for (int i = 0; i < p_data.size(); i++) {
+		ERR_FAIL_COND(p_data[i].get_type() != Variant::STRING_NAME);
+		monitors.set(i, p_data[i]);
+	}
+	performance_profiler->update_monitors(monitors);
+}
+
+void ScriptEditorDebugger::_msg_filesystem_update_file(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.is_empty());
+	if (EditorFileSystem::get_singleton()) {
+		EditorFileSystem::get_singleton()->update_file(p_data[0]);
+	}
+}
+
+void ScriptEditorDebugger::_msg_evaluation_return(uint64_t p_thread_id, const Array &p_data) {
+	expression_evaluator->add_value(p_data);
+}
+
+void ScriptEditorDebugger::_msg_window_title(uint64_t p_thread_id, const Array &p_data) {
+	ERR_FAIL_COND(p_data.size() != 1);
+	emit_signal(SNAME("remote_window_title_changed"), p_data[0]);
+}
+
+void ScriptEditorDebugger::_parse_message(const String &p_msg, uint64_t p_thread_id, const Array &p_data) {
+	emit_signal(SNAME("debug_data"), p_msg, p_data);
+
+	ParseMessageFunc *fn_ptr = parse_message_handlers.getptr(p_msg);
+	if (fn_ptr) {
+		(this->**fn_ptr)(p_thread_id, p_data);
 	} else {
 		int colon_index = p_msg.find_char(':');
 		ERR_FAIL_COND_MSG(colon_index < 1, "Invalid message received");
@@ -840,6 +922,39 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, uint64_t p_thread
 	}
 }
 
+HashMap<String, ScriptEditorDebugger::ParseMessageFunc> ScriptEditorDebugger::parse_message_handlers;
+
+void ScriptEditorDebugger::_init_parse_message_handlers() {
+	parse_message_handlers["debug_enter"] = &ScriptEditorDebugger::_msg_debug_enter;
+	parse_message_handlers["debug_exit"] = &ScriptEditorDebugger::_msg_debug_exit;
+	parse_message_handlers["set_pid"] = &ScriptEditorDebugger::_msg_set_pid;
+	parse_message_handlers["scene:click_ctrl"] = &ScriptEditorDebugger::_msg_scene_click_ctrl;
+	parse_message_handlers["scene:scene_tree"] = &ScriptEditorDebugger::_msg_scene_scene_tree;
+	parse_message_handlers["scene:inspect_objects"] = &ScriptEditorDebugger::_msg_scene_inspect_objects;
+	parse_message_handlers["servers:memory_usage"] = &ScriptEditorDebugger::_msg_servers_memory_usage;
+	parse_message_handlers["servers:drawn"] = &ScriptEditorDebugger::_msg_servers_drawn;
+	parse_message_handlers["stack_dump"] = &ScriptEditorDebugger::_msg_stack_dump;
+	parse_message_handlers["stack_frame_vars"] = &ScriptEditorDebugger::_msg_stack_frame_vars;
+	parse_message_handlers["stack_frame_var"] = &ScriptEditorDebugger::_msg_stack_frame_var;
+	parse_message_handlers["output"] = &ScriptEditorDebugger::_msg_output;
+	parse_message_handlers["performance:profile_frame"] = &ScriptEditorDebugger::_msg_performance_profile_frame;
+	parse_message_handlers["visual:hardware_info"] = &ScriptEditorDebugger::_msg_visual_hardware_info;
+	parse_message_handlers["visual:profile_frame"] = &ScriptEditorDebugger::_msg_visual_profile_frame;
+	parse_message_handlers["error"] = &ScriptEditorDebugger::_msg_error;
+	parse_message_handlers["servers:function_signature"] = &ScriptEditorDebugger::_msg_servers_function_signature;
+	parse_message_handlers["servers:profile_frame"] = &ScriptEditorDebugger::_msg_servers_profile_frame;
+	parse_message_handlers["servers:profile_total"] = &ScriptEditorDebugger::_msg_servers_profile_total;
+	parse_message_handlers["request_quit"] = &ScriptEditorDebugger::_msg_request_quit;
+	parse_message_handlers["remote_objects_selected"] = &ScriptEditorDebugger::_msg_remote_objects_selected;
+	parse_message_handlers["remote_nothing_selected"] = &ScriptEditorDebugger::_msg_remote_nothing_selected;
+	parse_message_handlers["remote_selection_invalidated"] = &ScriptEditorDebugger::_msg_remote_selection_invalidated;
+	parse_message_handlers["show_selection_limit_warning"] = &ScriptEditorDebugger::_msg_show_selection_limit_warning;
+	parse_message_handlers["performance:profile_names"] = &ScriptEditorDebugger::_msg_performance_profile_names;
+	parse_message_handlers["filesystem:update_file"] = &ScriptEditorDebugger::_msg_filesystem_update_file;
+	parse_message_handlers["evaluation_return"] = &ScriptEditorDebugger::_msg_evaluation_return;
+	parse_message_handlers["window:title"] = &ScriptEditorDebugger::_msg_window_title;
+}
+
 void ScriptEditorDebugger::_set_reason_text(const String &p_reason, MessageType p_type) {
 	switch (p_type) {
 		case MESSAGE_ERROR:
@@ -879,6 +994,11 @@ void ScriptEditorDebugger::_notification(int p_what) {
 			tabs->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("DebuggerPanel"), EditorStringName(EditorStyles)));
 
 			skip_breakpoints->set_button_icon(get_editor_theme_icon(skip_breakpoints_value ? SNAME("DebugSkipBreakpointsOn") : SNAME("DebugSkipBreakpointsOff")));
+			ignore_error_breaks->set_button_icon(get_editor_theme_icon(ignore_error_breaks_value ? SNAME("NotificationDisabled") : SNAME("Notification")));
+			ignore_error_breaks->add_theme_color_override("icon_normal_color", get_theme_color(SNAME("error_color"), SNAME("Editor")));
+			ignore_error_breaks->add_theme_color_override("icon_hover_color", get_theme_color(SNAME("error_color"), SNAME("Editor")));
+			ignore_error_breaks->add_theme_color_override("icon_pressed_color", get_theme_color(SNAME("error_color"), SNAME("Editor")));
+			ignore_error_breaks->add_theme_color_override("icon_focus_color", get_theme_color(SNAME("error_color"), SNAME("Editor")));
 			copy->set_button_icon(get_editor_theme_icon(SNAME("ActionCopy")));
 			step->set_button_icon(get_editor_theme_icon(SNAME("DebugStep")));
 			next->set_button_icon(get_editor_theme_icon(SNAME("DebugNext")));
@@ -924,8 +1044,7 @@ void ScriptEditorDebugger::_notification(int p_what) {
 						transform.scale_basis(Size2(zoom, zoom));
 						transform.columns[2] = -offset * zoom;
 
-						Array msg;
-						msg.push_back(transform);
+						Array msg = { transform };
 						_put_msg("scene:transform_camera_2d", msg);
 					}
 
@@ -934,8 +1053,7 @@ void ScriptEditorDebugger::_notification(int p_what) {
 						Node3DEditorViewport *viewport = Node3DEditor::get_singleton()->get_last_used_viewport();
 						const Camera3D *cam = viewport->get_camera_3d();
 
-						Array msg;
-						msg.push_back(cam->get_camera_transform());
+						Array msg = { cam->get_camera_transform() };
 						if (cam->get_projection() == Camera3D::PROJECTION_ORTHOGONAL) {
 							msg.push_back(false);
 							msg.push_back(cam->get_size());
@@ -1122,8 +1240,7 @@ void ScriptEditorDebugger::stop() {
 }
 
 void ScriptEditorDebugger::_profiler_activate(bool p_enable, int p_type) {
-	Array msg_data;
-	msg_data.push_back(p_enable);
+	Array msg_data = { p_enable };
 	switch (p_type) {
 		case PROFILER_VISUAL:
 			_put_msg("profiler:visual", msg_data);
@@ -1133,11 +1250,9 @@ void ScriptEditorDebugger::_profiler_activate(bool p_enable, int p_type) {
 				// Clear old script signatures. (should we move all this into the profiler?)
 				profiler_signature.clear();
 				// Add max funcs options to request.
-				Array opts;
 				int max_funcs = EDITOR_GET("debugger/profiler_frame_max_functions");
 				bool include_native = EDITOR_GET("debugger/profile_native_calls");
-				opts.push_back(CLAMP(max_funcs, 16, 512));
-				opts.push_back(include_native);
+				Array opts = { CLAMP(max_funcs, 16, 512), include_native };
 				msg_data.push_back(opts);
 			}
 			_put_msg("profiler:servers", msg_data);
@@ -1179,8 +1294,7 @@ String ScriptEditorDebugger::get_var_value(const String &p_var) const {
 }
 
 void ScriptEditorDebugger::_resources_reimported(const PackedStringArray &p_resources) {
-	Array msg;
-	msg.push_back(p_resources);
+	Array msg = { p_resources };
 	_put_msg("scene:reload_cached_files", msg);
 }
 
@@ -1193,9 +1307,7 @@ int ScriptEditorDebugger::_get_node_path_cache(const NodePath &p_path) {
 	last_path_id++;
 
 	node_path_cache[p_path] = last_path_id;
-	Array msg;
-	msg.push_back(p_path);
-	msg.push_back(last_path_id);
+	Array msg = { p_path, last_path_id };
 	_put_msg("scene:live_node_path", msg);
 
 	return last_path_id;
@@ -1211,9 +1323,7 @@ int ScriptEditorDebugger::_get_res_path_cache(const String &p_path) {
 	last_path_id++;
 
 	res_path_cache[p_path] = last_path_id;
-	Array msg;
-	msg.push_back(p_path);
-	msg.push_back(last_path_id);
+	Array msg = { p_path, last_path_id };
 	_put_msg("scene:live_res_path", msg);
 
 	return last_path_id;
@@ -1237,9 +1347,7 @@ void ScriptEditorDebugger::_method_changed(Object *p_base, const StringName &p_n
 		NodePath path = EditorNode::get_singleton()->get_edited_scene()->get_path_to(node);
 		int pathid = _get_node_path_cache(path);
 
-		Array msg;
-		msg.push_back(pathid);
-		msg.push_back(p_name);
+		Array msg = { pathid, p_name };
 		for (int i = 0; i < p_argcount; i++) {
 			//no pointers, sorry
 			msg.push_back(*p_args[i]);
@@ -1255,9 +1363,7 @@ void ScriptEditorDebugger::_method_changed(Object *p_base, const StringName &p_n
 		String respath = res->get_path();
 		int pathid = _get_res_path_cache(respath);
 
-		Array msg;
-		msg.push_back(pathid);
-		msg.push_back(p_name);
+		Array msg = { pathid, p_name };
 		for (int i = 0; i < p_argcount; i++) {
 			//no pointers, sorry
 			msg.push_back(*p_args[i]);
@@ -1282,17 +1388,11 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p
 		if (p_value.is_ref_counted()) {
 			Ref<Resource> res = p_value;
 			if (res.is_valid() && !res->get_path().is_empty()) {
-				Array msg;
-				msg.push_back(pathid);
-				msg.push_back(p_property);
-				msg.push_back(res->get_path());
+				Array msg = { pathid, p_property, res->get_path() };
 				_put_msg("scene:live_node_prop_res", msg);
 			}
 		} else {
-			Array msg;
-			msg.push_back(pathid);
-			msg.push_back(p_property);
-			msg.push_back(p_value);
+			Array msg = { pathid, p_property, p_value };
 			_put_msg("scene:live_node_prop", msg);
 		}
 
@@ -1308,17 +1408,11 @@ void ScriptEditorDebugger::_property_changed(Object *p_base, const StringName &p
 		if (p_value.is_ref_counted()) {
 			Ref<Resource> res2 = p_value;
 			if (res2.is_valid() && !res2->get_path().is_empty()) {
-				Array msg;
-				msg.push_back(pathid);
-				msg.push_back(p_property);
-				msg.push_back(res2->get_path());
+				Array msg = { pathid, p_property, res2->get_path() };
 				_put_msg("scene:live_res_prop_res", msg);
 			}
 		} else {
-			Array msg;
-			msg.push_back(pathid);
-			msg.push_back(p_property);
-			msg.push_back(p_value);
+			Array msg = { pathid, p_property, p_value };
 			_put_msg("scene:live_res_prop", msg);
 		}
 
@@ -1364,8 +1458,7 @@ int ScriptEditorDebugger::get_stack_script_frame() const {
 bool ScriptEditorDebugger::request_stack_dump(const int &p_frame) {
 	ERR_FAIL_COND_V(!is_session_active() || p_frame < 0, false);
 
-	Array msg;
-	msg.push_back(p_frame);
+	Array msg = { p_frame };
 	_put_msg("get_stack_frame_vars", msg, debugging_thread_id);
 	return true;
 }
@@ -1409,8 +1502,7 @@ void ScriptEditorDebugger::_live_edit_clear() {
 void ScriptEditorDebugger::update_live_edit_root() {
 	NodePath np = EditorNode::get_editor_data().get_edited_scene_live_edit_root();
 
-	Array msg;
-	msg.push_back(np);
+	Array msg = { np };
 	if (EditorNode::get_singleton()->get_edited_scene()) {
 		msg.push_back(EditorNode::get_singleton()->get_edited_scene()->get_scene_file_path());
 	} else {
@@ -1422,89 +1514,79 @@ void ScriptEditorDebugger::update_live_edit_root() {
 
 void ScriptEditorDebugger::live_debug_create_node(const NodePath &p_parent, const String &p_type, const String &p_name) {
 	if (live_debug) {
-		Array msg;
-		msg.push_back(p_parent);
-		msg.push_back(p_type);
-		msg.push_back(p_name);
+		Array msg = { p_parent, p_type, p_name };
 		_put_msg("scene:live_create_node", msg);
 	}
 }
 
 void ScriptEditorDebugger::live_debug_instantiate_node(const NodePath &p_parent, const String &p_path, const String &p_name) {
 	if (live_debug) {
-		Array msg;
-		msg.push_back(p_parent);
-		msg.push_back(p_path);
-		msg.push_back(p_name);
+		Array msg = { p_parent, p_path, p_name };
 		_put_msg("scene:live_instantiate_node", msg);
 	}
 }
 
 void ScriptEditorDebugger::live_debug_remove_node(const NodePath &p_at) {
 	if (live_debug) {
-		Array msg;
-		msg.push_back(p_at);
+		Array msg = { p_at };
 		_put_msg("scene:live_remove_node", msg);
 	}
 }
 
 void ScriptEditorDebugger::live_debug_remove_and_keep_node(const NodePath &p_at, ObjectID p_keep_id) {
 	if (live_debug) {
-		Array msg;
-		msg.push_back(p_at);
-		msg.push_back(p_keep_id);
+		Array msg = { p_at, p_keep_id };
 		_put_msg("scene:live_remove_and_keep_node", msg);
 	}
 }
 
 void ScriptEditorDebugger::live_debug_restore_node(ObjectID p_id, const NodePath &p_at, int p_at_pos) {
 	if (live_debug) {
-		Array msg;
-		msg.push_back(p_id);
-		msg.push_back(p_at);
-		msg.push_back(p_at_pos);
+		Array msg = { p_id, p_at, p_at_pos };
 		_put_msg("scene:live_restore_node", msg);
 	}
 }
 
 void ScriptEditorDebugger::live_debug_duplicate_node(const NodePath &p_at, const String &p_new_name) {
 	if (live_debug) {
-		Array msg;
-		msg.push_back(p_at);
-		msg.push_back(p_new_name);
+		Array msg = { p_at, p_new_name };
 		_put_msg("scene:live_duplicate_node", msg);
 	}
 }
 
 void ScriptEditorDebugger::live_debug_reparent_node(const NodePath &p_at, const NodePath &p_new_place, const String &p_new_name, int p_at_pos) {
 	if (live_debug) {
-		Array msg;
-		msg.push_back(p_at);
-		msg.push_back(p_new_place);
-		msg.push_back(p_new_name);
-		msg.push_back(p_at_pos);
+		Array msg = { p_at, p_new_place, p_new_name, p_at_pos };
 		_put_msg("scene:live_reparent_node", msg);
 	}
 }
 
+bool ScriptEditorDebugger::get_debug_mute_audio() const {
+	return debug_mute_audio;
+}
+
+void ScriptEditorDebugger::set_debug_mute_audio(bool p_mute) {
+	Array msg = { p_mute };
+	_put_msg("scene:debug_mute_audio", msg);
+	debug_mute_audio = p_mute;
+}
+
 CameraOverride ScriptEditorDebugger::get_camera_override() const {
 	return camera_override;
 }
 
 void ScriptEditorDebugger::set_camera_override(CameraOverride p_override) {
-	Array msg;
-	msg.push_back(p_override != CameraOverride::OVERRIDE_NONE);
-	msg.push_back(p_override == CameraOverride::OVERRIDE_EDITORS);
+	Array msg = {
+		p_override != CameraOverride::OVERRIDE_NONE,
+		p_override == CameraOverride::OVERRIDE_EDITORS
+	};
 	_put_msg("scene:override_cameras", msg);
 
 	camera_override = p_override;
 }
 
 void ScriptEditorDebugger::set_breakpoint(const String &p_path, int p_line, bool p_enabled) {
-	Array msg;
-	msg.push_back(p_path);
-	msg.push_back(p_line);
-	msg.push_back(p_enabled);
+	Array msg = { p_path, p_line, p_enabled };
 	_put_msg("breakpoint", msg, debugging_thread_id != Thread::UNASSIGNED_ID ? debugging_thread_id : Thread::MAIN_ID);
 
 	TreeItem *path_item = breakpoints_tree->search_item_text(p_path);
@@ -1555,10 +1637,14 @@ void ScriptEditorDebugger::reload_scripts(const Vector<String> &p_script_paths)
 	_put_msg("reload_scripts", Variant(p_script_paths).operator Array(), debugging_thread_id != Thread::UNASSIGNED_ID ? debugging_thread_id : Thread::MAIN_ID);
 }
 
-bool ScriptEditorDebugger::is_skip_breakpoints() {
+bool ScriptEditorDebugger::is_skip_breakpoints() const {
 	return skip_breakpoints_value;
 }
 
+bool ScriptEditorDebugger::is_ignore_error_breaks() const {
+	return ignore_error_breaks_value;
+}
+
 void ScriptEditorDebugger::_error_activated() {
 	TreeItem *selected = error_tree->get_selected();
 
@@ -1580,7 +1666,7 @@ void ScriptEditorDebugger::_error_selected() {
 	}
 
 	Array meta = selected->get_metadata(0);
-	if (meta.size() == 0) {
+	if (meta.is_empty()) {
 		return;
 	}
 
@@ -1613,6 +1699,18 @@ void ScriptEditorDebugger::_collapse_errors_list() {
 	}
 }
 
+void ScriptEditorDebugger::_vmem_item_activated() {
+	TreeItem *selected = vmem_tree->get_selected();
+	if (!selected) {
+		return;
+	}
+	const String path = selected->get_text(0);
+	if (path.is_empty() || !FileAccess::exists(path)) {
+		return;
+	}
+	FileSystemDock::get_singleton()->navigate_to_path(path);
+}
+
 void ScriptEditorDebugger::_clear_errors_list() {
 	error_tree->clear();
 	error_count = 0;
@@ -1725,7 +1823,7 @@ void ScriptEditorDebugger::_item_menu_id_pressed(int p_option) {
 
 			// Construct a GitHub repository URL and open it in the user's default web browser.
 			// If the commit hash is available, use it for greater accuracy. Otherwise fall back to tagged release.
-			String git_ref = String(VERSION_HASH).is_empty() ? String(VERSION_NUMBER) + "-stable" : String(VERSION_HASH);
+			String git_ref = String(GODOT_VERSION_HASH).is_empty() ? String(GODOT_VERSION_NUMBER) + "-stable" : String(GODOT_VERSION_HASH);
 			OS::get_singleton()->shell_open(vformat("https://github.com/godotengine/godot/blob/%s/%s#L%d",
 					git_ref, file, line_number));
 		} break;
@@ -1770,8 +1868,7 @@ void ScriptEditorDebugger::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("live_debug_restore_node"), &ScriptEditorDebugger::live_debug_restore_node);
 	ClassDB::bind_method(D_METHOD("live_debug_duplicate_node"), &ScriptEditorDebugger::live_debug_duplicate_node);
 	ClassDB::bind_method(D_METHOD("live_debug_reparent_node"), &ScriptEditorDebugger::live_debug_reparent_node);
-	ClassDB::bind_method(D_METHOD("request_remote_object", "id"), &ScriptEditorDebugger::request_remote_object);
-	ClassDB::bind_method(D_METHOD("update_remote_object", "id", "property", "value"), &ScriptEditorDebugger::update_remote_object);
+	ClassDB::bind_method(D_METHOD("update_remote_object", "id", "property", "value", "field"), &ScriptEditorDebugger::update_remote_object);
 
 	ADD_SIGNAL(MethodInfo("started"));
 	ADD_SIGNAL(MethodInfo("stopped"));
@@ -1782,12 +1879,13 @@ void ScriptEditorDebugger::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("set_execution", PropertyInfo("script"), PropertyInfo(Variant::INT, "line")));
 	ADD_SIGNAL(MethodInfo("clear_execution", PropertyInfo("script")));
 	ADD_SIGNAL(MethodInfo("breaked", PropertyInfo(Variant::BOOL, "reallydid"), PropertyInfo(Variant::BOOL, "can_debug"), PropertyInfo(Variant::STRING, "reason"), PropertyInfo(Variant::BOOL, "has_stackdump")));
-	ADD_SIGNAL(MethodInfo("remote_object_requested", PropertyInfo(Variant::INT, "id")));
-	ADD_SIGNAL(MethodInfo("remote_object_updated", PropertyInfo(Variant::INT, "id")));
+	ADD_SIGNAL(MethodInfo("remote_objects_requested", PropertyInfo(Variant::ARRAY, "ids")));
+	ADD_SIGNAL(MethodInfo("remote_objects_updated", PropertyInfo(Variant::OBJECT, "remote_objects")));
 	ADD_SIGNAL(MethodInfo("remote_object_property_updated", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::STRING, "property")));
-	ADD_SIGNAL(MethodInfo("remote_tree_updated"));
-	ADD_SIGNAL(MethodInfo("remote_tree_select_requested", PropertyInfo(Variant::NODE_PATH, "path")));
 	ADD_SIGNAL(MethodInfo("remote_window_title_changed", PropertyInfo(Variant::STRING, "title")));
+	ADD_SIGNAL(MethodInfo("remote_tree_updated"));
+	ADD_SIGNAL(MethodInfo("remote_tree_select_requested", PropertyInfo(Variant::ARRAY, "ids")));
+	ADD_SIGNAL(MethodInfo("remote_tree_clear_selection_requested"));
 	ADD_SIGNAL(MethodInfo("output", PropertyInfo(Variant::STRING, "msg"), PropertyInfo(Variant::INT, "level")));
 	ADD_SIGNAL(MethodInfo("stack_dump", PropertyInfo(Variant::ARRAY, "stack_dump")));
 	ADD_SIGNAL(MethodInfo("stack_frame_vars", PropertyInfo(Variant::INT, "num_vars")));
@@ -1821,13 +1919,15 @@ void ScriptEditorDebugger::send_message(const String &p_message, const Array &p_
 }
 
 void ScriptEditorDebugger::toggle_profiler(const String &p_profiler, bool p_enable, const Array &p_data) {
-	Array msg_data;
-	msg_data.push_back(p_enable);
-	msg_data.append_array(p_data);
+	Array msg_data = { p_enable, p_data };
 	_put_msg("profiler:" + p_profiler, msg_data);
 }
 
 ScriptEditorDebugger::ScriptEditorDebugger() {
+	if (unlikely(parse_message_handlers.is_empty())) {
+		_init_parse_message_handlers();
+	}
+
 	tabs = memnew(TabContainer);
 	add_child(tabs);
 	tabs->connect("tab_changed", callable_mp(this, &ScriptEditorDebugger::_tab_changed));
@@ -1857,14 +1957,23 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		skip_breakpoints->set_theme_type_variation(SceneStringName(FlatButton));
 		hbc->add_child(skip_breakpoints);
 		skip_breakpoints->set_tooltip_text(TTR("Skip Breakpoints"));
+		skip_breakpoints->set_accessibility_name(TTRC("Skip Breakpoints"));
 		skip_breakpoints->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_skip_breakpoints));
 
+		ignore_error_breaks = memnew(Button);
+		ignore_error_breaks->set_flat(true);
+		ignore_error_breaks->set_tooltip_text(TTR("Ignore Error Breaks"));
+		ignore_error_breaks->set_accessibility_name(TTRC("Ignore Error Breaks"));
+		hbc->add_child(ignore_error_breaks);
+		ignore_error_breaks->connect("pressed", callable_mp(this, &ScriptEditorDebugger::debug_ignore_error_breaks));
+
 		hbc->add_child(memnew(VSeparator));
 
 		copy = memnew(Button);
 		copy->set_theme_type_variation(SceneStringName(FlatButton));
 		hbc->add_child(copy);
 		copy->set_tooltip_text(TTR("Copy Error"));
+		copy->set_accessibility_name(TTRC("Copy Error"));
 		copy->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_copy));
 
 		hbc->add_child(memnew(VSeparator));
@@ -1873,6 +1982,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		step->set_theme_type_variation(SceneStringName(FlatButton));
 		hbc->add_child(step);
 		step->set_tooltip_text(TTR("Step Into"));
+		step->set_accessibility_name(TTRC("Step Into"));
 		step->set_shortcut(ED_GET_SHORTCUT("debugger/step_into"));
 		step->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_step));
 
@@ -1880,6 +1990,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		next->set_theme_type_variation(SceneStringName(FlatButton));
 		hbc->add_child(next);
 		next->set_tooltip_text(TTR("Step Over"));
+		next->set_accessibility_name(TTRC("Step Over"));
 		next->set_shortcut(ED_GET_SHORTCUT("debugger/step_over"));
 		next->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_next));
 
@@ -1889,6 +2000,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		dobreak->set_theme_type_variation(SceneStringName(FlatButton));
 		hbc->add_child(dobreak);
 		dobreak->set_tooltip_text(TTR("Break"));
+		dobreak->set_accessibility_name(TTRC("Break"));
 		dobreak->set_shortcut(ED_GET_SHORTCUT("debugger/break"));
 		dobreak->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_break));
 
@@ -1896,6 +2008,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		docontinue->set_theme_type_variation(SceneStringName(FlatButton));
 		hbc->add_child(docontinue);
 		docontinue->set_tooltip_text(TTR("Continue"));
+		docontinue->set_accessibility_name(TTRC("Continue"));
 		docontinue->set_shortcut(ED_GET_SHORTCUT("debugger/continue"));
 		docontinue->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::debug_continue));
 
@@ -1917,6 +2030,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		thread_hb->add_child(memnew(Label(TTR("Thread:"))));
 		threads = memnew(OptionButton);
 		thread_hb->add_child(threads);
+		threads->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 		threads->set_h_size_flags(SIZE_EXPAND_FILL);
 		threads->connect(SceneStringName(item_selected), callable_mp(this, &ScriptEditorDebugger::_select_thread));
 
@@ -1943,6 +2057,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		search = memnew(LineEdit);
 		search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		search->set_placeholder(TTR("Filter Stack Variables"));
+		search->set_accessibility_name(TTRC("Filter Stack Variables"));
 		search->set_clear_button_enabled(true);
 		tools_hb->add_child(search);
 
@@ -1952,7 +2067,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		inspector->set_property_name_style(EditorPropertyNameProcessor::STYLE_RAW);
 		inspector->set_read_only(true);
 		inspector->connect("object_selected", callable_mp(this, &ScriptEditorDebugger::_remote_object_selected));
-		inspector->connect("object_edited", callable_mp(this, &ScriptEditorDebugger::_remote_object_edited));
+		inspector->connect("objects_edited", callable_mp(this, &ScriptEditorDebugger::_remote_objects_edited));
 		inspector->connect("object_property_updated", callable_mp(this, &ScriptEditorDebugger::_remote_object_property_updated));
 		inspector->register_text_enter(search);
 		inspector->set_use_filter(true);
@@ -2077,14 +2192,17 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		vmem_hb->add_child(memnew(Label(TTR("Total:") + " ")));
 		vmem_total = memnew(LineEdit);
 		vmem_total->set_editable(false);
+		vmem_total->set_accessibility_name(TTRC("Video RAM Total"));
 		vmem_total->set_custom_minimum_size(Size2(100, 0) * EDSCALE);
 		vmem_hb->add_child(vmem_total);
 		vmem_refresh = memnew(Button);
+		vmem_refresh->set_accessibility_name(TTRC("Refresh Video RAM"));
 		vmem_refresh->set_theme_type_variation(SceneStringName(FlatButton));
 		vmem_hb->add_child(vmem_refresh);
 		vmem_export = memnew(Button);
 		vmem_export->set_theme_type_variation(SceneStringName(FlatButton));
 		vmem_export->set_tooltip_text(TTR("Export list to a CSV file"));
+		vmem_export->set_accessibility_name(TTRC("Export to CSV"));
 		vmem_hb->add_child(vmem_export);
 		vmem_vb->add_child(vmem_hb);
 		vmem_refresh->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditorDebugger::_video_mem_request));
@@ -2113,6 +2231,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		vmem_tree->set_column_title(3, TTR("Usage"));
 		vmem_tree->set_column_custom_minimum_width(3, 80 * EDSCALE);
 		vmem_tree->set_hide_root(true);
+		vmem_tree->connect("item_activated", callable_mp(this, &ScriptEditorDebugger::_vmem_item_activated));
 
 		tabs->add_child(vmem_vb);
 	}
@@ -2127,11 +2246,13 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		misc->add_child(info_left);
 		clicked_ctrl = memnew(LineEdit);
 		clicked_ctrl->set_editable(false);
+		clicked_ctrl->set_accessibility_name(TTRC("Clicked Control"));
 		clicked_ctrl->set_h_size_flags(SIZE_EXPAND_FILL);
 		info_left->add_child(memnew(Label(TTR("Clicked Control:"))));
 		info_left->add_child(clicked_ctrl);
 		clicked_ctrl_type = memnew(LineEdit);
 		clicked_ctrl_type->set_editable(false);
+		clicked_ctrl_type->set_accessibility_name(TTRC("Clicked Control Type"));
 		info_left->add_child(memnew(Label(TTR("Clicked Control Type:"))));
 		info_left->add_child(clicked_ctrl_type);
 
@@ -2139,6 +2260,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 		live_edit_root = memnew(LineEdit);
 		live_edit_root->set_editable(false);
 		live_edit_root->set_h_size_flags(SIZE_EXPAND_FILL);
+		live_edit_root->set_accessibility_name(TTRC("Live Edit Root"));
 
 		{
 			HBoxContainer *lehb = memnew(HBoxContainer);
@@ -2166,9 +2288,7 @@ ScriptEditorDebugger::ScriptEditorDebugger() {
 	msgdialog = memnew(AcceptDialog);
 	add_child(msgdialog);
 
-	live_debug = true;
 	camera_override = CameraOverride::OVERRIDE_NONE;
-	last_path_id = false;
 	error_count = 0;
 	warning_count = 0;
 	_update_buttons_state();
diff --git a/engine/editor/debugger/script_editor_debugger.h b/engine/editor/debugger/script_editor_debugger.h
index 06a968e1..ff736cd3 100644
--- a/engine/editor/debugger/script_editor_debugger.h
+++ b/engine/editor/debugger/script_editor_debugger.h
@@ -28,17 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_EDITOR_DEBUGGER_H
-#define SCRIPT_EDITOR_DEBUGGER_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/debugger/editor_debugger_node.h"
-#include "editor/debugger/editor_debugger_server.h"
-#include "scene/gui/button.h"
 #include "scene/gui/margin_container.h"
 
+class Button;
 class Tree;
 class LineEdit;
 class TabContainer;
@@ -115,6 +113,7 @@ private:
 	int warning_count;
 
 	bool skip_breakpoints_value = false;
+	bool ignore_error_breaks_value = false;
 	Ref<Script> stack_script;
 
 	TabContainer *tabs = nullptr;
@@ -122,6 +121,7 @@ private:
 	Label *reason = nullptr;
 
 	Button *skip_breakpoints = nullptr;
+	Button *ignore_error_breaks = nullptr;
 	Button *copy = nullptr;
 	Button *step = nullptr;
 	Button *next = nullptr;
@@ -147,7 +147,7 @@ private:
 	Ref<RemoteDebuggerPeer> peer;
 
 	HashMap<NodePath, int> node_path_cache;
-	int last_path_id;
+	int last_path_id = 0;
 	HashMap<String, int> res_path_cache;
 
 	EditorProfiler *profiler = nullptr;
@@ -159,7 +159,7 @@ private:
 	bool move_to_foreground = true;
 	bool can_request_idle_draw = false;
 
-	bool live_debug;
+	bool live_debug = true;
 
 	uint64_t debugging_thread_id = Thread::UNASSIGNED_ID;
 
@@ -183,16 +183,54 @@ private:
 
 	void _select_thread(int p_index);
 
+	bool debug_mute_audio = false;
+
 	EditorDebuggerNode::CameraOverride camera_override;
 
 	void _stack_dump_frame_selected();
 
 	void _file_selected(const String &p_file);
+
+	/// Message handler function for _parse_message.
+	typedef void (ScriptEditorDebugger::*ParseMessageFunc)(uint64_t p_thread_id, const Array &p_data);
+	static HashMap<String, ParseMessageFunc> parse_message_handlers;
+	static void _init_parse_message_handlers();
+
+	void _msg_debug_enter(uint64_t p_thread_id, const Array &p_data);
+	void _msg_debug_exit(uint64_t p_thread_id, const Array &p_data);
+	void _msg_set_pid(uint64_t p_thread_id, const Array &p_data);
+	void _msg_scene_click_ctrl(uint64_t p_thread_id, const Array &p_data);
+	void _msg_scene_scene_tree(uint64_t p_thread_id, const Array &p_data);
+	void _msg_scene_inspect_objects(uint64_t p_thread_id, const Array &p_data);
+	void _msg_servers_memory_usage(uint64_t p_thread_id, const Array &p_data);
+	void _msg_servers_drawn(uint64_t p_thread_id, const Array &p_data);
+	void _msg_stack_dump(uint64_t p_thread_id, const Array &p_data);
+	void _msg_stack_frame_vars(uint64_t p_thread_id, const Array &p_data);
+	void _msg_stack_frame_var(uint64_t p_thread_id, const Array &p_data);
+	void _msg_output(uint64_t p_thread_id, const Array &p_data);
+	void _msg_performance_profile_frame(uint64_t p_thread_id, const Array &p_data);
+	void _msg_visual_hardware_info(uint64_t p_thread_id, const Array &p_data);
+	void _msg_visual_profile_frame(uint64_t p_thread_id, const Array &p_data);
+	void _msg_error(uint64_t p_thread_id, const Array &p_data);
+	void _msg_servers_function_signature(uint64_t p_thread_id, const Array &p_data);
+	void _msg_servers_profile_common(const Array &p_data, const bool p_final);
+	void _msg_servers_profile_frame(uint64_t p_thread_id, const Array &p_data);
+	void _msg_servers_profile_total(uint64_t p_thread_id, const Array &p_data);
+	void _msg_request_quit(uint64_t p_thread_id, const Array &p_data);
+	void _msg_remote_objects_selected(uint64_t p_thread_id, const Array &p_data);
+	void _msg_remote_nothing_selected(uint64_t p_thread_id, const Array &p_data);
+	void _msg_remote_selection_invalidated(uint64_t p_thread_id, const Array &p_data);
+	void _msg_show_selection_limit_warning(uint64_t p_thread_id, const Array &p_data);
+	void _msg_performance_profile_names(uint64_t p_thread_id, const Array &p_data);
+	void _msg_filesystem_update_file(uint64_t p_thread_id, const Array &p_data);
+	void _msg_evaluation_return(uint64_t p_thread_id, const Array &p_data);
+	void _msg_window_title(uint64_t p_thread_id, const Array &p_data);
+
 	void _parse_message(const String &p_msg, uint64_t p_thread_id, const Array &p_data);
 	void _set_reason_text(const String &p_reason, MessageType p_type);
 	void _update_buttons_state();
 	void _remote_object_selected(ObjectID p_object);
-	void _remote_object_edited(ObjectID, const String &p_prop, const Variant &p_value);
+	void _remote_objects_edited(const String &p_prop, const TypedDictionary<uint64_t, Variant> &p_values, const String &p_field);
 	void _remote_object_property_updated(ObjectID p_id, const String &p_property);
 
 	void _video_mem_request();
@@ -216,6 +254,8 @@ private:
 	void _expand_errors_list();
 	void _collapse_errors_list();
 
+	void _vmem_item_activated();
+
 	void _profiler_activate(bool p_enable, int p_profiler);
 	void _profiler_seeked();
 
@@ -246,9 +286,10 @@ protected:
 	static void _bind_methods();
 
 public:
-	void request_remote_object(ObjectID p_obj_id);
-	void update_remote_object(ObjectID p_obj_id, const String &p_prop, const Variant &p_value);
-	Object *get_remote_object(ObjectID p_id);
+	void request_remote_objects(const TypedArray<uint64_t> &p_obj_ids, bool p_update_selection = true);
+	void update_remote_object(ObjectID p_obj_id, const String &p_prop, const Variant &p_value, const String &p_field = "");
+
+	void clear_inspector(bool p_send_msg = true);
 
 	// Needed by _live_edit_set, buttons state.
 	void set_editor_remote_tree(const Tree *p_tree) { editor_remote_tree = p_tree; }
@@ -262,6 +303,7 @@ public:
 	void stop();
 
 	void debug_skip_breakpoints();
+	void debug_ignore_error_breaks();
 	void debug_copy();
 
 	void debug_next();
@@ -299,6 +341,9 @@ public:
 	void live_debug_duplicate_node(const NodePath &p_at, const String &p_new_name);
 	void live_debug_reparent_node(const NodePath &p_at, const NodePath &p_new_place, const String &p_new_name, int p_at_pos);
 
+	bool get_debug_mute_audio() const;
+	void set_debug_mute_audio(bool p_mute);
+
 	EditorDebuggerNode::CameraOverride get_camera_override() const;
 	void set_camera_override(EditorDebuggerNode::CameraOverride p_override);
 
@@ -309,7 +354,8 @@ public:
 	void reload_all_scripts();
 	void reload_scripts(const Vector<String> &p_script_paths);
 
-	bool is_skip_breakpoints();
+	bool is_skip_breakpoints() const;
+	bool is_ignore_error_breaks() const;
 
 	virtual Size2 get_minimum_size() const override;
 
@@ -324,5 +370,3 @@ public:
 	ScriptEditorDebugger();
 	~ScriptEditorDebugger();
 };
-
-#endif // SCRIPT_EDITOR_DEBUGGER_H
diff --git a/engine/editor/dependency_editor.cpp b/engine/editor/dependency_editor.cpp
index 3ce63071..e8182052 100644
--- a/engine/editor/dependency_editor.cpp
+++ b/engine/editor/dependency_editor.cpp
@@ -317,12 +317,8 @@ void DependencyEditorOwners::_list_rmb_clicked(int p_item, const Vector2 &p_pos,
 
 void DependencyEditorOwners::_select_file(int p_idx) {
 	String fpath = owners->get_item_text(p_idx);
+	EditorNode::get_singleton()->load_scene_or_resource(fpath);
 
-	if (ResourceLoader::get_resource_type(fpath) == "PackedScene") {
-		EditorNode::get_singleton()->open_request(fpath);
-	} else {
-		EditorNode::get_singleton()->load_resource(fpath);
-	}
 	hide();
 	emit_signal(SceneStringName(confirmed));
 }
@@ -467,17 +463,16 @@ void DependencyRemoveDialog::_find_localization_remaps_of_removed_files(Vector<R
 				p_removed.push_back(dep);
 			}
 
-			Array remap_keys = remaps.keys();
-			for (int j = 0; j < remap_keys.size(); j++) {
-				PackedStringArray remapped_files = remaps[remap_keys[j]];
-				for (int k = 0; k < remapped_files.size(); k++) {
-					int splitter_pos = remapped_files[k].rfind_char(':');
-					String res_path = remapped_files[k].substr(0, splitter_pos);
+			for (const KeyValue<Variant, Variant> &remap_kv : remaps) {
+				PackedStringArray remapped_files = remap_kv.value;
+				for (const String &remapped_file : remapped_files) {
+					int splitter_pos = remapped_file.rfind_char(':');
+					String res_path = remapped_file.substr(0, splitter_pos);
 					if (res_path == path) {
-						String locale_name = remapped_files[k].substr(splitter_pos + 1);
+						String locale_name = remapped_file.substr(splitter_pos + 1);
 
 						RemovedDependency dep;
-						dep.file = vformat(TTR("Localization remap for path '%s' and locale '%s'."), remap_keys[j], locale_name);
+						dep.file = vformat(TTR("Localization remap for path '%s' and locale '%s'."), remap_kv.key, locale_name);
 						dep.file_type = "";
 						dep.dependency = path;
 						dep.dependency_folder = files.value;
@@ -589,34 +584,19 @@ void DependencyRemoveDialog::ok_pressed() {
 		}
 	}
 
+	HashMap<String, StringName> setting_path_map;
+	for (const StringName &setting : path_project_settings) {
+		const String path = ResourceUID::ensure_path(GLOBAL_GET(setting));
+		setting_path_map[path] = setting;
+	}
+
 	bool project_settings_modified = false;
 	for (const String &file : files_to_delete) {
 		// If the file we are deleting for e.g. the main scene, default environment,
 		// or audio bus layout, we must clear its definition in Project Settings.
-		if (file == ResourceUID::ensure_path(GLOBAL_GET("application/config/icon"))) {
-			ProjectSettings::get_singleton()->set("application/config/icon", "");
-			project_settings_modified = true;
-		} else if (file == ResourceUID::ensure_path(GLOBAL_GET("application/run/main_scene"))) {
-			ProjectSettings::get_singleton()->set("application/run/main_scene", "");
-			project_settings_modified = true;
-		} else if (file == ResourceUID::ensure_path(GLOBAL_GET("application/boot_splash/image"))) {
-			ProjectSettings::get_singleton()->set("application/boot_splash/image", "");
-			project_settings_modified = true;
-		} else if (file == ResourceUID::ensure_path(GLOBAL_GET("rendering/environment/defaults/default_environment"))) {
-			ProjectSettings::get_singleton()->set("rendering/environment/defaults/default_environment", "");
-			project_settings_modified = true;
-		} else if (file == ResourceUID::ensure_path(GLOBAL_GET("display/mouse_cursor/custom_image"))) {
-			ProjectSettings::get_singleton()->set("display/mouse_cursor/custom_image", "");
-			project_settings_modified = true;
-		} else if (file == ResourceUID::ensure_path(GLOBAL_GET("gui/theme/custom"))) {
-			ProjectSettings::get_singleton()->set("gui/theme/custom", "");
-			project_settings_modified = true;
-		} else if (file == ResourceUID::ensure_path(GLOBAL_GET("gui/theme/custom_font"))) {
-			ProjectSettings::get_singleton()->set("gui/theme/custom_font", "");
-			project_settings_modified = true;
-		} else if (file == ResourceUID::ensure_path(GLOBAL_GET("audio/buses/default_bus_layout"))) {
-			ProjectSettings::get_singleton()->set("audio/buses/default_bus_layout", "");
-			project_settings_modified = true;
+		const StringName *setting_name = setting_path_map.getptr(file);
+		if (setting_name) {
+			ProjectSettings::get_singleton()->set(*setting_name, "");
 		}
 
 		const String path = OS::get_singleton()->get_resource_dir() + file.replace_first("res://", "/");
@@ -632,7 +612,7 @@ void DependencyRemoveDialog::ok_pressed() {
 		ProjectSettings::get_singleton()->save();
 	}
 
-	if (dirs_to_delete.size() == 0) {
+	if (dirs_to_delete.is_empty()) {
 		// If we only deleted files we should only need to tell the file system about the files we touched.
 		for (int i = 0; i < files_to_delete.size(); ++i) {
 			EditorFileSystem::get_singleton()->update_file(files_to_delete[i]);
@@ -698,6 +678,7 @@ DependencyRemoveDialog::DependencyRemoveDialog() {
 	files_to_delete_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	files_to_delete_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	files_to_delete_list->set_custom_minimum_size(Size2(0, 94) * EDSCALE);
+	files_to_delete_list->set_accessibility_name(TTRC("Files to be Deleted"));
 	vb->add_child(files_to_delete_list);
 
 	vb_owners = memnew(VBoxContainer);
@@ -714,14 +695,22 @@ DependencyRemoveDialog::DependencyRemoveDialog() {
 	owners->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	owners->set_hide_root(true);
 	owners->set_custom_minimum_size(Size2(0, 94) * EDSCALE);
+	owners->set_accessibility_name(TTRC("Dependencies"));
 	vb_owners->add_child(owners);
 	owners->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+
+	List<PropertyInfo> property_list;
+	ProjectSettings::get_singleton()->get_property_list(&property_list);
+	for (const PropertyInfo &pi : property_list) {
+		if (pi.type == Variant::STRING && pi.hint == PROPERTY_HINT_FILE) {
+			path_project_settings.push_back(pi.name);
+		}
+	}
 }
 
 //////////////
 
-void DependencyErrorDialog::show(Mode p_mode, const String &p_for_file, const Vector<String> &report) {
-	mode = p_mode;
+void DependencyErrorDialog::show(const String &p_for_file, const Vector<String> &report) {
 	for_file = p_for_file;
 	set_title(TTR("Error loading:") + " " + p_for_file.get_file());
 	files->clear();
@@ -746,14 +735,7 @@ void DependencyErrorDialog::show(Mode p_mode, const String &p_for_file, const Ve
 }
 
 void DependencyErrorDialog::ok_pressed() {
-	switch (mode) {
-		case MODE_SCENE:
-			EditorNode::get_singleton()->load_scene(for_file, true);
-			break;
-		case MODE_RESOURCE:
-			EditorNode::get_singleton()->load_resource(for_file, true);
-			break;
-	}
+	EditorNode::get_singleton()->load_scene_or_resource(for_file, true);
 }
 
 void DependencyErrorDialog::custom_action(const String &) {
@@ -778,8 +760,6 @@ DependencyErrorDialog::DependencyErrorDialog() {
 	vb->add_child(text);
 	text->set_text(TTR("Which action should be taken?"));
 
-	mode = Mode::MODE_RESOURCE;
-
 	fdep = add_button(TTR("Fix Dependencies"), true, "fixdeps");
 
 	set_title(TTR("Errors loading!"));
diff --git a/engine/editor/dependency_editor.h b/engine/editor/dependency_editor.h
index e7c5a060..622e5c48 100644
--- a/engine/editor/dependency_editor.h
+++ b/engine/editor/dependency_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEPENDENCY_EDITOR_H
-#define DEPENDENCY_EDITOR_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
@@ -120,6 +119,8 @@ class DependencyRemoveDialog : public ConfirmationDialog {
 		}
 	};
 
+	LocalVector<StringName> path_project_settings;
+
 	void _find_files_in_removed_folder(EditorFileSystemDirectory *efsd, const String &p_folder);
 	void _find_all_removed_dependencies(EditorFileSystemDirectory *efsd, Vector<RemovedDependency> &p_removed);
 	void _find_localization_remaps_of_removed_files(Vector<RemovedDependency> &p_removed);
@@ -138,12 +139,6 @@ public:
 class DependencyErrorDialog : public ConfirmationDialog {
 	GDCLASS(DependencyErrorDialog, ConfirmationDialog);
 
-public:
-	enum Mode {
-		MODE_SCENE,
-		MODE_RESOURCE,
-	};
-
 private:
 	String for_file;
 	Mode mode;
@@ -154,7 +149,7 @@ private:
 	void custom_action(const String &) override;
 
 public:
-	void show(Mode p_mode, const String &p_for_file, const Vector<String> &report);
+	void show(const String &p_for_file, const Vector<String> &report);
 	DependencyErrorDialog();
 };
 
@@ -179,5 +174,3 @@ public:
 	void show();
 	OrphanResourcesDialog();
 };
-
-#endif // DEPENDENCY_EDITOR_H
diff --git a/engine/editor/directory_create_dialog.cpp b/engine/editor/directory_create_dialog.cpp
index 43c85134..69198a37 100644
--- a/engine/editor/directory_create_dialog.cpp
+++ b/engine/editor/directory_create_dialog.cpp
@@ -166,6 +166,7 @@ DirectoryCreateDialog::DirectoryCreateDialog() {
 	vb->add_child(name_label);
 
 	dir_path = memnew(LineEdit);
+	dir_path->set_accessibility_name(TTRC("Name"));
 	vb->add_child(dir_path);
 	register_text_enter(dir_path);
 
diff --git a/engine/editor/directory_create_dialog.h b/engine/editor/directory_create_dialog.h
index 2292a6e5..ec7070a8 100644
--- a/engine/editor/directory_create_dialog.h
+++ b/engine/editor/directory_create_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIRECTORY_CREATE_DIALOG_H
-#define DIRECTORY_CREATE_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -68,5 +67,3 @@ public:
 
 	DirectoryCreateDialog();
 };
-
-#endif // DIRECTORY_CREATE_DIALOG_H
diff --git a/engine/editor/doc_tools.cpp b/engine/editor/doc_tools.cpp
index 02babe6a..c29ad3b5 100644
--- a/engine/editor/doc_tools.cpp
+++ b/engine/editor/doc_tools.cpp
@@ -368,6 +368,15 @@ void DocTools::remove_doc(const String &p_class_name) {
 	class_list.erase(p_class_name);
 }
 
+void DocTools::remove_script_doc_by_path(const String &p_path) {
+	for (KeyValue<String, DocData::ClassDoc> &E : class_list) {
+		if (E.value.is_script_doc && E.value.script_path == p_path) {
+			remove_doc(E.key);
+			return;
+		}
+	}
+}
+
 bool DocTools::has_doc(const String &p_class_name) {
 	if (p_class_name.is_empty()) {
 		return false;
@@ -385,9 +394,9 @@ static Variant get_documentation_default_value(const StringName &p_class_name, c
 		// Cannot get default value of classes that can't be instantiated
 		List<StringName> inheriting_classes;
 		ClassDB::get_direct_inheriters_from_class(p_class_name, &inheriting_classes);
-		for (List<StringName>::Element *E2 = inheriting_classes.front(); E2; E2 = E2->next()) {
-			if (ClassDB::can_instantiate(E2->get())) {
-				default_value = ClassDB::class_get_default_property_value(E2->get(), p_property_name, &r_default_value_valid);
+		for (const StringName &class_name : inheriting_classes) {
+			if (ClassDB::can_instantiate(class_name)) {
+				default_value = ClassDB::class_get_default_property_value(class_name, p_property_name, &r_default_value_valid);
 				if (r_default_value_valid) {
 					break;
 				}
@@ -619,7 +628,7 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 					// Don't skip parametric setters and getters, i.e. method which require
 					// one or more parameters to define what property should be set or retrieved.
 					// E.g. CPUParticles3D::set_param(Parameter param, float value).
-					if (E.arguments.size() == 0 /* getter */ || (E.arguments.size() == 1 && E.return_val.type == Variant::NIL /* setter */)) {
+					if (E.arguments.is_empty() /* getter */ || (E.arguments.size() == 1 && E.return_val.type == Variant::NIL /* setter */)) {
 						continue;
 					}
 				}
@@ -648,11 +657,10 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 			ClassDB::get_signal_list(name, &signal_list, true);
 
 			if (signal_list.size()) {
-				for (List<MethodInfo>::Element *EV = signal_list.front(); EV; EV = EV->next()) {
+				for (const MethodInfo &mi : signal_list) {
 					DocData::MethodDoc signal;
-					signal.name = EV->get().name;
-					for (List<PropertyInfo>::Element *EA = EV->get().arguments.front(); EA; EA = EA->next()) {
-						const PropertyInfo &arginfo = EA->get();
+					signal.name = mi.name;
+					for (const PropertyInfo &arginfo : mi.arguments) {
 						DocData::ArgumentDoc argument;
 						DocData::argument_doc_from_arginfo(argument, arginfo);
 
@@ -844,9 +852,8 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 
 			method.name = mi.name;
 
-			int j = 0;
-			for (List<PropertyInfo>::ConstIterator itr = mi.arguments.begin(); itr != mi.arguments.end(); ++itr, ++j) {
-				PropertyInfo arginfo = *itr;
+			for (int64_t j = 0; j < mi.arguments.size(); ++j) {
+				const PropertyInfo &arginfo = mi.arguments[j];
 				DocData::ArgumentDoc ad;
 				DocData::argument_doc_from_arginfo(ad, arginfo);
 				ad.name = arginfo.name;
@@ -933,7 +940,7 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 			DocData::ConstantDoc constant;
 			constant.name = E;
 			Variant value = Variant::get_constant_value(Variant::Type(i), E);
-			constant.value = value.get_type() == Variant::INT ? itos(value) : value.get_construct_string().replace("\n", " ");
+			constant.value = value.get_type() == Variant::INT ? itos(value) : value.get_construct_string().replace_char('\n', ' ');
 			constant.is_value_valid = true;
 			constant.type = Variant::get_type_name(value.get_type());
 			c.constants.push_back(constant);
@@ -1057,10 +1064,9 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 
 				DocData::return_doc_from_retinfo(md, mi.return_val);
 
-				int j = 0;
-				for (List<PropertyInfo>::ConstIterator itr = mi.arguments.begin(); itr != mi.arguments.end(); ++itr, ++j) {
+				for (int64_t j = 0; j < mi.arguments.size(); ++j) {
 					DocData::ArgumentDoc ad;
-					DocData::argument_doc_from_arginfo(ad, *itr);
+					DocData::argument_doc_from_arginfo(ad, mi.arguments[j]);
 
 					int darg_idx = j - (mi.arguments.size() - mi.default_arguments.size());
 					if (darg_idx >= 0) {
@@ -1103,12 +1109,11 @@ void DocTools::generate(BitField<GenerateFlags> p_flags) {
 
 				DocData::return_doc_from_retinfo(atd, ai.return_val);
 
-				int j = 0;
-				for (List<PropertyInfo>::ConstIterator itr = ai.arguments.begin(); itr != ai.arguments.end(); ++itr, ++j) {
+				for (int64_t j = 0; j < ai.arguments.size(); ++j) {
 					DocData::ArgumentDoc ad;
-					DocData::argument_doc_from_arginfo(ad, *itr);
+					DocData::argument_doc_from_arginfo(ad, ai.arguments[j]);
 
-					int darg_idx = j - (ai.arguments.size() - ai.default_arguments.size());
+					int64_t darg_idx = j - (ai.arguments.size() - ai.default_arguments.size());
 					if (darg_idx >= 0) {
 						ad.default_value = DocData::get_default_value_string(ai.default_arguments[darg_idx]);
 					}
@@ -1632,7 +1637,7 @@ Error DocTools::save_classes(const String &p_default_path, const HashMap<String,
 		}
 
 		Error err;
-		String save_file = save_path.path_join(c.name.replace("\"", "").replace("/", "--") + ".xml");
+		String save_file = save_path.path_join(c.name.remove_char('\"').replace("/", "--") + ".xml");
 		Ref<FileAccess> f = FileAccess::open(save_file, FileAccess::WRITE, &err);
 
 		ERR_CONTINUE_MSG(err != OK, "Can't write doc file: " + save_file + ".");
diff --git a/engine/editor/doc_tools.h b/engine/editor/doc_tools.h
index 3be59bf2..fcac2c21 100644
--- a/engine/editor/doc_tools.h
+++ b/engine/editor/doc_tools.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DOC_TOOLS_H
-#define DOC_TOOLS_H
+#pragma once
 
 #include "core/doc_data.h"
 #include "core/templates/rb_set.h"
@@ -45,6 +44,7 @@ public:
 	void merge_from(const DocTools &p_data);
 	void add_doc(const DocData::ClassDoc &p_class_doc);
 	void remove_doc(const String &p_class_name);
+	void remove_script_doc_by_path(const String &p_path);
 	bool has_doc(const String &p_class_name);
 	enum GenerateFlags {
 		GENERATE_FLAG_SKIP_BASIC_TYPES = (1 << 0),
@@ -58,5 +58,3 @@ public:
 	Error load_compressed(const uint8_t *p_data, int p_compressed_size, int p_uncompressed_size);
 	Error load_xml(const uint8_t *p_data, int p_size);
 };
-
-#endif // DOC_TOOLS_H
diff --git a/engine/editor/editor_about.cpp b/engine/editor/editor_about.cpp
index 6b592ba7..b1c327fd 100644
--- a/engine/editor/editor_about.cpp
+++ b/engine/editor/editor_about.cpp
@@ -133,8 +133,8 @@ ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<St
 
 				while (*names_ptr) {
 					const String name = String::utf8(*names_ptr++);
-					const String identifier = name.get_slice("<", 0);
-					const String website = name.get_slice_count("<") == 1 ? "" : name.get_slice("<", 1).trim_suffix(">");
+					const String identifier = name.get_slicec('<', 0);
+					const String website = name.get_slice_count("<") == 1 ? "" : name.get_slicec('<', 1).trim_suffix(">");
 
 					const int name_item_id = il->add_item(identifier, nullptr, false);
 					il->set_item_tooltip_enabled(name_item_id, false);
@@ -340,5 +340,3 @@ EditorAbout::EditorAbout() {
 	tpl_ti_all->select(0);
 	_tpl_text->set_text(tpl_ti_all->get_metadata(0));
 }
-
-EditorAbout::~EditorAbout() {}
diff --git a/engine/editor/editor_about.h b/engine/editor/editor_about.h
index 0a3fb626..ac5def66 100644
--- a/engine/editor/editor_about.h
+++ b/engine/editor/editor_about.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_ABOUT_H
-#define EDITOR_ABOUT_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 #include "scene/gui/item_list.h"
@@ -62,7 +61,4 @@ protected:
 
 public:
 	EditorAbout();
-	~EditorAbout();
 };
-
-#endif // EDITOR_ABOUT_H
diff --git a/engine/editor/editor_asset_installer.cpp b/engine/editor/editor_asset_installer.cpp
index 5035900f..26393e03 100644
--- a/engine/editor/editor_asset_installer.cpp
+++ b/engine/editor/editor_asset_installer.cpp
@@ -684,6 +684,7 @@ EditorAssetInstaller::EditorAssetInstaller() {
 	show_source_files_button = memnew(Button);
 	show_source_files_button->set_toggle_mode(true);
 	show_source_files_button->set_tooltip_text(TTR("Open the list of the asset contents and select which files to install."));
+	show_source_files_button->set_accessibility_name(TTRC("Show Asset Contents"));
 	remapping_tools->add_child(show_source_files_button);
 	show_source_files_button->connect(SceneStringName(toggled), callable_mp(this, &EditorAssetInstaller::_toggle_source_tree).bind(false));
 
@@ -708,6 +709,7 @@ EditorAssetInstaller::EditorAssetInstaller() {
 	asset_conflicts_label->set_text(TTR("No files conflict with your project"));
 	remapping_tools->add_child(asset_conflicts_label);
 	asset_conflicts_link = memnew(LinkButton);
+	asset_conflicts_link->set_accessibility_name(TTRC("Show Conflicting Files"));
 	asset_conflicts_link->set_theme_type_variation("HeaderSmallLink");
 	asset_conflicts_link->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
 	asset_conflicts_link->set_tooltip_text(TTR("Show contents of the asset and conflicting files."));
@@ -732,6 +734,7 @@ EditorAssetInstaller::EditorAssetInstaller() {
 	source_tree_vb->add_child(source_tree_label);
 
 	source_tree = memnew(Tree);
+	source_tree->set_accessibility_name(TTRC("Source Files"));
 	source_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	source_tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	source_tree->connect("item_edited", callable_mp(this, &EditorAssetInstaller::_item_checked_cbk));
@@ -748,6 +751,7 @@ EditorAssetInstaller::EditorAssetInstaller() {
 	destination_tree_vb->add_child(destination_tree_label);
 
 	destination_tree = memnew(Tree);
+	destination_tree->set_accessibility_name(TTRC("Destination Files"));
 	destination_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	destination_tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	destination_tree->connect("item_edited", callable_mp(this, &EditorAssetInstaller::_item_checked_cbk));
diff --git a/engine/editor/editor_asset_installer.h b/engine/editor/editor_asset_installer.h
index 41f092f3..29f13002 100644
--- a/engine/editor/editor_asset_installer.h
+++ b/engine/editor/editor_asset_installer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_ASSET_INSTALLER_H
-#define EDITOR_ASSET_INSTALLER_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
@@ -105,5 +104,3 @@ public:
 
 	EditorAssetInstaller();
 };
-
-#endif // EDITOR_ASSET_INSTALLER_H
diff --git a/engine/editor/editor_atlas_packer.h b/engine/editor/editor_atlas_packer.h
index aa623801..c461719d 100644
--- a/engine/editor/editor_atlas_packer.h
+++ b/engine/editor/editor_atlas_packer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_ATLAS_PACKER_H
-#define EDITOR_ATLAS_PACKER_H
+#pragma once
 
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
@@ -68,5 +67,3 @@ private:
 public:
 	static void chart_pack(Vector<Chart> &charts, int &r_width, int &r_height, int p_atlas_max_size = 2048, int p_cell_resolution = 4);
 };
-
-#endif // EDITOR_ATLAS_PACKER_H
diff --git a/engine/editor/editor_audio_buses.cpp b/engine/editor/editor_audio_buses.cpp
index 9881087b..19a5b287 100644
--- a/engine/editor/editor_audio_buses.cpp
+++ b/engine/editor/editor_audio_buses.cpp
@@ -130,6 +130,14 @@ void EditorAudioBus::_notification(int p_what) {
 			set_process(true);
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Audio bus editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (is_master) {
 				draw_style_box(get_theme_stylebox(SNAME("disabled"), SNAME("Button")), Rect2(Vector2(), get_size()));
@@ -583,6 +591,15 @@ void EditorAudioBus::gui_input(const Ref<InputEvent> &p_event) {
 		bus_popup->reset_size();
 		bus_popup->popup();
 	}
+
+	Ref<InputEventKey> k = p_event;
+	if (k.is_valid() && k->is_pressed() && k->is_action("ui_menu", true)) {
+		bus_popup->set_position(get_screen_position());
+		bus_popup->reset_size();
+		bus_popup->popup();
+
+		accept_event();
+	}
 }
 
 void EditorAudioBus::_effects_gui_input(Ref<InputEvent> p_event) {
@@ -619,7 +636,7 @@ Variant EditorAudioBus::get_drag_data(const Point2 &p_point) {
 	p->set_modulate(Color(1, 1, 1, 0.7));
 	p->add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SNAME("focus"), SNAME("Button")));
 	p->set_size(get_size());
-	p->set_position(-p_point);
+	p->set_position((p_point == Vector2(Math::INF, Math::INF)) ? Vector2() : -p_point);
 	set_drag_preview(c);
 	Dictionary d;
 	d["type"] = "move_audio_bus";
@@ -652,7 +669,7 @@ void EditorAudioBus::drop_data(const Point2 &p_point, const Variant &p_data) {
 }
 
 Variant EditorAudioBus::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
-	TreeItem *item = effects->get_item_at_position(p_point);
+	TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? effects->get_selected() : effects->get_item_at_position(p_point);
 	if (!item) {
 		return Variant();
 	}
@@ -681,7 +698,7 @@ bool EditorAudioBus::can_drop_data_fw(const Point2 &p_point, const Variant &p_da
 		return false;
 	}
 
-	TreeItem *item = effects->get_item_at_position(p_point);
+	TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? effects->get_selected() : effects->get_item_at_position(p_point);
 	if (!item) {
 		return false;
 	}
@@ -694,11 +711,11 @@ bool EditorAudioBus::can_drop_data_fw(const Point2 &p_point, const Variant &p_da
 void EditorAudioBus::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
 	Dictionary d = p_data;
 
-	TreeItem *item = effects->get_item_at_position(p_point);
+	TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? effects->get_selected() : effects->get_item_at_position(p_point);
 	if (!item) {
 		return;
 	}
-	int pos = effects->get_drop_section_at_position(p_point);
+	int pos = (p_point == Vector2(Math::INF, Math::INF)) ? effects->get_drop_section_at_position(effects->get_item_rect(item).position) : effects->get_drop_section_at_position(p_point);
 	Variant md = item->get_metadata(0);
 
 	int paste_at;
@@ -815,6 +832,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	set_v_size_flags(SIZE_EXPAND_FILL);
 
 	track_name = memnew(LineEdit);
+	track_name->set_accessibility_name(TTRC("Track Name"));
 	track_name->connect(SceneStringName(text_submitted), callable_mp(this, &EditorAudioBus::_name_changed));
 	track_name->connect(SceneStringName(focus_exited), callable_mp(this, &EditorAudioBus::_name_focus_exit));
 	vb->add_child(track_name);
@@ -825,6 +843,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	solo->set_theme_type_variation(SceneStringName(FlatButton));
 	solo->set_toggle_mode(true);
 	solo->set_tooltip_text(TTR("Solo"));
+	solo->set_accessibility_name(TTRC("Solo"));
 	solo->set_focus_mode(FOCUS_NONE);
 	solo->connect(SceneStringName(pressed), callable_mp(this, &EditorAudioBus::_solo_toggled));
 	hbc->add_child(solo);
@@ -832,6 +851,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	mute->set_theme_type_variation(SceneStringName(FlatButton));
 	mute->set_toggle_mode(true);
 	mute->set_tooltip_text(TTR("Mute"));
+	mute->set_accessibility_name(TTRC("Mute"));
 	mute->set_focus_mode(FOCUS_NONE);
 	mute->connect(SceneStringName(pressed), callable_mp(this, &EditorAudioBus::_mute_toggled));
 	hbc->add_child(mute);
@@ -839,6 +859,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	bypass->set_theme_type_variation(SceneStringName(FlatButton));
 	bypass->set_toggle_mode(true);
 	bypass->set_tooltip_text(TTR("Bypass"));
+	bypass->set_accessibility_name(TTRC("Bypass"));
 	bypass->set_focus_mode(FOCUS_NONE);
 	bypass->connect(SceneStringName(pressed), callable_mp(this, &EditorAudioBus::_bypass_toggled));
 	hbc->add_child(bypass);
@@ -886,6 +907,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	slider->set_max(1.0);
 	slider->set_step(0.0001);
 	slider->set_clip_contents(false);
+	slider->set_accessibility_name(TTRC("Volume"));
 
 	audio_value_preview_box = memnew(Panel);
 	slider->add_child(audio_value_preview_box);
@@ -922,6 +944,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 		channel[i].vu_l->set_min(-80);
 		channel[i].vu_l->set_max(24);
 		channel[i].vu_l->set_step(0.1);
+		channel[i].vu_l->set_accessibility_name(vformat(TTR("Channel %d, Left VU"), i));
 
 		channel[i].vu_r = memnew(TextureProgressBar);
 		channel[i].vu_r->set_fill_mode(TextureProgressBar::FILL_BOTTOM_TO_TOP);
@@ -929,6 +952,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 		channel[i].vu_r->set_min(-80);
 		channel[i].vu_r->set_max(24);
 		channel[i].vu_r->set_step(0.1);
+		channel[i].vu_r->set_accessibility_name(vformat(TTR("Channel %d, Right VU"), i));
 
 		channel[i].peak_l = 0.0f;
 		channel[i].peak_r = 0.0f;
@@ -944,6 +968,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	hb->add_child(scale);
 
 	effects = memnew(Tree);
+	effects->set_accessibility_name(TTRC("Effects"));
 	effects->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	effects->set_hide_root(true);
 	effects->set_custom_minimum_size(Size2(0, 80) * EDSCALE);
@@ -963,6 +988,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	effects->connect(SceneStringName(gui_input), callable_mp(this, &EditorAudioBus::_effects_gui_input));
 
 	send = memnew(OptionButton);
+	send->set_accessibility_name(TTRC("Send"));
 	send->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	send->set_clip_text(true);
 	send->connect(SceneStringName(item_selected), callable_mp(this, &EditorAudioBus::_send_selected));
@@ -974,8 +1000,8 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	effect_options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Don't translate class names.
 	effect_options->connect("index_pressed", callable_mp(this, &EditorAudioBus::_effect_add));
 	add_child(effect_options);
-	List<StringName> effect_list;
-	ClassDB::get_inheriters_from_class("AudioEffect", &effect_list);
+	LocalVector<StringName> effect_list;
+	ClassDB::get_inheriters_from_class("AudioEffect", effect_list);
 	effect_list.sort_custom<StringName::AlphCompare>();
 	for (const StringName &E : effect_list) {
 		if (!ClassDB::can_instantiate(E) || ClassDB::is_virtual(E)) {
@@ -992,6 +1018,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
 	bus_options->set_h_size_flags(SIZE_SHRINK_END);
 	bus_options->set_anchor(SIDE_RIGHT, 0.0);
 	bus_options->set_tooltip_text(TTR("Bus Options"));
+	bus_options->set_accessibility_name(TTRC("Bus Options"));
 	hbc->add_child(bus_options);
 
 	bus_popup = bus_options->get_popup();
@@ -1050,9 +1077,6 @@ void EditorAudioBusDrop::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("dropped"));
 }
 
-EditorAudioBusDrop::EditorAudioBusDrop() {
-}
-
 void EditorAudioBuses::_rebuild_buses() {
 	for (int i = bus_hb->get_child_count() - 1; i >= 0; i--) {
 		EditorAudioBus *audio_bus = Object::cast_to<EditorAudioBus>(bus_hb->get_child(i));
@@ -1118,9 +1142,8 @@ void EditorAudioBuses::_notification(int p_what) {
 				}
 			}
 
-			AudioServer::get_singleton()->set_edited(false);
-
 			if (edited) {
+				AudioServer::get_singleton()->set_edited(false);
 				save_timer->start();
 			}
 		} break;
@@ -1409,9 +1432,6 @@ AudioBusesEditorPlugin::AudioBusesEditorPlugin(EditorAudioBuses *p_node) {
 	audio_bus_editor = p_node;
 }
 
-AudioBusesEditorPlugin::~AudioBusesEditorPlugin() {
-}
-
 void EditorAudioMeterNotches::add_notch(float p_normalized_offset, float p_db_value, bool p_render_value) {
 	notches.push_back(AudioNotch(p_normalized_offset, p_db_value, p_render_value));
 }
diff --git a/engine/editor/editor_audio_buses.h b/engine/editor/editor_audio_buses.h
index 5a9cd0c6..457c3931 100644
--- a/engine/editor/editor_audio_buses.h
+++ b/engine/editor/editor_audio_buses.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_AUDIO_BUSES_H
-#define EDITOR_AUDIO_BUSES_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
@@ -146,9 +145,6 @@ class EditorAudioBusDrop : public Control {
 protected:
 	static void _bind_methods();
 	void _notification(int p_what);
-
-public:
-	EditorAudioBusDrop();
 };
 
 class EditorAudioBuses : public VBoxContainer {
@@ -263,9 +259,6 @@ private:
 	static void _bind_methods();
 	void _notification(int p_what);
 	void _draw_audio_notches();
-
-public:
-	EditorAudioMeterNotches() {}
 };
 
 class AudioBusesEditorPlugin : public EditorPlugin {
@@ -281,7 +274,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	AudioBusesEditorPlugin(EditorAudioBuses *p_node);
-	~AudioBusesEditorPlugin();
 };
-
-#endif // EDITOR_AUDIO_BUSES_H
diff --git a/engine/editor/editor_autoload_settings.cpp b/engine/editor/editor_autoload_settings.cpp
index ae47eb07..bad06143 100644
--- a/engine/editor/editor_autoload_settings.cpp
+++ b/engine/editor/editor_autoload_settings.cpp
@@ -187,7 +187,7 @@ void EditorAutoloadSettings::_autoload_edited() {
 
 	if (column == 0) {
 		String name = ti->get_text(0);
-		String old_name = selected_autoload.get_slice("/", 1);
+		String old_name = selected_autoload.get_slicec('/', 1);
 
 		if (name == old_name) {
 			return;
@@ -242,7 +242,7 @@ void EditorAutoloadSettings::_autoload_edited() {
 		String scr_path = GLOBAL_GET(base);
 
 		if (scr_path.begins_with("*")) {
-			scr_path = scr_path.substr(1, scr_path.length());
+			scr_path = scr_path.substr(1);
 		}
 
 		// Singleton autoloads are represented with a leading "*" in their path.
@@ -349,11 +349,7 @@ void EditorAutoloadSettings::_autoload_activated() {
 }
 
 void EditorAutoloadSettings::_autoload_open(const String &fpath) {
-	if (ResourceLoader::get_resource_type(fpath) == "PackedScene") {
-		EditorNode::get_singleton()->open_request(fpath);
-	} else {
-		EditorNode::get_singleton()->load_resource(fpath);
-	}
+	EditorNode::get_singleton()->load_scene_or_resource(fpath);
 	ProjectSettingsEditor::get_singleton()->hide();
 }
 
@@ -483,7 +479,7 @@ void EditorAutoloadSettings::update_autoload() {
 			continue;
 		}
 
-		String name = pi.name.get_slice("/", 1);
+		String name = pi.name.get_slicec('/', 1);
 		String scr_path = GLOBAL_GET(pi.name);
 
 		if (name.is_empty()) {
@@ -494,7 +490,7 @@ void EditorAutoloadSettings::update_autoload() {
 		info.is_singleton = scr_path.begins_with("*");
 
 		if (info.is_singleton) {
-			scr_path = scr_path.substr(1, scr_path.length());
+			scr_path = scr_path.substr(1);
 		}
 
 		info.name = name;
@@ -625,7 +621,7 @@ Variant EditorAutoloadSettings::get_drag_data_fw(const Point2 &p_point, Control
 		next = tree->get_next_selected(next);
 	}
 
-	if (autoloads.size() == 0 || autoloads.size() == autoload_cache.size()) {
+	if (autoloads.is_empty() || autoloads.size() == autoload_cache.size()) {
 		return Variant();
 	}
 
@@ -663,13 +659,13 @@ bool EditorAutoloadSettings::can_drop_data_fw(const Point2 &p_point, const Varia
 	}
 
 	if (drop_data.has("type")) {
-		TreeItem *ti = tree->get_item_at_position(p_point);
+		TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
 
 		if (!ti) {
 			return false;
 		}
 
-		int section = tree->get_drop_section_at_position(p_point);
+		int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(ti).position) : tree->get_drop_section_at_position(p_point);
 
 		return section >= -1;
 	}
@@ -678,13 +674,13 @@ bool EditorAutoloadSettings::can_drop_data_fw(const Point2 &p_point, const Varia
 }
 
 void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control) {
-	TreeItem *ti = tree->get_item_at_position(p_point);
+	TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
 
 	if (!ti) {
 		return;
 	}
 
-	int section = tree->get_drop_section_at_position(p_point);
+	int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(ti).position) : tree->get_drop_section_at_position(p_point);
 
 	if (section < -1) {
 		return;
@@ -862,7 +858,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 			continue;
 		}
 
-		String name = pi.name.get_slice("/", 1);
+		String name = pi.name.get_slicec('/', 1);
 		String scr_path = GLOBAL_GET(pi.name);
 
 		if (name.is_empty()) {
@@ -873,7 +869,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 		info.is_singleton = scr_path.begins_with("*");
 
 		if (info.is_singleton) {
-			scr_path = scr_path.substr(1, scr_path.length());
+			scr_path = scr_path.substr(1);
 		}
 
 		info.name = name;
@@ -905,6 +901,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 
 	autoload_add_path = memnew(LineEdit);
 	hbc->add_child(autoload_add_path);
+	autoload_add_path->set_accessibility_name(TTRC("Autoload Path"));
 	autoload_add_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	autoload_add_path->set_clear_button_enabled(true);
 	autoload_add_path->set_placeholder(vformat(TTR("Set path or press \"%s\" to create a script."), TTR("Add")));
@@ -912,6 +909,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 
 	browse_button = memnew(Button);
 	hbc->add_child(browse_button);
+	browse_button->set_accessibility_name(TTRC("Select Autoload Path"));
 	browse_button->connect(SceneStringName(pressed), callable_mp(this, &EditorAutoloadSettings::_browse_autoload_add_path));
 
 	file_dialog = memnew(EditorFileDialog);
@@ -929,6 +927,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	hbc->add_child(l);
 
 	autoload_add_name = memnew(LineEdit);
+	autoload_add_name->set_accessibility_name(TTRC("Node Name"));
 	autoload_add_name->set_h_size_flags(SIZE_EXPAND_FILL);
 	autoload_add_name->connect(SceneStringName(text_submitted), callable_mp(this, &EditorAutoloadSettings::_autoload_text_submitted));
 	autoload_add_name->connect(SceneStringName(text_changed), callable_mp(this, &EditorAutoloadSettings::_autoload_text_changed));
@@ -942,6 +941,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
 	hbc->add_child(add_autoload);
 
 	tree = memnew(Tree);
+	tree->set_accessibility_name(TTRC("Autoloads"));
 	tree->set_hide_root(true);
 	tree->set_select_mode(Tree::SELECT_MULTI);
 	tree->set_allow_reselect(true);
diff --git a/engine/editor/editor_autoload_settings.h b/engine/editor/editor_autoload_settings.h
index 2ab969eb..81d31d6e 100644
--- a/engine/editor/editor_autoload_settings.h
+++ b/engine/editor/editor_autoload_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_AUTOLOAD_SETTINGS_H
-#define EDITOR_AUTOLOAD_SETTINGS_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -114,5 +113,3 @@ public:
 	EditorAutoloadSettings();
 	~EditorAutoloadSettings();
 };
-
-#endif // EDITOR_AUTOLOAD_SETTINGS_H
diff --git a/engine/editor/editor_build_profile.cpp b/engine/editor/editor_build_profile.cpp
index 849340dc..75b67fa7 100644
--- a/engine/editor/editor_build_profile.cpp
+++ b/engine/editor/editor_build_profile.cpp
@@ -46,7 +46,7 @@ const char *EditorBuildProfile::build_option_identifiers[BUILD_OPTION_MAX] = {
 	"disable_2d_physics",
 	"disable_3d_physics",
 	"disable_navigation",
-	"openxr",
+	"disable_xr",
 	"rendering_device", // FIXME: there's no scons option to disable rendering device
 	"opengl3",
 	"vulkan",
@@ -82,7 +82,7 @@ const bool EditorBuildProfile::build_option_disable_values[BUILD_OPTION_MAX] = {
 	true, // PHYSICS_2D
 	true, // PHYSICS_3D
 	true, // NAVIGATION
-	false, // XR
+	true, // XR
 	false, // RENDERING_DEVICE
 	false, // OPENGL
 	false, // VULKAN
@@ -297,11 +297,9 @@ Error EditorBuildProfile::load_from_file(const String &p_path) {
 
 	if (data.has("disabled_build_options")) {
 		Dictionary disabled_build_options_arr = data["disabled_build_options"];
-		List<Variant> keys;
-		disabled_build_options_arr.get_key_list(&keys);
 
-		for (const Variant &K : keys) {
-			String key = K;
+		for (const KeyValue<Variant, Variant> &kv : disabled_build_options_arr) {
+			String key = kv.key;
 
 			for (int i = 0; i < BUILD_OPTION_MAX; i++) {
 				String f = build_option_identifiers[i];
@@ -810,6 +808,7 @@ EditorBuildProfileManager::EditorBuildProfileManager() {
 	HBoxContainer *path_hbc = memnew(HBoxContainer);
 	profile_path = memnew(LineEdit);
 	path_hbc->add_child(profile_path);
+	profile_path->set_accessibility_name(TTRC("Profile Path"));
 	profile_path->set_editable(true);
 	profile_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
@@ -868,7 +867,7 @@ EditorBuildProfileManager::EditorBuildProfileManager() {
 	import_profile = memnew(EditorFileDialog);
 	add_child(import_profile);
 	import_profile->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
-	import_profile->add_filter("*.build", TTR("Engine Compilation Profile"));
+	import_profile->add_filter("*.gdbuild,*.build", TTR("Engine Compilation Profile"));
 	import_profile->connect("files_selected", callable_mp(this, &EditorBuildProfileManager::_import_profile));
 	import_profile->set_title(TTR("Load Profile"));
 	import_profile->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
@@ -876,12 +875,13 @@ EditorBuildProfileManager::EditorBuildProfileManager() {
 	export_profile = memnew(EditorFileDialog);
 	add_child(export_profile);
 	export_profile->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
-	export_profile->add_filter("*.build", TTR("Engine Compilation Profile"));
+	export_profile->add_filter("*.gdbuild,*.build", TTR("Engine Compilation Profile"));
 	export_profile->connect("file_selected", callable_mp(this, &EditorBuildProfileManager::_export_profile));
 	export_profile->set_title(TTR("Export Profile"));
 	export_profile->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
 
 	force_detect_classes = memnew(LineEdit);
+	force_detect_classes->set_accessibility_name(TTRC("Forced Classes"));
 	main_vbc->add_margin_child(TTR("Forced Classes on Detect:"), force_detect_classes);
 	force_detect_classes->connect(SceneStringName(text_changed), callable_mp(this, &EditorBuildProfileManager::_force_detect_classes_changed));
 
diff --git a/engine/editor/editor_build_profile.h b/engine/editor/editor_build_profile.h
index 945f7ba3..3131650a 100644
--- a/engine/editor/editor_build_profile.h
+++ b/engine/editor/editor_build_profile.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_BUILD_PROFILE_H
-#define EDITOR_BUILD_PROFILE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "editor/editor_help.h"
@@ -185,5 +184,3 @@ public:
 	static EditorBuildProfileManager *get_singleton() { return singleton; }
 	EditorBuildProfileManager();
 };
-
-#endif // EDITOR_BUILD_PROFILE_H
diff --git a/engine/editor/editor_builders.py b/engine/editor/editor_builders.py
index 625d5706..50bcd763 100644
--- a/engine/editor/editor_builders.py
+++ b/engine/editor/editor_builders.py
@@ -2,141 +2,95 @@
 
 import os
 import os.path
-import shutil
 import subprocess
 import tempfile
 import uuid
-import zlib
 
-from methods import print_warning
+import methods
 
 
 def make_doc_header(target, source, env):
-    dst = str(target[0])
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        buf = ""
-        docbegin = ""
-        docend = ""
-        for src in source:
-            src = str(src)
-            if not src.endswith(".xml"):
-                continue
-            with open(src, "r", encoding="utf-8") as f:
-                content = f.read()
-            buf += content
+    buffer = b"".join([methods.get_buffer(src) for src in map(str, source)])
+    decomp_size = len(buffer)
+    buffer = methods.compress_buffer(buffer)
 
-        buf = (docbegin + buf + docend).encode("utf-8")
-        decomp_size = len(buf)
-
-        # Use maximum zlib compression level to further reduce file size
-        # (at the cost of initial build times).
-        buf = zlib.compress(buf, zlib.Z_BEST_COMPRESSION)
-
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef _DOC_DATA_RAW_H\n")
-        g.write("#define _DOC_DATA_RAW_H\n")
-        g.write('static const char *_doc_data_hash = "' + str(hash(buf)) + '";\n')
-        g.write("static const int _doc_data_compressed_size = " + str(len(buf)) + ";\n")
-        g.write("static const int _doc_data_uncompressed_size = " + str(decomp_size) + ";\n")
-        g.write("static const unsigned char _doc_data_compressed[] = {\n")
-        for i in range(len(buf)):
-            g.write("\t" + str(buf[i]) + ",\n")
-        g.write("};\n")
-
-        g.write("#endif")
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write(f"""\
+inline constexpr const char *_doc_data_hash = "{hash(buffer)}";
+inline constexpr int _doc_data_compressed_size = {len(buffer)};
+inline constexpr int _doc_data_uncompressed_size = {decomp_size};
+inline constexpr const unsigned char _doc_data_compressed[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
+""")
 
 
-def make_translations_header(target, source, env, category):
-    dst = str(target[0])
+def make_translations_header(target, source, env):
+    category = os.path.basename(str(target[0])).split("_")[0]
+    sorted_paths = sorted([src.abspath for src in source], key=lambda path: os.path.splitext(os.path.basename(path))[0])
 
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef _{}_TRANSLATIONS_H\n".format(category.upper()))
-        g.write("#define _{}_TRANSLATIONS_H\n".format(category.upper()))
+    xl_names = []
+    msgfmt = env.Detect("msgfmt")
+    if not msgfmt:
+        methods.print_warning("msgfmt not found, using .po files instead of .mo")
 
-        sorted_paths = sorted([str(x) for x in source], key=lambda path: os.path.splitext(os.path.basename(path))[0])
-
-        msgfmt_available = shutil.which("msgfmt") is not None
-
-        if not msgfmt_available:
-            print_warning("msgfmt is not found, using .po files instead of .mo")
-
-        xl_names = []
-        for i in range(len(sorted_paths)):
-            name = os.path.splitext(os.path.basename(sorted_paths[i]))[0]
+    with methods.generated_wrapper(str(target[0])) as file:
+        for path in sorted_paths:
+            name = os.path.splitext(os.path.basename(path))[0]
             # msgfmt erases non-translated messages, so avoid using it if exporting the POT.
-            if msgfmt_available and name != category:
+            if msgfmt and name != category:
                 mo_path = os.path.join(tempfile.gettempdir(), uuid.uuid4().hex + ".mo")
-                cmd = "msgfmt " + sorted_paths[i] + " --no-hash -o " + mo_path
+                cmd = f"{msgfmt} {path} --no-hash -o {mo_path}"
                 try:
                     subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE).communicate()
-                    with open(mo_path, "rb") as f:
-                        buf = f.read()
+                    buffer = methods.get_buffer(mo_path)
                 except OSError as e:
-                    print_warning(
+                    methods.print_warning(
                         "msgfmt execution failed, using .po file instead of .mo: path=%r; [%s] %s"
-                        % (sorted_paths[i], e.__class__.__name__, e)
+                        % (path, e.__class__.__name__, e)
                     )
-                    with open(sorted_paths[i], "rb") as f:
-                        buf = f.read()
+                    buffer = methods.get_buffer(path)
                 finally:
                     try:
-                        os.remove(mo_path)
+                        if os.path.exists(mo_path):
+                            os.remove(mo_path)
                     except OSError as e:
                         # Do not fail the entire build if it cannot delete a temporary file.
-                        print_warning(
+                        methods.print_warning(
                             "Could not delete temporary .mo file: path=%r; [%s] %s" % (mo_path, e.__class__.__name__, e)
                         )
             else:
-                with open(sorted_paths[i], "rb") as f:
-                    buf = f.read()
-
+                buffer = methods.get_buffer(path)
                 if name == category:
                     name = "source"
 
-            decomp_size = len(buf)
-            # Use maximum zlib compression level to further reduce file size
-            # (at the cost of initial build times).
-            buf = zlib.compress(buf, zlib.Z_BEST_COMPRESSION)
+            decomp_size = len(buffer)
+            buffer = methods.compress_buffer(buffer)
 
-            g.write("static const unsigned char _{}_translation_{}_compressed[] = {{\n".format(category, name))
-            for j in range(len(buf)):
-                g.write("\t" + str(buf[j]) + ",\n")
+            file.write(f"""\
+inline constexpr const unsigned char _{category}_translation_{name}_compressed[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
 
-            g.write("};\n")
+""")
 
-            xl_names.append([name, len(buf), str(decomp_size)])
+            xl_names.append([name, len(buffer), decomp_size])
+
+        file.write(f"""\
+struct {category.capitalize()}TranslationList {{
+	const char* lang;
+	int comp_size;
+	int uncomp_size;
+	const unsigned char* data;
+}};
+
+inline constexpr {category.capitalize()}TranslationList _{category}_translations[] = {{
+""")
 
-        g.write("struct {}TranslationList {{\n".format(category.capitalize()))
-        g.write("\tconst char* lang;\n")
-        g.write("\tint comp_size;\n")
-        g.write("\tint uncomp_size;\n")
-        g.write("\tconst unsigned char* data;\n")
-        g.write("};\n\n")
-        g.write("static {}TranslationList _{}_translations[] = {{\n".format(category.capitalize(), category))
         for x in xl_names:
-            g.write(
-                '\t{{ "{}", {}, {}, _{}_translation_{}_compressed }},\n'.format(
-                    x[0], str(x[1]), str(x[2]), category, x[0]
-                )
-            )
-        g.write("\t{nullptr, 0, 0, nullptr}\n")
-        g.write("};\n")
+            file.write(f'\t{{ "{x[0]}", {x[1]}, {x[2]}, _{category}_translation_{x[0]}_compressed }},\n')
 
-        g.write("#endif")
-
-
-def make_editor_translations_header(target, source, env):
-    make_translations_header(target, source, env, "editor")
-
-
-def make_property_translations_header(target, source, env):
-    make_translations_header(target, source, env, "property")
-
-
-def make_doc_translations_header(target, source, env):
-    make_translations_header(target, source, env, "doc")
-
-
-def make_extractable_translations_header(target, source, env):
-    make_translations_header(target, source, env, "extractable")
+        file.write("""\
+	{ nullptr, 0, 0, nullptr },
+};
+""")
diff --git a/engine/editor/editor_command_palette.cpp b/engine/editor/editor_command_palette.cpp
index a83ceb5f..9adff60d 100644
--- a/engine/editor/editor_command_palette.cpp
+++ b/engine/editor/editor_command_palette.cpp
@@ -112,7 +112,7 @@ void EditorCommandPalette::_update_command_search(const String &search_text) {
 
 	const int entry_limit = MIN(entries.size(), 300);
 	for (int i = 0; i < entry_limit; i++) {
-		String section_name = entries[i].key_name.get_slice("/", 0);
+		String section_name = entries[i].key_name.get_slicec('/', 0);
 		TreeItem *section;
 
 		if (sections.has(section_name)) {
@@ -294,11 +294,10 @@ void EditorCommandPalette::register_shortcuts_as_command() {
 
 	// Load command use history.
 	Dictionary command_history = EditorSettings::get_singleton()->get_project_metadata("command_palette", "command_history", Dictionary());
-	Array history_entries = command_history.keys();
-	for (int i = 0; i < history_entries.size(); i++) {
-		const String &history_key = history_entries[i];
+	for (const KeyValue<Variant, Variant> &history_kv : command_history) {
+		const String &history_key = history_kv.key;
 		if (commands.has(history_key)) {
-			commands[history_key].last_used = command_history[history_key];
+			commands[history_key].last_used = history_kv.value;
 		}
 	}
 }
@@ -345,6 +344,7 @@ EditorCommandPalette::EditorCommandPalette() {
 
 	command_search_box = memnew(LineEdit);
 	command_search_box->set_placeholder(TTR("Filter Commands"));
+	command_search_box->set_accessibility_name(TTRC("Filter Commands"));
 	command_search_box->connect(SceneStringName(gui_input), callable_mp(this, &EditorCommandPalette::_sbox_input));
 	command_search_box->connect(SceneStringName(text_changed), callable_mp(this, &EditorCommandPalette::_update_command_search));
 	command_search_box->set_v_size_flags(Control::SIZE_EXPAND_FILL);
diff --git a/engine/editor/editor_command_palette.h b/engine/editor/editor_command_palette.h
index 0b79d3e8..12c0a491 100644
--- a/engine/editor/editor_command_palette.h
+++ b/engine/editor/editor_command_palette.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_COMMAND_PALETTE_H
-#define EDITOR_COMMAND_PALETTE_H
+#pragma once
 
 #include "core/input/shortcut.h"
 #include "scene/gui/dialogs.h"
@@ -103,5 +102,3 @@ public:
 
 Ref<Shortcut> ED_SHORTCUT_AND_COMMAND(const String &p_path, const String &p_name, Key p_keycode = Key::NONE, String p_command = "");
 Ref<Shortcut> ED_SHORTCUT_ARRAY_AND_COMMAND(const String &p_path, const String &p_name, const PackedInt32Array &p_keycodes, String p_command = "");
-
-#endif // EDITOR_COMMAND_PALETTE_H
diff --git a/engine/editor/editor_data.cpp b/engine/editor/editor_data.cpp
index 7b6eb409..a8f4b5b4 100644
--- a/engine/editor/editor_data.cpp
+++ b/engine/editor/editor_data.cpp
@@ -336,12 +336,8 @@ void EditorData::set_editor_plugin_states(const Dictionary &p_states) {
 		return;
 	}
 
-	List<Variant> keys;
-	p_states.get_key_list(&keys);
-
-	List<Variant>::Element *E = keys.front();
-	for (; E; E = E->next()) {
-		String name = E->get();
+	for (const KeyValue<Variant, Variant> &kv : p_states) {
+		String name = kv.key;
 		int idx = -1;
 		for (int i = 0; i < editor_plugins.size(); i++) {
 			if (editor_plugins[i]->get_plugin_name() == name) {
@@ -353,7 +349,7 @@ void EditorData::set_editor_plugin_states(const Dictionary &p_states) {
 		if (idx == -1) {
 			continue;
 		}
-		editor_plugins[idx]->set_state(p_states[name]);
+		editor_plugins[idx]->set_state(kv.value);
 	}
 }
 
@@ -602,8 +598,7 @@ void EditorData::instantiate_object_properties(Object *p_object) {
 	List<PropertyInfo> pinfo;
 	p_object->get_property_list(&pinfo);
 
-	for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-		PropertyInfo pi = E->get();
+	for (const PropertyInfo &pi : pinfo) {
 		if (pi.type == Variant::OBJECT && pi.usage & PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT) {
 			Object *prop = ClassDB::instantiate(pi.class_name);
 			p_object->set(pi.name, prop);
@@ -1071,12 +1066,10 @@ void EditorData::script_class_load_icon_paths() {
 #ifndef DISABLE_DEPRECATED
 	if (ProjectSettings::get_singleton()->has_setting("_global_script_class_icons")) {
 		Dictionary d = GLOBAL_GET("_global_script_class_icons");
-		List<Variant> keys;
-		d.get_key_list(&keys);
 
-		for (const Variant &E : keys) {
-			String name = E.operator String();
-			_script_class_icon_paths[name] = d[name];
+		for (const KeyValue<Variant, Variant> &kv : d) {
+			String name = kv.key.operator String();
+			_script_class_icon_paths[name] = kv.value;
 
 			String path = ScriptServer::get_global_class_path(name);
 			script_class_set_name(path, name);
@@ -1258,7 +1251,10 @@ void EditorSelection::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("add_node", "node"), &EditorSelection::add_node);
 	ClassDB::bind_method(D_METHOD("remove_node", "node"), &EditorSelection::remove_node);
 	ClassDB::bind_method(D_METHOD("get_selected_nodes"), &EditorSelection::get_selected_nodes);
-	ClassDB::bind_method(D_METHOD("get_transformable_selected_nodes"), &EditorSelection::_get_transformable_selected_nodes);
+	ClassDB::bind_method(D_METHOD("get_top_selected_nodes"), &EditorSelection::get_top_selected_nodes);
+#ifndef DISABLE_DEPRECATED
+	ClassDB::bind_method(D_METHOD("get_transformable_selected_nodes"), &EditorSelection::get_top_selected_nodes);
+#endif // DISABLE_DEPRECATED
 	ADD_SIGNAL(MethodInfo("selection_changed"));
 }
 
@@ -1271,7 +1267,7 @@ void EditorSelection::_update_node_list() {
 		return;
 	}
 
-	selected_node_list.clear();
+	top_selected_node_list.clear();
 
 	// If the selection does not have the parent of the selected node, then add the node to the node list.
 	// However, if the parent is already selected, then adding this node is redundant as
@@ -1291,7 +1287,7 @@ void EditorSelection::_update_node_list() {
 		if (skip) {
 			continue;
 		}
-		selected_node_list.push_back(E.key);
+		top_selected_node_list.push_back(E.key);
 	}
 
 	node_list_changed = true;
@@ -1315,10 +1311,10 @@ void EditorSelection::_emit_change() {
 	emitted = false;
 }
 
-TypedArray<Node> EditorSelection::_get_transformable_selected_nodes() {
+TypedArray<Node> EditorSelection::get_top_selected_nodes() {
 	TypedArray<Node> ret;
 
-	for (const Node *E : selected_node_list) {
+	for (const Node *E : top_selected_node_list) {
 		ret.push_back(E);
 	}
 
@@ -1335,13 +1331,13 @@ TypedArray<Node> EditorSelection::get_selected_nodes() {
 	return ret;
 }
 
-List<Node *> &EditorSelection::get_selected_node_list() {
+const List<Node *> &EditorSelection::get_top_selected_node_list() {
 	if (changed) {
 		update();
 	} else {
 		_update_node_list();
 	}
-	return selected_node_list;
+	return top_selected_node_list;
 }
 
 List<Node *> EditorSelection::get_full_selected_node_list() {
@@ -1362,9 +1358,6 @@ void EditorSelection::clear() {
 	node_list_changed = true;
 }
 
-EditorSelection::EditorSelection() {
-}
-
 EditorSelection::~EditorSelection() {
 	clear();
 }
diff --git a/engine/editor/editor_data.h b/engine/editor/editor_data.h
index bc5a8dae..22f44db7 100644
--- a/engine/editor/editor_data.h
+++ b/engine/editor/editor_data.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DATA_H
-#define EDITOR_DATA_H
+#pragma once
 
 #include "core/templates/list.h"
 #include "scene/resources/texture.h"
@@ -287,10 +286,9 @@ class EditorSelection : public Object {
 
 	// Editor plugins which are related to selection.
 	List<Object *> editor_plugins;
-	List<Node *> selected_node_list;
+	List<Node *> top_selected_node_list;
 
 	void _update_node_list();
-	TypedArray<Node> _get_transformable_selected_nodes();
 	void _emit_change();
 
 protected:
@@ -315,18 +313,17 @@ public:
 	void update();
 	void clear();
 
-	// Returns all the selected nodes.
-	TypedArray<Node> get_selected_nodes();
 	// Returns only the top level selected nodes.
 	// That is, if the selection includes some node and a child of that node, only the parent is returned.
-	List<Node *> &get_selected_node_list();
+	const List<Node *> &get_top_selected_node_list();
+	// Same as get_top_selected_node_list but returns a copy in a TypedArray for binding to scripts.
+	TypedArray<Node> get_top_selected_nodes();
 	// Returns all the selected nodes (list version of "get_selected_nodes").
 	List<Node *> get_full_selected_node_list();
+	// Same as get_full_selected_node_list but returns a copy in a TypedArray for binding to scripts.
+	TypedArray<Node> get_selected_nodes();
 	// Returns the map of selected objects and their metadata.
 	HashMap<Node *, Object *> &get_selection() { return selection; }
 
-	EditorSelection();
 	~EditorSelection();
 };
-
-#endif // EDITOR_DATA_H
diff --git a/engine/editor/editor_dock_manager.cpp b/engine/editor/editor_dock_manager.cpp
index 32269f91..ca99cb6c 100644
--- a/engine/editor/editor_dock_manager.cpp
+++ b/engine/editor/editor_dock_manager.cpp
@@ -158,17 +158,20 @@ void EditorDockManager::_update_layout() {
 		return;
 	}
 	dock_context_popup->docks_updated();
-	_update_docks_menu();
+	update_docks_menu();
 	EditorNode::get_singleton()->save_editor_layout_delayed();
 }
 
-void EditorDockManager::_update_docks_menu() {
+void EditorDockManager::update_docks_menu() {
 	docks_menu->clear();
 	docks_menu->reset_size();
 
 	const Ref<Texture2D> default_icon = docks_menu->get_editor_theme_icon(SNAME("Window"));
 	const Color closed_icon_color_mod = Color(1, 1, 1, 0.5);
 
+	bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
+	bool dark_mode = DisplayServer::get_singleton()->is_dark_mode_supported() && DisplayServer::get_singleton()->is_dark_mode();
+
 	// Add docks.
 	docks_menu_docks.clear();
 	int id = 0;
@@ -182,7 +185,7 @@ void EditorDockManager::_update_docks_menu() {
 		} else {
 			docks_menu->add_item(dock.value.title, id);
 		}
-		const Ref<Texture2D> icon = dock.value.icon_name ? docks_menu->get_editor_theme_icon(dock.value.icon_name) : dock.value.icon;
+		const Ref<Texture2D> icon = dock.value.icon_name ? docks_menu->get_editor_theme_native_menu_icon(dock.value.icon_name, global_menu, dark_mode) : dock.value.icon;
 		docks_menu->set_item_icon(id, icon.is_valid() ? icon : default_icon);
 		if (!dock.value.open) {
 			docks_menu->set_item_icon_modulate(id, closed_icon_color_mod);
@@ -613,7 +616,7 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
 		int ofs = p_layout->get_value(p_section, "dock_hsplit_" + itos(i + 1));
 		hsplits[i]->set_split_offset(ofs * EDSCALE);
 	}
-	_update_docks_menu();
+	update_docks_menu();
 }
 
 void EditorDockManager::bottom_dock_show_placement_popup(const Rect2i &p_position, Control *p_dock) {
@@ -848,11 +851,13 @@ EditorDockManager::EditorDockManager() {
 	docks_menu = memnew(PopupMenu);
 	docks_menu->set_hide_on_item_selection(false);
 	docks_menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditorDockManager::_docks_menu_option));
-	EditorNode::get_singleton()->get_gui_base()->connect(SceneStringName(theme_changed), callable_mp(this, &EditorDockManager::_update_docks_menu));
+	EditorNode::get_singleton()->get_gui_base()->connect(SceneStringName(theme_changed), callable_mp(this, &EditorDockManager::update_docks_menu));
 }
 
 void DockContextPopup::_notification(int p_what) {
 	switch (p_what) {
+		case Control::NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_THEME_CHANGED: {
 			if (make_float_button) {
 				make_float_button->set_button_icon(get_editor_theme_icon(SNAME("MakeFloating")));
@@ -1087,6 +1092,7 @@ DockContextPopup::DockContextPopup() {
 
 	HBoxContainer *header_hb = memnew(HBoxContainer);
 	tab_move_left_button = memnew(Button);
+	tab_move_left_button->set_accessibility_name(TTRC("Move Tab Left"));
 	tab_move_left_button->set_flat(true);
 	tab_move_left_button->set_focus_mode(Control::FOCUS_NONE);
 	tab_move_left_button->connect(SceneStringName(pressed), callable_mp(this, &DockContextPopup::_tab_move_left));
@@ -1099,6 +1105,7 @@ DockContextPopup::DockContextPopup() {
 	header_hb->add_child(position_label);
 
 	tab_move_right_button = memnew(Button);
+	tab_move_right_button->set_accessibility_name(TTRC("Move Tab Right"));
 	tab_move_right_button->set_flat(true);
 	tab_move_right_button->set_focus_mode(Control::FOCUS_NONE);
 	tab_move_right_button->connect(SceneStringName(pressed), callable_mp(this, &DockContextPopup::_tab_move_right));
diff --git a/engine/editor/editor_dock_manager.h b/engine/editor/editor_dock_manager.h
index d750d6b2..cd0d7998 100644
--- a/engine/editor/editor_dock_manager.h
+++ b/engine/editor/editor_dock_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DOCK_MANAGER_H
-#define EDITOR_DOCK_MANAGER_H
+#pragma once
 
 #include "scene/gui/popup.h"
 #include "scene/gui/split_container.h"
@@ -113,7 +112,6 @@ private:
 	void _dock_container_update_visibility(TabContainer *p_dock_container);
 	void _update_layout();
 
-	void _update_docks_menu();
 	void _docks_menu_option(int p_id);
 
 	void _window_close_request(WindowWrapper *p_wrapper);
@@ -133,6 +131,7 @@ private:
 public:
 	static EditorDockManager *get_singleton() { return singleton; }
 
+	void update_docks_menu();
 	void update_tab_styles();
 	void set_tab_icon_max_width(int p_max_width);
 
@@ -207,5 +206,3 @@ public:
 
 	DockContextPopup();
 };
-
-#endif // EDITOR_DOCK_MANAGER_H
diff --git a/engine/editor/editor_feature_profile.cpp b/engine/editor/editor_feature_profile.cpp
index bca49df5..81fdf081 100644
--- a/engine/editor/editor_feature_profile.cpp
+++ b/engine/editor/editor_feature_profile.cpp
@@ -261,7 +261,7 @@ Error EditorFeatureProfile::load_from_file(const String &p_path) {
 		Array disabled_properties_arr = data["disabled_properties"];
 		for (int i = 0; i < disabled_properties_arr.size(); i++) {
 			String s = disabled_properties_arr[i];
-			set_disable_class_property(s.get_slice(":", 0), s.get_slice(":", 1), true);
+			set_disable_class_property(s.get_slicec(':', 0), s.get_slicec(':', 1), true);
 		}
 	}
 
@@ -924,6 +924,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
 	HBoxContainer *name_hbc = memnew(HBoxContainer);
 	current_profile_name = memnew(LineEdit);
 	name_hbc->add_child(current_profile_name);
+	current_profile_name->set_accessibility_name(TTRC("Current Profile"));
 	current_profile_name->set_text(TTR("(none)"));
 	current_profile_name->set_editable(false);
 	current_profile_name->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -938,6 +939,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
 
 	HBoxContainer *profiles_hbc = memnew(HBoxContainer);
 	profile_list = memnew(OptionButton);
+	profile_list->set_accessibility_name(TTRC("Profiles"));
 	profile_list->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	profile_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	profiles_hbc->add_child(profile_list);
@@ -1031,6 +1033,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() {
 	new_profile_name = memnew(LineEdit);
 	new_profile_vb->add_child(new_profile_name);
 	new_profile_name->set_custom_minimum_size(Size2(300 * EDSCALE, 1));
+	new_profile_name->set_accessibility_name(TTRC("Profile Name"));
 	add_child(new_profile_dialog);
 	new_profile_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFeatureProfileManager::_create_new_profile));
 	new_profile_dialog->register_text_enter(new_profile_name);
diff --git a/engine/editor/editor_feature_profile.h b/engine/editor/editor_feature_profile.h
index 7a2f1325..f6f6bd6e 100644
--- a/engine/editor/editor_feature_profile.h
+++ b/engine/editor/editor_feature_profile.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_FEATURE_PROFILE_H
-#define EDITOR_FEATURE_PROFILE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "editor/editor_help.h"
@@ -185,5 +184,3 @@ public:
 	static EditorFeatureProfileManager *get_singleton() { return singleton; }
 	EditorFeatureProfileManager();
 };
-
-#endif // EDITOR_FEATURE_PROFILE_H
diff --git a/engine/editor/editor_file_system.cpp b/engine/editor/editor_file_system.cpp
index e78f77b5..066d8e04 100644
--- a/engine/editor/editor_file_system.cpp
+++ b/engine/editor/editor_file_system.cpp
@@ -447,8 +447,8 @@ void EditorFileSystem::_scan_filesystem() {
 					name = cpath.path_join(name);
 
 					FileCache fc;
-					fc.type = split[1].get_slice("/", 0);
-					fc.resource_script_class = split[1].get_slice("/", 1);
+					fc.type = split[1].get_slicec('/', 0);
+					fc.resource_script_class = split[1].get_slicec('/', 1);
 					fc.uid = split[2].to_int();
 					fc.modification_time = split[3].to_int();
 					fc.import_modification_time = split[4].to_int();
@@ -802,7 +802,7 @@ Vector<String> EditorFileSystem::_get_import_dest_paths(const String &p_path) {
 }
 
 bool EditorFileSystem::_scan_import_support(const Vector<String> &reimports) {
-	if (import_support_queries.size() == 0) {
+	if (import_support_queries.is_empty()) {
 		return false;
 	}
 	HashMap<String, int> import_support_test;
@@ -818,7 +818,7 @@ bool EditorFileSystem::_scan_import_support(const Vector<String> &reimports) {
 		}
 	}
 
-	if (import_support_test.size() == 0) {
+	if (import_support_test.is_empty()) {
 		return false; //well nothing to do
 	}
 
@@ -905,7 +905,7 @@ bool EditorFileSystem::_update_scan_actions() {
 				if (existing_id != ResourceUID::INVALID_ID) {
 					const String old_path = ResourceUID::get_singleton()->get_id_path(existing_id);
 					if (old_path != new_file_path && FileAccess::exists(old_path)) {
-						const ResourceUID::ID new_id = ResourceUID::get_singleton()->create_id();
+						const ResourceUID::ID new_id = ResourceUID::get_singleton()->create_id_for_path(new_file_path);
 						ResourceUID::get_singleton()->add_id(new_id, new_file_path);
 						ResourceSaver::set_uid(new_file_path, new_id);
 						WARN_PRINT(vformat("Duplicate UID detected for Resource at \"%s\".\nOld Resource path: \"%s\". The new file UID was changed automatically.", new_file_path, old_path));
@@ -913,6 +913,12 @@ bool EditorFileSystem::_update_scan_actions() {
 						// Re-assign the UID to file, just in case it was pulled from cache.
 						ResourceSaver::set_uid(new_file_path, existing_id);
 					}
+				} else if (ResourceLoader::should_create_uid_file(new_file_path)) {
+					Ref<FileAccess> f = FileAccess::open(new_file_path + ".uid", FileAccess::WRITE);
+					if (f.is_valid()) {
+						ia.new_file->uid = ResourceUID::get_singleton()->create_id_for_path(new_file_path);
+						f->store_line(ResourceUID::get_singleton()->id_to_text(ia.new_file->uid));
+					}
 				}
 
 				if (ClassDB::is_parent_class(ia.new_file->type, SNAME("Script"))) {
@@ -927,15 +933,16 @@ bool EditorFileSystem::_update_scan_actions() {
 				int idx = ia.dir->find_file_index(ia.file);
 				ERR_CONTINUE(idx == -1);
 
-				String class_name = ia.dir->files[idx]->class_info.name;
+				const String file_path = ia.dir->get_file_path(idx);
+				const String class_name = ia.dir->files[idx]->class_info.name;
 				if (ClassDB::is_parent_class(ia.dir->files[idx]->type, SNAME("Script"))) {
-					_queue_update_script_class(ia.dir->get_file_path(idx), ScriptClassInfoUpdate());
+					_queue_update_script_class(file_path, ScriptClassInfoUpdate());
 				}
 				if (ia.dir->files[idx]->type == SNAME("PackedScene")) {
-					_queue_update_scene_groups(ia.dir->get_file_path(idx));
+					_queue_update_scene_groups(file_path);
 				}
 
-				_delete_internal_files(ia.dir->files[idx]->file);
+				_delete_internal_files(file_path);
 				memdelete(ia.dir->files[idx]);
 				ia.dir->files.remove_at(idx);
 
@@ -963,7 +970,7 @@ bool EditorFileSystem::_update_scan_actions() {
 					Vector<String> dependencies = _get_dependencies(full_path);
 					for (const String &dep : dependencies) {
 						const String &dependency_path = dep.contains("::") ? dep.get_slice("::", 0) : dep;
-						if (import_extensions.has(dep.get_extension())) {
+						if (_can_import_file(dep)) {
 							reimports.push_back(dependency_path);
 						}
 					}
@@ -1061,6 +1068,19 @@ void EditorFileSystem::scan() {
 	// to be loaded to continue the scan and reimportations.
 	if (first_scan) {
 		_first_scan_filesystem();
+#ifdef ANDROID_ENABLED
+		const String nomedia_file_path = ProjectSettings::get_singleton()->get_resource_path().path_join(".nomedia");
+		if (!FileAccess::exists(nomedia_file_path)) {
+			// Create a .nomedia file to hide assets from media apps on Android.
+			Ref<FileAccess> f = FileAccess::open(nomedia_file_path, FileAccess::WRITE);
+			if (f.is_null()) {
+				// .nomedia isn't so critical.
+				ERR_PRINT("Couldn't create .nomedia in project path.");
+			} else {
+				f->close();
+			}
+		}
+#endif
 	}
 
 	_update_extensions();
@@ -1145,15 +1165,15 @@ int EditorFileSystem::_scan_new_dir(ScannedDirectory *p_dir, Ref<DirAccess> &da)
 
 	int nb_files_total_scan = 0;
 
-	for (List<String>::Element *E = dirs.front(); E; E = E->next()) {
-		if (da->change_dir(E->get()) == OK) {
+	for (const String &dir : dirs) {
+		if (da->change_dir(dir) == OK) {
 			String d = da->get_current_dir();
 
 			if (d == cd || !d.begins_with(cd)) {
 				da->change_dir(cd); //avoid recursion
 			} else {
 				ScannedDirectory *sd = memnew(ScannedDirectory);
-				sd->name = E->get();
+				sd->name = dir;
 				sd->full_path = p_dir->full_path.path_join(sd->name);
 
 				nb_files_total_scan += _scan_new_dir(sd, da);
@@ -1163,7 +1183,7 @@ int EditorFileSystem::_scan_new_dir(ScannedDirectory *p_dir, Ref<DirAccess> &da)
 				da->change_dir("..");
 			}
 		} else {
-			ERR_PRINT("Cannot go into subdir '" + E->get() + "'.");
+			ERR_PRINT("Cannot go into subdir '" + dir + "'.");
 		}
 	}
 
@@ -1204,7 +1224,7 @@ void EditorFileSystem::_process_file_system(const ScannedDirectory *p_scan_dir,
 		FileCache *fc = file_cache.getptr(path);
 		uint64_t mt = FileAccess::get_modified_time(path);
 
-		if (import_extensions.has(ext)) {
+		if (_can_import_file(scan_file)) {
 			//is imported
 			uint64_t import_mt = FileAccess::get_modified_time(path + ".import");
 
@@ -1333,7 +1353,7 @@ void EditorFileSystem::_process_file_system(const ScannedDirectory *p_scan_dir,
 				Ref<FileAccess> f = FileAccess::open(path + ".uid", FileAccess::WRITE);
 				if (f.is_valid()) {
 					if (fi->uid == ResourceUID::INVALID_ID) {
-						fi->uid = ResourceUID::get_singleton()->create_id();
+						fi->uid = ResourceUID::get_singleton()->create_id_for_path(path);
 					} else {
 						WARN_PRINT(vformat("Missing .uid file for path \"%s\". The file was re-created from cache.", path));
 					}
@@ -1494,7 +1514,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, ScanPr
 						scan_actions.push_back(ia);
 					}
 
-					if (import_extensions.has(ext)) {
+					if (_can_import_file(f)) {
 						//if it can be imported, and it was added, it needs to be reimported
 						ItemAction ia;
 						ia.action = ItemAction::ACTION_FILE_TEST_REIMPORT;
@@ -1526,7 +1546,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, ScanPr
 
 		String path = cd.path_join(p_dir->files[i]->file);
 
-		if (import_extensions.has(p_dir->files[i]->file.get_extension().to_lower())) {
+		if (_can_import_file(p_dir->files[i]->file)) {
 			// Check here if file must be imported or not.
 			// Same logic as in _process_file_system, the last modifications dates
 			// needs to be trusted to prevent reading all the .import files and the md5
@@ -1846,12 +1866,12 @@ bool EditorFileSystem::_find_file(const String &p_file, EditorFileSystemDirector
 	if (!f.begins_with("res://")) {
 		return false;
 	}
-	f = f.substr(6, f.length());
-	f = f.replace("\\", "/");
+	f = f.substr(6);
+	f = f.replace_char('\\', '/');
 
 	Vector<String> path = f.split("/");
 
-	if (path.size() == 0) {
+	if (path.is_empty()) {
 		return false;
 	}
 	String file = path[path.size() - 1];
@@ -1972,8 +1992,8 @@ EditorFileSystemDirectory *EditorFileSystem::get_filesystem_path(const String &p
 		return nullptr;
 	}
 
-	f = f.substr(6, f.length());
-	f = f.replace("\\", "/");
+	f = f.substr(6);
+	f = f.replace_char('\\', '/');
 	if (f.is_empty()) {
 		return filesystem;
 	}
@@ -1984,7 +2004,7 @@ EditorFileSystemDirectory *EditorFileSystem::get_filesystem_path(const String &p
 
 	Vector<String> path = f.split("/");
 
-	if (path.size() == 0) {
+	if (path.is_empty()) {
 		return nullptr;
 	}
 
@@ -2171,6 +2191,7 @@ void EditorFileSystem::_update_script_documentation() {
 
 		if (!efd || index < 0) {
 			// The file was removed
+			EditorHelp::remove_script_doc_by_path(path);
 			continue;
 		}
 
@@ -2188,7 +2209,7 @@ void EditorFileSystem::_update_script_documentation() {
 					scr->reload_from_file();
 				}
 				for (const DocData::ClassDoc &cd : scr->get_documentation()) {
-					EditorHelp::get_doc_data()->add_doc(cd);
+					EditorHelp::add_doc(cd);
 					if (!first_scan) {
 						// Update the documentation in the Script Editor if it is open.
 						ScriptEditor::get_singleton()->update_doc(cd.name);
@@ -2421,7 +2442,7 @@ void EditorFileSystem::update_files(const Vector<String> &p_script_paths) {
 				if (ResourceLoader::should_create_uid_file(file)) {
 					Ref<FileAccess> f = FileAccess::open(file + ".uid", FileAccess::WRITE);
 					if (f.is_valid()) {
-						const ResourceUID::ID id = ResourceUID::get_singleton()->create_id();
+						const ResourceUID::ID id = ResourceUID::get_singleton()->create_id_for_path(file);
 						ResourceUID::get_singleton()->add_id(id, file);
 						f->store_line(ResourceUID::get_singleton()->id_to_text(id));
 						fi->uid = id;
@@ -2609,7 +2630,7 @@ Error EditorFileSystem::_reimport_group(const String &p_group_file, const Vector
 			}
 
 			if (uid == ResourceUID::INVALID_ID) {
-				uid = ResourceUID::get_singleton()->create_id();
+				uid = ResourceUID::get_singleton()->create_id_for_path(file);
 			}
 
 			f->store_line("uid=\"" + ResourceUID::get_singleton()->id_to_text(uid) + "\""); // Store in readable format.
@@ -2799,7 +2820,7 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap<Strin
 
 	if (importer.is_null()) {
 		//not found by name, find by extension
-		importer = ResourceFormatImporter::get_singleton()->get_importer_by_extension(p_file.get_extension());
+		importer = ResourceFormatImporter::get_singleton()->get_importer_by_file(p_file);
 		load_default = true;
 		if (importer.is_null()) {
 			ERR_FAIL_V_MSG(ERR_FILE_CANT_OPEN, "BUG: File queued for import, but can't be imported, importer for type '" + importer_name + "' not found.");
@@ -2824,16 +2845,14 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap<Strin
 	if (load_default && ProjectSettings::get_singleton()->has_setting("importer_defaults/" + importer->get_importer_name())) {
 		//use defaults if exist
 		Dictionary d = GLOBAL_GET("importer_defaults/" + importer->get_importer_name());
-		List<Variant> v;
-		d.get_key_list(&v);
 
-		for (const Variant &E : v) {
-			params[E] = d[E];
+		for (const KeyValue<Variant, Variant> &kv : d) {
+			params[kv.key] = kv.value;
 		}
 	}
 
 	if (uid == ResourceUID::INVALID_ID) {
-		uid = ResourceUID::get_singleton()->create_id();
+		uid = ResourceUID::get_singleton()->create_id_for_path(p_file);
 	}
 
 	//finally, perform import!!
@@ -3093,7 +3112,7 @@ void EditorFileSystem::_queue_refresh_filesystem() {
 
 void EditorFileSystem::_refresh_filesystem() {
 	for (const ObjectID &id : folders_to_sort) {
-		EditorFileSystemDirectory *dir = Object::cast_to<EditorFileSystemDirectory>(ObjectDB::get_instance(id));
+		EditorFileSystemDirectory *dir = ObjectDB::get_instance<EditorFileSystemDirectory>(id);
 		if (dir) {
 			dir->subdirs.sort_custom<DirectoryComparator>();
 		}
@@ -3107,8 +3126,11 @@ void EditorFileSystem::_refresh_filesystem() {
 }
 
 void EditorFileSystem::_reimport_thread(uint32_t p_index, ImportThreadData *p_import_data) {
+	ResourceLoader::set_is_import_thread(true);
 	int file_idx = p_import_data->reimport_from + int(p_index);
 	_reimport_file(p_import_data->reimport_files[file_idx].path);
+	ResourceLoader::set_is_import_thread(false);
+
 	p_import_data->imported_sem->post();
 }
 
@@ -3437,7 +3459,7 @@ Error EditorFileSystem::make_dir_recursive(const String &p_path, const String &p
 	ERR_FAIL_NULL_V(parent, ERR_FILE_NOT_FOUND);
 	folders_to_sort.insert(parent->get_instance_id());
 
-	const PackedStringArray folders = p_path.trim_prefix(path).trim_suffix("/").split("/");
+	const PackedStringArray folders = p_path.trim_prefix(path).split("/", false);
 	for (const String &folder : folders) {
 		const int current = parent->find_dir_index(folder);
 		if (current > -1) {
@@ -3519,14 +3541,14 @@ ResourceUID::ID EditorFileSystem::_resource_saver_get_resource_id_for_path(const
 		}
 
 		if (p_generate) {
-			return ResourceUID::get_singleton()->create_id(); // Just create a new one, we will be notified of save anyway and fetch the right UID at that time, to keep things simple.
+			return ResourceUID::get_singleton()->create_id_for_path(p_path); // Just create a new one, we will be notified of save anyway and fetch the right UID at that time, to keep things simple.
 		} else {
 			return ResourceUID::INVALID_ID;
 		}
 	} else if (fs->files[cpos]->uid != ResourceUID::INVALID_ID) {
 		return fs->files[cpos]->uid;
 	} else if (p_generate) {
-		return ResourceUID::get_singleton()->create_id(); // Just create a new one, we will be notified of save anyway and fetch the right UID at that time, to keep things simple.
+		return ResourceUID::get_singleton()->create_id_for_path(p_path); // Just create a new one, we will be notified of save anyway and fetch the right UID at that time, to keep things simple.
 	} else {
 		return ResourceUID::INVALID_ID;
 	}
@@ -3604,10 +3626,20 @@ void EditorFileSystem::_update_extensions() {
 	extensionsl.clear();
 	ResourceFormatImporter::get_singleton()->get_recognized_extensions(&extensionsl);
 	for (const String &E : extensionsl) {
-		import_extensions.insert(E);
+		import_extensions.insert(!E.begins_with(".") ? "." + E : E);
 	}
 }
 
+bool EditorFileSystem::_can_import_file(const String &p_file) {
+	for (const String &F : import_extensions) {
+		if (p_file.right(F.length()).nocasecmp_to(F) == 0) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 void EditorFileSystem::add_import_format_support_query(Ref<EditorFileSystemImportFormatSupportQuery> p_query) {
 	ERR_FAIL_COND(import_support_queries.has(p_query));
 	import_support_queries.push_back(p_query);
diff --git a/engine/editor/editor_file_system.h b/engine/editor/editor_file_system.h
index 2e483a54..253d2868 100644
--- a/engine/editor/editor_file_system.h
+++ b/engine/editor/editor_file_system.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_FILE_SYSTEM_H
-#define EDITOR_FILE_SYSTEM_H
+#pragma once
 
 #include "core/io/dir_access.h"
 #include "core/io/resource_importer.h"
@@ -280,6 +279,7 @@ class EditorFileSystem : public Node {
 
 	bool _test_for_reimport(const String &p_path, const String &p_expected_import_md5);
 	bool _is_test_for_reimport_needed(const String &p_path, uint64_t p_last_modification_time, uint64_t p_modification_time, uint64_t p_last_import_modification_time, uint64_t p_import_modification_time, const Vector<String> &p_import_dest_paths);
+	bool _can_import_file(const String &p_path);
 	Vector<String> _get_import_dest_paths(const String &p_path);
 
 	bool reimport_on_missing_imported_files;
@@ -424,5 +424,3 @@ public:
 	EditorFileSystem();
 	~EditorFileSystem();
 };
-
-#endif // EDITOR_FILE_SYSTEM_H
diff --git a/engine/editor/editor_folding.cpp b/engine/editor/editor_folding.cpp
index 5cb38fa8..42e54a24 100644
--- a/engine/editor/editor_folding.cpp
+++ b/engine/editor/editor_folding.cpp
@@ -65,7 +65,7 @@ void EditorFolding::_set_unfolds(Object *p_object, const Vector<String> &p_unfol
 	const String *r = p_unfolds.ptr();
 	p_object->editor_clear_section_folding();
 	for (int i = 0; i < uc; i++) {
-		p_object->editor_set_section_unfold(r[i], true);
+		p_object->editor_set_section_unfold(r[i], true, true);
 	}
 }
 
@@ -294,6 +294,3 @@ void EditorFolding::unfold_scene(Node *p_scene) {
 	HashSet<Ref<Resource>> resources;
 	_do_node_unfolds(p_scene, p_scene, resources);
 }
-
-EditorFolding::EditorFolding() {
-}
diff --git a/engine/editor/editor_folding.h b/engine/editor/editor_folding.h
index f3c2743b..cc41dbd7 100644
--- a/engine/editor/editor_folding.h
+++ b/engine/editor/editor_folding.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_FOLDING_H
-#define EDITOR_FOLDING_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -52,8 +51,4 @@ public:
 	void unfold_scene(Node *p_scene);
 
 	bool has_folding_data(const String &p_path);
-
-	EditorFolding();
 };
-
-#endif // EDITOR_FOLDING_H
diff --git a/engine/editor/editor_help.cpp b/engine/editor/editor_help.cpp
index 0b6e8177..aebe0b40 100644
--- a/engine/editor/editor_help.cpp
+++ b/engine/editor/editor_help.cpp
@@ -38,8 +38,9 @@
 #include "core/object/script_language.h"
 #include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
-#include "core/version_generated.gen.h"
+#include "core/version.h"
 #include "editor/doc_data_compressed.gen.h"
+#include "editor/editor_file_system.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_paths.h"
@@ -66,7 +67,7 @@
 #include "modules/mono/csharp_script.h"
 #endif
 
-#define CONTRIBUTE_URL vformat("%s/contributing/documentation/updating_the_class_reference.html", VERSION_DOCS_URL)
+#define CONTRIBUTE_URL vformat("%s/contributing/documentation/updating_the_class_reference.html", GODOT_VERSION_DOCS_URL)
 
 #ifdef MODULE_MONO_ENABLED
 // Sync with the types mentioned in https://docs.godotengine.org/en/stable/tutorials/scripting/c_sharp/c_sharp_differences.html
@@ -102,7 +103,8 @@ const Vector<String> classes_with_csharp_differences = {
 };
 #endif
 
-static const String nbsp = String::chr(160);
+static const char32_t nbsp_chr = 160;
+static const String nbsp = String::chr(nbsp_chr);
 static const String nbsp_equal_nbsp = nbsp + "=" + nbsp;
 static const String colon_nbsp = ":" + nbsp;
 
@@ -120,7 +122,7 @@ const Vector<String> packed_array_types = {
 };
 
 static String _replace_nbsp_with_space(const String &p_string) {
-	return p_string.replace(nbsp, " ");
+	return p_string.replace_char(nbsp_chr, ' ');
 }
 
 static String _fix_constant(const String &p_constant) {
@@ -192,37 +194,6 @@ static String _contextualize_class_specifier(const String &p_class_specifier, co
 
 /// EditorHelp ///
 
-// TODO: This is sometimes used directly as `doc->something`, other times as `EditorHelp::get_doc_data()`, which is thread-safe.
-// Might this be a problem?
-DocTools *EditorHelp::doc = nullptr;
-DocTools *EditorHelp::ext_doc = nullptr;
-
-int EditorHelp::doc_generation_count = 0;
-String EditorHelp::doc_version_hash;
-Thread EditorHelp::worker_thread;
-
-static bool _attempt_doc_load(const String &p_class) {
-	// Docgen always happens in the outer-most class: it also generates docs for inner classes.
-	const String outer_class = p_class.get_slicec('.', 0);
-	if (!ScriptServer::is_global_class(outer_class)) {
-		return false;
-	}
-
-	// `ResourceLoader` is used in order to have a script-agnostic way to load scripts.
-	// This forces GDScript to compile the code, which is unnecessary for docgen, but it's a good compromise right now.
-	const Ref<Script> script = ResourceLoader::load(ScriptServer::get_global_class_path(outer_class), outer_class);
-	if (script.is_valid()) {
-		const Vector<DocData::ClassDoc> docs = script->get_documentation();
-		for (int j = 0; j < docs.size(); j++) {
-			const DocData::ClassDoc &doc = docs.get(j);
-			EditorHelp::get_doc_data()->add_doc(doc);
-		}
-		return true;
-	}
-
-	return false;
-}
-
 void EditorHelp::_update_theme_item_cache() {
 	VBoxContainer::_update_theme_item_cache();
 
@@ -705,8 +676,7 @@ void EditorHelp::_pop_code_font() {
 }
 
 Error EditorHelp::_goto_desc(const String &p_class) {
-	// If class doesn't have docs listed, attempt on-demand docgen
-	if (!doc->class_list.has(p_class) && !_attempt_doc_load(p_class)) {
+	if (!doc->class_list.has(p_class)) {
 		return ERR_DOES_NOT_EXIST;
 	}
 
@@ -1127,7 +1097,7 @@ void EditorHelp::_update_doc() {
 		class_desc->add_newline();
 		class_desc->add_newline();
 
-		const String &csharp_differences_url = vformat("%s/tutorials/scripting/c_sharp/c_sharp_differences.html", VERSION_DOCS_URL);
+		const String &csharp_differences_url = vformat("%s/tutorials/scripting/c_sharp/c_sharp_differences.html", GODOT_VERSION_DOCS_URL);
 
 		class_desc->push_indent(1);
 		_push_normal_font();
@@ -1704,8 +1674,8 @@ void EditorHelp::_update_doc() {
 
 			for (KeyValue<String, Vector<DocData::ConstantDoc>> &E : enums) {
 				String key = E.key;
-				if ((key.get_slice_count(".") > 1) && (key.get_slice(".", 0) == edited_class)) {
-					key = key.get_slice(".", 1);
+				if ((key.get_slice_count(".") > 1) && (key.get_slicec('.', 0) == edited_class)) {
+					key = key.get_slicec('.', 1);
 				}
 				if (cd.enums.has(key)) {
 					const bool is_documented = cd.enums[key].is_deprecated || cd.enums[key].is_experimental || !cd.enums[key].description.strip_edges().is_empty();
@@ -1906,7 +1876,7 @@ void EditorHelp::_update_doc() {
 				_push_code_font();
 
 				if (constant.value.begins_with("Color(") && constant.value.ends_with(")")) {
-					String stripped = constant.value.replace(" ", "").replace("Color(", "").replace(")", "");
+					String stripped = constant.value.remove_char(' ').replace("Color(", "").remove_char(')');
 					PackedFloat64Array color = stripped.split_floats(",");
 					if (color.size() >= 3) {
 						class_desc->push_color(Color(color[0], color[1], color[2]));
@@ -2334,11 +2304,11 @@ void EditorHelp::_request_help(const String &p_string) {
 }
 
 void EditorHelp::_help_callback(const String &p_topic) {
-	String what = p_topic.get_slice(":", 0);
-	String clss = p_topic.get_slice(":", 1);
+	String what = p_topic.get_slicec(':', 0);
+	String clss = p_topic.get_slicec(':', 1);
 	String name;
 	if (p_topic.get_slice_count(":") == 3) {
-		name = p_topic.get_slice(":", 2);
+		name = p_topic.get_slicec(':', 2);
 	}
 
 	_request_help(clss); // First go to class.
@@ -2403,12 +2373,10 @@ void EditorHelp::_help_callback(const String &p_topic) {
 }
 
 static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const Control *p_owner_node, const String &p_class) {
-	const DocTools *doc = EditorHelp::get_doc_data();
-
 	bool is_native = false;
 	{
-		const HashMap<String, DocData::ClassDoc>::ConstIterator E = doc->class_list.find(p_class);
-		if (E && !E->value.is_script_doc) {
+		const DocData::ClassDoc *E = EditorHelp::get_doc(p_class);
+		if (E && !E->is_script_doc) {
 			is_native = true;
 		}
 	}
@@ -2439,7 +2407,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 	const Color kbd_bg_color = p_owner_node->get_theme_color(SNAME("kbd_bg_color"), SNAME("EditorHelp"));
 	const Color param_bg_color = p_owner_node->get_theme_color(SNAME("param_bg_color"), SNAME("EditorHelp"));
 
-	String bbcode = p_bbcode.dedent().replace("\t", "").replace("\r", "").strip_edges();
+	String bbcode = p_bbcode.dedent().remove_chars("\t\r").strip_edges();
 
 	// Select the correct code examples.
 	switch ((int)EDITOR_GET("text_editor/help/class_reference_examples")) {
@@ -2517,7 +2485,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 		int brk_end = bbcode.find_char(']', brk_pos + 1);
 
 		if (brk_end == -1) {
-			p_rt->add_text(bbcode.substr(brk_pos, bbcode.length() - brk_pos).replace("\n", "\n\n"));
+			p_rt->add_text(bbcode.substr(brk_pos).replace("\n", "\n\n"));
 			break;
 		}
 
@@ -2622,7 +2590,7 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt, const C
 			p_rt->pop(); // font
 
 			pos = brk_end + 1;
-		} else if (doc->class_list.has(tag)) {
+		} else if (EditorHelp::has_doc(tag)) {
 			// Use a monospace font for class reference tags such as [Node2D] or [SceneTree].
 
 			p_rt->push_font(doc_code_font);
@@ -2902,9 +2870,9 @@ void EditorHelp::_add_text(const String &p_bbcode) {
 	_add_text_to_rt(p_bbcode, class_desc, this, edited_class);
 }
 
-void EditorHelp::_wait_for_thread() {
-	if (worker_thread.is_started()) {
-		worker_thread.wait_to_finish();
+void EditorHelp::_wait_for_thread(Thread &p_thread) {
+	if (p_thread.is_started()) {
+		p_thread.wait_to_finish();
 	}
 }
 
@@ -2914,7 +2882,53 @@ void EditorHelp::_compute_doc_version_hash() {
 }
 
 String EditorHelp::get_cache_full_path() {
-	return EditorPaths::get_singleton()->get_cache_dir().path_join(vformat("editor_doc_cache-%d.%d.res", VERSION_MAJOR, VERSION_MINOR));
+	return EditorPaths::get_singleton()->get_cache_dir().path_join(vformat("editor_doc_cache-%d.%d.res", GODOT_VERSION_MAJOR, GODOT_VERSION_MINOR));
+}
+
+String EditorHelp::get_script_doc_cache_full_path() {
+	return EditorPaths::get_singleton()->get_project_settings_dir().path_join("editor_script_doc_cache.res");
+}
+
+DocTools *EditorHelp::get_doc_data() {
+	_wait_for_thread();
+	return doc;
+}
+
+bool EditorHelp::has_doc(const String &p_class_name) {
+	return get_doc(p_class_name) != nullptr;
+}
+
+DocData::ClassDoc *EditorHelp::get_doc(const String &p_class_name) {
+	return get_doc_data()->class_list.getptr(p_class_name);
+}
+
+void EditorHelp::add_doc(const DocData::ClassDoc &p_class_doc) {
+	if (!_script_docs_loaded.is_set()) {
+		_docs_to_add.push_back(p_class_doc);
+		return;
+	}
+
+	get_doc_data()->add_doc(p_class_doc);
+}
+
+void EditorHelp::remove_doc(const String &p_class_name) {
+	if (!_script_docs_loaded.is_set()) {
+		_docs_to_remove.push_back(p_class_name);
+		return;
+	}
+
+	DocTools *dt = get_doc_data();
+	if (dt->has_doc(p_class_name)) {
+		dt->remove_doc(p_class_name);
+	}
+}
+
+void EditorHelp::remove_script_doc_by_path(const String &p_path) {
+	if (!_script_docs_loaded.is_set()) {
+		_docs_to_remove_by_path.push_back(p_path);
+		return;
+	}
+	get_doc_data()->remove_script_doc_by_path(p_path);
 }
 
 void EditorHelp::load_xml_buffer(const uint8_t *p_buffer, int p_size) {
@@ -2935,23 +2949,26 @@ void EditorHelp::remove_class(const String &p_class) {
 	}
 
 	if (doc && doc->has_doc(p_class)) {
-		doc->remove_doc(p_class);
+		remove_doc(p_class);
 	}
 }
 
 void EditorHelp::_load_doc_thread(void *p_udata) {
+	bool use_script_cache = (bool)p_udata;
 	Ref<Resource> cache_res = ResourceLoader::load(get_cache_full_path());
 	if (cache_res.is_valid() && cache_res->get_meta("version_hash", "") == doc_version_hash) {
 		Array classes = cache_res->get_meta("classes", Array());
 		for (int i = 0; i < classes.size(); i++) {
 			doc->add_doc(DocData::ClassDoc::from_dict(classes[i]));
 		}
-
+		if (use_script_cache) {
+			callable_mp_static(&EditorHelp::load_script_doc_cache).call_deferred();
+		}
 		// Extensions' docs are not cached. Generate them now (on the main thread).
 		callable_mp_static(&EditorHelp::_gen_extensions_docs).call_deferred();
 	} else {
 		// We have to go back to the main thread to start from scratch, bypassing any possibly existing cache.
-		callable_mp_static(&EditorHelp::generate_doc).call_deferred(false);
+		callable_mp_static(&EditorHelp::generate_doc).call_deferred(false, use_script_cache);
 	}
 
 	OS::get_singleton()->benchmark_end_measure("EditorHelp", vformat("Generate Documentation (Run %d)", doc_generation_count));
@@ -2981,6 +2998,12 @@ void EditorHelp::_gen_doc_thread(void *p_udata) {
 		ERR_PRINT("Cannot save editor help cache (" + get_cache_full_path() + ").");
 	}
 
+	// Load script docs after native ones are cached so native cache doesn't contain script docs.
+	bool use_script_cache = (bool)p_udata;
+	if (use_script_cache) {
+		callable_mp_static(&EditorHelp::load_script_doc_cache).call_deferred();
+	}
+
 	OS::get_singleton()->benchmark_end_measure("EditorHelp", vformat("Generate Documentation (Run %d)", doc_generation_count));
 }
 
@@ -2992,8 +3015,166 @@ void EditorHelp::_gen_extensions_docs() {
 		doc->merge_from(*ext_doc);
 	}
 }
+static void _load_script_doc_cache(bool p_changes) {
+	EditorHelp::load_script_doc_cache();
+}
 
-void EditorHelp::generate_doc(bool p_use_cache) {
+void EditorHelp::load_script_doc_cache() {
+	if (!ProjectSettings::get_singleton()->is_project_loaded()) {
+		print_verbose("Skipping loading script doc cache since no project is open.");
+		return;
+	}
+
+	_wait_for_thread();
+
+	if (!ResourceLoader::exists(get_script_doc_cache_full_path())) {
+		print_verbose("Script documentation cache not found. Regenerating it may take a while for projects with many scripts.");
+		regenerate_script_doc_cache();
+		return;
+	}
+
+	if (EditorFileSystem::get_singleton()->is_scanning()) {
+		// This is assuming EditorFileSystem is performing first scan. We must wait until it is done.
+		EditorFileSystem::get_singleton()->connect(SNAME("sources_changed"), callable_mp_static(_load_script_doc_cache), CONNECT_ONE_SHOT);
+		return;
+	}
+
+	worker_thread.start(_load_script_doc_cache_thread, nullptr);
+}
+
+void EditorHelp::_process_postponed_docs() {
+	for (const String &class_name : _docs_to_remove) {
+		doc->remove_doc(class_name);
+	}
+	for (const String &path : _docs_to_remove_by_path) {
+		doc->remove_script_doc_by_path(path);
+	}
+	for (const DocData::ClassDoc &cd : _docs_to_add) {
+		doc->add_doc(cd);
+	}
+	_docs_to_add.clear();
+	_docs_to_remove.clear();
+	_docs_to_remove_by_path.clear();
+}
+
+void EditorHelp::_load_script_doc_cache_thread(void *p_udata) {
+	ERR_FAIL_COND_MSG(!ProjectSettings::get_singleton()->is_project_loaded(), "Error: cannot load script doc cache without a project.");
+	ERR_FAIL_COND_MSG(!ResourceLoader::exists(get_script_doc_cache_full_path()), "Error: cannot load script doc cache from inexistent file.");
+
+	Ref<Resource> script_doc_cache_res = ResourceLoader::load(get_script_doc_cache_full_path(), "", ResourceFormatLoader::CACHE_MODE_IGNORE);
+	if (script_doc_cache_res.is_null()) {
+		print_verbose("Script doc cache is corrupted. Regenerating it instead.");
+		_delete_script_doc_cache();
+		callable_mp_static(EditorHelp::regenerate_script_doc_cache).call_deferred();
+		return;
+	}
+
+	Array classes = script_doc_cache_res->get_meta("classes", Array());
+	for (const Dictionary dict : classes) {
+		doc->add_doc(DocData::ClassDoc::from_dict(dict));
+	}
+
+	// Protect from race condition in other threads reading / this thread writing to _docs_to_add/remove/etc.
+	_script_docs_loaded.set();
+
+	// Deal with docs likely added from EditorFileSystem's scans while the cache was loading in EditorHelp::worker_thread.
+	_process_postponed_docs();
+
+	// Always delete the doc cache after successful load since most uses of editor will change a script, invalidating cache.
+	_delete_script_doc_cache();
+}
+
+// Helper method to deal with "sources_changed" signal having a parameter.
+static void _regenerate_script_doc_cache(bool p_changes) {
+	EditorHelp::regenerate_script_doc_cache();
+}
+
+void EditorHelp::regenerate_script_doc_cache() {
+	if (EditorFileSystem::get_singleton()->is_scanning()) {
+		// Wait until EditorFileSystem scanning is complete to use updated filesystem structure.
+		EditorFileSystem::get_singleton()->connect(SNAME("sources_changed"), callable_mp_static(_regenerate_script_doc_cache), CONNECT_ONE_SHOT);
+		return;
+	}
+
+	_wait_for_thread(worker_thread);
+	_wait_for_thread(loader_thread);
+	loader_thread.start(_regen_script_doc_thread, EditorFileSystem::get_singleton()->get_filesystem());
+}
+
+// Runs on worker_thread since it writes to DocData.
+void EditorHelp::_finish_regen_script_doc_thread(void *p_udata) {
+	loader_thread.wait_to_finish();
+	_process_postponed_docs();
+	_script_docs_loaded.set();
+
+	OS::get_singleton()->benchmark_end_measure("EditorHelp", "Generate Script Documentation");
+}
+
+// Runs on loader_thread since _reload_scripts_documentation calls ResourceLoader::load().
+// Avoids deadlocks of worker_thread needing main thread for load task dispatching, but main thread waiting on worker_thread.
+void EditorHelp::_regen_script_doc_thread(void *p_udata) {
+	OS::get_singleton()->benchmark_begin_measure("EditorHelp", "Generate Script Documentation");
+
+	EditorFileSystemDirectory *dir = static_cast<EditorFileSystemDirectory *>(p_udata);
+	_script_docs_loaded.set_to(false);
+
+	// Ignore changes from filesystem scan since script docs will be now.
+	_docs_to_add.clear();
+	_docs_to_remove.clear();
+	_docs_to_remove_by_path.clear();
+
+	_reload_scripts_documentation(dir);
+
+	// All ResourceLoader::load() calls are done, so we can no longer deadlock with main thread.
+	// Switch to back to worker_thread from loader_thread to resynchronize access to DocData.
+	worker_thread.start(_finish_regen_script_doc_thread, nullptr);
+}
+
+void EditorHelp::_reload_scripts_documentation(EditorFileSystemDirectory *p_dir) {
+	// Recursively force compile all scripts, which should generate their documentation.
+	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
+		_reload_scripts_documentation(p_dir->get_subdir(i));
+	}
+
+	for (int i = 0; i < p_dir->get_file_count(); i++) {
+		if (ClassDB::is_parent_class(p_dir->get_file_type(i), SNAME("Script"))) {
+			Ref<Script> scr = ResourceLoader::load(p_dir->get_file_path(i));
+			if (scr.is_valid()) {
+				for (const DocData::ClassDoc &cd : scr->get_documentation()) {
+					_docs_to_add.push_back(cd);
+				}
+			}
+		}
+	}
+}
+
+void EditorHelp::_delete_script_doc_cache() {
+	if (FileAccess::exists(get_script_doc_cache_full_path())) {
+		DirAccess::remove_file_or_error(ProjectSettings::get_singleton()->globalize_path(get_script_doc_cache_full_path()));
+	}
+}
+
+void EditorHelp::save_script_doc_cache() {
+	if (!_script_docs_loaded.is_set()) {
+		print_verbose("Script docs haven't been properly loaded or regenerated, so don't save them to disk.");
+		return;
+	}
+
+	Ref<Resource> cache_res;
+	cache_res.instantiate();
+	Array classes;
+	for (const KeyValue<String, DocData::ClassDoc> &E : doc->class_list) {
+		if (E.value.is_script_doc) {
+			classes.push_back(DocData::ClassDoc::to_dict(E.value));
+		}
+	}
+
+	cache_res->set_meta("classes", classes);
+	Error err = ResourceSaver::save(cache_res, get_script_doc_cache_full_path(), ResourceSaver::FLAG_COMPRESS);
+	ERR_FAIL_COND_MSG(err != OK, vformat("Cannot save script documentation cache in %s.", get_script_doc_cache_full_path()));
+}
+
+void EditorHelp::generate_doc(bool p_use_cache, bool p_use_script_cache) {
 	doc_generation_count++;
 	OS::get_singleton()->benchmark_begin_measure("EditorHelp", vformat("Generate Documentation (Run %d)", doc_generation_count));
 
@@ -3009,17 +3190,17 @@ void EditorHelp::generate_doc(bool p_use_cache) {
 	}
 
 	if (p_use_cache && FileAccess::exists(get_cache_full_path())) {
-		worker_thread.start(_load_doc_thread, nullptr);
+		worker_thread.start(_load_doc_thread, (void *)p_use_script_cache);
 	} else {
 		print_verbose("Regenerating editor help cache");
 		doc->generate();
-		worker_thread.start(_gen_doc_thread, nullptr);
+		worker_thread.start(_gen_doc_thread, (void *)p_use_script_cache);
 	}
 }
 
-void EditorHelp::_toggle_scripts_pressed() {
-	ScriptEditor::get_singleton()->toggle_scripts_panel();
-	update_toggle_scripts_button();
+void EditorHelp::_toggle_files_pressed() {
+	ScriptEditor::get_singleton()->toggle_files_panel();
+	update_toggle_files_button();
 }
 
 void EditorHelp::_notification(int p_what) {
@@ -3053,11 +3234,13 @@ void EditorHelp::_notification(int p_what) {
 			if (is_inside_tree()) {
 				_class_desc_resized(true);
 			}
-			update_toggle_scripts_button();
+			update_toggle_files_button();
 		} break;
 
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_VISIBILITY_CHANGED: {
-			update_toggle_scripts_button();
+			update_toggle_files_button();
 		} break;
 	}
 }
@@ -3126,13 +3309,13 @@ void EditorHelp::set_scroll(int p_scroll) {
 	class_desc->get_v_scroll_bar()->set_value(p_scroll);
 }
 
-void EditorHelp::update_toggle_scripts_button() {
+void EditorHelp::update_toggle_files_button() {
 	if (is_layout_rtl()) {
-		toggle_scripts_button->set_button_icon(get_editor_theme_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? SNAME("Forward") : SNAME("Back")));
+		toggle_files_button->set_button_icon(get_editor_theme_icon(ScriptEditor::get_singleton()->is_files_panel_toggled() ? SNAME("Forward") : SNAME("Back")));
 	} else {
-		toggle_scripts_button->set_button_icon(get_editor_theme_icon(ScriptEditor::get_singleton()->is_scripts_panel_toggled() ? SNAME("Back") : SNAME("Forward")));
+		toggle_files_button->set_button_icon(get_editor_theme_icon(ScriptEditor::get_singleton()->is_files_panel_toggled() ? SNAME("Back") : SNAME("Forward")));
 	}
-	toggle_scripts_button->set_tooltip_text(vformat("%s (%s)", TTR("Toggle Scripts Panel"), ED_GET_SHORTCUT("script_editor/toggle_scripts_panel")->get_as_text()));
+	toggle_files_button->set_tooltip_text(vformat("%s (%s)", TTR("Toggle Files Panel"), ED_GET_SHORTCUT("script_editor/toggle_files_panel")->get_as_text()));
 }
 
 void EditorHelp::_bind_methods() {
@@ -3175,10 +3358,11 @@ EditorHelp::EditorHelp() {
 	status_bar->set_h_size_flags(SIZE_EXPAND_FILL);
 	status_bar->set_custom_minimum_size(Size2(0, 24 * EDSCALE));
 
-	toggle_scripts_button = memnew(Button);
-	toggle_scripts_button->set_flat(true);
-	toggle_scripts_button->connect(SceneStringName(pressed), callable_mp(this, &EditorHelp::_toggle_scripts_pressed));
-	status_bar->add_child(toggle_scripts_button);
+	toggle_files_button = memnew(Button);
+	toggle_files_button->set_accessibility_name(TTRC("Scripts"));
+	toggle_files_button->set_flat(true);
+	toggle_files_button->connect(SceneStringName(pressed), callable_mp(this, &EditorHelp::_toggle_files_pressed));
+	status_bar->add_child(toggle_files_button);
 
 	class_desc->set_selection_enabled(true);
 	class_desc->set_context_menu_enabled(true);
@@ -3187,14 +3371,6 @@ EditorHelp::EditorHelp() {
 	class_desc->hide();
 }
 
-EditorHelp::~EditorHelp() {
-}
-
-DocTools *EditorHelp::get_doc_data() {
-	_wait_for_thread();
-	return doc;
-}
-
 /// EditorHelpBit ///
 
 #define HANDLE_DOC(m_string) ((is_native ? DTR(m_string) : (m_string)).strip_edges())
@@ -3206,13 +3382,13 @@ EditorHelpBit::HelpData EditorHelpBit::_get_class_help_data(const StringName &p_
 
 	HelpData result;
 
-	const HashMap<String, DocData::ClassDoc>::ConstIterator E = EditorHelp::get_doc_data()->class_list.find(p_class_name);
-	if (E) {
+	const DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	if (class_doc) {
 		// Non-native class shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		const String brief_description = HANDLE_DOC(E->value.brief_description);
-		const String long_description = HANDLE_DOC(E->value.description);
+		const String brief_description = HANDLE_DOC(class_doc->brief_description);
+		const String long_description = HANDLE_DOC(class_doc->description);
 
 		if (!brief_description.is_empty()) {
 			result.description += "[b]" + brief_description + "[/b]";
@@ -3223,18 +3399,18 @@ EditorHelpBit::HelpData EditorHelpBit::_get_class_help_data(const StringName &p_
 			}
 			result.description += long_description;
 		}
-		if (E->value.is_deprecated) {
-			if (E->value.deprecated_message.is_empty()) {
+		if (class_doc->is_deprecated) {
+			if (class_doc->deprecated_message.is_empty()) {
 				result.deprecated_message = TTR("This class may be changed or removed in future versions.");
 			} else {
-				result.deprecated_message = HANDLE_DOC(E->value.deprecated_message);
+				result.deprecated_message = HANDLE_DOC(class_doc->deprecated_message);
 			}
 		}
-		if (E->value.is_experimental) {
-			if (E->value.experimental_message.is_empty()) {
+		if (class_doc->is_experimental) {
+			if (class_doc->experimental_message.is_empty()) {
 				result.experimental_message = TTR("This class may be changed or removed in future versions.");
 			} else {
-				result.experimental_message = HANDLE_DOC(E->value.experimental_message);
+				result.experimental_message = HANDLE_DOC(class_doc->experimental_message);
 			}
 		}
 
@@ -3253,13 +3429,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_enum_help_data(const StringName &p_c
 
 	HelpData result;
 
-	const DocTools *dd = EditorHelp::get_doc_data();
-	const HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
-	if (E) {
+	const DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	if (class_doc) {
 		// Non-native enums shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		for (const KeyValue<String, DocData::EnumDoc> &kv : E->value.enums) {
+		for (const KeyValue<String, DocData::EnumDoc> &kv : class_doc->enums) {
 			const StringName enum_name = kv.key;
 			const DocData::EnumDoc &enum_doc = kv.value;
 
@@ -3304,13 +3479,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_constant_help_data(const StringName
 
 	HelpData result;
 
-	const DocTools *dd = EditorHelp::get_doc_data();
-	const HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
-	if (E) {
+	const DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	if (class_doc) {
 		// Non-native constants shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		for (const DocData::ConstantDoc &constant : E->value.constants) {
+		for (const DocData::ConstantDoc &constant : class_doc->constants) {
 			HelpData current;
 			current.description = HANDLE_DOC(constant.description);
 			if (constant.is_deprecated) {
@@ -3356,13 +3530,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_property_help_data(const StringName
 
 	HelpData result;
 
-	const DocTools *dd = EditorHelp::get_doc_data();
-	const HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
-	if (E) {
+	const DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	if (class_doc) {
 		// Non-native properties shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		for (const DocData::PropertyDoc &property : E->value.properties) {
+		for (const DocData::PropertyDoc &property : class_doc->properties) {
 			HelpData current;
 			current.description = HANDLE_DOC(property.description);
 			if (property.is_deprecated) {
@@ -3397,10 +3570,10 @@ EditorHelpBit::HelpData EditorHelpBit::_get_property_help_data(const StringName
 
 			if (!enum_class_name.is_empty() && !enum_name.is_empty()) {
 				// Classes can use enums from other classes, so check from which it came.
-				const HashMap<String, DocData::ClassDoc>::ConstIterator enum_class = dd->class_list.find(enum_class_name);
+				const DocData::ClassDoc *enum_class = EditorHelp::get_doc(enum_class_name);
 				if (enum_class) {
 					const String enum_prefix = EditorPropertyNameProcessor::get_singleton()->process_name(enum_name, EditorPropertyNameProcessor::STYLE_CAPITALIZED) + " ";
-					for (DocData::ConstantDoc constant : enum_class->value.constants) {
+					for (DocData::ConstantDoc constant : enum_class->constants) {
 						// Don't display `_MAX` enum value descriptions, as these are never exposed in the inspector.
 						if (constant.enumeration == enum_name && !constant.name.ends_with("_MAX")) {
 							// Prettify the enum value display, so that "<ENUM_NAME>_<ITEM>" becomes "Item".
@@ -3441,13 +3614,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_theme_item_help_data(const StringNam
 	HelpData result;
 
 	bool found = false;
-	const DocTools *dd = EditorHelp::get_doc_data();
-	HashMap<String, DocData::ClassDoc>::ConstIterator E = dd->class_list.find(p_class_name);
-	while (E) {
+	DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	while (class_doc) {
 		// Non-native theme items shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		for (const DocData::ThemeItemDoc &theme_item : E->value.theme_properties) {
+		for (const DocData::ThemeItemDoc &theme_item : class_doc->theme_properties) {
 			HelpData current;
 			current.description = HANDLE_DOC(theme_item.description);
 			if (theme_item.is_deprecated) {
@@ -3481,12 +3653,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_theme_item_help_data(const StringNam
 			}
 		}
 
-		if (found || E->value.inherits.is_empty()) {
+		if (found || class_doc->inherits.is_empty()) {
 			break;
 		}
 
 		// Check for inherited theme items.
-		E = dd->class_list.find(E->value.inherits);
+		class_doc = EditorHelp::get_doc(class_doc->inherits);
 	}
 
 	return result;
@@ -3499,12 +3671,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_method_help_data(const StringName &p
 
 	HelpData result;
 
-	const HashMap<String, DocData::ClassDoc>::ConstIterator E = EditorHelp::get_doc_data()->class_list.find(p_class_name);
-	if (E) {
+	const DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	if (class_doc) {
 		// Non-native methods shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		for (const DocData::MethodDoc &method : E->value.methods) {
+		for (const DocData::MethodDoc &method : class_doc->methods) {
 			HelpData current;
 			current.description = HANDLE_DOC(method.description);
 			if (method.is_deprecated) {
@@ -3552,12 +3724,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_signal_help_data(const StringName &p
 
 	HelpData result;
 
-	const HashMap<String, DocData::ClassDoc>::ConstIterator E = EditorHelp::get_doc_data()->class_list.find(p_class_name);
-	if (E) {
+	const DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	if (class_doc) {
 		// Non-native signals shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		for (const DocData::MethodDoc &signal : E->value.signals) {
+		for (const DocData::MethodDoc &signal : class_doc->signals) {
 			HelpData current;
 			current.description = HANDLE_DOC(signal.description);
 			if (signal.is_deprecated) {
@@ -3604,12 +3776,12 @@ EditorHelpBit::HelpData EditorHelpBit::_get_annotation_help_data(const StringNam
 
 	HelpData result;
 
-	const HashMap<String, DocData::ClassDoc>::ConstIterator E = EditorHelp::get_doc_data()->class_list.find(p_class_name);
-	if (E) {
+	const DocData::ClassDoc *class_doc = EditorHelp::get_doc(p_class_name);
+	if (class_doc) {
 		// Non-native annotations shouldn't be cached, nor translated.
-		const bool is_native = !E->value.is_script_doc;
+		const bool is_native = !class_doc->is_script_doc;
 
-		for (const DocData::MethodDoc &annotation : E->value.annotations) {
+		for (const DocData::MethodDoc &annotation : class_doc->annotations) {
 			HelpData current;
 			current.description = HANDLE_DOC(annotation.description);
 			if (annotation.is_deprecated) {
@@ -3699,8 +3871,7 @@ void EditorHelpBit::_update_labels() {
 				// Nothing to do.
 			} break;
 			case SYMBOL_HINT_INHERITANCE: {
-				const HashMap<String, DocData::ClassDoc> &class_list = EditorHelp::get_doc_data()->class_list;
-				const DocData::ClassDoc *class_doc = class_list.getptr(symbol_class_name);
+				const DocData::ClassDoc *class_doc = EditorHelp::get_doc(symbol_class_name);
 				String inherits = class_doc ? class_doc->inherits : String();
 
 				if (!inherits.is_empty()) {
@@ -3714,7 +3885,7 @@ void EditorHelpBit::_update_labels() {
 
 						_add_type_to_title({ inherits, String(), false });
 
-						const DocData::ClassDoc *base_class_doc = class_list.getptr(inherits);
+						const DocData::ClassDoc *base_class_doc = EditorHelp::get_doc(inherits);
 						inherits = base_class_doc ? base_class_doc->inherits : String();
 					}
 
@@ -3989,11 +4160,7 @@ void EditorHelpBit::_meta_clicked(const String &p_select) {
 		String path = ProjectSettings::get_singleton()->globalize_path(p_select.trim_prefix("open-file:"));
 		OS::get_singleton()->shell_show_in_file_manager(path, true);
 	} else if (p_select.begins_with("open-res:")) {
-		if (help_data.doc_type.type == "PackedScene") {
-			EditorNode::get_singleton()->load_scene(p_select.trim_prefix("open-res:"));
-		} else {
-			EditorNode::get_singleton()->load_resource(p_select.trim_prefix("open-res:"));
-		}
+		EditorNode::get_singleton()->load_scene_or_resource(p_select.trim_prefix("open-res:"));
 	} else if (p_select.begins_with("show:")) {
 		FileSystemDock::get_singleton()->navigate_to_path(p_select.trim_prefix("show:"));
 	} else if (p_select.begins_with("http:") || p_select.begins_with("https:")) {
@@ -4390,7 +4557,7 @@ void EditorHelpBitTooltip::popup_under_cursor() {
 	// When `FLAG_POPUP` is false, it prevents the editor from losing focus when displaying the tooltip.
 	// This way, clicks and double-clicks are still available outside the tooltip.
 	set_flag(Window::FLAG_POPUP, false);
-	set_flag(Window::FLAG_NO_FOCUS, true);
+	set_flag(Window::FLAG_NO_FOCUS, !is_embedded());
 	popup(r);
 }
 
@@ -4410,7 +4577,6 @@ EditorHelpBitTooltip::EditorHelpBitTooltip(Control *p_target) {
 	set_process_internal(true);
 }
 
-#if defined(MODULE_GDSCRIPT_ENABLED) || defined(MODULE_MONO_ENABLED)
 /// EditorHelpHighlighter ///
 
 EditorHelpHighlighter *EditorHelpHighlighter::singleton = nullptr;
@@ -4576,12 +4742,11 @@ EditorHelpHighlighter::~EditorHelpHighlighter() {
 #endif
 }
 
-#endif // defined(MODULE_GDSCRIPT_ENABLED) || defined(MODULE_MONO_ENABLED)
-
 /// FindBar ///
 
 FindBar::FindBar() {
 	search_text = memnew(LineEdit);
+	search_text->set_accessibility_name(TTRC("Search help"));
 	add_child(search_text);
 	search_text->set_keep_editing_on_text_submit(true);
 	search_text->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
@@ -4594,12 +4759,14 @@ FindBar::FindBar() {
 	matches_label->hide();
 
 	find_prev = memnew(Button);
+	find_prev->set_accessibility_name(TTRC("Find Previous"));
 	find_prev->set_flat(true);
 	add_child(find_prev);
 	find_prev->set_focus_mode(FOCUS_NONE);
 	find_prev->connect(SceneStringName(pressed), callable_mp(this, &FindBar::search_prev));
 
 	find_next = memnew(Button);
+	find_next->set_accessibility_name(TTRC("Find Next"));
 	find_next->set_flat(true);
 	add_child(find_next);
 	find_next->set_focus_mode(FOCUS_NONE);
@@ -4611,6 +4778,7 @@ FindBar::FindBar() {
 
 	hide_button = memnew(TextureButton);
 	add_child(hide_button);
+	hide_button->set_accessibility_name(TTRC("Hide"));
 	hide_button->set_focus_mode(FOCUS_NONE);
 	hide_button->set_ignore_texture_size(true);
 	hide_button->set_stretch_mode(TextureButton::STRETCH_KEEP_CENTERED);
diff --git a/engine/editor/editor_help.h b/engine/editor/editor_help.h
index e1561215..a43acd8f 100644
--- a/engine/editor/editor_help.h
+++ b/engine/editor/editor_help.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_HELP_H
-#define EDITOR_HELP_H
+#pragma once
 
 #include "core/os/thread.h"
 #include "editor/doc_tools.h"
@@ -41,8 +40,6 @@
 #include "scene/gui/text_edit.h"
 #include "scene/main/timer.h"
 
-#include "modules/modules_enabled.gen.h" // For gdscript, mono.
-
 class FindBar : public HBoxContainer {
 	GDCLASS(FindBar, HBoxContainer);
 
@@ -83,6 +80,8 @@ public:
 	FindBar();
 };
 
+class EditorFileSystemDirectory;
+
 class EditorHelp : public VBoxContainer {
 	GDCLASS(EditorHelp, VBoxContainer);
 
@@ -112,14 +111,14 @@ class EditorHelp : public VBoxContainer {
 
 	RichTextLabel *class_desc = nullptr;
 	HSplitContainer *h_split = nullptr;
-	static DocTools *doc;
-	static DocTools *ext_doc;
+	inline static DocTools *doc = nullptr;
+	inline static DocTools *ext_doc = nullptr;
 
 	ConfirmationDialog *search_dialog = nullptr;
 	LineEdit *search = nullptr;
 	FindBar *find_bar = nullptr;
 	HBoxContainer *status_bar = nullptr;
-	Button *toggle_scripts_button = nullptr;
+	Button *toggle_files_button = nullptr;
 
 	String base_path;
 
@@ -186,16 +185,28 @@ class EditorHelp : public VBoxContainer {
 	void _request_help(const String &p_string);
 	void _search(bool p_search_previous = false);
 
-	void _toggle_scripts_pressed();
+	void _toggle_files_pressed();
 
-	static int doc_generation_count;
-	static String doc_version_hash;
-	static Thread worker_thread;
+	inline static int doc_generation_count = 0;
+	inline static String doc_version_hash;
+	inline static Thread worker_thread;
+	inline static Thread loader_thread; // Only load scripts here to avoid deadlocking with main thread.
 
-	static void _wait_for_thread();
+	inline static SafeFlag _script_docs_loaded = SafeFlag(false);
+	inline static LocalVector<DocData::ClassDoc> _docs_to_add;
+	inline static LocalVector<String> _docs_to_remove;
+	inline static LocalVector<String> _docs_to_remove_by_path;
+
+	static void _wait_for_thread(Thread &p_thread = worker_thread);
 	static void _load_doc_thread(void *p_udata);
 	static void _gen_doc_thread(void *p_udata);
 	static void _gen_extensions_docs();
+	static void _process_postponed_docs();
+	static void _load_script_doc_cache_thread(void *p_udata);
+	static void _regen_script_doc_thread(void *p_udata);
+	static void _finish_regen_script_doc_thread(void *p_udata);
+	static void _reload_scripts_documentation(EditorFileSystemDirectory *p_dir);
+	static void _delete_script_doc_cache();
 	static void _compute_doc_version_hash();
 
 	struct PropertyCompare {
@@ -215,10 +226,23 @@ protected:
 	static void _bind_methods();
 
 public:
-	static void generate_doc(bool p_use_cache = true);
-	static DocTools *get_doc_data();
+	static void generate_doc(bool p_use_cache = true, bool p_use_script_cache = true);
 	static void cleanup_doc();
+	static void load_script_doc_cache();
+	static void regenerate_script_doc_cache();
+	static void save_script_doc_cache();
 	static String get_cache_full_path();
+	static String get_script_doc_cache_full_path();
+
+	// Adding scripts to DocData directly may make script doc cache inconsistent. Use methods below when adding script docs.
+	// Usage during startup can also cause deadlocks.
+	static DocTools *get_doc_data();
+	// Method forwarding to underlying DocTools to keep script doc cache consistent.
+	static DocData::ClassDoc *get_doc(const String &p_class_name);
+	static void add_doc(const DocData::ClassDoc &p_class_doc);
+	static void remove_doc(const String &p_class_name);
+	static void remove_script_doc_by_path(const String &p_path);
+	static bool has_doc(const String &p_class_name);
 
 	static void load_xml_buffer(const uint8_t *p_buffer, int p_size);
 	static void remove_class(const String &p_class);
@@ -240,12 +264,11 @@ public:
 	int get_scroll() const;
 	void set_scroll(int p_scroll);
 
-	void update_toggle_scripts_button();
+	void update_toggle_files_button();
 
 	static void init_gdext_pointers();
 
 	EditorHelp();
-	~EditorHelp();
 };
 
 class EditorHelpBit : public VBoxContainer {
@@ -361,7 +384,6 @@ public:
 	EditorHelpBitTooltip(Control *p_target);
 };
 
-#if defined(MODULE_GDSCRIPT_ENABLED) || defined(MODULE_MONO_ENABLED)
 class EditorSyntaxHighlighter;
 
 class EditorHelpHighlighter {
@@ -396,6 +418,3 @@ public:
 	EditorHelpHighlighter();
 	virtual ~EditorHelpHighlighter();
 };
-#endif // defined(MODULE_GDSCRIPT_ENABLED) || defined(MODULE_MONO_ENABLED)
-
-#endif // EDITOR_HELP_H
diff --git a/engine/editor/editor_help_search.cpp b/engine/editor/editor_help_search.cpp
index 3845d4b8..72d87589 100644
--- a/engine/editor/editor_help_search.cpp
+++ b/engine/editor/editor_help_search.cpp
@@ -328,6 +328,7 @@ EditorHelpSearch::EditorHelpSearch() {
 	vbox->add_child(hbox);
 
 	search_box = memnew(LineEdit);
+	search_box->set_accessibility_name(TTRC("Search"));
 	search_box->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	search_box->set_clear_button_enabled(true);
@@ -339,6 +340,7 @@ EditorHelpSearch::EditorHelpSearch() {
 	case_sensitive_button = memnew(Button);
 	case_sensitive_button->set_theme_type_variation(SceneStringName(FlatButton));
 	case_sensitive_button->set_tooltip_text(TTR("Case Sensitive"));
+	case_sensitive_button->set_accessibility_name(TTRC("Case Sensitive"));
 	case_sensitive_button->connect(SceneStringName(pressed), callable_mp(this, &EditorHelpSearch::_update_results));
 	case_sensitive_button->set_toggle_mode(true);
 	case_sensitive_button->set_focus_mode(Control::FOCUS_NONE);
@@ -347,6 +349,7 @@ EditorHelpSearch::EditorHelpSearch() {
 	hierarchy_button = memnew(Button);
 	hierarchy_button->set_theme_type_variation(SceneStringName(FlatButton));
 	hierarchy_button->set_tooltip_text(TTR("Show Hierarchy"));
+	hierarchy_button->set_accessibility_name(TTRC("Show Hierarchy"));
 	hierarchy_button->connect(SceneStringName(pressed), callable_mp(this, &EditorHelpSearch::_update_results));
 	hierarchy_button->set_toggle_mode(true);
 	hierarchy_button->set_pressed(true);
@@ -354,6 +357,7 @@ EditorHelpSearch::EditorHelpSearch() {
 	hbox->add_child(hierarchy_button);
 
 	filter_combo = memnew(OptionButton);
+	filter_combo->set_accessibility_name(TTRC("Filter"));
 	filter_combo->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
 	filter_combo->set_stretch_ratio(0); // Fixed width.
 	filter_combo->add_item(TTR("Display All"), SEARCH_ALL);
@@ -372,6 +376,7 @@ EditorHelpSearch::EditorHelpSearch() {
 
 	// Create the results tree.
 	results_tree = memnew(Tree);
+	results_tree->set_accessibility_name(TTRC("Search Results"));
 	results_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	results_tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	results_tree->set_columns(2);
diff --git a/engine/editor/editor_help_search.h b/engine/editor/editor_help_search.h
index c4492c4b..d62a3197 100644
--- a/engine/editor/editor_help_search.h
+++ b/engine/editor/editor_help_search.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_HELP_SEARCH_H
-#define EDITOR_HELP_SEARCH_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/dialogs.h"
@@ -212,5 +211,3 @@ public:
 
 	Runner(Control *p_icon_service, Tree *p_results_tree, TreeCache *p_tree_cache, const String &p_term, int p_search_flags);
 };
-
-#endif // EDITOR_HELP_SEARCH_H
diff --git a/engine/editor/editor_inspector.cpp b/engine/editor/editor_inspector.cpp
index 58b02ed2..0fbb7493 100644
--- a/engine/editor/editor_inspector.cpp
+++ b/engine/editor/editor_inspector.cpp
@@ -33,6 +33,7 @@
 
 #include "core/os/keyboard.h"
 #include "editor/add_metadata_dialog.h"
+#include "editor/debugger/editor_debugger_inspector.h"
 #include "editor/doc_tools.h"
 #include "editor/editor_feature_profile.h"
 #include "editor/editor_main_screen.h"
@@ -252,6 +253,25 @@ void EditorProperty::emit_changed(const StringName &p_property, const Variant &p
 
 void EditorProperty::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Property: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Property: %s"), label));
+
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &EditorProperty::_accessibility_action_menu));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &EditorProperty::_accessibility_action_click));
+
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_READONLY, read_only);
+			if (checkable) {
+				DisplayServer::get_singleton()->accessibility_update_set_checked(ae, checked);
+			}
+		} break;
+
 		case NOTIFICATION_SORT_CHILDREN: {
 			Size2 size = get_size();
 			Rect2 rect;
@@ -578,6 +598,12 @@ void EditorProperty::_notification(int p_what) {
 			}
 		} break;
 		case NOTIFICATION_ENTER_TREE: {
+			EditorInspector *inspector = get_parent_inspector();
+			if (inspector) {
+				inspector = inspector->get_root_inspector();
+			}
+			set_shortcut_context(inspector);
+
 			if (has_borders) {
 				get_parent()->connect(SceneStringName(theme_changed), callable_mp(this, &EditorProperty::_update_property_bg));
 				_update_property_bg();
@@ -617,6 +643,16 @@ StringName EditorProperty::get_edited_property() const {
 	return property;
 }
 
+Variant EditorProperty::get_edited_property_display_value() const {
+	ERR_FAIL_NULL_V(object, Variant());
+	Control *control = Object::cast_to<Control>(object);
+	if (checkable && !checked && control && String(property).begins_with("theme_override_")) {
+		return control->get_used_theme_item(property);
+	} else {
+		return get_edited_property_value();
+	}
+}
+
 EditorInspector *EditorProperty::get_parent_inspector() const {
 	Node *parent = get_parent();
 	while (parent) {
@@ -769,9 +805,7 @@ bool EditorProperty::use_keying_next() const {
 	List<PropertyInfo> plist;
 	object->get_property_list(&plist, true);
 
-	for (List<PropertyInfo>::Element *I = plist.front(); I; I = I->next()) {
-		PropertyInfo &p = I->get();
-
+	for (const PropertyInfo &p : plist) {
 		if (p.name == property) {
 			return (p.usage & PROPERTY_USAGE_KEYING_INCREMENTS);
 		}
@@ -918,6 +952,9 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
 
 	if (me.is_valid()) {
 		Vector2 mpos = me->get_position();
+		if (bottom_child_rect.has_point(mpos)) {
+			return; // Makes child EditorProperties behave like sibling nodes when handling mouse events.
+		}
 		if (is_layout_rtl()) {
 			mpos.x = get_size().x - mpos.x;
 		}
@@ -1013,6 +1050,22 @@ void EditorProperty::gui_input(const Ref<InputEvent> &p_event) {
 	}
 }
 
+void EditorProperty::_accessibility_action_click(const Variant &p_data) {
+	select();
+	if (checkable) {
+		checked = !checked;
+		queue_redraw();
+		emit_signal(SNAME("property_checked"), property, checked);
+	}
+}
+
+void EditorProperty::_accessibility_action_menu(const Variant &p_data) {
+	_update_popup();
+	menu->set_position(get_screen_position());
+	menu->reset_size();
+	menu->popup();
+}
+
 void EditorProperty::shortcut_input(const Ref<InputEvent> &p_event) {
 	if (!selected || !p_event->is_pressed()) {
 		return;
@@ -1250,6 +1303,19 @@ void EditorProperty::menu_option(int p_option) {
 			emit_signal(SNAME("property_pinned"), property, !pinned);
 			queue_redraw();
 		} break;
+		case MENU_DELETE: {
+			accept_event();
+			emit_signal(SNAME("property_deleted"), property);
+		} break;
+		case MENU_REVERT_VALUE: {
+			accept_event();
+			get_viewport()->gui_release_focus();
+			bool is_valid_revert = false;
+			Variant revert_value = EditorPropertyRevert::get_property_revert_value(object, property, &is_valid_revert);
+			ERR_FAIL_COND(!is_valid_revert);
+			emit_changed(_get_revert_property(), revert_value);
+			update_property();
+		} break;
 		case MENU_OPEN_DOCUMENTATION: {
 			ScriptEditor::get_singleton()->goto_help(doc_path);
 			EditorNode::get_singleton()->get_editor_main_screen()->select(EditorMainScreen::EDITOR_SCRIPT);
@@ -1343,6 +1409,8 @@ void EditorProperty::_bind_methods() {
 }
 
 EditorProperty::EditorProperty() {
+	set_focus_mode(FOCUS_ACCESSIBILITY);
+
 	object = nullptr;
 	split_ratio = 0.5;
 	text_size = 0;
@@ -1377,6 +1445,7 @@ void EditorProperty::_update_popup() {
 			menu->add_icon_item(get_editor_theme_icon(SNAME("Unfavorite")), TTR("Unfavorite Property"), MENU_FAVORITE_PROPERTY);
 			menu->set_item_tooltip(menu->get_item_index(MENU_FAVORITE_PROPERTY), TTR("Make this property be put back at its original place."));
 		} else {
+			// TRANSLATORS: This is a menu item to add a property to the favorites.
 			menu->add_icon_item(get_editor_theme_icon(SNAME("Favorites")), TTR("Favorite Property"), MENU_FAVORITE_PROPERTY);
 			menu->set_item_tooltip(menu->get_item_index(MENU_FAVORITE_PROPERTY), TTR("Make this property be placed at the top for all objects of this class."));
 		}
@@ -1392,7 +1461,15 @@ void EditorProperty::_update_popup() {
 		}
 		menu->set_item_tooltip(menu->get_item_index(MENU_PIN_VALUE), TTR("Pinning a value forces it to be saved even if it's equal to the default."));
 	}
-
+	if (deletable || can_revert) {
+		menu->add_separator();
+		if (deletable) {
+			menu->add_icon_item(get_editor_theme_icon(SNAME("Remove")), TTR("Delete Property"), MENU_PIN_VALUE);
+		}
+		if (can_revert) {
+			menu->add_icon_item(get_editor_theme_icon(SNAME("Reload")), TTR("Revert Value"), MENU_REVERT_VALUE);
+		}
+	}
 	if (!doc_path.is_empty()) {
 		menu->add_separator();
 		menu->add_icon_item(get_editor_theme_icon(SNAME("Help")), TTR("Open Documentation"), MENU_OPEN_DOCUMENTATION);
@@ -1471,6 +1548,19 @@ void EditorInspectorPlugin::_bind_methods() {
 
 void EditorInspectorCategory::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Category: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Category: %s"), label));
+
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &EditorInspectorCategory::_accessibility_action_menu));
+		} break;
+
 		case NOTIFICATION_THEME_CHANGED: {
 			if (menu) {
 				if (is_favorite) {
@@ -1524,6 +1614,22 @@ void EditorInspectorCategory::_notification(int p_what) {
 	}
 }
 
+void EditorInspectorCategory::_accessibility_action_menu(const Variant &p_data) {
+	if (!is_favorite) {
+		if (!menu) {
+			menu = memnew(PopupMenu);
+			menu->add_icon_item(get_editor_theme_icon(SNAME("Help")), TTR("Open Documentation"), MENU_OPEN_DOCS);
+			add_child(menu);
+			menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditorInspectorCategory::_handle_menu_option));
+		}
+		menu->set_item_disabled(menu->get_item_index(MENU_OPEN_DOCS), !EditorHelp::get_doc_data()->class_list.has(doc_class_name));
+	}
+
+	menu->set_position(get_screen_position());
+	menu->reset_size();
+	menu->popup();
+}
+
 Control *EditorInspectorCategory::make_custom_tooltip(const String &p_text) const {
 	// If it's not a doc tooltip, fallback to the default one.
 	if (doc_class_name.is_empty()) {
@@ -1594,6 +1700,10 @@ void EditorInspectorCategory::gui_input(const Ref<InputEvent> &p_event) {
 	menu->popup();
 }
 
+EditorInspectorCategory::EditorInspectorCategory() {
+	set_focus_mode(FOCUS_ACCESSIBILITY);
+}
+
 ////////////////////////////////////////////////
 ////////////////////////////////////////////////
 
@@ -1637,10 +1747,24 @@ int EditorInspectorSection::_get_header_height() {
 
 void EditorInspectorSection::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Section: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Section: %s"), label));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &EditorInspectorSection::_accessibility_action_collapse));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &EditorInspectorSection::_accessibility_action_expand));
+		} break;
+
 		case NOTIFICATION_THEME_CHANGED: {
 			update_minimum_size();
 			bg_color = get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor));
 			bg_color.a /= level;
+			int separation = get_theme_constant(SNAME("v_separation"), SNAME("EditorInspector"));
+			vbox->add_theme_constant_override(SNAME("separation"), separation);
 		} break;
 
 		case NOTIFICATION_SORT_CHILDREN: {
@@ -1864,6 +1988,20 @@ void EditorInspectorSection::gui_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
+	Ref<InputEventKey> k = p_event;
+	if (k.is_valid() && k->is_pressed()) {
+		if (k->is_action("ui_accept", true)) {
+			accept_event();
+
+			bool should_unfold = !object->editor_is_section_unfolded(section);
+			if (should_unfold) {
+				unfold();
+			} else {
+				fold();
+			}
+		}
+	}
+
 	Ref<InputEventMouseButton> mb = p_event;
 	if (mb.is_valid() && mb->is_pressed() && mb->get_button_index() == MouseButton::LEFT) {
 		if (object->editor_is_section_unfolded(section)) {
@@ -1885,6 +2023,15 @@ void EditorInspectorSection::gui_input(const Ref<InputEvent> &p_event) {
 	} else if (mb.is_valid() && !mb->is_pressed()) {
 		queue_redraw();
 	}
+
+	Ref<InputEventMouseMotion> mm = p_event;
+	if (mm.is_valid()) {
+		int header_height = _get_header_height();
+		Vector2 previous = mm->get_position() - mm->get_relative();
+		if ((mm->get_position().y >= header_height) != (previous.y >= header_height)) {
+			queue_redraw();
+		}
+	}
 }
 
 String EditorInspectorSection::get_section() const {
@@ -1895,6 +2042,14 @@ VBoxContainer *EditorInspectorSection::get_vbox() {
 	return vbox;
 }
 
+void EditorInspectorSection::_accessibility_action_collapse(const Variant &p_data) {
+	fold();
+}
+
+void EditorInspectorSection::_accessibility_action_expand(const Variant &p_data) {
+	unfold();
+}
+
 void EditorInspectorSection::unfold() {
 	if (!foldable) {
 		return;
@@ -1926,6 +2081,12 @@ void EditorInspectorSection::set_bg_color(const Color &p_bg_color) {
 	queue_redraw();
 }
 
+void EditorInspectorSection::reset_timer() {
+	if (dropping_for_unfold && !dropping_unfold_timer->is_stopped()) {
+		dropping_unfold_timer->start();
+	}
+}
+
 bool EditorInspectorSection::has_revertable_properties() const {
 	return !revertable_properties.is_empty();
 }
@@ -1950,6 +2111,8 @@ void EditorInspectorSection::_bind_methods() {
 }
 
 EditorInspectorSection::EditorInspectorSection() {
+	set_focus_mode(FOCUS_ACCESSIBILITY);
+
 	vbox = memnew(VBoxContainer);
 
 	dropping_unfold_timer = memnew(Timer);
@@ -2063,6 +2226,18 @@ void EditorInspectorArray::_panel_draw(int p_index) {
 	}
 }
 
+void EditorInspectorArray::_panel_gui_focus(int p_index) {
+	array_elements[p_index].panel->queue_redraw();
+	selected = p_index;
+}
+
+void EditorInspectorArray::_panel_gui_unfocus(int p_index) {
+	array_elements[p_index].panel->queue_redraw();
+	if (selected == p_index) {
+		selected = -1;
+	}
+}
+
 void EditorInspectorArray::_panel_gui_input(Ref<InputEvent> p_event, int p_index) {
 	ERR_FAIL_INDEX(p_index, (int)array_elements.size());
 
@@ -2087,13 +2262,22 @@ void EditorInspectorArray::_panel_gui_input(Ref<InputEvent> p_event, int p_index
 			popup_array_index_pressed = begin_array_index + p_index;
 			rmb_popup->set_item_disabled(OPTION_MOVE_UP, popup_array_index_pressed == 0);
 			rmb_popup->set_item_disabled(OPTION_MOVE_DOWN, popup_array_index_pressed == count - 1);
-			rmb_popup->set_position(get_screen_position() + mb->get_position());
+			rmb_popup->set_position(array_elements[p_index].panel->get_screen_position() + mb->get_position());
 			rmb_popup->reset_size();
 			rmb_popup->popup();
 		}
 	}
 }
 
+void EditorInspectorArray::show_menu(int p_index, const Vector2 &p_offset) {
+	popup_array_index_pressed = begin_array_index + p_index;
+	rmb_popup->set_item_disabled(OPTION_MOVE_UP, popup_array_index_pressed == 0);
+	rmb_popup->set_item_disabled(OPTION_MOVE_DOWN, popup_array_index_pressed == count - 1);
+	rmb_popup->set_position(get_screen_position() + p_offset);
+	rmb_popup->reset_size();
+	rmb_popup->popup();
+}
+
 void EditorInspectorArray::_move_element(int p_element_index, int p_to_pos) {
 	String action_name;
 	if (p_element_index < 0) {
@@ -2193,10 +2377,8 @@ void EditorInspectorArray::_move_element(int p_element_index, int p_to_pos) {
 			undo_redo->add_undo_property(object, count_property, properties_as_array.size());
 			for (int i = 0; i < (int)properties_as_array.size(); i++) {
 				Dictionary d = Dictionary(properties_as_array[i]);
-				Array keys = d.keys();
-				for (int j = 0; j < keys.size(); j++) {
-					String key = keys[j];
-					undo_redo->add_undo_property(object, vformat(key, i), d[key]);
+				for (const KeyValue<Variant, Variant> &kv : d) {
+					undo_redo->add_undo_property(object, vformat(kv.key, i), kv.value);
 				}
 			}
 
@@ -2216,10 +2398,8 @@ void EditorInspectorArray::_move_element(int p_element_index, int p_to_pos) {
 			undo_redo->add_do_property(object, count_property, properties_as_array.size());
 			for (int i = 0; i < (int)properties_as_array.size(); i++) {
 				Dictionary d = properties_as_array[i];
-				Array keys = d.keys();
-				for (int j = 0; j < keys.size(); j++) {
-					String key = keys[j];
-					undo_redo->add_do_property(object, vformat(key, i), d[key]);
+				for (const KeyValue<Variant, Variant> &kv : d) {
+					undo_redo->add_do_property(object, vformat(kv.key, i), kv.value);
 				}
 			}
 		}
@@ -2270,10 +2450,8 @@ void EditorInspectorArray::_clear_array() {
 		undo_redo->add_undo_property(object, count_property, count);
 		for (int i = 0; i < (int)properties_as_array.size(); i++) {
 			Dictionary d = Dictionary(properties_as_array[i]);
-			Array keys = d.keys();
-			for (int j = 0; j < keys.size(); j++) {
-				String key = keys[j];
-				undo_redo->add_undo_property(object, vformat(key, i), d[key]);
+			for (const KeyValue<Variant, Variant> &kv : d) {
+				undo_redo->add_undo_property(object, vformat(kv.key, i), kv.value);
 			}
 		}
 
@@ -2335,10 +2513,8 @@ void EditorInspectorArray::_resize_array(int p_size) {
 			undo_redo->add_undo_property(object, count_property, count);
 			for (int i = count - 1; i > p_size - 1; i--) {
 				Dictionary d = Dictionary(properties_as_array[i]);
-				Array keys = d.keys();
-				for (int j = 0; j < keys.size(); j++) {
-					String key = keys[j];
-					undo_redo->add_undo_property(object, vformat(key, i), d[key]);
+				for (const KeyValue<Variant, Variant> &kv : d) {
+					undo_redo->add_undo_property(object, vformat(kv.key, i), kv.value);
 				}
 			}
 
@@ -2462,16 +2638,20 @@ void EditorInspectorArray::_setup() {
 		ArrayElement &ae = array_elements[i];
 
 		// Panel and its hbox.
-		ae.panel = memnew(PanelContainer);
+		ae.panel = memnew(ArrayPanelContainer);
 		ae.panel->set_focus_mode(FOCUS_ALL);
 		ae.panel->set_mouse_filter(MOUSE_FILTER_PASS);
 		SET_DRAG_FORWARDING_GCD(ae.panel, EditorInspectorArray);
 
 		int element_position = begin_array_index + i;
+		String ae_name = vformat(TTR("Element %d: %s%d*"), element_position, array_element_prefix, element_position);
+
 		ae.panel->set_meta("index", element_position);
-		ae.panel->set_tooltip_text(vformat(TTR("Element %d: %s%d*"), element_position, array_element_prefix, element_position));
-		ae.panel->connect(SceneStringName(focus_entered), callable_mp((CanvasItem *)ae.panel, &PanelContainer::queue_redraw));
-		ae.panel->connect(SceneStringName(focus_exited), callable_mp((CanvasItem *)ae.panel, &PanelContainer::queue_redraw));
+		ae.panel->set_meta("name", ae_name);
+		ae.panel->set_meta("element", this);
+		ae.panel->set_tooltip_text(ae_name);
+		ae.panel->connect(SceneStringName(focus_entered), callable_mp(this, &EditorInspectorArray::_panel_gui_focus).bind(i));
+		ae.panel->connect(SceneStringName(focus_exited), callable_mp(this, &EditorInspectorArray::_panel_gui_unfocus).bind(i));
 		ae.panel->connect(SceneStringName(draw), callable_mp(this, &EditorInspectorArray::_panel_draw).bind(i));
 		ae.panel->connect(SceneStringName(gui_input), callable_mp(this, &EditorInspectorArray::_panel_gui_input).bind(i));
 		ae.panel->add_theme_style_override(SceneStringName(panel), i % 2 ? odd_style : even_style);
@@ -2504,6 +2684,7 @@ void EditorInspectorArray::_setup() {
 
 			if (element_position > 0) {
 				ae.move_up = memnew(Button);
+				ae.move_up->set_accessibility_name(TTRC("Move Up"));
 				ae.move_up->set_button_icon(get_editor_theme_icon(SNAME("MoveUp")));
 				ae.move_up->connect(SceneStringName(pressed), callable_mp(this, &EditorInspectorArray::_move_element).bind(element_position, element_position - 1));
 				move_vbox->add_child(ae.move_up);
@@ -2520,6 +2701,7 @@ void EditorInspectorArray::_setup() {
 
 			if (element_position < count - 1) {
 				ae.move_down = memnew(Button);
+				ae.move_down->set_accessibility_name(TTRC("Move Down"));
 				ae.move_down->set_button_icon(get_editor_theme_icon(SNAME("MoveDown")));
 				ae.move_down->connect(SceneStringName(pressed), callable_mp(this, &EditorInspectorArray::_move_element).bind(element_position, element_position + 2));
 				move_vbox->add_child(ae.move_down);
@@ -2544,6 +2726,7 @@ void EditorInspectorArray::_setup() {
 
 		if (!unresizable) {
 			ae.erase = memnew(Button);
+			ae.erase->set_accessibility_name(TTRC("Remove"));
 			ae.erase->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 			ae.erase->set_v_size_flags(SIZE_SHRINK_CENTER);
 			ae.erase->connect(SceneStringName(pressed), callable_mp(this, &EditorInspectorArray::_remove_item).bind(element_position));
@@ -2584,7 +2767,7 @@ void EditorInspectorArray::drop_data_fw(const Point2 &p_point, const Variant &p_
 	Dictionary dict = p_data;
 
 	int to_drop = dict["index"];
-	int drop_position = _drop_position();
+	int drop_position = (p_point == Vector2(Math::INF, Math::INF)) ? selected : _drop_position();
 	if (drop_position < 0) {
 		return;
 	}
@@ -2602,7 +2785,7 @@ bool EditorInspectorArray::can_drop_data_fw(const Point2 &p_point, const Variant
 		return false;
 	}
 	Dictionary dict = p_data;
-	int drop_position = _drop_position();
+	int drop_position = (p_point == Vector2(Math::INF, Math::INF)) ? selected : _drop_position();
 	if (!dict.has("type") || dict["type"] != "property_array_element" || String(dict["property_array_prefix"]) != array_element_prefix || drop_position < 0) {
 		return false;
 	}
@@ -2614,8 +2797,45 @@ bool EditorInspectorArray::can_drop_data_fw(const Point2 &p_point, const Variant
 	return drop_array_index != moved_array_index && drop_array_index - 1 != moved_array_index;
 }
 
+void ArrayPanelContainer::_accessibility_action_menu(const Variant &p_data) {
+	EditorInspectorArray *el = Object::cast_to<EditorInspectorArray>(get_meta("element"));
+	if (el) {
+		int index = get_meta("index");
+		el->show_menu(index, Vector2());
+	}
+}
+
+void ArrayPanelContainer::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_meta("text"));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, get_meta("text"));
+
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &ArrayPanelContainer::_accessibility_action_menu));
+		} break;
+	}
+}
+
+ArrayPanelContainer::ArrayPanelContainer() {
+	set_focus_mode(FOCUS_ACCESSIBILITY);
+}
+
 void EditorInspectorArray::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, vformat(TTR("Array: %s"), get_label()));
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, vformat(TTR("Array: %s"), get_label()));
+		} break;
+
 		case NOTIFICATION_ENTER_TREE:
 		case NOTIFICATION_THEME_CHANGED: {
 			Color color = get_theme_color(SNAME("dark_color_1"), EditorStringName(Editor));
@@ -2715,12 +2935,11 @@ VBoxContainer *EditorInspectorArray::get_vbox(int p_index) {
 EditorInspectorArray::EditorInspectorArray(bool p_read_only) {
 	read_only = p_read_only;
 
-	set_mouse_filter(Control::MOUSE_FILTER_STOP);
-
 	odd_style.instantiate();
 	even_style.instantiate();
 
 	rmb_popup = memnew(PopupMenu);
+	rmb_popup->set_accessibility_name(TTRC("Move"));
 	rmb_popup->add_item(TTR("Move Up"), OPTION_MOVE_UP);
 	rmb_popup->add_item(TTR("Move Down"), OPTION_MOVE_DOWN);
 	rmb_popup->add_separator();
@@ -2758,6 +2977,7 @@ EditorInspectorArray::EditorInspectorArray(bool p_read_only) {
 	resize_dialog->add_child(resize_dialog_vbox);
 
 	new_size_spin_box = memnew(SpinBox);
+	new_size_spin_box->set_accessibility_name(TTRC("Size"));
 	new_size_spin_box->set_max(16384);
 	new_size_spin_box->connect(SceneStringName(value_changed), callable_mp(this, &EditorInspectorArray::_new_size_spin_box_value_changed));
 	new_size_spin_box->get_line_edit()->connect(SceneStringName(text_submitted), callable_mp(this, &EditorInspectorArray::_new_size_spin_box_text_submitted));
@@ -2833,16 +3053,19 @@ EditorPaginator::EditorPaginator() {
 	set_alignment(ALIGNMENT_CENTER);
 
 	first_page_button = memnew(Button);
+	first_page_button->set_accessibility_name(TTRC("First Page"));
 	first_page_button->set_flat(true);
 	first_page_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPaginator::_first_page_button_pressed));
 	add_child(first_page_button);
 
 	prev_page_button = memnew(Button);
+	prev_page_button->set_accessibility_name(TTRC("Previuos Page"));
 	prev_page_button->set_flat(true);
 	prev_page_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPaginator::_prev_page_button_pressed));
 	add_child(prev_page_button);
 
 	page_line_edit = memnew(LineEdit);
+	page_line_edit->set_accessibility_name(TTRC("Page"));
 	page_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &EditorPaginator::_page_line_edit_text_submitted));
 	page_line_edit->add_theme_constant_override("minimum_character_width", 2);
 	add_child(page_line_edit);
@@ -2851,11 +3074,13 @@ EditorPaginator::EditorPaginator() {
 	add_child(page_count_label);
 
 	next_page_button = memnew(Button);
+	prev_page_button->set_accessibility_name(TTRC("Next Page"));
 	next_page_button->set_flat(true);
 	next_page_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPaginator::_next_page_button_pressed));
 	add_child(next_page_button);
 
 	last_page_button = memnew(Button);
+	last_page_button->set_accessibility_name(TTRC("Last Page"));
 	last_page_button->set_flat(true);
 	last_page_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPaginator::_last_page_button_pressed));
 	add_child(last_page_button);
@@ -2968,7 +3193,7 @@ void EditorInspector::_parse_added_editors(VBoxContainer *current_vbox, EditorIn
 			ep->connect("property_pinned", callable_mp(this, &EditorInspector::_property_pinned));
 			ep->connect("selected", callable_mp(this, &EditorInspector::_property_selected));
 			ep->connect("multiple_properties_changed", callable_mp(this, &EditorInspector::_multiple_properties_changed));
-			ep->connect("resource_selected", callable_mp(this, &EditorInspector::_resource_selected), CONNECT_DEFERRED);
+			ep->connect("resource_selected", callable_mp(get_root_inspector(), &EditorInspector::_resource_selected), CONNECT_DEFERRED);
 			ep->connect("object_id_selected", callable_mp(this, &EditorInspector::_object_id_selected), CONNECT_DEFERRED);
 
 			if (F.properties.size()) {
@@ -3040,15 +3265,21 @@ bool EditorInspector::_is_property_disabled_by_feature_profile(const StringName
 }
 
 void EditorInspector::update_tree() {
+	if (!object) {
+		return;
+	}
+
+	bool root_inspector_was_following_focus = get_root_inspector()->is_following_focus();
+	if (root_inspector_was_following_focus) {
+		// Temporarily disable focus following on the root inspector to avoid jumping while the inspector is updating.
+		get_root_inspector()->set_follow_focus(false);
+	}
+
 	// Store currently selected and focused elements to restore after the update.
 	// TODO: Can be useful to store more context for the focusable, such as the caret position in LineEdit.
 	StringName current_selected = property_selected;
 	int current_focusable = -1;
 
-	// Temporarily disable focus following on the root inspector to avoid jumping while the inspector is updating.
-	bool was_following = get_root_inspector()->is_following_focus();
-	get_root_inspector()->set_follow_focus(false);
-
 	if (property_focusable != -1) {
 		// Check that focusable is actually focusable.
 		bool restore_focus = false;
@@ -3070,14 +3301,9 @@ void EditorInspector::update_tree() {
 		}
 	}
 
-	// Only hide plugins if we are not editing any object.
-	// This should be handled outside of the update_tree call anyway (see EditorInspector::edit), but might as well keep it safe.
-	_clear(!object);
-
-	if (!object) {
-		get_root_inspector()->set_follow_focus(was_following);
-		return;
-	}
+	// The call here is for the edited object that has not changed, but the tree needs to be updated (for example, the object's property list has been modified).
+	// Since the edited object has not changed, there is no need to hide the plugin at this time.
+	_clear(false);
 
 	List<Ref<EditorInspectorPlugin>> valid_plugins;
 
@@ -3132,13 +3358,14 @@ void EditorInspector::update_tree() {
 	Color sscolor = get_theme_color(SNAME("prop_subsection"), EditorStringName(Editor));
 	bool sub_inspectors_enabled = EDITOR_GET("interface/inspector/open_resources_in_current_inspector");
 
-	// Get the lists of editors to add the beginning.
-	for (Ref<EditorInspectorPlugin> &ped : valid_plugins) {
-		ped->parse_begin(object);
-		_parse_added_editors(begin_vbox, nullptr, ped);
-	}
-	if (begin_vbox->get_child_count()) {
+	if (!valid_plugins.is_empty()) {
 		begin_vbox->show();
+
+		// Get the lists of editors to add the beginning.
+		for (Ref<EditorInspectorPlugin> &ped : valid_plugins) {
+			ped->parse_begin(object);
+			_parse_added_editors(begin_vbox, nullptr, ped);
+		}
 	}
 
 	StringName doc_name;
@@ -3440,6 +3667,8 @@ void EditorInspector::update_tree() {
 		// Recreate the category vbox if it was reset.
 		if (category_vbox == nullptr) {
 			category_vbox = memnew(VBoxContainer);
+			int separation = get_theme_constant(SNAME("v_separation"), SNAME("EditorInspector"));
+			category_vbox->add_theme_constant_override(SNAME("separation"), separation);
 			category_vbox->hide();
 			main_vbox->add_child(category_vbox);
 		}
@@ -3467,6 +3696,7 @@ void EditorInspector::update_tree() {
 			if (!vbox_per_path[root_vbox].has(acc_path)) {
 				// If the section does not exists, create it.
 				EditorInspectorSection *section = memnew(EditorInspectorSection);
+				get_root_inspector()->get_v_scroll_bar()->connect(SceneStringName(value_changed), callable_mp(section, &EditorInspectorSection::reset_timer).unbind(1));
 				current_vbox->add_child(section);
 				sections.push_back(section);
 
@@ -3535,9 +3765,9 @@ void EditorInspector::update_tree() {
 			String swap_method;
 			for (int i = (p.type == Variant::NIL ? 1 : 2); i < class_name_components.size(); i++) {
 				if (class_name_components[i].begins_with("page_size") && class_name_components[i].get_slice_count("=") == 2) {
-					page_size = class_name_components[i].get_slice("=", 1).to_int();
+					page_size = class_name_components[i].get_slicec('=', 1).to_int();
 				} else if (class_name_components[i].begins_with("add_button_text") && class_name_components[i].get_slice_count("=") == 2) {
-					add_button_text = class_name_components[i].get_slice("=", 1).strip_edges();
+					add_button_text = class_name_components[i].get_slicec('=', 1).strip_edges();
 				} else if (class_name_components[i] == "static") {
 					movable = false;
 				} else if (class_name_components[i] == "const") {
@@ -3547,7 +3777,7 @@ void EditorInspector::update_tree() {
 				} else if (class_name_components[i] == "unfoldable") {
 					foldable = false;
 				} else if (class_name_components[i].begins_with("swap_method") && class_name_components[i].get_slice_count("=") == 2) {
-					swap_method = class_name_components[i].get_slice("=", 1).strip_edges();
+					swap_method = class_name_components[i].get_slicec('=', 1).strip_edges();
 				}
 			}
 
@@ -3807,7 +4037,7 @@ void EditorInspector::update_tree() {
 				ep->connect("property_pinned", callable_mp(this, &EditorInspector::_property_pinned));
 				ep->connect("selected", callable_mp(this, &EditorInspector::_property_selected));
 				ep->connect("multiple_properties_changed", callable_mp(this, &EditorInspector::_multiple_properties_changed));
-				ep->connect("resource_selected", callable_mp(this, &EditorInspector::_resource_selected), CONNECT_DEFERRED);
+				ep->connect("resource_selected", callable_mp(get_root_inspector(), &EditorInspector::_resource_selected), CONNECT_DEFERRED);
 				ep->connect("object_id_selected", callable_mp(this, &EditorInspector::_object_id_selected), CONNECT_DEFERRED);
 
 				if (use_doc_hints) {
@@ -3867,6 +4097,7 @@ void EditorInspector::update_tree() {
 				}
 
 				EditorInspectorSection *section = memnew(EditorInspectorSection);
+				get_root_inspector()->get_v_scroll_bar()->connect(SceneStringName(value_changed), callable_mp(section, &EditorInspectorSection::reset_timer).unbind(1));
 				favorites_groups_vbox->add_child(section);
 				parent_vbox = section->get_vbox();
 				section->setup("", section_name, object, sscolor, false);
@@ -3886,6 +4117,7 @@ void EditorInspector::update_tree() {
 					}
 
 					EditorInspectorSection *section = memnew(EditorInspectorSection);
+					get_root_inspector()->get_v_scroll_bar()->connect(SceneStringName(value_changed), callable_mp(section, &EditorInspectorSection::reset_timer).unbind(1));
 					vbox->add_child(section);
 					vbox = section->get_vbox();
 					section->setup("", section_name, object, sscolor, false);
@@ -3918,8 +4150,9 @@ void EditorInspector::update_tree() {
 		}
 
 		// Clean up empty sections.
-		for (List<EditorInspectorSection *>::Element *I = sections.back(); I; I = I->prev()) {
+		for (List<EditorInspectorSection *>::Element *I = sections.back(); I;) {
 			EditorInspectorSection *section = I->get();
+			I = I->prev(); // Note: Advance before erasing element.
 			if (section->get_vbox()->get_child_count() == 0) {
 				sections.erase(section);
 				vbox_per_path[main_vbox].erase(section->get_section());
@@ -3954,7 +4187,9 @@ void EditorInspector::update_tree() {
 		EditorNode::get_singleton()->hide_unused_editors();
 	}
 
-	get_root_inspector()->set_follow_focus(was_following);
+	if (root_inspector_was_following_focus) {
+		get_root_inspector()->set_follow_focus(true);
+	}
 }
 
 void EditorInspector::update_property(const String &p_prop) {
@@ -4271,6 +4506,10 @@ void EditorInspector::_edit_set(const String &p_name, const Variant &p_value, bo
 		Object::cast_to<MultiNodeEdit>(object)->set_property_field(p_name, p_value, p_changed_field);
 		_edit_request_change(object, p_name);
 		emit_signal(_prop_edited, p_name);
+	} else if (Object::cast_to<EditorDebuggerRemoteObjects>(object)) {
+		Object::cast_to<EditorDebuggerRemoteObjects>(object)->set_property_field(p_name, p_value, p_changed_field);
+		_edit_request_change(object, p_name);
+		emit_signal(_prop_edited, p_name);
 	} else {
 		undo_redo->create_action(vformat(TTR("Set %s"), p_name), UndoRedo::MERGE_ENDS);
 		undo_redo->add_do_property(object, p_name, p_value);
@@ -4450,13 +4689,26 @@ void EditorInspector::_property_checked(const String &p_path, bool p_checked) {
 			_edit_set(p_path, Variant(), false, "");
 		} else {
 			Variant to_create;
-			List<PropertyInfo> pinfo;
-			object->get_property_list(&pinfo);
-			for (const PropertyInfo &E : pinfo) {
-				if (E.name == p_path) {
-					Callable::CallError ce;
-					Variant::construct(E.type, to_create, nullptr, 0, ce);
-					break;
+			Control *control = Object::cast_to<Control>(object);
+			bool skip = false;
+			if (control && p_path.begins_with("theme_override_")) {
+				to_create = control->get_used_theme_item(p_path);
+				Ref<Resource> resource = to_create;
+				if (resource.is_valid()) {
+					to_create = resource->duplicate();
+				}
+				skip = true;
+			}
+
+			if (!skip) {
+				List<PropertyInfo> pinfo;
+				object->get_property_list(&pinfo);
+				for (const PropertyInfo &E : pinfo) {
+					if (E.name == p_path) {
+						Callable::CallError ce;
+						Variant::construct(E.type, to_create, nullptr, 0, ce);
+						break;
+					}
 				}
 			}
 			_edit_set(p_path, to_create, false, "");
@@ -4528,14 +4780,6 @@ void EditorInspector::_node_removed(Node *p_node) {
 	}
 }
 
-void EditorInspector::_gui_focus_changed(Control *p_control) {
-	if (!is_visible_in_tree() && !is_following_focus()) {
-		return;
-	}
-	// Don't follow focus when the inspector nor any of its children is focused. Prevents potential jumping when gaining focus.
-	set_follow_focus(has_focus() || child_has_focus());
-}
-
 void EditorInspector::_update_current_favorites() {
 	current_favorites.clear();
 	if (!can_favorite) {
@@ -4608,7 +4852,7 @@ void EditorInspector::_set_property_favorited(const String &p_path, bool p_favor
 
 	String theme_property;
 	if (p_path.begins_with("theme_override_")) {
-		theme_property = p_path.get_slice("/", 1);
+		theme_property = p_path.get_slicec('/', 1);
 	}
 
 	while (!validate_name.is_empty()) {
@@ -4712,9 +4956,25 @@ void EditorInspector::_clear_current_favorites() {
 	update_tree();
 }
 
+void EditorInspector::_update_theme() {
+	updating_theme = true;
+	add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
+	updating_theme = false;
+}
+
 void EditorInspector::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			if (property_name_style == EditorPropertyNameProcessor::STYLE_LOCALIZED) {
+				update_tree_pending = true;
+			}
+		} break;
+
 		case NOTIFICATION_THEME_CHANGED: {
+			if (updating_theme) {
+				break;
+			}
+
 			favorites_category->icon = get_editor_theme_icon(SNAME("Favorites"));
 
 			int separation = get_theme_constant(SNAME("v_separation"), SNAME("EditorInspector"));
@@ -4729,14 +4989,15 @@ void EditorInspector::_notification(int p_what) {
 			ERR_FAIL_NULL(EditorFeatureProfileManager::get_singleton());
 			EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &EditorInspector::_feature_profile_changed));
 			set_process(is_visible_in_tree());
-			add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
+			get_parent()->connect(SceneStringName(theme_changed), callable_mp(this, &EditorInspector::_update_theme));
+			_update_theme();
 			if (!is_sub_inspector()) {
 				get_tree()->connect("node_removed", callable_mp(this, &EditorInspector::_node_removed));
 			}
+		} break;
 
-			Viewport *viewport = get_viewport();
-			ERR_FAIL_NULL(viewport);
-			viewport->connect("gui_focus_changed", callable_mp(this, &EditorInspector::_gui_focus_changed));
+		case NOTIFICATION_EXIT_TREE: {
+			get_parent()->disconnect(SceneStringName(theme_changed), callable_mp(this, &EditorInspector::_update_theme));
 		} break;
 
 		case NOTIFICATION_PREDELETE: {
@@ -4798,25 +5059,20 @@ void EditorInspector::_notification(int p_what) {
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			bool needs_update = false;
 			if (!is_sub_inspector() && EditorThemeManager::is_generated_theme_outdated()) {
-				add_theme_style_override(SceneStringName(panel), get_theme_stylebox(SceneStringName(panel), SNAME("Tree")));
+				_update_theme();
 			}
 
 			if (use_settings_name_style && EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/localize_settings")) {
 				EditorPropertyNameProcessor::Style style = EditorPropertyNameProcessor::get_settings_style();
 				if (property_name_style != style) {
 					property_name_style = style;
-					needs_update = true;
+					update_tree_pending = true;
 				}
 			}
 
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/inspector")) {
-				needs_update = true;
-			}
-
-			if (needs_update) {
-				update_tree();
+				update_tree_pending = true;
 			}
 		} break;
 	}
@@ -4975,6 +5231,7 @@ EditorInspector::EditorInspector() {
 	base_vbox->add_child(main_vbox);
 
 	set_horizontal_scroll_mode(SCROLL_MODE_DISABLED);
+	set_follow_focus(true);
 
 	changing = 0;
 	search_box = nullptr;
@@ -5001,4 +5258,5 @@ EditorInspector::EditorInspector() {
 	set_property_name_style(EditorPropertyNameProcessor::get_singleton()->get_settings_style());
 
 	set_draw_focus_border(true);
+	set_scroll_on_drag_hover(true);
 }
diff --git a/engine/editor/editor_inspector.h b/engine/editor/editor_inspector.h
index 9baf6544..14e2d816 100644
--- a/engine/editor/editor_inspector.h
+++ b/engine/editor/editor_inspector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_INSPECTOR_H
-#define EDITOR_INSPECTOR_H
+#pragma once
 
 #include "editor/add_metadata_dialog.h"
 #include "editor_property_name_processor.h"
@@ -67,6 +66,8 @@ public:
 		MENU_COPY_PROPERTY_PATH,
 		MENU_FAVORITE_PROPERTY,
 		MENU_PIN_VALUE,
+		MENU_DELETE,
+		MENU_REVERT_VALUE,
 		MENU_OPEN_DOCUMENTATION,
 	};
 
@@ -159,6 +160,9 @@ protected:
 
 	void _update_property_bg();
 
+	void _accessibility_action_menu(const Variant &p_data);
+	void _accessibility_action_click(const Variant &p_data);
+
 public:
 	void emit_changed(const StringName &p_property, const Variant &p_value, const StringName &p_field = StringName(), bool p_changing = false);
 
@@ -184,6 +188,7 @@ public:
 		ERR_FAIL_NULL_V(object, Variant());
 		return object->get(property);
 	}
+	Variant get_edited_property_display_value() const;
 	EditorInspector *get_parent_inspector() const;
 
 	void set_doc_path(const String &p_doc_path);
@@ -314,11 +319,15 @@ protected:
 	void _notification(int p_what);
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
+	void _accessibility_action_menu(const Variant &p_data);
+
 public:
 	void set_as_favorite(EditorInspector *p_for_inspector);
 
 	virtual Size2 get_minimum_size() const override;
 	virtual Control *make_custom_tooltip(const String &p_text) const override;
+
+	EditorInspectorCategory();
 };
 
 class EditorInspectorSection : public Container {
@@ -349,15 +358,20 @@ protected:
 	static void _bind_methods();
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
+	void _accessibility_action_collapse(const Variant &p_data);
+	void _accessibility_action_expand(const Variant &p_data);
+
 public:
 	virtual Size2 get_minimum_size() const override;
 
 	void setup(const String &p_section, const String &p_label, Object *p_object, const Color &p_bg_color, bool p_foldable, int p_indent_depth = 0, int p_level = 1);
 	String get_section() const;
+	String get_label() const { return label; }
 	VBoxContainer *get_vbox();
 	void unfold();
 	void fold();
 	void set_bg_color(const Color &p_bg_color);
+	void reset_timer();
 
 	bool has_revertable_properties() const;
 	void property_can_revert_changed(const String &p_path, bool p_can_revert);
@@ -366,6 +380,18 @@ public:
 	~EditorInspectorSection();
 };
 
+class ArrayPanelContainer : public PanelContainer {
+	GDCLASS(ArrayPanelContainer, PanelContainer);
+
+protected:
+	void _notification(int p_what);
+
+	void _accessibility_action_menu(const Variant &p_data);
+
+public:
+	ArrayPanelContainer();
+};
+
 class EditorInspectorArray : public EditorInspectorSection {
 	GDCLASS(EditorInspectorArray, EditorInspectorSection);
 
@@ -379,6 +405,7 @@ class EditorInspectorArray : public EditorInspectorSection {
 	String swap_method;
 
 	int count = 0;
+	int selected = -1;
 
 	VBoxContainer *elements_vbox = nullptr;
 
@@ -442,6 +469,8 @@ class EditorInspectorArray : public EditorInspectorSection {
 
 	void _panel_draw(int p_index);
 	void _panel_gui_input(Ref<InputEvent> p_event, int p_index);
+	void _panel_gui_focus(int p_index);
+	void _panel_gui_unfocus(int p_index);
 	void _move_element(int p_element_index, int p_to_pos);
 	void _clear_array();
 	void _resize_array(int p_size);
@@ -470,6 +499,8 @@ public:
 	void setup_with_count_property(Object *p_object, const String &p_label, const StringName &p_count_property, const StringName &p_array_element_prefix, int p_page, const Color &p_bg_color, bool p_foldable, bool p_movable = true, bool p_is_const = false, bool p_numbered = false, int p_page_length = 5, const String &p_add_item_text = "", const String &p_swap_method = "");
 	VBoxContainer *get_vbox(int p_index);
 
+	void show_menu(int p_index, const Vector2 &p_offset);
+
 	EditorInspectorArray(bool p_read_only);
 };
 
@@ -568,6 +599,8 @@ class EditorInspector : public ScrollContainer {
 	int property_focusable;
 	int update_scroll_request;
 
+	bool updating_theme = false;
+
 	struct DocCacheInfo {
 		String doc_path;
 		String theme_item_name;
@@ -605,8 +638,9 @@ class EditorInspector : public ScrollContainer {
 	void _set_property_favorited(const String &p_path, bool p_favorited);
 	void _clear_current_favorites();
 
+	void _update_theme();
+
 	void _node_removed(Node *p_node);
-	void _gui_focus_changed(Control *p_control);
 
 	HashMap<StringName, int> per_array_page;
 	void _page_change_request(int p_new_page, const StringName &p_array_prefix);
@@ -706,5 +740,3 @@ public:
 
 	EditorInspector();
 };
-
-#endif // EDITOR_INSPECTOR_H
diff --git a/engine/editor/editor_interface.cpp b/engine/editor/editor_interface.cpp
index c0d7b1b1..013a59cf 100644
--- a/engine/editor/editor_interface.cpp
+++ b/engine/editor/editor_interface.cpp
@@ -186,8 +186,8 @@ Vector<Ref<Texture2D>> EditorInterface::make_mesh_previews(const Vector<Ref<Mesh
 		Vector3 ofs = aabb.get_center();
 		aabb.position -= ofs;
 		Transform3D xform;
-		xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math_PI / 6);
-		xform.basis = Basis().rotated(Vector3(1, 0, 0), Math_PI / 6) * xform.basis;
+		xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math::PI / 6);
+		xform.basis = Basis().rotated(Vector3(1, 0, 0), Math::PI / 6) * xform.basis;
 		AABB rot_aabb = xform.xform(aabb);
 		float m = MAX(rot_aabb.size.x, rot_aabb.size.y) * 0.5;
 		if (m == 0) {
@@ -282,8 +282,8 @@ void EditorInterface::make_scene_preview(const String &p_path, Node *p_scene, in
 	Vector3 center = scene_aabb.get_center();
 	float camera_size = scene_aabb.get_longest_axis_size();
 
-	const float cam_rot_x = -Math_PI / 4;
-	const float cam_rot_y = -Math_PI / 4;
+	const float cam_rot_x = -Math::PI / 4;
+	const float cam_rot_y = -Math::PI / 4;
 
 	camera->set_orthogonal(camera_size * 2.0, 0.0001, camera_size * 2.0);
 
@@ -295,8 +295,8 @@ void EditorInterface::make_scene_preview(const String &p_path, Node *p_scene, in
 	camera->set_transform(xf);
 
 	Transform3D xform;
-	xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math_PI / 6);
-	xform.basis = Basis().rotated(Vector3(1, 0, 0), Math_PI / 6) * xform.basis;
+	xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math::PI / 6);
+	xform.basis = Basis().rotated(Vector3(1, 0, 0), Math::PI / 6) * xform.basis;
 
 	light->set_transform(xform * Transform3D().looking_at(Vector3(-2, -1, -1), Vector3(0, 1, 0)));
 	light2->set_transform(xform * Transform3D().looking_at(Vector3(+1, -1, -2), Vector3(0, 1, 0)));
@@ -647,8 +647,7 @@ void EditorInterface::open_scene_from_path(const String &scene_path, bool p_set_
 	if (EditorNode::get_singleton()->is_changing_scene()) {
 		return;
 	}
-
-	EditorNode::get_singleton()->open_request(scene_path, p_set_inherited);
+	EditorNode::get_singleton()->load_scene(scene_path, false, p_set_inherited);
 }
 
 void EditorInterface::reload_scene_from_path(const String &scene_path) {
@@ -667,12 +666,24 @@ PackedStringArray EditorInterface::get_open_scenes() const {
 	PackedStringArray ret;
 	Vector<EditorData::EditedScene> scenes = EditorNode::get_editor_data().get_edited_scenes();
 
-	int scns_amount = scenes.size();
-	for (int idx_scn = 0; idx_scn < scns_amount; idx_scn++) {
-		if (scenes[idx_scn].root == nullptr) {
+	for (EditorData::EditedScene &edited_scene : scenes) {
+		if (edited_scene.root == nullptr) {
 			continue;
 		}
-		ret.push_back(scenes[idx_scn].root->get_scene_file_path());
+		ret.push_back(edited_scene.root->get_scene_file_path());
+	}
+	return ret;
+}
+
+TypedArray<Node> EditorInterface::get_open_scene_roots() const {
+	TypedArray<Node> ret;
+	Vector<EditorData::EditedScene> scenes = EditorNode::get_editor_data().get_edited_scenes();
+
+	for (EditorData::EditedScene &edited_scene : scenes) {
+		if (edited_scene.root == nullptr) {
+			continue;
+		}
+		ret.push_back(edited_scene.root);
 	}
 	return ret;
 }
@@ -736,12 +747,11 @@ bool EditorInterface::is_movie_maker_enabled() const {
 	return EditorRunBar::get_singleton()->is_movie_maker_enabled();
 }
 
-#ifdef TOOLS_ENABLED
 void EditorInterface::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
 	const String pf = p_function;
 	if (p_idx == 0) {
 		if (pf == "set_main_screen_editor") {
-			for (String E : { "\"2D\"", "\"3D\"", "\"Script\"", "\"AssetLib\"" }) {
+			for (String E : { "\"2D\"", "\"3D\"", "\"Script\"", "\"Game\"", "\"AssetLib\"" }) {
 				r_options->push_back(E);
 			}
 		} else if (pf == "get_editor_viewport_3d") {
@@ -752,7 +762,6 @@ void EditorInterface::get_argument_options(const StringName &p_function, int p_i
 	}
 	Object::get_argument_options(p_function, p_idx, r_options);
 }
-#endif
 
 // Base.
 
@@ -830,6 +839,7 @@ void EditorInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("reload_scene_from_path", "scene_filepath"), &EditorInterface::reload_scene_from_path);
 
 	ClassDB::bind_method(D_METHOD("get_open_scenes"), &EditorInterface::get_open_scenes);
+	ClassDB::bind_method(D_METHOD("get_open_scene_roots"), &EditorInterface::get_open_scene_roots);
 	ClassDB::bind_method(D_METHOD("get_edited_scene_root"), &EditorInterface::get_edited_scene_root);
 
 	ClassDB::bind_method(D_METHOD("save_scene"), &EditorInterface::save_scene);
diff --git a/engine/editor/editor_interface.h b/engine/editor/editor_interface.h
index b6d163d2..5bf3ab48 100644
--- a/engine/editor/editor_interface.h
+++ b/engine/editor/editor_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_INTERFACE_H
-#define EDITOR_INTERFACE_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/class_db.h"
@@ -171,6 +170,7 @@ public:
 	void reload_scene_from_path(const String &scene_path);
 
 	PackedStringArray get_open_scenes() const;
+	TypedArray<Node> get_open_scene_roots() const;
 	Node *get_edited_scene_root() const;
 
 	Error save_scene();
@@ -190,9 +190,7 @@ public:
 	void set_movie_maker_enabled(bool p_enabled);
 	bool is_movie_maker_enabled() const;
 
-#ifdef TOOLS_ENABLED
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
-#endif
 
 	// Base.
 	static void create();
@@ -200,5 +198,3 @@ public:
 
 	EditorInterface();
 };
-
-#endif // EDITOR_INTERFACE_H
diff --git a/engine/editor/editor_layouts_dialog.cpp b/engine/editor/editor_layouts_dialog.cpp
index 60326056..0ba5fb1f 100644
--- a/engine/editor/editor_layouts_dialog.cpp
+++ b/engine/editor/editor_layouts_dialog.cpp
@@ -128,6 +128,7 @@ EditorLayoutsDialog::EditorLayoutsDialog() {
 	name = memnew(LineEdit);
 	makevb->add_child(name);
 	name->set_placeholder(TTR("Or enter new layout name"));
+	name->set_accessibility_name(TTRC("Layout Name"));
 	name->set_offset(SIDE_TOP, 5);
 	name->set_anchor_and_offset(SIDE_LEFT, Control::ANCHOR_BEGIN, 5);
 	name->set_anchor_and_offset(SIDE_RIGHT, Control::ANCHOR_END, -5);
diff --git a/engine/editor/editor_layouts_dialog.h b/engine/editor/editor_layouts_dialog.h
index e3557fbe..761f15a4 100644
--- a/engine/editor/editor_layouts_dialog.h
+++ b/engine/editor/editor_layouts_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_LAYOUTS_DIALOG_H
-#define EDITOR_LAYOUTS_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -57,5 +56,3 @@ public:
 
 	void set_name_line_enabled(bool p_enabled);
 };
-
-#endif // EDITOR_LAYOUTS_DIALOG_H
diff --git a/engine/editor/editor_locale_dialog.cpp b/engine/editor/editor_locale_dialog.cpp
index c36792c9..00621120 100644
--- a/engine/editor/editor_locale_dialog.cpp
+++ b/engine/editor/editor_locale_dialog.cpp
@@ -396,6 +396,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 		HBoxContainer *hb_filter = memnew(HBoxContainer);
 		{
 			filter_mode = memnew(OptionButton);
+			filter_mode->set_accessibility_name(TTRC("Locale Filter"));
 			filter_mode->add_item(TTR("Show All Locales"), SHOW_ALL_LOCALES);
 			filter_mode->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			filter_mode->add_item(TTR("Show Selected Locales Only"), SHOW_ONLY_SELECTED_LOCALES);
@@ -434,6 +435,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 			}
 			{
 				lang_list = memnew(Tree);
+				lang_list->set_accessibility_name(TTRC("Language"));
 				lang_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 				lang_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 				lang_list->connect("cell_selected", callable_mp(this, &EditorLocaleDialog::_item_selected));
@@ -454,6 +456,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 			}
 			{
 				script_list = memnew(Tree);
+				script_list->set_accessibility_name(TTR("Script", "Locale"));
 				script_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 				script_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 				script_list->connect("cell_selected", callable_mp(this, &EditorLocaleDialog::_item_selected));
@@ -473,6 +476,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 			}
 			{
 				cnt_list = memnew(Tree);
+				cnt_list->set_accessibility_name(TTRC("Country"));
 				cnt_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 				cnt_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 				cnt_list->connect("cell_selected", callable_mp(this, &EditorLocaleDialog::_item_selected));
@@ -499,7 +503,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 				{
 					lang_code = memnew(LineEdit);
 					lang_code->set_max_length(3);
-					lang_code->set_tooltip_text("Language");
+					lang_code->set_accessibility_name("Language");
 					vb_language->add_child(lang_code);
 				}
 				hb_locale->add_child(vb_language);
@@ -516,7 +520,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 				{
 					script_code = memnew(LineEdit);
 					script_code->set_max_length(4);
-					script_code->set_tooltip_text("Script");
+					script_code->set_accessibility_name("Script");
 					vb_script->add_child(script_code);
 				}
 				hb_locale->add_child(vb_script);
@@ -549,7 +553,7 @@ EditorLocaleDialog::EditorLocaleDialog() {
 					variant_code = memnew(LineEdit);
 					variant_code->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 					variant_code->set_placeholder("Variant");
-					variant_code->set_tooltip_text("Variant");
+					variant_code->set_accessibility_name("Variant");
 					vb_variant->add_child(variant_code);
 				}
 				hb_locale->add_child(vb_variant);
diff --git a/engine/editor/editor_locale_dialog.h b/engine/editor/editor_locale_dialog.h
index bc75e1df..dd04cc4c 100644
--- a/engine/editor/editor_locale_dialog.h
+++ b/engine/editor/editor_locale_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_LOCALE_DIALOG_H
-#define EDITOR_LOCALE_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -85,5 +84,3 @@ public:
 	void set_locale(const String &p_locale);
 	void popup_locale_dialog();
 };
-
-#endif // EDITOR_LOCALE_DIALOG_H
diff --git a/engine/editor/editor_log.cpp b/engine/editor/editor_log.cpp
index 5e1d3e46..9a76b24e 100644
--- a/engine/editor/editor_log.cpp
+++ b/engine/editor/editor_log.cpp
@@ -466,6 +466,7 @@ EditorLog::EditorLog() {
 	search_box = memnew(LineEdit);
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	search_box->set_placeholder(TTR("Filter Messages"));
+	search_box->set_accessibility_name(TTRC("Filter Messages"));
 	search_box->set_clear_button_enabled(true);
 	search_box->set_visible(true);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &EditorLog::_search_changed));
@@ -481,6 +482,7 @@ EditorLog::EditorLog() {
 
 	// Clear.
 	clear_button = memnew(Button);
+	clear_button->set_accessibility_name(TTRC("Clear Log"));
 	clear_button->set_theme_type_variation(SceneStringName(FlatButton));
 	clear_button->set_focus_mode(FOCUS_NONE);
 	clear_button->set_shortcut(ED_SHORTCUT("editor/clear_output", TTRC("Clear Output"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::ALT | Key::K));
@@ -489,6 +491,7 @@ EditorLog::EditorLog() {
 
 	// Copy.
 	copy_button = memnew(Button);
+	copy_button->set_accessibility_name(TTRC("Copy Selection"));
 	copy_button->set_theme_type_variation(SceneStringName(FlatButton));
 	copy_button->set_focus_mode(FOCUS_NONE);
 	copy_button->set_shortcut(ED_SHORTCUT("editor/copy_output", TTRC("Copy Selection"), KeyModifierMask::CMD_OR_CTRL | Key::C));
@@ -509,6 +512,7 @@ EditorLog::EditorLog() {
 	collapse_button->set_theme_type_variation(SceneStringName(FlatButton));
 	collapse_button->set_focus_mode(FOCUS_NONE);
 	collapse_button->set_tooltip_text(TTR("Collapse duplicate messages into one log entry. Shows number of occurrences."));
+	collapse_button->set_accessibility_name(TTRC("Collapse Duplicate Messages"));
 	collapse_button->set_toggle_mode(true);
 	collapse_button->set_pressed(false);
 	collapse_button->connect(SceneStringName(toggled), callable_mp(this, &EditorLog::_set_collapse));
@@ -516,6 +520,7 @@ EditorLog::EditorLog() {
 
 	// Show Search.
 	show_search_button = memnew(Button);
+	show_search_button->set_accessibility_name(TTRC("Show Search"));
 	show_search_button->set_theme_type_variation(SceneStringName(FlatButton));
 	show_search_button->set_focus_mode(FOCUS_NONE);
 	show_search_button->set_toggle_mode(true);
@@ -529,27 +534,27 @@ EditorLog::EditorLog() {
 	vb_right->add_child(memnew(HSeparator));
 
 	LogFilter *std_filter = memnew(LogFilter(MSG_TYPE_STD));
-	std_filter->initialize_button(TTR("Toggle visibility of standard output messages."), callable_mp(this, &EditorLog::_set_filter_active));
+	std_filter->initialize_button(TTRC("Standard Messages"), TTRC("Toggle visibility of standard output messages."), callable_mp(this, &EditorLog::_set_filter_active));
 	vb_right->add_child(std_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_STD, std_filter);
 	type_filter_map.insert(MSG_TYPE_STD_RICH, std_filter);
 
 	LogFilter *error_filter = memnew(LogFilter(MSG_TYPE_ERROR));
-	error_filter->initialize_button(TTR("Toggle visibility of errors."), callable_mp(this, &EditorLog::_set_filter_active));
+	error_filter->initialize_button(TTRC("Errors"), TTRC("Toggle visibility of errors."), callable_mp(this, &EditorLog::_set_filter_active));
 	vb_right->add_child(error_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_ERROR, error_filter);
 
 	LogFilter *warning_filter = memnew(LogFilter(MSG_TYPE_WARNING));
-	warning_filter->initialize_button(TTR("Toggle visibility of warnings."), callable_mp(this, &EditorLog::_set_filter_active));
+	warning_filter->initialize_button(TTRC("Warnings"), TTRC("Toggle visibility of warnings."), callable_mp(this, &EditorLog::_set_filter_active));
 	vb_right->add_child(warning_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_WARNING, warning_filter);
 
 	LogFilter *editor_filter = memnew(LogFilter(MSG_TYPE_EDITOR));
-	editor_filter->initialize_button(TTR("Toggle visibility of editor messages."), callable_mp(this, &EditorLog::_set_filter_active));
+	editor_filter->initialize_button(TTRC("Editor Messages"), TTRC("Toggle visibility of editor messages."), callable_mp(this, &EditorLog::_set_filter_active));
 	vb_right->add_child(editor_filter->toggle_button);
 	type_filter_map.insert(MSG_TYPE_EDITOR, editor_filter);
 
-	add_message(VERSION_FULL_NAME " (c) 2007-present Juan Linietsky, Ariel Manzur & Godot Contributors.");
+	add_message(GODOT_VERSION_FULL_NAME " (c) 2007-present Juan Linietsky, Ariel Manzur & Godot Contributors.");
 
 	eh.errfunc = _error_handler;
 	eh.userdata = this;
diff --git a/engine/editor/editor_log.h b/engine/editor/editor_log.h
index d5c2babd..498357f5 100644
--- a/engine/editor/editor_log.h
+++ b/engine/editor/editor_log.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_LOG_H
-#define EDITOR_LOG_H
+#pragma once
 
 #include "core/os/thread.h"
 #include "scene/gui/box_container.h"
@@ -88,12 +87,13 @@ private:
 		MessageType type;
 		Button *toggle_button = nullptr;
 
-		void initialize_button(const String &p_tooltip, Callable p_toggled_callback) {
+		void initialize_button(const String &p_name, const String &p_tooltip, Callable p_toggled_callback) {
 			toggle_button = memnew(Button);
 			toggle_button->set_toggle_mode(true);
 			toggle_button->set_pressed(true);
 			toggle_button->set_text(itos(message_count));
-			toggle_button->set_tooltip_text(TTR(p_tooltip));
+			toggle_button->set_accessibility_name(TTRGET(p_name));
+			toggle_button->set_tooltip_text(TTRGET(p_tooltip));
 			toggle_button->set_focus_mode(FOCUS_NONE);
 			// When toggled call the callback and pass the MessageType this button is for.
 			toggle_button->connect(SceneStringName(toggled), p_toggled_callback.bind(type));
@@ -191,5 +191,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(EditorLog::MessageType);
-
-#endif // EDITOR_LOG_H
diff --git a/engine/editor/editor_main_screen.h b/engine/editor/editor_main_screen.h
index 06bf2f7a..8430e42f 100644
--- a/engine/editor/editor_main_screen.h
+++ b/engine/editor/editor_main_screen.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_MAIN_SCREEN_H
-#define EDITOR_MAIN_SCREEN_H
+#pragma once
 
 #include "scene/gui/panel_container.h"
 
@@ -90,5 +89,3 @@ public:
 
 	EditorMainScreen();
 };
-
-#endif // EDITOR_MAIN_SCREEN_H
diff --git a/engine/editor/editor_native_shader_source_visualizer.h b/engine/editor/editor_native_shader_source_visualizer.h
index 8ae942da..f75e165c 100644
--- a/engine/editor/editor_native_shader_source_visualizer.h
+++ b/engine/editor/editor_native_shader_source_visualizer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_NATIVE_SHADER_SOURCE_VISUALIZER_H
-#define EDITOR_NATIVE_SHADER_SOURCE_VISUALIZER_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tab_container.h"
@@ -49,5 +48,3 @@ protected:
 public:
 	EditorNativeShaderSourceVisualizer();
 };
-
-#endif // EDITOR_NATIVE_SHADER_SOURCE_VISUALIZER_H
diff --git a/engine/editor/editor_node.cpp b/engine/editor/editor_node.cpp
index 6b725240..4855d861 100644
--- a/engine/editor/editor_node.cpp
+++ b/engine/editor/editor_node.cpp
@@ -68,8 +68,8 @@
 #include "scene/resources/portable_compressed_texture.h"
 #include "scene/theme/theme_db.h"
 #include "servers/display_server.h"
+#include "servers/navigation_server_2d.h"
 #include "servers/navigation_server_3d.h"
-#include "servers/physics_server_2d.h"
 #include "servers/rendering_server.h"
 
 #include "editor/audio_stream_preview.h"
@@ -158,24 +158,35 @@
 #include "editor/plugins/visual_shader_editor_plugin.h"
 #include "editor/progress_dialog.h"
 #include "editor/project_settings_editor.h"
+#include "editor/project_upgrade_tool.h"
 #include "editor/register_exporters.h"
 #include "editor/scene_tree_dock.h"
-#include "editor/surface_upgrade_tool.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
-#include "editor/uid_upgrade_tool.h"
 #include "editor/window_wrapper.h"
 
 #include "modules/modules_enabled.gen.h" // For gdscript, mono.
 
+#ifndef PHYSICS_2D_DISABLED
+#include "servers/physics_server_2d.h"
+#endif // PHYSICS_2D_DISABLED
+
+#ifndef PHYSICS_3D_DISABLED
+#include "servers/physics_server_3d.h"
+#endif // PHYSICS_3D_DISABLED
+
+#ifdef ANDROID_ENABLED
+#include "editor/gui/touch_actions_panel.h"
+#endif // ANDROID_ENABLED
+
 #include <stdlib.h>
 
 EditorNode *EditorNode::singleton = nullptr;
 
 static const String EDITOR_NODE_CONFIG_SECTION = "EditorNode";
 
-static const String REMOVE_ANDROID_BUILD_TEMPLATE_MESSAGE = "The Android build template is already installed in this project and it won't be overwritten.\nRemove the \"%s\" directory manually before attempting this operation again.";
-static const String INSTALL_ANDROID_BUILD_TEMPLATE_MESSAGE = "This will set up your project for gradle Android builds by installing the source template to \"%s\".\nNote that in order to make gradle builds instead of using pre-built APKs, the \"Use Gradle Build\" option should be enabled in the Android export preset.";
+static const String REMOVE_ANDROID_BUILD_TEMPLATE_MESSAGE = TTRC("The Android build template is already installed in this project and it won't be overwritten.\nRemove the \"%s\" directory manually before attempting this operation again.");
+static const String INSTALL_ANDROID_BUILD_TEMPLATE_MESSAGE = TTRC("This will set up your project for gradle Android builds by installing the source template to \"%s\".\nNote that in order to make gradle builds instead of using pre-built APKs, the \"Use Gradle Build\" option should be enabled in the Android export preset.");
 
 bool EditorProgress::step(const String &p_state, int p_step, bool p_force_refresh) {
 	if (!force_background && Thread::is_main_thread()) {
@@ -336,7 +347,7 @@ void EditorNode::_update_title() {
 		// Display the "modified" mark before anything else so that it can always be seen in the OS task bar.
 		title = vformat("(*) %s", title);
 	}
-	DisplayServer::get_singleton()->window_set_title(title + String(" - ") + VERSION_NAME);
+	DisplayServer::get_singleton()->window_set_title(title + String(" - ") + GODOT_VERSION_NAME);
 	if (project_title) {
 		project_title->set_text(title);
 	}
@@ -399,6 +410,9 @@ void EditorNode::_update_vsync_mode() {
 }
 
 void EditorNode::_update_from_settings() {
+	if (!is_inside_tree()) {
+		return;
+	}
 	_update_title();
 
 	int current_filter = GLOBAL_GET("rendering/textures/canvas_textures/default_texture_filter");
@@ -484,16 +498,25 @@ void EditorNode::_update_from_settings() {
 	ResourceImporterTexture::get_singleton()->update_imports();
 
 #ifdef DEBUG_ENABLED
-	NavigationServer3D::get_singleton()->set_debug_navigation_edge_connection_color(GLOBAL_GET("debug/shapes/navigation/edge_connection_color"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_color(GLOBAL_GET("debug/shapes/navigation/geometry_edge_color"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_face_color(GLOBAL_GET("debug/shapes/navigation/geometry_face_color"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_disabled_color(GLOBAL_GET("debug/shapes/navigation/geometry_edge_disabled_color"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_face_disabled_color(GLOBAL_GET("debug/shapes/navigation/geometry_face_disabled_color"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_connections(GLOBAL_GET("debug/shapes/navigation/enable_edge_connections"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_connections_xray(GLOBAL_GET("debug/shapes/navigation/enable_edge_connections_xray"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines(GLOBAL_GET("debug/shapes/navigation/enable_edge_lines"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines_xray(GLOBAL_GET("debug/shapes/navigation/enable_edge_lines_xray"));
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_geometry_face_random_color(GLOBAL_GET("debug/shapes/navigation/enable_geometry_face_random_color"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_edge_connection_color(GLOBAL_GET("debug/shapes/navigation/2d/edge_connection_color"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_geometry_edge_color(GLOBAL_GET("debug/shapes/navigation/2d/geometry_edge_color"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_geometry_face_color(GLOBAL_GET("debug/shapes/navigation/2d/geometry_face_color"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_geometry_edge_disabled_color(GLOBAL_GET("debug/shapes/navigation/2d/geometry_edge_disabled_color"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_geometry_face_disabled_color(GLOBAL_GET("debug/shapes/navigation/2d/geometry_face_disabled_color"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_enable_edge_connections(GLOBAL_GET("debug/shapes/navigation/2d/enable_edge_connections"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_enable_edge_lines(GLOBAL_GET("debug/shapes/navigation/2d/enable_edge_lines"));
+	NavigationServer2D::get_singleton()->set_debug_navigation_enable_geometry_face_random_color(GLOBAL_GET("debug/shapes/navigation/2d/enable_geometry_face_random_color"));
+
+	NavigationServer3D::get_singleton()->set_debug_navigation_edge_connection_color(GLOBAL_GET("debug/shapes/navigation/3d/edge_connection_color"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_color(GLOBAL_GET("debug/shapes/navigation/3d/geometry_edge_color"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_face_color(GLOBAL_GET("debug/shapes/navigation/3d/geometry_face_color"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_disabled_color(GLOBAL_GET("debug/shapes/navigation/3d/geometry_edge_disabled_color"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_face_disabled_color(GLOBAL_GET("debug/shapes/navigation/3d/geometry_face_disabled_color"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_connections(GLOBAL_GET("debug/shapes/navigation/3d/enable_edge_connections"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_connections_xray(GLOBAL_GET("debug/shapes/navigation/3d/enable_edge_connections_xray"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines(GLOBAL_GET("debug/shapes/navigation/3d/enable_edge_lines"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines_xray(GLOBAL_GET("debug/shapes/navigation/3d/enable_edge_lines_xray"));
+	NavigationServer3D::get_singleton()->set_debug_navigation_enable_geometry_face_random_color(GLOBAL_GET("debug/shapes/navigation/3d/enable_geometry_face_random_color"));
 #endif // DEBUG_ENABLED
 }
 
@@ -504,8 +527,9 @@ void EditorNode::_gdextensions_reloaded() {
 	// Reload script editor to revalidate GDScript if classes are added or removed.
 	ScriptEditor::get_singleton()->reload_scripts(true);
 
-	// Regenerate documentation.
-	EditorHelp::generate_doc();
+	// Regenerate documentation without using script documentation cache since that would
+	// revert doc changes during this session.
+	EditorHelp::generate_doc(true, false);
 }
 
 void EditorNode::_update_theme(bool p_skip_creation) {
@@ -541,6 +565,9 @@ void EditorNode::_update_theme(bool p_skip_creation) {
 
 	// Update styles.
 	{
+		bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
+		bool dark_mode = DisplayServer::get_singleton()->is_dark_mode_supported() && DisplayServer::get_singleton()->is_dark_mode();
+
 		gui_base->add_theme_style_override(SceneStringName(panel), theme->get_stylebox(SNAME("Background"), EditorStringName(EditorStyles)));
 		main_vbox->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT, Control::PRESET_MODE_MINSIZE, theme->get_constant(SNAME("window_border_margin"), EditorStringName(Editor)));
 		main_vbox->add_theme_constant_override("separation", theme->get_constant(SNAME("top_bar_separation"), EditorStringName(Editor)));
@@ -550,10 +577,10 @@ void EditorNode::_update_theme(bool p_skip_creation) {
 		distraction_free->set_button_icon(theme->get_icon(SNAME("DistractionFree"), EditorStringName(EditorIcons)));
 		distraction_free->add_theme_style_override(SceneStringName(pressed), theme->get_stylebox(CoreStringName(normal), "FlatMenuButton"));
 
-		help_menu->set_item_icon(help_menu->get_item_index(HELP_SEARCH), theme->get_icon(SNAME("HelpSearch"), EditorStringName(EditorIcons)));
-		help_menu->set_item_icon(help_menu->get_item_index(HELP_COPY_SYSTEM_INFO), theme->get_icon(SNAME("ActionCopy"), EditorStringName(EditorIcons)));
-		help_menu->set_item_icon(help_menu->get_item_index(HELP_ABOUT), theme->get_icon(SNAME("Godot"), EditorStringName(EditorIcons)));
-		help_menu->set_item_icon(help_menu->get_item_index(HELP_SUPPORT_GODOT_DEVELOPMENT), theme->get_icon(SNAME("Heart"), EditorStringName(EditorIcons)));
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_SEARCH), _get_editor_theme_native_menu_icon(SNAME("HelpSearch"), global_menu, dark_mode));
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_COPY_SYSTEM_INFO), _get_editor_theme_native_menu_icon(SNAME("ActionCopy"), global_menu, dark_mode));
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_ABOUT), _get_editor_theme_native_menu_icon(SNAME("Godot"), global_menu, dark_mode));
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_SUPPORT_GODOT_DEVELOPMENT), _get_editor_theme_native_menu_icon(SNAME("Heart"), global_menu, dark_mode));
 
 		if (EditorDebuggerNode::get_singleton()->is_visible()) {
 			bottom_panel->add_theme_style_override(SceneStringName(panel), theme->get_stylebox(SNAME("BottomPanelDebuggerOverride"), EditorStringName(EditorStyles)));
@@ -563,9 +590,22 @@ void EditorNode::_update_theme(bool p_skip_creation) {
 	}
 
 	editor_dock_manager->update_tab_styles();
+	editor_dock_manager->update_docks_menu();
 	editor_dock_manager->set_tab_icon_max_width(theme->get_constant(SNAME("class_icon_size"), EditorStringName(Editor)));
 }
 
+Ref<Texture2D> EditorNode::_get_editor_theme_native_menu_icon(const StringName &p_name, bool p_global_menu, bool p_dark_mode) const {
+	if (!p_global_menu) {
+		return theme->get_icon(p_name, SNAME("EditorIcons"));
+	}
+	if (p_dark_mode && theme->has_icon(String(p_name) + "Dark", SNAME("EditorIcons"))) {
+		return theme->get_icon(String(p_name) + "Dark", SNAME("EditorIcons"));
+	} else if (!p_dark_mode && theme->has_icon(String(p_name) + "Light", SNAME("EditorIcons"))) {
+		return theme->get_icon(String(p_name) + "Light", SNAME("EditorIcons"));
+	}
+	return theme->get_icon(p_name, SNAME("EditorIcons"));
+}
+
 void EditorNode::update_preview_themes(int p_mode) {
 	if (!scene_root->is_inside_tree()) {
 		return; // Too early.
@@ -596,8 +636,49 @@ void EditorNode::update_preview_themes(int p_mode) {
 	}
 }
 
+bool EditorNode::_is_project_data_missing() {
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	const String project_data_dir = EditorPaths::get_singleton()->get_project_data_dir();
+	if (!da->dir_exists(project_data_dir)) {
+		return true;
+	}
+
+	String project_data_gdignore_file_path = project_data_dir.path_join(".gdignore");
+	if (!FileAccess::exists(project_data_gdignore_file_path)) {
+		Ref<FileAccess> f = FileAccess::open(project_data_gdignore_file_path, FileAccess::WRITE);
+		if (f.is_valid()) {
+			f->store_line("");
+		} else {
+			ERR_PRINT("Failed to create file " + project_data_gdignore_file_path.quote() + ".");
+		}
+	}
+
+	String uid_cache = ResourceUID::get_singleton()->get_cache_file();
+	if (!da->file_exists(uid_cache)) {
+		Error err = ResourceUID::get_singleton()->save_to_cache();
+		if (err != OK) {
+			ERR_PRINT("Failed to create file " + uid_cache.quote() + ".");
+		}
+	}
+
+	const String dirs[] = {
+		EditorPaths::get_singleton()->get_project_settings_dir(),
+		ProjectSettings::get_singleton()->get_imported_files_path()
+	};
+	for (const String &dir : dirs) {
+		if (!da->dir_exists(dir)) {
+			return true;
+		}
+	}
+	return false;
+}
+
 void EditorNode::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			callable_mp(this, &EditorNode::_titlebar_resized).call_deferred();
+		} break;
+
 		case NOTIFICATION_POSTINITIALIZE: {
 			EditorHelp::generate_doc();
 #if defined(MODULE_GDSCRIPT_ENABLED) || defined(MODULE_MONO_ENABLED)
@@ -606,10 +687,6 @@ void EditorNode::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_PROCESS: {
-			if (opening_prev && !confirmation->is_visible()) {
-				opening_prev = false;
-			}
-
 			bool global_unsaved = EditorUndoRedoManager::get_singleton()->is_history_unsaved(EditorUndoRedoManager::GLOBAL_HISTORY);
 			bool scene_or_global_unsaved = global_unsaved || EditorUndoRedoManager::get_singleton()->is_history_unsaved(editor_data.get_current_edited_scene_history_id());
 			if (unsaved_cache != scene_or_global_unsaved) {
@@ -649,10 +726,7 @@ void EditorNode::_notification(int p_what) {
 
 				OS::get_singleton()->benchmark_begin_measure("Editor", "First Scan");
 
-				if (run_surface_upgrade_tool || run_uid_upgrade_tool) {
-					EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &EditorNode::_execute_upgrades), CONNECT_ONE_SHOT);
-				}
-
+				EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &EditorNode::_execute_upgrades), CONNECT_ONE_SHOT);
 				EditorFileSystem::get_singleton()->scan();
 			}
 		} break;
@@ -717,6 +791,7 @@ void EditorNode::_notification(int p_what) {
 			if (save_accept) {
 				save_accept->queue_free();
 			}
+			EditorHelp::save_script_doc_cache();
 			editor_data.save_editor_external_data();
 			FileAccess::set_file_close_fail_notify_callback(nullptr);
 			log->deinit(); // Do not get messages anymore.
@@ -735,23 +810,6 @@ void EditorNode::_notification(int p_what) {
 
 			// Save the project after opening to mark it as last modified, except in headless mode.
 			if (DisplayServer::get_singleton()->window_can_draw()) {
-				// Try to determine if this project's Godot version was less than 4.4 - if
-				// so, we'll ask the user if they want to upgrade the project.
-				PackedStringArray features = ProjectSettings::get_singleton()->get_setting("application/config/features");
-				if (!features.is_empty()) {
-					String version_str = features[0];
-					PackedStringArray version_parts = version_str.split(".", true, 1);
-					if (version_parts.size() >= 2) {
-						if (version_parts[0].is_valid_int() && version_parts[1].is_valid_int()) {
-							int major_ver = version_parts[0].to_int();
-							int minor_ver = version_parts[1].to_int();
-							if (major_ver < 4 || (major_ver == 4 && minor_ver < 4)) {
-								should_prompt_uid_upgrade_tool = true;
-							}
-						}
-					}
-				}
-
 				ProjectSettings::get_singleton()->save();
 			}
 
@@ -772,7 +830,11 @@ void EditorNode::_notification(int p_what) {
 			// Restore the original FPS cap after focusing back on the editor.
 			OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(int(EDITOR_GET("interface/editor/low_processor_mode_sleep_usec")));
 
-			EditorFileSystem::get_singleton()->scan_changes();
+			if (_is_project_data_missing()) {
+				project_data_missing->popup_centered();
+			} else {
+				EditorFileSystem::get_singleton()->scan_changes();
+			}
 			_scan_external_changes();
 
 			GDExtensionManager *gdextension_manager = GDExtensionManager::get_singleton();
@@ -806,6 +868,19 @@ void EditorNode::_notification(int p_what) {
 				EditorFileDialog::set_default_display_mode((EditorFileDialog::DisplayMode)EDITOR_GET("filesystem/file_dialog/display_mode").operator int());
 			}
 
+			if (EditorSettings::get_singleton()->check_changed_settings_in_group("interface/editor/tablet_driver")) {
+				String tablet_driver = GLOBAL_GET("input_devices/pen_tablet/driver");
+				int tablet_driver_idx = EDITOR_GET("interface/editor/tablet_driver");
+				if (tablet_driver_idx != -1) {
+					tablet_driver = DisplayServer::get_singleton()->tablet_get_driver_name(tablet_driver_idx);
+				}
+				if (tablet_driver.is_empty()) {
+					tablet_driver = DisplayServer::get_singleton()->tablet_get_driver_name(0);
+				}
+				DisplayServer::get_singleton()->tablet_set_current_driver(tablet_driver);
+				print_verbose("Using \"" + DisplayServer::get_singleton()->tablet_get_current_driver() + "\" pen tablet driver...");
+			}
+
 			if (EDITOR_GET("interface/editor/import_resources_when_unfocused")) {
 				scan_changes_timer->start();
 			} else {
@@ -896,16 +971,11 @@ void EditorNode::_update_update_spinner() {
 }
 
 void EditorNode::_execute_upgrades() {
-	if (run_surface_upgrade_tool) {
-		run_surface_upgrade_tool = false;
+	if (run_project_upgrade_tool) {
+		run_project_upgrade_tool = false;
 		// Execute another scan to reimport the modified files.
-		SurfaceUpgradeTool::get_singleton()->connect("upgrade_finished", callable_mp(EditorFileSystem::get_singleton(), &EditorFileSystem::scan), CONNECT_ONE_SHOT);
-		SurfaceUpgradeTool::get_singleton()->finish_upgrade();
-	} else if (run_uid_upgrade_tool) {
-		run_uid_upgrade_tool = false;
-		// Execute another scan to reimport the modified files.
-		UIDUpgradeTool::get_singleton()->connect("upgrade_finished", callable_mp(EditorFileSystem::get_singleton(), &EditorFileSystem::scan), CONNECT_ONE_SHOT);
-		UIDUpgradeTool::get_singleton()->finish_upgrade();
+		project_upgrade_tool->connect(project_upgrade_tool->UPGRADE_FINISHED, callable_mp(EditorFileSystem::get_singleton(), &EditorFileSystem::scan), CONNECT_ONE_SHOT);
+		project_upgrade_tool->finish_upgrade();
 	}
 }
 
@@ -954,12 +1024,12 @@ void EditorNode::_remove_plugin_from_enabled(const String &p_name) {
 void EditorNode::_plugin_over_edit(EditorPlugin *p_plugin, Object *p_object) {
 	if (p_object) {
 		editor_plugins_over->add_plugin(p_plugin);
-		p_plugin->make_visible(true);
 		p_plugin->edit(p_object);
+		p_plugin->make_visible(true);
 	} else {
 		editor_plugins_over->remove_plugin(p_plugin);
-		p_plugin->make_visible(false);
 		p_plugin->edit(nullptr);
+		p_plugin->make_visible(false);
 	}
 }
 
@@ -1202,20 +1272,10 @@ void EditorNode::_sources_changed(bool p_exist) {
 			OS::get_singleton()->benchmark_dump();
 		}
 
-		if (SurfaceUpgradeTool::get_singleton()->is_show_requested()) {
-			SurfaceUpgradeTool::get_singleton()->show_popup();
-		}
-
 		// Start preview thread now that it's safe.
-		if (!singleton->cmdline_export_mode) {
+		if (!singleton->cmdline_mode) {
 			EditorResourcePreview::get_singleton()->start();
 		}
-
-		if (should_prompt_uid_upgrade_tool) {
-			should_prompt_uid_upgrade_tool = false;
-			uid_upgrade_dialog->popup_on_demand();
-		}
-
 		get_tree()->create_timer(1.0f)->connect("timeout", callable_mp(this, &EditorNode::_remove_lock_file));
 	}
 }
@@ -1362,7 +1422,7 @@ Error EditorNode::load_resource(const String &p_resource, bool p_ignore_broken_d
 		for (const String &E : dependency_errors[p_resource]) {
 			errors.push_back(E);
 		}
-		dependency_error->show(DependencyErrorDialog::MODE_RESOURCE, p_resource, errors);
+		dependency_error->show(p_resource, errors);
 		dependency_errors.erase(p_resource);
 
 		return ERR_FILE_MISSING_DEPENDENCIES;
@@ -1372,6 +1432,16 @@ Error EditorNode::load_resource(const String &p_resource, bool p_ignore_broken_d
 	return OK;
 }
 
+Error EditorNode::load_scene_or_resource(const String &p_path, bool p_ignore_broken_deps, bool p_change_scene_tab_if_already_open) {
+	if (ClassDB::is_parent_class(ResourceLoader::get_resource_type(p_path), "PackedScene")) {
+		if (!p_change_scene_tab_if_already_open && EditorNode::get_singleton()->is_scene_open(p_path)) {
+			return OK;
+		}
+		return EditorNode::get_singleton()->load_scene(p_path, p_ignore_broken_deps);
+	}
+	return EditorNode::get_singleton()->load_resource(p_path, p_ignore_broken_deps);
+}
+
 void EditorNode::edit_node(Node *p_node) {
 	push_item(p_node);
 }
@@ -1606,10 +1676,8 @@ void EditorNode::_save_editor_states(const String &p_file, int p_idx) {
 		md = editor_data.get_scene_editor_states(p_idx);
 	}
 
-	List<Variant> keys;
-	md.get_key_list(&keys);
-	for (const Variant &E : keys) {
-		cf->set_value("editor_states", E, md[E]);
+	for (const KeyValue<Variant, Variant> &kv : md) {
+		cf->set_value("editor_states", kv.key, kv.value);
 	}
 
 	// Save the currently selected nodes.
@@ -1683,11 +1751,8 @@ bool EditorNode::_find_and_save_edited_subresources(Object *obj, HashMap<Ref<Res
 			} break;
 			case Variant::DICTIONARY: {
 				Dictionary d = obj->get(E.name);
-				List<Variant> keys;
-				d.get_key_list(&keys);
-				for (const Variant &F : keys) {
-					Variant v = d[F];
-					Ref<Resource> res = v;
+				for (const KeyValue<Variant, Variant> &kv : d) {
+					Ref<Resource> res = kv.value;
 					if (_find_and_save_resource(res, processed, flags)) {
 						ret_changed = true;
 					}
@@ -1807,7 +1872,7 @@ void EditorNode::_save_scene_with_preview(String p_file, int p_idx) {
 	save_scene_progress->step(TTR("Saving Scene"), 4);
 	_save_scene(p_file, p_idx);
 
-	if (!singleton->cmdline_export_mode) {
+	if (!singleton->cmdline_mode) {
 		EditorResourcePreview::get_singleton()->check_for_invalidation(p_file);
 	}
 
@@ -1867,6 +1932,7 @@ int EditorNode::_save_external_resources(bool p_also_save_external_data) {
 		res->set_edited(false);
 	}
 
+	bool script_was_saved = false;
 	for (const String &E : edited_resources) {
 		Ref<Resource> res = ResourceCache::get_ref(E);
 		if (res.is_null()) {
@@ -1876,10 +1942,18 @@ int EditorNode::_save_external_resources(bool p_also_save_external_data) {
 		if (ps.is_valid()) {
 			continue; // Do not save PackedScenes, this will mess up the editor.
 		}
+		if (!script_was_saved) {
+			Ref<Script> scr = res;
+			script_was_saved = scr.is_valid();
+		}
 		ResourceSaver::save(res, res->get_path(), flg);
 		saved++;
 	}
 
+	if (script_was_saved) {
+		ScriptEditor::get_singleton()->update_script_times();
+	}
+
 	if (p_also_save_external_data) {
 		for (int i = 0; i < editor_data.get_editor_plugin_count(); i++) {
 			EditorPlugin *plugin = editor_data.get_editor_plugin(i);
@@ -2061,26 +2135,32 @@ void EditorNode::restart_editor(bool p_goto_project_manager) {
 }
 
 void EditorNode::_save_all_scenes() {
-	bool all_saved = true;
+	scenes_to_save_as.clear(); // In case saving was canceled before.
 	for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
-		Node *scene = editor_data.get_edited_scene_root(i);
-		if (scene) {
-			if (!scene->get_scene_file_path().is_empty() && DirAccess::exists(scene->get_scene_file_path().get_base_dir())) {
-				if (i != editor_data.get_edited_scene()) {
-					_save_scene(scene->get_scene_file_path(), i);
-				} else {
-					_save_scene_with_preview(scene->get_scene_file_path());
-				}
-			} else if (!scene->get_scene_file_path().is_empty()) {
-				all_saved = false;
-			}
+		if (!_is_scene_unsaved(i)) {
+			continue;
+		}
+
+		const Node *scene = editor_data.get_edited_scene_root(i);
+		ERR_FAIL_NULL(scene);
+
+		const String &scene_path = scene->get_scene_file_path();
+		if (scene_path.is_empty() || !DirAccess::exists(scene_path.get_base_dir())) {
+			scenes_to_save_as.push_back(i);
+			continue;
+		}
+
+		if (i == editor_data.get_edited_scene()) {
+			_save_scene_with_preview(scene_path);
+		} else {
+			_save_scene(scene_path, i);
 		}
 	}
-
-	if (!all_saved) {
-		show_warning(TTR("Could not save one or more scenes!"), TTR("Save All Scenes"));
-	}
 	save_default_environment();
+
+	if (!scenes_to_save_as.is_empty()) {
+		_proceed_save_asing_scene_tabs();
+	}
 }
 
 void EditorNode::_mark_unsaved_scenes() {
@@ -2101,6 +2181,28 @@ void EditorNode::_mark_unsaved_scenes() {
 	scene_tabs->update_scene_tabs();
 }
 
+bool EditorNode::_is_scene_unsaved(int p_idx) {
+	const Node *scene = editor_data.get_edited_scene_root(p_idx);
+	if (!scene) {
+		return false;
+	}
+
+	if (EditorUndoRedoManager::get_singleton()->is_history_unsaved(editor_data.get_scene_history_id(p_idx))) {
+		return true;
+	}
+
+	const String &scene_path = scene->get_scene_file_path();
+	if (!scene_path.is_empty()) {
+		// Check if scene has unsaved changes in built-in resources.
+		for (int j = 0; j < editor_data.get_editor_plugin_count(); j++) {
+			if (!editor_data.get_editor_plugin(j)->get_unsaved_status(scene_path).is_empty()) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 void EditorNode::_dialog_action(String p_file) {
 	switch (current_menu_option) {
 		case FILE_NEW_INHERITED_SCENE: {
@@ -2125,8 +2227,9 @@ void EditorNode::_dialog_action(String p_file) {
 		case FILE_CLOSE:
 		case SCENE_TAB_CLOSE:
 		case FILE_SAVE_SCENE:
+		case FILE_MULTI_SAVE_AS_SCENE:
 		case FILE_SAVE_AS_SCENE: {
-			int scene_idx = (current_menu_option == FILE_SAVE_SCENE || current_menu_option == FILE_SAVE_AS_SCENE) ? -1 : tab_closing_idx;
+			int scene_idx = (current_menu_option == FILE_SAVE_SCENE || current_menu_option == FILE_SAVE_AS_SCENE || current_menu_option == FILE_MULTI_SAVE_AS_SCENE) ? -1 : tab_closing_idx;
 
 			if (file->get_file_mode() == EditorFileDialog::FILE_MODE_SAVE_FILE) {
 				bool same_open_scene = false;
@@ -2154,6 +2257,10 @@ void EditorNode::_dialog_action(String p_file) {
 				}
 			}
 
+			if (current_menu_option == FILE_MULTI_SAVE_AS_SCENE) {
+				_proceed_save_asing_scene_tabs();
+			}
+
 		} break;
 
 		case FILE_SAVE_AND_RUN: {
@@ -2371,22 +2478,39 @@ void EditorNode::edit_item(Object *p_object, Object *p_editing_owner) {
 			continue;
 		}
 
+		bool need_to_add = true;
+		List<EditorPropertyResource *> to_fold;
+
 		// If plugin is already associated with another owner, remove it from there first.
 		for (KeyValue<ObjectID, HashSet<EditorPlugin *>> &kv : active_plugins) {
-			if (kv.key != owner_id) {
-				EditorPropertyResource *epres = Object::cast_to<EditorPropertyResource>(ObjectDB::get_instance(kv.key));
-				if (epres && kv.value.has(plugin)) {
-					// If it's resource property editing the same resource type, fold it.
-					epres->fold_resource();
-				}
-				kv.value.erase(plugin);
+			if (kv.key == owner_id || !kv.value.has(plugin)) {
+				continue;
 			}
+			EditorPropertyResource *epres = ObjectDB::get_instance<EditorPropertyResource>(kv.key);
+			if (epres) {
+				// If it's resource property editing the same resource type, fold it later to avoid premature modifications
+				// that may result in unsafe iteration of active_plugins.
+				to_fold.push_back(epres);
+			} else {
+				kv.value.erase(plugin);
+				need_to_add = false;
+			}
+		}
+
+		if (!need_to_add && to_fold.is_empty()) {
+			plugin->make_visible(true);
+			plugin->edit(p_object);
+		} else {
+			for (EditorPropertyResource *epres : to_fold) {
+				epres->fold_resource();
+			}
+
+			// TODO: Call the function directly once a proper priority system is implemented.
+			to_over_edit.push_back(plugin);
 		}
 
 		// Activate previously inactive plugin and edit the object.
 		active_plugins[owner_id].insert(plugin);
-		// TODO: Call the function directly once a proper priority system is implemented.
-		to_over_edit.push_back(plugin);
 	}
 
 	for (EditorPlugin *plugin : to_over_edit) {
@@ -2493,7 +2617,7 @@ void EditorNode::_add_to_history(const Object *p_object, const String &p_propert
 	ObjectID history_id = editor_history.get_current();
 	if (id != history_id) {
 		const MultiNodeEdit *multi_node_edit = Object::cast_to<const MultiNodeEdit>(p_object);
-		const MultiNodeEdit *history_multi_node_edit = Object::cast_to<const MultiNodeEdit>(ObjectDB::get_instance(history_id));
+		const MultiNodeEdit *history_multi_node_edit = ObjectDB::get_instance<MultiNodeEdit>(history_id);
 		if (multi_node_edit && history_multi_node_edit && multi_node_edit->is_same_selection(history_multi_node_edit)) {
 			return;
 		}
@@ -2528,12 +2652,13 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update
 		InspectorDock::get_inspector_singleton()->edit(nullptr);
 		NodeDock::get_singleton()->set_node(nullptr);
 		InspectorDock::get_singleton()->update(nullptr);
+		EditorDebuggerNode::get_singleton()->clear_remote_tree_selection();
 		hide_unused_editors();
 		return;
 	}
 
 	// Update the use folding setting and state.
-	bool disable_folding = bool(EDITOR_GET("interface/inspector/disable_folding")) || current_obj->is_class("EditorDebuggerRemoteObject");
+	bool disable_folding = bool(EDITOR_GET("interface/inspector/disable_folding")) || current_obj->is_class("EditorDebuggerRemoteObjects");
 	if (InspectorDock::get_inspector_singleton()->is_using_folding() == disable_folding) {
 		InspectorDock::get_inspector_singleton()->set_use_folding(!disable_folding, false);
 	}
@@ -2561,6 +2686,7 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update
 			SceneTreeDock::get_singleton()->set_selected(nullptr);
 			NodeDock::get_singleton()->set_node(nullptr);
 			InspectorDock::get_singleton()->update(nullptr);
+			EditorDebuggerNode::get_singleton()->clear_remote_tree_selection();
 			ImportDock::get_singleton()->set_edit_path(current_res->get_path());
 		}
 
@@ -2600,6 +2726,7 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update
 			SceneTreeDock::get_singleton()->set_selected(nullptr);
 			InspectorDock::get_singleton()->update(nullptr);
 		}
+		EditorDebuggerNode::get_singleton()->clear_remote_tree_selection();
 
 		if (get_edited_scene() && !get_edited_scene()->get_scene_file_path().is_empty()) {
 			String source_scene = get_edited_scene()->get_scene_file_path();
@@ -2608,7 +2735,6 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update
 				info_is_warning = true;
 			}
 		}
-
 	} else {
 		Node *selected_node = nullptr;
 
@@ -2634,6 +2760,10 @@ void EditorNode::_edit_current(bool p_skip_foreign, bool p_skip_inspector_update
 			}
 		}
 
+		if (!current_obj->is_class("EditorDebuggerRemoteObjects")) {
+			EditorDebuggerNode::get_singleton()->clear_remote_tree_selection();
+		}
+
 		InspectorDock::get_inspector_singleton()->edit(current_obj);
 		NodeDock::get_singleton()->set_node(nullptr);
 		SceneTreeDock::get_singleton()->set_selected(selected_node);
@@ -2714,6 +2844,26 @@ void EditorNode::_android_explore_build_templates() {
 	OS::get_singleton()->shell_show_in_file_manager(ProjectSettings::get_singleton()->globalize_path(export_template_manager->get_android_build_directory(android_export_preset).get_base_dir()), true);
 }
 
+static String _get_unsaved_scene_dialog_text(String p_scene_filename, uint64_t p_started_timestamp) {
+	String unsaved_message;
+
+	// Consider editor startup to be a point of saving, so that when you
+	// close and reopen the editor, you don't get an excessively long
+	// "modified X hours ago".
+	const uint64_t last_modified_seconds = Time::get_singleton()->get_unix_time_from_system() - MAX(p_started_timestamp, FileAccess::get_modified_time(p_scene_filename));
+	String last_modified_string;
+	if (last_modified_seconds < 120) {
+		last_modified_string = vformat(TTRN("%d second ago", "%d seconds ago", last_modified_seconds), last_modified_seconds);
+	} else if (last_modified_seconds < 7200) {
+		last_modified_string = vformat(TTRN("%d minute ago", "%d minutes ago", last_modified_seconds / 60), last_modified_seconds / 60);
+	} else {
+		last_modified_string = vformat(TTRN("%d hour ago", "%d hours ago", last_modified_seconds / 3600), last_modified_seconds / 3600);
+	}
+	unsaved_message = vformat(TTR("Scene \"%s\" has unsaved changes.\nLast saved: %s."), p_scene_filename, last_modified_string);
+
+	return unsaved_message;
+}
+
 void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 	if (!p_confirmed) { // FIXME: this may be a hack.
 		current_menu_option = (MenuOptions)p_option;
@@ -2752,13 +2902,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			quick_open_dialog->popup_dialog({ "Script" }, callable_mp(this, &EditorNode::_quick_opened));
 		} break;
 		case FILE_OPEN_PREV: {
-			if (previous_scenes.is_empty()) {
-				break;
+			if (!prev_closed_scenes.is_empty()) {
+				load_scene(prev_closed_scenes.back()->get());
 			}
-			opening_prev = true;
-			open_request(previous_scenes.back()->get());
-			previous_scenes.pop_back();
-
 		} break;
 		case EditorSceneTabs::SCENE_CLOSE_OTHERS: {
 			tab_closing_menu_option = -1;
@@ -2810,8 +2956,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			}
 			[[fallthrough]];
 		}
+		case FILE_MULTI_SAVE_AS_SCENE:
 		case FILE_SAVE_AS_SCENE: {
-			int scene_idx = (p_option == FILE_SAVE_SCENE || p_option == FILE_SAVE_AS_SCENE) ? -1 : tab_closing_idx;
+			int scene_idx = (p_option == FILE_SAVE_SCENE || p_option == FILE_SAVE_AS_SCENE || p_option == FILE_MULTI_SAVE_AS_SCENE) ? -1 : tab_closing_idx;
 
 			Node *scene = editor_data.get_edited_scene_root(scene_idx);
 
@@ -2847,9 +2994,12 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 
 			if (!scene->get_scene_file_path().is_empty()) {
 				String path = scene->get_scene_file_path();
+				String root_name = EditorNode::adjust_scene_name_casing(scene->get_name());
+				String ext = path.get_extension().to_lower();
+				path = path.get_base_dir().path_join(root_name + "." + ext);
+
 				file->set_current_path(path);
 				if (extensions.size()) {
-					String ext = path.get_extension().to_lower();
 					if (extensions.find(ext) == nullptr) {
 						file->set_current_path(path.replacen("." + ext, "." + extensions.front()->get()));
 					}
@@ -2880,14 +3030,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			String resource_path = ProjectSettings::get_singleton()->get_resource_path();
 			const String base_path = resource_path.substr(0, resource_path.rfind_char('/')) + "/";
 
-			file->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
-			file->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-			file->clear_filters();
-			file->set_current_path(base_path);
-			file->set_current_file(ProjectZIPPacker::get_project_zip_safe_name());
-			file->add_filter("*.zip", "ZIP Archive");
-			file->set_title(TTR("Pack Project as ZIP..."));
-			file->popup_file_dialog();
+			file_pack_zip->set_current_path(base_path);
+			file_pack_zip->set_current_file(ProjectZIPPacker::get_project_zip_safe_name());
+			file_pack_zip->popup_file_dialog();
 		} break;
 
 		case FILE_UNDO: {
@@ -2947,31 +3092,28 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 				break;
 			}
 
-			String filename = scene->get_scene_file_path();
+			String scene_filename = scene->get_scene_file_path();
+			String unsaved_message;
 
-			if (filename.is_empty()) {
+			if (scene_filename.is_empty()) {
 				show_warning(TTR("Can't reload a scene that was never saved."));
 				break;
 			}
 
-			if (unsaved_cache && !p_confirmed) {
-				confirmation->set_ok_button_text(TTR("Reload Saved Scene"));
-				confirmation->set_text(
-						TTR("The current scene has unsaved changes.\nReload the saved scene anyway? This action cannot be undone."));
-				confirmation->popup_centered();
-				break;
+			if (unsaved_cache) {
+				if (!p_confirmed) {
+					confirmation->set_ok_button_text(TTRC("Save & Reload"));
+					unsaved_message = _get_unsaved_scene_dialog_text(scene_filename, started_timestamp);
+					confirmation->set_text(unsaved_message + "\n\n" + TTR("Save before reloading the scene?"));
+					confirmation->popup_centered();
+					confirmation_button->grab_focus();
+					break;
+				} else {
+					_save_scene_with_preview(scene_filename);
+				}
 			}
 
-			int cur_idx = editor_data.get_edited_scene();
-			_remove_edited_scene();
-			Error err = load_scene(filename);
-			if (err != OK) {
-				ERR_PRINT("Failed to load scene");
-			}
-			editor_data.move_edited_scene_to_index(cur_idx);
-			EditorUndoRedoManager::get_singleton()->clear_history(editor_data.get_current_edited_scene_history_id(), false);
-			scene_tabs->set_current_tab(cur_idx);
-
+			_discard_changes();
 		} break;
 
 		case EditorSceneTabs::SCENE_SHOW_IN_FILESYSTEM: {
@@ -3043,6 +3185,19 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			}
 
 			if (!p_confirmed) {
+				if (project_run_bar->is_playing()) {
+					if (p_option == PROJECT_RELOAD_CURRENT_PROJECT) {
+						confirmation->set_text(TTR("Stop running project before reloading the current project?"));
+						confirmation->set_ok_button_text(TTR("Stop & Reload"));
+					} else {
+						confirmation->set_text(TTR("Stop running project before exiting the editor?"));
+						confirmation->set_ok_button_text(TTR("Stop & Quit"));
+					}
+					confirmation->reset_size();
+					confirmation->popup_centered();
+					break;
+				}
+
 				bool save_each = EDITOR_GET("interface/editor/save_each_scene_on_quit");
 				if (_next_unsaved_scene(!save_each) == -1) {
 					if (EditorUndoRedoManager::get_singleton()->is_history_unsaved(EditorUndoRedoManager::GLOBAL_HISTORY)) {
@@ -3183,7 +3338,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
 			command_palette->open_popup();
 		} break;
 		case HELP_DOCS: {
-			OS::get_singleton()->shell_open(VERSION_DOCS_URL "/");
+			OS::get_singleton()->shell_open(GODOT_VERSION_DOCS_URL "/");
 		} break;
 		case HELP_FORUM: {
 			OS::get_singleton()->shell_open("https://forum.godotengine.org/");
@@ -3219,11 +3374,13 @@ String EditorNode::adjust_scene_name_casing(const String &p_root_name) {
 			// Use casing of the root node.
 			break;
 		case SCENE_NAME_CASING_PASCAL_CASE:
-			return p_root_name.replace("-", "_").to_pascal_case();
+			return p_root_name.to_pascal_case();
 		case SCENE_NAME_CASING_SNAKE_CASE:
-			return p_root_name.replace("-", "_").to_snake_case();
+			return p_root_name.to_snake_case();
 		case SCENE_NAME_CASING_KEBAB_CASE:
-			return p_root_name.to_snake_case().replace("_", "-");
+			return p_root_name.to_kebab_case();
+		case SCENE_NAME_CASING_CAMEL_CASE:
+			return p_root_name.to_camel_case();
 	}
 	return p_root_name;
 }
@@ -3240,11 +3397,13 @@ String EditorNode::adjust_script_name_casing(const String &p_file_name, ScriptLa
 			// Script language has no preference, so do not adjust.
 			break;
 		case ScriptLanguage::SCRIPT_NAME_CASING_PASCAL_CASE:
-			return p_file_name.replace("-", "_").to_pascal_case();
+			return p_file_name.to_pascal_case();
 		case ScriptLanguage::SCRIPT_NAME_CASING_SNAKE_CASE:
-			return p_file_name.replace("-", "_").to_snake_case();
+			return p_file_name.to_snake_case();
 		case ScriptLanguage::SCRIPT_NAME_CASING_KEBAB_CASE:
-			return p_file_name.to_snake_case().replace("_", "-");
+			return p_file_name.to_kebab_case();
+		case ScriptLanguage::SCRIPT_NAME_CASING_CAMEL_CASE:
+			return p_file_name.to_camel_case();
 	}
 	return p_file_name;
 }
@@ -3254,7 +3413,7 @@ void EditorNode::_request_screenshot() {
 }
 
 void EditorNode::_screenshot(bool p_use_utc) {
-	String name = "editor_screenshot_" + Time::get_singleton()->get_datetime_string_from_system(p_use_utc).replace(":", "") + ".png";
+	String name = "editor_screenshot_" + Time::get_singleton()->get_datetime_string_from_system(p_use_utc).remove_char(':') + ".png";
 	NodePath path = String("user://") + name;
 	_save_screenshot(path);
 	if (EDITOR_GET("interface/editor/automatically_open_screenshots")) {
@@ -3278,6 +3437,7 @@ void EditorNode::_save_screenshot(NodePath p_path) {
 void EditorNode::_check_system_theme_changed() {
 	DisplayServer *display_server = DisplayServer::get_singleton();
 
+	bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
 	bool system_theme_changed = false;
 
 	if (follow_system_theme) {
@@ -3301,6 +3461,17 @@ void EditorNode::_check_system_theme_changed() {
 
 	if (system_theme_changed) {
 		_update_theme();
+	} else if (global_menu && display_server->is_dark_mode_supported() && display_server->is_dark_mode() != last_dark_mode_state) {
+		last_dark_mode_state = display_server->is_dark_mode();
+
+		// Update system menus.
+		bool dark_mode = DisplayServer::get_singleton()->is_dark_mode();
+
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_SEARCH), _get_editor_theme_native_menu_icon(SNAME("HelpSearch"), global_menu, dark_mode));
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_COPY_SYSTEM_INFO), _get_editor_theme_native_menu_icon(SNAME("ActionCopy"), global_menu, dark_mode));
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_ABOUT), _get_editor_theme_native_menu_icon(SNAME("Godot"), global_menu, dark_mode));
+		help_menu->set_item_icon(help_menu->get_item_index(HELP_SUPPORT_GODOT_DEVELOPMENT), _get_editor_theme_native_menu_icon(SNAME("Heart"), global_menu, dark_mode));
+		editor_dock_manager->update_docks_menu();
 	}
 }
 
@@ -3312,11 +3483,8 @@ void EditorNode::_tool_menu_option(int p_idx) {
 		case TOOLS_BUILD_PROFILE_MANAGER: {
 			build_profile_manager->popup_centered_clamped(Size2(700, 800) * EDSCALE, 0.8);
 		} break;
-		case TOOLS_SURFACE_UPGRADE: {
-			surface_upgrade_dialog->popup_on_demand();
-		} break;
-		case TOOLS_UID_UPGRADE: {
-			uid_upgrade_dialog->popup_on_demand();
+		case TOOLS_PROJECT_UPGRADE: {
+			project_upgrade_tool->popup_dialog();
 		} break;
 		case TOOLS_CUSTOM: {
 			if (tool_menu->get_item_submenu(p_idx) == "") {
@@ -3423,10 +3591,7 @@ void EditorNode::_discard_changes(const String &p_str) {
 		case SCENE_TAB_CLOSE: {
 			Node *scene = editor_data.get_edited_scene_root(tab_closing_idx);
 			if (scene != nullptr) {
-				String scene_filename = scene->get_scene_file_path();
-				if (!scene_filename.is_empty()) {
-					previous_scenes.push_back(scene_filename);
-				}
+				_update_prev_closed_scenes(scene->get_scene_file_path(), true);
 			}
 
 			// Don't close tabs when exiting the editor (required for "restore_scenes_on_load" setting).
@@ -3436,6 +3601,25 @@ void EditorNode::_discard_changes(const String &p_str) {
 			}
 			_proceed_closing_scene_tabs();
 		} break;
+		case FILE_RELOAD_SAVED_SCENE: {
+			Node *scene = get_edited_scene();
+
+			String scene_filename = scene->get_scene_file_path();
+
+			int cur_idx = editor_data.get_edited_scene();
+
+			_remove_edited_scene();
+
+			Error err = load_scene(scene_filename);
+			if (err != OK) {
+				ERR_PRINT("Failed to load scene");
+			}
+			editor_data.move_edited_scene_to_index(cur_idx);
+			EditorUndoRedoManager::get_singleton()->clear_history(editor_data.get_current_edited_scene_history_id(), false);
+			scene_tabs->set_current_tab(cur_idx);
+
+			confirmation->hide();
+		} break;
 		case FILE_QUIT: {
 			project_run_bar->stop_playing();
 			_exit_editor(EXIT_SUCCESS);
@@ -3451,14 +3635,23 @@ void EditorNode::_discard_changes(const String &p_str) {
 }
 
 void EditorNode::_update_file_menu_opened() {
-	file_menu->set_item_disabled(file_menu->get_item_index(FILE_OPEN_PREV), previous_scenes.is_empty());
+	bool has_unsaved = false;
+	for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
+		if (_is_scene_unsaved(i)) {
+			has_unsaved = true;
+			break;
+		}
+	}
+	if (has_unsaved) {
+		file_menu->set_item_disabled(file_menu->get_item_index(FILE_SAVE_ALL_SCENES), false);
+		file_menu->set_item_tooltip(file_menu->get_item_index(FILE_SAVE_ALL_SCENES), String());
+	} else {
+		file_menu->set_item_disabled(file_menu->get_item_index(FILE_SAVE_ALL_SCENES), true);
+		file_menu->set_item_tooltip(file_menu->get_item_index(FILE_SAVE_ALL_SCENES), TTR("All scenes are already saved."));
+	}
 	_update_undo_redo_allowed();
 }
 
-void EditorNode::_update_file_menu_closed() {
-	file_menu->set_item_disabled(file_menu->get_item_index(FILE_OPEN_PREV), false);
-}
-
 void EditorNode::_palette_quick_open_dialog() {
 	quick_open_color_palette->popup_dialog({ "ColorPalette" }, palette_file_selected_callback);
 	quick_open_color_palette->set_title(TTR("Quick Open Color Palette..."));
@@ -3513,10 +3706,8 @@ void EditorNode::replace_resources_in_object(Object *p_object, const Vector<Ref<
 			} break;
 			case Variant::DICTIONARY: {
 				Dictionary d = p_object->get(E.name);
-				List<Variant> keys;
 				bool dictionary_requires_updating = false;
-				d.get_key_list(&keys);
-				for (const Variant &F : keys) {
+				for (const Variant &F : d.get_key_list()) {
 					Variant v = d[F];
 					Ref<Resource> res = v;
 
@@ -3592,7 +3783,7 @@ void EditorNode::add_extension_editor_plugin(const StringName &p_class_name) {
 	ERR_FAIL_COND_MSG(!ClassDB::is_parent_class(p_class_name, SNAME("EditorPlugin")), vformat("Class is not an editor plugin: %s", p_class_name));
 	ERR_FAIL_COND_MSG(singleton->editor_data.has_extension_editor_plugin(p_class_name), vformat("Editor plugin already added for class: %s", p_class_name));
 
-	EditorPlugin *plugin = Object::cast_to<EditorPlugin>(ClassDB::instantiate(p_class_name));
+	EditorPlugin *plugin = Object::cast_to<EditorPlugin>(ClassDB::_instantiate_allow_unexposed(p_class_name));
 	singleton->editor_data.add_extension_editor_plugin(p_class_name, plugin);
 	add_editor_plugin(plugin);
 }
@@ -3622,7 +3813,7 @@ void EditorNode::_update_addon_config() {
 		enabled_addons.push_back(E.key);
 	}
 
-	if (enabled_addons.size() == 0) {
+	if (enabled_addons.is_empty()) {
 		ProjectSettings::get_singleton()->set("editor_plugins/enabled", Variant());
 	} else {
 		enabled_addons.sort();
@@ -3976,6 +4167,8 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 	}
 
 	String lpath = ProjectSettings::get_singleton()->localize_path(ResourceUID::ensure_path(p_scene));
+	_update_prev_closed_scenes(lpath, false);
+
 	if (!p_set_inherited) {
 		for (int i = 0; i < editor_data.get_edited_scene_count(); i++) {
 			if (editor_data.get_scene_path(i) == lpath) {
@@ -3995,7 +4188,6 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 
 	if (!lpath.begins_with("res://")) {
 		show_accept(TTR("Error loading scene, it must be inside the project path. Use 'Import' to open the scene, then save it inside the project path."), TTR("OK"));
-		opening_prev = false;
 		return ERR_FILE_NOT_FOUND;
 	}
 
@@ -4025,8 +4217,7 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 		for (const String &E : dependency_errors[lpath]) {
 			errors.push_back(E);
 		}
-		dependency_error->show(DependencyErrorDialog::MODE_SCENE, lpath, errors);
-		opening_prev = false;
+		dependency_error->show(lpath, errors);
 
 		if (prev != -1 && prev != idx) {
 			_set_current_scene(prev);
@@ -4037,7 +4228,6 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 
 	if (sdata.is_null()) {
 		_dialog_display_load_error(lpath, err);
-		opening_prev = false;
 
 		if (prev != -1 && prev != idx) {
 			_set_current_scene(prev);
@@ -4070,11 +4260,9 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 	}
 
 	Node *new_scene = sdata->instantiate(p_set_inherited ? PackedScene::GEN_EDIT_STATE_MAIN_INHERITED : PackedScene::GEN_EDIT_STATE_MAIN);
-
 	if (!new_scene) {
 		sdata.unref();
 		_dialog_display_load_error(lpath, ERR_FILE_CORRUPT);
-		opening_prev = false;
 		if (prev != -1 && prev != idx) {
 			_set_current_scene(prev);
 			editor_data.remove_scene(idx);
@@ -4108,8 +4296,6 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b
 		editor_folding.save_scene_folding(new_scene, lpath);
 	}
 
-	opening_prev = false;
-
 	EditorDebuggerNode::get_singleton()->update_live_edit_root();
 
 	if (restoring_scenes) {
@@ -4490,19 +4676,8 @@ void EditorNode::replace_history_reimported_nodes(Node *p_original_root_node, No
 	}
 }
 
-void EditorNode::open_request(const String &p_path, bool p_set_inherited) {
-	if (!opening_prev) {
-		List<String>::Element *prev_scene_item = previous_scenes.find(p_path);
-		if (prev_scene_item != nullptr) {
-			prev_scene_item->erase();
-		}
-	}
-
-	load_scene(p_path, false, p_set_inherited); // As it will be opened in separate tab.
-}
-
-bool EditorNode::has_previous_scenes() const {
-	return !previous_scenes.is_empty();
+bool EditorNode::has_previous_closed_scenes() const {
+	return !prev_closed_scenes.is_empty();
 }
 
 void EditorNode::edit_foreign_resource(Ref<Resource> p_resource) {
@@ -4583,6 +4758,17 @@ void EditorNode::_show_messages() {
 	center_split->set_split_offset(old_split_ofs);
 }
 
+void EditorNode::_update_prev_closed_scenes(const String &p_scene_path, bool p_add_scene) {
+	if (!p_scene_path.is_empty()) {
+		if (p_add_scene) {
+			prev_closed_scenes.push_back(p_scene_path);
+		} else {
+			prev_closed_scenes.erase(p_scene_path);
+		}
+		file_menu->set_item_disabled(file_menu->get_item_index(FILE_OPEN_PREV), prev_closed_scenes.is_empty());
+	}
+}
+
 void EditorNode::_add_to_recent_scenes(const String &p_scene) {
 	Array rc = EditorSettings::get_singleton()->get_project_metadata("recent_files", "scenes", Array());
 	if (rc.has(p_scene)) {
@@ -4625,15 +4811,12 @@ void EditorNode::_update_recent_scenes() {
 
 	recent_scenes->add_separator();
 	recent_scenes->add_shortcut(ED_SHORTCUT("editor/clear_recent", TTRC("Clear Recent Scenes")));
+	recent_scenes->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_ALWAYS);
 	recent_scenes->reset_size();
 }
 
 void EditorNode::_quick_opened(const String &p_file_path) {
-	if (ClassDB::is_parent_class(ResourceLoader::get_resource_type(p_file_path), "PackedScene")) {
-		open_request(p_file_path);
-	} else {
-		load_resource(p_file_path);
-	}
+	load_scene_or_resource(p_file_path);
 }
 
 void EditorNode::_project_run_started() {
@@ -4883,7 +5066,8 @@ Ref<Texture2D> EditorNode::get_object_icon(const Object *p_object, const String
 
 	Ref<Script> scr = p_object->get_script();
 
-	if (Object::cast_to<EditorDebuggerRemoteObject>(p_object)) {
+	const EditorDebuggerRemoteObjects *robjs = Object::cast_to<EditorDebuggerRemoteObjects>(p_object);
+	if (robjs) {
 		String class_name;
 		if (scr.is_valid()) {
 			class_name = scr->get_global_name();
@@ -4893,7 +5077,12 @@ Ref<Texture2D> EditorNode::get_object_icon(const Object *p_object, const String
 				class_name = scr->get_path();
 			}
 		}
-		return get_class_icon(class_name.is_empty() ? Object::cast_to<EditorDebuggerRemoteObject>(p_object)->type_name : class_name, p_fallback);
+
+		if (class_name.is_empty()) {
+			return get_class_icon(robjs->type_name, p_fallback);
+		}
+
+		return get_class_icon(class_name, p_fallback);
 	}
 
 	if (scr.is_null() && p_object->is_class("Script")) {
@@ -4944,7 +5133,7 @@ bool EditorNode::is_object_of_custom_type(const Object *p_object, const StringNa
 void EditorNode::progress_add_task(const String &p_task, const String &p_label, int p_steps, bool p_can_cancel) {
 	if (!singleton) {
 		return;
-	} else if (singleton->cmdline_export_mode) {
+	} else if (singleton->cmdline_mode) {
 		print_line(p_task + ": begin: " + p_label + " steps: " + itos(p_steps));
 	} else if (singleton->progress_dialog) {
 		singleton->progress_dialog->add_task(p_task, p_label, p_steps, p_can_cancel);
@@ -4954,7 +5143,7 @@ void EditorNode::progress_add_task(const String &p_task, const String &p_label,
 bool EditorNode::progress_task_step(const String &p_task, const String &p_state, int p_step, bool p_force_refresh) {
 	if (!singleton) {
 		return false;
-	} else if (singleton->cmdline_export_mode) {
+	} else if (singleton->cmdline_mode) {
 		print_line("\t" + p_task + ": step " + itos(p_step) + ": " + p_state);
 		return false;
 	} else if (singleton->progress_dialog) {
@@ -4967,7 +5156,7 @@ bool EditorNode::progress_task_step(const String &p_task, const String &p_state,
 void EditorNode::progress_end_task(const String &p_task) {
 	if (!singleton) {
 		return;
-	} else if (singleton->cmdline_export_mode) {
+	} else if (singleton->cmdline_mode) {
 		print_line(p_task + ": end");
 	} else if (singleton->progress_dialog) {
 		singleton->progress_dialog->end_task(p_task);
@@ -5010,17 +5199,17 @@ String EditorNode::_get_system_info() const {
 	}
 	const String distribution_version = OS::get_singleton()->get_version_alias();
 
-	String godot_version = "Godot v" + String(VERSION_FULL_CONFIG);
-	if (String(VERSION_BUILD) != "official") {
-		String hash = String(VERSION_HASH);
+	String godot_version = "Godot v" + String(GODOT_VERSION_FULL_CONFIG);
+	if (String(GODOT_VERSION_BUILD) != "official") {
+		String hash = String(GODOT_VERSION_HASH);
 		hash = hash.is_empty() ? String("unknown") : vformat("(%s)", hash.left(9));
 		godot_version += " " + hash;
 	}
 
 	String display_session_type;
 #ifdef LINUXBSD_ENABLED
-	// `replace` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
-	display_session_type = OS::get_singleton()->get_environment("XDG_SESSION_TYPE").capitalize().replace(" ", "");
+	// `remove_char` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
+	display_session_type = OS::get_singleton()->get_environment("XDG_SESSION_TYPE").capitalize().remove_char(' ');
 #endif // LINUXBSD_ENABLED
 	String driver_name = OS::get_singleton()->get_current_rendering_driver_name().to_lower();
 	String rendering_method = OS::get_singleton()->get_current_rendering_method().to_lower();
@@ -5092,8 +5281,8 @@ String EditorNode::_get_system_info() const {
 
 	String display_driver_window_mode;
 #ifdef LINUXBSD_ENABLED
-	// `replace` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
-	display_driver_window_mode = DisplayServer::get_singleton()->get_name().capitalize().replace(" ", "") + " display driver";
+	// `remove_char` is necessary, because `capitalize` introduces a whitespace between "x" and "11".
+	display_driver_window_mode = DisplayServer::get_singleton()->get_name().capitalize().remove_char(' ') + " display driver";
 #endif // LINUXBSD_ENABLED
 	if (!display_driver_window_mode.is_empty()) {
 		display_driver_window_mode += ", ";
@@ -5220,7 +5409,7 @@ Error EditorNode::export_preset(const String &p_preset, const String &p_path, bo
 	export_defer.android_build_template = p_android_build_template;
 	export_defer.patch = p_patch;
 	export_defer.patches = p_patches;
-	cmdline_export_mode = true;
+	cmdline_mode = true;
 	return OK;
 }
 
@@ -5513,6 +5702,25 @@ bool EditorNode::ensure_main_scene(bool p_from_native) {
 	return true;
 }
 
+bool EditorNode::validate_custom_directory() {
+	bool use_custom_dir = GLOBAL_GET("application/config/use_custom_user_dir");
+
+	if (use_custom_dir) {
+		String data_dir = OS::get_singleton()->get_user_data_dir();
+		Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_USERDATA);
+		if (dir->change_dir(data_dir) != OK) {
+			dir->make_dir_recursive(data_dir);
+			if (dir->change_dir(data_dir) != OK) {
+				open_project_settings->set_text(vformat(TTR("User data dir '%s' is not valid. Change to a valid one?"), data_dir));
+				open_project_settings->popup_centered();
+				return false;
+			}
+		}
+	}
+
+	return true;
+}
+
 void EditorNode::_immediate_dialog_confirmed() {
 	immediate_dialog_confirmed = true;
 }
@@ -5574,6 +5782,7 @@ void EditorNode::_update_layouts_menu() {
 		}
 
 		editor_layouts->add_item(layout);
+		editor_layouts->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_DISABLED);
 	}
 }
 
@@ -5638,6 +5847,16 @@ void EditorNode::_proceed_closing_scene_tabs() {
 	_scene_tab_closed(tab_idx);
 }
 
+void EditorNode::_proceed_save_asing_scene_tabs() {
+	if (scenes_to_save_as.is_empty()) {
+		return;
+	}
+	int scene_idx = scenes_to_save_as.front()->get();
+	scenes_to_save_as.pop_front();
+	_set_current_scene(scene_idx);
+	_menu_option_confirm(FILE_MULTI_SAVE_AS_SCENE, false);
+}
+
 bool EditorNode::_is_closing_editor() const {
 	return tab_closing_menu_option == FILE_QUIT || tab_closing_menu_option == PROJECT_QUIT_TO_PROJECT_MANAGER || tab_closing_menu_option == PROJECT_RELOAD_CURRENT_PROJECT;
 }
@@ -5700,19 +5919,7 @@ void EditorNode::_scene_tab_closed(int p_tab) {
 		if (scene_filename.is_empty()) {
 			unsaved_message = TTR("This scene was never saved.");
 		} else {
-			// Consider editor startup to be a point of saving, so that when you
-			// close and reopen the editor, you don't get an excessively long
-			// "modified X hours ago".
-			const uint64_t last_modified_seconds = Time::get_singleton()->get_unix_time_from_system() - MAX(started_timestamp, FileAccess::get_modified_time(scene->get_scene_file_path()));
-			String last_modified_string;
-			if (last_modified_seconds < 120) {
-				last_modified_string = vformat(TTRN("%d second ago", "%d seconds ago", last_modified_seconds), last_modified_seconds);
-			} else if (last_modified_seconds < 7200) {
-				last_modified_string = vformat(TTRN("%d minute ago", "%d minutes ago", last_modified_seconds / 60), last_modified_seconds / 60);
-			} else {
-				last_modified_string = vformat(TTRN("%d hour ago", "%d hours ago", last_modified_seconds / 3600), last_modified_seconds / 3600);
-			}
-			unsaved_message = vformat(TTR("Scene \"%s\" has unsaved changes.\nLast saved: %s."), scene_filename, last_modified_string);
+			unsaved_message = _get_unsaved_scene_dialog_text(scene_filename, started_timestamp);
 		}
 	} else {
 		// Check if any plugin has unsaved changes in that scene.
@@ -6151,7 +6358,7 @@ void EditorNode::preload_reimporting_with_path_in_edited_scenes(const List<Strin
 }
 
 void EditorNode::reload_instances_with_path_in_edited_scenes() {
-	if (scenes_modification_table.size() == 0) {
+	if (scenes_modification_table.is_empty()) {
 		return;
 	}
 	EditorProgress progress("reloading_scene", TTR("Scenes reloading"), editor_data.get_edited_scene_count());
@@ -6320,7 +6527,7 @@ void EditorNode::reload_instances_with_path_in_edited_scenes() {
 
 			// Store all the paths for any selected nodes which are ancestors of the node we're replacing.
 			List<NodePath> selected_node_paths;
-			for (Node *selected_node : editor_selection->get_selected_node_list()) {
+			for (Node *selected_node : editor_selection->get_top_selected_node_list()) {
 				if (selected_node == original_node || original_node->is_ancestor_of(selected_node)) {
 					selected_node_paths.push_back(original_node->get_path_to(selected_node));
 					editor_selection->remove_node(selected_node);
@@ -6357,6 +6564,18 @@ void EditorNode::reload_instances_with_path_in_edited_scenes() {
 
 			get_scene_editor_data_for_node(owner, original_node, scene_editor_data_table);
 
+			// The current node being reloaded may also be an additional node for another node
+			// that is in the process of being reloaded.
+			// Replacing the additional node with the new one prevents a crash where nodes
+			// in 'addition_list' are removed from the scene tree and queued for deletion.
+			for (InstanceModificationsEntry &im : scene_modifications->instance_list) {
+				for (AdditiveNodeEntry &additive_node_entry : im.addition_list) {
+					if (additive_node_entry.node == original_node) {
+						additive_node_entry.node = instantiated_node;
+					}
+				}
+			}
+
 			bool original_node_scene_instance_load_placeholder = original_node->get_scene_instance_load_placeholder();
 
 			// Delete all the remaining node children.
@@ -6810,7 +7029,7 @@ int EditorNode::execute_and_show_output(const String &p_title, const String &p_p
 		{
 			MutexLock lock(eta.execute_output_mutex);
 			if (prev_len != eta.output.length()) {
-				String to_add = eta.output.substr(prev_len, eta.output.length());
+				String to_add = eta.output.substr(prev_len);
 				prev_len = eta.output.length();
 				execute_outputs->add_text(to_add);
 				DisplayServer::get_singleton()->process_events(); // Get rid of pending events.
@@ -6848,7 +7067,10 @@ EditorNode::EditorNode() {
 	DEV_ASSERT(!singleton);
 	singleton = this;
 
-	set_translation_domain("godot.editor");
+	// Detecting headless mode, that means the editor is running in command line.
+	if (!DisplayServer::get_singleton()->window_can_draw()) {
+		cmdline_mode = true;
+	}
 
 	Resource::_get_local_scene_func = _resource_get_edited_scene;
 
@@ -6866,8 +7088,12 @@ EditorNode::EditorNode() {
 		}
 
 		// No physics by default if in editor.
+#ifndef PHYSICS_3D_DISABLED
 		PhysicsServer3D::get_singleton()->set_active(false);
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 		PhysicsServer2D::get_singleton()->set_active(false);
+#endif // PHYSICS_2D_DISABLED
 
 		// No scripting by default if in editor (except for tool).
 		ScriptServer::set_scripting_enabled(false);
@@ -6909,18 +7135,11 @@ EditorNode::EditorNode() {
 
 	_update_vsync_mode();
 
-	// Warm up the surface upgrade tool as early as possible.
-	surface_upgrade_tool = memnew(SurfaceUpgradeTool);
-	run_surface_upgrade_tool = EditorSettings::get_singleton()->get_project_metadata("surface_upgrade_tool", "run_on_restart", false);
-	if (run_surface_upgrade_tool) {
-		SurfaceUpgradeTool::get_singleton()->begin_upgrade();
-	}
-
-	// Same for UID upgrade tool.
-	uid_upgrade_tool = memnew(UIDUpgradeTool);
-	run_uid_upgrade_tool = EditorSettings::get_singleton()->get_project_metadata(UIDUpgradeTool::META_UID_UPGRADE_TOOL, UIDUpgradeTool::META_RUN_ON_RESTART, false);
-	if (run_uid_upgrade_tool) {
-		UIDUpgradeTool::get_singleton()->begin_upgrade();
+	// Warm up the project upgrade tool as early as possible.
+	project_upgrade_tool = memnew(ProjectUpgradeTool);
+	run_project_upgrade_tool = EditorSettings::get_singleton()->get_project_metadata(project_upgrade_tool->META_PROJECT_UPGRADE_TOOL, project_upgrade_tool->META_RUN_ON_RESTART, false);
+	if (run_project_upgrade_tool) {
+		project_upgrade_tool->begin_upgrade();
 	}
 
 	{
@@ -6937,7 +7156,7 @@ EditorNode::EditorNode() {
 		switch (display_scale) {
 			case 0:
 				// Try applying a suitable display scale automatically.
-				EditorScale::set_scale(EditorSettings::get_singleton()->get_auto_display_scale());
+				EditorScale::set_scale(EditorSettings::get_auto_display_scale());
 				break;
 			case 1:
 				EditorScale::set_scale(0.75);
@@ -7279,6 +7498,7 @@ EditorNode::EditorNode() {
 	ED_SHORTCUT_AND_COMMAND("editor/toggle_last_opened_bottom_panel", TTRC("Toggle Last Opened Bottom Panel"), KeyModifierMask::CMD_OR_CTRL | Key::J);
 	distraction_free->set_shortcut(ED_GET_SHORTCUT("editor/distraction_free_mode"));
 	distraction_free->set_tooltip_text(TTRC("Toggle distraction-free mode."));
+	distraction_free->set_accessibility_name(TTRC("Distraction-free Mode"));
 	distraction_free->set_toggle_mode(true);
 	scene_tabs->add_extra_button(distraction_free);
 	distraction_free->connect(SceneStringName(pressed), callable_mp(this, &EditorNode::_toggle_distraction_free_mode));
@@ -7296,6 +7516,7 @@ EditorNode::EditorNode() {
 	scene_root->set_as_audio_listener_2d(true);
 
 	bool global_menu = !bool(EDITOR_GET("interface/editor/use_embedded_menu")) && NativeMenu::get_singleton()->has_feature(NativeMenu::FEATURE_GLOBAL_MENU);
+	bool dark_mode = DisplayServer::get_singleton()->is_dark_mode_supported() && DisplayServer::get_singleton()->is_dark_mode();
 	bool can_expand = bool(EDITOR_GET("interface/editor/expand_to_title")) && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_EXTEND_TO_TITLE);
 
 	if (can_expand) {
@@ -7315,7 +7536,7 @@ EditorNode::EditorNode() {
 	main_menu->set_switch_on_hover(true);
 
 	file_menu = memnew(PopupMenu);
-	file_menu->set_name(TTR("Scene"));
+	file_menu->set_name(TTRC("Scene"));
 	main_menu->add_child(file_menu);
 	main_menu->set_menu_tooltip(0, TTR("Operations with scene files."));
 
@@ -7389,6 +7610,7 @@ EditorNode::EditorNode() {
 	file_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/reopen_closed_scene", TTRC("Reopen Closed Scene"), KeyModifierMask::CMD_OR_CTRL + KeyModifierMask::SHIFT + Key::T), FILE_OPEN_PREV);
 
 	recent_scenes = memnew(PopupMenu);
+	recent_scenes->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	file_menu->add_submenu_node_item(TTR("Open Recent"), recent_scenes, FILE_OPEN_RECENT);
 	recent_scenes->connect(SceneStringName(id_pressed), callable_mp(this, &EditorNode::_open_recent_scene));
 
@@ -7440,7 +7662,7 @@ EditorNode::EditorNode() {
 #endif
 
 	project_menu = memnew(PopupMenu);
-	project_menu->set_name(TTR("Project"));
+	project_menu->set_name(TTRC("Project"));
 	main_menu->add_child(project_menu);
 
 	project_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/project_settings", TTRC("Project Settings..."), Key::NONE, TTRC("Project Settings")), PROJECT_OPEN_SETTINGS);
@@ -7464,8 +7686,7 @@ EditorNode::EditorNode() {
 	project_menu->add_submenu_node_item(TTR("Tools"), tool_menu);
 	tool_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/orphan_resource_explorer", TTRC("Orphan Resource Explorer...")), TOOLS_ORPHAN_RESOURCES);
 	tool_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/engine_compilation_configuration_editor", TTRC("Engine Compilation Configuration Editor...")), TOOLS_BUILD_PROFILE_MANAGER);
-	tool_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/upgrade_mesh_surfaces", TTRC("Upgrade Mesh Surfaces...")), TOOLS_SURFACE_UPGRADE);
-	tool_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/upgrade_uids", TTRC("Upgrade UIDs...")), TOOLS_UID_UPGRADE);
+	tool_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/upgrade_project", TTRC("Upgrade Project Files...")), TOOLS_PROJECT_UPGRADE);
 
 	project_menu->add_separator();
 	project_menu->add_shortcut(ED_SHORTCUT("editor/reload_current_project", TTRC("Reload Current Project")), PROJECT_RELOAD_CURRENT_PROJECT);
@@ -7495,14 +7716,15 @@ EditorNode::EditorNode() {
 	main_editor_button_hb->set_mouse_filter(Control::MOUSE_FILTER_STOP);
 	editor_main_screen->set_button_container(main_editor_button_hb);
 	title_bar->add_child(main_editor_button_hb);
+	title_bar->set_center_control(main_editor_button_hb);
 
 	// Options are added and handled by DebuggerEditorPlugin.
 	debug_menu = memnew(PopupMenu);
-	debug_menu->set_name(TTR("Debug"));
+	debug_menu->set_name(TTRC("Debug"));
 	main_menu->add_child(debug_menu);
 
 	settings_menu = memnew(PopupMenu);
-	settings_menu->set_name(TTR("Editor"));
+	settings_menu->set_name(TTRC("Editor"));
 	main_menu->add_child(settings_menu);
 
 #ifdef MACOS_ENABLED
@@ -7518,7 +7740,6 @@ EditorNode::EditorNode() {
 	settings_menu->add_submenu_node_item(TTR("Editor Docks"), editor_dock_manager->get_docks_menu());
 
 	editor_layouts = memnew(PopupMenu);
-	editor_layouts->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	settings_menu->add_submenu_node_item(TTR("Editor Layout"), editor_layouts);
 	editor_layouts->connect(SceneStringName(id_pressed), callable_mp(this, &EditorNode::_layout_menu_option));
 	settings_menu->add_separator();
@@ -7553,7 +7774,7 @@ EditorNode::EditorNode() {
 #endif
 
 	help_menu = memnew(PopupMenu);
-	help_menu->set_name(TTR("Help"));
+	help_menu->set_name(TTRC("Help"));
 	if (global_menu && NativeMenu::get_singleton()->has_system_menu(NativeMenu::HELP_MENU_ID)) {
 		help_menu->set_system_menu(NativeMenu::HELP_MENU_ID);
 	}
@@ -7563,13 +7784,13 @@ EditorNode::EditorNode() {
 
 	ED_SHORTCUT_AND_COMMAND("editor/editor_help", TTRC("Search Help..."), Key::F1);
 	ED_SHORTCUT_OVERRIDE("editor/editor_help", "macos", KeyModifierMask::ALT | Key::SPACE);
-	help_menu->add_icon_shortcut(theme->get_icon(SNAME("HelpSearch"), EditorStringName(EditorIcons)), ED_GET_SHORTCUT("editor/editor_help"), HELP_SEARCH);
+	help_menu->add_icon_shortcut(_get_editor_theme_native_menu_icon(SNAME("HelpSearch"), global_menu, dark_mode), ED_GET_SHORTCUT("editor/editor_help"), HELP_SEARCH);
 	help_menu->add_separator();
 	help_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/online_docs", TTRC("Online Documentation")), HELP_DOCS);
 	help_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/forum", TTRC("Forum")), HELP_FORUM);
 	help_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/community", TTRC("Community")), HELP_COMMUNITY);
 	help_menu->add_separator();
-	help_menu->add_icon_shortcut(theme->get_icon(SNAME("ActionCopy"), EditorStringName(EditorIcons)), ED_SHORTCUT_AND_COMMAND("editor/copy_system_info", TTRC("Copy System Info")), HELP_COPY_SYSTEM_INFO);
+	help_menu->add_icon_shortcut(_get_editor_theme_native_menu_icon(SNAME("ActionCopy"), global_menu, dark_mode), ED_SHORTCUT_AND_COMMAND("editor/copy_system_info", TTRC("Copy System Info")), HELP_COPY_SYSTEM_INFO);
 	help_menu->set_item_tooltip(-1, TTR("Copies the system info as a single-line text into the clipboard."));
 	help_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/report_a_bug", TTRC("Report a Bug")), HELP_REPORT_A_BUG);
 	help_menu->add_shortcut(ED_SHORTCUT_AND_COMMAND("editor/suggest_a_feature", TTRC("Suggest a Feature")), HELP_SUGGEST_A_FEATURE);
@@ -7577,9 +7798,9 @@ EditorNode::EditorNode() {
 	help_menu->add_separator();
 	if (!global_menu || !OS::get_singleton()->has_feature("macos")) {
 		// On macOS  "Quit" and "About" options are in the "app" menu.
-		help_menu->add_icon_shortcut(theme->get_icon(SNAME("Godot"), EditorStringName(EditorIcons)), ED_SHORTCUT_AND_COMMAND("editor/about", TTRC("About Godot...")), HELP_ABOUT);
+		help_menu->add_icon_shortcut(_get_editor_theme_native_menu_icon(SNAME("Godot"), global_menu, dark_mode), ED_SHORTCUT_AND_COMMAND("editor/about", TTRC("About Godot...")), HELP_ABOUT);
 	}
-	help_menu->add_icon_shortcut(theme->get_icon(SNAME("Heart"), EditorStringName(EditorIcons)), ED_SHORTCUT_AND_COMMAND("editor/support_development", TTRC("Support Godot Development")), HELP_SUPPORT_GODOT_DEVELOPMENT);
+	help_menu->add_icon_shortcut(_get_editor_theme_native_menu_icon(SNAME("Heart"), global_menu, dark_mode), ED_SHORTCUT_AND_COMMAND("editor/support_development", TTRC("Support Godot Development")), HELP_SUPPORT_GODOT_DEVELOPMENT);
 
 	// Spacer to center 2D / 3D / Script buttons.
 	Control *right_spacer = memnew(Control);
@@ -7604,6 +7825,7 @@ EditorNode::EditorNode() {
 	renderer->set_fit_to_longest_item(false);
 	renderer->set_focus_mode(Control::FOCUS_NONE);
 	renderer->set_tooltip_text(TTR("Choose a rendering method.\n\nNotes:\n- On mobile platforms, the Mobile rendering method is used if Forward+ is selected here.\n- On the web platform, the Compatibility rendering method is always used."));
+	renderer->set_accessibility_name(TTRC("Rendering Method"));
 
 	right_menu_hb->add_child(renderer);
 
@@ -7626,6 +7848,9 @@ EditorNode::EditorNode() {
 		PackedStringArray renderers = ProjectSettings::get_singleton()->get_custom_property_info().get(StringName("rendering/renderer/rendering_method")).hint_string.split(",", false);
 		for (int i = 0; i < renderers.size(); i++) {
 			String rendering_method = renderers[i];
+			if (rendering_method == "dummy") {
+				continue;
+			}
 			_add_renderer_entry(rendering_method, false);
 			renderer->set_item_metadata(i, rendering_method);
 			// Lowercase for standard comparison.
@@ -7661,6 +7886,7 @@ EditorNode::EditorNode() {
 	right_menu_hb->add_child(update_spinner);
 	update_spinner->set_button_icon(theme->get_icon(SNAME("Progress1"), EditorStringName(EditorIcons)));
 	update_spinner->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &EditorNode::_menu_option));
+	update_spinner->set_accessibility_name(TTRC("Update Mode"));
 	PopupMenu *p = update_spinner->get_popup();
 	p->add_radio_check_item(TTR("Update Continuously"), SPINNER_UPDATE_CONTINUOUSLY);
 	p->add_radio_check_item(TTR("Update When Changed"), SPINNER_UPDATE_WHEN_CHANGED);
@@ -7671,11 +7897,12 @@ EditorNode::EditorNode() {
 	// Instantiate and place editor docks.
 
 	memnew(SceneTreeDock(scene_root, editor_selection, editor_data));
+	memnew(FileSystemDock);
 	memnew(InspectorDock(editor_data));
 	memnew(ImportDock);
 	memnew(NodeDock);
 
-	FileSystemDock *filesystem_dock = memnew(FileSystemDock);
+	FileSystemDock *filesystem_dock = FileSystemDock::get_singleton();
 	filesystem_dock->connect("inherit", callable_mp(this, &EditorNode::_inherit_request));
 	filesystem_dock->connect("instantiate", callable_mp(this, &EditorNode::_instantiate_request));
 	filesystem_dock->connect("display_mode_changed", callable_mp(this, &EditorNode::_save_editor_layout));
@@ -7684,22 +7911,22 @@ EditorNode::EditorNode() {
 	history_dock = memnew(HistoryDock);
 
 	// Scene: Top left.
-	editor_dock_manager->add_dock(SceneTreeDock::get_singleton(), TTR("Scene"), EditorDockManager::DOCK_SLOT_LEFT_UR, nullptr, "PackedScene");
+	editor_dock_manager->add_dock(SceneTreeDock::get_singleton(), TTRC("Scene"), EditorDockManager::DOCK_SLOT_LEFT_UR, ED_SHORTCUT_AND_COMMAND("docks/open_scene", TTRC("Open Scene Dock")), "PackedScene");
 
 	// Import: Top left, behind Scene.
-	editor_dock_manager->add_dock(ImportDock::get_singleton(), TTR("Import"), EditorDockManager::DOCK_SLOT_LEFT_UR, nullptr, "FileAccess");
+	editor_dock_manager->add_dock(ImportDock::get_singleton(), TTRC("Import"), EditorDockManager::DOCK_SLOT_LEFT_UR, ED_SHORTCUT_AND_COMMAND("docks/open_import", TTRC("Open Import Dock")), "FileAccess");
 
 	// FileSystem: Bottom left.
-	editor_dock_manager->add_dock(FileSystemDock::get_singleton(), TTR("FileSystem"), EditorDockManager::DOCK_SLOT_LEFT_BR, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_filesystem_bottom_panel", TTRC("Toggle FileSystem Bottom Panel"), KeyModifierMask::ALT | Key::F), "Folder");
+	editor_dock_manager->add_dock(FileSystemDock::get_singleton(), TTRC("FileSystem"), EditorDockManager::DOCK_SLOT_LEFT_BR, ED_SHORTCUT_AND_COMMAND("docks/open_filesystem", TTRC("Open FileSystem Dock"), KeyModifierMask::ALT | Key::F), "Folder");
 
 	// Inspector: Full height right.
-	editor_dock_manager->add_dock(InspectorDock::get_singleton(), TTR("Inspector"), EditorDockManager::DOCK_SLOT_RIGHT_UL, nullptr, "AnimationTrackList");
+	editor_dock_manager->add_dock(InspectorDock::get_singleton(), TTRC("Inspector"), EditorDockManager::DOCK_SLOT_RIGHT_UL, ED_SHORTCUT_AND_COMMAND("docks/open_inspector", TTRC("Open Inspector Dock")), "AnimationTrackList");
 
 	// Node: Full height right, behind Inspector.
-	editor_dock_manager->add_dock(NodeDock::get_singleton(), TTR("Node"), EditorDockManager::DOCK_SLOT_RIGHT_UL, nullptr, "Object");
+	editor_dock_manager->add_dock(NodeDock::get_singleton(), TTRC("Node"), EditorDockManager::DOCK_SLOT_RIGHT_UL, ED_SHORTCUT_AND_COMMAND("docks/open_node", TTRC("Open Node Dock")), "Object");
 
 	// History: Full height right, behind Node.
-	editor_dock_manager->add_dock(history_dock, TTR("History"), EditorDockManager::DOCK_SLOT_RIGHT_UL, nullptr, "History");
+	editor_dock_manager->add_dock(history_dock, TTRC("History"), EditorDockManager::DOCK_SLOT_RIGHT_UL, ED_SHORTCUT_AND_COMMAND("docks/open_history", TTRC("Open History Dock")), "History");
 
 	// Add some offsets to left_r and main hsplits to make LEFT_R and RIGHT_L docks wider than minsize.
 	left_r_hsplit->set_split_offset(270 * EDSCALE);
@@ -7725,6 +7952,14 @@ EditorNode::EditorNode() {
 
 	_update_layouts_menu();
 
+#ifdef ANDROID_ENABLED
+	// Add TouchActionsPanel node.
+	bool is_enabled = EDITOR_GET("interface/touchscreen/enable_touch_actions_panel");
+	if (is_enabled) {
+		add_child(memnew(TouchActionsPanel));
+	}
+#endif
+
 	// Bottom panels.
 
 	bottom_panel = memnew(EditorBottomPanel);
@@ -7743,18 +7978,15 @@ EditorNode::EditorNode() {
 	orphan_resources = memnew(OrphanResourcesDialog);
 	gui_base->add_child(orphan_resources);
 
-	surface_upgrade_dialog = memnew(SurfaceUpgradeDialog);
-	gui_base->add_child(surface_upgrade_dialog);
-
-	uid_upgrade_dialog = memnew(UIDUpgradeDialog);
-	gui_base->add_child(uid_upgrade_dialog);
-
 	confirmation = memnew(ConfirmationDialog);
+	confirmation_button = confirmation->add_button(TTRC("Don't Save"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard");
 	gui_base->add_child(confirmation);
+	confirmation->set_min_size(Vector2(450.0 * EDSCALE, 0));
 	confirmation->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_confirm_current));
+	confirmation->connect("custom_action", callable_mp(this, &EditorNode::_discard_changes));
 
 	save_confirmation = memnew(ConfirmationDialog);
-	save_confirmation->add_button(TTR("Don't Save"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard");
+	save_confirmation->add_button(TTRC("Don't Save"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard");
 	gui_base->add_child(save_confirmation);
 	save_confirmation->set_min_size(Vector2(450.0 * EDSCALE, 0));
 	save_confirmation->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_confirm_current));
@@ -7835,9 +8067,16 @@ EditorNode::EditorNode() {
 	gui_base->add_child(file_script);
 	file_script->connect("file_selected", callable_mp(this, &EditorNode::_dialog_action));
 
+	file_pack_zip = memnew(EditorFileDialog);
+	file_pack_zip->connect("file_selected", callable_mp(this, &EditorNode::_dialog_action));
+	file_pack_zip->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
+	file_pack_zip->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
+	file_pack_zip->add_filter("*.zip", "ZIP Archive");
+	file_pack_zip->set_title(TTR("Pack Project as ZIP..."));
+	gui_base->add_child(file_pack_zip);
+
 	file_menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditorNode::_menu_option));
 	file_menu->connect("about_to_popup", callable_mp(this, &EditorNode::_update_file_menu_opened));
-	file_menu->connect("popup_hide", callable_mp(this, &EditorNode::_update_file_menu_closed));
 
 	settings_menu->connect(SceneStringName(id_pressed), callable_mp(this, &EditorNode::_menu_option));
 
@@ -7878,6 +8117,13 @@ EditorNode::EditorNode() {
 
 	gui_base->add_child(disk_changed);
 
+	project_data_missing = memnew(ConfirmationDialog);
+	project_data_missing->set_text(TTRC("Project data folder (.godot) is missing. Please restart editor."));
+	project_data_missing->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::restart_editor).bind(false));
+	project_data_missing->set_ok_button_text(TTRC("Restart"));
+
+	gui_base->add_child(project_data_missing);
+
 	add_editor_plugin(memnew(AnimationPlayerEditorPlugin));
 	add_editor_plugin(memnew(AnimationTrackKeyEditEditorPlugin));
 	add_editor_plugin(memnew(AnimationMarkerKeyEditEditorPlugin));
@@ -8050,6 +8296,11 @@ EditorNode::EditorNode() {
 	select_current_scene_button = pick_main_scene->add_button(TTR("Select Current"), true, "select_current");
 	pick_main_scene->connect("custom_action", callable_mp(this, &EditorNode::_pick_main_scene_custom_action));
 
+	open_project_settings = memnew(ConfirmationDialog);
+	gui_base->add_child(open_project_settings);
+	open_project_settings->set_ok_button_text(TTRC("Open Project Settings"));
+	open_project_settings->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_option).bind(PROJECT_OPEN_SETTINGS));
+
 	for (int i = 0; i < _init_callbacks.size(); i++) {
 		_init_callbacks[i]();
 	}
@@ -8142,8 +8393,7 @@ EditorNode::~EditorNode() {
 	memdelete(editor_plugins_force_over);
 	memdelete(editor_plugins_force_input_forwarding);
 	memdelete(progress_hb);
-	memdelete(surface_upgrade_tool);
-	memdelete(uid_upgrade_tool);
+	memdelete(project_upgrade_tool);
 	memdelete(editor_dock_manager);
 
 	EditorSettings::destroy();
@@ -8254,9 +8504,3 @@ bool EditorPluginList::is_empty() {
 void EditorPluginList::clear() {
 	plugins_list.clear();
 }
-
-EditorPluginList::EditorPluginList() {
-}
-
-EditorPluginList::~EditorPluginList() {
-}
diff --git a/engine/editor/editor_node.h b/engine/editor/editor_node.h
index de3af997..bcd21bb9 100644
--- a/engine/editor/editor_node.h
+++ b/engine/editor/editor_node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_NODE_H
-#define EDITOR_NODE_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "core/templates/safe_refcount.h"
@@ -98,10 +97,7 @@ class ProgressDialog;
 class ProjectExportDialog;
 class ProjectSettingsEditor;
 class SceneImportSettingsDialog;
-class SurfaceUpgradeTool;
-class SurfaceUpgradeDialog;
-class UIDUpgradeTool;
-class UIDUpgradeDialog;
+class ProjectUpgradeTool;
 
 struct EditorProgress {
 	String task;
@@ -121,6 +117,7 @@ public:
 		SCENE_NAME_CASING_PASCAL_CASE,
 		SCENE_NAME_CASING_SNAKE_CASE,
 		SCENE_NAME_CASING_KEBAB_CASE,
+		SCENE_NAME_CASING_CAMEL_CASE,
 	};
 
 	enum ActionOnPlay {
@@ -144,6 +141,7 @@ public:
 		FILE_SAVE_SCENE,
 		FILE_SAVE_AS_SCENE,
 		FILE_SAVE_ALL_SCENES,
+		FILE_MULTI_SAVE_AS_SCENE,
 		FILE_QUICK_OPEN,
 		FILE_QUICK_OPEN_SCENE,
 		FILE_QUICK_OPEN_SCRIPT,
@@ -167,8 +165,7 @@ public:
 
 		TOOLS_ORPHAN_RESOURCES,
 		TOOLS_BUILD_PROFILE_MANAGER,
-		TOOLS_SURFACE_UPGRADE,
-		TOOLS_UID_UPGRADE,
+		TOOLS_PROJECT_UPGRADE,
 		TOOLS_CUSTOM,
 
 		VCS_METADATA,
@@ -227,7 +224,6 @@ public:
 
 private:
 	friend class EditorSceneTabs;
-	friend class SurfaceUpgradeTool;
 
 	enum {
 		MAX_INIT_CALLBACKS = 128,
@@ -301,6 +297,7 @@ private:
 
 	int tab_closing_idx = 0;
 	List<String> tabs_to_close;
+	List<int> scenes_to_save_as;
 	int tab_closing_menu_option = -1;
 
 	bool exiting = false;
@@ -351,14 +348,16 @@ private:
 
 	PopupMenu *recent_scenes = nullptr;
 	String _recent_scene;
-	List<String> previous_scenes;
+	List<String> prev_closed_scenes;
 	String defer_load_scene;
 	Node *_last_instantiated_scene = nullptr;
 
 	ConfirmationDialog *confirmation = nullptr;
+	Button *confirmation_button = nullptr;
 	ConfirmationDialog *save_confirmation = nullptr;
 	ConfirmationDialog *import_confirmation = nullptr;
 	ConfirmationDialog *pick_main_scene = nullptr;
+	ConfirmationDialog *open_project_settings = nullptr;
 	Button *select_current_scene_button = nullptr;
 	AcceptDialog *accept = nullptr;
 	AcceptDialog *save_accept = nullptr;
@@ -387,6 +386,7 @@ private:
 	EditorFileDialog *file_export_lib = nullptr;
 	EditorFileDialog *file_script = nullptr;
 	EditorFileDialog *file_android_build_source = nullptr;
+	EditorFileDialog *file_pack_zip = nullptr;
 	String current_path;
 	MenuButton *update_spinner = nullptr;
 
@@ -414,15 +414,15 @@ private:
 
 	Tree *disk_changed_list = nullptr;
 	ConfirmationDialog *disk_changed = nullptr;
+	ConfirmationDialog *project_data_missing = nullptr;
 
 	bool scene_distraction_free = false;
 	bool script_distraction_free = false;
 
 	bool changing_scene = false;
-	bool cmdline_export_mode = false;
+	bool cmdline_mode = false;
 	bool convert_old = false;
 	bool immediate_dialog_confirmed = false;
-	bool opening_prev = false;
 	bool restoring_scenes = false;
 	bool unsaved_cache = true;
 
@@ -461,16 +461,8 @@ private:
 
 	HashMap<String, Ref<Texture2D>> icon_type_cache;
 
-	SurfaceUpgradeTool *surface_upgrade_tool = nullptr;
-	SurfaceUpgradeDialog *surface_upgrade_dialog = nullptr;
-
-	bool run_surface_upgrade_tool = false;
-
-	UIDUpgradeTool *uid_upgrade_tool = nullptr;
-	UIDUpgradeDialog *uid_upgrade_dialog = nullptr;
-
-	bool run_uid_upgrade_tool = false;
-	bool should_prompt_uid_upgrade_tool = false;
+	ProjectUpgradeTool *project_upgrade_tool = nullptr;
+	bool run_project_upgrade_tool = false;
 
 	bool was_window_windowed_last = false;
 
@@ -537,7 +529,6 @@ private:
 	void _tool_menu_option(int p_idx);
 	void _export_as_menu_option(int p_idx);
 	void _update_file_menu_opened();
-	void _update_file_menu_closed();
 	void _palette_quick_open_dialog();
 
 	void _remove_plugin_from_enabled(const String &p_name);
@@ -587,9 +578,12 @@ private:
 	void _project_run_started();
 	void _project_run_stopped();
 
+	void _update_prev_closed_scenes(const String &p_scene_path, bool p_add_scene);
+
 	void _add_to_recent_scenes(const String &p_scene);
 	void _update_recent_scenes();
 	void _open_recent_scene(int p_idx);
+
 	void _dropped_files(const Vector<String> &p_files);
 	void _add_dropped_files_recursive(const Vector<String> &p_files, String to_path);
 
@@ -615,6 +609,7 @@ private:
 	bool _find_and_save_edited_subresources(Object *obj, HashMap<Ref<Resource>, bool> &processed, int32_t flags);
 	void _save_edited_subresources(Node *scene, HashMap<Ref<Resource>, bool> &processed, int32_t flags);
 	void _mark_unsaved_scenes();
+	bool _is_scene_unsaved(int p_idx);
 
 	void _find_node_types(Node *p_node, int &count_2d, int &count_3d);
 	void _save_scene_with_preview(String p_file, int p_idx = -1);
@@ -623,6 +618,7 @@ private:
 	bool _find_scene_in_use(Node *p_node, const String &p_path) const;
 
 	void _proceed_closing_scene_tabs();
+	void _proceed_save_asing_scene_tabs();
 	bool _is_closing_editor() const;
 	void _restart_editor(bool p_goto_project_manager = false);
 
@@ -662,6 +658,7 @@ private:
 	bool _is_class_editor_disabled_by_feature_profile(const StringName &p_class);
 
 	Ref<Texture2D> _get_class_or_script_icon(const String &p_class, const String &p_script_path, const String &p_fallback = "Object", bool p_fallback_script_to_theme = false);
+	Ref<Texture2D> _get_editor_theme_native_menu_icon(const StringName &p_name, bool p_global_menu, bool p_dark_mode) const;
 
 	void _pick_main_scene_custom_action(const String &p_custom_action_name);
 
@@ -678,6 +675,8 @@ private:
 
 	void _execute_upgrades();
 
+	bool _is_project_data_missing();
+
 protected:
 	friend class FileSystemDock;
 
@@ -744,7 +743,7 @@ public:
 	ProjectSettingsEditor *get_project_settings() { return project_settings_editor; }
 
 	void trigger_menu_option(int p_option, bool p_confirmed);
-	bool has_previous_scenes() const;
+	bool has_previous_closed_scenes() const;
 
 	void new_inherited_scene() { _menu_option_confirm(FILE_NEW_INHERITED_SCENE, false); }
 
@@ -778,7 +777,6 @@ public:
 	void replace_resources_in_scenes(
 			const Vector<Ref<Resource>> &p_source_resources,
 			const Vector<Ref<Resource>> &p_target_resource);
-	void open_request(const String &p_path, bool p_set_inherited = false);
 	void edit_foreign_resource(Ref<Resource> p_resource);
 
 	bool is_resource_read_only(Ref<Resource> p_resource, bool p_foreign_resources_are_writable = false);
@@ -797,6 +795,7 @@ public:
 	int new_scene();
 	Error load_scene(const String &p_scene, bool p_ignore_broken_deps = false, bool p_set_inherited = false, bool p_force_open_imported = false, bool p_silent_change_tab = false);
 	Error load_resource(const String &p_resource, bool p_ignore_broken_deps = false);
+	Error load_scene_or_resource(const String &p_file, bool p_ignore_broken_deps = false, bool p_change_scene_tab_if_already_open = true);
 
 	HashMap<StringName, Variant> get_modified_properties_for_node(Node *p_node, bool p_node_references_only);
 	HashMap<StringName, Variant> get_modified_properties_reference_to_nodes(Node *p_node, List<Node *> &p_nodes_referenced_by);
@@ -966,6 +965,7 @@ public:
 	Vector<Ref<EditorResourceConversionPlugin>> find_resource_conversion_plugin_for_type_name(const String &p_type);
 
 	bool ensure_main_scene(bool p_from_native);
+	bool validate_custom_directory();
 };
 
 class EditorPluginList : public Object {
@@ -993,9 +993,6 @@ public:
 	void remove_plugin(EditorPlugin *p_plugin);
 	void clear();
 	bool is_empty();
-
-	EditorPluginList();
-	~EditorPluginList();
 };
 
 struct EditorProgressBG {
@@ -1007,5 +1004,3 @@ struct EditorProgressBG {
 	}
 	~EditorProgressBG() { EditorNode::progress_end_task_bg(task); }
 };
-
-#endif // EDITOR_NODE_H
diff --git a/engine/editor/editor_paths.h b/engine/editor/editor_paths.h
index 2fa28872..ab81e825 100644
--- a/engine/editor/editor_paths.h
+++ b/engine/editor/editor_paths.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PATHS_H
-#define EDITOR_PATHS_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/object.h"
@@ -84,5 +83,3 @@ public:
 
 	EditorPaths();
 };
-
-#endif // EDITOR_PATHS_H
diff --git a/engine/editor/editor_properties.cpp b/engine/editor/editor_properties.cpp
index 52780d7c..68c54de2 100644
--- a/engine/editor/editor_properties.cpp
+++ b/engine/editor/editor_properties.cpp
@@ -236,6 +236,7 @@ EditorPropertyMultilineText::EditorPropertyMultilineText(bool p_expression) {
 	hb->add_child(text);
 	text->set_h_size_flags(SIZE_EXPAND_FILL);
 	open_big_text = memnew(Button);
+	open_big_text->set_accessibility_name(TTRC("Open Text Edit Dialog"));
 	open_big_text->set_flat(true);
 	open_big_text->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyMultilineText::_open_big_text));
 	hb->add_child(open_big_text);
@@ -373,6 +374,7 @@ EditorPropertyTextEnum::EditorPropertyTextEnum() {
 	hb->add_child(edit_custom_layout);
 
 	option_button = memnew(OptionButton);
+	option_button->set_accessibility_name(TTRC("Enum Options"));
 	option_button->set_h_size_flags(SIZE_EXPAND_FILL);
 	option_button->set_clip_text(true);
 	option_button->set_flat(true);
@@ -381,22 +383,26 @@ EditorPropertyTextEnum::EditorPropertyTextEnum() {
 	option_button->connect(SceneStringName(item_selected), callable_mp(this, &EditorPropertyTextEnum::_option_selected));
 
 	edit_button = memnew(Button);
+	edit_button->set_accessibility_name(TTRC("Edit"));
 	edit_button->set_flat(true);
 	edit_button->hide();
 	default_layout->add_child(edit_button);
 	edit_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyTextEnum::_edit_custom_value));
 
 	custom_value_edit = memnew(LineEdit);
+	custom_value_edit->set_accessibility_name(TTRC("Custom Value"));
 	custom_value_edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit_custom_layout->add_child(custom_value_edit);
 	custom_value_edit->connect(SceneStringName(text_submitted), callable_mp(this, &EditorPropertyTextEnum::_custom_value_submitted));
 
 	accept_button = memnew(Button);
+	accept_button->set_accessibility_name(TTRC("Accept Custom Value Edit"));
 	accept_button->set_flat(true);
 	edit_custom_layout->add_child(accept_button);
 	accept_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyTextEnum::_custom_value_accepted));
 
 	cancel_button = memnew(Button);
+	cancel_button->set_accessibility_name(TTRC("Cancel Custom Value Edit"));
 	cancel_button->set_flat(true);
 	edit_custom_layout->add_child(cancel_button);
 	cancel_button->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyTextEnum::_custom_value_canceled));
@@ -453,12 +459,14 @@ EditorPropertyLocale::EditorPropertyLocale() {
 	HBoxContainer *locale_hb = memnew(HBoxContainer);
 	add_child(locale_hb);
 	locale = memnew(LineEdit);
+	locale->set_accessibility_name(TTRC("Locale"));
 	locale_hb->add_child(locale);
 	locale->connect(SceneStringName(text_submitted), callable_mp(this, &EditorPropertyLocale::_locale_selected));
 	locale->connect(SceneStringName(focus_exited), callable_mp(this, &EditorPropertyLocale::_locale_focus_exited));
 	locale->set_h_size_flags(SIZE_EXPAND_FILL);
 
 	locale_edit = memnew(Button);
+	locale_edit->set_accessibility_name(TTRC("Edit"));
 	locale_edit->set_clip_text(true);
 	locale_hb->add_child(locale_edit);
 	add_focusable(locale);
@@ -573,7 +581,7 @@ void EditorPropertyPath::_drop_data_fw(const Point2 &p_point, const Variant &p_d
 		return;
 	}
 	const Vector<String> filesPaths = drag_data["files"];
-	if (filesPaths.size() == 0) {
+	if (filesPaths.is_empty()) {
 		return;
 	}
 
@@ -589,12 +597,12 @@ bool EditorPropertyPath::_can_drop_data_fw(const Point2 &p_point, const Variant
 		return false;
 	}
 	const Vector<String> filesPaths = drag_data["files"];
-	if (filesPaths.size() == 0) {
+	if (filesPaths.is_empty()) {
 		return false;
 	}
 
 	for (const String &extension : extensions) {
-		if (filesPaths[0].ends_with(extension.substr(1, extension.size() - 1))) {
+		if (filesPaths[0].ends_with(extension.substr(1))) {
 			return true;
 		}
 	}
@@ -606,6 +614,7 @@ EditorPropertyPath::EditorPropertyPath() {
 	HBoxContainer *path_hb = memnew(HBoxContainer);
 	add_child(path_hb);
 	path = memnew(LineEdit);
+	path->set_accessibility_name(TTRC("Path"));
 	SET_DRAG_FORWARDING_CDU(path, EditorPropertyPath);
 	path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	path_hb->add_child(path);
@@ -614,6 +623,7 @@ EditorPropertyPath::EditorPropertyPath() {
 	path->set_h_size_flags(SIZE_EXPAND_FILL);
 
 	path_edit = memnew(Button);
+	path_edit->set_accessibility_name(TTRC("Edit"));
 	path_edit->set_clip_text(true);
 	path_hb->add_child(path_edit);
 	add_focusable(path);
@@ -993,6 +1003,15 @@ void EditorPropertyLayersGrid::gui_input(const Ref<InputEvent> &p_ev) {
 
 void EditorPropertyLayersGrid::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Layers grid property editor")));
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			Size2 grid_size = get_grid_size();
 			grid_size.x = get_size().x;
@@ -1300,6 +1319,7 @@ EditorPropertyLayers::EditorPropertyLayers() {
 	hb->add_child(grid);
 
 	button = memnew(TextureButton);
+	button->set_accessibility_name(TTRC("Layers"));
 	button->set_stretch_mode(TextureButton::STRETCH_KEEP_CENTERED);
 	button->set_toggle_mode(true);
 	button->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyLayers::_button_pressed));
@@ -1326,7 +1346,7 @@ void EditorPropertyInteger::_value_changed(int64_t val) {
 }
 
 void EditorPropertyInteger::update_property() {
-	int64_t val = get_edited_property_value();
+	int64_t val = get_edited_property_display_value();
 	spin->set_value_no_signal(val);
 #ifdef DEBUG_ENABLED
 	// If spin (currently EditorSplinSlider : Range) is changed so that it can use int64_t, then the below warning wouldn't be a problem.
@@ -1391,6 +1411,7 @@ void EditorPropertyObjectID::setup(const String &p_base_type) {
 
 EditorPropertyObjectID::EditorPropertyObjectID() {
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	add_child(edit);
 	add_focusable(edit);
 	edit->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
@@ -1416,6 +1437,7 @@ void EditorPropertySignal::update_property() {
 
 EditorPropertySignal::EditorPropertySignal() {
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	add_child(edit);
 	add_focusable(edit);
 	edit->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertySignal::_edit_pressed));
@@ -1435,6 +1457,7 @@ void EditorPropertyCallable::update_property() {
 
 EditorPropertyCallable::EditorPropertyCallable() {
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	add_child(edit);
 	add_focusable(edit);
 }
@@ -1766,6 +1789,7 @@ EditorPropertyRect2::EditorPropertyRect2(bool p_force_wide) {
 	for (int i = 0; i < 4; i++) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		spin[i]->set_flat(true);
 
 		if (grid) {
@@ -1860,6 +1884,7 @@ EditorPropertyRect2i::EditorPropertyRect2i(bool p_force_wide) {
 	for (int i = 0; i < 4; i++) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		spin[i]->set_flat(true);
 
 		if (grid) {
@@ -1951,6 +1976,7 @@ EditorPropertyPlane::EditorPropertyPlane(bool p_force_wide) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_flat(true);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		bc->add_child(spin[i]);
 		add_focusable(spin[i]);
 		spin[i]->connect(SceneStringName(value_changed), callable_mp(this, &EditorPropertyPlane::_value_changed).bind(desc[i]));
@@ -2121,6 +2147,7 @@ EditorPropertyQuaternion::EditorPropertyQuaternion() {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_flat(true);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		default_layout->add_child(spin[i]);
 		add_focusable(spin[i]);
 		spin[i]->connect(SceneStringName(value_changed), callable_mp(this, &EditorPropertyQuaternion::_value_changed).bind(desc[i]));
@@ -2148,6 +2175,7 @@ EditorPropertyQuaternion::EditorPropertyQuaternion() {
 		euler[i] = memnew(EditorSpinSlider);
 		euler[i]->set_flat(true);
 		euler[i]->set_label(desc[i]);
+		euler[i]->set_accessibility_name(vformat(TTR("Temporary Euler %s"), desc[i]));
 		edit_custom_layout->add_child(euler[i]);
 		add_focusable(euler[i]);
 		euler[i]->connect(SceneStringName(value_changed), callable_mp(this, &EditorPropertyQuaternion::_custom_value_changed));
@@ -2157,6 +2185,7 @@ EditorPropertyQuaternion::EditorPropertyQuaternion() {
 	}
 
 	edit_button = memnew(Button);
+	edit_button->set_accessibility_name(TTRC("Edit"));
 	edit_button->set_flat(true);
 	edit_button->set_toggle_mode(true);
 	default_layout->add_child(edit_button);
@@ -2231,6 +2260,7 @@ EditorPropertyAABB::EditorPropertyAABB() {
 	for (int i = 0; i < 6; i++) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		spin[i]->set_flat(true);
 
 		g->add_child(spin[i]);
@@ -2311,6 +2341,7 @@ EditorPropertyTransform2D::EditorPropertyTransform2D(bool p_include_origin) {
 	for (int i = 0; i < 6; i++) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		spin[i]->set_flat(true);
 		if (p_include_origin || i % 3 != 2) {
 			g->add_child(spin[i]);
@@ -2393,6 +2424,7 @@ EditorPropertyBasis::EditorPropertyBasis() {
 	for (int i = 0; i < 9; i++) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		spin[i]->set_flat(true);
 		g->add_child(spin[i]);
 		spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -2482,6 +2514,7 @@ EditorPropertyTransform3D::EditorPropertyTransform3D() {
 	for (int i = 0; i < 12; i++) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		spin[i]->set_flat(true);
 		g->add_child(spin[i]);
 		spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -2579,6 +2612,7 @@ EditorPropertyProjection::EditorPropertyProjection() {
 	for (int i = 0; i < 16; i++) {
 		spin[i] = memnew(EditorSpinSlider);
 		spin[i]->set_label(desc[i]);
+		spin[i]->set_accessibility_name(desc[i]);
 		spin[i]->set_flat(true);
 		g->add_child(spin[i]);
 		spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -2635,7 +2669,7 @@ void EditorPropertyColor::_notification(int p_what) {
 }
 
 void EditorPropertyColor::update_property() {
-	picker->set_pick_color(get_edited_property_value());
+	picker->set_pick_color(get_edited_property_display_value());
 	const Color color = picker->get_pick_color();
 
 	// Add a tooltip to display each channel's values without having to click the ColorPickerButton
@@ -2732,6 +2766,13 @@ void EditorPropertyNodePath::_node_assign() {
 	scene_tree->popup_scenetree_dialog(n, get_base_node());
 }
 
+void EditorPropertyNodePath::_assign_draw() {
+	if (dropping) {
+		Color color = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
+		assign->draw_rect(Rect2(Point2(), assign->get_size()), color, false);
+	}
+}
+
 void EditorPropertyNodePath::_update_menu() {
 	const NodePath &np = _get_node_path();
 
@@ -2909,6 +2950,20 @@ void EditorPropertyNodePath::_notification(int p_what) {
 			menu->get_popup()->set_item_icon(ACTION_EDIT, get_editor_theme_icon(SNAME("Edit")));
 			menu->get_popup()->set_item_icon(ACTION_SELECT, get_editor_theme_icon(SNAME("ExternalLink")));
 		} break;
+
+		case NOTIFICATION_DRAG_BEGIN: {
+			if (!is_read_only() && is_drop_valid(get_viewport()->gui_get_drag_data())) {
+				dropping = true;
+				assign->queue_redraw();
+			}
+		} break;
+
+		case NOTIFICATION_DRAG_END: {
+			if (dropping) {
+				dropping = false;
+				assign->queue_redraw();
+			}
+		} break;
 	}
 }
 
@@ -2943,12 +2998,14 @@ EditorPropertyNodePath::EditorPropertyNodePath() {
 	hbc->add_theme_constant_override("separation", 0);
 	add_child(hbc);
 	assign = memnew(Button);
+	assign->set_accessibility_name(TTRC("Assign Node"));
 	assign->set_flat(true);
 	assign->set_h_size_flags(SIZE_EXPAND_FILL);
 	assign->set_clip_text(true);
 	assign->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	assign->set_expand_icon(true);
 	assign->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyNodePath::_node_assign));
+	assign->connect(SceneStringName(draw), callable_mp(this, &EditorPropertyNodePath::_assign_draw));
 	SET_DRAG_FORWARDING_CD(assign, EditorPropertyNodePath);
 	hbc->add_child(assign);
 
@@ -2964,6 +3021,7 @@ EditorPropertyNodePath::EditorPropertyNodePath() {
 	menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &EditorPropertyNodePath::_menu_option));
 
 	edit = memnew(LineEdit);
+	edit->set_accessibility_name(TTRC("Node Path"));
 	edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit->hide();
 	edit->connect(SceneStringName(focus_exited), callable_mp(this, &EditorPropertyNodePath::_accept_text));
@@ -3015,7 +3073,7 @@ void EditorPropertyResource::_resource_selected(const Ref<Resource> &p_resource,
 		bool unfold = !get_edited_object()->editor_is_section_unfolded(get_edited_property());
 		get_edited_object()->editor_set_section_unfold(get_edited_property(), unfold);
 		update_property();
-	} else {
+	} else if (!is_checkable() || is_checked()) {
 		emit_signal(SNAME("resource_selected"), get_edited_property(), p_resource);
 	}
 }
@@ -3036,15 +3094,14 @@ static bool _find_recursive_resources(const Variant &v, HashSet<Resource *> &res
 		} break;
 		case Variant::DICTIONARY: {
 			Dictionary d = v;
-			List<Variant> keys;
-			d.get_key_list(&keys);
-			for (const Variant &k : keys) {
+			for (const KeyValue<Variant, Variant> &kv : d) {
+				const Variant &k = kv.key;
+				const Variant &v2 = kv.value;
 				if (k.get_type() == Variant::ARRAY || k.get_type() == Variant::DICTIONARY || k.get_type() == Variant::OBJECT) {
 					if (_find_recursive_resources(k, resources_found)) {
 						return true;
 					}
 				}
-				Variant v2 = d[k];
 				if (v2.get_type() == Variant::ARRAY || v2.get_type() == Variant::DICTIONARY || v2.get_type() == Variant::OBJECT) {
 					if (_find_recursive_resources(v2, resources_found)) {
 						return true;
@@ -3228,8 +3285,9 @@ void EditorPropertyResource::_viewport_selected(const NodePath &p_path) {
 		return;
 	}
 
-	Ref<ViewportTexture> vt;
-	vt.instantiate();
+	Ref<ViewportTexture> vt = get_edited_property_value();
+	ERR_FAIL_COND(vt.is_null());
+
 	vt->set_viewport_path_in_scene(get_tree()->get_edited_scene_root()->get_path_to(to_node));
 
 	emit_changed(get_edited_property(), vt);
@@ -3276,7 +3334,7 @@ void EditorPropertyResource::setup(Object *p_object, const String &p_path, const
 }
 
 void EditorPropertyResource::update_property() {
-	Ref<Resource> res = get_edited_property_value();
+	Ref<Resource> res = get_edited_property_display_value();
 
 	if (use_sub_inspector) {
 		if (res.is_valid() != resource_picker->is_toggle_mode()) {
@@ -3303,11 +3361,11 @@ void EditorPropertyResource::update_property() {
 				sub_inspector->set_use_folding(is_using_folding());
 
 				sub_inspector->set_draw_focus_border(false);
+				sub_inspector->set_focus_mode(FocusMode::FOCUS_NONE);
 
 				sub_inspector->set_use_filter(use_filter);
 				sub_inspector->register_text_enter(parent_inspector->search_box);
 
-				sub_inspector->set_mouse_filter(MOUSE_FILTER_STOP);
 				add_child(sub_inspector);
 				set_bottom_editor(sub_inspector);
 
@@ -3328,6 +3386,8 @@ void EditorPropertyResource::update_property() {
 				}
 			}
 
+			sub_inspector->set_read_only(is_checkable() && !is_checked());
+
 			if (res.ptr() != sub_inspector->get_edited_object()) {
 				sub_inspector->edit(res.ptr());
 				_update_property_bg();
diff --git a/engine/editor/editor_properties.h b/engine/editor/editor_properties.h
index 6fe8cc3c..6435825c 100644
--- a/engine/editor/editor_properties.h
+++ b/engine/editor/editor_properties.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PROPERTIES_H
-#define EDITOR_PROPERTIES_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 
@@ -629,10 +628,12 @@ class EditorPropertyNodePath : public EditorProperty {
 	SceneTreeDialog *scene_tree = nullptr;
 	bool use_path_from_scene_root = false;
 	bool editing_node = false;
+	bool dropping = false;
 
 	Vector<StringName> valid_types;
 	void _node_selected(const NodePath &p_path, bool p_absolute = true);
 	void _node_assign();
+	void _assign_draw();
 	Node *get_base_node();
 	void _update_menu();
 	void _menu_option(int p_idx);
@@ -723,5 +724,3 @@ public:
 
 	static EditorProperty *get_editor_for_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide = false);
 };
-
-#endif // EDITOR_PROPERTIES_H
diff --git a/engine/editor/editor_properties_array_dict.cpp b/engine/editor/editor_properties_array_dict.cpp
index 93c5a70c..4899eeeb 100644
--- a/engine/editor/editor_properties_array_dict.cpp
+++ b/engine/editor/editor_properties_array_dict.cpp
@@ -33,6 +33,7 @@
 #include "core/input/input.h"
 #include "core/io/marshalls.h"
 #include "editor/editor_file_system.h"
+#include "editor/editor_node.h"
 #include "editor/editor_properties.h"
 #include "editor/editor_properties_vector.h"
 #include "editor/editor_settings.h"
@@ -52,9 +53,9 @@ bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_
 
 	int index;
 	if (name.begins_with("metadata/")) {
-		index = name.get_slice("/", 2).to_int();
+		index = name.get_slicec('/', 2).to_int();
 	} else {
-		index = name.get_slice("/", 1).to_int();
+		index = name.get_slicec('/', 1).to_int();
 	}
 
 	array.set(index, p_value);
@@ -70,9 +71,9 @@ bool EditorPropertyArrayObject::_get(const StringName &p_name, Variant &r_ret) c
 
 	int index;
 	if (name.begins_with("metadata/")) {
-		index = name.get_slice("/", 2).to_int();
+		index = name.get_slicec('/', 2).to_int();
 	} else {
-		index = name.get_slice("/", 1).to_int();
+		index = name.get_slicec('/', 1).to_int();
 	}
 
 	bool valid;
@@ -93,9 +94,6 @@ Variant EditorPropertyArrayObject::get_array() {
 	return array;
 }
 
-EditorPropertyArrayObject::EditorPropertyArrayObject() {
-}
-
 ///////////////////
 
 bool EditorPropertyDictionaryObject::_set(const StringName &p_name, const Variant &p_value) {
@@ -232,9 +230,6 @@ String EditorPropertyDictionaryObject::get_label_for_index(int p_index) {
 	}
 }
 
-EditorPropertyDictionaryObject::EditorPropertyDictionaryObject() {
-}
-
 ///////////////////// ARRAY ///////////////////////////
 
 void EditorPropertyArray::initialize_array(Variant &p_array) {
@@ -263,7 +258,7 @@ void EditorPropertyArray::_property_changed(const String &p_property, Variant p_
 		p_value = Variant(); // `EditorResourcePicker` resets to `Ref<Resource>()`. See GH-82716.
 	}
 
-	int index = p_property.get_slice("/", 1).to_int();
+	int index = p_property.get_slicec('/', 1).to_int();
 
 	Variant array = object->get_array().duplicate();
 	array.set(index, p_value);
@@ -310,6 +305,7 @@ void EditorPropertyArray::_create_new_property_slot() {
 	HBoxContainer *hbox = memnew(HBoxContainer);
 
 	Button *reorder_button = memnew(Button);
+	reorder_button->set_accessibility_name(TTRC("Reorder"));
 	reorder_button->set_button_icon(get_editor_theme_icon(SNAME("TripleBar")));
 	reorder_button->set_default_cursor_shape(Control::CURSOR_MOVE);
 	reorder_button->set_disabled(is_read_only());
@@ -325,12 +321,14 @@ void EditorPropertyArray::_create_new_property_slot() {
 
 	if (is_untyped_array) {
 		Button *edit_btn = memnew(Button);
+		edit_btn->set_accessibility_name(TTRC("Edit"));
 		edit_btn->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
 		edit_btn->set_disabled(is_read_only());
 		edit_btn->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyArray::_change_type).bind(edit_btn, idx));
 		hbox->add_child(edit_btn);
 	} else {
 		Button *remove_btn = memnew(Button);
+		remove_btn->set_accessibility_name(TTRC("Remove"));
 		remove_btn->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 		remove_btn->set_disabled(is_read_only());
 		remove_btn->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyArray::_remove_pressed).bind(idx));
@@ -401,7 +399,7 @@ void EditorPropertyArray::update_property() {
 	}
 
 	if (preview_value) {
-		String ctr_str = array.get_construct_string().trim_prefix(array_type_name + "(").trim_suffix(")").replace("\n", "");
+		String ctr_str = array.get_construct_string().trim_prefix(array_type_name + "(").trim_suffix(")").remove_char('\n');
 		if (array_type == Variant::ARRAY && subtype != Variant::NIL) {
 			int type_end = ctr_str.find("](");
 			if (type_end > 0) {
@@ -430,7 +428,6 @@ void EditorPropertyArray::update_property() {
 
 		if (!container) {
 			container = memnew(PanelContainer);
-			container->set_mouse_filter(MOUSE_FILTER_STOP);
 			add_child(container);
 			set_bottom_editor(container);
 
@@ -450,6 +447,7 @@ void EditorPropertyArray::update_property() {
 			size_slider->set_editing_integer(true);
 			size_slider->set_h_size_flags(SIZE_EXPAND_FILL);
 			size_slider->set_read_only(is_read_only());
+			size_slider->set_accessibility_name(TTRC("Size"));
 			size_slider->connect(SceneStringName(value_changed), callable_mp(this, &EditorPropertyArray::_length_changed));
 			hbox->add_child(size_slider);
 
@@ -460,7 +458,10 @@ void EditorPropertyArray::update_property() {
 			button_add_item = EditorInspector::create_inspector_action_button(TTR("Add Element"));
 			button_add_item->set_button_icon(get_editor_theme_icon(SNAME("Add")));
 			button_add_item->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyArray::_add_element));
+			button_add_item->connect(SceneStringName(draw), callable_mp(this, &EditorPropertyArray::_button_add_item_draw));
+			SET_DRAG_FORWARDING_CD(button_add_item, EditorPropertyArray);
 			button_add_item->set_disabled(is_read_only());
+			button_add_item->set_accessibility_name(TTRC("Add"));
 			vbox->add_child(button_add_item);
 
 			paginator = memnew(EditorPaginator);
@@ -551,6 +552,13 @@ void EditorPropertyArray::_button_draw() {
 	}
 }
 
+void EditorPropertyArray::_button_add_item_draw() {
+	if (dropping) {
+		Color color = get_theme_color(SNAME("accent_color"), EditorStringName(Editor));
+		button_add_item->draw_rect(Rect2(Point2(), button_add_item->get_size()), color, false);
+	}
+}
+
 bool EditorPropertyArray::_is_drop_valid(const Dictionary &p_drag_data) const {
 	if (is_read_only()) {
 		return false;
@@ -570,14 +578,19 @@ bool EditorPropertyArray::_is_drop_valid(const Dictionary &p_drag_data) const {
 	if (drop_type == "files") {
 		PackedStringArray files = drag_data["files"];
 
-		for (int i = 0; i < files.size(); i++) {
-			const String &file = files[i];
-			String ftype = EditorFileSystem::get_singleton()->get_file_type(file);
+		for (const String &file : files) {
+			int idx_in_dir;
+			EditorFileSystemDirectory const *dir = EditorFileSystem::get_singleton()->find_file(file, &idx_in_dir);
+			if (!dir) {
+				return false;
+			}
+			StringName ftype = dir->get_file_type(idx_in_dir);
+			String script_class = dir->get_file_resource_script_class(idx_in_dir);
 
-			for (int j = 0; j < allowed_type.get_slice_count(","); j++) {
-				String at = allowed_type.get_slice(",", j).strip_edges();
+			for (String at : allowed_type.split(",", false)) {
+				at = at.strip_edges();
 				// Fail if one of the files is not of allowed type.
-				if (!ClassDB::is_parent_class(ftype, at)) {
+				if (!ClassDB::is_parent_class(ftype, at) && !EditorNode::get_editor_data().script_class_is_parent(script_class, at)) {
 					return false;
 				}
 			}
@@ -587,6 +600,28 @@ bool EditorPropertyArray::_is_drop_valid(const Dictionary &p_drag_data) const {
 		return true;
 	}
 
+	if (drop_type == "resource") {
+		Ref<Resource> res = drag_data["resource"];
+		if (res.is_null()) {
+			return false;
+		}
+
+		String res_type = res->get_class();
+		StringName script_class;
+		if (res->get_script()) {
+			script_class = EditorNode::get_singleton()->get_object_custom_type_name(res->get_script());
+		}
+
+		for (String at : allowed_type.split(",", false)) {
+			at = at.strip_edges();
+			if (ClassDB::is_parent_class(res_type, at) || EditorNode::get_editor_data().script_class_is_parent(script_class, at)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	if (drop_type == "nodes") {
 		Array node_paths = drag_data["nodes"];
 
@@ -595,8 +630,8 @@ bool EditorPropertyArray::_is_drop_valid(const Dictionary &p_drag_data) const {
 			if (subtype_hint_string == "NodePath") {
 				return true;
 			} else {
-				for (int j = 0; j < subtype_hint_string.get_slice_count(","); j++) {
-					String ast = subtype_hint_string.get_slice(",", j).strip_edges();
+				for (String ast : subtype_hint_string.split(",", false)) {
+					ast = ast.strip_edges();
 					allowed_subtype_array.append(ast);
 				}
 			}
@@ -609,7 +644,8 @@ bool EditorPropertyArray::_is_drop_valid(const Dictionary &p_drag_data) const {
 			ERR_FAIL_NULL_V_MSG(dropped_node, false, "Could not get the dropped node by its path.");
 
 			if (allowed_type != "NodePath") {
-				if (!ClassDB::is_parent_class(dropped_node->get_class_name(), allowed_type)) {
+				if (!ClassDB::is_parent_class(dropped_node->get_class_name(), allowed_type) &&
+						!EditorNode::get_singleton()->is_object_of_custom_type(dropped_node, allowed_type)) {
 					// Fail if one of the nodes is not of allowed type.
 					return false;
 				}
@@ -620,7 +656,8 @@ bool EditorPropertyArray::_is_drop_valid(const Dictionary &p_drag_data) const {
 				if (!allowed_subtype_array.has(dropped_node->get_class_name())) {
 					// The dropped node type was not found in the allowed subtype array, we must check if it inherits one of them.
 					for (const String &ast : allowed_subtype_array) {
-						if (ClassDB::is_parent_class(dropped_node->get_class_name(), ast)) {
+						if (ClassDB::is_parent_class(dropped_node->get_class_name(), ast) ||
+								EditorNode::get_singleton()->is_object_of_custom_type(dropped_node, ast)) {
 							is_drop_allowed = true;
 							break;
 						} else {
@@ -645,8 +682,6 @@ bool EditorPropertyArray::can_drop_data_fw(const Point2 &p_point, const Variant
 }
 
 void EditorPropertyArray::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
-	ERR_FAIL_COND(!_is_drop_valid(p_data));
-
 	Dictionary drag_data = p_data;
 	const String drop_type = drag_data.get("type", "");
 	Variant array = object->get_array();
@@ -674,6 +709,16 @@ void EditorPropertyArray::drop_data_fw(const Point2 &p_point, const Variant &p_d
 		emit_changed(get_edited_property(), array);
 	}
 
+	if (drop_type == "resource") {
+		Ref<Resource> res = drag_data["resource"];
+
+		if (res.is_valid()) {
+			array.call("push_back", res);
+
+			emit_changed(get_edited_property(), array);
+		}
+	}
+
 	if (drop_type == "nodes") {
 		Array node_paths = drag_data["nodes"];
 		Node *base_node = get_base_node();
@@ -729,6 +774,9 @@ void EditorPropertyArray::_notification(int p_what) {
 				if (_is_drop_valid(get_viewport()->gui_get_drag_data())) {
 					dropping = true;
 					edit->queue_redraw();
+					if (button_add_item) {
+						button_add_item->queue_redraw();
+					}
 				}
 			}
 		} break;
@@ -737,6 +785,9 @@ void EditorPropertyArray::_notification(int p_what) {
 			if (dropping) {
 				dropping = false;
 				edit->queue_redraw();
+				if (button_add_item) {
+					button_add_item->queue_redraw();
+				}
 			}
 		} break;
 	}
@@ -808,11 +859,11 @@ void EditorPropertyArray::setup(Variant::Type p_array_type, const String &p_hint
 			String subtype_string = p_hint_string.substr(0, hint_subtype_separator);
 			int slash_pos = subtype_string.find_char('/');
 			if (slash_pos >= 0) {
-				subtype_hint = PropertyHint(subtype_string.substr(slash_pos + 1, subtype_string.size() - slash_pos - 1).to_int());
+				subtype_hint = PropertyHint(subtype_string.substr(slash_pos + 1).to_int());
 				subtype_string = subtype_string.substr(0, slash_pos);
 			}
 
-			subtype_hint_string = p_hint_string.substr(hint_subtype_separator + 1, p_hint_string.size() - hint_subtype_separator - 1);
+			subtype_hint_string = p_hint_string.substr(hint_subtype_separator + 1);
 			subtype = Variant::Type(subtype_string.to_int());
 		}
 	}
@@ -839,7 +890,7 @@ void EditorPropertyArray::_reorder_button_gui_input(const Ref<InputEvent> &p_eve
 		}
 
 		float required_y_distance = 20.0f * EDSCALE;
-		if (ABS(reorder_mouse_y_delta) > required_y_distance) {
+		if (Math::abs(reorder_mouse_y_delta) > required_y_distance) {
 			int direction = reorder_mouse_y_delta > 0.0f ? 1 : -1;
 			reorder_mouse_y_delta -= required_y_distance * direction;
 
@@ -851,8 +902,12 @@ void EditorPropertyArray::_reorder_button_gui_input(const Ref<InputEvent> &p_eve
 				// Automatically move to the next/previous page.
 				_page_changed(page_index + direction);
 			}
-			// Ensure the moving element is visible.
-			InspectorDock::get_inspector_singleton()->ensure_control_visible(reorder_slot.container);
+			// Ensure the moving element is visible in the root inspector.
+			EditorInspector *parent_inspector = get_parent_inspector();
+			if (parent_inspector) {
+				// Defer to prevent moving elements from not displaying properly, especially near borders.
+				callable_mp((ScrollContainer *)parent_inspector->get_root_inspector(), &ScrollContainer::ensure_control_visible).call_deferred(reorder_slot.container);
+			}
 		}
 	}
 }
@@ -905,6 +960,7 @@ EditorPropertyArray::EditorPropertyArray() {
 	page_length = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
 
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit->set_clip_text(true);
 	edit->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyArray::_edit_pressed));
@@ -1018,12 +1074,14 @@ void EditorPropertyDictionary::_create_new_property_slot(int p_idx) {
 
 	if (is_untyped_dict) {
 		Button *edit_btn = memnew(Button);
+		edit_btn->set_accessibility_name(TTRC("Edit"));
 		edit_btn->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
 		edit_btn->set_disabled(is_read_only());
 		edit_btn->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyDictionary::_change_type).bind(edit_btn, slots.size()));
 		hbox->add_child(edit_btn);
 	} else if (p_idx >= 0) {
 		Button *remove_btn = memnew(Button);
+		remove_btn->set_accessibility_name(TTRC("Remove"));
 		remove_btn->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 		remove_btn->set_disabled(is_read_only());
 		remove_btn->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyDictionary::_remove_pressed).bind(slots.size()));
@@ -1091,11 +1149,11 @@ void EditorPropertyDictionary::setup(PropertyHint p_hint, const String &p_hint_s
 			String key_subtype_string = key.substr(0, hint_key_subtype_separator);
 			int slash_pos = key_subtype_string.find_char('/');
 			if (slash_pos >= 0) {
-				key_subtype_hint = PropertyHint(key_subtype_string.substr(slash_pos + 1, key_subtype_string.size() - slash_pos - 1).to_int());
+				key_subtype_hint = PropertyHint(key_subtype_string.substr(slash_pos + 1).to_int());
 				key_subtype_string = key_subtype_string.substr(0, slash_pos);
 			}
 
-			key_subtype_hint_string = key.substr(hint_key_subtype_separator + 1, key.size() - hint_key_subtype_separator - 1);
+			key_subtype_hint_string = key.substr(hint_key_subtype_separator + 1);
 			key_subtype = Variant::Type(key_subtype_string.to_int());
 
 			Variant new_key = object->get_new_item_key();
@@ -1110,11 +1168,11 @@ void EditorPropertyDictionary::setup(PropertyHint p_hint, const String &p_hint_s
 			String value_subtype_string = value.substr(0, hint_value_subtype_separator);
 			int slash_pos = value_subtype_string.find_char('/');
 			if (slash_pos >= 0) {
-				value_subtype_hint = PropertyHint(value_subtype_string.substr(slash_pos + 1, value_subtype_string.size() - slash_pos - 1).to_int());
+				value_subtype_hint = PropertyHint(value_subtype_string.substr(slash_pos + 1).to_int());
 				value_subtype_string = value_subtype_string.substr(0, slash_pos);
 			}
 
-			value_subtype_hint_string = value.substr(hint_value_subtype_separator + 1, value.size() - hint_value_subtype_separator - 1);
+			value_subtype_hint_string = value.substr(hint_value_subtype_separator + 1);
 			value_subtype = Variant::Type(value_subtype_string.to_int());
 
 			Variant new_value = object->get_new_item_value();
@@ -1179,7 +1237,7 @@ void EditorPropertyDictionary::update_property() {
 	object->set_dict(updated_val);
 
 	if (preview_value) {
-		String ctr_str = updated_val.get_construct_string().replace("\n", "");
+		String ctr_str = updated_val.get_construct_string().remove_char('\n');
 		if (key_subtype != Variant::NIL || value_subtype != Variant::NIL) {
 			int type_end = ctr_str.find("](");
 			if (type_end > 0) {
@@ -1208,7 +1266,6 @@ void EditorPropertyDictionary::update_property() {
 
 		if (!container) {
 			container = memnew(PanelContainer);
-			container->set_mouse_filter(MOUSE_FILTER_STOP);
 			add_child(container);
 			set_bottom_editor(container);
 
@@ -1239,6 +1296,7 @@ void EditorPropertyDictionary::update_property() {
 			button_add_item = EditorInspector::create_inspector_action_button(TTR("Add Key/Value Pair"));
 			button_add_item->set_button_icon(get_theme_icon(SNAME("Add"), EditorStringName(EditorIcons)));
 			button_add_item->set_disabled(is_read_only());
+			button_add_item->set_accessibility_name(TTRC("Add"));
 			button_add_item->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyDictionary::_add_key_value));
 			add_vbox->add_child(button_add_item);
 		}
@@ -1302,7 +1360,14 @@ void EditorPropertyDictionary::update_property() {
 
 			Variant value;
 			object->get_by_property_name(slot.prop_name, value);
-			Variant::Type value_type = value.get_type();
+
+			Variant::Type value_type;
+
+			if (dict.is_typed_value() && slot.prop_key) {
+				value_type = value_subtype;
+			} else {
+				value_type = value.get_type();
+			}
 
 			// Check if the editor property needs to be updated.
 			bool value_as_id = Object::cast_to<EncodedObjectAsID>(value);
@@ -1433,6 +1498,7 @@ EditorPropertyDictionary::EditorPropertyDictionary() {
 	page_length = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
 
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit->set_clip_text(true);
 	edit->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyDictionary::_edit_pressed));
@@ -1462,7 +1528,7 @@ EditorPropertyDictionary::EditorPropertyDictionary() {
 
 void EditorPropertyLocalizableString::_property_changed(const String &p_property, const Variant &p_value, const String &p_name, bool p_changing) {
 	if (p_property.begins_with("indices")) {
-		int index = p_property.get_slice("/", 1).to_int();
+		int index = p_property.get_slicec('/', 1).to_int();
 
 		Dictionary dict = object->get_dict().duplicate();
 		Variant key = dict.get_key_at_index(index);
@@ -1588,6 +1654,7 @@ void EditorPropertyLocalizableString::update_property() {
 			hbox->add_child(prop);
 			prop->set_h_size_flags(SIZE_EXPAND_FILL);
 			Button *edit_btn = memnew(Button);
+			edit_btn->set_accessibility_name(TTRC("Remove Translation"));
 			edit_btn->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 			hbox->add_child(edit_btn);
 			edit_btn->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyLocalizableString::_remove_item).bind(edit_btn, remove_index));
@@ -1597,6 +1664,7 @@ void EditorPropertyLocalizableString::update_property() {
 
 		if (page_index == max_page) {
 			button_add_item = EditorInspector::create_inspector_action_button(TTR("Add Translation"));
+			button_add_item->set_accessibility_name(TTRC("Add Translation"));
 			button_add_item->set_button_icon(get_editor_theme_icon(SNAME("Add")));
 			button_add_item->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyLocalizableString::_add_locale_popup));
 			property_vbox->add_child(button_add_item);
@@ -1653,6 +1721,7 @@ EditorPropertyLocalizableString::EditorPropertyLocalizableString() {
 	page_length = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
 
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit->set_clip_text(true);
 	edit->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyLocalizableString::_edit_pressed));
diff --git a/engine/editor/editor_properties_array_dict.h b/engine/editor/editor_properties_array_dict.h
index c0b4453b..e826395d 100644
--- a/engine/editor/editor_properties_array_dict.h
+++ b/engine/editor/editor_properties_array_dict.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PROPERTIES_ARRAY_DICT_H
-#define EDITOR_PROPERTIES_ARRAY_DICT_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/editor_locale_dialog.h"
@@ -54,8 +53,6 @@ public:
 
 	void set_array(const Variant &p_array);
 	Variant get_array();
-
-	EditorPropertyArrayObject();
 };
 
 class EditorPropertyDictionaryObject : public RefCounted {
@@ -89,8 +86,6 @@ public:
 	String get_label_for_index(int p_index);
 	String get_property_name_for_index(int p_index);
 	String get_key_name_for_index(int p_index);
-
-	EditorPropertyDictionaryObject();
 };
 
 class EditorPropertyArray : public EditorProperty {
@@ -164,6 +159,7 @@ protected:
 	virtual void _remove_pressed(int p_index);
 
 	virtual void _button_draw();
+	virtual void _button_add_item_draw();
 	virtual bool _is_drop_valid(const Dictionary &p_drag_data) const;
 	virtual bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
 	virtual void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
@@ -305,5 +301,3 @@ public:
 	virtual void update_property() override;
 	EditorPropertyLocalizableString();
 };
-
-#endif // EDITOR_PROPERTIES_ARRAY_DICT_H
diff --git a/engine/editor/editor_properties_vector.cpp b/engine/editor/editor_properties_vector.cpp
index 0ec7cf51..0cd0fdd8 100644
--- a/engine/editor/editor_properties_vector.cpp
+++ b/engine/editor/editor_properties_vector.cpp
@@ -222,6 +222,7 @@ EditorPropertyVectorN::EditorPropertyVectorN(Variant::Type p_type, bool p_force_
 		bc->add_child(spin[i]);
 		spin[i]->set_flat(true);
 		spin[i]->set_label(String(COMPONENT_LABELS[i]));
+		spin[i]->set_accessibility_name(String(COMPONENT_LABELS[i]));
 		if (horizontal) {
 			spin[i]->set_h_size_flags(SIZE_EXPAND_FILL);
 		}
@@ -238,6 +239,7 @@ EditorPropertyVectorN::EditorPropertyVectorN(Variant::Type p_type, bool p_force_
 	linked->set_toggle_mode(true);
 	linked->set_stretch_mode(TextureButton::STRETCH_KEEP_CENTERED);
 	linked->set_tooltip_text(TTR("Lock/Unlock Component Ratio"));
+	linked->set_accessibility_name(TTRC("Lock/Unlock Component Ratio"));
 	linked->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyVectorN::_update_ratio));
 	linked->connect(SceneStringName(toggled), callable_mp(this, &EditorPropertyVectorN::_store_link));
 	hb->add_child(linked);
diff --git a/engine/editor/editor_properties_vector.h b/engine/editor/editor_properties_vector.h
index 32f1abe9..7513662e 100644
--- a/engine/editor/editor_properties_vector.h
+++ b/engine/editor/editor_properties_vector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PROPERTIES_VECTOR_H
-#define EDITOR_PROPERTIES_VECTOR_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 
@@ -107,5 +106,3 @@ class EditorPropertyVector4i : public EditorPropertyVectorN {
 public:
 	EditorPropertyVector4i(bool p_force_wide = false);
 };
-
-#endif // EDITOR_PROPERTIES_VECTOR_H
diff --git a/engine/editor/editor_property_name_processor.cpp b/engine/editor/editor_property_name_processor.cpp
index a0baad7a..1cbb2f3b 100644
--- a/engine/editor/editor_property_name_processor.cpp
+++ b/engine/editor/editor_property_name_processor.cpp
@@ -59,11 +59,7 @@ EditorPropertyNameProcessor::Style EditorPropertyNameProcessor::get_tooltip_styl
 }
 
 bool EditorPropertyNameProcessor::is_localization_available() {
-	if (!EditorSettings::get_singleton()) {
-		return false;
-	}
-	const Vector<String> forbidden = String("en").split(",");
-	return !forbidden.has(EDITOR_GET("interface/editor/editor_language"));
+	return EditorSettings::get_singleton() && EDITOR_GET("interface/editor/editor_language") != "en";
 }
 
 String EditorPropertyNameProcessor::_capitalize_name(const String &p_name) const {
@@ -300,6 +296,7 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() {
 	capitalize_string_remaps["us"] = U"(µs)"; // Unit.
 	capitalize_string_remaps["usb"] = "USB";
 	capitalize_string_remaps["usec"] = U"(µsec)"; // Unit.
+	capitalize_string_remaps["uid"] = "UID";
 	capitalize_string_remaps["uuid"] = "UUID";
 	capitalize_string_remaps["uv"] = "UV";
 	capitalize_string_remaps["uv1"] = "UV1";
@@ -314,6 +311,8 @@ EditorPropertyNameProcessor::EditorPropertyNameProcessor() {
 	capitalize_string_remaps["webrtc"] = "WebRTC";
 	capitalize_string_remaps["websocket"] = "WebSocket";
 	capitalize_string_remaps["wine"] = "wine";
+	capitalize_string_remaps["wintab"] = "WinTab";
+	capitalize_string_remaps["winink"] = "Windows Ink";
 	capitalize_string_remaps["wifi"] = "Wi-Fi";
 	capitalize_string_remaps["x86"] = "x86";
 	capitalize_string_remaps["x86_32"] = "x86_32";
diff --git a/engine/editor/editor_property_name_processor.h b/engine/editor/editor_property_name_processor.h
index 8d93e78a..8793522b 100644
--- a/engine/editor/editor_property_name_processor.h
+++ b/engine/editor/editor_property_name_processor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PROPERTY_NAME_PROCESSOR_H
-#define EDITOR_PROPERTY_NAME_PROCESSOR_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -76,5 +75,3 @@ public:
 	EditorPropertyNameProcessor();
 	~EditorPropertyNameProcessor();
 };
-
-#endif // EDITOR_PROPERTY_NAME_PROCESSOR_H
diff --git a/engine/editor/editor_resource_picker.cpp b/engine/editor/editor_resource_picker.cpp
index 96fb8323..21ccb078 100644
--- a/engine/editor/editor_resource_picker.cpp
+++ b/engine/editor/editor_resource_picker.cpp
@@ -156,7 +156,7 @@ void EditorResourcePicker::_file_selected(const String &p_path) {
 		}
 
 		for (int i = 0; i < base_type.get_slice_count(","); i++) {
-			String base = base_type.get_slice(",", i);
+			String base = base_type.get_slicec(',', i);
 
 			any_type_matches = is_global_class ? EditorNode::get_editor_data().script_class_is_parent(res_type, base) : loaded_resource->is_class(base);
 
@@ -183,6 +183,12 @@ void EditorResourcePicker::_resource_saved(Object *p_resource) {
 }
 
 void EditorResourcePicker::_update_menu() {
+	if (edit_menu && edit_menu->is_visible()) {
+		edit_button->set_pressed(false);
+		edit_menu->hide();
+		return;
+	}
+
 	_update_menu_items();
 
 	Rect2 gt = edit_button->get_screen_rect();
@@ -263,7 +269,7 @@ void EditorResourcePicker::_update_menu_items() {
 			String res_type = _get_resource_type(cb);
 
 			for (int i = 0; i < base_type.get_slice_count(","); i++) {
-				String base = base_type.get_slice(",", i);
+				String base = base_type.get_slicec(',', i);
 
 				paste_valid = ClassDB::is_parent_class(res_type, base) || EditorNode::get_editor_data().script_class_is_parent(res_type, base);
 
@@ -313,7 +319,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
 		case OBJ_MENU_LOAD: {
 			List<String> extensions;
 			for (int i = 0; i < base_type.get_slice_count(","); i++) {
-				String base = base_type.get_slice(",", i);
+				String base = base_type.get_slicec(',', i);
 				ResourceLoader::get_recognized_extensions_for_type(base, &extensions);
 				if (ScriptServer::is_global_class(base)) {
 					ResourceLoader::get_recognized_extensions_for_type(ScriptServer::get_global_class_native_base(base), &extensions);
@@ -392,6 +398,7 @@ void EditorResourcePicker::_edit_menu_cbk(int p_which) {
 				vb->add_child(label);
 
 				duplicate_resources_tree = memnew(Tree);
+				duplicate_resources_tree->set_accessibility_name(TTRC("Duplicate resources"));
 				duplicate_resources_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 				vb->add_child(duplicate_resources_tree);
 				duplicate_resources_tree->set_columns(2);
@@ -500,6 +507,9 @@ void EditorResourcePicker::set_create_options(Object *p_menu_node) {
 
 		_ensure_allowed_types();
 		HashSet<StringName> allowed_types = allowed_types_without_convert;
+		if (!allowed_types.is_empty()) {
+			edit_menu->add_separator(TTRC("New"));
+		}
 
 		for (const StringName &E : allowed_types) {
 			const String &t = E;
@@ -512,7 +522,8 @@ void EditorResourcePicker::set_create_options(Object *p_menu_node) {
 
 			Ref<Texture2D> icon = EditorNode::get_singleton()->get_class_icon(t, "Object");
 			int id = TYPE_BASE_ID + idx;
-			edit_menu->add_icon_item(icon, vformat(TTR("New %s"), t), id);
+			edit_menu->add_icon_item(icon, t, id);
+			edit_menu->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_DISABLED);
 
 			HashMap<String, DocData::ClassDoc>::Iterator class_doc = EditorHelp::get_doc_data()->class_list.find(t);
 			if (class_doc) {
@@ -549,6 +560,12 @@ void EditorResourcePicker::_button_input(const Ref<InputEvent> &p_event) {
 		// a valid resource or the Picker is editable, as
 		// there will otherwise be nothing to display.
 		if (edited_resource.is_valid() || is_editable()) {
+			if (edit_menu && edit_menu->is_visible()) {
+				edit_button->set_pressed(false);
+				edit_menu->hide();
+				return;
+			}
+
 			_update_menu_items();
 
 			Vector2 pos = get_screen_position() + mb->get_position();
@@ -591,8 +608,8 @@ static void _add_allowed_type(const StringName &p_type, List<StringName> *p_vect
 			p_vector->push_back(p_type);
 		}
 
-		List<StringName> inheriters;
-		ClassDB::get_inheriters_from_class(p_type, &inheriters);
+		LocalVector<StringName> inheriters;
+		ClassDB::get_inheriters_from_class(p_type, inheriters);
 		for (const StringName &S : inheriters) {
 			_add_allowed_type(S, p_vector);
 		}
@@ -686,9 +703,11 @@ bool EditorResourcePicker::_is_drop_valid(const Dictionary &p_drag_data) const {
 			return true;
 		}
 
-		StringName custom_class = EditorNode::get_singleton()->get_object_custom_type_name(res.ptr());
-		if (_is_type_valid(custom_class, allowed_types)) {
-			return true;
+		if (res->get_script()) {
+			StringName custom_class = EditorNode::get_singleton()->get_object_custom_type_name(res->get_script());
+			if (_is_type_valid(custom_class, allowed_types)) {
+				return true;
+			}
 		}
 	}
 
@@ -1017,8 +1036,7 @@ void EditorResourcePicker::_gather_resources_to_duplicate(const Ref<Resource> p_
 	p_item->set_icon(0, EditorNode::get_singleton()->get_object_icon(p_resource.ptr()));
 	p_item->set_editable(0, true);
 
-	Array meta;
-	meta.append(p_resource);
+	Array meta = { p_resource };
 	p_item->set_metadata(0, meta);
 
 	if (!p_property_name.is_empty()) {
@@ -1086,6 +1104,7 @@ EditorResourcePicker::EditorResourcePicker(bool p_hide_assign_button_controls) {
 	assign_button = memnew(Button);
 	assign_button->set_flat(true);
 	assign_button->set_h_size_flags(SIZE_EXPAND_FILL);
+	assign_button->set_accessibility_name(TTRC("Assign Resource"));
 	assign_button->set_expand_icon(true);
 	assign_button->set_clip_text(true);
 	assign_button->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
@@ -1110,8 +1129,9 @@ EditorResourcePicker::EditorResourcePicker(bool p_hide_assign_button_controls) {
 	edit_button->set_flat(false);
 	edit_button->set_toggle_mode(true);
 	edit_button->set_action_mode(BaseButton::ACTION_MODE_BUTTON_PRESS);
-	edit_button->connect(SceneStringName(pressed), callable_mp(this, &EditorResourcePicker::_update_menu));
+	edit_button->set_accessibility_name(TTRC("Edit"));
 	add_child(edit_button);
+	edit_button->connect(SceneStringName(pressed), callable_mp(this, &EditorResourcePicker::_update_menu));
 	edit_button->connect(SceneStringName(gui_input), callable_mp(this, &EditorResourcePicker::_button_input));
 
 	add_theme_constant_override("separation", 0);
@@ -1173,9 +1193,6 @@ void EditorScriptPicker::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "script_owner", PROPERTY_HINT_RESOURCE_TYPE, "Node", PROPERTY_USAGE_NONE), "set_script_owner", "get_script_owner");
 }
 
-EditorScriptPicker::EditorScriptPicker() {
-}
-
 // EditorShaderPicker
 
 void EditorShaderPicker::set_create_options(Object *p_menu_node) {
@@ -1216,9 +1233,6 @@ void EditorShaderPicker::set_preferred_mode(int p_mode) {
 	preferred_mode = p_mode;
 }
 
-EditorShaderPicker::EditorShaderPicker() {
-}
-
 //////////////
 
 void EditorAudioStreamPicker::_notification(int p_what) {
diff --git a/engine/editor/editor_resource_picker.h b/engine/editor/editor_resource_picker.h
index 8fb774a2..a91a4dcb 100644
--- a/engine/editor/editor_resource_picker.h
+++ b/engine/editor/editor_resource_picker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_RESOURCE_PICKER_H
-#define EDITOR_RESOURCE_PICKER_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 
@@ -170,8 +169,6 @@ public:
 
 	void set_script_owner(Node *p_owner);
 	Node *get_script_owner() const;
-
-	EditorScriptPicker();
 };
 
 class EditorShaderPicker : public EditorResourcePicker {
@@ -191,8 +188,6 @@ public:
 	void set_edited_material(ShaderMaterial *p_material);
 	ShaderMaterial *get_edited_material() const;
 	void set_preferred_mode(int p_preferred_mode);
-
-	EditorShaderPicker();
 };
 
 class EditorAudioStreamPicker : public EditorResourcePicker {
@@ -216,5 +211,3 @@ protected:
 public:
 	EditorAudioStreamPicker();
 };
-
-#endif // EDITOR_RESOURCE_PICKER_H
diff --git a/engine/editor/editor_resource_preview.cpp b/engine/editor/editor_resource_preview.cpp
index f53f2744..bfb304fe 100644
--- a/engine/editor/editor_resource_preview.cpp
+++ b/engine/editor/editor_resource_preview.cpp
@@ -93,9 +93,6 @@ void EditorResourcePreviewGenerator::_bind_methods() {
 	GDVIRTUAL_BIND(_can_generate_small_preview);
 }
 
-EditorResourcePreviewGenerator::EditorResourcePreviewGenerator() {
-}
-
 void EditorResourcePreviewGenerator::DrawRequester::request_and_wait(RID p_viewport) {
 	Callable request_vp_update_once = callable_mp(RS::get_singleton(), &RS::viewport_set_update_mode).bind(p_viewport, RS::VIEWPORT_UPDATE_ONCE);
 
@@ -265,7 +262,7 @@ const Dictionary EditorResourcePreview::get_preview_metadata(const String &p_pat
 void EditorResourcePreview::_iterate() {
 	preview_mutex.lock();
 
-	if (queue.size() == 0) {
+	if (queue.is_empty()) {
 		preview_mutex.unlock();
 		return;
 	}
@@ -387,7 +384,7 @@ void EditorResourcePreview::_write_preview_cache(Ref<FileAccess> p_file, int p_t
 	p_file->store_line(itos(p_has_small_texture));
 	p_file->store_line(itos(p_modified_time));
 	p_file->store_line(p_hash);
-	p_file->store_line(VariantUtilityFunctions::var_to_str(p_metadata).replace("\n", " "));
+	p_file->store_line(VariantUtilityFunctions::var_to_str(p_metadata).replace_char('\n', ' '));
 	p_file->store_line(itos(CURRENT_METADATA_VERSION));
 }
 
diff --git a/engine/editor/editor_resource_preview.h b/engine/editor/editor_resource_preview.h
index e901000d..4bbe3131 100644
--- a/engine/editor/editor_resource_preview.h
+++ b/engine/editor/editor_resource_preview.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_RESOURCE_PREVIEW_H
-#define EDITOR_RESOURCE_PREVIEW_H
+#pragma once
 
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
@@ -69,8 +68,6 @@ public:
 
 	virtual bool generate_small_preview_automatically() const;
 	virtual bool can_generate_small_preview() const;
-
-	EditorResourcePreviewGenerator();
 };
 
 class EditorResourcePreview : public Node {
@@ -153,5 +150,3 @@ public:
 	EditorResourcePreview();
 	~EditorResourcePreview();
 };
-
-#endif // EDITOR_RESOURCE_PREVIEW_H
diff --git a/engine/editor/editor_run.cpp b/engine/editor/editor_run.cpp
index 84367971..f7297d28 100644
--- a/engine/editor/editor_run.cpp
+++ b/engine/editor/editor_run.cpp
@@ -73,6 +73,7 @@ Error EditorRun::run(const String &p_scene, const String &p_write_movie, const V
 	bool debug_navigation = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_navigation", false);
 	bool debug_avoidance = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_avoidance", false);
 	bool debug_canvas_redraw = EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_debug_canvas_redraw", false);
+	bool debug_mute_audio = EditorDebuggerNode::get_singleton()->get_debug_mute_audio();
 
 	if (debug_collisions) {
 		args.push_back("--debug-collisions");
@@ -94,6 +95,10 @@ Error EditorRun::run(const String &p_scene, const String &p_write_movie, const V
 		args.push_back("--debug-canvas-item-redraw");
 	}
 
+	if (debug_mute_audio) {
+		args.push_back("--debug-mute-audio");
+	}
+
 	if (p_write_movie != "") {
 		args.push_back("--write-movie");
 		args.push_back(p_write_movie);
@@ -136,6 +141,10 @@ Error EditorRun::run(const String &p_scene, const String &p_write_movie, const V
 		args.push_back("--skip-breakpoints");
 	}
 
+	if (EditorDebuggerNode::get_singleton()->is_ignore_error_breaks()) {
+		args.push_back("--ignore-error-breaks");
+	}
+
 	if (!p_scene.is_empty()) {
 		args.push_back(p_scene);
 	}
@@ -286,9 +295,11 @@ EditorRun::WindowPlacement EditorRun::get_window_placement() {
 			} break;
 			case 3: { // force maximized
 				placement.force_maximized = true;
+				placement.position = (screen_rect.position) + ((screen_rect.size - placement.size) / 2).floor();
 			} break;
 			case 4: { // force fullscreen
 				placement.force_fullscreen = true;
+				placement.position = (screen_rect.position) + ((screen_rect.size - placement.size) / 2).floor();
 			} break;
 		}
 	} else {
diff --git a/engine/editor/editor_run.h b/engine/editor/editor_run.h
index 5e342944..250dea5c 100644
--- a/engine/editor/editor_run.h
+++ b/engine/editor/editor_run.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_RUN_H
-#define EDITOR_RUN_H
+#pragma once
 
 #include "core/os/os.h"
 
@@ -76,5 +75,3 @@ public:
 
 	EditorRun();
 };
-
-#endif // EDITOR_RUN_H
diff --git a/engine/editor/editor_run_native.cpp b/engine/editor/editor_run_native.cpp
index faa80915..91cbe4ed 100644
--- a/engine/editor/editor_run_native.cpp
+++ b/engine/editor/editor_run_native.cpp
@@ -135,10 +135,7 @@ Error EditorRunNative::start_run_native(int p_id) {
 		bool is_arch_enabled = preset->get(preset_arch);
 
 		if (!is_arch_enabled) {
-			String warning_message = vformat(TTR("Warning: The CPU architecture \"%s\" is not active in your export preset.\n\n"), Variant(architecture));
-			warning_message += TTR("Run \"Remote Deploy\" anyway?");
-
-			run_native_confirm->set_text(warning_message);
+			run_native_confirm->set_text(vformat(TTR("Warning: The CPU architecture \"%s\" is not active in your export preset.\n\nRun \"Remote Deploy\" anyway?"), architecture));
 			run_native_confirm->popup_centered();
 			return OK;
 		}
@@ -204,6 +201,7 @@ EditorRunNative::EditorRunNative() {
 	remote_debug->set_theme_type_variation("RunBarButton");
 	remote_debug->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &EditorRunNative::start_run_native));
 	remote_debug->set_tooltip_text(TTR("Remote Deploy"));
+	remote_debug->set_accessibility_name(TTRC("Remote Deploy"));
 	remote_debug->set_disabled(true);
 
 	add_child(remote_debug);
diff --git a/engine/editor/editor_run_native.h b/engine/editor/editor_run_native.h
index b7638f23..c507d26d 100644
--- a/engine/editor/editor_run_native.h
+++ b/engine/editor/editor_run_native.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_RUN_NATIVE_H
-#define EDITOR_RUN_NATIVE_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
@@ -63,5 +62,3 @@ public:
 
 	EditorRunNative();
 };
-
-#endif // EDITOR_RUN_NATIVE_H
diff --git a/engine/editor/editor_script.h b/engine/editor/editor_script.h
index b0724c31..9d804b69 100644
--- a/engine/editor/editor_script.h
+++ b/engine/editor/editor_script.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCRIPT_H
-#define EDITOR_SCRIPT_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
@@ -52,8 +51,4 @@ public:
 	EditorInterface *get_editor_interface() const;
 
 	virtual void run();
-
-	EditorScript() {}
 };
-
-#endif // EDITOR_SCRIPT_H
diff --git a/engine/editor/editor_sectioned_inspector.cpp b/engine/editor/editor_sectioned_inspector.cpp
index 94fda334..c014967d 100644
--- a/engine/editor/editor_sectioned_inspector.cpp
+++ b/engine/editor/editor_sectioned_inspector.cpp
@@ -150,6 +150,7 @@ void SectionedInspector::_section_selected() {
 	selected_category = sections->get_selected()->get_metadata(0);
 	filter->set_section(selected_category, sections->get_selected()->get_first_child() == nullptr);
 	inspector->set_property_prefix(selected_category + "/");
+	inspector->set_v_scroll(0);
 }
 
 void SectionedInspector::set_current_section(const String &p_section) {
diff --git a/engine/editor/editor_sectioned_inspector.h b/engine/editor/editor_sectioned_inspector.h
index 75f1569d..fbad9bd6 100644
--- a/engine/editor/editor_sectioned_inspector.h
+++ b/engine/editor/editor_sectioned_inspector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SECTIONED_INSPECTOR_H
-#define EDITOR_SECTIONED_INSPECTOR_H
+#pragma once
 
 #include "scene/gui/split_container.h"
 
@@ -79,5 +78,3 @@ public:
 	SectionedInspector();
 	~SectionedInspector();
 };
-
-#endif // EDITOR_SECTIONED_INSPECTOR_H
diff --git a/engine/editor/editor_settings.cpp b/engine/editor/editor_settings.cpp
index a246249c..44d01dc5 100644
--- a/engine/editor/editor_settings.cpp
+++ b/engine/editor/editor_settings.cpp
@@ -50,10 +50,12 @@
 #include "editor/editor_property_name_processor.h"
 #include "editor/editor_translation.h"
 #include "editor/engine_update_label.h"
+#include "modules/regex/regex.h"
 #include "scene/gui/color_picker.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
+#include "scene/resources/animation.h"
 
 // PRIVATE METHODS
 
@@ -67,7 +69,18 @@ bool EditorSettings::_set(const StringName &p_name, const Variant &p_value) {
 	bool changed = _set_only(p_name, p_value);
 	if (changed && initialized) {
 		changed_settings.insert(p_name);
+		if (p_name == SNAME("text_editor/external/exec_path")) {
+			const StringName exec_args_name = "text_editor/external/exec_flags";
+			const String exec_args_value = _guess_exec_args_for_extenal_editor(p_value);
+			if (!exec_args_value.is_empty() && _set_only(exec_args_name, exec_args_value)) {
+				changed_settings.insert(exec_args_name);
+			}
+		}
 		emit_signal(SNAME("settings_changed"));
+
+		if (p_name == SNAME("interface/editor/editor_language")) {
+			setup_language();
+		}
 	}
 	return true;
 }
@@ -182,6 +195,11 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const {
 	} else if (p_name == "builtin_action_overrides") {
 		Array actions_arr;
 		for (const KeyValue<String, List<Ref<InputEvent>>> &action_override : builtin_action_overrides) {
+			const List<Ref<InputEvent>> *defaults = InputMap::get_singleton()->get_builtins().getptr(action_override.key);
+			if (!defaults) {
+				continue;
+			}
+
 			List<Ref<InputEvent>> events = action_override.value;
 
 			Dictionary action_dict;
@@ -197,8 +215,7 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const {
 			}
 
 			Array defaults_arr;
-			List<Ref<InputEvent>> defaults = InputMap::get_singleton()->get_builtins()[action_override.key];
-			for (const Ref<InputEvent> &default_input_event : defaults) {
+			for (const Ref<InputEvent> &default_input_event : *defaults) {
 				if (default_input_event.is_valid()) {
 					defaults_arr.append(default_input_event);
 				}
@@ -389,7 +406,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 		for (const String &locale : get_editor_locales()) {
 			// Skip locales which we can't render properly (see above comment).
 			// Test against language code without regional variants (e.g. ur_PK).
-			String lang_code = locale.get_slice("_", 0);
+			String lang_code = locale.get_slicec('_', 0);
 			if (locales_to_skip.has(lang_code)) {
 				continue;
 			}
@@ -431,6 +448,20 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	}
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/editor_screen", EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO, ed_screen_hints)
 
+#ifdef WINDOWS_ENABLED
+	String tablet_hints = "Use Project Settings:-1";
+	for (int i = 0; i < DisplayServer::get_singleton()->tablet_get_driver_count(); i++) {
+		String drv_name = DisplayServer::get_singleton()->tablet_get_driver_name(i);
+		if (EditorPropertyNameProcessor::get_singleton()) {
+			drv_name = EditorPropertyNameProcessor::get_singleton()->process_name(drv_name, EditorPropertyNameProcessor::STYLE_CAPITALIZED); // Note: EditorPropertyNameProcessor is not available when doctool is used, but this value is not part of docs.
+		}
+		tablet_hints += vformat(",%s:%d", drv_name, i);
+	}
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/tablet_driver", -1, tablet_hints);
+#else
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/editor/tablet_driver", -1, "Default:-1");
+#endif
+
 	String project_manager_screen_hints = "Screen With Mouse Pointer:-4,Screen With Keyboard Focus:-3,Primary Screen:-2";
 	for (int i = 0; i < DisplayServer::get_singleton()->get_screen_count(); i++) {
 		project_manager_screen_hints += ",Screen " + itos(i + 1) + ":" + itos(i);
@@ -439,7 +470,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 
 	{
 		EngineUpdateLabel::UpdateMode default_update_mode = EngineUpdateLabel::UpdateMode::NEWEST_UNSTABLE;
-		if (String(VERSION_STATUS) == String("stable")) {
+		if (String(GODOT_VERSION_STATUS) == String("stable")) {
 			default_update_mode = EngineUpdateLabel::UpdateMode::NEWEST_STABLE;
 		}
 		EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "network/connection/engine_version_update_mode", int(default_update_mode), "Disable Update Checks,Check Newest Preview,Check Newest Stable,Check Newest Patch"); // Uses EngineUpdateLabel::UpdateMode.
@@ -553,6 +584,10 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/touchscreen/scale_gizmo_handles", has_touchscreen_ui ? 3 : 1, "1,5,1")
 	set_restart_if_changed("interface/touchscreen/scale_gizmo_handles", true);
 
+	// Only available in the Android editor.
+	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_touch_actions_panel", true, "")
+	set_restart_if_changed("interface/touchscreen/enable_touch_actions_panel", true);
+
 	// Disable some touchscreen settings by default for the XR Editor.
 	bool is_native_touchscreen = has_touchscreen_ui && !OS::get_singleton()->has_feature("xr_editor");
 	EDITOR_SETTING(Variant::BOOL, PROPERTY_HINT_NONE, "interface/touchscreen/enable_long_press_as_right_click", is_native_touchscreen, "")
@@ -626,6 +661,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("docks/scene_tree/auto_expand_to_selected", true);
 	_initial_set("docks/scene_tree/center_node_on_reparent", false);
 	_initial_set("docks/scene_tree/hide_filtered_out_parents", true);
+	_initial_set("docks/scene_tree/accessibility_warnings", false);
 
 	// FileSystem
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "docks/filesystem/thumbnail_size", 64, "32,128,16")
@@ -710,6 +746,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	_initial_set("text_editor/behavior/files/auto_reload_scripts_on_external_change", false);
 	_initial_set("text_editor/behavior/files/auto_reload_and_parse_scripts_on_save", true);
 	_initial_set("text_editor/behavior/files/open_dominant_script_on_scene_change", false, true);
+	_initial_set("text_editor/behavior/files/drop_preload_resources_as_uid", true, true);
 
 	// Behavior: Documentation
 	_initial_set("text_editor/behavior/documentation/enable_tooltips", true, true);
@@ -765,7 +802,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING_BASIC(Variant::COLOR, PROPERTY_HINT_NONE, "editors/3d/secondary_grid_color", Color(0.38, 0.38, 0.38, 0.5), "")
 
 	// Use a similar color to the 2D editor selection.
-	EDITOR_SETTING_USAGE(Variant::COLOR, PROPERTY_HINT_NONE, "editors/3d/selection_box_color", Color(1.0, 0.5, 0), "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
+	EDITOR_SETTING_USAGE(Variant::COLOR, PROPERTY_HINT_NONE, "editors/3d/selection_box_color", Color(1.0, 0.5, 0), "", PROPERTY_USAGE_DEFAULT)
+	EDITOR_SETTING_USAGE(Variant::COLOR, PROPERTY_HINT_NONE, "editors/3d/active_selection_box_color", Color(1.5, 0.75, 0, 1.0), "", PROPERTY_USAGE_DEFAULT)
 	EDITOR_SETTING_USAGE(Variant::COLOR, PROPERTY_HINT_NONE, "editors/3d_gizmos/gizmo_colors/instantiated", Color(0.7, 0.7, 0.7, 0.6), "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 	EDITOR_SETTING_USAGE(Variant::COLOR, PROPERTY_HINT_NONE, "editors/3d_gizmos/gizmo_colors/joint", Color(0.5, 0.8, 1), "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
 	EDITOR_SETTING_USAGE(Variant::COLOR, PROPERTY_HINT_NONE, "editors/3d_gizmos/gizmo_colors/aabb", Color(0.28, 0.8, 0.82), "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
@@ -845,7 +883,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "editors/3d/freelook/freelook_navigation_scheme", 0, "Default,Partially Axis-Locked (id Tech),Fully Axis-Locked (Minecraft)")
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/freelook/freelook_sensitivity", 0.25, "0.01,2,0.001")
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/freelook/freelook_inertia", 0.0, "0,1,0.001")
-	EDITOR_SETTING_BASIC(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/freelook/freelook_base_speed", 5.0, "0,10,0.01")
+	EDITOR_SETTING_BASIC(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/3d/freelook/freelook_base_speed", 5.0, "0,10,0.01,or_greater")
 	EDITOR_SETTING_BASIC(Variant::INT, PROPERTY_HINT_ENUM, "editors/3d/freelook/freelook_activation_modifier", 0, "None,Shift,Alt,Meta,Ctrl")
 	_initial_set("editors/3d/freelook/freelook_speed_zoom_link", false);
 
@@ -894,6 +932,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/polygon_editor/auto_bake_delay", 1.5, "-1.0,10.0,0.01");
 
 	// Animation
+	EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "editors/animation/default_animation_step", Animation::DEFAULT_STEP, "0.0,10.0,0.00000001");
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "editors/animation/default_fps_mode", 0, "Seconds,FPS");
+	_initial_set("editors/animation/default_fps_compatibility", true);
 	_initial_set("editors/animation/autorename_animation_tracks", true);
 	_initial_set("editors/animation/confirm_insert_track", true, true);
 	_initial_set("editors/animation/default_create_bezier_tracks", false, true);
@@ -984,6 +1025,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 
 	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "debugger/auto_switch_to_remote_scene_tree", false, "")
 	EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_NONE, "debugger/auto_switch_to_stack_trace", true, "")
+	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "debugger/max_node_selection", 20, "1,100,1")
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "debugger/profiler_frame_history_size", 3600, "60,10000,1")
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "debugger/profiler_frame_max_functions", 64, "16,512,1")
 	EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "debugger/profiler_target_fps", 60, "1,1000,1")
@@ -1074,6 +1116,7 @@ void EditorSettings::_load_godot2_text_editor_theme() {
 	_initial_set("text_editor/theme/highlighting/function_color", Color(0.4, 0.64, 0.81), true);
 	_initial_set("text_editor/theme/highlighting/member_variable_color", Color(0.9, 0.31, 0.35), true);
 	_initial_set("text_editor/theme/highlighting/mark_color", Color(1.0, 0.4, 0.4, 0.4), true);
+	_initial_set("text_editor/theme/highlighting/warning_color", Color(1.0, 0.8, 0.4, 0.1), true);
 	_initial_set("text_editor/theme/highlighting/bookmark_color", Color(0.08, 0.49, 0.98));
 	_initial_set("text_editor/theme/highlighting/breakpoint_color", Color(0.9, 0.29, 0.3));
 	_initial_set("text_editor/theme/highlighting/executing_line_color", Color(0.98, 0.89, 0.27));
@@ -1107,6 +1150,40 @@ void EditorSettings::_load_default_visual_shader_editor_theme() {
 	_initial_set("editors/visual_editors/category_colors/particle_color", Color(0.12, 0.358, 0.8));
 }
 
+String EditorSettings::_guess_exec_args_for_extenal_editor(const String &p_path) {
+	Ref<RegEx> regex;
+	regex.instantiate();
+
+	const String editor_pattern = R"([\\/]((?:jetbrains\s*)?rider(?:\s*(eap|\d{4}\.\d+|\d{4}\.\d+\s*dev)?)?|visual\s*studio\s*code|subl(ime\s*text)?|sublime_text|(g)?vim|emacs|atom|geany|kate|code|(vs)?codium)(?:\.app|\.exe|\.bat|\.sh)?)";
+	regex->compile(editor_pattern);
+	Ref<RegExMatch> editor_match = regex->search(p_path.to_lower());
+
+	if (editor_match.is_null()) {
+		return String();
+	}
+
+	const String editor = editor_match->get_string(1).to_lower();
+	String new_exec_flags = "{file}";
+
+	if (editor.begins_with("rider")) {
+		new_exec_flags = "{project} --line {line} {file}";
+	} else if (editor == "subl" || editor == "sublime text" || editor == "sublime_text") {
+		new_exec_flags = "{project} {file}:{line}:{column}";
+	} else if (editor == "vim" || editor == "gvim") {
+		new_exec_flags = "\"+call cursor({line}, {col})\" {file}";
+	} else if (editor == "emacs") {
+		new_exec_flags = "emacs +{line}:{col} {file}";
+	} else if (editor == "atom") {
+		new_exec_flags = "{file}:{line}";
+	} else if (editor == "geany" || editor == "kate") {
+		new_exec_flags = "{file} --line {line} --column {col}";
+	} else if (editor == "code" || editor == "visual studio code" || editor == "codium" || editor == "vscodium") {
+		new_exec_flags = "{project} --goto {file}:{line}:{col}";
+	}
+
+	return new_exec_flags;
+}
+
 bool EditorSettings::_save_text_editor_theme(const String &p_file) {
 	String theme_section = "color_theme";
 	Ref<ConfigFile> cf = memnew(ConfigFile); // hex is better?
@@ -1153,16 +1230,16 @@ EditorSettings *EditorSettings::get_singleton() {
 
 String EditorSettings::get_existing_settings_path() {
 	const String config_dir = EditorPaths::get_singleton()->get_config_dir();
-	int minor = VERSION_MINOR;
+	int minor = GODOT_VERSION_MINOR;
 	String filename;
 
 	do {
-		if (VERSION_MAJOR == 4 && minor < 3) {
+		if (GODOT_VERSION_MAJOR == 4 && minor < 3) {
 			// Minor version is used since 4.3, so special case to load older settings.
-			filename = vformat("editor_settings-%d.tres", VERSION_MAJOR);
+			filename = vformat("editor_settings-%d.tres", GODOT_VERSION_MAJOR);
 			minor = -1;
 		} else {
-			filename = vformat("editor_settings-%d.%d.tres", VERSION_MAJOR, minor);
+			filename = vformat("editor_settings-%d.%d.tres", GODOT_VERSION_MAJOR, minor);
 			minor--;
 		}
 	} while (minor >= 0 && !FileAccess::exists(config_dir.path_join(filename)));
@@ -1170,7 +1247,7 @@ String EditorSettings::get_existing_settings_path() {
 }
 
 String EditorSettings::get_newest_settings_path() {
-	const String config_file_name = vformat("editor_settings-%d.%d.tres", VERSION_MAJOR, VERSION_MINOR);
+	const String config_file_name = vformat("editor_settings-%d.%d.tres", GODOT_VERSION_MAJOR, GODOT_VERSION_MINOR);
 	return EditorPaths::get_singleton()->get_config_dir().path_join(config_file_name);
 }
 
@@ -1255,9 +1332,9 @@ fail:
 
 void EditorSettings::setup_language() {
 	String lang = get("interface/editor/editor_language");
-	TranslationServer::get_singleton()->set_locale(lang);
 
 	if (lang == "en") {
+		TranslationServer::get_singleton()->set_locale(lang);
 		return; // Default, nothing to do.
 	}
 	// Load editor translation for configured/detected locale.
@@ -1269,6 +1346,8 @@ void EditorSettings::setup_language() {
 
 	// Load extractable translation for projects.
 	load_extractable_translations(lang);
+
+	TranslationServer::get_singleton()->set_locale(lang);
 }
 
 void EditorSettings::setup_network() {
@@ -1748,7 +1827,7 @@ String EditorSettings::get_editor_layouts_config() const {
 	return EditorPaths::get_singleton()->get_config_dir().path_join("editor_layouts.cfg");
 }
 
-float EditorSettings::get_auto_display_scale() const {
+float EditorSettings::get_auto_display_scale() {
 #ifdef LINUXBSD_ENABLED
 	if (DisplayServer::get_singleton()->get_name() == "Wayland") {
 		float main_window_scale = DisplayServer::get_singleton()->screen_get_scale(DisplayServer::SCREEN_OF_MAIN_WINDOW);
@@ -2058,7 +2137,6 @@ void EditorSettings::notify_changes() {
 	root->propagate_notification(NOTIFICATION_EDITOR_SETTINGS_CHANGED);
 }
 
-#ifdef TOOLS_ENABLED
 void EditorSettings::get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const {
 	const String pf = p_function;
 	if (p_idx == 0) {
@@ -2085,7 +2163,6 @@ void EditorSettings::get_argument_options(const StringName &p_function, int p_id
 	}
 	Object::get_argument_options(p_function, p_idx, r_options);
 }
-#endif
 
 void EditorSettings::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("has_setting", "name"), &EditorSettings::has_setting);
diff --git a/engine/editor/editor_settings.h b/engine/editor/editor_settings.h
index 5bdd504d..e58eeec5 100644
--- a/engine/editor/editor_settings.h
+++ b/engine/editor/editor_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SETTINGS_H
-#define EDITOR_SETTINGS_H
+#pragma once
 
 #include "core/input/shortcut.h"
 #include "core/io/config_file.h"
@@ -123,6 +122,7 @@ private:
 	void _load_default_visual_shader_editor_theme();
 	bool _save_text_editor_theme(const String &p_file);
 	bool _is_default_text_editor_theme(const String &p_theme_name);
+	static String _guess_exec_args_for_extenal_editor(const String &p_value);
 	const String _get_project_metadata_path() const;
 #ifndef DISABLE_DEPRECATED
 	void _remove_deprecated_settings();
@@ -191,7 +191,7 @@ public:
 
 	Vector<String> get_script_templates(const String &p_extension, const String &p_custom_path = String());
 	String get_editor_layouts_config() const;
-	float get_auto_display_scale() const;
+	static float get_auto_display_scale();
 
 	void _add_shortcut_default(const String &p_name, const Ref<Shortcut> &p_shortcut);
 	void add_shortcut(const String &p_name, const Ref<Shortcut> &p_shortcut);
@@ -204,9 +204,7 @@ public:
 
 	void notify_changes();
 
-#ifdef TOOLS_ENABLED
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
-#endif
 
 	EditorSettings();
 };
@@ -227,5 +225,3 @@ Ref<Shortcut> ED_SHORTCUT_ARRAY(const String &p_path, const String &p_name, cons
 void ED_SHORTCUT_OVERRIDE(const String &p_path, const String &p_feature, Key p_keycode = Key::NONE, bool p_physical = false);
 void ED_SHORTCUT_OVERRIDE_ARRAY(const String &p_path, const String &p_feature, const PackedInt32Array &p_keycodes, bool p_physical = false);
 Ref<Shortcut> ED_GET_SHORTCUT(const String &p_path);
-
-#endif // EDITOR_SETTINGS_H
diff --git a/engine/editor/editor_settings_dialog.cpp b/engine/editor/editor_settings_dialog.cpp
index 607c922c..7d424617 100644
--- a/engine/editor/editor_settings_dialog.cpp
+++ b/engine/editor/editor_settings_dialog.cpp
@@ -56,13 +56,13 @@ void EditorSettingsDialog::ok_pressed() {
 	if (!EditorSettings::get_singleton()) {
 		return;
 	}
-
 	_settings_save();
-	timer->stop();
 }
 
 void EditorSettingsDialog::_settings_changed() {
-	timer->start();
+	if (is_visible()) {
+		timer->start();
+	}
 }
 
 void EditorSettingsDialog::_settings_property_edited(const String &p_name) {
@@ -174,6 +174,9 @@ void EditorSettingsDialog::_set_shortcut_input(const String &p_name, Ref<InputEv
 }
 
 void EditorSettingsDialog::_settings_save() {
+	if (!timer->is_stopped()) {
+		timer->stop();
+	}
 	EditorSettings::get_singleton()->notify_changes();
 	EditorSettings::get_singleton()->save();
 }
@@ -572,7 +575,7 @@ void EditorSettingsDialog::_update_shortcuts() {
 	// Create all sections first.
 	for (const String &E : slist) {
 		Ref<Shortcut> sc = EditorSettings::get_singleton()->get_shortcut(E);
-		String section_name = E.get_slice("/", 0);
+		String section_name = E.get_slicec('/', 0);
 
 		if (sections.has(section_name)) {
 			continue;
@@ -605,7 +608,7 @@ void EditorSettingsDialog::_update_shortcuts() {
 			continue;
 		}
 
-		String section_name = E.get_slice("/", 0);
+		String section_name = E.get_slicec('/', 0);
 		TreeItem *section = sections[section_name];
 
 		if (!_should_display_shortcut(sc->get_name(), sc->get_events(), true)) {
@@ -756,7 +759,7 @@ Variant EditorSettingsDialog::get_drag_data_fw(const Point2 &p_point, Control *p
 
 bool EditorSettingsDialog::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
 	TreeItem *selected = shortcuts->get_selected();
-	TreeItem *item = shortcuts->get_item_at_position(p_point);
+	TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? shortcuts->get_selected() : shortcuts->get_item_at_position(p_point);
 	if (!selected || !item || item == selected || (String)item->get_meta("type", "") != "event") {
 		return false;
 	}
@@ -775,7 +778,7 @@ void EditorSettingsDialog::drop_data_fw(const Point2 &p_point, const Variant &p_
 	}
 
 	TreeItem *selected = shortcuts->get_selected();
-	TreeItem *target = shortcuts->get_item_at_position(p_point);
+	TreeItem *target = (p_point == Vector2(Math::INF, Math::INF)) ? shortcuts->get_selected() : shortcuts->get_item_at_position(p_point);
 
 	if (!target) {
 		return;
@@ -898,6 +901,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
 
 	search_box = memnew(LineEdit);
 	search_box->set_placeholder(TTR("Filter Settings"));
+	search_box->set_accessibility_name(TTRC("Filter Settings"));
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	hbc->add_child(search_box);
 
@@ -933,6 +937,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
 	restart_hb->add_child(restart_button);
 	restart_button->set_text(TTR("Save & Restart"));
 	restart_close_button = memnew(Button);
+	restart_close_button->set_accessibility_name(TTRC("Close"));
 	restart_close_button->set_flat(true);
 	restart_close_button->connect(SceneStringName(pressed), callable_mp(this, &EditorSettingsDialog::_editor_restart_close));
 	restart_hb->add_child(restart_close_button);
@@ -951,6 +956,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
 
 	shortcut_search_box = memnew(LineEdit);
 	shortcut_search_box->set_placeholder(TTR("Filter by Name"));
+	shortcut_search_box->set_accessibility_name(TTRC("Filter by Name"));
 	shortcut_search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	top_hbox->add_child(shortcut_search_box);
 	shortcut_search_box->connect(SceneStringName(text_changed), callable_mp(this, &EditorSettingsDialog::_filter_shortcuts));
@@ -972,6 +978,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
 	top_hbox->add_child(clear_all_search);
 
 	shortcuts = memnew(Tree);
+	shortcuts->set_accessibility_name(TTRC("Shortcuts"));
 	shortcuts->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	shortcuts->set_columns(2);
 	shortcuts->set_hide_root(true);
@@ -1000,6 +1007,3 @@ EditorSettingsDialog::EditorSettingsDialog() {
 	EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &EditorSettingsDialog::_settings_changed));
 	set_ok_button_text(TTR("Close"));
 }
-
-EditorSettingsDialog::~EditorSettingsDialog() {
-}
diff --git a/engine/editor/editor_settings_dialog.h b/engine/editor/editor_settings_dialog.h
index 4e6b3124..b4fb94fc 100644
--- a/engine/editor/editor_settings_dialog.h
+++ b/engine/editor/editor_settings_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SETTINGS_DIALOG_H
-#define EDITOR_SETTINGS_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -137,7 +136,4 @@ public:
 	static void update_navigation_preset();
 
 	EditorSettingsDialog();
-	~EditorSettingsDialog();
 };
-
-#endif // EDITOR_SETTINGS_DIALOG_H
diff --git a/engine/editor/editor_string_names.h b/engine/editor/editor_string_names.h
index 0ef5cf63..886e2dd1 100644
--- a/engine/editor/editor_string_names.h
+++ b/engine/editor/editor_string_names.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_STRING_NAMES_H
-#define EDITOR_STRING_NAMES_H
+#pragma once
 
 #include "core/string/string_name.h"
 
@@ -52,5 +51,3 @@ public:
 };
 
 #define EditorStringName(m_name) EditorStringNames::get_singleton()->m_name
-
-#endif // EDITOR_STRING_NAMES_H
diff --git a/engine/editor/editor_translation.cpp b/engine/editor/editor_translation.cpp
index 6ccde3b6..fb59288e 100644
--- a/engine/editor/editor_translation.cpp
+++ b/engine/editor/editor_translation.cpp
@@ -42,7 +42,7 @@
 Vector<String> get_editor_locales() {
 	Vector<String> locales;
 
-	EditorTranslationList *etl = _editor_translations;
+	const EditorTranslationList *etl = _editor_translations;
 	while (etl->data) {
 		const String &locale = etl->lang;
 		locales.push_back(locale);
@@ -56,7 +56,7 @@ Vector<String> get_editor_locales() {
 void load_editor_translations(const String &p_locale) {
 	const Ref<TranslationDomain> domain = TranslationServer::get_singleton()->get_or_add_domain("godot.editor");
 
-	EditorTranslationList *etl = _editor_translations;
+	const EditorTranslationList *etl = _editor_translations;
 	while (etl->data) {
 		if (etl->lang == p_locale) {
 			Vector<uint8_t> data;
@@ -84,7 +84,7 @@ void load_editor_translations(const String &p_locale) {
 void load_property_translations(const String &p_locale) {
 	const Ref<TranslationDomain> domain = TranslationServer::get_singleton()->get_or_add_domain("godot.properties");
 
-	PropertyTranslationList *etl = _property_translations;
+	const PropertyTranslationList *etl = _property_translations;
 	while (etl->data) {
 		if (etl->lang == p_locale) {
 			Vector<uint8_t> data;
@@ -112,7 +112,7 @@ void load_property_translations(const String &p_locale) {
 void load_doc_translations(const String &p_locale) {
 	const Ref<TranslationDomain> domain = TranslationServer::get_singleton()->get_or_add_domain("godot.documentation");
 
-	DocTranslationList *dtl = _doc_translations;
+	const DocTranslationList *dtl = _doc_translations;
 	while (dtl->data) {
 		if (dtl->lang == p_locale) {
 			Vector<uint8_t> data;
@@ -140,7 +140,7 @@ void load_doc_translations(const String &p_locale) {
 void load_extractable_translations(const String &p_locale) {
 	const Ref<TranslationDomain> domain = TranslationServer::get_singleton()->get_or_add_domain("godot.editor");
 
-	ExtractableTranslationList *etl = _extractable_translations;
+	const ExtractableTranslationList *etl = _extractable_translations;
 	while (etl->data) {
 		if (etl->lang == p_locale) {
 			Vector<uint8_t> data;
@@ -166,7 +166,7 @@ void load_extractable_translations(const String &p_locale) {
 }
 
 Vector<Vector<String>> get_extractable_message_list() {
-	ExtractableTranslationList *etl = _extractable_translations;
+	const ExtractableTranslationList *etl = _extractable_translations;
 	Vector<Vector<String>> list;
 
 	while (etl->data) {
@@ -235,7 +235,7 @@ Vector<Vector<String>> get_extractable_message_list() {
 						list.push_back(msgs);
 					}
 					msg_context = "";
-					l = l.substr(7, l.length()).strip_edges();
+					l = l.substr(7).strip_edges();
 					status = STATUS_READING_CONTEXT;
 					entered_context = true;
 				}
@@ -244,7 +244,7 @@ Vector<Vector<String>> get_extractable_message_list() {
 					if (status != STATUS_READING_ID) {
 						ERR_FAIL_V_MSG(Vector<Vector<String>>(), "Unexpected 'msgid_plural', was expecting 'msgid' before 'msgid_plural' while parsing: " + path + ":" + itos(line));
 					}
-					l = l.substr(12, l.length()).strip_edges();
+					l = l.substr(12).strip_edges();
 					status = STATUS_READING_PLURAL;
 				} else if (l.begins_with("msgid")) {
 					ERR_FAIL_COND_V_MSG(status == STATUS_READING_ID, Vector<Vector<String>>(), "Unexpected 'msgid', was expecting 'msgstr' while parsing: " + path + ":" + itos(line));
@@ -257,7 +257,7 @@ Vector<Vector<String>> get_extractable_message_list() {
 						list.push_back(msgs);
 					}
 
-					l = l.substr(5, l.length()).strip_edges();
+					l = l.substr(5).strip_edges();
 					status = STATUS_READING_ID;
 					// If we did not encounter msgctxt, we reset context to empty to reset it.
 					if (!entered_context) {
@@ -271,11 +271,11 @@ Vector<Vector<String>> get_extractable_message_list() {
 				if (l.begins_with("msgstr[")) {
 					ERR_FAIL_COND_V_MSG(status != STATUS_READING_PLURAL, Vector<Vector<String>>(),
 							"Unexpected 'msgstr[]', was expecting 'msgid_plural' before 'msgstr[]' while parsing: " + path + ":" + itos(line));
-					l = l.substr(9, l.length()).strip_edges();
+					l = l.substr(9).strip_edges();
 				} else if (l.begins_with("msgstr")) {
 					ERR_FAIL_COND_V_MSG(status != STATUS_READING_ID, Vector<Vector<String>>(),
 							"Unexpected 'msgstr', was expecting 'msgid' before 'msgstr' while parsing: " + path + ":" + itos(line));
-					l = l.substr(6, l.length()).strip_edges();
+					l = l.substr(6).strip_edges();
 					status = STATUS_READING_STRING;
 				}
 
@@ -286,7 +286,7 @@ Vector<Vector<String>> get_extractable_message_list() {
 
 				ERR_FAIL_COND_V_MSG(!l.begins_with("\"") || status == STATUS_NONE, Vector<Vector<String>>(), "Invalid line '" + l + "' while parsing: " + path + ":" + itos(line));
 
-				l = l.substr(1, l.length());
+				l = l.substr(1);
 				// Find final quote, ignoring escaped ones (\").
 				// The escape_next logic is necessary to properly parse things like \\"
 				// where the backslash is the one being escaped, not the quote.
diff --git a/engine/editor/editor_translation.h b/engine/editor/editor_translation.h
index 396d7de1..f20e8ff6 100644
--- a/engine/editor/editor_translation.h
+++ b/engine/editor/editor_translation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_TRANSLATION_H
-#define EDITOR_TRANSLATION_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
@@ -40,5 +39,3 @@ void load_property_translations(const String &p_locale);
 void load_doc_translations(const String &p_locale);
 void load_extractable_translations(const String &p_locale);
 Vector<Vector<String>> get_extractable_message_list();
-
-#endif // EDITOR_TRANSLATION_H
diff --git a/engine/editor/editor_translation_parser.cpp b/engine/editor/editor_translation_parser.cpp
index e3422861..25f00f33 100644
--- a/engine/editor/editor_translation_parser.cpp
+++ b/engine/editor/editor_translation_parser.cpp
@@ -179,9 +179,6 @@ EditorTranslationParser *EditorTranslationParser::get_singleton() {
 	return singleton;
 }
 
-EditorTranslationParser::EditorTranslationParser() {
-}
-
 EditorTranslationParser::~EditorTranslationParser() {
 	memdelete(singleton);
 	singleton = nullptr;
diff --git a/engine/editor/editor_translation_parser.h b/engine/editor/editor_translation_parser.h
index e787cbc8..7f0f5d1b 100644
--- a/engine/editor/editor_translation_parser.h
+++ b/engine/editor/editor_translation_parser.h
@@ -28,10 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_TRANSLATION_PARSER_H
-#define EDITOR_TRANSLATION_PARSER_H
+#pragma once
 
-#include "core/error/error_list.h"
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
 #include "core/variant/typed_array.h"
@@ -75,8 +73,5 @@ public:
 	void remove_parser(const Ref<EditorTranslationParserPlugin> &p_parser, ParserType p_type);
 	void clean_parsers();
 
-	EditorTranslationParser();
 	~EditorTranslationParser();
 };
-
-#endif // EDITOR_TRANSLATION_PARSER_H
diff --git a/engine/editor/editor_undo_redo_manager.cpp b/engine/editor/editor_undo_redo_manager.cpp
index c0b6a497..a278de08 100644
--- a/engine/editor/editor_undo_redo_manager.cpp
+++ b/engine/editor/editor_undo_redo_manager.cpp
@@ -61,7 +61,7 @@ UndoRedo *EditorUndoRedoManager::get_history_undo_redo(int p_idx) const {
 int EditorUndoRedoManager::get_history_id_for_object(Object *p_object) const {
 	int history_id = INVALID_HISTORY;
 
-	if (Object::cast_to<EditorDebuggerRemoteObject>(p_object)) {
+	if (Object::cast_to<EditorDebuggerRemoteObjects>(p_object)) {
 		return REMOTE_HISTORY;
 	}
 
@@ -321,7 +321,7 @@ bool EditorUndoRedoManager::redo() {
 	}
 
 	int selected_history = INVALID_HISTORY;
-	double global_timestamp = INFINITY;
+	double global_timestamp = Math::INF;
 
 	// Pick the history with lowest last action timestamp (either global or current scene).
 	{
diff --git a/engine/editor/editor_undo_redo_manager.h b/engine/editor/editor_undo_redo_manager.h
index 74524477..4b90a65e 100644
--- a/engine/editor/editor_undo_redo_manager.h
+++ b/engine/editor/editor_undo_redo_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_UNDO_REDO_MANAGER_H
-#define EDITOR_UNDO_REDO_MANAGER_H
+#pragma once
 
 #include "core/object/object.h"
 #include "core/object/undo_redo.h"
@@ -144,5 +143,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(EditorUndoRedoManager::SpecialHistory);
-
-#endif // EDITOR_UNDO_REDO_MANAGER_H
diff --git a/engine/editor/editor_vcs_interface.h b/engine/editor/editor_vcs_interface.h
index 718354f7..a0d80d79 100644
--- a/engine/editor/editor_vcs_interface.h
+++ b/engine/editor/editor_vcs_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_VCS_INTERFACE_H
-#define EDITOR_VCS_INTERFACE_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/string/ustring.h"
@@ -177,5 +176,3 @@ public:
 
 VARIANT_ENUM_CAST(EditorVCSInterface::ChangeType);
 VARIANT_ENUM_CAST(EditorVCSInterface::TreeArea);
-
-#endif // EDITOR_VCS_INTERFACE_H
diff --git a/engine/editor/engine_update_label.cpp b/engine/editor/engine_update_label.cpp
index 33f856f5..6f93647c 100644
--- a/engine/editor/engine_update_label.cpp
+++ b/engine/editor/engine_update_label.cpp
@@ -61,9 +61,8 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod
 
 	Array version_array;
 	{
-		String s;
 		const uint8_t *r = p_body.ptr();
-		s.parse_utf8((const char *)r, p_body.size());
+		String s = String::utf8((const char *)r, p_body.size());
 
 		Variant result = JSON::parse_string(s);
 		if (result == Variant()) {
@@ -185,17 +184,20 @@ void EngineUpdateLabel::_set_status(UpdateStatus p_status) {
 			} else {
 				_set_message(TTR("Update checks disabled."), theme_cache.disabled_color);
 			}
+			set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_OFF);
 			set_tooltip_text("");
 			break;
 		}
 
 		case UpdateStatus::ERROR: {
 			set_disabled(false);
+			set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_POLITE);
 			set_tooltip_text(TTR("An error has occurred. Click to try again."));
 		} break;
 
 		case UpdateStatus::UPDATE_AVAILABLE: {
 			set_disabled(false);
+			set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_POLITE);
 			set_tooltip_text(TTR("Click to open download page."));
 		} break;
 
@@ -248,12 +250,7 @@ void EngineUpdateLabel::_notification(int p_what) {
 			}
 
 			if (_can_check_updates()) {
-				if (!checked_update) {
-					_check_update();
-				} else {
-					// This will be wrong when user toggles online mode twice when update is available, but it's not worth handling.
-					_set_status(UpdateStatus::UP_TO_DATE);
-				}
+				_check_update();
 			} else {
 				_set_status(UpdateStatus::OFFLINE);
 			}
diff --git a/engine/editor/engine_update_label.h b/engine/editor/engine_update_label.h
index 5ebe271c..a424064e 100644
--- a/engine/editor/engine_update_label.h
+++ b/engine/editor/engine_update_label.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENGINE_UPDATE_LABEL_H
-#define ENGINE_UPDATE_LABEL_H
+#pragma once
 
 #include "scene/gui/link_button.h"
 
@@ -99,5 +98,3 @@ protected:
 public:
 	EngineUpdateLabel();
 };
-
-#endif // ENGINE_UPDATE_LABEL_H
diff --git a/engine/editor/event_listener_line_edit.cpp b/engine/editor/event_listener_line_edit.cpp
index a6b30233..c8151ed9 100644
--- a/engine/editor/event_listener_line_edit.cpp
+++ b/engine/editor/event_listener_line_edit.cpp
@@ -162,8 +162,26 @@ void EventListenerLineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
+	// Allow releasing focus by holding "ui_cancel" action.
+	bool accept_release = false;
+	uint64_t hold_to_unfocus_timeout = 3000;
+	if (p_event->is_action_pressed(SNAME("ui_cancel"), true, true)) {
+		if ((OS::get_singleton()->get_ticks_msec() - hold_next) < hold_to_unfocus_timeout) {
+			hold_next = 0;
+			Control *next = find_next_valid_focus();
+			next->grab_focus();
+		} else {
+			hold_next = OS::get_singleton()->get_ticks_msec();
+		}
+		accept_event();
+		return;
+	} else if (p_event->is_action_released(SNAME("ui_cancel"), true)) {
+		accept_release = true;
+	}
+	hold_next = 0;
+
 	accept_event();
-	if (!p_event->is_pressed() || p_event->is_echo() || p_event->is_match(event) || !_is_event_allowed(p_event)) {
+	if (!(p_event->is_pressed() || accept_release) || p_event->is_echo() || p_event->is_match(event) || !_is_event_allowed(p_event)) {
 		return;
 	}
 
@@ -215,6 +233,12 @@ void EventListenerLineEdit::grab_focus() {
 
 void EventListenerLineEdit::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_extra_info(ae, vformat(TTR("Listening for Input. Hold %s to release focus."), InputMap::get_singleton()->get_action_description("ui_cancel")));
+		} break;
 		case NOTIFICATION_ENTER_TREE: {
 			connect(SceneStringName(text_changed), callable_mp(this, &EventListenerLineEdit::_on_text_changed));
 			connect(SceneStringName(focus_entered), callable_mp(this, &EventListenerLineEdit::_on_focus));
diff --git a/engine/editor/event_listener_line_edit.h b/engine/editor/event_listener_line_edit.h
index aa0cc91d..ca274416 100644
--- a/engine/editor/event_listener_line_edit.h
+++ b/engine/editor/event_listener_line_edit.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EVENT_LISTENER_LINE_EDIT_H
-#define EVENT_LISTENER_LINE_EDIT_H
+#pragma once
 
 #include "scene/gui/line_edit.h"
 
@@ -43,6 +42,8 @@ enum InputType {
 class EventListenerLineEdit : public LineEdit {
 	GDCLASS(EventListenerLineEdit, LineEdit)
 
+	uint64_t hold_next = 0;
+
 	int allowed_input_types = INPUT_KEY | INPUT_MOUSE_BUTTON | INPUT_JOY_BUTTON | INPUT_JOY_MOTION;
 	bool ignore_next_event = true;
 	bool share_keycodes = false;
@@ -75,5 +76,3 @@ public:
 public:
 	EventListenerLineEdit();
 };
-
-#endif // EVENT_LISTENER_LINE_EDIT_H
diff --git a/engine/editor/export/codesign.cpp b/engine/editor/export/codesign.cpp
index 7515f931..62d10653 100644
--- a/engine/editor/export/codesign.cpp
+++ b/engine/editor/export/codesign.cpp
@@ -469,13 +469,10 @@ _FORCE_INLINE_ void CodeSignRequirements::_parse_certificate_slot(uint32_t &r_po
 _FORCE_INLINE_ void CodeSignRequirements::_parse_key(uint32_t &r_pos, String &r_out, uint32_t p_rq_size) const {
 #define _R(x) BSWAP32(*(uint32_t *)(blob.ptr() + x))
 	ERR_FAIL_COND_MSG(r_pos >= p_rq_size, "CodeSign/Requirements: Out of bounds.");
-	uint32_t key_size = _R(r_pos);
+	const uint32_t key_size = _R(r_pos);
 	ERR_FAIL_COND_MSG(r_pos + key_size > p_rq_size, "CodeSign/Requirements: Out of bounds.");
-	CharString key;
-	key.resize(key_size);
-	memcpy(key.ptrw(), blob.ptr() + r_pos + 4, key_size);
 	r_pos += 4 + key_size + PAD(key_size, 4);
-	r_out += "[" + String::utf8(key, key_size) + "]";
+	r_out += "[" + String::utf8((const char *)blob.ptr() + r_pos + 4, key_size) + "]";
 #undef _R
 }
 
@@ -515,10 +512,7 @@ _FORCE_INLINE_ void CodeSignRequirements::_parse_hash_string(uint32_t &r_pos, St
 	ERR_FAIL_COND_MSG(r_pos >= p_rq_size, "CodeSign/Requirements: Out of bounds.");
 	uint32_t tag_size = _R(r_pos);
 	ERR_FAIL_COND_MSG(r_pos + tag_size > p_rq_size, "CodeSign/Requirements: Out of bounds.");
-	PackedByteArray data;
-	data.resize(tag_size);
-	memcpy(data.ptrw(), blob.ptr() + r_pos + 4, tag_size);
-	r_out += "H\"" + String::hex_encode_buffer(data.ptr(), data.size()) + "\"";
+	r_out += "H\"" + String::hex_encode_buffer(blob.ptr() + r_pos + 4, tag_size) + "\"";
 	r_pos += 4 + tag_size + PAD(tag_size, 4);
 #undef _R
 }
@@ -526,13 +520,10 @@ _FORCE_INLINE_ void CodeSignRequirements::_parse_hash_string(uint32_t &r_pos, St
 _FORCE_INLINE_ void CodeSignRequirements::_parse_value(uint32_t &r_pos, String &r_out, uint32_t p_rq_size) const {
 #define _R(x) BSWAP32(*(uint32_t *)(blob.ptr() + x))
 	ERR_FAIL_COND_MSG(r_pos >= p_rq_size, "CodeSign/Requirements: Out of bounds.");
-	uint32_t key_size = _R(r_pos);
+	const uint32_t key_size = _R(r_pos);
 	ERR_FAIL_COND_MSG(r_pos + key_size > p_rq_size, "CodeSign/Requirements: Out of bounds.");
-	CharString key;
-	key.resize(key_size);
-	memcpy(key.ptrw(), blob.ptr() + r_pos + 4, key_size);
 	r_pos += 4 + key_size + PAD(key_size, 4);
-	r_out += "\"" + String::utf8(key, key_size) + "\"";
+	r_out += "\"" + String::utf8((const char *)blob.ptr() + r_pos + 4, key_size) + "\"";
 #undef _R
 }
 
diff --git a/engine/editor/export/codesign.h b/engine/editor/export/codesign.h
index 0e0635df..bfbcdeaf 100644
--- a/engine/editor/export/codesign.h
+++ b/engine/editor/export/codesign.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CODESIGN_H
-#define CODESIGN_H
+#pragma once
 
 // macOS code signature creation utility.
 //
@@ -114,6 +113,8 @@ public:
 /*************************************************************************/
 
 class CodeSignBlob : public RefCounted {
+	GDSOFTCLASS(CodeSignBlob, RefCounted);
+
 public:
 	virtual PackedByteArray get_hash_sha1() const = 0;
 	virtual PackedByteArray get_hash_sha256() const = 0;
@@ -351,5 +352,3 @@ class CodeSign {
 public:
 	static Error codesign(bool p_use_hardened_runtime, bool p_force, const String &p_path, const String &p_ent_path, String &r_error_msg);
 };
-
-#endif // CODESIGN_H
diff --git a/engine/editor/export/editor_export.cpp b/engine/editor/export/editor_export.cpp
index 6f28b077..07729680 100644
--- a/engine/editor/export/editor_export.cpp
+++ b/engine/editor/export/editor_export.cpp
@@ -453,6 +453,3 @@ EditorExport::EditorExport() {
 	singleton = this;
 	set_process(true);
 }
-
-EditorExport::~EditorExport() {
-}
diff --git a/engine/editor/export/editor_export.h b/engine/editor/export/editor_export.h
index ebb2038f..ec99e92c 100644
--- a/engine/editor/export/editor_export.h
+++ b/engine/editor/export/editor_export.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_EXPORT_H
-#define EDITOR_EXPORT_H
+#pragma once
 
 #include "editor_export_platform.h"
 #include "editor_export_plugin.h"
@@ -84,7 +83,4 @@ public:
 	void connect_presets_runnable_updated(const Callable &p_target);
 
 	EditorExport();
-	~EditorExport();
 };
-
-#endif // EDITOR_EXPORT_H
diff --git a/engine/editor/export/editor_export_platform.compat.inc b/engine/editor/export/editor_export_platform.compat.inc
new file mode 100644
index 00000000..fca3300a
--- /dev/null
+++ b/engine/editor/export/editor_export_platform.compat.inc
@@ -0,0 +1,41 @@
+/**************************************************************************/
+/*  editor_export_platform.compat.inc                                     */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+Vector<String> EditorExportPlatform::_get_forced_export_files_bind_compat_71542() {
+	return get_forced_export_files(Ref<EditorExportPreset>());
+}
+
+void EditorExportPlatform::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_static_method("EditorExportPlatform", D_METHOD("get_forced_export_files"), &EditorExportPlatform::_get_forced_export_files_bind_compat_71542);
+}
+
+#endif
diff --git a/engine/editor/export/editor_export_platform.cpp b/engine/editor/export/editor_export_platform.cpp
index 55c58a10..6f41c1ec 100644
--- a/engine/editor/export/editor_export_platform.cpp
+++ b/engine/editor/export/editor_export_platform.cpp
@@ -30,6 +30,8 @@
 
 #include "editor_export_platform.h"
 
+#include "editor_export_platform.compat.inc"
+
 #include "core/config/project_settings.h"
 #include "core/crypto/crypto_core.h"
 #include "core/extension/gdextension.h"
@@ -38,6 +40,7 @@
 #include "core/io/image_loader.h"
 #include "core/io/resource_uid.h"
 #include "core/io/zip_io.h"
+#include "core/math/random_pcg.h"
 #include "core/version.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
@@ -255,6 +258,10 @@ Error EditorExportPlatform::_save_pack_file(void *p_userdata, const String &p_pa
 	PackData *pd = (PackData *)p_userdata;
 
 	String simplified_path = p_path.simplify_path();
+	if (simplified_path.begins_with("uid://")) {
+		simplified_path = ResourceUID::uid_to_path(simplified_path).simplify_path();
+		print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, simplified_path));
+	}
 
 	SavedData sd;
 	sd.path_utf8 = simplified_path.trim_prefix("res://").utf8();
@@ -290,7 +297,7 @@ Error EditorExportPlatform::_save_pack_file(void *p_userdata, const String &p_pa
 				seed = ((seed << 5) + seed) ^ ptr[i];
 			}
 
-			RandomPCG rng = RandomPCG(seed, RandomPCG::DEFAULT_INC);
+			RandomPCG rng = RandomPCG(seed);
 			iv.resize(16);
 			for (int i = 0; i < 16; i++) {
 				iv.write[i] = rng.rand() % 256;
@@ -349,7 +356,13 @@ Error EditorExportPlatform::_save_pack_patch_file(void *p_userdata, const String
 Error EditorExportPlatform::_save_zip_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed) {
 	ERR_FAIL_COND_V_MSG(p_total < 1, ERR_PARAMETER_RANGE_ERROR, "Must select at least one file to export.");
 
-	String path = p_path.replace_first("res://", "");
+	String path = p_path.simplify_path();
+	if (path.begins_with("uid://")) {
+		path = ResourceUID::uid_to_path(path).simplify_path();
+		print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, path));
+	}
+
+	path = path.replace_first("res://", "");
 
 	ZipData *zd = (ZipData *)p_userdata;
 
@@ -393,7 +406,7 @@ Ref<ImageTexture> EditorExportPlatform::get_option_icon(int p_index) const {
 }
 
 String EditorExportPlatform::find_export_template(const String &template_file_name, String *err) const {
-	String current_version = VERSION_FULL_CONFIG;
+	String current_version = GODOT_VERSION_FULL_CONFIG;
 	String template_path = EditorPaths::get_singleton()->get_export_templates_dir().path_join(current_version).path_join(template_file_name);
 
 	if (FileAccess::exists(template_path)) {
@@ -488,7 +501,7 @@ void EditorExportPlatform::_export_find_dependencies(const String &p_path, HashS
 
 void EditorExportPlatform::_edit_files_with_filter(Ref<DirAccess> &da, const Vector<String> &p_filters, HashSet<String> &r_list, bool exclude) {
 	da->list_dir_begin();
-	String cur_dir = da->get_current_dir().replace("\\", "/");
+	String cur_dir = da->get_current_dir().replace_char('\\', '/');
 	if (!cur_dir.ends_with("/")) {
 		cur_dir += "/";
 	}
@@ -627,9 +640,7 @@ EditorExportPlatform::ExportNotifier::~ExportNotifier() {
 bool EditorExportPlatform::_export_customize_dictionary(Dictionary &dict, LocalVector<Ref<EditorExportPlugin>> &customize_resources_plugins) {
 	bool changed = false;
 
-	List<Variant> keys;
-	dict.get_key_list(&keys);
-	for (const Variant &K : keys) {
+	for (const Variant &K : dict.get_key_list()) {
 		Variant v = dict[K];
 		switch (v.get_type()) {
 			case Variant::OBJECT: {
@@ -937,7 +948,7 @@ Dictionary EditorExportPlatform::get_internal_export_files(const Ref<EditorExpor
 	Dictionary files;
 
 	// Text server support data.
-	if (TS->has_feature(TextServer::FEATURE_USE_SUPPORT_DATA) && (bool)GLOBAL_GET("internationalization/locale/include_text_server_data")) {
+	if (TS->has_feature(TextServer::FEATURE_USE_SUPPORT_DATA) && (bool)get_project_setting(p_preset, "internationalization/locale/include_text_server_data")) {
 		String ts_name = TS->get_support_data_filename();
 		String ts_target = "res://" + ts_name;
 		if (!ts_name.is_empty()) {
@@ -950,7 +961,7 @@ Dictionary EditorExportPlatform::get_internal_export_files(const Ref<EditorExpor
 					export_ok = true;
 				}
 			} else {
-				String current_version = VERSION_FULL_CONFIG;
+				String current_version = GODOT_VERSION_FULL_CONFIG;
 				String template_path = EditorPaths::get_singleton()->get_export_templates_dir().path_join(current_version);
 				if (p_debug && p_preset->has("custom_template/debug") && p_preset->get("custom_template/debug") != "") {
 					template_path = p_preset->get("custom_template/debug").operator String().get_base_dir();
@@ -983,13 +994,13 @@ Dictionary EditorExportPlatform::get_internal_export_files(const Ref<EditorExpor
 	return files;
 }
 
-Vector<String> EditorExportPlatform::get_forced_export_files() {
+Vector<String> EditorExportPlatform::get_forced_export_files(const Ref<EditorExportPreset> &p_preset) {
 	Vector<String> files;
 
 	files.push_back(ProjectSettings::get_singleton()->get_global_class_list_path());
 
-	String icon = ResourceUID::ensure_path(GLOBAL_GET("application/config/icon"));
-	String splash = ResourceUID::ensure_path(GLOBAL_GET("application/boot_splash/image"));
+	String icon = ResourceUID::ensure_path(get_project_setting(p_preset, "application/config/icon"));
+	String splash = ResourceUID::ensure_path(get_project_setting(p_preset, "application/boot_splash/image"));
 	if (!icon.is_empty() && FileAccess::exists(icon)) {
 		files.push_back(icon);
 	}
@@ -1013,7 +1024,13 @@ Error EditorExportPlatform::_script_save_file(void *p_userdata, const String &p_
 	Callable cb = ((ScriptCallbackData *)p_userdata)->file_cb;
 	ERR_FAIL_COND_V(!cb.is_valid(), FAILED);
 
-	Variant path = p_path;
+	String simplified_path = p_path.simplify_path();
+	if (simplified_path.begins_with("uid://")) {
+		simplified_path = ResourceUID::uid_to_path(simplified_path).simplify_path();
+		print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, simplified_path));
+	}
+
+	Variant path = simplified_path;
 	Variant data = p_data;
 	Variant file = p_file;
 	Variant total = p_total;
@@ -1095,7 +1112,7 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 				continue;
 			}
 
-			String autoload_path = GLOBAL_GET(pi.name);
+			String autoload_path = get_project_setting(p_preset, pi.name);
 
 			if (autoload_path.begins_with("*")) {
 				autoload_path = autoload_path.substr(1);
@@ -1238,7 +1255,7 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 	HashMap<String, FileExportCache> export_cache;
 	String export_base_path = ProjectSettings::get_singleton()->get_project_data_path().path_join("exported/") + itos(custom_resources_hash);
 
-	bool convert_text_to_binary = GLOBAL_GET("editor/export/convert_text_resources_to_binary");
+	bool convert_text_to_binary = get_project_setting(p_preset, "editor/export/convert_text_resources_to_binary");
 
 	if (convert_text_to_binary || !customize_resources_plugins.is_empty() || !customize_scenes_plugins.is_empty()) {
 		// See if we have something to open
@@ -1404,7 +1421,7 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 
 				for (const String &F : remaps) {
 					String remap = F;
-					String feature = remap.get_slice(".", 1);
+					String feature = remap.get_slicec('.', 1);
 					if (features.has(feature)) {
 						remap_features.insert(feature);
 					}
@@ -1423,7 +1440,7 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 						Vector<uint8_t> array = FileAccess::get_file_as_bytes(remapped_path);
 						err = save_proxy.save_file(p_udata, remapped_path, array, idx, total, enc_in_filters, enc_ex_filters, key, seed);
 					} else if (remap.begins_with("path.")) {
-						String feature = remap.get_slice(".", 1);
+						String feature = remap.get_slicec('.', 1);
 
 						if (remap_features.has(feature)) {
 							String remapped_path = config->get_value("remap", remap);
@@ -1550,12 +1567,12 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 		}
 	}
 
-	Vector<String> forced_export = get_forced_export_files();
+	Vector<String> forced_export = get_forced_export_files(p_preset);
 	for (int i = 0; i < forced_export.size(); i++) {
 		Vector<uint8_t> array;
 		if (GDExtension::get_extension_list_config_file() == forced_export[i]) {
 			array = _filter_extension_list_config_file(forced_export[i], paths);
-			if (array.size() == 0) {
+			if (array.is_empty()) {
 				continue;
 			}
 		} else {
@@ -1568,9 +1585,9 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
 	}
 
 	Dictionary int_export = get_internal_export_files(p_preset, p_debug);
-	for (const Variant &int_name : int_export.keys()) {
-		const PackedByteArray &array = int_export[int_name];
-		err = save_proxy.save_file(p_udata, int_name, array, idx, total, enc_in_filters, enc_ex_filters, key, seed);
+	for (const KeyValue<Variant, Variant> &int_export_kv : int_export) {
+		const PackedByteArray &array = int_export_kv.value;
+		err = save_proxy.save_file(p_udata, int_export_kv.key, array, idx, total, enc_in_filters, enc_ex_filters, key, seed);
 		if (err != OK) {
 			return err;
 		}
@@ -1642,8 +1659,7 @@ Error EditorExportPlatform::_remove_pack_file(void *p_userdata, const String &p_
 		pd->f->store_8(0);
 	}
 
-	sd.md5.resize(16);
-	sd.md5.fill(0);
+	sd.md5.resize_zeroed(16);
 
 	pd->file_ofs.push_back(sd);
 
@@ -1946,9 +1962,9 @@ Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, b
 
 	f->store_32(PACK_HEADER_MAGIC);
 	f->store_32(PACK_FORMAT_VERSION);
-	f->store_32(VERSION_MAJOR);
-	f->store_32(VERSION_MINOR);
-	f->store_32(VERSION_PATCH);
+	f->store_32(GODOT_VERSION_MAJOR);
+	f->store_32(GODOT_VERSION_MINOR);
+	f->store_32(GODOT_VERSION_PATCH);
 
 	uint32_t pack_flags = 0;
 	bool enc_pck = p_preset->get_enc_pck();
@@ -2023,7 +2039,7 @@ Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, b
 				seed = ((seed << 5) + seed) ^ pd.file_ofs[i].size;
 			}
 
-			RandomPCG rng = RandomPCG(seed, RandomPCG::DEFAULT_INC);
+			RandomPCG rng = RandomPCG(seed);
 			iv.resize(16);
 			for (int i = 0; i < 16; i++) {
 				iv.write[i] = rng.rand() % 256;
@@ -2344,7 +2360,7 @@ Error EditorExportPlatform::ssh_run_on_remote(const String &p_host, const String
 		print_verbose(vformat("Exit code: %d, Output: %s", exit_code, out.replace("\r\n", "\n")));
 	}
 	if (r_out) {
-		*r_out = out.replace("\r\n", "\n").get_slice("\n", 0);
+		*r_out = out.replace("\r\n", "\n").get_slicec('\n', 0);
 	}
 	if (err != OK) {
 		return err;
@@ -2450,6 +2466,14 @@ Array EditorExportPlatform::get_current_presets() const {
 	return ret;
 }
 
+Variant EditorExportPlatform::get_project_setting(const Ref<EditorExportPreset> &p_preset, const StringName &p_name) {
+	if (p_preset.is_valid()) {
+		return p_preset->get_project_setting(p_name);
+	} else {
+		return GLOBAL_GET(p_name);
+	}
+}
+
 void EditorExportPlatform::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_os_name"), &EditorExportPlatform::get_os_name);
 
@@ -2488,7 +2512,7 @@ void EditorExportPlatform::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_internal_export_files", "preset", "debug"), &EditorExportPlatform::get_internal_export_files);
 
-	ClassDB::bind_static_method("EditorExportPlatform", D_METHOD("get_forced_export_files"), &EditorExportPlatform::get_forced_export_files);
+	ClassDB::bind_static_method("EditorExportPlatform", D_METHOD("get_forced_export_files", "preset"), &EditorExportPlatform::get_forced_export_files);
 
 	BIND_ENUM_CONSTANT(EXPORT_MESSAGE_NONE);
 	BIND_ENUM_CONSTANT(EXPORT_MESSAGE_INFO);
@@ -2501,6 +2525,3 @@ void EditorExportPlatform::_bind_methods() {
 	BIND_BITFIELD_FLAG(DEBUG_FLAG_VIEW_COLLISIONS);
 	BIND_BITFIELD_FLAG(DEBUG_FLAG_VIEW_NAVIGATION);
 }
-
-EditorExportPlatform::EditorExportPlatform() {
-}
diff --git a/engine/editor/export/editor_export_platform.h b/engine/editor/export/editor_export_platform.h
index 37cfaac5..19f62569 100644
--- a/engine/editor/export/editor_export_platform.h
+++ b/engine/editor/export/editor_export_platform.h
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_EXPORT_PLATFORM_H
-#define EDITOR_EXPORT_PLATFORM_H
+#pragma once
 
 class EditorFileSystemDirectory;
 struct EditorProgress;
 
+#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/zip_io.h"
 #include "core/os/shared_object.h"
@@ -204,7 +204,13 @@ protected:
 
 	Ref<Image> _load_icon_or_splash_image(const String &p_path, Error *r_error) const;
 
+#ifndef DISABLE_DEPRECATED
+	static Vector<String> _get_forced_export_files_bind_compat_71542();
+	static void _bind_compatibility_methods();
+#endif
+
 public:
+	static Variant get_project_setting(const Ref<EditorExportPreset> &p_preset, const StringName &p_name);
 	virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const = 0;
 
 	struct ExportOption {
@@ -281,7 +287,7 @@ public:
 
 	Dictionary get_internal_export_files(const Ref<EditorExportPreset> &p_preset, bool p_debug);
 
-	static Vector<String> get_forced_export_files();
+	static Vector<String> get_forced_export_files(const Ref<EditorExportPreset> &p_preset);
 
 	virtual bool fill_log_messages(RichTextLabel *p_log, Error p_err);
 
@@ -337,11 +343,7 @@ public:
 	virtual void resolve_platform_feature_priorities(const Ref<EditorExportPreset> &p_preset, HashSet<String> &p_features) {}
 	virtual String get_debug_protocol() const { return "tcp://"; }
 	virtual HashMap<String, Variant> get_custom_project_settings(const Ref<EditorExportPreset> &p_preset) const { return HashMap<String, Variant>(); }
-
-	EditorExportPlatform();
 };
 
 VARIANT_ENUM_CAST(EditorExportPlatform::ExportMessageType)
 VARIANT_BITFIELD_CAST(EditorExportPlatform::DebugFlags);
-
-#endif // EDITOR_EXPORT_PLATFORM_H
diff --git a/engine/editor/export/editor_export_platform_extension.h b/engine/editor/export/editor_export_platform_extension.h
index 390aaf45..032f466c 100644
--- a/engine/editor/export/editor_export_platform_extension.h
+++ b/engine/editor/export/editor_export_platform_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_EXPORT_PLATFORM_EXTENSION_H
-#define EDITOR_EXPORT_PLATFORM_EXTENSION_H
+#pragma once
 
 #include "editor_export_platform.h"
 #include "editor_export_preset.h"
@@ -151,5 +150,3 @@ public:
 	EditorExportPlatformExtension();
 	~EditorExportPlatformExtension();
 };
-
-#endif // EDITOR_EXPORT_PLATFORM_EXTENSION_H
diff --git a/engine/editor/export/editor_export_platform_pc.h b/engine/editor/export/editor_export_platform_pc.h
index 668ddaf4..d5ed2a78 100644
--- a/engine/editor/export/editor_export_platform_pc.h
+++ b/engine/editor/export/editor_export_platform_pc.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_EXPORT_PLATFORM_PC_H
-#define EDITOR_EXPORT_PLATFORM_PC_H
+#pragma once
 
 #include "editor_export_platform.h"
 
@@ -78,5 +77,3 @@ public:
 		return Error::OK;
 	}
 };
-
-#endif // EDITOR_EXPORT_PLATFORM_PC_H
diff --git a/engine/editor/export/editor_export_plugin.cpp b/engine/editor/export/editor_export_plugin.cpp
index ddc340ee..dea7c45a 100644
--- a/engine/editor/export/editor_export_plugin.cpp
+++ b/engine/editor/export/editor_export_plugin.cpp
@@ -264,6 +264,12 @@ String EditorExportPlugin::get_android_manifest_element_contents(const Ref<Edito
 	return ret;
 }
 
+PackedByteArray EditorExportPlugin::update_android_prebuilt_manifest(const Ref<EditorExportPlatform> &p_export_platform, const PackedByteArray &p_manifest_data) const {
+	PackedByteArray ret;
+	GDVIRTUAL_CALL(_update_android_prebuilt_manifest, p_export_platform, p_manifest_data, ret);
+	return ret;
+}
+
 PackedStringArray EditorExportPlugin::_get_export_features(const Ref<EditorExportPlatform> &p_platform, bool p_debug) const {
 	PackedStringArray ret;
 	GDVIRTUAL_CALL(_get_export_features, p_platform, p_debug, ret);
@@ -369,4 +375,5 @@ void EditorExportPlugin::_bind_methods() {
 	GDVIRTUAL_BIND(_get_android_manifest_activity_element_contents, "platform", "debug");
 	GDVIRTUAL_BIND(_get_android_manifest_application_element_contents, "platform", "debug");
 	GDVIRTUAL_BIND(_get_android_manifest_element_contents, "platform", "debug");
+	GDVIRTUAL_BIND(_update_android_prebuilt_manifest, "platform", "manifest_data");
 }
diff --git a/engine/editor/export/editor_export_plugin.h b/engine/editor/export/editor_export_plugin.h
index e991a9a5..5d60951b 100644
--- a/engine/editor/export/editor_export_plugin.h
+++ b/engine/editor/export/editor_export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_EXPORT_PLUGIN_H
-#define EDITOR_EXPORT_PLUGIN_H
+#pragma once
 
 #include "core/os/shared_object.h"
 #include "editor_export_platform.h"
@@ -144,6 +143,7 @@ protected:
 	GDVIRTUAL2RC(String, _get_android_manifest_activity_element_contents, const Ref<EditorExportPlatform> &, bool);
 	GDVIRTUAL2RC(String, _get_android_manifest_application_element_contents, const Ref<EditorExportPlatform> &, bool);
 	GDVIRTUAL2RC(String, _get_android_manifest_element_contents, const Ref<EditorExportPlatform> &, bool);
+	GDVIRTUAL2RC(PackedByteArray, _update_android_prebuilt_manifest, const Ref<EditorExportPlatform> &, const PackedByteArray &);
 
 	virtual bool _begin_customize_resources(const Ref<EditorExportPlatform> &p_platform, const Vector<String> &p_features); // Return true if this plugin does property export customization
 	virtual Ref<Resource> _customize_resource(const Ref<Resource> &p_resource, const String &p_path); // If nothing is returned, it means do not touch (nothing changed). If something is returned (either the same or a different resource) it means changes are made.
@@ -175,6 +175,7 @@ public:
 	virtual String get_android_manifest_activity_element_contents(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
 	virtual String get_android_manifest_application_element_contents(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
 	virtual String get_android_manifest_element_contents(const Ref<EditorExportPlatform> &p_export_platform, bool p_debug) const;
+	virtual PackedByteArray update_android_prebuilt_manifest(const Ref<EditorExportPlatform> &p_export_platform, const PackedByteArray &p_manifest_data) const;
 
 	Vector<String> get_ios_frameworks() const;
 	Vector<String> get_ios_embedded_frameworks() const;
@@ -186,5 +187,3 @@ public:
 	const Vector<String> &get_macos_plugin_files() const;
 	Variant get_option(const StringName &p_name) const;
 };
-
-#endif // EDITOR_EXPORT_PLUGIN_H
diff --git a/engine/editor/export/editor_export_preset.cpp b/engine/editor/export/editor_export_preset.cpp
index 8ff5dd75..f6bec00a 100644
--- a/engine/editor/export/editor_export_preset.cpp
+++ b/engine/editor/export/editor_export_preset.cpp
@@ -60,6 +60,29 @@ bool EditorExportPreset::_get(const StringName &p_name, Variant &r_ret) const {
 	return false;
 }
 
+Variant EditorExportPreset::get_project_setting(const StringName &p_name) {
+	List<String> ftr_list;
+	platform->get_platform_features(&ftr_list);
+	platform->get_preset_features(this, &ftr_list);
+
+	Vector<String> features;
+	for (const String &E : ftr_list) {
+		features.push_back(E);
+	}
+
+	if (!get_custom_features().is_empty()) {
+		Vector<String> tmp_custom_list = get_custom_features().split(",");
+
+		for (int i = 0; i < tmp_custom_list.size(); i++) {
+			String f = tmp_custom_list[i].strip_edges();
+			if (!f.is_empty()) {
+				features.push_back(f);
+			}
+		}
+	}
+	return ProjectSettings::get_singleton()->get_setting_with_override_and_custom_features(p_name, features);
+}
+
 void EditorExportPreset::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_get_property_warning", "name"), &EditorExportPreset::_get_property_warning);
 
@@ -70,6 +93,7 @@ void EditorExportPreset::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_customized_files_count"), &EditorExportPreset::get_customized_files_count);
 	ClassDB::bind_method(D_METHOD("has_export_file", "path"), &EditorExportPreset::has_export_file);
 	ClassDB::bind_method(D_METHOD("get_file_export_mode", "path", "default"), &EditorExportPreset::get_file_export_mode, DEFVAL(MODE_FILE_NOT_CUSTOMIZED));
+	ClassDB::bind_method(D_METHOD("get_project_setting", "name"), &EditorExportPreset::get_project_setting);
 
 	ClassDB::bind_method(D_METHOD("get_preset_name"), &EditorExportPreset::get_name);
 	ClassDB::bind_method(D_METHOD("is_runnable"), &EditorExportPreset::is_runnable);
@@ -208,10 +232,9 @@ void EditorExportPreset::update_value_overrides() {
 
 		Dictionary plugin_overrides = export_plugins[i]->_get_export_options_overrides(platform);
 		if (!plugin_overrides.is_empty()) {
-			Array keys = plugin_overrides.keys();
-			for (int x = 0; x < keys.size(); x++) {
-				StringName key = keys[x];
-				Variant value = plugin_overrides[key];
+			for (const KeyValue<Variant, Variant> &kv : plugin_overrides) {
+				const StringName &key = kv.key;
+				const Variant &value = kv.value;
 				if (new_value_overrides.has(key) && new_value_overrides[key] != value) {
 					WARN_PRINT_ED(vformat("Editor export plugin '%s' overrides pre-existing export option override '%s' with new value.", export_plugins[i]->get_name(), key));
 				}
@@ -561,5 +584,3 @@ String EditorExportPreset::get_version(const StringName &p_preset_string, bool p
 
 	return result;
 }
-
-EditorExportPreset::EditorExportPreset() {}
diff --git a/engine/editor/export/editor_export_preset.h b/engine/editor/export/editor_export_preset.h
index 4834a483..1d41dbcb 100644
--- a/engine/editor/export/editor_export_preset.h
+++ b/engine/editor/export/editor_export_preset.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_EXPORT_PRESET_H
-#define EDITOR_EXPORT_PRESET_H
+#pragma once
 
 class EditorExportPlatform;
 
@@ -126,6 +125,8 @@ public:
 	void set_file_export_mode(const String &p_path, FileExportMode p_mode);
 	FileExportMode get_file_export_mode(const String &p_path, FileExportMode p_default = MODE_FILE_NOT_CUSTOMIZED) const;
 
+	Variant get_project_setting(const StringName &p_name);
+
 	void set_name(const String &p_name);
 	String get_name() const;
 
@@ -195,12 +196,8 @@ public:
 
 	const HashMap<StringName, PropertyInfo> &get_properties() const { return properties; }
 	const HashMap<StringName, Variant> &get_values() const { return values; }
-
-	EditorExportPreset();
 };
 
 VARIANT_ENUM_CAST(EditorExportPreset::ExportFilter);
 VARIANT_ENUM_CAST(EditorExportPreset::FileExportMode);
 VARIANT_ENUM_CAST(EditorExportPreset::ScriptExportMode);
-
-#endif // EDITOR_EXPORT_PRESET_H
diff --git a/engine/editor/export/export_template_manager.cpp b/engine/editor/export/export_template_manager.cpp
index 4b864316..71dd2f58 100644
--- a/engine/editor/export/export_template_manager.cpp
+++ b/engine/editor/export/export_template_manager.cpp
@@ -43,6 +43,7 @@
 #include "editor/progress_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/file_dialog.h"
+#include "scene/gui/link_button.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/tree.h"
@@ -52,25 +53,31 @@ enum DownloadsAvailability {
 	DOWNLOADS_AVAILABLE,
 	DOWNLOADS_NOT_AVAILABLE_IN_OFFLINE_MODE,
 	DOWNLOADS_NOT_AVAILABLE_FOR_DEV_BUILDS,
+	DOWNLOADS_NOT_AVAILABLE_FOR_DOUBLE_BUILDS,
 };
 
 static DownloadsAvailability _get_downloads_availability() {
 	const int network_mode = EDITOR_GET("network/connection/network_mode");
-	if (network_mode == EditorSettings::NETWORK_OFFLINE) {
-		return DOWNLOADS_NOT_AVAILABLE_IN_OFFLINE_MODE;
-	}
 
 	// Downloadable export templates are only available for stable and official alpha/beta/RC builds
 	// (which always have a number following their status, e.g. "alpha1").
 	// Therefore, don't display download-related features when using a development version
 	// (whose builds aren't numbered).
-	if (String(VERSION_STATUS) == String("dev") ||
-			String(VERSION_STATUS) == String("alpha") ||
-			String(VERSION_STATUS) == String("beta") ||
-			String(VERSION_STATUS) == String("rc")) {
+	if (String(GODOT_VERSION_STATUS) == String("dev") ||
+			String(GODOT_VERSION_STATUS) == String("alpha") ||
+			String(GODOT_VERSION_STATUS) == String("beta") ||
+			String(GODOT_VERSION_STATUS) == String("rc")) {
 		return DOWNLOADS_NOT_AVAILABLE_FOR_DEV_BUILDS;
 	}
 
+#ifdef REAL_T_IS_DOUBLE
+	return DOWNLOADS_NOT_AVAILABLE_FOR_DOUBLE_BUILDS;
+#endif
+
+	if (network_mode == EditorSettings::NETWORK_OFFLINE) {
+		return DOWNLOADS_NOT_AVAILABLE_IN_OFFLINE_MODE;
+	}
+
 	return DOWNLOADS_AVAILABLE;
 }
 
@@ -96,7 +103,7 @@ void ExportTemplateManager::_update_template_status() {
 	da->list_dir_end();
 
 	// Update the state of the current version.
-	String current_version = VERSION_FULL_CONFIG;
+	String current_version = GODOT_VERSION_FULL_CONFIG;
 	current_value->set_text(current_version);
 
 	if (templates.has(current_version)) {
@@ -264,7 +271,7 @@ void ExportTemplateManager::_refresh_mirrors() {
 	}
 	is_refreshing_mirrors = true;
 
-	String current_version = VERSION_FULL_CONFIG;
+	String current_version = GODOT_VERSION_FULL_CONFIG;
 	const String mirrors_metadata_url = "https://godotengine.org/mirrorlist/" + current_version + ".json";
 	request_mirrors->request(mirrors_metadata_url);
 }
@@ -279,11 +286,7 @@ void ExportTemplateManager::_refresh_mirrors_completed(int p_status, int p_code,
 		return;
 	}
 
-	String response_json;
-	{
-		const uint8_t *r = p_data.ptr();
-		response_json.parse_utf8((const char *)r, p_data.size());
-	}
+	String response_json = String::utf8((const char *)p_data.ptr(), p_data.size());
 
 	JSON json;
 	Error err = json.parse(response_json);
@@ -335,6 +338,14 @@ void ExportTemplateManager::_refresh_mirrors_completed(int p_status, int p_code,
 	}
 }
 
+void ExportTemplateManager::_force_online_mode() {
+	EditorSettings::get_singleton()->set_setting("network/connection/network_mode", EditorSettings::NETWORK_ONLINE);
+	EditorSettings::get_singleton()->notify_changes();
+	EditorSettings::get_singleton()->save();
+
+	popup_manager();
+}
+
 bool ExportTemplateManager::_humanize_http_status(HTTPRequest *p_request, String *r_status, int *r_downloaded_bytes, int *r_total_bytes) {
 	*r_status = "";
 	*r_downloaded_bytes = -1;
@@ -454,8 +465,7 @@ bool ExportTemplateManager::_install_file_selected(const String &p_file, bool p_
 			ERR_BREAK_MSG(ret < 0, vformat("An error occurred while attempting to read from file: %s. This file will not be used.", file));
 			unzCloseCurrentFile(pkg);
 
-			String data_str;
-			data_str.parse_utf8((const char *)uncomp_data.ptr(), uncomp_data.size());
+			String data_str = String::utf8((const char *)uncomp_data.ptr(), uncomp_data.size());
 			data_str = data_str.strip_edges();
 
 			// Version number should be of the form major.minor[.patch].status[.module_config]
@@ -694,6 +704,8 @@ void ExportTemplateManager::popup_manager() {
 			if (!is_downloading_templates) {
 				_refresh_mirrors();
 			}
+
+			enable_online_hb->hide();
 		} break;
 
 		case DOWNLOADS_NOT_AVAILABLE_IN_OFFLINE_MODE: {
@@ -708,6 +720,8 @@ void ExportTemplateManager::popup_manager() {
 
 			download_current_button->set_disabled(true);
 			download_current_button->set_tooltip_text(TTR("Template downloading is disabled in offline mode."));
+
+			enable_online_hb->show();
 		} break;
 
 		case DOWNLOADS_NOT_AVAILABLE_FOR_DEV_BUILDS: {
@@ -722,7 +736,23 @@ void ExportTemplateManager::popup_manager() {
 
 			download_current_button->set_disabled(true);
 			download_current_button->set_tooltip_text(TTR("Official export templates aren't available for development builds."));
+
+			enable_online_hb->hide();
 		} break;
+
+		case DOWNLOADS_NOT_AVAILABLE_FOR_DOUBLE_BUILDS: {
+			current_missing_label->set_text(TTR("Export templates are missing. Install them from a file."));
+
+			mirrors_list->clear();
+			mirrors_list->add_item(TTR("No templates for double-precision builds"), 0);
+			mirrors_list->set_disabled(true);
+			mirrors_list->set_tooltip_text(TTR("Official export templates aren't available for double-precision builds."));
+
+			mirror_options_button->set_disabled(true);
+
+			download_current_button->set_disabled(true);
+			download_current_button->set_tooltip_text(TTR("Official export templates aren't available for double-precision builds."));
+		}
 	}
 
 	popup_centered(Size2(720, 280) * EDSCALE);
@@ -759,7 +789,7 @@ String ExportTemplateManager::get_android_source_zip(const Ref<EditorExportPrese
 		}
 	}
 
-	const String templates_dir = EditorPaths::get_singleton()->get_export_templates_dir().path_join(VERSION_FULL_CONFIG);
+	const String templates_dir = EditorPaths::get_singleton()->get_export_templates_dir().path_join(GODOT_VERSION_FULL_CONFIG);
 	return templates_dir.path_join("android_source.zip");
 }
 
@@ -771,7 +801,7 @@ String ExportTemplateManager::get_android_template_identifier(const Ref<EditorEx
 			return android_source_zip + String(" [") + FileAccess::get_md5(android_source_zip) + String("]");
 		}
 	}
-	return VERSION_FULL_CONFIG;
+	return GODOT_VERSION_FULL_CONFIG;
 }
 
 bool ExportTemplateManager::is_android_template_installed(const Ref<EditorExportPreset> &p_preset) {
@@ -987,6 +1017,7 @@ ExportTemplateManager::ExportTemplateManager() {
 	current_installed_path = memnew(LineEdit);
 	current_installed_path->set_editable(false);
 	current_installed_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	current_installed_path->set_accessibility_name(TTRC("Installed Path"));
 	current_installed_hb->add_child(current_installed_path);
 
 #ifndef ANDROID_ENABLED
@@ -994,14 +1025,14 @@ ExportTemplateManager::ExportTemplateManager() {
 	current_open_button->set_text(TTR("Open Folder"));
 	current_open_button->set_tooltip_text(TTR("Open the folder containing installed templates for the current version."));
 	current_installed_hb->add_child(current_open_button);
-	current_open_button->connect(SceneStringName(pressed), callable_mp(this, &ExportTemplateManager::_open_template_folder).bind(VERSION_FULL_CONFIG));
+	current_open_button->connect(SceneStringName(pressed), callable_mp(this, &ExportTemplateManager::_open_template_folder).bind(GODOT_VERSION_FULL_CONFIG));
 #endif
 
 	current_uninstall_button = memnew(Button);
 	current_uninstall_button->set_text(TTR("Uninstall"));
 	current_uninstall_button->set_tooltip_text(TTR("Uninstall templates for the current version."));
 	current_installed_hb->add_child(current_uninstall_button);
-	current_uninstall_button->connect(SceneStringName(pressed), callable_mp(this, &ExportTemplateManager::_uninstall_template).bind(VERSION_FULL_CONFIG));
+	current_uninstall_button->connect(SceneStringName(pressed), callable_mp(this, &ExportTemplateManager::_uninstall_template).bind(GODOT_VERSION_FULL_CONFIG));
 
 	main_vb->add_child(memnew(HSeparator));
 
@@ -1022,6 +1053,7 @@ ExportTemplateManager::ExportTemplateManager() {
 	download_install_hb->add_child(mirrors_label);
 
 	mirrors_list = memnew(OptionButton);
+	mirrors_list->set_accessibility_name(TTRC("Mirror"));
 	mirrors_list->set_custom_minimum_size(Size2(280, 0) * EDSCALE);
 	download_install_hb->add_child(mirrors_list);
 
@@ -1030,6 +1062,7 @@ ExportTemplateManager::ExportTemplateManager() {
 	request_mirrors->connect("request_completed", callable_mp(this, &ExportTemplateManager::_refresh_mirrors_completed));
 
 	mirror_options_button = memnew(MenuButton);
+	mirror_options_button->set_accessibility_name(TTRC("Mirror Options"));
 	mirror_options_button->get_popup()->add_item(TTR("Open in Web Browser"), VISIT_WEB_MIRROR);
 	mirror_options_button->get_popup()->add_item(TTR("Copy Mirror URL"), COPY_MIRROR_URL);
 	download_install_hb->add_child(mirror_options_button);
@@ -1053,6 +1086,19 @@ ExportTemplateManager::ExportTemplateManager() {
 	install_file_hb->add_child(install_file_button);
 	install_file_button->connect(SceneStringName(pressed), callable_mp(this, &ExportTemplateManager::_install_file));
 
+	enable_online_hb = memnew(HBoxContainer);
+	install_options_vb->add_child(enable_online_hb);
+
+	Label *enable_online_label = memnew(Label);
+	enable_online_label->set_text(TTR("Online mode is needed to download the templates."));
+	enable_online_hb->add_child(enable_online_label);
+
+	LinkButton *enable_online_button = memnew(LinkButton);
+	enable_online_button->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
+	enable_online_button->set_text(TTR("Go Online"));
+	enable_online_hb->add_child(enable_online_button);
+	enable_online_button->connect(SceneStringName(pressed), callable_mp(this, &ExportTemplateManager::_force_online_mode));
+
 	// Templates are being downloaded; buttons unavailable.
 	download_progress_hb = memnew(HBoxContainer);
 	download_progress_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
diff --git a/engine/editor/export/export_template_manager.h b/engine/editor/export/export_template_manager.h
index ccfe568d..c3c1f19f 100644
--- a/engine/editor/export/export_template_manager.h
+++ b/engine/editor/export/export_template_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EXPORT_TEMPLATE_MANAGER_H
-#define EXPORT_TEMPLATE_MANAGER_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -68,6 +67,7 @@ class ExportTemplateManager : public AcceptDialog {
 	};
 
 	MenuButton *mirror_options_button = nullptr;
+	HBoxContainer *enable_online_hb = nullptr;
 	HBoxContainer *download_progress_hb = nullptr;
 	ProgressBar *download_progress_bar = nullptr;
 	Label *download_progress_label = nullptr;
@@ -96,6 +96,7 @@ class ExportTemplateManager : public AcceptDialog {
 	void _cancel_template_download();
 	void _refresh_mirrors();
 	void _refresh_mirrors_completed(int p_status, int p_code, const PackedStringArray &headers, const PackedByteArray &p_data);
+	void _force_online_mode();
 
 	bool _humanize_http_status(HTTPRequest *p_request, String *r_status, int *r_downloaded_bytes, int *r_total_bytes);
 	void _set_current_progress_status(const String &p_status, bool p_error = false);
@@ -134,5 +135,3 @@ public:
 
 	ExportTemplateManager();
 };
-
-#endif // EXPORT_TEMPLATE_MANAGER_H
diff --git a/engine/editor/export/lipo.h b/engine/editor/export/lipo.h
index 0f8044d8..b187fe13 100644
--- a/engine/editor/export/lipo.h
+++ b/engine/editor/export/lipo.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIPO_H
-#define LIPO_H
+#pragma once
 
 // Universal / Universal 2 fat binary file creator and extractor.
 
@@ -68,5 +67,3 @@ public:
 
 	~LipO();
 };
-
-#endif // LIPO_H
diff --git a/engine/editor/export/macho.h b/engine/editor/export/macho.h
index b23aad00..0932c276 100644
--- a/engine/editor/export/macho.h
+++ b/engine/editor/export/macho.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MACHO_H
-#define MACHO_H
+#pragma once
 
 // Mach-O binary object file format parser and editor.
 
@@ -222,5 +221,3 @@ public:
 	uint64_t get_signature_size();
 	bool set_signature_size(uint64_t p_size);
 };
-
-#endif // MACHO_H
diff --git a/engine/editor/export/project_export.cpp b/engine/editor/export/project_export.cpp
index 5b93a1a1..299a887e 100644
--- a/engine/editor/export/project_export.cpp
+++ b/engine/editor/export/project_export.cpp
@@ -73,7 +73,7 @@ void ProjectExportTextureFormatError::_notification(int p_what) {
 }
 
 void ProjectExportTextureFormatError::show_for_texture_format(const String &p_friendly_name, const String &p_setting_identifier) {
-	texture_format_error_label->set_text(vformat(TTR("Target platform requires '%s' texture compression. Enable 'Import %s' to fix."), p_friendly_name, p_friendly_name.replace("/", " ")));
+	texture_format_error_label->set_text(vformat(TTR("Target platform requires '%s' texture compression. Enable 'Import %s' to fix."), p_friendly_name, p_friendly_name.replace_char('/', ' ')));
 	setting_identifier = p_setting_identifier;
 	show();
 }
@@ -576,7 +576,7 @@ void ProjectExportDialog::_enc_filters_changed(const String &p_filters) {
 }
 
 void ProjectExportDialog::_open_key_help_link() {
-	OS::get_singleton()->shell_open(vformat("%s/contributing/development/compiling/compiling_with_script_encryption_key.html", VERSION_DOCS_URL));
+	OS::get_singleton()->shell_open(vformat("%s/contributing/development/compiling/compiling_with_script_encryption_key.html", GODOT_VERSION_DOCS_URL));
 }
 
 void ProjectExportDialog::_enc_pck_changed(bool p_pressed) {
@@ -745,7 +745,14 @@ void ProjectExportDialog::_delete_preset_confirm() {
 
 Variant ProjectExportDialog::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
 	if (p_from == presets) {
-		int pos = presets->get_item_at_position(p_point, true);
+		int pos = -1;
+		if (p_point == Vector2(Math::INF, Math::INF)) {
+			if (presets->is_anything_selected()) {
+				pos = presets->get_selected_items()[0];
+			}
+		} else {
+			pos = presets->get_item_at_position(p_point, true);
+		}
 
 		if (pos >= 0) {
 			Dictionary d;
@@ -766,7 +773,7 @@ Variant ProjectExportDialog::get_drag_data_fw(const Point2 &p_point, Control *p_
 			return d;
 		}
 	} else if (p_from == patches) {
-		TreeItem *item = patches->get_item_at_position(p_point);
+		TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? patches->get_selected() : patches->get_item_at_position(p_point);
 
 		if (item) {
 			int item_metadata = item->get_metadata(0);
@@ -791,7 +798,18 @@ bool ProjectExportDialog::can_drop_data_fw(const Point2 &p_point, const Variant
 			return false;
 		}
 
-		if (presets->get_item_at_position(p_point, true) < 0 && !presets->is_pos_at_end_of_items(p_point)) {
+		int pos = -1;
+		bool end = true;
+		if (p_point == Vector2(Math::INF, Math::INF)) {
+			if (presets->is_anything_selected()) {
+				pos = presets->get_selected_items()[0];
+			}
+		} else {
+			pos = presets->get_item_at_position(p_point, true);
+			end = presets->is_pos_at_end_of_items(p_point);
+		}
+
+		if (pos < 0 && !end) {
 			return false;
 		}
 	} else if (p_from == patches) {
@@ -800,7 +818,7 @@ bool ProjectExportDialog::can_drop_data_fw(const Point2 &p_point, const Variant
 			return false;
 		}
 
-		TreeItem *item = patches->get_item_at_position(p_point);
+		TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? patches->get_selected() : patches->get_item_at_position(p_point);
 		if (!item) {
 			return false;
 		}
@@ -818,11 +836,22 @@ void ProjectExportDialog::drop_data_fw(const Point2 &p_point, const Variant &p_d
 
 		int to_pos = -1;
 
-		if (presets->get_item_at_position(p_point, true) >= 0) {
-			to_pos = presets->get_item_at_position(p_point, true);
+		int pos = -1;
+		bool end = true;
+		if (p_point == Vector2(Math::INF, Math::INF)) {
+			if (presets->is_anything_selected()) {
+				pos = presets->get_selected_items()[0];
+			}
+		} else {
+			pos = presets->get_item_at_position(p_point, true);
+			end = presets->is_pos_at_end_of_items(p_point);
 		}
 
-		if (to_pos == -1 && !presets->is_pos_at_end_of_items(p_point)) {
+		if (pos >= 0) {
+			to_pos = pos;
+		}
+
+		if (to_pos == -1 && !end) {
 			return;
 		}
 
@@ -846,14 +875,20 @@ void ProjectExportDialog::drop_data_fw(const Point2 &p_point, const Variant &p_d
 		Dictionary d = p_data;
 		int from_pos = d["patch"];
 
-		TreeItem *item = patches->get_item_at_position(p_point);
+		TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? patches->get_selected() : patches->get_item_at_position(p_point);
 		if (!item) {
 			return;
 		}
 
 		int to_pos = item->get_metadata(0);
 
-		if (patches->get_drop_section_at_position(p_point) > 0) {
+		int pos = -1;
+		if (p_point == Vector2(Math::INF, Math::INF)) {
+			pos = patches->get_drop_section_at_position(patches->get_item_rect(item).position);
+		} else {
+			pos = patches->get_drop_section_at_position(p_point);
+		}
+		if (pos > 0) {
 			to_pos++;
 		}
 
@@ -1428,11 +1463,13 @@ ProjectExportDialog::ProjectExportDialog() {
 	presets->connect(SceneStringName(item_selected), callable_mp(this, &ProjectExportDialog::_edit_preset));
 	duplicate_preset = memnew(Button);
 	duplicate_preset->set_tooltip_text(TTR("Duplicate"));
+	duplicate_preset->set_accessibility_name(TTRC("Duplicate"));
 	duplicate_preset->set_flat(true);
 	preset_hb->add_child(duplicate_preset);
 	duplicate_preset->connect(SceneStringName(pressed), callable_mp(this, &ProjectExportDialog::_duplicate_preset));
 	delete_preset = memnew(Button);
 	delete_preset->set_tooltip_text(TTR("Delete"));
+	delete_preset->set_accessibility_name(TTRC("Delete"));
 	delete_preset->set_flat(true);
 	preset_hb->add_child(delete_preset);
 	delete_preset->connect(SceneStringName(pressed), callable_mp(this, &ProjectExportDialog::_delete_preset));
@@ -1501,6 +1538,7 @@ ProjectExportDialog::ProjectExportDialog() {
 	resources_scroll_container->add_child(resources_vb);
 
 	export_filter = memnew(OptionButton);
+	export_filter->set_accessibility_name(TTRC("Export Mode"));
 	export_filter->add_item(TTR("Export all resources in the project"));
 	export_filter->add_item(TTR("Export selected scenes (and dependencies)"));
 	export_filter->add_item(TTR("Export selected resources (and dependencies)"));
@@ -1531,8 +1569,8 @@ ProjectExportDialog::ProjectExportDialog() {
 	resources_vb->add_child(server_strip_message);
 
 	{
-		List<StringName> resource_names;
-		ClassDB::get_inheriters_from_class("Resource", &resource_names);
+		LocalVector<StringName> resource_names;
+		ClassDB::get_inheriters_from_class("Resource", resource_names);
 
 		PackedStringArray strippable;
 		for (const StringName &resource_name : resource_names) {
@@ -1555,12 +1593,14 @@ ProjectExportDialog::ProjectExportDialog() {
 	file_mode_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ProjectExportDialog::_set_file_export_mode));
 
 	include_filters = memnew(LineEdit);
+	include_filters->set_accessibility_name(TTRC("Include Filters"));
 	resources_vb->add_margin_child(
 			TTR("Filters to export non-resource files/folders\n(comma-separated, e.g: *.json, *.txt, docs/*)"),
 			include_filters);
 	include_filters->connect(SceneStringName(text_changed), callable_mp(this, &ProjectExportDialog::_filter_changed));
 
 	exclude_filters = memnew(LineEdit);
+	exclude_filters->set_accessibility_name(TTRC("Exclude Filters"));
 	resources_vb->add_margin_child(
 			TTR("Filters to exclude files/folders from project\n(comma-separated, e.g: *.json, *.txt, docs/*)"),
 			exclude_filters);
@@ -1635,18 +1675,21 @@ ProjectExportDialog::ProjectExportDialog() {
 	sec_vb->add_child(enc_directory);
 
 	enc_in_filters = memnew(LineEdit);
+	enc_in_filters->set_accessibility_name(TTRC("Include Filters"));
 	enc_in_filters->connect(SceneStringName(text_changed), callable_mp(this, &ProjectExportDialog::_enc_filters_changed));
 	sec_vb->add_margin_child(
 			TTR("Filters to include files/folders\n(comma-separated, e.g: *.tscn, *.tres, scenes/*)"),
 			enc_in_filters);
 
 	enc_ex_filters = memnew(LineEdit);
+	enc_ex_filters->set_accessibility_name(TTRC("Exclude Filters"));
 	enc_ex_filters->connect(SceneStringName(text_changed), callable_mp(this, &ProjectExportDialog::_enc_filters_changed));
 	sec_vb->add_margin_child(
 			TTR("Filters to exclude files/folders\n(comma-separated, e.g: *.ctex, *.import, music/*)"),
 			enc_ex_filters);
 
 	script_key = memnew(LineEdit);
+	script_key->set_accessibility_name(TTRC("Encryption Key"));
 	script_key->connect(SceneStringName(text_changed), callable_mp(this, &ProjectExportDialog::_script_encryption_key_changed));
 	script_key_error = memnew(Label);
 	script_key_error->set_text(String::utf8("•  ") + TTR("Invalid Encryption Key (must be 64 hexadecimal characters long)"));
@@ -1656,6 +1699,7 @@ ProjectExportDialog::ProjectExportDialog() {
 	sections->add_child(sec_scroll_container);
 
 	seed_input = memnew(LineEdit);
+	seed_input->set_accessibility_name(TTRC("Encryption Seed"));
 	seed_input->connect(SceneStringName(text_changed), callable_mp(this, &ProjectExportDialog::_seed_input_changed));
 	sec_vb->add_margin_child(TTR("Initialization vector seed"), seed_input);
 
@@ -1674,6 +1718,7 @@ ProjectExportDialog::ProjectExportDialog() {
 	script_vb->set_name(TTR("Scripts"));
 
 	script_mode = memnew(OptionButton);
+	script_mode->set_accessibility_name(TTRC("GDScript Export Mode"));
 	script_vb->add_margin_child(TTR("GDScript Export Mode:"), script_mode);
 	script_mode->add_item(TTR("Text (easier debugging)"), (int)EditorExportPreset::MODE_SCRIPT_TEXT);
 	script_mode->add_item(TTR("Binary tokens (faster loading)"), (int)EditorExportPreset::MODE_SCRIPT_BINARY_TOKENS);
@@ -1746,11 +1791,13 @@ ProjectExportDialog::ProjectExportDialog() {
 	export_error = memnew(Label);
 	main_vb->add_child(export_error);
 	export_error->hide();
+	export_error->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_WORD_ELLIPSIS);
 	export_error->add_theme_color_override(SceneStringName(font_color), EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor)));
 
 	export_warning = memnew(Label);
 	main_vb->add_child(export_warning);
 	export_warning->hide();
+	export_warning->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_WORD_ELLIPSIS);
 	export_warning->add_theme_color_override(SceneStringName(font_color), EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("warning_color"), EditorStringName(Editor)));
 
 	export_templates_error = memnew(HBoxContainer);
@@ -1759,6 +1806,7 @@ ProjectExportDialog::ProjectExportDialog() {
 
 	Label *export_error2 = memnew(Label);
 	export_templates_error->add_child(export_error2);
+	export_error2->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_WORD_ELLIPSIS);
 	export_error2->add_theme_color_override(SceneStringName(font_color), EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("error_color"), EditorStringName(Editor)));
 	export_error2->set_text(String::utf8("•  ") + TTR("Export templates for this platform are missing:") + " ");
 
@@ -1801,6 +1849,3 @@ ProjectExportDialog::ProjectExportDialog() {
 		}
 	}
 }
-
-ProjectExportDialog::~ProjectExportDialog() {
-}
diff --git a/engine/editor/export/project_export.h b/engine/editor/export/project_export.h
index 68676bfc..4c6ebd4f 100644
--- a/engine/editor/export/project_export.h
+++ b/engine/editor/export/project_export.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_EXPORT_H
-#define PROJECT_EXPORT_H
+#pragma once
 
 #include "editor/export/editor_export_preset.h"
 #include "scene/gui/dialogs.h"
@@ -222,7 +221,4 @@ public:
 	bool is_exporting() const { return exporting; }
 
 	ProjectExportDialog();
-	~ProjectExportDialog();
 };
-
-#endif // PROJECT_EXPORT_H
diff --git a/engine/editor/export/project_zip_packer.cpp b/engine/editor/export/project_zip_packer.cpp
index 2595bb01..f5d978a1 100644
--- a/engine/editor/export/project_zip_packer.cpp
+++ b/engine/editor/export/project_zip_packer.cpp
@@ -42,9 +42,9 @@ String ProjectZIPPacker::get_project_zip_safe_name() {
 	// In the project name, all invalid characters become an empty string so that a name
 	// like "Platformer 2: Godette's Revenge" becomes "platformer_2-_godette-s_revenge".
 	const String project_name = GLOBAL_GET("application/config/name");
-	const String project_name_safe = project_name.to_lower().replace(" ", "_");
+	const String project_name_safe = project_name.to_lower().replace_char(' ', '_');
 	const String datetime_safe =
-			Time::get_singleton()->get_datetime_string_from_system(false, true).replace(" ", "_");
+			Time::get_singleton()->get_datetime_string_from_system(false, true).replace_char(' ', '_');
 	const String output_name = OS::get_singleton()->get_safe_dir_name(vformat("%s_%s.zip", project_name_safe, datetime_safe));
 	return output_name;
 }
diff --git a/engine/editor/export/project_zip_packer.h b/engine/editor/export/project_zip_packer.h
index d09c2ec2..c66d793f 100644
--- a/engine/editor/export/project_zip_packer.h
+++ b/engine/editor/export/project_zip_packer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_ZIP_PACKER_H
-#define PROJECT_ZIP_PACKER_H
+#pragma once
 
 #include "core/io/zip_io.h"
 #include "core/variant/variant.h"
@@ -42,5 +41,3 @@ public:
 	static String get_project_zip_safe_name();
 	static void pack_project_zip(const String &p_path);
 };
-
-#endif // PROJECT_ZIP_PACKER_H
diff --git a/engine/editor/fbx_importer_manager.cpp b/engine/editor/fbx_importer_manager.cpp
index f612c3bd..72806ad6 100644
--- a/engine/editor/fbx_importer_manager.cpp
+++ b/engine/editor/fbx_importer_manager.cpp
@@ -150,6 +150,7 @@ FBXImporterManager::FBXImporterManager() {
 
 	fbx_path = memnew(LineEdit);
 	fbx_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	fbx_path->set_accessibility_name(TTRC("Path"));
 	hb->add_child(fbx_path);
 	fbx_path_browse = memnew(Button);
 	fbx_path_browse->set_text(TTR("Browse"));
diff --git a/engine/editor/fbx_importer_manager.h b/engine/editor/fbx_importer_manager.h
index 55061c04..845901fc 100644
--- a/engine/editor/fbx_importer_manager.h
+++ b/engine/editor/fbx_importer_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FBX_IMPORTER_MANAGER_H
-#define FBX_IMPORTER_MANAGER_H
+#pragma once
 
 #include "editor/gui/editor_file_dialog.h"
 #include "scene/gui/dialogs.h"
@@ -65,5 +64,3 @@ public:
 
 	FBXImporterManager();
 };
-
-#endif // FBX_IMPORTER_MANAGER_H
diff --git a/engine/editor/file_info.h b/engine/editor/file_info.h
index 1e2b6e87..942eb824 100644
--- a/engine/editor/file_info.h
+++ b/engine/editor/file_info.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_INFO_H
-#define FILE_INFO_H
+#pragma once
 
 #include "core/string/string_name.h"
 #include "core/templates/list.h"
@@ -71,5 +70,3 @@ struct FileInfoModifiedTimeComparator {
 };
 
 void sort_file_info_list(List<FileInfo> &r_file_list, FileSortOption p_file_sort_option);
-
-#endif // FILE_INFO_H
diff --git a/engine/editor/filesystem_dock.cpp b/engine/editor/filesystem_dock.cpp
index 4fafdefb..8a03d8d8 100644
--- a/engine/editor/filesystem_dock.cpp
+++ b/engine/editor/filesystem_dock.cpp
@@ -274,7 +274,7 @@ void FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory
 		List<FileInfo> file_list;
 		for (int i = 0; i < p_dir->get_file_count(); i++) {
 			String file_type = p_dir->get_file_type(i);
-			if (file_type != "TextFile" && file_type != "OtherFile" && _is_file_type_disabled_by_feature_profile(file_type)) {
+			if (_is_file_type_disabled_by_feature_profile(file_type)) {
 				// If type is disabled, file won't be displayed.
 				continue;
 			}
@@ -321,9 +321,7 @@ void FileSystemDock::_create_tree(TreeItem *p_parent, EditorFileSystemDirectory
 			if (main_scene == file_metadata) {
 				file_item->set_custom_color(0, get_theme_color(SNAME("accent_color"), EditorStringName(Editor)));
 			}
-			Array udata;
-			udata.push_back(tree_update_id);
-			udata.push_back(file_item);
+			Array udata = { tree_update_id, file_item };
 			EditorResourcePreview::get_singleton()->queue_resource_preview(file_metadata, this, "_tree_thumbnail_done", udata);
 		}
 	} else {
@@ -377,7 +375,8 @@ void FileSystemDock::_update_tree(const Vector<String> &p_uncollapsed_paths, boo
 	// Handles the favorites.
 	favorites_item = tree->create_item(root);
 	favorites_item->set_icon(0, get_editor_theme_icon(SNAME("Favorites")));
-	favorites_item->set_text(0, TTR("Favorites:"));
+	favorites_item->set_text(0, TTRC("Favorites:"));
+	favorites_item->set_auto_translate_mode(0, AUTO_TRANSLATE_MODE_ALWAYS);
 	favorites_item->set_metadata(0, "Favorites");
 	favorites_item->set_collapsed(!p_uncollapsed_paths.has("Favorites"));
 
@@ -437,9 +436,7 @@ void FileSystemDock::_update_tree(const Vector<String> &p_uncollapsed_paths, boo
 		ti->set_metadata(0, favorite);
 
 		if (!favorite.ends_with("/")) {
-			Array udata;
-			udata.push_back(tree_update_id);
-			udata.push_back(ti);
+			Array udata = { tree_update_id, ti };
 			EditorResourcePreview::get_singleton()->queue_resource_preview(favorite, this, "_tree_thumbnail_done", udata);
 		}
 	}
@@ -574,8 +571,6 @@ void FileSystemDock::_notification(int p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
 			_update_display_mode(true);
 
-			button_reload->set_button_icon(get_editor_theme_icon(SNAME("Reload")));
-
 			StringName mode_icon = "Panels1";
 			if (display_mode == DISPLAY_MODE_VSPLIT) {
 				mode_icon = "Panels2";
@@ -841,11 +836,11 @@ void FileSystemDock::_set_file_display(bool p_active) {
 	if (p_active) {
 		file_list_display_mode = FILE_LIST_DISPLAY_LIST;
 		button_file_list_display_mode->set_button_icon(get_editor_theme_icon(SNAME("FileThumbnail")));
-		button_file_list_display_mode->set_tooltip_text(TTR("View items as a grid of thumbnails."));
+		button_file_list_display_mode->set_tooltip_text(TTRC("View items as a grid of thumbnails."));
 	} else {
 		file_list_display_mode = FILE_LIST_DISPLAY_THUMBNAILS;
 		button_file_list_display_mode->set_button_icon(get_editor_theme_icon(SNAME("FileList")));
-		button_file_list_display_mode->set_tooltip_text(TTR("View items as a list."));
+		button_file_list_display_mode->set_tooltip_text(TTRC("View items as a list."));
 	}
 
 	_update_file_list(true);
@@ -853,7 +848,7 @@ void FileSystemDock::_set_file_display(bool p_active) {
 
 bool FileSystemDock::_is_file_type_disabled_by_feature_profile(const StringName &p_class) {
 	Ref<EditorFeatureProfile> profile = EditorFeatureProfileManager::get_singleton()->get_current_profile();
-	if (profile.is_null()) {
+	if (profile.is_null() || !ClassDB::class_exists(p_class)) {
 		return false;
 	}
 
@@ -1226,7 +1221,7 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
 				if (config->has_section_key("remap", "importer")) {
 					String importer = config->get_value("remap", "importer");
 					if (importer == "keep" || importer == "skip") {
-						EditorNode::get_singleton()->show_warning(TTR("Importing has been disabled for this file, so it can't be opened for editing."));
+						EditorNode::get_singleton()->show_warning(TTRC("Importing has been disabled for this file, so it can't be opened for editing."));
 						return;
 					}
 				}
@@ -1234,10 +1229,8 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
 		}
 
 		String resource_type = ResourceLoader::get_resource_type(fpath);
-
 		if (resource_type == "PackedScene" || resource_type == "AnimationLibrary") {
 			bool is_imported = false;
-
 			{
 				List<String> importer_exts;
 				ResourceImporterScene::get_scene_importer_extensions(&importer_exts);
@@ -1252,10 +1245,8 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
 
 			if (is_imported) {
 				SceneImportSettingsDialog::get_singleton()->open_settings(p_path, resource_type);
-			} else if (resource_type == "PackedScene") {
-				EditorNode::get_singleton()->open_request(fpath);
 			} else {
-				EditorNode::get_singleton()->load_resource(fpath);
+				EditorNode::get_singleton()->load_scene_or_resource(fpath);
 			}
 		} else if (ResourceLoader::is_imported(fpath)) {
 			// If the importer has advanced settings, show them.
@@ -1275,7 +1266,6 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit
 			if (!used_advanced_settings) {
 				EditorNode::get_singleton()->load_resource(fpath);
 			}
-
 		} else {
 			EditorNode::get_singleton()->load_resource(fpath);
 		}
@@ -1338,6 +1328,10 @@ void FileSystemDock::_fs_changed() {
 	}
 
 	set_process(false);
+	if (had_focus) {
+		had_focus->grab_focus();
+		had_focus = nullptr;
+	}
 }
 
 void FileSystemDock::_set_scanning_mode() {
@@ -1563,7 +1557,7 @@ void FileSystemDock::_update_resource_paths_after_move(const HashMap<String, Str
 		String extra_path;
 		int sep_pos = r->get_path().find("::");
 		if (sep_pos >= 0) {
-			extra_path = base_path.substr(sep_pos, base_path.length());
+			extra_path = base_path.substr(sep_pos);
 			base_path = base_path.substr(0, sep_pos);
 		}
 
@@ -1629,7 +1623,7 @@ void FileSystemDock::_update_project_settings_after_move(const HashMap<String, S
 			// If the autoload resource paths has a leading "*", it indicates that it is a Singleton,
 			// so we have to handle both cases when updating.
 			String autoload = GLOBAL_GET(E.name);
-			String autoload_singleton = autoload.substr(1, autoload.length());
+			String autoload_singleton = autoload.substr(1);
 			if (p_renames.has(autoload)) {
 				ProjectSettings::get_singleton()->set_setting(E.name, p_renames[autoload]);
 			} else if (autoload.begins_with("*") && p_renames.has(autoload_singleton)) {
@@ -1738,9 +1732,7 @@ void FileSystemDock::_folder_removed(const String &p_folder) {
 
 	// Remove assigned folder color for all subfolders.
 	bool folder_colors_updated = false;
-	List<Variant> paths;
-	assigned_folder_colors.get_key_list(&paths);
-	for (const Variant &E : paths) {
+	for (const Variant &E : assigned_folder_colors.get_key_list()) {
 		const String &path = E;
 		// These folder paths are guaranteed to end with a "/".
 		if (path.begins_with(p_folder)) {
@@ -1773,17 +1765,17 @@ void FileSystemDock::_rename_operation_confirm() {
 
 	bool rename_error = false;
 	if (new_name.length() == 0) {
-		EditorNode::get_singleton()->show_warning(TTR("No name provided."));
+		EditorNode::get_singleton()->show_warning(TTRC("No name provided."));
 		rename_error = true;
 	} else if (new_name.contains_char('/') || new_name.contains_char('\\') || new_name.contains_char(':')) {
-		EditorNode::get_singleton()->show_warning(TTR("Name contains invalid characters."));
+		EditorNode::get_singleton()->show_warning(TTRC("Name contains invalid characters."));
 		rename_error = true;
 	} else if (new_name[0] == '.') {
-		EditorNode::get_singleton()->show_warning(TTR("This filename begins with a dot rendering the file invisible to the editor.\nIf you want to rename it anyway, use your operating system's file manager."));
+		EditorNode::get_singleton()->show_warning(TTRC("This filename begins with a dot rendering the file invisible to the editor.\nIf you want to rename it anyway, use your operating system's file manager."));
 		rename_error = true;
 	} else if (to_rename.is_file && to_rename.path.get_extension() != new_name.get_extension()) {
 		if (!EditorFileSystem::get_singleton()->get_valid_extensions().find(new_name.get_extension())) {
-			EditorNode::get_singleton()->show_warning(TTR("This file extension is not recognized by the editor.\nIf you want to rename it anyway, use your operating system's file manager.\nAfter renaming to an unknown extension, the file won't be shown in the editor anymore."));
+			EditorNode::get_singleton()->show_warning(TTRC("This file extension is not recognized by the editor.\nIf you want to rename it anyway, use your operating system's file manager.\nAfter renaming to an unknown extension, the file won't be shown in the editor anymore."));
 			rename_error = true;
 		}
 	}
@@ -1814,7 +1806,7 @@ void FileSystemDock::_rename_operation_confirm() {
 		new_exist = new_exist && (new_path.to_lower() != old_path.to_lower());
 	}
 	if (new_exist) {
-		EditorNode::get_singleton()->show_warning(TTR("A file or folder with this name already exists."));
+		EditorNode::get_singleton()->show_warning(TTRC("A file or folder with this name already exists."));
 		if (ti) {
 			ti->set_text(col_index, old_name);
 		}
@@ -1936,8 +1928,8 @@ void FileSystemDock::_move_operation_confirm(const String &p_to_path, bool p_cop
 					TTR("The following files or folders conflict with items in the target location '%s':"), to_move_path));
 			overwrite_dialog_file_list->set_text(String("\n").join(conflicting_items));
 			overwrite_dialog_footer->set_text(
-					p_copy ? TTR("Do you wish to overwrite them or rename the copied files?")
-						   : TTR("Do you wish to overwrite them or rename the moved files?"));
+					p_copy ? TTRC("Do you wish to overwrite them or rename the copied files?")
+						   : TTRC("Do you wish to overwrite them or rename the moved files?"));
 			overwrite_dialog->popup_centered();
 			return;
 		}
@@ -2675,6 +2667,12 @@ bool FileSystemDock::_matches_all_search_tokens(const String &p_text) {
 }
 
 void FileSystemDock::_rescan() {
+	if (tree->has_focus()) {
+		had_focus = tree;
+	} else if (files->has_focus()) {
+		had_focus = files;
+	}
+
 	_set_scanning_mode();
 	EditorFileSystem::get_singleton()->scan();
 }
@@ -2737,7 +2735,13 @@ void FileSystemDock::focus_on_filter() {
 }
 
 void FileSystemDock::create_directory(const String &p_path, const String &p_base_dir) {
-	Error err = EditorFileSystem::get_singleton()->make_dir_recursive(p_path.trim_prefix(p_base_dir), p_base_dir);
+	String trimmed_path = p_path;
+	if (!p_base_dir.is_empty()) {
+		// Trims off the joining '/' if the base didn't end with one. If the base did have it
+		// and there's two slashes, the empty directory is safe to trim off anyways.
+		trimmed_path = trimmed_path.trim_prefix(p_base_dir).trim_prefix("/");
+	}
+	Error err = EditorFileSystem::get_singleton()->make_dir_recursive(trimmed_path, p_base_dir);
 	if (err != OK) {
 		EditorNode::get_singleton()->show_warning(vformat(TTR("Could not create folder: %s"), error_names[err]));
 	}
@@ -2851,12 +2855,12 @@ bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_da
 		}
 
 		// Moving favorite around.
-		TreeItem *ti = tree->get_item_at_position(p_point);
+		TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
 		if (!ti) {
 			return false;
 		}
 
-		int drop_section = tree->get_drop_section_at_position(p_point);
+		int drop_section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(ti).position) : tree->get_drop_section_at_position(p_point);
 		if (ti == favorites_item) {
 			return (drop_section == 1); // The parent, first fav.
 		}
@@ -2929,11 +2933,11 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
 			return;
 		}
 		// Moving favorite around.
-		TreeItem *ti = tree->get_item_at_position(p_point);
+		TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
 		if (!ti) {
 			return;
 		}
-		int drop_section = tree->get_drop_section_at_position(p_point);
+		int drop_section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(ti).position) : tree->get_drop_section_at_position(p_point);
 
 		int drop_position;
 		Vector<String> drag_files = drag_data["files"];
@@ -3053,7 +3057,7 @@ void FileSystemDock::_get_drag_target_folder(String &target, bool &target_favori
 
 	// In the file list.
 	if (p_from == files) {
-		int pos = files->get_item_at_position(p_point, true);
+		int pos = (p_point == Vector2(Math::INF, Math::INF)) ? -1 : files->get_item_at_position(p_point, true);
 		if (pos == -1) {
 			target = get_current_directory();
 			return;
@@ -3066,8 +3070,8 @@ void FileSystemDock::_get_drag_target_folder(String &target, bool &target_favori
 
 	// In the tree.
 	if (p_from == tree) {
-		TreeItem *ti = tree->get_item_at_position(p_point);
-		int section = tree->get_drop_section_at_position(p_point);
+		TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
+		int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(ti).position) : tree->get_drop_section_at_position(p_point);
 		if (ti) {
 			// Check the favorites first.
 			if (ti == tree->get_root()->get_first_child() && section >= 0) {
@@ -3195,24 +3199,24 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 	if (all_files) {
 		if (all_files_scenes) {
 			if (filenames.size() == 1) {
-				p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Open Scene"), FILE_OPEN);
-				p_popup->add_icon_item(get_editor_theme_icon(SNAME("CreateNewSceneFrom")), TTR("New Inherited Scene"), FILE_INHERIT);
+				p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRC("Open Scene"), FILE_OPEN);
+				p_popup->add_icon_item(get_editor_theme_icon(SNAME("CreateNewSceneFrom")), TTRC("New Inherited Scene"), FILE_INHERIT);
 				if (GLOBAL_GET("application/run/main_scene") != filenames[0]) {
-					p_popup->add_icon_item(get_editor_theme_icon(SNAME("PlayScene")), TTR("Set as Main Scene"), FILE_MAIN_SCENE);
+					p_popup->add_icon_item(get_editor_theme_icon(SNAME("PlayScene")), TTRC("Set as Main Scene"), FILE_MAIN_SCENE);
 				}
 			} else {
-				p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Open Scenes"), FILE_OPEN);
+				p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRC("Open Scenes"), FILE_OPEN);
 			}
-			p_popup->add_icon_item(get_editor_theme_icon(SNAME("Instance")), TTR("Instantiate"), FILE_INSTANTIATE);
+			p_popup->add_icon_item(get_editor_theme_icon(SNAME("Instance")), TTRC("Instantiate"), FILE_INSTANTIATE);
 			p_popup->add_separator();
 		} else if (filenames.size() == 1) {
-			p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Open"), FILE_OPEN);
+			p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRC("Open"), FILE_OPEN);
 			p_popup->add_separator();
 		}
 
 		if (filenames.size() == 1) {
-			p_popup->add_item(TTR("Edit Dependencies..."), FILE_DEPENDENCIES);
-			p_popup->add_item(TTR("View Owners..."), FILE_OWNERS);
+			p_popup->add_item(TTRC("Edit Dependencies..."), FILE_DEPENDENCIES);
+			p_popup->add_item(TTRC("View Owners..."), FILE_OWNERS);
 			p_popup->add_separator();
 		}
 	}
@@ -3221,14 +3225,14 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 		PopupMenu *new_menu = memnew(PopupMenu);
 		new_menu->connect(SceneStringName(id_pressed), callable_mp(this, &FileSystemDock::_generic_rmb_option_selected));
 
-		p_popup->add_submenu_node_item(TTR("Create New"), new_menu, FILE_NEW);
+		p_popup->add_submenu_node_item(TTRC("Create New"), new_menu, FILE_NEW);
 		p_popup->set_item_icon(p_popup->get_item_index(FILE_NEW), get_editor_theme_icon(SNAME("Add")));
 
-		new_menu->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTR("Folder..."), FILE_NEW_FOLDER);
-		new_menu->add_icon_item(get_editor_theme_icon(SNAME("PackedScene")), TTR("Scene..."), FILE_NEW_SCENE);
-		new_menu->add_icon_item(get_editor_theme_icon(SNAME("Script")), TTR("Script..."), FILE_NEW_SCRIPT);
-		new_menu->add_icon_item(get_editor_theme_icon(SNAME("Object")), TTR("Resource..."), FILE_NEW_RESOURCE);
-		new_menu->add_icon_item(get_editor_theme_icon(SNAME("TextFile")), TTR("TextFile..."), FILE_NEW_TEXTFILE);
+		new_menu->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTRC("Folder..."), FILE_NEW_FOLDER);
+		new_menu->add_icon_item(get_editor_theme_icon(SNAME("PackedScene")), TTRC("Scene..."), FILE_NEW_SCENE);
+		new_menu->add_icon_item(get_editor_theme_icon(SNAME("Script")), TTRC("Script..."), FILE_NEW_SCRIPT);
+		new_menu->add_icon_item(get_editor_theme_icon(SNAME("Object")), TTRC("Resource..."), FILE_NEW_RESOURCE);
+		new_menu->add_icon_item(get_editor_theme_icon(SNAME("TextFile")), TTRC("TextFile..."), FILE_NEW_TEXTFILE);
 
 		EditorContextMenuPluginManager::get_singleton()->add_options_from_plugins(new_menu, EditorContextMenuPlugin::CONTEXT_SLOT_FILESYSTEM_CREATE, p_paths);
 		p_popup->add_separator();
@@ -3239,11 +3243,11 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 	bool root_path_not_selected = p_paths[0] != "res://" && (p_paths.size() <= 1 || p_paths[1] != "res://");
 
 	if (all_folders && foldernames.size() > 0) {
-		p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Expand Folder"), FILE_OPEN);
+		p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRC("Expand Folder"), FILE_OPEN);
 
 		if (foldernames.size() == 1) {
-			p_popup->add_icon_item(get_editor_theme_icon(SNAME("GuiTreeArrowDown")), TTR("Expand Hierarchy"), FOLDER_EXPAND_ALL);
-			p_popup->add_icon_item(get_editor_theme_icon(SNAME("GuiTreeArrowRight")), TTR("Collapse Hierarchy"), FOLDER_COLLAPSE_ALL);
+			p_popup->add_icon_item(get_editor_theme_icon(SNAME("GuiTreeArrowDown")), TTRC("Expand Hierarchy"), FOLDER_EXPAND_ALL);
+			p_popup->add_icon_item(get_editor_theme_icon(SNAME("GuiTreeArrowRight")), TTRC("Collapse Hierarchy"), FOLDER_COLLAPSE_ALL);
 		}
 
 		p_popup->add_separator();
@@ -3253,10 +3257,10 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 			PopupMenu *folder_colors_menu = memnew(PopupMenu);
 			folder_colors_menu->connect(SceneStringName(id_pressed), callable_mp(this, &FileSystemDock::_folder_color_index_pressed).bind(folder_colors_menu));
 
-			p_popup->add_submenu_node_item(TTR("Set Folder Color..."), folder_colors_menu);
+			p_popup->add_submenu_node_item(TTRC("Set Folder Color..."), folder_colors_menu);
 			p_popup->set_item_icon(-1, get_editor_theme_icon(SNAME("Paint")));
 
-			folder_colors_menu->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTR("Default (Reset)"));
+			folder_colors_menu->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTRC("Default (Reset)"));
 			folder_colors_menu->set_item_icon_modulate(0, get_theme_color(SNAME("folder_icon_color"), SNAME("FileDialog")));
 			folder_colors_menu->add_separator();
 
@@ -3284,7 +3288,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 
 	// Add the options that are only available when the root path is not selected.
 	if (root_path_not_selected) {
-		p_popup->add_icon_item(get_editor_theme_icon(SNAME("MoveUp")), TTR("Move/Duplicate To..."), FILE_MOVE);
+		p_popup->add_icon_item(get_editor_theme_icon(SNAME("MoveUp")), TTRC("Move/Duplicate To..."), FILE_MOVE);
 		p_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("Remove")), ED_GET_SHORTCUT("filesystem_dock/delete"), FILE_REMOVE);
 	}
 
@@ -3296,10 +3300,10 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 	// Add the options that are available when one or more items are selected.
 	if (p_paths.size() >= 1) {
 		if (!all_favorites) {
-			p_popup->add_icon_item(get_editor_theme_icon(SNAME("Favorites")), TTR("Add to Favorites"), FILE_ADD_FAVORITE);
+			p_popup->add_icon_item(get_editor_theme_icon(SNAME("Favorites")), TTRC("Add to Favorites"), FILE_ADD_FAVORITE);
 		}
 		if (!all_not_favorites) {
-			p_popup->add_icon_item(get_editor_theme_icon(SNAME("NonFavorite")), TTR("Remove from Favorites"), FILE_REMOVE_FAVORITE);
+			p_popup->add_icon_item(get_editor_theme_icon(SNAME("NonFavorite")), TTRC("Remove from Favorites"), FILE_REMOVE_FAVORITE);
 		}
 
 		if (root_path_not_selected) {
@@ -3319,7 +3323,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 					container_menu = memnew(PopupMenu);
 					container_menu->connect(SceneStringName(id_pressed), callable_mp(this, &FileSystemDock::_generic_rmb_option_selected));
 
-					p_popup->add_submenu_node_item(TTR("Convert to..."), container_menu, FILE_NEW);
+					p_popup->add_submenu_node_item(TTRC("Convert to..."), container_menu, FILE_NEW);
 					conversion_string_template = "%s";
 				}
 
@@ -3364,7 +3368,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 			}
 
 			if (resource_valid) {
-				p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTR("Reimport"), FILE_REIMPORT);
+				p_popup->add_icon_item(get_editor_theme_icon(SNAME("Load")), TTRC("Reimport"), FILE_REIMPORT);
 			}
 		}
 	}
@@ -3389,7 +3393,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 			if (is_item_in_favorites) {
 				p_popup->add_separator();
 				added_separator = true;
-				p_popup->add_icon_item(get_editor_theme_icon(SNAME("ShowInFileSystem")), TTR("Show in FileSystem"), FILE_SHOW_IN_FILESYSTEM);
+				p_popup->add_icon_item(get_editor_theme_icon(SNAME("ShowInFileSystem")), TTRC("Show in FileSystem"), FILE_SHOW_IN_FILESYSTEM);
 			}
 		}
 
@@ -3403,14 +3407,14 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
 		const bool is_directory = fpath.ends_with("/");
 
 		p_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("Terminal")), ED_GET_SHORTCUT("filesystem_dock/open_in_terminal"), FILE_OPEN_IN_TERMINAL);
-		p_popup->set_item_text(p_popup->get_item_index(FILE_OPEN_IN_TERMINAL), is_directory ? TTR("Open in Terminal") : TTR("Open Folder in Terminal"));
+		p_popup->set_item_text(p_popup->get_item_index(FILE_OPEN_IN_TERMINAL), is_directory ? TTRC("Open in Terminal") : TTRC("Open Folder in Terminal"));
 
 		if (!is_directory) {
 			p_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("ExternalLink")), ED_GET_SHORTCUT("filesystem_dock/open_in_external_program"), FILE_OPEN_EXTERNAL);
 		}
 
 		p_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("Filesystem")), ED_GET_SHORTCUT("filesystem_dock/show_in_explorer"), FILE_SHOW_IN_EXPLORER);
-		p_popup->set_item_text(p_popup->get_item_index(FILE_SHOW_IN_EXPLORER), is_directory ? TTR("Open in File Manager") : TTR("Show in File Manager"));
+		p_popup->set_item_text(p_popup->get_item_index(FILE_SHOW_IN_EXPLORER), is_directory ? TTRC("Open in File Manager") : TTRC("Show in File Manager"));
 #endif
 
 		current_path = fpath;
@@ -3447,11 +3451,11 @@ void FileSystemDock::_tree_empty_click(const Vector2 &p_pos, MouseButton p_butto
 	current_path = "res://";
 	tree_popup->clear();
 	tree_popup->reset_size();
-	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTR("New Folder..."), FILE_NEW_FOLDER);
-	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("PackedScene")), TTR("New Scene..."), FILE_NEW_SCENE);
-	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("Script")), TTR("New Script..."), FILE_NEW_SCRIPT);
-	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("Object")), TTR("New Resource..."), FILE_NEW_RESOURCE);
-	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("TextFile")), TTR("New TextFile..."), FILE_NEW_TEXTFILE);
+	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTRC("New Folder..."), FILE_NEW_FOLDER);
+	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("PackedScene")), TTRC("New Scene..."), FILE_NEW_SCENE);
+	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("Script")), TTRC("New Script..."), FILE_NEW_SCRIPT);
+	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("Object")), TTRC("New Resource..."), FILE_NEW_RESOURCE);
+	tree_popup->add_icon_item(get_editor_theme_icon(SNAME("TextFile")), TTRC("New TextFile..."), FILE_NEW_TEXTFILE);
 #if !defined(ANDROID_ENABLED) && !defined(WEB_ENABLED)
 	// Opening the system file manager is not supported on the Android and web editors.
 	tree_popup->add_separator();
@@ -3517,11 +3521,11 @@ void FileSystemDock::_file_list_empty_clicked(const Vector2 &p_pos, MouseButton
 	file_list_popup->clear();
 	file_list_popup->reset_size();
 
-	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTR("New Folder..."), FILE_NEW_FOLDER);
-	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("PackedScene")), TTR("New Scene..."), FILE_NEW_SCENE);
-	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("Script")), TTR("New Script..."), FILE_NEW_SCRIPT);
-	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("Object")), TTR("New Resource..."), FILE_NEW_RESOURCE);
-	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("TextFile")), TTR("New TextFile..."), FILE_NEW_TEXTFILE);
+	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("Folder")), TTRC("New Folder..."), FILE_NEW_FOLDER);
+	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("PackedScene")), TTRC("New Scene..."), FILE_NEW_SCENE);
+	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("Script")), TTRC("New Script..."), FILE_NEW_SCRIPT);
+	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("Object")), TTRC("New Resource..."), FILE_NEW_RESOURCE);
+	file_list_popup->add_icon_item(get_editor_theme_icon(SNAME("TextFile")), TTRC("New TextFile..."), FILE_NEW_TEXTFILE);
 	file_list_popup->add_separator();
 	file_list_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("Terminal")), ED_GET_SHORTCUT("filesystem_dock/open_in_terminal"), FILE_OPEN_IN_TERMINAL);
 	file_list_popup->add_icon_shortcut(get_editor_theme_icon(SNAME("Filesystem")), ED_GET_SHORTCUT("filesystem_dock/show_in_explorer"), FILE_SHOW_IN_EXPLORER);
@@ -3695,7 +3699,7 @@ void FileSystemDock::_file_list_gui_input(Ref<InputEvent> p_event) {
 			if (fpath.size() > String("res://").size()) {
 				fpath = fpath.left(fpath.size() - 2); // Remove last '/'.
 				const int slash_idx = fpath.rfind_char('/');
-				fpath = fpath.substr(slash_idx + 1, fpath.size() - slash_idx - 1);
+				fpath = fpath.substr(slash_idx + 1);
 			}
 
 			tree_item = tree->get_item_with_text(fpath);
@@ -3834,7 +3838,7 @@ void FileSystemDock::_update_import_dock() {
 		imports.push_back(fpath);
 	}
 
-	if (imports.size() == 0) {
+	if (imports.is_empty()) {
 		ImportDock::get_singleton()->clear();
 	} else if (imports.size() == 1) {
 		ImportDock::get_singleton()->set_edit_path(imports[0]);
@@ -3880,16 +3884,17 @@ MenuButton *FileSystemDock::_create_file_menu_button() {
 	MenuButton *button = memnew(MenuButton);
 	button->set_flat(false);
 	button->set_theme_type_variation("FlatMenuButton");
-	button->set_tooltip_text(TTR("Sort Files"));
+	button->set_tooltip_text(TTRC("Sort Files"));
+	button->set_accessibility_name(TTRC("Sort Files"));
 
 	PopupMenu *p = button->get_popup();
 	p->connect(SceneStringName(id_pressed), callable_mp(this, &FileSystemDock::_file_sort_popup));
-	p->add_radio_check_item(TTR("Sort by Name (Ascending)"), (int)FileSortOption::FILE_SORT_NAME);
-	p->add_radio_check_item(TTR("Sort by Name (Descending)"), (int)FileSortOption::FILE_SORT_NAME_REVERSE);
-	p->add_radio_check_item(TTR("Sort by Type (Ascending)"), (int)FileSortOption::FILE_SORT_TYPE);
-	p->add_radio_check_item(TTR("Sort by Type (Descending)"), (int)FileSortOption::FILE_SORT_TYPE_REVERSE);
-	p->add_radio_check_item(TTR("Sort by Last Modified"), (int)FileSortOption::FILE_SORT_MODIFIED_TIME);
-	p->add_radio_check_item(TTR("Sort by First Modified"), (int)FileSortOption::FILE_SORT_MODIFIED_TIME_REVERSE);
+	p->add_radio_check_item(TTRC("Sort by Name (Ascending)"), (int)FileSortOption::FILE_SORT_NAME);
+	p->add_radio_check_item(TTRC("Sort by Name (Descending)"), (int)FileSortOption::FILE_SORT_NAME_REVERSE);
+	p->add_radio_check_item(TTRC("Sort by Type (Ascending)"), (int)FileSortOption::FILE_SORT_TYPE);
+	p->add_radio_check_item(TTRC("Sort by Type (Descending)"), (int)FileSortOption::FILE_SORT_TYPE_REVERSE);
+	p->add_radio_check_item(TTRC("Sort by Last Modified"), (int)FileSortOption::FILE_SORT_MODIFIED_TIME);
+	p->add_radio_check_item(TTRC("Sort by First Modified"), (int)FileSortOption::FILE_SORT_MODIFIED_TIME_REVERSE);
 	p->set_item_checked((int)file_sort, true);
 	return button;
 }
@@ -4074,38 +4079,36 @@ FileSystemDock::FileSystemDock() {
 	button_hist_prev->set_flat(true);
 	button_hist_prev->set_disabled(true);
 	button_hist_prev->set_focus_mode(FOCUS_NONE);
-	button_hist_prev->set_tooltip_text(TTR("Go to previous selected folder/file."));
+	button_hist_prev->set_tooltip_text(TTRC("Go to previous selected folder/file."));
+	button_hist_prev->set_accessibility_name(TTRC("Previous"));
 	nav_hbc->add_child(button_hist_prev);
 
 	button_hist_next = memnew(Button);
 	button_hist_next->set_flat(true);
 	button_hist_next->set_disabled(true);
 	button_hist_next->set_focus_mode(FOCUS_NONE);
-	button_hist_next->set_tooltip_text(TTR("Go to next selected folder/file."));
+	button_hist_next->set_tooltip_text(TTRC("Go to next selected folder/file."));
+	button_hist_next->set_accessibility_name(TTRC("Next"));
 	nav_hbc->add_child(button_hist_next);
 
 	current_path_line_edit = memnew(LineEdit);
 	current_path_line_edit->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
+	current_path_line_edit->set_accessibility_name(TTRC("Path"));
 	current_path_line_edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	_set_current_path_line_edit_text(current_path);
 	toolbar_hbc->add_child(current_path_line_edit);
 
-	button_reload = memnew(Button);
-	button_reload->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_rescan));
-	button_reload->set_focus_mode(FOCUS_NONE);
-	button_reload->set_tooltip_text(TTR("Re-Scan Filesystem"));
-	button_reload->hide();
-	toolbar_hbc->add_child(button_reload);
-
 	button_toggle_display_mode = memnew(Button);
 	button_toggle_display_mode->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_change_split_mode));
 	button_toggle_display_mode->set_focus_mode(FOCUS_NONE);
-	button_toggle_display_mode->set_tooltip_text(TTR("Change Split Mode"));
+	button_toggle_display_mode->set_tooltip_text(TTRC("Change Split Mode"));
+	button_toggle_display_mode->set_accessibility_name(TTRC("Change Split Mode"));
 	button_toggle_display_mode->set_theme_type_variation("FlatMenuButton");
 	toolbar_hbc->add_child(button_toggle_display_mode);
 
 	button_dock_placement = memnew(Button);
 	button_dock_placement->set_theme_type_variation("FlatMenuButton");
+	button_dock_placement->set_accessibility_name(TTRC("Dock Placement"));
 	button_dock_placement->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_change_bottom_dock_placement));
 	button_dock_placement->hide();
 	toolbar_hbc->add_child(button_dock_placement);
@@ -4115,7 +4118,8 @@ FileSystemDock::FileSystemDock() {
 
 	tree_search_box = memnew(LineEdit);
 	tree_search_box->set_h_size_flags(SIZE_EXPAND_FILL);
-	tree_search_box->set_placeholder(TTR("Filter Files"));
+	tree_search_box->set_placeholder(TTRC("Filter Files"));
+	tree_search_box->set_accessibility_name(TTRC("Filter Files"));
 	tree_search_box->set_clear_button_enabled(true);
 	tree_search_box->connect(SceneStringName(text_changed), callable_mp(this, &FileSystemDock::_search_changed).bind(tree_search_box));
 	toolbar2_hbc->add_child(tree_search_box);
@@ -4138,6 +4142,7 @@ FileSystemDock::FileSystemDock() {
 	add_child(split_box);
 
 	tree = memnew(FileSystemTree);
+	tree->set_accessibility_name(TTRC("Directories"));
 	tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 
 	tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
@@ -4167,7 +4172,8 @@ FileSystemDock::FileSystemDock() {
 
 	file_list_search_box = memnew(LineEdit);
 	file_list_search_box->set_h_size_flags(SIZE_EXPAND_FILL);
-	file_list_search_box->set_placeholder(TTR("Filter Files"));
+	file_list_search_box->set_placeholder(TTRC("Filter Files"));
+	file_list_search_box->set_accessibility_name(TTRC("Filter Files"));
 	file_list_search_box->set_clear_button_enabled(true);
 	file_list_search_box->connect(SceneStringName(text_changed), callable_mp(this, &FileSystemDock::_search_changed).bind(file_list_search_box));
 	path_hb->add_child(file_list_search_box);
@@ -4176,11 +4182,13 @@ FileSystemDock::FileSystemDock() {
 	path_hb->add_child(file_list_button_sort);
 
 	button_file_list_display_mode = memnew(Button);
+	button_file_list_display_mode->set_accessibility_name(TTRC("Display Mode"));
 	button_file_list_display_mode->set_theme_type_variation("FlatMenuButton");
 	path_hb->add_child(button_file_list_display_mode);
 
 	files = memnew(FileSystemList);
 	files->set_v_size_flags(SIZE_EXPAND_FILL);
+	files->set_accessibility_name(TTRC("Files"));
 	files->set_select_mode(ItemList::SELECT_MULTI);
 	files->set_theme_type_variation("ItemListSecondary");
 	SET_DRAG_FORWARDING_GCD(files, FileSystemDock);
@@ -4198,11 +4206,12 @@ FileSystemDock::FileSystemDock() {
 	add_child(scanning_vb);
 
 	Label *slabel = memnew(Label);
-	slabel->set_text(TTR("Scanning Files,\nPlease Wait..."));
+	slabel->set_text(TTRC("Scanning Files,\nPlease Wait..."));
 	slabel->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	scanning_vb->add_child(slabel);
 
 	scanning_progress = memnew(ProgressBar);
+	scanning_progress->set_accessibility_name(TTRC("Filesystem Scan"));
 	scanning_vb->add_child(scanning_progress);
 
 	deps_editor = memnew(DependencyEditor);
@@ -4224,8 +4233,8 @@ FileSystemDock::FileSystemDock() {
 
 	overwrite_dialog = memnew(ConfirmationDialog);
 	add_child(overwrite_dialog);
-	overwrite_dialog->set_ok_button_text(TTR("Overwrite"));
-	overwrite_dialog->add_button(TTR("Keep Both"), true)->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_overwrite_dialog_action).bind(false));
+	overwrite_dialog->set_ok_button_text(TTRC("Overwrite"));
+	overwrite_dialog->add_button(TTRC("Keep Both"), true)->connect(SceneStringName(pressed), callable_mp(this, &FileSystemDock::_overwrite_dialog_action).bind(false));
 	overwrite_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_overwrite_dialog_action).bind(true));
 
 	VBoxContainer *overwrite_dialog_vb = memnew(VBoxContainer);
@@ -4252,7 +4261,7 @@ FileSystemDock::FileSystemDock() {
 	make_scene_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_make_scene_confirm));
 
 	make_script_dialog = memnew(ScriptCreateDialog);
-	make_script_dialog->set_title(TTR("Create Script"));
+	make_script_dialog->set_title(TTRC("Create Script"));
 	add_child(make_script_dialog);
 
 	make_shader_dialog = memnew(ShaderCreateDialog);
@@ -4265,7 +4274,7 @@ FileSystemDock::FileSystemDock() {
 
 	conversion_dialog = memnew(ConfirmationDialog);
 	add_child(conversion_dialog);
-	conversion_dialog->set_ok_button_text(TTR("Convert"));
+	conversion_dialog->set_ok_button_text(TTRC("Convert"));
 	conversion_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_convert_dialog_action));
 
 	uncollapsed_paths_before_search = Vector<String>();
diff --git a/engine/editor/filesystem_dock.h b/engine/editor/filesystem_dock.h
index 0ed0de3d..4a2eeae5 100644
--- a/engine/editor/filesystem_dock.h
+++ b/engine/editor/filesystem_dock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILESYSTEM_DOCK_H
-#define FILESYSTEM_DOCK_H
+#pragma once
 
 #include "editor/dependency_editor.h"
 #include "editor/editor_file_system.h"
@@ -152,7 +151,6 @@ private:
 	Button *button_dock_placement = nullptr;
 
 	Button *button_toggle_display_mode = nullptr;
-	Button *button_reload = nullptr;
 	Button *button_file_list_display_mode = nullptr;
 	Button *button_hist_next = nullptr;
 	Button *button_hist_prev = nullptr;
@@ -235,6 +233,7 @@ private:
 	bool import_dock_needs_update = false;
 	TreeItem *resources_item = nullptr;
 	TreeItem *favorites_item = nullptr;
+	Control *had_focus = nullptr;
 
 	bool holding_branch = false;
 	Vector<TreeItem *> tree_items_selected_on_drag_begin;
@@ -422,5 +421,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(FileSystemDock::Overwrite);
-
-#endif // FILESYSTEM_DOCK_H
diff --git a/engine/editor/find_in_files.cpp b/engine/editor/find_in_files.cpp
index cc3f3f22..bb79e0ea 100644
--- a/engine/editor/find_in_files.cpp
+++ b/engine/editor/find_in_files.cpp
@@ -117,7 +117,7 @@ void FindInFiles::start() {
 		emit_signal(SceneStringName(finished));
 		return;
 	}
-	if (_extension_filter.size() == 0) {
+	if (_extension_filter.is_empty()) {
 		print_verbose("Nothing to search, filter matches no files");
 		emit_signal(SceneStringName(finished));
 		return;
@@ -183,7 +183,7 @@ void FindInFiles::_iterate() {
 			pop_back(_folders_stack);
 			_current_dir = _current_dir.get_base_dir();
 
-			if (_folders_stack.size() == 0) {
+			if (_folders_stack.is_empty()) {
 				// All folders scanned.
 				_initial_files_count = _files_to_scan.size();
 			}
@@ -319,6 +319,7 @@ FindInFilesDialog::FindInFilesDialog() {
 
 	_search_text_line_edit = memnew(LineEdit);
 	_search_text_line_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	_search_text_line_edit->set_accessibility_name(TTRC("Search"));
 	_search_text_line_edit->connect(SceneStringName(text_changed), callable_mp(this, &FindInFilesDialog::_on_search_text_modified));
 	_search_text_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &FindInFilesDialog::_on_search_text_submitted));
 	gc->add_child(_search_text_line_edit);
@@ -330,6 +331,7 @@ FindInFilesDialog::FindInFilesDialog() {
 
 	_replace_text_line_edit = memnew(LineEdit);
 	_replace_text_line_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	_replace_text_line_edit->set_accessibility_name(TTRC("Replace"));
 	_replace_text_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &FindInFilesDialog::_on_replace_text_submitted));
 	_replace_text_line_edit->hide();
 	gc->add_child(_replace_text_line_edit);
@@ -366,6 +368,7 @@ FindInFilesDialog::FindInFilesDialog() {
 		hbc->add_child(_folder_line_edit);
 
 		Button *folder_button = memnew(Button);
+		folder_button->set_accessibility_name(TTRC("Select Folder"));
 		folder_button->set_text("...");
 		folder_button->connect(SceneStringName(pressed), callable_mp(this, &FindInFilesDialog::_on_folder_button_pressed));
 		hbc->add_child(folder_button);
@@ -622,6 +625,7 @@ FindInFilesPanel::FindInFilesPanel() {
 	}
 
 	_results_display = memnew(Tree);
+	_results_display->set_accessibility_name(TTRC("Search Results"));
 	_results_display->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	_results_display->set_v_size_flags(SIZE_EXPAND_FILL);
 	_results_display->connect(SceneStringName(item_selected), callable_mp(this, &FindInFilesPanel::_on_result_selected));
@@ -644,6 +648,7 @@ FindInFilesPanel::FindInFilesPanel() {
 		_replace_container->add_child(replace_label);
 
 		_replace_line_edit = memnew(LineEdit);
+		_replace_line_edit->set_accessibility_name(TTRC("Replace"));
 		_replace_line_edit->set_h_size_flags(SIZE_EXPAND_FILL);
 		_replace_line_edit->connect(SceneStringName(text_changed), callable_mp(this, &FindInFilesPanel::_on_replace_text_changed));
 		_replace_container->add_child(_replace_line_edit);
diff --git a/engine/editor/find_in_files.h b/engine/editor/find_in_files.h
index c3760ed5..34c0297f 100644
--- a/engine/editor/find_in_files.h
+++ b/engine/editor/find_in_files.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FIND_IN_FILES_H
-#define FIND_IN_FILES_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "scene/gui/dialogs.h"
@@ -221,5 +220,3 @@ private:
 	LineEdit *_replace_line_edit = nullptr;
 	Button *_replace_all_button = nullptr;
 };
-
-#endif // FIND_IN_FILES_H
diff --git a/engine/editor/group_settings_editor.cpp b/engine/editor/group_settings_editor.cpp
index b7482cdf..33d29819 100644
--- a/engine/editor/group_settings_editor.cpp
+++ b/engine/editor/group_settings_editor.cpp
@@ -499,6 +499,7 @@ GroupSettingsEditor::GroupSettingsEditor() {
 	group_name = memnew(LineEdit);
 	group_name->set_h_size_flags(SIZE_EXPAND_FILL);
 	group_name->set_clear_button_enabled(true);
+	group_name->set_accessibility_name(TTRC("Group Name"));
 	group_name->connect(SceneStringName(text_changed), callable_mp(this, &GroupSettingsEditor::_group_name_text_changed));
 	group_name->connect(SceneStringName(text_submitted), callable_mp(this, &GroupSettingsEditor::_text_submitted));
 	hbc->add_child(group_name);
@@ -509,6 +510,7 @@ GroupSettingsEditor::GroupSettingsEditor() {
 
 	group_description = memnew(LineEdit);
 	group_description->set_clear_button_enabled(true);
+	group_description->set_accessibility_name(TTRC("Group Description"));
 	group_description->set_h_size_flags(SIZE_EXPAND_FILL);
 	group_description->connect(SceneStringName(text_submitted), callable_mp(this, &GroupSettingsEditor::_text_submitted));
 	hbc->add_child(group_description);
diff --git a/engine/editor/group_settings_editor.h b/engine/editor/group_settings_editor.h
index 5be0013e..755da48c 100644
--- a/engine/editor/group_settings_editor.h
+++ b/engine/editor/group_settings_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GROUP_SETTINGS_EDITOR_H
-#define GROUP_SETTINGS_EDITOR_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -104,5 +103,3 @@ public:
 
 	GroupSettingsEditor();
 };
-
-#endif // GROUP_SETTINGS_EDITOR_H
diff --git a/engine/editor/groups_editor.cpp b/engine/editor/groups_editor.cpp
index ce4cd7bd..3534f165 100644
--- a/engine/editor/groups_editor.cpp
+++ b/engine/editor/groups_editor.cpp
@@ -633,6 +633,7 @@ void GroupsEditor::_show_add_group_dialog() {
 		add_group_name = memnew(LineEdit);
 		add_group_name->set_custom_minimum_size(Size2(200 * EDSCALE, 0));
 		add_group_name->set_h_size_flags(SIZE_EXPAND_FILL);
+		add_group_name->set_accessibility_name(TTRC("Name"));
 		hbc->add_child(add_group_name);
 
 		global_group_button = memnew(CheckButton);
@@ -646,6 +647,7 @@ void GroupsEditor::_show_add_group_dialog() {
 		add_group_description = memnew(LineEdit);
 		add_group_description->set_h_size_flags(SIZE_EXPAND_FILL);
 		add_group_description->set_editable(false);
+		add_group_description->set_accessibility_name(TTRC("Description"));
 		gc->add_child(add_group_description);
 
 		global_group_button->connect(SceneStringName(toggled), callable_mp(add_group_description, &LineEdit::set_editable));
@@ -841,6 +843,7 @@ GroupsEditor::GroupsEditor() {
 
 	add = memnew(Button);
 	add->set_theme_type_variation("FlatMenuButton");
+	add->set_accessibility_name(TTRC("Add Group"));
 	add->set_tooltip_text(TTR("Add a new group."));
 	add->connect(SceneStringName(pressed), callable_mp(this, &GroupsEditor::_show_add_group_dialog));
 	hbc->add_child(add);
@@ -848,6 +851,7 @@ GroupsEditor::GroupsEditor() {
 	filter = memnew(LineEdit);
 	filter->set_clear_button_enabled(true);
 	filter->set_placeholder(TTR("Filter Groups"));
+	filter->set_accessibility_name(TTRC("Filter Groups"));
 	filter->set_h_size_flags(SIZE_EXPAND_FILL);
 	filter->connect(SceneStringName(text_changed), callable_mp(this, &GroupsEditor::_update_tree).unbind(1));
 	hbc->add_child(filter);
@@ -869,6 +873,3 @@ GroupsEditor::GroupsEditor() {
 
 	ProjectSettingsEditor::get_singleton()->get_group_settings()->connect("group_changed", callable_mp(this, &GroupsEditor::_update_groups_and_tree));
 }
-
-GroupsEditor::~GroupsEditor() {
-}
diff --git a/engine/editor/groups_editor.h b/engine/editor/groups_editor.h
index 8a0ca067..ae61772e 100644
--- a/engine/editor/groups_editor.h
+++ b/engine/editor/groups_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GROUPS_EDITOR_H
-#define GROUPS_EDITOR_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -138,7 +137,4 @@ public:
 	void set_current(Node *p_node);
 
 	GroupsEditor();
-	~GroupsEditor();
 };
-
-#endif // GROUPS_EDITOR_H
diff --git a/engine/editor/gui/editor_bottom_panel.cpp b/engine/editor/gui/editor_bottom_panel.cpp
index e984f196..f0e3bef0 100644
--- a/engine/editor/gui/editor_bottom_panel.cpp
+++ b/engine/editor/gui/editor_bottom_panel.cpp
@@ -307,6 +307,7 @@ EditorBottomPanel::EditorBottomPanel() {
 
 	left_button = memnew(Button);
 	left_button->set_tooltip_text(TTR("Scroll Left\nHold Ctrl to scroll to the begin.\nHold Shift to scroll one page."));
+	left_button->set_accessibility_name(TTRC("Scroll Left"));
 	left_button->set_theme_type_variation("BottomPanelButton");
 	left_button->set_focus_mode(Control::FOCUS_NONE);
 	left_button->connect(SceneStringName(pressed), callable_mp(this, &EditorBottomPanel::_scroll).bind(false));
@@ -323,6 +324,7 @@ EditorBottomPanel::EditorBottomPanel() {
 
 	right_button = memnew(Button);
 	right_button->set_tooltip_text(TTR("Scroll Right\nHold Ctrl to scroll to the end.\nHold Shift to scroll one page."));
+	right_button->set_accessibility_name(TTRC("Scroll Right"));
 	right_button->set_theme_type_variation("BottomPanelButton");
 	right_button->set_focus_mode(Control::FOCUS_NONE);
 	right_button->connect(SceneStringName(pressed), callable_mp(this, &EditorBottomPanel::_scroll).bind(true));
@@ -354,6 +356,7 @@ EditorBottomPanel::EditorBottomPanel() {
 	pin_button->set_theme_type_variation("FlatMenuButton");
 	pin_button->set_toggle_mode(true);
 	pin_button->set_tooltip_text(TTR("Pin Bottom Panel Switching"));
+	pin_button->set_accessibility_name(TTRC("Pin Bottom Panel"));
 	pin_button->connect(SceneStringName(toggled), callable_mp(this, &EditorBottomPanel::_pin_button_toggled));
 
 	expand_button = memnew(Button);
@@ -361,6 +364,7 @@ EditorBottomPanel::EditorBottomPanel() {
 	expand_button->hide();
 	expand_button->set_theme_type_variation("FlatMenuButton");
 	expand_button->set_toggle_mode(true);
+	expand_button->set_accessibility_name(TTRC("Expand Bottom Panel"));
 	expand_button->set_shortcut(ED_SHORTCUT_AND_COMMAND("editor/bottom_panel_expand", TTRC("Expand Bottom Panel"), KeyModifierMask::SHIFT | Key::F12));
 	expand_button->connect(SceneStringName(toggled), callable_mp(this, &EditorBottomPanel::_expand_button_toggled));
 }
diff --git a/engine/editor/gui/editor_bottom_panel.h b/engine/editor/gui/editor_bottom_panel.h
index dd8eb0ad..45152b97 100644
--- a/engine/editor/gui/editor_bottom_panel.h
+++ b/engine/editor/gui/editor_bottom_panel.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_BOTTOM_PANEL_H
-#define EDITOR_BOTTOM_PANEL_H
+#pragma once
 
 #include "scene/gui/panel_container.h"
 
@@ -90,5 +89,3 @@ public:
 
 	EditorBottomPanel();
 };
-
-#endif // EDITOR_BOTTOM_PANEL_H
diff --git a/engine/editor/gui/editor_dir_dialog.h b/engine/editor/gui/editor_dir_dialog.h
index 491eb617..bac5afd1 100644
--- a/engine/editor/gui/editor_dir_dialog.h
+++ b/engine/editor/gui/editor_dir_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DIR_DIALOG_H
-#define EDITOR_DIR_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -73,5 +72,3 @@ public:
 
 	EditorDirDialog();
 };
-
-#endif // EDITOR_DIR_DIALOG_H
diff --git a/engine/editor/gui/editor_file_dialog.cpp b/engine/editor/gui/editor_file_dialog.cpp
index 03fe1f7f..3e156fc4 100644
--- a/engine/editor/gui/editor_file_dialog.cpp
+++ b/engine/editor/gui/editor_file_dialog.cpp
@@ -65,7 +65,15 @@ void EditorFileDialog::_native_popup() {
 	} else if (access == ACCESS_USERDATA) {
 		root = OS::get_singleton()->get_user_data_dir();
 	}
-	DisplayServer::get_singleton()->file_dialog_with_options_show(get_translated_title(), ProjectSettings::get_singleton()->globalize_path(dir->get_text()), root, file->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, _get_options(), callable_mp(this, &EditorFileDialog::_native_dialog_cb));
+
+	// Attach native file dialog to first persistent parent window.
+	Window *w = (is_transient() || is_transient_to_focused()) ? get_parent_visible_window() : nullptr;
+	while (w && w->get_flag(FLAG_POPUP) && w->get_parent_visible_window()) {
+		w = w->get_parent_visible_window();
+	}
+	DisplayServer::WindowID wid = w ? w->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
+
+	DisplayServer::get_singleton()->file_dialog_with_options_show(get_translated_title(), ProjectSettings::get_singleton()->globalize_path(dir->get_text()), root, file->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, _get_options(), callable_mp(this, &EditorFileDialog::_native_dialog_cb), wid);
 }
 
 void EditorFileDialog::popup(const Rect2i &p_rect) {
@@ -134,9 +142,9 @@ void EditorFileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_file
 			} else if (filters.size() > 1 && p_filter == 0) {
 				// Match all filters.
 				for (int i = 0; i < filters.size(); i++) {
-					String flt = filters[i].get_slice(";", 0);
+					String flt = filters[i].get_slicec(';', 0);
 					for (int j = 0; j < flt.get_slice_count(","); j++) {
-						String str = flt.get_slice(",", j).strip_edges();
+						String str = flt.get_slicec(',', j).strip_edges();
 						if (f.matchn(str)) {
 							valid = true;
 							break;
@@ -152,10 +160,10 @@ void EditorFileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_file
 					idx--;
 				}
 				if (idx >= 0 && idx < filters.size()) {
-					String flt = filters[idx].get_slice(";", 0);
+					String flt = filters[idx].get_slicec(';', 0);
 					int filter_slice_count = flt.get_slice_count(",");
 					for (int j = 0; j < filter_slice_count; j++) {
-						String str = (flt.get_slice(",", j).strip_edges());
+						String str = flt.get_slicec(',', j).strip_edges();
 						if (f.matchn(str)) {
 							valid = true;
 							break;
@@ -163,8 +171,8 @@ void EditorFileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_file
 					}
 
 					if (!valid && filter_slice_count > 0) {
-						String str = (flt.get_slice(",", 0).strip_edges());
-						f += str.substr(1, str.length() - 1);
+						String str = flt.get_slicec(',', 0).strip_edges();
+						f += str.substr(1);
 						file->set_text(f.get_file());
 						valid = true;
 					}
@@ -176,8 +184,8 @@ void EditorFileDialog::_native_dialog_cb(bool p_ok, const Vector<String> &p_file
 			// Add first extension of filter if no valid extension is found.
 			if (!valid) {
 				int idx = p_filter;
-				String flt = filters[idx].get_slice(";", 0);
-				String ext = flt.get_slice(",", 0).strip_edges().get_extension();
+				String flt = filters[idx].get_slicec(';', 0);
+				String ext = flt.get_slicec(',', 0).strip_edges().get_extension();
 				f += "." + ext;
 			}
 			emit_signal(SNAME("file_selected"), f);
@@ -586,7 +594,7 @@ void EditorFileDialog::_action_pressed() {
 	} else if (mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_DIR) {
 		String path = dir_access->get_current_dir();
 
-		path = path.replace("\\", "/");
+		path = path.replace_char('\\', '/');
 
 		for (int i = 0; i < item_list->get_item_count(); i++) {
 			if (item_list->is_selected(i)) {
@@ -612,9 +620,9 @@ void EditorFileDialog::_action_pressed() {
 		} else if (filters.size() > 1 && filter->get_selected() == 0) {
 			// Match all filters.
 			for (int i = 0; i < filters.size(); i++) {
-				String flt = filters[i].get_slice(";", 0);
+				String flt = filters[i].get_slicec(';', 0);
 				for (int j = 0; j < flt.get_slice_count(","); j++) {
-					String str = flt.get_slice(",", j).strip_edges();
+					String str = flt.get_slicec(',', j).strip_edges();
 					if (f.matchn(str)) {
 						valid = true;
 						break;
@@ -630,10 +638,10 @@ void EditorFileDialog::_action_pressed() {
 				idx--;
 			}
 			if (idx >= 0 && idx < filters.size()) {
-				String flt = filters[idx].get_slice(";", 0);
+				String flt = filters[idx].get_slicec(';', 0);
 				int filter_slice_count = flt.get_slice_count(",");
 				for (int j = 0; j < filter_slice_count; j++) {
-					String str = (flt.get_slice(",", j).strip_edges());
+					String str = (flt.get_slicec(',', j).strip_edges());
 					if (f.matchn(str)) {
 						valid = true;
 						break;
@@ -641,8 +649,8 @@ void EditorFileDialog::_action_pressed() {
 				}
 
 				if (!valid && filter_slice_count > 0) {
-					String str = (flt.get_slice(",", 0).strip_edges());
-					f += str.substr(1, str.length() - 1);
+					String str = flt.get_slicec(',', 0).strip_edges();
+					f += str.substr(1);
 					_request_single_thumbnail(get_current_dir().path_join(f.get_file()));
 					file->set_text(f.get_file());
 					valid = true;
@@ -663,8 +671,8 @@ void EditorFileDialog::_action_pressed() {
 		// Add first extension of filter if no valid extension is found.
 		if (!valid) {
 			int idx = filter->get_selected();
-			String flt = filters[idx].get_slice(";", 0);
-			String ext = flt.get_slice(",", 0).strip_edges().get_extension();
+			String flt = filters[idx].get_slicec(';', 0);
+			String ext = flt.get_slicec(',', 0).strip_edges().get_extension();
 			f += "." + ext;
 		}
 
@@ -762,7 +770,7 @@ void EditorFileDialog::_items_clear_selection(const Vector2 &p_pos, MouseButton
 void EditorFileDialog::_push_history() {
 	local_history.resize(local_history_pos + 1);
 	String new_path = dir_access->get_current_dir();
-	if (local_history.size() == 0 || new_path != local_history[local_history_pos]) {
+	if (local_history.is_empty() || new_path != local_history[local_history_pos]) {
 		local_history.push_back(new_path);
 		local_history_pos++;
 		dir_prev->set_disabled(local_history_pos == 0);
@@ -932,7 +940,7 @@ bool EditorFileDialog::_is_open_should_be_disabled() {
 	}
 
 	Vector<int> items = item_list->get_selected_items();
-	if (items.size() == 0) {
+	if (items.is_empty()) {
 		return mode != FILE_MODE_OPEN_DIR; // In "Open folder" mode, having nothing selected picks the current folder.
 	}
 
@@ -1097,9 +1105,9 @@ void EditorFileDialog::update_file_list() {
 	} else if (filters.size() > 1 && filter->get_selected() == 0) {
 		// match all filters
 		for (int i = 0; i < filters.size(); i++) {
-			String f = filters[i].get_slice(";", 0);
+			String f = filters[i].get_slicec(';', 0);
 			for (int j = 0; j < f.get_slice_count(","); j++) {
-				patterns.push_back(f.get_slice(",", j).strip_edges());
+				patterns.push_back(f.get_slicec(',', j).strip_edges());
 			}
 		}
 	} else {
@@ -1109,9 +1117,9 @@ void EditorFileDialog::update_file_list() {
 		}
 
 		if (idx >= 0 && idx < filters.size()) {
-			String f = filters[idx].get_slice(";", 0);
+			String f = filters[idx].get_slicec(';', 0);
 			for (int j = 0; j < f.get_slice_count(","); j++) {
-				patterns.push_back(f.get_slice(",", j).strip_edges());
+				patterns.push_back(f.get_slicec(',', j).strip_edges());
 			}
 		}
 	}
@@ -1428,7 +1436,7 @@ void EditorFileDialog::set_current_path(const String &p_path) {
 		set_current_file(p_path);
 	} else {
 		String path_dir = p_path.substr(0, pos);
-		String path_file = p_path.substr(pos + 1, p_path.length());
+		String path_file = p_path.substr(pos + 1);
 		set_current_dir(path_dir);
 		set_current_file(path_file);
 	}
@@ -2040,6 +2048,7 @@ void EditorFileDialog::_update_option_controls() {
 	for (const EditorFileDialog::Option &opt : options) {
 		if (opt.values.is_empty()) {
 			CheckBox *cb = memnew(CheckBox);
+			cb->set_accessibility_name(opt.name);
 			cb->set_pressed(opt.default_idx);
 			cb->set_text(opt.name);
 			flow_checkbox_options->add_child(cb);
@@ -2048,12 +2057,14 @@ void EditorFileDialog::_update_option_controls() {
 		} else {
 			Label *lbl = memnew(Label);
 			lbl->set_text(opt.name);
+			lbl->set_focus_mode(Control::FOCUS_NONE);
 			grid_select_options->add_child(lbl);
 
 			OptionButton *ob = memnew(OptionButton);
 			for (const String &val : opt.values) {
 				ob->add_item(val);
 			}
+			ob->set_accessibility_name(opt.name);
 			ob->select(opt.default_idx);
 			grid_select_options->add_child(ob);
 			ob->connect(SceneStringName(item_selected), callable_mp(this, &EditorFileDialog::_option_changed_item_selected).bind(opt.name));
@@ -2393,12 +2404,15 @@ EditorFileDialog::EditorFileDialog() {
 
 	dir_prev = memnew(Button);
 	dir_prev->set_theme_type_variation(SceneStringName(FlatButton));
+	dir_prev->set_accessibility_name(TTRC("Previous"));
 	dir_prev->set_tooltip_text(TTR("Go to previous folder."));
 	dir_next = memnew(Button);
 	dir_next->set_theme_type_variation(SceneStringName(FlatButton));
+	dir_next->set_accessibility_name(TTRC("Next"));
 	dir_next->set_tooltip_text(TTR("Go to next folder."));
 	dir_up = memnew(Button);
 	dir_up->set_theme_type_variation(SceneStringName(FlatButton));
+	dir_up->set_accessibility_name(TTRC("Parent Folder"));
 	dir_up->set_tooltip_text(TTR("Go to parent folder."));
 
 	pathhb->add_child(dir_prev);
@@ -2410,6 +2424,7 @@ EditorFileDialog::EditorFileDialog() {
 	dir_up->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::_go_up));
 
 	Label *l = memnew(Label(TTR("Path:")));
+	l->set_focus_mode(Control::FOCUS_NONE);
 	l->set_theme_type_variation("HeaderSmall");
 	pathhb->add_child(l);
 
@@ -2418,10 +2433,12 @@ EditorFileDialog::EditorFileDialog() {
 
 	dir = memnew(LineEdit);
 	dir->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
+	dir->set_accessibility_name(TTRC("Directory Path"));
 	pathhb->add_child(dir);
 
 	refresh = memnew(Button);
 	refresh->set_theme_type_variation(SceneStringName(FlatButton));
+	refresh->set_accessibility_name(TTRC("Refresh Files"));
 	refresh->set_tooltip_text(TTR("Refresh files."));
 	refresh->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::update_file_list));
 	pathhb->add_child(refresh);
@@ -2429,6 +2446,7 @@ EditorFileDialog::EditorFileDialog() {
 	favorite = memnew(Button);
 	favorite->set_theme_type_variation(SceneStringName(FlatButton));
 	favorite->set_toggle_mode(true);
+	favorite->set_accessibility_name(TTRC("(Un)favorite Folder"));
 	favorite->set_tooltip_text(TTR("(Un)favorite current folder."));
 	favorite->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::_favorite_pressed));
 	pathhb->add_child(favorite);
@@ -2438,6 +2456,7 @@ EditorFileDialog::EditorFileDialog() {
 
 	drives = memnew(OptionButton);
 	drives->connect(SceneStringName(item_selected), callable_mp(this, &EditorFileDialog::_select_drive));
+	drives->set_accessibility_name(TTRC("Current Drive"));
 	pathhb->add_child(drives);
 
 	makedir_sep = memnew(VSeparator);
@@ -2445,6 +2464,7 @@ EditorFileDialog::EditorFileDialog() {
 
 	makedir = memnew(Button);
 	makedir->set_theme_type_variation(SceneStringName(FlatButton));
+	makedir->set_accessibility_name(TTRC("Create Folder"));
 	makedir->set_tooltip_text(TTR("Create a new folder."));
 	makedir->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::_make_dir));
 	pathhb->add_child(makedir);
@@ -2480,16 +2500,19 @@ EditorFileDialog::EditorFileDialog() {
 	fav_vb->add_child(fav_hb);
 
 	l = memnew(Label(TTR("Favorites:")));
+	l->set_focus_mode(Control::FOCUS_NONE);
 	l->set_theme_type_variation("HeaderSmall");
 	fav_hb->add_child(l);
 
 	fav_hb->add_spacer();
 	fav_up = memnew(Button);
 	fav_up->set_theme_type_variation(SceneStringName(FlatButton));
+	fav_up->set_accessibility_name(TTRC("Move Up"));
 	fav_hb->add_child(fav_up);
 	fav_up->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::_favorite_move_up));
 	fav_down = memnew(Button);
 	fav_down->set_theme_type_variation(SceneStringName(FlatButton));
+	fav_down->set_accessibility_name(TTRC("Move Down"));
 	fav_hb->add_child(fav_down);
 	fav_down->connect(SceneStringName(pressed), callable_mp(this, &EditorFileDialog::_favorite_move_down));
 
@@ -2498,6 +2521,7 @@ EditorFileDialog::EditorFileDialog() {
 	fav_vb->add_child(favorites);
 	favorites->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	favorites->set_theme_type_variation("ItemListSecondary");
+	favorites->set_accessibility_name(TTRC("Favorites"));
 	favorites->connect(SceneStringName(item_selected), callable_mp(this, &EditorFileDialog::_favorite_selected));
 
 	VBoxContainer *rec_vb = memnew(VBoxContainer);
@@ -2508,6 +2532,7 @@ EditorFileDialog::EditorFileDialog() {
 	recent->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	recent->set_allow_reselect(true);
 	recent->set_theme_type_variation("ItemListSecondary");
+	recent->set_accessibility_name(TTRC("Recent"));
 	rec_vb->add_margin_child(TTR("Recent:"), recent, true);
 	recent->connect(SceneStringName(item_selected), callable_mp(this, &EditorFileDialog::_recent_selected));
 
@@ -2526,6 +2551,7 @@ EditorFileDialog::EditorFileDialog() {
 	lower_hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	l = memnew(Label(TTR("Directories & Files:")));
+	l->set_focus_mode(Control::FOCUS_NONE);
 	l->set_theme_type_variation("HeaderSmall");
 	l->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
@@ -2535,6 +2561,7 @@ EditorFileDialog::EditorFileDialog() {
 	show_hidden->set_theme_type_variation(SceneStringName(FlatButton));
 	show_hidden->set_toggle_mode(true);
 	show_hidden->set_pressed(is_showing_hidden_files());
+	show_hidden->set_accessibility_name(TTRC("Show Hidden Files"));
 	show_hidden->set_tooltip_text(TTR("Toggle the visibility of hidden files."));
 	show_hidden->connect(SceneStringName(toggled), callable_mp(this, &EditorFileDialog::set_show_hidden_files));
 	lower_hb->add_child(show_hidden);
@@ -2550,6 +2577,7 @@ EditorFileDialog::EditorFileDialog() {
 	mode_thumbnails->set_toggle_mode(true);
 	mode_thumbnails->set_pressed(display_mode == DISPLAY_THUMBNAILS);
 	mode_thumbnails->set_button_group(view_mode_group);
+	mode_thumbnails->set_accessibility_name(TTRC("View as Thumbnails"));
 	mode_thumbnails->set_tooltip_text(TTR("View items as a grid of thumbnails."));
 	lower_hb->add_child(mode_thumbnails);
 
@@ -2559,6 +2587,7 @@ EditorFileDialog::EditorFileDialog() {
 	mode_list->set_toggle_mode(true);
 	mode_list->set_pressed(display_mode == DISPLAY_LIST);
 	mode_list->set_button_group(view_mode_group);
+	mode_list->set_accessibility_name(TTRC("View as List"));
 	mode_list->set_tooltip_text(TTR("View items as a list."));
 	lower_hb->add_child(mode_list);
 
@@ -2568,12 +2597,14 @@ EditorFileDialog::EditorFileDialog() {
 	file_sort_button->set_flat(false);
 	file_sort_button->set_theme_type_variation("FlatMenuButton");
 	file_sort_button->set_tooltip_text(TTR("Sort files"));
+	file_sort_button->set_accessibility_name(TTRC("Sort Files"));
 
 	show_search_filter_button = memnew(Button);
 	show_search_filter_button->set_theme_type_variation(SceneStringName(FlatButton));
 	show_search_filter_button->set_toggle_mode(true);
 	show_search_filter_button->set_pressed(false);
 	show_search_filter_button->set_tooltip_text(TTR("Toggle the visibility of the filter for file names."));
+	show_search_filter_button->set_accessibility_name(TTRC("Show Search Filters"));
 	show_search_filter_button->connect(SceneStringName(toggled), callable_mp(this, &EditorFileDialog::set_show_search_filter));
 	lower_hb->add_child(show_search_filter_button);
 
@@ -2599,6 +2630,7 @@ EditorFileDialog::EditorFileDialog() {
 	item_list->connect("item_clicked", callable_mp(this, &EditorFileDialog::_item_list_item_rmb_clicked));
 	item_list->connect("empty_clicked", callable_mp(this, &EditorFileDialog::_item_list_empty_clicked));
 	item_list->set_allow_rmb_select(true);
+	item_list->set_accessibility_name(TTRC("Directories and Files"));
 
 	list_vb->add_child(item_list);
 
@@ -2621,6 +2653,7 @@ EditorFileDialog::EditorFileDialog() {
 	filter_box = memnew(LineEdit);
 	filter_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	filter_box->set_placeholder(TTR("Filter"));
+	filter_box->set_accessibility_name(TTRC("Filename Filter"));
 	filter_hb->add_child(filter_box);
 	filter_hb->set_visible(false);
 	item_vb->add_child(filter_hb);
@@ -2628,6 +2661,7 @@ EditorFileDialog::EditorFileDialog() {
 	file_box = memnew(HBoxContainer);
 
 	l = memnew(Label(TTR("File:")));
+	l->set_focus_mode(Control::FOCUS_NONE);
 	l->set_theme_type_variation("HeaderSmall");
 	file_box->add_child(l);
 
@@ -2635,11 +2669,13 @@ EditorFileDialog::EditorFileDialog() {
 	file->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	file->set_stretch_ratio(4);
 	file->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	file->set_accessibility_name(TTRC("File Name"));
 	file_box->add_child(file);
 	filter = memnew(OptionButton);
 	filter->set_stretch_ratio(3);
 	filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	filter->set_clip_text(true); // Too many extensions overflow it.
+	filter->set_accessibility_name(TTRC("File Type Filter"));
 	file_box->add_child(filter);
 	file_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	item_vb->add_child(file_box);
@@ -2677,6 +2713,7 @@ EditorFileDialog::EditorFileDialog() {
 
 	makedirname = memnew(LineEdit);
 	makedirname->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
+	makedirname->set_accessibility_name(TTRC("Name"));
 	makevb->add_margin_child(TTR("Name:"), makedirname);
 	add_child(makedialog);
 	makedialog->register_text_enter(makedirname);
diff --git a/engine/editor/gui/editor_file_dialog.h b/engine/editor/gui/editor_file_dialog.h
index d1b37687..1bde60ab 100644
--- a/engine/editor/gui/editor_file_dialog.h
+++ b/engine/editor/gui/editor_file_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_FILE_DIALOG_H
-#define EDITOR_FILE_DIALOG_H
+#pragma once
 
 #include "core/io/dir_access.h"
 #include "editor/file_info.h"
@@ -378,5 +377,3 @@ public:
 VARIANT_ENUM_CAST(EditorFileDialog::FileMode);
 VARIANT_ENUM_CAST(EditorFileDialog::Access);
 VARIANT_ENUM_CAST(EditorFileDialog::DisplayMode);
-
-#endif // EDITOR_FILE_DIALOG_H
diff --git a/engine/editor/gui/editor_object_selector.cpp b/engine/editor/gui/editor_object_selector.cpp
index 3cf5a0fa..7dd08432 100644
--- a/engine/editor/gui/editor_object_selector.cpp
+++ b/engine/editor/gui/editor_object_selector.cpp
@@ -128,7 +128,6 @@ void EditorObjectSelector::update_path() {
 		}
 
 		Ref<Texture2D> obj_icon = EditorNode::get_singleton()->get_object_icon(obj);
-
 		if (obj_icon.is_valid()) {
 			current_object_icon->set_texture(obj_icon);
 		}
@@ -148,7 +147,7 @@ void EditorObjectSelector::update_path() {
 				if (name.is_empty()) {
 					name = r->get_class();
 				}
-			} else if (obj->is_class("EditorDebuggerRemoteObject")) {
+			} else if (obj->is_class("EditorDebuggerRemoteObjects")) {
 				name = obj->call("get_title");
 			} else if (Object::cast_to<Node>(obj)) {
 				name = Object::cast_to<Node>(obj)->get_name();
diff --git a/engine/editor/gui/editor_object_selector.h b/engine/editor/gui/editor_object_selector.h
index 60d6df48..7e7ace03 100644
--- a/engine/editor/gui/editor_object_selector.h
+++ b/engine/editor/gui/editor_object_selector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_OBJECT_SELECTOR_H
-#define EDITOR_OBJECT_SELECTOR_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -68,5 +67,3 @@ public:
 
 	EditorObjectSelector(EditorSelectionHistory *p_history);
 };
-
-#endif // EDITOR_OBJECT_SELECTOR_H
diff --git a/engine/editor/gui/editor_quick_open_dialog.cpp b/engine/editor/gui/editor_quick_open_dialog.cpp
index 40b2242f..f1dd34f1 100644
--- a/engine/editor/gui/editor_quick_open_dialog.cpp
+++ b/engine/editor/gui/editor_quick_open_dialog.cpp
@@ -115,6 +115,7 @@ EditorQuickOpenDialog::EditorQuickOpenDialog() {
 		search_box = memnew(LineEdit);
 		search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		search_box->set_placeholder(TTR("Search files..."));
+		search_box->set_accessibility_name(TTRC("Search"));
 		search_box->set_clear_button_enabled(true);
 		mc->add_child(search_box);
 	}
@@ -278,6 +279,7 @@ QuickOpenResultContainer::QuickOpenResultContainer() {
 		bottom_bar->add_child(vsep);
 
 		display_mode_toggle = memnew(Button);
+		display_mode_toggle->set_accessibility_name(TTRC("Display Mode"));
 		style_button(display_mode_toggle);
 		display_mode_toggle->connect(SceneStringName(pressed), callable_mp(this, &QuickOpenResultContainer::_toggle_display_mode));
 		bottom_bar->add_child(display_mode_toggle);
@@ -343,18 +345,31 @@ void QuickOpenResultContainer::init(const Vector<StringName> &p_base_types) {
 		// Load history when opening for the first time.
 		file_type_icons.insert(SNAME("__default_icon"), get_editor_theme_icon(SNAME("Object")));
 
+		bool history_modified = false;
 		List<String> history_keys;
 		history_file->get_section_keys("selected_history", &history_keys);
 		for (const String &type : history_keys) {
 			const StringName type_name = type;
 			const PackedStringArray paths = history_file->get_value("selected_history", type);
 
+			PackedStringArray cleaned_paths;
+			cleaned_paths.resize(paths.size());
+
 			Vector<QuickOpenResultCandidate> loaded_candidates;
 			loaded_candidates.resize(paths.size());
 			{
 				QuickOpenResultCandidate *candidates_write = loaded_candidates.ptrw();
+				String *cleanup_write = cleaned_paths.ptrw();
 				int i = 0;
-				for (const String &path : paths) {
+				for (String path : paths) {
+					if (path.begins_with("uid://")) {
+						ResourceUID::ID id = ResourceUID::get_singleton()->text_to_id(path);
+						if (!ResourceUID::get_singleton()->has_id(id)) {
+							continue;
+						}
+						path = ResourceUID::get_singleton()->get_id_path(id);
+					}
+
 					if (!ResourceLoader::exists(path)) {
 						continue;
 					}
@@ -363,22 +378,62 @@ void QuickOpenResultContainer::init(const Vector<StringName> &p_base_types) {
 					QuickOpenResultCandidate candidate;
 					_setup_candidate(candidate, path);
 					candidates_write[i] = candidate;
+					cleanup_write[i] = path;
 					i++;
 				}
 				loaded_candidates.resize(i);
+				cleaned_paths.resize(i);
 				selected_history.insert(type, loaded_candidates);
+
+				if (i < paths.size()) {
+					// Some paths removed, need to update history.
+					if (i == 0) {
+						history_file->erase_section_key("selected_history", type);
+					} else {
+						history_file->set_value("selected_history", type, cleaned_paths);
+					}
+					history_modified = true;
+				}
 			}
 		}
+		if (history_modified) {
+			history_file->save(_get_cache_file_path());
+		}
 	}
+
 	_create_initial_results();
 }
 
+void QuickOpenResultContainer::_sort_filepaths(int p_max_results) {
+	struct FilepathComparator {
+		bool operator()(const String &p_lhs, const String &p_rhs) const {
+			// Sort on (length, alphanumeric) to prioritize shorter filepaths
+			return p_lhs.length() == p_rhs.length() ? p_lhs < p_rhs : p_lhs.length() < p_rhs.length();
+		}
+	};
+
+	SortArray<String, FilepathComparator> sorter;
+	if (filepaths.size() > p_max_results) {
+		sorter.partial_sort(0, filepaths.size(), p_max_results, filepaths.ptrw());
+	} else {
+		sorter.sort(filepaths.ptrw(), filepaths.size());
+	}
+}
+
 void QuickOpenResultContainer::_create_initial_results() {
 	file_type_icons.clear();
 	file_type_icons.insert(SNAME("__default_icon"), get_editor_theme_icon(SNAME("Object")));
 	filepaths.clear();
 	filetypes.clear();
+	history_set.clear();
+	Vector<QuickOpenResultCandidate> *history = _get_history();
+	if (history) {
+		for (const QuickOpenResultCandidate &candidate : *history) {
+			history_set.insert(candidate.file_path);
+		}
+	}
 	_find_filepaths_in_folder(EditorFileSystem::get_singleton()->get_filesystem(), include_addons_toggle->is_pressed());
+	_sort_filepaths(result_items.size());
 	max_total_results = MIN(filepaths.size(), result_items.size());
 	update_results();
 }
@@ -416,25 +471,26 @@ void QuickOpenResultContainer::set_query_and_update(const String &p_query) {
 	update_results();
 }
 
-void QuickOpenResultContainer::_setup_candidate(QuickOpenResultCandidate &p_candidate, const String &p_filepath) {
-	ResourceUID::ID id = EditorFileSystem::get_singleton()->get_file_uid(p_filepath);
-	if (id == ResourceUID::INVALID_ID) {
-		p_candidate.file_path = p_filepath;
-	} else {
-		p_candidate.file_path = ResourceUID::get_singleton()->id_to_text(id);
+Vector<QuickOpenResultCandidate> *QuickOpenResultContainer::_get_history() {
+	if (base_types.size() == 1) {
+		return selected_history.lookup_ptr(base_types[0]);
 	}
-	p_candidate.result = nullptr;
+	return nullptr;
+}
 
+void QuickOpenResultContainer::_setup_candidate(QuickOpenResultCandidate &p_candidate, const String &p_filepath) {
+	p_candidate.file_path = ResourceUID::ensure_path(p_filepath);
+	p_candidate.result = nullptr;
 	StringName actual_type;
 	{
 		StringName *actual_type_ptr = filetypes.lookup_ptr(p_filepath);
 		if (actual_type_ptr) {
 			actual_type = *actual_type_ptr;
 		} else {
-			ERR_PRINT(vformat("EditorQuickOpenDialog: No type for path %s.", p_filepath));
+			ERR_PRINT(vformat("EditorQuickOpenDialog: No type for path %s.", p_candidate.file_path));
 		}
 	}
-	EditorResourcePreview::PreviewItem item = EditorResourcePreview::get_singleton()->get_resource_preview_if_available(p_filepath);
+	EditorResourcePreview::PreviewItem item = EditorResourcePreview::get_singleton()->get_resource_preview_if_available(p_candidate.file_path);
 	if (item.preview.is_valid()) {
 		p_candidate.thumbnail = item.preview;
 	} else if (file_type_icons.has(actual_type)) {
@@ -453,7 +509,6 @@ void QuickOpenResultContainer::_setup_candidate(QuickOpenResultCandidate &p_cand
 }
 
 void QuickOpenResultContainer::update_results() {
-	showing_history = false;
 	candidates.clear();
 	if (query.is_empty()) {
 		_use_default_candidates();
@@ -464,17 +519,18 @@ void QuickOpenResultContainer::update_results() {
 }
 
 void QuickOpenResultContainer::_use_default_candidates() {
-	if (filepaths.size() <= SHOW_ALL_FILES_THRESHOLD) {
-		candidates.resize(filepaths.size());
-		QuickOpenResultCandidate *candidates_write = candidates.ptrw();
-		for (const String &filepath : filepaths) {
-			_setup_candidate(*candidates_write++, filepath);
+	Vector<QuickOpenResultCandidate> *history = _get_history();
+	if (history) {
+		candidates.append_array(*history);
+	}
+	int count = candidates.size();
+	candidates.resize(MIN(max_total_results, filepaths.size()));
+	for (const String &filepath : filepaths) {
+		if (count >= max_total_results) {
+			break;
 		}
-	} else if (base_types.size() == 1) {
-		Vector<QuickOpenResultCandidate> *history = selected_history.lookup_ptr(base_types[0]);
-		if (history) {
-			showing_history = true;
-			candidates.append_array(*history);
+		if (!history || !history_set.has(filepath)) {
+			_setup_candidate(candidates.write[count++], filepath);
 		}
 	}
 }
@@ -524,8 +580,6 @@ void QuickOpenResultContainer::_update_result_items(int p_new_visible_results_co
 	if (!any_results) {
 		if (filepaths.is_empty()) {
 			no_results_label->set_text(TTR("No files found for this type"));
-		} else if (query.is_empty()) {
-			no_results_label->set_text(TTR("Start searching to find files..."));
 		} else {
 			no_results_label->set_text(TTR("No results found"));
 		}
@@ -552,7 +606,7 @@ void QuickOpenResultContainer::handle_search_box_input(const Ref<InputEvent> &p_
 			case Key::RIGHT: {
 				if (content_display_mode == QuickOpenDisplayMode::GRID) {
 					// Maybe strip off the shift modifier to allow non-selecting navigation by character?
-					if (key_event->get_modifiers_mask() == 0) {
+					if (key_event->get_modifiers_mask().is_empty()) {
 						move_selection = true;
 					}
 				}
@@ -621,7 +675,8 @@ void QuickOpenResultContainer::_select_item(int p_index) {
 	}
 
 	result_items[selection_index]->highlight_item(true);
-	file_details_path->set_text(get_selected() + (showing_history ? TTR(" (recently opened)") : ""));
+	bool in_history = history_set.has(candidates[selection_index].file_path);
+	file_details_path->set_text(get_selected() + (in_history ? TTR(" (recently opened)") : ""));
 
 	const QuickOpenResultItem *item = result_items[selection_index];
 
@@ -727,7 +782,7 @@ bool QuickOpenResultContainer::has_nothing_selected() const {
 
 String QuickOpenResultContainer::get_selected() const {
 	ERR_FAIL_COND_V_MSG(has_nothing_selected(), String(), "Tried to get selected file, but nothing was selected.");
-	return ResourceUID::ensure_path(candidates[selection_index].file_path);
+	return candidates[selection_index].file_path;
 }
 
 QuickOpenDisplayMode QuickOpenResultContainer::get_adaptive_display_mode(const Vector<StringName> &p_base_types) {
@@ -749,6 +804,11 @@ QuickOpenDisplayMode QuickOpenResultContainer::get_adaptive_display_mode(const V
 	return QuickOpenDisplayMode::LIST;
 }
 
+String _get_uid_string(const String &p_filepath) {
+	ResourceUID::ID id = EditorFileSystem::get_singleton()->get_file_uid(p_filepath);
+	return id == ResourceUID::INVALID_ID ? p_filepath : ResourceUID::get_singleton()->id_to_text(id);
+}
+
 void QuickOpenResultContainer::save_selected_item() {
 	if (base_types.size() > 1) {
 		// Getting the type of the file and checking which base type it belongs to should be possible.
@@ -773,6 +833,7 @@ void QuickOpenResultContainer::save_selected_item() {
 	}
 
 	selected.result = nullptr;
+	history_set.insert(selected.file_path);
 	type_history->insert(0, selected);
 	if (type_history->size() > MAX_HISTORY_SIZE) {
 		type_history->resize(MAX_HISTORY_SIZE);
@@ -785,7 +846,7 @@ void QuickOpenResultContainer::save_selected_item() {
 
 		int i = 0;
 		for (const QuickOpenResultCandidate &candidate : *type_history) {
-			paths_write[i] = candidate.file_path;
+			paths_write[i] = _get_uid_string(candidate.file_path);
 			i++;
 		}
 	}
@@ -796,6 +857,7 @@ void QuickOpenResultContainer::save_selected_item() {
 void QuickOpenResultContainer::cleanup() {
 	num_visible_results = 0;
 	candidates.clear();
+	history_set.clear();
 	_select_item(-1);
 
 	for (QuickOpenResultItem *item : result_items) {
@@ -981,9 +1043,8 @@ QuickOpenResultListItem::QuickOpenResultListItem() {
 
 void QuickOpenResultListItem::set_content(const QuickOpenResultCandidate &p_candidate, bool p_highlight) {
 	thumbnail->set_texture(p_candidate.thumbnail);
-	const String file_path = ResourceUID::ensure_path(p_candidate.file_path);
-	name->set_text(file_path.get_file());
-	path->set_text(file_path.get_base_dir());
+	name->set_text(p_candidate.file_path.get_file());
+	path->set_text(p_candidate.file_path.get_base_dir());
 	name->reset_highlights();
 	path->reset_highlights();
 
@@ -1053,9 +1114,8 @@ QuickOpenResultGridItem::QuickOpenResultGridItem() {
 
 void QuickOpenResultGridItem::set_content(const QuickOpenResultCandidate &p_candidate, bool p_highlight) {
 	thumbnail->set_texture(p_candidate.thumbnail);
-	const String file_path = ResourceUID::ensure_path(p_candidate.file_path);
-	name->set_text(file_path.get_file());
-	name->set_tooltip_text(file_path);
+	name->set_text(p_candidate.file_path.get_file());
+	name->set_tooltip_text(p_candidate.file_path);
 	name->reset_highlights();
 
 	if (p_highlight && p_candidate.result != nullptr) {
diff --git a/engine/editor/gui/editor_quick_open_dialog.h b/engine/editor/gui/editor_quick_open_dialog.h
index a5f396d7..a730e792 100644
--- a/engine/editor/gui/editor_quick_open_dialog.h
+++ b/engine/editor/gui/editor_quick_open_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_QUICK_OPEN_DIALOG_H
-#define EDITOR_QUICK_OPEN_DIALOG_H
+#pragma once
 
 #include "core/templates/oa_hash_map.h"
 #include "scene/gui/dialogs.h"
@@ -107,7 +106,6 @@ protected:
 	void _notification(int p_what);
 
 private:
-	static constexpr int SHOW_ALL_FILES_THRESHOLD = 30;
 	static constexpr int MAX_HISTORY_SIZE = 20;
 
 	Vector<FuzzySearchResult> search_results;
@@ -117,13 +115,13 @@ private:
 	Vector<QuickOpenResultCandidate> candidates;
 
 	OAHashMap<StringName, Vector<QuickOpenResultCandidate>> selected_history;
+	HashSet<String> history_set;
 
 	String query;
 	int selection_index = -1;
 	int num_visible_results = 0;
 	int max_total_results = 0;
 
-	bool showing_history = false;
 	bool never_opened = true;
 	Ref<ConfigFile> history_file;
 
@@ -149,9 +147,11 @@ private:
 	static QuickOpenDisplayMode get_adaptive_display_mode(const Vector<StringName> &p_base_types);
 
 	void _ensure_result_vector_capacity();
+	void _sort_filepaths(int p_max_results);
 	void _create_initial_results();
 	void _find_filepaths_in_folder(EditorFileSystemDirectory *p_directory, bool p_include_addons);
 
+	Vector<QuickOpenResultCandidate> *_get_history();
 	void _setup_candidate(QuickOpenResultCandidate &p_candidate, const String &p_filepath);
 	void _setup_candidate(QuickOpenResultCandidate &p_candidate, const FuzzySearchResult &p_result);
 	void _update_fuzzy_search_results();
@@ -268,5 +268,3 @@ private:
 
 	void _search_box_text_changed(const String &p_query);
 };
-
-#endif // EDITOR_QUICK_OPEN_DIALOG_H
diff --git a/engine/editor/gui/editor_run_bar.cpp b/engine/editor/gui/editor_run_bar.cpp
index 288ea96b..7b71a376 100644
--- a/engine/editor/gui/editor_run_bar.cpp
+++ b/engine/editor/gui/editor_run_bar.cpp
@@ -47,9 +47,9 @@
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel_container.h"
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 #include "servers/xr_server.h"
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 EditorRunBar *EditorRunBar::singleton = nullptr;
 
@@ -218,6 +218,10 @@ void EditorRunBar::_run_scene(const String &p_scene_path, const Vector<String> &
 		return;
 	}
 
+	if (!EditorNode::get_singleton()->validate_custom_directory()) {
+		return;
+	}
+
 	_reset_play_buttons();
 
 	String write_movie_file;
@@ -255,7 +259,7 @@ void EditorRunBar::_run_scene(const String &p_scene_path, const Vector<String> &
 	String run_filename;
 	switch (current_mode) {
 		case RUN_CUSTOM: {
-			run_filename = p_scene_path;
+			run_filename = ResourceUID::ensure_path(p_scene_path);
 			run_custom_filename = run_filename;
 		} break;
 
@@ -530,6 +534,7 @@ EditorRunBar::EditorRunBar() {
 		recovery_mode_reload_button->set_theme_type_variation("RunBarButton");
 		recovery_mode_reload_button->set_focus_mode(Control::FOCUS_NONE);
 		recovery_mode_reload_button->set_tooltip_text(TTR("Disable recovery mode and reload the project."));
+		recovery_mode_reload_button->set_accessibility_name(TTRC("Disable Recovery Mode"));
 		recovery_mode_reload_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::recovery_mode_reload_project));
 
 		recovery_mode_panel = memnew(PanelContainer);
@@ -552,6 +557,7 @@ EditorRunBar::EditorRunBar() {
 	play_button->set_toggle_mode(true);
 	play_button->set_focus_mode(Control::FOCUS_NONE);
 	play_button->set_tooltip_text(TTRC("Run the project's default scene."));
+	play_button->set_accessibility_name(TTRC("Run Default Scene"));
 	play_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::play_main_scene).bind(false));
 
 	ED_SHORTCUT_AND_COMMAND("editor/run_project", TTRC("Run Project"), Key::F5);
@@ -564,6 +570,7 @@ EditorRunBar::EditorRunBar() {
 	pause_button->set_toggle_mode(true);
 	pause_button->set_focus_mode(Control::FOCUS_NONE);
 	pause_button->set_tooltip_text(TTRC("Pause the running project's execution for debugging."));
+	pause_button->set_accessibility_name(TTRC("Pause"));
 	pause_button->set_disabled(true);
 
 	ED_SHORTCUT("editor/pause_running_project", TTRC("Pause Running Project"), Key::F7);
@@ -575,6 +582,7 @@ EditorRunBar::EditorRunBar() {
 	stop_button->set_theme_type_variation("RunBarButton");
 	stop_button->set_focus_mode(Control::FOCUS_NONE);
 	stop_button->set_tooltip_text(TTRC("Stop the currently running project."));
+	stop_button->set_accessibility_name(TTRC("Stop"));
 	stop_button->set_disabled(true);
 	stop_button->connect(SceneStringName(pressed), callable_mp(this, &EditorRunBar::stop_playing));
 
@@ -587,7 +595,7 @@ EditorRunBar::EditorRunBar() {
 	run_native->connect("native_run", callable_mp(this, &EditorRunBar::_run_native));
 
 	bool add_play_xr_mode_options = false;
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	if (OS::get_singleton()->has_feature("xr_editor") &&
 			(XRServer::get_xr_mode() == XRServer::XRMODE_ON ||
 					(XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT && GLOBAL_GET("xr/openxr/enabled")))) {
@@ -596,7 +604,7 @@ EditorRunBar::EditorRunBar() {
 		// either regular mode or XR mode.
 		add_play_xr_mode_options = true;
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 	if (add_play_xr_mode_options) {
 		MenuButton *menu_button = memnew(MenuButton);
@@ -614,6 +622,7 @@ EditorRunBar::EditorRunBar() {
 	play_scene_button->set_theme_type_variation("RunBarButton");
 	play_scene_button->set_focus_mode(Control::FOCUS_NONE);
 	play_scene_button->set_tooltip_text(TTRC("Run the currently edited scene."));
+	play_scene_button->set_accessibility_name(TTRC("Run Edited Scene"));
 
 	ED_SHORTCUT_AND_COMMAND("editor/run_current_scene", TTRC("Run Current Scene"), Key::F6);
 	ED_SHORTCUT_OVERRIDE("editor/run_current_scene", "macos", KeyModifierMask::META | Key::R);
@@ -635,6 +644,7 @@ EditorRunBar::EditorRunBar() {
 	play_custom_scene_button->set_theme_type_variation("RunBarButton");
 	play_custom_scene_button->set_focus_mode(Control::FOCUS_NONE);
 	play_custom_scene_button->set_tooltip_text(TTRC("Run a specific scene."));
+	play_custom_scene_button->set_accessibility_name(TTRC("Run Specific Scene"));
 
 	ED_SHORTCUT_AND_COMMAND("editor/run_specific_scene", TTRC("Run Specific Scene"), KeyModifierMask::CTRL | KeyModifierMask::SHIFT | Key::F5);
 	ED_SHORTCUT_OVERRIDE("editor/run_specific_scene", "macos", KeyModifierMask::META | KeyModifierMask::SHIFT | Key::R);
@@ -650,5 +660,6 @@ EditorRunBar::EditorRunBar() {
 	write_movie_button->set_pressed(false);
 	write_movie_button->set_focus_mode(Control::FOCUS_NONE);
 	write_movie_button->set_tooltip_text(TTR("Enable Movie Maker mode.\nThe project will run at stable FPS and the visual and audio output will be recorded to a video file."));
+	write_movie_button->set_accessibility_name(TTRC("Enable Movie Maker Mode"));
 	write_movie_button->connect(SceneStringName(toggled), callable_mp(this, &EditorRunBar::_write_movie_toggled));
 }
diff --git a/engine/editor/gui/editor_run_bar.h b/engine/editor/gui/editor_run_bar.h
index 71aab8e5..5ee97abd 100644
--- a/engine/editor/gui/editor_run_bar.h
+++ b/engine/editor/gui/editor_run_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_RUN_BAR_H
-#define EDITOR_RUN_BAR_H
+#pragma once
 
 #include "editor/editor_run.h"
 #include "editor/export/editor_export.h"
@@ -132,5 +131,3 @@ public:
 
 	EditorRunBar();
 };
-
-#endif // EDITOR_RUN_BAR_H
diff --git a/engine/editor/gui/editor_scene_tabs.cpp b/engine/editor/gui/editor_scene_tabs.cpp
index 77d020f7..9393d531 100644
--- a/engine/editor/gui/editor_scene_tabs.cpp
+++ b/engine/editor/gui/editor_scene_tabs.cpp
@@ -67,6 +67,11 @@ void EditorSceneTabs::_notification(int p_what) {
 				_scene_tabs_resized();
 			}
 		} break;
+
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			_scene_tabs_resized();
+		} break;
 	}
 }
 
@@ -116,15 +121,10 @@ void EditorSceneTabs::_scene_tab_exit() {
 }
 
 void EditorSceneTabs::_scene_tab_input(const Ref<InputEvent> &p_input) {
-	int tab_id = scene_tabs->get_hovered_tab();
 	Ref<InputEventMouseButton> mb = p_input;
 
 	if (mb.is_valid()) {
-		if (tab_id >= 0) {
-			if (mb->get_button_index() == MouseButton::MIDDLE && mb->is_pressed()) {
-				_scene_tab_closed(tab_id);
-			}
-		} else if (mb->get_button_index() == MouseButton::LEFT && mb->is_double_click()) {
+		if (mb->get_button_index() == MouseButton::LEFT && mb->is_double_click()) {
 			int tab_buttons = 0;
 			if (scene_tabs->get_offset_buttons_visible()) {
 				tab_buttons = get_theme_icon(SNAME("increment"), SNAME("TabBar"))->get_width() + get_theme_icon(SNAME("decrement"), SNAME("TabBar"))->get_width();
@@ -203,7 +203,7 @@ void EditorSceneTabs::_update_context_menu() {
 		scene_tabs_context_menu->set_item_text(-1, TTR("Close Tab"));
 		scene_tabs_context_menu->add_shortcut(ED_GET_SHORTCUT("editor/reopen_closed_scene"), EditorNode::FILE_OPEN_PREV);
 		scene_tabs_context_menu->set_item_text(-1, TTR("Undo Close Tab"));
-		DISABLE_LAST_OPTION_IF(!EditorNode::get_singleton()->has_previous_scenes());
+		DISABLE_LAST_OPTION_IF(!EditorNode::get_singleton()->has_previous_closed_scenes());
 		scene_tabs_context_menu->add_item(TTR("Close Other Tabs"), SCENE_CLOSE_OTHERS);
 		DISABLE_LAST_OPTION_IF(EditorNode::get_editor_data().get_edited_scene_count() <= 1);
 		scene_tabs_context_menu->add_item(TTR("Close Tabs to the Right"), SCENE_CLOSE_RIGHT);
@@ -437,6 +437,7 @@ EditorSceneTabs::EditorSceneTabs() {
 	scene_tab_add = memnew(Button);
 	scene_tab_add->set_flat(true);
 	scene_tab_add->set_tooltip_text(TTR("Add a new scene."));
+	scene_tab_add->set_accessibility_name(TTRC("Add Scene"));
 	scene_tabs->add_child(scene_tab_add);
 	scene_tab_add->connect(SceneStringName(pressed), callable_mp(EditorNode::get_singleton(), &EditorNode::trigger_menu_option).bind(EditorNode::FILE_NEW_SCENE, false));
 
diff --git a/engine/editor/gui/editor_scene_tabs.h b/engine/editor/gui/editor_scene_tabs.h
index 7cb666f6..3b23aea7 100644
--- a/engine/editor/gui/editor_scene_tabs.h
+++ b/engine/editor/gui/editor_scene_tabs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCENE_TABS_H
-#define EDITOR_SCENE_TABS_H
+#pragma once
 
 #include "scene/gui/margin_container.h"
 
@@ -106,5 +105,3 @@ public:
 
 	EditorSceneTabs();
 };
-
-#endif // EDITOR_SCENE_TABS_H
diff --git a/engine/editor/gui/editor_spin_slider.cpp b/engine/editor/gui/editor_spin_slider.cpp
index a9d8e3ae..ec513d51 100644
--- a/engine/editor/gui/editor_spin_slider.cpp
+++ b/engine/editor/gui/editor_spin_slider.cpp
@@ -95,7 +95,7 @@ void EditorSpinSlider::gui_input(const Ref<InputEvent> &p_event) {
 			}
 			grabbing_spinner_dist_cache += diff_x * grabbing_spinner_speed;
 
-			if (!grabbing_spinner && ABS(grabbing_spinner_dist_cache) > 4 * grabbing_spinner_speed * EDSCALE) {
+			if (!grabbing_spinner && Math::abs(grabbing_spinner_dist_cache) > 4 * grabbing_spinner_speed * EDSCALE) {
 				Input::get_singleton()->set_mouse_mode(Input::MOUSE_MODE_CAPTURED);
 				grabbing_spinner = true;
 			}
@@ -187,9 +187,11 @@ void EditorSpinSlider::_grabber_gui_input(const Ref<InputEvent> &p_event) {
 			if (mb->get_button_index() == MouseButton::WHEEL_UP) {
 				set_value(get_value() + get_step());
 				mousewheel_over_grabber = true;
+				accept_event();
 			} else if (mb->get_button_index() == MouseButton::WHEEL_DOWN) {
 				set_value(get_value() - get_step());
 				mousewheel_over_grabber = true;
+				accept_event();
 			}
 		}
 	}
@@ -435,13 +437,11 @@ void EditorSpinSlider::_draw_spin_slider() {
 					grabber->set_texture(grabber_tex);
 				}
 
-				Vector2 scale = get_global_transform_with_canvas().get_scale();
-				grabber->set_scale(scale);
 				grabber->reset_size();
-				grabber->set_position((grabber_rect.get_center() - grabber->get_size() * 0.5) * scale);
+				grabber->set_position(grabber_rect.get_center() - grabber->get_size() * 0.5);
 
 				if (mousewheel_over_grabber) {
-					Input::get_singleton()->warp_mouse(grabber->get_position() + grabber_rect.size);
+					Input::get_singleton()->warp_mouse(grabber->get_global_position() + grabber_rect.size);
 				}
 
 				grabber_range = width;
@@ -457,6 +457,8 @@ void EditorSpinSlider::_notification(int p_what) {
 			_update_value_input_stylebox();
 		} break;
 
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_THEME_CHANGED: {
 			_update_value_input_stylebox();
 		} break;
@@ -566,8 +568,8 @@ void EditorSpinSlider::_evaluate_input_text() {
 	expr.instantiate();
 
 	// Convert commas ',' to dots '.' for French/German etc. keyboard layouts.
-	String text = value_input->get_text().replace(",", ".");
-	text = text.replace(";", ",");
+	String text = value_input->get_text().replace_char(',', '.');
+	text = text.replace_char(';', ',');
 	text = TS->parse_number(text);
 
 	Error err = expr->parse(text);
diff --git a/engine/editor/gui/editor_spin_slider.h b/engine/editor/gui/editor_spin_slider.h
index f3fe6e21..d6a4c171 100644
--- a/engine/editor/gui/editor_spin_slider.h
+++ b/engine/editor/gui/editor_spin_slider.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SPIN_SLIDER_H
-#define EDITOR_SPIN_SLIDER_H
+#pragma once
 
 #include "scene/gui/line_edit.h"
 #include "scene/gui/range.h"
@@ -131,5 +130,3 @@ public:
 	virtual Size2 get_minimum_size() const override;
 	EditorSpinSlider();
 };
-
-#endif // EDITOR_SPIN_SLIDER_H
diff --git a/engine/editor/gui/editor_title_bar.cpp b/engine/editor/gui/editor_title_bar.cpp
index ac6d991b..cf5cd49b 100644
--- a/engine/editor/gui/editor_title_bar.cpp
+++ b/engine/editor/gui/editor_title_bar.cpp
@@ -80,6 +80,53 @@ void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
 	}
 }
 
+void EditorTitleBar::set_center_control(Control *p_center_control) {
+	center_control = p_center_control;
+}
+
+Control *EditorTitleBar::get_center_control() const {
+	return center_control;
+}
+
+void EditorTitleBar::_notification(int p_what) {
+	if (!center_control || p_what != NOTIFICATION_SORT_CHILDREN) {
+		return;
+	}
+
+	Control *prev = nullptr;
+	Control *base = nullptr;
+	Control *next = nullptr;
+	for (int i = 0; i < get_child_count(); i++) {
+		Control *c = as_sortable_control(get_child(i));
+		if (!c) {
+			continue;
+		}
+		if (base) {
+			next = c;
+			break;
+		}
+		if (c != center_control) {
+			prev = c;
+			continue;
+		}
+		base = c;
+	}
+	if (base && prev && next) {
+		Size2i title_size = get_size();
+		Size2i c_size = base->get_combined_minimum_size();
+
+		int min_offset = prev->get_position().x + prev->get_combined_minimum_size().x;
+		int max_offset = next->get_position().x + next->get_size().x - next->get_combined_minimum_size().x - c_size.x;
+
+		int offset = (title_size.width - c_size.width) / 2;
+		offset = CLAMP(offset, min_offset, max_offset);
+
+		fit_child_in_rect(prev, Rect2i(prev->get_position().x, 0, offset - prev->get_position().x, title_size.height));
+		fit_child_in_rect(base, Rect2i(offset, 0, c_size.width, title_size.height));
+		fit_child_in_rect(next, Rect2i(offset + c_size.width, 0, next->get_position().x + next->get_size().x - (offset + c_size.width), title_size.height));
+	}
+}
+
 void EditorTitleBar::set_can_move_window(bool p_enabled) {
 	can_move = p_enabled;
 	set_process_input(can_move);
diff --git a/engine/editor/gui/editor_title_bar.h b/engine/editor/gui/editor_title_bar.h
index 13fd5d6c..0041c0fe 100644
--- a/engine/editor/gui/editor_title_bar.h
+++ b/engine/editor/gui/editor_title_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_TITLE_BAR_H
-#define EDITOR_TITLE_BAR_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/main/window.h"
@@ -40,14 +39,18 @@ class EditorTitleBar : public HBoxContainer {
 	Point2i click_pos;
 	bool moving = false;
 	bool can_move = false;
+	Control *center_control = nullptr;
 
 protected:
+	void _notification(int p_what);
+
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 	static void _bind_methods() {}
 
 public:
+	void set_center_control(Control *p_center_control);
+	Control *get_center_control() const;
+
 	void set_can_move_window(bool p_enabled);
 	bool get_can_move_window() const;
 };
-
-#endif // EDITOR_TITLE_BAR_H
diff --git a/engine/editor/gui/editor_toaster.cpp b/engine/editor/gui/editor_toaster.cpp
index a05f8f5d..e4707b40 100644
--- a/engine/editor/gui/editor_toaster.cpp
+++ b/engine/editor/gui/editor_toaster.cpp
@@ -374,11 +374,13 @@ Control *EditorToaster::popup(Control *p_control, Severity p_severity, double p_
 	// Add buttons.
 	if (p_time > 0.0) {
 		Button *copy_button = memnew(Button);
+		copy_button->set_accessibility_name(TTRC("Copy"));
 		copy_button->set_flat(true);
 		copy_button->connect(SceneStringName(pressed), callable_mp(this, &EditorToaster::copy).bind(panel));
 		hbox_container->add_child(copy_button);
 
 		Button *close_button = memnew(Button);
+		close_button->set_accessibility_name(TTRC("Close"));
 		close_button->set_flat(true);
 		close_button->connect(SceneStringName(pressed), callable_mp(this, &EditorToaster::instant_close).bind(panel));
 		hbox_container->add_child(close_button);
@@ -572,6 +574,7 @@ EditorToaster::EditorToaster() {
 
 	// Main button.
 	main_button = memnew(Button);
+	main_button->set_accessibility_name(TTRC("Notifications"));
 	main_button->set_tooltip_text(TTR("No notifications."));
 	main_button->set_modulate(Color(0.5, 0.5, 0.5));
 	main_button->set_disabled(true);
@@ -588,6 +591,7 @@ EditorToaster::EditorToaster() {
 	add_child(disable_notifications_panel);
 
 	disable_notifications_button = memnew(Button);
+	disable_notifications_button->set_accessibility_name(TTRC("Silence Notifications"));
 	disable_notifications_button->set_tooltip_text(TTR("Silence the notifications."));
 	disable_notifications_button->set_flat(true);
 	disable_notifications_button->connect(SceneStringName(pressed), callable_mp(this, &EditorToaster::_set_notifications_enabled).bind(false));
diff --git a/engine/editor/gui/editor_toaster.h b/engine/editor/gui/editor_toaster.h
index 467569f6..fda3be6f 100644
--- a/engine/editor/gui/editor_toaster.h
+++ b/engine/editor/gui/editor_toaster.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_TOASTER_H
-#define EDITOR_TOASTER_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 
@@ -125,5 +124,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(EditorToaster::Severity);
-
-#endif // EDITOR_TOASTER_H
diff --git a/engine/editor/gui/editor_validation_panel.h b/engine/editor/gui/editor_validation_panel.h
index c371795e..7538f582 100644
--- a/engine/editor/gui/editor_validation_panel.h
+++ b/engine/editor/gui/editor_validation_panel.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_VALIDATION_PANEL_H
-#define EDITOR_VALIDATION_PANEL_H
+#pragma once
 
 #include "scene/gui/panel_container.h"
 
@@ -84,5 +83,3 @@ public:
 
 	EditorValidationPanel();
 };
-
-#endif // EDITOR_VALIDATION_PANEL_H
diff --git a/engine/editor/gui/editor_version_button.cpp b/engine/editor/gui/editor_version_button.cpp
index 635d66f4..15f2d46a 100644
--- a/engine/editor/gui/editor_version_button.cpp
+++ b/engine/editor/gui/editor_version_button.cpp
@@ -37,20 +37,20 @@ String _get_version_string(EditorVersionButton::VersionFormat p_format) {
 	String main;
 	switch (p_format) {
 		case EditorVersionButton::FORMAT_BASIC: {
-			return VERSION_FULL_CONFIG;
+			return GODOT_VERSION_FULL_CONFIG;
 		} break;
 		case EditorVersionButton::FORMAT_WITH_BUILD: {
-			main = "v" VERSION_FULL_BUILD;
+			main = "v" GODOT_VERSION_FULL_BUILD;
 		} break;
 		case EditorVersionButton::FORMAT_WITH_NAME_AND_BUILD: {
-			main = VERSION_FULL_NAME;
+			main = GODOT_VERSION_FULL_NAME;
 		} break;
 		default: {
-			ERR_FAIL_V_MSG(VERSION_FULL_NAME, "Unexpected format: " + itos(p_format));
+			ERR_FAIL_V_MSG(GODOT_VERSION_FULL_NAME, "Unexpected format: " + itos(p_format));
 		} break;
 	}
 
-	String hash = VERSION_HASH;
+	String hash = GODOT_VERSION_HASH;
 	if (!hash.is_empty()) {
 		hash = vformat(" [%s]", hash.left(9));
 	}
@@ -76,8 +76,8 @@ EditorVersionButton::EditorVersionButton(VersionFormat p_format) {
 	set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
 
 	String build_date;
-	if (VERSION_TIMESTAMP > 0) {
-		build_date = Time::get_singleton()->get_datetime_string_from_unix_time(VERSION_TIMESTAMP, true) + " UTC";
+	if (GODOT_VERSION_TIMESTAMP > 0) {
+		build_date = Time::get_singleton()->get_datetime_string_from_unix_time(GODOT_VERSION_TIMESTAMP, true) + " UTC";
 	} else {
 		build_date = TTR("(unknown)");
 	}
diff --git a/engine/editor/gui/editor_version_button.h b/engine/editor/gui/editor_version_button.h
index 591c3d48..b6f0e90b 100644
--- a/engine/editor/gui/editor_version_button.h
+++ b/engine/editor/gui/editor_version_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_VERSION_BUTTON_H
-#define EDITOR_VERSION_BUTTON_H
+#pragma once
 
 #include "scene/gui/link_button.h"
 
@@ -57,5 +56,3 @@ protected:
 public:
 	EditorVersionButton(VersionFormat p_format);
 };
-
-#endif // EDITOR_VERSION_BUTTON_H
diff --git a/engine/editor/gui/editor_zoom_widget.cpp b/engine/editor/gui/editor_zoom_widget.cpp
index 085a8733..ccf1bd18 100644
--- a/engine/editor/gui/editor_zoom_widget.cpp
+++ b/engine/editor/gui/editor_zoom_widget.cpp
@@ -187,6 +187,7 @@ void EditorZoomWidget::set_shortcut_context(Node *p_node) const {
 EditorZoomWidget::EditorZoomWidget() {
 	// Zoom buttons
 	zoom_minus = memnew(Button);
+	zoom_minus->set_accessibility_name(TTRC("Zoom Out"));
 	zoom_minus->set_flat(true);
 	zoom_minus->set_shortcut(ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_minus", TTRC("Zoom Out"), { int32_t(KeyModifierMask::CMD_OR_CTRL | Key::MINUS), int32_t(KeyModifierMask::CMD_OR_CTRL | Key::KP_SUBTRACT) }));
 	zoom_minus->set_shortcut_context(this);
@@ -196,6 +197,7 @@ EditorZoomWidget::EditorZoomWidget() {
 
 	zoom_reset = memnew(Button);
 	zoom_reset->set_flat(true);
+	zoom_reset->set_accessibility_name(TTRC("Reset Zoom"));
 
 	Ref<StyleBoxEmpty> empty_stylebox = memnew(StyleBoxEmpty);
 	zoom_reset->add_theme_style_override(CoreStringName(normal), empty_stylebox);
@@ -216,6 +218,7 @@ EditorZoomWidget::EditorZoomWidget() {
 	zoom_reset->connect(SceneStringName(pressed), callable_mp(this, &EditorZoomWidget::_button_zoom_reset));
 
 	zoom_plus = memnew(Button);
+	zoom_plus->set_accessibility_name(TTRC("Zoom In"));
 	zoom_plus->set_flat(true);
 	zoom_plus->set_shortcut(ED_SHORTCUT_ARRAY("canvas_item_editor/zoom_plus", TTRC("Zoom In"), { int32_t(KeyModifierMask::CMD_OR_CTRL | Key::EQUAL), int32_t(KeyModifierMask::CMD_OR_CTRL | Key::KP_ADD) }));
 	zoom_plus->set_shortcut_context(this);
diff --git a/engine/editor/gui/editor_zoom_widget.h b/engine/editor/gui/editor_zoom_widget.h
index 6b2fe4d3..c1b2f2be 100644
--- a/engine/editor/gui/editor_zoom_widget.h
+++ b/engine/editor/gui/editor_zoom_widget.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_ZOOM_WIDGET_H
-#define EDITOR_ZOOM_WIDGET_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -67,5 +66,3 @@ public:
 	// Sets the shortcut context for the zoom buttons. By default their context is this EditorZoomWidget control.
 	void set_shortcut_context(Node *p_node) const;
 };
-
-#endif // EDITOR_ZOOM_WIDGET_H
diff --git a/engine/editor/gui/scene_tree_editor.cpp b/engine/editor/gui/scene_tree_editor.cpp
index 5aedd940..ed104a34 100644
--- a/engine/editor/gui/scene_tree_editor.cpp
+++ b/engine/editor/gui/scene_tree_editor.cpp
@@ -63,13 +63,13 @@ PackedStringArray SceneTreeEditor::_get_node_configuration_warnings(Node *p_node
 		if (node_2d) {
 			// Note: Warn for Node2D but not all CanvasItems, don't warn for Control nodes.
 			// Control nodes may have reasons to use a transformed root node like anchors.
-			if (!node_2d->get_transform().is_equal_approx(Transform2D())) {
+			if (!node_2d->get_position().is_zero_approx()) {
 				warnings.append(TTR("The root node of a scene is recommended to not be transformed, since instances of the scene will usually override this. Reset the transform and reload the scene to remove this warning."));
 			}
 		}
 		Node3D *node_3d = Object::cast_to<Node3D>(p_node);
 		if (node_3d) {
-			if (!node_3d->get_transform().is_equal_approx(Transform3D())) {
+			if (!node_3d->get_position().is_zero_approx()) {
 				warnings.append(TTR("The root node of a scene is recommended to not be transformed, since instances of the scene will usually override this. Reset the transform and reload the scene to remove this warning."));
 			}
 		}
@@ -77,6 +77,12 @@ PackedStringArray SceneTreeEditor::_get_node_configuration_warnings(Node *p_node
 	return warnings;
 }
 
+PackedStringArray SceneTreeEditor::_get_node_accessibility_configuration_warnings(Node *p_node) {
+	PackedStringArray warnings = p_node->get_accessibility_configuration_warnings();
+
+	return warnings;
+}
+
 void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_id, MouseButton p_button) {
 	if (p_button != MouseButton::LEFT) {
 		return;
@@ -112,7 +118,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
 	} else if (p_id == BUTTON_VISIBILITY) {
 		undo_redo->create_action(TTR("Toggle Visible"));
 		_toggle_visible(n);
-		List<Node *> selection = editor_selection->get_selected_node_list();
+		List<Node *> selection = editor_selection->get_top_selected_node_list();
 		if (selection.size() > 1 && selection.find(n) != nullptr) {
 			for (Node *nv : selection) {
 				ERR_FAIL_NULL(nv);
@@ -151,8 +157,10 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
 		}
 		undo_redo->commit_action();
 	} else if (p_id == BUTTON_WARNING) {
-		const PackedStringArray warnings = _get_node_configuration_warnings(n);
-
+		PackedStringArray warnings = _get_node_configuration_warnings(n);
+		if (accessibility_warnings) {
+			warnings.append_array(_get_node_accessibility_configuration_warnings(n));
+		}
 		if (warnings.is_empty()) {
 			return;
 		}
@@ -447,7 +455,7 @@ void SceneTreeEditor::_update_node(Node *p_node, TreeItem *p_item, bool p_part_o
 			_set_item_custom_color(p_item, accent);
 		}
 	} else if (p_part_of_subscene) {
-		if (valid_types.size() == 0) {
+		if (valid_types.is_empty()) {
 			_set_item_custom_color(p_item, get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
 		}
 	} else if (marked.has(p_node)) {
@@ -473,7 +481,11 @@ void SceneTreeEditor::_update_node(Node *p_node, TreeItem *p_item, bool p_part_o
 	}
 
 	if (can_rename) { // TODO Should be can edit..
-		const PackedStringArray warnings = _get_node_configuration_warnings(p_node);
+		PackedStringArray warnings = _get_node_configuration_warnings(p_node);
+		if (accessibility_warnings) {
+			warnings.append_array(_get_node_accessibility_configuration_warnings(p_node));
+		}
+
 		const int num_warnings = warnings.size();
 		if (num_warnings > 0) {
 			StringName warning_icon;
@@ -512,8 +524,7 @@ void SceneTreeEditor::_update_node(Node *p_node, TreeItem *p_item, bool p_part_o
 
 		String msg_temp;
 		if (num_connections >= 1) {
-			Array arr;
-			arr.push_back(num_connections);
+			Array arr = { num_connections };
 			msg_temp += TTRN("Node has one connection.", "Node has {num} connections.", num_connections).format(arr, "{num}");
 			if (num_groups >= 1) {
 				msg_temp += "\n";
@@ -1291,7 +1302,7 @@ void SceneTreeEditor::_cell_multi_selected(Object *p_object, int p_cell, bool p_
 
 void SceneTreeEditor::_tree_scroll_to_item(ObjectID p_item_id) {
 	ERR_FAIL_NULL(tree);
-	TreeItem *item = Object::cast_to<TreeItem>(ObjectDB::get_instance(p_item_id));
+	TreeItem *item = ObjectDB::get_instance<TreeItem>(p_item_id);
 	if (item) {
 		tree->scroll_to_item(item, true);
 	}
@@ -1840,7 +1851,7 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
 }
 
 bool SceneTreeEditor::_is_script_type(const StringName &p_type) const {
-	return (script_types->find(p_type));
+	return (script_types->has(p_type));
 }
 
 bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
@@ -1853,12 +1864,12 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
 		return false;
 	}
 
-	TreeItem *item = tree->get_item_at_position(p_point);
+	TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
 	if (!item) {
 		return false;
 	}
 
-	int section = tree->get_drop_section_at_position(p_point);
+	int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(item).position) : tree->get_drop_section_at_position(p_point);
 	if (section < -1 || (section == -1 && !item->get_parent())) {
 		return false;
 	}
@@ -1866,7 +1877,7 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
 	if (String(d["type"]) == "files") {
 		Vector<String> files = d["files"];
 
-		if (files.size() == 0) {
+		if (files.is_empty()) {
 			return false; // TODO Weird?
 		}
 
@@ -1942,11 +1953,11 @@ void SceneTreeEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data,
 		return;
 	}
 
-	TreeItem *item = tree->get_item_at_position(p_point);
+	TreeItem *item = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
 	if (!item) {
 		return;
 	}
-	int section = tree->get_drop_section_at_position(p_point);
+	int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(item).position) : tree->get_drop_section_at_position(p_point);
 	if (section < -1) {
 		return;
 	}
@@ -2036,6 +2047,13 @@ void SceneTreeEditor::set_hide_filtered_out_parents(bool p_hide, bool p_update_s
 	}
 }
 
+void SceneTreeEditor::set_accessibility_warnings(bool p_enable, bool p_update_settings) {
+	if (p_update_settings) {
+		EditorSettings::get_singleton()->set("docks/scene_tree/accessibility_warnings", p_enable);
+	}
+	accessibility_warnings = p_enable;
+}
+
 void SceneTreeEditor::set_connect_to_script_mode(bool p_enable) {
 	connect_to_script_mode = p_enable;
 	_update_tree();
@@ -2145,8 +2163,8 @@ SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_ope
 	ask_before_revoke_checkbox->set_tooltip_text(TTR("This dialog can also be enabled/disabled in the Editor Settings: Docks > Scene Tree > Ask Before Revoking Unique Name."));
 	vb->add_child(ask_before_revoke_checkbox);
 
-	script_types = memnew(List<StringName>);
-	ClassDB::get_inheriters_from_class("Script", script_types);
+	script_types = memnew(LocalVector<StringName>);
+	ClassDB::get_inheriters_from_class("Script", *script_types);
 }
 
 SceneTreeEditor::~SceneTreeEditor() {
@@ -2341,9 +2359,6 @@ SceneTreeDialog::SceneTreeDialog() {
 	tree->connect("node_selected", callable_mp(this, &SceneTreeDialog::_selected_changed));
 }
 
-SceneTreeDialog::~SceneTreeDialog() {
-}
-
 /******** CACHE *********/
 
 HashMap<Node *, SceneTreeEditor::CachedNode>::Iterator SceneTreeEditor::NodeCache::add(Node *p_node, TreeItem *p_item) {
diff --git a/engine/editor/gui/scene_tree_editor.h b/engine/editor/gui/scene_tree_editor.h
index d29c4df0..d7eda45d 100644
--- a/engine/editor/gui/scene_tree_editor.h
+++ b/engine/editor/gui/scene_tree_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_TREE_EDITOR_H
-#define SCENE_TREE_EDITOR_H
+#pragma once
 
 #include "scene/gui/check_box.h"
 #include "scene/gui/check_button.h"
@@ -128,6 +127,7 @@ class SceneTreeEditor : public Control {
 
 	bool auto_expand_selected = true;
 	bool hide_filtered_out_parents = false;
+	bool accessibility_warnings = false;
 	bool connect_to_script_mode = false;
 	bool connecting_signal = false;
 	bool update_when_invisible = true;
@@ -137,6 +137,7 @@ class SceneTreeEditor : public Control {
 	void _compute_hash(Node *p_node, uint64_t &hash);
 	void _reset();
 	PackedStringArray _get_node_configuration_warnings(Node *p_node);
+	PackedStringArray _get_node_accessibility_configuration_warnings(Node *p_node);
 
 	void _update_node_path(Node *p_node, bool p_recursive = true);
 	void _update_node_subtree(Node *p_node, TreeItem *p_parent, bool p_force = false);
@@ -213,7 +214,7 @@ class SceneTreeEditor : public Control {
 
 	Timer *update_timer = nullptr;
 
-	List<StringName> *script_types;
+	LocalVector<StringName> *script_types;
 	bool _is_script_type(const StringName &p_type) const;
 
 	Vector<StringName> valid_types;
@@ -249,6 +250,7 @@ public:
 
 	void set_auto_expand_selected(bool p_auto, bool p_update_settings);
 	void set_hide_filtered_out_parents(bool p_hide, bool p_update_settings);
+	void set_accessibility_warnings(bool p_enable, bool p_update_settings);
 	void set_connect_to_script_mode(bool p_enable);
 	void set_connecting_signal(bool p_enable);
 	void set_update_when_invisible(bool p_enable);
@@ -291,7 +293,4 @@ public:
 	LineEdit *get_filter_line_edit() { return filter; }
 
 	SceneTreeDialog();
-	~SceneTreeDialog();
 };
-
-#endif // SCENE_TREE_EDITOR_H
diff --git a/engine/editor/gui/touch_actions_panel.cpp b/engine/editor/gui/touch_actions_panel.cpp
new file mode 100644
index 00000000..bc6576e5
--- /dev/null
+++ b/engine/editor/gui/touch_actions_panel.cpp
@@ -0,0 +1,184 @@
+/**************************************************************************/
+/*  touch_actions_panel.cpp                                               */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "touch_actions_panel.h"
+
+#include "core/input/input.h"
+#include "editor/editor_settings.h"
+#include "editor/editor_string_names.h"
+#include "scene/gui/box_container.h"
+#include "scene/gui/button.h"
+#include "scene/gui/color_rect.h"
+#include "scene/gui/texture_rect.h"
+#include "scene/resources/style_box_flat.h"
+
+void TouchActionsPanel::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE: {
+			DisplayServer::get_singleton()->set_hardware_keyboard_connection_change_callback(callable_mp(this, &TouchActionsPanel::_hardware_keyboard_connected));
+			_hardware_keyboard_connected(DisplayServer::get_singleton()->has_hardware_keyboard());
+		} break;
+		case NOTIFICATION_THEME_CHANGED: {
+			drag_handle->set_texture(get_editor_theme_icon(SNAME("DragHandle")));
+			layout_toggle_button->set_button_icon(get_editor_theme_icon(SNAME("Orientation")));
+			lock_panel_button->set_button_icon(get_editor_theme_icon(SNAME("Lock")));
+			save_button->set_button_icon(get_editor_theme_icon(SNAME("Save")));
+			delete_button->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
+			undo_button->set_button_icon(get_editor_theme_icon(SNAME("UndoRedo")));
+			redo_button->set_button_icon(get_editor_theme_icon(SNAME("Redo")));
+		} break;
+	}
+}
+
+void TouchActionsPanel::_hardware_keyboard_connected(bool p_connected) {
+	set_visible(!p_connected);
+}
+
+void TouchActionsPanel::_simulate_editor_shortcut(const String &p_shortcut_name) {
+	Ref<Shortcut> shortcut = ED_GET_SHORTCUT(p_shortcut_name);
+
+	if (shortcut.is_valid() && !shortcut->get_events().is_empty()) {
+		Ref<InputEventKey> event = shortcut->get_events()[0];
+		if (event.is_valid()) {
+			event->set_pressed(true);
+			Input::get_singleton()->parse_input_event(event);
+		}
+	}
+}
+
+void TouchActionsPanel::_simulate_key_press(Key p_keycode) {
+	Ref<InputEventKey> event;
+	event.instantiate();
+	event->set_keycode(p_keycode);
+	event->set_pressed(true);
+	Input::get_singleton()->parse_input_event(event);
+}
+
+Button *TouchActionsPanel::_add_new_action_button(const String &p_shortcut, const String &p_name, Key p_keycode) {
+	Button *action_button = memnew(Button);
+	action_button->set_focus_mode(Control::FOCUS_NONE);
+	action_button->set_h_size_flags(Control::SIZE_SHRINK_CENTER);
+	action_button->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
+	action_button->set_accessibility_name(p_name);
+	if (p_keycode == Key::NONE) {
+		action_button->connect(SceneStringName(pressed), callable_mp(this, &TouchActionsPanel::_simulate_editor_shortcut).bind(p_shortcut));
+	} else {
+		action_button->connect(SceneStringName(pressed), callable_mp(this, &TouchActionsPanel::_simulate_key_press).bind(p_keycode));
+	}
+	box->add_child(action_button);
+	return action_button;
+}
+
+void TouchActionsPanel::_on_drag_handle_gui_input(const Ref<InputEvent> &p_event) {
+	if (lock_panel_position) {
+		return;
+	}
+	Ref<InputEventMouseButton> mouse_button_event = p_event;
+	if (mouse_button_event.is_valid() && mouse_button_event->get_button_index() == MouseButton::LEFT) {
+		if (mouse_button_event->is_pressed()) {
+			dragging = true;
+			drag_offset = mouse_button_event->get_position();
+		} else {
+			dragging = false;
+		}
+	}
+
+	Ref<InputEventMouseMotion> mouse_motion_event = p_event;
+	if (dragging && mouse_motion_event.is_valid()) {
+		Vector2 new_position = get_position() + mouse_motion_event->get_relative();
+		const float margin = 25.0;
+		Vector2 parent_size = get_parent_area_size();
+		Vector2 panel_size = get_size();
+		new_position = new_position.clamp(Vector2(margin, margin), parent_size - panel_size - Vector2(margin, margin));
+		set_position(new_position);
+	}
+}
+
+void TouchActionsPanel::_switch_layout() {
+	box->set_vertical(!box->is_vertical());
+	reset_size();
+}
+
+void TouchActionsPanel::_lock_panel_toggled(bool p_pressed) {
+	lock_panel_position = p_pressed;
+	layout_toggle_button->set_disabled(p_pressed);
+}
+
+TouchActionsPanel::TouchActionsPanel() {
+	Ref<StyleBoxFlat> panel_style;
+	panel_style.instantiate();
+	panel_style->set_bg_color(Color(0.1, 0.1, 0.1, 1));
+	panel_style->set_border_color(Color(0.3, 0.3, 0.3, 1));
+	panel_style->set_border_width_all(3);
+	panel_style->set_corner_radius_all(10);
+	panel_style->set_content_margin_all(12);
+	add_theme_style_override(SceneStringName(panel), panel_style);
+
+	set_anchors_and_offsets_preset(Control::PRESET_CENTER_BOTTOM, Control::PRESET_MODE_MINSIZE, 80);
+
+	box = memnew(BoxContainer);
+	box->set_alignment(BoxContainer::ALIGNMENT_CENTER);
+	box->add_theme_constant_override("separation", 15);
+	add_child(box);
+
+	drag_handle = memnew(TextureRect);
+	drag_handle->set_custom_minimum_size(Size2(40, 40));
+	drag_handle->set_stretch_mode(TextureRect::STRETCH_KEEP_CENTERED);
+	drag_handle->connect(SceneStringName(gui_input), callable_mp(this, &TouchActionsPanel::_on_drag_handle_gui_input));
+	box->add_child(drag_handle);
+
+	layout_toggle_button = memnew(Button);
+	layout_toggle_button->set_accessibility_name(TTRC("Switch Layout"));
+	layout_toggle_button->set_focus_mode(Control::FOCUS_NONE);
+	layout_toggle_button->set_h_size_flags(Control::SIZE_SHRINK_CENTER);
+	layout_toggle_button->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
+	layout_toggle_button->connect(SceneStringName(pressed), callable_mp(this, &TouchActionsPanel::_switch_layout));
+	box->add_child(layout_toggle_button);
+
+	lock_panel_button = memnew(Button);
+	lock_panel_button->set_toggle_mode(true);
+	lock_panel_button->set_accessibility_name(TTRC("Lock Panel"));
+	lock_panel_button->set_focus_mode(Control::FOCUS_NONE);
+	lock_panel_button->set_h_size_flags(Control::SIZE_SHRINK_CENTER);
+	lock_panel_button->set_v_size_flags(Control::SIZE_SHRINK_CENTER);
+	lock_panel_button->connect(SceneStringName(toggled), callable_mp(this, &TouchActionsPanel::_lock_panel_toggled));
+	box->add_child(lock_panel_button);
+
+	ColorRect *separator = memnew(ColorRect);
+	separator->set_color(Color(0.5, 0.5, 0.5));
+	separator->set_custom_minimum_size(Size2(2, 2));
+	box->add_child(separator);
+
+	// Add action buttons.
+	save_button = _add_new_action_button("editor/save_scene", TTR("Save"));
+	delete_button = _add_new_action_button("", TTR("Delete"), Key::KEY_DELETE);
+	undo_button = _add_new_action_button("ui_undo", TTR("Undo"));
+	redo_button = _add_new_action_button("ui_redo", TTR("Redo"));
+}
diff --git a/engine/editor/gui/touch_actions_panel.h b/engine/editor/gui/touch_actions_panel.h
new file mode 100644
index 00000000..8fde9f8a
--- /dev/null
+++ b/engine/editor/gui/touch_actions_panel.h
@@ -0,0 +1,70 @@
+/**************************************************************************/
+/*  touch_actions_panel.h                                                 */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "scene/gui/panel_container.h"
+
+class BoxContainer;
+class Button;
+class TextureRect;
+
+class TouchActionsPanel : public PanelContainer {
+	GDCLASS(TouchActionsPanel, PanelContainer);
+
+private:
+	BoxContainer *box = nullptr;
+	Button *save_button = nullptr;
+	Button *delete_button = nullptr;
+	Button *undo_button = nullptr;
+	Button *redo_button = nullptr;
+
+	TextureRect *drag_handle = nullptr;
+	Button *layout_toggle_button = nullptr;
+	Button *lock_panel_button = nullptr;
+
+	bool lock_panel_position = false;
+	bool dragging = false;
+	Vector2 drag_offset;
+
+	void _notification(int p_what);
+
+	void _simulate_editor_shortcut(const String &p_shortcut_name);
+	void _simulate_key_press(Key p_keycode);
+	void _on_drag_handle_gui_input(const Ref<InputEvent> &p_event);
+	void _switch_layout();
+	void _lock_panel_toggled(bool p_pressed);
+	Button *_add_new_action_button(const String &p_shortcut, const String &p_name, Key p_keycode = Key::NONE);
+
+	void _hardware_keyboard_connected(bool p_connected);
+
+public:
+	TouchActionsPanel();
+};
diff --git a/engine/editor/history_dock.cpp b/engine/editor/history_dock.cpp
index 906f71f9..e29ff2fa 100644
--- a/engine/editor/history_dock.cpp
+++ b/engine/editor/history_dock.cpp
@@ -58,7 +58,8 @@ void HistoryDock::refresh_history() {
 	bool include_global = global_history_checkbox->is_pressed();
 
 	if (!include_scene && !include_global) {
-		action_list->add_item(TTR("The Beginning"));
+		action_list->add_item(TTRC("The Beginning"));
+		action_list->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_ALWAYS);
 		return;
 	}
 
@@ -107,7 +108,8 @@ void HistoryDock::refresh_history() {
 		}
 	}
 
-	action_list->add_item(TTR("The Beginning"));
+	action_list->add_item(TTRC("The Beginning"));
+	action_list->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_ALWAYS);
 	refresh_version();
 }
 
@@ -250,7 +252,7 @@ HistoryDock::HistoryDock() {
 	current_scene_checkbox = memnew(CheckBox);
 	mode_hb->add_child(current_scene_checkbox);
 	current_scene_checkbox->set_flat(true);
-	current_scene_checkbox->set_text(TTR("Scene"));
+	current_scene_checkbox->set_text(TTRC("Scene"));
 	current_scene_checkbox->set_h_size_flags(SIZE_EXPAND_FILL);
 	current_scene_checkbox->set_clip_text(true);
 	current_scene_checkbox->set_pressed(true);
@@ -259,7 +261,7 @@ HistoryDock::HistoryDock() {
 	global_history_checkbox = memnew(CheckBox);
 	mode_hb->add_child(global_history_checkbox);
 	global_history_checkbox->set_flat(true);
-	global_history_checkbox->set_text(TTR("Global"));
+	global_history_checkbox->set_text(TTRC("Global"));
 	global_history_checkbox->set_h_size_flags(SIZE_EXPAND_FILL);
 	global_history_checkbox->set_clip_text(true);
 	global_history_checkbox->set_pressed(true);
diff --git a/engine/editor/history_dock.h b/engine/editor/history_dock.h
index 00afbafb..4f435d16 100644
--- a/engine/editor/history_dock.h
+++ b/engine/editor/history_dock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HISTORY_DOCK_H
-#define HISTORY_DOCK_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 
@@ -67,5 +66,3 @@ public:
 
 	HistoryDock();
 };
-
-#endif // HISTORY_DOCK_H
diff --git a/engine/editor/icons/2D.svg b/engine/editor/icons/2D.svg
index ca67a538..32c22c25 100644
--- a/engine/editor/icons/2D.svg
+++ b/engine/editor/icons/2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3.308 15-2-2a1 1 0 0 1 1.414-1.414l.293.293V3.293h8.586L11.308 3a1 1 0 0 1 1.415-1.414l2 2a1 1 0 0 1 0 1.414l-2 2a1 1 0 0 1-1.415-1.414l.293-.293H5.015v6.586l.294-.293A1 1 0 0 1 6.723 13l-2 2a1 1 0 0 1-1.414 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3.308 15-2-2a1 1 0 0 1 1.414-1.414l.293.293V3.293h8.586L11.308 3a1 1 0 0 1 1.415-1.414l2 2a1 1 0 0 1 0 1.414l-2 2a1 1 0 0 1-1.415-1.414l.293-.293H5.015v6.586l.294-.293A1 1 0 0 1 6.723 13l-2 2a1 1 0 0 1-1.414 0z"/></svg>
diff --git a/engine/editor/icons/2DNodes.svg b/engine/editor/icons/2DNodes.svg
index 90b92a4b..2bf2fbc6 100644
--- a/engine/editor/icons/2DNodes.svg
+++ b/engine/editor/icons/2DNodes.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-width="2" d="M 8,13 C 5.2385763,13 3,10.761424 3,8 3,5.2385763 5.2385763,3 8,3"/><path fill="none" stroke="#8eef97" stroke-width="2" d="m 8,13 c 2.761424,0 5,-2.238576 5,-5 C 13,5.2385763 10.761424,3 8,3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-width="2" d="M 8,13 C 5.2385763,13 3,10.761424 3,8 3,5.2385763 5.2385763,3 8,3"/><path fill="none" stroke="#8eef97" stroke-width="2" d="m 8,13 c 2.761424,0 5,-2.238576 5,-5 C 13,5.2385763 10.761424,3 8,3"/></svg>
diff --git a/engine/editor/icons/3D.svg b/engine/editor/icons/3D.svg
index 6b82223b..130df990 100644
--- a/engine/editor/icons/3D.svg
+++ b/engine/editor/icons/3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3.309 1.291-2 2a1 1 0 0 0 1.414 1.414l.293-.293v8.586h8.586l-.293.293a1 1 0 0 0 1.414 1.414l2-2a1 1 0 0 0 0-1.414l-2-2a1 1 0 0 0-1.414 1.414l.293.293H6.43l5.586-5.586v.416a1 1 0 0 0 2 0v-2.83a1 1 0 0 0-1-1h-2.83a1 1 0 0 0 0 2h.416L5.016 9.584V4.412l.293.293a1 1 0 0 0 1.414-1.414l-2-2a1 1 0 0 0-1.414 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3.309 1.291-2 2a1 1 0 0 0 1.414 1.414l.293-.293v8.586h8.586l-.293.293a1 1 0 0 0 1.414 1.414l2-2a1 1 0 0 0 0-1.414l-2-2a1 1 0 0 0-1.414 1.414l.293.293H6.43l5.586-5.586v.416a1 1 0 0 0 2 0v-2.83a1 1 0 0 0-1-1h-2.83a1 1 0 0 0 0 2h.416L5.016 9.584V4.412l.293.293a1 1 0 0 0 1.414-1.414l-2-2a1 1 0 0 0-1.414 0z"/></svg>
diff --git a/engine/editor/icons/AABB.svg b/engine/editor/icons/AABB.svg
index 01866f5e..a624e6c2 100644
--- a/engine/editor/icons/AABB.svg
+++ b/engine/editor/icons/AABB.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ee5677" d="M5 1a3 3 0 0 0-2.223 5.012A3 3 0 0 0 3 12h2V7h2V1H5zm6 0v5.174A3 3 0 0 0 10 6V4H8v8h2a3 3 0 0 0 3-3 3 3 0 0 0 0-6V1h-2zM5 3v2a1 1 0 0 1 0-2zm8 2a1 1 0 0 1 0 2zM3 8v2a1 1 0 0 1 0-2zm7 0a1 1 0 0 1 0 2z"/><path fill="#fff" fill-opacity=".235" d="M8 4v8h2a3 3 0 0 0 0-6V4zM3 6a3 3 0 0 0 0 6h2V6zm0 2v2a1 1 0 0 1 0-2zm7 0a1 1 0 0 1 0 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ee5677" d="M5 1a3 3 0 0 0-2.223 5.012A3 3 0 0 0 3 12h2V7h2V1H5zm6 0v5.174A3 3 0 0 0 10 6V4H8v8h2a3 3 0 0 0 3-3 3 3 0 0 0 0-6V1h-2zM5 3v2a1 1 0 0 1 0-2zm8 2a1 1 0 0 1 0 2zM3 8v2a1 1 0 0 1 0-2zm7 0a1 1 0 0 1 0 2z"/><path fill="#fff" fill-opacity=".235" d="M8 4v8h2a3 3 0 0 0 0-6V4zM3 6a3 3 0 0 0 0 6h2V6zm0 2v2a1 1 0 0 1 0-2zm7 0a1 1 0 0 1 0 2z"/></svg>
diff --git a/engine/editor/icons/AcceptDialog.svg b/engine/editor/icons/AcceptDialog.svg
index 83b42102..019d4c88 100644
--- a/engine/editor/icons/AcceptDialog.svg
+++ b/engine/editor/icons/AcceptDialog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm9.475 1.637 1.414 1.414L6.939 13l-2.828-2.828 1.414-1.414 1.415 1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm9.475 1.637 1.414 1.414L6.939 13l-2.828-2.828 1.414-1.414 1.415 1.414z"/></svg>
diff --git a/engine/editor/icons/ActionCopy.svg b/engine/editor/icons/ActionCopy.svg
index 909c6c10..96e5b2bd 100644
--- a/engine/editor/icons/ActionCopy.svg
+++ b/engine/editor/icons/ActionCopy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h1V3h9V2a1 1 0 0 0-1-1zm3 3a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm1 2h7v7H6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h1V3h9V2a1 1 0 0 0-1-1zm3 3a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h9a1 1 0 0 0 1-1V5a1 1 0 0 0-1-1zm1 2h7v7H6z"/></svg>
diff --git a/engine/editor/icons/ActionCut.svg b/engine/editor/icons/ActionCut.svg
index 5ea64e7f..29c33ea4 100644
--- a/engine/editor/icons/ActionCut.svg
+++ b/engine/editor/icons/ActionCut.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3.635.51C.67 3.376 4.17 9.439 6.402 9.305l.442.765-.565.979a3 3 0 1 0 .315 3.449L8 11.998l1.406 2.5a3 3 0 1 0 .315-3.45l-.567-.982.442-.765c2.232.134 5.731-5.93 2.767-8.795L8 8zM4 12a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm8 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3.635.51C.67 3.376 4.17 9.439 6.402 9.305l.442.765-.565.979a3 3 0 1 0 .315 3.449L8 11.998l1.406 2.5a3 3 0 1 0 .315-3.45l-.567-.982.442-.765c2.232.134 5.731-5.93 2.767-8.795L8 8zM4 12a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm8 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/ActionPaste.svg b/engine/editor/icons/ActionPaste.svg
index 4ac0c251..9e4af8cb 100644
--- a/engine/editor/icons/ActionPaste.svg
+++ b/engine/editor/icons/ActionPaste.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1h-3.184a3 3 0 0 0-5.632 0zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM3 5h2v2h6V5h2v8H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1h-3.184a3 3 0 0 0-5.632 0zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM3 5h2v2h6V5h2v8H3z"/></svg>
diff --git a/engine/editor/icons/Add.svg b/engine/editor/icons/Add.svg
index eaeb0435..d860ce85 100644
--- a/engine/editor/icons/Add.svg
+++ b/engine/editor/icons/Add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z"/></svg>
diff --git a/engine/editor/icons/Anchor.svg b/engine/editor/icons/Anchor.svg
index 30470ca4..16f19071 100644
--- a/engine/editor/icons/Anchor.svg
+++ b/engine/editor/icons/Anchor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 7H5v2h2v3.898a5 5 0 0 1-3.828-3.603l-1.934.518a7 7 0 0 0 13.524 0l-1.938-.52A5 5 0 0 1 9 12.896V9h2V7H9v-.176a3 3 0 1 0-2 0zm1-4a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 7H5v2h2v3.898a5 5 0 0 1-3.828-3.603l-1.934.518a7 7 0 0 0 13.524 0l-1.938-.52A5 5 0 0 1 9 12.896V9h2V7H9v-.176a3 3 0 1 0-2 0zm1-4a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/AnimatableBody2D.svg b/engine/editor/icons/AnimatableBody2D.svg
index 5dcf707d..b84c5219 100644
--- a/engine/editor/icons/AnimatableBody2D.svg
+++ b/engine/editor/icons/AnimatableBody2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M11 4h2v2h-2zm0 7h2v2h-2zm-7 0h2v2H4z"/><g fill="none" stroke="#8da5f3" stroke-linecap="round"><path d="M2.5 8v5A1.5 1.5 0 0 0 4 14.5h9a1.5 1.5 0 0 0 1.5-1.5V4A1.5 1.5 0 0 0 13 2.5H8"/><path stroke-width="1.5" d="m2 2 6 6M7 1.75l2 2M1.75 7l2 2"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M11 4h2v2h-2zm0 7h2v2h-2zm-7 0h2v2H4z"/><g fill="none" stroke="#8da5f3" stroke-linecap="round"><path d="M2.5 8v5A1.5 1.5 0 0 0 4 14.5h9a1.5 1.5 0 0 0 1.5-1.5V4A1.5 1.5 0 0 0 13 2.5H8"/><path stroke-width="1.5" d="m2 2 6 6M7 1.75l2 2M1.75 7l2 2"/></g></svg>
diff --git a/engine/editor/icons/AnimatableBody3D.svg b/engine/editor/icons/AnimatableBody3D.svg
index df08da84..5cb5b33a 100644
--- a/engine/editor/icons/AnimatableBody3D.svg
+++ b/engine/editor/icons/AnimatableBody3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M11 4h2v2h-2zm0 7h2v2h-2zm-7 0h2v2H4z"/><g fill="none" stroke="#fc7f7f" stroke-linecap="round"><path d="M2.5 8v5A1.5 1.5 0 0 0 4 14.5h9a1.5 1.5 0 0 0 1.5-1.5V4A1.5 1.5 0 0 0 13 2.5H8"/><path stroke-width="1.5" d="m2 2 6 6M7 1.75l2 2M1.75 7l2 2"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M11 4h2v2h-2zm0 7h2v2h-2zm-7 0h2v2H4z"/><g fill="none" stroke="#fc7f7f" stroke-linecap="round"><path d="M2.5 8v5A1.5 1.5 0 0 0 4 14.5h9a1.5 1.5 0 0 0 1.5-1.5V4A1.5 1.5 0 0 0 13 2.5H8"/><path stroke-width="1.5" d="m2 2 6 6M7 1.75l2 2M1.75 7l2 2"/></g></svg>
diff --git a/engine/editor/icons/AnimatedSprite2D.svg b/engine/editor/icons/AnimatedSprite2D.svg
index 1cc68f4a..fe8a9ffe 100644
--- a/engine/editor/icons/AnimatedSprite2D.svg
+++ b/engine/editor/icons/AnimatedSprite2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#8da5f3"><path fill-opacity=".4" d="M7 0a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/><path fill-opacity=".6" d="M5 2a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v7a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z"/><path d="M3 4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h7a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zM2 9a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm7 0a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm0 3a2.5 2 0 0 1-5 0z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#8da5f3"><path fill-opacity=".4" d="M7 0a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/><path fill-opacity=".6" d="M5 2a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v7a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z"/><path d="M3 4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h7a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zM2 9a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm7 0a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm0 3a2.5 2 0 0 1-5 0z"/></g></svg>
diff --git a/engine/editor/icons/AnimatedSprite3D.svg b/engine/editor/icons/AnimatedSprite3D.svg
index 7c6f6358..1e1bbe55 100644
--- a/engine/editor/icons/AnimatedSprite3D.svg
+++ b/engine/editor/icons/AnimatedSprite3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path fill-opacity=".4" d="M7 0a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/><path fill-opacity=".6" d="M5 2a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v7a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z"/><path d="M3 4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h7a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zM2 9a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm7 0a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm0 3a2.5 2 0 0 1-5 0z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path fill-opacity=".4" d="M7 0a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/><path fill-opacity=".6" d="M5 2a2 2 0 0 0-2 2h7a2 2 0 0 1 2 2v7a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2z"/><path d="M3 4a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h7a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2zM2 9a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm7 0a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm0 3a2.5 2 0 0 1-5 0z"/></g></svg>
diff --git a/engine/editor/icons/AnimatedTexture.svg b/engine/editor/icons/AnimatedTexture.svg
index e0b1c626..389beba1 100644
--- a/engine/editor/icons/AnimatedTexture.svg
+++ b/engine/editor/icons/AnimatedTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm1 4h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm1 4h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/Animation.svg b/engine/editor/icons/Animation.svg
index fac7cc81..201f87b1 100644
--- a/engine/editor/icons/Animation.svg
+++ b/engine/editor/icons/Animation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 14a2 2 0 0 0 2 2h1v-2h-.5a.5.5 0 0 1-.5-.5V8a6 6 0 1 0-2 4.465zM8 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm3.441 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM4.488 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm.024 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6.904 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM8 11a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 14a2 2 0 0 0 2 2h1v-2h-.5a.5.5 0 0 1-.5-.5V8a6 6 0 1 0-2 4.465zM8 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm3.441 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM4.488 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm.024 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6.904 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM8 11a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/AnimationAutoFit.svg b/engine/editor/icons/AnimationAutoFit.svg
index 7162c751..bb7c9109 100644
--- a/engine/editor/icons/AnimationAutoFit.svg
+++ b/engine/editor/icons/AnimationAutoFit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m15.477 0.99862v14h-2.1017v-14zm-14.954 14.003v-14h2.1017v14zm11.946-6.823-3.5-3v6zm-8.9343 0.023985 3.5 3v-2h2.1464l0.00376-2h-2.1501v-2zm4.6005-7.0028c8.9077 15.09 8.9077 15.09 0 0zm-0.23085 14.003c-8.9077-15.09-8.9077-15.09 0 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m15.477 0.99862v14h-2.1017v-14zm-14.954 14.003v-14h2.1017v14zm11.946-6.823-3.5-3v6zm-8.9343 0.023985 3.5 3v-2h2.1464l0.00376-2h-2.1501v-2zm4.6005-7.0028c8.9077 15.09 8.9077 15.09 0 0zm-0.23085 14.003c-8.9077-15.09-8.9077-15.09 0 0z"/></svg>
diff --git a/engine/editor/icons/AnimationAutoFitBezier.svg b/engine/editor/icons/AnimationAutoFitBezier.svg
index acddd680..b9feaa10 100644
--- a/engine/editor/icons/AnimationAutoFitBezier.svg
+++ b/engine/editor/icons/AnimationAutoFitBezier.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m12.469 8.1784-3.5-3v6zm-8.9343 0.023985 3.5 3v-2h2.1464l0.00376-2h-2.1501v-2zm9.4532 0.53338c-10.763 8.9077-10.763 8.9077 0 0zm0 7h-9.9859v-2h9.9859zm-9.9806-8.5564c10.763-8.9077 10.763-8.9077 0 0zm0-7h9.9859v2h-9.9859zm5.4684 2.8277c8.9077 10.763 8.9077 10.763 0 0zm7 0v9.9859h-2v-9.9859zm-7.8862 9.9859c-8.9077-10.763-8.9077-10.763 0 0zm-7 0v-9.9859h2v9.9859z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m12.469 8.1784-3.5-3v6zm-8.9343 0.023985 3.5 3v-2h2.1464l0.00376-2h-2.1501v-2zm9.4532 0.53338c-10.763 8.9077-10.763 8.9077 0 0zm0 7h-9.9859v-2h9.9859zm-9.9806-8.5564c10.763-8.9077 10.763-8.9077 0 0zm0-7h9.9859v2h-9.9859zm5.4684 2.8277c8.9077 10.763 8.9077 10.763 0 0zm7 0v9.9859h-2v-9.9859zm-7.8862 9.9859c-8.9077-10.763-8.9077-10.763 0 0zm-7 0v-9.9859h2v9.9859z"/></svg>
diff --git a/engine/editor/icons/AnimationFilter.svg b/engine/editor/icons/AnimationFilter.svg
index bc9bec54..a2a04f08 100644
--- a/engine/editor/icons/AnimationFilter.svg
+++ b/engine/editor/icons/AnimationFilter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14.783 1.55H1.77a.454.454 0 0 0-.318.779l4.615 4.507v7.086a.45.45 0 0 0 .738.354l3.511-2.812a.454.454 0 0 0 .17-.354V6.836L15.1 2.33a.454.454 0 0 0-.317-.779z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14.783 1.55H1.77a.454.454 0 0 0-.318.779l4.615 4.507v7.086a.45.45 0 0 0 .738.354l3.511-2.812a.454.454 0 0 0 .17-.354V6.836L15.1 2.33a.454.454 0 0 0-.317-.779z"/></svg>
diff --git a/engine/editor/icons/AnimationLibrary.svg b/engine/editor/icons/AnimationLibrary.svg
index 5e021931..8d331e23 100644
--- a/engine/editor/icons/AnimationLibrary.svg
+++ b/engine/editor/icons/AnimationLibrary.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14.5 2a6 6 0 0 0 0 12v-1.01a1 1 0 0 1 0-2v-6a1 1 0 0 1 0-2zM11 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm0 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm0-7a6 6 0 0 0 0 12 6 6 0 0 1-2.95-3.133A1 1 0 1 1 7.53 9a6 6 0 0 1 0-2 1 1 0 1 1 .52-1.867A5.795 6.506 0 0 1 11 2zM7.5 2a6 6 0 0 0 0 12 6 6 0 0 1-2.95-3.133A1 1 0 1 1 4.03 9a6 6 0 0 1 0-2 1 1 0 1 1 .52-1.867A5.795 6.506 0 0 1 7.5 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14.5 2a6 6 0 0 0 0 12v-1.01a1 1 0 0 1 0-2v-6a1 1 0 0 1 0-2zM11 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm0 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm0-7a6 6 0 0 0 0 12 6 6 0 0 1-2.95-3.133A1 1 0 1 1 7.53 9a6 6 0 0 1 0-2 1 1 0 1 1 .52-1.867A5.795 6.506 0 0 1 11 2zM7.5 2a6 6 0 0 0 0 12 6 6 0 0 1-2.95-3.133A1 1 0 1 1 4.03 9a6 6 0 0 1 0-2 1 1 0 1 1 .52-1.867A5.795 6.506 0 0 1 7.5 2z"/></svg>
diff --git a/engine/editor/icons/AnimationMixer.svg b/engine/editor/icons/AnimationMixer.svg
index 8c2dc9c0..2f969191 100644
--- a/engine/editor/icons/AnimationMixer.svg
+++ b/engine/editor/icons/AnimationMixer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm1 4h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm1 4h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/AnimationPlayer.svg b/engine/editor/icons/AnimationPlayer.svg
index a15dea18..3f410a10 100644
--- a/engine/editor/icons/AnimationPlayer.svg
+++ b/engine/editor/icons/AnimationPlayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#c38ef1" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm1 4h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#c38ef1" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm1 4h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/AnimationTrackGroup.svg b/engine/editor/icons/AnimationTrackGroup.svg
index d8cf4b6e..460f0d69 100644
--- a/engine/editor/icons/AnimationTrackGroup.svg
+++ b/engine/editor/icons/AnimationTrackGroup.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5.05 2v2H14V2zm-3.32-.017v2h2v-2zM8.983 7v2H14V7zm-3.525 5v2h2v-2zm3.525 0v2H14v-2zM5.492 6.932v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5.05 2v2H14V2zm-3.32-.017v2h2v-2zM8.983 7v2H14V7zm-3.525 5v2h2v-2zm3.525 0v2H14v-2zM5.492 6.932v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/AnimationTrackList.svg b/engine/editor/icons/AnimationTrackList.svg
index a79a5cfd..11ce8289 100644
--- a/engine/editor/icons/AnimationTrackList.svg
+++ b/engine/editor/icons/AnimationTrackList.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2z"/></svg>
diff --git a/engine/editor/icons/AnimationTree.svg b/engine/editor/icons/AnimationTree.svg
index d2ec0299..e530c321 100644
--- a/engine/editor/icons/AnimationTree.svg
+++ b/engine/editor/icons/AnimationTree.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#c38ef1" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm4 3h2v2h4v2H9v2h2v2H8a1 1 0 0 1-1-1V8H6a1 1 0 0 1-1-1zM2 5h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#c38ef1" d="M1 1v14h1v-2h2v2h8v-2h2v2h1V1h-1v2h-2V1H4v2H2V1zm4 3h2v2h4v2H9v2h2v2H8a1 1 0 0 1-1-1V8H6a1 1 0 0 1-1-1zM2 5h2v2H2zm10 0h2v2h-2zM2 9h2v2H2zm10 0h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/Area2D.svg b/engine/editor/icons/Area2D.svg
index 4a8e9549..1a39e35b 100644
--- a/engine/editor/icons/Area2D.svg
+++ b/engine/editor/icons/Area2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v4h2V3h2V1zm10 0v2h2v2h2V1zM4 4v8h8V4zm2 2h4v4H6zm-5 5v4h4v-2H3v-2zm12 0v2h-2v2h4v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v4h2V3h2V1zm10 0v2h2v2h2V1zM4 4v8h8V4zm2 2h4v4H6zm-5 5v4h4v-2H3v-2zm12 0v2h-2v2h4v-4z"/></svg>
diff --git a/engine/editor/icons/Area3D.svg b/engine/editor/icons/Area3D.svg
index 114f7f67..358a141e 100644
--- a/engine/editor/icons/Area3D.svg
+++ b/engine/editor/icons/Area3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M1 1v4h2V3h2V1zm10 0v2h2v2h2V1zM4 4v8h8V4zm2 2h4v4H6zm-5 5v4h4v-2H3v-2zm12 0v2h-2v2h4v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M1 1v4h2V3h2V1zm10 0v2h2v2h2V1zM4 4v8h8V4zm2 2h4v4H6zm-5 5v4h4v-2H3v-2zm12 0v2h-2v2h4v-4z"/></svg>
diff --git a/engine/editor/icons/Array.svg b/engine/editor/icons/Array.svg
index fd9be640..db2e61da 100644
--- a/engine/editor/icons/Array.svg
+++ b/engine/editor/icons/Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M4 4a3 3 0 0 0 0 6h2V4zm6 0a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4zm4 0a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4zM4 6v2a1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M4 4a3 3 0 0 0 0 6h2V4zm6 0a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4zm4 0a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4zM4 6v2a1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/ArrayMesh.svg b/engine/editor/icons/ArrayMesh.svg
index 9261d8a0..46e308d4 100644
--- a/engine/editor/icons/ArrayMesh.svg
+++ b/engine/editor/icons/ArrayMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M3 1a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm10 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-2 7v3H8v2h3v3h2v-3h3v-2h-3V8zm-8 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M3 1a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm10 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-2 7v3H8v2h3v3h2v-3h3v-2h-3V8zm-8 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/ArrayOccluder3D.svg b/engine/editor/icons/ArrayOccluder3D.svg
index 5612cf0f..6f7393ec 100644
--- a/engine/editor/icons/ArrayOccluder3D.svg
+++ b/engine/editor/icons/ArrayOccluder3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M13 1a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-2 7v3H8v2h3v3h2v-3h3v-2h-3V8zm-8 3a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M13 1a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-2 7v3H8v2h3v3h2v-3h3v-2h-3V8zm-8 3a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/ArrowDown.svg b/engine/editor/icons/ArrowDown.svg
index e77eeb56..f5a05937 100644
--- a/engine/editor/icons/ArrowDown.svg
+++ b/engine/editor/icons/ArrowDown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 5v7l4-4m-4 4L4 8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 5v7l4-4m-4 4L4 8"/></svg>
diff --git a/engine/editor/icons/ArrowLeft.svg b/engine/editor/icons/ArrowLeft.svg
index b7cb8929..a2fa4b6a 100644
--- a/engine/editor/icons/ArrowLeft.svg
+++ b/engine/editor/icons/ArrowLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 8H4l4 4M4 8l4-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 8H4l4 4M4 8l4-4"/></svg>
diff --git a/engine/editor/icons/ArrowRight.svg b/engine/editor/icons/ArrowRight.svg
index c37c92e6..938a7cab 100644
--- a/engine/editor/icons/ArrowRight.svg
+++ b/engine/editor/icons/ArrowRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 8h7L8 4m4 4-4 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 8h7L8 4m4 4-4 4"/></svg>
diff --git a/engine/editor/icons/ArrowUp.svg b/engine/editor/icons/ArrowUp.svg
index 597380f9..e91fd7f9 100644
--- a/engine/editor/icons/ArrowUp.svg
+++ b/engine/editor/icons/ArrowUp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 11V4L4 8m4-4 4 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 11V4L4 8m4-4 4 4"/></svg>
diff --git a/engine/editor/icons/AspectRatioContainer.svg b/engine/editor/icons/AspectRatioContainer.svg
index 4c8e9750..40267659 100644
--- a/engine/editor/icons/AspectRatioContainer.svg
+++ b/engine/editor/icons/AspectRatioContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM3 5v2h2V5zm8 0v2h2V5zM3 9v2h2V9zm8 0v2h2V9zm-8 4a2 2 0 0 0 2 2v-2zm4 0v2h2v-2zm4 0v2a2 2 0 0 0 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM3 5v2h2V5zm8 0v2h2V5zM3 9v2h2V9zm8 0v2h2V9zm-8 4a2 2 0 0 0 2 2v-2zm4 0v2h2v-2zm4 0v2a2 2 0 0 0 2-2z"/></svg>
diff --git a/engine/editor/icons/AssetLib.svg b/engine/editor/icons/AssetLib.svg
index 4a4d9e7c..9dd73dcc 100644
--- a/engine/editor/icons/AssetLib.svg
+++ b/engine/editor/icons/AssetLib.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2"><path d="M8 1v9l4-4m-4 4L4 6"/><path stroke-linecap="round" d="M2 10v4h12v-4"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2"><path d="M8 1v9l4-4m-4 4L4 6"/><path stroke-linecap="round" d="M2 10v4h12v-4"/></g></svg>
diff --git a/engine/editor/icons/AtlasTexture.svg b/engine/editor/icons/AtlasTexture.svg
index 62f4ca39..5b259171 100644
--- a/engine/editor/icons/AtlasTexture.svg
+++ b/engine/editor/icons/AtlasTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1 1 3v12l5-2 4 2 5-2V1l-5 2zm0 2 4 2v8l-4-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1 1 3v12l5-2 4 2 5-2V1l-5 2zm0 2 4 2v8l-4-2z"/></svg>
diff --git a/engine/editor/icons/AudioBusBypass.svg b/engine/editor/icons/AudioBusBypass.svg
index f5e3ec91..34009f5a 100644
--- a/engine/editor/icons/AudioBusBypass.svg
+++ b/engine/editor/icons/AudioBusBypass.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h4a3 3 0 0 0 .787-5.894A3 3 0 0 0 7 3zm1 2h1a1 1 0 0 1 0 2H6zm0 4h3a1 1 0 0 1 0 2H6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h4a3 3 0 0 0 .787-5.894A3 3 0 0 0 7 3zm1 2h1a1 1 0 0 1 0 2H6zm0 4h3a1 1 0 0 1 0 2H6z"/></svg>
diff --git a/engine/editor/icons/AudioBusLayout.svg b/engine/editor/icons/AudioBusLayout.svg
index 70eb0f28..9f8bef54 100644
--- a/engine/editor/icons/AudioBusLayout.svg
+++ b/engine/editor/icons/AudioBusLayout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm8 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zM3 2h2a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm8 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zM3 2h2a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1z"/></svg>
diff --git a/engine/editor/icons/AudioBusMute.svg b/engine/editor/icons/AudioBusMute.svg
index d802230e..0f541c2b 100644
--- a/engine/editor/icons/AudioBusMute.svg
+++ b/engine/editor/icons/AudioBusMute.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 12V4l4 5 4-5v8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 12V4l4 5 4-5v8"/></svg>
diff --git a/engine/editor/icons/AudioBusSolo.svg b/engine/editor/icons/AudioBusSolo.svg
index bdb8f841..a54734ba 100644
--- a/engine/editor/icons/AudioBusSolo.svg
+++ b/engine/editor/icons/AudioBusSolo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 3a3 3 0 0 0 0 6h2a1 1 0 0 1 0 2H6a1 1 0 0 0 0 2h3a1 1 0 0 0 0-6H7a1 1 0 0 1 0-2h3a1 1 0 0 0 0-2H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 3a3 3 0 0 0 0 6h2a1 1 0 0 1 0 2H6a1 1 0 0 0 0 2h3a1 1 0 0 0 0-6H7a1 1 0 0 1 0-2h3a1 1 0 0 0 0-2H7z"/></svg>
diff --git a/engine/editor/icons/AudioListener2D.svg b/engine/editor/icons/AudioListener2D.svg
index 71adde1a..bb464038 100644
--- a/engine/editor/icons/AudioListener2D.svg
+++ b/engine/editor/icons/AudioListener2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M2 6a4 4 0 0 1 8 0c0 1 0 3-3 4.75 0 3-1.47 3.25-3 3.25H3M13.05 2.5a7 7 0 0 1 0 7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M2 6a4 4 0 0 1 8 0c0 1 0 3-3 4.75 0 3-1.47 3.25-3 3.25H3M13.05 2.5a7 7 0 0 1 0 7"/></svg>
diff --git a/engine/editor/icons/AudioListener3D.svg b/engine/editor/icons/AudioListener3D.svg
index cb9c3607..42a79dd2 100644
--- a/engine/editor/icons/AudioListener3D.svg
+++ b/engine/editor/icons/AudioListener3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="M2 6a4 4 0 0 1 8 0c0 1 0 3-3 4.75 0 3-1.47 3.25-3 3.25H3M13.05 2.5a7 7 0 0 1 0 7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="M2 6a4 4 0 0 1 8 0c0 1 0 3-3 4.75 0 3-1.47 3.25-3 3.25H3M13.05 2.5a7 7 0 0 1 0 7"/></svg>
diff --git a/engine/editor/icons/AudioMute.svg b/engine/editor/icons/AudioMute.svg
new file mode 100644
index 00000000..5c28f051
--- /dev/null
+++ b/engine/editor/icons/AudioMute.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" version="1.0" viewBox="0 0 2.4 2.4"><path fill="#e0e0e0" d="M 1.2518555 0.15 A 0.1 0.1 0 0 0 1.1701172 0.17988281 L 0.6 0.75 L 0.31787109 0.75 C 0.22487119 0.75 0.15 0.81700008 0.15 0.9 L 0.15 1.5 C 0.15 1.5424221 0.16969512 1.5805593 0.20126953 1.6078125 L 1.35 0.45527344 L 1.35 0.25605469 A 0.106 0.106 0 0 0 1.2518555 0.15 z M 1.35 1.6438477 L 0.97236328 2.0223633 L 1.1701172 2.2201172 C 1.2361171 2.2871171 1.35 2.239996 1.35 2.1459961 L 1.35 1.6438477 z"/><path fill="#e0e0e0" d="M 2.1984375 0.79306641 L 2.0660156 0.92578125 C 2.1142629 1.1320246 2.0935608 1.3239034 2.0487305 1.4882812 C 1.9692536 1.7796963 1.8105469 1.9725586 1.8105469 1.9725586 A 0.0825 0.0825 0 0 0 1.8222656 2.0879883 A 0.0825 0.0825 0 0 0 1.9394531 2.0780273 C 1.9394531 2.0780273 2.1176607 1.8586814 2.2069336 1.5313477 C 2.2638362 1.3227069 2.2834498 1.0648044 2.1984375 0.79306641 z M 1.8539062 1.1384766 L 1.6790039 1.3136719 C 1.6747238 1.3346601 1.6697313 1.3550615 1.6640625 1.3749023 C 1.6131343 1.5531513 1.5117188 1.6719727 1.5117187 1.6719727 A 0.0825 0.0825 0 0 0 1.5213867 1.7871094 A 0.0825 0.0825 0 0 0 1.6368164 1.7791992 C 1.6368164 1.7791992 1.7606941 1.6355198 1.8222656 1.4200195 C 1.8460259 1.3368593 1.8597024 1.2410136 1.8539062 1.1384766 z" color="#000" paint-order="markers stroke fill" style="-inkscape-stroke:none"/><path fill="#fc7f7f" d="M.08295 2.0529 2.0502.07965 2.31705.34725.34965 2.32035ZM-1.2804596 3.0939027 3.0879072-1.2877874Z"/></svg>
diff --git a/engine/editor/icons/AudioStream.svg b/engine/editor/icons/AudioStream.svg
index 8a011260..df294e68 100644
--- a/engine/editor/icons/AudioStream.svg
+++ b/engine/editor/icons/AudioStream.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="m12 2a-1 1 0 0 1 0 2a 8 8 0 0 0-8 8a-1 1 0 0 1-2 0a10 10 0 0 1 10-10zm0 4A-1 1 0 0 1 12 8a 4 4 0 0 0-4 4A-1 1 0 0 1 6 12a6 6 0 0 1 6-6zm0 4A-2 2 0 0 1 12 14A-2 2 0 0 1 12 10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="m12 2a-1 1 0 0 1 0 2a 8 8 0 0 0-8 8a-1 1 0 0 1-2 0a10 10 0 0 1 10-10zm0 4A-1 1 0 0 1 12 8a 4 4 0 0 0-4 4A-1 1 0 0 1 6 12a6 6 0 0 1 6-6zm0 4A-2 2 0 0 1 12 14A-2 2 0 0 1 12 10z"/></svg>
diff --git a/engine/editor/icons/AudioStreamGenerator.svg b/engine/editor/icons/AudioStreamGenerator.svg
index b458804c..1bae0efa 100644
--- a/engine/editor/icons/AudioStreamGenerator.svg
+++ b/engine/editor/icons/AudioStreamGenerator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m14 9-3 5-3-12-3 7-3-2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m14 9-3 5-3-12-3 7-3-2"/></svg>
diff --git a/engine/editor/icons/AudioStreamMP3.svg b/engine/editor/icons/AudioStreamMP3.svg
index da9452ed..bbdc014e 100644
--- a/engine/editor/icons/AudioStreamMP3.svg
+++ b/engine/editor/icons/AudioStreamMP3.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1z"/><path fill="none" stroke="url(#a)" stroke-linecap="round" d="M10.5 8v5m2-4v3m-4-2v1m6-1v1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1z"/><path fill="none" stroke="url(#a)" stroke-linecap="round" d="M10.5 8v5m2-4v3m-4-2v1m6-1v1"/></svg>
diff --git a/engine/editor/icons/AudioStreamMicrophone.svg b/engine/editor/icons/AudioStreamMicrophone.svg
index 7adaf0fa..02c0df7d 100644
--- a/engine/editor/icons/AudioStreamMicrophone.svg
+++ b/engine/editor/icons/AudioStreamMicrophone.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M7 1a2 2 0 0 0-2 2h2v1H5v2h2v1H5a2 2 0 0 0 2 2v4l-2 2h6l-2-2V9a2 2 0 0 0 2-2H9V6h2V4H9V3h2a2 2 0 0 0-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M7 1a2 2 0 0 0-2 2h2v1H5v2h2v1H5a2 2 0 0 0 2 2v4l-2 2h6l-2-2V9a2 2 0 0 0 2-2H9V6h2V4H9V3h2a2 2 0 0 0-2-2z"/></svg>
diff --git a/engine/editor/icons/AudioStreamOggVorbis.svg b/engine/editor/icons/AudioStreamOggVorbis.svg
index da9452ed..bbdc014e 100644
--- a/engine/editor/icons/AudioStreamOggVorbis.svg
+++ b/engine/editor/icons/AudioStreamOggVorbis.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1z"/><path fill="none" stroke="url(#a)" stroke-linecap="round" d="M10.5 8v5m2-4v3m-4-2v1m6-1v1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1z"/><path fill="none" stroke="url(#a)" stroke-linecap="round" d="M10.5 8v5m2-4v3m-4-2v1m6-1v1"/></svg>
diff --git a/engine/editor/icons/AudioStreamPlayer.svg b/engine/editor/icons/AudioStreamPlayer.svg
index 561e1c3b..da9caca2 100644
--- a/engine/editor/icons/AudioStreamPlayer.svg
+++ b/engine/editor/icons/AudioStreamPlayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" version="1.0" viewBox="0 0 2.4 2.4"><path fill="#e0e0e0" d="M1.252.15a.1.1 0 0 0-.082.03L.6.75H.318C.225.75.15.817.15.9v.6c0 .083.075.15.168.15H.6l.57.57c.066.067.18.02.18-.074V.256A.106.106 0 0 0 1.252.15" paint-order="markers stroke fill"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width=".165" d="M1.575.675c.45.525 0 1.05 0 1.05m.3-1.35c.675.825 0 1.65 0 1.65" paint-order="markers stroke fill"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" version="1.0" viewBox="0 0 2.4 2.4"><path fill="#e0e0e0" d="M1.252.15a.1.1 0 0 0-.082.03L.6.75H.318C.225.75.15.817.15.9v.6c0 .083.075.15.168.15H.6l.57.57c.066.067.18.02.18-.074V.256A.106.106 0 0 0 1.252.15" paint-order="markers stroke fill"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width=".165" d="M1.575.675c.45.525 0 1.05 0 1.05m.3-1.35c.675.825 0 1.65 0 1.65" paint-order="markers stroke fill"/></svg>
diff --git a/engine/editor/icons/AudioStreamPlayer2D.svg b/engine/editor/icons/AudioStreamPlayer2D.svg
index 7f557b2c..d576f414 100644
--- a/engine/editor/icons/AudioStreamPlayer2D.svg
+++ b/engine/editor/icons/AudioStreamPlayer2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" version="1.0" viewBox="0 0 2.4 2.4"><path fill="#8da5f3" d="M1.252.15a.1.1 0 0 0-.082.03L.6.75H.318C.225.75.15.817.15.9v.6c0 .083.075.15.168.15H.6l.57.57c.066.067.18.02.18-.074V.256A.106.106 0 0 0 1.252.15" paint-order="markers stroke fill"/><path fill="none" stroke="#8da5f3" stroke-linecap="round" stroke-linejoin="round" stroke-width=".165" d="M1.575.675c.45.525 0 1.05 0 1.05m.3-1.35c.675.825 0 1.65 0 1.65" paint-order="markers stroke fill"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" version="1.0" viewBox="0 0 2.4 2.4"><path fill="#8da5f3" d="M1.252.15a.1.1 0 0 0-.082.03L.6.75H.318C.225.75.15.817.15.9v.6c0 .083.075.15.168.15H.6l.57.57c.066.067.18.02.18-.074V.256A.106.106 0 0 0 1.252.15" paint-order="markers stroke fill"/><path fill="none" stroke="#8da5f3" stroke-linecap="round" stroke-linejoin="round" stroke-width=".165" d="M1.575.675c.45.525 0 1.05 0 1.05m.3-1.35c.675.825 0 1.65 0 1.65" paint-order="markers stroke fill"/></svg>
diff --git a/engine/editor/icons/AudioStreamPlayer3D.svg b/engine/editor/icons/AudioStreamPlayer3D.svg
index 5f07d68e..b8f59217 100644
--- a/engine/editor/icons/AudioStreamPlayer3D.svg
+++ b/engine/editor/icons/AudioStreamPlayer3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" version="1.0" viewBox="0 0 2.4 2.4"><path fill="#fc7f7f" d="M1.252.15a.1.1 0 0 0-.082.03L.6.75H.318C.225.75.15.817.15.9v.6c0 .083.075.15.168.15H.6l.57.57c.066.067.18.02.18-.074V.256A.106.106 0 0 0 1.252.15" paint-order="markers stroke fill"/><path fill="none" stroke="#fc7f7f" stroke-linecap="round" stroke-linejoin="round" stroke-width=".165" d="M1.575.675c.45.525 0 1.05 0 1.05m.3-1.35c.675.825 0 1.65 0 1.65" paint-order="markers stroke fill"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16" version="1.0" viewBox="0 0 2.4 2.4"><path fill="#fc7f7f" d="M1.252.15a.1.1 0 0 0-.082.03L.6.75H.318C.225.75.15.817.15.9v.6c0 .083.075.15.168.15H.6l.57.57c.066.067.18.02.18-.074V.256A.106.106 0 0 0 1.252.15" paint-order="markers stroke fill"/><path fill="none" stroke="#fc7f7f" stroke-linecap="round" stroke-linejoin="round" stroke-width=".165" d="M1.575.675c.45.525 0 1.05 0 1.05m.3-1.35c.675.825 0 1.65 0 1.65" paint-order="markers stroke fill"/></svg>
diff --git a/engine/editor/icons/AudioStreamPolyphonic.svg b/engine/editor/icons/AudioStreamPolyphonic.svg
index f0231c63..2648cca3 100644
--- a/engine/editor/icons/AudioStreamPolyphonic.svg
+++ b/engine/editor/icons/AudioStreamPolyphonic.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1zm-3 6h2v2h2v2h-2v2h-2v-2H8v-2h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1zm-3 6h2v2h2v2h-2v2h-2v-2H8v-2h2z"/></svg>
diff --git a/engine/editor/icons/AudioStreamRandomizer.svg b/engine/editor/icons/AudioStreamRandomizer.svg
index 109d1ed9..7331edb8 100644
--- a/engine/editor/icons/AudioStreamRandomizer.svg
+++ b/engine/editor/icons/AudioStreamRandomizer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1="8" x2="8" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M8 1C1 1 1 1 1 8s0 7 7 7 7 0 7-7 0-7-7-7zm3.75 1.25a1 1 0 0 1 0 4 1 1 0 0 1 0-4zM8 6a1 1 0 0 1 0 4 1 1 0 0 1 0-4zM4.25 9.75a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1="8" x2="8" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M8 1C1 1 1 1 1 8s0 7 7 7 7 0 7-7 0-7-7-7zm3.75 1.25a1 1 0 0 1 0 4 1 1 0 0 1 0-4zM8 6a1 1 0 0 1 0 4 1 1 0 0 1 0-4zM4.25 9.75a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
diff --git a/engine/editor/icons/AudioStreamWAV.svg b/engine/editor/icons/AudioStreamWAV.svg
index da9452ed..bbdc014e 100644
--- a/engine/editor/icons/AudioStreamWAV.svg
+++ b/engine/editor/icons/AudioStreamWAV.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1z"/><path fill="none" stroke="url(#a)" stroke-linecap="round" d="M10.5 8v5m2-4v3m-4-2v1m6-1v1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="1" y2="15" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="url(#a)" d="M13 2a1 1 0 0 0-1-1L4.754 3A1 1 0 0 0 4 4v5.55A2.5 2.5 0 1 0 6 12V4.756l5-1.428V6.5l2-1z"/><path fill="none" stroke="url(#a)" stroke-linecap="round" d="M10.5 8v5m2-4v3m-4-2v1m6-1v1"/></svg>
diff --git a/engine/editor/icons/AutoEnd.svg b/engine/editor/icons/AutoEnd.svg
index 88c4fd47..e3125dc1 100644
--- a/engine/editor/icons/AutoEnd.svg
+++ b/engine/editor/icons/AutoEnd.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 14a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H6a1 1 0 0 0-.781.375l-4 5a1 1 0 0 0 0 1.248l4 5a1 1 0 0 0 .78.377zm-1-2H6.48L3.281 8l3.2-4H13zm-6-2V6L5 8zm1-5h4v1.2H9.4v1.2h2.2v1.2H9.4v1.2H12V11H8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 14a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H6a1 1 0 0 0-.781.375l-4 5a1 1 0 0 0 0 1.248l4 5a1 1 0 0 0 .78.377zm-1-2H6.48L3.281 8l3.2-4H13zm-6-2V6L5 8zm1-5h4v1.2H9.4v1.2h2.2v1.2H9.4v1.2H12V11H8z"/></svg>
diff --git a/engine/editor/icons/AutoKey.svg b/engine/editor/icons/AutoKey.svg
index 7df078f4..5377205e 100644
--- a/engine/editor/icons/AutoKey.svg
+++ b/engine/editor/icons/AutoKey.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="5" r="4"/><path d="M11 13a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1 0-2h1v-2h-1a3 3 0 0 0-3 3zm-7-3a3 3 0 0 0-3 3v3h2v-3a1 1 0 0 1 1-1h1v-2zm4 6h1v-2H8a1 1 0 0 1-1-1h4a3 3 0 1 0-3 3zm-1-4a1.08 1.08 0 0 1 2 0z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="5" r="4"/><path d="M11 13a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1 0-2h1v-2h-1a3 3 0 0 0-3 3zm-7-3a3 3 0 0 0-3 3v3h2v-3a1 1 0 0 1 1-1h1v-2zm4 6h1v-2H8a1 1 0 0 1-1-1h4a3 3 0 1 0-3 3zm-1-4a1.08 1.08 0 0 1 2 0z"/></g></svg>
diff --git a/engine/editor/icons/AutoPlay.svg b/engine/editor/icons/AutoPlay.svg
index 3d72ffbb..51e7a24e 100644
--- a/engine/editor/icons/AutoPlay.svg
+++ b/engine/editor/icons/AutoPlay.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h8a1 1 0 0 0 .781-.375l4-5a1 1 0 0 0 0-1.248l-4-5A1 1 0 0 0 10 2H2zm1 2h6.52l3.199 4-3.2 4H3zm5 3a2 2 0 0 0-4 0v4h1V9h2v2h1zM5 7a1 1 0 0 1 2 0v1H5zm4-1v4l2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h8a1 1 0 0 0 .781-.375l4-5a1 1 0 0 0 0-1.248l-4-5A1 1 0 0 0 10 2H2zm1 2h6.52l3.199 4-3.2 4H3zm5 3a2 2 0 0 0-4 0v4h1V9h2v2h1zM5 7a1 1 0 0 1 2 0v1H5zm4-1v4l2-2z"/></svg>
diff --git a/engine/editor/icons/AutoTriangle.svg b/engine/editor/icons/AutoTriangle.svg
index 720cd4e5..b5a7d0ee 100644
--- a/engine/editor/icons/AutoTriangle.svg
+++ b/engine/editor/icons/AutoTriangle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8.232.678.645 15.289h14.71zm-1.29 4.765H9.21l4.203 9.004H10.87l-.777-1.949h-4.11l-.778 1.95H2.738l4.203-9.005zm1.081 2.04-1.492 3.404h3L8.023 7.482z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8.232.678.645 15.289h14.71zm-1.29 4.765H9.21l4.203 9.004H10.87l-.777-1.949h-4.11l-.778 1.95H2.738l4.203-9.005zm1.081 2.04-1.492 3.404h3L8.023 7.482z"/></svg>
diff --git a/engine/editor/icons/Back.svg b/engine/editor/icons/Back.svg
index 4bf82330..0bed4c35 100644
--- a/engine/editor/icons/Back.svg
+++ b/engine/editor/icons/Back.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 2 2 8l4 6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 2 2 8l4 6"/></svg>
diff --git a/engine/editor/icons/BackBufferCopy.svg b/engine/editor/icons/BackBufferCopy.svg
index a2f78ad0..9523245f 100644
--- a/engine/editor/icons/BackBufferCopy.svg
+++ b/engine/editor/icons/BackBufferCopy.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m1 1v11h5v-2h-3v-7h6v-2zm6 3v11h8v-11zm2 2h4v7h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m1 1v11h5v-2h-3v-7h6v-2zm6 3v11h8v-11zm2 2h4v7h-4z"/></svg>
diff --git a/engine/editor/icons/Bake.svg b/engine/editor/icons/Bake.svg
index e9565922..db812e8b 100644
--- a/engine/editor/icons/Bake.svg
+++ b/engine/editor/icons/Bake.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1v2h12v-2zm-1 3v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9zm2 1h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm-9 2h10v6h-10zm3 1v1h4v-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1v2h12v-2zm-1 3v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9zm2 1h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm-9 2h10v6h-10zm3 1v1h4v-1z"/></svg>
diff --git a/engine/editor/icons/BaseButton.svg b/engine/editor/icons/BaseButton.svg
index 16391411..ae37346c 100644
--- a/engine/editor/icons/BaseButton.svg
+++ b/engine/editor/icons/BaseButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#76ad7b" d="M5.5 9C4.669 9 4 9.669 4 10.5V12H2v2h12v-2h-2v-1.5c0-.831-.669-1.5-1.5-1.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#76ad7b" d="M5.5 9C4.669 9 4 9.669 4 10.5V12H2v2h12v-2h-2v-1.5c0-.831-.669-1.5-1.5-1.5z"/></svg>
diff --git a/engine/editor/icons/Basis.svg b/engine/editor/icons/Basis.svg
index b9f03c2b..37c8224f 100644
--- a/engine/editor/icons/Basis.svg
+++ b/engine/editor/icons/Basis.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e1ec41" d="M0 2v8h2a3 3 0 0 0 0-6V2zm10 0v2h2V2zM7 4a2 2 0 0 0 0 4H5v2h2a2 2 0 0 0 0-4h2V4zm7 0a2 2 0 0 0 0 4h-2V6h-2v4h4a2 2 0 0 0 0-4h2V4zM2 6a1 1 0 0 1 1 1 1 1 0 0 1-1 1z"/><path fill="#fff" fill-opacity=".4" d="M10 2v2h2V2zm0 4v4h2V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e1ec41" d="M0 2v8h2a3 3 0 0 0 0-6V2zm10 0v2h2V2zM7 4a2 2 0 0 0 0 4H5v2h2a2 2 0 0 0 0-4h2V4zm7 0a2 2 0 0 0 0 4h-2V6h-2v4h4a2 2 0 0 0 0-4h2V4zM2 6a1 1 0 0 1 1 1 1 1 0 0 1-1 1z"/><path fill="#fff" fill-opacity=".4" d="M10 2v2h2V2zm0 4v4h2V6z"/></svg>
diff --git a/engine/editor/icons/BezierHandlesBalanced.svg b/engine/editor/icons/BezierHandlesBalanced.svg
index 5228ed9e..508b9a51 100644
--- a/engine/editor/icons/BezierHandlesBalanced.svg
+++ b/engine/editor/icons/BezierHandlesBalanced.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="M1.8 13.5s1.3-6.7 6.6-8c5.1 1 6 8 6 8"/><path stroke="#61b2ff" stroke-width="1.5" d="M2.5 7.7 12.7 4"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8.25" cy="5.7" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="1.75" cy="7.9" r="1"/><circle cx="13.5" cy="3.7" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="M1.8 13.5s1.3-6.7 6.6-8c5.1 1 6 8 6 8"/><path stroke="#61b2ff" stroke-width="1.5" d="M2.5 7.7 12.7 4"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8.25" cy="5.7" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="1.75" cy="7.9" r="1"/><circle cx="13.5" cy="3.7" r="1"/></g></svg>
diff --git a/engine/editor/icons/BezierHandlesFree.svg b/engine/editor/icons/BezierHandlesFree.svg
index a745a461..3e62159b 100644
--- a/engine/editor/icons/BezierHandlesFree.svg
+++ b/engine/editor/icons/BezierHandlesFree.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="m1.8 13.5s1.3-5.2 6.6-6.5c5.1 1 6 6.5 6 6.5"/><path fill="none" stroke="#61b3ff" stroke-width="1.5" d="M2.7 8.4 8.4 7.2 10.4 2.7"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8.25" cy="7.2" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="1.75" cy="8.5" r="1"/><circle cx="10.75" cy="1.75" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="m1.8 13.5s1.3-5.2 6.6-6.5c5.1 1 6 6.5 6 6.5"/><path fill="none" stroke="#61b3ff" stroke-width="1.5" d="M2.7 8.4 8.4 7.2 10.4 2.7"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8.25" cy="7.2" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="1.75" cy="8.5" r="1"/><circle cx="10.75" cy="1.75" r="1"/></g></svg>
diff --git a/engine/editor/icons/BezierHandlesLinear.svg b/engine/editor/icons/BezierHandlesLinear.svg
index f8aa9ab3..ddce62cc 100644
--- a/engine/editor/icons/BezierHandlesLinear.svg
+++ b/engine/editor/icons/BezierHandlesLinear.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="m1.8 13.5 6.2-9 6.2 9"/><path fill="none" stroke="#61b3ff" stroke-width="1.5" d="M5.3 8.4 7.9 4.6m.2 0l2.6 3.8"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8" cy="4.5" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="4.8" cy="9.1" r="1"/><circle cx="11.2" cy="9.1" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="m1.8 13.5 6.2-9 6.2 9"/><path fill="none" stroke="#61b3ff" stroke-width="1.5" d="M5.3 8.4 7.9 4.6m.2 0l2.6 3.8"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8" cy="4.5" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="4.8" cy="9.1" r="1"/><circle cx="11.2" cy="9.1" r="1"/></g></svg>
diff --git a/engine/editor/icons/BezierHandlesMirror.svg b/engine/editor/icons/BezierHandlesMirror.svg
index 8ab93567..25e74930 100644
--- a/engine/editor/icons/BezierHandlesMirror.svg
+++ b/engine/editor/icons/BezierHandlesMirror.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="M1.8 13.5c2.2-10 10.2-10 12.4 0"/><path stroke="#61b2ff" stroke-width="1.5" d="M2.7 5.7h10.6"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8" cy="5.7" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="1.8" cy="5.7" r="1"/><circle cx="14.2" cy="5.7" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#87b1d7" stroke-width=".5" d="M1.8 13.5c2.2-10 10.2-10 12.4 0"/><path stroke="#61b2ff" stroke-width="1.5" d="M2.7 5.7h10.6"/><g fill="#e0e0e0"><circle cx="1.8" cy="13.5" r="1.25"/><circle cx="14.2" cy="13.5" r="1.25"/><circle cx="8" cy="5.7" r="1.25"/></g><g fill="none" stroke="#e0e0e0" stroke-width=".5"><circle cx="1.8" cy="5.7" r="1"/><circle cx="14.2" cy="5.7" r="1"/></g></svg>
diff --git a/engine/editor/icons/BitMap.svg b/engine/editor/icons/BitMap.svg
index ee756728..73b1158c 100644
--- a/engine/editor/icons/BitMap.svg
+++ b/engine/editor/icons/BitMap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v2h2v-2zm2 2v2h2v-2zm2 0h2v-2h-2zm2 0v2h2v-2zm2 0h2v-2h-2zm2 0v2h2v-2zm2 0h2v-2h-2zm0 2v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm-2 0h-2v2h2zm-2 0v-2h-2v2zm-2 0h-2v2h2zm-2 0v-2h-2v2zm-2 0h-2v2h2zm0-2v-2h-2v2zm0-2h2v-2h-2zm0-2v-2h-2v2zm2 0h2v-2h-2zm2 0v2h2v-2zm2 0h2v-2h-2zm0 2v2h2v-2zm-2 0h-2v2h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v2h2v-2zm2 2v2h2v-2zm2 0h2v-2h-2zm2 0v2h2v-2zm2 0h2v-2h-2zm2 0v2h2v-2zm2 0h2v-2h-2zm0 2v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm0 2v2h2v-2zm-2 0h-2v2h2zm-2 0v-2h-2v2zm-2 0h-2v2h2zm-2 0v-2h-2v2zm-2 0h-2v2h2zm0-2v-2h-2v2zm0-2h2v-2h-2zm0-2v-2h-2v2zm2 0h2v-2h-2zm2 0v2h2v-2zm2 0h2v-2h-2zm0 2v2h2v-2zm-2 0h-2v2h2z"/></svg>
diff --git a/engine/editor/icons/Blend.svg b/engine/editor/icons/Blend.svg
index 47f9fe56..17023e9e 100644
--- a/engine/editor/icons/Blend.svg
+++ b/engine/editor/icons/Blend.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 1v2h2.586L8 6.586 3.707 2.293 2.293 3.707 6.586 8l-4.293 4.293 1.414 1.414L8 9.414 11.586 13H9v2h5a1 1 0 0 0 1-1V9h-2v2.586L9.414 8 13 4.414V7h2V2a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 1v2h2.586L8 6.586 3.707 2.293 2.293 3.707 6.586 8l-4.293 4.293 1.414 1.414L8 9.414 11.586 13H9v2h5a1 1 0 0 0 1-1V9h-2v2.586L9.414 8 13 4.414V7h2V2a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/Bone.svg b/engine/editor/icons/Bone.svg
index f34b6ed2..b1059d49 100644
--- a/engine/editor/icons/Bone.svg
+++ b/engine/editor/icons/Bone.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.824 8.384a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496 2.466 2.466 0 1 0-4.496 1.705z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.824 8.384a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496 2.466 2.466 0 1 0-4.496 1.705z"/></svg>
diff --git a/engine/editor/icons/Bone2D.svg b/engine/editor/icons/Bone2D.svg
index 10da51a3..2f1868ab 100644
--- a/engine/editor/icons/Bone2D.svg
+++ b/engine/editor/icons/Bone2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.824 8.384a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496 2.466 2.466 0 1 0-4.496 1.705z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.824 8.384a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496 2.466 2.466 0 1 0-4.496 1.705z"/></svg>
diff --git a/engine/editor/icons/BoneAttachment3D.svg b/engine/editor/icons/BoneAttachment3D.svg
index 2fa8badb..4dd33946 100644
--- a/engine/editor/icons/BoneAttachment3D.svg
+++ b/engine/editor/icons/BoneAttachment3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#FC7F7F" d="M9.264,8.125L8.119,9.27c-0.219,0.228-0.212,0.589,0.014,0.81c0.222,0.213,0.574,0.213,0.794,0l0.169-0.168	v4.912h4.909l-0.167,0.165c-0.219,0.229-0.212,0.591,0.015,0.81c0.222,0.214,0.573,0.214,0.794,0l1.145-1.145	c0.224-0.224,0.224-0.584,0-0.809l-1.145-1.143c-0.226-0.221-0.588-0.215-0.809,0.014c-0.213,0.221-0.213,0.573,0,0.795l0.167,0.168	h-2.957l3.195-3.196v0.237c0,0.317,0.256,0.573,0.572,0.573c0.315,0,0.571-0.256,0.571-0.573V9.102c0-0.315-0.256-0.571-0.571-0.571	h-1.619c-0.316,0-0.572,0.256-0.572,0.571c0,0.316,0.256,0.572,0.572,0.572h0.237l-3.194,3.194V9.911l0.167,0.168	c0.228,0.218,0.59,0.213,0.81-0.015c0.214-0.223,0.214-0.572,0-0.795l-1.144-1.145C9.848,7.903,9.486,7.903,9.264,8.125L9.264,8.125	z"/><path fill="#FC7F7F" d="M7.615,11.175l0.326-0.326c-0.119-0.06-0.23-0.135-0.328-0.229c-0.524-0.511-0.538-1.349-0.035-1.871	l1.155-1.155c0.5-0.499,1.367-0.497,1.865-0.003l0.3,0.3l0.276-0.276c0.399,0.266,0.849,0.393,1.296,0.405	c0.211-0.142,0.453-0.24,0.726-0.24h0.399c0.391-0.186,0.741-0.467,0.998-0.854c0.754-1.134,0.446-2.665-0.688-3.419	c-0.309-0.205-0.66-0.338-1.026-0.389c-0.188-1.349-1.433-2.291-2.782-2.103c-1.349,0.188-2.29,1.433-2.103,2.782	c0.051,0.367,0.184,0.717,0.389,1.026l-3.56,3.56C3.69,7.63,2.159,7.938,1.405,9.072c-0.754,1.134-0.446,2.664,0.688,3.419	c0.308,0.204,0.659,0.338,1.026,0.389c0.188,1.349,1.433,2.29,2.782,2.103c1.349-0.188,2.291-1.433,2.103-2.781	C7.953,11.834,7.82,11.483,7.615,11.175z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#FC7F7F" d="M9.264,8.125L8.119,9.27c-0.219,0.228-0.212,0.589,0.014,0.81c0.222,0.213,0.574,0.213,0.794,0l0.169-0.168	v4.912h4.909l-0.167,0.165c-0.219,0.229-0.212,0.591,0.015,0.81c0.222,0.214,0.573,0.214,0.794,0l1.145-1.145	c0.224-0.224,0.224-0.584,0-0.809l-1.145-1.143c-0.226-0.221-0.588-0.215-0.809,0.014c-0.213,0.221-0.213,0.573,0,0.795l0.167,0.168	h-2.957l3.195-3.196v0.237c0,0.317,0.256,0.573,0.572,0.573c0.315,0,0.571-0.256,0.571-0.573V9.102c0-0.315-0.256-0.571-0.571-0.571	h-1.619c-0.316,0-0.572,0.256-0.572,0.571c0,0.316,0.256,0.572,0.572,0.572h0.237l-3.194,3.194V9.911l0.167,0.168	c0.228,0.218,0.59,0.213,0.81-0.015c0.214-0.223,0.214-0.572,0-0.795l-1.144-1.145C9.848,7.903,9.486,7.903,9.264,8.125L9.264,8.125	z"/><path fill="#FC7F7F" d="M7.615,11.175l0.326-0.326c-0.119-0.06-0.23-0.135-0.328-0.229c-0.524-0.511-0.538-1.349-0.035-1.871	l1.155-1.155c0.5-0.499,1.367-0.497,1.865-0.003l0.3,0.3l0.276-0.276c0.399,0.266,0.849,0.393,1.296,0.405	c0.211-0.142,0.453-0.24,0.726-0.24h0.399c0.391-0.186,0.741-0.467,0.998-0.854c0.754-1.134,0.446-2.665-0.688-3.419	c-0.309-0.205-0.66-0.338-1.026-0.389c-0.188-1.349-1.433-2.291-2.782-2.103c-1.349,0.188-2.29,1.433-2.103,2.782	c0.051,0.367,0.184,0.717,0.389,1.026l-3.56,3.56C3.69,7.63,2.159,7.938,1.405,9.072c-0.754,1.134-0.446,2.664,0.688,3.419	c0.308,0.204,0.659,0.338,1.026,0.389c0.188,1.349,1.433,2.29,2.782,2.103c1.349-0.188,2.291-1.433,2.103-2.781	C7.953,11.834,7.82,11.483,7.615,11.175z"/></svg>
diff --git a/engine/editor/icons/BoneMapHumanBody.svg b/engine/editor/icons/BoneMapHumanBody.svg
index 607f1db5..abe199db 100644
--- a/engine/editor/icons/BoneMapHumanBody.svg
+++ b/engine/editor/icons/BoneMapHumanBody.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M128 134.04c1.75 8.75 2.911 16.725 3.5 28.5.5 10 1 12.75.5 16.5-1.846 13.843 1.692 45.975 2.166 51.667.5 6-1.913 6.06-2.666 11.583-.612 4.49 19.75 4.61 16.25-2.25-6.25-12.25-.5-21 1-55.25.13-2.98-2.242-11.968-.5-23.5 2.771-18.353 2.105-26.81 1.625-36.415-.311-7.993-.25-14.241-2.25-34.741-.244-2.5 1.479-19.817 2.988-19.772 10.5.313 24.329-1.252 29.537-3.67 7.225.933 24.452-3.012 31.971-4.031 3.636 2.351 4.169.833 9.379 2.254 1.375.375 4.334-.36 3-1.25-1.852-1.234-5.187-2.062-5.75-3 2.688-.625 5.591-2.394 9-3.291 2.375-.625 4.717-2.937 3.875-3.084-2.875-.5-6.507 1.137-9.375 1.625-3.931.67-6.309.81-8.333 1.292-.307.073-.776.19-1.448.24l-.013.109c-9.205.248-20.081-2.431-32.578-1.392-8.506-.982-23.545-1.29-28.378-1.374-3.478-.06-14.823-.645-17.938-.125-.167-1.02-.375-2.437.238-4.117 3.72-1.811 4.797-4.449 6.825-8.673.23 1.106 1.563 1.232 3.115-3.558 1.415-4.37.58-5.563-.579-5.631.043-.514.07-1.026.079-1.536.196-12.01-1.74-20.61-15.24-20.61s-15.437 8.6-15.24 20.61c.009.51.036 1.022.078 1.536-1.159.068-1.993 1.262-.578 5.631 1.552 4.79 2.884 4.664 3.115 3.558 2.028 4.224 3.105 6.862 6.825 8.673.612 1.68.404 3.097.237 4.117-3.114-.52-14.459.066-17.937.126-4.833.083-19.872.392-28.378 1.373-12.497-1.039-23.373 1.64-32.578 1.392a24.54 24.54 0 0 0-.013-.11c-.672-.048-1.141-.166-1.448-.239-2.024-.482-4.402-.622-8.333-1.291-2.868-.489-6.5-2.125-9.375-1.625-.842.146 1.5 2.458 3.875 3.083 3.408.897 6.312 2.666 9 3.291-.563.938-3.898 1.766-5.75 3-1.334.89 1.625 1.625 3 1.25 5.21-1.42 5.743.097 9.378-2.254 7.52 1.02 24.747 4.964 31.972 4.031 5.208 2.418 19.036 3.983 29.536 3.67 1.51-.045 3.233 17.272 2.989 19.772-2 20.5-1.939 26.748-2.25 34.741-.48 9.605-1.147 18.062 1.625 36.416 1.742 11.531-.63 20.519-.5 23.5 1.5 34.25 7.25 43 1 55.25-3.5 6.859 16.862 6.739 16.25 2.25-.753-5.523-3.167-5.584-2.667-11.584.474-5.692 4.013-37.824 2.167-51.666-.5-3.75 0-6.5.5-16.5.589-11.776 1.75-19.751 3.5-28.501Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M128 134.04c1.75 8.75 2.911 16.725 3.5 28.5.5 10 1 12.75.5 16.5-1.846 13.843 1.692 45.975 2.166 51.667.5 6-1.913 6.06-2.666 11.583-.612 4.49 19.75 4.61 16.25-2.25-6.25-12.25-.5-21 1-55.25.13-2.98-2.242-11.968-.5-23.5 2.771-18.353 2.105-26.81 1.625-36.415-.311-7.993-.25-14.241-2.25-34.741-.244-2.5 1.479-19.817 2.988-19.772 10.5.313 24.329-1.252 29.537-3.67 7.225.933 24.452-3.012 31.971-4.031 3.636 2.351 4.169.833 9.379 2.254 1.375.375 4.334-.36 3-1.25-1.852-1.234-5.187-2.062-5.75-3 2.688-.625 5.591-2.394 9-3.291 2.375-.625 4.717-2.937 3.875-3.084-2.875-.5-6.507 1.137-9.375 1.625-3.931.67-6.309.81-8.333 1.292-.307.073-.776.19-1.448.24l-.013.109c-9.205.248-20.081-2.431-32.578-1.392-8.506-.982-23.545-1.29-28.378-1.374-3.478-.06-14.823-.645-17.938-.125-.167-1.02-.375-2.437.238-4.117 3.72-1.811 4.797-4.449 6.825-8.673.23 1.106 1.563 1.232 3.115-3.558 1.415-4.37.58-5.563-.579-5.631.043-.514.07-1.026.079-1.536.196-12.01-1.74-20.61-15.24-20.61s-15.437 8.6-15.24 20.61c.009.51.036 1.022.078 1.536-1.159.068-1.993 1.262-.578 5.631 1.552 4.79 2.884 4.664 3.115 3.558 2.028 4.224 3.105 6.862 6.825 8.673.612 1.68.404 3.097.237 4.117-3.114-.52-14.459.066-17.937.126-4.833.083-19.872.392-28.378 1.373-12.497-1.039-23.373 1.64-32.578 1.392a24.54 24.54 0 0 0-.013-.11c-.672-.048-1.141-.166-1.448-.239-2.024-.482-4.402-.622-8.333-1.291-2.868-.489-6.5-2.125-9.375-1.625-.842.146 1.5 2.458 3.875 3.083 3.408.897 6.312 2.666 9 3.291-.563.938-3.898 1.766-5.75 3-1.334.89 1.625 1.625 3 1.25 5.21-1.42 5.743.097 9.378-2.254 7.52 1.02 24.747 4.964 31.972 4.031 5.208 2.418 19.036 3.983 29.536 3.67 1.51-.045 3.233 17.272 2.989 19.772-2 20.5-1.939 26.748-2.25 34.741-.48 9.605-1.147 18.062 1.625 36.416 1.742 11.531-.63 20.519-.5 23.5 1.5 34.25 7.25 43 1 55.25-3.5 6.859 16.862 6.739 16.25 2.25-.753-5.523-3.167-5.584-2.667-11.584.474-5.692 4.013-37.824 2.167-51.666-.5-3.75 0-6.5.5-16.5.589-11.776 1.75-19.751 3.5-28.501Z"/></svg>
diff --git a/engine/editor/icons/BoneMapHumanFace.svg b/engine/editor/icons/BoneMapHumanFace.svg
index 7502b791..69926429 100644
--- a/engine/editor/icons/BoneMapHumanFace.svg
+++ b/engine/editor/icons/BoneMapHumanFace.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M197.026 138.242c4.499-14.473 7.974-31.142 7.719-49.518-.94-67.6-62.462-62.87-73.892-61.237C40.886 40.34 76.091 140.577 75.74 151.594c-1.225 38.374 20.921 42.748 40.416 53.888.661.378 1.815.447 3.328.278 1.806 6.295 2.941 14.759 2.387 18.909-.816 6.124 52.255 6.124 52.255 0 0-15.72 3.059-31.09 8.457-47.222 1.786-.571 4.014-1.9 6.491-4.237 3.42-3.227 8.71-5.444 11.431-15.787 3.904-14.834.968-19.018-3.479-19.181Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M197.026 138.242c4.499-14.473 7.974-31.142 7.719-49.518-.94-67.6-62.462-62.87-73.892-61.237C40.886 40.34 76.091 140.577 75.74 151.594c-1.225 38.374 20.921 42.748 40.416 53.888.661.378 1.815.447 3.328.278 1.806 6.295 2.941 14.759 2.387 18.909-.816 6.124 52.255 6.124 52.255 0 0-15.72 3.059-31.09 8.457-47.222 1.786-.571 4.014-1.9 6.491-4.237 3.42-3.227 8.71-5.444 11.431-15.787 3.904-14.834.968-19.018-3.479-19.181Z"/></svg>
diff --git a/engine/editor/icons/BoneMapHumanLeftHand.svg b/engine/editor/icons/BoneMapHumanLeftHand.svg
index 9e1301ad..eeefcbb7 100644
--- a/engine/editor/icons/BoneMapHumanLeftHand.svg
+++ b/engine/editor/icons/BoneMapHumanLeftHand.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M175.976 196.525c1.762-16.733 7.034-38.341 4.633-65.048-.286-3.178-1.125-12.071-1.115-20.683.006-5.294-.528-12.127-.494-16.044.042-4.833-.107-10.396-.156-13.939-.263-18.86-3.307-21.456-7.704-21.456-4.311 0-6.692 3.566-6.765 21.145-.015 3.605.125 12.75.125 14.625 0 4.377-.083 8.542 0 13.375.112 6.489-1.07 17-2.25 17-.976 0-2.025-9.825-2.394-19.25-.189-4.831-.805-14.584-.65-17.525.44-8.353.119-14.729.384-22.541.796-23.402-3.254-27.933-8.673-27.933-5.494 0-8.995 14.422-8.713 28.556.032 1.599-.291 12.685.047 22.465.189 5.453-.267 12.407-.42 17.418-.274 8.942-1.439 15.974-2.218 15.974-.66 0-1.033-8.146-1.364-16.427-.214-5.389-1.117-14.62-.916-20.904.472-14.753-.284-27.556-.265-30.375.158-23.739-3.665-30.775-9.013-30.775-5.369 0-9.297 7.548-9.15 30.835.016 2.633-.655 24.982-.44 30.454.216 5.498-.693 16.266-.879 21.205-.325 8.63-1.623 15.987-2.281 15.987-.821 0-2.699-6.41-2.931-15.242-.147-5.568.307-12.747.156-17.672-.315-10.176-.794-16.157-.97-24.927-.486-24.295-4.088-26.572-9.535-26.572-4.49 0-8.113 7.168-8.164 28.758-.017 6.925-.608 15.656-.079 23.582.201 3.02-.156 10.628-.469 18.473-.2 5.002-.275 11.876-.284 15.944-.042 19.649-6.678 33.356-9.139 32.827-7.583-1.63-12.912-10.979-17.805-29.327-2.637-9.891-9.166-17.787-17.474-19.453-6.475-1.298-4.946 11.54-.33 31.323 2.162 9.267 6.977 21.557 9.891 30.664 7.913 24.729 31.394 47.141 40.226 57.137 4.286 4.85 59.223 4.85 66.147 0 2.882-2.018 10.772-25.39 11.431-31.654Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M175.976 196.525c1.762-16.733 7.034-38.341 4.633-65.048-.286-3.178-1.125-12.071-1.115-20.683.006-5.294-.528-12.127-.494-16.044.042-4.833-.107-10.396-.156-13.939-.263-18.86-3.307-21.456-7.704-21.456-4.311 0-6.692 3.566-6.765 21.145-.015 3.605.125 12.75.125 14.625 0 4.377-.083 8.542 0 13.375.112 6.489-1.07 17-2.25 17-.976 0-2.025-9.825-2.394-19.25-.189-4.831-.805-14.584-.65-17.525.44-8.353.119-14.729.384-22.541.796-23.402-3.254-27.933-8.673-27.933-5.494 0-8.995 14.422-8.713 28.556.032 1.599-.291 12.685.047 22.465.189 5.453-.267 12.407-.42 17.418-.274 8.942-1.439 15.974-2.218 15.974-.66 0-1.033-8.146-1.364-16.427-.214-5.389-1.117-14.62-.916-20.904.472-14.753-.284-27.556-.265-30.375.158-23.739-3.665-30.775-9.013-30.775-5.369 0-9.297 7.548-9.15 30.835.016 2.633-.655 24.982-.44 30.454.216 5.498-.693 16.266-.879 21.205-.325 8.63-1.623 15.987-2.281 15.987-.821 0-2.699-6.41-2.931-15.242-.147-5.568.307-12.747.156-17.672-.315-10.176-.794-16.157-.97-24.927-.486-24.295-4.088-26.572-9.535-26.572-4.49 0-8.113 7.168-8.164 28.758-.017 6.925-.608 15.656-.079 23.582.201 3.02-.156 10.628-.469 18.473-.2 5.002-.275 11.876-.284 15.944-.042 19.649-6.678 33.356-9.139 32.827-7.583-1.63-12.912-10.979-17.805-29.327-2.637-9.891-9.166-17.787-17.474-19.453-6.475-1.298-4.946 11.54-.33 31.323 2.162 9.267 6.977 21.557 9.891 30.664 7.913 24.729 31.394 47.141 40.226 57.137 4.286 4.85 59.223 4.85 66.147 0 2.882-2.018 10.772-25.39 11.431-31.654Z"/></svg>
diff --git a/engine/editor/icons/BoneMapHumanRightHand.svg b/engine/editor/icons/BoneMapHumanRightHand.svg
index a2d1297f..ddd0418e 100644
--- a/engine/editor/icons/BoneMapHumanRightHand.svg
+++ b/engine/editor/icons/BoneMapHumanRightHand.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M80.023 196.525c-1.761-16.733-7.033-38.341-4.632-65.048.286-3.178 1.125-12.071 1.115-20.683-.006-5.294.528-12.127.494-16.044-.042-4.833.107-10.396.156-13.939.263-18.86 3.306-21.456 7.703-21.456 4.312 0 6.693 3.566 6.766 21.145.015 3.605-.125 12.75-.125 14.625 0 4.377.083 8.542 0 13.375-.112 6.489 1.07 17 2.25 17 .975 0 2.025-9.825 2.394-19.25.189-4.831.804-14.584.65-17.525-.44-8.353-.119-14.729-.385-22.541-.795-23.402 3.254-27.933 8.674-27.933 5.493 0 8.995 14.422 8.712 28.556-.032 1.599.292 12.685-.047 22.465-.188 5.453.268 12.407.421 17.418.274 8.942 1.439 15.974 2.217 15.974.661 0 1.034-8.146 1.364-16.427.215-5.389 1.117-14.62.916-20.904-.471-14.753.285-27.556.266-30.375-.159-23.739 3.665-30.775 9.013-30.775 5.369 0 9.297 7.548 9.15 30.835-.017 2.633.655 24.982.44 30.454-.216 5.498.693 16.266.879 21.205.325 8.63 1.623 15.987 2.281 15.987.82 0 2.699-6.41 2.931-15.242.147-5.568-.308-12.747-.156-17.672.314-10.176.794-16.157.969-24.927.487-24.295 4.088-26.572 9.536-26.572 4.489 0 8.113 7.168 8.164 28.758.016 6.925.607 15.656.079 23.582-.202 3.02.155 10.628.468 18.473.2 5.002.276 11.876.285 15.944.042 19.649 6.678 33.356 9.139 32.827 7.583-1.63 12.912-10.979 17.804-29.327 2.638-9.891 9.167-17.787 17.475-19.453 6.475-1.298 4.946 11.54.33 31.323-2.162 9.267-6.977 21.557-9.892 30.664-7.913 24.729-31.393 47.141-40.225 57.137-4.287 4.85-59.224 4.85-66.148 0-2.88-2.018-10.771-25.39-11.43-31.654Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path fill="#3f3f3f" d="M0 0h256v256H0V0Z"/><path fill="#b2b2b2" d="M80.023 196.525c-1.761-16.733-7.033-38.341-4.632-65.048.286-3.178 1.125-12.071 1.115-20.683-.006-5.294.528-12.127.494-16.044-.042-4.833.107-10.396.156-13.939.263-18.86 3.306-21.456 7.703-21.456 4.312 0 6.693 3.566 6.766 21.145.015 3.605-.125 12.75-.125 14.625 0 4.377.083 8.542 0 13.375-.112 6.489 1.07 17 2.25 17 .975 0 2.025-9.825 2.394-19.25.189-4.831.804-14.584.65-17.525-.44-8.353-.119-14.729-.385-22.541-.795-23.402 3.254-27.933 8.674-27.933 5.493 0 8.995 14.422 8.712 28.556-.032 1.599.292 12.685-.047 22.465-.188 5.453.268 12.407.421 17.418.274 8.942 1.439 15.974 2.217 15.974.661 0 1.034-8.146 1.364-16.427.215-5.389 1.117-14.62.916-20.904-.471-14.753.285-27.556.266-30.375-.159-23.739 3.665-30.775 9.013-30.775 5.369 0 9.297 7.548 9.15 30.835-.017 2.633.655 24.982.44 30.454-.216 5.498.693 16.266.879 21.205.325 8.63 1.623 15.987 2.281 15.987.82 0 2.699-6.41 2.931-15.242.147-5.568-.308-12.747-.156-17.672.314-10.176.794-16.157.969-24.927.487-24.295 4.088-26.572 9.536-26.572 4.489 0 8.113 7.168 8.164 28.758.016 6.925.607 15.656.079 23.582-.202 3.02.155 10.628.468 18.473.2 5.002.276 11.876.285 15.944.042 19.649 6.678 33.356 9.139 32.827 7.583-1.63 12.912-10.979 17.804-29.327 2.638-9.891 9.167-17.787 17.475-19.453 6.475-1.298 4.946 11.54.33 31.323-2.162 9.267-6.977 21.557-9.892 30.664-7.913 24.729-31.393 47.141-40.225 57.137-4.287 4.85-59.224 4.85-66.148 0-2.88-2.018-10.771-25.39-11.43-31.654Z"/></svg>
diff --git a/engine/editor/icons/BoneMapperHandle.svg b/engine/editor/icons/BoneMapperHandle.svg
index 5ca39938..db3cf384 100644
--- a/engine/editor/icons/BoneMapperHandle.svg
+++ b/engine/editor/icons/BoneMapperHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill-opacity=".294"/><circle cx="6" cy="6" r="4" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill-opacity=".294"/><circle cx="6" cy="6" r="4" fill="#fff"/></svg>
diff --git a/engine/editor/icons/BoneMapperHandleCircle.svg b/engine/editor/icons/BoneMapperHandleCircle.svg
index abd2e2c9..bd5fbc37 100644
--- a/engine/editor/icons/BoneMapperHandleCircle.svg
+++ b/engine/editor/icons/BoneMapperHandleCircle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#fff"/></svg>
diff --git a/engine/editor/icons/BoneMapperHandleSelected.svg b/engine/editor/icons/BoneMapperHandleSelected.svg
index fba4eb2a..f4a5c435 100644
--- a/engine/editor/icons/BoneMapperHandleSelected.svg
+++ b/engine/editor/icons/BoneMapperHandleSelected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill-opacity=".294"/><g fill="#fff"><circle cx="6" cy="6" r="4"/><path d="M7 0h5v5h-1V1H7zm5 7v5H7v-1h4V7zm-7 5H0V7h1v4h4zM0 5V0h5v1H1v4z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill-opacity=".294"/><g fill="#fff"><circle cx="6" cy="6" r="4"/><path d="M7 0h5v5h-1V1H7zm5 7v5H7v-1h4V7zm-7 5H0V7h1v4h4zM0 5V0h5v1H1v4z"/></g></svg>
diff --git a/engine/editor/icons/BoxContainer.svg b/engine/editor/icons/BoxContainer.svg
index cdd06333..1c231c3c 100644
--- a/engine/editor/icons/BoxContainer.svg
+++ b/engine/editor/icons/BoxContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v2H3zm0 4h10v2H3zm0 4h10v2H3z" transform="rotate(45 4.241 9.083)scale(.737)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v2H3zm0 4h10v2H3zm0 4h10v2H3z" transform="rotate(45 4.241 9.083)scale(.737)"/></svg>
diff --git a/engine/editor/icons/BoxMesh.svg b/engine/editor/icons/BoxMesh.svg
index 70c31039..fe1fb3dd 100644
--- a/engine/editor/icons/BoxMesh.svg
+++ b/engine/editor/icons/BoxMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5"/></svg>
diff --git a/engine/editor/icons/BoxOccluder3D.svg b/engine/editor/icons/BoxOccluder3D.svg
index 9008f75b..f974b9eb 100644
--- a/engine/editor/icons/BoxOccluder3D.svg
+++ b/engine/editor/icons/BoxOccluder3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="m8 .889-.506.254A4.5 4.5 0 1 1 1 7.314v4.297l7 3.5 7-3.5V4.39z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="m8 .889-.506.254A4.5 4.5 0 1 1 1 7.314v4.297l7 3.5 7-3.5V4.39z"/></svg>
diff --git a/engine/editor/icons/BoxShape3D.svg b/engine/editor/icons/BoxShape3D.svg
index 6af9780f..3ac50c5e 100644
--- a/engine/editor/icons/BoxShape3D.svg
+++ b/engine/editor/icons/BoxShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#2998ff" d="m8 1-7 3v8l7 3 7-3v-8z"/><path fill="#5fb2ff" d="m8 15-7-3v-8l7 3z"/><path fill="#a2d2ff" d="m1 4 7 3 7-3-7-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#2998ff" d="m8 1-7 3v8l7 3 7-3v-8z"/><path fill="#5fb2ff" d="m8 15-7-3v-8l7 3z"/><path fill="#a2d2ff" d="m1 4 7 3 7-3-7-3z"/></svg>
diff --git a/engine/editor/icons/Breakpoint.svg b/engine/editor/icons/Breakpoint.svg
index 7eff32c4..2d79f94b 100644
--- a/engine/editor/icons/Breakpoint.svg
+++ b/engine/editor/icons/Breakpoint.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.308" fill="#e0e0e0"/><circle cx="8" cy="8" r="3.033" fill="#fefefe"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.308" fill="#e0e0e0"/><circle cx="8" cy="8" r="3.033" fill="#fefefe"/></svg>
diff --git a/engine/editor/icons/Bucket.svg b/engine/editor/icons/Bucket.svg
index 67f336bb..6128c6c8 100644
--- a/engine/editor/icons/Bucket.svg
+++ b/engine/editor/icons/Bucket.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8.693 2.51a.754.754 0 0 0-1.067 0l-.8.8 1.538 1.54a1.132 1.132 0 1 1-1.066 1.066l-1.54-1.54-.8.8-1.6-1.6A.754.754 0 0 1 4.425 2.51l3.273 3.273a.754.754 0 1 0 .533-.533L4.958 1.977A1.509 1.509 0 0 0 2.824 4.11l1.6 1.6-3.2 3.201a.754.754 0 0 0 0 1.067l4.268 4.268a.754.754 0 0 0 1.067 0l6.935-6.935zm4.801 5.869c-1.51 2.263-1.51 2.263-1.51 3.018 0 .754.756 1.509 1.51 1.509s1.51-.755 1.51-1.51c0-.754 0-.754-1.51-3.017z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8.693 2.51a.754.754 0 0 0-1.067 0l-.8.8 1.538 1.54a1.132 1.132 0 1 1-1.066 1.066l-1.54-1.54-.8.8-1.6-1.6A.754.754 0 0 1 4.425 2.51l3.273 3.273a.754.754 0 1 0 .533-.533L4.958 1.977A1.509 1.509 0 0 0 2.824 4.11l1.6 1.6-3.2 3.201a.754.754 0 0 0 0 1.067l4.268 4.268a.754.754 0 0 0 1.067 0l6.935-6.935zm4.801 5.869c-1.51 2.263-1.51 2.263-1.51 3.018 0 .754.756 1.509 1.51 1.509s1.51-.755 1.51-1.51c0-.754 0-.754-1.51-3.017z"/></svg>
diff --git a/engine/editor/icons/BusVuActive.svg b/engine/editor/icons/BusVuActive.svg
index 730961a0..cff2b53d 100644
--- a/engine/editor/icons/BusVuActive.svg
+++ b/engine/editor/icons/BusVuActive.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="128"><linearGradient id="a" x1="8" x2="8" y1="2" y2="126" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M3 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 5H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="128"><linearGradient id="a" x1="8" x2="8" y1="2" y2="126" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff5f5f"/><stop offset=".5" stop-color="#e1da5b"/><stop offset="1" stop-color="#5fff97"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M3 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 5H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10"/></svg>
diff --git a/engine/editor/icons/BusVuFrozen.svg b/engine/editor/icons/BusVuFrozen.svg
index ce3c9157..7c89e8f9 100644
--- a/engine/editor/icons/BusVuFrozen.svg
+++ b/engine/editor/icons/BusVuFrozen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="128"><linearGradient id="a" x1="8" x2="8" y1="2" y2="126" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#62aeff"/><stop offset=".5" stop-color="#75d1e6"/><stop offset="1" stop-color="#84ffee"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M3 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 5H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10" opacity=".7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="128"><linearGradient id="a" x1="8" x2="8" y1="2" y2="126" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#62aeff"/><stop offset=".5" stop-color="#75d1e6"/><stop offset="1" stop-color="#84ffee"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M3 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 5H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10m0 3H3m0 3h10" opacity=".7"/></svg>
diff --git a/engine/editor/icons/Button.svg b/engine/editor/icons/Button.svg
index ab463c47..20d60336 100644
--- a/engine/editor/icons/Button.svg
+++ b/engine/editor/icons/Button.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M7 1v3.133l-1.445-.965-1.11 1.664 3 2a1 1 0 0 0 1.11 0l3-2-1.11-1.664L9 4.133V1zM5.5 9A1.5 1.5 0 0 0 4 10.5V12H2v2h12v-2h-2v-1.5A1.5 1.5 0 0 0 10.5 9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M7 1v3.133l-1.445-.965-1.11 1.664 3 2a1 1 0 0 0 1.11 0l3-2-1.11-1.664L9 4.133V1zM5.5 9A1.5 1.5 0 0 0 4 10.5V12H2v2h12v-2h-2v-1.5A1.5 1.5 0 0 0 10.5 9z"/></svg>
diff --git a/engine/editor/icons/ButtonGroup.svg b/engine/editor/icons/ButtonGroup.svg
index 3bba919d..a377d0c1 100644
--- a/engine/editor/icons/ButtonGroup.svg
+++ b/engine/editor/icons/ButtonGroup.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 1h2a1 1 0 0 1 0 2H5a1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM6 6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm5 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm0 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm-7 2h1v2H4zm2 0h1v2H6zm2 0h1v2H8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 1h2a1 1 0 0 1 0 2H5a1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM6 6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm5 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm0 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm-7 2h1v2H4zm2 0h1v2H6zm2 0h1v2H8z"/></svg>
diff --git a/engine/editor/icons/CPUParticles2D.svg b/engine/editor/icons/CPUParticles2D.svg
index d511546d..151ad672 100644
--- a/engine/editor/icons/CPUParticles2D.svg
+++ b/engine/editor/icons/CPUParticles2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.586.5a.764.764 0 0 0-.764.764v.6h-1.2a.764.764 0 0 0-.764.764v1.2h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v4.5h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v1.2a.764.764 0 0 0 .764.764h1.2v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h4.5v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h1.2a.764.764 0 0 0 .764-.764v-1.2h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-4.5h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-1.2a.764.764 0 0 0-.764-.763h-1.2v-.6a.764.764 0 0 0-.764-.764h-.4a.764.764 0 0 0-.764.764v.6h-4.5v-.6a.764.764 0 0 0-.764-.764zm6.575 5.3a2.186 2.186 0 0 1-.3 4.349h-5.83a2.186 2.186 0 0 1-.3-4.349 3.28 3.644 0 0 1 6.434 0zM5.084 11a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zm5.83 0a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zM8 11.729a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.46z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.586.5a.764.764 0 0 0-.764.764v.6h-1.2a.764.764 0 0 0-.764.764v1.2h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v4.5h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v1.2a.764.764 0 0 0 .764.764h1.2v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h4.5v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h1.2a.764.764 0 0 0 .764-.764v-1.2h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-4.5h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-1.2a.764.764 0 0 0-.764-.763h-1.2v-.6a.764.764 0 0 0-.764-.764h-.4a.764.764 0 0 0-.764.764v.6h-4.5v-.6a.764.764 0 0 0-.764-.764zm6.575 5.3a2.186 2.186 0 0 1-.3 4.349h-5.83a2.186 2.186 0 0 1-.3-4.349 3.28 3.644 0 0 1 6.434 0zM5.084 11a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zm5.83 0a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zM8 11.729a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.46z"/></svg>
diff --git a/engine/editor/icons/CPUParticles3D.svg b/engine/editor/icons/CPUParticles3D.svg
index 475eeb74..4ea46f16 100644
--- a/engine/editor/icons/CPUParticles3D.svg
+++ b/engine/editor/icons/CPUParticles3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.586.5a.764.764 0 0 0-.764.764v.6h-1.2a.764.764 0 0 0-.764.764v1.2h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v4.5h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v1.2a.764.764 0 0 0 .764.764h1.2v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h4.5v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h1.2a.764.764 0 0 0 .764-.764v-1.2h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-4.5h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-1.2a.764.764 0 0 0-.764-.763h-1.2v-.6a.764.764 0 0 0-.764-.764h-.4a.764.764 0 0 0-.764.764v.6h-4.5v-.6a.764.764 0 0 0-.764-.764zm6.575 5.3a2.186 2.186 0 0 1-.3 4.349h-5.83a2.186 2.186 0 0 1-.3-4.349 3.28 3.644 0 0 1 6.434 0zM5.084 11a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zm5.83 0a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zM8 11.729a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.46z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.586.5a.764.764 0 0 0-.764.764v.6h-1.2a.764.764 0 0 0-.764.764v1.2h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v4.5h-.6a.764.764 0 0 0-.764.764v.4a.764.764 0 0 0 .764.764h.6v1.2a.764.764 0 0 0 .764.764h1.2v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h4.5v.6a.764.764 0 0 0 .764.764h.4a.764.764 0 0 0 .764-.764v-.6h1.2a.764.764 0 0 0 .764-.764v-1.2h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-4.5h.6a.764.764 0 0 0 .764-.764v-.4a.764.764 0 0 0-.764-.764h-.6v-1.2a.764.764 0 0 0-.764-.763h-1.2v-.6a.764.764 0 0 0-.764-.764h-.4a.764.764 0 0 0-.764.764v.6h-4.5v-.6a.764.764 0 0 0-.764-.764zm6.575 5.3a2.186 2.186 0 0 1-.3 4.349h-5.83a2.186 2.186 0 0 1-.3-4.349 3.28 3.644 0 0 1 6.434 0zM5.084 11a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zm5.83 0a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.459zM8 11.729a.729.729 0 0 1 0 1.459.729.729 0 0 1 0-1.46z"/></svg>
diff --git a/engine/editor/icons/Callable.svg b/engine/editor/icons/Callable.svg
index 20798c60..35c4d3fb 100644
--- a/engine/editor/icons/Callable.svg
+++ b/engine/editor/icons/Callable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m12 1c-2 2-4 4-7 4h-4v5h4c3 0 5 2 7 4zm1 4v5c2.59-.016 2.59-4.985 0-5zm-11 6v4h2l1-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m12 1c-2 2-4 4-7 4h-4v5h4c3 0 5 2 7 4zm1 4v5c2.59-.016 2.59-4.985 0-5zm-11 6v4h2l1-4z"/></svg>
diff --git a/engine/editor/icons/Camera.svg b/engine/editor/icons/Camera.svg
index 8612d458..2a9ecb2f 100644
--- a/engine/editor/icons/Camera.svg
+++ b/engine/editor/icons/Camera.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M9 2a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1v-1l3 2V7l-3 2V7.23A3 3 0 0 0 9 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M9 2a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1v-1l3 2V7l-3 2V7.23A3 3 0 0 0 9 2z"/></svg>
diff --git a/engine/editor/icons/Camera2D.svg b/engine/editor/icons/Camera2D.svg
index e51e3c6d..721ec4fc 100644
--- a/engine/editor/icons/Camera2D.svg
+++ b/engine/editor/icons/Camera2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M9 2a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1v-1l3 2V7l-3 2V7.23A3 3 0 0 0 9 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M9 2a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1v-1l3 2V7l-3 2V7.23A3 3 0 0 0 9 2z"/></svg>
diff --git a/engine/editor/icons/Camera3D.svg b/engine/editor/icons/Camera3D.svg
index dacf2be5..1f0e771a 100644
--- a/engine/editor/icons/Camera3D.svg
+++ b/engine/editor/icons/Camera3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M9 2a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1v-1l3 2V7l-3 2V7.23A3 3 0 0 0 9 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M9 2a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V12a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1v-1l3 2V7l-3 2V7.23A3 3 0 0 0 9 2z"/></svg>
diff --git a/engine/editor/icons/CameraAttributes.svg b/engine/editor/icons/CameraAttributes.svg
index bdc25086..eb0c9069 100644
--- a/engine/editor/icons/CameraAttributes.svg
+++ b/engine/editor/icons/CameraAttributes.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M6 2a3 3 0 0 0-2 5.23V9L1 7v6l3-2v1a1 1 0 0 0 1 1h3a2 2 0 0 1 .73-1.24 1.83 1.83 0 0 1 1.828-3.143 1.8 1.8 0 0 1 3.313-.75 3 3 0 0 0-4.883-3.09A3 3 0 0 0 6 2zm6.36 6.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M6 2a3 3 0 0 0-2 5.23V9L1 7v6l3-2v1a1 1 0 0 0 1 1h3a2 2 0 0 1 .73-1.24 1.83 1.83 0 0 1 1.828-3.143 1.8 1.8 0 0 1 3.313-.75 3 3 0 0 0-4.883-3.09A3 3 0 0 0 6 2zm6.36 6.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
diff --git a/engine/editor/icons/CameraAttributesPhysical.svg b/engine/editor/icons/CameraAttributesPhysical.svg
index 964bea10..b577f733 100644
--- a/engine/editor/icons/CameraAttributesPhysical.svg
+++ b/engine/editor/icons/CameraAttributesPhysical.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 2a3 3 0 0 0-2 5.23V9L1 7v6l3-2v1a1 1 0 0 0 1 1h3a2 2 0 0 1 .73-1.24 1.83 1.83 0 0 1 1.828-3.143 1.8 1.8 0 0 1 3.313-.75 3 3 0 0 0-4.883-3.09A3 3 0 0 0 6 2z"/><path fill="#5fb2ff" d="M12.36 8.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 2a3 3 0 0 0-2 5.23V9L1 7v6l3-2v1a1 1 0 0 0 1 1h3a2 2 0 0 1 .73-1.24 1.83 1.83 0 0 1 1.828-3.143 1.8 1.8 0 0 1 3.313-.75 3 3 0 0 0-4.883-3.09A3 3 0 0 0 6 2z"/><path fill="#5fb2ff" d="M12.36 8.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
diff --git a/engine/editor/icons/CameraAttributesPractical.svg b/engine/editor/icons/CameraAttributesPractical.svg
index 8479f231..9cdc14cc 100644
--- a/engine/editor/icons/CameraAttributesPractical.svg
+++ b/engine/editor/icons/CameraAttributesPractical.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 2a3 3 0 0 0-2 5.23V9L1 7v6l3-2v1a1 1 0 0 0 1 1h3a2 2 0 0 1 .73-1.24 1.83 1.83 0 0 1 1.828-3.143 1.8 1.8 0 0 1 3.313-.75 3 3 0 0 0-4.883-3.09A3 3 0 0 0 6 2z"/><path fill="#ffca5f" d="M12.36 8.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 2a3 3 0 0 0-2 5.23V9L1 7v6l3-2v1a1 1 0 0 0 1 1h3a2 2 0 0 1 .73-1.24 1.83 1.83 0 0 1 1.828-3.143 1.8 1.8 0 0 1 3.313-.75 3 3 0 0 0-4.883-3.09A3 3 0 0 0 6 2z"/><path fill="#ffca5f" d="M12.36 8.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
diff --git a/engine/editor/icons/CameraTexture.svg b/engine/editor/icons/CameraTexture.svg
index 530cd8c6..042c4290 100644
--- a/engine/editor/icons/CameraTexture.svg
+++ b/engine/editor/icons/CameraTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm4 1-.75 1H5a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1H9.75L9 4zm1 2a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm4 1-.75 1H5a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1H9.75L9 4zm1 2a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3z"/></svg>
diff --git a/engine/editor/icons/CanvasGroup.svg b/engine/editor/icons/CanvasGroup.svg
index 913e8427..8d36d76c 100644
--- a/engine/editor/icons/CanvasGroup.svg
+++ b/engine/editor/icons/CanvasGroup.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" fill-opacity=".6" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#8da5f3" d="M1 1v2h2V1H1zm12 0v2h2V1h-2zM1 13v2h2v-2H1zm12 0v2h2v-2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" fill-opacity=".6" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#8da5f3" d="M1 1v2h2V1H1zm12 0v2h2V1h-2zM1 13v2h2v-2H1zm12 0v2h2v-2h-2z"/></svg>
diff --git a/engine/editor/icons/CanvasItem.svg b/engine/editor/icons/CanvasItem.svg
index 0006015a..8fa12d98 100644
--- a/engine/editor/icons/CanvasItem.svg
+++ b/engine/editor/icons/CanvasItem.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M2.92 10c-.263.3-.42.73-.42 1.238 0 1.628-3.138-.178-.337 2.67.884.9 2.654.67 3.538-.228a2.33 2.33 0 0 0 0-3.256c-1.1-1.119-2.2-1.084-2.78-.424zm2.3-1.64 2.4 2.4 6.8-6.8a1.7 1.7 0 0 0-2.4-2.45z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M2.92 10c-.263.3-.42.73-.42 1.238 0 1.628-3.138-.178-.337 2.67.884.9 2.654.67 3.538-.228a2.33 2.33 0 0 0 0-3.256c-1.1-1.119-2.2-1.084-2.78-.424zm2.3-1.64 2.4 2.4 6.8-6.8a1.7 1.7 0 0 0-2.4-2.45z"/></svg>
diff --git a/engine/editor/icons/CanvasItemMaterial.svg b/engine/editor/icons/CanvasItemMaterial.svg
index e5b34fd1..69d1a977 100644
--- a/engine/editor/icons/CanvasItemMaterial.svg
+++ b/engine/editor/icons/CanvasItemMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><circle cx="8" cy="8" r="7" fill="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><circle cx="8" cy="8" r="7" fill="url(#a)"/></svg>
diff --git a/engine/editor/icons/CanvasLayer.svg b/engine/editor/icons/CanvasLayer.svg
index 87c3fc53..1b90f095 100644
--- a/engine/editor/icons/CanvasLayer.svg
+++ b/engine/editor/icons/CanvasLayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v6h1V3a1 1 0 0 1 1-1h6V1zm-.08 9c-.263.3-.42.73-.42 1.238 0 1.628-3.138-.178-.337 2.67.884.9 2.654.67 3.538-.228a2.33 2.33 0 0 0 0-3.256c-1.1-1.119-2.2-1.084-2.78-.424zm2.381-1.61 2.4 2.441 6.802-6.917a1.7 1.7 0 0 0-2.4-2.442zm8.7-1.39v6a1 1 0 0 1-1 1H7v1h6a2 2 0 0 0 2-2V7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v6h1V3a1 1 0 0 1 1-1h6V1zm-.08 9c-.263.3-.42.73-.42 1.238 0 1.628-3.138-.178-.337 2.67.884.9 2.654.67 3.538-.228a2.33 2.33 0 0 0 0-3.256c-1.1-1.119-2.2-1.084-2.78-.424zm2.381-1.61 2.4 2.441 6.802-6.917a1.7 1.7 0 0 0-2.4-2.442zm8.7-1.39v6a1 1 0 0 1-1 1H7v1h6a2 2 0 0 0 2-2V7z"/></svg>
diff --git a/engine/editor/icons/CanvasModulate.svg b/engine/editor/icons/CanvasModulate.svg
index 8414cf37..971d7e6e 100644
--- a/engine/editor/icons/CanvasModulate.svg
+++ b/engine/editor/icons/CanvasModulate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v14h14V1zm2 2h10v10H3z"/><path fill="#45d7ff" d="M12 12H7.2L12 7.2z"/><path fill="#ff4545" d="M4 4h4.8L4 8.8z"/><path fill="#80ff45" d="M4 12V8.8L8.8 4H12v3.2L7.2 12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v14h14V1zm2 2h10v10H3z"/><path fill="#45d7ff" d="M12 12H7.2L12 7.2z"/><path fill="#ff4545" d="M4 4h4.8L4 8.8z"/><path fill="#80ff45" d="M4 12V8.8L8.8 4H12v3.2L7.2 12z"/></svg>
diff --git a/engine/editor/icons/CanvasTexture.svg b/engine/editor/icons/CanvasTexture.svg
index 302db554..f51dd6df 100644
--- a/engine/editor/icons/CanvasTexture.svg
+++ b/engine/editor/icons/CanvasTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v8.5c1.5.5 1-1 2-1V3h10v2.2a2.415 2.415 0 0 1 2 .5V2a1 1 0 0 0-1-1zm1.36 10.18c-.283.169-.516.466-.645.865-.416 1.277-2.417-.94-.946 2.009.465.931 1.912 1.202 2.835.723a1.922 1.922 0 0 0 .83-2.555c-.578-1.158-1.45-1.411-2.074-1.041zm2.222-.7 1.272 2.495 7.069-3.602a1.415 1.415 0 0 0-1.259-2.534zM9 5v1H8v1H6v1H5v1H4v1h.25L11 6.527V6h-1V5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v8.5c1.5.5 1-1 2-1V3h10v2.2a2.415 2.415 0 0 1 2 .5V2a1 1 0 0 0-1-1zm1.36 10.18c-.283.169-.516.466-.645.865-.416 1.277-2.417-.94-.946 2.009.465.931 1.912 1.202 2.835.723a1.922 1.922 0 0 0 .83-2.555c-.578-1.158-1.45-1.411-2.074-1.041zm2.222-.7 1.272 2.495 7.069-3.602a1.415 1.415 0 0 0-1.259-2.534zM9 5v1H8v1H6v1H5v1H4v1h.25L11 6.527V6h-1V5z"/></svg>
diff --git a/engine/editor/icons/CapsuleMesh.svg b/engine/editor/icons/CapsuleMesh.svg
index 7643bdf3..480ef18b 100644
--- a/engine/editor/icons/CapsuleMesh.svg
+++ b/engine/editor/icons/CapsuleMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M4 6a4 4 0 0 1 8 0v4a4 4 0 0 1-8 0zm0 1.25a2.5 1 0 0 0 8 0m-4-5v12"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M4 6a4 4 0 0 1 8 0v4a4 4 0 0 1-8 0zm0 1.25a2.5 1 0 0 0 8 0m-4-5v12"/></svg>
diff --git a/engine/editor/icons/CapsuleShape2D.svg b/engine/editor/icons/CapsuleShape2D.svg
index 89f24b11..09a3a182 100644
--- a/engine/editor/icons/CapsuleShape2D.svg
+++ b/engine/editor/icons/CapsuleShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-width="2" d="M4 6v4a4 4 0 0 0 8 0V6a4 4 0 0 0-8 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-width="2" d="M4 6v4a4 4 0 0 0 8 0V6a4 4 0 0 0-8 0"/></svg>
diff --git a/engine/editor/icons/CapsuleShape3D.svg b/engine/editor/icons/CapsuleShape3D.svg
index 6100b1d0..562e7bd8 100644
--- a/engine/editor/icons/CapsuleShape3D.svg
+++ b/engine/editor/icons/CapsuleShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M3 6v4a5 5 0 0 0 10 0V6A5 5 0 0 0 3 6z"/><circle cx="6.5" cy="4.5" r="1.5" fill="#a2d2ff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M3 6v4a5 5 0 0 0 10 0V6A5 5 0 0 0 3 6z"/><circle cx="6.5" cy="4.5" r="1.5" fill="#a2d2ff"/></svg>
diff --git a/engine/editor/icons/CenterContainer.svg b/engine/editor/icons/CenterContainer.svg
index c8d10c10..e26dcf96 100644
--- a/engine/editor/icons/CenterContainer.svg
+++ b/engine/editor/icons/CenterContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m3 1c-1.1046 0-2 .89543-2 2v10c0 1.1046.89543 2 2 2h10c1.1046 0 2-.89543 2-2v-10c0-1.1046-.89543-2-2-2zm0 2h10v10h-10zm3 1 2 2 2-2zm-2 2v4l2-2zm8 0-2 2 2 2zm-4 4-2 2h4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m3 1c-1.1046 0-2 .89543-2 2v10c0 1.1046.89543 2 2 2h10c1.1046 0 2-.89543 2-2v-10c0-1.1046-.89543-2-2-2zm0 2h10v10h-10zm3 1 2 2 2-2zm-2 2v4l2-2zm8 0-2 2 2 2zm-4 4-2 2h4z"/></svg>
diff --git a/engine/editor/icons/CenterView.svg b/engine/editor/icons/CenterView.svg
index fbd23ae3..82b494db 100644
--- a/engine/editor/icons/CenterView.svg
+++ b/engine/editor/icons/CenterView.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="4" height="4" x="6" y="6" fill="#e0e0e0" rx="1"/><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="1.5" d="M1.5 5.5 4 8l-2.5 2.5m13 0L12 8l2.5-2.5m-4-4L8 4 5.5 1.5m0 13L8 12l2.5 2.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="4" height="4" x="6" y="6" fill="#e0e0e0" rx="1"/><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="1.5" d="M1.5 5.5 4 8l-2.5 2.5m13 0L12 8l2.5-2.5m-4-4L8 4 5.5 1.5m0 13L8 12l2.5 2.5"/></svg>
diff --git a/engine/editor/icons/CharacterBody2D.svg b/engine/editor/icons/CharacterBody2D.svg
index a6c12d2b..917bc0ed 100644
--- a/engine/editor/icons/CharacterBody2D.svg
+++ b/engine/editor/icons/CharacterBody2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6.492 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h1v.99a1 1 0 0 0-.316.062l-2.051.684-.684-2.051a1 1 0 0 0-1.898.631l1 3a1 1 0 0 0 1.265.633l1.684-.56v.61c0 .041.019.076.024.116l-4.579 3.052a1 1 0 1 0 1.11 1.664l5.056-3.37 1.495 2.986a1 1 0 0 0 1.21.502l3-1a1 1 0 1 0-.632-1.897l-2.178.725-.975-1.951a.981.981 0 0 0 .469-.827V9h1.383l.722 1.448a1 1 0 1 0 1.79-.895l-1-2A1 1 0 0 0 12.492 7h-3V6h1a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm0 2h1v2h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6.492 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h1v.99a1 1 0 0 0-.316.062l-2.051.684-.684-2.051a1 1 0 0 0-1.898.631l1 3a1 1 0 0 0 1.265.633l1.684-.56v.61c0 .041.019.076.024.116l-4.579 3.052a1 1 0 1 0 1.11 1.664l5.056-3.37 1.495 2.986a1 1 0 0 0 1.21.502l3-1a1 1 0 1 0-.632-1.897l-2.178.725-.975-1.951a.981.981 0 0 0 .469-.827V9h1.383l.722 1.448a1 1 0 1 0 1.79-.895l-1-2A1 1 0 0 0 12.492 7h-3V6h1a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm0 2h1v2h-1z"/></svg>
diff --git a/engine/editor/icons/CharacterBody3D.svg b/engine/editor/icons/CharacterBody3D.svg
index 4732bba1..887e276a 100644
--- a/engine/editor/icons/CharacterBody3D.svg
+++ b/engine/editor/icons/CharacterBody3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6.492 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h1v.99a1 1 0 0 0-.316.062l-2.051.684-.684-2.051a1 1 0 0 0-1.898.631l1 3a1 1 0 0 0 1.265.633l1.684-.56v.61c0 .041.019.076.024.116l-4.579 3.052a1 1 0 1 0 1.11 1.664l5.056-3.37 1.495 2.986a1 1 0 0 0 1.21.502l3-1a1 1 0 1 0-.632-1.897l-2.178.725-.975-1.951a.981.981 0 0 0 .469-.827V9h1.383l.722 1.448a1 1 0 1 0 1.79-.895l-1-2A1 1 0 0 0 12.492 7h-3V6h1a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm0 2h1v2h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6.492 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h1v.99a1 1 0 0 0-.316.062l-2.051.684-.684-2.051a1 1 0 0 0-1.898.631l1 3a1 1 0 0 0 1.265.633l1.684-.56v.61c0 .041.019.076.024.116l-4.579 3.052a1 1 0 1 0 1.11 1.664l5.056-3.37 1.495 2.986a1 1 0 0 0 1.21.502l3-1a1 1 0 1 0-.632-1.897l-2.178.725-.975-1.951a.981.981 0 0 0 .469-.827V9h1.383l.722 1.448a1 1 0 1 0 1.79-.895l-1-2A1 1 0 0 0 12.492 7h-3V6h1a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm0 2h1v2h-1z"/></svg>
diff --git a/engine/editor/icons/CheckBox.svg b/engine/editor/icons/CheckBox.svg
index 8d89b753..c57a2341 100644
--- a/engine/editor/icons/CheckBox.svg
+++ b/engine/editor/icons/CheckBox.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2-2V8l-2 2v3H3V4h7l2-2zm9.363 2.05L7.414 9 6 7.586 4.586 9l2.828 2.828 6.363-6.363z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9a2 2 0 0 0 2-2V8l-2 2v3H3V4h7l2-2zm9.363 2.05L7.414 9 6 7.586 4.586 9l2.828 2.828 6.363-6.363z"/></svg>
diff --git a/engine/editor/icons/CheckButton.svg b/engine/editor/icons/CheckButton.svg
index c279db43..78663b9c 100644
--- a/engine/editor/icons/CheckButton.svg
+++ b/engine/editor/icons/CheckButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m5 4a4 4 0 0 0 -4 4 4 4 0 0 0 4 4h6a4 4 0 0 0 4-4 4 4 0 0 0 -4-4zm0 2h2.541a4 4 0 0 0 -.54102 2 4 4 0 0 0 .54102 2h-2.541a2 2 0 0 1 -2-2 2 2 0 0 1 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m5 4a4 4 0 0 0 -4 4 4 4 0 0 0 4 4h6a4 4 0 0 0 4-4 4 4 0 0 0 -4-4zm0 2h2.541a4 4 0 0 0 -.54102 2 4 4 0 0 0 .54102 2h-2.541a2 2 0 0 1 -2-2 2 2 0 0 1 2-2z"/></svg>
diff --git a/engine/editor/icons/Checkerboard.svg b/engine/editor/icons/Checkerboard.svg
index 26ab5220..18b67ac6 100644
--- a/engine/editor/icons/Checkerboard.svg
+++ b/engine/editor/icons/Checkerboard.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g fill="#fff"><path fill-opacity=".2" d="M0 0h64v64H0z"/><path fill-opacity=".4" d="M0 0v16h16V0zm16 16v16h16V16zm16 0h16V0H32zm16 0v16h16V16zm0 16H32v16h16zm0 16v16h16V48zm-16 0H16v16h16zm-16 0V32H0v16z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g fill="#fff"><path fill-opacity=".2" d="M0 0h64v64H0z"/><path fill-opacity=".4" d="M0 0v16h16V0zm16 16v16h16V16zm16 0h16V0H32zm16 0v16h16V16zm0 16H32v16h16zm0 16v16h16V48zm-16 0H16v16h16zm-16 0V32H0v16z"/></g></svg>
diff --git a/engine/editor/icons/CircleShape2D.svg b/engine/editor/icons/CircleShape2D.svg
index db61736a..c3760c33 100644
--- a/engine/editor/icons/CircleShape2D.svg
+++ b/engine/editor/icons/CircleShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="none" stroke="#5fb2ff" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="none" stroke="#5fb2ff" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/ClassList.svg b/engine/editor/icons/ClassList.svg
index 68a662e8..f60ad9be 100644
--- a/engine/editor/icons/ClassList.svg
+++ b/engine/editor/icons/ClassList.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m6 1v1h-5v1h2v10h6v1h6v-3h-6v1h-5v-4h5v1h6v-3h-6v1h-5v-4h2v1h6v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m6 1v1h-5v1h2v10h6v1h6v-3h-6v1h-5v-4h5v1h6v-3h-6v1h-5v-4h2v1h6v-3z"/></svg>
diff --git a/engine/editor/icons/Clear.svg b/engine/editor/icons/Clear.svg
index d809d62e..06a3ca14 100644
--- a/engine/editor/icons/Clear.svg
+++ b/engine/editor/icons/Clear.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 1a1 1 0 0 0 -1 1v5h-2c-1.108 0-2 .892-2 2v1h10v-1c0-1.108-.892-2-2-2h-2v-5a1 1 0 0 0 -1-1zm-5 10v4l10-1v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 1a1 1 0 0 0 -1 1v5h-2c-1.108 0-2 .892-2 2v1h10v-1c0-1.108-.892-2-2-2h-2v-5a1 1 0 0 0 -1-1zm-5 10v4l10-1v-3z"/></svg>
diff --git a/engine/editor/icons/Close.svg b/engine/editor/icons/Close.svg
index e2e9707e..f52657f4 100644
--- a/engine/editor/icons/Close.svg
+++ b/engine/editor/icons/Close.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="2" d="m3 3 10 10M3 13 13 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="2" d="m3 3 10 10M3 13 13 3"/></svg>
diff --git a/engine/editor/icons/CodeEdit.svg b/engine/editor/icons/CodeEdit.svg
index 78430dd1..915c275d 100644
--- a/engine/editor/icons/CodeEdit.svg
+++ b/engine/editor/icons/CodeEdit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm2 1L4 5l1 1-1 1 1 1 2-2zm2 3v1h2V7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm2 1L4 5l1 1-1 1 1 1 2-2zm2 3v1h2V7z"/></svg>
diff --git a/engine/editor/icons/CodeFoldDownArrow.svg b/engine/editor/icons/CodeFoldDownArrow.svg
index 8e0ee163..07d2d37f 100644
--- a/engine/editor/icons/CodeFoldDownArrow.svg
+++ b/engine/editor/icons/CodeFoldDownArrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m3 5 3 3 3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m3 5 3 3 3-3"/></svg>
diff --git a/engine/editor/icons/CodeFoldedRightArrow.svg b/engine/editor/icons/CodeFoldedRightArrow.svg
index 2189ee2f..cd8bb131 100644
--- a/engine/editor/icons/CodeFoldedRightArrow.svg
+++ b/engine/editor/icons/CodeFoldedRightArrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m4 9 3-3-3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m4 9 3-3-3-3"/></svg>
diff --git a/engine/editor/icons/CodeHighlighter.svg b/engine/editor/icons/CodeHighlighter.svg
index e99222f7..6101391a 100644
--- a/engine/editor/icons/CodeHighlighter.svg
+++ b/engine/editor/icons/CodeHighlighter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a"><stop offset=".25" stop-color="#ffe345"/><stop offset=".75" stop-color="#919191"/></linearGradient><path fill="#45d7ff" d="m5.914 4-2 2H9.01V4z"/><path fill="#ff4596" d="M11 4v2h4V4Z"/><path fill="#ff4545" d="M1 8v2h3V8z"/><path fill="url(#a)" d="M6 8v2h7V8z"/><path fill="#919191" d="M1 12v2h5v-2zm7 0v2h6v-2z"/><path fill="#e0e0e0" d="M2 1 1 2l1.5 1.5L1 5l1 1 2.5-2.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a"><stop offset=".25" stop-color="#ffe345"/><stop offset=".75" stop-color="#919191"/></linearGradient><path fill="#45d7ff" d="m5.914 4-2 2H9.01V4z"/><path fill="#ff4596" d="M11 4v2h4V4Z"/><path fill="#ff4545" d="M1 8v2h3V8z"/><path fill="url(#a)" d="M6 8v2h7V8z"/><path fill="#919191" d="M1 12v2h5v-2zm7 0v2h6v-2z"/><path fill="#e0e0e0" d="M2 1 1 2l1.5 1.5L1 5l1 1 2.5-2.5z"/></svg>
diff --git a/engine/editor/icons/CodeRegionFoldDownArrow.svg b/engine/editor/icons/CodeRegionFoldDownArrow.svg
index 5186dd8a..e03cb9ae 100644
--- a/engine/editor/icons/CodeRegionFoldDownArrow.svg
+++ b/engine/editor/icons/CodeRegionFoldDownArrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M10 3a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1zM3 5.75a1 1 0 0 1 1.414-1.414L6 5.922l1.586-1.586A1 1 0 0 1 9 5.75L6.707 8.043a1 1 0 0 1-1.414 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M10 3a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1zM3 5.75a1 1 0 0 1 1.414-1.414L6 5.922l1.586-1.586A1 1 0 0 1 9 5.75L6.707 8.043a1 1 0 0 1-1.414 0z"/></svg>
diff --git a/engine/editor/icons/CodeRegionFoldedRightArrow.svg b/engine/editor/icons/CodeRegionFoldedRightArrow.svg
index 99e20678..9cb49cf3 100644
--- a/engine/editor/icons/CodeRegionFoldedRightArrow.svg
+++ b/engine/editor/icons/CodeRegionFoldedRightArrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M3 2a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1zm2.75 7a1 1 0 0 1-1.414-1.414L5.922 6 4.336 4.414A1 1 0 0 1 5.75 3l2.293 2.293a1 1 0 0 1 0 1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M3 2a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1zm2.75 7a1 1 0 0 1-1.414-1.414L5.922 6 4.336 4.414A1 1 0 0 1 5.75 3l2.293 2.293a1 1 0 0 1 0 1.414z"/></svg>
diff --git a/engine/editor/icons/Collapse.svg b/engine/editor/icons/Collapse.svg
index eb87f5a2..f1529b57 100644
--- a/engine/editor/icons/Collapse.svg
+++ b/engine/editor/icons/Collapse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m3 8 5 4 5-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m3 8 5 4 5-4"/></svg>
diff --git a/engine/editor/icons/CollapseTree.svg b/engine/editor/icons/CollapseTree.svg
index 048ac81f..d353e999 100644
--- a/engine/editor/icons/CollapseTree.svg
+++ b/engine/editor/icons/CollapseTree.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 9.669-3.536 2.583H7v2.537h2v-2.537h2.536zm0-3.314L4.464 3.772H7V1.235h2v2.537h2.536zm-7.296.73h14.591v1.831H.704z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 9.669-3.536 2.583H7v2.537h2v-2.537h2.536zm0-3.314L4.464 3.772H7V1.235h2v2.537h2.536zm-7.296.73h14.591v1.831H.704z"/></svg>
diff --git a/engine/editor/icons/CollisionPolygon2D.svg b/engine/editor/icons/CollisionPolygon2D.svg
index 316ba080..25f8b392 100644
--- a/engine/editor/icons/CollisionPolygon2D.svg
+++ b/engine/editor/icons/CollisionPolygon2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2h12L8 8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2h12L8 8z"/></svg>
diff --git a/engine/editor/icons/CollisionPolygon3D.svg b/engine/editor/icons/CollisionPolygon3D.svg
index b6ab1e62..9b8cf6bb 100644
--- a/engine/editor/icons/CollisionPolygon3D.svg
+++ b/engine/editor/icons/CollisionPolygon3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="m8 2 6 3.5v5L8 14l-6-3.5v-5h6zm6 3.5L8 9 2 5.5M8 9v5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="m8 2 6 3.5v5L8 14l-6-3.5v-5h6zm6 3.5L8 9 2 5.5M8 9v5"/></svg>
diff --git a/engine/editor/icons/CollisionShape2D.svg b/engine/editor/icons/CollisionShape2D.svg
index 7fc1d17e..4de21c11 100644
--- a/engine/editor/icons/CollisionShape2D.svg
+++ b/engine/editor/icons/CollisionShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2h12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2h12z"/></svg>
diff --git a/engine/editor/icons/CollisionShape3D.svg b/engine/editor/icons/CollisionShape3D.svg
index aa24d48c..05cc3734 100644
--- a/engine/editor/icons/CollisionShape3D.svg
+++ b/engine/editor/icons/CollisionShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5"/></svg>
diff --git a/engine/editor/icons/Color.svg b/engine/editor/icons/Color.svg
index 5e4ac2ac..1c42243c 100644
--- a/engine/editor/icons/Color.svg
+++ b/engine/editor/icons/Color.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ff5f5f" d="M4 4a3 3 0 0 0 0 6h1V8H4a1 1 0 0 1 0-2h1V4z"/><path fill="#5fff97" d="M6 2v5a3 3 0 0 0 3 3h1V8H9a1 1 0 0 1-1-1V2z"/><path fill="#5fb2ff" d="M14 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ff5f5f" d="M4 4a3 3 0 0 0 0 6h1V8H4a1 1 0 0 1 0-2h1V4z"/><path fill="#5fff97" d="M6 2v5a3 3 0 0 0 3 3h1V8H9a1 1 0 0 1-1-1V2z"/><path fill="#5fb2ff" d="M14 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/></svg>
diff --git a/engine/editor/icons/ColorPick.svg b/engine/editor/icons/ColorPick.svg
index 741bd7a3..a56e868d 100644
--- a/engine/editor/icons/ColorPick.svg
+++ b/engine/editor/icons/ColorPick.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 1c-1.108 0-2 .892-2 2v2h-1v2h1v5a2 2 0 0 0 1 1.7285v1.2715h2v-1.2695a2 2 0 0 0 1-1.7305v-5h1v-2h-1v-2c0-1.108-.892-2-2-2zm-1 6h2v5a1 1 0 0 1 -1 1 1 1 0 0 1 -1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 1c-1.108 0-2 .892-2 2v2h-1v2h1v5a2 2 0 0 0 1 1.7285v1.2715h2v-1.2695a2 2 0 0 0 1-1.7305v-5h1v-2h-1v-2c0-1.108-.892-2-2-2zm-1 6h2v5a1 1 0 0 1 -1 1 1 1 0 0 1 -1-1z"/></svg>
diff --git a/engine/editor/icons/ColorPicker.svg b/engine/editor/icons/ColorPicker.svg
index 1c2ec26e..ff25482b 100644
--- a/engine/editor/icons/ColorPicker.svg
+++ b/engine/editor/icons/ColorPicker.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M6 5H5v2h1v5a2 2 0 0 0 1 1.728V15h2v-1.27A2 2 0 0 0 10 12V7h1V5h-1V3a1 1 0 0 0-4 0zm1 2h2v5a1 1 0 0 1-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M6 5H5v2h1v5a2 2 0 0 0 1 1.728V15h2v-1.27A2 2 0 0 0 10 12V7h1V5h-1V3a1 1 0 0 0-4 0zm1 2h2v5a1 1 0 0 1-2 0z"/></svg>
diff --git a/engine/editor/icons/ColorPickerBarArrow.svg b/engine/editor/icons/ColorPickerBarArrow.svg
index 60685943..51aed983 100644
--- a/engine/editor/icons/ColorPickerBarArrow.svg
+++ b/engine/editor/icons/ColorPickerBarArrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20"><path fill="#e0e0e0" d="M2 16h12l-6-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="20"><path fill="#e0e0e0" d="M2 16h12l-6-6z"/></svg>
diff --git a/engine/editor/icons/ColorPickerButton.svg b/engine/editor/icons/ColorPickerButton.svg
index ea66a8dc..b43d363e 100644
--- a/engine/editor/icons/ColorPickerButton.svg
+++ b/engine/editor/icons/ColorPickerButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M11 5h-1v2h1v5a2 2 0 0 0 1 1.728V15h2v-1.27A2 2 0 0 0 15 12V7h1V5h-1V3a1 1 0 0 0-4 0zm1 2h2v5a1 1 0 0 1-2 0zM4 2v3.133l-1.445-.965-1.11 1.664 3 2a1 1 0 0 0 1.11 0l3-2-1.11-1.664L6 5.133V2zm-.5 8A1.5 1.5 0 0 0 2 11.5V13H1v2h8v-2H8v-1.5A1.5 1.5 0 0 0 6.5 10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M11 5h-1v2h1v5a2 2 0 0 0 1 1.728V15h2v-1.27A2 2 0 0 0 15 12V7h1V5h-1V3a1 1 0 0 0-4 0zm1 2h2v5a1 1 0 0 1-2 0zM4 2v3.133l-1.445-.965-1.11 1.664 3 2a1 1 0 0 0 1.11 0l3-2-1.11-1.664L6 5.133V2zm-.5 8A1.5 1.5 0 0 0 2 11.5V13H1v2h8v-2H8v-1.5A1.5 1.5 0 0 0 6.5 10z"/></svg>
diff --git a/engine/editor/icons/ColorRect.svg b/engine/editor/icons/ColorRect.svg
index 254fc475..176ee60d 100644
--- a/engine/editor/icons/ColorRect.svg
+++ b/engine/editor/icons/ColorRect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 1v14h14V1zm2 2h10v10H3z"/><path fill="#45d7ff" d="M12 12H7.2L12 7.2z"/><path fill="#ff4545" d="M4 4h4.8L4 8.8z"/><path fill="#80ff45" d="M4 12V8.8L8.8 4H12v3.2L7.2 12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 1v14h14V1zm2 2h10v10H3z"/><path fill="#45d7ff" d="M12 12H7.2L12 7.2z"/><path fill="#ff4545" d="M4 4h4.8L4 8.8z"/><path fill="#80ff45" d="M4 12V8.8L8.8 4H12v3.2L7.2 12z"/></svg>
diff --git a/engine/editor/icons/ColorTrackVu.svg b/engine/editor/icons/ColorTrackVu.svg
index c463e281..e449c3db 100644
--- a/engine/editor/icons/ColorTrackVu.svg
+++ b/engine/editor/icons/ColorTrackVu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24"><linearGradient id="a" x1="8" x2="8" y1="24" y2="0" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#288027"/><stop offset=".75" stop-color="#dbee15"/><stop offset=".75" stop-color="#eec315"/><stop offset="1" stop-color="#f70000"/></linearGradient><path fill="url(#a)" d="M0 0h16v24H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="24"><linearGradient id="a" x1="8" x2="8" y1="24" y2="0" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#288027"/><stop offset=".75" stop-color="#dbee15"/><stop offset=".75" stop-color="#eec315"/><stop offset="1" stop-color="#f70000"/></linearGradient><path fill="url(#a)" d="M0 0h16v24H0z"/></svg>
diff --git a/engine/editor/icons/CombineLines.svg b/engine/editor/icons/CombineLines.svg
index 54205397..b133e8be 100644
--- a/engine/editor/icons/CombineLines.svg
+++ b/engine/editor/icons/CombineLines.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 2v2h14V2zm7 5v2h7V7zm0 5v2h7v-2zM4.976 14V9h2l-1.5-2-1.5-2-1.5 2-1.5 2h2v5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 2v2h14V2zm7 5v2h7V7zm0 5v2h7v-2zM4.976 14V9h2l-1.5-2-1.5-2-1.5 2-1.5 2h2v5z"/></svg>
diff --git a/engine/editor/icons/CompressedTexture2D.svg b/engine/editor/icons/CompressedTexture2D.svg
index 53b80e03..51e8c7e9 100644
--- a/engine/editor/icons/CompressedTexture2D.svg
+++ b/engine/editor/icons/CompressedTexture2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h6v-2h2v-2H3V3h5V1zm6 2v2h2V3zm2 0h2V1h-2zm2 0v2h2V3zm0 2h-2v2h2zm0 2v2h2V7zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm-2-4V7H8V6H7v1H6v1H5v1H4v1h4V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h6v-2h2v-2H3V3h5V1zm6 2v2h2V3zm2 0h2V1h-2zm2 0v2h2V3zm0 2h-2v2h2zm0 2v2h2V7zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2zm-2-4V7H8V6H7v1H6v1H5v1H4v1h4V9z"/></svg>
diff --git a/engine/editor/icons/CompressedTexture3D.svg b/engine/editor/icons/CompressedTexture3D.svg
index 8fc50da4..5db72b8f 100644
--- a/engine/editor/icons/CompressedTexture3D.svg
+++ b/engine/editor/icons/CompressedTexture3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h6v-2h2v-2H8v1H2.25V5H10V3H8v.75H3.25L5 2h3V1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5Zm6.675-8L8 6.5V7h2v2H8v1.75l-.325.25-1.5-.5-1.75.75-1.75-.75L4.25 8l.875 1.25ZM10 3h2V1h-2zm2 0v2h2V3zm0 2h-2v2h2zm0 2v2h2V7zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2z"/><path fill-opacity=".4" d="M7.675 6v5L6 10.5l-.875-1.25zM4.25 8v3.25L2.5 10.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h6v-2h2v-2H8v1H2.25V5H10V3H8v.75H3.25L5 2h3V1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5Zm6.675-8L8 6.5V7h2v2H8v1.75l-.325.25-1.5-.5-1.75.75-1.75-.75L4.25 8l.875 1.25ZM10 3h2V1h-2zm2 0v2h2V3zm0 2h-2v2h2zm0 2v2h2V7zm0 2h-2v2h2zm0 2v2h2v-2zm0 2h-2v2h2z"/><path fill-opacity=".4" d="M7.675 6v5L6 10.5l-.875-1.25zM4.25 8v3.25L2.5 10.5"/></svg>
diff --git a/engine/editor/icons/ConcavePolygonShape2D.svg b/engine/editor/icons/ConcavePolygonShape2D.svg
index 8824c8bf..cd57109c 100644
--- a/engine/editor/icons/ConcavePolygonShape2D.svg
+++ b/engine/editor/icons/ConcavePolygonShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2l6 6 6-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2l6 6 6-6z"/></svg>
diff --git a/engine/editor/icons/ConcavePolygonShape3D.svg b/engine/editor/icons/ConcavePolygonShape3D.svg
index 51e07653..36b34796 100644
--- a/engine/editor/icons/ConcavePolygonShape3D.svg
+++ b/engine/editor/icons/ConcavePolygonShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#2998ff" d="M8 1 1 4v8l7 3 7-3V4zm7 3-2 1v6l-5 2v2l7-3z"/><path fill="#a2d2ff" d="m8 13 5-2-5-2-5 2zM8 1 1 4l2 1 5-2 5 2 2-1z"/><path fill="#5fb2ff" d="m8 9 5 2V5L8 3zM1 4v8l7 3v-2l-5-2V5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#2998ff" d="M8 1 1 4v8l7 3 7-3V4zm7 3-2 1v6l-5 2v2l7-3z"/><path fill="#a2d2ff" d="m8 13 5-2-5-2-5 2zM8 1 1 4l2 1 5-2 5 2 2-1z"/><path fill="#5fb2ff" d="m8 9 5 2V5L8 3zM1 4v8l7 3v-2l-5-2V5z"/></svg>
diff --git a/engine/editor/icons/ConeTwistJoint3D.svg b/engine/editor/icons/ConeTwistJoint3D.svg
index 1489b2e6..54c7766c 100644
--- a/engine/editor/icons/ConeTwistJoint3D.svg
+++ b/engine/editor/icons/ConeTwistJoint3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8 2-6 9a6 3 0 0 0 12 0 6 3 0 0 0-12 0m12 0L8 2v9"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8 2-6 9a6 3 0 0 0 12 0 6 3 0 0 0-12 0m12 0L8 2v9"/></svg>
diff --git a/engine/editor/icons/ConfirmationDialog.svg b/engine/editor/icons/ConfirmationDialog.svg
index be7834d1..75711b6a 100644
--- a/engine/editor/icons/ConfirmationDialog.svg
+++ b/engine/editor/icons/ConfirmationDialog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm6.986 1.002A3 3 0 0 1 9 11.822V12H7v-1a1 1 0 0 1 1-1 1 1 0 1 0-.865-1.5 1 1 0 0 1-1.733-1 3 3 0 0 1 2.584-1.498zM7 13h2v1H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm6.986 1.002A3 3 0 0 1 9 11.822V12H7v-1a1 1 0 0 1 1-1 1 1 0 1 0-.865-1.5 1 1 0 0 1-1.733-1 3 3 0 0 1 2.584-1.498zM7 13h2v1H7z"/></svg>
diff --git a/engine/editor/icons/Container.svg b/engine/editor/icons/Container.svg
index b0657e0c..29058b61 100644
--- a/engine/editor/icons/Container.svg
+++ b/engine/editor/icons/Container.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM1 5v2h2V5zm12 0v2h2V5zM1 9v2h2V9zm12 0v2h2V9zM1 13a2 2 0 0 0 2 2v-2zm4 0v2h2v-2zm4 0v2h2v-2zm4 0v2a2 2 0 0 0 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM1 5v2h2V5zm12 0v2h2V5zM1 9v2h2V9zm12 0v2h2V9zM1 13a2 2 0 0 0 2 2v-2zm4 0v2h2v-2zm4 0v2h2v-2zm4 0v2a2 2 0 0 0 2-2z"/></svg>
diff --git a/engine/editor/icons/ContainerLayout.svg b/engine/editor/icons/ContainerLayout.svg
index 336c853b..0fc05356 100644
--- a/engine/editor/icons/ContainerLayout.svg
+++ b/engine/editor/icons/ContainerLayout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM1 5v2h2V5zm12 0v2h2V5zM1 9v2h2V9zm12 0v2h2V9zM1 13a2 2 0 0 0 2 2v-2zm4 0v2h2v-2zm4 0v2h2v-2zm4 0v2a2 2 0 0 0 2-2z"/><path fill="#d6d6d6" d="M7 7h4v4H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM1 5v2h2V5zm12 0v2h2V5zM1 9v2h2V9zm12 0v2h2V9zM1 13a2 2 0 0 0 2 2v-2zm4 0v2h2v-2zm4 0v2h2v-2zm4 0v2a2 2 0 0 0 2-2z"/><path fill="#d6d6d6" d="M7 7h4v4H7z"/></svg>
diff --git a/engine/editor/icons/Control.svg b/engine/editor/icons/Control.svg
index 8b993345..6fb41e12 100644
--- a/engine/editor/icons/Control.svg
+++ b/engine/editor/icons/Control.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#8eef97" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#8eef97" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/ControlAlignBottomLeft.svg b/engine/editor/icons/ControlAlignBottomLeft.svg
index 80b9532c..c52df534 100644
--- a/engine/editor/icons/ControlAlignBottomLeft.svg
+++ b/engine/editor/icons/ControlAlignBottomLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 10h4v4h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 10h4v4h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignBottomRight.svg b/engine/editor/icons/ControlAlignBottomRight.svg
index c5ddf42c..3d4da209 100644
--- a/engine/editor/icons/ControlAlignBottomRight.svg
+++ b/engine/editor/icons/ControlAlignBottomRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 10h4v4h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 10h4v4h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignBottomWide.svg b/engine/editor/icons/ControlAlignBottomWide.svg
index caa31ea2..cc65de39 100644
--- a/engine/editor/icons/ControlAlignBottomWide.svg
+++ b/engine/editor/icons/ControlAlignBottomWide.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 10h12v4h-12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 10h12v4h-12z"/></svg>
diff --git a/engine/editor/icons/ControlAlignCenter.svg b/engine/editor/icons/ControlAlignCenter.svg
index c41e2195..f8495c44 100644
--- a/engine/editor/icons/ControlAlignCenter.svg
+++ b/engine/editor/icons/ControlAlignCenter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m6 6h4v4h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m6 6h4v4h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignCenterBottom.svg b/engine/editor/icons/ControlAlignCenterBottom.svg
index e8ee76c4..3a3d4d83 100644
--- a/engine/editor/icons/ControlAlignCenterBottom.svg
+++ b/engine/editor/icons/ControlAlignCenterBottom.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m6 10h4v4h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m6 10h4v4h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignCenterLeft.svg b/engine/editor/icons/ControlAlignCenterLeft.svg
index 905c568b..6b9509b8 100644
--- a/engine/editor/icons/ControlAlignCenterLeft.svg
+++ b/engine/editor/icons/ControlAlignCenterLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 6h4v4h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 6h4v4h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignCenterRight.svg b/engine/editor/icons/ControlAlignCenterRight.svg
index 93479372..d9e5a11e 100644
--- a/engine/editor/icons/ControlAlignCenterRight.svg
+++ b/engine/editor/icons/ControlAlignCenterRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 6h4v4h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 6h4v4h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignCenterTop.svg b/engine/editor/icons/ControlAlignCenterTop.svg
index f92344b5..2902e71b 100644
--- a/engine/editor/icons/ControlAlignCenterTop.svg
+++ b/engine/editor/icons/ControlAlignCenterTop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m6 2h4v3.9999h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m6 2h4v3.9999h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignFullRect.svg b/engine/editor/icons/ControlAlignFullRect.svg
index 1d8535c4..b967bf4f 100644
--- a/engine/editor/icons/ControlAlignFullRect.svg
+++ b/engine/editor/icons/ControlAlignFullRect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#d6d6d6" d="m2 2h12v12h-12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#d6d6d6" d="m2 2h12v12h-12z"/></svg>
diff --git a/engine/editor/icons/ControlAlignHCenterWide.svg b/engine/editor/icons/ControlAlignHCenterWide.svg
index 1d980c97..bd25cc71 100644
--- a/engine/editor/icons/ControlAlignHCenterWide.svg
+++ b/engine/editor/icons/ControlAlignHCenterWide.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 6h12v4h-12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 6h12v4h-12z"/></svg>
diff --git a/engine/editor/icons/ControlAlignLeftWide.svg b/engine/editor/icons/ControlAlignLeftWide.svg
index 3f492c4c..d21342db 100644
--- a/engine/editor/icons/ControlAlignLeftWide.svg
+++ b/engine/editor/icons/ControlAlignLeftWide.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 2h4v12h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 2h4v12h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignRightWide.svg b/engine/editor/icons/ControlAlignRightWide.svg
index 2c718143..cdfdf702 100644
--- a/engine/editor/icons/ControlAlignRightWide.svg
+++ b/engine/editor/icons/ControlAlignRightWide.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 2h4v12h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 2h4v12h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignTopLeft.svg b/engine/editor/icons/ControlAlignTopLeft.svg
index 36b11a1d..8d814893 100644
--- a/engine/editor/icons/ControlAlignTopLeft.svg
+++ b/engine/editor/icons/ControlAlignTopLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 2h4v3.9999h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 2h4v3.9999h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignTopRight.svg b/engine/editor/icons/ControlAlignTopRight.svg
index 070c80ca..4f4456b2 100644
--- a/engine/editor/icons/ControlAlignTopRight.svg
+++ b/engine/editor/icons/ControlAlignTopRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 2h4v3.9999h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m10 2h4v3.9999h-4z"/></svg>
diff --git a/engine/editor/icons/ControlAlignTopWide.svg b/engine/editor/icons/ControlAlignTopWide.svg
index c319e8b7..ff31beca 100644
--- a/engine/editor/icons/ControlAlignTopWide.svg
+++ b/engine/editor/icons/ControlAlignTopWide.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 2h12v3.9999h-12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="m0 0h16v16h-16z"/><path fill="#474747" d="m2 2h12v12h-12z"/><path fill="#d6d6d6" d="m2 2h12v3.9999h-12z"/></svg>
diff --git a/engine/editor/icons/ControlAlignVCenterWide.svg b/engine/editor/icons/ControlAlignVCenterWide.svg
index 7e011897..d702b65f 100644
--- a/engine/editor/icons/ControlAlignVCenterWide.svg
+++ b/engine/editor/icons/ControlAlignVCenterWide.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="M0 0h16v16H0z"/><path fill="#474747" d="M2 2h12v12H2z"/><path fill="#d6d6d6" d="M10 2v12H6V2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#919191" d="M0 0h16v16H0z"/><path fill="#474747" d="M2 2h12v12H2z"/><path fill="#d6d6d6" d="M10 2v12H6V2z"/></svg>
diff --git a/engine/editor/icons/ControlLayout.svg b/engine/editor/icons/ControlLayout.svg
index 6c581c20..9575d07c 100644
--- a/engine/editor/icons/ControlLayout.svg
+++ b/engine/editor/icons/ControlLayout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#d6d6d6" d="M11.793 8V6H8V3.887H6V6H3.858v2H6v3.967h2V8z"/><path fill="#8eef97" d="M8 .5a7.5 7.5 0 0 0 0 15 7.5 7.5 0 0 0 0-15zm0 2a5.5 5.5 0 0 1 0 11 5.5 5.5 0 0 1 0-11z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#d6d6d6" d="M11.793 8V6H8V3.887H6V6H3.858v2H6v3.967h2V8z"/><path fill="#8eef97" d="M8 .5a7.5 7.5 0 0 0 0 15 7.5 7.5 0 0 0 0-15zm0 2a5.5 5.5 0 0 1 0 11 5.5 5.5 0 0 1 0-11z"/></svg>
diff --git a/engine/editor/icons/ConvexPolygonShape2D.svg b/engine/editor/icons/ConvexPolygonShape2D.svg
index 8d692010..1448e169 100644
--- a/engine/editor/icons/ConvexPolygonShape2D.svg
+++ b/engine/editor/icons/ConvexPolygonShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linejoin="round" stroke-width="2" d="M14 14H2V8l6-6 6 6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linejoin="round" stroke-width="2" d="M14 14H2V8l6-6 6 6z"/></svg>
diff --git a/engine/editor/icons/ConvexPolygonShape3D.svg b/engine/editor/icons/ConvexPolygonShape3D.svg
index 7a1a42f9..8f3cac5e 100644
--- a/engine/editor/icons/ConvexPolygonShape3D.svg
+++ b/engine/editor/icons/ConvexPolygonShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="m8 15-7-3V4l7 3z"/><path fill="#2998ff" d="M8 1 1 4l7 11 7-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="m8 15-7-3V4l7 3z"/><path fill="#2998ff" d="M8 1 1 4l7 11 7-3z"/></svg>
diff --git a/engine/editor/icons/CopyNodePath.svg b/engine/editor/icons/CopyNodePath.svg
index 9bf5d81f..6f0e3bc6 100644
--- a/engine/editor/icons/CopyNodePath.svg
+++ b/engine/editor/icons/CopyNodePath.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6l-5-5zm1 2h6v3a1 1 0 0 0 1 1h3v6H3zm3 5-2 4h2l2-4zm4 0-2 4h2l2-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6l-5-5zm1 2h6v3a1 1 0 0 0 1 1h3v6H3zm3 5-2 4h2l2-4zm4 0-2 4h2l2-4z"/></svg>
diff --git a/engine/editor/icons/CreateNewSceneFrom.svg b/engine/editor/icons/CreateNewSceneFrom.svg
index 3dbd30b8..c202826b 100644
--- a/engine/editor/icons/CreateNewSceneFrom.svg
+++ b/engine/editor/icons/CreateNewSceneFrom.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.244.328.818 1.9 1.715-.25zm-4.223.615-1.978.29.818 1.902 1.979-.29zm-3.959.578-1.978.29.818 1.902 1.979-.29zm-3.957.578-1.714.25L1 6l2.244-.328zM1 7v6a2 2 0 0 0 2 2h7v-1H8v-4h2V8h4v2h1V7z"/><path fill="#5fff97" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.244.328.818 1.9 1.715-.25zm-4.223.615-1.978.29.818 1.902 1.979-.29zm-3.959.578-1.978.29.818 1.902 1.979-.29zm-3.957.578-1.714.25L1 6l2.244-.328zM1 7v6a2 2 0 0 0 2 2h7v-1H8v-4h2V8h4v2h1V7z"/><path fill="#5fff97" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
diff --git a/engine/editor/icons/CryptoKey.svg b/engine/editor/icons/CryptoKey.svg
index bc1cbfc5..2dc0347f 100644
--- a/engine/editor/icons/CryptoKey.svg
+++ b/engine/editor/icons/CryptoKey.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.233 4.233"><path fill="#e0e0e0" d="m2.397.34-.749.747v.375l.188.187L.339 3.145v.375l.374.374h.374l.187-.188.282-.092.092-.282.282-.093.187-.56.28-.095.187-.187.187.187h.374l.748-.748.001-.374L2.772.34zm.374.858a.264.264 0 1 1 .002.528.264.264 0 0 1-.002-.528z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.233 4.233"><path fill="#e0e0e0" d="m2.397.34-.749.747v.375l.188.187L.339 3.145v.375l.374.374h.374l.187-.188.282-.092.092-.282.282-.093.187-.56.28-.095.187-.187.187.187h.374l.748-.748.001-.374L2.772.34zm.374.858a.264.264 0 1 1 .002.528.264.264 0 0 1-.002-.528z"/></svg>
diff --git a/engine/editor/icons/Cubemap.svg b/engine/editor/icons/Cubemap.svg
index fce76803..d0f35711 100644
--- a/engine/editor/icons/Cubemap.svg
+++ b/engine/editor/icons/Cubemap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m0 6v4h4v-4zm8 0v4h4v-4z"/><path fill="#ff5f5f" d="m4 6v4h4v-4zm8 0v4h4v-4z"/><path fill="#5fb2ff" d="m4 2v4h4v-4zm0 8v4h4v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m0 6v4h4v-4zm8 0v4h4v-4z"/><path fill="#ff5f5f" d="m4 6v4h4v-4zm8 0v4h4v-4z"/><path fill="#5fb2ff" d="m4 2v4h4v-4zm0 8v4h4v-4z"/></svg>
diff --git a/engine/editor/icons/CubemapArray.svg b/engine/editor/icons/CubemapArray.svg
index fbad386e..62ad5a38 100644
--- a/engine/editor/icons/CubemapArray.svg
+++ b/engine/editor/icons/CubemapArray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m2 6v4h2v-4zm6 0v4h4v-4z"/><path fill="#ff5f5f" d="m4 6v4h4v-4zm8 0v4h2v-4z"/><path fill="#5fb2ff" d="m4 2v4h4v-4zm0 8v4h4v-4z"/><path fill="#e0e0e0" d="m-.00000002 2v12h4.00000002v-2h-2v-8h2v-2h-2zm12.00000002 0v2h2.000001v8h-2.000001v2h4.000001v-12h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m2 6v4h2v-4zm6 0v4h4v-4z"/><path fill="#ff5f5f" d="m4 6v4h4v-4zm8 0v4h2v-4z"/><path fill="#5fb2ff" d="m4 2v4h4v-4zm0 8v4h4v-4z"/><path fill="#e0e0e0" d="m-.00000002 2v12h4.00000002v-2h-2v-8h2v-2h-2zm12.00000002 0v2h2.000001v8h-2.000001v2h4.000001v-12h-2z"/></svg>
diff --git a/engine/editor/icons/Curve.svg b/engine/editor/icons/Curve.svg
index 3c05f134..bdaf4798 100644
--- a/engine/editor/icons/Curve.svg
+++ b/engine/editor/icons/Curve.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-width="2"><path stroke-opacity=".325" d="M2 1v13h13"/><path stroke-linecap="round" d="M2 14c8 0 12-4 12-12"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-width="2"><path stroke-opacity=".325" d="M2 1v13h13"/><path stroke-linecap="round" d="M2 14c8 0 12-4 12-12"/></g></svg>
diff --git a/engine/editor/icons/Curve2D.svg b/engine/editor/icons/Curve2D.svg
index cc51a453..a473518c 100644
--- a/engine/editor/icons/Curve2D.svg
+++ b/engine/editor/icons/Curve2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M 2 14 C 14 14 2 2 14 2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M 2 14 C 14 14 2 2 14 2"/></svg>
diff --git a/engine/editor/icons/Curve3D.svg b/engine/editor/icons/Curve3D.svg
index 5057ef6d..c6eddc6c 100644
--- a/engine/editor/icons/Curve3D.svg
+++ b/engine/editor/icons/Curve3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 2 2 5l6 3 6-3v6l-6 3-6-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 2 2 5l6 3 6-3v6l-6 3-6-3"/></svg>
diff --git a/engine/editor/icons/CurveClose.svg b/engine/editor/icons/CurveClose.svg
index 1823775e..3454bfed 100644
--- a/engine/editor/icons/CurveClose.svg
+++ b/engine/editor/icons/CurveClose.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#fff" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/><path fill="#5fb2ff" d="M10 6v2h2V6zm0 2H8v2h2zm-2 2H6v2h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#fff" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/><path fill="#5fb2ff" d="M10 6v2h2V6zm0 2H8v2h2zm-2 2H6v2h2z"/></svg>
diff --git a/engine/editor/icons/CurveConstant.svg b/engine/editor/icons/CurveConstant.svg
index 1ff093d1..5efd6a7c 100644
--- a/engine/editor/icons/CurveConstant.svg
+++ b/engine/editor/icons/CurveConstant.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M2 6h8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M2 6h8"/></svg>
diff --git a/engine/editor/icons/CurveCreate.svg b/engine/editor/icons/CurveCreate.svg
index f851c5b9..8bb49cd8 100644
--- a/engine/editor/icons/CurveCreate.svg
+++ b/engine/editor/icons/CurveCreate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#5fff97" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm6 5v3H8v2h3v3h2v-3h3v-2h-3V8z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#5fff97" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm6 5v3H8v2h3v3h2v-3h3v-2h-3V8z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/CurveCurve.svg b/engine/editor/icons/CurveCurve.svg
index 398f0f35..73c42ff0 100644
--- a/engine/editor/icons/CurveCurve.svg
+++ b/engine/editor/icons/CurveCurve.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#5fb2ff" d="M8.469.47 5.78 3.159a2 2 0 0 0-2.62 2.62L.47 8.47l1.06 1.062 2.69-2.69a2 2 0 0 0 2.62-2.62L9.53 1.53 8.47.471z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#5fb2ff" d="M8.469.47 5.78 3.159a2 2 0 0 0-2.62 2.62L.47 8.47l1.06 1.062 2.69-2.69a2 2 0 0 0 2.62-2.62L9.53 1.53 8.47.471z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/CurveDelete.svg b/engine/editor/icons/CurveDelete.svg
index 0f27b661..a67031ab 100644
--- a/engine/editor/icons/CurveDelete.svg
+++ b/engine/editor/icons/CurveDelete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#ff5f5f" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm4.879 5.465L8.465 9.879 10.585 12l-2.12 2.121 1.414 1.414L12 13.415l2.121 2.12 1.414-1.414L13.415 12l2.12-2.121-1.414-1.414L12 10.585z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#ff5f5f" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm4.879 5.465L8.465 9.879 10.585 12l-2.12 2.121 1.414 1.414L12 13.415l2.121 2.12 1.414-1.414L13.415 12l2.12-2.121-1.414-1.414L12 10.585z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/CurveEdit.svg b/engine/editor/icons/CurveEdit.svg
index f942c200..b8c0a0d4 100644
--- a/engine/editor/icons/CurveEdit.svg
+++ b/engine/editor/icons/CurveEdit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#5fb2ff" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm3 5 3.291 8 .947-2.82 1.883 1.883.943-.942-1.884-1.883 2.82-.947L8 8z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" d="M5 13C3 4 4 3 13 5"/><path fill="#5fb2ff" d="M5 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm3 5 3.291 8 .947-2.82 1.883 1.883.943-.942-1.884-1.883 2.82-.947L8 8z"/><path fill="#fff" d="M13 3a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-8 8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/CurveIn.svg b/engine/editor/icons/CurveIn.svg
index caeaa390..2ce1e7d4 100644
--- a/engine/editor/icons/CurveIn.svg
+++ b/engine/editor/icons/CurveIn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#80ff45" stroke-linecap="round" stroke-width="2" d="M2 10c5 0 8-3 8-8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#80ff45" stroke-linecap="round" stroke-width="2" d="M2 10c5 0 8-3 8-8"/></svg>
diff --git a/engine/editor/icons/CurveInOut.svg b/engine/editor/icons/CurveInOut.svg
index bb2835ea..244e4319 100644
--- a/engine/editor/icons/CurveInOut.svg
+++ b/engine/editor/icons/CurveInOut.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#45d7ff" stroke-linecap="round" stroke-width="2" d="M2 10c5 0 3-8 8-8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#45d7ff" stroke-linecap="round" stroke-width="2" d="M2 10c5 0 3-8 8-8"/></svg>
diff --git a/engine/editor/icons/CurveLinear.svg b/engine/editor/icons/CurveLinear.svg
index f4012776..f7fd16ea 100644
--- a/engine/editor/icons/CurveLinear.svg
+++ b/engine/editor/icons/CurveLinear.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#ffe345" stroke-linecap="round" stroke-width="2" d="m2 10 8-8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#ffe345" stroke-linecap="round" stroke-width="2" d="m2 10 8-8"/></svg>
diff --git a/engine/editor/icons/CurveOut.svg b/engine/editor/icons/CurveOut.svg
index 712fd9b2..4dda2ee4 100644
--- a/engine/editor/icons/CurveOut.svg
+++ b/engine/editor/icons/CurveOut.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#45ffa2" stroke-linecap="round" stroke-width="2" d="M2 10c0-5 3-8 8-8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#45ffa2" stroke-linecap="round" stroke-width="2" d="M2 10c0-5 3-8 8-8"/></svg>
diff --git a/engine/editor/icons/CurveOutIn.svg b/engine/editor/icons/CurveOutIn.svg
index 35095597..1cb3f9fe 100644
--- a/engine/editor/icons/CurveOutIn.svg
+++ b/engine/editor/icons/CurveOutIn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#ff4596" stroke-linecap="round" stroke-width="2" d="M2 10c0-5 8-3 8-8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#ff4596" stroke-linecap="round" stroke-width="2" d="M2 10c0-5 8-3 8-8"/></svg>
diff --git a/engine/editor/icons/CurveTexture.svg b/engine/editor/icons/CurveTexture.svg
index 9fed6258..7d9459d0 100644
--- a/engine/editor/icons/CurveTexture.svg
+++ b/engine/editor/icons/CurveTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v9.16A3 3 0 0 1 2 11h1V3h10v1.135a3 3 0 0 1 2 0V2a1 1 0 0 0-1-1zm7 4v1H8v1H6v1H5v1H4v1h4.39c1.113-.567 1.968-1.454 2.61-3.473V6h-1V5zm4.039 1.727c-.927 3.246-2.636 4.682-4.652 5.466C6.37 12.978 4 13 2 13a1 1 0 1 0 0 2c2 0 4.63.024 7.113-.941 2.484-.966 4.775-3.03 5.848-6.784a1 1 0 0 0-1.922-.548z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v9.16A3 3 0 0 1 2 11h1V3h10v1.135a3 3 0 0 1 2 0V2a1 1 0 0 0-1-1zm7 4v1H8v1H6v1H5v1H4v1h4.39c1.113-.567 1.968-1.454 2.61-3.473V6h-1V5zm4.039 1.727c-.927 3.246-2.636 4.682-4.652 5.466C6.37 12.978 4 13 2 13a1 1 0 1 0 0 2c2 0 4.63.024 7.113-.941 2.484-.966 4.775-3.03 5.848-6.784a1 1 0 0 0-1.922-.548z"/></svg>
diff --git a/engine/editor/icons/CurveTilt.svg b/engine/editor/icons/CurveTilt.svg
index b4ff258b..192e1297 100644
--- a/engine/editor/icons/CurveTilt.svg
+++ b/engine/editor/icons/CurveTilt.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><circle cx="8" cy="8" r="5" fill="none" stroke="#ff6" stroke-miterlimit="10" stroke-width="2"/><path fill="none" stroke="#ff6" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="m8 8v-5"/><path fill="#fff" d="m8 1c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><circle cx="8" cy="8" r="5" fill="none" stroke="#ff6" stroke-miterlimit="10" stroke-width="2"/><path fill="none" stroke="#ff6" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="m8 8v-5"/><path fill="#fff" d="m8 1c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>
diff --git a/engine/editor/icons/CurveXYZTexture.svg b/engine/editor/icons/CurveXYZTexture.svg
index e56401c9..4a32e27f 100644
--- a/engine/editor/icons/CurveXYZTexture.svg
+++ b/engine/editor/icons/CurveXYZTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v10a2 2 0 0 1 .75-.1Q3 11.9 3 10.62V3h10v6.5a2 2 0 0 1 2 0V2a1 1 0 0 0-1-1zm7 4v1H8v1H6v1H5v1H4v.5a2 2 0 0 1 2.7.5h1.2a2 2 0 0 1 3.2 0h.9V8h-1V6h-1V5z"/><g fill="none" stroke-linecap="round" stroke-width="1.6"><path stroke="#ff5f5f" d="M2 14.2q2.5 0 3-3"/><path stroke="#5fff97" d="M6.5 14.2q2.5 0 3-3"/><path stroke="#5fb2ff" d="M11 14.2q2.5 0 3-3"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v10a2 2 0 0 1 .75-.1Q3 11.9 3 10.62V3h10v6.5a2 2 0 0 1 2 0V2a1 1 0 0 0-1-1zm7 4v1H8v1H6v1H5v1H4v.5a2 2 0 0 1 2.7.5h1.2a2 2 0 0 1 3.2 0h.9V8h-1V6h-1V5z"/><g fill="none" stroke-linecap="round" stroke-width="1.6"><path stroke="#ff5f5f" d="M2 14.2q2.5 0 3-3"/><path stroke="#5fff97" d="M6.5 14.2q2.5 0 3-3"/><path stroke="#5fb2ff" d="M11 14.2q2.5 0 3-3"/></g></svg>
diff --git a/engine/editor/icons/CylinderMesh.svg b/engine/editor/icons/CylinderMesh.svg
index e64b2048..6d2095ed 100644
--- a/engine/editor/icons/CylinderMesh.svg
+++ b/engine/editor/icons/CylinderMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M2 4v8a6 2 0 0 0 12 0V4A6 2 0 0 0 2 4a6 2 0 0 0 12 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M2 4v8a6 2 0 0 0 12 0V4A6 2 0 0 0 2 4a6 2 0 0 0 12 0"/></svg>
diff --git a/engine/editor/icons/CylinderShape3D.svg b/engine/editor/icons/CylinderShape3D.svg
index 22e96bae..82538bbd 100644
--- a/engine/editor/icons/CylinderShape3D.svg
+++ b/engine/editor/icons/CylinderShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M1 4h14v8H1z"/><ellipse cx="8" cy="4" fill="#a2d2ff" rx="7" ry="3"/><ellipse cx="8" cy="12" fill="#5fb2ff" rx="7" ry="3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M1 4h14v8H1z"/><ellipse cx="8" cy="4" fill="#a2d2ff" rx="7" ry="3"/><ellipse cx="8" cy="12" fill="#5fb2ff" rx="7" ry="3"/></svg>
diff --git a/engine/editor/icons/DampedSpringJoint2D.svg b/engine/editor/icons/DampedSpringJoint2D.svg
index a84e9956..6ce68524 100644
--- a/engine/editor/icons/DampedSpringJoint2D.svg
+++ b/engine/editor/icons/DampedSpringJoint2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M12 1 4 3v2l4.8 1.8L4 8v2l4.8 1.8L4 13v2l8-2v-2L7.2 9.2 12 8V6L7.2 4.2 12 3V1"/><path fill="#010101" fill-opacity=".235" d="m4 5 4.8 1.8L12 6 7.2 4.2M4 10l4.8 1.8L12 11 7.2 9.2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M12 1 4 3v2l4.8 1.8L4 8v2l4.8 1.8L4 13v2l8-2v-2L7.2 9.2 12 8V6L7.2 4.2 12 3V1"/><path fill="#010101" fill-opacity=".235" d="m4 5 4.8 1.8L12 6 7.2 4.2M4 10l4.8 1.8L12 11 7.2 9.2"/></svg>
diff --git a/engine/editor/icons/Debug.svg b/engine/editor/icons/Debug.svg
index 1956af07..995bd8a8 100644
--- a/engine/editor/icons/Debug.svg
+++ b/engine/editor/icons/Debug.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1a5 5 0 0 0-3.535 1.465 1 1 0 0 0 1.414 1.414 3 3 0 0 1 4.242 0 1 1 0 0 0 1.414-1.414A5 5 0 0 0 8 1zM3 4.996a1 1 0 0 0-1 1c0 .833.327 1.697.969 2.5.33.413.77.796 1.3 1.072a4 4 0 0 0-.136.432H2a1 1 0 0 0 0 2h2.131a4 4 0 0 0 .18.537c-.142.09-.279.185-.41.283-.586.44-1.108.97-1.608 1.47a1 1 0 0 0 1.414 1.413c.5-.5.978-.972 1.393-1.283.17-.127.31-.203.443-.27a4 4 0 0 0 4.914 0c.133.067.273.142.442.268.414.311.892.783 1.392 1.283a1 1 0 0 0 1.414-1.414c-.5-.5-1.022-1.03-1.607-1.469a6.236 6.236 0 0 0-.408-.28 4 4 0 0 0 .175-.54h2.133a1 1 0 0 0 0-2h-2.13a4 4 0 0 0-.135-.434 4.117 4.117 0 0 0 1.296-1.07c.643-.803.97-1.666.97-2.5a1 1 0 0 0-2 0c0 .167-.174.803-.532 1.25-.25.314-.549.55-.932.666a4 4 0 0 0-.603-.412 2 2 0 1 0-3.867 0 4 4 0 0 0-.604.408c-.383-.117-.68-.352-.931-.666-.358-.447-.532-1.083-.532-1.25a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1a5 5 0 0 0-3.535 1.465 1 1 0 0 0 1.414 1.414 3 3 0 0 1 4.242 0 1 1 0 0 0 1.414-1.414A5 5 0 0 0 8 1zM3 4.996a1 1 0 0 0-1 1c0 .833.327 1.697.969 2.5.33.413.77.796 1.3 1.072a4 4 0 0 0-.136.432H2a1 1 0 0 0 0 2h2.131a4 4 0 0 0 .18.537c-.142.09-.279.185-.41.283-.586.44-1.108.97-1.608 1.47a1 1 0 0 0 1.414 1.413c.5-.5.978-.972 1.393-1.283.17-.127.31-.203.443-.27a4 4 0 0 0 4.914 0c.133.067.273.142.442.268.414.311.892.783 1.392 1.283a1 1 0 0 0 1.414-1.414c-.5-.5-1.022-1.03-1.607-1.469a6.236 6.236 0 0 0-.408-.28 4 4 0 0 0 .175-.54h2.133a1 1 0 0 0 0-2h-2.13a4 4 0 0 0-.135-.434 4.117 4.117 0 0 0 1.296-1.07c.643-.803.97-1.666.97-2.5a1 1 0 0 0-2 0c0 .167-.174.803-.532 1.25-.25.314-.549.55-.932.666a4 4 0 0 0-.603-.412 2 2 0 1 0-3.867 0 4 4 0 0 0-.604.408c-.383-.117-.68-.352-.931-.666-.358-.447-.532-1.083-.532-1.25a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/DebugContinue.svg b/engine/editor/icons/DebugContinue.svg
index ec7cbafa..80328642 100644
--- a/engine/editor/icons/DebugContinue.svg
+++ b/engine/editor/icons/DebugContinue.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M10 4v3H5v2h5v3l2.5-2L15 8l-2.5-2z"/><circle cx="4" cy="8" r="3" fill="#e0e0e0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M10 4v3H5v2h5v3l2.5-2L15 8l-2.5-2z"/><circle cx="4" cy="8" r="3" fill="#e0e0e0"/></svg>
diff --git a/engine/editor/icons/DebugNext.svg b/engine/editor/icons/DebugNext.svg
index 034279dd..7af030b2 100644
--- a/engine/editor/icons/DebugNext.svg
+++ b/engine/editor/icons/DebugNext.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="m3 1v10h-2l1.5 2 1.5 2 1.5-2 1.5-2h-2v-10z"/><path fill="#e0e0e0" d="m7 1v2h8v-2zm2 4v2h6v-2zm0 4v2h6v-2zm-2 4v2h8v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="m3 1v10h-2l1.5 2 1.5 2 1.5-2 1.5-2h-2v-10z"/><path fill="#e0e0e0" d="m7 1v2h8v-2zm2 4v2h6v-2zm0 4v2h6v-2zm-2 4v2h8v-2z"/></svg>
diff --git a/engine/editor/icons/DebugSkipBreakpointsOff.svg b/engine/editor/icons/DebugSkipBreakpointsOff.svg
index 9238f116..31fa129a 100644
--- a/engine/editor/icons/DebugSkipBreakpointsOff.svg
+++ b/engine/editor/icons/DebugSkipBreakpointsOff.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17"><circle cx="8.5" cy="8.5" r="6" fill="#fc7f7f"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17"><circle cx="8.5" cy="8.5" r="6" fill="#fc7f7f"/></svg>
diff --git a/engine/editor/icons/DebugSkipBreakpointsOn.svg b/engine/editor/icons/DebugSkipBreakpointsOn.svg
index bed5b832..32713e46 100644
--- a/engine/editor/icons/DebugSkipBreakpointsOn.svg
+++ b/engine/editor/icons/DebugSkipBreakpointsOn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17"><circle cx="8.5" cy="8.5" r="6" fill="#fc7f7f"/><path fill="#e0e0e0" d="M1.077 14.239 14.192 1.084l1.779 1.784L2.855 16.022z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="17"><circle cx="8.5" cy="8.5" r="6" fill="#fc7f7f"/><path fill="#e0e0e0" d="M1.077 14.239 14.192 1.084l1.779 1.784L2.855 16.022z"/></svg>
diff --git a/engine/editor/icons/DebugStep.svg b/engine/editor/icons/DebugStep.svg
index 67d4b80a..25f4642f 100644
--- a/engine/editor/icons/DebugStep.svg
+++ b/engine/editor/icons/DebugStep.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="m1 1v8 2h2 1v2l2-1.5 2-1.5-2-1.5-2-1.5v2h-1v-8z"/><path fill="#e0e0e0" d="m7 1v2h8v-2zm2 4v2h6v-2zm0 4v2h6v-2zm-2 4v2h8v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="m1 1v8 2h2 1v2l2-1.5 2-1.5-2-1.5-2-1.5v2h-1v-8z"/><path fill="#e0e0e0" d="m7 1v2h8v-2zm2 4v2h6v-2zm0 4v2h6v-2zm-2 4v2h8v-2z"/></svg>
diff --git a/engine/editor/icons/Decal.svg b/engine/editor/icons/Decal.svg
index 1b37db37..dd215b0f 100644
--- a/engine/editor/icons/Decal.svg
+++ b/engine/editor/icons/Decal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M13.91 7A6 6 0 1 0 5 13.191z"/><path fill="#ff5f5f" d="M13.91 7A6 6 0 0 0 5 13.191z"/><path fill="#fc7f7f" fill-opacity=".4" d="M5 13.191A6 6 0 0 0 13.91 7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M13.91 7A6 6 0 1 0 5 13.191z"/><path fill="#ff5f5f" d="M13.91 7A6 6 0 0 0 5 13.191z"/><path fill="#fc7f7f" fill-opacity=".4" d="M5 13.191A6 6 0 0 0 13.91 7z"/></svg>
diff --git a/engine/editor/icons/DefaultProjectIcon.svg b/engine/editor/icons/DefaultProjectIcon.svg
index 9d8b7fa1..c6bbb7d8 100644
--- a/engine/editor/icons/DefaultProjectIcon.svg
+++ b/engine/editor/icons/DefaultProjectIcon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><rect width="124" height="124" x="2" y="2" fill="#363d52" stroke="#212532" stroke-width="4" rx="14"/><g fill="#fff" transform="translate(12.322 12.322)scale(.101)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(12.322 12.322)scale(.101)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><rect width="124" height="124" x="2" y="2" fill="#363d52" stroke="#212532" stroke-width="4" rx="14"/><g fill="#fff" transform="translate(12.322 12.322)scale(.101)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(12.322 12.322)scale(.101)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/editor/icons/Dictionary.svg b/engine/editor/icons/Dictionary.svg
index b5dbb316..9c8741f3 100644
--- a/engine/editor/icons/Dictionary.svg
+++ b/engine/editor/icons/Dictionary.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#54ed9e" d="M3 2v2a3 3 0 0 0 0 6h2V2zm3 0v2h2V2zm7 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zm-2 2a3 3 0 0 0 0 6h1V8h-1a1 1 0 0 1 0-2h1V4zM8 7V6H6v4h2zM3 6v2a1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#54ed9e" d="M3 2v2a3 3 0 0 0 0 6h2V2zm3 0v2h2V2zm7 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zm-2 2a3 3 0 0 0 0 6h1V8h-1a1 1 0 0 1 0-2h1V4zM8 7V6H6v4h2zM3 6v2a1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/DirAccess.svg b/engine/editor/icons/DirAccess.svg
index e1f07f9d..a2e0af9f 100644
--- a/engine/editor/icons/DirAccess.svg
+++ b/engine/editor/icons/DirAccess.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M3 10v3h11V5H9.5l-1-2H3v3"/><path fill="#e0e0e0" d="M6 11V9H1V7h5V5l3 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M3 10v3h11V5H9.5l-1-2H3v3"/><path fill="#e0e0e0" d="M6 11V9H1V7h5V5l3 3z"/></svg>
diff --git a/engine/editor/icons/DirectionalLight2D.svg b/engine/editor/icons/DirectionalLight2D.svg
index 0d731545..3abd5a30 100644
--- a/engine/editor/icons/DirectionalLight2D.svg
+++ b/engine/editor/icons/DirectionalLight2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M7 1v3h2V1zM4.465 3.05 3.05 4.466 4.464 5.88l1.414-1.414zm7.07 0-1.414 1.415 1.414 1.414 1.414-1.414zM8 5a2 2 0 0 0 0 6 2 2 0 0 0 0-6zM1 7v2h3V7zm11 0v2h3V7zm-7.535 3.121L3.05 11.535l1.414 1.414 1.414-1.414zm7.07 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 12v3h2v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M7 1v3h2V1zM4.465 3.05 3.05 4.466 4.464 5.88l1.414-1.414zm7.07 0-1.414 1.415 1.414 1.414 1.414-1.414zM8 5a2 2 0 0 0 0 6 2 2 0 0 0 0-6zM1 7v2h3V7zm11 0v2h3V7zm-7.535 3.121L3.05 11.535l1.414 1.414 1.414-1.414zm7.07 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 12v3h2v-3z"/></svg>
diff --git a/engine/editor/icons/DirectionalLight3D.svg b/engine/editor/icons/DirectionalLight3D.svg
index 024a7359..62880610 100644
--- a/engine/editor/icons/DirectionalLight3D.svg
+++ b/engine/editor/icons/DirectionalLight3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7 1v3h2V1zM4.465 3.05 3.05 4.466 4.464 5.88l1.414-1.414zm7.07 0-1.414 1.415 1.414 1.414 1.414-1.414zM8 5a2 2 0 0 0 0 6 2 2 0 0 0 0-6zM1 7v2h3V7zm11 0v2h3V7zm-7.535 3.121L3.05 11.535l1.414 1.414 1.414-1.414zm7.07 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 12v3h2v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7 1v3h2V1zM4.465 3.05 3.05 4.466 4.464 5.88l1.414-1.414zm7.07 0-1.414 1.415 1.414 1.414 1.414-1.414zM8 5a2 2 0 0 0 0 6 2 2 0 0 0 0-6zM1 7v2h3V7zm11 0v2h3V7zm-7.535 3.121L3.05 11.535l1.414 1.414 1.414-1.414zm7.07 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 12v3h2v-3z"/></svg>
diff --git a/engine/editor/icons/DistractionFree.svg b/engine/editor/icons/DistractionFree.svg
index 2f784852..0115216e 100644
--- a/engine/editor/icons/DistractionFree.svg
+++ b/engine/editor/icons/DistractionFree.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v5l1.793-1.793 2.5 2.5 1.4141-1.4141-2.5-2.5 1.793-1.793h-5zm9 0 1.793 1.793-2.5 2.5 1.4141 1.4141 2.5-2.5 1.793 1.793v-5h-5zm-4.707 8.293-2.5 2.5-1.793-1.793v5h5l-1.793-1.793 2.5-2.5-1.4141-1.4141zm5.4141 0-1.4141 1.4141 2.5 2.5-1.793 1.793h5v-5l-1.793 1.793-2.5-2.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v5l1.793-1.793 2.5 2.5 1.4141-1.4141-2.5-2.5 1.793-1.793h-5zm9 0 1.793 1.793-2.5 2.5 1.4141 1.4141 2.5-2.5 1.793 1.793v-5h-5zm-4.707 8.293-2.5 2.5-1.793-1.793v5h5l-1.793-1.793 2.5-2.5-1.4141-1.4141zm5.4141 0-1.4141 1.4141 2.5 2.5-1.793 1.793h5v-5l-1.793 1.793-2.5-2.5z"/></svg>
diff --git a/engine/editor/icons/DragHandle.svg b/engine/editor/icons/DragHandle.svg
new file mode 100644
index 00000000..d57c70f2
--- /dev/null
+++ b/engine/editor/icons/DragHandle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#def"><circle cx="4" cy="3" r="2"/><circle cx="4" cy="8" r="2"/><circle cx="4" cy="13" r="2"/><circle cx="12" cy="3" r="2"/><circle cx="12" cy="8" r="2"/><circle cx="12" cy="13" r="2"/></g></svg>
diff --git a/engine/editor/icons/Duplicate.svg b/engine/editor/icons/Duplicate.svg
index 48b198c1..f3eb523a 100644
--- a/engine/editor/icons/Duplicate.svg
+++ b/engine/editor/icons/Duplicate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 1v11h9v-6h-5v-5zm5 0v4h4zm-8 3v11h2 8v-2h-8v-9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 1v11h9v-6h-5v-5zm5 0v4h4zm-8 3v11h2 8v-2h-8v-9z"/></svg>
diff --git a/engine/editor/icons/Edit.svg b/engine/editor/icons/Edit.svg
index 7963e544..b80d4529 100644
--- a/engine/editor/icons/Edit.svg
+++ b/engine/editor/icons/Edit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1c-.554 0-1 .446-1 1v2h4v-2c0-.554-.446-1-1-1zm-1 4v7l2 3 2-3v-7zm1 1h1v5h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1c-.554 0-1 .446-1 1v2h4v-2c0-.554-.446-1-1-1zm-1 4v7l2 3 2-3v-7zm1 1h1v5h-1z"/></svg>
diff --git a/engine/editor/icons/EditAddRemove.svg b/engine/editor/icons/EditAddRemove.svg
index 09af4f7f..cf55f922 100644
--- a/engine/editor/icons/EditAddRemove.svg
+++ b/engine/editor/icons/EditAddRemove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a1 1 0 0 0-1 1v2h4V2a1 1 0 0 0-1-1zM2 5v7l2 3 2-3V5zm1 1h1v5H3zm7.75-.25v2h-2v1.5h2v2h1.5v-2h2v-1.5h-2v-2zm-2 7v1.5h5.5v-1.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a1 1 0 0 0-1 1v2h4V2a1 1 0 0 0-1-1zM2 5v7l2 3 2-3V5zm1 1h1v5H3zm7.75-.25v2h-2v1.5h2v2h1.5v-2h2v-1.5h-2v-2zm-2 7v1.5h5.5v-1.5z"/></svg>
diff --git a/engine/editor/icons/EditBezier.svg b/engine/editor/icons/EditBezier.svg
index 9ba25e49..5ad8348b 100644
--- a/engine/editor/icons/EditBezier.svg
+++ b/engine/editor/icons/EditBezier.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-width="2.2" d="M1.476 13.906c11.65.72 3.11-11.497 12.233-11.347"/><g fill="#e0e0e0"><circle cx="13.5" cy="2.5" r="1.823"/><circle cx="2.5" cy="14" r="1.823"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-width="2.2" d="M1.476 13.906c11.65.72 3.11-11.497 12.233-11.347"/><g fill="#e0e0e0"><circle cx="13.5" cy="2.5" r="1.823"/><circle cx="2.5" cy="14" r="1.823"/></g></svg>
diff --git a/engine/editor/icons/EditInternal.svg b/engine/editor/icons/EditInternal.svg
index cf6a470b..d9385d2a 100644
--- a/engine/editor/icons/EditInternal.svg
+++ b/engine/editor/icons/EditInternal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M3.678 1c-.554 0-1 .446-1 1v2h4V2c0-.554-.446-1-1-1zm-1 4v7l2 3 2-3V5zm1 1h1v5h-1z"/><circle cx="10.508" cy="12.678" r="2.373"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M3.678 1c-.554 0-1 .446-1 1v2h4V2c0-.554-.446-1-1-1zm-1 4v7l2 3 2-3V5zm1 1h1v5h-1z"/><circle cx="10.508" cy="12.678" r="2.373"/></g></svg>
diff --git a/engine/editor/icons/EditKey.svg b/engine/editor/icons/EditKey.svg
index b3fdbe33..17f31563 100644
--- a/engine/editor/icons/EditKey.svg
+++ b/engine/editor/icons/EditKey.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 1a1 1 0 0 0-1 1v2h4V2a1 1 0 0 0-1-1zM1.226 7.46a.76.76 0 0 0 0 1.078l3.236 3.236a.76.76 0 0 0 1.078 0L8.775 8.54a.76.76 0 0 0 0-1.078L5.54 4.225a.76.76 0 0 0-1.08 0zM11 5v7l2 3 2-3V5zm1 1h1v5h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 1a1 1 0 0 0-1 1v2h4V2a1 1 0 0 0-1-1zM1.226 7.46a.76.76 0 0 0 0 1.078l3.236 3.236a.76.76 0 0 0 1.078 0L8.775 8.54a.76.76 0 0 0 0-1.078L5.54 4.225a.76.76 0 0 0-1.08 0zM11 5v7l2 3 2-3V5zm1 1h1v5h-1z"/></svg>
diff --git a/engine/editor/icons/EditPivot.svg b/engine/editor/icons/EditPivot.svg
index 2e208156..2c15b1e6 100644
--- a/engine/editor/icons/EditPivot.svg
+++ b/engine/editor/icons/EditPivot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1v4h2v-4zm-6 6v2h4v-2zm10 0v.61328l3.3711 1.3867h.62891v-2h-4zm-3 1 3.291 8 .94726-2.8203 1.8828 1.8828.94336-.94141-1.8848-1.8828 2.8203-.94726-8-3.291zm-1 3v4h2v-.625l-1.3887-3.375h-.61133z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1v4h2v-4zm-6 6v2h4v-2zm10 0v.61328l3.3711 1.3867h.62891v-2h-4zm-3 1 3.291 8 .94726-2.8203 1.8828 1.8828.94336-.94141-1.8848-1.8828 2.8203-.94726-8-3.291zm-1 3v4h2v-.625l-1.3887-3.375h-.61133z"/></svg>
diff --git a/engine/editor/icons/Editor3DHandle.svg b/engine/editor/icons/Editor3DHandle.svg
index cdf01d75..f526d1a8 100644
--- a/engine/editor/icons/Editor3DHandle.svg
+++ b/engine/editor/icons/Editor3DHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".294"/><circle cx="8" cy="8" r="6" fill="#ff5f5f" stroke="#fff" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".294"/><circle cx="8" cy="8" r="6" fill="#ff5f5f" stroke="#fff" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/EditorBoneHandle.svg b/engine/editor/icons/EditorBoneHandle.svg
index 81ec0852..078fb3e3 100644
--- a/engine/editor/icons/EditorBoneHandle.svg
+++ b/engine/editor/icons/EditorBoneHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="3.25" stroke="#fff" stroke-width="1.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="3.25" stroke="#fff" stroke-width="1.5"/></svg>
diff --git a/engine/editor/icons/EditorControlAnchor.svg b/engine/editor/icons/EditorControlAnchor.svg
index d7d7830f..ffc07d93 100644
--- a/engine/editor/icons/EditorControlAnchor.svg
+++ b/engine/editor/icons/EditorControlAnchor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".4" d="M16 16 9.883 6.06a5 5 0 1 0-3.826 3.82z"/><path fill="#8eef97" d="M16 16 8.832 6.144A4 4 0 1 0 6.14 8.83z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".4" d="M16 16 9.883 6.06a5 5 0 1 0-3.826 3.82z"/><path fill="#8eef97" d="M16 16 8.832 6.144A4 4 0 1 0 6.14 8.83z"/></svg>
diff --git a/engine/editor/icons/EditorCurveHandle.svg b/engine/editor/icons/EditorCurveHandle.svg
index a9eb9290..8e12be9f 100644
--- a/engine/editor/icons/EditorCurveHandle.svg
+++ b/engine/editor/icons/EditorCurveHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="4.4" fill="#fff" stroke="#000" stroke-linecap="square" stroke-width="1.6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="4.4" fill="#fff" stroke="#000" stroke-linecap="square" stroke-width="1.6"/></svg>
diff --git a/engine/editor/icons/EditorFileDialog.svg b/engine/editor/icons/EditorFileDialog.svg
index c6076c9f..02d89ffa 100644
--- a/engine/editor/icons/EditorFileDialog.svg
+++ b/engine/editor/icons/EditorFileDialog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm3 2h3c1 0 1 2 2 2h3v4H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm3 2h3c1 0 1 2 2 2h3v4H4z"/></svg>
diff --git a/engine/editor/icons/EditorHandle.svg b/engine/editor/icons/EditorHandle.svg
index 236bb05a..b4cc81aa 100644
--- a/engine/editor/icons/EditorHandle.svg
+++ b/engine/editor/icons/EditorHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="5" fill-opacity=".294"/><circle cx="5" cy="5" r="3.5" fill="#ff5f5f" stroke="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="5" fill-opacity=".294"/><circle cx="5" cy="5" r="3.5" fill="#ff5f5f" stroke="#fff"/></svg>
diff --git a/engine/editor/icons/EditorHandleAdd.svg b/engine/editor/icons/EditorHandleAdd.svg
index 6c1fc48a..ad127657 100644
--- a/engine/editor/icons/EditorHandleAdd.svg
+++ b/engine/editor/icons/EditorHandleAdd.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="5" fill-opacity=".294"/><circle cx="5" cy="5" r="4" fill="#474747"/><path fill="#5fff97" d="m4 2v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="5" fill-opacity=".294"/><circle cx="5" cy="5" r="4" fill="#474747"/><path fill="#5fff97" d="m4 2v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/></svg>
diff --git a/engine/editor/icons/EditorHandleDisabled.svg b/engine/editor/icons/EditorHandleDisabled.svg
index ca5f0dea..f816030b 100644
--- a/engine/editor/icons/EditorHandleDisabled.svg
+++ b/engine/editor/icons/EditorHandleDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="4" fill="none" stroke="#fff" stroke-opacity=".294" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="4" fill="none" stroke="#fff" stroke-opacity=".294" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/EditorPathSharpHandle.svg b/engine/editor/icons/EditorPathSharpHandle.svg
index 6857db27..9a9fe3cb 100644
--- a/engine/editor/icons/EditorPathSharpHandle.svg
+++ b/engine/editor/icons/EditorPathSharpHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000" stroke-width="1.6" d="M14.869 8 8 14.869 1.131 8 8 1.131z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000" stroke-width="1.6" d="M14.869 8 8 14.869 1.131 8 8 1.131z"/></svg>
diff --git a/engine/editor/icons/EditorPathSmoothHandle.svg b/engine/editor/icons/EditorPathSmoothHandle.svg
index 50f59df5..03a3acac 100644
--- a/engine/editor/icons/EditorPathSmoothHandle.svg
+++ b/engine/editor/icons/EditorPathSmoothHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000" stroke-linecap="square" stroke-width="1.6" d="m13.6 2.4v11.2h-11.2v-11.2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000" stroke-linecap="square" stroke-width="1.6" d="m13.6 2.4v11.2h-11.2v-11.2z"/></svg>
diff --git a/engine/editor/icons/EditorPivot.svg b/engine/editor/icons/EditorPivot.svg
index 816c9cf5..3fb37c1f 100644
--- a/engine/editor/icons/EditorPivot.svg
+++ b/engine/editor/icons/EditorPivot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".706" d="m6 0v6h-6v4h6v6h4v-6h6v-4h-6v-6zm1 7h2v2h-2z"/><path fill="#ff5f5f" d="m7 1v5h2v-5zm-6 6v2h5v-2zm9 0v2h5v-2zm-3 3v5h2v-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".706" d="m6 0v6h-6v4h6v6h4v-6h6v-4h-6v-6zm1 7h2v2h-2z"/><path fill="#ff5f5f" d="m7 1v5h2v-5zm-6 6v2h5v-2zm9 0v2h5v-2zm-3 3v5h2v-5z"/></svg>
diff --git a/engine/editor/icons/EditorPlugin.svg b/engine/editor/icons/EditorPlugin.svg
index 51081a91..1dd2c5cf 100644
--- a/engine/editor/icons/EditorPlugin.svg
+++ b/engine/editor/icons/EditorPlugin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h3v.25a2 2 0 1 0 2 0V11h3a1 1 0 0 0 1-1V7h.25a2 2 0 1 0 0-2H11V2a1 1 0 0 0-1-1H2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h3v.25a2 2 0 1 0 2 0V11h3a1 1 0 0 0 1-1V7h.25a2 2 0 1 0 0-2H11V2a1 1 0 0 0-1-1H2z"/></svg>
diff --git a/engine/editor/icons/EditorPosition.svg b/engine/editor/icons/EditorPosition.svg
index 10083286..a937b28d 100644
--- a/engine/editor/icons/EditorPosition.svg
+++ b/engine/editor/icons/EditorPosition.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".706" d="M6 0v4.42A4 4 0 0 0 4.42 6H0v4h4.42A4 4 0 0 0 6 11.58V16h4v-4.42A4 4 0 0 0 11.58 10H16V6h-4.42A4 4 0 0 0 10 4.42V0Z"/><path fill="#ff5f5f" d="M7 1v3a4 4 0 0 1 2 0V1Zm1 4a3 3 0 0 0 0 6 3 3 0 0 0 0-6ZM1 7v2h3a4 4 0 0 1 0-2H1Zm11 0a4 4 0 0 1 0 2h3V7Zm-5 8h2v-3a4 4 0 0 1-2 0Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".706" d="M6 0v4.42A4 4 0 0 0 4.42 6H0v4h4.42A4 4 0 0 0 6 11.58V16h4v-4.42A4 4 0 0 0 11.58 10H16V6h-4.42A4 4 0 0 0 10 4.42V0Z"/><path fill="#ff5f5f" d="M7 1v3a4 4 0 0 1 2 0V1Zm1 4a3 3 0 0 0 0 6 3 3 0 0 0 0-6ZM1 7v2h3a4 4 0 0 1 0-2H1Zm11 0a4 4 0 0 1 0 2h3V7Zm-5 8h2v-3a4 4 0 0 1-2 0Z"/></svg>
diff --git a/engine/editor/icons/EditorPositionPrevious.svg b/engine/editor/icons/EditorPositionPrevious.svg
index 04538ced..cc9c1dca 100644
--- a/engine/editor/icons/EditorPositionPrevious.svg
+++ b/engine/editor/icons/EditorPositionPrevious.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" fill-opacity=".698" d="M7 1v3a4 4 0 0 1 2 0V1zm1 4a3 3 0 0 0 0 6 3 3 0 0 0 0-6zM1 7v2h2.87a4 4 0 0 1 0-2H1zm11 0a4 4 0 0 1 0 2h3V7zm-5 8h2v-3a4 4 0 0 1-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" fill-opacity=".698" d="M7 1v3a4 4 0 0 1 2 0V1zm1 4a3 3 0 0 0 0 6 3 3 0 0 0 0-6zM1 7v2h2.87a4 4 0 0 1 0-2H1zm11 0a4 4 0 0 1 0 2h3V7zm-5 8h2v-3a4 4 0 0 1-2 0z"/></svg>
diff --git a/engine/editor/icons/EditorPositionUnselected.svg b/engine/editor/icons/EditorPositionUnselected.svg
index 12334dc6..b4fee894 100644
--- a/engine/editor/icons/EditorPositionUnselected.svg
+++ b/engine/editor/icons/EditorPositionUnselected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".411" d="M6 0v4.42A4 4 0 0 0 4.291 6H0v4h4.42A4 4 0 0 0 6 11.582V16h4v-4.42A4 4 0 0 0 11.709 10H16V6h-4.42A4 4 0 0 0 10 4.418V0z"/><path fill="#d6d6d6" d="M7 1v3a4 4 0 0 1 2 0V1zm1 4a3 3 0 0 0 0 6 3 3 0 0 0 0-6zM1 7v2h2.87a4 4 0 0 1 0-2H1zm11 0a4 4 0 0 1 0 2h3V7zm-5 8h2v-3a4 4 0 0 1-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".411" d="M6 0v4.42A4 4 0 0 0 4.291 6H0v4h4.42A4 4 0 0 0 6 11.582V16h4v-4.42A4 4 0 0 0 11.709 10H16V6h-4.42A4 4 0 0 0 10 4.418V0z"/><path fill="#d6d6d6" d="M7 1v3a4 4 0 0 1 2 0V1zm1 4a3 3 0 0 0 0 6 3 3 0 0 0 0-6zM1 7v2h2.87a4 4 0 0 1 0-2H1zm11 0a4 4 0 0 1 0 2h3V7zm-5 8h2v-3a4 4 0 0 1-2 0z"/></svg>
diff --git a/engine/editor/icons/Enum.svg b/engine/editor/icons/Enum.svg
index da4ca908..e6fc1efc 100644
--- a/engine/editor/icons/Enum.svg
+++ b/engine/editor/icons/Enum.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-2 2v1a1 1 0 0 0 0 2v1a2 2 0 0 0 2 2h1V8H3V4h1V2zm3 0v8h4V8H8V7h2V5H8V4h2V2zm6 0v2h1v4h-1v2h1a2 2 0 0 0 2-2V7a1 1 0 0 0 0-2V4a2 2 0 0 0-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-2 2v1a1 1 0 0 0 0 2v1a2 2 0 0 0 2 2h1V8H3V4h1V2zm3 0v8h4V8H8V7h2V5H8V4h2V2zm6 0v2h1v4h-1v2h1a2 2 0 0 0 2-2V7a1 1 0 0 0 0-2V4a2 2 0 0 0-2-2z"/></svg>
diff --git a/engine/editor/icons/Environment.svg b/engine/editor/icons/Environment.svg
index e958323f..9909a77c 100644
--- a/engine/editor/icons/Environment.svg
+++ b/engine/editor/icons/Environment.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0"><circle cx="8" cy="8" r="6" stroke-width="2"/><path stroke-width="1.5" d="M2 8a6.5 2 0 0 0 12 0M8 2c-3 4-3 8 0 12M8 2c3 4 3 8 0 12"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0"><circle cx="8" cy="8" r="6" stroke-width="2"/><path stroke-width="1.5" d="M2 8a6.5 2 0 0 0 12 0M8 2c-3 4-3 8 0 12M8 2c3 4 3 8 0 12"/></g></svg>
diff --git a/engine/editor/icons/Eraser.svg b/engine/editor/icons/Eraser.svg
index ff8accec..af60e775 100644
--- a/engine/editor/icons/Eraser.svg
+++ b/engine/editor/icons/Eraser.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M10 1.5.5 11 4 14.5h4L15.5 7Zm-4.5 7 3 3-1 1h-3L3 11Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M10 1.5.5 11 4 14.5h4L15.5 7Zm-4.5 7 3 3-1 1h-3L3 11Z"/></svg>
diff --git a/engine/editor/icons/Error.svg b/engine/editor/icons/Error.svg
index ada7afc0..a52f7b67 100644
--- a/engine/editor/icons/Error.svg
+++ b/engine/editor/icons/Error.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="4" fill="#ff5f5f"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="4" fill="#ff5f5f"/></svg>
diff --git a/engine/editor/icons/ErrorWarning.svg b/engine/editor/icons/ErrorWarning.svg
index 833b632d..de49f24e 100644
--- a/engine/editor/icons/ErrorWarning.svg
+++ b/engine/editor/icons/ErrorWarning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#ff5f5f" d="M4 8a1 1 0 0 1 0-8z"/><path fill="#ffdd65" d="M4 0a1 1 0 0 1 0 8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#ff5f5f" d="M4 8a1 1 0 0 1 0-8z"/><path fill="#ffdd65" d="M4 0a1 1 0 0 1 0 8z"/></svg>
diff --git a/engine/editor/icons/ExpandBottomDock.svg b/engine/editor/icons/ExpandBottomDock.svg
index 67d4650b..80025119 100644
--- a/engine/editor/icons/ExpandBottomDock.svg
+++ b/engine/editor/icons/ExpandBottomDock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 4.5 1 8h2v5h2V8h2zm8 0L9 8h2v5h2V8h2zM1 1h14v2H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 4.5 1 8h2v5h2V8h2zm8 0L9 8h2v5h2V8h2zM1 1h14v2H1z"/></svg>
diff --git a/engine/editor/icons/ExpandTree.svg b/engine/editor/icons/ExpandTree.svg
index 9abf5f47..bf23621b 100644
--- a/engine/editor/icons/ExpandTree.svg
+++ b/engine/editor/icons/ExpandTree.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 16-3.5-2.5H7V11h2v2.5h2.5zM8 0 4.5 2.5H7V5h2V2.5h2.5zM1 7h14v2H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 16-3.5-2.5H7V11h2v2.5h2.5zM8 0 4.5 2.5H7V5h2V2.5h2.5zM1 7h14v2H1z"/></svg>
diff --git a/engine/editor/icons/ExternalLink.svg b/engine/editor/icons/ExternalLink.svg
index 4a2b57fa..a5c8e54a 100644
--- a/engine/editor/icons/ExternalLink.svg
+++ b/engine/editor/icons/ExternalLink.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 9 5.5-5.5L8 1h7v7l-2.5-2.5L7 11zm7 6H4a3 3 0 0 1-3-3V4a3 3 0 0 1 3-3h2a1 1 0 0 1 0 2H4a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-2a1 1 0 0 1 2 0v2a3 3 0 0 1-3 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 9 5.5-5.5L8 1h7v7l-2.5-2.5L7 11zm7 6H4a3 3 0 0 1-3-3V4a3 3 0 0 1 3-3h2a1 1 0 0 1 0 2H4a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-2a1 1 0 0 1 2 0v2a3 3 0 0 1-3 3z"/></svg>
diff --git a/engine/editor/icons/FPS.svg b/engine/editor/icons/FPS.svg
index 5ee818c3..a0c28578 100644
--- a/engine/editor/icons/FPS.svg
+++ b/engine/editor/icons/FPS.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7.25 4h-2v8h2v-2c1.656 0 3-1.344 3-3 0-1.657-1.344-3-3-3zm0 4v-2c.553 0 1 .448 1 1s-.447 1-1 1zM.25 7v5h2v-2h2v-2h-2v-1c0-.553.447-1 1-1h1v-2h-1c-1.656 0-3 1.344-3 3zM13.25 7c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2v-2h-2c-1.381 0-2.5 1.119-2.5 2.5s1.119 2.5 2.5 2.5c.276 0 .5.224.5.5s-.224.5-.5.5h-2v2h2c1.381 0 2.5-1.119 2.5-2.5s-1.119-2.5-2.5-2.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7.25 4h-2v8h2v-2c1.656 0 3-1.344 3-3 0-1.657-1.344-3-3-3zm0 4v-2c.553 0 1 .448 1 1s-.447 1-1 1zM.25 7v5h2v-2h2v-2h-2v-1c0-.553.447-1 1-1h1v-2h-1c-1.656 0-3 1.344-3 3zM13.25 7c-.276 0-.5-.224-.5-.5s.224-.5.5-.5h2v-2h-2c-1.381 0-2.5 1.119-2.5 2.5s1.119 2.5 2.5 2.5c.276 0 .5.224.5.5s-.224.5-.5.5h-2v2h2c1.381 0 2.5-1.119 2.5-2.5s-1.119-2.5-2.5-2.5z"/></svg>
diff --git a/engine/editor/icons/FadeCross.svg b/engine/editor/icons/FadeCross.svg
index 2f78954d..8b8a46df 100644
--- a/engine/editor/icons/FadeCross.svg
+++ b/engine/editor/icons/FadeCross.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m9 1v2h2.586l-3.586 3.586-4.293-4.293-1.414 1.414 4.293 4.293-4.293 4.293 1.414 1.414 4.293-4.293 3.586 3.586h-2.586v2h5a1 1 0 0 0 1-1v-5h-2v2.586l-3.586-3.586 3.586-3.586v2.586h2v-5a1 1 0 0 0 -1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m9 1v2h2.586l-3.586 3.586-4.293-4.293-1.414 1.414 4.293 4.293-4.293 4.293 1.414 1.414 4.293-4.293 3.586 3.586h-2.586v2h5a1 1 0 0 0 1-1v-5h-2v2.586l-3.586-3.586 3.586-3.586v2.586h2v-5a1 1 0 0 0 -1-1z"/></svg>
diff --git a/engine/editor/icons/FadeDisabled.svg b/engine/editor/icons/FadeDisabled.svg
index 10d295ba..d39e4aeb 100644
--- a/engine/editor/icons/FadeDisabled.svg
+++ b/engine/editor/icons/FadeDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m11.032091 3.1108593-1.4142134 1.4142136 1.8285784 1.8285781h-9.8600786v1.999698h9.8600786l-1.8285784 1.828578 1.4142134 1.414214 3.535534-3.5355342c.390524-.3905243.390525-1.0236891 0-1.4142136z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m11.032091 3.1108593-1.4142134 1.4142136 1.8285784 1.8285781h-9.8600786v1.999698h9.8600786l-1.8285784 1.828578 1.4142134 1.414214 3.535534-3.5355342c.390524-.3905243.390525-1.0236891 0-1.4142136z"/></svg>
diff --git a/engine/editor/icons/FadeIn.svg b/engine/editor/icons/FadeIn.svg
index 92578bb3..477d5ec2 100644
--- a/engine/editor/icons/FadeIn.svg
+++ b/engine/editor/icons/FadeIn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m9 1v2h2.586c-9.293 9.293-.896067.8960673-9.293 9.293l1.414 1.414c9.293-9.293 3.7072139-3.7072139 9.293-9.293v2.586h2v-5c0-.5522847-.447715-1-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m9 1v2h2.586c-9.293 9.293-.896067.8960673-9.293 9.293l1.414 1.414c9.293-9.293 3.7072139-3.7072139 9.293-9.293v2.586h2v-5c0-.5522847-.447715-1-1-1z"/></svg>
diff --git a/engine/editor/icons/FadeOut.svg b/engine/editor/icons/FadeOut.svg
index 6dc6585c..b38f065d 100644
--- a/engine/editor/icons/FadeOut.svg
+++ b/engine/editor/icons/FadeOut.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3.707 2.293-1.414 1.414c9.293 9.293 1.4503342 1.4503342 9.293 9.293h-2.586v2h5c.552285 0 1-.447715 1-1v-5h-2v2.586c-9.293-9.293-2.832166-2.8321664-9.293-9.293z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3.707 2.293-1.414 1.414c9.293 9.293 1.4503342 1.4503342 9.293 9.293h-2.586v2h5c.552285 0 1-.447715 1-1v-5h-2v2.586c-9.293-9.293-2.832166-2.8321664-9.293-9.293z"/></svg>
diff --git a/engine/editor/icons/Favorites.svg b/engine/editor/icons/Favorites.svg
index f4bd5f67..3595265d 100644
--- a/engine/editor/icons/Favorites.svg
+++ b/engine/editor/icons/Favorites.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1.7 5.626 5.797 1 6.895l3.236 3.408-.359 4.673 4.14-1.977 4.157 1.942-.396-4.653L15 6.895l-4.626-1.098z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1.7 5.626 5.797 1 6.895l3.236 3.408-.359 4.673 4.14-1.977 4.157 1.942-.396-4.653L15 6.895l-4.626-1.098z"/></svg>
diff --git a/engine/editor/icons/File.svg b/engine/editor/icons/File.svg
index 11573e8a..63fd97bf 100644
--- a/engine/editor/icons/File.svg
+++ b/engine/editor/icons/File.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1v14h12v-9h-5v-5zm8 0v4h4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1v14h12v-9h-5v-5zm8 0v4h4z"/></svg>
diff --git a/engine/editor/icons/FileAccess.svg b/engine/editor/icons/FileAccess.svg
index 36937ed2..d69df0c7 100644
--- a/engine/editor/icons/FileAccess.svg
+++ b/engine/editor/icons/FileAccess.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M15 6v8a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-3h2v2h8V7h-3a1 1 0 0 1-1-1V3H5v4H3V2a1 1 0 0 1 1-1h6zm-9 6v-2H1V8h5V6l3 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M15 6v8a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1v-3h2v2h8V7h-3a1 1 0 0 1-1-1V3H5v4H3V2a1 1 0 0 1 1-1h6zm-9 6v-2H1V8h5V6l3 3z"/></svg>
diff --git a/engine/editor/icons/FileBigThumb.svg b/engine/editor/icons/FileBigThumb.svg
index 7405830e..034f8b8a 100644
--- a/engine/editor/icons/FileBigThumb.svg
+++ b/engine/editor/icons/FileBigThumb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#fff" fill-opacity=".6" d="M14 5a4 4 0 0 0-4 4v46a4 4 0 0 0 4 4h36a4 4 0 0 0 4-4V22a1 1 0 0 0-.29-.707l-16-16a1 1 0 0 0-.707-.29V5H14zm0 2h22v12a4 4 0 0 0 4 4h12v32a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#fff" fill-opacity=".6" d="M14 5a4 4 0 0 0-4 4v46a4 4 0 0 0 4 4h36a4 4 0 0 0 4-4V22a1 1 0 0 0-.29-.707l-16-16a1 1 0 0 0-.707-.29V5H14zm0 2h22v12a4 4 0 0 0 4 4h12v32a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2z"/></svg>
diff --git a/engine/editor/icons/FileBroken.svg b/engine/editor/icons/FileBroken.svg
index 0f7ed384..0b52af04 100644
--- a/engine/editor/icons/FileBroken.svg
+++ b/engine/editor/icons/FileBroken.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M2 1v8.586l1.293-1.293a1 1 0 0 1 1.414 0L7 10.587l2.293-2.293a1 1 0 0 1 1.414 0L13 10.586l1-1V6H9V1H2zm8 0v4h4zm-6 9.414-2 2V15h12v-2.586l-.293.293a1 1 0 0 1-1.414 0L10 10.414l-2.293 2.293a1 1 0 0 1-1.414 0L4 10.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M2 1v8.586l1.293-1.293a1 1 0 0 1 1.414 0L7 10.587l2.293-2.293a1 1 0 0 1 1.414 0L13 10.586l1-1V6H9V1H2zm8 0v4h4zm-6 9.414-2 2V15h12v-2.586l-.293.293a1 1 0 0 1-1.414 0L10 10.414l-2.293 2.293a1 1 0 0 1-1.414 0L4 10.414z"/></svg>
diff --git a/engine/editor/icons/FileBrokenBigThumb.svg b/engine/editor/icons/FileBrokenBigThumb.svg
index 20b0cd94..defc1c6d 100644
--- a/engine/editor/icons/FileBrokenBigThumb.svg
+++ b/engine/editor/icons/FileBrokenBigThumb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#ff5f5f" d="M14 5c-2.199 0-4 1.801-4 4v26.172a1 1 0 0 0 1.707.707L15 32.586l9.293 9.293a1 1 0 0 0 1.414 0L35 32.586l9.293 9.293a1 1 0 0 0 1.414 0l8-8a1 1 0 0 0 .293-.707V22a1 1 0 0 0-.293-.707l-16-16A1 1 0 0 0 37 5H14zm0 2h22v12c0 2.199 1.801 4 4 4h12v9.758l-7 7-9.293-9.293a1 1 0 0 0-1.414 0L25 39.758l-9.293-9.293a1 1 0 0 0-1.414 0L12 32.758V9c0-1.126.875-2 2-2zm.984 28.83a1 1 0 0 0-.691.293l-4 4a1 1 0 0 0-.293.707V55c0 2.199 1.801 4 4 4h36c2.199 0 4-1.801 4-4V38.83a1 1 0 0 0-1.707-.707L45 45.416l-9.293-9.293a1 1 0 0 0-1.414 0L25 45.416l-9.293-9.293a1 1 0 0 0-.723-.293zM15 38.244l9.293 9.293a1 1 0 0 0 1.414 0L35 38.244l9.293 9.293a1 1 0 0 0 1.414 0L52 41.244V55c0 1.125-.875 2-2 2H14c-1.125 0-2-.875-2-2V41.244l3-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#ff5f5f" d="M14 5c-2.199 0-4 1.801-4 4v26.172a1 1 0 0 0 1.707.707L15 32.586l9.293 9.293a1 1 0 0 0 1.414 0L35 32.586l9.293 9.293a1 1 0 0 0 1.414 0l8-8a1 1 0 0 0 .293-.707V22a1 1 0 0 0-.293-.707l-16-16A1 1 0 0 0 37 5H14zm0 2h22v12c0 2.199 1.801 4 4 4h12v9.758l-7 7-9.293-9.293a1 1 0 0 0-1.414 0L25 39.758l-9.293-9.293a1 1 0 0 0-1.414 0L12 32.758V9c0-1.126.875-2 2-2zm.984 28.83a1 1 0 0 0-.691.293l-4 4a1 1 0 0 0-.293.707V55c0 2.199 1.801 4 4 4h36c2.199 0 4-1.801 4-4V38.83a1 1 0 0 0-1.707-.707L45 45.416l-9.293-9.293a1 1 0 0 0-1.414 0L25 45.416l-9.293-9.293a1 1 0 0 0-.723-.293zM15 38.244l9.293 9.293a1 1 0 0 0 1.414 0L35 38.244l9.293 9.293a1 1 0 0 0 1.414 0L52 41.244V55c0 1.125-.875 2-2 2H14c-1.125 0-2-.875-2-2V41.244l3-3z"/></svg>
diff --git a/engine/editor/icons/FileBrowse.svg b/engine/editor/icons/FileBrowse.svg
index ad7e01d9..01e796a3 100644
--- a/engine/editor/icons/FileBrowse.svg
+++ b/engine/editor/icons/FileBrowse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1v14h2.707a2.5 2.5 0 0 1-.207-1A2.49 2.49 0 0 1 7 11.5c.565 0 1.083.188 1.5.5a2.494 2.494 0 0 1 3 0 2.51 2.51 0 0 1 2.5-.293V6H9V1Zm8 0v4h4z"/><path fill="#e0e0e0" d="M8 14a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1v14h2.707a2.5 2.5 0 0 1-.207-1A2.49 2.49 0 0 1 7 11.5c.565 0 1.083.188 1.5.5a2.494 2.494 0 0 1 3 0 2.51 2.51 0 0 1 2.5-.293V6H9V1Zm8 0v4h4z"/><path fill="#e0e0e0" d="M8 14a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/></svg>
diff --git a/engine/editor/icons/FileDead.svg b/engine/editor/icons/FileDead.svg
index 0d6d765f..4e7b33c9 100644
--- a/engine/editor/icons/FileDead.svg
+++ b/engine/editor/icons/FileDead.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M2 1v14h12V6H9V1zm8 0v4h4zM5 7.793l.646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.707.707L5 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .707-.707zm6 0 .646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.706.707L11 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .706-.707zM3.5 11h9a.5.5 0 0 1 0 1H8a2 2 0 0 1-4 0h-.5a.5.5 0 0 1 0-1zM5 12a1 1 0 0 0 2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M2 1v14h12V6H9V1zm8 0v4h4zM5 7.793l.646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.707.707L5 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .707-.707zm6 0 .646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.706.707L11 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .706-.707zM3.5 11h9a.5.5 0 0 1 0 1H8a2 2 0 0 1-4 0h-.5a.5.5 0 0 1 0-1zM5 12a1 1 0 0 0 2 0z"/></svg>
diff --git a/engine/editor/icons/FileDeadBigThumb.svg b/engine/editor/icons/FileDeadBigThumb.svg
index 1dd1fd71..c5a6a24a 100644
--- a/engine/editor/icons/FileDeadBigThumb.svg
+++ b/engine/editor/icons/FileDeadBigThumb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#ff5f5f" d="M14 5a4 4 0 0 0-4 4v46a4 4 0 0 0 4 4h36a4 4 0 0 0 4-4V22a.967.967 0 0 0-.285-.707l-16-16a1 1 0 0 0-.707-.29V5zm0 2h22v12a4 4 0 0 0 4 4h12v32a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2zm2.951 22.002a1 1 0 0 0-.703 1.658L19.172 34l-2.924 3.342a1 1 0 0 0 1.504 1.318l2.748-3.14 2.748 3.14a1 1 0 0 0 1.504-1.318L21.828 34l2.924-3.34a1 1 0 0 0-1.504-1.318l-2.748 3.14-2.748-3.14a1 1 0 0 0-.8-.34zm23 0a1 1 0 0 0-.703 1.658L42.172 34l-2.924 3.342a1 1 0 0 0 1.504 1.318l2.748-3.14 2.748 3.14a1 1 0 0 0 1.504-1.318L44.828 34l2.924-3.34a1 1 0 0 0-1.504-1.318l-2.748 3.14-2.748-3.14a1 1 0 0 0-.8-.34zM21 43a1 1 0 0 0 0 2h3v3a5 5 0 0 0 10 0v-3h9a1 1 0 0 0 0-2zm5 2h6v3a3 3 0 0 1-6 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#ff5f5f" d="M14 5a4 4 0 0 0-4 4v46a4 4 0 0 0 4 4h36a4 4 0 0 0 4-4V22a.967.967 0 0 0-.285-.707l-16-16a1 1 0 0 0-.707-.29V5zm0 2h22v12a4 4 0 0 0 4 4h12v32a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2zm2.951 22.002a1 1 0 0 0-.703 1.658L19.172 34l-2.924 3.342a1 1 0 0 0 1.504 1.318l2.748-3.14 2.748 3.14a1 1 0 0 0 1.504-1.318L21.828 34l2.924-3.34a1 1 0 0 0-1.504-1.318l-2.748 3.14-2.748-3.14a1 1 0 0 0-.8-.34zm23 0a1 1 0 0 0-.703 1.658L42.172 34l-2.924 3.342a1 1 0 0 0 1.504 1.318l2.748-3.14 2.748 3.14a1 1 0 0 0 1.504-1.318L44.828 34l2.924-3.34a1 1 0 0 0-1.504-1.318l-2.748 3.14-2.748-3.14a1 1 0 0 0-.8-.34zM21 43a1 1 0 0 0 0 2h3v3a5 5 0 0 0 10 0v-3h9a1 1 0 0 0 0-2zm5 2h6v3a3 3 0 0 1-6 0z"/></svg>
diff --git a/engine/editor/icons/FileDeadMediumThumb.svg b/engine/editor/icons/FileDeadMediumThumb.svg
index 8f468033..07ed2120 100644
--- a/engine/editor/icons/FileDeadMediumThumb.svg
+++ b/engine/editor/icons/FileDeadMediumThumb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#ff5f5f" d="M5 1a3 3 0 0 0-3 3v24a3 3 0 0 0 3 3h22a3 3 0 0 0 3-3V11.191a1 1 0 0 0-.293-.707l-9.182-9.19A1 1 0 0 0 19.818 1H5zm0 2h14v6a3 3 0 0 0 3 3h6v16a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm1.986 11.002a1 1 0 0 0-.693 1.705L7.586 17l-1.293 1.293a1 1 0 0 0 1.414 1.414L9 18.414l1.293 1.293a1 1 0 0 0 1.414-1.414L10.414 17l1.293-1.293a1 1 0 0 0-1.414-1.414L9 15.586l-1.293-1.293a1 1 0 0 0-.72-.291zm14 0a1 1 0 0 0-.693 1.705L21.586 17l-1.293 1.293a1 1 0 0 0 1.414 1.414L23 18.414l1.293 1.293a1 1 0 0 0 1.414-1.414L24.414 17l1.293-1.293a1 1 0 0 0-1.414-1.414L23 15.586l-1.293-1.293a1 1 0 0 0-.72-.291zM7 22a1 1 0 0 0 0 2h1a4 4 0 0 0 8 0h9a1 1 0 0 0 0-2zm3 2h4a2 2 0 0 1-4 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#ff5f5f" d="M5 1a3 3 0 0 0-3 3v24a3 3 0 0 0 3 3h22a3 3 0 0 0 3-3V11.191a1 1 0 0 0-.293-.707l-9.182-9.19A1 1 0 0 0 19.818 1H5zm0 2h14v6a3 3 0 0 0 3 3h6v16a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zm1.986 11.002a1 1 0 0 0-.693 1.705L7.586 17l-1.293 1.293a1 1 0 0 0 1.414 1.414L9 18.414l1.293 1.293a1 1 0 0 0 1.414-1.414L10.414 17l1.293-1.293a1 1 0 0 0-1.414-1.414L9 15.586l-1.293-1.293a1 1 0 0 0-.72-.291zm14 0a1 1 0 0 0-.693 1.705L21.586 17l-1.293 1.293a1 1 0 0 0 1.414 1.414L23 18.414l1.293 1.293a1 1 0 0 0 1.414-1.414L24.414 17l1.293-1.293a1 1 0 0 0-1.414-1.414L23 15.586l-1.293-1.293a1 1 0 0 0-.72-.291zM7 22a1 1 0 0 0 0 2h1a4 4 0 0 0 8 0h9a1 1 0 0 0 0-2zm3 2h4a2 2 0 0 1-4 0z"/></svg>
diff --git a/engine/editor/icons/FileDialog.svg b/engine/editor/icons/FileDialog.svg
index c6076c9f..02d89ffa 100644
--- a/engine/editor/icons/FileDialog.svg
+++ b/engine/editor/icons/FileDialog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm3 2h3c1 0 1 2 2 2h3v4H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm3 2h3c1 0 1 2 2 2h3v4H4z"/></svg>
diff --git a/engine/editor/icons/FileList.svg b/engine/editor/icons/FileList.svg
index a79a5cfd..11ce8289 100644
--- a/engine/editor/icons/FileList.svg
+++ b/engine/editor/icons/FileList.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2zm-4 5v2h2v-2zm4 0v2h8v-2z"/></svg>
diff --git a/engine/editor/icons/FileMediumThumb.svg b/engine/editor/icons/FileMediumThumb.svg
index 65ec6591..1fde71b6 100644
--- a/engine/editor/icons/FileMediumThumb.svg
+++ b/engine/editor/icons/FileMediumThumb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#fff" fill-opacity=".6" d="M5 1a3 3 0 0 0-3 3v24a3 3 0 0 0 3 3h22a3 3 0 0 0 3-3V11.191a1 1 0 0 0-.293-.707l-9.182-9.182A1 1 0 0 0 19.818 1zm0 2h14v6a3 3 0 0 0 3 3h6v16a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#fff" fill-opacity=".6" d="M5 1a3 3 0 0 0-3 3v24a3 3 0 0 0 3 3h22a3 3 0 0 0 3-3V11.191a1 1 0 0 0-.293-.707l-9.182-9.182A1 1 0 0 0 19.818 1zm0 2h14v6a3 3 0 0 0 3 3h6v16a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1z"/></svg>
diff --git a/engine/editor/icons/FileThumbnail.svg b/engine/editor/icons/FileThumbnail.svg
index 00d98c07..b99c1097 100644
--- a/engine/editor/icons/FileThumbnail.svg
+++ b/engine/editor/icons/FileThumbnail.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v5h5v-5zm7 0v5h5v-5zm-7 7v5h5v-5zm7 0v5h5v-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v5h5v-5zm7 0v5h5v-5zm-7 7v5h5v-5zm7 0v5h5v-5z"/></svg>
diff --git a/engine/editor/icons/FileTree.svg b/engine/editor/icons/FileTree.svg
index 9a5c9de2..910b5f8b 100644
--- a/engine/editor/icons/FileTree.svg
+++ b/engine/editor/icons/FileTree.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v2h2v5h2v5h8v-2h-6v-3h6v-2h-8v-3h8v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 2v2h2v5h2v5h8v-2h-6v-3h6v-2h-8v-3h8v-2z"/></svg>
diff --git a/engine/editor/icons/FilenameFilter.svg b/engine/editor/icons/FilenameFilter.svg
index 351cc44c..03bd8ca8 100644
--- a/engine/editor/icons/FilenameFilter.svg
+++ b/engine/editor/icons/FilenameFilter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="m13.297.714h-13.013a.454.454 0 0 0 -.318.779l4.615 4.507v7.086a.45.45 0 0 0 .738.354l3.511-2.812a.454.454 0 0 0 .17-.354v-4.274l4.614-4.506a.454.454 0 0 0 -.317-.779z"/><path d="m11.085832 14.18196c3.399443 1.97457 6.855925-2.441094 4.074102-5.1815164-2.781825-2.7404217-7.2642008.6646174-5.2597994 4.0134654l-1.9001346 1.871854 1.1856973 1.168051zm1.699723-4.4945981c2.236109 0 2.236109 3.3042441 0 3.3042441-2.236108 0-2.236108-3.3042441 0-3.3042441z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="m13.297.714h-13.013a.454.454 0 0 0 -.318.779l4.615 4.507v7.086a.45.45 0 0 0 .738.354l3.511-2.812a.454.454 0 0 0 .17-.354v-4.274l4.614-4.506a.454.454 0 0 0 -.317-.779z"/><path d="m11.085832 14.18196c3.399443 1.97457 6.855925-2.441094 4.074102-5.1815164-2.781825-2.7404217-7.2642008.6646174-5.2597994 4.0134654l-1.9001346 1.871854 1.1856973 1.168051zm1.699723-4.4945981c2.236109 0 2.236109 3.3042441 0 3.3042441-2.236108 0-2.236108-3.3042441 0-3.3042441z"/></g></svg>
diff --git a/engine/editor/icons/Filesystem.svg b/engine/editor/icons/Filesystem.svg
index 0ef84a2d..8fcad079 100644
--- a/engine/editor/icons/Filesystem.svg
+++ b/engine/editor/icons/Filesystem.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v5h2v8h1 5v1h6v-3h-6v1h-5v-4h5v1h6v-3h-6v1h-5v-2h3v-4h-2l-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v5h2v8h1 5v1h6v-3h-6v1h-5v-4h5v1h6v-3h-6v1h-5v-2h3v-4h-2l-1-1z"/></svg>
diff --git a/engine/editor/icons/FixedSize.svg b/engine/editor/icons/FixedSize.svg
index 1ca5752c..3ea5e214 100644
--- a/engine/editor/icons/FixedSize.svg
+++ b/engine/editor/icons/FixedSize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m11.032 6.8435a3.032 2.8914 0 0 0-6.064 0v1.1565h-0.6064v4.0479h7.2768v-4.0479h-0.6064zm-4.8512 0a1.8192 1.7348 0 0 1 3.6384 0v1.1565h-3.6384zm1.2128 2.3131h1.2128v1.7348h-1.2128z"/><g fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-miterlimit="0"><path d="m2.1058 5.8844v-2.7749h2.9127m5.8565 0.0498h2.7749v2.9127" transform="matrix(1.1315 0 0 1.1398 -.914 -1.888)"/><path d="m13.757 11.466v2.7749h-2.9127m-5.856-0.0499h-2.7749v-2.9127" transform="matrix(1.1315 0 0 1.1398 -1.035 -1.888)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m11.032 6.8435a3.032 2.8914 0 0 0-6.064 0v1.1565h-0.6064v4.0479h7.2768v-4.0479h-0.6064zm-4.8512 0a1.8192 1.7348 0 0 1 3.6384 0v1.1565h-3.6384zm1.2128 2.3131h1.2128v1.7348h-1.2128z"/><g fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-miterlimit="0"><path d="m2.1058 5.8844v-2.7749h2.9127m5.8565 0.0498h2.7749v2.9127" transform="matrix(1.1315 0 0 1.1398 -.914 -1.888)"/><path d="m13.757 11.466v2.7749h-2.9127m-5.856-0.0499h-2.7749v-2.9127" transform="matrix(1.1315 0 0 1.1398 -1.035 -1.888)"/></g></svg>
diff --git a/engine/editor/icons/FlipWinding.svg b/engine/editor/icons/FlipWinding.svg
index 8964ca8d..511f21b3 100644
--- a/engine/editor/icons/FlipWinding.svg
+++ b/engine/editor/icons/FlipWinding.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="4.596" height="4.596" x="5.7" y="5.7" fill="#e0e0e0" fill-opacity=".6" rx="1" ry="1" transform="rotate(45 8 8)"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 2a6 6 0 00-2.5 11m.5-3L6 14H2M9 14a6 6 0 002.5-11M11 6 10 2h4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="4.596" height="4.596" x="5.7" y="5.7" fill="#e0e0e0" fill-opacity=".6" rx="1" ry="1" transform="rotate(45 8 8)"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M7 2a6 6 0 00-2.5 11m.5-3L6 14H2M9 14a6 6 0 002.5-11M11 6 10 2h4"/></svg>
diff --git a/engine/editor/icons/FlowContainer.svg b/engine/editor/icons/FlowContainer.svg
index d3c6fa55..f1ac882b 100644
--- a/engine/editor/icons/FlowContainer.svg
+++ b/engine/editor/icons/FlowContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97" stroke-width="2" transform="rotate(45 4.241 9.083)scale(.737)"><rect width="12" height="12" x="2" y="2" rx="1"/><path stroke-linecap="round" d="M5 5h2m3 0h1M5 8h0m3 0h3m-6 3h4"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97" stroke-width="2" transform="rotate(45 4.241 9.083)scale(.737)"><rect width="12" height="12" x="2" y="2" rx="1"/><path stroke-linecap="round" d="M5 5h2m3 0h1M5 8h0m3 0h3m-6 3h4"/></g></svg>
diff --git a/engine/editor/icons/FogMaterial.svg b/engine/editor/icons/FogMaterial.svg
index cd2e3791..6bca53a2 100644
--- a/engine/editor/icons/FogMaterial.svg
+++ b/engine/editor/icons/FogMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M2.5 8S1 8 1 6.5 3 5 3 5s0-4 3.5-4S10 4 10 4s1.26-2 3-1 .5 3 .5 3S15 6 15 7s-1 1-1 1z"/><path stroke="url(#a)" stroke-linecap="round" d="M4.5 9.5h8m-9 2h5m2 0H13m-7.5 2h5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M2.5 8S1 8 1 6.5 3 5 3 5s0-4 3.5-4S10 4 10 4s1.26-2 3-1 .5 3 .5 3S15 6 15 7s-1 1-1 1z"/><path stroke="url(#a)" stroke-linecap="round" d="M4.5 9.5h8m-9 2h5m2 0H13m-7.5 2h5"/></svg>
diff --git a/engine/editor/icons/FogVolume.svg b/engine/editor/icons/FogVolume.svg
index 7ff8e78d..87dd4095 100644
--- a/engine/editor/icons/FogVolume.svg
+++ b/engine/editor/icons/FogVolume.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2.5 8S1 8 1 6.5 3 5 3 5s0-4 3.5-4S10 4 10 4s1.26-2 3-1 .5 3 .5 3S15 6 15 7s-1 1-1 1z"/><path stroke="#fc7f7f" stroke-linecap="round" d="M4.5 9.5h8m-9 2h5m2 0H13m-7.5 2h5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2.5 8S1 8 1 6.5 3 5 3 5s0-4 3.5-4S10 4 10 4s1.26-2 3-1 .5 3 .5 3S15 6 15 7s-1 1-1 1z"/><path stroke="#fc7f7f" stroke-linecap="round" d="M4.5 9.5h8m-9 2h5m2 0H13m-7.5 2h5"/></svg>
diff --git a/engine/editor/icons/FoldableContainer.svg b/engine/editor/icons/FoldableContainer.svg
new file mode 100644
index 00000000..85817467
--- /dev/null
+++ b/engine/editor/icons/FoldableContainer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m3 1c-1.1045684 0-2 .8954316-2 2v10c0 1.104568.8954316 2 2 2h10c1.104568 0 2-.895432 2-2v-10c0-1.1045684-.895432-2-2-2zm1 2h8l-4 4zm-1 5h10v5h-10z"/></svg>
diff --git a/engine/editor/icons/Folder.svg b/engine/editor/icons/Folder.svg
index 168e26b2..464dcc00 100644
--- a/engine/editor/icons/Folder.svg
+++ b/engine/editor/icons/Folder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/FolderBigThumb.svg b/engine/editor/icons/FolderBigThumb.svg
index d02c2473..db256910 100644
--- a/engine/editor/icons/FolderBigThumb.svg
+++ b/engine/editor/icons/FolderBigThumb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#e0e0e0" d="M12 10a4 4 0 0 0-4 4v36a4 4 0 0 0 4 4h40a4 4 0 0 0 4-4V22a4 4 0 0 0-4-4H36l-2-4c-1-2-2-4-4-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#e0e0e0" d="M12 10a4 4 0 0 0-4 4v36a4 4 0 0 0 4 4h40a4 4 0 0 0 4-4V22a4 4 0 0 0-4-4H36l-2-4c-1-2-2-4-4-4z"/></svg>
diff --git a/engine/editor/icons/FolderBrowse.svg b/engine/editor/icons/FolderBrowse.svg
index 96081da2..24ce0783 100644
--- a/engine/editor/icons/FolderBrowse.svg
+++ b/engine/editor/icons/FolderBrowse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h3.738a2.5 2.5 0 0 1-.238-1.074 2.49 2.49 0 0 1 2.5-2.5c.565 0 1.083.187 1.5.5.417-.313.935-.5 1.5-.5s1.083.187 1.5.5a2.5 2.5 0 0 1 2.5-.295V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1Zm5.408 13.355.074.018q-.038-.008-.074-.018m.35.06"/><path fill="#e0e0e0" d="M9 13a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h3.738a2.5 2.5 0 0 1-.238-1.074 2.49 2.49 0 0 1 2.5-2.5c.565 0 1.083.187 1.5.5.417-.313.935-.5 1.5-.5s1.083.187 1.5.5a2.5 2.5 0 0 1 2.5-.295V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1Zm5.408 13.355.074.018q-.038-.008-.074-.018m.35.06"/><path fill="#e0e0e0" d="M9 13a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0m3 0a1 1 0 1 1-2 0 1 1 0 0 1 2 0"/></svg>
diff --git a/engine/editor/icons/FolderCreate.svg b/engine/editor/icons/FolderCreate.svg
index 1c525584..b1731cac 100644
--- a/engine/editor/icons/FolderCreate.svg
+++ b/engine/editor/icons/FolderCreate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h8v-1H8v-4h2V8h4v2h1V7a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V4a1 1 0 0 0-1-1Z"/><path fill="#5fff97" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h8v-1H8v-4h2V8h4v2h1V7a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V4a1 1 0 0 0-1-1Z"/><path fill="#5fff97" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
diff --git a/engine/editor/icons/FolderMediumThumb.svg b/engine/editor/icons/FolderMediumThumb.svg
index 5578739e..98baca65 100644
--- a/engine/editor/icons/FolderMediumThumb.svg
+++ b/engine/editor/icons/FolderMediumThumb.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#e0e0e0" d="M6 5a2 2 0 0 0-2 2v18.5h.065A2 2 0 0 0 6 27h20a2 2 0 0 0 2-2V11a2 2 0 0 0-2-2h-8l-1-2c-.5-1-1-2-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#e0e0e0" d="M6 5a2 2 0 0 0-2 2v18.5h.065A2 2 0 0 0 6 27h20a2 2 0 0 0 2-2V11a2 2 0 0 0-2-2h-8l-1-2c-.5-1-1-2-2-2z"/></svg>
diff --git a/engine/editor/icons/Font.svg b/engine/editor/icons/Font.svg
index e7e4999b..ff65147b 100644
--- a/engine/editor/icons/Font.svg
+++ b/engine/editor/icons/Font.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M1 1h14v4h-1a2 2 0 0 0-2-2H9v9a2 2 0 0 0 2 2v1H5v-1a2 2 0 0 0 2-2V3H4a2 2 0 0 0-2 2H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M1 1h14v4h-1a2 2 0 0 0-2-2H9v9a2 2 0 0 0 2 2v1H5v-1a2 2 0 0 0 2-2V3H4a2 2 0 0 0-2 2H1z"/></svg>
diff --git a/engine/editor/icons/FontFile.svg b/engine/editor/icons/FontFile.svg
index 448b1ff7..89be108d 100644
--- a/engine/editor/icons/FontFile.svg
+++ b/engine/editor/icons/FontFile.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7.5 7.5h-1A.491.491 0 0 0 6 8v.5h-.5V9a1 1 0 0 1-1 1v1H8V9.854A1 1 0 0 1 7.5 9zM1.5 1v3h1a1 1 0 0 1 1-1h2v1.5h2V3h2a1 1 0 0 1 1 1h1V1z"/><path fill="#ff5f5f" d="M4.5 5v3h1a1 1 0 0 1 1-1h2v6a1 1 0 0 1-1 1v1h4v-1a1 1 0 0 1-1-1V7h2a1 1 0 0 1 1 1h1V5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7.5 7.5h-1A.491.491 0 0 0 6 8v.5h-.5V9a1 1 0 0 1-1 1v1H8V9.854A1 1 0 0 1 7.5 9zM1.5 1v3h1a1 1 0 0 1 1-1h2v1.5h2V3h2a1 1 0 0 1 1 1h1V1z"/><path fill="#ff5f5f" d="M4.5 5v3h1a1 1 0 0 1 1-1h2v6a1 1 0 0 1-1 1v1h4v-1a1 1 0 0 1-1-1V7h2a1 1 0 0 1 1 1h1V5z"/></svg>
diff --git a/engine/editor/icons/FontItem.svg b/engine/editor/icons/FontItem.svg
index 000c22eb..6bee7198 100644
--- a/engine/editor/icons/FontItem.svg
+++ b/engine/editor/icons/FontItem.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1h14v4h-1a2 2 0 0 0-2-2H9v9a2 2 0 0 0 2 2v1H5v-1a2 2 0 0 0 2-2V3H4a2 2 0 0 0-2 2H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1h14v4h-1a2 2 0 0 0-2-2H9v9a2 2 0 0 0 2 2v1H5v-1a2 2 0 0 0 2-2V3H4a2 2 0 0 0-2 2H1z"/></svg>
diff --git a/engine/editor/icons/FontSize.svg b/engine/editor/icons/FontSize.svg
index 70f42254..bad6b9ff 100644
--- a/engine/editor/icons/FontSize.svg
+++ b/engine/editor/icons/FontSize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 6.992h6.025v2.4h-.43a.861 1.2 0 0 0-.861-1.2H4.62v3.913a1.214.93 0 0 0 1.214.93v.465H2.19v-.465a1.214.93 0 0 0 1.214-.93V8.192H2.29a.861 1.2 0 0 0-.861 1.2h-.43zm3-3.961h10.773v3.078h-.77a1.539 1.539 0 0 0-1.539-1.539h-2.308v6.926a1.539 1.539 0 0 0 1.539 1.539v.465H7.078v-.465a1.539 1.539 0 0 0 1.539-1.539V4.57H6.309A1.539 1.539 0 0 0 4.77 6.109H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 6.992h6.025v2.4h-.43a.861 1.2 0 0 0-.861-1.2H4.62v3.913a1.214.93 0 0 0 1.214.93v.465H2.19v-.465a1.214.93 0 0 0 1.214-.93V8.192H2.29a.861 1.2 0 0 0-.861 1.2h-.43zm3-3.961h10.773v3.078h-.77a1.539 1.539 0 0 0-1.539-1.539h-2.308v6.926a1.539 1.539 0 0 0 1.539 1.539v.465H7.078v-.465a1.539 1.539 0 0 0 1.539-1.539V4.57H6.309A1.539 1.539 0 0 0 4.77 6.109H4z"/></svg>
diff --git a/engine/editor/icons/FontVariation.svg b/engine/editor/icons/FontVariation.svg
index 042c9687..cee12009 100644
--- a/engine/editor/icons/FontVariation.svg
+++ b/engine/editor/icons/FontVariation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5.975 11 7.21 7.5H5.916a.75 1 0 0 0-.416.152V9a1 1 0 0 1-1 1v1zM1.5 1v3h1a1 1 0 0 1 1-1h2v1.5h2V3h2a1 1 0 0 1 1 1h1V1z"/><path fill="#ff5f5f" d="M4.621 5 3.563 8h1a.84 1.192 50 0 1 1.353-1h2L5.8 13a.84 1.192 50 0 1-1.353 1l-.353 1h4l.353-1a.84 1.192 50 0 1-.647-1l2.116-6h2a.84 1.192 50 0 1 .647 1h1l1.058-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5.975 11 7.21 7.5H5.916a.75 1 0 0 0-.416.152V9a1 1 0 0 1-1 1v1zM1.5 1v3h1a1 1 0 0 1 1-1h2v1.5h2V3h2a1 1 0 0 1 1 1h1V1z"/><path fill="#ff5f5f" d="M4.621 5 3.563 8h1a.84 1.192 50 0 1 1.353-1h2L5.8 13a.84 1.192 50 0 1-1.353 1l-.353 1h4l.353-1a.84 1.192 50 0 1-.647-1l2.116-6h2a.84 1.192 50 0 1 .647 1h1l1.058-3z"/></svg>
diff --git a/engine/editor/icons/Forward.svg b/engine/editor/icons/Forward.svg
index 33dd0d20..230f0726 100644
--- a/engine/editor/icons/Forward.svg
+++ b/engine/editor/icons/Forward.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 2 4 6-4 6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 2 4 6-4 6"/></svg>
diff --git a/engine/editor/icons/GPUParticles2D.svg b/engine/editor/icons/GPUParticles2D.svg
index 91cf5dbb..981ed923 100644
--- a/engine/editor/icons/GPUParticles2D.svg
+++ b/engine/editor/icons/GPUParticles2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M12 11a3 3 0 0 0 .414-5.969 4.5 5 0 0 0-8.824 0 3 3 0 0 0 .414 5.967zm-8 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm8 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-4 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M12 11a3 3 0 0 0 .414-5.969 4.5 5 0 0 0-8.824 0 3 3 0 0 0 .414 5.967zm-8 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm8 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-4 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/GPUParticles3D.svg b/engine/editor/icons/GPUParticles3D.svg
index dafb2dcc..b57117b3 100644
--- a/engine/editor/icons/GPUParticles3D.svg
+++ b/engine/editor/icons/GPUParticles3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M12 11a3 3 0 0 0 .414-5.969 4.5 5 0 0 0-8.824 0 3 3 0 0 0 .414 5.967zm-8 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm8 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-4 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M12 11a3 3 0 0 0 .414-5.969 4.5 5 0 0 0-8.824 0 3 3 0 0 0 .414 5.967zm-8 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm8 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-4 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/GPUParticlesAttractorBox3D.svg b/engine/editor/icons/GPUParticlesAttractorBox3D.svg
index 83048237..62be278f 100644
--- a/engine/editor/icons/GPUParticlesAttractorBox3D.svg
+++ b/engine/editor/icons/GPUParticlesAttractorBox3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="1" fill="#fc7f7f"/><g fill="none" stroke="#fc7f7f"><ellipse cx="8" cy="8" rx="4.8" ry="2.4"/><ellipse cx="8" cy="8" rx="2.4" ry="4.8"/><path d="m1.5 1.5h13v13h-13z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="1" fill="#fc7f7f"/><g fill="none" stroke="#fc7f7f"><ellipse cx="8" cy="8" rx="4.8" ry="2.4"/><ellipse cx="8" cy="8" rx="2.4" ry="4.8"/><path d="m1.5 1.5h13v13h-13z"/></g></svg>
diff --git a/engine/editor/icons/GPUParticlesAttractorSphere3D.svg b/engine/editor/icons/GPUParticlesAttractorSphere3D.svg
index 4ec15559..345f8496 100644
--- a/engine/editor/icons/GPUParticlesAttractorSphere3D.svg
+++ b/engine/editor/icons/GPUParticlesAttractorSphere3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="1" fill="#fc7f7f"/><g fill="none" stroke="#fc7f7f"><circle cx="8" cy="8" r="6.5"/><ellipse cx="11.314" rx="2.4" ry="4.8" transform="rotate(45)"/><ellipse cy="11.314" rx="2.4" ry="4.8" transform="rotate(-45)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="1" fill="#fc7f7f"/><g fill="none" stroke="#fc7f7f"><circle cx="8" cy="8" r="6.5"/><ellipse cx="11.314" rx="2.4" ry="4.8" transform="rotate(45)"/><ellipse cy="11.314" rx="2.4" ry="4.8" transform="rotate(-45)"/></g></svg>
diff --git a/engine/editor/icons/GPUParticlesAttractorVectorField3D.svg b/engine/editor/icons/GPUParticlesAttractorVectorField3D.svg
index 4f1d38b9..2a312f1d 100644
--- a/engine/editor/icons/GPUParticlesAttractorVectorField3D.svg
+++ b/engine/editor/icons/GPUParticlesAttractorVectorField3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><ellipse cx="6.673" cy="9.387" fill="none" stroke="#fc7f7f" rx="2.4" ry="4.8"/><ellipse cx="6.672" cy="9.387" fill="none" stroke="#fc7f7f" rx="4.8" ry="2.4"/><g fill="#fc7f7f"><circle cx="6.664" cy="9.3" r="1"/><path d="m11.8 15 2.4-2.4.8.8V11h-2.4l.8.8-2.4 2.4zM11 6l3-3 1 1V1h-3l1 1-3 3zM1.8 5l2.4-2.4.8.8V1H2.6l.8.8L1 4.2z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><ellipse cx="6.673" cy="9.387" fill="none" stroke="#fc7f7f" rx="2.4" ry="4.8"/><ellipse cx="6.672" cy="9.387" fill="none" stroke="#fc7f7f" rx="4.8" ry="2.4"/><g fill="#fc7f7f"><circle cx="6.664" cy="9.3" r="1"/><path d="m11.8 15 2.4-2.4.8.8V11h-2.4l.8.8-2.4 2.4zM11 6l3-3 1 1V1h-3l1 1-3 3zM1.8 5l2.4-2.4.8.8V1H2.6l.8.8L1 4.2z"/></g></svg>
diff --git a/engine/editor/icons/GPUParticlesCollisionBox3D.svg b/engine/editor/icons/GPUParticlesCollisionBox3D.svg
index c803bfba..9aa41e3b 100644
--- a/engine/editor/icons/GPUParticlesCollisionBox3D.svg
+++ b/engine/editor/icons/GPUParticlesCollisionBox3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="1.75" d="m7.5 4 5.25 2.625v5.25L7.5 14.5l-5.25-2.625v-5.25zm0 10.5V9.25l5.25-2.625M7.5 9.25 2.25 6.625"/><g fill="#fc7f7f"><circle cx="1.875" cy="3.75" r="1"/><circle cx="13.125" cy="3.75" r="1"/><circle cx="9.375" cy="1.875" r="1"/><circle cx="5.625" cy="1.875" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="1.75" d="m7.5 4 5.25 2.625v5.25L7.5 14.5l-5.25-2.625v-5.25zm0 10.5V9.25l5.25-2.625M7.5 9.25 2.25 6.625"/><g fill="#fc7f7f"><circle cx="1.875" cy="3.75" r="1"/><circle cx="13.125" cy="3.75" r="1"/><circle cx="9.375" cy="1.875" r="1"/><circle cx="5.625" cy="1.875" r="1"/></g></svg>
diff --git a/engine/editor/icons/GPUParticlesCollisionHeightField3D.svg b/engine/editor/icons/GPUParticlesCollisionHeightField3D.svg
index f6cbccd1..8a9fdc75 100644
--- a/engine/editor/icons/GPUParticlesCollisionHeightField3D.svg
+++ b/engine/editor/icons/GPUParticlesCollisionHeightField3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m1 10c1-1 3-2 3-4s2-4 4-4 4 2 4 4 2 3 3 4l-7 5z"/><circle cx="2" cy="6" r="1"/><circle cx="14" cy="6" r="1"/><circle cx="12" cy="2" r="1"/><circle cx="4" cy="2" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m1 10c1-1 3-2 3-4s2-4 4-4 4 2 4 4 2 3 3 4l-7 5z"/><circle cx="2" cy="6" r="1"/><circle cx="14" cy="6" r="1"/><circle cx="12" cy="2" r="1"/><circle cx="4" cy="2" r="1"/></g></svg>
diff --git a/engine/editor/icons/GPUParticlesCollisionSDF3D.svg b/engine/editor/icons/GPUParticlesCollisionSDF3D.svg
index 51366192..e51d69b0 100644
--- a/engine/editor/icons/GPUParticlesCollisionSDF3D.svg
+++ b/engine/editor/icons/GPUParticlesCollisionSDF3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="M14 14H2V5s3 4 6 4 6-4 6-4z"/><g fill="#fc7f7f"><circle cx="2" cy="2" r="1"/><circle cx="14" cy="2" r="1"/><circle cx="10" cy="5" r="1"/><circle cx="6" cy="5" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="M14 14H2V5s3 4 6 4 6-4 6-4z"/><g fill="#fc7f7f"><circle cx="2" cy="2" r="1"/><circle cx="14" cy="2" r="1"/><circle cx="10" cy="5" r="1"/><circle cx="6" cy="5" r="1"/></g></svg>
diff --git a/engine/editor/icons/GPUParticlesCollisionSphere3D.svg b/engine/editor/icons/GPUParticlesCollisionSphere3D.svg
index c6954524..fad034ad 100644
--- a/engine/editor/icons/GPUParticlesCollisionSphere3D.svg
+++ b/engine/editor/icons/GPUParticlesCollisionSphere3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="1.667" d="M 8 4 a 5 5 0 0 0 0 10 a 5 5 0 0 0 0 -10 v 10 m -4.95 -5.6 a 5 2 0 0 0 9.9 0"/><g fill="#fc7f7f"><circle cx="2" cy="5" r="1"/><circle cx="14" cy="5" r="1"/><circle cx="10" cy="2" r="1"/><circle cx="6" cy="2" r="1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="1.667" d="M 8 4 a 5 5 0 0 0 0 10 a 5 5 0 0 0 0 -10 v 10 m -4.95 -5.6 a 5 2 0 0 0 9.9 0"/><g fill="#fc7f7f"><circle cx="2" cy="5" r="1"/><circle cx="14" cy="5" r="1"/><circle cx="10" cy="2" r="1"/><circle cx="6" cy="2" r="1"/></g></svg>
diff --git a/engine/editor/icons/Game.svg b/engine/editor/icons/Game.svg
index e75e5c53..287770ee 100644
--- a/engine/editor/icons/Game.svg
+++ b/engine/editor/icons/Game.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M 1,15 V 12 C 1,11.5 1.5,11 2,11 H 3 V 10 C 3,9.5 3.5,9 4,9 h 1 c 0.5,0 1,0.5 1,1 v 1 H 8 V 5 h 2 v 6 h 4 c 0.5,0 1,0.5 1,1 v 3 z"/><circle cx="9" cy="4" r="3" fill="#e0e0e0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M 1,15 V 12 C 1,11.5 1.5,11 2,11 H 3 V 10 C 3,9.5 3.5,9 4,9 h 1 c 0.5,0 1,0.5 1,1 v 1 H 8 V 5 h 2 v 6 h 4 c 0.5,0 1,0.5 1,1 v 3 z"/><circle cx="9" cy="4" r="3" fill="#e0e0e0"/></svg>
diff --git a/engine/editor/icons/Generic6DOFJoint3D.svg b/engine/editor/icons/Generic6DOFJoint3D.svg
index dc15f55b..14fe70f3 100644
--- a/engine/editor/icons/Generic6DOFJoint3D.svg
+++ b/engine/editor/icons/Generic6DOFJoint3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 2v12M3 6l10 5M3 11l10-5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 2v12M3 6l10 5M3 11l10-5"/></svg>
diff --git a/engine/editor/icons/GeometryInstance3D.svg b/engine/editor/icons/GeometryInstance3D.svg
index 548d1dc6..5184a48a 100644
--- a/engine/editor/icons/GeometryInstance3D.svg
+++ b/engine/editor/icons/GeometryInstance3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b56d6d" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zm6.542 2a2 2 0 0 0 .729.729v6.542a2 2 0 0 0-.729.729H4.729A2 2 0 0 0 4 11.271V4.729A2 2 0 0 0 4.729 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b56d6d" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zm6.542 2a2 2 0 0 0 .729.729v6.542a2 2 0 0 0-.729.729H4.729A2 2 0 0 0 4 11.271V4.729A2 2 0 0 0 4.729 4z"/></svg>
diff --git a/engine/editor/icons/Gizmo3DSamplePlayer.svg b/engine/editor/icons/Gizmo3DSamplePlayer.svg
index db729dec..c43d0572 100644
--- a/engine/editor/icons/Gizmo3DSamplePlayer.svg
+++ b/engine/editor/icons/Gizmo3DSamplePlayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M63.766 8a8 8 0 0 0-5.42 2.336L28.682 40H16a8 8 0 0 0-8 8v32a8 8 0 0 0 8 8h12.682l29.664 29.664A8 8 0 0 0 72 112V16a8 8 0 0 0-8.234-8zM112 12a8 8 0 0 0-8 8v88a8 8 0 0 0 16 0V20a8 8 0 0 0-8-8zM88 36a8 8 0 0 0-8 8v40a8 8 0 0 0 16 0V44a8 8 0 0 0-8-8z"/><path fill="#f7f5cf" d="M63.883 12.004a4 4 0 0 0-2.71 1.168l-30.829 30.83H16a4 4 0 0 0-4 4v32a4 4 0 0 0 4 4h14.344l30.828 30.828c2.52 2.518 6.827.734 6.828-2.828V16a4 4 0 0 0-4.117-3.996zM112 16a4 4 0 0 0-4 4v88a4 4 0 0 0 4 4 4 4 0 0 0 4-4V20a4 4 0 0 0-4-4zM88 40a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4 4 4 0 0 0 4-4V44a4 4 0 0 0-4-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M63.766 8a8 8 0 0 0-5.42 2.336L28.682 40H16a8 8 0 0 0-8 8v32a8 8 0 0 0 8 8h12.682l29.664 29.664A8 8 0 0 0 72 112V16a8 8 0 0 0-8.234-8zM112 12a8 8 0 0 0-8 8v88a8 8 0 0 0 16 0V20a8 8 0 0 0-8-8zM88 36a8 8 0 0 0-8 8v40a8 8 0 0 0 16 0V44a8 8 0 0 0-8-8z"/><path fill="#f7f5cf" d="M63.883 12.004a4 4 0 0 0-2.71 1.168l-30.829 30.83H16a4 4 0 0 0-4 4v32a4 4 0 0 0 4 4h14.344l30.828 30.828c2.52 2.518 6.827.734 6.828-2.828V16a4 4 0 0 0-4.117-3.996zM112 16a4 4 0 0 0-4 4v88a4 4 0 0 0 4 4 4 4 0 0 0 4-4V20a4 4 0 0 0-4-4zM88 40a4 4 0 0 0-4 4v40a4 4 0 0 0 4 4 4 4 0 0 0 4-4V44a4 4 0 0 0-4-4z"/></svg>
diff --git a/engine/editor/icons/GizmoAudioListener3D.svg b/engine/editor/icons/GizmoAudioListener3D.svg
index c5ca3e4f..b9b1c8cd 100644
--- a/engine/editor/icons/GizmoAudioListener3D.svg
+++ b/engine/editor/icons/GizmoAudioListener3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".294" stroke-width="8" d="M48 8A40 40 0 0 0 8 48h16a24 24 0 0 1 48 0c0 14-4.33 18.86-9.12 22.852-2.396 1.996-5.038 3.53-7.814 5.536-1.388 1-2.866 2.126-4.304 3.94-1.44 1.774-2.762 4.63-2.762 7.63 0 10.22-2.54 12.59-5.118 14.138-2.578 1.546-6.882 1.86-10.882 1.86h-8v16h8c4 0 11.696.31 19.116-4.14 7.06-4.238 12.2-13.28 12.696-26 .184-.166.148-.156.62-.498 1.724-1.244 5.084-3.21 8.688-6.214C80.33 77.096 88 65.958 88 47.958A40 40 0 0 0 48 8zm63.426 8L97.52 24a48 48 0 0 1 .016 47.942l13.89 8a64 64 0 0 0 0-64z"/><path fill="#f7f5cf" d="M48 8A40 40 0 0 0 8 48h16a24 24 0 0 1 48 0c0 14-4.33 18.86-9.12 22.852-2.396 1.996-5.038 3.53-7.814 5.536-1.388 1-2.866 2.126-4.304 3.94-1.44 1.774-2.762 4.63-2.762 7.63 0 10.22-2.54 12.59-5.118 14.138-2.578 1.546-6.882 1.86-10.882 1.86h-8v16h8c4 0 11.696.31 19.116-4.14 7.06-4.238 12.2-13.28 12.696-26 .184-.166.148-.156.62-.498 1.724-1.244 5.084-3.21 8.688-6.214C80.33 77.096 88 65.958 88 47.958A40 40 0 0 0 48 8zm63.426 8L97.52 24a48 48 0 0 1 .016 47.942l13.89 8a64 64 0 0 0 0-64z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".294" stroke-width="8" d="M48 8A40 40 0 0 0 8 48h16a24 24 0 0 1 48 0c0 14-4.33 18.86-9.12 22.852-2.396 1.996-5.038 3.53-7.814 5.536-1.388 1-2.866 2.126-4.304 3.94-1.44 1.774-2.762 4.63-2.762 7.63 0 10.22-2.54 12.59-5.118 14.138-2.578 1.546-6.882 1.86-10.882 1.86h-8v16h8c4 0 11.696.31 19.116-4.14 7.06-4.238 12.2-13.28 12.696-26 .184-.166.148-.156.62-.498 1.724-1.244 5.084-3.21 8.688-6.214C80.33 77.096 88 65.958 88 47.958A40 40 0 0 0 48 8zm63.426 8L97.52 24a48 48 0 0 1 .016 47.942l13.89 8a64 64 0 0 0 0-64z"/><path fill="#f7f5cf" d="M48 8A40 40 0 0 0 8 48h16a24 24 0 0 1 48 0c0 14-4.33 18.86-9.12 22.852-2.396 1.996-5.038 3.53-7.814 5.536-1.388 1-2.866 2.126-4.304 3.94-1.44 1.774-2.762 4.63-2.762 7.63 0 10.22-2.54 12.59-5.118 14.138-2.578 1.546-6.882 1.86-10.882 1.86h-8v16h8c4 0 11.696.31 19.116-4.14 7.06-4.238 12.2-13.28 12.696-26 .184-.166.148-.156.62-.498 1.724-1.244 5.084-3.21 8.688-6.214C80.33 77.096 88 65.958 88 47.958A40 40 0 0 0 48 8zm63.426 8L97.52 24a48 48 0 0 1 .016 47.942l13.89 8a64 64 0 0 0 0-64z"/></svg>
diff --git a/engine/editor/icons/GizmoCPUParticles3D.svg b/engine/editor/icons/GizmoCPUParticles3D.svg
index 3ae607c6..af1979ee 100644
--- a/engine/editor/icons/GizmoCPUParticles3D.svg
+++ b/engine/editor/icons/GizmoCPUParticles3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8" d="M36.688 4a6.112 6.112 0 0 0-6.112 6.112v4.8h-9.6a6.112 6.112 0 0 0-6.112 6.112v9.6h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v36h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v9.6a6.112 6.112 0 0 0 6.112 6.112h9.6v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2A6.112 6.112 0 0 0 46 117.984v-4.8h36v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2a6.112 6.112 0 0 0 6.112-6.112v-4.8h9.6a6.112 6.112 0 0 0 6.112-6.112v-9.6h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-36h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-9.6a6.112 6.112 0 0 0-6.112-6.104h-9.6v-4.8a6.112 6.112 0 0 0-6.112-6.112h-3.2A6.112 6.112 0 0 0 82 10.12v4.8H46v-4.8a6.112 6.112 0 0 0-6.112-6.112z"/><path fill="#f7f5cf" d="M36.688 4a6.112 6.112 0 0 0-6.112 6.112v4.8h-9.6a6.112 6.112 0 0 0-6.112 6.112v9.6h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v36h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v9.6a6.112 6.112 0 0 0 6.112 6.112h9.6v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2A6.112 6.112 0 0 0 46 117.984v-4.8h36v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2a6.112 6.112 0 0 0 6.112-6.112v-4.8h9.6a6.112 6.112 0 0 0 6.112-6.112v-9.6h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-36h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-9.6a6.112 6.112 0 0 0-6.112-6.104h-9.6v-4.8a6.112 6.112 0 0 0-6.112-6.112h-3.2A6.112 6.112 0 0 0 82 10.12v4.8H46v-4.8a6.112 6.112 0 0 0-6.112-6.112z"/><path fill="#e1b44c" d="M88 82a18 18 0 0 0 2.484-35.814 27 30 0 0 0-52.944 0 18 18 0 0 0 2.484 35.802zm-48 6a6 6 0 0 0 0 12 6 6 0 0 0 0-12zm48 0a6 6 0 0 0 0 12 6 6 0 0 0 0-12zm-24 6a6 6 0 0 0 0 12 6 6 0 0 0 0-12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8" d="M36.688 4a6.112 6.112 0 0 0-6.112 6.112v4.8h-9.6a6.112 6.112 0 0 0-6.112 6.112v9.6h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v36h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v9.6a6.112 6.112 0 0 0 6.112 6.112h9.6v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2A6.112 6.112 0 0 0 46 117.984v-4.8h36v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2a6.112 6.112 0 0 0 6.112-6.112v-4.8h9.6a6.112 6.112 0 0 0 6.112-6.112v-9.6h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-36h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-9.6a6.112 6.112 0 0 0-6.112-6.104h-9.6v-4.8a6.112 6.112 0 0 0-6.112-6.112h-3.2A6.112 6.112 0 0 0 82 10.12v4.8H46v-4.8a6.112 6.112 0 0 0-6.112-6.112z"/><path fill="#f7f5cf" d="M36.688 4a6.112 6.112 0 0 0-6.112 6.112v4.8h-9.6a6.112 6.112 0 0 0-6.112 6.112v9.6h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v36h-4.8a6.112 6.112 0 0 0-6.112 6.112v3.2a6.112 6.112 0 0 0 6.112 6.112h4.8v9.6a6.112 6.112 0 0 0 6.112 6.112h9.6v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2A6.112 6.112 0 0 0 46 117.984v-4.8h36v4.8a6.112 6.112 0 0 0 6.112 6.112h3.2a6.112 6.112 0 0 0 6.112-6.112v-4.8h9.6a6.112 6.112 0 0 0 6.112-6.112v-9.6h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-36h4.8a6.112 6.112 0 0 0 6.112-6.112v-3.2a6.112 6.112 0 0 0-6.112-6.112h-4.8v-9.6a6.112 6.112 0 0 0-6.112-6.104h-9.6v-4.8a6.112 6.112 0 0 0-6.112-6.112h-3.2A6.112 6.112 0 0 0 82 10.12v4.8H46v-4.8a6.112 6.112 0 0 0-6.112-6.112z"/><path fill="#e1b44c" d="M88 82a18 18 0 0 0 2.484-35.814 27 30 0 0 0-52.944 0 18 18 0 0 0 2.484 35.802zm-48 6a6 6 0 0 0 0 12 6 6 0 0 0 0-12zm48 0a6 6 0 0 0 0 12 6 6 0 0 0 0-12zm-24 6a6 6 0 0 0 0 12 6 6 0 0 0 0-12z"/></svg>
diff --git a/engine/editor/icons/GizmoCamera3D.svg b/engine/editor/icons/GizmoCamera3D.svg
index 79941c50..924f04e5 100644
--- a/engine/editor/icons/GizmoCamera3D.svg
+++ b/engine/editor/icons/GizmoCamera3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".294" stroke-width="8" d="M76 20a24 24 0 0 0-24 22.216 24 24 0 1 0-24 40.376V100a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-8l24 16V60L92 76V61.84A24 24 0 0 0 76 20zM44 96a4 4 0 0 1-4-4V75a3 3 0 0 0-3-3 12 12 0 1 1 9-19 9.5 9.5 0 0 0 18-6 12 12 0 1 1 18 7 3 3 0 0 0-2 3v35a4 4 0 0 1-4 4z"/><path fill="#f7f5cf" d="M76 20a24 24 0 0 0-24 22.216 24 24 0 1 0-24 40.376V100a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-8l24 16V60L92 76V61.84A24 24 0 0 0 76 20zM44 96a4 4 0 0 1-4-4V75a3 3 0 0 0-3-3 12 12 0 1 1 9-19 9.5 9.5 0 0 0 18-6 12 12 0 1 1 18 7 3 3 0 0 0-2 3v35a4 4 0 0 1-4 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".294" stroke-width="8" d="M76 20a24 24 0 0 0-24 22.216 24 24 0 1 0-24 40.376V100a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-8l24 16V60L92 76V61.84A24 24 0 0 0 76 20zM44 96a4 4 0 0 1-4-4V75a3 3 0 0 0-3-3 12 12 0 1 1 9-19 9.5 9.5 0 0 0 18-6 12 12 0 1 1 18 7 3 3 0 0 0-2 3v35a4 4 0 0 1-4 4z"/><path fill="#f7f5cf" d="M76 20a24 24 0 0 0-24 22.216 24 24 0 1 0-24 40.376V100a8 8 0 0 0 8 8h48a8 8 0 0 0 8-8v-8l24 16V60L92 76V61.84A24 24 0 0 0 76 20zM44 96a4 4 0 0 1-4-4V75a3 3 0 0 0-3-3 12 12 0 1 1 9-19 9.5 9.5 0 0 0 18-6 12 12 0 1 1 18 7 3 3 0 0 0-2 3v35a4 4 0 0 1-4 4z"/></svg>
diff --git a/engine/editor/icons/GizmoDecal.svg b/engine/editor/icons/GizmoDecal.svg
index 986fec83..5db0f9be 100644
--- a/engine/editor/icons/GizmoDecal.svg
+++ b/engine/editor/icons/GizmoDecal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><circle cx="64" cy="64" r="48" fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8"/><path fill="#f7f5cf" d="M111.313 55.934a48 48 0 1 0-71.28 49.528z"/><path fill="#e1b44c" d="M111.313 55.934a48 48 0 0 0-71.28 49.528z"/><path fill="#f7f5cf" fill-opacity=".4" d="M40.033 105.462a48 48 0 0 0 71.28-49.528z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><circle cx="64" cy="64" r="48" fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8"/><path fill="#f7f5cf" d="M111.313 55.934a48 48 0 1 0-71.28 49.528z"/><path fill="#e1b44c" d="M111.313 55.934a48 48 0 0 0-71.28 49.528z"/><path fill="#f7f5cf" fill-opacity=".4" d="M40.033 105.462a48 48 0 0 0 71.28-49.528z"/></svg>
diff --git a/engine/editor/icons/GizmoDirectionalLight.svg b/engine/editor/icons/GizmoDirectionalLight.svg
index 7fee901d..d3d32825 100644
--- a/engine/editor/icons/GizmoDirectionalLight.svg
+++ b/engine/editor/icons/GizmoDirectionalLight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M56 28a8 8 0 0 0 16 0V12a8 8 0 0 0-16 0zM32.886 44.2A8 8 0 0 0 44.2 32.886L32.886 21.575a7.975 7.975 0 0 0-11.312 11.312zm50.913-11.313a8 8 0 0 0 11.314 11.314l11.312-11.314a8 8 0 0 0-11.312-11.312zM64 40a24 24 0 0 0 0 48 24 24 0 0 0 0-48zM12 56a8 8 0 0 0 0 16h16a8 8 0 0 0 0-16zm88 0a8 8 0 0 0 0 16h16a8 8 0 0 0 0-16zM21.574 95.113a7.98 7.98 0 0 0 11.312 11.312L44.2 95.113a8 8 0 0 0-11.314-11.314zm73.538 11.312a8 8 0 0 0 11.312-11.312L95.112 83.799a8 8 0 0 0-11.314 11.314zM56 116a8 8 0 0 0 16 0v-16a8 8 0 0 0-16 0z"/><path fill="#fff" d="M60 28a4 4 0 0 0 8 0V12a4 4 0 0 0-8 0zM35.714 41.373a4 4 0 0 0 5.658-5.658L30.058 24.403a4 4 0 0 0-5.656 5.656zm50.913-5.658a4 4 0 0 0 5.658 5.658l11.313-11.314a4 4 0 0 0-5.657-5.656zM64 44a20 20 0 0 0 0 40 20 20 0 0 0 0-40zM12 60a4 4 0 0 0 0 8h16a4 4 0 0 0 0-8zm88 0a1 1 0 0 0 0 8h16a1 1 0 0 0 0-8zM24.402 97.94a4 4 0 0 0 5.656 5.656l11.314-11.313a4 4 0 0 0-5.658-5.656zm73.538 5.658a4 4 0 0 0 5.656-5.656L92.283 86.628a4 4 0 0 0-5.657 5.657zM60 116a4 4 0 0 0 8 0v-16a4 4 0 0 0-8 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M56 28a8 8 0 0 0 16 0V12a8 8 0 0 0-16 0zM32.886 44.2A8 8 0 0 0 44.2 32.886L32.886 21.575a7.975 7.975 0 0 0-11.312 11.312zm50.913-11.313a8 8 0 0 0 11.314 11.314l11.312-11.314a8 8 0 0 0-11.312-11.312zM64 40a24 24 0 0 0 0 48 24 24 0 0 0 0-48zM12 56a8 8 0 0 0 0 16h16a8 8 0 0 0 0-16zm88 0a8 8 0 0 0 0 16h16a8 8 0 0 0 0-16zM21.574 95.113a7.98 7.98 0 0 0 11.312 11.312L44.2 95.113a8 8 0 0 0-11.314-11.314zm73.538 11.312a8 8 0 0 0 11.312-11.312L95.112 83.799a8 8 0 0 0-11.314 11.314zM56 116a8 8 0 0 0 16 0v-16a8 8 0 0 0-16 0z"/><path fill="#fff" d="M60 28a4 4 0 0 0 8 0V12a4 4 0 0 0-8 0zM35.714 41.373a4 4 0 0 0 5.658-5.658L30.058 24.403a4 4 0 0 0-5.656 5.656zm50.913-5.658a4 4 0 0 0 5.658 5.658l11.313-11.314a4 4 0 0 0-5.657-5.656zM64 44a20 20 0 0 0 0 40 20 20 0 0 0 0-40zM12 60a4 4 0 0 0 0 8h16a4 4 0 0 0 0-8zm88 0a1 1 0 0 0 0 8h16a1 1 0 0 0 0-8zM24.402 97.94a4 4 0 0 0 5.656 5.656l11.314-11.313a4 4 0 0 0-5.658-5.656zm73.538 5.658a4 4 0 0 0 5.656-5.656L92.283 86.628a4 4 0 0 0-5.657 5.657zM60 116a4 4 0 0 0 8 0v-16a4 4 0 0 0-8 0z"/></svg>
diff --git a/engine/editor/icons/GizmoFogVolume.svg b/engine/editor/icons/GizmoFogVolume.svg
index 670ad117..83de0550 100644
--- a/engine/editor/icons/GizmoFogVolume.svg
+++ b/engine/editor/icons/GizmoFogVolume.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8" d="M20 68S8 68 8 56s16-12 16-12 0-32 28-32 28 24 28 24 10.08-16 24-8 4 24 4 24 12 0 12 8-8 8-8 8zm16 8a4 4 0 0 0 0 8h64a4 4 0 0 0 0-8zm-8 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8zm56 0a4 4 0 0 0 0 8h20a4 4 0 0 0 0-8zm-40 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8z"/><path fill="#f7f5cf" d="M20 68S8 68 8 56s16-12 16-12 0-32 28-32 28 24 28 24 10.08-16 24-8 4 24 4 24 12 0 12 8-8 8-8 8zm16 8a4 4 0 0 0 0 8h64a4 4 0 0 0 0-8zm-8 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8zm56 0a4 4 0 0 0 0 8h20a4 4 0 0 0 0-8zm-40 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8" d="M20 68S8 68 8 56s16-12 16-12 0-32 28-32 28 24 28 24 10.08-16 24-8 4 24 4 24 12 0 12 8-8 8-8 8zm16 8a4 4 0 0 0 0 8h64a4 4 0 0 0 0-8zm-8 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8zm56 0a4 4 0 0 0 0 8h20a4 4 0 0 0 0-8zm-40 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8z"/><path fill="#f7f5cf" d="M20 68S8 68 8 56s16-12 16-12 0-32 28-32 28 24 28 24 10.08-16 24-8 4 24 4 24 12 0 12 8-8 8-8 8zm16 8a4 4 0 0 0 0 8h64a4 4 0 0 0 0-8zm-8 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8zm56 0a4 4 0 0 0 0 8h20a4 4 0 0 0 0-8zm-40 16a4 4 0 0 0 0 8h40a4 4 0 0 0 0-8z"/></svg>
diff --git a/engine/editor/icons/GizmoGPUParticles3D.svg b/engine/editor/icons/GizmoGPUParticles3D.svg
index e8f61079..8cd558ad 100644
--- a/engine/editor/icons/GizmoGPUParticles3D.svg
+++ b/engine/editor/icons/GizmoGPUParticles3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M63.998 4c-18.429.005-34.029 13.88-38.557 32.926C13.041 39.934 4.014 51.006 4 63.996V64c0 15.417 12.583 28 28 28h64c15.417 0 28-12.583 28-28v-.004c-.015-13-9.055-24.076-21.467-27.074C98.006 17.889 82.421 4.019 64.004 4zM96 92c-6.58 0-12 5.42-12 12s5.42 12 12 12 12-5.42 12-12-5.42-12-12-12zm-64 0c-6.58 0-12 5.42-12 12s5.42 12 12 12 12-5.42 12-12-5.42-12-12-12zm32 8c-6.58 0-12 5.42-12 12s5.42 12 12 12 12-5.42 12-12-5.42-12-12-12z"/><path fill="#f7f5cf" d="M64 8a36 40 0 0 0-35.311 32.256A24 24 0 0 0 8 64a24 24 0 0 0 24 24h64a24 24 0 0 0 24-24 24 24 0 0 0-20.715-23.746A36 40 0 0 0 64 8zM32 96a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm64 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm-32 8a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M63.998 4c-18.429.005-34.029 13.88-38.557 32.926C13.041 39.934 4.014 51.006 4 63.996V64c0 15.417 12.583 28 28 28h64c15.417 0 28-12.583 28-28v-.004c-.015-13-9.055-24.076-21.467-27.074C98.006 17.889 82.421 4.019 64.004 4zM96 92c-6.58 0-12 5.42-12 12s5.42 12 12 12 12-5.42 12-12-5.42-12-12-12zm-64 0c-6.58 0-12 5.42-12 12s5.42 12 12 12 12-5.42 12-12-5.42-12-12-12zm32 8c-6.58 0-12 5.42-12 12s5.42 12 12 12 12-5.42 12-12-5.42-12-12-12z"/><path fill="#f7f5cf" d="M64 8a36 40 0 0 0-35.311 32.256A24 24 0 0 0 8 64a24 24 0 0 0 24 24h64a24 24 0 0 0 24-24 24 24 0 0 0-20.715-23.746A36 40 0 0 0 64 8zM32 96a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm64 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm-32 8a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8z"/></svg>
diff --git a/engine/editor/icons/GizmoLight.svg b/engine/editor/icons/GizmoLight.svg
index 48e565e5..ba13268b 100644
--- a/engine/editor/icons/GizmoLight.svg
+++ b/engine/editor/icons/GizmoLight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M64 2a44 44 0 0 0-44 44 44 44 0 0 0 24 39.189v13.81a10.97 10.97 0 0 0 8 10.579v16.421h24v-16.421a10.97 10.97 0 0 0 8-10.579V85.142A44 44 0 0 0 108 46 44 44 0 0 0 64 2zm0 20a24 24 0 0 1 24 24 24 24 0 0 1-24 24 24 24 0 0 1-24-24 24 24 0 0 1 24-24z"/><path fill="#fff" d="M64 6a40 40 0 0 0-40 40 40 40 0 0 0 24 36.607V98a8 8 0 0 0 8 8h16a8 8 0 0 0 8-8V82.637A40 40 0 0 0 104 46 40 40 0 0 0 64 6zm0 12a28 28 0 0 1 28 28 28 28 0 0 1-28 28 28 28 0 0 1-28-28 28 28 0 0 1 28-28zm-8 96v8h16v-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M64 2a44 44 0 0 0-44 44 44 44 0 0 0 24 39.189v13.81a10.97 10.97 0 0 0 8 10.579v16.421h24v-16.421a10.97 10.97 0 0 0 8-10.579V85.142A44 44 0 0 0 108 46 44 44 0 0 0 64 2zm0 20a24 24 0 0 1 24 24 24 24 0 0 1-24 24 24 24 0 0 1-24-24 24 24 0 0 1 24-24z"/><path fill="#fff" d="M64 6a40 40 0 0 0-40 40 40 40 0 0 0 24 36.607V98a8 8 0 0 0 8 8h16a8 8 0 0 0 8-8V82.637A40 40 0 0 0 104 46 40 40 0 0 0 64 6zm0 12a28 28 0 0 1 28 28 28 28 0 0 1-28 28 28 28 0 0 1-28-28 28 28 0 0 1 28-28zm-8 96v8h16v-8z"/></svg>
diff --git a/engine/editor/icons/GizmoLightmapGI.svg b/engine/editor/icons/GizmoLightmapGI.svg
index 1be1a9b1..85563202 100644
--- a/engine/editor/icons/GizmoLightmapGI.svg
+++ b/engine/editor/icons/GizmoLightmapGI.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M18 8a4 4 0 0 0-4 4v20H8a4 4 0 0 0-4 4v71a17 17 0 0 0 17 17h61a4 4 0 0 0 4-4v-12a4 4 0 0 0-4-4H24V64h20v12a4 4 0 0 0 4 4h32a4 4 0 0 0 4-4V64h20v4a4 4 0 0 0 .576 2.059A20 20 0 0 0 92 105.756v2.238a8 8 0 0 0 4 6.75V120a4 4 0 0 0 4 4h8a4 4 0 0 0 4-4v-5.248a8 8 0 0 0 4-6.752v-2.234A20 20 0 0 0 112.541 72H120a4 4 0 0 0 4-4V36a4 4 0 0 0-4-4h-6V12a4 4 0 0 0-4-4zm8 38a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm25 0a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm26 0a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm25 0a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm2 38a1 1 0 0 1 0 12 1 1 0 0 1 0-12z"/><path fill="#f7f5cf" d="M18 12v16h92V12zM8 36v71.076A13 13 0 0 0 20.924 120H82v-12H20V60h88v8h12V36zm18 6a6 6 0 1 1 0 12 6 6 0 0 1 0-12zm25 0a6 6 0 1 1 0 12 6 6 0 0 1 0-12zm26 0a6 6 0 1 1 0 12 6 6 0 0 1 0-12zm25 0a6 6 0 1 1 0 12 6 6 0 0 1 0-12zM48 68v8h32v-8zm48 40a4 4 0 0 0 4 4h8a4 4 0 0 0 4-4v-4.16a16 16 0 1 0-16 0zm8-28a10 10 0 0 1 0 20 10 10 0 0 1 0-20zm-4 36v4h8v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M18 8a4 4 0 0 0-4 4v20H8a4 4 0 0 0-4 4v71a17 17 0 0 0 17 17h61a4 4 0 0 0 4-4v-12a4 4 0 0 0-4-4H24V64h20v12a4 4 0 0 0 4 4h32a4 4 0 0 0 4-4V64h20v4a4 4 0 0 0 .576 2.059A20 20 0 0 0 92 105.756v2.238a8 8 0 0 0 4 6.75V120a4 4 0 0 0 4 4h8a4 4 0 0 0 4-4v-5.248a8 8 0 0 0 4-6.752v-2.234A20 20 0 0 0 112.541 72H120a4 4 0 0 0 4-4V36a4 4 0 0 0-4-4h-6V12a4 4 0 0 0-4-4zm8 38a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm25 0a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm26 0a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm25 0a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm2 38a1 1 0 0 1 0 12 1 1 0 0 1 0-12z"/><path fill="#f7f5cf" d="M18 12v16h92V12zM8 36v71.076A13 13 0 0 0 20.924 120H82v-12H20V60h88v8h12V36zm18 6a6 6 0 1 1 0 12 6 6 0 0 1 0-12zm25 0a6 6 0 1 1 0 12 6 6 0 0 1 0-12zm26 0a6 6 0 1 1 0 12 6 6 0 0 1 0-12zm25 0a6 6 0 1 1 0 12 6 6 0 0 1 0-12zM48 68v8h32v-8zm48 40a4 4 0 0 0 4 4h8a4 4 0 0 0 4-4v-4.16a16 16 0 1 0-16 0zm8-28a10 10 0 0 1 0 20 10 10 0 0 1 0-20zm-4 36v4h8v-4z"/></svg>
diff --git a/engine/editor/icons/GizmoLightmapProbe.svg b/engine/editor/icons/GizmoLightmapProbe.svg
index 4609e9d1..d73bbd5e 100644
--- a/engine/editor/icons/GizmoLightmapProbe.svg
+++ b/engine/editor/icons/GizmoLightmapProbe.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8" d="M8 72h24V56H8zm16.4 20.28 11.32 11.312L47.032 92.28 35.72 80.968zm0-56.56 11.32 11.312L47.032 35.72 35.72 24.4zM40 64a24 24 0 0 0 48 0 24 24 0 0 0-48 0zm24 56A56 56 0 0 0 64 8v18.672a37.328 37.328 0 0 1 0 74.656z"/><path fill="#f7f5cf" d="M8 72h24V56H8zm16.4 20.28 11.32 11.312L47.032 92.28 35.72 80.968zm0-56.56 11.32 11.312L47.032 35.72 35.72 24.4zM40 64a24 24 0 0 0 48 0 24 24 0 0 0-48 0zm24 56A56 56 0 0 0 64 8v18.672a37.328 37.328 0 0 1 0 74.656z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill="none" stroke="#000" stroke-opacity=".3" stroke-width="8" d="M8 72h24V56H8zm16.4 20.28 11.32 11.312L47.032 92.28 35.72 80.968zm0-56.56 11.32 11.312L47.032 35.72 35.72 24.4zM40 64a24 24 0 0 0 48 0 24 24 0 0 0-48 0zm24 56A56 56 0 0 0 64 8v18.672a37.328 37.328 0 0 1 0 74.656z"/><path fill="#f7f5cf" d="M8 72h24V56H8zm16.4 20.28 11.32 11.312L47.032 92.28 35.72 80.968zm0-56.56 11.32 11.312L47.032 35.72 35.72 24.4zM40 64a24 24 0 0 0 48 0 24 24 0 0 0-48 0zm24 56A56 56 0 0 0 64 8v18.672a37.328 37.328 0 0 1 0 74.656z"/></svg>
diff --git a/engine/editor/icons/GizmoReflectionProbe.svg b/engine/editor/icons/GizmoReflectionProbe.svg
index 38d69aa3..39dfab9d 100644
--- a/engine/editor/icons/GizmoReflectionProbe.svg
+++ b/engine/editor/icons/GizmoReflectionProbe.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M12 4c-4.37 0-8 3.63-8 8v28h16V20h88v8h16V12c0-4.37-3.63-8-8-8zm76 28c-4.37 0-8 3.63-8 8s3.63 8 8 8h10.035L63.549 88.236 18.828 43.513 7.516 54.829l50.828 50.828c3.254 3.251 8.737 3.04 11.73-.453L108 60.96v7.039c0 4.37 3.63 8 8 8s8-3.63 8-8v-28c0-4.37-3.63-8-8-8zM4 84v32c0 4.37 3.63 8 8 8h104c4.37 0 8-3.63 8-8V84h-16v24H20V84z"/><path fill="#f7f5cf" d="M12 8a4 4 0 0 0-4 4v24h8V16h96v8h8V12a4 4 0 0 0-4-4zm76 28a4 4 0 0 0 0 8h18.732L63.775 94.119 18.828 49.172l-5.656 5.658 48 48a4 4 0 0 0 5.865-.226L112 50.147v17.854a4 4 0 0 0 8 0v-28a4 4 0 0 0-4-4zM8 88v28a4 4 0 0 0 4 4h104a4 4 0 0 0 4-4V88h-8v24H16V88z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M12 4c-4.37 0-8 3.63-8 8v28h16V20h88v8h16V12c0-4.37-3.63-8-8-8zm76 28c-4.37 0-8 3.63-8 8s3.63 8 8 8h10.035L63.549 88.236 18.828 43.513 7.516 54.829l50.828 50.828c3.254 3.251 8.737 3.04 11.73-.453L108 60.96v7.039c0 4.37 3.63 8 8 8s8-3.63 8-8v-28c0-4.37-3.63-8-8-8zM4 84v32c0 4.37 3.63 8 8 8h104c4.37 0 8-3.63 8-8V84h-16v24H20V84z"/><path fill="#f7f5cf" d="M12 8a4 4 0 0 0-4 4v24h8V16h96v8h8V12a4 4 0 0 0-4-4zm76 28a4 4 0 0 0 0 8h18.732L63.775 94.119 18.828 49.172l-5.656 5.658 48 48a4 4 0 0 0 5.865-.226L112 50.147v17.854a4 4 0 0 0 8 0v-28a4 4 0 0 0-4-4zM8 88v28a4 4 0 0 0 4 4h104a4 4 0 0 0 4-4V88h-8v24H16V88z"/></svg>
diff --git a/engine/editor/icons/GizmoSpotLight.svg b/engine/editor/icons/GizmoSpotLight.svg
index e0e1b22e..aa659649 100644
--- a/engine/editor/icons/GizmoSpotLight.svg
+++ b/engine/editor/icons/GizmoSpotLight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M52 4a12 12 0 0 0-12 12v26.625A38 38 0 0 0 20 76v4h28.578a16 16 0 0 0 30.856 0H108v-4a38 38 0 0 0-20-33.385V16A12 12 0 0 0 76 4zM40.311 82a8 8 0 0 0-4.559 1.055l-10.393 6a8 8 0 0 0 8 13.86l10.394-6A8 8 0 0 0 40.311 82zm47.379 0a8 8 0 0 0-3.441 14.93l10.393 6a8 8 0 0 0 8-13.86l-10.393-6a8 8 0 0 0-4.559-1.054zM64 96a8 8 0 0 0-8 8v12a8 8 0 0 0 16 0v-12a8 8 0 0 0-8-8z"/><path fill="#fff" d="M52 8a8 8 0 0 0-8 8v28.875A40 36 0 0 0 24 76h28a12 12 0 0 0 24 0h28a40 36 0 0 0-20-31.141V16a8 8 0 0 0-8-8zM40.031 86a4 4 0 0 0-2.28.53l-10.392 6a4 4 0 0 0 4 6.929l10.393-6a4 4 0 0 0-1.721-7.453zm47.938 0a4 4 0 0 0-1.721 7.465l10.393 6a4 4 0 0 0 4-6.93l-10.393-6a4 4 0 0 0-2.279-.529zM64 100a4 4 0 0 0-4 4v12a4 4 0 0 0 8 0v-12a4 4 0 0 0-4-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M52 4a12 12 0 0 0-12 12v26.625A38 38 0 0 0 20 76v4h28.578a16 16 0 0 0 30.856 0H108v-4a38 38 0 0 0-20-33.385V16A12 12 0 0 0 76 4zM40.311 82a8 8 0 0 0-4.559 1.055l-10.393 6a8 8 0 0 0 8 13.86l10.394-6A8 8 0 0 0 40.311 82zm47.379 0a8 8 0 0 0-3.441 14.93l10.393 6a8 8 0 0 0 8-13.86l-10.393-6a8 8 0 0 0-4.559-1.054zM64 96a8 8 0 0 0-8 8v12a8 8 0 0 0 16 0v-12a8 8 0 0 0-8-8z"/><path fill="#fff" d="M52 8a8 8 0 0 0-8 8v28.875A40 36 0 0 0 24 76h28a12 12 0 0 0 24 0h28a40 36 0 0 0-20-31.141V16a8 8 0 0 0-8-8zM40.031 86a4 4 0 0 0-2.28.53l-10.392 6a4 4 0 0 0 4 6.929l10.393-6a4 4 0 0 0-1.721-7.453zm47.938 0a4 4 0 0 0-1.721 7.465l10.393 6a4 4 0 0 0 4-6.93l-10.393-6a4 4 0 0 0-2.279-.529zM64 100a4 4 0 0 0-4 4v12a4 4 0 0 0 8 0v-12a4 4 0 0 0-4-4z"/></svg>
diff --git a/engine/editor/icons/GizmoVoxelGI.svg b/engine/editor/icons/GizmoVoxelGI.svg
index d701e6dc..3712d36f 100644
--- a/engine/editor/icons/GizmoVoxelGI.svg
+++ b/engine/editor/icons/GizmoVoxelGI.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M12 4a8 8 0 0 0-8 8v104a8 8 0 0 0 8 8h64v-16H20V20h88v7.768A36 36 0 0 0 72 89.9V98a9.977 9.977 0 0 0 8 9.8V124h24v-16.2a9.977 9.977 0 0 0 8-9.8v-8.088A36 36 0 0 0 108.477 28H124V12a8 8 0 0 0-8-8H12zm34.432 38.928a8 8 0 0 0 8-13.856l-10.393-6a1 1 0 0 0-8 13.856zM92 44a16 16 0 0 1 0 32 16 16 0 0 1 0-32zm-60 8a8 8 0 0 0 0 16h12a8 8 0 0 0 0-16zm4.039 31.076a8 8 0 0 0 8 13.856l10.393-6a8 8 0 0 0-8.001-13.856z"/><path fill="#f7f5cf" d="M12 8a4 4 0 0 0-4 4v104a4 4 0 0 0 4 4h60v-8H16V16h96v8h8V12a4 4 0 0 0-4-4zm36.558 31.539a4 4 0 0 0 4-6.93L41.91 26.461a4 4 0 0 0-4 6.93zM92 28a32 32 0 0 0-16 59.668V96a8 8 0 0 0 8 8h16a8 8 0 0 0 8-8v-8.323A32 32 0 0 0 92 28zm0 12a20 20 0 0 1 0 40 20 20 0 0 1 0-40zM31.852 56a4 4 0 0 0 0 8h12.297a4 4 0 0 0 0-8zm6.058 30.61a4 4 0 0 0 4 6.93l10.648-6.148a4 4 0 0 0-4-6.93zM84 112v8h16v-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path fill-opacity=".294" d="M12 4a8 8 0 0 0-8 8v104a8 8 0 0 0 8 8h64v-16H20V20h88v7.768A36 36 0 0 0 72 89.9V98a9.977 9.977 0 0 0 8 9.8V124h24v-16.2a9.977 9.977 0 0 0 8-9.8v-8.088A36 36 0 0 0 108.477 28H124V12a8 8 0 0 0-8-8H12zm34.432 38.928a8 8 0 0 0 8-13.856l-10.393-6a1 1 0 0 0-8 13.856zM92 44a16 16 0 0 1 0 32 16 16 0 0 1 0-32zm-60 8a8 8 0 0 0 0 16h12a8 8 0 0 0 0-16zm4.039 31.076a8 8 0 0 0 8 13.856l10.393-6a8 8 0 0 0-8.001-13.856z"/><path fill="#f7f5cf" d="M12 8a4 4 0 0 0-4 4v104a4 4 0 0 0 4 4h60v-8H16V16h96v8h8V12a4 4 0 0 0-4-4zm36.558 31.539a4 4 0 0 0 4-6.93L41.91 26.461a4 4 0 0 0-4 6.93zM92 28a32 32 0 0 0-16 59.668V96a8 8 0 0 0 8 8h16a8 8 0 0 0 8-8v-8.323A32 32 0 0 0 92 28zm0 12a20 20 0 0 1 0 40 20 20 0 0 1 0-40zM31.852 56a4 4 0 0 0 0 8h12.297a4 4 0 0 0 0-8zm6.058 30.61a4 4 0 0 0 4 6.93l10.648-6.148a4 4 0 0 0-4-6.93zM84 112v8h16v-8z"/></svg>
diff --git a/engine/editor/icons/Godot.svg b/engine/editor/icons/Godot.svg
index 1fd90b8a..1b18dd6a 100644
--- a/engine/editor/icons/Godot.svg
+++ b/engine/editor/icons/Godot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fff" transform="scale(.01563)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="scale(.01563)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fff" transform="scale(.01563)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="scale(.01563)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/editor/icons/GodotFile.svg b/engine/editor/icons/GodotFile.svg
index 5b715fad..61404e4c 100644
--- a/engine/editor/icons/GodotFile.svg
+++ b/engine/editor/icons/GodotFile.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g fill="#fff" transform="matrix(.03 0 0 .03 16.65 21.75)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="matrix(.03 0 0 .03 16.65 21.75)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g><path fill="#fff" fill-opacity=".6" d="M14 5a4 4 0 0 0-4 4v46a4 4 0 0 0 4 4h36a4 4 0 0 0 4-4V22a1 1 0 0 0-.285-.707l-16-16A1 1 0 0 0 37 5zm0 2h22v12a4 4 0 0 0 4 4h12v32a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g fill="#fff" transform="matrix(.03 0 0 .03 16.65 21.75)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="matrix(.03 0 0 .03 16.65 21.75)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g><path fill="#fff" fill-opacity=".6" d="M14 5a4 4 0 0 0-4 4v46a4 4 0 0 0 4 4h36a4 4 0 0 0 4-4V22a1 1 0 0 0-.285-.707l-16-16A1 1 0 0 0 37 5zm0 2h22v12a4 4 0 0 0 4 4h12v32a2 2 0 0 1-2 2H14a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2z"/></svg>
diff --git a/engine/editor/icons/GodotMonochrome.svg b/engine/editor/icons/GodotMonochrome.svg
index c2429b85..d5474ece 100644
--- a/engine/editor/icons/GodotMonochrome.svg
+++ b/engine/editor/icons/GodotMonochrome.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fff" transform="scale(.01563)"><path d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69zM725 436a90 90 0 0 1 0 180 90 90 0 0 1 0-180zM299 436a90 90 0 0 1 0 180 90 90 0 0 1 0-180zM483 514c0-34 58-34 58 0v86c0 34-58 34-58 0z"/><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fff" transform="scale(.01563)"><path d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69zM725 436a90 90 0 0 1 0 180 90 90 0 0 1 0-180zM299 436a90 90 0 0 1 0 180 90 90 0 0 1 0-180zM483 514c0-34 58-34 58 0v86c0 34-58 34-58 0z"/><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/editor/icons/Gradient.svg b/engine/editor/icons/Gradient.svg
index 4c2073ba..c09ff188 100644
--- a/engine/editor/icons/Gradient.svg
+++ b/engine/editor/icons/Gradient.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm4.5 2.5h1v1h-1zm-4-2v9h3v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1zm4 0h1v1h-1zm0 6h1v1h-1zm0-2h1v1h-1zm0 4h1v1h-1zm1-7h1v1h-1zm0 2h1v1h-1zm0 2h1v1h-1zm0 2h1v1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm4.5 2.5h1v1h-1zm-4-2v9h3v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1h1v-1h-1v-1zm4 0h1v1h-1zm0 6h1v1h-1zm0-2h1v1h-1zm0 4h1v1h-1zm1-7h1v1h-1zm0 2h1v1h-1zm0 2h1v1h-1zm0 2h1v1h-1z"/></svg>
diff --git a/engine/editor/icons/GradientTexture1D.svg b/engine/editor/icons/GradientTexture1D.svg
index 72785851..e4824efd 100644
--- a/engine/editor/icons/GradientTexture1D.svg
+++ b/engine/editor/icons/GradientTexture1D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12.5 10.5v-7h-3v1h-1v1h1v1h-1v1h1v1h-1v1h1v1zm-4-1h-1v1h1zm-1 0v-1h-1v1zm0-1h1v-1h-1zm0-1v-1h-1v1zm0-1h1v-1h-1zm0-1v-1h-1v1zm0-1h1v-1h-1zM2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12.5 10.5v-7h-3v1h-1v1h1v1h-1v1h1v1h-1v1h1v1zm-4-1h-1v1h1zm-1 0v-1h-1v1zm0-1h1v-1h-1zm0-1v-1h-1v1zm0-1h1v-1h-1zm0-1v-1h-1v1zm0-1h1v-1h-1zM2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3z"/></svg>
diff --git a/engine/editor/icons/GradientTexture2D.svg b/engine/editor/icons/GradientTexture2D.svg
index efb92268..0e48e166 100644
--- a/engine/editor/icons/GradientTexture2D.svg
+++ b/engine/editor/icons/GradientTexture2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3Zm2.5.5v1h1v-1zm1 1v1h1v-1zm1 0h1v1h-1v1h1v1h1v1h1v-1h1v1h1v-5h-5zm4 4h-1v1h1zm0 1v1h1v-1zm-1 0h-1v1h1zm-1 0v-1h-1v1zm-1-1v-1h-1v1zm-1 0h-1v1h1zm0-1v-1h-1v1zm-1-1v-1h-1v1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3Zm2.5.5v1h1v-1zm1 1v1h1v-1zm1 0h1v1h-1v1h1v1h1v1h1v-1h1v1h1v-5h-5zm4 4h-1v1h1zm0 1v1h1v-1zm-1 0h-1v1h1zm-1 0v-1h-1v1zm-1-1v-1h-1v1zm-1 0h-1v1h1zm0-1v-1h-1v1zm-1-1v-1h-1v1z"/></svg>
diff --git a/engine/editor/icons/GraphEdit.svg b/engine/editor/icons/GraphEdit.svg
index a85fbf26..c4db9244 100644
--- a/engine/editor/icons/GraphEdit.svg
+++ b/engine/editor/icons/GraphEdit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M11 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h3a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM6.732 5A2 2 0 0 1 7 6v1.117L9.268 6A2 2 0 0 1 9 5V3.883zM2 5a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h3a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1zm5 3.883V10a2 2 0 0 1-.268 1L9 12.117V11a2 2 0 0 1 .268-1zM11 10a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h3a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M11 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h3a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM6.732 5A2 2 0 0 1 7 6v1.117L9.268 6A2 2 0 0 1 9 5V3.883zM2 5a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h3a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1zm5 3.883V10a2 2 0 0 1-.268 1L9 12.117V11a2 2 0 0 1 .268-1zM11 10a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h3a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/GraphElement.svg b/engine/editor/icons/GraphElement.svg
index 78f667e0..c615e47f 100644
--- a/engine/editor/icons/GraphElement.svg
+++ b/engine/editor/icons/GraphElement.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="2" fill="#8eef97"/><circle cx="8" cy="8" r="5" fill="none" stroke="#8eef97" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="2" fill="#8eef97"/><circle cx="8" cy="8" r="5" fill="none" stroke="#8eef97" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/GraphFrame.svg b/engine/editor/icons/GraphFrame.svg
index 169bd5f0..532fd005 100644
--- a/engine/editor/icons/GraphFrame.svg
+++ b/engine/editor/icons/GraphFrame.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1c-1.108 0-2 .892-2 2v10c0 1.108.892 2 2 2h10c1.108 0 2-.892 2-2V3c0-1.108-.892-2-2-2zm1.25 2h6.5c.692 0 1.25.558 1.25 1.25V5c-1.645 0-3 1.355-3 3s1.355 3 3 3v.75c0 .692-.558 1.25-1.25 1.25h-6.5C3.558 13 3 12.442 3 11.75v-7.5C3 3.558 3.558 3 4.25 3zM12 6a2 2 0 110 4 2 2 0 010-4z" paint-order="stroke markers fill"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1c-1.108 0-2 .892-2 2v10c0 1.108.892 2 2 2h10c1.108 0 2-.892 2-2V3c0-1.108-.892-2-2-2zm1.25 2h6.5c.692 0 1.25.558 1.25 1.25V5c-1.645 0-3 1.355-3 3s1.355 3 3 3v.75c0 .692-.558 1.25-1.25 1.25h-6.5C3.558 13 3 12.442 3 11.75v-7.5C3 3.558 3.558 3 4.25 3zM12 6a2 2 0 110 4 2 2 0 010-4z" paint-order="stroke markers fill"/></svg>
diff --git a/engine/editor/icons/GraphNode.svg b/engine/editor/icons/GraphNode.svg
index c1d4ed19..82abf5bb 100644
--- a/engine/editor/icons/GraphNode.svg
+++ b/engine/editor/icons/GraphNode.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 2a2 2 0 0 0-2 2h10a2 2 0 0 0-2-2zM3 5v1a3 3 0 0 1 0 6 2 2 0 0 0 2 2h6a2 2 0 0 0 2-2 3 3 0 0 1 0-6V5zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm10 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 2a2 2 0 0 0-2 2h10a2 2 0 0 0-2-2zM3 5v1a3 3 0 0 1 0 6 2 2 0 0 0 2 2h6a2 2 0 0 0 2-2 3 3 0 0 1 0-6V5zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm10 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/Grid.svg b/engine/editor/icons/Grid.svg
index 0f3bd7f5..349ab5a8 100644
--- a/engine/editor/icons/Grid.svg
+++ b/engine/editor/icons/Grid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h14V1zm2 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h14V1zm2 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/GridContainer.svg b/engine/editor/icons/GridContainer.svg
index 99e7e930..24492518 100644
--- a/engine/editor/icons/GridContainer.svg
+++ b/engine/editor/icons/GridContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/GridLayout.svg b/engine/editor/icons/GridLayout.svg
index 192463c4..bcfa6016 100644
--- a/engine/editor/icons/GridLayout.svg
+++ b/engine/editor/icons/GridLayout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="1.3" d="M1.87 6.541h2.917v2.917H1.87zm4.666 0h2.917v2.917H6.536zm4.666 0h2.917v2.917h-2.917zm-5.77-5.429-1.95 1.95 1.95 1.95m-1.95-1.95h9.386m-2.137 8.05 1.95 1.95-1.95 1.95m-7.437-1.95h9.387"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="1.3" d="M1.87 6.541h2.917v2.917H1.87zm4.666 0h2.917v2.917H6.536zm4.666 0h2.917v2.917h-2.917zm-5.77-5.429-1.95 1.95 1.95 1.95m-1.95-1.95h9.386m-2.137 8.05 1.95 1.95-1.95 1.95m-7.437-1.95h9.387"/></svg>
diff --git a/engine/editor/icons/GridMinimap.svg b/engine/editor/icons/GridMinimap.svg
index 31e71a93..9bbd8621 100644
--- a/engine/editor/icons/GridMinimap.svg
+++ b/engine/editor/icons/GridMinimap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 2.199v2.615l-2.625 1.313V3.512zM2 6.264l2.625 1.312v2.551L2 8.814zm12 0v2.55l-2.625 1.313V7.576zM6 7.719h4v2.64H6zm-4 2.56 2.625 1.313v2.521L2 12.801zm12 0v2.522l-2.625 1.312v-2.521zm-8 1.455h4v2.641H6zm4-8.109v2.734H5.844s-.749.647-.875.641c-.131-.007-1.51-1.456-1.51-1.456L2 4.814V2.199l.117.06s-.064-.775.424-1.216L1.279.441A.626.626 0 0 0 .375 1v12c0 .237.134.453.346.559l4 2a.626.626 0 0 0 .279.066h6a.626.626 0 0 0 .279-.066l4-2a.625.625 0 0 0 .346-.559V1a.625.625 0 0 0-.904-.559l-3.869 1.934H7.888s.084.624-.218 1.25z"/><path fill="#fff" fill-opacity=".686" d="M5 6.25c-4-3.5-2-6 0-6s4 2.5 0 6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 2.199v2.615l-2.625 1.313V3.512zM2 6.264l2.625 1.312v2.551L2 8.814zm12 0v2.55l-2.625 1.313V7.576zM6 7.719h4v2.64H6zm-4 2.56 2.625 1.313v2.521L2 12.801zm12 0v2.522l-2.625 1.312v-2.521zm-8 1.455h4v2.641H6zm4-8.109v2.734H5.844s-.749.647-.875.641c-.131-.007-1.51-1.456-1.51-1.456L2 4.814V2.199l.117.06s-.064-.775.424-1.216L1.279.441A.626.626 0 0 0 .375 1v12c0 .237.134.453.346.559l4 2a.626.626 0 0 0 .279.066h6a.626.626 0 0 0 .279-.066l4-2a.625.625 0 0 0 .346-.559V1a.625.625 0 0 0-.904-.559l-3.869 1.934H7.888s.084.624-.218 1.25z"/><path fill="#fff" fill-opacity=".686" d="M5 6.25c-4-3.5-2-6 0-6s4 2.5 0 6z"/></svg>
diff --git a/engine/editor/icons/GridToggle.svg b/engine/editor/icons/GridToggle.svg
index ff755eaf..23a2a335 100644
--- a/engine/editor/icons/GridToggle.svg
+++ b/engine/editor/icons/GridToggle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0v2H0v1h2v4H0v1h2v4H0v1h2v2h1v-2h3.125A5.5 5 0 0 1 6 12H3V8h4v1.143a5.5 5 0 0 1 1-.99V8h.223A5.5 5 0 0 1 11.5 7H8V3h4v4h-.5a5.5 5 0 0 1 3.297 1H15V7h-2V3h2V2h-2V0h-1v2H8V0H7v2H3V0H2zm1 3h4v4H3V3zm8.485 5.261c-1.648 0-3.734 1.256-4.485 3.68a.645.645 0 0 0-.004.367C7.721 14.846 9.873 16 11.486 16c1.612 0 3.764-1.154 4.489-3.692a.645.645 0 0 0 0-.356c-.71-2.443-2.842-3.691-4.49-3.691zm0 1.29a2.58 2.58 0 0 1 0 5.16 2.58 2.58 0 0 1 0-5.16zm0 1.29a1.29 1.29 0 0 0 0 2.58 1.29 1.29 0 0 0 0-2.58z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0v2H0v1h2v4H0v1h2v4H0v1h2v2h1v-2h3.125A5.5 5 0 0 1 6 12H3V8h4v1.143a5.5 5 0 0 1 1-.99V8h.223A5.5 5 0 0 1 11.5 7H8V3h4v4h-.5a5.5 5 0 0 1 3.297 1H15V7h-2V3h2V2h-2V0h-1v2H8V0H7v2H3V0H2zm1 3h4v4H3V3zm8.485 5.261c-1.648 0-3.734 1.256-4.485 3.68a.645.645 0 0 0-.004.367C7.721 14.846 9.873 16 11.486 16c1.612 0 3.764-1.154 4.489-3.692a.645.645 0 0 0 0-.356c-.71-2.443-2.842-3.691-4.49-3.691zm0 1.29a2.58 2.58 0 0 1 0 5.16 2.58 2.58 0 0 1 0-5.16zm0 1.29a1.29 1.29 0 0 0 0 2.58 1.29 1.29 0 0 0 0-2.58z"/></svg>
diff --git a/engine/editor/icons/GrooveJoint2D.svg b/engine/editor/icons/GrooveJoint2D.svg
index 00732268..a9fb8cdb 100644
--- a/engine/editor/icons/GrooveJoint2D.svg
+++ b/engine/editor/icons/GrooveJoint2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M15 1h-5v6H5v2h5v6h5zM8 1H1v14h7v-4H3V5h5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M15 1h-5v6H5v2h5v6h5zM8 1H1v14h7v-4H3V5h5z"/></svg>
diff --git a/engine/editor/icons/Group.svg b/engine/editor/icons/Group.svg
index 0e21ed71..31bd999c 100644
--- a/engine/editor/icons/Group.svg
+++ b/engine/editor/icons/Group.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".4" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#fff" d="M1 1v2h2V1H1zm12 0v2h2V1h-2zM1 13v2h2v-2H1zm12 0v2h2v-2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".4" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#fff" d="M1 1v2h2V1H1zm12 0v2h2V1h-2zM1 13v2h2v-2H1zm12 0v2h2v-2h-2z"/></svg>
diff --git a/engine/editor/icons/GroupViewport.svg b/engine/editor/icons/GroupViewport.svg
index 31d4d3c4..9d758614 100644
--- a/engine/editor/icons/GroupViewport.svg
+++ b/engine/editor/icons/GroupViewport.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".4" d="M0 0v4h4V0zm6 0v6H0v10h10v-6h6V0zm4 4h2v2h-2zm2 8v4h4v-4z"/><path fill="#e0e0e0" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#fff" d="M1 1v2h2V1H1zm12 0v2h2V1h-2zM1 13v2h2v-2H1zm12 0v2h2v-2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".4" d="M0 0v4h4V0zm6 0v6H0v10h10v-6h6V0zm4 4h2v2h-2zm2 8v4h4v-4z"/><path fill="#e0e0e0" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#fff" d="M1 1v2h2V1H1zm12 0v2h2V1h-2zM1 13v2h2v-2H1zm12 0v2h2v-2h-2z"/></svg>
diff --git a/engine/editor/icons/Groups.svg b/engine/editor/icons/Groups.svg
index 67c786e7..9a922a10 100644
--- a/engine/editor/icons/Groups.svg
+++ b/engine/editor/icons/Groups.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v10H3zm5 2a3 3 0 0 0 0 6 3 3 0 0 0 0-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v10H3zm5 2a3 3 0 0 0 0 6 3 3 0 0 0 0-6z"/></svg>
diff --git a/engine/editor/icons/GuiArrowUp.svg b/engine/editor/icons/GuiArrowUp.svg
new file mode 100644
index 00000000..84edf2d9
--- /dev/null
+++ b/engine/editor/icons/GuiArrowUp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".4" stroke-width="2" d="m3 7.9999586 3-3 3 3"/></svg>
diff --git a/engine/editor/icons/GuiChecked.svg b/engine/editor/icons/GuiChecked.svg
index d196de2e..4a1c4bd2 100644
--- a/engine/editor/icons/GuiChecked.svg
+++ b/engine/editor/icons/GuiChecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#699ce8" rx="2.33"/><path fill="#fff" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#699ce8" rx="2.33"/><path fill="#fff" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>
diff --git a/engine/editor/icons/GuiCheckedDisabled.svg b/engine/editor/icons/GuiCheckedDisabled.svg
index 1112a94c..e3bae398 100644
--- a/engine/editor/icons/GuiCheckedDisabled.svg
+++ b/engine/editor/icons/GuiCheckedDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.33"/><path fill="#b3b3b3" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.33"/><path fill="#b3b3b3" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>
diff --git a/engine/editor/icons/GuiClose.svg b/engine/editor/icons/GuiClose.svg
index 3cef5e1f..9a800e96 100644
--- a/engine/editor/icons/GuiClose.svg
+++ b/engine/editor/icons/GuiClose.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-opacity=".898" stroke-width="2" d="m3 3 10 10M3 13 13 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-opacity=".898" stroke-width="2" d="m3 3 10 10M3 13 13 3"/></svg>
diff --git a/engine/editor/icons/GuiDropdown.svg b/engine/editor/icons/GuiDropdown.svg
index a9f1e439..64f9ca52 100644
--- a/engine/editor/icons/GuiDropdown.svg
+++ b/engine/editor/icons/GuiDropdown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="m4 7 3 3 3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="m4 7 3 3 3-3"/></svg>
diff --git a/engine/editor/icons/GuiEllipsis.svg b/engine/editor/icons/GuiEllipsis.svg
index 0c229935..03242cbc 100644
--- a/engine/editor/icons/GuiEllipsis.svg
+++ b/engine/editor/icons/GuiEllipsis.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="8"><path fill="#fff" fill-opacity=".4" d="M3.86 0A3.851 3.851 0 0 0 0 3.86v.28A3.851 3.851 0 0 0 3.86 8h6.28A3.851 3.851 0 0 0 14 4.14v-.28A3.851 3.851 0 0 0 10.14 0zM3 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="8"><path fill="#fff" fill-opacity=".4" d="M3.86 0A3.851 3.851 0 0 0 0 3.86v.28A3.851 3.851 0 0 0 3.86 8h6.28A3.851 3.851 0 0 0 14 4.14v-.28A3.851 3.851 0 0 0 10.14 0zM3 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/GuiGraphNodePort.svg b/engine/editor/icons/GuiGraphNodePort.svg
index 586781ed..bd57d613 100644
--- a/engine/editor/icons/GuiGraphNodePort.svg
+++ b/engine/editor/icons/GuiGraphNodePort.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><circle cx="12" cy="12" r="10" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><circle cx="12" cy="12" r="10" fill="#fff"/></svg>
diff --git a/engine/editor/icons/GuiHsplitter.svg b/engine/editor/icons/GuiHsplitter.svg
index 7caa2477..4d9d5eae 100644
--- a/engine/editor/icons/GuiHsplitter.svg
+++ b/engine/editor/icons/GuiHsplitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="2" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M1 2v60"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="2" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M1 2v60"/></svg>
diff --git a/engine/editor/icons/GuiIndeterminate.svg b/engine/editor/icons/GuiIndeterminate.svg
index 057907a4..e606268f 100644
--- a/engine/editor/icons/GuiIndeterminate.svg
+++ b/engine/editor/icons/GuiIndeterminate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#699ce8" rx="2.33"/><path fill="#fff" d="M3 7h10v2H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#699ce8" rx="2.33"/><path fill="#fff" d="M3 7h10v2H3z"/></svg>
diff --git a/engine/editor/icons/GuiIndeterminateDisabled.svg b/engine/editor/icons/GuiIndeterminateDisabled.svg
index a2e2f5a1..2ede6080 100644
--- a/engine/editor/icons/GuiIndeterminateDisabled.svg
+++ b/engine/editor/icons/GuiIndeterminateDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.33"/><path fill="#b3b3b3" d="M3 7h10v2H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.33"/><path fill="#b3b3b3" d="M3 7h10v2H3z"/></svg>
diff --git a/engine/editor/icons/GuiMiniCheckerboard.svg b/engine/editor/icons/GuiMiniCheckerboard.svg
index 2dd71a6a..9c0515d7 100644
--- a/engine/editor/icons/GuiMiniCheckerboard.svg
+++ b/engine/editor/icons/GuiMiniCheckerboard.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M0 0v8h8V0zm8 8v8h8V8z"/><path fill="#fff" d="M8 0v8h8V0zm0 8H0v8h8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M0 0v8h8V0zm8 8v8h8V8z"/><path fill="#fff" d="M8 0v8h8V0zm0 8H0v8h8z"/></svg>
diff --git a/engine/editor/icons/GuiOptionArrow.svg b/engine/editor/icons/GuiOptionArrow.svg
index 3758846f..8c541938 100644
--- a/engine/editor/icons/GuiOptionArrow.svg
+++ b/engine/editor/icons/GuiOptionArrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 4 4 4 4-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 4 4 4 4-4"/></svg>
diff --git a/engine/editor/icons/GuiProgressBar.svg b/engine/editor/icons/GuiProgressBar.svg
index 3b4f0e3e..256a09fe 100644
--- a/engine/editor/icons/GuiProgressBar.svg
+++ b/engine/editor/icons/GuiProgressBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" rx="1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="none" stroke="#e0e0e0" stroke-opacity=".4" stroke-width="2" rx="1"/></svg>
diff --git a/engine/editor/icons/GuiProgressFill.svg b/engine/editor/icons/GuiProgressFill.svg
index 8d22fd6a..e206b45d 100644
--- a/engine/editor/icons/GuiProgressFill.svg
+++ b/engine/editor/icons/GuiProgressFill.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="8" height="8" x="4" y="4" fill="#e0e0e0" fill-opacity=".4" ry="1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="8" height="8" x="4" y="4" fill="#e0e0e0" fill-opacity=".4" ry="1"/></svg>
diff --git a/engine/editor/icons/GuiRadioChecked.svg b/engine/editor/icons/GuiRadioChecked.svg
index 9a68094e..b96ef7ee 100644
--- a/engine/editor/icons/GuiRadioChecked.svg
+++ b/engine/editor/icons/GuiRadioChecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#699ce8"/><circle cx="8" cy="8" r="4" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#699ce8"/><circle cx="8" cy="8" r="4" fill="#fff"/></svg>
diff --git a/engine/editor/icons/GuiRadioCheckedDisabled.svg b/engine/editor/icons/GuiRadioCheckedDisabled.svg
index 6356bac3..56f80510 100644
--- a/engine/editor/icons/GuiRadioCheckedDisabled.svg
+++ b/engine/editor/icons/GuiRadioCheckedDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="gray"/><circle cx="8" cy="8" r="4" fill="#b3b3b3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="gray"/><circle cx="8" cy="8" r="4" fill="#b3b3b3"/></svg>
diff --git a/engine/editor/icons/GuiRadioUnchecked.svg b/engine/editor/icons/GuiRadioUnchecked.svg
index 89c5f171..d57cda7b 100644
--- a/engine/editor/icons/GuiRadioUnchecked.svg
+++ b/engine/editor/icons/GuiRadioUnchecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#e0e0e0" fill-opacity=".2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#e0e0e0" fill-opacity=".2"/></svg>
diff --git a/engine/editor/icons/GuiRadioUncheckedDisabled.svg b/engine/editor/icons/GuiRadioUncheckedDisabled.svg
index 90ce73c5..ea189fe2 100644
--- a/engine/editor/icons/GuiRadioUncheckedDisabled.svg
+++ b/engine/editor/icons/GuiRadioUncheckedDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="gray" fill-opacity=".2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="gray" fill-opacity=".2"/></svg>
diff --git a/engine/editor/icons/GuiResizer.svg b/engine/editor/icons/GuiResizer.svg
index 6f0e68e7..ff94092c 100644
--- a/engine/editor/icons/GuiResizer.svg
+++ b/engine/editor/icons/GuiResizer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="M4 11h7V4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="M4 11h7V4"/></svg>
diff --git a/engine/editor/icons/GuiResizerTopLeft.svg b/engine/editor/icons/GuiResizerTopLeft.svg
index f75bf58d..79492a9c 100644
--- a/engine/editor/icons/GuiResizerTopLeft.svg
+++ b/engine/editor/icons/GuiResizerTopLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="M4 11V4h7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="M4 11V4h7"/></svg>
diff --git a/engine/editor/icons/GuiScrollArrowLeft.svg b/engine/editor/icons/GuiScrollArrowLeft.svg
index 8d3cbc95..9f2b50d3 100644
--- a/engine/editor/icons/GuiScrollArrowLeft.svg
+++ b/engine/editor/icons/GuiScrollArrowLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 14A6 6 0 0 0 8 2a6 6 0 0 0 0 12zM5.293 8.707a1 1 0 0 1 0-1.414l3-3a1 1 0 0 1 1.414 1.414L7.414 8l2.293 2.293a1 1 0 0 1-1.414 1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 14A6 6 0 0 0 8 2a6 6 0 0 0 0 12zM5.293 8.707a1 1 0 0 1 0-1.414l3-3a1 1 0 0 1 1.414 1.414L7.414 8l2.293 2.293a1 1 0 0 1-1.414 1.414z"/></svg>
diff --git a/engine/editor/icons/GuiScrollArrowLeftHl.svg b/engine/editor/icons/GuiScrollArrowLeftHl.svg
index dfb27d1b..3120c2d2 100644
--- a/engine/editor/icons/GuiScrollArrowLeftHl.svg
+++ b/engine/editor/icons/GuiScrollArrowLeftHl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".8" d="M8 14A6 6 0 0 0 8 2a6 6 0 0 0 0 12zM5.293 8.707a1 1 0 0 1 0-1.414l3-3a1 1 0 0 1 1.414 1.414L7.414 8l2.293 2.293a1 1 0 0 1-1.414 1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".8" d="M8 14A6 6 0 0 0 8 2a6 6 0 0 0 0 12zM5.293 8.707a1 1 0 0 1 0-1.414l3-3a1 1 0 0 1 1.414 1.414L7.414 8l2.293 2.293a1 1 0 0 1-1.414 1.414z"/></svg>
diff --git a/engine/editor/icons/GuiScrollArrowRight.svg b/engine/editor/icons/GuiScrollArrowRight.svg
index 1de12516..a0da11ff 100644
--- a/engine/editor/icons/GuiScrollArrowRight.svg
+++ b/engine/editor/icons/GuiScrollArrowRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".8" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2zm2.707 5.293a1 1 0 0 1 0 1.414l-3 3a1 1 0 0 1-1.414-1.414L8.586 8 6.293 5.707a1 1 0 0 1 1.414-1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".8" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2zm2.707 5.293a1 1 0 0 1 0 1.414l-3 3a1 1 0 0 1-1.414-1.414L8.586 8 6.293 5.707a1 1 0 0 1 1.414-1.414z"/></svg>
diff --git a/engine/editor/icons/GuiScrollArrowRightHl.svg b/engine/editor/icons/GuiScrollArrowRightHl.svg
index f89ef07c..f1aad966 100644
--- a/engine/editor/icons/GuiScrollArrowRightHl.svg
+++ b/engine/editor/icons/GuiScrollArrowRightHl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2zm2.707 5.293a1 1 0 0 1 0 1.414l-3 3a1 1 0 0 1-1.414-1.414L8.586 8 6.293 5.707a1 1 0 0 1 1.414-1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2zm2.707 5.293a1 1 0 0 1 0 1.414l-3 3a1 1 0 0 1-1.414-1.414L8.586 8 6.293 5.707a1 1 0 0 1 1.414-1.414z"/></svg>
diff --git a/engine/editor/icons/GuiScrollBg.svg b/engine/editor/icons/GuiScrollBg.svg
index 312b71d7..5d80bb44 100644
--- a/engine/editor/icons/GuiScrollBg.svg
+++ b/engine/editor/icons/GuiScrollBg.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="2" fill="#fff" fill-opacity=".082"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="2" fill="#fff" fill-opacity=".082"/></svg>
diff --git a/engine/editor/icons/GuiScrollGrabber.svg b/engine/editor/icons/GuiScrollGrabber.svg
index b3c00c4b..05d94731 100644
--- a/engine/editor/icons/GuiScrollGrabber.svg
+++ b/engine/editor/icons/GuiScrollGrabber.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#fff" fill-opacity=".29"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#fff" fill-opacity=".29"/></svg>
diff --git a/engine/editor/icons/GuiScrollGrabberHl.svg b/engine/editor/icons/GuiScrollGrabberHl.svg
index 25a4a3cb..7380ff23 100644
--- a/engine/editor/icons/GuiScrollGrabberHl.svg
+++ b/engine/editor/icons/GuiScrollGrabberHl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#f9f9f9" fill-opacity=".73"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#f9f9f9" fill-opacity=".73"/></svg>
diff --git a/engine/editor/icons/GuiScrollGrabberPressed.svg b/engine/editor/icons/GuiScrollGrabberPressed.svg
index 64787f8b..e8684bb7 100644
--- a/engine/editor/icons/GuiScrollGrabberPressed.svg
+++ b/engine/editor/icons/GuiScrollGrabberPressed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#b3b3b3" fill-opacity=".729"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="3" fill="#b3b3b3" fill-opacity=".729"/></svg>
diff --git a/engine/editor/icons/GuiSliderGrabber.svg b/engine/editor/icons/GuiSliderGrabber.svg
index 88e4998c..37d0db3c 100644
--- a/engine/editor/icons/GuiSliderGrabber.svg
+++ b/engine/editor/icons/GuiSliderGrabber.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="3" fill="#fff" fill-opacity=".9"/><circle cx="8" cy="8" r="6" fill="none" stroke="#e0e0e0" stroke-opacity=".29" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="3" fill="#fff" fill-opacity=".9"/><circle cx="8" cy="8" r="6" fill="none" stroke="#e0e0e0" stroke-opacity=".29" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/GuiSliderGrabberHl.svg b/engine/editor/icons/GuiSliderGrabberHl.svg
index 4cd14784..22150d61 100644
--- a/engine/editor/icons/GuiSliderGrabberHl.svg
+++ b/engine/editor/icons/GuiSliderGrabberHl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="3" fill="#fff" fill-opacity=".9"/><circle cx="8" cy="8" r="6" fill="none" stroke="#e0e0e0" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="3" fill="#fff" fill-opacity=".9"/><circle cx="8" cy="8" r="6" fill="none" stroke="#e0e0e0" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/GuiSpace.svg b/engine/editor/icons/GuiSpace.svg
index 73883c70..8d9f1317 100644
--- a/engine/editor/icons/GuiSpace.svg
+++ b/engine/editor/icons/GuiSpace.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="1.5" fill="#fff" fill-opacity=".2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="1.5" fill="#fff" fill-opacity=".2"/></svg>
diff --git a/engine/editor/icons/GuiSpinboxDown.svg b/engine/editor/icons/GuiSpinboxDown.svg
index f8f473ce..e64452b0 100644
--- a/engine/editor/icons/GuiSpinboxDown.svg
+++ b/engine/editor/icons/GuiSpinboxDown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m12 2-4 4-4-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m12 2-4 4-4-4"/></svg>
diff --git a/engine/editor/icons/GuiSpinboxUp.svg b/engine/editor/icons/GuiSpinboxUp.svg
index 28bd0505..1c7be3d3 100644
--- a/engine/editor/icons/GuiSpinboxUp.svg
+++ b/engine/editor/icons/GuiSpinboxUp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m4 6 4-4 4 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m4 6 4-4 4 4"/></svg>
diff --git a/engine/editor/icons/GuiSpinboxUpdown.svg b/engine/editor/icons/GuiSpinboxUpdown.svg
index f56febd8..7d0f4905 100644
--- a/engine/editor/icons/GuiSpinboxUpdown.svg
+++ b/engine/editor/icons/GuiSpinboxUpdown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m4 6 4-4 4 4m0 4-4 4-4-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m4 6 4-4 4 4m0 4-4 4-4-4"/></svg>
diff --git a/engine/editor/icons/GuiSpinboxUpdownDisabled.svg b/engine/editor/icons/GuiSpinboxUpdownDisabled.svg
index 49ec14d4..7b6464a7 100644
--- a/engine/editor/icons/GuiSpinboxUpdownDisabled.svg
+++ b/engine/editor/icons/GuiSpinboxUpdownDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b3b3b3" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m4 6 4-4 4 4m0 4-4 4-4-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b3b3b3" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m4 6 4-4 4 4m0 4-4 4-4-4"/></svg>
diff --git a/engine/editor/icons/GuiTab.svg b/engine/editor/icons/GuiTab.svg
index a582f90f..504429a0 100644
--- a/engine/editor/icons/GuiTab.svg
+++ b/engine/editor/icons/GuiTab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#fff" fill-opacity=".2" d="M6 0v8h2V0zM1 0a1 1 0 0 0-.693 1.705L2.6 3.998.307 6.291A1 1 0 0 0 1.72 7.705l3-3a1 1 0 0 0 0-1.414l-3-3A1 1 0 0 0 1 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#fff" fill-opacity=".2" d="M6 0v8h2V0zM1 0a1 1 0 0 0-.693 1.705L2.6 3.998.307 6.291A1 1 0 0 0 1.72 7.705l3-3a1 1 0 0 0 0-1.414l-3-3A1 1 0 0 0 1 0z"/></svg>
diff --git a/engine/editor/icons/GuiTabDropMark.svg b/engine/editor/icons/GuiTabDropMark.svg
index d68967ca..00029f4d 100644
--- a/engine/editor/icons/GuiTabDropMark.svg
+++ b/engine/editor/icons/GuiTabDropMark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="32"><path fill="#fff" d="m5 2h6v30h-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="32"><path fill="#fff" d="m5 2h6v30h-6z"/></svg>
diff --git a/engine/editor/icons/GuiTabMenu.svg b/engine/editor/icons/GuiTabMenu.svg
index 39fdc665..d382dc26 100644
--- a/engine/editor/icons/GuiTabMenu.svg
+++ b/engine/editor/icons/GuiTabMenu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".4" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".4" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/GuiTabMenuHl.svg b/engine/editor/icons/GuiTabMenuHl.svg
index 7d45e7e1..ab995aec 100644
--- a/engine/editor/icons/GuiTabMenuHl.svg
+++ b/engine/editor/icons/GuiTabMenuHl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/GuiToggleOff.svg b/engine/editor/icons/GuiToggleOff.svg
index de14ac51..fc14fda6 100644
--- a/engine/editor/icons/GuiToggleOff.svg
+++ b/engine/editor/icons/GuiToggleOff.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="#e0e0e0"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="8" cy="8" r="5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="#e0e0e0"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="8" cy="8" r="5"/></g></svg>
diff --git a/engine/editor/icons/GuiToggleOffDisabled.svg b/engine/editor/icons/GuiToggleOffDisabled.svg
index 35dfa775..2a6ba8d5 100644
--- a/engine/editor/icons/GuiToggleOffDisabled.svg
+++ b/engine/editor/icons/GuiToggleOffDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="gray"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="8" cy="8" r="5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="gray"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="8" cy="8" r="5"/></g></svg>
diff --git a/engine/editor/icons/GuiToggleOffDisabledMirrored.svg b/engine/editor/icons/GuiToggleOffDisabledMirrored.svg
index cc4e0534..96c51713 100644
--- a/engine/editor/icons/GuiToggleOffDisabledMirrored.svg
+++ b/engine/editor/icons/GuiToggleOffDisabledMirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="gray"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="30" cy="8" r="5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="gray"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="30" cy="8" r="5"/></g></svg>
diff --git a/engine/editor/icons/GuiToggleOffMirrored.svg b/engine/editor/icons/GuiToggleOffMirrored.svg
index 138a856a..0884c3bc 100644
--- a/engine/editor/icons/GuiToggleOffMirrored.svg
+++ b/engine/editor/icons/GuiToggleOffMirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="#e0e0e0"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="30" cy="8" r="5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><g fill="#e0e0e0"><rect width="36" height="14" x="1" y="1" fill-opacity=".2" rx="7"/><circle cx="30" cy="8" r="5"/></g></svg>
diff --git a/engine/editor/icons/GuiToggleOn.svg b/engine/editor/icons/GuiToggleOn.svg
index e45dbcf4..d543101a 100644
--- a/engine/editor/icons/GuiToggleOn.svg
+++ b/engine/editor/icons/GuiToggleOn.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="#699ce8" rx="7"/><circle cx="30" cy="8" r="5" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="#699ce8" rx="7"/><circle cx="30" cy="8" r="5" fill="#fff"/></svg>
diff --git a/engine/editor/icons/GuiToggleOnDisabled.svg b/engine/editor/icons/GuiToggleOnDisabled.svg
index 9477f2de..83e3b5f0 100644
--- a/engine/editor/icons/GuiToggleOnDisabled.svg
+++ b/engine/editor/icons/GuiToggleOnDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="gray" rx="7"/><circle cx="30" cy="8" r="5" fill="#b3b3b3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="gray" rx="7"/><circle cx="30" cy="8" r="5" fill="#b3b3b3"/></svg>
diff --git a/engine/editor/icons/GuiToggleOnDisabledMirrored.svg b/engine/editor/icons/GuiToggleOnDisabledMirrored.svg
index 4e7f63d5..70dbdd79 100644
--- a/engine/editor/icons/GuiToggleOnDisabledMirrored.svg
+++ b/engine/editor/icons/GuiToggleOnDisabledMirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="gray" rx="7"/><circle cx="8" cy="8" r="5" fill="#b3b3b3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="gray" rx="7"/><circle cx="8" cy="8" r="5" fill="#b3b3b3"/></svg>
diff --git a/engine/editor/icons/GuiToggleOnMirrored.svg b/engine/editor/icons/GuiToggleOnMirrored.svg
index 67e318d2..f2c870d2 100644
--- a/engine/editor/icons/GuiToggleOnMirrored.svg
+++ b/engine/editor/icons/GuiToggleOnMirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="#699ce8" rx="7"/><circle cx="8" cy="8" r="5" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="38" height="16"><rect width="36" height="14" x="1" y="1" fill="#699ce8" rx="7"/><circle cx="8" cy="8" r="5" fill="#fff"/></svg>
diff --git a/engine/editor/icons/GuiTreeArrowDown.svg b/engine/editor/icons/GuiTreeArrowDown.svg
index 9c08eba1..571aa605 100644
--- a/engine/editor/icons/GuiTreeArrowDown.svg
+++ b/engine/editor/icons/GuiTreeArrowDown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".4" stroke-width="2" d="m3 5 3 3 3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".4" stroke-width="2" d="m3 5 3 3 3-3"/></svg>
diff --git a/engine/editor/icons/GuiTreeArrowLeft.svg b/engine/editor/icons/GuiTreeArrowLeft.svg
index 2a9eceea..8f8f0915 100644
--- a/engine/editor/icons/GuiTreeArrowLeft.svg
+++ b/engine/editor/icons/GuiTreeArrowLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".4" stroke-width="2" d="M7 3 4 6l3 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".4" stroke-width="2" d="M7 3 4 6l3 3"/></svg>
diff --git a/engine/editor/icons/GuiTreeArrowRight.svg b/engine/editor/icons/GuiTreeArrowRight.svg
index 340d4e22..e4a94735 100644
--- a/engine/editor/icons/GuiTreeArrowRight.svg
+++ b/engine/editor/icons/GuiTreeArrowRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".4" stroke-width="2" d="m5 9 3-3-3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".4" stroke-width="2" d="m5 9 3-3-3-3"/></svg>
diff --git a/engine/editor/icons/GuiTreeUpdown.svg b/engine/editor/icons/GuiTreeUpdown.svg
index b79e025f..dc688ff5 100644
--- a/engine/editor/icons/GuiTreeUpdown.svg
+++ b/engine/editor/icons/GuiTreeUpdown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="m5 6 3-3 3 3m0 4-3 3-3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="m5 6 3-3 3 3m0 4-3 3-3-3"/></svg>
diff --git a/engine/editor/icons/GuiUnchecked.svg b/engine/editor/icons/GuiUnchecked.svg
index ac9be611..4caa29a6 100644
--- a/engine/editor/icons/GuiUnchecked.svg
+++ b/engine/editor/icons/GuiUnchecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#e0e0e0" fill-opacity=".2" rx="2.333"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#e0e0e0" fill-opacity=".2" rx="2.333"/></svg>
diff --git a/engine/editor/icons/GuiUncheckedDisabled.svg b/engine/editor/icons/GuiUncheckedDisabled.svg
index 79bebdf1..e96653f1 100644
--- a/engine/editor/icons/GuiUncheckedDisabled.svg
+++ b/engine/editor/icons/GuiUncheckedDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" fill-opacity=".2" rx="2.333"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" fill-opacity=".2" rx="2.333"/></svg>
diff --git a/engine/editor/icons/GuiViewportHdiagsplitter.svg b/engine/editor/icons/GuiViewportHdiagsplitter.svg
index f68f22c8..ad55722d 100644
--- a/engine/editor/icons/GuiViewportHdiagsplitter.svg
+++ b/engine/editor/icons/GuiViewportHdiagsplitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="34"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 2V32M2 2h60"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="34"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 2V32M2 2h60"/></svg>
diff --git a/engine/editor/icons/GuiViewportVdiagsplitter.svg b/engine/editor/icons/GuiViewportVdiagsplitter.svg
index 6752a6d3..d5f035b4 100644
--- a/engine/editor/icons/GuiViewportVdiagsplitter.svg
+++ b/engine/editor/icons/GuiViewportVdiagsplitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="34" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 32H2m30-30v60"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="34" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 32H2m30-30v60"/></svg>
diff --git a/engine/editor/icons/GuiViewportVhsplitter.svg b/engine/editor/icons/GuiViewportVhsplitter.svg
index cca8a86e..ae3746ea 100644
--- a/engine/editor/icons/GuiViewportVhsplitter.svg
+++ b/engine/editor/icons/GuiViewportVhsplitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 2v60M2 32h60"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M32 2v60M2 32h60"/></svg>
diff --git a/engine/editor/icons/GuiVisibilityHidden.svg b/engine/editor/icons/GuiVisibilityHidden.svg
index a9da2efc..acc728df 100644
--- a/engine/editor/icons/GuiVisibilityHidden.svg
+++ b/engine/editor/icons/GuiVisibilityHidden.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2.96 7.727-1.921.548c.32 1.12.824 2.06 1.432 2.84l-.834.834 1.414 1.414.843-.843c.986.747 2.077 1.206 3.106 1.386V15h2v-1.094c1.029-.18 2.12-.639 3.105-1.386l.844.843 1.414-1.414-.834-.834a8.285 8.285 0 0 0 1.432-2.84l-1.922-.548C12.163 10.79 9.499 12 7.999 12s-4.163-1.209-5.038-4.273z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2.96 7.727-1.921.548c.32 1.12.824 2.06 1.432 2.84l-.834.834 1.414 1.414.843-.843c.986.747 2.077 1.206 3.106 1.386V15h2v-1.094c1.029-.18 2.12-.639 3.105-1.386l.844.843 1.414-1.414-.834-.834a8.285 8.285 0 0 0 1.432-2.84l-1.922-.548C12.163 10.79 9.499 12 7.999 12s-4.163-1.209-5.038-4.273z"/></svg>
diff --git a/engine/editor/icons/GuiVisibilityVisible.svg b/engine/editor/icons/GuiVisibilityVisible.svg
index 3f953eff..8e64200a 100644
--- a/engine/editor/icons/GuiVisibilityVisible.svg
+++ b/engine/editor/icons/GuiVisibilityVisible.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/GuiVisibilityXray.svg b/engine/editor/icons/GuiVisibilityXray.svg
index 67d5d28b..c9389b3a 100644
--- a/engine/editor/icons/GuiVisibilityXray.svg
+++ b/engine/editor/icons/GuiVisibilityXray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".4" d="M8 14c2.557 0 5.79-1.948 6.955-5.705a1 1 0 0 0 0-.55C13.837 3.789 10.5 2 8 2v2a4 4 0 0 1 0 8zm0-4a2 2 0 0 0 0-4z"/><path d="M8 2C5.443 2 2.21 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14v-2a4 4 0 0 1 0-8zm0 4a2 2 0 0 0 0 4z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".4" d="M8 14c2.557 0 5.79-1.948 6.955-5.705a1 1 0 0 0 0-.55C13.837 3.789 10.5 2 8 2v2a4 4 0 0 1 0 8zm0-4a2 2 0 0 0 0-4z"/><path d="M8 2C5.443 2 2.21 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14v-2a4 4 0 0 1 0-8zm0 4a2 2 0 0 0 0 4z"/></g></svg>
diff --git a/engine/editor/icons/GuiVsplitter.svg b/engine/editor/icons/GuiVsplitter.svg
index 45b6769a..2a5426e7 100644
--- a/engine/editor/icons/GuiVsplitter.svg
+++ b/engine/editor/icons/GuiVsplitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="2"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M2 1h60"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="2"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2" d="M2 1h60"/></svg>
diff --git a/engine/editor/icons/HBoxContainer.svg b/engine/editor/icons/HBoxContainer.svg
index 94063809..eb35599f 100644
--- a/engine/editor/icons/HBoxContainer.svg
+++ b/engine/editor/icons/HBoxContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v10H3zm4 0h2v10H7zm4 0h2v10h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v10H3zm4 0h2v10H7zm4 0h2v10h-2z"/></svg>
diff --git a/engine/editor/icons/HFlowContainer.svg b/engine/editor/icons/HFlowContainer.svg
index 81d23c4f..c3510e98 100644
--- a/engine/editor/icons/HFlowContainer.svg
+++ b/engine/editor/icons/HFlowContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97" stroke-width="2"><rect width="12" height="12" x="2" y="2" rx="1"/><path stroke-linecap="round" d="M5 5h2m3 0h1M5 8h0m3 0h3m-6 3h4"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97" stroke-width="2"><rect width="12" height="12" x="2" y="2" rx="1"/><path stroke-linecap="round" d="M5 5h2m3 0h1M5 8h0m3 0h3m-6 3h4"/></g></svg>
diff --git a/engine/editor/icons/HScrollBar.svg b/engine/editor/icons/HScrollBar.svg
index 34266f12..0203189c 100644
--- a/engine/editor/icons/HScrollBar.svg
+++ b/engine/editor/icons/HScrollBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M15 5a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2zm-1 2.988a1 1 0 0 1-.168.567l-2 3a1 1 0 1 1-1.664-1.11L11.797 8l-1.629-2.445a1 1 0 1 1 1.664-1.11l2 3a1 1 0 0 1 .168.543zM6.008 4.99a1 1 0 0 1-.176.565L4.202 8l1.63 2.445a1 1 0 1 1-1.664 1.11l-2-3a1 1 0 0 1 0-1.11l2-3a1 1 0 0 1 1.84.545z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M15 5a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2zm-1 2.988a1 1 0 0 1-.168.567l-2 3a1 1 0 1 1-1.664-1.11L11.797 8l-1.629-2.445a1 1 0 1 1 1.664-1.11l2 3a1 1 0 0 1 .168.543zM6.008 4.99a1 1 0 0 1-.176.565L4.202 8l1.63 2.445a1 1 0 1 1-1.664 1.11l-2-3a1 1 0 0 1 0-1.11l2-3a1 1 0 0 1 1.84.545z"/></svg>
diff --git a/engine/editor/icons/HSeparator.svg b/engine/editor/icons/HSeparator.svg
index 43eff6ed..f807bc3c 100644
--- a/engine/editor/icons/HSeparator.svg
+++ b/engine/editor/icons/HSeparator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 2v3h6V2zM1 7v2h14V7zm4 4v3h6v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 2v3h6V2zM1 7v2h14V7zm4 4v3h6v-3z"/></svg>
diff --git a/engine/editor/icons/HSlider.svg b/engine/editor/icons/HSlider.svg
index 07c82a20..932a2e3e 100644
--- a/engine/editor/icons/HSlider.svg
+++ b/engine/editor/icons/HSlider.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 11a2 2 0 0 0 4 0 2 2 0 0 0-4 0zm0-5a1 1 0 0 0 2 0V4a1 1 0 0 0-2 0zm5.867 4a4 4 0 0 1 0 2h7.13a1 1 0 0 0 0-2zM7 5a1 1 0 1 0 2 0 1 1 0 0 0-2 0zm6 1a1 1 0 0 0 2 0V4a1 1 0 0 0-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 11a2 2 0 0 0 4 0 2 2 0 0 0-4 0zm0-5a1 1 0 0 0 2 0V4a1 1 0 0 0-2 0zm5.867 4a4 4 0 0 1 0 2h7.13a1 1 0 0 0 0-2zM7 5a1 1 0 1 0 2 0 1 1 0 0 0-2 0zm6 1a1 1 0 0 0 2 0V4a1 1 0 0 0-2 0z"/></svg>
diff --git a/engine/editor/icons/HSplitContainer.svg b/engine/editor/icons/HSplitContainer.svg
index 8e3ad1d0..e279943d 100644
--- a/engine/editor/icons/HSplitContainer.svg
+++ b/engine/editor/icons/HSplitContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h4v3L5 8l2 2v3H3zm6 0h4v10H9v-3l2-2-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h4v3L5 8l2 2v3H3zm6 0h4v10H9v-3l2-2-2-2z"/></svg>
diff --git a/engine/editor/icons/HTTPRequest.svg b/engine/editor/icons/HTTPRequest.svg
index 561419a7..d3e3d1bc 100644
--- a/engine/editor/icons/HTTPRequest.svg
+++ b/engine/editor/icons/HTTPRequest.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 1-3 4h2v3h2v-3h2zm7 0v3h-2l3 4 3-4h-2v-3zm-10 9v2 1 2h1v-2h1v2h1v-5h-1v2h-1v-2zm4 0v1h1v4h1v-4h1v-1zm4 0v1h1v4h1v-4h1v-1zm4 0v2 1 2h1v-2h1 1v-1-2h-2zm1 1h1v1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 1-3 4h2v3h2v-3h2zm7 0v3h-2l3 4 3-4h-2v-3zm-10 9v2 1 2h1v-2h1v2h1v-5h-1v2h-1v-2zm4 0v1h1v4h1v-4h1v-1zm4 0v1h1v4h1v-4h1v-1zm4 0v2 1 2h1v-2h1 1v-1-2h-2zm1 1h1v1h-1z"/></svg>
diff --git a/engine/editor/icons/Heart.svg b/engine/editor/icons/Heart.svg
index 59274b5a..8830eee3 100644
--- a/engine/editor/icons/Heart.svg
+++ b/engine/editor/icons/Heart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2.781 9.155C2.72 9.102 1 7.531 1 5.656 1 3.367 2.398 2 4.734 2 6.102 2 7.383 3.39 8 4c.617-.61 1.898-2 3.266-2C13.602 2 15 3.367 15 5.656c0 1.875-1.719 3.446-1.79 3.516l-4.866 4.687a.485.485 0 0 1-.688 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2.781 9.155C2.72 9.102 1 7.531 1 5.656 1 3.367 2.398 2 4.734 2 6.102 2 7.383 3.39 8 4c.617-.61 1.898-2 3.266-2C13.602 2 15 3.367 15 5.656c0 1.875-1.719 3.446-1.79 3.516l-4.866 4.687a.485.485 0 0 1-.688 0z"/></svg>
diff --git a/engine/editor/icons/HeightMapShape3D.svg b/engine/editor/icons/HeightMapShape3D.svg
index 7aad9809..3be4694c 100644
--- a/engine/editor/icons/HeightMapShape3D.svg
+++ b/engine/editor/icons/HeightMapShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="7" y2="10" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a2d2ff"/><stop offset="1" stop-color="#5fb2ff"/></linearGradient><path fill="#5fb2ff" d="m1 10 7 3 7-3-7-3z"/><path fill="url(#a)" d="M3 10c1-1 2-2 2-4s1-3 3-3 3 1 3 3 1 3 2 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="7" y2="10" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a2d2ff"/><stop offset="1" stop-color="#5fb2ff"/></linearGradient><path fill="#5fb2ff" d="m1 10 7 3 7-3-7-3z"/><path fill="url(#a)" d="M3 10c1-1 2-2 2-4s1-3 3-3 3 1 3 3 1 3 2 4z"/></svg>
diff --git a/engine/editor/icons/Help.svg b/engine/editor/icons/Help.svg
index dbd46f96..428e5b0d 100644
--- a/engine/editor/icons/Help.svg
+++ b/engine/editor/icons/Help.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 2C6 .7 4 .7 2 2v7c2-1.3 4-1.3 6 0 2-1.3 4-1.3 6 0V2C12 .7 10.2.9 9 1.5V6H8zm-8 8v6h2a3 3 0 0 0 0-6zm5 3a3 3 0 0 0 6 0 3 3 0 0 0-6 0zm9 3h1v-2h-1a1 1 0 0 1 0-2h1v-2h-1a3 3 0 0 0 0 6zM2 12a1 1 0 0 1 0 2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 2C6 .7 4 .7 2 2v7c2-1.3 4-1.3 6 0 2-1.3 4-1.3 6 0V2C12 .7 10.2.9 9 1.5V6H8zm-8 8v6h2a3 3 0 0 0 0-6zm5 3a3 3 0 0 0 6 0 3 3 0 0 0-6 0zm9 3h1v-2h-1a1 1 0 0 1 0-2h1v-2h-1a3 3 0 0 0 0 6zM2 12a1 1 0 0 1 0 2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/HelpSearch.svg b/engine/editor/icons/HelpSearch.svg
index f95bf5c3..8106e73c 100644
--- a/engine/editor/icons/HelpSearch.svg
+++ b/engine/editor/icons/HelpSearch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6.973 7.441a4 4 0 1 0-1.414-1.414L3.293 8.293l1.414 1.414zM9 2a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-9 8v6h2a3 3 0 1 0 0-6zm5 3a3 3 0 1 0 6 0 3 3 0 0 0-6 0zm6 0a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1 0-2h1v-2h-1a3 3 0 0 0-3 3zm-9-1a1 1 0 0 1 0 2zm6 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6.973 7.441a4 4 0 1 0-1.414-1.414L3.293 8.293l1.414 1.414zM9 2a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-9 8v6h2a3 3 0 1 0 0-6zm5 3a3 3 0 1 0 6 0 3 3 0 0 0-6 0zm6 0a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1 0-2h1v-2h-1a3 3 0 0 0-3 3zm-9-1a1 1 0 0 1 0 2zm6 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/HingeJoint3D.svg b/engine/editor/icons/HingeJoint3D.svg
index d1d48ac1..6f16ede6 100644
--- a/engine/editor/icons/HingeJoint3D.svg
+++ b/engine/editor/icons/HingeJoint3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m6.403 1.84-3.69 6.39a4 4 0 0 1 2.349-.068L8.135 2.84a1 1 0 0 0-1.732-1zM4 15h10a1 1 0 0 0 0-2H6.826A3 3 0 1 0 4 15zm0-4a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m6.403 1.84-3.69 6.39a4 4 0 0 1 2.349-.068L8.135 2.84a1 1 0 0 0-1.732-1zM4 15h10a1 1 0 0 0 0-2H6.826A3 3 0 1 0 4 15zm0-4a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/History.svg b/engine/editor/icons/History.svg
index fc9fb843..032f7196 100644
--- a/engine/editor/icons/History.svg
+++ b/engine/editor/icons/History.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4zm3-3h2v2h2v2H8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4zm3-3h2v2h2v2H8z"/></svg>
diff --git a/engine/editor/icons/Hsize.svg b/engine/editor/icons/Hsize.svg
index 923d96fb..8ae437d7 100644
--- a/engine/editor/icons/Hsize.svg
+++ b/engine/editor/icons/Hsize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 7v-2l-3 3 3 3v-2h8v2l3-3-3-3v2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 7v-2l-3 3 3 3v-2h8v2l3-3-3-3v2z"/></svg>
diff --git a/engine/editor/icons/IOSDeviceWired.svg b/engine/editor/icons/IOSDeviceWired.svg
index f487e785..1d54ae4c 100644
--- a/engine/editor/icons/IOSDeviceWired.svg
+++ b/engine/editor/icons/IOSDeviceWired.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M7 1a2 2 0 0 0-2 2v7.5h-.4a2 2 0 0 0-2-1.5v.8H1v.8h1.6v1.2H1v.8h1.6v.8a2 2 0 0 0 2-1.5H5V13a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h1v.6a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V3h1v10H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M7 1a2 2 0 0 0-2 2v7.5h-.4a2 2 0 0 0-2-1.5v.8H1v.8h1.6v1.2H1v.8h1.6v.8a2 2 0 0 0 2-1.5H5V13a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h1v.6a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V3h1v10H7z"/></svg>
diff --git a/engine/editor/icons/IOSDeviceWireless.svg b/engine/editor/icons/IOSDeviceWireless.svg
index ac121b28..fe674ae9 100644
--- a/engine/editor/icons/IOSDeviceWireless.svg
+++ b/engine/editor/icons/IOSDeviceWireless.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M7 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h1v.6a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V3h1v10H7z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" d="M3.75 9a1.75 1.75 0 0 1 0-2.5m-1 4a3.5 3.5 0 0 1 0-5.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M7 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h1v.6a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V3h1v10H7z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" d="M3.75 9a1.75 1.75 0 0 1 0-2.5m-1 4a3.5 3.5 0 0 1 0-5.5"/></svg>
diff --git a/engine/editor/icons/IOSSimulator.svg b/engine/editor/icons/IOSSimulator.svg
index 8cb88e74..9c05e78a 100644
--- a/engine/editor/icons/IOSSimulator.svg
+++ b/engine/editor/icons/IOSSimulator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#4bb7f8" d="M5 3H1v10h4z"/><path fill="#e0e0e0" d="M1.7 3.5v9h2.6v-.8H2.5v-1.3h1.8v-.8H2.5V4.3h1.8v-.8zM7 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h1v.6a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V3h1v10H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#4bb7f8" d="M5 3H1v10h4z"/><path fill="#e0e0e0" d="M1.7 3.5v9h2.6v-.8H2.5v-1.3h1.8v-.8H2.5V4.3h1.8v-.8zM7 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h1v.6a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V3h1v10H7z"/></svg>
diff --git a/engine/editor/icons/Image.svg b/engine/editor/icons/Image.svg
index e5459f62..63e65446 100644
--- a/engine/editor/icons/Image.svg
+++ b/engine/editor/icons/Image.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1a1 1 0 0 0 -1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-12a1 1 0 0 0 -1-1zm1 2h10v8h-10zm6 2-1.5 2.5-.70117 1.168-.099609-.16797-.89844-1.5-.90039 1.5-.90039 1.5h1.8008.19922 1.5996 1.4004 3l-1.5-2.5-1.5-2.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1a1 1 0 0 0 -1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-12a1 1 0 0 0 -1-1zm1 2h10v8h-10zm6 2-1.5 2.5-.70117 1.168-.099609-.16797-.89844-1.5-.90039 1.5-.90039 1.5h1.8008.19922 1.5996 1.4004 3l-1.5-2.5-1.5-2.5z"/></svg>
diff --git a/engine/editor/icons/ImageTexture.svg b/engine/editor/icons/ImageTexture.svg
index cdf82022..01e0f515 100644
--- a/engine/editor/icons/ImageTexture.svg
+++ b/engine/editor/icons/ImageTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm6 2v1H8v1H6v1H5v1H4v1h8V8h-1V6h-1V5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm6 2v1H8v1H6v1H5v1H4v1h8V8h-1V6h-1V5z"/></svg>
diff --git a/engine/editor/icons/ImageTexture3D.svg b/engine/editor/icons/ImageTexture3D.svg
index 94233651..a8c0b19f 100644
--- a/engine/editor/icons/ImageTexture3D.svg
+++ b/engine/editor/icons/ImageTexture3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6V4.75L14 3v6.25zm-1-7.25h-8L5 2h8zM7.675 6l3 4-3 1-1.5-.5-1.75.75-1.75-.75L4.25 8l.875 1.25z"/><path fill-opacity=".4" d="M7.675 6v5L6 10.5l-.875-1.25zM4.25 8v3.25L2.5 10.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6V4.75L14 3v6.25zm-1-7.25h-8L5 2h8zM7.675 6l3 4-3 1-1.5-.5-1.75.75-1.75-.75L4.25 8l.875 1.25z"/><path fill-opacity=".4" d="M7.675 6v5L6 10.5l-.875-1.25zM4.25 8v3.25L2.5 10.5"/></svg>
diff --git a/engine/editor/icons/ImmediateMesh.svg b/engine/editor/icons/ImmediateMesh.svg
index 2eb70246..d660da7d 100644
--- a/engine/editor/icons/ImmediateMesh.svg
+++ b/engine/editor/icons/ImmediateMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M2 2v2h5V2zm5 2v3h2V4zm2-2v2h5V2zM7 9v3h2V9zm-5 3v2h5v-2zm7 0v2h5v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M2 2v2h5V2zm5 2v3h2V4zm2-2v2h5V2zM7 9v3h2V9zm-5 3v2h5v-2zm7 0v2h5v-2z"/></svg>
diff --git a/engine/editor/icons/ImportCheck.svg b/engine/editor/icons/ImportCheck.svg
index ea5f8dbc..e2ed8d6c 100644
--- a/engine/editor/icons/ImportCheck.svg
+++ b/engine/editor/icons/ImportCheck.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fff97" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 8 4 4 8-8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fff97" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 8 4 4 8-8"/></svg>
diff --git a/engine/editor/icons/ImportFail.svg b/engine/editor/icons/ImportFail.svg
index bab9f5c9..207afbd3 100644
--- a/engine/editor/icons/ImportFail.svg
+++ b/engine/editor/icons/ImportFail.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-width="2" d="M3 3 13 13M13 3 3 13"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-width="2" d="M3 3 13 13M13 3 3 13"/></svg>
diff --git a/engine/editor/icons/ImporterMeshInstance3D.svg b/engine/editor/icons/ImporterMeshInstance3D.svg
index a56032ca..1b1dcb06 100644
--- a/engine/editor/icons/ImporterMeshInstance3D.svg
+++ b/engine/editor/icons/ImporterMeshInstance3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zM4 4h8v8H4zm3 3h2v4H7zm0-2h2v1H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zM4 4h8v8H4zm3 3h2v4H7zm0-2h2v1H7z"/></svg>
diff --git a/engine/editor/icons/Info.svg b/engine/editor/icons/Info.svg
index de179237..77fee360 100644
--- a/engine/editor/icons/Info.svg
+++ b/engine/editor/icons/Info.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1m1 12H7v-2h2v2M4.5 6a3.5 3.4 0 1 1 7 0C11.3 8.9 9 8.5 9 10H7c.1-2.6 2.4-2.8 2.5-4a1.5 1.4 0 0 0-3 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1m1 12H7v-2h2v2M4.5 6a3.5 3.4 0 1 1 7 0C11.3 8.9 9 8.5 9 10H7c.1-2.6 2.4-2.8 2.5-4a1.5 1.4 0 0 0-3 0z"/></svg>
diff --git a/engine/editor/icons/InputEventAction.svg b/engine/editor/icons/InputEventAction.svg
index 13d52130..aa8192b9 100644
--- a/engine/editor/icons/InputEventAction.svg
+++ b/engine/editor/icons/InputEventAction.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" d="M4.55 5a.85.85 0 0 0-.85.85v7.65a.85.85 0 0 0 .85.85h6.8a.85.85 0 0 0 .85-.85V5.85a.85.85 0 0 0-.85-.85zM8.5 6.2l.282 1.129.345.14.994-.597.707.707-.598.997.143.342L11.5 9.2v1l-1.129.282-.14.344.597.995-.707.707-.997-.598-.343.143-.28 1.127h-1l-.283-1.13-.344-.139-.995.597-.707-.707.598-.997-.143-.343L4.5 10.2v-1l1.13-.282.139-.344-.597-.995.707-.707.997.598.343-.143L7.5 6.2z"/><circle cx="8" cy="9.675" r="1" fill="#69c4d4"/><path fill="#e0e0e0" d="M2 6.36v7.65a1.7 1.7 0 0 0 1.7 1.7h8.5a1.7 1.7 0 0 0 1.7-1.7V6.36h-.85v7.65a.85.85 0 0 1-.85.85H3.7a.85.85 0 0 1-.85-.85V6.36z"/><path fill="none" stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m10.5 3.6.75-1.5M5.5 3.6l-.75-1.5M8 3.2V1.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" d="M4.55 5a.85.85 0 0 0-.85.85v7.65a.85.85 0 0 0 .85.85h6.8a.85.85 0 0 0 .85-.85V5.85a.85.85 0 0 0-.85-.85zM8.5 6.2l.282 1.129.345.14.994-.597.707.707-.598.997.143.342L11.5 9.2v1l-1.129.282-.14.344.597.995-.707.707-.997-.598-.343.143-.28 1.127h-1l-.283-1.13-.344-.139-.995.597-.707-.707.598-.997-.143-.343L4.5 10.2v-1l1.13-.282.139-.344-.597-.995.707-.707.997.598.343-.143L7.5 6.2z"/><circle cx="8" cy="9.675" r="1" fill="#69c4d4"/><path fill="#e0e0e0" d="M2 6.36v7.65a1.7 1.7 0 0 0 1.7 1.7h8.5a1.7 1.7 0 0 0 1.7-1.7V6.36h-.85v7.65a.85.85 0 0 1-.85.85H3.7a.85.85 0 0 1-.85-.85V6.36z"/><path fill="none" stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m10.5 3.6.75-1.5M5.5 3.6l-.75-1.5M8 3.2V1.5"/></svg>
diff --git a/engine/editor/icons/InputEventJoypadButton.svg b/engine/editor/icons/InputEventJoypadButton.svg
index b7a50148..9e05aa1b 100644
--- a/engine/editor/icons/InputEventJoypadButton.svg
+++ b/engine/editor/icons/InputEventJoypadButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5.25 3h2.3A1.15 1.15 0 0 1 8.7 4.15v9.2a1.15 1.15 0 0 1-1.15 1.15h-2.3a1.15 1.15 0 0 1-1.15-1.15v-2.3H1.8A1.15 1.15 0 0 1 .65 9.9V7.6A1.15 1.15 0 0 1 1.8 6.45h2.3v-2.3A1.15 1.15 0 0 1 5.25 3zM6.4 7.025a1.15 1.15 0 0 0 0 3.45 1.15 1.15 0 0 0 0-3.45Z"/><path fill="#69c4d4" d="M8.7 6.3H11a1.15 1.15 0 0 1 1.15 1.15v2.3A1.15 1.15 0 0 1 11 10.9H8.7"/><path stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m13.25 7.25 1.7-.4m-2.2-1.35 1.3-1.3M11 5l.4-1.7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5.25 3h2.3A1.15 1.15 0 0 1 8.7 4.15v9.2a1.15 1.15 0 0 1-1.15 1.15h-2.3a1.15 1.15 0 0 1-1.15-1.15v-2.3H1.8A1.15 1.15 0 0 1 .65 9.9V7.6A1.15 1.15 0 0 1 1.8 6.45h2.3v-2.3A1.15 1.15 0 0 1 5.25 3zM6.4 7.025a1.15 1.15 0 0 0 0 3.45 1.15 1.15 0 0 0 0-3.45Z"/><path fill="#69c4d4" d="M8.7 6.3H11a1.15 1.15 0 0 1 1.15 1.15v2.3A1.15 1.15 0 0 1 11 10.9H8.7"/><path stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m13.25 7.25 1.7-.4m-2.2-1.35 1.3-1.3M11 5l.4-1.7"/></svg>
diff --git a/engine/editor/icons/InputEventJoypadMotion.svg b/engine/editor/icons/InputEventJoypadMotion.svg
index 698cd708..6a74cca4 100644
--- a/engine/editor/icons/InputEventJoypadMotion.svg
+++ b/engine/editor/icons/InputEventJoypadMotion.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1="2" x2="9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#69c4d4" stop-opacity="0"/><stop offset=".6" stop-color="#69c4d4"/></linearGradient><path fill="#e0e0e0" d="M11.5 16v-1.5a1 1 0 0 0-1-1H10l1.6-4a4 4 0 1 0-3.5-1.4l-2.2 5.4h-.7a1 1 0 0 0-1 1V16z"/><path fill="url(#a)" d="M5.25 12.2 2 4a8 8 0 0 1 7-3 5 5 0 0 0-2.1 7.2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1="2" x2="9" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#69c4d4" stop-opacity="0"/><stop offset=".6" stop-color="#69c4d4"/></linearGradient><path fill="#e0e0e0" d="M11.5 16v-1.5a1 1 0 0 0-1-1H10l1.6-4a4 4 0 1 0-3.5-1.4l-2.2 5.4h-.7a1 1 0 0 0-1 1V16z"/><path fill="url(#a)" d="M5.25 12.2 2 4a8 8 0 0 1 7-3 5 5 0 0 0-2.1 7.2z"/></svg>
diff --git a/engine/editor/icons/InputEventKey.svg b/engine/editor/icons/InputEventKey.svg
index be821e69..98b3310c 100644
--- a/engine/editor/icons/InputEventKey.svg
+++ b/engine/editor/icons/InputEventKey.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" d="M4.55 5a.85.85 0 0 0-.85.85v7.65a.85.85 0 0 0 .85.85h6.8a.85.85 0 0 0 .85-.85V5.85a.85.85 0 0 0-.85-.85zm.65 1.503h1.75v2.2l2-2.2h2.1L8.166 9.675l2.884 3.172h-2.1l-2-2.2v2.2H5.2z"/><path fill="#e0e0e0" d="M2 6.36v7.65a1.7 1.7 0 0 0 1.7 1.7h8.5a1.7 1.7 0 0 0 1.7-1.7V6.36h-.85v7.65a.85.85 0 0 1-.85.85H3.7a.85.85 0 0 1-.85-.85V6.36z"/><path fill="none" stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m10.5 3.6.75-1.5M5.5 3.6l-.75-1.5M8 3.2V1.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" d="M4.55 5a.85.85 0 0 0-.85.85v7.65a.85.85 0 0 0 .85.85h6.8a.85.85 0 0 0 .85-.85V5.85a.85.85 0 0 0-.85-.85zm.65 1.503h1.75v2.2l2-2.2h2.1L8.166 9.675l2.884 3.172h-2.1l-2-2.2v2.2H5.2z"/><path fill="#e0e0e0" d="M2 6.36v7.65a1.7 1.7 0 0 0 1.7 1.7h8.5a1.7 1.7 0 0 0 1.7-1.7V6.36h-.85v7.65a.85.85 0 0 1-.85.85H3.7a.85.85 0 0 1-.85-.85V6.36z"/><path fill="none" stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m10.5 3.6.75-1.5M5.5 3.6l-.75-1.5M8 3.2V1.5"/></svg>
diff --git a/engine/editor/icons/InputEventMIDI.svg b/engine/editor/icons/InputEventMIDI.svg
index e1313d2a..e9801380 100644
--- a/engine/editor/icons/InputEventMIDI.svg
+++ b/engine/editor/icons/InputEventMIDI.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" fill-opacity=".8" d="M8.5 14.5v-4H9v-4h1.5v4h.5v4z"/><path fill="#e0e0e0" d="M.5 15.5h15v-9a2 2 0 0 0-2-2h-11a2 2 0 0 0-2 2zm1-1v-8h2v4H4v4zm3.5 0v-4h.5v-4H7v4h.5v4zm7 0v-4h.5v-4h2v8zm-3.5 0v-4H9v-4h1.5v4h.5v4z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="square" d="M4.5 4.127a2 2 0 0 0-2-2 2 2 0 0 1-2-2"/><path stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m11.75 3.3.75-1.5M7.75 3.3 7 1.8m2.75 1.1V1.2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" fill-opacity=".8" d="M8.5 14.5v-4H9v-4h1.5v4h.5v4z"/><path fill="#e0e0e0" d="M.5 15.5h15v-9a2 2 0 0 0-2-2h-11a2 2 0 0 0-2 2zm1-1v-8h2v4H4v4zm3.5 0v-4h.5v-4H7v4h.5v4zm7 0v-4h.5v-4h2v8zm-3.5 0v-4H9v-4h1.5v4h.5v4z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="square" d="M4.5 4.127a2 2 0 0 0-2-2 2 2 0 0 1-2-2"/><path stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m11.75 3.3.75-1.5M7.75 3.3 7 1.8m2.75 1.1V1.2"/></svg>
diff --git a/engine/editor/icons/InputEventMagnifyGesture.svg b/engine/editor/icons/InputEventMagnifyGesture.svg
index 0bedae85..da912b9a 100644
--- a/engine/editor/icons/InputEventMagnifyGesture.svg
+++ b/engine/editor/icons/InputEventMagnifyGesture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1zm1 0v8h12V3zm0 9v1h5.5v-1zm6.5 0v1H14v-1z"/><path fill="#69c4d4" d="M6.4 3.8a1.7 1.7 0 1 1 3.2 0C8.1 7 8.1 7 9.6 10.2a1.7 1.7 0 1 1-3.2 0C7.9 7 7.9 7 6.4 3.8z" transform="rotate(66 8 7)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1zm1 0v8h12V3zm0 9v1h5.5v-1zm6.5 0v1H14v-1z"/><path fill="#69c4d4" d="M6.4 3.8a1.7 1.7 0 1 1 3.2 0C8.1 7 8.1 7 9.6 10.2a1.7 1.7 0 1 1-3.2 0C7.9 7 7.9 7 6.4 3.8z" transform="rotate(66 8 7)"/></svg>
diff --git a/engine/editor/icons/InputEventMouseButton.svg b/engine/editor/icons/InputEventMouseButton.svg
index 4c6034b3..e17cb325 100644
--- a/engine/editor/icons/InputEventMouseButton.svg
+++ b/engine/editor/icons/InputEventMouseButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3.5 8.5v2.75a4 4 0 0 0 8 0V8.5zm3-1V4a4 4 0 0 0-3 3.5z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" d="M7.5 4.127a2 2 0 0 0-2-2H4a2 2 0 0 1-2-2"/><path fill="#69c4d4" d="M11.5 7.5a4 4 0 0 0-3-3.5v3.5z"/><path stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m12.2 5.5 1.6-.8m-2.5-.75 1.3-1.3m-2.85.4.8-1.6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3.5 8.5v2.75a4 4 0 0 0 8 0V8.5zm3-1V4a4 4 0 0 0-3 3.5z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" d="M7.5 4.127a2 2 0 0 0-2-2H4a2 2 0 0 1-2-2"/><path fill="#69c4d4" d="M11.5 7.5a4 4 0 0 0-3-3.5v3.5z"/><path stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m12.2 5.5 1.6-.8m-2.5-.75 1.3-1.3m-2.85.4.8-1.6"/></svg>
diff --git a/engine/editor/icons/InputEventMouseMotion.svg b/engine/editor/icons/InputEventMouseMotion.svg
index af8ba328..64d62958 100644
--- a/engine/editor/icons/InputEventMouseMotion.svg
+++ b/engine/editor/icons/InputEventMouseMotion.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1=".5" x2="6" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#69c4d4" stop-opacity="0"/><stop offset=".6" stop-color="#69c4d4"/></linearGradient><path fill="#e0e0e0" d="M6 8v3a4 4 0 0 0 8 0V8a4 4 0 0 0-3-3.873V7.5a1 1 0 0 1-2 0V4.127A4 4 0 0 0 6 8"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" d="M10 4.127a2 2 0 0 0-2-2H7a2 2 0 0 1-2-2"/><path fill="url(#a)" d="M5 6a4 4 0 0 0-.4 1.5v4a4 4 0 0 0 1.2 2.8l-4 .8q-1.3.26-1.3-2V8q0-1.1 1.3-1.36Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1=".5" x2="6" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#69c4d4" stop-opacity="0"/><stop offset=".6" stop-color="#69c4d4"/></linearGradient><path fill="#e0e0e0" d="M6 8v3a4 4 0 0 0 8 0V8a4 4 0 0 0-3-3.873V7.5a1 1 0 0 1-2 0V4.127A4 4 0 0 0 6 8"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" d="M10 4.127a2 2 0 0 0-2-2H7a2 2 0 0 1-2-2"/><path fill="url(#a)" d="M5 6a4 4 0 0 0-.4 1.5v4a4 4 0 0 0 1.2 2.8l-4 .8q-1.3.26-1.3-2V8q0-1.1 1.3-1.36Z"/></svg>
diff --git a/engine/editor/icons/InputEventPanGesture.svg b/engine/editor/icons/InputEventPanGesture.svg
index 76c7f134..a57cbe54 100644
--- a/engine/editor/icons/InputEventPanGesture.svg
+++ b/engine/editor/icons/InputEventPanGesture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1zm1 0v8h12V3zm0 9v1h5.5v-1zm6.5 0v1H14v-1z"/><path fill="#69c4d4" d="M11.25 4a1.3 1.3 0 1 1 0 2.5 31 31 0 0 0-7.75-.85.4.4 0 1 1 0-.8A31 31 0 0 0 11.25 4zm0 3.5a1.3 1.3 0 1 1 0 2.5 31 31 0 0 0-7.75-.85.4.4 0 1 1 0-.8 31 31 0 0 0 7.75-.85z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 3a1 1 0 0 1 1-1h12a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1zm1 0v8h12V3zm0 9v1h5.5v-1zm6.5 0v1H14v-1z"/><path fill="#69c4d4" d="M11.25 4a1.3 1.3 0 1 1 0 2.5 31 31 0 0 0-7.75-.85.4.4 0 1 1 0-.8A31 31 0 0 0 11.25 4zm0 3.5a1.3 1.3 0 1 1 0 2.5 31 31 0 0 0-7.75-.85.4.4 0 1 1 0-.8 31 31 0 0 0 7.75-.85z"/></svg>
diff --git a/engine/editor/icons/InputEventScreenDrag.svg b/engine/editor/icons/InputEventScreenDrag.svg
index 3b57166a..bf601591 100644
--- a/engine/editor/icons/InputEventScreenDrag.svg
+++ b/engine/editor/icons/InputEventScreenDrag.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1zm1 0v10.75h8V2M8 13.125a.625.625 0 0 0 0 1.5.625.625 0 0 0 0-1.5z"/><path fill="#69c4d4" d="M6 4.1a1.8 1.8 0 1 1 3.3.9 6 6 0 0 0 .3 6.4.6.6 0 1 1-1.2.6A15 15 0 0 1 6 4.1z" transform="rotate(40 8 6.76)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1zm1 0v10.75h8V2M8 13.125a.625.625 0 0 0 0 1.5.625.625 0 0 0 0-1.5z"/><path fill="#69c4d4" d="M6 4.1a1.8 1.8 0 1 1 3.3.9 6 6 0 0 0 .3 6.4.6.6 0 1 1-1.2.6A15 15 0 0 1 6 4.1z" transform="rotate(40 8 6.76)"/></svg>
diff --git a/engine/editor/icons/InputEventScreenTouch.svg b/engine/editor/icons/InputEventScreenTouch.svg
index f338a585..0cd8e1fd 100644
--- a/engine/editor/icons/InputEventScreenTouch.svg
+++ b/engine/editor/icons/InputEventScreenTouch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1zm1 0v10.75h8V2M8 13.125a.625.625 0 0 0 0 1.5.625.625 0 0 0 0-1.5z"/><circle cx="8" cy="6.5" r="1.25" fill="#69c4d4"/><circle cx="8" cy="6.5" r="2.25" fill="none" stroke="#69c4d4" stroke-width=".75"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1zm1 0v10.75h8V2M8 13.125a.625.625 0 0 0 0 1.5.625.625 0 0 0 0-1.5z"/><circle cx="8" cy="6.5" r="1.25" fill="#69c4d4"/><circle cx="8" cy="6.5" r="2.25" fill="none" stroke="#69c4d4" stroke-width=".75"/></svg>
diff --git a/engine/editor/icons/InputEventShortcut.svg b/engine/editor/icons/InputEventShortcut.svg
index 6e5cbffd..1c8e3455 100644
--- a/engine/editor/icons/InputEventShortcut.svg
+++ b/engine/editor/icons/InputEventShortcut.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" d="M4.55 5a.85.85 0 0 0-.85.85v7.65a.85.85 0 0 0 .85.85h6.8a.85.85 0 0 0 .85-.85V5.85a.85.85 0 0 0-.85-.85zM7 7h2.55L8.7 9.55h1.7L7 12.95l.85-2.55h-1.7z"/><path fill="#e0e0e0" d="M2 6.36v7.65a1.7 1.7 0 0 0 1.7 1.7h8.5a1.7 1.7 0 0 0 1.7-1.7V6.36h-.85v7.65a.85.85 0 0 1-.85.85H3.7a.85.85 0 0 1-.85-.85V6.36z"/><path fill="none" stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m10.5 3.6.75-1.5M5.5 3.6l-.75-1.5M8 3.2V1.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#69c4d4" d="M4.55 5a.85.85 0 0 0-.85.85v7.65a.85.85 0 0 0 .85.85h6.8a.85.85 0 0 0 .85-.85V5.85a.85.85 0 0 0-.85-.85zM7 7h2.55L8.7 9.55h1.7L7 12.95l.85-2.55h-1.7z"/><path fill="#e0e0e0" d="M2 6.36v7.65a1.7 1.7 0 0 0 1.7 1.7h8.5a1.7 1.7 0 0 0 1.7-1.7V6.36h-.85v7.65a.85.85 0 0 1-.85.85H3.7a.85.85 0 0 1-.85-.85V6.36z"/><path fill="none" stroke="#69c4d4" stroke-linecap="round" stroke-width="1.25" d="m10.5 3.6.75-1.5M5.5 3.6l-.75-1.5M8 3.2V1.5"/></svg>
diff --git a/engine/editor/icons/InsertAfter.svg b/engine/editor/icons/InsertAfter.svg
index 4b002be1..2713c70d 100644
--- a/engine/editor/icons/InsertAfter.svg
+++ b/engine/editor/icons/InsertAfter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 1a1 1 0 0 0-.697 1.717l.283.283H9v2h2.586l-.283.283a1 1 0 1 0 1.414 1.414l2-2a1 1 0 0 0 0-1.414l-2-2A1 1 0 0 0 12 1zM3 1a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2z"/><path fill="#5fff97" d="M11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 1a1 1 0 0 0-.697 1.717l.283.283H9v2h2.586l-.283.283a1 1 0 1 0 1.414 1.414l2-2a1 1 0 0 0 0-1.414l-2-2A1 1 0 0 0 12 1zM3 1a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2z"/><path fill="#5fff97" d="M11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
diff --git a/engine/editor/icons/InsertBefore.svg b/engine/editor/icons/InsertBefore.svg
index f6a246dd..5bf458f3 100644
--- a/engine/editor/icons/InsertBefore.svg
+++ b/engine/editor/icons/InsertBefore.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 7a1 1 0 0 0 .697-1.717L4.414 5H7V3H4.414l.283-.283a1 1 0 1 0-1.414-1.414l-2 2a1 1 0 0 0 0 1.414l2 2A1 1 0 0 0 4 7zm9 0a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2z"/><path fill="#5fff97" d="M11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 7a1 1 0 0 0 .697-1.717L4.414 5H7V3H4.414l.283-.283a1 1 0 1 0-1.414-1.414l-2 2a1 1 0 0 0 0 1.414l2 2A1 1 0 0 0 4 7zm9 0a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2z"/><path fill="#5fff97" d="M11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
diff --git a/engine/editor/icons/Instance.svg b/engine/editor/icons/Instance.svg
index e61808ed..0b041079 100644
--- a/engine/editor/icons/Instance.svg
+++ b/engine/editor/icons/Instance.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9.545 3.627a1 1 0 0 1 2.84 2.818L9.98 8.85a4 4 0 1 0-2.83-2.83zm-5.238 6.664a1 1 0 0 0 1.414 1.414l6-6a1 1 0 0 0-1.414-1.414zm2.148 2.082a2 2 0 0 1-2.84-2.818L6.02 7.15a4 4 0 1 0 2.83 2.828z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9.545 3.627a1 1 0 0 1 2.84 2.818L9.98 8.85a4 4 0 1 0-2.83-2.83zm-5.238 6.664a1 1 0 0 0 1.414 1.414l6-6a1 1 0 0 0-1.414-1.414zm2.148 2.082a2 2 0 0 1-2.84-2.818L6.02 7.15a4 4 0 1 0 2.83 2.828z"/></svg>
diff --git a/engine/editor/icons/InstanceOptions.svg b/engine/editor/icons/InstanceOptions.svg
index 91142dc0..03065afc 100644
--- a/engine/editor/icons/InstanceOptions.svg
+++ b/engine/editor/icons/InstanceOptions.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 7v6a2 2 0 0 0 2 2h12V7zm4 2h6l-3 4zM.711 4 1 5.98l2.244-.328-.818-1.902L.711 4zm3.694-.539.818 1.902 1.979-.289-.818-1.901zm3.958-.577.818 1.902 1.98-.29-.82-1.9zm3.958-.578.818 1.902 1.714-.25-.288-1.979-2.244.327z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 7v6a2 2 0 0 0 2 2h12V7zm4 2h6l-3 4zM.711 4 1 5.98l2.244-.328-.818-1.902L.711 4zm3.694-.539.818 1.902 1.979-.289-.818-1.901zm3.958-.577.818 1.902 1.98-.29-.82-1.9zm3.958-.578.818 1.902 1.714-.25-.288-1.979-2.244.327z"/></svg>
diff --git a/engine/editor/icons/InterpCubic.svg b/engine/editor/icons/InterpCubic.svg
index ba0b5db0..304da2fb 100644
--- a/engine/editor/icons/InterpCubic.svg
+++ b/engine/editor/icons/InterpCubic.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-width="2" d="M2 6c5 0 3-4 6-4s1 4 6 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-width="2" d="M2 6c5 0 3-4 6-4s1 4 6 4"/></svg>
diff --git a/engine/editor/icons/InterpCubicAngle.svg b/engine/editor/icons/InterpCubicAngle.svg
index b3dfdb83..aeeb1035 100644
--- a/engine/editor/icons/InterpCubicAngle.svg
+++ b/engine/editor/icons/InterpCubicAngle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><g fill="none" stroke="#5fff95" stroke-linecap="round"><path stroke-width="2" d="m2 6c5 0 3-4 6-4s1 4 6 4"/><circle cx="14" cy="2" r="1.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><g fill="none" stroke="#5fff95" stroke-linecap="round"><path stroke-width="2" d="m2 6c5 0 3-4 6-4s1 4 6 4"/><circle cx="14" cy="2" r="1.5"/></g></svg>
diff --git a/engine/editor/icons/InterpLinear.svg b/engine/editor/icons/InterpLinear.svg
index ee3aba2c..c1a9bdb6 100644
--- a/engine/editor/icons/InterpLinear.svg
+++ b/engine/editor/icons/InterpLinear.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#ffca5f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 6 6-4 6 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#ffca5f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 6 6-4 6 4"/></svg>
diff --git a/engine/editor/icons/InterpLinearAngle.svg b/engine/editor/icons/InterpLinearAngle.svg
index 3bbf94a5..ff48db1b 100644
--- a/engine/editor/icons/InterpLinearAngle.svg
+++ b/engine/editor/icons/InterpLinearAngle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><g fill="none" stroke="#fd995f" stroke-linecap="round" stroke-linejoin="round"><path stroke-width="2" d="m2 6 6-4 6 4"/><circle cx="14" cy="2" r="1.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><g fill="none" stroke="#fd995f" stroke-linecap="round" stroke-linejoin="round"><path stroke-width="2" d="m2 6 6-4 6 4"/><circle cx="14" cy="2" r="1.5"/></g></svg>
diff --git a/engine/editor/icons/InterpRaw.svg b/engine/editor/icons/InterpRaw.svg
index d82fdbe8..8eda9fc9 100644
--- a/engine/editor/icons/InterpRaw.svg
+++ b/engine/editor/icons/InterpRaw.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 6h3V2h6v4h3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 6h3V2h6v4h3"/></svg>
diff --git a/engine/editor/icons/InterpWrapClamp.svg b/engine/editor/icons/InterpWrapClamp.svg
index 1adcc266..e792261c 100644
--- a/engine/editor/icons/InterpWrapClamp.svg
+++ b/engine/editor/icons/InterpWrapClamp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#fc7f7f" d="M1 1v6h2V1zm2 3.014a1 1 0 0 0 .293.693l2 2a1 1 0 0 0 1.414-1.414L6.414 5h3.172l-.293.293a1 1 0 0 0 1.414 1.414l2-2a1 1 0 0 0 0-1.414l-2-2a1 1 0 0 0-1.414 1.414L9.586 3H6.414l.293-.293a1 1 0 0 0-1.414-1.414l-2 2a1 1 0 0 0-.293.72zm10-3v6h2v-6h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#fc7f7f" d="M1 1v6h2V1zm2 3.014a1 1 0 0 0 .293.693l2 2a1 1 0 0 0 1.414-1.414L6.414 5h3.172l-.293.293a1 1 0 0 0 1.414 1.414l2-2a1 1 0 0 0 0-1.414l-2-2a1 1 0 0 0-1.414 1.414L9.586 3H6.414l.293-.293a1 1 0 0 0-1.414-1.414l-2 2a1 1 0 0 0-.293.72zm10-3v6h2v-6h-2z"/></svg>
diff --git a/engine/editor/icons/InterpWrapLoop.svg b/engine/editor/icons/InterpWrapLoop.svg
index 97367541..d33f44dc 100644
--- a/engine/editor/icons/InterpWrapLoop.svg
+++ b/engine/editor/icons/InterpWrapLoop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#c38ef1" d="M9 0 6 2l3 2V3h3a1 1 0 0 1 0 2v2a3 3 0 0 0 0-6H9zM4 1a3 3 0 0 0 0 6h3v1l3-2-3-2v1H4a1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#c38ef1" d="M9 0 6 2l3 2V3h3a1 1 0 0 1 0 2v2a3 3 0 0 0 0-6H9zM4 1a3 3 0 0 0 0 6h3v1l3-2-3-2v1H4a1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/ItemList.svg b/engine/editor/icons/ItemList.svg
index aefe7342..093df224 100644
--- a/engine/editor/icons/ItemList.svg
+++ b/engine/editor/icons/ItemList.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm1 1v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM4 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm-6 3v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm1 1v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM4 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm-6 3v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/JoyAxis.svg b/engine/editor/icons/JoyAxis.svg
index 665b2c21..86742bd9 100644
--- a/engine/editor/icons/JoyAxis.svg
+++ b/engine/editor/icons/JoyAxis.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12V1zm4 2h2a1 1 0 0 1 1 1v2h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1v-2H4a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h2V4a1 1 0 0 1 1-1z"/><circle cx="8" cy="8" r="1.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12V1zm4 2h2a1 1 0 0 1 1 1v2h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2v2a1 1 0 0 1-1 1H7a1 1 0 0 1-1-1v-2H4a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h2V4a1 1 0 0 1 1-1z"/><circle cx="8" cy="8" r="1.5"/></g></svg>
diff --git a/engine/editor/icons/JoyButton.svg b/engine/editor/icons/JoyButton.svg
index e6924802..9d21e9aa 100644
--- a/engine/editor/icons/JoyButton.svg
+++ b/engine/editor/icons/JoyButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm7 1a2 2 0 0 1 0 4 2 2 0 0 1 0-4zM4 6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm8 0a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-4 4a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm7 1a2 2 0 0 1 0 4 2 2 0 0 1 0-4zM4 6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm8 0a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-4 4a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
diff --git a/engine/editor/icons/Joypad.svg b/engine/editor/icons/Joypad.svg
index 6d24dfb2..7c652133 100644
--- a/engine/editor/icons/Joypad.svg
+++ b/engine/editor/icons/Joypad.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm2 2h2v2h2v2H5v2H3V9H1V7h2zm10.5 0a1.5 1.5 0 0 1 0 3 1.5 1.5 0 0 1 0-3zm-3 3a1.5 1.5 0 0 1 0 3 1.5 1.5 0 0 1 0-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm2 2h2v2h2v2H5v2H3V9H1V7h2zm10.5 0a1.5 1.5 0 0 1 0 3 1.5 1.5 0 0 1 0-3zm-3 3a1.5 1.5 0 0 1 0 3 1.5 1.5 0 0 1 0-3z"/></svg>
diff --git a/engine/editor/icons/KeepAspect.svg b/engine/editor/icons/KeepAspect.svg
index f178a2aa..0fe2d754 100644
--- a/engine/editor/icons/KeepAspect.svg
+++ b/engine/editor/icons/KeepAspect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-miterlimit="0"><path d="m10.875 3.1593h2.7749v2.9127" transform="matrix(1.1315 0 0 1.1398 -.914 -1.888)"/><path d="m4.9883 14.191h-2.7749v-2.9127" transform="matrix(1.1315 0 0 1.1398 -1.035 -1.888)"/></g><path fill="#e0e0e0" d="m11.509 10.223-1.1866 1.1424 2.0978 2.0196-1.5046 1.4485h4.1955v-4.0392l-1.5046 1.4485-2.0978-2.0196zm-10.592-9.0557v4.0897l1.5233-1.4666 2.124 2.0448 1.2014-1.1566-2.124-2.0448 1.5233-1.4666h-4.2479z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-miterlimit="0"><path d="m10.875 3.1593h2.7749v2.9127" transform="matrix(1.1315 0 0 1.1398 -.914 -1.888)"/><path d="m4.9883 14.191h-2.7749v-2.9127" transform="matrix(1.1315 0 0 1.1398 -1.035 -1.888)"/></g><path fill="#e0e0e0" d="m11.509 10.223-1.1866 1.1424 2.0978 2.0196-1.5046 1.4485h4.1955v-4.0392l-1.5046 1.4485-2.0978-2.0196zm-10.592-9.0557v4.0897l1.5233-1.4666 2.124 2.0448 1.2014-1.1566-2.124-2.0448 1.5233-1.4666h-4.2479z"/></svg>
diff --git a/engine/editor/icons/Key.svg b/engine/editor/icons/Key.svg
index 72d4dd34..c157f25e 100644
--- a/engine/editor/icons/Key.svg
+++ b/engine/editor/icons/Key.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 7v2h1v2h3V9h2.133a4 4 0 1 0 0-2zm10-1a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 7v2h1v2h3V9h2.133a4 4 0 1 0 0-2zm10-1a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
diff --git a/engine/editor/icons/KeyAnimation.svg b/engine/editor/icons/KeyAnimation.svg
index 6d3d5496..36a0b7c7 100644
--- a/engine/editor/icons/KeyAnimation.svg
+++ b/engine/editor/icons/KeyAnimation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#a448f0" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#a448f0" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyAudio.svg b/engine/editor/icons/KeyAudio.svg
index 012032f1..aff003c9 100644
--- a/engine/editor/icons/KeyAudio.svg
+++ b/engine/editor/icons/KeyAudio.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#eae440" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#eae440" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyBezier.svg b/engine/editor/icons/KeyBezier.svg
index 2ee075a8..b72903fd 100644
--- a/engine/editor/icons/KeyBezier.svg
+++ b/engine/editor/icons/KeyBezier.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.1" height="6.1" x="1.95" y="1.95" fill="#2877f6" ry=".763" transform="rotate(-45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.1" height="6.1" x="1.95" y="1.95" fill="#2877f6" ry=".763" transform="rotate(-45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyBezierHandle.svg b/engine/editor/icons/KeyBezierHandle.svg
index 09a9a1ee..51099456 100644
--- a/engine/editor/icons/KeyBezierHandle.svg
+++ b/engine/editor/icons/KeyBezierHandle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#e0e0e0" d="M7.762 3.434a.8.8 45 0 1 0 1.132L4.566 7.762a.8.8 45 0 1-1.132 0L.238 4.566a.8.8 45 0 1 0-1.132L3.434.238a.8.8 45 0 1 1.132 0zM4.354.974a.5.5 45 0 0-.708 0L.974 3.646a.5.5 45 0 0 0 .708l2.672 2.672a.5.5 45 0 0 .708 0l2.672-2.672a.5.5 45 0 0 0-.708z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#e0e0e0" d="M7.762 3.434a.8.8 45 0 1 0 1.132L4.566 7.762a.8.8 45 0 1-1.132 0L.238 4.566a.8.8 45 0 1 0-1.132L3.434.238a.8.8 45 0 1 1.132 0zM4.354.974a.5.5 45 0 0-.708 0L.974 3.646a.5.5 45 0 0 0 .708l2.672 2.672a.5.5 45 0 0 .708 0l2.672-2.672a.5.5 45 0 0 0-.708z"/></svg>
diff --git a/engine/editor/icons/KeyBezierPoint.svg b/engine/editor/icons/KeyBezierPoint.svg
index 7fcafbf5..7f8ffea8 100644
--- a/engine/editor/icons/KeyBezierPoint.svg
+++ b/engine/editor/icons/KeyBezierPoint.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><rect width="4.96" height="4.96" x="1.52" y="1.52" fill="#e0e0e0" rx=".6" transform="rotate(45 4 4)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><rect width="4.96" height="4.96" x="1.52" y="1.52" fill="#e0e0e0" rx=".6" transform="rotate(45 4 4)"/></svg>
diff --git a/engine/editor/icons/KeyBezierSelected.svg b/engine/editor/icons/KeyBezierSelected.svg
index 62fd8a55..f4dfa35a 100644
--- a/engine/editor/icons/KeyBezierSelected.svg
+++ b/engine/editor/icons/KeyBezierSelected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><rect width="4.96" height="4.96" x="1.52" y="1.52" fill="#5fb2ff" ry=".6" transform="rotate(45 4 4)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><rect width="4.96" height="4.96" x="1.52" y="1.52" fill="#5fb2ff" ry=".6" transform="rotate(45 4 4)"/></svg>
diff --git a/engine/editor/icons/KeyBlendShape.svg b/engine/editor/icons/KeyBlendShape.svg
index 92cc7829..bf40b2dc 100644
--- a/engine/editor/icons/KeyBlendShape.svg
+++ b/engine/editor/icons/KeyBlendShape.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#5ad5c4" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#5ad5c4" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyCall.svg b/engine/editor/icons/KeyCall.svg
index 1466753f..2c02ef77 100644
--- a/engine/editor/icons/KeyCall.svg
+++ b/engine/editor/icons/KeyCall.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#3cf34e" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#3cf34e" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyEasedSelected.svg b/engine/editor/icons/KeyEasedSelected.svg
index a1d693de..14096ad5 100644
--- a/engine/editor/icons/KeyEasedSelected.svg
+++ b/engine/editor/icons/KeyEasedSelected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="10" height="10" fill="#5fb2ff" rx="1"/><rect width="5.6" height="5.6" x="2.1" y="2.1" fill="#003e7a" rx=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="10" height="10" fill="#5fb2ff" rx="1"/><rect width="5.6" height="5.6" x="2.1" y="2.1" fill="#003e7a" rx=".5"/></svg>
diff --git a/engine/editor/icons/KeyInvalid.svg b/engine/editor/icons/KeyInvalid.svg
index b580da77..31847b78 100644
--- a/engine/editor/icons/KeyInvalid.svg
+++ b/engine/editor/icons/KeyInvalid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="none" stroke="#ff5f5f" stroke-width="2" d="m1 1 6 6M1 7 7 1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="none" stroke="#ff5f5f" stroke-width="2" d="m1 1 6 6M1 7 7 1"/></svg>
diff --git a/engine/editor/icons/KeyNext.svg b/engine/editor/icons/KeyNext.svg
index 0c68b666..6a2201e5 100644
--- a/engine/editor/icons/KeyNext.svg
+++ b/engine/editor/icons/KeyNext.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m11 9v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/><path fill="#e0e0e0" d="m11 1a4 4 0 0 0 -3.8691 3h-6.1309v2h1v2h3v-2h2.1328a4 4 0 0 0 2.8672 2.8691v-.86914h3.6387a4 4 0 0 0 1.3613-3 4 4 0 0 0 -4-4zm0 2a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m11 9v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/><path fill="#e0e0e0" d="m11 1a4 4 0 0 0 -3.8691 3h-6.1309v2h1v2h3v-2h2.1328a4 4 0 0 0 2.8672 2.8691v-.86914h3.6387a4 4 0 0 0 1.3613-3 4 4 0 0 0 -4-4zm0 2a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2z"/></svg>
diff --git a/engine/editor/icons/KeyPosition.svg b/engine/editor/icons/KeyPosition.svg
index 6b22b83b..0bd84397 100644
--- a/engine/editor/icons/KeyPosition.svg
+++ b/engine/editor/icons/KeyPosition.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.226 3.46a.76.76 0 0 0 0 1.078L7.46 7.775a.76.76 0 0 0 1.078 0l3.236-3.236a.76.76 0 0 0 0-1.078L8.54.225a.76.76 0 0 0-1.08 0zM8 9a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm5-2a1 1 0 0 0 0 4h-2v2h2a1 1 0 0 0 0-4h2V9zM0 9h2a2.7 2.7 0 0 1 0 5.4V16H0zm2 3.7a1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.226 3.46a.76.76 0 0 0 0 1.078L7.46 7.775a.76.76 0 0 0 1.078 0l3.236-3.236a.76.76 0 0 0 0-1.078L8.54.225a.76.76 0 0 0-1.08 0zM8 9a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm5-2a1 1 0 0 0 0 4h-2v2h2a1 1 0 0 0 0-4h2V9zM0 9h2a2.7 2.7 0 0 1 0 5.4V16H0zm2 3.7a1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/KeyRotation.svg b/engine/editor/icons/KeyRotation.svg
index f125d35e..2994c544 100644
--- a/engine/editor/icons/KeyRotation.svg
+++ b/engine/editor/icons/KeyRotation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.226 3.46a.76.76 0 0 0 0 1.078L7.46 7.775a.76.76 0 0 0 1.078 0l3.236-3.236a.76.76 0 0 0 0-1.078L8.54.225a.76.76 0 0 0-1.08 0zM11 7v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1-1-1v-1h2V9h-2V7zm0 5a3 3 0 0 0-6 0 3 3 0 0 0 6 0zM4 9a3 3 0 0 0-3 3v3h2v-3a1 1 0 0 1 1-1h1V9zm4 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.226 3.46a.76.76 0 0 0 0 1.078L7.46 7.775a.76.76 0 0 0 1.078 0l3.236-3.236a.76.76 0 0 0 0-1.078L8.54.225a.76.76 0 0 0-1.08 0zM11 7v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1-1-1v-1h2V9h-2V7zm0 5a3 3 0 0 0-6 0 3 3 0 0 0 6 0zM4 9a3 3 0 0 0-3 3v3h2v-3a1 1 0 0 1 1-1h1V9zm4 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/KeyScale.svg b/engine/editor/icons/KeyScale.svg
index 6acb36a5..cb630619 100644
--- a/engine/editor/icons/KeyScale.svg
+++ b/engine/editor/icons/KeyScale.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.226 3.46a.76.76 0 0 0 0 1.078L7.46 7.775a.76.76 0 0 0 1.078 0l3.236-3.236a.76.76 0 0 0 0-1.078L8.54.225a.76.76 0 0 0-1.08 0zM11 7v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1-1-1V7zM3 9a2 2 0 1 0 0 4H1v2h2a2 2 0 1 0 0-4h2V9zm6 0a3 3 0 1 0 0 6h1v-2H9a1 1 0 0 1 0-2h1V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.226 3.46a.76.76 0 0 0 0 1.078L7.46 7.775a.76.76 0 0 0 1.078 0l3.236-3.236a.76.76 0 0 0 0-1.078L8.54.225a.76.76 0 0 0-1.08 0zM11 7v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1-1-1V7zM3 9a2 2 0 1 0 0 4H1v2h2a2 2 0 1 0 0-4h2V9zm6 0a3 3 0 1 0 0 6h1v-2H9a1 1 0 0 1 0-2h1V9z"/></svg>
diff --git a/engine/editor/icons/KeySelected.svg b/engine/editor/icons/KeySelected.svg
index bab2e9a7..180f1e0f 100644
--- a/engine/editor/icons/KeySelected.svg
+++ b/engine/editor/icons/KeySelected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="7.5" height="7.5" x="1.25" y="1.25" fill="#5fb2ff" ry="1" transform="rotate(45 5 5)"/><rect width="4.2" height="4.2" x="2.9" y="2.9" fill="#003e7a" ry=".5" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="7.5" height="7.5" x="1.25" y="1.25" fill="#5fb2ff" ry="1" transform="rotate(45 5 5)"/><rect width="4.2" height="4.2" x="2.9" y="2.9" fill="#003e7a" ry=".5" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyTrackBlendShape.svg b/engine/editor/icons/KeyTrackBlendShape.svg
index c5a93201..e4e5adde 100644
--- a/engine/editor/icons/KeyTrackBlendShape.svg
+++ b/engine/editor/icons/KeyTrackBlendShape.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><path fill="#5ad5c4" d="M4.523 1.134A3.909 3.909 0 0 0 .656 5.033a3.909 3.909 0 0 0 3.117 3.816l.18-1.27a2.607 2.607 0 0 1-2.018-2.546 2.608 2.608 0 0 1 2.54-2.616h.2l.18-1.28zM6.2 1.15 6 2.45h1.35a.1.1 0 0 1 .1.1v5a.1.1 0 0 1-.1.1H5.3l-.2 1.3h2.25a1.4 1.4 0 0 0 1.4-1.4v-5a1.4 1.4 0 0 0-1.4-1.4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><path fill="#5ad5c4" d="M4.523 1.134A3.909 3.909 0 0 0 .656 5.033a3.909 3.909 0 0 0 3.117 3.816l.18-1.27a2.607 2.607 0 0 1-2.018-2.546 2.608 2.608 0 0 1 2.54-2.616h.2l.18-1.28zM6.2 1.15 6 2.45h1.35a.1.1 0 0 1 .1.1v5a.1.1 0 0 1-.1.1H5.3l-.2 1.3h2.25a1.4 1.4 0 0 0 1.4-1.4v-5a1.4 1.4 0 0 0-1.4-1.4z"/></svg>
diff --git a/engine/editor/icons/KeyTrackPosition.svg b/engine/editor/icons/KeyTrackPosition.svg
index ba6efd29..d34f96c3 100644
--- a/engine/editor/icons/KeyTrackPosition.svg
+++ b/engine/editor/icons/KeyTrackPosition.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><g fill="#ea7940"><circle cx="5" cy="5" r="1.25"/><path d="M5 .625a.625.625 0 0 0-.432.182l-1.25 1.25.884.884.808-.808.808.808.884-.884-1.25-1.25A.625.625 0 0 0 5 .625zM2.068 3.307l-1.25 1.25a.625.625 0 0 0 0 .884l1.25 1.25.884-.884-.808-.808.808-.808-.884-.884zm5.884 0-.884.884.808.808-.808.808.884.883 1.25-1.25a.625.625 0 0 0 0-.883l-1.25-1.25zm-3.75 3.75-.884.884 1.25 1.25a.625.625 0 0 0 .884 0l1.25-1.25-.884-.884-.808.808-.808-.808z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><g fill="#ea7940"><circle cx="5" cy="5" r="1.25"/><path d="M5 .625a.625.625 0 0 0-.432.182l-1.25 1.25.884.884.808-.808.808.808.884-.884-1.25-1.25A.625.625 0 0 0 5 .625zM2.068 3.307l-1.25 1.25a.625.625 0 0 0 0 .884l1.25 1.25.884-.884-.808-.808.808-.808-.884-.884zm5.884 0-.884.884.808.808-.808.808.884.883 1.25-1.25a.625.625 0 0 0 0-.883l-1.25-1.25zm-3.75 3.75-.884.884 1.25 1.25a.625.625 0 0 0 .884 0l1.25-1.25-.884-.884-.808.808-.808-.808z"/></g></svg>
diff --git a/engine/editor/icons/KeyTrackRotation.svg b/engine/editor/icons/KeyTrackRotation.svg
index b940f0ee..783a44e9 100644
--- a/engine/editor/icons/KeyTrackRotation.svg
+++ b/engine/editor/icons/KeyTrackRotation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><g fill="#ff2b88"><circle cx="5" cy="5" r="1.25"/><path d="M5 .625a4.375 4.375 0 0 0-3.114 7.499h-.692v1.25h2.5a.625.625 0 0 0 .607-.777l-.625-2.5-1.213.304.175.7a3.125 3.125 0 1 1 4.514.106l.885.885A4.375 4.375 0 0 0 5 .625z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><g fill="#ff2b88"><circle cx="5" cy="5" r="1.25"/><path d="M5 .625a4.375 4.375 0 0 0-3.114 7.499h-.692v1.25h2.5a.625.625 0 0 0 .607-.777l-.625-2.5-1.213.304.175.7a3.125 3.125 0 1 1 4.514.106l.885.885A4.375 4.375 0 0 0 5 .625z"/></g></svg>
diff --git a/engine/editor/icons/KeyTrackScale.svg b/engine/editor/icons/KeyTrackScale.svg
index 7f339edf..63c86fa2 100644
--- a/engine/editor/icons/KeyTrackScale.svg
+++ b/engine/editor/icons/KeyTrackScale.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><g fill="#eac840"><circle cx="5" cy="5" r="1.25"/><path d="M5.625.625a.625.625 0 0 0 0 1.25h1.616l-.808.808.884.884.808-.808v1.616a.625.625 0 0 0 1.25 0V1.25A.625.625 0 0 0 8.75.625zm-3.75 5a.625.625 0 0 0-1.25 0V8.75a.625.625 0 0 0 .625.625h3.125a.625.625 0 0 0 0-1.25H2.759l.808-.808-.884-.884-.808.808V5.625z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><g fill="#eac840"><circle cx="5" cy="5" r="1.25"/><path d="M5.625.625a.625.625 0 0 0 0 1.25h1.616l-.808.808.884.884.808-.808v1.616a.625.625 0 0 0 1.25 0V1.25A.625.625 0 0 0 8.75.625zm-3.75 5a.625.625 0 0 0-1.25 0V8.75a.625.625 0 0 0 .625.625h3.125a.625.625 0 0 0 0-1.25H2.759l.808-.808-.884-.884-.808.808V5.625z"/></g></svg>
diff --git a/engine/editor/icons/KeyValue.svg b/engine/editor/icons/KeyValue.svg
index 89ffbfe3..96053e14 100644
--- a/engine/editor/icons/KeyValue.svg
+++ b/engine/editor/icons/KeyValue.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#e0e0e0" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#e0e0e0" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyValueEased.svg b/engine/editor/icons/KeyValueEased.svg
index 129b6a4a..42e41f3e 100644
--- a/engine/editor/icons/KeyValueEased.svg
+++ b/engine/editor/icons/KeyValueEased.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="8" height="8" x="1" y="1" fill="#e0e0e0" rx="1" ry="1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="8" height="8" x="1" y="1" fill="#e0e0e0" rx="1" ry="1"/></svg>
diff --git a/engine/editor/icons/KeyXPosition.svg b/engine/editor/icons/KeyXPosition.svg
index 933ca62f..6a4cc8dd 100644
--- a/engine/editor/icons/KeyXPosition.svg
+++ b/engine/editor/icons/KeyXPosition.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#ea7940" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#ea7940" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyXRotation.svg b/engine/editor/icons/KeyXRotation.svg
index dffea999..c1b439ad 100644
--- a/engine/editor/icons/KeyXRotation.svg
+++ b/engine/editor/icons/KeyXRotation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#ff2b88" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#ff2b88" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/KeyXScale.svg b/engine/editor/icons/KeyXScale.svg
index e41d77f2..106bdde1 100644
--- a/engine/editor/icons/KeyXScale.svg
+++ b/engine/editor/icons/KeyXScale.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#eac840" ry=".75" transform="rotate(45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.2" height="6.2" x="1.9" y="1.9" fill="#eac840" ry=".75" transform="rotate(45 5 5)"/></svg>
diff --git a/engine/editor/icons/Keyboard.svg b/engine/editor/icons/Keyboard.svg
index 1be2ab54..4a0e6f64 100644
--- a/engine/editor/icons/Keyboard.svg
+++ b/engine/editor/icons/Keyboard.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6.584 5.135 6.17 4.059l-.412 1.076h.826zm3.203 2.976a.95 1.06 0 0 0 0 2.14.95 1.06 0 0 0 0-2.14zM4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 .995 1h8a1 1 0 0 0 1-1V3A1 1 0 0 0 12 2.007H4Zm1.475.646H6.89l1.865 4.27H7.268l-.286-.744H5.36l-.287.744H3.61l1.866-4.27Zm2.939 8.401a2.42 2.24 0 1 1 2.41.168c.296.465.837-.109 1.06-.007l.544.642c-.64.756-1.883.677-2.605.084-.394-.448-.866-.673-1.409-.887ZM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6.584 5.135 6.17 4.059l-.412 1.076h.826zm3.203 2.976a.95 1.06 0 0 0 0 2.14.95 1.06 0 0 0 0-2.14zM4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 .995 1h8a1 1 0 0 0 1-1V3A1 1 0 0 0 12 2.007H4Zm1.475.646H6.89l1.865 4.27H7.268l-.286-.744H5.36l-.287.744H3.61l1.866-4.27Zm2.939 8.401a2.42 2.24 0 1 1 2.41.168c.296.465.837-.109 1.06-.007l.544.642c-.64.756-1.883.677-2.605.084-.394-.448-.866-.673-1.409-.887ZM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Z"/></svg>
diff --git a/engine/editor/icons/KeyboardError.svg b/engine/editor/icons/KeyboardError.svg
index 72f647b3..bc2ed119 100644
--- a/engine/editor/icons/KeyboardError.svg
+++ b/engine/editor/icons/KeyboardError.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H4Zm4.223 1.262c1.06.005 2.29.257 2.92 1.197.532.862.275 2.057-.484 2.703-.346.382-.862.629-1.075 1.117.055.345-.33.172-.537.213H7.148c-.037-.749.503-1.335 1.026-1.796.406-.253.744-1.002.129-1.22-.626-.25-1.374.117-1.645.715l-2.08-1.039c.599-1.147 1.868-1.818 3.136-1.872.17-.013.339-.018.509-.018Zm.127 5.697c.798-.057 1.616.616 1.54 1.45-.023.81-.841 1.413-1.623 1.328-.833.022-1.6-.771-1.443-1.613.097-.721.83-1.195 1.526-1.165zM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1H4Zm4.223 1.262c1.06.005 2.29.257 2.92 1.197.532.862.275 2.057-.484 2.703-.346.382-.862.629-1.075 1.117.055.345-.33.172-.537.213H7.148c-.037-.749.503-1.335 1.026-1.796.406-.253.744-1.002.129-1.22-.626-.25-1.374.117-1.645.715l-2.08-1.039c.599-1.147 1.868-1.818 3.136-1.872.17-.013.339-.018.509-.018Zm.127 5.697c.798-.057 1.616.616 1.54 1.45-.023.81-.841 1.413-1.623 1.328-.833.022-1.6-.771-1.443-1.613.097-.721.83-1.195 1.526-1.165zM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Z"/></svg>
diff --git a/engine/editor/icons/KeyboardLabel.svg b/engine/editor/icons/KeyboardLabel.svg
index 9500b1c0..83303a54 100644
--- a/engine/editor/icons/KeyboardLabel.svg
+++ b/engine/editor/icons/KeyboardLabel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1.977a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1zm5.8 2 .58.58-.58.58-.58-.58zm-.6 1 .6.6-.6.6-.6-.6zm1.2 0 .6.6-.6.6-.6-.6zm.717 1.436h1.06c.053.217.093.428.122.63.028.201.043.395.043.58a2.363 2.363 0 0 1-.133.724 1.425 1.425 0 0 1-.31.515c-.249.265-.598.399-1.05.399-.331 0-.594-.08-.785-.235a1.091 1.091 0 0 1-.236-.275c-.063.1-.14.19-.236.265-.206.163-.467.245-.787.245-.252 0-.457-.057-.614-.166a2.75 2.75 0 0 1-.095.42 1.936 1.936 0 0 1-.403.722c-.2.22-.452.383-.756.49-.303.11-.654.166-1.052.166-.466 0-.865-.089-1.2-.265a1.817 1.817 0 0 1-.765-.752c-.18-.327-.27-.715-.27-1.164 0-.256.027-.525.082-.809.055-.284.126-.545.21-.781h1.001c-.062.232-.112.46-.15.684a3.87 3.87 0 0 0-.053.613c0 .37.1.643.3.82.204.177.523.264.96.264.222 0 .425-.03.61-.092a.97.97 0 0 0 .439-.299.803.803 0 0 0 .166-.521 5.463 5.463 0 0 0-.051-.725 11.61 11.61 0 0 0-.068-.482A26.51 26.51 0 0 0 7 6.778h1.135l.043.276c.047.32.123.532.228.634.105.1.24.15.402.15.165 0 .284-.04.358-.124.076-.086.115-.224.115-.412v-.524h1.027v.524c0 .203.032.351.096.447.065.095.202.142.412.142a.637.637 0 0 0 .33-.078c.089-.052.133-.15.133-.297 0-.128-.019-.295-.054-.498zM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1.977a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-9a1 1 0 0 0-1-1zm5.8 2 .58.58-.58.58-.58-.58zm-.6 1 .6.6-.6.6-.6-.6zm1.2 0 .6.6-.6.6-.6-.6zm.717 1.436h1.06c.053.217.093.428.122.63.028.201.043.395.043.58a2.363 2.363 0 0 1-.133.724 1.425 1.425 0 0 1-.31.515c-.249.265-.598.399-1.05.399-.331 0-.594-.08-.785-.235a1.091 1.091 0 0 1-.236-.275c-.063.1-.14.19-.236.265-.206.163-.467.245-.787.245-.252 0-.457-.057-.614-.166a2.75 2.75 0 0 1-.095.42 1.936 1.936 0 0 1-.403.722c-.2.22-.452.383-.756.49-.303.11-.654.166-1.052.166-.466 0-.865-.089-1.2-.265a1.817 1.817 0 0 1-.765-.752c-.18-.327-.27-.715-.27-1.164 0-.256.027-.525.082-.809.055-.284.126-.545.21-.781h1.001c-.062.232-.112.46-.15.684a3.87 3.87 0 0 0-.053.613c0 .37.1.643.3.82.204.177.523.264.96.264.222 0 .425-.03.61-.092a.97.97 0 0 0 .439-.299.803.803 0 0 0 .166-.521 5.463 5.463 0 0 0-.051-.725 11.61 11.61 0 0 0-.068-.482A26.51 26.51 0 0 0 7 6.778h1.135l.043.276c.047.32.123.532.228.634.105.1.24.15.402.15.165 0 .284-.04.358-.124.076-.086.115-.224.115-.412v-.524h1.027v.524c0 .203.032.351.096.447.065.095.202.142.412.142a.637.637 0 0 0 .33-.078c.089-.052.133-.15.133-.297 0-.128-.019-.295-.054-.498zM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4z"/></svg>
diff --git a/engine/editor/icons/KeyboardPhysical.svg b/engine/editor/icons/KeyboardPhysical.svg
index a5e26f40..39f2ff29 100644
--- a/engine/editor/icons/KeyboardPhysical.svg
+++ b/engine/editor/icons/KeyboardPhysical.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1ZM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Zm5.762-.232h2.476l3.264 7.464H9.898l-.502-1.3H6.561l-.502 1.3H3.498Zm1.217 2.474L7.254 8.12h1.45z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1ZM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Zm5.762-.232h2.476l3.264 7.464H9.898l-.502-1.3H6.561l-.502 1.3H3.498Zm1.217 2.474L7.254 8.12h1.45z"/></svg>
diff --git a/engine/editor/icons/Label.svg b/engine/editor/icons/Label.svg
index fc879aa1..c00a1e66 100644
--- a/engine/editor/icons/Label.svg
+++ b/engine/editor/icons/Label.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M6 3a1 1 0 0 0-.707.293l-4 4a1 1 0 0 0 0 1.414l4 4A1 1 0 0 0 6 13h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H6zM5 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M6 3a1 1 0 0 0-.707.293l-4 4a1 1 0 0 0 0 1.414l4 4A1 1 0 0 0 6 13h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H6zM5 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/Label3D.svg b/engine/editor/icons/Label3D.svg
index 1980e2d2..32a6465b 100644
--- a/engine/editor/icons/Label3D.svg
+++ b/engine/editor/icons/Label3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 3a1 1 0 0 0-.707.293l-4 4a1 1 0 0 0 0 1.414l4 4A1 1 0 0 0 6 13h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H6zM5 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 3a1 1 0 0 0-.707.293l-4 4a1 1 0 0 0 0 1.414l4 4A1 1 0 0 0 6 13h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H6zM5 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/LabelSettings.svg b/engine/editor/icons/LabelSettings.svg
index 5dbf80cf..0ce9efa0 100644
--- a/engine/editor/icons/LabelSettings.svg
+++ b/engine/editor/icons/LabelSettings.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="#8eef97" d="M6 3a1 1 0 0 0-.707.293l-4 4a1 1 0 0 0 0 1.414l4 4A1 1 0 0 0 6 13h2.184C7.25 10.75 9.75 8.75 11.25 6.5a.85.85 0 0 1 1.5 0c1.5 2.25 2 2.5 2.25 3V4a1 1 0 0 0-1-1H6zM5 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/><path fill="url(#a)" d="M12 7c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="#8eef97" d="M6 3a1 1 0 0 0-.707.293l-4 4a1 1 0 0 0 0 1.414l4 4A1 1 0 0 0 6 13h2.184C7.25 10.75 9.75 8.75 11.25 6.5a.85.85 0 0 1 1.5 0c1.5 2.25 2 2.5 2.25 3V4a1 1 0 0 0-1-1H6zM5 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/><path fill="url(#a)" d="M12 7c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
diff --git a/engine/editor/icons/LightOccluder2D.svg b/engine/editor/icons/LightOccluder2D.svg
index 571fe38e..98333116 100644
--- a/engine/editor/icons/LightOccluder2D.svg
+++ b/engine/editor/icons/LightOccluder2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6 10.576V13h4v-2.42a5 5 0 1 0-4 0zM8 9a3 3 0 0 1 0-6zm-1 5v1h2v-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6 10.576V13h4v-2.42a5 5 0 1 0-4 0zM8 9a3 3 0 0 1 0-6zm-1 5v1h2v-1z"/></svg>
diff --git a/engine/editor/icons/LightmapGI.svg b/engine/editor/icons/LightmapGI.svg
index 51101d88..574b9bc2 100644
--- a/engine/editor/icons/LightmapGI.svg
+++ b/engine/editor/icons/LightmapGI.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m2 1v2h12v-2zm-1 3v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9zm2 1h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm-9 2h10v6h-10zm3 1v1h4v-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m2 1v2h12v-2zm-1 3v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9zm2 1h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm3 0h1v1h-1zm-9 2h10v6h-10zm3 1v1h4v-1z"/></svg>
diff --git a/engine/editor/icons/LightmapGIData.svg b/engine/editor/icons/LightmapGIData.svg
index beb731f6..f2ded15d 100644
--- a/engine/editor/icons/LightmapGIData.svg
+++ b/engine/editor/icons/LightmapGIData.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v2h2v-2zm3 0v2h2v-2zm4 0v2h6v-2zm-7 3v2h2v-2zm3 0v2h2v-2zm4 0v3h5v6h-5v2h5a2 2 0 0 0 2-2v-9zm1 1h1v1h-1zm3 0h1v1h-1zm-11 2v2h2v-2zm3 0v2h2v-2zm4 1v1h2v-1zm-7 2v2h2v-2zm3 0v2h2v-2zm-3 3v2h2v-2zm3 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v2h2v-2zm3 0v2h2v-2zm4 0v2h6v-2zm-7 3v2h2v-2zm3 0v2h2v-2zm4 0v3h5v6h-5v2h5a2 2 0 0 0 2-2v-9zm1 1h1v1h-1zm3 0h1v1h-1zm-11 2v2h2v-2zm3 0v2h2v-2zm4 1v1h2v-1zm-7 2v2h2v-2zm3 0v2h2v-2zm-3 3v2h2v-2zm3 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/LightmapProbe.svg b/engine/editor/icons/LightmapProbe.svg
index dea5c30d..f3fae439 100644
--- a/engine/editor/icons/LightmapProbe.svg
+++ b/engine/editor/icons/LightmapProbe.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M1 9h3V7H1zm2.05 2.535 1.415 1.414 1.414-1.414-1.414-1.414zm0-7.07 1.415 1.414 1.414-1.414L4.465 3.05zM5 8a3 3 0 0 0 6 0 3 3 0 0 0-6 0zm3 7A7 7 0 0 0 8 1v2.334a1 1 0 0 1 0 9.332z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M1 9h3V7H1zm2.05 2.535 1.415 1.414 1.414-1.414-1.414-1.414zm0-7.07 1.415 1.414 1.414-1.414L4.465 3.05zM5 8a3 3 0 0 0 6 0 3 3 0 0 0-6 0zm3 7A7 7 0 0 0 8 1v2.334a1 1 0 0 1 0 9.332z"/></svg>
diff --git a/engine/editor/icons/Line.svg b/engine/editor/icons/Line.svg
index 78efa4d0..014ae091 100644
--- a/engine/editor/icons/Line.svg
+++ b/engine/editor/icons/Line.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-width="2" d="m2 10 8-8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-width="2" d="m2 10 8-8"/></svg>
diff --git a/engine/editor/icons/Line2D.svg b/engine/editor/icons/Line2D.svg
index f8bdb449..6a0f312f 100644
--- a/engine/editor/icons/Line2D.svg
+++ b/engine/editor/icons/Line2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 9 3 4L8 3l3 6 3-2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#8da5f3" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 9 3 4L8 3l3 6 3-2"/></svg>
diff --git a/engine/editor/icons/LineEdit.svg b/engine/editor/icons/LineEdit.svg
index a0e3faea..e5887501 100644
--- a/engine/editor/icons/LineEdit.svg
+++ b/engine/editor/icons/LineEdit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M2 4v5h2V4zm-1 7a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M2 4v5h2V4zm-1 7a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2z"/></svg>
diff --git a/engine/editor/icons/LinkButton.svg b/engine/editor/icons/LinkButton.svg
index 31a1c7b4..7691b008 100644
--- a/engine/editor/icons/LinkButton.svg
+++ b/engine/editor/icons/LinkButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M6 3a5 5 0 0 0 0 10h1v-2H6a3 3 0 0 1 0-6h1V3zm3 0v2h1a3 3 0 0 1 0 6H9v2h1a5 5 0 0 0 0-10zM6 7a1 1 0 0 0 0 2h4a1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M6 3a5 5 0 0 0 0 10h1v-2H6a3 3 0 0 1 0-6h1V3zm3 0v2h1a3 3 0 0 1 0 6H9v2h1a5 5 0 0 0 0-10zM6 7a1 1 0 0 0 0 2h4a1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/LinkOverlay.svg b/engine/editor/icons/LinkOverlay.svg
index b263f94c..9bfb238f 100644
--- a/engine/editor/icons/LinkOverlay.svg
+++ b/engine/editor/icons/LinkOverlay.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path stroke="#fff" stroke-width=".6" d="M2.08 8.2v1.907h2.465l-4.02 4.02 1.347 1.349 4.021-4.021v2.465H7.8V9.153a.953.953 0 0 0-.953-.953z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path stroke="#fff" stroke-width=".6" d="M2.08 8.2v1.907h2.465l-4.02 4.02 1.347 1.349 4.021-4.021v2.465H7.8V9.153a.953.953 0 0 0-.953-.953z"/></svg>
diff --git a/engine/editor/icons/ListSelect.svg b/engine/editor/icons/ListSelect.svg
index f918e8db..45700e29 100644
--- a/engine/editor/icons/ListSelect.svg
+++ b/engine/editor/icons/ListSelect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v14h8.2578l-.82227-2h-5.4355v-2h4.6113l-.82227-2h-3.7891v-2h3.8867a1.5002 1.5002 0 0 1 1.0977-.49805v-.0019531a1.5002 1.5002 0 0 1 .58594.11133l.94531.38867h.48438v.19922l2 .82227v-7.0215h-11zm2 2h7v2h-7zm5 5 3.291 8 .94726-2.8203 1.8828 1.8828.94336-.94141-1.8848-1.8828 2.8203-.94726-8-3.291z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v14h8.2578l-.82227-2h-5.4355v-2h4.6113l-.82227-2h-3.7891v-2h3.8867a1.5002 1.5002 0 0 1 1.0977-.49805v-.0019531a1.5002 1.5002 0 0 1 .58594.11133l.94531.38867h.48438v.19922l2 .82227v-7.0215h-11zm2 2h7v2h-7zm5 5 3.291 8 .94726-2.8203 1.8828 1.8828.94336-.94141-1.8848-1.8828 2.8203-.94726-8-3.291z"/></svg>
diff --git a/engine/editor/icons/Load.svg b/engine/editor/icons/Load.svg
index 6f738a8a..f1ff65fc 100644
--- a/engine/editor/icons/Load.svg
+++ b/engine/editor/icons/Load.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9c1.105 0 1.818-.91 2-2l1-6a1 1 0 0 0-1-1H6c-.552 0-.909.455-1 1l-1 6c-.091.545-.448 1-1 1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1 1 1 0 0 0 1 1h5a1 1 0 0 0-1-1H7a2 2 0 0 0-2-2H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9c1.105 0 1.818-.91 2-2l1-6a1 1 0 0 0-1-1H6c-.552 0-.909.455-1 1l-1 6c-.091.545-.448 1-1 1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1 1 1 0 0 0 1 1h5a1 1 0 0 0-1-1H7a2 2 0 0 0-2-2H3z"/></svg>
diff --git a/engine/editor/icons/LocalVariable.svg b/engine/editor/icons/LocalVariable.svg
index 194a34d9..33aa1e74 100644
--- a/engine/editor/icons/LocalVariable.svg
+++ b/engine/editor/icons/LocalVariable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M9 5c-4 0-4 6 0 6h2v-6zm0 4c-1.3333 0-1.3333-2 0-2zM14 5c-1.6569 0-3 1.3431-3 3v3h2v-3c0-.55228.44772-1 1-1h1v-2z"/><path d="m1 5v6h2c1.6569 0 3-1.3431 3-3v-3h-2v3c0 0.55228-0.44772 1-1 1v-4z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M9 5c-4 0-4 6 0 6h2v-6zm0 4c-1.3333 0-1.3333-2 0-2zM14 5c-1.6569 0-3 1.3431-3 3v3h2v-3c0-.55228.44772-1 1-1h1v-2z"/><path d="m1 5v6h2c1.6569 0 3-1.3431 3-3v-3h-2v3c0 0.55228-0.44772 1-1 1v-4z"/></g></svg>
diff --git a/engine/editor/icons/Lock.svg b/engine/editor/icons/Lock.svg
index 2d17af34..382d7440 100644
--- a/engine/editor/icons/Lock.svg
+++ b/engine/editor/icons/Lock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 6A5 5 0 0 0 3 6v2H2v7h12V8h-1V6zM5 6a3 3 0 0 1 6 0v2H5zm2 4h2v3H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 6A5 5 0 0 0 3 6v2H2v7h12V8h-1V6zM5 6a3 3 0 0 1 6 0v2H5zm2 4h2v3H7z"/></svg>
diff --git a/engine/editor/icons/LockViewport.svg b/engine/editor/icons/LockViewport.svg
index b60f9c59..83e018af 100644
--- a/engine/editor/icons/LockViewport.svg
+++ b/engine/editor/icons/LockViewport.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".392" d="M2 6v1H1v9h14V7h-1V6A6 6 0 0 0 2 6zm8 0v1H6V6a1 1 0 0 1 4 0z"/><path fill="#e0e0e0" d="M3 6v2H2v7h12V8h-1V6A5 5 0 0 0 3 6zm8 0v2H5V6a3 3 0 0 1 6 0zm-4 4h2v3H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill-opacity=".392" d="M2 6v1H1v9h14V7h-1V6A6 6 0 0 0 2 6zm8 0v1H6V6a1 1 0 0 1 4 0z"/><path fill="#e0e0e0" d="M3 6v2H2v7h12V8h-1V6A5 5 0 0 0 3 6zm8 0v2H5V6a3 3 0 0 1 6 0zm-4 4h2v3H7z"/></svg>
diff --git a/engine/editor/icons/Logo.svg b/engine/editor/icons/Logo.svg
index 60757749..baf05dd3 100644
--- a/engine/editor/icons/Logo.svg
+++ b/engine/editor/icons/Logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="187" height="69"><path fill="#fff" d="M96.116 30.781c-1.847-.029-3.96.356-3.96.356v3.605h2.125l-.024 1.606q0 .893-1.767.894-1.767-.001-3.12-1.493-1.358-1.495-1.356-4.372 0-2.884 1.32-4.255 1.32-1.372 3.448-1.372a6.3 6.3 0 0 1 1.852.292q.96.291 1.287.546c.217.176.422.258.618.258q.29.002.94-.685.654-.687 1.169-2.074c.342-.929.514-1.64.514-2.145 0-.501-.011-.847-.034-1.029q-.72-.788-2.66-1.252-1.936-.464-4.338-.463-5.282 0-8.265 3.327-2.986 3.328-2.985 8.644 0 6.244 3.051 9.467 3.055 3.224 8.028 3.223 2.674 0 4.75-.463 2.075-.462 2.762-.943l.137-10.734c0-.623-1.646-.906-3.492-.938m17.018-5.01q-1.645 0-2.762 1.509-1.114 1.509-1.114 4.234 0 2.73 1.064 4.186 1.063 1.46 2.795 1.46t2.812-1.478q1.081-1.473 1.082-4.218c.001-2.745-.373-3.237-1.116-4.22q-1.114-1.473-2.761-1.473m-.017 18.074q-4.819 0-7.856-3.153-3.033-3.156-3.033-9.21 0-6.056 3.068-9.178 3.07-3.12 7.924-3.12 4.854-.002 7.837 3.072c1.991 2.045 2.985 5.146 2.985 9.294q0 6.224-3.053 9.263-3.053 3.032-7.872 3.032M133.71 26.01v10.26q0 .717.104.907.103.189.616.189 1.888 0 2.865-1.408.978-1.404.976-4.68-.001-3.278-1.01-4.27-1.013-.996-3.208-.998zm-6.585 15.917V21.348q-.001-.858.43-1.359.427-.496 1.114-.497h5.728q5.454.001 8.281 2.747 2.832 2.742 2.832 8.642 0 12.622-10.772 12.622h-5.864q-1.749.001-1.75-1.577m31.623-16.155q-1.648 0-2.763 1.509-1.113 1.509-1.113 4.234 0 2.73 1.063 4.186 1.062 1.46 2.795 1.46c1.733 0 2.093-.492 2.813-1.478q1.08-1.473 1.081-4.218c.001-2.745-.372-3.237-1.115-4.22q-1.114-1.473-2.761-1.473m-.018 18.074q-4.819 0-7.854-3.153-3.036-3.156-3.036-9.21 0-6.056 3.069-9.178 3.07-3.12 7.925-3.12 4.853-.002 7.837 3.072c1.99 2.045 2.984 5.146 2.984 9.294q0 6.224-3.053 9.263-3.053 3.032-7.872 3.032m23.773-.842c0 .454-1.13.685-3.395.685q-3.396-.001-3.397-.685v-17.22h-4.115q-.584.001-.823-1.58a11 11 0 0 1-.101-1.542q-.001-.787.1-1.543c.16-1.05.435-1.58.824-1.58h14.92q.584.002.825 1.58a11.6 11.6 0 0 1 0 3.086q-.242 1.58-.824 1.579h-4.014z"/><path fill="#e0e0e0" d="M88.866 57.973q-.284.585-1.048 1.069-.764.486-1.942.486-1.554.002-2.503-.987-.946-.983-.947-2.833v-3.073q0-1.808.895-2.776c.596-.64 1.395-.966 2.392-.966q1.462.002 2.265.764.8.765.837 2.128l-.013.04h-.796q-.041-1.042-.61-1.612-.568-.565-1.683-.566-1.128 0-1.782.765-.652.762-.651 2.215v3.091q0 1.507.702 2.3.701.785 1.894.785.873.001 1.398-.313.526-.312.732-.763v-2.692h-2.144v-.748h3.004zm3.95.789q.708.001 1.26-.406.55-.41.777-1.04v-1.661H93.49q-.87 0-1.393.493a1.6 1.6 0 0 0-.522 1.22q0 .616.327 1.006.327.389.915.388m2.165.62a20 20 0 0 1-.097-.652 4 4 0 0 1-.03-.518 3 3 0 0 1-.906.945q-.555.374-1.238.373-.952 0-1.47-.591-.517-.594-.518-1.603 0-1.07.751-1.707.753-.636 2.038-.636h1.342v-.943q-.001-.815-.41-1.28-.415-.457-1.152-.459-.687 0-1.133.441a1.46 1.46 0 0 0-.442 1.078l-.797-.007-.014-.042q-.033-.865.659-1.544.69-.678 1.77-.677 1.064 0 1.719.646.65.653.651 1.86v3.767q0 .412.037.795a5 5 0 0 0 .127.753zm3.415-7.698.072 1.191a2.46 2.46 0 0 1 .808-.989q.505-.345 1.186-.345.697 0 1.17.408.475.408.697 1.237.284-.766.805-1.207.524-.438 1.259-.438 1.01 0 1.566.818.557.819.557 2.518v4.485h-.857v-4.5q-.001-1.413-.384-1.987-.383-.573-1.093-.574-.745-.002-1.165.637-.417.639-.511 1.605v4.82h-.853v-4.497q0-1.381-.393-1.97a1.25 1.25 0 0 0-1.096-.59q-.674.001-1.083.409t-.585 1.119v5.528h-.853v-7.679zm12.414.61q-.801 0-1.317.73c-.516.73-.522 1.089-.536 1.805h3.542v-.328q0-.952-.446-1.58-.449-.628-1.243-.627m.12 7.218q-1.24 0-2.03-.933-.787-.931-.787-2.382V54.92q0-1.454.79-2.42.792-.96 1.907-.959 1.206 0 1.872.858.67.86.67 2.31v.842h-4.395v.639q0 1.115.532 1.856.534.741 1.442.74.631 0 1.09-.22a2.25 2.25 0 0 0 .783-.632l.349.604a2.5 2.5 0 0 1-.9.708q-.548.264-1.322.265m9.375-7.218q-.804 0-1.32.73-.512.73-.535 1.805h3.543V54.5q0-.952-.447-1.58-.446-.629-1.241-.627m.12 7.218q-1.243 0-2.03-.933-.79-.932-.79-2.382V54.92q.001-1.454.79-2.42.794-.96 1.91-.959 1.205 0 1.872.858.668.86.668 2.31v.842h-4.395v.639q0 1.115.535 1.856.53.741 1.44.74.632 0 1.088-.22a2.3 2.3 0 0 0 .787-.632l.347.604a2.5 2.5 0 0 1-.9.708q-.548.264-1.322.265m4.684-7.828.07 1.269q.306-.677.814-1.044a1.97 1.97 0 0 1 1.19-.368q1.028 0 1.576.763.552.764.551 2.374v4.684h-.858v-4.677q0-1.314-.384-1.845-.382-.534-1.113-.533-.655-.001-1.095.43-.441.426-.66 1.144v5.481h-.852v-7.678zm6.72 4.523q0 1.17.447 1.86.445.697 1.348.696.617.001 1.044-.335.424-.338.673-.935V53.69q-.24-.614-.655-.994-.415-.376-1.047-.377-.902 0-1.355.786-.456.79-.455 2.053zm-.86-1.05q0-1.631.66-2.62.659-.984 1.825-.984c.43 0 .81.105 1.132.316.324.207.592.51.807.895l.083-1.068h.723v7.686q0 1.475-.686 2.286c-.46.537-1.111.81-1.953.81q-.454-.001-.976-.14a4 4 0 0 1-.927-.365l.236-.748a2.9 2.9 0 0 0 .774.347 3 3 0 0 0 .879.124q.916 0 1.355-.587.44-.592.44-1.727v-.93a2.3 2.3 0 0 1-.802.795 2.15 2.15 0 0 1-1.1.276q-1.157 0-1.813-.906-.657-.905-.658-2.41zm8.12 4.226h-.862v-7.7h.862zm0-9.892h-.862v-1.213h.862zm2.782 2.193.07 1.269q.307-.677.813-1.044a2 2 0 0 1 1.19-.368q1.03 0 1.58.763.55.764.549 2.374v4.684h-.858v-4.677q0-1.314-.384-1.845-.383-.534-1.114-.533-.654-.001-1.093.43-.441.426-.66 1.144v5.481h-.853v-7.678zm8.499.61q-.804 0-1.317.73-.514.73-.537 1.805h3.543V54.5q0-.952-.446-1.58-.447-.629-1.243-.627m.122 7.218q-1.245 0-2.03-.933-.789-.932-.788-2.382V54.92q0-1.454.79-2.42.792-.96 1.906-.959 1.207 0 1.875.858.666.86.667 2.31v.842h-4.396v.639q.002 1.115.534 1.856.531.741 1.442.74.63 0 1.087-.22a2.25 2.25 0 0 0 .787-.632l.348.604a2.5 2.5 0 0 1-.9.708q-.548.264-1.322.265"/><g fill="#fefefe" transform="translate(-2.69 -2.69)scale(.0727)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(-2.69 -2.69)scale(.0727)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="187" height="69"><path fill="#fff" d="M96.116 30.781c-1.847-.029-3.96.356-3.96.356v3.605h2.125l-.024 1.606q0 .893-1.767.894-1.767-.001-3.12-1.493-1.358-1.495-1.356-4.372 0-2.884 1.32-4.255 1.32-1.372 3.448-1.372a6.3 6.3 0 0 1 1.852.292q.96.291 1.287.546c.217.176.422.258.618.258q.29.002.94-.685.654-.687 1.169-2.074c.342-.929.514-1.64.514-2.145 0-.501-.011-.847-.034-1.029q-.72-.788-2.66-1.252-1.936-.464-4.338-.463-5.282 0-8.265 3.327-2.986 3.328-2.985 8.644 0 6.244 3.051 9.467 3.055 3.224 8.028 3.223 2.674 0 4.75-.463 2.075-.462 2.762-.943l.137-10.734c0-.623-1.646-.906-3.492-.938m17.018-5.01q-1.645 0-2.762 1.509-1.114 1.509-1.114 4.234 0 2.73 1.064 4.186 1.063 1.46 2.795 1.46t2.812-1.478q1.081-1.473 1.082-4.218c.001-2.745-.373-3.237-1.116-4.22q-1.114-1.473-2.761-1.473m-.017 18.074q-4.819 0-7.856-3.153-3.033-3.156-3.033-9.21 0-6.056 3.068-9.178 3.07-3.12 7.924-3.12 4.854-.002 7.837 3.072c1.991 2.045 2.985 5.146 2.985 9.294q0 6.224-3.053 9.263-3.053 3.032-7.872 3.032M133.71 26.01v10.26q0 .717.104.907.103.189.616.189 1.888 0 2.865-1.408.978-1.404.976-4.68-.001-3.278-1.01-4.27-1.013-.996-3.208-.998zm-6.585 15.917V21.348q-.001-.858.43-1.359.427-.496 1.114-.497h5.728q5.454.001 8.281 2.747 2.832 2.742 2.832 8.642 0 12.622-10.772 12.622h-5.864q-1.749.001-1.75-1.577m31.623-16.155q-1.648 0-2.763 1.509-1.113 1.509-1.113 4.234 0 2.73 1.063 4.186 1.062 1.46 2.795 1.46c1.733 0 2.093-.492 2.813-1.478q1.08-1.473 1.081-4.218c.001-2.745-.372-3.237-1.115-4.22q-1.114-1.473-2.761-1.473m-.018 18.074q-4.819 0-7.854-3.153-3.036-3.156-3.036-9.21 0-6.056 3.069-9.178 3.07-3.12 7.925-3.12 4.853-.002 7.837 3.072c1.99 2.045 2.984 5.146 2.984 9.294q0 6.224-3.053 9.263-3.053 3.032-7.872 3.032m23.773-.842c0 .454-1.13.685-3.395.685q-3.396-.001-3.397-.685v-17.22h-4.115q-.584.001-.823-1.58a11 11 0 0 1-.101-1.542q-.001-.787.1-1.543c.16-1.05.435-1.58.824-1.58h14.92q.584.002.825 1.58a11.6 11.6 0 0 1 0 3.086q-.242 1.58-.824 1.579h-4.014z"/><path fill="#e0e0e0" d="M88.866 57.973q-.284.585-1.048 1.069-.764.486-1.942.486-1.554.002-2.503-.987-.946-.983-.947-2.833v-3.073q0-1.808.895-2.776c.596-.64 1.395-.966 2.392-.966q1.462.002 2.265.764.8.765.837 2.128l-.013.04h-.796q-.041-1.042-.61-1.612-.568-.565-1.683-.566-1.128 0-1.782.765-.652.762-.651 2.215v3.091q0 1.507.702 2.3.701.785 1.894.785.873.001 1.398-.313.526-.312.732-.763v-2.692h-2.144v-.748h3.004zm3.95.789q.708.001 1.26-.406.55-.41.777-1.04v-1.661H93.49q-.87 0-1.393.493a1.6 1.6 0 0 0-.522 1.22q0 .616.327 1.006.327.389.915.388m2.165.62a20 20 0 0 1-.097-.652 4 4 0 0 1-.03-.518 3 3 0 0 1-.906.945q-.555.374-1.238.373-.952 0-1.47-.591-.517-.594-.518-1.603 0-1.07.751-1.707.753-.636 2.038-.636h1.342v-.943q-.001-.815-.41-1.28-.415-.457-1.152-.459-.687 0-1.133.441a1.46 1.46 0 0 0-.442 1.078l-.797-.007-.014-.042q-.033-.865.659-1.544.69-.678 1.77-.677 1.064 0 1.719.646.65.653.651 1.86v3.767q0 .412.037.795a5 5 0 0 0 .127.753zm3.415-7.698.072 1.191a2.46 2.46 0 0 1 .808-.989q.505-.345 1.186-.345.697 0 1.17.408.475.408.697 1.237.284-.766.805-1.207.524-.438 1.259-.438 1.01 0 1.566.818.557.819.557 2.518v4.485h-.857v-4.5q-.001-1.413-.384-1.987-.383-.573-1.093-.574-.745-.002-1.165.637-.417.639-.511 1.605v4.82h-.853v-4.497q0-1.381-.393-1.97a1.25 1.25 0 0 0-1.096-.59q-.674.001-1.083.409t-.585 1.119v5.528h-.853v-7.679zm12.414.61q-.801 0-1.317.73c-.516.73-.522 1.089-.536 1.805h3.542v-.328q0-.952-.446-1.58-.449-.628-1.243-.627m.12 7.218q-1.24 0-2.03-.933-.787-.931-.787-2.382V54.92q0-1.454.79-2.42.792-.96 1.907-.959 1.206 0 1.872.858.67.86.67 2.31v.842h-4.395v.639q0 1.115.532 1.856.534.741 1.442.74.631 0 1.09-.22a2.25 2.25 0 0 0 .783-.632l.349.604a2.5 2.5 0 0 1-.9.708q-.548.264-1.322.265m9.375-7.218q-.804 0-1.32.73-.512.73-.535 1.805h3.543V54.5q0-.952-.447-1.58-.446-.629-1.241-.627m.12 7.218q-1.243 0-2.03-.933-.79-.932-.79-2.382V54.92q.001-1.454.79-2.42.794-.96 1.91-.959 1.205 0 1.872.858.668.86.668 2.31v.842h-4.395v.639q0 1.115.535 1.856.53.741 1.44.74.632 0 1.088-.22a2.3 2.3 0 0 0 .787-.632l.347.604a2.5 2.5 0 0 1-.9.708q-.548.264-1.322.265m4.684-7.828.07 1.269q.306-.677.814-1.044a1.97 1.97 0 0 1 1.19-.368q1.028 0 1.576.763.552.764.551 2.374v4.684h-.858v-4.677q0-1.314-.384-1.845-.382-.534-1.113-.533-.655-.001-1.095.43-.441.426-.66 1.144v5.481h-.852v-7.678zm6.72 4.523q0 1.17.447 1.86.445.697 1.348.696.617.001 1.044-.335.424-.338.673-.935V53.69q-.24-.614-.655-.994-.415-.376-1.047-.377-.902 0-1.355.786-.456.79-.455 2.053zm-.86-1.05q0-1.631.66-2.62.659-.984 1.825-.984c.43 0 .81.105 1.132.316.324.207.592.51.807.895l.083-1.068h.723v7.686q0 1.475-.686 2.286c-.46.537-1.111.81-1.953.81q-.454-.001-.976-.14a4 4 0 0 1-.927-.365l.236-.748a2.9 2.9 0 0 0 .774.347 3 3 0 0 0 .879.124q.916 0 1.355-.587.44-.592.44-1.727v-.93a2.3 2.3 0 0 1-.802.795 2.15 2.15 0 0 1-1.1.276q-1.157 0-1.813-.906-.657-.905-.658-2.41zm8.12 4.226h-.862v-7.7h.862zm0-9.892h-.862v-1.213h.862zm2.782 2.193.07 1.269q.307-.677.813-1.044a2 2 0 0 1 1.19-.368q1.03 0 1.58.763.55.764.549 2.374v4.684h-.858v-4.677q0-1.314-.384-1.845-.383-.534-1.114-.533-.654-.001-1.093.43-.441.426-.66 1.144v5.481h-.853v-7.678zm8.499.61q-.804 0-1.317.73-.514.73-.537 1.805h3.543V54.5q0-.952-.446-1.58-.447-.629-1.243-.627m.122 7.218q-1.245 0-2.03-.933-.789-.932-.788-2.382V54.92q0-1.454.79-2.42.792-.96 1.906-.959 1.207 0 1.875.858.666.86.667 2.31v.842h-4.396v.639q.002 1.115.534 1.856.531.741 1.442.74.63 0 1.087-.22a2.25 2.25 0 0 0 .787-.632l.348.604a2.5 2.5 0 0 1-.9.708q-.548.264-1.322.265"/><g fill="#fefefe" transform="translate(-2.69 -2.69)scale(.0727)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(-2.69 -2.69)scale(.0727)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/editor/icons/LookAtModifier3D.svg b/engine/editor/icons/LookAtModifier3D.svg
index 9315b297..4f293913 100644
--- a/engine/editor/icons/LookAtModifier3D.svg
+++ b/engine/editor/icons/LookAtModifier3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m5.742 11.508c.916-2.959 3.507-4.508 5.592-4.508.803 0 1.673.223 2.492.658.297-.182.563-.423.768-.731.754-1.134.446-2.665-.688-3.419-.309-.205-.66-.338-1.026-.389-.188-1.349-1.433-2.291-2.782-2.103s-2.29 1.433-2.103 2.782c.051.367.184.717.389 1.026l-3.56 3.56c-1.134-.754-2.665-.446-3.419.688s-.446 2.664.688 3.419c.308.205.659.338 1.026.389.188 1.349 1.433 2.29 2.782 2.103.342-.048.658-.164.936-.333-.467-.612-.856-1.337-1.102-2.206-.085-.3-.085-.617.007-.936z"/><path d="m11.334 8c-1.704 0-3.861 1.299-4.637 3.804-.034.119-.034.246 0 .366.745 2.638 2.97 3.83 4.637 3.83s3.891-1.192 4.641-3.816c.034-.12.034-.247 0-.367-.734-2.526-2.938-3.817-4.641-3.817zm0 6.667c-1.473 0-2.667-1.194-2.667-2.667s1.194-2.666 2.667-2.666 2.667 1.193 2.667 2.666-1.194 2.667-2.667 2.667z"/><circle cx="11.334" cy="12" r="1.333"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m5.742 11.508c.916-2.959 3.507-4.508 5.592-4.508.803 0 1.673.223 2.492.658.297-.182.563-.423.768-.731.754-1.134.446-2.665-.688-3.419-.309-.205-.66-.338-1.026-.389-.188-1.349-1.433-2.291-2.782-2.103s-2.29 1.433-2.103 2.782c.051.367.184.717.389 1.026l-3.56 3.56c-1.134-.754-2.665-.446-3.419.688s-.446 2.664.688 3.419c.308.205.659.338 1.026.389.188 1.349 1.433 2.29 2.782 2.103.342-.048.658-.164.936-.333-.467-.612-.856-1.337-1.102-2.206-.085-.3-.085-.617.007-.936z"/><path d="m11.334 8c-1.704 0-3.861 1.299-4.637 3.804-.034.119-.034.246 0 .366.745 2.638 2.97 3.83 4.637 3.83s3.891-1.192 4.641-3.816c.034-.12.034-.247 0-.367-.734-2.526-2.938-3.817-4.641-3.817zm0 6.667c-1.473 0-2.667-1.194-2.667-2.667s1.194-2.666 2.667-2.666 2.667 1.193 2.667 2.666-1.194 2.667-2.667 2.667z"/><circle cx="11.334" cy="12" r="1.333"/></g></svg>
diff --git a/engine/editor/icons/Loop.svg b/engine/editor/icons/Loop.svg
index 1dc018d2..9df28926 100644
--- a/engine/editor/icons/Loop.svg
+++ b/engine/editor/icons/Loop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1v2H6a5 5 0 0 0-4 8l1.414-1.414A3 3 0 0 1 6 5h2v2l4-3-4-3zm6 4-1.414 1.414A3 3 0 0 1 10 11H8V9l-4 3 4 3v-2h2a5 5 0 0 0 4-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1v2H6a5 5 0 0 0-4 8l1.414-1.414A3 3 0 0 1 6 5h2v2l4-3-4-3zm6 4-1.414 1.414A3 3 0 0 1 10 11H8V9l-4 3 4 3v-2h2a5 5 0 0 0 4-8z"/></svg>
diff --git a/engine/editor/icons/MainMovieWrite.svg b/engine/editor/icons/MainMovieWrite.svg
index fac7cc81..201f87b1 100644
--- a/engine/editor/icons/MainMovieWrite.svg
+++ b/engine/editor/icons/MainMovieWrite.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 14a2 2 0 0 0 2 2h1v-2h-.5a.5.5 0 0 1-.5-.5V8a6 6 0 1 0-2 4.465zM8 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm3.441 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM4.488 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm.024 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6.904 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM8 11a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 14a2 2 0 0 0 2 2h1v-2h-.5a.5.5 0 0 1-.5-.5V8a6 6 0 1 0-2 4.465zM8 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm3.441 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM4.488 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm.024 4a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6.904 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM8 11a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/MainPlay.svg b/engine/editor/icons/MainPlay.svg
index c8fb9b36..cea985b8 100644
--- a/engine/editor/icons/MainPlay.svg
+++ b/engine/editor/icons/MainPlay.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M4 12V4l7 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M4 12V4l7 4z"/></svg>
diff --git a/engine/editor/icons/MakeFloating.svg b/engine/editor/icons/MakeFloating.svg
index 52af3adb..7ac83227 100644
--- a/engine/editor/icons/MakeFloating.svg
+++ b/engine/editor/icons/MakeFloating.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="11" height="10" x="1" y="5" fill="#919191" rx="1.5"/><path fill="#e0e0e0" d="M5.5 1A1.5 1.5 0 0 0 4 2.5V3h11v-.5A1.5 1.5 0 0 0 13.5 1zM4 4v5.5A1.5 1.5 0 0 0 5.5 11h8A1.5 1.5 0 0 0 15 9.5V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="11" height="10" x="1" y="5" fill="#919191" rx="1.5"/><path fill="#e0e0e0" d="M5.5 1A1.5 1.5 0 0 0 4 2.5V3h11v-.5A1.5 1.5 0 0 0 13.5 1zM4 4v5.5A1.5 1.5 0 0 0 5.5 11h8A1.5 1.5 0 0 0 15 9.5V4z"/></svg>
diff --git a/engine/editor/icons/MarginContainer.svg b/engine/editor/icons/MarginContainer.svg
index dfe7e3c5..0a98cd9f 100644
--- a/engine/editor/icons/MarginContainer.svg
+++ b/engine/editor/icons/MarginContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm1 3v4l2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm1 3v4l2-2z"/></svg>
diff --git a/engine/editor/icons/Marker.svg b/engine/editor/icons/Marker.svg
index ff91a4a9..58310867 100644
--- a/engine/editor/icons/Marker.svg
+++ b/engine/editor/icons/Marker.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="-959.5 540.5 10 10"><path fill="#e0e0e0" d="m-954.5 550-3-3v-6h6v6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="-959.5 540.5 10 10"><path fill="#e0e0e0" d="m-954.5 550-3-3v-6h6v6z"/></svg>
diff --git a/engine/editor/icons/Marker2D.svg b/engine/editor/icons/Marker2D.svg
index 17b9b229..a2dac2c4 100644
--- a/engine/editor/icons/Marker2D.svg
+++ b/engine/editor/icons/Marker2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m7 1v4h2v-4zm-6 6v2h4v-2zm10 0v2h4v-2zm-4 4v4h2v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m7 1v4h2v-4zm-6 6v2h4v-2zm10 0v2h4v-2zm-4 4v4h2v-4z"/></svg>
diff --git a/engine/editor/icons/Marker3D.svg b/engine/editor/icons/Marker3D.svg
index 511b56eb..cf588da3 100644
--- a/engine/editor/icons/Marker3D.svg
+++ b/engine/editor/icons/Marker3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m7 1v4h2v-4zm-6 6v2h4v-2zm10 0v2h4v-2zm-4 4v4h2v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m7 1v4h2v-4zm-6 6v2h4v-2zm10 0v2h4v-2zm-4 4v4h2v-4z"/></svg>
diff --git a/engine/editor/icons/MarkerSelected.svg b/engine/editor/icons/MarkerSelected.svg
index c581a3a6..19f89842 100644
--- a/engine/editor/icons/MarkerSelected.svg
+++ b/engine/editor/icons/MarkerSelected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="-959.5 540.5 10 10"><path fill="#5fb2ff" d="m-952 541.5v5.086l-2.5 2.5-2.5-2.5v-5.086zm1-1h-7v6.5l3.5 3.5 3.5-3.5z"/><path fill="#003e7a" d="m-957 546.586 2.5 2.5 2.5-2.5v-5.086h-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="-959.5 540.5 10 10"><path fill="#5fb2ff" d="m-952 541.5v5.086l-2.5 2.5-2.5-2.5v-5.086zm1-1h-7v6.5l3.5 3.5 3.5-3.5z"/><path fill="#003e7a" d="m-957 546.586 2.5 2.5 2.5-2.5v-5.086h-5z"/></svg>
diff --git a/engine/editor/icons/MatchCase.svg b/engine/editor/icons/MatchCase.svg
index c8ea7494..d9ad4c77 100644
--- a/engine/editor/icons/MatchCase.svg
+++ b/engine/editor/icons/MatchCase.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1a4 4 0 0 0-4 4v10h2v-4h4v4h2V5a4 4 0 0 0-4-4zm5 11a3 3 0 0 0 4 2.824V15h2V9a3 3 0 0 0-3-3h-1v2h1a1 1 0 0 1 1 1v.174A3 3 0 0 0 9 12zM4 3a2 2 0 0 1 2 2v4H2V5a2 2 0 0 1 2-2zm8 8a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1a4 4 0 0 0-4 4v10h2v-4h4v4h2V5a4 4 0 0 0-4-4zm5 11a3 3 0 0 0 4 2.824V15h2V9a3 3 0 0 0-3-3h-1v2h1a1 1 0 0 1 1 1v.174A3 3 0 0 0 9 12zM4 3a2 2 0 0 1 2 2v4H2V5a2 2 0 0 1 2-2zm8 8a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/MaterialPreviewCube.svg b/engine/editor/icons/MaterialPreviewCube.svg
index 4741cb2a..171fc852 100644
--- a/engine/editor/icons/MaterialPreviewCube.svg
+++ b/engine/editor/icons/MaterialPreviewCube.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m8 1 7 3v8l-7 3-7-3V4z"/><path fill="#d6d6d6" d="M8 1 1 4v8l7 3 7-3V4z"/><path fill="#f9f9f9" d="m1 4 7 3 7-3-7-3z"/><path fill="#e0e0e0" d="m8 15-7-3V4l7 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m8 1 7 3v8l-7 3-7-3V4z"/><path fill="#d6d6d6" d="M8 1 1 4v8l7 3 7-3V4z"/><path fill="#f9f9f9" d="m1 4 7 3 7-3-7-3z"/><path fill="#e0e0e0" d="m8 15-7-3V4l7 3z"/></svg>
diff --git a/engine/editor/icons/MaterialPreviewLight1.svg b/engine/editor/icons/MaterialPreviewLight1.svg
index 8c7776af..95165cea 100644
--- a/engine/editor/icons/MaterialPreviewLight1.svg
+++ b/engine/editor/icons/MaterialPreviewLight1.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2"><path d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2z"/><circle cx="8" cy="8" r="3.5" fill="#000"/></g><path fill="#f9f9f9" d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2zm1-7.875a.75.75 0 0 1 1.145.625V11h-1.5V7.152l-1 .667-.75-1.2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2"><path d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2z"/><circle cx="8" cy="8" r="3.5" fill="#000"/></g><path fill="#f9f9f9" d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2zm1-7.875a.75.75 0 0 1 1.145.625V11h-1.5V7.152l-1 .667-.75-1.2z"/></svg>
diff --git a/engine/editor/icons/MaterialPreviewLight2.svg b/engine/editor/icons/MaterialPreviewLight2.svg
index 8d0e0b35..79bec6bc 100644
--- a/engine/editor/icons/MaterialPreviewLight2.svg
+++ b/engine/editor/icons/MaterialPreviewLight2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2"><path d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2z"/><circle cx="8" cy="8" r="3.5" fill="#000"/></g><path fill="#f9f9f9" d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2zM5.9 6.45a1.98 1.98 0 1 1 3.4 1.8L8.05 9.5h2V11H6.8a.9.9 0 0 1-.75-1.5L8.3 7.25a.62.62 0 1 0-1.1-.45z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2"><path d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2z"/><circle cx="8" cy="8" r="3.5" fill="#000"/></g><path fill="#f9f9f9" d="M7 1v2h2V1zM3.758 2.344 2.344 3.758l1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM8 4a4 4 0 0 0 0 8 4 4 0 0 0 0-8zM1 7v2h2V7zm12 0v2h2V7zm-9.242 3.828-1.414 1.414 1.414 1.414 1.414-1.414zm8.484 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 13v2h2v-2zM5.9 6.45a1.98 1.98 0 1 1 3.4 1.8L8.05 9.5h2V11H6.8a.9.9 0 0 1-.75-1.5L8.3 7.25a.62.62 0 1 0-1.1-.45z"/></svg>
diff --git a/engine/editor/icons/MaterialPreviewQuad.svg b/engine/editor/icons/MaterialPreviewQuad.svg
index 9765a15d..2040b3a7 100644
--- a/engine/editor/icons/MaterialPreviewQuad.svg
+++ b/engine/editor/icons/MaterialPreviewQuad.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m2 1 12 1v11l-12 1z"/><path fill="#f9f9f9" d="m2 14 12-1v-11l-12-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m2 1 12 1v11l-12 1z"/><path fill="#f9f9f9" d="m2 14 12-1v-11l-12-1z"/></svg>
diff --git a/engine/editor/icons/MaterialPreviewSphere.svg b/engine/editor/icons/MaterialPreviewSphere.svg
index bfe8e156..1fd9ce9e 100644
--- a/engine/editor/icons/MaterialPreviewSphere.svg
+++ b/engine/editor/icons/MaterialPreviewSphere.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".8"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM6 7a2 2 0 0 1 0-4 2 2 0 0 1 0 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".8"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM6 7a2 2 0 0 1 0-4 2 2 0 0 1 0 4"/></svg>
diff --git a/engine/editor/icons/MemberAnnotation.svg b/engine/editor/icons/MemberAnnotation.svg
index 27930b67..b2b486ea 100644
--- a/engine/editor/icons/MemberAnnotation.svg
+++ b/engine/editor/icons/MemberAnnotation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="1.493" d="M13.821 12.756c-5 3.915-12.551 2.248-12.49-4.538.674-11.471 17.312-7.45 12.446 2.117-.8 1.196-2.074 1.462-3.198.433-.3-.3-.448-1.16-.382-1.509.4-1.894 1.088-4.078-.722-4.723-2.417-.865-4.559 1.65-4.97 4.02-.473 2.734 2.285 3.374 4.15 1.987.455-.363 1.55-1.38 1.68-1.974"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="1.493" d="M13.821 12.756c-5 3.915-12.551 2.248-12.49-4.538.674-11.471 17.312-7.45 12.446 2.117-.8 1.196-2.074 1.462-3.198.433-.3-.3-.448-1.16-.382-1.509.4-1.894 1.088-4.078-.722-4.723-2.417-.865-4.559 1.65-4.97 4.02-.473 2.734 2.285 3.374 4.15 1.987.455-.363 1.55-1.38 1.68-1.974"/></svg>
diff --git a/engine/editor/icons/MemberConstant.svg b/engine/editor/icons/MemberConstant.svg
index cc59eb44..d4622ce5 100644
--- a/engine/editor/icons/MemberConstant.svg
+++ b/engine/editor/icons/MemberConstant.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12.5 3.67a5 5 0 1 0 0 8.66l-1-1.73a3 3 0 1 1 0-5.2zM3 11a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12.5 3.67a5 5 0 1 0 0 8.66l-1-1.73a3 3 0 1 1 0-5.2zM3 11a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/MemberConstructor.svg b/engine/editor/icons/MemberConstructor.svg
index 0e617687..0298086c 100644
--- a/engine/editor/icons/MemberConstructor.svg
+++ b/engine/editor/icons/MemberConstructor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 6c-1.33 2.67-1.33 4.33 0 7h2c-1.33-2.67-1.33-4.33 0-7zm4 0c1.33 2.67 1.33 4.33 0 7h2c1.33-2.67 1.33-4.33 0-7zM1 11a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm6 2v-2H6a1 1 0 0 1 0-2h1V7H6a3 3 0 0 0 0 6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 6c-1.33 2.67-1.33 4.33 0 7h2c-1.33-2.67-1.33-4.33 0-7zm4 0c1.33 2.67 1.33 4.33 0 7h2c1.33-2.67 1.33-4.33 0-7zM1 11a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm6 2v-2H6a1 1 0 0 1 0-2h1V7H6a3 3 0 0 0 0 6z"/></svg>
diff --git a/engine/editor/icons/MemberMethod.svg b/engine/editor/icons/MemberMethod.svg
index 5e325d51..91835251 100644
--- a/engine/editor/icons/MemberMethod.svg
+++ b/engine/editor/icons/MemberMethod.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6.021 3A3 3 0 0 0 3 6v7h2v-3h2V8H5V6a1 1 0 0 1 1.707-.707l1.414-1.414A3 3 0 0 0 6.021 3zM9 6c-1.326 2.659-1.34 4.325 0 7h2c-1.34-2.675-1.326-4.341 0-7zm4 0c1.326 2.659 1.34 4.325 0 7h2c1.34-2.675 1.326-4.341 0-7zM1 11a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6.021 3A3 3 0 0 0 3 6v7h2v-3h2V8H5V6a1 1 0 0 1 1.707-.707l1.414-1.414A3 3 0 0 0 6.021 3zM9 6c-1.326 2.659-1.34 4.325 0 7h2c-1.34-2.675-1.326-4.341 0-7zm4 0c1.326 2.659 1.34 4.325 0 7h2c1.34-2.675 1.326-4.341 0-7zM1 11a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/MemberOperator.svg b/engine/editor/icons/MemberOperator.svg
index a00d990e..1de44e1c 100644
--- a/engine/editor/icons/MemberOperator.svg
+++ b/engine/editor/icons/MemberOperator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 6c-1.33 2.67-1.33 4.33 0 7h2c-1.33-2.67-1.33-4.33 0-7zm4 0c1.33 2.67 1.33 4.33 0 7h2c1.33-2.67 1.33-4.33 0-7zM1 11a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm4-4a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 6c-1.33 2.67-1.33 4.33 0 7h2c-1.33-2.67-1.33-4.33 0-7zm4 0c1.33 2.67 1.33 4.33 0 7h2c1.33-2.67 1.33-4.33 0-7zM1 11a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm4-4a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/MemberProperty.svg b/engine/editor/icons/MemberProperty.svg
index a2ea8f56..52c1ce61 100644
--- a/engine/editor/icons/MemberProperty.svg
+++ b/engine/editor/icons/MemberProperty.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 4v9h2v-3h1a3 3 0 0 0 0-6zm2 2h1a1 1 0 0 1 0 2H9zm-5 5a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 4v9h2v-3h1a3 3 0 0 0 0-6zm2 2h1a1 1 0 0 1 0 2H9zm-5 5a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/MemberSignal.svg b/engine/editor/icons/MemberSignal.svg
index f043c7f2..f36ffa12 100644
--- a/engine/editor/icons/MemberSignal.svg
+++ b/engine/editor/icons/MemberSignal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a1 1 0 0 0 0 2 8 8 0 0 1 8 8 1 1 0 0 0 2 0A10 10 0 0 0 6 1zm0 4a1 1 0 0 0 0 2 4 4 0 0 1 4 4 1 1 0 0 0 2 0 6 6 0 0 0-6-6zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-5 2a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a1 1 0 0 0 0 2 8 8 0 0 1 8 8 1 1 0 0 0 2 0A10 10 0 0 0 6 1zm0 4a1 1 0 0 0 0 2 4 4 0 0 1 4 4 1 1 0 0 0 2 0 6 6 0 0 0-6-6zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-5 2a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/MemberTheme.svg b/engine/editor/icons/MemberTheme.svg
index 949621b3..e1596a37 100644
--- a/engine/editor/icons/MemberTheme.svg
+++ b/engine/editor/icons/MemberTheme.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 11a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm7-9C7.6 6 6 6.79 6 9s1.83 4 4 4 4-1.79 4-4-1.6-3-4-7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 11a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm7-9C7.6 6 6 6.79 6 9s1.83 4 4 4 4-1.79 4-4-1.6-3-4-7z"/></svg>
diff --git a/engine/editor/icons/MenuBar.svg b/engine/editor/icons/MenuBar.svg
index cdd99c95..c54cb7b6 100644
--- a/engine/editor/icons/MenuBar.svg
+++ b/engine/editor/icons/MenuBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M2 6a1 1 0 0 0-1 1v7a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1Zm1 2h10v2H3Zm0 3h10v2H3ZM1 1v4h6V1Zm1 1h4L4 4Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M2 6a1 1 0 0 0-1 1v7a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V7a1 1 0 0 0-1-1Zm1 2h10v2H3Zm0 3h10v2H3ZM1 1v4h6V1Zm1 1h4L4 4Z"/></svg>
diff --git a/engine/editor/icons/MenuButton.svg b/engine/editor/icons/MenuButton.svg
index 13d1a356..b2082c5b 100644
--- a/engine/editor/icons/MenuButton.svg
+++ b/engine/editor/icons/MenuButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v4h14v-4zm5 1h4l-2 2zm-4 4a1 1 0 0 0 -1 1v7a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-7a1 1 0 0 0 -1-1zm1 2h10v2h-10zm0 3h10v2h-10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v4h14v-4zm5 1h4l-2 2zm-4 4a1 1 0 0 0 -1 1v7a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-7a1 1 0 0 0 -1-1zm1 2h10v2h-10zm0 3h10v2h-10z"/></svg>
diff --git a/engine/editor/icons/Mesh.svg b/engine/editor/icons/Mesh.svg
index 04499256..540ba4bf 100644
--- a/engine/editor/icons/Mesh.svg
+++ b/engine/editor/icons/Mesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
diff --git a/engine/editor/icons/MeshInstance2D.svg b/engine/editor/icons/MeshInstance2D.svg
index 989ad631..fb9cd382 100644
--- a/engine/editor/icons/MeshInstance2D.svg
+++ b/engine/editor/icons/MeshInstance2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
diff --git a/engine/editor/icons/MeshInstance3D.svg b/engine/editor/icons/MeshInstance3D.svg
index adb95b24..821260de 100644
--- a/engine/editor/icons/MeshInstance3D.svg
+++ b/engine/editor/icons/MeshInstance3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
diff --git a/engine/editor/icons/MeshItem.svg b/engine/editor/icons/MeshItem.svg
index d231559b..80bd91e3 100644
--- a/engine/editor/icons/MeshItem.svg
+++ b/engine/editor/icons/MeshItem.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541A2 2 0 1 0 14 11.27V4.729A2 2 0 1 0 11.27 2Zm.683 2h5.857a2 2 0 0 0 .729.73v5.856L5.412 4zM3.999 5.414 10.584 12H4.727a2 2 0 0 0-.729-.73V5.414z"/></svg>
diff --git a/engine/editor/icons/MeshLibrary.svg b/engine/editor/icons/MeshLibrary.svg
index 5c8ccd8f..36d98e73 100644
--- a/engine/editor/icons/MeshLibrary.svg
+++ b/engine/editor/icons/MeshLibrary.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M4.729 2A2 2 0 1 0 2 4.73v6.542A2 2 0 1 0 4.73 14H7v-2H4.728A2 2 0 0 0 4 11.27V5.414l3 3V8a2 2 0 0 1 .809-1.606L5.414 4h5.858a2 2 0 0 0 .728.73V6a2 2 0 0 1 1 .271A2 2 0 0 1 14 6V4.728A2 2 0 1 0 11.27 2zM9 8v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M4.729 2A2 2 0 1 0 2 4.73v6.542A2 2 0 1 0 4.73 14H7v-2H4.728A2 2 0 0 0 4 11.27V5.414l3 3V8a2 2 0 0 1 .809-1.606L5.414 4h5.858a2 2 0 0 0 .728.73V6a2 2 0 0 1 1 .271A2 2 0 0 1 14 6V4.728A2 2 0 1 0 11.27 2zM9 8v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8z"/></svg>
diff --git a/engine/editor/icons/MeshTexture.svg b/engine/editor/icons/MeshTexture.svg
index c6417e54..bc58be56 100644
--- a/engine/editor/icons/MeshTexture.svg
+++ b/engine/editor/icons/MeshTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zm6.542 2a2 2 0 0 0 .729.729v6.542a2 2 0 0 0-.729.729H4.729A2 2 0 0 0 4 11.271V4.729A2 2 0 0 0 4.729 4zM8.75 6.125v.75H8v.75H6.5v.75h-.75v.75H5v.75h6v-1.5h-.75v-1.5H9.5v-.75z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zm6.542 2a2 2 0 0 0 .729.729v6.542a2 2 0 0 0-.729.729H4.729A2 2 0 0 0 4 11.271V4.729A2 2 0 0 0 4.729 4zM8.75 6.125v.75H8v.75H6.5v.75h-.75v.75H5v.75h6v-1.5h-.75v-1.5H9.5v-.75z"/></svg>
diff --git a/engine/editor/icons/MethodOverride.svg b/engine/editor/icons/MethodOverride.svg
index dd69f007..6210f0ec 100644
--- a/engine/editor/icons/MethodOverride.svg
+++ b/engine/editor/icons/MethodOverride.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M2 12.5h3V10c0-2.5.5-4.2 3.5-4.2H10V3l5 3.8-5 3.8V8H8.5C7.25 8 7 9 7 10v2.5h3v2H2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M2 12.5h3V10c0-2.5.5-4.2 3.5-4.2H10V3l5 3.8-5 3.8V8H8.5C7.25 8 7 9 7 10v2.5h3v2H2z"/></svg>
diff --git a/engine/editor/icons/MethodOverrideAndSlot.svg b/engine/editor/icons/MethodOverrideAndSlot.svg
index 871ce3ce..6c52c004 100644
--- a/engine/editor/icons/MethodOverrideAndSlot.svg
+++ b/engine/editor/icons/MethodOverrideAndSlot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M.5 13.5H2V11c0-2.5.5-4.2 3.5-4.2H6V4l5 3.8-5 3.8V9h-.5C4.25 9 4 10 4 11v2.5h4.5v2h-8z"/><path fill="#5fff97" d="M9 3h6v10H9v-2h4V5H9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M.5 13.5H2V11c0-2.5.5-4.2 3.5-4.2H6V4l5 3.8-5 3.8V9h-.5C4.25 9 4 10 4 11v2.5h4.5v2h-8z"/><path fill="#5fff97" d="M9 3h6v10H9v-2h4V5H9z"/></svg>
diff --git a/engine/editor/icons/MiniObject.svg b/engine/editor/icons/MiniObject.svg
index 5859189f..359c1324 100644
--- a/engine/editor/icons/MiniObject.svg
+++ b/engine/editor/icons/MiniObject.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#55f3e3" d="M7 2v8h2a3 3 0 0 0 0-6V2zM6 7a3 3 0 0 0-6 0 3 3 0 0 0 6 0zm7-1v3a1 1 0 0 1-1 1h-1v2h1a3 3 0 0 0 3-3V6zM3 6a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2zm4-4h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#55f3e3" d="M7 2v8h2a3 3 0 0 0 0-6V2zM6 7a3 3 0 0 0-6 0 3 3 0 0 0 6 0zm7-1v3a1 1 0 0 1-1 1h-1v2h1a3 3 0 0 0 3-3V6zM3 6a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2zm4-4h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/MirrorX.svg b/engine/editor/icons/MirrorX.svg
index c73996a3..81fd3362 100644
--- a/engine/editor/icons/MirrorX.svg
+++ b/engine/editor/icons/MirrorX.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6 2 8l2 2M2 8h11m-1-2 2 2-2 2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6 2 8l2 2M2 8h11m-1-2 2 2-2 2"/></svg>
diff --git a/engine/editor/icons/MirrorY.svg b/engine/editor/icons/MirrorY.svg
index 7f878723..73356bd2 100644
--- a/engine/editor/icons/MirrorY.svg
+++ b/engine/editor/icons/MirrorY.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 4 8 2 6 4m2-2v11m2-1-2 2-2-2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 4 8 2 6 4m2-2v11m2-1-2 2-2-2"/></svg>
diff --git a/engine/editor/icons/MissingNode.svg b/engine/editor/icons/MissingNode.svg
index bab9f5c9..207afbd3 100644
--- a/engine/editor/icons/MissingNode.svg
+++ b/engine/editor/icons/MissingNode.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-width="2" d="M3 3 13 13M13 3 3 13"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-width="2" d="M3 3 13 13M13 3 3 13"/></svg>
diff --git a/engine/editor/icons/MissingResource.svg b/engine/editor/icons/MissingResource.svg
index bab9f5c9..207afbd3 100644
--- a/engine/editor/icons/MissingResource.svg
+++ b/engine/editor/icons/MissingResource.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-width="2" d="M3 3 13 13M13 3 3 13"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-width="2" d="M3 3 13 13M13 3 3 13"/></svg>
diff --git a/engine/editor/icons/Modifiers.svg b/engine/editor/icons/Modifiers.svg
index 1b25d620..2ba2fc42 100644
--- a/engine/editor/icons/Modifiers.svg
+++ b/engine/editor/icons/Modifiers.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1 3 3l1 2v4H2v3.5a2.5 2.5 0 0 0 5 0V9H5V5l1-2-1-2zm6 .174a3 3 0 0 0 0 5.652V14a1 1 0 0 0 2 0V6.824a3 3 0 0 0 0-5.648V4a1 1 0 0 1-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1 3 3l1 2v4H2v3.5a2.5 2.5 0 0 0 5 0V9H5V5l1-2-1-2zm6 .174a3 3 0 0 0 0 5.652V14a1 1 0 0 0 2 0V6.824a3 3 0 0 0 0-5.648V4a1 1 0 0 1-2 0z"/></svg>
diff --git a/engine/editor/icons/Mouse.svg b/engine/editor/icons/Mouse.svg
index 8e63a841..cab0b346 100644
--- a/engine/editor/icons/Mouse.svg
+++ b/engine/editor/icons/Mouse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 1a5 5 0 0 0-4 5h4zm2 0a5 5 0 0 1 4 5H9zM3 8v2a5 5 0 0 0 10 0V8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 1a5 5 0 0 0-4 5h4zm2 0a5 5 0 0 1 4 5H9zM3 8v2a5 5 0 0 0 10 0V8z"/></svg>
diff --git a/engine/editor/icons/MoveDown.svg b/engine/editor/icons/MoveDown.svg
index 943e5768..34591074 100644
--- a/engine/editor/icons/MoveDown.svg
+++ b/engine/editor/icons/MoveDown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 2H6m2 4v8M4 9l4 5 4-5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 2H6m2 4v8M4 9l4 5 4-5"/></svg>
diff --git a/engine/editor/icons/MoveLeft.svg b/engine/editor/icons/MoveLeft.svg
index 785c71f4..10e58d1c 100644
--- a/engine/editor/icons/MoveLeft.svg
+++ b/engine/editor/icons/MoveLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 10V6m-4 2H2m5-4L2 8l5 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 10V6m-4 2H2m5-4L2 8l5 4"/></svg>
diff --git a/engine/editor/icons/MovePoint.svg b/engine/editor/icons/MovePoint.svg
index add743bd..9f29bfde 100644
--- a/engine/editor/icons/MovePoint.svg
+++ b/engine/editor/icons/MovePoint.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M8 1a7 7 0 1 0 1.213 13.893l-2.6-6.32a1.5 1.5 0 0 1 1.957-1.96l6.319 2.6A7 7 0 0 0 8 1z"/><path fill="#ff5f5f" d="M8 3a5 5 0 1 0 .426 9.979L6.613 8.572A1.5 1.5 0 0 1 8.57 6.613l4.409 1.813A5 5 0 0 0 8 3z"/><path fill="#e0e0e0" d="M16 11.3 8 8.009l3.291 8 .947-2.82 1.884 1.883.942-.941-1.884-1.884z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M8 1a7 7 0 1 0 1.213 13.893l-2.6-6.32a1.5 1.5 0 0 1 1.957-1.96l6.319 2.6A7 7 0 0 0 8 1z"/><path fill="#ff5f5f" d="M8 3a5 5 0 1 0 .426 9.979L6.613 8.572A1.5 1.5 0 0 1 8.57 6.613l4.409 1.813A5 5 0 0 0 8 3z"/><path fill="#e0e0e0" d="M16 11.3 8 8.009l3.291 8 .947-2.82 1.884 1.883.942-.941-1.884-1.884z"/></svg>
diff --git a/engine/editor/icons/MoveRight.svg b/engine/editor/icons/MoveRight.svg
index fa98b932..b81af369 100644
--- a/engine/editor/icons/MoveRight.svg
+++ b/engine/editor/icons/MoveRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 6v4m4-2h8m-5 4 5-4-5-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 6v4m4-2h8m-5 4 5-4-5-4"/></svg>
diff --git a/engine/editor/icons/MoveUp.svg b/engine/editor/icons/MoveUp.svg
index 609db3f0..e98d5832 100644
--- a/engine/editor/icons/MoveUp.svg
+++ b/engine/editor/icons/MoveUp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 14h4m-2-4V2m4 5L8 2 4 7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 14h4m-2-4V2m4 5L8 2 4 7"/></svg>
diff --git a/engine/editor/icons/MultiMesh.svg b/engine/editor/icons/MultiMesh.svg
index 96303c1e..62e7360b 100644
--- a/engine/editor/icons/MultiMesh.svg
+++ b/engine/editor/icons/MultiMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541a2 2 0 1 0 2.73 2.73H6v-2H4.73a2 2 0 0 0-.73-.73V5.437l3.564 3.564H9V7.565L5.436 4.001h5.834a2 2 0 0 0 .73.73V6h2V4.731A2 2 0 1 0 11.27 2zM11 8v3H8v2h3v3h2v-3h3v-2h-3V8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541a2 2 0 1 0 2.73 2.73H6v-2H4.73a2 2 0 0 0-.73-.73V5.437l3.564 3.564H9V7.565L5.436 4.001h5.834a2 2 0 0 0 .73.73V6h2V4.731A2 2 0 1 0 11.27 2zM11 8v3H8v2h3v3h2v-3h3v-2h-3V8z"/></svg>
diff --git a/engine/editor/icons/MultiMeshInstance2D.svg b/engine/editor/icons/MultiMeshInstance2D.svg
index 2972a9ea..5f811f35 100644
--- a/engine/editor/icons/MultiMeshInstance2D.svg
+++ b/engine/editor/icons/MultiMeshInstance2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.73 2A2 2 0 1 0 2 4.73v6.541a2 2 0 1 0 2.73 2.73H6v-2H4.73a2 2 0 0 0-.73-.73V5.437l3.564 3.564H9V7.565L5.436 4.001h5.834a2 2 0 0 0 .73.73V6h2V4.731A2 2 0 1 0 11.27 2zM11 8v3H8v2h3v3h2v-3h3v-2h-3V8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M4.73 2A2 2 0 1 0 2 4.73v6.541a2 2 0 1 0 2.73 2.73H6v-2H4.73a2 2 0 0 0-.73-.73V5.437l3.564 3.564H9V7.565L5.436 4.001h5.834a2 2 0 0 0 .73.73V6h2V4.731A2 2 0 1 0 11.27 2zM11 8v3H8v2h3v3h2v-3h3v-2h-3V8z"/></svg>
diff --git a/engine/editor/icons/MultiMeshInstance3D.svg b/engine/editor/icons/MultiMeshInstance3D.svg
index 03507674..619c5d51 100644
--- a/engine/editor/icons/MultiMeshInstance3D.svg
+++ b/engine/editor/icons/MultiMeshInstance3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541a2 2 0 1 0 2.73 2.73H6v-2H4.73a2 2 0 0 0-.73-.73V5.437l3.564 3.564H9V7.565L5.436 4.001h5.834a2 2 0 0 0 .73.73V6h2V4.731A2 2 0 1 0 11.27 2zM11 8v3H8v2h3v3h2v-3h3v-2h-3V8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541a2 2 0 1 0 2.73 2.73H6v-2H4.73a2 2 0 0 0-.73-.73V5.437l3.564 3.564H9V7.565L5.436 4.001h5.834a2 2 0 0 0 .73.73V6h2V4.731A2 2 0 1 0 11.27 2zM11 8v3H8v2h3v3h2v-3h3v-2h-3V8z"/></svg>
diff --git a/engine/editor/icons/MultiplayerSpawner.svg b/engine/editor/icons/MultiplayerSpawner.svg
index 714e92a9..2ef11be3 100644
--- a/engine/editor/icons/MultiplayerSpawner.svg
+++ b/engine/editor/icons/MultiplayerSpawner.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M4.936 7.429a4 4 0 0 1 6.128 0M1.872 4.858a8 8 0 0 1 12.256 0"/><path fill="#5fff97" d="M7 9v2H5v2h2v2h2v-2h2v-2H9V9Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M4.936 7.429a4 4 0 0 1 6.128 0M1.872 4.858a8 8 0 0 1 12.256 0"/><path fill="#5fff97" d="M7 9v2H5v2h2v2h2v-2h2v-2H9V9Z"/></svg>
diff --git a/engine/editor/icons/MultiplayerSynchronizer.svg b/engine/editor/icons/MultiplayerSynchronizer.svg
index cc640f8d..ee6572b0 100644
--- a/engine/editor/icons/MultiplayerSynchronizer.svg
+++ b/engine/editor/icons/MultiplayerSynchronizer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m8 10-2 4-2-4Z"/><path fill="#ff5f5f" d="m12 14-2-4-2 4Z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M4.936 7.429a4 4 0 0 1 6.128 0M1.872 4.858a8 8 0 0 1 12.256 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m8 10-2 4-2-4Z"/><path fill="#ff5f5f" d="m12 14-2-4-2 4Z"/><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M4.936 7.429a4 4 0 0 1 6.128 0M1.872 4.858a8 8 0 0 1 12.256 0"/></svg>
diff --git a/engine/editor/icons/NavigationAgent2D.svg b/engine/editor/icons/NavigationAgent2D.svg
index 4e0d00f4..7791bca1 100644
--- a/engine/editor/icons/NavigationAgent2D.svg
+++ b/engine/editor/icons/NavigationAgent2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 1v2.5a2.5 2.5 0 0 1 0 5V15c2-3 5-6 5-9s-2-5-5-5z"/><path fill="#e0e0e0" d="M8 1C5 1 3 3 3 6s3 6 5 9V8.5a1 1 0 0 1 0-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 1v2.5a2.5 2.5 0 0 1 0 5V15c2-3 5-6 5-9s-2-5-5-5z"/><path fill="#e0e0e0" d="M8 1C5 1 3 3 3 6s3 6 5 9V8.5a1 1 0 0 1 0-5z"/></svg>
diff --git a/engine/editor/icons/NavigationAgent3D.svg b/engine/editor/icons/NavigationAgent3D.svg
index ecda3b96..52b83ba1 100644
--- a/engine/editor/icons/NavigationAgent3D.svg
+++ b/engine/editor/icons/NavigationAgent3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1C5 1 3 3 3 6s3 6 5 9V8.5a1 1 0 0 1 0-5z"/><path fill="#fc7f7f" d="M8 1v2.5a2.5 2.5 0 0 1 0 5V15c2-3 5-6 5-9s-2-5-5-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1C5 1 3 3 3 6s3 6 5 9V8.5a1 1 0 0 1 0-5z"/><path fill="#fc7f7f" d="M8 1v2.5a2.5 2.5 0 0 1 0 5V15c2-3 5-6 5-9s-2-5-5-5z"/></svg>
diff --git a/engine/editor/icons/NavigationLink2D.svg b/engine/editor/icons/NavigationLink2D.svg
index 8aed54a9..405198e5 100644
--- a/engine/editor/icons/NavigationLink2D.svg
+++ b/engine/editor/icons/NavigationLink2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h3.2a3.25 3.25 0 0 1-.2-5l5-5a3.25 3.25 0 0 1 5 .2V2a1 1 0 0 0-1-1zm7.15 6.65a2 2 0 0 1 1.207.207l1.25-1.25a1 1 0 0 1 1.75 1.75l-2 2a1 1 0 0 1-1.5 0 .5.5 0 0 0-.707.707 2 2 0 0 0 2.914 0l2-2A2 2 0 0 0 10.9 5.9zm1.628 4.628a2 2 0 0 1-1.207-.207l-1.25 1.25a1.237 1.237 0 0 1-1.75-1.75l2-2a1 1 0 0 1 1.5 0 .5.5 0 0 0 .707-.707 2 2 0 0 0-2.914 0l-2 2a2.237 2.237 0 0 0 3.164 3.164z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h3.2a3.25 3.25 0 0 1-.2-5l5-5a3.25 3.25 0 0 1 5 .2V2a1 1 0 0 0-1-1zm7.15 6.65a2 2 0 0 1 1.207.207l1.25-1.25a1 1 0 0 1 1.75 1.75l-2 2a1 1 0 0 1-1.5 0 .5.5 0 0 0-.707.707 2 2 0 0 0 2.914 0l2-2A2 2 0 0 0 10.9 5.9zm1.628 4.628a2 2 0 0 1-1.207-.207l-1.25 1.25a1.237 1.237 0 0 1-1.75-1.75l2-2a1 1 0 0 1 1.5 0 .5.5 0 0 0 .707-.707 2 2 0 0 0-2.914 0l-2 2a2.237 2.237 0 0 0 3.164 3.164z"/></svg>
diff --git a/engine/editor/icons/NavigationLink3D.svg b/engine/editor/icons/NavigationLink3D.svg
index 4ac3cce9..61049b00 100644
--- a/engine/editor/icons/NavigationLink3D.svg
+++ b/engine/editor/icons/NavigationLink3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h3.2a3.25 3.25 0 0 1-.2-5l5-5a3.25 3.25 0 0 1 5 .2V2a1 1 0 0 0-1-1zm7.15 6.65a2 2 0 0 1 1.207.207l1.25-1.25a1 1 0 0 1 1.75 1.75l-2 2a1 1 0 0 1-1.5 0 .5.5 0 0 0-.707.707 2 2 0 0 0 2.914 0l2-2A2 2 0 0 0 10.9 5.9zm1.628 4.628a2 2 0 0 1-1.207-.207l-1.25 1.25a1.237 1.237 0 0 1-1.75-1.75l2-2a1 1 0 0 1 1.5 0 .5.5 0 0 0 .707-.707 2 2 0 0 0-2.914 0l-2 2a2.237 2.237 0 0 0 3.164 3.164z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h3.2a3.25 3.25 0 0 1-.2-5l5-5a3.25 3.25 0 0 1 5 .2V2a1 1 0 0 0-1-1zm7.15 6.65a2 2 0 0 1 1.207.207l1.25-1.25a1 1 0 0 1 1.75 1.75l-2 2a1 1 0 0 1-1.5 0 .5.5 0 0 0-.707.707 2 2 0 0 0 2.914 0l2-2A2 2 0 0 0 10.9 5.9zm1.628 4.628a2 2 0 0 1-1.207-.207l-1.25 1.25a1.237 1.237 0 0 1-1.75-1.75l2-2a1 1 0 0 1 1.5 0 .5.5 0 0 0 .707-.707 2 2 0 0 0-2.914 0l-2 2a2.237 2.237 0 0 0 3.164 3.164z"/></svg>
diff --git a/engine/editor/icons/NavigationMesh.svg b/engine/editor/icons/NavigationMesh.svg
index 9d54230d..2f908709 100644
--- a/engine/editor/icons/NavigationMesh.svg
+++ b/engine/editor/icons/NavigationMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="m3 1a2 2 0 0 0 -2 2 2 2 0 0 0 1 1.7305v6.541a2 2 0 0 0 -1 1.7285 2 2 0 0 0 2 2 2 2 0 0 0 1.7305-1h2.5078l.75-2h-3.2598a2 2 0 0 0 -.72852-.73047v-5.8555l4.6973 4.6973.77148-2.0566-4.0547-4.0547h5.8574a2 2 0 0 0 .72852.73047v.27148a2.0002 2.0002 0 0 1 .023438 0 2.0002 2.0002 0 0 1 1.8496 1.2969l.12695.33789v-1.9082a2 2 0 0 0 1-1.7285 2 2 0 0 0 -2-2 2 2 0 0 0 -1.7305 1h-6.541a2 2 0 0 0 -1.7285-1zm9 6-3 8 3-2 3 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="m3 1a2 2 0 0 0 -2 2 2 2 0 0 0 1 1.7305v6.541a2 2 0 0 0 -1 1.7285 2 2 0 0 0 2 2 2 2 0 0 0 1.7305-1h2.5078l.75-2h-3.2598a2 2 0 0 0 -.72852-.73047v-5.8555l4.6973 4.6973.77148-2.0566-4.0547-4.0547h5.8574a2 2 0 0 0 .72852.73047v.27148a2.0002 2.0002 0 0 1 .023438 0 2.0002 2.0002 0 0 1 1.8496 1.2969l.12695.33789v-1.9082a2 2 0 0 0 1-1.7285 2 2 0 0 0 -2-2 2 2 0 0 0 -1.7305 1h-6.541a2 2 0 0 0 -1.7285-1zm9 6-3 8 3-2 3 2z"/></svg>
diff --git a/engine/editor/icons/NavigationObstacle2D.svg b/engine/editor/icons/NavigationObstacle2D.svg
index bc2a2c78..5c9ce62b 100644
--- a/engine/editor/icons/NavigationObstacle2D.svg
+++ b/engine/editor/icons/NavigationObstacle2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 .875C7.375.875 6.75 1.25 6.5 2l-3 10H8V9H5.5l1-4H8zM2 13c-1 0-1 2 0 2h6v-2z"/><path fill="#8da5f3" d="M8 .875V5h1.5l1 4H8v3h4.5l-3-10C9.25 1.25 8.625.875 8 .875zM8 13v2h6c1 0 1-2 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 .875C7.375.875 6.75 1.25 6.5 2l-3 10H8V9H5.5l1-4H8zM2 13c-1 0-1 2 0 2h6v-2z"/><path fill="#8da5f3" d="M8 .875V5h1.5l1 4H8v3h4.5l-3-10C9.25 1.25 8.625.875 8 .875zM8 13v2h6c1 0 1-2 0-2z"/></svg>
diff --git a/engine/editor/icons/NavigationObstacle3D.svg b/engine/editor/icons/NavigationObstacle3D.svg
index 103b5d05..a15bdf40 100644
--- a/engine/editor/icons/NavigationObstacle3D.svg
+++ b/engine/editor/icons/NavigationObstacle3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 .875C7.375.875 6.75 1.25 6.5 2l-3 10H8V9H5.5l1-4H8zM2 13c-1 0-1 2 0 2h6v-2z"/><path fill="#fc7f7f" d="M8 .875V5h1.5l1 4H8v3h4.5l-3-10C9.25 1.25 8.625.875 8 .875zM8 13v2h6c1 0 1-2 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 .875C7.375.875 6.75 1.25 6.5 2l-3 10H8V9H5.5l1-4H8zM2 13c-1 0-1 2 0 2h6v-2z"/><path fill="#fc7f7f" d="M8 .875V5h1.5l1 4H8v3h4.5l-3-10C9.25 1.25 8.625.875 8 .875zM8 13v2h6c1 0 1-2 0-2z"/></svg>
diff --git a/engine/editor/icons/NavigationPolygon.svg b/engine/editor/icons/NavigationPolygon.svg
index faa950f7..08c7a99b 100644
--- a/engine/editor/icons/NavigationPolygon.svg
+++ b/engine/editor/icons/NavigationPolygon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4.902a2.1 2.1 0 0 1 .131-.736L7.508 13H3V3h8.586L7.293 7.293a1 1 0 0 0 0 1.414l1.326 1.326 1.414-3.77a2.1 2.1 0 0 1 1.992-1.36 2.1 2.1 0 0 1 .436.05l2.246-2.246A1 1 0 0 0 14 1H2zm13 14-3-8-3 8 3-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4.902a2.1 2.1 0 0 1 .131-.736L7.508 13H3V3h8.586L7.293 7.293a1 1 0 0 0 0 1.414l1.326 1.326 1.414-3.77a2.1 2.1 0 0 1 1.992-1.36 2.1 2.1 0 0 1 .436.05l2.246-2.246A1 1 0 0 0 14 1H2zm13 14-3-8-3 8 3-2z"/></svg>
diff --git a/engine/editor/icons/NavigationRegion2D.svg b/engine/editor/icons/NavigationRegion2D.svg
index 156b160c..5bb1d80b 100644
--- a/engine/editor/icons/NavigationRegion2D.svg
+++ b/engine/editor/icons/NavigationRegion2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4.885a2.118 2.118 0 0 1 .133-.744l3-8a2.118 2.118 0 0 1 3.964 0L15 8.969V2a.992.992 0 0 0-1-1zm10 6-3 8 3-2 3 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4.885a2.118 2.118 0 0 1 .133-.744l3-8a2.118 2.118 0 0 1 3.964 0L15 8.969V2a.992.992 0 0 0-1-1zm10 6-3 8 3-2 3 2z"/></svg>
diff --git a/engine/editor/icons/NavigationRegion3D.svg b/engine/editor/icons/NavigationRegion3D.svg
index b6915e21..6cb4b898 100644
--- a/engine/editor/icons/NavigationRegion3D.svg
+++ b/engine/editor/icons/NavigationRegion3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4.885a2.118 2.118 0 0 1 .133-.744l3-8a2.118 2.118 0 0 1 3.964 0L15 8.969V2a.992.992 0 0 0-1-1zm10 6-3 8 3-2 3 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4.885a2.118 2.118 0 0 1 .133-.744l3-8a2.118 2.118 0 0 1 3.964 0L15 8.969V2a.992.992 0 0 0-1-1zm10 6-3 8 3-2 3 2z"/></svg>
diff --git a/engine/editor/icons/New.svg b/engine/editor/icons/New.svg
index 8ac4eea4..4afeb011 100644
--- a/engine/editor/icons/New.svg
+++ b/engine/editor/icons/New.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1v14h8v-1H8v-4h2V8h4V6H9V1zm8 0v4h4z"/><path fill="#5fff97" d="M11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1v14h8v-1H8v-4h2V8h4V6H9V1zm8 0v4h4z"/><path fill="#5fff97" d="M11 9v2H9v2h2v2h2v-2h2v-2h-2V9z"/></svg>
diff --git a/engine/editor/icons/NewKey.svg b/engine/editor/icons/NewKey.svg
index a69744f3..1eb5630c 100644
--- a/engine/editor/icons/NewKey.svg
+++ b/engine/editor/icons/NewKey.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 9h-2v2H9v2h2v2h2v-2h2v-2h-2zm-3 .723A2 2 0 1 1 13 8h1v2h.445a4 4 0 1 0-7.314-3H1v2h1v2h3V9h2.133A4 4 0 0 0 8 10.627V10h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 9h-2v2H9v2h2v2h2v-2h2v-2h-2zm-3 .723A2 2 0 1 1 13 8h1v2h.445a4 4 0 1 0-7.314-3H1v2h1v2h3V9h2.133A4 4 0 0 0 8 10.627V10h2z"/></svg>
diff --git a/engine/editor/icons/NewRoot.svg b/engine/editor/icons/NewRoot.svg
index b06f6670..9702f67a 100644
--- a/engine/editor/icons/NewRoot.svg
+++ b/engine/editor/icons/NewRoot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 5v1.5a2 2 0 1 0 2.75 2.75h1.5A2 2 0 0 0 7 10v1.5a2 2 0 1 0 2.75 2.75h1.5a2 2 0 1 0 0-2h-1.5A2 2 0 0 0 9 11.5V10a2 2 0 1 0-2.75-2.75h-1.5A2 2 0 0 0 4 6.5V5z"/><path fill="#5fff97" d="M2 5a2 2 0 1 1 2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 5v1.5a2 2 0 1 0 2.75 2.75h1.5A2 2 0 0 0 7 10v1.5a2 2 0 1 0 2.75 2.75h1.5a2 2 0 1 0 0-2h-1.5A2 2 0 0 0 9 11.5V10a2 2 0 1 0-2.75-2.75h-1.5A2 2 0 0 0 4 6.5V5z"/><path fill="#5fff97" d="M2 5a2 2 0 1 1 2 0z"/></svg>
diff --git a/engine/editor/icons/NextFrame.svg b/engine/editor/icons/NextFrame.svg
index 9609b253..be0c9f7c 100644
--- a/engine/editor/icons/NextFrame.svg
+++ b/engine/editor/icons/NextFrame.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m 12,3 c -0.552285,0 -1,0.4477153 -1,1 v 8 c 0,0.552285 0.447715,1 1,1 h 1 c 0.552285,0 1,-0.447715 1,-1 V 4 C 14,3.4477153 13.552285,3 13,3 Z M 2.975,3.002 C 2.4332786,3.0155465 2.0009144,3.45811 2,4 v 8 c -3.148e-4,0.838862 0.9701632,1.305289 1.625,0.781 l 5,-4 c 0.4989606,-0.4003069 0.4989606,-1.1596931 0,-1.56 l -5,-4 C 3.4409271,3.0736532 3.2107095,2.9960875 2.975,3.002 Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m 12,3 c -0.552285,0 -1,0.4477153 -1,1 v 8 c 0,0.552285 0.447715,1 1,1 h 1 c 0.552285,0 1,-0.447715 1,-1 V 4 C 14,3.4477153 13.552285,3 13,3 Z M 2.975,3.002 C 2.4332786,3.0155465 2.0009144,3.45811 2,4 v 8 c -3.148e-4,0.838862 0.9701632,1.305289 1.625,0.781 l 5,-4 c 0.4989606,-0.4003069 0.4989606,-1.1596931 0,-1.56 l -5,-4 C 3.4409271,3.0736532 3.2107095,2.9960875 2.975,3.002 Z"/></svg>
diff --git a/engine/editor/icons/Nil.svg b/engine/editor/icons/Nil.svg
index 01c729bd..05586cd5 100644
--- a/engine/editor/icons/Nil.svg
+++ b/engine/editor/icons/Nil.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M8 2v2h2V2zm3 0v5a3 3 0 0 0 3 3h1V8h-1a1 1 0 0 1-1-1V2zM1 4v6h2V6h1a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm7 2v4h2V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M8 2v2h2V2zm3 0v5a3 3 0 0 0 3 3h1V8h-1a1 1 0 0 1-1-1V2zM1 4v6h2V6h1a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm7 2v4h2V6z"/></svg>
diff --git a/engine/editor/icons/NinePatchRect.svg b/engine/editor/icons/NinePatchRect.svg
index 77a42c1e..89766738 100644
--- a/engine/editor/icons/NinePatchRect.svg
+++ b/engine/editor/icons/NinePatchRect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 1h14v14H1zm2 2v2h2V3zm3 0v2h4V3zm5 0v2h2V3zM3 6v4h2V6zm3 0v4h4V6zm5 0v4h2V6zm-8 5v2h2v-2zm3 0v2h4v-2zm5 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 1h14v14H1zm2 2v2h2V3zm3 0v2h4V3zm5 0v2h2V3zM3 6v4h2V6zm3 0v4h4V6zm5 0v4h2V6zm-8 5v2h2v-2zm3 0v2h4v-2zm5 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/Node.svg b/engine/editor/icons/Node.svg
index e9605994..0f9c3000 100644
--- a/engine/editor/icons/Node.svg
+++ b/engine/editor/icons/Node.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#e0e0e0" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#e0e0e0" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/Node2D.svg b/engine/editor/icons/Node2D.svg
index 249b3c99..02485560 100644
--- a/engine/editor/icons/Node2D.svg
+++ b/engine/editor/icons/Node2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#8da5f3" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#8da5f3" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/Node3D.svg b/engine/editor/icons/Node3D.svg
index 1e3f32c0..24fa651c 100644
--- a/engine/editor/icons/Node3D.svg
+++ b/engine/editor/icons/Node3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#fc7f7f" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#fc7f7f" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/NodeDisabled.svg b/engine/editor/icons/NodeDisabled.svg
index b3ec9cc5..2e465b79 100644
--- a/engine/editor/icons/NodeDisabled.svg
+++ b/engine/editor/icons/NodeDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#919191" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5" fill="none" stroke="#919191" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/NodeInfo.svg b/engine/editor/icons/NodeInfo.svg
index 81fa0aba..e13d3146 100644
--- a/engine/editor/icons/NodeInfo.svg
+++ b/engine/editor/icons/NodeInfo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 4h2v2H7zm0 3h2v5H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 4h2v2H7zm0 3h2v5H7z"/></svg>
diff --git a/engine/editor/icons/NodePath.svg b/engine/editor/icons/NodePath.svg
index 07734769..0d37ca6e 100644
--- a/engine/editor/icons/NodePath.svg
+++ b/engine/editor/icons/NodePath.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#417aec" d="M0 2v8h2V8a3 3 0 0 0 0-6zm6 0v5a3 3 0 0 0 3 3h1V8H9a1 1 0 0 1-1-1V6h2V4H8V2zm5 0v8h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3V2zM2 4a1 1 0 0 1 0 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#417aec" d="M0 2v8h2V8a3 3 0 0 0 0-6zm6 0v5a3 3 0 0 0 3 3h1V8H9a1 1 0 0 1-1-1V6h2V4H8V2zm5 0v8h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3V2zM2 4a1 1 0 0 1 0 2z"/></svg>
diff --git a/engine/editor/icons/NodeWarning.svg b/engine/editor/icons/NodeWarning.svg
index 051f28dd..87e835a1 100644
--- a/engine/editor/icons/NodeWarning.svg
+++ b/engine/editor/icons/NodeWarning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z"/></svg>
diff --git a/engine/editor/icons/NodeWarnings2.svg b/engine/editor/icons/NodeWarnings2.svg
index 6b8c0ddd..d8d952ad 100644
--- a/engine/editor/icons/NodeWarnings2.svg
+++ b/engine/editor/icons/NodeWarnings2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fff" d="M0 0v16h16V8.24A3 3 0 0 1 11 6V0z"/></mask><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z" mask="url(#a)"/><path fill="#f95252" d="M14 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm1.447 4.621a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fff" d="M0 0v16h16V8.24A3 3 0 0 1 11 6V0z"/></mask><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z" mask="url(#a)"/><path fill="#f95252" d="M14 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm1.447 4.621a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0z"/></svg>
diff --git a/engine/editor/icons/NodeWarnings3.svg b/engine/editor/icons/NodeWarnings3.svg
index 77ad1d09..034771aa 100644
--- a/engine/editor/icons/NodeWarnings3.svg
+++ b/engine/editor/icons/NodeWarnings3.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fff" d="M0 0v16h16v-3.76A3 3 0 0 1 11.77 8a3 3 0 0 1 0-4V0z"/></mask><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z" mask="url(#a)"/><path fill="#f95252" d="M14 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm1.447 4.621a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0zm0 4a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fff" d="M0 0v16h16v-3.76A3 3 0 0 1 11.77 8a3 3 0 0 1 0-4V0z"/></mask><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z" mask="url(#a)"/><path fill="#f95252" d="M14 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm1.447 4.621a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0zm0 4a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0z"/></svg>
diff --git a/engine/editor/icons/NodeWarnings4Plus.svg b/engine/editor/icons/NodeWarnings4Plus.svg
index 79ec2d87..b3230da1 100644
--- a/engine/editor/icons/NodeWarnings4Plus.svg
+++ b/engine/editor/icons/NodeWarnings4Plus.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fff" d="M0 0v16h11.77a3 3 0 0 1 0-4 3 3 0 0 1 0-4 3 3 0 0 1 0-4V0z"/></mask><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z" mask="url(#a)"/><path fill="#f95252" d="M14 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm1.447 4.621a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0zm0 4a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0zm0 4a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fff" d="M0 0v16h11.77a3 3 0 0 1 0-4 3 3 0 0 1 0-4 3 3 0 0 1 0-4V0z"/></mask><path fill="#ffdd65" d="M8 2a1 1 0 0 0-.85.484l-6 10A1 1 0 0 0 2 14h12a1 1 0 0 0 .857-1.514l-6-10a1 1 0 0 0-.85-.484zM7 5h2v5H7zm0 6h2v2H7z" mask="url(#a)"/><path fill="#f95252" d="M14 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm1.447 4.621a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0zm0 4a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0zm0 4a3 3 0 0 1-2.892 0 2 2 0 1 0 2.892 0z"/></svg>
diff --git a/engine/editor/icons/NonFavorite.svg b/engine/editor/icons/NonFavorite.svg
index 8743ab41..45f162e1 100644
--- a/engine/editor/icons/NonFavorite.svg
+++ b/engine/editor/icons/NonFavorite.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1.725 5.625 5.822 1 6.92l3.236 3.406L3.876 15l4.14-1.977 4.158 1.942-.397-4.652L15 6.92l-4.625-1.098L8 1.725zM8 4l1.658 2.777 3.233.744-2.25 2.301.275 3.155-2.904-1.317L5.119 13l.252-3.168-2.262-2.31 3.233-.745L8 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1.725 5.625 5.822 1 6.92l3.236 3.406L3.876 15l4.14-1.977 4.158 1.942-.397-4.652L15 6.92l-4.625-1.098L8 1.725zM8 4l1.658 2.777 3.233.744-2.25 2.301.275 3.155-2.904-1.317L5.119 13l.252-3.168-2.262-2.31 3.233-.745L8 4z"/></svg>
diff --git a/engine/editor/icons/Notification.svg b/engine/editor/icons/Notification.svg
index 939214c3..4245ee32 100644
--- a/engine/editor/icons/Notification.svg
+++ b/engine/editor/icons/Notification.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#e0e0e0" d="M10.755 1.795a3 3 0 0 0-4.061 1.517L4.968 6.919s-.864 1.804-1.668 1.3a1 1 0 0 0-.958 2l9.02 4.318a1 1 0 0 0 .957-2c-.902-.432-.038-2.236-.038-2.236l1.727-3.608a3 3 0 0 0-1.41-4 1 1 0 0 0-1.843-.898zM7 13a1.352 1.352 0 1 0 2.438 1.167z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><path fill="#e0e0e0" d="M10.755 1.795a3 3 0 0 0-4.061 1.517L4.968 6.919s-.864 1.804-1.668 1.3a1 1 0 0 0-.958 2l9.02 4.318a1 1 0 0 0 .957-2c-.902-.432-.038-2.236-.038-2.236l1.727-3.608a3 3 0 0 0-1.41-4 1 1 0 0 0-1.843-.898zM7 13a1.352 1.352 0 1 0 2.438 1.167z"/></svg>
diff --git a/engine/editor/icons/NotificationDisabled.svg b/engine/editor/icons/NotificationDisabled.svg
index 6852a449..23d56c28 100644
--- a/engine/editor/icons/NotificationDisabled.svg
+++ b/engine/editor/icons/NotificationDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><mask id="a"><path fill="#fff" d="M13.5 1H1v10.5zm-11 14H15V4.5z"/></mask><path fill="#e0e0e0" d="M10.755 1.795a3 3 0 0 0-4.061 1.517L4.968 6.919s-.864 1.804-1.668 1.3a1 1 0 0 0-.958 2l9.02 4.318a1 1 0 0 0 .957-2c-.902-.432-.038-2.236-.038-2.236l1.727-3.608a3 3 0 0 0-1.41-4 1 1 0 0 0-1.843-.898zM7 13a1.352 1.352 0 1 0 2.438 1.167z" mask="url(#a)"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M2 13 14 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none"><mask id="a"><path fill="#fff" d="M13.5 1H1v10.5zm-11 14H15V4.5z"/></mask><path fill="#e0e0e0" d="M10.755 1.795a3 3 0 0 0-4.061 1.517L4.968 6.919s-.864 1.804-1.668 1.3a1 1 0 0 0-.958 2l9.02 4.318a1 1 0 0 0 .957-2c-.902-.432-.038-2.236-.038-2.236l1.727-3.608a3 3 0 0 0-1.41-4 1 1 0 0 0-1.843-.898zM7 13a1.352 1.352 0 1 0 2.438 1.167z" mask="url(#a)"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M2 13 14 3"/></svg>
diff --git a/engine/editor/icons/ORMMaterial3D.svg b/engine/editor/icons/ORMMaterial3D.svg
index 99b8bee6..536527a1 100644
--- a/engine/editor/icons/ORMMaterial3D.svg
+++ b/engine/editor/icons/ORMMaterial3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#80ff45" d="M7.75 3.375 4 5.25l3.75 1.875L11.5 5.25z"/><path fill="#ff4545" d="M3.375 6.5v3.75L7 12.063v-3.75z"/><path fill="#45d7ff" d="M12.125 6.5 8.5 8.313v3.75l3.625-1.813z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#80ff45" d="M7.75 3.375 4 5.25l3.75 1.875L11.5 5.25z"/><path fill="#ff4545" d="M3.375 6.5v3.75L7 12.063v-3.75z"/><path fill="#45d7ff" d="M12.125 6.5 8.5 8.313v3.75l3.625-1.813z"/></svg>
diff --git a/engine/editor/icons/Object.svg b/engine/editor/icons/Object.svg
index 1fd1b109..61c8cc89 100644
--- a/engine/editor/icons/Object.svg
+++ b/engine/editor/icons/Object.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.553 4.104A1 1 0 0 0 1 5v6a1 1 0 0 0 .553.895l6 3a1 1 0 0 0 .894 0l6-3A1 1 0 0 0 15 11V5a1 1 0 0 0-.553-.894l-6-3a1 1 0 0 0-.894 0zm6.447-1 3.764 1.882L8 6.868 4.236 4.986zm-5 3.5 4 2v3.766l-4-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.553 4.104A1 1 0 0 0 1 5v6a1 1 0 0 0 .553.895l6 3a1 1 0 0 0 .894 0l6-3A1 1 0 0 0 15 11V5a1 1 0 0 0-.553-.894l-6-3a1 1 0 0 0-.894 0zm6.447-1 3.764 1.882L8 6.868 4.236 4.986zm-5 3.5 4 2v3.766l-4-2z"/></svg>
diff --git a/engine/editor/icons/ObjectDisabled.svg b/engine/editor/icons/ObjectDisabled.svg
index 75f483e8..f9bdd9de 100644
--- a/engine/editor/icons/ObjectDisabled.svg
+++ b/engine/editor/icons/ObjectDisabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M1.553 4.104A1 1 0 0 0 1 5v6a1 1 0 0 0 .553.895l6 3a1 1 0 0 0 .894 0l6-3A1 1 0 0 0 15 11V5a1 1 0 0 0-.553-.894l-6-3a1 1 0 0 0-.894 0zm6.447-1 3.764 1.882L8 6.868 4.236 4.986zm-5 3.5 4 2v3.766l-4-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M1.553 4.104A1 1 0 0 0 1 5v6a1 1 0 0 0 .553.895l6 3a1 1 0 0 0 .894 0l6-3A1 1 0 0 0 15 11V5a1 1 0 0 0-.553-.894l-6-3a1 1 0 0 0-.894 0zm6.447-1 3.764 1.882L8 6.868 4.236 4.986zm-5 3.5 4 2v3.766l-4-2z"/></svg>
diff --git a/engine/editor/icons/Occluder3D.svg b/engine/editor/icons/Occluder3D.svg
index e8d2cccd..e9f9d62e 100644
--- a/engine/editor/icons/Occluder3D.svg
+++ b/engine/editor/icons/Occluder3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M8.242 2a4.5 4.5 0 0 1 .729 2h2.3a2 2 0 0 0 .729.73v5.856L8.307 6.893a4.5 4.5 0 0 1-1.414 1.414L10.586 12H4.729A2 2 0 0 0 4 11.27V8.965a4.5 4.5 0 0 1-2-.729v3.035A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M8.242 2a4.5 4.5 0 0 1 .729 2h2.3a2 2 0 0 0 .729.73v5.856L8.307 6.893a4.5 4.5 0 0 1-1.414 1.414L10.586 12H4.729A2 2 0 0 0 4 11.27V8.965a4.5 4.5 0 0 1-2-.729v3.035A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2z"/></svg>
diff --git a/engine/editor/icons/OccluderInstance3D.svg b/engine/editor/icons/OccluderInstance3D.svg
index c0f10e0a..52467d8b 100644
--- a/engine/editor/icons/OccluderInstance3D.svg
+++ b/engine/editor/icons/OccluderInstance3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6.607 1.139A4.5 4.5 0 1 1 1.141 6.61a7 7 0 1 0 5.466-5.47z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6.607 1.139A4.5 4.5 0 1 1 1.141 6.61a7 7 0 1 0 5.466-5.47z"/></svg>
diff --git a/engine/editor/icons/OccluderPolygon2D.svg b/engine/editor/icons/OccluderPolygon2D.svg
index f2823605..73db5b0d 100644
--- a/engine/editor/icons/OccluderPolygon2D.svg
+++ b/engine/editor/icons/OccluderPolygon2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m1 9 6 6h8V7L9 1H1z"/><path fill-opacity=".235" d="m9 1 6 6v8H7L1 9h8L6 5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m1 9 6 6h8V7L9 1H1z"/><path fill-opacity=".235" d="m9 1 6 6v8H7L1 9h8L6 5z"/></svg>
diff --git a/engine/editor/icons/OmniLight3D.svg b/engine/editor/icons/OmniLight3D.svg
index 004ada83..32cea806 100644
--- a/engine/editor/icons/OmniLight3D.svg
+++ b/engine/editor/icons/OmniLight3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 10.576V13h4v-2.42a5 5 0 1 0-4 0zM8 3a3 3 0 0 1 0 6 3 3 0 0 1 0-6zM7 14v1h2v-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 10.576V13h4v-2.42a5 5 0 1 0-4 0zM8 3a3 3 0 0 1 0 6 3 3 0 0 1 0-6zM7 14v1h2v-1z"/></svg>
diff --git a/engine/editor/icons/OneWayTile.svg b/engine/editor/icons/OneWayTile.svg
index 1cc5838f..07434ba8 100644
--- a/engine/editor/icons/OneWayTile.svg
+++ b/engine/editor/icons/OneWayTile.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" stroke-linecap="round" stroke-linejoin="round"><path fill="#fff" d="M10.959 1.5 8.002 4.436 5.043 1.502 4 2.529 8 6.5l4-3.967zm0 8-2.957 2.936-2.959-2.934L4 10.529 8 14.5l4-3.967z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" stroke-linecap="round" stroke-linejoin="round"><path fill="#fff" d="M10.959 1.5 8.002 4.436 5.043 1.502 4 2.529 8 6.5l4-3.967zm0 8-2.957 2.936-2.959-2.934L4 10.529 8 14.5l4-3.967z"/></svg>
diff --git a/engine/editor/icons/Onion.svg b/engine/editor/icons/Onion.svg
index 274c1785..04ced6ab 100644
--- a/engine/editor/icons/Onion.svg
+++ b/engine/editor/icons/Onion.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1C6 3 1 5 1 9s3 6 7 6C1 12 1.4 7.25 8 2c-2.25 4-5.5 9 0 13 5-4.25 2.75-8.25 1-12 5.5 4.75 5.5 8.75-1 12 4 0 7-2 7-6s-5-6-7-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1C6 3 1 5 1 9s3 6 7 6C1 12 1.4 7.25 8 2c-2.25 4-5.5 9 0 13 5-4.25 2.75-8.25 1-12 5.5 4.75 5.5 8.75-1 12 4 0 7-2 7-6s-5-6-7-8z"/></svg>
diff --git a/engine/editor/icons/OptionButton.svg b/engine/editor/icons/OptionButton.svg
index 663e4759..1cd2edc6 100644
--- a/engine/editor/icons/OptionButton.svg
+++ b/engine/editor/icons/OptionButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zm7.293 3.307a1 1 0 0 1 1.424 1.414l-3 3a1 1 0 0 1-1.414 0l-3-3a1 1 0 0 1 1.414-1.414L8 8.6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zm7.293 3.307a1 1 0 0 1 1.424 1.414l-3 3a1 1 0 0 1-1.414 0l-3-3a1 1 0 0 1 1.414-1.414L8 8.6z"/></svg>
diff --git a/engine/editor/icons/Orientation.svg b/engine/editor/icons/Orientation.svg
new file mode 100644
index 00000000..887c5710
--- /dev/null
+++ b/engine/editor/icons/Orientation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path fill="#e0e0e0" d="M3 2H6A2 2 0 0 1 8 4V20A2 2 0 0 1 6 22H3A2 2 0 0 1 1 20V4A2 2 0 0 1 3 2M21 15A2 2 0 0 1 23 17V20A2 2 0 0 1 21 22H12V15H21Z"/></svg>
diff --git a/engine/editor/icons/OverbrightIndicator.svg b/engine/editor/icons/OverbrightIndicator.svg
index a8eea32f..be3d71b6 100644
--- a/engine/editor/icons/OverbrightIndicator.svg
+++ b/engine/editor/icons/OverbrightIndicator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000" d="m.5.5v10l10-10z"/><path fill="#000003" d="m0 12 12-12h-1.714286l-10.285714 10.285714z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000" d="m.5.5v10l10-10z"/><path fill="#000003" d="m0 12 12-12h-1.714286l-10.285714 10.285714z"/></svg>
diff --git a/engine/editor/icons/Override.svg b/engine/editor/icons/Override.svg
index a09c0c5e..47b7e056 100644
--- a/engine/editor/icons/Override.svg
+++ b/engine/editor/icons/Override.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 1c-1.108 0-2 .89199-2 2v1h4v-1h2v1h4v-1c0-1.108-.89199-2-2-2zm-2 5c-1.108 0-2 .89199-2 2v5c0 1.108.89199 2 2 2h10c1.108 0 2-.89199 2-2v-5c0-1.108-.89199-2-2-2h-4v3h2l-3 4-3-4h2v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 1c-1.108 0-2 .89199-2 2v1h4v-1h2v1h4v-1c0-1.108-.89199-2-2-2zm-2 5c-1.108 0-2 .89199-2 2v5c0 1.108.89199 2 2 2h10c1.108 0 2-.89199 2-2v-5c0-1.108-.89199-2-2-2h-4v3h2l-3 4-3-4h2v-3z"/></svg>
diff --git a/engine/editor/icons/PackedByteArray.svg b/engine/editor/icons/PackedByteArray.svg
index df53aa67..11063a22 100644
--- a/engine/editor/icons/PackedByteArray.svg
+++ b/engine/editor/icons/PackedByteArray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#5fff97" d="M5 3a3 3 0 0 0-3 3v3h2V6a1 1 0 0 1 1-1h1v4h2a3 3 0 0 0 1-.176V9h2a3 3 0 0 0 3-3V3h-2v3a1 1 0 0 1-1 1V3H9v3a1 1 0 0 1-1 1V3z"/><path fill="#fff" fill-opacity=".4" d="M6 9V3h2v4a1 1 0 0 0 1-1V3h2v4a1 1 0 0 0 1-1V3h2v3a3 3 0 0 1-3 3H9v-.176A3 3 0 0 1 8 9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#5fff97" d="M5 3a3 3 0 0 0-3 3v3h2V6a1 1 0 0 1 1-1h1v4h2a3 3 0 0 0 1-.176V9h2a3 3 0 0 0 3-3V3h-2v3a1 1 0 0 1-1 1V3H9v3a1 1 0 0 1-1 1V3z"/><path fill="#fff" fill-opacity=".4" d="M6 9V3h2v4a1 1 0 0 0 1-1V3h2v4a1 1 0 0 0 1-1V3h2v3a3 3 0 0 1-3 3H9v-.176A3 3 0 0 1 8 9z"/></svg>
diff --git a/engine/editor/icons/PackedColorArray.svg b/engine/editor/icons/PackedColorArray.svg
index f85196ad..fc0b6967 100644
--- a/engine/editor/icons/PackedColorArray.svg
+++ b/engine/editor/icons/PackedColorArray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#ff4545" d="M6 3.5a3 3 0 0 0 0 6h1v-2H6a1 1 0 0 1 0-2h1v-2z"/><path fill="#80ff45" d="M7 1.5v5a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1v-5z"/><path fill="#45d7ff" d="M13 3.5a3 3 0 0 0-3 3v3h2v-3a1 1 0 0 1 1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#ff4545" d="M6 3.5a3 3 0 0 0 0 6h1v-2H6a1 1 0 0 1 0-2h1v-2z"/><path fill="#80ff45" d="M7 1.5v5a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1v-5z"/><path fill="#45d7ff" d="M13 3.5a3 3 0 0 0-3 3v3h2v-3a1 1 0 0 1 1-1z"/></svg>
diff --git a/engine/editor/icons/PackedDataContainer.svg b/engine/editor/icons/PackedDataContainer.svg
index 87789e3a..513f439d 100644
--- a/engine/editor/icons/PackedDataContainer.svg
+++ b/engine/editor/icons/PackedDataContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v10H3zm1 1v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM4 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm-6 3v2h2v-2zm3 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v10H3zm1 1v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM4 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm-6 3v2h2v-2zm3 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/PackedFloat32Array.svg b/engine/editor/icons/PackedFloat32Array.svg
index 305e1ef5..efcf8be5 100644
--- a/engine/editor/icons/PackedFloat32Array.svg
+++ b/engine/editor/icons/PackedFloat32Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#35d4f4" d="M6 2a3 3 0 0 0-3 3v5h2V8h1V6H5V5a1 1 0 0 1 1-1zm1 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2zm3 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2z"/><path fill="#fff" fill-opacity=".4" d="M7 2v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#35d4f4" d="M6 2a3 3 0 0 0-3 3v5h2V8h1V6H5V5a1 1 0 0 1 1-1zm1 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2zm3 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2z"/><path fill="#fff" fill-opacity=".4" d="M7 2v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2z"/></svg>
diff --git a/engine/editor/icons/PackedFloat64Array.svg b/engine/editor/icons/PackedFloat64Array.svg
index 305e1ef5..efcf8be5 100644
--- a/engine/editor/icons/PackedFloat64Array.svg
+++ b/engine/editor/icons/PackedFloat64Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#35d4f4" d="M6 2a3 3 0 0 0-3 3v5h2V8h1V6H5V5a1 1 0 0 1 1-1zm1 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2zm3 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2z"/><path fill="#fff" fill-opacity=".4" d="M7 2v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#35d4f4" d="M6 2a3 3 0 0 0-3 3v5h2V8h1V6H5V5a1 1 0 0 1 1-1zm1 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2zm3 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2z"/><path fill="#fff" fill-opacity=".4" d="M7 2v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2z"/></svg>
diff --git a/engine/editor/icons/PackedInt32Array.svg b/engine/editor/icons/PackedInt32Array.svg
index 18404c6a..d7b05f7c 100644
--- a/engine/editor/icons/PackedInt32Array.svg
+++ b/engine/editor/icons/PackedInt32Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#5abbef" d="M3 2v2h2V2zm2 2v2H3v4h4V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm5 3a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2h-2z"/><path fill="#fff" fill-opacity=".4" d="M5 4v6h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#5abbef" d="M3 2v2h2V2zm2 2v2H3v4h4V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm5 3a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2h-2z"/><path fill="#fff" fill-opacity=".4" d="M5 4v6h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3z"/></svg>
diff --git a/engine/editor/icons/PackedInt64Array.svg b/engine/editor/icons/PackedInt64Array.svg
index 18404c6a..d7b05f7c 100644
--- a/engine/editor/icons/PackedInt64Array.svg
+++ b/engine/editor/icons/PackedInt64Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#5abbef" d="M3 2v2h2V2zm2 2v2H3v4h4V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm5 3a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2h-2z"/><path fill="#fff" fill-opacity=".4" d="M5 4v6h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#5abbef" d="M3 2v2h2V2zm2 2v2H3v4h4V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm5 3a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2h-2z"/><path fill="#fff" fill-opacity=".4" d="M5 4v6h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3z"/></svg>
diff --git a/engine/editor/icons/PackedScene.svg b/engine/editor/icons/PackedScene.svg
index d7ffd1bc..5c8a199b 100644
--- a/engine/editor/icons/PackedScene.svg
+++ b/engine/editor/icons/PackedScene.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.244.328.818 1.9 1.715-.25zm-4.223.615-1.978.29.818 1.902 1.979-.29zm-3.959.578-1.978.29.818 1.902 1.979-.29zm-3.957.578-1.714.25L1 6l2.244-.328zM1 7v6a2 2 0 0 0 2 2h12V7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.244.328.818 1.9 1.715-.25zm-4.223.615-1.978.29.818 1.902 1.979-.29zm-3.959.578-1.978.29.818 1.902 1.979-.29zm-3.957.578-1.714.25L1 6l2.244-.328zM1 7v6a2 2 0 0 0 2 2h12V7z"/></svg>
diff --git a/engine/editor/icons/PackedStringArray.svg b/engine/editor/icons/PackedStringArray.svg
index cbc2b8ee..398e820e 100644
--- a/engine/editor/icons/PackedStringArray.svg
+++ b/engine/editor/icons/PackedStringArray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#4593ec" d="M5 2a2.5 2.5 0 0 0 0 5 .5.5 0 0 1 0 1H2v2h3a2.5 2.5 0 0 0 0-5 .5.5 0 0 1 0-1h3v3a3 3 0 0 0 3 3h2V7a1 1 0 0 1 1-1V4a3 3 0 0 0-3 3v1a1 1 0 0 1-1-1V6h1V4h-1V2z"/><path fill="#fff" fill-opacity=".4" d="M8 2v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#4593ec" d="M5 2a2.5 2.5 0 0 0 0 5 .5.5 0 0 1 0 1H2v2h3a2.5 2.5 0 0 0 0-5 .5.5 0 0 1 0-1h3v3a3 3 0 0 0 3 3h2V7a1 1 0 0 1 1-1V4a3 3 0 0 0-3 3v1a1 1 0 0 1-1-1V6h1V4h-1V2z"/><path fill="#fff" fill-opacity=".4" d="M8 2v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2z"/></svg>
diff --git a/engine/editor/icons/PackedVector2Array.svg b/engine/editor/icons/PackedVector2Array.svg
index fa25fb62..97ba1042 100644
--- a/engine/editor/icons/PackedVector2Array.svg
+++ b/engine/editor/icons/PackedVector2Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#ac73f1" d="M9 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6zM3 3v6h2a3 3 0 0 0 3-3V3H6v3a1 1 0 0 1-1 1V3z"/><path fill="#fff" fill-opacity=".4" d="M9 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#ac73f1" d="M9 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6zM3 3v6h2a3 3 0 0 0 3-3V3H6v3a1 1 0 0 1-1 1V3z"/><path fill="#fff" fill-opacity=".4" d="M9 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6z"/></svg>
diff --git a/engine/editor/icons/PackedVector3Array.svg b/engine/editor/icons/PackedVector3Array.svg
index 6f44ef63..07dee723 100644
--- a/engine/editor/icons/PackedVector3Array.svg
+++ b/engine/editor/icons/PackedVector3Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#de66f0" d="M8 1v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 3V1zm0 2H6v3a1 1 0 0 1-1 1V3H3v6h2a3 3 0 0 0 3-3z"/><path fill="#fff" fill-opacity=".4" d="M8 1v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 3V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="M0 0v12h4v-2H2V2h2V0zm12 0v2h2v8h-2v2h4V0z"/><path fill="#de66f0" d="M8 1v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 3V1zm0 2H6v3a1 1 0 0 1-1 1V3H3v6h2a3 3 0 0 0 3-3z"/><path fill="#fff" fill-opacity=".4" d="M8 1v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 3V1z"/></svg>
diff --git a/engine/editor/icons/PackedVector4Array.svg b/engine/editor/icons/PackedVector4Array.svg
index d12eb59a..b4b6a7bc 100644
--- a/engine/editor/icons/PackedVector4Array.svg
+++ b/engine/editor/icons/PackedVector4Array.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="m0 0v12h4v-2h-2v-8h2v-2zm12 0v2h2v8h-2v2h4v-12z"/><path fill="#ac73f1" d="M8 3h2v2h1v-3h2v8h-2v-3h-3zM3 3v6h2a3 3 0 003-3v-3h-2v3a1 1 0 01-1 1v-4z"/><path fill="#fff" fill-opacity=".392" d="M8 3h2v2h1v-3h2v8h-2v-3h-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#e0e0e0" d="m0 0v12h4v-2h-2v-8h2v-2zm12 0v2h2v8h-2v2h4v-12z"/><path fill="#ac73f1" d="M8 3h2v2h1v-3h2v8h-2v-3h-3zM3 3v6h2a3 3 0 003-3v-3h-2v3a1 1 0 01-1 1v-4z"/><path fill="#fff" fill-opacity=".392" d="M8 3h2v2h1v-3h2v8h-2v-3h-3z"/></svg>
diff --git a/engine/editor/icons/PageFirst.svg b/engine/editor/icons/PageFirst.svg
index 3f754380..1168ed66 100644
--- a/engine/editor/icons/PageFirst.svg
+++ b/engine/editor/icons/PageFirst.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 3 3 6l3 3m3-6v6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 3 3 6l3 3m3-6v6"/></svg>
diff --git a/engine/editor/icons/PageLast.svg b/engine/editor/icons/PageLast.svg
index 64a68123..7a30b999 100644
--- a/engine/editor/icons/PageLast.svg
+++ b/engine/editor/icons/PageLast.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m6 9 3-3-3-3M3 9V3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m6 9 3-3-3-3M3 9V3"/></svg>
diff --git a/engine/editor/icons/PageNext.svg b/engine/editor/icons/PageNext.svg
index b0097516..a5e4674d 100644
--- a/engine/editor/icons/PageNext.svg
+++ b/engine/editor/icons/PageNext.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m4.5 9 3-3-3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m4.5 9 3-3-3-3"/></svg>
diff --git a/engine/editor/icons/PagePrevious.svg b/engine/editor/icons/PagePrevious.svg
index 9aecb27c..42f7ea2c 100644
--- a/engine/editor/icons/PagePrevious.svg
+++ b/engine/editor/icons/PagePrevious.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m7.5 3-3 3 3 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m7.5 3-3 3 3 3"/></svg>
diff --git a/engine/editor/icons/Paint.svg b/engine/editor/icons/Paint.svg
index 51dc521a..ee34c704 100644
--- a/engine/editor/icons/Paint.svg
+++ b/engine/editor/icons/Paint.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2.92 10c-.263.3-.42.73-.42 1.238 0 1.628-3.138-.178-.337 2.67.884.9 2.654.67 3.538-.228a2.33 2.33 0 0 0 0-3.256c-1.1-1.119-2.2-1.084-2.78-.424zm2.3-1.64 2.4 2.4 6.8-6.8a1.7 1.7 0 0 0-2.4-2.45z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2.92 10c-.263.3-.42.73-.42 1.238 0 1.628-3.138-.178-.337 2.67.884.9 2.654.67 3.538-.228a2.33 2.33 0 0 0 0-3.256c-1.1-1.119-2.2-1.084-2.78-.424zm2.3-1.64 2.4 2.4 6.8-6.8a1.7 1.7 0 0 0-2.4-2.45z"/></svg>
diff --git a/engine/editor/icons/Panel.svg b/engine/editor/icons/Panel.svg
index ae03c52d..f9c18c74 100644
--- a/engine/editor/icons/Panel.svg
+++ b/engine/editor/icons/Panel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#8eef97" rx="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#8eef97" rx="2"/></svg>
diff --git a/engine/editor/icons/PanelContainer.svg b/engine/editor/icons/PanelContainer.svg
index a1bc05b3..f6968a71 100644
--- a/engine/editor/icons/PanelContainer.svg
+++ b/engine/editor/icons/PanelContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3z"/></svg>
diff --git a/engine/editor/icons/Panels1.svg b/engine/editor/icons/Panels1.svg
index c37d9740..79a47796 100644
--- a/engine/editor/icons/Panels1.svg
+++ b/engine/editor/icons/Panels1.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12.002a2 2 0 0 0 2 2h12.002a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h12v10H2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12.002a2 2 0 0 0 2 2h12.002a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h12v10H2z"/></svg>
diff --git a/engine/editor/icons/Panels2.svg b/engine/editor/icons/Panels2.svg
index 673ae62a..19a90365 100644
--- a/engine/editor/icons/Panels2.svg
+++ b/engine/editor/icons/Panels2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h12v4H2zm12 6v4H2v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h12v4H2zm12 6v4H2v-4z"/></svg>
diff --git a/engine/editor/icons/Panels2Alt.svg b/engine/editor/icons/Panels2Alt.svg
index e2f27e41..aa45977c 100644
--- a/engine/editor/icons/Panels2Alt.svg
+++ b/engine/editor/icons/Panels2Alt.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h5v10H2zm7 0h5v10H9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h5v10H2zm7 0h5v10H9z"/></svg>
diff --git a/engine/editor/icons/Panels3.svg b/engine/editor/icons/Panels3.svg
index d5cf987c..bd12a0ff 100644
--- a/engine/editor/icons/Panels3.svg
+++ b/engine/editor/icons/Panels3.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h12v4H2zm0 6h5v4H2zm7 0h5v4H9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h12v4H2zm0 6h5v4H2zm7 0h5v4H9z"/></svg>
diff --git a/engine/editor/icons/Panels3Alt.svg b/engine/editor/icons/Panels3Alt.svg
index ea6745df..f2ebaa40 100644
--- a/engine/editor/icons/Panels3Alt.svg
+++ b/engine/editor/icons/Panels3Alt.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h5v4H2zm7 0h5v10H9zm-7 6h5v4H2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h5v4H2zm7 0h5v10H9zm-7 6h5v4H2z"/></svg>
diff --git a/engine/editor/icons/Panels4.svg b/engine/editor/icons/Panels4.svg
index 407dfba1..2dd668a7 100644
--- a/engine/editor/icons/Panels4.svg
+++ b/engine/editor/icons/Panels4.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h5v4H2zm7 0h5v4H9zm-7 6h5v4H2zm7 0h5v4H9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 4h5v4H2zm7 0h5v4H9zm-7 6h5v4H2zm7 0h5v4H9z"/></svg>
diff --git a/engine/editor/icons/PanoramaSkyMaterial.svg b/engine/editor/icons/PanoramaSkyMaterial.svg
index 1ae40e3d..eaca9a21 100644
--- a/engine/editor/icons/PanoramaSkyMaterial.svg
+++ b/engine/editor/icons/PanoramaSkyMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 2q7 4 14 0v12q-7-4-14 0zm2 7a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2zm8 0a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2h-2a1 1 0 0 0-1 1H9a1 1 0 0 0 0 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 2q7 4 14 0v12q-7-4-14 0zm2 7a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2zm8 0a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2h-2a1 1 0 0 0-1 1H9a1 1 0 0 0 0 2z"/></svg>
diff --git a/engine/editor/icons/Parallax2D.svg b/engine/editor/icons/Parallax2D.svg
index 86a8cc61..c45c8643 100644
--- a/engine/editor/icons/Parallax2D.svg
+++ b/engine/editor/icons/Parallax2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m3 1a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-10a2 2 0 00-2-2zm10 2v10h-10v-10zM7 5v6l-3-3zm2 0v6l3-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m3 1a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-10a2 2 0 00-2-2zm10 2v10h-10v-10zM7 5v6l-3-3zm2 0v6l3-3z"/></svg>
diff --git a/engine/editor/icons/ParallaxBackground.svg b/engine/editor/icons/ParallaxBackground.svg
index f2aa449d..9e860fa9 100644
--- a/engine/editor/icons/ParallaxBackground.svg
+++ b/engine/editor/icons/ParallaxBackground.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="13" height="13" x="1.5" y="1.5" fill="none" stroke="#e0e0e0" rx="1"/><path fill="#e0e0e0" d="M7 5v6L4 8zm2 0v6l3-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="13" height="13" x="1.5" y="1.5" fill="none" stroke="#e0e0e0" rx="1"/><path fill="#e0e0e0" d="M7 5v6L4 8zm2 0v6l3-3z"/></svg>
diff --git a/engine/editor/icons/ParallaxLayer.svg b/engine/editor/icons/ParallaxLayer.svg
index 1c3a3abd..ed207249 100644
--- a/engine/editor/icons/ParallaxLayer.svg
+++ b/engine/editor/icons/ParallaxLayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm4 4v6L4 8zm2 0 3 3-3 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm4 4v6L4 8zm2 0 3 3-3 3z"/></svg>
diff --git a/engine/editor/icons/ParticleProcessMaterial.svg b/engine/editor/icons/ParticleProcessMaterial.svg
index cff26a45..40cd8084 100644
--- a/engine/editor/icons/ParticleProcessMaterial.svg
+++ b/engine/editor/icons/ParticleProcessMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M12 11a3 3 0 0 0 .414-5.969 4.5 5 0 0 0-8.824 0 3 3 0 0 0 .414 5.967zm-8 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm8 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-4 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M12 11a3 3 0 0 0 .414-5.969 4.5 5 0 0 0-8.824 0 3 3 0 0 0 .414 5.967zm-8 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm8 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-4 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/Path2D.svg b/engine/editor/icons/Path2D.svg
index 481e23c3..495c7483 100644
--- a/engine/editor/icons/Path2D.svg
+++ b/engine/editor/icons/Path2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M13 1a2 2 0 0 0-1.15 3.633c-.193.885-.554 1.34-.987 1.642-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c.892-.625 1.532-1.654 1.818-3.098A2 2 0 0 0 13 1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M13 1a2 2 0 0 0-1.15 3.633c-.193.885-.554 1.34-.987 1.642-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c.892-.625 1.532-1.654 1.818-3.098A2 2 0 0 0 13 1z"/></svg>
diff --git a/engine/editor/icons/Path3D.svg b/engine/editor/icons/Path3D.svg
index 5f973c81..fc6e564e 100644
--- a/engine/editor/icons/Path3D.svg
+++ b/engine/editor/icons/Path3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M13 1a2 2 0 0 0-1.15 3.633c-.193.885-.554 1.34-.987 1.642-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c.892-.625 1.532-1.654 1.818-3.098A2 2 0 0 0 13 1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M13 1a2 2 0 0 0-1.15 3.633c-.193.885-.554 1.34-.987 1.642-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c.892-.625 1.532-1.654 1.818-3.098A2 2 0 0 0 13 1z"/></svg>
diff --git a/engine/editor/icons/PathFollow2D.svg b/engine/editor/icons/PathFollow2D.svg
index 7c9decc9..8da52b84 100644
--- a/engine/editor/icons/PathFollow2D.svg
+++ b/engine/editor/icons/PathFollow2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m13 0-3 4h1.947c-.138 1.32-.558 1.907-1.084 2.275-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c1.053-.737 1.755-2.032 1.937-3.914H16l-3-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m13 0-3 4h1.947c-.138 1.32-.558 1.907-1.084 2.275-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c1.053-.737 1.755-2.032 1.937-3.914H16l-3-4z"/></svg>
diff --git a/engine/editor/icons/PathFollow3D.svg b/engine/editor/icons/PathFollow3D.svg
index 94bca801..5367cfa8 100644
--- a/engine/editor/icons/PathFollow3D.svg
+++ b/engine/editor/icons/PathFollow3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m13 0-3 4h1.947c-.138 1.32-.558 1.907-1.084 2.275-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c1.053-.737 1.755-2.032 1.937-3.914H16l-3-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m13 0-3 4h1.947c-.138 1.32-.558 1.907-1.084 2.275-.644.451-1.713.606-2.963.73s-2.681.221-3.912 1.083c-.892.625-1.532 1.652-1.818 3.096a2 2 0 1 0 1.98.183c.193-.885.553-1.337.987-1.64.644-.451 1.713-.606 2.963-.73s2.681-.221 3.912-1.083c1.053-.737 1.755-2.032 1.937-3.914H16l-3-4z"/></svg>
diff --git a/engine/editor/icons/Pause.svg b/engine/editor/icons/Pause.svg
index 29069179..2c45f82c 100644
--- a/engine/editor/icons/Pause.svg
+++ b/engine/editor/icons/Pause.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm6 0a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm6 0a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/Performance.svg b/engine/editor/icons/Performance.svg
index 4029b5b0..0af01080 100644
--- a/engine/editor/icons/Performance.svg
+++ b/engine/editor/icons/Performance.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="1.25" d="m5 12.533-1.5 1.5a6.375 6.375 0 1 1 9 0l-1.5-1.5M2 9.5h2m10 0h-2M3.5 4.967l1.5 1.5m7.5-1.5-1.5 1.5M8 3.52v2"/><path fill="#e0e0e0" d="M7.125 8.93a1.033 1.033 0 1 0 1.867.716l.478-3.03-.672-.258z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="1.25" d="m5 12.533-1.5 1.5a6.375 6.375 0 1 1 9 0l-1.5-1.5M2 9.5h2m10 0h-2M3.5 4.967l1.5 1.5m7.5-1.5-1.5 1.5M8 3.52v2"/><path fill="#e0e0e0" d="M7.125 8.93a1.033 1.033 0 1 0 1.867.716l.478-3.03-.672-.258z"/></svg>
diff --git a/engine/editor/icons/PhysicalBone2D.svg b/engine/editor/icons/PhysicalBone2D.svg
index 496b03d1..020113ec 100644
--- a/engine/editor/icons/PhysicalBone2D.svg
+++ b/engine/editor/icons/PhysicalBone2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M10.478 1a2.466 2.466 0 0 0-1.9.878L10.15 4.15l-1.766.674-3.56 3.56a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496A2.466 2.466 0 0 0 10.478 1zm-9.32 1.77.96 4.827 1.397-.525zm2.763-1.743.961 4.827 1.396-.525zM7.133.899l.711 3.514 1.397-.525z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M10.478 1a2.466 2.466 0 0 0-1.9.878L10.15 4.15l-1.766.674-3.56 3.56a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496A2.466 2.466 0 0 0 10.478 1zm-9.32 1.77.96 4.827 1.397-.525zm2.763-1.743.961 4.827 1.396-.525zM7.133.899l.711 3.514 1.397-.525z"/></svg>
diff --git a/engine/editor/icons/PhysicalBone3D.svg b/engine/editor/icons/PhysicalBone3D.svg
index 0fedcffd..52e6a6d7 100644
--- a/engine/editor/icons/PhysicalBone3D.svg
+++ b/engine/editor/icons/PhysicalBone3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M10.478 1a2.466 2.466 0 0 0-1.9.878L10.15 4.15l-1.766.674-3.56 3.56a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496A2.466 2.466 0 0 0 10.478 1zm-9.32 1.77.96 4.827 1.397-.525zm2.763-1.743.961 4.827 1.396-.525zM7.133.899l.711 3.514 1.397-.525z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M10.478 1a2.466 2.466 0 0 0-1.9.878L10.15 4.15l-1.766.674-3.56 3.56a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l3.56-3.56a2.466 2.466 0 1 0 1.705-4.496A2.466 2.466 0 0 0 10.478 1zm-9.32 1.77.96 4.827 1.397-.525zm2.763-1.743.961 4.827 1.396-.525zM7.133.899l.711 3.514 1.397-.525z"/></svg>
diff --git a/engine/editor/icons/PhysicalBoneSimulator3D.svg b/engine/editor/icons/PhysicalBoneSimulator3D.svg
index dcbf64cc..3dcd408c 100644
--- a/engine/editor/icons/PhysicalBoneSimulator3D.svg
+++ b/engine/editor/icons/PhysicalBoneSimulator3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m15.209 5.934c-.018.574-.181 1.149-.521 1.662-.594.891-1.588 1.424-2.661 1.424-.343 0-.681-.055-1.002-.162l-2.169 2.169c.061.185.104.374.132.565.117.844-.102 1.684-.616 2.363-.515.681-1.263 1.12-2.107 1.236-.113.016-.224.02-.335.023.469.557 1.201.872 1.975.765 1.2-.167 2.036-1.274 1.87-2.473-.045-.326-.163-.639-.346-.913l3.164-3.163c1.008.67 2.369.396 3.039-.612.625-.939.422-2.176-.423-2.884z"/><path d="m13.452 4.173c-.005.599-.173 1.204-.529 1.738-.593.893-1.588 1.426-2.66 1.426-.344 0-.682-.055-1.003-.162l-2.169 2.169c.062.185.105.374.132.565.118.844-.101 1.684-.615 2.363-.514.681-1.262 1.12-2.107 1.237-.09.013-.179.014-.269.019.47.5 1.165.774 1.896.673 1.2-.166 2.037-1.274 1.87-2.472-.045-.327-.164-.64-.346-.913l3.165-3.164c1.008.67 2.368.396 3.039-.612.619-.931.423-2.157-.404-2.867z"/><path d="m8.432.09c-.651-.004-1.27.283-1.689.78l1.397 2.02-1.57.6-3.164 3.163c-1.008-.67-2.369-.396-3.039.612-.67 1.007-.396 2.369.611 3.039.274.183.586.301.912.346.167 1.199 1.274 2.036 2.473 1.87 1.199-.167 2.036-1.274 1.869-2.473-.044-.326-.163-.639-.345-.913l3.164-3.164c1.008.67 2.369.396 3.039-.612.671-1.008.397-2.368-.61-3.039-.274-.182-.587-.3-.913-.345-.152-1.068-1.056-1.867-2.135-1.884zm-8.285 1.573.854 4.291 1.242-.467zm2.457-1.549.854 4.291 1.241-.466zm2.854-.114.632 3.124 1.242-.466z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m15.209 5.934c-.018.574-.181 1.149-.521 1.662-.594.891-1.588 1.424-2.661 1.424-.343 0-.681-.055-1.002-.162l-2.169 2.169c.061.185.104.374.132.565.117.844-.102 1.684-.616 2.363-.515.681-1.263 1.12-2.107 1.236-.113.016-.224.02-.335.023.469.557 1.201.872 1.975.765 1.2-.167 2.036-1.274 1.87-2.473-.045-.326-.163-.639-.346-.913l3.164-3.163c1.008.67 2.369.396 3.039-.612.625-.939.422-2.176-.423-2.884z"/><path d="m13.452 4.173c-.005.599-.173 1.204-.529 1.738-.593.893-1.588 1.426-2.66 1.426-.344 0-.682-.055-1.003-.162l-2.169 2.169c.062.185.105.374.132.565.118.844-.101 1.684-.615 2.363-.514.681-1.262 1.12-2.107 1.237-.09.013-.179.014-.269.019.47.5 1.165.774 1.896.673 1.2-.166 2.037-1.274 1.87-2.472-.045-.327-.164-.64-.346-.913l3.165-3.164c1.008.67 2.368.396 3.039-.612.619-.931.423-2.157-.404-2.867z"/><path d="m8.432.09c-.651-.004-1.27.283-1.689.78l1.397 2.02-1.57.6-3.164 3.163c-1.008-.67-2.369-.396-3.039.612-.67 1.007-.396 2.369.611 3.039.274.183.586.301.912.346.167 1.199 1.274 2.036 2.473 1.87 1.199-.167 2.036-1.274 1.869-2.473-.044-.326-.163-.639-.345-.913l3.164-3.164c1.008.67 2.369.396 3.039-.612.671-1.008.397-2.368-.61-3.039-.274-.182-.587-.3-.913-.345-.152-1.068-1.056-1.867-2.135-1.884zm-8.285 1.573.854 4.291 1.242-.467zm2.457-1.549.854 4.291 1.241-.466zm2.854-.114.632 3.124 1.242-.466z"/></g></svg>
diff --git a/engine/editor/icons/PhysicalSkyMaterial.svg b/engine/editor/icons/PhysicalSkyMaterial.svg
index b15a6fe0..4d508740 100644
--- a/engine/editor/icons/PhysicalSkyMaterial.svg
+++ b/engine/editor/icons/PhysicalSkyMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 3h14v10H1m2-4a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2zm8 0a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2h-2a1 1 0 0 0-1 1H9a1 1 0 0 0 0 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 3h14v10H1m2-4a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2zm8 0a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2h-2a1 1 0 0 0-1 1H9a1 1 0 0 0 0 2z"/></svg>
diff --git a/engine/editor/icons/PhysicsMaterial.svg b/engine/editor/icons/PhysicsMaterial.svg
index e9fe293b..0125b541 100644
--- a/engine/editor/icons/PhysicsMaterial.svg
+++ b/engine/editor/icons/PhysicsMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0"><path stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="M14 8.5v4L8 15l-6-2.5v-4M8 11v4"/><path stroke-linejoin="round" stroke-width="2" d="m8 6 6 2.5L8 11 2 8.5z"/><path stroke-linecap="round" stroke-width="1.75" d="M3.5 2l1 1.8M8 1v2m4.5-1-1 1.8"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0"><path stroke-linejoin="round" stroke-opacity=".6" stroke-width="2" d="M14 8.5v4L8 15l-6-2.5v-4M8 11v4"/><path stroke-linejoin="round" stroke-width="2" d="m8 6 6 2.5L8 11 2 8.5z"/><path stroke-linecap="round" stroke-width="1.75" d="M3.5 2l1 1.8M8 1v2m4.5-1-1 1.8"/></g></svg>
diff --git a/engine/editor/icons/PickerCursor.svg b/engine/editor/icons/PickerCursor.svg
index d59b2d53..1a27dfc4 100644
--- a/engine/editor/icons/PickerCursor.svg
+++ b/engine/editor/icons/PickerCursor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill="none" stroke="#fff"/><circle cx="6" cy="6" r="4" fill="none" stroke="#000"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill="none" stroke="#fff"/><circle cx="6" cy="6" r="4" fill="none" stroke="#000"/></svg>
diff --git a/engine/editor/icons/PickerCursorBg.svg b/engine/editor/icons/PickerCursorBg.svg
index fa51b709..05a053fd 100644
--- a/engine/editor/icons/PickerCursorBg.svg
+++ b/engine/editor/icons/PickerCursorBg.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="4" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="4" fill="#fff"/></svg>
diff --git a/engine/editor/icons/PickerShapeCircle.svg b/engine/editor/icons/PickerShapeCircle.svg
index de104121..a655ac1f 100644
--- a/engine/editor/icons/PickerShapeCircle.svg
+++ b/engine/editor/icons/PickerShapeCircle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M6.5 2.5a5.5 5.5 0 0 0 0 11 5.5 5.5 0 0 0 0-11m6.5 0h2v11h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M6.5 2.5a5.5 5.5 0 0 0 0 11 5.5 5.5 0 0 0 0-11m6.5 0h2v11h-2z"/></svg>
diff --git a/engine/editor/icons/PickerShapeRectangle.svg b/engine/editor/icons/PickerShapeRectangle.svg
index 642b9f78..47d2aef8 100644
--- a/engine/editor/icons/PickerShapeRectangle.svg
+++ b/engine/editor/icons/PickerShapeRectangle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M.5 2.5h11v11H.5zm12 0h2v11h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M.5 2.5h11v11H.5zm12 0h2v11h-2z"/></svg>
diff --git a/engine/editor/icons/PickerShapeRectangleWheel.svg b/engine/editor/icons/PickerShapeRectangleWheel.svg
index e46cc414..ccd74907 100644
--- a/engine/editor/icons/PickerShapeRectangleWheel.svg
+++ b/engine/editor/icons/PickerShapeRectangleWheel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.25" fill="none" stroke="#eaeaea" stroke-width="1.75"/><path fill="#eaeaea" d="M4.9 4.9h6.2v6.2H4.9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.25" fill="none" stroke="#eaeaea" stroke-width="1.75"/><path fill="#eaeaea" d="M4.9 4.9h6.2v6.2H4.9z"/></svg>
diff --git a/engine/editor/icons/Pin.svg b/engine/editor/icons/Pin.svg
index c20ffd5f..cc1be70f 100644
--- a/engine/editor/icons/Pin.svg
+++ b/engine/editor/icons/Pin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 1v1l1 1v3h6v-3l1-1v-1zm1 6-2 3h10l-2-3zm2 4v2l1 2 1-2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 1v1l1 1v3h6v-3l1-1v-1zm1 6-2 3h10l-2-3zm2 4v2l1 2 1-2v-2z"/></svg>
diff --git a/engine/editor/icons/PinJoint2D.svg b/engine/editor/icons/PinJoint2D.svg
index a1a873f8..f5909cb9 100644
--- a/engine/editor/icons/PinJoint2D.svg
+++ b/engine/editor/icons/PinJoint2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m9 1.272-.707.707v1.414L6.172 5.516l4.242 4.242 2.121-2.121h1.414l.707-.707zm-3.535 4.95L1.93 6.93 9 14l.707-3.535zM4.05 10.466 2.636 11.88 1.93 14l2.12-.707 1.415-1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m9 1.272-.707.707v1.414L6.172 5.516l4.242 4.242 2.121-2.121h1.414l.707-.707zm-3.535 4.95L1.93 6.93 9 14l.707-3.535zM4.05 10.466 2.636 11.88 1.93 14l2.12-.707 1.415-1.414z"/></svg>
diff --git a/engine/editor/icons/PinJoint3D.svg b/engine/editor/icons/PinJoint3D.svg
index 593899f2..a8799c94 100644
--- a/engine/editor/icons/PinJoint3D.svg
+++ b/engine/editor/icons/PinJoint3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m9 1.272-.707.707v1.414L6.172 5.516l4.242 4.242 2.121-2.121h1.414l.707-.707zm-3.535 4.95L1.93 6.93 9 14l.707-3.535zM4.05 10.466 2.636 11.88 1.93 14l2.12-.707 1.415-1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m9 1.272-.707.707v1.414L6.172 5.516l4.242 4.242 2.121-2.121h1.414l.707-.707zm-3.535 4.95L1.93 6.93 9 14l.707-3.535zM4.05 10.466 2.636 11.88 1.93 14l2.12-.707 1.415-1.414z"/></svg>
diff --git a/engine/editor/icons/PinPressed.svg b/engine/editor/icons/PinPressed.svg
index c20ffd5f..cc1be70f 100644
--- a/engine/editor/icons/PinPressed.svg
+++ b/engine/editor/icons/PinPressed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 1v1l1 1v3h6v-3l1-1v-1zm1 6-2 3h10l-2-3zm2 4v2l1 2 1-2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m4 1v1l1 1v3h6v-3l1-1v-1zm1 6-2 3h10l-2-3zm2 4v2l1 2 1-2v-2z"/></svg>
diff --git a/engine/editor/icons/PingPongLoop.svg b/engine/editor/icons/PingPongLoop.svg
index 98bcb270..c548d636 100644
--- a/engine/editor/icons/PingPongLoop.svg
+++ b/engine/editor/icons/PingPongLoop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M10 7H6V5L2 8l4 3V9h4v2l4-3-4-3zM0 1v14h2V1zm14 0v14h2V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M10 7H6V5L2 8l4 3V9h4v2l4-3-4-3zM0 1v14h2V1zm14 0v14h2V1z"/></svg>
diff --git a/engine/editor/icons/PlaceholderMaterial.svg b/engine/editor/icons/PlaceholderMaterial.svg
index 9eda6624..e4b8c01c 100644
--- a/engine/editor/icons/PlaceholderMaterial.svg
+++ b/engine/editor/icons/PlaceholderMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><g stroke="url(#a)"><path fill="none" stroke-linejoin="round" stroke-width="2" d="M3 3h10v10H3z"/><path stroke-linecap="round" stroke-width="1.5" d="M7 5.5 5.5 7m5-1.5-5 5m5-1.5L9 10.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><g stroke="url(#a)"><path fill="none" stroke-linejoin="round" stroke-width="2" d="M3 3h10v10H3z"/><path stroke-linecap="round" stroke-width="1.5" d="M7 5.5 5.5 7m5-1.5-5 5m5-1.5L9 10.5"/></g></svg>
diff --git a/engine/editor/icons/PlaceholderMesh.svg b/engine/editor/icons/PlaceholderMesh.svg
index df18b0d3..e9781eec 100644
--- a/engine/editor/icons/PlaceholderMesh.svg
+++ b/engine/editor/icons/PlaceholderMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zm6.542 2a2 2 0 0 0 .729.729v6.542a2 2 0 0 0-.729.729H4.729A2 2 0 0 0 4 11.271V4.729A2 2 0 0 0 4.729 4z"/><path stroke="#ffca5f" stroke-linecap="round" stroke-width="1.5" d="m7.25 5.25-2 2M10.5 5.5l-5 5m5.25-1.75-2 2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M4.729 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.73 14h6.541a2 2 0 1 0 2.698-2.75H14V4.729A2 2 0 1 0 11.27 2H4.729zm6.542 2a2 2 0 0 0 .729.729v6.542a2 2 0 0 0-.729.729H4.729A2 2 0 0 0 4 11.271V4.729A2 2 0 0 0 4.729 4z"/><path stroke="#ffca5f" stroke-linecap="round" stroke-width="1.5" d="m7.25 5.25-2 2M10.5 5.5l-5 5m5.25-1.75-2 2"/></svg>
diff --git a/engine/editor/icons/PlaceholderTexture2D.svg b/engine/editor/icons/PlaceholderTexture2D.svg
index 2185844d..1d3affe3 100644
--- a/engine/editor/icons/PlaceholderTexture2D.svg
+++ b/engine/editor/icons/PlaceholderTexture2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3z"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-width="1.5" d="M7 4.25 4.25 7m6.5-2.75-5.5 5.5M11.75 7 9 9.75"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3z"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-width="1.5" d="M7 4.25 4.25 7m6.5-2.75-5.5 5.5M11.75 7 9 9.75"/></svg>
diff --git a/engine/editor/icons/PlaceholderTexture3D.svg b/engine/editor/icons/PlaceholderTexture3D.svg
index 441e11f6..fa089325 100644
--- a/engine/editor/icons/PlaceholderTexture3D.svg
+++ b/engine/editor/icons/PlaceholderTexture3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13z"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-width="1.5" d="M5.25 6.25 3.5 8m5.375-1.75-4.5 4.5M9.75 9 8 10.75"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13z"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-width="1.5" d="M5.25 6.25 3.5 8m5.375-1.75-4.5 4.5M9.75 9 8 10.75"/></svg>
diff --git a/engine/editor/icons/Plane.svg b/engine/editor/icons/Plane.svg
index 98d61057..d377dbd0 100644
--- a/engine/editor/icons/Plane.svg
+++ b/engine/editor/icons/Plane.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f74949" d="M1 2v8h2V8a3 3 0 0 0 0-6zm6 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2zM3 4a1 1 0 0 1 0 2zm8 0v6h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f74949" d="M1 2v8h2V8a3 3 0 0 0 0-6zm6 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V2zM3 4a1 1 0 0 1 0 2zm8 0v6h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3z"/></svg>
diff --git a/engine/editor/icons/PlaneMesh.svg b/engine/editor/icons/PlaneMesh.svg
index 1d4bd8df..9b5dcaed 100644
--- a/engine/editor/icons/PlaneMesh.svg
+++ b/engine/editor/icons/PlaneMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="m8 5 5 3-5 3-5-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="m8 5 5 3-5 3-5-3z"/></svg>
diff --git a/engine/editor/icons/Play.svg b/engine/editor/icons/Play.svg
index 4f107564..62f25b99 100644
--- a/engine/editor/icons/Play.svg
+++ b/engine/editor/icons/Play.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 4 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 4 4z"/></svg>
diff --git a/engine/editor/icons/PlayBackwards.svg b/engine/editor/icons/PlayBackwards.svg
index 34d3e7c2..5db3a62c 100644
--- a/engine/editor/icons/PlayBackwards.svg
+++ b/engine/editor/icons/PlayBackwards.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 12a1 1 0 0 1-1.555.832l-6-4a1 1 0 0 1 0-1.664l6-4A1 1 0 0 1 12 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 12a1 1 0 0 1-1.555.832l-6-4a1 1 0 0 1 0-1.664l6-4A1 1 0 0 1 12 4z"/></svg>
diff --git a/engine/editor/icons/PlayCustom.svg b/engine/editor/icons/PlayCustom.svg
index a67c9c5d..b603976c 100644
--- a/engine/editor/icons/PlayCustom.svg
+++ b/engine/editor/icons/PlayCustom.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.2441.32812.81836 1.9004 1.7148-.25-.28906-1.9785zm-4.2227.61523-1.9785.28906.81836 1.9023 1.9785-.28906zm-3.959.57812-1.9785.28906.81836 1.9023 1.9785-.28906zm-3.957.57812-1.7148.25.28906 1.9785 2.2441-.32812-.81836-1.9004zm-1.4258 3.2285v6a2 2 0 0 0 2 2h12v-8zm3 1h4v1h4v5h-4-4v-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.2441.32812.81836 1.9004 1.7148-.25-.28906-1.9785zm-4.2227.61523-1.9785.28906.81836 1.9023 1.9785-.28906zm-3.959.57812-1.9785.28906.81836 1.9023 1.9785-.28906zm-3.957.57812-1.7148.25.28906 1.9785 2.2441-.32812-.81836-1.9004zm-1.4258 3.2285v6a2 2 0 0 0 2 2h12v-8zm3 1h4v1h4v5h-4-4v-5z"/></svg>
diff --git a/engine/editor/icons/PlayOverlay.svg b/engine/editor/icons/PlayOverlay.svg
index 06fd0ff6..c593d0a2 100644
--- a/engine/editor/icons/PlayOverlay.svg
+++ b/engine/editor/icons/PlayOverlay.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><rect width="64" height="64" fill="#699ce8" fill-opacity=".75" rx="5"/><path fill="#fff" d="m16 16 32 16-32 16"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><rect width="64" height="64" fill="#699ce8" fill-opacity=".75" rx="5"/><path fill="#fff" d="m16 16 32 16-32 16"/></svg>
diff --git a/engine/editor/icons/PlayRemote.svg b/engine/editor/icons/PlayRemote.svg
index 40374ac0..ed3407ed 100644
--- a/engine/editor/icons/PlayRemote.svg
+++ b/engine/editor/icons/PlayRemote.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2.5a2 2 0 0 0-2 2V9a2 2 0 0 0 2 2h4v1H5.4v.4H3v2h2.4v.4h5.2v-.4H13v-2h-2.4V12H9v-1h4a2 2 0 0 0 2-2V4.5a2 2 0 0 0-2-2zm2.75 1.25 5 3-5 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2.5a2 2 0 0 0-2 2V9a2 2 0 0 0 2 2h4v1H5.4v.4H3v2h2.4v.4h5.2v-.4H13v-2h-2.4V12H9v-1h4a2 2 0 0 0 2-2V4.5a2 2 0 0 0-2-2zm2.75 1.25 5 3-5 3z"/></svg>
diff --git a/engine/editor/icons/PlayScene.svg b/engine/editor/icons/PlayScene.svg
index 52b9506a..4865cc4d 100644
--- a/engine/editor/icons/PlayScene.svg
+++ b/engine/editor/icons/PlayScene.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.244.328.818 1.9 1.715-.25zm-4.223.615-1.978.29.818 1.902 1.979-.29zm-3.959.578-1.978.29.818 1.902 1.979-.29zm-3.957.578-1.714.25L1 6l2.244-.328zM1 7v6a2 2 0 0 0 2 2h12V7zm5 1 5 3-5 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m14.564 2-2.244.328.818 1.9 1.715-.25zm-4.223.615-1.978.29.818 1.902 1.979-.29zm-3.959.578-1.978.29.818 1.902 1.979-.29zm-3.957.578-1.714.25L1 6l2.244-.328zM1 7v6a2 2 0 0 0 2 2h12V7zm5 1 5 3-5 3z"/></svg>
diff --git a/engine/editor/icons/PlayStart.svg b/engine/editor/icons/PlayStart.svg
index 8fec994d..eb2d6968 100644
--- a/engine/editor/icons/PlayStart.svg
+++ b/engine/editor/icons/PlayStart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h1a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm4.975 0A1 1 0 0 0 7 3.998v8a1 1 0 0 0 1.625.781l5-4a1 1 0 0 0 0-1.56l-5-4A1 1 0 0 0 7.975 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h1a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm4.975 0A1 1 0 0 0 7 3.998v8a1 1 0 0 0 1.625.781l5-4a1 1 0 0 0 0-1.56l-5-4A1 1 0 0 0 7.975 3z"/></svg>
diff --git a/engine/editor/icons/PlayStartBackwards.svg b/engine/editor/icons/PlayStartBackwards.svg
index d5ccb9d7..31e4eaec 100644
--- a/engine/editor/icons/PlayStartBackwards.svg
+++ b/engine/editor/icons/PlayStartBackwards.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 3a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zM8.025 3A1 1 0 0 1 9 3.998v8a1 1 0 0 1-1.625.781l-5-4a1 1 0 0 1 0-1.56l5-4A1 1 0 0 1 8.025 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 3a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1zM8.025 3A1 1 0 0 1 9 3.998v8a1 1 0 0 1-1.625.781l-5-4a1 1 0 0 1 0-1.56l5-4A1 1 0 0 1 8.025 3z"/></svg>
diff --git a/engine/editor/icons/PlayTravel.svg b/engine/editor/icons/PlayTravel.svg
index 0a4e6b86..03dc6f3c 100644
--- a/engine/editor/icons/PlayTravel.svg
+++ b/engine/editor/icons/PlayTravel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.739 5.44a.595.595 0 0 0-.586.593v4.75a.593.593 0 0 0 .923.494l3.56-2.373h4.25V8h-4.25l-3.56-2.461a.593.593 0 0 0-.336-.098zm8.746 0a.595.595 0 0 0-.587.592v4.746a.593.593 0 0 0 .923.494l3.559-2.373a.593.593 0 0 0 0-1l-3.56-2.373a.593.593 0 0 0-.335-.099z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.739 5.44a.595.595 0 0 0-.586.593v4.75a.593.593 0 0 0 .923.494l3.56-2.373h4.25V8h-4.25l-3.56-2.461a.593.593 0 0 0-.336-.098zm8.746 0a.595.595 0 0 0-.587.592v4.746a.593.593 0 0 0 .923.494l3.559-2.373a.593.593 0 0 0 0-1l-3.56-2.373a.593.593 0 0 0-.335-.099z"/></svg>
diff --git a/engine/editor/icons/PluginScript.svg b/engine/editor/icons/PluginScript.svg
index 3e2f7420..910efc3e 100644
--- a/engine/editor/icons/PluginScript.svg
+++ b/engine/editor/icons/PluginScript.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1-.565 2.258a4.947 4.947 0 0 0-.689.28L3.758 2.343 2.344 3.758l1.195 1.994c-.112.221-.207.45-.285.685L1 7v2l2.258.564c.048.15.115.292.177.436H4c.54-.684 1.222-1.246 2-1.596a2.037 2.037 0 1 1 4 0A4.766 4.766 0 0 1 12 10h.58c.064-.145.132-.287.182-.438L15.014 9V7l-2.257-.565a4.992 4.992 0 0 0-.28-.687l1.194-1.99-1.414-1.414-1.994 1.195a5.012 5.012 0 0 0-.686-.285L9.016 1h-2zm1 6a1 1 0 0 0-1 1v2.174A3 3 0 0 0 5 13h1v2h1v-2h2v2h1v-2h1a3 3 0 0 0-2-2.826V7.998a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1-.565 2.258a4.947 4.947 0 0 0-.689.28L3.758 2.343 2.344 3.758l1.195 1.994c-.112.221-.207.45-.285.685L1 7v2l2.258.564c.048.15.115.292.177.436H4c.54-.684 1.222-1.246 2-1.596a2.037 2.037 0 1 1 4 0A4.766 4.766 0 0 1 12 10h.58c.064-.145.132-.287.182-.438L15.014 9V7l-2.257-.565a4.992 4.992 0 0 0-.28-.687l1.194-1.99-1.414-1.414-1.994 1.195a5.012 5.012 0 0 0-.686-.285L9.016 1h-2zm1 6a1 1 0 0 0-1 1v2.174A3 3 0 0 0 5 13h1v2h1v-2h2v2h1v-2h1a3 3 0 0 0-2-2.826V7.998a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/PointLight2D.svg b/engine/editor/icons/PointLight2D.svg
index a8beb2b2..c0a47f65 100644
--- a/engine/editor/icons/PointLight2D.svg
+++ b/engine/editor/icons/PointLight2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6 10.576V13h4v-2.42a5 5 0 1 0-4 0zM8 3a3 3 0 0 1 0 6 3 3 0 0 1 0-6zM7 14v1h2v-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6 10.576V13h4v-2.42a5 5 0 1 0-4 0zM8 3a3 3 0 0 1 0 6 3 3 0 0 1 0-6zM7 14v1h2v-1z"/></svg>
diff --git a/engine/editor/icons/PointMesh.svg b/engine/editor/icons/PointMesh.svg
index d0eb7f0b..7c0b9137 100644
--- a/engine/editor/icons/PointMesh.svg
+++ b/engine/editor/icons/PointMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#ffca5f"><circle cx="3.75" cy="3" r="2"/><circle cx="11.75" cy="6.25" r="2"/><circle cx="6.5" cy="12.5" r="2"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#ffca5f"><circle cx="3.75" cy="3" r="2"/><circle cx="11.75" cy="6.25" r="2"/><circle cx="6.5" cy="12.5" r="2"/></g></svg>
diff --git a/engine/editor/icons/Polygon2D.svg b/engine/editor/icons/Polygon2D.svg
index 532c71d4..46f0f9f8 100644
--- a/engine/editor/icons/Polygon2D.svg
+++ b/engine/editor/icons/Polygon2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2h12L8 8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" stroke="#8da5f3" stroke-linejoin="round" stroke-width="2" d="M14 14H2V2h12L8 8z"/></svg>
diff --git a/engine/editor/icons/PolygonOccluder3D.svg b/engine/editor/icons/PolygonOccluder3D.svg
index 92895e36..8f5e8546 100644
--- a/engine/editor/icons/PolygonOccluder3D.svg
+++ b/engine/editor/icons/PolygonOccluder3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M7.328 1A4.5 4.5 0 1 1 1 7.314V14a1 1 0 0 0 1 1h12a1 1 0 0 0 .707-1.707L9.414 8l5.293-5.293A1 1 0 0 0 14 1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M7.328 1A4.5 4.5 0 1 1 1 7.314V14a1 1 0 0 0 1 1h12a1 1 0 0 0 .707-1.707L9.414 8l5.293-5.293A1 1 0 0 0 14 1z"/></svg>
diff --git a/engine/editor/icons/PolygonPathFinder.svg b/engine/editor/icons/PolygonPathFinder.svg
index adc917d8..801e2be5 100644
--- a/engine/editor/icons/PolygonPathFinder.svg
+++ b/engine/editor/icons/PolygonPathFinder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v1h2V1zm3 0v2h2V1zm4 0v2h2V1zm4 0v2h2V2a1 1 0 0 0-1-1zm0 4h2v2h-2ZM1 5v2h2V5zm11 3-3 7 3-1.5 3 1.5zM1 9v2h2V9zm0 4v1a1 1 0 0 0 1 1h1v-2zm4 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v1h2V1zm3 0v2h2V1zm4 0v2h2V1zm4 0v2h2V2a1 1 0 0 0-1-1zm0 4h2v2h-2ZM1 5v2h2V5zm11 3-3 7 3-1.5 3 1.5zM1 9v2h2V9zm0 4v1a1 1 0 0 0 1 1h1v-2zm4 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/Popup.svg b/engine/editor/icons/Popup.svg
index 6e8daa27..9809bf60 100644
--- a/engine/editor/icons/Popup.svg
+++ b/engine/editor/icons/Popup.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm4 2h2v6H7zm0 8h2v2H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm4 2h2v6H7zm0 8h2v2H7z"/></svg>
diff --git a/engine/editor/icons/PopupMenu.svg b/engine/editor/icons/PopupMenu.svg
index fc0dcf73..648b1567 100644
--- a/engine/editor/icons/PopupMenu.svg
+++ b/engine/editor/icons/PopupMenu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v4h6v-4zm1 1h4l-2 2zm0 4a1 1 0 0 0 -1 1v7a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-7a1 1 0 0 0 -1-1zm1 2h10v2h-10zm0 3h10v2h-10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v4h6v-4zm1 1h4l-2 2zm0 4a1 1 0 0 0 -1 1v7a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-7a1 1 0 0 0 -1-1zm1 2h10v2h-10zm0 3h10v2h-10z"/></svg>
diff --git a/engine/editor/icons/PopupPanel.svg b/engine/editor/icons/PopupPanel.svg
index 16617eab..922d29b4 100644
--- a/engine/editor/icons/PopupPanel.svg
+++ b/engine/editor/icons/PopupPanel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v4h6v-4zm1 1h4l-2 2zm0 4c-.55228 0-1 .44772-1 1v7c0 .55228.44772 1 1 1h12c.55228 0 1-.44772 1-1v-7c0-.55228-.44772-1-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v4h6v-4zm1 1h4l-2 2zm0 4c-.55228 0-1 .44772-1 1v7c0 .55228.44772 1 1 1h12c.55228 0 1-.44772 1-1v-7c0-.55228-.44772-1-1-1z"/></svg>
diff --git a/engine/editor/icons/PortableCompressedTexture2D.svg b/engine/editor/icons/PortableCompressedTexture2D.svg
index 931acb6a..13bb7b38 100644
--- a/engine/editor/icons/PortableCompressedTexture2D.svg
+++ b/engine/editor/icons/PortableCompressedTexture2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h7v-4H3V3h6V1zm6 5v1H6v1H5v1H4v1h5V6zm3-5h4v4h-4Zm0 5h4v4h-4Zm0 5h4v4h-4Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h7v-4H3V3h6V1zm6 5v1H6v1H5v1H4v1h5V6zm3-5h4v4h-4Zm0 5h4v4h-4Zm0 5h4v4h-4Z"/></svg>
diff --git a/engine/editor/icons/PreviewEnvironment.svg b/engine/editor/icons/PreviewEnvironment.svg
index e958323f..9909a77c 100644
--- a/engine/editor/icons/PreviewEnvironment.svg
+++ b/engine/editor/icons/PreviewEnvironment.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0"><circle cx="8" cy="8" r="6" stroke-width="2"/><path stroke-width="1.5" d="M2 8a6.5 2 0 0 0 12 0M8 2c-3 4-3 8 0 12M8 2c3 4 3 8 0 12"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0"><circle cx="8" cy="8" r="6" stroke-width="2"/><path stroke-width="1.5" d="M2 8a6.5 2 0 0 0 12 0M8 2c-3 4-3 8 0 12M8 2c3 4 3 8 0 12"/></g></svg>
diff --git a/engine/editor/icons/PreviewRotate.svg b/engine/editor/icons/PreviewRotate.svg
index 69be8a0f..ad4a2884 100644
--- a/engine/editor/icons/PreviewRotate.svg
+++ b/engine/editor/icons/PreviewRotate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><path id="a" d="M8 1a7 7 0 00-4.982 11.998H1.911v2h4a1 1 0 00.97-1.242l-1-4-1.94.486.28 1.121a5 5 0 117.223.168l1.416 1.416A7 7 0 008 1z"/></defs><g fill="none" stroke="#000" stroke-linejoin="round" stroke-width="2" opacity=".8"><circle cx="8" cy="8" r="2"/><use xlink:href="#a"/></g><g fill="#f9f9f9"><circle cx="8" cy="8" r="2"/><use xlink:href="#a"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><path id="a" d="M8 1a7 7 0 00-4.982 11.998H1.911v2h4a1 1 0 00.97-1.242l-1-4-1.94.486.28 1.121a5 5 0 117.223.168l1.416 1.416A7 7 0 008 1z"/></defs><g fill="none" stroke="#000" stroke-linejoin="round" stroke-width="2" opacity=".8"><circle cx="8" cy="8" r="2"/><use xlink:href="#a"/></g><g fill="#f9f9f9"><circle cx="8" cy="8" r="2"/><use xlink:href="#a"/></g></svg>
diff --git a/engine/editor/icons/PreviewSun.svg b/engine/editor/icons/PreviewSun.svg
index e2d89465..d359517f 100644
--- a/engine/editor/icons/PreviewSun.svg
+++ b/engine/editor/icons/PreviewSun.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 1v3h2V1zM4.465 3.05 3.05 4.466 4.464 5.88l1.414-1.414zm7.07 0-1.414 1.415 1.414 1.414 1.414-1.414zM8 5a2 2 0 0 0 0 6 2 2 0 0 0 0-6zM1 7v2h3V7zm11 0v2h3V7zm-7.535 3.121L3.05 11.535l1.414 1.414 1.414-1.414zm7.07 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 12v3h2v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 1v3h2V1zM4.465 3.05 3.05 4.466 4.464 5.88l1.414-1.414zm7.07 0-1.414 1.415 1.414 1.414 1.414-1.414zM8 5a2 2 0 0 0 0 6 2 2 0 0 0 0-6zM1 7v2h3V7zm11 0v2h3V7zm-7.535 3.121L3.05 11.535l1.414 1.414 1.414-1.414zm7.07 0-1.414 1.414 1.414 1.414 1.414-1.414zM7 12v3h2v-3z"/></svg>
diff --git a/engine/editor/icons/PrismMesh.svg b/engine/editor/icons/PrismMesh.svg
index d204e89c..08a4e9a5 100644
--- a/engine/editor/icons/PrismMesh.svg
+++ b/engine/editor/icons/PrismMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-linejoin="round" stroke-width="2" d="m5 2 6 3-3 9-6-3zm6 3 3 6-6 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-linejoin="round" stroke-width="2" d="m5 2 6 3-3 9-6-3zm6 3 3 6-6 3"/></svg>
diff --git a/engine/editor/icons/ProceduralSkyMaterial.svg b/engine/editor/icons/ProceduralSkyMaterial.svg
index 22144bc3..ead0d911 100644
--- a/engine/editor/icons/ProceduralSkyMaterial.svg
+++ b/engine/editor/icons/ProceduralSkyMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1.685 13a7 7 0 1 1 12.631 0zM3 10a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2zm7 0a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2h-2a1 1 0 0 0-1 1H8a1 1 0 0 0 0 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1.685 13a7 7 0 1 1 12.631 0zM3 10a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2zm7 0a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2h-2a1 1 0 0 0-1 1H8a1 1 0 0 0 0 2z"/></svg>
diff --git a/engine/editor/icons/ProfilerAutostartWarning.svg b/engine/editor/icons/ProfilerAutostartWarning.svg
index f416b568..5660df33 100644
--- a/engine/editor/icons/ProfilerAutostartWarning.svg
+++ b/engine/editor/icons/ProfilerAutostartWarning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><radialGradient xlink:href="#a" id="b" cx="12.039" cy="6.909" r="5.11" fx="11.285" fy="6.896" gradientTransform="matrix(1.19638 -1.2376 1.21246 1.17207 -11.159 13.888)" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#a" id="d" cx="12.039" cy="6.909" r="5.11" fx="11.285" fy="6.896" gradientTransform="matrix(1.19638 -1.2376 1.21246 1.17207 -11.159 13.888)" gradientUnits="userSpaceOnUse"/><linearGradient id="a"><stop offset=".108" stop-color="#ffdd65"/><stop offset="1" stop-color="#ffdd65" stop-opacity="0"/></linearGradient><path id="c" fill="#ffdd65" d="M7.56 10.905L6.355 5.79l4.085 3.304z"/></defs><path fill="#ffdd65" d="M39.087-34.74a.507.507 0 00-.431.247l-3.045 5.074a.507.507 0 00.431.77h6.09a.507.507 0 00.435-.769l-3.045-5.074a.507.507 0 00-.431-.246zm-.507 1.523h1.015v2.538H38.58zm0 3.045h1.015v1.015H38.58zM41.79-25.317a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm0 2a5 5 0 015 5 5 5 0 01-5 5 5 5 0 01-5-5 5 5 0 015-5z"/><path fill="none" stroke="#ffdd65" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M38.941-19.26a3 3 0 012.76-2.056 3 3 0 012.876 1.89"/><path fill="#ffdd65" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.7" d="M40.79-17.5l1-5 1 5z" paint-order="stroke markers fill"/><circle cx="41.789" cy="-16.317" r="2" fill="#ffdd65"/><g transform="translate(47.69 -41.492)"><path fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.797" d="M4.74 9.936a3.757 3.757 0 01.176-4.033 3.757 3.757 0 013.73-1.544 3.757 3.757 0 012.976 2.727"/><use xlink:href="#c" paint-order="stroke markers fill"/><circle cx="2.298" cy="13.837" r="1.797" fill="#ffdd65" transform="rotate(-32.152)"/><circle cx="8" cy="8" r="6.323" fill="none" stroke="#ffdd65" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.355" paint-order="fill markers stroke"/></g><g transform="translate(66.007 -44.302)"><path fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.797" d="M4.74 9.936a3.757 3.757 0 01.176-4.033 3.757 3.757 0 013.73-1.544 3.757 3.757 0 012.976 2.727"/><use xlink:href="#c" paint-order="stroke markers fill"/><circle cx="2.298" cy="13.837" r="1.797" fill="#ffdd65" transform="rotate(-32.152)"/><circle cx="8" cy="8" r="6.323" fill="none" stroke="#ffdd65" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.355" paint-order="fill markers stroke"/></g><path fill="#1d2229" d="M8 3a6 6 0 00-6 6 6 6 0 006 6 6 6 0 006-6 6 6 0 00-6-6zm0 2a4 4 0 014 4 4 4 0 01-4 4 4 4 0 01-4-4 4 4 0 014-4z" paint-order="fill markers stroke"/><path fill="#1d2229" d="M7 1h2v3H7z" paint-order="fill markers stroke"/><rect width="2" height="2" x="11.021" y="-6.293" fill="#1d2229" paint-order="fill markers stroke" ry=".5" transform="rotate(45)"/><rect width="6" height="1" x="5" y="1" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><circle cx="8" cy="9" r="1" fill="#1d2229" paint-order="fill markers stroke"/><path fill="#1d2229" d="M7 9h2L8 5.016z" paint-order="fill markers stroke"/><rect width="2" height="2" x="-1.707" y="5.021" fill="#1d2229" paint-order="fill markers stroke" ry=".5" transform="rotate(-45)"/><rect width="1" height="1" x="4.5" y="8.5" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="10.5" y="8.5" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="7.5" y="11.5" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><circle cx="20" cy="-21" r="6" fill="#ffdd65" paint-order="fill markers stroke"/><circle cx="20" cy="-21" r="4" fill="#fff" paint-order="fill markers stroke"/><path fill="#ffdd65" d="M19-29h2v3h-2z" paint-order="fill markers stroke"/><rect width="2" height="2" x="-1.707" y="-35.991" fill="#ffdd65" paint-order="fill markers stroke" ry=".5" transform="rotate(45)"/><rect width="6" height="1" x="17" y="-29" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/><circle cx="20" cy="-21" r="1" fill="#ffdd65" paint-order="fill markers stroke"/><path fill="#ffdd65" d="M19-21h2l-1-3.984z" paint-order="fill markers stroke"/><rect width="2" height="2" x="27.991" y="-7.707" fill="#ffdd65" paint-order="fill markers stroke" ry=".5" transform="rotate(-45)"/><rect width="1" height="1" x="16.5" y="-21.5" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="22.5" y="-21.5" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="19.5" y="-18.5" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16"><defs><radialGradient xlink:href="#a" id="b" cx="12.039" cy="6.909" r="5.11" fx="11.285" fy="6.896" gradientTransform="matrix(1.19638 -1.2376 1.21246 1.17207 -11.159 13.888)" gradientUnits="userSpaceOnUse"/><radialGradient xlink:href="#a" id="d" cx="12.039" cy="6.909" r="5.11" fx="11.285" fy="6.896" gradientTransform="matrix(1.19638 -1.2376 1.21246 1.17207 -11.159 13.888)" gradientUnits="userSpaceOnUse"/><linearGradient id="a"><stop offset=".108" stop-color="#ffdd65"/><stop offset="1" stop-color="#ffdd65" stop-opacity="0"/></linearGradient><path id="c" fill="#ffdd65" d="M7.56 10.905L6.355 5.79l4.085 3.304z"/></defs><path fill="#ffdd65" d="M39.087-34.74a.507.507 0 00-.431.247l-3.045 5.074a.507.507 0 00.431.77h6.09a.507.507 0 00.435-.769l-3.045-5.074a.507.507 0 00-.431-.246zm-.507 1.523h1.015v2.538H38.58zm0 3.045h1.015v1.015H38.58zM41.79-25.317a7 7 0 00-7 7 7 7 0 007 7 7 7 0 007-7 7 7 0 00-7-7zm0 2a5 5 0 015 5 5 5 0 01-5 5 5 5 0 01-5-5 5 5 0 015-5z"/><path fill="none" stroke="#ffdd65" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M38.941-19.26a3 3 0 012.76-2.056 3 3 0 012.876 1.89"/><path fill="#ffdd65" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.7" d="M40.79-17.5l1-5 1 5z" paint-order="stroke markers fill"/><circle cx="41.789" cy="-16.317" r="2" fill="#ffdd65"/><g transform="translate(47.69 -41.492)"><path fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.797" d="M4.74 9.936a3.757 3.757 0 01.176-4.033 3.757 3.757 0 013.73-1.544 3.757 3.757 0 012.976 2.727"/><use xlink:href="#c" paint-order="stroke markers fill"/><circle cx="2.298" cy="13.837" r="1.797" fill="#ffdd65" transform="rotate(-32.152)"/><circle cx="8" cy="8" r="6.323" fill="none" stroke="#ffdd65" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.355" paint-order="fill markers stroke"/></g><g transform="translate(66.007 -44.302)"><path fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.797" d="M4.74 9.936a3.757 3.757 0 01.176-4.033 3.757 3.757 0 013.73-1.544 3.757 3.757 0 012.976 2.727"/><use xlink:href="#c" paint-order="stroke markers fill"/><circle cx="2.298" cy="13.837" r="1.797" fill="#ffdd65" transform="rotate(-32.152)"/><circle cx="8" cy="8" r="6.323" fill="none" stroke="#ffdd65" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.355" paint-order="fill markers stroke"/></g><path fill="#1d2229" d="M8 3a6 6 0 00-6 6 6 6 0 006 6 6 6 0 006-6 6 6 0 00-6-6zm0 2a4 4 0 014 4 4 4 0 01-4 4 4 4 0 01-4-4 4 4 0 014-4z" paint-order="fill markers stroke"/><path fill="#1d2229" d="M7 1h2v3H7z" paint-order="fill markers stroke"/><rect width="2" height="2" x="11.021" y="-6.293" fill="#1d2229" paint-order="fill markers stroke" ry=".5" transform="rotate(45)"/><rect width="6" height="1" x="5" y="1" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><circle cx="8" cy="9" r="1" fill="#1d2229" paint-order="fill markers stroke"/><path fill="#1d2229" d="M7 9h2L8 5.016z" paint-order="fill markers stroke"/><rect width="2" height="2" x="-1.707" y="5.021" fill="#1d2229" paint-order="fill markers stroke" ry=".5" transform="rotate(-45)"/><rect width="1" height="1" x="4.5" y="8.5" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="10.5" y="8.5" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="7.5" y="11.5" fill="#1d2229" paint-order="fill markers stroke" ry=".5"/><circle cx="20" cy="-21" r="6" fill="#ffdd65" paint-order="fill markers stroke"/><circle cx="20" cy="-21" r="4" fill="#fff" paint-order="fill markers stroke"/><path fill="#ffdd65" d="M19-29h2v3h-2z" paint-order="fill markers stroke"/><rect width="2" height="2" x="-1.707" y="-35.991" fill="#ffdd65" paint-order="fill markers stroke" ry=".5" transform="rotate(45)"/><rect width="6" height="1" x="17" y="-29" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/><circle cx="20" cy="-21" r="1" fill="#ffdd65" paint-order="fill markers stroke"/><path fill="#ffdd65" d="M19-21h2l-1-3.984z" paint-order="fill markers stroke"/><rect width="2" height="2" x="27.991" y="-7.707" fill="#ffdd65" paint-order="fill markers stroke" ry=".5" transform="rotate(-45)"/><rect width="1" height="1" x="16.5" y="-21.5" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="22.5" y="-21.5" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/><rect width="1" height="1" x="19.5" y="-18.5" fill="#ffdd65" paint-order="fill markers stroke" ry=".5"/></svg>
diff --git a/engine/editor/icons/Progress1.svg b/engine/editor/icons/Progress1.svg
index 15442fd0..b433f5e7 100644
--- a/engine/editor/icons/Progress1.svg
+++ b/engine/editor/icons/Progress1.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M9 1v3.055a4 4 0 0 1 1.027.426l2.159-2.159A7 7 0 0 0 9 1z"/><path fill-opacity=".2" d="M7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.08zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.815zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.186l2.158-2.159A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.159A7 7 0 0 0 14.921 9h-3.055zm-5.894 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0a4 4 0 0 1-1.028.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M9 1v3.055a4 4 0 0 1 1.027.426l2.159-2.159A7 7 0 0 0 9 1z"/><path fill-opacity=".2" d="M7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.08zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.815zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.186l2.158-2.159A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.159A7 7 0 0 0 14.921 9h-3.055zm-5.894 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0a4 4 0 0 1-1.028.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/></g></svg>
diff --git a/engine/editor/icons/Progress2.svg b/engine/editor/icons/Progress2.svg
index 53445988..8e25f425 100644
--- a/engine/editor/icons/Progress2.svg
+++ b/engine/editor/icons/Progress2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zM1.08 9a7 7 0 0 0 1.32 3.185l2.159-2.158A4 4 0 0 1 4.131 9H1.08zm10.787 0a4 4 0 0 1-.426 1.027l2.159 2.158A7 7 0 0 0 14.922 9h-3.055zm-5.894 2.441L3.814 13.6A7 7 0 0 0 7 14.922v-3.055a4 4 0 0 1-1.027-.426zm4.054 0A4 4 0 0 1 9 11.869v3.05a7 7 0 0 0 3.186-1.32l-2.159-2.158z"/><path d="m13.6 3.8-2.158 2.158a4 4 0 0 1 .428 1.028h3.05A7 7 0 0 0 13.6 3.8z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zM1.08 9a7 7 0 0 0 1.32 3.185l2.159-2.158A4 4 0 0 1 4.131 9H1.08zm10.787 0a4 4 0 0 1-.426 1.027l2.159 2.158A7 7 0 0 0 14.922 9h-3.055zm-5.894 2.441L3.814 13.6A7 7 0 0 0 7 14.922v-3.055a4 4 0 0 1-1.027-.426zm4.054 0A4 4 0 0 1 9 11.869v3.05a7 7 0 0 0 3.186-1.32l-2.159-2.158z"/><path d="m13.6 3.8-2.158 2.158a4 4 0 0 1 .428 1.028h3.05A7 7 0 0 0 13.6 3.8z"/></g></svg>
diff --git a/engine/editor/icons/Progress3.svg b/engine/editor/icons/Progress3.svg
index 08f77ca4..2c7f72f0 100644
--- a/engine/editor/icons/Progress3.svg
+++ b/engine/editor/icons/Progress3.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm4.892 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0a4 4 0 0 1-1.028.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/><path d="M11.867 9a4 4 0 0 1-.426 1.027l2.158 2.159A7 7 0 0 0 14.922 9h-3.055z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm4.892 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0a4 4 0 0 1-1.028.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/><path d="M11.867 9a4 4 0 0 1-.426 1.027l2.158 2.159A7 7 0 0 0 14.922 9h-3.055z"/></g></svg>
diff --git a/engine/editor/icons/Progress4.svg b/engine/editor/icons/Progress4.svg
index 04ad78e1..5227a991 100644
--- a/engine/editor/icons/Progress4.svg
+++ b/engine/editor/icons/Progress4.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.055zm-5.894 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426z"/><path d="M10.027 11.4A4 4 0 0 1 9 11.828v3.05a7 7 0 0 0 3.185-1.32z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.055zm-5.894 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426z"/><path d="M10.027 11.4A4 4 0 0 1 9 11.828v3.05a7 7 0 0 0 3.185-1.32z"/></g></svg>
diff --git a/engine/editor/icons/Progress5.svg b/engine/editor/icons/Progress5.svg
index 85fee0c6..d7bd104d 100644
--- a/engine/editor/icons/Progress5.svg
+++ b/engine/editor/icons/Progress5.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.055zm-1.84 2.441a4 4 0 0 1-1.027.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/><path d="m5.973 11.4-2.159 2.158A7 7 0 0 0 7 14.88v-3.054a4 4 0 0 1-1.027-.426z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.055zm-1.84 2.441a4 4 0 0 1-1.027.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/><path d="m5.973 11.4-2.159 2.158A7 7 0 0 0 7 14.88v-3.054a4 4 0 0 1-1.027-.426z"/></g></svg>
diff --git a/engine/editor/icons/Progress6.svg b/engine/editor/icons/Progress6.svg
index 24306b63..91ea2cde 100644
--- a/engine/editor/icons/Progress6.svg
+++ b/engine/editor/icons/Progress6.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM11.867 9a4 4 0 0 1-.426 1.027l2.158 2.158A7 7 0 0 0 14.922 9h-3.055zm-5.895 2.441L3.814 13.6A7 7 0 0 0 7 14.922v-3.055a4 4 0 0 1-1.028-.426zm4.055 0A4 4 0 0 1 9 11.869v3.05a7 7 0 0 0 3.185-1.32l-2.158-2.158z"/><path d="M1.08 9a7 7 0 0 0 1.32 3.186l2.159-2.159A4 4 0 0 1 4.131 9H1.08z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM11.867 9a4 4 0 0 1-.426 1.027l2.158 2.158A7 7 0 0 0 14.922 9h-3.055zm-5.895 2.441L3.814 13.6A7 7 0 0 0 7 14.922v-3.055a4 4 0 0 1-1.028-.426zm4.055 0A4 4 0 0 1 9 11.869v3.05a7 7 0 0 0 3.185-1.32l-2.158-2.158z"/><path d="M1.08 9a7 7 0 0 0 1.32 3.186l2.159-2.159A4 4 0 0 1 4.131 9H1.08z"/></g></svg>
diff --git a/engine/editor/icons/Progress7.svg b/engine/editor/icons/Progress7.svg
index 094feff6..8505133c 100644
--- a/engine/editor/icons/Progress7.svg
+++ b/engine/editor/icons/Progress7.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zm6.6 2.734-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.787 0a4 4 0 0 1-.426 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.054zm-5.895 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0A4 4 0 0 1 9 11.869v3.05a7 7 0 0 0 3.185-1.32l-2.158-2.158z"/><path d="M2.4 3.8a7 7 0 0 0-1.322 3.186h3.055a4 4 0 0 1 .426-1.028L2.4 3.8z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM7 1.08A7 7 0 0 0 3.814 2.4l2.159 2.159A4 4 0 0 1 7 4.13V1.079zm6.6 2.734-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.787 0a4 4 0 0 1-.426 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.054zm-5.895 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0A4 4 0 0 1 9 11.869v3.05a7 7 0 0 0 3.185-1.32l-2.158-2.158z"/><path d="M2.4 3.8a7 7 0 0 0-1.322 3.186h3.055a4 4 0 0 1 .426-1.028L2.4 3.8z"/></g></svg>
diff --git a/engine/editor/icons/Progress8.svg b/engine/editor/icons/Progress8.svg
index 2e8260e8..b88d910f 100644
--- a/engine/editor/icons/Progress8.svg
+++ b/engine/editor/icons/Progress8.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.055zm-5.894 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0a4 4 0 0 1-1.028.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/><path d="M7 1a7 7 0 0 0-3.186 1.32l2.159 2.159A4 4 0 0 1 7 4.05z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path fill-opacity=".2" d="M9 1.078v3.055a4 4 0 0 1 1.027.426L12.186 2.4A7 7 0 0 0 9 1.078zM2.4 3.814A7 7 0 0 0 1.078 7h3.055a4 4 0 0 1 .426-1.027L2.4 3.814zm11.2 0-2.159 2.159A4 4 0 0 1 11.869 7h3.05a7 7 0 0 0-1.32-3.186zM1.08 9a7 7 0 0 0 1.32 3.185l2.158-2.158A4 4 0 0 1 4.13 9H1.08zm10.786 0a4 4 0 0 1-.425 1.027l2.158 2.158A7 7 0 0 0 14.921 9h-3.055zm-5.894 2.441L3.814 13.6a7 7 0 0 0 3.185 1.322v-3.055a4 4 0 0 1-1.027-.426zm4.055 0a4 4 0 0 1-1.028.428v3.05a7 7 0 0 0 3.186-1.32l-2.158-2.158z"/><path d="M7 1a7 7 0 0 0-3.186 1.32l2.159 2.159A4 4 0 0 1 7 4.05z"/></g></svg>
diff --git a/engine/editor/icons/ProgressBar.svg b/engine/editor/icons/ProgressBar.svg
index df36fef9..cd56d170 100644
--- a/engine/editor/icons/ProgressBar.svg
+++ b/engine/editor/icons/ProgressBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zm0 2h10v6H3zm1 1v4h1V6zm2 0v4h1V6zm2 0v4h1V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zm0 2h10v6H3zm1 1v4h1V6zm2 0v4h1V6zm2 0v4h1V6z"/></svg>
diff --git a/engine/editor/icons/ProjectIconLoading.svg b/engine/editor/icons/ProjectIconLoading.svg
index c571bac6..d49faa41 100644
--- a/engine/editor/icons/ProjectIconLoading.svg
+++ b/engine/editor/icons/ProjectIconLoading.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><rect width="64" height="64" fill="#e0e0e0" fill-opacity=".2" rx="8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><rect width="64" height="64" fill="#e0e0e0" fill-opacity=".2" rx="8"/></svg>
diff --git a/engine/editor/icons/ProjectList.svg b/engine/editor/icons/ProjectList.svg
index bca02891..467fefaa 100644
--- a/engine/editor/icons/ProjectList.svg
+++ b/engine/editor/icons/ProjectList.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v14h14v-14zm3 7c1.104 0 2 .896 2 2s-.896 2-2 2-2-.896-2-2 .896-2 2-2zm9 1v2h-6v-2zm-9-7c1.104 0 2 .896 2 2s-.896 2-2 2-2-.896-2-2 .896-2 2-2zm3 1h6v2h-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m1 1v14h14v-14zm3 7c1.104 0 2 .896 2 2s-.896 2-2 2-2-.896-2-2 .896-2 2-2zm9 1v2h-6v-2zm-9-7c1.104 0 2 .896 2 2s-.896 2-2 2-2-.896-2-2 .896-2 2-2zm3 1h6v2h-6z"/></svg>
diff --git a/engine/editor/icons/Projection.svg b/engine/editor/icons/Projection.svg
index 45c46b8a..f8a5c436 100644
--- a/engine/editor/icons/Projection.svg
+++ b/engine/editor/icons/Projection.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#44bd44" d="M0 2v8h2V8a3 3 0 0 0 2-.779V10h2V7a1 1 0 0 1 1-1h1V4H7a3 3 0 0 0-2.02.795A3 3 0 0 0 2 2zm8 4v2a2 2 0 0 0 2 2h1a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2h-1a2 2 0 0 0-2 2zm6-4v2h2V2zM2 4a1 1 0 0 1 0 2zm8 2h1v2h-1zm4 0v3a1 1 0 0 1-1 1h-1v2h1a3 3 0 0 0 3-3V6z"/><path fill="#fff" fill-opacity=".4" d="M7 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#44bd44" d="M0 2v8h2V8a3 3 0 0 0 2-.779V10h2V7a1 1 0 0 1 1-1h1V4H7a3 3 0 0 0-2.02.795A3 3 0 0 0 2 2zm8 4v2a2 2 0 0 0 2 2h1a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2h-1a2 2 0 0 0-2 2zm6-4v2h2V2zM2 4a1 1 0 0 1 0 2zm8 2h1v2h-1zm4 0v3a1 1 0 0 1-1 1h-1v2h1a3 3 0 0 0 3-3V6z"/><path fill="#fff" fill-opacity=".4" d="M7 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/></svg>
diff --git a/engine/editor/icons/Quad.svg b/engine/editor/icons/Quad.svg
index cde5b79a..693cfd84 100644
--- a/engine/editor/icons/Quad.svg
+++ b/engine/editor/icons/Quad.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m1 1v2 10 2h2 12v-2-12h-12zm3.4141 2h8.5859v8.5859zm-1.4141 1.4141 8.5859 8.5859h-8.5859z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m1 1v2 10 2h2 12v-2-12h-12zm3.4141 2h8.5859v8.5859zm-1.4141 1.4141 8.5859 8.5859h-8.5859z"/></svg>
diff --git a/engine/editor/icons/QuadMesh.svg b/engine/editor/icons/QuadMesh.svg
index 04b1a580..70061d2f 100644
--- a/engine/editor/icons/QuadMesh.svg
+++ b/engine/editor/icons/QuadMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M2 2h12v12H2zm0 0l12 12"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M2 2h12v12H2zm0 0l12 12"/></svg>
diff --git a/engine/editor/icons/QuadOccluder3D.svg b/engine/editor/icons/QuadOccluder3D.svg
index cd6720fc..8d9f1e49 100644
--- a/engine/editor/icons/QuadOccluder3D.svg
+++ b/engine/editor/icons/QuadOccluder3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M7.328 1a4.5 4.5 0 0 1 1.414 2H13v8.586L8.307 6.893a4.5 4.5 0 0 1-1.414 1.414L11.586 13H3V8.732a4.5 4.5 0 0 1-2-1.418V15h14V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M7.328 1a4.5 4.5 0 0 1 1.414 2H13v8.586L8.307 6.893a4.5 4.5 0 0 1-1.414 1.414L11.586 13H3V8.732a4.5 4.5 0 0 1-2-1.418V15h14V1z"/></svg>
diff --git a/engine/editor/icons/Quaternion.svg b/engine/editor/icons/Quaternion.svg
index 37c10ae3..2956f8e3 100644
--- a/engine/editor/icons/Quaternion.svg
+++ b/engine/editor/icons/Quaternion.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ec418e" d="M3 3a3 3 0 0 0 0 6v2h2V8.236A3 3 0 0 0 7 9h2v-.764A3 3 0 0 0 11 9h2V6a3 3 0 0 0 3 3V7a1 1 0 0 1-1-1V5h1V3h-1V1h-2v2h-2a3 3 0 0 0-2 .764V3H7v4a1 1 0 0 1-1-1V3zm0 4a1 1 0 0 1 0-2zm8 0a1 1 0 0 1 0-2z"/><path fill="#fff" fill-opacity=".4" d="M4 3v3a3 3 0 0 0 3 3h2V3H7v4a1 1 0 0 1-1-1V3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ec418e" d="M3 3a3 3 0 0 0 0 6v2h2V8.236A3 3 0 0 0 7 9h2v-.764A3 3 0 0 0 11 9h2V6a3 3 0 0 0 3 3V7a1 1 0 0 1-1-1V5h1V3h-1V1h-2v2h-2a3 3 0 0 0-2 .764V3H7v4a1 1 0 0 1-1-1V3zm0 4a1 1 0 0 1 0-2zm8 0a1 1 0 0 1 0-2z"/><path fill="#fff" fill-opacity=".4" d="M4 3v3a3 3 0 0 0 3 3h2V3H7v4a1 1 0 0 1-1-1V3z"/></svg>
diff --git a/engine/editor/icons/RID.svg b/engine/editor/icons/RID.svg
index 9311f6e8..247cc168 100644
--- a/engine/editor/icons/RID.svg
+++ b/engine/editor/icons/RID.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#41ec80" d="M7 2v2h2V2zm7 0v2h-1a3 3 0 0 0 0 6h3V2zM4 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4zm3 2v4h2V6zm6 0h1v2h-1a1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#41ec80" d="M7 2v2h2V2zm7 0v2h-1a3 3 0 0 0 0 6h3V2zM4 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4zm3 2v4h2V6zm6 0h1v2h-1a1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/RandomNumberGenerator.svg b/engine/editor/icons/RandomNumberGenerator.svg
index 881ace0b..e528b98c 100644
--- a/engine/editor/icons/RandomNumberGenerator.svg
+++ b/engine/editor/icons/RandomNumberGenerator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M8 1C1 1 1 1 1 8s0 7 7 7 7 0 7-7 0-7-7-7zM4.25 2.25a1 1 0 0 1 0 4 1 1 0 0 1 0-4zM8 6a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm3.75 3.75a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M8 1C1 1 1 1 1 8s0 7 7 7 7 0 7-7 0-7-7-7zM4.25 2.25a1 1 0 0 1 0 4 1 1 0 0 1 0-4zM8 6a1 1 0 0 1 0 4 1 1 0 0 1 0-4zm3.75 3.75a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
diff --git a/engine/editor/icons/Range.svg b/engine/editor/icons/Range.svg
index 0c792088..002dc4cc 100644
--- a/engine/editor/icons/Range.svg
+++ b/engine/editor/icons/Range.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#76ad7b" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="m3 8 1 4 4 1M8 3l4 1 1 4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#76ad7b" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" d="m3 8 1 4 4 1M8 3l4 1 1 4"/></svg>
diff --git a/engine/editor/icons/RangeSliderLeft.svg b/engine/editor/icons/RangeSliderLeft.svg
index f09b1c71..fa7d9a70 100644
--- a/engine/editor/icons/RangeSliderLeft.svg
+++ b/engine/editor/icons/RangeSliderLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16"><path fill="#fff" d="m10 2-9.99983819 6 9.99983819 6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16"><path fill="#fff" d="m10 2-9.99983819 6 9.99983819 6z"/></svg>
diff --git a/engine/editor/icons/RangeSliderRight.svg b/engine/editor/icons/RangeSliderRight.svg
index 28491b72..44893975 100644
--- a/engine/editor/icons/RangeSliderRight.svg
+++ b/engine/editor/icons/RangeSliderRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16"><path fill="#fff" d="m2 2 10 6-10 6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="16"><path fill="#fff" d="m2 2 10 6-10 6z"/></svg>
diff --git a/engine/editor/icons/RayCast2D.svg b/engine/editor/icons/RayCast2D.svg
index a9cbe812..fd9311e5 100644
--- a/engine/editor/icons/RayCast2D.svg
+++ b/engine/editor/icons/RayCast2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m7 1v9h-3l4 5 4-5h-3v-9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m7 1v9h-3l4 5 4-5h-3v-9z"/></svg>
diff --git a/engine/editor/icons/RayCast3D.svg b/engine/editor/icons/RayCast3D.svg
index c7f57ed5..fcf64160 100644
--- a/engine/editor/icons/RayCast3D.svg
+++ b/engine/editor/icons/RayCast3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m7 1v9h-3l4 5 4-5h-3v-9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m7 1v9h-3l4 5 4-5h-3v-9z"/></svg>
diff --git a/engine/editor/icons/Rect2.svg b/engine/editor/icons/Rect2.svg
index f55fe46d..fb736067 100644
--- a/engine/editor/icons/Rect2.svg
+++ b/engine/editor/icons/Rect2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f1738f" d="M13 2v2h-1a3 3 0 0 0-2.5 1.346A3 3 0 1 0 7 10h1V8H7a1 1 0 0 1-1-1h3a3 3 0 0 0 3 3h1V8h-1a1 1 0 0 1 0-2h1v1a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zM3 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f1738f" d="M13 2v2h-1a3 3 0 0 0-2.5 1.346A3 3 0 1 0 7 10h1V8H7a1 1 0 0 1-1-1h3a3 3 0 0 0 3 3h1V8h-1a1 1 0 0 1 0-2h1v1a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zM3 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/></svg>
diff --git a/engine/editor/icons/Rect2i.svg b/engine/editor/icons/Rect2i.svg
index 58de99fa..7ad45c52 100644
--- a/engine/editor/icons/Rect2i.svg
+++ b/engine/editor/icons/Rect2i.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f1738f" d="M9 2v2H8a3 3 0 0 0 0 6h1V8H8a1 1 0 0 1 0-2h1v1a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zM4 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f1738f" d="M9 2v2H8a3 3 0 0 0 0 6h1V8H8a1 1 0 0 1 0-2h1v1a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zM4 4a3 3 0 0 0-3 3v3h2V7a1 1 0 0 1 1-1h1V4z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
diff --git a/engine/editor/icons/Rectangle.svg b/engine/editor/icons/Rectangle.svg
index 72819295..c2fac1a6 100644
--- a/engine/editor/icons/Rectangle.svg
+++ b/engine/editor/icons/Rectangle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M2 4h12v8H2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M2 4h12v8H2z"/></svg>
diff --git a/engine/editor/icons/RectangleShape2D.svg b/engine/editor/icons/RectangleShape2D.svg
index 70892bc3..b483cc1a 100644
--- a/engine/editor/icons/RectangleShape2D.svg
+++ b/engine/editor/icons/RectangleShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linejoin="round" stroke-width="2" d="M2 4h12v8H2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linejoin="round" stroke-width="2" d="M2 4h12v8H2z"/></svg>
diff --git a/engine/editor/icons/Redo.svg b/engine/editor/icons/Redo.svg
new file mode 100644
index 00000000..8394c822
--- /dev/null
+++ b/engine/editor/icons/Redo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 9h7V2l-2 2a6.927 8.938-30 0 0-9 11 4.364 6.234-10 0 1 6-8z"/></svg>
diff --git a/engine/editor/icons/ReferenceRect.svg b/engine/editor/icons/ReferenceRect.svg
index de84fe83..4613e007 100644
--- a/engine/editor/icons/ReferenceRect.svg
+++ b/engine/editor/icons/ReferenceRect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v2h2v-2zm3 0v2h8v-2zm9 0v2h2v-2zm-12 3v8h2v-8zm12 0v8h2v-8zm-12 9v2h2v-2zm3 0v2h8v-2zm9 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v2h2v-2zm3 0v2h8v-2zm9 0v2h2v-2zm-12 3v8h2v-8zm12 0v8h2v-8zm-12 9v2h2v-2zm3 0v2h8v-2zm9 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/ReflectionProbe.svg b/engine/editor/icons/ReflectionProbe.svg
index 4417ee07..5035b12b 100644
--- a/engine/editor/icons/ReflectionProbe.svg
+++ b/engine/editor/icons/ReflectionProbe.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M10 2a1 1 0 1 0 0 2h1.586l-4.52 4.52-4.298-5.16-1.536 1.28 5 6a1 1 0 0 0 1.475.064L13 5.412V7a1 1 0 1 0 2 0V3a1 1 0 0 0-1-1h-4zM1 9v5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-4h-2v3H3V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M10 2a1 1 0 1 0 0 2h1.586l-4.52 4.52-4.298-5.16-1.536 1.28 5 6a1 1 0 0 0 1.475.064L13 5.412V7a1 1 0 1 0 2 0V3a1 1 0 0 0-1-1h-4zM1 9v5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-4h-2v3H3V9z"/></svg>
diff --git a/engine/editor/icons/RegionEdit.svg b/engine/editor/icons/RegionEdit.svg
index d70df994..89d20254 100644
--- a/engine/editor/icons/RegionEdit.svg
+++ b/engine/editor/icons/RegionEdit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M6 6h6v6H6z"/><path fill-opacity=".325" d="M1 1v4h4V1zm5 0v4h6V1zm7 0v4h2V1zM1 6v6h4V6zm12 0v6h2V6zM1 13v2h4v-2zm5 0v2h6v-2zm7 0v2h2v-2z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M6 6h6v6H6z"/><path fill-opacity=".325" d="M1 1v4h4V1zm5 0v4h6V1zm7 0v4h2V1zM1 6v6h4V6zm12 0v6h2V6zM1 13v2h4v-2zm5 0v2h6v-2zm7 0v2h2v-2z"/></g></svg>
diff --git a/engine/editor/icons/Reload.svg b/engine/editor/icons/Reload.svg
index 651f68b7..ff237a02 100644
--- a/engine/editor/icons/Reload.svg
+++ b/engine/editor/icons/Reload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4z"/></svg>
diff --git a/engine/editor/icons/ReloadSmall.svg b/engine/editor/icons/ReloadSmall.svg
index d33112cb..2646284d 100644
--- a/engine/editor/icons/ReloadSmall.svg
+++ b/engine/editor/icons/ReloadSmall.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#e0e0e0" d="M2 7a6 6 0 1 1 6 6v-2a4 4 0 1 0-4-4h2l-3 4-3-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#e0e0e0" d="M2 7a6 6 0 1 1 6 6v-2a4 4 0 1 0-4-4h2l-3 4-3-4z"/></svg>
diff --git a/engine/editor/icons/RemoteTransform2D.svg b/engine/editor/icons/RemoteTransform2D.svg
index 91a9c948..96cfefbe 100644
--- a/engine/editor/icons/RemoteTransform2D.svg
+++ b/engine/editor/icons/RemoteTransform2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 1a8 8 0 0 0-6.928 4 1 1 0 0 0 1.733 1 6 6 0 0 1 10.39 0 1 1 0 0 0 1.733-1A8 8 0 0 0 8 1zm0 4a4 4 0 0 0-3.863 2.965 1 1 0 0 0 1.931.517 2 2 0 0 1 3.864 0 1 1 0 0 0 1.931-.517A4 4 0 0 0 8 5zm0 4a1 1 0 0 0-1 1v1H4a4 4 0 0 0 8 0H9v-1a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 1a8 8 0 0 0-6.928 4 1 1 0 0 0 1.733 1 6 6 0 0 1 10.39 0 1 1 0 0 0 1.733-1A8 8 0 0 0 8 1zm0 4a4 4 0 0 0-3.863 2.965 1 1 0 0 0 1.931.517 2 2 0 0 1 3.864 0 1 1 0 0 0 1.931-.517A4 4 0 0 0 8 5zm0 4a1 1 0 0 0-1 1v1H4a4 4 0 0 0 8 0H9v-1a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/RemoteTransform3D.svg b/engine/editor/icons/RemoteTransform3D.svg
index 1e70d689..86eb864c 100644
--- a/engine/editor/icons/RemoteTransform3D.svg
+++ b/engine/editor/icons/RemoteTransform3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M8 1a8 8 0 0 0-6.928 4 1 1 0 0 0 1.733 1 6 6 0 0 1 10.39 0 1 1 0 0 0 1.733-1A8 8 0 0 0 8 1zm0 4a4 4 0 0 0-3.863 2.965 1 1 0 0 0 1.931.517 2 2 0 0 1 3.864 0 1 1 0 0 0 1.931-.517A4 4 0 0 0 8 5zm0 4a1 1 0 0 0-1 1v1H4a4 4 0 0 0 8 0H9v-1a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M8 1a8 8 0 0 0-6.928 4 1 1 0 0 0 1.733 1 6 6 0 0 1 10.39 0 1 1 0 0 0 1.733-1A8 8 0 0 0 8 1zm0 4a4 4 0 0 0-3.863 2.965 1 1 0 0 0 1.931.517 2 2 0 0 1 3.864 0 1 1 0 0 0 1.931-.517A4 4 0 0 0 8 5zm0 4a1 1 0 0 0-1 1v1H4a4 4 0 0 0 8 0H9v-1a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/Remove.svg b/engine/editor/icons/Remove.svg
index d2eb0f96..7acc15cd 100644
--- a/engine/editor/icons/Remove.svg
+++ b/engine/editor/icons/Remove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 1v1h-4v2h14v-2h-4v-1zm-3 4v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8zm1 2h2v6h-2zm4 0h2v6h-2zm4 0h2v6h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 1v1h-4v2h14v-2h-4v-1zm-3 4v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8zm1 2h2v6h-2zm4 0h2v6h-2zm4 0h2v6h-2z"/></svg>
diff --git a/engine/editor/icons/RemoveInternal.svg b/engine/editor/icons/RemoveInternal.svg
index a133ca7e..f4bfbb91 100644
--- a/engine/editor/icons/RemoveInternal.svg
+++ b/engine/editor/icons/RemoveInternal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="10.5" cy="12.627" r="2.373"/><path d="m2.766 2.412-.897.897L4.56 6 1.87 8.691l.896.898 2.692-2.692L8.149 9.59l.897-.898L6.355 6l2.691-2.691-.897-.897-2.691 2.69z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="10.5" cy="12.627" r="2.373"/><path d="m2.766 2.412-.897.897L4.56 6 1.87 8.691l.896.898 2.692-2.692L8.149 9.59l.897-.898L6.355 6l2.691-2.691-.897-.897-2.691 2.69z"/></g></svg>
diff --git a/engine/editor/icons/Rename.svg b/engine/editor/icons/Rename.svg
index 26d3fead..1582f519 100644
--- a/engine/editor/icons/Rename.svg
+++ b/engine/editor/icons/Rename.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 2v2h2v8H5v2h2a1 1 0 0 0 1-1 1 1 0 0 0 1 1h2v-2H9V4h2V2H9a1 1 0 0 0-1 1 1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 2v2h2v8H5v2h2a1 1 0 0 0 1-1 1 1 0 0 0 1 1h2v-2H9V4h2V2H9a1 1 0 0 0-1 1 1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/editor/icons/Reparent.svg b/engine/editor/icons/Reparent.svg
index 4117a228..93f2b26b 100644
--- a/engine/editor/icons/Reparent.svg
+++ b/engine/editor/icons/Reparent.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-1 3.73v5.542A2 2 0 1 0 4.73 14h6.542a2 2 0 1 0-.002-2H4.729A2 2 0 0 0 4 11.27V5.729A2 2 0 0 0 3 2z"/><path fill="#5fff97" d="M9 1 5 4l4 3V5a3 3 0 0 1 3 3v2h2V8a5 5 0 0 0-5-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-1 3.73v5.542A2 2 0 1 0 4.73 14h6.542a2 2 0 1 0-.002-2H4.729A2 2 0 0 0 4 11.27V5.729A2 2 0 0 0 3 2z"/><path fill="#5fff97" d="M9 1 5 4l4 3V5a3 3 0 0 1 3 3v2h2V8a5 5 0 0 0-5-5z"/></svg>
diff --git a/engine/editor/icons/ReparentToNewNode.svg b/engine/editor/icons/ReparentToNewNode.svg
index 345a5b5c..647641d5 100644
--- a/engine/editor/icons/ReparentToNewNode.svg
+++ b/engine/editor/icons/ReparentToNewNode.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2.5 11.272A2 2 0 1 0 5.23 14h6.05a2 2 0 1 0 0-2H5.23a2 2 0 0 0-.73-.73V8h-2z"/><path fill="#5fff97" d="M10.422 1.881 7.627 3.977l2.795 2.097V4.676c2.717 0 2.18 1.447 2.18 3.927V10H14V8.603c0-3.863.13-5.324-3.578-5.324zM2.5 1v2h-2v2h2v2h2V5h2V3h-2V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2.5 11.272A2 2 0 1 0 5.23 14h6.05a2 2 0 1 0 0-2H5.23a2 2 0 0 0-.73-.73V8h-2z"/><path fill="#5fff97" d="M10.422 1.881 7.627 3.977l2.795 2.097V4.676c2.717 0 2.18 1.447 2.18 3.927V10H14V8.603c0-3.863.13-5.324-3.578-5.324zM2.5 1v2h-2v2h2v2h2V5h2V3h-2V1z"/></svg>
diff --git a/engine/editor/icons/ResourcePreloader.svg b/engine/editor/icons/ResourcePreloader.svg
index c7b66873..d2df998c 100644
--- a/engine/editor/icons/ResourcePreloader.svg
+++ b/engine/editor/icons/ResourcePreloader.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.553 4.104A1 1 0 0 0 1 4.998v6a1 1 0 0 0 .553.895l6 3a1 1 0 0 0 .894 0l6-3a1 1 0 0 0 .553-.895v-6a1 1 0 0 0-.553-.894l-6-3a1 1 0 0 0-.894 0zM8 3.119 11.764 5l-1.381.692-3.764-1.883L8 3.119zm-5 3.5 4 2v3.764l-4-2zm10 0v3.764l-4 2V8.619z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.553 4.104A1 1 0 0 0 1 4.998v6a1 1 0 0 0 .553.895l6 3a1 1 0 0 0 .894 0l6-3a1 1 0 0 0 .553-.895v-6a1 1 0 0 0-.553-.894l-6-3a1 1 0 0 0-.894 0zM8 3.119 11.764 5l-1.381.692-3.764-1.883L8 3.119zm-5 3.5 4 2v3.764l-4-2zm10 0v3.764l-4 2V8.619z"/></svg>
diff --git a/engine/editor/icons/RetargetModifier3D.svg b/engine/editor/icons/RetargetModifier3D.svg
index 2ca7af6c..74c91092 100644
--- a/engine/editor/icons/RetargetModifier3D.svg
+++ b/engine/editor/icons/RetargetModifier3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m11.667 4.166h-3.334c-1.841 0-3.333 1.492-3.333 3.334.003 1.188.638 2.283 1.667 2.877v2.956c0 .597.317 1.146.833 1.444.254.146.54.221.833.221v.002h3.334v-.002c.293 0 .579-.075.833-.221.516-.299.833-.851.833-1.444v-2.956c1.028-.594 1.664-1.689 1.667-2.877 0-1.842-1.492-3.334-3.333-3.334zm-2.5 4.166h1.666v.834h-1.666zm-2.5-.832c0-.461.372-.834.833-.834s.833.373.833.834-.372.832-.833.832-.833-.371-.833-.832zm5.833 3.223v2.61h-.833v-.833h-.834v.833h-1.666v-.833h-.834v.833h-.833v-2.608-.725h.833v.832h.834v-.832h1.666v.832h.834v-.832h.833zm0-2.391c-.461 0-.833-.371-.833-.832s.372-.834.833-.834.833.373.833.834-.372.832-.833.832z"/><path d="m4.418 9.334h-.085v.833h-.833v-2.608-.725h.567c.323-2.072 2.104-3.668 4.266-3.668h2.445c-.473-1.263-1.682-2.166-3.111-2.166h-3.334c-1.841 0-3.333 1.492-3.333 3.334.003 1.188.638 2.283 1.667 2.877v2.956c0 .597.317 1.146.833 1.444.254.146.54.221.833.221v.002h1.334v-.929c-.538-.421-.962-.962-1.249-1.571zm-1.751-5c0-.461.372-.834.833-.834s.833.373.833.834-.372.832-.833.832-.833-.371-.833-.832z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fc7f7f"><path d="m11.667 4.166h-3.334c-1.841 0-3.333 1.492-3.333 3.334.003 1.188.638 2.283 1.667 2.877v2.956c0 .597.317 1.146.833 1.444.254.146.54.221.833.221v.002h3.334v-.002c.293 0 .579-.075.833-.221.516-.299.833-.851.833-1.444v-2.956c1.028-.594 1.664-1.689 1.667-2.877 0-1.842-1.492-3.334-3.333-3.334zm-2.5 4.166h1.666v.834h-1.666zm-2.5-.832c0-.461.372-.834.833-.834s.833.373.833.834-.372.832-.833.832-.833-.371-.833-.832zm5.833 3.223v2.61h-.833v-.833h-.834v.833h-1.666v-.833h-.834v.833h-.833v-2.608-.725h.833v.832h.834v-.832h1.666v.832h.834v-.832h.833zm0-2.391c-.461 0-.833-.371-.833-.832s.372-.834.833-.834.833.373.833.834-.372.832-.833.832z"/><path d="m4.418 9.334h-.085v.833h-.833v-2.608-.725h.567c.323-2.072 2.104-3.668 4.266-3.668h2.445c-.473-1.263-1.682-2.166-3.111-2.166h-3.334c-1.841 0-3.333 1.492-3.333 3.334.003 1.188.638 2.283 1.667 2.877v2.956c0 .597.317 1.146.833 1.444.254.146.54.221.833.221v.002h1.334v-.929c-.538-.421-.962-.962-1.249-1.571zm-1.751-5c0-.461.372-.834.833-.834s.833.373.833.834-.372.832-.833.832-.833-.371-.833-.832z"/></g></svg>
diff --git a/engine/editor/icons/ReverseGradient.svg b/engine/editor/icons/ReverseGradient.svg
index e460d8d6..a150b355 100644
--- a/engine/editor/icons/ReverseGradient.svg
+++ b/engine/editor/icons/ReverseGradient.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a"><stop offset="0" stop-color="#e0e0e0"/><stop offset="1" stop-color="#e0e0e0" stop-opacity="0"/></linearGradient><linearGradient id="b" x1="1" x2="15" gradientUnits="userSpaceOnUse" href="#a"/><linearGradient id="c" x1="15" x2="1" y1="0" y2="0" gradientUnits="userSpaceOnUse" href="#a"/><path fill="url(#b)" d="M1 1h14v4H1z"/><path fill="url(#c)" d="M1 11h14v4H1z"/><path fill="#e0e0e0" d="m6 6 2 4 2-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a"><stop offset="0" stop-color="#e0e0e0"/><stop offset="1" stop-color="#e0e0e0" stop-opacity="0"/></linearGradient><linearGradient id="b" x1="1" x2="15" gradientUnits="userSpaceOnUse" href="#a"/><linearGradient id="c" x1="15" x2="1" y1="0" y2="0" gradientUnits="userSpaceOnUse" href="#a"/><path fill="url(#b)" d="M1 1h14v4H1z"/><path fill="url(#c)" d="M1 11h14v4H1z"/><path fill="#e0e0e0" d="m6 6 2 4 2-4z"/></svg>
diff --git a/engine/editor/icons/RibbonTrailMesh.svg b/engine/editor/icons/RibbonTrailMesh.svg
index 12510d8d..15163c0a 100644
--- a/engine/editor/icons/RibbonTrailMesh.svg
+++ b/engine/editor/icons/RibbonTrailMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M4 2h8M1 8h14M4 14h8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M4 2h8M1 8h14M4 14h8"/></svg>
diff --git a/engine/editor/icons/RichTextEffect.svg b/engine/editor/icons/RichTextEffect.svg
index f54d1446..128862dc 100644
--- a/engine/editor/icons/RichTextEffect.svg
+++ b/engine/editor/icons/RichTextEffect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v2h7V1zm9 0v2h5V1zM1 5v2h11V5zm0 4v2h4V9zm6 0v2h1a1.8 1.8 0 0 1 .328-2zm-6 4v2h8.281a1.8 1.8 0 0 1-1.426-2z"/><path fill="#c38ef1" d="M12.36 8.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v2h7V1zm9 0v2h5V1zM1 5v2h11V5zm0 4v2h4V9zm6 0v2h1a1.8 1.8 0 0 1 .328-2zm-6 4v2h8.281a1.8 1.8 0 0 1-1.426-2z"/><path fill="#c38ef1" d="M12.36 8.598a.533 3.2 0 0 0-.51 2.275 3.2.533 30 0 0-.515.887.533 3.2 60 0 0 .515.887.533 3.2 0 0 0 1.02 0 3.2.533 30 0 0 .515-.887.533 3.2 60 0 0-.515-.887.533 3.2 0 0 0-.51-2.275z"/></svg>
diff --git a/engine/editor/icons/RichTextLabel.svg b/engine/editor/icons/RichTextLabel.svg
index 4a740647..03b1e867 100644
--- a/engine/editor/icons/RichTextLabel.svg
+++ b/engine/editor/icons/RichTextLabel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v2h8v-2zm12 0-3 3h2v8h-2l3 3 3-3h-2v-8h2zm-12 4v2h2v-2zm4 0v2h4v-2zm-4 4v2h8v-2zm0 4v2h4v-2zm6 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v2h8v-2zm12 0-3 3h2v8h-2l3 3 3-3h-2v-8h2zm-12 4v2h2v-2zm4 0v2h4v-2zm-4 4v2h8v-2zm0 4v2h4v-2zm6 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/RigidBody2D.svg b/engine/editor/icons/RigidBody2D.svg
index 36e5351c..c10059ac 100644
--- a/engine/editor/icons/RigidBody2D.svg
+++ b/engine/editor/icons/RigidBody2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm1.951 1.334A6 6 0 0 1 14.001 8h-7a2 2 0 0 0-.95-1.7c1.346-2.029 2.604-3.263 3.9-3.967zm-6.828 2.18c.146.65.358 1.283.684 1.884A2 2 0 0 0 3 8H2a6 6 0 0 1 1.123-3.486zM3.8 9.6a2 2 0 0 0 2.4 0c1.472 2.027 2.728 3.264 3.8 4a6 6 0 0 1-7.15-2.5c.25-.6.5-1 .95-1.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm1.951 1.334A6 6 0 0 1 14.001 8h-7a2 2 0 0 0-.95-1.7c1.346-2.029 2.604-3.263 3.9-3.967zm-6.828 2.18c.146.65.358 1.283.684 1.884A2 2 0 0 0 3 8H2a6 6 0 0 1 1.123-3.486zM3.8 9.6a2 2 0 0 0 2.4 0c1.472 2.027 2.728 3.264 3.8 4a6 6 0 0 1-7.15-2.5c.25-.6.5-1 .95-1.5z"/></svg>
diff --git a/engine/editor/icons/RigidBody3D.svg b/engine/editor/icons/RigidBody3D.svg
index d829b84f..24371680 100644
--- a/engine/editor/icons/RigidBody3D.svg
+++ b/engine/editor/icons/RigidBody3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm1.951 1.334A6 6 0 0 1 14.001 8h-7a2 2 0 0 0-.95-1.7c1.346-2.029 2.604-3.263 3.9-3.967zm-6.828 2.18c.146.65.358 1.283.684 1.884A2 2 0 0 0 3 8H2a6 6 0 0 1 1.123-3.486zM3.8 9.6a2 2 0 0 0 2.4 0c1.472 2.027 2.728 3.264 3.8 4a6 6 0 0 1-7.15-2.5c.25-.6.5-1 .95-1.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm1.951 1.334A6 6 0 0 1 14.001 8h-7a2 2 0 0 0-.95-1.7c1.346-2.029 2.604-3.263 3.9-3.967zm-6.828 2.18c.146.65.358 1.283.684 1.884A2 2 0 0 0 3 8H2a6 6 0 0 1 1.123-3.486zM3.8 9.6a2 2 0 0 0 2.4 0c1.472 2.027 2.728 3.264 3.8 4a6 6 0 0 1-7.15-2.5c.25-.6.5-1 .95-1.5z"/></svg>
diff --git a/engine/editor/icons/RootMotionView.svg b/engine/editor/icons/RootMotionView.svg
index 503321d8..9ed98020 100644
--- a/engine/editor/icons/RootMotionView.svg
+++ b/engine/editor/icons/RootMotionView.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><radialGradient id="a" cx="8" cy="8" r="6" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc7f7f"/><stop offset=".833" stop-color="#fc7f7f" stop-opacity=".7"/><stop offset="1" stop-color="#fc7f7f" stop-opacity="0"/></radialGradient><path fill="url(#a)" d="M5 2v3H2v2h3v2H2v2h3v3h2v-3h2v3h2v-3h3V9h-3V7h3V5h-3V2H9v3H7V2zm2 5h2v2H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><radialGradient id="a" cx="8" cy="8" r="6" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fc7f7f"/><stop offset=".833" stop-color="#fc7f7f" stop-opacity=".7"/><stop offset="1" stop-color="#fc7f7f" stop-opacity="0"/></radialGradient><path fill="url(#a)" d="M5 2v3H2v2h3v2H2v2h3v3h2v-3h2v3h2v-3h3V9h-3V7h3V5h-3V2H9v3H7V2zm2 5h2v2H7z"/></svg>
diff --git a/engine/editor/icons/RotateLeft.svg b/engine/editor/icons/RotateLeft.svg
index 651f68b7..ff237a02 100644
--- a/engine/editor/icons/RotateLeft.svg
+++ b/engine/editor/icons/RotateLeft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4z"/></svg>
diff --git a/engine/editor/icons/RotateRight.svg b/engine/editor/icons/RotateRight.svg
index 3da2ce5f..d3e44ee1 100644
--- a/engine/editor/icons/RotateRight.svg
+++ b/engine/editor/icons/RotateRight.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M 11 8 a 4 4 0 1 0 -4 4 v 2 a 6 6 0 1 1 6 -6 h 2 l -3 4 l -3 -4 z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M 11 8 a 4 4 0 1 0 -4 4 v 2 a 6 6 0 1 1 6 -6 h 2 l -3 4 l -3 -4 z"/></svg>
diff --git a/engine/editor/icons/Ruler.svg b/engine/editor/icons/Ruler.svg
index baaaecd5..be2c36b5 100644
--- a/engine/editor/icons/Ruler.svg
+++ b/engine/editor/icons/Ruler.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h14zm3 7 4 4H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v14h14zm3 7 4 4H4z"/></svg>
diff --git a/engine/editor/icons/SampleLibrary.svg b/engine/editor/icons/SampleLibrary.svg
index 3f62ae2d..657c5988 100644
--- a/engine/editor/icons/SampleLibrary.svg
+++ b/engine/editor/icons/SampleLibrary.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M9 8v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8z"/><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 6h2l2 4l1-8l2 4h3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M9 8v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8z"/><path fill="none" stroke="#ff5f5f" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M2 6h2l2 4l1-8l2 4h3"/></svg>
diff --git a/engine/editor/icons/Save.svg b/engine/editor/icons/Save.svg
index ab8ffff8..b8b2f9a1 100644
--- a/engine/editor/icons/Save.svg
+++ b/engine/editor/icons/Save.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4l-3-3h-1v6H3zm1 0v5h3V1zm4 8a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4l-3-3h-1v6H3zm1 0v5h3V1zm4 8a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
diff --git a/engine/editor/icons/SceneUniqueName.svg b/engine/editor/icons/SceneUniqueName.svg
index 029eca86..72b5e712 100644
--- a/engine/editor/icons/SceneUniqueName.svg
+++ b/engine/editor/icons/SceneUniqueName.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 1.75a1 1 0 0 1 0 2.5 1 1 0 0 1 0-2.5zM10.5 2H12L5.5 14H4zM12 8a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 1.75a1 1 0 0 1 0 2.5 1 1 0 0 1 0-2.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 1.75a1 1 0 0 1 0 2.5 1 1 0 0 1 0-2.5zM10.5 2H12L5.5 14H4zM12 8a3 3 0 0 0 0 6 3 3 0 0 0 0-6zm0 1.75a1 1 0 0 1 0 2.5 1 1 0 0 1 0-2.5z"/></svg>
diff --git a/engine/editor/icons/Script.svg b/engine/editor/icons/Script.svg
index 6e1d3273..4e418ab6 100644
--- a/engine/editor/icons/Script.svg
+++ b/engine/editor/icons/Script.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h7a2 2 0 0 0 2-2V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h7a2 2 0 0 0 2-2V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/></svg>
diff --git a/engine/editor/icons/ScriptCreate.svg b/engine/editor/icons/ScriptCreate.svg
index e3688004..6b1fa485 100644
--- a/engine/editor/icons/ScriptCreate.svg
+++ b/engine/editor/icons/ScriptCreate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h7v-1H8v-4h2V8h2V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/><path fill="#5fff97" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h7v-1H8v-4h2V8h2V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/><path fill="#5fff97" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
diff --git a/engine/editor/icons/ScriptCreateDialog.svg b/engine/editor/icons/ScriptCreateDialog.svg
index 9e60c999..08d07f67 100644
--- a/engine/editor/icons/ScriptCreateDialog.svg
+++ b/engine/editor/icons/ScriptCreateDialog.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm5.572 1h3.998a1.143 1.143 0 0 1 1.143 1.143v1.142H7.715V7.143A1.143 1.143 0 0 0 6.572 6zm.57 2.858H10v4A1.143 1.143 0 0 1 8.857 14h-4A1.143 1.143 0 0 0 6 12.857V7.143a.57.57 0 0 1 1.143 0zm-2.855 2.854H5.43v1.143a.564.564 0 0 1-1.143 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v1h14V3a2 2 0 0 0-2-2zm9 1h1v1h-1zM1 5v8a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5zm5.572 1h3.998a1.143 1.143 0 0 1 1.143 1.143v1.142H7.715V7.143A1.143 1.143 0 0 0 6.572 6zm.57 2.858H10v4A1.143 1.143 0 0 1 8.857 14h-4A1.143 1.143 0 0 0 6 12.857V7.143a.57.57 0 0 1 1.143 0zm-2.855 2.854H5.43v1.143a.564.564 0 0 1-1.143 0z"/></svg>
diff --git a/engine/editor/icons/ScriptExtend.svg b/engine/editor/icons/ScriptExtend.svg
index 3dc771dc..0b577985 100644
--- a/engine/editor/icons/ScriptExtend.svg
+++ b/engine/editor/icons/ScriptExtend.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h7a2 2 0 0 0 1.723-1H8v-4h4V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/><path fill="#5fb2ff" d="m16 12-3-3v2H9v2h4v2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h7a2 2 0 0 0 1.723-1H8v-4h4V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/><path fill="#5fb2ff" d="m16 12-3-3v2H9v2h4v2z"/></svg>
diff --git a/engine/editor/icons/ScriptRemove.svg b/engine/editor/icons/ScriptRemove.svg
index 5236b6df..b4d4a00a 100644
--- a/engine/editor/icons/ScriptRemove.svg
+++ b/engine/editor/icons/ScriptRemove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h5.635l-1.584-1.584 1.414-1.414-1.414-1.414 3.535-3.535L12 8.467V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/><path fill="#ff5f5f" d="m13.414 12 1.414-1.414-1.414-1.414L12 10.586l-1.414-1.414-1.414 1.414L10.586 12l-1.414 1.414 1.414 1.414L12 13.414l1.414 1.414 1.414-1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 0 0 2 2h5.635l-1.584-1.584 1.414-1.414-1.414-1.414 3.535-3.535L12 8.467V5h3V3a2 2 0 0 0-2-2z"/><path fill-opacity=".2" d="M6 1a2 2 0 0 0-2 2v7H1v3a2 2 0 1 0 4 0V3a1 1 0 0 1 2 0v3h5V5H8V3a2 2 0 0 0-2-2zM2 11h2v2a1 1 0 0 1-2 0z"/><path fill="#ff5f5f" d="m13.414 12 1.414-1.414-1.414-1.414L12 10.586l-1.414-1.414-1.414 1.414L10.586 12l-1.414 1.414 1.414 1.414L12 13.414l1.414 1.414 1.414-1.414z"/></svg>
diff --git a/engine/editor/icons/ScrollContainer.svg b/engine/editor/icons/ScrollContainer.svg
index 099b951e..76d60360 100644
--- a/engine/editor/icons/ScrollContainer.svg
+++ b/engine/editor/icons/ScrollContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm5 1L4 8l4 4 4-4zm2 2v4H6V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm5 1L4 8l4 4 4-4zm2 2v4H6V6z"/></svg>
diff --git a/engine/editor/icons/Search.svg b/engine/editor/icons/Search.svg
index f556cd9c..736d5535 100644
--- a/engine/editor/icons/Search.svg
+++ b/engine/editor/icons/Search.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M10.168 8.754a5 5 0 1 0-1.414 1.414l4.316 4.316 1.414-1.414zM6 3a3 3 0 0 1 0 6 3 3 0 0 1 0-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M10.168 8.754a5 5 0 1 0-1.414 1.414l4.316 4.316 1.414-1.414zM6 3a3 3 0 0 1 0 6 3 3 0 0 1 0-6z"/></svg>
diff --git a/engine/editor/icons/SegmentShape2D.svg b/engine/editor/icons/SegmentShape2D.svg
index 1facf6bb..5c81a838 100644
--- a/engine/editor/icons/SegmentShape2D.svg
+++ b/engine/editor/icons/SegmentShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-width="2" d="m2 14 12-12"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-width="2" d="m2 14 12-12"/></svg>
diff --git a/engine/editor/icons/SeparationRayShape2D.svg b/engine/editor/icons/SeparationRayShape2D.svg
index d816bcf3..f14859c8 100644
--- a/engine/editor/icons/SeparationRayShape2D.svg
+++ b/engine/editor/icons/SeparationRayShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 2v12m3-3-3 3-3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 2v12m3-3-3 3-3-3"/></svg>
diff --git a/engine/editor/icons/SeparationRayShape3D.svg b/engine/editor/icons/SeparationRayShape3D.svg
index 83d70e98..f1fd4d16 100644
--- a/engine/editor/icons/SeparationRayShape3D.svg
+++ b/engine/editor/icons/SeparationRayShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#a2d2ff" d="M8 1 3 6a5 2 0 0 0 3 1.8v6.4a2 .8 0 0 0 2 .8z"/><path fill="#2998ff" d="m8 1 5 5a5 2 0 0 1-3 1.8v6.4a2 .8 0 0 1-2 .8V9.5a5 2 0 0 1-2-.2V7.8A5 2 0 0 0 8 8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#a2d2ff" d="M8 1 3 6a5 2 0 0 0 3 1.8v6.4a2 .8 0 0 0 2 .8z"/><path fill="#2998ff" d="m8 1 5 5a5 2 0 0 1-3 1.8v6.4a2 .8 0 0 1-2 .8V9.5a5 2 0 0 1-2-.2V7.8A5 2 0 0 0 8 8z"/></svg>
diff --git a/engine/editor/icons/Shader.svg b/engine/editor/icons/Shader.svg
index ed2b487b..21849d37 100644
--- a/engine/editor/icons/Shader.svg
+++ b/engine/editor/icons/Shader.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6l-5-5zm1 2h6v3a1 1 0 0 0 1 1h3v6H3z"/><path fill="#8045ff" d="M10 11h2v1h-2z"/><path fill="#ffe345" d="M4 6h2v1H4z"/><path fill="#80ff45" d="M8 8h4v1H8z"/><path fill="#45d7ff" d="M7 6h1v1H7z"/><path fill="#ff4596" d="M4 11h5v1H4z"/><path fill="#ff4545" d="M4 4h3v1H4z"/><path fill="#45ffa2" d="M4 8h3v1H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6l-5-5zm1 2h6v3a1 1 0 0 0 1 1h3v6H3z"/><path fill="#8045ff" d="M10 11h2v1h-2z"/><path fill="#ffe345" d="M4 6h2v1H4z"/><path fill="#80ff45" d="M8 8h4v1H8z"/><path fill="#45d7ff" d="M7 6h1v1H7z"/><path fill="#ff4596" d="M4 11h5v1H4z"/><path fill="#ff4545" d="M4 4h3v1H4z"/><path fill="#45ffa2" d="M4 8h3v1H4z"/></svg>
diff --git a/engine/editor/icons/ShaderGlobalsOverride.svg b/engine/editor/icons/ShaderGlobalsOverride.svg
index 4ce700f2..70df35c3 100644
--- a/engine/editor/icons/ShaderGlobalsOverride.svg
+++ b/engine/editor/icons/ShaderGlobalsOverride.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6l-5-5zm1 2h6v3a1 1 0 0 0 1 1h3v6H3zm1 1v1h3V4zm0 2v1h2V6zm3 0v1h1V6zM5 9l3 3 3-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6l-5-5zm1 2h6v3a1 1 0 0 0 1 1h3v6H3zm1 1v1h3V4zm0 2v1h2V6zm3 0v1h1V6zM5 9l3 3 3-3z"/></svg>
diff --git a/engine/editor/icons/ShaderInclude.svg b/engine/editor/icons/ShaderInclude.svg
index 0023be54..2dc14f4e 100644
--- a/engine/editor/icons/ShaderInclude.svg
+++ b/engine/editor/icons/ShaderInclude.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 10h2v2H2zm0 3h2v3H2zm3 3v-6h2a3 3 0 0 1 3 3v3H8v-3a1 1 0 0 0-1-1v4zm10-6h-1a1 1 0 0 0 0 6h1v-2h-1a1 1 0 0 1 0-2h1zM2 1a1 1 0 0 0-1 1v7h2V3h6v3a1 1 0 0 0 1 1h3v2h2V6l-5-5z"/><path fill="#ffe345" d="M4 6h2v1H4z"/><path fill="#80ff45" d="M8 8h4v1H8z"/><path fill="#45d7ff" d="M7 6h1v1H7z"/><path fill="#ff4545" d="M4 4h3v1H4z"/><path fill="#45ffa2" d="M4 8h3v1H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 10h2v2H2zm0 3h2v3H2zm3 3v-6h2a3 3 0 0 1 3 3v3H8v-3a1 1 0 0 0-1-1v4zm10-6h-1a1 1 0 0 0 0 6h1v-2h-1a1 1 0 0 1 0-2h1zM2 1a1 1 0 0 0-1 1v7h2V3h6v3a1 1 0 0 0 1 1h3v2h2V6l-5-5z"/><path fill="#ffe345" d="M4 6h2v1H4z"/><path fill="#80ff45" d="M8 8h4v1H8z"/><path fill="#45d7ff" d="M7 6h1v1H7z"/><path fill="#ff4545" d="M4 4h3v1H4z"/><path fill="#45ffa2" d="M4 8h3v1H4z"/></svg>
diff --git a/engine/editor/icons/ShaderMaterial.svg b/engine/editor/icons/ShaderMaterial.svg
index add2072b..9bfd7af9 100644
--- a/engine/editor/icons/ShaderMaterial.svg
+++ b/engine/editor/icons/ShaderMaterial.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 2a1 1 0 0 1 1-1h8l5 5v8a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1zm2 1v10h10V7h-3a1 1 0 0 1-1-1V3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 2a1 1 0 0 1 1-1h8l5 5v8a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1zm2 1v10h10V7h-3a1 1 0 0 1-1-1V3z"/></svg>
diff --git a/engine/editor/icons/ShapeCast2D.svg b/engine/editor/icons/ShapeCast2D.svg
index 87ab6ef7..08f4742f 100644
--- a/engine/editor/icons/ShapeCast2D.svg
+++ b/engine/editor/icons/ShapeCast2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M9 8.7a4 4 0 1 0-2 0V10H4l4 5 4-5H9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M9 8.7a4 4 0 1 0-2 0V10H4l4 5 4-5H9z"/></svg>
diff --git a/engine/editor/icons/ShapeCast3D.svg b/engine/editor/icons/ShapeCast3D.svg
index 6390c4a9..ea8ac05b 100644
--- a/engine/editor/icons/ShapeCast3D.svg
+++ b/engine/editor/icons/ShapeCast3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M9 8.7a4 4 0 1 0-2 0V10H4l4 5 4-5H9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M9 8.7a4 4 0 1 0-2 0V10H4l4 5 4-5H9z"/></svg>
diff --git a/engine/editor/icons/Shortcut.svg b/engine/editor/icons/Shortcut.svg
index 5010aafe..fe77e4a7 100644
--- a/engine/editor/icons/Shortcut.svg
+++ b/engine/editor/icons/Shortcut.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1Zm3 2h3L9 7h2l-4 4 1-3H6zM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a1 1 0 0 0-1 1v9a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1Zm3 2h3L9 7h2l-4 4 1-3H6zM1 4v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4h-1v9a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4Z"/></svg>
diff --git a/engine/editor/icons/ShowInFileSystem.svg b/engine/editor/icons/ShowInFileSystem.svg
index 766088cd..efb4a2b7 100644
--- a/engine/editor/icons/ShowInFileSystem.svg
+++ b/engine/editor/icons/ShowInFileSystem.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v2.25h6v4.5h3v4.5h5V10h-2.75V7.75H15V5.5H9.25V3.25H15V1z"/><path fill="#5fb2ff" d="M5.04 8.04c-1.534 0-3.475 1.169-4.173 3.423a.6.6 0 0 0 0 .33c.67 2.374 2.673 3.447 4.173 3.447s3.502-1.073 4.177-3.435a.6.6 0 0 0 0-.33C8.557 9.201 6.572 8.04 5.04 8.04zm0 1.2a2.4 2.4 0 0 1 0 4.8 2.4 2.4 0 0 1 0-4.8zm0 1.2a1.2 1.2 0 0 0 0 2.4 1.2 1.2 0 0 0 0-2.4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v2.25h6v4.5h3v4.5h5V10h-2.75V7.75H15V5.5H9.25V3.25H15V1z"/><path fill="#5fb2ff" d="M5.04 8.04c-1.534 0-3.475 1.169-4.173 3.423a.6.6 0 0 0 0 .33c.67 2.374 2.673 3.447 4.173 3.447s3.502-1.073 4.177-3.435a.6.6 0 0 0 0-.33C8.557 9.201 6.572 8.04 5.04 8.04zm0 1.2a2.4 2.4 0 0 1 0 4.8 2.4 2.4 0 0 1 0-4.8zm0 1.2a1.2 1.2 0 0 0 0 2.4 1.2 1.2 0 0 0 0-2.4z"/></svg>
diff --git a/engine/editor/icons/Signal.svg b/engine/editor/icons/Signal.svg
index c651cb03..3292c210 100644
--- a/engine/editor/icons/Signal.svg
+++ b/engine/editor/icons/Signal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="m1 3v10h2 4v-2h-4v-6h4v-2h-4zm9 1v3h-5v2h5v3l2.5-2 2.5-2-2.5-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="m1 3v10h2 4v-2h-4v-6h4v-2h-4zm9 1v3h-5v2h5v3l2.5-2 2.5-2-2.5-2z"/></svg>
diff --git a/engine/editor/icons/Signals.svg b/engine/editor/icons/Signals.svg
index f8af3f1b..52c6fc5e 100644
--- a/engine/editor/icons/Signals.svg
+++ b/engine/editor/icons/Signals.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a1 1 0 0 0 0 2 8 8 0 0 1 8 8 1 1 0 0 0 2 0A10 10 0 0 0 4 2zm0 4a1 1 0 0 0 0 2 4 4 0 0 1 4 4 1 1 0 0 0 2 0 6 6 0 0 0-6-6zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 2a1 1 0 0 0 0 2 8 8 0 0 1 8 8 1 1 0 0 0 2 0A10 10 0 0 0 4 2zm0 4a1 1 0 0 0 0 2 4 4 0 0 1 4 4 1 1 0 0 0 2 0 6 6 0 0 0-6-6zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/SignalsAndGroups.svg b/engine/editor/icons/SignalsAndGroups.svg
index c3775624..2f6f2aa0 100644
--- a/engine/editor/icons/SignalsAndGroups.svg
+++ b/engine/editor/icons/SignalsAndGroups.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 0a1 1 0 0 0 0 2 8 8 0 0 1 8 8 1 1 0 0 0 2 0A10 10 0 0 0 6 0zm0 4a1 1 0 0 0 0 2 4 4 0 0 1 4 4 1 1 0 0 0 2 0 6 6 0 0 0-6-6zM1 8a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1zm1 2h4v4H2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 0a1 1 0 0 0 0 2 8 8 0 0 1 8 8 1 1 0 0 0 2 0A10 10 0 0 0 6 0zm0 4a1 1 0 0 0 0 2 4 4 0 0 1 4 4 1 1 0 0 0 2 0 6 6 0 0 0-6-6zM1 8a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1zm1 2h4v4H2z"/></svg>
diff --git a/engine/editor/icons/Skeleton2D.svg b/engine/editor/icons/Skeleton2D.svg
index c444447c..f8ba01d8 100644
--- a/engine/editor/icons/Skeleton2D.svg
+++ b/engine/editor/icons/Skeleton2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM7 7h2v1H7zM5 9h1v1h1V9h2v1h1V9h1v4h-1v-1H9v1H7v-1H6v1H5V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM7 7h2v1H7zM5 9h1v1h1V9h2v1h1V9h1v4h-1v-1H9v1H7v-1H6v1H5V9z"/></svg>
diff --git a/engine/editor/icons/Skeleton3D.svg b/engine/editor/icons/Skeleton3D.svg
index 7b14c3e4..7fb396c8 100644
--- a/engine/editor/icons/Skeleton3D.svg
+++ b/engine/editor/icons/Skeleton3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM7 7h2v1H7zM5 9h1v1h1V9h2v1h1V9h1v4h-1v-1H9v1H7v-1H6v1H5V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM7 7h2v1H7zM5 9h1v1h1V9h2v1h1V9h1v4h-1v-1H9v1H7v-1H6v1H5V9z"/></svg>
diff --git a/engine/editor/icons/SkeletonIK3D.svg b/engine/editor/icons/SkeletonIK3D.svg
index 5f824990..45632042 100644
--- a/engine/editor/icons/SkeletonIK3D.svg
+++ b/engine/editor/icons/SkeletonIK3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h2v-2H7v-1H6v1H5V9h1v1h1V9h1V8H7V7h1V2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/><path fill="#fc7f7f" d="M8 2v5h1v1H8v1h1v1h1V9h1v4h-1v-1H9v1H8v2h2a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zm3 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h2v-2H7v-1H6v1H5V9h1v1h1V9h1V8H7V7h1V2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/><path fill="#fc7f7f" d="M8 2v5h1v1H8v1h1v1h1V9h1v4h-1v-1H9v1H8v2h2a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zm3 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/SkeletonModifier3D.svg b/engine/editor/icons/SkeletonModifier3D.svg
index 35b113c4..27028d12 100644
--- a/engine/editor/icons/SkeletonModifier3D.svg
+++ b/engine/editor/icons/SkeletonModifier3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b56d6d" d="M8.445 9.308v-3.001c1.613-.944 2.156-3.016 1.213-4.631-.603-1.033-1.709-1.67-2.905-1.676h-3.385c-1.869.008-3.377 1.532-3.368 3.401.005 1.197.643 2.301 1.676 2.906v3.001c0 .934.758 1.692 1.692 1.692h3.385c.935 0 1.692-.758 1.692-1.692zm-4.23-5.077h1.692v.846h-1.692zm-2.539-.846c0-.468.378-.846.847-.846.468 0 .846.378.846.846 0 .467-.378.846-.846.846-.469 0-.847-.379-.847-.846zm5.923 5.923h-.846v-.847h-.846v.846h-1.692v-.846h-.847v.846h-.846v-3.384h.846v.846h.847v-.846h1.692v.846h.846v-.846h.846zm-.846-5.923c0-.468.378-.846.846-.846s.846.378.846.846c0 .467-.378.846-.846.846s-.846-.379-.846-.846zM15.294 8.617c-.198-.132-.424-.219-.658-.251-.122-.867-.921-1.471-1.787-1.351s-1.472.921-1.353 1.788c.034.235.119.46.251.658l-2.286 2.286c-.729-.484-1.712-.287-2.195.443-.486.727-.287 1.71.441 2.194.198.131.423.217.659.25.121.865.922 1.471 1.787 1.35.866-.12 1.471-.919 1.351-1.786-.034-.235-.118-.46-.25-.658l2.286-2.286c.728.483 1.712.285 2.195-.443.484-.727.287-1.711-.441-2.194z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b56d6d" d="M8.445 9.308v-3.001c1.613-.944 2.156-3.016 1.213-4.631-.603-1.033-1.709-1.67-2.905-1.676h-3.385c-1.869.008-3.377 1.532-3.368 3.401.005 1.197.643 2.301 1.676 2.906v3.001c0 .934.758 1.692 1.692 1.692h3.385c.935 0 1.692-.758 1.692-1.692zm-4.23-5.077h1.692v.846h-1.692zm-2.539-.846c0-.468.378-.846.847-.846.468 0 .846.378.846.846 0 .467-.378.846-.846.846-.469 0-.847-.379-.847-.846zm5.923 5.923h-.846v-.847h-.846v.846h-1.692v-.846h-.847v.846h-.846v-3.384h.846v.846h.847v-.846h1.692v.846h.846v-.846h.846zm-.846-5.923c0-.468.378-.846.846-.846s.846.378.846.846c0 .467-.378.846-.846.846s-.846-.379-.846-.846zM15.294 8.617c-.198-.132-.424-.219-.658-.251-.122-.867-.921-1.471-1.787-1.351s-1.472.921-1.353 1.788c.034.235.119.46.251.658l-2.286 2.286c-.729-.484-1.712-.287-2.195.443-.486.727-.287 1.71.441 2.194.198.131.423.217.659.25.121.865.922 1.471 1.787 1.35.866-.12 1.471-.919 1.351-1.786-.034-.235-.118-.46-.25-.658l2.286-2.286c.728.483 1.712.285 2.195-.443.484-.727.287-1.711-.441-2.194z"/></svg>
diff --git a/engine/editor/icons/SkeletonPreview.svg b/engine/editor/icons/SkeletonPreview.svg
index 2c4384ab..cf80b0d4 100644
--- a/engine/editor/icons/SkeletonPreview.svg
+++ b/engine/editor/icons/SkeletonPreview.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eee" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM7 7h2v1H7zM5 9h1v1h1V9h2v1h1V9h1v4h-1v-1H9v1H7v-1H6v1H5V8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eee" d="M6 2a4 4 0 0 0-2 7.453V13a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V9.453A4 4 0 0 0 10 2zM5 5a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM7 7h2v1H7zM5 9h1v1h1V9h2v1h1V9h1v4h-1v-1H9v1H7v-1H6v1H5V8z"/></svg>
diff --git a/engine/editor/icons/Sky.svg b/engine/editor/icons/Sky.svg
index f52e19a6..93106b42 100644
--- a/engine/editor/icons/Sky.svg
+++ b/engine/editor/icons/Sky.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1="8" x2="8" y1="3" y2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1ec3ff"/><stop offset="1" stop-color="#b2e1ff"/></linearGradient><path fill="url(#a)" d="M8 3a7 7 0 0 0-7 7 7 7 0 0 0 .686 3h12.63A7 7 0 0 0 15 10a7 7 0 0 0-7-7z"/><path fill="#fff" d="M10 7a1 1 0 0 0-1 1H8a1 1 0 0 0 0 2h2a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2zm-7 3a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x1="8" x2="8" y1="3" y2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1ec3ff"/><stop offset="1" stop-color="#b2e1ff"/></linearGradient><path fill="url(#a)" d="M8 3a7 7 0 0 0-7 7 7 7 0 0 0 .686 3h12.63A7 7 0 0 0 15 10a7 7 0 0 0-7-7z"/><path fill="#fff" d="M10 7a1 1 0 0 0-1 1H8a1 1 0 0 0 0 2h2a1 1 0 0 0 1-1h1a1 1 0 0 0 0-2zm-7 3a1 1 0 0 0 0 2h1a1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/SliderJoint3D.svg b/engine/editor/icons/SliderJoint3D.svg
index e1302e2a..ea8cc4ad 100644
--- a/engine/editor/icons/SliderJoint3D.svg
+++ b/engine/editor/icons/SliderJoint3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M5 1a1 1 0 0 0 0 2h3l-7 7v3L13 1zm10 2L3 15h8a1 1 0 0 0 0-2H8l7-7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M5 1a1 1 0 0 0 0 2h3l-7 7v3L13 1zm10 2L3 15h8a1 1 0 0 0 0-2H8l7-7z"/></svg>
diff --git a/engine/editor/icons/Slot.svg b/engine/editor/icons/Slot.svg
index 3030c7f5..4f8b6803 100644
--- a/engine/editor/icons/Slot.svg
+++ b/engine/editor/icons/Slot.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m9 3v2h4v6h-4v2h4 2v-10h-2zm-3 1v3h-5v2h5v3l2.5-2 2.5-2-2.5-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="m9 3v2h4v6h-4v2h4 2v-10h-2zm-3 1v3h-5v2h5v3l2.5-2 2.5-2-2.5-2z"/></svg>
diff --git a/engine/editor/icons/Snap.svg b/engine/editor/icons/Snap.svg
index 3c2f76e7..9b1013b2 100644
--- a/engine/editor/icons/Snap.svg
+++ b/engine/editor/icons/Snap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 3v2h2V3zm6 0v2h2V3zM3 9v2h2V9zm4 4v2h2v-2zm6 0v2h2v-2z"/><path fill="#fff" fill-opacity=".686" d="M7 13h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 3v2h2V3zm6 0v2h2V3zM3 9v2h2V9zm4 4v2h2v-2zm6 0v2h2v-2z"/><path fill="#fff" fill-opacity=".686" d="M7 13h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/></svg>
diff --git a/engine/editor/icons/SnapDisable.svg b/engine/editor/icons/SnapDisable.svg
index 1f7db143..2f1d0187 100644
--- a/engine/editor/icons/SnapDisable.svg
+++ b/engine/editor/icons/SnapDisable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".686" d="M7 13h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/><path fill="#e0e0e0" d="M4.54 2.14a.5.5 0 0 0-.705.705l2.142 2.142-2.142 2.142a.5.5 0 1 0 .705.705l2.142-2.142 2.142 2.142a.5.5 0 1 0 .705-.705L7.387 4.987l2.141-2.142a.5.5 0 0 0-.705-.705L6.681 4.282zM7 13v2h2v-2zm6 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".686" d="M7 13h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/><path fill="#e0e0e0" d="M4.54 2.14a.5.5 0 0 0-.705.705l2.142 2.142-2.142 2.142a.5.5 0 1 0 .705.705l2.142-2.142 2.142 2.142a.5.5 0 1 0 .705-.705L7.387 4.987l2.141-2.142a.5.5 0 0 0-.705-.705L6.681 4.282zM7 13v2h2v-2zm6 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/SnapGrid.svg b/engine/editor/icons/SnapGrid.svg
index 1f8dfdda..8259e74e 100644
--- a/engine/editor/icons/SnapGrid.svg
+++ b/engine/editor/icons/SnapGrid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0v2H0v1h2v4H0v1h2v4H0v1h2v2h1v-2h3v-1H3V8h4l1-1V3h4v3h1V3h2V2h-2V0h-1v2H8V0H7v2H3V0zm1 3h4v4H3zm4 10v2h2v-2zm6 0v2h2v-2z"/><path fill="#e0e0e0" fill-opacity=".8" d="M7 13h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 0v2H0v1h2v4H0v1h2v4H0v1h2v2h1v-2h3v-1H3V8h4l1-1V3h4v3h1V3h2V2h-2V0h-1v2H8V0H7v2H3V0zm1 3h4v4H3zm4 10v2h2v-2zm6 0v2h2v-2z"/><path fill="#e0e0e0" fill-opacity=".8" d="M7 13h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/></svg>
diff --git a/engine/editor/icons/SnapKeys.svg b/engine/editor/icons/SnapKeys.svg
index 813781b8..64711958 100644
--- a/engine/editor/icons/SnapKeys.svg
+++ b/engine/editor/icons/SnapKeys.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m 7,13 v 2 h 2 v -2 z m 6,0 v 2 h 2 v -2 z"/><path fill="#fff" fill-opacity=".686" d="m 7,13 h 2 v -2 a 2,2 0 0 1 4,0 v 2 h 2 v -2 a 4,4 0 0 0 -8,0 z"/><path fill="#fff" d="M 5,1 1,5 5,9 9,5 Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m 7,13 v 2 h 2 v -2 z m 6,0 v 2 h 2 v -2 z"/><path fill="#fff" fill-opacity=".686" d="m 7,13 h 2 v -2 a 2,2 0 0 1 4,0 v 2 h 2 v -2 a 4,4 0 0 0 -8,0 z"/><path fill="#fff" d="M 5,1 1,5 5,9 9,5 Z"/></svg>
diff --git a/engine/editor/icons/SnapTimeline.svg b/engine/editor/icons/SnapTimeline.svg
index b558545f..88ce9893 100644
--- a/engine/editor/icons/SnapTimeline.svg
+++ b/engine/editor/icons/SnapTimeline.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m 7,13 v 2 h 2 v -2 z m 6,0 v 2 h 2 v -2 z"/><path fill="#fff" fill-opacity=".686" d="m 7,13 h 2 v -2 a 2,2 0 0 1 4,0 v 2 h 2 v -2 a 4,4 0 0 0 -8,0 z"/><path fill="#fff" d="m 1,2 3,3 v 9 H 6 V 5 L 9,2 Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m 7,13 v 2 h 2 v -2 z m 6,0 v 2 h 2 v -2 z"/><path fill="#fff" fill-opacity=".686" d="m 7,13 h 2 v -2 a 2,2 0 0 1 4,0 v 2 h 2 v -2 a 4,4 0 0 0 -8,0 z"/><path fill="#fff" d="m 1,2 3,3 v 9 H 6 V 5 L 9,2 Z"/></svg>
diff --git a/engine/editor/icons/SoftBody3D.svg b/engine/editor/icons/SoftBody3D.svg
index 025c2fda..1f85b04d 100644
--- a/engine/editor/icons/SoftBody3D.svg
+++ b/engine/editor/icons/SoftBody3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m2 1s-3 5 0 7-1 7-1 7h13s3-6 0-8 1-6 1-6zm2 2h7s-2 3 1 5 0 5 0 5h-7s2-4-1-6 0-4 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m2 1s-3 5 0 7-1 7-1 7h13s3-6 0-8 1-6 1-6zm2 2h7s-2 3 1 5 0 5 0 5h-7s2-4-1-6 0-4 0-4z"/></svg>
diff --git a/engine/editor/icons/Sort.svg b/engine/editor/icons/Sort.svg
index 88232f75..12446def 100644
--- a/engine/editor/icons/Sort.svg
+++ b/engine/editor/icons/Sort.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 1v2h6V1zM4 1a1 1 0 0 0-.691.291l-2 2a1 1 0 0 0 1.414 1.414l.293-.293v7.172l-.293-.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l2-2a1 1 0 0 0-1.414-1.414l-.293.293V4.412l.293.293a1 1 0 0 0 1.414-1.414l-2-2A1 1 0 0 0 4 1zm5 6v2h4V7zm0 6v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M9 1v2h6V1zM4 1a1 1 0 0 0-.691.291l-2 2a1 1 0 0 0 1.414 1.414l.293-.293v7.172l-.293-.293a1 1 0 0 0-1.414 1.414l2 2a1 1 0 0 0 1.414 0l2-2a1 1 0 0 0-1.414-1.414l-.293.293V4.412l.293.293a1 1 0 0 0 1.414-1.414l-2-2A1 1 0 0 0 4 1zm5 6v2h4V7zm0 6v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/SphereMesh.svg b/engine/editor/icons/SphereMesh.svg
index 21ca3518..8b2de2f3 100644
--- a/engine/editor/icons/SphereMesh.svg
+++ b/engine/editor/icons/SphereMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2v12M2.05 7.4a6 2 0 0 0 11.9 0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-width="2" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2v12M2.05 7.4a6 2 0 0 0 11.9 0"/></svg>
diff --git a/engine/editor/icons/SphereOccluder3D.svg b/engine/editor/icons/SphereOccluder3D.svg
index 1f149c13..ba64c8c3 100644
--- a/engine/editor/icons/SphereOccluder3D.svg
+++ b/engine/editor/icons/SphereOccluder3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M6.607 1.139A4.5 4.5 0 1 1 1.141 6.61a7 7 0 1 0 5.466-5.47z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M6.607 1.139A4.5 4.5 0 1 1 1.141 6.61a7 7 0 1 0 5.466-5.47z"/></svg>
diff --git a/engine/editor/icons/SphereShape3D.svg b/engine/editor/icons/SphereShape3D.svg
index a335694c..78d071db 100644
--- a/engine/editor/icons/SphereShape3D.svg
+++ b/engine/editor/icons/SphereShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#5fb2ff"/><circle cx="6" cy="5" r="2" fill="#a2d2ff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#5fb2ff"/><circle cx="6" cy="5" r="2" fill="#a2d2ff"/></svg>
diff --git a/engine/editor/icons/SpinBox.svg b/engine/editor/icons/SpinBox.svg
index c6e280ee..49ad6b04 100644
--- a/engine/editor/icons/SpinBox.svg
+++ b/engine/editor/icons/SpinBox.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7V3zm10 1-2 3h4zM3 5h5v6H3zm8 4 2 3 2-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h7V3zm10 1-2 3h4zM3 5h5v6H3zm8 4 2 3 2-3z"/></svg>
diff --git a/engine/editor/icons/SplitContainer.svg b/engine/editor/icons/SplitContainer.svg
index cb54ee8c..7055da45 100644
--- a/engine/editor/icons/SplitContainer.svg
+++ b/engine/editor/icons/SplitContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M15 3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2zm-2 0v4h-3L8 5 6 7H3V3zm0 6v4H3V9h3l2 2 2-2z" transform="rotate(45 4.241 9.083)scale(.737)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M15 3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2zm-2 0v4h-3L8 5 6 7H3V3zm0 6v4H3V9h3l2 2 2-2z" transform="rotate(45 4.241 9.083)scale(.737)"/></svg>
diff --git a/engine/editor/icons/SpotLight3D.svg b/engine/editor/icons/SpotLight3D.svg
index 0ad2f513..f0fdc5bc 100644
--- a/engine/editor/icons/SpotLight3D.svg
+++ b/engine/editor/icons/SpotLight3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 1a1 1 0 0 0-1 1v3.693A5 5 0 0 0 2 10h4a2 2 0 0 0 4 0h4a5 5 0 0 0-3-4.307V2a1 1 0 0 0-1-1zm-1.098 9.635-1.732 1 1 1.73 1.732-1zm6.196 0-1 1.73 1.732 1 1-1.73zM7 13v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M6 1a1 1 0 0 0-1 1v3.693A5 5 0 0 0 2 10h4a2 2 0 0 0 4 0h4a5 5 0 0 0-3-4.307V2a1 1 0 0 0-1-1zm-1.098 9.635-1.732 1 1 1.73 1.732-1zm6.196 0-1 1.73 1.732 1 1-1.73zM7 13v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/SpringArm3D.svg b/engine/editor/icons/SpringArm3D.svg
index e5eeae9a..2099dfc4 100644
--- a/engine/editor/icons/SpringArm3D.svg
+++ b/engine/editor/icons/SpringArm3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="2" d="m8 14 6-6M2 2l7 7M10 9h-6M9 9v-5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="2" d="m8 14 6-6M2 2l7 7M10 9h-6M9 9v-5"/></svg>
diff --git a/engine/editor/icons/SpringBoneCollision3D.svg b/engine/editor/icons/SpringBoneCollision3D.svg
index 564c44a4..118bf78d 100644
--- a/engine/editor/icons/SpringBoneCollision3D.svg
+++ b/engine/editor/icons/SpringBoneCollision3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b56d6d" d="M7.375 5.053c-.488.733-.289 1.724.445 2.213.2.133.426.219.664.252.122.873.927 1.481 1.8 1.36.874-.121 1.483-.928 1.36-1.801-.033-.238-.119-.464-.25-.664l1.373-1.372c.733.486 1.724.288 2.211-.445.488-.734.291-1.725-.444-2.213-.199-.132-.427-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.803c.033.236.119.465.251.664l-1.372 1.37c-.734-.488-1.725-.289-2.213.446zM8.625 10.949c.488-.734.289-1.727-.444-2.215-.2-.131-.427-.217-.665-.25-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.464.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.481 1.8 1.36.874-.123 1.482-.926 1.36-1.801-.033-.236-.118-.465-.252-.664l1.374-1.373c.732.49 1.723.292 2.211-.443z"/><circle cx="12" cy="12" r="3" fill="#5c7d8e"/><circle cx="11.143" cy="10.714" r=".856" fill="#728387"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b56d6d" d="M7.375 5.053c-.488.733-.289 1.724.445 2.213.2.133.426.219.664.252.122.873.927 1.481 1.8 1.36.874-.121 1.483-.928 1.36-1.801-.033-.238-.119-.464-.25-.664l1.373-1.372c.733.486 1.724.288 2.211-.445.488-.734.291-1.725-.444-2.213-.199-.132-.427-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.803c.033.236.119.465.251.664l-1.372 1.37c-.734-.488-1.725-.289-2.213.446zM8.625 10.949c.488-.734.289-1.727-.444-2.215-.2-.131-.427-.217-.665-.25-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.464.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.481 1.8 1.36.874-.123 1.482-.926 1.36-1.801-.033-.236-.118-.465-.252-.664l1.374-1.373c.732.49 1.723.292 2.211-.443z"/><circle cx="12" cy="12" r="3" fill="#5c7d8e"/><circle cx="11.143" cy="10.714" r=".856" fill="#728387"/></svg>
diff --git a/engine/editor/icons/SpringBoneCollisionCapsule3D.svg b/engine/editor/icons/SpringBoneCollisionCapsule3D.svg
index 3c433562..cb1fbf16 100644
--- a/engine/editor/icons/SpringBoneCollisionCapsule3D.svg
+++ b/engine/editor/icons/SpringBoneCollisionCapsule3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7.375 5.053c-.488.733-.289 1.724.445 2.213.2.133.426.219.664.252.122.873.927 1.481 1.8 1.36.874-.121 1.483-.928 1.36-1.801-.033-.238-.119-.464-.25-.664l1.373-1.372c.733.486 1.724.288 2.211-.445.488-.734.291-1.725-.444-2.213-.199-.132-.427-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.803c.033.236.119.465.251.664l-1.372 1.37c-.734-.488-1.725-.289-2.213.446zM8.625 10.949c.488-.734.289-1.727-.444-2.215-.2-.131-.427-.217-.665-.25-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.464.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.481 1.8 1.36.874-.123 1.482-.926 1.36-1.801-.033-.236-.118-.465-.252-.664l1.374-1.373c.732.49 1.723.292 2.211-.443z"/><path fill="#5fb2ff" d="m10.286 10.857v2.285c0 1.578 1.278 2.856 2.856 2.856s2.858-1.277 2.858-2.855v-2.285c0-1.579-1.279-2.858-2.857-2.858s-2.857 1.279-2.857 2.857z"/><circle cx="12.286" cy="10" r=".857" fill="#a2d2ff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7.375 5.053c-.488.733-.289 1.724.445 2.213.2.133.426.219.664.252.122.873.927 1.481 1.8 1.36.874-.121 1.483-.928 1.36-1.801-.033-.238-.119-.464-.25-.664l1.373-1.372c.733.486 1.724.288 2.211-.445.488-.734.291-1.725-.444-2.213-.199-.132-.427-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.803c.033.236.119.465.251.664l-1.372 1.37c-.734-.488-1.725-.289-2.213.446zM8.625 10.949c.488-.734.289-1.727-.444-2.215-.2-.131-.427-.217-.665-.25-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.464.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.481 1.8 1.36.874-.123 1.482-.926 1.36-1.801-.033-.236-.118-.465-.252-.664l1.374-1.373c.732.49 1.723.292 2.211-.443z"/><path fill="#5fb2ff" d="m10.286 10.857v2.285c0 1.578 1.278 2.856 2.856 2.856s2.858-1.277 2.858-2.855v-2.285c0-1.579-1.279-2.858-2.857-2.858s-2.857 1.279-2.857 2.857z"/><circle cx="12.286" cy="10" r=".857" fill="#a2d2ff"/></svg>
diff --git a/engine/editor/icons/SpringBoneCollisionPlane3D.svg b/engine/editor/icons/SpringBoneCollisionPlane3D.svg
index 7ccb674a..731a39b9 100644
--- a/engine/editor/icons/SpringBoneCollisionPlane3D.svg
+++ b/engine/editor/icons/SpringBoneCollisionPlane3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-399.5 200.5 16 16"><path fill="#fc7f7f" d="M-392.125 205.553c-.488.733-.289 1.725.445 2.213.2.132.426.218.664.252.121.872.927 1.481 1.8 1.36.874-.121 1.483-.928 1.361-1.801-.033-.238-.119-.464-.251-.664l1.373-1.372c.734.487 1.724.288 2.212-.445.488-.734.29-1.725-.445-2.213-.199-.132-.426-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.802c.033.236.119.465.251.664l-1.372 1.371c-.734-.488-1.725-.289-2.213.446zM-390.875 211.449c.488-.734.289-1.726-.444-2.214-.2-.132-.427-.218-.665-.251-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.463.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.482 1.8 1.36.874-.122 1.482-.926 1.36-1.8-.033-.237-.118-.465-.252-.664l1.374-1.373c.732.489 1.723.29 2.211-.444z"/><path fill="#5fb2ff" d="m-389.5 216.5 6-.5v-5.5l-6-.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-399.5 200.5 16 16"><path fill="#fc7f7f" d="M-392.125 205.553c-.488.733-.289 1.725.445 2.213.2.132.426.218.664.252.121.872.927 1.481 1.8 1.36.874-.121 1.483-.928 1.361-1.801-.033-.238-.119-.464-.251-.664l1.373-1.372c.734.487 1.724.288 2.212-.445.488-.734.29-1.725-.445-2.213-.199-.132-.426-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.802c.033.236.119.465.251.664l-1.372 1.371c-.734-.488-1.725-.289-2.213.446zM-390.875 211.449c.488-.734.289-1.726-.444-2.214-.2-.132-.427-.218-.665-.251-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.463.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.482 1.8 1.36.874-.122 1.482-.926 1.36-1.8-.033-.237-.118-.465-.252-.664l1.374-1.373c.732.489 1.723.29 2.211-.444z"/><path fill="#5fb2ff" d="m-389.5 216.5 6-.5v-5.5l-6-.5z"/></svg>
diff --git a/engine/editor/icons/SpringBoneCollisionSphere3D.svg b/engine/editor/icons/SpringBoneCollisionSphere3D.svg
index 7d39ee95..dace4aef 100644
--- a/engine/editor/icons/SpringBoneCollisionSphere3D.svg
+++ b/engine/editor/icons/SpringBoneCollisionSphere3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7.375 5.053c-.488.733-.289 1.724.445 2.213.2.133.426.219.664.252.122.873.927 1.481 1.8 1.36.874-.121 1.483-.928 1.36-1.801-.033-.238-.119-.464-.25-.664l1.373-1.372c.733.486 1.724.288 2.211-.445.488-.734.291-1.725-.444-2.213-.199-.132-.427-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.803c.033.236.119.465.251.664l-1.372 1.37c-.734-.488-1.725-.289-2.213.446zM8.625 10.949c.488-.734.289-1.727-.444-2.215-.2-.131-.427-.217-.665-.25-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.464.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.481 1.8 1.36.874-.123 1.482-.926 1.36-1.801-.033-.236-.118-.465-.252-.664l1.374-1.373c.732.49 1.723.292 2.211-.443z"/><circle cx="12" cy="12" r="3" fill="#5fb2ff"/><circle cx="11.143" cy="10.714" r=".856" fill="#a2d2ff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7.375 5.053c-.488.733-.289 1.724.445 2.213.2.133.426.219.664.252.122.873.927 1.481 1.8 1.36.874-.121 1.483-.928 1.36-1.801-.033-.238-.119-.464-.25-.664l1.373-1.372c.733.486 1.724.288 2.211-.445.488-.734.291-1.725-.444-2.213-.199-.132-.427-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.803c.033.236.119.465.251.664l-1.372 1.37c-.734-.488-1.725-.289-2.213.446zM8.625 10.949c.488-.734.289-1.727-.444-2.215-.2-.131-.427-.217-.665-.25-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.464.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.481 1.8 1.36.874-.123 1.482-.926 1.36-1.801-.033-.236-.118-.465-.252-.664l1.374-1.373c.732.49 1.723.292 2.211-.443z"/><circle cx="12" cy="12" r="3" fill="#5fb2ff"/><circle cx="11.143" cy="10.714" r=".856" fill="#a2d2ff"/></svg>
diff --git a/engine/editor/icons/SpringBoneSimulator3D.svg b/engine/editor/icons/SpringBoneSimulator3D.svg
index eeb37314..aa6c9783 100644
--- a/engine/editor/icons/SpringBoneSimulator3D.svg
+++ b/engine/editor/icons/SpringBoneSimulator3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-399.5 200.5 16 16"><g fill="#fc7f7f"><path d="M-392.125 205.553c-.488.733-.289 1.725.445 2.213.2.132.426.218.664.252.121.872.927 1.481 1.8 1.36.874-.121 1.483-.928 1.361-1.801-.033-.238-.119-.464-.251-.664l1.373-1.372c.734.487 1.724.288 2.212-.445.488-.734.29-1.725-.445-2.213-.199-.132-.426-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.802c.033.236.119.465.251.664l-1.372 1.371c-.734-.488-1.725-.289-2.213.446zM-390.875 211.449c.488-.734.289-1.726-.444-2.214-.2-.132-.427-.218-.665-.251-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.463.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.482 1.8 1.36.874-.122 1.482-.926 1.36-1.8-.033-.237-.118-.465-.252-.664l1.374-1.373c.732.489 1.723.29 2.211-.444z"/><path d="m-397.222 209.5c0 .276.224.5.5.5s.5-.224.5-.5c0-3.263 2.46-5.723 5.722-5.723.276 0 .5-.224.5-.5s-.224-.5-.5-.5c-3.832 0-6.722 2.89-6.722 6.723z"/><path d="M-398 207.723c0-3.263 2.46-5.723 5.722-5.723.276 0 .5-.224.5-.5s-.224-.5-.5-.5c-3.832 0-6.722 2.89-6.722 6.723 0 .276.224.5.5.5s.5-.224.5-.5zM-385.778 207.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5c0 3.263-2.46 5.723-5.722 5.723-.276 0-.5.224-.5.5s.224.5.5.5c3.832 0 6.722-2.89 6.722-6.723z"/><path d="m-384.5 208.777c-.276 0-.5.224-.5.5 0 3.263-2.46 5.723-5.722 5.723-.276 0-.5.224-.5.5s.224.5.5.5c3.832 0 6.722-2.89 6.722-6.723 0-.276-.224-.5-.5-.5z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="-399.5 200.5 16 16"><g fill="#fc7f7f"><path d="M-392.125 205.553c-.488.733-.289 1.725.445 2.213.2.132.426.218.664.252.121.872.927 1.481 1.8 1.36.874-.121 1.483-.928 1.361-1.801-.033-.238-.119-.464-.251-.664l1.373-1.372c.734.487 1.724.288 2.212-.445.488-.734.29-1.725-.445-2.213-.199-.132-.426-.219-.664-.251-.121-.874-.927-1.483-1.8-1.362s-1.482.928-1.361 1.802c.033.236.119.465.251.664l-1.372 1.371c-.734-.488-1.725-.289-2.213.446zM-390.875 211.449c.488-.734.289-1.726-.444-2.214-.2-.132-.427-.218-.665-.251-.122-.873-.927-1.482-1.8-1.361s-1.482.928-1.36 1.802c.033.236.119.463.252.663l-1.373 1.373c-.734-.488-1.724-.289-2.212.445s-.289 1.724.445 2.212c.199.132.426.219.664.252.121.873.927 1.482 1.8 1.36.874-.122 1.482-.926 1.36-1.8-.033-.237-.118-.465-.252-.664l1.374-1.373c.732.489 1.723.29 2.211-.444z"/><path d="m-397.222 209.5c0 .276.224.5.5.5s.5-.224.5-.5c0-3.263 2.46-5.723 5.722-5.723.276 0 .5-.224.5-.5s-.224-.5-.5-.5c-3.832 0-6.722 2.89-6.722 6.723z"/><path d="M-398 207.723c0-3.263 2.46-5.723 5.722-5.723.276 0 .5-.224.5-.5s-.224-.5-.5-.5c-3.832 0-6.722 2.89-6.722 6.723 0 .276.224.5.5.5s.5-.224.5-.5zM-385.778 207.5c0-.276-.224-.5-.5-.5s-.5.224-.5.5c0 3.263-2.46 5.723-5.722 5.723-.276 0-.5.224-.5.5s.224.5.5.5c3.832 0 6.722-2.89 6.722-6.723z"/><path d="m-384.5 208.777c-.276 0-.5.224-.5.5 0 3.263-2.46 5.723-5.722 5.723-.276 0-.5.224-.5.5s.224.5.5.5c3.832 0 6.722-2.89 6.722-6.723 0-.276-.224-.5-.5-.5z"/></g></svg>
diff --git a/engine/editor/icons/Sprite2D.svg b/engine/editor/icons/Sprite2D.svg
index 965c0185..6d2c4185 100644
--- a/engine/editor/icons/Sprite2D.svg
+++ b/engine/editor/icons/Sprite2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M5 1a4 4 0 0 0-4 4v6a4 4 0 0 0 4 4h6a4 4 0 0 0 4-4V5a4 4 0 0 0-4-4zM3 7a1 1 0 0 1 2 0v2a1 1 0 0 1-2 0zm10 2a1 1 0 0 1-2 0V7a1 1 0 0 1 2 0zm-2.172 3.828a4 4 0 0 1-5.656 0 1 1 0 0 1 1.414-1.414 2 2 0 0 0 2.828 0 1 1 0 0 1 1.414 1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M5 1a4 4 0 0 0-4 4v6a4 4 0 0 0 4 4h6a4 4 0 0 0 4-4V5a4 4 0 0 0-4-4zM3 7a1 1 0 0 1 2 0v2a1 1 0 0 1-2 0zm10 2a1 1 0 0 1-2 0V7a1 1 0 0 1 2 0zm-2.172 3.828a4 4 0 0 1-5.656 0 1 1 0 0 1 1.414-1.414 2 2 0 0 0 2.828 0 1 1 0 0 1 1.414 1.414z"/></svg>
diff --git a/engine/editor/icons/Sprite3D.svg b/engine/editor/icons/Sprite3D.svg
index 62917aec..6572fd56 100644
--- a/engine/editor/icons/Sprite3D.svg
+++ b/engine/editor/icons/Sprite3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M5 1a4 4 0 0 0-4 4v6a4 4 0 0 0 4 4h6a4 4 0 0 0 4-4V5a4 4 0 0 0-4-4zM3 7a1 1 0 0 1 2 0v2a1 1 0 0 1-2 0zm10 2a1 1 0 0 1-2 0V7a1 1 0 0 1 2 0zm-2.172 3.828a4 4 0 0 1-5.656 0 1 1 0 0 1 1.414-1.414 2 2 0 0 0 2.828 0 1 1 0 0 1 1.414 1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M5 1a4 4 0 0 0-4 4v6a4 4 0 0 0 4 4h6a4 4 0 0 0 4-4V5a4 4 0 0 0-4-4zM3 7a1 1 0 0 1 2 0v2a1 1 0 0 1-2 0zm10 2a1 1 0 0 1-2 0V7a1 1 0 0 1 2 0zm-2.172 3.828a4 4 0 0 1-5.656 0 1 1 0 0 1 1.414-1.414 2 2 0 0 0 2.828 0 1 1 0 0 1 1.414 1.414z"/></svg>
diff --git a/engine/editor/icons/SpriteFrames.svg b/engine/editor/icons/SpriteFrames.svg
index 8b13e829..b0996182 100644
--- a/engine/editor/icons/SpriteFrames.svg
+++ b/engine/editor/icons/SpriteFrames.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm10 0v2h2V1zM2 6a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm6 0a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm5-1v2h2V5zM4 9h4a2 1 0 0 1-4 0zm9 0v2h2V9zM1 13v2h2v-2zm4 0v2h2v-2zm4 0v2h2v-2zm4 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm10 0v2h2V1zM2 6a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm6 0a1 1 0 0 1 2 0v1a1 1 0 0 1-2 0zm5-1v2h2V5zM4 9h4a2 1 0 0 1-4 0zm9 0v2h2V9zM1 13v2h2v-2zm4 0v2h2v-2zm4 0v2h2v-2zm4 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/SpriteSheet.svg b/engine/editor/icons/SpriteSheet.svg
index 75f925b6..fdc239c0 100644
--- a/engine/editor/icons/SpriteSheet.svg
+++ b/engine/editor/icons/SpriteSheet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>
diff --git a/engine/editor/icons/StandardMaterial3D.svg b/engine/editor/icons/StandardMaterial3D.svg
index 0751e1b6..f2407779 100644
--- a/engine/editor/icons/StandardMaterial3D.svg
+++ b/engine/editor/icons/StandardMaterial3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linejoin="round" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linejoin="round" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5"/></svg>
diff --git a/engine/editor/icons/StaticBody2D.svg b/engine/editor/icons/StaticBody2D.svg
index 0a8f6ada..a24d1f2e 100644
--- a/engine/editor/icons/StaticBody2D.svg
+++ b/engine/editor/icons/StaticBody2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3zm0 1h10a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1zm0 1v2h2V3zm8 0v2h2V3zm-8 8v2h2v-2zm8 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3zm0 1h10a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1zm0 1v2h2V3zm8 0v2h2V3zm-8 8v2h2v-2zm8 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/StaticBody3D.svg b/engine/editor/icons/StaticBody3D.svg
index abc61bb9..232ef888 100644
--- a/engine/editor/icons/StaticBody3D.svg
+++ b/engine/editor/icons/StaticBody3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3zm0 1h10a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1zm0 1v2h2V3zm8 0v2h2V3zm-8 8v2h2v-2zm8 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H3zm0 1h10a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V3a1 1 0 0 1 1-1zm0 1v2h2V3zm8 0v2h2V3zm-8 8v2h2v-2zm8 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/StatusError.svg b/engine/editor/icons/StatusError.svg
index f3e81188..43008df8 100644
--- a/engine/editor/icons/StatusError.svg
+++ b/engine/editor/icons/StatusError.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM5.172 3.758 8 6.586l2.828-2.828 1.414 1.414L9.414 8l2.828 2.828-1.414 1.414L8 9.414l-2.828 2.828-1.414-1.414L6.586 8 3.758 5.172l1.414-1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM5.172 3.758 8 6.586l2.828-2.828 1.414 1.414L9.414 8l2.828 2.828-1.414 1.414L8 9.414l-2.828 2.828-1.414-1.414L6.586 8 3.758 5.172l1.414-1.414z"/></svg>
diff --git a/engine/editor/icons/StatusIndicator.svg b/engine/editor/icons/StatusIndicator.svg
index 5b8dd51d..6d104946 100644
--- a/engine/editor/icons/StatusIndicator.svg
+++ b/engine/editor/icons/StatusIndicator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1 5.184 3H2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1h-3.184ZM3 5h2.584L8 3.4 10.416 5H13v8H3Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1 5.184 3H2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1h-3.184ZM3 5h2.584L8 3.4 10.416 5H13v8H3Z"/></svg>
diff --git a/engine/editor/icons/StatusSuccess.svg b/engine/editor/icons/StatusSuccess.svg
index 0ff2239d..060ce27f 100644
--- a/engine/editor/icons/StatusSuccess.svg
+++ b/engine/editor/icons/StatusSuccess.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="M8 1a7 7 0 1 0 0 14A7 7 0 0 0 8 1zm3.293 3.877 1.414 1.414L7 12.001 3.293 8.29l1.414-1.414L7 9.17z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fff97" d="M8 1a7 7 0 1 0 0 14A7 7 0 0 0 8 1zm3.293 3.877 1.414 1.414L7 12.001 3.293 8.29l1.414-1.414L7 9.17z"/></svg>
diff --git a/engine/editor/icons/StatusWarning.svg b/engine/editor/icons/StatusWarning.svg
index eccea2d3..7ab8e1b6 100644
--- a/engine/editor/icons/StatusWarning.svg
+++ b/engine/editor/icons/StatusWarning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffdd65" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 3h2v7H7zm0 8h2v2H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffdd65" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 3h2v7H7zm0 8h2v2H7z"/></svg>
diff --git a/engine/editor/icons/Stop.svg b/engine/editor/icons/Stop.svg
index adc85e77..e6f97841 100644
--- a/engine/editor/icons/Stop.svg
+++ b/engine/editor/icons/Stop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="10" height="10" x="3" y="3" fill="#e0e0e0" rx="1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="10" height="10" x="3" y="3" fill="#e0e0e0" rx="1"/></svg>
diff --git a/engine/editor/icons/Stretch.svg b/engine/editor/icons/Stretch.svg
index f8cb75fe..a0924e30 100644
--- a/engine/editor/icons/Stretch.svg
+++ b/engine/editor/icons/Stretch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m11.505 10.226-1.1835 1.144 2.0923 2.0225-1.5006 1.4505h4.1844v-4.0448l-1.5006 1.4505-2.0923-2.0225zm-6.9268-0.057673-2.1184 2.0477-1.5193-1.4686v4.0954h4.2367l-1.5193-1.4686 2.1184-2.0477-1.1982-1.1582zm6.3009-9.0107 1.513 1.4625-2.1097 2.0393 1.1933 1.1535 2.1097-2.0393 1.513 1.4625v-4.0786zm-9.9385-1.96e-5v4.0954l1.5193-1.4686 2.1184 2.0477 1.1982-1.1583-2.1184-2.0477 1.5193-1.4686h-4.2367z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m11.505 10.226-1.1835 1.144 2.0923 2.0225-1.5006 1.4505h4.1844v-4.0448l-1.5006 1.4505-2.0923-2.0225zm-6.9268-0.057673-2.1184 2.0477-1.5193-1.4686v4.0954h4.2367l-1.5193-1.4686 2.1184-2.0477-1.1982-1.1582zm6.3009-9.0107 1.513 1.4625-2.1097 2.0393 1.1933 1.1535 2.1097-2.0393 1.513 1.4625v-4.0786zm-9.9385-1.96e-5v4.0954l1.5193-1.4686 2.1184 2.0477 1.1982-1.1583-2.1184-2.0477 1.5193-1.4686h-4.2367z"/></svg>
diff --git a/engine/editor/icons/String.svg b/engine/editor/icons/String.svg
index d8cb0279..9e25109e 100644
--- a/engine/editor/icons/String.svg
+++ b/engine/editor/icons/String.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#4593ec" d="M7 2H4a2.5 2.5 0 0 0 0 5 .5.5 0 0 1 0 1H1v2h3a2.5 2.5 0 0 0 0-5 .5.5 0 0 1 0-1h3zm1 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zm4 8h2V7a1 1 0 0 1 1-1V4a3 3 0 0 0-3 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#4593ec" d="M7 2H4a2.5 2.5 0 0 0 0 5 .5.5 0 0 1 0 1H1v2h3a2.5 2.5 0 0 0 0-5 .5.5 0 0 1 0-1h3zm1 0v5a3 3 0 0 0 3 3V8a1 1 0 0 1-1-1V6h1V4h-1V2zm4 8h2V7a1 1 0 0 1 1-1V4a3 3 0 0 0-3 3z"/></svg>
diff --git a/engine/editor/icons/StringName.svg b/engine/editor/icons/StringName.svg
index 2ef0209c..e8d54df8 100644
--- a/engine/editor/icons/StringName.svg
+++ b/engine/editor/icons/StringName.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#4593ec" d="M3 2a2.5 2.5 0 0 0 0 5 .5.5 0 0 1 0 1H0v2h3a2.5 2.5 0 0 0 0-5 .5.5 0 0 1 0-1h3v3a3 3 0 0 0 3 3h3V6a2 2 0 0 1 2 2v2h2V8a4 4 0 0 0-4-4H8V2zm7 4v2H9a1 1 0 0 1-1-1V6z"/><path fill="#fff" fill-opacity=".4" d="M6 2v5a3 3 0 0 0 3 3h1V8H9a1 1 0 0 1-1-1V6h2V4H8V2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#4593ec" d="M3 2a2.5 2.5 0 0 0 0 5 .5.5 0 0 1 0 1H0v2h3a2.5 2.5 0 0 0 0-5 .5.5 0 0 1 0-1h3v3a3 3 0 0 0 3 3h3V6a2 2 0 0 1 2 2v2h2V8a4 4 0 0 0-4-4H8V2zm7 4v2H9a1 1 0 0 1-1-1V6z"/><path fill="#fff" fill-opacity=".4" d="M6 2v5a3 3 0 0 0 3 3h1V8H9a1 1 0 0 1-1-1V6h2V4H8V2z"/></svg>
diff --git a/engine/editor/icons/StyleBoxEmpty.svg b/engine/editor/icons/StyleBoxEmpty.svg
index 9a1039ee..8038faca 100644
--- a/engine/editor/icons/StyleBoxEmpty.svg
+++ b/engine/editor/icons/StyleBoxEmpty.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M2 1a1 1 0 0 0-1 1v1h2V1zm3 0v2h2V1zm4 0v2h2V1zm4 0v2h2V2a1 1 0 0 0-1-1zM1 5v2h2V5zm12 0v.232c.316.179.578.438.76.752L14.459 7H15V5zM1 9v2h2V9zm0 4v1a1 1 0 0 0 1 1h1v-2zm4 0v2h2v-2zm7-6c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M2 1a1 1 0 0 0-1 1v1h2V1zm3 0v2h2V1zm4 0v2h2V1zm4 0v2h2V2a1 1 0 0 0-1-1zM1 5v2h2V5zm12 0v.232c.316.179.578.438.76.752L14.459 7H15V5zM1 9v2h2V9zm0 4v1a1 1 0 0 0 1 1h1v-2zm4 0v2h2v-2zm7-6c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
diff --git a/engine/editor/icons/StyleBoxFlat.svg b/engine/editor/icons/StyleBoxFlat.svg
index d7ce1e6c..e6462e93 100644
--- a/engine/editor/icons/StyleBoxFlat.svg
+++ b/engine/editor/icons/StyleBoxFlat.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 14a1 1 0 0 0 1 1h6.037a5.044 5.044 0 0 1-.92-2A4.735 4.735 0 0 1 7 12c0-.356.045-.687.117-1 .18-.784.546-1.435.938-2 .14-.203.285-.402.424-.584.386-.505.763-.968 1.103-1.416.257-.338.495-.67.686-1a2 2 0 0 1 3.465 0c.188.327.428.66.685 1 .186.246.38.494.582.75V2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1Zm11-7c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1 14a1 1 0 0 0 1 1h6.037a5.044 5.044 0 0 1-.92-2A4.735 4.735 0 0 1 7 12c0-.356.045-.687.117-1 .18-.784.546-1.435.938-2 .14-.203.285-.402.424-.584.386-.505.763-.968 1.103-1.416.257-.338.495-.67.686-1a2 2 0 0 1 3.465 0c.188.327.428.66.685 1 .186.246.38.494.582.75V2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1Zm11-7c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
diff --git a/engine/editor/icons/StyleBoxGrid.svg b/engine/editor/icons/StyleBoxGrid.svg
index bd7619c5..9d0b3a66 100644
--- a/engine/editor/icons/StyleBoxGrid.svg
+++ b/engine/editor/icons/StyleBoxGrid.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#000b" d="M0 0h16v16H0z"/><path fill="none" stroke="#e0e0e0" stroke-width="2" d="M5 1v14m6 0V1m4 4H1m0 6h14"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#000b" d="M0 0h16v16H0z"/><path fill="none" stroke="#e0e0e0" stroke-width="2" d="M5 1v14m6 0V1m4 4H1m0 6h14"/></svg>
diff --git a/engine/editor/icons/StyleBoxLine.svg b/engine/editor/icons/StyleBoxLine.svg
index 9bb55e7c..41383a1d 100644
--- a/engine/editor/icons/StyleBoxLine.svg
+++ b/engine/editor/icons/StyleBoxLine.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1.734 12.053a1.5 1.5 0 0 0 2.4 2.441l2.893-2.941c.27-1.337.636-1.988 1.028-2.553l2.213-3a2 2 0 0 1 2.845-.64l1.39-1.413a1.5 1.5 0 0 0-2.401-2.441zM12 7c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M1.734 12.053a1.5 1.5 0 0 0 2.4 2.441l2.893-2.941c.27-1.337.636-1.988 1.028-2.553l2.213-3a2 2 0 0 1 2.845-.64l1.39-1.413a1.5 1.5 0 0 0-2.401-2.441zM12 7c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
diff --git a/engine/editor/icons/StyleBoxTexture.svg b/engine/editor/icons/StyleBoxTexture.svg
index 0fd65903..13cef975 100644
--- a/engine/editor/icons/StyleBoxTexture.svg
+++ b/engine/editor/icons/StyleBoxTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M8.1 15a4.5 4.5 0 0 1-1.02-2H3V3h10v2.232a2.031 2.031 0 0 1 .76.752L15 7.75V2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1zM8 5v1H6v1H5v1H4v1h4l2.24-3a2.031 2.031 0 0 1 .76-.752V5h-1V4H9v1zm4 2c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M8.1 15a4.5 4.5 0 0 1-1.02-2H3V3h10v2.232a2.031 2.031 0 0 1 .76.752L15 7.75V2a1 1 0 0 0-1-1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1zM8 5v1H6v1H5v1H4v1h4l2.24-3a2.031 2.031 0 0 1 .76-.752V5h-1V4H9v1zm4 2c-.429.746-.946 1.387-1.429 2-.571.69-1.066 1.342-1.34 2-.138.326-.231.656-.231 1s.072.686.184 1c.413 1.163 1.512 2 2.816 2s2.402-.837 2.816-2c.112-.314.184-.656.184-1s-.094-.674-.231-1c-.275-.658-.77-1.31-1.34-2-.484-.613-1-1.254-1.43-2z"/></svg>
diff --git a/engine/editor/icons/SubViewport.svg b/engine/editor/icons/SubViewport.svg
index 6cffbc90..27dc3a20 100644
--- a/engine/editor/icons/SubViewport.svg
+++ b/engine/editor/icons/SubViewport.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-width="1.25"><rect width="12.75" height="10.75" x="1.625" y="2.625" rx="1.5"/><rect width="6.75" height="6.75" x="4.625" y="4.625" rx="1.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-width="1.25"><rect width="12.75" height="10.75" x="1.625" y="2.625" rx="1.5"/><rect width="6.75" height="6.75" x="4.625" y="4.625" rx="1.5"/></g></svg>
diff --git a/engine/editor/icons/SubViewportContainer.svg b/engine/editor/icons/SubViewportContainer.svg
index 01b9ed9c..4142bfb2 100644
--- a/engine/editor/icons/SubViewportContainer.svg
+++ b/engine/editor/icons/SubViewportContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97"><rect width="12" height="12" x="2" y="2" stroke-width="2" rx="1"/><rect width="6.75" height="6.75" x="4.625" y="4.625" stroke-width="1.25" rx="1.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97"><rect width="12" height="12" x="2" y="2" stroke-width="2" rx="1"/><rect width="6.75" height="6.75" x="4.625" y="4.625" stroke-width="1.25" rx="1.5"/></g></svg>
diff --git a/engine/editor/icons/SyntaxHighlighter.svg b/engine/editor/icons/SyntaxHighlighter.svg
index 1475bd81..a4a399d3 100644
--- a/engine/editor/icons/SyntaxHighlighter.svg
+++ b/engine/editor/icons/SyntaxHighlighter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a"><stop offset=".25" stop-color="#ffe345"/><stop offset=".75" stop-color="#919191"/></linearGradient><path fill="#45d7ff" d="M4 4v2h5V4z"/><path fill="#ff4596" d="M11 4v2h4V4Z"/><path fill="#ff4545" d="M1 8v2h3V8z"/><path fill="url(#a)" d="M6 8v2h7V8z"/><path fill="#919191" d="M1 12v2h5v-2zm7 0v2h6v-2z"/><path fill="#e0e0e0" d="M1 1.5h1.25V6H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a"><stop offset=".25" stop-color="#ffe345"/><stop offset=".75" stop-color="#919191"/></linearGradient><path fill="#45d7ff" d="M4 4v2h5V4z"/><path fill="#ff4596" d="M11 4v2h4V4Z"/><path fill="#ff4545" d="M1 8v2h3V8z"/><path fill="url(#a)" d="M6 8v2h7V8z"/><path fill="#919191" d="M1 12v2h5v-2zm7 0v2h6v-2z"/><path fill="#e0e0e0" d="M1 1.5h1.25V6H1z"/></svg>
diff --git a/engine/editor/icons/SystemFont.svg b/engine/editor/icons/SystemFont.svg
index 411e096e..bd9f79cc 100644
--- a/engine/editor/icons/SystemFont.svg
+++ b/engine/editor/icons/SystemFont.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5.787 1-.402 1.613c-.352.265-.71.122-1.012-.111l-.904-.541L2.46 2.973l.853 1.425c-.058.438-.412.586-.79.635-.343.065-.674.216-1.024.213V6.72c.367 0 .715.157 1.074.224.371.032.716.243.727.65l-.84 1.4 1.008 1.01c.443-.266.895-.53 1.33-.802.349-.044.675.139.674.506l.314 1.258h1.45c.117-.475.242-.954.35-1.428A.67.67 0 0 1 8 9.195V7.5H6.5A.5.5 0 0 0 6 8v.5H4v-4h5.75c-.005-.22.107-.434.254-.625l.543-.902L9.535 1.96l-1.426.853c-.437-.058-.588-.412-.636-.79L7.217 1h-1.43z"/><path fill="#ff5f5f" d="M4.5 5v3h1a1 1 0 0 1 1-1h2v6a1 1 0 0 1-1 1v1h4v-1a1 1 0 0 1-1-1V7h2a1 1 0 0 1 1 1h1V5h-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5.787 1-.402 1.613c-.352.265-.71.122-1.012-.111l-.904-.541L2.46 2.973l.853 1.425c-.058.438-.412.586-.79.635-.343.065-.674.216-1.024.213V6.72c.367 0 .715.157 1.074.224.371.032.716.243.727.65l-.84 1.4 1.008 1.01c.443-.266.895-.53 1.33-.802.349-.044.675.139.674.506l.314 1.258h1.45c.117-.475.242-.954.35-1.428A.67.67 0 0 1 8 9.195V7.5H6.5A.5.5 0 0 0 6 8v.5H4v-4h5.75c-.005-.22.107-.434.254-.625l.543-.902L9.535 1.96l-1.426.853c-.437-.058-.588-.412-.636-.79L7.217 1h-1.43z"/><path fill="#ff5f5f" d="M4.5 5v3h1a1 1 0 0 1 1-1h2v6a1 1 0 0 1-1 1v1h4v-1a1 1 0 0 1-1-1V7h2a1 1 0 0 1 1 1h1V5h-6z"/></svg>
diff --git a/engine/editor/icons/TabBar.svg b/engine/editor/icons/TabBar.svg
index 23ec3e0b..3fc3f0b9 100644
--- a/engine/editor/icons/TabBar.svg
+++ b/engine/editor/icons/TabBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5.5 4c-1.108 0-1.818.907-2 2l-1 6H1v2h14v-2h-1.5l-1-6c-.182-1.093-.892-2-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5.5 4c-1.108 0-1.818.907-2 2l-1 6H1v2h14v-2h-1.5l-1-6c-.182-1.093-.892-2-2-2z"/></svg>
diff --git a/engine/editor/icons/TabContainer.svg b/engine/editor/icons/TabContainer.svg
index 3d3e12a6..8862e7fc 100644
--- a/engine/editor/icons/TabContainer.svg
+++ b/engine/editor/icons/TabContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h5v4h5v6H3zm7 0h3v2h-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h5v4h5v6H3zm7 0h3v2h-3z"/></svg>
diff --git a/engine/editor/icons/Terminal.svg b/engine/editor/icons/Terminal.svg
index 1cda070c..5ec55b09 100644
--- a/engine/editor/icons/Terminal.svg
+++ b/engine/editor/icons/Terminal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 13 5.0000552-5-5.0000552-5M9 13h5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m2 13 5.0000552-5-5.0000552-5M9 13h5"/></svg>
diff --git a/engine/editor/icons/TerrainConnect.svg b/engine/editor/icons/TerrainConnect.svg
index 9d366c55..48d27e8f 100644
--- a/engine/editor/icons/TerrainConnect.svg
+++ b/engine/editor/icons/TerrainConnect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 16 16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M7 3.5H6L8 1l2 2.5H9v2H7zM3.56 4.975l-.706.707L2.5 2.5l3.182.353-.707.708.707.707-1.414 1.414zm7.465-1.415-.707-.706L13.5 2.5l-.353 3.182-.708-.707-.707.707-1.414-1.414zm1.415 7.465.706-.707.354 3.182-3.182-.354.707-.707-.707-.707 1.414-1.414zM4.975 12.44l.707.707L2.5 13.5l.354-3.182.707.707.707-.707 1.414 1.414zM12.5 7V6L15 8l-2.5 2V9h-2V7zM9 12.5h1L8 15l-2-2.5h1v-2h2zM3.5 9v1L1 8l2.5-2v1h2v2z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 16 16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M7 3.5H6L8 1l2 2.5H9v2H7zM3.56 4.975l-.706.707L2.5 2.5l3.182.353-.707.708.707.707-1.414 1.414zm7.465-1.415-.707-.706L13.5 2.5l-.353 3.182-.708-.707-.707.707-1.414-1.414zm1.415 7.465.706-.707.354 3.182-3.182-.354.707-.707-.707-.707 1.414-1.414zM4.975 12.44l.707.707L2.5 13.5l.354-3.182.707.707.707-.707 1.414 1.414zM12.5 7V6L15 8l-2.5 2V9h-2V7zM9 12.5h1L8 15l-2-2.5h1v-2h2zM3.5 9v1L1 8l2.5-2v1h2v2z"/></g></svg>
diff --git a/engine/editor/icons/TerrainMatchCorners.svg b/engine/editor/icons/TerrainMatchCorners.svg
index 29b4c861..ef6373f4 100644
--- a/engine/editor/icons/TerrainMatchCorners.svg
+++ b/engine/editor/icons/TerrainMatchCorners.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M15 1H9v3h3v3h3zM1 15h6v-3H4V9H1z"/><path fill="#77ce57" d="M1 1h6v3H4v3H1zM15 15H9v-3h3V9h3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M15 1H9v3h3v3h3zM1 15h6v-3H4V9H1z"/><path fill="#77ce57" d="M1 1h6v3H4v3H1zM15 15H9v-3h3V9h3z"/></svg>
diff --git a/engine/editor/icons/TerrainMatchCornersAndSides.svg b/engine/editor/icons/TerrainMatchCornersAndSides.svg
index 97b72061..08e93b31 100644
--- a/engine/editor/icons/TerrainMatchCornersAndSides.svg
+++ b/engine/editor/icons/TerrainMatchCornersAndSides.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M6 1h4v3H9L8 5 7 4H6z"/><path fill="#77ce57" d="M1 15h4v-3H4v-1H1zm14 0h-4v-3h1v-1h3zm0-14h-4v3h1v1h3zM1 1h4v3H4v1H1z"/><path fill="#ffca5f" d="M6 15h4v-3H9l-1-1-1 1H6zm-5-5V6h3v1l1 1-1 1v1zm14 0V6h-3v1l-1 1 1 1v1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M6 1h4v3H9L8 5 7 4H6z"/><path fill="#77ce57" d="M1 15h4v-3H4v-1H1zm14 0h-4v-3h1v-1h3zm0-14h-4v3h1v1h3zM1 1h4v3H4v1H1z"/><path fill="#ffca5f" d="M6 15h4v-3H9l-1-1-1 1H6zm-5-5V6h3v1l1 1-1 1v1zm14 0V6h-3v1l-1 1 1 1v1z"/></svg>
diff --git a/engine/editor/icons/TerrainMatchSides.svg b/engine/editor/icons/TerrainMatchSides.svg
index 2c3520e7..2c02c739 100644
--- a/engine/editor/icons/TerrainMatchSides.svg
+++ b/engine/editor/icons/TerrainMatchSides.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#77ce57" d="M1 14V2l3 3v2l1 1-1 1v2zm14 0V2l-3 2.706v2l-1 1 1 1v2z"/><path fill="#ffca5f" d="M2 15h12l-3-3H9l-1-1-1 1H5zM14 1H2l3 3h2l1 1 1-1h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#77ce57" d="M1 14V2l3 3v2l1 1-1 1v2zm14 0V2l-3 2.706v2l-1 1 1 1v2z"/><path fill="#ffca5f" d="M2 15h12l-3-3H9l-1-1-1 1H5zM14 1H2l3 3h2l1 1 1-1h2z"/></svg>
diff --git a/engine/editor/icons/TerrainPath.svg b/engine/editor/icons/TerrainPath.svg
index 4ab5a992..251af544 100644
--- a/engine/editor/icons/TerrainPath.svg
+++ b/engine/editor/icons/TerrainPath.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 16 16"><g fill="#e0e0e0"><circle cx="3" cy="13" r="2"/><circle cx="13" cy="3" r="2"/><path d="M7 2v10H3v2h6V4h4V2z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 16 16"><g fill="#e0e0e0"><circle cx="3" cy="13" r="2"/><circle cx="13" cy="3" r="2"/><path d="M7 2v10H3v2h6V4h4V2z"/></g></svg>
diff --git a/engine/editor/icons/TextEdit.svg b/engine/editor/icons/TextEdit.svg
index 93a92668..85d64f6f 100644
--- a/engine/editor/icons/TextEdit.svg
+++ b/engine/editor/icons/TextEdit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm1 1v4h1V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v10H3zm1 1v4h1V4z"/></svg>
diff --git a/engine/editor/icons/TextEditorPlay.svg b/engine/editor/icons/TextEditorPlay.svg
index c8fb9b36..cea985b8 100644
--- a/engine/editor/icons/TextEditorPlay.svg
+++ b/engine/editor/icons/TextEditorPlay.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M4 12V4l7 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M4 12V4l7 4z"/></svg>
diff --git a/engine/editor/icons/TextFile.svg b/engine/editor/icons/TextFile.svg
index 932129db..dddc314c 100644
--- a/engine/editor/icons/TextFile.svg
+++ b/engine/editor/icons/TextFile.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 12h1v-2h-4v2h1v4h2zm-8.3-2h1.7l.6 1.5.6-1.5h1.7l-1.2 3 1.2 3H8.6L8 14.5 7.4 16H5.7l1.2-3zM4 12h1v-2H1v2h1v4h2ZM9 1l.564 2.258.69.28 1.988-1.194 1.414 1.414-1.196 1.994.286.684L15 7v2H9.75a2 2 0 1 0-3.5 0H1V7l2.26-.564.278-.688-1.194-1.99 1.414-1.414L5.752 3.54l.686-.286L7 1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 12h1v-2h-4v2h1v4h2zm-8.3-2h1.7l.6 1.5.6-1.5h1.7l-1.2 3 1.2 3H8.6L8 14.5 7.4 16H5.7l1.2-3zM4 12h1v-2H1v2h1v4h2ZM9 1l.564 2.258.69.28 1.988-1.194 1.414 1.414-1.196 1.994.286.684L15 7v2H9.75a2 2 0 1 0-3.5 0H1V7l2.26-.564.278-.688-1.194-1.99 1.414-1.414L5.752 3.54l.686-.286L7 1z"/></svg>
diff --git a/engine/editor/icons/TextMesh.svg b/engine/editor/icons/TextMesh.svg
index 585b92ac..e5b6e3ba 100644
--- a/engine/editor/icons/TextMesh.svg
+++ b/engine/editor/icons/TextMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M1 1h14v4h-1a2 2 0 0 0-2-2H9v9a2 2 0 0 0 2 2v1H5v-1a2 2 0 0 0 2-2V3H4a2 2 0 0 0-2 2H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffca5f" d="M1 1h14v4h-1a2 2 0 0 0-2-2H9v9a2 2 0 0 0 2 2v1H5v-1a2 2 0 0 0 2-2V3H4a2 2 0 0 0-2 2H1z"/></svg>
diff --git a/engine/editor/icons/Texture2D.svg b/engine/editor/icons/Texture2D.svg
index 94e5ae59..8fe5f834 100644
--- a/engine/editor/icons/Texture2D.svg
+++ b/engine/editor/icons/Texture2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="gray"><path d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3z"/><path fill-opacity=".2" d="M3.5 3.5h9v7h-9"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="gray"><path d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3z"/><path fill-opacity=".2" d="M3.5 3.5h9v7h-9"/></g></svg>
diff --git a/engine/editor/icons/Texture2DArray.svg b/engine/editor/icons/Texture2DArray.svg
index 46e9d374..3b63e0f2 100644
--- a/engine/editor/icons/Texture2DArray.svg
+++ b/engine/editor/icons/Texture2DArray.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm1 1h3v1H5.5v4H7v1H4zm8 6H9V9h1.5V5H9V4h3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm1 1h3v1H5.5v4H7v1H4zm8 6H9V9h1.5V5H9V4h3z"/></svg>
diff --git a/engine/editor/icons/Texture3D.svg b/engine/editor/icons/Texture3D.svg
index 52b1b208..18f476b5 100644
--- a/engine/editor/icons/Texture3D.svg
+++ b/engine/editor/icons/Texture3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="gray"><path d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13z"/><path fill-opacity=".2" d="M2.75 5.5h7.75v6H2.75"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="gray"><path d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13z"/><path fill-opacity=".2" d="M2.75 5.5h7.75v6H2.75"/></g></svg>
diff --git a/engine/editor/icons/TextureButton.svg b/engine/editor/icons/TextureButton.svg
index c917bb1d..f5838884 100644
--- a/engine/editor/icons/TextureButton.svg
+++ b/engine/editor/icons/TextureButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M8 1v2h6v10h-4v2h6V1zM3 2v3.133l-1.445-.965-1.11 1.664 3 2a1 1 0 0 0 1.11 0l3-2-1.11-1.664L5 5.133V2zm7 4v1H9v1H8v1h1v2h4V9h-1V7h-1V6zm-7.5 4A1.5 1.5 0 0 0 1 11.5V13H0v2h8v-2H7v-1.5A1.5 1.5 0 0 0 5.5 10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M8 1v2h6v10h-4v2h6V1zM3 2v3.133l-1.445-.965-1.11 1.664 3 2a1 1 0 0 0 1.11 0l3-2-1.11-1.664L5 5.133V2zm7 4v1H9v1H8v1h1v2h4V9h-1V7h-1V6zm-7.5 4A1.5 1.5 0 0 0 1 11.5V13H0v2h8v-2H7v-1.5A1.5 1.5 0 0 0 5.5 10z"/></svg>
diff --git a/engine/editor/icons/TexturePreviewChannels.svg b/engine/editor/icons/TexturePreviewChannels.svg
index e70fd998..8f66b6fc 100644
--- a/engine/editor/icons/TexturePreviewChannels.svg
+++ b/engine/editor/icons/TexturePreviewChannels.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m8 1 7 3v8l-7 3-7-3V4Z"/><path fill-opacity=".8" d="M2 5h12v6l-12-.008Z" paint-order="stroke fill markers"/><path fill="#c2c2c2" d="m8 7.5-7 3V12l7 3 7-3v-1.5z"/><path fill="#d6d6d6" d="m8 15-7-3v-1.5l7 3z"/><path fill="#f9f9f9" d="m1 10.5 7 3 7-3-7-3z"/><path fill="#c2c2c2" d="m8 4.25-7 3v1.5l7 3 7-3v-1.5z"/><path fill="#d6d6d6" d="m8 11.75-7-3v-1.5l7 3z"/><path fill="#f9f9f9" d="m1 7.25 7 3 7-3-7-3z"/><path fill="#c2c2c2" d="M8 1 1 4v1.5l7 3 7-3V4Z"/><path fill="#f9f9f9" d="m1 4 7 3 7-3-7-3z"/><path fill="#d6d6d6" d="m8 8.5-7-3V4l7 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#000" stroke-linejoin="round" stroke-opacity=".8" stroke-width="2" d="m8 1 7 3v8l-7 3-7-3V4Z"/><path fill-opacity=".8" d="M2 5h12v6l-12-.008Z" paint-order="stroke fill markers"/><path fill="#c2c2c2" d="m8 7.5-7 3V12l7 3 7-3v-1.5z"/><path fill="#d6d6d6" d="m8 15-7-3v-1.5l7 3z"/><path fill="#f9f9f9" d="m1 10.5 7 3 7-3-7-3z"/><path fill="#c2c2c2" d="m8 4.25-7 3v1.5l7 3 7-3v-1.5z"/><path fill="#d6d6d6" d="m8 11.75-7-3v-1.5l7 3z"/><path fill="#f9f9f9" d="m1 7.25 7 3 7-3-7-3z"/><path fill="#c2c2c2" d="M8 1 1 4v1.5l7 3 7-3V4Z"/><path fill="#f9f9f9" d="m1 4 7 3 7-3-7-3z"/><path fill="#d6d6d6" d="m8 8.5-7-3V4l7 3z"/></svg>
diff --git a/engine/editor/icons/TextureProgressBar.svg b/engine/editor/icons/TextureProgressBar.svg
index ca884082..561334af 100644
--- a/engine/editor/icons/TextureProgressBar.svg
+++ b/engine/editor/icons/TextureProgressBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zm0 2h10v6H3zm1 1h1v2H4zm2 1h1v3H6zm2-1h1v4H8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 3a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2zm0 2h10v6H3zm1 1h1v2H4zm2 1h1v3H6zm2-1h1v4H8z"/></svg>
diff --git a/engine/editor/icons/TextureRect.svg b/engine/editor/icons/TextureRect.svg
index b37b9197..af88a4ed 100644
--- a/engine/editor/icons/TextureRect.svg
+++ b/engine/editor/icons/TextureRect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v14h14v-14zm2 2h10v10h-10zm6 3v1h-1v1h-2v1h-1v1h-1v1h2 2 2 2v-2h-1v-2h-1v-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="m1 1v14h14v-14zm2 2h10v10h-10zm6 3v1h-1v1h-2v1h-1v1h-1v1h2 2 2 2v-2h-1v-2h-1v-1z"/></svg>
diff --git a/engine/editor/icons/Theme.svg b/engine/editor/icons/Theme.svg
index 3efe868e..fb93917a 100644
--- a/engine/editor/icons/Theme.svg
+++ b/engine/editor/icons/Theme.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M8 1c-.75 1.305-1.654 2.427-2.5 3.5-1 1.208-1.865 2.349-2.346 3.5-.24.57-.404 1.148-.404 1.75s.126 1.2.322 1.75C3.795 13.535 5.718 15 8 15s4.205-1.465 4.928-3.5c.196-.55.322-1.148.322-1.75s-.164-1.18-.404-1.75C12.365 6.849 11.5 5.708 10.5 4.5 9.654 3.427 8.753 2.305 8 1Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="url(#a)" d="M8 1c-.75 1.305-1.654 2.427-2.5 3.5-1 1.208-1.865 2.349-2.346 3.5-.24.57-.404 1.148-.404 1.75s.126 1.2.322 1.75C3.795 13.535 5.718 15 8 15s4.205-1.465 4.928-3.5c.196-.55.322-1.148.322-1.75s-.164-1.18-.404-1.75C12.365 6.849 11.5 5.708 10.5 4.5 9.654 3.427 8.753 2.305 8 1Z"/></svg>
diff --git a/engine/editor/icons/ThemeDeselectAll.svg b/engine/editor/icons/ThemeDeselectAll.svg
index 942ea789..81335c53 100644
--- a/engine/editor/icons/ThemeDeselectAll.svg
+++ b/engine/editor/icons/ThemeDeselectAll.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 7h8v2H6zM1 6h4v4H1zm5-4h8v2H6zM1 1h4v4H1zm5 11h8v2H6zm-5-1h4v4H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 7h8v2H6zM1 6h4v4H1zm5-4h8v2H6zM1 1h4v4H1zm5 11h8v2H6zm-5-1h4v4H1z"/></svg>
diff --git a/engine/editor/icons/ThemeRemoveAllItems.svg b/engine/editor/icons/ThemeRemoveAllItems.svg
index 6323b0d0..b4a6f93c 100644
--- a/engine/editor/icons/ThemeRemoveAllItems.svg
+++ b/engine/editor/icons/ThemeRemoveAllItems.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="#8eef97" d="M8 14.25a1 1 0 0 0 1.084-1.084V9.753l3.851 1.927a1.084 1.084 0 0 0 .97-1.94L10.424 8l3.481-1.74a1.084 1.084 0 0 0-.97-1.94L9.084 6.247V2.834A1 1 0 0 0 8 1.75z"/><path fill="url(#a)" d="M8 1.75a1 1 0 0 0-1.084 1.084v3.413L3.065 4.32a1 1 0 0 0-.97 1.94L5.576 8 2.095 9.74a1 1 0 0 0 .97 1.94l3.851-1.927v3.413A1 1 0 0 0 8 14.25z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><path fill="#8eef97" d="M8 14.25a1 1 0 0 0 1.084-1.084V9.753l3.851 1.927a1.084 1.084 0 0 0 .97-1.94L10.424 8l3.481-1.74a1.084 1.084 0 0 0-.97-1.94L9.084 6.247V2.834A1 1 0 0 0 8 1.75z"/><path fill="url(#a)" d="M8 1.75a1 1 0 0 0-1.084 1.084v3.413L3.065 4.32a1 1 0 0 0-.97 1.94L5.576 8 2.095 9.74a1 1 0 0 0 .97 1.94l3.851-1.927v3.413A1 1 0 0 0 8 14.25z"/></svg>
diff --git a/engine/editor/icons/ThemeRemoveCustomItems.svg b/engine/editor/icons/ThemeRemoveCustomItems.svg
index c85e22b6..3aadcb5b 100644
--- a/engine/editor/icons/ThemeRemoveCustomItems.svg
+++ b/engine/editor/icons/ThemeRemoveCustomItems.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><circle cx="8" cy="8" r="5" fill="none" stroke="url(#a)" stroke-width="2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y2="16" gradientUnits="userSpaceOnUse"><stop offset=".188" stop-color="#ff4545"/><stop stop-color="#ffe345"/><stop offset=".313" stop-color="#ffe345"/><stop stop-color="#80ff45"/><stop offset=".438" stop-color="#80ff45"/><stop stop-color="#45ffa2"/><stop offset=".563" stop-color="#45ffa2"/><stop stop-color="#45d7ff"/><stop offset=".688" stop-color="#45d7ff"/><stop stop-color="#8045ff"/><stop offset=".813" stop-color="#8045ff"/><stop stop-color="#ff4596"/></linearGradient><circle cx="8" cy="8" r="5" fill="none" stroke="url(#a)" stroke-width="2"/></svg>
diff --git a/engine/editor/icons/ThemeSelectAll.svg b/engine/editor/icons/ThemeSelectAll.svg
index 177c29fa..9e49f0b2 100644
--- a/engine/editor/icons/ThemeSelectAll.svg
+++ b/engine/editor/icons/ThemeSelectAll.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#e0e0e0" d="M1.5 1.5h3v3h-3zm0 5h3v3h-3zm0 5h3v3h-3z"/><path fill="#e0e0e0" d="M6 2h8v2H6zm0 5h8v2H6zm0 5h8v2H6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#e0e0e0" d="M1.5 1.5h3v3h-3zm0 5h3v3h-3zm0 5h3v3h-3z"/><path fill="#e0e0e0" d="M6 2h8v2H6zm0 5h8v2H6zm0 5h8v2H6z"/></svg>
diff --git a/engine/editor/icons/ThemeSelectFull.svg b/engine/editor/icons/ThemeSelectFull.svg
index d0b01ac4..3eba826f 100644
--- a/engine/editor/icons/ThemeSelectFull.svg
+++ b/engine/editor/icons/ThemeSelectFull.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#e0e0e0" d="M1.5 1.5h3v3h-3zm0 5h3v3h-3zm0 5h3v3h-3zm5-10h3v3h-3zm0 5h3v3h-3zm0 5h3v3h-3z"/><path fill="#e0e0e0" d="M11 2h3v2h-3zm0 5h3v2h-3zm0 5h3v2h-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#e0e0e0" d="M1.5 1.5h3v3h-3zm0 5h3v3h-3zm0 5h3v3h-3zm5-10h3v3h-3zm0 5h3v3h-3zm0 5h3v3h-3z"/><path fill="#e0e0e0" d="M11 2h3v2h-3zm0 5h3v2h-3zm0 5h3v2h-3z"/></svg>
diff --git a/engine/editor/icons/ThumbnailWait.svg b/engine/editor/icons/ThumbnailWait.svg
index f65a098e..34adf05c 100644
--- a/engine/editor/icons/ThumbnailWait.svg
+++ b/engine/editor/icons/ThumbnailWait.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M1 8a7 7 0 0 1 7-7h48a7 7 0 0 1 7 7v48a-7 7 0 0 1-7 7H8 a-7-7 0 0 1-7-7zM8 8l8 8M8 56l8-8M56 56l-8-8M56 8l-8 8"/><path fill="#e0e0e0" d="M22 18a2 2 0 0 0-2 2c0 3 1.934 5.25 3.746 7.32 1.52 1.74 2.832 3.286 3.75 4.68-.918 1.394-2.228 2.944-3.75 4.684C21.934 38.754 20 41 20 44a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2c0-3-1.934-5.246-3.746-7.316-1.52-1.74-2.832-3.29-3.75-4.684.918-1.394 2.228-2.94 3.75-4.68C42.066 25.25 44 23 44 20a2 2 0 0 0-2-2zm16.824 4c-.476.88-.61 1.58-1.578 2.684-1.688 1.928-3.796 3.944-5.036 6.42A2 2 0 0 0 32 32a2 2 0 0 0-.212-.894c-1.238-2.478-3.346-4.494-5.034-6.422-.968-1.106-1.102-1.802-1.58-2.684z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M1 8a7 7 0 0 1 7-7h48a7 7 0 0 1 7 7v48a-7 7 0 0 1-7 7H8 a-7-7 0 0 1-7-7zM8 8l8 8M8 56l8-8M56 56l-8-8M56 8l-8 8"/><path fill="#e0e0e0" d="M22 18a2 2 0 0 0-2 2c0 3 1.934 5.25 3.746 7.32 1.52 1.74 2.832 3.286 3.75 4.68-.918 1.394-2.228 2.944-3.75 4.684C21.934 38.754 20 41 20 44a2 2 0 0 0 2 2h20a2 2 0 0 0 2-2c0-3-1.934-5.246-3.746-7.316-1.52-1.74-2.832-3.29-3.75-4.684.918-1.394 2.228-2.94 3.75-4.68C42.066 25.25 44 23 44 20a2 2 0 0 0-2-2zm16.824 4c-.476.88-.61 1.58-1.578 2.684-1.688 1.928-3.796 3.944-5.036 6.42A2 2 0 0 0 32 32a2 2 0 0 0-.212-.894c-1.238-2.478-3.346-4.494-5.034-6.422-.968-1.106-1.102-1.802-1.58-2.684z"/></svg>
diff --git a/engine/editor/icons/TileChecked.svg b/engine/editor/icons/TileChecked.svg
index 22cf026b..36d57313 100644
--- a/engine/editor/icons/TileChecked.svg
+++ b/engine/editor/icons/TileChecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.33"/><path fill="#fff" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.33"/><path fill="#fff" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>
diff --git a/engine/editor/icons/TileMap.svg b/engine/editor/icons/TileMap.svg
index 1b45aafe..2912b932 100644
--- a/engine/editor/icons/TileMap.svg
+++ b/engine/editor/icons/TileMap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zM1 10v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zM1 13v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zM1 10v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zM1 13v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/TileMapHighlightSelected.svg b/engine/editor/icons/TileMapHighlightSelected.svg
index 4653cd85..b99dc37b 100644
--- a/engine/editor/icons/TileMapHighlightSelected.svg
+++ b/engine/editor/icons/TileMapHighlightSelected.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.5 5.25H15v2H4.5zM2 4.283v-1h1l1 2zm0 4v1h1l1-2zm-.621-2.707-.707.707.707.707L3.5 6.283zM4.5 1.75H15v2H4.5zm0 7H15v2H4.5zm0 3.5H15v2H4.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4.5 5.25H15v2H4.5zM2 4.283v-1h1l1 2zm0 4v1h1l1-2zm-.621-2.707-.707.707.707.707L3.5 6.283zM4.5 1.75H15v2H4.5zm0 7H15v2H4.5zm0 3.5H15v2H4.5z"/></svg>
diff --git a/engine/editor/icons/TileMapLayer.svg b/engine/editor/icons/TileMapLayer.svg
index f86d2a9e..2c4eae6c 100644
--- a/engine/editor/icons/TileMapLayer.svg
+++ b/engine/editor/icons/TileMapLayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 2 6.25 3.375 8 4.75l1.75-1.375zm2.624 2.062-1.75 1.375 1.75 1.375 1.75-1.375Zm2.626 2.063L11.5 7.5l1.75 1.375L15 7.5ZM5.376 4.062l-1.75 1.375 1.75 1.375 1.75-1.375zM8 6.124 6.25 7.499 8 8.874l1.75-1.375zm2.626 2.063-1.75 1.375 1.75 1.375 1.75-1.375ZM2.75 6.125 1 7.5l1.75 1.375L4.5 7.5Zm2.624 2.062-1.75 1.375 1.75 1.375 1.75-1.375ZM8 10.25l-1.75 1.375L8 13l1.75-1.375z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M8 2 6.25 3.375 8 4.75l1.75-1.375zm2.624 2.062-1.75 1.375 1.75 1.375 1.75-1.375Zm2.626 2.063L11.5 7.5l1.75 1.375L15 7.5ZM5.376 4.062l-1.75 1.375 1.75 1.375 1.75-1.375zM8 6.124 6.25 7.499 8 8.874l1.75-1.375zm2.626 2.063-1.75 1.375 1.75 1.375 1.75-1.375ZM2.75 6.125 1 7.5l1.75 1.375L4.5 7.5Zm2.624 2.062-1.75 1.375 1.75 1.375 1.75-1.375ZM8 10.25l-1.75 1.375L8 13l1.75-1.375z"/></svg>
diff --git a/engine/editor/icons/TileSelection.svg b/engine/editor/icons/TileSelection.svg
index 987b5b87..b1175bc3 100644
--- a/engine/editor/icons/TileSelection.svg
+++ b/engine/editor/icons/TileSelection.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="5" height="5"><g fill="none"><path stroke="#fff" d="M.5.5h4v4h-4z"/><path stroke="#000" d="M1.5 1.5h2v2h-2z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="5" height="5"><g fill="none"><path stroke="#fff" d="M.5.5h4v4h-4z"/><path stroke="#000" d="M1.5 1.5h2v2h-2z"/></g></svg>
diff --git a/engine/editor/icons/TileSet.svg b/engine/editor/icons/TileSet.svg
index efdd0456..a3d2685d 100644
--- a/engine/editor/icons/TileSet.svg
+++ b/engine/editor/icons/TileSet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm5 1v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8zm-8 2v2h2v-2zm3 0v2h2v-2zm-3 3v2h2v-2zm3 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm5 1v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8zm-8 2v2h2v-2zm3 0v2h2v-2zm-3 3v2h2v-2zm3 0v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/TileUnchecked.svg b/engine/editor/icons/TileUnchecked.svg
index 0e5774e8..def0ddb3 100644
--- a/engine/editor/icons/TileUnchecked.svg
+++ b/engine/editor/icons/TileUnchecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.333"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="gray" rx="2.333"/></svg>
diff --git a/engine/editor/icons/Time.svg b/engine/editor/icons/Time.svg
index 5259f562..cab5fec0 100644
--- a/engine/editor/icons/Time.svg
+++ b/engine/editor/icons/Time.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="1.25" d="M7 1.5h2m-1 0v2.875m0-1.25a5.625 5.625 0 0 0 0 11.25v-1.25m0 1.25a5.625 5.625 0 0 0 0-11.25m5.375 5.625h-1m-9.875 0h1m4.5 0 2-2"/><circle cx="8" cy="8.75" r="1" fill="#e0e0e0"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="1.25" d="M7 1.5h2m-1 0v2.875m0-1.25a5.625 5.625 0 0 0 0 11.25v-1.25m0 1.25a5.625 5.625 0 0 0 0-11.25m5.375 5.625h-1m-9.875 0h1m4.5 0 2-2"/><circle cx="8" cy="8.75" r="1" fill="#e0e0e0"/></svg>
diff --git a/engine/editor/icons/TimelineIndicator.svg b/engine/editor/icons/TimelineIndicator.svg
index 53751867..cf3ab5af 100644
--- a/engine/editor/icons/TimelineIndicator.svg
+++ b/engine/editor/icons/TimelineIndicator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="m3 0h10l-4 4h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="m3 0h10l-4 4h-2z"/></svg>
diff --git a/engine/editor/icons/Timer.svg b/engine/editor/icons/Timer.svg
index 53592627..840eab4c 100644
--- a/engine/editor/icons/Timer.svg
+++ b/engine/editor/icons/Timer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a1 1 0 0 0-1 1c0 1.5.967 2.625 1.873 3.66.76.87 1.416 1.643 1.875 2.34-.459.697-1.114 1.472-1.875 2.342C2.967 11.377 2 12.5 2 14a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1c0-1.5-.967-2.623-1.873-3.658-.76-.87-1.416-1.645-1.875-2.342.459-.697 1.114-1.47 1.875-2.34C13.033 4.625 14 3.5 14 2a1 1 0 0 0-1-1zm8.412 2c-.238.44-.305.79-.789 1.342-.844.964-1.898 1.972-2.518 3.21A1 1 0 0 0 8 8a1 1 0 0 0-.106-.447c-.619-1.239-1.673-2.247-2.517-3.211-.484-.553-.551-.901-.79-1.342z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a1 1 0 0 0-1 1c0 1.5.967 2.625 1.873 3.66.76.87 1.416 1.643 1.875 2.34-.459.697-1.114 1.472-1.875 2.342C2.967 11.377 2 12.5 2 14a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1c0-1.5-.967-2.623-1.873-3.658-.76-.87-1.416-1.645-1.875-2.342.459-.697 1.114-1.47 1.875-2.34C13.033 4.625 14 3.5 14 2a1 1 0 0 0-1-1zm8.412 2c-.238.44-.305.79-.789 1.342-.844.964-1.898 1.972-2.518 3.21A1 1 0 0 0 8 8a1 1 0 0 0-.106-.447c-.619-1.239-1.673-2.247-2.517-3.211-.484-.553-.551-.901-.79-1.342z"/></svg>
diff --git a/engine/editor/icons/TitleBarLogo.svg b/engine/editor/icons/TitleBarLogo.svg
index 74f1c1a9..8ca66bd8 100644
--- a/engine/editor/icons/TitleBarLogo.svg
+++ b/engine/editor/icons/TitleBarLogo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="100" height="24" stroke-linejoin="round"><path fill="#e0e0e0" d="M40.122 11.514c-1.211-.019-2.597.234-2.597.234v2.364h1.393l-.015 1.052q0 .587-1.159.587c-1.159 0-1.454-.328-2.045-.979q-.89-.98-.889-2.867 0-1.89.865-2.79.866-.899 2.261-.899c.411.003.821.067 1.214.191q.63.192.844.358.212.172.405.17.19 0 .616-.45.43-.45.767-1.359c.224-.61.337-1.076.337-1.407a6 6 0 0 0-.023-.674q-.47-.517-1.744-.821-1.268-.305-2.844-.304-3.463 0-5.419 2.181-1.957 2.182-1.957 5.668 0 4.094 2.001 6.207 2.002 2.114 5.263 2.113 1.754 0 3.114-.303 1.361-.303 1.811-.619l.09-7.038c0-.408-1.079-.594-2.289-.615M51.279 8.23q-1.078 0-1.81.989-.73.99-.731 2.776 0 1.79.698 2.745.697.957 1.832.957c1.135 0 1.372-.323 1.844-.969q.709-.966.709-2.766c0-1.8-.244-2.122-.731-2.767q-.73-.965-1.811-.965m-.011 11.85q-3.16 0-5.15-2.067-1.989-2.07-1.989-6.039 0-3.97 2.011-6.017 2.014-2.046 5.196-2.046 3.183-.001 5.138 2.014 1.958 2.013 1.957 6.094t-2.001 6.073q-2.002 1.988-5.162 1.988M64.77 8.386v6.727q0 .47.068.595c.068.125.18.124.404.124q1.238 0 1.879-.923.641-.921.64-3.069c-.001-2.148-.222-2.366-.663-2.799q-.664-.654-2.103-.655zm-4.317 10.436V5.33q0-.563.282-.891a.92.92 0 0 1 .73-.326h3.756q3.575 0 5.429 1.801 1.857 1.798 1.857 5.666 0 8.276-7.063 8.276h-3.845q-1.146 0-1.147-1.034M81.186 8.23q-1.08 0-1.812.989-.73.99-.73 2.776 0 1.79.697 2.745.697.957 1.833.957c1.136 0 1.372-.323 1.844-.969q.709-.966.709-2.766c0-1.8-.244-2.122-.731-2.767q-.73-.965-1.81-.965m-.012 11.85q-3.16 0-5.15-2.067-1.99-2.07-1.99-6.039 0-3.97 2.012-6.017 2.014-2.046 5.196-2.046c3.182 0 3.834.67 5.138 2.014q1.957 2.013 1.957 6.094t-2.002 6.073q-2.001 1.988-5.161 1.988m15.587-.552q0 .448-2.226.449-2.227-.001-2.228-.449V8.238h-2.698q-.382 0-.539-1.036a7 7 0 0 1-.066-1.011q0-.517.065-1.012c.105-.688.285-1.036.54-1.036h9.783q.382.001.541 1.036a7.7 7.7 0 0 1 0 2.023q-.16 1.036-.541 1.036h-2.631z"/><g fill="#fefefe" transform="translate(-.27 -1.335)scale(.02592)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(-.27 -1.335)scale(.02592)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="24" stroke-linejoin="round"><path fill="#e0e0e0" d="M40.122 11.514c-1.211-.019-2.597.234-2.597.234v2.364h1.393l-.015 1.052q0 .587-1.159.587c-1.159 0-1.454-.328-2.045-.979q-.89-.98-.889-2.867 0-1.89.865-2.79.866-.899 2.261-.899c.411.003.821.067 1.214.191q.63.192.844.358.212.172.405.17.19 0 .616-.45.43-.45.767-1.359c.224-.61.337-1.076.337-1.407a6 6 0 0 0-.023-.674q-.47-.517-1.744-.821-1.268-.305-2.844-.304-3.463 0-5.419 2.181-1.957 2.182-1.957 5.668 0 4.094 2.001 6.207 2.002 2.114 5.263 2.113 1.754 0 3.114-.303 1.361-.303 1.811-.619l.09-7.038c0-.408-1.079-.594-2.289-.615M51.279 8.23q-1.078 0-1.81.989-.73.99-.731 2.776 0 1.79.698 2.745.697.957 1.832.957c1.135 0 1.372-.323 1.844-.969q.709-.966.709-2.766c0-1.8-.244-2.122-.731-2.767q-.73-.965-1.811-.965m-.011 11.85q-3.16 0-5.15-2.067-1.989-2.07-1.989-6.039 0-3.97 2.011-6.017 2.014-2.046 5.196-2.046 3.183-.001 5.138 2.014 1.958 2.013 1.957 6.094t-2.001 6.073q-2.002 1.988-5.162 1.988M64.77 8.386v6.727q0 .47.068.595c.068.125.18.124.404.124q1.238 0 1.879-.923.641-.921.64-3.069c-.001-2.148-.222-2.366-.663-2.799q-.664-.654-2.103-.655zm-4.317 10.436V5.33q0-.563.282-.891a.92.92 0 0 1 .73-.326h3.756q3.575 0 5.429 1.801 1.857 1.798 1.857 5.666 0 8.276-7.063 8.276h-3.845q-1.146 0-1.147-1.034M81.186 8.23q-1.08 0-1.812.989-.73.99-.73 2.776 0 1.79.697 2.745.697.957 1.833.957c1.136 0 1.372-.323 1.844-.969q.709-.966.709-2.766c0-1.8-.244-2.122-.731-2.767q-.73-.965-1.81-.965m-.012 11.85q-3.16 0-5.15-2.067-1.99-2.07-1.99-6.039 0-3.97 2.012-6.017 2.014-2.046 5.196-2.046c3.182 0 3.834.67 5.138 2.014q1.957 2.013 1.957 6.094t-2.002 6.073q-2.001 1.988-5.161 1.988m15.587-.552q0 .448-2.226.449-2.227-.001-2.228-.449V8.238h-2.698q-.382 0-.539-1.036a7 7 0 0 1-.066-1.011q0-.517.065-1.012c.105-.688.285-1.036.54-1.036h9.783q.382.001.541 1.036a7.7 7.7 0 0 1 0 2.023q-.16 1.036-.541 1.036h-2.631z"/><g fill="#fefefe" transform="translate(-.27 -1.335)scale(.02592)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(-.27 -1.335)scale(.02592)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/editor/icons/ToolAddNode.svg b/engine/editor/icons/ToolAddNode.svg
index 99f5afe2..6f357e31 100644
--- a/engine/editor/icons/ToolAddNode.svg
+++ b/engine/editor/icons/ToolAddNode.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 3a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1zm5.25 0a1 1 0 0 1 1 1v1.75H11a1 1 0 0 1 1 1v.5a1 1 0 0 1-1 1H9.25V11a1 1 0 0 1-1 1h-.5a1 1 0 0 1-1-1V9.25H5a1 1 0 0 1-1-1v-.5a1 1 0 0 1 1-1h1.75V5a1 1 0 0 1 1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 3a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1zm5.25 0a1 1 0 0 1 1 1v1.75H11a1 1 0 0 1 1 1v.5a1 1 0 0 1-1 1H9.25V11a1 1 0 0 1-1 1h-.5a1 1 0 0 1-1-1V9.25H5a1 1 0 0 1-1-1v-.5a1 1 0 0 1 1-1h1.75V5a1 1 0 0 1 1-1z"/></svg>
diff --git a/engine/editor/icons/ToolBoneSelect.svg b/engine/editor/icons/ToolBoneSelect.svg
index 1bddf041..57b0fcb1 100644
--- a/engine/editor/icons/ToolBoneSelect.svg
+++ b/engine/editor/icons/ToolBoneSelect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M16 11.46 9.858 8.933l-1.572-.647.647 1.572L11.46 16l.913-2.72 1.815 1.817.91-.909-1.818-1.815zM10.478 1a2.466 2.466 0 0 0-2.094 3.824l-3.56 3.56a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l.17-.17-.886-2.152a1.48 1.48 0 0 1 1.958-1.957l2.151.885.167-.166a2.466 2.466 0 1 0 1.705-4.496A2.466 2.466 0 0 0 10.478 1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M16 11.46 9.858 8.933l-1.572-.647.647 1.572L11.46 16l.913-2.72 1.815 1.817.91-.909-1.818-1.815zM10.478 1a2.466 2.466 0 0 0-2.094 3.824l-3.56 3.56a2.466 2.466 0 1 0-1.705 4.496 2.466 2.466 0 1 0 4.496-1.705l.17-.17-.886-2.152a1.48 1.48 0 0 1 1.958-1.957l2.151.885.167-.166a2.466 2.466 0 1 0 1.705-4.496A2.466 2.466 0 0 0 10.478 1z"/></svg>
diff --git a/engine/editor/icons/ToolConnect.svg b/engine/editor/icons/ToolConnect.svg
index 94c97c06..4d4a2fb5 100644
--- a/engine/editor/icons/ToolConnect.svg
+++ b/engine/editor/icons/ToolConnect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><rect width="14" height="2" x="1" y="7" ry=".75"/><path d="M5 1v14l8-7z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><rect width="14" height="2" x="1" y="7" ry=".75"/><path d="M5 1v14l8-7z"/></g></svg>
diff --git a/engine/editor/icons/ToolMove.svg b/engine/editor/icons/ToolMove.svg
index 756c8f54..7a1d8ed1 100644
--- a/engine/editor/icons/ToolMove.svg
+++ b/engine/editor/icons/ToolMove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M8 1a1 1 0 0 0-.691.291l-2 2 1.414 1.414 1.293-1.293 1.293 1.293 1.414-1.414-2-2A1 1 0 0 0 8 1zM3.309 5.291l-2 2a1 1 0 0 0 0 1.414l2 2 1.414-1.414L3.43 7.998l1.293-1.293-1.414-1.414zm9.414 0-1.414 1.414 1.293 1.293-1.293 1.293 1.414 1.414 2-2a1 1 0 0 0 0-1.414l-2-2zm-6 6-1.414 1.414 2 2a1 1 0 0 0 1.414 0l2-2-1.414-1.414-1.293 1.293-1.293-1.293z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M8 1a1 1 0 0 0-.691.291l-2 2 1.414 1.414 1.293-1.293 1.293 1.293 1.414-1.414-2-2A1 1 0 0 0 8 1zM3.309 5.291l-2 2a1 1 0 0 0 0 1.414l2 2 1.414-1.414L3.43 7.998l1.293-1.293-1.414-1.414zm9.414 0-1.414 1.414 1.293 1.293-1.293 1.293 1.414 1.414 2-2a1 1 0 0 0 0-1.414l-2-2zm-6 6-1.414 1.414 2 2a1 1 0 0 0 1.414 0l2-2-1.414-1.414-1.293 1.293-1.293-1.293z"/></g></svg>
diff --git a/engine/editor/icons/ToolPan.svg b/engine/editor/icons/ToolPan.svg
index 18023938..4da37361 100644
--- a/engine/editor/icons/ToolPan.svg
+++ b/engine/editor/icons/ToolPan.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M11 2a1 1 0 0 0-2 0v6H8V3a1 1 0 0 0-2 0v8.05l-2.5-1.8A1 1 0 0 0 1.875 11L6 15h6a2 2 0 0 0 2-2V4a1 1 0 0 0-2 0v4h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M11 2a1 1 0 0 0-2 0v6H8V3a1 1 0 0 0-2 0v8.05l-2.5-1.8A1 1 0 0 0 1.875 11L6 15h6a2 2 0 0 0 2-2V4a1 1 0 0 0-2 0v4h-1z"/></svg>
diff --git a/engine/editor/icons/ToolRotate.svg b/engine/editor/icons/ToolRotate.svg
index 3b1d90cd..315bc2c0 100644
--- a/engine/editor/icons/ToolRotate.svg
+++ b/engine/editor/icons/ToolRotate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M8 1a7 7 0 0 0-4.982 11.998H1.911v2h4a1 1 0 0 0 .97-1.242l-1-4-1.94.486.28 1.121a5 5 0 1 1 7.223.168l1.416 1.416A7 7 0 0 0 8 1z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M8 1a7 7 0 0 0-4.982 11.998H1.911v2h4a1 1 0 0 0 .97-1.242l-1-4-1.94.486.28 1.121a5 5 0 1 1 7.223.168l1.416 1.416A7 7 0 0 0 8 1z"/></g></svg>
diff --git a/engine/editor/icons/ToolScale.svg b/engine/editor/icons/ToolScale.svg
index 3972535f..379e50c7 100644
--- a/engine/editor/icons/ToolScale.svg
+++ b/engine/editor/icons/ToolScale.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M9 1a1 1 0 0 0 0 2h2.586l-1.293 1.293 1.414 1.414L13 4.414V7a1 1 0 0 0 2 0V2a1 1 0 0 0-1-1zM3 9a1 1 0 0 0-2 0v5a1 1 0 0 0 1 1h5a1 1 0 0 0 0-2H4.414l1.293-1.293-1.414-1.414L3 11.586V9z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M9 1a1 1 0 0 0 0 2h2.586l-1.293 1.293 1.414 1.414L13 4.414V7a1 1 0 0 0 2 0V2a1 1 0 0 0-1-1zM3 9a1 1 0 0 0-2 0v5a1 1 0 0 0 1 1h5a1 1 0 0 0 0-2H4.414l1.293-1.293-1.414-1.414L3 11.586V9z"/></g></svg>
diff --git a/engine/editor/icons/ToolSelect.svg b/engine/editor/icons/ToolSelect.svg
index 771558a0..b647e949 100644
--- a/engine/editor/icons/ToolSelect.svg
+++ b/engine/editor/icons/ToolSelect.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 6.932 2 1.995l4.936 12 1.421-4.23 2.826 2.825 1.412-1.412L9.77 8.352z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M14 6.932 2 1.995l4.936 12 1.421-4.23 2.826 2.825 1.412-1.412L9.77 8.352z"/></svg>
diff --git a/engine/editor/icons/ToolTriangle.svg b/engine/editor/icons/ToolTriangle.svg
index f906d73f..4f9bbd89 100644
--- a/engine/editor/icons/ToolTriangle.svg
+++ b/engine/editor/icons/ToolTriangle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.695 10.034 8.814 2.17l5.83 11.729z"/><g fill="#414042" stroke="#e0e0e0" stroke-width=".5"><circle cx="8.661" cy="2.322" r="1.6"/><circle cx="13.932" cy="13.4" r="1.6"/><circle cx="2.169" cy="10" r="1.6"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1.695 10.034 8.814 2.17l5.83 11.729z"/><g fill="#414042" stroke="#e0e0e0" stroke-width=".5"><circle cx="8.661" cy="2.322" r="1.6"/><circle cx="13.932" cy="13.4" r="1.6"/><circle cx="2.169" cy="10" r="1.6"/></g></svg>
diff --git a/engine/editor/icons/Tools.svg b/engine/editor/icons/Tools.svg
index 1b25d620..2ba2fc42 100644
--- a/engine/editor/icons/Tools.svg
+++ b/engine/editor/icons/Tools.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1 3 3l1 2v4H2v3.5a2.5 2.5 0 0 0 5 0V9H5V5l1-2-1-2zm6 .174a3 3 0 0 0 0 5.652V14a1 1 0 0 0 2 0V6.824a3 3 0 0 0 0-5.648V4a1 1 0 0 1-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 1 3 3l1 2v4H2v3.5a2.5 2.5 0 0 0 5 0V9H5V5l1-2-1-2zm6 .174a3 3 0 0 0 0 5.652V14a1 1 0 0 0 2 0V6.824a3 3 0 0 0 0-5.648V4a1 1 0 0 1-2 0z"/></svg>
diff --git a/engine/editor/icons/TorusMesh.svg b/engine/editor/icons/TorusMesh.svg
index 5b09ef57..7b5d118b 100644
--- a/engine/editor/icons/TorusMesh.svg
+++ b/engine/editor/icons/TorusMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#ffca5f"><path stroke-width="2" d="M2.5 10a6 4 0 0 0 11 0 4 4 0 0 0 0-4 6 4 0 0 0-11 0 4 4 0 0 0 0 4z"/><path stroke-linecap="round" stroke-width="1.75" d="M6.2 7.2a2 1 0 1 0 3.6 0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#ffca5f"><path stroke-width="2" d="M2.5 10a6 4 0 0 0 11 0 4 4 0 0 0 0-4 6 4 0 0 0-11 0 4 4 0 0 0 0 4z"/><path stroke-linecap="round" stroke-width="1.75" d="M6.2 7.2a2 1 0 1 0 3.6 0"/></g></svg>
diff --git a/engine/editor/icons/TouchScreenButton.svg b/engine/editor/icons/TouchScreenButton.svg
index ff642378..c98b8833 100644
--- a/engine/editor/icons/TouchScreenButton.svg
+++ b/engine/editor/icons/TouchScreenButton.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M3 1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2V4H3V2h8v2H9v1h2a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm5 7V4a1 1 0 0 0-2 0v7.05l-2.5-1.8A1 1 0 0 0 1.875 11L6 15h6a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M3 1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2V4H3V2h8v2H9v1h2a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm5 7V4a1 1 0 0 0-2 0v7.05l-2.5-1.8A1 1 0 0 0 1.875 11L6 15h6a2 2 0 0 0 2-2v-3a2 2 0 0 0-2-2z"/></svg>
diff --git a/engine/editor/icons/TrackCapture.svg b/engine/editor/icons/TrackCapture.svg
index 3d70d513..445fa221 100644
--- a/engine/editor/icons/TrackCapture.svg
+++ b/engine/editor/icons/TrackCapture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#e1da5b" d="M2 1a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1v-.75H3.4c-.3 0-.4-.2-.4-1v-.5c0-.8.1-1 .4-1H7V2a1 1 0 0 0-1-1zm5.5 6h2l.75-1.5h2L13 7h2l-3-6h-1.5zm3.75-4 .5 1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#e1da5b" d="M2 1a1 1 0 0 0-1 1v4a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1v-.75H3.4c-.3 0-.4-.2-.4-1v-.5c0-.8.1-1 .4-1H7V2a1 1 0 0 0-1-1zm5.5 6h2l.75-1.5h2L13 7h2l-3-6h-1.5zm3.75-4 .5 1h-1z"/></svg>
diff --git a/engine/editor/icons/TrackColor.svg b/engine/editor/icons/TrackColor.svg
index 3ec87008..dae0fd9b 100644
--- a/engine/editor/icons/TrackColor.svg
+++ b/engine/editor/icons/TrackColor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.1" height="6.1" x="1.95" y="1.95" fill="#fff" ry=".763" transform="rotate(-45 5 5)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><rect width="6.1" height="6.1" x="1.95" y="1.95" fill="#fff" ry=".763" transform="rotate(-45 5 5)"/></svg>
diff --git a/engine/editor/icons/TrackContinuous.svg b/engine/editor/icons/TrackContinuous.svg
index f085882a..5f9a8c66 100644
--- a/engine/editor/icons/TrackContinuous.svg
+++ b/engine/editor/icons/TrackContinuous.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M2 6c6 0 6-4 12-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#e0e0e0" stroke-linecap="round" stroke-width="2" d="M2 6c6 0 6-4 12-4"/></svg>
diff --git a/engine/editor/icons/TrackDiscrete.svg b/engine/editor/icons/TrackDiscrete.svg
index 2909c528..ced32ded 100644
--- a/engine/editor/icons/TrackDiscrete.svg
+++ b/engine/editor/icons/TrackDiscrete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#b9ec41" d="M14 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zM8 3a1 1 0 0 0 0 2 1 1 0 0 0 0-2zM2 5a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="#b9ec41" d="M14 1a1 1 0 0 0 0 2 1 1 0 0 0 0-2zM8 3a1 1 0 0 0 0 2 1 1 0 0 0 0-2zM2 5a1 1 0 0 0 0 2 1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/Transform2D.svg b/engine/editor/icons/Transform2D.svg
index 60911580..bf76b2a0 100644
--- a/engine/editor/icons/Transform2D.svg
+++ b/engine/editor/icons/Transform2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#b9ec41" d="M0 2v2h2v6h2V4h3a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h7a4 4 0 0 0 0-8h-2v6H7a3 3 0 0 0 0-6zm12 2a2 2 0 0 1 0 4z"/><path fill="#fff" fill-opacity=".4" d="M6.5 2v2H7a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8H7a3 3 0 0 0 0-6h-.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#b9ec41" d="M0 2v2h2v6h2V4h3a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h7a4 4 0 0 0 0-8h-2v6H7a3 3 0 0 0 0-6zm12 2a2 2 0 0 1 0 4z"/><path fill="#fff" fill-opacity=".4" d="M6.5 2v2H7a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8H7a3 3 0 0 0 0-6h-.5z"/></svg>
diff --git a/engine/editor/icons/Transform3D.svg b/engine/editor/icons/Transform3D.svg
index 3a257ecd..efe6e818 100644
--- a/engine/editor/icons/Transform3D.svg
+++ b/engine/editor/icons/Transform3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f68f45" d="M4 4h3.349a1 1.267 0 0 1-1 1.267v1a.866.866 0 0 1 0 1.732h-1v2h1a2.81 2.81 0 0 0 2.232-4.734A1.32 1.32 0 0 0 9.345 4V2H0v2h2v6h2zm6 6h2a4 4 0 0 0 0-8h-2zm2-6a2 2 0 0 1 0 4z"/><path fill="#fff" fill-opacity=".4" d="M5.5 4h1.849a1 1.267 0 0 1-1 1.267v1a.866.866 0 0 1 0 1.732h-1v2h1a2.81 2.81 0 0 0 2.232-4.734A1.32 1.32 0 0 0 9.345 4V2H5.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f68f45" d="M4 4h3.349a1 1.267 0 0 1-1 1.267v1a.866.866 0 0 1 0 1.732h-1v2h1a2.81 2.81 0 0 0 2.232-4.734A1.32 1.32 0 0 0 9.345 4V2H0v2h2v6h2zm6 6h2a4 4 0 0 0 0-8h-2zm2-6a2 2 0 0 1 0 4z"/><path fill="#fff" fill-opacity=".4" d="M5.5 4h1.849a1 1.267 0 0 1-1 1.267v1a.866.866 0 0 1 0 1.732h-1v2h1a2.81 2.81 0 0 0 2.232-4.734A1.32 1.32 0 0 0 9.345 4V2H5.5z"/></svg>
diff --git a/engine/editor/icons/TransitionEnd.svg b/engine/editor/icons/TransitionEnd.svg
index 10c5b5f0..18536029 100644
--- a/engine/editor/icons/TransitionEnd.svg
+++ b/engine/editor/icons/TransitionEnd.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M2.988 3c-.547.01-.987.451-.988.998v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2.988 3z"/><rect width="3.068" height="10.067" x="11.17" y="3.008" ry=".763"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M2.988 3c-.547.01-.987.451-.988.998v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2.988 3z"/><rect width="3.068" height="10.067" x="11.17" y="3.008" ry=".763"/></g></svg>
diff --git a/engine/editor/icons/TransitionEndAuto.svg b/engine/editor/icons/TransitionEndAuto.svg
index a812680f..7a82f2ed 100644
--- a/engine/editor/icons/TransitionEndAuto.svg
+++ b/engine/editor/icons/TransitionEndAuto.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#77ce57"><path d="M3.555 3.168A1 1 0 0 0 2 4v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664z"/><rect width="3.068" height="10.067" x="11.17" y="3" ry=".763"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#77ce57"><path d="M3.555 3.168A1 1 0 0 0 2 4v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664z"/><rect width="3.068" height="10.067" x="11.17" y="3" ry=".763"/></g></svg>
diff --git a/engine/editor/icons/TransitionEndAutoBig.svg b/engine/editor/icons/TransitionEndAutoBig.svg
index 95156e59..1cb9a6c7 100644
--- a/engine/editor/icons/TransitionEndAutoBig.svg
+++ b/engine/editor/icons/TransitionEndAutoBig.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#77ce57" stroke="#414042" stroke-width="1.41"><path d="M2.836 2.996a1.413 1.413 0 0 0-1.394 1.407v11.28a1.41 1.41 0 0 0 2.192 1.173l8.46-5.64a1.41 1.41 0 0 0 0-2.346l-8.46-5.64a1.41 1.41 0 0 0-.798-.234z"/><rect width="4.326" height="14.194" x="14.371" y="3.008" ry="1.076"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#77ce57" stroke="#414042" stroke-width="1.41"><path d="M2.836 2.996a1.413 1.413 0 0 0-1.394 1.407v11.28a1.41 1.41 0 0 0 2.192 1.173l8.46-5.64a1.41 1.41 0 0 0 0-2.346l-8.46-5.64a1.41 1.41 0 0 0-.798-.234z"/><rect width="4.326" height="14.194" x="14.371" y="3.008" ry="1.076"/></g></svg>
diff --git a/engine/editor/icons/TransitionEndBig.svg b/engine/editor/icons/TransitionEndBig.svg
index 251ff3b5..fa6b0f88 100644
--- a/engine/editor/icons/TransitionEndBig.svg
+++ b/engine/editor/icons/TransitionEndBig.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#e0e0e0" stroke="#414042" stroke-width="1.42"><path d="M2.79 3.175a1.424 1.424 0 0 0-1.403 1.417v11.363c0 1.134 1.264 1.811 2.208 1.182l8.522-5.681a1.42 1.42 0 0 0 0-2.364L3.595 3.411a1.42 1.42 0 0 0-.805-.236z"/><rect width="4.358" height="14.299" x="14.411" y="3.187" ry="1.084"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#e0e0e0" stroke="#414042" stroke-width="1.42"><path d="M2.79 3.175a1.424 1.424 0 0 0-1.403 1.417v11.363c0 1.134 1.264 1.811 2.208 1.182l8.522-5.681a1.42 1.42 0 0 0 0-2.364L3.595 3.411a1.42 1.42 0 0 0-.805-.236z"/><rect width="4.358" height="14.299" x="14.411" y="3.187" ry="1.084"/></g></svg>
diff --git a/engine/editor/icons/TransitionImmediate.svg b/engine/editor/icons/TransitionImmediate.svg
index 4d427536..3e24afd9 100644
--- a/engine/editor/icons/TransitionImmediate.svg
+++ b/engine/editor/icons/TransitionImmediate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2 4z"/></svg>
diff --git a/engine/editor/icons/TransitionImmediateAuto.svg b/engine/editor/icons/TransitionImmediateAuto.svg
index 04267254..436d1358 100644
--- a/engine/editor/icons/TransitionImmediateAuto.svg
+++ b/engine/editor/icons/TransitionImmediateAuto.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#77ce57" d="M2 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#77ce57" d="M2 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2 4z"/></svg>
diff --git a/engine/editor/icons/TransitionImmediateAutoBig.svg b/engine/editor/icons/TransitionImmediateAutoBig.svg
index c59c4dbb..10e72310 100644
--- a/engine/editor/icons/TransitionImmediateAutoBig.svg
+++ b/engine/editor/icons/TransitionImmediateAutoBig.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path fill="#77ce57" stroke="#414042" stroke-width="1.571" d="M5.111 2.306c-.86.015-1.55.708-1.553 1.568v12.568c0 1.254 1.399 2.003 2.443 1.307l9.426-6.284a1.571 1.571 0 0 0 0-2.614L6.001 2.567a1.57 1.57 0 0 0-.89-.261z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path fill="#77ce57" stroke="#414042" stroke-width="1.571" d="M5.111 2.306c-.86.015-1.55.708-1.553 1.568v12.568c0 1.254 1.399 2.003 2.443 1.307l9.426-6.284a1.571 1.571 0 0 0 0-2.614L6.001 2.567a1.57 1.57 0 0 0-.89-.261z"/></svg>
diff --git a/engine/editor/icons/TransitionImmediateBig.svg b/engine/editor/icons/TransitionImmediateBig.svg
index 3180121e..42c481d9 100644
--- a/engine/editor/icons/TransitionImmediateBig.svg
+++ b/engine/editor/icons/TransitionImmediateBig.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path fill="#e0e0e0" stroke="#414042" stroke-width="1.571" d="M5.111 2.306c-.86.015-1.55.708-1.553 1.568v12.568c0 1.254 1.399 2.003 2.443 1.307l9.426-6.284a1.571 1.571 0 0 0 0-2.614L6.001 2.567a1.57 1.57 0 0 0-.89-.261z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path fill="#e0e0e0" stroke="#414042" stroke-width="1.571" d="M5.111 2.306c-.86.015-1.55.708-1.553 1.568v12.568c0 1.254 1.399 2.003 2.443 1.307l9.426-6.284a1.571 1.571 0 0 0 0-2.614L6.001 2.567a1.57 1.57 0 0 0-.89-.261z"/></svg>
diff --git a/engine/editor/icons/TransitionSync.svg b/engine/editor/icons/TransitionSync.svg
index c2550eb6..1a788a7a 100644
--- a/engine/editor/icons/TransitionSync.svg
+++ b/engine/editor/icons/TransitionSync.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M7.543 3c-.547.01-.988.451-.989.998v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 7.543 3z"/><rect width="3.068" height="10.067" x="1.966" y="3.008" ry=".763"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="M7.543 3c-.547.01-.988.451-.989.998v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 7.543 3z"/><rect width="3.068" height="10.067" x="1.966" y="3.008" ry=".763"/></g></svg>
diff --git a/engine/editor/icons/TransitionSyncAuto.svg b/engine/editor/icons/TransitionSyncAuto.svg
index 9ebd68b6..a1203b55 100644
--- a/engine/editor/icons/TransitionSyncAuto.svg
+++ b/engine/editor/icons/TransitionSyncAuto.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#77ce57"><path d="M8.07 3c-.547.01-.987.451-.988.998v8a1 1 0 0 0 1.554.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 8.07 3z"/><rect width="3.068" height="10.067" x="1.966" y="3.008" ry=".763"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#77ce57"><path d="M8.07 3c-.547.01-.987.451-.988.998v8a1 1 0 0 0 1.554.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 8.07 3z"/><rect width="3.068" height="10.067" x="1.966" y="3.008" ry=".763"/></g></svg>
diff --git a/engine/editor/icons/TransitionSyncAutoBig.svg b/engine/editor/icons/TransitionSyncAutoBig.svg
index 6e2de97f..3514d9b1 100644
--- a/engine/editor/icons/TransitionSyncAutoBig.svg
+++ b/engine/editor/icons/TransitionSyncAutoBig.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#77ce57" stroke="#414042" stroke-width="1.41"><path d="M9.209 2.996a1.413 1.413 0 0 0-1.394 1.407v11.28a1.41 1.41 0 0 0 2.192 1.173l8.46-5.64a1.41 1.41 0 0 0 0-2.346l-8.46-5.64a1.41 1.41 0 0 0-.798-.234z"/><rect width="4.326" height="14.194" x="1.626" y="3.008" ry="1.076"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#77ce57" stroke="#414042" stroke-width="1.41"><path d="M9.209 2.996a1.413 1.413 0 0 0-1.394 1.407v11.28a1.41 1.41 0 0 0 2.192 1.173l8.46-5.64a1.41 1.41 0 0 0 0-2.346l-8.46-5.64a1.41 1.41 0 0 0-.798-.234z"/><rect width="4.326" height="14.194" x="1.626" y="3.008" ry="1.076"/></g></svg>
diff --git a/engine/editor/icons/TransitionSyncBig.svg b/engine/editor/icons/TransitionSyncBig.svg
index c460930c..b9fd36c9 100644
--- a/engine/editor/icons/TransitionSyncBig.svg
+++ b/engine/editor/icons/TransitionSyncBig.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#e0e0e0" stroke="#414042" stroke-width="1.42"><path d="M8.96 3.175a1.424 1.424 0 0 0-1.404 1.417v11.363c0 1.134 1.264 1.811 2.208 1.182l8.522-5.681a1.42 1.42 0 0 0 0-2.364L9.764 3.411a1.42 1.42 0 0 0-.804-.236z"/><rect width="4.358" height="14.299" x="1.462" y="3.187" ry="1.084"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><g fill="#e0e0e0" stroke="#414042" stroke-width="1.42"><path d="M8.96 3.175a1.424 1.424 0 0 0-1.404 1.417v11.363c0 1.134 1.264 1.811 2.208 1.182l8.522-5.681a1.42 1.42 0 0 0 0-2.364L9.764 3.411a1.42 1.42 0 0 0-.804-.236z"/><rect width="4.358" height="14.299" x="1.462" y="3.187" ry="1.084"/></g></svg>
diff --git a/engine/editor/icons/Translation.svg b/engine/editor/icons/Translation.svg
index bbcebcff..6cd034f7 100644
--- a/engine/editor/icons/Translation.svg
+++ b/engine/editor/icons/Translation.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 2a1 1 0 0 0-1.715-.697 3 3 0 1 0 0 5.392A1 1 0 0 0 7 6zM4 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6.887 3.53-1.79.894.29.576H7v2h.82a5.432 5.432 0 0 0 1.2 2.73c-.616.163-1.357.266-2.266.27v2c1.677-.01 3.041-.313 4.111-.834 1.07.52 2.434.826 4.111.834v-2c-.909 0-1.65-.106-2.266-.27A5.432 5.432 0 0 0 13.932 10H15V8h-3.379zM9.863 10h2.024a3.432 3.432 0 0 1-1.012 1.783A3.432 3.432 0 0 1 9.863 10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M7 2a1 1 0 0 0-1.715-.697 3 3 0 1 0 0 5.392A1 1 0 0 0 7 6zM4 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm6.887 3.53-1.79.894.29.576H7v2h.82a5.432 5.432 0 0 0 1.2 2.73c-.616.163-1.357.266-2.266.27v2c1.677-.01 3.041-.313 4.111-.834 1.07.52 2.434.826 4.111.834v-2c-.909 0-1.65-.106-2.266-.27A5.432 5.432 0 0 0 13.932 10H15V8h-3.379zM9.863 10h2.024a3.432 3.432 0 0 1-1.012 1.783A3.432 3.432 0 0 1 9.863 10z"/></svg>
diff --git a/engine/editor/icons/Tree.svg b/engine/editor/icons/Tree.svg
index 40dde340..1e71a9a0 100644
--- a/engine/editor/icons/Tree.svg
+++ b/engine/editor/icons/Tree.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 1v13a1 1 0 0 0 1 1h13v-2H3V7h2v3a1 1 0 0 0 1 1h9V9H7V7h8V5H3V3h12V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M1 1v13a1 1 0 0 0 1 1h13v-2H3V7h2v3a1 1 0 0 0 1 1h9V9H7V7h8V5H3V3h12V1z"/></svg>
diff --git a/engine/editor/icons/TripleBar.svg b/engine/editor/icons/TripleBar.svg
index a83bc804..1941eda5 100644
--- a/engine/editor/icons/TripleBar.svg
+++ b/engine/editor/icons/TripleBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" d="M2 4h12zm0 4h12zm0 4h12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" d="M2 4h12zm0 4h12zm0 4h12z"/></svg>
diff --git a/engine/editor/icons/TubeTrailMesh.svg b/engine/editor/icons/TubeTrailMesh.svg
index 4c2558db..010b87ac 100644
--- a/engine/editor/icons/TubeTrailMesh.svg
+++ b/engine/editor/icons/TubeTrailMesh.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-linejoin="round" stroke-width="2" d="M11.75 2a5 8 0 0 1 0 11h-8.5a5 8 0 0 1 0 -11z M4 7.5 h7"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#ffca5f" stroke-linejoin="round" stroke-width="2" d="M11.75 2a5 8 0 0 1 0 11h-8.5a5 8 0 0 1 0 -11z M4 7.5 h7"/></svg>
diff --git a/engine/editor/icons/Tween.svg b/engine/editor/icons/Tween.svg
index da317200..d70bb5b1 100644
--- a/engine/editor/icons/Tween.svg
+++ b/engine/editor/icons/Tween.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#c38ef1" d="m7 1v2h6v6h2v-8zm-1 4 1.793 1.793-4.793 4.793v-4.5859h-2v8h8v-2h-4.5859l4.793-4.793 1.793 1.793v-5h-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#c38ef1" d="m7 1v2h6v6h2v-8zm-1 4 1.793 1.793-4.793 4.793v-4.5859h-2v8h8v-2h-4.5859l4.793-4.793 1.793 1.793v-5h-5z"/></svg>
diff --git a/engine/editor/icons/UndoRedo.svg b/engine/editor/icons/UndoRedo.svg
index 6350eab2..0d653b2b 100644
--- a/engine/editor/icons/UndoRedo.svg
+++ b/engine/editor/icons/UndoRedo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 9H1V2l2 2a3.875 5 30 0 1 9 11 3.5 5 10 0 0-6-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 9H1V2l2 2a3.875 5 30 0 1 9 11 3.5 5 10 0 0-6-8z"/></svg>
diff --git a/engine/editor/icons/Unfavorite.svg b/engine/editor/icons/Unfavorite.svg
index 78f1b90f..93a0133b 100644
--- a/engine/editor/icons/Unfavorite.svg
+++ b/engine/editor/icons/Unfavorite.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M 8 1.6992188 L 5.6269531 5.796875 L 1 6.8945312 L 4.2363281 10.302734 L 3.8769531 14.976562 L 8.0175781 12.998047 L 12.173828 14.941406 L 11.777344 10.287109 L 15 6.8945312 L 10.373047 5.796875 L 8 1.6992188 z M 8 4.2773438 L 9.4882812 6.8457031 L 12.388672 7.5332031 L 10.369141 9.6601562 L 10.617188 12.576172 L 8.0097656 11.359375 L 5.4160156 12.599609 L 5.640625 9.6699219 L 3.6113281 7.5332031 L 6.5117188 6.8457031 L 8 4.2773438 z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M 8 1.6992188 L 5.6269531 5.796875 L 1 6.8945312 L 4.2363281 10.302734 L 3.8769531 14.976562 L 8.0175781 12.998047 L 12.173828 14.941406 L 11.777344 10.287109 L 15 6.8945312 L 10.373047 5.796875 L 8 1.6992188 z M 8 4.2773438 L 9.4882812 6.8457031 L 12.388672 7.5332031 L 10.369141 9.6601562 L 10.617188 12.576172 L 8.0097656 11.359375 L 5.4160156 12.599609 L 5.640625 9.6699219 L 3.6113281 7.5332031 L 6.5117188 6.8457031 L 8 4.2773438 z"/></svg>
diff --git a/engine/editor/icons/Ungroup.svg b/engine/editor/icons/Ungroup.svg
index 0a8e2d52..aeb116a6 100644
--- a/engine/editor/icons/Ungroup.svg
+++ b/engine/editor/icons/Ungroup.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".4" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#fff" d="M7 1v2h2V1H7zm6 0v2h2V1h-2zM1 7v2h2V7H1zm6 0v2h2V7H7zm6 0v2h2V7h-2zM1 13v2h2v-2H1zm6 0v2h2v-2H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" fill-opacity=".4" d="M7 1v6H1v8h8V9h6V1zm2 2h4v4H9z"/><path fill="#fff" d="M7 1v2h2V1H7zm6 0v2h2V1h-2zM1 7v2h2V7H1zm6 0v2h2V7H7zm6 0v2h2V7h-2zM1 13v2h2v-2H1zm6 0v2h2v-2H7z"/></svg>
diff --git a/engine/editor/icons/Unlinked.svg b/engine/editor/icons/Unlinked.svg
index d7d9f954..c2ea3249 100644
--- a/engine/editor/icons/Unlinked.svg
+++ b/engine/editor/icons/Unlinked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-linecap="round"><path stroke-width="2" d="M4.22 8.1a3 3 0 1 0 3.68 2.1M8.1 4.22a3 3 0 1 1 2.1 3.68"/><path d="M3.5 5.5 h-2 M5.5 3.5 v-2 M4.5 4.5 l-2 -2"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#e0e0e0" stroke-linecap="round"><path stroke-width="2" d="M4.22 8.1a3 3 0 1 0 3.68 2.1M8.1 4.22a3 3 0 1 1 2.1 3.68"/><path d="M3.5 5.5 h-2 M5.5 3.5 v-2 M4.5 4.5 l-2 -2"/></g></svg>
diff --git a/engine/editor/icons/Unlock.svg b/engine/editor/icons/Unlock.svg
index 1db1612f..42949384 100644
--- a/engine/editor/icons/Unlock.svg
+++ b/engine/editor/icons/Unlock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 6a5 5 0 0 0-7.498-4.326l1 1.732A3 3 0 0 1 11 6v2H2v7h12V8h-1zm-6 4h2v3H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M13 6a5 5 0 0 0-7.498-4.326l1 1.732A3 3 0 0 1 11 6v2H2v7h12V8h-1zm-6 4h2v3H7z"/></svg>
diff --git a/engine/editor/icons/UseBlendDisable.svg b/engine/editor/icons/UseBlendDisable.svg
index b408a184..8bdd902d 100644
--- a/engine/editor/icons/UseBlendDisable.svg
+++ b/engine/editor/icons/UseBlendDisable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#a3e595" d="M4.5 1h7v14h-7z" opacity=".5"/><path fill="none" stroke="#a3e595" stroke-width="2" d="M10.5 15V2m-5 0v13M15 2H1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#a3e595" d="M4.5 1h7v14h-7z" opacity=".5"/><path fill="none" stroke="#a3e595" stroke-width="2" d="M10.5 15V2m-5 0v13M15 2H1"/></svg>
diff --git a/engine/editor/icons/UseBlendEnable.svg b/engine/editor/icons/UseBlendEnable.svg
index 5c540bf1..5939a064 100644
--- a/engine/editor/icons/UseBlendEnable.svg
+++ b/engine/editor/icons/UseBlendEnable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#95c6e8" d="M8 2.744C4 5.1 1 9.519 1 14v1h14v-1c0-4.48-3-8.9-7-11.256z" opacity=".5"/><path fill="none" stroke="#95c6e8" stroke-linecap="square" stroke-width="2" d="M14 2C8 2 2 8 2 14m12 0C14 8 8 2 2 2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#95c6e8" d="M8 2.744C4 5.1 1 9.519 1 14v1h14v-1c0-4.48-3-8.9-7-11.256z" opacity=".5"/><path fill="none" stroke="#95c6e8" stroke-linecap="square" stroke-width="2" d="M14 2C8 2 2 8 2 14m12 0C14 8 8 2 2 2"/></svg>
diff --git a/engine/editor/icons/Uv.svg b/engine/editor/icons/Uv.svg
index a4622779..e895c5c0 100644
--- a/engine/editor/icons/Uv.svg
+++ b/engine/editor/icons/Uv.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 5v4a3 3 0 0 0 6 0V5H5v4a1 1 0 0 1-2 0V5zm8 0 2 7h3l2-7h-2l-1.5 5.25L11 5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 5v4a3 3 0 0 0 6 0V5H5v4a1 1 0 0 1-2 0V5zm8 0 2 7h3l2-7h-2l-1.5 5.25L11 5z"/></svg>
diff --git a/engine/editor/icons/VBoxContainer.svg b/engine/editor/icons/VBoxContainer.svg
index 85163aba..7f5deeef 100644
--- a/engine/editor/icons/VBoxContainer.svg
+++ b/engine/editor/icons/VBoxContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v2H3zm0 4h10v2H3zm0 4h10v2H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v2H3zm0 4h10v2H3zm0 4h10v2H3z"/></svg>
diff --git a/engine/editor/icons/VFlowContainer.svg b/engine/editor/icons/VFlowContainer.svg
index 428e1efa..104ca381 100644
--- a/engine/editor/icons/VFlowContainer.svg
+++ b/engine/editor/icons/VFlowContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97" stroke-width="2"><rect width="12" height="12" x="2" y="2" rx="1"/><path stroke-linecap="round" d="M5 11V9m0-3V5m3 6h0m0-3V5m3 6V7"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#8eef97" stroke-width="2"><rect width="12" height="12" x="2" y="2" rx="1"/><path stroke-linecap="round" d="M5 11V9m0-3V5m3 6h0m0-3V5m3 6V7"/></g></svg>
diff --git a/engine/editor/icons/VScrollBar.svg b/engine/editor/icons/VScrollBar.svg
index 2ae6b282..dbaadb92 100644
--- a/engine/editor/icons/VScrollBar.svg
+++ b/engine/editor/icons/VScrollBar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm2.988 1a1 1 0 0 1 .567.168l3 2a1 1 0 1 1-1.11 1.664L8 4.203l-2.445 1.63a1 1 0 1 1-1.11-1.665l3-2A1 1 0 0 1 7.988 2zM4.99 9.992a1 1 0 0 1 .565.176L8 11.798l2.445-1.63a1 1 0 1 1 1.11 1.664l-3 2a1 1 0 0 1-1.11 0l-3-2a1 1 0 0 1 .545-1.84z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm2.988 1a1 1 0 0 1 .567.168l3 2a1 1 0 1 1-1.11 1.664L8 4.203l-2.445 1.63a1 1 0 1 1-1.11-1.665l3-2A1 1 0 0 1 7.988 2zM4.99 9.992a1 1 0 0 1 .565.176L8 11.798l2.445-1.63a1 1 0 1 1 1.11 1.664l-3 2a1 1 0 0 1-1.11 0l-3-2a1 1 0 0 1 .545-1.84z"/></svg>
diff --git a/engine/editor/icons/VSeparator.svg b/engine/editor/icons/VSeparator.svg
index 3fcce829..b03cf647 100644
--- a/engine/editor/icons/VSeparator.svg
+++ b/engine/editor/icons/VSeparator.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M2 11h3V5H2zm5 4h2V1H7zm4-4h3V5h-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M2 11h3V5H2zm5 4h2V1H7zm4-4h3V5h-3z"/></svg>
diff --git a/engine/editor/icons/VSlider.svg b/engine/editor/icons/VSlider.svg
index 43813103..90bd8074 100644
--- a/engine/editor/icons/VSlider.svg
+++ b/engine/editor/icons/VSlider.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 1a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm5 0a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2zM6 6.867a4 4 0 0 1-2 0v7.13a1 1 0 0 0 2 0zM11 7a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm-1 6a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M5 1a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm5 0a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2zM6 6.867a4 4 0 0 1-2 0v7.13a1 1 0 0 0 2 0zM11 7a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm-1 6a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2z"/></svg>
diff --git a/engine/editor/icons/VSplitContainer.svg b/engine/editor/icons/VSplitContainer.svg
index 6e4a5665..bc1c68d0 100644
--- a/engine/editor/icons/VSplitContainer.svg
+++ b/engine/editor/icons/VSplitContainer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M15 3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2zm-2 0v4h-3L8 5 6 7H3V3zm0 6v4H3V9h3l2 2 2-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M15 3a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2zm-2 0v4h-3L8 5 6 7H3V3zm0 6v4H3V9h3l2 2 2-2z"/></svg>
diff --git a/engine/editor/icons/Variant.svg b/engine/editor/icons/Variant.svg
index bbf21806..b1df9c5d 100644
--- a/engine/editor/icons/Variant.svg
+++ b/engine/editor/icons/Variant.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#41ecad" d="M3 3a3 3 0 0 0 0 6h2V3zm3 0v6h2V5a1 1 0 0 1 1 1v3h2V6a3 3 0 0 0-3-3zm5 2a3 3 0 0 0 3 3 1 1 0 0 1-1 1h-1v2h1a3 3 0 0 0 3-3V3h-2v3a1 1 0 0 1-1-1V3h-2zM3 7a1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#41ecad" d="M3 3a3 3 0 0 0 0 6h2V3zm3 0v6h2V5a1 1 0 0 1 1 1v3h2V6a3 3 0 0 0-3-3zm5 2a3 3 0 0 0 3 3 1 1 0 0 1-1 1h-1v2h1a3 3 0 0 0 3-3V3h-2v3a1 1 0 0 1-1-1V3h-2zM3 7a1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/VcsBranches.svg b/engine/editor/icons/VcsBranches.svg
index b11fb314..91c767b7 100644
--- a/engine/editor/icons/VcsBranches.svg
+++ b/engine/editor/icons/VcsBranches.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="1.5" d="M9.5 11.75a2.5 2.5 0 0 0 5 0 2.5 2.5 0 0 0-5 0h-3l-3-3v-2A2.5 2.5 0 0 0 6 4.25h3.5a2.5 2.5 0 0 0 5 0 2.5 2.5 0 0 0-5 0m-3.5 0a2.5 2.5 0 1 0-2.5 2.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-width="1.5" d="M9.5 11.75a2.5 2.5 0 0 0 5 0 2.5 2.5 0 0 0-5 0h-3l-3-3v-2A2.5 2.5 0 0 0 6 4.25h3.5a2.5 2.5 0 0 0 5 0 2.5 2.5 0 0 0-5 0m-3.5 0a2.5 2.5 0 1 0-2.5 2.5"/></svg>
diff --git a/engine/editor/icons/Vector2.svg b/engine/editor/icons/Vector2.svg
index 4e9dc402..dab0fa35 100644
--- a/engine/editor/icons/Vector2.svg
+++ b/engine/editor/icons/Vector2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ac73f1" d="M12 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4zm9 6V8H9a1 1 0 0 1 0-2h1V4H9a3 3 0 0 0 0 6z"/><path fill="#fff" fill-opacity=".4" d="M12 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ac73f1" d="M12 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4zm9 6V8H9a1 1 0 0 1 0-2h1V4H9a3 3 0 0 0 0 6z"/><path fill="#fff" fill-opacity=".4" d="M12 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8h-3a3 3 0 0 0 0-6z"/></svg>
diff --git a/engine/editor/icons/Vector2i.svg b/engine/editor/icons/Vector2i.svg
index a3af81bc..21fdce6a 100644
--- a/engine/editor/icons/Vector2i.svg
+++ b/engine/editor/icons/Vector2i.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ac73f1" d="M8 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8H9a3 3 0 0 0 0-6zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4z"/><path fill="#fff" fill-opacity=".4" d="M8 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8H9a3 3 0 0 0 0-6z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#ac73f1" d="M8 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8H9a3 3 0 0 0 0-6zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4z"/><path fill="#fff" fill-opacity=".4" d="M8 2v2h1a1 1 0 0 1 0 2 2 2 0 0 0-2 2v2h5V8H9a3 3 0 0 0 0-6z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
diff --git a/engine/editor/icons/Vector3.svg b/engine/editor/icons/Vector3.svg
index b9263e1f..676d12d1 100644
--- a/engine/editor/icons/Vector3.svg
+++ b/engine/editor/icons/Vector3.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#de66f0" d="M11 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2h-1v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 15 4V2zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4zm9 6V8H9a1 1 0 0 1 0-2h1V4H9a3 3 0 0 0 0 6z"/><path fill="#fff" fill-opacity=".4" d="M11 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2h-1v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 15 4V2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#de66f0" d="M11 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2h-1v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 15 4V2zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4zm9 6V8H9a1 1 0 0 1 0-2h1V4H9a3 3 0 0 0 0 6z"/><path fill="#fff" fill-opacity=".4" d="M11 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2h-1v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 15 4V2z"/></svg>
diff --git a/engine/editor/icons/Vector3i.svg b/engine/editor/icons/Vector3i.svg
index 5f1a8650..7b17c07c 100644
--- a/engine/editor/icons/Vector3i.svg
+++ b/engine/editor/icons/Vector3i.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#de66f0" d="M8 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 4V2zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4z"/><path fill="#fff" fill-opacity=".4" d="M8 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 4V2z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#de66f0" d="M8 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 4V2zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4z"/><path fill="#fff" fill-opacity=".4" d="M8 2v2h2a1 1 0 0 1-1 1v2a1 1 0 0 1 0 2H8v2h1a3 3 0 0 0 2.232-5A3 3 0 0 0 12 4V2z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
diff --git a/engine/editor/icons/Vector4.svg b/engine/editor/icons/Vector4.svg
index fca05d21..0b0f3835 100644
--- a/engine/editor/icons/Vector4.svg
+++ b/engine/editor/icons/Vector4.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f066bd" d="M11 3v5h3v3h2V2h-2v4h-1V3zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4zm9 6V8H9a1 1 0 0 1 0-2h1V4H9a3 3 0 0 0 0 6z"/><path fill="#fff" fill-opacity=".4" d="M11 3v5h3v3h2V2h-2v4h-1V3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f066bd" d="M11 3v5h3v3h2V2h-2v4h-1V3zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4zm9 6V8H9a1 1 0 0 1 0-2h1V4H9a3 3 0 0 0 0 6z"/><path fill="#fff" fill-opacity=".4" d="M11 3v5h3v3h2V2h-2v4h-1V3z"/></svg>
diff --git a/engine/editor/icons/Vector4i.svg b/engine/editor/icons/Vector4i.svg
index 40e11bd1..d1679482 100644
--- a/engine/editor/icons/Vector4i.svg
+++ b/engine/editor/icons/Vector4i.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f066bd" d="M7 3v5h3v3h2V2h-2v4H9V3zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4z"/><path fill="#fff" fill-opacity=".4" d="M7 3v5h3v3h2V2h-2v4H9V3z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#f066bd" d="M7 3v5h3v3h2V2h-2v4H9V3zM1 4v6h2a3 3 0 0 0 3-3V4H4v3a1 1 0 0 1-1 1V4z"/><path fill="#fff" fill-opacity=".4" d="M7 3v5h3v3h2V2h-2v4H9V3z"/><path fill="#5abbef" d="M13 2v2h2V2zm0 4v4h2V6z"/></svg>
diff --git a/engine/editor/icons/VehicleBody3D.svg b/engine/editor/icons/VehicleBody3D.svg
index 80393c13..d82d8040 100644
--- a/engine/editor/icons/VehicleBody3D.svg
+++ b/engine/editor/icons/VehicleBody3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M5 3a1 1 0 0 0-1 .75L3 7H1v4h1.05A2.5 2.5 0 0 1 4.5 9a2.5 2.5 0 0 1 2.45 2h2.1a2.5 2.5 0 0 1 2.45-2 2.5 2.5 0 0 1 2.45 2H15V7h-4V3zm1 1h4v3H6zm-1.5 6a1.5 1.5 0 0 0 0 3 1.5 1.5 0 0 0 0-3zm7 0a1.5 1.5 0 0 0 0 3 1.5 1.5 0 0 0 0-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M5 3a1 1 0 0 0-1 .75L3 7H1v4h1.05A2.5 2.5 0 0 1 4.5 9a2.5 2.5 0 0 1 2.45 2h2.1a2.5 2.5 0 0 1 2.45-2 2.5 2.5 0 0 1 2.45 2H15V7h-4V3zm1 1h4v3H6zm-1.5 6a1.5 1.5 0 0 0 0 3 1.5 1.5 0 0 0 0-3zm7 0a1.5 1.5 0 0 0 0 3 1.5 1.5 0 0 0 0-3z"/></svg>
diff --git a/engine/editor/icons/VehicleWheel3D.svg b/engine/editor/icons/VehicleWheel3D.svg
index 5f978721..09d654e8 100644
--- a/engine/editor/icons/VehicleWheel3D.svg
+++ b/engine/editor/icons/VehicleWheel3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm0 2a5 5 0 0 1 0 10A5 5 0 0 1 8 3zm0 1a4 4 0 0 0 0 8 4 4 0 0 0 0-8zm0 1a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM6 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM8 9a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm0 2a5 5 0 0 1 0 10A5 5 0 0 1 8 3zm0 1a4 4 0 0 0 0 8 4 4 0 0 0 0-8zm0 1a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM6 7a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM8 9a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/VideoStream.svg b/engine/editor/icons/VideoStream.svg
index c0dc686a..a82e94df 100644
--- a/engine/editor/icons/VideoStream.svg
+++ b/engine/editor/icons/VideoStream.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="m12 2 a-1 1 0 0 1 0 2a 8 8 0 0 0-8 8a-1 1 0 0 1-2 0a10 10 0 0 1 10-10zm0 4A-1 1 0 0 1 12 8a4 4 0 0 0-4 4A-1 1 0 0 1 6 12a6 6 0 0 1 6-6zm-2 4.5 a.667.667 0 0 1 1-0.566l2.667 1.674a.667.667 0 0 1 0 1.149l-2.667 1.674a.667 0.667 0 0 1-1-.566z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="m12 2 a-1 1 0 0 1 0 2a 8 8 0 0 0-8 8a-1 1 0 0 1-2 0a10 10 0 0 1 10-10zm0 4A-1 1 0 0 1 12 8a4 4 0 0 0-4 4A-1 1 0 0 1 6 12a6 6 0 0 1 6-6zm-2 4.5 a.667.667 0 0 1 1-0.566l2.667 1.674a.667.667 0 0 1 0 1.149l-2.667 1.674a.667 0.667 0 0 1-1-.566z"/></svg>
diff --git a/engine/editor/icons/VideoStreamPlayer.svg b/engine/editor/icons/VideoStreamPlayer.svg
index 3252eccc..50115085 100644
--- a/engine/editor/icons/VideoStreamPlayer.svg
+++ b/engine/editor/icons/VideoStreamPlayer.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v8H3zm3 2v4l4-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h10v8H3zm3 2v4l4-2z"/></svg>
diff --git a/engine/editor/icons/VideoStreamTheora.svg b/engine/editor/icons/VideoStreamTheora.svg
index 1b5b5b16..72d12de4 100644
--- a/engine/editor/icons/VideoStreamTheora.svg
+++ b/engine/editor/icons/VideoStreamTheora.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="2" y2="14" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff8dbc"/><stop offset=".4" stop-color="#7260ff"/><stop offset=".6" stop-color="#7260ff"/><stop offset="1" stop-color="#74c9ff"/></linearGradient><path fill="url(#a)" d="M15 1H1v1h2v2H1v8h2v2H1v1h14v-1h-2v-2h2V4h-2V2h2zm-4 1v2H9V2zm0 10v2H9v-2zM7 2v2H5V2zm0 10v2H5v-2zM6 6.107a.75.75 0 0 1 1.125-.637l3 1.883a.75.75 0 0 1 0 1.293l-3 1.883A.75.75 0 0 1 6 9.892z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" x2="0" y1="2" y2="14" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff8dbc"/><stop offset=".4" stop-color="#7260ff"/><stop offset=".6" stop-color="#7260ff"/><stop offset="1" stop-color="#74c9ff"/></linearGradient><path fill="url(#a)" d="M15 1H1v1h2v2H1v8h2v2H1v1h14v-1h-2v-2h2V4h-2V2h2zm-4 1v2H9V2zm0 10v2H9v-2zM7 2v2H5V2zm0 10v2H5v-2zM6 6.107a.75.75 0 0 1 1.125-.637l3 1.883a.75.75 0 0 1 0 1.293l-3 1.883A.75.75 0 0 1 6 9.892z"/></svg>
diff --git a/engine/editor/icons/Viewport.svg b/engine/editor/icons/Viewport.svg
index f4cfa0cd..0dc3f064 100644
--- a/engine/editor/icons/Viewport.svg
+++ b/engine/editor/icons/Viewport.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="12.75" height="10.75" x="1.625" y="2.625" fill="none" stroke="gray" stroke-width="1.25" rx="1.5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="12.75" height="10.75" x="1.625" y="2.625" fill="none" stroke="gray" stroke-width="1.25" rx="1.5"/></svg>
diff --git a/engine/editor/icons/ViewportSpeed.svg b/engine/editor/icons/ViewportSpeed.svg
index f4545af0..abe4e064 100644
--- a/engine/editor/icons/ViewportSpeed.svg
+++ b/engine/editor/icons/ViewportSpeed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.029 0a2 2 0 0 0-2 2v2.31a2 2 0 0 0-2.895 2.334l.996 2.989a2 2 0 0 0 1.106 1.158L.933 12.328a2 2 0 0 0 2.217 3.328l4.101-2.734.986 1.972a2 2 0 0 0 2.422 1.004l3-1a2 2 0 0 0 .594-3.441 2 2 0 0 0 .591-2.36l-1-2A2 2 0 0 0 12.029 6h-.42a2 2 0 0 0 .42-1V2a2 2 0 0 0-2-2z"/><path fill="#fff" d="M6.029 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h1v.99a1 1 0 0 0-.317.063l-2.05.683-.684-2.05a1 1 0 0 0-1.899.63l1 3a1 1 0 0 0 1.266.633l1.683-.56v.61c0 .042.02.076.024.116l-4.578 3.053a1 1 0 1 0 1.11 1.664L7.64 11.46l1.494 2.986a1 1 0 0 0 1.21.502l3-1a1 1 0 1 0-.632-1.896l-2.178.724-.974-1.95a.981.981 0 0 0 .468-.827V9h1.383l.723 1.447a1 1 0 1 0 1.789-.894l-1-2A1 1 0 0 0 12.028 7h-3V6h1a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm0 2h1v2h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M6.029 0a2 2 0 0 0-2 2v2.31a2 2 0 0 0-2.895 2.334l.996 2.989a2 2 0 0 0 1.106 1.158L.933 12.328a2 2 0 0 0 2.217 3.328l4.101-2.734.986 1.972a2 2 0 0 0 2.422 1.004l3-1a2 2 0 0 0 .594-3.441 2 2 0 0 0 .591-2.36l-1-2A2 2 0 0 0 12.029 6h-.42a2 2 0 0 0 .42-1V2a2 2 0 0 0-2-2z"/><path fill="#fff" d="M6.029 1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h1v.99a1 1 0 0 0-.317.063l-2.05.683-.684-2.05a1 1 0 0 0-1.899.63l1 3a1 1 0 0 0 1.266.633l1.683-.56v.61c0 .042.02.076.024.116l-4.578 3.053a1 1 0 1 0 1.11 1.664L7.64 11.46l1.494 2.986a1 1 0 0 0 1.21.502l3-1a1 1 0 1 0-.632-1.896l-2.178.724-.974-1.95a.981.981 0 0 0 .468-.827V9h1.383l.723 1.447a1 1 0 1 0 1.789-.894l-1-2A1 1 0 0 0 12.028 7h-3V6h1a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm0 2h1v2h-1z"/></svg>
diff --git a/engine/editor/icons/ViewportTexture.svg b/engine/editor/icons/ViewportTexture.svg
index fa0f6e6f..de475f65 100644
--- a/engine/editor/icons/ViewportTexture.svg
+++ b/engine/editor/icons/ViewportTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="12.75" height="10.75" x="1.625" y="2.625" fill="none" stroke="#e0e0e0" stroke-width="1.25" rx="1.5"/><path fill="#e0e0e0" d="M9 6v1H8v1H6v1H5v1H4v1h8V9h-1V7h-1V6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="12.75" height="10.75" x="1.625" y="2.625" fill="none" stroke="#e0e0e0" stroke-width="1.25" rx="1.5"/><path fill="#e0e0e0" d="M9 6v1H8v1H6v1H5v1H4v1h8V9h-1V7h-1V6z"/></svg>
diff --git a/engine/editor/icons/ViewportZoom.svg b/engine/editor/icons/ViewportZoom.svg
index b15b3fa6..85cb917c 100644
--- a/engine/editor/icons/ViewportZoom.svg
+++ b/engine/editor/icons/ViewportZoom.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M10 1.6a5.96 5.96 0 1 0-1.465 9.763l3.8 3.8a1 1 0 0 0 1.414 0l1.414-1.414a1 1 0 0 0 0-1.414l-3.8-3.8A5.85 5.85 0 0 0 11.576 8H13a1 1 0 0 0 1-1V6h1a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1h-1V1a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1z"/><path fill="#fff" d="M6 1a5 5 0 1 0 2.752 9.166l4.318 4.318 1.414-1.414-4.318-4.318a5 5 0 0 0 .41-.752H10V6H9a3 3 0 1 1-1-2.232V2h.99A5 5 0 0 0 6 1zm5 0v2H9v2h2v2h2V5h2V3h-2V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M10 1.6a5.96 5.96 0 1 0-1.465 9.763l3.8 3.8a1 1 0 0 0 1.414 0l1.414-1.414a1 1 0 0 0 0-1.414l-3.8-3.8A5.85 5.85 0 0 0 11.576 8H13a1 1 0 0 0 1-1V6h1a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1h-1V1a1 1 0 0 0-1-1h-2a1 1 0 0 0-1 1z"/><path fill="#fff" d="M6 1a5 5 0 1 0 2.752 9.166l4.318 4.318 1.414-1.414-4.318-4.318a5 5 0 0 0 .41-.752H10V6H9a3 3 0 1 1-1-2.232V2h.99A5 5 0 0 0 6 1zm5 0v2H9v2h2v2h2V5h2V3h-2V1z"/></svg>
diff --git a/engine/editor/icons/VisibleOnScreenEnabler2D.svg b/engine/editor/icons/VisibleOnScreenEnabler2D.svg
index eda09a5c..211a3949 100644
--- a/engine/editor/icons/VisibleOnScreenEnabler2D.svg
+++ b/engine/editor/icons/VisibleOnScreenEnabler2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v3h1V2h2V1zm11 0v1h2v2h1V1zM8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-7 6v3h3v-1H2v-2zm13 0v2h-2v1h3v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v3h1V2h2V1zm11 0v1h2v2h1V1zM8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-7 6v3h3v-1H2v-2zm13 0v2h-2v1h3v-3z"/></svg>
diff --git a/engine/editor/icons/VisibleOnScreenEnabler3D.svg b/engine/editor/icons/VisibleOnScreenEnabler3D.svg
index c22e0413..6e5b6c8c 100644
--- a/engine/editor/icons/VisibleOnScreenEnabler3D.svg
+++ b/engine/editor/icons/VisibleOnScreenEnabler3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M1 1v3h1V2h2V1zm11 0v1h2v2h1V1zM8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-7 6v3h3v-1H2v-2zm13 0v2h-2v1h3v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M1 1v3h1V2h2V1zm11 0v1h2v2h1V1zM8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm-7 6v3h3v-1H2v-2zm13 0v2h-2v1h3v-3z"/></svg>
diff --git a/engine/editor/icons/VisibleOnScreenNotifier2D.svg b/engine/editor/icons/VisibleOnScreenNotifier2D.svg
index 7f5b7982..c2ce7727 100644
--- a/engine/editor/icons/VisibleOnScreenNotifier2D.svg
+++ b/engine/editor/icons/VisibleOnScreenNotifier2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M12 1v6h2V1zM8 3C5.443 3 2.21 4.948 1.045 8.705a1 1 0 0 0 0 .55C2.163 13.211 5.5 15 8 15c1.492 0 3.273-.652 4.712-2H10v-.541a4 4 0 1 1 0-6.918V3.359A6.121 6.121 0 0 0 8 3zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm4 2v2h2V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M12 1v6h2V1zM8 3C5.443 3 2.21 4.948 1.045 8.705a1 1 0 0 0 0 .55C2.163 13.211 5.5 15 8 15c1.492 0 3.273-.652 4.712-2H10v-.541a4 4 0 1 1 0-6.918V3.359A6.121 6.121 0 0 0 8 3zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm4 2v2h2V9z"/></svg>
diff --git a/engine/editor/icons/VisibleOnScreenNotifier3D.svg b/engine/editor/icons/VisibleOnScreenNotifier3D.svg
index 08598def..fb5abfd8 100644
--- a/engine/editor/icons/VisibleOnScreenNotifier3D.svg
+++ b/engine/editor/icons/VisibleOnScreenNotifier3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M12 1v6h2V1zM8 3C5.443 3 2.21 4.948 1.045 8.705a1 1 0 0 0 0 .55C2.163 13.211 5.5 15 8 15c1.492 0 3.273-.652 4.712-2H10v-.541a4 4 0 1 1 0-6.918V3.359A6.121 6.121 0 0 0 8 3zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm4 2v2h2V9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M12 1v6h2V1zM8 3C5.443 3 2.21 4.948 1.045 8.705a1 1 0 0 0 0 .55C2.163 13.211 5.5 15 8 15c1.492 0 3.273-.652 4.712-2H10v-.541a4 4 0 1 1 0-6.918V3.359A6.121 6.121 0 0 0 8 3zm0 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm4 2v2h2V9z"/></svg>
diff --git a/engine/editor/icons/VisualInstance3D.svg b/engine/editor/icons/VisualInstance3D.svg
index 8f5d9876..e0aed3c3 100644
--- a/engine/editor/icons/VisualInstance3D.svg
+++ b/engine/editor/icons/VisualInstance3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#b56d6d"><circle cx="3" cy="3" r="2"/><circle cx="13" cy="3" r="2"/><circle cx="13" cy="13" r="2"/><circle cx="3" cy="13" r="2"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#b56d6d"><circle cx="3" cy="3" r="2"/><circle cx="13" cy="3" r="2"/><circle cx="13" cy="13" r="2"/><circle cx="3" cy="13" r="2"/></g></svg>
diff --git a/engine/editor/icons/VisualShader.svg b/engine/editor/icons/VisualShader.svg
index d4d5a45b..99280e06 100644
--- a/engine/editor/icons/VisualShader.svg
+++ b/engine/editor/icons/VisualShader.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 10v6h2a3 3 0 0 0 3-3v-3H6v3a1 1 0 0 1-1 1v-4zm8 0a2 2 0 0 0 0 4H9v2h2a2 2 0 0 0 0-4h2v-2zM2 1a1 1 0 0 0-1 1v7h2V3h6v3a1 1 0 0 0 1 1h3v2h2V6l-5-5z"/><path fill="#ffe345" d="M4 6h2v1H4z"/><path fill="#80ff45" d="M8 8h4v1H8z"/><path fill="#45d7ff" d="M7 6h1v1H7z"/><path fill="#ff4545" d="M4 4h3v1H4z"/><path fill="#45ffa2" d="M4 8h3v1H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 10v6h2a3 3 0 0 0 3-3v-3H6v3a1 1 0 0 1-1 1v-4zm8 0a2 2 0 0 0 0 4H9v2h2a2 2 0 0 0 0-4h2v-2zM2 1a1 1 0 0 0-1 1v7h2V3h6v3a1 1 0 0 0 1 1h3v2h2V6l-5-5z"/><path fill="#ffe345" d="M4 6h2v1H4z"/><path fill="#80ff45" d="M8 8h4v1H8z"/><path fill="#45d7ff" d="M7 6h1v1H7z"/><path fill="#ff4545" d="M4 4h3v1H4z"/><path fill="#45ffa2" d="M4 8h3v1H4z"/></svg>
diff --git a/engine/editor/icons/VisualShaderGraphTextureUniform.svg b/engine/editor/icons/VisualShaderGraphTextureUniform.svg
index 3c469ae2..dfa01ecc 100644
--- a/engine/editor/icons/VisualShaderGraphTextureUniform.svg
+++ b/engine/editor/icons/VisualShaderGraphTextureUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeBooleanUniform.svg b/engine/editor/icons/VisualShaderNodeBooleanUniform.svg
index b631d240..f6b228a9 100644
--- a/engine/editor/icons/VisualShaderNodeBooleanUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeBooleanUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#6f91f0" d="M2 0a2 2 0 0 0-2 2v2h2v2a3 3 0 0 1 2.5 1.346A3 3 0 0 1 9 6.768a3 3 0 0 1 4 0V4h2v5a1 1 0 0 0 1 1V2a2 2 0 0 0-2-2zm0 8v2a1 1 0 0 0 0-2zm5 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm4 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-6.5 2.654A3 3 0 0 1 2 12H0v2a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-2a3 3 0 0 1-2.5-1.346 3 3 0 0 1-4.5.578 3 3 0 0 1-4.5-.578z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#6f91f0" d="M2 0a2 2 0 0 0-2 2v2h2v2a3 3 0 0 1 2.5 1.346A3 3 0 0 1 9 6.768a3 3 0 0 1 4 0V4h2v5a1 1 0 0 0 1 1V2a2 2 0 0 0-2-2zm0 8v2a1 1 0 0 0 0-2zm5 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm4 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm-6.5 2.654A3 3 0 0 1 2 12H0v2a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-2a3 3 0 0 1-2.5-1.346 3 3 0 0 1-4.5.578 3 3 0 0 1-4.5-.578z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeColorConstant.svg b/engine/editor/icons/VisualShaderNodeColorConstant.svg
index 82f9c229..049884cf 100644
--- a/engine/editor/icons/VisualShaderNodeColorConstant.svg
+++ b/engine/editor/icons/VisualShaderNodeColorConstant.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><g fill-opacity=".4"><path fill="#fff" d="M3.04 5.52a4 4 0 1 0 3.958 6.94 4 4 0 1 0 3.965-6.942 4 4 0 1 0-7.923 0z"/><path fill="#fff" d="M4.21 6.106A3 3 0 1 0 7 11.233 3 3 0 1 0 9.785 6.11a3 3 0 1 0-5.575 0z"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><g fill-opacity=".4"><path fill="#fff" d="M3.04 5.52a4 4 0 1 0 3.958 6.94 4 4 0 1 0 3.965-6.942 4 4 0 1 0-7.923 0z"/><path fill="#fff" d="M4.21 6.106A3 3 0 1 0 7 11.233 3 3 0 1 0 9.785 6.11a3 3 0 1 0-5.575 0z"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/></g></svg>
diff --git a/engine/editor/icons/VisualShaderNodeColorOp.svg b/engine/editor/icons/VisualShaderNodeColorOp.svg
index 5b2957d3..3c5bdf29 100644
--- a/engine/editor/icons/VisualShaderNodeColorOp.svg
+++ b/engine/editor/icons/VisualShaderNodeColorOp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#fff" d="M4 1a1 1 0 0 0-1 1v1H1v2h2v4H1v2h2v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8h2V6h-2V2a1 1 0 0 0-1-1z"/><g fill-opacity=".863"><path fill="red" d="M5 3h4v2H5z"/><path fill="#0f0" d="M5 6h4v2H5z"/><path fill="#00f" d="M5 9h4v2H5z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#fff" d="M4 1a1 1 0 0 0-1 1v1H1v2h2v4H1v2h2v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8h2V6h-2V2a1 1 0 0 0-1-1z"/><g fill-opacity=".863"><path fill="red" d="M5 3h4v2H5z"/><path fill="#0f0" d="M5 6h4v2H5z"/><path fill="#00f" d="M5 9h4v2H5z"/></g></svg>
diff --git a/engine/editor/icons/VisualShaderNodeColorUniform.svg b/engine/editor/icons/VisualShaderNodeColorUniform.svg
index 071813c5..85c7d042 100644
--- a/engine/editor/icons/VisualShaderNodeColorUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeColorUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#fff" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/><g fill-opacity=".4"><path fill="#fff" d="M7 2a3 3 0 0 0-3 3 3 3 0 0 0 .21 1.106A3 3 0 0 0 2 9a3 3 0 0 0 3 3 3 3 0 0 0 2-.767A3 3 0 0 0 9 12a3 3 0 0 0 3-3 3 3 0 0 0-2.215-2.89A3 3 0 0 0 10 5a3 3 0 0 0-3-3z"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#fff" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/><g fill-opacity=".4"><path fill="#fff" d="M7 2a3 3 0 0 0-3 3 3 3 0 0 0 .21 1.106A3 3 0 0 0 2 9a3 3 0 0 0 3 3 3 3 0 0 0 2-.767A3 3 0 0 0 9 12a3 3 0 0 0 3-3 3 3 0 0 0-2.215-2.89A3 3 0 0 0 10 5a3 3 0 0 0-3-3z"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/><circle cx="7" cy="5" r="3" fill="red"/><circle cx="5" cy="9" r="3" fill="#00f"/><circle cx="9" cy="9" r="3" fill="#0f0"/></g></svg>
diff --git a/engine/editor/icons/VisualShaderNodeComment.svg b/engine/editor/icons/VisualShaderNodeComment.svg
index 9e1f6a71..75130c58 100644
--- a/engine/editor/icons/VisualShaderNodeComment.svg
+++ b/engine/editor/icons/VisualShaderNodeComment.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#e0e0e0" d="m3 1v2h-2v2h2v4h-2v2h2v2h2v-2h4v2h2v-2h2v-2h-2v-4h2v-2h-2v-2h-2v2h-4v-2zm2 4h4v4h-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#e0e0e0" d="m3 1v2h-2v2h2v4h-2v2h2v2h2v-2h4v2h2v-2h2v-2h-2v-4h2v-2h-2v-2h-2v2h-4v-2zm2 4h4v4h-4z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeCubemap.svg b/engine/editor/icons/VisualShaderNodeCubemap.svg
index e680ccd5..1e1ff259 100644
--- a/engine/editor/icons/VisualShaderNodeCubemap.svg
+++ b/engine/editor/icons/VisualShaderNodeCubemap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M7 3.5 4 5l3 1.5L10 5zM3.5 6v3l2.9 1.45v-3zm7 0L7.6 7.45v3L10.5 9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M7 3.5 4 5l3 1.5L10 5zM3.5 6v3l2.9 1.45v-3zm7 0L7.6 7.45v3L10.5 9z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeCubemapUniform.svg b/engine/editor/icons/VisualShaderNodeCubemapUniform.svg
index e9fa2060..d4d7c9f2 100644
--- a/engine/editor/icons/VisualShaderNodeCubemapUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeCubemapUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm4.973 2a.714.714 0 0 1 .347.074l4.286 2.143a.714.714 0 0 1 .394.64v4.286a.714.714 0 0 1-.394.638L7.32 11.924a.714.714 0 0 1-.64 0L2.395 9.78A.714.714 0 0 1 2 9.143V4.857a.714.714 0 0 1 .395-.64L6.68 2.074A.714.714 0 0 1 6.973 2zM7 3.514 4.31 4.858 7 6.2l2.69-1.343zM3.428 6.012v2.69l2.857 1.427V7.44zm7.144 0-2.857 1.43v2.687L10.572 8.7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm4.973 2a.714.714 0 0 1 .347.074l4.286 2.143a.714.714 0 0 1 .394.64v4.286a.714.714 0 0 1-.394.638L7.32 11.924a.714.714 0 0 1-.64 0L2.395 9.78A.714.714 0 0 1 2 9.143V4.857a.714.714 0 0 1 .395-.64L6.68 2.074A.714.714 0 0 1 6.973 2zM7 3.514 4.31 4.858 7 6.2l2.69-1.343zM3.428 6.012v2.69l2.857 1.427V7.44zm7.144 0-2.857 1.43v2.687L10.572 8.7z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeCurveTexture.svg b/engine/editor/icons/VisualShaderNodeCurveTexture.svg
index f54192b8..e02c1988 100644
--- a/engine/editor/icons/VisualShaderNodeCurveTexture.svg
+++ b/engine/editor/icons/VisualShaderNodeCurveTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#f9f9f9" stroke-linecap="round" stroke-width="2" d="M2 11c8 0 9 0 9-9"/><path fill="#5fb2ff" d="M10.8 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zM6 8.8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#f9f9f9" stroke-linecap="round" stroke-width="2" d="M2 11c8 0 9 0 9-9"/><path fill="#5fb2ff" d="M10.8 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zM6 8.8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeCurveXYZTexture.svg b/engine/editor/icons/VisualShaderNodeCurveXYZTexture.svg
index f54192b8..e02c1988 100644
--- a/engine/editor/icons/VisualShaderNodeCurveXYZTexture.svg
+++ b/engine/editor/icons/VisualShaderNodeCurveXYZTexture.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#f9f9f9" stroke-linecap="round" stroke-width="2" d="M2 11c8 0 9 0 9-9"/><path fill="#5fb2ff" d="M10.8 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zM6 8.8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#f9f9f9" stroke-linecap="round" stroke-width="2" d="M2 11c8 0 9 0 9-9"/><path fill="#5fb2ff" d="M10.8 4a2 2 0 0 0 0 4 2 2 0 0 0 0-4zM6 8.8a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeExpression.svg b/engine/editor/icons/VisualShaderNodeExpression.svg
index 8ce22a2c..e16f6ce6 100644
--- a/engine/editor/icons/VisualShaderNodeExpression.svg
+++ b/engine/editor/icons/VisualShaderNodeExpression.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#cf68ea" d="M4.5 3A3.5 3.5 0 0 0 1 6.5V13h2.5v-2.5H6V8H3.5V6.5a1 1 0 0 1 1-1H6V3zm3 0L10 8l-2.5 5H10l1.25-2.5L12.5 13H15l-2.5-5L15 3h-2.5l-1.25 2.5L10 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#cf68ea" d="M4.5 3A3.5 3.5 0 0 0 1 6.5V13h2.5v-2.5H6V8H3.5V6.5a1 1 0 0 1 1-1H6V3zm3 0L10 8l-2.5 5H10l1.25-2.5L12.5 13H15l-2.5-5L15 3h-2.5l-1.25 2.5L10 3z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeFloatFunc.svg b/engine/editor/icons/VisualShaderNodeFloatFunc.svg
index 6761f009..a00bc794 100644
--- a/engine/editor/icons/VisualShaderNodeFloatFunc.svg
+++ b/engine/editor/icons/VisualShaderNodeFloatFunc.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#cf68ea" stroke-width="2" d="M3 10 a 2 2 0 0 0 4 0v-6a2 2 0 0 1 4 0v1 M4 7h6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#cf68ea" stroke-width="2" d="M3 10 a 2 2 0 0 0 4 0v-6a2 2 0 0 1 4 0v1 M4 7h6"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeFloatOp.svg b/engine/editor/icons/VisualShaderNodeFloatOp.svg
index 00e869a9..b84aa7a3 100644
--- a/engine/editor/icons/VisualShaderNodeFloatOp.svg
+++ b/engine/editor/icons/VisualShaderNodeFloatOp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M4 1a1 1 0 0 0-1 1v1H1v2h2v4H1v2h2v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8h2V6h-2V2a1 1 0 0 0-1-1zm1 3 4 3-4 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M4 1a1 1 0 0 0-1 1v1H1v2h2v4H1v2h2v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8h2V6h-2V2a1 1 0 0 0-1-1zm1 3 4 3-4 3z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeFloatUniform.svg b/engine/editor/icons/VisualShaderNodeFloatUniform.svg
index 1a8ccd3f..971c1999 100644
--- a/engine/editor/icons/VisualShaderNodeFloatUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeFloatUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm4 2h5v2H6a1 1 0 0 0 0 2h2a3 3 0 1 1 0 6H3v-2h5a1 1 0 0 0 0-2H6a3 3 0 1 1 0-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm4 2h5v2H6a1 1 0 0 0 0 2h2a3 3 0 1 1 0 6H3v-2h5a1 1 0 0 0 0-2H6a3 3 0 1 1 0-6z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeGlobalExpression.svg b/engine/editor/icons/VisualShaderNodeGlobalExpression.svg
index 81256467..e5c9bfd1 100644
--- a/engine/editor/icons/VisualShaderNodeGlobalExpression.svg
+++ b/engine/editor/icons/VisualShaderNodeGlobalExpression.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#35d4f4" d="M4.5 3A3.5 3.5 0 0 0 1 6.5V13h2.5v-2.5H6V8H3.5V6.5a1 1 0 0 1 1-1H6V3zm3 0L10 8l-2.5 5H10l1.25-2.5L12.5 13H15l-2.5-5L15 3h-2.5l-1.25 2.5L10 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#35d4f4" d="M4.5 3A3.5 3.5 0 0 0 1 6.5V13h2.5v-2.5H6V8H3.5V6.5a1 1 0 0 1 1-1H6V3zm3 0L10 8l-2.5 5H10l1.25-2.5L12.5 13H15l-2.5-5L15 3h-2.5l-1.25 2.5L10 3z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeInput.svg b/engine/editor/icons/VisualShaderNodeInput.svg
index 9bf47add..4946fd5f 100644
--- a/engine/editor/icons/VisualShaderNodeInput.svg
+++ b/engine/editor/icons/VisualShaderNodeInput.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><circle cx="7" cy="7" r="6" fill="#f9f9f9"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><circle cx="7" cy="7" r="6" fill="#f9f9f9"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeIntFunc.svg b/engine/editor/icons/VisualShaderNodeIntFunc.svg
index 6761f009..a00bc794 100644
--- a/engine/editor/icons/VisualShaderNodeIntFunc.svg
+++ b/engine/editor/icons/VisualShaderNodeIntFunc.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#cf68ea" stroke-width="2" d="M3 10 a 2 2 0 0 0 4 0v-6a2 2 0 0 1 4 0v1 M4 7h6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#cf68ea" stroke-width="2" d="M3 10 a 2 2 0 0 0 4 0v-6a2 2 0 0 1 4 0v1 M4 7h6"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeIntOp.svg b/engine/editor/icons/VisualShaderNodeIntOp.svg
index 00e869a9..b84aa7a3 100644
--- a/engine/editor/icons/VisualShaderNodeIntOp.svg
+++ b/engine/editor/icons/VisualShaderNodeIntOp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M4 1a1 1 0 0 0-1 1v1H1v2h2v4H1v2h2v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8h2V6h-2V2a1 1 0 0 0-1-1zm1 3 4 3-4 3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M4 1a1 1 0 0 0-1 1v1H1v2h2v4H1v2h2v1a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V8h2V6h-2V2a1 1 0 0 0-1-1zm1 3 4 3-4 3z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeIntUniform.svg b/engine/editor/icons/VisualShaderNodeIntUniform.svg
index 1a8ccd3f..971c1999 100644
--- a/engine/editor/icons/VisualShaderNodeIntUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeIntUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm4 2h5v2H6a1 1 0 0 0 0 2h2a3 3 0 1 1 0 6H3v-2h5a1 1 0 0 0 0-2H6a3 3 0 1 1 0-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#cf68ea" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm4 2h5v2H6a1 1 0 0 0 0 2h2a3 3 0 1 1 0 6H3v-2h5a1 1 0 0 0 0-2H6a3 3 0 1 1 0-6z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg b/engine/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg
index 3c469ae2..dfa01ecc 100644
--- a/engine/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeTexture2DArrayUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTexture3DUniform.svg b/engine/editor/icons/VisualShaderNodeTexture3DUniform.svg
index 3c469ae2..dfa01ecc 100644
--- a/engine/editor/icons/VisualShaderNodeTexture3DUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeTexture3DUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTextureUniform.svg b/engine/editor/icons/VisualShaderNodeTextureUniform.svg
index 3c469ae2..dfa01ecc 100644
--- a/engine/editor/icons/VisualShaderNodeTextureUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeTextureUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg b/engine/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg
index 3c469ae2..dfa01ecc 100644
--- a/engine/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg
+++ b/engine/editor/icons/VisualShaderNodeTextureUniformTriplanar.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#eac968" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm0 2h10v10H2zm9 2L7 8 5 6 3 9h8z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTransformCompose.svg b/engine/editor/icons/VisualShaderNodeTransformCompose.svg
index dd78f66e..87232c5a 100644
--- a/engine/editor/icons/VisualShaderNodeTransformCompose.svg
+++ b/engine/editor/icons/VisualShaderNodeTransformCompose.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#77ce57"/><stop offset="1" stop-color="#ea686c"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="m2 2 5 5-5 5m0-5h10"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#77ce57"/><stop offset="1" stop-color="#ea686c"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="m2 2 5 5-5 5m0-5h10"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTransformDecompose.svg b/engine/editor/icons/VisualShaderNodeTransformDecompose.svg
index 410783fd..697e049f 100644
--- a/engine/editor/icons/VisualShaderNodeTransformDecompose.svg
+++ b/engine/editor/icons/VisualShaderNodeTransformDecompose.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ea686c"/><stop offset="1" stop-color="#77ce57"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M12 2 7 7l5 5m0-5H2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ea686c"/><stop offset="1" stop-color="#77ce57"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M12 2 7 7l5 5m0-5H2"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTransformUniform.svg b/engine/editor/icons/VisualShaderNodeTransformUniform.svg
index 6b5759b0..04599f61 100644
--- a/engine/editor/icons/VisualShaderNodeTransformUniform.svg
+++ b/engine/editor/icons/VisualShaderNodeTransformUniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#ea686c" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zM1 1h3v1H2v10h2v1H1zm9 0h3v12h-3v-1h2V2h-2zm1 10H9V6.414L7.707 7.707a1 1 0 0 1-1.414 0L5 6.414V11H3V4a1 1 0 0 1 1.707-.707L7 5.586l2.293-2.293A1 1 0 0 1 11 4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#ea686c" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zM1 1h3v1H2v10h2v1H1zm9 0h3v12h-3v-1h2V2h-2zm1 10H9V6.414L7.707 7.707a1 1 0 0 1-1.414 0L5 6.414V11H3V4a1 1 0 0 1 1.707-.707L7 5.586l2.293-2.293A1 1 0 0 1 11 4z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeTransformVecMult.svg b/engine/editor/icons/VisualShaderNodeTransformVecMult.svg
index 3b942ae5..ef31e551 100644
--- a/engine/editor/icons/VisualShaderNodeTransformVecMult.svg
+++ b/engine/editor/icons/VisualShaderNodeTransformVecMult.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><g fill="none" stroke-linejoin="round" stroke-width="2"><path stroke="#77ce57" d="m9 4 2 6 2-6"/><path stroke="#ea686c" d="M1 11V4l2 3 2-3v7"/></g><circle cx="7.5" cy="7.5" r="1" fill="#77ce57"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><g fill="none" stroke-linejoin="round" stroke-width="2"><path stroke="#77ce57" d="m9 4 2 6 2-6"/><path stroke="#ea686c" d="M1 11V4l2 3 2-3v7"/></g><circle cx="7.5" cy="7.5" r="1" fill="#77ce57"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeVec3Uniform.svg b/engine/editor/icons/VisualShaderNodeVec3Uniform.svg
index 947def8a..dab366bc 100644
--- a/engine/editor/icons/VisualShaderNodeVec3Uniform.svg
+++ b/engine/editor/icons/VisualShaderNodeVec3Uniform.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#77ce57" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm6 0 3 3-3 3V4H3V2h5zM4.344 5.629 7 10.056l2.656-4.427 1.715 1.03-3.514 5.857a1 1 0 0 1-1.714 0L2.629 6.658z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#77ce57" d="M2 0a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2zm6 0 3 3-3 3V4H3V2h5zM4.344 5.629 7 10.056l2.656-4.427 1.715 1.03-3.514 5.857a1 1 0 0 1-1.714 0L2.629 6.658z"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeVectorCompose.svg b/engine/editor/icons/VisualShaderNodeVectorCompose.svg
index 68c367db..5df835fb 100644
--- a/engine/editor/icons/VisualShaderNodeVectorCompose.svg
+++ b/engine/editor/icons/VisualShaderNodeVectorCompose.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cf68ea"/><stop offset="1" stop-color="#77ce57"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="m2 2 5 5-5 5m0-5h10"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#cf68ea"/><stop offset="1" stop-color="#77ce57"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="m2 2 5 5-5 5m0-5h10"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeVectorDecompose.svg b/engine/editor/icons/VisualShaderNodeVectorDecompose.svg
index beddc124..b00fbba2 100644
--- a/engine/editor/icons/VisualShaderNodeVectorDecompose.svg
+++ b/engine/editor/icons/VisualShaderNodeVectorDecompose.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#77ce57"/><stop offset="1" stop-color="#cf68ea"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M12 2 7 7l5 5m0-5H2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><linearGradient id="a" x1="1" x2="13" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#77ce57"/><stop offset="1" stop-color="#cf68ea"/></linearGradient><path fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width="2" d="M12 2 7 7l5 5m0-5H2"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeVectorDistance.svg b/engine/editor/icons/VisualShaderNodeVectorDistance.svg
index 415e14e2..9701e153 100644
--- a/engine/editor/icons/VisualShaderNodeVectorDistance.svg
+++ b/engine/editor/icons/VisualShaderNodeVectorDistance.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#77ce57" stroke-linecap="round" stroke-width="2" d="M2 12 12 2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#77ce57" stroke-linecap="round" stroke-width="2" d="M2 12 12 2"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeVectorFunc.svg b/engine/editor/icons/VisualShaderNodeVectorFunc.svg
index 60a90c66..c6b62c98 100644
--- a/engine/editor/icons/VisualShaderNodeVectorFunc.svg
+++ b/engine/editor/icons/VisualShaderNodeVectorFunc.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#77ce57" stroke-width="2" d="M3 10 a 2 2 0 0 0 4 0v-6a2 2 0 0 1 4 0v1 M4 7h6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="none" stroke="#77ce57" stroke-width="2" d="M3 10 a 2 2 0 0 0 4 0v-6a2 2 0 0 1 4 0v1 M4 7h6"/></svg>
diff --git a/engine/editor/icons/VisualShaderNodeVectorLen.svg b/engine/editor/icons/VisualShaderNodeVectorLen.svg
index 8d458a69..f396d610 100644
--- a/engine/editor/icons/VisualShaderNodeVectorLen.svg
+++ b/engine/editor/icons/VisualShaderNodeVectorLen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#77ce57" d="M8 0v2H3v2h5v2l3-3zM4.344 5.627l-1.715 1.03 3.514 5.857a1 1 0 0 0 1.714 0l3.514-5.858-1.715-1.029L7 10.055z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path fill="#77ce57" d="M8 0v2H3v2h5v2l3-3zM4.344 5.627l-1.715 1.03 3.514 5.857a1 1 0 0 0 1.714 0l3.514-5.858-1.715-1.029L7 10.055z"/></svg>
diff --git a/engine/editor/icons/VisualShaderPort.svg b/engine/editor/icons/VisualShaderPort.svg
index 1590ded2..1bff21d1 100644
--- a/engine/editor/icons/VisualShaderPort.svg
+++ b/engine/editor/icons/VisualShaderPort.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><path fill="#fff" d="M2 0a1 1 0 0 0-1 1v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><path fill="#fff" d="M2 0a1 1 0 0 0-1 1v8a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 2 0z"/></svg>
diff --git a/engine/editor/icons/VoxelGI.svg b/engine/editor/icons/VoxelGI.svg
index b87b8613..eb9e6cff 100644
--- a/engine/editor/icons/VoxelGI.svg
+++ b/engine/editor/icons/VoxelGI.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4v-2H3V3h9V1zm7 11a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.541a4 4 0 1 0-4 0zm2-6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-1 8v1h2v-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4v-2H3V3h9V1zm7 11a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.541a4 4 0 1 0-4 0zm2-6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-1 8v1h2v-1z"/></svg>
diff --git a/engine/editor/icons/VoxelGIData.svg b/engine/editor/icons/VoxelGIData.svg
index af1ef252..05c30150 100644
--- a/engine/editor/icons/VoxelGIData.svg
+++ b/engine/editor/icons/VoxelGIData.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4v-2H3V3h9V1zm7 11a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.541a4 4 0 1 0-4 0zm2-6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-1 8v1h2v-1zM4 4h2v2H4zm0 3h2v2H4zm0 3h2v2H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h4v-2H3V3h9V1zm7 11a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1v-.541a4 4 0 1 0-4 0zm2-6a2 2 0 0 1 0 4 2 2 0 0 1 0-4zm-1 8v1h2v-1zM4 4h2v2H4zm0 3h2v2H4zm0 3h2v2H4z"/></svg>
diff --git a/engine/editor/icons/Warning.svg b/engine/editor/icons/Warning.svg
index 38889a21..747c1bcb 100644
--- a/engine/editor/icons/Warning.svg
+++ b/engine/editor/icons/Warning.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="4" fill="#ffdd65"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="4" fill="#ffdd65"/></svg>
diff --git a/engine/editor/icons/WarningPattern.svg b/engine/editor/icons/WarningPattern.svg
index 3c250b5d..8988abf4 100644
--- a/engine/editor/icons/WarningPattern.svg
+++ b/engine/editor/icons/WarningPattern.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#fff" d="m0 0v8l8-8zm16 0-16 16v8l24-24zm16 0-32 32v8l40-40zm16 0-48 48v8l56-56zm16 0-64 64h8l56-56zm0 16-48 48h8l40-40zm0 16-32 32h8s24-23 24-24zm0 16-16 16h8l8-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path fill="#fff" d="m0 0v8l8-8zm16 0-16 16v8l24-24zm16 0-32 32v8l40-40zm16 0-48 48v8l56-56zm16 0-64 64h8l56-56zm0 16-48 48h8l40-40zm0 16-32 32h8s24-23 24-24zm0 16-16 16h8l8-8z"/></svg>
diff --git a/engine/editor/icons/Window.svg b/engine/editor/icons/Window.svg
index b202613f..5beddbf7 100644
--- a/engine/editor/icons/Window.svg
+++ b/engine/editor/icons/Window.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3 1c-1.1046 0-2 .8954-2 2v1h14v-1c0-1.1046-.89543-2-2-2zm9 1h1v1h-1zm-11 3v8c0 1.1046.89543 2 2 2h10c1.1046 0 2-.8954 2-2v-8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m3 1c-1.1046 0-2 .8954-2 2v1h14v-1c0-1.1046-.89543-2-2-2zm9 1h1v1h-1zm-11 3v8c0 1.1046.89543 2 2 2h10c1.1046 0 2-.8954 2-2v-8z"/></svg>
diff --git a/engine/editor/icons/World2D.svg b/engine/editor/icons/World2D.svg
index 2aba01c9..41014e55 100644
--- a/engine/editor/icons/World2D.svg
+++ b/engine/editor/icons/World2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M2 12c6 0 6 2 12 2V4C8 4 8 2 2 2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" stroke-linejoin="round" stroke-width="2" d="M2 12c6 0 6 2 12 2V4C8 4 8 2 2 2z"/></svg>
diff --git a/engine/editor/icons/World3D.svg b/engine/editor/icons/World3D.svg
index ea0c0378..60167b36 100644
--- a/engine/editor/icons/World3D.svg
+++ b/engine/editor/icons/World3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 2a1 1 0 0 0 0 2 1 1 0 0 0 0-2zM6 5a5 5 0 0 0 0 10A5 5 0 0 0 6 5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M12 2a1 1 0 0 0 0 2 1 1 0 0 0 0-2zM6 5a5 5 0 0 0 0 10A5 5 0 0 0 6 5z"/></svg>
diff --git a/engine/editor/icons/WorldBoundaryShape2D.svg b/engine/editor/icons/WorldBoundaryShape2D.svg
index 8cae40f7..f519e851 100644
--- a/engine/editor/icons/WorldBoundaryShape2D.svg
+++ b/engine/editor/icons/WorldBoundaryShape2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="M1 11h14"/><path stroke-width="1.5" d="M8 10V1.75l2 2m-2-2-2 2"/></g><path fill="#5fb2ff" fill-opacity=".4" d="M0 11h16v5H0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke="#5fb2ff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="M1 11h14"/><path stroke-width="1.5" d="M8 10V1.75l2 2m-2-2-2 2"/></g><path fill="#5fb2ff" fill-opacity=".4" d="M0 11h16v5H0z"/></svg>
diff --git a/engine/editor/icons/WorldBoundaryShape3D.svg b/engine/editor/icons/WorldBoundaryShape3D.svg
index 2a0e8409..af30bdef 100644
--- a/engine/editor/icons/WorldBoundaryShape3D.svg
+++ b/engine/editor/icons/WorldBoundaryShape3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" fill-opacity=".4" d="M0 10h16v6H0z"/><path fill="#5fb2ff" d="m0 10 8 2.5 8-2.5-8-2.5z"/><path fill="#a2d2ff" d="M8 1 5.5 3.5a2.5 1 0 0 0 1.5.9v5.2a1 .4 0 0 0 1 .4z"/><path fill="#2998ff" d="m8 1 2.5 2.5a2.5 1 0 0 1-1.5.9v5.2a1 .4 0 0 1-1 .4V5.25a2.5 1 0 0 1-1-.1V4.4a2.5 1 0 0 0 1 .1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" fill-opacity=".4" d="M0 10h16v6H0z"/><path fill="#5fb2ff" d="m0 10 8 2.5 8-2.5-8-2.5z"/><path fill="#a2d2ff" d="M8 1 5.5 3.5a2.5 1 0 0 0 1.5.9v5.2a1 .4 0 0 0 1 .4z"/><path fill="#2998ff" d="m8 1 2.5 2.5a2.5 1 0 0 1-1.5.9v5.2a1 .4 0 0 1-1 .4V5.25a2.5 1 0 0 1-1-.1V4.4a2.5 1 0 0 0 1 .1z"/></svg>
diff --git a/engine/editor/icons/WorldEnvironment.svg b/engine/editor/icons/WorldEnvironment.svg
index 9cc3d87a..a2c036ec 100644
--- a/engine/editor/icons/WorldEnvironment.svg
+++ b/engine/editor/icons/WorldEnvironment.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" y2="0" gradientUnits="userSpaceOnUse"><stop stop-color="#fc7f7f"/><stop offset=".5" stop-color="#fc7f7f"/><stop stop-color="#8da5f3"/></linearGradient><g fill="none" stroke="url(#a)"><circle cx="8" cy="8" r="6" stroke-width="2"/><path stroke-width="1.5" d="M2 8a6.5 2 0 0 0 12 0M8 2c-3 4-3 8 0 12M8 2c3 4 3 8 0 12"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><linearGradient id="a" y2="0" gradientUnits="userSpaceOnUse"><stop stop-color="#fc7f7f"/><stop offset=".5" stop-color="#fc7f7f"/><stop stop-color="#8da5f3"/></linearGradient><g fill="none" stroke="url(#a)"><circle cx="8" cy="8" r="6" stroke-width="2"/><path stroke-width="1.5" d="M2 8a6.5 2 0 0 0 12 0M8 2c-3 4-3 8 0 12M8 2c3 4 3 8 0 12"/></g></svg>
diff --git a/engine/editor/icons/X509Certificate.svg b/engine/editor/icons/X509Certificate.svg
index 0a71cbb3..db294bbf 100644
--- a/engine/editor/icons/X509Certificate.svg
+++ b/engine/editor/icons/X509Certificate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v10h5.4a3.75 3.75 0 1 1 7.2 0H15V1z"/><path fill="#ff5f5f" d="M8 12.25a3 3 0 1 1 4 0V15l-2-1-2 1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v10h5.4a3.75 3.75 0 1 1 7.2 0H15V1z"/><path fill="#ff5f5f" d="M8 12.25a3 3 0 1 1 4 0V15l-2-1-2 1z"/></svg>
diff --git a/engine/editor/icons/XRAnchor3D.svg b/engine/editor/icons/XRAnchor3D.svg
index e8370e75..1d325830 100644
--- a/engine/editor/icons/XRAnchor3D.svg
+++ b/engine/editor/icons/XRAnchor3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M8 1v9M5 4h6M3.2 7.2a5 4 0 0 0 9.6 0"/><path fill="#fc7f7f" d="M4 12v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M8 1v9M5 4h6M3.2 7.2a5 4 0 0 0 9.6 0"/><path fill="#fc7f7f" d="M4 12v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
diff --git a/engine/editor/icons/XRBodyModifier3D.svg b/engine/editor/icons/XRBodyModifier3D.svg
index 5c4a2138..c4aa17ad 100644
--- a/engine/editor/icons/XRBodyModifier3D.svg
+++ b/engine/editor/icons/XRBodyModifier3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4 12v1c0 .553.448 1 1 1-.552 0-1 .447-1 1v1h1v-1h1v1h1v-1c0-.553-.448-1-1-1 .552 0 1-.447 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.049-.348-.137-.5.088-.152.136-.324.137-.5v-1c0-.553-.447-1-1-1zm1 1h1v1h-1zM12.091 5.286h-3.384v-.715h.722c.396 0 .714-.319.714-.714v-2.143c0-.394-.319-.714-.714-.714h-2.857c-.395 0-.715.32-.715.714v2.143c0 .395.319.714.715.714h.707v.707l-3.279.008c-.395 0-.714.32-.714.714 0 .395.319.714.714.714h2.04l-.005 3.573c0 .395.32.713.715.713.394 0 .714-.318.714-.713v-1.662h1.073v1.662c0 .395.321.713.716.713.393 0 .713-.318.713-.713v-3.573h2.125c.395 0 .715-.32.715-.714s-.321-.714-.715-.714zm-3.384-3.027h.8v1.598h-.8zm-2.228 1.598v-1.598h.8v1.598z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4 12v1c0 .553.448 1 1 1-.552 0-1 .447-1 1v1h1v-1h1v1h1v-1c0-.553-.448-1-1-1 .552 0 1-.447 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.049-.348-.137-.5.088-.152.136-.324.137-.5v-1c0-.553-.447-1-1-1zm1 1h1v1h-1zM12.091 5.286h-3.384v-.715h.722c.396 0 .714-.319.714-.714v-2.143c0-.394-.319-.714-.714-.714h-2.857c-.395 0-.715.32-.715.714v2.143c0 .395.319.714.715.714h.707v.707l-3.279.008c-.395 0-.714.32-.714.714 0 .395.319.714.714.714h2.04l-.005 3.573c0 .395.32.713.715.713.394 0 .714-.318.714-.713v-1.662h1.073v1.662c0 .395.321.713.716.713.393 0 .713-.318.713-.713v-3.573h2.125c.395 0 .715-.32.715-.714s-.321-.714-.715-.714zm-3.384-3.027h.8v1.598h-.8zm-2.228 1.598v-1.598h.8v1.598z"/></svg>
diff --git a/engine/editor/icons/XRCamera3D.svg b/engine/editor/icons/XRCamera3D.svg
index ec9dff12..a7351cdc 100644
--- a/engine/editor/icons/XRCamera3D.svg
+++ b/engine/editor/icons/XRCamera3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M9.5 0a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V10a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9l3 2V5l-3 2V5.23A3 3 0 0 0 9.5 0zM4 12v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M9.5 0a3 3 0 0 0-3 2.777 3 3 0 1 0-3 5.047V10a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9l3 2V5l-3 2V5.23A3 3 0 0 0 9.5 0zM4 12v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
diff --git a/engine/editor/icons/XRController3D.svg b/engine/editor/icons/XRController3D.svg
index ecabdd27..b4e3467f 100644
--- a/engine/editor/icons/XRController3D.svg
+++ b/engine/editor/icons/XRController3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm2 1h2v2h2v2H6v2H4V6H2V4h2zm9 1a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm-2 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM4 12v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M2 1a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm2 1h2v2h2v2H6v2H4V6H2V4h2zm9 1a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm-2 2a1 1 0 0 1 0 2 1 1 0 0 1 0-2zM4 12v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
diff --git a/engine/editor/icons/XRFaceModifier3D.svg b/engine/editor/icons/XRFaceModifier3D.svg
index cbd630f4..9eaf6eaa 100644
--- a/engine/editor/icons/XRFaceModifier3D.svg
+++ b/engine/editor/icons/XRFaceModifier3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4 12v1c0 .552.448 1 1 1-.552 0-1 .448-1 1v1h1v-1h1v1h1v-1c0-.552-.448-1-1-1 .552 0 1-.448 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.048-.348-.137-.5.089-.152.136-.324.137-.5v-1c0-.552-.448-1-1-1zm1 1h1v1h-1zM11.384 9.462v-2.155c1.613-.944 2.156-3.016 1.213-4.631-.603-1.033-1.709-1.67-2.905-1.676h-3.385c-1.869.008-3.377 1.532-3.368 3.401.005 1.197.643 2.301 1.676 2.906v2.155c0 .934.758 1.692 1.692 1.692h3.385c.935 0 1.692-.758 1.692-1.692zm-4.23-4.231h1.692v.846h-1.692zm-2.539-.846c0-.468.378-.846.847-.846.468 0 .846.378.846.846 0 .467-.378.846-.846.846-.469 0-.847-.379-.847-.846zm5.923 5.077h-.846v-.847h-.846v.846h-1.692v-.846h-.847v.846h-.846v-2.538h.846v.846h.847v-.846h1.692v.846h.846v-.846h.846zm-.846-5.077c0-.468.378-.846.846-.846s.846.378.846.846c0 .467-.378.846-.846.846s-.846-.379-.846-.846z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4 12v1c0 .552.448 1 1 1-.552 0-1 .448-1 1v1h1v-1h1v1h1v-1c0-.552-.448-1-1-1 .552 0 1-.448 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.048-.348-.137-.5.089-.152.136-.324.137-.5v-1c0-.552-.448-1-1-1zm1 1h1v1h-1zM11.384 9.462v-2.155c1.613-.944 2.156-3.016 1.213-4.631-.603-1.033-1.709-1.67-2.905-1.676h-3.385c-1.869.008-3.377 1.532-3.368 3.401.005 1.197.643 2.301 1.676 2.906v2.155c0 .934.758 1.692 1.692 1.692h3.385c.935 0 1.692-.758 1.692-1.692zm-4.23-4.231h1.692v.846h-1.692zm-2.539-.846c0-.468.378-.846.847-.846.468 0 .846.378.846.846 0 .467-.378.846-.846.846-.469 0-.847-.379-.847-.846zm5.923 5.077h-.846v-.847h-.846v.846h-1.692v-.846h-.847v.846h-.846v-2.538h.846v.846h.847v-.846h1.692v.846h.846v-.846h.846zm-.846-5.077c0-.468.378-.846.846-.846s.846.378.846.846c0 .467-.378.846-.846.846s-.846-.379-.846-.846z"/></svg>
diff --git a/engine/editor/icons/XRHandModifier3D.svg b/engine/editor/icons/XRHandModifier3D.svg
index ae54273b..aed527aa 100644
--- a/engine/editor/icons/XRHandModifier3D.svg
+++ b/engine/editor/icons/XRHandModifier3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4 12v1c0 .553.448 1 1 1-.552 0-1 .447-1 1v1h1v-1h1v1h1v-1c0-.553-.448-1-1-1 .552 0 1-.447 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.049-.348-.137-.5.088-.152.136-.324.137-.5v-1c0-.553-.447-1-1-1zm1 1h1v1h-1zM12.375 4.948c-.38-.186-.839-.028-1.025.353l-.916 1.88.688-3.795c.076-.414-.201-.813-.617-.89-.417-.075-.814.2-.891.616l-.575 3.166-.091-.641v-3.869c0-.426-.343-.768-.767-.768s-.766.342-.766.768v3.869 1.146l-.666-3.671c-.076-.416-.475-.693-.891-.617-.417.076-.693.475-.617.89l.745 4.111-1.254-.902c-.37-.344-.949-.322-1.293.047-.344.371-.323.949.048 1.293l3.161 3.066h3.065c.551 0 1.202-1.314 1.202-1.314l1.813-3.712c.185-.383.028-.841-.353-1.026z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4 12v1c0 .553.448 1 1 1-.552 0-1 .447-1 1v1h1v-1h1v1h1v-1c0-.553-.448-1-1-1 .552 0 1-.447 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.049-.348-.137-.5.088-.152.136-.324.137-.5v-1c0-.553-.447-1-1-1zm1 1h1v1h-1zM12.375 4.948c-.38-.186-.839-.028-1.025.353l-.916 1.88.688-3.795c.076-.414-.201-.813-.617-.89-.417-.075-.814.2-.891.616l-.575 3.166-.091-.641v-3.869c0-.426-.343-.768-.767-.768s-.766.342-.766.768v3.869 1.146l-.666-3.671c-.076-.416-.475-.693-.891-.617-.417.076-.693.475-.617.89l.745 4.111-1.254-.902c-.37-.344-.949-.322-1.293.047-.344.371-.323.949.048 1.293l3.161 3.066h3.065c.551 0 1.202-1.314 1.202-1.314l1.813-3.712c.185-.383.028-.841-.353-1.026z"/></svg>
diff --git a/engine/editor/icons/XRNode3D.svg b/engine/editor/icons/XRNode3D.svg
index ef399043..72de6f4e 100644
--- a/engine/editor/icons/XRNode3D.svg
+++ b/engine/editor/icons/XRNode3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="6" r="4" fill="none" stroke="#fc7f7f" stroke-width="2"/><path fill="#fc7f7f" d="m4 12v1c0 .552.448 1 1 1-.552 0-1 .448-1 1v1h1v-1h1v1h1v-1c0-.552-.448-1-1-1 .552 0 1-.448 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.048-.348-.137-.5.089-.152.136-.324.137-.5v-1c0-.552-.448-1-1-1zm1 1h1v1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="6" r="4" fill="none" stroke="#fc7f7f" stroke-width="2"/><path fill="#fc7f7f" d="m4 12v1c0 .552.448 1 1 1-.552 0-1 .448-1 1v1h1v-1h1v1h1v-1c0-.552-.448-1-1-1 .552 0 1-.448 1-1v-1h-1v1h-1v-1zm5 0v4h1v-1h1v1h1v-1c-.001-.176-.048-.348-.137-.5.089-.152.136-.324.137-.5v-1c0-.552-.448-1-1-1zm1 1h1v1h-1z"/></svg>
diff --git a/engine/editor/icons/XROrigin3D.svg b/engine/editor/icons/XROrigin3D.svg
index 85339148..0ba68f11 100644
--- a/engine/editor/icons/XROrigin3D.svg
+++ b/engine/editor/icons/XROrigin3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7 1v3h2V1zM3 5v2h3V5zm5 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm2 0v2h3V5zM7 8v3h2V8zm-3 4v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M7 1v3h2V1zM3 5v2h3V5zm5 0a1 1 0 0 0 0 2 1 1 0 0 0 0-2zm2 0v2h3V5zM7 8v3h2V8zm-3 4v1a1 1 0 0 0 1 1 1 1 0 0 0-1 1v1h1v-1h1v1h1v-1a1 1 0 0 0-1-1 1 1 0 0 0 1-1v-1H6v1H5v-1zm5 0v4h1v-1h1v1h1v-1a1 1 0 0 0-.137-.5A1 1 0 0 0 12 14v-1a1 1 0 0 0-1-1zm1 1h1v1h-1z"/></svg>
diff --git a/engine/editor/icons/YSort.svg b/engine/editor/icons/YSort.svg
index 429ebf1c..66353d49 100644
--- a/engine/editor/icons/YSort.svg
+++ b/engine/editor/icons/YSort.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m4 1-3 3h2v8h-2l3 3 3-3h-2v-8h2zm5 1v2h6v-2zm0 5v2h4v-2zm0 5v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="m4 1-3 3h2v8h-2l3 3 3-3h-2v-8h2zm5 1v2h6v-2zm0 5v2h4v-2zm0 5v2h2v-2z"/></svg>
diff --git a/engine/editor/icons/Zoom.svg b/engine/editor/icons/Zoom.svg
index 3b0cec33..d2300b04 100644
--- a/engine/editor/icons/Zoom.svg
+++ b/engine/editor/icons/Zoom.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a5 5 0 1 0 2.752 9.166l4.318 4.318 1.414-1.414-4.318-4.318a5 5 0 0 0 .41-.752H10V6H9a3 3 0 1 1-1-2.232V2h.99a5 5 0 0 0-3-1zm5 0v2H9v2h2v2h2V5h2V3h-2V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 1a5 5 0 1 0 2.752 9.166l4.318 4.318 1.414-1.414-4.318-4.318a5 5 0 0 0 .41-.752H10V6H9a3 3 0 1 1-1-2.232V2h.99a5 5 0 0 0-3-1zm5 0v2H9v2h2v2h2V5h2V3h-2V1z"/></svg>
diff --git a/engine/editor/icons/ZoomLess.svg b/engine/editor/icons/ZoomLess.svg
index 83d964fd..ecdb23f5 100644
--- a/engine/editor/icons/ZoomLess.svg
+++ b/engine/editor/icons/ZoomLess.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".4"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM4 7h8v2H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".4"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM4 7h8v2H4z"/></svg>
diff --git a/engine/editor/icons/ZoomMore.svg b/engine/editor/icons/ZoomMore.svg
index 63250ed7..a6dda358 100644
--- a/engine/editor/icons/ZoomMore.svg
+++ b/engine/editor/icons/ZoomMore.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><circle cx="8" cy="8" r="8" fill-opacity=".4"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 4h2v3h3v2H9v3H7V9H4V7h3z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><circle cx="8" cy="8" r="8" fill-opacity=".4"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 4h2v3h3v2H9v3H7V9H4V7h3z"/></g></svg>
diff --git a/engine/editor/icons/ZoomReset.svg b/engine/editor/icons/ZoomReset.svg
index 5e7a5612..06b8ff75 100644
--- a/engine/editor/icons/ZoomReset.svg
+++ b/engine/editor/icons/ZoomReset.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".4"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm0 3.166A1 1 0 0 1 9.526 5v7h-2V6.87l-1.445.962-1-1.6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".4"/><path fill="#e0e0e0" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm0 3.166A1 1 0 0 1 9.526 5v7h-2V6.87l-1.445.962-1-1.6z"/></svg>
diff --git a/engine/editor/icons/bool.svg b/engine/editor/icons/bool.svg
index 97a155c0..d8b7ae39 100644
--- a/engine/editor/icons/bool.svg
+++ b/engine/editor/icons/bool.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#6f91f0" d="M0 4v8h2a3 3 0 0 0 2.5-1.346 3 3 0 0 0 4.5.578 3 3 0 0 0 4.5-.578A3 3 0 0 0 16 12v-2a1 1 0 0 1-1-1V4h-2v2.77a3 3 0 0 0-4 0 3 3 0 0 0-4.5.578A3 3 0 0 0 2 6V4zm2 4a1 1 0 0 1 0 2zm5 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#6f91f0" d="M0 4v8h2a3 3 0 0 0 2.5-1.346 3 3 0 0 0 4.5.578 3 3 0 0 0 4.5-.578A3 3 0 0 0 16 12v-2a1 1 0 0 1-1-1V4h-2v2.77a3 3 0 0 0-4 0 3 3 0 0 0-4.5.578A3 3 0 0 0 2 6V4zm2 4a1 1 0 0 1 0 2zm5 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/editor/icons/editor_icons_builders.py b/engine/editor/icons/editor_icons_builders.py
index d3e89534..24ae0b80 100644
--- a/engine/editor/icons/editor_icons_builders.py
+++ b/engine/editor/icons/editor_icons_builders.py
@@ -1,71 +1,47 @@
 """Functions used to generate source files during build time"""
 
 import os
-from io import StringIO
 
-from methods import to_raw_cstring
+import methods
 
 
 # See also `scene/theme/icons/default_theme_icons_builders.py`.
 def make_editor_icons_action(target, source, env):
-    dst = str(target[0])
-    svg_icons = source
+    icons_names = []
+    icons_raw = []
+    icons_med = []
+    icons_big = []
 
-    with StringIO() as icons_string, StringIO() as s:
-        for svg in svg_icons:
-            with open(str(svg), "r") as svgf:
-                icons_string.write("\t%s,\n" % to_raw_cstring(svgf.read()))
+    for idx, svg in enumerate(source):
+        path = str(svg)
+        with open(path, encoding="utf-8", newline="\n") as file:
+            icons_raw.append(methods.to_raw_cstring(file.read()))
 
-        s.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        s.write("#ifndef _EDITOR_ICONS_H\n")
-        s.write("#define _EDITOR_ICONS_H\n")
-        s.write("static const int editor_icons_count = {};\n".format(len(svg_icons)))
-        s.write("static const char *editor_icons_sources[] = {\n")
-        s.write(icons_string.getvalue())
-        s.write("};\n\n")
-        s.write("static const char *editor_icons_names[] = {\n")
+        name = os.path.splitext(os.path.basename(path))[0]
+        icons_names.append(f'"{name}"')
 
-        # this is used to store the indices of thumbnail icons
-        thumb_medium_indices = []
-        thumb_big_indices = []
-        index = 0
-        for f in svg_icons:
-            fname = str(f)
+        if name.endswith("MediumThumb"):
+            icons_med.append(str(idx))
+        elif name.endswith(("BigThumb", "GodotFile")):
+            icons_big.append(str(idx))
 
-            # Trim the `.svg` extension from the string.
-            icon_name = os.path.basename(fname)[:-4]
-            # some special cases
-            if icon_name.endswith("MediumThumb"):  # don't know a better way to handle this
-                thumb_medium_indices.append(str(index))
-            if icon_name.endswith("BigThumb"):  # don't know a better way to handle this
-                thumb_big_indices.append(str(index))
-            if icon_name.endswith("GodotFile"):  # don't know a better way to handle this
-                thumb_big_indices.append(str(index))
+    icons_names_str = ",\n\t".join(icons_names)
+    icons_raw_str = ",\n\t".join(icons_raw)
 
-            s.write('\t"{0}"'.format(icon_name))
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write(f"""\
+inline constexpr int editor_icons_count = {len(icons_names)};
+inline constexpr const char *editor_icons_sources[] = {{
+	{icons_raw_str}
+}};
 
-            if fname != svg_icons[-1]:
-                s.write(",")
-            s.write("\n")
+inline constexpr const char *editor_icons_names[] = {{
+	{icons_names_str}
+}};
 
-            index += 1
+inline constexpr int editor_md_thumbs_count = {len(icons_med)};
+inline constexpr int editor_md_thumbs_indices[] = {{ {", ".join(icons_med)} }};
 
-        s.write("};\n")
-
-        if thumb_medium_indices:
-            s.write("\n\n")
-            s.write("static const int editor_md_thumbs_count = {};\n".format(len(thumb_medium_indices)))
-            s.write("static const int editor_md_thumbs_indices[] = {")
-            s.write(", ".join(thumb_medium_indices))
-            s.write("};\n")
-        if thumb_big_indices:
-            s.write("\n\n")
-            s.write("static const int editor_bg_thumbs_count = {};\n".format(len(thumb_big_indices)))
-            s.write("static const int editor_bg_thumbs_indices[] = {")
-            s.write(", ".join(thumb_big_indices))
-            s.write("};\n")
-
-        s.write("#endif\n")
-
-        with open(dst, "w", encoding="utf-8", newline="\n") as f:
-            f.write(s.getvalue())
+inline constexpr int editor_bg_thumbs_count = {len(icons_big)};
+inline constexpr int editor_bg_thumbs_indices[] = {{ {", ".join(icons_big)} }};
+""")
diff --git a/engine/editor/icons/float.svg b/engine/editor/icons/float.svg
index 05328c0b..a9e8c4ee 100644
--- a/engine/editor/icons/float.svg
+++ b/engine/editor/icons/float.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#35d4f4" d="M3 4a3 3 0 0 0-3 3v5h2v-2h2V8H2V7a1 1 0 0 1 1-1h1V4zm3 0v5a3 3 0 0 0 3 3h1v-2H9a1 1 0 0 1-1-1V4zm6 0v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1-1-1V8h2V6h-2V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#35d4f4" d="M3 4a3 3 0 0 0-3 3v5h2v-2h2V8H2V7a1 1 0 0 1 1-1h1V4zm3 0v5a3 3 0 0 0 3 3h1v-2H9a1 1 0 0 1-1-1V4zm6 0v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1-1-1V8h2V6h-2V4z"/></svg>
diff --git a/engine/editor/icons/int.svg b/engine/editor/icons/int.svg
index 009167c5..d90714b1 100644
--- a/engine/editor/icons/int.svg
+++ b/engine/editor/icons/int.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#5abbef" d="m1 2v2h2v-2zm11 0v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1 -1-1v-1h2v-2h-2v-2zm-8 2v6h2v-4h1a1 1 0 0 1 1 1v3h2v-3a3 3 0 0 0 -3-3h-1zm-3 2v4h2v-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#5abbef" d="m1 2v2h2v-2zm11 0v5a3 3 0 0 0 3 3h1v-2h-1a1 1 0 0 1 -1-1v-1h2v-2h-2v-2zm-8 2v6h2v-4h1a1 1 0 0 1 1 1v3h2v-3a3 3 0 0 0 -3-3h-1zm-3 2v4h2v-4z"/></svg>
diff --git a/engine/editor/icons/uint.svg b/engine/editor/icons/uint.svg
index 3582a466..3d6786d5 100644
--- a/engine/editor/icons/uint.svg
+++ b/engine/editor/icons/uint.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#5abbef" d="M5 2v2h2V2zm2 2v2H5V4H3v4a1 1 0 0 1-1-1V4H0v3a3 3 0 0 0 0 .05A3 3 0 0 0 3 10h6V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm5 3a3 3 0 0 0 3 3h1V8h-1a1 1 0 0 1-1-1V6h2V4h-2V2h-2z"/><path fill="#fff" fill-opacity=".4" d="M5 10V4H3v4a1 1 0 0 1-1-1V4H0v3a3 3 0 0 0 3 3zm2 0h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3H7z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="12"><path fill="#5abbef" d="M5 2v2h2V2zm2 2v2H5V4H3v4a1 1 0 0 1-1-1V4H0v3a3 3 0 0 0 0 .05A3 3 0 0 0 3 10h6V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3zm5 3a3 3 0 0 0 3 3h1V8h-1a1 1 0 0 1-1-1V6h2V4h-2V2h-2z"/><path fill="#fff" fill-opacity=".4" d="M5 10V4H3v4a1 1 0 0 1-1-1V4H0v3a3 3 0 0 0 3 3zm2 0h2V6a1 1 0 0 1 1 1v3h2V7a3 3 0 0 0-3-3H7z"/></svg>
diff --git a/engine/editor/import/3d/collada.cpp b/engine/editor/import/3d/collada.cpp
index edf8669b..0f6b0a3d 100644
--- a/engine/editor/import/3d/collada.cpp
+++ b/engine/editor/import/3d/collada.cpp
@@ -66,7 +66,7 @@ void Collada::Vertex::fix_unit_scale(const Collada &p_state) {
 
 static String _uri_to_id(const String &p_uri) {
 	if (p_uri.begins_with("#")) {
-		return p_uri.substr(1, p_uri.size() - 1);
+		return p_uri.substr(1);
 	} else {
 		return p_uri;
 	}
@@ -208,7 +208,6 @@ Vector<float> Collada::AnimationTrack::get_value_at_time(float p_time) const {
 
 				Vector<float> ret;
 				ret.resize(16);
-				Transform3D tr;
 				// i wonder why collada matrices are transposed, given that's opposed to opengl..
 				ret.write[0] = interp.basis.rows[0][0];
 				ret.write[1] = interp.basis.rows[0][1];
@@ -289,7 +288,7 @@ void Collada::_parse_image(XMLParser &p_parser) {
 		String path = p_parser.get_named_attribute_value("source").strip_edges();
 		if (!path.contains("://") && path.is_relative_path()) {
 			// path is relative to file being loaded, so convert to a resource path
-			image.path = ProjectSettings::get_singleton()->localize_path(state.local_path.get_base_dir().path_join(path.uri_decode()));
+			image.path = ProjectSettings::get_singleton()->localize_path(state.local_path.get_base_dir().path_join(path.uri_file_decode()));
 		}
 	} else {
 		while (p_parser.read() == OK) {
@@ -298,7 +297,7 @@ void Collada::_parse_image(XMLParser &p_parser) {
 
 				if (name == "init_from") {
 					p_parser.read();
-					String path = p_parser.get_node_data().strip_edges().uri_decode();
+					String path = p_parser.get_node_data().strip_edges().uri_file_decode();
 
 					if (!path.contains("://") && path.is_relative_path()) {
 						// path is relative to file being loaded, so convert to a resource path
@@ -1373,7 +1372,7 @@ Collada::Node *Collada::_parse_visual_instance_camera(XMLParser &p_parser) {
 	cam->camera = _uri_to_id(p_parser.get_named_attribute_value_safe("url"));
 
 	if (state.up_axis == Vector3::AXIS_Z) { //collada weirdness
-		cam->post_transform.basis.rotate(Vector3(1, 0, 0), -Math_PI * 0.5);
+		cam->post_transform.basis.rotate(Vector3(1, 0, 0), -Math::PI * 0.5);
 	}
 
 	if (p_parser.is_empty()) { //nothing else to parse...
@@ -1394,7 +1393,7 @@ Collada::Node *Collada::_parse_visual_instance_light(XMLParser &p_parser) {
 	cam->light = _uri_to_id(p_parser.get_named_attribute_value_safe("url"));
 
 	if (state.up_axis == Vector3::AXIS_Z) { //collada weirdness
-		cam->post_transform.basis.rotate(Vector3(1, 0, 0), -Math_PI * 0.5);
+		cam->post_transform.basis.rotate(Vector3(1, 0, 0), -Math::PI * 0.5);
 	}
 
 	if (p_parser.is_empty()) { //nothing else to parse...
@@ -1812,9 +1811,9 @@ void Collada::_parse_animation(XMLParser &p_parser) {
 				track.target = target.get_slicec('/', 0);
 				track.param = target.get_slicec('/', 1);
 				if (track.param.contains_char('.')) {
-					track.component = track.param.get_slice(".", 1).to_upper();
+					track.component = track.param.get_slicec('.', 1).to_upper();
 				}
-				track.param = track.param.get_slice(".", 0);
+				track.param = track.param.get_slicec('.', 0);
 				if (names.size() > 1 && track.component.is_empty()) {
 					//this is a guess because the collada spec is ambiguous here...
 					//i suppose if you have many names (outputs) you can't use a component and i should abide to that.
@@ -2347,9 +2346,9 @@ Error Collada::load(const String &p_path, int p_flags) {
 	{
 		//version
 		String version = parser.get_named_attribute_value("version");
-		state.version.major = version.get_slice(".", 0).to_int();
-		state.version.minor = version.get_slice(".", 1).to_int();
-		state.version.rev = version.get_slice(".", 2).to_int();
+		state.version.major = version.get_slicec('.', 0).to_int();
+		state.version.minor = version.get_slicec('.', 1).to_int();
+		state.version.rev = version.get_slicec('.', 2).to_int();
 		COLLADA_PRINT("Collada VERSION: " + version);
 	}
 
@@ -2379,6 +2378,3 @@ Error Collada::load(const String &p_path, int p_flags) {
 	_optimize();
 	return OK;
 }
-
-Collada::Collada() {
-}
diff --git a/engine/editor/import/3d/collada.h b/engine/editor/import/3d/collada.h
index 948a2bbf..f36f189a 100644
--- a/engine/editor/import/3d/collada.h
+++ b/engine/editor/import/3d/collada.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLADA_H
-#define COLLADA_H
+#pragma once
 
 #include "core/io/xml_parser.h"
 
@@ -57,7 +56,6 @@ public:
 			int uv_idx = 0;
 			String texture;
 			Color color;
-			Channel() {}
 		};
 
 		Channel diffuse, specular, emission, bump;
@@ -117,8 +115,6 @@ public:
 
 		float spot_angle = 45;
 		float spot_exp = 1;
-
-		LightData() {}
 	};
 
 	struct MeshData {
@@ -154,8 +150,6 @@ public:
 
 		bool found_double_sided = false;
 		bool double_sided = true;
-
-		MeshData() {}
 	};
 
 	struct CurveData {
@@ -171,8 +165,6 @@ public:
 		HashMap<String, Source> sources;
 
 		HashMap<String, String> control_vertices;
-
-		CurveData() {}
 	};
 
 	struct SkinControllerData {
@@ -185,7 +177,6 @@ public:
 			Vector<String> sarray; //maybe for names
 			Vector<float> array;
 			int stride = 1;
-			Source() {}
 		};
 
 		HashMap<String, Source> sources;
@@ -208,8 +199,6 @@ public:
 		} weights;
 
 		HashMap<String, Transform3D> bone_rest_map;
-
-		SkinControllerData() {}
 	};
 
 	struct MorphControllerData {
@@ -220,13 +209,11 @@ public:
 			int stride = 1;
 			Vector<String> sarray; //maybe for names
 			Vector<float> array;
-			Source() {}
 		};
 
 		HashMap<String, Source> sources;
 
 		HashMap<String, String> targets;
-		MorphControllerData() {}
 	};
 
 	struct Vertex {
@@ -304,8 +291,6 @@ public:
 				return uid < p_vert.uid;
 			}
 		}
-
-		Vertex() {}
 	};
 
 	struct Node {
@@ -351,7 +336,6 @@ public:
 
 		bool ignore_anim = false;
 
-		Node() {}
 		virtual ~Node() {
 			for (int i = 0; i < children.size(); i++) {
 				memdelete(children[i]);
@@ -413,8 +397,6 @@ public:
 		float begin = 0;
 		float end = 1;
 		Vector<String> tracks;
-
-		AnimationClip() {}
 	};
 
 	struct AnimationTrack {
@@ -440,15 +422,11 @@ public:
 			Point2 in_tangent;
 			Point2 out_tangent;
 			InterpolationType interp_type = INTERP_LINEAR;
-
-			Key() {}
 		};
 
 		Vector<float> get_value_at_time(float p_time) const;
 
 		Vector<Key> keys;
-
-		AnimationTrack() {}
 	};
 
 	/****************/
@@ -506,14 +484,10 @@ public:
 		HashMap<String, Vector<int>> by_id_tracks;
 
 		float animation_length = 0;
-
-		State() {}
 	} state;
 
 	Error load(const String &p_path, int p_flags = 0);
 
-	Collada();
-
 	Transform3D fix_transform(const Transform3D &p_transform);
 
 	Transform3D get_root_transform() const;
@@ -570,5 +544,3 @@ private: // private stuff
 
 	void _optimize();
 };
-
-#endif // COLLADA_H
diff --git a/engine/editor/import/3d/editor_import_collada.cpp b/engine/editor/import/3d/editor_import_collada.cpp
index 238aa940..27e1df77 100644
--- a/engine/editor/import/3d/editor_import_collada.cpp
+++ b/engine/editor/import/3d/editor_import_collada.cpp
@@ -706,7 +706,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ImporterMesh> &p
 					}
 				}
 
-				if (weights.size() == 0 || total == 0) { //if nothing, add a weight to bone 0
+				if (weights.is_empty() || total == 0) { //if nothing, add a weight to bone 0
 					//no weights assigned
 					Collada::Vertex::Weight w;
 					w.bone_idx = 0;
@@ -1278,7 +1278,7 @@ Error ColladaImport::_create_resources(Collada::Node *p_node, bool p_use_compres
 					mesh_unique_names.insert(name);
 
 					mesh->set_name(name);
-					Error err = _create_mesh_surfaces(morphs.size() == 0, mesh, ng2->material_map, meshdata, apply_xform, bone_remap, skin, morph, morphs, p_use_compression, use_mesh_builtin_materials);
+					Error err = _create_mesh_surfaces(morphs.is_empty(), mesh, ng2->material_map, meshdata, apply_xform, bone_remap, skin, morph, morphs, p_use_compression, use_mesh_builtin_materials);
 					ERR_FAIL_COND_V_MSG(err, err, "Cannot create mesh surface.");
 
 					mesh_cache[meshid] = mesh;
@@ -1642,22 +1642,22 @@ void ColladaImport::create_animation(int p_clip, bool p_import_value_tracks) {
 		}
 
 		for (int i = 0; i < snapshots.size(); i++) {
-			for (List<int>::Element *ET = nm.anim_tracks.front(); ET; ET = ET->next()) {
+			for (const int track_id : nm.anim_tracks) {
 				//apply tracks
 
 				if (p_clip == -1) {
-					if (track_filter.has(ET->get())) {
+					if (track_filter.has(track_id)) {
 						continue;
 					}
 				} else {
-					if (!track_filter.has(ET->get())) {
+					if (!track_filter.has(track_id)) {
 						continue;
 					}
 				}
 
 				found_anim = true;
 
-				const Collada::AnimationTrack &at = collada.state.animation_tracks[ET->get()];
+				const Collada::AnimationTrack &at = collada.state.animation_tracks[track_id];
 
 				int xform_idx = -1;
 				for (int j = 0; j < cn->xform_list.size(); j++) {
@@ -1855,6 +1855,3 @@ Node *EditorSceneFormatImporterCollada::import_scene(const String &p_path, uint3
 
 	return state.scene;
 }
-
-EditorSceneFormatImporterCollada::EditorSceneFormatImporterCollada() {
-}
diff --git a/engine/editor/import/3d/editor_import_collada.h b/engine/editor/import/3d/editor_import_collada.h
index 4467c1ec..a07fefa5 100644
--- a/engine/editor/import/3d/editor_import_collada.h
+++ b/engine/editor/import/3d/editor_import_collada.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_IMPORT_COLLADA_H
-#define EDITOR_IMPORT_COLLADA_H
+#pragma once
 
 #include "editor/import/3d/resource_importer_scene.h"
 
@@ -39,8 +38,4 @@ class EditorSceneFormatImporterCollada : public EditorSceneFormatImporter {
 public:
 	virtual void get_extensions(List<String> *r_extensions) const override;
 	virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps = nullptr, Error *r_err = nullptr) override;
-
-	EditorSceneFormatImporterCollada();
 };
-
-#endif // EDITOR_IMPORT_COLLADA_H
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
index a2965575..772a2c64 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.cpp
@@ -245,6 +245,3 @@ void PostImportPluginSkeletonRenamer::internal_process(InternalImportCategory p_
 		}
 	}
 }
-
-PostImportPluginSkeletonRenamer::PostImportPluginSkeletonRenamer() {
-}
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h
index a9771173..9d11a51c 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_renamer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POST_IMPORT_PLUGIN_SKELETON_RENAMER_H
-#define POST_IMPORT_PLUGIN_SKELETON_RENAMER_H
+#pragma once
 
 #include "resource_importer_scene.h"
 
@@ -41,8 +40,4 @@ public:
 	virtual void internal_process(InternalImportCategory p_category, Node *p_base_scene, Node *p_node, Ref<Resource> p_resource, const Dictionary &p_options) override;
 
 	void _internal_process(InternalImportCategory p_category, Node *p_base_scene, Node *p_node, Ref<Resource> p_resource, const Dictionary &p_options, const HashMap<String, String> &p_rename_map);
-
-	PostImportPluginSkeletonRenamer();
 };
-
-#endif // POST_IMPORT_PLUGIN_SKELETON_RENAMER_H
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
index 21b60743..ebfe7068 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.cpp
@@ -972,6 +972,3 @@ void PostImportPluginSkeletonRestFixer::internal_process(InternalImportCategory
 		memdelete(prof_skeleton);
 	}
 }
-
-PostImportPluginSkeletonRestFixer::PostImportPluginSkeletonRestFixer() {
-}
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
index 9fec76be..ee45e17c 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_rest_fixer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POST_IMPORT_PLUGIN_SKELETON_REST_FIXER_H
-#define POST_IMPORT_PLUGIN_SKELETON_REST_FIXER_H
+#pragma once
 
 #include "resource_importer_scene.h"
 
@@ -40,8 +39,4 @@ public:
 	virtual void get_internal_import_options(InternalImportCategory p_category, List<ResourceImporter::ImportOption> *r_options) override;
 	virtual Variant get_internal_option_visibility(InternalImportCategory p_category, const String &p_scene_import_type, const String &p_option, const HashMap<StringName, Variant> &p_options) const override;
 	virtual void internal_process(InternalImportCategory p_category, Node *p_base_scene, Node *p_node, Ref<Resource> p_resource, const Dictionary &p_options) override;
-
-	PostImportPluginSkeletonRestFixer();
 };
-
-#endif // POST_IMPORT_PLUGIN_SKELETON_REST_FIXER_H
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
index 24cf77e9..c6befa13 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.cpp
@@ -153,6 +153,3 @@ void PostImportPluginSkeletonTrackOrganizer::internal_process(InternalImportCate
 		}
 	}
 }
-
-PostImportPluginSkeletonTrackOrganizer::PostImportPluginSkeletonTrackOrganizer() {
-}
diff --git a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
index 24a4f70a..7d017ac2 100644
--- a/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
+++ b/engine/editor/import/3d/post_import_plugin_skeleton_track_organizer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POST_IMPORT_PLUGIN_SKELETON_TRACK_ORGANIZER_H
-#define POST_IMPORT_PLUGIN_SKELETON_TRACK_ORGANIZER_H
+#pragma once
 
 #include "resource_importer_scene.h"
 
@@ -39,8 +38,4 @@ class PostImportPluginSkeletonTrackOrganizer : public EditorScenePostImportPlugi
 public:
 	virtual void get_internal_import_options(InternalImportCategory p_category, List<ResourceImporter::ImportOption> *r_options) override;
 	virtual void internal_process(InternalImportCategory p_category, Node *p_base_scene, Node *p_node, Ref<Resource> p_resource, const Dictionary &p_options) override;
-
-	PostImportPluginSkeletonTrackOrganizer();
 };
-
-#endif // POST_IMPORT_PLUGIN_SKELETON_TRACK_ORGANIZER_H
diff --git a/engine/editor/import/3d/resource_importer_obj.cpp b/engine/editor/import/3d/resource_importer_obj.cpp
index efada9f2..13b54949 100644
--- a/engine/editor/import/3d/resource_importer_obj.cpp
+++ b/engine/editor/import/3d/resource_importer_obj.cpp
@@ -119,7 +119,7 @@ static Error _parse_material_library(const String &p_path, HashMap<String, Ref<S
 			//normal
 			ERR_FAIL_COND_V(current.is_null(), ERR_FILE_CORRUPT);
 
-			String p = l.replace("map_Kd", "").replace("\\", "/").strip_edges();
+			String p = l.replace("map_Kd", "").replace_char('\\', '/').strip_edges();
 			String path;
 			if (p.is_absolute_path()) {
 				path = p;
@@ -139,7 +139,7 @@ static Error _parse_material_library(const String &p_path, HashMap<String, Ref<S
 			//normal
 			ERR_FAIL_COND_V(current.is_null(), ERR_FILE_CORRUPT);
 
-			String p = l.replace("map_Ks", "").replace("\\", "/").strip_edges();
+			String p = l.replace("map_Ks", "").replace_char('\\', '/').strip_edges();
 			String path;
 			if (p.is_absolute_path()) {
 				path = p;
@@ -159,7 +159,7 @@ static Error _parse_material_library(const String &p_path, HashMap<String, Ref<S
 			//normal
 			ERR_FAIL_COND_V(current.is_null(), ERR_FILE_CORRUPT);
 
-			String p = l.replace("map_Ns", "").replace("\\", "/").strip_edges();
+			String p = l.replace("map_Ns", "").replace_char('\\', '/').strip_edges();
 			String path;
 			if (p.is_absolute_path()) {
 				path = p;
@@ -178,7 +178,7 @@ static Error _parse_material_library(const String &p_path, HashMap<String, Ref<S
 			//normal
 			ERR_FAIL_COND_V(current.is_null(), ERR_FILE_CORRUPT);
 
-			String p = l.replace("map_bump", "").replace("\\", "/").strip_edges();
+			String p = l.replace("map_bump", "").replace_char('\\', '/').strip_edges();
 			String path = base_path.path_join(p);
 
 			Ref<Texture2D> texture = ResourceLoader::load(path);
@@ -365,7 +365,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
 				face[1] = face[2];
 			}
 		} else if (l.begins_with("s ")) { //smoothing
-			String what = l.substr(2, l.length()).strip_edges();
+			String what = l.substr(2).strip_edges();
 			bool do_smooth;
 			if (what == "off") {
 				do_smooth = false;
@@ -402,7 +402,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
 			//groups are too annoying
 			if (surf_tool->get_vertex_array().size()) {
 				//another group going on, commit it
-				if (normals.size() == 0) {
+				if (normals.is_empty()) {
 					surf_tool->generate_normals();
 				}
 
@@ -476,7 +476,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
 			}
 
 			if (l.begins_with("o ")) {
-				name = l.substr(2, l.length()).strip_edges();
+				name = l.substr(2).strip_edges();
 			}
 
 			if (l.begins_with("usemtl ")) {
@@ -484,7 +484,7 @@ static Error _parse_obj(const String &p_path, List<Ref<ImporterMesh>> &r_meshes,
 			}
 
 			if (l.begins_with("g ")) {
-				current_group = l.substr(2, l.length()).strip_edges();
+				current_group = l.substr(2).strip_edges();
 			}
 
 		} else if (l.begins_with("mtllib ")) { //parse material
@@ -584,9 +584,6 @@ void EditorOBJImporter::get_extensions(List<String> *r_extensions) const {
 	r_extensions->push_back("obj");
 }
 
-EditorOBJImporter::EditorOBJImporter() {
-}
-
 ////////////////////////////////////////////////////
 
 String ResourceImporterOBJ::get_importer_name() const {
@@ -682,6 +679,3 @@ Error ResourceImporterOBJ::import(ResourceUID::ID p_source_id, const String &p_s
 
 	return OK;
 }
-
-ResourceImporterOBJ::ResourceImporterOBJ() {
-}
diff --git a/engine/editor/import/3d/resource_importer_obj.h b/engine/editor/import/3d/resource_importer_obj.h
index 46f6a551..ee7eed8c 100644
--- a/engine/editor/import/3d/resource_importer_obj.h
+++ b/engine/editor/import/3d/resource_importer_obj.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_OBJ_H
-#define RESOURCE_IMPORTER_OBJ_H
+#pragma once
 
 #include "resource_importer_scene.h"
 
@@ -39,8 +38,6 @@ class EditorOBJImporter : public EditorSceneFormatImporter {
 public:
 	virtual void get_extensions(List<String> *r_extensions) const override;
 	virtual Node *import_scene(const String &p_path, uint32_t p_flags, const HashMap<StringName, Variant> &p_options, List<String> *r_missing_deps, Error *r_err = nullptr) override;
-
-	EditorOBJImporter();
 };
 
 class ResourceImporterOBJ : public ResourceImporter {
@@ -61,8 +58,4 @@ public:
 	virtual bool get_option_visibility(const String &p_path, const String &p_option, const HashMap<StringName, Variant> &p_options) const override;
 
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
-
-	ResourceImporterOBJ();
 };
-
-#endif // RESOURCE_IMPORTER_OBJ_H
diff --git a/engine/editor/import/3d/resource_importer_scene.cpp b/engine/editor/import/3d/resource_importer_scene.cpp
index db2a6d7d..adea55f5 100644
--- a/engine/editor/import/3d/resource_importer_scene.cpp
+++ b/engine/editor/import/3d/resource_importer_scene.cpp
@@ -40,7 +40,7 @@
 #include "editor/import/3d/scene_import_settings.h"
 #include "scene/3d/importer_mesh_instance_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/3d/occluder_instance_3d.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
@@ -146,9 +146,6 @@ void EditorScenePostImport::init(const String &p_source_file) {
 	source_file = p_source_file;
 }
 
-EditorScenePostImport::EditorScenePostImport() {
-}
-
 ///////////////////////////////////////////////////////
 
 Variant EditorScenePostImportPlugin::get_option_value(const StringName &p_name) const {
@@ -435,7 +432,7 @@ static String _fixstr(const String &p_what, const String &p_str) {
 		what = what.substr(0, what.length() - 1);
 	}
 
-	String end = p_what.substr(what.length(), p_what.length() - what.length());
+	String end = p_what.substr(what.length());
 
 	if (what.containsn("$" + p_str)) { // Blender and other stuff.
 		return what.replace("$" + p_str, "") + end;
@@ -829,7 +826,7 @@ Node *ResourceImporterScene::_pre_fix_node(Node *p_node, Node *p_root, HashMap<R
 				SeparationRayShape3D *rayShape = memnew(SeparationRayShape3D);
 				rayShape->set_length(1);
 				colshape->set_shape(rayShape);
-				Object::cast_to<Node3D>(sb)->rotate_x(Math_PI / 2);
+				Object::cast_to<Node3D>(sb)->rotate_x(Math::PI / 2);
 			} else if (empty_draw_type == "IMAGE") {
 				WorldBoundaryShape3D *world_boundary_shape = memnew(WorldBoundaryShape3D);
 				colshape->set_shape(world_boundary_shape);
@@ -1306,9 +1303,9 @@ Node *ResourceImporterScene::_post_fix_animations(Node *p_node, Node *p_root, co
 				Dictionary anim_settings = p_animation_data[name];
 
 				{
-					int slices_count = anim_settings["slices/amount"];
+					int slice_count = anim_settings["slices/amount"];
 
-					for (int i = 0; i < slices_count; i++) {
+					for (int i = 0; i < slice_count; i++) {
 						String slice_name = anim_settings["slice_" + itos(i + 1) + "/name"];
 						int from_frame = anim_settings["slice_" + itos(i + 1) + "/start_frame"];
 						int end_frame = anim_settings["slice_" + itos(i + 1) + "/end_frame"];
@@ -1534,8 +1531,26 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 							if (matdata.has("use_external/enabled") && bool(matdata["use_external/enabled"]) && matdata.has("use_external/path")) {
 								String path = matdata["use_external/path"];
 								Ref<Material> external_mat = ResourceLoader::load(path);
+								if (external_mat.is_null()) {
+									if (matdata.has("use_external/fallback_path")) {
+										String fallback_save_path = matdata["use_external/fallback_path"];
+										if (!fallback_save_path.is_empty()) {
+											external_mat = ResourceLoader::load(fallback_save_path);
+											if (external_mat.is_valid()) {
+												path = fallback_save_path;
+											}
+										}
+									}
+								}
 								if (external_mat.is_valid()) {
 									m->set_surface_material(i, external_mat);
+									if (!path.begins_with("uid://")) {
+										const ResourceUID::ID id = ResourceLoader::get_resource_uid(path);
+										if (id != ResourceUID::INVALID_ID) {
+											matdata["use_external/path"] = ResourceUID::get_singleton()->id_to_text(id);
+										}
+									}
+									matdata["use_external/fallback_path"] = external_mat->get_path();
 								}
 							}
 						}
@@ -1787,13 +1802,14 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 }
 
 Ref<Animation> ResourceImporterScene::_save_animation_to_file(Ref<Animation> anim, bool p_save_to_file, const String &p_save_to_path, bool p_keep_custom_tracks) {
-	if (!p_save_to_file || !p_save_to_path.is_resource_file()) {
+	String res_path = ResourceUID::ensure_path(p_save_to_path);
+	if (!p_save_to_file || !res_path.is_resource_file()) {
 		return anim;
 	}
 
-	if (FileAccess::exists(p_save_to_path) && p_keep_custom_tracks) {
+	if (FileAccess::exists(res_path) && p_keep_custom_tracks) {
 		// Copy custom animation tracks from previously imported files.
-		Ref<Animation> old_anim = ResourceLoader::load(p_save_to_path, "Animation", ResourceFormatLoader::CACHE_MODE_IGNORE);
+		Ref<Animation> old_anim = ResourceLoader::load(res_path, "Animation", ResourceFormatLoader::CACHE_MODE_IGNORE);
 		if (old_anim.is_valid()) {
 			for (int i = 0; i < old_anim->get_track_count(); i++) {
 				if (!old_anim->track_is_imported(i)) {
@@ -1804,16 +1820,21 @@ Ref<Animation> ResourceImporterScene::_save_animation_to_file(Ref<Animation> ani
 		}
 	}
 
-	if (ResourceCache::has(p_save_to_path)) {
-		Ref<Animation> old_anim = ResourceCache::get_ref(p_save_to_path);
+	if (ResourceCache::has(res_path)) {
+		Ref<Animation> old_anim = ResourceCache::get_ref(res_path);
 		if (old_anim.is_valid()) {
 			old_anim->copy_from(anim);
 			anim = old_anim;
 		}
 	}
-	anim->set_path(p_save_to_path, true); // Set path to save externally.
-	Error err = ResourceSaver::save(anim, p_save_to_path, ResourceSaver::FLAG_CHANGE_PATH);
-	ERR_FAIL_COND_V_MSG(err != OK, anim, "Saving of animation failed: " + p_save_to_path);
+	anim->set_path(res_path, true); // Set path to save externally.
+	Error err = ResourceSaver::save(anim, res_path, ResourceSaver::FLAG_CHANGE_PATH);
+
+	ERR_FAIL_COND_V_MSG(err != OK, anim, "Saving of animation failed: " + res_path);
+	if (p_save_to_path.begins_with("uid://")) {
+		// slow
+		ResourceSaver::set_uid(res_path, ResourceUID::get_singleton()->text_to_id(p_save_to_path));
+	}
 	return anim;
 }
 
@@ -2044,6 +2065,7 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 		case INTERNAL_IMPORT_CATEGORY_MESH: {
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.tres"), ""));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/fallback_path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), ""));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/shadow_meshes", PROPERTY_HINT_ENUM, "Default,Enable,Disable"), 0));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/lightmap_uv", PROPERTY_HINT_ENUM, "Default,Enable,Disable"), 0));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "generate/lods", PROPERTY_HINT_ENUM, "Default,Enable,Disable"), 0));
@@ -2052,11 +2074,13 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 		case INTERNAL_IMPORT_CATEGORY_MATERIAL: {
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "use_external/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "use_external/path", PROPERTY_HINT_FILE, "*.material,*.res,*.tres"), ""));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "use_external/fallback_path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), ""));
 		} break;
 		case INTERNAL_IMPORT_CATEGORY_ANIMATION: {
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "settings/loop_mode", PROPERTY_HINT_ENUM, "None,Linear,Pingpong"), 0));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
-			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.tres"), ""));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.anim,*.tres"), ""));
+			r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "save_to_file/fallback_path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), ""));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "save_to_file/keep_custom_tracks"), ""));
 			r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slices/amount", PROPERTY_HINT_RANGE, "0,256,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), 0));
 
@@ -2066,7 +2090,8 @@ void ResourceImporterScene::get_internal_import_options(InternalImportCategory p
 				r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/end_frame"), 0));
 				r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "slice_" + itos(i + 1) + "/loop_mode", PROPERTY_HINT_ENUM, "None,Linear,Pingpong"), 0));
 				r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/enabled", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), false));
-				r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/save_to_file/path", PROPERTY_HINT_SAVE_FILE, ".res,*.tres"), ""));
+				r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/save_to_file/path", PROPERTY_HINT_SAVE_FILE, "*.res,*.anim,*.tres"), ""));
+				r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "slice_" + itos(i + 1) + "/save_to_file/fallback_path", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), ""));
 				r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "slice_" + itos(i + 1) + "/save_to_file/keep_custom_tracks"), false));
 			}
 		} break;
@@ -2211,7 +2236,7 @@ bool ResourceImporterScene::get_internal_option_visibility(InternalImportCategor
 			}
 			if (p_option.begins_with("slice_")) {
 				int max_slice = p_options["slices/amount"];
-				int slice = p_option.get_slice("_", 1).to_int() - 1;
+				int slice = p_option.get_slicec('_', 1).to_int() - 1;
 				if (slice >= max_slice) {
 					return false;
 				}
@@ -2530,7 +2555,7 @@ Node *ResourceImporterScene::_generate_meshes(Node *p_node, const Dictionary &p_
 
 					if (bool(mesh_settings.get("save_to_file/enabled", false))) {
 						save_to_file = mesh_settings.get("save_to_file/path", String());
-						if (!save_to_file.is_resource_file()) {
+						if (!ResourceUID::ensure_path(save_to_file).is_resource_file()) {
 							save_to_file = "";
 						}
 					}
@@ -2584,16 +2609,24 @@ Node *ResourceImporterScene::_generate_meshes(Node *p_node, const Dictionary &p_
 				src_mesh_node->get_mesh()->optimize_indices();
 
 				if (!save_to_file.is_empty()) {
-					Ref<Mesh> existing = ResourceCache::get_ref(save_to_file);
+					String save_res_path = ResourceUID::ensure_path(save_to_file);
+					Ref<Mesh> existing = ResourceCache::get_ref(save_res_path);
 					if (existing.is_valid()) {
 						//if somehow an existing one is useful, create
 						existing->reset_state();
 					}
 					mesh = src_mesh_node->get_mesh()->get_mesh(existing);
 
-					ResourceSaver::save(mesh, save_to_file); //override
+					Error err = ResourceSaver::save(mesh, save_res_path); //override
+					if (err != OK) {
+						WARN_PRINT(vformat("Failed to save mesh %s to '%s'.", mesh->get_name(), save_res_path));
+					}
+					if (err == OK && save_to_file.begins_with("uid://")) {
+						// slow
+						ResourceSaver::set_uid(save_res_path, ResourceUID::get_singleton()->text_to_id(save_to_file));
+					}
 
-					mesh->set_path(save_to_file, true); //takeover existing, if needed
+					mesh->set_path(save_res_path, true); //takeover existing, if needed
 
 				} else {
 					mesh = src_mesh_node->get_mesh()->get_mesh();
@@ -2871,14 +2904,65 @@ Node *ResourceImporterScene::pre_import(const String &p_source_file, const HashM
 	return scene;
 }
 
-Error ResourceImporterScene::_check_resource_save_paths(const Dictionary &p_data) {
-	Array keys = p_data.keys();
-	for (int i = 0; i < keys.size(); i++) {
-		const Dictionary &settings = p_data[keys[i]];
+static Error convert_path_to_uid(ResourceUID::ID p_source_id, const String &p_hash_str, Dictionary &p_settings, const String &p_path_key, const String &p_fallback_path_key) {
+	const String &raw_save_path = p_settings[p_path_key];
+	String save_path = ResourceUID::ensure_path(raw_save_path);
+	if (raw_save_path.begins_with("uid://")) {
+		if (save_path.is_empty() || !DirAccess::exists(save_path.get_base_dir())) {
+			if (p_settings.has(p_fallback_path_key)) {
+				String fallback_save_path = p_settings[p_fallback_path_key];
+				if (!fallback_save_path.is_empty() && DirAccess::exists(fallback_save_path.get_base_dir())) {
+					save_path = fallback_save_path;
+					ResourceUID::get_singleton()->add_id(ResourceUID::get_singleton()->text_to_id(raw_save_path), save_path);
+				}
+			}
+		} else {
+			p_settings[p_fallback_path_key] = save_path;
+		}
+	}
+	ERR_FAIL_COND_V(!save_path.is_empty() && !DirAccess::exists(save_path.get_base_dir()), ERR_FILE_BAD_PATH);
+	if (!save_path.is_empty() && !raw_save_path.begins_with("uid://")) {
+		const ResourceUID::ID id = ResourceLoader::get_resource_uid(save_path);
+		if (id != ResourceUID::INVALID_ID) {
+			p_settings[p_path_key] = ResourceUID::get_singleton()->id_to_text(id);
+		} else {
+			ResourceUID::ID save_id = hash64_murmur3_64(p_hash_str.hash64(), p_source_id) & 0x7FFFFFFFFFFFFFFF;
+			if (ResourceUID::get_singleton()->has_id(save_id)) {
+				if (save_path != ResourceUID::get_singleton()->get_id_path(save_id)) {
+					// The user has specified a path which does not match the default UID.
+					save_id = ResourceUID::get_singleton()->create_id_for_path(save_path);
+				}
+			}
+			p_settings[p_path_key] = ResourceUID::get_singleton()->id_to_text(save_id);
+			ResourceUID::get_singleton()->add_id(save_id, save_path);
+		}
+		p_settings[p_fallback_path_key] = save_path;
+	}
+	return OK;
+}
+
+Error ResourceImporterScene::_check_resource_save_paths(ResourceUID::ID p_source_id, const String &p_hash_suffix, const Dictionary &p_data) {
+	for (const KeyValue<Variant, Variant> &kv : p_data) {
+		Dictionary settings = kv.value;
 
 		if (bool(settings.get("save_to_file/enabled", false)) && settings.has("save_to_file/path")) {
-			const String save_path = ResourceUID::ensure_path(settings["save_to_file/path"]);
-			ERR_FAIL_COND_V(!save_path.is_empty() && !DirAccess::exists(save_path.get_base_dir()), ERR_FILE_BAD_PATH);
+			String to_hash = kv.key.operator String() + p_hash_suffix;
+			Error ret = convert_path_to_uid(p_source_id, to_hash, settings, "save_to_file/path", "save_to_file/fallback_path");
+			ERR_FAIL_COND_V_MSG(ret != OK, ret, vformat("Resource save path %s not valid. Ensure parent directory has been created.", settings.has("save_to_file/path")));
+		}
+
+		if (settings.has("slices/amount")) {
+			int slice_count = settings["slices/amount"];
+			for (int si = 0; si < slice_count; si++) {
+				if (bool(settings.get("slice_" + itos(si + 1) + "/save_to_file/enabled", false)) &&
+						settings.has("slice_" + itos(si + 1) + "/save_to_file/path")) {
+					String to_hash = kv.key.operator String() + p_hash_suffix + itos(si + 1);
+					Error ret = convert_path_to_uid(p_source_id, to_hash, settings,
+							"slice_" + itos(si + 1) + "/save_to_file/path",
+							"slice_" + itos(si + 1) + "/save_to_file/fallback_path");
+					ERR_FAIL_COND_V_MSG(ret != OK, ret, vformat("Slice save path %s not valid. Ensure parent directory has been created.", settings.has("save_to_file/path")));
+				}
+			}
 		}
 	}
 
@@ -2943,14 +3027,14 @@ Error ResourceImporterScene::import(ResourceUID::ID p_source_id, const String &p
 	// Check whether any of the meshes or animations have nonexistent save paths
 	// and if they do, fail the import immediately.
 	if (subresources.has("meshes")) {
-		err = _check_resource_save_paths(subresources["meshes"]);
+		err = _check_resource_save_paths(p_source_id, "m", subresources["meshes"]);
 		if (err != OK) {
 			return err;
 		}
 	}
 
 	if (subresources.has("animations")) {
-		err = _check_resource_save_paths(subresources["animations"]);
+		err = _check_resource_save_paths(p_source_id, "a", subresources["animations"]);
 		if (err != OK) {
 			return err;
 		}
diff --git a/engine/editor/import/3d/resource_importer_scene.h b/engine/editor/import/3d/resource_importer_scene.h
index f25a2231..224ad97e 100644
--- a/engine/editor/import/3d/resource_importer_scene.h
+++ b/engine/editor/import/3d/resource_importer_scene.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_SCENE_H
-#define RESOURCE_IMPORTER_SCENE_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/io/resource_importer.h"
@@ -81,8 +80,6 @@ public:
 	virtual void get_import_options(const String &p_path, List<ResourceImporter::ImportOption> *r_options);
 	virtual Variant get_option_visibility(const String &p_path, const String &p_scene_import_type, const String &p_option, const HashMap<StringName, Variant> &p_options);
 	virtual void handle_compatibility_options(HashMap<StringName, Variant> &p_import_params) const {}
-
-	EditorSceneFormatImporter() {}
 };
 
 class EditorScenePostImport : public RefCounted {
@@ -99,7 +96,6 @@ public:
 	String get_source_file() const;
 	virtual Node *post_import(Node *p_scene);
 	virtual void init(const String &p_source_file);
-	EditorScenePostImport();
 };
 
 class EditorScenePostImportPlugin : public RefCounted {
@@ -151,8 +147,6 @@ public:
 
 	virtual void pre_process(Node *p_scene, const HashMap<StringName, Variant> &p_options);
 	virtual void post_process(Node *p_scene, const HashMap<StringName, Variant> &p_options);
-
-	EditorScenePostImportPlugin() {}
 };
 
 VARIANT_ENUM_CAST(EditorScenePostImportPlugin::InternalImportCategory)
@@ -216,7 +210,7 @@ class ResourceImporterScene : public ResourceImporter {
 		SHAPE_TYPE_AUTOMATIC,
 	};
 
-	static Error _check_resource_save_paths(const Dictionary &p_data);
+	static Error _check_resource_save_paths(ResourceUID::ID p_source_id, const String &p_hash_suffix, const Dictionary &p_data);
 	Array _get_skinned_pose_transforms(ImporterMeshInstance3D *p_src_mesh_node);
 	void _replace_owner(Node *p_node, Node *p_scene, Node *p_new_owner);
 	Node *_generate_meshes(Node *p_node, const Dictionary &p_mesh_data, bool p_generate_lods, bool p_create_shadow_meshes, LightBakeMode p_light_bake_mode, float p_lightmap_texel_size, const Vector<uint8_t> &p_src_lightmap_cache, Vector<Vector<uint8_t>> &r_lightmap_caches);
@@ -518,10 +512,8 @@ Transform3D ResourceImporterScene::get_collision_shapes_transform(const M &p_opt
 		}
 
 		if (p_options.has(SNAME("primitive/rotation"))) {
-			transform.basis = Basis::from_euler(p_options[SNAME("primitive/rotation")].operator Vector3() * (Math_PI / 180.0));
+			transform.basis = Basis::from_euler(p_options[SNAME("primitive/rotation")].operator Vector3() * (Math::PI / 180.0));
 		}
 	}
 	return transform;
 }
-
-#endif // RESOURCE_IMPORTER_SCENE_H
diff --git a/engine/editor/import/3d/scene_import_settings.cpp b/engine/editor/import/3d/scene_import_settings.cpp
index 71b010a9..e3469f0b 100644
--- a/engine/editor/import/3d/scene_import_settings.cpp
+++ b/engine/editor/import/3d/scene_import_settings.cpp
@@ -744,8 +744,8 @@ void SceneImportSettingsDialog::open_settings(const String &p_path, const String
 	selected_id = "";
 	selected_type = "";
 
-	cam_rot_x = -Math_PI / 4;
-	cam_rot_y = -Math_PI / 4;
+	cam_rot_x = -Math::PI / 4;
+	cam_rot_y = -Math::PI / 4;
 	cam_zoom = 1;
 
 	{
@@ -1204,7 +1204,7 @@ void SceneImportSettingsDialog::_viewport_input(const Ref<InputEvent> &p_input)
 	if (mm.is_valid() && (mm->get_button_mask().has_flag(MouseButtonMask::LEFT))) {
 		(*rot_x) -= mm->get_relative().y * 0.01 * EDSCALE;
 		(*rot_y) -= mm->get_relative().x * 0.01 * EDSCALE;
-		(*rot_x) = CLAMP((*rot_x), -Math_PI / 2, Math_PI / 2);
+		(*rot_x) = CLAMP((*rot_x), -Math::PI / 2, Math::PI / 2);
 		_update_camera();
 	}
 	if (mm.is_valid() && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CURSOR_SHAPE)) {
@@ -1585,6 +1585,10 @@ void SceneImportSettingsDialog::_save_dir_confirm() {
 			continue; //ignore
 		}
 		String path = item->get_text(1);
+		String uid_path = path;
+		if (path.begins_with("uid://")) {
+			path = ResourceUID::uid_to_path(uid_path);
+		}
 		if (!path.is_resource_file()) {
 			continue;
 		}
@@ -1601,9 +1605,11 @@ void SceneImportSettingsDialog::_save_dir_confirm() {
 					EditorNode::get_singleton()->add_io_error(TTR("Can't make material external to file, write error:") + "\n\t" + path);
 					continue;
 				}
+				uid_path = ResourceUID::path_to_uid(path);
 
 				md.settings["use_external/enabled"] = true;
-				md.settings["use_external/path"] = path;
+				md.settings["use_external/path"] = uid_path;
+				md.settings["use_external/fallback_path"] = path;
 
 			} break;
 			case ACTION_CHOOSE_MESH_SAVE_PATHS: {
@@ -1611,14 +1617,16 @@ void SceneImportSettingsDialog::_save_dir_confirm() {
 				MeshData &md = mesh_map[id];
 
 				md.settings["save_to_file/enabled"] = true;
-				md.settings["save_to_file/path"] = path;
+				md.settings["save_to_file/path"] = uid_path;
+				md.settings["save_to_file/fallback_path"] = path;
 			} break;
 			case ACTION_CHOOSE_ANIMATION_SAVE_PATHS: {
 				ERR_CONTINUE(!animation_map.has(id));
 				AnimationData &ad = animation_map[id];
 
 				ad.settings["save_to_file/enabled"] = true;
-				ad.settings["save_to_file/path"] = path;
+				ad.settings["save_to_file/path"] = uid_path;
+				ad.settings["save_to_file/fallback_path"] = path;
 
 			} break;
 		}
@@ -1716,6 +1724,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	animation_play_button = memnew(Button);
 	animation_hbox->add_child(animation_play_button);
 	animation_play_button->set_flat(true);
+	animation_play_button->set_accessibility_name(TTRC("Play"));
 	animation_play_button->set_focus_mode(Control::FOCUS_NONE);
 	animation_play_button->set_shortcut(ED_SHORTCUT("scene_import_settings/play_selected_animation", TTRC("Selected Animation Play/Pause"), Key::SPACE));
 	animation_play_button->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_play_animation));
@@ -1723,6 +1732,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	animation_stop_button = memnew(Button);
 	animation_hbox->add_child(animation_stop_button);
 	animation_stop_button->set_flat(true);
+	animation_stop_button->set_accessibility_name(TTRC("Stop"));
 	animation_stop_button->set_focus_mode(Control::FOCUS_NONE);
 	animation_stop_button->set_tooltip_text(TTR("Selected Animation Stop"));
 	animation_stop_button->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_stop_current_animation));
@@ -1735,6 +1745,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	animation_slider->set_step(1.0 / 100.0);
 	animation_slider->set_value_no_signal(0.0);
 	animation_slider->set_focus_mode(Control::FOCUS_NONE);
+	animation_slider->set_accessibility_name(TTRC("Animation"));
 	animation_slider->connect(SceneStringName(value_changed), callable_mp(this, &SceneImportSettingsDialog::_animation_slider_value_changed));
 
 	animation_toggle_skeleton_visibility = memnew(Button);
@@ -1743,6 +1754,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	animation_toggle_skeleton_visibility->set_theme_type_variation("FlatButton");
 	animation_toggle_skeleton_visibility->set_focus_mode(Control::FOCUS_NONE);
 	animation_toggle_skeleton_visibility->set_tooltip_text(TTR("Toggle Animation Skeleton Visibility"));
+	animation_toggle_skeleton_visibility->set_accessibility_name(TTRC("Skeleton Visibility"));
 
 	animation_toggle_skeleton_visibility->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_animation_update_skeleton_visibility));
 
@@ -1763,6 +1775,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	light_rotate_switch->set_toggle_mode(true);
 	light_rotate_switch->set_pressed(true);
 	light_rotate_switch->set_tooltip_text(TTR("Rotate Lights With Model"));
+	light_rotate_switch->set_accessibility_name(TTRC("Rotate Lights With Model"));
 	light_rotate_switch->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_on_light_rotate_switch_pressed));
 	vb_light->add_child(light_rotate_switch);
 
@@ -1771,6 +1784,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	light_1_switch->set_toggle_mode(true);
 	light_1_switch->set_pressed(true);
 	light_1_switch->set_tooltip_text(TTR("Primary Light"));
+	light_1_switch->set_accessibility_name(TTRC("Primary Light"));
 	light_1_switch->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_on_light_1_switch_pressed));
 	vb_light->add_child(light_1_switch);
 
@@ -1779,6 +1793,7 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	light_2_switch->set_toggle_mode(true);
 	light_2_switch->set_pressed(true);
 	light_2_switch->set_tooltip_text(TTR("Secondary Light"));
+	light_2_switch->set_accessibility_name(TTRC("Secondary Light"));
 	light_2_switch->connect(SceneStringName(pressed), callable_mp(this, &SceneImportSettingsDialog::_on_light_2_switch_pressed));
 	vb_light->add_child(light_2_switch);
 
@@ -1883,6 +1898,9 @@ SceneImportSettingsDialog::SceneImportSettingsDialog() {
 	inspector = memnew(EditorInspector);
 	inspector->set_custom_minimum_size(Size2(300 * EDSCALE, 0));
 	inspector->connect(SNAME("property_edited"), callable_mp(this, &SceneImportSettingsDialog::_inspector_property_edited));
+	// Display the same tooltips as in the Import dock.
+	inspector->set_object_class(ResourceImporterScene::get_class_static());
+	inspector->set_use_doc_hints(true);
 
 	property_split->add_child(inspector);
 
diff --git a/engine/editor/import/3d/scene_import_settings.h b/engine/editor/import/3d/scene_import_settings.h
index 73cdb130..f46e1e77 100644
--- a/engine/editor/import/3d/scene_import_settings.h
+++ b/engine/editor/import/3d/scene_import_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_IMPORT_SETTINGS_H
-#define SCENE_IMPORT_SETTINGS_H
+#pragma once
 
 #include "editor/import/3d/resource_importer_scene.h"
 #include "scene/3d/camera_3d.h"
@@ -129,8 +128,8 @@ class SceneImportSettingsDialog : public ConfirmationDialog {
 		TreeItem *mesh_node = nullptr;
 		TreeItem *material_node = nullptr;
 
-		float cam_rot_x = -Math_PI / 4;
-		float cam_rot_y = -Math_PI / 4;
+		float cam_rot_x = -Math::PI / 4;
+		float cam_rot_y = -Math::PI / 4;
 		float cam_zoom = 1;
 
 		HashMap<StringName, Variant> settings;
@@ -144,8 +143,8 @@ class SceneImportSettingsDialog : public ConfirmationDialog {
 		TreeItem *scene_node = nullptr;
 		TreeItem *mesh_node = nullptr;
 
-		float cam_rot_x = -Math_PI / 4;
-		float cam_rot_y = -Math_PI / 4;
+		float cam_rot_x = -Math::PI / 4;
+		float cam_rot_y = -Math::PI / 4;
 		float cam_zoom = 1;
 		HashMap<StringName, Variant> settings;
 	};
@@ -251,5 +250,3 @@ public:
 	SceneImportSettingsDialog();
 	~SceneImportSettingsDialog();
 };
-
-#endif // SCENE_IMPORT_SETTINGS_H
diff --git a/engine/editor/import/audio_stream_import_settings.cpp b/engine/editor/import/audio_stream_import_settings.cpp
index 34ebfff7..3c6e2d42 100644
--- a/engine/editor/import/audio_stream_import_settings.cpp
+++ b/engine/editor/import/audio_stream_import_settings.cpp
@@ -536,12 +536,14 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
 	loop_hb->add_theme_constant_override("separation", 4 * EDSCALE);
 	loop = memnew(CheckBox);
 	loop->set_text(TTR("Enable"));
+	loop->set_accessibility_name(TTRC("Enable looping"));
 	loop->set_tooltip_text(TTR("Enable looping."));
 	loop->connect(SceneStringName(toggled), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1));
 	loop_hb->add_child(loop);
 	loop_hb->add_spacer();
 	loop_hb->add_child(memnew(Label(TTR("Offset:"))));
 	loop_offset = memnew(SpinBox);
+	loop_offset->set_accessibility_name(TTRC("Loop Offset"));
 	loop_offset->set_max(10000);
 	loop_offset->set_step(0.001);
 	loop_offset->set_suffix("sec");
@@ -559,6 +561,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
 	bpm_edit = memnew(SpinBox);
 	bpm_edit->set_max(400);
 	bpm_edit->set_step(0.01);
+	bpm_edit->set_accessibility_name(TTRC("BPM"));
 	bpm_edit->set_tooltip_text(TTR("Configure the Beats Per Measure (tempo) used for the interactive streams.\nThis is required in order to configure beat information."));
 	bpm_edit->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1));
 	interactive_hb->add_child(bpm_edit);
@@ -570,6 +573,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
 	beats_edit = memnew(SpinBox);
 	beats_edit->set_tooltip_text(TTR("Configure the amount of Beats used for music-aware looping. If zero, it will be autodetected from the length.\nIt is recommended to set this value (either manually or by clicking on a beat number in the preview) to ensure looping works properly."));
 	beats_edit->set_max(99999);
+	beats_edit->set_accessibility_name(TTRC("Beat Count"));
 	beats_edit->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1));
 	interactive_hb->add_child(beats_edit);
 	bar_beats_label = memnew(Label(TTR("Bar Beats:")));
@@ -578,6 +582,7 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
 	bar_beats_edit->set_tooltip_text(TTR("Configure the Beats Per Bar. This used for music-aware transitions between AudioStreams."));
 	bar_beats_edit->set_min(2);
 	bar_beats_edit->set_max(32);
+	bar_beats_edit->set_accessibility_name(TTRC("Bar Beats"));
 	bar_beats_edit->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamImportSettingsDialog::_settings_changed).unbind(1));
 	interactive_hb->add_child(bar_beats_edit);
 	main_vbox->add_margin_child(TTR("Music Playback:"), interactive_hb);
@@ -605,10 +610,13 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
 	HBoxContainer *zoom_hbox = memnew(HBoxContainer);
 	zoom_bar = memnew(HScrollBar);
 	zoom_in = memnew(Button);
+	zoom_in->set_accessibility_name(TTRC("Zoom In"));
 	zoom_in->set_flat(true);
 	zoom_reset = memnew(Button);
+	zoom_reset->set_accessibility_name(TTRC("Reset Zoom"));
 	zoom_reset->set_flat(true);
 	zoom_out = memnew(Button);
+	zoom_out->set_accessibility_name(TTRC("Zoom Out"));
 	zoom_out->set_flat(true);
 	zoom_hbox->add_child(zoom_bar);
 	zoom_bar->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -634,12 +642,14 @@ AudioStreamImportSettingsDialog::AudioStreamImportSettingsDialog() {
 	vbox->add_child(hbox);
 
 	_play_button = memnew(Button);
+	_play_button->set_accessibility_name(TTRC("Play"));
 	_play_button->set_flat(true);
 	hbox->add_child(_play_button);
 	_play_button->set_focus_mode(Control::FOCUS_NONE);
 	_play_button->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamImportSettingsDialog::_play));
 
 	_stop_button = memnew(Button);
+	_stop_button->set_accessibility_name(TTRC("Stop"));
 	_stop_button->set_flat(true);
 	hbox->add_child(_stop_button);
 	_stop_button->set_focus_mode(Control::FOCUS_NONE);
diff --git a/engine/editor/import/audio_stream_import_settings.h b/engine/editor/import/audio_stream_import_settings.h
index 931faf45..9d169b2c 100644
--- a/engine/editor/import/audio_stream_import_settings.h
+++ b/engine/editor/import/audio_stream_import_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_IMPORT_SETTINGS_H
-#define AUDIO_STREAM_IMPORT_SETTINGS_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/audio/audio_stream_player.h"
@@ -113,5 +112,3 @@ public:
 
 	AudioStreamImportSettingsDialog();
 };
-
-#endif // AUDIO_STREAM_IMPORT_SETTINGS_H
diff --git a/engine/editor/import/dynamic_font_import_settings.cpp b/engine/editor/import/dynamic_font_import_settings.cpp
index 6fd80d84..23c02b40 100644
--- a/engine/editor/import/dynamic_font_import_settings.cpp
+++ b/engine/editor/import/dynamic_font_import_settings.cpp
@@ -490,6 +490,8 @@ void DynamicFontImportSettingsDialog::_main_prop_changed(const String &p_edited_
 			font_preview->set_allow_system_fallback(import_settings_data->get("allow_system_fallback"));
 		} else if (p_edited_property == "force_autohinter") {
 			font_preview->set_force_autohinter(import_settings_data->get("force_autohinter"));
+		} else if (p_edited_property == "modulate_color_glyphs") {
+			font_preview->set_modulate_color_glyphs(import_settings_data->get("modulate_color_glyphs"));
 		} else if (p_edited_property == "hinting") {
 			font_preview->set_hinting((TextServer::Hinting)import_settings_data->get("hinting").operator int());
 		} else if (p_edited_property == "subpixel_positioning") {
@@ -533,8 +535,8 @@ void DynamicFontImportSettingsDialog::_variation_add() {
 	import_variation_data->owner = this;
 	ERR_FAIL_COND(import_variation_data.is_null());
 
-	for (List<ResourceImporter::ImportOption>::Element *E = options_variations.front(); E; E = E->next()) {
-		import_variation_data->defaults[E->get().option.name] = E->get().default_value;
+	for (const ResourceImporter::ImportOption &option : options_variations) {
+		import_variation_data->defaults[option.option.name] = option.default_value;
 	}
 
 	import_variation_data->options = options_variations;
@@ -977,6 +979,7 @@ void DynamicFontImportSettingsDialog::_re_import() {
 	main_settings["msdf_size"] = import_settings_data->get("msdf_size");
 	main_settings["allow_system_fallback"] = import_settings_data->get("allow_system_fallback");
 	main_settings["force_autohinter"] = import_settings_data->get("force_autohinter");
+	main_settings["modulate_color_glyphs"] = import_settings_data->get("modulate_color_glyphs");
 	main_settings["hinting"] = import_settings_data->get("hinting");
 	main_settings["subpixel_positioning"] = import_settings_data->get("subpixel_positioning");
 	main_settings["keep_rounding_remainders"] = import_settings_data->get("keep_rounding_remainders");
@@ -1170,8 +1173,8 @@ void DynamicFontImportSettingsDialog::open_settings(const String &p_path) {
 
 	text_settings_data->owner = this;
 
-	for (List<ResourceImporter::ImportOption>::Element *F = options_text.front(); F; F = F->next()) {
-		text_settings_data->defaults[F->get().option.name] = F->get().default_value;
+	for (const ResourceImporter::ImportOption &option : options_text) {
+		text_settings_data->defaults[option.option.name] = option.default_value;
 	}
 
 	text_settings_data->fd = font_main;
@@ -1190,8 +1193,8 @@ void DynamicFontImportSettingsDialog::open_settings(const String &p_path) {
 
 	import_settings_data->settings.clear();
 	import_settings_data->defaults.clear();
-	for (List<ResourceImporter::ImportOption>::Element *E = options_general.front(); E; E = E->next()) {
-		import_settings_data->defaults[E->get().option.name] = E->get().default_value;
+	for (const ResourceImporter::ImportOption &option : options_general) {
+		import_settings_data->defaults[option.option.name] = option.default_value;
 	}
 
 	Ref<ConfigFile> config;
@@ -1203,8 +1206,7 @@ void DynamicFontImportSettingsDialog::open_settings(const String &p_path) {
 	if (err == OK) {
 		List<String> keys;
 		config->get_section_keys("params", &keys);
-		for (List<String>::Element *E = keys.front(); E; E = E->next()) {
-			String key = E->get();
+		for (const String &key : keys) {
 			print_verbose(String("    ") + key + " == " + String(config->get_value("params", key)));
 			if (key == "preload") {
 				Array preload_configurations = config->get_value("params", key);
@@ -1231,8 +1233,8 @@ void DynamicFontImportSettingsDialog::open_settings(const String &p_path) {
 					ERR_FAIL_COND(import_variation_data_custom.is_null());
 
 					import_variation_data_custom->owner = this;
-					for (List<ResourceImporter::ImportOption>::Element *F = options_variations.front(); F; F = F->next()) {
-						import_variation_data_custom->defaults[F->get().option.name] = F->get().default_value;
+					for (const ResourceImporter::ImportOption &option : options_variations) {
+						import_variation_data_custom->defaults[option.option.name] = option.default_value;
 					}
 
 					import_variation_data_custom->fd = font_main;
@@ -1282,6 +1284,7 @@ void DynamicFontImportSettingsDialog::open_settings(const String &p_path) {
 		font_preview->set_msdf_size(import_settings_data->get("msdf_size"));
 		font_preview->set_allow_system_fallback(import_settings_data->get("allow_system_fallback"));
 		font_preview->set_force_autohinter(import_settings_data->get("force_autohinter"));
+		font_preview->set_modulate_color_glyphs(import_settings_data->get("modulate_color_glyphs"));
 		font_preview->set_hinting((TextServer::Hinting)import_settings_data->get("hinting").operator int());
 		int font_subpixel_positioning = import_settings_data->get("subpixel_positioning").operator int();
 		if (font_subpixel_positioning == 4 /* Auto (Except Pixel Fonts) */) {
@@ -1323,6 +1326,7 @@ DynamicFontImportSettingsDialog::DynamicFontImportSettingsDialog() {
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "msdf_size", PROPERTY_HINT_RANGE, "1,250,1"), 48));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "allow_system_fallback"), true));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "force_autohinter"), false));
+	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "modulate_color_glyphs"), false));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), 1));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::INT, "subpixel_positioning", PROPERTY_HINT_ENUM, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel,Auto (Except Pixel Fonts)"), 4));
 	options_general.push_back(ResourceImporter::ImportOption(PropertyInfo(Variant::BOOL, "keep_rounding_remainders"), true));
@@ -1440,7 +1444,8 @@ DynamicFontImportSettingsDialog::DynamicFontImportSettingsDialog() {
 	page2_hb_vars->add_child(label_vars);
 
 	add_var = memnew(Button);
-	add_var->set_tooltip_text(TTR("Add configuration"));
+	add_var->set_tooltip_text(TTR("Add new font variation configuration."));
+	add_var->set_accessibility_name(TTRC("Add Configuration"));
 	page2_hb_vars->add_child(add_var);
 	add_var->connect(SceneStringName(pressed), callable_mp(this, &DynamicFontImportSettingsDialog::_variation_add));
 
diff --git a/engine/editor/import/dynamic_font_import_settings.h b/engine/editor/import/dynamic_font_import_settings.h
index eeb860ba..df4cbe29 100644
--- a/engine/editor/import/dynamic_font_import_settings.h
+++ b/engine/editor/import/dynamic_font_import_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DYNAMIC_FONT_IMPORT_SETTINGS_H
-#define DYNAMIC_FONT_IMPORT_SETTINGS_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 
@@ -172,5 +171,3 @@ public:
 
 	DynamicFontImportSettingsDialog();
 };
-
-#endif // DYNAMIC_FONT_IMPORT_SETTINGS_H
diff --git a/engine/editor/import/editor_import_plugin.cpp b/engine/editor/import/editor_import_plugin.cpp
index 82710103..789c79a6 100644
--- a/engine/editor/import/editor_import_plugin.cpp
+++ b/engine/editor/import/editor_import_plugin.cpp
@@ -33,9 +33,6 @@
 #include "core/object/script_language.h"
 #include "editor/editor_file_system.h"
 
-EditorImportPlugin::EditorImportPlugin() {
-}
-
 String EditorImportPlugin::get_importer_name() const {
 	String ret;
 	if (GDVIRTUAL_CALL(_get_importer_name, ret)) {
@@ -121,9 +118,7 @@ int EditorImportPlugin::get_format_version() const {
 }
 
 void EditorImportPlugin::get_import_options(const String &p_path, List<ResourceImporter::ImportOption> *r_options, int p_preset) const {
-	Array needed;
-	needed.push_back("name");
-	needed.push_back("default_value");
+	Array needed = { "name", "default_value" };
 	TypedArray<Dictionary> options;
 	if (GDVIRTUAL_CALL(_get_import_options, p_path, p_preset, options)) {
 		for (int i = 0; i < options.size(); i++) {
@@ -205,10 +200,8 @@ bool EditorImportPlugin::can_import_threaded() const {
 
 Error EditorImportPlugin::_append_import_external_resource(const String &p_file, const Dictionary &p_custom_options, const String &p_custom_importer, Variant p_generator_parameters) {
 	HashMap<StringName, Variant> options;
-	List<Variant> keys;
-	p_custom_options.get_key_list(&keys);
-	for (const Variant &K : keys) {
-		options.insert(K, p_custom_options[K]);
+	for (const KeyValue<Variant, Variant> &kv : p_custom_options) {
+		options.insert(kv.key, kv.value);
 	}
 	return append_import_external_resource(p_file, options, p_custom_importer, p_generator_parameters);
 }
diff --git a/engine/editor/import/editor_import_plugin.h b/engine/editor/import/editor_import_plugin.h
index ad0f6c82..46f18942 100644
--- a/engine/editor/import/editor_import_plugin.h
+++ b/engine/editor/import/editor_import_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_IMPORT_PLUGIN_H
-#define EDITOR_IMPORT_PLUGIN_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 #include "core/variant/typed_array.h"
@@ -58,7 +57,6 @@ protected:
 	Error _append_import_external_resource(const String &p_file, const Dictionary &p_custom_options = Dictionary(), const String &p_custom_importer = String(), Variant p_generator_parameters = Variant());
 
 public:
-	EditorImportPlugin();
 	virtual String get_importer_name() const override;
 	virtual String get_visible_name() const override;
 	virtual void get_recognized_extensions(List<String> *p_extensions) const override;
@@ -75,5 +73,3 @@ public:
 	virtual bool can_import_threaded() const override;
 	Error append_import_external_resource(const String &p_file, const HashMap<StringName, Variant> &p_custom_options = HashMap<StringName, Variant>(), const String &p_custom_importer = String(), Variant p_generator_parameters = Variant());
 };
-
-#endif // EDITOR_IMPORT_PLUGIN_H
diff --git a/engine/editor/import/resource_importer_bitmask.cpp b/engine/editor/import/resource_importer_bitmask.cpp
index 8441a496..38fef7d4 100644
--- a/engine/editor/import/resource_importer_bitmask.cpp
+++ b/engine/editor/import/resource_importer_bitmask.cpp
@@ -105,9 +105,3 @@ Error ResourceImporterBitMap::import(ResourceUID::ID p_source_id, const String &
 
 	return ResourceSaver::save(bitmap, p_save_path + ".res");
 }
-
-ResourceImporterBitMap::ResourceImporterBitMap() {
-}
-
-ResourceImporterBitMap::~ResourceImporterBitMap() {
-}
diff --git a/engine/editor/import/resource_importer_bitmask.h b/engine/editor/import/resource_importer_bitmask.h
index fcb152b4..41b969f2 100644
--- a/engine/editor/import/resource_importer_bitmask.h
+++ b/engine/editor/import/resource_importer_bitmask.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_BITMASK_H
-#define RESOURCE_IMPORTER_BITMASK_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 
@@ -51,9 +50,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterBitMap();
-	~ResourceImporterBitMap();
 };
-
-#endif // RESOURCE_IMPORTER_BITMASK_H
diff --git a/engine/editor/import/resource_importer_bmfont.cpp b/engine/editor/import/resource_importer_bmfont.cpp
index b7efdbb6..0c7fe8b2 100644
--- a/engine/editor/import/resource_importer_bmfont.cpp
+++ b/engine/editor/import/resource_importer_bmfont.cpp
@@ -81,16 +81,16 @@ Error ResourceImporterBMFont::import(ResourceUID::ID p_source_id, const String &
 	ERR_FAIL_COND_V_MSG(err != OK, err, "Cannot load font to file \"" + p_source_file + "\".");
 
 	// Update import settings for the image files used by font.
-	for (List<String>::Element *E = image_files.front(); E; E = E->next()) {
+	for (const String &file : image_files) {
 		Ref<ConfigFile> config;
 		config.instantiate();
 
-		err = config->load(E->get() + ".import");
+		err = config->load(file + ".import");
 		if (err == OK) {
 			config->clear();
 			config->set_value("remap", "importer", "skip");
 
-			config->save(E->get() + ".import");
+			config->save(file + ".import");
 		}
 	}
 
@@ -109,6 +109,3 @@ Error ResourceImporterBMFont::import(ResourceUID::ID p_source_id, const String &
 	print_verbose("Done saving to: " + p_save_path + ".fontdata");
 	return OK;
 }
-
-ResourceImporterBMFont::ResourceImporterBMFont() {
-}
diff --git a/engine/editor/import/resource_importer_bmfont.h b/engine/editor/import/resource_importer_bmfont.h
index 74fef9ff..49c89b67 100644
--- a/engine/editor/import/resource_importer_bmfont.h
+++ b/engine/editor/import/resource_importer_bmfont.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_BMFONT_H
-#define RESOURCE_IMPORTER_BMFONT_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 #include "scene/resources/font.h"
@@ -51,8 +50,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterBMFont();
 };
-
-#endif // RESOURCE_IMPORTER_BMFONT_H
diff --git a/engine/editor/import/resource_importer_csv_translation.cpp b/engine/editor/import/resource_importer_csv_translation.cpp
index 62aa7bd1..6e7e5862 100644
--- a/engine/editor/import/resource_importer_csv_translation.cpp
+++ b/engine/editor/import/resource_importer_csv_translation.cpp
@@ -162,6 +162,3 @@ Error ResourceImporterCSVTranslation::import(ResourceUID::ID p_source_id, const
 
 	return OK;
 }
-
-ResourceImporterCSVTranslation::ResourceImporterCSVTranslation() {
-}
diff --git a/engine/editor/import/resource_importer_csv_translation.h b/engine/editor/import/resource_importer_csv_translation.h
index 63676c61..06ae60f1 100644
--- a/engine/editor/import/resource_importer_csv_translation.h
+++ b/engine/editor/import/resource_importer_csv_translation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_CSV_TRANSLATION_H
-#define RESOURCE_IMPORTER_CSV_TRANSLATION_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 
@@ -52,8 +51,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterCSVTranslation();
 };
-
-#endif // RESOURCE_IMPORTER_CSV_TRANSLATION_H
diff --git a/engine/editor/import/resource_importer_dynamic_font.cpp b/engine/editor/import/resource_importer_dynamic_font.cpp
index 9e7d37d5..5bedf1ff 100644
--- a/engine/editor/import/resource_importer_dynamic_font.cpp
+++ b/engine/editor/import/resource_importer_dynamic_font.cpp
@@ -116,6 +116,7 @@ void ResourceImporterDynamicFont::get_import_options(const String &p_path, List<
 
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "allow_system_fallback"), true));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "force_autohinter"), false));
+	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "modulate_color_glyphs"), false));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), 1));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "subpixel_positioning", PROPERTY_HINT_ENUM, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel,Auto (Except Pixel Fonts)"), 4));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "keep_rounding_remainders"), true));
@@ -153,6 +154,7 @@ Error ResourceImporterDynamicFont::import(ResourceUID::ID p_source_id, const Str
 	Dictionary ot_ov = p_options["opentype_features"];
 
 	bool autohinter = p_options["force_autohinter"];
+	bool modulate_color_glyphs = p_options["modulate_color_glyphs"];
 	bool allow_system_fallback = p_options["allow_system_fallback"];
 	int hinting = p_options["hinting"];
 	int subpixel_positioning = p_options["subpixel_positioning"];
@@ -176,6 +178,7 @@ Error ResourceImporterDynamicFont::import(ResourceUID::ID p_source_id, const Str
 	font->set_opentype_feature_overrides(ot_ov);
 	font->set_fixed_size(0);
 	font->set_force_autohinter(autohinter);
+	font->set_modulate_color_glyphs(modulate_color_glyphs);
 	font->set_allow_system_fallback(allow_system_fallback);
 	font->set_hinting((TextServer::Hinting)hinting);
 	font->set_oversampling(oversampling);
@@ -220,16 +223,16 @@ Error ResourceImporterDynamicFont::import(ResourceUID::ID p_source_id, const Str
 	font->set_keep_rounding_remainders(keep_rounding_remainders);
 
 	Dictionary langs = p_options["language_support"];
-	for (int i = 0; i < langs.size(); i++) {
-		String key = langs.get_key_at_index(i);
-		bool enabled = langs.get_value_at_index(i);
+	for (const KeyValue<Variant, Variant> &kv : langs) {
+		String key = kv.key;
+		bool enabled = kv.value;
 		font->set_language_support_override(key, enabled);
 	}
 
 	Dictionary scripts = p_options["script_support"];
-	for (int i = 0; i < scripts.size(); i++) {
-		String key = scripts.get_key_at_index(i);
-		bool enabled = scripts.get_value_at_index(i);
+	for (const KeyValue<Variant, Variant> &kv : scripts) {
+		String key = kv.key;
+		bool enabled = kv.value;
 		font->set_script_support_override(key, enabled);
 	}
 
@@ -271,6 +274,3 @@ Error ResourceImporterDynamicFont::import(ResourceUID::ID p_source_id, const Str
 	print_verbose("Done saving to: " + p_save_path + ".fontdata");
 	return OK;
 }
-
-ResourceImporterDynamicFont::ResourceImporterDynamicFont() {
-}
diff --git a/engine/editor/import/resource_importer_dynamic_font.h b/engine/editor/import/resource_importer_dynamic_font.h
index 73ef96d5..f41eb4b7 100644
--- a/engine/editor/import/resource_importer_dynamic_font.h
+++ b/engine/editor/import/resource_importer_dynamic_font.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_DYNAMIC_FONT_H
-#define RESOURCE_IMPORTER_DYNAMIC_FONT_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 
@@ -61,8 +60,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterDynamicFont();
 };
-
-#endif // RESOURCE_IMPORTER_DYNAMIC_FONT_H
diff --git a/engine/editor/import/resource_importer_image.cpp b/engine/editor/import/resource_importer_image.cpp
index 2807909e..4981ef57 100644
--- a/engine/editor/import/resource_importer_image.cpp
+++ b/engine/editor/import/resource_importer_image.cpp
@@ -92,6 +92,3 @@ Error ResourceImporterImage::import(ResourceUID::ID p_source_id, const String &p
 
 	return OK;
 }
-
-ResourceImporterImage::ResourceImporterImage() {
-}
diff --git a/engine/editor/import/resource_importer_image.h b/engine/editor/import/resource_importer_image.h
index da1925bc..b5fbd411 100644
--- a/engine/editor/import/resource_importer_image.h
+++ b/engine/editor/import/resource_importer_image.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_IMAGE_H
-#define RESOURCE_IMPORTER_IMAGE_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/io/resource_importer.h"
@@ -53,8 +52,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterImage();
 };
-
-#endif // RESOURCE_IMPORTER_IMAGE_H
diff --git a/engine/editor/import/resource_importer_imagefont.cpp b/engine/editor/import/resource_importer_imagefont.cpp
index 741287ec..3e735042 100644
--- a/engine/editor/import/resource_importer_imagefont.cpp
+++ b/engine/editor/import/resource_importer_imagefont.cpp
@@ -114,6 +114,7 @@ Error ResourceImporterImageFont::import(ResourceUID::ID p_source_id, const Strin
 	font->set_subpixel_positioning(TextServer::SUBPIXEL_POSITIONING_DISABLED);
 	font->set_keep_rounding_remainders(true);
 	font->set_force_autohinter(false);
+	font->set_modulate_color_glyphs(false);
 	font->set_allow_system_fallback(false);
 	font->set_hinting(TextServer::HINTING_NONE);
 	font->set_oversampling(1.0f);
@@ -344,6 +345,3 @@ Error ResourceImporterImageFont::import(ResourceUID::ID p_source_id, const Strin
 	print_verbose("Done saving to: " + p_save_path + ".fontdata");
 	return OK;
 }
-
-ResourceImporterImageFont::ResourceImporterImageFont() {
-}
diff --git a/engine/editor/import/resource_importer_imagefont.h b/engine/editor/import/resource_importer_imagefont.h
index 79e9455d..7bca0c69 100644
--- a/engine/editor/import/resource_importer_imagefont.h
+++ b/engine/editor/import/resource_importer_imagefont.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_IMAGEFONT_H
-#define RESOURCE_IMPORTER_IMAGEFONT_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 #include "scene/resources/font.h"
@@ -51,8 +50,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterImageFont();
 };
-
-#endif // RESOURCE_IMPORTER_IMAGEFONT_H
diff --git a/engine/editor/import/resource_importer_layered_texture.h b/engine/editor/import/resource_importer_layered_texture.h
index 271f1f45..844e1540 100644
--- a/engine/editor/import/resource_importer_layered_texture.h
+++ b/engine/editor/import/resource_importer_layered_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_LAYERED_TEXTURE_H
-#define RESOURCE_IMPORTER_LAYERED_TEXTURE_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/io/resource_importer.h"
@@ -54,7 +53,6 @@ public:
 	bool mipmaps = true;
 	bool high_quality = false;
 	Image::UsedChannels used_channels = Image::USED_CHANNELS_RGBA;
-	virtual ~LayeredTextureImport() {}
 };
 
 class ResourceImporterLayeredTexture : public ResourceImporter {
@@ -124,5 +122,3 @@ public:
 	ResourceImporterLayeredTexture(bool p_singleton = false);
 	~ResourceImporterLayeredTexture();
 };
-
-#endif // RESOURCE_IMPORTER_LAYERED_TEXTURE_H
diff --git a/engine/editor/import/resource_importer_shader_file.cpp b/engine/editor/import/resource_importer_shader_file.cpp
index 6c1aa6fc..6cfca20a 100644
--- a/engine/editor/import/resource_importer_shader_file.cpp
+++ b/engine/editor/import/resource_importer_shader_file.cpp
@@ -91,6 +91,7 @@ static String _include_function(const String &p_path, void *userpointer) {
 Error ResourceImporterShaderFile::import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
 	/* STEP 1, Read shader code */
 	ERR_FAIL_COND_V_EDMSG((OS::get_singleton()->get_current_rendering_method() == "gl_compatibility"), ERR_UNAVAILABLE, "Cannot import custom .glsl shaders when using the Compatibility renderer. Please switch to the Forward+ or Mobile renderer to use custom shaders.");
+	ERR_FAIL_COND_V_EDMSG((OS::get_singleton()->get_current_rendering_method() == "dummy"), ERR_UNAVAILABLE, "Cannot import custom .glsl shaders when using the Dummy renderer. Please switch to the Forward+ or Mobile renderer to use custom shaders.");
 	ERR_FAIL_COND_V_EDMSG((DisplayServer::get_singleton()->get_name() == "headless"), ERR_UNAVAILABLE, "Cannot import custom .glsl shaders when running in headless mode.");
 
 	Error err;
@@ -114,6 +115,3 @@ Error ResourceImporterShaderFile::import(ResourceUID::ID p_source_id, const Stri
 
 	return OK;
 }
-
-ResourceImporterShaderFile::ResourceImporterShaderFile() {
-}
diff --git a/engine/editor/import/resource_importer_shader_file.h b/engine/editor/import/resource_importer_shader_file.h
index 440a3d86..57689333 100644
--- a/engine/editor/import/resource_importer_shader_file.h
+++ b/engine/editor/import/resource_importer_shader_file.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_SHADER_FILE_H
-#define RESOURCE_IMPORTER_SHADER_FILE_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 
@@ -52,8 +51,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterShaderFile();
 };
-
-#endif // RESOURCE_IMPORTER_SHADER_FILE_H
diff --git a/engine/editor/import/resource_importer_texture.cpp b/engine/editor/import/resource_importer_texture.cpp
index 594d7d93..2464d5ae 100644
--- a/engine/editor/import/resource_importer_texture.cpp
+++ b/engine/editor/import/resource_importer_texture.cpp
@@ -82,13 +82,6 @@ void ResourceImporterTexture::_texture_reimport_normal(const Ref<CompressedTextu
 	singleton->make_flags[path].flags |= MAKE_NORMAL_FLAG;
 }
 
-inline void ResourceImporterTexture::_print_callback_message(const String &p_message) {
-#ifdef TOOLS_ENABLED
-	EditorToaster::get_singleton()->popup_str(p_message);
-#endif
-	print_line(p_message);
-}
-
 void ResourceImporterTexture::update_imports() {
 	if (EditorFileSystem::get_singleton()->is_scanning() || EditorFileSystem::get_singleton()->is_importing()) {
 		return; // Don't update when EditorFileSystem is doing something else.
@@ -112,7 +105,7 @@ void ResourceImporterTexture::update_imports() {
 		bool changed = false;
 
 		if (E.value.flags & MAKE_NORMAL_FLAG && int(cf->get_value("params", "compress/normal_map")) == 0) {
-			_print_callback_message(
+			print_line(
 					vformat(TTR("%s: Texture detected as used as a normal map in 3D. Enabling red-green texture compression to reduce memory usage (blue channel is discarded)."),
 							String(E.key)));
 
@@ -121,7 +114,7 @@ void ResourceImporterTexture::update_imports() {
 		}
 
 		if (E.value.flags & MAKE_ROUGHNESS_FLAG && int(cf->get_value("params", "roughness/mode")) == 0) {
-			_print_callback_message(
+			print_line(
 					vformat(TTR("%s: Texture detected as used as a roughness map in 3D. Enabling roughness limiter based on the detected associated normal map at %s."),
 							String(E.key), E.value.normal_path_for_roughness));
 
@@ -146,7 +139,7 @@ void ResourceImporterTexture::update_imports() {
 				compress_string = "Basis Universal";
 			}
 
-			_print_callback_message(
+			print_line(
 					vformat(TTR("%s: Texture detected as used in 3D. Enabling mipmap generation and setting the texture compression mode to %s."),
 							String(E.key), compress_string));
 
@@ -240,7 +233,7 @@ void ResourceImporterTexture::get_import_options(const String &p_path, List<Impo
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "compress/hdr_compression", PROPERTY_HINT_ENUM, "Disabled,Opaque Only,Always"), 1));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "compress/normal_map", PROPERTY_HINT_ENUM, "Detect,Enable,Disabled"), 0));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "compress/channel_pack", PROPERTY_HINT_ENUM, "sRGB Friendly,Optimized"), 0));
-	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "mipmaps/generate"), (p_preset == PRESET_3D ? true : false)));
+	r_options->push_back(ImportOption(PropertyInfo(Variant::BOOL, "mipmaps/generate", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), (p_preset == PRESET_3D ? true : false)));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "mipmaps/limit", PROPERTY_HINT_RANGE, "-1,256"), -1));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "roughness/mode", PROPERTY_HINT_ENUM, "Detect,Disabled,Red,Green,Blue,Alpha,Gray"), 0));
 	r_options->push_back(ImportOption(PropertyInfo(Variant::STRING, "roughness/src_normal", PROPERTY_HINT_FILE, "*.bmp,*.dds,*.exr,*.jpeg,*.jpg,*.hdr,*.png,*.svg,*.tga,*.webp"), ""));
diff --git a/engine/editor/import/resource_importer_texture.h b/engine/editor/import/resource_importer_texture.h
index b181b2fe..d1f3ef23 100644
--- a/engine/editor/import/resource_importer_texture.h
+++ b/engine/editor/import/resource_importer_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_TEXTURE_H
-#define RESOURCE_IMPORTER_TEXTURE_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/io/image.h"
@@ -79,7 +78,6 @@ protected:
 
 	static inline void _clamp_hdr_exposure(Ref<Image> &r_image);
 	static inline void _invert_y_channel(Ref<Image> &r_image);
-	static inline void _print_callback_message(const String &p_message);
 
 public:
 	static void save_to_ctex_format(Ref<FileAccess> f, const Ref<Image> &p_image, CompressMode p_compress_mode, Image::UsedChannels p_channels, Image::CompressMode p_compress_format, float p_lossy_quality);
@@ -115,5 +113,3 @@ public:
 	ResourceImporterTexture(bool p_singleton = false);
 	~ResourceImporterTexture();
 };
-
-#endif // RESOURCE_IMPORTER_TEXTURE_H
diff --git a/engine/editor/import/resource_importer_texture_atlas.cpp b/engine/editor/import/resource_importer_texture_atlas.cpp
index 9346cabd..a327f700 100644
--- a/engine/editor/import/resource_importer_texture_atlas.cpp
+++ b/engine/editor/import/resource_importer_texture_atlas.cpp
@@ -404,6 +404,3 @@ Error ResourceImporterTextureAtlas::import_group_file(const String &p_group_file
 
 	return OK;
 }
-
-ResourceImporterTextureAtlas::ResourceImporterTextureAtlas() {
-}
diff --git a/engine/editor/import/resource_importer_texture_atlas.h b/engine/editor/import/resource_importer_texture_atlas.h
index 943f2216..b30a67cc 100644
--- a/engine/editor/import/resource_importer_texture_atlas.h
+++ b/engine/editor/import/resource_importer_texture_atlas.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_TEXTURE_ATLAS_H
-#define RESOURCE_IMPORTER_TEXTURE_ATLAS_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/io/resource_importer.h"
@@ -68,8 +67,4 @@ public:
 	virtual Error import_group_file(const String &p_group_file, const HashMap<String, HashMap<StringName, Variant>> &p_source_file_options, const HashMap<String, String> &p_base_paths) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterTextureAtlas();
 };
-
-#endif // RESOURCE_IMPORTER_TEXTURE_ATLAS_H
diff --git a/engine/editor/import/resource_importer_texture_settings.h b/engine/editor/import/resource_importer_texture_settings.h
index 47a7e160..b69d4118 100644
--- a/engine/editor/import/resource_importer_texture_settings.h
+++ b/engine/editor/import/resource_importer_texture_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_TEXTURE_SETTINGS_H
-#define RESOURCE_IMPORTER_TEXTURE_SETTINGS_H
+#pragma once
 
 // ResourceImporterTextureSettings contains code used by
 // multiple texture importers and the export dialog.
@@ -37,5 +36,3 @@ namespace ResourceImporterTextureSettings {
 bool should_import_s3tc_bptc();
 bool should_import_etc2_astc();
 } //namespace ResourceImporterTextureSettings
-
-#endif // RESOURCE_IMPORTER_TEXTURE_SETTINGS_H
diff --git a/engine/editor/import/resource_importer_wav.cpp b/engine/editor/import/resource_importer_wav.cpp
index a6016ba7..1abaf6dd 100644
--- a/engine/editor/import/resource_importer_wav.cpp
+++ b/engine/editor/import/resource_importer_wav.cpp
@@ -98,6 +98,3 @@ Error ResourceImporterWAV::import(ResourceUID::ID p_source_id, const String &p_s
 	ResourceSaver::save(sample, p_save_path + ".sample");
 	return OK;
 }
-
-ResourceImporterWAV::ResourceImporterWAV() {
-}
diff --git a/engine/editor/import/resource_importer_wav.h b/engine/editor/import/resource_importer_wav.h
index c06de1a7..ba51db61 100644
--- a/engine/editor/import/resource_importer_wav.h
+++ b/engine/editor/import/resource_importer_wav.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_WAV_H
-#define RESOURCE_IMPORTER_WAV_H
+#pragma once
 
 #include "core/io/resource_importer.h"
 #include "scene/resources/audio_stream_wav.h"
@@ -53,8 +52,4 @@ public:
 	virtual Error import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = nullptr, Variant *r_metadata = nullptr) override;
 
 	virtual bool can_import_threaded() const override { return true; }
-
-	ResourceImporterWAV();
 };
-
-#endif // RESOURCE_IMPORTER_WAV_H
diff --git a/engine/editor/import_defaults_editor.h b/engine/editor/import_defaults_editor.h
index ccc74f39..2c0a6086 100644
--- a/engine/editor/import_defaults_editor.h
+++ b/engine/editor/import_defaults_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMPORT_DEFAULTS_EDITOR_H
-#define IMPORT_DEFAULTS_EDITOR_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -64,5 +63,3 @@ public:
 	ImportDefaultsEditor();
 	~ImportDefaultsEditor();
 };
-
-#endif // IMPORT_DEFAULTS_EDITOR_H
diff --git a/engine/editor/import_dock.cpp b/engine/editor/import_dock.cpp
index 1c0249bd..1bbd0611 100644
--- a/engine/editor/import_dock.cpp
+++ b/engine/editor/import_dock.cpp
@@ -124,7 +124,7 @@ void ImportDock::set_edit_path(const String &p_path) {
 	_update_options(p_path, config);
 
 	List<Ref<ResourceImporter>> importers;
-	ResourceFormatImporter::get_singleton()->get_importers_for_extension(p_path.get_extension(), &importers);
+	ResourceFormatImporter::get_singleton()->get_importers_for_file(p_path, &importers);
 	List<Pair<String, String>> importer_names;
 
 	for (const Ref<ResourceImporter> &E : importers) {
@@ -157,9 +157,9 @@ void ImportDock::set_edit_path(const String &p_path) {
 
 void ImportDock::_add_keep_import_option(const String &p_importer_name) {
 	import_as->add_separator();
-	import_as->add_item(TTR("Keep File (exported as is)"));
+	import_as->add_item(TTRC("Keep File (exported as is)"));
 	import_as->set_item_metadata(-1, "keep");
-	import_as->add_item(TTR("Skip File (not exported)"));
+	import_as->add_item(TTRC("Skip File (not exported)"));
 	import_as->set_item_metadata(-1, "skip");
 	if (p_importer_name == "keep") {
 		import_as->select(import_as->get_item_count() - 2);
@@ -297,13 +297,11 @@ void ImportDock::set_edit_multiple_paths(const Vector<String> &p_paths) {
 		if (value_frequency.has(E.option.name)) {
 			Dictionary d = value_frequency[E.option.name];
 			int freq = 0;
-			List<Variant> v;
-			d.get_key_list(&v);
 			Variant value;
-			for (const Variant &F : v) {
-				int f = d[F];
+			for (const KeyValue<Variant, Variant> &kv : d) {
+				int f = kv.value;
 				if (f > freq) {
-					value = F;
+					value = kv.key;
 				}
 			}
 
@@ -316,7 +314,7 @@ void ImportDock::set_edit_multiple_paths(const Vector<String> &p_paths) {
 	params->update();
 
 	List<Ref<ResourceImporter>> importers;
-	ResourceFormatImporter::get_singleton()->get_importers_for_extension(p_paths[0].get_extension(), &importers);
+	ResourceFormatImporter::get_singleton()->get_importers_for_file(p_paths[0], &importers);
 	List<Pair<String, String>> importer_names;
 
 	for (const Ref<ResourceImporter> &E : importers) {
@@ -377,14 +375,14 @@ void ImportDock::_update_preset_menu() {
 	preset->get_popup()->clear();
 
 	if (params->importer.is_null()) {
-		preset->get_popup()->add_item(TTR("Default"));
+		preset->get_popup()->add_item(TTRC("Default"));
 		preset->hide();
 		return;
 	}
 	preset->show();
 
 	if (params->importer->get_preset_count() == 0) {
-		preset->get_popup()->add_item(TTR("Default"));
+		preset->get_popup()->add_item(TTRC("Default"));
 	} else {
 		for (int i = 0; i < params->importer->get_preset_count(); i++) {
 			preset->get_popup()->add_item(params->importer->get_preset_name(i));
@@ -394,7 +392,7 @@ void ImportDock::_update_preset_menu() {
 	preset->get_popup()->add_separator();
 	preset->get_popup()->add_item(vformat(TTR("Set as Default for '%s'"), params->importer->get_visible_name()), ITEM_SET_AS_DEFAULT);
 	if (ProjectSettings::get_singleton()->has_setting("importer_defaults/" + params->importer->get_importer_name())) {
-		preset->get_popup()->add_item(TTR("Load Default"), ITEM_LOAD_DEFAULT);
+		preset->get_popup()->add_item(TTRC("Load Default"), ITEM_LOAD_DEFAULT);
 		preset->get_popup()->add_separator();
 		preset->get_popup()->add_item(vformat(TTR("Clear Default for '%s'"), params->importer->get_visible_name()), ITEM_CLEAR_DEFAULT);
 	}
@@ -456,16 +454,14 @@ void ImportDock::_preset_selected(int p_idx) {
 			ERR_FAIL_COND(!ProjectSettings::get_singleton()->has_setting(setting_name));
 
 			Dictionary import_settings = GLOBAL_GET(setting_name);
-			List<Variant> keys;
-			import_settings.get_key_list(&keys);
 
 			if (params->checking) {
 				params->checked.clear();
 			}
-			for (const Variant &E : keys) {
-				params->values[E] = import_settings[E];
+			for (const KeyValue<Variant, Variant> &kv : import_settings) {
+				params->values[kv.key] = kv.value;
 				if (params->checking) {
-					params->checked.insert(E);
+					params->checked.insert(kv.key);
 				}
 			}
 			params->update();
@@ -719,10 +715,10 @@ void ImportDock::_set_dirty(bool p_dirty) {
 		// Add a dirty marker to notify the user that they should reimport the selected resource to see changes.
 		import->set_text(TTR("Reimport") + " (*)");
 		import->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("warning_color"), EditorStringName(Editor)));
-		import->set_tooltip_text(TTR("You have pending changes that haven't been applied yet. Click Reimport to apply changes made to the import options.\nSelecting another resource in the FileSystem dock without clicking Reimport first will discard changes made in the Import dock."));
+		import->set_tooltip_text(TTRC("You have pending changes that haven't been applied yet. Click Reimport to apply changes made to the import options.\nSelecting another resource in the FileSystem dock without clicking Reimport first will discard changes made in the Import dock."));
 	} else {
 		// Remove the dirty marker on the Reimport button.
-		import->set_text(TTR("Reimport"));
+		import->set_text(TTRC("Reimport"));
 		import->remove_theme_color_override(SceneStringName(font_color));
 		import->set_tooltip_text("");
 	}
@@ -760,17 +756,18 @@ ImportDock::ImportDock() {
 	imported->set_clip_text(true);
 	content->add_child(imported);
 	HBoxContainer *hb = memnew(HBoxContainer);
-	content->add_margin_child(TTR("Import As:"), hb);
+	content->add_margin_child(TTRC("Import As:"), hb);
 	import_as = memnew(OptionButton);
 	import_as->set_disabled(true);
 	import_as->set_fit_to_longest_item(false);
 	import_as->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
 	import_as->set_h_size_flags(SIZE_EXPAND_FILL);
 	import_as->connect(SceneStringName(item_selected), callable_mp(this, &ImportDock::_importer_selected));
+	import_as->set_accessibility_name(TTRC("Import As"));
 	hb->add_child(import_as);
 	import_as->set_h_size_flags(SIZE_EXPAND_FILL);
 	preset = memnew(MenuButton);
-	preset->set_text(TTR("Preset"));
+	preset->set_text(TTRC("Preset"));
 	preset->set_disabled(true);
 	preset->get_popup()->connect("index_pressed", callable_mp(this, &ImportDock::_preset_selected));
 	hb->add_child(preset);
@@ -787,12 +784,12 @@ ImportDock::ImportDock() {
 	hb = memnew(HBoxContainer);
 	content->add_child(hb);
 	import = memnew(Button);
-	import->set_text(TTR("Reimport"));
+	import->set_text(TTRC("Reimport"));
 	import->set_disabled(true);
 	import->connect(SceneStringName(pressed), callable_mp(this, &ImportDock::_reimport_pressed));
 	advanced_spacer = hb->add_spacer();
 	advanced = memnew(Button);
-	advanced->set_text(TTR("Advanced..."));
+	advanced->set_text(TTRC("Advanced..."));
 	hb->add_child(advanced);
 	hb->add_spacer();
 	hb->add_child(import);
@@ -807,16 +804,16 @@ ImportDock::ImportDock() {
 	reimport_confirm->connect(SceneStringName(confirmed), callable_mp(this, &ImportDock::_reimport_and_cleanup));
 
 	VBoxContainer *vbc_confirm = memnew(VBoxContainer());
-	cleanup_warning = memnew(Label(TTR("The imported resource is currently loaded. All instances will be replaced and undo history will be cleared.")));
+	cleanup_warning = memnew(Label(TTRC("The imported resource is currently loaded. All instances will be replaced and undo history will be cleared.")));
 	vbc_confirm->add_child(cleanup_warning);
-	label_warning = memnew(Label(TTR("WARNING: Assets exist that use this resource. They may stop loading properly after changing type.")));
+	label_warning = memnew(Label(TTRC("WARNING: Assets exist that use this resource. They may stop loading properly after changing type.")));
 	vbc_confirm->add_child(label_warning);
 	reimport_confirm->add_child(vbc_confirm);
 
 	params = memnew(ImportDockParameters);
 
 	select_a_resource = memnew(Label);
-	select_a_resource->set_text(TTR("Select a resource file in the filesystem or in the inspector to adjust import settings."));
+	select_a_resource->set_text(TTRC("Select a resource file in the filesystem or in the inspector to adjust import settings."));
 	select_a_resource->set_autowrap_mode(TextServer::AUTOWRAP_WORD);
 	select_a_resource->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
 	select_a_resource->set_v_size_flags(SIZE_EXPAND_FILL);
diff --git a/engine/editor/import_dock.h b/engine/editor/import_dock.h
index 6a6c54f1..33a1d33e 100644
--- a/engine/editor/import_dock.h
+++ b/engine/editor/import_dock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMPORT_DOCK_H
-#define IMPORT_DOCK_H
+#pragma once
 
 #include "core/io/config_file.h"
 #include "core/io/resource_importer.h"
@@ -108,5 +107,3 @@ public:
 	ImportDock();
 	~ImportDock();
 };
-
-#endif // IMPORT_DOCK_H
diff --git a/engine/editor/input_event_configuration_dialog.cpp b/engine/editor/input_event_configuration_dialog.cpp
index 8d9617bc..84168e11 100644
--- a/engine/editor/input_event_configuration_dialog.cpp
+++ b/engine/editor/input_event_configuration_dialog.cpp
@@ -668,13 +668,13 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
 	input_list_search = memnew(LineEdit);
 	input_list_search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	input_list_search->set_placeholder(TTR("Filter Inputs"));
+	input_list_search->set_accessibility_name(TTRC("Filter Inputs"));
 	input_list_search->set_clear_button_enabled(true);
 	input_list_search->connect(SceneStringName(text_changed), callable_mp(this, &InputEventConfigurationDialog::_search_term_updated));
 	manual_vbox->add_child(input_list_search);
 
 	input_list_tree = memnew(Tree);
 	input_list_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	input_list_tree->set_custom_minimum_size(Size2(0, 300 * EDSCALE)); // Min height for tree
 	input_list_tree->connect("item_activated", callable_mp(this, &InputEventConfigurationDialog::_input_list_item_activated));
 	input_list_tree->connect(SceneStringName(item_selected), callable_mp(this, &InputEventConfigurationDialog::_input_list_item_selected));
 	input_list_tree->set_v_size_flags(Control::SIZE_EXPAND_FILL);
@@ -709,6 +709,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
 		device_id_option->add_item(EventListenerLineEdit::get_device_string(i));
 	}
 	device_id_option->connect(SceneStringName(item_selected), callable_mp(this, &InputEventConfigurationDialog::_device_selection_changed));
+	device_id_option->set_accessibility_name(TTRC("Device"));
 	_set_current_device(InputMap::ALL_DEVICES);
 	device_container->add_child(device_id_option);
 
@@ -763,6 +764,7 @@ InputEventConfigurationDialog::InputEventConfigurationDialog() {
 	key_location->add_item(TTR("Left"), (int)KeyLocation::LEFT);
 	key_location->add_item(TTR("Right"), (int)KeyLocation::RIGHT);
 	key_location->connect(SceneStringName(item_selected), callable_mp(this, &InputEventConfigurationDialog::_key_location_selected));
+	key_location->set_accessibility_name(TTRC("Location"));
 
 	location_container->add_child(key_location);
 	additional_options_container->add_child(location_container);
diff --git a/engine/editor/input_event_configuration_dialog.h b/engine/editor/input_event_configuration_dialog.h
index b27f25a5..da498163 100644
--- a/engine/editor/input_event_configuration_dialog.h
+++ b/engine/editor/input_event_configuration_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INPUT_EVENT_CONFIGURATION_DIALOG_H
-#define INPUT_EVENT_CONFIGURATION_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -132,5 +131,3 @@ public:
 
 	InputEventConfigurationDialog();
 };
-
-#endif // INPUT_EVENT_CONFIGURATION_DIALOG_H
diff --git a/engine/editor/inspector_dock.cpp b/engine/editor/inspector_dock.cpp
index 036c0eca..a94afbf5 100644
--- a/engine/editor/inspector_dock.cpp
+++ b/engine/editor/inspector_dock.cpp
@@ -30,6 +30,8 @@
 
 #include "inspector_dock.h"
 
+#include "editor/debugger/editor_debugger_inspector.h"
+#include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_main_screen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
@@ -155,11 +157,11 @@ void InspectorDock::_menu_option_confirm(int p_option, bool p_confirmed) {
 						ti->set_text(0, propname);
 					}
 
-					unique_resources_label->set_text(TTR("The following resources will be duplicated and embedded within this resource/object."));
+					unique_resources_label->set_text(TTRC("The following resources will be duplicated and embedded within this resource/object."));
 					unique_resources_confirmation->popup_centered();
 				} else {
 					current_option = -1;
-					unique_resources_label->set_text(TTR("This object has no resources."));
+					unique_resources_label->set_text(TTRC("This object has no resources."));
 					unique_resources_confirmation->popup_centered();
 				}
 			} else {
@@ -261,7 +263,7 @@ void InspectorDock::_resource_file_selected(const String &p_file) {
 	}
 
 	if (res.is_null()) {
-		info_dialog->set_text(TTR("Failed to load resource."));
+		info_dialog->set_text(TTRC("Failed to load resource."));
 		return;
 	};
 
@@ -351,7 +353,7 @@ void InspectorDock::_prepare_history() {
 			}
 		} else if (Object::cast_to<Node>(obj)) {
 			text = Object::cast_to<Node>(obj)->get_name();
-		} else if (obj->is_class("EditorDebuggerRemoteObject")) {
+		} else if (obj->is_class("EditorDebuggerRemoteObjects")) {
 			text = obj->call("get_title");
 		} else {
 			text = obj->get_class();
@@ -372,6 +374,10 @@ void InspectorDock::_select_history(int p_idx) {
 		return;
 	}
 	EditorNode::get_singleton()->push_item(obj);
+
+	if (const EditorDebuggerRemoteObjects *robjs = Object::cast_to<EditorDebuggerRemoteObjects>(obj)) {
+		EditorDebuggerNode::get_singleton()->set_remote_selection(robjs->remote_object_ids.duplicate());
+	}
 }
 
 void InspectorDock::_resource_created() {
@@ -393,9 +399,28 @@ void InspectorDock::_resource_selected(const Ref<Resource> &p_res, const String
 	EditorNode::get_singleton()->push_item(r.operator->(), p_property);
 }
 
+void InspectorDock::_files_moved(const String &p_old_file, const String &p_new_file) {
+	// Because only the file name is shown, we care about changes on the file name.
+	if (p_old_file.get_file() == p_new_file.get_file()) {
+		return;
+	}
+
+	ObjectID current_id = EditorNode::get_singleton()->get_editor_selection_history()->get_current();
+	Ref<Resource> res(current_id.is_valid() ? ObjectDB::get_instance(current_id) : nullptr);
+	// We only care about updating the path if the current object is the one being renamed.
+	if (res.is_valid() && p_old_file == res->get_path()) {
+		res->set_path(p_new_file);
+		object_selector->update_path();
+	}
+}
+
 void InspectorDock::_edit_forward() {
 	if (EditorNode::get_singleton()->get_editor_selection_history()->next()) {
 		EditorNode::get_singleton()->edit_current();
+
+		if (const EditorDebuggerRemoteObjects *robjs = Object::cast_to<EditorDebuggerRemoteObjects>(current)) {
+			EditorDebuggerNode::get_singleton()->set_remote_selection(robjs->remote_object_ids.duplicate());
+		}
 	}
 }
 
@@ -403,6 +428,10 @@ void InspectorDock::_edit_back() {
 	EditorSelectionHistory *editor_history = EditorNode::get_singleton()->get_editor_selection_history();
 	if ((current && editor_history->previous()) || editor_history->get_path_size() == 1) {
 		EditorNode::get_singleton()->edit_current();
+
+		if (const EditorDebuggerRemoteObjects *robjs = Object::cast_to<EditorDebuggerRemoteObjects>(current)) {
+			EditorDebuggerNode::get_singleton()->set_remote_selection(robjs->remote_object_ids.duplicate());
+		}
 	}
 }
 
@@ -428,8 +457,11 @@ Container *InspectorDock::get_addon_area() {
 
 void InspectorDock::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			update(current);
+			[[fallthrough]];
+		}
 		case NOTIFICATION_THEME_CHANGED:
-		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
 			resource_new_button->set_button_icon(get_editor_theme_icon(SNAME("New")));
 			resource_load_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
@@ -548,7 +580,7 @@ void InspectorDock::update(Object *p_object) {
 	// Calling it 'revertable' internally, because that's what the implementation is based on, but labeling it as 'non-default' because that's more user friendly, even if not 100% accurate.
 	p->add_shortcut(ED_SHORTCUT("property_editor/expand_revertable", TTRC("Expand Non-Default")), EXPAND_REVERTABLE);
 
-	p->add_separator(TTR("Property Name Style"));
+	p->add_separator(TTRC("Property Name Style"));
 	p->add_radio_check_item(vformat(TTR("Raw (e.g. \"%s\")"), "z_index"), PROPERTY_NAME_STYLE_RAW);
 	p->add_radio_check_item(vformat(TTR("Capitalized (e.g. \"%s\")"), "Z Index"), PROPERTY_NAME_STYLE_CAPITALIZED);
 	// TRANSLATORS: "Z Index" should match the existing translated CanvasItem property name in the current language you're working on.
@@ -557,7 +589,7 @@ void InspectorDock::update(Object *p_object) {
 	if (!EditorPropertyNameProcessor::is_localization_available()) {
 		const int index = p->get_item_index(PROPERTY_NAME_STYLE_LOCALIZED);
 		p->set_item_disabled(index, true);
-		p->set_item_tooltip(index, TTR("Localization not available for current language."));
+		p->set_item_tooltip(index, TTRC("Localization not available for current language."));
 	}
 
 	p->add_separator();
@@ -656,14 +688,16 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 
 	resource_new_button = memnew(Button);
 	resource_new_button->set_theme_type_variation("FlatMenuButton");
-	resource_new_button->set_tooltip_text(TTR("Create a new resource in memory and edit it."));
+	resource_new_button->set_tooltip_text(TTRC("Create a new resource in memory and edit it."));
+	resource_new_button->set_accessibility_name(TTRC("New Resource"));
 	general_options_hb->add_child(resource_new_button);
 	resource_new_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_new_resource));
 	resource_new_button->set_focus_mode(Control::FOCUS_NONE);
 
 	resource_load_button = memnew(Button);
 	resource_load_button->set_theme_type_variation("FlatMenuButton");
-	resource_load_button->set_tooltip_text(TTR("Load an existing resource from disk and edit it."));
+	resource_load_button->set_tooltip_text(TTRC("Load an existing resource from disk and edit it."));
+	resource_load_button->set_accessibility_name(TTRC("Load Resource"));
 	general_options_hb->add_child(resource_load_button);
 	resource_load_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_open_resource_selector));
 	resource_load_button->set_focus_mode(Control::FOCUS_NONE);
@@ -671,10 +705,11 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 	resource_save_button = memnew(MenuButton);
 	resource_save_button->set_flat(false);
 	resource_save_button->set_theme_type_variation("FlatMenuButton");
-	resource_save_button->set_tooltip_text(TTR("Save the currently edited resource."));
+	resource_save_button->set_tooltip_text(TTRC("Save the currently edited resource."));
+	resource_save_button->set_accessibility_name(TTRC("Save Resource"));
 	general_options_hb->add_child(resource_save_button);
-	resource_save_button->get_popup()->add_item(TTR("Save"), RESOURCE_SAVE);
-	resource_save_button->get_popup()->add_item(TTR("Save As..."), RESOURCE_SAVE_AS);
+	resource_save_button->get_popup()->add_item(TTRC("Save"), RESOURCE_SAVE);
+	resource_save_button->get_popup()->add_item(TTRC("Save As..."), RESOURCE_SAVE_AS);
 	resource_save_button->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &InspectorDock::_menu_option));
 	resource_save_button->set_focus_mode(Control::FOCUS_NONE);
 	resource_save_button->set_disabled(true);
@@ -682,7 +717,8 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 	resource_extra_button = memnew(MenuButton);
 	resource_extra_button->set_flat(false);
 	resource_extra_button->set_theme_type_variation("FlatMenuButton");
-	resource_extra_button->set_tooltip_text(TTR("Extra resource options."));
+	resource_extra_button->set_tooltip_text(TTRC("Extra resource options."));
+	resource_extra_button->set_accessibility_name(TTRC("Resource Options"));
 	general_options_hb->add_child(resource_extra_button);
 	resource_extra_button->connect("about_to_popup", callable_mp(this, &InspectorDock::_prepare_resource_extra_popup));
 	resource_extra_button->get_popup()->add_shortcut(ED_SHORTCUT("property_editor/paste_resource", TTRC("Edit Resource from Clipboard")), RESOURCE_EDIT_CLIPBOARD);
@@ -699,14 +735,16 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 	backward_button = memnew(Button);
 	backward_button->set_flat(true);
 	general_options_hb->add_child(backward_button);
-	backward_button->set_tooltip_text(TTR("Go to previous edited object in history."));
+	backward_button->set_tooltip_text(TTRC("Go to previous edited object in history."));
+	backward_button->set_accessibility_name(TTRC("Previous Edited Object"));
 	backward_button->set_disabled(true);
 	backward_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_edit_back));
 
 	forward_button = memnew(Button);
 	forward_button->set_flat(true);
 	general_options_hb->add_child(forward_button);
-	forward_button->set_tooltip_text(TTR("Go to next edited object in history."));
+	forward_button->set_tooltip_text(TTRC("Go to next edited object in history."));
+	forward_button->set_accessibility_name(TTRC("Next Edited Object"));
 	forward_button->set_disabled(true);
 	forward_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_edit_forward));
 
@@ -714,7 +752,8 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 	history_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	history_menu->set_flat(false);
 	history_menu->set_theme_type_variation("FlatMenuButton");
-	history_menu->set_tooltip_text(TTR("History of recently edited objects."));
+	history_menu->set_tooltip_text(TTRC("History of recently edited objects."));
+	history_menu->set_accessibility_name(TTRC("Edit History"));
 	general_options_hb->add_child(history_menu);
 	history_menu->connect("about_to_popup", callable_mp(this, &InspectorDock::_prepare_history));
 	history_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &InspectorDock::_select_history));
@@ -729,6 +768,7 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 	open_docs_button->set_theme_type_variation("FlatMenuButton");
 	open_docs_button->set_disabled(true);
 	open_docs_button->set_tooltip_text(TTRC("Open documentation for this object."));
+	open_docs_button->set_accessibility_name(TTRC("Open Documentation"));
 	open_docs_button->set_shortcut(ED_SHORTCUT("property_editor/open_help", TTRC("Open Documentation")));
 	subresource_hb->add_child(open_docs_button);
 	open_docs_button->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_menu_option).bind(OBJECT_REQUEST_HELP));
@@ -743,7 +783,8 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 
 	search = memnew(LineEdit);
 	search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	search->set_placeholder(TTR("Filter Properties"));
+	search->set_placeholder(TTRC("Filter Properties"));
+	search->set_accessibility_name(TTRC("Filter Properties"));
 	search->set_clear_button_enabled(true);
 	property_tools_hb->add_child(search);
 
@@ -751,13 +792,15 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 	object_menu->set_flat(false);
 	object_menu->set_theme_type_variation("FlatMenuButton");
 	property_tools_hb->add_child(object_menu);
-	object_menu->set_tooltip_text(TTR("Manage object properties."));
+	object_menu->set_tooltip_text(TTRC("Manage object properties."));
+	object_menu->set_accessibility_name(TTRC("Object Properties"));
 	object_menu->get_popup()->connect("about_to_popup", callable_mp(this, &InspectorDock::_prepare_menu));
 	object_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &InspectorDock::_menu_option));
 
 	info = memnew(Button);
 	add_child(info);
 	info->set_clip_text(true);
+	info->set_accessibility_name(TTRC("Information"));
 	info->hide();
 	info->connect(SceneStringName(pressed), callable_mp(this, &InspectorDock::_info_pressed));
 
@@ -774,12 +817,11 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 	unique_resources_list_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	unique_resources_list_tree->set_hide_root(true);
 	unique_resources_list_tree->set_columns(1);
-	unique_resources_list_tree->set_column_title(0, TTR("Property"));
 	unique_resources_list_tree->set_custom_minimum_size(Size2(0, 200 * EDSCALE));
 	container->add_child(unique_resources_list_tree);
 
 	Label *bottom_label = memnew(Label);
-	bottom_label->set_text(TTR("This cannot be undone. Are you sure?"));
+	bottom_label->set_text(TTRC("This cannot be undone. Are you sure?"));
 	container->add_child(bottom_label);
 
 	unique_resources_confirmation->connect(SceneStringName(confirmed), callable_mp(this, &InspectorDock::_menu_confirm_current));
@@ -809,6 +851,8 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) {
 
 	inspector->connect("resource_selected", callable_mp(this, &InspectorDock::_resource_selected));
 
+	FileSystemDock::get_singleton()->connect("files_moved", callable_mp(this, &InspectorDock::_files_moved));
+
 	set_process_shortcut_input(true);
 }
 
diff --git a/engine/editor/inspector_dock.h b/engine/editor/inspector_dock.h
index 924f7abd..5db47cde 100644
--- a/engine/editor/inspector_dock.h
+++ b/engine/editor/inspector_dock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INSPECTOR_DOCK_H
-#define INSPECTOR_DOCK_H
+#pragma once
 
 #include "editor/create_dialog.h"
 #include "editor/editor_data.h"
@@ -125,6 +124,7 @@ class InspectorDock : public VBoxContainer {
 	void _info_pressed();
 	void _resource_created();
 	void _resource_selected(const Ref<Resource> &p_res, const String &p_property);
+	void _files_moved(const String &p_old_file, const String &p_new_file);
 	void _edit_forward();
 	void _edit_back();
 	void _menu_collapseall();
@@ -164,5 +164,3 @@ public:
 	InspectorDock(EditorData &p_editor_data);
 	~InspectorDock();
 };
-
-#endif // INSPECTOR_DOCK_H
diff --git a/engine/editor/localization_editor.cpp b/engine/editor/localization_editor.cpp
index 5b75c767..f25995d2 100644
--- a/engine/editor/localization_editor.cpp
+++ b/engine/editor/localization_editor.cpp
@@ -32,6 +32,7 @@
 
 #include "core/config/project_settings.h"
 #include "core/string/translation_server.h"
+#include "editor/editor_settings.h"
 #include "editor/editor_translation_parser.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/filesystem_dock.h"
@@ -400,6 +401,7 @@ void LocalizationEditor::_pot_add_builtin_toggled() {
 }
 
 void LocalizationEditor::_pot_generate(const String &p_file) {
+	EditorSettings::get_singleton()->set_project_metadata("pot_generator", "last_pot_path", p_file);
 	POTGenerator::get_singleton()->generate_pot(p_file);
 }
 
@@ -437,8 +439,8 @@ void LocalizationEditor::_filesystem_files_moved(const String &p_old_file, const
 
 	// Check for the Array elements of the values.
 	Array remap_keys = remaps.keys();
-	for (int i = 0; i < remap_keys.size(); i++) {
-		PackedStringArray remapped_files = remaps[remap_keys[i]];
+	for (const Variant &remap_key : remap_keys) {
+		PackedStringArray remapped_files = remaps[remap_key];
 		bool remapped_files_updated = false;
 
 		for (int j = 0; j < remapped_files.size(); j++) {
@@ -452,12 +454,12 @@ void LocalizationEditor::_filesystem_files_moved(const String &p_old_file, const
 				remapped_files.remove_at(j + 1);
 				remaps_changed = true;
 				remapped_files_updated = true;
-				print_verbose(vformat("Changed remap value \"%s\" to \"%s\" of key \"%s\" due to a moved file.", res_path + ":" + locale_name, remapped_files[j], remap_keys[i]));
+				print_verbose(vformat("Changed remap value \"%s\" to \"%s\" of key \"%s\" due to a moved file.", res_path + ":" + locale_name, remapped_files[j], remap_key));
 			}
 		}
 
 		if (remapped_files_updated) {
-			remaps[remap_keys[i]] = remapped_files;
+			remaps[remap_key] = remapped_files;
 		}
 	}
 
@@ -539,11 +541,9 @@ void LocalizationEditor::update_translations() {
 
 	if (ProjectSettings::get_singleton()->has_setting("internationalization/locale/translation_remaps")) {
 		Dictionary remaps = GLOBAL_GET("internationalization/locale/translation_remaps");
-		List<Variant> rk;
-		remaps.get_key_list(&rk);
 		Vector<String> keys;
-		for (const Variant &E : rk) {
-			keys.push_back(E);
+		for (const KeyValue<Variant, Variant> &kv : remaps) {
+			keys.push_back(kv.key);
 		}
 		keys.sort();
 
@@ -570,7 +570,7 @@ void LocalizationEditor::update_translations() {
 					const String &s2 = selected[j];
 					int qp = s2.rfind_char(':');
 					String path = s2.substr(0, qp);
-					String locale = s2.substr(qp + 1, s2.length());
+					String locale = s2.substr(qp + 1);
 
 					TreeItem *t2 = translation_remap_options->create_item(root2);
 					t2->set_editable(0, false);
@@ -763,6 +763,7 @@ LocalizationEditor::LocalizationEditor() {
 
 		pot_generate_dialog = memnew(EditorFileDialog);
 		pot_generate_dialog->set_file_mode(EditorFileDialog::FILE_MODE_SAVE_FILE);
+		pot_generate_dialog->set_current_path(EditorSettings::get_singleton()->get_project_metadata("pot_generator", "last_pot_path", String()));
 		pot_generate_dialog->connect("file_selected", callable_mp(this, &LocalizationEditor::_pot_generate));
 		add_child(pot_generate_dialog);
 
diff --git a/engine/editor/localization_editor.h b/engine/editor/localization_editor.h
index eb6e5b93..f5e693d2 100644
--- a/engine/editor/localization_editor.h
+++ b/engine/editor/localization_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LOCALIZATION_EDITOR_H
-#define LOCALIZATION_EDITOR_H
+#pragma once
 
 #include "editor/editor_locale_dialog.h"
 #include "scene/gui/check_box.h"
@@ -98,5 +97,3 @@ public:
 
 	LocalizationEditor();
 };
-
-#endif // LOCALIZATION_EDITOR_H
diff --git a/engine/editor/multi_node_edit.cpp b/engine/editor/multi_node_edit.cpp
index ef6a9c9a..7fb7467a 100644
--- a/engine/editor/multi_node_edit.cpp
+++ b/engine/editor/multi_node_edit.cpp
@@ -219,8 +219,29 @@ bool MultiNodeEdit::_property_get_revert(const StringName &p_name, Variant &r_pr
 	return false;
 }
 
+void MultiNodeEdit::_queue_notify_property_list_changed() {
+	if (notify_property_list_changed_pending) {
+		return;
+	}
+	notify_property_list_changed_pending = true;
+	callable_mp(this, &MultiNodeEdit::_notify_property_list_changed).call_deferred();
+}
+
+void MultiNodeEdit::_notify_property_list_changed() {
+	notify_property_list_changed_pending = false;
+	notify_property_list_changed();
+}
+
 void MultiNodeEdit::add_node(const NodePath &p_node) {
 	nodes.push_back(p_node);
+
+	Node *es = EditorNode::get_singleton()->get_edited_scene();
+	if (es) {
+		Node *node = es->get_node_or_null(p_node);
+		if (node) {
+			node->connect(CoreStringName(property_list_changed), callable_mp(this, &MultiNodeEdit::_queue_notify_property_list_changed));
+		}
+	}
 }
 
 int MultiNodeEdit::get_node_count() const {
@@ -295,6 +316,3 @@ void MultiNodeEdit::_bind_methods() {
 	ClassDB::bind_method("_hide_metadata_from_inspector", &MultiNodeEdit::_hide_metadata_from_inspector);
 	ClassDB::bind_method("_get_editor_name", &MultiNodeEdit::_get_editor_name);
 }
-
-MultiNodeEdit::MultiNodeEdit() {
-}
diff --git a/engine/editor/multi_node_edit.h b/engine/editor/multi_node_edit.h
index 07bdaa84..49bf5194 100644
--- a/engine/editor/multi_node_edit.h
+++ b/engine/editor/multi_node_edit.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTI_NODE_EDIT_H
-#define MULTI_NODE_EDIT_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -37,12 +36,15 @@ class MultiNodeEdit : public RefCounted {
 	GDCLASS(MultiNodeEdit, RefCounted);
 
 	LocalVector<NodePath> nodes;
+	bool notify_property_list_changed_pending = false;
 	struct PLData {
 		int uses = 0;
 		PropertyInfo info;
 	};
 
 	bool _set_impl(const StringName &p_name, const Variant &p_value, const String &p_field);
+	void _queue_notify_property_list_changed();
+	void _notify_property_list_changed();
 
 protected:
 	static void _bind_methods();
@@ -80,7 +82,4 @@ public:
 
 		return true;
 	}
-	MultiNodeEdit();
 };
-
-#endif // MULTI_NODE_EDIT_H
diff --git a/engine/editor/node_dock.cpp b/engine/editor/node_dock.cpp
index b0b27b5d..0865c080 100644
--- a/engine/editor/node_dock.cpp
+++ b/engine/editor/node_dock.cpp
@@ -54,7 +54,15 @@ void NodeDock::_save_layout_to_config(Ref<ConfigFile> p_layout, const String &p_
 
 void NodeDock::_load_layout_from_config(Ref<ConfigFile> p_layout, const String &p_section) {
 	const int current_tab = p_layout->get_value(p_section, "dock_node_current_tab", 0);
-	if (current_tab == 0) {
+	if (select_a_node->is_visible()) {
+		if (current_tab == 0) {
+			groups_button->set_pressed_no_signal(false);
+			connections_button->set_pressed_no_signal(true);
+		} else if (current_tab == 1) {
+			groups_button->set_pressed_no_signal(true);
+			connections_button->set_pressed_no_signal(false);
+		}
+	} else if (current_tab == 0) {
 		show_connections();
 	} else if (current_tab == 1) {
 		show_groups();
@@ -110,7 +118,7 @@ NodeDock::NodeDock() {
 
 	connections_button = memnew(Button);
 	connections_button->set_theme_type_variation(SceneStringName(FlatButton));
-	connections_button->set_text(TTR("Signals"));
+	connections_button->set_text(TTRC("Signals"));
 	connections_button->set_toggle_mode(true);
 	connections_button->set_pressed(true);
 	connections_button->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -120,7 +128,7 @@ NodeDock::NodeDock() {
 
 	groups_button = memnew(Button);
 	groups_button->set_theme_type_variation(SceneStringName(FlatButton));
-	groups_button->set_text(TTR("Groups"));
+	groups_button->set_text(TTRC("Groups"));
 	groups_button->set_toggle_mode(true);
 	groups_button->set_pressed(false);
 	groups_button->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -139,7 +147,7 @@ NodeDock::NodeDock() {
 	groups->hide();
 
 	select_a_node = memnew(Label);
-	select_a_node->set_text(TTR("Select a single node to edit its signals and groups."));
+	select_a_node->set_text(TTRC("Select a single node to edit its signals and groups."));
 	select_a_node->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
 	select_a_node->set_v_size_flags(SIZE_EXPAND_FILL);
 	select_a_node->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
diff --git a/engine/editor/node_dock.h b/engine/editor/node_dock.h
index 24a8aa06..c27de1cd 100644
--- a/engine/editor/node_dock.h
+++ b/engine/editor/node_dock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NODE_DOCK_H
-#define NODE_DOCK_H
+#pragma once
 
 #include "groups_editor.h"
 
@@ -73,5 +72,3 @@ public:
 	NodeDock();
 	~NodeDock();
 };
-
-#endif // NODE_DOCK_H
diff --git a/engine/editor/plugins/abstract_polygon_2d_editor.cpp b/engine/editor/plugins/abstract_polygon_2d_editor.cpp
index 553670cb..3d5ffa0c 100644
--- a/engine/editor/plugins/abstract_polygon_2d_editor.cpp
+++ b/engine/editor/plugins/abstract_polygon_2d_editor.cpp
@@ -423,7 +423,7 @@ bool AbstractPolygon2DEditor::forward_gui_input(const Ref<InputEvent> &p_event)
 			//Move the point in a single axis. Should only work when editing a polygon and while holding shift.
 			if (mode == MODE_EDIT && mm->is_shift_pressed()) {
 				Vector2 old_point = pre_move_edit.get(selected_point.vertex);
-				if (ABS(cpoint.x - old_point.x) > ABS(cpoint.y - old_point.y)) {
+				if (Math::abs(cpoint.x - old_point.x) > Math::abs(cpoint.y - old_point.y)) {
 					cpoint.y = old_point.y;
 				} else {
 					cpoint.x = old_point.x;
@@ -707,12 +707,12 @@ AbstractPolygon2DEditor::PosVertex AbstractPolygon2DEditor::closest_edge_point(c
 		const int n_segments = n_points - (_is_line() ? 1 : 0);
 
 		for (int i = 0; i < n_segments; i++) {
-			Vector2 segment[2] = { xform.xform(points[i] + offset),
-				xform.xform(points[(i + 1) % n_points] + offset) };
+			const Vector2 segment_a = xform.xform(points[i] + offset);
+			const Vector2 segment_b = xform.xform(points[(i + 1) % n_points] + offset);
 
-			Vector2 cp = Geometry2D::get_closest_point_to_segment(p_pos, segment);
+			Vector2 cp = Geometry2D::get_closest_point_to_segment(p_pos, segment_a, segment_b);
 
-			if (cp.distance_squared_to(segment[0]) < eps2 || cp.distance_squared_to(segment[1]) < eps2) {
+			if (cp.distance_squared_to(segment_a) < eps2 || cp.distance_squared_to(segment_b) < eps2) {
 				continue; //not valid to reuse point
 			}
 
@@ -737,18 +737,21 @@ AbstractPolygon2DEditor::AbstractPolygon2DEditor(bool p_wip_destructive) {
 
 	button_create = memnew(Button);
 	button_create->set_theme_type_variation(SceneStringName(FlatButton));
+	button_create->set_accessibility_name(TTRC("Create Polygon Points"));
 	add_child(button_create);
 	button_create->connect(SceneStringName(pressed), callable_mp(this, &AbstractPolygon2DEditor::_menu_option).bind(MODE_CREATE));
 	button_create->set_toggle_mode(true);
 
 	button_edit = memnew(Button);
 	button_edit->set_theme_type_variation(SceneStringName(FlatButton));
+	button_edit->set_accessibility_name(TTRC("Edit Polygon Points"));
 	add_child(button_edit);
 	button_edit->connect(SceneStringName(pressed), callable_mp(this, &AbstractPolygon2DEditor::_menu_option).bind(MODE_EDIT));
 	button_edit->set_toggle_mode(true);
 
 	button_delete = memnew(Button);
 	button_delete->set_theme_type_variation(SceneStringName(FlatButton));
+	button_delete->set_accessibility_name(TTRC("Delete Polygon Points"));
 	add_child(button_delete);
 	button_delete->connect(SceneStringName(pressed), callable_mp(this, &AbstractPolygon2DEditor::_menu_option).bind(MODE_DELETE));
 	button_delete->set_toggle_mode(true);
@@ -783,6 +786,3 @@ AbstractPolygon2DEditorPlugin::AbstractPolygon2DEditorPlugin(AbstractPolygon2DEd
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(polygon_editor);
 	polygon_editor->hide();
 }
-
-AbstractPolygon2DEditorPlugin::~AbstractPolygon2DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/abstract_polygon_2d_editor.h b/engine/editor/plugins/abstract_polygon_2d_editor.h
index b6dd0142..7fd9bee4 100644
--- a/engine/editor/plugins/abstract_polygon_2d_editor.h
+++ b/engine/editor/plugins/abstract_polygon_2d_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ABSTRACT_POLYGON_2D_EDITOR_H
-#define ABSTRACT_POLYGON_2D_EDITOR_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/2d/node_2d.h"
@@ -163,7 +162,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	AbstractPolygon2DEditorPlugin(AbstractPolygon2DEditor *p_polygon_editor, const String &p_class);
-	~AbstractPolygon2DEditorPlugin();
 };
-
-#endif // ABSTRACT_POLYGON_2D_EDITOR_H
diff --git a/engine/editor/plugins/animation_blend_space_1d_editor.cpp b/engine/editor/plugins/animation_blend_space_1d_editor.cpp
index 4f185b9d..407a9bec 100644
--- a/engine/editor/plugins/animation_blend_space_1d_editor.cpp
+++ b/engine/editor/plugins/animation_blend_space_1d_editor.cpp
@@ -76,8 +76,8 @@ void AnimationNodeBlendSpace1DEditor::_blend_space_gui_input(const Ref<InputEven
 			animations_menu->clear();
 			animations_to_add.clear();
 
-			List<StringName> classes;
-			ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
+			LocalVector<StringName> classes;
+			ClassDB::get_inheriters_from_class("AnimationRootNode", classes);
 			classes.sort_custom<StringName::AlphCompare>();
 
 			menu->add_submenu_node_item(TTR("Add Animation"), animations_menu);
@@ -667,6 +667,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	top_hb->add_child(tool_blend);
 	tool_blend->set_pressed(true);
 	tool_blend->set_tooltip_text(TTR("Set the blending position within the space"));
+	tool_blend->set_accessibility_name(TTRC("Set Blending Position"));
 	tool_blend->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_tool_switch).bind(3));
 
 	tool_select = memnew(Button);
@@ -675,6 +676,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	tool_select->set_button_group(bg);
 	top_hb->add_child(tool_select);
 	tool_select->set_tooltip_text(TTR("Select and move points, create points with RMB."));
+	tool_select->set_accessibility_name(TTRC("Edit Points"));
 	tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_tool_switch).bind(0));
 
 	tool_create = memnew(Button);
@@ -683,6 +685,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	tool_create->set_button_group(bg);
 	top_hb->add_child(tool_create);
 	tool_create->set_tooltip_text(TTR("Create points."));
+	tool_create->set_accessibility_name(TTRC("Create Points"));
 	tool_create->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_tool_switch).bind(1));
 
 	tool_erase_sep = memnew(VSeparator);
@@ -691,6 +694,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	tool_erase->set_theme_type_variation(SceneStringName(FlatButton));
 	top_hb->add_child(tool_erase);
 	tool_erase->set_tooltip_text(TTR("Erase points."));
+	tool_erase->set_accessibility_name(TTRC("Erase Points"));
 	tool_erase->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_erase_selected));
 
 	top_hb->add_child(memnew(VSeparator));
@@ -701,6 +705,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	top_hb->add_child(snap);
 	snap->set_pressed(true);
 	snap->set_tooltip_text(TTR("Enable snap and show grid."));
+	snap->set_accessibility_name(TTRC("Snap to Grid"));
 	snap->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_snap_toggled));
 
 	snap_value = memnew(SpinBox);
@@ -708,6 +713,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	snap_value->set_min(0.01);
 	snap_value->set_step(0.01);
 	snap_value->set_max(1000);
+	snap_value->set_accessibility_name(TTRC("Grid Step"));
 
 	top_hb->add_child(memnew(VSeparator));
 	top_hb->add_child(memnew(Label(TTR("Sync:"))));
@@ -732,6 +738,7 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 	edit_value->set_min(-1000);
 	edit_value->set_max(1000);
 	edit_value->set_step(0.01);
+	edit_value->set_accessibility_name(TTRC("Blend Value"));
 	edit_value->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace1DEditor::_edit_point_pos));
 
 	open_editor = memnew(Button);
@@ -768,14 +775,17 @@ AnimationNodeBlendSpace1DEditor::AnimationNodeBlendSpace1DEditor() {
 		min_value->set_min(-10000);
 		min_value->set_max(0);
 		min_value->set_step(0.01);
+		min_value->set_accessibility_name(TTRC("Min"));
 
 		max_value = memnew(SpinBox);
 		max_value->set_min(0.01);
 		max_value->set_max(10000);
 		max_value->set_step(0.01);
+		max_value->set_accessibility_name(TTRC("Max"));
 
 		label_value = memnew(LineEdit);
 		label_value->set_expand_to_text_length_enabled(true);
+		label_value->set_accessibility_name(TTRC("Value"));
 
 		// now add
 
diff --git a/engine/editor/plugins/animation_blend_space_1d_editor.h b/engine/editor/plugins/animation_blend_space_1d_editor.h
index 9409fb61..1e82122c 100644
--- a/engine/editor/plugins/animation_blend_space_1d_editor.h
+++ b/engine/editor/plugins/animation_blend_space_1d_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_BLEND_SPACE_1D_EDITOR_H
-#define ANIMATION_BLEND_SPACE_1D_EDITOR_H
+#pragma once
 
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/plugins/editor_plugin.h"
@@ -136,5 +135,3 @@ public:
 	virtual void edit(const Ref<AnimationNode> &p_node) override;
 	AnimationNodeBlendSpace1DEditor();
 };
-
-#endif // ANIMATION_BLEND_SPACE_1D_EDITOR_H
diff --git a/engine/editor/plugins/animation_blend_space_2d_editor.cpp b/engine/editor/plugins/animation_blend_space_2d_editor.cpp
index ac87f4bb..5dde9d52 100644
--- a/engine/editor/plugins/animation_blend_space_2d_editor.cpp
+++ b/engine/editor/plugins/animation_blend_space_2d_editor.cpp
@@ -119,10 +119,10 @@ void AnimationNodeBlendSpace2DEditor::_blend_space_gui_input(const Ref<InputEven
 			menu->clear(false);
 			animations_menu->clear();
 			animations_to_add.clear();
-			List<StringName> classes;
+			LocalVector<StringName> classes;
 			classes.sort_custom<StringName::AlphCompare>();
 
-			ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
+			ClassDB::get_inheriters_from_class("AnimationRootNode", classes);
 			menu->add_submenu_node_item(TTR("Add Animation"), animations_menu);
 
 			List<StringName> names;
@@ -886,6 +886,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	top_hb->add_child(tool_blend);
 	tool_blend->set_pressed(true);
 	tool_blend->set_tooltip_text(TTR("Set the blending position within the space"));
+	tool_blend->set_accessibility_name(TTRC("Set Blending Position"));
 	tool_blend->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(3));
 
 	tool_select = memnew(Button);
@@ -894,6 +895,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	tool_select->set_button_group(bg);
 	top_hb->add_child(tool_select);
 	tool_select->set_tooltip_text(TTR("Select and move points, create points with RMB."));
+	tool_select->set_accessibility_name(TTRC("Edit Points"));
 	tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(0));
 
 	tool_create = memnew(Button);
@@ -902,6 +904,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	tool_create->set_button_group(bg);
 	top_hb->add_child(tool_create);
 	tool_create->set_tooltip_text(TTR("Create points."));
+	tool_create->set_accessibility_name(TTRC("Create Points"));
 	tool_create->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(1));
 
 	tool_triangle = memnew(Button);
@@ -910,6 +913,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	tool_triangle->set_button_group(bg);
 	top_hb->add_child(tool_triangle);
 	tool_triangle->set_tooltip_text(TTR("Create triangles by connecting points."));
+	tool_triangle->set_accessibility_name(TTRC("Create Triangles"));
 	tool_triangle->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_tool_switch).bind(2));
 
 	tool_erase_sep = memnew(VSeparator);
@@ -918,6 +922,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	tool_erase->set_theme_type_variation(SceneStringName(FlatButton));
 	top_hb->add_child(tool_erase);
 	tool_erase->set_tooltip_text(TTR("Erase points and triangles."));
+	tool_erase->set_accessibility_name(TTRC("Erase Points"));
 	tool_erase->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_erase_selected));
 	tool_erase->set_disabled(true);
 
@@ -929,6 +934,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	auto_triangles->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_auto_triangles_toggled));
 	auto_triangles->set_toggle_mode(true);
 	auto_triangles->set_tooltip_text(TTR("Generate blend triangles automatically (instead of manually)"));
+	auto_triangles->set_accessibility_name(TTRC("Generate Triangles"));
 
 	top_hb->add_child(memnew(VSeparator));
 
@@ -938,6 +944,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	top_hb->add_child(snap);
 	snap->set_pressed(true);
 	snap->set_tooltip_text(TTR("Enable snap and show grid."));
+	snap->set_accessibility_name(TTRC("Snap to Grid"));
 	snap->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_snap_toggled));
 
 	snap_x = memnew(SpinBox);
@@ -946,6 +953,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	snap_x->set_min(0.01);
 	snap_x->set_step(0.01);
 	snap_x->set_max(1000);
+	snap_x->set_accessibility_name(TTRC("Grid X Step"));
 
 	snap_y = memnew(SpinBox);
 	top_hb->add_child(snap_y);
@@ -953,6 +961,7 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	snap_y->set_min(0.01);
 	snap_y->set_step(0.01);
 	snap_y->set_max(1000);
+	snap_y->set_accessibility_name(TTRC("Grid Y Step"));
 
 	top_hb->add_child(memnew(VSeparator));
 
@@ -977,12 +986,14 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 	edit_x->set_min(-1000);
 	edit_x->set_step(0.01);
 	edit_x->set_max(1000);
+	edit_x->set_accessibility_name(TTRC("Blend X Value"));
 	edit_x->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_edit_point_pos));
 	edit_y = memnew(SpinBox);
 	edit_hb->add_child(edit_y);
 	edit_y->set_min(-1000);
 	edit_y->set_step(0.01);
 	edit_y->set_max(1000);
+	edit_y->set_accessibility_name(TTRC("Blend X Value"));
 	edit_y->connect(SceneStringName(value_changed), callable_mp(this, &AnimationNodeBlendSpace2DEditor::_edit_point_pos));
 	open_editor = memnew(Button);
 	edit_hb->add_child(open_editor);
@@ -1004,13 +1015,16 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 		main_grid->add_child(left_vbox);
 		left_vbox->set_v_size_flags(SIZE_EXPAND_FILL);
 		max_y_value = memnew(SpinBox);
+		max_y_value->set_accessibility_name(TTRC("Max Y"));
 		left_vbox->add_child(max_y_value);
 		left_vbox->add_spacer();
 		label_y = memnew(LineEdit);
+		label_y->set_accessibility_name(TTRC("Y Value"));
 		left_vbox->add_child(label_y);
 		label_y->set_expand_to_text_length_enabled(true);
 		left_vbox->add_spacer();
 		min_y_value = memnew(SpinBox);
+		min_y_value->set_accessibility_name(TTRC("Min Y"));
 		left_vbox->add_child(min_y_value);
 
 		max_y_value->set_max(10000);
@@ -1040,13 +1054,16 @@ AnimationNodeBlendSpace2DEditor::AnimationNodeBlendSpace2DEditor() {
 		main_grid->add_child(bottom_vbox);
 		bottom_vbox->set_h_size_flags(SIZE_EXPAND_FILL);
 		min_x_value = memnew(SpinBox);
+		min_x_value->set_accessibility_name(TTRC("Min X"));
 		bottom_vbox->add_child(min_x_value);
 		bottom_vbox->add_spacer();
 		label_x = memnew(LineEdit);
+		label_y->set_accessibility_name(TTRC("X Value"));
 		bottom_vbox->add_child(label_x);
 		label_x->set_expand_to_text_length_enabled(true);
 		bottom_vbox->add_spacer();
 		max_x_value = memnew(SpinBox);
+		max_x_value->set_accessibility_name(TTRC("Max Y"));
 		bottom_vbox->add_child(max_x_value);
 
 		max_x_value->set_max(10000);
diff --git a/engine/editor/plugins/animation_blend_space_2d_editor.h b/engine/editor/plugins/animation_blend_space_2d_editor.h
index acc718d1..27370ee9 100644
--- a/engine/editor/plugins/animation_blend_space_2d_editor.h
+++ b/engine/editor/plugins/animation_blend_space_2d_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_BLEND_SPACE_2D_EDITOR_H
-#define ANIMATION_BLEND_SPACE_2D_EDITOR_H
+#pragma once
 
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/plugins/editor_plugin.h"
@@ -147,5 +146,3 @@ public:
 	virtual void edit(const Ref<AnimationNode> &p_node) override;
 	AnimationNodeBlendSpace2DEditor();
 };
-
-#endif // ANIMATION_BLEND_SPACE_2D_EDITOR_H
diff --git a/engine/editor/plugins/animation_blend_tree_editor_plugin.cpp b/engine/editor/plugins/animation_blend_tree_editor_plugin.cpp
index d39ce5f9..137dffc0 100644
--- a/engine/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/engine/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -176,6 +176,7 @@ void AnimationNodeBlendTreeEditor::update_graph() {
 				delete_button->set_flat(true);
 				delete_button->set_focus_mode(FOCUS_NONE);
 				delete_button->set_button_icon(get_editor_theme_icon(SNAME("Close")));
+				delete_button->set_accessibility_name(TTRC("Delete"));
 				delete_button->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeBlendTreeEditor::_delete_node_request).bind(E), CONNECT_DEFERRED);
 				node->get_titlebar_hbox()->add_child(delete_button);
 			}
@@ -1271,9 +1272,6 @@ AnimationNodeBlendTreeEditor::AnimationNodeBlendTreeEditor() {
 	EditorInspector::add_inspector_plugin(animation_node_inspector_plugin);
 }
 
-AnimationNodeBlendTreeEditor::~AnimationNodeBlendTreeEditor() {
-}
-
 // EditorPluginAnimationNodeAnimation
 
 void AnimationNodeAnimationEditor::_open_set_custom_timeline_from_marker_dialog() {
@@ -1370,9 +1368,6 @@ AnimationNodeAnimationEditor::AnimationNodeAnimationEditor(Ref<AnimationNodeAnim
 	bottom_spacer->set_custom_minimum_size(Size2(0, 2) * EDSCALE);
 }
 
-AnimationNodeAnimationEditor::~AnimationNodeAnimationEditor() {
-}
-
 void AnimationNodeAnimationEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
@@ -1412,6 +1407,7 @@ AnimationNodeAnimationEditorDialog::AnimationNodeAnimationEditorDialog() {
 	label_start->set_stretch_ratio(1);
 	select_start = memnew(OptionButton);
 	select_start->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	select_start->set_accessibility_name(TTRC("Start Marker"));
 	grid->add_child(select_start);
 	select_start->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	select_start->set_stretch_ratio(2);
@@ -1422,10 +1418,8 @@ AnimationNodeAnimationEditorDialog::AnimationNodeAnimationEditorDialog() {
 	label_end->set_stretch_ratio(1);
 	select_end = memnew(OptionButton);
 	select_end->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	select_end->set_accessibility_name(TTRC("End Marker"));
 	grid->add_child(select_end);
 	select_end->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	select_end->set_stretch_ratio(2);
 }
-
-AnimationNodeAnimationEditorDialog::~AnimationNodeAnimationEditorDialog() {
-}
diff --git a/engine/editor/plugins/animation_blend_tree_editor_plugin.h b/engine/editor/plugins/animation_blend_tree_editor_plugin.h
index 1d1b3651..f41cbd0a 100644
--- a/engine/editor/plugins/animation_blend_tree_editor_plugin.h
+++ b/engine/editor/plugins/animation_blend_tree_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_BLEND_TREE_EDITOR_PLUGIN_H
-#define ANIMATION_BLEND_TREE_EDITOR_PLUGIN_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "editor/editor_inspector.h"
@@ -169,7 +168,6 @@ public:
 	void update_graph();
 
 	AnimationNodeBlendTreeEditor();
-	~AnimationNodeBlendTreeEditor();
 };
 
 // EditorPluginAnimationNodeAnimation
@@ -192,7 +190,6 @@ class AnimationNodeAnimationEditorDialog : public ConfirmationDialog {
 
 public:
 	AnimationNodeAnimationEditorDialog();
-	~AnimationNodeAnimationEditorDialog();
 };
 
 class AnimationNodeAnimationEditor : public VBoxContainer {
@@ -207,10 +204,7 @@ class AnimationNodeAnimationEditor : public VBoxContainer {
 
 public:
 	AnimationNodeAnimationEditor(Ref<AnimationNodeAnimation> p_animation_node_animation);
-	~AnimationNodeAnimationEditor();
 
 protected:
 	void _notification(int p_what);
 };
-
-#endif // ANIMATION_BLEND_TREE_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/animation_library_editor.h b/engine/editor/plugins/animation_library_editor.h
index 82bd2d13..6f00de37 100644
--- a/engine/editor/plugins/animation_library_editor.h
+++ b/engine/editor/plugins/animation_library_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_LIBRARY_EDITOR_H
-#define ANIMATION_LIBRARY_EDITOR_H
+#pragma once
 
 #include "core/io/config_file.h"
 #include "core/templates/vector.h"
@@ -128,5 +127,3 @@ public:
 	void update_tree();
 	AnimationLibraryEditor();
 };
-
-#endif // ANIMATION_LIBRARY_EDITOR_H
diff --git a/engine/editor/plugins/animation_player_editor_plugin.cpp b/engine/editor/plugins/animation_player_editor_plugin.cpp
index e00c7526..8495d981 100644
--- a/engine/editor/plugins/animation_player_editor_plugin.cpp
+++ b/engine/editor/plugins/animation_player_editor_plugin.cpp
@@ -503,7 +503,7 @@ void AnimationPlayerEditor::_animation_rename() {
 
 	// Remove library prefix if present.
 	if (selected_name.contains_char('/')) {
-		selected_name = selected_name.get_slice("/", 1);
+		selected_name = selected_name.get_slicec('/', 1);
 	}
 
 	name_dialog->set_title(TTR("Rename Animation"));
@@ -536,7 +536,7 @@ void AnimationPlayerEditor::_animation_remove_confirmed() {
 
 	// For names of form lib_name/anim_name, remove library name prefix.
 	if (current.contains_char('/')) {
-		current = current.get_slice("/", 1);
+		current = current.get_slicec('/', 1);
 	}
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Remove Animation"));
@@ -625,8 +625,8 @@ void AnimationPlayerEditor::_animation_name_edited() {
 			// Extract library prefix if present.
 			String new_library_prefix = "";
 			if (current.contains_char('/')) {
-				new_library_prefix = current.get_slice("/", 0) + "/";
-				current = current.get_slice("/", 1);
+				new_library_prefix = current.get_slicec('/', 0) + "/";
+				current = current.get_slicec('/', 1);
 			}
 
 			undo_redo->create_action(TTR("Rename Animation"));
@@ -655,6 +655,8 @@ void AnimationPlayerEditor::_animation_name_edited() {
 				if (current_anim.is_valid()) {
 					new_anim->set_step(current_anim->get_step());
 				}
+			} else {
+				new_anim->set_step(EDITOR_GET("editors/animation/default_animation_step"));
 			}
 
 			String library_name;
@@ -923,6 +925,10 @@ void AnimationPlayerEditor::set_state(const Dictionary &p_state) {
 	}
 }
 
+void AnimationPlayerEditor::clear() {
+	track_editor->clear();
+}
+
 void AnimationPlayerEditor::_animation_resource_edit() {
 	String current = _get_current();
 	if (current != String()) {
@@ -1340,7 +1346,7 @@ void AnimationPlayerEditor::_animation_duplicate() {
 
 	if (new_name.contains_char('/')) {
 		// Discard library prefix.
-		new_name = new_name.get_slice("/", 1);
+		new_name = new_name.get_slicec('/', 1);
 	}
 
 	_update_name_dialog_library_dropdown();
@@ -1926,7 +1932,7 @@ AnimationMixer *AnimationPlayerEditor::fetch_mixer_for_library() const {
 }
 
 Node *AnimationPlayerEditor::get_cached_root_node() const {
-	return Object::cast_to<Node>(ObjectDB::get_instance(cached_root_node_id));
+	return ObjectDB::get_instance<Node>(cached_root_node_id);
 }
 
 bool AnimationPlayerEditor::_validate_tracks(const Ref<Animation> p_anim) {
@@ -2013,26 +2019,31 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	play_bw_from = memnew(Button);
 	play_bw_from->set_theme_type_variation(SceneStringName(FlatButton));
 	play_bw_from->set_tooltip_text(TTR("Play Animation Backwards"));
+	play_bw_from->set_accessibility_name(TTRC("Play Backwards"));
 	playback_container->add_child(play_bw_from);
 
 	play_bw = memnew(Button);
 	play_bw->set_theme_type_variation(SceneStringName(FlatButton));
 	play_bw->set_tooltip_text(TTR("Play Animation Backwards from End"));
+	play_bw->set_accessibility_name(TTRC("Play Backwards from End"));
 	playback_container->add_child(play_bw);
 
 	stop = memnew(Button);
 	stop->set_theme_type_variation(SceneStringName(FlatButton));
 	stop->set_tooltip_text(TTR("Pause/Stop Animation"));
+	stop->set_accessibility_name(TTRC("Pause/Stop"));
 	playback_container->add_child(stop);
 
 	play = memnew(Button);
 	play->set_theme_type_variation(SceneStringName(FlatButton));
 	play->set_tooltip_text(TTR("Play Animation from Start"));
+	play->set_accessibility_name(TTRC("Play from Start"));
 	playback_container->add_child(play);
 
 	play_from = memnew(Button);
 	play_from->set_theme_type_variation(SceneStringName(FlatButton));
 	play_from->set_tooltip_text(TTR("Play Animation"));
+	play_from->set_accessibility_name(TTRC("Play"));
 	playback_container->add_child(play_from);
 
 	frame = memnew(SpinBox);
@@ -2041,6 +2052,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	frame->set_stretch_ratio(2);
 	frame->set_step(0.0001);
 	frame->set_tooltip_text(TTR("Animation position (in seconds)."));
+	frame->set_accessibility_name(TTRC("Frame"));
 
 	hb->add_child(memnew(VSeparator));
 
@@ -2049,6 +2061,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	scale->set_h_size_flags(SIZE_EXPAND_FILL);
 	scale->set_stretch_ratio(1);
 	scale->set_tooltip_text(TTR("Scale animation playback globally for the node."));
+	scale->set_accessibility_name(TTRC("Scale"));
 	scale->hide();
 
 	delete_dialog = memnew(ConfirmationDialog);
@@ -2076,6 +2089,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 
 	animation = memnew(OptionButton);
 	hb->add_child(animation);
+	animation->set_accessibility_name(TTRC("Animation"));
 	animation->set_h_size_flags(SIZE_EXPAND_FILL);
 	animation->set_tooltip_text(TTR("Display list of animations in player."));
 	animation->set_clip_text(true);
@@ -2085,6 +2099,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	autoplay->set_theme_type_variation(SceneStringName(FlatButton));
 	hb->add_child(autoplay);
 	autoplay->set_tooltip_text(TTR("Autoplay on Load"));
+	autoplay->set_accessibility_name(TTRC("Autoplay on Load"));
 
 	hb->add_child(memnew(VSeparator));
 
@@ -2097,10 +2112,12 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	onion_toggle->set_theme_type_variation(SceneStringName(FlatButton));
 	onion_toggle->set_toggle_mode(true);
 	onion_toggle->set_tooltip_text(TTR("Enable Onion Skinning"));
+	onion_toggle->set_accessibility_name(TTRC("Onion Skinning"));
 	onion_toggle->connect(SceneStringName(pressed), callable_mp(this, &AnimationPlayerEditor::_onion_skinning_menu).bind(ONION_SKINNING_ENABLE));
 	hb->add_child(onion_toggle);
 
 	onion_skinning = memnew(MenuButton);
+	onion_skinning->set_accessibility_name(TTRC("Onion Skinning Options"));
 	onion_skinning->set_flat(false);
 	onion_skinning->set_theme_type_variation("FlatMenuButton");
 	onion_skinning->set_tooltip_text(TTR("Onion Skinning Options"));
@@ -2127,6 +2144,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug
 	pin->set_theme_type_variation(SceneStringName(FlatButton));
 	pin->set_toggle_mode(true);
 	pin->set_tooltip_text(TTR("Pin AnimationPlayer"));
+	pin->set_accessibility_name(TTRC("Pin AnimationPlayer"));
 	hb->add_child(pin);
 	pin->connect(SceneStringName(pressed), callable_mp(this, &AnimationPlayerEditor::_pin_pressed));
 
diff --git a/engine/editor/plugins/animation_player_editor_plugin.h b/engine/editor/plugins/animation_player_editor_plugin.h
index 5295934d..dfcc65ff 100644
--- a/engine/editor/plugins/animation_player_editor_plugin.h
+++ b/engine/editor/plugins/animation_player_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_PLAYER_EDITOR_PLUGIN_H
-#define ANIMATION_PLAYER_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/animation_track_editor.h"
 #include "editor/plugins/animation_library_editor.h"
@@ -266,6 +265,7 @@ public:
 	AnimationTrackEditor *get_track_editor() { return track_editor; }
 	Dictionary get_state() const;
 	void set_state(const Dictionary &p_state);
+	void clear();
 
 	void ensure_visibility();
 
@@ -298,6 +298,7 @@ protected:
 public:
 	virtual Dictionary get_state() const override { return anim_editor->get_state(); }
 	virtual void set_state(const Dictionary &p_state) override { anim_editor->set_state(p_state); }
+	virtual void clear() override { anim_editor->clear(); }
 
 	virtual String get_plugin_name() const override { return "Anim"; }
 	bool has_main_screen() const override { return false; }
@@ -363,5 +364,3 @@ public:
 
 	AnimationMarkerKeyEditEditorPlugin();
 };
-
-#endif // ANIMATION_PLAYER_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/animation_state_machine_editor.cpp b/engine/editor/plugins/animation_state_machine_editor.cpp
index f5159818..94345158 100644
--- a/engine/editor/plugins/animation_state_machine_editor.cpp
+++ b/engine/editor/plugins/animation_state_machine_editor.cpp
@@ -39,10 +39,10 @@
 #include "editor/gui/editor_file_dialog.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/animation/animation_blend_tree.h"
+#include "scene/gui/line_edit.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/panel_container.h"
 #include "scene/gui/separator.h"
-#include "scene/gui/tree.h"
 #include "scene/main/viewport.h"
 #include "scene/main/window.h"
 #include "scene/resources/style_box_flat.h"
@@ -232,11 +232,7 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 
 		// First find closest lines using point-to-segment distance.
 		for (int i = 0; i < transition_lines.size(); i++) {
-			Vector2 s[2] = {
-				transition_lines[i].from,
-				transition_lines[i].to
-			};
-			Vector2 cpoint = Geometry2D::get_closest_point_to_segment(mb->get_position(), s);
+			Vector2 cpoint = Geometry2D::get_closest_point_to_segment(mb->get_position(), transition_lines[i].from, transition_lines[i].to);
 			float d = cpoint.distance_to(mb->get_position());
 
 			if (d > transition_lines[i].width) {
@@ -464,14 +460,14 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 				}
 				Vector2 npos = state_machine->get_node_position(E);
 
-				float d_x = ABS(npos.x - cpos.x);
+				float d_x = Math::abs(npos.x - cpos.x);
 				if (d_x < MIN(5, best_d_x)) {
 					drag_ofs.x -= cpos.x - npos.x;
 					best_d_x = d_x;
 					snap_x = E;
 				}
 
-				float d_y = ABS(npos.y - cpos.y);
+				float d_y = Math::abs(npos.y - cpos.y);
 				if (d_y < MIN(5, best_d_y)) {
 					drag_ofs.y -= cpos.y - npos.y;
 					best_d_y = d_y;
@@ -545,11 +541,7 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv
 			int closest = -1;
 			float closest_d = 1e20;
 			for (int i = 0; i < transition_lines.size(); i++) {
-				Vector2 s[2] = {
-					transition_lines[i].from,
-					transition_lines[i].to
-				};
-				Vector2 cpoint = Geometry2D::get_closest_point_to_segment(mm->get_position(), s);
+				Vector2 cpoint = Geometry2D::get_closest_point_to_segment(mm->get_position(), transition_lines[i].from, transition_lines[i].to);
 				float d = cpoint.distance_to(mm->get_position());
 				if (d > transition_lines[i].width) {
 					continue;
@@ -639,18 +631,18 @@ void AnimationNodeStateMachineEditor::_open_menu(const Vector2 &p_position) {
 		}
 	}
 
-	List<StringName> classes;
-	ClassDB::get_inheriters_from_class("AnimationRootNode", &classes);
+	LocalVector<StringName> classes;
+	ClassDB::get_inheriters_from_class("AnimationRootNode", classes);
 	classes.sort_custom<StringName::AlphCompare>();
 
-	for (List<StringName>::Element *E = classes.front(); E; E = E->next()) {
-		String name = String(E->get()).replace_first("AnimationNode", "");
+	for (const StringName &class_name : classes) {
+		String name = String(class_name).replace_first("AnimationNode", "");
 		if (name == "Animation" || name == "StartState" || name == "EndState") {
 			continue; // nope
 		}
 		int idx = menu->get_item_count();
 		menu->add_item(vformat(TTR("Add %s"), name), idx);
-		menu->set_item_metadata(idx, E->get());
+		menu->set_item_metadata(idx, class_name);
 	}
 	Ref<AnimationNode> clipb = EditorSettings::get_singleton()->get_resource_clipboard();
 
@@ -714,50 +706,6 @@ void AnimationNodeStateMachineEditor::_stop_connecting() {
 	state_machine_draw->queue_redraw();
 }
 
-void AnimationNodeStateMachineEditor::_delete_selected() {
-	TreeItem *item = delete_tree->get_next_selected(nullptr);
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	while (item) {
-		if (!updating) {
-			updating = true;
-			undo_redo->create_action("Transition(s) Removed");
-		}
-
-		Vector<String> path = item->get_text(0).split(" -> ");
-
-		selected_transition_from = path[0];
-		selected_transition_to = path[1];
-		_erase_selected(true);
-
-		item = delete_tree->get_next_selected(item);
-	}
-
-	if (updating) {
-		undo_redo->commit_action();
-		updating = false;
-	}
-}
-
-void AnimationNodeStateMachineEditor::_delete_all() {
-	updating = true;
-	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
-	undo_redo->create_action("Transition(s) Removed");
-	_erase_selected(true);
-	undo_redo->commit_action();
-	updating = false;
-
-	delete_window->hide();
-}
-
-void AnimationNodeStateMachineEditor::_delete_tree_draw() {
-	TreeItem *item = delete_tree->get_next_selected(nullptr);
-	while (item) {
-		delete_window->get_cancel_button()->set_disabled(false);
-		return;
-	}
-	delete_window->get_cancel_button()->set_disabled(true);
-}
-
 void AnimationNodeStateMachineEditor::_file_opened(const String &p_file) {
 	file_loaded = ResourceLoader::load(p_file);
 	if (file_loaded.is_valid()) {
@@ -929,7 +877,7 @@ void AnimationNodeStateMachineEditor::_connection_draw(const Vector2 &p_from, co
 		state_machine_draw->draw_line(p_from, p_from.lerp(p_to, p_fade_ratio), fade_line_color, 2);
 	}
 
-	const int ICON_COUNT = sizeof(theme_cache.transition_icons) / sizeof(*theme_cache.transition_icons);
+	const int ICON_COUNT = std::size(theme_cache.transition_icons);
 	int icon_index = p_mode + (p_auto_advance ? ICON_COUNT / 2 : 0);
 	ERR_FAIL_COND(icon_index >= ICON_COUNT);
 	Ref<Texture2D> icon = theme_cache.transition_icons[icon_index];
@@ -1822,6 +1770,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	tool_select->set_button_group(bg);
 	tool_select->set_pressed(true);
 	tool_select->set_tooltip_text(TTR("Select and move nodes.\nRMB: Add node at position clicked.\nShift+LMB+Drag: Connects the selected node with another node or creates a new node if you select an area without nodes."));
+	tool_select->set_accessibility_name(TTRC("Edit Nodes"));
 	tool_select->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_update_mode), CONNECT_DEFERRED);
 
 	tool_create = memnew(Button);
@@ -1830,6 +1779,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	tool_create->set_toggle_mode(true);
 	tool_create->set_button_group(bg);
 	tool_create->set_tooltip_text(TTR("Create new nodes."));
+	tool_create->set_accessibility_name(TTRC("Create Nodes"));
 	tool_create->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_update_mode), CONNECT_DEFERRED);
 
 	tool_connect = memnew(Button);
@@ -1838,6 +1788,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	tool_connect->set_toggle_mode(true);
 	tool_connect->set_button_group(bg);
 	tool_connect->set_tooltip_text(TTR("Connect nodes."));
+	tool_connect->set_accessibility_name(TTRC("Connect Nodes"));
 	tool_connect->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_update_mode), CONNECT_DEFERRED);
 
 	// Context-sensitive selection tools:
@@ -1850,6 +1801,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	tool_erase->set_tooltip_text(TTR("Remove selected node or transition."));
 	tool_erase->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_erase_selected).bind(false));
 	tool_erase->set_disabled(true);
+	tool_erase->set_accessibility_name(TTRC("Erase"));
 	selection_tools_hb->add_child(tool_erase);
 
 	transition_tools_hb = memnew(HBoxContainer);
@@ -1865,6 +1817,7 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	auto_advance->set_tooltip_text(TTR("New Transitions Should Auto Advance"));
 	auto_advance->set_toggle_mode(true);
 	auto_advance->set_pressed(true);
+	auto_advance->set_accessibility_name(TTRC("Transitions Auto Advance"));
 	transition_tools_hb->add_child(auto_advance);
 
 	//
@@ -1951,23 +1904,6 @@ AnimationNodeStateMachineEditor::AnimationNodeStateMachineEditor() {
 	open_file->set_title(TTR("Open Animation Node"));
 	open_file->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
 	open_file->connect("file_selected", callable_mp(this, &AnimationNodeStateMachineEditor::_file_opened));
-
-	delete_window = memnew(ConfirmationDialog);
-	delete_window->set_flag(Window::FLAG_RESIZE_DISABLED, true);
-	add_child(delete_window);
-
-	delete_tree = memnew(Tree);
-	delete_tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
-	delete_tree->set_hide_root(true);
-	delete_tree->connect(SceneStringName(draw), callable_mp(this, &AnimationNodeStateMachineEditor::_delete_tree_draw));
-	delete_window->add_child(delete_tree);
-
-	Button *ok = delete_window->get_cancel_button();
-	ok->set_text(TTR("Delete Selected"));
-	ok->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_delete_selected));
-
-	Button *delete_all = delete_window->add_button(TTR("Delete All"), true);
-	delete_all->connect(SceneStringName(pressed), callable_mp(this, &AnimationNodeStateMachineEditor::_delete_all));
 }
 
 void EditorAnimationMultiTransitionEdit::add_transition(const StringName &p_from, const StringName &p_to, Ref<AnimationNodeStateMachineTransition> p_transition) {
@@ -2019,16 +1955,16 @@ void EditorAnimationMultiTransitionEdit::_get_property_list(List<PropertyInfo> *
 		prop_transition_path.name = itos(i) + "/" + "transition_path";
 		p_list->push_back(prop_transition_path);
 
-		for (List<PropertyInfo>::Element *F = plist.front(); F; F = F->next()) {
-			if (F->get().name == "script" || F->get().name == "resource_name" || F->get().name == "resource_path" || F->get().name == "resource_local_to_scene") {
+		for (const PropertyInfo &pi : plist) {
+			if (pi.name == "script" || pi.name == "resource_name" || pi.name == "resource_path" || pi.name == "resource_local_to_scene") {
 				continue;
 			}
 
-			if (F->get().usage != PROPERTY_USAGE_DEFAULT) {
+			if (pi.usage != PROPERTY_USAGE_DEFAULT) {
 				continue;
 			}
 
-			PropertyInfo prop = F->get();
+			PropertyInfo prop = pi;
 			prop.name = itos(i) + "/" + prop.name;
 
 			p_list->push_back(prop);
diff --git a/engine/editor/plugins/animation_state_machine_editor.h b/engine/editor/plugins/animation_state_machine_editor.h
index f6dd5850..eefb0e1e 100644
--- a/engine/editor/plugins/animation_state_machine_editor.h
+++ b/engine/editor/plugins/animation_state_machine_editor.h
@@ -28,17 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_STATE_MACHINE_EDITOR_H
-#define ANIMATION_STATE_MACHINE_EDITOR_H
+#pragma once
 
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "scene/animation/animation_node_state_machine.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/popup.h"
-#include "scene/gui/tree.h"
 
 class ConfirmationDialog;
 class EditorFileDialog;
+class LineEdit;
 class OptionButton;
 class PanelContainer;
 
@@ -150,9 +149,6 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 
 	Vector2 add_node_pos;
 
-	ConfirmationDialog *delete_window = nullptr;
-	Tree *delete_tree = nullptr;
-
 	bool box_selecting = false;
 	Point2 box_selecting_from;
 	Point2 box_selecting_to;
@@ -253,10 +249,6 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
 	bool _create_submenu(PopupMenu *p_menu, Ref<AnimationNodeStateMachine> p_nodesm, const StringName &p_name, const StringName &p_path);
 	void _stop_connecting();
 
-	void _delete_selected();
-	void _delete_all();
-	void _delete_tree_draw();
-
 	bool last_active = false;
 	StringName last_fading_from_node;
 	StringName last_current_node;
@@ -327,8 +319,4 @@ protected:
 
 public:
 	void add_transition(const StringName &p_from, const StringName &p_to, Ref<AnimationNodeStateMachineTransition> p_transition);
-
-	EditorAnimationMultiTransitionEdit() {}
 };
-
-#endif // ANIMATION_STATE_MACHINE_EDITOR_H
diff --git a/engine/editor/plugins/animation_tree_editor_plugin.cpp b/engine/editor/plugins/animation_tree_editor_plugin.cpp
index bfffc907..f2dc886c 100644
--- a/engine/editor/plugins/animation_tree_editor_plugin.cpp
+++ b/engine/editor/plugins/animation_tree_editor_plugin.cpp
@@ -308,6 +308,3 @@ AnimationTreeEditorPlugin::AnimationTreeEditorPlugin() {
 	button = EditorNode::get_bottom_panel()->add_item(TTR("AnimationTree"), anim_tree_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_animation_tree_bottom_panel", TTRC("Toggle AnimationTree Bottom Panel")));
 	button->hide();
 }
-
-AnimationTreeEditorPlugin::~AnimationTreeEditorPlugin() {
-}
diff --git a/engine/editor/plugins/animation_tree_editor_plugin.h b/engine/editor/plugins/animation_tree_editor_plugin.h
index 3466ad60..aa081846 100644
--- a/engine/editor/plugins/animation_tree_editor_plugin.h
+++ b/engine/editor/plugins/animation_tree_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_TREE_EDITOR_PLUGIN_H
-#define ANIMATION_TREE_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/animation/animation_tree.h"
@@ -107,7 +106,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	AnimationTreeEditorPlugin();
-	~AnimationTreeEditorPlugin();
 };
-
-#endif // ANIMATION_TREE_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/asset_library_editor_plugin.cpp b/engine/editor/plugins/asset_library_editor_plugin.cpp
index f3692ad4..394622ac 100644
--- a/engine/editor/plugins/asset_library_editor_plugin.cpp
+++ b/engine/editor/plugins/asset_library_editor_plugin.cpp
@@ -136,6 +136,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) {
 	add_child(hb);
 
 	icon = memnew(TextureButton);
+	icon->set_accessibility_name(TTRC("Open asset details"));
 	icon->set_custom_minimum_size(Size2(64, 64) * EDSCALE);
 	hb->add_child(icon);
 
@@ -145,11 +146,13 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) {
 	vb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	title = memnew(LinkButton);
+	title->set_accessibility_name(TTRC("Title"));
 	title->set_auto_translate_mode(AutoTranslateMode::AUTO_TRANSLATE_MODE_DISABLED);
 	title->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
 	vb->add_child(title);
 
 	category = memnew(LinkButton);
+	category->set_accessibility_name(TTRC("Category"));
 	category->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER);
 	vb->add_child(category);
 
@@ -159,6 +162,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) {
 
 	author = memnew(LinkButton);
 	author->set_tooltip_text(TTR("Author"));
+	author->set_accessibility_name(TTRC("Author"));
 	author_price_hbox->add_child(author);
 
 	author_price_hbox->add_child(memnew(HSeparator));
@@ -184,6 +188,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem(bool p_clickable) {
 	price = memnew(Label);
 	price->add_theme_style_override(CoreStringName(normal), label_margin);
 	price->set_tooltip_text(TTR("License"));
+	price->set_accessibility_name(TTRC("License"));
 	price->set_mouse_filter(MOUSE_FILTER_PASS);
 
 	author_price_hbox->add_child(price);
@@ -579,6 +584,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() {
 
 	dismiss_button = memnew(TextureButton);
 	dismiss_button->connect(SceneStringName(pressed), callable_mp(this, &EditorAssetLibraryItemDownload::_close));
+	dismiss_button->set_accessibility_name(TTRC("Close"));
 	title_hb->add_child(dismiss_button);
 
 	title->set_clip_text(true);
@@ -708,11 +714,11 @@ void EditorAssetLibrary::_update_repository_options() {
 	default_urls["godotengine.org (Official)"] = "https://godotengine.org/asset-library/api";
 	Dictionary available_urls = _EDITOR_DEF("asset_library/available_urls", default_urls, true);
 	repository->clear();
-	Array keys = available_urls.keys();
-	for (int i = 0; i < keys.size(); i++) {
-		String key = keys[i];
-		repository->add_item(key);
-		repository->set_item_metadata(i, available_urls[key]);
+	int i = 0;
+	for (const KeyValue<Variant, Variant> &kv : available_urls) {
+		repository->add_item(kv.key);
+		repository->set_item_metadata(i, kv.value);
+		i++;
 	}
 }
 
@@ -907,7 +913,7 @@ void EditorAssetLibrary::_image_request_completed(int p_status, int p_code, cons
 			for (int i = 0; i < headers.size(); i++) {
 				if (headers[i].findn("ETag:") == 0) { // Save etag
 					String cache_filename_base = EditorPaths::get_singleton()->get_cache_dir().path_join("assetimage_" + image_queue[p_queue_id].image_url.md5_text());
-					String new_etag = headers[i].substr(headers[i].find_char(':') + 1, headers[i].length()).strip_edges();
+					String new_etag = headers[i].substr(headers[i].find_char(':') + 1).strip_edges();
 					Ref<FileAccess> file = FileAccess::open(cache_filename_base + ".etag", FileAccess::WRITE);
 					if (file.is_valid()) {
 						file->store_line(new_etag);
@@ -1069,7 +1075,7 @@ void EditorAssetLibrary::_search(int p_page) {
 	args += String() + "sort=" + sort_key[sort->get_selected()];
 
 	// We use the "branch" version, i.e. major.minor, as patch releases should be compatible
-	args += "&godot_version=" + String(VERSION_BRANCH);
+	args += "&godot_version=" + String(GODOT_VERSION_BRANCH);
 
 	String support_list;
 	for (int i = 0; i < SUPPORT_MAX; i++) {
@@ -1214,14 +1220,7 @@ void EditorAssetLibrary::_api_request(const String &p_request, RequestType p_req
 }
 
 void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const PackedStringArray &headers, const PackedByteArray &p_data) {
-	String str;
-
-	{
-		int datalen = p_data.size();
-		const uint8_t *r = p_data.ptr();
-		str.parse_utf8((const char *)r, datalen);
-	}
-
+	String str = String::utf8((const char *)p_data.ptr(), (int)p_data.size());
 	bool error_abort = true;
 
 	switch (p_status) {
@@ -1373,7 +1372,7 @@ void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const
 					// This is typically because the version number changed recently
 					// and no assets compatible with the new version have been published yet.
 					_set_library_message(
-							vformat(TTR("No results compatible with %s %s for support level(s): %s.\nCheck the enabled support levels using the 'Support' button in the top-right corner."), String(VERSION_SHORT_NAME).capitalize(), String(VERSION_BRANCH), support_list));
+							vformat(TTR("No results compatible with %s %s for support level(s): %s.\nCheck the enabled support levels using the 'Support' button in the top-right corner."), String(GODOT_VERSION_SHORT_NAME).capitalize(), String(GODOT_VERSION_BRANCH), support_list));
 				}
 			} else {
 				library_message_box->hide();
@@ -1801,6 +1800,3 @@ AssetLibraryEditorPlugin::AssetLibraryEditorPlugin() {
 	addon_library->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
 	addon_library->hide();
 }
-
-AssetLibraryEditorPlugin::~AssetLibraryEditorPlugin() {
-}
diff --git a/engine/editor/plugins/asset_library_editor_plugin.h b/engine/editor/plugins/asset_library_editor_plugin.h
index 73b39029..a035b244 100644
--- a/engine/editor/plugins/asset_library_editor_plugin.h
+++ b/engine/editor/plugins/asset_library_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ASSET_LIBRARY_EDITOR_PLUGIN_H
-#define ASSET_LIBRARY_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_asset_installer.h"
 #include "editor/plugins/editor_plugin.h"
@@ -339,7 +338,7 @@ class AssetLibraryEditorPlugin : public EditorPlugin {
 public:
 	static bool is_available();
 
-	virtual String get_plugin_name() const override { return "AssetLib"; }
+	virtual String get_plugin_name() const override { return TTRC("AssetLib"); }
 	bool has_main_screen() const override { return true; }
 	virtual void edit(Object *p_object) override {}
 	virtual bool handles(Object *p_object) const override { return false; }
@@ -349,7 +348,4 @@ public:
 	//virtual void set_state(const Dictionary& p_state);
 
 	AssetLibraryEditorPlugin();
-	~AssetLibraryEditorPlugin();
 };
-
-#endif // ASSET_LIBRARY_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/audio_stream_editor_plugin.cpp b/engine/editor/plugins/audio_stream_editor_plugin.cpp
index 814cb3d2..44b9c425 100644
--- a/engine/editor/plugins/audio_stream_editor_plugin.cpp
+++ b/engine/editor/plugins/audio_stream_editor_plugin.cpp
@@ -246,12 +246,14 @@ AudioStreamEditor::AudioStreamEditor() {
 	_play_button->set_focus_mode(Control::FOCUS_NONE);
 	_play_button->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamEditor::_play));
 	_play_button->set_shortcut(ED_SHORTCUT("audio_stream_editor/audio_preview_play_pause", TTRC("Audio Preview Play/Pause"), Key::SPACE));
+	_play_button->set_accessibility_name(TTRC("Play"));
 
 	_stop_button = memnew(Button);
 	hbox->add_child(_stop_button);
 	_stop_button->set_flat(true);
 	_stop_button->set_focus_mode(Control::FOCUS_NONE);
 	_stop_button->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamEditor::_stop));
+	_stop_button->set_accessibility_name(TTRC("Stop"));
 
 	_current_label = memnew(Label);
 	_current_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
diff --git a/engine/editor/plugins/audio_stream_editor_plugin.h b/engine/editor/plugins/audio_stream_editor_plugin.h
index 0501409c..fcf2b14c 100644
--- a/engine/editor/plugins/audio_stream_editor_plugin.h
+++ b/engine/editor/plugins/audio_stream_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_EDITOR_PLUGIN_H
-#define AUDIO_STREAM_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -89,5 +88,3 @@ class AudioStreamEditorPlugin : public EditorPlugin {
 public:
 	AudioStreamEditorPlugin();
 };
-
-#endif // AUDIO_STREAM_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/audio_stream_randomizer_editor_plugin.cpp b/engine/editor/plugins/audio_stream_randomizer_editor_plugin.cpp
index 728c4be0..5e364b11 100644
--- a/engine/editor/plugins/audio_stream_randomizer_editor_plugin.cpp
+++ b/engine/editor/plugins/audio_stream_randomizer_editor_plugin.cpp
@@ -119,5 +119,3 @@ void AudioStreamRandomizerEditorPlugin::_move_stream_array_element(Object *p_und
 AudioStreamRandomizerEditorPlugin::AudioStreamRandomizerEditorPlugin() {
 	EditorNode::get_editor_data().add_move_array_element_function(SNAME("AudioStreamRandomizer"), callable_mp(this, &AudioStreamRandomizerEditorPlugin::_move_stream_array_element));
 }
-
-AudioStreamRandomizerEditorPlugin::~AudioStreamRandomizerEditorPlugin() {}
diff --git a/engine/editor/plugins/audio_stream_randomizer_editor_plugin.h b/engine/editor/plugins/audio_stream_randomizer_editor_plugin.h
index e1ac1fe8..395e9cc6 100644
--- a/engine/editor/plugins/audio_stream_randomizer_editor_plugin.h
+++ b/engine/editor/plugins/audio_stream_randomizer_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H
-#define AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -47,7 +46,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	AudioStreamRandomizerEditorPlugin();
-	~AudioStreamRandomizerEditorPlugin();
 };
-
-#endif // AUDIO_STREAM_RANDOMIZER_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/bit_map_editor_plugin.cpp b/engine/editor/plugins/bit_map_editor_plugin.cpp
index 668ea04d..7d5724ef 100644
--- a/engine/editor/plugins/bit_map_editor_plugin.cpp
+++ b/engine/editor/plugins/bit_map_editor_plugin.cpp
@@ -30,22 +30,59 @@
 
 #include "bit_map_editor_plugin.h"
 
+#include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
+#include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/label.h"
+#include "scene/gui/margin_container.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/image_texture.h"
 
 void BitMapEditor::setup(const Ref<BitMap> &p_bitmap) {
-	texture_rect->set_texture(ImageTexture::create_from_image(p_bitmap->convert_to_image()));
+	Ref<ImageTexture> bitmap_texture = ImageTexture::create_from_image(p_bitmap->convert_to_image());
+	texture_rect->set_texture(bitmap_texture);
+	if (bitmap_texture.is_valid()) {
+		centering_container->set_custom_minimum_size(Size2(0, 250) * EDSCALE);
+		centering_container->set_ratio(bitmap_texture->get_size().aspect());
+		outline_overlay->connect(SceneStringName(draw), callable_mp(this, &BitMapEditor::_draw_outline));
+	}
 	size_label->set_text(vformat(U"%s×%s", p_bitmap->get_size().width, p_bitmap->get_size().height));
 }
 
+void BitMapEditor::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_THEME_CHANGED: {
+			cached_outline_color = get_theme_color(SNAME("extra_border_color_1"), EditorStringName(Editor));
+		} break;
+	}
+}
+
+void BitMapEditor::_draw_outline() {
+	const float outline_width = Math::round(EDSCALE);
+	const Rect2 outline_rect = Rect2(Vector2(), texture_rect->get_size()).grow(outline_width * 0.5);
+	outline_overlay->draw_rect(outline_rect, cached_outline_color, false, outline_width);
+}
+
 BitMapEditor::BitMapEditor() {
+	MarginContainer *margin_container = memnew(MarginContainer);
+	const float outline_width = Math::round(EDSCALE);
+	margin_container->add_theme_constant_override("margin_right", outline_width);
+	margin_container->add_theme_constant_override("margin_top", outline_width);
+	margin_container->add_theme_constant_override("margin_left", outline_width);
+	margin_container->add_theme_constant_override("margin_bottom", outline_width);
+	add_child(margin_container);
+
+	centering_container = memnew(AspectRatioContainer);
+	margin_container->add_child(centering_container);
+
 	texture_rect = memnew(TextureRect);
-	texture_rect->set_stretch_mode(TextureRect::STRETCH_KEEP_ASPECT_CENTERED);
 	texture_rect->set_texture_filter(TEXTURE_FILTER_NEAREST);
-	texture_rect->set_custom_minimum_size(Size2(0, 250) * EDSCALE);
-	add_child(texture_rect);
+	texture_rect->set_expand_mode(TextureRect::EXPAND_IGNORE_SIZE);
+	centering_container->add_child(texture_rect);
+
+	outline_overlay = memnew(Control);
+	centering_container->add_child(outline_overlay);
 
 	size_label = memnew(Label);
 	size_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
diff --git a/engine/editor/plugins/bit_map_editor_plugin.h b/engine/editor/plugins/bit_map_editor_plugin.h
index 030536ab..5f67d6b5 100644
--- a/engine/editor/plugins/bit_map_editor_plugin.h
+++ b/engine/editor/plugins/bit_map_editor_plugin.h
@@ -28,21 +28,31 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BIT_MAP_EDITOR_PLUGIN_H
-#define BIT_MAP_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
 #include "scene/resources/bit_map.h"
 
+class AspectRatioContainer;
 class TextureRect;
 
 class BitMapEditor : public VBoxContainer {
 	GDCLASS(BitMapEditor, VBoxContainer);
 
+private:
+	AspectRatioContainer *centering_container = nullptr;
+	Control *outline_overlay = nullptr;
 	TextureRect *texture_rect = nullptr;
 	Label *size_label = nullptr;
 
+	Color cached_outline_color;
+
+	void _draw_outline();
+
+protected:
+	void _notification(int p_what);
+
 public:
 	void setup(const Ref<BitMap> &p_bitmap);
 
@@ -63,5 +73,3 @@ class BitMapEditorPlugin : public EditorPlugin {
 public:
 	BitMapEditorPlugin();
 };
-
-#endif // BIT_MAP_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/bone_map_editor_plugin.cpp b/engine/editor/plugins/bone_map_editor_plugin.cpp
index 55400e16..1f73920a 100644
--- a/engine/editor/plugins/bone_map_editor_plugin.cpp
+++ b/engine/editor/plugins/bone_map_editor_plugin.cpp
@@ -104,9 +104,6 @@ BoneMapperButton::BoneMapperButton(const StringName &p_profile_bone_name, bool p
 	selected = p_selected;
 }
 
-BoneMapperButton::~BoneMapperButton() {
-}
-
 void BoneMapperItem::create_editor() {
 	HBoxContainer *hbox = memnew(HBoxContainer);
 	add_child(hbox);
@@ -165,9 +162,6 @@ BoneMapperItem::BoneMapperItem(Ref<BoneMap> &p_bone_map, const StringName &p_pro
 	profile_bone_name = p_profile_bone_name;
 }
 
-BoneMapperItem::~BoneMapperItem() {
-}
-
 void BonePicker::create_editors() {
 	set_title(TTR("Bone Picker:"));
 
@@ -266,9 +260,6 @@ BonePicker::BonePicker(Skeleton3D *p_skeleton) {
 	skeleton = p_skeleton;
 }
 
-BonePicker::~BonePicker() {
-}
-
 void BoneMapper::create_editor() {
 	// Create Bone picker.
 	picker = memnew(BonePicker(skeleton));
@@ -300,6 +291,7 @@ void BoneMapper::create_editor() {
 	clear_mapping_button = memnew(Button);
 	clear_mapping_button->set_button_icon(get_editor_theme_icon(SNAME("Clear")));
 	clear_mapping_button->set_tooltip_text(TTR("Clear mappings in current group."));
+	clear_mapping_button->set_accessibility_name(TTRC("Clear Mappings"));
 	clear_mapping_button->connect(SceneStringName(pressed), callable_mp(this, &BoneMapper::_clear_mapping_current_group));
 	group_hbox->add_child(clear_mapping_button);
 
@@ -674,7 +666,7 @@ void BoneMapper::auto_mapping_process(Ref<BoneMap> &p_bone_map) {
 		search_path.push_back(bone_idx);
 		bone_idx = skeleton->get_bone_parent(bone_idx);
 	}
-	if (search_path.size() == 0) {
+	if (search_path.is_empty()) {
 		bone_idx = -1;
 	} else if (search_path.size() == 1) {
 		bone_idx = search_path[0]; // It is only one bone which can be root.
@@ -1338,7 +1330,7 @@ void BoneMapper::auto_mapping_process(Ref<BoneMap> &p_bone_map) {
 		bone_idx = skeleton->get_bone_parent(bone_idx);
 	}
 	search_path.reverse();
-	if (search_path.size() == 0) {
+	if (search_path.is_empty()) {
 		p_bone_map->_set_skeleton_bone_name("Spine", skeleton->get_bone_name(chest_or_upper_chest)); // Maybe chibi model...?
 	} else if (search_path.size() == 1) {
 		p_bone_map->_set_skeleton_bone_name("Spine", skeleton->get_bone_name(search_path[0]));
@@ -1407,9 +1399,6 @@ BoneMapper::BoneMapper(Skeleton3D *p_skeleton, Ref<BoneMap> &p_bone_map) {
 	bone_map = p_bone_map;
 }
 
-BoneMapper::~BoneMapper() {
-}
-
 void BoneMapEditor::create_editors() {
 	if (!skeleton) {
 		return;
@@ -1457,9 +1446,6 @@ BoneMapEditor::BoneMapEditor(Ref<BoneMap> &p_bone_map) {
 	bone_map = p_bone_map;
 }
 
-BoneMapEditor::~BoneMapEditor() {
-}
-
 bool EditorInspectorPluginBoneMap::can_handle(Object *p_object) {
 	return Object::cast_to<BoneMap>(p_object) != nullptr;
 }
diff --git a/engine/editor/plugins/bone_map_editor_plugin.h b/engine/editor/plugins/bone_map_editor_plugin.h
index a4a938e1..376d4a1d 100644
--- a/engine/editor/plugins/bone_map_editor_plugin.h
+++ b/engine/editor/plugins/bone_map_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BONE_MAP_EDITOR_PLUGIN_H
-#define BONE_MAP_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_node.h"
 #include "editor/editor_properties.h"
@@ -74,7 +73,6 @@ public:
 	bool is_require() const;
 
 	BoneMapperButton(const StringName &p_profile_bone_name, bool p_require, bool p_selected);
-	~BoneMapperButton();
 };
 
 class BoneMapperItem : public VBoxContainer {
@@ -101,7 +99,6 @@ public:
 	void assign_button_id(int p_button_id);
 
 	BoneMapperItem(Ref<BoneMap> &p_bone_map, const StringName &p_profile_bone_name = StringName());
-	~BoneMapperItem();
 };
 
 class BonePicker : public AcceptDialog {
@@ -125,7 +122,6 @@ private:
 
 public:
 	BonePicker(Skeleton3D *p_skeleton);
-	~BonePicker();
 };
 
 class BoneMapper : public VBoxContainer {
@@ -190,7 +186,6 @@ public:
 	int get_current_bone_idx() const;
 
 	BoneMapper(Skeleton3D *p_skeleton, Ref<BoneMap> &p_bone_map);
-	~BoneMapper();
 };
 
 class BoneMapEditor : public VBoxContainer {
@@ -208,7 +203,6 @@ protected:
 
 public:
 	BoneMapEditor(Ref<BoneMap> &p_bone_map);
-	~BoneMapEditor();
 };
 
 class EditorInspectorPluginBoneMap : public EditorInspectorPlugin {
@@ -227,5 +221,3 @@ public:
 	virtual String get_plugin_name() const override { return "BoneMap"; }
 	BoneMapEditorPlugin();
 };
-
-#endif // BONE_MAP_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/camera_2d_editor_plugin.cpp b/engine/editor/plugins/camera_2d_editor_plugin.cpp
new file mode 100644
index 00000000..ec6db977
--- /dev/null
+++ b/engine/editor/plugins/camera_2d_editor_plugin.cpp
@@ -0,0 +1,165 @@
+/**************************************************************************/
+/*  camera_2d_editor_plugin.cpp                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "camera_2d_editor_plugin.h"
+
+#include "canvas_item_editor_plugin.h"
+#include "core/config/project_settings.h"
+#include "editor/editor_node.h"
+#include "editor/editor_undo_redo_manager.h"
+#include "editor/themes/editor_scale.h"
+#include "scene/2d/camera_2d.h"
+#include "scene/gui/label.h"
+#include "scene/gui/menu_button.h"
+
+void Camera2DEditor::edit(Camera2D *p_camera) {
+	if (p_camera == selected_camera) {
+		return;
+	}
+	selected_camera = p_camera;
+}
+
+void Camera2DEditor::_menu_option(int p_option) {
+	switch (p_option) {
+		case MENU_SNAP_LIMITS_TO_VIEWPORT: {
+			EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
+			Rect2 prev_rect = selected_camera->get_limit_rect();
+			ur->create_action(TTR("Snap the Limits to the Viewport"), UndoRedo::MERGE_DISABLE, selected_camera);
+			ur->add_do_method(this, "_snap_limits_to_viewport");
+			ur->add_do_reference(selected_camera);
+			ur->add_undo_method(this, "_undo_snap_limits_to_viewport", prev_rect);
+			ur->commit_action();
+		} break;
+	}
+}
+
+void Camera2DEditor::_snap_limits_to_viewport() {
+	selected_camera->set_limit(SIDE_LEFT, 0);
+	selected_camera->set_limit(SIDE_TOP, 0);
+	selected_camera->set_limit(SIDE_RIGHT, GLOBAL_GET("display/window/size/viewport_width"));
+	selected_camera->set_limit(SIDE_BOTTOM, GLOBAL_GET("display/window/size/viewport_height"));
+}
+
+void Camera2DEditor::_undo_snap_limits_to_viewport(const Rect2 &p_prev_rect) {
+	Point2 end = p_prev_rect.get_end();
+	selected_camera->set_limit(SIDE_LEFT, p_prev_rect.position.x);
+	selected_camera->set_limit(SIDE_TOP, p_prev_rect.position.y);
+	selected_camera->set_limit(SIDE_RIGHT, end.x);
+	selected_camera->set_limit(SIDE_BOTTOM, end.y);
+}
+
+void Camera2DEditor::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_THEME_CHANGED: {
+			options->set_button_icon(get_editor_theme_icon(SNAME("Camera2D")));
+		} break;
+	}
+}
+
+void Camera2DEditor::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("_snap_limits_to_viewport"), &Camera2DEditor::_snap_limits_to_viewport);
+	ClassDB::bind_method(D_METHOD("_undo_snap_limits_to_viewport", "prev_rect"), &Camera2DEditor::_undo_snap_limits_to_viewport);
+}
+
+Camera2DEditor::Camera2DEditor() {
+	options = memnew(MenuButton);
+
+	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
+
+	options->set_text(TTRC("Camera2D"));
+
+	options->get_popup()->add_item(TTRC("Snap the Limits to the Viewport"), MENU_SNAP_LIMITS_TO_VIEWPORT);
+	options->set_switch_on_hover(true);
+
+	options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &Camera2DEditor::_menu_option));
+
+	add_user_signal(MethodInfo("_editor_theme_changed"));
+}
+
+void Camera2DEditorPlugin::_update_approach_text_visibility() {
+	if (camera_2d_editor->selected_camera == nullptr) {
+		return;
+	}
+	approach_to_move_rect->set_visible(camera_2d_editor->selected_camera->is_limit_enabled());
+}
+
+void Camera2DEditorPlugin::_editor_theme_changed() {
+	approach_to_move_rect->remove_theme_color_override(SceneStringName(font_color));
+	approach_to_move_rect->add_theme_color_override(SceneStringName(font_color), Color(0.6f, 0.6f, 0.6f, 1));
+	approach_to_move_rect->add_theme_color_override("font_shadow_color", Color(0.2f, 0.2f, 0.2f, 1));
+	approach_to_move_rect->add_theme_constant_override("shadow_outline_size", 1 * EDSCALE);
+	approach_to_move_rect->add_theme_constant_override("line_spacing", 0);
+}
+
+void Camera2DEditorPlugin::edit(Object *p_object) {
+	Callable update_text = callable_mp(this, &Camera2DEditorPlugin::_update_approach_text_visibility);
+	StringName update_signal = SNAME("_camera_limit_enabled_updated");
+
+	Camera2D *prev_cam = camera_2d_editor->selected_camera;
+	if (prev_cam != nullptr && prev_cam->is_connected(update_signal, update_text)) {
+		prev_cam->disconnect(update_signal, update_text);
+	}
+	Camera2D *cam = Object::cast_to<Camera2D>(p_object);
+	if (cam != nullptr) {
+		camera_2d_editor->edit(cam);
+		_update_approach_text_visibility();
+		if (!cam->is_connected(update_signal, update_text)) {
+			cam->connect(update_signal, update_text);
+		}
+	}
+}
+
+bool Camera2DEditorPlugin::handles(Object *p_object) const {
+	return p_object->is_class("Camera2D");
+}
+
+void Camera2DEditorPlugin::make_visible(bool p_visible) {
+	if (p_visible) {
+		camera_2d_editor->options->show();
+		approach_to_move_rect->show();
+	} else {
+		camera_2d_editor->options->hide();
+		approach_to_move_rect->hide();
+	}
+}
+
+Camera2DEditorPlugin::Camera2DEditorPlugin() {
+	camera_2d_editor = memnew(Camera2DEditor);
+	EditorNode::get_singleton()->get_gui_base()->add_child(camera_2d_editor);
+	camera_2d_editor->connect(SNAME("_editor_theme_changed"), callable_mp(this, &Camera2DEditorPlugin::_editor_theme_changed));
+
+	approach_to_move_rect = memnew(Label);
+	approach_to_move_rect->set_text(TTRC("In Move Mode: \nHold Ctrl + left mouse button to move the limit rectangle.\nHold left mouse button to move the camera only."));
+	approach_to_move_rect->hide();
+	_editor_theme_changed();
+	CanvasItemEditor::get_singleton()->get_controls_container()->add_child(approach_to_move_rect);
+
+	make_visible(false);
+}
diff --git a/engine/editor/plugins/camera_2d_editor_plugin.h b/engine/editor/plugins/camera_2d_editor_plugin.h
new file mode 100644
index 00000000..3e72329a
--- /dev/null
+++ b/engine/editor/plugins/camera_2d_editor_plugin.h
@@ -0,0 +1,80 @@
+/**************************************************************************/
+/*  camera_2d_editor_plugin.h                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "editor/plugins/editor_plugin.h"
+
+class Camera2D;
+class Label;
+class MenuButton;
+
+class Camera2DEditor : public Control {
+	GDCLASS(Camera2DEditor, Control);
+
+	enum Menu {
+		MENU_SNAP_LIMITS_TO_VIEWPORT,
+	};
+
+	Camera2D *selected_camera = nullptr;
+
+	friend class Camera2DEditorPlugin;
+	MenuButton *options = nullptr;
+
+	void _menu_option(int p_option);
+	void _snap_limits_to_viewport();
+	void _undo_snap_limits_to_viewport(const Rect2 &p_prev_rect);
+
+protected:
+	static void _bind_methods();
+	void _notification(int p_what);
+
+public:
+	void edit(Camera2D *p_camera);
+	Camera2DEditor();
+};
+
+class Camera2DEditorPlugin : public EditorPlugin {
+	GDCLASS(Camera2DEditorPlugin, EditorPlugin);
+
+	Camera2DEditor *camera_2d_editor = nullptr;
+
+	Label *approach_to_move_rect = nullptr;
+
+	void _editor_theme_changed();
+	void _update_approach_text_visibility();
+
+public:
+	virtual void edit(Object *p_object) override;
+	virtual bool handles(Object *p_object) const override;
+	virtual void make_visible(bool p_visible) override;
+
+	Camera2DEditorPlugin();
+};
diff --git a/engine/editor/plugins/camera_3d_editor_plugin.cpp b/engine/editor/plugins/camera_3d_editor_plugin.cpp
index 2d1e6d64..4dc3cdfe 100644
--- a/engine/editor/plugins/camera_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/camera_3d_editor_plugin.cpp
@@ -126,6 +126,3 @@ Camera3DEditorPlugin::Camera3DEditorPlugin() {
 	plugin.instantiate();
 	add_inspector_plugin(plugin);
 }
-
-Camera3DEditorPlugin::~Camera3DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/camera_3d_editor_plugin.h b/engine/editor/plugins/camera_3d_editor_plugin.h
index 4e5d3a8c..4a05eaf9 100644
--- a/engine/editor/plugins/camera_3d_editor_plugin.h
+++ b/engine/editor/plugins/camera_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_3D_EDITOR_PLUGIN_H
-#define CAMERA_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/texture_editor_plugin.h"
@@ -85,7 +84,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	Camera3DEditorPlugin();
-	~Camera3DEditorPlugin();
 };
-
-#endif // CAMERA_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/canvas_item_editor_plugin.cpp b/engine/editor/plugins/canvas_item_editor_plugin.cpp
index 7381f2ab..f4685cb4 100644
--- a/engine/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/engine/editor/plugins/canvas_item_editor_plugin.cpp
@@ -49,10 +49,10 @@
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
 #include "scene/2d/audio_stream_player_2d.h"
+#include "scene/2d/physics/touch_screen_button.h"
 #include "scene/2d/polygon_2d.h"
 #include "scene/2d/skeleton_2d.h"
 #include "scene/2d/sprite_2d.h"
-#include "scene/2d/touch_screen_button.h"
 #include "scene/gui/base_button.h"
 #include "scene/gui/flow_container.h"
 #include "scene/gui/grid_container.h"
@@ -118,6 +118,7 @@ public:
 		grid_offset_x->set_suffix("px");
 		grid_offset_x->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		grid_offset_x->set_select_all_on_focus(true);
+		grid_offset_x->set_accessibility_name(TTRC("X Offset"));
 		child_container->add_child(grid_offset_x);
 
 		grid_offset_y = memnew(SpinBox);
@@ -128,6 +129,7 @@ public:
 		grid_offset_y->set_suffix("px");
 		grid_offset_y->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		grid_offset_y->set_select_all_on_focus(true);
+		grid_offset_y->set_accessibility_name(TTRC("Y Offset"));
 		child_container->add_child(grid_offset_y);
 
 		label = memnew(Label);
@@ -142,6 +144,7 @@ public:
 		grid_step_x->set_suffix("px");
 		grid_step_x->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		grid_step_x->set_select_all_on_focus(true);
+		grid_step_x->set_accessibility_name(TTRC("X Step"));
 		child_container->add_child(grid_step_x);
 
 		grid_step_y = memnew(SpinBox);
@@ -151,6 +154,7 @@ public:
 		grid_step_y->set_suffix("px");
 		grid_step_y->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		grid_step_y->set_select_all_on_focus(true);
+		grid_step_y->set_accessibility_name(TTRC("X Step"));
 		child_container->add_child(grid_step_y);
 
 		label = memnew(Label);
@@ -166,6 +170,7 @@ public:
 		primary_grid_step_x->set_suffix("steps");
 		primary_grid_step_x->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		primary_grid_step_x->set_select_all_on_focus(true);
+		primary_grid_step_x->set_accessibility_name(TTRC("X Primary Step"));
 		child_container->add_child(primary_grid_step_x);
 
 		primary_grid_step_y = memnew(SpinBox);
@@ -176,6 +181,7 @@ public:
 		primary_grid_step_y->set_suffix("steps");
 		primary_grid_step_y->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		primary_grid_step_y->set_select_all_on_focus(true);
+		primary_grid_step_y->set_accessibility_name(TTRC("Y Primary Step"));
 		child_container->add_child(primary_grid_step_y);
 
 		container->add_child(memnew(HSeparator));
@@ -197,6 +203,7 @@ public:
 		rotation_offset->set_suffix("deg");
 		rotation_offset->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		rotation_offset->set_select_all_on_focus(true);
+		rotation_offset->set_accessibility_name(TTRC("Rotation Offset"));
 		child_container->add_child(rotation_offset);
 
 		label = memnew(Label);
@@ -210,6 +217,7 @@ public:
 		rotation_step->set_suffix("deg");
 		rotation_step->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		rotation_step->set_select_all_on_focus(true);
+		rotation_step->set_accessibility_name(TTRC("Rotation Step"));
 		child_container->add_child(rotation_step);
 
 		container->add_child(memnew(HSeparator));
@@ -229,6 +237,7 @@ public:
 		scale_step->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		scale_step->set_step(0.01f);
 		scale_step->set_select_all_on_focus(true);
+		scale_step->set_accessibility_name(TTRC("Scale Step"));
 		child_container->add_child(scale_step);
 	}
 
@@ -770,14 +779,15 @@ void CanvasItemEditor::_find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_n
 
 bool CanvasItemEditor::_select_click_on_item(CanvasItem *item, Point2 p_click_pos, bool p_append) {
 	bool still_selected = true;
-	if (p_append && !editor_selection->get_selected_node_list().is_empty()) {
+	const List<Node *> &top_node_list = editor_selection->get_top_selected_node_list();
+	if (p_append && !top_node_list.is_empty()) {
 		if (editor_selection->is_selected(item)) {
 			// Already in the selection, remove it from the selected nodes
 			editor_selection->remove_node(item);
 			still_selected = false;
 
-			if (editor_selection->get_selected_node_list().size() == 1) {
-				EditorNode::get_singleton()->push_item(editor_selection->get_selected_node_list().front()->get());
+			if (top_node_list.size() == 1) {
+				EditorNode::get_singleton()->push_item(top_node_list.front()->get());
 			}
 		} else {
 			// Add the item to the selection
@@ -974,7 +984,7 @@ void CanvasItemEditor::_add_node_pressed(int p_result) {
 			[[fallthrough]];
 		}
 		case ADD_MOVE: {
-			nodes_to_move = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
+			nodes_to_move = EditorNode::get_singleton()->get_editor_selection()->get_top_selected_node_list();
 			if (nodes_to_move.is_empty()) {
 				return;
 			}
@@ -1116,7 +1126,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 			if (m.is_valid() && m->get_position().x < RULER_WIDTH) {
 				// Check if we are hovering an existing horizontal guide
 				for (int i = 0; i < hguides.size(); i++) {
-					if (ABS(xform.xform(Point2(0, hguides[i])).y - m->get_position().y) < MIN(minimum, 8)) {
+					if (Math::abs(xform.xform(Point2(0, hguides[i])).y - m->get_position().y) < MIN(minimum, 8)) {
 						is_hovering_h_guide = true;
 						is_hovering_v_guide = false;
 						break;
@@ -1126,7 +1136,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 			} else if (m.is_valid() && m->get_position().y < RULER_WIDTH) {
 				// Check if we are hovering an existing vertical guide
 				for (int i = 0; i < vguides.size(); i++) {
-					if (ABS(xform.xform(Point2(vguides[i], 0)).x - m->get_position().x) < MIN(minimum, 8)) {
+					if (Math::abs(xform.xform(Point2(vguides[i], 0)).x - m->get_position().x) < MIN(minimum, 8)) {
 						is_hovering_v_guide = true;
 						is_hovering_h_guide = false;
 						break;
@@ -1146,7 +1156,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 					// Check if we drag an existing horizontal guide
 					dragged_guide_index = -1;
 					for (int i = 0; i < hguides.size(); i++) {
-						if (ABS(xform.xform(Point2(0, hguides[i])).y - b->get_position().y) < MIN(minimum, 8)) {
+						if (Math::abs(xform.xform(Point2(0, hguides[i])).y - b->get_position().y) < MIN(minimum, 8)) {
 							dragged_guide_index = i;
 						}
 					}
@@ -1163,7 +1173,7 @@ bool CanvasItemEditor::_gui_input_rulers_and_guides(const Ref<InputEvent> &p_eve
 					// Check if we drag an existing vertical guide
 					dragged_guide_index = -1;
 					for (int i = 0; i < vguides.size(); i++) {
-						if (ABS(xform.xform(Point2(vguides[i], 0)).x - b->get_position().x) < MIN(minimum, 8)) {
+						if (Math::abs(xform.xform(Point2(vguides[i], 0)).x - b->get_position().x) < MIN(minimum, 8)) {
 							dragged_guide_index = i;
 						}
 					}
@@ -1597,7 +1607,7 @@ bool CanvasItemEditor::_gui_input_open_scene_on_double_click(const Ref<InputEven
 		if (selection.size() == 1) {
 			CanvasItem *ci = selection.front()->get();
 			if (!ci->get_scene_file_path().is_empty() && ci != EditorNode::get_singleton()->get_edited_scene()) {
-				EditorNode::get_singleton()->open_request(ci->get_scene_file_path());
+				EditorNode::get_singleton()->load_scene(ci->get_scene_file_path());
 				return true;
 			}
 		}
@@ -2220,7 +2230,7 @@ bool CanvasItemEditor::_gui_input_move(const Ref<InputEvent> &p_event) {
 
 			bool single_axis = m->is_shift_pressed();
 			if (single_axis) {
-				if (ABS(new_pos.x - previous_pos.x) > ABS(new_pos.y - previous_pos.y)) {
+				if (Math::abs(new_pos.x - previous_pos.x) > Math::abs(new_pos.y - previous_pos.y)) {
 					new_pos.y = previous_pos.y;
 				} else {
 					new_pos.x = previous_pos.x;
@@ -2468,7 +2478,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 					break;
 				}
 			}
-			for (Node *node : EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list()) {
+			for (Node *node : EditorNode::get_singleton()->get_editor_selection()->get_top_selected_node_list()) {
 				if (Object::cast_to<CanvasItem>(node)) {
 					add_node_menu->add_icon_item(get_editor_theme_icon(SNAME("ToolMove")), TTR("Move Node(s) Here"), ADD_MOVE);
 					break;
@@ -2599,7 +2609,7 @@ bool CanvasItemEditor::_gui_input_select(const Ref<InputEvent> &p_event) {
 				}
 
 				_find_canvas_items_in_rect(Rect2(bsfrom, bsto - bsfrom), scene, &selitems);
-				if (selitems.size() == 1 && editor_selection->get_selected_node_list().is_empty()) {
+				if (selitems.size() == 1 && editor_selection->get_top_selected_node_list().is_empty()) {
 					EditorNode::get_singleton()->push_item(selitems.front()->get());
 				}
 				for (CanvasItem *E : selitems) {
@@ -2812,7 +2822,7 @@ void CanvasItemEditor::_update_lock_and_group_button() {
 	bool all_locked = true;
 	bool all_group = true;
 	bool has_canvas_item = false;
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 	if (selection.is_empty()) {
 		all_locked = false;
 		all_group = false;
@@ -2854,14 +2864,14 @@ Control::CursorShape CanvasItemEditor::get_cursor_shape(const Point2 &p_pos) con
 
 	List<CanvasItem *> selection = _get_edited_canvas_items();
 	if (selection.size() == 1) {
-		const double angle = Math::fposmod((double)selection.front()->get()->get_global_transform_with_canvas().get_rotation(), Math_PI);
-		if (angle > Math_PI * 7.0 / 8.0) {
+		const double angle = Math::fposmod((double)selection.front()->get()->get_global_transform_with_canvas().get_rotation(), Math::PI);
+		if (angle > Math::PI * 7.0 / 8.0) {
 			rotation_array_index = 0;
-		} else if (angle > Math_PI * 5.0 / 8.0) {
+		} else if (angle > Math::PI * 5.0 / 8.0) {
 			rotation_array_index = 1;
-		} else if (angle > Math_PI * 3.0 / 8.0) {
+		} else if (angle > Math::PI * 3.0 / 8.0) {
 			rotation_array_index = 2;
-		} else if (angle > Math_PI * 1.0 / 8.0) {
+		} else if (angle > Math::PI * 1.0 / 8.0) {
 			rotation_array_index = 3;
 		} else {
 			rotation_array_index = 0;
@@ -3075,7 +3085,7 @@ void CanvasItemEditor::_draw_rulers() {
 		if (i % (major_subdivision * minor_subdivision) == 0) {
 			viewport->draw_line(Point2(position.x, 0), Point2(position.x, RULER_WIDTH), graduation_color, Math::round(EDSCALE));
 			real_t val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(i, 0)).x;
-			viewport->draw_string(font, Point2(position.x + 2, font->get_height(font_size)), TS->format_number(vformat(((int)val == val) ? "%d" : "%.1f", val)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
+			viewport->draw_string(font, Point2(position.x + 2, font->get_ascent(font_size) + Math::round(EDSCALE)), TS->format_number(vformat(((int)val == val) ? "%d" : "%.1f", val)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
 		} else {
 			if (i % minor_subdivision == 0) {
 				viewport->draw_line(Point2(position.x, RULER_WIDTH * 0.33), Point2(position.x, RULER_WIDTH), graduation_color, Math::round(EDSCALE));
@@ -3093,7 +3103,7 @@ void CanvasItemEditor::_draw_rulers() {
 			viewport->draw_line(Point2(0, position.y), Point2(RULER_WIDTH, position.y), graduation_color, Math::round(EDSCALE));
 			real_t val = (ruler_transform * major_subdivide * minor_subdivide).xform(Point2(0, i)).y;
 
-			Transform2D text_xform = Transform2D(-Math_PI / 2.0, Point2(font->get_height(font_size), position.y - 2));
+			Transform2D text_xform = Transform2D(-Math::PI / 2.0, Point2(font->get_ascent(font_size) + Math::round(EDSCALE), position.y - 2));
 			viewport->draw_set_transform_matrix(viewport->get_transform() * text_xform);
 			viewport->draw_string(font, Point2(), TS->format_number(vformat(((int)val == val) ? "%d" : "%.1f", val)), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
 			viewport->draw_set_transform_matrix(viewport->get_transform());
@@ -3200,7 +3210,7 @@ void CanvasItemEditor::_draw_ruler_tool() {
 		Vector2 length_vector = (begin - end).abs() / zoom;
 
 		const real_t horizontal_angle_rad = length_vector.angle();
-		const real_t vertical_angle_rad = Math_PI / 2.0 - horizontal_angle_rad;
+		const real_t vertical_angle_rad = Math::PI / 2.0 - horizontal_angle_rad;
 
 		Ref<Font> font = get_theme_font(SNAME("bold"), EditorStringName(EditorFonts));
 		int font_size = 1.3 * get_theme_font_size(SNAME("bold_size"), EditorStringName(EditorFonts));
@@ -3236,18 +3246,18 @@ void CanvasItemEditor::_draw_ruler_tool() {
 			const Vector2 end_to_begin = (end - begin);
 
 			real_t arc_1_start_angle = end_to_begin.x < 0
-					? (end_to_begin.y < 0 ? 3.0 * Math_PI / 2.0 - vertical_angle_rad : Math_PI / 2.0)
-					: (end_to_begin.y < 0 ? 3.0 * Math_PI / 2.0 : Math_PI / 2.0 - vertical_angle_rad);
+					? (end_to_begin.y < 0 ? 3.0 * Math::PI / 2.0 - vertical_angle_rad : Math::PI / 2.0)
+					: (end_to_begin.y < 0 ? 3.0 * Math::PI / 2.0 : Math::PI / 2.0 - vertical_angle_rad);
 			real_t arc_1_end_angle = arc_1_start_angle + vertical_angle_rad;
 			// Constrain arc to triangle height & max size.
-			real_t arc_1_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, ABS(end_to_begin.y)), arc_max_radius);
+			real_t arc_1_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, Math::abs(end_to_begin.y)), arc_max_radius);
 
 			real_t arc_2_start_angle = end_to_begin.x < 0
 					? (end_to_begin.y < 0 ? 0.0 : -horizontal_angle_rad)
-					: (end_to_begin.y < 0 ? Math_PI - horizontal_angle_rad : Math_PI);
+					: (end_to_begin.y < 0 ? Math::PI - horizontal_angle_rad : Math::PI);
 			real_t arc_2_end_angle = arc_2_start_angle + horizontal_angle_rad;
 			// Constrain arc to triangle width & max size.
-			real_t arc_2_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, ABS(end_to_begin.x)), arc_max_radius);
+			real_t arc_2_radius = MIN(MIN(arc_radius_max_length_percent * ruler_length, Math::abs(end_to_begin.x)), arc_max_radius);
 
 			viewport->draw_arc(begin, arc_1_radius, arc_1_start_angle, arc_1_end_angle, arc_point_count, ruler_primary_color, Math::round(EDSCALE * arc_line_width));
 			viewport->draw_arc(end, arc_2_radius, arc_2_start_angle, arc_2_end_angle, arc_point_count, ruler_primary_color, Math::round(EDSCALE * arc_line_width));
@@ -3265,8 +3275,8 @@ void CanvasItemEditor::_draw_ruler_tool() {
 		viewport->draw_string(font, text_pos, TS->format_number(vformat("%.1f px", length_vector.length())), HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, font_color);
 
 		if (draw_secondary_lines) {
-			const int horizontal_angle = round(180 * horizontal_angle_rad / Math_PI);
-			const int vertical_angle = round(180 * vertical_angle_rad / Math_PI);
+			const int horizontal_angle = round(180 * horizontal_angle_rad / Math::PI);
+			const int vertical_angle = round(180 * vertical_angle_rad / Math::PI);
 
 			Point2 text_pos2 = text_pos;
 			text_pos2.x = begin.x < text_pos.x ? MIN(text_pos.x - text_width, begin.x - text_width / 2) : MAX(text_pos.x + text_width, begin.x - text_width / 2);
@@ -3288,13 +3298,13 @@ void CanvasItemEditor::_draw_ruler_tool() {
 			h_angle_text_pos.x = CLAMP(end.x - angle_text_width / 2, angle_text_width / 2, viewport->get_rect().size.x - angle_text_width);
 			if (begin.y < end.y) {
 				h_angle_text_pos.y = end.y + text_height * 1.5;
-				if (ABS(text_pos2.x - h_angle_text_pos.x) < text_width) {
+				if (Math::abs(text_pos2.x - h_angle_text_pos.x) < text_width) {
 					int height_multiplier = 1.5 + (int)grid_snap_active;
 					h_angle_text_pos.y = MAX(text_pos.y + height_multiplier * text_height, MAX(end.y + text_height * 1.5, text_pos2.y + height_multiplier * text_height));
 				}
 			} else {
 				h_angle_text_pos.y = end.y - text_height * 0.5;
-				if (ABS(text_pos2.x - h_angle_text_pos.x) < text_width) {
+				if (Math::abs(text_pos2.x - h_angle_text_pos.x) < text_width) {
 					int height_multiplier = 1 + (int)grid_snap_active;
 					h_angle_text_pos.y = MIN(text_pos.y - height_multiplier * text_height, MIN(end.y - text_height * 0.5, text_pos2.y - height_multiplier * text_height));
 				}
@@ -3645,7 +3655,7 @@ void CanvasItemEditor::_draw_selection() {
 					int next = (i + 1) % 4;
 
 					Vector2 ofs = ((endpoints[i] - endpoints[prev]).normalized() + ((endpoints[i] - endpoints[next]).normalized())).normalized();
-					ofs *= Math_SQRT2 * (select_handle->get_size().width / 2);
+					ofs *= Math::SQRT2 * (select_handle->get_size().width / 2);
 
 					select_handle->draw(vp_ci, (endpoints[i] + ofs - (select_handle->get_size() / 2)).floor());
 
@@ -4127,6 +4137,15 @@ void CanvasItemEditor::_notification(int p_what) {
 			ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &CanvasItemEditor::_project_settings_changed));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Canvas item editor")));
+		} break;
+
 		case NOTIFICATION_PROCESS: {
 			// Update the viewport if the canvas_item changes
 			List<CanvasItem *> selection = _get_edited_canvas_items(true);
@@ -4238,8 +4257,8 @@ void CanvasItemEditor::_selection_changed() {
 	}
 	selected_from_canvas = false;
 
-	if (temp_pivot != Vector2(INFINITY, INFINITY)) {
-		temp_pivot = Vector2(INFINITY, INFINITY);
+	if (temp_pivot != Vector2(Math::INF, Math::INF)) {
+		temp_pivot = Vector2(Math::INF, Math::INF);
 		viewport->queue_redraw();
 	}
 }
@@ -4584,7 +4603,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			snap_dialog->popup_centered(Size2(320, 160) * EDSCALE);
 		} break;
 		case SKELETON_SHOW_BONES: {
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			for (Node *E : selection) {
 				// Add children nodes so they are processed
 				for (int child = 0; child < E->get_child_count(); child++) {
@@ -4619,7 +4638,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		case LOCK_SELECTED: {
 			undo_redo->create_action(TTR("Lock Selected"));
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			for (Node *E : selection) {
 				CanvasItem *ci = Object::cast_to<CanvasItem>(E);
 				if (!ci || !ci->is_inside_tree()) {
@@ -4638,7 +4657,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		case UNLOCK_SELECTED: {
 			undo_redo->create_action(TTR("Unlock Selected"));
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			for (Node *E : selection) {
 				CanvasItem *ci = Object::cast_to<CanvasItem>(E);
 				if (!ci || !ci->is_inside_tree()) {
@@ -4657,7 +4676,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		case GROUP_SELECTED: {
 			undo_redo->create_action(TTR("Group Selected"));
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			for (Node *E : selection) {
 				CanvasItem *ci = Object::cast_to<CanvasItem>(E);
 				if (!ci || !ci->is_inside_tree()) {
@@ -4676,7 +4695,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		case UNGROUP_SELECTED: {
 			undo_redo->create_action(TTR("Ungroup Selected"));
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			for (Node *E : selection) {
 				CanvasItem *ci = Object::cast_to<CanvasItem>(E);
 				if (!ci || !ci->is_inside_tree()) {
@@ -4739,7 +4758,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 
 			undo_redo->create_action(TTR("Paste Pose"));
 			for (const PoseClipboard &E : pose_clipboard) {
-				Node2D *n2d = Object::cast_to<Node2D>(ObjectDB::get_instance(E.id));
+				Node2D *n2d = ObjectDB::get_instance<Node2D>(E.id);
 				if (!n2d) {
 					continue;
 				}
@@ -4872,7 +4891,6 @@ void CanvasItemEditor::_set_owner_for_node_and_children(Node *p_node, Node *p_ow
 }
 
 void CanvasItemEditor::_focus_selection(int p_op) {
-	Vector2 center(0.f, 0.f);
 	Rect2 rect;
 	int count = 0;
 
@@ -4882,31 +4900,30 @@ void CanvasItemEditor::_focus_selection(int p_op) {
 		if (!ci) {
 			continue;
 		}
-
-		// counting invisible items, for now
-		//if (!ci->is_visible_in_tree()) continue;
-		++count;
-
+		const Transform2D canvas_item_transform = ci->get_global_transform();
+		if (!canvas_item_transform.is_finite()) {
+			continue;
+		}
 		Rect2 item_rect;
 		if (ci->_edit_use_rect()) {
 			item_rect = ci->_edit_get_rect();
 		} else {
 			item_rect = Rect2();
 		}
-
-		Vector2 pos = ci->get_global_transform().get_origin();
-		Vector2 scale = ci->get_global_transform().get_scale();
-		real_t angle = ci->get_global_transform().get_rotation();
+		Vector2 pos = canvas_item_transform.get_origin();
+		const Vector2 scale = canvas_item_transform.get_scale();
+		const real_t angle = canvas_item_transform.get_rotation();
 		pos = ci->get_viewport()->get_popup_base_transform().xform(pos);
 
 		Transform2D t(angle, Vector2(0.f, 0.f));
 		item_rect = t.xform(item_rect);
 		Rect2 canvas_item_rect(pos + scale * item_rect.position, scale * item_rect.size);
-		if (count == 1) {
+		if (count == 0) {
 			rect = canvas_item_rect;
 		} else {
 			rect = rect.merge(canvas_item_rect);
 		}
+		count++;
 	}
 
 	if (p_op == VIEW_FRAME_TO_SELECTION && rect.size.x > CMP_EPSILON && rect.size.y > CMP_EPSILON) {
@@ -5361,6 +5378,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	controls_hb->add_child(button_center_view);
 	button_center_view->set_flat(true);
 	button_center_view->set_tooltip_text(TTR("Center View"));
+	button_center_view->set_accessibility_name(TTRC("Center View"));
 	button_center_view->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(VIEW_CENTER_TO_SELECTION));
 
 	zoom_widget = memnew(EditorZoomWidget);
@@ -5403,6 +5421,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	select_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/select_mode", TTRC("Select Mode"), Key::Q));
 	select_button->set_shortcut_context(this);
 	select_button->set_tooltip_text(keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Drag: Rotate selected node around pivot.") + "\n" + TTR("Alt+Drag: Move selected node.") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Alt+Drag: Scale selected node.") + "\n" + TTR("V: Set selected node's pivot position.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.") + "\n" + TTR("(Available in all modes.)") + "\n" + TTR("RMB: Add node at position clicked."));
+	select_button->set_accessibility_name(TTRC("Select Mode"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -5414,6 +5433,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	move_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/move_mode", TTRC("Move Mode"), Key::W));
 	move_button->set_shortcut_context(this);
 	move_button->set_tooltip_text(TTRC("Move Mode"));
+	move_button->set_accessibility_name(TTRC("Move Mode"));
 
 	rotate_button = memnew(Button);
 	rotate_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5423,6 +5443,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	rotate_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/rotate_mode", TTRC("Rotate Mode"), Key::E));
 	rotate_button->set_shortcut_context(this);
 	rotate_button->set_tooltip_text(TTRC("Rotate Mode"));
+	rotate_button->set_accessibility_name(TTRC("Rotate Mode"));
 
 	scale_button = memnew(Button);
 	scale_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5432,6 +5453,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	scale_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/scale_mode", TTRC("Scale Mode"), Key::S));
 	scale_button->set_shortcut_context(this);
 	scale_button->set_tooltip_text(TTRC("Shift: Scale proportionally."));
+	scale_button->set_accessibility_name(TTRC("Scale Mode"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -5441,6 +5463,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	list_select_button->set_toggle_mode(true);
 	list_select_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_LIST_SELECT));
 	list_select_button->set_tooltip_text(TTR("Show list of selectable nodes at position clicked."));
+	list_select_button->set_accessibility_name(TTRC("List Selectable Nodes"));
 
 	pivot_button = memnew(Button);
 	pivot_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5448,6 +5471,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	pivot_button->set_toggle_mode(true);
 	pivot_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_button_tool_select).bind(TOOL_EDIT_PIVOT));
 	pivot_button->set_tooltip_text(TTR("Click to change object's pivot.") + "\n" + TTR("Shift: Set temporary pivot.") + "\n" + TTR("Click this button while holding Shift to put the temporary pivot in the center of the selected nodes."));
+	pivot_button->set_accessibility_name(TTRC("Change Pivot"));
 
 	pan_button = memnew(Button);
 	pan_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5457,6 +5481,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	pan_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/pan_mode", TTRC("Pan Mode"), Key::G));
 	pan_button->set_shortcut_context(this);
 	pan_button->set_tooltip_text(TTRC("You can also use Pan View shortcut (Space by default) to pan in any mode."));
+	pan_button->set_accessibility_name(TTRC("Pan View"));
 
 	ruler_button = memnew(Button);
 	ruler_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5466,6 +5491,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	ruler_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/ruler_mode", TTRC("Ruler Mode"), Key::R));
 	ruler_button->set_shortcut_context(this);
 	ruler_button->set_tooltip_text(TTRC("Ruler Mode"));
+	ruler_button->set_accessibility_name(TTRC("Ruler Mode"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -5477,6 +5503,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	smart_snap_button->set_tooltip_text(TTRC("Toggle smart snapping."));
 	smart_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_smart_snap", TTRC("Use Smart Snap"), KeyModifierMask::SHIFT | Key::S));
 	smart_snap_button->set_shortcut_context(this);
+	smart_snap_button->set_accessibility_name(TTRC("Smart Snap"));
 
 	grid_snap_button = memnew(Button);
 	grid_snap_button->set_theme_type_variation(SceneStringName(FlatButton));
@@ -5486,6 +5513,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	grid_snap_button->set_tooltip_text(TTRC("Toggle grid snapping."));
 	grid_snap_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/use_grid_snap", TTRC("Use Grid Snap"), KeyModifierMask::SHIFT | Key::G));
 	grid_snap_button->set_shortcut_context(this);
+	grid_snap_button->set_accessibility_name(TTRC("Grid Snap"));
 
 	snap_config_menu = memnew(MenuButton);
 	snap_config_menu->set_flat(false);
@@ -5495,6 +5523,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	snap_config_menu->set_h_size_flags(SIZE_SHRINK_END);
 	snap_config_menu->set_tooltip_text(TTR("Snapping Options"));
 	snap_config_menu->set_switch_on_hover(true);
+	snap_config_menu->set_accessibility_name(TTRC("Snapping Options"));
 
 	PopupMenu *p = snap_config_menu->get_popup();
 	p->connect(SceneStringName(id_pressed), callable_mp(this, &CanvasItemEditor::_popup_callback));
@@ -5522,6 +5551,7 @@ CanvasItemEditor::CanvasItemEditor() {
 
 	lock_button = memnew(Button);
 	lock_button->set_theme_type_variation(SceneStringName(FlatButton));
+	lock_button->set_accessibility_name(TTRC("Lock"));
 	main_menu_hbox->add_child(lock_button);
 
 	lock_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(LOCK_SELECTED));
@@ -5530,6 +5560,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	lock_button->set_shortcut(ED_GET_SHORTCUT("editor/lock_selected_nodes"));
 
 	unlock_button = memnew(Button);
+	unlock_button->set_accessibility_name(TTRC("Unlock"));
 	unlock_button->set_theme_type_variation(SceneStringName(FlatButton));
 	main_menu_hbox->add_child(unlock_button);
 	unlock_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(UNLOCK_SELECTED));
@@ -5538,6 +5569,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	unlock_button->set_shortcut(ED_GET_SHORTCUT("editor/unlock_selected_nodes"));
 
 	group_button = memnew(Button);
+	group_button->set_accessibility_name(TTRC("Group"));
 	group_button->set_theme_type_variation(SceneStringName(FlatButton));
 	main_menu_hbox->add_child(group_button);
 	group_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(GROUP_SELECTED));
@@ -5546,6 +5578,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	group_button->set_shortcut(ED_GET_SHORTCUT("editor/group_selected_nodes"));
 
 	ungroup_button = memnew(Button);
+	ungroup_button->set_accessibility_name(TTRC("Ungroup"));
 	ungroup_button->set_theme_type_variation(SceneStringName(FlatButton));
 	main_menu_hbox->add_child(ungroup_button);
 	ungroup_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(UNGROUP_SELECTED));
@@ -5562,6 +5595,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	main_menu_hbox->add_child(skeleton_menu);
 	skeleton_menu->set_tooltip_text(TTR("Skeleton Options"));
 	skeleton_menu->set_switch_on_hover(true);
+	skeleton_menu->set_accessibility_name(TTRC("Skeleton Options"));
 
 	p = skeleton_menu->get_popup();
 	p->set_hide_on_checkable_item_selection(false);
@@ -5653,6 +5687,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	key_loc_button->set_focus_mode(FOCUS_NONE);
 	key_loc_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_POS));
 	key_loc_button->set_tooltip_text(TTR("Translation mask for inserting keys."));
+	key_loc_button->set_accessibility_name(TTRC("Translation Mask"));
 	animation_hb->add_child(key_loc_button);
 
 	key_rot_button = memnew(Button);
@@ -5662,6 +5697,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	key_rot_button->set_focus_mode(FOCUS_NONE);
 	key_rot_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_ROT));
 	key_rot_button->set_tooltip_text(TTR("Rotation mask for inserting keys."));
+	key_rot_button->set_accessibility_name(TTRC("Rotation Mask"));
 	animation_hb->add_child(key_rot_button);
 
 	key_scale_button = memnew(Button);
@@ -5670,6 +5706,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	key_scale_button->set_focus_mode(FOCUS_NONE);
 	key_scale_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_SCALE));
 	key_scale_button->set_tooltip_text(TTR("Scale mask for inserting keys."));
+	key_scale_button->set_accessibility_name(TTRC("Scale Mask"));
 	animation_hb->add_child(key_scale_button);
 
 	key_insert_button = memnew(Button);
@@ -5678,6 +5715,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	key_insert_button->connect(SceneStringName(pressed), callable_mp(this, &CanvasItemEditor::_popup_callback).bind(ANIM_INSERT_KEY));
 	key_insert_button->set_tooltip_text(TTRC("Insert keys (based on mask)."));
 	key_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_insert_key", TTRC("Insert Key"), Key::INSERT));
+	key_insert_button->set_accessibility_name(TTRC("Insert Keys"));
 	key_insert_button->set_shortcut_context(this);
 	animation_hb->add_child(key_insert_button);
 
@@ -5687,6 +5725,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	key_auto_insert_button->set_focus_mode(FOCUS_NONE);
 	key_auto_insert_button->set_tooltip_text(TTRC("Auto insert keys when objects are translated, rotated or scaled (based on mask).\nKeys are only added to existing tracks, no new tracks will be created.\nKeys must be inserted manually for the first time."));
 	key_auto_insert_button->set_shortcut(ED_SHORTCUT("canvas_item_editor/anim_auto_insert_key", TTRC("Auto Insert Key")));
+	key_auto_insert_button->set_accessibility_name(TTRC("Auto Insert Keys"));
 	key_auto_insert_button->set_shortcut_context(this);
 	animation_hb->add_child(key_auto_insert_button);
 
@@ -5695,6 +5734,7 @@ CanvasItemEditor::CanvasItemEditor() {
 	animation_menu->set_theme_type_variation("FlatMenuButton");
 	animation_menu->set_shortcut_context(this);
 	animation_menu->set_tooltip_text(TTR("Animation Key and Pose Options"));
+	animation_menu->set_accessibility_name(TTRC("Animation Key and Pose"));
 	animation_hb->add_child(animation_menu);
 	animation_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &CanvasItemEditor::_popup_callback));
 	animation_menu->set_switch_on_hover(true);
@@ -5794,9 +5834,6 @@ CanvasItemEditorPlugin::CanvasItemEditorPlugin() {
 	canvas_item_editor->hide();
 }
 
-CanvasItemEditorPlugin::~CanvasItemEditorPlugin() {
-}
-
 void CanvasItemEditorViewport::_on_mouse_exit() {
 	if (!texture_node_type_selector->is_visible()) {
 		_remove_preview();
@@ -6067,7 +6104,7 @@ bool CanvasItemEditorViewport::_create_instance(Node *p_parent, const String &p_
 }
 
 void CanvasItemEditorViewport::_perform_drop_data() {
-	ERR_FAIL_COND(selected_files.size() <= 0);
+	ERR_FAIL_COND(selected_files.is_empty());
 
 	_remove_preview();
 
@@ -6138,6 +6175,9 @@ void CanvasItemEditorViewport::_perform_drop_data() {
 }
 
 bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Variant &p_data) const {
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		return false;
+	}
 	Dictionary d = p_data;
 	if (!d.has("type") || (String(d["type"]) != "files")) {
 		label->hide();
@@ -6269,6 +6309,9 @@ bool CanvasItemEditorViewport::_is_any_texture_selected() const {
 }
 
 void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p_data) {
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		return;
+	}
 	bool is_shift = Input::get_singleton()->is_key_pressed(Key::SHIFT);
 	bool is_alt = Input::get_singleton()->is_key_pressed(Key::ALT);
 
@@ -6277,11 +6320,11 @@ void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p
 	if (d.has("type") && String(d["type"]) == "files") {
 		selected_files = d["files"];
 	}
-	if (selected_files.size() == 0) {
+	if (selected_files.is_empty()) {
 		return;
 	}
 
-	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
+	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_top_selected_node_list();
 	Node *root_node = EditorNode::get_singleton()->get_edited_scene();
 	if (selected_nodes.size() > 0) {
 		Node *selected_node = selected_nodes.front()->get();
diff --git a/engine/editor/plugins/canvas_item_editor_plugin.h b/engine/editor/plugins/canvas_item_editor_plugin.h
index 1581db93..9e1ef008 100644
--- a/engine/editor/plugins/canvas_item_editor_plugin.h
+++ b/engine/editor/plugins/canvas_item_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CANVAS_ITEM_EDITOR_PLUGIN_H
-#define CANVAS_ITEM_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
@@ -68,8 +67,6 @@ public:
 	List<Dictionary> pre_drag_bones_undo_state;
 
 	Dictionary undo_state;
-
-	CanvasItemEditorSelectedItem() {}
 };
 
 class CanvasItemEditor : public VBoxContainer {
@@ -255,7 +252,7 @@ private:
 	bool key_scale = false;
 
 	bool pan_pressed = false;
-	Vector2 temp_pivot = Vector2(INFINITY, INFINITY);
+	Vector2 temp_pivot = Vector2(Math::INF, Math::INF);
 
 	bool ruler_tool_active = false;
 	Point2 ruler_tool_origin;
@@ -603,7 +600,7 @@ protected:
 	void _notification(int p_what);
 
 public:
-	virtual String get_plugin_name() const override { return "2D"; }
+	virtual String get_plugin_name() const override { return TTRC("2D"); }
 	bool has_main_screen() const override { return true; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
@@ -615,7 +612,6 @@ public:
 	CanvasItemEditor *get_canvas_item_editor() { return canvas_item_editor; }
 
 	CanvasItemEditorPlugin();
-	~CanvasItemEditorPlugin();
 };
 
 class CanvasItemEditorViewport : public Control {
@@ -665,5 +661,3 @@ public:
 	CanvasItemEditorViewport(CanvasItemEditor *p_canvas_item_editor);
 	~CanvasItemEditorViewport();
 };
-
-#endif // CANVAS_ITEM_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/cast_2d_editor_plugin.h b/engine/editor/plugins/cast_2d_editor_plugin.h
index a74307b3..d9a742e7 100644
--- a/engine/editor/plugins/cast_2d_editor_plugin.h
+++ b/engine/editor/plugins/cast_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAST_2D_EDITOR_PLUGIN_H
-#define CAST_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/2d/node_2d.h"
@@ -73,5 +72,3 @@ public:
 
 	Cast2DEditorPlugin();
 };
-
-#endif // CAST_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/engine/editor/plugins/collision_polygon_2d_editor_plugin.cpp
index 7f4e0d3f..e4e6a073 100644
--- a/engine/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/collision_polygon_2d_editor_plugin.cpp
@@ -38,8 +38,6 @@ void CollisionPolygon2DEditor::_set_node(Node *p_polygon) {
 	node = Object::cast_to<CollisionPolygon2D>(p_polygon);
 }
 
-CollisionPolygon2DEditor::CollisionPolygon2DEditor() {}
-
 CollisionPolygon2DEditorPlugin::CollisionPolygon2DEditorPlugin() :
 		AbstractPolygon2DEditorPlugin(memnew(CollisionPolygon2DEditor), "CollisionPolygon2D") {
 }
diff --git a/engine/editor/plugins/collision_polygon_2d_editor_plugin.h b/engine/editor/plugins/collision_polygon_2d_editor_plugin.h
index 61e6cc3d..ba2d07b7 100644
--- a/engine/editor/plugins/collision_polygon_2d_editor_plugin.h
+++ b/engine/editor/plugins/collision_polygon_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_POLYGON_2D_EDITOR_PLUGIN_H
-#define COLLISION_POLYGON_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
 #include "scene/2d/physics/collision_polygon_2d.h"
@@ -42,9 +41,6 @@ class CollisionPolygon2DEditor : public AbstractPolygon2DEditor {
 protected:
 	virtual Node2D *_get_node() const override;
 	virtual void _set_node(Node *p_polygon) override;
-
-public:
-	CollisionPolygon2DEditor();
 };
 
 class CollisionPolygon2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
@@ -53,5 +49,3 @@ class CollisionPolygon2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
 public:
 	CollisionPolygon2DEditorPlugin();
 };
-
-#endif // COLLISION_POLYGON_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/collision_shape_2d_editor_plugin.cpp b/engine/editor/plugins/collision_shape_2d_editor_plugin.cpp
index d4522381..4c78b7f1 100644
--- a/engine/editor/plugins/collision_shape_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/collision_shape_2d_editor_plugin.cpp
@@ -664,6 +664,3 @@ CollisionShape2DEditorPlugin::CollisionShape2DEditorPlugin() {
 	collision_shape_2d_editor = memnew(CollisionShape2DEditor);
 	EditorNode::get_singleton()->get_gui_base()->add_child(collision_shape_2d_editor);
 }
-
-CollisionShape2DEditorPlugin::~CollisionShape2DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/collision_shape_2d_editor_plugin.h b/engine/editor/plugins/collision_shape_2d_editor_plugin.h
index efd7c5e3..e9ed6e26 100644
--- a/engine/editor/plugins/collision_shape_2d_editor_plugin.h
+++ b/engine/editor/plugins/collision_shape_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_SHAPE_2D_EDITOR_PLUGIN_H
-#define COLLISION_SHAPE_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/2d/physics/collision_shape_2d.h"
@@ -112,7 +111,4 @@ public:
 	virtual void make_visible(bool visible) override;
 
 	CollisionShape2DEditorPlugin();
-	~CollisionShape2DEditorPlugin();
 };
-
-#endif // COLLISION_SHAPE_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/color_channel_selector.h b/engine/editor/plugins/color_channel_selector.h
index f1498d30..3809af1b 100644
--- a/engine/editor/plugins/color_channel_selector.h
+++ b/engine/editor/plugins/color_channel_selector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLOR_CHANNEL_SELECTOR_H
-#define COLOR_CHANNEL_SELECTOR_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 
@@ -61,5 +60,3 @@ private:
 	PanelContainer *panel = nullptr;
 	Button *toggle_button = nullptr;
 };
-
-#endif // COLOR_CHANNEL_SELECTOR_H
diff --git a/engine/editor/plugins/control_editor_plugin.cpp b/engine/editor/plugins/control_editor_plugin.cpp
index e3ac7751..e146dd16 100644
--- a/engine/editor/plugins/control_editor_plugin.cpp
+++ b/engine/editor/plugins/control_editor_plugin.cpp
@@ -104,7 +104,8 @@ void ControlPositioningWarning::gui_input(const Ref<InputEvent> &p_event) {
 
 void ControlPositioningWarning::_notification(int p_notification) {
 	switch (p_notification) {
-		case NOTIFICATION_ENTER_TREE:
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED:
 		case NOTIFICATION_THEME_CHANGED:
 			_update_warning();
 			_update_toggler();
@@ -329,7 +330,7 @@ void EditorPropertySizeFlags::update_property() {
 void EditorPropertySizeFlags::setup(const Vector<String> &p_options, bool p_vertical) {
 	vertical = p_vertical;
 
-	if (p_options.size() == 0) {
+	if (p_options.is_empty()) {
 		flag_presets->clear();
 		flag_presets->add_item(TTR("Container Default"));
 		flag_presets->set_disabled(true);
@@ -551,6 +552,7 @@ void ControlEditorPresetPicker::_add_row_button(HBoxContainer *p_row, const int
 	b->set_custom_minimum_size(Size2i(36, 36) * EDSCALE);
 	b->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	b->set_tooltip_text(p_name);
+	b->set_accessibility_name(p_name);
 	b->set_flat(true);
 	p_row->add_child(b);
 	b->connect(SceneStringName(pressed), callable_mp(this, &ControlEditorPresetPicker::_preset_button_pressed).bind(p_preset));
@@ -740,7 +742,7 @@ SizeFlagPresetPicker::SizeFlagPresetPicker(bool p_vertical) {
 
 void ControlEditorToolbar::_anchors_preset_selected(int p_preset) {
 	LayoutPreset preset = (LayoutPreset)p_preset;
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Change Anchors, Offsets, Grow Direction"));
@@ -761,7 +763,7 @@ void ControlEditorToolbar::_anchors_preset_selected(int p_preset) {
 }
 
 void ControlEditorToolbar::_anchors_to_current_ratio() {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("Change Anchors, Offsets (Keep Ratio)"));
@@ -812,7 +814,7 @@ void ControlEditorToolbar::_anchor_mode_toggled(bool p_status) {
 }
 
 void ControlEditorToolbar::_container_flags_selected(int p_flags, bool p_vertical) {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	if (p_vertical) {
@@ -839,7 +841,7 @@ void ControlEditorToolbar::_container_flags_selected(int p_flags, bool p_vertica
 }
 
 void ControlEditorToolbar::_expand_flag_toggled(bool p_expand, bool p_vertical) {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	if (p_vertical) {
@@ -973,7 +975,7 @@ void ControlEditorToolbar::_selection_changed() {
 		int nb_valid_controls = 0;
 		int nb_anchors_mode = 0;
 
-		List<Node *> selection = editor_selection->get_selected_node_list();
+		List<Node *> selection = editor_selection->get_top_selected_node_list();
 		for (Node *E : selection) {
 			Control *control = Object::cast_to<Control>(E);
 			if (!control) {
@@ -1023,7 +1025,7 @@ void ControlEditorToolbar::_selection_changed() {
 		int nb_h_expand = 0;
 		int nb_v_expand = 0;
 
-		List<Node *> selection = editor_selection->get_selected_node_list();
+		List<Node *> selection = editor_selection->get_top_selected_node_list();
 		for (Node *E : selection) {
 			Control *control = Object::cast_to<Control>(E);
 			if (!control) {
@@ -1084,6 +1086,7 @@ ControlEditorToolbar::ControlEditorToolbar() {
 	anchor_mode_button->set_theme_type_variation(SceneStringName(FlatButton));
 	anchor_mode_button->set_toggle_mode(true);
 	anchor_mode_button->set_tooltip_text(TTR("When active, moving Control nodes changes their anchors instead of their offsets."));
+	anchor_mode_button->set_accessibility_name(TTRC("Change Anchors"));
 	add_child(anchor_mode_button);
 	anchor_mode_button->connect(SceneStringName(toggled), callable_mp(this, &ControlEditorToolbar::_anchor_mode_toggled));
 
diff --git a/engine/editor/plugins/control_editor_plugin.h b/engine/editor/plugins/control_editor_plugin.h
index b0a4de87..53b43b05 100644
--- a/engine/editor/plugins/control_editor_plugin.h
+++ b/engine/editor/plugins/control_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONTROL_EDITOR_PLUGIN_H
-#define CONTROL_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -171,9 +170,6 @@ protected:
 
 	void _add_row_button(HBoxContainer *p_row, const int p_preset, const String &p_name);
 	void _add_separator(BoxContainer *p_box, Separator *p_separator);
-
-public:
-	ControlEditorPresetPicker() {}
 };
 
 class AnchorPresetPicker : public ControlEditorPresetPicker {
@@ -259,5 +255,3 @@ public:
 
 	ControlEditorPlugin();
 };
-
-#endif // CONTROL_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/curve_editor_plugin.cpp b/engine/editor/plugins/curve_editor_plugin.cpp
index aaf7c427..7b99546a 100644
--- a/engine/editor/plugins/curve_editor_plugin.cpp
+++ b/engine/editor/plugins/curve_editor_plugin.cpp
@@ -128,6 +128,14 @@ void CurveEdit::_notification(int p_what) {
 			tangent_hover_radius = Math::round(BASE_TANGENT_HOVER_RADIUS * get_theme_default_base_scale() * gizmo_scale);
 			tangent_length = Math::round(BASE_TANGENT_LENGTH * get_theme_default_base_scale());
 		} break;
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Curve editor")));
+		} break;
 		case NOTIFICATION_DRAW: {
 			_redraw();
 		} break;
@@ -989,6 +997,7 @@ CurveEditor::CurveEditor() {
 
 	snap_button = memnew(Button);
 	snap_button->set_tooltip_text(TTR("Toggle Grid Snap"));
+	snap_button->set_accessibility_name(TTRC("Grid Snap"));
 	snap_button->set_toggle_mode(true);
 	toolbar->add_child(snap_button);
 	snap_button->connect(SceneStringName(toggled), callable_mp(this, &CurveEditor::_set_snap_enabled));
@@ -998,6 +1007,7 @@ CurveEditor::CurveEditor() {
 	snap_count_edit = memnew(EditorSpinSlider);
 	snap_count_edit->set_min(2);
 	snap_count_edit->set_max(100);
+	snap_count_edit->set_accessibility_name(TTRC("Snap Step"));
 	snap_count_edit->set_value(DEFAULT_SNAP);
 	snap_count_edit->set_custom_minimum_size(Size2(65 * EDSCALE, 0));
 	toolbar->add_child(snap_count_edit);
diff --git a/engine/editor/plugins/curve_editor_plugin.h b/engine/editor/plugins/curve_editor_plugin.h
index 64abe977..a8c45950 100644
--- a/engine/editor/plugins/curve_editor_plugin.h
+++ b/engine/editor/plugins/curve_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CURVE_EDITOR_PLUGIN_H
-#define CURVE_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/editor_resource_preview.h"
@@ -198,5 +197,3 @@ public:
 	virtual bool handles(const String &p_type) const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
 };
-
-#endif // CURVE_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/debugger_editor_plugin.h b/engine/editor/plugins/debugger_editor_plugin.h
index c94ff9b1..c5860d83 100644
--- a/engine/editor/plugins/debugger_editor_plugin.h
+++ b/engine/editor/plugins/debugger_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEBUGGER_EDITOR_PLUGIN_H
-#define DEBUGGER_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -73,5 +72,3 @@ public:
 	DebuggerEditorPlugin(PopupMenu *p_menu);
 	~DebuggerEditorPlugin();
 };
-
-#endif // DEBUGGER_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/dedicated_server_export_plugin.h b/engine/editor/plugins/dedicated_server_export_plugin.h
index 4881d54f..5451a668 100644
--- a/engine/editor/plugins/dedicated_server_export_plugin.h
+++ b/engine/editor/plugins/dedicated_server_export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEDICATED_SERVER_EXPORT_PLUGIN_H
-#define DEDICATED_SERVER_EXPORT_PLUGIN_H
+#pragma once
 
 #include "editor/export/editor_export_plugin.h"
 
@@ -54,5 +53,3 @@ protected:
 	void _end_customize_scenes() override;
 	void _end_customize_resources() override;
 };
-
-#endif // DEDICATED_SERVER_EXPORT_PLUGIN_H
diff --git a/engine/editor/plugins/editor_context_menu_plugin.h b/engine/editor/plugins/editor_context_menu_plugin.h
index 8f323239..822d9de9 100644
--- a/engine/editor/plugins/editor_context_menu_plugin.h
+++ b/engine/editor/plugins/editor_context_menu_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_CONTEXT_MENU_PLUGIN_H
-#define EDITOR_CONTEXT_MENU_PLUGIN_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
@@ -113,5 +112,3 @@ public:
 	static void create();
 	static void cleanup();
 };
-
-#endif // EDITOR_CONTEXT_MENU_PLUGIN_H
diff --git a/engine/editor/plugins/editor_debugger_plugin.h b/engine/editor/plugins/editor_debugger_plugin.h
index 4f09824d..1cc4a54e 100644
--- a/engine/editor/plugins/editor_debugger_plugin.h
+++ b/engine/editor/plugins/editor_debugger_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DEBUGGER_PLUGIN_H
-#define EDITOR_DEBUGGER_PLUGIN_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -103,5 +102,3 @@ public:
 	EditorDebuggerPlugin();
 	~EditorDebuggerPlugin();
 };
-
-#endif // EDITOR_DEBUGGER_PLUGIN_H
diff --git a/engine/editor/plugins/editor_plugin.h b/engine/editor/plugins/editor_plugin.h
index 8b494b07..b2cf92c5 100644
--- a/engine/editor/plugins/editor_plugin.h
+++ b/engine/editor/plugins/editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PLUGIN_H
-#define EDITOR_PLUGIN_H
+#pragma once
 
 #include "core/io/config_file.h"
 #include "editor/plugins/editor_context_menu_plugin.h"
@@ -255,9 +254,6 @@ public:
 
 	void enable_plugin();
 	void disable_plugin();
-
-	EditorPlugin() {}
-	virtual ~EditorPlugin() {}
 };
 
 VARIANT_ENUM_CAST(EditorPlugin::CustomControlContainer);
@@ -296,5 +292,3 @@ public:
 		creation_funcs[creation_func_count++] = p_func;
 	}
 };
-
-#endif // EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/editor_plugin_settings.h b/engine/editor/plugins/editor_plugin_settings.h
index e0fdb882..f6946e3b 100644
--- a/engine/editor/plugins/editor_plugin_settings.h
+++ b/engine/editor/plugins/editor_plugin_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PLUGIN_SETTINGS_H
-#define EDITOR_PLUGIN_SETTINGS_H
+#pragma once
 
 #include "editor/plugins/plugin_config_dialog.h"
 
@@ -73,5 +72,3 @@ public:
 
 	EditorPluginSettings();
 };
-
-#endif // EDITOR_PLUGIN_SETTINGS_H
diff --git a/engine/editor/plugins/editor_preview_plugins.cpp b/engine/editor/plugins/editor_preview_plugins.cpp
index 5b003f53..85327b99 100644
--- a/engine/editor/plugins/editor_preview_plugins.cpp
+++ b/engine/editor/plugins/editor_preview_plugins.cpp
@@ -182,9 +182,6 @@ Ref<Texture2D> EditorTexturePreviewPlugin::generate(const Ref<Resource> &p_from,
 	return ImageTexture::create_from_image(img);
 }
 
-EditorTexturePreviewPlugin::EditorTexturePreviewPlugin() {
-}
-
 ////////////////////////////////////////////////////////////////////////////
 
 bool EditorImagePreviewPlugin::handles(const String &p_type) const {
@@ -222,9 +219,6 @@ Ref<Texture2D> EditorImagePreviewPlugin::generate(const Ref<Resource> &p_from, c
 	return ImageTexture::create_from_image(img);
 }
 
-EditorImagePreviewPlugin::EditorImagePreviewPlugin() {
-}
-
 bool EditorImagePreviewPlugin::generate_small_preview_automatically() const {
 	return true;
 }
@@ -287,9 +281,6 @@ bool EditorBitmapPreviewPlugin::generate_small_preview_automatically() const {
 	return true;
 }
 
-EditorBitmapPreviewPlugin::EditorBitmapPreviewPlugin() {
-}
-
 ///////////////////////////////////////////////////////////////////////////
 
 bool EditorPackedScenePreviewPlugin::handles(const String &p_type) const {
@@ -325,9 +316,6 @@ Ref<Texture2D> EditorPackedScenePreviewPlugin::generate_from_path(const String &
 	}
 }
 
-EditorPackedScenePreviewPlugin::EditorPackedScenePreviewPlugin() {
-}
-
 //////////////////////////////////////////////////////////////////
 
 void EditorMaterialPreviewPlugin::abort() {
@@ -405,22 +393,22 @@ EditorMaterialPreviewPlugin::EditorMaterialPreviewPlugin() {
 
 	int lats = 32;
 	int lons = 32;
-	const double lat_step = Math_TAU / lats;
-	const double lon_step = Math_TAU / lons;
+	const double lat_step = Math::TAU / lats;
+	const double lon_step = Math::TAU / lons;
 	real_t radius = 1.0;
 
 	Vector<Vector3> vertices;
 	Vector<Vector3> normals;
 	Vector<Vector2> uvs;
 	Vector<real_t> tangents;
-	Basis tt = Basis(Vector3(0, 1, 0), Math_PI * 0.5);
+	Basis tt = Basis(Vector3(0, 1, 0), Math::PI * 0.5);
 
 	for (int i = 1; i <= lats; i++) {
-		double lat0 = lat_step * (i - 1) - Math_TAU / 4;
+		double lat0 = lat_step * (i - 1) - Math::TAU / 4;
 		double z0 = Math::sin(lat0);
 		double zr0 = Math::cos(lat0);
 
-		double lat1 = lat_step * i - Math_TAU / 4;
+		double lat1 = lat_step * i - Math::TAU / 4;
 		double z1 = Math::sin(lat1);
 		double zr1 = Math::cos(lat1);
 
@@ -445,7 +433,7 @@ EditorMaterialPreviewPlugin::EditorMaterialPreviewPlugin() {
 	vertices.push_back(v[m_idx] * radius);                                                     \
 	{                                                                                          \
 		Vector2 uv(Math::atan2(v[m_idx].x, v[m_idx].z), Math::atan2(-v[m_idx].y, v[m_idx].z)); \
-		uv /= Math_PI;                                                                         \
+		uv /= Math::PI;                                                                        \
 		uv *= 4.0;                                                                             \
 		uv = uv * 0.5 + Vector2(0.5, 0.5);                                                     \
 		uvs.push_back(uv);                                                                     \
@@ -649,9 +637,6 @@ Ref<Texture2D> EditorScriptPreviewPlugin::_generate_from_source_code(const Scrip
 	return ImageTexture::create_from_image(img);
 }
 
-EditorScriptPreviewPlugin::EditorScriptPreviewPlugin() {
-}
-
 ///////////////////////////////////////////////////////////////////
 
 bool EditorAudioStreamPreviewPlugin::handles(const String &p_type) const {
@@ -731,9 +716,6 @@ Ref<Texture2D> EditorAudioStreamPreviewPlugin::generate(const Ref<Resource> &p_f
 	return ImageTexture::create_from_image(image);
 }
 
-EditorAudioStreamPreviewPlugin::EditorAudioStreamPreviewPlugin() {
-}
-
 ///////////////////////////////////////////////////////////////////////////
 
 void EditorMeshPreviewPlugin::abort() {
@@ -754,8 +736,8 @@ Ref<Texture2D> EditorMeshPreviewPlugin::generate(const Ref<Resource> &p_from, co
 	Vector3 ofs = aabb.get_center();
 	aabb.position -= ofs;
 	Transform3D xform;
-	xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math_PI * 0.125);
-	xform.basis = Basis().rotated(Vector3(1, 0, 0), Math_PI * 0.125) * xform.basis;
+	xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math::PI * 0.125);
+	xform.basis = Basis().rotated(Vector3(1, 0, 0), Math::PI * 0.125) * xform.basis;
 	AABB rot_aabb = xform.xform(aabb);
 	real_t m = MAX(rot_aabb.size.x, rot_aabb.size.y) * 0.5;
 	if (m == 0) {
@@ -952,6 +934,3 @@ Ref<Texture2D> EditorGradientPreviewPlugin::generate(const Ref<Resource> &p_from
 	}
 	return Ref<Texture2D>();
 }
-
-EditorGradientPreviewPlugin::EditorGradientPreviewPlugin() {
-}
diff --git a/engine/editor/plugins/editor_preview_plugins.h b/engine/editor/plugins/editor_preview_plugins.h
index ef8ba64e..c0730fa3 100644
--- a/engine/editor/plugins/editor_preview_plugins.h
+++ b/engine/editor/plugins/editor_preview_plugins.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_PREVIEW_PLUGINS_H
-#define EDITOR_PREVIEW_PLUGINS_H
+#pragma once
 
 #include "editor/editor_resource_preview.h"
 
@@ -44,8 +43,6 @@ public:
 	virtual bool handles(const String &p_type) const override;
 	virtual bool generate_small_preview_automatically() const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
-
-	EditorTexturePreviewPlugin();
 };
 
 class EditorImagePreviewPlugin : public EditorResourcePreviewGenerator {
@@ -55,8 +52,6 @@ public:
 	virtual bool handles(const String &p_type) const override;
 	virtual bool generate_small_preview_automatically() const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
-
-	EditorImagePreviewPlugin();
 };
 
 class EditorBitmapPreviewPlugin : public EditorResourcePreviewGenerator {
@@ -66,8 +61,6 @@ public:
 	virtual bool handles(const String &p_type) const override;
 	virtual bool generate_small_preview_automatically() const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
-
-	EditorBitmapPreviewPlugin();
 };
 
 class EditorPackedScenePreviewPlugin : public EditorResourcePreviewGenerator {
@@ -77,8 +70,6 @@ public:
 	virtual bool handles(const String &p_type) const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
 	virtual Ref<Texture2D> generate_from_path(const String &p_path, const Size2 &p_size, Dictionary &p_metadata) const override;
-
-	EditorPackedScenePreviewPlugin();
 };
 
 class EditorMaterialPreviewPlugin : public EditorResourcePreviewGenerator {
@@ -116,8 +107,6 @@ public:
 	virtual bool handles(const String &p_type) const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
 	virtual Ref<Texture2D> generate_from_path(const String &p_path, const Size2 &p_size, Dictionary &p_metadata) const override;
-
-	EditorScriptPreviewPlugin();
 };
 
 class EditorAudioStreamPreviewPlugin : public EditorResourcePreviewGenerator {
@@ -126,8 +115,6 @@ class EditorAudioStreamPreviewPlugin : public EditorResourcePreviewGenerator {
 public:
 	virtual bool handles(const String &p_type) const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
-
-	EditorAudioStreamPreviewPlugin();
 };
 
 class EditorMeshPreviewPlugin : public EditorResourcePreviewGenerator {
@@ -180,8 +167,4 @@ public:
 	virtual bool handles(const String &p_type) const override;
 	virtual bool generate_small_preview_automatically() const override;
 	virtual Ref<Texture2D> generate(const Ref<Resource> &p_from, const Size2 &p_size, Dictionary &p_metadata) const override;
-
-	EditorGradientPreviewPlugin();
 };
-
-#endif // EDITOR_PREVIEW_PLUGINS_H
diff --git a/engine/editor/plugins/editor_resource_conversion_plugin.h b/engine/editor/plugins/editor_resource_conversion_plugin.h
index 1f8aad51..758ced16 100644
--- a/engine/editor/plugins/editor_resource_conversion_plugin.h
+++ b/engine/editor/plugins/editor_resource_conversion_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_RESOURCE_CONVERSION_PLUGIN_H
-#define EDITOR_RESOURCE_CONVERSION_PLUGIN_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -49,5 +48,3 @@ public:
 	virtual bool handles(const Ref<Resource> &p_resource) const;
 	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const;
 };
-
-#endif // EDITOR_RESOURCE_CONVERSION_PLUGIN_H
diff --git a/engine/editor/plugins/editor_resource_tooltip_plugins.cpp b/engine/editor/plugins/editor_resource_tooltip_plugins.cpp
index dfeb5921..d8da6002 100644
--- a/engine/editor/plugins/editor_resource_tooltip_plugins.cpp
+++ b/engine/editor/plugins/editor_resource_tooltip_plugins.cpp
@@ -30,6 +30,7 @@
 
 #include "editor_resource_tooltip_plugins.h"
 
+#include "editor/editor_file_system.h"
 #include "editor/editor_resource_preview.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/box_container.h"
@@ -38,7 +39,7 @@
 
 void EditorResourceTooltipPlugin::_thumbnail_ready(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, const Variant &p_udata) {
 	ObjectID trid = p_udata;
-	TextureRect *tr = Object::cast_to<TextureRect>(ObjectDB::get_instance(trid));
+	TextureRect *tr = ObjectDB::get_instance<TextureRect>(trid);
 
 	if (!tr) {
 		return;
@@ -63,6 +64,12 @@ VBoxContainer *EditorResourceTooltipPlugin::make_default_tooltip(const String &p
 		vb->add_child(label);
 	}
 
+	ResourceUID::ID id = EditorFileSystem::get_singleton()->get_file_uid(p_resource_path);
+	if (id != ResourceUID::INVALID_ID) {
+		Label *label = memnew(Label(ResourceUID::get_singleton()->id_to_text(id)));
+		vb->add_child(label);
+	}
+
 	{
 		Ref<FileAccess> f = FileAccess::open(p_resource_path, FileAccess::READ);
 		Label *label = memnew(Label(vformat(TTR("Size: %s"), String::humanize_size(f->get_length()))));
diff --git a/engine/editor/plugins/editor_resource_tooltip_plugins.h b/engine/editor/plugins/editor_resource_tooltip_plugins.h
index 43be8fd8..b679ebd0 100644
--- a/engine/editor/plugins/editor_resource_tooltip_plugins.h
+++ b/engine/editor/plugins/editor_resource_tooltip_plugins.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_RESOURCE_TOOLTIP_PLUGINS_H
-#define EDITOR_RESOURCE_TOOLTIP_PLUGINS_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
@@ -73,5 +72,3 @@ public:
 	virtual bool handles(const String &p_resource_type) const override;
 	virtual Control *make_tooltip_for_path(const String &p_resource_path, const Dictionary &p_metadata, Control *p_base) const override;
 };
-
-#endif // EDITOR_RESOURCE_TOOLTIP_PLUGINS_H
diff --git a/engine/editor/plugins/embedded_process.h b/engine/editor/plugins/embedded_process.h
index 298424b0..1464a849 100644
--- a/engine/editor/plugins/embedded_process.h
+++ b/engine/editor/plugins/embedded_process.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EMBEDDED_PROCESS_H
-#define EMBEDDED_PROCESS_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -94,5 +93,3 @@ public:
 	EmbeddedProcess();
 	~EmbeddedProcess();
 };
-
-#endif // EMBEDDED_PROCESS_H
diff --git a/engine/editor/plugins/font_config_plugin.cpp b/engine/editor/plugins/font_config_plugin.cpp
index 7cf0b2d2..a213d493 100644
--- a/engine/editor/plugins/font_config_plugin.cpp
+++ b/engine/editor/plugins/font_config_plugin.cpp
@@ -158,7 +158,7 @@ void EditorPropertyFontMetaOverride::_notification(int p_what) {
 void EditorPropertyFontMetaOverride::_property_changed(const String &p_property, const Variant &p_value, const String &p_name, bool p_changing) {
 	if (p_property.begins_with("keys")) {
 		Dictionary dict = object->get_dict();
-		String key = p_property.get_slice("/", 1);
+		String key = p_property.get_slicec('/', 1);
 		dict[key] = (bool)p_value;
 
 		emit_changed(get_edited_property(), dict, "", true);
@@ -295,6 +295,7 @@ void EditorPropertyFontMetaOverride::update_property() {
 			hbox->add_child(prop);
 			prop->set_h_size_flags(SIZE_EXPAND_FILL);
 			Button *remove = memnew(Button);
+			remove->set_accessibility_name(TTRC("Remove"));
 			remove->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 			hbox->add_child(remove);
 			remove->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyFontMetaOverride::_remove).bind(remove, name));
@@ -349,6 +350,7 @@ EditorPropertyFontMetaOverride::EditorPropertyFontMetaOverride(bool p_script) {
 	page_length = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
 
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit->set_clip_text(true);
 	edit->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyFontMetaOverride::_edit_pressed));
@@ -378,7 +380,7 @@ EditorPropertyFontMetaOverride::EditorPropertyFontMetaOverride(bool p_script) {
 void EditorPropertyOTVariation::_property_changed(const String &p_property, const Variant &p_value, const String &p_name, bool p_changing) {
 	if (p_property.begins_with("keys")) {
 		Dictionary dict = object->get_dict();
-		int key = p_property.get_slice("/", 1).to_int();
+		int key = p_property.get_slicec('/', 1).to_int();
 		dict[key] = (int)p_value;
 
 		emit_changed(get_edited_property(), dict, "", true);
@@ -407,9 +409,9 @@ void EditorPropertyOTVariation::update_property() {
 
 	Dictionary supported = (fd.is_valid()) ? fd->get_supported_variation_list() : Dictionary();
 
-	for (int i = 0; i < supported.size(); i++) {
-		int name_tag = supported.get_key_at_index(i);
-		Vector3i range = supported.get_value_at_index(i);
+	for (const KeyValue<Variant, Variant> &kv : supported) {
+		const int &name_tag = kv.key;
+		const Vector3i &range = kv.value;
 		if ((dict.has(name_tag) && dict[name_tag].get_type() == Variant::NIL) || !dict.has(name_tag)) {
 			dict[name_tag] = range.z;
 		}
@@ -476,7 +478,7 @@ void EditorPropertyOTVariation::update_property() {
 			String name = TS->tag_to_name(name_tag);
 			String name_cap;
 			{
-				String aux = name.replace("_", " ").strip_edges();
+				String aux = name.replace_char('_', ' ').strip_edges();
 				for (int j = 0; j < aux.get_slice_count(" "); j++) {
 					String slice = aux.get_slicec(' ', j);
 					if (slice.length() > 0) {
@@ -535,6 +537,7 @@ EditorPropertyOTVariation::EditorPropertyOTVariation() {
 	page_length = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
 
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit->set_clip_text(true);
 	edit->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyOTVariation::_edit_pressed));
@@ -561,7 +564,7 @@ void EditorPropertyOTFeatures::_notification(int p_what) {
 void EditorPropertyOTFeatures::_property_changed(const String &p_property, const Variant &p_value, const String &p_name, bool p_changing) {
 	if (p_property.begins_with("keys")) {
 		Dictionary dict = object->get_dict();
-		int key = p_property.get_slice("/", 1).to_int();
+		int key = p_property.get_slicec('/', 1).to_int();
 		dict[key] = (int)p_value;
 
 		emit_changed(get_edited_property(), dict, "", true);
@@ -789,6 +792,7 @@ void EditorPropertyOTFeatures::update_property() {
 				hbox->add_child(prop);
 				prop->set_h_size_flags(SIZE_EXPAND_FILL);
 				Button *remove = memnew(Button);
+				remove->set_accessibility_name(TTRC("Remove"));
 				remove->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 				hbox->add_child(remove);
 				remove->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyOTFeatures::_remove).bind(remove, name_tag));
@@ -838,6 +842,7 @@ EditorPropertyOTFeatures::EditorPropertyOTFeatures() {
 	page_length = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
 
 	edit = memnew(Button);
+	edit->set_accessibility_name(TTRC("Edit"));
 	edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	edit->set_clip_text(true);
 	edit->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyOTFeatures::_edit_pressed));
@@ -973,9 +978,6 @@ void FontPreview::_preview_changed() {
 	queue_redraw();
 }
 
-FontPreview::FontPreview() {
-}
-
 /*************************************************************************/
 /* EditorInspectorPluginFontPreview                                      */
 /*************************************************************************/
diff --git a/engine/editor/plugins/font_config_plugin.h b/engine/editor/plugins/font_config_plugin.h
index 79f4205b..0fb0694e 100644
--- a/engine/editor/plugins/font_config_plugin.h
+++ b/engine/editor/plugins/font_config_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FONT_CONFIG_PLUGIN_H
-#define FONT_CONFIG_PLUGIN_H
+#pragma once
 
 #include "editor/editor_properties.h"
 #include "editor/editor_properties_array_dict.h"
@@ -49,8 +48,6 @@ protected:
 public:
 	void set_dict(const Dictionary &p_dict);
 	Dictionary get_dict();
-
-	EditorPropertyFontMetaObject() {}
 };
 
 /*************************************************************************/
@@ -73,8 +70,6 @@ public:
 
 	void set_defaults(const Dictionary &p_dict);
 	Dictionary get_defaults();
-
-	EditorPropertyFontOTObject() {}
 };
 
 /*************************************************************************/
@@ -229,8 +224,6 @@ public:
 	virtual Size2 get_minimum_size() const override;
 
 	void set_data(const Ref<Font> &p_f);
-
-	FontPreview();
 };
 
 /*************************************************************************/
@@ -281,5 +274,3 @@ public:
 
 	virtual String get_plugin_name() const override { return "Font"; }
 };
-
-#endif // FONT_CONFIG_PLUGIN_H
diff --git a/engine/editor/plugins/game_view_plugin.cpp b/engine/editor/plugins/game_view_plugin.cpp
index bc3b4cee..fdff2cca 100644
--- a/engine/editor/plugins/game_view_plugin.cpp
+++ b/engine/editor/plugins/game_view_plugin.cpp
@@ -35,7 +35,6 @@
 #include "core/string/translation_server.h"
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/debugger/script_editor_debugger.h"
-#include "editor/editor_command_palette.h"
 #include "editor/editor_feature_profile.h"
 #include "editor/editor_interface.h"
 #include "editor/editor_main_screen.h"
@@ -58,14 +57,30 @@ void GameViewDebugger::_session_started(Ref<EditorDebuggerSession> p_session) {
 		return;
 	}
 
-	Array setup_data;
 	Dictionary settings;
+	settings["debugger/max_node_selection"] = EDITOR_GET("debugger/max_node_selection");
 	settings["editors/panning/2d_editor_panning_scheme"] = EDITOR_GET("editors/panning/2d_editor_panning_scheme");
 	settings["editors/panning/simple_panning"] = EDITOR_GET("editors/panning/simple_panning");
 	settings["editors/panning/warped_mouse_panning"] = EDITOR_GET("editors/panning/warped_mouse_panning");
 	settings["editors/panning/2d_editor_pan_speed"] = EDITOR_GET("editors/panning/2d_editor_pan_speed");
+	settings["editors/polygon_editor/point_grab_radius"] = EDITOR_GET("editors/polygon_editor/point_grab_radius");
 	settings["canvas_item_editor/pan_view"] = DebuggerMarshalls::serialize_key_shortcut(ED_GET_SHORTCUT("canvas_item_editor/pan_view"));
+	settings["box_selection_fill_color"] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("box_selection_fill_color"), EditorStringName(Editor));
+	settings["box_selection_stroke_color"] = EditorNode::get_singleton()->get_editor_theme()->get_color(SNAME("box_selection_stroke_color"), EditorStringName(Editor));
+	settings["editors/3d/default_fov"] = EDITOR_GET("editors/3d/default_fov");
+	settings["editors/3d/default_z_near"] = EDITOR_GET("editors/3d/default_z_near");
+	settings["editors/3d/default_z_far"] = EDITOR_GET("editors/3d/default_z_far");
+	settings["editors/3d/navigation/invert_x_axis"] = EDITOR_GET("editors/3d/navigation/invert_x_axis");
+	settings["editors/3d/navigation/invert_y_axis"] = EDITOR_GET("editors/3d/navigation/invert_y_axis");
+	settings["editors/3d/navigation/warped_mouse_panning"] = EDITOR_GET("editors/3d/navigation/warped_mouse_panning");
 	settings["editors/3d/freelook/freelook_base_speed"] = EDITOR_GET("editors/3d/freelook/freelook_base_speed");
+	settings["editors/3d/freelook/freelook_sensitivity"] = EDITOR_GET("editors/3d/freelook/freelook_sensitivity");
+	settings["editors/3d/navigation_feel/orbit_sensitivity"] = EDITOR_GET("editors/3d/navigation_feel/orbit_sensitivity");
+	settings["editors/3d/navigation_feel/translation_sensitivity"] = EDITOR_GET("editors/3d/navigation_feel/translation_sensitivity");
+	settings["editors/3d/selection_box_color"] = EDITOR_GET("editors/3d/selection_box_color");
+	settings["editors/3d/freelook/freelook_base_speed"] = EDITOR_GET("editors/3d/freelook/freelook_base_speed");
+
+	Array setup_data;
 	setup_data.append(settings);
 	p_session->send_message("scene:runtime_node_select_setup", setup_data);
 
@@ -78,6 +93,9 @@ void GameViewDebugger::_session_started(Ref<EditorDebuggerSession> p_session) {
 	Array mode;
 	mode.append(select_mode);
 	p_session->send_message("scene:runtime_node_select_set_mode", mode);
+	Array mute_audio_data;
+	mute_audio_data.append(mute_audio);
+	p_session->send_message("scene:debug_mute_audio", mute_audio_data);
 
 	emit_signal(SNAME("session_started"));
 }
@@ -90,10 +108,6 @@ void GameViewDebugger::_session_stopped() {
 	emit_signal(SNAME("session_stopped"));
 }
 
-void GameViewDebugger::set_is_feature_enabled(bool p_enabled) {
-	is_feature_enabled = p_enabled;
-}
-
 void GameViewDebugger::set_suspend(bool p_enabled) {
 	Array message;
 	message.append(p_enabled);
@@ -152,6 +166,11 @@ void GameViewDebugger::set_select_mode(int p_mode) {
 	}
 }
 
+void GameViewDebugger::set_debug_mute_audio(bool p_enabled) {
+	mute_audio = p_enabled;
+	EditorDebuggerNode::get_singleton()->set_debug_mute_audio(p_enabled);
+}
+
 void GameViewDebugger::set_camera_override(bool p_enabled) {
 	EditorDebuggerNode::get_singleton()->set_camera_override(p_enabled ? camera_override_mode : EditorDebuggerNode::OVERRIDE_NONE);
 }
@@ -190,11 +209,20 @@ void GameViewDebugger::setup_session(int p_session_id) {
 	session->connect("stopped", callable_mp(this, &GameViewDebugger::_session_stopped));
 }
 
+void GameViewDebugger::_feature_profile_changed() {
+	Ref<EditorFeatureProfile> profile = EditorFeatureProfileManager::get_singleton()->get_current_profile();
+	is_feature_enabled = profile.is_null() || !profile->is_feature_disabled(EditorFeatureProfile::FEATURE_GAME);
+}
+
 void GameViewDebugger::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("session_started"));
 	ADD_SIGNAL(MethodInfo("session_stopped"));
 }
 
+GameViewDebugger::GameViewDebugger() {
+	EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &GameViewDebugger::_feature_profile_changed));
+}
+
 ///////
 
 void GameView::_sessions_changed() {
@@ -225,6 +253,7 @@ void GameView::_instance_starting(int p_idx, List<String> &r_arguments) {
 	if (!is_feature_enabled) {
 		return;
 	}
+
 	if (p_idx == 0 && embed_on_play && make_floating_on_play && window_wrapper->is_window_available() && !window_wrapper->get_window_enabled() && _get_embed_available() == EMBED_AVAILABLE) {
 		// Set the Floating Window default title. Always considered in DEBUG mode, same as in Window::set_title.
 		String appname = GLOBAL_GET("application/config/name");
@@ -337,6 +366,9 @@ void GameView::_stop_pressed() {
 void GameView::_embedding_completed() {
 	_attach_script_debugger();
 	_update_ui();
+	if (make_floating_on_play) {
+		get_window()->set_flag(Window::FLAG_ALWAYS_ON_TOP, bool(GLOBAL_GET("display/window/size/always_on_top")));
+	}
 }
 
 void GameView::_embedding_failed() {
@@ -406,11 +438,17 @@ void GameView::_node_type_pressed(int p_option) {
 
 void GameView::_select_mode_pressed(int p_option) {
 	RuntimeNodeSelect::SelectMode mode = (RuntimeNodeSelect::SelectMode)p_option;
+	if (!select_mode_button[mode]->is_visible()) {
+		return;
+	}
+
 	for (int i = 0; i < RuntimeNodeSelect::SELECT_MODE_MAX; i++) {
 		select_mode_button[i]->set_pressed_no_signal(i == mode);
 	}
 
 	debugger->set_select_mode(mode);
+
+	EditorSettings::get_singleton()->set_project_metadata("game_view", "select_mode", mode);
 }
 
 void GameView::_embed_options_menu_menu_id_pressed(int p_id) {
@@ -506,13 +544,13 @@ void GameView::_update_ui() {
 			state_label->set_text(vformat(TTR("Game embedding not available for the Display Server: '%s'.\nDisplay Server can be modified in the Project Settings (Display > Display Server > Driver)."), GLOBAL_GET("display/display_server/driver")));
 			break;
 		case EMBED_NOT_AVAILABLE_MINIMIZED:
-			state_label->set_text(TTR("Game embedding not available when the game starts minimized.\nConsider overriding the window mode project setting with the editor feature tag to Windowed to use game embedding while leaving the exported project intact."));
+			state_label->set_text(TTR("Game embedding not available when the game starts minimized.") + "\n" + TTR("Consider overriding the window mode project setting with the editor feature tag to Windowed to use game embedding while leaving the exported project intact."));
 			break;
 		case EMBED_NOT_AVAILABLE_MAXIMIZED:
-			state_label->set_text(TTR("Game embedding not available when the game starts maximized.\nConsider overriding the window mode project setting with the editor feature tag to Windowed to use game embedding while leaving the exported project intact."));
+			state_label->set_text(TTR("Game embedding not available when the game starts maximized.") + "\n" + TTR("Consider overriding the window mode project setting with the editor feature tag to Windowed to use game embedding while leaving the exported project intact."));
 			break;
 		case EMBED_NOT_AVAILABLE_FULLSCREEN:
-			state_label->set_text(TTR("Game embedding not available when the game starts in fullscreen.\nConsider overriding the window mode project setting with the editor feature tag to Windowed to use game embedding while leaving the exported project intact."));
+			state_label->set_text(TTR("Game embedding not available when the game starts in fullscreen.") + "\n" + TTR("Consider overriding the window mode project setting with the editor feature tag to Windowed to use game embedding while leaving the exported project intact."));
 			break;
 		case EMBED_NOT_AVAILABLE_SINGLE_WINDOW_MODE:
 			state_label->set_text(TTR("Game embedding not available in single window mode."));
@@ -570,6 +608,15 @@ void GameView::_hide_selection_toggled(bool p_pressed) {
 	hide_selection->set_button_icon(get_editor_theme_icon(p_pressed ? SNAME("GuiVisibilityHidden") : SNAME("GuiVisibilityVisible")));
 
 	debugger->set_selection_visible(!p_pressed);
+
+	EditorSettings::get_singleton()->set_project_metadata("game_view", "hide_selection", p_pressed);
+}
+
+void GameView::_debug_mute_audio_button_pressed() {
+	debug_mute_audio = !debug_mute_audio;
+	debug_mute_audio_button->set_button_icon(get_editor_theme_icon(debug_mute_audio ? SNAME("AudioMute") : SNAME("AudioStreamPlayer")));
+	debug_mute_audio_button->set_tooltip_text(debug_mute_audio ? TTRC("Unmute game audio.") : TTRC("Mute game audio."));
+	debugger->set_debug_mute_audio(debug_mute_audio);
 }
 
 void GameView::_camera_override_button_toggled(bool p_pressed) {
@@ -598,12 +645,16 @@ void GameView::_camera_override_menu_id_pressed(int p_id) {
 			menu->set_item_checked(menu->get_item_index(p_id), true);
 
 			_update_debugger_buttons();
+
+			EditorSettings::get_singleton()->set_project_metadata("game_view", "camera_override_mode", p_id);
 		} break;
 		case CAMERA_MODE_EDITORS: {
 			debugger->set_camera_manipulate_mode(EditorDebuggerNode::OVERRIDE_EDITORS);
 			menu->set_item_checked(menu->get_item_index(p_id), true);
 
 			_update_debugger_buttons();
+
+			EditorSettings::get_singleton()->set_project_metadata("game_view", "camera_override_mode", p_id);
 		} break;
 	}
 }
@@ -616,9 +667,7 @@ void GameView::_notification(int p_what) {
 
 			node_type_button[RuntimeNodeSelect::NODE_TYPE_NONE]->set_button_icon(get_editor_theme_icon(SNAME("InputEventJoypadMotion")));
 			node_type_button[RuntimeNodeSelect::NODE_TYPE_2D]->set_button_icon(get_editor_theme_icon(SNAME("2DNodes")));
-#ifndef _3D_DISABLED
 			node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]->set_button_icon(get_editor_theme_icon(SNAME("Node3D")));
-#endif // _3D_DISABLED
 
 			select_mode_button[RuntimeNodeSelect::SELECT_MODE_SINGLE]->set_button_icon(get_editor_theme_icon(SNAME("ToolSelect")));
 			select_mode_button[RuntimeNodeSelect::SELECT_MODE_LIST]->set_button_icon(get_editor_theme_icon(SNAME("ListSelect")));
@@ -629,6 +678,8 @@ void GameView::_notification(int p_what) {
 			stretch_button->set_button_icon(get_editor_theme_icon(SNAME("Stretch")));
 			embed_options_menu->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
 
+			debug_mute_audio_button->set_button_icon(get_editor_theme_icon(debug_mute_audio ? SNAME("AudioMute") : SNAME("AudioStreamPlayer")));
+
 			camera_override_button->set_button_icon(get_editor_theme_icon(SNAME("Camera")));
 			camera_override_menu->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
 		} break;
@@ -685,45 +736,6 @@ void GameView::_notification(int p_what) {
 	}
 }
 
-void GameView::set_is_feature_enabled(bool p_enabled) {
-	is_feature_enabled = p_enabled;
-}
-
-void GameView::set_state(const Dictionary &p_state) {
-	if (p_state.has("hide_selection")) {
-		hide_selection->set_pressed(p_state["hide_selection"]);
-		_hide_selection_toggled(hide_selection->is_pressed());
-	}
-	if (p_state.has("select_mode")) {
-		_select_mode_pressed(p_state["select_mode"]);
-	}
-	if (p_state.has("camera_override_mode")) {
-		_camera_override_menu_id_pressed(p_state["camera_override_mode"]);
-	}
-}
-
-Dictionary GameView::get_state() const {
-	Dictionary d;
-	d["hide_selection"] = hide_selection->is_pressed();
-
-	for (int i = 0; i < RuntimeNodeSelect::SELECT_MODE_MAX; i++) {
-		if (select_mode_button[i]->is_pressed()) {
-			d["select_mode"] = i;
-			break;
-		}
-	}
-
-	PopupMenu *menu = camera_override_menu->get_popup();
-	for (int i = CAMERA_MODE_INGAME; i < CAMERA_MODE_EDITORS + 1; i++) {
-		if (menu->is_item_checked(menu->get_item_index(i))) {
-			d["camera_override_mode"] = i;
-			break;
-		}
-	}
-
-	return d;
-}
-
 void GameView::set_window_layout(Ref<ConfigFile> p_layout) {
 	floating_window_rect = p_layout->get_value("GameView", "floating_window_rect", Rect2i());
 	floating_window_screen = p_layout->get_value("GameView", "floating_window_screen", -1);
@@ -881,6 +893,19 @@ void GameView::_debugger_breaked(bool p_breaked, bool p_can_debug) {
 	_update_embed_window_size();
 }
 
+void GameView::_feature_profile_changed() {
+	Ref<EditorFeatureProfile> profile = EditorFeatureProfileManager::get_singleton()->get_current_profile();
+	bool is_profile_null = profile.is_null();
+
+	is_feature_enabled = is_profile_null || !profile->is_feature_disabled(EditorFeatureProfile::FEATURE_GAME);
+
+	bool is_3d_enabled = is_profile_null || !profile->is_feature_disabled(EditorFeatureProfile::FEATURE_3D);
+	if (!is_3d_enabled && node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]->is_pressed()) {
+		_node_type_pressed(RuntimeNodeSelect::NODE_TYPE_NONE);
+	}
+	node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]->set_visible(is_3d_enabled);
+}
+
 GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	singleton = this;
 
@@ -904,12 +929,14 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	suspend_button->set_theme_type_variation(SceneStringName(FlatButton));
 	suspend_button->connect(SceneStringName(toggled), callable_mp(this, &GameView::_suspend_button_toggled));
 	suspend_button->set_tooltip_text(TTR("Suspend"));
+	suspend_button->set_accessibility_name(TTRC("Suspend"));
 
 	next_frame_button = memnew(Button);
 	main_menu_hbox->add_child(next_frame_button);
 	next_frame_button->set_theme_type_variation(SceneStringName(FlatButton));
 	next_frame_button->connect(SceneStringName(pressed), callable_mp(*debugger, &GameViewDebugger::next_frame));
 	next_frame_button->set_tooltip_text(TTR("Next Frame"));
+	next_frame_button->set_accessibility_name(TTRC("Next Frame"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -930,7 +957,6 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	node_type_button[RuntimeNodeSelect::NODE_TYPE_2D]->connect(SceneStringName(pressed), callable_mp(this, &GameView::_node_type_pressed).bind(RuntimeNodeSelect::NODE_TYPE_2D));
 	node_type_button[RuntimeNodeSelect::NODE_TYPE_2D]->set_tooltip_text(TTR("Disable game input and allow to select Node2Ds, Controls, and manipulate the 2D camera."));
 
-#ifndef _3D_DISABLED
 	node_type_button[RuntimeNodeSelect::NODE_TYPE_3D] = memnew(Button);
 	main_menu_hbox->add_child(node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]);
 	node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]->set_text(TTR("3D"));
@@ -938,7 +964,6 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]->set_theme_type_variation(SceneStringName(FlatButton));
 	node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]->connect(SceneStringName(pressed), callable_mp(this, &GameView::_node_type_pressed).bind(RuntimeNodeSelect::NODE_TYPE_3D));
 	node_type_button[RuntimeNodeSelect::NODE_TYPE_3D]->set_tooltip_text(TTR("Disable game input and allow to select Node3Ds and manipulate the 3D camera."));
-#endif // _3D_DISABLED
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -948,6 +973,8 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	hide_selection->set_theme_type_variation(SceneStringName(FlatButton));
 	hide_selection->connect(SceneStringName(toggled), callable_mp(this, &GameView::_hide_selection_toggled));
 	hide_selection->set_tooltip_text(TTR("Toggle Selection Visibility"));
+	hide_selection->set_accessibility_name(TTRC("Selection Visibility"));
+	hide_selection->set_pressed(EditorSettings::get_singleton()->get_project_metadata("game_view", "hide_selection", false));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -968,14 +995,25 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	select_mode_button[RuntimeNodeSelect::SELECT_MODE_LIST]->connect(SceneStringName(pressed), callable_mp(this, &GameView::_select_mode_pressed).bind(RuntimeNodeSelect::SELECT_MODE_LIST));
 	select_mode_button[RuntimeNodeSelect::SELECT_MODE_LIST]->set_tooltip_text(TTR("Show list of selectable nodes at position clicked."));
 
+	_select_mode_pressed(EditorSettings::get_singleton()->get_project_metadata("game_view", "select_mode", 0));
+
+	main_menu_hbox->add_child(memnew(VSeparator));
+
+	debug_mute_audio_button = memnew(Button);
+	main_menu_hbox->add_child(debug_mute_audio_button);
+	debug_mute_audio_button->set_theme_type_variation("FlatButton");
+	debug_mute_audio_button->connect(SceneStringName(pressed), callable_mp(this, &GameView::_debug_mute_audio_button_pressed));
+	debug_mute_audio_button->set_tooltip_text(debug_mute_audio ? TTRC("Unmute game audio.") : TTRC("Mute game audio."));
+
 	main_menu_hbox->add_child(memnew(VSeparator));
 
 	camera_override_button = memnew(Button);
 	main_menu_hbox->add_child(camera_override_button);
 	camera_override_button->set_toggle_mode(true);
 	camera_override_button->set_theme_type_variation(SceneStringName(FlatButton));
-	camera_override_button->connect(SceneStringName(toggled), callable_mp(this, &GameView::_camera_override_button_toggled));
 	camera_override_button->set_tooltip_text(TTR("Override the in-game camera."));
+	camera_override_button->set_accessibility_name(TTRC("Override In-game Camera"));
+	camera_override_button->connect(SceneStringName(toggled), callable_mp(this, &GameView::_camera_override_button_toggled));
 
 	camera_override_menu = memnew(MenuButton);
 	main_menu_hbox->add_child(camera_override_menu);
@@ -983,6 +1021,8 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	camera_override_menu->set_theme_type_variation("FlatMenuButton");
 	camera_override_menu->set_h_size_flags(SIZE_SHRINK_END);
 	camera_override_menu->set_tooltip_text(TTR("Camera Override Options"));
+	camera_override_menu->set_accessibility_name(TTRC("Camera Override Options"));
+	_camera_override_menu_id_pressed(EditorSettings::get_singleton()->get_project_metadata("game_view", "camera_override_mode", 0));
 
 	PopupMenu *menu = camera_override_menu->get_popup();
 	menu->connect(SceneStringName(id_pressed), callable_mp(this, &GameView::_camera_override_menu_id_pressed));
@@ -1001,6 +1041,7 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	fixed_size_button->set_toggle_mode(true);
 	fixed_size_button->set_theme_type_variation("FlatButton");
 	fixed_size_button->set_tooltip_text(TTR("Embedded game size is based on project settings.\nThe 'Keep Aspect' mode is used when the Game Workspace is smaller than the desired size."));
+	fixed_size_button->set_accessibility_name(TTRC("Fixed Size"));
 	fixed_size_button->connect(SceneStringName(pressed), callable_mp(this, &GameView::_size_mode_button_pressed).bind(SIZE_MODE_FIXED));
 
 	keep_aspect_button = memnew(Button);
@@ -1008,6 +1049,7 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	keep_aspect_button->set_toggle_mode(true);
 	keep_aspect_button->set_theme_type_variation("FlatButton");
 	keep_aspect_button->set_tooltip_text(TTR("Keep the aspect ratio of the embedded game."));
+	keep_aspect_button->set_accessibility_name(TTRC("Keep Aspect Ratio"));
 	keep_aspect_button->connect(SceneStringName(pressed), callable_mp(this, &GameView::_size_mode_button_pressed).bind(SIZE_MODE_KEEP_ASPECT));
 
 	stretch_button = memnew(Button);
@@ -1015,6 +1057,7 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	stretch_button->set_toggle_mode(true);
 	stretch_button->set_theme_type_variation("FlatButton");
 	stretch_button->set_tooltip_text(TTR("Embedded game size stretches to fit the Game Workspace."));
+	stretch_button->set_accessibility_name(TTRC("Stretch"));
 	stretch_button->connect(SceneStringName(pressed), callable_mp(this, &GameView::_size_mode_button_pressed).bind(SIZE_MODE_STRETCH));
 
 	embed_options_menu = memnew(MenuButton);
@@ -1023,6 +1066,7 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	embed_options_menu->set_theme_type_variation("FlatMenuButton");
 	embed_options_menu->set_h_size_flags(SIZE_SHRINK_END);
 	embed_options_menu->set_tooltip_text(TTR("Embedding Options"));
+	embed_options_menu->set_accessibility_name(TTRC("Embedding Options"));
 
 	menu = embed_options_menu->get_popup();
 	menu->connect(SceneStringName(id_pressed), callable_mp(this, &GameView::_embed_options_menu_menu_id_pressed));
@@ -1077,6 +1121,8 @@ GameView::GameView(Ref<GameViewDebugger> p_debugger, WindowWrapper *p_wrapper) {
 	p_wrapper->connect("window_size_changed", callable_mp(this, &GameView::_update_floating_window_settings));
 
 	EditorDebuggerNode::get_singleton()->connect("breaked", callable_mp(this, &GameView::_debugger_breaked));
+
+	EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &GameView::_feature_profile_changed));
 }
 
 ///////
@@ -1087,7 +1133,7 @@ void GameViewPlugin::selected_notify() {
 		notify_main_screen_changed(get_plugin_name());
 #else
 		window_wrapper->grab_window_focus();
-#endif
+#endif // ANDROID_ENABLED
 		_focus_another_editor();
 	}
 }
@@ -1108,19 +1154,7 @@ void GameViewPlugin::set_window_layout(Ref<ConfigFile> p_layout) {
 void GameViewPlugin::get_window_layout(Ref<ConfigFile> p_layout) {
 	game_view->get_window_layout(p_layout);
 }
-
-void GameViewPlugin::set_state(const Dictionary &p_state) {
-	game_view->set_state(p_state);
-}
-
-Dictionary GameViewPlugin::get_state() const {
-	return game_view->get_state();
-}
-
-void GameViewPlugin::_window_visibility_changed(bool p_visible) {
-	_focus_another_editor();
-}
-#endif
+#endif // ANDROID_ENABLED
 
 void GameViewPlugin::_notification(int p_what) {
 	switch (p_what) {
@@ -1135,24 +1169,6 @@ void GameViewPlugin::_notification(int p_what) {
 	}
 }
 
-void GameViewPlugin::_feature_profile_changed() {
-	bool is_feature_enabled = true;
-	Ref<EditorFeatureProfile> profile = EditorFeatureProfileManager::get_singleton()->get_current_profile();
-	if (profile.is_valid()) {
-		is_feature_enabled = !profile->is_feature_disabled(EditorFeatureProfile::FEATURE_GAME);
-	}
-
-	if (debugger.is_valid()) {
-		debugger->set_is_feature_enabled(is_feature_enabled);
-	}
-
-#ifndef ANDROID_ENABLED
-	if (game_view) {
-		game_view->set_is_feature_enabled(is_feature_enabled);
-	}
-#endif
-}
-
 void GameViewPlugin::_save_last_editor(const String &p_editor) {
 	if (p_editor != get_plugin_name()) {
 		last_editor = p_editor;
@@ -1174,7 +1190,7 @@ bool GameViewPlugin::_is_window_wrapper_enabled() const {
 	return true;
 #else
 	return window_wrapper->get_window_enabled();
-#endif
+#endif // ANDROID_ENABLED
 }
 
 GameViewPlugin::GameViewPlugin() {
@@ -1193,11 +1209,6 @@ GameViewPlugin::GameViewPlugin() {
 	EditorNode::get_singleton()->get_editor_main_screen()->get_control()->add_child(window_wrapper);
 	window_wrapper->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	window_wrapper->hide();
-	window_wrapper->connect("window_visibility_changed", callable_mp(this, &GameViewPlugin::_window_visibility_changed));
-#endif
-
-	EditorFeatureProfileManager::get_singleton()->connect("current_feature_profile_changed", callable_mp(this, &GameViewPlugin::_feature_profile_changed));
-}
-
-GameViewPlugin::~GameViewPlugin() {
+	window_wrapper->connect("window_visibility_changed", callable_mp(this, &GameViewPlugin::_focus_another_editor).unbind(1));
+#endif // ANDROID_ENABLED
 }
diff --git a/engine/editor/plugins/game_view_plugin.h b/engine/editor/plugins/game_view_plugin.h
index 6e08c269..23f4176c 100644
--- a/engine/editor/plugins/game_view_plugin.h
+++ b/engine/editor/plugins/game_view_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GAME_VIEW_PLUGIN_H
-#define GAME_VIEW_PLUGIN_H
+#pragma once
 
 #include "editor/debugger/editor_debugger_node.h"
 #include "editor/editor_main_screen.h"
@@ -53,17 +52,18 @@ private:
 	int node_type = RuntimeNodeSelect::NODE_TYPE_NONE;
 	bool selection_visible = true;
 	int select_mode = RuntimeNodeSelect::SELECT_MODE_SINGLE;
+	bool mute_audio = false;
 	EditorDebuggerNode::CameraOverride camera_override_mode = EditorDebuggerNode::OVERRIDE_INGAME;
 
 	void _session_started(Ref<EditorDebuggerSession> p_session);
 	void _session_stopped();
 
+	void _feature_profile_changed();
+
 protected:
 	static void _bind_methods();
 
 public:
-	void set_is_feature_enabled(bool p_enabled);
-
 	void set_suspend(bool p_enabled);
 	void next_frame();
 
@@ -72,6 +72,8 @@ public:
 
 	void set_selection_visible(bool p_visible);
 
+	void set_debug_mute_audio(bool p_enabled);
+
 	void set_camera_override(bool p_enabled);
 	void set_camera_manipulate_mode(EditorDebuggerNode::CameraOverride p_mode);
 
@@ -80,7 +82,7 @@ public:
 
 	virtual void setup_session(int p_session_id) override;
 
-	GameViewDebugger() {}
+	GameViewDebugger();
 };
 
 class GameView : public VBoxContainer {
@@ -130,6 +132,8 @@ class GameView : public VBoxContainer {
 	Rect2i floating_window_rect;
 	int floating_window_screen = -1;
 
+	bool debug_mute_audio = false;
+
 	Button *suspend_button = nullptr;
 	Button *next_frame_button = nullptr;
 
@@ -138,6 +142,8 @@ class GameView : public VBoxContainer {
 
 	Button *hide_selection = nullptr;
 
+	Button *debug_mute_audio_button = nullptr;
+
 	Button *camera_override_button = nullptr;
 	MenuButton *camera_override_menu = nullptr;
 
@@ -181,6 +187,8 @@ class GameView : public VBoxContainer {
 
 	void _hide_selection_toggled(bool p_pressed);
 
+	void _debug_mute_audio_button_pressed();
+
 	void _camera_override_button_toggled(bool p_pressed);
 	void _camera_override_menu_id_pressed(int p_id);
 
@@ -192,12 +200,12 @@ class GameView : public VBoxContainer {
 
 	void _debugger_breaked(bool p_breaked, bool p_can_debug);
 
+	void _feature_profile_changed();
+
 protected:
 	void _notification(int p_what);
 
 public:
-	void set_is_feature_enabled(bool p_enabled);
-
 	void set_state(const Dictionary &p_state);
 	Dictionary get_state() const;
 
@@ -213,16 +221,15 @@ class GameViewPlugin : public EditorPlugin {
 #ifndef ANDROID_ENABLED
 	GameView *game_view = nullptr;
 	WindowWrapper *window_wrapper = nullptr;
-#endif
+#endif // ANDROID_ENABLED
 
 	Ref<GameViewDebugger> debugger;
 
 	String last_editor;
 
-	void _feature_profile_changed();
 #ifndef ANDROID_ENABLED
 	void _window_visibility_changed(bool p_visible);
-#endif
+#endif // ANDROID_ENABLED
 	void _save_last_editor(const String &p_editor);
 	void _focus_another_editor();
 	bool _is_window_wrapper_enabled() const;
@@ -231,7 +238,7 @@ protected:
 	void _notification(int p_what);
 
 public:
-	virtual String get_plugin_name() const override { return "Game"; }
+	virtual String get_plugin_name() const override { return TTRC("Game"); }
 	bool has_main_screen() const override { return true; }
 	virtual void edit(Object *p_object) override {}
 	virtual bool handles(Object *p_object) const override { return false; }
@@ -244,13 +251,7 @@ public:
 
 	virtual void set_window_layout(Ref<ConfigFile> p_layout) override;
 	virtual void get_window_layout(Ref<ConfigFile> p_layout) override;
-
-	virtual void set_state(const Dictionary &p_state) override;
-	virtual Dictionary get_state() const override;
-#endif
+#endif // ANDROID_ENABLED
 
 	GameViewPlugin();
-	~GameViewPlugin();
 };
-
-#endif // GAME_VIEW_PLUGIN_H
diff --git a/engine/editor/plugins/gdextension_export_plugin.h b/engine/editor/plugins/gdextension_export_plugin.h
index 9189441c..0792400e 100644
--- a/engine/editor/plugins/gdextension_export_plugin.h
+++ b/engine/editor/plugins/gdextension_export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDEXTENSION_EXPORT_PLUGIN_H
-#define GDEXTENSION_EXPORT_PLUGIN_H
+#pragma once
 
 #include "core/extension/gdextension_library_loader.h"
 #include "editor/export/editor_export.h"
@@ -169,5 +168,3 @@ void GDExtensionExportPlugin::_export_file(const String &p_path, const String &p
 		}
 	}
 }
-
-#endif // GDEXTENSION_EXPORT_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h
index e9c0e29e..77445d0d 100644
--- a/engine/editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/audio_listener_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_LISTENER_3D_GIZMO_PLUGIN_H
-#define AUDIO_LISTENER_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -45,5 +44,3 @@ public:
 
 	AudioListener3DGizmoPlugin();
 };
-
-#endif // AUDIO_LISTENER_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.cpp
index 4a4ff9a2..610ac60f 100644
--- a/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.cpp
@@ -158,26 +158,50 @@ void AudioStreamPlayer3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 			// or a soft distance cap with the Unit Size property (sound never reaches true zero).
 			// When Max Distance is 0.0, `r` represents the distance above which the
 			// sound can't be heard in *most* (but not all) scenarios.
-			float r;
+			float radius = player->get_unit_size() * soft_multiplier;
 			if (player->get_max_distance() > CMP_EPSILON) {
-				r = MIN(player->get_unit_size() * soft_multiplier, player->get_max_distance());
-			} else {
-				r = player->get_unit_size() * soft_multiplier;
+				radius = MIN(radius, player->get_max_distance());
 			}
+
+#define PUSH_QUARTER_XY(m_from_x, m_from_y, m_to_x, m_to_y, m_y)   \
+	points_ptrw[index++] = Vector3(m_from_x, -m_from_y - m_y, 0);  \
+	points_ptrw[index++] = Vector3(m_to_x, -m_to_y - m_y, 0);      \
+	points_ptrw[index++] = Vector3(m_from_x, m_from_y + m_y, 0);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_to_y + m_y, 0);       \
+	points_ptrw[index++] = Vector3(-m_from_x, -m_from_y - m_y, 0); \
+	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y - m_y, 0);     \
+	points_ptrw[index++] = Vector3(-m_from_x, m_from_y + m_y, 0);  \
+	points_ptrw[index++] = Vector3(-m_to_x, m_to_y + m_y, 0);
+
+			// Number of points in an octant. So there will be 8 * points_in_octant points in total.
+			// This corresponds to the smoothness of the circle.
+			const uint32_t points_in_octant = 15;
+			const real_t octant_angle = Math::PI / 4;
+			const real_t inc = (Math::PI / (4 * points_in_octant));
+			const real_t radius_squared = radius * radius;
+			real_t r = 0;
+
 			Vector<Vector3> points_billboard;
+			points_billboard.resize(8 * points_in_octant * 2);
+			Vector3 *points_ptrw = points_billboard.ptrw();
 
-			for (int i = 0; i < 120; i++) {
-				// Create a circle.
-				const float ra = Math::deg_to_rad((float)(i * 3));
-				const float rb = Math::deg_to_rad((float)((i + 1) * 3));
-				const Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * r;
-				const Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * r;
+			uint32_t index = 0;
+			float previous_x = radius;
+			float previous_y = 0.f;
 
-				// Draw a billboarded circle.
-				points_billboard.push_back(Vector3(a.x, a.y, 0));
-				points_billboard.push_back(Vector3(b.x, b.y, 0));
+			for (uint32_t i = 0; i < points_in_octant; i++) {
+				r += inc;
+				real_t x = Math::cos((i == points_in_octant - 1) ? octant_angle : r) * radius;
+				real_t y = Math::sqrt(radius_squared - (x * x));
+
+				PUSH_QUARTER_XY(previous_x, previous_y, x, y, 0);
+				PUSH_QUARTER_XY(previous_y, previous_x, y, x, 0);
+				previous_x = x;
+				previous_y = y;
 			}
 
+#undef PUSH_QUARTER_XY
+
 			Color color;
 			switch (player->get_attenuation_model()) {
 				// Pick cold colors for all attenuation models (except Disabled),
@@ -210,44 +234,76 @@ void AudioStreamPlayer3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		}
 
 		if (player->is_emission_angle_enabled()) {
-			const float pc = player->get_emission_angle();
-			const float ofs = -Math::cos(Math::deg_to_rad(pc));
-			const float radius = Math::sin(Math::deg_to_rad(pc));
+			const float ha = Math::deg_to_rad(player->get_emission_angle());
+			const float ofs = -Math::cos(ha);
+			const float radius = Math::sin(ha);
+
+			const uint32_t points_in_octant = 7;
+			const real_t octant_angle = Math::PI / 4;
+			const real_t inc = (Math::PI / (4 * points_in_octant));
+			const real_t radius_squared = radius * radius;
+			real_t r = 0;
 
 			Vector<Vector3> points_primary;
-			points_primary.resize(200);
+			points_primary.resize(8 * points_in_octant * 2);
+			Vector3 *points_ptrw = points_primary.ptrw();
 
-			real_t step = Math_TAU / 100.0;
-			for (int i = 0; i < 100; i++) {
-				const float a = i * step;
-				const float an = (i + 1) * step;
+			uint32_t index = 0;
+			float previous_x = radius;
+			float previous_y = 0.f;
+#define PUSH_QUARTER(m_from_x, m_from_y, m_to_x, m_to_y, m_y)  \
+	points_ptrw[index++] = Vector3(m_from_x, -m_from_y, m_y);  \
+	points_ptrw[index++] = Vector3(m_to_x, -m_to_y, m_y);      \
+	points_ptrw[index++] = Vector3(m_from_x, m_from_y, m_y);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_to_y, m_y);       \
+	points_ptrw[index++] = Vector3(-m_from_x, -m_from_y, m_y); \
+	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y, m_y);     \
+	points_ptrw[index++] = Vector3(-m_from_x, m_from_y, m_y);  \
+	points_ptrw[index++] = Vector3(-m_to_x, m_to_y, m_y);
 
-				const Vector3 from(Math::sin(a) * radius, Math::cos(a) * radius, ofs);
-				const Vector3 to(Math::sin(an) * radius, Math::cos(an) * radius, ofs);
+			for (uint32_t i = 0; i < points_in_octant; i++) {
+				r += inc;
+				real_t x = Math::cos((i == points_in_octant - 1) ? octant_angle : r) * radius;
+				real_t y = Math::sqrt(radius_squared - (x * x));
 
-				points_primary.write[i * 2 + 0] = from;
-				points_primary.write[i * 2 + 1] = to;
+				PUSH_QUARTER(previous_x, previous_y, x, y, ofs);
+				PUSH_QUARTER(previous_y, previous_x, y, x, ofs);
+
+				previous_x = x;
+				previous_y = y;
 			}
+#undef PUSH_QUARTER
 
 			const Ref<Material> material_primary = get_material("stream_player_3d_material_primary", p_gizmo);
 			p_gizmo->add_lines(points_primary, material_primary);
 
 			Vector<Vector3> points_secondary;
 			points_secondary.resize(16);
-
-			for (int i = 0; i < 8; i++) {
-				const float a = i * (Math_TAU / 8.0);
-				const Vector3 from(Math::sin(a) * radius, Math::cos(a) * radius, ofs);
-
-				points_secondary.write[i * 2 + 0] = from;
-				points_secondary.write[i * 2 + 1] = Vector3();
-			}
+			Vector3 *points_second_ptrw = points_secondary.ptrw();
+			uint32_t index2 = 0;
+			// Lines to the circle.
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(radius, 0, ofs);
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(-radius, 0, ofs);
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(0, radius, ofs);
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(0, -radius, ofs);
+			real_t octant_value = Math::cos(octant_angle) * radius;
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(octant_value, octant_value, ofs);
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(-octant_value, octant_value, ofs);
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(-octant_value, -octant_value, ofs);
+			points_second_ptrw[index2++] = Vector3();
+			points_second_ptrw[index2++] = Vector3(octant_value, -octant_value, ofs);
 
 			const Ref<Material> material_secondary = get_material("stream_player_3d_material_secondary", p_gizmo);
 			p_gizmo->add_lines(points_secondary, material_secondary);
 
 			Vector<Vector3> handles;
-			const float ha = Math::deg_to_rad(player->get_emission_angle());
 			handles.push_back(Vector3(Math::sin(ha), 0, -Math::cos(ha)));
 			p_gizmo->add_handles(handles, get_material("handles"));
 		}
diff --git a/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h
index c818886b..9cbaef14 100644
--- a/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/audio_stream_player_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_PLAYER_3D_GIZMO_PLUGIN_H
-#define AUDIO_STREAM_PLAYER_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -49,5 +48,3 @@ public:
 
 	AudioStreamPlayer3DGizmoPlugin();
 };
-
-#endif // AUDIO_STREAM_PLAYER_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp
index 257db674..f8a83322 100644
--- a/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.cpp
@@ -180,7 +180,13 @@ void Camera3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 			const float hsize = Math::sin(Math::deg_to_rad(fov));
 			const float depth = -Math::cos(Math::deg_to_rad(fov));
-			Vector3 side = Vector3(hsize * size_factor.x, 0, depth);
+
+			Vector3 side;
+			if (camera->get_keep_aspect_mode() == Camera3D::KEEP_WIDTH) {
+				side = Vector3(hsize * size_factor.x, 0, depth * size_factor.x);
+			} else {
+				side = Vector3(hsize * size_factor.x, 0, depth * size_factor.y);
+			}
 			Vector3 nside = Vector3(-side.x, side.y, side.z);
 			Vector3 up = Vector3(0, hsize * size_factor.y, 0);
 
@@ -204,7 +210,6 @@ void Camera3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 			Vector3 right, up;
 			Vector3 back(0, 0, -1.0);
-			Vector3 front(0, 0, 0);
 
 			if (aspect == Camera3D::KeepAspect::KEEP_WIDTH) {
 				right = Vector3(keep_size, 0, 0);
@@ -266,8 +271,8 @@ float Camera3DGizmoPlugin::_find_closest_angle_to_half_pi_arc(const Vector3 &p_f
 	Vector3 min_p;
 
 	for (int i = 0; i < arc_test_points; i++) {
-		float a = i * Math_PI * 0.5 / arc_test_points;
-		float an = (i + 1) * Math_PI * 0.5 / arc_test_points;
+		float a = i * Math::PI * 0.5 / arc_test_points;
+		float an = (i + 1) * Math::PI * 0.5 / arc_test_points;
 		Vector3 p = Vector3(Math::cos(a), 0, -Math::sin(a)) * p_arc_radius;
 		Vector3 n = Vector3(Math::cos(an), 0, -Math::sin(an)) * p_arc_radius;
 
@@ -282,6 +287,6 @@ float Camera3DGizmoPlugin::_find_closest_angle_to_half_pi_arc(const Vector3 &p_f
 	}
 
 	//min_p = p_arc_xform.affine_inverse().xform(min_p);
-	float a = (Math_PI * 0.5) - Vector2(min_p.x, -min_p.z).angle();
+	float a = (Math::PI * 0.5) - Vector2(min_p.x, -min_p.z).angle();
 	return Math::rad_to_deg(a);
 }
diff --git a/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.h
index 94238704..26156f29 100644
--- a/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/camera_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_3D_GIZMO_PLUGIN_H
-#define CAMERA_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -52,5 +51,3 @@ public:
 
 	Camera3DGizmoPlugin();
 };
-
-#endif // CAMERA_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h
index 759b8c3f..69fa12a6 100644
--- a/engine/editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/collision_object_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_OBJECT_3D_GIZMO_PLUGIN_H
-#define COLLISION_OBJECT_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	CollisionObject3DGizmoPlugin();
 };
-
-#endif // COLLISION_OBJECT_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h
index 6c78a862..7d6edcd9 100644
--- a/engine/editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/collision_polygon_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_POLYGON_3D_GIZMO_PLUGIN_H
-#define COLLISION_POLYGON_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -45,5 +44,3 @@ public:
 	void redraw(EditorNode3DGizmo *p_gizmo) override;
 	CollisionPolygon3DGizmoPlugin();
 };
-
-#endif // COLLISION_POLYGON_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp
index db9a9bef..957979bc 100644
--- a/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.cpp
@@ -58,9 +58,6 @@ CollisionShape3DGizmoPlugin::CollisionShape3DGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-CollisionShape3DGizmoPlugin::~CollisionShape3DGizmoPlugin() {
-}
-
 void CollisionShape3DGizmoPlugin::create_collision_material(const String &p_name, float p_alpha) {
 	Vector<Ref<StandardMaterial3D>> mats;
 
@@ -118,7 +115,7 @@ String CollisionShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_g
 	}
 
 	if (Object::cast_to<CapsuleShape3D>(*s)) {
-		return p_id == 0 ? "Radius" : "Height";
+		return helper->capsule_get_handle_name(p_id);
 	}
 
 	if (Object::cast_to<CylinderShape3D>(*s)) {
@@ -157,7 +154,7 @@ Variant CollisionShape3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p
 
 	if (Object::cast_to<CylinderShape3D>(*s)) {
 		Ref<CylinderShape3D> cs2 = s;
-		return p_id == 0 ? cs2->get_radius() : cs2->get_height();
+		return Vector2(cs2->get_radius(), cs2->get_height());
 	}
 
 	if (Object::cast_to<SeparationRayShape3D>(*s)) {
@@ -225,26 +222,15 @@ void CollisionShape3DGizmoPlugin::set_handle(const EditorNode3DGizmo *p_gizmo, i
 	}
 
 	if (Object::cast_to<CapsuleShape3D>(*s)) {
-		Vector3 axis;
-		axis[p_id == 0 ? 0 : 1] = 1.0;
 		Ref<CapsuleShape3D> cs2 = s;
-		Vector3 ra, rb;
-		Geometry3D::get_closest_points_between_segments(Vector3(), axis * 4096, sg[0], sg[1], ra, rb);
-		float d = axis.dot(ra);
 
-		if (Node3DEditor::get_singleton()->is_snap_enabled()) {
-			d = Math::snapped(d, Node3DEditor::get_singleton()->get_translate_snap());
-		}
-
-		if (d < 0.001) {
-			d = 0.001;
-		}
-
-		if (p_id == 0) {
-			cs2->set_radius(d);
-		} else if (p_id == 1) {
-			cs2->set_height(d * 2.0);
-		}
+		real_t height = cs2->get_height();
+		real_t radius = cs2->get_radius();
+		Vector3 position;
+		helper->capsule_set_handle(sg, p_id, height, radius, position);
+		cs2->set_height(height);
+		cs2->set_radius(radius);
+		cs->set_global_position(position);
 	}
 
 	if (Object::cast_to<CylinderShape3D>(*s)) {
@@ -288,26 +274,7 @@ void CollisionShape3DGizmoPlugin::commit_handle(const EditorNode3DGizmo *p_gizmo
 
 	if (Object::cast_to<CapsuleShape3D>(*s)) {
 		Ref<CapsuleShape3D> ss = s;
-		Vector2 values = p_restore;
-
-		if (p_cancel) {
-			ss->set_radius(values[0]);
-			ss->set_height(values[1]);
-			return;
-		}
-
-		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
-		if (p_id == 0) {
-			ur->create_action(TTR("Change Capsule Shape Radius"));
-			ur->add_do_method(ss.ptr(), "set_radius", ss->get_radius());
-		} else {
-			ur->create_action(TTR("Change Capsule Shape Height"));
-			ur->add_do_method(ss.ptr(), "set_height", ss->get_height());
-		}
-		ur->add_undo_method(ss.ptr(), "set_radius", values[0]);
-		ur->add_undo_method(ss.ptr(), "set_height", values[1]);
-
-		ur->commit_action();
+		helper->cylinder_commit_handle(p_id, TTR("Change Capsule Shape Radius"), TTR("Change Capsule Shape Height"), p_cancel, cs, *ss, *ss);
 	}
 
 	if (Object::cast_to<CylinderShape3D>(*s)) {
@@ -357,42 +324,77 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 	if (Object::cast_to<SphereShape3D>(*s)) {
 		Ref<SphereShape3D> sp = s;
-		float r = sp->get_radius();
+		float radius = sp->get_radius();
+
+#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y)      \
+	points_ptrw[index++] = Vector3(from_x, y, from_y);   \
+	points_ptrw[index++] = Vector3(to_x, y, to_y);       \
+	points_ptrw[index++] = Vector3(from_x, y, -from_y);  \
+	points_ptrw[index++] = Vector3(to_x, y, -to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, from_y);  \
+	points_ptrw[index++] = Vector3(-to_x, y, to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, -from_y); \
+	points_ptrw[index++] = Vector3(-to_x, y, -to_y);
+
+#define PUSH_QUARTER_XY(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(from_x, -from_y - y, 0);  \
+	points_ptrw[index++] = Vector3(to_x, -to_y - y, 0);      \
+	points_ptrw[index++] = Vector3(from_x, from_y + y, 0);   \
+	points_ptrw[index++] = Vector3(to_x, to_y + y, 0);       \
+	points_ptrw[index++] = Vector3(-from_x, -from_y - y, 0); \
+	points_ptrw[index++] = Vector3(-to_x, -to_y - y, 0);     \
+	points_ptrw[index++] = Vector3(-from_x, from_y + y, 0);  \
+	points_ptrw[index++] = Vector3(-to_x, to_y + y, 0);
+
+#define PUSH_QUARTER_YZ(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(0, -from_y - y, from_x);  \
+	points_ptrw[index++] = Vector3(0, -to_y - y, to_x);      \
+	points_ptrw[index++] = Vector3(0, from_y + y, from_x);   \
+	points_ptrw[index++] = Vector3(0, to_y + y, to_x);       \
+	points_ptrw[index++] = Vector3(0, -from_y - y, -from_x); \
+	points_ptrw[index++] = Vector3(0, -to_y - y, -to_x);     \
+	points_ptrw[index++] = Vector3(0, from_y + y, -from_x);  \
+	points_ptrw[index++] = Vector3(0, to_y + y, -to_x);
+
+		// Number of points in an octant. So there will be 8 * points_in_octant * 2 points in total for one circle.
+		// This Corresponds to the smoothness of the circle.
+		const uint32_t points_in_octant = 16;
+		const real_t inc = (Math::PI / (4 * points_in_octant));
+		const real_t radius_squared = radius * radius;
+		real_t r = 0;
 
 		Vector<Vector3> points;
+		uint32_t index = 0;
+		// 3 full circles.
+		points.resize(3 * 8 * points_in_octant * 2);
+		Vector3 *points_ptrw = points.ptrw();
 
-		for (int i = 0; i <= 360; i++) {
-			float ra = Math::deg_to_rad((float)i);
-			float rb = Math::deg_to_rad((float)i + 1);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * r;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * r;
+		float previous_x = radius;
+		float previous_y = 0.f;
 
-			points.push_back(Vector3(a.x, 0, a.y));
-			points.push_back(Vector3(b.x, 0, b.y));
-			points.push_back(Vector3(0, a.x, a.y));
-			points.push_back(Vector3(0, b.x, b.y));
-			points.push_back(Vector3(a.x, a.y, 0));
-			points.push_back(Vector3(b.x, b.y, 0));
-		}
-
-		Vector<Vector3> collision_segments;
-
-		for (int i = 0; i < 64; i++) {
-			float ra = i * (Math_TAU / 64.0);
-			float rb = (i + 1) * (Math_TAU / 64.0);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * r;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * r;
-
-			collision_segments.push_back(Vector3(a.x, 0, a.y));
-			collision_segments.push_back(Vector3(b.x, 0, b.y));
-			collision_segments.push_back(Vector3(0, a.x, a.y));
-			collision_segments.push_back(Vector3(0, b.x, b.y));
-			collision_segments.push_back(Vector3(a.x, a.y, 0));
-			collision_segments.push_back(Vector3(b.x, b.y, 0));
+		for (uint32_t i = 0; i < points_in_octant; ++i) {
+			r += inc;
+			real_t x = Math::cos(r) * radius;
+			real_t y = Math::sqrt(radius_squared - (x * x));
+
+			PUSH_QUARTER(previous_x, previous_y, x, y, 0);
+			PUSH_QUARTER(previous_y, previous_x, y, x, 0);
+
+			PUSH_QUARTER_XY(previous_x, previous_y, x, y, 0);
+			PUSH_QUARTER_XY(previous_y, previous_x, y, x, 0);
+
+			PUSH_QUARTER_YZ(previous_x, previous_y, x, y, 0);
+			PUSH_QUARTER_YZ(previous_y, previous_x, y, x, 0)
+
+			previous_x = x;
+			previous_y = y;
 		}
+#undef PUSH_QUARTER
+#undef PUSH_QUARTER_XY
+#undef PUSH_QUARTER_YZ
 
 		p_gizmo->add_lines(points, material, false, collision_color);
-		p_gizmo->add_collision_segments(collision_segments);
+		p_gizmo->add_collision_segments(points);
 		Vector<Vector3> handles;
 		handles.push_back(Vector3(r, 0, 0));
 		p_gizmo->add_handles(handles, handles_material);
@@ -424,69 +426,98 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		float radius = cs2->get_radius();
 		float height = cs2->get_height();
 
+		// Number of points in an octant. So there will be 8 * points_in_octant points in total.
+		// This corresponds to the smoothness of the circle.
+		const uint32_t points_in_octant = 16;
+		const real_t octant_angle = Math::PI / 4;
+		const real_t inc = (Math::PI / (4 * points_in_octant));
+		const real_t radius_squared = radius * radius;
+		real_t r = 0;
+
 		Vector<Vector3> points;
+		// 4 vertical lines and 4 full circles.
+		points.resize(4 * 2 + 4 * 8 * points_in_octant * 2);
+		Vector3 *points_ptrw = points.ptrw();
 
-		Vector3 d(0, height * 0.5 - radius, 0);
-		for (int i = 0; i < 360; i++) {
-			float ra = Math::deg_to_rad((float)i);
-			float rb = Math::deg_to_rad((float)i + 1);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
+		uint32_t index = 0;
+		float y_value = height * 0.5 - radius;
 
-			points.push_back(Vector3(a.x, 0, a.y) + d);
-			points.push_back(Vector3(b.x, 0, b.y) + d);
+		// Vertical Lines.
+		points_ptrw[index++] = Vector3(0.f, y_value, radius);
+		points_ptrw[index++] = Vector3(0.f, -y_value, radius);
+		points_ptrw[index++] = Vector3(0.f, y_value, -radius);
+		points_ptrw[index++] = Vector3(0.f, -y_value, -radius);
+		points_ptrw[index++] = Vector3(radius, y_value, 0.f);
+		points_ptrw[index++] = Vector3(radius, -y_value, 0.f);
+		points_ptrw[index++] = Vector3(-radius, y_value, 0.f);
+		points_ptrw[index++] = Vector3(-radius, -y_value, 0.f);
 
-			points.push_back(Vector3(a.x, 0, a.y) - d);
-			points.push_back(Vector3(b.x, 0, b.y) - d);
+#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y)      \
+	points_ptrw[index++] = Vector3(from_x, y, from_y);   \
+	points_ptrw[index++] = Vector3(to_x, y, to_y);       \
+	points_ptrw[index++] = Vector3(from_x, y, -from_y);  \
+	points_ptrw[index++] = Vector3(to_x, y, -to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, from_y);  \
+	points_ptrw[index++] = Vector3(-to_x, y, to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, -from_y); \
+	points_ptrw[index++] = Vector3(-to_x, y, -to_y);
 
-			if (i % 90 == 0) {
-				points.push_back(Vector3(a.x, 0, a.y) + d);
-				points.push_back(Vector3(a.x, 0, a.y) - d);
-			}
+#define PUSH_QUARTER_XY(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(from_x, -from_y - y, 0);  \
+	points_ptrw[index++] = Vector3(to_x, -to_y - y, 0);      \
+	points_ptrw[index++] = Vector3(from_x, from_y + y, 0);   \
+	points_ptrw[index++] = Vector3(to_x, to_y + y, 0);       \
+	points_ptrw[index++] = Vector3(-from_x, -from_y - y, 0); \
+	points_ptrw[index++] = Vector3(-to_x, -to_y - y, 0);     \
+	points_ptrw[index++] = Vector3(-from_x, from_y + y, 0);  \
+	points_ptrw[index++] = Vector3(-to_x, to_y + y, 0);
 
-			Vector3 dud = i < 180 ? d : -d;
+#define PUSH_QUARTER_YZ(from_x, from_y, to_x, to_y, y)       \
+	points_ptrw[index++] = Vector3(0, -from_y - y, from_x);  \
+	points_ptrw[index++] = Vector3(0, -to_y - y, to_x);      \
+	points_ptrw[index++] = Vector3(0, from_y + y, from_x);   \
+	points_ptrw[index++] = Vector3(0, to_y + y, to_x);       \
+	points_ptrw[index++] = Vector3(0, -from_y - y, -from_x); \
+	points_ptrw[index++] = Vector3(0, -to_y - y, -to_x);     \
+	points_ptrw[index++] = Vector3(0, from_y + y, -from_x);  \
+	points_ptrw[index++] = Vector3(0, to_y + y, -to_x);
 
-			points.push_back(Vector3(0, a.x, a.y) + dud);
-			points.push_back(Vector3(0, b.x, b.y) + dud);
-			points.push_back(Vector3(a.y, a.x, 0) + dud);
-			points.push_back(Vector3(b.y, b.x, 0) + dud);
+		float previous_x = radius;
+		float previous_y = 0.f;
+
+		for (uint32_t i = 0; i < points_in_octant; ++i) {
+			r += inc;
+			real_t x = Math::cos((i == points_in_octant - 1) ? octant_angle : r) * radius;
+			real_t y = Math::sqrt(radius_squared - (x * x));
+
+			// High circle ring.
+			PUSH_QUARTER(previous_x, previous_y, x, y, y_value);
+			PUSH_QUARTER(previous_y, previous_x, y, x, y_value);
+
+			// Low circle ring.
+			PUSH_QUARTER(previous_x, previous_y, x, y, -y_value);
+			PUSH_QUARTER(previous_y, previous_x, y, x, -y_value);
+
+			// Up and Low circle in X-Y plane.
+			PUSH_QUARTER_XY(previous_x, previous_y, x, y, y_value);
+			PUSH_QUARTER_XY(previous_y, previous_x, y, x, y_value);
+
+			// Up and Low circle in Y-Z plane.
+			PUSH_QUARTER_YZ(previous_x, previous_y, x, y, y_value);
+			PUSH_QUARTER_YZ(previous_y, previous_x, y, x, y_value)
+
+			previous_x = x;
+			previous_y = y;
 		}
 
+#undef PUSH_QUARTER
+#undef PUSH_QUARTER_XY
+#undef PUSH_QUARTER_YZ
+
 		p_gizmo->add_lines(points, material, false, collision_color);
+		p_gizmo->add_collision_segments(points);
 
-		Vector<Vector3> collision_segments;
-
-		for (int i = 0; i < 64; i++) {
-			float ra = i * (Math_TAU / 64.0);
-			float rb = (i + 1) * (Math_TAU / 64.0);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
-
-			collision_segments.push_back(Vector3(a.x, 0, a.y) + d);
-			collision_segments.push_back(Vector3(b.x, 0, b.y) + d);
-
-			collision_segments.push_back(Vector3(a.x, 0, a.y) - d);
-			collision_segments.push_back(Vector3(b.x, 0, b.y) - d);
-
-			if (i % 16 == 0) {
-				collision_segments.push_back(Vector3(a.x, 0, a.y) + d);
-				collision_segments.push_back(Vector3(a.x, 0, a.y) - d);
-			}
-
-			Vector3 dud = i < 32 ? d : -d;
-
-			collision_segments.push_back(Vector3(0, a.x, a.y) + dud);
-			collision_segments.push_back(Vector3(0, b.x, b.y) + dud);
-			collision_segments.push_back(Vector3(a.y, a.x, 0) + dud);
-			collision_segments.push_back(Vector3(b.y, b.x, 0) + dud);
-		}
-
-		p_gizmo->add_collision_segments(collision_segments);
-
-		Vector<Vector3> handles = {
-			Vector3(cs2->get_radius(), 0, 0),
-			Vector3(0, cs2->get_height() * 0.5, 0)
-		};
+		Vector<Vector3> handles = helper->capsule_get_handles(cs2->get_height(), cs2->get_radius());
 		p_gizmo->add_handles(handles, handles_material);
 	}
 
@@ -495,50 +526,63 @@ void CollisionShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		float radius = cs2->get_radius();
 		float height = cs2->get_height();
 
+#define PUSH_QUARTER(from_x, from_y, to_x, to_y, y)      \
+	points_ptrw[index++] = Vector3(from_x, y, from_y);   \
+	points_ptrw[index++] = Vector3(to_x, y, to_y);       \
+	points_ptrw[index++] = Vector3(from_x, y, -from_y);  \
+	points_ptrw[index++] = Vector3(to_x, y, -to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, from_y);  \
+	points_ptrw[index++] = Vector3(-to_x, y, to_y);      \
+	points_ptrw[index++] = Vector3(-from_x, y, -from_y); \
+	points_ptrw[index++] = Vector3(-to_x, y, -to_y);
+
+		// Number of points in an octant. So there will be 8 * points_in_octant * 2 points in total for one circle.
+		// This corresponds to the smoothness of the circle.
+		const uint32_t points_in_octant = 16;
+		const real_t inc = (Math::PI / (4 * points_in_octant));
+		const real_t radius_squared = radius * radius;
+		real_t r = 0;
+
 		Vector<Vector3> points;
+		uint32_t index = 0;
+		// 4 vertical lines and 2 full circles.
+		points.resize(4 * 2 + 2 * 8 * points_in_octant * 2);
+		Vector3 *points_ptrw = points.ptrw();
+		float y_value = height * 0.5;
 
-		Vector3 d(0, height * 0.5, 0);
-		for (int i = 0; i < 360; i++) {
-			float ra = Math::deg_to_rad((float)i);
-			float rb = Math::deg_to_rad((float)i + 1);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
+		// Vertical lines.
+		points_ptrw[index++] = Vector3(0.f, y_value, radius);
+		points_ptrw[index++] = Vector3(0.f, -y_value, radius);
+		points_ptrw[index++] = Vector3(0.f, y_value, -radius);
+		points_ptrw[index++] = Vector3(0.f, -y_value, -radius);
+		points_ptrw[index++] = Vector3(radius, y_value, 0.f);
+		points_ptrw[index++] = Vector3(radius, -y_value, 0.f);
+		points_ptrw[index++] = Vector3(-radius, y_value, 0.f);
+		points_ptrw[index++] = Vector3(-radius, -y_value, 0.f);
 
-			points.push_back(Vector3(a.x, 0, a.y) + d);
-			points.push_back(Vector3(b.x, 0, b.y) + d);
+		float previous_x = radius;
+		float previous_y = 0.f;
 
-			points.push_back(Vector3(a.x, 0, a.y) - d);
-			points.push_back(Vector3(b.x, 0, b.y) - d);
+		for (uint32_t i = 0; i < points_in_octant; ++i) {
+			r += inc;
+			real_t x = Math::cos(r) * radius;
+			real_t y = Math::sqrt(radius_squared - (x * x));
 
-			if (i % 90 == 0) {
-				points.push_back(Vector3(a.x, 0, a.y) + d);
-				points.push_back(Vector3(a.x, 0, a.y) - d);
-			}
+			// High circle ring.
+			PUSH_QUARTER(previous_x, previous_y, x, y, y_value);
+			PUSH_QUARTER(previous_y, previous_x, y, x, y_value);
+
+			// Low circle ring.
+			PUSH_QUARTER(previous_x, previous_y, x, y, -y_value);
+			PUSH_QUARTER(previous_y, previous_x, y, x, -y_value);
+
+			previous_x = x;
+			previous_y = y;
 		}
+#undef PUSH_QUARTER
 
 		p_gizmo->add_lines(points, material, false, collision_color);
-
-		Vector<Vector3> collision_segments;
-
-		for (int i = 0; i < 64; i++) {
-			float ra = i * (Math_TAU / 64.0);
-			float rb = (i + 1) * (Math_TAU / 64.0);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * radius;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * radius;
-
-			collision_segments.push_back(Vector3(a.x, 0, a.y) + d);
-			collision_segments.push_back(Vector3(b.x, 0, b.y) + d);
-
-			collision_segments.push_back(Vector3(a.x, 0, a.y) - d);
-			collision_segments.push_back(Vector3(b.x, 0, b.y) - d);
-
-			if (i % 16 == 0) {
-				collision_segments.push_back(Vector3(a.x, 0, a.y) + d);
-				collision_segments.push_back(Vector3(a.x, 0, a.y) - d);
-			}
-		}
-
-		p_gizmo->add_collision_segments(collision_segments);
+		p_gizmo->add_collision_segments(points);
 
 		Vector<Vector3> handles = helper->cylinder_get_handles(cs2->get_height(), cs2->get_radius());
 		p_gizmo->add_handles(handles, handles_material);
diff --git a/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h
index 09590fba..2f19f0b7 100644
--- a/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/collision_shape_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_SHAPE_3D_GIZMO_PLUGIN_H
-#define COLLISION_SHAPE_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -55,7 +54,4 @@ public:
 	void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel = false) override;
 
 	CollisionShape3DGizmoPlugin();
-	~CollisionShape3DGizmoPlugin();
 };
-
-#endif // COLLISION_SHAPE_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h
index 5765d613..19dc4965 100644
--- a/engine/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/cpu_particles_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CPU_PARTICLES_3D_GIZMO_PLUGIN_H
-#define CPU_PARTICLES_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 	void redraw(EditorNode3DGizmo *p_gizmo) override;
 	CPUParticles3DGizmoPlugin();
 };
-
-#endif // CPU_PARTICLES_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/decal_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/decal_gizmo_plugin.cpp
index 4caa5073..6d6b5648 100644
--- a/engine/editor/plugins/gizmos/decal_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/decal_gizmo_plugin.cpp
@@ -47,9 +47,6 @@ DecalGizmoPlugin::DecalGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-DecalGizmoPlugin::~DecalGizmoPlugin() {
-}
-
 bool DecalGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<Decal>(p_spatial) != nullptr;
 }
diff --git a/engine/editor/plugins/gizmos/decal_gizmo_plugin.h b/engine/editor/plugins/gizmos/decal_gizmo_plugin.h
index c7809dc5..448b5c2e 100644
--- a/engine/editor/plugins/gizmos/decal_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/decal_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DECAL_GIZMO_PLUGIN_H
-#define DECAL_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -53,7 +52,4 @@ public:
 	void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel = false) override;
 
 	DecalGizmoPlugin();
-	~DecalGizmoPlugin();
 };
-
-#endif // DECAL_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp
index e562e6d5..a9572e9b 100644
--- a/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.cpp
@@ -48,9 +48,6 @@ FogVolumeGizmoPlugin::FogVolumeGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-FogVolumeGizmoPlugin::~FogVolumeGizmoPlugin() {
-}
-
 bool FogVolumeGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return (Object::cast_to<FogVolume>(p_spatial) != nullptr);
 }
diff --git a/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.h b/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.h
index dd84075c..998bda13 100644
--- a/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/fog_volume_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FOG_VOLUME_GIZMO_PLUGIN_H
-#define FOG_VOLUME_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -53,7 +52,4 @@ public:
 	void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel = false) override;
 
 	FogVolumeGizmoPlugin();
-	~FogVolumeGizmoPlugin();
 };
-
-#endif // FOG_VOLUME_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp
index 54bbef09..c12b14f6 100644
--- a/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.cpp
@@ -33,9 +33,6 @@
 #include "editor/editor_settings.h"
 #include "scene/3d/visual_instance_3d.h"
 
-GeometryInstance3DGizmoPlugin::GeometryInstance3DGizmoPlugin() {
-}
-
 bool GeometryInstance3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<GeometryInstance3D>(p_spatial) != nullptr;
 }
diff --git a/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h
index 2482e277..f9b7524f 100644
--- a/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/geometry_instance_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GEOMETRY_INSTANCE_3D_GIZMO_PLUGIN_H
-#define GEOMETRY_INSTANCE_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -42,8 +41,4 @@ public:
 	virtual int get_priority() const override;
 
 	virtual void redraw(EditorNode3DGizmo *p_gizmo) override;
-
-	GeometryInstance3DGizmoPlugin();
 };
-
-#endif // GEOMETRY_INSTANCE_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/gizmo_3d_helper.cpp b/engine/editor/plugins/gizmos/gizmo_3d_helper.cpp
index ff1b67aa..220ddea2 100644
--- a/engine/editor/plugins/gizmos/gizmo_3d_helper.cpp
+++ b/engine/editor/plugins/gizmos/gizmo_3d_helper.cpp
@@ -156,7 +156,10 @@ String Gizmo3DHelper::cylinder_get_handle_name(int p_id) const {
 	}
 }
 
-void Gizmo3DHelper::cylinder_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position) {
+void Gizmo3DHelper::_cylinder_or_capsule_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position, bool p_is_capsule) {
+	real_t initial_radius = initial_value.operator Vector2().x;
+	real_t initial_height = initial_value.operator Vector2().y;
+
 	int sign = p_id == 2 ? -1 : 1;
 	int axis = p_id == 0 ? 0 : 1;
 
@@ -178,9 +181,13 @@ void Gizmo3DHelper::cylinder_set_handle(const Vector3 p_segment[2], int p_id, re
 		}
 		r_radius = d;
 		r_cylinder_position = initial_transform.get_origin();
-	} else if (p_id == 1 || p_id == 2) {
-		real_t initial_height = initial_value;
 
+		if (p_is_capsule) {
+			r_height = MAX(initial_height, r_radius * 2.0);
+		} else {
+			r_height = initial_height;
+		}
+	} else if (p_id == 1 || p_id == 2) {
 		// Adjust height.
 		if (Input::get_singleton()->is_key_pressed(Key::ALT)) {
 			r_height = d * 2.0;
@@ -200,6 +207,12 @@ void Gizmo3DHelper::cylinder_set_handle(const Vector3 p_segment[2], int p_id, re
 			offset[axis] = (r_height - initial_height) * 0.5 * sign;
 			r_cylinder_position = initial_transform.xform(offset);
 		}
+
+		if (p_is_capsule) {
+			r_radius = MIN(initial_radius, r_height / 2.0);
+		} else {
+			r_radius = initial_radius;
+		}
 	}
 }
 
@@ -212,25 +225,19 @@ void Gizmo3DHelper::cylinder_commit_handle(int p_id, const String &p_radius_acti
 	}
 
 	if (p_cancel) {
-		if (p_id == 0) {
-			p_radius_object->set(p_radius_property, initial_value);
-		} else {
-			p_height_object->set(p_height_property, initial_value);
-		}
+		p_radius_object->set(p_radius_property, initial_value.operator Vector2().x);
+		p_height_object->set(p_height_property, initial_value.operator Vector2().y);
 		p_position_object->set(p_position_property, initial_transform.get_origin());
 		return;
 	}
 
 	EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 	ur->create_action(p_id == 0 ? p_radius_action_name : p_height_action_name);
-	if (p_id == 0) {
-		ur->add_do_property(p_radius_object, p_radius_property, p_radius_object->get(p_radius_property));
-		ur->add_undo_property(p_radius_object, p_radius_property, initial_value);
-	} else {
-		ur->add_do_property(p_height_object, p_height_property, p_height_object->get(p_height_property));
-		ur->add_do_property(p_position_object, p_position_property, p_position_object->get(p_position_property));
-		ur->add_undo_property(p_height_object, p_height_property, initial_value);
-		ur->add_undo_property(p_position_object, p_position_property, initial_transform.get_origin());
-	}
+	ur->add_do_property(p_radius_object, p_radius_property, p_radius_object->get(p_radius_property));
+	ur->add_undo_property(p_radius_object, p_radius_property, initial_value.operator Vector2().x);
+	ur->add_do_property(p_height_object, p_height_property, p_height_object->get(p_height_property));
+	ur->add_undo_property(p_height_object, p_height_property, initial_value.operator Vector2().y);
+	ur->add_do_property(p_position_object, p_position_property, p_position_object->get(p_position_property));
+	ur->add_undo_property(p_position_object, p_position_property, initial_transform.get_origin());
 	ur->commit_action();
 }
diff --git a/engine/editor/plugins/gizmos/gizmo_3d_helper.h b/engine/editor/plugins/gizmos/gizmo_3d_helper.h
index 6d27e547..21d3747d 100644
--- a/engine/editor/plugins/gizmos/gizmo_3d_helper.h
+++ b/engine/editor/plugins/gizmos/gizmo_3d_helper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GIZMO_3D_HELPER_H
-#define GIZMO_3D_HELPER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -42,19 +41,44 @@ class Gizmo3DHelper : public RefCounted {
 	Variant initial_value;
 	Transform3D initial_transform;
 
+private:
+	void _cylinder_or_capsule_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position, bool p_is_capsule);
+
 public:
+	/**
+	 * Initializes a new action involving a handle.
+	 *
+	 * Depending on the type of gizmo that will be used, different formats for the `p_initial_value` are required:
+	 * Box: The size of the box as `Vector3`
+	 * Cylinder or Capsule: A `Vector2` of the form `Vector2(radius, height)`
+	 */
 	void initialize_handle_action(const Variant &p_initial_value, const Transform3D &p_initial_transform);
 	void get_segment(Camera3D *p_camera, const Point2 &p_point, Vector3 *r_segment);
 
+	// Box
+
 	Vector<Vector3> box_get_handles(const Vector3 &p_box_size);
 	String box_get_handle_name(int p_id) const;
 	void box_set_handle(const Vector3 p_segment[2], int p_id, Vector3 &r_box_size, Vector3 &r_box_position);
 	void box_commit_handle(const String &p_action_name, bool p_cancel, Object *p_position_object, Object *p_size_object = nullptr, const StringName &p_position_property = "global_position", const StringName &p_size_property = "size");
 
+	// Cylinder
+
 	Vector<Vector3> cylinder_get_handles(real_t p_height, real_t p_radius);
 	String cylinder_get_handle_name(int p_id) const;
-	void cylinder_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position);
+	_FORCE_INLINE_ void cylinder_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_cylinder_position) {
+		_cylinder_or_capsule_set_handle(p_segment, p_id, r_height, r_radius, r_cylinder_position, false);
+	}
 	void cylinder_commit_handle(int p_id, const String &p_radius_action_name, const String &p_height_action_name, bool p_cancel, Object *p_position_object, Object *p_height_object = nullptr, Object *p_radius_object = nullptr, const StringName &p_position_property = "global_position", const StringName &p_height_property = "height", const StringName &p_radius_property = "radius");
-};
 
-#endif // GIZMO_3D_HELPER_H
+	// Capsule
+
+	_FORCE_INLINE_ Vector<Vector3> capsule_get_handles(real_t p_height, real_t p_radius) { return cylinder_get_handles(p_height, p_radius); }
+	_FORCE_INLINE_ String capsule_get_handle_name(int p_id) { return cylinder_get_handle_name(p_id); }
+	_FORCE_INLINE_ void capsule_set_handle(const Vector3 p_segment[2], int p_id, real_t &r_height, real_t &r_radius, Vector3 &r_capsule_position) {
+		_cylinder_or_capsule_set_handle(p_segment, p_id, r_height, r_radius, r_capsule_position, true);
+	}
+	_FORCE_INLINE_ void capsule_commit_handle(int p_id, const String &p_radius_action_name, const String &p_height_action_name, bool p_cancel, Object *p_position_object, Object *p_height_object = nullptr, Object *p_radius_object = nullptr, const StringName &p_position_property = "global_position", const StringName &p_height_property = "height", const StringName &p_radius_property = "radius") {
+		cylinder_commit_handle(p_id, p_radius_action_name, p_height_action_name, p_cancel, p_position_object, p_height_object, p_radius_object, p_position_property, p_height_property, p_radius_property);
+	}
+};
diff --git a/engine/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h
index b463e60a..6a23bba7 100644
--- a/engine/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/gpu_particles_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GPU_PARTICLES_3D_GIZMO_PLUGIN_H
-#define GPU_PARTICLES_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -45,5 +44,3 @@ public:
 
 	GPUParticles3DGizmoPlugin();
 };
-
-#endif // GPU_PARTICLES_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp
index 78acbc4d..e52178e8 100644
--- a/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.cpp
@@ -52,9 +52,6 @@ GPUParticlesCollision3DGizmoPlugin::GPUParticlesCollision3DGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-GPUParticlesCollision3DGizmoPlugin::~GPUParticlesCollision3DGizmoPlugin() {
-}
-
 bool GPUParticlesCollision3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return (Object::cast_to<GPUParticlesCollision3D>(p_spatial) != nullptr) || (Object::cast_to<GPUParticlesAttractor3D>(p_spatial) != nullptr);
 }
@@ -168,45 +165,81 @@ void GPUParticlesCollision3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	const Ref<Material> handles_material = get_material("handles");
 
 	if (Object::cast_to<GPUParticlesCollisionSphere3D>(cs) || Object::cast_to<GPUParticlesAttractorSphere3D>(cs)) {
-		float r = cs->call("get_radius");
+		float radius = cs->call("get_radius");
+
+#define PUSH_QUARTER(m_from_x, m_from_y, m_to_x, m_to_y, m_y)  \
+	points_ptrw[index++] = Vector3(m_from_x, m_y, m_from_y);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_y, m_to_y);       \
+	points_ptrw[index++] = Vector3(m_from_x, m_y, -m_from_y);  \
+	points_ptrw[index++] = Vector3(m_to_x, m_y, -m_to_y);      \
+	points_ptrw[index++] = Vector3(-m_from_x, m_y, m_from_y);  \
+	points_ptrw[index++] = Vector3(-m_to_x, m_y, m_to_y);      \
+	points_ptrw[index++] = Vector3(-m_from_x, m_y, -m_from_y); \
+	points_ptrw[index++] = Vector3(-m_to_x, m_y, -m_to_y);
+
+#define PUSH_QUARTER_XY(m_from_x, m_from_y, m_to_x, m_to_y)  \
+	points_ptrw[index++] = Vector3(m_from_x, -m_from_y, 0);  \
+	points_ptrw[index++] = Vector3(m_to_x, -m_to_y, 0);      \
+	points_ptrw[index++] = Vector3(m_from_x, m_from_y, 0);   \
+	points_ptrw[index++] = Vector3(m_to_x, m_to_y, 0);       \
+	points_ptrw[index++] = Vector3(-m_from_x, -m_from_y, 0); \
+	points_ptrw[index++] = Vector3(-m_to_x, -m_to_y, 0);     \
+	points_ptrw[index++] = Vector3(-m_from_x, m_from_y, 0);  \
+	points_ptrw[index++] = Vector3(-m_to_x, m_to_y, 0);
+
+#define PUSH_QUARTER_YZ(m_from_x, m_from_y, m_to_x, m_to_y)  \
+	points_ptrw[index++] = Vector3(0, -m_from_y, m_from_x);  \
+	points_ptrw[index++] = Vector3(0, -m_to_y, m_to_x);      \
+	points_ptrw[index++] = Vector3(0, m_from_y, m_from_x);   \
+	points_ptrw[index++] = Vector3(0, m_to_y, m_to_x);       \
+	points_ptrw[index++] = Vector3(0, -m_from_y, -m_from_x); \
+	points_ptrw[index++] = Vector3(0, -m_to_y, -m_to_x);     \
+	points_ptrw[index++] = Vector3(0, m_from_y, -m_from_x);  \
+	points_ptrw[index++] = Vector3(0, m_to_y, -m_to_x);
+
+		// Number of points in an octant. So there will be 8 * points_in_octant points in total.
+		// This corresponds to the smoothness of the circle.
+		const uint32_t points_in_octant = 16;
+		const real_t octant_angle = Math::PI / 4;
+		const real_t inc = (Math::PI / (4 * points_in_octant));
+		const real_t radius_squared = radius * radius;
+		real_t r = 0;
 
 		Vector<Vector3> points;
+		points.resize(3 * 8 * points_in_octant * 2);
+		Vector3 *points_ptrw = points.ptrw();
 
-		for (int i = 0; i <= 360; i++) {
-			float ra = Math::deg_to_rad((float)i);
-			float rb = Math::deg_to_rad((float)i + 1);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * r;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * r;
+		uint32_t index = 0;
+		float previous_x = radius;
+		float previous_y = 0.f;
 
-			points.push_back(Vector3(a.x, 0, a.y));
-			points.push_back(Vector3(b.x, 0, b.y));
-			points.push_back(Vector3(0, a.x, a.y));
-			points.push_back(Vector3(0, b.x, b.y));
-			points.push_back(Vector3(a.x, a.y, 0));
-			points.push_back(Vector3(b.x, b.y, 0));
-		}
+		for (uint32_t i = 0; i < points_in_octant; ++i) {
+			r += inc;
+			real_t x = Math::cos((i == points_in_octant - 1) ? octant_angle : r) * radius;
+			real_t y = Math::sqrt(radius_squared - (x * x));
 
-		Vector<Vector3> collision_segments;
+			PUSH_QUARTER(previous_x, previous_y, x, y, 0);
+			PUSH_QUARTER(previous_y, previous_x, y, x, 0);
 
-		for (int i = 0; i < 64; i++) {
-			float ra = i * (Math_TAU / 64.0);
-			float rb = (i + 1) * (Math_TAU / 64.0);
-			Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * r;
-			Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * r;
+			PUSH_QUARTER_XY(previous_x, previous_y, x, y);
+			PUSH_QUARTER_XY(previous_y, previous_x, y, x);
 
-			collision_segments.push_back(Vector3(a.x, 0, a.y));
-			collision_segments.push_back(Vector3(b.x, 0, b.y));
-			collision_segments.push_back(Vector3(0, a.x, a.y));
-			collision_segments.push_back(Vector3(0, b.x, b.y));
-			collision_segments.push_back(Vector3(a.x, a.y, 0));
-			collision_segments.push_back(Vector3(b.x, b.y, 0));
+			PUSH_QUARTER_YZ(previous_x, previous_y, x, y);
+			PUSH_QUARTER_YZ(previous_y, previous_x, y, x);
+
+			previous_x = x;
+			previous_y = y;
 		}
 
 		p_gizmo->add_lines(points, material);
-		p_gizmo->add_collision_segments(collision_segments);
+		p_gizmo->add_collision_segments(points);
 		Vector<Vector3> handles;
 		handles.push_back(Vector3(r, 0, 0));
 		p_gizmo->add_handles(handles, handles_material);
+
+#undef PUSH_QUARTER
+#undef PUSH_QUARTER_XY
+#undef PUSH_QUARTER_YZ
 	}
 
 	if (Object::cast_to<GPUParticlesCollisionBox3D>(cs) || Object::cast_to<GPUParticlesAttractorBox3D>(cs) || Object::cast_to<GPUParticlesAttractorVectorField3D>(cs) || Object::cast_to<GPUParticlesCollisionSDF3D>(cs) || Object::cast_to<GPUParticlesCollisionHeightField3D>(cs)) {
diff --git a/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h
index 98572ff8..33b3ddbc 100644
--- a/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/gpu_particles_collision_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GPU_PARTICLES_COLLISION_3D_GIZMO_PLUGIN_H
-#define GPU_PARTICLES_COLLISION_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -53,7 +52,4 @@ public:
 	void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel = false) override;
 
 	GPUParticlesCollision3DGizmoPlugin();
-	~GPUParticlesCollision3DGizmoPlugin();
 };
-
-#endif // GPU_PARTICLES_COLLISION_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp
index 188e757d..6e598bc7 100644
--- a/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.cpp
@@ -179,8 +179,8 @@ void JointGizmosDrawer::draw_circle(Vector3::Axis p_axis, real_t p_radius, const
 
 	} else {
 		if (p_limit_lower > p_limit_upper) {
-			p_limit_lower = -Math_PI;
-			p_limit_upper = Math_PI;
+			p_limit_lower = -Math::PI;
+			p_limit_upper = Math::PI;
 		}
 
 		const int points = 32;
diff --git a/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.h
index 25b08d71..1af50c7f 100644
--- a/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/joint_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOINT_3D_GIZMO_PLUGIN_H
-#define JOINT_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -95,5 +94,3 @@ public:
 	static void draw_circle(Vector3::Axis p_axis, real_t p_radius, const Transform3D &p_offset, const Basis &p_base, real_t p_limit_lower, real_t p_limit_upper, Vector<Vector3> &r_points, bool p_inverse = false);
 	static void draw_cone(const Transform3D &p_offset, const Basis &p_base, real_t p_swing, real_t p_twist, Vector<Vector3> &r_points);
 };
-
-#endif // JOINT_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.cpp
index d7abb24d..43982442 100644
--- a/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.cpp
@@ -32,9 +32,6 @@
 
 #include "scene/3d/label_3d.h"
 
-Label3DGizmoPlugin::Label3DGizmoPlugin() {
-}
-
 bool Label3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<Label3D>(p_spatial) != nullptr;
 }
diff --git a/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.h
index 979a4b86..f23698cc 100644
--- a/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/label_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LABEL_3D_GIZMO_PLUGIN_H
-#define LABEL_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -42,8 +41,4 @@ public:
 	int get_priority() const override;
 	bool can_be_hidden() const override;
 	void redraw(EditorNode3DGizmo *p_gizmo) override;
-
-	Label3DGizmoPlugin();
 };
-
-#endif // LABEL_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.cpp
index 7346ce69..56bfae69 100644
--- a/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.cpp
@@ -179,7 +179,7 @@ void Light3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 			for (int i = 0; i < arrow_sides; i++) {
 				for (int j = 0; j < arrow_points; j++) {
-					Basis ma(Vector3(0, 0, 1), Math_PI * i / arrow_sides);
+					Basis ma(Vector3(0, 0, 1), Math::PI * i / arrow_sides);
 
 					Vector3 v1 = arrow[j] - Vector3(0, 0, arrow_length);
 					Vector3 v2 = arrow[(j + 1) % arrow_points] - Vector3(0, 0, arrow_length);
@@ -295,8 +295,8 @@ float Light3DGizmoPlugin::_find_closest_angle_to_half_pi_arc(const Vector3 &p_fr
 	Vector3 min_p;
 
 	for (int i = 0; i < arc_test_points; i++) {
-		float a = i * Math_PI * 0.5 / arc_test_points;
-		float an = (i + 1) * Math_PI * 0.5 / arc_test_points;
+		float a = i * Math::PI * 0.5 / arc_test_points;
+		float an = (i + 1) * Math::PI * 0.5 / arc_test_points;
 		Vector3 p = Vector3(Math::cos(a), 0, -Math::sin(a)) * p_arc_radius;
 		Vector3 n = Vector3(Math::cos(an), 0, -Math::sin(an)) * p_arc_radius;
 
@@ -311,6 +311,6 @@ float Light3DGizmoPlugin::_find_closest_angle_to_half_pi_arc(const Vector3 &p_fr
 	}
 
 	//min_p = p_arc_xform.affine_inverse().xform(min_p);
-	float a = (Math_PI * 0.5) - Vector2(min_p.x, -min_p.z).angle();
+	float a = (Math::PI * 0.5) - Vector2(min_p.x, -min_p.z).angle();
 	return Math::rad_to_deg(a);
 }
diff --git a/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.h
index b7eec7fb..b301d5d7 100644
--- a/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/light_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_3D_GIZMO_PLUGIN_H
-#define LIGHT_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -52,5 +51,3 @@ public:
 
 	Light3DGizmoPlugin();
 };
-
-#endif // LIGHT_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp
index 20a876bb..daf5dd7b 100644
--- a/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.cpp
@@ -88,7 +88,7 @@ void LightmapGIGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	HashSet<Vector2i> lines_found;
 
 	Vector<Vector3> points = data->get_capture_points();
-	if (points.size() == 0) {
+	if (points.is_empty()) {
 		return;
 	}
 	Vector<Color> sh = data->get_capture_sh();
@@ -123,8 +123,8 @@ void LightmapGIGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	int stack_count = 8;
 	int sector_count = 16;
 
-	float sector_step = (Math_PI * 2.0) / sector_count;
-	float stack_step = Math_PI / stack_count;
+	float sector_step = (Math::PI * 2.0) / sector_count;
+	float stack_step = Math::PI / stack_count;
 
 	Vector<Vector3> vertices;
 	Vector<Color> colors;
@@ -141,7 +141,7 @@ void LightmapGIGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 		}
 
 		for (int i = 0; i <= stack_count; ++i) {
-			float stack_angle = Math_PI / 2 - i * stack_step; // starting from pi/2 to -pi/2
+			float stack_angle = Math::PI / 2 - i * stack_step; // starting from pi/2 to -pi/2
 			float xy = radius * Math::cos(stack_angle); // r * cos(u)
 			float z = radius * Math::sin(stack_angle); // r * sin(u)
 
diff --git a/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h b/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h
index 50ce0425..94a521da 100644
--- a/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/lightmap_gi_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAP_GI_GIZMO_PLUGIN_H
-#define LIGHTMAP_GI_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	LightmapGIGizmoPlugin();
 };
-
-#endif // LIGHTMAP_GI_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp
index 4c3d0116..9cf9b29d 100644
--- a/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.cpp
@@ -66,14 +66,14 @@ void LightmapProbeGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 	int stack_count = 8;
 	int sector_count = 16;
 
-	float sector_step = (Math_PI * 2.0) / sector_count;
-	float stack_step = Math_PI / stack_count;
+	float sector_step = (Math::PI * 2.0) / sector_count;
+	float stack_step = Math::PI / stack_count;
 
 	Vector<Vector3> vertices;
 	float radius = 0.2;
 
 	for (int i = 0; i <= stack_count; ++i) {
-		float stack_angle = Math_PI / 2 - i * stack_step; // starting from pi/2 to -pi/2
+		float stack_angle = Math::PI / 2 - i * stack_step; // starting from pi/2 to -pi/2
 		float xy = radius * Math::cos(stack_angle); // r * cos(u)
 		float z = radius * Math::sin(stack_angle); // r * sin(u)
 
diff --git a/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h b/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h
index d1419523..885ada55 100644
--- a/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/lightmap_probe_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAP_PROBE_GIZMO_PLUGIN_H
-#define LIGHTMAP_PROBE_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	LightmapProbeGizmoPlugin();
 };
-
-#endif // LIGHTMAP_PROBE_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/marker_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/marker_3d_gizmo_plugin.h
index 912166f8..bd783431 100644
--- a/engine/editor/plugins/gizmos/marker_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/marker_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MARKER_3D_GIZMO_PLUGIN_H
-#define MARKER_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -46,5 +45,3 @@ public:
 
 	Marker3DGizmoPlugin();
 };
-
-#endif // MARKER_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.cpp
index 395fe7ed..4a84aa8e 100644
--- a/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.cpp
@@ -32,12 +32,9 @@
 
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/soft_body_3d.h"
+#include "scene/3d/physics/soft_body_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
 
-MeshInstance3DGizmoPlugin::MeshInstance3DGizmoPlugin() {
-}
-
 bool MeshInstance3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<MeshInstance3D>(p_spatial) != nullptr && Object::cast_to<SoftBody3D>(p_spatial) == nullptr;
 }
diff --git a/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h
index dfc889b3..bd87ff4d 100644
--- a/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/mesh_instance_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_INSTANCE_3D_GIZMO_PLUGIN_H
-#define MESH_INSTANCE_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -42,8 +41,4 @@ public:
 	int get_priority() const override;
 	bool can_be_hidden() const override;
 	void redraw(EditorNode3DGizmo *p_gizmo) override;
-
-	MeshInstance3DGizmoPlugin();
 };
-
-#endif // MESH_INSTANCE_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.cpp
index 18cdbcb7..ea01a2e9 100644
--- a/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.cpp
@@ -32,7 +32,7 @@
 
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
-#include "scene/3d/navigation_link_3d.h"
+#include "scene/3d/navigation/navigation_link_3d.h"
 #include "servers/navigation_server_3d.h"
 
 NavigationLink3DGizmoPlugin::NavigationLink3DGizmoPlugin() {
@@ -70,10 +70,10 @@ void NavigationLink3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 	p_gizmo->clear();
 
-	// Number of points in an octant. So there ill be 8 * points_in_octant points in total.
+	// Number of points in an octant. So there will be 8 * points_in_octant points in total.
 	// Correspond to the smoothness of the circle.
-	const uint32_t points_in_octant = 4;
-	real_t inc = (Math_PI / (4 * points_in_octant));
+	const uint32_t points_in_octant = 8;
+	real_t inc = (Math::PI / (4 * points_in_octant));
 
 	Vector<Vector3> lines;
 	// points_in_octant * 8 * 2 per circle * 2 circles. 2 for the start-end. 4 for the arrow, and another 4 if bidirectionnal.
diff --git a/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h
index a58301fe..cb3e25e5 100644
--- a/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/navigation_link_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_LINK_3D_GIZMO_PLUGIN_H
-#define NAVIGATION_LINK_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -49,5 +48,3 @@ public:
 
 	NavigationLink3DGizmoPlugin();
 };
-
-#endif // NAVIGATION_LINK_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp
index d782e3b1..0a323a50 100644
--- a/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.cpp
@@ -30,7 +30,8 @@
 
 #include "navigation_region_3d_gizmo_plugin.h"
 
-#include "scene/3d/navigation_region_3d.h"
+#include "core/math/random_pcg.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "servers/navigation_server_3d.h"
 
 NavigationRegion3DGizmoPlugin::NavigationRegion3DGizmoPlugin() {
diff --git a/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h
index 93d0849e..2235e25d 100644
--- a/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/navigation_region_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_REGION_3D_GIZMO_PLUGIN_H
-#define NAVIGATION_REGION_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -57,5 +56,3 @@ public:
 
 	NavigationRegion3DGizmoPlugin();
 };
-
-#endif // NAVIGATION_REGION_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h
index 1555ffd4..4c5763f0 100644
--- a/engine/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/occluder_instance_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OCCLUDER_INSTANCE_3D_GIZMO_PLUGIN_H
-#define OCCLUDER_INSTANCE_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -49,5 +48,3 @@ public:
 
 	OccluderInstance3DGizmoPlugin();
 };
-
-#endif // OCCLUDER_INSTANCE_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h b/engine/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h
index 45b725af..2efa8a1f 100644
--- a/engine/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/particles_3d_emission_shape_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLES_3D_EMISSION_SHAPE_GIZMO_PLUGIN_H
-#define PARTICLES_3D_EMISSION_SHAPE_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/gizmos/gizmo_3d_helper.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
@@ -53,5 +52,3 @@ public:
 
 	Particles3DEmissionShapeGizmoPlugin();
 };
-
-#endif // PARTICLES_3D_EMISSION_SHAPE_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp
index e7851585..8a0d4fd3 100644
--- a/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.cpp
@@ -32,8 +32,8 @@
 
 #include "editor/editor_settings.h"
 #include "editor/plugins/gizmos/joint_3d_gizmo_plugin.h"
-#include "scene/3d/physical_bone_simulator_3d.h"
 #include "scene/3d/physics/physical_bone_3d.h"
+#include "scene/3d/physics/physical_bone_simulator_3d.h"
 
 PhysicalBone3DGizmoPlugin::PhysicalBone3DGizmoPlugin() {
 	create_material("joint_material", EDITOR_GET("editors/3d_gizmos/gizmo_colors/joint"));
diff --git a/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h
index bd551c98..b617eaff 100644
--- a/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/physics_bone_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_BONE_3D_GIZMO_PLUGIN_H
-#define PHYSICS_BONE_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	PhysicalBone3DGizmoPlugin();
 };
-
-#endif // PHYSICS_BONE_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h
index 133476a3..0233bd96 100644
--- a/engine/editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/ray_cast_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RAY_CAST_3D_GIZMO_PLUGIN_H
-#define RAY_CAST_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	RayCast3DGizmoPlugin();
 };
-
-#endif // RAY_CAST_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.cpp
index 0ad30e89..483220b7 100644
--- a/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.cpp
@@ -51,9 +51,6 @@ ReflectionProbeGizmoPlugin::ReflectionProbeGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-ReflectionProbeGizmoPlugin::~ReflectionProbeGizmoPlugin() {
-}
-
 bool ReflectionProbeGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<ReflectionProbe>(p_spatial) != nullptr;
 }
diff --git a/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.h b/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.h
index b980f5a9..788d21a9 100644
--- a/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/reflection_probe_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REFLECTION_PROBE_GIZMO_PLUGIN_H
-#define REFLECTION_PROBE_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -53,7 +52,4 @@ public:
 	void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel = false) override;
 
 	ReflectionProbeGizmoPlugin();
-	~ReflectionProbeGizmoPlugin();
 };
-
-#endif // REFLECTION_PROBE_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h
index 9e4a802b..3c1c1dc1 100644
--- a/engine/editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/shape_cast_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHAPE_CAST_3D_GIZMO_PLUGIN_H
-#define SHAPE_CAST_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	ShapeCast3DGizmoPlugin();
 };
-
-#endif // SHAPE_CAST_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.cpp
index e403e093..d3c6c6de 100644
--- a/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "soft_body_3d_gizmo_plugin.h"
 
-#include "scene/3d/soft_body_3d.h"
+#include "scene/3d/physics/soft_body_3d.h"
 
 SoftBody3DGizmoPlugin::SoftBody3DGizmoPlugin() {
 	Color gizmo_color = SceneTree::get_singleton()->get_debug_collisions_color();
diff --git a/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h
index f56e1528..95b5b424 100644
--- a/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/soft_body_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SOFT_BODY_3D_GIZMO_PLUGIN_H
-#define SOFT_BODY_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -50,5 +49,3 @@ public:
 
 	SoftBody3DGizmoPlugin();
 };
-
-#endif // SOFT_BODY_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h
index cbb7c163..91fd64d2 100644
--- a/engine/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/spring_arm_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_ARM_3D_GIZMO_PLUGIN_H
-#define SPRING_ARM_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	SpringArm3DGizmoPlugin();
 };
-
-#endif // SPRING_ARM_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.cpp
index e98a5a52..5486746c 100644
--- a/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.cpp
@@ -171,7 +171,7 @@ void SpringBoneSimulator3DGizmoPlugin::draw_sphere(Ref<SurfaceTool> &p_surface_t
 	static const Vector3 VECTOR3_UP = Vector3(0, 1, 0);
 	static const Vector3 VECTOR3_FORWARD = Vector3(0, 0, 1);
 	static const int STEP = 16;
-	static const float SPPI = Math_TAU / (float)STEP;
+	static const float SPPI = Math::TAU / (float)STEP;
 
 	for (int i = 1; i <= STEP; i++) {
 		p_surface_tool->set_color(p_color);
@@ -302,7 +302,7 @@ void SpringBoneCollision3DGizmoPlugin::draw_sphere(Ref<SurfaceTool> &p_surface_t
 	static const Vector3 VECTOR3_UP = Vector3(0, 1, 0);
 	static const Vector3 VECTOR3_FORWARD = Vector3(0, 0, 1);
 	static const int STEP = 16;
-	static const float SPPI = Math_TAU / (float)STEP;
+	static const float SPPI = Math::TAU / (float)STEP;
 
 	for (int i = 1; i <= STEP; i++) {
 		p_surface_tool->set_color(p_color);
@@ -330,8 +330,8 @@ void SpringBoneCollision3DGizmoPlugin::draw_capsule(Ref<SurfaceTool> &p_surface_
 	static const Vector3 VECTOR3_FORWARD = Vector3(0, 0, 1);
 	static const int STEP = 16;
 	static const int HALF_STEP = 8;
-	static const float SPPI = Math_TAU / (float)STEP;
-	static const float HALF_PI = Math_PI * 0.5;
+	static const float SPPI = Math::TAU / (float)STEP;
+	static const float HALF_PI = Math::PI * 0.5;
 
 	Vector3 top = VECTOR3_UP * (p_height * 0.5 - p_radius);
 	Vector3 bottom = -top;
@@ -376,7 +376,7 @@ void SpringBoneCollision3DGizmoPlugin::draw_capsule(Ref<SurfaceTool> &p_surface_
 
 void SpringBoneCollision3DGizmoPlugin::draw_plane(Ref<SurfaceTool> &p_surface_tool, const Color &p_color) {
 	static const Vector3 VECTOR3_UP = Vector3(0, 1, 0);
-	static const float HALF_PI = Math_PI * 0.5;
+	static const float HALF_PI = Math::PI * 0.5;
 	static const float ARROW_LENGTH = 0.3;
 	static const float ARROW_HALF_WIDTH = 0.05;
 	static const float ARROW_TOP_HALF_WIDTH = 0.1;
diff --git a/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h
index 8d6be59b..41943ed4 100644
--- a/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/spring_bone_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_BONE_3D_GIZMO_PLUGIN_H
-#define SPRING_BONE_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
@@ -85,5 +84,3 @@ public:
 	SpringBoneCollision3DGizmoPlugin();
 	~SpringBoneCollision3DGizmoPlugin();
 };
-
-#endif // SPRING_BONE_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.cpp
index f1eed733..062505b5 100644
--- a/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.cpp
@@ -32,9 +32,6 @@
 
 #include "scene/3d/sprite_3d.h"
 
-SpriteBase3DGizmoPlugin::SpriteBase3DGizmoPlugin() {
-}
-
 bool SpriteBase3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<SpriteBase3D>(p_spatial) != nullptr;
 }
diff --git a/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h
index 83239570..5f65a983 100644
--- a/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/sprite_base_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRITE_BASE_3D_GIZMO_PLUGIN_H
-#define SPRITE_BASE_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -42,8 +41,4 @@ public:
 	int get_priority() const override;
 	bool can_be_hidden() const override;
 	void redraw(EditorNode3DGizmo *p_gizmo) override;
-
-	SpriteBase3DGizmoPlugin();
 };
-
-#endif // SPRITE_BASE_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h
index 8c5f8bd4..16e13a9b 100644
--- a/engine/editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/vehicle_body_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VEHICLE_BODY_3D_GIZMO_PLUGIN_H
-#define VEHICLE_BODY_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -44,5 +43,3 @@ public:
 
 	VehicleWheel3DGizmoPlugin();
 };
-
-#endif // VEHICLE_BODY_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h b/engine/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h
index bf3d9909..3fa89a34 100644
--- a/engine/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISIBLE_ON_SCREEN_NOTIFIER_3D_GIZMO_PLUGIN_H
-#define VISIBLE_ON_SCREEN_NOTIFIER_3D_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -49,5 +48,3 @@ public:
 
 	VisibleOnScreenNotifier3DGizmoPlugin();
 };
-
-#endif // VISIBLE_ON_SCREEN_NOTIFIER_3D_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp b/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp
index f28b2b44..48533706 100644
--- a/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp
+++ b/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.cpp
@@ -51,9 +51,6 @@ VoxelGIGizmoPlugin::VoxelGIGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-VoxelGIGizmoPlugin::~VoxelGIGizmoPlugin() {
-}
-
 bool VoxelGIGizmoPlugin::has_gizmo(Node3D *p_spatial) {
 	return Object::cast_to<VoxelGI>(p_spatial) != nullptr;
 }
diff --git a/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.h b/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.h
index a5447c8b..e68e3165 100644
--- a/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.h
+++ b/engine/editor/plugins/gizmos/voxel_gi_gizmo_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VOXEL_GI_GIZMO_PLUGIN_H
-#define VOXEL_GI_GIZMO_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/node_3d_editor_gizmos.h"
 
@@ -53,7 +52,4 @@ public:
 	void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel = false) override;
 
 	VoxelGIGizmoPlugin();
-	~VoxelGIGizmoPlugin();
 };
-
-#endif // VOXEL_GI_GIZMO_PLUGIN_H
diff --git a/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp b/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
index 1fa9f672..7b2226c6 100644
--- a/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
+++ b/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.cpp
@@ -199,6 +199,3 @@ GPUParticlesCollisionSDF3DEditorPlugin::GPUParticlesCollisionSDF3DEditorPlugin()
 	GPUParticlesCollisionSDF3D::bake_step_function = bake_func_step;
 	GPUParticlesCollisionSDF3D::bake_end_function = bake_func_end;
 }
-
-GPUParticlesCollisionSDF3DEditorPlugin::~GPUParticlesCollisionSDF3DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h b/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h
index 499a1df6..f7959d9b 100644
--- a/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h
+++ b/engine/editor/plugins/gpu_particles_collision_sdf_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GPU_PARTICLES_COLLISION_SDF_EDITOR_PLUGIN_H
-#define GPU_PARTICLES_COLLISION_SDF_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/gpu_particles_collision_3d.h"
@@ -68,7 +67,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	GPUParticlesCollisionSDF3DEditorPlugin();
-	~GPUParticlesCollisionSDF3DEditorPlugin();
 };
-
-#endif // GPU_PARTICLES_COLLISION_SDF_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/gradient_editor_plugin.cpp b/engine/editor/plugins/gradient_editor_plugin.cpp
index 291ffc24..6dc42997 100644
--- a/engine/editor/plugins/gradient_editor_plugin.cpp
+++ b/engine/editor/plugins/gradient_editor_plugin.cpp
@@ -57,7 +57,7 @@ int GradientEdit::_get_point_at(int p_xpos) const {
 			break;
 		}
 		// Check if we clicked at point.
-		float distance = ABS(p_xpos - gradient->get_offset(i) * total_w);
+		float distance = Math::abs(p_xpos - gradient->get_offset(i) * total_w);
 		if (distance < min_distance) {
 			result = i;
 			min_distance = distance;
@@ -385,14 +385,14 @@ void GradientEdit::gui_input(const Ref<InputEvent> &p_event) {
 			int nearest_idx = -1;
 			// Only check the two adjacent points to find which one is the nearest.
 			if (selected_index > 0) {
-				float temp_offset = ABS(gradient->get_offset(selected_index - 1) - new_offset);
+				float temp_offset = Math::abs(gradient->get_offset(selected_index - 1) - new_offset);
 				if (temp_offset < smallest_offset) {
 					smallest_offset = temp_offset;
 					nearest_idx = selected_index - 1;
 				}
 			}
 			if (selected_index < gradient->get_point_count() - 1) {
-				float temp_offset = ABS(gradient->get_offset(selected_index + 1) - new_offset);
+				float temp_offset = Math::abs(gradient->get_offset(selected_index + 1) - new_offset);
 				if (temp_offset < smallest_offset) {
 					smallest_offset = temp_offset;
 					nearest_idx = selected_index + 1;
@@ -544,6 +544,14 @@ void GradientEdit::_notification(int p_what) {
 			draw_spacing = BASE_SPACING * get_theme_default_base_scale();
 			handle_width = BASE_HANDLE_WIDTH * get_theme_default_base_scale();
 		} break;
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "Gradient editor")));
+		} break;
 		case NOTIFICATION_DRAW: {
 			_redraw();
 		} break;
@@ -630,6 +638,7 @@ GradientEditor::GradientEditor() {
 
 	snap_button = memnew(Button);
 	snap_button->set_tooltip_text(TTR("Toggle Grid Snap"));
+	snap_button->set_accessibility_name(TTRC("Snap to Grid"));
 	snap_button->set_toggle_mode(true);
 	toolbar->add_child(snap_button);
 	snap_button->connect(SceneStringName(toggled), callable_mp(this, &GradientEditor::_set_snap_enabled));
@@ -637,6 +646,7 @@ GradientEditor::GradientEditor() {
 	snap_count_edit = memnew(EditorSpinSlider);
 	snap_count_edit->set_min(2);
 	snap_count_edit->set_max(100);
+	snap_count_edit->set_accessibility_name(TTRC("Grid Step"));
 	snap_count_edit->set_value(DEFAULT_SNAP);
 	snap_count_edit->set_custom_minimum_size(Size2(65 * EDSCALE, 0));
 	toolbar->add_child(snap_count_edit);
diff --git a/engine/editor/plugins/gradient_editor_plugin.h b/engine/editor/plugins/gradient_editor_plugin.h
index 516babf8..a8dadd0e 100644
--- a/engine/editor/plugins/gradient_editor_plugin.h
+++ b/engine/editor/plugins/gradient_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRADIENT_EDITOR_PLUGIN_H
-#define GRADIENT_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -142,5 +141,3 @@ public:
 
 	GradientEditorPlugin();
 };
-
-#endif // GRADIENT_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/gradient_texture_2d_editor_plugin.cpp b/engine/editor/plugins/gradient_texture_2d_editor_plugin.cpp
index 65951724..4b3c7903 100644
--- a/engine/editor/plugins/gradient_texture_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/gradient_texture_2d_editor_plugin.cpp
@@ -279,6 +279,7 @@ GradientTexture2DEditor::GradientTexture2DEditor() {
 
 	reverse_button = memnew(Button);
 	reverse_button->set_tooltip_text(TTR("Swap Gradient Fill Points"));
+	reverse_button->set_accessibility_name(TTRC("Swap Gradient Fill Points"));
 	toolbar->add_child(reverse_button);
 	reverse_button->connect(SceneStringName(pressed), callable_mp(this, &GradientTexture2DEditor::_reverse_button_pressed));
 
@@ -286,6 +287,7 @@ GradientTexture2DEditor::GradientTexture2DEditor() {
 
 	snap_button = memnew(Button);
 	snap_button->set_tooltip_text(TTR("Toggle Grid Snap"));
+	snap_button->set_accessibility_name(TTRC("Snap to Grid"));
 	snap_button->set_toggle_mode(true);
 	toolbar->add_child(snap_button);
 	snap_button->connect(SceneStringName(toggled), callable_mp(this, &GradientTexture2DEditor::_set_snap_enabled));
@@ -294,6 +296,7 @@ GradientTexture2DEditor::GradientTexture2DEditor() {
 	snap_count_edit->set_min(2);
 	snap_count_edit->set_max(100);
 	snap_count_edit->set_value(DEFAULT_SNAP);
+	snap_count_edit->set_accessibility_name(TTRC("Grid Step"));
 	snap_count_edit->set_custom_minimum_size(Size2(65 * EDSCALE, 0));
 	toolbar->add_child(snap_count_edit);
 	snap_count_edit->connect(SceneStringName(value_changed), callable_mp(this, &GradientTexture2DEditor::_set_snap_count));
diff --git a/engine/editor/plugins/gradient_texture_2d_editor_plugin.h b/engine/editor/plugins/gradient_texture_2d_editor_plugin.h
index a9f247c3..73f3f957 100644
--- a/engine/editor/plugins/gradient_texture_2d_editor_plugin.h
+++ b/engine/editor/plugins/gradient_texture_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRADIENT_TEXTURE_2D_EDITOR_PLUGIN_H
-#define GRADIENT_TEXTURE_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -118,5 +117,3 @@ class GradientTexture2DEditorPlugin : public EditorPlugin {
 public:
 	GradientTexture2DEditorPlugin();
 };
-
-#endif // GRADIENT_TEXTURE_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/input_event_editor_plugin.h b/engine/editor/plugins/input_event_editor_plugin.h
index 8d14c2e4..23fd7183 100644
--- a/engine/editor/plugins/input_event_editor_plugin.h
+++ b/engine/editor/plugins/input_event_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INPUT_EVENT_EDITOR_PLUGIN_H
-#define INPUT_EVENT_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/action_map_editor.h"
 #include "editor/editor_inspector.h"
@@ -74,5 +73,3 @@ public:
 
 	InputEventEditorPlugin();
 };
-
-#endif // INPUT_EVENT_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/light_occluder_2d_editor_plugin.cpp b/engine/editor/plugins/light_occluder_2d_editor_plugin.cpp
index a675ae08..7a186ce9 100644
--- a/engine/editor/plugins/light_occluder_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/light_occluder_2d_editor_plugin.cpp
@@ -106,8 +106,6 @@ void LightOccluder2DEditor::_create_resource() {
 	_menu_option(MODE_CREATE);
 }
 
-LightOccluder2DEditor::LightOccluder2DEditor() {}
-
 LightOccluder2DEditorPlugin::LightOccluder2DEditorPlugin() :
 		AbstractPolygon2DEditorPlugin(memnew(LightOccluder2DEditor), "LightOccluder2D") {
 }
diff --git a/engine/editor/plugins/light_occluder_2d_editor_plugin.h b/engine/editor/plugins/light_occluder_2d_editor_plugin.h
index 01c8a185..2ff254b5 100644
--- a/engine/editor/plugins/light_occluder_2d_editor_plugin.h
+++ b/engine/editor/plugins/light_occluder_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_OCCLUDER_2D_EDITOR_PLUGIN_H
-#define LIGHT_OCCLUDER_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
 #include "scene/2d/light_occluder_2d.h"
@@ -54,9 +53,6 @@ protected:
 
 	virtual bool _has_resource() const override;
 	virtual void _create_resource() override;
-
-public:
-	LightOccluder2DEditor();
 };
 
 class LightOccluder2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
@@ -65,5 +61,3 @@ class LightOccluder2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
 public:
 	LightOccluder2DEditorPlugin();
 };
-
-#endif // LIGHT_OCCLUDER_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/lightmap_gi_editor_plugin.cpp b/engine/editor/plugins/lightmap_gi_editor_plugin.cpp
index 61f7dd53..bd36d0f2 100644
--- a/engine/editor/plugins/lightmap_gi_editor_plugin.cpp
+++ b/engine/editor/plugins/lightmap_gi_editor_plugin.cpp
@@ -214,6 +214,3 @@ LightmapGIEditorPlugin::LightmapGIEditorPlugin() {
 	file_dialog->connect("file_selected", callable_mp(this, &LightmapGIEditorPlugin::_bake_select_file));
 	bake->add_child(file_dialog);
 }
-
-LightmapGIEditorPlugin::~LightmapGIEditorPlugin() {
-}
diff --git a/engine/editor/plugins/lightmap_gi_editor_plugin.h b/engine/editor/plugins/lightmap_gi_editor_plugin.h
index 4df71459..c690807e 100644
--- a/engine/editor/plugins/lightmap_gi_editor_plugin.h
+++ b/engine/editor/plugins/lightmap_gi_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAP_GI_EDITOR_PLUGIN_H
-#define LIGHTMAP_GI_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/lightmap_gi.h"
@@ -64,7 +63,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	LightmapGIEditorPlugin();
-	~LightmapGIEditorPlugin();
 };
-
-#endif // LIGHTMAP_GI_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/line_2d_editor_plugin.cpp b/engine/editor/plugins/line_2d_editor_plugin.cpp
index 5191db85..c8ed8af6 100644
--- a/engine/editor/plugins/line_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/line_2d_editor_plugin.cpp
@@ -59,8 +59,6 @@ void Line2DEditor::_action_set_polygon(int p_idx, const Variant &p_previous, con
 	undo_redo->add_undo_method(_node, "set_points", p_previous);
 }
 
-Line2DEditor::Line2DEditor() {}
-
 Line2DEditorPlugin::Line2DEditorPlugin() :
 		AbstractPolygon2DEditorPlugin(memnew(Line2DEditor), "Line2D") {
 }
diff --git a/engine/editor/plugins/line_2d_editor_plugin.h b/engine/editor/plugins/line_2d_editor_plugin.h
index f91fec80..2707da6b 100644
--- a/engine/editor/plugins/line_2d_editor_plugin.h
+++ b/engine/editor/plugins/line_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LINE_2D_EDITOR_PLUGIN_H
-#define LINE_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
 #include "scene/2d/line_2d.h"
@@ -47,9 +46,6 @@ protected:
 	virtual Variant _get_polygon(int p_idx) const override;
 	virtual void _set_polygon(int p_idx, const Variant &p_polygon) const override;
 	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) override;
-
-public:
-	Line2DEditor();
 };
 
 class Line2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
@@ -58,5 +54,3 @@ class Line2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
 public:
 	Line2DEditorPlugin();
 };
-
-#endif // LINE_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/material_editor_plugin.cpp b/engine/editor/plugins/material_editor_plugin.cpp
index b17e9927..26161db2 100644
--- a/engine/editor/plugins/material_editor_plugin.cpp
+++ b/engine/editor/plugins/material_editor_plugin.cpp
@@ -62,7 +62,7 @@ void MaterialEditor::gui_input(const Ref<InputEvent> &p_event) {
 			const real_t limit = Math::deg_to_rad(80.0);
 			rot = rot.clampf(-limit, limit);
 		} else {
-			rot.x = CLAMP(rot.x, -Math_PI / 2, Math_PI / 2);
+			rot.x = CLAMP(rot.x, -Math::PI / 2, Math::PI / 2);
 		}
 		_update_rotation();
 		_store_rotation_metadata();
@@ -310,18 +310,21 @@ MaterialEditor::MaterialEditor() {
 	sphere_switch = memnew(Button);
 	sphere_switch->set_theme_type_variation("PreviewLightButton");
 	sphere_switch->set_toggle_mode(true);
+	sphere_switch->set_accessibility_name(TTRC("Sphere"));
 	vb_shape->add_child(sphere_switch);
 	sphere_switch->connect(SceneStringName(pressed), callable_mp(this, &MaterialEditor::_on_sphere_switch_pressed));
 
 	box_switch = memnew(Button);
 	box_switch->set_theme_type_variation("PreviewLightButton");
 	box_switch->set_toggle_mode(true);
+	box_switch->set_accessibility_name(TTRC("Box"));
 	vb_shape->add_child(box_switch);
 	box_switch->connect(SceneStringName(pressed), callable_mp(this, &MaterialEditor::_on_box_switch_pressed));
 
 	quad_switch = memnew(Button);
 	quad_switch->set_theme_type_variation("PreviewLightButton");
 	quad_switch->set_toggle_mode(true);
+	quad_switch->set_accessibility_name(TTRC("Quad"));
 	vb_shape->add_child(quad_switch);
 	quad_switch->connect(SceneStringName(pressed), callable_mp(this, &MaterialEditor::_on_quad_switch_pressed));
 
@@ -334,6 +337,7 @@ MaterialEditor::MaterialEditor() {
 	light_1_switch->set_theme_type_variation("PreviewLightButton");
 	light_1_switch->set_toggle_mode(true);
 	light_1_switch->set_pressed(true);
+	light_1_switch->set_accessibility_name(TTRC("First Light"));
 	vb_light->add_child(light_1_switch);
 	light_1_switch->connect(SceneStringName(pressed), callable_mp(this, &MaterialEditor::_on_light_1_switch_pressed));
 
@@ -341,6 +345,7 @@ MaterialEditor::MaterialEditor() {
 	light_2_switch->set_theme_type_variation("PreviewLightButton");
 	light_2_switch->set_toggle_mode(true);
 	light_2_switch->set_pressed(true);
+	light_2_switch->set_accessibility_name(TTRC("Second Light"));
 	vb_light->add_child(light_2_switch);
 	light_2_switch->connect(SceneStringName(pressed), callable_mp(this, &MaterialEditor::_on_light_2_switch_pressed));
 
diff --git a/engine/editor/plugins/material_editor_plugin.h b/engine/editor/plugins/material_editor_plugin.h
index f8b2eabb..44e885e4 100644
--- a/engine/editor/plugins/material_editor_plugin.h
+++ b/engine/editor/plugins/material_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATERIAL_EDITOR_PLUGIN_H
-#define MATERIAL_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -207,5 +206,3 @@ public:
 	virtual bool handles(const Ref<Resource> &p_resource) const override;
 	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // MATERIAL_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/mesh_editor_plugin.cpp b/engine/editor/plugins/mesh_editor_plugin.cpp
index 645dd178..92b7f67d 100644
--- a/engine/editor/plugins/mesh_editor_plugin.cpp
+++ b/engine/editor/plugins/mesh_editor_plugin.cpp
@@ -43,7 +43,7 @@ void MeshEditor::gui_input(const Ref<InputEvent> &p_event) {
 		rot_x -= mm->get_relative().y * 0.01;
 		rot_y -= mm->get_relative().x * 0.01;
 
-		rot_x = CLAMP(rot_x, -Math_PI / 2, Math_PI / 2);
+		rot_x = CLAMP(rot_x, -Math::PI / 2, Math::PI / 2);
 		_update_rotation();
 	}
 }
@@ -149,6 +149,7 @@ MeshEditor::MeshEditor() {
 	light_1_switch->set_theme_type_variation("PreviewLightButton");
 	light_1_switch->set_toggle_mode(true);
 	light_1_switch->set_pressed(true);
+	light_1_switch->set_accessibility_name(TTRC("First Light"));
 	vb_light->add_child(light_1_switch);
 	light_1_switch->connect(SceneStringName(pressed), callable_mp(this, &MeshEditor::_on_light_1_switch_pressed));
 
@@ -156,6 +157,7 @@ MeshEditor::MeshEditor() {
 	light_2_switch->set_theme_type_variation("PreviewLightButton");
 	light_2_switch->set_toggle_mode(true);
 	light_2_switch->set_pressed(true);
+	light_2_switch->set_accessibility_name(TTRC("Second Light"));
 	vb_light->add_child(light_2_switch);
 	light_2_switch->connect(SceneStringName(pressed), callable_mp(this, &MeshEditor::_on_light_2_switch_pressed));
 
diff --git a/engine/editor/plugins/mesh_editor_plugin.h b/engine/editor/plugins/mesh_editor_plugin.h
index 03db4978..36ec6cd4 100644
--- a/engine/editor/plugins/mesh_editor_plugin.h
+++ b/engine/editor/plugins/mesh_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_EDITOR_PLUGIN_H
-#define MESH_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -96,5 +95,3 @@ public:
 
 	MeshEditorPlugin();
 };
-
-#endif // MESH_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/mesh_instance_3d_editor_plugin.cpp b/engine/editor/plugins/mesh_instance_3d_editor_plugin.cpp
index 58e9e168..f975fd6e 100644
--- a/engine/editor/plugins/mesh_instance_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/mesh_instance_3d_editor_plugin.cpp
@@ -36,7 +36,7 @@
 #include "editor/multi_node_edit.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
 #include "scene/gui/aspect_ratio_container.h"
@@ -133,7 +133,7 @@ void MeshInstance3DEditor::_create_collision_shape() {
 			break;
 	}
 
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	bool verbose = false;
 	if (selection.is_empty()) {
@@ -394,7 +394,7 @@ void MeshInstance3DEditor::_create_uv_lines(int p_layer) {
 		Array a = mesh->surface_get_arrays(i);
 
 		Vector<Vector2> uv = a[p_layer == 0 ? Mesh::ARRAY_TEX_UV : Mesh::ARRAY_TEX_UV2];
-		if (uv.size() == 0) {
+		if (uv.is_empty()) {
 			err_dialog->set_text(vformat(TTR("Mesh has no UV in layer %d."), p_layer + 1));
 			err_dialog->popup_centered();
 			return;
@@ -440,7 +440,7 @@ void MeshInstance3DEditor::_create_uv_lines(int p_layer) {
 }
 
 void MeshInstance3DEditor::_debug_uv_draw() {
-	if (uv_lines.size() == 0) {
+	if (uv_lines.is_empty()) {
 		return;
 	}
 
@@ -569,6 +569,8 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 	options = memnew(MenuButton);
 	options->set_text(TTR("Mesh"));
 	options->set_switch_on_hover(true);
+	options->set_flat(false);
+	options->set_theme_type_variation("FlatMenuButton");
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->get_popup()->add_item(TTR("Create Collision Shape..."), MENU_OPTION_CREATE_COLLISION_SHAPE);
@@ -593,6 +595,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 	//outline_dialog->set_child_rect(outline_dialog_vbc);
 
 	outline_size = memnew(SpinBox);
+	outline_size->set_accessibility_name(TTRC("Outline Size"));
 	outline_size->set_min(0.001);
 	outline_size->set_max(1024);
 	outline_size->set_step(0.001);
@@ -610,10 +613,11 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 	shape_dialog->add_child(shape_dialog_vbc);
 
 	Label *l = memnew(Label);
-	l->set_text(TTR("Collision Shape placement"));
+	l->set_text(TTR("Collision Shape Placement"));
 	shape_dialog_vbc->add_child(l);
 
 	shape_placement = memnew(OptionButton);
+	shape_placement->set_accessibility_name(TTRC("Collision Shape Placement"));
 	shape_placement->set_h_size_flags(SIZE_EXPAND_FILL);
 	shape_placement->add_item(TTR("Sibling"), SHAPE_PLACEMENT_SIBLING);
 	shape_placement->set_item_tooltip(-1, TTR("Creates collision shapes as Sibling."));
@@ -626,6 +630,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() {
 	shape_dialog_vbc->add_child(l);
 
 	shape_type = memnew(OptionButton);
+	shape_type->set_accessibility_name(TTRC("Collision Shape Type"));
 	shape_type->set_h_size_flags(SIZE_EXPAND_FILL);
 	shape_type->add_item(TTR("Trimesh"), SHAPE_TYPE_TRIMESH);
 	shape_type->set_item_tooltip(-1, TTR("Creates a polygon-based collision shape.\nThis is the most accurate (but slowest) option for collision detection."));
@@ -730,6 +735,3 @@ MeshInstance3DEditorPlugin::MeshInstance3DEditorPlugin() {
 
 	mesh_editor->options->hide();
 }
-
-MeshInstance3DEditorPlugin::~MeshInstance3DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/mesh_instance_3d_editor_plugin.h b/engine/editor/plugins/mesh_instance_3d_editor_plugin.h
index 2744c98a..a5ee3c66 100644
--- a/engine/editor/plugins/mesh_instance_3d_editor_plugin.h
+++ b/engine/editor/plugins/mesh_instance_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_INSTANCE_3D_EDITOR_PLUGIN_H
-#define MESH_INSTANCE_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
@@ -120,7 +119,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	MeshInstance3DEditorPlugin();
-	~MeshInstance3DEditorPlugin();
 };
-
-#endif // MESH_INSTANCE_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/mesh_library_editor_plugin.cpp b/engine/editor/plugins/mesh_library_editor_plugin.cpp
index e3a66180..7c997787 100644
--- a/engine/editor/plugins/mesh_library_editor_plugin.cpp
+++ b/engine/editor/plugins/mesh_library_editor_plugin.cpp
@@ -39,7 +39,7 @@
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "main/main.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
 #include "scene/gui/menu_button.h"
 #include "scene/resources/packed_scene.h"
@@ -239,7 +239,7 @@ void MeshLibraryEditor::_menu_cbk(int p_option) {
 		case MENU_OPTION_REMOVE_ITEM: {
 			String p = InspectorDock::get_inspector_singleton()->get_selected_path();
 			if (p.begins_with("item") && p.get_slice_count("/") >= 2) {
-				to_erase = p.get_slice("/", 1).to_int();
+				to_erase = p.get_slicec('/', 1).to_int();
 				cd_remove->set_text(vformat(TTR("Remove item %d?"), to_erase));
 				cd_remove->popup_centered(Size2(300, 60));
 			}
@@ -278,6 +278,8 @@ MeshLibraryEditor::MeshLibraryEditor() {
 	menu->set_position(Point2(1, 1));
 	menu->set_text(TTR("MeshLibrary"));
 	menu->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MeshLibrary"), EditorStringName(EditorIcons)));
+	menu->set_flat(false);
+	menu->set_theme_type_variation("FlatMenuButton");
 	menu->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM);
 	menu->get_popup()->add_item(TTR("Remove Selected Item"), MENU_OPTION_REMOVE_ITEM);
 	menu->get_popup()->add_separator();
diff --git a/engine/editor/plugins/mesh_library_editor_plugin.h b/engine/editor/plugins/mesh_library_editor_plugin.h
index eacfebc5..91756e3d 100644
--- a/engine/editor/plugins/mesh_library_editor_plugin.h
+++ b/engine/editor/plugins/mesh_library_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_LIBRARY_EDITOR_PLUGIN_H
-#define MESH_LIBRARY_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/resources/3d/mesh_library.h"
@@ -91,5 +90,3 @@ public:
 
 	MeshLibraryEditorPlugin();
 };
-
-#endif // MESH_LIBRARY_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/multimesh_editor_plugin.cpp b/engine/editor/plugins/multimesh_editor_plugin.cpp
index efc65bae..681e2f8d 100644
--- a/engine/editor/plugins/multimesh_editor_plugin.cpp
+++ b/engine/editor/plugins/multimesh_editor_plugin.cpp
@@ -120,7 +120,7 @@ void MultiMeshEditor::_populate() {
 
 	Vector<Face3> geometry = ss_instance->get_mesh()->get_faces();
 
-	if (geometry.size() == 0) {
+	if (geometry.is_empty()) {
 		err_dialog->set_text(TTR("Surface source is invalid (no faces)."));
 		err_dialog->popup_centered();
 		return;
@@ -174,10 +174,10 @@ void MultiMeshEditor::_populate() {
 
 	Transform3D axis_xform;
 	if (axis == Vector3::AXIS_Z) {
-		axis_xform.rotate(Vector3(1, 0, 0), -Math_PI * 0.5);
+		axis_xform.rotate(Vector3(1, 0, 0), -Math::PI * 0.5);
 	}
 	if (axis == Vector3::AXIS_X) {
-		axis_xform.rotate(Vector3(0, 0, 1), -Math_PI * 0.5);
+		axis_xform.rotate(Vector3(0, 0, 1), -Math::PI * 0.5);
 	}
 
 	for (int i = 0; i < instance_count; i++) {
@@ -203,9 +203,9 @@ void MultiMeshEditor::_populate() {
 
 		Basis post_xform;
 
-		post_xform.rotate(xform.basis.get_column(1), -Math::random(-_rotate_random, _rotate_random) * Math_PI);
-		post_xform.rotate(xform.basis.get_column(2), -Math::random(-_tilt_random, _tilt_random) * Math_PI);
-		post_xform.rotate(xform.basis.get_column(0), -Math::random(-_tilt_random, _tilt_random) * Math_PI);
+		post_xform.rotate(xform.basis.get_column(1), -Math::random(-_rotate_random, _rotate_random) * Math::PI);
+		post_xform.rotate(xform.basis.get_column(2), -Math::random(-_tilt_random, _tilt_random) * Math::PI);
+		post_xform.rotate(xform.basis.get_column(0), -Math::random(-_tilt_random, _tilt_random) * Math::PI);
 
 		xform.basis = post_xform * xform.basis;
 		//xform.basis.orthonormalize();
@@ -273,6 +273,8 @@ MultiMeshEditor::MultiMeshEditor() {
 
 	options->set_text("MultiMesh");
 	options->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MultiMeshInstance3D"), EditorStringName(EditorIcons)));
+	options->set_flat(false);
+	options->set_theme_type_variation("FlatMenuButton");
 
 	options->get_popup()->add_item(TTR("Populate Surface"));
 	options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &MultiMeshEditor::_menu_option));
@@ -290,8 +292,10 @@ MultiMeshEditor::MultiMeshEditor() {
 	surface_source = memnew(LineEdit);
 	hbc->add_child(surface_source);
 	surface_source->set_h_size_flags(SIZE_EXPAND_FILL);
+	surface_source->set_accessibility_name(TTRC("Surface Source"));
 	Button *b = memnew(Button);
 	hbc->add_child(b);
+	b->set_accessibility_name(TTRC("Browse"));
 	b->set_text("..");
 	b->connect(SceneStringName(pressed), callable_mp(this, &MultiMeshEditor::_browse).bind(false));
 
@@ -301,13 +305,16 @@ MultiMeshEditor::MultiMeshEditor() {
 	mesh_source = memnew(LineEdit);
 	hbc->add_child(mesh_source);
 	mesh_source->set_h_size_flags(SIZE_EXPAND_FILL);
+	mesh_source->set_accessibility_name(TTRC("Mesh Source"));
 	b = memnew(Button);
 	hbc->add_child(b);
+	b->set_accessibility_name(TTRC("Browse"));
 	b->set_text("..");
 	vbc->add_margin_child(TTR("Source Mesh:"), hbc);
 	b->connect(SceneStringName(pressed), callable_mp(this, &MultiMeshEditor::_browse).bind(true));
 
 	populate_axis = memnew(OptionButton);
+	populate_axis->set_accessibility_name(TTRC("Up Axis"));
 	populate_axis->add_item(TTR("X-Axis"));
 	populate_axis->add_item(TTR("Y-Axis"));
 	populate_axis->add_item(TTR("Z-Axis"));
@@ -317,11 +324,13 @@ MultiMeshEditor::MultiMeshEditor() {
 	populate_rotate_random = memnew(HSlider);
 	populate_rotate_random->set_max(1);
 	populate_rotate_random->set_step(0.01);
+	populate_rotate_random->set_accessibility_name(TTRC("Random Rotation"));
 	vbc->add_margin_child(TTR("Random Rotation:"), populate_rotate_random);
 
 	populate_tilt_random = memnew(HSlider);
 	populate_tilt_random->set_max(1);
 	populate_tilt_random->set_step(0.01);
+	populate_tilt_random->set_accessibility_name(TTRC("Random Tilt"));
 	vbc->add_margin_child(TTR("Random Tilt:"), populate_tilt_random);
 
 	populate_scale_random = memnew(SpinBox);
@@ -329,7 +338,7 @@ MultiMeshEditor::MultiMeshEditor() {
 	populate_scale_random->set_max(1);
 	populate_scale_random->set_value(0);
 	populate_scale_random->set_step(0.01);
-
+	populate_scale_random->set_accessibility_name(TTRC("Random Scale"));
 	vbc->add_margin_child(TTR("Random Scale:"), populate_scale_random);
 
 	populate_scale = memnew(SpinBox);
@@ -337,7 +346,7 @@ MultiMeshEditor::MultiMeshEditor() {
 	populate_scale->set_max(4096);
 	populate_scale->set_value(1);
 	populate_scale->set_step(0.01);
-
+	populate_scale->set_accessibility_name(TTRC("Scale"));
 	vbc->add_margin_child(TTR("Scale:"), populate_scale);
 
 	populate_amount = memnew(SpinBox);
@@ -347,6 +356,7 @@ MultiMeshEditor::MultiMeshEditor() {
 	populate_amount->set_min(1);
 	populate_amount->set_max(65536);
 	populate_amount->set_value(128);
+	populate_amount->set_accessibility_name(TTRC("Amount"));
 	vbc->add_margin_child(TTR("Amount:"), populate_amount);
 
 	populate_dialog->set_ok_button_text(TTR("Populate"));
@@ -388,6 +398,3 @@ MultiMeshEditorPlugin::MultiMeshEditorPlugin() {
 
 	multimesh_editor->options->hide();
 }
-
-MultiMeshEditorPlugin::~MultiMeshEditorPlugin() {
-}
diff --git a/engine/editor/plugins/multimesh_editor_plugin.h b/engine/editor/plugins/multimesh_editor_plugin.h
index af83d5fb..b1ec83ff 100644
--- a/engine/editor/plugins/multimesh_editor_plugin.h
+++ b/engine/editor/plugins/multimesh_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIMESH_EDITOR_PLUGIN_H
-#define MULTIMESH_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/multimesh_instance_3d.h"
@@ -98,7 +97,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	MultiMeshEditorPlugin();
-	~MultiMeshEditorPlugin();
 };
-
-#endif // MULTIMESH_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/navigation_link_2d_editor_plugin.h b/engine/editor/plugins/navigation_link_2d_editor_plugin.h
index d4032590..d9715a71 100644
--- a/engine/editor/plugins/navigation_link_2d_editor_plugin.h
+++ b/engine/editor/plugins/navigation_link_2d_editor_plugin.h
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_LINK_2D_EDITOR_PLUGIN_H
-#define NAVIGATION_LINK_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
-#include "scene/2d/navigation_link_2d.h"
+#include "scene/2d/navigation/navigation_link_2d.h"
 
 class CanvasItemEditor;
 
@@ -75,5 +74,3 @@ public:
 
 	NavigationLink2DEditorPlugin();
 };
-
-#endif // NAVIGATION_LINK_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp b/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp
index 58af08c8..3d04b766 100644
--- a/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.cpp
@@ -66,8 +66,6 @@ void NavigationObstacle2DEditor::_action_set_polygon(int p_idx, const Variant &p
 	undo_redo->add_undo_method(node, "set_vertices", node->get_vertices());
 }
 
-NavigationObstacle2DEditor::NavigationObstacle2DEditor() {}
-
 NavigationObstacle2DEditorPlugin::NavigationObstacle2DEditorPlugin() :
 		AbstractPolygon2DEditorPlugin(memnew(NavigationObstacle2DEditor), "NavigationObstacle2D") {
 }
diff --git a/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.h b/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.h
index ae5b3a05..62f55205 100644
--- a/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.h
+++ b/engine/editor/plugins/navigation_obstacle_2d_editor_plugin.h
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_OBSTACLE_2D_EDITOR_PLUGIN_H
-#define NAVIGATION_OBSTACLE_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
-#include "scene/2d/navigation_obstacle_2d.h"
+#include "scene/2d/navigation/navigation_obstacle_2d.h"
 
 class NavigationObstacle2DEditor : public AbstractPolygon2DEditor {
 	GDCLASS(NavigationObstacle2DEditor, AbstractPolygon2DEditor);
@@ -49,9 +48,6 @@ protected:
 	virtual void _action_add_polygon(const Variant &p_polygon) override;
 	virtual void _action_remove_polygon(int p_idx) override;
 	virtual void _action_set_polygon(int p_idx, const Variant &p_previous, const Variant &p_polygon) override;
-
-public:
-	NavigationObstacle2DEditor();
 };
 
 class NavigationObstacle2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
@@ -60,5 +56,3 @@ class NavigationObstacle2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
 public:
 	NavigationObstacle2DEditorPlugin();
 };
-
-#endif // NAVIGATION_OBSTACLE_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp b/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp
index f82e320d..48df1eb1 100644
--- a/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.cpp
@@ -36,7 +36,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/plugins/node_3d_editor_plugin.h"
-#include "scene/3d/navigation_obstacle_3d.h"
+#include "scene/3d/navigation/navigation_obstacle_3d.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
 #include "servers/navigation_server_3d.h"
@@ -466,13 +466,11 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
 						Vector2 closest_edge_point;
 						real_t closest_dist = 1e10;
 						for (int i = 0; i < obstacle_vertices.size(); i++) {
-							Vector2 points[2] = {
-								p_camera->unproject_position(gt.xform(obstacle_vertices[i])),
-								p_camera->unproject_position(gt.xform(obstacle_vertices[(i + 1) % obstacle_vertices.size()]))
-							};
+							const Vector2 a = p_camera->unproject_position(gt.xform(obstacle_vertices[i]));
+							const Vector2 b = p_camera->unproject_position(gt.xform(obstacle_vertices[(i + 1) % obstacle_vertices.size()]));
 
-							Vector2 cp = Geometry2D::get_closest_point_to_segment(mouse_position, points);
-							if (cp.distance_squared_to(points[0]) < grab_threshold || cp.distance_squared_to(points[1]) < grab_threshold) {
+							Vector2 cp = Geometry2D::get_closest_point_to_segment(mouse_position, a, b);
+							if (cp.distance_squared_to(a) < grab_threshold || cp.distance_squared_to(b) < grab_threshold) {
 								continue; // Skip edge as clicked point is too close to existing vertex.
 							}
 
@@ -548,13 +546,11 @@ EditorPlugin::AfterGUIInput NavigationObstacle3DEditorPlugin::forward_3d_gui_inp
 							Vector2 closest_pos;
 							real_t closest_dist = 1e10;
 							for (int i = 0; i < obstacle_vertices.size(); i++) {
-								Vector2 points[2] = {
-									p_camera->unproject_position(gt.xform(obstacle_vertices[i])),
-									p_camera->unproject_position(gt.xform(obstacle_vertices[(i + 1) % obstacle_vertices.size()]))
-								};
+								const Vector2 a = p_camera->unproject_position(gt.xform(obstacle_vertices[i]));
+								const Vector2 b = p_camera->unproject_position(gt.xform(obstacle_vertices[(i + 1) % obstacle_vertices.size()]));
 
-								Vector2 cp = Geometry2D::get_closest_point_to_segment(mouse_position, points);
-								if (cp.distance_squared_to(points[0]) < CMP_EPSILON2 || cp.distance_squared_to(points[1]) < CMP_EPSILON2) {
+								Vector2 cp = Geometry2D::get_closest_point_to_segment(mouse_position, a, b);
+								if (cp.distance_squared_to(a) < CMP_EPSILON2 || cp.distance_squared_to(b) < CMP_EPSILON2) {
 									continue; //not valid to reuse point
 								}
 
@@ -834,12 +830,14 @@ NavigationObstacle3DEditorPlugin::NavigationObstacle3DEditorPlugin() {
 	button_create->set_theme_type_variation(SceneStringName(FlatButton));
 	obstacle_editor->add_child(button_create);
 	button_create->set_tooltip_text(TTR("Add Vertex"));
+	button_create->set_accessibility_name(TTRC("Add Vertex"));
 	button_create->connect(SceneStringName(pressed), callable_mp(this, &NavigationObstacle3DEditorPlugin::set_mode).bind(NavigationObstacle3DEditorPlugin::MODE_CREATE));
 	button_create->set_toggle_mode(true);
 	button_create->set_button_group(bg);
 
 	button_edit = memnew(Button);
 	button_edit->set_theme_type_variation(SceneStringName(FlatButton));
+	button_edit->set_accessibility_name(TTRC("Edit"));
 	obstacle_editor->add_child(button_edit);
 	button_edit->connect(SceneStringName(pressed), callable_mp(this, &NavigationObstacle3DEditorPlugin::set_mode).bind(NavigationObstacle3DEditorPlugin::MODE_EDIT));
 	button_edit->set_toggle_mode(true);
@@ -847,6 +845,7 @@ NavigationObstacle3DEditorPlugin::NavigationObstacle3DEditorPlugin() {
 
 	button_delete = memnew(Button);
 	button_delete->set_theme_type_variation(SceneStringName(FlatButton));
+	button_delete->set_accessibility_name(TTRC("Delete"));
 	obstacle_editor->add_child(button_delete);
 	button_delete->connect(SceneStringName(pressed), callable_mp(this, &NavigationObstacle3DEditorPlugin::set_mode).bind(NavigationObstacle3DEditorPlugin::MODE_DELETE));
 	button_delete->set_toggle_mode(true);
@@ -854,12 +853,14 @@ NavigationObstacle3DEditorPlugin::NavigationObstacle3DEditorPlugin() {
 
 	button_flip = memnew(Button);
 	button_flip->set_theme_type_variation(SceneStringName(FlatButton));
+	button_flip->set_accessibility_name(TTRC("Flip"));
 	obstacle_editor->add_child(button_flip);
 	button_flip->connect(SceneStringName(pressed), callable_mp(this, &NavigationObstacle3DEditorPlugin::set_mode).bind(NavigationObstacle3DEditorPlugin::ACTION_FLIP));
 	button_flip->set_toggle_mode(true);
 
 	button_clear = memnew(Button);
 	button_clear->set_theme_type_variation(SceneStringName(FlatButton));
+	button_clear->set_accessibility_name(TTRC("Clear"));
 	obstacle_editor->add_child(button_clear);
 	button_clear->connect(SceneStringName(pressed), callable_mp(this, &NavigationObstacle3DEditorPlugin::set_mode).bind(NavigationObstacle3DEditorPlugin::ACTION_CLEAR));
 	button_clear->set_toggle_mode(true);
diff --git a/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.h b/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.h
index 86f7f2d9..f00c97ef 100644
--- a/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.h
+++ b/engine/editor/plugins/navigation_obstacle_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_OBSTACLE_3D_EDITOR_PLUGIN_H
-#define NAVIGATION_OBSTACLE_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
@@ -133,5 +132,3 @@ public:
 	NavigationObstacle3DEditorPlugin();
 	~NavigationObstacle3DEditorPlugin();
 };
-
-#endif // NAVIGATION_OBSTACLE_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/navigation_polygon_editor_plugin.cpp b/engine/editor/plugins/navigation_polygon_editor_plugin.cpp
index 5368e1ab..777eb7ae 100644
--- a/engine/editor/plugins/navigation_polygon_editor_plugin.cpp
+++ b/engine/editor/plugins/navigation_polygon_editor_plugin.cpp
@@ -33,7 +33,7 @@
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
-#include "scene/2d/navigation_region_2d.h"
+#include "scene/2d/navigation/navigation_region_2d.h"
 #include "scene/gui/dialogs.h"
 
 Ref<NavigationPolygon> NavigationPolygonEditor::_ensure_navpoly() const {
diff --git a/engine/editor/plugins/navigation_polygon_editor_plugin.h b/engine/editor/plugins/navigation_polygon_editor_plugin.h
index 4d6d245c..13754203 100644
--- a/engine/editor/plugins/navigation_polygon_editor_plugin.h
+++ b/engine/editor/plugins/navigation_polygon_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_POLYGON_EDITOR_PLUGIN_H
-#define NAVIGATION_POLYGON_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
 
@@ -94,5 +93,3 @@ class NavigationPolygonEditorPlugin : public AbstractPolygon2DEditorPlugin {
 public:
 	NavigationPolygonEditorPlugin();
 };
-
-#endif // NAVIGATION_POLYGON_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/node_3d_editor_gizmos.cpp b/engine/editor/plugins/node_3d_editor_gizmos.cpp
index 0b56e8ba..f4554685 100644
--- a/engine/editor/plugins/node_3d_editor_gizmos.cpp
+++ b/engine/editor/plugins/node_3d_editor_gizmos.cpp
@@ -67,7 +67,7 @@ void EditorNode3DGizmo::clear() {
 
 	billboard_handle = false;
 	collision_segments.clear();
-	collision_mesh = Ref<TriangleMesh>();
+	collision_meshes.clear();
 	instances.clear();
 	handles.clear();
 	handle_ids.clear();
@@ -259,11 +259,15 @@ void EditorNode3DGizmo::_update_bvh() {
 		aabb.expand_to(transform.xform(segment_end));
 	}
 
-	if (collision_mesh.is_valid()) {
-		for (const Face3 &face : collision_mesh->get_faces()) {
-			aabb.expand_to(transform.xform(face.vertex[0]));
-			aabb.expand_to(transform.xform(face.vertex[1]));
-			aabb.expand_to(transform.xform(face.vertex[2]));
+	if (!collision_meshes.is_empty()) {
+		for (Ref<TriangleMesh> collision_mesh : collision_meshes) {
+			if (collision_mesh.is_valid()) {
+				for (const Face3 &face : collision_mesh->get_faces()) {
+					aabb.expand_to(transform.xform(face.vertex[0]));
+					aabb.expand_to(transform.xform(face.vertex[1]));
+					aabb.expand_to(transform.xform(face.vertex[2]));
+				}
+			}
 		}
 	}
 
@@ -384,7 +388,7 @@ void EditorNode3DGizmo::add_unscaled_billboard(const Ref<Material> &p_material,
 }
 
 void EditorNode3DGizmo::add_collision_triangles(const Ref<TriangleMesh> &p_tmesh) {
-	collision_mesh = p_tmesh;
+	collision_meshes.push_back(p_tmesh);
 }
 
 void EditorNode3DGizmo::add_collision_segments(const Vector<Vector3> &p_lines) {
@@ -482,10 +486,10 @@ void EditorNode3DGizmo::add_handles(const Vector<Vector3> &p_handles, const Ref<
 void EditorNode3DGizmo::add_solid_box(const Ref<Material> &p_material, Vector3 p_size, Vector3 p_position, const Transform3D &p_xform) {
 	ERR_FAIL_NULL(spatial_node);
 
-	BoxMesh box_mesh;
-	box_mesh.set_size(p_size);
+	Array arrays;
+	arrays.resize(RS::ARRAY_MAX);
+	BoxMesh::create_mesh_array(arrays, p_size);
 
-	Array arrays = box_mesh.surface_get_arrays(0);
 	PackedVector3Array vertex = arrays[RS::ARRAY_VERTEX];
 	Vector3 *w = vertex.ptrw();
 
@@ -495,8 +499,9 @@ void EditorNode3DGizmo::add_solid_box(const Ref<Material> &p_material, Vector3 p
 
 	arrays[RS::ARRAY_VERTEX] = vertex;
 
-	Ref<ArrayMesh> m = memnew(ArrayMesh);
-	m->add_surface_from_arrays(box_mesh.surface_get_primitive_type(0), arrays);
+	Ref<ArrayMesh> m;
+	m.instantiate();
+	m->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, arrays);
 	add_mesh(m, p_material, p_xform);
 }
 
@@ -553,7 +558,7 @@ bool EditorNode3DGizmo::intersect_frustum(const Camera3D *p_camera, const Vector
 		}
 	}
 
-	if (collision_mesh.is_valid()) {
+	if (!collision_meshes.is_empty()) {
 		Transform3D t = spatial_node->get_global_transform();
 
 		Vector3 mesh_scale = t.get_basis().get_scale();
@@ -570,8 +575,13 @@ bool EditorNode3DGizmo::intersect_frustum(const Camera3D *p_camera, const Vector
 		}
 
 		Vector<Vector3> convex_points = Geometry3D::compute_convex_mesh_points(transformed_frustum.ptr(), plane_count);
-		if (collision_mesh->inside_convex_shape(transformed_frustum.ptr(), plane_count, convex_points.ptr(), convex_points.size(), mesh_scale)) {
-			return true;
+
+		for (Ref<TriangleMesh> collision_mesh : collision_meshes) {
+			if (collision_mesh.is_valid()) {
+				if (collision_mesh->inside_convex_shape(transformed_frustum.ptr(), plane_count, convex_points.ptr(), convex_points.size(), mesh_scale)) {
+					return true;
+				}
+			}
 		}
 	}
 
@@ -668,7 +678,7 @@ bool EditorNode3DGizmo::intersect_ray(Camera3D *p_camera, const Point2 &p_point,
 		Transform3D orig_camera_transform = p_camera->get_camera_transform();
 
 		if (!orig_camera_transform.origin.is_equal_approx(t.origin) &&
-				ABS(orig_camera_transform.basis.get_column(Vector3::AXIS_Z).dot(Vector3(0, 1, 0))) < 0.99) {
+				Math::abs(orig_camera_transform.basis.get_column(Vector3::AXIS_Z).dot(Vector3(0, 1, 0))) < 0.99) {
 			p_camera->look_at(t.origin);
 		}
 
@@ -705,21 +715,20 @@ bool EditorNode3DGizmo::intersect_ray(Camera3D *p_camera, const Point2 &p_point,
 		float cpd = 1e20;
 
 		for (int i = 0; i < vc / 2; i++) {
-			Vector3 a = t.xform(vptr[i * 2 + 0]);
-			Vector3 b = t.xform(vptr[i * 2 + 1]);
-			Vector2 s[2];
-			s[0] = p_camera->unproject_position(a);
-			s[1] = p_camera->unproject_position(b);
+			const Vector3 a = t.xform(vptr[i * 2 + 0]);
+			const Vector3 b = t.xform(vptr[i * 2 + 1]);
+			const Vector2 segment_a = p_camera->unproject_position(a);
+			const Vector2 segment_b = p_camera->unproject_position(b);
 
-			Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, s);
+			Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, segment_a, segment_b);
 
 			float pd = p.distance_to(p_point);
 
 			if (pd < cpd) {
-				float d = s[0].distance_to(s[1]);
+				float d = segment_a.distance_to(segment_b);
 				Vector3 tcp;
 				if (d > 0) {
-					float d2 = s[0].distance_to(p) / d;
+					float d2 = segment_a.distance_to(p) / d;
 					tcp = a + (b - a) * d2;
 
 				} else {
@@ -741,7 +750,7 @@ bool EditorNode3DGizmo::intersect_ray(Camera3D *p_camera, const Point2 &p_point,
 		}
 	}
 
-	if (collision_mesh.is_valid()) {
+	if (!collision_meshes.is_empty()) {
 		Transform3D gt = spatial_node->get_global_transform();
 
 		if (billboard_handle) {
@@ -753,10 +762,14 @@ bool EditorNode3DGizmo::intersect_ray(Camera3D *p_camera, const Point2 &p_point,
 		Vector3 ray_dir = ai.basis.xform(p_camera->project_ray_normal(p_point)).normalized();
 		Vector3 rpos, rnorm;
 
-		if (collision_mesh->intersect_ray(ray_from, ray_dir, rpos, rnorm)) {
-			r_pos = gt.xform(rpos);
-			r_normal = gt.basis.xform(rnorm).normalized();
-			return true;
+		for (Ref<TriangleMesh> collision_mesh : collision_meshes) {
+			if (collision_mesh.is_valid()) {
+				if (collision_mesh->intersect_ray(ray_from, ray_dir, rpos, rnorm)) {
+					r_pos = gt.xform(rpos);
+					r_normal = gt.basis.xform(rnorm).normalized();
+					return true;
+				}
+			}
 		}
 	}
 
diff --git a/engine/editor/plugins/node_3d_editor_gizmos.h b/engine/editor/plugins/node_3d_editor_gizmos.h
index c895b966..4a8165b0 100644
--- a/engine/editor/plugins/node_3d_editor_gizmos.h
+++ b/engine/editor/plugins/node_3d_editor_gizmos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NODE_3D_EDITOR_GIZMOS_H
-#define NODE_3D_EDITOR_GIZMOS_H
+#pragma once
 
 #include "core/math/dynamic_bvh.h"
 #include "core/templates/hash_map.h"
@@ -57,7 +56,7 @@ class EditorNode3DGizmo : public Node3DGizmo {
 	bool selected;
 
 	Vector<Vector3> collision_segments;
-	Ref<TriangleMesh> collision_mesh;
+	LocalVector<Ref<TriangleMesh>> collision_meshes;
 
 	Vector<Vector3> handles;
 	Vector<int> handle_ids;
@@ -221,5 +220,3 @@ public:
 	EditorNode3DGizmoPlugin();
 	virtual ~EditorNode3DGizmoPlugin();
 };
-
-#endif // NODE_3D_EDITOR_GIZMOS_H
diff --git a/engine/editor/plugins/node_3d_editor_plugin.cpp b/engine/editor/plugins/node_3d_editor_plugin.cpp
index 058adbdb..3e5c82e1 100644
--- a/engine/editor/plugins/node_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/node_3d_editor_plugin.cpp
@@ -662,10 +662,10 @@ int Node3DEditorViewport::get_selected_count() const {
 }
 
 void Node3DEditorViewport::cancel_transform() {
-	List<Node *> &selection = editor_selection->get_selected_node_list();
+	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
-	for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
-		Node3D *sp = Object::cast_to<Node3D>(E->get());
+	for (Node *E : selection) {
+		Node3D *sp = Object::cast_to<Node3D>(E);
 		if (!sp) {
 			continue;
 		}
@@ -696,7 +696,7 @@ void Node3DEditorViewport::cancel_transform() {
 }
 
 void Node3DEditorViewport::_update_shrink() {
-	bool shrink = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION));
+	bool shrink = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION));
 	subviewport_container->set_stretch_shrink(shrink ? 2 : 1);
 	subviewport_container->set_texture_filter(shrink ? TEXTURE_FILTER_NEAREST : TEXTURE_FILTER_PARENT_NODE);
 }
@@ -758,7 +758,7 @@ void Node3DEditorViewport::_clear_selected() {
 }
 
 void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
-	Node *node = Object::cast_to<Node3D>(ObjectDB::get_instance(clicked));
+	Node *node = ObjectDB::get_instance<Node3D>(clicked);
 	Node3D *selected = Object::cast_to<Node3D>(node);
 	clicked = ObjectID();
 
@@ -791,8 +791,13 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
 
 	if (p_allow_locked || (selected != nullptr && !_is_node_locked(selected))) {
 		if (clicked_wants_append) {
+			const List<Node *> &top_node_list = editor_selection->get_top_selected_node_list();
+			const Node *active_node = top_node_list.is_empty() ? nullptr : top_node_list.back()->get();
 			if (editor_selection->is_selected(selected)) {
 				editor_selection->remove_node(selected);
+				if (selected != active_node) {
+					editor_selection->add_node(selected);
+				}
 			} else {
 				editor_selection->add_node(selected);
 			}
@@ -804,8 +809,9 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
 			}
 		}
 
-		if (editor_selection->get_selected_node_list().size() == 1) {
-			EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list().front()->get());
+		const List<Node *> &top_node_list = editor_selection->get_top_selected_node_list();
+		if (top_node_list.size() == 1) {
+			EditorNode::get_singleton()->edit_node(top_node_list.front()->get());
 		}
 	}
 }
@@ -1135,8 +1141,9 @@ void Node3DEditorViewport::_select_region() {
 		}
 	}
 
-	if (editor_selection->get_selected_node_list().size() == 1) {
-		EditorNode::get_singleton()->edit_node(editor_selection->get_selected_node_list().front()->get());
+	const List<Node *> &top_node_list = editor_selection->get_top_selected_node_list();
+	if (top_node_list.size() == 1) {
+		EditorNode::get_singleton()->edit_node(top_node_list.front()->get());
 	}
 }
 
@@ -1200,8 +1207,8 @@ void Node3DEditorViewport::_update_name() {
 		name += " " + TTR("[auto]");
 	}
 
-	view_menu->set_text(name);
-	view_menu->reset_size();
+	view_display_menu->set_text(name);
+	view_display_menu->reset_size();
 }
 
 void Node3DEditorViewport::_compute_edit(const Point2 &p_point) {
@@ -1223,10 +1230,10 @@ void Node3DEditorViewport::_compute_edit(const Point2 &p_point) {
 		se->original_local = selected->get_transform();
 		se->original = selected->get_global_transform();
 	} else {
-		List<Node *> &selection = editor_selection->get_selected_node_list();
+		const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
-		for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
-			Node3D *sp = Object::cast_to<Node3D>(E->get());
+		for (Node *E : selection) {
+			Node3D *sp = Object::cast_to<Node3D>(E);
 			if (!sp) {
 				continue;
 			}
@@ -1569,11 +1576,11 @@ void Node3DEditorViewport::_surface_mouse_exit() {
 }
 
 void Node3DEditorViewport::_surface_focus_enter() {
-	view_menu->set_disable_shortcuts(false);
+	view_display_menu->set_disable_shortcuts(false);
 }
 
 void Node3DEditorViewport::_surface_focus_exit() {
-	view_menu->set_disable_shortcuts(true);
+	view_display_menu->set_disable_shortcuts(true);
 }
 
 bool Node3DEditorViewport::_is_node_locked(const Node *p_node) const {
@@ -1852,10 +1859,10 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					bool can_select_gizmos = spatial_editor->get_single_selected_node();
 
 					{
-						int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
-						int idx2 = view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
-						can_select_gizmos = can_select_gizmos && view_menu->get_popup()->is_item_checked(idx);
-						transform_gizmo_visible = view_menu->get_popup()->is_item_checked(idx2);
+						int idx = view_display_menu->get_popup()->get_item_index(VIEW_GIZMOS);
+						int idx2 = view_display_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
+						can_select_gizmos = can_select_gizmos && view_display_menu->get_popup()->is_item_checked(idx);
+						transform_gizmo_visible = view_display_menu->get_popup()->is_item_checked(idx2);
 					}
 
 					// Gizmo handles
@@ -1943,35 +1950,39 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 
 					bool node_selected = get_selected_count() > 0;
 
-					if (node_selected && ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->is_command_or_control_pressed()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE)) {
-						begin_transform(TRANSFORM_ROTATE, false);
-						break;
-					}
-
-					if (node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE) {
-						begin_transform(TRANSFORM_TRANSLATE, false);
-						break;
-					}
-
-					if (node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SCALE) {
-						begin_transform(TRANSFORM_SCALE, false);
-						break;
-					}
-
-					if (after != EditorPlugin::AFTER_GUI_INPUT_CUSTOM) {
+					if (after != EditorPlugin::AFTER_GUI_INPUT_CUSTOM && !b->is_alt_pressed()) {
 						// Single item selection.
 						clicked = _select_ray(b->get_position());
 
-						selection_in_progress = true;
+						if (clicked.is_valid() && !editor_selection->is_selected(ObjectDB::get_instance<Node>(clicked))) {
+							selection_in_progress = true;
+							break;
+						}
 
 						if (clicked.is_null()) {
 							// Default to region select.
 							cursor.region_select = true;
 							cursor.region_begin = b->get_position();
 							cursor.region_end = b->get_position();
+							break;
 						}
 					}
 
+					if (!clicked_wants_append && node_selected && ((spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT && b->is_command_or_control_pressed()) || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_ROTATE)) {
+						begin_transform(TRANSFORM_ROTATE, false);
+						break;
+					}
+
+					if (!clicked_wants_append && node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE) {
+						begin_transform(TRANSFORM_TRANSLATE, false);
+						break;
+					}
+
+					if (!clicked_wants_append && node_selected && spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SCALE) {
+						begin_transform(TRANSFORM_SCALE, false);
+						break;
+					}
+
 					surface->queue_redraw();
 				} else {
 					if (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_RULER) {
@@ -2027,7 +2038,6 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 						set_message("");
 						spatial_editor->update_transform_gizmo();
 					}
-					surface->queue_redraw();
 				}
 
 			} break;
@@ -2113,12 +2123,10 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 			} else {
 				const bool movement_threshold_passed = _edit.original_mouse_pos.distance_to(_edit.mouse_pos) > 8 * EDSCALE;
 
-				if (selection_in_progress && movement_threshold_passed && clicked.is_valid()) {
-					if (clicked_wants_append || !editor_selection->is_selected(Object::cast_to<Node>(ObjectDB::get_instance(clicked)))) {
-						cursor.region_select = true;
-						cursor.region_begin = _edit.original_mouse_pos;
-						clicked = ObjectID();
-					}
+				if ((selection_in_progress || clicked_wants_append) && movement_threshold_passed && clicked.is_valid()) {
+					cursor.region_select = true;
+					cursor.region_begin = _edit.original_mouse_pos;
+					clicked = ObjectID();
 				}
 
 				if (cursor.region_select) {
@@ -2127,7 +2135,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					return;
 				}
 
-				if (clicked.is_valid() && movement_threshold_passed) {
+				if (clicked.is_valid() && movement_threshold_passed && (spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == Node3DEditor::TOOL_MODE_MOVE)) {
 					_compute_edit(_edit.original_mouse_pos);
 					clicked = ObjectID();
 					_edit.mode = TRANSFORM_TRANSLATE;
@@ -2137,7 +2145,9 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					return;
 				}
 
-				update_transform(_get_key_modifier(m) == Key::SHIFT);
+				if (!selection_in_progress) {
+					update_transform(_get_key_modifier(m) == Key::SHIFT);
+				}
 			}
 		} else if (m->get_button_mask().has_flag(MouseButtonMask::RIGHT) || freelook_active) {
 			NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_RIGHT_MOUSE, shortcut_check_sets, false);
@@ -2379,28 +2389,28 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_down", p_event)) {
 			// Clamp rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
-			cursor.x_rot = CLAMP(cursor.x_rot - Math_PI / 12.0, -1.57, 1.57);
+			cursor.x_rot = CLAMP(cursor.x_rot - Math::PI / 12.0, -1.57, 1.57);
 			view_type = VIEW_TYPE_USER;
 			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_up", p_event)) {
 			// Clamp rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
-			cursor.x_rot = CLAMP(cursor.x_rot + Math_PI / 12.0, -1.57, 1.57);
+			cursor.x_rot = CLAMP(cursor.x_rot + Math::PI / 12.0, -1.57, 1.57);
 			view_type = VIEW_TYPE_USER;
 			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_right", p_event)) {
-			cursor.y_rot -= Math_PI / 12.0;
+			cursor.y_rot -= Math::PI / 12.0;
 			view_type = VIEW_TYPE_USER;
 			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_left", p_event)) {
-			cursor.y_rot += Math_PI / 12.0;
+			cursor.y_rot += Math::PI / 12.0;
 			view_type = VIEW_TYPE_USER;
 			_update_name();
 		}
 		if (ED_IS_SHORTCUT("spatial_editor/orbit_view_180", p_event)) {
-			cursor.y_rot += Math_PI;
+			cursor.y_rot += Math::PI;
 			view_type = VIEW_TYPE_USER;
 			_update_name();
 		}
@@ -2426,7 +2436,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 				return;
 			}
 
-			List<Node *> &selection = editor_selection->get_selected_node_list();
+			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 			for (Node *E : selection) {
 				Node3D *sp = Object::cast_to<Node3D>(E);
@@ -2467,7 +2477,7 @@ void Node3DEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
 					begin_transform(TRANSFORM_SCALE, true);
 				}
 			}
-			if (ED_IS_SHORTCUT("spatial_editor/collision_reposition", p_event) && editor_selection->get_selected_node_list().size() == 1 && !collision_reposition) {
+			if (ED_IS_SHORTCUT("spatial_editor/collision_reposition", p_event) && editor_selection->get_top_selected_node_list().size() == 1 && !collision_reposition) {
 				if (_edit.mode == TRANSFORM_NONE || _edit.instant) {
 					if (_edit.mode == TRANSFORM_NONE) {
 						_compute_edit(_edit.mouse_pos);
@@ -2913,7 +2923,7 @@ void Node3DEditorViewport::_notification(int p_what) {
 			set_physics_process(vp_visible);
 
 			if (vp_visible) {
-				orthogonal = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL));
+				orthogonal = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL));
 				_update_name();
 				_update_camera(0);
 			} else {
@@ -2997,6 +3007,9 @@ void Node3DEditorViewport::_notification(int p_what) {
 				}
 
 				Transform3D t = sp->get_global_gizmo_transform();
+				if (!t.is_finite()) {
+					continue;
+				}
 				AABB new_aabb = _calculate_spatial_bounds(sp);
 
 				exist = true;
@@ -3049,7 +3062,7 @@ void Node3DEditorViewport::_notification(int p_what) {
 				}
 			}
 
-			bool show_info = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_INFORMATION));
+			bool show_info = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_INFORMATION));
 			if (show_info != info_panel->is_visible()) {
 				info_panel->set_visible(show_info);
 			}
@@ -3083,7 +3096,7 @@ void Node3DEditorViewport::_notification(int p_what) {
 			}
 
 			// FPS Counter.
-			bool show_fps = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_FRAME_TIME));
+			bool show_fps = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_FRAME_TIME));
 
 			if (show_fps != frame_time_panel->is_visible()) {
 				frame_time_panel->set_visible(show_fps);
@@ -3142,7 +3155,7 @@ void Node3DEditorViewport::_notification(int p_what) {
 								Math::remap(fps, 110, 10, 0, 1)));
 			}
 
-			bool show_cinema = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW));
+			bool show_cinema = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW));
 			cinema_label->set_visible(show_cinema);
 			if (show_cinema) {
 				float cinema_half_width = cinema_label->get_size().width / 2.0f;
@@ -3166,7 +3179,7 @@ void Node3DEditorViewport::_notification(int p_what) {
 						selected_node = ruler_start_point;
 					}
 				} else {
-					List<Node *> &selection = editor_selection->get_selected_node_list();
+					const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 					if (selection.size() == 1) {
 						selected_node = Object::cast_to<Node3D>(selection.front()->get());
 					}
@@ -3232,26 +3245,26 @@ void Node3DEditorViewport::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
-			view_menu->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
+			view_display_menu->set_button_icon(get_editor_theme_icon(SNAME("GuiTabMenuHl")));
 			preview_camera->set_button_icon(get_editor_theme_icon(SNAME("Camera3D")));
 			Control *gui_base = EditorNode::get_singleton()->get_gui_base();
 
 			const Ref<StyleBox> &information_3d_stylebox = gui_base->get_theme_stylebox(SNAME("Information3dViewport"), EditorStringName(EditorStyles));
 
-			view_menu->begin_bulk_theme_override();
-			view_menu->add_theme_style_override(CoreStringName(normal), information_3d_stylebox);
-			view_menu->add_theme_style_override("normal_mirrored", information_3d_stylebox);
-			view_menu->add_theme_style_override(SceneStringName(hover), information_3d_stylebox);
-			view_menu->add_theme_style_override("hover_mirrored", information_3d_stylebox);
-			view_menu->add_theme_style_override("hover_pressed", information_3d_stylebox);
-			view_menu->add_theme_style_override("hover_pressed_mirrored", information_3d_stylebox);
-			view_menu->add_theme_style_override(SceneStringName(pressed), information_3d_stylebox);
-			view_menu->add_theme_style_override("pressed_mirrored", information_3d_stylebox);
-			view_menu->add_theme_style_override("focus", information_3d_stylebox);
-			view_menu->add_theme_style_override("focus_mirrored", information_3d_stylebox);
-			view_menu->add_theme_style_override("disabled", information_3d_stylebox);
-			view_menu->add_theme_style_override("disabled_mirrored", information_3d_stylebox);
-			view_menu->end_bulk_theme_override();
+			view_display_menu->begin_bulk_theme_override();
+			view_display_menu->add_theme_style_override(CoreStringName(normal), information_3d_stylebox);
+			view_display_menu->add_theme_style_override("normal_mirrored", information_3d_stylebox);
+			view_display_menu->add_theme_style_override(SceneStringName(hover), information_3d_stylebox);
+			view_display_menu->add_theme_style_override("hover_mirrored", information_3d_stylebox);
+			view_display_menu->add_theme_style_override("hover_pressed", information_3d_stylebox);
+			view_display_menu->add_theme_style_override("hover_pressed_mirrored", information_3d_stylebox);
+			view_display_menu->add_theme_style_override(SceneStringName(pressed), information_3d_stylebox);
+			view_display_menu->add_theme_style_override("pressed_mirrored", information_3d_stylebox);
+			view_display_menu->add_theme_style_override("focus", information_3d_stylebox);
+			view_display_menu->add_theme_style_override("focus_mirrored", information_3d_stylebox);
+			view_display_menu->add_theme_style_override("disabled", information_3d_stylebox);
+			view_display_menu->add_theme_style_override("disabled_mirrored", information_3d_stylebox);
+			view_display_menu->end_bulk_theme_override();
 
 			preview_camera->begin_bulk_theme_override();
 			preview_camera->add_theme_style_override(CoreStringName(normal), information_3d_stylebox);
@@ -3492,7 +3505,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 	switch (p_option) {
 		case VIEW_TOP: {
 			cursor.y_rot = 0;
-			cursor.x_rot = Math_PI / 2.0;
+			cursor.x_rot = Math::PI / 2.0;
 			set_message(TTR("Top View."), 2);
 			view_type = VIEW_TYPE_TOP;
 			_set_auto_orthogonal();
@@ -3501,7 +3514,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 		} break;
 		case VIEW_BOTTOM: {
 			cursor.y_rot = 0;
-			cursor.x_rot = -Math_PI / 2.0;
+			cursor.x_rot = -Math::PI / 2.0;
 			set_message(TTR("Bottom View."), 2);
 			view_type = VIEW_TYPE_BOTTOM;
 			_set_auto_orthogonal();
@@ -3510,7 +3523,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 		} break;
 		case VIEW_LEFT: {
 			cursor.x_rot = 0;
-			cursor.y_rot = Math_PI / 2.0;
+			cursor.y_rot = Math::PI / 2.0;
 			set_message(TTR("Left View."), 2);
 			view_type = VIEW_TYPE_LEFT;
 			_set_auto_orthogonal();
@@ -3519,7 +3532,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 		} break;
 		case VIEW_RIGHT: {
 			cursor.x_rot = 0;
-			cursor.y_rot = -Math_PI / 2.0;
+			cursor.y_rot = -Math::PI / 2.0;
 			set_message(TTR("Right View."), 2);
 			view_type = VIEW_TYPE_RIGHT;
 			_set_auto_orthogonal();
@@ -3537,7 +3550,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 		} break;
 		case VIEW_REAR: {
 			cursor.x_rot = 0;
-			cursor.y_rot = Math_PI;
+			cursor.y_rot = Math::PI;
 			set_message(TTR("Rear View."), 2);
 			view_type = VIEW_TYPE_REAR;
 			_set_auto_orthogonal();
@@ -3559,7 +3572,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 
 			Transform3D camera_transform = camera->get_global_transform();
 
-			List<Node *> &selection = editor_selection->get_selected_node_list();
+			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 			undo_redo->create_action(TTR("Align Transform with View"));
 
@@ -3574,12 +3587,11 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 					continue;
 				}
 
-				Transform3D xform;
+				Transform3D xform = camera_transform;
 				if (orthogonal) {
-					xform = sp->get_global_transform();
-					xform.basis = Basis::from_euler(camera_transform.basis.get_euler());
+					Vector3 offset = camera_transform.basis.xform(Vector3(0, 0, cursor.distance));
+					xform.origin = cursor.pos + offset;
 				} else {
-					xform = camera_transform;
 					xform.scale_basis(sp->get_scale());
 				}
 
@@ -3587,7 +3599,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 					// Adjust rotation to match Decal's default orientation.
 					// This makes the decal "look" in the same direction as the camera,
 					// rather than pointing down relative to the camera orientation.
-					xform.basis.rotate_local(Vector3(1, 0, 0), Math_TAU * 0.25);
+					xform.basis.rotate_local(Vector3(1, 0, 0), Math::TAU * 0.25);
 				}
 
 				Node3D *parent = sp->get_parent_node_3d();
@@ -3605,7 +3617,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 
 			Transform3D camera_transform = camera->get_global_transform();
 
-			List<Node *> &selection = editor_selection->get_selected_node_list();
+			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 			undo_redo->create_action(TTR("Align Rotation with View"));
 			for (Node *E : selection) {
@@ -3625,7 +3637,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 					// Adjust rotation to match Decal's default orientation.
 					// This makes the decal "look" in the same direction as the camera,
 					// rather than pointing down relative to the camera orientation.
-					basis.rotate_local(Vector3(1, 0, 0), Math_TAU * 0.25);
+					basis.rotate_local(Vector3(1, 0, 0), Math::TAU * 0.25);
 				}
 
 				undo_redo->add_do_method(sp, "set_rotation", basis.get_euler_normalized());
@@ -3635,8 +3647,8 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 
 		} break;
 		case VIEW_ENVIRONMENT: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
 			if (current) {
 				camera->set_environment(Ref<Resource>());
@@ -3644,12 +3656,12 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 				camera->set_environment(Node3DEditor::get_singleton()->get_viewport_environment());
 			}
 
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 
 		} break;
 		case VIEW_PERSPECTIVE: {
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), false);
+			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true);
+			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), false);
 			orthogonal = false;
 			auto_orthogonal = false;
 			callable_mp(this, &Node3DEditorViewport::update_transform_gizmo_view).call_deferred();
@@ -3658,8 +3670,8 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 
 		} break;
 		case VIEW_ORTHOGONAL: {
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), true);
+			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), false);
+			view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ORTHOGONAL), true);
 			orthogonal = true;
 			auto_orthogonal = false;
 			callable_mp(this, &Node3DEditorViewport::update_transform_gizmo_view).call_deferred();
@@ -3671,42 +3683,42 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 
 		} break;
 		case VIEW_AUTO_ORTHOGONAL: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 			if (auto_orthogonal) {
 				auto_orthogonal = false;
 				_update_name();
 			}
 		} break;
 		case VIEW_LOCK_ROTATION: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_LOCK_ROTATION);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_LOCK_ROTATION);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			_set_lock_view_rotation(!current);
 
 		} break;
 		case VIEW_AUDIO_LISTENER: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
 			viewport->set_as_audio_listener_3d(current);
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 
 		} break;
 		case VIEW_AUDIO_DOPPLER: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
 			camera->set_doppler_tracking(current ? Camera3D::DOPPLER_TRACKING_IDLE_STEP : Camera3D::DOPPLER_TRACKING_DISABLED);
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 
 		} break;
 		case VIEW_CINEMATIC_PREVIEW: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 			previewing_cinema = true;
 			_toggle_cinema_preview(current);
 
@@ -3719,8 +3731,8 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 			}
 		} break;
 		case VIEW_GIZMOS: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_GIZMOS);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
 			uint32_t layers = camera->get_cull_mask();
 			layers &= ~(1 << GIZMO_EDIT_LAYER);
@@ -3728,38 +3740,38 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 				layers |= (1 << GIZMO_EDIT_LAYER);
 			}
 			camera->set_cull_mask(layers);
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 
 		} break;
 		case VIEW_TRANSFORM_GIZMO: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
 			transform_gizmo_visible = current;
 
 			spatial_editor->update_transform_gizmo();
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 		} break;
 		case VIEW_HALF_RESOLUTION: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
-			view_menu->get_popup()->set_item_checked(idx, !current);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
+			view_display_menu->get_popup()->set_item_checked(idx, !current);
 			_update_shrink();
 		} break;
 		case VIEW_INFORMATION: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_INFORMATION);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
-			view_menu->get_popup()->set_item_checked(idx, !current);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_INFORMATION);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
+			view_display_menu->get_popup()->set_item_checked(idx, !current);
 
 		} break;
 		case VIEW_FRAME_TIME: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_FRAME_TIME);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
-			view_menu->get_popup()->set_item_checked(idx, !current);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_FRAME_TIME);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
+			view_display_menu->get_popup()->set_item_checked(idx, !current);
 		} break;
 		case VIEW_GRID: {
-			int idx = view_menu->get_popup()->get_item_index(VIEW_GRID);
-			bool current = view_menu->get_popup()->is_item_checked(idx);
+			int idx = view_display_menu->get_popup()->get_item_index(VIEW_GRID);
+			bool current = view_display_menu->get_popup()->is_item_checked(idx);
 			current = !current;
 			uint32_t layers = camera->get_cull_mask();
 			layers &= ~(1 << GIZMO_GRID_LAYER);
@@ -3767,7 +3779,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 				layers |= (1 << GIZMO_GRID_LAYER);
 			}
 			camera->set_cull_mask(layers);
-			view_menu->get_popup()->set_item_checked(idx, current);
+			view_display_menu->get_popup()->set_item_checked(idx, current);
 		} break;
 		case VIEW_DISPLAY_NORMAL:
 		case VIEW_DISPLAY_WIREFRAME:
@@ -3858,9 +3870,9 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 
 			for (int idx = 0; display_options[idx] != VIEW_MAX; idx++) {
 				int id = display_options[idx];
-				int item_idx = view_menu->get_popup()->get_item_index(id);
+				int item_idx = view_display_menu->get_popup()->get_item_index(id);
 				if (item_idx != -1) {
-					view_menu->get_popup()->set_item_checked(item_idx, id == p_option);
+					view_display_menu->get_popup()->set_item_checked(item_idx, id == p_option);
 				}
 				item_idx = display_submenu->get_item_index(id);
 				if (item_idx != -1) {
@@ -3876,7 +3888,7 @@ void Node3DEditorViewport::_menu_option(int p_option) {
 }
 
 void Node3DEditorViewport::_set_auto_orthogonal() {
-	if (!orthogonal && view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL))) {
+	if (!orthogonal && view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL))) {
 		_menu_option(VIEW_ORTHOGONAL);
 		auto_orthogonal = true;
 	}
@@ -3887,7 +3899,7 @@ void Node3DEditorViewport::_preview_exited_scene() {
 	preview_camera->set_pressed(false);
 	_toggle_camera_preview(false);
 	preview_camera->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview));
-	view_menu->show();
+	view_display_menu->show();
 }
 
 void Node3DEditorViewport::_init_gizmo_instance(int p_idx) {
@@ -4015,7 +4027,7 @@ void Node3DEditorViewport::_toggle_cinema_preview(bool p_activate) {
 		} else {
 			preview_camera->show();
 		}
-		view_menu->show();
+		view_display_menu->show();
 		surface->queue_redraw();
 	}
 }
@@ -4165,13 +4177,13 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
 	}
 	if (p_state.has("auto_orthogonal_enabled")) {
 		bool enabled = p_state["auto_orthogonal_enabled"];
-		view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL), enabled);
+		view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL), enabled);
 	}
 	if (p_state.has("display_mode")) {
 		int display = p_state["display_mode"];
 
-		int idx = view_menu->get_popup()->get_item_index(display);
-		if (idx != -1 && !view_menu->get_popup()->is_item_checked(idx)) {
+		int idx = view_display_menu->get_popup()->get_item_index(display);
+		if (idx != -1 && !view_display_menu->get_popup()->is_item_checked(idx)) {
 			_menu_option(display);
 		} else {
 			idx = display_submenu->get_item_index(display);
@@ -4193,69 +4205,69 @@ void Node3DEditorViewport::set_state(const Dictionary &p_state) {
 	if (p_state.has("listener")) {
 		bool listener = p_state["listener"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER);
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER);
 		viewport->set_as_audio_listener_3d(listener);
-		view_menu->get_popup()->set_item_checked(idx, listener);
+		view_display_menu->get_popup()->set_item_checked(idx, listener);
 	}
 	if (p_state.has("doppler")) {
 		bool doppler = p_state["doppler"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER);
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER);
 		camera->set_doppler_tracking(doppler ? Camera3D::DOPPLER_TRACKING_IDLE_STEP : Camera3D::DOPPLER_TRACKING_DISABLED);
-		view_menu->get_popup()->set_item_checked(idx, doppler);
+		view_display_menu->get_popup()->set_item_checked(idx, doppler);
 	}
 	if (p_state.has("gizmos")) {
 		bool gizmos = p_state["gizmos"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_GIZMOS);
-		if (view_menu->get_popup()->is_item_checked(idx) != gizmos) {
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_GIZMOS);
+		if (view_display_menu->get_popup()->is_item_checked(idx) != gizmos) {
 			_menu_option(VIEW_GIZMOS);
 		}
 	}
 	if (p_state.has("transform_gizmo")) {
 		bool transform_gizmo = p_state["transform_gizmo"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
-		if (view_menu->get_popup()->is_item_checked(idx) != transform_gizmo) {
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO);
+		if (view_display_menu->get_popup()->is_item_checked(idx) != transform_gizmo) {
 			_menu_option(VIEW_TRANSFORM_GIZMO);
 		}
 	}
 	if (p_state.has("grid")) {
 		bool grid = p_state["grid"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_GRID);
-		if (view_menu->get_popup()->is_item_checked(idx) != grid) {
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_GRID);
+		if (view_display_menu->get_popup()->is_item_checked(idx) != grid) {
 			_menu_option(VIEW_GRID);
 		}
 	}
 	if (p_state.has("information")) {
 		bool information = p_state["information"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_INFORMATION);
-		if (view_menu->get_popup()->is_item_checked(idx) != information) {
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_INFORMATION);
+		if (view_display_menu->get_popup()->is_item_checked(idx) != information) {
 			_menu_option(VIEW_INFORMATION);
 		}
 	}
 	if (p_state.has("frame_time")) {
 		bool fps = p_state["frame_time"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_FRAME_TIME);
-		if (view_menu->get_popup()->is_item_checked(idx) != fps) {
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_FRAME_TIME);
+		if (view_display_menu->get_popup()->is_item_checked(idx) != fps) {
 			_menu_option(VIEW_FRAME_TIME);
 		}
 	}
 	if (p_state.has("half_res")) {
 		bool half_res = p_state["half_res"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION);
-		view_menu->get_popup()->set_item_checked(idx, half_res);
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_HALF_RESOLUTION);
+		view_display_menu->get_popup()->set_item_checked(idx, half_res);
 		_update_shrink();
 	}
 	if (p_state.has("cinematic_preview")) {
 		previewing_cinema = p_state["cinematic_preview"];
 
-		int idx = view_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW);
-		view_menu->get_popup()->set_item_checked(idx, previewing_cinema);
+		int idx = view_display_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW);
+		view_display_menu->get_popup()->set_item_checked(idx, previewing_cinema);
 	}
 
 	if (preview_camera->is_connected(SceneStringName(toggled), callable_mp(this, &Node3DEditorViewport::_toggle_camera_preview))) {
@@ -4286,12 +4298,12 @@ Dictionary Node3DEditorViewport::get_state() const {
 	d["orthogonal"] = camera->get_projection() == Camera3D::PROJECTION_ORTHOGONAL;
 	d["view_type"] = view_type;
 	d["auto_orthogonal"] = auto_orthogonal;
-	d["auto_orthogonal_enabled"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL));
+	d["auto_orthogonal_enabled"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL));
 
 	// Find selected display mode.
 	int display_mode = VIEW_DISPLAY_NORMAL;
 	for (int i = VIEW_DISPLAY_NORMAL; i < VIEW_DISPLAY_ADVANCED; i++) {
-		if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(i))) {
+		if (view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(i))) {
 			display_mode = i;
 			break;
 		}
@@ -4305,14 +4317,14 @@ Dictionary Node3DEditorViewport::get_state() const {
 	d["display_mode"] = display_mode;
 
 	d["listener"] = viewport->is_audio_listener_3d();
-	d["doppler"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER));
-	d["gizmos"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS));
-	d["transform_gizmo"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO));
-	d["grid"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_GRID));
-	d["information"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_INFORMATION));
-	d["frame_time"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_FRAME_TIME));
+	d["doppler"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUDIO_DOPPLER));
+	d["gizmos"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_GIZMOS));
+	d["transform_gizmo"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO));
+	d["grid"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_GRID));
+	d["information"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_INFORMATION));
+	d["frame_time"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_FRAME_TIME));
 	d["half_res"] = subviewport_container->get_stretch_shrink() > 1;
-	d["cinematic_preview"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW));
+	d["cinematic_preview"] = view_display_menu->get_popup()->is_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW));
 	if (previewing) {
 		d["previewing"] = EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing);
 	}
@@ -4343,31 +4355,36 @@ void Node3DEditorViewport::focus_selection() {
 	Vector3 center;
 	int count = 0;
 
-	const List<Node *> &selection = editor_selection->get_selected_node_list();
+	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
-	for (Node *E : selection) {
-		Node3D *sp = Object::cast_to<Node3D>(E);
-		if (!sp) {
+	for (Node *node : selection) {
+		Node3D *node_3d = Object::cast_to<Node3D>(node);
+		if (!node_3d) {
 			continue;
 		}
 
-		Node3DEditorSelectedItem *se = editor_selection->get_node_editor_data<Node3DEditorSelectedItem>(sp);
+		Node3DEditorSelectedItem *se = editor_selection->get_node_editor_data<Node3DEditorSelectedItem>(node_3d);
 		if (!se) {
 			continue;
 		}
 
 		if (se->gizmo.is_valid()) {
 			for (const KeyValue<int, Transform3D> &GE : se->subgizmos) {
-				center += se->gizmo->get_subgizmo_transform(GE.key).origin;
-				count++;
+				const Vector3 pos = se->gizmo->get_subgizmo_transform(GE.key).origin;
+				if (pos.is_finite()) {
+					center += pos;
+					count++;
+				}
 			}
 		}
-
-		center += sp->get_global_gizmo_transform().origin;
-		count++;
+		const Vector3 pos = node_3d->get_global_gizmo_transform().origin;
+		if (pos.is_finite()) {
+			center += pos;
+			count++;
+		}
 	}
 
-	if (count != 0) {
+	if (count > 1) {
 		center /= count;
 	}
 
@@ -4407,7 +4424,7 @@ Vector3 Node3DEditorViewport::_get_instance_position(const Point2 &p_pos, Node3D
 	HashSet<RID> rids;
 
 	if (!preview_node->is_inside_tree() && !ruler->is_inside_tree()) {
-		List<Node *> &selection = editor_selection->get_selected_node_list();
+		const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 		Node3D *first_selected_node = Object::cast_to<Node3D>(selection.front()->get());
 
@@ -4477,20 +4494,23 @@ Vector3 Node3DEditorViewport::_get_instance_position(const Point2 &p_pos, Node3D
 }
 
 AABB Node3DEditorViewport::_calculate_spatial_bounds(const Node3D *p_parent, bool p_omit_top_level, const Transform3D *p_bounds_orientation) {
-	AABB bounds;
-
-	Transform3D bounds_orientation;
-	if (p_bounds_orientation) {
-		bounds_orientation = *p_bounds_orientation;
-	} else {
-		bounds_orientation = p_parent->get_global_transform();
-	}
-
 	if (!p_parent) {
 		return AABB(Vector3(-0.2, -0.2, -0.2), Vector3(0.4, 0.4, 0.4));
 	}
+	const Transform3D parent_transform = p_parent->get_global_transform();
+	if (!parent_transform.is_finite()) {
+		return AABB();
+	}
+	AABB bounds;
 
-	const Transform3D xform_to_top_level_parent_space = bounds_orientation.affine_inverse() * p_parent->get_global_transform();
+	Transform3D bounds_orientation;
+	Transform3D xform_to_top_level_parent_space;
+	if (p_bounds_orientation) {
+		bounds_orientation = *p_bounds_orientation;
+		xform_to_top_level_parent_space = bounds_orientation.affine_inverse() * parent_transform;
+	} else {
+		bounds_orientation = parent_transform;
+	}
 
 	const VisualInstance3D *visual_instance = Object::cast_to<VisualInstance3D>(p_parent);
 	if (visual_instance) {
@@ -4834,8 +4854,8 @@ bool Node3DEditorViewport::_create_audio_node(Node *p_parent, const String &p_pa
 void Node3DEditorViewport::_perform_drop_data() {
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	if (spatial_editor->get_preview_material_target().is_valid()) {
-		GeometryInstance3D *geometry_instance = Object::cast_to<GeometryInstance3D>(ObjectDB::get_instance(spatial_editor->get_preview_material_target()));
-		MeshInstance3D *mesh_instance = Object::cast_to<MeshInstance3D>(ObjectDB::get_instance(spatial_editor->get_preview_material_target()));
+		GeometryInstance3D *geometry_instance = ObjectDB::get_instance<GeometryInstance3D>(spatial_editor->get_preview_material_target());
+		MeshInstance3D *mesh_instance = ObjectDB::get_instance<MeshInstance3D>(spatial_editor->get_preview_material_target());
 		if (mesh_instance && spatial_editor->get_preview_material_surface() != -1) {
 			undo_redo->create_action(vformat(TTR("Set Surface %d Override Material"), spatial_editor->get_preview_material_surface()));
 			undo_redo->add_do_method(geometry_instance, "set_surface_override_material", spatial_editor->get_preview_material_surface(), spatial_editor->get_preview_material());
@@ -4891,6 +4911,9 @@ void Node3DEditorViewport::_perform_drop_data() {
 }
 
 bool Node3DEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		return false;
+	}
 	preview_node_viewport_pos = p_point;
 
 	bool can_instantiate = false;
@@ -5013,7 +5036,7 @@ void Node3DEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p_
 		selected_files = d["files"];
 	}
 
-	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
+	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_top_selected_node_list();
 	Node *root_node = EditorNode::get_singleton()->get_edited_scene();
 	if (selected_nodes.size() > 0) {
 		Node *selected_node = selected_nodes.front()->get();
@@ -5063,10 +5086,10 @@ void Node3DEditorViewport::commit_transform() {
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(_transform_name[_edit.mode]);
 
-	List<Node *> &selection = editor_selection->get_selected_node_list();
+	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
-	for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
-		Node3D *sp = Object::cast_to<Node3D>(E->get());
+	for (Node *E : selection) {
+		Node3D *sp = Object::cast_to<Node3D>(E);
 		if (!sp) {
 			continue;
 		}
@@ -5088,7 +5111,7 @@ void Node3DEditorViewport::commit_transform() {
 
 void Node3DEditorViewport::apply_transform(Vector3 p_motion, double p_snap) {
 	bool local_coords = (spatial_editor->are_local_coords_enabled() && _edit.plane != TRANSFORM_VIEW);
-	List<Node *> &selection = editor_selection->get_selected_node_list();
+	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 	for (Node *E : selection) {
 		Node3D *sp = Object::cast_to<Node3D>(E);
 		if (!sp) {
@@ -5345,7 +5368,7 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
 			}
 
 			static const float orthogonal_threshold = Math::cos(Math::deg_to_rad(85.0f));
-			bool axis_is_orthogonal = ABS(plane.normal.dot(global_axis)) < orthogonal_threshold;
+			bool axis_is_orthogonal = Math::abs(plane.normal.dot(global_axis)) < orthogonal_threshold;
 
 			double angle = 0.0f;
 			if (axis_is_orthogonal) {
@@ -5353,7 +5376,7 @@ void Node3DEditorViewport::update_transform(bool p_shift) {
 				Vector3 projection_axis = plane.normal.cross(global_axis);
 				Vector3 delta = intersection - click;
 				float projection = delta.dot(projection_axis);
-				angle = (projection * (Math_PI / 2.0f)) / (gizmo_scale * GIZMO_CIRCLE_SIZE);
+				angle = (projection * (Math::PI / 2.0f)) / (gizmo_scale * GIZMO_CIRCLE_SIZE);
 			} else {
 				_edit.show_rotation_line = true;
 				Vector3 click_axis = (click - _edit.center).normalized();
@@ -5478,8 +5501,8 @@ void Node3DEditorViewport::shortcut_changed_callback(const Ref<Shortcut> p_short
 
 void Node3DEditorViewport::_set_lock_view_rotation(bool p_lock_rotation) {
 	lock_rotation = p_lock_rotation;
-	int idx = view_menu->get_popup()->get_item_index(VIEW_LOCK_ROTATION);
-	view_menu->get_popup()->set_item_checked(idx, p_lock_rotation);
+	int idx = view_display_menu->get_popup()->get_item_index(VIEW_LOCK_ROTATION);
+	view_display_menu->get_popup()->set_item_checked(idx, p_lock_rotation);
 	if (p_lock_rotation) {
 		locked_label->show();
 	} else {
@@ -5487,6 +5510,36 @@ void Node3DEditorViewport::_set_lock_view_rotation(bool p_lock_rotation) {
 	}
 }
 
+void Node3DEditorViewport::_add_advanced_debug_draw_mode_item(PopupMenu *p_popup, const String &p_name, int p_value, SupportedRenderingMethods p_rendering_methods, const String &p_tooltip) {
+	display_submenu->add_radio_check_item(p_name, p_value);
+
+	bool disabled = false;
+	String disabled_tooltip;
+	switch (p_rendering_methods) {
+		case SupportedRenderingMethods::ALL:
+			break;
+		case SupportedRenderingMethods::FORWARD_PLUS_MOBILE:
+			disabled = OS::get_singleton()->get_current_rendering_method() == "gl_compatibility";
+			disabled_tooltip = TTR("This debug draw mode is not supported when using the Compatibility rendering method.");
+			break;
+		case SupportedRenderingMethods::FORWARD_PLUS:
+			disabled = OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "mobile";
+			disabled_tooltip = TTR("This debug draw mode is not supported when using the Mobile or Compatibility rendering methods.");
+			break;
+	}
+
+	display_submenu->set_item_disabled(-1, disabled);
+	String tooltip = p_tooltip;
+	if (disabled) {
+		if (tooltip.is_empty()) {
+			tooltip = disabled_tooltip;
+		} else {
+			tooltip += "\n\n" + disabled_tooltip;
+		}
+	}
+	display_submenu->set_item_tooltip(-1, tooltip);
+}
+
 Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p_index) {
 	cpu_time_history_index = 0;
 	gpu_time_history_index = 0;
@@ -5535,122 +5588,124 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	vbox->set_offset(SIDE_LEFT, 10 * EDSCALE);
 	vbox->set_offset(SIDE_TOP, 10 * EDSCALE);
 
-	view_menu = memnew(MenuButton);
-	view_menu->set_flat(false);
-	view_menu->set_h_size_flags(0);
-	view_menu->set_shortcut_context(this);
-	vbox->add_child(view_menu);
+	view_display_menu = memnew(MenuButton);
+	view_display_menu->set_flat(false);
+	view_display_menu->set_h_size_flags(0);
+	view_display_menu->set_shortcut_context(this);
+	view_display_menu->set_accessibility_name(TTRC("View"));
+	vbox->add_child(view_display_menu);
 
-	view_menu->get_popup()->set_hide_on_checkable_item_selection(false);
+	view_display_menu->get_popup()->set_hide_on_checkable_item_selection(false);
 
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/top_view"), VIEW_TOP);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/bottom_view"), VIEW_BOTTOM);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/left_view"), VIEW_LEFT);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/right_view"), VIEW_RIGHT);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/front_view"), VIEW_FRONT);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/rear_view"), VIEW_REAR);
-	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal"), VIEW_SWITCH_PERSPECTIVE_ORTHOGONAL);
-	view_menu->get_popup()->add_radio_check_item(TTR("Perspective"), VIEW_PERSPECTIVE);
-	view_menu->get_popup()->add_radio_check_item(TTR("Orthogonal"), VIEW_ORTHOGONAL);
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true);
-	view_menu->get_popup()->add_check_item(TTR("Auto Orthogonal Enabled"), VIEW_AUTO_ORTHOGONAL);
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL), true);
-	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_lock_rotation", TTRC("Lock View Rotation")), VIEW_LOCK_ROTATION);
-	view_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/top_view"), VIEW_TOP);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/bottom_view"), VIEW_BOTTOM);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/left_view"), VIEW_LEFT);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/right_view"), VIEW_RIGHT);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/front_view"), VIEW_FRONT);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/rear_view"), VIEW_REAR);
+	view_display_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/switch_perspective_orthogonal"), VIEW_SWITCH_PERSPECTIVE_ORTHOGONAL);
+	view_display_menu->get_popup()->add_radio_check_item(TTR("Perspective"), VIEW_PERSPECTIVE);
+	view_display_menu->get_popup()->add_radio_check_item(TTR("Orthogonal"), VIEW_ORTHOGONAL);
+	view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE), true);
+	view_display_menu->get_popup()->add_check_item(TTR("Auto Orthogonal Enabled"), VIEW_AUTO_ORTHOGONAL);
+	view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUTO_ORTHOGONAL), true);
+	view_display_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_lock_rotation", TTRC("Lock View Rotation")), VIEW_LOCK_ROTATION);
+	view_display_menu->get_popup()->add_separator();
 	// TRANSLATORS: "Normal" as in "normal life", not "normal vector".
-	view_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_normal", TTRC("Display Normal")), VIEW_DISPLAY_NORMAL);
-	view_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_wireframe", TTRC("Display Wireframe")), VIEW_DISPLAY_WIREFRAME);
-	view_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_overdraw", TTRC("Display Overdraw")), VIEW_DISPLAY_OVERDRAW);
-	view_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_lighting", TTRC("Display Lighting")), VIEW_DISPLAY_LIGHTING);
-	view_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_unshaded", TTRC("Display Unshaded")), VIEW_DISPLAY_UNSHADED);
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL), true);
+	view_display_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_normal", TTRC("Display Normal")), VIEW_DISPLAY_NORMAL);
+	view_display_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_wireframe", TTRC("Display Wireframe")), VIEW_DISPLAY_WIREFRAME);
+	view_display_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_overdraw", TTRC("Display Overdraw")), VIEW_DISPLAY_OVERDRAW);
+	view_display_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_lighting", TTRC("Display Lighting")), VIEW_DISPLAY_LIGHTING);
+	view_display_menu->get_popup()->add_radio_check_shortcut(ED_SHORTCUT("spatial_editor/view_display_unshaded", TTRC("Display Unshaded")), VIEW_DISPLAY_UNSHADED);
+	view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL), true);
 
 	display_submenu = memnew(PopupMenu);
 	display_submenu->set_hide_on_checkable_item_selection(false);
-	display_submenu->add_radio_check_item(TTR("Directional Shadow Splits"), VIEW_DISPLAY_DEBUG_PSSM_SPLITS);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Directional Shadow Splits"), VIEW_DISPLAY_DEBUG_PSSM_SPLITS, SupportedRenderingMethods::FORWARD_PLUS_MOBILE,
+			TTR("Displays directional shadow splits in different colors to make adjusting split thresholds easier. \nRed: 1st split (closest to the camera), Green: 2nd split, Blue: 3rd split, Yellow: 4th split (furthest from the camera)"));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("Normal Buffer"), VIEW_DISPLAY_NORMAL_BUFFER);
+	// TRANSLATORS: "Normal" as in "normal vector", not "normal life".
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Normal Buffer"), VIEW_DISPLAY_NORMAL_BUFFER, SupportedRenderingMethods::FORWARD_PLUS);
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("Shadow Atlas"), VIEW_DISPLAY_DEBUG_SHADOW_ATLAS);
-	display_submenu->add_radio_check_item(TTR("Directional Shadow Map"), VIEW_DISPLAY_DEBUG_DIRECTIONAL_SHADOW_ATLAS);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Shadow Atlas"), VIEW_DISPLAY_DEBUG_SHADOW_ATLAS, SupportedRenderingMethods::ALL,
+			TTR("Displays the shadow atlas used for positional (omni/spot) shadow mapping.\nRequires a visible OmniLight3D or SpotLight3D node with shadows enabled to have a visible effect."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Directional Shadow Map"), VIEW_DISPLAY_DEBUG_DIRECTIONAL_SHADOW_ATLAS, SupportedRenderingMethods::ALL,
+			TTR("Displays the shadow map used for directional shadow mapping.\nRequires a visible DirectionalLight3D node with shadows enabled to have a visible effect."));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("Decal Atlas"), VIEW_DISPLAY_DEBUG_DECAL_ATLAS);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Decal Atlas"), VIEW_DISPLAY_DEBUG_DECAL_ATLAS, SupportedRenderingMethods::FORWARD_PLUS_MOBILE);
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("VoxelGI Lighting"), VIEW_DISPLAY_DEBUG_VOXEL_GI_LIGHTING);
-	display_submenu->add_radio_check_item(TTR("VoxelGI Albedo"), VIEW_DISPLAY_DEBUG_VOXEL_GI_ALBEDO);
-	display_submenu->add_radio_check_item(TTR("VoxelGI Emission"), VIEW_DISPLAY_DEBUG_VOXEL_GI_EMISSION);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("VoxelGI Lighting"), VIEW_DISPLAY_DEBUG_VOXEL_GI_LIGHTING, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Requires a visible VoxelGI node that has been baked to have a visible effect."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("VoxelGI Albedo"), VIEW_DISPLAY_DEBUG_VOXEL_GI_ALBEDO, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Requires a visible VoxelGI node that has been baked to have a visible effect."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("VoxelGI Emission"), VIEW_DISPLAY_DEBUG_VOXEL_GI_EMISSION, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Requires a visible VoxelGI node that has been baked to have a visible effect."));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("SDFGI Cascades"), VIEW_DISPLAY_DEBUG_SDFGI);
-	display_submenu->add_radio_check_item(TTR("SDFGI Probes"), VIEW_DISPLAY_DEBUG_SDFGI_PROBES);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("SDFGI Cascades"), VIEW_DISPLAY_DEBUG_SDFGI, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Requires SDFGI to be enabled in Environment to have a visible effect."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("SDFGI Probes"), VIEW_DISPLAY_DEBUG_SDFGI_PROBES, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Requires SDFGI to be enabled in Environment to have a visible effect."));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("Scene Luminance"), VIEW_DISPLAY_DEBUG_SCENE_LUMINANCE);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Scene Luminance"), VIEW_DISPLAY_DEBUG_SCENE_LUMINANCE, SupportedRenderingMethods::FORWARD_PLUS_MOBILE,
+			TTR("Displays the scene luminance computed from the 3D buffer. This is used for Auto Exposure calculation.\nRequires Auto Exposure to be enabled in CameraAttributes to have a visible effect."));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("SSAO"), VIEW_DISPLAY_DEBUG_SSAO);
-	display_submenu->add_radio_check_item(TTR("SSIL"), VIEW_DISPLAY_DEBUG_SSIL);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("SSAO"), VIEW_DISPLAY_DEBUG_SSAO, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Displays the screen-space ambient occlusion buffer. Requires SSAO to be enabled in Environment to have a visible effect."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("SSIL"), VIEW_DISPLAY_DEBUG_SSIL, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Displays the screen-space indirect lighting buffer. Requires SSIL to be enabled in Environment to have a visible effect."));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("VoxelGI/SDFGI Buffer"), VIEW_DISPLAY_DEBUG_GI_BUFFER);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("VoxelGI/SDFGI Buffer"), VIEW_DISPLAY_DEBUG_GI_BUFFER, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Requires SDFGI or VoxelGI to be enabled to have a visible effect."));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("Disable Mesh LOD"), VIEW_DISPLAY_DEBUG_DISABLE_LOD);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Disable Mesh LOD"), VIEW_DISPLAY_DEBUG_DISABLE_LOD, SupportedRenderingMethods::ALL,
+			TTR("Renders all meshes with their highest level of detail regardless of their distance from the camera."));
 	display_submenu->add_separator();
-	display_submenu->add_radio_check_item(TTR("OmniLight3D Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_OMNI_LIGHTS);
-	display_submenu->add_radio_check_item(TTR("SpotLight3D Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_SPOT_LIGHTS);
-	display_submenu->add_radio_check_item(TTR("Decal Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_DECALS);
-	display_submenu->add_radio_check_item(TTR("ReflectionProbe Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_REFLECTION_PROBES);
-	display_submenu->add_radio_check_item(TTR("Occlusion Culling Buffer"), VIEW_DISPLAY_DEBUG_OCCLUDERS);
-	display_submenu->add_radio_check_item(TTR("Motion Vectors"), VIEW_DISPLAY_MOTION_VECTORS);
-	display_submenu->add_radio_check_item(TTR("Internal Buffer"), VIEW_DISPLAY_INTERNAL_BUFFER);
-	view_menu->get_popup()->add_submenu_node_item(TTR("Display Advanced..."), display_submenu, VIEW_DISPLAY_ADVANCED);
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("OmniLight3D Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_OMNI_LIGHTS, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Highlights tiles of pixels that are affected by at least one OmniLight3D."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("SpotLight3D Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_SPOT_LIGHTS, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Highlights tiles of pixels that are affected by at least one SpotLight3D."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Decal Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_DECALS, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Highlights tiles of pixels that are affected by at least one Decal."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("ReflectionProbe Cluster"), VIEW_DISPLAY_DEBUG_CLUSTER_REFLECTION_PROBES, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Highlights tiles of pixels that are affected by at least one ReflectionProbe."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Occlusion Culling Buffer"), VIEW_DISPLAY_DEBUG_OCCLUDERS, SupportedRenderingMethods::FORWARD_PLUS_MOBILE,
+			TTR("Represents occluders with black pixels. Requires occlusion culling to be enabled to have a visible effect."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Motion Vectors"), VIEW_DISPLAY_MOTION_VECTORS, SupportedRenderingMethods::FORWARD_PLUS,
+			TTR("Represents motion vectors with colored lines in the direction of motion. Gray dots represent areas with no per-pixel motion."));
+	_add_advanced_debug_draw_mode_item(display_submenu, TTR("Internal Buffer"), VIEW_DISPLAY_INTERNAL_BUFFER, SupportedRenderingMethods::FORWARD_PLUS_MOBILE,
+			TTR("Shows the scene rendered in linear colorspace before any tonemapping or post-processing."));
+	view_display_menu->get_popup()->add_submenu_node_item(TTR("Display Advanced..."), display_submenu, VIEW_DISPLAY_ADVANCED);
 
-	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTRC("View Environment")), VIEW_ENVIRONMENT);
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTRC("View Gizmos")), VIEW_GIZMOS);
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_transform_gizmo", TTRC("View Transform Gizmo")), VIEW_TRANSFORM_GIZMO);
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_grid_lines", TTRC("View Grid")), VIEW_GRID);
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_information", TTRC("View Information")), VIEW_INFORMATION);
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_fps", TTRC("View Frame Time")), VIEW_FRAME_TIME);
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT), true);
-	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_half_resolution", TTRC("Half Resolution")), VIEW_HALF_RESOLUTION);
-	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_listener", TTRC("Audio Listener")), VIEW_AUDIO_LISTENER);
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_doppler", TTRC("Enable Doppler")), VIEW_AUDIO_DOPPLER);
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_GIZMOS), true);
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO), true);
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_GRID), true);
+	view_display_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTRC("View Environment")), VIEW_ENVIRONMENT);
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTRC("View Gizmos")), VIEW_GIZMOS);
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_transform_gizmo", TTRC("View Transform Gizmo")), VIEW_TRANSFORM_GIZMO);
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_grid_lines", TTRC("View Grid")), VIEW_GRID);
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_information", TTRC("View Information")), VIEW_INFORMATION);
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_fps", TTRC("View Frame Time")), VIEW_FRAME_TIME);
+	view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT), true);
+	view_display_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_half_resolution", TTRC("Half Resolution")), VIEW_HALF_RESOLUTION);
+	view_display_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_listener", TTRC("Audio Listener")), VIEW_AUDIO_LISTENER);
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_audio_doppler", TTRC("Enable Doppler")), VIEW_AUDIO_DOPPLER);
+	view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_GIZMOS), true);
+	view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_TRANSFORM_GIZMO), true);
+	view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_GRID), true);
 
-	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_cinematic_preview", TTRC("Cinematic Preview")), VIEW_CINEMATIC_PREVIEW);
+	view_display_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_cinematic_preview", TTRC("Cinematic Preview")), VIEW_CINEMATIC_PREVIEW);
 
-	view_menu->get_popup()->add_separator();
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_origin"), VIEW_CENTER_TO_ORIGIN);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_selection"), VIEW_CENTER_TO_SELECTION);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_transform_with_view"), VIEW_ALIGN_TRANSFORM_WITH_VIEW);
-	view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_rotation_with_view"), VIEW_ALIGN_ROTATION_WITH_VIEW);
-	view_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &Node3DEditorViewport::_menu_option));
+	view_display_menu->get_popup()->add_separator();
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_origin"), VIEW_CENTER_TO_ORIGIN);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/focus_selection"), VIEW_CENTER_TO_SELECTION);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_transform_with_view"), VIEW_ALIGN_TRANSFORM_WITH_VIEW);
+	view_display_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/align_rotation_with_view"), VIEW_ALIGN_ROTATION_WITH_VIEW);
+	view_display_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &Node3DEditorViewport::_menu_option));
 	display_submenu->connect(SceneStringName(id_pressed), callable_mp(this, &Node3DEditorViewport::_menu_option));
-	view_menu->set_disable_shortcuts(true);
-
-	// TODO: Re-evaluate with new OpenGL3 renderer, and implement.
-	//if (OS::get_singleton()->get_current_video_driver() == OS::RENDERING_DRIVER_OPENGL3) {
-	if (false) {
-		// Alternate display modes only work when using the Vulkan renderer; make this explicit.
-		const int normal_idx = view_menu->get_popup()->get_item_index(VIEW_DISPLAY_NORMAL);
-		const int wireframe_idx = view_menu->get_popup()->get_item_index(VIEW_DISPLAY_WIREFRAME);
-		const int overdraw_idx = view_menu->get_popup()->get_item_index(VIEW_DISPLAY_OVERDRAW);
-		const int shadeless_idx = view_menu->get_popup()->get_item_index(VIEW_DISPLAY_UNSHADED);
-		const String unsupported_tooltip = TTR("Not available when using the OpenGL renderer.");
-
-		view_menu->get_popup()->set_item_disabled(normal_idx, true);
-		view_menu->get_popup()->set_item_tooltip(normal_idx, unsupported_tooltip);
-		view_menu->get_popup()->set_item_disabled(wireframe_idx, true);
-		view_menu->get_popup()->set_item_tooltip(wireframe_idx, unsupported_tooltip);
-		view_menu->get_popup()->set_item_disabled(overdraw_idx, true);
-		view_menu->get_popup()->set_item_tooltip(overdraw_idx, unsupported_tooltip);
-		view_menu->get_popup()->set_item_disabled(shadeless_idx, true);
-		view_menu->get_popup()->set_item_tooltip(shadeless_idx, unsupported_tooltip);
-	}
+	view_display_menu->set_disable_shortcuts(true);
 
 	// Registering with Key::NONE intentionally creates an empty Array.
 	register_shortcut_action("spatial_editor/viewport_orbit_modifier_1", TTRC("Viewport Orbit Modifier 1"), Key::NONE);
@@ -5831,7 +5886,7 @@ Node3DEditorViewport::Node3DEditorViewport(Node3DEditor *p_spatial_editor, int p
 	selection_menu->connect("popup_hide", callable_mp(this, &Node3DEditorViewport::_selection_menu_hide));
 
 	if (p_index == 0) {
-		view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER), true);
+		view_display_menu->get_popup()->set_item_checked(view_display_menu->get_popup()->get_item_index(VIEW_AUDIO_LISTENER), true);
 		viewport->set_as_audio_listener_3d(true);
 	}
 
@@ -6241,16 +6296,19 @@ void Node3DEditor::update_transform_gizmo() {
 	if (se && se->gizmo.is_valid()) {
 		for (const KeyValue<int, Transform3D> &E : se->subgizmos) {
 			Transform3D xf = se->sp->get_global_transform() * se->gizmo->get_subgizmo_transform(E.key);
+			if (!xf.is_finite()) {
+				continue;
+			}
 			gizmo_center += xf.origin;
-			if (count == 0 && local_gizmo_coords) {
+			if ((unsigned int)count == se->subgizmos.size() - 1 && local_gizmo_coords) {
 				gizmo_basis = xf.basis;
 			}
 			count++;
 		}
 	} else {
-		List<Node *> &selection = editor_selection->get_selected_node_list();
-		for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
-			Node3D *sp = Object::cast_to<Node3D>(E->get());
+		const List<Node *> &selection = editor_selection->get_top_selected_node_list();
+		for (Node *E : selection) {
+			Node3D *sp = Object::cast_to<Node3D>(E);
 			if (!sp) {
 				continue;
 			}
@@ -6265,8 +6323,11 @@ void Node3DEditor::update_transform_gizmo() {
 			}
 
 			Transform3D xf = sel_item->sp->get_global_transform();
+			if (!xf.is_finite()) {
+				continue;
+			}
 			gizmo_center += xf.origin;
-			if (count == 0 && local_gizmo_coords) {
+			if (count == selection.size() - 1 && local_gizmo_coords) {
 				gizmo_basis = xf.basis;
 			}
 			count++;
@@ -6275,7 +6336,7 @@ void Node3DEditor::update_transform_gizmo() {
 
 	gizmo.visible = count > 0;
 	gizmo.transform.origin = (count > 0) ? gizmo_center / count : Vector3();
-	gizmo.transform.basis = (count == 1) ? gizmo_basis : Basis();
+	gizmo.transform.basis = gizmo_basis;
 
 	for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
 		viewports[i]->update_transform_gizmo_view();
@@ -6367,36 +6428,59 @@ void Node3DEditor::_generate_selection_boxes() {
 	// This lets the user see where the selection is while still having a sense of depth.
 	Ref<SurfaceTool> st = memnew(SurfaceTool);
 	Ref<SurfaceTool> st_xray = memnew(SurfaceTool);
+	Ref<SurfaceTool> active_st = memnew(SurfaceTool);
+	Ref<SurfaceTool> active_st_xray = memnew(SurfaceTool);
 
 	st->begin(Mesh::PRIMITIVE_LINES);
 	st_xray->begin(Mesh::PRIMITIVE_LINES);
+	active_st->begin(Mesh::PRIMITIVE_LINES);
+	active_st_xray->begin(Mesh::PRIMITIVE_LINES);
 	for (int i = 0; i < 12; i++) {
 		Vector3 a, b;
 		aabb.get_edge(i, a, b);
 
 		st->add_vertex(a);
 		st->add_vertex(b);
+		active_st->add_vertex(a);
+		active_st->add_vertex(b);
 		st_xray->add_vertex(a);
 		st_xray->add_vertex(b);
+		active_st_xray->add_vertex(a);
+		active_st_xray->add_vertex(b);
 	}
 
-	Ref<StandardMaterial3D> mat = memnew(StandardMaterial3D);
-	mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
-	mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
 	const Color selection_box_color = EDITOR_GET("editors/3d/selection_box_color");
-	mat->set_albedo(selection_box_color);
-	mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
-	st->set_material(mat);
+	const Color active_selection_box_color = EDITOR_GET("editors/3d/active_selection_box_color");
+
+	selection_box_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+	selection_box_mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	selection_box_mat->set_albedo(selection_box_color);
+	selection_box_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+	st->set_material(selection_box_mat);
 	selection_box = st->commit();
 
-	Ref<StandardMaterial3D> mat_xray = memnew(StandardMaterial3D);
-	mat_xray->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
-	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
-	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
-	mat_xray->set_albedo(selection_box_color * Color(1, 1, 1, 0.15));
-	mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
-	st_xray->set_material(mat_xray);
+	selection_box_mat_xray->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+	selection_box_mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	selection_box_mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
+	selection_box_mat_xray->set_albedo(selection_box_color * Color(1, 1, 1, 0.15));
+	selection_box_mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+	st_xray->set_material(selection_box_mat_xray);
 	selection_box_xray = st_xray->commit();
+
+	active_selection_box_mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+	active_selection_box_mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	active_selection_box_mat->set_albedo(active_selection_box_color);
+	active_selection_box_mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+	active_st->set_material(active_selection_box_mat);
+	active_selection_box = active_st->commit();
+
+	active_selection_box_mat_xray->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+	active_selection_box_mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	active_selection_box_mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
+	active_selection_box_mat_xray->set_albedo(active_selection_box_color * Color(1, 1, 1, 0.15));
+	active_selection_box_mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+	active_st_xray->set_material(active_selection_box_mat_xray);
+	active_selection_box_xray = active_st_xray->commit();
 }
 
 Dictionary Node3DEditor::get_state() const {
@@ -6410,17 +6494,17 @@ Dictionary Node3DEditor::get_state() const {
 	d["local_coords"] = tool_option_button[TOOL_OPT_LOCAL_COORDS]->is_pressed();
 
 	int vc = 0;
-	if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT))) {
+	if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT))) {
 		vc = 1;
-	} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS))) {
+	} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS))) {
 		vc = 2;
-	} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS))) {
+	} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS))) {
 		vc = 3;
-	} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS))) {
+	} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS))) {
 		vc = 4;
-	} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT))) {
+	} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT))) {
 		vc = 5;
-	} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT))) {
+	} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT))) {
 		vc = 6;
 	}
 
@@ -6432,8 +6516,8 @@ Dictionary Node3DEditor::get_state() const {
 
 	d["viewports"] = vpdata;
 
-	d["show_grid"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_GRID));
-	d["show_origin"] = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN));
+	d["show_grid"] = view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_GRID));
+	d["show_origin"] = view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN));
 	d["fov"] = get_fov();
 	d["znear"] = get_znear();
 	d["zfar"] = get_zfar();
@@ -6461,7 +6545,7 @@ Dictionary Node3DEditor::get_state() const {
 		pd["environ_tonemap_enabled"] = environ_tonemap_button->is_pressed();
 		pd["environ_ao_enabled"] = environ_ao_button->is_pressed();
 		pd["environ_gi_enabled"] = environ_gi_button->is_pressed();
-		pd["sun_max_distance"] = sun_max_distance->get_value();
+		pd["sun_shadow_max_distance"] = sun_shadow_max_distance->get_value();
 
 		pd["sun_color"] = sun_color->get_pick_color();
 		pd["sun_energy"] = sun_energy->get_value();
@@ -6545,7 +6629,7 @@ void Node3DEditor::set_state(const Dictionary &p_state) {
 	if (d.has("show_grid")) {
 		bool use = d["show_grid"];
 
-		if (use != view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_GRID))) {
+		if (use != view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_GRID))) {
 			_menu_item_pressed(MENU_VIEW_GRID);
 		}
 	}
@@ -6553,25 +6637,23 @@ void Node3DEditor::set_state(const Dictionary &p_state) {
 	if (d.has("show_origin")) {
 		bool use = d["show_origin"];
 
-		if (use != view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN))) {
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), use);
+		if (use != view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN))) {
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), use);
 			RenderingServer::get_singleton()->instance_set_visible(origin_instance, use);
 		}
 	}
 
 	if (d.has("gizmos_status")) {
 		Dictionary gizmos_status = d["gizmos_status"];
-		List<Variant> keys;
-		gizmos_status.get_key_list(&keys);
 
 		for (int j = 0; j < gizmo_plugins_by_name.size(); ++j) {
 			if (!gizmo_plugins_by_name[j]->can_be_hidden()) {
 				continue;
 			}
 			int state = EditorNode3DGizmoPlugin::VISIBLE;
-			for (const Variant &key : keys) {
-				if (gizmo_plugins_by_name.write[j]->get_gizmo_name() == String(key)) {
-					state = gizmos_status[key];
+			for (const KeyValue<Variant, Variant> &kv : gizmos_status) {
+				if (gizmo_plugins_by_name.write[j]->get_gizmo_name() == String(kv.key)) {
+					state = kv.value;
 					break;
 				}
 			}
@@ -6588,15 +6670,15 @@ void Node3DEditor::set_state(const Dictionary &p_state) {
 
 		environ_sky_color->set_pick_color(pd["environ_sky_color"]);
 		environ_ground_color->set_pick_color(pd["environ_ground_color"]);
-		environ_energy->set_value(pd["environ_energy"]);
-		environ_glow_button->set_pressed(pd["environ_glow_enabled"]);
-		environ_tonemap_button->set_pressed(pd["environ_tonemap_enabled"]);
-		environ_ao_button->set_pressed(pd["environ_ao_enabled"]);
-		environ_gi_button->set_pressed(pd["environ_gi_enabled"]);
-		sun_max_distance->set_value(pd["sun_max_distance"]);
+		environ_energy->set_value_no_signal(pd["environ_energy"]);
+		environ_glow_button->set_pressed_no_signal(pd["environ_glow_enabled"]);
+		environ_tonemap_button->set_pressed_no_signal(pd["environ_tonemap_enabled"]);
+		environ_ao_button->set_pressed_no_signal(pd["environ_ao_enabled"]);
+		environ_gi_button->set_pressed_no_signal(pd["environ_gi_enabled"]);
+		sun_shadow_max_distance->set_value_no_signal(pd["sun_shadow_max_distance"]);
 
 		sun_color->set_pick_color(pd["sun_color"]);
-		sun_energy->set_value(pd["sun_energy"]);
+		sun_energy->set_value_no_signal(pd["sun_energy"]);
 
 		sun_button->set_pressed(pd["sun_enabled"]);
 		environ_button->set_pressed(pd["environ_enabled"]);
@@ -6693,7 +6775,7 @@ void Node3DEditor::_xform_dialog_action() {
 	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
 	undo_redo->create_action(TTR("XForm Dialog"));
 
-	const List<Node *> &selection = editor_selection->get_selected_node_list();
+	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 	for (Node *E : selection) {
 		Node3D *sp = Object::cast_to<Node3D>(E);
@@ -6746,13 +6828,13 @@ void Node3DEditor::_menu_gizmo_toggled(int p_option) {
 	const int state = gizmos_menu->get_item_state(idx);
 	switch (state) {
 		case EditorNode3DGizmoPlugin::VISIBLE:
-			gizmos_menu->set_item_icon(idx, view_menu->get_popup()->get_theme_icon(SNAME("visibility_visible")));
+			gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityVisible")));
 			break;
 		case EditorNode3DGizmoPlugin::ON_TOP:
-			gizmos_menu->set_item_icon(idx, view_menu->get_popup()->get_theme_icon(SNAME("visibility_xray")));
+			gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityXray")));
 			break;
 		case EditorNode3DGizmoPlugin::HIDDEN:
-			gizmos_menu->set_item_icon(idx, view_menu->get_popup()->get_theme_icon(SNAME("visibility_hidden")));
+			gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityHidden")));
 			break;
 	}
 
@@ -6795,12 +6877,12 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 				last_used_viewport = 0;
 			}
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), true);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), true);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
 
 		} break;
 		case MENU_VIEW_USE_2_VIEWPORTS: {
@@ -6809,12 +6891,12 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 				last_used_viewport = 0;
 			}
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), true);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), true);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
 
 		} break;
 		case MENU_VIEW_USE_2_VIEWPORTS_ALT: {
@@ -6823,12 +6905,12 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 				last_used_viewport = 0;
 			}
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), true);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), true);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
 
 		} break;
 		case MENU_VIEW_USE_3_VIEWPORTS: {
@@ -6837,12 +6919,12 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 				last_used_viewport = 0;
 			}
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), true);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), true);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
 
 		} break;
 		case MENU_VIEW_USE_3_VIEWPORTS_ALT: {
@@ -6851,27 +6933,27 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 				last_used_viewport = 0;
 			}
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), true);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), true);
 
 		} break;
 		case MENU_VIEW_USE_4_VIEWPORTS: {
 			viewport_base->set_view(Node3DEditorViewportContainer::VIEW_USE_4_VIEWPORTS);
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), true);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), true);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), false);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), false);
 
 		} break;
 		case MENU_VIEW_ORIGIN: {
-			bool is_checked = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(p_option));
+			bool is_checked = view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(p_option));
 
 			origin_enabled = !is_checked;
 			RenderingServer::get_singleton()->instance_set_visible(origin_instance, origin_enabled);
@@ -6879,10 +6961,10 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 			_finish_grid();
 			_init_grid();
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(p_option), origin_enabled);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(p_option), origin_enabled);
 		} break;
 		case MENU_VIEW_GRID: {
-			bool is_checked = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(p_option));
+			bool is_checked = view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(p_option));
 
 			grid_enabled = !is_checked;
 
@@ -6894,7 +6976,7 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 			_finish_grid();
 			_init_grid();
 
-			view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(p_option), grid_enabled);
+			view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(p_option), grid_enabled);
 
 		} break;
 		case MENU_VIEW_CAMERA_SETTINGS: {
@@ -6906,7 +6988,7 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 		case MENU_LOCK_SELECTED: {
 			undo_redo->create_action(TTR("Lock Selected"));
 
-			List<Node *> &selection = editor_selection->get_selected_node_list();
+			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 			for (Node *E : selection) {
 				Node3D *spatial = Object::cast_to<Node3D>(E);
@@ -6927,7 +7009,7 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 		case MENU_UNLOCK_SELECTED: {
 			undo_redo->create_action(TTR("Unlock Selected"));
 
-			List<Node *> &selection = editor_selection->get_selected_node_list();
+			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 			for (Node *E : selection) {
 				Node3D *spatial = Object::cast_to<Node3D>(E);
@@ -6948,7 +7030,7 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 		case MENU_GROUP_SELECTED: {
 			undo_redo->create_action(TTR("Group Selected"));
 
-			List<Node *> &selection = editor_selection->get_selected_node_list();
+			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 			for (Node *E : selection) {
 				Node3D *spatial = Object::cast_to<Node3D>(E);
@@ -6968,7 +7050,7 @@ void Node3DEditor::_menu_item_pressed(int p_option) {
 		} break;
 		case MENU_UNGROUP_SELECTED: {
 			undo_redo->create_action(TTR("Ungroup Selected"));
-			List<Node *> &selection = editor_selection->get_selected_node_list();
+			const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 			for (Node *E : selection) {
 				Node3D *spatial = Object::cast_to<Node3D>(E);
@@ -7242,7 +7324,7 @@ void fragment() {
 
 				int arrow_sides = 16;
 
-				const real_t arrow_sides_step = Math_TAU / arrow_sides;
+				const real_t arrow_sides_step = Math::TAU / arrow_sides;
 				for (int k = 0; k < arrow_sides; k++) {
 					Basis ma(ivec, k * arrow_sides_step);
 					Basis mb(ivec, (k + 1) * arrow_sides_step);
@@ -7281,7 +7363,7 @@ void fragment() {
 					vec * GIZMO_PLANE_DST - ivec3 * GIZMO_PLANE_SIZE
 				};
 
-				Basis ma(ivec, Math_PI / 2);
+				Basis ma(ivec, Math::PI / 2);
 
 				Vector3 points[4] = {
 					ma.xform(plane[0]),
@@ -7321,14 +7403,14 @@ void fragment() {
 				int n = 128; // number of circle segments
 				int m = 3; // number of thickness segments
 
-				real_t step = Math_TAU / n;
+				real_t step = Math::TAU / n;
 				for (int j = 0; j < n; ++j) {
 					Basis basis = Basis(ivec, j * step);
 
 					Vector3 vertex = basis.xform(ivec2 * GIZMO_CIRCLE_SIZE);
 
 					for (int k = 0; k < m; ++k) {
-						Vector2 ofs = Vector2(Math::cos((Math_TAU * k) / m), Math::sin((Math_TAU * k) / m));
+						Vector2 ofs = Vector2(Math::cos((Math::TAU * k) / m), Math::sin((Math::TAU * k) / m));
 						Vector3 normal = ivec * ofs.x + ivec2 * ofs.y;
 
 						surftool->set_normal(basis.xform(normal));
@@ -7465,7 +7547,7 @@ void fragment() {
 
 				int arrow_sides = 4;
 
-				const real_t arrow_sides_step = Math_TAU / arrow_sides;
+				const real_t arrow_sides_step = Math::TAU / arrow_sides;
 				for (int k = 0; k < 4; k++) {
 					Basis ma(ivec, k * arrow_sides_step);
 					Basis mb(ivec, (k + 1) * arrow_sides_step);
@@ -7504,7 +7586,7 @@ void fragment() {
 					vec * GIZMO_PLANE_DST - ivec3 * GIZMO_PLANE_SIZE
 				};
 
-				Basis ma(ivec, Math_PI / 2);
+				Basis ma(ivec, Math::PI / 2);
 
 				Vector3 points[4] = {
 					ma.xform(plane[0]),
@@ -7573,13 +7655,13 @@ void Node3DEditor::_update_gizmos_menu() {
 				TTR("Click to toggle between visibility states.\n\nOpen eye: Gizmo is visible.\nClosed eye: Gizmo is hidden.\nHalf-open eye: Gizmo is also visible through opaque surfaces (\"x-ray\")."));
 		switch (plugin_state) {
 			case EditorNode3DGizmoPlugin::VISIBLE:
-				gizmos_menu->set_item_icon(idx, gizmos_menu->get_theme_icon(SNAME("visibility_visible")));
+				gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityVisible")));
 				break;
 			case EditorNode3DGizmoPlugin::ON_TOP:
-				gizmos_menu->set_item_icon(idx, gizmos_menu->get_theme_icon(SNAME("visibility_xray")));
+				gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityXray")));
 				break;
 			case EditorNode3DGizmoPlugin::HIDDEN:
-				gizmos_menu->set_item_icon(idx, gizmos_menu->get_theme_icon(SNAME("visibility_hidden")));
+				gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityHidden")));
 				break;
 		}
 	}
@@ -7594,13 +7676,13 @@ void Node3DEditor::_update_gizmos_menu_theme() {
 		const int idx = gizmos_menu->get_item_index(i);
 		switch (plugin_state) {
 			case EditorNode3DGizmoPlugin::VISIBLE:
-				gizmos_menu->set_item_icon(idx, gizmos_menu->get_theme_icon(SNAME("visibility_visible")));
+				gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityVisible")));
 				break;
 			case EditorNode3DGizmoPlugin::ON_TOP:
-				gizmos_menu->set_item_icon(idx, gizmos_menu->get_theme_icon(SNAME("visibility_xray")));
+				gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityXray")));
 				break;
 			case EditorNode3DGizmoPlugin::HIDDEN:
-				gizmos_menu->set_item_icon(idx, gizmos_menu->get_theme_icon(SNAME("visibility_hidden")));
+				gizmos_menu->set_item_icon(idx, get_editor_theme_icon(SNAME("GuiVisibilityHidden")));
 				break;
 		}
 	}
@@ -7831,7 +7913,34 @@ void Node3DEditor::update_grid() {
 
 void Node3DEditor::_selection_changed() {
 	_refresh_menu_icons();
-	if (selected && editor_selection->get_selected_node_list().size() != 1) {
+
+	const HashMap<Node *, Object *> &selection = editor_selection->get_selection();
+
+	for (const KeyValue<Node *, Object *> &E : selection) {
+		Node3D *sp = Object::cast_to<Node3D>(E.key);
+		if (!sp) {
+			continue;
+		}
+
+		Node3DEditorSelectedItem *se = editor_selection->get_node_editor_data<Node3DEditorSelectedItem>(sp);
+		if (!se) {
+			continue;
+		}
+
+		if (sp == editor_selection->get_top_selected_node_list().back()->get()) {
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance, active_selection_box->get_rid());
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray, active_selection_box_xray->get_rid());
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_offset, active_selection_box->get_rid());
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray_offset, active_selection_box_xray->get_rid());
+		} else {
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance, selection_box->get_rid());
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray, selection_box_xray->get_rid());
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_offset, selection_box->get_rid());
+			RenderingServer::get_singleton()->instance_set_base(se->sbox_instance_xray_offset, selection_box_xray->get_rid());
+		}
+	}
+
+	if (selected && editor_selection->get_top_selected_node_list().size() != 1) {
 		Vector<Ref<Node3DGizmo>> gizmos = selected->get_gizmos();
 		for (int i = 0; i < gizmos.size(); i++) {
 			Ref<EditorNode3DGizmo> seg = gizmos[i];
@@ -7857,7 +7966,7 @@ void Node3DEditor::_refresh_menu_icons() {
 	bool all_grouped = true;
 	bool has_node3d_item = false;
 
-	List<Node *> &selection = editor_selection->get_selected_node_list();
+	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 
 	if (selection.is_empty()) {
 		all_locked = false;
@@ -7932,7 +8041,7 @@ void Node3DEditor::snap_selected_nodes_to_floor() {
 }
 
 void Node3DEditor::_snap_selected_nodes_to_floor() {
-	const List<Node *> &selection = editor_selection->get_selected_node_list();
+	const List<Node *> &selection = editor_selection->get_top_selected_node_list();
 	Dictionary snap_data;
 
 	for (Node *E : selection) {
@@ -7997,21 +8106,19 @@ void Node3DEditor::_snap_selected_nodes_to_floor() {
 	PhysicsDirectSpaceState3D *ss = get_tree()->get_root()->get_world_3d()->get_direct_space_state();
 	PhysicsDirectSpaceState3D::RayResult result;
 
-	Array keys = snap_data.keys();
-
 	// The maximum height an object can travel to be snapped
 	const float max_snap_height = 500.0;
 
 	// Will be set to `true` if at least one node from the selection was successfully snapped
 	bool snapped_to_floor = false;
 
-	if (keys.size()) {
+	if (!snap_data.is_empty()) {
 		// For snapping to be performed, there must be solid geometry under at least one of the selected nodes.
 		// We need to check this before snapping to register the undo/redo action only if needed.
-		for (int i = 0; i < keys.size(); i++) {
-			Node *node = Object::cast_to<Node>(keys[i]);
+		for (const KeyValue<Variant, Variant> &kv : snap_data) {
+			Node *node = Object::cast_to<Node>(kv.key);
 			Node3D *sp = Object::cast_to<Node3D>(node);
-			Dictionary d = snap_data[node];
+			Dictionary d = kv.value;
 			Vector3 from = d["from"];
 			Vector3 to = from - Vector3(0.0, max_snap_height, 0.0);
 			HashSet<RID> excluded = _get_physics_bodies_rid(sp);
@@ -8031,10 +8138,10 @@ void Node3DEditor::_snap_selected_nodes_to_floor() {
 			undo_redo->create_action(TTR("Snap Nodes to Floor"));
 
 			// Perform snapping if at least one node can be snapped
-			for (int i = 0; i < keys.size(); i++) {
-				Node *node = Object::cast_to<Node>(keys[i]);
+			for (const KeyValue<Variant, Variant> &kv : snap_data) {
+				Node *node = Object::cast_to<Node>(kv.key);
 				Node3D *sp = Object::cast_to<Node3D>(node);
-				Dictionary d = snap_data[node];
+				Dictionary d = kv.value;
 				Vector3 from = d["from"];
 				Vector3 to = from - Vector3(0.0, max_snap_height, 0.0);
 				HashSet<RID> excluded = _get_physics_bodies_rid(sp);
@@ -8163,12 +8270,12 @@ void Node3DEditor::_update_theme() {
 	tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_button_icon(get_editor_theme_icon(SNAME("Object")));
 	tool_option_button[TOOL_OPT_USE_SNAP]->set_button_icon(get_editor_theme_icon(SNAME("Snap")));
 
-	view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), get_editor_theme_icon(SNAME("Panels1")));
-	view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), get_editor_theme_icon(SNAME("Panels2")));
-	view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), get_editor_theme_icon(SNAME("Panels2Alt")));
-	view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), get_editor_theme_icon(SNAME("Panels3")));
-	view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), get_editor_theme_icon(SNAME("Panels3Alt")));
-	view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), get_editor_theme_icon(SNAME("Panels4")));
+	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), get_editor_theme_icon(SNAME("Panels1")));
+	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), get_editor_theme_icon(SNAME("Panels2")));
+	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT), get_editor_theme_icon(SNAME("Panels2Alt")));
+	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS), get_editor_theme_icon(SNAME("Panels3")));
+	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT), get_editor_theme_icon(SNAME("Panels3Alt")));
+	view_layout_menu->get_popup()->set_item_icon(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS), get_editor_theme_icon(SNAME("Panels4")));
 
 	sun_button->set_button_icon(get_editor_theme_icon(SNAME("PreviewSun")));
 	environ_button->set_button_icon(get_editor_theme_icon(SNAME("PreviewEnvironment")));
@@ -8204,6 +8311,15 @@ void Node3DEditor::_notification(int p_what) {
 			ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &Node3DEditor::update_all_gizmos).bind(Variant()));
 		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			//TODO
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, TTR(vformat("The %s is not accessible at this time.", "3D editor")));
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			_update_theme();
 			_register_all_gizmos();
@@ -8224,8 +8340,21 @@ void Node3DEditor::_notification(int p_what) {
 		} break;
 
 		case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
-			// Update grid color by rebuilding grid.
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("editors/3d")) {
+				const Color selection_box_color = EDITOR_GET("editors/3d/selection_box_color");
+				const Color active_selection_box_color = EDITOR_GET("editors/3d/active_selection_box_color");
+
+				if (selection_box_color != selection_box_mat->get_albedo()) {
+					selection_box_mat->set_albedo(selection_box_color);
+					selection_box_mat_xray->set_albedo(selection_box_color * Color(1, 1, 1, 0.15));
+				}
+
+				if (active_selection_box_color != active_selection_box_mat->get_albedo()) {
+					active_selection_box_mat->set_albedo(active_selection_box_color);
+					active_selection_box_mat_xray->set_albedo(active_selection_box_color * Color(1, 1, 1, 0.15));
+				}
+
+				// Update grid color by rebuilding grid.
 				_finish_grid();
 				_init_grid();
 			}
@@ -8406,7 +8535,7 @@ void Node3DEditor::_request_gizmo(Object *p_obj) {
 }
 
 void Node3DEditor::_request_gizmo_for_id(ObjectID p_id) {
-	Node3D *node = Object::cast_to<Node3D>(ObjectDB::get_instance(p_id));
+	Node3D *node = ObjectDB::get_instance<Node3D>(p_id);
 	if (node) {
 		_request_gizmo(node);
 	}
@@ -8497,17 +8626,17 @@ void Node3DEditor::_toggle_maximize_view(Object *p_viewport) {
 			viewports[i]->show();
 		}
 
-		if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT))) {
+		if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT))) {
 			_menu_item_pressed(MENU_VIEW_USE_1_VIEWPORT);
-		} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS))) {
+		} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS))) {
 			_menu_item_pressed(MENU_VIEW_USE_2_VIEWPORTS);
-		} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT))) {
+		} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS_ALT))) {
 			_menu_item_pressed(MENU_VIEW_USE_2_VIEWPORTS_ALT);
-		} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS))) {
+		} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS))) {
 			_menu_item_pressed(MENU_VIEW_USE_3_VIEWPORTS);
-		} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT))) {
+		} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_3_VIEWPORTS_ALT))) {
 			_menu_item_pressed(MENU_VIEW_USE_3_VIEWPORTS_ALT);
-		} else if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS))) {
+		} else if (view_layout_menu->get_popup()->is_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_USE_4_VIEWPORTS))) {
 			_menu_item_pressed(MENU_VIEW_USE_4_VIEWPORTS);
 		}
 	}
@@ -8604,6 +8733,7 @@ void Node3DEditor::_bind_methods() {
 	ClassDB::bind_method("_set_subgizmo_selection", &Node3DEditor::_set_subgizmo_selection);
 	ClassDB::bind_method("_clear_subgizmo_selection", &Node3DEditor::_clear_subgizmo_selection);
 	ClassDB::bind_method("_refresh_menu_icons", &Node3DEditor::_refresh_menu_icons);
+	ClassDB::bind_method("_preview_settings_changed", &Node3DEditor::_preview_settings_changed);
 
 	ClassDB::bind_method("update_all_gizmos", &Node3DEditor::update_all_gizmos);
 	ClassDB::bind_method("update_transform_gizmo", &Node3DEditor::update_transform_gizmo);
@@ -8631,7 +8761,7 @@ void Node3DEditor::clear() {
 		RenderingServer::get_singleton()->instance_set_visible(origin_instance, true);
 	}
 
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), true);
+	view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), true);
 	for (int i = 0; i < 3; ++i) {
 		if (grid_enable[i]) {
 			grid_visible[i] = true;
@@ -8639,11 +8769,11 @@ void Node3DEditor::clear() {
 	}
 
 	for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
-		viewports[i]->view_menu->get_popup()->set_item_checked(viewports[i]->view_menu->get_popup()->get_item_index(Node3DEditorViewport::VIEW_AUDIO_LISTENER), i == 0);
+		viewports[i]->view_display_menu->get_popup()->set_item_checked(viewports[i]->view_display_menu->get_popup()->get_item_index(Node3DEditorViewport::VIEW_AUDIO_LISTENER), i == 0);
 		viewports[i]->viewport->set_as_audio_listener_3d(i == 0);
 	}
 
-	view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_GRID), true);
+	view_layout_menu->get_popup()->set_item_checked(view_layout_menu->get_popup()->get_item_index(MENU_VIEW_GRID), true);
 	grid_enabled = true;
 	grid_init_draw = false;
 }
@@ -8663,12 +8793,14 @@ void Node3DEditor::_preview_settings_changed() {
 	}
 
 	{ // preview sun
+		sun_rotation.x = Math::deg_to_rad(-sun_angle_altitude->get_value());
+		sun_rotation.y = Math::deg_to_rad(180.0 - sun_angle_azimuth->get_value());
 		Transform3D t;
 		t.basis = Basis::from_euler(Vector3(sun_rotation.x, sun_rotation.y, 0));
 		preview_sun->set_transform(t);
 		sun_direction->queue_redraw();
 		preview_sun->set_param(Light3D::PARAM_ENERGY, sun_energy->get_value());
-		preview_sun->set_param(Light3D::PARAM_SHADOW_MAX_DISTANCE, sun_max_distance->get_value());
+		preview_sun->set_param(Light3D::PARAM_SHADOW_MAX_DISTANCE, sun_shadow_max_distance->get_value());
 		preview_sun->set_color(sun_color->get_pick_color());
 	}
 
@@ -8700,22 +8832,22 @@ void Node3DEditor::_load_default_preview_settings() {
 	// The azimuth choice is arbitrary, but ideally shouldn't be on an axis.
 	sun_rotation = Vector2(-Math::deg_to_rad(60.0), Math::deg_to_rad(150.0));
 
-	sun_angle_altitude->set_value(-Math::rad_to_deg(sun_rotation.x));
-	sun_angle_azimuth->set_value(180.0 - Math::rad_to_deg(sun_rotation.y));
+	sun_angle_altitude->set_value_no_signal(-Math::rad_to_deg(sun_rotation.x));
+	sun_angle_azimuth->set_value_no_signal(180.0 - Math::rad_to_deg(sun_rotation.y));
 	sun_direction->queue_redraw();
 	environ_sky_color->set_pick_color(Color(0.385, 0.454, 0.55));
 	environ_ground_color->set_pick_color(Color(0.2, 0.169, 0.133));
-	environ_energy->set_value(1.0);
-	if (OS::get_singleton()->get_current_rendering_method() != "gl_compatibility") {
-		environ_glow_button->set_pressed(true);
+	environ_energy->set_value_no_signal(1.0);
+	if (OS::get_singleton()->get_current_rendering_method() != "gl_compatibility" && OS::get_singleton()->get_current_rendering_method() != "dummy") {
+		environ_glow_button->set_pressed_no_signal(true);
 	}
-	environ_tonemap_button->set_pressed(true);
-	environ_ao_button->set_pressed(false);
-	environ_gi_button->set_pressed(false);
-	sun_max_distance->set_value(100);
+	environ_tonemap_button->set_pressed_no_signal(true);
+	environ_ao_button->set_pressed_no_signal(false);
+	environ_gi_button->set_pressed_no_signal(false);
+	sun_shadow_max_distance->set_value_no_signal(100);
 
 	sun_color->set_pick_color(Color(1, 1, 1));
-	sun_energy->set_value(1.0);
+	sun_energy->set_value_no_signal(1.0);
 
 	sun_environ_updating = false;
 }
@@ -8748,8 +8880,8 @@ void Node3DEditor::_update_preview_environment() {
 		}
 	}
 
-	sun_angle_altitude->set_value(-Math::rad_to_deg(sun_rotation.x));
-	sun_angle_azimuth->set_value(180.0 - Math::rad_to_deg(sun_rotation.y));
+	sun_angle_altitude->set_value_no_signal(-Math::rad_to_deg(sun_rotation.x));
+	sun_angle_azimuth->set_value_no_signal(180.0 - Math::rad_to_deg(sun_rotation.y));
 
 	bool disable_env = world_env_count > 0 || !environ_button->is_pressed();
 
@@ -8780,20 +8912,162 @@ void Node3DEditor::_update_preview_environment() {
 
 void Node3DEditor::_sun_direction_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventMouseMotion> mm = p_event;
-	if (mm.is_valid() && (mm->get_button_mask().has_flag(MouseButtonMask::LEFT))) {
+	if (mm.is_valid() && mm->get_button_mask().has_flag(MouseButtonMask::LEFT)) {
 		sun_rotation.x += mm->get_relative().y * (0.02 * EDSCALE);
 		sun_rotation.y -= mm->get_relative().x * (0.02 * EDSCALE);
-		sun_rotation.x = CLAMP(sun_rotation.x, -Math_TAU / 4, Math_TAU / 4);
-		sun_angle_altitude->set_value(-Math::rad_to_deg(sun_rotation.x));
-		sun_angle_azimuth->set_value(180.0 - Math::rad_to_deg(sun_rotation.y));
-		_preview_settings_changed();
+		sun_rotation.x = CLAMP(sun_rotation.x, -Math::TAU / 4, Math::TAU / 4);
+
+		EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+		undo_redo->create_action(TTR("Set Preview Sun Direction"), UndoRedo::MergeMode::MERGE_ENDS);
+		undo_redo->add_do_method(sun_angle_altitude, "set_value_no_signal", -Math::rad_to_deg(sun_rotation.x));
+		undo_redo->add_undo_method(sun_angle_altitude, "set_value_no_signal", sun_angle_altitude->get_value());
+		undo_redo->add_do_method(sun_angle_azimuth, "set_value_no_signal", 180.0 - Math::rad_to_deg(sun_rotation.y));
+		undo_redo->add_undo_method(sun_angle_azimuth, "set_value_no_signal", sun_angle_azimuth->get_value());
+		undo_redo->add_do_method(this, "_preview_settings_changed");
+		undo_redo->add_undo_method(this, "_preview_settings_changed");
+		undo_redo->commit_action();
 	}
 }
 
-void Node3DEditor::_sun_direction_angle_set() {
-	sun_rotation.x = Math::deg_to_rad(-sun_angle_altitude->get_value());
-	sun_rotation.y = Math::deg_to_rad(180.0 - sun_angle_azimuth->get_value());
-	_preview_settings_changed();
+void Node3DEditor::_sun_direction_set_altitude(float p_altitude) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Sun Altitude"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(sun_angle_altitude, "set_value_no_signal", p_altitude);
+	undo_redo->add_undo_method(sun_angle_altitude, "set_value_no_signal", -Math::rad_to_deg(sun_rotation.x));
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_sun_direction_set_azimuth(float p_azimuth) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Sun Azimuth"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(sun_angle_azimuth, "set_value_no_signal", p_azimuth);
+	undo_redo->add_undo_method(sun_angle_azimuth, "set_value_no_signal", 180.0 - Math::rad_to_deg(sun_rotation.y));
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_sun_set_color(const Color &p_color) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Sun Color"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(sun_color, "set_pick_color", p_color);
+	undo_redo->add_undo_method(sun_color, "set_pick_color", preview_sun->get_color());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_sun_set_energy(float p_energy) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Sun Energy"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(sun_energy, "set_value_no_signal", p_energy);
+	undo_redo->add_undo_method(sun_energy, "set_value_no_signal", preview_sun->get_param(Light3D::PARAM_ENERGY));
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_sun_set_shadow_max_distance(float p_shadow_max_distance) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Sun Max Shadow Distance"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(sun_shadow_max_distance, "set_value_no_signal", p_shadow_max_distance);
+	undo_redo->add_undo_method(sun_shadow_max_distance, "set_value_no_signal", preview_sun->get_param(Light3D::PARAM_SHADOW_MAX_DISTANCE));
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_environ_set_sky_color(const Color &p_color) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Environment Sky Color"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(environ_sky_color, "set_pick_color", p_color);
+	undo_redo->add_undo_method(environ_sky_color, "set_pick_color", sky_material->get_sky_top_color());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_environ_set_ground_color(const Color &p_color) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Environment Ground Color"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(environ_ground_color, "set_pick_color", p_color);
+	undo_redo->add_undo_method(environ_ground_color, "set_pick_color", sky_material->get_ground_bottom_color());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_environ_set_sky_energy(float p_energy) {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Environment Energy"), UndoRedo::MergeMode::MERGE_ENDS);
+	undo_redo->add_do_method(environ_energy, "set_value_no_signal", p_energy);
+	undo_redo->add_undo_method(environ_energy, "set_value_no_signal", sky_material->get_energy_multiplier());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_environ_set_ao() {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Environment Ambient Occlusion"));
+	undo_redo->add_do_method(environ_ao_button, "set_pressed", environ_ao_button->is_pressed());
+	undo_redo->add_undo_method(environ_ao_button, "set_pressed", !environ_ao_button->is_pressed());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_environ_set_glow() {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Environment Glow"));
+	undo_redo->add_do_method(environ_glow_button, "set_pressed", environ_glow_button->is_pressed());
+	undo_redo->add_undo_method(environ_glow_button, "set_pressed", !environ_glow_button->is_pressed());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_environ_set_tonemap() {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Environment Tonemap"));
+	undo_redo->add_do_method(environ_tonemap_button, "set_pressed", environ_tonemap_button->is_pressed());
+	undo_redo->add_undo_method(environ_tonemap_button, "set_pressed", !environ_tonemap_button->is_pressed());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::_environ_set_gi() {
+	EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
+	undo_redo->create_action(TTR("Set Preview Environment Global Illumination"));
+	undo_redo->add_do_method(environ_gi_button, "set_pressed", environ_gi_button->is_pressed());
+	undo_redo->add_undo_method(environ_gi_button, "set_pressed", !environ_gi_button->is_pressed());
+	undo_redo->add_do_method(this, "_preview_settings_changed");
+	undo_redo->add_undo_method(this, "_preview_settings_changed");
+	undo_redo->commit_action();
+}
+
+void Node3DEditor::PreviewSunEnvPopup::shortcut_input(const Ref<InputEvent> &p_event) {
+	const Ref<InputEventKey> k = p_event;
+	if (k.is_valid() && k->is_pressed()) {
+		bool handled = false;
+
+		if (ED_IS_SHORTCUT("ui_undo", p_event)) {
+			EditorNode::get_singleton()->undo();
+			handled = true;
+		}
+
+		if (ED_IS_SHORTCUT("ui_redo", p_event)) {
+			EditorNode::get_singleton()->redo();
+			handled = true;
+		}
+
+		if (handled) {
+			set_input_as_handled();
+		}
+	}
 }
 
 Node3DEditor::Node3DEditor() {
@@ -8837,9 +9111,10 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_MODE_SELECT]->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_button[TOOL_MODE_SELECT]->set_pressed(true);
 	tool_button[TOOL_MODE_SELECT]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_TOOL_SELECT));
-	tool_button[TOOL_MODE_SELECT]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_select", TTRC("Select Mode"), Key::Q));
+	tool_button[TOOL_MODE_SELECT]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_select", TTRC("Select Mode"), Key::Q, true));
 	tool_button[TOOL_MODE_SELECT]->set_shortcut_context(this);
 	tool_button[TOOL_MODE_SELECT]->set_tooltip_text(keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Drag: Rotate selected node around pivot.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked.") + "\n" + TTR("(Available in all modes.)"));
+	tool_button[TOOL_MODE_SELECT]->set_accessibility_name(TTRC("Select Mode"));
 	main_menu_hbox->add_child(memnew(VSeparator));
 
 	tool_button[TOOL_MODE_MOVE] = memnew(Button);
@@ -8848,27 +9123,30 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_MODE_MOVE]->set_theme_type_variation(SceneStringName(FlatButton));
 
 	tool_button[TOOL_MODE_MOVE]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_TOOL_MOVE));
-	tool_button[TOOL_MODE_MOVE]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_move", TTRC("Move Mode"), Key::W));
+	tool_button[TOOL_MODE_MOVE]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_move", TTRC("Move Mode"), Key::W, true));
 	tool_button[TOOL_MODE_MOVE]->set_shortcut_context(this);
 	tool_button[TOOL_MODE_MOVE]->set_tooltip_text(keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Drag: Use snap.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked."));
+	tool_button[TOOL_MODE_MOVE]->set_accessibility_name(TTRC("Move Mode"));
 
 	tool_button[TOOL_MODE_ROTATE] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_MODE_ROTATE]);
 	tool_button[TOOL_MODE_ROTATE]->set_toggle_mode(true);
 	tool_button[TOOL_MODE_ROTATE]->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_button[TOOL_MODE_ROTATE]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_TOOL_ROTATE));
-	tool_button[TOOL_MODE_ROTATE]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_rotate", TTRC("Rotate Mode"), Key::E));
+	tool_button[TOOL_MODE_ROTATE]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_rotate", TTRC("Rotate Mode"), Key::E, true));
 	tool_button[TOOL_MODE_ROTATE]->set_shortcut_context(this);
 	tool_button[TOOL_MODE_ROTATE]->set_tooltip_text(keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Drag: Use snap.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked."));
+	tool_button[TOOL_MODE_ROTATE]->set_accessibility_name(TTRC("Rotate Mode"));
 
 	tool_button[TOOL_MODE_SCALE] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_MODE_SCALE]);
 	tool_button[TOOL_MODE_SCALE]->set_toggle_mode(true);
 	tool_button[TOOL_MODE_SCALE]->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_button[TOOL_MODE_SCALE]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_TOOL_SCALE));
-	tool_button[TOOL_MODE_SCALE]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_scale", TTRC("Scale Mode"), Key::R));
+	tool_button[TOOL_MODE_SCALE]->set_shortcut(ED_SHORTCUT("spatial_editor/tool_scale", TTRC("Scale Mode"), Key::R, true));
 	tool_button[TOOL_MODE_SCALE]->set_shortcut_context(this);
 	tool_button[TOOL_MODE_SCALE]->set_tooltip_text(keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Drag: Use snap.") + "\n" + TTR("Alt+RMB: Show list of all nodes at position clicked, including locked."));
+	tool_button[TOOL_MODE_SCALE]->set_accessibility_name(TTRC("Scale Mode"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -8878,6 +9156,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_MODE_LIST_SELECT]->set_theme_type_variation(SceneStringName(FlatButton));
 	tool_button[TOOL_MODE_LIST_SELECT]->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed).bind(MENU_TOOL_LIST_SELECT));
 	tool_button[TOOL_MODE_LIST_SELECT]->set_tooltip_text(TTR("Show list of selectable nodes at position clicked."));
+	tool_button[TOOL_MODE_LIST_SELECT]->set_accessibility_name(TTRC("Show List of Selectable Nodes"));
 
 	tool_button[TOOL_LOCK_SELECTED] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_LOCK_SELECTED]);
@@ -8886,6 +9165,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_LOCK_SELECTED]->set_tooltip_text(TTRC("Lock selected node, preventing selection and movement."));
 	// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
 	tool_button[TOOL_LOCK_SELECTED]->set_shortcut(ED_GET_SHORTCUT("editor/lock_selected_nodes"));
+	tool_button[TOOL_LOCK_SELECTED]->set_accessibility_name(TTRC("Lock"));
 
 	tool_button[TOOL_UNLOCK_SELECTED] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_UNLOCK_SELECTED]);
@@ -8894,6 +9174,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_UNLOCK_SELECTED]->set_tooltip_text(TTRC("Unlock selected node, allowing selection and movement."));
 	// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
 	tool_button[TOOL_UNLOCK_SELECTED]->set_shortcut(ED_GET_SHORTCUT("editor/unlock_selected_nodes"));
+	tool_button[TOOL_UNLOCK_SELECTED]->set_accessibility_name(TTRC("Unlock"));
 
 	tool_button[TOOL_GROUP_SELECTED] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_GROUP_SELECTED]);
@@ -8902,6 +9183,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_GROUP_SELECTED]->set_tooltip_text(TTRC("Groups the selected node with its children. This selects the parent when any child node is clicked in 2D and 3D view."));
 	// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
 	tool_button[TOOL_GROUP_SELECTED]->set_shortcut(ED_GET_SHORTCUT("editor/group_selected_nodes"));
+	tool_button[TOOL_GROUP_SELECTED]->set_accessibility_name(TTRC("Group"));
 
 	tool_button[TOOL_UNGROUP_SELECTED] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_UNGROUP_SELECTED]);
@@ -8910,6 +9192,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_UNGROUP_SELECTED]->set_tooltip_text(TTRC("Ungroups the selected node from its children. Child nodes will be individual items in 2D and 3D view."));
 	// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
 	tool_button[TOOL_UNGROUP_SELECTED]->set_shortcut(ED_GET_SHORTCUT("editor/ungroup_selected_nodes"));
+	tool_button[TOOL_UNGROUP_SELECTED]->set_accessibility_name(TTRC("Ungroup"));
 
 	tool_button[TOOL_RULER] = memnew(Button);
 	main_menu_hbox->add_child(tool_button[TOOL_RULER]);
@@ -8919,6 +9202,7 @@ Node3DEditor::Node3DEditor() {
 	tool_button[TOOL_RULER]->set_tooltip_text(TTRC("LMB+Drag: Measure the distance between two points in 3D space."));
 	// Define the shortcut globally (without a context) so that it works if the Scene tree dock is currently focused.
 	tool_button[TOOL_RULER]->set_shortcut(ED_SHORTCUT("spatial_editor/measure", TTRC("Ruler Mode"), Key::M));
+	tool_button[TOOL_RULER]->set_accessibility_name(TTRC("Ruler Mode"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -8929,6 +9213,7 @@ Node3DEditor::Node3DEditor() {
 	tool_option_button[TOOL_OPT_LOCAL_COORDS]->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_LOCAL_COORDS));
 	tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_shortcut(ED_SHORTCUT("spatial_editor/local_coords", TTRC("Use Local Space"), Key::T));
 	tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_shortcut_context(this);
+	tool_option_button[TOOL_OPT_LOCAL_COORDS]->set_accessibility_name(TTRC("Use Local Space"));
 
 	tool_option_button[TOOL_OPT_USE_SNAP] = memnew(Button);
 	main_menu_hbox->add_child(tool_option_button[TOOL_OPT_USE_SNAP]);
@@ -8937,11 +9222,13 @@ Node3DEditor::Node3DEditor() {
 	tool_option_button[TOOL_OPT_USE_SNAP]->connect(SceneStringName(toggled), callable_mp(this, &Node3DEditor::_menu_item_toggled).bind(MENU_TOOL_USE_SNAP));
 	tool_option_button[TOOL_OPT_USE_SNAP]->set_shortcut(ED_SHORTCUT("spatial_editor/snap", TTRC("Use Snap"), Key::Y));
 	tool_option_button[TOOL_OPT_USE_SNAP]->set_shortcut_context(this);
+	tool_option_button[TOOL_OPT_USE_SNAP]->set_accessibility_name(TTRC("Use Snap"));
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 	sun_button = memnew(Button);
 	sun_button->set_tooltip_text(TTR("Toggle preview sunlight.\nIf a DirectionalLight3D node is added to the scene, preview sunlight is disabled."));
 	sun_button->set_toggle_mode(true);
+	sun_button->set_accessibility_name(TTRC("Preview Sunlight"));
 	sun_button->set_theme_type_variation(SceneStringName(FlatButton));
 	sun_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED);
 	// Preview is enabled by default - ensure this applies on editor startup when there is no state yet.
@@ -8952,6 +9239,7 @@ Node3DEditor::Node3DEditor() {
 	environ_button = memnew(Button);
 	environ_button->set_tooltip_text(TTR("Toggle preview environment.\nIf a WorldEnvironment node is added to the scene, preview environment is disabled."));
 	environ_button->set_toggle_mode(true);
+	environ_button->set_accessibility_name(TTRC("Preview Environment"));
 	environ_button->set_theme_type_variation(SceneStringName(FlatButton));
 	environ_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_update_preview_environment), CONNECT_DEFERRED);
 	// Preview is enabled by default - ensure this applies on editor startup when there is no state yet.
@@ -8962,6 +9250,7 @@ Node3DEditor::Node3DEditor() {
 	sun_environ_settings = memnew(Button);
 	sun_environ_settings->set_tooltip_text(TTR("Edit Sun and Environment settings."));
 	sun_environ_settings->set_theme_type_variation(SceneStringName(FlatButton));
+	sun_environ_settings->set_accessibility_name(TTRC("Edit Sun and Environment"));
 	sun_environ_settings->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_sun_environ_settings_pressed));
 
 	main_menu_hbox->add_child(sun_environ_settings);
@@ -9019,14 +9308,14 @@ Node3DEditor::Node3DEditor() {
 
 	p->connect(SceneStringName(id_pressed), callable_mp(this, &Node3DEditor::_menu_item_pressed));
 
-	view_menu = memnew(MenuButton);
-	view_menu->set_flat(false);
-	view_menu->set_theme_type_variation("FlatMenuButton");
+	view_layout_menu = memnew(MenuButton);
+	view_layout_menu->set_flat(false);
+	view_layout_menu->set_theme_type_variation("FlatMenuButton");
 	// TRANSLATORS: Noun, name of the 2D/3D View menus.
-	view_menu->set_text(TTR("View"));
-	view_menu->set_switch_on_hover(true);
-	view_menu->set_shortcut_context(this);
-	main_menu_hbox->add_child(view_menu);
+	view_layout_menu->set_text(TTR("View"));
+	view_layout_menu->set_switch_on_hover(true);
+	view_layout_menu->set_shortcut_context(this);
+	main_menu_hbox->add_child(view_layout_menu);
 
 	main_menu_hbox->add_child(memnew(VSeparator));
 
@@ -9036,7 +9325,7 @@ Node3DEditor::Node3DEditor() {
 	main_flow->add_child(context_toolbar_panel);
 
 	// Get the view menu popup and have it stay open when a checkable item is selected
-	p = view_menu->get_popup();
+	p = view_layout_menu->get_popup();
 	p->set_hide_on_checkable_item_selection(false);
 
 	accept = memnew(AcceptDialog);
@@ -9104,14 +9393,17 @@ Node3DEditor::Node3DEditor() {
 
 	snap_translate = memnew(LineEdit);
 	snap_translate->set_select_all_on_focus(true);
+	snap_translate->set_accessibility_name(TTRC("Translate Snap"));
 	snap_dialog_vbc->add_margin_child(TTR("Translate Snap:"), snap_translate);
 
 	snap_rotate = memnew(LineEdit);
 	snap_rotate->set_select_all_on_focus(true);
+	snap_rotate->set_accessibility_name(TTRC("Rotate Snap"));
 	snap_dialog_vbc->add_margin_child(TTR("Rotate Snap (deg.):"), snap_rotate);
 
 	snap_scale = memnew(LineEdit);
 	snap_scale->set_select_all_on_focus(true);
+	snap_scale->set_accessibility_name(TTRC("Scale Snap"));
 	snap_dialog_vbc->add_margin_child(TTR("Scale Snap (%):"), snap_scale);
 
 	/* SETTINGS DIALOG */
@@ -9130,12 +9422,14 @@ Node3DEditor::Node3DEditor() {
 	settings_fov->set_value(EDITOR_GET("editors/3d/default_fov"));
 	settings_fov->set_select_all_on_focus(true);
 	settings_fov->set_tooltip_text(TTR("FOV is defined as a vertical value, as the editor camera always uses the Keep Height aspect mode."));
+	settings_fov->set_accessibility_name(TTRC("Perspective VFOV"));
 	settings_vbc->add_margin_child(TTR("Perspective VFOV (deg.):"), settings_fov);
 
 	settings_znear = memnew(SpinBox);
 	settings_znear->set_max(MAX_Z);
 	settings_znear->set_min(MIN_Z);
 	settings_znear->set_step(0.01);
+	settings_znear->set_accessibility_name(TTRC("View Z-Near"));
 	settings_znear->set_value(EDITOR_GET("editors/3d/default_z_near"));
 	settings_znear->set_select_all_on_focus(true);
 	settings_vbc->add_margin_child(TTR("View Z-Near:"), settings_znear);
@@ -9144,6 +9438,7 @@ Node3DEditor::Node3DEditor() {
 	settings_zfar->set_max(MAX_Z);
 	settings_zfar->set_min(MIN_Z);
 	settings_zfar->set_step(0.1);
+	settings_zfar->set_accessibility_name(TTRC("View Z-Far"));
 	settings_zfar->set_value(EDITOR_GET("editors/3d/default_z_far"));
 	settings_zfar->set_select_all_on_focus(true);
 	settings_vbc->add_margin_child(TTR("View Z-Far:"), settings_zfar);
@@ -9209,6 +9504,7 @@ Node3DEditor::Node3DEditor() {
 
 	xform_type = memnew(OptionButton);
 	xform_type->set_h_size_flags(SIZE_EXPAND_FILL);
+	xform_type->set_accessibility_name(TTRC("Transform Type"));
 	xform_type->add_item(TTR("Pre"));
 	xform_type->add_item(TTR("Post"));
 	xform_vbc->add_child(xform_type);
@@ -9224,7 +9520,7 @@ Node3DEditor::Node3DEditor() {
 	current_hover_gizmo_handle_secondary = false;
 	{
 		// Sun/preview environment popup.
-		sun_environ_popup = memnew(PopupPanel);
+		sun_environ_popup = memnew(PreviewSunEnvPopup);
 		add_child(sun_environ_popup);
 
 		HBoxContainer *sun_environ_hb = memnew(HBoxContainer);
@@ -9286,7 +9582,7 @@ void fragment() {
 		sun_angle_altitude->set_max(90);
 		sun_angle_altitude->set_min(-90);
 		sun_angle_altitude->set_step(0.1);
-		sun_angle_altitude->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_sun_direction_angle_set).unbind(1));
+		sun_angle_altitude->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_sun_direction_set_altitude));
 		sun_angle_altitude_vbox->add_child(sun_angle_altitude);
 		sun_angle_hbox->add_child(sun_angle_altitude_vbox);
 		VBoxContainer *sun_angle_azimuth_vbox = memnew(VBoxContainer);
@@ -9302,7 +9598,7 @@ void fragment() {
 		sun_angle_azimuth->set_step(0.1);
 		sun_angle_azimuth->set_allow_greater(true);
 		sun_angle_azimuth->set_allow_lesser(true);
-		sun_angle_azimuth->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_sun_direction_angle_set).unbind(1));
+		sun_angle_azimuth->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_sun_direction_set_azimuth));
 		sun_angle_azimuth_vbox->add_child(sun_angle_azimuth);
 		sun_angle_hbox->add_child(sun_angle_azimuth_vbox);
 		sun_angle_hbox->add_theme_constant_override("separation", 10);
@@ -9311,7 +9607,7 @@ void fragment() {
 		sun_color = memnew(ColorPickerButton);
 		sun_color->set_edit_alpha(false);
 		sun_vb->add_margin_child(TTR("Sun Color"), sun_color);
-		sun_color->connect("color_changed", callable_mp(this, &Node3DEditor::_preview_settings_changed).unbind(1));
+		sun_color->connect("color_changed", callable_mp(this, &Node3DEditor::_sun_set_color));
 		sun_color->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(sun_color->get_picker()));
 
 		sun_energy = memnew(EditorSpinSlider);
@@ -9319,13 +9615,13 @@ void fragment() {
 		sun_energy->set_min(0);
 		sun_energy->set_step(0.05);
 		sun_vb->add_margin_child(TTR("Sun Energy"), sun_energy);
-		sun_energy->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_preview_settings_changed).unbind(1));
+		sun_energy->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_sun_set_energy));
 
-		sun_max_distance = memnew(EditorSpinSlider);
-		sun_vb->add_margin_child(TTR("Shadow Max Distance"), sun_max_distance);
-		sun_max_distance->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_preview_settings_changed).unbind(1));
-		sun_max_distance->set_min(1);
-		sun_max_distance->set_max(4096);
+		sun_shadow_max_distance = memnew(EditorSpinSlider);
+		sun_vb->add_margin_child(TTR("Shadow Max Distance"), sun_shadow_max_distance);
+		sun_shadow_max_distance->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_sun_set_shadow_max_distance));
+		sun_shadow_max_distance->set_min(1);
+		sun_shadow_max_distance->set_max(4096);
 
 		sun_add_to_scene = memnew(Button);
 		sun_add_to_scene->set_text(TTR("Add Sun to Scene"));
@@ -9359,11 +9655,11 @@ void fragment() {
 
 		environ_sky_color = memnew(ColorPickerButton);
 		environ_sky_color->set_edit_alpha(false);
-		environ_sky_color->connect("color_changed", callable_mp(this, &Node3DEditor::_preview_settings_changed).unbind(1));
+		environ_sky_color->connect("color_changed", callable_mp(this, &Node3DEditor::_environ_set_sky_color));
 		environ_sky_color->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(environ_sky_color->get_picker()));
 		environ_vb->add_margin_child(TTR("Sky Color"), environ_sky_color);
 		environ_ground_color = memnew(ColorPickerButton);
-		environ_ground_color->connect("color_changed", callable_mp(this, &Node3DEditor::_preview_settings_changed).unbind(1));
+		environ_ground_color->connect("color_changed", callable_mp(this, &Node3DEditor::_environ_set_ground_color));
 		environ_ground_color->set_edit_alpha(false);
 		environ_ground_color->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(environ_ground_color->get_picker()));
 		environ_vb->add_margin_child(TTR("Ground Color"), environ_ground_color);
@@ -9371,7 +9667,7 @@ void fragment() {
 		environ_energy->set_max(8.0);
 		environ_energy->set_min(0);
 		environ_energy->set_step(0.05);
-		environ_energy->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_preview_settings_changed).unbind(1));
+		environ_energy->connect(SceneStringName(value_changed), callable_mp(this, &Node3DEditor::_environ_set_sky_energy));
 		environ_vb->add_margin_child(TTR("Sky Energy"), environ_energy);
 		HBoxContainer *fx_vb = memnew(HBoxContainer);
 		fx_vb->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -9380,25 +9676,25 @@ void fragment() {
 		environ_ao_button->set_text(TTR("AO"));
 		environ_ao_button->set_h_size_flags(SIZE_EXPAND_FILL);
 		environ_ao_button->set_toggle_mode(true);
-		environ_ao_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_preview_settings_changed), CONNECT_DEFERRED);
+		environ_ao_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_environ_set_ao), CONNECT_DEFERRED);
 		fx_vb->add_child(environ_ao_button);
 		environ_glow_button = memnew(Button);
 		environ_glow_button->set_text(TTR("Glow"));
 		environ_glow_button->set_h_size_flags(SIZE_EXPAND_FILL);
 		environ_glow_button->set_toggle_mode(true);
-		environ_glow_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_preview_settings_changed), CONNECT_DEFERRED);
+		environ_glow_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_environ_set_glow), CONNECT_DEFERRED);
 		fx_vb->add_child(environ_glow_button);
 		environ_tonemap_button = memnew(Button);
 		environ_tonemap_button->set_text(TTR("Tonemap"));
 		environ_tonemap_button->set_h_size_flags(SIZE_EXPAND_FILL);
 		environ_tonemap_button->set_toggle_mode(true);
-		environ_tonemap_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_preview_settings_changed), CONNECT_DEFERRED);
+		environ_tonemap_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_environ_set_tonemap), CONNECT_DEFERRED);
 		fx_vb->add_child(environ_tonemap_button);
 		environ_gi_button = memnew(Button);
 		environ_gi_button->set_text(TTR("GI"));
 		environ_gi_button->set_h_size_flags(SIZE_EXPAND_FILL);
 		environ_gi_button->set_toggle_mode(true);
-		environ_gi_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_preview_settings_changed), CONNECT_DEFERRED);
+		environ_gi_button->connect(SceneStringName(pressed), callable_mp(this, &Node3DEditor::_environ_set_gi), CONNECT_DEFERRED);
 		fx_vb->add_child(environ_gi_button);
 		environ_vb->add_margin_child(TTR("Post Process"), fx_vb);
 
@@ -9432,6 +9728,8 @@ void fragment() {
 		environment->set_sky(sky);
 		environment->set_background(Environment::BG_SKY);
 
+		sun_environ_popup->set_process_shortcut_input(true);
+
 		_load_default_preview_settings();
 		_preview_settings_changed();
 	}
@@ -9617,6 +9915,3 @@ Node3DEditorPlugin::Node3DEditorPlugin() {
 
 	spatial_editor->hide();
 }
-
-Node3DEditorPlugin::~Node3DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/node_3d_editor_plugin.h b/engine/editor/plugins/node_3d_editor_plugin.h
index 27c709fb..92aaf700 100644
--- a/engine/editor/plugins/node_3d_editor_plugin.h
+++ b/engine/editor/plugins/node_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NODE_3D_EDITOR_PLUGIN_H
-#define NODE_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "core/math/dynamic_bvh.h"
 #include "editor/plugins/editor_plugin.h"
@@ -249,7 +248,7 @@ private:
 	CheckBox *preview_camera = nullptr;
 	SubViewportContainer *subviewport_container = nullptr;
 
-	MenuButton *view_menu = nullptr;
+	MenuButton *view_display_menu = nullptr;
 	PopupMenu *display_submenu = nullptr;
 
 	Control *surface = nullptr;
@@ -524,7 +523,15 @@ private:
 	void register_shortcut_action(const String &p_path, const String &p_name, Key p_keycode, bool p_physical = false);
 	void shortcut_changed_callback(const Ref<Shortcut> p_shortcut, const String &p_shortcut_path);
 
+	// Supported rendering methods for advanced debug draw mode items.
+	enum SupportedRenderingMethods {
+		ALL,
+		FORWARD_PLUS,
+		FORWARD_PLUS_MOBILE,
+	};
+
 	void _set_lock_view_rotation(bool p_lock_rotation);
+	void _add_advanced_debug_draw_mode_item(PopupMenu *p_popup, const String &p_name, int p_value, SupportedRenderingMethods p_rendering_methods = SupportedRenderingMethods::ALL, const String &p_tooltip = "");
 
 protected:
 	void _notification(int p_what);
@@ -694,8 +701,16 @@ private:
 	real_t snap_rotate_value;
 	real_t snap_scale_value;
 
+	Ref<ArrayMesh> active_selection_box_xray;
+	Ref<ArrayMesh> active_selection_box;
 	Ref<ArrayMesh> selection_box_xray;
 	Ref<ArrayMesh> selection_box;
+
+	Ref<StandardMaterial3D> selection_box_mat = memnew(StandardMaterial3D);
+	Ref<StandardMaterial3D> selection_box_mat_xray = memnew(StandardMaterial3D);
+	Ref<StandardMaterial3D> active_selection_box_mat = memnew(StandardMaterial3D);
+	Ref<StandardMaterial3D> active_selection_box_mat_xray = memnew(StandardMaterial3D);
+
 	RID indicators;
 	RID indicators_instance;
 	RID cursor_mesh;
@@ -752,7 +767,7 @@ private:
 
 	MenuButton *transform_menu = nullptr;
 	PopupMenu *gizmos_menu = nullptr;
-	MenuButton *view_menu = nullptr;
+	MenuButton *view_layout_menu = nullptr;
 
 	AcceptDialog *accept = nullptr;
 
@@ -832,6 +847,13 @@ private:
 
 	// Preview Sun and Environment
 
+	class PreviewSunEnvPopup : public PopupPanel {
+		GDCLASS(PreviewSunEnvPopup, PopupPanel);
+
+	protected:
+		virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
+	};
+
 	uint32_t world_env_count = 0;
 	uint32_t directional_light_count = 0;
 
@@ -845,13 +867,9 @@ private:
 	EditorSpinSlider *sun_angle_azimuth = nullptr;
 	ColorPickerButton *sun_color = nullptr;
 	EditorSpinSlider *sun_energy = nullptr;
-	EditorSpinSlider *sun_max_distance = nullptr;
+	EditorSpinSlider *sun_shadow_max_distance = nullptr;
 	Button *sun_add_to_scene = nullptr;
 
-	void _sun_direction_draw();
-	void _sun_direction_input(const Ref<InputEvent> &p_event);
-	void _sun_direction_angle_set();
-
 	Vector2 sun_rotation;
 
 	Ref<Shader> sun_direction_shader;
@@ -882,6 +900,22 @@ private:
 
 	bool sun_environ_updating = false;
 
+	void _sun_direction_draw();
+	void _sun_direction_input(const Ref<InputEvent> &p_event);
+	void _sun_direction_set_altitude(float p_altitude);
+	void _sun_direction_set_azimuth(float p_azimuth);
+	void _sun_set_color(const Color &p_color);
+	void _sun_set_energy(float p_energy);
+	void _sun_set_shadow_max_distance(float p_shadow_max_distance);
+
+	void _environ_set_sky_color(const Color &p_color);
+	void _environ_set_ground_color(const Color &p_color);
+	void _environ_set_sky_energy(float p_energy);
+	void _environ_set_ao();
+	void _environ_set_glow();
+	void _environ_set_tonemap();
+	void _environ_set_gi();
+
 	void _load_default_preview_settings();
 	void _update_preview_environment();
 
@@ -1014,7 +1048,7 @@ class Node3DEditorPlugin : public EditorPlugin {
 
 public:
 	Node3DEditor *get_spatial_editor() { return spatial_editor; }
-	virtual String get_plugin_name() const override { return "3D"; }
+	virtual String get_plugin_name() const override { return TTRC("3D"); }
 	bool has_main_screen() const override { return true; }
 	virtual void make_visible(bool p_visible) override;
 	virtual void edit(Object *p_object) override;
@@ -1027,7 +1061,6 @@ public:
 	virtual void edited_scene_changed() override;
 
 	Node3DEditorPlugin();
-	~Node3DEditorPlugin();
 };
 
 class ViewportNavigationControl : public Control {
@@ -1054,5 +1087,3 @@ public:
 	void set_navigation_mode(Node3DEditorViewport::NavigationMode p_nav_mode);
 	void set_viewport(Node3DEditorViewport *p_viewport);
 };
-
-#endif // NODE_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/occluder_instance_3d_editor_plugin.cpp b/engine/editor/plugins/occluder_instance_3d_editor_plugin.cpp
index 35e8cd00..912ad922 100644
--- a/engine/editor/plugins/occluder_instance_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/occluder_instance_3d_editor_plugin.cpp
@@ -119,6 +119,3 @@ OccluderInstance3DEditorPlugin::OccluderInstance3DEditorPlugin() {
 	file_dialog->connect("file_selected", callable_mp(this, &OccluderInstance3DEditorPlugin::_bake_select_file));
 	bake->add_child(file_dialog);
 }
-
-OccluderInstance3DEditorPlugin::~OccluderInstance3DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/occluder_instance_3d_editor_plugin.h b/engine/editor/plugins/occluder_instance_3d_editor_plugin.h
index d9498046..4768a6e4 100644
--- a/engine/editor/plugins/occluder_instance_3d_editor_plugin.h
+++ b/engine/editor/plugins/occluder_instance_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OCCLUDER_INSTANCE_3D_EDITOR_PLUGIN_H
-#define OCCLUDER_INSTANCE_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/occluder_instance_3d.h"
@@ -60,7 +59,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	OccluderInstance3DEditorPlugin();
-	~OccluderInstance3DEditorPlugin();
 };
-
-#endif // OCCLUDER_INSTANCE_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/packed_scene_editor_plugin.cpp b/engine/editor/plugins/packed_scene_editor_plugin.cpp
index e7762e1c..f193eeae 100644
--- a/engine/editor/plugins/packed_scene_editor_plugin.cpp
+++ b/engine/editor/plugins/packed_scene_editor_plugin.cpp
@@ -36,7 +36,7 @@
 
 void PackedSceneEditor::_on_open_scene_pressed() {
 	// Using deferred call because changing scene updates the Inspector and thus destroys this plugin.
-	callable_mp(EditorNode::get_singleton(), &EditorNode::open_request).call_deferred(packed_scene->get_path(), false);
+	callable_mp(EditorNode::get_singleton(), &EditorNode::load_scene).call_deferred(packed_scene->get_path(), false, false, false, false);
 }
 
 void PackedSceneEditor::_notification(int p_what) {
diff --git a/engine/editor/plugins/packed_scene_editor_plugin.h b/engine/editor/plugins/packed_scene_editor_plugin.h
index 0e18d989..20346b82 100644
--- a/engine/editor/plugins/packed_scene_editor_plugin.h
+++ b/engine/editor/plugins/packed_scene_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKED_SCENE_EDITOR_PLUGIN_H
-#define PACKED_SCENE_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -64,5 +63,3 @@ class PackedSceneEditorPlugin : public EditorPlugin {
 public:
 	PackedSceneEditorPlugin();
 };
-
-#endif // PACKED_SCENE_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/packed_scene_translation_parser_plugin.cpp b/engine/editor/plugins/packed_scene_translation_parser_plugin.cpp
index 6f34a874..4857c0f9 100644
--- a/engine/editor/plugins/packed_scene_translation_parser_plugin.cpp
+++ b/engine/editor/plugins/packed_scene_translation_parser_plugin.cpp
@@ -156,7 +156,7 @@ Error PackedSceneEditorTranslationParserPlugin::parse_file(const String &p_path,
 				// Extract FileDialog's filters property with values in format "*.png ; PNG Images","*.gd ; GDScript Files".
 				Vector<String> str_values = property_value;
 				for (int k = 0; k < str_values.size(); k++) {
-					String desc = str_values[k].get_slice(";", 1).strip_edges();
+					String desc = str_values[k].get_slicec(';', 1).strip_edges();
 					if (!desc.is_empty()) {
 						r_translations->push_back({ desc });
 					}
diff --git a/engine/editor/plugins/packed_scene_translation_parser_plugin.h b/engine/editor/plugins/packed_scene_translation_parser_plugin.h
index c6d9754d..2020ebe7 100644
--- a/engine/editor/plugins/packed_scene_translation_parser_plugin.h
+++ b/engine/editor/plugins/packed_scene_translation_parser_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKED_SCENE_TRANSLATION_PARSER_PLUGIN_H
-#define PACKED_SCENE_TRANSLATION_PARSER_PLUGIN_H
+#pragma once
 
 #include "editor/editor_translation_parser.h"
 
@@ -48,5 +47,3 @@ public:
 
 	PackedSceneEditorTranslationParserPlugin();
 };
-
-#endif // PACKED_SCENE_TRANSLATION_PARSER_PLUGIN_H
diff --git a/engine/editor/plugins/parallax_background_editor_plugin.cpp b/engine/editor/plugins/parallax_background_editor_plugin.cpp
index e802f425..b15232e8 100644
--- a/engine/editor/plugins/parallax_background_editor_plugin.cpp
+++ b/engine/editor/plugins/parallax_background_editor_plugin.cpp
@@ -133,5 +133,7 @@ ParallaxBackgroundEditorPlugin::ParallaxBackgroundEditorPlugin() {
 	menu->get_popup()->add_item(TTR("Convert to Parallax2D"), MENU_CONVERT_TO_PARALLAX_2D);
 	menu->set_text(TTR("ParallaxBackground"));
 	menu->set_switch_on_hover(true);
+	menu->set_flat(false);
+	menu->set_theme_type_variation("FlatMenuButton");
 	toolbar->add_child(menu);
 }
diff --git a/engine/editor/plugins/parallax_background_editor_plugin.h b/engine/editor/plugins/parallax_background_editor_plugin.h
index 552e35fe..99a160ff 100644
--- a/engine/editor/plugins/parallax_background_editor_plugin.h
+++ b/engine/editor/plugins/parallax_background_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARALLAX_BACKGROUND_EDITOR_PLUGIN_H
-#define PARALLAX_BACKGROUND_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -63,5 +62,3 @@ public:
 
 	ParallaxBackgroundEditorPlugin();
 };
-
-#endif // PARALLAX_BACKGROUND_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/particle_process_material_editor_plugin.cpp b/engine/editor/plugins/particle_process_material_editor_plugin.cpp
index 52cc2e65..f4db0e3d 100644
--- a/engine/editor/plugins/particle_process_material_editor_plugin.cpp
+++ b/engine/editor/plugins/particle_process_material_editor_plugin.cpp
@@ -435,6 +435,7 @@ ParticleProcessMaterialMinMaxPropertyEditor::ParticleProcessMaterialMinMaxProper
 	toggle_mode_button = memnew(Button);
 	toggle_mode_button->set_toggle_mode(true);
 	toggle_mode_button->set_tooltip_text(TTR("Toggle between minimum/maximum and base value/spread modes."));
+	toggle_mode_button->set_accessibility_name(TTRC("Spread mode"));
 	hb->add_child(toggle_mode_button);
 	toggle_mode_button->connect(SceneStringName(toggled), callable_mp(this, &ParticleProcessMaterialMinMaxPropertyEditor::_toggle_mode));
 
diff --git a/engine/editor/plugins/particle_process_material_editor_plugin.h b/engine/editor/plugins/particle_process_material_editor_plugin.h
index 623d3d4b..0dc47dd4 100644
--- a/engine/editor/plugins/particle_process_material_editor_plugin.h
+++ b/engine/editor/plugins/particle_process_material_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLE_PROCESS_MATERIAL_EDITOR_PLUGIN_H
-#define PARTICLE_PROCESS_MATERIAL_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_properties.h"
 #include "editor/plugins/editor_plugin.h"
@@ -134,5 +133,3 @@ public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual bool parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide = false) override;
 };
-
-#endif // PARTICLE_PROCESS_MATERIAL_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/particles_editor_plugin.cpp b/engine/editor/plugins/particles_editor_plugin.cpp
index 036fc7d9..1b756163 100644
--- a/engine/editor/plugins/particles_editor_plugin.cpp
+++ b/engine/editor/plugins/particles_editor_plugin.cpp
@@ -118,6 +118,8 @@ ParticlesEditorPlugin::ParticlesEditorPlugin() {
 
 	menu = memnew(MenuButton);
 	menu->set_switch_on_hover(true);
+	menu->set_flat(false);
+	menu->set_theme_type_variation("FlatMenuButton");
 	toolbar->add_child(menu);
 	menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &ParticlesEditorPlugin::_menu_callback));
 }
@@ -291,22 +293,29 @@ Particles2DEditorPlugin::Particles2DEditorPlugin() {
 	emission_mask->connect(SceneStringName(confirmed), callable_mp(this, &Particles2DEditorPlugin::_generate_emission_mask));
 }
 
-void GPUParticles2DEditorPlugin::_selection_changed() {
-	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_selected_node_list();
+void Particles2DEditorPlugin::_selection_changed() {
+	List<Node *> selected_nodes = EditorNode::get_singleton()->get_editor_selection()->get_top_selected_node_list();
 	if (selected_particles.is_empty() && selected_nodes.is_empty()) {
 		return;
 	}
 
-	for (GPUParticles2D *particles : selected_particles) {
-		particles->set_show_visibility_rect(false);
+	for (Node *particles : selected_particles) {
+		if (GPUParticles2D *gpu_particles = Object::cast_to<GPUParticles2D>(particles)) {
+			gpu_particles->set_show_gizmos(false);
+		} else if (CPUParticles2D *cpu_particles = Object::cast_to<CPUParticles2D>(particles)) {
+			cpu_particles->set_show_gizmos(false);
+		}
 	}
+
 	selected_particles.clear();
 
 	for (Node *node : selected_nodes) {
-		GPUParticles2D *selected_particle = Object::cast_to<GPUParticles2D>(node);
-		if (selected_particle) {
-			selected_particle->set_show_visibility_rect(true);
-			selected_particles.push_back(selected_particle);
+		if (GPUParticles2D *selected_gpu_particle = Object::cast_to<GPUParticles2D>(node)) {
+			selected_gpu_particle->set_show_gizmos(true);
+			selected_particles.push_back(selected_gpu_particle);
+		} else if (CPUParticles2D *selected_cpu_particle = Object::cast_to<CPUParticles2D>(node)) {
+			selected_cpu_particle->set_show_gizmos(true);
+			selected_particles.push_back(selected_cpu_particle);
 		}
 	}
 }
@@ -353,10 +362,10 @@ void GPUParticles2DEditorPlugin::_generate_visibility_rect() {
 	undo_redo->commit_action();
 }
 
-void GPUParticles2DEditorPlugin::_notification(int p_what) {
+void Particles2DEditorPlugin::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
-			EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed", callable_mp(this, &GPUParticles2DEditorPlugin::_selection_changed));
+			EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed", callable_mp(this, &Particles2DEditorPlugin::_selection_changed));
 		} break;
 	}
 }
@@ -649,7 +658,7 @@ void Particles3DEditorPlugin::_node_selected(const NodePath &p_path) {
 	}
 
 	geometry = mi->get_mesh()->get_faces();
-	if (geometry.size() == 0) {
+	if (geometry.is_empty()) {
 		EditorNode::get_singleton()->show_warning(vformat(TTR("\"%s\" doesn't contain face geometry."), sel->get_name()));
 		return;
 	}
@@ -819,6 +828,7 @@ Particles3DEditorPlugin::Particles3DEditorPlugin() {
 	generate_aabb->add_child(genvb);
 
 	generate_seconds = memnew(SpinBox);
+	generate_seconds->set_accessibility_name(TTRC("Generation Time"));
 	generate_seconds->set_min(0.1);
 	generate_seconds->set_max(25);
 	generate_seconds->set_value(2);
@@ -843,12 +853,14 @@ Particles3DEditorPlugin::Particles3DEditorPlugin() {
 	emission_dialog->add_child(emd_vb);
 
 	emission_amount = memnew(SpinBox);
+	emission_amount->set_accessibility_name(TTRC("Emission Points"));
 	emission_amount->set_min(1);
 	emission_amount->set_max(100000);
 	emission_amount->set_value(512);
 	emd_vb->add_margin_child(TTR("Emission Points:"), emission_amount);
 
 	emission_fill = memnew(OptionButton);
+	emission_fill->set_accessibility_name(TTRC("Emission Source"));
 	emission_fill->add_item(TTR("Surface Points"));
 	emission_fill->add_item(TTR("Surface Points+Normal (Directed)"));
 	emission_fill->add_item(TTR("Volume"));
diff --git a/engine/editor/plugins/particles_editor_plugin.h b/engine/editor/plugins/particles_editor_plugin.h
index d4459765..9d556748 100644
--- a/engine/editor/plugins/particles_editor_plugin.h
+++ b/engine/editor/plugins/particles_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLES_EDITOR_PLUGIN_H
-#define PARTICLES_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -37,6 +36,7 @@ class CheckBox;
 class ConfirmationDialog;
 class EditorFileDialog;
 class GPUParticles2D;
+class CPUParticles2D;
 class HBoxContainer;
 class MenuButton;
 class OptionButton;
@@ -87,6 +87,8 @@ protected:
 		MENU_LOAD_EMISSION_MASK = 100,
 	};
 
+	List<Node *> selected_particles;
+
 	enum EmissionMode {
 		EMISSION_MODE_SOLID,
 		EMISSION_MODE_BORDER,
@@ -106,6 +108,8 @@ protected:
 	void _file_selected(const String &p_file);
 	void _get_base_emission_mask(PackedVector2Array &r_valid_positions, PackedVector2Array &r_valid_normals, PackedByteArray &r_valid_colors, Vector2i &r_image_size);
 	virtual void _generate_emission_mask() = 0;
+	void _notification(int p_what);
+	void _selection_changed();
 
 public:
 	Particles2DEditorPlugin();
@@ -118,17 +122,12 @@ class GPUParticles2DEditorPlugin : public Particles2DEditorPlugin {
 		MENU_GENERATE_VISIBILITY_RECT = 200,
 	};
 
-	List<GPUParticles2D *> selected_particles;
-
 	ConfirmationDialog *generate_visibility_rect = nullptr;
 	SpinBox *generate_seconds = nullptr;
 
-	void _selection_changed();
 	void _generate_visibility_rect();
 
 protected:
-	void _notification(int p_what);
-
 	void _menu_callback(int p_idx) override;
 	void _add_menu_options(PopupMenu *p_menu) override;
 
@@ -212,5 +211,3 @@ protected:
 public:
 	CPUParticles3DEditorPlugin();
 };
-
-#endif // PARTICLES_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/path_2d_editor_plugin.cpp b/engine/editor/plugins/path_2d_editor_plugin.cpp
index 31bc80a7..794aa151 100644
--- a/engine/editor/plugins/path_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/path_2d_editor_plugin.cpp
@@ -110,6 +110,7 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
 						moving_screen_from = gpoint;
 						return true;
 					} else if (mode == MODE_EDIT || mode == MODE_EDIT_CURVE) {
+						control_points_in_range = 0;
 						// In/out controls can be moved in multiple modes.
 						if (dist_to_p_out < grab_threshold && i < (curve->get_point_count() - 1)) {
 							action = ACTION_MOVING_OUT;
@@ -117,13 +118,17 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
 							moving_from = curve->get_point_out(i);
 							moving_screen_from = gpoint;
 							orig_in_length = curve->get_point_in(action_point).length();
-							return true;
-						} else if (dist_to_p_in < grab_threshold && i > 0) {
+							control_points_in_range += 1;
+						}
+						if (dist_to_p_in < grab_threshold && i > 0) {
 							action = ACTION_MOVING_IN;
 							action_point = i;
 							moving_from = curve->get_point_in(i);
 							moving_screen_from = gpoint;
 							orig_out_length = curve->get_point_out(action_point).length();
+							control_points_in_range += 1;
+						}
+						if (control_points_in_range > 0) {
 							return true;
 						}
 					}
@@ -298,6 +303,27 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventMouseMotion> mm = p_event;
 
 	if (mm.is_valid()) {
+		// When both control points were in range of click,
+		// pick the point that drags the curve outwards.
+		if (control_points_in_range == 2) {
+			control_points_in_range = 0;
+			Ref<Curve2D> curve = node->get_curve();
+			Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_screen_transform();
+			Point2 relative = xform.affine_inverse().basis_xform(mm->get_relative());
+			real_t angle_in = relative.angle_to(curve->get_point_position(action_point - 1) - curve->get_point_position(action_point));
+			real_t angle_out = relative.angle_to(curve->get_point_position(action_point + 1) - curve->get_point_position(action_point));
+
+			if (Math::abs(angle_in) < Math::abs(angle_out)) {
+				action = ACTION_MOVING_IN;
+				moving_from = curve->get_point_in(action_point);
+				orig_out_length = curve->get_point_out(action_point).length();
+			} else {
+				action = ACTION_MOVING_OUT;
+				moving_from = curve->get_point_out(action_point);
+				orig_in_length = curve->get_point_in(action_point).length();
+			}
+		}
+
 		if (action == ACTION_NONE && mode == MODE_EDIT) {
 			// Handle Edge Follow
 			bool old_edge = on_edge;
@@ -696,6 +722,7 @@ Path2DEditor::Path2DEditor() {
 	curve_edit->set_pressed(true);
 	curve_edit->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit->set_tooltip_text(TTR("Select Points") + "\n" + TTR("Shift+Drag: Select Control Points") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Click: Add Point") + "\n" + TTR("Left Click: Split Segment (in curve)") + "\n" + TTR("Right Click: Delete Point"));
+	curve_edit->set_accessibility_name(TTRC("Select Points"));
 	curve_edit->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_EDIT));
 	toolbar->add_child(curve_edit);
 
@@ -704,6 +731,7 @@ Path2DEditor::Path2DEditor() {
 	curve_edit_curve->set_toggle_mode(true);
 	curve_edit_curve->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit_curve->set_tooltip_text(TTR("Select Control Points (Shift+Drag)"));
+	curve_edit_curve->set_accessibility_name(TTRC("Select Control Points"));
 	curve_edit_curve->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_EDIT_CURVE));
 	toolbar->add_child(curve_edit_curve);
 
@@ -712,6 +740,7 @@ Path2DEditor::Path2DEditor() {
 	curve_create->set_toggle_mode(true);
 	curve_create->set_focus_mode(Control::FOCUS_NONE);
 	curve_create->set_tooltip_text(TTR("Add Point (in empty space)") + "\n" + TTR("Right Click: Delete Point"));
+	curve_create->set_accessibility_name(TTRC("Add Point"));
 	curve_create->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CREATE));
 	toolbar->add_child(curve_create);
 
@@ -720,6 +749,7 @@ Path2DEditor::Path2DEditor() {
 	curve_del->set_toggle_mode(true);
 	curve_del->set_focus_mode(Control::FOCUS_NONE);
 	curve_del->set_tooltip_text(TTR("Delete Point"));
+	curve_del->set_accessibility_name(TTRC("Delete Point"));
 	curve_del->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_DELETE));
 	toolbar->add_child(curve_del);
 
@@ -727,6 +757,7 @@ Path2DEditor::Path2DEditor() {
 	curve_close->set_theme_type_variation(SceneStringName(FlatButton));
 	curve_close->set_focus_mode(Control::FOCUS_NONE);
 	curve_close->set_tooltip_text(TTR("Close Curve"));
+	curve_close->set_accessibility_name(TTRC("Close Curve"));
 	curve_close->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CLOSE));
 	toolbar->add_child(curve_close);
 
@@ -734,6 +765,7 @@ Path2DEditor::Path2DEditor() {
 	curve_clear_points->set_theme_type_variation(SceneStringName(FlatButton));
 	curve_clear_points->set_focus_mode(Control::FOCUS_NONE);
 	curve_clear_points->set_tooltip_text(TTR("Clear Points"));
+	curve_clear_points->set_accessibility_name(TTRC("Clear Points"));
 	curve_clear_points->connect(SceneStringName(pressed), callable_mp(this, &Path2DEditor::_confirm_clear_points));
 	toolbar->add_child(curve_clear_points);
 
@@ -787,6 +819,3 @@ Path2DEditorPlugin::Path2DEditorPlugin() {
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(path2d_editor);
 	path2d_editor->hide();
 }
-
-Path2DEditorPlugin::~Path2DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/path_2d_editor_plugin.h b/engine/editor/plugins/path_2d_editor_plugin.h
index 236d492e..f3ddb25c 100644
--- a/engine/editor/plugins/path_2d_editor_plugin.h
+++ b/engine/editor/plugins/path_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PATH_2D_EDITOR_PLUGIN_H
-#define PATH_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/2d/path_2d.h"
@@ -97,6 +96,10 @@ class Path2DEditor : public HBoxContainer {
 	Vector2 edge_point;
 	Vector2 original_mouse_pos;
 
+	// Number of control points in range of the last click.
+	// 0, 1, or 2.
+	int control_points_in_range = 0;
+
 	void _mode_selected(int p_mode);
 	void _handle_option_pressed(int p_option);
 	void _cancel_current_action();
@@ -137,7 +140,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	Path2DEditorPlugin();
-	~Path2DEditorPlugin();
 };
-
-#endif // PATH_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/path_3d_editor_plugin.cpp b/engine/editor/plugins/path_3d_editor_plugin.cpp
index 81e93cc4..721fe063 100644
--- a/engine/editor/plugins/path_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/path_3d_editor_plugin.cpp
@@ -149,7 +149,31 @@ void Path3DGizmo::set_handle(int p_id, bool p_secondary, Camera3D *p_camera, con
 					local.snapf(snap);
 				}
 
-				if (info.type == HandleType::HANDLE_TYPE_IN) {
+				// Determine if control points should be swapped based on delta movement.
+				// Only run on the next update after an overlap is detected, to get proper delta movement.
+				if (control_points_overlapped) {
+					control_points_overlapped = false;
+					Vector3 delta = local - (info.type == HANDLE_TYPE_IN ? c->get_point_in(idx) : c->get_point_out(idx));
+					Vector3 p0 = c->get_point_position(idx - 1) - base;
+					Vector3 p1 = c->get_point_position(idx + 1) - base;
+					HandleType new_type = Math::abs(delta.angle_to(p0)) < Math::abs(delta.angle_to(p1)) ? HANDLE_TYPE_IN : HANDLE_TYPE_OUT;
+					if (info.type != new_type) {
+						swapped_control_points_idx = idx;
+					}
+				}
+
+				// Detect control points overlap.
+				bool control_points_equal = c->get_point_in(idx).is_equal_approx(c->get_point_out(idx));
+				if (idx > 0 && idx < (c->get_point_count() - 1) && control_points_equal) {
+					control_points_overlapped = true;
+				}
+
+				HandleType control_type = info.type;
+				if (swapped_control_points_idx == idx) {
+					control_type = info.type == HANDLE_TYPE_IN ? HANDLE_TYPE_OUT : HANDLE_TYPE_IN;
+				}
+
+				if (control_type == HandleType::HANDLE_TYPE_IN) {
 					c->set_point_in(idx, local);
 					if (Path3DEditorPlugin::singleton->mirror_angle_enabled()) {
 						c->set_point_out(idx, Path3DEditorPlugin::singleton->mirror_length_enabled() ? -local : (-local.normalized() * orig_out_length));
@@ -190,6 +214,9 @@ void Path3DGizmo::set_handle(int p_id, bool p_secondary, Camera3D *p_camera, con
 }
 
 void Path3DGizmo::commit_handle(int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) {
+	swapped_control_points_idx = -1;
+	control_points_overlapped = false;
+
 	Ref<Curve3D> c = path->get_curve();
 	if (c.is_null()) {
 		return;
@@ -272,7 +299,6 @@ void Path3DGizmo::commit_handle(int p_id, bool p_secondary, const Variant &p_res
 void Path3DGizmo::redraw() {
 	clear();
 
-	Ref<StandardMaterial3D> path_material = gizmo_plugin->get_material("path_material", this);
 	Ref<StandardMaterial3D> path_thin_material = gizmo_plugin->get_material("path_thin_material", this);
 	Ref<StandardMaterial3D> path_tilt_material = gizmo_plugin->get_material("path_tilt_material", this);
 	Ref<StandardMaterial3D> path_tilt_muted_material = gizmo_plugin->get_material("path_tilt_muted_material", this);
@@ -291,11 +317,24 @@ void Path3DGizmo::redraw() {
 		return;
 	}
 
+	debug_material = gizmo_plugin->get_material("path_material", this);
+
+	Color path_color = path->get_debug_custom_color();
+	if (path_color != Color(0.0, 0.0, 0.0)) {
+		debug_material.instantiate();
+		debug_material->set_albedo(path_color);
+		debug_material->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+		debug_material->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+		debug_material->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
+		debug_material->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
+		debug_material->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	}
+
 	real_t interval = 0.1;
 	const real_t length = c->get_baked_length();
 
-	// 1. Draw curve and bones.
-	if (length > CMP_EPSILON) {
+	// 1. Draw curve and bones if it is visible (alpha > 0.0).
+	if (length > CMP_EPSILON && path_color.a > 0.0) {
 		const int sample_count = int(length / interval) + 2;
 		interval = length / (sample_count - 1); // Recalculate real interval length.
 
@@ -356,8 +395,8 @@ void Path3DGizmo::redraw() {
 		}
 
 		add_collision_segments(_collision_segments);
-		add_lines(bones, path_material);
-		add_vertices(ribbon, path_material, Mesh::PRIMITIVE_LINE_STRIP);
+		add_lines(bones, debug_material);
+		add_vertices(ribbon, debug_material, Mesh::PRIMITIVE_LINE_STRIP);
 	}
 
 	// 2. Draw handles when selected.
@@ -433,11 +472,11 @@ void Path3DGizmo::redraw() {
 
 					const int n = 36;
 					for (int i = 0; i <= n; i++) {
-						const float a = Math_TAU * i / n;
+						const float a = Math::TAU * i / n;
 						const Vector3 edge = sin(a) * side + cos(a) * up;
 						disk.append(pos + edge * disk_size);
 					}
-					add_vertices(disk, path_tilt_material, Mesh::PRIMITIVE_LINE_STRIP);
+					add_vertices(disk, debug_material, Mesh::PRIMITIVE_LINE_STRIP);
 				}
 			}
 		}
@@ -509,6 +548,7 @@ Path3DGizmo::Path3DGizmo(Path3D *p_path, float p_disk_size) {
 
 	// Connecting to a signal once, rather than plaguing the implementation with calls to `Node3DEditor::update_transform_gizmo`.
 	path->connect("curve_changed", callable_mp(this, &Path3DGizmo::_update_transform_gizmo));
+	path->connect("debug_color_changed", callable_mp(this, &Path3DGizmo::redraw));
 
 	Path3DEditorPlugin::singleton->curve_edit->connect(SceneStringName(pressed), callable_mp(this, &Path3DGizmo::redraw));
 	Path3DEditorPlugin::singleton->curve_edit_curve->connect(SceneStringName(pressed), callable_mp(this, &Path3DGizmo::redraw));
@@ -580,10 +620,9 @@ EditorPlugin::AfterGUIInput Path3DEditorPlugin::forward_3d_gui_input(Camera3D *p
 						from = gt.xform(from);
 						to = gt.xform(to);
 						if (cdist > 0) {
-							Vector2 s[2];
-							s[0] = viewport->point_to_screen(from);
-							s[1] = viewport->point_to_screen(to);
-							Vector2 inters = Geometry2D::get_closest_point_to_segment(mbpos, s);
+							const Vector2 segment_a = viewport->point_to_screen(from);
+							const Vector2 segment_b = viewport->point_to_screen(to);
+							Vector2 inters = Geometry2D::get_closest_point_to_segment(mbpos, segment_a, segment_b);
 							float d = inters.distance_to(mbpos);
 
 							if (d < 10 && d < closest_d) {
@@ -880,6 +919,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	curve_edit->set_toggle_mode(true);
 	curve_edit->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit->set_tooltip_text(TTR("Select Points") + "\n" + TTR("Shift+Click: Select multiple Points") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Click: Add Point") + "\n" + TTR("Right Click: Delete Point"));
+	curve_edit->set_accessibility_name(TTRC("Select Points"));
 	toolbar->add_child(curve_edit);
 	curve_edit->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_EDIT));
 
@@ -888,6 +928,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	curve_edit_curve->set_toggle_mode(true);
 	curve_edit_curve->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit_curve->set_tooltip_text(TTR("Select Control Points") + "\n" + TTR("Shift+Click: Drag out Control Points"));
+	curve_edit_curve->set_accessibility_name(TTRC("Select Control Points"));
 	toolbar->add_child(curve_edit_curve);
 	curve_edit_curve->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_EDIT_CURVE));
 
@@ -896,6 +937,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	curve_edit_tilt->set_toggle_mode(true);
 	curve_edit_tilt->set_focus_mode(Control::FOCUS_NONE);
 	curve_edit_tilt->set_tooltip_text(TTR("Select Tilt Handles"));
+	curve_edit_tilt->set_accessibility_name(TTRC("Select Tilt Handles"));
 	toolbar->add_child(curve_edit_tilt);
 	curve_edit_tilt->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_EDIT_TILT));
 
@@ -904,6 +946,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	curve_create->set_toggle_mode(true);
 	curve_create->set_focus_mode(Control::FOCUS_NONE);
 	curve_create->set_tooltip_text(TTR("Add Point (in empty space)") + "\n" + TTR("Split Segment (in curve)"));
+	curve_create->set_accessibility_name(TTRC("Add Point"));
 	toolbar->add_child(curve_create);
 	curve_create->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_CREATE));
 
@@ -912,6 +955,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	curve_del->set_toggle_mode(true);
 	curve_del->set_focus_mode(Control::FOCUS_NONE);
 	curve_del->set_tooltip_text(TTR("Delete Point"));
+	curve_del->set_accessibility_name(TTRC("Delete Point"));
 	toolbar->add_child(curve_del);
 	curve_del->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_mode_changed).bind(MODE_DELETE));
 
@@ -919,6 +963,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	curve_closed->set_theme_type_variation(SceneStringName(FlatButton));
 	curve_closed->set_focus_mode(Control::FOCUS_NONE);
 	curve_closed->set_tooltip_text(TTR("Close Curve"));
+	curve_closed->set_accessibility_name(TTRC("Close Curve"));
 	toolbar->add_child(curve_closed);
 	curve_closed->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_toggle_closed_curve));
 
@@ -926,6 +971,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() {
 	curve_clear_points->set_theme_type_variation(SceneStringName(FlatButton));
 	curve_clear_points->set_focus_mode(Control::FOCUS_NONE);
 	curve_clear_points->set_tooltip_text(TTR("Clear Points"));
+	curve_clear_points->set_accessibility_name(TTRC("Clear Points"));
 	curve_clear_points->connect(SceneStringName(pressed), callable_mp(this, &Path3DEditorPlugin::_confirm_clear_points));
 	toolbar->add_child(curve_clear_points);
 
diff --git a/engine/editor/plugins/path_3d_editor_plugin.h b/engine/editor/plugins/path_3d_editor_plugin.h
index a85682c1..15c8df00 100644
--- a/engine/editor/plugins/path_3d_editor_plugin.h
+++ b/engine/editor/plugins/path_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PATH_3D_EDITOR_PLUGIN_H
-#define PATH_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
@@ -56,11 +55,16 @@ class Path3DGizmo : public EditorNode3DGizmo {
 	};
 
 	Path3D *path = nullptr;
+	Ref<StandardMaterial3D> debug_material;
 	mutable Vector3 original;
 	mutable float orig_in_length;
 	mutable float orig_out_length;
 	mutable float disk_size = 0.8;
 
+	// Index that should have swapped control points for achieving an outwards curve.
+	int swapped_control_points_idx = -1;
+	bool control_points_overlapped = false;
+
 	// Cache information of secondary handles.
 	Vector<HandleInfo> _secondary_handles_info;
 
@@ -183,5 +187,3 @@ public:
 
 	Path3DEditorPlugin();
 };
-
-#endif // PATH_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/physical_bone_3d_editor_plugin.cpp b/engine/editor/plugins/physical_bone_3d_editor_plugin.cpp
index 2db13cdc..2e58a0f7 100644
--- a/engine/editor/plugins/physical_bone_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/physical_bone_3d_editor_plugin.cpp
@@ -82,8 +82,6 @@ void PhysicalBone3DEditor::show() {
 	spatial_editor_hb->show();
 }
 
-PhysicalBone3DEditorPlugin::PhysicalBone3DEditorPlugin() {}
-
 void PhysicalBone3DEditorPlugin::make_visible(bool p_visible) {
 	if (p_visible) {
 		physical_bone_editor.show();
diff --git a/engine/editor/plugins/physical_bone_3d_editor_plugin.h b/engine/editor/plugins/physical_bone_3d_editor_plugin.h
index 87d58254..db421a07 100644
--- a/engine/editor/plugins/physical_bone_3d_editor_plugin.h
+++ b/engine/editor/plugins/physical_bone_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICAL_BONE_3D_EDITOR_PLUGIN_H
-#define PHYSICAL_BONE_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
@@ -51,7 +50,6 @@ private:
 
 public:
 	PhysicalBone3DEditor();
-	~PhysicalBone3DEditor() {}
 
 	void set_selected(PhysicalBone3D *p_pb);
 
@@ -70,8 +68,4 @@ public:
 	virtual bool handles(Object *p_object) const override { return p_object->is_class("PhysicalBone3D"); }
 	virtual void make_visible(bool p_visible) override;
 	virtual void edit(Object *p_node) override;
-
-	PhysicalBone3DEditorPlugin();
 };
-
-#endif // PHYSICAL_BONE_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/plugin_config_dialog.cpp b/engine/editor/plugins/plugin_config_dialog.cpp
index c3e87c50..85cadfa5 100644
--- a/engine/editor/plugins/plugin_config_dialog.cpp
+++ b/engine/editor/plugins/plugin_config_dialog.cpp
@@ -144,7 +144,7 @@ void PluginConfigDialog::_on_required_text_changed() {
 }
 
 String PluginConfigDialog::_get_subfolder() {
-	return subfolder_edit->get_text().is_empty() ? name_edit->get_text().replace(" ", "_").to_lower() : subfolder_edit->get_text();
+	return subfolder_edit->get_text().is_empty() ? name_edit->get_text().replace_char(' ', '_').to_lower() : subfolder_edit->get_text();
 }
 
 String PluginConfigDialog::_to_absolute_plugin_path(const String &p_plugin_name) {
@@ -224,6 +224,7 @@ PluginConfigDialog::PluginConfigDialog() {
 	name_edit = memnew(LineEdit);
 	name_edit->set_placeholder("MyPlugin");
 	name_edit->set_tooltip_text(TTR("Required. This name will be displayed in the list of plugins."));
+	name_edit->set_accessibility_name(TTRC("Name"));
 	name_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	grid->add_child(name_edit);
 
@@ -237,6 +238,7 @@ PluginConfigDialog::PluginConfigDialog() {
 	subfolder_edit = memnew(LineEdit);
 	subfolder_edit->set_placeholder("\"my_plugin\" -> res://addons/my_plugin");
 	subfolder_edit->set_tooltip_text(TTR("Optional. The folder name should generally use `snake_case` naming (avoid spaces and special characters).\nIf left empty, the folder will be named after the plugin name converted to `snake_case`."));
+	subfolder_edit->set_accessibility_name(TTRC("Subfolder"));
 	subfolder_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	grid->add_child(subfolder_edit);
 	plugin_edit_hidden_controls.push_back(subfolder_edit);
@@ -249,6 +251,7 @@ PluginConfigDialog::PluginConfigDialog() {
 
 	desc_edit = memnew(TextEdit);
 	desc_edit->set_tooltip_text(TTR("Optional. This description should be kept relatively short (up to 5 lines).\nIt will display when hovering the plugin in the list of plugins."));
+	desc_edit->set_accessibility_name(TTRC("Description"));
 	desc_edit->set_custom_minimum_size(Size2(400, 80) * EDSCALE);
 	desc_edit->set_line_wrapping_mode(TextEdit::LineWrappingMode::LINE_WRAPPING_BOUNDARY);
 	desc_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -263,6 +266,7 @@ PluginConfigDialog::PluginConfigDialog() {
 
 	author_edit = memnew(LineEdit);
 	author_edit->set_placeholder("Godette");
+	author_edit->set_accessibility_name(TTRC("Author"));
 	author_edit->set_tooltip_text(TTR("Optional. The author's username, full name, or organization name."));
 	author_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	grid->add_child(author_edit);
@@ -276,6 +280,7 @@ PluginConfigDialog::PluginConfigDialog() {
 	version_edit = memnew(LineEdit);
 	version_edit->set_tooltip_text(TTR("Optional. A human-readable version identifier used for informational purposes only."));
 	version_edit->set_placeholder("1.0");
+	version_edit->set_accessibility_name(TTRC("Version"));
 	version_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	grid->add_child(version_edit);
 
@@ -287,6 +292,7 @@ PluginConfigDialog::PluginConfigDialog() {
 
 	script_option_edit = memnew(OptionButton);
 	script_option_edit->set_tooltip_text(TTR("Required. The scripting language to use for the script.\nNote that a plugin may use several languages at once by adding more scripts to the plugin."));
+	script_option_edit->set_accessibility_name(TTRC("Scripting Language"));
 	int default_lang = 0;
 	for (int i = 0; i < ScriptServer::get_language_count(); i++) {
 		ScriptLanguage *lang = ScriptServer::get_language(i);
@@ -307,6 +313,7 @@ PluginConfigDialog::PluginConfigDialog() {
 	script_edit = memnew(LineEdit);
 	script_edit->set_tooltip_text(TTR("Optional. The name of the script file. If left empty, will default to the subfolder name."));
 	script_edit->set_placeholder("\"plugin.gd\" -> res://addons/my_plugin/plugin.gd");
+	script_edit->set_accessibility_name(TTRC("Script"));
 	script_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	grid->add_child(script_edit);
 
@@ -319,6 +326,7 @@ PluginConfigDialog::PluginConfigDialog() {
 
 	active_edit = memnew(CheckBox);
 	active_edit->set_pressed(true);
+	active_edit->set_accessibility_name(TTRC("Active"));
 	grid->add_child(active_edit);
 	plugin_edit_hidden_controls.push_back(active_edit);
 
@@ -340,6 +348,3 @@ PluginConfigDialog::PluginConfigDialog() {
 	subfolder_edit->connect(SceneStringName(text_changed), callable_mp(validation_panel, &EditorValidationPanel::update).unbind(1));
 	script_edit->connect(SceneStringName(text_changed), callable_mp(validation_panel, &EditorValidationPanel::update).unbind(1));
 }
-
-PluginConfigDialog::~PluginConfigDialog() {
-}
diff --git a/engine/editor/plugins/plugin_config_dialog.h b/engine/editor/plugins/plugin_config_dialog.h
index c95b8f56..477b0393 100644
--- a/engine/editor/plugins/plugin_config_dialog.h
+++ b/engine/editor/plugins/plugin_config_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLUGIN_CONFIG_DIALOG_H
-#define PLUGIN_CONFIG_DIALOG_H
+#pragma once
 
 #include "scene/gui/check_box.h"
 #include "scene/gui/dialogs.h"
@@ -82,7 +81,4 @@ public:
 	void config(const String &p_config_path);
 
 	PluginConfigDialog();
-	~PluginConfigDialog();
 };
-
-#endif // PLUGIN_CONFIG_DIALOG_H
diff --git a/engine/editor/plugins/polygon_2d_editor_plugin.cpp b/engine/editor/plugins/polygon_2d_editor_plugin.cpp
index 4ecbab15..9848a51e 100644
--- a/engine/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -182,7 +182,7 @@ void Polygon2DEditor::_sync_bones() {
 				}
 			}
 
-			if (weights.size() == 0) { //create them
+			if (weights.is_empty()) { //create them
 				weights.resize(wc);
 				float *w = weights.ptrw();
 				for (int j = 0; j < wc; j++) {
@@ -311,7 +311,7 @@ void Polygon2DEditor::_edit_menu_option(int p_option) {
 	switch (p_option) {
 		case MENU_POLYGON_TO_UV: {
 			Vector<Vector2> points = node->get_polygon();
-			if (points.size() == 0) {
+			if (points.is_empty()) {
 				break;
 			}
 			Vector<Vector2> uvs = node->get_uv();
@@ -323,7 +323,7 @@ void Polygon2DEditor::_edit_menu_option(int p_option) {
 		case MENU_UV_TO_POLYGON: {
 			Vector<Vector2> points = node->get_polygon();
 			Vector<Vector2> uvs = node->get_uv();
-			if (uvs.size() == 0) {
+			if (uvs.is_empty()) {
 				break;
 			}
 
@@ -334,7 +334,7 @@ void Polygon2DEditor::_edit_menu_option(int p_option) {
 		} break;
 		case MENU_UV_CLEAR: {
 			Vector<Vector2> uvs = node->get_uv();
-			if (uvs.size() == 0) {
+			if (uvs.is_empty()) {
 				break;
 			}
 			undo_redo->create_action(TTR("Create UV Map"));
@@ -1319,6 +1319,18 @@ Polygon2DEditor::Polygon2DEditor() {
 	action_buttons[ACTION_PAINT_WEIGHT]->set_tooltip_text(TTR("Paint weights with specified intensity."));
 	action_buttons[ACTION_CLEAR_WEIGHT]->set_tooltip_text(TTR("Unpaint weights with specified intensity."));
 
+	action_buttons[ACTION_CREATE]->set_accessibility_name(TTRC("Create Polygon"));
+	action_buttons[ACTION_CREATE_INTERNAL]->set_accessibility_name(TTRC("Create Internal Vertex"));
+	action_buttons[ACTION_REMOVE_INTERNAL]->set_accessibility_name(TTRC("Remove Internal Vertex"));
+	action_buttons[ACTION_EDIT_POINT]->set_accessibility_name(TTRC("Move Points"));
+	action_buttons[ACTION_MOVE]->set_accessibility_name(TTRC("Move Polygon"));
+	action_buttons[ACTION_ROTATE]->set_accessibility_name(TTRC("Rotate Polygon"));
+	action_buttons[ACTION_SCALE]->set_accessibility_name(TTRC("Scale Polygon"));
+	action_buttons[ACTION_ADD_POLYGON]->set_accessibility_name(TTRC("Create Custom Polygon"));
+	action_buttons[ACTION_REMOVE_POLYGON]->set_accessibility_name(TTRC("Remove Custom Polygon"));
+	action_buttons[ACTION_PAINT_WEIGHT]->set_accessibility_name(TTRC("Paint Weights"));
+	action_buttons[ACTION_CLEAR_WEIGHT]->set_accessibility_name(TTRC("Unpaint Weights"));
+
 	bone_paint_strength = memnew(HSlider);
 	toolbar->add_child(bone_paint_strength);
 	bone_paint_strength->set_custom_minimum_size(Size2(75 * EDSCALE, 0));
@@ -1327,6 +1339,7 @@ Polygon2DEditor::Polygon2DEditor() {
 	bone_paint_strength->set_max(1);
 	bone_paint_strength->set_step(0.01);
 	bone_paint_strength->set_value(0.5);
+	bone_paint_strength->set_accessibility_name(TTRC("Strength"));
 
 	bone_paint_radius_label = memnew(Label(TTR("Radius:")));
 	toolbar->add_child(bone_paint_radius_label);
@@ -1337,6 +1350,7 @@ Polygon2DEditor::Polygon2DEditor() {
 	bone_paint_radius->set_max(100);
 	bone_paint_radius->set_step(1);
 	bone_paint_radius->set_value(32);
+	bone_paint_radius->set_accessibility_name(TTRC("Radius"));
 
 	HSplitContainer *uv_main_hsc = memnew(HSplitContainer);
 	polygon_edit->add_child(uv_main_hsc);
@@ -1407,6 +1421,7 @@ Polygon2DEditor::Polygon2DEditor() {
 	sb_off_x->set_value(snap_offset.x);
 	sb_off_x->set_suffix("px");
 	sb_off_x->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_off_x));
+	sb_off_x->set_accessibility_name(TTRC("Grid Offset X"));
 	grid_settings_vb->add_margin_child(TTR("Grid Offset X:"), sb_off_x);
 
 	SpinBox *sb_off_y = memnew(SpinBox);
@@ -1416,6 +1431,7 @@ Polygon2DEditor::Polygon2DEditor() {
 	sb_off_y->set_value(snap_offset.y);
 	sb_off_y->set_suffix("px");
 	sb_off_y->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_off_y));
+	sb_off_y->set_accessibility_name(TTRC("Grid Offset Y"));
 	grid_settings_vb->add_margin_child(TTR("Grid Offset Y:"), sb_off_y);
 
 	SpinBox *sb_step_x = memnew(SpinBox);
@@ -1425,6 +1441,7 @@ Polygon2DEditor::Polygon2DEditor() {
 	sb_step_x->set_value(snap_step.x);
 	sb_step_x->set_suffix("px");
 	sb_step_x->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_step_x));
+	sb_step_x->set_accessibility_name(TTRC("Grid Step X"));
 	grid_settings_vb->add_margin_child(TTR("Grid Step X:"), sb_step_x);
 
 	SpinBox *sb_step_y = memnew(SpinBox);
@@ -1434,6 +1451,7 @@ Polygon2DEditor::Polygon2DEditor() {
 	sb_step_y->set_value(snap_step.y);
 	sb_step_y->set_suffix("px");
 	sb_step_y->connect(SceneStringName(value_changed), callable_mp(this, &Polygon2DEditor::_set_snap_step_y));
+	sb_step_y->set_accessibility_name(TTRC("Grid Step Y"));
 	grid_settings_vb->add_margin_child(TTR("Grid Step Y:"), sb_step_y);
 
 	zoom_widget = memnew(EditorZoomWidget);
diff --git a/engine/editor/plugins/polygon_2d_editor_plugin.h b/engine/editor/plugins/polygon_2d_editor_plugin.h
index acf88042..bbdf7924 100644
--- a/engine/editor/plugins/polygon_2d_editor_plugin.h
+++ b/engine/editor/plugins/polygon_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POLYGON_2D_EDITOR_PLUGIN_H
-#define POLYGON_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/abstract_polygon_2d_editor.h"
 #include "scene/2d/polygon_2d.h"
@@ -196,5 +195,3 @@ class Polygon2DEditorPlugin : public AbstractPolygon2DEditorPlugin {
 public:
 	Polygon2DEditorPlugin();
 };
-
-#endif // POLYGON_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/polygon_3d_editor_plugin.cpp b/engine/editor/plugins/polygon_3d_editor_plugin.cpp
index 9d7567f2..ee1bdeef 100644
--- a/engine/editor/plugins/polygon_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/polygon_3d_editor_plugin.cpp
@@ -200,13 +200,11 @@ EditorPlugin::AfterGUIInput Polygon3DEditor::forward_3d_gui_input(Camera3D *p_ca
 							Vector2 closest_pos;
 							real_t closest_dist = 1e10;
 							for (int i = 0; i < poly.size(); i++) {
-								Vector2 points[2] = {
-									p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth))),
-									p_camera->unproject_position(gt.xform(Vector3(poly[(i + 1) % poly.size()].x, poly[(i + 1) % poly.size()].y, depth)))
-								};
+								const Vector2 segment_a = p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth)));
+								const Vector2 segment_b = p_camera->unproject_position(gt.xform(Vector3(poly[(i + 1) % poly.size()].x, poly[(i + 1) % poly.size()].y, depth)));
 
-								Vector2 cp = Geometry2D::get_closest_point_to_segment(gpoint, points);
-								if (cp.distance_squared_to(points[0]) < CMP_EPSILON2 || cp.distance_squared_to(points[1]) < CMP_EPSILON2) {
+								Vector2 cp = Geometry2D::get_closest_point_to_segment(gpoint, segment_a, segment_b);
+								if (cp.distance_squared_to(segment_a) < CMP_EPSILON2 || cp.distance_squared_to(segment_b) < CMP_EPSILON2) {
 									continue; //not valid to reuse point
 								}
 
@@ -464,7 +462,7 @@ void Polygon3DEditor::_polygon_draw() {
 
 	imesh->surface_end();
 
-	if (poly.size() == 0) {
+	if (poly.is_empty()) {
 		return;
 	}
 
@@ -475,7 +473,7 @@ void Polygon3DEditor::_polygon_draw() {
 		va.resize(poly.size());
 		Vector3 *w = va.ptrw();
 		for (int i = 0; i < poly.size(); i++) {
-			Vector2 p, p2;
+			Vector2 p;
 			p = i == edited_point ? edited_point_pos : poly[i];
 
 			Vector3 point = Vector3(p.x, p.y, depth);
@@ -535,6 +533,7 @@ Polygon3DEditor::Polygon3DEditor() {
 
 	button_create = memnew(Button);
 	button_create->set_theme_type_variation(SceneStringName(FlatButton));
+	button_create->set_accessibility_name(TTRC("Create Polygon"));
 	button_create->set_tooltip_text(TTRC("Create Polygon"));
 	add_child(button_create);
 	button_create->connect(SceneStringName(pressed), callable_mp(this, &Polygon3DEditor::_menu_option).bind(MODE_CREATE));
@@ -542,6 +541,7 @@ Polygon3DEditor::Polygon3DEditor() {
 
 	button_edit = memnew(Button);
 	button_edit->set_theme_type_variation(SceneStringName(FlatButton));
+	button_edit->set_accessibility_name(TTRC("Edit Polygon"));
 	button_edit->set_tooltip_text(TTRC("Edit Polygon"));
 	add_child(button_edit);
 	button_edit->connect(SceneStringName(pressed), callable_mp(this, &Polygon3DEditor::_menu_option).bind(MODE_EDIT));
@@ -560,6 +560,7 @@ Polygon3DEditor::Polygon3DEditor() {
 	line_material->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
 	line_material->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
 	line_material->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	line_material->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
 	line_material->set_albedo(Color(1, 1, 1));
 
 	handle_material.instantiate();
@@ -569,6 +570,7 @@ Polygon3DEditor::Polygon3DEditor() {
 	handle_material->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
 	handle_material->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
 	handle_material->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	handle_material->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
 	Ref<Texture2D> handle = EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Editor3DHandle"), EditorStringName(EditorIcons));
 	handle_material->set_point_size(handle->get_width());
 	handle_material->set_texture(StandardMaterial3D::TEXTURE_ALBEDO, handle);
@@ -609,6 +611,3 @@ Polygon3DEditorPlugin::Polygon3DEditorPlugin() {
 
 	polygon_editor->hide();
 }
-
-Polygon3DEditorPlugin::~Polygon3DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/polygon_3d_editor_plugin.h b/engine/editor/plugins/polygon_3d_editor_plugin.h
index dc8d1438..24314de6 100644
--- a/engine/editor/plugins/polygon_3d_editor_plugin.h
+++ b/engine/editor/plugins/polygon_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POLYGON_3D_EDITOR_PLUGIN_H
-#define POLYGON_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/mesh_instance_3d.h"
@@ -111,7 +110,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	Polygon3DEditorPlugin();
-	~Polygon3DEditorPlugin();
 };
-
-#endif // POLYGON_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/resource_preloader_editor_plugin.cpp b/engine/editor/plugins/resource_preloader_editor_plugin.cpp
index 7c6834a5..47a53414 100644
--- a/engine/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/engine/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -253,7 +253,7 @@ void ResourcePreloaderEditor::edit(ResourcePreloader *p_preloader) {
 }
 
 Variant ResourcePreloaderEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
-	TreeItem *ti = tree->get_item_at_position(p_point);
+	TreeItem *ti = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_selected() : tree->get_item_at_position(p_point);
 	if (!ti) {
 		return Variant();
 	}
@@ -356,6 +356,7 @@ ResourcePreloaderEditor::ResourcePreloaderEditor() {
 	vbc->add_child(hbc);
 
 	load = memnew(Button);
+	load->set_accessibility_name(TTRC("Load Resource"));
 	load->set_tooltip_text(TTR("Load Resource"));
 	hbc->add_child(load);
 
@@ -427,6 +428,3 @@ ResourcePreloaderEditorPlugin::ResourcePreloaderEditorPlugin() {
 	button = EditorNode::get_bottom_panel()->add_item("ResourcePreloader", preloader_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_resource_preloader_bottom_panel", TTRC("Toggle ResourcePreloader Bottom Panel")));
 	button->hide();
 }
-
-ResourcePreloaderEditorPlugin::~ResourcePreloaderEditorPlugin() {
-}
diff --git a/engine/editor/plugins/resource_preloader_editor_plugin.h b/engine/editor/plugins/resource_preloader_editor_plugin.h
index 25e9be22..fea323aa 100644
--- a/engine/editor/plugins/resource_preloader_editor_plugin.h
+++ b/engine/editor/plugins/resource_preloader_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_PRELOADER_EDITOR_PLUGIN_H
-#define RESOURCE_PRELOADER_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/dialogs.h"
@@ -95,7 +94,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	ResourcePreloaderEditorPlugin();
-	~ResourcePreloaderEditorPlugin();
 };
-
-#endif // RESOURCE_PRELOADER_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/root_motion_editor_plugin.cpp b/engine/editor/plugins/root_motion_editor_plugin.cpp
index 9016c650..f4bc2a81 100644
--- a/engine/editor/plugins/root_motion_editor_plugin.cpp
+++ b/engine/editor/plugins/root_motion_editor_plugin.cpp
@@ -196,12 +196,14 @@ EditorPropertyRootMotion::EditorPropertyRootMotion() {
 	HBoxContainer *hbc = memnew(HBoxContainer);
 	add_child(hbc);
 	assign = memnew(Button);
+	assign->set_accessibility_name(TTRC("Assign"));
 	assign->set_h_size_flags(SIZE_EXPAND_FILL);
 	assign->set_clip_text(true);
 	assign->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyRootMotion::_node_assign));
 	hbc->add_child(assign);
 
 	clear = memnew(Button);
+	clear->set_accessibility_name(TTRC("Clear"));
 	clear->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyRootMotion::_node_clear));
 	hbc->add_child(clear);
 
diff --git a/engine/editor/plugins/root_motion_editor_plugin.h b/engine/editor/plugins/root_motion_editor_plugin.h
index a3e90360..a735e644 100644
--- a/engine/editor/plugins/root_motion_editor_plugin.h
+++ b/engine/editor/plugins/root_motion_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ROOT_MOTION_EDITOR_PLUGIN_H
-#define ROOT_MOTION_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 
@@ -67,5 +66,3 @@ public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual bool parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide = false) override;
 };
-
-#endif // ROOT_MOTION_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/script_editor_plugin.cpp b/engine/editor/plugins/script_editor_plugin.cpp
index af7812ab..1170382e 100644
--- a/engine/editor/plugins/script_editor_plugin.cpp
+++ b/engine/editor/plugins/script_editor_plugin.cpp
@@ -202,8 +202,8 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
 		List<String> comments;
 		scr_lang->get_comment_delimiters(&comments);
 		for (const String &comment : comments) {
-			String beg = comment.get_slice(" ", 0);
-			String end = comment.get_slice_count(" ") > 1 ? comment.get_slice(" ", 1) : String();
+			String beg = comment.get_slicec(' ', 0);
+			String end = comment.get_slice_count(" ") > 1 ? comment.get_slicec(' ', 1) : String();
 			highlighter->add_color_region(beg, end, comment_color, end.is_empty());
 		}
 
@@ -212,8 +212,8 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
 		List<String> doc_comments;
 		scr_lang->get_doc_comment_delimiters(&doc_comments);
 		for (const String &doc_comment : doc_comments) {
-			String beg = doc_comment.get_slice(" ", 0);
-			String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slice(" ", 1) : String();
+			String beg = doc_comment.get_slicec(' ', 0);
+			String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slicec(' ', 1) : String();
 			highlighter->add_color_region(beg, end, doc_comment_color, end.is_empty());
 		}
 
@@ -222,8 +222,8 @@ void EditorStandardSyntaxHighlighter::_update_cache() {
 		List<String> strings;
 		scr_lang->get_string_delimiters(&strings);
 		for (const String &string : strings) {
-			String beg = string.get_slice(" ", 0);
-			String end = string.get_slice_count(" ") > 1 ? string.get_slice(" ", 1) : String();
+			String beg = string.get_slicec(' ', 0);
+			String end = string.get_slice_count(" ") > 1 ? string.get_slicec(' ', 1) : String();
 			highlighter->add_color_region(beg, end, string_color, end.is_empty());
 		}
 	}
@@ -389,8 +389,6 @@ public:
 
 		return E->value.cache;
 	}
-
-	virtual ~EditorScriptCodeCompletionCache() {}
 };
 
 void ScriptEditorQuickOpen::popup_dialog(const Vector<String> &p_functions, bool p_dontclear) {
@@ -443,7 +441,7 @@ void ScriptEditorQuickOpen::_confirmed() {
 	if (!ti) {
 		return;
 	}
-	int line = ti->get_text(0).get_slice(":", 1).to_int();
+	int line = ti->get_text(0).get_slicec(':', 1).to_int();
 
 	emit_signal(SNAME("goto_line"), line - 1);
 	hide();
@@ -824,7 +822,8 @@ void ScriptEditor::_update_recent_scripts() {
 
 	recent_scripts->add_separator();
 	recent_scripts->add_shortcut(ED_GET_SHORTCUT("script_editor/clear_recent"));
-	recent_scripts->set_item_disabled(recent_scripts->get_item_id(recent_scripts->get_item_count() - 1), rc.is_empty());
+	recent_scripts->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_ALWAYS);
+	recent_scripts->set_item_disabled(-1, rc.is_empty());
 
 	recent_scripts->reset_size();
 }
@@ -865,13 +864,8 @@ void ScriptEditor::_open_recent_script(int p_idx) {
 	} else if (path.contains("::")) {
 		// built-in script
 		String res_path = path.get_slice("::", 0);
-		if (ResourceLoader::get_resource_type(res_path) == "PackedScene") {
-			if (!EditorNode::get_singleton()->is_scene_open(res_path)) {
-				EditorNode::get_singleton()->load_scene(res_path);
-			}
-		} else {
-			EditorNode::get_singleton()->load_resource(res_path);
-		}
+		EditorNode::get_singleton()->load_scene_or_resource(res_path, false, false);
+
 		Ref<Script> scr = ResourceLoader::load(path);
 		if (scr.is_valid()) {
 			edit(scr, true);
@@ -1310,13 +1304,13 @@ TypedArray<Script> ScriptEditor::_get_open_scripts() const {
 	return ret;
 }
 
-bool ScriptEditor::toggle_scripts_panel() {
+bool ScriptEditor::toggle_files_panel() {
 	list_split->set_visible(!list_split->is_visible());
-	EditorSettings::get_singleton()->set_project_metadata("scripts_panel", "show_scripts_panel", list_split->is_visible());
+	EditorSettings::get_singleton()->set_project_metadata("files_panel", "show_files_panel", list_split->is_visible());
 	return list_split->is_visible();
 }
 
-bool ScriptEditor::is_scripts_panel_toggled() {
+bool ScriptEditor::is_files_panel_toggled() {
 	return list_split->is_visible();
 }
 
@@ -1376,13 +1370,7 @@ void ScriptEditor::_menu_option(int p_option) {
 			if (extensions.find(path.get_extension()) || built_in) {
 				if (built_in) {
 					String res_path = path.get_slice("::", 0);
-					if (ResourceLoader::get_resource_type(res_path) == "PackedScene") {
-						if (!EditorNode::get_singleton()->is_scene_open(res_path)) {
-							EditorNode::get_singleton()->load_scene(res_path);
-						}
-					} else {
-						EditorNode::get_singleton()->load_resource(res_path);
-					}
+					EditorNode::get_singleton()->load_scene_or_resource(res_path, false, false);
 				}
 
 				Ref<Resource> scr = ResourceLoader::load(path);
@@ -1434,10 +1422,10 @@ void ScriptEditor::_menu_option(int p_option) {
 			}
 			if (native_class_doc) {
 				String name = eh->get_class().to_lower();
-				String doc_url = vformat(VERSION_DOCS_URL "/classes/class_%s.html", name);
+				String doc_url = vformat(GODOT_VERSION_DOCS_URL "/classes/class_%s.html", name);
 				OS::get_singleton()->shell_open(doc_url);
 			} else {
-				OS::get_singleton()->shell_open(VERSION_DOCS_URL "/");
+				OS::get_singleton()->shell_open(GODOT_VERSION_DOCS_URL "/");
 			}
 		} break;
 		case WINDOW_NEXT: {
@@ -1450,15 +1438,15 @@ void ScriptEditor::_menu_option(int p_option) {
 			_sort_list_on_update = true;
 			_update_script_names();
 		} break;
-		case TOGGLE_SCRIPTS_PANEL: {
-			toggle_scripts_panel();
+		case TOGGLE_FILES_PANEL: {
+			toggle_files_panel();
 			if (current) {
-				current->update_toggle_scripts_button();
+				current->update_toggle_files_button();
 			} else {
 				Control *tab = tab_container->get_current_tab_control();
 				EditorHelp *editor_help = Object::cast_to<EditorHelp>(tab);
 				if (editor_help) {
-					editor_help->update_toggle_scripts_button();
+					editor_help->update_toggle_files_button();
 				}
 			}
 		}
@@ -2111,10 +2099,10 @@ void ScriptEditor::_update_members_overview() {
 
 	for (int i = 0; i < functions.size(); i++) {
 		String filter = filter_methods->get_text();
-		String name = functions[i].get_slice(":", 0);
+		String name = functions[i].get_slicec(':', 0);
 		if (filter.is_empty() || filter.is_subsequence_ofn(name)) {
 			members_overview->add_item(name);
-			members_overview->set_item_metadata(-1, functions[i].get_slice(":", 1).to_int() - 1);
+			members_overview->set_item_metadata(-1, functions[i].get_slicec(':', 1).to_int() - 1);
 		}
 	}
 
@@ -2297,39 +2285,9 @@ void ScriptEditor::_update_script_names() {
 			sedata.push_back(sd);
 		}
 
-		Vector<String> disambiguated_script_names;
-		Vector<String> full_script_paths;
-		for (int j = 0; j < sedata.size(); j++) {
-			String name = sedata[j].name.replace("(*)", "");
-			ScriptListName script_display = (ScriptListName)(int)EDITOR_GET("text_editor/script_list/list_script_names_as");
-			switch (script_display) {
-				case DISPLAY_NAME: {
-					name = name.get_file();
-				} break;
-				case DISPLAY_DIR_AND_NAME: {
-					name = name.get_base_dir().get_file().path_join(name.get_file());
-				} break;
-				default:
-					break;
-			}
-
-			disambiguated_script_names.append(name);
-			full_script_paths.append(sedata[j].tooltip);
-		}
-
-		EditorNode::disambiguate_filenames(full_script_paths, disambiguated_script_names);
-
-		for (int j = 0; j < sedata.size(); j++) {
-			if (sedata[j].name.ends_with("(*)")) {
-				sedata.write[j].name = disambiguated_script_names[j] + "(*)";
-			} else {
-				sedata.write[j].name = disambiguated_script_names[j];
-			}
-		}
-
 		EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_tab_control(i));
-		if (eh) {
-			String name = eh->get_class();
+		if (eh && !eh->get_class().is_empty()) {
+			String name = eh->get_class().unquote();
 			Ref<Texture2D> icon = get_editor_theme_icon(SNAME("Help"));
 			String tooltip = vformat(TTR("%s Class Reference"), name);
 
@@ -2347,6 +2305,36 @@ void ScriptEditor::_update_script_names() {
 		}
 	}
 
+	Vector<String> disambiguated_script_names;
+	Vector<String> full_script_paths;
+	for (int j = 0; j < sedata.size(); j++) {
+		String name = sedata[j].name.replace("(*)", "");
+		ScriptListName script_display = (ScriptListName)(int)EDITOR_GET("text_editor/script_list/list_script_names_as");
+		switch (script_display) {
+			case DISPLAY_NAME: {
+				name = name.get_file();
+			} break;
+			case DISPLAY_DIR_AND_NAME: {
+				name = name.get_base_dir().get_file().path_join(name.get_file());
+			} break;
+			default:
+				break;
+		}
+
+		disambiguated_script_names.append(name);
+		full_script_paths.append(sedata[j].tooltip);
+	}
+
+	EditorNode::disambiguate_filenames(full_script_paths, disambiguated_script_names);
+
+	for (int j = 0; j < sedata.size(); j++) {
+		if (sedata[j].name.ends_with("(*)")) {
+			sedata.write[j].name = disambiguated_script_names[j] + "(*)";
+		} else {
+			sedata.write[j].name = disambiguated_script_names[j];
+		}
+	}
+
 	if (_sort_list_on_update && !sedata.is_empty()) {
 		sedata.sort();
 
@@ -2817,6 +2805,15 @@ void ScriptEditor::save_all_scripts() {
 	_update_script_names();
 }
 
+void ScriptEditor::update_script_times() {
+	for (int i = 0; i < tab_container->get_tab_count(); i++) {
+		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
+		if (se) {
+			se->edited_file_data.last_modified_time = FileAccess::get_modified_time(se->edited_file_data.path);
+		}
+	}
+}
+
 void ScriptEditor::apply_scripts() const {
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
 		ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_tab_control(i));
@@ -3209,7 +3206,7 @@ bool ScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data
 
 	if (String(d["type"]) == "nodes") {
 		Array nodes = d["nodes"];
-		if (nodes.size() == 0) {
+		if (nodes.is_empty()) {
 			return false;
 		}
 		Node *node = get_node((nodes[0]));
@@ -3227,7 +3224,7 @@ bool ScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data
 	if (String(d["type"]) == "files") {
 		Vector<String> files = d["files"];
 
-		if (files.size() == 0) {
+		if (files.is_empty()) {
 			return false; //weird
 		}
 
@@ -3275,7 +3272,15 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
 		if (se || eh) {
 			int new_index = 0;
 			if (script_list->get_item_count() > 0) {
-				new_index = script_list->get_item_metadata(script_list->get_item_at_position(p_point));
+				int pos = 0;
+				if (p_point == Vector2(Math::INF, Math::INF)) {
+					if (script_list->is_anything_selected()) {
+						pos = script_list->get_selected_items()[0];
+					}
+				} else {
+					pos = script_list->get_item_at_position(p_point);
+				}
+				new_index = script_list->get_item_metadata(pos);
 			}
 			tab_container->move_child(node, new_index);
 			tab_container->set_current_tab(new_index);
@@ -3285,7 +3290,7 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
 
 	if (String(d["type"]) == "nodes") {
 		Array nodes = d["nodes"];
-		if (nodes.size() == 0) {
+		if (nodes.is_empty()) {
 			return;
 		}
 		Node *node = get_node(nodes[0]);
@@ -3295,7 +3300,15 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
 		if (se || eh) {
 			int new_index = 0;
 			if (script_list->get_item_count() > 0) {
-				new_index = script_list->get_item_metadata(script_list->get_item_at_position(p_point));
+				int pos = 0;
+				if (p_point == Vector2(Math::INF, Math::INF)) {
+					if (script_list->is_anything_selected()) {
+						pos = script_list->get_selected_items()[0];
+					}
+				} else {
+					pos = script_list->get_item_at_position(p_point);
+				}
+				new_index = script_list->get_item_metadata(pos);
 			}
 			tab_container->move_child(node, new_index);
 			tab_container->set_current_tab(new_index);
@@ -3308,7 +3321,15 @@ void ScriptEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
 
 		int new_index = 0;
 		if (script_list->get_item_count() > 0) {
-			new_index = script_list->get_item_metadata(script_list->get_item_at_position(p_point));
+			int pos = 0;
+			if (p_point == Vector2(Math::INF, Math::INF)) {
+				if (script_list->is_anything_selected()) {
+					pos = script_list->get_selected_items()[0];
+				}
+			} else {
+				pos = script_list->get_item_at_position(p_point);
+			}
+			new_index = script_list->get_item_metadata(pos);
 		}
 		int num_tabs_before = tab_container->get_tab_count();
 		for (int i = 0; i < files.size(); i++) {
@@ -3455,7 +3476,7 @@ void ScriptEditor::_make_script_list_context_menu() {
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/window_move_up"), WINDOW_MOVE_UP);
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/window_move_down"), WINDOW_MOVE_DOWN);
 	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/window_sort"), WINDOW_SORT);
-	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/toggle_scripts_panel"), TOGGLE_SCRIPTS_PANEL);
+	context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/toggle_files_panel"), TOGGLE_FILES_PANEL);
 
 	context_menu->set_item_disabled(context_menu->get_item_index(CLOSE_ALL), tab_container->get_tab_count() <= 0);
 	context_menu->set_item_disabled(context_menu->get_item_index(CLOSE_OTHER_TABS), tab_container->get_tab_count() <= 1);
@@ -3672,7 +3693,7 @@ void ScriptEditor::_help_class_open(const String &p_class) {
 }
 
 void ScriptEditor::_help_class_goto(const String &p_desc) {
-	String cname = p_desc.get_slice(":", 1);
+	String cname = p_desc.get_slicec(':', 1);
 
 	if (_help_tab_goto(cname, p_desc)) {
 		return;
@@ -3706,7 +3727,7 @@ bool ScriptEditor::_help_tab_goto(const String &p_name, const String &p_desc) {
 }
 
 void ScriptEditor::update_doc(const String &p_name) {
-	ERR_FAIL_COND(!EditorHelp::get_doc_data()->has_doc(p_name));
+	ERR_FAIL_COND(!EditorHelp::has_doc(p_name));
 
 	for (int i = 0; i < tab_container->get_tab_count(); i++) {
 		EditorHelp *eh = Object::cast_to<EditorHelp>(tab_container->get_tab_control(i));
@@ -3979,7 +4000,7 @@ void ScriptEditor::_on_find_in_files_result_selected(const String &fpath, int li
 
 				// Found the end of the script.
 				scr_id = line.get_slice(scr_header, 1);
-				scr_id = scr_id.get_slice("\"", 0);
+				scr_id = scr_id.get_slicec('"', 0);
 
 				scr_start_line = l + 1;
 				int scr_line_count = 0;
@@ -4175,6 +4196,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 
 	filter_scripts = memnew(LineEdit);
 	filter_scripts->set_placeholder(TTR("Filter Scripts"));
+	filter_scripts->set_accessibility_name(TTRC("Filter Scripts"));
 	filter_scripts->set_clear_button_enabled(true);
 	filter_scripts->connect(SceneStringName(text_changed), callable_mp(this, &ScriptEditor::_filter_scripts_text_changed));
 	scripts_vbox->add_child(filter_scripts);
@@ -4200,11 +4222,12 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	overview_vbox->set_v_size_flags(SIZE_EXPAND_FILL);
 
 	list_split->add_child(overview_vbox);
-	list_split->set_visible(EditorSettings::get_singleton()->get_project_metadata("scripts_panel", "show_scripts_panel", true));
+	list_split->set_visible(EditorSettings::get_singleton()->get_project_metadata("files_panel", "show_files_panel", true));
 	buttons_hbox = memnew(HBoxContainer);
 	overview_vbox->add_child(buttons_hbox);
 
 	filename = memnew(Label);
+	filename->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	filename->set_clip_text(true);
 	filename->set_h_size_flags(SIZE_EXPAND_FILL);
 	filename->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
@@ -4213,6 +4236,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 
 	members_overview_alphabeta_sort_button = memnew(Button);
 	members_overview_alphabeta_sort_button->set_flat(true);
+	members_overview_alphabeta_sort_button->set_accessibility_name(TTRC("Alphabetical Sorting"));
 	members_overview_alphabeta_sort_button->set_tooltip_text(TTR("Toggle alphabetical sorting of the method list."));
 	members_overview_alphabeta_sort_button->set_toggle_mode(true);
 	members_overview_alphabeta_sort_button->set_pressed(EDITOR_GET("text_editor/script_list/sort_members_outline_alphabetically"));
@@ -4222,6 +4246,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 
 	filter_methods = memnew(LineEdit);
 	filter_methods->set_placeholder(TTR("Filter Methods"));
+	filter_methods->set_accessibility_name(TTRC("Filter Methods"));
 	filter_methods->set_clear_button_enabled(true);
 	filter_methods->connect(SceneStringName(text_changed), callable_mp(this, &ScriptEditor::_filter_methods_text_changed));
 	overview_vbox->add_child(filter_methods);
@@ -4279,6 +4304,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	file_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_editor/reopen_closed_script"), FILE_REOPEN_CLOSED);
 
 	recent_scripts = memnew(PopupMenu);
+	recent_scripts->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	file_menu->get_popup()->add_submenu_node_item(TTR("Open Recent"), recent_scripts, FILE_OPEN_RECENT);
 	recent_scripts->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptEditor::_open_recent_script));
 
@@ -4329,7 +4355,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/run_file", TTRC("Run"), KeyModifierMask::CMD_OR_CTRL | KeyModifierMask::SHIFT | Key::X), FILE_RUN);
 
 	file_menu->get_popup()->add_separator();
-	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/toggle_scripts_panel", TTRC("Toggle Scripts Panel"), KeyModifierMask::CMD_OR_CTRL | Key::BACKSLASH), TOGGLE_SCRIPTS_PANEL);
+	file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/toggle_files_panel", TTRC("Toggle Files Panel"), KeyModifierMask::CMD_OR_CTRL | Key::BACKSLASH), TOGGLE_FILES_PANEL);
 	file_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &ScriptEditor::_menu_option));
 	file_menu->get_popup()->connect("about_to_popup", callable_mp(this, &ScriptEditor::_prepare_file_menu));
 	file_menu->get_popup()->connect("popup_hide", callable_mp(this, &ScriptEditor::_file_menu_closed));
@@ -4367,6 +4393,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	menu_hb->add_spacer();
 
 	site_search = memnew(Button);
+	site_search->set_accessibility_name(TTRC("Site Search"));
 	site_search->set_flat(true);
 	site_search->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_menu_option).bind(SEARCH_WEBSITE));
 	menu_hb->add_child(site_search);
@@ -4381,6 +4408,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	menu_hb->add_child(memnew(VSeparator));
 
 	script_back = memnew(Button);
+	script_back->set_accessibility_name(TTRC("Previous"));
 	script_back->set_flat(true);
 	script_back->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_history_back));
 	menu_hb->add_child(script_back);
@@ -4388,6 +4416,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	script_back->set_tooltip_text(TTR("Go to previous edited document."));
 
 	script_forward = memnew(Button);
+	script_forward->set_accessibility_name(TTRC("Next"));
 	script_forward->set_flat(true);
 	script_forward->connect(SceneStringName(pressed), callable_mp(this, &ScriptEditor::_history_forward));
 	menu_hb->add_child(script_forward);
@@ -4401,7 +4430,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
 	make_floating->connect("request_open_in_screen", callable_mp(window_wrapper, &WindowWrapper::enable_window_on_screen).bind(true));
 	if (!make_floating->is_disabled()) {
 		// Override default ScreenSelect tooltip if multi-window support is available.
-		make_floating->set_tooltip_text(TTR("Make the script editor floating.\nRight-click to open the screen selector."));
+		make_floating->set_tooltip_text(TTR("Make the script editor floating.") + "\n" + TTR("Right-click to open the screen selector."));
 	}
 
 	menu_hb->add_child(make_floating);
@@ -4549,13 +4578,7 @@ void ScriptEditorPlugin::edit(Object *p_object) {
 		String res_path = p_script->get_path().get_slice("::", 0);
 
 		if (p_script->is_built_in() && !res_path.is_empty()) {
-			if (ResourceLoader::get_resource_type(res_path) == "PackedScene") {
-				if (!EditorNode::get_singleton()->is_scene_open(res_path)) {
-					EditorNode::get_singleton()->load_scene(res_path);
-				}
-			} else {
-				EditorNode::get_singleton()->load_resource(res_path);
-			}
+			EditorNode::get_singleton()->load_scene_or_resource(res_path, false, false);
 		}
 		script_editor->edit(p_script);
 	} else if (Object::cast_to<JSON>(p_object)) {
@@ -4716,6 +4739,3 @@ ScriptEditorPlugin::ScriptEditorPlugin() {
 
 	ScriptServer::set_reload_scripts_on_save(EDITOR_GET("text_editor/behavior/files/auto_reload_and_parse_scripts_on_save"));
 }
-
-ScriptEditorPlugin::~ScriptEditorPlugin() {
-}
diff --git a/engine/editor/plugins/script_editor_plugin.h b/engine/editor/plugins/script_editor_plugin.h
index 02e0529a..3d9f705d 100644
--- a/engine/editor/plugins/script_editor_plugin.h
+++ b/engine/editor/plugins/script_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_EDITOR_PLUGIN_H
-#define SCRIPT_EDITOR_PLUGIN_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "editor/plugins/editor_plugin.h"
@@ -210,7 +209,7 @@ public:
 	virtual void update_settings() = 0;
 	virtual void set_debugger_active(bool p_active) = 0;
 	virtual bool can_lose_focus_on_node_selection() { return true; }
-	virtual void update_toggle_scripts_button() {}
+	virtual void update_toggle_files_button() {}
 
 	virtual bool show_members_overview() = 0;
 
@@ -223,8 +222,6 @@ public:
 	virtual CodeTextEditor *get_code_editor() const = 0;
 
 	virtual void validate() = 0;
-
-	ScriptEditorBase() {}
 };
 
 typedef ScriptEditorBase *(*CreateScriptEditorFunc)(const Ref<Resource> &p_resource);
@@ -255,7 +252,7 @@ class ScriptEditor : public PanelContainer {
 		CLOSE_DOCS,
 		CLOSE_ALL,
 		CLOSE_OTHER_TABS,
-		TOGGLE_SCRIPTS_PANEL,
+		TOGGLE_FILES_PANEL,
 		SHOW_IN_FILE_SYSTEM,
 		FILE_COPY_PATH,
 		FILE_COPY_UID,
@@ -548,8 +545,8 @@ protected:
 public:
 	static ScriptEditor *get_singleton() { return script_editor; }
 
-	bool toggle_scripts_panel();
-	bool is_scripts_panel_toggled();
+	bool toggle_files_panel();
+	bool is_files_panel_toggled();
 	void apply_scripts() const;
 	void reload_scripts(bool p_refresh_only = false);
 	void open_script_create_dialog(const String &p_base_name, const String &p_base_path);
@@ -569,6 +566,7 @@ public:
 	PackedStringArray get_unsaved_scripts() const;
 	void save_current_script();
 	void save_all_scripts();
+	void update_script_times();
 
 	void set_window_layout(Ref<ConfigFile> p_layout);
 	void get_window_layout(Ref<ConfigFile> p_layout);
@@ -623,7 +621,7 @@ protected:
 	void _notification(int p_what);
 
 public:
-	virtual String get_plugin_name() const override { return "Script"; }
+	virtual String get_plugin_name() const override { return TTRC("Script"); }
 	bool has_main_screen() const override { return true; }
 	virtual void edit(Object *p_object) override;
 	virtual bool handles(Object *p_object) const override;
@@ -642,7 +640,4 @@ public:
 	virtual void edited_scene_changed() override;
 
 	ScriptEditorPlugin();
-	~ScriptEditorPlugin();
 };
-
-#endif // SCRIPT_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/script_text_editor.cpp b/engine/editor/plugins/script_text_editor.cpp
index 70a2960f..09f95abd 100644
--- a/engine/editor/plugins/script_text_editor.cpp
+++ b/engine/editor/plugins/script_text_editor.cpp
@@ -184,16 +184,22 @@ void ScriptTextEditor::enable_editor(Control *p_shortcut_context) {
 void ScriptTextEditor::_load_theme_settings() {
 	CodeEdit *text_edit = code_editor->get_text_editor();
 
+	Color updated_warning_line_color = EDITOR_GET("text_editor/theme/highlighting/warning_color");
 	Color updated_marked_line_color = EDITOR_GET("text_editor/theme/highlighting/mark_color");
 	Color updated_safe_line_number_color = EDITOR_GET("text_editor/theme/highlighting/safe_line_number_color");
 	Color updated_folded_code_region_color = EDITOR_GET("text_editor/theme/highlighting/folded_code_region_color");
 
-	bool safe_line_number_color_updated = updated_safe_line_number_color != safe_line_number_color;
+	bool warning_line_color_updated = updated_warning_line_color != warning_line_color;
 	bool marked_line_color_updated = updated_marked_line_color != marked_line_color;
+	bool safe_line_number_color_updated = updated_safe_line_number_color != safe_line_number_color;
 	bool folded_code_region_color_updated = updated_folded_code_region_color != folded_code_region_color;
-	if (safe_line_number_color_updated || marked_line_color_updated || folded_code_region_color_updated) {
+	if (safe_line_number_color_updated || warning_line_color_updated || marked_line_color_updated || folded_code_region_color_updated) {
 		safe_line_number_color = updated_safe_line_number_color;
 		for (int i = 0; i < text_edit->get_line_count(); i++) {
+			if (warning_line_color_updated && text_edit->get_line_background_color(i) == warning_line_color) {
+				text_edit->set_line_background_color(i, updated_warning_line_color);
+			}
+
 			if (marked_line_color_updated && text_edit->get_line_background_color(i) == marked_line_color) {
 				text_edit->set_line_background_color(i, updated_marked_line_color);
 			}
@@ -206,6 +212,7 @@ void ScriptTextEditor::_load_theme_settings() {
 				text_edit->set_line_background_color(i, updated_folded_code_region_color);
 			}
 		}
+		warning_line_color = updated_warning_line_color;
 		marked_line_color = updated_marked_line_color;
 		folded_code_region_color = updated_folded_code_region_color;
 	}
@@ -228,8 +235,8 @@ void ScriptTextEditor::_set_theme_for_script() {
 	script->get_language()->get_string_delimiters(&strings);
 	text_edit->clear_string_delimiters();
 	for (const String &string : strings) {
-		String beg = string.get_slice(" ", 0);
-		String end = string.get_slice_count(" ") > 1 ? string.get_slice(" ", 1) : String();
+		String beg = string.get_slicec(' ', 0);
+		String end = string.get_slice_count(" ") > 1 ? string.get_slicec(' ', 1) : String();
 		if (!text_edit->has_string_delimiter(beg)) {
 			text_edit->add_string_delimiter(beg, end, end.is_empty());
 		}
@@ -244,8 +251,8 @@ void ScriptTextEditor::_set_theme_for_script() {
 	List<String> comments;
 	script->get_language()->get_comment_delimiters(&comments);
 	for (const String &comment : comments) {
-		String beg = comment.get_slice(" ", 0);
-		String end = comment.get_slice_count(" ") > 1 ? comment.get_slice(" ", 1) : String();
+		String beg = comment.get_slicec(' ', 0);
+		String end = comment.get_slice_count(" ") > 1 ? comment.get_slicec(' ', 1) : String();
 		text_edit->add_comment_delimiter(beg, end, end.is_empty());
 
 		if (!end.is_empty() && !text_edit->has_auto_brace_completion_open_key(beg)) {
@@ -256,8 +263,8 @@ void ScriptTextEditor::_set_theme_for_script() {
 	List<String> doc_comments;
 	script->get_language()->get_doc_comment_delimiters(&doc_comments);
 	for (const String &doc_comment : doc_comments) {
-		String beg = doc_comment.get_slice(" ", 0);
-		String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slice(" ", 1) : String();
+		String beg = doc_comment.get_slicec(' ', 0);
+		String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slicec(' ', 1) : String();
 		text_edit->add_comment_delimiter(beg, end, end.is_empty());
 
 		if (!end.is_empty() && !text_edit->has_auto_brace_completion_open_key(beg)) {
@@ -567,8 +574,8 @@ void ScriptTextEditor::_validate_script() {
 		script_is_valid = true;
 	}
 	_update_connected_methods();
-	_update_warnings();
 	_update_errors();
+	_update_warnings();
 
 	emit_signal(SNAME("name_changed"));
 	emit_signal(SNAME("edited_script_changed"));
@@ -637,6 +644,17 @@ void ScriptTextEditor::_update_warnings() {
 		warnings_panel->pop(); // Cell.
 	}
 	warnings_panel->pop(); // Table.
+	if (warning_line_color.a != 0.0) {
+		CodeEdit *te = code_editor->get_text_editor();
+		for (int i = 0; i < te->get_line_count(); i++) {
+			for (const ScriptLanguage::Warning &W : warnings) {
+				if (i >= W.start_line - 1 && i < W.end_line) {
+					te->set_line_background_color(i, warning_line_color);
+					break;
+				}
+			}
+		}
+	}
 }
 
 void ScriptTextEditor::_update_errors() {
@@ -706,7 +724,7 @@ void ScriptTextEditor::_update_errors() {
 		if (errors.is_empty()) {
 			bool is_folded_code_region = te->is_line_code_region_start(i) && te->is_line_folded(i);
 			te->set_line_background_color(i, is_folded_code_region ? folded_code_region_color : Color(0, 0, 0, 0));
-		} else {
+		} else if (marked_line_color.a != 0) {
 			for (const ScriptLanguage::ScriptError &E : errors) {
 				bool error_line = i == E.line - 1;
 				te->set_line_background_color(i, error_line ? marked_line_color : Color(0, 0, 0, 0));
@@ -742,7 +760,7 @@ void ScriptTextEditor::_update_bookmark_list() {
 	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_bookmark"), BOOKMARK_GOTO_PREV);
 
 	PackedInt32Array bookmark_list = code_editor->get_text_editor()->get_bookmarked_lines();
-	if (bookmark_list.size() == 0) {
+	if (bookmark_list.is_empty()) {
 		return;
 	}
 
@@ -897,7 +915,7 @@ void ScriptTextEditor::_update_breakpoint_list() {
 	breakpoints_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_breakpoint"), DEBUG_GOTO_PREV_BREAKPOINT);
 
 	PackedInt32Array breakpoint_list = code_editor->get_text_editor()->get_breakpointed_lines();
-	if (breakpoint_list.size() == 0) {
+	if (breakpoint_list.is_empty()) {
 		return;
 	}
 
@@ -935,7 +953,7 @@ void ScriptTextEditor::_on_caret_moved() {
 		return;
 	}
 	int current_line = code_editor->get_text_editor()->get_caret_line();
-	if (ABS(current_line - previous_line) >= 10) {
+	if (Math::abs(current_line - previous_line) >= 10) {
 		Dictionary nav_state = get_navigation_state();
 		nav_state["row"] = previous_line;
 		nav_state["scroll_position"] = -1;
@@ -957,19 +975,7 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c
 	if (ScriptServer::is_global_class(p_symbol)) {
 		EditorNode::get_singleton()->load_resource(ScriptServer::get_global_class_path(p_symbol));
 	} else if (p_symbol.is_resource_file() || p_symbol.begins_with("uid://")) {
-		String symbol = p_symbol;
-		if (symbol.begins_with("uid://")) {
-			symbol = ResourceUID::uid_to_path(symbol);
-		}
-
-		List<String> scene_extensions;
-		ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions);
-
-		if (scene_extensions.find(symbol.get_extension())) {
-			EditorNode::get_singleton()->load_scene(symbol);
-		} else {
-			EditorNode::get_singleton()->load_resource(symbol);
-		}
+		EditorNode::get_singleton()->load_scene_or_resource(p_symbol);
 	} else if (lc_error == OK) {
 		_goto_line(p_row);
 
@@ -1064,14 +1070,7 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c
 		// Every symbol other than absolute path is relative path so keep this condition at last.
 		String path = _get_absolute_path(p_symbol);
 		if (FileAccess::exists(path)) {
-			List<String> scene_extensions;
-			ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions);
-
-			if (scene_extensions.find(path.get_extension())) {
-				EditorNode::get_singleton()->load_scene(path);
-			} else {
-				EditorNode::get_singleton()->load_resource(path);
-			}
+			EditorNode::get_singleton()->load_scene_or_resource(path);
 		}
 	}
 }
@@ -1228,8 +1227,8 @@ String ScriptTextEditor::_get_absolute_path(const String &rel_path) {
 	return path.replace("///", "//").simplify_path();
 }
 
-void ScriptTextEditor::update_toggle_scripts_button() {
-	code_editor->update_toggle_scripts_button();
+void ScriptTextEditor::update_toggle_files_button() {
+	code_editor->update_toggle_files_button();
 }
 
 void ScriptTextEditor::_update_connected_methods() {
@@ -1278,12 +1277,12 @@ void ScriptTextEditor::_update_connected_methods() {
 				int line = -1;
 
 				for (int j = 0; j < functions.size(); j++) {
-					String name = functions[j].get_slice(":", 0);
+					String name = functions[j].get_slicec(':', 0);
 					if (name == method) {
 						Dictionary line_meta;
 						line_meta["type"] = "connection";
 						line_meta["method"] = method;
-						line = functions[j].get_slice(":", 1).to_int() - 1;
+						line = functions[j].get_slicec(':', 1).to_int() - 1;
 						text_edit->set_line_gutter_metadata(line, connection_gutter, line_meta);
 						text_edit->set_line_gutter_icon(line, connection_gutter, get_parent_control()->get_editor_theme_icon(SNAME("Slot")));
 						text_edit->set_line_gutter_clickable(line, connection_gutter, true);
@@ -1318,7 +1317,7 @@ void ScriptTextEditor::_update_connected_methods() {
 	// Add override icons to methods.
 	methods_found.clear();
 	for (int i = 0; i < functions.size(); i++) {
-		String raw_name = functions[i].get_slice(":", 0);
+		String raw_name = functions[i].get_slicec(':', 0);
 		StringName name = StringName(raw_name);
 		if (methods_found.has(name)) {
 			continue;
@@ -1364,7 +1363,7 @@ void ScriptTextEditor::_update_connected_methods() {
 		}
 
 		if (!found_base_class.is_empty()) {
-			int line = functions[i].get_slice(":", 1).to_int() - 1;
+			int line = functions[i].get_slicec(':', 1).to_int() - 1;
 
 			Dictionary line_meta = text_edit->get_line_gutter_metadata(line, connection_gutter);
 			if (line_meta.is_empty()) {
@@ -1697,7 +1696,7 @@ void ScriptTextEditor::_edit_option(int p_op) {
 		} break;
 		case DEBUG_GOTO_NEXT_BREAKPOINT: {
 			PackedInt32Array bpoints = tx->get_breakpointed_lines();
-			if (bpoints.size() <= 0) {
+			if (bpoints.is_empty()) {
 				return;
 			}
 
@@ -1712,7 +1711,7 @@ void ScriptTextEditor::_edit_option(int p_op) {
 		} break;
 		case DEBUG_GOTO_PREV_BREAKPOINT: {
 			PackedInt32Array bpoints = tx->get_breakpointed_lines();
-			if (bpoints.size() <= 0) {
+			if (bpoints.is_empty()) {
 				return;
 			}
 
@@ -1806,8 +1805,8 @@ void ScriptTextEditor::_notification(int p_what) {
 				break;
 			}
 			if (is_visible_in_tree()) {
-				_update_warnings();
 				_update_errors();
+				_update_warnings();
 			}
 			[[fallthrough]];
 		case NOTIFICATION_ENTER_TREE: {
@@ -1928,8 +1927,14 @@ static String _quote_drop_data(const String &str) {
 	return escaped.quote(using_single_quotes ? "'" : "\"");
 }
 
-static String _get_dropped_resource_line(const Ref<Resource> &p_resource, bool p_create_field) {
-	const String &path = p_resource->get_path();
+static String _get_dropped_resource_line(const Ref<Resource> &p_resource, bool p_create_field, bool p_allow_uid) {
+	String path = p_resource->get_path();
+	if (p_allow_uid) {
+		ResourceUID::ID id = ResourceLoader::get_resource_uid(path);
+		if (id != ResourceUID::INVALID_ID) {
+			path = ResourceUID::get_singleton()->id_to_text(id);
+		}
+	}
 	const bool is_script = ClassDB::is_parent_class(p_resource->get_class(), "Script");
 
 	if (!p_create_field) {
@@ -1938,7 +1943,7 @@ static String _get_dropped_resource_line(const Ref<Resource> &p_resource, bool p
 
 	String variable_name = p_resource->get_name();
 	if (variable_name.is_empty()) {
-		variable_name = path.get_file().get_basename();
+		variable_name = p_resource->get_path().get_file().get_basename();
 	}
 
 	if (is_script) {
@@ -1953,7 +1958,7 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 	Dictionary d = p_data;
 
 	CodeEdit *te = code_editor->get_text_editor();
-	Point2i pos = te->get_line_column_at_pos(p_point);
+	Point2i pos = (p_point == Vector2(Math::INF, Math::INF)) ? Point2i(te->get_caret_line(0), te->get_caret_column(0)) : te->get_line_column_at_pos(p_point);
 	int drop_at_line = pos.y;
 	int drop_at_column = pos.x;
 	int selection_index = te->get_selection_at_line_column(drop_at_line, drop_at_column);
@@ -1969,6 +1974,7 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 	String text_to_drop;
 
 	const bool drop_modifier_pressed = Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL);
+	const bool allow_uid = Input::get_singleton()->is_key_pressed(Key::SHIFT) != bool(EDITOR_GET("text_editor/behavior/files/drop_preload_resources_as_uid"));
 	const String &line = te->get_line(drop_at_line);
 	const bool is_empty_line = line_will_be_empty || line.is_empty() || te->get_first_non_whitespace_column(drop_at_line) == line.length();
 
@@ -1991,7 +1997,7 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 				String warning = TTR("Preloading internal resources is not supported.");
 				EditorToaster::get_singleton()->popup_str(warning, EditorToaster::SEVERITY_ERROR);
 			} else {
-				text_to_drop = _get_dropped_resource_line(resource, is_empty_line);
+				text_to_drop = _get_dropped_resource_line(resource, is_empty_line, allow_uid);
 			}
 		} else {
 			text_to_drop = _quote_drop_data(path);
@@ -2010,7 +2016,7 @@ void ScriptTextEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 					resource.instantiate();
 					resource->set_path_cache(path);
 				}
-				parts.append(_get_dropped_resource_line(resource, is_empty_line));
+				parts.append(_get_dropped_resource_line(resource, is_empty_line, allow_uid));
 			} else {
 				parts.append(_quote_drop_data(path));
 			}
@@ -2242,7 +2248,7 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
 			switch (expression_pattern) {
 				case RGBA_PARAMETER: {
 					color_args = line.substr(begin, end - begin);
-					String stripped = color_args.replace(" ", "").replace("\t", "").replace("(", "").replace(")", "");
+					String stripped = color_args.remove_chars(" \t()");
 					PackedFloat64Array color = stripped.split_floats(",");
 					if (color.size() > 2) {
 						float alpha = color.size() > 3 ? color[3] : 1.0f;
@@ -2254,7 +2260,7 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) {
 						end = line.length();
 					}
 					color_args = line.substr(begin, end - begin);
-					const String color_name = color_args.replace(" ", "").replace("\t", "").replace(".", "");
+					const String color_name = color_args.remove_chars(" \t.");
 					const int color_index = Color::find_named_color(color_name);
 					if (0 <= color_index) {
 						const Color color_constant = Color::get_named_color(color_index);
@@ -2376,7 +2382,7 @@ void ScriptTextEditor::_enable_code_editor() {
 	code_editor->get_text_editor()->connect("gutter_removed", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
 	code_editor->get_text_editor()->connect("gutter_clicked", callable_mp(this, &ScriptTextEditor::_gutter_clicked));
 	code_editor->get_text_editor()->connect(SceneStringName(gui_input), callable_mp(this, &ScriptTextEditor::_text_edit_gui_input));
-	code_editor->show_toggle_scripts_button();
+	code_editor->show_toggle_files_button();
 	_update_gutter_indexes();
 
 	editor_box->add_child(warnings_panel);
diff --git a/engine/editor/plugins/script_text_editor.h b/engine/editor/plugins/script_text_editor.h
index 6bf3f9f1..7ddb7a0a 100644
--- a/engine/editor/plugins/script_text_editor.h
+++ b/engine/editor/plugins/script_text_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_TEXT_EDITOR_H
-#define SCRIPT_TEXT_EDITOR_H
+#pragma once
 
 #include "script_editor_plugin.h"
 
@@ -98,6 +97,7 @@ class ScriptTextEditor : public ScriptEditorBase {
 	Color safe_line_number_color = Color(1, 1, 1);
 
 	Color marked_line_color = Color(1, 1, 1);
+	Color warning_line_color = Color(1, 1, 1);
 	Color folded_code_region_color = Color(1, 1, 1);
 	int previous_line = 0;
 
@@ -216,7 +216,7 @@ public:
 
 	virtual void add_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
 	virtual void set_syntax_highlighter(Ref<EditorSyntaxHighlighter> p_highlighter) override;
-	void update_toggle_scripts_button() override;
+	void update_toggle_files_button() override;
 
 	virtual void apply_code() override;
 	virtual Ref<Resource> get_edited_resource() const override;
@@ -274,5 +274,3 @@ public:
 	ScriptTextEditor();
 	~ScriptTextEditor();
 };
-
-#endif // SCRIPT_TEXT_EDITOR_H
diff --git a/engine/editor/plugins/shader/shader_editor.h b/engine/editor/plugins/shader/shader_editor.h
index 32e69001..d9c6b64a 100644
--- a/engine/editor/plugins/shader/shader_editor.h
+++ b/engine/editor/plugins/shader/shader_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_EDITOR_H
-#define SHADER_EDITOR_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/resources/shader.h"
@@ -45,6 +44,5 @@ public:
 	virtual bool is_unsaved() const = 0;
 	virtual void save_external_data(const String &p_str = "") = 0;
 	virtual void validate_script() = 0;
+	virtual Control *get_top_bar() = 0;
 };
-
-#endif // SHADER_EDITOR_H
diff --git a/engine/editor/plugins/shader_editor_plugin.cpp b/engine/editor/plugins/shader_editor_plugin.cpp
index 06cf80e9..613bb4db 100644
--- a/engine/editor/plugins/shader_editor_plugin.cpp
+++ b/engine/editor/plugins/shader_editor_plugin.cpp
@@ -146,12 +146,13 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 			if (edited_shaders[i].shader_inc.ptr() == si) {
 				shader_tabs->set_current_tab(i);
 				shader_list->select(i);
+				_switch_to_editor(edited_shaders[i].shader_editor);
 				return;
 			}
 		}
 		es.shader_inc = Ref<ShaderInclude>(si);
 		TextShaderEditor *text_shader = memnew(TextShaderEditor);
-		text_shader->get_code_editor()->set_toggle_list_control(left_panel);
+		text_shader->get_code_editor()->set_toggle_list_control(shader_list);
 		es.shader_editor = text_shader;
 		es.shader_editor->edit_shader_include(si);
 		shader_tabs->add_child(es.shader_editor);
@@ -161,16 +162,19 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 			if (edited_shaders[i].shader.ptr() == s) {
 				shader_tabs->set_current_tab(i);
 				shader_list->select(i);
+				_switch_to_editor(edited_shaders[i].shader_editor);
 				return;
 			}
 		}
 		es.shader = Ref<Shader>(s);
 		Ref<VisualShader> vs = es.shader;
 		if (vs.is_valid()) {
-			es.shader_editor = memnew(VisualShaderEditor);
+			VisualShaderEditor *vs_editor = memnew(VisualShaderEditor);
+			vs_editor->set_toggle_list_control(shader_list);
+			es.shader_editor = vs_editor;
 		} else {
 			TextShaderEditor *text_shader = memnew(TextShaderEditor);
-			text_shader->get_code_editor()->set_toggle_list_control(left_panel);
+			text_shader->get_code_editor()->set_toggle_list_control(shader_list);
 			es.shader_editor = text_shader;
 		}
 		shader_tabs->add_child(es.shader_editor);
@@ -185,11 +189,18 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 			cte->set_zoom_factor(text_shader_zoom_factor);
 			cte->connect("zoomed", callable_mp(this, &ShaderEditorPlugin::_set_text_shader_zoom_factor));
 		}
+
+		if (text_shader_editor->get_top_bar()) {
+			text_shader_editor->get_top_bar()->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+			menu_hb->add_child(text_shader_editor->get_top_bar());
+			menu_hb->move_child(text_shader_editor->get_top_bar(), 1);
+		}
 	}
 
 	shader_tabs->set_current_tab(shader_tabs->get_tab_count() - 1);
 	edited_shaders.push_back(es);
 	_update_shader_list();
+	_switch_to_editor(es.shader_editor);
 }
 
 bool ShaderEditorPlugin::handles(Object *p_object) const {
@@ -250,7 +261,7 @@ void ShaderEditorPlugin::set_window_layout(Ref<ConfigFile> p_layout) {
 	}
 
 	if (p_layout->has_section_key("ShaderEditor", "split_offset")) {
-		main_split->set_split_offset(p_layout->get_value("ShaderEditor", "split_offset"));
+		files_split->set_split_offset(p_layout->get_value("ShaderEditor", "split_offset"));
 	}
 
 	_update_shader_list();
@@ -300,7 +311,7 @@ void ShaderEditorPlugin::get_window_layout(Ref<ConfigFile> p_layout) {
 		}
 	}
 	p_layout->set_value("ShaderEditor", "open_shaders", shaders);
-	p_layout->set_value("ShaderEditor", "split_offset", main_split->get_split_offset());
+	p_layout->set_value("ShaderEditor", "split_offset", files_split->get_split_offset());
 	p_layout->set_value("ShaderEditor", "selected_shader", selected_shader);
 	p_layout->set_value("ShaderEditor", "text_shader_zoom_factor", text_shader_zoom_factor);
 }
@@ -343,7 +354,7 @@ String ShaderEditorPlugin::get_unsaved_status(const String &p_for_scene) const {
 
 void ShaderEditorPlugin::save_external_data() {
 	for (EditedShader &edited_shader : edited_shaders) {
-		if (edited_shader.shader_editor) {
+		if (edited_shader.shader_editor && edited_shader.shader_editor->is_unsaved()) {
 			edited_shader.shader_editor->save_external_data();
 		}
 	}
@@ -364,6 +375,7 @@ void ShaderEditorPlugin::_shader_selected(int p_index) {
 	}
 
 	if (edited_shaders[p_index].shader_editor) {
+		_switch_to_editor(edited_shaders[p_index].shader_editor);
 		edited_shaders[p_index].shader_editor->validate_script();
 	}
 
@@ -400,6 +412,8 @@ void ShaderEditorPlugin::_setup_popup_menu(PopupMenuType p_type, PopupMenu *p_me
 		p_menu->add_item(TTR("Inspect Native Shader Code..."), FILE_INSPECT_NATIVE_SHADER_CODE);
 		p_menu->add_separator();
 		p_menu->add_shortcut(ED_SHORTCUT("shader_editor/close_file", TTRC("Close File"), KeyModifierMask::CMD_OR_CTRL | Key::W), FILE_CLOSE);
+		p_menu->add_separator();
+		p_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/toggle_files_panel"), TOGGLE_FILES_PANEL);
 	} else {
 		p_menu->add_shortcut(ED_SHORTCUT("shader_editor/close_file", TTRC("Close File"), KeyModifierMask::CMD_OR_CTRL | Key::W), FILE_CLOSE);
 		p_menu->add_item(TTR("Close All"), CLOSE_ALL);
@@ -428,21 +442,37 @@ void ShaderEditorPlugin::_make_script_list_context_menu() {
 	context_menu->set_item_disabled(context_menu->get_item_index(CLOSE_ALL), shader_tabs->get_tab_count() <= 0);
 	context_menu->set_item_disabled(context_menu->get_item_index(CLOSE_OTHER_TABS), shader_tabs->get_tab_count() <= 1);
 
-	context_menu->set_position(main_split->get_screen_position() + main_split->get_local_mouse_position());
+	context_menu->set_position(files_split->get_screen_position() + files_split->get_local_mouse_position());
 	context_menu->reset_size();
 	context_menu->popup();
 }
 
 void ShaderEditorPlugin::_close_shader(int p_index) {
 	ERR_FAIL_INDEX(p_index, shader_tabs->get_tab_count());
+
 	Control *c = shader_tabs->get_tab_control(p_index);
+	VisualShaderEditor *vs_editor = Object::cast_to<VisualShaderEditor>(c);
+	if (vs_editor) {
+		file_menu->get_parent()->remove_child(file_menu);
+		menu_hb->add_child(file_menu);
+		menu_hb->move_child(file_menu, 0);
+
+		make_floating->get_parent()->remove_child(make_floating);
+		menu_hb->add_child(make_floating);
+	} else {
+		memdelete(edited_shaders[p_index].shader_editor->get_top_bar());
+	}
+
 	memdelete(c);
 	edited_shaders.remove_at(p_index);
 	_update_shader_list();
 	EditorUndoRedoManager::get_singleton()->clear_history(); // To prevent undo on deleted graphs.
 
 	if (shader_tabs->get_tab_count() == 0) {
-		left_panel->show(); // Make sure the panel is visible, because it can't be toggled without open shaders.
+		shader_list->show(); // Make sure the panel is visible, because it can't be toggled without open shaders.
+		menu_spacer->show();
+	} else {
+		_switch_to_editor(edited_shaders[shader_tabs->get_current_tab()].shader_editor);
 	}
 }
 
@@ -590,6 +620,21 @@ void ShaderEditorPlugin::_menu_item_pressed(int p_index) {
 			Ref<Resource> shader = _get_current_shader();
 			DisplayServer::get_singleton()->clipboard_set(shader->get_path());
 		} break;
+		case TOGGLE_FILES_PANEL: {
+			shader_list->set_visible(!shader_list->is_visible());
+
+			int index = shader_tabs->get_current_tab();
+			ERR_FAIL_INDEX(index, shader_tabs->get_tab_count());
+			TextShaderEditor *editor = Object::cast_to<TextShaderEditor>(edited_shaders[index].shader_editor);
+			if (editor) {
+				editor->get_code_editor()->update_toggle_files_button();
+			} else {
+				VisualShaderEditor *vs_editor = Object::cast_to<VisualShaderEditor>(edited_shaders[index].shader_editor);
+				if (vs_editor) {
+					vs_editor->update_toggle_files_button();
+				}
+			}
+		} break;
 	}
 }
 
@@ -606,7 +651,14 @@ Variant ShaderEditorPlugin::get_drag_data_fw(const Point2 &p_point, Control *p_f
 		return Variant();
 	}
 
-	int idx = shader_list->get_item_at_position(p_point);
+	int idx = 0;
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		if (shader_list->is_anything_selected()) {
+			idx = shader_list->get_selected_items()[0];
+		}
+	} else {
+		idx = shader_list->get_item_at_position(p_point);
+	}
 	if (idx < 0) {
 		return Variant();
 	}
@@ -624,7 +676,7 @@ Variant ShaderEditorPlugin::get_drag_data_fw(const Point2 &p_point, Control *p_f
 	Label *label = memnew(Label(preview_name));
 	label->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED); // Don't translate script names.
 	drag_preview->add_child(label);
-	main_split->set_drag_preview(drag_preview);
+	files_split->set_drag_preview(drag_preview);
 
 	Dictionary drag_data;
 	drag_data["type"] = "shader_list_element";
@@ -646,7 +698,7 @@ bool ShaderEditorPlugin::can_drop_data_fw(const Point2 &p_point, const Variant &
 	if (String(d["type"]) == "files") {
 		Vector<String> files = d["files"];
 
-		if (files.size() == 0) {
+		if (files.is_empty()) {
 			return false;
 		}
 
@@ -683,7 +735,14 @@ void ShaderEditorPlugin::drop_data_fw(const Point2 &p_point, const Variant &p_da
 
 	if (String(d["type"]) == "shader_list_element") {
 		int idx = d["shader_list_element"];
-		int new_idx = shader_list->get_item_at_position(p_point);
+		int new_idx = 0;
+		if (p_point == Vector2(Math::INF, Math::INF)) {
+			if (shader_list->is_anything_selected()) {
+				new_idx = shader_list->get_selected_items()[0];
+			}
+		} else {
+			new_idx = shader_list->get_item_at_position(p_point);
+		}
 		_move_shader_tab(idx, new_idx);
 		return;
 	}
@@ -723,6 +782,45 @@ void ShaderEditorPlugin::_set_text_shader_zoom_factor(float p_zoom_factor) {
 	}
 }
 
+void ShaderEditorPlugin::_switch_to_editor(ShaderEditor *p_editor) {
+	Control *bar = p_editor->get_top_bar();
+
+	VisualShaderEditor *vs_editor = Object::cast_to<VisualShaderEditor>(p_editor);
+	if (vs_editor) {
+		file_menu->get_parent()->remove_child(file_menu);
+		bar->add_child(file_menu);
+		bar->move_child(file_menu, 2); // Toggle Files Panel button + separator.
+
+		make_floating->get_parent()->remove_child(make_floating);
+		bar->add_child(make_floating);
+	} else {
+		if (menu_spacer->is_visible()) {
+			menu_spacer->hide();
+		}
+
+		// Just swapped from a visual shader editor.
+		if (file_menu->get_parent() != menu_hb) {
+			file_menu->get_parent()->remove_child(file_menu);
+			menu_hb->add_child(file_menu);
+			menu_hb->move_child(file_menu, 0);
+
+			make_floating->get_parent()->remove_child(make_floating);
+			menu_hb->add_child(make_floating);
+		}
+	}
+
+	for (int i = 0; i < shader_tabs->get_tab_count(); i++) {
+		ShaderEditor *se = Object::cast_to<ShaderEditor>(shader_tabs->get_tab_control(i));
+		if (se && se->get_top_bar()) {
+			if (se == p_editor) {
+				se->get_top_bar()->show();
+			} else {
+				se->get_top_bar()->hide();
+			}
+		}
+	}
+}
+
 void ShaderEditorPlugin::_file_removed(const String &p_removed_file) {
 	for (uint32_t i = 0; i < edited_shaders.size(); i++) {
 		if (edited_shaders[i].path == p_removed_file) {
@@ -782,18 +880,19 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	window_wrapper->set_window_title(vformat(TTR("%s - Godot Engine"), TTR("Shader Editor")));
 	window_wrapper->set_margins_enabled(true);
 
-	main_split = memnew(HSplitContainer);
-	main_split->set_split_offset(200 * EDSCALE);
+	main_container = memnew(VBoxContainer);
 	Ref<Shortcut> make_floating_shortcut = ED_SHORTCUT_AND_COMMAND("shader_editor/make_floating", TTRC("Make Floating"));
-	window_wrapper->set_wrapped_control(main_split, make_floating_shortcut);
+	window_wrapper->set_wrapped_control(main_container, make_floating_shortcut);
 
-	left_panel = memnew(VBoxContainer);
+	files_split = memnew(HSplitContainer);
+	files_split->set_split_offset(200 * EDSCALE);
+	files_split->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 
-	HBoxContainer *menu_hb = memnew(HBoxContainer);
-	left_panel->add_child(menu_hb);
+	menu_hb = memnew(HBoxContainer);
+	main_container->add_child(menu_hb);
 	file_menu = memnew(MenuButton);
 	file_menu->set_text(TTR("File"));
-	file_menu->set_shortcut_context(main_split);
+	file_menu->set_shortcut_context(files_split);
 	_setup_popup_menu(FILE, file_menu->get_popup());
 	file_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &ShaderEditorPlugin::_menu_item_pressed));
 	menu_hb->add_child(file_menu);
@@ -804,16 +903,14 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	add_child(context_menu);
 	context_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ShaderEditorPlugin::_menu_item_pressed));
 
-	Control *padding = memnew(Control);
-	padding->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	menu_hb->add_child(padding);
+	menu_spacer = menu_hb->add_spacer();
 
 	make_floating = memnew(ScreenSelect);
 	make_floating->set_flat(true);
 	make_floating->connect("request_open_in_screen", callable_mp(window_wrapper, &WindowWrapper::enable_window_on_screen).bind(true));
 	if (!make_floating->is_disabled()) {
 		// Override default ScreenSelect tooltip if multi-window support is available.
-		make_floating->set_tooltip_text(TTR("Make the shader editor floating.\nRight-click to open the screen selector."));
+		make_floating->set_tooltip_text(TTR("Make the shader editor floating.") + "\n" + TTR("Right-click to open the screen selector."));
 	}
 
 	menu_hb->add_child(make_floating);
@@ -823,20 +920,20 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	shader_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	shader_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	shader_list->set_theme_type_variation("ItemListSecondary");
-	left_panel->add_child(shader_list);
+	files_split->add_child(shader_list);
 	shader_list->connect(SceneStringName(item_selected), callable_mp(this, &ShaderEditorPlugin::_shader_selected));
 	shader_list->connect("item_clicked", callable_mp(this, &ShaderEditorPlugin::_shader_list_clicked));
 	shader_list->set_allow_rmb_select(true);
 	SET_DRAG_FORWARDING_GCD(shader_list, ShaderEditorPlugin);
 
-	main_split->add_child(left_panel);
-	left_panel->set_custom_minimum_size(Size2(100, 300) * EDSCALE);
+	main_container->add_child(files_split);
+	main_container->set_custom_minimum_size(Size2(100, 300) * EDSCALE);
 
 	shader_tabs = memnew(TabContainer);
 	shader_tabs->set_custom_minimum_size(Size2(460, 300) * EDSCALE);
 	shader_tabs->set_tabs_visible(false);
 	shader_tabs->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	main_split->add_child(shader_tabs);
+	files_split->add_child(shader_tabs);
 	Ref<StyleBoxEmpty> empty;
 	empty.instantiate();
 	shader_tabs->add_theme_style_override(SceneStringName(panel), empty);
@@ -844,10 +941,7 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	button = EditorNode::get_bottom_panel()->add_item(TTR("Shader Editor"), window_wrapper, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_shader_editor_bottom_panel", TTRC("Toggle Shader Editor Bottom Panel"), KeyModifierMask::ALT | Key::S));
 
 	shader_create_dialog = memnew(ShaderCreateDialog);
-	main_split->add_child(shader_create_dialog);
+	files_split->add_child(shader_create_dialog);
 	shader_create_dialog->connect("shader_created", callable_mp(this, &ShaderEditorPlugin::_shader_created));
 	shader_create_dialog->connect("shader_include_created", callable_mp(this, &ShaderEditorPlugin::_shader_include_created));
 }
-
-ShaderEditorPlugin::~ShaderEditorPlugin() {
-}
diff --git a/engine/editor/plugins/shader_editor_plugin.h b/engine/editor/plugins/shader_editor_plugin.h
index 02dc2416..999e178e 100644
--- a/engine/editor/plugins/shader_editor_plugin.h
+++ b/engine/editor/plugins/shader_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_EDITOR_PLUGIN_H
-#define SHADER_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -41,6 +40,7 @@ class ShaderEditor;
 class TabContainer;
 class TextShaderEditor;
 class VBoxContainer;
+class HBoxContainer;
 class VisualShaderEditor;
 class WindowWrapper;
 
@@ -75,6 +75,7 @@ class ShaderEditorPlugin : public EditorPlugin {
 		CLOSE_OTHER_TABS,
 		SHOW_IN_FILE_SYSTEM,
 		COPY_PATH,
+		TOGGLE_FILES_PANEL,
 	};
 
 	enum PopupMenuType {
@@ -83,8 +84,11 @@ class ShaderEditorPlugin : public EditorPlugin {
 		CONTEXT_VALID_ITEM,
 	};
 
-	HSplitContainer *main_split = nullptr;
-	VBoxContainer *left_panel = nullptr;
+	VBoxContainer *main_container = nullptr;
+	HSplitContainer *files_split = nullptr;
+	HBoxContainer *menu_hb = nullptr;
+	Control *menu_spacer = nullptr;
+
 	ItemList *shader_list = nullptr;
 	TabContainer *shader_tabs = nullptr;
 
@@ -125,6 +129,7 @@ class ShaderEditorPlugin : public EditorPlugin {
 	void _window_changed(bool p_visible);
 
 	void _set_text_shader_zoom_factor(float p_zoom_factor);
+	void _switch_to_editor(ShaderEditor *p_editor);
 
 protected:
 	void _notification(int p_what);
@@ -146,7 +151,4 @@ public:
 	virtual void apply_changes() override;
 
 	ShaderEditorPlugin();
-	~ShaderEditorPlugin();
 };
-
-#endif // SHADER_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/shader_file_editor_plugin.cpp b/engine/editor/plugins/shader_file_editor_plugin.cpp
index d955f84b..41ad9b55 100644
--- a/engine/editor/plugins/shader_file_editor_plugin.cpp
+++ b/engine/editor/plugins/shader_file_editor_plugin.cpp
@@ -166,7 +166,7 @@ void ShaderFileEditor::_update_options() {
 		}
 	}
 
-	if (version_list.size() == 0) {
+	if (version_list.is_empty()) {
 		for (int i = 0; i < RD::SHADER_STAGE_MAX; i++) {
 			stages[i]->set_disabled(true);
 		}
@@ -319,6 +319,3 @@ ShaderFileEditorPlugin::ShaderFileEditorPlugin() {
 	button = EditorNode::get_bottom_panel()->add_item(TTR("ShaderFile"), shader_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_shader_file_bottom_panel", TTRC("Toggle ShaderFile Bottom Panel")));
 	button->hide();
 }
-
-ShaderFileEditorPlugin::~ShaderFileEditorPlugin() {
-}
diff --git a/engine/editor/plugins/shader_file_editor_plugin.h b/engine/editor/plugins/shader_file_editor_plugin.h
index 426cdfaf..06e31016 100644
--- a/engine/editor/plugins/shader_file_editor_plugin.h
+++ b/engine/editor/plugins/shader_file_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_FILE_EDITOR_PLUGIN_H
-#define SHADER_FILE_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/box_container.h"
@@ -82,7 +81,4 @@ public:
 	ShaderFileEditor *get_shader_editor() const { return shader_editor; }
 
 	ShaderFileEditorPlugin();
-	~ShaderFileEditorPlugin();
 };
-
-#endif // SHADER_FILE_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/skeleton_2d_editor_plugin.cpp b/engine/editor/plugins/skeleton_2d_editor_plugin.cpp
index 6cc098e5..a0426e8f 100644
--- a/engine/editor/plugins/skeleton_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/skeleton_2d_editor_plugin.cpp
@@ -96,6 +96,8 @@ Skeleton2DEditor::Skeleton2DEditor() {
 
 	options->set_text(TTR("Skeleton2D"));
 	options->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Skeleton2D"), EditorStringName(EditorIcons)));
+	options->set_flat(false);
+	options->set_theme_type_variation("FlatMenuButton");
 
 	options->get_popup()->add_item(TTR("Reset to Rest Pose"), MENU_OPTION_SET_REST);
 	options->get_popup()->add_separator();
@@ -133,6 +135,3 @@ Skeleton2DEditorPlugin::Skeleton2DEditorPlugin() {
 
 	//sprite_editor->options->hide();
 }
-
-Skeleton2DEditorPlugin::~Skeleton2DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/skeleton_2d_editor_plugin.h b/engine/editor/plugins/skeleton_2d_editor_plugin.h
index 3d9c82b9..07376b8b 100644
--- a/engine/editor/plugins/skeleton_2d_editor_plugin.h
+++ b/engine/editor/plugins/skeleton_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_2D_EDITOR_PLUGIN_H
-#define SKELETON_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/2d/skeleton_2d.h"
@@ -76,7 +75,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	Skeleton2DEditorPlugin();
-	~Skeleton2DEditorPlugin();
 };
-
-#endif // SKELETON_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/skeleton_3d_editor_plugin.cpp b/engine/editor/plugins/skeleton_3d_editor_plugin.cpp
index 5b07b9dd..17672cdd 100644
--- a/engine/editor/plugins/skeleton_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/skeleton_3d_editor_plugin.cpp
@@ -41,9 +41,9 @@
 #include "editor/plugins/node_3d_editor_plugin.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/physical_bone_simulator_3d.h"
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/3d/physics/physical_bone_3d.h"
+#include "scene/3d/physics/physical_bone_simulator_3d.h"
 #include "scene/gui/separator.h"
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
@@ -701,7 +701,7 @@ Variant Skeleton3DEditor::get_drag_data_fw(const Point2 &p_point, Control *p_fro
 }
 
 bool Skeleton3DEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
-	TreeItem *target = joint_tree->get_item_at_position(p_point);
+	TreeItem *target = (p_point == Vector2(Math::INF, Math::INF)) ? joint_tree->get_selected() : joint_tree->get_item_at_position(p_point);
 	if (!target) {
 		return false;
 	}
@@ -729,7 +729,7 @@ void Skeleton3DEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data
 		return;
 	}
 
-	TreeItem *target = joint_tree->get_item_at_position(p_point);
+	TreeItem *target = (p_point == Vector2(Math::INF, Math::INF)) ? joint_tree->get_selected() : joint_tree->get_item_at_position(p_point);
 	TreeItem *selected = Object::cast_to<TreeItem>(Dictionary(p_data)["node"]);
 
 	const BoneId target_boneidx = String(target->get_metadata(0)).get_slicec('/', 1).to_int();
@@ -1026,6 +1026,7 @@ void Skeleton3DEditor::create_editors() {
 	edit_mode_button->set_toggle_mode(true);
 	edit_mode_button->set_focus_mode(FOCUS_NONE);
 	edit_mode_button->set_tooltip_text(TTR("Edit Mode\nShow buttons on joints."));
+	edit_mode_button->set_accessibility_name(TTRC("Edit Mode"));
 	edit_mode_button->connect(SceneStringName(toggled), callable_mp(this, &Skeleton3DEditor::edit_mode_toggled));
 
 	edit_mode = false;
@@ -1047,6 +1048,7 @@ void Skeleton3DEditor::create_editors() {
 	key_loc_button->set_pressed(false);
 	key_loc_button->set_focus_mode(FOCUS_NONE);
 	key_loc_button->set_tooltip_text(TTR("Translation mask for inserting keys."));
+	key_loc_button->set_accessibility_name(TTRC("Translation Mask"));
 	animation_hb->add_child(key_loc_button);
 
 	key_rot_button = memnew(Button);
@@ -1055,6 +1057,7 @@ void Skeleton3DEditor::create_editors() {
 	key_rot_button->set_pressed(true);
 	key_rot_button->set_focus_mode(FOCUS_NONE);
 	key_rot_button->set_tooltip_text(TTR("Rotation mask for inserting keys."));
+	key_rot_button->set_accessibility_name(TTRC("Rotation Mask"));
 	animation_hb->add_child(key_rot_button);
 
 	key_scale_button = memnew(Button);
@@ -1063,6 +1066,7 @@ void Skeleton3DEditor::create_editors() {
 	key_scale_button->set_pressed(false);
 	key_scale_button->set_focus_mode(FOCUS_NONE);
 	key_scale_button->set_tooltip_text(TTR("Scale mask for inserting keys."));
+	key_scale_button->set_accessibility_name(TTRC("Scale Mask"));
 	animation_hb->add_child(key_scale_button);
 
 	key_insert_button = memnew(Button);
@@ -1071,6 +1075,7 @@ void Skeleton3DEditor::create_editors() {
 	key_insert_button->connect(SceneStringName(pressed), callable_mp(this, &Skeleton3DEditor::insert_keys).bind(false));
 	key_insert_button->set_tooltip_text(TTRC("Insert key (based on mask) for bones with an existing track."));
 	key_insert_button->set_shortcut(ED_SHORTCUT("skeleton_3d_editor/insert_key_to_existing_tracks", TTRC("Insert Key (Existing Tracks)"), Key::INSERT));
+	key_insert_button->set_accessibility_name(TTRC("Insert Key"));
 	animation_hb->add_child(key_insert_button);
 
 	key_insert_all_button = memnew(Button);
@@ -1078,6 +1083,7 @@ void Skeleton3DEditor::create_editors() {
 	key_insert_all_button->set_focus_mode(FOCUS_NONE);
 	key_insert_all_button->connect(SceneStringName(pressed), callable_mp(this, &Skeleton3DEditor::insert_keys).bind(true));
 	key_insert_all_button->set_tooltip_text(TTRC("Insert key (based on mask) for all bones."));
+	key_insert_all_button->set_accessibility_name(TTRC("Insert Key for All Bones"));
 	key_insert_all_button->set_shortcut(ED_SHORTCUT("skeleton_3d_editor/insert_key_of_all_bones", TTRC("Insert Key (All Bones)"), KeyModifierMask::CMD_OR_CTRL + Key::INSERT));
 	animation_hb->add_child(key_insert_all_button);
 
@@ -1121,12 +1127,11 @@ void Skeleton3DEditor::_notification(int p_what) {
 			joint_tree->connect(SceneStringName(item_selected), callable_mp(this, &Skeleton3DEditor::_joint_tree_selection_changed));
 			joint_tree->connect("item_mouse_selected", callable_mp(this, &Skeleton3DEditor::_joint_tree_rmb_select));
 			joint_tree->connect("button_clicked", callable_mp(this, &Skeleton3DEditor::_joint_tree_button_clicked));
-#ifdef TOOLS_ENABLED
+
 			skeleton->connect(SceneStringName(pose_updated), callable_mp(this, &Skeleton3DEditor::_draw_gizmo));
 			skeleton->connect(SceneStringName(pose_updated), callable_mp(this, &Skeleton3DEditor::_update_properties));
 			skeleton->connect(SceneStringName(bone_enabled_changed), callable_mp(this, &Skeleton3DEditor::_bone_enabled_changed));
 			skeleton->connect(SceneStringName(show_rest_only_changed), callable_mp(this, &Skeleton3DEditor::_update_gizmo_visible));
-#endif
 
 			get_tree()->connect("node_removed", callable_mp(this, &Skeleton3DEditor::_node_removed), Object::CONNECT_ONE_SHOT);
 		} break;
@@ -1149,13 +1154,12 @@ void Skeleton3DEditor::_notification(int p_what) {
 		case NOTIFICATION_PREDELETE: {
 			if (skeleton) {
 				select_bone(-1); // Requires that the joint_tree has not been deleted.
-#ifdef TOOLS_ENABLED
 				skeleton->disconnect(SceneStringName(show_rest_only_changed), callable_mp(this, &Skeleton3DEditor::_update_gizmo_visible));
 				skeleton->disconnect(SceneStringName(bone_enabled_changed), callable_mp(this, &Skeleton3DEditor::_bone_enabled_changed));
 				skeleton->disconnect(SceneStringName(pose_updated), callable_mp(this, &Skeleton3DEditor::_draw_gizmo));
 				skeleton->disconnect(SceneStringName(pose_updated), callable_mp(this, &Skeleton3DEditor::_update_properties));
 				skeleton->set_transform_gizmo_visible(true);
-#endif
+
 				if (handles_mesh_instance->get_parent()) {
 					handles_mesh_instance->get_parent()->remove_child(handles_mesh_instance);
 				}
@@ -1437,22 +1441,16 @@ void Skeleton3DEditor::_update_gizmo_visible() {
 	_subgizmo_selection_change();
 	if (edit_mode) {
 		if (selected_bone == -1) {
-#ifdef TOOLS_ENABLED
 			skeleton->set_transform_gizmo_visible(false);
-#endif
 		} else {
-#ifdef TOOLS_ENABLED
 			if (skeleton->is_bone_enabled(selected_bone) && !skeleton->is_show_rest_only()) {
 				skeleton->set_transform_gizmo_visible(true);
 			} else {
 				skeleton->set_transform_gizmo_visible(false);
 			}
-#endif
 		}
 	} else {
-#ifdef TOOLS_ENABLED
 		skeleton->set_transform_gizmo_visible(true);
-#endif
 	}
 	_draw_gizmo();
 }
diff --git a/engine/editor/plugins/skeleton_3d_editor_plugin.h b/engine/editor/plugins/skeleton_3d_editor_plugin.h
index a909a8fa..1779b4be 100644
--- a/engine/editor/plugins/skeleton_3d_editor_plugin.h
+++ b/engine/editor/plugins/skeleton_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_3D_EDITOR_PLUGIN_H
-#define SKELETON_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/add_metadata_dialog.h"
 #include "editor/editor_properties.h"
@@ -295,5 +294,3 @@ public:
 	Skeleton3DGizmoPlugin();
 	~Skeleton3DGizmoPlugin();
 };
-
-#endif // SKELETON_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/skeleton_ik_3d_editor_plugin.cpp b/engine/editor/plugins/skeleton_ik_3d_editor_plugin.cpp
index d0c8744d..f09ab022 100644
--- a/engine/editor/plugins/skeleton_ik_3d_editor_plugin.cpp
+++ b/engine/editor/plugins/skeleton_ik_3d_editor_plugin.cpp
@@ -83,5 +83,3 @@ SkeletonIK3DEditorPlugin::SkeletonIK3DEditorPlugin() {
 	add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, play_btn);
 	skeleton_ik = nullptr;
 }
-
-SkeletonIK3DEditorPlugin::~SkeletonIK3DEditorPlugin() {}
diff --git a/engine/editor/plugins/skeleton_ik_3d_editor_plugin.h b/engine/editor/plugins/skeleton_ik_3d_editor_plugin.h
index c7c7867e..75a278a0 100644
--- a/engine/editor/plugins/skeleton_ik_3d_editor_plugin.h
+++ b/engine/editor/plugins/skeleton_ik_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_IK_3D_EDITOR_PLUGIN_H
-#define SKELETON_IK_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -53,7 +52,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	SkeletonIK3DEditorPlugin();
-	~SkeletonIK3DEditorPlugin();
 };
-
-#endif // SKELETON_IK_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/sprite_2d_editor_plugin.cpp b/engine/editor/plugins/sprite_2d_editor_plugin.cpp
index 4c9ace75..0bd666db 100644
--- a/engine/editor/plugins/sprite_2d_editor_plugin.cpp
+++ b/engine/editor/plugins/sprite_2d_editor_plugin.cpp
@@ -586,6 +586,8 @@ Sprite2DEditor::Sprite2DEditor() {
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->set_text(TTR("Sprite2D"));
+	options->set_flat(false);
+	options->set_theme_type_variation("FlatMenuButton");
 
 	options->get_popup()->add_item(TTR("Convert to MeshInstance2D"), MENU_OPTION_CONVERT_TO_MESH_2D);
 	options->get_popup()->add_item(TTR("Convert to Polygon2D"), MENU_OPTION_CONVERT_TO_POLYGON_2D);
@@ -633,6 +635,7 @@ Sprite2DEditor::Sprite2DEditor() {
 	simplification->set_max(10.00);
 	simplification->set_step(0.01);
 	simplification->set_value(2);
+	simplification->set_accessibility_name(TTRC("Simplification"));
 	hb->add_child(simplification);
 	hb->add_spacer();
 	hb->add_child(memnew(Label(TTR("Shrink (Pixels):"))));
@@ -641,6 +644,7 @@ Sprite2DEditor::Sprite2DEditor() {
 	shrink_pixels->set_max(10);
 	shrink_pixels->set_step(1);
 	shrink_pixels->set_value(0);
+	shrink_pixels->set_accessibility_name(TTRC("Shrink"));
 	hb->add_child(shrink_pixels);
 	hb->add_spacer();
 	hb->add_child(memnew(Label(TTR("Grow (Pixels):"))));
@@ -649,6 +653,7 @@ Sprite2DEditor::Sprite2DEditor() {
 	grow_pixels->set_max(10);
 	grow_pixels->set_step(1);
 	grow_pixels->set_value(2);
+	grow_pixels->set_accessibility_name(TTRC("Grow"));
 	hb->add_child(grow_pixels);
 	hb->add_spacer();
 	update_preview = memnew(Button);
@@ -684,6 +689,3 @@ Sprite2DEditorPlugin::Sprite2DEditorPlugin() {
 
 	//sprite_editor->options->hide();
 }
-
-Sprite2DEditorPlugin::~Sprite2DEditorPlugin() {
-}
diff --git a/engine/editor/plugins/sprite_2d_editor_plugin.h b/engine/editor/plugins/sprite_2d_editor_plugin.h
index 2b86b20a..609b5d9b 100644
--- a/engine/editor/plugins/sprite_2d_editor_plugin.h
+++ b/engine/editor/plugins/sprite_2d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRITE_2D_EDITOR_PLUGIN_H
-#define SPRITE_2D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/2d/sprite_2d.h"
@@ -128,7 +127,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	Sprite2DEditorPlugin();
-	~Sprite2DEditorPlugin();
 };
-
-#endif // SPRITE_2D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/sprite_frames_editor_plugin.cpp b/engine/editor/plugins/sprite_frames_editor_plugin.cpp
index b0b9727c..f03c55a9 100644
--- a/engine/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/engine/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -131,7 +131,7 @@ void SpriteFramesEditor::_sheet_preview_draw() {
 	}
 	_draw_shadowed_line(split_sheet_preview, draw_offset + Vector2(0, draw_size.y), Vector2(draw_size.x, 0), Vector2(0, 1), line_color, shadow_color);
 
-	if (frames_selected.size() == 0) {
+	if (frames_selected.is_empty()) {
 		split_sheet_dialog->get_ok_button()->set_disabled(true);
 		split_sheet_dialog->set_ok_button_text(TTR("No Frames Selected"));
 		return;
@@ -183,7 +183,7 @@ void SpriteFramesEditor::_sheet_preview_input(const Ref<InputEvent> &p_event) {
 				const int from = last_frame_selected;
 				const int to = idx;
 
-				const int diff = ABS(to - from);
+				const int diff = Math::abs(to - from);
 				const int dir = SIGN(to - from);
 
 				for (int i = 0; i <= diff; i++) {
@@ -672,6 +672,11 @@ void SpriteFramesEditor::_notification(int p_what) {
 			_update_show_settings();
 		} break;
 
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			_update_show_settings();
+		} break;
+
 		case NOTIFICATION_READY: {
 			add_theme_constant_override("autohide", 1); // Fixes the dragger always showing up.
 		} break;
@@ -1099,7 +1104,7 @@ void SpriteFramesEditor::_animation_name_edited() {
 		new_name = "new_animation";
 	}
 
-	new_name = new_name.replace("/", "_").replace(",", " ");
+	new_name = new_name.replace_char('/', '_').replace_char(',', ' ');
 
 	String name = new_name;
 	int counter = 0;
@@ -1289,6 +1294,10 @@ void SpriteFramesEditor::_animation_speed_resized() {
 }
 
 void SpriteFramesEditor::_animation_speed_changed(double p_value) {
+	if (frames.is_null()) {
+		return;
+	}
+
 	if (updating) {
 		return;
 	}
@@ -1326,7 +1335,7 @@ void SpriteFramesEditor::_frame_list_gui_input(const Ref<InputEvent> &p_event) {
 					menu = memnew(PopupMenu);
 					add_child(menu);
 					menu->connect(SceneStringName(id_pressed), callable_mp(this, &SpriteFramesEditor::_menu_selected));
-					menu->add_icon_item(get_editor_theme_icon(SNAME("ShowInFileSystem")), TTRC("Show in FileSystem"));
+					menu->add_icon_item(get_editor_theme_icon(SNAME("ShowInFileSystem")), TTRC("Show in FileSystem"), MENU_SHOW_IN_FILESYSTEM);
 				}
 
 				menu->set_position(get_screen_position() + get_local_mouse_position());
@@ -1336,12 +1345,14 @@ void SpriteFramesEditor::_frame_list_gui_input(const Ref<InputEvent> &p_event) {
 	}
 }
 
-void SpriteFramesEditor::_menu_selected(int p_index) {
-	switch (p_index) {
+void SpriteFramesEditor::_menu_selected(int p_id) {
+	switch (p_id) {
 		case MENU_SHOW_IN_FILESYSTEM: {
-			String path = frames->get_frame_texture(edited_anim, right_clicked_frame)->get_path();
+			Ref<Texture2D> frame_texture = frames->get_frame_texture(edited_anim, right_clicked_frame);
+			ERR_FAIL_COND(frame_texture.is_null());
+			String path = frame_texture->get_path();
 			// Check if the file is an atlas resource, if it is find the source texture.
-			Ref<AtlasTexture> at = frames->get_frame_texture(edited_anim, right_clicked_frame);
+			Ref<AtlasTexture> at = frame_texture;
 			while (at.is_valid() && at->get_atlas().is_valid()) {
 				path = at->get_atlas()->get_path();
 				at = at->get_atlas();
@@ -1367,6 +1378,10 @@ void SpriteFramesEditor::_frame_list_item_selected(int p_index, bool p_selected)
 }
 
 void SpriteFramesEditor::_frame_duration_changed(double p_value) {
+	if (frames.is_null()) {
+		return;
+	}
+
 	if (updating) {
 		return;
 	}
@@ -1646,7 +1661,14 @@ Variant SpriteFramesEditor::get_drag_data_fw(const Point2 &p_point, Control *p_f
 		return false;
 	}
 
-	int idx = frame_list->get_item_at_position(p_point, true);
+	int idx = -1;
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		if (frame_list->is_anything_selected()) {
+			idx = frame_list->get_selected_items()[0];
+		}
+	} else {
+		idx = frame_list->get_item_at_position(p_point, true);
+	}
 
 	if (idx < 0 || idx >= frames->get_frame_count(edited_anim)) {
 		return Variant();
@@ -1692,7 +1714,7 @@ bool SpriteFramesEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
 	if (String(d["type"]) == "files") {
 		Vector<String> files = d["files"];
 
-		if (files.size() == 0) {
+		if (files.is_empty()) {
 			return false;
 		}
 
@@ -1721,7 +1743,14 @@ void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
 		return;
 	}
 
-	int at_pos = frame_list->get_item_at_position(p_point, true);
+	int at_pos = -1;
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		if (frame_list->is_anything_selected()) {
+			at_pos = frame_list->get_selected_items()[0];
+		}
+	} else {
+		at_pos = frame_list->get_item_at_position(p_point, true);
+	}
 
 	if (String(d["type"]) == "resource" && d.has("resource")) {
 		Ref<Resource> r = d["resource"];
@@ -1804,8 +1833,9 @@ void SpriteFramesEditor::_remove_sprite_node() {
 void SpriteFramesEditor::_fetch_sprite_node() {
 	Node *selected = nullptr;
 	EditorSelection *editor_selection = EditorNode::get_singleton()->get_editor_selection();
-	if (editor_selection->get_selected_node_list().size() == 1) {
-		selected = editor_selection->get_selected_node_list().front()->get();
+	const List<Node *> &top_node_list = editor_selection->get_top_selected_node_list();
+	if (top_node_list.size() == 1) {
+		selected = top_node_list.front()->get();
 	}
 
 	bool show_node_edit = false;
@@ -1938,16 +1968,19 @@ SpriteFramesEditor::SpriteFramesEditor() {
 
 	add_anim = memnew(Button);
 	add_anim->set_theme_type_variation(SceneStringName(FlatButton));
+	add_anim->set_accessibility_name(TTRC("Add Animation"));
 	hbc_animlist->add_child(add_anim);
 	add_anim->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_animation_add));
 
 	duplicate_anim = memnew(Button);
 	duplicate_anim->set_theme_type_variation(SceneStringName(FlatButton));
+	duplicate_anim->set_accessibility_name(TTRC("Duplicate Animation"));
 	hbc_animlist->add_child(duplicate_anim);
 	duplicate_anim->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_animation_duplicate));
 
 	delete_anim = memnew(Button);
 	delete_anim->set_theme_type_variation(SceneStringName(FlatButton));
+	delete_anim->set_accessibility_name(TTRC("Delete Animation"));
 	hbc_animlist->add_child(delete_anim);
 	delete_anim->set_disabled(true);
 	delete_anim->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_animation_remove));
@@ -1959,6 +1992,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 
 	autoplay = memnew(Button);
 	autoplay->set_theme_type_variation(SceneStringName(FlatButton));
+	autoplay->set_accessibility_name(TTRC("Autoplay on Load"));
 	autoplay->set_tooltip_text(TTR("Autoplay on Load"));
 	autoplay_container->add_child(autoplay);
 
@@ -1967,6 +2001,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	anim_loop = memnew(Button);
 	anim_loop->set_toggle_mode(true);
 	anim_loop->set_theme_type_variation(SceneStringName(FlatButton));
+	anim_loop->set_accessibility_name(TTRC("Animation Looping"));
 	anim_loop->set_tooltip_text(TTR("Animation Looping"));
 	anim_loop->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_animation_loop_changed));
 	hbc_animlist->add_child(anim_loop);
@@ -1978,6 +2013,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	anim_speed->set_step(0.01);
 	anim_speed->set_custom_arrow_step(1);
 	anim_speed->set_tooltip_text(TTR("Animation Speed"));
+	anim_speed->set_accessibility_name(TTRC("Animation Speed"));
 	anim_speed->get_line_edit()->set_expand_to_text_length_enabled(true);
 	anim_speed->get_line_edit()->connect(SceneStringName(resized), callable_mp(this, &SpriteFramesEditor::_animation_speed_resized));
 	anim_speed->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_animation_speed_changed));
@@ -1987,6 +2023,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	sub_vb->add_child(anim_search_box);
 	anim_search_box->set_h_size_flags(SIZE_EXPAND_FILL);
 	anim_search_box->set_placeholder(TTR("Filter Animations"));
+	anim_search_box->set_accessibility_name(TTRC("Filter Animations"));
 	anim_search_box->set_clear_button_enabled(true);
 	anim_search_box->connect(SceneStringName(text_changed), callable_mp(this, &SpriteFramesEditor::_animation_search_text_changed));
 
@@ -2034,26 +2071,31 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	play_bw_from = memnew(Button);
 	play_bw_from->set_theme_type_variation(SceneStringName(FlatButton));
 	play_bw_from->set_tooltip_text(TTR("Play selected animation backwards from current pos. (A)"));
+	play_bw_from->set_accessibility_name(TTRC("Play Backwards"));
 	playback_container->add_child(play_bw_from);
 
 	play_bw = memnew(Button);
 	play_bw->set_theme_type_variation(SceneStringName(FlatButton));
 	play_bw->set_tooltip_text(TTR("Play selected animation backwards from end. (Shift+A)"));
+	play_bw->set_accessibility_name(TTRC("Play Backwards from End"));
 	playback_container->add_child(play_bw);
 
 	stop = memnew(Button);
 	stop->set_theme_type_variation(SceneStringName(FlatButton));
 	stop->set_tooltip_text(TTR("Pause/stop animation playback. (S)"));
+	stop->set_accessibility_name(TTRC("Pause/Stop"));
 	playback_container->add_child(stop);
 
 	play = memnew(Button);
 	play->set_theme_type_variation(SceneStringName(FlatButton));
 	play->set_tooltip_text(TTR("Play selected animation from start. (Shift+D)"));
+	play->set_accessibility_name(TTRC("Play from Start"));
 	playback_container->add_child(play);
 
 	play_from = memnew(Button);
 	play_from->set_theme_type_variation(SceneStringName(FlatButton));
 	play_from->set_tooltip_text(TTR("Play selected animation from current pos. (D)"));
+	play_from->set_accessibility_name(TTRC("Play"));
 	playback_container->add_child(play_from);
 
 	hfc->add_child(memnew(VSeparator));
@@ -2070,44 +2112,53 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	hfc->add_child(hbc_actions);
 
 	load = memnew(Button);
+	load->set_accessibility_name(TTRC("Load"));
 	load->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(load);
 
 	load_sheet = memnew(Button);
+	load_sheet->set_accessibility_name(TTRC("Load Sheet"));
 	load_sheet->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(load_sheet);
 
 	hbc_actions->add_child(memnew(VSeparator));
 
 	copy = memnew(Button);
+	copy->set_accessibility_name(TTRC("Copy"));
 	copy->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(copy);
 
 	paste = memnew(Button);
+	paste->set_accessibility_name(TTRC("Paste"));
 	paste->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(paste);
 
 	hbc_actions->add_child(memnew(VSeparator));
 
 	empty_before = memnew(Button);
+	empty_before->set_accessibility_name(TTRC("Empty Before"));
 	empty_before->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(empty_before);
 
 	empty_after = memnew(Button);
+	empty_after->set_accessibility_name(TTRC("Empty After"));
 	empty_after->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(empty_after);
 
 	hbc_actions->add_child(memnew(VSeparator));
 
 	move_up = memnew(Button);
+	move_up->set_accessibility_name(TTRC("Move Up"));
 	move_up->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(move_up);
 
 	move_down = memnew(Button);
+	move_down->set_accessibility_name(TTRC("Move Down"));
 	move_down->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(move_down);
 
 	delete_frame = memnew(Button);
+	delete_frame->set_accessibility_name(TTRC("Delete Frame"));
 	delete_frame->set_theme_type_variation(SceneStringName(FlatButton));
 	hbc_actions->add_child(delete_frame);
 
@@ -2129,6 +2180,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	frame_duration->set_allow_lesser(false);
 	frame_duration->set_allow_greater(true);
 	frame_duration->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_frame_duration_changed));
+	frame_duration->set_accessibility_name(TTRC("Frame Duration"));
 	hbc_frame_duration->add_child(frame_duration);
 
 	// Wide empty separation control. (like BoxContainer::add_spacer())
@@ -2144,18 +2196,21 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	zoom_out->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_zoom_out));
 	zoom_out->set_flat(true);
 	zoom_out->set_tooltip_text(TTRC("Zoom Out"));
+	zoom_out->set_accessibility_name(TTRC("Zoom Out"));
 	hbc_zoom->add_child(zoom_out);
 
 	zoom_reset = memnew(Button);
 	zoom_reset->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_zoom_reset));
 	zoom_reset->set_flat(true);
 	zoom_reset->set_tooltip_text(TTRC("Zoom Reset"));
+	zoom_reset->set_accessibility_name(TTRC("Reset Zoom"));
 	hbc_zoom->add_child(zoom_reset);
 
 	zoom_in = memnew(Button);
 	zoom_in->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_zoom_in));
 	zoom_in->set_flat(true);
 	zoom_in->set_tooltip_text(TTRC("Zoom In"));
+	zoom_in->set_accessibility_name(TTRC("Zoom In"));
 	hbc_zoom->add_child(zoom_in);
 
 	file = memnew(EditorFileDialog);
@@ -2278,6 +2333,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	toggle_settings_button->set_theme_type_variation(SceneStringName(FlatButton));
 	toggle_settings_button->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_toggle_show_settings));
 	toggle_settings_button->set_tooltip_text(TTR("Toggle Settings Panel"));
+	toggle_settings_button->set_accessibility_name(TTRC("Settings Panel"));
 	split_sheet_menu_hb->add_child(toggle_settings_button);
 
 	split_sheet_vb->add_child(split_sheet_menu_hb);
@@ -2316,6 +2372,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_zoom_out->set_theme_type_variation(SceneStringName(FlatButton));
 	split_sheet_zoom_out->set_focus_mode(FOCUS_NONE);
 	split_sheet_zoom_out->set_tooltip_text(TTR("Zoom Out"));
+	split_sheet_zoom_out->set_accessibility_name(TTRC("Zoom Out"));
 	split_sheet_zoom_out->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_sheet_zoom_out));
 	split_sheet_zoom_hb->add_child(split_sheet_zoom_out);
 
@@ -2323,6 +2380,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_zoom_reset->set_theme_type_variation(SceneStringName(FlatButton));
 	split_sheet_zoom_reset->set_focus_mode(FOCUS_NONE);
 	split_sheet_zoom_reset->set_tooltip_text(TTR("Zoom Reset"));
+	split_sheet_zoom_reset->set_accessibility_name(TTRC("Reset Zoom"));
 	split_sheet_zoom_reset->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_sheet_zoom_reset));
 	split_sheet_zoom_hb->add_child(split_sheet_zoom_reset);
 
@@ -2330,6 +2388,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_zoom_in->set_theme_type_variation(SceneStringName(FlatButton));
 	split_sheet_zoom_in->set_focus_mode(FOCUS_NONE);
 	split_sheet_zoom_in->set_tooltip_text(TTR("Zoom In"));
+	split_sheet_zoom_in->set_accessibility_name(TTRC("Zoom In"));
 	split_sheet_zoom_in->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_sheet_zoom_in));
 	split_sheet_zoom_hb->add_child(split_sheet_zoom_in);
 
@@ -2349,6 +2408,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_h->set_max(128);
 	split_sheet_h->set_step(1);
 	split_sheet_h->set_select_all_on_focus(true);
+	split_sheet_h->set_accessibility_name(TTRC("Horizontal"));
 	split_sheet_h_hb->add_child(split_sheet_h);
 	split_sheet_h->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_FRAME_COUNT));
 	split_sheet_settings_vb->add_child(split_sheet_h_hb);
@@ -2366,6 +2426,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_v->set_max(128);
 	split_sheet_v->set_step(1);
 	split_sheet_v->set_select_all_on_focus(true);
+	split_sheet_v->set_accessibility_name(TTRC("Vertical"));
 	split_sheet_v_hb->add_child(split_sheet_v);
 	split_sheet_v->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_FRAME_COUNT));
 	split_sheet_settings_vb->add_child(split_sheet_v_hb);
@@ -2386,6 +2447,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_size_x->set_step(1);
 	split_sheet_size_x->set_suffix("px");
 	split_sheet_size_x->set_select_all_on_focus(true);
+	split_sheet_size_x->set_accessibility_name(TTRC("X Size"));
 	split_sheet_size_x->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_SIZE));
 	split_sheet_size_vb->add_child(split_sheet_size_x);
 	split_sheet_size_y = memnew(SpinBox);
@@ -2394,6 +2456,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_size_y->set_step(1);
 	split_sheet_size_y->set_suffix("px");
 	split_sheet_size_y->set_select_all_on_focus(true);
+	split_sheet_size_y->set_accessibility_name(TTRC("Y Size"));
 	split_sheet_size_y->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_SIZE));
 	split_sheet_size_vb->add_child(split_sheet_size_y);
 	split_sheet_size_hb->add_child(split_sheet_size_vb);
@@ -2414,6 +2477,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_sep_x->set_step(1);
 	split_sheet_sep_x->set_suffix("px");
 	split_sheet_sep_x->set_select_all_on_focus(true);
+	split_sheet_sep_x->set_accessibility_name(TTRC("X Separation"));
 	split_sheet_sep_x->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_USE_CURRENT));
 	split_sheet_sep_vb->add_child(split_sheet_sep_x);
 	split_sheet_sep_y = memnew(SpinBox);
@@ -2421,6 +2485,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_sep_y->set_step(1);
 	split_sheet_sep_y->set_suffix("px");
 	split_sheet_sep_y->set_select_all_on_focus(true);
+	split_sheet_sep_y->set_accessibility_name(TTRC("Y Separation"));
 	split_sheet_sep_y->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_USE_CURRENT));
 	split_sheet_sep_vb->add_child(split_sheet_sep_y);
 	split_sheet_sep_hb->add_child(split_sheet_sep_vb);
@@ -2441,6 +2506,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_offset_x->set_step(1);
 	split_sheet_offset_x->set_suffix("px");
 	split_sheet_offset_x->set_select_all_on_focus(true);
+	split_sheet_offset_x->set_accessibility_name(TTRC("X Offset"));
 	split_sheet_offset_x->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_USE_CURRENT));
 	split_sheet_offset_vb->add_child(split_sheet_offset_x);
 	split_sheet_offset_y = memnew(SpinBox);
@@ -2448,6 +2514,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
 	split_sheet_offset_y->set_step(1);
 	split_sheet_offset_y->set_suffix("px");
 	split_sheet_offset_y->set_select_all_on_focus(true);
+	split_sheet_offset_y->set_accessibility_name(TTRC("Y Offset"));
 	split_sheet_offset_y->connect(SceneStringName(value_changed), callable_mp(this, &SpriteFramesEditor::_sheet_spin_changed).bind(PARAM_USE_CURRENT));
 	split_sheet_offset_vb->add_child(split_sheet_offset_y);
 	split_sheet_offset_hb->add_child(split_sheet_offset_vb);
@@ -2534,6 +2601,3 @@ SpriteFramesEditorPlugin::SpriteFramesEditorPlugin() {
 	button = EditorNode::get_bottom_panel()->add_item(TTR("SpriteFrames"), frames_editor, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_sprite_frames_bottom_panel", TTRC("Toggle SpriteFrames Bottom Panel")));
 	button->hide();
 }
-
-SpriteFramesEditorPlugin::~SpriteFramesEditorPlugin() {
-}
diff --git a/engine/editor/plugins/sprite_frames_editor_plugin.h b/engine/editor/plugins/sprite_frames_editor_plugin.h
index 6e58a355..1c4b39fe 100644
--- a/engine/editor/plugins/sprite_frames_editor_plugin.h
+++ b/engine/editor/plugins/sprite_frames_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRITE_FRAMES_EDITOR_PLUGIN_H
-#define SPRITE_FRAMES_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/gui/button.h"
@@ -228,7 +227,7 @@ class SpriteFramesEditor : public HSplitContainer {
 	void _frame_list_gui_input(const Ref<InputEvent> &p_event);
 	void _frame_list_item_selected(int p_index, bool p_selected);
 
-	void _menu_selected(int p_index);
+	void _menu_selected(int p_id);
 
 	void _zoom_in();
 	void _zoom_out();
@@ -302,7 +301,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	SpriteFramesEditorPlugin();
-	~SpriteFramesEditorPlugin();
 };
-
-#endif // SPRITE_FRAMES_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/style_box_editor_plugin.cpp b/engine/editor/plugins/style_box_editor_plugin.cpp
index 2d71c617..b7ce74d8 100644
--- a/engine/editor/plugins/style_box_editor_plugin.cpp
+++ b/engine/editor/plugins/style_box_editor_plugin.cpp
@@ -112,6 +112,8 @@ StyleBoxPreview::StyleBoxPreview() {
 	grid_preview = memnew(Button);
 	// This theme variation works better than the normal theme because there's no focus highlight.
 	grid_preview->set_theme_type_variation("PreviewLightButton");
+	grid_preview->set_tooltip_text(TTRC("Toggle margins preview grid."));
+	grid_preview->set_accessibility_name(TTRC("Margins Preview Grid"));
 	grid_preview->set_toggle_mode(true);
 	grid_preview->connect(SceneStringName(toggled), callable_mp(this, &StyleBoxPreview::_grid_preview_toggled));
 	grid_preview->set_pressed(grid_preview_enabled);
diff --git a/engine/editor/plugins/style_box_editor_plugin.h b/engine/editor/plugins/style_box_editor_plugin.h
index 5814e5ad..8103bac1 100644
--- a/engine/editor/plugins/style_box_editor_plugin.h
+++ b/engine/editor/plugins/style_box_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STYLE_BOX_EDITOR_PLUGIN_H
-#define STYLE_BOX_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -74,5 +73,3 @@ public:
 
 	StyleBoxEditorPlugin();
 };
-
-#endif // STYLE_BOX_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/sub_viewport_preview_editor_plugin.h b/engine/editor/plugins/sub_viewport_preview_editor_plugin.h
index cf1ef0d2..c1a55cb0 100644
--- a/engine/editor/plugins/sub_viewport_preview_editor_plugin.h
+++ b/engine/editor/plugins/sub_viewport_preview_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SUB_VIEWPORT_PREVIEW_EDITOR_PLUGIN_H
-#define SUB_VIEWPORT_PREVIEW_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/texture_editor_plugin.h"
@@ -50,5 +49,3 @@ public:
 
 	SubViewportPreviewEditorPlugin();
 };
-
-#endif // SUB_VIEWPORT_PREVIEW_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/text_editor.cpp b/engine/editor/plugins/text_editor.cpp
index 5ba1b201..c00c7e74 100644
--- a/engine/editor/plugins/text_editor.cpp
+++ b/engine/editor/plugins/text_editor.cpp
@@ -216,7 +216,7 @@ void TextEditor::_update_bookmark_list() {
 	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_bookmark"), BOOKMARK_GOTO_PREV);
 
 	PackedInt32Array bookmark_list = code_editor->get_text_editor()->get_bookmarked_lines();
-	if (bookmark_list.size() == 0) {
+	if (bookmark_list.is_empty()) {
 		return;
 	}
 
@@ -601,8 +601,8 @@ void TextEditor::_make_context_menu(bool p_selection, bool p_can_fold, bool p_is
 	context_menu->popup();
 }
 
-void TextEditor::update_toggle_scripts_button() {
-	code_editor->update_toggle_scripts_button();
+void TextEditor::update_toggle_files_button() {
+	code_editor->update_toggle_files_button();
 }
 
 TextEditor::TextEditor() {
@@ -613,7 +613,7 @@ TextEditor::TextEditor() {
 	code_editor->connect("validate_script", callable_mp(this, &TextEditor::_validate_script));
 	code_editor->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
 	code_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	code_editor->show_toggle_scripts_button();
+	code_editor->show_toggle_files_button();
 	code_editor->set_toggle_list_control(ScriptEditor::get_singleton()->get_left_list_split());
 
 	update_settings();
diff --git a/engine/editor/plugins/text_editor.h b/engine/editor/plugins/text_editor.h
index e2e7fada..7e2208e5 100644
--- a/engine/editor/plugins/text_editor.h
+++ b/engine/editor/plugins/text_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_EDITOR_H
-#define TEXT_EDITOR_H
+#pragma once
 
 #include "script_editor_plugin.h"
 
@@ -146,7 +145,7 @@ public:
 	virtual void set_debugger_active(bool p_active) override;
 	virtual void set_tooltip_request_func(const Callable &p_toolip_callback) override;
 	virtual void add_callback(const String &p_function, const PackedStringArray &p_args) override;
-	void update_toggle_scripts_button() override;
+	void update_toggle_files_button() override;
 
 	virtual Control *get_edit_menu() override;
 	virtual void clear_edit_menu() override;
@@ -162,5 +161,3 @@ public:
 	TextEditor();
 	~TextEditor();
 };
-
-#endif // TEXT_EDITOR_H
diff --git a/engine/editor/plugins/text_shader_editor.cpp b/engine/editor/plugins/text_shader_editor.cpp
index 693cf243..48d25952 100644
--- a/engine/editor/plugins/text_shader_editor.cpp
+++ b/engine/editor/plugins/text_shader_editor.cpp
@@ -38,6 +38,7 @@
 #include "editor/editor_string_names.h"
 #include "editor/themes/editor_scale.h"
 #include "editor/themes/editor_theme_manager.h"
+#include "scene/gui/separator.h"
 #include "scene/gui/split_container.h"
 #include "servers/rendering/shader_preprocessor.h"
 #include "servers/rendering/shader_types.h"
@@ -727,7 +728,7 @@ void TextShaderEditor::_menu_option(int p_option) {
 			code_editor->remove_all_bookmarks();
 		} break;
 		case HELP_DOCS: {
-			OS::get_singleton()->shell_open(vformat("%s/tutorials/shaders/shader_reference/index.html", VERSION_DOCS_URL));
+			OS::get_singleton()->shell_open(vformat("%s/tutorials/shaders/shader_reference/index.html", GODOT_VERSION_DOCS_URL));
 		} break;
 		case EDIT_EMOJI_AND_SYMBOL: {
 			code_editor->get_text_editor()->show_emoji_and_symbol_picker();
@@ -749,8 +750,7 @@ void TextShaderEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE:
 		case NOTIFICATION_THEME_CHANGED: {
-			PopupMenu *popup = help_menu->get_popup();
-			popup->set_item_icon(popup->get_item_index(HELP_DOCS), get_editor_theme_icon(SNAME("ExternalLink")));
+			site_search->set_button_icon(get_editor_theme_icon(SNAME("ExternalLink")));
 		} break;
 
 		case NOTIFICATION_APPLICATION_FOCUS_IN: {
@@ -976,6 +976,10 @@ void TextShaderEditor::validate_script() {
 	code_editor->_validate_script();
 }
 
+Control *TextShaderEditor::get_top_bar() {
+	return hbc;
+}
+
 bool TextShaderEditor::is_unsaved() const {
 	return code_editor->get_text_editor()->get_saved_version() != code_editor->get_text_editor()->get_version();
 }
@@ -1062,7 +1066,7 @@ void TextShaderEditor::_update_bookmark_list() {
 	bookmarks_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/goto_previous_bookmark"), BOOKMARK_GOTO_PREV);
 
 	PackedInt32Array bookmark_list = code_editor->get_text_editor()->get_bookmarked_lines();
-	if (bookmark_list.size() == 0) {
+	if (bookmark_list.is_empty()) {
 		return;
 	}
 
@@ -1149,7 +1153,7 @@ TextShaderEditor::TextShaderEditor() {
 
 	VBoxContainer *main_container = memnew(VBoxContainer);
 	main_container->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
-	HBoxContainer *hbc = memnew(HBoxContainer);
+	hbc = memnew(HBoxContainer);
 
 	edit_menu = memnew(MenuButton);
 	edit_menu->set_shortcut_context(this);
@@ -1205,18 +1209,20 @@ TextShaderEditor::TextShaderEditor() {
 	bookmarks_menu->connect("about_to_popup", callable_mp(this, &TextShaderEditor::_update_bookmark_list));
 	bookmarks_menu->connect("index_pressed", callable_mp(this, &TextShaderEditor::_bookmark_item_pressed));
 
-	help_menu = memnew(MenuButton);
-	help_menu->set_text(TTR("Help"));
-	help_menu->set_switch_on_hover(true);
-	help_menu->get_popup()->add_item(TTR("Online Docs"), HELP_DOCS);
-	help_menu->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TextShaderEditor::_menu_option));
-
 	add_child(main_container);
-	main_container->add_child(hbc);
-	hbc->add_child(search_menu);
 	hbc->add_child(edit_menu);
+	hbc->add_child(search_menu);
 	hbc->add_child(goto_menu);
-	hbc->add_child(help_menu);
+	hbc->add_spacer();
+
+	site_search = memnew(Button);
+	site_search->set_flat(true);
+	site_search->connect(SceneStringName(pressed), callable_mp(this, &TextShaderEditor::_menu_option).bind(HELP_DOCS));
+	site_search->set_text(TTR("Online Docs"));
+	site_search->set_tooltip_text(TTR("Open Godot online documentation."));
+	hbc->add_child(site_search);
+	hbc->add_child(memnew(VSeparator));
+
 	hbc->add_theme_style_override(SceneStringName(panel), EditorNode::get_singleton()->get_editor_theme()->get_stylebox(SNAME("ScriptEditorPanel"), EditorStringName(EditorStyles)));
 
 	VSplitContainer *editor_box = memnew(VSplitContainer);
@@ -1263,5 +1269,5 @@ TextShaderEditor::TextShaderEditor() {
 	add_child(disk_changed);
 
 	_editor_settings_changed();
-	code_editor->show_toggle_scripts_button(); // TODO: Disabled for now, because it doesn't work properly.
+	code_editor->show_toggle_files_button(); // TODO: Disabled for now, because it doesn't work properly.
 }
diff --git a/engine/editor/plugins/text_shader_editor.h b/engine/editor/plugins/text_shader_editor.h
index 21d57c5e..a1c575aa 100644
--- a/engine/editor/plugins/text_shader_editor.h
+++ b/engine/editor/plugins/text_shader_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SHADER_EDITOR_H
-#define TEXT_SHADER_EDITOR_H
+#pragma once
 
 #include "editor/code_editor.h"
 #include "editor/plugins/shader/shader_editor.h"
@@ -137,10 +136,11 @@ class TextShaderEditor : public ShaderEditor {
 		EDIT_EMOJI_AND_SYMBOL,
 	};
 
+	HBoxContainer *hbc = nullptr;
 	MenuButton *edit_menu = nullptr;
 	MenuButton *search_menu = nullptr;
 	PopupMenu *bookmarks_menu = nullptr;
-	MenuButton *help_menu = nullptr;
+	Button *site_search = nullptr;
 	PopupMenu *context_menu = nullptr;
 	RichTextLabel *warnings_panel = nullptr;
 	uint64_t idle = 0;
@@ -196,6 +196,7 @@ public:
 	virtual bool is_unsaved() const override;
 	virtual void save_external_data(const String &p_str = "") override;
 	virtual void validate_script() override;
+	virtual Control *get_top_bar() override;
 
 	bool was_compilation_successful() const { return compilation_success; }
 	bool get_trim_trailing_whitespace_on_save() const { return trim_trailing_whitespace_on_save; }
@@ -211,5 +212,3 @@ public:
 
 	TextShaderEditor();
 };
-
-#endif // TEXT_SHADER_EDITOR_H
diff --git a/engine/editor/plugins/texture_3d_editor_plugin.h b/engine/editor/plugins/texture_3d_editor_plugin.h
index 58424955..5ed77612 100644
--- a/engine/editor/plugins/texture_3d_editor_plugin.h
+++ b/engine/editor/plugins/texture_3d_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_3D_EDITOR_PLUGIN_H
-#define TEXTURE_3D_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -99,5 +98,3 @@ public:
 
 	Texture3DEditorPlugin();
 };
-
-#endif // TEXTURE_3D_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/texture_editor_plugin.cpp b/engine/editor/plugins/texture_editor_plugin.cpp
index fcda832c..e7b9b139 100644
--- a/engine/editor/plugins/texture_editor_plugin.cpp
+++ b/engine/editor/plugins/texture_editor_plugin.cpp
@@ -124,6 +124,11 @@ static Image::Format get_texture_2d_format(const Ref<Texture2D> &p_texture) {
 		return compressed_texture->get_format();
 	}
 
+	const Ref<PortableCompressedTexture2D> portable_compressed_texture = p_texture;
+	if (portable_compressed_texture.is_valid()) {
+		return portable_compressed_texture->get_format();
+	}
+
 	// AtlasTexture?
 
 	// Unknown
diff --git a/engine/editor/plugins/texture_editor_plugin.h b/engine/editor/plugins/texture_editor_plugin.h
index d27cb4ea..1a52da7d 100644
--- a/engine/editor/plugins/texture_editor_plugin.h
+++ b/engine/editor/plugins/texture_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_EDITOR_PLUGIN_H
-#define TEXTURE_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -90,5 +89,3 @@ public:
 
 	TextureEditorPlugin();
 };
-
-#endif // TEXTURE_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/texture_layered_editor_plugin.cpp b/engine/editor/plugins/texture_layered_editor_plugin.cpp
index 2ecd5216..de79d0b1 100644
--- a/engine/editor/plugins/texture_layered_editor_plugin.cpp
+++ b/engine/editor/plugins/texture_layered_editor_plugin.cpp
@@ -415,9 +415,6 @@ TextureLayeredEditor::TextureLayeredEditor() {
 	add_child(info);
 }
 
-TextureLayeredEditor::~TextureLayeredEditor() {
-}
-
 bool EditorInspectorPluginLayeredTexture::can_handle(Object *p_object) {
 	return Object::cast_to<TextureLayered>(p_object) != nullptr;
 }
diff --git a/engine/editor/plugins/texture_layered_editor_plugin.h b/engine/editor/plugins/texture_layered_editor_plugin.h
index d2264175..c5cd92d2 100644
--- a/engine/editor/plugins/texture_layered_editor_plugin.h
+++ b/engine/editor/plugins/texture_layered_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_LAYERED_EDITOR_PLUGIN_H
-#define TEXTURE_LAYERED_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -83,7 +82,6 @@ public:
 	void edit(Ref<TextureLayered> p_texture);
 
 	TextureLayeredEditor();
-	~TextureLayeredEditor();
 };
 
 class EditorInspectorPluginLayeredTexture : public EditorInspectorPlugin {
@@ -102,5 +100,3 @@ public:
 
 	TextureLayeredEditorPlugin();
 };
-
-#endif // TEXTURE_LAYERED_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/texture_region_editor_plugin.cpp b/engine/editor/plugins/texture_region_editor_plugin.cpp
index 30c3fd79..821b425d 100644
--- a/engine/editor/plugins/texture_region_editor_plugin.cpp
+++ b/engine/editor/plugins/texture_region_editor_plugin.cpp
@@ -171,7 +171,7 @@ void TextureRegionEditor::_texture_overlay_draw() {
 		int next = (i + 1) % 4;
 
 		Vector2 ofs = ((endpoints[i] - endpoints[prev]).normalized() + ((endpoints[i] - endpoints[next]).normalized())).normalized();
-		ofs *= Math_SQRT2 * (select_handle->get_size().width / 2);
+		ofs *= Math::SQRT2 * (select_handle->get_size().width / 2);
 
 		texture_overlay->draw_line(endpoints[i] - draw_ofs * draw_zoom, endpoints[next] - draw_ofs * draw_zoom, color, 2);
 
@@ -197,7 +197,7 @@ void TextureRegionEditor::_texture_overlay_draw() {
 
 	hscroll->set_min(scroll_rect.position.x);
 	hscroll->set_max(scroll_rect.position.x + scroll_rect.size.x);
-	if (ABS(scroll_rect.position.x - (scroll_rect.position.x + scroll_rect.size.x)) <= scroll_margin.x) {
+	if (Math::abs(scroll_rect.position.x - (scroll_rect.position.x + scroll_rect.size.x)) <= scroll_margin.x) {
 		hscroll->hide();
 	} else {
 		hscroll->show();
@@ -207,7 +207,7 @@ void TextureRegionEditor::_texture_overlay_draw() {
 
 	vscroll->set_min(scroll_rect.position.y);
 	vscroll->set_max(scroll_rect.position.y + scroll_rect.size.y);
-	if (ABS(scroll_rect.position.y - (scroll_rect.position.y + scroll_rect.size.y)) <= scroll_margin.y) {
+	if (Math::abs(scroll_rect.position.y - (scroll_rect.position.y + scroll_rect.size.y)) <= scroll_margin.y) {
 		vscroll->hide();
 		draw_ofs.y = scroll_rect.position.y;
 	} else {
@@ -1154,6 +1154,7 @@ TextureRegionEditor::TextureRegionEditor() {
 
 	snap_mode_button = memnew(OptionButton);
 	hb_tools->add_child(snap_mode_button);
+	snap_mode_button->set_accessibility_name(TTRC("Snap Mode"));
 	snap_mode_button->add_item(TTR("None"), 0);
 	snap_mode_button->add_item(TTR("Pixel Snap"), 1);
 	snap_mode_button->add_item(TTR("Grid Snap"), 2);
@@ -1171,12 +1172,14 @@ TextureRegionEditor::TextureRegionEditor() {
 	sb_off_x->set_step(1);
 	sb_off_x->set_suffix("px");
 	sb_off_x->connect(SceneStringName(value_changed), callable_mp(this, &TextureRegionEditor::_set_snap_off_x));
+	sb_off_x->set_accessibility_name(TTRC("Offset X"));
 	hb_grid->add_child(sb_off_x);
 
 	sb_off_y = memnew(SpinBox);
 	sb_off_y->set_step(1);
 	sb_off_y->set_suffix("px");
 	sb_off_y->connect(SceneStringName(value_changed), callable_mp(this, &TextureRegionEditor::_set_snap_off_y));
+	sb_off_y->set_accessibility_name(TTRC("Offset Y"));
 	hb_grid->add_child(sb_off_y);
 
 	hb_grid->add_child(memnew(VSeparator));
@@ -1187,6 +1190,7 @@ TextureRegionEditor::TextureRegionEditor() {
 	sb_step_x->set_step(1);
 	sb_step_x->set_suffix("px");
 	sb_step_x->connect(SceneStringName(value_changed), callable_mp(this, &TextureRegionEditor::_set_snap_step_x));
+	sb_step_x->set_accessibility_name(TTRC("Step X"));
 	hb_grid->add_child(sb_step_x);
 
 	sb_step_y = memnew(SpinBox);
@@ -1194,6 +1198,7 @@ TextureRegionEditor::TextureRegionEditor() {
 	sb_step_y->set_step(1);
 	sb_step_y->set_suffix("px");
 	sb_step_y->connect(SceneStringName(value_changed), callable_mp(this, &TextureRegionEditor::_set_snap_step_y));
+	sb_step_y->set_accessibility_name(TTRC("Step Y"));
 	hb_grid->add_child(sb_step_y);
 
 	hb_grid->add_child(memnew(VSeparator));
@@ -1204,6 +1209,7 @@ TextureRegionEditor::TextureRegionEditor() {
 	sb_sep_x->set_step(1);
 	sb_sep_x->set_suffix("px");
 	sb_sep_x->connect(SceneStringName(value_changed), callable_mp(this, &TextureRegionEditor::_set_snap_sep_x));
+	sb_sep_x->set_accessibility_name(TTRC("Separation X"));
 	hb_grid->add_child(sb_sep_x);
 
 	sb_sep_y = memnew(SpinBox);
@@ -1211,6 +1217,7 @@ TextureRegionEditor::TextureRegionEditor() {
 	sb_sep_y->set_step(1);
 	sb_sep_y->set_suffix("px");
 	sb_sep_y->connect(SceneStringName(value_changed), callable_mp(this, &TextureRegionEditor::_set_snap_sep_y));
+	sb_sep_y->set_accessibility_name(TTRC("Separation Y"));
 	hb_grid->add_child(sb_sep_y);
 
 	hb_grid->hide();
@@ -1249,18 +1256,21 @@ TextureRegionEditor::TextureRegionEditor() {
 	zoom_out = memnew(Button);
 	zoom_out->set_flat(true);
 	zoom_out->set_tooltip_text(TTR("Zoom Out"));
+	zoom_out->set_accessibility_name(TTRC("Zoom Out"));
 	zoom_out->connect(SceneStringName(pressed), callable_mp(this, &TextureRegionEditor::_zoom_out));
 	zoom_hb->add_child(zoom_out);
 
 	zoom_reset = memnew(Button);
 	zoom_reset->set_flat(true);
 	zoom_reset->set_tooltip_text(TTR("Zoom Reset"));
+	zoom_reset->set_accessibility_name(TTRC("Reset Zoom"));
 	zoom_reset->connect(SceneStringName(pressed), callable_mp(this, &TextureRegionEditor::_zoom_reset));
 	zoom_hb->add_child(zoom_reset);
 
 	zoom_in = memnew(Button);
 	zoom_in->set_flat(true);
 	zoom_in->set_tooltip_text(TTR("Zoom In"));
+	zoom_in->set_accessibility_name(TTRC("Zoom In"));
 	zoom_in->connect(SceneStringName(pressed), callable_mp(this, &TextureRegionEditor::_zoom_in));
 	zoom_hb->add_child(zoom_in);
 
diff --git a/engine/editor/plugins/texture_region_editor_plugin.h b/engine/editor/plugins/texture_region_editor_plugin.h
index ae1f8381..30f80bf3 100644
--- a/engine/editor/plugins/texture_region_editor_plugin.h
+++ b/engine/editor/plugins/texture_region_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_REGION_EDITOR_PLUGIN_H
-#define TEXTURE_REGION_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -180,5 +179,3 @@ public:
 
 	TextureRegionEditorPlugin();
 };
-
-#endif // TEXTURE_REGION_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/theme_editor_plugin.cpp b/engine/editor/plugins/theme_editor_plugin.cpp
index ca037292..690571cd 100644
--- a/engine/editor/plugins/theme_editor_plugin.cpp
+++ b/engine/editor/plugins/theme_editor_plugin.cpp
@@ -136,7 +136,7 @@ void ThemeItemImportTree::_update_items_tree() {
 				filtered_names.push_back(F);
 			}
 
-			if (filtered_names.size() == 0) {
+			if (filtered_names.is_empty()) {
 				continue;
 			}
 
@@ -240,8 +240,7 @@ void ThemeItemImportTree::_update_items_tree() {
 	}
 
 	if (color_amount > 0) {
-		Array arr;
-		arr.push_back(color_amount);
+		Array arr = { color_amount };
 		select_colors_label->set_text(TTRN("1 color", "{num} colors", color_amount).format(arr, "{num}"));
 		select_all_colors_button->set_visible(true);
 		select_full_colors_button->set_visible(true);
@@ -254,8 +253,7 @@ void ThemeItemImportTree::_update_items_tree() {
 	}
 
 	if (constant_amount > 0) {
-		Array arr;
-		arr.push_back(constant_amount);
+		Array arr = { constant_amount };
 		select_constants_label->set_text(TTRN("1 constant", "{num} constants", constant_amount).format(arr, "{num}"));
 		select_all_constants_button->set_visible(true);
 		select_full_constants_button->set_visible(true);
@@ -268,8 +266,7 @@ void ThemeItemImportTree::_update_items_tree() {
 	}
 
 	if (font_amount > 0) {
-		Array arr;
-		arr.push_back(font_amount);
+		Array arr = { font_amount };
 		select_fonts_label->set_text(TTRN("1 font", "{num} fonts", font_amount).format(arr, "{num}"));
 		select_all_fonts_button->set_visible(true);
 		select_full_fonts_button->set_visible(true);
@@ -282,8 +279,7 @@ void ThemeItemImportTree::_update_items_tree() {
 	}
 
 	if (font_size_amount > 0) {
-		Array arr;
-		arr.push_back(font_size_amount);
+		Array arr = { font_size_amount };
 		select_font_sizes_label->set_text(TTRN("1 font size", "{num} font sizes", font_size_amount).format(arr, "{num}"));
 		select_all_font_sizes_button->set_visible(true);
 		select_full_font_sizes_button->set_visible(true);
@@ -296,8 +292,7 @@ void ThemeItemImportTree::_update_items_tree() {
 	}
 
 	if (icon_amount > 0) {
-		Array arr;
-		arr.push_back(icon_amount);
+		Array arr = { icon_amount };
 		select_icons_label->set_text(TTRN("1 icon", "{num} icons", icon_amount).format(arr, "{num}"));
 		select_all_icons_button->set_visible(true);
 		select_full_icons_button->set_visible(true);
@@ -312,8 +307,7 @@ void ThemeItemImportTree::_update_items_tree() {
 	}
 
 	if (stylebox_amount > 0) {
-		Array arr;
-		arr.push_back(stylebox_amount);
+		Array arr = { stylebox_amount };
 		select_styleboxes_label->set_text(TTRN("1 stylebox", "{num} styleboxes", stylebox_amount).format(arr, "{num}"));
 		select_all_styleboxes_button->set_visible(true);
 		select_full_styleboxes_button->set_visible(true);
@@ -460,8 +454,7 @@ void ThemeItemImportTree::_update_total_selected(Theme::DataType p_data_type) {
 	if (count == 0) {
 		total_selected_items_label->hide();
 	} else {
-		Array arr;
-		arr.push_back(count);
+		Array arr = { count };
 		total_selected_items_label->set_text(TTRN("{num} currently selected", "{num} currently selected", count).format(arr, "{num}"));
 		total_selected_items_label->show();
 	}
@@ -741,7 +734,7 @@ void ThemeItemImportTree::_deselect_all_data_type_pressed(int p_data_type) {
 }
 
 void ThemeItemImportTree::_import_selected() {
-	if (selected_items.size() == 0) {
+	if (selected_items.is_empty()) {
 		EditorNode::get_singleton()->show_accept(TTR("Nothing was selected for the import."), TTR("OK"));
 		return;
 	}
@@ -756,9 +749,7 @@ void ThemeItemImportTree::_import_selected() {
 		// Arbitrary number of items to skip from reporting.
 		// Reduces the number of UI updates that this causes when copying large themes.
 		if (idx % 10 == 0) {
-			Array arr;
-			arr.push_back(idx + 1);
-			arr.push_back(selected_items.size());
+			Array arr = { idx + 1, selected_items.size() };
 			ProgressDialog::get_singleton()->task_step("import_theme_items", TTR("Importing items {n}/{n}").format(arr, "{n}"), idx);
 		}
 
@@ -1588,15 +1579,11 @@ void ThemeItemEditorDialog::_add_theme_item(Theme::DataType p_data_type, String
 
 void ThemeItemEditorDialog::_remove_theme_type(const String &p_theme_type) {
 	Ref<Theme> old_snapshot = edited_theme->duplicate();
-	Ref<Theme> new_snapshot = edited_theme->duplicate();
 
 	EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
 	ur->create_action(TTR("Remove Theme Type"));
 
-	new_snapshot->remove_type(p_theme_type);
-
-	ur->add_do_method(*edited_theme, "clear");
-	ur->add_do_method(*edited_theme, "merge_with", new_snapshot);
+	ur->add_do_method(*edited_theme, "remove_type", p_theme_type);
 	// If the type was empty, it cannot be restored with merge, but thankfully we can fake it.
 	ur->add_undo_method(*edited_theme, "add_type", p_theme_type);
 	ur->add_undo_method(*edited_theme, "merge_with", old_snapshot);
@@ -1970,6 +1957,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_add_color = memnew(Button);
 	edit_items_add_color->set_tooltip_text(TTR("Add Color Item"));
+	edit_items_add_color->set_accessibility_name(TTRC("Add Color Item"));
 	edit_items_add_color->set_flat(true);
 	edit_items_add_color->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_add_color);
@@ -1977,6 +1965,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_add_constant = memnew(Button);
 	edit_items_add_constant->set_tooltip_text(TTR("Add Constant Item"));
+	edit_items_add_constant->set_accessibility_name(TTRC("Add Constant Item"));
 	edit_items_add_constant->set_flat(true);
 	edit_items_add_constant->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_add_constant);
@@ -1984,6 +1973,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_add_font = memnew(Button);
 	edit_items_add_font->set_tooltip_text(TTR("Add Font Item"));
+	edit_items_add_font->set_accessibility_name(TTRC("Add Font Item"));
 	edit_items_add_font->set_flat(true);
 	edit_items_add_font->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_add_font);
@@ -1991,6 +1981,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_add_font_size = memnew(Button);
 	edit_items_add_font_size->set_tooltip_text(TTR("Add Font Size Item"));
+	edit_items_add_font_size->set_accessibility_name(TTRC("Add Font Size Item"));
 	edit_items_add_font_size->set_flat(true);
 	edit_items_add_font_size->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_add_font_size);
@@ -1998,6 +1989,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_add_icon = memnew(Button);
 	edit_items_add_icon->set_tooltip_text(TTR("Add Icon Item"));
+	edit_items_add_icon->set_accessibility_name(TTRC("Add Icon Item"));
 	edit_items_add_icon->set_flat(true);
 	edit_items_add_icon->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_add_icon);
@@ -2005,6 +1997,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_add_stylebox = memnew(Button);
 	edit_items_add_stylebox->set_tooltip_text(TTR("Add StyleBox Item"));
+	edit_items_add_stylebox->set_accessibility_name(TTRC("Add StyleBox Item"));
 	edit_items_add_stylebox->set_flat(true);
 	edit_items_add_stylebox->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_add_stylebox);
@@ -2018,6 +2011,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_remove_class = memnew(Button);
 	edit_items_remove_class->set_tooltip_text(TTR("Remove Class Items"));
+	edit_items_remove_class->set_accessibility_name(TTRC("Remove Class Items"));
 	edit_items_remove_class->set_flat(true);
 	edit_items_remove_class->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_remove_class);
@@ -2025,6 +2019,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_remove_custom = memnew(Button);
 	edit_items_remove_custom->set_tooltip_text(TTR("Remove Custom Items"));
+	edit_items_remove_custom->set_accessibility_name(TTRC("Remove Custom Items"));
 	edit_items_remove_custom->set_flat(true);
 	edit_items_remove_custom->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_remove_custom);
@@ -2032,6 +2027,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito
 
 	edit_items_remove_all = memnew(Button);
 	edit_items_remove_all->set_tooltip_text(TTR("Remove All Items"));
+	edit_items_remove_all->set_accessibility_name(TTRC("Remove All Items"));
 	edit_items_remove_all->set_flat(true);
 	edit_items_remove_all->set_disabled(true);
 	edit_items_toolbar->add_child(edit_items_remove_all);
@@ -2486,6 +2482,7 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_
 		Button *item_rename_button = memnew(Button);
 		item_rename_button->set_button_icon(get_editor_theme_icon(SNAME("Edit")));
 		item_rename_button->set_tooltip_text(TTR("Rename Item"));
+		item_rename_button->set_accessibility_name(TTRC("Rename Item"));
 		item_rename_button->set_flat(true);
 		item_name_container->add_child(item_rename_button);
 		item_rename_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_rename_cbk).bind(p_data_type, p_item_name, item_name_container));
@@ -2493,6 +2490,7 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_
 		Button *item_remove_button = memnew(Button);
 		item_remove_button->set_button_icon(get_editor_theme_icon(SNAME("Remove")));
 		item_remove_button->set_tooltip_text(TTR("Remove Item"));
+		item_remove_button->set_accessibility_name(TTRC("Remove Item"));
 		item_remove_button->set_flat(true);
 		item_name_container->add_child(item_remove_button);
 		item_remove_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_remove_cbk).bind(p_data_type, p_item_name));
@@ -2500,6 +2498,7 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_
 		Button *item_rename_confirm_button = memnew(Button);
 		item_rename_confirm_button->set_button_icon(get_editor_theme_icon(SNAME("ImportCheck")));
 		item_rename_confirm_button->set_tooltip_text(TTR("Confirm Item Rename"));
+		item_rename_confirm_button->set_accessibility_name(TTRC("Confirm Item Rename"));
 		item_rename_confirm_button->set_flat(true);
 		item_name_container->add_child(item_rename_confirm_button);
 		item_rename_confirm_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_rename_confirmed).bind(p_data_type, p_item_name, item_name_container));
@@ -2508,6 +2507,7 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_
 		Button *item_rename_cancel_button = memnew(Button);
 		item_rename_cancel_button->set_button_icon(get_editor_theme_icon(SNAME("ImportFail")));
 		item_rename_cancel_button->set_tooltip_text(TTR("Cancel Item Rename"));
+		item_rename_cancel_button->set_accessibility_name(TTRC("Cancel Item Rename"));
 		item_rename_cancel_button->set_flat(true);
 		item_name_container->add_child(item_rename_cancel_button);
 		item_rename_cancel_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_rename_canceled).bind(p_data_type, p_item_name, item_name_container));
@@ -2518,6 +2518,7 @@ HBoxContainer *ThemeTypeEditor::_create_property_control(Theme::DataType p_data_
 		Button *item_override_button = memnew(Button);
 		item_override_button->set_button_icon(get_editor_theme_icon(SNAME("Add")));
 		item_override_button->set_tooltip_text(TTR("Override Item"));
+		item_override_button->set_accessibility_name(TTRC("Override Item"));
 		item_override_button->set_flat(true);
 		item_name_container->add_child(item_override_button);
 		item_override_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_item_override_cbk).bind(p_data_type, p_item_name));
@@ -2727,6 +2728,7 @@ void ThemeTypeEditor::_update_type_items() {
 			pin_leader_button->set_pressed(true);
 			pin_leader_button->set_button_icon(get_editor_theme_icon(SNAME("Pin")));
 			pin_leader_button->set_tooltip_text(TTR("Unpin this StyleBox as a main style."));
+			pin_leader_button->set_accessibility_name(TTRC("Unpin StyleBox"));
 			item_control->add_child(pin_leader_button);
 			pin_leader_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_on_unpin_leader_button_pressed));
 
@@ -2770,6 +2772,7 @@ void ThemeTypeEditor::_update_type_items() {
 				pin_leader_button->set_toggle_mode(true);
 				pin_leader_button->set_button_icon(get_editor_theme_icon(SNAME("Pin")));
 				pin_leader_button->set_tooltip_text(TTR("Pin this StyleBox as a main style. Editing its properties will update the same properties in all other StyleBoxes of this type."));
+				pin_leader_button->set_accessibility_name(TTRC("Pin StyleBox as a Main Style"));
 				item_control->add_child(pin_leader_button);
 				pin_leader_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_on_pin_leader_button_pressed).bind(item_editor, E.key));
 			} else {
@@ -3456,11 +3459,13 @@ ThemeTypeEditor::ThemeTypeEditor() {
 	theme_type_list->set_h_size_flags(SIZE_EXPAND_FILL);
 	theme_type_list->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
 	theme_type_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	theme_type_list->set_accessibility_name(TTRC("Type"));
 	type_list_hb->add_child(theme_type_list);
 	theme_type_list->connect(SceneStringName(item_selected), callable_mp(this, &ThemeTypeEditor::_list_type_selected));
 
 	add_type_button = memnew(Button);
 	add_type_button->set_tooltip_text(TTR("Add a type from a list of available types or create a new one."));
+	add_type_button->set_accessibility_name(TTRC("Add Type"));
 	type_list_hb->add_child(add_type_button);
 	add_type_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_add_type_button_cbk));
 
@@ -3523,9 +3528,11 @@ ThemeTypeEditor::ThemeTypeEditor() {
 	type_variation_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	type_variation_edit->connect(SceneStringName(text_changed), callable_mp(this, &ThemeTypeEditor::_type_variation_changed));
 	type_variation_edit->connect(SceneStringName(focus_exited), callable_mp(this, &ThemeTypeEditor::_update_type_items));
+	type_variation_edit->set_accessibility_name(TTRC("Base Type"));
 	type_variation_button = memnew(Button);
 	type_variation_hb->add_child(type_variation_button);
 	type_variation_button->set_tooltip_text(TTR("Select the variation base type from a list of available types."));
+	type_variation_button->set_accessibility_name(TTRC("Select Base Type"));
 	type_variation_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeTypeEditor::_add_type_variation_cbk));
 
 	type_variation_locked = memnew(Label);
@@ -3796,9 +3803,10 @@ ThemeEditor::ThemeEditor() {
 	main_hs->set_v_size_flags(SIZE_EXPAND_FILL);
 	add_child(main_hs);
 
+	main_hs->set_split_offset(520 * EDSCALE);
+
 	VBoxContainer *preview_tabs_vb = memnew(VBoxContainer);
 	preview_tabs_vb->set_h_size_flags(SIZE_EXPAND_FILL);
-	preview_tabs_vb->set_custom_minimum_size(Size2(520, 0) * EDSCALE);
 	preview_tabs_vb->add_theme_constant_override("separation", 2 * EDSCALE);
 	main_hs->add_child(preview_tabs_vb);
 	HBoxContainer *preview_tabbar_hb = memnew(HBoxContainer);
diff --git a/engine/editor/plugins/theme_editor_plugin.h b/engine/editor/plugins/theme_editor_plugin.h
index 12b4a5fa..711da63d 100644
--- a/engine/editor/plugins/theme_editor_plugin.h
+++ b/engine/editor/plugins/theme_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THEME_EDITOR_PLUGIN_H
-#define THEME_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "editor/plugins/theme_editor_preview.h"
@@ -485,5 +484,3 @@ public:
 
 	ThemeEditorPlugin();
 };
-
-#endif // THEME_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/theme_editor_preview.cpp b/engine/editor/plugins/theme_editor_preview.cpp
index cfeb9992..021ea8b0 100644
--- a/engine/editor/plugins/theme_editor_preview.cpp
+++ b/engine/editor/plugins/theme_editor_preview.cpp
@@ -250,7 +250,7 @@ ThemeEditorPreview::ThemeEditorPreview() {
 	picker_button->connect(SceneStringName(pressed), callable_mp(this, &ThemeEditorPreview::_picker_button_cbk));
 
 	MarginContainer *preview_body = memnew(MarginContainer);
-	preview_body->set_custom_minimum_size(Size2(480, 0) * EDSCALE);
+	preview_body->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
 	preview_body->set_v_size_flags(SIZE_EXPAND_FILL);
 	add_child(preview_body);
 
diff --git a/engine/editor/plugins/theme_editor_preview.h b/engine/editor/plugins/theme_editor_preview.h
index ed888e6c..bddcfc44 100644
--- a/engine/editor/plugins/theme_editor_preview.h
+++ b/engine/editor/plugins/theme_editor_preview.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THEME_EDITOR_PREVIEW_H
-#define THEME_EDITOR_PREVIEW_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/resources/theme.h"
@@ -118,5 +117,3 @@ public:
 
 	SceneThemeEditorPreview();
 };
-
-#endif // THEME_EDITOR_PREVIEW_H
diff --git a/engine/editor/plugins/tiles/atlas_merging_dialog.h b/engine/editor/plugins/tiles/atlas_merging_dialog.h
index 5385489b..99d23330 100644
--- a/engine/editor/plugins/tiles/atlas_merging_dialog.h
+++ b/engine/editor/plugins/tiles/atlas_merging_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ATLAS_MERGING_DIALOG_H
-#define ATLAS_MERGING_DIALOG_H
+#pragma once
 
 #include "editor/editor_properties.h"
 #include "scene/gui/dialogs.h"
@@ -83,5 +82,3 @@ public:
 
 	AtlasMergingDialog();
 };
-
-#endif // ATLAS_MERGING_DIALOG_H
diff --git a/engine/editor/plugins/tiles/tile_atlas_view.cpp b/engine/editor/plugins/tiles/tile_atlas_view.cpp
index cca6ffe1..1fb89945 100644
--- a/engine/editor/plugins/tiles/tile_atlas_view.cpp
+++ b/engine/editor/plugins/tiles/tile_atlas_view.cpp
@@ -650,6 +650,7 @@ TileAtlasView::TileAtlasView() {
 	button_center_view->set_flat(true);
 	button_center_view->set_disabled(true);
 	button_center_view->set_tooltip_text(TTR("Center View"));
+	button_center_view->set_accessibility_name(TTRC("Center View"));
 	add_child(button_center_view);
 
 	panner.instantiate();
diff --git a/engine/editor/plugins/tiles/tile_atlas_view.h b/engine/editor/plugins/tiles/tile_atlas_view.h
index 025df4fd..781447cf 100644
--- a/engine/editor/plugins/tiles/tile_atlas_view.h
+++ b/engine/editor/plugins/tiles/tile_atlas_view.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_ATLAS_VIEW_H
-#define TILE_ATLAS_VIEW_H
+#pragma once
 
 #include "editor/gui/editor_zoom_widget.h"
 #include "scene/gui/box_container.h"
@@ -170,5 +169,3 @@ public:
 	TileAtlasView();
 	~TileAtlasView();
 };
-
-#endif // TILE_ATLAS_VIEW_H
diff --git a/engine/editor/plugins/tiles/tile_data_editors.cpp b/engine/editor/plugins/tiles/tile_data_editors.cpp
index 00649a78..653cb990 100644
--- a/engine/editor/plugins/tiles/tile_data_editors.cpp
+++ b/engine/editor/plugins/tiles/tile_data_editors.cpp
@@ -33,6 +33,7 @@
 #include "tile_set_editor.h"
 
 #include "core/math/geometry_2d.h"
+#include "core/math/random_pcg.h"
 #include "core/os/keyboard.h"
 
 #include "editor/editor_node.h"
@@ -219,8 +220,7 @@ void GenericTilePolygonEditor::_base_control_draw() {
 			color = color.darkened(0.3);
 		}
 		color.a = 0.5;
-		Vector<Color> v_color;
-		v_color.push_back(color);
+		Vector<Color> v_color = { color };
 		base_control->draw_polygon(polygon, v_color);
 
 		color.a = 0.7;
@@ -438,8 +438,9 @@ void GenericTilePolygonEditor::_grab_polygon_segment_point(Vector2 p_pos, const
 	for (unsigned int i = 0; i < polygons.size(); i++) {
 		const Vector<Vector2> &polygon = polygons[i];
 		for (int j = 0; j < polygon.size(); j++) {
-			Vector2 segment[2] = { polygon[j], polygon[(j + 1) % polygon.size()] };
-			Vector2 closest_point = Geometry2D::get_closest_point_to_segment(point, segment);
+			const Vector2 segment_a = polygon[j];
+			const Vector2 segment_b = polygon[(j + 1) % polygon.size()];
+			Vector2 closest_point = Geometry2D::get_closest_point_to_segment(point, segment_a, segment_b);
 			float distance = closest_point.distance_to(point);
 			if (distance < grab_threshold / editor_zoom_widget->get_zoom() && distance < closest_distance) {
 				r_polygon_index = i;
@@ -474,8 +475,9 @@ void GenericTilePolygonEditor::_snap_to_tile_shape(Point2 &r_point, float &r_cur
 	// Snap to edges if we did not snap to vertices.
 	if (!snapped) {
 		for (int i = 0; i < polygon.size(); i++) {
-			Point2 segment[2] = { polygon[i], polygon[(i + 1) % polygon.size()] };
-			Point2 point = Geometry2D::get_closest_point_to_segment(r_point, segment);
+			const Vector2 segment_a = polygon[i];
+			const Vector2 segment_b = polygon[(i + 1) % polygon.size()];
+			Point2 point = Geometry2D::get_closest_point_to_segment(r_point, segment_a, segment_b);
 			float distance = r_point.distance_to(point);
 			if (distance < p_snap_dist && distance < r_current_snapped_dist) {
 				snapped_point = point;
@@ -834,7 +836,7 @@ void GenericTilePolygonEditor::remove_polygon(int p_index) {
 	ERR_FAIL_INDEX(p_index, (int)polygons.size());
 	polygons.remove_at(p_index);
 
-	if (polygons.size() == 0) {
+	if (polygons.is_empty()) {
 		button_create->set_pressed(true);
 	}
 	base_control->queue_redraw();
@@ -922,6 +924,7 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
 	button_expand->set_toggle_mode(true);
 	button_expand->set_pressed(false);
 	button_expand->set_tooltip_text(TTR("Expand editor"));
+	button_expand->set_accessibility_name(TTRC("Expand editor"));
 	button_expand->connect(SceneStringName(toggled), callable_mp(this, &GenericTilePolygonEditor::_toggle_expand));
 	toolbar->add_child(button_expand);
 
@@ -933,6 +936,7 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
 	button_create->set_button_group(tools_button_group);
 	button_create->set_pressed(true);
 	button_create->set_tooltip_text(TTR("Add polygon tool"));
+	button_create->set_accessibility_name(TTRC("Add Points"));
 	toolbar->add_child(button_create);
 
 	button_edit = memnew(Button);
@@ -940,6 +944,7 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
 	button_edit->set_toggle_mode(true);
 	button_edit->set_button_group(tools_button_group);
 	button_edit->set_tooltip_text(TTR("Edit points tool"));
+	button_edit->set_accessibility_name(TTRC("Edit Points"));
 	toolbar->add_child(button_edit);
 
 	button_delete = memnew(Button);
@@ -947,10 +952,12 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
 	button_delete->set_toggle_mode(true);
 	button_delete->set_button_group(tools_button_group);
 	button_delete->set_tooltip_text(TTR("Delete points tool"));
+	button_delete->set_accessibility_name(TTRC("Delete Points"));
 	toolbar->add_child(button_delete);
 
 	button_advanced_menu = memnew(MenuButton);
 	button_advanced_menu->set_flat(false);
+	button_advanced_menu->set_accessibility_name(TTRC("Advanced"));
 	button_advanced_menu->set_theme_type_variation("FlatMenuButton");
 	button_advanced_menu->set_toggle_mode(true);
 	button_advanced_menu->get_popup()->add_item(TTR("Reset to default tile shape"), RESET_TO_DEFAULT_TILE, Key::F);
@@ -969,6 +976,7 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
 	button_pixel_snap = memnew(MenuButton);
 	toolbar->add_child(button_pixel_snap);
 	button_pixel_snap->set_flat(false);
+	button_pixel_snap->set_accessibility_name(TTRC("Snap"));
 	button_pixel_snap->set_theme_type_variation("FlatMenuButton");
 	button_pixel_snap->set_tooltip_text(TTR("Toggle Grid Snap"));
 	button_pixel_snap->get_popup()->add_item(TTR("Disable Snap"), SNAP_NONE);
@@ -978,6 +986,7 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
 
 	snap_subdivision = memnew(SpinBox);
 	toolbar->add_child(snap_subdivision);
+	snap_subdivision->set_accessibility_name(TTRC("Subdivision"));
 	snap_subdivision->get_line_edit()->add_theme_constant_override("minimum_character_width", 2);
 	snap_subdivision->set_min(1);
 	snap_subdivision->set_max(99);
@@ -1017,6 +1026,7 @@ GenericTilePolygonEditor::GenericTilePolygonEditor() {
 	button_center_view->connect(SceneStringName(pressed), callable_mp(this, &GenericTilePolygonEditor::_center_view));
 	button_center_view->set_theme_type_variation(SceneStringName(FlatButton));
 	button_center_view->set_tooltip_text(TTR("Center View"));
+	button_center_view->set_accessibility_name(TTRC("Center View"));
 	button_center_view->set_disabled(true);
 	root->add_child(button_center_view);
 
@@ -1482,8 +1492,7 @@ void TileDataOcclusionShapeEditor::draw_over_tile(CanvasItem *p_canvas_item, Tra
 	}
 	color.a *= 0.5;
 
-	Vector<Color> debug_occlusion_color;
-	debug_occlusion_color.push_back(color);
+	Vector<Color> debug_occlusion_color = { color };
 
 	RenderingServer::get_singleton()->canvas_item_add_set_transform(p_canvas_item->get_canvas_item(), p_transform);
 	for (int i = 0; i < tile_data->get_occluder_polygons_count(occlusion_layer); i++) {
@@ -2064,14 +2073,12 @@ void TileDataTerrainsEditor::forward_draw_over_atlas(TileAtlasView *p_tile_atlas
 		}
 
 		Vector2 end = p_transform.affine_inverse().xform(p_canvas_item->get_local_mouse_position());
-		Vector<Point2> mouse_pos_rect_polygon;
-		mouse_pos_rect_polygon.push_back(drag_start_pos);
-		mouse_pos_rect_polygon.push_back(Vector2(end.x, drag_start_pos.y));
-		mouse_pos_rect_polygon.push_back(end);
-		mouse_pos_rect_polygon.push_back(Vector2(drag_start_pos.x, end.y));
+		Vector<Point2> mouse_pos_rect_polygon = {
+			drag_start_pos, Vector2(end.x, drag_start_pos.y),
+			end, Vector2(drag_start_pos.x, end.y)
+		};
 
-		Vector<Color> color;
-		color.push_back(Color(1.0, 1.0, 1.0, 0.5));
+		Vector<Color> color = { Color(1.0, 1.0, 1.0, 0.5) };
 
 		p_canvas_item->draw_set_transform_matrix(p_transform);
 
@@ -2131,8 +2138,7 @@ void TileDataTerrainsEditor::forward_draw_over_alternatives(TileAtlasView *p_til
 				Transform2D xform;
 				xform.set_origin(position);
 
-				Vector<Color> color;
-				color.push_back(Color(1.0, 1.0, 1.0, 0.5));
+				Vector<Color> color = { Color(1.0, 1.0, 1.0, 0.5) };
 
 				Vector<Vector2> polygon = tile_set->get_terrain_polygon(terrain_set);
 				if (Geometry2D::is_point_in_polygon(xform.affine_inverse().xform(mouse_pos), polygon)) {
@@ -2547,11 +2553,10 @@ void TileDataTerrainsEditor::forward_painting_atlas_gui_input(TileAtlasView *p_t
 						}
 					}
 
-					Vector<Point2> mouse_pos_rect_polygon;
-					mouse_pos_rect_polygon.push_back(drag_start_pos);
-					mouse_pos_rect_polygon.push_back(Vector2(mb->get_position().x, drag_start_pos.y));
-					mouse_pos_rect_polygon.push_back(mb->get_position());
-					mouse_pos_rect_polygon.push_back(Vector2(drag_start_pos.x, mb->get_position().y));
+					Vector<Point2> mouse_pos_rect_polygon = {
+						drag_start_pos, Vector2(mb->get_position().x, drag_start_pos.y),
+						mb->get_position(), Vector2(drag_start_pos.x, mb->get_position().y)
+					};
 
 					undo_redo->create_action(TTR("Painting Terrain"));
 					for (const TileMapCell &E : edited) {
@@ -2883,6 +2888,7 @@ TileDataTerrainsEditor::TileDataTerrainsEditor() {
 	picker_button->set_theme_type_variation(SceneStringName(FlatButton));
 	picker_button->set_toggle_mode(true);
 	picker_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/picker"));
+	picker_button->set_accessibility_name(TTRC("Pick"));
 	toolbar->add_child(picker_button);
 
 	// Setup
@@ -3030,8 +3036,7 @@ void TileDataNavigationEditor::draw_over_tile(CanvasItem *p_canvas_item, Transfo
 			Color random_variation_color;
 			random_variation_color.set_hsv(color.get_h() + rand.random(-1.0, 1.0) * 0.05, color.get_s(), color.get_v() + rand.random(-1.0, 1.0) * 0.1);
 			random_variation_color.a = color.a;
-			Vector<Color> colors;
-			colors.push_back(random_variation_color);
+			Vector<Color> colors = { random_variation_color };
 
 			RenderingServer::get_singleton()->canvas_item_add_polygon(p_canvas_item->get_canvas_item(), vertices, colors);
 		}
diff --git a/engine/editor/plugins/tiles/tile_data_editors.h b/engine/editor/plugins/tiles/tile_data_editors.h
index e05e2cb3..eb88a2a7 100644
--- a/engine/editor/plugins/tiles/tile_data_editors.h
+++ b/engine/editor/plugins/tiles/tile_data_editors.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_DATA_EDITORS_H
-#define TILE_DATA_EDITORS_H
+#pragma once
 
 #include "tile_atlas_view.h"
 
@@ -415,5 +414,3 @@ public:
 
 	TileDataNavigationEditor();
 };
-
-#endif // TILE_DATA_EDITORS_H
diff --git a/engine/editor/plugins/tiles/tile_map_layer_editor.cpp b/engine/editor/plugins/tiles/tile_map_layer_editor.cpp
index e243faca..4bd0ae13 100644
--- a/engine/editor/plugins/tiles/tile_map_layer_editor.cpp
+++ b/engine/editor/plugins/tiles/tile_map_layer_editor.cpp
@@ -44,10 +44,28 @@
 
 #include "core/input/input.h"
 #include "core/math/geometry_2d.h"
+#include "core/math/random_pcg.h"
 #include "core/os/keyboard.h"
 
 TileMapLayer *TileMapLayerSubEditorPlugin::_get_edited_layer() const {
-	return Object::cast_to<TileMapLayer>(ObjectDB::get_instance(edited_tile_map_layer_id));
+	return ObjectDB::get_instance<TileMapLayer>(edited_tile_map_layer_id);
+}
+
+void TileMapLayerSubEditorPlugin::draw_tile_coords_over_viewport(Control *p_overlay, const TileMapLayer *p_edited_layer, Ref<TileSet> p_tile_set, bool p_show_rectangle_size, const Vector2i &p_rectangle_origin) {
+	Point2 msgpos = Point2(20 * EDSCALE, p_overlay->get_size().y - 20 * EDSCALE);
+	String text = p_tile_set->local_to_map(p_edited_layer->get_local_mouse_position());
+
+	if (p_show_rectangle_size) {
+		Vector2i rect_size = p_tile_set->local_to_map(p_edited_layer->get_local_mouse_position()) - p_tile_set->local_to_map(p_rectangle_origin);
+		text += vformat(" %s (%dx%d)", TTR("Drawing Rect:"), Math::abs(rect_size.x) + 1, Math::abs(rect_size.y) + 1);
+	}
+
+	Ref<Font> font = p_overlay->get_theme_font(SceneStringName(font), SNAME("Label"));
+	int font_size = p_overlay->get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
+
+	p_overlay->draw_string(font, msgpos + Point2(1, 1), text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
+	p_overlay->draw_string(font, msgpos + Point2(-1, -1), text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
+	p_overlay->draw_string(font, msgpos, text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(1, 1, 1, 1));
 }
 
 void TileMapLayerEditorTilesPlugin::tile_set_changed() {
@@ -66,7 +84,7 @@ void TileMapLayerEditorTilesPlugin::_on_scattering_spinbox_changed(double p_valu
 }
 
 void TileMapLayerEditorTilesPlugin::_update_toolbar() {
-	// Stop draggig if needed.
+	// Stop dragging if needed.
 	_stop_dragging();
 
 	// Hide all settings.
@@ -783,7 +801,7 @@ bool TileMapLayerEditorTilesPlugin::forward_canvas_gui_input(const Ref<InputEven
 }
 
 void TileMapLayerEditorTilesPlugin::forward_canvas_draw_over_viewport(Control *p_overlay) {
-	TileMapLayer *edited_layer = _get_edited_layer();
+	const TileMapLayer *edited_layer = _get_edited_layer();
 	if (!edited_layer) {
 		return;
 	}
@@ -1000,19 +1018,7 @@ void TileMapLayerEditorTilesPlugin::forward_canvas_draw_over_viewport(Control *p
 			}
 		}
 
-		Ref<Font> font = p_overlay->get_theme_font(SceneStringName(font), SNAME("Label"));
-		int font_size = p_overlay->get_theme_font_size(SceneStringName(font_size), SNAME("Label"));
-		Point2 msgpos = Point2(20 * EDSCALE, p_overlay->get_size().y - 20 * EDSCALE);
-
-		String text = tile_set->local_to_map(edited_layer->get_local_mouse_position());
-		if (drawing_rect) {
-			Vector2i size = tile_set->local_to_map(edited_layer->get_local_mouse_position()) - tile_set->local_to_map(drag_start_mouse_pos);
-			text += vformat(" %s (%dx%d)", TTR("Drawing Rect:"), ABS(size.x) + 1, ABS(size.y) + 1);
-		}
-
-		p_overlay->draw_string(font, msgpos + Point2(1, 1), text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
-		p_overlay->draw_string(font, msgpos + Point2(-1, -1), text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(0, 0, 0, 0.8));
-		p_overlay->draw_string(font, msgpos, text, HORIZONTAL_ALIGNMENT_LEFT, -1, font_size, Color(1, 1, 1, 1));
+		draw_tile_coords_over_viewport(p_overlay, edited_layer, tile_set, drawing_rect, drag_start_mouse_pos);
 	}
 }
 
@@ -2171,7 +2177,7 @@ void TileMapLayerEditorTilesPlugin::edit(ObjectID p_tile_map_layer_id) {
 		}
 	}
 
-	TileMapLayer *new_tile_map_layer = Object::cast_to<TileMapLayer>(ObjectDB::get_instance(edited_tile_map_layer_id));
+	TileMapLayer *new_tile_map_layer = ObjectDB::get_instance<TileMapLayer>(edited_tile_map_layer_id);
 	Ref<TileSet> new_tile_set;
 	if (new_tile_map_layer) {
 		new_tile_set = new_tile_map_layer->get_tile_set();
@@ -2213,6 +2219,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	select_tool_button->set_button_group(tool_buttons_group);
 	select_tool_button->set_shortcut(ED_SHORTCUT("tiles_editor/selection_tool", TTRC("Selection Tool"), Key::S));
 	select_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_toolbar));
+	select_tool_button->set_accessibility_name(TTRC("Selection Tool"));
 	tilemap_tiles_tools_buttons->add_child(select_tool_button);
 	viewport_shortcut_buttons.push_back(select_tool_button);
 
@@ -2223,6 +2230,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	paint_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/paint_tool"));
 	paint_tool_button->set_tooltip_text(TTR("Shift: Draw line.") + "\n" + keycode_get_string((Key)KeyModifierMask::CMD_OR_CTRL) + TTR("Shift: Draw rectangle."));
 	paint_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_toolbar));
+	paint_tool_button->set_accessibility_name(TTRC("Paint Tool"));
 	tilemap_tiles_tools_buttons->add_child(paint_tool_button);
 	viewport_shortcut_buttons.push_back(paint_tool_button);
 
@@ -2233,6 +2241,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	// TRANSLATORS: This refers to the line tool in the tilemap editor.
 	line_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/line_tool"));
 	line_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_toolbar));
+	line_tool_button->set_accessibility_name(TTRC("Line Tool"));
 	tilemap_tiles_tools_buttons->add_child(line_tool_button);
 	viewport_shortcut_buttons.push_back(line_tool_button);
 
@@ -2242,6 +2251,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	rect_tool_button->set_button_group(tool_buttons_group);
 	rect_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/rect_tool"));
 	rect_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_toolbar));
+	rect_tool_button->set_accessibility_name(TTRC("Rect Tool"));
 	tilemap_tiles_tools_buttons->add_child(rect_tool_button);
 	viewport_shortcut_buttons.push_back(rect_tool_button);
 
@@ -2251,6 +2261,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	bucket_tool_button->set_button_group(tool_buttons_group);
 	bucket_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/bucket_tool"));
 	bucket_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_update_toolbar));
+	bucket_tool_button->set_accessibility_name(TTRC("Bucket Tool"));
 	tilemap_tiles_tools_buttons->add_child(bucket_tool_button);
 	toolbar->add_child(tilemap_tiles_tools_buttons);
 	viewport_shortcut_buttons.push_back(bucket_tool_button);
@@ -2270,6 +2281,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	Key key = (OS::get_singleton()->has_feature("macos") || OS::get_singleton()->has_feature("web_macos") || OS::get_singleton()->has_feature("web_ios")) ? Key::META : Key::CTRL;
 	picker_button->set_tooltip_text(vformat(TTR("Alternatively hold %s with other tools to pick tile."), find_keycode_name(key)));
 	picker_button->connect(SceneStringName(pressed), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
+	picker_button->set_accessibility_name(TTRC("Pick"));
 	tools_settings->add_child(picker_button);
 	viewport_shortcut_buttons.push_back(picker_button);
 
@@ -2280,6 +2292,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	erase_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/eraser"));
 	erase_button->set_tooltip_text(TTRC("Alternatively use RMB to erase tiles."));
 	erase_button->connect(SceneStringName(pressed), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
+	erase_button->set_accessibility_name(TTRC("Erase"));
 	tools_settings->add_child(erase_button);
 	viewport_shortcut_buttons.push_back(erase_button);
 
@@ -2293,6 +2306,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	transform_button_rotate_left->set_shortcut(ED_SHORTCUT("tiles_editor/rotate_tile_left", TTRC("Rotate Tile Left"), Key::Z));
 	transform_toolbar->add_child(transform_button_rotate_left);
 	transform_button_rotate_left->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_ROTATE_LEFT));
+	transform_button_rotate_left->set_accessibility_name(TTRC("Rotate Tile Left"));
 	viewport_shortcut_buttons.push_back(transform_button_rotate_left);
 
 	transform_button_rotate_right = memnew(Button);
@@ -2300,6 +2314,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	transform_button_rotate_right->set_shortcut(ED_SHORTCUT("tiles_editor/rotate_tile_right", TTRC("Rotate Tile Right"), Key::X));
 	transform_toolbar->add_child(transform_button_rotate_right);
 	transform_button_rotate_right->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_ROTATE_RIGHT));
+	transform_button_rotate_right->set_accessibility_name(TTRC("Rotate Tile Right"));
 	viewport_shortcut_buttons.push_back(transform_button_rotate_right);
 
 	transform_button_flip_h = memnew(Button);
@@ -2307,6 +2322,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	transform_button_flip_h->set_shortcut(ED_SHORTCUT("tiles_editor/flip_tile_horizontal", TTRC("Flip Tile Horizontally"), Key::C));
 	transform_toolbar->add_child(transform_button_flip_h);
 	transform_button_flip_h->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_FLIP_H));
+	transform_button_flip_h->set_accessibility_name(TTRC("Flip Tile Horizontally"));
 	viewport_shortcut_buttons.push_back(transform_button_flip_h);
 
 	transform_button_flip_v = memnew(Button);
@@ -2314,6 +2330,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	transform_button_flip_v->set_shortcut(ED_SHORTCUT("tiles_editor/flip_tile_vertical", TTRC("Flip Tile Vertically"), Key::V));
 	transform_toolbar->add_child(transform_button_flip_v);
 	transform_button_flip_v->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_apply_transform).bind(TRANSFORM_FLIP_V));
+	transform_button_flip_v->set_accessibility_name(TTRC("Flip Tile Vertically"));
 	viewport_shortcut_buttons.push_back(transform_button_flip_v);
 
 	// Separator 2.
@@ -2333,6 +2350,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	random_tile_toggle->set_toggle_mode(true);
 	random_tile_toggle->set_tooltip_text(TTR("Place Random Tile"));
 	random_tile_toggle->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditorTilesPlugin::_on_random_tile_checkbox_toggled));
+	random_tile_toggle->set_accessibility_name(TTRC("Place Random Tile"));
 	tools_settings->add_child(random_tile_toggle);
 
 	// Random tile scattering.
@@ -2350,6 +2368,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	scatter_spinbox->set_tooltip_text(TTR("Modifies the chance of painting nothing instead of a randomly selected tile."));
 	scatter_spinbox->get_line_edit()->add_theme_constant_override("minimum_character_width", 4);
 	scatter_spinbox->connect(SceneStringName(value_changed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_on_scattering_spinbox_changed));
+	scatter_spinbox->set_accessibility_name(TTRC("Scattering"));
 	scatter_controls_container->add_child(scatter_spinbox);
 	tools_settings->add_child(scatter_controls_container);
 
@@ -2371,6 +2390,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 
 	missing_source_label = memnew(Label);
 	missing_source_label->set_text(TTR("This TileMap's TileSet has no Tile Source configured. Go to the TileSet bottom panel to add one."));
+	missing_source_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 	missing_source_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	missing_source_label->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	missing_source_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
@@ -2397,6 +2417,7 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 	source_sort_button->set_flat(false);
 	source_sort_button->set_theme_type_variation("FlatMenuButton");
 	source_sort_button->set_tooltip_text(TTR("Sort sources"));
+	source_sort_button->set_accessibility_name(TTRC("Sort sources"));
 
 	PopupMenu *p = source_sort_button->get_popup();
 	p->connect(SceneStringName(id_pressed), callable_mp(this, &TileMapLayerEditorTilesPlugin::_set_source_sort));
@@ -2489,17 +2510,15 @@ TileMapLayerEditorTilesPlugin::TileMapLayerEditorTilesPlugin() {
 
 	patterns_help_label = memnew(Label);
 	patterns_help_label->set_text(TTR("Drag and drop or paste a TileMap selection here to store a pattern."));
+	patterns_help_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 	patterns_help_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
-	patterns_help_label->set_anchors_and_offsets_preset(Control::PRESET_CENTER);
+	patterns_help_label->set_anchors_and_offsets_preset(Control::PRESET_HCENTER_WIDE);
 	patterns_item_list->add_child(patterns_help_label);
 
 	// Update.
 	_update_source_display();
 }
 
-TileMapLayerEditorTilesPlugin::~TileMapLayerEditorTilesPlugin() {
-}
-
 void TileMapLayerEditorTerrainsPlugin::tile_set_changed() {
 	_update_terrains_cache();
 	_update_terrains_tree();
@@ -3169,6 +3188,7 @@ void TileMapLayerEditorTerrainsPlugin::forward_canvas_draw_over_viewport(Control
 	Transform2D xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * edited_layer->get_global_transform_with_canvas();
 	Vector2 mpos = edited_layer->get_local_mouse_position();
 	Vector2i tile_shape_size = tile_set->get_tile_size();
+	bool drawing_rect = false;
 
 	// Handle the preview of the tiles to be placed.
 	if (main_vbox_container->is_visible_in_tree() && has_mouse) { // Only if the tilemap editor is opened and the viewport is hovered.
@@ -3215,6 +3235,8 @@ void TileMapLayerEditorTerrainsPlugin::forward_canvas_draw_over_viewport(Control
 						preview.insert(Vector2i(x, y));
 					}
 				}
+
+				drawing_rect = !preview.is_empty();
 				expand_grid = true;
 			} else if (tool_buttons_group->get_pressed_button() == bucket_tool_button && drag_type == DRAG_TYPE_NONE) {
 				// Preview for a fill.
@@ -3273,6 +3295,8 @@ void TileMapLayerEditorTerrainsPlugin::forward_canvas_draw_over_viewport(Control
 				}
 			}
 		}
+
+		draw_tile_coords_over_viewport(p_overlay, edited_layer, tile_set, drawing_rect, drag_start_mouse_pos);
 	}
 }
 
@@ -3561,6 +3585,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	paint_tool_button->set_pressed(true);
 	paint_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/paint_tool"));
 	paint_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTerrainsPlugin::_update_toolbar));
+	paint_tool_button->set_accessibility_name(TTRC("Paint Tool"));
 	tilemap_tiles_tools_buttons->add_child(paint_tool_button);
 	viewport_shortcut_buttons.push_back(paint_tool_button);
 
@@ -3570,6 +3595,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	line_tool_button->set_button_group(tool_buttons_group);
 	line_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/line_tool"));
 	line_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTerrainsPlugin::_update_toolbar));
+	line_tool_button->set_accessibility_name(TTRC("Line Tool"));
 	tilemap_tiles_tools_buttons->add_child(line_tool_button);
 	viewport_shortcut_buttons.push_back(line_tool_button);
 
@@ -3579,6 +3605,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	rect_tool_button->set_button_group(tool_buttons_group);
 	rect_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/rect_tool"));
 	rect_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTerrainsPlugin::_update_toolbar));
+	rect_tool_button->set_accessibility_name(TTRC("Rect Tool"));
 	tilemap_tiles_tools_buttons->add_child(rect_tool_button);
 	viewport_shortcut_buttons.push_back(rect_tool_button);
 
@@ -3588,6 +3615,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	bucket_tool_button->set_button_group(tool_buttons_group);
 	bucket_tool_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/bucket_tool"));
 	bucket_tool_button->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditorTerrainsPlugin::_update_toolbar));
+	bucket_tool_button->set_accessibility_name(TTRC("Bucket Tool"));
 	tilemap_tiles_tools_buttons->add_child(bucket_tool_button);
 	viewport_shortcut_buttons.push_back(bucket_tool_button);
 
@@ -3606,6 +3634,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	picker_button->set_toggle_mode(true);
 	picker_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/picker"));
 	picker_button->connect(SceneStringName(pressed), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
+	picker_button->set_accessibility_name(TTRC("Pick"));
 	tools_settings->add_child(picker_button);
 	viewport_shortcut_buttons.push_back(picker_button);
 
@@ -3615,6 +3644,7 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	erase_button->set_toggle_mode(true);
 	erase_button->set_shortcut(ED_GET_SHORTCUT("tiles_editor/eraser"));
 	erase_button->connect(SceneStringName(pressed), callable_mp(CanvasItemEditor::get_singleton(), &CanvasItemEditor::update_viewport));
+	erase_button->set_accessibility_name(TTRC("Erase"));
 	tools_settings->add_child(erase_button);
 	viewport_shortcut_buttons.push_back(erase_button);
 
@@ -3630,11 +3660,8 @@ TileMapLayerEditorTerrainsPlugin::TileMapLayerEditorTerrainsPlugin() {
 	tools_settings->add_child(bucket_contiguous_checkbox);
 }
 
-TileMapLayerEditorTerrainsPlugin::~TileMapLayerEditorTerrainsPlugin() {
-}
-
 TileMapLayer *TileMapLayerEditor::_get_edited_layer() const {
-	return Object::cast_to<TileMapLayer>(ObjectDB::get_instance(edited_tile_map_layer_id));
+	return ObjectDB::get_instance<TileMapLayer>(edited_tile_map_layer_id);
 }
 
 void TileMapLayerEditor::_find_tile_map_layers_in_scene(Node *p_current, const Node *p_owner, Vector<TileMapLayer *> &r_list) const {
@@ -4033,18 +4060,18 @@ Vector<Vector2i> TileMapLayerEditor::get_line(const TileMapLayer *p_tile_map_lay
 		}
 
 		Vector2i delta = p_to_cell - p_from_cell;
-		delta = Vector2i(2 * delta.x + ABS(p_to_cell.y % 2) - ABS(p_from_cell.y % 2), delta.y);
+		delta = Vector2i(2 * delta.x + Math::abs(p_to_cell.y % 2) - Math::abs(p_from_cell.y % 2), delta.y);
 		Vector2i sign = delta.sign();
 
 		Vector2i current = p_from_cell;
 		points.push_back(TileSet::transform_coords_layout(transposed ? Vector2i(current.y, current.x) : current, tile_set->get_tile_offset_axis(), TileSet::TILE_LAYOUT_STACKED, tile_set->get_tile_layout()));
 
 		int err = 0;
-		if (ABS(delta.y) < ABS(delta.x)) {
+		if (Math::abs(delta.y) < Math::abs(delta.x)) {
 			Vector2i err_step = 3 * delta.abs();
 			while (current != p_to_cell) {
 				err += err_step.y;
-				if (err > ABS(delta.x)) {
+				if (err > Math::abs(delta.x)) {
 					if (sign.x == 0) {
 						current += Vector2(sign.y, 0);
 					} else {
@@ -4113,6 +4140,7 @@ void TileMapLayerEditor::_tab_changed(int p_tab_id) {
 	// Graphical update.
 	tabs_data[tabs_bar->get_current_tab()].panel->queue_redraw();
 	CanvasItemEditor::get_singleton()->update_viewport();
+	_update_bottom_panel();
 }
 
 void TileMapLayerEditor::_layers_select_next_or_previous(bool p_next) {
@@ -4277,10 +4305,7 @@ void TileMapLayerEditor::forward_canvas_draw_over_viewport(Control *p_overlay) {
 
 			if (!source || !source->has_tile(tile_atlas_coords) || !source->has_alternative_tile(tile_atlas_coords, tile_alternative_tile)) {
 				// Generate a random color from the hashed identifier of the tiles.
-				Array to_hash;
-				to_hash.push_back(tile_source_id);
-				to_hash.push_back(tile_atlas_coords);
-				to_hash.push_back(tile_alternative_tile);
+				Array to_hash = { tile_source_id, tile_atlas_coords, tile_alternative_tile };
 				uint32_t hash = RandomPCG(to_hash.hash()).rand();
 
 				Color color;
@@ -4471,18 +4496,21 @@ TileMapLayerEditor::TileMapLayerEditor() {
 	layers_selection_button->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
 	layers_selection_button->set_tooltip_text(TTR("TileMap Layers"));
 	layers_selection_button->connect(SceneStringName(item_selected), callable_mp(this, &TileMapLayerEditor::_layers_selection_item_selected));
+	layers_selection_button->set_accessibility_name(TTRC("TileMap Layers"));
 	layer_selection_hbox->add_child(layers_selection_button);
 
 	select_previous_layer = memnew(Button);
 	select_previous_layer->set_theme_type_variation(SceneStringName(FlatButton));
 	select_previous_layer->set_tooltip_text(TTR("Select previous layer"));
 	select_previous_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_previous_layer_pressed));
+	select_previous_layer->set_accessibility_name(TTRC("Previous"));
 	layer_selection_hbox->add_child(select_previous_layer);
 
 	select_next_layer = memnew(Button);
 	select_next_layer->set_theme_type_variation(SceneStringName(FlatButton));
 	select_next_layer->set_tooltip_text(TTR("Select next layer"));
 	select_next_layer->connect(SceneStringName(pressed), callable_mp(this, &TileMapLayerEditor::_select_next_layer_pressed));
+	select_next_layer->set_accessibility_name(TTRC("Next"));
 	layer_selection_hbox->add_child(select_next_layer);
 
 	select_all_layers = memnew(Button);
@@ -4498,6 +4526,7 @@ TileMapLayerEditor::TileMapLayerEditor() {
 	toggle_highlight_selected_layer_button->set_toggle_mode(true);
 	toggle_highlight_selected_layer_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_highlight_selected_layer_button_toggled));
 	toggle_highlight_selected_layer_button->set_tooltip_text(TTR("Highlight Selected TileMap Layer"));
+	toggle_highlight_selected_layer_button->set_accessibility_name(TTRC("Highlight Selected TileMap Layer"));
 	tile_map_toolbar->add_child(toggle_highlight_selected_layer_button);
 
 	tile_map_toolbar->add_child(memnew(VSeparator));
@@ -4508,11 +4537,13 @@ TileMapLayerEditor::TileMapLayerEditor() {
 	toggle_grid_button->set_toggle_mode(true);
 	toggle_grid_button->set_tooltip_text(TTR("Toggle grid visibility."));
 	toggle_grid_button->connect(SceneStringName(toggled), callable_mp(this, &TileMapLayerEditor::_on_grid_toggled));
+	toggle_grid_button->set_accessibility_name(TTRC("Grid"));
 	tile_map_toolbar->add_child(toggle_grid_button);
 
 	// Advanced settings menu button.
 	advanced_menu_button = memnew(MenuButton);
 	advanced_menu_button->set_flat(false);
+	advanced_menu_button->set_accessibility_name(TTRC("Advanced"));
 	advanced_menu_button->set_theme_type_variation(SceneStringName(FlatButton));
 	advanced_menu_button->get_popup()->add_item(TTR("Automatically Replace Tiles with Proxies"), ADVANCED_MENU_REPLACE_WITH_PROXIES);
 	advanced_menu_button->get_popup()->add_item(TTR("Extract TileMap layers as individual TileMapLayer nodes"), ADVANCED_MENU_EXTRACT_TILE_MAP_LAYERS);
@@ -4521,6 +4552,8 @@ TileMapLayerEditor::TileMapLayerEditor() {
 
 	// A label for editing errors.
 	cant_edit_label = memnew(Label);
+	cant_edit_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
+	cant_edit_label->set_anchors_and_offsets_preset(Control::PRESET_HCENTER_WIDE);
 	cant_edit_label->set_h_size_flags(SIZE_EXPAND_FILL);
 	cant_edit_label->set_v_size_flags(SIZE_EXPAND_FILL);
 	cant_edit_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
diff --git a/engine/editor/plugins/tiles/tile_map_layer_editor.h b/engine/editor/plugins/tiles/tile_map_layer_editor.h
index 1eee26c0..1abc6890 100644
--- a/engine/editor/plugins/tiles/tile_map_layer_editor.h
+++ b/engine/editor/plugins/tiles/tile_map_layer_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_MAP_LAYER_EDITOR_H
-#define TILE_MAP_LAYER_EDITOR_H
+#pragma once
 
 #include "tile_atlas_view.h"
 
@@ -68,6 +67,7 @@ public:
 	virtual void forward_canvas_draw_over_viewport(Control *p_overlay) {}
 	virtual void tile_set_changed() {}
 	virtual void edit(ObjectID p_tile_map_layer_id) {}
+	virtual void draw_tile_coords_over_viewport(Control *p_overlay, const TileMapLayer *p_edited_layer, Ref<TileSet> p_tile_set, bool p_show_rectangle_size, const Vector2i &p_rectangle_origin);
 };
 
 class TileMapLayerEditorTilesPlugin : public TileMapLayerSubEditorPlugin {
@@ -240,7 +240,6 @@ public:
 	virtual void edit(ObjectID p_tile_map_layer_id) override;
 
 	TileMapLayerEditorTilesPlugin();
-	~TileMapLayerEditorTilesPlugin();
 };
 
 class TileMapLayerEditorTerrainsPlugin : public TileMapLayerSubEditorPlugin {
@@ -332,7 +331,6 @@ public:
 	virtual void edit(ObjectID p_tile_map_layer_id) override;
 
 	TileMapLayerEditorTerrainsPlugin();
-	~TileMapLayerEditorTerrainsPlugin();
 };
 
 class TileMapLayerEditor : public VBoxContainer {
@@ -422,5 +420,3 @@ public:
 	// Static functions.
 	static Vector<Vector2i> get_line(const TileMapLayer *p_tile_map_layer, Vector2i p_from_cell, Vector2i p_to_cell);
 };
-
-#endif // TILE_MAP_LAYER_EDITOR_H
diff --git a/engine/editor/plugins/tiles/tile_proxies_manager_dialog.h b/engine/editor/plugins/tiles/tile_proxies_manager_dialog.h
index fbbdb0d6..0408f7da 100644
--- a/engine/editor/plugins/tiles/tile_proxies_manager_dialog.h
+++ b/engine/editor/plugins/tiles/tile_proxies_manager_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_PROXIES_MANAGER_DIALOG_H
-#define TILE_PROXIES_MANAGER_DIALOG_H
+#pragma once
 
 #include "editor/editor_properties.h"
 #include "scene/gui/dialogs.h"
@@ -85,5 +84,3 @@ public:
 
 	TileProxiesManagerDialog();
 };
-
-#endif // TILE_PROXIES_MANAGER_DIALOG_H
diff --git a/engine/editor/plugins/tiles/tile_set_atlas_source_editor.cpp b/engine/editor/plugins/tiles/tile_set_atlas_source_editor.cpp
index 80958b20..c56d97e6 100644
--- a/engine/editor/plugins/tiles/tile_set_atlas_source_editor.cpp
+++ b/engine/editor/plugins/tiles/tile_set_atlas_source_editor.cpp
@@ -463,13 +463,13 @@ void TileSetAtlasSourceEditor::AtlasTileProxyObject::_get_property_list(List<Pro
 		tile_data->get_property_list(&list);
 
 		HashMap<String, int> counts; // Counts the number of time a property appears (useful for groups that may appear more than once)
-		for (List<PropertyInfo>::Element *E_property = list.front(); E_property; E_property = E_property->next()) {
+		for (const PropertyInfo &property : list) {
 			// Don't show category for TileData.
-			if (E_property->get().usage & PROPERTY_USAGE_CATEGORY) {
+			if (property.usage & PROPERTY_USAGE_CATEGORY) {
 				continue;
 			}
 
-			const String &property_string = E_property->get().name;
+			const String &property_string = property.name;
 			if (!tile_data->is_allowing_transform() && (property_string == "flip_h" || property_string == "flip_v" || property_string == "transpose")) {
 				continue;
 			}
@@ -480,7 +480,7 @@ void TileSetAtlasSourceEditor::AtlasTileProxyObject::_get_property_list(List<Pro
 				counts[property_string] += 1;
 			}
 
-			PropertyInfo stored_property_info = E_property->get();
+			PropertyInfo stored_property_info = property;
 			stored_property_info.usage |= PROPERTY_USAGE_STORAGE; // Ignore the storage flag in comparing properties.
 
 			PropertyId id = { counts[property_string], property_string };
@@ -968,7 +968,15 @@ void TileSetAtlasSourceEditor::_update_atlas_view() {
 	if (tile_set.is_null()) {
 		return;
 	} else {
-		tile_create_help->set_visible(tools_button_group->get_pressed_button() == tool_setup_atlas_source_button);
+		if (tools_button_group->get_pressed_button() == tool_setup_atlas_source_button) {
+			help_label->set_visible(true);
+			help_label->set_text(TTR("Hold Ctrl to create multiple tiles.") + "\n" + TTR("Hold Shift to create big tiles."));
+		} else if (tools_button_group->get_pressed_button() == tool_select_button) {
+			help_label->set_visible(true);
+			help_label->set_text(TTRC("Hold Shift to select multiple regions."));
+		} else {
+			help_label->set_visible(false);
+		}
 	}
 
 	if (tools_button_group->get_pressed_button() != tool_paint_button) {
@@ -1465,9 +1473,7 @@ void TileSetAtlasSourceEditor::_end_dragging() {
 				undo_redo->add_do_method(tile_set_atlas_source, "move_tile_in_atlas", drag_start_tile_shape.position, drag_current_tile, tile_set_atlas_source->get_tile_size_in_atlas(drag_current_tile));
 				undo_redo->add_do_method(this, "_set_selection_from_array", _get_selection_as_array());
 				undo_redo->add_undo_method(tile_set_atlas_source, "move_tile_in_atlas", drag_current_tile, drag_start_tile_shape.position, drag_start_tile_shape.size);
-				Array array;
-				array.push_back(drag_start_tile_shape.position);
-				array.push_back(0);
+				Array array = { drag_start_tile_shape.position, 0 };
 				undo_redo->add_undo_method(this, "_set_selection_from_array", array);
 				undo_redo->commit_action(false);
 			}
@@ -1565,9 +1571,7 @@ void TileSetAtlasSourceEditor::_end_dragging() {
 				undo_redo->add_do_method(tile_set_atlas_source, "move_tile_in_atlas", drag_start_tile_shape.position, drag_current_tile, tile_set_atlas_source->get_tile_size_in_atlas(drag_current_tile));
 				undo_redo->add_do_method(this, "_set_selection_from_array", _get_selection_as_array());
 				undo_redo->add_undo_method(tile_set_atlas_source, "move_tile_in_atlas", drag_current_tile, drag_start_tile_shape.position, drag_start_tile_shape.size);
-				Array array;
-				array.push_back(drag_start_tile_shape.position);
-				array.push_back(0);
+				Array array = { drag_start_tile_shape.position, 0 };
 				undo_redo->add_undo_method(this, "_set_selection_from_array", array);
 				undo_redo->commit_action(false);
 			}
@@ -1656,9 +1660,7 @@ void TileSetAtlasSourceEditor::_menu_option(int p_option) {
 		case TILE_CREATE: {
 			undo_redo->create_action(TTR("Create a tile"));
 			undo_redo->add_do_method(tile_set_atlas_source, "create_tile", menu_option_coords);
-			Array array;
-			array.push_back(menu_option_coords);
-			array.push_back(0);
+			Array array = { menu_option_coords, 0 };
 			undo_redo->add_do_method(this, "_set_selection_from_array", array);
 			undo_redo->add_undo_method(tile_set_atlas_source, "remove_tile", menu_option_coords);
 			undo_redo->add_undo_method(this, "_set_selection_from_array", _get_selection_as_array());
@@ -2685,18 +2687,12 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() {
 	tile_atlas_view->connect("transform_changed", callable_mp(this, &TileSetAtlasSourceEditor::_tile_atlas_view_transform_changed).unbind(2));
 	right_panel->add_child(tile_atlas_view);
 
-	tile_create_help = memnew(VBoxContainer);
-	tile_atlas_view->add_child(tile_create_help);
-	tile_create_help->set_mouse_filter(MOUSE_FILTER_IGNORE);
-
-	Label *help_label = memnew(Label(TTR("Hold Ctrl to create multiple tiles.")));
-	tile_create_help->add_child(help_label);
-
-	help_label = memnew(Label(TTR("Hold Shift to create big tiles.")));
-	tile_create_help->add_child(help_label);
-
-	tile_create_help->set_anchors_and_offsets_preset(Control::PRESET_BOTTOM_LEFT, Control::PRESET_MODE_MINSIZE, 8);
-	tile_create_help->set_grow_direction_preset(Control::PRESET_BOTTOM_LEFT);
+	help_label = memnew(Label);
+	help_label->set_mouse_filter(MOUSE_FILTER_IGNORE);
+	help_label->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
+	help_label->set_vertical_alignment(VERTICAL_ALIGNMENT_BOTTOM);
+	help_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
+	tile_atlas_view->add_child(help_label);
 
 	base_tile_popup_menu = memnew(PopupMenu);
 	base_tile_popup_menu->add_shortcut(ED_GET_SHORTCUT("tiles_editor/delete"), TILE_DELETE);
@@ -2768,7 +2764,7 @@ TileSetAtlasSourceEditor::~TileSetAtlasSourceEditor() {
 
 void EditorPropertyTilePolygon::_add_focusable_children(Node *p_node) {
 	Control *control = Object::cast_to<Control>(p_node);
-	if (control && control->get_focus_mode() != Control::FOCUS_NONE) {
+	if (control && control->get_focus_mode_with_recursive() != Control::FOCUS_NONE) {
 		add_focusable(control);
 	}
 	for (int i = 0; i < p_node->get_child_count(); i++) {
@@ -2801,11 +2797,9 @@ void EditorPropertyTilePolygon::_polygons_changed() {
 		}
 	} else {
 		// Multiple array of vertices or OccluderPolygon2D.
-		Vector<String> changed_properties;
-		Array values;
+		Vector<String> changed_properties = { count_property };
 		int count = generic_tile_polygon_editor->get_polygon_count();
-		changed_properties.push_back(count_property);
-		values.push_back(count);
+		Array values = { count };
 		for (int i = 0; i < count; i++) {
 			changed_properties.push_back(vformat(element_pattern, i));
 			if (base_type.is_empty()) {
@@ -2939,8 +2933,7 @@ bool EditorInspectorPluginTileData::parse_property(Object *p_object, const Varia
 		if (components[1] == "polygons_count") {
 			EditorPropertyTilePolygon *ep = memnew(EditorPropertyTilePolygon);
 			ep->setup_multiple_mode(vformat("physics_layer_%d/polygons", layer_index), vformat("physics_layer_%d/polygons_count", layer_index), vformat("physics_layer_%d/polygon_%%d/points", layer_index), "");
-			Vector<String> properties;
-			properties.push_back(p_path);
+			Vector<String> properties = { p_path };
 			int count = p_object->get(vformat("physics_layer_%d/polygons_count", layer_index));
 			for (int i = 0; i < count; i++) {
 				properties.push_back(vformat(vformat("physics_layer_%d/polygon_%d/points", layer_index, i)));
diff --git a/engine/editor/plugins/tiles/tile_set_atlas_source_editor.h b/engine/editor/plugins/tiles/tile_set_atlas_source_editor.h
index b729364d..bb0c5e04 100644
--- a/engine/editor/plugins/tiles/tile_set_atlas_source_editor.h
+++ b/engine/editor/plugins/tiles/tile_set_atlas_source_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_SET_ATLAS_SOURCE_EDITOR_H
-#define TILE_SET_ATLAS_SOURCE_EDITOR_H
+#pragma once
 
 #include "tile_atlas_view.h"
 #include "tile_data_editors.h"
@@ -160,7 +159,7 @@ private:
 
 	// -- Atlas view --
 	TileAtlasView *tile_atlas_view = nullptr;
-	VBoxContainer *tile_create_help = nullptr;
+	Label *help_label = nullptr;
 
 	// Dragging
 	enum DragType {
@@ -334,5 +333,3 @@ public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual bool parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide = false) override;
 };
-
-#endif // TILE_SET_ATLAS_SOURCE_EDITOR_H
diff --git a/engine/editor/plugins/tiles/tile_set_editor.cpp b/engine/editor/plugins/tiles/tile_set_editor.cpp
index df89bf28..e30527ef 100644
--- a/engine/editor/plugins/tiles/tile_set_editor.cpp
+++ b/engine/editor/plugins/tiles/tile_set_editor.cpp
@@ -80,7 +80,7 @@ bool TileSetEditor::_can_drop_data_fw(const Point2 &p_point, const Variant &p_da
 		if (String(d["type"]) == "files") {
 			Vector<String> files = d["files"];
 
-			if (files.size() == 0) {
+			if (files.is_empty()) {
 				return false;
 			}
 
@@ -784,7 +784,7 @@ void TileSetEditor::remove_expanded_editor() {
 		return;
 	}
 
-	Node *original_parent = Object::cast_to<Node>(ObjectDB::get_instance(expanded_editor_parent));
+	Node *original_parent = ObjectDB::get_instance<Node>(expanded_editor_parent);
 	if (original_parent) {
 		expanded_editor->remove_meta("reparented");
 		expanded_editor->reparent(original_parent);
@@ -846,6 +846,7 @@ TileSetEditor::TileSetEditor() {
 	source_sort_button->set_flat(false);
 	source_sort_button->set_theme_type_variation(SceneStringName(FlatButton));
 	source_sort_button->set_tooltip_text(TTR("Sort Sources"));
+	source_sort_button->set_accessibility_name(TTRC("Sort Sources"));
 
 	PopupMenu *p = source_sort_button->get_popup();
 	p->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetEditor::_set_source_sort));
@@ -896,6 +897,7 @@ TileSetEditor::TileSetEditor() {
 	sources_advanced_menu_button->get_popup()->add_item(TTR("Open Atlas Merging Tool"));
 	sources_advanced_menu_button->get_popup()->add_item(TTR("Manage Tile Proxies"));
 	sources_advanced_menu_button->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &TileSetEditor::_sources_advanced_menu_id_pressed));
+	sources_advanced_menu_button->set_accessibility_name(TTRC("Advanced"));
 	sources_bottom_actions->add_child(sources_advanced_menu_button);
 	sources_bottom_actions->add_child(source_sort_button);
 
@@ -914,6 +916,8 @@ TileSetEditor::TileSetEditor() {
 	// No source selected.
 	no_source_selected_label = memnew(Label);
 	no_source_selected_label->set_text(TTR("No TileSet source selected. Select or create a TileSet source.\nYou can create a new source by using the Add button on the left or by dropping a tileset texture onto the source list."));
+	no_source_selected_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
+	no_source_selected_label->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
 	no_source_selected_label->set_h_size_flags(SIZE_EXPAND_FILL);
 	no_source_selected_label->set_v_size_flags(SIZE_EXPAND_FILL);
 	no_source_selected_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
@@ -953,8 +957,9 @@ TileSetEditor::TileSetEditor() {
 
 	patterns_help_label = memnew(Label);
 	patterns_help_label->set_text(TTR("Add new patterns in the TileMap editing mode."));
+	patterns_help_label->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
 	patterns_help_label->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER);
-	patterns_help_label->set_anchors_and_offsets_preset(Control::PRESET_CENTER);
+	patterns_help_label->set_anchors_and_offsets_preset(Control::PRESET_HCENTER_WIDE);
 	patterns_item_list->add_child(patterns_help_label);
 
 	// Expanded editor
@@ -978,6 +983,8 @@ void TileSourceInspectorPlugin::_show_id_edit_dialog(Object *p_for_source) {
 
 		Label *label = memnew(Label(TTR("Warning: Modifying a source ID will result in all TileMaps using that source to reference an invalid source instead. This may result in unexpected data loss. Change this ID carefully.")));
 		label->set_autowrap_mode(TextServer::AUTOWRAP_WORD);
+		// Workaround too tall popup window due to text autowrapping. See GH-83546.
+		label->set_custom_minimum_size(Vector2i(400, 0));
 		vbox->add_child(label);
 
 		id_input = memnew(SpinBox);
diff --git a/engine/editor/plugins/tiles/tile_set_editor.h b/engine/editor/plugins/tiles/tile_set_editor.h
index 106be5ac..7410c399 100644
--- a/engine/editor/plugins/tiles/tile_set_editor.h
+++ b/engine/editor/plugins/tiles/tile_set_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_SET_EDITOR_H
-#define TILE_SET_EDITOR_H
+#pragma once
 
 #include "atlas_merging_dialog.h"
 #include "scene/gui/tab_bar.h"
@@ -45,8 +44,8 @@ class SplitContainer;
 class EditorFileDialog;
 class EditorInspectorPlugin;
 
-class TileSetEditor : public Control {
-	GDCLASS(TileSetEditor, Control);
+class TileSetEditor : public MarginContainer {
+	GDCLASS(TileSetEditor, MarginContainer);
 
 	static TileSetEditor *singleton;
 
@@ -141,5 +140,3 @@ public:
 	virtual bool can_handle(Object *p_object) override;
 	virtual bool parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide = false) override;
 };
-
-#endif // TILE_SET_EDITOR_H
diff --git a/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp b/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp
index db1ae1b6..06b7be6c 100644
--- a/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp
+++ b/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.cpp
@@ -233,7 +233,7 @@ void TileSetScenesCollectionSourceEditor::_scene_thumbnail_done(const String &p_
 void TileSetScenesCollectionSourceEditor::_scenes_list_item_activated(int p_index) {
 	Ref<PackedScene> packed_scene = tile_set_scenes_collection_source->get_scene_tile_scene(scene_tiles_list->get_item_metadata(p_index));
 	if (packed_scene.is_valid()) {
-		EditorNode::get_singleton()->open_request(packed_scene->get_path());
+		EditorNode::get_singleton()->load_scene(packed_scene->get_path());
 	}
 }
 
@@ -302,7 +302,7 @@ void TileSetScenesCollectionSourceEditor::_update_tile_inspector() {
 
 void TileSetScenesCollectionSourceEditor::_update_action_buttons() {
 	Vector<int> selected_indices = scene_tiles_list->get_selected_items();
-	scene_tile_delete_button->set_disabled(selected_indices.size() <= 0 || read_only);
+	scene_tile_delete_button->set_disabled(selected_indices.is_empty() || read_only);
 }
 
 void TileSetScenesCollectionSourceEditor::_update_scenes_list() {
@@ -483,7 +483,7 @@ bool TileSetScenesCollectionSourceEditor::_can_drop_data_fw(const Point2 &p_poin
 		if (String(d["type"]) == "files") {
 			Vector<String> files = d["files"];
 
-			if (files.size() == 0) {
+			if (files.is_empty()) {
 				return false;
 			}
 
@@ -573,12 +573,14 @@ TileSetScenesCollectionSourceEditor::TileSetScenesCollectionSourceEditor() {
 	scene_tile_add_button = memnew(Button);
 	scene_tile_add_button->set_theme_type_variation(SceneStringName(FlatButton));
 	scene_tile_add_button->connect(SceneStringName(pressed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_source_add_pressed));
+	scene_tile_add_button->set_accessibility_name(TTRC("Add"));
 	scenes_bottom_actions->add_child(scene_tile_add_button);
 
 	scene_tile_delete_button = memnew(Button);
 	scene_tile_delete_button->set_theme_type_variation(SceneStringName(FlatButton));
 	scene_tile_delete_button->set_disabled(true);
 	scene_tile_delete_button->connect(SceneStringName(pressed), callable_mp(this, &TileSetScenesCollectionSourceEditor::_source_delete_pressed));
+	scene_tile_delete_button->set_accessibility_name(TTRC("Delete"));
 	scenes_bottom_actions->add_child(scene_tile_delete_button);
 
 	EditorInspector::add_inspector_plugin(memnew(TileSourceInspectorPlugin));
diff --git a/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h b/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h
index f8db0c21..396754e8 100644
--- a/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h
+++ b/engine/editor/plugins/tiles/tile_set_scenes_collection_source_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_SET_SCENES_COLLECTION_SOURCE_EDITOR_H
-#define TILE_SET_SCENES_COLLECTION_SOURCE_EDITOR_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "scene/gui/box_container.h"
@@ -144,5 +143,3 @@ public:
 	TileSetScenesCollectionSourceEditor();
 	~TileSetScenesCollectionSourceEditor();
 };
-
-#endif // TILE_SET_SCENES_COLLECTION_SOURCE_EDITOR_H
diff --git a/engine/editor/plugins/tiles/tiles_editor_plugin.cpp b/engine/editor/plugins/tiles/tiles_editor_plugin.cpp
index e1d37069..e3b48295 100644
--- a/engine/editor/plugins/tiles/tiles_editor_plugin.cpp
+++ b/engine/editor/plugins/tiles/tiles_editor_plugin.cpp
@@ -74,7 +74,7 @@ void TilesEditorUtils::_thread() {
 		pattern_preview_sem.wait();
 
 		pattern_preview_mutex.lock();
-		if (pattern_preview_queue.size() == 0) {
+		if (pattern_preview_queue.is_empty()) {
 			pattern_preview_mutex.unlock();
 		} else {
 			QueueItem item = pattern_preview_queue.front()->get();
@@ -339,14 +339,14 @@ void TileMapEditorPlugin::_tile_map_layer_changed() {
 
 void TileMapEditorPlugin::_tile_map_layer_removed() {
 	// Workaround for TileMap, making sure the editor stays open when you delete the currently edited layer.
-	TileMap *tile_map = Object::cast_to<TileMap>(ObjectDB::get_instance(tile_map_group_id));
+	TileMap *tile_map = ObjectDB::get_instance<TileMap>(tile_map_group_id);
 	if (tile_map) {
 		edit(tile_map);
 	}
 }
 
 void TileMapEditorPlugin::_update_tile_map() {
-	TileMapLayer *edited_layer = Object::cast_to<TileMapLayer>(ObjectDB::get_instance(tile_map_layer_id));
+	TileMapLayer *edited_layer = ObjectDB::get_instance<TileMapLayer>(tile_map_layer_id);
 	if (edited_layer) {
 		Ref<TileSet> tile_set = edited_layer->get_tile_set();
 		if (tile_set.is_valid() && tile_set_id != tile_set->get_instance_id()) {
@@ -363,7 +363,7 @@ void TileMapEditorPlugin::_update_tile_map() {
 }
 
 void TileMapEditorPlugin::_select_layer(const StringName &p_name) {
-	TileMapLayer *edited_layer = Object::cast_to<TileMapLayer>(ObjectDB::get_instance(tile_map_layer_id));
+	TileMapLayer *edited_layer = ObjectDB::get_instance<TileMapLayer>(tile_map_layer_id);
 	ERR_FAIL_NULL(edited_layer);
 
 	Node *parent = edited_layer->get_parent();
@@ -415,7 +415,7 @@ void TileMapEditorPlugin::_notification(int p_notification) {
 }
 
 void TileMapEditorPlugin::edit(Object *p_object) {
-	TileMapLayer *edited_layer = Object::cast_to<TileMapLayer>(ObjectDB::get_instance(tile_map_layer_id));
+	TileMapLayer *edited_layer = ObjectDB::get_instance<TileMapLayer>(tile_map_layer_id);
 	if (edited_layer) {
 		edited_layer->disconnect(CoreStringName(changed), callable_mp(this, &TileMapEditorPlugin::_tile_map_layer_changed));
 		edited_layer->disconnect(SceneStringName(tree_exited), callable_mp(this, &TileMapEditorPlugin::_tile_map_layer_removed));
diff --git a/engine/editor/plugins/tiles/tiles_editor_plugin.h b/engine/editor/plugins/tiles/tiles_editor_plugin.h
index c61ddcc8..6f2c0f4a 100644
--- a/engine/editor/plugins/tiles/tiles_editor_plugin.h
+++ b/engine/editor/plugins/tiles/tiles_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILES_EDITOR_PLUGIN_H
-#define TILES_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -163,5 +162,3 @@ public:
 	TileSetEditorPlugin();
 	~TileSetEditorPlugin();
 };
-
-#endif // TILES_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/tool_button_editor_plugin.h b/engine/editor/plugins/tool_button_editor_plugin.h
index f4122537..fe2c0cae 100644
--- a/engine/editor/plugins/tool_button_editor_plugin.h
+++ b/engine/editor/plugins/tool_button_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TOOL_BUTTON_EDITOR_PLUGIN_H
-#define TOOL_BUTTON_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -53,5 +52,3 @@ public:
 
 	ToolButtonEditorPlugin();
 };
-
-#endif // TOOL_BUTTON_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/version_control_editor_plugin.cpp b/engine/editor/plugins/version_control_editor_plugin.cpp
index b6c880d7..ecf7eafe 100644
--- a/engine/editor/plugins/version_control_editor_plugin.cpp
+++ b/engine/editor/plugins/version_control_editor_plugin.cpp
@@ -222,8 +222,7 @@ void VersionControlEditorPlugin::_refresh_commit_list() {
 
 	List<EditorVCSInterface::Commit> commit_info_list = EditorVCSInterface::get_singleton()->get_previous_commits(commit_list_size_button->get_selected_metadata());
 
-	for (List<EditorVCSInterface::Commit>::Element *e = commit_info_list.front(); e; e = e->next()) {
-		EditorVCSInterface::Commit commit = e->get();
+	for (const EditorVCSInterface::Commit &commit : commit_info_list) {
 		TreeItem *item = commit_list->create_item();
 
 		// Only display the first line of a commit message
@@ -370,8 +369,7 @@ void VersionControlEditorPlugin::_refresh_stage_area() {
 	unstaged_files->get_root()->clear_children();
 
 	List<EditorVCSInterface::StatusFile> status_files = EditorVCSInterface::get_singleton()->get_modified_files_data();
-	for (List<EditorVCSInterface::StatusFile>::Element *E = status_files.front(); E; E = E->next()) {
-		EditorVCSInterface::StatusFile sf = E->get();
+	for (const EditorVCSInterface::StatusFile &sf : status_files) {
 		if (sf.area == EditorVCSInterface::TREE_AREA_STAGED) {
 			_add_new_item(staged_files, sf.file_path, sf.change_type);
 		} else if (sf.area == EditorVCSInterface::TREE_AREA_UNSTAGED) {
@@ -548,7 +546,7 @@ void VersionControlEditorPlugin::_cell_button_pressed(Object *p_item, int p_colu
 
 		file_path = "res://" + file_path;
 		if (ResourceLoader::get_resource_type(file_path) == "PackedScene") {
-			EditorNode::get_singleton()->open_request(file_path);
+			EditorNode::get_singleton()->load_scene(file_path);
 		} else if (file_path.ends_with(".gd")) {
 			EditorNode::get_singleton()->load_resource(file_path);
 			ScriptEditor::get_singleton()->reload_scripts();
@@ -908,7 +906,7 @@ void VersionControlEditorPlugin::fetch_available_vcs_plugin_names() {
 }
 
 void VersionControlEditorPlugin::register_editor() {
-	EditorDockManager::get_singleton()->add_dock(version_commit_dock, "", EditorDockManager::DOCK_SLOT_RIGHT_UL);
+	EditorDockManager::get_singleton()->add_dock(version_commit_dock, "", EditorDockManager::DOCK_SLOT_RIGHT_UL, ED_SHORTCUT_AND_COMMAND("docks/open_version_control", TTRC("Open Version Control Dock")));
 
 	version_control_dock_button = EditorNode::get_bottom_panel()->add_item(TTR("Version Control"), version_control_dock, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_version_control_bottom_panel", TTRC("Toggle Version Control Bottom Panel")));
 
@@ -1069,6 +1067,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 
 	set_up_ssh_public_key_path = memnew(LineEdit);
 	set_up_ssh_public_key_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	set_up_ssh_public_key_path->set_accessibility_name(TTRC("SSH Public Key Path"));
 	set_up_ssh_public_key_path->set_text(EDITOR_GET("version_control/ssh_public_key_path"));
 	set_up_ssh_public_key_path->connect(SceneStringName(text_changed), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
 	set_up_ssh_public_key_input_hbc->add_child(set_up_ssh_public_key_path);
@@ -1085,6 +1084,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	select_public_path_button->set_button_icon(EditorNode::get_singleton()->get_gui_base()->get_editor_theme_icon("Folder"));
 	select_public_path_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_popup_file_dialog).bind(set_up_ssh_public_key_file_dialog));
 	select_public_path_button->set_tooltip_text(TTR("Select SSH public key path"));
+	select_public_path_button->set_accessibility_name(TTRC("Select SSH public key path"));
 	set_up_ssh_public_key_input_hbc->add_child(select_public_path_button);
 
 	HBoxContainer *set_up_ssh_private_key_input = memnew(HBoxContainer);
@@ -1104,6 +1104,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	set_up_ssh_private_key_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	set_up_ssh_private_key_path->set_text(EDITOR_GET("version_control/ssh_private_key_path"));
 	set_up_ssh_private_key_path->connect(SceneStringName(text_changed), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
+	set_up_ssh_private_key_path->set_accessibility_name(TTRC("SSH Private Key Path"));
 	set_up_ssh_private_key_input_hbc->add_child(set_up_ssh_private_key_path);
 
 	set_up_ssh_private_key_file_dialog = memnew(FileDialog);
@@ -1118,6 +1119,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	select_private_path_button->set_button_icon(EditorNode::get_singleton()->get_gui_base()->get_editor_theme_icon("Folder"));
 	select_private_path_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_popup_file_dialog).bind(set_up_ssh_private_key_file_dialog));
 	select_private_path_button->set_tooltip_text(TTR("Select SSH private key path"));
+	select_private_path_button->set_accessibility_name(TTRC("Select SSH private key path"));
 	set_up_ssh_private_key_input_hbc->add_child(select_private_path_button);
 
 	HBoxContainer *set_up_ssh_passphrase_input = memnew(HBoxContainer);
@@ -1133,6 +1135,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	set_up_ssh_passphrase->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	set_up_ssh_passphrase->set_secret(true);
 	set_up_ssh_passphrase->connect(SceneStringName(text_changed), callable_mp(this, &VersionControlEditorPlugin::_update_set_up_warning));
+	set_up_ssh_passphrase->set_accessibility_name(TTRC("SSH Passphrase"));
 	set_up_ssh_passphrase_input->add_child(set_up_ssh_passphrase);
 
 	set_up_warning_text = memnew(Label);
@@ -1158,6 +1161,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	unstage_title->add_child(unstage_label);
 
 	refresh_button = memnew(Button);
+	refresh_button->set_accessibility_name(TTRC("Detect new changes"));
 	refresh_button->set_tooltip_text(TTR("Detect new changes"));
 	refresh_button->set_theme_type_variation(SceneStringName(FlatButton));
 	refresh_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Reload"), EditorStringName(EditorIcons)));
@@ -1179,6 +1183,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	discard_all_confirm->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_discard_all));
 
 	discard_all_button = memnew(Button);
+	discard_all_button->set_accessibility_name(TTRC("Discard all changes"));
 	discard_all_button->set_tooltip_text(TTR("Discard all changes"));
 	discard_all_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Close"), EditorStringName(EditorIcons)));
 	discard_all_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_confirm_discard_all));
@@ -1186,6 +1191,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	unstage_title->add_child(discard_all_button);
 
 	stage_all_button = memnew(Button);
+	stage_all_button->set_accessibility_name(TTRC("Stage all changes"));
 	stage_all_button->set_theme_type_variation(SceneStringName(FlatButton));
 	stage_all_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveDown"), EditorStringName(EditorIcons)));
 	stage_all_button->set_tooltip_text(TTR("Stage all changes"));
@@ -1216,6 +1222,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	stage_title->add_child(stage_label);
 
 	unstage_all_button = memnew(Button);
+	unstage_all_button->set_accessibility_name(TTRC("Unstage all changes"));
 	unstage_all_button->set_theme_type_variation(SceneStringName(FlatButton));
 	unstage_all_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveUp"), EditorStringName(EditorIcons)));
 	unstage_all_button->set_tooltip_text(TTR("Unstage all changes"));
@@ -1247,6 +1254,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	commit_area->add_child(commit_label);
 
 	commit_message = memnew(TextEdit);
+	commit_message->set_accessibility_name(TTRC("Commit Message"));
 	commit_message->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	commit_message->set_h_grow_direction(Control::GrowDirection::GROW_DIRECTION_BEGIN);
 	commit_message->set_v_grow_direction(Control::GrowDirection::GROW_DIRECTION_END);
@@ -1275,6 +1283,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	commit_list_hbc->add_child(commit_list_label);
 
 	commit_list_size_button = memnew(OptionButton);
+	commit_list_size_button->set_accessibility_name(TTRC("Commit list size"));
 	commit_list_size_button->set_tooltip_text(TTR("Commit list size"));
 	commit_list_size_button->add_item("10");
 	commit_list_size_button->set_item_metadata(0, 10);
@@ -1307,6 +1316,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	version_commit_dock->add_child(menu_bar);
 
 	branch_select = memnew(OptionButton);
+	branch_select->set_accessibility_name(TTRC("Branches"));
 	branch_select->set_tooltip_text(TTR("Branches"));
 	branch_select->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	branch_select->set_clip_text(true);
@@ -1348,11 +1358,13 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	branch_create_hbc->add_child(branch_create_name_label);
 
 	branch_create_name_input = memnew(LineEdit);
+	branch_create_name_input->set_accessibility_name(TTRC("Branch Name"));
 	branch_create_name_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	branch_create_name_input->connect(SceneStringName(text_changed), callable_mp(this, &VersionControlEditorPlugin::_update_branch_create_button));
 	branch_create_hbc->add_child(branch_create_name_input);
 
 	remote_select = memnew(OptionButton);
+	remote_select->set_accessibility_name(TTRC("Remote"));
 	remote_select->set_tooltip_text(TTR("Remotes"));
 	remote_select->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	remote_select->set_clip_text(true);
@@ -1394,6 +1406,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	remote_create_name_hbc->add_child(remote_create_name_label);
 
 	remote_create_name_input = memnew(LineEdit);
+	remote_create_name_input->set_accessibility_name(TTRC("Remote Name"));
 	remote_create_name_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	remote_create_name_input->connect(SceneStringName(text_changed), callable_mp(this, &VersionControlEditorPlugin::_update_remote_create_button));
 	remote_create_name_hbc->add_child(remote_create_name_input);
@@ -1408,12 +1421,14 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	remote_create_hbc->add_child(remote_create_url_label);
 
 	remote_create_url_input = memnew(LineEdit);
+	remote_create_url_input->set_accessibility_name(TTRC("Remote URL"));
 	remote_create_url_input->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	remote_create_url_input->connect(SceneStringName(text_changed), callable_mp(this, &VersionControlEditorPlugin::_update_remote_create_button));
 	remote_create_hbc->add_child(remote_create_url_input);
 
 	fetch_button = memnew(Button);
 	fetch_button->set_theme_type_variation(SceneStringName(FlatButton));
+	fetch_button->set_accessibility_name(TTRC("Fetch"));
 	fetch_button->set_tooltip_text(TTR("Fetch"));
 	fetch_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("Reload"), EditorStringName(EditorIcons)));
 	fetch_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_fetch));
@@ -1421,6 +1436,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 
 	pull_button = memnew(Button);
 	pull_button->set_theme_type_variation(SceneStringName(FlatButton));
+	pull_button->set_accessibility_name(TTRC("Pull"));
 	pull_button->set_tooltip_text(TTR("Pull"));
 	pull_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveDown"), EditorStringName(EditorIcons)));
 	pull_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_pull));
@@ -1428,6 +1444,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 
 	push_button = memnew(Button);
 	push_button->set_theme_type_variation(SceneStringName(FlatButton));
+	push_button->set_accessibility_name(TTRC("Push"));
 	push_button->set_tooltip_text(TTR("Push"));
 	push_button->set_button_icon(EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("MoveUp"), EditorStringName(EditorIcons)));
 	push_button->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_push));
@@ -1494,6 +1511,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() {
 	diff_heading->add_child(view);
 
 	diff_view_type_select = memnew(OptionButton);
+	diff_view_type_select->set_accessibility_name(TTRC("View"));
 	diff_view_type_select->add_item(TTR("Split"), DIFF_VIEW_TYPE_SPLIT);
 	diff_view_type_select->add_item(TTR("Unified"), DIFF_VIEW_TYPE_UNIFIED);
 	diff_view_type_select->connect(SceneStringName(item_selected), callable_mp(this, &VersionControlEditorPlugin::_display_diff));
diff --git a/engine/editor/plugins/version_control_editor_plugin.h b/engine/editor/plugins/version_control_editor_plugin.h
index 145366e2..9d6e1e81 100644
--- a/engine/editor/plugins/version_control_editor_plugin.h
+++ b/engine/editor/plugins/version_control_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VERSION_CONTROL_EDITOR_PLUGIN_H
-#define VERSION_CONTROL_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_vcs_interface.h"
 #include "editor/plugins/editor_plugin.h"
@@ -213,5 +212,3 @@ public:
 	VersionControlEditorPlugin();
 	~VersionControlEditorPlugin();
 };
-
-#endif // VERSION_CONTROL_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/visual_shader_editor_plugin.cpp b/engine/editor/plugins/visual_shader_editor_plugin.cpp
index b8af4603..ad1444b5 100644
--- a/engine/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/engine/editor/plugins/visual_shader_editor_plugin.cpp
@@ -34,6 +34,7 @@
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
 #include "core/os/keyboard.h"
+#include "core/version_generated.gen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_properties.h"
 #include "editor/editor_properties_vector.h"
@@ -79,17 +80,17 @@ struct FloatConstantDef {
 };
 
 static FloatConstantDef float_constant_defs[] = {
-	{ "E", Math_E, TTRC("E constant (2.718282). Represents the base of the natural logarithm.") },
+	{ "E", Math::E, TTRC("E constant (2.718282). Represents the base of the natural logarithm.") },
 	{ "Epsilon", CMP_EPSILON, TTRC("Epsilon constant (0.00001). Smallest possible scalar number.") },
 	{ "Phi", 1.618034f, TTRC("Phi constant (1.618034). Golden ratio.") },
-	{ "Pi/4", Math_PI / 4, TTRC("Pi/4 constant (0.785398) or 45 degrees.") },
-	{ "Pi/2", Math_PI / 2, TTRC("Pi/2 constant (1.570796) or 90 degrees.") },
-	{ "Pi", Math_PI, TTRC("Pi constant (3.141593) or 180 degrees.") },
-	{ "Tau", Math_TAU, TTRC("Tau constant (6.283185) or 360 degrees.") },
-	{ "Sqrt2", Math_SQRT2, TTRC("Sqrt2 constant (1.414214). Square root of 2.") }
+	{ "Pi/4", Math::PI / 4, TTRC("Pi/4 constant (0.785398) or 45 degrees.") },
+	{ "Pi/2", Math::PI / 2, TTRC("Pi/2 constant (1.570796) or 90 degrees.") },
+	{ "Pi", Math::PI, TTRC("Pi constant (3.141593) or 180 degrees.") },
+	{ "Tau", Math::TAU, TTRC("Tau constant (6.283185) or 360 degrees.") },
+	{ "Sqrt2", Math::SQRT2, TTRC("Sqrt2 constant (1.414214). Square root of 2.") }
 };
 
-const int MAX_FLOAT_CONST_DEFS = sizeof(float_constant_defs) / sizeof(FloatConstantDef);
+constexpr int MAX_FLOAT_CONST_DEFS = std::size(float_constant_defs);
 
 ///////////////////
 
@@ -1211,6 +1212,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id, bool
 		if (valid_right) {
 			if (expanded_port_counter == 0 && vsnode->is_output_port_expandable(i)) {
 				TextureButton *expand = memnew(TextureButton);
+				expand->set_accessibility_name(TTRC("Expand output port"));
 				expand->set_toggle_mode(true);
 				expand->set_texture_normal(editor->get_editor_theme_icon(SNAME("GuiTreeArrowRight")));
 				expand->set_texture_pressed(editor->get_editor_theme_icon(SNAME("GuiTreeArrowDown")));
@@ -1221,6 +1223,7 @@ void VisualShaderGraphPlugin::add_node(VisualShader::Type p_type, int p_id, bool
 			}
 			if (vsnode->has_output_port_preview(i) && port_right != VisualShaderNode::PORT_TYPE_TRANSFORM && port_right != VisualShaderNode::PORT_TYPE_SAMPLER) {
 				TextureButton *preview = memnew(TextureButton);
+				preview->set_accessibility_name(TTRC("Select preview port"));
 				preview->set_toggle_mode(true);
 				preview->set_texture_normal(editor->get_editor_theme_icon(SNAME("GuiVisibilityHidden")));
 				preview->set_texture_pressed(editor->get_editor_theme_icon(SNAME("GuiVisibilityVisible")));
@@ -1491,9 +1494,6 @@ void VisualShaderGraphPlugin::disconnect_nodes(VisualShader::Type p_type, int p_
 	}
 }
 
-VisualShaderGraphPlugin::~VisualShaderGraphPlugin() {
-}
-
 /////////////////
 
 void VisualShaderEditedProperty::_bind_methods() {
@@ -1575,6 +1575,10 @@ void VisualShaderEditor::validate_script() {
 	}
 }
 
+Control *VisualShaderEditor::get_top_bar() {
+	return toolbar;
+}
+
 void VisualShaderEditor::add_plugin(const Ref<VisualShaderNodePlugin> &p_plugin) {
 	if (plugins.has(p_plugin)) {
 		return;
@@ -2195,8 +2199,7 @@ void VisualShaderEditor::_update_nodes() {
 		}
 	}
 
-	List<Variant> keys;
-	added.get_key_list(&keys);
+	LocalVector<Variant> keys = added.get_key_list();
 	keys.sort_custom<StringLikeVariantOrder>();
 
 	for (const Variant &key : keys) {
@@ -2466,6 +2469,13 @@ Size2 VisualShaderEditor::get_minimum_size() const {
 	return Size2(10, 200);
 }
 
+void VisualShaderEditor::update_toggle_files_button() {
+	ERR_FAIL_NULL(toggle_files_list);
+	bool forward = toggle_files_list->is_visible() == is_layout_rtl();
+	toggle_files_button->set_button_icon(get_editor_theme_icon(forward ? SNAME("Forward") : SNAME("Back")));
+	toggle_files_button->set_tooltip_text(vformat("%s (%s)", TTR("Toggle Files Panel"), ED_GET_SHORTCUT("script_editor/toggle_files_panel")->get_as_text()));
+}
+
 void VisualShaderEditor::_draw_color_over_button(Object *p_obj, Color p_color) {
 	Button *button = Object::cast_to<Button>(p_obj);
 	if (!button) {
@@ -3305,7 +3315,7 @@ void VisualShaderEditor::_edit_port_default_input(Object *p_button, int p_node,
 			popup_pref_size.width = 180;
 			break;
 	}
-	property_editor_popup->set_min_size(popup_pref_size);
+	property_editor_popup->set_min_size(popup_pref_size * EDSCALE);
 
 	property_editor->set_object_and_property(edited_property_holder.ptr(), "edited_property");
 	property_editor->update_property();
@@ -4424,8 +4434,8 @@ void VisualShaderEditor::_delete_nodes(int p_type, const List<int> &p_nodes) {
 		for (const VisualShader::Connection &E : conns) {
 			if (E.from_node == F || E.to_node == F) {
 				bool cancel = false;
-				for (List<VisualShader::Connection>::Element *R = used_conns.front(); R; R = R->next()) {
-					if (R->get().from_node == E.from_node && R->get().from_port == E.from_port && R->get().to_node == E.to_node && R->get().to_port == E.to_port) {
+				for (const VisualShader::Connection &R : used_conns) {
+					if (R.from_node == E.from_node && R.from_port == E.from_port && R.to_node == E.to_node && R.to_port == E.to_port) {
 						cancel = true; // to avoid ERR_ALREADY_EXISTS warning
 						break;
 					}
@@ -5150,6 +5160,10 @@ void VisualShaderEditor::_param_unselected() {
 	_clear_preview_param();
 }
 
+void VisualShaderEditor::_help_open() {
+	OS::get_singleton()->shell_open(vformat("%s/tutorials/shaders/visual_shaders.html", GODOT_VERSION_DOCS_URL));
+}
+
 void VisualShaderEditor::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_POSTINITIALIZE: {
@@ -5191,6 +5205,7 @@ void VisualShaderEditor::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
+			site_search->set_button_icon(get_editor_theme_icon(SNAME("ExternalLink")));
 			highend_label->set_modulate(get_theme_color(SNAME("highend_color"), EditorStringName(Editor)));
 
 			param_filter->set_right_icon(Control::get_editor_theme_icon(SNAME("Search")));
@@ -5254,6 +5269,11 @@ void VisualShaderEditor::_notification(int p_what) {
 			if (is_visible_in_tree()) {
 				_update_graph();
 			}
+			update_toggle_files_button();
+		} break;
+
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			update_toggle_files_button();
 		} break;
 
 		case NOTIFICATION_DRAG_BEGIN: {
@@ -6102,6 +6122,10 @@ void VisualShaderEditor::_connection_menu_id_pressed(int p_idx) {
 }
 
 Variant VisualShaderEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		return Variant();
+	}
+
 	if (p_from == members) {
 		TreeItem *it = members->get_item_at_position(p_point);
 		if (!it) {
@@ -6127,6 +6151,10 @@ Variant VisualShaderEditor::get_drag_data_fw(const Point2 &p_point, Control *p_f
 }
 
 bool VisualShaderEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		return false;
+	}
+
 	if (p_from == graph) {
 		Dictionary d = p_data;
 
@@ -6142,6 +6170,10 @@ bool VisualShaderEditor::can_drop_data_fw(const Point2 &p_point, const Variant &
 }
 
 void VisualShaderEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		return;
+	}
+
 	if (p_from == graph) {
 		Dictionary d = p_data;
 
@@ -6357,6 +6389,16 @@ void VisualShaderEditor::_show_shader_preview() {
 	}
 }
 
+void VisualShaderEditor::set_toggle_list_control(Control *p_control) {
+	toggle_files_list = p_control;
+}
+
+void VisualShaderEditor::_toggle_files_pressed() {
+	ERR_FAIL_NULL(toggle_files_list);
+	toggle_files_list->set_visible(!toggle_files_list->is_visible());
+	update_toggle_files_button();
+}
+
 void VisualShaderEditor::_bind_methods() {
 	ClassDB::bind_method("_update_nodes", &VisualShaderEditor::_update_nodes);
 	ClassDB::bind_method("_update_graph", &VisualShaderEditor::_update_graph);
@@ -6493,7 +6535,7 @@ VisualShaderEditor::VisualShaderEditor() {
 	toolbar_panel->set_anchors_and_offsets_preset(Control::PRESET_TOP_WIDE, PRESET_MODE_MINSIZE, 10);
 	toolbar_panel->set_mouse_filter(Control::MOUSE_FILTER_IGNORE);
 
-	HFlowContainer *toolbar = memnew(HFlowContainer);
+	toolbar = memnew(HFlowContainer);
 	{
 		LocalVector<Node *> nodes;
 		for (int i = 0; i < graph->get_menu_hbox()->get_child_count(); i++) {
@@ -6592,6 +6634,32 @@ VisualShaderEditor::VisualShaderEditor() {
 	toolbar->add_child(shader_preview_button);
 	shader_preview_button->connect(SceneStringName(pressed), callable_mp(this, &VisualShaderEditor::_show_shader_preview));
 
+	Control *spacer = memnew(Control);
+	spacer->set_h_size_flags(Control::SIZE_EXPAND);
+	toolbar->add_child(spacer);
+
+	site_search = memnew(Button);
+	site_search->set_flat(true);
+	site_search->connect(SceneStringName(pressed), callable_mp(this, &VisualShaderEditor::_help_open));
+	site_search->set_text(TTR("Online Docs"));
+	site_search->set_tooltip_text(TTR("Open Godot online documentation."));
+	toolbar->add_child(site_search);
+	toolbar->add_child(memnew(VSeparator));
+
+	VSeparator *separator = memnew(VSeparator);
+	toolbar->add_child(separator);
+	toolbar->move_child(separator, 0);
+
+	separator = memnew(VSeparator);
+	toolbar->add_child(separator);
+	toolbar->move_child(separator, 0);
+
+	toggle_files_button = memnew(Button);
+	toggle_files_button->set_flat(true);
+	toggle_files_button->connect(SceneStringName(pressed), callable_mp(this, &VisualShaderEditor::_toggle_files_pressed));
+	toolbar->add_child(toggle_files_button);
+	toolbar->move_child(toggle_files_button, 0);
+
 	///////////////////////////////////////
 	// CODE PREVIEW
 	///////////////////////////////////////
@@ -6691,6 +6759,7 @@ VisualShaderEditor::VisualShaderEditor() {
 	preview_tools = memnew(MenuButton);
 	filter_hbox->add_child(preview_tools);
 	preview_tools->set_tooltip_text(TTR("Options"));
+	preview_tools->set_accessibility_name(TTRC("Options"));
 	preview_tools->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &VisualShaderEditor::_preview_tools_menu_option));
 	preview_tools->get_popup()->add_item(TTR("Copy Parameters From Material"), COPY_PARAMS_FROM_MATERIAL);
 	preview_tools->get_popup()->add_item(TTR("Paste Parameters To Material"), PASTE_PARAMS_TO_MATERIAL);
@@ -6740,10 +6809,12 @@ VisualShaderEditor::VisualShaderEditor() {
 	node_filter->connect(SceneStringName(gui_input), callable_mp(this, &VisualShaderEditor::_sbox_input));
 	node_filter->set_h_size_flags(SIZE_EXPAND_FILL);
 	node_filter->set_placeholder(TTR("Search"));
+	node_filter->set_accessibility_name(TTRC("Search"));
 
 	tools = memnew(MenuButton);
 	filter_hb->add_child(tools);
 	tools->set_tooltip_text(TTR("Options"));
+	tools->set_accessibility_name(TTRC("Options"));
 	tools->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &VisualShaderEditor::_tools_menu_option));
 	tools->get_popup()->add_item(TTR("Expand All"), EXPAND_ALL);
 	tools->get_popup()->add_item(TTR("Collapse All"), COLLAPSE_ALL);
@@ -6819,6 +6890,7 @@ VisualShaderEditor::VisualShaderEditor() {
 		varying_type->add_item("Vector4");
 		varying_type->add_item("Boolean");
 		varying_type->add_item("Transform");
+		varying_type->set_accessibility_name(TTRC("Varying Type"));
 		varying_type->connect(SceneStringName(item_selected), callable_mp(this, &VisualShaderEditor::_varying_type_changed));
 
 		varying_name = memnew(LineEdit);
@@ -6832,6 +6904,7 @@ VisualShaderEditor::VisualShaderEditor() {
 		hb->add_child(varying_mode);
 		varying_mode->add_item("Vertex -> [Fragment, Light]");
 		varying_mode->add_item("Fragment -> Light");
+		varying_mode->set_accessibility_name(TTRC("Varying Mode"));
 		varying_mode->connect(SceneStringName(item_selected), callable_mp(this, &VisualShaderEditor::_varying_mode_changed));
 
 		varying_error_label = memnew(Label);
@@ -7623,12 +7696,15 @@ public:
 	}
 
 	void _item_selected(int p_item) {
-		editor->call_deferred(SNAME("_input_select_item"), input, get_item_text(p_item));
+		editor->call_deferred(SNAME("_input_select_item"), input, get_item_metadata(p_item));
 	}
 
 	void setup(VisualShaderEditor *p_editor, const Ref<VisualShaderNodeInput> &p_input) {
+		set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+
 		editor = p_editor;
 		input = p_input;
+
 		Ref<Texture2D> type_icon[] = {
 			EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("float"), EditorStringName(EditorIcons)),
 			EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("int"), EditorStringName(EditorIcons)),
@@ -7641,13 +7717,16 @@ public:
 			EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("ImageTexture"), EditorStringName(EditorIcons)),
 		};
 
-		add_item("[None]");
+		add_item(TTR("[None]"));
+		set_item_metadata(-1, "[None]");
+
 		int to_select = -1;
 		for (int i = 0; i < input->get_input_index_count(); i++) {
 			if (input->get_input_name() == input->get_input_index_name(i)) {
 				to_select = i + 1;
 			}
 			add_icon_item(type_icon[input->get_input_index_type(i)], input->get_input_index_name(i));
+			set_item_metadata(-1, input->get_input_index_name(i));
 		}
 
 		if (to_select >= 0) {
@@ -7672,10 +7751,12 @@ public:
 	}
 
 	void _item_selected(int p_item) {
-		editor->call_deferred(SNAME("_varying_select_item"), varying, get_item_text(p_item));
+		editor->call_deferred(SNAME("_varying_select_item"), varying, get_item_metadata(p_item));
 	}
 
 	void setup(VisualShaderEditor *p_editor, const Ref<VisualShaderNodeVarying> &p_varying, VisualShader::Type p_type) {
+		set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+
 		editor = p_editor;
 		varying = p_varying;
 
@@ -7692,7 +7773,8 @@ public:
 
 		bool is_getter = Ref<VisualShaderNodeVaryingGetter>(p_varying.ptr()).is_valid();
 
-		add_item("[None]");
+		add_item(TTR("[None]"));
+		set_item_metadata(-1, "[None]");
 
 		int to_select = -1;
 		for (int i = 0, j = 0; i < varying->get_varyings_count(); i++) {
@@ -7726,6 +7808,7 @@ public:
 				to_select = i - j + 1;
 			}
 			add_icon_item(type_icon[varying->get_varying_type_by_index(i)], varying->get_varying_name_by_index(i));
+			set_item_metadata(-1, varying->get_varying_name_by_index(i));
 		}
 
 		if (to_select >= 0) {
@@ -7752,10 +7835,12 @@ public:
 	}
 
 	void _item_selected(int p_item) {
-		editor->call_deferred(SNAME("_parameter_ref_select_item"), parameter_ref, get_item_text(p_item));
+		editor->call_deferred(SNAME("_parameter_ref_select_item"), parameter_ref, get_item_metadata(p_item));
 	}
 
 	void setup(VisualShaderEditor *p_editor, const Ref<VisualShaderNodeParameterRef> &p_parameter_ref) {
+		set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+
 		editor = p_editor;
 		parameter_ref = p_parameter_ref;
 
@@ -7772,13 +7857,16 @@ public:
 			EditorNode::get_singleton()->get_editor_theme()->get_icon(SNAME("ImageTexture"), EditorStringName(EditorIcons)),
 		};
 
-		add_item("[None]");
+		add_item(TTR("[None]"));
+		set_item_metadata(-1, "[None]");
+
 		int to_select = -1;
 		for (int i = 0; i < p_parameter_ref->get_parameters_count(); i++) {
 			if (p_parameter_ref->get_parameter_name() == p_parameter_ref->get_parameter_name_by_index(i)) {
 				to_select = i + 1;
 			}
 			add_icon_item(type_icon[p_parameter_ref->get_parameter_type_by_index(i)], p_parameter_ref->get_parameter_name_by_index(i));
+			set_item_metadata(-1, p_parameter_ref->get_parameter_name_by_index(i));
 		}
 
 		if (to_select >= 0) {
@@ -7967,7 +8055,7 @@ Control *VisualShaderNodePluginDefault::create_editor(const Ref<Resource> &p_par
 	}
 
 	Vector<StringName> properties = p_node->get_editable_properties();
-	if (properties.size() == 0) {
+	if (properties.is_empty()) {
 		return nullptr;
 	}
 
@@ -7984,7 +8072,7 @@ Control *VisualShaderNodePluginDefault::create_editor(const Ref<Resource> &p_par
 		}
 	}
 
-	if (pinfo.size() == 0) {
+	if (pinfo.is_empty()) {
 		return nullptr;
 	}
 
@@ -8126,6 +8214,7 @@ void EditorPropertyVisualShaderMode::set_option_button_clip(bool p_enable) {
 
 EditorPropertyVisualShaderMode::EditorPropertyVisualShaderMode() {
 	options = memnew(OptionButton);
+	options->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	options->set_clip_text(true);
 	add_child(options);
 	add_focusable(options);
diff --git a/engine/editor/plugins/visual_shader_editor_plugin.h b/engine/editor/plugins/visual_shader_editor_plugin.h
index a74fe113..57ca744a 100644
--- a/engine/editor/plugins/visual_shader_editor_plugin.h
+++ b/engine/editor/plugins/visual_shader_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISUAL_SHADER_EDITOR_PLUGIN_H
-#define VISUAL_SHADER_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_properties.h"
 #include "editor/plugins/editor_plugin.h"
@@ -179,7 +178,6 @@ public:
 	VisualShader::Type get_shader_type() const;
 
 	VisualShaderGraphPlugin();
-	~VisualShaderGraphPlugin();
 };
 
 class VisualShaderEditedProperty : public RefCounted {
@@ -194,8 +192,6 @@ protected:
 public:
 	void set_edited_property(const Variant &p_variant);
 	Variant get_edited_property() const;
-
-	VisualShaderEditedProperty() {}
 };
 
 class VisualShaderEditor : public ShaderEditor {
@@ -215,11 +211,15 @@ class VisualShaderEditor : public ShaderEditor {
 	String param_filter_name;
 	EditorProperty *current_prop = nullptr;
 	VBoxContainer *shader_preview_vbox = nullptr;
+	Button *site_search = nullptr;
+	Button *toggle_files_button = nullptr;
+	Control *toggle_files_list = nullptr;
 	GraphEdit *graph = nullptr;
 	Button *add_node = nullptr;
 	MenuButton *varying_button = nullptr;
 	Button *code_preview_button = nullptr;
 	Button *shader_preview_button = nullptr;
+	Control *toolbar = nullptr;
 
 	int last_to_node = -1;
 	int last_to_port = -1;
@@ -450,6 +450,8 @@ class VisualShaderEditor : public ShaderEditor {
 
 	void _show_shader_preview();
 
+	void _toggle_files_pressed();
+
 	Vector<int> nodes_link_to_frame_buffer; // Contains the nodes that are requested to be linked to a frame. This is used to perform one Undo/Redo operation for dragging nodes.
 	int frame_node_id_to_link_to = -1;
 
@@ -637,6 +639,8 @@ class VisualShaderEditor : public ShaderEditor {
 	void _param_selected();
 	void _param_unselected();
 
+	void _help_open();
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
@@ -647,6 +651,7 @@ public:
 	virtual bool is_unsaved() const override;
 	virtual void save_external_data(const String &p_str = "") override;
 	virtual void validate_script() override;
+	virtual Control *get_top_bar() override;
 
 	void add_plugin(const Ref<VisualShaderNodePlugin> &p_plugin);
 	void remove_plugin(const Ref<VisualShaderNodePlugin> &p_plugin);
@@ -655,11 +660,13 @@ public:
 
 	void clear_custom_types();
 	void add_custom_type(const String &p_name, const String &p_type, const Ref<Script> &p_script, const String &p_description, int p_return_icon_type, const String &p_category, bool p_highend);
+	void set_toggle_list_control(Control *p_control);
 
 	Dictionary get_custom_node_data(Ref<VisualShaderNodeCustom> &p_custom_node);
 	void update_custom_type(const Ref<Resource> &p_resource);
 
 	virtual Size2 get_minimum_size() const override;
+	void update_toggle_files_button();
 
 	Ref<VisualShader> get_visual_shader() const { return visual_shader; }
 
@@ -720,5 +727,3 @@ public:
 	virtual bool handles(const Ref<Resource> &p_resource) const override;
 	virtual Ref<Resource> convert(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // VISUAL_SHADER_EDITOR_PLUGIN_H
diff --git a/engine/editor/plugins/voxel_gi_editor_plugin.cpp b/engine/editor/plugins/voxel_gi_editor_plugin.cpp
index 245ef22b..e8c97c44 100644
--- a/engine/editor/plugins/voxel_gi_editor_plugin.cpp
+++ b/engine/editor/plugins/voxel_gi_editor_plugin.cpp
@@ -203,6 +203,3 @@ VoxelGIEditorPlugin::VoxelGIEditorPlugin() {
 	VoxelGI::bake_step_function = bake_func_step;
 	VoxelGI::bake_end_function = bake_func_end;
 }
-
-VoxelGIEditorPlugin::~VoxelGIEditorPlugin() {
-}
diff --git a/engine/editor/plugins/voxel_gi_editor_plugin.h b/engine/editor/plugins/voxel_gi_editor_plugin.h
index 667638fd..5ec92963 100644
--- a/engine/editor/plugins/voxel_gi_editor_plugin.h
+++ b/engine/editor/plugins/voxel_gi_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VOXEL_GI_EDITOR_PLUGIN_H
-#define VOXEL_GI_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 #include "scene/3d/voxel_gi.h"
@@ -67,7 +66,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	VoxelGIEditorPlugin();
-	~VoxelGIEditorPlugin();
 };
-
-#endif // VOXEL_GI_EDITOR_PLUGIN_H
diff --git a/engine/editor/pot_generator.cpp b/engine/editor/pot_generator.cpp
index 0e18c3c1..272bb0f0 100644
--- a/engine/editor/pot_generator.cpp
+++ b/engine/editor/pot_generator.cpp
@@ -249,9 +249,6 @@ POTGenerator *POTGenerator::get_singleton() {
 	return singleton;
 }
 
-POTGenerator::POTGenerator() {
-}
-
 POTGenerator::~POTGenerator() {
 	memdelete(singleton);
 	singleton = nullptr;
diff --git a/engine/editor/pot_generator.h b/engine/editor/pot_generator.h
index 54f4aa06..56f5de0a 100644
--- a/engine/editor/pot_generator.h
+++ b/engine/editor/pot_generator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POT_GENERATOR_H
-#define POT_GENERATOR_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/templates/hash_map.h"
@@ -61,8 +60,5 @@ public:
 	static POTGenerator *get_singleton();
 	void generate_pot(const String &p_file);
 
-	POTGenerator();
 	~POTGenerator();
 };
-
-#endif // POT_GENERATOR_H
diff --git a/engine/editor/progress_dialog.h b/engine/editor/progress_dialog.h
index 87fb02b3..6a1747ff 100644
--- a/engine/editor/progress_dialog.h
+++ b/engine/editor/progress_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROGRESS_DIALOG_H
-#define PROGRESS_DIALOG_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -60,8 +59,6 @@ public:
 	void add_task(const String &p_task, const String &p_label, int p_steps);
 	void task_step(const String &p_task, int p_step = -1);
 	void end_task(const String &p_task);
-
-	BackgroundProgress() {}
 };
 
 class PanelContainer;
@@ -108,5 +105,3 @@ public:
 
 	ProgressDialog();
 };
-
-#endif // PROGRESS_DIALOG_H
diff --git a/engine/editor/project_converter_3_to_4.cpp b/engine/editor/project_converter_3_to_4.cpp
index e781baea..ad927647 100644
--- a/engine/editor/project_converter_3_to_4.cpp
+++ b/engine/editor/project_converter_3_to_4.cpp
@@ -1990,9 +1990,9 @@ void ProjectConverter3To4::process_gdscript_line(String &line, const RegExContai
 			Vector<String> parts = parse_arguments(line.substr(start, end));
 			if (parts.size() == 2) {
 				if (builtin) {
-					line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\\\"", "").replace("\\'", "").replace(" ", "") + line.substr(end + start);
+					line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\\\"", "").replace("\\'", "").remove_char(' ') + line.substr(end + start);
 				} else {
-					line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].replace("\"", "").replace("\'", "").replace(" ", "") + line.substr(end + start);
+					line = line.substr(0, start) + "await " + parts[0] + "." + parts[1].remove_chars("\"' ") + line.substr(end + start);
 				}
 			}
 		}
@@ -2226,7 +2226,7 @@ void ProjectConverter3To4::process_gdscript_line(String &line, const RegExContai
 		int end = get_end_parenthesis(line.substr(start)) + 1;
 		if (end > -1) {
 			Vector<String> parts = parse_arguments(line.substr(start, end));
-			if (parts.size() == 0) {
+			if (parts.is_empty()) {
 				line = line.substr(0, start) + "DisplayServer.get_display_safe_area()" + line.substr(end + start);
 			}
 		}
@@ -2920,7 +2920,7 @@ String ProjectConverter3To4::line_formatter(int current_line, String from, Strin
 
 	from = from.strip_escapes();
 	to = to.strip_escapes();
-	line = line.replace("\r", "").replace("\n", "").strip_edges();
+	line = line.remove_chars("\r\n").strip_edges();
 
 	return vformat("Line(%d), %s -> %s  -  LINE \"\"\" %s \"\"\"", current_line, from, to, line);
 }
@@ -2935,8 +2935,8 @@ String ProjectConverter3To4::simple_line_formatter(int current_line, String old_
 		new_line = new_line.substr(0, 997) + "...";
 	}
 
-	old_line = old_line.replace("\r", "").replace("\n", "").strip_edges();
-	new_line = new_line.replace("\r", "").replace("\n", "").strip_edges();
+	old_line = old_line.remove_chars("\r\n").strip_edges();
+	new_line = new_line.remove_chars("\r\n").strip_edges();
 
 	return vformat("Line (%d) - FULL LINES - \"\"\" %s \"\"\"  =====>  \"\"\" %s \"\"\"", current_line, old_line, new_line);
 }
diff --git a/engine/editor/project_converter_3_to_4.h b/engine/editor/project_converter_3_to_4.h
index 4e135a42..5ebadb2f 100644
--- a/engine/editor/project_converter_3_to_4.h
+++ b/engine/editor/project_converter_3_to_4.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_CONVERTER_3_TO_4_H
-#define PROJECT_CONVERTER_3_TO_4_H
+#pragma once
 
 #ifndef DISABLE_DEPRECATED
 
@@ -114,5 +113,3 @@ public:
 };
 
 #endif // DISABLE_DEPRECATED
-
-#endif // PROJECT_CONVERTER_3_TO_4_H
diff --git a/engine/editor/project_manager.cpp b/engine/editor/project_manager.cpp
index c3bd3acf..7c7fc328 100644
--- a/engine/editor/project_manager.cpp
+++ b/engine/editor/project_manager.cpp
@@ -63,7 +63,14 @@
 #include "scene/theme/theme_db.h"
 #include "servers/display_server.h"
 #include "servers/navigation_server_3d.h"
+
+#ifndef PHYSICS_3D_DISABLED
+#include "servers/physics_server_3d.h"
+#endif // PHYSICS_3D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
 #include "servers/physics_server_2d.h"
+#endif // PHYSICS_2D_DISABLED
 
 constexpr int GODOT4_CONFIG_VERSION = 5;
 
@@ -97,6 +104,10 @@ void ProjectManager::_notification(int p_what) {
 			_titlebar_resized();
 		} break;
 
+		case NOTIFICATION_TRANSLATION_CHANGED: {
+			_titlebar_resized();
+		} break;
+
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			set_process_shortcut_input(is_visible_in_tree());
 		} break;
@@ -142,16 +153,15 @@ void ProjectManager::_build_icon_type_cache(Ref<Theme> p_theme) {
 	}
 	List<StringName> tl;
 	p_theme->get_icon_list(EditorStringName(EditorIcons), &tl);
-	for (List<StringName>::Element *E = tl.front(); E; E = E->next()) {
-		icon_type_cache[E->get()] = p_theme->get_icon(E->get(), EditorStringName(EditorIcons));
+	for (const StringName &name : tl) {
+		icon_type_cache[name] = p_theme->get_icon(name, EditorStringName(EditorIcons));
 	}
 }
 
 // Main layout.
 
-void ProjectManager::_update_size_limits(bool p_custom_res) {
+void ProjectManager::_update_size_limits() {
 	const Size2 minimum_size = Size2(720, 450) * EDSCALE;
-	const Size2 default_size = Size2(DEFAULT_WINDOW_WIDTH, DEFAULT_WINDOW_HEIGHT) * EDSCALE;
 
 	// Define a minimum window size to prevent UI elements from overlapping or being cut off.
 	Window *w = Object::cast_to<Window>(SceneTree::get_singleton()->get_root());
@@ -159,12 +169,6 @@ void ProjectManager::_update_size_limits(bool p_custom_res) {
 		// Calling Window methods this early doesn't sync properties with DS.
 		w->set_min_size(minimum_size);
 		DisplayServer::get_singleton()->window_set_min_size(minimum_size);
-		if (!p_custom_res) {
-			// Only set window size if it currently matches the default, which is defined in `main/main.cpp`.
-			// This allows CLI arguments to override the window size.
-			w->set_size(default_size);
-			DisplayServer::get_singleton()->window_set_size(default_size);
-		}
 	}
 	Size2 real_size = DisplayServer::get_singleton()->window_get_size();
 
@@ -174,7 +178,6 @@ void ProjectManager::_update_size_limits(bool p_custom_res) {
 		Vector2i window_position;
 		window_position.x = screen_rect.position.x + (screen_rect.size.x - real_size.x) / 2;
 		window_position.y = screen_rect.position.y + (screen_rect.size.y - real_size.y) / 2;
-		DisplayServer::get_singleton()->window_set_position(window_position);
 
 		// Limit popup menus to prevent unusably long lists.
 		// We try to set it to half the screen resolution, but no smaller than the minimum window size.
@@ -271,7 +274,8 @@ void ProjectManager::_update_theme(bool p_skip_creation) {
 			erase_missing_btn->add_theme_constant_override("h_separation", get_theme_constant(SNAME("sidebar_button_icon_separation"), SNAME("ProjectManager")));
 
 			open_btn_container->add_theme_constant_override("separation", 0);
-			open_options_popup->set_item_icon(0, get_editor_theme_icon(SNAME("NodeWarning")));
+			open_options_popup->set_item_icon(0, get_editor_theme_icon(SNAME("Notification")));
+			open_options_popup->set_item_icon(1, get_editor_theme_icon(SNAME("NodeWarning")));
 		}
 
 		// Asset library popup.
@@ -508,6 +512,10 @@ void ProjectManager::_open_selected_projects() {
 			args.push_back("--recovery-mode");
 		}
 
+		if (open_in_verbose_mode) {
+			args.push_back("--verbose");
+		}
+
 		Error err = OS::get_singleton()->create_instance(args);
 		if (err != OK) {
 			loading_label->hide();
@@ -592,7 +600,7 @@ void ProjectManager::_open_selected_projects_check_warnings() {
 				i--;
 			} else if (ProjectList::project_feature_looks_like_version(feature)) {
 				version_convert_feature = feature;
-				warning_message += vformat(TTR("Warning: This project was last edited in Godot %s. Opening will change it to Godot %s.\n\n"), Variant(feature), Variant(VERSION_BRANCH));
+				warning_message += vformat(TTR("Warning: This project was last edited in Godot %s. Opening will change it to Godot %s.\n\n"), Variant(feature), Variant(GODOT_VERSION_BRANCH));
 				unsupported_features.remove_at(i);
 				i--;
 			}
@@ -624,6 +632,7 @@ void ProjectManager::_open_selected_projects_check_recovery_mode() {
 		return;
 	}
 
+	open_in_verbose_mode = false;
 	open_in_recovery_mode = false;
 	// Check if the project failed to load during last startup.
 	if (project.recovery_mode) {
@@ -664,7 +673,7 @@ void ProjectManager::_new_project() {
 void ProjectManager::_rename_project() {
 	const Vector<ProjectList::Item> &selected_list = project_list->get_selected_projects();
 
-	if (selected_list.size() == 0) {
+	if (selected_list.is_empty()) {
 		return;
 	}
 
@@ -679,7 +688,7 @@ void ProjectManager::_rename_project() {
 void ProjectManager::_erase_project() {
 	const HashSet<String> &selected_list = project_list->get_selected_project_keys();
 
-	if (selected_list.size() == 0) {
+	if (selected_list.is_empty()) {
 		return;
 	}
 
@@ -781,7 +790,11 @@ void ProjectManager::_on_projects_updated() {
 
 void ProjectManager::_on_open_options_selected(int p_option) {
 	switch (p_option) {
-		case 0: // Edit in recovery mode.
+		case 0: // Edit in verbose mode.
+			open_in_verbose_mode = true;
+			_open_selected_projects_check_warnings();
+			break;
+		case 1: // Edit in recovery mode.
 			_open_recovery_mode_ask(true);
 			break;
 	}
@@ -1145,12 +1158,10 @@ void ProjectManager::_titlebar_resized() {
 	if (left_menu_spacer) {
 		int w = (root_container->is_layout_rtl()) ? margin.y : margin.x;
 		left_menu_spacer->set_custom_minimum_size(Size2(w, 0));
-		right_spacer->set_custom_minimum_size(Size2(w, 0));
 	}
 	if (right_menu_spacer) {
 		int w = (root_container->is_layout_rtl()) ? margin.x : margin.y;
 		right_menu_spacer->set_custom_minimum_size(Size2(w, 0));
-		left_spacer->set_custom_minimum_size(Size2(w, 0));
 	}
 	if (title_bar) {
 		title_bar->set_custom_minimum_size(Size2(0, margin.z - title_bar->get_global_position().y));
@@ -1159,11 +1170,9 @@ void ProjectManager::_titlebar_resized() {
 
 // Object methods.
 
-ProjectManager::ProjectManager(bool p_custom_res) {
+ProjectManager::ProjectManager() {
 	singleton = this;
 
-	set_translation_domain("godot.editor");
-
 	// Turn off some servers we aren't going to be using in the Project Manager.
 	NavigationServer3D::get_singleton()->set_active(false);
 	PhysicsServer3D::get_singleton()->set_active(false);
@@ -1189,7 +1198,7 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 		switch (display_scale) {
 			case 0:
 				// Try applying a suitable display scale automatically.
-				EditorScale::set_scale(EditorSettings::get_singleton()->get_auto_display_scale());
+				EditorScale::set_scale(EditorSettings::get_auto_display_scale());
 				break;
 			case 1:
 				EditorScale::set_scale(0.75);
@@ -1229,7 +1238,7 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 	}
 
 	// TRANSLATORS: This refers to the application where users manage their Godot projects.
-	SceneTree::get_singleton()->get_root()->set_title(VERSION_NAME + String(" - ") + TTR("Project Manager", "Application"));
+	SceneTree::get_singleton()->get_root()->set_title(GODOT_VERSION_NAME + String(" - ") + TTR("Project Manager", "Application"));
 
 	SceneTree::get_singleton()->get_root()->connect("files_dropped", callable_mp(this, &ProjectManager::_files_dropped));
 
@@ -1283,6 +1292,8 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 
 		title_bar_logo = memnew(Button);
 		title_bar_logo->set_flat(true);
+		title_bar_logo->set_tooltip_text(TTR("About Godot"));
+		title_bar_logo->set_accessibility_name(TTRC("About Godot"));
 		left_hbox->add_child(title_bar_logo);
 		title_bar_logo->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_show_about));
 
@@ -1298,6 +1309,7 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 		main_view_toggles->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		main_view_toggles->set_stretch_ratio(2.0);
 		title_bar->add_child(main_view_toggles);
+		title_bar->set_center_control(main_view_toggles);
 
 		if (can_expand) {
 			// Spacer to center main toggles.
@@ -1363,12 +1375,14 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 			hb->add_child(scan_btn);
 
 			loading_label = memnew(Label(TTR("Loading, please wait...")));
+			loading_label->set_accessibility_live(DisplayServer::AccessibilityLiveMode::LIVE_ASSERTIVE);
 			loading_label->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			loading_label->hide();
 			hb->add_child(loading_label);
 
 			search_box = memnew(LineEdit);
 			search_box->set_placeholder(TTR("Filter Projects"));
+			search_box->set_accessibility_name(TTRC("Filter Projects"));
 			search_box->set_tooltip_text(TTR("This field filters projects by name and last path component.\nTo filter projects by name and full path, the query must contain at least one `/` character."));
 			search_box->set_clear_button_enabled(true);
 			search_box->connect(SceneStringName(text_changed), callable_mp(this, &ProjectManager::_on_search_term_changed));
@@ -1376,14 +1390,16 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 			search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			hb->add_child(search_box);
 
-			Label *sort_label = memnew(Label);
+			sort_label = memnew(Label);
 			sort_label->set_text(TTR("Sort:"));
+			sort_label->set_focus_mode(Control::FOCUS_NONE);
 			hb->add_child(sort_label);
 
 			filter_option = memnew(OptionButton);
 			filter_option->set_clip_text(true);
 			filter_option->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			filter_option->set_stretch_ratio(0.3);
+			filter_option->set_accessibility_name(TTRC("Sort"));
 			filter_option->connect(SceneStringName(item_selected), callable_mp(this, &ProjectManager::_on_order_option_changed));
 			hb->add_child(filter_option);
 
@@ -1482,12 +1498,14 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 			open_btn_container->add_child(memnew(VSeparator));
 
 			open_options_btn = memnew(Button);
+			open_options_btn->set_accessibility_name(TTRC("Options"));
 			open_options_btn->set_icon_alignment(HorizontalAlignment::HORIZONTAL_ALIGNMENT_CENTER);
 			open_options_btn->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_options_popup));
 			open_btn_container->add_child(open_options_btn);
 
 			open_options_popup = memnew(PopupMenu);
-			open_options_popup->add_item(TTR("Edit in recovery mode"));
+			open_options_popup->add_item(TTRC("Edit in verbose mode"));
+			open_options_popup->add_item(TTRC("Edit in recovery mode"));
 			open_options_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ProjectManager::_on_open_options_selected));
 			open_options_btn->add_child(open_options_popup);
 
@@ -1508,6 +1526,7 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 
 			manage_tags_btn = memnew(Button);
 			manage_tags_btn->set_text(TTR("Manage Tags"));
+			manage_tags_btn->set_shortcut(ED_SHORTCUT("project_manager/project_tags", TTR("Manage Tags"), KeyModifierMask::CMD_OR_CTRL | Key::T));
 			project_list_sidebar->add_child(manage_tags_btn);
 
 			erase_btn = memnew(Button);
@@ -1618,7 +1637,11 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 		ask_update_settings = memnew(ConfirmationDialog);
 		ask_update_settings->set_autowrap(true);
 		ask_update_settings->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects_with_migration));
-		full_convert_button = ask_update_settings->add_button(TTR("Convert Full Project"), !GLOBAL_GET("gui/common/swap_cancel_ok"));
+		int ed_swap_cancel_ok = EDITOR_GET("interface/editor/accept_dialog_cancel_ok_buttons");
+		if (ed_swap_cancel_ok == 0) {
+			ed_swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok() ? 2 : 1;
+		}
+		full_convert_button = ask_update_settings->add_button(TTR("Convert Full Project"), ed_swap_cancel_ok != 2);
 		full_convert_button->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_full_convert_button_pressed));
 		add_child(ask_update_settings);
 
@@ -1697,6 +1720,7 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 
 		new_tag_name = memnew(LineEdit);
 		tag_vb->add_child(new_tag_name);
+		new_tag_name->set_accessibility_name(TTRC("New Tag Name"));
 		new_tag_name->connect(SceneStringName(text_changed), callable_mp(this, &ProjectManager::_set_new_tag_name));
 		new_tag_name->connect(SceneStringName(text_submitted), callable_mp(this, &ProjectManager::_create_new_tag).unbind(1));
 		create_tag_dialog->connect("about_to_popup", callable_mp(new_tag_name, &LineEdit::clear));
@@ -1706,6 +1730,7 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 		tag_vb->add_child(tag_error);
 
 		create_tag_btn = memnew(Button);
+		create_tag_btn->set_accessibility_name(TTRC("Create Tag"));
 		all_tags->add_child(create_tag_btn);
 		create_tag_btn->connect(SceneStringName(pressed), callable_mp((Window *)create_tag_dialog, &Window::popup_centered).bind(Vector2i(500, 0) * EDSCALE));
 	}
@@ -1747,7 +1772,7 @@ ProjectManager::ProjectManager(bool p_custom_res) {
 		title_bar->connect(SceneStringName(item_rect_changed), callable_mp(this, &ProjectManager::_titlebar_resized));
 	}
 
-	_update_size_limits(p_custom_res);
+	_update_size_limits();
 }
 
 ProjectManager::~ProjectManager() {
diff --git a/engine/editor/project_manager.h b/engine/editor/project_manager.h
index 73a77e3d..841ee6e9 100644
--- a/engine/editor/project_manager.h
+++ b/engine/editor/project_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_MANAGER_H
-#define PROJECT_MANAGER_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 #include "scene/gui/scroll_container.h"
@@ -70,7 +69,7 @@ class ProjectManager : public Control {
 
 	Ref<Theme> theme;
 
-	void _update_size_limits(bool p_custom_res);
+	void _update_size_limits();
 	void _update_theme(bool p_skip_creation = false);
 	void _titlebar_resized();
 
@@ -139,6 +138,7 @@ class ProjectManager : public Control {
 
 	LineEdit *search_box = nullptr;
 	Label *loading_label = nullptr;
+	Label *sort_label = nullptr;
 	OptionButton *filter_option = nullptr;
 	PanelContainer *project_list_panel = nullptr;
 
@@ -231,6 +231,7 @@ class ProjectManager : public Control {
 
 	String version_convert_feature;
 	bool open_in_recovery_mode = false;
+	bool open_in_verbose_mode = false;
 
 #ifndef DISABLE_DEPRECATED
 	void _minor_project_migrate();
@@ -262,8 +263,6 @@ public:
 
 	void add_new_tag(const String &p_tag);
 
-	ProjectManager(bool p_custom_res);
+	ProjectManager();
 	~ProjectManager();
 };
-
-#endif // PROJECT_MANAGER_H
diff --git a/engine/editor/project_manager/project_dialog.cpp b/engine/editor/project_manager/project_dialog.cpp
index 09819215..77b7f9c3 100644
--- a/engine/editor/project_manager/project_dialog.cpp
+++ b/engine/editor/project_manager/project_dialog.cpp
@@ -277,7 +277,7 @@ void ProjectDialog::_update_target_auto_dir() {
 		case 0: // No convention
 			break;
 		case 1: // kebab-case
-			new_auto_dir = new_auto_dir.to_lower().replace(" ", "-");
+			new_auto_dir = new_auto_dir.to_kebab_case();
 			break;
 		case 2: // snake_case
 			new_auto_dir = new_auto_dir.to_snake_case();
@@ -376,7 +376,7 @@ void ProjectDialog::_browse_project_path() {
 	if (mode == MODE_IMPORT) {
 		fdialog_project->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_ANY);
 		fdialog_project->clear_filters();
-		fdialog_project->add_filter("project.godot", vformat("%s %s", VERSION_NAME, TTR("Project")));
+		fdialog_project->add_filter("project.godot", vformat("%s %s", GODOT_VERSION_NAME, TTR("Project")));
 		fdialog_project->add_filter("*.zip", TTR("ZIP File"));
 	} else {
 		fdialog_project->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_DIR);
@@ -725,6 +725,17 @@ void ProjectDialog::ok_pressed() {
 
 	hide();
 	if (mode == MODE_NEW || mode == MODE_IMPORT || mode == MODE_INSTALL) {
+#ifdef ANDROID_ENABLED
+		// Create a .nomedia file to hide assets from media apps on Android.
+		const String nomedia_file_path = path.path_join(".nomedia");
+		Ref<FileAccess> f2 = FileAccess::open(nomedia_file_path, FileAccess::WRITE);
+		if (f2.is_null()) {
+			// .nomedia isn't so critical.
+			ERR_PRINT("Couldn't create .nomedia in project path.");
+		} else {
+			f2->close();
+		}
+#endif
 		emit_signal(SNAME("project_created"), path, edit_check_box->is_pressed());
 	} else if (mode == MODE_RENAME) {
 		emit_signal(SNAME("projects_updated"));
@@ -910,6 +921,7 @@ ProjectDialog::ProjectDialog() {
 
 	project_path = memnew(LineEdit);
 	project_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	project_path->set_accessibility_name(TTRC("Project Path"));
 	project_path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	pphb->add_child(project_path);
 
@@ -925,6 +937,7 @@ ProjectDialog::ProjectDialog() {
 
 	install_path = memnew(LineEdit);
 	install_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	install_path->set_accessibility_name(TTRC("Install Path"));
 	install_path->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	iphb->add_child(install_path);
 
diff --git a/engine/editor/project_manager/project_dialog.h b/engine/editor/project_manager/project_dialog.h
index f0e07a05..8f98a985 100644
--- a/engine/editor/project_manager/project_dialog.h
+++ b/engine/editor/project_manager/project_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_DIALOG_H
-#define PROJECT_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -150,5 +149,3 @@ public:
 
 	ProjectDialog();
 };
-
-#endif // PROJECT_DIALOG_H
diff --git a/engine/editor/project_manager/project_list.cpp b/engine/editor/project_manager/project_list.cpp
index b96e40b0..590115e1 100644
--- a/engine/editor/project_manager/project_list.cpp
+++ b/engine/editor/project_manager/project_list.cpp
@@ -49,6 +49,10 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/resources/image_texture.h"
 
+const char *ProjectList::SIGNAL_LIST_CHANGED = "list_changed";
+const char *ProjectList::SIGNAL_SELECTION_CHANGED = "selection_changed";
+const char *ProjectList::SIGNAL_PROJECT_ASK_OPEN = "project_ask_open";
+
 void ProjectListItemControl::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_THEME_CHANGED: {
@@ -68,21 +72,60 @@ void ProjectListItemControl::_notification(int p_what) {
 			project_unsupported_features->set_texture(get_editor_theme_icon(SNAME("NodeWarning")));
 
 			favorite_button->set_texture_normal(get_editor_theme_icon(SNAME("Favorites")));
+
 			if (project_is_missing) {
 				explore_button->set_button_icon(get_editor_theme_icon(SNAME("FileBroken")));
+#if !defined(ANDROID_ENABLED) && !defined(WEB_ENABLED)
 			} else {
 				explore_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
+#endif
 			}
 		} break;
 
 		case NOTIFICATION_MOUSE_ENTER: {
 			is_hovering = true;
 			queue_redraw();
+			queue_accessibility_update();
 		} break;
 
 		case NOTIFICATION_MOUSE_EXIT: {
 			is_hovering = false;
 			queue_redraw();
+			queue_accessibility_update();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST_BOX_OPTION);
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, TTR("Project") + " " + project_title->get_text());
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, project_title->get_text());
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &ProjectListItemControl::_accessibility_action_open));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &ProjectListItemControl::_accessibility_action_scroll_into_view));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &ProjectListItemControl::_accessibility_action_focus));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &ProjectListItemControl::_accessibility_action_blur));
+
+			ProjectList *pl = get_list();
+			if (pl) {
+				DisplayServer::get_singleton()->accessibility_update_set_list_item_index(ae, pl->get_index(this));
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_level(ae, 0);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(ae, is_selected);
+		} break;
+
+		case NOTIFICATION_FOCUS_ENTER: {
+			ProjectList *pl = get_list();
+			if (pl) {
+				int idx = pl->get_index(this);
+				if (idx >= 0) {
+					pl->ensure_project_visible(idx);
+					pl->select_project(idx);
+
+					pl->emit_signal(SNAME(ProjectList::SIGNAL_SELECTION_CHANGED));
+				}
+			}
 		} break;
 
 		case NOTIFICATION_DRAW: {
@@ -98,6 +141,53 @@ void ProjectListItemControl::_notification(int p_what) {
 	}
 }
 
+ProjectList *ProjectListItemControl::get_list() const {
+	if (!is_inside_tree()) {
+		return nullptr;
+	}
+	ProjectList *pl = Object::cast_to<ProjectList>(get_parent()->get_parent());
+	return pl;
+}
+
+void ProjectListItemControl::_accessibility_action_scroll_into_view(const Variant &p_data) {
+	ProjectList *pl = get_list();
+	if (pl) {
+		int idx = pl->get_index(this);
+		if (idx >= 0) {
+			pl->ensure_project_visible(idx);
+		}
+	}
+}
+
+void ProjectListItemControl::_accessibility_action_open(const Variant &p_data) {
+	ProjectList *pl = get_list();
+	if (pl && !pl->project_opening_initiated) {
+		pl->emit_signal(SNAME(ProjectList::SIGNAL_PROJECT_ASK_OPEN));
+	}
+}
+
+void ProjectListItemControl::_accessibility_action_focus(const Variant &p_data) {
+	ProjectList *pl = get_list();
+	if (pl) {
+		int idx = pl->get_index(this);
+		if (idx >= 0) {
+			pl->ensure_project_visible(idx);
+			pl->select_project(idx);
+		}
+	}
+}
+
+void ProjectListItemControl::_accessibility_action_blur(const Variant &p_data) {
+	ProjectList *pl = get_list();
+	if (pl) {
+		int idx = pl->get_index(this);
+		if (idx >= 0) {
+			pl->ensure_project_visible(idx);
+			pl->deselect_project(idx);
+		}
+	}
+}
+
 void ProjectListItemControl::_favorite_button_pressed() {
 	emit_signal(SNAME("favorite_pressed"));
 }
@@ -108,10 +198,14 @@ void ProjectListItemControl::_explore_button_pressed() {
 
 void ProjectListItemControl::set_project_title(const String &p_title) {
 	project_title->set_text(p_title);
+	project_title->set_accessibility_name(TTRC("Project Name"));
+	queue_accessibility_update();
 }
 
 void ProjectListItemControl::set_project_path(const String &p_path) {
 	project_path->set_text(p_path);
+	project_path->set_accessibility_name(TTRC("Project Path"));
+	queue_accessibility_update();
 }
 
 void ProjectListItemControl::set_tags(const PackedStringArray &p_tags, ProjectList *p_parent_list) {
@@ -153,7 +247,7 @@ void ProjectListItemControl::set_unsupported_features(PackedStringArray p_featur
 					project_version_major = project_version_split[0].to_int();
 					project_version_minor = project_version_split[1].to_int();
 				}
-				if (VERSION_MAJOR != project_version_major || VERSION_MINOR <= project_version_minor) {
+				if (GODOT_VERSION_MAJOR != project_version_major || GODOT_VERSION_MINOR <= project_version_minor) {
 					// Don't show a warning if the project was last edited in a previous minor version.
 					tooltip_text += TTR("This project was last edited in a different Godot version: ") + p_features[i] + "\n";
 				}
@@ -169,6 +263,8 @@ void ProjectListItemControl::set_unsupported_features(PackedStringArray p_featur
 			return;
 		}
 		project_version->set_tooltip_text(tooltip_text);
+		project_unsupported_features->set_focus_mode(FOCUS_ACCESSIBILITY);
+		project_unsupported_features->set_accessibility_name(tooltip_text);
 		project_unsupported_features->set_tooltip_text(tooltip_text);
 		project_unsupported_features->show();
 	} else {
@@ -183,6 +279,7 @@ bool ProjectListItemControl::should_load_project_icon() const {
 void ProjectListItemControl::set_selected(bool p_selected) {
 	is_selected = p_selected;
 	queue_redraw();
+	queue_accessibility_update();
 }
 
 void ProjectListItemControl::set_is_favorite(bool p_favorite) {
@@ -190,9 +287,6 @@ void ProjectListItemControl::set_is_favorite(bool p_favorite) {
 }
 
 void ProjectListItemControl::set_is_missing(bool p_missing) {
-	if (project_is_missing == p_missing) {
-		return;
-	}
 	project_is_missing = p_missing;
 
 	if (project_is_missing) {
@@ -201,10 +295,8 @@ void ProjectListItemControl::set_is_missing(bool p_missing) {
 		explore_button->set_button_icon(get_editor_theme_icon(SNAME("FileBroken")));
 		explore_button->set_tooltip_text(TTR("Error: Project is missing on the filesystem."));
 	} else {
-		project_icon->set_modulate(Color(1, 1, 1, 1.0));
-
-		explore_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
 #if !defined(ANDROID_ENABLED) && !defined(WEB_ENABLED)
+		explore_button->set_button_icon(get_editor_theme_icon(SNAME("Load")));
 		explore_button->set_tooltip_text(TTR("Show in File Manager"));
 #else
 		// Opening the system file manager is not supported on the Android and web editors.
@@ -238,6 +330,8 @@ ProjectListItemControl::ProjectListItemControl() {
 
 	favorite_button = memnew(TextureButton);
 	favorite_button->set_name("FavoriteButton");
+	favorite_button->set_tooltip_text(TTR("Add to favorites"));
+	favorite_button->set_accessibility_name(TTRC("Add to favorites"));
 	// This makes the project's "hover" style display correctly when hovering the favorite icon.
 	favorite_button->set_mouse_filter(MOUSE_FILTER_PASS);
 	favorite_box->add_child(favorite_button);
@@ -285,6 +379,8 @@ ProjectListItemControl::ProjectListItemControl() {
 
 		explore_button = memnew(Button);
 		explore_button->set_name("ExploreButton");
+		explore_button->set_tooltip_text(TTR("Open in file manager"));
+		explore_button->set_accessibility_name(TTRC("Open in file manager"));
 		explore_button->set_flat(true);
 		path_hb->add_child(explore_button);
 		explore_button->connect(SceneStringName(pressed), callable_mp(this, &ProjectListItemControl::_explore_button_pressed));
@@ -345,10 +441,6 @@ struct ProjectListComparator {
 	}
 };
 
-const char *ProjectList::SIGNAL_LIST_CHANGED = "list_changed";
-const char *ProjectList::SIGNAL_SELECTION_CHANGED = "selection_changed";
-const char *ProjectList::SIGNAL_PROJECT_ASK_OPEN = "project_ask_open";
-
 // Helpers.
 
 bool ProjectList::project_feature_looks_like_version(const String &p_feature) {
@@ -378,6 +470,15 @@ void ProjectList::_notification(int p_what) {
 				}
 			}
 		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST_BOX);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, _projects.size());
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_MULTISELECTABLE, false);
+		}
 	}
 }
 
@@ -446,7 +547,7 @@ void ProjectList::_migrate_config() {
 		String path = EDITOR_GET(property_key);
 		print_line("Migrating legacy project '" + path + "'.");
 
-		String favoriteKey = "favorite_projects/" + property_key.get_slice("/", 1);
+		String favoriteKey = "favorite_projects/" + property_key.get_slicec('/', 1);
 		bool favorite = EditorSettings::get_singleton()->has_setting(favoriteKey);
 		add_project(path, favorite);
 		if (favorite) {
@@ -637,6 +738,7 @@ void ProjectList::update_project_list() {
 
 	set_v_scroll(0);
 	emit_signal(SNAME(SIGNAL_LIST_CHANGED));
+	queue_accessibility_update();
 }
 
 void ProjectList::sort_projects() {
@@ -653,7 +755,7 @@ void ProjectList::sort_projects() {
 			PackedStringArray remaining;
 			for (const String &part : search_parts) {
 				if (part.begins_with("tag:")) {
-					tags.push_back(part.get_slice(":", 1));
+					tags.push_back(part.get_slicec(':', 1));
 				} else {
 					remaining.append(part);
 				}
@@ -701,6 +803,7 @@ void ProjectList::sort_projects() {
 	// Rewind the coroutine because order of projects changed
 	_update_icons_async();
 	update_dock_menu();
+	queue_accessibility_update();
 }
 
 int ProjectList::get_project_count() const {
@@ -791,6 +894,7 @@ void ProjectList::add_project(const String &dir_path, bool favorite) {
 	if (!_config.has_section(dir_path)) {
 		_config.set_value(dir_path, "favorite", favorite);
 	}
+	queue_accessibility_update();
 }
 
 void ProjectList::set_project_version(const String &p_project_path, int p_version) {
@@ -850,6 +954,15 @@ int ProjectList::refresh_project(const String &dir_path) {
 	return index;
 }
 
+int ProjectList::get_index(const ProjectListItemControl *p_control) const {
+	for (int i = 0; i < _projects.size(); ++i) {
+		if (_projects[i].control == p_control) {
+			return i;
+		}
+	}
+	return -1;
+}
+
 void ProjectList::ensure_project_visible(int p_index) {
 	const Item &item = _projects[p_index];
 	ensure_control_visible(item.control);
@@ -917,6 +1030,7 @@ void ProjectList::_remove_project(int p_index, bool p_update_config) {
 		// Not actually saving the file, in case you are doing more changes to settings
 	}
 
+	queue_accessibility_update();
 	update_dock_menu();
 }
 
@@ -998,18 +1112,21 @@ void ProjectList::_clear_project_selection() {
 	for (int i = 0; i < previous_selected_items.size(); ++i) {
 		previous_selected_items[i].control->set_selected(false);
 	}
+	queue_accessibility_update();
 }
 
 void ProjectList::_select_project_nocheck(int p_index) {
 	Item &item = _projects.write[p_index];
 	_selected_project_paths.insert(item.path);
 	item.control->set_selected(true);
+	queue_accessibility_update();
 }
 
 void ProjectList::_deselect_project_nocheck(int p_index) {
 	Item &item = _projects.write[p_index];
 	_selected_project_paths.erase(item.path);
 	item.control->set_selected(false);
+	queue_accessibility_update();
 }
 
 inline void _sort_project_range(int &a, int &b) {
@@ -1035,6 +1152,10 @@ void ProjectList::select_project(int p_index) {
 	_select_project_nocheck(p_index);
 }
 
+void ProjectList::deselect_project(int p_index) {
+	_deselect_project_nocheck(p_index);
+}
+
 void ProjectList::select_first_visible_project() {
 	_clear_project_selection();
 
@@ -1048,7 +1169,7 @@ void ProjectList::select_first_visible_project() {
 
 Vector<ProjectList::Item> ProjectList::get_selected_projects() const {
 	Vector<Item> items;
-	if (_selected_project_paths.size() == 0) {
+	if (_selected_project_paths.is_empty()) {
 		return items;
 	}
 	items.resize(_selected_project_paths.size());
@@ -1069,7 +1190,7 @@ const HashSet<String> &ProjectList::get_selected_project_keys() const {
 }
 
 int ProjectList::get_single_selected_index() const {
-	if (_selected_project_paths.size() == 0) {
+	if (_selected_project_paths.is_empty()) {
 		// Default selection
 		return 0;
 	}
@@ -1090,7 +1211,7 @@ int ProjectList::get_single_selected_index() const {
 }
 
 void ProjectList::erase_selected_projects(bool p_delete_project_contents) {
-	if (_selected_project_paths.size() == 0) {
+	if (_selected_project_paths.is_empty()) {
 		return;
 	}
 
diff --git a/engine/editor/project_manager/project_list.h b/engine/editor/project_manager/project_list.h
index 21717301..552ea11b 100644
--- a/engine/editor/project_manager/project_list.h
+++ b/engine/editor/project_manager/project_list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_LIST_H
-#define PROJECT_LIST_H
+#pragma once
 
 #include "core/io/config_file.h"
 #include "scene/gui/box_container.h"
@@ -65,6 +64,13 @@ class ProjectListItemControl : public HBoxContainer {
 	void _favorite_button_pressed();
 	void _explore_button_pressed();
 
+	ProjectList *get_list() const;
+
+	void _accessibility_action_open(const Variant &p_data);
+	void _accessibility_action_scroll_into_view(const Variant &p_data);
+	void _accessibility_action_focus(const Variant &p_data);
+	void _accessibility_action_blur(const Variant &p_data);
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
@@ -92,6 +98,7 @@ class ProjectList : public ScrollContainer {
 	GDCLASS(ProjectList, ScrollContainer)
 
 	friend class ProjectManager;
+	friend class ProjectListItemControl;
 
 public:
 	enum FilterOption {
@@ -259,10 +266,12 @@ public:
 	void set_project_version(const String &p_project_path, int version);
 	int refresh_project(const String &dir_path);
 	void ensure_project_visible(int p_index);
+	int get_index(const ProjectListItemControl *p_control) const;
 
 	// Project list selection.
 
 	void select_project(int p_index);
+	void deselect_project(int p_index);
 	void select_first_visible_project();
 	Vector<Item> get_selected_projects() const;
 	const HashSet<String> &get_selected_project_keys() const;
@@ -286,5 +295,3 @@ public:
 
 	ProjectList();
 };
-
-#endif // PROJECT_LIST_H
diff --git a/engine/editor/project_manager/project_tag.cpp b/engine/editor/project_manager/project_tag.cpp
index fe4e5999..8b36d41b 100644
--- a/engine/editor/project_manager/project_tag.cpp
+++ b/engine/editor/project_manager/project_tag.cpp
@@ -68,7 +68,8 @@ ProjectTag::ProjectTag(const String &p_text, bool p_display_close) {
 	add_child(button);
 	button->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	button->set_text(p_text.capitalize());
-	button->set_focus_mode(FOCUS_NONE);
+	button->set_focus_mode(FOCUS_ACCESSIBILITY);
+	button->set_accessibility_name(vformat(TTR("Project Tag: %s"), p_text));
 	button->set_icon_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
 	button->set_theme_type_variation(SNAME("ProjectTagButton"));
 }
diff --git a/engine/editor/project_manager/project_tag.h b/engine/editor/project_manager/project_tag.h
index 2cd15f64..433d0476 100644
--- a/engine/editor/project_manager/project_tag.h
+++ b/engine/editor/project_manager/project_tag.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_TAG_H
-#define PROJECT_TAG_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 
@@ -52,5 +51,3 @@ public:
 
 	ProjectTag(const String &p_text, bool p_display_close = false);
 };
-
-#endif // PROJECT_TAG_H
diff --git a/engine/editor/project_manager/quick_settings_dialog.cpp b/engine/editor/project_manager/quick_settings_dialog.cpp
index a805f6c7..96c5311f 100644
--- a/engine/editor/project_manager/quick_settings_dialog.cpp
+++ b/engine/editor/project_manager/quick_settings_dialog.cpp
@@ -48,6 +48,7 @@ void QuickSettingsDialog::_fetch_setting_values() {
 	editor_themes.clear();
 	editor_scales.clear();
 	editor_network_modes.clear();
+	editor_engine_version_update_modes.clear();
 	editor_directory_naming_conventions.clear();
 
 	{
@@ -65,6 +66,8 @@ void QuickSettingsDialog::_fetch_setting_values() {
 				editor_scales = pi.hint_string.split(",");
 			} else if (pi.name == "network/connection/network_mode") {
 				editor_network_modes = pi.hint_string.split(",");
+			} else if (pi.name == "network/connection/engine_version_update_mode") {
+				editor_engine_version_update_modes = pi.hint_string.split(",");
 			} else if (pi.name == "project_manager/directory_naming_convention") {
 				editor_directory_naming_conventions = pi.hint_string.split(",");
 			}
@@ -130,6 +133,22 @@ void QuickSettingsDialog::_update_current_values() {
 		}
 	}
 
+	// Engine version update mode options.
+	{
+		const int current_update_mode = EDITOR_GET("network/connection/engine_version_update_mode");
+
+		for (int i = 0; i < editor_engine_version_update_modes.size(); i++) {
+			const String &engine_version_update_mode_value = editor_engine_version_update_modes[i];
+			if (current_update_mode == i) {
+				engine_version_update_mode_button->set_text(engine_version_update_mode_value);
+				engine_version_update_mode_button->select(i);
+
+				// Disables Engine Version Update Mode selection if Network mode is set to Offline.
+				engine_version_update_mode_button->set_disabled(!EDITOR_GET("network/connection/network_mode"));
+			}
+		}
+	}
+
 	// Project directory naming options.
 	{
 		const int current_directory_naming = EDITOR_GET("project_manager/directory_naming_convention");
@@ -177,6 +196,13 @@ void QuickSettingsDialog::_scale_selected(int p_id) {
 
 void QuickSettingsDialog::_network_mode_selected(int p_id) {
 	_set_setting_value("network/connection/network_mode", p_id);
+
+	// Disables Engine Version Update Mode selection if Network mode is set to Offline.
+	engine_version_update_mode_button->set_disabled(!p_id);
+}
+
+void QuickSettingsDialog::_engine_version_update_mode_selected(int p_id) {
+	_set_setting_value("network/connection/engine_version_update_mode", p_id);
 }
 
 void QuickSettingsDialog::_directory_naming_convention_selected(int p_id) {
@@ -192,7 +218,11 @@ void QuickSettingsDialog::_set_setting_value(const String &p_setting, const Vari
 		restart_required_label->show();
 
 		if (!restart_required_button) {
-			restart_required_button = add_button(TTR("Restart Now"), !GLOBAL_GET("gui/common/swap_cancel_ok"));
+			int ed_swap_cancel_ok = EDITOR_GET("interface/editor/accept_dialog_cancel_ok_buttons");
+			if (ed_swap_cancel_ok == 0) {
+				ed_swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok() ? 2 : 1;
+			}
+			restart_required_button = add_button(TTR("Restart Now"), ed_swap_cancel_ok != 2);
 			restart_required_button->connect(SceneStringName(pressed), callable_mp(this, &QuickSettingsDialog::_request_restart));
 		}
 	}
@@ -316,6 +346,20 @@ QuickSettingsDialog::QuickSettingsDialog() {
 			_add_setting_control(TTR("Network Mode"), network_mode_option_button);
 		}
 
+		// Engine version update mode options.
+		{
+			engine_version_update_mode_button = memnew(OptionButton);
+			engine_version_update_mode_button->set_fit_to_longest_item(false);
+			engine_version_update_mode_button->connect(SceneStringName(item_selected), callable_mp(this, &QuickSettingsDialog::_engine_version_update_mode_selected));
+
+			for (int i = 0; i < editor_engine_version_update_modes.size(); i++) {
+				const String &engine_version_update_mode_value = editor_engine_version_update_modes[i];
+				engine_version_update_mode_button->add_item(engine_version_update_mode_value, i);
+			}
+
+			_add_setting_control(TTR("Engine Version Update Mode"), engine_version_update_mode_button);
+		}
+
 		// Project directory naming options.
 		{
 			directory_naming_convention_button = memnew(OptionButton);
diff --git a/engine/editor/project_manager/quick_settings_dialog.h b/engine/editor/project_manager/quick_settings_dialog.h
index 938a6de1..765bacc4 100644
--- a/engine/editor/project_manager/quick_settings_dialog.h
+++ b/engine/editor/project_manager/quick_settings_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef QUICK_SETTINGS_DIALOG_H
-#define QUICK_SETTINGS_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -49,6 +48,7 @@ class QuickSettingsDialog : public AcceptDialog {
 	Vector<String> editor_themes;
 	Vector<String> editor_scales;
 	Vector<String> editor_network_modes;
+	Vector<String> editor_engine_version_update_modes;
 	Vector<String> editor_directory_naming_conventions;
 
 	void _fetch_setting_values();
@@ -67,6 +67,7 @@ class QuickSettingsDialog : public AcceptDialog {
 	OptionButton *theme_option_button = nullptr;
 	OptionButton *scale_option_button = nullptr;
 	OptionButton *network_mode_option_button = nullptr;
+	OptionButton *engine_version_update_mode_button = nullptr;
 	OptionButton *directory_naming_convention_button = nullptr;
 
 	Label *custom_theme_label = nullptr;
@@ -77,6 +78,7 @@ class QuickSettingsDialog : public AcceptDialog {
 	void _theme_selected(int p_id);
 	void _scale_selected(int p_id);
 	void _network_mode_selected(int p_id);
+	void _engine_version_update_mode_selected(int p_id);
 	void _directory_naming_convention_selected(int p_id);
 	void _set_setting_value(const String &p_setting, const Variant &p_value, bool p_restart_required = false);
 
@@ -94,5 +96,3 @@ public:
 
 	QuickSettingsDialog();
 };
-
-#endif // QUICK_SETTINGS_DIALOG_H
diff --git a/engine/editor/project_settings_editor.cpp b/engine/editor/project_settings_editor.cpp
index 1528ea3a..db5113fa 100644
--- a/engine/editor/project_settings_editor.cpp
+++ b/engine/editor/project_settings_editor.cpp
@@ -76,9 +76,17 @@ void ProjectSettingsEditor::popup_project_settings(bool p_clear_filter) {
 }
 
 void ProjectSettingsEditor::queue_save() {
+	settings_changed = true;
 	timer->start();
 }
 
+void ProjectSettingsEditor::_save() {
+	settings_changed = false;
+	if (ps) {
+		ps->save();
+	}
+}
+
 void ProjectSettingsEditor::set_plugins_page() {
 	tab_container->set_current_tab(tab_container->get_tab_idx_from_control(plugin_settings));
 }
@@ -139,7 +147,7 @@ void ProjectSettingsEditor::_add_setting() {
 	undo_redo->add_undo_method(this, "queue_save");
 	undo_redo->commit_action();
 
-	general_settings_inspector->set_current_section(setting.get_slice("/", 1));
+	general_settings_inspector->set_current_section(setting.get_slicec('/', 1));
 	add_button->release_focus();
 }
 
@@ -601,6 +609,10 @@ void ProjectSettingsEditor::_notification(int p_what) {
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			if (!is_visible()) {
 				EditorSettings::get_singleton()->set_project_metadata("dialog_bounds", "project_settings", Rect2(get_position(), get_size()));
+				if (settings_changed) {
+					timer->stop();
+					_save();
+				}
 			}
 		} break;
 
@@ -647,13 +659,13 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 
 	search_box = memnew(LineEdit);
 	search_box->set_placeholder(TTR("Filter Settings"));
+	search_box->set_accessibility_name(TTRC("Filter Settings"));
 	search_box->set_clear_button_enabled(true);
 	search_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	search_bar->add_child(search_box);
 
 	advanced = memnew(CheckButton);
 	advanced->set_text(TTR("Advanced Settings"));
-	advanced->connect(SceneStringName(toggled), callable_mp(this, &ProjectSettingsEditor::_advanced_toggled));
 	search_bar->add_child(advanced);
 
 	custom_properties = memnew(HBoxContainer);
@@ -661,17 +673,20 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 
 	property_box = memnew(LineEdit);
 	property_box->set_placeholder(TTR("Select a Setting or Type its Name"));
+	property_box->set_accessibility_name(TTRC("Setting Name"));
 	property_box->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	property_box->connect(SceneStringName(text_changed), callable_mp(this, &ProjectSettingsEditor::_property_box_changed));
 	custom_properties->add_child(property_box);
 
 	feature_box = memnew(OptionButton);
 	feature_box->set_custom_minimum_size(Size2(120, 0) * EDSCALE);
+	feature_box->set_accessibility_name(TTRC("Feature"));
 	feature_box->connect(SceneStringName(item_selected), callable_mp(this, &ProjectSettingsEditor::_feature_selected));
 	custom_properties->add_child(feature_box);
 
 	type_box = memnew(OptionButton);
 	type_box->set_custom_minimum_size(Size2(120, 0) * EDSCALE);
+	type_box->set_accessibility_name(TTRC("Type"));
 	custom_properties->add_child(type_box);
 
 	add_button = memnew(Button);
@@ -720,6 +735,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 	restart_close_button = memnew(Button);
 	restart_close_button->set_flat(true);
 	restart_close_button->connect(SceneStringName(pressed), callable_mp(this, &ProjectSettingsEditor::_editor_restart_close));
+	restart_close_button->set_accessibility_name(TTRC("Close"));
 	restart_hb->add_child(restart_close_button);
 
 	action_map_editor = memnew(ActionMapEditor);
@@ -763,7 +779,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 
 	timer = memnew(Timer);
 	timer->set_wait_time(1.5);
-	timer->connect("timeout", callable_mp(ps, &ProjectSettings::save));
+	timer->connect("timeout", callable_mp(this, &ProjectSettingsEditor::_save));
 	timer->set_one_shot(true);
 	add_child(timer);
 
@@ -774,6 +790,7 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) {
 	if (use_advanced) {
 		advanced->set_pressed(true);
 	}
+	advanced->connect(SceneStringName(toggled), callable_mp(this, &ProjectSettingsEditor::_advanced_toggled));
 
 	_update_advanced(use_advanced);
 
diff --git a/engine/editor/project_settings_editor.h b/engine/editor/project_settings_editor.h
index 85ca9d90..a6f846ca 100644
--- a/engine/editor/project_settings_editor.h
+++ b/engine/editor/project_settings_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROJECT_SETTINGS_EDITOR_H
-#define PROJECT_SETTINGS_EDITOR_H
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "editor/action_map_editor.h"
@@ -82,6 +81,8 @@ class ProjectSettingsEditor : public AcceptDialog {
 	ImportDefaultsEditor *import_defaults_editor = nullptr;
 	EditorData *data = nullptr;
 
+	bool settings_changed = false;
+
 	void _advanced_toggled(bool p_button_pressed);
 	void _update_advanced(bool p_is_advanced);
 	void _property_box_changed(const String &p_text);
@@ -114,6 +115,7 @@ class ProjectSettingsEditor : public AcceptDialog {
 	void _action_reordered(const String &p_action_name, const String &p_relative_to, bool p_before);
 	void _update_action_map_editor();
 	void _update_theme();
+	void _save();
 
 protected:
 	void _notification(int p_what);
@@ -136,5 +138,3 @@ public:
 
 	ProjectSettingsEditor(EditorData *p_data);
 };
-
-#endif // PROJECT_SETTINGS_EDITOR_H
diff --git a/engine/editor/project_upgrade_tool.cpp b/engine/editor/project_upgrade_tool.cpp
new file mode 100644
index 00000000..8d72d40b
--- /dev/null
+++ b/engine/editor/project_upgrade_tool.cpp
@@ -0,0 +1,135 @@
+/**************************************************************************/
+/*  project_upgrade_tool.cpp                                              */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "project_upgrade_tool.h"
+
+#include "core/io/dir_access.h"
+#include "editor/editor_file_system.h"
+#include "editor/editor_node.h"
+#include "editor/editor_settings.h"
+#include "editor/gui/editor_scene_tabs.h"
+#include "editor/themes/editor_scale.h"
+#include "scene/gui/dialogs.h"
+
+void ProjectUpgradeTool::_add_files(EditorFileSystemDirectory *p_dir, Vector<String> &r_reimport_paths, Vector<String> &r_resave_scenes, Vector<String> &r_resave_resources) {
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	for (int i = 0; i < p_dir->get_file_count(); i++) {
+		const String path = p_dir->get_file_path(i);
+		const String ext = path.get_extension();
+		if (ext == "tscn" || ext == "scn") {
+			r_resave_scenes.append(path);
+		} else if (ext == "tres" || ext == "res") {
+			r_resave_resources.append(path);
+		} else if (da->file_exists(path + ".import")) {
+			r_reimport_paths.append(path);
+		}
+	}
+
+	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
+		_add_files(p_dir->get_subdir(i), r_reimport_paths, r_resave_scenes, r_resave_resources);
+	}
+}
+
+void ProjectUpgradeTool::_bind_methods() {
+	ADD_SIGNAL(MethodInfo("upgrade_finished"));
+}
+
+void ProjectUpgradeTool::popup_dialog() {
+	if (!upgrade_dialog) {
+		upgrade_dialog = memnew(ConfirmationDialog);
+		upgrade_dialog->set_autowrap(true);
+		upgrade_dialog->set_text(TTRC("Different engine version may have minor differences in various Resources, like additional fields or removed properties. When upgrading the project to a new version, such changes can cause diffs when saving scenes or resources, or reimporting.\n\nThis tool ensures that such changes are performed all at once. It will:\n- Regenerate UID cache\n- Load and re-save every text/binary Resource\n- Reimport every importable Resource\n\nFull upgrade will take considerable amount of time, but afterwards saving/reimporting any scene/resource should not cause unintended changes."));
+		upgrade_dialog->get_ok_button()->set_text(TTRC("Restart & Upgrade"));
+		upgrade_dialog->get_label()->set_custom_minimum_size(Size2(750 * EDSCALE, 0));
+		EditorNode::get_singleton()->get_gui_base()->add_child(upgrade_dialog);
+		upgrade_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ProjectUpgradeTool::prepare_upgrade));
+	}
+	upgrade_dialog->popup_centered();
+}
+
+void ProjectUpgradeTool::prepare_upgrade() {
+	EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RUN_ON_RESTART, true);
+
+	Vector<String> reimport_paths;
+	Vector<String> resave_scenes;
+	Vector<String> resave_resources;
+	_add_files(EditorFileSystem::get_singleton()->get_filesystem(), reimport_paths, resave_scenes, resave_resources);
+
+	EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_REIMPORT_PATHS, reimport_paths);
+	EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_SCENES, resave_scenes);
+	EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_RESOURCES, resave_resources);
+
+	// Delay to avoid deadlocks, since this dialog can be triggered by loading a scene.
+	callable_mp(EditorNode::get_singleton(), &EditorNode::restart_editor).call_deferred(false);
+}
+
+void ProjectUpgradeTool::begin_upgrade() {
+	EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RUN_ON_RESTART, false);
+	DirAccess::remove_absolute("res://.godot/uid_cache.bin");
+}
+
+void ProjectUpgradeTool::finish_upgrade() {
+	EditorNode::get_singleton()->trigger_menu_option(EditorSceneTabs::SCENE_CLOSE_ALL, true);
+
+	Vector<String> paths = EditorSettings::get_singleton()->get_project_metadata(META_PROJECT_UPGRADE_TOOL, META_REIMPORT_PATHS, Vector<String>());
+	EditorFileSystem::get_singleton()->reimport_files(paths);
+	EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_REIMPORT_PATHS, Variant());
+
+	{
+		paths = EditorSettings::get_singleton()->get_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_SCENES, Vector<String>());
+		EditorProgress ep("uid_upgrade_resave", TTR("Updating Project Scenes"), paths.size());
+
+		int step = 0;
+		for (const String &file_path : paths) {
+			ep.step(TTR("Re-saving scene:") + " " + file_path, step++);
+			EditorNode::get_singleton()->load_scene(file_path);
+			EditorNode::get_singleton()->trigger_menu_option(EditorNode::FILE_SAVE_SCENE, true);
+			EditorNode::get_singleton()->trigger_menu_option(EditorNode::FILE_CLOSE, true);
+		}
+		EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_SCENES, Variant());
+	}
+
+	{
+		paths = EditorSettings::get_singleton()->get_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_RESOURCES, Vector<String>());
+		EditorProgress ep("uid_upgrade_resave", TTR("Updating Project Resources"), paths.size());
+
+		int step = 0;
+		for (const String &file_path : paths) {
+			ep.step(TTR("Re-saving resource:") + " " + file_path, step++);
+			Ref<Resource> res = ResourceLoader::load(file_path, "", ResourceFormatLoader::CACHE_MODE_REPLACE);
+			if (res.is_valid()) {
+				ResourceSaver::save(res);
+			}
+		}
+		EditorSettings::get_singleton()->set_project_metadata(META_PROJECT_UPGRADE_TOOL, META_RESAVE_RESOURCES, Variant());
+	}
+
+	emit_signal(UPGRADE_FINISHED);
+}
diff --git a/engine/editor/surface_upgrade_tool.h b/engine/editor/project_upgrade_tool.h
similarity index 72%
rename from engine/editor/surface_upgrade_tool.h
rename to engine/editor/project_upgrade_tool.h
index 130c49dc..1ab4307c 100644
--- a/engine/editor/surface_upgrade_tool.h
+++ b/engine/editor/project_upgrade_tool.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  surface_upgrade_tool.h                                                */
+/*  project_upgrade_tool.h                                                */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,55 +28,35 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SURFACE_UPGRADE_TOOL_H
-#define SURFACE_UPGRADE_TOOL_H
+#pragma once
 
-#include "scene/gui/dialogs.h"
+#include "core/object/class_db.h"
 
+class ConfirmationDialog;
 class EditorFileSystemDirectory;
 
-class SurfaceUpgradeTool : public Object {
-	GDCLASS(SurfaceUpgradeTool, Object);
+class ProjectUpgradeTool : public Object {
+	GDCLASS(ProjectUpgradeTool, Object);
 
-	static SurfaceUpgradeTool *singleton;
+	ConfirmationDialog *upgrade_dialog = nullptr;
 
-	Mutex mutex;
+	void _add_files(EditorFileSystemDirectory *p_dir, Vector<String> &r_reimport_paths, Vector<String> &r_resave_scenes, Vector<String> &r_resave_resources);
 
-	bool show_requested = false;
-	bool updating = false;
+	const String META_REIMPORT_PATHS = "reimport_paths";
+	const String META_RESAVE_SCENES = "resave_scenes";
+	const String META_RESAVE_RESOURCES = "resave_resources";
 
-	static void _try_show_popup();
-	void _show_popup();
-
-	void _add_files(EditorFileSystemDirectory *p_dir, Vector<String> &r_reimport_paths, Vector<String> &r_resave_paths);
+public:
+	const String META_PROJECT_UPGRADE_TOOL = "project_upgrade_tool";
+	const String META_RUN_ON_RESTART = "run_on_restart";
+	const StringName UPGRADE_FINISHED = "upgrade_finished";
 
 protected:
 	static void _bind_methods();
 
 public:
-	static SurfaceUpgradeTool *get_singleton() { return singleton; }
-
-	bool is_show_requested() const { return show_requested; }
-	void show_popup() { _show_popup(); }
-
+	void popup_dialog();
 	void prepare_upgrade();
 	void begin_upgrade();
 	void finish_upgrade();
-
-	SurfaceUpgradeTool();
-	~SurfaceUpgradeTool();
 };
-
-class SurfaceUpgradeDialog : public ConfirmationDialog {
-	GDCLASS(SurfaceUpgradeDialog, ConfirmationDialog);
-
-protected:
-	void _notification(int p_what);
-
-public:
-	void popup_on_demand();
-
-	SurfaceUpgradeDialog();
-};
-
-#endif // SURFACE_UPGRADE_TOOL_H
diff --git a/engine/editor/property_selector.cpp b/engine/editor/property_selector.cpp
index f0e9efe8..d1a06742 100644
--- a/engine/editor/property_selector.cpp
+++ b/engine/editor/property_selector.cpp
@@ -81,7 +81,7 @@ void PropertySelector::_update_search() {
 	TreeItem *root = search_options->create_item();
 
 	// Allow using spaces in place of underscores in the search string (makes the search more fault-tolerant).
-	const String search_text = search_box->get_text().replace(" ", "_");
+	const String search_text = search_box->get_text().replace_char(' ', '_');
 
 	if (properties) {
 		List<PropertyInfo> props;
@@ -180,7 +180,7 @@ void PropertySelector::_update_search() {
 			Variant::construct(type, v, nullptr, 0, ce);
 			v.get_method_list(&methods);
 		} else {
-			Ref<Script> script_ref = Object::cast_to<Script>(ObjectDB::get_instance(script));
+			Ref<Script> script_ref = ObjectDB::get_ref<Script>(script);
 			if (script_ref.is_valid()) {
 				if (script_ref->is_built_in()) {
 					script_ref->reload(true);
@@ -226,7 +226,7 @@ void PropertySelector::_update_search() {
 
 				Ref<Texture2D> icon;
 				script_methods = false;
-				String rep = mi.name.replace("*", "");
+				String rep = mi.name.remove_char('*');
 				if (mi.name == "*Script Methods") {
 					icon = search_options->get_editor_theme_icon(SNAME("Script"));
 					script_methods = true;
@@ -238,7 +238,7 @@ void PropertySelector::_update_search() {
 				continue;
 			}
 
-			String name = mi.name.get_slice(":", 0);
+			String name = mi.name.get_slicec(':', 0);
 			if (!script_methods && name.begins_with("_") && !(mi.flags & METHOD_FLAG_VIRTUAL)) {
 				continue;
 			}
@@ -259,8 +259,8 @@ void PropertySelector::_update_search() {
 
 			String desc;
 			if (mi.name.contains_char(':')) {
-				desc = mi.name.get_slice(":", 1) + " ";
-				mi.name = mi.name.get_slice(":", 0);
+				desc = mi.name.get_slicec(':', 1) + " ";
+				mi.name = mi.name.get_slicec(':', 0);
 			} else if (mi.return_val.type != Variant::NIL) {
 				desc = Variant::get_type_name(mi.return_val.type);
 			} else {
@@ -269,20 +269,21 @@ void PropertySelector::_update_search() {
 
 			desc += vformat(" %s(", mi.name);
 
-			for (List<PropertyInfo>::Iterator arg_itr = mi.arguments.begin(); arg_itr != mi.arguments.end(); ++arg_itr) {
-				if (arg_itr != mi.arguments.begin()) {
+			for (int64_t i = 0; i < mi.arguments.size(); ++i) {
+				PropertyInfo &arg = mi.arguments.write[i];
+				if (i > 0) {
 					desc += ", ";
 				}
 
-				desc += arg_itr->name;
+				desc += arg.name;
 
-				if (arg_itr->type == Variant::NIL) {
+				if (arg.type == Variant::NIL) {
 					desc += ": Variant";
-				} else if (arg_itr->name.contains_char(':')) {
-					desc += vformat(": %s", arg_itr->name.get_slice(":", 1));
-					arg_itr->name = arg_itr->name.get_slice(":", 0);
+				} else if (arg.name.contains_char(':')) {
+					desc += vformat(": %s", arg.name.get_slicec(':', 1));
+					arg.name = arg.name.get_slicec(':', 0);
 				} else {
-					desc += vformat(": %s", Variant::get_type_name(arg_itr->type));
+					desc += vformat(": %s", Variant::get_type_name(arg.type));
 				}
 			}
 
diff --git a/engine/editor/property_selector.h b/engine/editor/property_selector.h
index 48bc8a05..3bcbe9e1 100644
--- a/engine/editor/property_selector.h
+++ b/engine/editor/property_selector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROPERTY_SELECTOR_H
-#define PROPERTY_SELECTOR_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -85,5 +84,3 @@ public:
 
 	PropertySelector();
 };
-
-#endif // PROPERTY_SELECTOR_H
diff --git a/engine/editor/register_editor_types.cpp b/engine/editor/register_editor_types.cpp
index 1dfe399a..80551de8 100644
--- a/engine/editor/register_editor_types.cpp
+++ b/engine/editor/register_editor_types.cpp
@@ -73,6 +73,7 @@
 #include "editor/plugins/audio_stream_randomizer_editor_plugin.h"
 #include "editor/plugins/bit_map_editor_plugin.h"
 #include "editor/plugins/bone_map_editor_plugin.h"
+#include "editor/plugins/camera_2d_editor_plugin.h"
 #include "editor/plugins/camera_3d_editor_plugin.h"
 #include "editor/plugins/cast_2d_editor_plugin.h"
 #include "editor/plugins/collision_polygon_2d_editor_plugin.h"
@@ -252,6 +253,7 @@ void register_editor_types() {
 	EditorPlugins::add_by_type<VoxelGIEditorPlugin>();
 
 	// 2D
+	EditorPlugins::add_by_type<Camera2DEditorPlugin>();
 	EditorPlugins::add_by_type<CollisionPolygon2DEditorPlugin>();
 	EditorPlugins::add_by_type<CollisionShape2DEditorPlugin>();
 	EditorPlugins::add_by_type<CPUParticles2DEditorPlugin>();
@@ -277,8 +279,8 @@ void register_editor_types() {
 
 	GLOBAL_DEF("editor/naming/default_signal_callback_name", "_on_{node_name}_{signal_name}");
 	GLOBAL_DEF("editor/naming/default_signal_callback_to_self_name", "_on_{signal_name}");
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/naming/scene_name_casing", PROPERTY_HINT_ENUM, "Auto,PascalCase,snake_case,kebab-case"), EditorNode::SCENE_NAME_CASING_SNAKE_CASE);
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/naming/script_name_casing", PROPERTY_HINT_ENUM, "Auto,PascalCase,snake_case,kebab-case"), ScriptLanguage::SCRIPT_NAME_CASING_AUTO);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/naming/scene_name_casing", PROPERTY_HINT_ENUM, "Auto,PascalCase,snake_case,kebab-case,camelCase"), EditorNode::SCENE_NAME_CASING_SNAKE_CASE);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/naming/script_name_casing", PROPERTY_HINT_ENUM, "Auto,PascalCase,snake_case,kebab-case,camelCase"), ScriptLanguage::SCRIPT_NAME_CASING_AUTO);
 
 	GLOBAL_DEF("editor/import/reimport_missing_imported_files", true);
 	GLOBAL_DEF("editor/import/use_multiple_threads", true);
diff --git a/engine/editor/register_editor_types.h b/engine/editor/register_editor_types.h
index 82d74832..2e1c6d15 100644
--- a/engine/editor/register_editor_types.h
+++ b/engine/editor/register_editor_types.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_EDITOR_TYPES_H
-#define REGISTER_EDITOR_TYPES_H
+#pragma once
 
 void register_editor_types();
 void unregister_editor_types();
-
-#endif // REGISTER_EDITOR_TYPES_H
diff --git a/engine/editor/register_exporters.h b/engine/editor/register_exporters.h
index 5faed565..1f105fbc 100644
--- a/engine/editor/register_exporters.h
+++ b/engine/editor/register_exporters.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_EXPORTERS_H
-#define REGISTER_EXPORTERS_H
+#pragma once
 
 void register_exporter_types();
 void register_exporters();
-
-#endif // REGISTER_EXPORTERS_H
diff --git a/engine/editor/rename_dialog.cpp b/engine/editor/rename_dialog.cpp
index b4bc8f65..153d6636 100644
--- a/engine/editor/rename_dialog.cpp
+++ b/engine/editor/rename_dialog.cpp
@@ -69,6 +69,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 
 	lne_search = memnew(LineEdit);
 	lne_search->set_name("lne_search");
+	lne_search->set_accessibility_name(TTRC("Search"));
 	lne_search->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	Label *lbl_replace = memnew(Label);
@@ -76,6 +77,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 
 	lne_replace = memnew(LineEdit);
 	lne_replace->set_name("lne_replace");
+	lne_replace->set_accessibility_name(TTRC("Replace"));
 	lne_replace->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	grd_main->add_child(lbl_search);
@@ -90,6 +92,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 
 	lne_prefix = memnew(LineEdit);
 	lne_prefix->set_name("lne_prefix");
+	lne_prefix->set_accessibility_name(TTRC("Prefix"));
 	lne_prefix->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	Label *lbl_suffix = memnew(Label);
@@ -97,6 +100,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 
 	lne_suffix = memnew(LineEdit);
 	lne_suffix->set_name("lne_suffix");
+	lne_prefix->set_accessibility_name(TTRC("Suffix"));
 	lne_suffix->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	grd_main->add_child(lbl_prefix);
@@ -209,6 +213,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 
 	spn_count_start = memnew(SpinBox);
 	spn_count_start->set_tooltip_text(TTR("Initial value for the counter."));
+	spn_count_start->set_accessibility_name(TTRC("Counter Initial Value"));
 	spn_count_start->set_step(1);
 	spn_count_start->set_min(0);
 	hbc_count_options->add_child(spn_count_start);
@@ -220,6 +225,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 
 	spn_count_step = memnew(SpinBox);
 	spn_count_step->set_tooltip_text(TTR("Amount by which counter is incremented for each node."));
+	spn_count_step->set_accessibility_name(TTRC("Counter Step"));
 	spn_count_step->set_step(1);
 	hbc_count_options->add_child(spn_count_step);
 
@@ -230,6 +236,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 
 	spn_count_padding = memnew(SpinBox);
 	spn_count_padding->set_tooltip_text(TTR("Minimum number of digits for the counter.\nMissing digits are padded with leading zeros."));
+	spn_count_padding->set_accessibility_name(TTRC("Minimum Number of Digits"));
 	spn_count_padding->set_step(1);
 	hbc_count_options->add_child(spn_count_padding);
 
@@ -254,6 +261,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 	hbc_style->add_child(lbl_style);
 
 	opt_style = memnew(OptionButton);
+	opt_style->set_accessibility_name(TTRC("Style"));
 	opt_style->add_item(TTR("Keep"));
 	opt_style->add_item(TTR("PascalCase to snake_case"));
 	opt_style->add_item(TTR("snake_case to PascalCase"));
@@ -269,6 +277,7 @@ RenameDialog::RenameDialog(SceneTreeEditor *p_scene_tree_editor) {
 	hbc_case->add_child(lbl_case);
 
 	opt_case = memnew(OptionButton);
+	opt_case->set_accessibility_name(TTRC("Case"));
 	opt_case->add_item(TTR("Keep"));
 	opt_case->add_item(TTR("To Lowercase"));
 	opt_case->add_item(TTR("To Uppercase"));
@@ -520,7 +529,7 @@ String RenameDialog::_postprocess(const String &subject) {
 				buffer += result.substr(start, 1).to_upper();
 				end = start + 1;
 			}
-			buffer += result.substr(end, result.size() - (end + 1));
+			buffer += result.substr(end);
 			result = buffer.to_pascal_case();
 		}
 	}
diff --git a/engine/editor/rename_dialog.h b/engine/editor/rename_dialog.h
index e0a47877..1aa39679 100644
--- a/engine/editor/rename_dialog.h
+++ b/engine/editor/rename_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENAME_DIALOG_H
-#define RENAME_DIALOG_H
+#pragma once
 
 #include "editor/gui/scene_tree_editor.h"
 #include "scene/gui/dialogs.h"
@@ -110,5 +109,3 @@ public:
 
 	RenameDialog(SceneTreeEditor *p_scene_tree_editor);
 };
-
-#endif // RENAME_DIALOG_H
diff --git a/engine/editor/renames_map_3_to_4.h b/engine/editor/renames_map_3_to_4.h
index 452a741b..1cb78ea4 100644
--- a/engine/editor/renames_map_3_to_4.h
+++ b/engine/editor/renames_map_3_to_4.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENAMES_MAP_3_TO_4_H
-#define RENAMES_MAP_3_TO_4_H
+#pragma once
 
 #ifndef DISABLE_DEPRECATED
 
@@ -52,5 +51,3 @@ struct RenamesMap3To4 {
 };
 
 #endif // DISABLE_DEPRECATED
-
-#endif // RENAMES_MAP_3_TO_4_H
diff --git a/engine/editor/reparent_dialog.cpp b/engine/editor/reparent_dialog.cpp
index 42f7f6f4..ff8cfd5e 100644
--- a/engine/editor/reparent_dialog.cpp
+++ b/engine/editor/reparent_dialog.cpp
@@ -87,6 +87,3 @@ ReparentDialog::ReparentDialog() {
 
 	set_ok_button_text(TTR("Reparent"));
 }
-
-ReparentDialog::~ReparentDialog() {
-}
diff --git a/engine/editor/reparent_dialog.h b/engine/editor/reparent_dialog.h
index 2ca26fcd..3bcca07d 100644
--- a/engine/editor/reparent_dialog.h
+++ b/engine/editor/reparent_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REPARENT_DIALOG_H
-#define REPARENT_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -53,7 +52,4 @@ public:
 	void set_current(const HashSet<Node *> &p_selection);
 
 	ReparentDialog();
-	~ReparentDialog();
 };
-
-#endif // REPARENT_DIALOG_H
diff --git a/engine/editor/run_instances_dialog.cpp b/engine/editor/run_instances_dialog.cpp
index 2811ada5..1e2d598c 100644
--- a/engine/editor/run_instances_dialog.cpp
+++ b/engine/editor/run_instances_dialog.cpp
@@ -339,6 +339,7 @@ RunInstancesDialog::RunInstancesDialog() {
 	instance_count->set_min(1);
 	instance_count->set_max(20);
 	instance_count->set_value(EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_instance_count", stored_data.size()));
+	instance_count->set_accessibility_name(TTRC("Number of Instances"));
 
 	args_gc->add_child(instance_count);
 	instance_count->connect(SceneStringName(value_changed), callable_mp(this, &RunInstancesDialog::_start_instance_timer).unbind(1));
@@ -349,6 +350,7 @@ RunInstancesDialog::RunInstancesDialog() {
 	main_args_edit = memnew(LineEdit);
 	main_args_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	main_args_edit->set_placeholder(TTR("Space-separated arguments, example: host player1 blue"));
+	main_args_edit->set_accessibility_name(TTRC("Launch Arguments"));
 	args_gc->add_child(main_args_edit);
 	_fetch_main_args();
 	ProjectSettings::get_singleton()->connect("settings_changed", callable_mp(this, &RunInstancesDialog::_fetch_main_args));
@@ -358,6 +360,7 @@ RunInstancesDialog::RunInstancesDialog() {
 	main_features_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	main_features_edit->set_placeholder(TTR("Comma-separated tags, example: demo, steam, event"));
 	main_features_edit->set_text(EditorSettings::get_singleton()->get_project_metadata("debug_options", "run_main_feature_tags", ""));
+	main_features_edit->set_accessibility_name(TTRC("Feature Tags"));
 	args_gc->add_child(main_features_edit);
 	main_features_edit->connect(SceneStringName(text_changed), callable_mp(this, &RunInstancesDialog::_start_main_timer).unbind(1));
 
diff --git a/engine/editor/run_instances_dialog.h b/engine/editor/run_instances_dialog.h
index a7cca88b..ad2d9da7 100644
--- a/engine/editor/run_instances_dialog.h
+++ b/engine/editor/run_instances_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RUN_INSTANCES_DIALOG_H
-#define RUN_INSTANCES_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -104,5 +103,3 @@ public:
 	static RunInstancesDialog *get_singleton() { return singleton; }
 	RunInstancesDialog();
 };
-
-#endif // RUN_INSTANCES_DIALOG_H
diff --git a/engine/editor/scene_create_dialog.cpp b/engine/editor/scene_create_dialog.cpp
index c197950a..24ad3064 100644
--- a/engine/editor/scene_create_dialog.cpp
+++ b/engine/editor/scene_create_dialog.cpp
@@ -83,7 +83,7 @@ void SceneCreateDialog::browse_types() {
 }
 
 void SceneCreateDialog::on_type_picked() {
-	other_type_display->set_text(select_node_dialog->get_selected_type().get_slice(" ", 0));
+	other_type_display->set_text(select_node_dialog->get_selected_type().get_slicec(' ', 0));
 	if (node_type_other->is_pressed()) {
 		validation_panel->update();
 	} else {
@@ -226,6 +226,7 @@ SceneCreateDialog::SceneCreateDialog() {
 
 		node_type_other = memnew(CheckBox);
 		hb->add_child(node_type_other);
+		node_type_other->set_accessibility_name(TTRC("Other Type"));
 		node_type_other->set_button_group(node_type_group);
 		node_type_other->set_meta(type_meta, ROOT_OTHER);
 
@@ -234,12 +235,14 @@ SceneCreateDialog::SceneCreateDialog() {
 		spacing->set_custom_minimum_size(Size2(4 * EDSCALE, 0));
 
 		other_type_display = memnew(LineEdit);
+		other_type_display->set_accessibility_name(TTRC("Other Type"));
 		hb->add_child(other_type_display);
 		other_type_display->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		other_type_display->set_editable(false);
 		other_type_display->set_text("Node");
 
 		select_node_button = memnew(Button);
+		select_node_button->set_accessibility_name(TTRC("Select Node"));
 		hb->add_child(select_node_button);
 		select_node_button->connect(SceneStringName(pressed), callable_mp(this, &SceneCreateDialog::browse_types));
 	}
@@ -253,6 +256,7 @@ SceneCreateDialog::SceneCreateDialog() {
 
 		scene_name_edit = memnew(LineEdit);
 		hb->add_child(scene_name_edit);
+		scene_name_edit->set_accessibility_name(TTRC("Scene Name:"));
 		scene_name_edit->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 		scene_name_edit->connect(SceneStringName(text_submitted), callable_mp(this, &SceneCreateDialog::accept_create).unbind(1));
 
@@ -261,6 +265,7 @@ SceneCreateDialog::SceneCreateDialog() {
 		ResourceSaver::get_recognized_extensions(sd, &extensions);
 
 		scene_extension_picker = memnew(OptionButton);
+		scene_extension_picker->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 		hb->add_child(scene_extension_picker);
 		for (const String &E : extensions) {
 			scene_extension_picker->add_item("." + E);
diff --git a/engine/editor/scene_create_dialog.h b/engine/editor/scene_create_dialog.h
index c7a4a098..3252682e 100644
--- a/engine/editor/scene_create_dialog.h
+++ b/engine/editor/scene_create_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_CREATE_DIALOG_H
-#define SCENE_CREATE_DIALOG_H
+#pragma once
 
 #include "scene/gui/dialogs.h"
 
@@ -97,5 +96,3 @@ public:
 
 	SceneCreateDialog();
 };
-
-#endif // SCENE_CREATE_DIALOG_H
diff --git a/engine/editor/scene_tree_dock.cpp b/engine/editor/scene_tree_dock.cpp
index 267d35f9..ee1b8aa8 100644
--- a/engine/editor/scene_tree_dock.cpp
+++ b/engine/editor/scene_tree_dock.cpp
@@ -88,8 +88,12 @@ static void _restore_treeitem_custom_color(TreeItem *p_item) {
 }
 
 void SceneTreeDock::_inspect_hovered_node() {
-	select_node_hovered_at_end_of_drag = true;
 	Tree *tree = scene_tree->get_scene_tree();
+	if (!tree->get_rect().has_point(tree->get_local_mouse_position())) {
+		return;
+	}
+
+	select_node_hovered_at_end_of_drag = true;
 	TreeItem *item = tree->get_item_with_metadata(node_hovered_now->get_path());
 
 	_restore_treeitem_custom_color(tree_item_inspected);
@@ -150,7 +154,14 @@ void SceneTreeDock::input(const Ref<InputEvent> &p_event) {
 		}
 	}
 
-	if (tree_clicked && get_viewport()->gui_is_dragging()) {
+	Ref<InputEventMouseMotion> mm = p_event;
+	bool tree_hovered = false;
+	if (mm.is_valid()) {
+		Tree *tree = scene_tree->get_scene_tree();
+		tree_hovered = tree->get_rect().has_point(tree->get_local_mouse_position());
+	}
+
+	if ((tree_clicked || tree_hovered) && get_viewport()->gui_is_dragging()) {
 		_handle_hover_to_inspect();
 	}
 }
@@ -424,7 +435,7 @@ void SceneTreeDock::_perform_create_audio_stream_players(const Vector<String> &p
 
 void SceneTreeDock::_replace_with_branch_scene(const String &p_file, Node *base) {
 	// `move_child` + `get_index` doesn't really work for internal nodes.
-	ERR_FAIL_COND_MSG(base->get_internal_mode() != INTERNAL_MODE_DISABLED, "Trying to replace internal node, this is not supported.");
+	ERR_FAIL_COND_MSG(base->is_internal(), "Trying to replace internal node, this is not supported.");
 
 	Ref<PackedScene> sdata = ResourceLoader::load(p_file);
 	if (sdata.is_null()) {
@@ -549,7 +560,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			if (!profile_allow_editing) {
 				break;
 			}
-			if (editor_selection->get_selected_node_list().size() > 1) {
+			if (editor_selection->get_top_selected_node_list().size() > 1) {
 				if (!_validate_no_foreign()) {
 					break;
 				}
@@ -647,8 +658,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
-			if (selection.size() == 0) {
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
+			if (selection.is_empty()) {
 				break;
 			}
 
@@ -727,8 +738,9 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			}
 
 			Node *selected = scene_tree->get_selected();
-			if (!selected && !editor_selection->get_selected_node_list().is_empty()) {
-				selected = editor_selection->get_selected_node_list().front()->get();
+			const List<Node *> &top_node_list = editor_selection->get_top_selected_node_list();
+			if (!selected && !top_node_list.is_empty()) {
+				selected = top_node_list.front()->get();
 			}
 
 			if (selected) {
@@ -804,7 +816,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			bool MOVING_UP = !MOVING_DOWN;
 
 			Node *common_parent = scene_tree->get_selected()->get_parent();
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			selection.sort_custom<Node::Comparator>(); // sort by index
 			if (MOVING_DOWN) {
 				selection.reverse();
@@ -814,7 +826,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			int highest_id = 0;
 			for (Node *E : selection) {
 				// `move_child` + `get_index` doesn't really work for internal nodes.
-				ERR_FAIL_COND_MSG(E->get_internal_mode() != INTERNAL_MODE_DISABLED, "Trying to move internal node, this is not supported.");
+				ERR_FAIL_COND_MSG(E->is_internal(), "Trying to move internal node, this is not supported.");
 				int index = E->get_index(false);
 
 				if (index > highest_id) {
@@ -874,8 +886,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
-			if (selection.size() == 0) {
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
+			if (selection.is_empty()) {
 				break;
 			}
 
@@ -969,7 +981,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> nodes = editor_selection->get_selected_node_list();
+			List<Node *> nodes = editor_selection->get_top_selected_node_list();
 			HashSet<Node *> nodeset;
 			for (Node *E : nodes) {
 				nodeset.insert(E);
@@ -982,7 +994,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> nodes = editor_selection->get_selected_node_list();
+			List<Node *> nodes = editor_selection->get_top_selected_node_list();
 			ERR_FAIL_COND(nodes.size() != 1);
 
 			Node *node = nodes.front()->get();
@@ -993,7 +1005,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			}
 
 			// `move_child` + `get_index` doesn't really work for internal nodes.
-			ERR_FAIL_COND_MSG(node->get_internal_mode() != INTERNAL_MODE_DISABLED, "Trying to set internal node as scene root, this is not supported.");
+			ERR_FAIL_COND_MSG(node->is_internal(), "Trying to set internal node as scene root, this is not supported.");
 
 			//check that from node to root, all owners are right
 
@@ -1065,7 +1077,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> remove_list = editor_selection->get_selected_node_list();
+			List<Node *> remove_list = editor_selection->get_top_selected_node_list();
 
 			if (remove_list.is_empty()) {
 				return;
@@ -1135,7 +1147,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 			if (selection.size() != 1) {
 				accept->set_text(vformat(TTR("Saving the branch as a scene requires selecting only one node, but you have selected %d nodes."), selection.size()));
@@ -1191,7 +1203,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			new_scene_from_dialog->popup_file_dialog();
 		} break;
 		case TOOL_COPY_NODE_PATH: {
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			List<Node *>::Element *e = selection.front();
 			if (e) {
 				Node *node = e->get();
@@ -1203,7 +1215,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			}
 		} break;
 		case TOOL_SHOW_IN_FILE_SYSTEM: {
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			List<Node *>::Element *e = selection.front();
 			if (e) {
 				const Node *node = e->get();
@@ -1213,7 +1225,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			}
 		} break;
 		case TOOL_OPEN_DOCUMENTATION: {
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			for (const Node *node : selection) {
 				String class_name;
 				Ref<Script> script_base = node->get_script();
@@ -1237,12 +1249,15 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 		case TOOL_HIDE_FILTERED_OUT_PARENTS: {
 			scene_tree->set_hide_filtered_out_parents(!EDITOR_GET("docks/scene_tree/hide_filtered_out_parents"), true);
 		} break;
+		case TOOL_ACCESSIBILITY_WARNINGS: {
+			scene_tree->set_accessibility_warnings(!EDITOR_GET("docks/scene_tree/accessibility_warnings"), true);
+		} break;
 		case TOOL_SCENE_EDITABLE_CHILDREN: {
 			if (!profile_allow_editing) {
 				break;
 			}
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			if (selection.size() != 1) {
 				break;
 			}
@@ -1277,7 +1292,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			List<Node *>::Element *e = selection.front();
 			if (e) {
 				Node *node = e->get();
@@ -1312,7 +1327,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			List<Node *>::Element *e = selection.front();
 			if (e) {
 				Node *node = e->get();
@@ -1337,7 +1352,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			}
 		} break;
 		case TOOL_SCENE_OPEN: {
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			List<Node *>::Element *e = selection.front();
 			if (e) {
 				Node *node = e->get();
@@ -1358,7 +1373,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			List<Node *>::Element *e = selection.front();
 			if (e) {
 				Node *node = e->get();
@@ -1370,7 +1385,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			}
 		} break;
 		case TOOL_SCENE_OPEN_INHERITED: {
-			List<Node *> selection = editor_selection->get_selected_node_list();
+			List<Node *> selection = editor_selection->get_top_selected_node_list();
 			List<Node *>::Element *e = selection.front();
 			if (e) {
 				Node *node = e->get();
@@ -1381,14 +1396,14 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 		} break;
 		case TOOL_TOGGLE_SCENE_UNIQUE_NAME: {
 			// Enabling/disabling based on the same node based on which the checkbox in the menu is checked/unchecked.
-			List<Node *>::Element *first_selected = editor_selection->get_selected_node_list().front();
+			const List<Node *>::Element *first_selected = editor_selection->get_top_selected_node_list().front();
 			if (first_selected == nullptr) {
 				return;
 			}
 			if (first_selected->get() == EditorNode::get_singleton()->get_edited_scene()) {
 				// Exclude Root Node. It should never be unique name in its own scene!
 				editor_selection->remove_node(first_selected->get());
-				first_selected = editor_selection->get_selected_node_list().front();
+				first_selected = editor_selection->get_top_selected_node_list().front();
 				if (first_selected == nullptr) {
 					return;
 				}
@@ -1515,6 +1530,10 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 
 			add_root_node(new_node);
 
+			if (GLOBAL_GET("editor/naming/node_name_casing").operator int() != NAME_CASING_PASCAL_CASE) {
+				new_node->set_name(Node::adjust_name_casing(new_node->get_name()));
+			}
+
 			EditorNode::get_singleton()->edit_node(new_node);
 			editor_selection->clear();
 			editor_selection->add_node(new_node);
@@ -1601,6 +1620,7 @@ void SceneTreeDock::_notification(int p_what) {
 
 			node_shortcuts_toggle = memnew(Button);
 			node_shortcuts_toggle->set_flat(true);
+			node_shortcuts_toggle->set_accessibility_name(TTRC("Favorite Nodes"));
 			node_shortcuts_toggle->set_button_icon(get_editor_theme_icon(SNAME("Favorites")));
 			node_shortcuts_toggle->set_toggle_mode(true);
 			node_shortcuts_toggle->set_tooltip_text(TTR("Toggle the display of favorite nodes."));
@@ -1663,6 +1683,7 @@ void SceneTreeDock::_notification(int p_what) {
 			clear_inherit_confirm->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_SCENE_CLEAR_INHERITANCE_CONFIRM, false));
 			scene_tree->set_auto_expand_selected(EDITOR_GET("docks/scene_tree/auto_expand_to_selected"), false);
 			scene_tree->set_hide_filtered_out_parents(EDITOR_GET("docks/scene_tree/hide_filtered_out_parents"), false);
+			scene_tree->set_accessibility_warnings(EDITOR_GET("docks/scene_tree/accessibility_warnings"), false);
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
@@ -1673,6 +1694,7 @@ void SceneTreeDock::_notification(int p_what) {
 			if (EditorSettings::get_singleton()->check_changed_settings_in_group("docks/scene_tree")) {
 				scene_tree->set_auto_expand_selected(EDITOR_GET("docks/scene_tree/auto_expand_to_selected"), false);
 				scene_tree->set_hide_filtered_out_parents(EDITOR_GET("docks/scene_tree/hide_filtered_out_parents"), false);
+				scene_tree->set_accessibility_warnings(EDITOR_GET("docks/scene_tree/accessibility_warnings"), false);
 			}
 		} break;
 
@@ -1806,7 +1828,7 @@ void SceneTreeDock::_node_strip_signal_inheritance(Node *p_node) {
 }
 
 void SceneTreeDock::_load_request(const String &p_path) {
-	EditorNode::get_singleton()->open_request(p_path);
+	EditorNode::get_singleton()->load_scene(p_path);
 	_local_tree_selected();
 }
 
@@ -2253,7 +2275,7 @@ void SceneTreeDock::_node_prerenamed(Node *p_node, const String &p_new_name) {
 }
 
 bool SceneTreeDock::_validate_no_foreign() {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	for (Node *E : selection) {
 		if (E != edited_scene && E->get_owner() != edited_scene) {
@@ -2282,7 +2304,7 @@ bool SceneTreeDock::_validate_no_foreign() {
 }
 
 bool SceneTreeDock::_validate_no_instance() {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	for (Node *E : selection) {
 		if (E != edited_scene && !E->get_scene_file_path().is_empty()) {
@@ -2299,7 +2321,7 @@ void SceneTreeDock::_node_reparent(NodePath p_path, bool p_keep_global_xform) {
 	Node *new_parent = scene_root->get_node(p_path);
 	ERR_FAIL_NULL(new_parent);
 
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	if (selection.is_empty()) {
 		return; // Nothing to reparent.
@@ -2317,7 +2339,7 @@ void SceneTreeDock::_node_reparent(NodePath p_path, bool p_keep_global_xform) {
 void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, Vector<Node *> p_nodes, bool p_keep_global_xform) {
 	ERR_FAIL_NULL(p_new_parent);
 
-	if (p_nodes.size() == 0) {
+	if (p_nodes.is_empty()) {
 		return; // Nothing to reparent.
 	}
 
@@ -2331,7 +2353,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 			return; // Attempt to reparent to itself.
 		}
 		// `move_child` + `get_index` doesn't really work for internal nodes.
-		ERR_FAIL_COND_MSG(p_nodes[ni]->get_internal_mode() != INTERNAL_MODE_DISABLED, "Trying to move internal node, this is not supported.");
+		ERR_FAIL_COND_MSG(p_nodes[ni]->is_internal(), "Trying to move internal node, this is not supported.");
 
 		if (p_nodes[ni]->get_index(false) < first_idx) {
 			nodes_before--;
@@ -2521,7 +2543,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 }
 
 void SceneTreeDock::_script_created(Ref<Script> p_script) {
-	List<Node *> selected = editor_selection->get_selected_node_list();
+	List<Node *> selected = editor_selection->get_top_selected_node_list();
 
 	if (selected.is_empty()) {
 		return;
@@ -2582,7 +2604,7 @@ void SceneTreeDock::_shader_creation_closed() {
 }
 
 void SceneTreeDock::_toggle_editable_children_from_selection() {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 	List<Node *>::Element *e = selection.front();
 
 	if (e) {
@@ -2591,7 +2613,7 @@ void SceneTreeDock::_toggle_editable_children_from_selection() {
 }
 
 void SceneTreeDock::_toggle_placeholder_from_selection() {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 	List<Node *>::Element *e = selection.front();
 
 	if (e) {
@@ -2726,7 +2748,7 @@ void SceneTreeDock::_toggle_editable_children(Node *p_node) {
 }
 
 void SceneTreeDock::_delete_confirm(bool p_cut) {
-	List<Node *> remove_list = editor_selection->get_selected_node_list();
+	List<Node *> remove_list = editor_selection->get_top_selected_node_list();
 
 	if (remove_list.is_empty()) {
 		return;
@@ -2744,7 +2766,7 @@ void SceneTreeDock::_delete_confirm(bool p_cut) {
 	if (!entire_scene) {
 		for (const Node *E : remove_list) {
 			// `move_child` + `get_index` doesn't really work for internal nodes.
-			ERR_FAIL_COND_MSG(E->get_internal_mode() != INTERNAL_MODE_DISABLED, "Trying to remove internal node, this is not supported.");
+			ERR_FAIL_COND_MSG(E->is_internal(), "Trying to remove internal node, this is not supported.");
 		}
 	}
 
@@ -2961,7 +2983,7 @@ void SceneTreeDock::_create() {
 		_do_create(parent);
 
 	} else if (current_option == TOOL_REPLACE) {
-		List<Node *> selection = editor_selection->get_selected_node_list();
+		List<Node *> selection = editor_selection->get_top_selected_node_list();
 		ERR_FAIL_COND(selection.is_empty());
 
 		EditorUndoRedoManager *ur = EditorUndoRedoManager::get_singleton();
@@ -2980,7 +3002,7 @@ void SceneTreeDock::_create() {
 
 		ur->commit_action(false);
 	} else if (current_option == TOOL_REPARENT_TO_NEW_NODE) {
-		List<Node *> selection = editor_selection->get_selected_node_list();
+		List<Node *> selection = editor_selection->get_top_selected_node_list();
 		ERR_FAIL_COND(selection.is_empty());
 
 		// Find top level node in selection
@@ -3181,7 +3203,7 @@ void SceneTreeDock::_replace_node(Node *p_node, Node *p_by_node, bool p_keep_pro
 
 	List<Node *> to_erase;
 	for (int i = 0; i < oldnode->get_child_count(); i++) {
-		if (oldnode->get_child(i)->get_owner() == nullptr && oldnode->is_owned_by_parent()) {
+		if (oldnode->get_child(i)->get_owner() == nullptr && oldnode->is_internal()) {
 			to_erase.push_back(oldnode->get_child(i));
 		}
 	}
@@ -3277,7 +3299,7 @@ bool SceneTreeDock::_check_node_recursive(Variant &r_variant, Node *p_node, Node
 			bool updated = false;
 			for (int i = 0; i < a.size(); i++) {
 				Variant value = a[i];
-				if (_check_node_recursive(value, p_node, p_by_node, type_hint.get_slice(":", 1), r_warn_message)) {
+				if (_check_node_recursive(value, p_node, p_by_node, type_hint.get_slicec(':', 1), r_warn_message)) {
 					if (!updated) {
 						a = a.duplicate(); // Need to duplicate for undo-redo to work.
 						updated = true;
@@ -3329,7 +3351,7 @@ void SceneTreeDock::set_selected(Node *p_node, bool p_emit_selected) {
 }
 
 void SceneTreeDock::_new_scene_from(const String &p_file) {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	if (selection.size() != 1) {
 		accept->set_text(TTR("This operation requires a single selected node."));
@@ -3507,7 +3529,7 @@ void SceneTreeDock::_normalize_drop(Node *&to_node, int &to_pos, int p_type) {
 }
 
 Array SceneTreeDock::_get_selection_array() {
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 	TypedArray<Node> array;
 	array.resize(selection.size());
 
@@ -3656,7 +3678,7 @@ void SceneTreeDock::_nodes_dragged(const Array &p_nodes, NodePath p_to, int p_ty
 		return;
 	}
 
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 
 	if (selection.is_empty()) {
 		return; //nothing to reparent
@@ -3729,10 +3751,10 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 		return;
 	}
 
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 	List<Node *> full_selection = editor_selection->get_full_selected_node_list(); // Above method only returns nodes with common parent.
 
-	if (selection.size() == 0) {
+	if (selection.is_empty()) {
 		return;
 	}
 
@@ -3792,7 +3814,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 				menu->add_icon_shortcut(get_editor_theme_icon(SNAME("ScriptCreate")), ED_GET_SHORTCUT("scene_tree/attach_script"), TOOL_ATTACH_SCRIPT);
 			}
 
-			if (existing_script.is_valid()) {
+			if (existing_script.is_valid() && !existing_script->is_built_in()) {
 				menu->add_icon_shortcut(get_editor_theme_icon(SNAME("ScriptExtend")), ED_GET_SHORTCUT("scene_tree/extend_script"), TOOL_EXTEND_SCRIPT);
 			}
 		}
@@ -3880,8 +3902,9 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 				menu->add_separator();
 			}
 			Node *node = full_selection.front()->get();
-			menu->add_icon_shortcut(get_editor_theme_icon(SNAME("SceneUniqueName")), ED_GET_SHORTCUT("scene_tree/toggle_unique_name"), TOOL_TOGGLE_SCENE_UNIQUE_NAME);
-			menu->set_item_text(menu->get_item_index(TOOL_TOGGLE_SCENE_UNIQUE_NAME), node->is_unique_name_in_owner() ? TTR("Revoke Unique Name") : TTR("Access as Unique Name"));
+			menu->add_icon_check_item(get_editor_theme_icon(SNAME("SceneUniqueName")), TTRC("Access as Unique Name"), TOOL_TOGGLE_SCENE_UNIQUE_NAME);
+			menu->set_item_shortcut(menu->get_item_index(TOOL_TOGGLE_SCENE_UNIQUE_NAME), ED_GET_SHORTCUT("scene_tree/toggle_unique_name"));
+			menu->set_item_checked(menu->get_item_index(TOOL_TOGGLE_SCENE_UNIQUE_NAME), node->is_unique_name_in_owner());
 		}
 	}
 
@@ -3965,6 +3988,9 @@ void SceneTreeDock::_update_tree_menu() {
 	tree_menu->set_item_checked(-1, EDITOR_GET("docks/scene_tree/hide_filtered_out_parents"));
 
 	tree_menu->add_separator();
+	tree_menu->add_check_item(TTR("Show Accessibility Warnings"), TOOL_ACCESSIBILITY_WARNINGS);
+	tree_menu->set_item_checked(tree_menu->get_item_index(TOOL_ACCESSIBILITY_WARNINGS), EDITOR_GET("docks/scene_tree/accessibility_warnings"));
+
 	PopupMenu *resource_list = memnew(PopupMenu);
 	resource_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	resource_list->connect("about_to_popup", callable_mp(this, &SceneTreeDock::_list_all_subresources).bind(resource_list));
@@ -4069,7 +4095,7 @@ void SceneTreeDock::attach_script_to_selected(bool p_extend) {
 		return;
 	}
 
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 	if (selection.is_empty()) {
 		return;
 	}
@@ -4199,7 +4225,7 @@ List<Node *> SceneTreeDock::paste_nodes(bool p_paste_as_sibling) {
 	Node *paste_parent = edited_scene;
 	Node *paste_sibling = nullptr;
 
-	List<Node *> selection = editor_selection->get_selected_node_list();
+	List<Node *> selection = editor_selection->get_top_selected_node_list();
 	if (selection.size() > 0) {
 		paste_parent = selection.back()->get();
 	}
@@ -4268,7 +4294,7 @@ List<Node *> SceneTreeDock::paste_nodes(bool p_paste_as_sibling) {
 			// and added to the node_clipboard_edited_scene_owned list.
 			if (d != dup && E2.key->get_owner() == nullptr) {
 				if (node_clipboard_edited_scene_owned.find(const_cast<Node *>(E2.key))) {
-					ur->add_do_method(d, "set_owner", edited_scene);
+					ur->add_do_method(d, "set_owner", owner);
 				}
 			}
 		}
@@ -4658,6 +4684,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	button_add->set_theme_type_variation("FlatMenuButton");
 	button_add->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_NEW, false));
 	button_add->set_tooltip_text(TTRC("Add/Create a New Node."));
+	button_add->set_accessibility_name(TTRC("Add/Create"));
 	button_add->set_shortcut(ED_GET_SHORTCUT("scene_tree/add_child_node"));
 	filter_hbc->add_child(button_add);
 
@@ -4665,6 +4692,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	button_instance->set_theme_type_variation("FlatMenuButton");
 	button_instance->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_INSTANTIATE, false));
 	button_instance->set_tooltip_text(TTRC("Instantiate a scene file as a Node. Creates an inherited scene if no root node exists."));
+	button_instance->set_accessibility_name(TTRC("Instantiate Scene File"));
 	button_instance->set_shortcut(ED_GET_SHORTCUT("scene_tree/instantiate_scene"));
 	filter_hbc->add_child(button_instance);
 	vbc->add_child(filter_hbc);
@@ -4673,6 +4701,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	filter = memnew(LineEdit);
 	filter->set_h_size_flags(SIZE_EXPAND_FILL);
 	filter->set_placeholder(TTR("Filter: name, t:type, g:group"));
+	filter->set_accessibility_name(TTRC("Filter"));
 	filter->set_tooltip_text(TTR("Filter nodes by entering a part of their name, type (if prefixed with \"type:\" or \"t:\")\nor group (if prefixed with \"group:\" or \"g:\"). Filtering is case-insensitive."));
 	filter_hbc->add_child(filter);
 	filter->add_theme_constant_override("minimum_character_width", 0);
@@ -4690,6 +4719,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	button_create_script->set_theme_type_variation("FlatMenuButton");
 	button_create_script->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_ATTACH_SCRIPT, false));
 	button_create_script->set_tooltip_text(TTRC("Attach a new or existing script to the selected node."));
+	button_create_script->set_accessibility_name(TTRC("Attach Script"));
 	button_create_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/attach_script"));
 	filter_hbc->add_child(button_create_script);
 	button_create_script->hide();
@@ -4698,6 +4728,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	button_detach_script->set_theme_type_variation("FlatMenuButton");
 	button_detach_script->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_DETACH_SCRIPT, false));
 	button_detach_script->set_tooltip_text(TTRC("Detach the script from the selected node."));
+	button_detach_script->set_accessibility_name(TTRC("Detach Script"));
 	button_detach_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/detach_script"));
 	filter_hbc->add_child(button_detach_script);
 	button_detach_script->hide();
@@ -4706,6 +4737,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	button_extend_script->set_flat(true);
 	button_extend_script->connect(SceneStringName(pressed), callable_mp(this, &SceneTreeDock::_tool_selected).bind(TOOL_EXTEND_SCRIPT, false));
 	button_extend_script->set_tooltip_text(TTRC("Extend the script of the selected node."));
+	button_extend_script->set_accessibility_name(TTRC("Extend Script"));
 	button_extend_script->set_shortcut(ED_GET_SHORTCUT("scene_tree/extend_script"));
 	filter_hbc->add_child(button_extend_script);
 	button_extend_script->hide();
@@ -4714,6 +4746,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	button_tree_menu->set_flat(false);
 	button_tree_menu->set_theme_type_variation("FlatMenuButton");
 	button_tree_menu->set_tooltip_text(TTR("Extra scene options."));
+	button_tree_menu->set_accessibility_name(TTRC("Scene Options"));
 	button_tree_menu->connect("about_to_popup", callable_mp(this, &SceneTreeDock::_update_tree_menu));
 	filter_hbc->add_child(button_tree_menu);
 
@@ -4764,6 +4797,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 	scene_tree->connect("files_dropped", callable_mp(this, &SceneTreeDock::_files_dropped));
 	scene_tree->connect("script_dropped", callable_mp(this, &SceneTreeDock::_script_dropped));
 	scene_tree->connect("nodes_dragged", callable_mp(this, &SceneTreeDock::_nodes_drag_begin));
+	scene_tree->get_scene_tree()->get_vscroll_bar()->connect("value_changed", callable_mp(this, &SceneTreeDock::_reset_hovering_timer).unbind(1));
 
 	scene_tree->get_scene_tree()->connect(SceneStringName(gui_input), callable_mp(this, &SceneTreeDock::_scene_tree_gui_input));
 	scene_tree->get_scene_tree()->connect("item_icon_double_clicked", callable_mp(this, &SceneTreeDock::_focus_node));
@@ -4775,6 +4809,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
 
 	inspect_hovered_node_delay = memnew(Timer);
 	inspect_hovered_node_delay->connect("timeout", callable_mp(this, &SceneTreeDock::_inspect_hovered_node));
+	inspect_hovered_node_delay->set_wait_time(.5);
 	inspect_hovered_node_delay->set_one_shot(true);
 	add_child(inspect_hovered_node_delay);
 
diff --git a/engine/editor/scene_tree_dock.h b/engine/editor/scene_tree_dock.h
index 98ec67a9..8968d33b 100644
--- a/engine/editor/scene_tree_dock.h
+++ b/engine/editor/scene_tree_dock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_TREE_DOCK_H
-#define SCENE_TREE_DOCK_H
+#pragma once
 
 #include "editor/gui/scene_tree_editor.h"
 #include "editor/script_create_dialog.h"
@@ -89,6 +88,7 @@ class SceneTreeDock : public VBoxContainer {
 		TOOL_CREATE_FAVORITE,
 		TOOL_CENTER_PARENT,
 		TOOL_HIDE_FILTERED_OUT_PARENTS,
+		TOOL_ACCESSIBILITY_WARNINGS,
 	};
 
 	enum {
@@ -355,5 +355,3 @@ public:
 	SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selection, EditorData &p_editor_data);
 	~SceneTreeDock();
 };
-
-#endif // SCENE_TREE_DOCK_H
diff --git a/engine/editor/script_create_dialog.cpp b/engine/editor/script_create_dialog.cpp
index 5001e518..2bb12e73 100644
--- a/engine/editor/script_create_dialog.cpp
+++ b/engine/editor/script_create_dialog.cpp
@@ -216,7 +216,7 @@ bool ScriptCreateDialog::_validate_parent(const String &p_string) {
 
 	if (can_inherit_from_file && p_string.is_quoted()) {
 		String p = p_string.substr(1, p_string.length() - 2);
-		if (_validate_path(p, true) == "") {
+		if (_validate_path(p, true).is_empty()) {
 			return true;
 		}
 	}
@@ -224,8 +224,11 @@ bool ScriptCreateDialog::_validate_parent(const String &p_string) {
 	return EditorNode::get_editor_data().is_type_recognized(p_string);
 }
 
-String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must_exist) {
+String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must_exist, bool *r_path_valid) {
 	String p = p_path.strip_edges();
+	if (r_path_valid) {
+		*r_path_valid = false;
+	}
 
 	if (p.is_empty()) {
 		return TTR("Path is empty.");
@@ -263,6 +266,10 @@ String ScriptCreateDialog::_validate_path(const String &p_path, bool p_file_must
 		}
 	}
 
+	if (r_path_valid) {
+		*r_path_valid = true;
+	}
+
 	// Check file extension.
 	String extension = p.get_extension();
 	List<String> extensions;
@@ -491,10 +498,9 @@ void ScriptCreateDialog::_path_changed(const String &p_path) {
 		return;
 	}
 
-	is_path_valid = false;
 	is_new_script_created = true;
 
-	path_error = _validate_path(p_path, false);
+	path_error = _validate_path(p_path, false, &is_path_valid);
 	if (!path_error.is_empty()) {
 		validation_panel->update();
 		return;
@@ -506,8 +512,6 @@ void ScriptCreateDialog::_path_changed(const String &p_path) {
 	if (da->file_exists(p)) {
 		is_new_script_created = false;
 	}
-
-	is_path_valid = true;
 	validation_panel->update();
 }
 
@@ -562,6 +566,7 @@ void ScriptCreateDialog::_update_template_menu() {
 					if (!separator) {
 						template_menu->add_separator();
 						template_menu->set_item_text(-1, display_name);
+						template_menu->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_ALWAYS);
 						separator = true;
 					}
 					for (ScriptLanguage::ScriptTemplate &t : templates_found) {
@@ -666,7 +671,7 @@ void ScriptCreateDialog::_update_dialog() {
 			validation_panel->set_message(MSG_ID_PATH, TTR("Built-in script (into scene file)."), EditorValidationPanel::MSG_OK);
 		}
 	} else {
-		template_inactive_message = TTR("Using existing script file.");
+		template_inactive_message = TTRC("Using existing script file.");
 		if (load_enabled) {
 			if (is_path_valid) {
 				validation_panel->set_message(MSG_ID_PATH, TTR("Will load an existing script file."), EditorValidationPanel::MSG_OK);
@@ -680,16 +685,17 @@ void ScriptCreateDialog::_update_dialog() {
 	if (is_using_templates) {
 		// Check if at least one suitable template has been found.
 		if (template_menu->get_item_count() == 0 && template_inactive_message.is_empty()) {
-			template_inactive_message = TTR("No suitable template.");
+			template_inactive_message = TTRC("No suitable template.");
 		}
 	} else {
-		template_inactive_message = TTR("Empty");
+		template_inactive_message = TTRC("Empty");
 	}
 
 	if (!template_inactive_message.is_empty()) {
 		template_menu->set_disabled(true);
 		template_menu->clear();
 		template_menu->add_item(template_inactive_message);
+		template_menu->set_item_auto_translate_mode(-1, AUTO_TRANSLATE_MODE_ALWAYS);
 		validation_panel->set_message(MSG_ID_TEMPLATE, "", EditorValidationPanel::MSG_INFO);
 	}
 }
@@ -817,11 +823,11 @@ ScriptLanguage::ScriptTemplate ScriptCreateDialog::_parse_template(const ScriptL
 String ScriptCreateDialog::_get_script_origin_label(const ScriptLanguage::TemplateLocation &p_origin) const {
 	switch (p_origin) {
 		case ScriptLanguage::TEMPLATE_BUILT_IN:
-			return TTR("Built-in");
+			return TTRC("Built-in");
 		case ScriptLanguage::TEMPLATE_EDITOR:
-			return TTR("Editor");
+			return TTRC("Editor");
 		case ScriptLanguage::TEMPLATE_PROJECT:
-			return TTR("Project");
+			return TTRC("Project");
 	}
 	return "";
 }
@@ -864,9 +870,11 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	/* Language */
 
 	language_menu = memnew(OptionButton);
+	language_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	language_menu->set_custom_minimum_size(Size2(350, 0) * EDSCALE);
 	language_menu->set_expand_icon(true);
 	language_menu->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	language_menu->set_accessibility_name(TTRC("Language"));
 	gc->add_child(memnew(Label(TTR("Language:"))));
 	gc->add_child(language_menu);
 
@@ -891,14 +899,17 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	HBoxContainer *hb = memnew(HBoxContainer);
 	hb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	parent_name = memnew(LineEdit);
+	parent_name->set_accessibility_name(TTRC("Parent Name"));
 	parent_name->connect(SceneStringName(text_changed), callable_mp(this, &ScriptCreateDialog::_parent_name_changed));
 	parent_name->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	hb->add_child(parent_name);
 	register_text_enter(parent_name);
 	parent_search_button = memnew(Button);
+	parent_search_button->set_accessibility_name(TTRC("Search Parent"));
 	parent_search_button->connect(SceneStringName(pressed), callable_mp(this, &ScriptCreateDialog::_browse_class_in_tree));
 	hb->add_child(parent_search_button);
 	parent_browse_button = memnew(Button);
+	parent_browse_button->set_accessibility_name(TTRC("Select Parent"));
 	parent_browse_button->connect(SceneStringName(pressed), callable_mp(this, &ScriptCreateDialog::_browse_path).bind(true, false));
 	hb->add_child(parent_browse_button);
 	gc->add_child(memnew(Label(TTR("Inherits:"))));
@@ -911,12 +922,15 @@ ScriptCreateDialog::ScriptCreateDialog() {
 
 	use_templates = memnew(CheckBox);
 	use_templates->set_pressed(is_using_templates);
+	use_templates->set_accessibility_name(TTRC("Use Template"));
 	use_templates->connect(SceneStringName(pressed), callable_mp(this, &ScriptCreateDialog::_use_template_pressed));
 	template_hb->add_child(use_templates);
 
 	template_inactive_message = "";
 
 	template_menu = memnew(OptionButton);
+	template_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	template_menu->set_accessibility_name(TTRC("Template"));
 	template_menu->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	template_menu->connect(SceneStringName(item_selected), callable_mp(this, &ScriptCreateDialog::_template_changed));
 	template_hb->add_child(template_menu);
@@ -927,6 +941,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
 
 	built_in = memnew(CheckBox);
 	built_in->set_text(TTR("On"));
+	built_in->set_accessibility_name(TTRC("Built-in Script"));
 	built_in->connect(SceneStringName(pressed), callable_mp(this, &ScriptCreateDialog::_built_in_pressed));
 	gc->add_child(memnew(Label(TTR("Built-in Script:"))));
 	gc->add_child(built_in);
@@ -936,11 +951,13 @@ ScriptCreateDialog::ScriptCreateDialog() {
 	hb = memnew(HBoxContainer);
 	hb->connect(SceneStringName(sort_children), callable_mp(this, &ScriptCreateDialog::_path_hbox_sorted));
 	file_path = memnew(LineEdit);
+	file_path->set_accessibility_name(TTRC("File Path"));
 	file_path->connect(SceneStringName(text_changed), callable_mp(this, &ScriptCreateDialog::_path_changed));
 	file_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	hb->add_child(file_path);
 	register_text_enter(file_path);
 	path_button = memnew(Button);
+	path_button->set_accessibility_name(TTRC("Select File"));
 	path_button->connect(SceneStringName(pressed), callable_mp(this, &ScriptCreateDialog::_browse_path).bind(false, true));
 	hb->add_child(path_button);
 	Label *label = memnew(Label(TTR("Path:")));
@@ -953,6 +970,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
 
 	built_in_name = memnew(LineEdit);
 	built_in_name->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	built_in_name->set_accessibility_name(TTRC("Name"));
 	register_text_enter(built_in_name);
 	label = memnew(Label(TTR("Name:")));
 	gc->add_child(label);
diff --git a/engine/editor/script_create_dialog.h b/engine/editor/script_create_dialog.h
index c8f043b4..df7a11aa 100644
--- a/engine/editor/script_create_dialog.h
+++ b/engine/editor/script_create_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_CREATE_DIALOG_H
-#define SCRIPT_CREATE_DIALOG_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "scene/gui/check_box.h"
@@ -99,7 +98,7 @@ class ScriptCreateDialog : public ConfirmationDialog {
 	void _built_in_pressed();
 	void _use_template_pressed();
 	bool _validate_parent(const String &p_string);
-	String _validate_path(const String &p_path, bool p_file_must_exist);
+	String _validate_path(const String &p_path, bool p_file_must_exist, bool *r_path_valid = nullptr);
 	void _parent_name_changed(const String &p_parent);
 	void _template_changed(int p_template = 0);
 	void _browse_path(bool browse_parent, bool p_save);
@@ -126,5 +125,3 @@ public:
 	void set_inheritance_base_type(const String &p_base);
 	ScriptCreateDialog();
 };
-
-#endif // SCRIPT_CREATE_DIALOG_H
diff --git a/engine/editor/shader_create_dialog.cpp b/engine/editor/shader_create_dialog.cpp
index 9423a830..f3d59b85 100644
--- a/engine/editor/shader_create_dialog.cpp
+++ b/engine/editor/shader_create_dialog.cpp
@@ -312,13 +312,13 @@ void ShaderCreateDialog::_type_changed(int p_language) {
 	if (shader_type_data.use_templates) {
 		int last_template = EditorSettings::get_singleton()->get_project_metadata("shader_setup", "last_selected_template", 0);
 
-		template_menu->add_item(TTR("Default"));
-		template_menu->add_item(TTR("Empty"));
+		template_menu->add_item(TTRC("Default"));
+		template_menu->add_item(TTRC("Empty"));
 
 		template_menu->select(last_template);
 		current_template = last_template;
 	} else {
-		template_menu->add_item(TTR("N/A"));
+		template_menu->add_item(TTRC("N/A"));
 	}
 
 	EditorSettings::get_singleton()->set_project_metadata("shader_setup", "last_selected_language", type_menu->get_item_text(type_menu->get_selected()));
@@ -572,6 +572,8 @@ ShaderCreateDialog::ShaderCreateDialog() {
 	// Type.
 
 	type_menu = memnew(OptionButton);
+	type_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	type_menu->set_accessibility_name(TTRC("Type"));
 	type_menu->set_custom_minimum_size(Size2(250, 0) * EDSCALE);
 	type_menu->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	gc->add_child(memnew(Label(TTR("Type:"))));
@@ -612,6 +614,8 @@ ShaderCreateDialog::ShaderCreateDialog() {
 	// Modes.
 
 	mode_menu = memnew(OptionButton);
+	mode_menu->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	mode_menu->set_accessibility_name(TTRC("Mode"));
 	for (const String &type_name : ShaderTypes::get_singleton()->get_types_list()) {
 		mode_menu->add_item(type_name.capitalize());
 	}
@@ -622,6 +626,7 @@ ShaderCreateDialog::ShaderCreateDialog() {
 	// Templates.
 
 	template_menu = memnew(OptionButton);
+	template_menu->set_accessibility_name(TTRC("Template"));
 	gc->add_child(memnew(Label(TTR("Template:"))));
 	gc->add_child(template_menu);
 	template_menu->connect(SceneStringName(item_selected), callable_mp(this, &ShaderCreateDialog::_template_changed));
@@ -630,6 +635,7 @@ ShaderCreateDialog::ShaderCreateDialog() {
 
 	internal = memnew(CheckBox);
 	internal->set_text(TTR("On"));
+	internal->set_accessibility_name(TTRC("Built-in Shader"));
 	internal->connect(SceneStringName(toggled), callable_mp(this, &ShaderCreateDialog::_built_in_toggled));
 	gc->add_child(memnew(Label(TTR("Built-in Shader:"))));
 	gc->add_child(internal);
@@ -645,6 +651,7 @@ ShaderCreateDialog::ShaderCreateDialog() {
 	hb->add_child(file_path);
 	register_text_enter(file_path);
 	path_button = memnew(Button);
+	path_button->set_accessibility_name(TTRC("Select"));
 	path_button->connect(SceneStringName(pressed), callable_mp(this, &ShaderCreateDialog::_browse_path));
 	hb->add_child(path_button);
 	gc->add_child(memnew(Label(TTR("Path:"))));
diff --git a/engine/editor/shader_create_dialog.h b/engine/editor/shader_create_dialog.h
index 52408421..51d6f530 100644
--- a/engine/editor/shader_create_dialog.h
+++ b/engine/editor/shader_create_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_CREATE_DIALOG_H
-#define SHADER_CREATE_DIALOG_H
+#pragma once
 
 #include "editor/editor_settings.h"
 #include "scene/gui/check_box.h"
@@ -108,5 +107,3 @@ public:
 	void config(const String &p_base_path, bool p_built_in_enabled = true, bool p_load_enabled = true, int p_preferred_type = -1, int p_preferred_mode = -1);
 	ShaderCreateDialog();
 };
-
-#endif // SHADER_CREATE_DIALOG_H
diff --git a/engine/editor/shader_globals_editor.h b/engine/editor/shader_globals_editor.h
index 43adc6c1..6ec631d7 100644
--- a/engine/editor/shader_globals_editor.h
+++ b/engine/editor/shader_globals_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_GLOBALS_EDITOR_H
-#define SHADER_GLOBALS_EDITOR_H
+#pragma once
 
 #include "editor/editor_sectioned_inspector.h"
 #include "scene/gui/box_container.h"
@@ -65,5 +64,3 @@ public:
 	ShaderGlobalsEditor();
 	~ShaderGlobalsEditor();
 };
-
-#endif // SHADER_GLOBALS_EDITOR_H
diff --git a/engine/editor/surface_upgrade_tool.cpp b/engine/editor/surface_upgrade_tool.cpp
deleted file mode 100644
index 81d89260..00000000
--- a/engine/editor/surface_upgrade_tool.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/**************************************************************************/
-/*  surface_upgrade_tool.cpp                                              */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "surface_upgrade_tool.h"
-
-#include "editor/editor_file_system.h"
-#include "editor/editor_log.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "editor/gui/editor_scene_tabs.h"
-#include "editor/gui/editor_toaster.h"
-#include "editor/themes/editor_scale.h"
-#include "servers/rendering_server.h"
-
-SurfaceUpgradeTool *SurfaceUpgradeTool::singleton = nullptr;
-
-void SurfaceUpgradeTool::_add_files(EditorFileSystemDirectory *p_dir, Vector<String> &r_reimport_paths, Vector<String> &r_resave_paths) {
-	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
-		_add_files(p_dir->get_subdir(i), r_reimport_paths, r_resave_paths);
-	}
-
-	for (int i = 0; i < p_dir->get_file_count(); i++) {
-		if (p_dir->get_file_type(i) == "Mesh" ||
-				p_dir->get_file_type(i) == "ArrayMesh" ||
-				p_dir->get_file_type(i) == "PackedScene") {
-			if (FileAccess::exists(p_dir->get_file_path(i) + ".import")) {
-				r_reimport_paths.append(p_dir->get_file_path(i) + ".import");
-			} else {
-				r_resave_paths.append(p_dir->get_file_path(i));
-			}
-		}
-	}
-}
-
-void SurfaceUpgradeTool::_try_show_popup() {
-	if (singleton->show_requested || singleton->updating) {
-		return;
-	}
-
-	singleton->show_requested = true;
-
-	if (!EditorNode::get_singleton()->is_editor_ready()) {
-		// EditorNode may not be ready yet. It will call this tool when it is.
-		return;
-	}
-
-	if (EditorFileSystem::get_singleton()->is_importing()) {
-		EditorFileSystem::get_singleton()->connect("resources_reimported", callable_mp(singleton, &SurfaceUpgradeTool::_show_popup), CONNECT_ONE_SHOT);
-	} else {
-		singleton->_show_popup();
-	}
-	RS::get_singleton()->set_warn_on_surface_upgrade(false);
-}
-
-void SurfaceUpgradeTool::_show_popup() {
-	MutexLock lock(mutex);
-	if (!show_requested) {
-		return; // We only show the dialog if it was previously requested.
-	}
-	show_requested = false;
-
-	// These messages are supposed to be translated as they are critical to users migrating their projects.
-
-	const String confirmation_message = TTR("This project uses meshes with an outdated mesh format from previous Godot versions. The engine needs to update the format in order to use those meshes. Please use the 'Upgrade Mesh Surfaces' tool from the 'Project > Tools' menu. You can ignore this message and keep using outdated meshes, but keep in mind that this leads to increased load times every time you load the project.");
-	EditorNode::get_log()->add_message(confirmation_message, EditorLog::MSG_TYPE_WARNING);
-
-	const String toast_message = TTR("This project uses meshes with an outdated mesh format. Check the output log.");
-	EditorToaster::get_singleton()->popup_str(toast_message, EditorToaster::SEVERITY_WARNING);
-}
-
-void SurfaceUpgradeTool::prepare_upgrade() {
-	EditorSettings::get_singleton()->set_project_metadata("surface_upgrade_tool", "run_on_restart", true);
-
-	Vector<String> reimport_paths;
-	Vector<String> resave_paths;
-	_add_files(EditorFileSystem::get_singleton()->get_filesystem(), reimport_paths, resave_paths);
-
-	EditorSettings::get_singleton()->set_project_metadata("surface_upgrade_tool", "reimport_paths", reimport_paths);
-	EditorSettings::get_singleton()->set_project_metadata("surface_upgrade_tool", "resave_paths", resave_paths);
-
-	// Delay to avoid deadlocks, since this dialog can be triggered by loading a scene.
-	callable_mp(EditorNode::get_singleton(), &EditorNode::restart_editor).call_deferred(false);
-}
-
-// Ensure that the warnings and popups are skipped.
-void SurfaceUpgradeTool::begin_upgrade() {
-	updating = true;
-
-	EditorSettings::get_singleton()->set_project_metadata("surface_upgrade_tool", "run_on_restart", false);
-	RS::get_singleton()->set_surface_upgrade_callback(nullptr);
-	RS::get_singleton()->set_warn_on_surface_upgrade(false);
-}
-
-void SurfaceUpgradeTool::finish_upgrade() {
-	EditorNode::get_singleton()->trigger_menu_option(EditorSceneTabs::SCENE_CLOSE_ALL, true);
-
-	// Update all meshes here.
-	Vector<String> resave_paths = EditorSettings::get_singleton()->get_project_metadata("surface_upgrade_tool", "resave_paths", Vector<String>());
-	Vector<String> reimport_paths = EditorSettings::get_singleton()->get_project_metadata("surface_upgrade_tool", "reimport_paths", Vector<String>());
-	EditorProgress ep("surface_upgrade_resave", TTR("Upgrading All Meshes in Project"), resave_paths.size() + reimport_paths.size());
-
-	int step = 0;
-	for (const String &file_path : resave_paths) {
-		Ref<Resource> res = ResourceLoader::load(file_path);
-		ep.step(TTR("Attempting to re-save ") + file_path, step++);
-		if (res.is_valid()) {
-			// Ignore things that fail to load.
-			ResourceSaver::save(res);
-		}
-	}
-	EditorSettings::get_singleton()->set_project_metadata("surface_upgrade_tool", "resave_paths", Vector<String>());
-
-	// Remove the imported scenes/meshes from .import so they will be reimported automatically after this.
-	for (const String &file_path : reimport_paths) {
-		Ref<ConfigFile> config;
-		config.instantiate();
-		Error err = config->load(file_path);
-		if (err != OK) {
-			ERR_PRINT("Could not open " + file_path + " for upgrade.");
-			continue;
-		}
-
-		String remap_path = config->get_value("remap", "path", "");
-		if (remap_path.is_empty()) {
-			continue;
-		}
-
-		ep.step(TTR("Attempting to remove ") + remap_path, step++);
-
-		String path = OS::get_singleton()->get_resource_dir() + remap_path.replace_first("res://", "/");
-		print_verbose("Moving to trash: " + path);
-		err = OS::get_singleton()->move_to_trash(path);
-		if (err != OK) {
-			EditorNode::get_singleton()->add_io_error(TTR("Cannot remove:") + "\n" + remap_path + "\n");
-		}
-	}
-	EditorSettings::get_singleton()->set_project_metadata("surface_upgrade_tool", "reimport_paths", Vector<String>());
-
-	emit_signal(SNAME("upgrade_finished"));
-}
-
-void SurfaceUpgradeTool::_bind_methods() {
-	ADD_SIGNAL(MethodInfo("upgrade_finished"));
-}
-
-SurfaceUpgradeTool::SurfaceUpgradeTool() {
-	singleton = this;
-	RS::get_singleton()->set_surface_upgrade_callback(_try_show_popup);
-}
-
-SurfaceUpgradeTool::~SurfaceUpgradeTool() {
-	singleton = nullptr;
-}
-
-void SurfaceUpgradeDialog::popup_on_demand() {
-	const String confirmation_message = TTR("The mesh format has changed in Godot 4.2, which affects both imported meshes and meshes authored inside of Godot. The engine needs to update the format in order to use those meshes.\n\nIf your project predates Godot 4.2 and contains meshes, we recommend you run this one time conversion tool. This update will restart the editor and may take several minutes. Upgrading will make the meshes incompatible with previous versions of Godot.\n\nYou can still use your existing meshes as is. The engine will update each mesh in memory, but the update will not be saved. Choosing this option will lead to slower load times every time this project is loaded.");
-	set_text(confirmation_message);
-	get_ok_button()->set_text(TTR("Restart & Upgrade"));
-
-	popup_centered(Size2(750 * EDSCALE, 0));
-}
-
-void SurfaceUpgradeDialog::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_READY:
-			// Can't do it in the constructor because it doesn't know that the signal exists.
-			connect(SceneStringName(confirmed), callable_mp(SurfaceUpgradeTool::get_singleton(), &SurfaceUpgradeTool::prepare_upgrade));
-			break;
-	}
-}
-
-SurfaceUpgradeDialog::SurfaceUpgradeDialog() {
-	set_autowrap(true);
-	get_label()->set_custom_minimum_size(Size2(750 * EDSCALE, 0));
-}
diff --git a/engine/editor/template_builders.py b/engine/editor/template_builders.py
index 6eee4e22..4dbe0378 100644
--- a/engine/editor/template_builders.py
+++ b/engine/editor/template_builders.py
@@ -1,7 +1,8 @@
 """Functions used to generate source files during build time"""
 
 import os
-from io import StringIO
+
+import methods
 
 
 def parse_template(inherits, source, delimiter):
@@ -36,54 +37,36 @@ def parse_template(inherits, source, delimiter):
             script_template["script"].replace('"', '\\"').lstrip().replace("\n", "\\n").replace("\t", "_TS_")
         )
         return (
-            '{ String("'
-            + script_template["inherits"]
-            + '"), String("'
-            + script_template["name"]
-            + '"),  String("'
-            + script_template["description"]
-            + '"),  String("'
-            + script_template["script"]
-            + '")'
-            + " },\n"
+            f'{{ String("{script_template["inherits"]}"), '
+            + f'String("{script_template["name"]}"), '
+            + f'String("{script_template["description"]}"), '
+            + f'String("{script_template["script"]}") }},'
         )
 
 
 def make_templates(target, source, env):
-    dst = str(target[0])
-    with StringIO() as s:
-        s.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n\n")
-        s.write("#ifndef _CODE_TEMPLATES_H\n")
-        s.write("#define _CODE_TEMPLATES_H\n\n")
-        s.write('#include "core/object/object.h"\n')
-        s.write('#include "core/object/script_language.h"\n')
+    delimiter = "#"  # GDScript single line comment delimiter by default.
+    if source:
+        ext = os.path.splitext(str(source[0]))[1]
+        if ext == ".cs":
+            delimiter = "//"
 
-        delimiter = "#"  # GDScript single line comment delimiter by default.
-        if source:
-            ext = os.path.splitext(str(source[0]))[1]
-            if ext == ".cs":
-                delimiter = "//"
+    parsed_templates = []
 
-        parsed_template_string = ""
-        number_of_templates = 0
+    for filepath in source:
+        filepath = str(filepath)
+        node_name = os.path.basename(os.path.dirname(filepath))
+        parsed_templates.append(parse_template(node_name, filepath, delimiter))
 
-        for filepath in source:
-            filepath = str(filepath)
-            node_name = os.path.basename(os.path.dirname(filepath))
-            parsed_template = parse_template(node_name, filepath, delimiter)
-            parsed_template_string += "\t" + parsed_template
-            number_of_templates += 1
+    parsed_template_string = "\n\t".join(parsed_templates)
 
-        s.write("\nstatic const int TEMPLATES_ARRAY_SIZE = " + str(number_of_templates) + ";\n")
-        s.write(
-            "\nstatic const struct ScriptLanguage::ScriptTemplate TEMPLATES[" + str(number_of_templates) + "] = {\n"
-        )
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write(f"""\
+#include "core/object/object.h"
+#include "core/object/script_language.h"
 
-        s.write(parsed_template_string)
-
-        s.write("};\n")
-
-        s.write("\n#endif\n")
-
-        with open(dst, "w", encoding="utf-8", newline="\n") as f:
-            f.write(s.getvalue())
+inline constexpr int TEMPLATES_ARRAY_SIZE = {len(parsed_templates)};
+static const struct ScriptLanguage::ScriptTemplate TEMPLATES[TEMPLATES_ARRAY_SIZE] = {{
+	{parsed_template_string}
+}};
+""")
diff --git a/engine/editor/themes/SCsub b/engine/editor/themes/SCsub
index 5a9949df..ba5070e8 100644
--- a/engine/editor/themes/SCsub
+++ b/engine/editor/themes/SCsub
@@ -3,17 +3,14 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-import glob
-
 import editor_theme_builders
 
 # Fonts
-flist = glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.ttf")
-flist.extend(glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.otf"))
-flist.extend(glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.woff"))
-flist.extend(glob.glob(env.Dir("#thirdparty").abspath + "/fonts/*.woff2"))
+flist = Glob("#thirdparty/fonts/*.ttf")
+flist.extend(Glob("#thirdparty/fonts/*.otf"))
+flist.extend(Glob("#thirdparty/fonts/*.woff"))
+flist.extend(Glob("#thirdparty/fonts/*.woff2"))
 flist.sort()
-env.Depends("#editor/themes/builtin_fonts.gen.h", flist)
 env.CommandNoCache(
     "#editor/themes/builtin_fonts.gen.h",
     flist,
diff --git a/engine/editor/themes/editor_color_map.h b/engine/editor/themes/editor_color_map.h
index fba39f24..cf9fa343 100644
--- a/engine/editor/themes/editor_color_map.h
+++ b/engine/editor/themes/editor_color_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_COLOR_MAP_H
-#define EDITOR_COLOR_MAP_H
+#pragma once
 
 #include "core/math/color.h"
 #include "core/string/string_name.h"
@@ -56,5 +55,3 @@ public:
 	static void create();
 	static void finish();
 };
-
-#endif // EDITOR_COLOR_MAP_H
diff --git a/engine/editor/themes/editor_fonts.cpp b/engine/editor/themes/editor_fonts.cpp
index 8ae48892..e283f034 100644
--- a/engine/editor/themes/editor_fonts.cpp
+++ b/engine/editor/themes/editor_fonts.cpp
@@ -159,7 +159,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	String noto_cjk_path;
 	String noto_cjk_bold_path;
 	String var_suffix[] = { "HK", "KR", "SC", "TC", "JP" }; // Note: All Noto Sans CJK versions support all glyph variations, it should not match current locale.
-	for (size_t i = 0; i < sizeof(var_suffix) / sizeof(String); i++) {
+	for (size_t i = 0; i < std::size(var_suffix); i++) {
 		if (noto_cjk_path.is_empty()) {
 			noto_cjk_path = OS::get_singleton()->get_system_font_path("Noto Sans CJK " + var_suffix[i], 400, 100);
 		}
@@ -210,13 +210,14 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	Ref<FontVariation> japanese_font_bold = make_bold_font(japanese_font, embolden_strength, &fallbacks_bold);
 
 	if (OS::get_singleton()->has_feature("system_fonts")) {
-		PackedStringArray emoji_font_names;
-		emoji_font_names.push_back("Apple Color Emoji");
-		emoji_font_names.push_back("Segoe UI Emoji");
-		emoji_font_names.push_back("Noto Color Emoji");
-		emoji_font_names.push_back("Twitter Color Emoji");
-		emoji_font_names.push_back("OpenMoji");
-		emoji_font_names.push_back("EmojiOne Color");
+		PackedStringArray emoji_font_names = {
+			"Apple Color Emoji",
+			"Segoe UI Emoji",
+			"Noto Color Emoji",
+			"Twitter Color Emoji",
+			"OpenMoji",
+			"EmojiOne Color"
+		};
 		Ref<SystemFont> emoji_font = load_system_font(emoji_font_names, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, false);
 		fallbacks.push_back(emoji_font);
 		fallbacks_bold.push_back(emoji_font);
@@ -238,8 +239,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	if (custom_font_path.length() > 0 && dir->file_exists(custom_font_path)) {
 		Ref<FontFile> custom_font = load_external_font(custom_font_path, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps);
 		{
-			TypedArray<Font> fallback_custom;
-			fallback_custom.push_back(default_font);
+			TypedArray<Font> fallback_custom = { default_font };
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		default_fc->set_base_font(custom_font);
@@ -255,8 +255,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	if (custom_font_path.length() > 0 && dir->file_exists(custom_font_path)) {
 		Ref<FontFile> custom_font = load_external_font(custom_font_path, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, font_allow_msdf);
 		{
-			TypedArray<Font> fallback_custom;
-			fallback_custom.push_back(default_font_msdf);
+			TypedArray<Font> fallback_custom = { default_font_msdf };
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		default_fc_msdf->set_base_font(custom_font);
@@ -272,16 +271,14 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	if (custom_font_path_bold.length() > 0 && dir->file_exists(custom_font_path_bold)) {
 		Ref<FontFile> custom_font = load_external_font(custom_font_path_bold, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps);
 		{
-			TypedArray<Font> fallback_custom;
-			fallback_custom.push_back(default_font_bold);
+			TypedArray<Font> fallback_custom = { default_font_bold };
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		bold_fc->set_base_font(custom_font);
 	} else if (custom_font_path.length() > 0 && dir->file_exists(custom_font_path)) {
 		Ref<FontFile> custom_font = load_external_font(custom_font_path, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps);
 		{
-			TypedArray<Font> fallback_custom;
-			fallback_custom.push_back(default_font_bold);
+			TypedArray<Font> fallback_custom = { default_font_bold };
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		bold_fc->set_base_font(custom_font);
@@ -298,16 +295,14 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	if (custom_font_path_bold.length() > 0 && dir->file_exists(custom_font_path_bold)) {
 		Ref<FontFile> custom_font = load_external_font(custom_font_path_bold, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, font_allow_msdf);
 		{
-			TypedArray<Font> fallback_custom;
-			fallback_custom.push_back(default_font_bold_msdf);
+			TypedArray<Font> fallback_custom = { default_font_bold_msdf };
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		bold_fc_msdf->set_base_font(custom_font);
 	} else if (custom_font_path.length() > 0 && dir->file_exists(custom_font_path)) {
 		Ref<FontFile> custom_font = load_external_font(custom_font_path, font_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps, font_allow_msdf);
 		{
-			TypedArray<Font> fallback_custom;
-			fallback_custom.push_back(default_font_bold_msdf);
+			TypedArray<Font> fallback_custom = { default_font_bold_msdf };
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		bold_fc_msdf->set_base_font(custom_font);
@@ -324,8 +319,7 @@ void editor_register_fonts(const Ref<Theme> &p_theme) {
 	if (custom_font_path_source.length() > 0 && dir->file_exists(custom_font_path_source)) {
 		Ref<FontFile> custom_font = load_external_font(custom_font_path_source, font_mono_hinting, font_antialiasing, true, font_subpixel_positioning, font_disable_embedded_bitmaps);
 		{
-			TypedArray<Font> fallback_custom;
-			fallback_custom.push_back(default_font_mono);
+			TypedArray<Font> fallback_custom = { default_font_mono };
 			custom_font->set_fallbacks(fallback_custom);
 		}
 		mono_fc->set_base_font(custom_font);
diff --git a/engine/editor/themes/editor_fonts.h b/engine/editor/themes/editor_fonts.h
index b612797d..d252d35b 100644
--- a/engine/editor/themes/editor_fonts.h
+++ b/engine/editor/themes/editor_fonts.h
@@ -28,11 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_FONTS_H
-#define EDITOR_FONTS_H
+#pragma once
 
 #include "scene/resources/theme.h"
 
 void editor_register_fonts(const Ref<Theme> &p_theme);
-
-#endif // EDITOR_FONTS_H
diff --git a/engine/editor/themes/editor_icons.cpp b/engine/editor/themes/editor_icons.cpp
index b7da3cfa..a415a919 100644
--- a/engine/editor/themes/editor_icons.cpp
+++ b/engine/editor/themes/editor_icons.cpp
@@ -94,21 +94,37 @@ void editor_register_icons(const Ref<Theme> &p_theme, bool p_dark_theme, float p
 	// And then some icons are completely excluded from the conversion.
 
 	// Standard color conversion map.
-	HashMap<Color, Color> color_conversion_map;
+	HashMap<Color, Color> color_conversion_map_light;
+	HashMap<Color, Color> color_conversion_map_dark;
 	// Icons by default are set up for the dark theme, so if the theme is light,
 	// we apply the dark-to-light color conversion map.
-	if (!p_dark_theme) {
-		for (KeyValue<Color, Color> &E : EditorColorMap::get_color_conversion_map()) {
-			color_conversion_map[E.key] = E.value;
-		}
+	for (KeyValue<Color, Color> &E : EditorColorMap::get_color_conversion_map()) {
+		color_conversion_map_light[E.key] = E.value;
 	}
 	// These colors should be converted even if we are using a dark theme.
 	const Color error_color = p_theme->get_color(SNAME("error_color"), EditorStringName(Editor));
 	const Color success_color = p_theme->get_color(SNAME("success_color"), EditorStringName(Editor));
 	const Color warning_color = p_theme->get_color(SNAME("warning_color"), EditorStringName(Editor));
-	color_conversion_map[Color::html("#ff5f5f")] = error_color;
-	color_conversion_map[Color::html("#5fff97")] = success_color;
-	color_conversion_map[Color::html("#ffdd65")] = warning_color;
+	color_conversion_map_dark[Color::html("#ff5f5f")] = error_color;
+	color_conversion_map_dark[Color::html("#5fff97")] = success_color;
+	color_conversion_map_dark[Color::html("#ffdd65")] = warning_color;
+	color_conversion_map_light[Color::html("#ff5f5f")] = error_color;
+	color_conversion_map_light[Color::html("#5fff97")] = success_color;
+	color_conversion_map_light[Color::html("#ffdd65")] = warning_color;
+
+	HashMap<Color, Color> color_conversion_map = p_dark_theme ? color_conversion_map_dark : color_conversion_map_light;
+
+	// The names of the icons used in native menus.
+	HashSet<StringName> native_menu_icons;
+	native_menu_icons.insert("HelpSearch");
+	native_menu_icons.insert("ActionCopy");
+	native_menu_icons.insert("Heart");
+	native_menu_icons.insert("PackedScene");
+	native_menu_icons.insert("FileAccess");
+	native_menu_icons.insert("Folder");
+	native_menu_icons.insert("AnimationTrackList");
+	native_menu_icons.insert("Object");
+	native_menu_icons.insert("History");
 
 	// The names of the icons to exclude from the standard color conversion.
 	HashSet<StringName> conversion_exceptions = EditorColorMap::get_color_conversion_exceptions();
@@ -141,25 +157,38 @@ void editor_register_icons(const Ref<Theme> &p_theme, bool p_dark_theme, float p
 	// Generate icons.
 	{
 		for (int i = 0; i < editor_icons_count; i++) {
-			Ref<ImageTexture> icon;
-
 			const String &editor_icon_name = editor_icons_names[i];
-			if (accent_color_icons.has(editor_icon_name)) {
-				icon = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), 1.0, accent_color_map);
-			} else {
+			if (native_menu_icons.has(editor_icon_name)) {
 				float saturation = p_icon_saturation;
 				if (saturation_exceptions.has(editor_icon_name)) {
 					saturation = 1.0;
 				}
 
-				if (conversion_exceptions.has(editor_icon_name)) {
-					icon = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), saturation);
-				} else {
-					icon = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), saturation, color_conversion_map);
-				}
-			}
+				Ref<ImageTexture> icon_dark = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), saturation, color_conversion_map_dark);
+				Ref<ImageTexture> icon_light = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), saturation, color_conversion_map_light);
 
-			p_theme->set_icon(editor_icon_name, EditorStringName(EditorIcons), icon);
+				p_theme->set_icon(editor_icon_name + "Dark", EditorStringName(EditorIcons), icon_dark);
+				p_theme->set_icon(editor_icon_name + "Light", EditorStringName(EditorIcons), icon_light);
+				p_theme->set_icon(editor_icon_name, EditorStringName(EditorIcons), p_dark_theme ? icon_dark : icon_light);
+			} else {
+				Ref<ImageTexture> icon;
+				if (accent_color_icons.has(editor_icon_name)) {
+					icon = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), 1.0, accent_color_map);
+				} else {
+					float saturation = p_icon_saturation;
+					if (saturation_exceptions.has(editor_icon_name)) {
+						saturation = 1.0;
+					}
+
+					if (conversion_exceptions.has(editor_icon_name)) {
+						icon = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), saturation);
+					} else {
+						icon = editor_generate_icon(i, get_gizmo_handle_scale(editor_icon_name, p_gizmo_handle_scale), saturation, color_conversion_map);
+					}
+				}
+
+				p_theme->set_icon(editor_icon_name, EditorStringName(EditorIcons), icon);
+			}
 		}
 	}
 
diff --git a/engine/editor/themes/editor_icons.h b/engine/editor/themes/editor_icons.h
index 447057b5..82fa9a15 100644
--- a/engine/editor/themes/editor_icons.h
+++ b/engine/editor/themes/editor_icons.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_ICONS_H
-#define EDITOR_ICONS_H
+#pragma once
 
 #include "scene/resources/theme.h"
 
@@ -38,5 +37,3 @@ void editor_register_icons(const Ref<Theme> &p_theme, bool p_dark_theme, float p
 void editor_copy_icons(const Ref<Theme> &p_theme, const Ref<Theme> &p_old_theme);
 
 String get_default_project_icon();
-
-#endif // EDITOR_ICONS_H
diff --git a/engine/editor/themes/editor_scale.h b/engine/editor/themes/editor_scale.h
index b3583fdc..f2654574 100644
--- a/engine/editor/themes/editor_scale.h
+++ b/engine/editor/themes/editor_scale.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCALE_H
-#define EDITOR_SCALE_H
+#pragma once
 
 class EditorScale {
 	static float _scale;
@@ -40,5 +39,3 @@ public:
 };
 
 #define EDSCALE (EditorScale::get_scale())
-
-#endif // EDITOR_SCALE_H
diff --git a/engine/editor/themes/editor_theme.h b/engine/editor/themes/editor_theme.h
index 2cc7ad28..53c42d25 100644
--- a/engine/editor/themes/editor_theme.h
+++ b/engine/editor/themes/editor_theme.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_THEME_H
-#define EDITOR_THEME_H
+#pragma once
 
 #include "scene/resources/theme.h"
 
@@ -62,5 +61,3 @@ public:
 	static void initialize();
 	static void finalize();
 };
-
-#endif // EDITOR_THEME_H
diff --git a/engine/editor/themes/editor_theme_builders.py b/engine/editor/themes/editor_theme_builders.py
index ec5653fb..fc9f3f9d 100644
--- a/engine/editor/themes/editor_theme_builders.py
+++ b/engine/editor/themes/editor_theme_builders.py
@@ -2,28 +2,20 @@
 
 import os
 
+import methods
+
 
 def make_fonts_header(target, source, env):
-    dst = str(target[0])
+    with methods.generated_wrapper(str(target[0])) as file:
+        for src in map(str, source):
+            # Saving uncompressed, since FreeType will reference from memory pointer.
+            buffer = methods.get_buffer(src)
+            name = os.path.splitext(os.path.basename(src))[0]
 
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef _EDITOR_FONTS_H\n")
-        g.write("#define _EDITOR_FONTS_H\n")
+            file.write(f"""\
+inline constexpr int _font_{name}_size = {len(buffer)};
+inline constexpr unsigned char _font_{name}[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
 
-        # Saving uncompressed, since FreeType will reference from memory pointer.
-        for i in range(len(source)):
-            file = str(source[i])
-            with open(file, "rb") as f:
-                buf = f.read()
-
-            name = os.path.splitext(os.path.basename(file))[0]
-
-            g.write("static const int _font_" + name + "_size = " + str(len(buf)) + ";\n")
-            g.write("static const unsigned char _font_" + name + "[] = {\n")
-            for j in range(len(buf)):
-                g.write("\t" + str(buf[j]) + ",\n")
-
-            g.write("};\n")
-
-        g.write("#endif")
+""")
diff --git a/engine/editor/themes/editor_theme_manager.cpp b/engine/editor/themes/editor_theme_manager.cpp
index 1793418c..986a0469 100644
--- a/engine/editor/themes/editor_theme_manager.cpp
+++ b/engine/editor/themes/editor_theme_manager.cpp
@@ -957,6 +957,7 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 			p_theme->set_color(SceneStringName(font_color), "Tree", p_config.font_color);
 			p_theme->set_color("font_hovered_color", "Tree", p_config.mono_color);
 			p_theme->set_color("font_hovered_dimmed_color", "Tree", p_config.font_color);
+			p_theme->set_color("font_hovered_selected_color", "Tree", p_config.mono_color);
 			p_theme->set_color("font_selected_color", "Tree", p_config.mono_color);
 			p_theme->set_color("font_disabled_color", "Tree", p_config.font_disabled_color);
 			p_theme->set_color("font_outline_color", "Tree", p_config.font_outline_color);
@@ -1017,6 +1018,13 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 			style_tree_hover_dimmed->set_border_width_all(0);
 			p_theme->set_stylebox("hovered_dimmed", "Tree", style_tree_hover_dimmed);
 
+			Ref<StyleBoxFlat> style_tree_hover_selected = style_tree_selected->duplicate();
+			style_tree_hover_selected->set_bg_color(p_config.highlight_color * Color(1, 1, 1, 1.2));
+			style_tree_hover_selected->set_border_width_all(0);
+
+			p_theme->set_stylebox("hovered_selected", "Tree", style_tree_hover_selected);
+			p_theme->set_stylebox("hovered_selected_focus", "Tree", style_tree_hover_selected);
+
 			p_theme->set_stylebox("selected_focus", "Tree", style_tree_focus);
 			p_theme->set_stylebox("selected", "Tree", style_tree_selected);
 
@@ -1051,7 +1059,7 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 
 			Ref<StyleBoxFlat> style_itemlist_cursor = p_config.base_style->duplicate();
 			style_itemlist_cursor->set_draw_center(false);
-			style_itemlist_cursor->set_border_width_all(p_config.border_width);
+			style_itemlist_cursor->set_border_width_all(MAX(1 * EDSCALE, p_config.border_width));
 			style_itemlist_cursor->set_border_color(p_config.highlight_color);
 
 			Ref<StyleBoxFlat> style_itemlist_hover = style_tree_selected->duplicate();
@@ -1287,6 +1295,40 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 
 		// GridContainer.
 		p_theme->set_constant("v_separation", "GridContainer", Math::round(p_config.widget_margin.y - 2 * EDSCALE));
+
+		// FoldableContainer
+
+		Ref<StyleBoxFlat> foldable_container_title = make_flat_stylebox(p_config.dark_color_1.darkened(0.125), p_config.base_margin, p_config.base_margin, p_config.base_margin, p_config.base_margin);
+		foldable_container_title->set_corner_radius(CORNER_BOTTOM_LEFT, 0);
+		foldable_container_title->set_corner_radius(CORNER_BOTTOM_RIGHT, 0);
+		p_theme->set_stylebox("title_panel", "FoldableContainer", foldable_container_title);
+		Ref<StyleBoxFlat> foldable_container_hover = make_flat_stylebox(p_config.dark_color_1.lerp(p_config.base_color, 0.4), p_config.base_margin, p_config.base_margin, p_config.base_margin, p_config.base_margin);
+		foldable_container_hover->set_corner_radius(CORNER_BOTTOM_LEFT, 0);
+		foldable_container_hover->set_corner_radius(CORNER_BOTTOM_RIGHT, 0);
+		p_theme->set_stylebox("title_hover_panel", "FoldableContainer", foldable_container_hover);
+		p_theme->set_stylebox("title_collapsed_panel", "FoldableContainer", make_flat_stylebox(p_config.dark_color_1.darkened(0.125), p_config.base_margin, p_config.base_margin, p_config.base_margin, p_config.base_margin));
+		p_theme->set_stylebox("title_collapsed_hover_panel", "FoldableContainer", make_flat_stylebox(p_config.dark_color_1.lerp(p_config.base_color, 0.4), p_config.base_margin, p_config.base_margin, p_config.base_margin, p_config.base_margin));
+		Ref<StyleBoxFlat> foldable_container_panel = make_flat_stylebox(p_config.dark_color_1, p_config.base_margin, p_config.base_margin, p_config.base_margin, p_config.base_margin);
+		foldable_container_panel->set_corner_radius(CORNER_TOP_LEFT, 0);
+		foldable_container_panel->set_corner_radius(CORNER_TOP_RIGHT, 0);
+		p_theme->set_stylebox(SceneStringName(panel), "FoldableContainer", foldable_container_panel);
+		p_theme->set_stylebox("focus", "FoldableContainer", p_config.button_style_focus);
+
+		p_theme->set_font(SceneStringName(font), "FoldableContainer", p_theme->get_font(SceneStringName(font), SNAME("HeaderSmall")));
+		p_theme->set_font_size(SceneStringName(font_size), "FoldableContainer", p_theme->get_font_size(SceneStringName(font_size), SNAME("HeaderSmall")));
+
+		p_theme->set_color(SceneStringName(font_color), "FoldableContainer", p_config.font_color);
+		p_theme->set_color("hover_font_color", "FoldableContainer", p_config.font_hover_color);
+		p_theme->set_color("collapsed_font_color", "FoldableContainer", p_config.font_pressed_color);
+		p_theme->set_color("font_outline_color", "FoldableContainer", p_config.font_outline_color);
+
+		p_theme->set_icon("expanded_arrow", "FoldableContainer", p_theme->get_icon(SNAME("GuiTreeArrowDown"), EditorStringName(EditorIcons)));
+		p_theme->set_icon("expanded_arrow_mirrored", "FoldableContainer", p_theme->get_icon(SNAME("GuiArrowUp"), EditorStringName(EditorIcons)));
+		p_theme->set_icon("folded_arrow", "FoldableContainer", p_theme->get_icon(SNAME("GuiTreeArrowRight"), EditorStringName(EditorIcons)));
+		p_theme->set_icon("folded_arrow_mirrored", "FoldableContainer", p_theme->get_icon(SNAME("GuiTreeArrowLeft"), EditorStringName(EditorIcons)));
+
+		p_theme->set_constant("outline_size", "FoldableContainer", 0);
+		p_theme->set_constant("h_separation", "FoldableContainer", p_config.separation_margin);
 	}
 
 	// Window and dialogs.
@@ -1380,9 +1422,6 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 			p_theme->set_icon("radio_unchecked_disabled", "PopupMenu", p_theme->get_icon(SNAME("GuiRadioUncheckedDisabled"), EditorStringName(EditorIcons)));
 			p_theme->set_icon("submenu", "PopupMenu", p_theme->get_icon(SNAME("ArrowRight"), EditorStringName(EditorIcons)));
 			p_theme->set_icon("submenu_mirrored", "PopupMenu", p_theme->get_icon(SNAME("ArrowLeft"), EditorStringName(EditorIcons)));
-			p_theme->set_icon("visibility_hidden", "PopupMenu", p_theme->get_icon(SNAME("GuiVisibilityHidden"), EditorStringName(EditorIcons)));
-			p_theme->set_icon("visibility_visible", "PopupMenu", p_theme->get_icon(SNAME("GuiVisibilityVisible"), EditorStringName(EditorIcons)));
-			p_theme->set_icon("visibility_xray", "PopupMenu", p_theme->get_icon(SNAME("GuiVisibilityXray"), EditorStringName(EditorIcons)));
 
 			p_theme->set_constant("v_separation", "PopupMenu", p_config.forced_even_separation * EDSCALE);
 			p_theme->set_constant("outline_size", "PopupMenu", 0);
@@ -1475,6 +1514,7 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 		// Label.
 
 		p_theme->set_stylebox(CoreStringName(normal), "Label", p_config.base_empty_style);
+		p_theme->set_stylebox("focus", "Label", p_config.button_style_focus);
 
 		p_theme->set_color(SceneStringName(font_color), "Label", p_config.font_color);
 		p_theme->set_color("font_shadow_color", "Label", Color(0, 0, 0, 0));
@@ -1541,6 +1581,7 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 		// GraphEdit.
 
 		p_theme->set_stylebox(SceneStringName(panel), "GraphEdit", p_config.tree_panel_style);
+		p_theme->set_stylebox("panel_focus", "GraphEdit", p_config.button_style_focus);
 		p_theme->set_stylebox("menu_panel", "GraphEdit", make_flat_stylebox(p_config.dark_color_1 * Color(1, 1, 1, 0.6), 4, 2, 4, 2, 3));
 
 		float grid_base_brightness = p_config.dark_theme ? 1.0 : 0.0;
@@ -1672,9 +1713,11 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 
 			p_theme->set_stylebox(SceneStringName(panel), "GraphNode", gn_panel_style);
 			p_theme->set_stylebox("panel_selected", "GraphNode", gn_panel_selected_style);
+			p_theme->set_stylebox("panel_focus", "GraphNode", p_config.button_style_focus);
 			p_theme->set_stylebox("titlebar", "GraphNode", gn_titlebar_style);
 			p_theme->set_stylebox("titlebar_selected", "GraphNode", gn_titlebar_selected_style);
 			p_theme->set_stylebox("slot", "GraphNode", gn_slot_style);
+			p_theme->set_stylebox("slot_selected", "GraphNode", p_config.button_style_focus);
 
 			p_theme->set_color("resizer_color", "GraphNode", gn_decoration_color);
 
@@ -1750,6 +1793,9 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 	// ColorPicker and related nodes.
 	{
 		// ColorPicker.
+		p_config.circle_style_focus = p_config.button_style_focus->duplicate();
+		p_config.circle_style_focus->set_corner_radius_all(256 * EDSCALE);
+		p_config.circle_style_focus->set_corner_detail(32 * EDSCALE);
 
 		p_theme->set_constant("margin", "ColorPicker", p_config.base_margin);
 		p_theme->set_constant("sv_width", "ColorPicker", 256 * EDSCALE);
@@ -1758,6 +1804,11 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
 		p_theme->set_constant("label_width", "ColorPicker", 10 * EDSCALE);
 		p_theme->set_constant("center_slider_grabbers", "ColorPicker", 1);
 
+		p_theme->set_stylebox("sample_focus", "ColorPicker", p_config.button_style_focus);
+		p_theme->set_stylebox("picker_focus_rectangle", "ColorPicker", p_config.button_style_focus);
+		p_theme->set_stylebox("picker_focus_circle", "ColorPicker", p_config.circle_style_focus);
+		p_theme->set_color("focused_not_editing_cursor_color", "ColorPicker", p_config.highlight_color);
+
 		p_theme->set_icon("screen_picker", "ColorPicker", p_theme->get_icon(SNAME("ColorPick"), EditorStringName(EditorIcons)));
 		p_theme->set_icon("shape_circle", "ColorPicker", p_theme->get_icon(SNAME("PickerShapeCircle"), EditorStringName(EditorIcons)));
 		p_theme->set_icon("shape_rect", "ColorPicker", p_theme->get_icon(SNAME("PickerShapeRectangle"), EditorStringName(EditorIcons)));
@@ -2609,6 +2660,7 @@ void EditorThemeManager::_generate_text_editor_defaults(ThemeConfiguration &p_co
 	const Color function_color =                  p_config.dark_theme ? Color(0.34, 0.7, 1.0) : Color(0, 0.225, 0.9, 1);
 	const Color member_variable_color =           p_config.dark_theme ? Color(0.34, 0.7, 1.0).lerp(p_config.mono_color, 0.6) : Color(0, 0.4, 0.68, 1);
 	const Color mark_color =                      Color(p_config.error_color.r, p_config.error_color.g, p_config.error_color.b, 0.3);
+	const Color warning_color =                   Color(p_config.warning_color.r, p_config.warning_color.g, p_config.warning_color.b, 0.15);
 	const Color bookmark_color =                  Color(0.08, 0.49, 0.98);
 	const Color breakpoint_color =                p_config.dark_theme ? p_config.error_color : Color(1, 0.27, 0.2, 1);
 	const Color executing_line_color =            Color(0.98, 0.89, 0.27);
@@ -2652,6 +2704,7 @@ void EditorThemeManager::_generate_text_editor_defaults(ThemeConfiguration &p_co
 	setting->set_initial_value("text_editor/theme/highlighting/function_color",                  function_color, true);
 	setting->set_initial_value("text_editor/theme/highlighting/member_variable_color",           member_variable_color, true);
 	setting->set_initial_value("text_editor/theme/highlighting/mark_color",                      mark_color, true);
+	setting->set_initial_value("text_editor/theme/highlighting/warning_color",                   warning_color, true);
 	setting->set_initial_value("text_editor/theme/highlighting/bookmark_color",                  bookmark_color, true);
 	setting->set_initial_value("text_editor/theme/highlighting/breakpoint_color",                breakpoint_color, true);
 	setting->set_initial_value("text_editor/theme/highlighting/executing_line_color",            executing_line_color, true);
diff --git a/engine/editor/themes/editor_theme_manager.h b/engine/editor/themes/editor_theme_manager.h
index ca5e1a4e..e81eb32e 100644
--- a/engine/editor/themes/editor_theme_manager.h
+++ b/engine/editor/themes/editor_theme_manager.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_THEME_MANAGER_H
-#define EDITOR_THEME_MANAGER_H
+#pragma once
 
 #include "editor/themes/editor_theme.h"
 #include "scene/resources/style_box_flat.h"
@@ -134,6 +133,8 @@ class EditorThemeManager {
 		Ref<StyleBoxFlat> button_style_pressed;
 		Ref<StyleBoxFlat> button_style_hover;
 
+		Ref<StyleBoxFlat> circle_style_focus;
+
 		Ref<StyleBoxFlat> popup_style;
 		Ref<StyleBoxFlat> popup_border_style;
 		Ref<StyleBoxFlat> window_style;
@@ -171,5 +172,3 @@ public:
 	static void initialize();
 	static void finalize();
 };
-
-#endif // EDITOR_THEME_MANAGER_H
diff --git a/engine/editor/translations/editor/ar.po b/engine/editor/translations/editor/ar.po
index 91d598b0..6447905f 100644
--- a/engine/editor/translations/editor/ar.po
+++ b/engine/editor/translations/editor/ar.po
@@ -1616,6 +1616,9 @@ msgstr "فك إشارة الوسائط:"
 msgid "Receiver Method:"
 msgstr "الدالة المُتلقية:"
 
+msgid "Pick"
+msgstr "اختار"
+
 msgid "Advanced"
 msgstr "الإعدادات المتقدمة"
 
@@ -5092,6 +5095,9 @@ msgstr "تثبيت من ملف"
 msgid "Install templates from a local file."
 msgstr "تثبيت القوالب من ملف محلي."
 
+msgid "Go Online"
+msgstr "الاتصال بالشبكة"
+
 msgid "Cancel the download of the templates."
 msgstr "إلغاء تحميل القوالب."
 
@@ -7622,9 +7628,6 @@ msgid ""
 "over the internet."
 msgstr "مكتبة الأصول والملحقات تتطلب اتصال بالشبكة."
 
-msgid "Go Online"
-msgstr "الاتصال بالشبكة"
-
 msgid "Failed to get repository configuration."
 msgstr "فشل تحصيل تهيئة المستودع."
 
@@ -14150,9 +14153,6 @@ msgstr "تأصيل"
 msgid "Pick Root Node Type"
 msgstr "اختر نوع العقدة الجذرية"
 
-msgid "Pick"
-msgstr "اختار"
-
 msgid "Scene name is empty."
 msgstr "اسم المشهد فارغ."
 
diff --git a/engine/editor/translations/editor/ca.po b/engine/editor/translations/editor/ca.po
index b8a5bfe9..58f48e35 100644
--- a/engine/editor/translations/editor/ca.po
+++ b/engine/editor/translations/editor/ca.po
@@ -29,13 +29,15 @@
 # Luna Moreno <akaluna99@gmail.com>, 2024.
 # Lukas Tenbrink <lukas.tenbrink@gmail.com>, 2025.
 # Alvaro <alvaro.garcia-bamala@epitech.eu>, 2025.
+# Joel Joan Castillo Ramos <joeljoancastilloramos5276@gmail.com>, 2025.
+# Quim Nuss Székely <lluna.nova@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-27 18:37+0000\n"
-"Last-Translator: Alberto Blanco Celdrán <flaberto.abc@gmail.com>\n"
+"PO-Revision-Date: 2025-03-15 15:39+0000\n"
+"Last-Translator: Quim Nuss Székely <lluna.nova@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ca/>\n"
 "Language: ca\n"
@@ -43,22 +45,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.2-rc\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Fil principal"
 
 msgid "Unset"
-msgstr "Desactiva"
+msgstr "Sense Establir"
 
 msgid "Physical"
 msgstr "Físic"
 
 msgid "Left Mouse Button"
-msgstr "Botó Esquerre del Ratolí"
+msgstr "Botó esquerre del ratolí"
 
 msgid "Right Mouse Button"
-msgstr "Botó Dret del Ratolí"
+msgstr "Botó dret del ratolí"
 
 msgid "Middle Mouse Button"
 msgstr "Botó Central del Ratolí"
@@ -517,8 +519,15 @@ msgstr "Tipus:"
 msgid "Metadata name can't be empty."
 msgstr "El nom de la metadada no pot estar buit."
 
+msgid "Metadata name must be a valid identifier."
+msgstr "El nom de les metadades ha de ser un identificador vàlid."
+
+msgid "Metadata with name \"%s\" already exists."
+msgstr "Ja existeixen metadades amb aquest nom \"%s\"."
+
 msgid "Names starting with _ are reserved for editor-only metadata."
-msgstr "Els noms començant amb _ estan reservats per a metadades de l'editor."
+msgstr ""
+"Els noms que començan amb _ estan reservats per a metadades de l'editor."
 
 msgid "Time:"
 msgstr "Temps:"
@@ -530,13 +539,13 @@ msgid "Update Selected Key Handles"
 msgstr "Actualitza les nanses clau seleccionades"
 
 msgid "Insert Key Here"
-msgstr "Insereix una Clau aquí"
+msgstr "Insereix una clau aquí"
 
 msgid "Duplicate Selected Key(s)"
-msgstr "Duplica les Claus seleccionades"
+msgstr "Duplica les claus seleccionades"
 
 msgid "Cut Selected Key(s)"
-msgstr "Elimina les claus seleccionades"
+msgstr "Talla les claus seleccionades"
 
 msgid "Copy Selected Key(s)"
 msgstr "Copia les Claus seleccionades"
@@ -2424,18 +2433,47 @@ msgstr ""
 "Aquest mètode no necessita una instància per ser cridat.\n"
 "Es pot cridar directament utilitzant el nom de la classe."
 
+msgid "This value is an integer composed as a bitmask of the following flags."
+msgstr ""
+"Aquest valor és un nombre enter compost com a màscara de bits dels següents "
+"senyals."
+
+msgid "Experimental"
+msgstr "Experimental"
+
+msgid "Experimental:"
+msgstr "Experimental:"
+
 msgid "Operators"
 msgstr "Operadors"
 
 msgid "Method Descriptions"
 msgstr "Descripcions dels Mètodes"
 
+msgid "This method may be changed or removed in future versions."
+msgstr "Aquest mètode es canviarà o eliminarà en futures versions."
+
+msgid "This constructor may be changed or removed in future versions."
+msgstr "Aquest constructor es canviarà o eliminarà en futures versions."
+
+msgid "There is currently no description for this method."
+msgstr "Actualment, no hi ha cap descripció per a aquest mètode."
+
+msgid "There is currently no description for this constructor."
+msgstr "Actualment, no hi ha cap descripció per a aquest constructor."
+
+msgid "There is currently no description for this operator."
+msgstr "Actualment, no hi ha cap descripció per a aquest operador."
+
 msgid "Top"
 msgstr "Dalt"
 
 msgid "Class:"
 msgstr "Classe:"
 
+msgid "This class may be changed or removed in future versions."
+msgstr "Aquesta classe es canviarà o eliminarà en futures versions."
+
 msgid "Inherits:"
 msgstr "Hereta:"
 
@@ -2445,6 +2483,20 @@ msgstr "Heretat per:"
 msgid "Description"
 msgstr "Descripció"
 
+msgid "There is currently no description for this class."
+msgstr "Actualment no hi ha cap descripció per a aquesta classe."
+
+msgid "Note:"
+msgstr "Nota:"
+
+msgid ""
+"There are notable differences when using this API with C#. See [url=%s]C# API "
+"differences to GDScript[/url] for more information."
+msgstr ""
+"Hi ha diferències notòries en usar aquesta API amb C#. Vegeu "
+"[url=%s]Diferències entre la API de C# i GDScript[/*url] per a més "
+"información."
+
 msgid "Online Tutorials"
 msgstr "Tutorials en línia"
 
@@ -2460,9 +2512,21 @@ msgstr "Propietats del tema"
 msgid "Constants"
 msgstr "Constants"
 
+msgid "There is currently no description for this theme property."
+msgstr "Actualment no hi ha cap descripció per a aquesta propietat del tema."
+
+msgid "This signal may be changed or removed in future versions."
+msgstr "Aquest senyal pot canviar o ser eliminat en versions futures."
+
+msgid "There is currently no description for this signal."
+msgstr "Actualment no hi ha descripció per aquest senyal."
+
 msgid "Enumerations"
 msgstr "Enumeracions"
 
+msgid "This enumeration may be changed or removed in future versions."
+msgstr "Aquesta enumeració pot canviar o suprimida en versions futures."
+
 msgid "Property Descriptions"
 msgstr "Descripcions de la Propietat"
 
diff --git a/engine/editor/translations/editor/cs.po b/engine/editor/translations/editor/cs.po
index b0fb164d..f030934b 100644
--- a/engine/editor/translations/editor/cs.po
+++ b/engine/editor/translations/editor/cs.po
@@ -1564,6 +1564,9 @@ msgstr "Zrušit vazby argumentů signálu:"
 msgid "Receiver Method:"
 msgstr "Přijímací metoda:"
 
+msgid "Pick"
+msgstr "Vybrat"
+
 msgid "Advanced"
 msgstr "Pokročilé"
 
@@ -5187,6 +5190,9 @@ msgstr "Instalovat ze souboru"
 msgid "Install templates from a local file."
 msgstr "Instalovat šablony z místního souboru."
 
+msgid "Go Online"
+msgstr "Jít online"
+
 msgid "Cancel the download of the templates."
 msgstr "Zrušit stahování šablon."
 
@@ -7985,9 +7991,6 @@ msgstr ""
 "Knihovna zdrojů vyžaduje online připojení a zahrnuje posílání dat přes "
 "internet."
 
-msgid "Go Online"
-msgstr "Jít online"
-
 msgid "Failed to get repository configuration."
 msgstr "Stahování konfigurace repozitáře selhalo."
 
@@ -15579,9 +15582,6 @@ msgstr "Štítky funkcí"
 msgid "Pick Root Node Type"
 msgstr "Vybrat typ kořenového uzlu"
 
-msgid "Pick"
-msgstr "Vybrat"
-
 msgid "Scene name is empty."
 msgstr "Název scény je prázdný."
 
@@ -16273,41 +16273,6 @@ msgstr "Restartovat a aktualizovat"
 msgid "Updating Script UIDs"
 msgstr "Aktualizace UID skriptů"
 
-msgid ""
-"As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
-"\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
-msgstr ""
-"Od verze Godotu 4.4 používají scény a zdroje pro odkazování na skripty a "
-"shadery UID.\n"
-"\n"
-"Běžně se tato aktualizace aplikuje na jednu scénu nebo zdroj, jakmile je "
-"poprvé uložíte v Godotu 4.4. Máte-li mnoho scén a/nebo zdrojů, může být ruční "
-"aktualizace časově náročná. Tento nástroj aktualizuje všechny scény a zdroje "
-"projektu najednou.\n"
-"\n"
-"Kliknutím na \"Restartovat a aktualizovat\" restartujete editor a "
-"aktualizujete všechny scén a zdrojů v tomto projektu. Tato operace může v "
-"závislosti na velikosti projektu trvat až několik minut.\n"
-"\n"
-"Poznámka: Před spuštěním nástroje se ujistěte, že máte svůj projekt "
-"zálohovaný, abyste předešli potenciálně ztrátě dat. Také se ujistěte, že jste "
-"všechny .uid soubory commitovali do systému správy verzí (a nepřidávejte je "
-"do seznamů ignorovaných souborů jako .gitignore)."
-
 msgid "Learn More"
 msgstr "Zjistit více"
 
@@ -19587,6 +19552,9 @@ msgstr ""
 "Chcete-li pokračovat s minimálními změnami kódu, přidejte 'uniform sampler2D "
 "%s : hint_%s, filter_linear_mipmap;' v horní části vašeho shaderu."
 
+msgid "Can't use function as identifier: '%s'."
+msgstr "Nelze použít funkci jako identifikátor: '%s'."
+
 msgid "Varying with '%s' data type may only be used in the '%s' function."
 msgstr ""
 "Interpolovaná proměnná datového typu '%s' je možné použít pouze ve funkci "
@@ -19595,9 +19563,6 @@ msgstr ""
 msgid "Varying '%s' must be assigned in the '%s' function first."
 msgstr "Interpolovaná proměnná '%s' musí být nejprve přiřazena ve funkci '%s'."
 
-msgid "Can't use function as identifier: '%s'."
-msgstr "Nelze použít funkci jako identifikátor: '%s'."
-
 msgid "Only integer expressions are allowed for indexing."
 msgstr "Pro indexaci jsou povoleny pouze celočíselné výrazy."
 
diff --git a/engine/editor/translations/editor/de.po b/engine/editor/translations/editor/de.po
index 29f876ce..24c5c544 100644
--- a/engine/editor/translations/editor/de.po
+++ b/engine/editor/translations/editor/de.po
@@ -93,7 +93,7 @@
 # Jakob <js2k2@gmx.de>, 2023.
 # DafabHoid <github@dafabhoid.de>, 2023.
 # Jummit <jummit@web.de>, 2023.
-# Ettore Atalan <atalanttore@googlemail.com>, 2023, 2024.
+# Ettore Atalan <atalanttore@googlemail.com>, 2023, 2024, 2025.
 # Luke Pucknat <lukesollichstun@gmail.com>, 2023.
 # Haoyu Qiu <timothyqiu32@gmail.com>, 2023.
 # Jan Werder <jan@werder.space>, 2023.
@@ -117,13 +117,15 @@
 # Leona 'leo' Gottfried <s6573328@stud.uni-frankfurt.de>, 2024.
 # Deleted User <noreply+102345@weblate.org>, 2025.
 # Silikonmanns Kanal <silvan.goeth@gmail.com>, 2025.
+# I_had_a_bad_idea <emmert_raphael@web.de>, 2025.
+# Robert Kossessa <weblate@kosro.de>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-27 11:52+0000\n"
-"Last-Translator: Silikonmanns Kanal <silvan.goeth@gmail.com>\n"
+"PO-Revision-Date: 2025-03-16 12:59+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/godot/"
 "de/>\n"
 "Language: de\n"
@@ -131,7 +133,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.2-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Hauptthread"
@@ -997,6 +999,9 @@ msgstr "AnimationPlayer kann sich nicht selbst animieren, nur andere Objekte."
 msgid "property '%s'"
 msgstr "Eigenschaft ‚%s‘"
 
+msgid "Nearest FPS: %d"
+msgstr "Nächste FPS: %d"
+
 msgid "Change Animation Step"
 msgstr "Animationsschrittweite ändern"
 
@@ -1170,6 +1175,9 @@ msgstr "Nur Tracks der aktuell ausgewählten Nodes anzeigen."
 msgid "Group tracks by node or display them as plain list."
 msgstr "Tracks nach Node gruppieren oder nacheinander anzeigen."
 
+msgid "Apply snapping to timeline cursor."
+msgstr "Einrasten für Zeitleistencursor anwenden."
+
 msgid "Apply snapping to selected key(s)."
 msgstr "Einrasten für ausgewählte(n) Key(s) anwenden."
 
@@ -1459,6 +1467,12 @@ msgstr "Markername ändern:"
 msgid "Edit Marker Color"
 msgstr "Markerfarbe einstellen"
 
+msgid "Multi Edit Marker Color"
+msgstr "Farbe des Mehrfachbearbeitungsmarkers"
+
+msgid "Animation Change Marker Time"
+msgstr "Animationsänderungsmarkerzeit"
+
 msgid "Add Audio Track Clip"
 msgstr "Audiotrack-Clip hinzufügen"
 
@@ -1490,6 +1504,12 @@ msgid_plural "%d of %d matches"
 msgstr[0] "%d von %d Übereinstimmung"
 msgstr[1] "%d von %d Übereinstimmungen"
 
+msgid "Hide Replace"
+msgstr "Ersetzung ausblenden"
+
+msgid "Show Replace"
+msgstr "Ersetzung anzeigen"
+
 msgid "Find"
 msgstr "Suchen"
 
@@ -1631,6 +1651,9 @@ msgstr "Signalargumente lösen:"
 msgid "Receiver Method:"
 msgstr "Empfängermethode:"
 
+msgid "Pick"
+msgstr "Auswählen"
+
 msgid "Advanced"
 msgstr "Erweitert"
 
@@ -1787,6 +1810,9 @@ msgstr "Sichtbarkeit ein-/ausschalten"
 msgid "Expression to evaluate"
 msgstr "Auszuführender Ausdruck"
 
+msgid "Clear on Run"
+msgstr "Beim Ausführen leeren"
+
 msgid "Evaluate"
 msgstr "Auswerten"
 
@@ -2981,6 +3007,9 @@ msgstr "Autoload-Skripte erzeugen …"
 msgid "Initializing plugins..."
 msgstr "Plugins initialisieren …"
 
+msgid "Scanning actions..."
+msgstr "Aktionen scannen …"
+
 msgid "Some extensions need the editor to restart to take effect."
 msgstr ""
 "Bei einigen Erweiterungen muss der Editor neugestartet werden, um wirksam zu "
@@ -3056,6 +3085,9 @@ msgstr ""
 "Diese Methode benötigt keine Instanz, um aufgerufen zu werden.\n"
 "Sie kann direkt über den Klassennamen aufgerufen werden."
 
+msgid "Code snippet copied to clipboard."
+msgstr "Codeausschnitt in Zwischenablage kopiert."
+
 msgid "No return value."
 msgstr "Kein Rückgabewert."
 
@@ -5301,6 +5333,9 @@ msgstr "Aus Datei installieren"
 msgid "Install templates from a local file."
 msgstr "Exportvorlagen aus lokaler Datei installieren."
 
+msgid "Go Online"
+msgstr "Online gehen"
+
 msgid "Cancel the download of the templates."
 msgstr "Herunterladen der Exportvorlagen abbrechen."
 
@@ -6584,9 +6619,19 @@ msgstr "Szenenbaum (Nodes):"
 msgid "Node Configuration Warning!"
 msgstr "Node-Konfigurationswarnung!"
 
+msgid "Revoke"
+msgstr "Widerrufen"
+
 msgid "Don't Ask Again"
 msgstr "Nicht mehr fragen"
 
+msgid ""
+"This dialog can also be enabled/disabled in the Editor Settings: Docks > "
+"Scene Tree > Ask Before Revoking Unique Name."
+msgstr ""
+"Dieser Dialog kann auch in den Editor Einstellungen de-/aktiviert werden: "
+"Docks > Szenenbaum > Vor dem Wiederrufen eindeutiger Namen fragen."
+
 msgid "Allowed:"
 msgstr "Erlaubt:"
 
@@ -6764,6 +6809,9 @@ msgstr "Materialien"
 msgid "Selected Animation Play/Pause"
 msgstr "Ausgewählte Animation abspielen/pausieren"
 
+msgid "Toggle Animation Skeleton Visibility"
+msgstr "Unteres Animation-Panel ein-/ausblenden"
+
 msgid "Rotate Lights With Model"
 msgstr "Lichter mit Modell rotieren"
 
@@ -8040,9 +8088,6 @@ msgstr ""
 "Die Asset-Bibliothek erfordert eine Online-Verbindung und überträgt Daten "
 "über das Internet."
 
-msgid "Go Online"
-msgstr "Online gehen"
-
 msgid "Failed to get repository configuration."
 msgstr "Repository-Konfiguration konnte nicht abgerufen werden."
 
@@ -8928,6 +8973,13 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr "Plugin bearbeiten"
 
+msgid ""
+"Recovery mode is enabled. Enabled plugins will not run while this mode is "
+"active."
+msgstr ""
+"Der Wiederherstellungsmodus ist aktiviert. Aktivierte Plugins werden nicht "
+"ausgeführt werden während dieser Modus aktiv ist."
+
 msgid "Installed Plugins:"
 msgstr "Installierte Plugins:"
 
@@ -9007,6 +9059,128 @@ msgstr "Zahlen-Ausrichtung"
 msgid "Unable to preview font"
 msgstr "Vorschau für Schriftart nicht verfügbar"
 
+msgid "Game running not embedded."
+msgstr "Spielausführung nicht eingebettet."
+
+msgid "Press play to start the game."
+msgstr "Klicke auf Play um das Spiel zu starten."
+
+msgid "Embedding is disabled."
+msgstr "Einbettung ist deaktiviert."
+
+msgid ""
+"Game embedding not available on Wayland.\n"
+"Wayland can be disabled in the Editor Settings (Run > Platforms > Linux/*BSD "
+"> Prefer Wayland)."
+msgstr ""
+"Das Einbetten des Spiels ist unter Wayland nicht verfügbar.\n"
+"Wayland kann in den Editor-Einstellungen, unter Ausführen > Plattformen > "
+"Linux/*BSD > Wayland bevorzugen, deaktiviert werden."
+
+msgid "Game embedding not available on your OS."
+msgstr "Spieleinbettung nicht auf diesem Betriebssystem verfügbar."
+
+msgid ""
+"Game embedding not available for the Display Server: '%s'.\n"
+"Display Server can be modified in the Project Settings (Display > Display "
+"Server > Driver)."
+msgstr ""
+"Das Einbetten des Spiels ist für den Display-Server „%s“ nicht verfügbar.\n"
+"Der Display-Server kann in den Projekteinstellungen, unter Anzeige > Display-"
+"Server > Treiber, geändert werden."
+
+msgid ""
+"Game embedding not available when the game starts minimized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Das Einbetten des Spiels ist nicht verfügbar, wenn das Spiel minimiert "
+"startet.\n"
+"Erwäge, die Projekteinstellung für den Fenstermodus mit dem Editor-Feature-"
+"Tag auf „Windowed“ zu setzen, um das Einbetten des Spiels zu ermöglichen, "
+"während das exportierte Projekt unverändert bleibt."
+
+msgid ""
+"Game embedding not available when the game starts maximized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Das Einbetten des Spiels ist nicht verfügbar, wenn das Spiel maximiert "
+"startet.\n"
+"Erwäge, die Projekteinstellung für den Fenstermodus mit dem Editor-Feature-"
+"Tag auf „Windowed“ zu setzen, um das Einbetten des Spiels zu ermöglichen, "
+"während das exportierte Projekt unverändert bleibt."
+
+msgid ""
+"Game embedding not available when the game starts in fullscreen.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Das Einbetten des Spiels ist nicht verfügbar, wenn das Spiel im Vollbild "
+"startet.\n"
+"Erwäge, die Projekteinstellung für den Fenstermodus mit dem Editor-Feature-"
+"Tag auf „Windowed“ zu setzen, um das Einbetten des Spiels zu ermöglichen, "
+"während das exportierte Projekt unverändert bleibt."
+
+msgid "Game embedding not available in single window mode."
+msgstr "Spieleinbettung ist nicht im Einzelfenster-Modus verfügbar."
+
+msgid "Suspend"
+msgstr "Unterbrechen"
+
+msgid "Allow game input."
+msgstr "Spieleingabe erlauben."
+
+msgid ""
+"Disable game input and allow to select Node2Ds, Controls, and manipulate the "
+"2D camera."
+msgstr ""
+"Spieleingabe deaktivieren und erlauben Node2Ds und Controls auszuwählen und "
+"die 2D-Kamera manipulieren."
+
+msgid ""
+"Disable game input and allow to select Node3Ds and manipulate the 3D camera."
+msgstr ""
+"Spieleingabe deaktivieren und Node3Ds auswählen und die 3D-Kamera "
+"manipulieren."
+
+msgid "Manipulate In-Game"
+msgstr "Im Spiel manipulieren"
+
+msgid "Manipulate From Editors"
+msgstr "Aus Editoren manipulieren"
+
+msgid ""
+"Embedded game size is based on project settings.\n"
+"The 'Keep Aspect' mode is used when the Game Workspace is smaller than the "
+"desired size."
+msgstr ""
+"Die Größe des eingebetteten Spiels basiert auf den Projekteinstellungen.\n"
+"Der Modus „Seitenverhältnis beibehalten“ wird verwendet, wenn der "
+"Spielarbeitsbereich kleiner als die gewünschte Größe ist."
+
+msgid "Keep the aspect ratio of the embedded game."
+msgstr "Seitenverhältnis des eingebetteten Spiels beibehalten."
+
+msgid "Embed Game on Next Play"
+msgstr "Spiel beim nächsten Start einbetten"
+
+msgid "Make Game Workspace Floating on Next Play"
+msgstr "Spielarbeitsbereich beim nächsten Start als schwebend festlegen"
+
+msgid ""
+"No \"%s\" library found for GDExtension: \"%s\". Possible feature flags for "
+"your platform: %s"
+msgstr ""
+"Keine „%s“-Bibliothek für GDExtension „%s“ gefunden. Mögliche Feature-Flags "
+"für deine Plattform: %s"
+
+msgid "Multiple \"%s\" libraries found for GDExtension: \"%s\": \"%s\"."
+msgstr "Mehrere „%s“ Bibliotheken für GDExtension „%s“ gefunden: „%s“."
+
 msgid "Change AudioStreamPlayer3D Emission Angle"
 msgstr "Emissionswinkel für AudioStreamPlayer3D ändern"
 
@@ -9144,6 +9318,29 @@ msgstr ""
 "Ein Speicherpfad für Lightmap-Bilder kann nicht bestimmt werden.\n"
 "Ein Speichern der Szene sollte dieses Problem beheben."
 
+msgid ""
+"No meshes with lightmapping support to bake. Make sure they contain UV2 data "
+"and their Global Illumination property is set to Static."
+msgstr ""
+"Keine Meshes mit Lightmapping-Unterstützung zum Backen gefunden. Stelle "
+"sicher, dass sie UV2-Daten enthalten und ihre Global Illumination-Eigenschaft "
+"auf „Statisch“ gesetzt ist."
+
+msgid ""
+"To import a scene with lightmapping support, set Meshes > Light Baking to "
+"Static Lightmaps in the Import dock."
+msgstr ""
+"Um eine Szene mit Lightmapping-Unterstützung zu importieren, setze im Import-"
+"Dock: Meshes > Light Baking auf „Statische Lightmaps“."
+
+msgid ""
+"To enable lightmapping support on a primitive mesh, edit the PrimitiveMesh "
+"resource in the inspector and check Add UV2."
+msgstr ""
+"Um Lightmapping-Unterstützung für ein primitives Mesh zu aktivieren, "
+"bearbeite die PrimitiveMesh-Ressource im Inspektor und aktiviere „UV2 "
+"hinzufügen“."
+
 msgid "No editor scene root found."
 msgstr "Keinen Root-Node in Editorszene gefunden."
 
@@ -9169,6 +9366,13 @@ msgstr ""
 msgid "Bake Lightmaps"
 msgstr "Lightmaps backen"
 
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time."
+msgstr ""
+"Lightmaps können nicht gebacken werden, da das Modul `lightmapper_rd` zur "
+"Kompilierzeit deaktiviert wurde."
+
 msgid "LightMap Bake"
 msgstr "LightMap backen"
 
@@ -9369,6 +9573,28 @@ msgstr ""
 msgid "UV Channel Debug"
 msgstr "UV-Channel-Debug"
 
+msgid ""
+"Before converting a rendering mesh to a navigation mesh, please verify:\n"
+"\n"
+"- The mesh is two-dimensional.\n"
+"- The mesh has no surface overlap.\n"
+"- The mesh has no self-intersection.\n"
+"- The mesh surfaces have indices.\n"
+"\n"
+"If the mesh does not fulfill these requirements, the pathfinding will be "
+"broken."
+msgstr ""
+"Vor dem Konvertieren eines Rendering-Mesh zu einem Navigation-Mesh , "
+"verifiziere bitte:\n"
+"\n"
+"-Das Mesh ist zweidimensional.\n"
+"-Das Mesh hat keine überlappenden Flächen.\n"
+"-Das Mesh schneidet sich nicht selbst.\n"
+"-Die Mesh-Flächen besitzen Indeces.\n"
+"\n"
+"Falls das Mesh diese Vorraussetzungen nicht erfüllt, wird das Pathfinding "
+"defekt sein."
+
 msgid "Remove item %d?"
 msgstr "Element %d entfernen?"
 
@@ -9482,6 +9708,18 @@ msgstr "start_position festlegen"
 msgid "Set end_position"
 msgstr "end_position festlegen"
 
+msgid "Edit Obstacle (Flip Winding)"
+msgstr "Hindernis bearbeiten (Wicklung invetieren)"
+
+msgid "Add Vertex"
+msgstr "Vertex hinzufügen"
+
+msgid "Edit Obstacle (Add Vertex)"
+msgstr "Hindernis bearbeiten (Vertex hinzufügen)"
+
+msgid "Edit Obstacle (Move Vertex)"
+msgstr "Hindernis bearbeiten (Vertex bewegen)"
+
 msgid "Please Confirm..."
 msgstr "Bitte bestätigen …"
 
@@ -9838,6 +10076,9 @@ msgstr "Rotations-Transformation starten"
 msgid "Begin Scale Transformation"
 msgstr "Skalierungs-Transformation starten"
 
+msgid "Reposition Using Collisions"
+msgstr "Neupositionierung mithilfe von Kollisionen"
+
 msgid "Toggle Camera Preview"
 msgstr "Kameravorschau ein-/ausschalten"
 
@@ -10242,6 +10483,9 @@ msgstr "Generiere Sichtbarkeits-Rechteck (Warte auf Partikelsimulation)"
 msgid "Generating..."
 msgstr "Wird generiert ..."
 
+msgid "Loading emission mask requires ParticleProcessMaterial."
+msgstr "Das Laden der Emissionenmaske benötigt ParticleProcessMaterial."
+
 msgid "GPUParticles2D"
 msgstr "CPU-Partikel-2D"
 
@@ -10712,6 +10956,9 @@ msgstr ""
 "AnimationMixer hat keinen gültigen Root-Node-Pfad, also können Track-Namen "
 "nicht abgerufen werden."
 
+msgid "(truncated)"
+msgstr "(abgeschnitten)"
+
 msgid "Can't open '%s'. The file could have been moved or deleted."
 msgstr ""
 "Datei ‚%s‘ kann nicht geöffnet werden. Die Datei könnte verschoben oder "
@@ -10919,6 +11166,9 @@ msgstr "Normaler Text"
 msgid "JSON"
 msgstr "JSON"
 
+msgid "Markdown"
+msgstr "Markdown"
+
 msgid "Connections to method:"
 msgstr "Verbindungen mit Methode:"
 
@@ -10967,6 +11217,9 @@ msgstr ""
 "Nodes können hier nicht fallen gelassen werden da Skript ‚%s‘ nicht von Node "
 "erbt."
 
+msgid "Emoji & Symbols"
+msgstr "Emojis & Symbole"
+
 msgid "Pick Color"
 msgstr "Farbe auswählen"
 
@@ -11151,6 +11404,9 @@ msgstr "Standardpose überschreiben"
 msgid "Set Bone Transform"
 msgstr "Knochentransformation festlegen"
 
+msgid "Modify metadata '%s' for bone '%s'"
+msgstr "Metadaten „%s“ für Knochen „%s“ ändern"
+
 msgid "Set Bone Rest"
 msgstr "Standardpose für Knochen festlegen"
 
@@ -13207,6 +13463,12 @@ msgstr ""
 "Das Ergebnis des Instanzparameters kann nicht richtig von der 2D-Vorschau "
 "dargestellt werden."
 
+msgid "Copy Preview Shader Parameters From Material"
+msgstr "Vorschau-Shader-Parameter aus Material kopieren"
+
+msgid "Paste Preview Shader Parameters To Material"
+msgstr "Vorschau-Shader-Parameter in Material einfügen"
+
 msgid "Add Input Port"
 msgstr "Eingangs-Port hinzufügen"
 
@@ -13354,6 +13616,9 @@ msgstr "Eine Varying mit dem Namen existiert bereits."
 msgid "Add Node(s) to Visual Shader"
 msgstr "Node(s) zum Visual Shader hinzufügen"
 
+msgid "Hold %s Key To Swap Connections"
+msgstr "Halte die %s Taste gedrückt, um Verbindungen zu wechseln"
+
 msgid "Vertex"
 msgstr "Vertex"
 
@@ -13402,6 +13667,9 @@ msgstr "Neuen Node einfügen"
 msgid "Insert New Reroute"
 msgstr "Neue Umleitung einfügen"
 
+msgid "Copy Parameters From Material"
+msgstr "Parameter aus Material kopieren"
+
 msgid "High-end node"
 msgstr "Hochleistungs-Node"
 
@@ -13426,12 +13694,18 @@ msgstr "Graustufenfunktion."
 msgid "Converts HSV vector to RGB equivalent."
 msgstr "Wandelt HSV-Vektor in RGB-Gegenwert um."
 
+msgid "Converts color from linear to sRGB color space."
+msgstr "Konvertiert Farben vom linearen in den sRGB-Farbraum."
+
 msgid "Converts RGB vector to HSV equivalent."
 msgstr "Wandelt RGB-Vektor in HSV-Gegenwert um."
 
 msgid "Sepia function."
 msgstr "Sepiafunktion."
 
+msgid "Converts color from sRGB to linear color space."
+msgstr "Konvertiert Farben von sRGB in den linearen Farbraum."
+
 msgid "Burn operator."
 msgstr "Brenn-Operator."
 
@@ -14597,6 +14871,27 @@ msgstr ""
 "Alle fehlenden Projekte aus der Liste entfernen?\n"
 "Inhalte des Projektordners werden nicht geändert."
 
+msgid ""
+"It looks like Godot crashed when opening this project the last time. If "
+"you're having problems editing this project, you can try to open it in "
+"Recovery Mode."
+msgstr ""
+"Es sieht so aus, als wäre Godot beim letzten Öffnen dieses Projekts "
+"abgestürzt. Wenn Sie Probleme haben, dieses Projekt zu bearbeiten, können Sie "
+"versuchen, es im Wiederherstellungsmodus zu öffnen."
+
+msgid ""
+"Recovery Mode is a special mode that may help to recover projects that crash "
+"the engine during initialization. This mode temporarily disables the "
+"following features:"
+msgstr ""
+"Recovery-Modus ist ein spezieller Modus, der helfen kann, Projekte zu "
+"wiederherstellen, bei denen die Engine während der Initialisierung abstürzt. "
+"Dieser Modus deaktiviert vorübergehend die folgenden Eigenschaften:"
+
+msgid "Edit the project in Recovery Mode?"
+msgstr "Das Projekt im Wiederherstellungsmodus bearbeiten?"
+
 msgid "Couldn't load project at '%s'. It may be missing or corrupted."
 msgstr ""
 "Das Projekt '%s' konnte nicht geladen werden. Es könnte fehlen oder "
@@ -14714,6 +15009,9 @@ msgstr "Wähle zu durchsuchenden Ordner"
 msgid "Remove All"
 msgstr "Alles entfernen"
 
+msgid "Edit in Recovery Mode"
+msgstr "Bearbeiten im Wiederherstellungsmodus"
+
 msgid "Convert Full Project"
 msgstr "Gesamtes Projekt konvertieren"
 
@@ -14917,6 +15215,15 @@ msgstr "Projektinstallationspfad:"
 msgid "Renderer:"
 msgstr "Renderer:"
 
+msgid ""
+"RenderingDevice-based methods not available on this GPU:\n"
+"%s\n"
+"Please use the Compatibility renderer."
+msgstr ""
+"Auf dieser GPU sind keine RenderingDevice-basierten Methoden verfügbar:\n"
+"%s\n"
+"Bitte verwenden Sie den Kompatibilitäts-Renderer."
+
 msgid "The renderer can be changed later, but scenes may need to be adjusted."
 msgstr ""
 "Ein Wechsel des Renderers ist jederzeit zulässig, bereits vorhandene Szenen "
@@ -15183,9 +15490,6 @@ msgstr "Feature-Tags"
 msgid "Pick Root Node Type"
 msgstr "Typ des Root-Nodes auswählen"
 
-msgid "Pick"
-msgstr "Auswählen"
-
 msgid "Scene name is empty."
 msgstr "Szenenname ist leer."
 
@@ -15872,6 +16176,9 @@ msgstr ""
 msgid "Restart & Upgrade"
 msgstr "Neustart & Aktualisieren"
 
+msgid "Learn More"
+msgstr "Mehr erfahren"
+
 msgid "Make this panel floating in the screen %d."
 msgstr "Dieses Panel schwebend machen auf Bildschirm %d."
 
@@ -15885,6 +16192,31 @@ msgstr ""
 msgid "Select Screen"
 msgstr "Bildschirm auswählen"
 
+msgid ""
+"The CSGShape3D has an empty shape.\n"
+"CSGShape3D empty shapes typically occur because the mesh is not manifold.\n"
+"A manifold mesh forms a solid object without gaps, holes, or loose edges.\n"
+"Each edge must be a member of exactly two faces."
+msgstr ""
+"CSGShape3D hat eine leere Form.\n"
+"Leere CSGShape3D-Formen treten normalerweise auf, weil das Mesh nicht "
+"mannigfaltig ist.\n"
+"Ein mannigfaltiges Mesh bildet ein festes Objekt ohne Lücken, Löcher oder "
+"lose Kanten.\n"
+"Jede Kante muss ein Element von genau zwei Flächen sein."
+
+msgid "CSG operation returned an empty array."
+msgstr "Der CSG-Vorgang hat ein leeres Array zurückgegeben."
+
+msgid "CSG operation returned an empty mesh."
+msgstr "CSG-Vorgang hat ein leeres Mesh zurückgegeben."
+
+msgid "CSG operation returned an empty shape."
+msgstr "CSG-Vorgang hat eine leere Form zurückgegeben."
+
+msgid "CSG"
+msgstr "CSG"
+
 msgid "Change Torus Inner Radius"
 msgstr "Inneren Torusradius ändern"
 
@@ -16471,6 +16803,11 @@ msgstr "Aktion hinzufügen."
 msgid "Remove action set."
 msgstr "Aktionsset entfernen."
 
+msgid "Note: modifiers will only be applied if supported on the host system."
+msgstr ""
+"Notiz: Modifikatoren werden nur angewandt, wenn sie auf dem Host-System "
+"unterstützt sind."
+
 msgid "OpenXR Action Map"
 msgstr "OpenXR-Aktionszuweisung"
 
@@ -16501,6 +16838,9 @@ msgstr "Eine Aktion auswählen"
 msgid "Select an interaction profile"
 msgstr "Interaktionsprofil auswählen"
 
+msgid "All interaction profiles have been added to the action map."
+msgstr "Alle Interaktionsprofile wurden zur Aktionszuweisung hinzugefügt."
+
 msgid "Choose an XR runtime."
 msgstr "XR-Runtime wählen."
 
@@ -16978,6 +17318,9 @@ msgstr "Exportieren nach iOS bei Verwendung von C#/.NET ist noch experimentell."
 msgid "Invalid additional PList content: "
 msgstr "Ungültiger zusätzlicher PList-Inhalt: "
 
+msgid "Metal renderer require iOS 14+."
+msgstr "Der Metallrenderer benötigt iOS 14+"
+
 msgid "Identifier is missing."
 msgstr "Bezeichner fehlt."
 
@@ -17626,6 +17969,11 @@ msgstr ""
 "Die Startposition eines NavigationLink2D sollte sich von seiner Endposition "
 "unterscheiden, um nützlich zu sein."
 
+msgid "NavigationObstacle2D does not support negative or zero scaling."
+msgstr ""
+"NavigationObstacle2D unterstützt weder eine negative Skalierung noch eine von "
+"null."
+
 msgid ""
 "A NavigationMesh resource must be set or created for this node to work. "
 "Please set a property or draw a polygon."
@@ -17976,6 +18324,23 @@ msgstr "Generiere Probe-Volumen"
 msgid "Generating Probe Acceleration Structures"
 msgstr "Generiere Probe-Beschleunigungsstrukturen"
 
+msgid ""
+"The lightmap has no baked shadowmask textures. Please rebake with the "
+"Shadowmask Mode set to anything other than None."
+msgstr ""
+"Die Lightmap enthält keine gebackenen Schattenmasken-Texturen. Bitte backe "
+"sie erneut mit einem anderen Schattenmasken-Modus als „Nichts“."
+
+msgid ""
+"Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will "
+"still work."
+msgstr ""
+"Lightmaps können nicht auf %s gebacken werden. Das Rendern vorhandener "
+"gebackener Lightmaps funktioniert weiterhin."
+
+msgid "Forward axis and primary rotation axis must not be parallel."
+msgstr "Vorwärtsachse und primäre Rotationsachse dürfen nicht parallel sein."
+
 msgid ""
 "The NavigationAgent3D can be used only under a Node3D inheriting parent node."
 msgstr ""
@@ -17989,6 +18354,14 @@ msgstr ""
 "Die Startposition von NavigationLink3D sollte sich von der Endposition "
 "unterscheiden, um einen Effekt zu haben."
 
+msgid ""
+"NavigationObstacle3D only takes global rotation around the y-axis into "
+"account. Rotations around the x-axis or z-axis might lead to unexpected "
+"results."
+msgstr ""
+"NavigationObstacle3D berücksichtigt nur die globale Rotation um die Y-Achse. "
+"Rotationen um die X- oder Z-Achse können zu unerwarteten Ergebnissen führen."
+
 msgid ""
 "Occlusion culling is disabled in the Project Settings, which means occlusion "
 "culling won't be performed in the root viewport.\n"
@@ -18595,6 +18968,9 @@ msgstr "Alle Oberflächen nutzen"
 msgid "Surface Index"
 msgstr "Oberflächenindex"
 
+msgid "Division by zero error."
+msgstr "Fehler beim Teilen durch Null."
+
 msgid ""
 "Invalid number of arguments when calling stage function '%s', which expects "
 "%d arguments."
@@ -18727,6 +19103,10 @@ msgstr "Positive Integer-Konstante erwartet."
 msgid "Invalid data type for the array."
 msgstr "Ungültiger Datentyp für das Array."
 
+msgid "Array size mismatch. Expected %d elements (found %d)."
+msgstr ""
+"Array-Größenabweichung. Erwartet wurden %d Elemente (gefunden wurden %d)."
+
 msgid "Expected array initialization."
 msgstr "Array-Initialisierung erwartet."
 
@@ -18886,6 +19266,9 @@ msgstr ""
 msgid "Expected '%s' with an expression of type '%s'."
 msgstr "‚%s‘ mit einem Ausdruck des Typs ‚%s‘ erwartet."
 
+msgid "'%s' function cannot return a value."
+msgstr "Die Funktion „%s“ kann keinen Wert zurückgeben."
+
 msgid "Expected return with an expression of type '%s'."
 msgstr "Rückgabe eines Ausdrucks des Typs ‚%s‘ erwartet."
 
@@ -19015,6 +19398,9 @@ msgstr "„,“ nach Integer-Konstante erwartet."
 msgid "Expected an integer constant after ','."
 msgstr "Integer-Konstante nach „,“ erwartet."
 
+msgid "Expected a string constant."
+msgstr "String-Konstante erwartet."
+
 msgid "Can only specify '%s' once."
 msgstr "‚%s‘ kann nur einmal aufgeführt werden."
 
@@ -19201,6 +19587,9 @@ msgstr "Zyklisches Include erkannt"
 msgid "Shader max include depth exceeded."
 msgstr "Maximale Include-Tiefe des Shaders wurde überschritten."
 
+msgid "Cannot use '%s' on built-in define."
+msgstr "„%s“ kann nicht für eine eingebaute Definition verwendet werden."
+
 msgid "Macro expansion limit exceeded."
 msgstr "Makroausweitungsgrenze überschritten."
 
diff --git a/engine/editor/translations/editor/es.po b/engine/editor/translations/editor/es.po
index 05204ff3..7a731cd0 100644
--- a/engine/editor/translations/editor/es.po
+++ b/engine/editor/translations/editor/es.po
@@ -133,7 +133,7 @@
 # Victor Ortega <vitotankian@gmail.com>, 2024.
 # Augusto Hernández <agumano@outlook.es>, 2024.
 # jose luis barbosa cepeda <barbosa02058@gmail.com>, 2024.
-# Alejandro Moctezuma <moctezumaalejandro25@gmail.com>, 2024.
+# Alejandro Moctezuma <moctezumaalejandro25@gmail.com>, 2024, 2025.
 # trubiso <crishipohola@gmail.com>, 2024.
 # Luis Roel <luisroelsoftwarede@gmail.com>, 2024.
 # leonardo garcia hernandez <leoxdnpc2@gmail.com>, 2024.
@@ -145,12 +145,14 @@
 # José Andrés Urdaneta <urdaneta7834@gmail.com>, 2025.
 # andres valenzuela pacheco <andresmauricio6777@gmail.com>, 2025.
 # Marco Antonio Silva Mendoza <n00028146@upn.pe>, 2025.
+# Lucas García da Rosa <gdarlucas@gmail.com>, 2025.
+# Erick Estuardo Pineda Palma <erickestuardopineda82004@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-27 06:54+0000\n"
+"PO-Revision-Date: 2025-03-18 05:43+0000\n"
 "Last-Translator: Javier <xavier.ocampos@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/es/>\n"
@@ -159,7 +161,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.2-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Hilo Principal"
@@ -1024,6 +1026,9 @@ msgstr "Un AnimationPlayer no puede animarse a sí mismo, solo a otros players."
 msgid "property '%s'"
 msgstr "propiedad '%s'"
 
+msgid "Nearest FPS: %d"
+msgstr "FPS más cercano: %d"
+
 msgid "Change Animation Step"
 msgstr "Cambiar Paso de Animación"
 
@@ -1671,6 +1676,9 @@ msgstr "Desvincular Argumentos de Señal:"
 msgid "Receiver Method:"
 msgstr "Método Receptor:"
 
+msgid "Pick"
+msgstr "Seleccionar"
+
 msgid "Advanced"
 msgstr "Avanzado"
 
@@ -5361,6 +5369,12 @@ msgstr "Instalar desde un archivo"
 msgid "Install templates from a local file."
 msgstr "Instalar plantillas desde un archivo local."
 
+msgid "Online mode is needed to download the templates."
+msgstr "Se necesita el modo en línea para descargar las plantillas."
+
+msgid "Go Online"
+msgstr "Ir a Internet"
+
 msgid "Cancel the download of the templates."
 msgstr "Cancele la descarga de las plantillas."
 
@@ -8200,9 +8214,6 @@ msgstr ""
 "Nota: La Librería de Assets requiere de una conexión en línea e implica "
 "enviar datos a través de Internet."
 
-msgid "Go Online"
-msgstr "Ir a Internet"
-
 msgid "Failed to get repository configuration."
 msgstr "Error al obtener la configuración del repositorio."
 
@@ -11052,7 +11063,7 @@ msgid ""
 "Note that a plugin may use several languages at once by adding more scripts "
 "to the plugin."
 msgstr ""
-"Requerido. El lenguaje scripting que se utilizará para el script.\n"
+"Requerido. El lenguaje de scripting que se utilizará para el script.\n"
 "Tenga en cuenta que un plugin puede utilizar varios lenguajes a la vez "
 "agregando más scripts al plugin."
 
@@ -15055,6 +15066,9 @@ msgstr ""
 "Permite redirigir conexiones con libertad, posibilitando la conexión de "
 "varios puertos de entrada a un único puerto de salida."
 
+msgid "[None]"
+msgstr "[Ninguno]"
+
 msgid "Edit Visual Property: %s"
 msgstr "Editar Propiedad Visual: %s"
 
@@ -15923,9 +15937,6 @@ msgstr "Etiquetas de Características"
 msgid "Pick Root Node Type"
 msgstr "Seleccionar Tipo de Nodo Raíz"
 
-msgid "Pick"
-msgstr "Seleccionar"
-
 msgid "Scene name is empty."
 msgstr "El nombre de la escena está vacío."
 
@@ -16627,38 +16638,21 @@ msgstr "Actualizando UIDs de Script"
 
 msgid ""
 "As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
+"shaders. Upgrades apply on the next save of each scene/resource.\n"
 "\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
+"To save time, this tool can open and save each of these files. Depending on "
+"the project size, it may take several minutes."
 msgstr ""
-"A partir de Godot 4.4, las escenas y recursos usan UIDs para referenciar "
-"scripts y shaders.\n"
+"A partir de Godot 4.4, las escenas y los recursos usan UIDs para referenciar "
+"scripts y shaders. Las actualizaciones se aplican al siguiente guardado de "
+"cada escena/recurso.\n"
 "\n"
-"Normalmente, esta actualización se aplica a una sola escena o recurso la "
-"primera vez que lo guardas en Godot 4.4. Si tienes muchas escenas y/o "
-"recursos, hacerlo manualmente puede llevar mucho tiempo. Esta herramienta "
-"actualizará todas las escenas y recursos del proyecto a la vez.\n"
-"\n"
-"Haz clic en \"Restart & Upgrade\" para reiniciar el editor y actualizar todas "
-"las escenas y recursos de este proyecto. Dependiendo del tamaño del proyecto, "
-"puede tardar varios minutos.\n"
-"\n"
-"Nota: Por favor, asegúrate de tener una copia de seguridad de tu proyecto "
-"antes de ejecutar la herramienta, para evitar la posibilidad de pérdida de "
-"datos. Además, asegúrate de confirmar todos los archivos .uid en el control "
-"de versiones (y no los añadas a listas de ignorados como .gitignore)."
+"Para ahorrar tiempo, esta herramienta puede abrir y guardar cada uno de estos "
+"archivos. Dependiendo del tamaño del proyecto, esto puede llevar varios "
+"minutos."
+
+msgid "Re-save all scenes and resources to use UIDs"
+msgstr "Vuelve a guardar todas las escenas y recursos para poder usar UIDs"
 
 msgid "Learn More"
 msgstr "Más Información"
@@ -18609,9 +18603,9 @@ msgid ""
 "Settings (Export > Windows > rcedit), or disable \"Application > Modify "
 "Resources\" in the export preset."
 msgstr ""
-"No se pudo iniciar el ejecutable rcedit. Configura la ruta de rcedit en la "
-"Configuración del Editor (Exportar > Windows > rcedit), o desactiva "
-"\"Aplicación > Modificar Recursos\" en el ajuste de exportación."
+"No se pudo iniciar el ejecutable rcedit. Configure la ruta de rcedit en la "
+"Configuración del Editor (Exportar > Windows > rcedit), o desactive "
+"\"Aplicación > Modificar Recursos\" en los ajustes de exportación."
 
 msgid "rcedit failed to modify executable: %s."
 msgstr "rcedit falló al modificar el ejecutable: %s."
@@ -20061,15 +20055,15 @@ msgstr ""
 "Para continuar con cambios mínimos en el código añade 'uniform sampler2D %s: "
 "hint_%s, filter_linear_mipmap;' cerca de la parte superior de tu shader."
 
+msgid "Can't use function as identifier: '%s'."
+msgstr "No se puede utilizar la función como identificador: '%s'."
+
 msgid "Varying with '%s' data type may only be used in the '%s' function."
 msgstr "El varying con tipo de dato '%s' solo puede usarse en la función '%s'."
 
 msgid "Varying '%s' must be assigned in the '%s' function first."
 msgstr "El varying '%s' debe asignarse primero en la función '%s'."
 
-msgid "Can't use function as identifier: '%s'."
-msgstr "No se puede utilizar la función como identificador: '%s'."
-
 msgid "Only integer expressions are allowed for indexing."
 msgstr "Sólo se permiten expresiones enteras para la indexación."
 
diff --git a/engine/editor/translations/editor/es_AR.po b/engine/editor/translations/editor/es_AR.po
index 1f65178a..9183a17f 100644
--- a/engine/editor/translations/editor/es_AR.po
+++ b/engine/editor/translations/editor/es_AR.po
@@ -33,13 +33,16 @@
 # Franco Ezequiel Ibañez <francoibanez.dev@gmail.com>, 2024.
 # David Pepice <davitogaming@gmail.com>, 2025.
 # LCDF <lcdf1001@gmail.com>, 2025.
+# Lucas García da Rosa <gdarlucas@gmail.com>, 2025.
+# Adrián Ricardo Iazbeck Scalia <adrian.r.scalia@gmail.com>, 2025.
+# zirzak <gdarlucas@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-01-29 23:00+0000\n"
-"Last-Translator: LCDF <lcdf1001@gmail.com>\n"
+"PO-Revision-Date: 2025-03-06 10:31+0000\n"
+"Last-Translator: zirzak <gdarlucas@gmail.com>\n"
 "Language-Team: Spanish (Argentina) <https://hosted.weblate.org/projects/godot-"
 "engine/godot/es_AR/>\n"
 "Language: es_AR\n"
@@ -47,16 +50,16 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Main Thread"
 msgstr "Hilo Principal"
 
 msgid "Unset"
-msgstr "Desactivar"
+msgstr "Sin establecer"
 
 msgid "Physical"
-msgstr "Física"
+msgstr "Físico"
 
 msgid "Left Mouse Button"
 msgstr "Botón Izquierdo del Mouse"
@@ -74,10 +77,10 @@ msgid "Mouse Wheel Down"
 msgstr "Rueda del Mouse Abajo"
 
 msgid "Mouse Wheel Left"
-msgstr "Rueda del Mouse - Izquierda"
+msgstr "Rueda del Mouse Izquierda"
 
 msgid "Mouse Wheel Right"
-msgstr "Rueda del Mouse - Derecha"
+msgstr "Rueda del Mouse Derecha"
 
 msgid "Mouse Thumb Button 1"
 msgstr "Botón Pulgar del Mouse 1"
@@ -199,6 +202,9 @@ msgstr "Bottón de Joypad %d"
 msgid "Pressure:"
 msgstr "Presión:"
 
+msgid "canceled"
+msgstr "cancelado"
+
 msgid "touched"
 msgstr "tocado"
 
@@ -373,6 +379,9 @@ msgstr "Seleccionar Palabra Bajo el Cursor"
 msgid "Add Selection for Next Occurrence"
 msgstr "Agregar Selección para la Próxima Ocurrencia"
 
+msgid "Skip Selection for Next Occurrence"
+msgstr "Saltear Selección para la Próxima Ocurrencia"
+
 msgid "Clear Carets and Selection"
 msgstr "Limpiar Cursores y Selecciones"
 
@@ -400,6 +409,9 @@ msgstr "Mostrar Ocultos"
 msgid "Swap Input Direction"
 msgstr "Intercambiar Dirección de Entrada"
 
+msgid "Start Unicode Character Input"
+msgstr "Iniciar Entrada de Carácter Unicode"
+
 msgid "Invalid input %d (not passed) in expression"
 msgstr "Entrada inválida %d (no se transmitió) en la expresión"
 
@@ -458,12 +470,18 @@ msgstr ""
 msgid "An action with the name '%s' already exists."
 msgstr "Ya existe una acción con el nombre '%s'."
 
+msgid "Cannot Revert - Action is same as initial"
+msgstr "No se puede revertir - La acción es igual a la inicial"
+
 msgid "Revert Action"
 msgstr "Revertir Acción"
 
 msgid "Add Event"
 msgstr "Agregar Evento"
 
+msgid "Remove Action"
+msgstr "Eliminar Acción"
+
 msgid "Cannot Remove Action"
 msgstr "No se puede eliminar acción"
 
@@ -480,7 +498,7 @@ msgid "Clear All"
 msgstr "Limpiar Todo"
 
 msgid "Clear all search filters."
-msgstr "Borrar todos los filtros de búsqueda"
+msgstr "Borrar todos los filtros de búsqueda."
 
 msgid "Add New Action"
 msgstr "Agregar Acción Nueva"
@@ -503,6 +521,26 @@ msgstr "Nombre:"
 msgid "Type:"
 msgstr "Tipo:"
 
+msgid "Metadata name is valid."
+msgstr "El nombre de los metadatos es válido."
+
+msgid "Add Metadata Property for \"%s\""
+msgstr "Agregar Propiedad de Metadatos para \"%s\""
+
+msgid "Metadata name can't be empty."
+msgstr "El nombre del metadato no puede estar vacío."
+
+msgid "Metadata name must be a valid identifier."
+msgstr "El nombre del metadato debe ser un identificador válido."
+
+msgid "Metadata with name \"%s\" already exists."
+msgstr "Ya existe un metadato con el nombre '%s'."
+
+msgid "Names starting with _ are reserved for editor-only metadata."
+msgstr ""
+"Los nombres que comienzan con _ están reservados para metadatos exclusivos "
+"del editor."
+
 msgid "Time:"
 msgstr "Tiempo:"
 
@@ -617,6 +655,39 @@ msgstr "Cambiar Duración de la Animación"
 msgid "Change Animation Loop"
 msgstr "Cambiar Loop de Animación"
 
+msgid ""
+"Can't change loop mode on animation instanced from an imported scene.\n"
+"\n"
+"To change this animation's loop mode, navigate to the scene's Advanced Import "
+"settings and select the animation.\n"
+"You can then change the loop mode from the inspector menu."
+msgstr ""
+"No se puede cambiar el modo loop en una animación instanciada desde una "
+"escena importada. \n"
+"\n"
+"Para cambiar el modo loop de esta animación, navegá hasta Advanced Import "
+"settings y seleccioná la animación.\n"
+"Luego de hacer eso, podés cambiar el modo loop desde el menú inspector."
+
+msgid "Can't change loop mode on animation instanced from an imported resource."
+msgstr ""
+"No se puede cambiar el modo de loop en una animación creada a partir de una "
+"escena importada."
+
+msgid ""
+"Can't change loop mode on animation embedded in another scene.\n"
+"\n"
+"You must open this scene and change the animation's loop mode from there."
+msgstr ""
+"No se puede cambiar el modo de loop en una animación incrustada en otra "
+"escena.\n"
+"\n"
+"Tenés que abrir esta escena y cambiar el modo de loop desde ahí."
+
+msgid "Can't change loop mode on animation embedded in another resource."
+msgstr ""
+"No se puede cambiar el modo de loop en una animación insertada en otra escena."
+
 msgid "Property Track..."
 msgstr "Pista de Propiedades..."
 
@@ -707,9 +778,42 @@ msgstr "(Inválido, tipo esperado: %s)"
 msgid "Easing:"
 msgstr "Atenuación:"
 
+msgid "In-Handle:"
+msgstr "In-Hadle:"
+
+msgid "Out-Handle:"
+msgstr "Out-Handle:"
+
+msgid "Handle mode: Free\n"
+msgstr "Modo de manejo: Libre\n"
+
+msgid "Handle mode: Linear\n"
+msgstr "Modo de manejo: Lineal\n"
+
+msgid "Handle mode: Balanced\n"
+msgstr "Modo de manejo: Balanceado\n"
+
+msgid "Handle mode: Mirrored\n"
+msgstr "Modo de manejo: Espejado\n"
+
+msgid "Stream:"
+msgstr "Transmisión:"
+
+msgid "Start (s):"
+msgstr "Inicio (s):"
+
+msgid "End (s):"
+msgstr "Final (es):"
+
+msgid "Animation Clip:"
+msgstr "Clip de Animación:"
+
 msgid "Toggle Track Enabled"
 msgstr "Activar/Desactivar Pista"
 
+msgid "Don't Use Blend"
+msgstr "No usar Mezcla"
+
 msgid "Continuous"
 msgstr "Contínuo"
 
@@ -728,15 +832,30 @@ msgstr "Lineal"
 msgid "Cubic"
 msgstr "Cúbica"
 
+msgid "Linear Angle"
+msgstr "Ángulo Lineal"
+
+msgid "Cubic Angle"
+msgstr "Ángulo Cúbico"
+
 msgid "Clamp Loop Interp"
 msgstr "Interp de Loop Cortante"
 
 msgid "Wrap Loop Interp"
 msgstr "Interp de Loop Envolvente"
 
+msgid "Insert Key..."
+msgstr "Insertar Clave..."
+
 msgid "Duplicate Key(s)"
 msgstr "Duplicar Clave(s)"
 
+msgid "Cut Key(s)"
+msgstr "Cortar Clave(s)"
+
+msgid "Copy Key(s)"
+msgstr "Copiar Clave(s)"
+
 msgid "Add RESET Value(s)"
 msgstr "Agregar Valor(es) de RESET"
 
@@ -752,9 +871,30 @@ msgstr "Cambiar Modo de Interpolación de Animación"
 msgid "Change Animation Loop Mode"
 msgstr "Cambiar Modo de Bucle de Animación"
 
+msgid "Change Animation Use Blend"
+msgstr "Cambiar Uso de Mezcla en la Animación"
+
+msgid ""
+"Compressed tracks can't be edited or removed. Re-import the animation with "
+"compression disabled in order to edit."
+msgstr ""
+"Las pistas comprimidas no se pueden editar ni eliminar. Re-importá la "
+"animación con la compresión deshabilitada para poder editarla."
+
 msgid "Remove Anim Track"
 msgstr "Quitar pista de animación"
 
+msgid "Create new track for %s and insert key?"
+msgstr "¿Crear nueva pista para %s e insertar clave?"
+
+msgid "Create %d new tracks and insert keys?"
+msgstr "¿Crear %d nuevas pistas e insertar claves?"
+
+msgid "Hold Shift when clicking the key icon to skip this dialog."
+msgstr ""
+"Apretá la tecla Shift mientras hacés click en el botón de la llave para "
+"saltear este diálogo."
+
 msgid "Create"
 msgstr "Crear"
 
@@ -776,6 +916,14 @@ msgstr "Cambiar Step de Animación"
 msgid "Rearrange Tracks"
 msgstr "Reordenar Pistas"
 
+msgid "Blend Shape tracks only apply to MeshInstance3D nodes."
+msgstr ""
+"Las pistas de Formas Combinadas solo se aplican a nodos de tipo "
+"MeshInstance3D."
+
+msgid "Position/Rotation/Scale 3D tracks only apply to 3D-based nodes."
+msgstr "Las pistas de tipo Posición/Rotación/Escala 3D solo aplican a nodos 3D."
+
 msgid ""
 "Audio tracks can only point to nodes of type:\n"
 "-AudioStreamPlayer\n"
@@ -802,6 +950,12 @@ msgstr "Agregar Pista Bezier"
 msgid "Track path is invalid, so can't add a key."
 msgstr "La ruta de la pista es inválida, por ende no se pueden agregar claves."
 
+msgid "Track is not of type Node3D, can't insert key"
+msgstr "La pista no es de tipo Node3D, no se puede insertar una clave"
+
+msgid "Track is not of type MeshInstance3D, can't insert key"
+msgstr "La pista no es de tipo MeshInstance3D, no se puede insertar una clave"
+
 msgid "Track path is invalid, so can't add a method key."
 msgstr ""
 "La ruta de la pista es inválida, por ende no se pueden agregar claves de "
@@ -810,6 +964,12 @@ msgstr ""
 msgid "Add Method Track Key"
 msgstr "Agregar Clave de Pista de Método"
 
+msgid "Method not found in object:"
+msgstr "Método no encontrado en el objeto:"
+
+msgid "Animation Move Keys"
+msgstr "Mover Claves de Animación"
+
 msgid "Position"
 msgstr "Posición"
 
@@ -819,6 +979,9 @@ msgstr "Rotación"
 msgid "Scale"
 msgstr "Escalar"
 
+msgid "BlendShape"
+msgstr "BlendShape"
+
 msgid "Methods"
 msgstr "Métodos"
 
@@ -834,18 +997,62 @@ msgstr "El portapapeles está vacío!"
 msgid "Paste Tracks"
 msgstr "Pegar Pistas"
 
+msgid "Animation Scale Keys"
+msgstr "Escalar Claves de Animación"
+
+msgid "Animation Set Start Offset"
+msgstr "Establecer Offset de Inicio para la Animación"
+
+msgid "Animation Set End Offset"
+msgstr "Establecer Offset al final de la animación"
+
+msgid "Make Easing Keys"
+msgstr "Crear Claves de Interpolación"
+
+msgid "Animation Add RESET Keys"
+msgstr "Agregar Claves de Reinicio"
+
+msgid ""
+"Some AnimationPlayerEditor's options are disabled since this is the dummy "
+"AnimationPlayer for preview.\n"
+"\n"
+"The dummy player is forced active, non-deterministic and doesn't have the "
+"root motion track. Furthermore, the original node is inactive temporary."
+msgstr ""
+"Algunas opciones del AnimationPlayerEditor están deshabilitadas ya que este "
+"es un AnimationPlayer de simulación para hacer vista previa.\n"
+"\n"
+"El jugador simulado está forzado a estar activo, no es determinista y no "
+"tiene la pista de movimiento raíz. Además, el nodo original está inactivo "
+"temporalmente."
+
+msgid "AnimationPlayer is inactive. The playback will not be processed."
+msgstr "El AnimationPlayer está inactivo. La reproducción no será procesada."
+
 msgid "Select an AnimationPlayer node to create and edit animations."
 msgstr "Seleccioná un nodo AnimationPlayer para crear y editar animaciones."
 
 msgid "Warning: Editing imported animation"
 msgstr "Advertencia: Se está editando una animación importada"
 
+msgid "Dummy Player"
+msgstr "Jugador simulado"
+
+msgid "Toggle between the bezier curve editor and track editor."
+msgstr "Cambiar entre editor de curvas bezier y editor de pistas."
+
 msgid "Only show tracks from nodes selected in tree."
 msgstr "Mostrar solo las pistas de los nodos seleccionados en el árbol."
 
 msgid "Group tracks by node or display them as plain list."
 msgstr "Agrupar las pistas por nodo o mostrarlas como una lista plana."
 
+msgid "Apply snapping to timeline cursor."
+msgstr "Aplicar imantación al cursor de la línea de tiempo."
+
+msgid "Apply snapping to the nearest integer FPS."
+msgstr "Aplicar imantación al FPS entero más cercano."
+
 msgid "Animation step value."
 msgstr "Valor de paso de animación."
 
@@ -861,6 +1068,18 @@ msgstr "Editar"
 msgid "Animation properties."
 msgstr "Propiedades de animación."
 
+msgid "Set Start Offset (Audio)"
+msgstr "Establecer Offset Inicial (Audio)"
+
+msgid "Set End Offset (Audio)"
+msgstr "Establecer Offset Final (Audio)"
+
+msgid "Move First Selected Key to Cursor"
+msgstr "Mover Primera Clave Seleccionada hacia el Cursor"
+
+msgid "Move Last Selected Key to Cursor"
+msgstr "Mover Última Clave Seleccionada hacia el Cursor"
+
 msgid "Delete Selection"
 msgstr "Eliminar Selección"
 
@@ -882,6 +1101,12 @@ msgstr "Crear RESET Track(s)"
 msgid "Optimize"
 msgstr "Optimizar"
 
+msgid "Trim keys placed in negative time"
+msgstr "Recortar claves posicionadas en tiempo negativo"
+
+msgid "Trim keys placed exceed the animation length"
+msgstr "Recortar claves posicionadas más allá de la duración de la animación"
+
 msgid "Remove invalid keys"
 msgstr "Quitar claves inválidas"
 
@@ -900,22 +1125,76 @@ msgstr "Limpiar"
 msgid "Scale Ratio:"
 msgstr "Ratio de Escala:"
 
+msgid "Select Transition and Easing"
+msgstr "Seleccionar Transición y Easing"
+
 msgctxt "Transition Type"
 msgid "Sine"
 msgstr "Sinusoide"
 
+msgctxt "Transition Type"
+msgid "Quint"
+msgstr "Quint"
+
+msgctxt "Transition Type"
+msgid "Quart"
+msgstr "Quart"
+
+msgctxt "Transition Type"
+msgid "Quad"
+msgstr "Quad"
+
+msgctxt "Transition Type"
+msgid "Elastic"
+msgstr "Elástico"
+
+msgctxt "Transition Type"
+msgid "Circ"
+msgstr "Circ"
+
+msgctxt "Transition Type"
+msgid "Bounce"
+msgstr "Rebote"
+
+msgctxt "Transition Type"
+msgid "Spring"
+msgstr "Resorte"
+
+msgctxt "Ease Type"
+msgid "InOut"
+msgstr "InOut"
+
+msgctxt "Ease Type"
+msgid "OutIn"
+msgstr "OutIn"
+
 msgid "Select Tracks to Copy"
 msgstr "Elegir Pistas a Copiar"
 
 msgid "Select All/None"
 msgstr "Seleccionar Todo/Ninguno"
 
+msgid ""
+"A marker's name can only be changed by right-clicking it in the animation "
+"editor and selecting \"Rename Marker\", in order to make sure that marker "
+"names are all unique."
+msgstr ""
+"El nombre de un marcador solo puede cambiarse al hacer click derecho sobre él "
+"en el editor de animación y seleccionando \"Renombrar Marcador\", para "
+"asegurar que el nombre de todos los marcadores sea único."
+
+msgid "Marker:"
+msgstr "Marcador:"
+
 msgid "Close"
 msgstr "Cerrar"
 
 msgid "Error!"
 msgstr "Error!"
 
+msgid "Multi Edit Marker Color"
+msgstr "Edición Múltiple de Colores de Marcadores"
+
 msgid "Add Audio Track Clip"
 msgstr "Agregar Clip de Pista de Audio"
 
@@ -949,6 +1228,17 @@ msgstr "Reemplazar Todo"
 msgid "Selection Only"
 msgstr "Solo Selección"
 
+msgid "Hide"
+msgstr "Esconder"
+
+msgctxt "Indentation"
+msgid "Spaces"
+msgstr "Espacios"
+
+msgctxt "Indentation"
+msgid "Tabs"
+msgstr "Pestañas"
+
 msgid "Toggle Scripts Panel"
 msgstr "Act/Desact. Panel de Scripts"
 
@@ -967,6 +1257,13 @@ msgstr "Errores"
 msgid "Warnings"
 msgstr "Advertencias"
 
+msgid ""
+"%sMouse wheel, %s/%s: Finetune\n"
+"%s: Reset"
+msgstr ""
+"%sRueda de mouse, %s/%s: Ajuste fino\n"
+"%s: Reiniciar"
+
 msgid "Line and column numbers."
 msgstr "Números de línea y columna."
 
@@ -983,6 +1280,10 @@ msgstr ""
 "El método objetivo no fue encontrado. Especificá un método válido o agregá un "
 "script al nodo objetivo."
 
+msgid "%s: Callback code won't be generated, please add it manually."
+msgstr ""
+"%s: El código callback no se va a generar, por favor añadilo manualmente."
+
 msgid "Connect to Node:"
 msgstr "Conectar al Nodo:"
 
@@ -998,6 +1299,9 @@ msgstr "La escena no contiene ningún script."
 msgid "Select Method"
 msgstr "Seleccionar Método"
 
+msgid "No method found matching given filters."
+msgstr "No se encontró ningún método que cumpla con los filtros establecidos."
+
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1007,6 +1311,9 @@ msgstr "Agregar Argumento de Llamada Extra:"
 msgid "Extra Call Arguments:"
 msgstr "Argumentos de Llamada Extras:"
 
+msgid "Allows to drop arguments sent by signal emitter."
+msgstr "Permite descartar argumentos enviados por el emisor de señales."
+
 msgid "Receiver Method:"
 msgstr "Método Receptor:"
 
@@ -1080,6 +1387,15 @@ msgstr "Crear Nuevo %s"
 msgid "No results for \"%s\"."
 msgstr "No hay resultados para \"%s\"."
 
+msgid "The script will run in the editor."
+msgstr "El script correrá en el editor."
+
+msgid "This class is marked as deprecated."
+msgstr "Esta clase está marcada como obsoleta."
+
+msgid "This class is marked as experimental."
+msgstr "Esta clase está marcada como experimental."
+
 msgid "Favorites:"
 msgstr "Favoritos:"
 
@@ -1095,6 +1411,9 @@ msgstr "Coincidencias:"
 msgid "Description:"
 msgstr "Descripción:"
 
+msgid "Session %d"
+msgstr "Sesión %d"
+
 msgid "Debugger"
 msgstr "Depurador"
 
@@ -1110,12 +1429,36 @@ msgstr "Copiar Ruta del Nodo"
 msgid "Instance:"
 msgstr "Instancia:"
 
+msgid ""
+"This node has been instantiated from a PackedScene file:\n"
+"%s\n"
+"Click to open the original file in the Editor."
+msgstr ""
+"Este nodo se instanció desde el siguiente archivo Packed Scene:\n"
+"%s\n"
+"Hacé click para abrir el archivo original en el Editor."
+
 msgid "Toggle Visibility"
 msgstr "Act/Desact. Visibilidad"
 
+msgid "Expression to evaluate"
+msgstr "Expresión a evaluar."
+
 msgid "Clear"
 msgstr "Limpiar"
 
+msgid "Updating assets on target device:"
+msgstr "Actualizando assets en el dispositivo de destino:"
+
+msgid "Getting remote file system"
+msgstr "Obteniendo sistema de archivos remoto"
+
+msgid "Sending list of changed files:"
+msgstr "Enviando lista de archivos cambiados:"
+
+msgid "ms"
+msgstr "ms"
+
 msgid "Monitors"
 msgstr "Monitores"
 
@@ -1182,6 +1525,12 @@ msgstr "Tiempo"
 msgid "Calls"
 msgstr "Llamadas"
 
+msgid "GPU"
+msgstr "GPU"
+
+msgid "Execution resumed."
+msgstr "Ejecución reanudada."
+
 msgid "Bytes:"
 msgstr "Bytes:"
 
@@ -1194,6 +1543,9 @@ msgstr "Error de %s"
 msgid "Stack Trace"
 msgstr "Stack Trace"
 
+msgid "Debug session closed."
+msgstr "Sesión de depuración cerrada."
+
 msgid "Copy Error"
 msgstr "Copiar Error"
 
@@ -1221,6 +1573,9 @@ msgstr "Break"
 msgid "Continue"
 msgstr "Continuar"
 
+msgid "Thread:"
+msgstr "Hilo:"
+
 msgid "Stack Frames"
 msgstr "Frames del Stack"
 
@@ -1233,6 +1588,9 @@ msgstr "Expandir Todos"
 msgid "Collapse All"
 msgstr "Colapsar Todos"
 
+msgid "Evaluator"
+msgstr "Evaluador"
+
 msgid "Profiler"
 msgstr "Profiler"
 
@@ -1319,6 +1677,13 @@ msgstr "Buscar Reemplazo de Recurso:"
 msgid "Open"
 msgstr "Abrir"
 
+msgid "Owners of: %s (Total: %d)"
+msgstr "Propietarios de:%s (Total: %d)"
+
+msgid "Localization remap for path '%s' and locale '%s'."
+msgstr ""
+"Remapeo de localización para la ruta '%s' y configuración regional '%s'."
+
 msgid ""
 "Remove the selected files from the project? (Cannot be undone.)\n"
 "Depending on your filesystem configuration, the files will either be moved to "
@@ -1344,6 +1709,9 @@ msgstr ""
 msgid "Cannot remove:"
 msgstr "No se puede remover:"
 
+msgid "Dependencies of files to be deleted:"
+msgstr "Dependencias de archivos a eliminar:"
+
 msgid "Error loading:"
 msgstr "Error cargando:"
 
@@ -1377,6 +1745,19 @@ msgstr "Es Dueño De"
 msgid "Resources Without Explicit Ownership:"
 msgstr "Recursos Sin Propietario Explícito:"
 
+msgid "Using slashes in folder names will create subfolders recursively."
+msgstr "Usar barras al nombrar carpetas creará subcarpetas de forma recursiva."
+
+msgid ""
+"Using slashes in path will create the file in subfolder, creating new "
+"subfolders if necessary."
+msgstr ""
+"Usar barras al nombrar rutas creará el archivo en una subcarpeta. Se crearán "
+"subcarpetas en caso de que haga falta."
+
+msgid "Double-click to open in browser."
+msgstr "Doble click para abrir en el navegador."
+
 msgid "Thanks from the Godot community!"
 msgstr "Gracias de parte de la comunidad Godot!"
 
@@ -1395,6 +1776,9 @@ msgstr "Desarrolladores"
 msgid "Authors"
 msgstr "Autores"
 
+msgid "Patrons"
+msgstr "Patrons"
+
 msgid "Platinum Sponsors"
 msgstr "Sponsors Platino"
 
@@ -1404,6 +1788,12 @@ msgstr "Sponsors Oro"
 msgid "Silver Sponsors"
 msgstr "Sponsors Plata"
 
+msgid "Diamond Members"
+msgstr "Miembros Diamond"
+
+msgid "Titanium Members"
+msgstr "Miembros Titanium"
+
 msgid "Donors"
 msgstr "Donantes"
 
@@ -1441,6 +1831,19 @@ msgstr ""
 msgid "%s (already exists)"
 msgstr "%s (ya existe)"
 
+msgid "%d file conflicts with your project and won't be installed"
+msgid_plural "%d files conflict with your project and won't be installed"
+msgstr[0] ""
+"%d archivo presenta conflictos con tu proyecto, por lo que no se instalará"
+msgstr[1] ""
+"%d archivos presentan conflictos con tu proyecto, por lo que no se instalarán"
+
+msgid "This asset doesn't have a root directory, so it can't be ignored."
+msgstr "Este asset no tiene directorio raiz, por lo que no puede ser ignorado."
+
+msgid "Select Install Folder"
+msgstr "Seleccionar carpeta de instalación"
+
 msgid "Uncompressing Assets"
 msgstr "Descomprimiendo Assets"
 
@@ -1450,9 +1853,35 @@ msgstr "Falló la extracción de los siguientes archivos del asset \"%s\":"
 msgid "(and %s more files)"
 msgstr "(y %s archivos más)"
 
+msgid "Asset \"%s\" installed successfully!"
+msgstr "¡Se instaló el asset \"%s\"!"
+
 msgid "Success!"
 msgstr "¡Éxito!"
 
+msgid "Asset:"
+msgstr "Asset:"
+
+msgid "Open the list of the asset contents and select which files to install."
+msgstr ""
+"Abrir la lista de contenidos de assets y seleccionar cuales archivos instalar."
+
+msgid ""
+"Change the folder where the contents of the asset are going to be installed."
+msgstr "Cambiar la carpeta donde los contenidos del asset serán instalados."
+
+msgid "Ignore asset root"
+msgstr "Ignorar la raiz del asset"
+
+msgid "Show contents of the asset and conflicting files."
+msgstr "Mostrar contenidos del asset y archivos en conflicto."
+
+msgid "Contents of the asset:"
+msgstr "Contenidos del asset:"
+
+msgid "Configure Asset Before Installing"
+msgstr "Configurar Asset antes de instalar"
+
 msgid "Install"
 msgstr "Instalar"
 
@@ -1567,6 +1996,20 @@ msgstr "Cargar el Bus Layout predeterminado."
 msgid "Create a new Bus Layout."
 msgstr "Crear un nuevo Bus Layout."
 
+msgid "Must not collide with an existing engine class name."
+msgstr ""
+"No puede tener el mismo nombre que una clase ya existente dentro del motor."
+
+msgid "Must not collide with an existing global script class name."
+msgstr ""
+"No puede tener el mismo nombre que una clase de script global ya existente."
+
+msgid "Must not collide with an existing built-in type name."
+msgstr "No puede tener el mismo nombre que un tipo de dato ya existente."
+
+msgid "Must not collide with an existing global constant name."
+msgstr "No puede tener el mismo nombre que una constante global ya existente."
+
 msgid "Autoload '%s' already exists!"
 msgstr "Autocargar '%s' ya existe!"
 
@@ -1594,12 +2037,18 @@ msgstr "%s es una ruta inválida. No esta en la ruta de recursos (res://)."
 msgid "Path:"
 msgstr "Ruta:"
 
+msgid "Set path or press \"%s\" to create a script."
+msgstr "Asigná una ruta o apretá \"%s\" para crear un script."
+
 msgid "Node Name:"
 msgstr "Nombre de Nodo:"
 
 msgid "Global Variable"
 msgstr "Variable Global"
 
+msgid "3D Engine"
+msgstr "Motor 3D"
+
 msgid "2D Physics"
 msgstr "(Física)"
 
@@ -1609,6 +2058,125 @@ msgstr "(Física)"
 msgid "Navigation"
 msgstr "Navegación"
 
+msgid "XR"
+msgstr "XR"
+
+msgid "RenderingDevice"
+msgstr "RenderingDevice"
+
+msgid "OpenGL"
+msgstr "OpenGL"
+
+msgid "Vulkan"
+msgstr "Vulkan"
+
+msgid "Text Server: Advanced"
+msgstr "Servidor de Texto: Avanzado"
+
+msgid "TTF, OTF, Type 1, WOFF1 Fonts"
+msgstr "Fuentes TTF, OTF, Type 1, WOFF1"
+
+msgid "WOFF2 Fonts"
+msgstr "Fuentes WOFF2"
+
+msgid "SIL Graphite Fonts"
+msgstr "Fuentes SIL Graphite"
+
+msgid "Multi-channel Signed Distance Field Font Rendering"
+msgstr "Multi-channel Signed Distance Field Font Rendering"
+
+msgid "3D Nodes as well as RenderingServer access to 3D features."
+msgstr ""
+"Los nodos 3D y el RenderingServer tienen acceso a las características 3D."
+
+msgid "2D Physics nodes and PhysicsServer2D."
+msgstr "Nodos de física 2D y PhysicsServer2D."
+
+msgid "3D Physics nodes and PhysicsServer3D."
+msgstr "Nodos de física 3D y PhysicsServer3D."
+
+msgid "Navigation, both 2D and 3D."
+msgstr "Navegación, tanto 2D como 3D."
+
+msgid "XR (AR and VR)."
+msgstr "XR (AR y VR)."
+
+msgid ""
+"RenderingDevice based rendering (if disabled, the OpenGL back-end is "
+"required)."
+msgstr ""
+"Renderizado basado en RenderingDevice (si se desactiva, hace falta el back-"
+"end de OpenGL)."
+
+msgid "OpenGL back-end (if disabled, the RenderingDevice back-end is required)."
+msgstr ""
+"Back-end de OpenGL (si se desactiva, es necesario el back-end de "
+"RenderingDevice)."
+
+msgid "Vulkan back-end of RenderingDevice."
+msgstr "Back-end Vulkan de RenderingDevice."
+
+msgid ""
+"Fallback implementation of Text Server\n"
+"Supports basic text layouts."
+msgstr ""
+"Implementación alternativa de TextServer\n"
+"Soporta formatos de texto básicos."
+
+msgid ""
+"Text Server implementation powered by ICU and HarfBuzz libraries.\n"
+"Supports complex text layouts, BiDi, and contextual OpenType font features."
+msgstr ""
+"Implementación de TextServer a través de las librerías ICU y HarfBuzz. \n"
+"Soporta formatos de texto complejos, BiDi, y funciones contextuales de "
+"fuentes OpenType."
+
+msgid ""
+"TrueType, OpenType, Type 1, and WOFF1 font format support using FreeType "
+"library (if disabled, WOFF2 support is also disabled)."
+msgstr ""
+"Soporte de formato de fuente TrueType, OpenType, Type 1, y WOFF1 usando la "
+"librería FreeType (si se deshabilita, también se deshabilita el soporte para "
+"WOFF2)."
+
+msgid "WOFF2 font format support using FreeType and Brotli libraries."
+msgstr "Soporte de formato WOFF2 usando las librerías FreeType y Brotli."
+
+msgid ""
+"SIL Graphite smart font technology support (supported by Advanced Text Server "
+"only)."
+msgstr ""
+"Compatible con la tecnología de fuentes inteligentes SIL Graphite (compatible "
+"con Advanced Text Server solamente)."
+
+msgid ""
+"Multi-channel signed distance field font rendering support using msdfgen "
+"library (pre-rendered MSDF fonts can be used even if this option disabled)."
+msgstr ""
+"Soporte de renderizado de fuentes de campo de distancia firmada multi-canal "
+"mediante la librería msdfgen (se pueden usar fuentes pre-renderizadas de MSDF "
+"incluso si esta opción está desactivada)."
+
+msgid "General Features:"
+msgstr "Características Generales:"
+
+msgid "Text Rendering and Font Options:"
+msgstr "Opciones de Fuente y Renderizado de Texto:"
+
+msgid "Reset the edited profile?"
+msgstr "¿Reiniciar el perfil editado?"
+
+msgid "File saving failed."
+msgstr "Error guardando archivo."
+
+msgid "Create a new profile?"
+msgstr "¿Crear un nuevo perfil?"
+
+msgid "This will scan all files in the current project to detect used classes."
+msgstr ""
+"Esto escaneará todos los archivos en el proyecto actual para detectar clases "
+"en uso."
+
 msgid "Nodes and Classes:"
 msgstr "Nodos y Clases:"
 
@@ -1625,12 +2193,49 @@ msgstr "Nuevo"
 msgid "Save"
 msgstr "Guardar"
 
+msgid "Profile:"
+msgstr "Perfil:"
+
 msgid "Reset to Defaults"
 msgstr "Restablecer Valores Por Defecto"
 
+msgid "Detect from Project"
+msgstr "Detectar desde Proyecto"
+
+msgid "Actions:"
+msgstr "Acciones:"
+
+msgid "Configure Engine Compilation Profile:"
+msgstr "Configurar Perfil de Compilación del Motor:"
+
+msgid "Please Confirm:"
+msgstr "Confirmá, por favor:"
+
+msgid "Engine Compilation Profile"
+msgstr "Perfil de Compilación de Motor"
+
+msgid "Load Profile"
+msgstr "Cargar Perfil"
+
 msgid "Export Profile"
 msgstr "Exportar Perfil"
 
+msgid "Forced Classes on Detect:"
+msgstr "Clases Forzadas Detectadas:"
+
+msgid "Edit Compilation Configuration Profile"
+msgstr "Editar Perfil de Configuración de Compilación"
+
+msgid ""
+"Failed to execute command \"%s\":\n"
+"%s."
+msgstr ""
+"Error al ejecutar el comando \"%s\":\n"
+"%s."
+
+msgid "Filter Commands"
+msgstr "Filtrar Comandos"
+
 msgid "Paste Params"
 msgstr "Pegar Parámetros"
 
@@ -1649,9 +2254,39 @@ msgstr "[vacío]"
 msgid "[unsaved]"
 msgstr "[sin guardar]"
 
+msgid "Open the %s dock."
+msgstr "Abrir el panel %s."
+
+msgid "Focus on the %s dock."
+msgstr "Enfocar el panel %s."
+
+msgid "%s - Godot Engine"
+msgstr "%s - Godot Engine"
+
+msgid "Move this dock right one tab."
+msgstr "Mover este panel una pestaña hacia la derecha."
+
+msgid "Move this dock left one tab."
+msgstr "Mover este panel una pestaña hacia la izquierda."
+
 msgid "Dock Position"
 msgstr "Posición del Panel"
 
+msgid "Make Floating"
+msgstr "Hacer Flotante"
+
+msgid "Make this dock floating."
+msgstr "Hacer que este panel flote."
+
+msgid "Move to Bottom"
+msgstr "Mover hacia Abajo"
+
+msgid "Move this dock to the bottom panel."
+msgstr "Mover este panel al panel inferior."
+
+msgid "Close this dock."
+msgstr "Cerrar este panel."
+
 msgid "3D Editor"
 msgstr "Editor 3D"
 
@@ -1673,6 +2308,12 @@ msgstr "Panel de Sistema de Archivos"
 msgid "Import Dock"
 msgstr "Dock de Importación"
 
+msgid "History Dock"
+msgstr "Panel de Historial"
+
+msgid "Game View"
+msgstr "Vista del Juego"
+
 msgid "Allows to view and edit 3D scenes."
 msgstr "Permite ver y editar escenas 3D."
 
@@ -1702,6 +2343,15 @@ msgstr ""
 "Permite ajustar los parámetros de importación para assets individuales. "
 "Requiere del panel Sistema de Archivos para funcionar."
 
+msgid "Provides an overview of the editor's and each scene's undo history."
+msgstr ""
+"Provee un vistazo general del historial de deshacer del editor y de cada "
+"escena."
+
+msgid "Provides tools for selecting and debugging nodes at runtime."
+msgstr ""
+"Provee herramientas para seleccionar y debugear nodos durante la ejecución."
+
 msgid "(current)"
 msgstr "(actual)"
 
@@ -1790,6 +2440,34 @@ msgstr "Importar Perfil(es)"
 msgid "Manage Editor Feature Profiles"
 msgstr "Administrar Perfiles de Características del Editor"
 
+msgid "Project initialization"
+msgstr "Inicialización de Proyecto"
+
+msgid "Scanning file structure..."
+msgstr "Examinando Estructura de Archivos..."
+
+msgid "Loading global class names..."
+msgstr "Cargando nombres de clases globales..."
+
+msgid "Verifying GDExtensions..."
+msgstr "Verificando GDExtensions..."
+
+msgid "Creating autoload scripts..."
+msgstr "Creando scripts de autoload..."
+
+msgid "Initializing plugins..."
+msgstr "Inicializando plugins..."
+
+msgid "Starting file scan..."
+msgstr "Comenzando escaneo de archivos..."
+
+msgid "Scanning actions..."
+msgstr "Escaneando acciones..."
+
+msgid "Some extensions need the editor to restart to take effect."
+msgstr ""
+"Algunas extensiones necesitan que reinicies el editor para tener efecto."
+
 msgid "Restart"
 msgstr "Reiniciar"
 
@@ -1799,25 +2477,155 @@ msgstr "Guardar y Reiniciar"
 msgid "ScanSources"
 msgstr "Escanear Fuentes"
 
+msgid "Registering global classes..."
+msgstr "Registrando clases globales..."
+
+msgid "Updating scripts documentation"
+msgstr "Actualizando documentación de scripts"
+
+msgid "Updating Scene Groups"
+msgstr "Actualizando Grupos de Escenas"
+
 msgid ""
 "There are multiple importers for different types pointing to file %s, import "
 "aborted"
 msgstr ""
-"Hay varios importadores para diferentes tipos que apuntan al archivo %s, "
+"Hay múltiples importadores para diferentes tipos apuntando al archivo %s, "
 "importación abortada"
 
 msgid "(Re)Importing Assets"
 msgstr "(Re)Importando Assets"
 
+msgid "Preparing files to reimport..."
+msgstr "Preparando archivos para reimportar..."
+
+msgid "Executing pre-reimport operations..."
+msgstr "Ejecutando operaciones de pre-importación..."
+
+msgid "Import resources of type: %s"
+msgstr "Importar recursos de tipo: %s"
+
+msgid "Finalizing Asset Import..."
+msgstr "Finalizando importación de Assets..."
+
+msgid "Executing post-reimport operations..."
+msgstr "Ejecutando operaciones post-reimportación..."
+
+msgid "Copying files..."
+msgstr "Copiando archivos..."
+
+msgid "This method supports a variable number of arguments."
+msgstr "Este método soporta un número variable de argumentos."
+
+msgid ""
+"This method is called by the engine.\n"
+"It can be overridden to customize built-in behavior."
+msgstr ""
+"Este método es llamado por el motor.\n"
+"Se puede sobrecargar para personalizar su comportamiento por defecto."
+
+msgid ""
+"This method has no side effects.\n"
+"It does not modify the object in any way."
+msgstr ""
+"Este método no tiene efectos secundarios.\n"
+"No modifica el objeto de ninguna forma."
+
+msgid ""
+"This method does not need an instance to be called.\n"
+"It can be called directly using the class name."
+msgstr ""
+"Este método no necesita una instancia para ser llamado.\n"
+"Se lo puede llamar directamente usando el nombre de la clase."
+
+msgid "Code snippet copied to clipboard."
+msgstr "Recorte de código copiado al portapapeles."
+
+msgid "No return value."
+msgstr "Sin valor de retorno."
+
+msgid "This value is an integer composed as a bitmask of the following flags."
+msgstr ""
+"Este valor es un int compuesto como una bitmask para las siguientes banderas."
+
+msgid "Deprecated"
+msgstr "Obsoleto/a"
+
+msgid "Experimental"
+msgstr "Experimental"
+
+msgid "Deprecated:"
+msgstr "Obsoleto/a:"
+
+msgid "Experimental:"
+msgstr "Experimental:"
+
+msgid "Constructors"
+msgstr "Constructores"
+
+msgid "Operators"
+msgstr "Operadores"
+
 msgid "Method Descriptions"
-msgstr "Descripción de Método"
+msgstr "Descripciones de Métodos"
+
+msgid "Constructor Descriptions"
+msgstr "Descripciones de Constructor"
+
+msgid "Operator Descriptions"
+msgstr "Descripciones de Operador"
+
+msgid "This method may be changed or removed in future versions."
+msgstr "Este método podría ser cambiado o eliminado en futuras versiones."
+
+msgid "This constructor may be changed or removed in future versions."
+msgstr "Este constructor podría ser cambiado o eliminado en futuras versiones."
+
+msgid "This operator may be changed or removed in future versions."
+msgstr "Este operador podría ser cambiado o eliminado en futuras versiones."
+
+msgid "Error codes returned:"
+msgstr "Códigos de error devueltos:"
+
+msgid "There is currently no description for this method."
+msgstr "Actualmente no existe una descripción para este método."
+
+msgid "There is currently no description for this constructor."
+msgstr "Actualmente no existe una descripción para este constructor."
+
+msgid "There is currently no description for this operator."
+msgstr "Actualmente no existe una descripción para este operador."
+
+msgid ""
+"There is currently no description for this method. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"Actualmente no existe una descripción para este método. ¡Por favor, ayudanos "
+"[color=$color][url=$url]contribuyendo una[/url][/color]!"
+
+msgid ""
+"There is currently no description for this constructor. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"Actualmente no existe una descripción para este constructor. ¡Por favor, "
+"ayudanos [color=$color][url=$url]contribuyendo una[/url][/color]!"
+
+msgid ""
+"There is currently no description for this operator. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"Actualmente no existe una descripción para este operador. ¡Por favor, "
+"ayudanos [color=$color][url=$url]contribuyendo una[/url][/color]!"
 
 msgid "Top"
-msgstr "Cima"
+msgstr "Superior"
 
 msgid "Class:"
 msgstr "Clase:"
 
+msgid "This class may be changed or removed in future versions."
+msgstr "Esta clase puede ser cambiada o eliminada en futuras versiones."
+
 msgid "Inherits:"
 msgstr "Hereda:"
 
@@ -1827,6 +2635,26 @@ msgstr "Heredada por:"
 msgid "Description"
 msgstr "Descripción"
 
+msgid "There is currently no description for this class."
+msgstr "No existe una descripción para esta clase actualmente."
+
+msgid ""
+"There is currently no description for this class. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"Actualmente no existe descripción para esta clase. ¡Por favor, ayudanos "
+"[color=$color][url=$url]contribuyendo una[/url][/color]!"
+
+msgid "Note:"
+msgstr "Nota:"
+
+msgid ""
+"There are notable differences when using this API with C#. See [url=%s]C# API "
+"differences to GDScript[/url] for more information."
+msgstr ""
+"Hay diferencias notorias al usar esta API con C#. Véase [url=%s]Diferencias "
+"entre la API de C# y GDScript[/url] para más información."
+
 msgid "Online Tutorials"
 msgstr "Tutoriales en línea"
 
@@ -1839,6 +2667,9 @@ msgstr "reemplaza(overrides) %s:"
 msgid "default:"
 msgstr "predeterminado:"
 
+msgid "property:"
+msgstr "propiedad:"
+
 msgid "Theme Properties"
 msgstr "Propiedades de Tema"
 
@@ -1851,14 +2682,63 @@ msgstr "Constantes"
 msgid "Fonts"
 msgstr "Fuentes"
 
+msgid "Font Sizes"
+msgstr "Tamaños de Fuente"
+
 msgid "Icons"
-msgstr "Iconos"
+msgstr "Íconos"
 
 msgid "Styles"
 msgstr "Estilos"
 
+msgid "This theme property may be changed or removed in future versions."
+msgstr ""
+"Esta propiedad de tema podría cambiar o ser eliminada en futuras versiones."
+
+msgid "There is currently no description for this theme property."
+msgstr "Actualmente no existe una descripción para esta propiedad de tema."
+
+msgid ""
+"There is currently no description for this theme property. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"Actualmente no existe descripción para esta propiedad de tema. ¡Por favor, "
+"ayudanos [color=$color][url=$url]contribuyendo una[/url][/color]!"
+
+msgid "This signal may be changed or removed in future versions."
+msgstr "Esta señal podría ser cambiada o eliminada en futuras versiones."
+
+msgid "There is currently no description for this signal."
+msgstr "Actualmente no hay una descripción para esta señal."
+
+msgid ""
+"There is currently no description for this signal. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"Actualmente no existe descripción para esta señal. ¡Por favor, ayudanos "
+"[color=$color][url=$url]contribuyendo una[/url][/color]!"
+
 msgid "Enumerations"
-msgstr "Enumerados"
+msgstr "Enumeraciones"
+
+msgid "This enumeration may be changed or removed in future versions."
+msgstr "Esta enumeración podría cambiar o ser eliminada en futuras versiones."
+
+msgid "This constant may be changed or removed in future versions."
+msgstr "Esta constante podría cambiar o ser eliminada en futuras versiones."
+
+msgid "Annotations"
+msgstr "Anotaciones"
+
+msgid "There is currently no description for this annotation."
+msgstr "Actualmente no existe descripción para esta anotación."
+
+msgid ""
+"There is currently no description for this annotation. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"Actualmente no existe descripción para esta anotación. ¡Por favor, ayúdanos "
+"[color=$color][url=$url]contribuyendo una[/url][/color]!"
 
 msgid "Property Descriptions"
 msgstr "Descripción de Propiedades"
@@ -1866,6 +2746,12 @@ msgstr "Descripción de Propiedades"
 msgid "(value)"
 msgstr "(valor)"
 
+msgid "This property may be changed or removed in future versions."
+msgstr "Esta propiedad podría cambiar o ser eliminada en futuras versiones."
+
+msgid "There is currently no description for this property."
+msgstr "Actualmente no existe descripción para esta propiedad."
+
 msgid ""
 "There is currently no description for this property. Please help us by "
 "[color=$color][url=$url]contributing one[/url][/color]!"
@@ -1873,9 +2759,29 @@ msgstr ""
 "Actualmente no existe descripción para esta propiedad. Por favor ayúdanos "
 "[color=$color][url=$url]contribuyendo una[/url][/color]!"
 
+msgid ""
+"[b]Note:[/b] The returned array is [i]copied[/i] and any changes to it will "
+"not update the original property value. See [%s] for more details."
+msgstr ""
+"[b]Nota:[/b] El array resultante está [i]copiado[/i] y cualquier cambio "
+"realizado en el no actualizará el valor en la propiedad original. Véase [%s] "
+"para más información."
+
 msgid "Editor"
 msgstr "Editor"
 
+msgid "Click to copy."
+msgstr "Click para copiar."
+
+msgid "Click to open in browser."
+msgstr "Abrir en el Navegador."
+
+msgid "No description available."
+msgstr "No hay descripción disponible."
+
+msgid "This annotation may be changed or removed in future versions."
+msgstr "Esta anotación podría cambiar o ser eliminada en futuras versiones."
+
 msgid "Show in FileSystem"
 msgstr "Mostrar en Sistema de Archivos"
 
@@ -1885,12 +2791,21 @@ msgstr "Abrir en el Explorador de Archivos"
 msgid "Class"
 msgstr "Clase"
 
+msgid "Enumeration"
+msgstr "Enumeración"
+
 msgid "Constant"
 msgstr "Constante"
 
+msgid "Metadata"
+msgstr "Metadatos"
+
 msgid "Property"
 msgstr "Propiedad"
 
+msgid "This property can only be set in the Inspector."
+msgstr "Esta propiedad solo puede establecerse en el Inspector."
+
 msgid "Theme Property"
 msgstr "Propiedades del Tema"
 
@@ -1903,6 +2818,12 @@ msgstr "Señal"
 msgid "File"
 msgstr "Archivo"
 
+msgid "Invalid UID"
+msgstr "UID Inválido"
+
+msgid "This UID does not point to any valid Resource."
+msgstr "Esta UID no apunta a ningún recurso válido."
+
 msgid "%d matches."
 msgstr "%d coincidencias."
 
@@ -1921,6 +2842,9 @@ msgstr "Mostrar Todo"
 msgid "Classes Only"
 msgstr "Solo Clases"
 
+msgid "Constructors Only"
+msgstr "Solo Constructores"
+
 msgid "Methods Only"
 msgstr "Solo Métodos"
 
@@ -1939,25 +2863,83 @@ msgstr "Solo Propiedades de Tema"
 msgid "Member Type"
 msgstr "Tipo de Miembro"
 
+msgid "Keywords"
+msgstr "Palabras clave"
+
+msgid "Matches the \"%s\" keyword."
+msgstr "Coincide con la palabra clave \"%s\"."
+
+msgid "This member is marked as deprecated."
+msgstr "Este miembro fue marcado como obsoleto."
+
+msgid "This member is marked as experimental."
+msgstr "Este miembro fue marcado como experimental."
+
+msgid "Unfavorite Property"
+msgstr "Quitar Propiedad de Favoritos"
+
+msgid "Make this property be put back at its original place."
+msgstr "Devolver esta propiedad a su lugar original."
+
+msgid "Make this property be placed at the top for all objects of this class."
+msgstr ""
+"Hacer que esta propiedad sea posicionada por encima de todos los objetos de "
+"esta clase."
+
 msgid "Pinning a value forces it to be saved even if it's equal to the default."
 msgstr ""
 "Fijar un valor fuerza que sea guardado incluso si es igual predeterminado."
 
+msgid "Add element to property array with prefix %s."
+msgstr "Añadir elemento al array de propiedades con el prefijo %s."
+
+msgid "Remove element %d from property array with prefix %s."
+msgstr "Eliminar elemento %d del array de propiedades con el prefijo %s."
+
+msgid "Move element %d to position %d in property array with prefix %s."
+msgstr ""
+"Mover el elemento %d a la posición %d en el array de propiedades con el "
+"prefijo %s."
+
+msgid "Clear Property Array with Prefix %s"
+msgstr "Limpiar el array de propiedades con el prefijo %s"
+
+msgid "Resize Property Array with Prefix %s"
+msgstr "Cambiar el tamaño del array de propiedades con el prefijo %s"
+
+msgid "Element %d: %s%d*"
+msgstr "Elemento %d: %s%d"
+
 msgid "Move Up"
 msgstr "Subir"
 
 msgid "Move Down"
 msgstr "Bajar"
 
+msgid "Insert New Before"
+msgstr "Insertar Nuevo Antes"
+
+msgid "Insert New After"
+msgstr "Insertar Nuevo Después"
+
 msgid "Resize Array"
 msgstr "Redimensionar Array"
 
+msgid "Add Metadata"
+msgstr "Añadir metadatos"
+
 msgid "Set %s"
 msgstr "Asignar %s"
 
+msgid "Pinned %s"
+msgstr "Fijado: %s"
+
 msgid "Unpinned %s"
 msgstr "Desfijado %s"
 
+msgid "Add metadata %s"
+msgstr "Añadir metadatos %s"
+
 msgid "Favorites"
 msgstr "Favoritos"
 
@@ -1970,9 +2952,15 @@ msgstr "Creando Vistas Previas de Mesh/es"
 msgid "Thumbnail..."
 msgstr "Miniatura..."
 
+msgid "Or enter new layout name"
+msgstr "O añadir nuevo nombre para el layout"
+
 msgid "Changed Locale Filter Mode"
 msgstr "Cambiar Modo de Filtro de Locale"
 
+msgid "[Default]"
+msgstr "[Predeterminado]"
+
 msgid "Show All Locales"
 msgstr "Mostrar Todas las Localizaciones"
 
@@ -1985,15 +2973,35 @@ msgstr "Editar Filtros"
 msgid "Language:"
 msgstr "Lenguaje:"
 
+msgid "Filter Messages"
+msgstr "Filtrar Mensajes"
+
 msgid "Clear Output"
 msgstr "Limpiar Salida"
 
 msgid "Copy Selection"
 msgstr "Copiar Selección"
 
+msgid ""
+"Collapse duplicate messages into one log entry. Shows number of occurrences."
+msgstr ""
+"Agrupar todos los mensajes duplicados en una sola entrada en el registro. "
+"Muestra número de reincidencias."
+
+msgid "Focus Search/Filter Bar"
+msgstr "Enfocar la Barra de Búsqueda/Filtro"
+
+msgid "Native Shader Source Inspector"
+msgstr "Inspector de Código Fuente de Shader Nativo"
+
 msgid "Unnamed Project"
 msgstr "Proyecto Sin Nombre"
 
+msgid "Recovery Mode is enabled. Editor functionality has been restricted."
+msgstr ""
+"El Modo Recuperación está activado. La funcionalidad del editor está "
+"restringida."
+
 msgid ""
 "Spins when the editor window redraws.\n"
 "Update Continuously is enabled, which can increase power usage. Click to "
@@ -2019,6 +3027,22 @@ msgstr ""
 msgid "Save Resource As..."
 msgstr "Guardar Recurso Como..."
 
+msgid "Error while parsing file '%s'."
+msgstr "Error al leer el archivo: '%s'."
+
+msgid "Scene file '%s' appears to be invalid/corrupt."
+msgstr "El archivo de Escena '%s' parece ser inválido o estar corrupto."
+
+msgid ""
+"File '%s' is saved in a format that is newer than the formats supported by "
+"this version of Godot, so it can't be opened."
+msgstr ""
+"El archivo '%s' se guardó en un formato que es más nuevo que los formatos "
+"soportados por esta versión de Godot, por lo tanto no puede ser abierto."
+
+msgid "Error while loading file '%s'."
+msgstr "Error al cargar el archivo: '%s'."
+
 msgid "Saving Scene"
 msgstr "Guardar Escena"
 
@@ -2028,9 +3052,20 @@ msgstr "Analizando"
 msgid "Creating Thumbnail"
 msgstr "Creando Miniatura"
 
+msgid ""
+"This scene can't be saved because there is a cyclic instance inclusion.\n"
+"Please resolve it and then attempt to save again."
+msgstr ""
+"Esta escena no se puede guardar porque hay una inclusión de instancias "
+"cíclica.\n"
+"Por favor, arreglalo y luego intentá guardar otra vez."
+
 msgid "Save scene before running..."
 msgstr "Guardar escena antes de ejecutar..."
 
+msgid "Could not save one or more scenes!"
+msgstr "¡No se pudo guardar una o más escenas!"
+
 msgid "Save All Scenes"
 msgstr "Guardar Todas las Escenas"
 
@@ -2043,6 +3078,12 @@ msgstr "Mergear Con Existentes"
 msgid "Apply MeshInstance Transforms"
 msgstr "Aplicar Transformaciones al MeshInstance"
 
+msgid "Can't load MeshLibrary for merging!"
+msgstr "¡No se pudo cargar la MeshLibrary para el merging!"
+
+msgid "Error saving MeshLibrary!"
+msgstr "¡Error guardando la MeshLibrary!"
+
 msgid ""
 "An error occurred while trying to save the editor layout.\n"
 "Make sure the editor's user data path is writable."
@@ -2066,6 +3107,9 @@ msgstr "Nombre de layout no encontrado!"
 msgid "Restored the Default layout to its base settings."
 msgstr "Se restauró el layout Por Defecto a su configuración básica."
 
+msgid "This object is marked as read-only, so it's not editable."
+msgstr "El objeto fue marcado como sólo lectura, por lo tanto no es editable."
+
 msgid ""
 "This resource belongs to a scene that was imported, so it's not editable.\n"
 "Please read the documentation relevant to importing scenes to better "
@@ -2083,9 +3127,19 @@ msgstr ""
 "Este recurso fue importado, por ende no es editable. Cambiá sus ajustes en el "
 "panel de importación y luego reimportá."
 
+msgid "Changes may be lost!"
+msgstr "¡Podrías perder tus cambios!"
+
+msgid "This object is read-only."
+msgstr "Este objeto es de solo lectura."
+
 msgid "Open Base Scene"
 msgstr "Abrir Escena Base"
 
+msgid "%s no longer exists! Please specify a new save location."
+msgstr ""
+"¡%s ya no existe! Por favor, especificá una nueva ubicación de guardado."
+
 msgid ""
 "A root node is required to save the scene. You can add a root node using the "
 "Scene tree dock."
@@ -2096,20 +3150,35 @@ msgstr ""
 msgid "Save Scene As..."
 msgstr "Guardar Escena Como..."
 
+msgid "Pack Project as ZIP..."
+msgstr "Empacar Proyecto como ZIP..."
+
 msgid "Can't undo while mouse buttons are pressed."
 msgstr "No se puede deshacer mientras los botones del mouse están presionados."
 
 msgid "Nothing to undo."
 msgstr "Nada para deshacer."
 
+msgid "Remote Undo: %s"
+msgstr "Deshacer Remoto: %s"
+
+msgid "Scene Undo: %s"
+msgstr "Deshacer Escena: %s"
+
 msgid "Can't redo while mouse buttons are pressed."
 msgstr "No se puede rehacer mientras los botones del mouse están presionados."
 
 msgid "Nothing to redo."
 msgstr "No hay nada que rehacer."
 
+msgid "Remote Redo: %s"
+msgstr "Rehacer Remoto: %s"
+
+msgid "Scene Redo: %s"
+msgstr "Rehacer Escena: %s"
+
 msgid "Can't reload a scene that was never saved."
-msgstr "No se puede volver a cargar una escena que nunca se guardó."
+msgstr "No se puede recargar una escena que nunca se guardó."
 
 msgid "Reload Saved Scene"
 msgstr "Recargar Escena Guardada"
@@ -2122,20 +3191,48 @@ msgstr ""
 "Querés recargar la escena guardada igualmente? Esta acción no se puede "
 "deshacer."
 
+msgid "Save & Reload"
+msgstr "Guardar y Recargar"
+
+msgid "Save modified resources before reloading?"
+msgstr "¿Guardar recursos modificados antes de recargar?"
+
 msgid "Save & Quit"
 msgstr "Guardar y Salir"
 
+msgid "Save modified resources before closing?"
+msgstr "¿Guardar recursos modificados antes de cerrar?"
+
+msgid "Save changes to the following scene(s) before reloading?"
+msgstr "¿Guardar cambios a la(s) siguiente(s) escena(s) antes de recargar?"
+
+msgid "Save changes to the following scene(s) before quitting?"
+msgstr "¿Guardar cambios a la(s) siguiente(s) escena(s) antes de salir?"
+
 msgid "Save changes to the following scene(s) before opening Project Manager?"
 msgstr ""
-"Guardar cambios a la(s) siguiente(s) escena(s) antes de abrir el Gestor de "
+"¿Guardar cambios a la(s) siguiente(s) escena(s) antes de abrir el Gestor de "
 "Proyectos?"
 
+msgid ""
+"This option is deprecated. Situations where refresh must be forced are now "
+"considered a bug. Please report."
+msgstr ""
+"Esta opción está obsoleta. Situaciones donde haga falta forzar una "
+"actualización son ahora consideradas bugs. Por favor, reportalo."
+
 msgid "Pick a Main Scene"
 msgstr "Elegí una Escena Principal"
 
+msgid "This operation can't be done without a scene."
+msgstr "Esta operación no puede ser realizada sin una escena."
+
 msgid "Export Mesh Library"
 msgstr "Exportar Librería de Meshes"
 
+msgid "Quick Open Color Palette..."
+msgstr "Apertura Rápida de Paleta de Colores..."
+
 msgid "Unable to enable addon plugin at: '%s' parsing of config failed."
 msgstr ""
 "No se pudo activar el plugin de addon en: '%s' falló el parseo de la "
@@ -2156,6 +3253,17 @@ msgstr ""
 "error de código en dicho script.\n"
 "Desactivando el addon en '%s' para prevenir nuevos errores."
 
+msgid ""
+"Unable to load addon script from path: '%s'. Base type is not 'EditorPlugin'."
+msgstr ""
+"No se pudo cargar el script de addon desde la ruta: El tipo base de '%s' no "
+"es 'EditorPlugin'."
+
+msgid "Unable to load addon script from path: '%s'. Script is not in tool mode."
+msgstr ""
+"No se pudo cargar el script de addon desde la ruta: El script '%s' no está en "
+"modo herramienta."
+
 msgid ""
 "Scene '%s' was automatically imported, so it can't be modified.\n"
 "To make changes to it, a new inherited scene can be created."
@@ -2164,12 +3272,40 @@ msgstr ""
 "modificada.\n"
 "Para realizar cambios, se debe crear una nueva escena heredada."
 
+msgid ""
+"Error loading scene, it must be inside the project path. Use 'Import' to open "
+"the scene, then save it inside the project path."
+msgstr ""
+"Error cargando la escena, debe estar dentro de la ruta del proyecto. Usá "
+"'Importar' para abrir la escena, y luego guardala dentro de la ruta del "
+"proyecto."
+
 msgid "Scene '%s' has broken dependencies:"
 msgstr "La escena '%s' tiene dependencias rotas:"
 
+msgid ""
+"Multi-window support is not available because the `--single-window` command "
+"line argument was used to start the editor."
+msgstr ""
+"El soporte para múltiples ventanas no está disponible porque se usó el "
+"comando `--single-window` al abrir el editor."
+
+msgid ""
+"Multi-window support is not available because the current platform doesn't "
+"support multiple windows."
+msgstr ""
+"El soporte para múltiples ventanas no está disponible porque la plataforma "
+"actual no soporta múltiples ventanas."
+
 msgid "Clear Recent Scenes"
 msgstr "Restablecer Escenas Recientes"
 
+msgid "Save Layout..."
+msgstr "Guardar Layout..."
+
+msgid "Delete Layout..."
+msgstr "Eliminar Layout..."
+
 msgid "Default"
 msgstr "Por Defecto"
 
@@ -2179,9 +3315,34 @@ msgstr "Guardar Layout"
 msgid "Delete Layout"
 msgstr "Eliminar Layout"
 
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "hace %d segundo"
+msgstr[1] "hace %d segundos"
+
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "hace %d minuto"
+msgstr[1] "hace %d minutos"
+
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "hace %d hora"
+msgstr[1] "hace %d horas"
+
+msgid ""
+"Scene \"%s\" has unsaved changes.\n"
+"Last saved: %s."
+msgstr ""
+"La escena \"%s\" tiene cambios sin guardar.\n"
+"Último guardado: %s."
+
 msgid "Save & Close"
 msgstr "Guardar y Cerrar"
 
+msgid "Save before closing?"
+msgstr "¿Guardar antes de cerrar?"
+
 msgid "%d more files or folders"
 msgstr "%d más archivos o carpetas"
 
@@ -2191,6 +3352,57 @@ msgstr "%d más carpetas"
 msgid "%d more files"
 msgstr "%d más archivos"
 
+msgid ""
+"Unable to write to file '%s', file in use, locked or lacking permissions."
+msgstr ""
+"No es posible guardar el archivo '%s', el archivo está en uso, bloqueado o "
+"faltan permisos."
+
+msgid "Preparing scenes for reload"
+msgstr "Preparando escenas para la recarga"
+
+msgid "Analyzing scene %s"
+msgstr "Analizando escena %s"
+
+msgid "Preparation done."
+msgstr "Preparación lista."
+
+msgid "Scenes reloading"
+msgstr "Recargando escenas"
+
+msgid "Reloading..."
+msgstr "Recargando..."
+
+msgid "Reloading done."
+msgstr "Recarga lista."
+
+msgid ""
+"Changing the renderer requires restarting the editor.\n"
+"\n"
+"Choosing Save & Restart will change the rendering method to:\n"
+"- Desktop platforms: %s\n"
+"- Mobile platforms: %s\n"
+"- Web platform: gl_compatibility"
+msgstr ""
+"Cambiar el renderizador requiere reiniciar el editor. \n"
+"\n"
+"Elegir Guardar y Reiniciar va a cambiar el método de renderizado a:\n"
+"- Plataformas de escritorio: %s\n"
+"- Plataformas móviles: %s\n"
+"- Plataformas Web: gl_compatibility"
+
+msgid "Forward+"
+msgstr "Forward+"
+
+msgid "Mobile"
+msgstr "Móvil"
+
+msgid "Compatibility"
+msgstr "Compatibilidad"
+
+msgid "(Overridden)"
+msgstr "(Sobrecargado(a))"
+
 msgid "Lock Selected Node(s)"
 msgstr "Bloquear Nodo(s) Seleccionado(s)"
 
@@ -2221,6 +3433,9 @@ msgstr "Operaciones con archivos de escena."
 msgid "Copy Text"
 msgstr "Copiar Texto"
 
+msgid "Command Palette"
+msgstr "Paleta de Comandos"
+
 msgid "New Scene"
 msgstr "Nueva Escena"
 
@@ -2248,6 +3463,9 @@ msgstr "Apertura Rápida de Escena..."
 msgid "Quick Open Script..."
 msgstr "Apertura Rápida de Script..."
 
+msgid "Export As..."
+msgstr "Exportar Como..."
+
 msgid "MeshLibrary..."
 msgstr "MeshLibrary..."
 
@@ -2263,9 +3481,18 @@ msgstr "Configuración del Editor..."
 msgid "Project"
 msgstr "Proyecto"
 
+msgid "Project Settings..."
+msgstr "Ajustes del Proyecto..."
+
+msgid "Project Settings"
+msgstr "Ajustes del Proyecto"
+
 msgid "Version Control"
 msgstr "Control de Versiones"
 
+msgid "Export..."
+msgstr "Exportar..."
+
 msgid "Install Android Build Template..."
 msgstr "Instalar Plantilla de Compilación de Android..."
 
@@ -2278,6 +3505,15 @@ msgstr "Herramientas"
 msgid "Orphan Resource Explorer..."
 msgstr "Explorador de Recursos Huérfanos..."
 
+msgid "Engine Compilation Configuration Editor..."
+msgstr "Configuración del Editor del Motor de Compilación..."
+
+msgid "Upgrade Mesh Surfaces..."
+msgstr "Actualizar Superficies de Malla..."
+
+msgid "Upgrade UIDs..."
+msgstr "Actualizar UIDs..."
+
 msgid "Reload Current Project"
 msgstr "Volver a Cargar el Proyecto Actual"
 
@@ -2314,9 +3550,20 @@ msgstr "Ayuda"
 msgid "Online Documentation"
 msgstr "Documentación En Línea"
 
+msgid "Forum"
+msgstr "Foro"
+
 msgid "Community"
 msgstr "Comunidad"
 
+msgid "Copy System Info"
+msgstr "Copiar información del sistema"
+
+msgid "Copies the system info as a single-line text into the clipboard."
+msgstr ""
+"Copia la información del sistema como una sola línea de texto en el "
+"portapapeles."
+
 msgid "Report a Bug"
 msgstr "Reportar un Bug"
 
@@ -2329,6 +3576,21 @@ msgstr "Enviar comentarios sobre la documentación"
 msgid "Support Godot Development"
 msgstr "Apoyar el desarrollo de Godot"
 
+msgid ""
+"Choose a rendering method.\n"
+"\n"
+"Notes:\n"
+"- On mobile platforms, the Mobile rendering method is used if Forward+ is "
+"selected here.\n"
+"- On the web platform, the Compatibility rendering method is always used."
+msgstr ""
+"Elegir método de renderizado.\n"
+"\n"
+"Notas:\n"
+"- En plataformas móviles, se usa el método de renderizado Móvil si acá se "
+"elige Forward+.\n"
+"- En plataformas web, siempre se usa el método de renderizado Compatibility."
+
 msgid "Update Continuously"
 msgstr "Actualizar Continuamente"
 
@@ -2370,6 +3632,9 @@ msgstr "Exportar Libreria"
 msgid "Open & Run a Script"
 msgstr "Abrir y Correr un Script"
 
+msgid "Files have been modified outside Godot"
+msgstr "Se han modificado archivos fuera de Godot"
+
 msgid "New Inherited"
 msgstr "Nuevo Heredado"
 
@@ -2397,6 +3662,9 @@ msgstr "Abrir el Editor siguiente"
 msgid "Open the previous Editor"
 msgstr "Abrir el Editor anterior"
 
+msgid "Ok"
+msgstr "Ok"
+
 msgid "Warning!"
 msgstr "Cuidado!"
 
@@ -2424,6 +3692,20 @@ msgstr "Asignar..."
 msgid "Invalid RID"
 msgstr "RID Inválido"
 
+msgid "Recursion detected, unable to assign resource to property."
+msgstr "Recursión detectada, no se puede asignar el recurso a la propiedad."
+
+msgid ""
+"Can't create a ViewportTexture in a Texture2D node because the texture will "
+"not be bound to a scene.\n"
+"Use a Texture2DParameter node instead and set the texture in the \"Shader "
+"Parameters\" tab."
+msgstr ""
+"No se puede crear una ViewportTexture en un nodo Texture2D porque la textura "
+"no estará vinculada a una escena.\n"
+"En lugar de eso, usa un nodo Texture2DParameter y elegí la textura desde la "
+"pestaña \"Parámetros de Shader\"."
+
 msgid ""
 "Can't create a ViewportTexture on resources saved as a file.\n"
 "Resource needs to belong to a scene."
@@ -2454,6 +3736,15 @@ msgstr "Nueva Clave:"
 msgid "New Value:"
 msgstr "Nuevo Valor:"
 
+msgid "(Nil) %s"
+msgstr "(Nulo) %s"
+
+msgid "%s%s (size %d)"
+msgstr "%s%s (tamaño %d)"
+
+msgid "%s (size %d)"
+msgstr "%s (tamaño %d)"
+
 msgid "Size:"
 msgstr "Tamaño:"
 
@@ -3757,7 +5048,7 @@ msgid "Write error."
 msgstr "Error de escritura."
 
 msgid "Request failed, too many redirects"
-msgstr "Solicitud fallida, demasiadas redireccinoes"
+msgstr "Solicitud fallida, demasiadas redirecciones"
 
 msgid "Redirect loop."
 msgstr "Bucle de redireccionamiento."
@@ -6825,7 +8116,7 @@ msgid "Plugins"
 msgstr "Plugins"
 
 msgid "Import Defaults"
-msgstr "Valores de Importacion Por Defecto"
+msgstr "Valores de Importacion por Defecto"
 
 msgid "Select Property"
 msgstr "Seleccionar Propiedad"
@@ -7492,15 +8783,80 @@ msgstr ""
 "La firma de código está deshabilitada. El proyecto exportado no se ejecutará "
 "en Mac con Gatekeeper habilitado y Mac con tecnología Apple Silicon."
 
+msgid "Icon Creation"
+msgstr "Creación de Ícono"
+
+msgid "Could not read file: \"%s\"."
+msgstr "No se pudo leer el archivo: \"%s\"."
+
+msgid "PWA"
+msgstr "PWA"
+
+msgid ""
+"Exporting to Web is currently not supported in Godot 4 when using C#/.NET. "
+"Use Godot 3 to target Web with C#/Mono instead."
+msgstr ""
+"Actualmente, la exportación a Web no está soportada en Godot 4 cuando se usa "
+"C#/.Net. Para exportar a la Web, usá Godot 3 con C#/Mono."
+
+msgid "Could not read HTML shell: \"%s\"."
+msgstr "No se pudo leer el HTML shell: \"%s\"."
+
 msgid "Run in Browser"
 msgstr "Ejecutar en el Navegador"
 
+msgid "Start HTTP Server"
+msgstr "Iniciar Servidor HTTP"
+
+msgid "Re-export Project"
+msgstr "Re-exportar Proyecto"
+
 msgid "Stop HTTP Server"
 msgstr "Detener Servidor HTTP"
 
 msgid "Run exported HTML in the system's default browser."
 msgstr "Ejecutar HTML exportado en el navegador por defecto del sistema."
 
+msgid "Start the HTTP server."
+msgstr "Iniciar el servidor HTTP."
+
+msgid "Export project again to account for updates."
+msgstr "Exportá el proyecto otra vez para tener en cuenta actualizaciones."
+
+msgid "Stop the HTTP server."
+msgstr "Detener servidor HTTP."
+
+msgid "Could not create HTTP server directory: %s."
+msgstr "No se pudo crear el directorio del servidor HTTP: %s."
+
+msgid "Error starting HTTP server: %d."
+msgstr "Error al iniciar el servidor HTTP: %d."
+
+msgid "Resources Modification"
+msgstr "Modificación de Recursos"
+
+msgid "Icon size \"%d\" is missing."
+msgstr "Falta un ícono de tamaño \"%d\""
+
+msgid ""
+"Mismatching custom export template executable architecture: found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"La arquitectura del ejecutable de la plantilla de exportación personalizada "
+"no coincide: se encontró \"%s\", pero se esperaba \"%s\"."
+
+msgid "Failed to rename temporary file \"%s\"."
+msgstr "No se puede eliminar el archivo temporal: \"%s\"."
+
+msgid "Invalid icon path."
+msgstr "Ruta de icono no válida."
+
+msgid "Invalid file version."
+msgstr "Versión de archivo inválida."
+
+msgid "Invalid product version."
+msgstr "Versión de producto inválida."
+
 msgid "No identity found."
 msgstr "No se encontró identidad."
 
@@ -7711,3 +9067,133 @@ msgstr "Función de comparación inválida para este tipo."
 
 msgid "Constants cannot be modified."
 msgstr "Las constantes no pueden modificarse."
+
+msgid "Expected a valid data type for argument."
+msgstr "Se esperaba un tipo de dato válido para el argumento."
+
+msgid "Opaque types cannot be output parameters."
+msgstr "Los tipos opacos no pueden ser parámetros de salida."
+
+msgid "Void type not allowed as argument."
+msgstr "No se permite un tipo vacío como argumento."
+
+msgid "Expected an identifier for argument name."
+msgstr "Se esperaba un identificador para el nombre del argumento."
+
+msgid "Function '%s' expects no arguments."
+msgstr "La función '%s' no necesita argumentos."
+
+msgid "Function '%s' must be of '%s' return type."
+msgstr "La función '%s' debe ser del tipo de retorno '%s'."
+
+msgid "Expected a '{' to begin function."
+msgstr "Se esperaba un '{' al inicio de la función."
+
+msgid "Expected at least one '%s' statement in a non-void function."
+msgstr ""
+"Se esperaba menos una sentencia '%s' en una función de retorno no vacío."
+
+msgid "Expected a '%s'."
+msgstr "Se esperaba un(a) '%s'."
+
+msgid "Expected a '%s' or '%s'."
+msgstr "Se esperaba un(a)'%s' o '%s'."
+
+msgid "Expected a '%s' after '%s'."
+msgstr "Se esperaba un(a) '%s' después de '%s'."
+
+msgid "Redefinition of '%s'."
+msgstr "Redefinición de: '%s'"
+
+msgid "Macro redefinition."
+msgstr "Redefinición de Macros."
+
+msgid "Shader include file does not exist:"
+msgstr "El archivo de inclusión del Shader no existe:"
+
+msgid ""
+"Shader include load failed. Does the shader include exist? Is there a cyclic "
+"dependency?"
+msgstr ""
+"La carga del archivo de inclusión del Shader falló. ¿Existe este archivo? "
+"¿Hay acaso una dependencia cíclica?"
+
+msgid "Shader include resource type is wrong."
+msgstr "El tipo de recurso de inclusión del shader está mal."
+
+msgid "Cyclic include found"
+msgstr "Se encontró un include cíclico"
+
+msgid "Shader max include depth exceeded."
+msgstr "Se superó la profundidad máxima de inclusión de shaders."
+
+msgid "Cannot use '%s' on built-in define."
+msgstr "No se puede usar '%s' en la definición por defecto."
+
+msgid "Macro expansion limit exceeded."
+msgstr "Se superó el límite de expansión de macros."
+
+msgid "Invalid macro argument list."
+msgstr "La lista de argumentos de macro es inválida."
+
+msgid "Invalid macro argument."
+msgstr "El argumento de macro es inválido."
+
+msgid "Invalid macro argument count."
+msgstr "El conteo de argumentos de macro es inválido."
+
+msgid "Can't find matching branch directive."
+msgstr "No se puede encontrar una directiva de rama que coincida."
+
+msgid "Invalid symbols placed before directive."
+msgstr "Se colocaron símbolos inválidos antes de la directiva."
+
+msgid "Unmatched conditional statement."
+msgstr "La declaración condicional no coincide."
+
+msgid ""
+"Direct floating-point comparison (this may not evaluate to `true` as you "
+"expect). Instead, use `abs(a - b) < 0.0001` for an approximate but "
+"predictable comparison."
+msgstr ""
+"La comparación de punto flotante es directa (esto podría no evaluarse a "
+"`true` como uno esperaría). Para una conseguir una comparación aproximada "
+"pero predecible, usá `abs(a - b) < 0.0001`."
+
+msgid "The const '%s' is declared but never used."
+msgstr "La constante '%s' se declara pero nunca se usa."
+
+msgid "The function '%s' is declared but never used."
+msgstr "La función '%s' se declara pero nunca se usa."
+
+msgid "The struct '%s' is declared but never used."
+msgstr "La estructura '%s' se declara pero nunca se usa."
+
+msgid "The uniform '%s' is declared but never used."
+msgstr "El uniforme '%s' se declara pero nunca se usa."
+
+msgid "The varying '%s' is declared but never used."
+msgstr "El varying '%s' se declara pero nunca se usa."
+
+msgid "The local variable '%s' is declared but never used."
+msgstr "La variable local '%s' se declara pero nunca se usa."
+
+msgid ""
+"The total size of the %s for this shader on this device has been exceeded (%d/"
+"%d). The shader may not work correctly."
+msgstr ""
+"El tamaño total del %s para este shader en este dispositivo fue excedido. (%d/"
+"%d). El shader podría funcionar mal."
+
+msgid ""
+"You are attempting to assign the VERTEX position in model space to the vertex "
+"POSITION in clip space. The definition of clip space changed in version 4.3, "
+"so if this code was written prior to 4.3, it will not continue to work. "
+"Consider specifying the clip space z-component directly i.e. use `vec4(VERTEX."
+"xy, 1.0, 1.0)`."
+msgstr ""
+"Estás intentando asignar la posición del VÉRTEX en el espacio modelo a la "
+"POSICIÓN del vértice en el espacio del clip. La definición de espacio de clip "
+"cambió en la versión 4.3, por lo que si este código se escribió antes de la "
+"4.3, no seguirá funcionando. Considerá especificar el componente z del "
+"espacio de recorte directamente, es decir, usá `vec4(VERTEX.xy, 1.0, 1.0)`."
diff --git a/engine/editor/translations/editor/fa.po b/engine/editor/translations/editor/fa.po
index fefc7f5b..ffc2cd17 100644
--- a/engine/editor/translations/editor/fa.po
+++ b/engine/editor/translations/editor/fa.po
@@ -29,7 +29,7 @@
 # Mitsuha Miamizu <mitsuha.miamizu4444@gmail.com>, 2022.
 # LordProfo <nimaentity30@gmail.com>, 2022.
 # LordProfo (Nima) <nimaentity30@gmail.com>, 2022, 2023.
-# John Smith <pkafsharix@gmail.com>, 2022, 2023, 2024.
+# John Smith <pkafsharix@gmail.com>, 2022, 2023, 2024, 2025.
 # Ali Jafari <ali.jafari.sn@gmail.com>, 2022.
 # Ali Almasi <A710almasi@gmail.com>, 2022.
 # 2g.2d.2t <2g.2d.2t@gmail.com>, 2022.
@@ -57,8 +57,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-27 22:41+0000\n"
-"Last-Translator: Atur <aturaseman9@gmail.com>\n"
+"PO-Revision-Date: 2025-03-19 07:54+0000\n"
+"Last-Translator: John Smith <pkafsharix@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/fa/>\n"
 "Language: fa\n"
@@ -66,7 +66,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.10.2-rc\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "ریسهٔ اصلی"
@@ -710,7 +710,7 @@ msgid "3D Scale Track..."
 msgstr "نوار مقیاس سه‌بعدی..."
 
 msgid "Blend Shape Track..."
-msgstr "نوار شکل درآمیزی..."
+msgstr "نوار درآمیزی شکل..."
 
 msgid "Call Method Track..."
 msgstr "نوار فراخوانی روش..."
@@ -866,7 +866,7 @@ msgid "Copy Key(s)"
 msgstr "کپی کلید(ها)"
 
 msgid "Add RESET Value(s)"
-msgstr "اضافه کردن مقدار(های) ریست"
+msgstr "افزودن ارزش(های) بازنشانی"
 
 msgid "Delete Key(s)"
 msgstr "زدایش کلید(ها)"
@@ -1564,6 +1564,9 @@ msgstr "آرگومان‌های سیگنال‌ Unbind:"
 msgid "Receiver Method:"
 msgstr "روش گیرنده:"
 
+msgid "Pick"
+msgstr "برداشتن"
+
 msgid "Advanced"
 msgstr "پیشرفته"
 
@@ -1697,7 +1700,7 @@ msgid "Save Branch as Scene"
 msgstr "ذخیرهٔ شاخه به‌عنوان صحنه"
 
 msgid "Copy Node Path"
-msgstr "کپی کردن مسیر node"
+msgstr "روگرفت مسیر گره"
 
 msgid "Expand/Collapse Branch"
 msgstr "گسترش/بستن شاخه"
@@ -2022,8 +2025,8 @@ msgstr "جستجو برای جایگزین بنمایه:"
 
 msgid "Open Scene"
 msgid_plural "Open Scenes"
-msgstr[0] "گشودن صحنهگشودن صحنه‌ها"
-msgstr[1] ""
+msgstr[0] "گشودن صحنه"
+msgstr[1] "گشودن صحنه‌ها"
 
 msgid "Open"
 msgstr "گشودن"
@@ -2306,7 +2309,7 @@ msgid "Add Effect"
 msgstr "افزودن جلوه"
 
 msgid "Rename Audio Bus"
-msgstr "تغییر نام گذرگاه صدا"
+msgstr "بازنامگذاری گذرگاه صدا"
 
 msgid "Change Audio Bus Volume"
 msgstr "تغییر مقدار صدای خطی"
@@ -2396,7 +2399,7 @@ msgid "Layout:"
 msgstr "چیدمان:"
 
 msgid "Add Bus"
-msgstr "اتوبوس اضافه کنید"
+msgstr "افزودن گذرگاه"
 
 msgid "Add a new Audio Bus to this layout."
 msgstr "یک باس شنیداری نو به این چیدمان بیفزایید."
@@ -2664,6 +2667,9 @@ msgstr "بار کردن نمایه"
 msgid "Export Profile"
 msgstr "برون‌برد نمایه"
 
+msgid "Forced Classes on Detect:"
+msgstr "کلاس‌های اجبارشده هنگام شناسایی:"
+
 msgid "Edit Compilation Configuration Profile"
 msgstr "ویرایش نمایهٔ پیکربندی کامپایل"
 
@@ -2711,7 +2717,7 @@ msgid "Move this dock left one tab."
 msgstr "این لنگرگاه را یک زبانه به چپ ببر."
 
 msgid "Dock Position"
-msgstr "مکان داک"
+msgstr "نهشت لنگرگاه"
 
 msgid "Make Floating"
 msgstr "شناور کردن"
@@ -2723,10 +2729,10 @@ msgid "Move to Bottom"
 msgstr "جابه‌جا کردن به زیر"
 
 msgid "Move this dock to the bottom panel."
-msgstr "این داک را به پنل پایینی ببر."
+msgstr "این لنگرگاه را به پهنهٔ پایینی ببرید."
 
 msgid "Close this dock."
-msgstr "این داک را ببند."
+msgstr "این لنگرگاه را ببندید."
 
 msgid "3D Editor"
 msgstr "ویراستار سه‌بعدی"
@@ -2741,16 +2747,16 @@ msgid "Scene Tree Editing"
 msgstr "ویرایش درخت صحنه"
 
 msgid "Node Dock"
-msgstr "داک گره"
+msgstr "لنگرگاه گره"
 
 msgid "FileSystem Dock"
-msgstr "قایل‌سیستم داک"
+msgstr "لنگرگاه سامانهٔ پرونده"
 
 msgid "Import Dock"
 msgstr "درون‌برد لنگرگاه"
 
 msgid "History Dock"
-msgstr "داک تاریخچه"
+msgstr "لنگرگاه تاریخچه"
 
 msgid "Game View"
 msgstr "نمای بازی"
@@ -2765,14 +2771,15 @@ msgid "Provides built-in access to the Asset Library."
 msgstr "دسترسی تعبیه‌ شده به کتابخانه دارایی را فراهم می‌کند."
 
 msgid "Allows editing the node hierarchy in the Scene dock."
-msgstr "اجازه ویرایش سلسله مراتب گره‌ در داک صحنه را میدهد."
+msgstr "اجازهٔ ویرایش سلسله‌مراتب گره‌ در لنگرگاه صحنه را می‌دهد."
 
 msgid ""
 "Allows to work with signals and groups of the node selected in the Scene dock."
-msgstr "اجازه کار کردن با سیگنال‌ها و گروه‌های گره برگزیده در داک صحنه را میدهد."
+msgstr ""
+"اجازهٔ کار کردن با سیگنال‌ها و گروه‌های گره برگزیده در لنگرگاه صحنه را می‌دهد."
 
 msgid "Allows to browse the local file system via a dedicated dock."
-msgstr "به مرور سیستم فایل محلی از طریق یک داک اختصاصی اجازه می دهد."
+msgstr "اجازهٔ مرور سامانهٔ پروندهٔ بومی از راه لنگرگاهی اختصاصی را می‌دهد."
 
 msgid ""
 "Allows to configure import settings for individual assets. Requires the "
@@ -3453,7 +3460,7 @@ msgid "Add metadata %s"
 msgstr "افزودن فراداده %s"
 
 msgid "Favorites"
-msgstr "برگزیده‌ها"
+msgstr "دلخواه‌ها"
 
 msgid "Copy Value"
 msgstr "روگرفت ارزش"
@@ -3462,7 +3469,7 @@ msgid "Paste Value"
 msgstr "چسباندن ارزش"
 
 msgid "Copy Property Path"
-msgstr "کپی کردن مسیر دارایی"
+msgstr "روگرفت مسیر ویژگی"
 
 msgid "Creating Mesh Previews"
 msgstr "در حال ساخت پیش‌نمایش‌های مش"
@@ -4269,16 +4276,16 @@ msgid "Community"
 msgstr "انجمن"
 
 msgid "Copy System Info"
-msgstr "کپی اطلاعات سیستم"
+msgstr "روگرفت اطلاعات رایانه"
 
 msgid "Copies the system info as a single-line text into the clipboard."
 msgstr "اطلاعات رایانه را به‌عنوان یک نوشتهٔ تک‌خطی درون بریده‌دان روگرفت می‌کند."
 
 msgid "Report a Bug"
-msgstr "گزارش یک مشکل"
+msgstr "گزارش مشکل"
 
 msgid "Suggest a Feature"
-msgstr "پیشنهاد یک ویژگی"
+msgstr "پیشنهاد ویژگی"
 
 msgid "Send Docs Feedback"
 msgstr "فرستادن بازخورد مستندات"
@@ -4440,7 +4447,7 @@ msgid "Bit %d, value %d"
 msgstr "%d بیت، %d ارزش"
 
 msgid "Rename"
-msgstr "تغییر نام"
+msgstr "بازنامگذاری"
 
 msgid "Rename layer"
 msgstr "بازنامگذاری لایه"
@@ -4646,9 +4653,6 @@ msgstr "به‌کارگیری در چهارمین دستگاه درون فهرس
 msgid "Project Run"
 msgstr "اجرای پروژه"
 
-msgid "Write your logic in the _run() method."
-msgstr "منطق خود را در روش _run() بنویسید."
-
 msgid "The current scene already has a root node."
 msgstr "صحنهٔ کنونی هم‌اکنون گرهٔ ریشه دارد."
 
@@ -4905,6 +4909,13 @@ msgstr ""
 "آی.سی.یوی متفاوتی ساخته شده باشد، ممکن است نمایش نوشتار در پروژهٔ برون‌بردشده "
 "خراب باشد!"
 
+msgid ""
+"Missing text server data, text display in the exported project might be "
+"broken!"
+msgstr ""
+"داده‌های کارساز (سرور) متن یافت نشد، نمایش متن در پروژهٔ برون‌بردشده شاید دچار "
+"مشکل شود!"
+
 msgid "ZIP Creation"
 msgstr "ساخت ZIP"
 
@@ -5175,6 +5186,9 @@ msgstr "نصب از پرونده"
 msgid "Install templates from a local file."
 msgstr "قالب‌ها را از پرونده‌ای بومی نصب کنید."
 
+msgid "Go Online"
+msgstr "آنلاین شو"
+
 msgid "Cancel the download of the templates."
 msgstr "بارگیری قالب‌ها را لغو کن."
 
@@ -5374,6 +5388,9 @@ msgstr "کلید رمزبندی نامعتبر است (باید به بلندی
 msgid "Encryption Key (256-bits as hexadecimal):"
 msgstr "کلید رمزبندی (۲۵۶ بیت به‌عنوان شانزدهی):"
 
+msgid "Initialization vector seed"
+msgstr "بذر بُردار راه‌اندازی آغازین"
+
 msgid ""
 "Note: Encryption key needs to be stored in the binary,\n"
 "you need to build the export templates from source."
@@ -5577,6 +5594,15 @@ msgid ""
 msgstr ""
 "ناتوانی در اجرای برنامهٔ بیرونی برای بررسی حضور شبیه‌ساز پایانه: فرمان -v %s"
 
+msgid ""
+"Couldn't run external terminal program (error code %d): %s %s\n"
+"Check `filesystem/external_programs/terminal_emulator` and `filesystem/"
+"external_programs/terminal_emulator_flags` in the Editor Settings."
+msgstr ""
+"ناتوانی در اجرای برنامهٔ خارجی پایانه (کد خطا: %d): %s %s\n"
+"تنظیمات `filesystem/external_programs/terminal_emulator` و `filesystem/"
+"external_programs/terminal_emulator_flags` را در تنظیمات ویراستار بررسی کنید."
+
 msgid "Duplicating file:"
 msgstr "فایل تکراری:"
 
@@ -5649,7 +5675,7 @@ msgid "Move/Duplicate To..."
 msgstr "جابه‌جایی/دوتاسازی به..."
 
 msgid "Add to Favorites"
-msgstr "اضافه به علاقمندی‌ها"
+msgstr "افزودن به دلخواه‌ها"
 
 msgid "Remove from Favorites"
 msgstr "برچیدن از دلخواه‌ها"
@@ -5700,16 +5726,19 @@ msgid "Sort by First Modified"
 msgstr "چینش بر پایهٔ زمان نخستین دگرگونی"
 
 msgid "Copy Path"
-msgstr "کپی کردن مسیر"
+msgstr "روگرفت مسیر"
+
+msgid "Copy Absolute Path"
+msgstr "روگرفت مسیر مطلق"
 
 msgid "Copy UID"
 msgstr "روگرفت یو.آی.دی"
 
 msgid "Duplicate..."
-msgstr "تکرار..."
+msgstr "دوتاسازی..."
 
 msgid "Rename..."
-msgstr "تغییر نام..."
+msgstr "بازنامگذاری..."
 
 msgid "Open in External Program"
 msgstr "گشودن در برنامهٔ بیرونی"
@@ -5849,7 +5878,7 @@ msgid "Removing Group References"
 msgstr "زدایش بازبرد‌های گروه"
 
 msgid "Rename Group"
-msgstr "تغییر نام گروه"
+msgstr "گروه بازنامگذاری شد"
 
 msgid "Remove Group"
 msgstr "برچیدن گروه"
@@ -5879,7 +5908,7 @@ msgid "Global Groups"
 msgstr "گروه‌های جهانی"
 
 msgid "Add to Group"
-msgstr "اضافه به گروه"
+msgstr "افزودن به گروه"
 
 msgid "Remove from Group"
 msgstr "برچیدن از گروه"
@@ -5923,6 +5952,9 @@ msgstr ""
 "برای پایان دادن به پیمایش کنترل را نگه دارید.\n"
 "برای پیمودن یک برگه شیفت را نگه دارید."
 
+msgid "Pin Bottom Panel Switching"
+msgstr "سنجاق کردن سودهی پهنهٔ پایینی"
+
 msgid "Expand Bottom Panel"
 msgstr "گسترش پهنهٔ پایینی"
 
@@ -6195,6 +6227,24 @@ msgstr "برافزاهای جی.دی.اکستنشن"
 msgid "Automatic scene restoring"
 msgstr "بازگردانی خودکار صحنه"
 
+msgid ""
+"If the project cannot be opened outside of this mode, then it's very likely "
+"any of these components is preventing this project from launching. This mode "
+"is intended only for basic editing to troubleshoot such issues, and therefore "
+"it is not possible to run a project in this mode."
+msgstr ""
+"اگر پروژه نمی‌تواند بیرون از این حالت گشوده شود، پس احتمال بالایی هست که "
+"هرکدام از این مولفه‌ها در حال پیشگیری از اجرا شدن این پروژه باشند. این حالت "
+"تنها برای ویرایش پایه‌ای برای اشکال‌یابی چنین مشکل‌هایی در نظر گرفته شده است، از "
+"این رو، اجرای پروژه‌ها در این حالت شدنی نیست."
+
+msgid ""
+"To disable Recovery Mode, reload the project by pressing the Reload button "
+"next to the Recovery Mode banner, or by reopening the project normally."
+msgstr ""
+"برای از کار انداختن حالت بازیابی، پروژه را با فشردن دکمهٔ دوباره بار کردن کنار "
+"برنمای حالت بازیابی یا با بهنجارانه بازگشودن پروژه دوباره بار کنید."
+
 msgid "Disable recovery mode and reload the project."
 msgstr "حالت بازیابی را از کار انداخته و پروژه را دوباره بار کنید."
 
@@ -6524,6 +6574,14 @@ msgstr "پروندهٔ نو خواهد ساخت"
 msgid "Already External"
 msgstr "هم‌اکنون هم بیرونی"
 
+msgid ""
+"This material already references an external file, no action will be taken.\n"
+"Disable the external property for it to be extracted again."
+msgstr ""
+"این ماده قبلاً به یک پرونده خارجی ارجاع داده شده است، هیچ اقدامی انجام نخواهد "
+"شد.\n"
+"برای استخراج مجدد، ویژگی خارجی را غیرفعال کنید."
+
 msgid "No import ID"
 msgstr "بدون شناسهٔ درون‌برد"
 
@@ -6658,12 +6716,37 @@ msgstr "چرخه:"
 msgid "BPM:"
 msgstr "ضرب در دقیقه (بی.پی.ام):"
 
+msgid ""
+"Configure the Beats Per Measure (tempo) used for the interactive streams.\n"
+"This is required in order to configure beat information."
+msgstr ""
+"ضرب‌ها در هر اندازه (تمپو) را برای جریان‌های تعاملی پیکربندی کنید.\n"
+"این برای پیکربندی اطلاعات ضرب‌ها لازم است."
+
 msgid "Beat Count:"
 msgstr "شمار ضرب:"
 
+msgid ""
+"Configure the amount of Beats used for music-aware looping. If zero, it will "
+"be autodetected from the length.\n"
+"It is recommended to set this value (either manually or by clicking on a beat "
+"number in the preview) to ensure looping works properly."
+msgstr ""
+"مقدار ضرب‌ها را برای حلقه‌زنی هماهنگ با موسیقی پیکربندی کنید. اگر مقدار صفر "
+"باشد، به‌طور خودکار از طول تشخیص داده می‌شود.\n"
+"توصیه می‌شود این مقدار را (به‌صورت دستی یا با کلیک روی شماره ضرب در پیش‌نمایش) "
+"تنظیم کنید تا حلقه‌زنی به‌درستی کار کند."
+
 msgid "Bar Beats:"
 msgstr "ضرب‌های نوار:"
 
+msgid ""
+"Configure the Beats Per Bar. This used for music-aware transitions between "
+"AudioStreams."
+msgstr ""
+"پیکربندی ضرب بر میزان. برای گذارهای آگاه از موسیقی میان AudioStreamها به کار "
+"می‌رود."
+
 msgid "Music Playback:"
 msgstr "بازنواخت موسیقی:"
 
@@ -6755,9 +6838,24 @@ msgstr "شکل دادن به نوشتار و افزودن گلیف‌ها"
 msgid "Glyphs from the Character Map"
 msgstr "گلیف‌های نقشهٔ نویسه"
 
+msgid ""
+"Add or remove glyphs from the character map to pre-render list:\n"
+"Note: Some stylistic alternatives and glyph variants do not have one-to-one "
+"correspondence to character, and not shown in this map, use \"Glyphs from the "
+"text\" tab to add these."
+msgstr ""
+"حروف را به نقشه نویسه اضافه یا از آن حذف کنید تا در فهرست پیش‌پردازش قرار "
+"گیرند:\n"
+"توجه: برخی از جایگزین‌های سبک‌شناختی و گونه‌های حروف تطابق یک‌به‌یک با نویسه‌ها "
+"ندارند و در این نقشه نمایش داده نمی‌شوند. برای افزودن آن‌ها، از برگه «حروف از "
+"متن» استفاده کنید."
+
 msgid "Dynamically rendered TrueType/OpenType font"
 msgstr "قلم پویا نماپردازش‌شدهٔ TrueType/OpenType"
 
+msgid "Prerendered multichannel(+true) signed distance field"
+msgstr "میدان فاصلهٔ امضاشدهٔ چندکانالهٔ(+true) پیش‌نماپردازش‌شده"
+
 msgid ""
 "Error importing GLSL shader file: '%s'. Open the file in the filesystem dock "
 "in order to see the reason."
@@ -6899,12 +6997,20 @@ msgstr "دستگاه:"
 msgid "Command / Control (auto)"
 msgstr "فرمان / کنترل (خودکار)"
 
+msgid ""
+"Automatically remaps between 'Meta' ('Command') and 'Control' depending on "
+"current platform."
+msgstr "خودکارانه میان «متا» («فرمان») و «کنترل» بسته به سکوی کنونی بازمی‌نشاند."
+
 msgid "Keycode (Latin Equivalent)"
 msgstr "کد کلید (هم‌ارز لاتین)"
 
 msgid "Physical Keycode (Position on US QWERTY Keyboard)"
 msgstr "کد کلید فیزیکی (نهشت در تخته‌کلید کوئرتی آمریکایی)"
 
+msgid "Key Label (Unicode, Case-Insensitive)"
+msgstr "برچسب کلید (یونی‌کد، بدون حساسیت به حروف بزرگ و کوچک)"
+
 msgid "Physical location"
 msgstr "جایگاه فیزیکی"
 
@@ -7114,7 +7220,7 @@ msgid "Add Animation"
 msgstr "افزودن پویانمایی"
 
 msgid "Add %s"
-msgstr "اضافه کردن %s"
+msgstr "افزودن %s"
 
 msgid "Move Node Point"
 msgstr "جابه‌جایی نقطهٔ گره"
@@ -7196,6 +7302,9 @@ msgstr "برچیدن مثلث BlendSpace2D"
 msgid "No triangles exist, so no blending can take place."
 msgstr "هیچ مثلثی وجود ندارد، بنابراین هیچ درآمیزشی نمی‌تواند انجام شود."
 
+msgid "Toggle Auto Triangles"
+msgstr "روشن/خاموش کردن مثلث‌های خودکار"
+
 msgid "Create triangles by connecting points."
 msgstr "با اتصال نقطه‌ها مثلث بسازید."
 
@@ -7276,7 +7385,7 @@ msgid "Edit Filtered Tracks:"
 msgstr "ویرایش نوارهای پالاییده:"
 
 msgid "Node Renamed"
-msgstr "نام گره تغییر کرد"
+msgstr "گره بازنامگذاری شد"
 
 msgid "Add Node..."
 msgstr "افزودن گره..."
@@ -7502,7 +7611,7 @@ msgid "New Animation Name:"
 msgstr "نام پویانمایی تازه:"
 
 msgid "Rename Animation"
-msgstr "تغییر نام پویانمایی"
+msgstr "بازنامگذاری پویانمایی"
 
 msgid "Change Animation Name:"
 msgstr "تغییر نام پویانمایی:"
@@ -7522,6 +7631,9 @@ msgstr "پویانمایی '%s' هم‌اکنون وجود دارد!"
 msgid "Duplicate Animation"
 msgstr "دوتاسازی پویانمایی"
 
+msgid "Blend Next Changed"
+msgstr "درآمیزی تغییر بعدی"
+
 msgid "Change Blend Time"
 msgstr "دگرش زمان درآمیزی"
 
@@ -7606,12 +7718,18 @@ msgstr "۳ گام"
 msgid "Differences Only"
 msgstr "تنها تفاوت‌ها"
 
+msgid "Force White Modulate"
+msgstr "اجبار به مدوله‌سازی سفید"
+
 msgid "Include Gizmos (3D)"
 msgstr "دربرگیری گیزمو‌ها (سه‌بعدی)"
 
 msgid "Pin AnimationPlayer"
 msgstr "سنجاق کردن AnimationPlayer"
 
+msgid "Cross-Animation Blend Times"
+msgstr "زمان‌های درآمیزی متقاطع پویانمایی‌ها"
+
 msgid "Blend Times:"
 msgstr "زمان درآمیزی:"
 
@@ -7633,6 +7751,9 @@ msgstr "حرکت دادن گره"
 msgid "Transition exists!"
 msgstr "گذار وجود دارد!"
 
+msgid "Play/Travel to %s"
+msgstr "پخش/سفر به %s"
+
 msgid "Edit %s"
 msgstr "ویرایش %s"
 
@@ -7850,15 +7971,21 @@ msgstr ""
 "کتابخانهٔ دارایی نیاز به اتصال آنلاین دارد و وابسته به فرستادن داده با اینترنت "
 "است."
 
-msgid "Go Online"
-msgstr "آنلاین شو"
-
 msgid "Failed to get repository configuration."
 msgstr "ناکامی در دریافت پیکربندی مخزن."
 
 msgid "All"
 msgstr "همه"
 
+msgid ""
+"No results compatible with %s %s for support level(s): %s.\n"
+"Check the enabled support levels using the 'Support' button in the top-right "
+"corner."
+msgstr ""
+"هیچ نتیجه‌ای سازگار با %s %s برای سطح(های) پشتیبانی: %s یافت نشد.\n"
+"سطوح پشتیبانی فعال را با استفاده از دکمه «پشتیبانی» در گوشه بالا-راست بررسی "
+"کنید."
+
 msgid "Search Templates, Projects, and Demos"
 msgstr "جستجوی قالب‌ها، پروژه‌ها و دموها"
 
@@ -7954,12 +8081,30 @@ msgstr "نشاندن بازه از مبدای لولای CanvasItem «%s» به
 msgid "Rotate %d CanvasItems"
 msgstr "چرخش %d CanvasItem"
 
+msgid "Rotate CanvasItem \"%s\" to %d degrees"
+msgstr "چرخش CanvasItem «%s» به %d درجه"
+
+msgid "Move CanvasItem \"%s\" Anchor"
+msgstr "جابه‌جایی لنگر CanvasItem «%s»"
+
+msgid "Scale Node2D \"%s\" to (%s, %s)"
+msgstr "مقیاس‌گذاری Node2D «%s» به (%s،%s)"
+
 msgid "Resize Control \"%s\" to (%d, %d)"
 msgstr "تغییر اندازهٔ کنترل «%s» به (%d, %d)"
 
+msgid "Scale %d CanvasItems"
+msgstr "مقیاس‌گذاری %d CanvasItem"
+
+msgid "Scale CanvasItem \"%s\" to (%s, %s)"
+msgstr "مقیاس‌گذاری CanvasItem «%s» به (%s, %s)"
+
 msgid "Move %d CanvasItems"
 msgstr "جابه‌جایی %d CanvasItem"
 
+msgid "Move CanvasItem \"%s\" to (%d, %d)"
+msgstr "جابه‌جایی CanvasItem «%s» به (%d، %d)"
+
 msgid "Locked"
 msgstr "قفلیده"
 
@@ -8075,6 +8220,9 @@ msgstr "حالت چرخش"
 msgid "Scale Mode"
 msgstr "حالت مقیاس"
 
+msgid "Shift: Scale proportionally."
+msgstr "شیفت: مقیاس‌گذاری تناسب‌وار."
+
 msgid "Show list of selectable nodes at position clicked."
 msgstr "نشان دادن فهرستی از گیره‌های قابل انتخاب در موقعیت کلیک شده."
 
@@ -8124,6 +8272,9 @@ msgstr "به‌کارگیری چفت چرخش"
 msgid "Use Scale Snap"
 msgstr "به‌کارگیری چفت مقیاس"
 
+msgid "Snap Relative"
+msgstr "چفتاندن خویشاوند"
+
 msgid "Use Pixel Snap"
 msgstr "به‌کارگیری چفت پیکسلی"
 
@@ -8157,6 +8308,20 @@ msgstr "قفلاندن گرهٔ برگزیده، از گزینش و جابه‌
 msgid "Unlock selected node, allowing selection and movement."
 msgstr "واقفلاندن گرهٔ برگزیده، اجازهٔ گزینش و جابه‌جایی می‌دهد."
 
+msgid ""
+"Groups the selected node with its children. This causes the parent to be "
+"selected when any child node is clicked in 2D and 3D view."
+msgstr ""
+"گرهٔ برگزیده را با فرزندانش گروه‌بندی می‌کند. این باعث می‌شود که والد زمانی که هر "
+"گرهٔ فرزند در نمای دوبعدی و سه‌بعدی کلیک شود، برگزیده شود."
+
+msgid ""
+"Ungroups the selected node from its children. Child nodes will be individual "
+"items in 2D and 3D view."
+msgstr ""
+"گرهٔ برگزیده را از فرزندانش گروه‌زدایی می‌کند. گره‌های فرزند به‌عنوان موردهای "
+"جداگانه در نمای دوبعدی و سه‌بعدی نمایش داده خواهند شد."
+
 msgid "Skeleton Options"
 msgstr "گزینه‌های اسکلت"
 
@@ -8241,6 +8406,16 @@ msgstr "جایگذاری کلیدها (بر پایه ماسک)."
 msgid "Insert Key"
 msgstr "درج کلید"
 
+msgid ""
+"Auto insert keys when objects are translated, rotated or scaled (based on "
+"mask).\n"
+"Keys are only added to existing tracks, no new tracks will be created.\n"
+"Keys must be inserted manually for the first time."
+msgstr ""
+"درج خودکار کلیدها هنگام جابه‌جایی، چرخش یا مقیاس‌دهی اشیا (بر اساس ماسک).\n"
+"کلیدها تنها به مسیرهای موجود اضافه می‌شوند و مسیر جدیدی ایجاد نخواهد شد.\n"
+"برای اولین بار باید کلیدها به صورت دستی درج شوند."
+
 msgid "Auto Insert Key"
 msgstr "جایگذاری خودکار کلید"
 
@@ -8263,7 +8438,7 @@ msgid "Divide grid step by 2"
 msgstr "نیم کردن گام توری"
 
 msgid "Adding %s..."
-msgstr "در حال اضافه کردن %s..."
+msgstr "در حال افزودن %s..."
 
 msgid "Error instantiating scene from %s."
 msgstr "خطا در نمونه‌سازی صحنه از %s."
@@ -8274,6 +8449,9 @@ msgstr "ساخت گره"
 msgid "Can't instantiate multiple nodes without root."
 msgstr "نمی‌توان چندین گره را بی‌ریشه نمونه‌سازی کرد."
 
+msgid "Circular dependency found at %s."
+msgstr "وابستگی دایره‌ای در %s یافت شد."
+
 msgid "Can't instantiate: %s"
 msgstr "نمی‌توان نمونه‌ساخت: %s"
 
@@ -8307,12 +8485,22 @@ msgstr ""
 msgid "Change Default Type"
 msgstr "دگرش گونهٔ پیش‌فرض"
 
+msgid ""
+"All selected CanvasItems are either invisible or locked in some way and can't "
+"be transformed."
+msgstr ""
+"همهٔ CanvasItemsهای برگزیده یا ناپدید هستند یا به گونه‌ای قفلیده شده و "
+"نمی‌توانند ترادیسیده شوند."
+
 msgid "Set Target Position"
 msgstr "نشاندن نهشت هدف"
 
 msgid "Set Handle"
 msgstr "نشاندن هَندِل"
 
+msgid "This node doesn't have a control parent."
+msgstr "این گره والد کنترلی ندارد."
+
 msgid ""
 "Use the appropriate layout properties depending on where you are going to put "
 "it."
@@ -8332,6 +8520,12 @@ msgstr "این گره فرزند یک کنترل معمولی است."
 msgid "Use anchors and the rectangle for positioning."
 msgstr "لنگر‌ها و مستطیل را برای جایگذاری بکار ببرید."
 
+msgid "Collapse positioning hint."
+msgstr "موقعیت‌یابی اشاره (hint) را ببندید."
+
+msgid "Expand positioning hint."
+msgstr "موقعیت‌یابی اشاره (hint) را بگسترانید."
+
 msgid "Container Default"
 msgstr "پیش‌فرض گنجایه"
 
@@ -8362,6 +8556,9 @@ msgstr "مرکز بالا"
 msgid "Top Right"
 msgstr "راست بالا"
 
+msgid "Top Wide"
+msgstr "پهن بالا"
+
 msgid "Center Left"
 msgstr "مرکز چپ"
 
@@ -8371,6 +8568,9 @@ msgstr "مرکز"
 msgid "Center Right"
 msgstr "مرکز راست"
 
+msgid "HCenter Wide"
+msgstr "پهن مرکز افقی"
+
 msgid "Bottom Left"
 msgstr "چپ پایین"
 
@@ -8380,15 +8580,52 @@ msgstr "مرکز پایین"
 msgid "Bottom Right"
 msgstr "راست پایین"
 
+msgid "Bottom Wide"
+msgstr "پهن پایین"
+
+msgid "VCenter Wide"
+msgstr "پهن مرکز عمودی"
+
+msgid "Full Rect"
+msgstr "مستطیل کامل"
+
+msgid ""
+"Enable to also set the Expand flag.\n"
+"Disable to only set Shrink/Fill flags."
+msgstr ""
+"فعال کردن این گزینه باعث تنظیم نشانگر گسترش نیز می‌شود.\n"
+"غیرفعال کردن آن تنها نشانگرهای کوچک‌سازی/پر کردن را تنظیم می‌کند."
+
+msgid "Some parents of the selected nodes do not support the Expand flag."
+msgstr "برخی از والدهای گره‌های برگزیده از پرچم گسترش پشتیبانی نمی‌کنند."
+
+msgid "Change Anchors, Offsets, Grow Direction"
+msgstr "تغییر لنگرها، آفست‌ها، جهت رشد"
+
 msgid "Change Anchors, Offsets (Keep Ratio)"
 msgstr "دگرش لنگرها، بازه از مبداها (نگهداشتن نسبت)"
 
+msgid "Presets for the anchor and offset values of a Control node."
+msgstr "پیش‌نشانده‌ها برای ارزش‌های لنگر و آفست یک گرهٔ کنترل."
+
 msgid "Anchor preset"
 msgstr "پیش‌نشاندهٔ لنگر"
 
 msgid "Set to Current Ratio"
 msgstr "نشاندن نسبت کنونی"
 
+msgid "Adjust anchors and offsets to match the current rect size."
+msgstr ""
+"لنگرها و آفست‌ها را به‌گونه‌ای تنظیم کنید که با اندازهٔ مستطیل کنونی مطابقت داشته "
+"باشند."
+
+msgid ""
+"When active, moving Control nodes changes their anchors instead of their "
+"offsets."
+msgstr ""
+"هنگامی که فعال باشد، جابه‌جایی گره‌های کنترل، به‌جای آفست‌هایشان لنگرهای آن‌ها را "
+"تغییر می‌دهد."
+
 msgid "Sizing settings for children of a Container node."
 msgstr "تنظیمات اندازه‌بندی برای فرزندان یک گرهٔ گنجایه."
 
@@ -8402,7 +8639,7 @@ msgid "Load Curve Preset"
 msgstr "بارگیری منحنی ذخیره‌شده"
 
 msgid "Add Curve Point"
-msgstr "اضافه کردن نقطه منحنی"
+msgstr "افزودن نقطهٔ کمانه"
 
 msgid "Remove Curve Point"
 msgstr "برچیدن نقطهٔ کمانه"
@@ -8410,6 +8647,18 @@ msgstr "برچیدن نقطهٔ کمانه"
 msgid "Modify Curve Point"
 msgstr "ویرایش نقطهٔ منحنی"
 
+msgid "Toggle Linear Curve Point's Tangent"
+msgstr "روشن/خاموش کردن مماس نقطهٔ کمانهٔ خطی"
+
+msgid "Hold Shift to edit tangents individually"
+msgstr "برای جداگانه ویراستن مماس‌ها شیفت را نگه دارید"
+
+msgid "Ease In"
+msgstr "ورود تدریجی"
+
+msgid "Ease Out"
+msgstr "خروج تدریجی"
+
 msgid "Smoothstep"
 msgstr "گام نرم"
 
@@ -8425,27 +8674,110 @@ msgstr "روشن/خاموش کردن پهنهٔ پایینی اشکال‌زدا
 msgid "Deploy with Remote Debug"
 msgstr "به‌کارگیری با اشکال‌زدایی از راه دور"
 
+msgid ""
+"When this option is enabled, using one-click deploy will make the executable "
+"attempt to connect to this computer's IP so the running project can be "
+"debugged.\n"
+"This option is intended to be used for remote debugging (typically with a "
+"mobile device).\n"
+"You don't need to enable it to use the GDScript debugger locally."
+msgstr ""
+"با فعال کردن این گزینه، هنگام استفاده از استقرار تک‌کلیکی، فایل اجرایی تلاش "
+"می‌کند به آدرس IP این رایانه متصل شود تا پروژه در حال اجرا اشکال‌زدایی شود.\n"
+"این گزینه برای اشکال‌زدایی از راه دور (معمولاً با یک دستگاه موبایل) در نظر "
+"گرفته شده است.\n"
+"برای استفاده از اشکال‌زدا‌ی جی‌دی‌اسکریپت به‌صورت محلی، نیازی به فعال کردن آن نیست."
+
+msgid "Small Deploy with Network Filesystem"
+msgstr "پیاده‌سازی کوچک با سامانهٔ پروندهٔ شبکه"
+
+msgid ""
+"When this option is enabled, using one-click deploy for Android will only "
+"export an executable without the project data.\n"
+"The filesystem will be provided from the project by the editor over the "
+"network.\n"
+"On Android, deploying will use the USB cable for faster performance. This "
+"option speeds up testing for projects with large assets."
+msgstr ""
+"هنگامی که این گزینه فعال باشد، استفاده از انتشار یک‌کلیک برای اندروید فقط یک "
+"فایل اجرایی بدون داده‌های پروژه صادر خواهد کرد.\n"
+"سیستم‌فایل از طریق ویرایشگر از پروژه بر روی شبکه فراهم می‌شود.\n"
+"در اندروید، انتشار از کابل USB برای عملکرد سریع‌تر استفاده خواهد کرد. این "
+"گزینه زمان تست برای پروژه‌هایی با دارایی‌های بزرگ را تسریع می‌کند."
+
 msgid "Visible Collision Shapes"
 msgstr "شکل‌های پدیدار برخوردگاه"
 
+msgid ""
+"When this option is enabled, collision shapes and raycast nodes (for 2D and "
+"3D) will be visible in the running project."
+msgstr ""
+"هنگامی که این گزینه فعال باشد، شکل‌های برخورد و گره‌های پرتوپراکنی (برای دوبعدی "
+"و سه‌بعدی) در پروژهٔ در حال اجرا پدیدار خواهند بود."
+
 msgid "Visible Paths"
 msgstr "مسیر‌های پدیدار"
 
+msgid ""
+"When this option is enabled, curve resources used by path nodes will be "
+"visible in the running project."
+msgstr ""
+"هنگامی که این گزینه فعال باشد، بنمایه‌های کمانهٔ به‌کارگرفته‌شده توسط گره‌های مسیر "
+"در پروژهٔ در حال اجرا پدیدار خواهند بود."
+
 msgid "Visible Navigation"
 msgstr "ناوبری پدیدار"
 
 msgid "Visible Avoidance"
 msgstr "پرهیز پدیدار"
 
+msgid ""
+"When this option is enabled, redraw requests of 2D objects will become "
+"visible (as a short flash) in the running project.\n"
+"This is useful to troubleshoot low processor mode."
+msgstr ""
+"هنگامی که این گزینه فعال باشد، درخواست‌های بازنقاشی اشیاء ۲‌بعدی به صورت یک "
+"چشمک کوتاه در پروژه در حال اجرا قابل مشاهده خواهند بود.\n"
+"این گزینه برای اشکال‌زدایی در حالت پردازنده کم مصرف مفید است."
+
 msgid "Synchronize Scene Changes"
 msgstr "همگام‌سازی دگرش‌های صحنه"
 
+msgid ""
+"When this option is enabled, any changes made to the scene in the editor will "
+"be replicated in the running project.\n"
+"When used remotely on a device, this is more efficient when the network "
+"filesystem option is enabled."
+msgstr ""
+"هنگامی که این گزینه فعال باشد، هر تغییری که در صحنه در ویرایشگر انجام شود، در "
+"پروژه در حال اجرا کپی خواهد شد.\n"
+"هنگامی که از راه دور بر روی دستگاه استفاده می‌شود، این روش زمانی که گزینه "
+"سیستم‌فایل شبکه فعال باشد، کارآمدتر است."
+
 msgid "Synchronize Script Changes"
 msgstr "همگام سازی تغییرات اسکریپت"
 
+msgid ""
+"When this option is enabled, any script that is saved will be reloaded in the "
+"running project.\n"
+"When used remotely on a device, this is more efficient when the network "
+"filesystem option is enabled."
+msgstr ""
+"هنگامی که این گزینه فعال باشد، هر اسکریپتی که ذخیره شود، در پروژه در حال اجرا "
+"مجدداً بارگذاری خواهد شد.\n"
+"هنگامی که از راه دور بر روی دستگاه استفاده می‌شود، این روش زمانی که گزینه "
+"سیستم‌فایل شبکه فعال باشد، کارآمدتر است."
+
 msgid "Keep Debug Server Open"
 msgstr "باز نگه داشتن سرور اشکال زدایی"
 
+msgid ""
+"When this option is enabled, the editor debug server will stay open and "
+"listen for new sessions started outside of the editor itself."
+msgstr ""
+"هنگامی که این گزینه فعال باشد، سرور اشکال‌زدایی ویراستار گشوده خواهد ماند و "
+"منتظر نشست‌های نویی که بیرون از خود ویراستار آغاز شده باشند می‌ماند."
+
 msgid "Customize Run Instances..."
 msgstr "سفارشی‌سازی نمونه‌های اجرا..."
 
@@ -8465,6 +8797,13 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr "ویرایش افزایه"
 
+msgid ""
+"Recovery mode is enabled. Enabled plugins will not run while this mode is "
+"active."
+msgstr ""
+"حالت بازیابی فعال است. افزایه‌های فعال هنگام فعال بودن این حالت اجرا نخواهند "
+"شد."
+
 msgid "Installed Plugins:"
 msgstr "افزایه‌های نصب‌شده:"
 
@@ -8517,6 +8856,9 @@ msgstr "افزودن ویژگی‌"
 msgid "East Asian Language"
 msgstr "زبان آسیای شرقی"
 
+msgid "East Asian Widths"
+msgstr "عرض‌های شرق‌آسیایی"
+
 msgid "Numeral Alignment"
 msgstr "تراز شماره‌ای"
 
@@ -8559,15 +8901,67 @@ msgstr ""
 "سرور نمایشگر می‌تواند در تنظیمات ویراستار (نمایش > سرور نمایشگر > دِرایوِر) "
 "دگرگون شود."
 
+msgid ""
+"Game embedding not available when the game starts minimized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"قرار دادن بازی در داخل صفحه هنگام شروع بازی به حالت کوچک‌شده در دسترس نیست.\n"
+"در نظر بگیرید که تنظیمات حالت پنجره پروژه را با برچسب ویژگی ویرایشگر به حالت "
+"پنجره‌ای تغییر دهید تا از قرار دادن بازی در داخل صفحه استفاده کرده و پروژه "
+"صادر شده دست نخورده باقی بماند."
+
+msgid ""
+"Game embedding not available when the game starts maximized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"گنجاندن بازی در دسترس نیست زمانی که بازی در حالت بزرگ‌شده شروع می‌شود.\n"
+"در نظر داشته باشید که با استفاده از برچسب ویژگی ویرایشگر، تنظیم حالت پنجره‌ای "
+"پروژه را برای استفاده از گنجاندن بازی، در حالی که پروژه خروجی بدون تغییر باقی "
+"می‌ماند، بازنویسی کنید."
+
+msgid ""
+"Game embedding not available when the game starts in fullscreen.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"گنجاندن بازی در دسترس نیست زمانی که بازی در حالت تمام صفحه شروع می‌شود.\n"
+"در نظر داشته باشید که با استفاده از برچسب ویژگی ویرایشگر، تنظیم حالت پنجره‌ای "
+"پروژه را برای استفاده از گنجاندن بازی، در حالی که پروژه خروجی بدون تغییر باقی "
+"می‌ماند، بازنویسی کنید."
+
 msgid "Game embedding not available in single window mode."
 msgstr "نهادینه‌سازی بازی در حالت تک‌پنجرگی در دسترس نیست."
 
+msgid "Suspend"
+msgstr "تعلیق"
+
 msgid "Next Frame"
 msgstr "فریم بعدی"
 
 msgid "Input"
 msgstr "درونداد"
 
+msgid "Allow game input."
+msgstr "به دروندادهای بازی اجازه می‌دهد."
+
+msgid ""
+"Disable game input and allow to select Node2Ds, Controls, and manipulate the "
+"2D camera."
+msgstr ""
+"درونداد بازی را از کار می‌اندازد و گزینش Node2Dها، Controlها و دستکاری دوربین "
+"دوبعدی را مجاز می‌کند."
+
+msgid ""
+"Disable game input and allow to select Node3Ds and manipulate the 3D camera."
+msgstr ""
+"درونداد بازی را از کار می‌اندازد و گزینش Node3Dها، Controlها و دستکاری دوربین "
+"سه‌بعدی را مجاز می‌کند."
+
 msgid "Toggle Selection Visibility"
 msgstr "روشن/خاموش کردن پدیداری برگزیده"
 
@@ -8610,12 +9004,31 @@ msgstr "اندازهٔ بازی نهادینه‌شده کشش می‌یابد 
 msgid "Embedding Options"
 msgstr "گزینه‌های نهادینه‌سازی"
 
+msgid "Embed Game on Next Play"
+msgstr "نهادینه‌سازی بازی در اجرای بعدی"
+
 msgid "Make Game Workspace Floating on Next Play"
 msgstr "شناورسازی محیط کاری بازی در اجرای بعدی"
 
 msgid "Game Workspace"
 msgstr "محیط کاری بازی"
 
+msgid ""
+"No \"%s\" library found for GDExtension: \"%s\". Possible feature flags for "
+"your platform: %s"
+msgstr ""
+"هیچ کتابخانهٔ «%s» برای جی.دی.اکستنشن: «%s» یافت نشد. پرچم‌های ویژگی احتمالی "
+"برای سکوی شما: %s"
+
+msgid "Multiple \"%s\" libraries found for GDExtension: \"%s\": \"%s\"."
+msgstr "چندین کتابخانهٔ «%s» برای جی.دی.اکستنشن: «%s» یافت شد: «%s»."
+
+msgid "Change AudioStreamPlayer3D Emission Angle"
+msgstr "تغییر زاویهٔ گسیل AudioStreamPlayer3D"
+
+msgid "Change Camera FOV"
+msgstr "تغییر میدان دید دوربین"
+
 msgid "Change Camera Size"
 msgstr "تغییر اندازه دوربین"
 
@@ -8658,6 +9071,9 @@ msgstr "دگرش نهشت پایانی"
 msgid "Change Probe Size"
 msgstr "دگرش اندازهٔ کاوَند"
 
+msgid "Change Notifier AABB"
+msgstr "تغییر اِی.اِی.بی.بی خبردهنده"
+
 msgid "Low"
 msgstr "پایین"
 
@@ -8676,6 +9092,15 @@ msgstr "اندازه ویدئو رم: %s مگابایت ( %s)"
 msgid "Bake SDF"
 msgstr "پخت SDF"
 
+msgid ""
+"No faces detected during GPUParticlesCollisionSDF3D bake.\n"
+"Check whether there are visible meshes matching the bake mask within its "
+"extents."
+msgstr ""
+"هیچ سطحی در هنگام پخت GPUParticlesCollisionSDF3D شناسایی نشد.\n"
+"بررسی کنید که آیا مش‌های قابل مشاهده‌ای که با ماسک پخت مطابقت دارند، در داخل "
+"ابعاد آن وجود دارند یا خیر."
+
 msgid "Select path for SDF Texture"
 msgstr "گزینش مسیر برای بافت اس.دی.اف"
 
@@ -8688,17 +9113,120 @@ msgstr "برچیدن نقطهٔ گرادیان"
 msgid "Move Gradient Point"
 msgstr "جابه‌جایی نقطهٔ گرادیان"
 
+msgid "Reverse Gradient"
+msgstr "معکوس کردن گرادیان"
+
+msgid "Reverse/Mirror Gradient"
+msgstr "گرادیان معکوس/آینه‌ای"
+
+msgid "Move GradientTexture2D Fill Point"
+msgstr "جابه‌جایی نقطه پر کردن GradientTexture2D"
+
+msgid "Swap GradientTexture2D Fill Points"
+msgstr "تعویض نقاط پر کردن GradientTexture2D"
+
+msgid "Swap Gradient Fill Points"
+msgstr "تعویض نقاط پر کردن گرادیان"
+
 msgid "Configure"
 msgstr "تنظیم کردن"
 
 msgid "Create Occluder Polygon"
 msgstr "ساخت چندضلعی بندآور"
 
+msgid ""
+"No meshes with lightmapping support to bake. Make sure they contain UV2 data "
+"and their Global Illumination property is set to Static."
+msgstr ""
+"هیچ مشی با پشتیبانی از نورنگاشت برای پخت وجود ندارد. اطمینان حاصل کنید که "
+"داده‌های UV2 در آن‌ها موجود است و ویژگی روشنایی جهانی آن‌ها روی استاتیک تنظیم "
+"شده است."
+
+msgid ""
+"To import a scene with lightmapping support, set Meshes > Light Baking to "
+"Static Lightmaps in the Import dock."
+msgstr ""
+"برای وارد کردن یک صحنه با پشتیبانی از نقشه‌برداری نور، در داک واردات، گزینه‌ی "
+"Meshes > Light Baking را روی Static Lightmaps تنظیم کنید."
+
+msgid ""
+"To enable lightmapping support on a primitive mesh, edit the PrimitiveMesh "
+"resource in the inspector and check Add UV2."
+msgstr ""
+"برای فعال‌سازی پشتیبانی از نقشه‌برداری نور در یک مش اولیه، منبع PrimitiveMesh "
+"را در پنجره بازبینی ویرایش کرده و گزینه Add UV2 را تیک بزنید."
+
+msgid ""
+"To enable lightmapping support on a CSG mesh, select the root CSG node and "
+"choose CSG > Bake Mesh Instance at the top of the 3D editor viewport.\n"
+"Select the generated MeshInstance3D node and choose Mesh > Unwrap UV2 for "
+"Lightmap/AO at the top of the 3D editor viewport."
+msgstr ""
+"برای فعال‌سازی پشتیبانی از نقشه‌برداری نور در یک مش CSG، گره ریشه CSG را انتخاب "
+"کرده و گزینه CSG > Bake Mesh Instance را در بالای درگاه ویرایشگر ۳D انتخاب "
+"کنید.\n"
+"سپس گره MeshInstance3D ایجاد شده را انتخاب کرده و گزینه Mesh > Unwrap UV2 for "
+"Lightmap/AO را در بالای درگاه ویرایشگر ۳D انتخاب کنید."
+
+msgid ""
+"Failed creating lightmap images. Make sure the lightmap destination path is "
+"writable."
+msgstr ""
+"ساخت تصاویر نورنگاشت ناموفق بود. اطمینان حاصل کنید که مسیر مقصد نورنگاشت قابل "
+"نوشتن است."
+
 msgid "No editor scene root found."
 msgstr "ریشهٔ صحنهٔ هیچ ویراستاری پیدا نشد."
 
-msgid "Couldn't create a Trimesh collision shape."
-msgstr "ناتوانی در ساخت یک شکل برخوردگاه Trimesh."
+msgid "Lightmap data is not local to the scene."
+msgstr "داده‌های نورنگاشت محلی به صحنه نیستند."
+
+msgid ""
+"Maximum texture size is too small for the lightmap images.\n"
+"While this can be fixed by increasing the maximum texture size, it is "
+"recommended you split the scene into more objects instead."
+msgstr ""
+"اندازه حداکثری بافت برای تصاویر نورنگاشت خیلی کوچک است.\n"
+"اگرچه می‌توانید با افزایش اندازه حداکثری بافت این مشکل را برطرف کنید، اما "
+"توصیه می‌شود که صحنه را به اشیاء بیشتری تقسیم کنید."
+
+msgid ""
+"Failed creating lightmap images. Make sure all meshes to bake have the "
+"Lightmap Size Hint property set high enough, and the LightmapGI's Texel Scale "
+"value is not too low."
+msgstr ""
+"ساخت تصاویر نورنگاشت ناموفق بود. اطمینان حاصل کنید که تمام مش‌هایی که باید "
+"پخته شوند، ویژگی Lightmap Size Hint آن‌ها به اندازه کافی بالا تنظیم شده است و "
+"مقدار Texel Scale در LightmapGI خیلی پایین نیست."
+
+msgid ""
+"Failed fitting a lightmap image into an atlas. This should never happen and "
+"should be reported."
+msgstr ""
+"قرار دادن تصویر نورنگاشت در آتلس ناموفق بود. این نباید هرگز اتفاق بیفتد و "
+"باید گزارش شود."
+
+msgid "Bake Lightmaps"
+msgstr "پخت نورنگاشت‌ها"
+
+msgid "Lightmaps cannot be baked on %s."
+msgstr "نورنگاشت‌ها نمی‌توانند بر روی %s پخته شوند."
+
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time."
+msgstr ""
+"نورنگاشت‌ها قابل پخت نیستند، زیرا ماژول `lightmapper_rd` در زمان کامپایل "
+"غیرفعال شده است."
+
+msgid "LightMap Bake"
+msgstr "پخت نورنگاشت"
+
+msgid "Select lightmap bake file:"
+msgstr "فایل پخت نورنگاشت را انتخاب کنید:"
+
+msgid "Preview is not available for this shader mode."
+msgstr "پیش‌نمایش برای این حالت شیدر در دسترس نیست."
 
 msgid "Couldn't create a single collision shape."
 msgstr "ناتوانی در ساخت یک شکل برخوردگاه تنها."
@@ -8742,18 +9270,39 @@ msgstr ""
 msgid "Unwrap UV2"
 msgstr "بی‌پوشش کردن فرابنفش ۲"
 
+msgid "Contained Mesh is not of type ArrayMesh."
+msgstr "مش موجود از نوع ArrayMesh نیست."
+
 msgid "Can't unwrap mesh with blend shapes."
 msgstr "نمی‌توان مِش دارای شکل‌های درآمیزی را بی‌پوشش کرد."
 
+msgid "Only triangles are supported for lightmap unwrap."
+msgstr "فقط مثلث‌ها برای بازکردن نورنگاشت پشتیبانی می‌شوند."
+
+msgid "Normals are required for lightmap unwrap."
+msgstr "نرمال‌ها برای بازکردن نورنگاشت مورد نیاز هستند."
+
+msgid "UV Unwrap failed, mesh may not be manifold?"
+msgstr "پهنه‌سازی UV شکست خورد، ممکن است مش غیرمنفرد باشد؟"
+
 msgid "No mesh to debug."
 msgstr "مشی برای اشکال‌زدایی نیست."
 
+msgid "Mesh has no UV in layer %d."
+msgstr "مش هیچ UV‌ای در لایه %d ندارد."
+
 msgid "Create Navigation Mesh"
 msgstr "ساخت مش ناوبری"
 
+msgid "MeshInstance3D lacks a Mesh."
+msgstr "مش MeshInstance3D فاقد یک مش است."
+
 msgid "Mesh has no surface to create outlines from."
 msgstr "مش هیچ سطحی برای ساخت پیراخط از آن ندارد."
 
+msgid "Mesh primitive type is not PRIMITIVE_TRIANGLES."
+msgstr "نوع هندسی مش برابر با PRIMITIVE_TRIANGLES نیست."
+
 msgid "Could not create outline."
 msgstr "ناتوانی در ساخت پیراخط."
 
@@ -8803,12 +9352,75 @@ msgstr "هم‌نیا"
 msgid "Creates collision shapes as Sibling."
 msgstr "شکل برخوردگاه‌ها را به‌عنوان هم‌نیا می‌سازد."
 
+msgid "Static Body Child"
+msgstr "فرزند جسم ایستا"
+
+msgid "Creates a StaticBody3D as child and assigns collision shapes to it."
+msgstr ""
+"یک StaticBody3D به عنوان فرزند ایجاد می‌کند و اشکال برخورد را به آن اختصاص "
+"می‌دهد."
+
 msgid "Collision Shape Type"
 msgstr "گونهٔ شکل برخوردگاه"
 
+msgid ""
+"Creates a polygon-based collision shape.\n"
+"This is the most accurate (but slowest) option for collision detection."
+msgstr ""
+"یک شکل برخورد مبتنی بر چندضلعی ایجاد می‌کند.\n"
+"این دقیق‌ترین (اما کندترین) گزینه برای شناسایی برخورد است."
+
+msgid ""
+"Creates a single convex collision shape.\n"
+"This is the fastest (but least accurate) option for collision detection."
+msgstr ""
+"یک شکل برخورد محدب واحد ایجاد می‌کند.\n"
+"این سریع‌ترین (اما کم‌دقت‌ترین) گزینه برای شناسایی برخورد است."
+
+msgid ""
+"Creates a simplified convex collision shape.\n"
+"This is similar to single collision shape, but can result in a simpler "
+"geometry in some cases, at the cost of accuracy."
+msgstr ""
+"یک شکل برخورد محدب ساده‌شده ایجاد می‌کند.\n"
+"این مشابه شکل برخورد واحد است، اما در برخی موارد می‌تواند هندسه ساده‌تری ایجاد "
+"کند، به قیمت دقت کمتر."
+
+msgid ""
+"Creates a polygon-based collision shape.\n"
+"This is a performance middle-ground between a single convex collision and a "
+"polygon-based collision."
+msgstr ""
+"یک شکل برخورد مبتنی بر چندضلعی ایجاد می‌کند.\n"
+"این یک تعادل عملکردی میان شکل برخورد محدب واحد و شکل برخورد مبتنی بر چندضلعی "
+"است."
+
+msgid "UV Channel Debug"
+msgstr "اشکال‌زدایی کانال UV"
+
 msgid "Create NavigationMesh"
 msgstr "ساخت NavigationMesh"
 
+msgid ""
+"Before converting a rendering mesh to a navigation mesh, please verify:\n"
+"\n"
+"- The mesh is two-dimensional.\n"
+"- The mesh has no surface overlap.\n"
+"- The mesh has no self-intersection.\n"
+"- The mesh surfaces have indices.\n"
+"\n"
+"If the mesh does not fulfill these requirements, the pathfinding will be "
+"broken."
+msgstr ""
+"قبل از تبدیل مش رندر به مش ناوبری، لطفاً موارد زیر را بررسی کنید:\n"
+"\n"
+"- مش دو‌بعدی است.\n"
+"- مش هیچ‌گونه هم‌پوشانی سطحی ندارد.\n"
+"- مش هیچ‌گونه برخورد خودی ندارد.\n"
+"- سطوح مش دارای اندیس هستند.\n"
+"\n"
+"اگر مش این الزامات را برآورده نکند، مسیر‌یابی خراب خواهد شد."
+
 msgid "Remove item %d?"
 msgstr "برچیدن %d مورد؟"
 
@@ -8840,9 +9452,42 @@ msgstr "بکاربستن بدون ترادیسی"
 msgid "Apply with Transforms"
 msgstr "بکاربستن با ترادیسی"
 
+msgid "No mesh source specified (and no MultiMesh set in node)."
+msgstr "منبع مش مشخص نشده است (و هیچ MultiMesh در گره تنظیم نشده است)."
+
+msgid "No mesh source specified (and MultiMesh contains no Mesh)."
+msgstr "منبع مش مشخص نشده است (و MultiMesh هیچ مشی ندارد)."
+
+msgid "Mesh source is invalid (invalid path)."
+msgstr "منبع مش نامعتبر است (مسیر نامعتبر)."
+
+msgid "Mesh source is invalid (not a MeshInstance3D)."
+msgstr "منبع مش نامعتبر است (یک MeshInstance3D نیست)."
+
+msgid "Mesh source is invalid (contains no Mesh resource)."
+msgstr "منبع مش نامعتبر است (هیچ منبع مشی ندارد)."
+
+msgid "No surface source specified."
+msgstr "هیچ منبع سطحی مشخص نشده است."
+
+msgid "Surface source is invalid (invalid path)."
+msgstr "منبع سطح نامعتبر است (مسیر نامعتبر)."
+
+msgid "Surface source is invalid (no geometry)."
+msgstr "منبع سطح نامعتبر است (بدون هندسه)."
+
 msgid "Surface source is invalid (no faces)."
 msgstr "سطح منبع باطل است‌ (بدون وجه)."
 
+msgid "Select a Source Mesh:"
+msgstr "یک مش منبع انتخاب کنید:"
+
+msgid "Select a Target Surface:"
+msgstr "یک سطح هدف انتخاب کنید:"
+
+msgid "Populate Surface"
+msgstr "پرکردن سطح"
+
 msgid "Target Surface:"
 msgstr "سطح هدف:"
 
@@ -8858,6 +9503,9 @@ msgstr "محور Y"
 msgid "Z-Axis"
 msgstr "محور Z"
 
+msgid "Mesh Up Axis:"
+msgstr "محور بالا برای مش:"
+
 msgid "Random Rotation:"
 msgstr "چرخش تصادفی:"
 
@@ -8870,12 +9518,18 @@ msgstr "مقیاس تصادفی:"
 msgid "Amount:"
 msgstr "مقدار:"
 
+msgid "Populate"
+msgstr "پرکردن"
+
 msgid "Set start_position"
 msgstr "نشاندن start_position"
 
 msgid "Set end_position"
 msgstr "نشاندن نهشت پایانی"
 
+msgid "Edit Obstacle (Flip Winding)"
+msgstr "ویرایش مانع (معکوس کردن گردش)"
+
 msgid "Add Vertex"
 msgstr "افزودن رأس"
 
@@ -8888,6 +9542,12 @@ msgstr "زدایش رأس"
 msgid "Clear Vertices"
 msgstr "پاک کردن رأس‌ها"
 
+msgid "Edit Obstacle (Add Vertex)"
+msgstr "ویرایش مانع (افزودن راس)"
+
+msgid "Edit Obstacle (Move Vertex)"
+msgstr "ویرایش مانع (جابجایی راس)"
+
 msgid "Please Confirm..."
 msgstr "لطفاً تأیید کنید…"
 
@@ -8900,9 +9560,19 @@ msgstr "ساخت چندضلعی ناوبری"
 msgid "Bake NavigationPolygon"
 msgstr "پخت NavigationPolygon"
 
+msgid ""
+"Bakes the NavigationPolygon by first parsing the scene for source geometry "
+"and then creating the navigation polygon vertices and polygons."
+msgstr ""
+"نورنگاشت NavigationPolygon را ابتدا با تجزیه صحنه برای هندسه منبع و سپس ایجاد "
+"رئوس و پلی‌گون‌های ناوبری می‌پزد."
+
 msgid "Clear NavigationPolygon"
 msgstr "پاک‌کردن NavigationPolygon"
 
+msgid "Clears the internal NavigationPolygon outlines, vertices and polygons."
+msgstr "حاشیه‌ها، رئوس و چندضلعی‌های داخلی NavigationPolygon را پاک می‌کند."
+
 msgid ""
 "A NavigationPolygon resource must be set or created for this node to work."
 msgstr ""
@@ -8917,6 +9587,21 @@ msgstr "قائم"
 msgid "Perspective"
 msgstr "دیدانداز"
 
+msgid "Top Orthogonal"
+msgstr "قائم بالا"
+
+msgid "Bottom Orthogonal"
+msgstr "قائم از پایین"
+
+msgid "Left Orthogonal"
+msgstr "قائم از چپ"
+
+msgid "Front Orthogonal"
+msgstr "قائم جلو"
+
+msgid "Rear Orthogonal"
+msgstr "قائم عقب"
+
 msgid "[auto]"
 msgstr "[خودکار]"
 
@@ -9007,6 +9692,9 @@ msgstr "در حال ترجمهٔ %s."
 msgid "Rotating %f degrees."
 msgstr "%f درجه چرخاندن."
 
+msgid "Auto Orthogonal Enabled"
+msgstr "قائم خودکار فعال شده است"
+
 msgid "Shadow Atlas"
 msgstr "اطلس سایه"
 
@@ -9050,7 +9738,7 @@ msgid "View Frame Time"
 msgstr "مشاهده زمان فریم"
 
 msgid "Audio Listener"
-msgstr "شونده صوتی"
+msgstr "شنوندهٔ صوت"
 
 msgid "Cinematic Preview"
 msgstr "پیش‌نمایش سینمایی"
@@ -9058,6 +9746,21 @@ msgstr "پیش‌نمایش سینمایی"
 msgid "Not available when using the OpenGL renderer."
 msgstr "هنگام به‌کارگیری نماپرداز OpenGL در دسترس نیست."
 
+msgid "Freelook Left"
+msgstr "آزادنگری چپ"
+
+msgid "Freelook Right"
+msgstr "آزادنگری راست"
+
+msgid "Freelook Forward"
+msgstr "آزادنگری جلو"
+
+msgid "Freelook Up"
+msgstr "آزادنگری بالا"
+
+msgid "Freelook Speed Modifier"
+msgstr "اصلاح‌کنندهٔ تندی آزادنگری"
+
 msgid "Lock Transformation to X axis"
 msgstr "قفلیدن ترادیسی به محور X"
 
@@ -9067,27 +9770,91 @@ msgstr "قفلیدن ترادیسی به محور Y"
 msgid "Lock Transformation to Z axis"
 msgstr "قفلیدن ترادیسی به محور Z"
 
+msgid "Lock Transformation to YZ plane"
+msgstr "قفل کردن ترادیسی روی صفحه YZ"
+
+msgid "Lock Transformation to XZ plane"
+msgstr "قفل کردن ترادیسی روی صفحه XZ"
+
+msgid "Lock Transformation to XY plane"
+msgstr "قفل کردن ترادیسی روی صفحه XY"
+
+msgid "Begin Translate Transformation"
+msgstr "آغاز ترادیسی انتقال"
+
 msgid "Begin Scale Transformation"
 msgstr "آغاز ترادیسی مقیاس"
 
+msgid "Reposition Using Collisions"
+msgstr "تغییر نهشت با به‌کارگیری برخوردگاه‌ها"
+
+msgid "Toggle Camera Preview"
+msgstr "روشن/خاموش کردن پیش‌نمایش دوربین"
+
+msgid ""
+"To zoom further, change the camera's clipping planes (View -> Settings...)"
+msgstr ""
+"برای بزرگ‌نمایی بیشتر، صفحه‌های برش دوربین را تغییر دهید (نمایش -> تنظیمات...)"
+
 msgid "Overriding material..."
 msgstr "در حال بازنویسی جنس..."
 
+msgid ""
+"Click to toggle between visibility states.\n"
+"\n"
+"Open eye: Gizmo is visible.\n"
+"Closed eye: Gizmo is hidden.\n"
+"Half-open eye: Gizmo is also visible through opaque surfaces (\"x-ray\")."
+msgstr ""
+"برای تغییر وضعیت‌های دید، کلیک کن\n"
+"\n"
+"چشم باز: گیزمو قابل مشاهده است.\n"
+"چشم بسته: گیزمو پنهان است.\n"
+"چشم نیمه‌باز: گیزمو از طریق سطوح کدر نیز قابل مشاهده است («اشعه ایکس»)."
+
 msgid "Snap Nodes to Floor"
 msgstr "چفتاندن گره‌ها به زمین"
 
+msgid "Couldn't find a solid floor to snap the selection to."
+msgstr "کف محکم برای چفتاندن برگزیده یافت نشد."
+
 msgid "Add Preview Sun to Scene"
 msgstr "افزودن خورشید پیش‌نمایش به صحنه"
 
 msgid "Add Preview Environment to Scene"
 msgstr "افزودن محیط پیش‌نمایش به صحنه"
 
+msgid ""
+"Scene contains\n"
+"DirectionalLight3D.\n"
+"Preview disabled."
+msgstr ""
+"صحنه شامل\n"
+"DirectionalLight3D است.\n"
+"پیش‌نمایش غیرفعال است."
+
 msgid "Preview disabled."
 msgstr "پیش‌نمایش غیرفعال شد."
 
+msgid ""
+"Scene contains\n"
+"WorldEnvironment.\n"
+"Preview disabled."
+msgstr ""
+"صحنه شامل\n"
+"WorldEnvironment است.\n"
+"پیش‌نمایش غیرفعال است."
+
 msgid "Drag: Use snap."
 msgstr "کشاندن: به‌کارگیری چفت."
 
+msgid ""
+"Groups the selected node with its children. This selects the parent when any "
+"child node is clicked in 2D and 3D view."
+msgstr ""
+"گرهٔ برگزیده را با فرزندانش گروه‌بندی می‌کند. این باعث می‌شود که والد زمانی که هر "
+"گرهٔ فرزند در نمای دوبعدی و سه‌بعدی کلیک شود، برگزیده شود."
+
 msgid "LMB+Drag: Measure the distance between two points in 3D space."
 msgstr "راست‌کلیک+کشاندن: اندازه‌گیری فاصلهٔ میان دو نقطه در فضای سه‌بعدی."
 
@@ -9097,6 +9864,24 @@ msgstr "استفاده از فضای محلی"
 msgid "Use Snap"
 msgstr "به‌کارگیری چفت"
 
+msgid ""
+"Toggle preview sunlight.\n"
+"If a DirectionalLight3D node is added to the scene, preview sunlight is "
+"disabled."
+msgstr ""
+"پیش‌نمایش نور خورشید را تغییر دهید.\n"
+"اگر یک گره DirectionalLight3D به صحنه اضافه شود، پیش‌نمایش نور خورشید غیرفعال "
+"می‌شود."
+
+msgid ""
+"Toggle preview environment.\n"
+"If a WorldEnvironment node is added to the scene, preview environment is "
+"disabled."
+msgstr ""
+"پیش‌نمایش نور خورشید را تغییر دهید.\n"
+"اگر یک گره DirectionalLight3D به صحنه اضافه شود، پیش‌نمایش نور خورشید غیرفعال "
+"می‌شود."
+
 msgid "Edit Sun and Environment settings."
 msgstr "ویرایش تنظیمات خورشید و محیط."
 
@@ -9118,9 +9903,30 @@ msgstr "نمای چپ"
 msgid "Right View"
 msgstr "نمای راست"
 
+msgid "Orbit View Down"
+msgstr "نمای مدار به پایین"
+
+msgid "Orbit View Left"
+msgstr "نمای مدار به چپ"
+
+msgid "Orbit View Right"
+msgstr "نمای مدار به راست"
+
+msgid "Orbit View Up"
+msgstr "نمای مدار به بالا"
+
+msgid "Orbit View 180"
+msgstr "نمای ۱۸۰ درجهٔ مدار"
+
 msgid "Insert Animation Key"
 msgstr "جایگذاری کلید پویانمایی"
 
+msgid "Focus Origin"
+msgstr "مبدا تمرکز"
+
+msgid "Focus Selection"
+msgstr "تمرکز روی برگزیده"
+
 msgid "Toggle Freelook"
 msgstr "دید آزاد"
 
@@ -9133,6 +9939,9 @@ msgstr "افزایش میدان دید"
 msgid "Transform"
 msgstr "ترادیسی(transform)"
 
+msgid "Snap Object to Floor"
+msgstr "چفتاندن شیء به زمین"
+
 msgid "1 Viewport"
 msgstr "۱ دیدگستره"
 
@@ -9161,17 +9970,24 @@ msgid "Snap Settings"
 msgstr "تنظیمات چفت"
 
 msgid "Translate Snap:"
-msgstr "ترجمهٔ چفت:"
+msgstr "انتقال چفت:"
 
 msgid "Rotate Snap (deg.):"
 msgstr "چرخش چفت (به درجه):"
 
 msgid "Scale Snap (%):"
-msgstr "چفتاندن مقیاس (%):"
+msgstr "مقیاس چفت (%):"
 
 msgid "Viewport Settings"
 msgstr "تنظیمات دیدگستره(viewport)"
 
+msgid ""
+"FOV is defined as a vertical value, as the editor camera always uses the Keep "
+"Height aspect mode."
+msgstr ""
+"میدان دید به‌عنوان ارزشی عمودی تعریف شده است، زیرا دوربین ویراستار همیشه حالت "
+"نگهداری نمای ارتفاع را به کار می‌برد."
+
 msgid "View Z-Near:"
 msgstr "دیدن Z نزدیک:"
 
@@ -9214,6 +10030,16 @@ msgstr "انرژی خورشید"
 msgid "Add Sun to Scene"
 msgstr "افزودن خورشید به صحنه"
 
+msgid ""
+"Adds a DirectionalLight3D node matching the preview sun settings to the "
+"current scene.\n"
+"Hold Shift while clicking to also add the preview environment to the current "
+"scene."
+msgstr ""
+"یک گره DirectionalLight3D مطابق با تنظیمات پیش‌نمایش خورشید به صحنه کنونی "
+"می‌افزاید.\n"
+"هنگام کلیک، شیفت را نگه دارید تا محیط پیش‌نمایش نیز به صحنه کنونی افزوده شود."
+
 msgid "Preview Environment"
 msgstr "محیط پیش‌نمایش"
 
@@ -9241,6 +10067,31 @@ msgstr "پساپردازش"
 msgid "Add Environment to Scene"
 msgstr "افزودن محیط به صحنه"
 
+msgid ""
+"Adds a WorldEnvironment node matching the preview environment settings to the "
+"current scene.\n"
+"Hold Shift while clicking to also add the preview sun to the current scene."
+msgstr ""
+"یک گره WorldEnvironment مطابق با تنظیمات محیط پیش‌نمایش به صحنه کنونی "
+"می‌افزاید.\n"
+"هنگام کلیک، شیفت را نگه دارید تا خورشید پیش‌نمایش نیز به صحنه کنونی افزوده شود."
+
+msgid ""
+"Can't determine a save path for the occluder.\n"
+"Save your scene and try again."
+msgstr ""
+"مسیر ذخیره‌ای برای مسدودکننده قابل تعیین نیست.\n"
+"صحنه خود را ذخیره کرده و دوباره تلاش کنید."
+
+msgid ""
+"No meshes to bake.\n"
+"Make sure there is at least one MeshInstance3D node in the scene whose visual "
+"layers are part of the OccluderInstance3D's Bake Mask property."
+msgstr ""
+"هیچ مشی برای پخت وجود ندارد.\n"
+"مطمئن شوید که حداقل یک گره MeshInstance3D در صحنه باشد که لایه‌های دیداری آن "
+"جزئی از ویژگی Bake Mask در OccluderInstance3D باشد."
+
 msgid "Bake Occluders"
 msgstr "پخت بندآورها"
 
@@ -9253,6 +10104,12 @@ msgstr "تبدیل به Parallax2D"
 msgid "ParallaxBackground"
 msgstr "ParallaxBackground"
 
+msgid "Hold Shift to scale around midpoint instead of moving."
+msgstr "برای مقیاس‌گذاری پیرامون نقطهٔ میانی به‌جای جابه‌جایی شیفت را نگه دارید."
+
+msgid "Toggle between minimum/maximum and base value/spread modes."
+msgstr "تغییر بین حالت‌های حداقل/حداکثر و مقدار پایه/پراکنده."
+
 msgid "Restart Emission"
 msgstr "راه‌اندازی دوبارهٔ برون‌پاشی"
 
@@ -9268,15 +10125,24 @@ msgstr "پیکسل‌های جامد"
 msgid "Border Pixels"
 msgstr "پیکسل‌های مرزی"
 
+msgid "Directed Border Pixels"
+msgstr "پیکسل‌های مرزی جهت‌دار"
+
 msgid "Emission Mask"
-msgstr "ماسک برون‌پاشی"
+msgstr "ماسک گسیل"
 
 msgid "Centered"
 msgstr "مرکزی‌شده"
 
+msgid "Capture Colors from Pixel"
+msgstr "گرفتن رنگ‌ها از پیکسل"
+
 msgid "Generating Visibility Rect (Waiting for Particle Simulation)"
 msgstr "ایجاد مستطیل دید (در انتظار شبیه‌سازی پارتیکل‌ها)"
 
+msgid "Loading emission mask requires ParticleProcessMaterial."
+msgstr "بار کردن ماسک گسیل به ParticleProcessMaterial نیاز دارد."
+
 msgid "GPUParticles2D"
 msgstr "GPUParticles2D"
 
@@ -9292,15 +10158,27 @@ msgstr "CPUParticles2D"
 msgid "Convert to GPUParticles2D"
 msgstr "تبدیل به GPUParticles2D"
 
+msgid "Generating Visibility AABB (Waiting for Particle Simulation)"
+msgstr "در حال زایش اِی.اِی.بی.بی پدیداری (منتظر شبیه‌سازی ذرات)"
+
+msgid "Generate Visibility AABB"
+msgstr "ایجاد AABB نمایان بودن"
+
 msgid "\"%s\" doesn't inherit from Node3D."
 msgstr "«%s» از گرهٔ سه‌بعدی ارث نمی‌برد."
 
 msgid "\"%s\" doesn't contain geometry."
 msgstr "«%s» دارای هندسه نیست."
 
+msgid "\"%s\" doesn't contain face geometry."
+msgstr "«%s» وجه هندسی ندارد."
+
 msgid "Create Emission Points From Node"
 msgstr "ساخت نقطه‌های برون‌پاشی از گره"
 
+msgid "The geometry's faces don't contain any area."
+msgstr "وجه‌های هندسه هیچ مساحتی ندارند."
+
 msgid "Create Emitter"
 msgstr "ساخت گسیلنده"
 
@@ -9316,6 +10194,9 @@ msgstr "گنجایش"
 msgid "Emission Source:"
 msgstr "سرچشمهٔ برون‌پاشی:"
 
+msgid "A processor material of type 'ParticleProcessMaterial' is required."
+msgstr "یک ماده پردازش‌گر از نوع «ParticleProcessMaterial»مورد نیاز است."
+
 msgid "Create Emission Points"
 msgstr "ساخت نقطه‌های گسیل"
 
@@ -9385,9 +10266,18 @@ msgstr "پاک کردن نقطه‌ها"
 msgid "Remove all curve points?"
 msgstr "برچیدن همهٔ نقطه‌های کمانه؟"
 
+msgid "Mirror Handle Angles"
+msgstr "زاویه‌های دسته آینه‌ای"
+
+msgid "Mirror Handle Lengths"
+msgstr "طول‌های دسته آینه‌ای"
+
 msgid "Create Curve"
 msgstr "ساخت کمانه"
 
+msgid "Handle Tilt #"
+msgstr "شیب دسته شماره"
+
 msgid "Set Curve Point Position"
 msgstr "نشاندن نهشت نقطهٔ کمانه"
 
@@ -9406,6 +10296,9 @@ msgstr "شیفت+کلیک: گزینش چندین نقطه"
 msgid "Shift+Click: Drag out Control Points"
 msgstr "شیفت+کلیک: بیرون کشاندن نقطه‌های کنترل"
 
+msgid "Select Tilt Handles"
+msgstr "دسته‌های شیب را انتخاب کنید"
+
 msgid "Split Segment (in curve)"
 msgstr "شکافتن بخش (در کمانه)"
 
@@ -9418,6 +10311,16 @@ msgstr "نام افزایه نمی‌تواند تهی باشد."
 msgid "Subfolder name is not a valid folder name."
 msgstr "نام زیرپوشه، نام پوشه‌ای معتبر نیست."
 
+msgid "Script extension must match chosen language extension (.%s)."
+msgstr "پسوند اسکریپت باید با پسوند زبان انتخاب‌شده (.%s) مطابقت داشته باشد."
+
+msgid ""
+"C# doesn't support activating the plugin on creation because the project must "
+"be built first."
+msgstr ""
+"زبان سی‌شارپ از فعال‌سازی پلاگین در زمان ایجاد پشتیبانی نمی‌کند زیرا پروژه ابتدا "
+"باید ساخته شود."
+
 msgid "Edit a Plugin"
 msgstr "ویرایش یک افزایه"
 
@@ -9430,15 +10333,62 @@ msgstr "به‌روزرسانی"
 msgid "Plugin Name:"
 msgstr "نام افزایه:"
 
+msgid "Required. This name will be displayed in the list of plugins."
+msgstr "ضروری است. این نام در فهرست پلاگین‌ها نمایش داده خواهد شد."
+
 msgid "Subfolder:"
 msgstr "زیرپوشه:"
 
+msgid ""
+"Optional. The folder name should generally use `snake_case` naming (avoid "
+"spaces and special characters).\n"
+"If left empty, the folder will be named after the plugin name converted to "
+"`snake_case`."
+msgstr ""
+"اختیاری است. نام پوشه به طور کلی باید از نام‌گذاری «snake_case» استفاده کند "
+"(از فضاها و کاراکترهای خاص خودداری کنید).\n"
+"اگر خالی رها شود، نام پوشه به نام پلاگین تبدیل شده به «snake_case» اختصاص "
+"خواهد یافت."
+
+msgid ""
+"Optional. This description should be kept relatively short (up to 5 lines).\n"
+"It will display when hovering the plugin in the list of plugins."
+msgstr ""
+"اختیاری است. این توضیح باید نسبتاً کوتاه باشد (حداکثر ۵ خط).\n"
+"هنگام قرار گرفتن نشانگر روی پلاگین در فهرست پلاگین‌ها نمایش داده می‌شود."
+
 msgid "Author:"
 msgstr "خالق:"
 
+msgid "Optional. The author's username, full name, or organization name."
+msgstr "اختیاری است. نام کاربری، نام کامل نویسنده یا نام سازمان."
+
+msgid ""
+"Optional. A human-readable version identifier used for informational purposes "
+"only."
+msgstr ""
+"اختیاری است. یک شناسه نسخه‌ی خوانا برای انسان که فقط برای اهداف اطلاعاتی "
+"استفاده می‌شود."
+
+msgid ""
+"Required. The scripting language to use for the script.\n"
+"Note that a plugin may use several languages at once by adding more scripts "
+"to the plugin."
+msgstr ""
+"ضروری است. زبان اسکریپت‌نویسی که برای اسکریپت استفاده می‌شود.\n"
+"توجه داشته باشید که یک پلاگین می‌تواند با افزودن اسکریپت‌های بیشتر، از چندین "
+"زبان به طور هم‌زمان استفاده کند."
+
 msgid "Script Name:"
 msgstr "نام اسکریپت:"
 
+msgid ""
+"Optional. The name of the script file. If left empty, will default to the "
+"subfolder name."
+msgstr ""
+"‏اختیاری است. نام پرونده اسکریپت. اگر خالی رها شود، به طور پیش‌فرض از نام "
+"زیرپوشه استفاده خواهد شد."
+
 msgid "Activate now?"
 msgstr "الان فعالسازی شود؟"
 
@@ -9451,6 +10401,10 @@ msgstr "پسوند اسکریپت معتبر است."
 msgid "Subfolder name is valid."
 msgstr "نام زیرپوشه معتبر است."
 
+msgid ""
+"The skeleton property of the Polygon2D does not point to a Skeleton2D node"
+msgstr "ویژگی اسکلت Polygon2D به یک گره Skeleton2D اشاره نمی‌کند"
+
 msgid "Sync Bones"
 msgstr "همگام‌سازی استخوان‌ها"
 
@@ -9496,6 +10450,9 @@ msgstr "استخوان‌ها"
 msgid "Move Points"
 msgstr "جابه‌جایی نقطه‌ها"
 
+msgid "%s: Rotate"
+msgstr "%s: چرخش"
+
 msgid "Shift: Move All"
 msgstr "شیفت: جابه‌جایی همه"
 
@@ -9517,6 +10474,9 @@ msgstr ""
 "یک چندضلعی سفارشی را برچینید. اگر هیچ یک به‌جا نمانده، نماپردازش چندضلعی "
 "سفارشی از کار می‌افتد."
 
+msgid "Paint weights with specified intensity."
+msgstr "رنگ‌آمیزی وزن‌ها با شدت مشخص‌شده."
+
 msgid "Radius:"
 msgstr "شعاع:"
 
@@ -9592,6 +10552,15 @@ msgstr "بارکردن بنمایه"
 msgid "Path to AnimationMixer is invalid"
 msgstr "مسیر AnimationMixer نامعتبر است"
 
+msgid ""
+"AnimationMixer has no valid root node path, so unable to retrieve track names."
+msgstr ""
+"AnimationMixer مسیر گره ریشه‌ی معتبری ندارد، بنابراین امکان بازیابی نام نوار‌ها "
+"وجود ندارد."
+
+msgid "(truncated)"
+msgstr "(بریده‌شده)"
+
 msgid "Current value: "
 msgstr "ارزش کنونی: "
 
@@ -9601,6 +10570,9 @@ msgstr "نمی‌توان «%s» را گشود. شاید پرونده جابه
 msgid "Close and save changes?"
 msgstr "بستن و ذخیره دگرش‌ها؟"
 
+msgid "Error writing TextFile:"
+msgstr "خطا در نوشتن فایل متنی:"
+
 msgid "Error saving file!"
 msgstr "خطای ذخیره در پرونده!"
 
@@ -9628,9 +10600,29 @@ msgstr "ناتوانی در بارکردن پرونده در:"
 msgid "Save File As..."
 msgstr "ذخیره‌سازی پرونده به‌عنوان..."
 
+msgid "Can't obtain the script for reloading."
+msgstr "امکان دریافت اسکریپت برای بارگذاری مجدد وجود ندارد."
+
 msgid "Cannot run the edited file because it's not a script."
 msgstr "نمی‌توان پروندهٔ ویراسته را اجرا کرد چون اسکریپت نیست."
 
+msgid "Cannot run the script because it contains errors, check the output log."
+msgstr ""
+"اجرای اسکریپت امکان‌پذیر نیست زیرا حاوی خطا است، لاگ خروجی را بررسی کنید."
+
+msgid "Cannot run the script because it doesn't extend EditorScript."
+msgstr "اجرای اسکریپت امکان‌پذیر نیست زیرا از EditorScript ارث‌بری نمی‌کند."
+
+msgid ""
+"Cannot run the script because it's not a tool script (add the @tool "
+"annotation at the top)."
+msgstr ""
+"‫امکان اجرای اسکریپت وجود ندارد زیرا یک اسکریپت ابزاری نیست (حاشیه‌نویسی "
+"`@tool` را در ابتدای آن اضافه کنید)."
+
+msgid "Cannot run the script because it's not a tool script."
+msgstr "اجرای اسکریپت امکان‌پذیر نیست زیرا اسکریپت ابزار نیست."
+
 msgid "Import Theme"
 msgstr "درون‌برد زمینه"
 
@@ -9646,6 +10638,9 @@ msgstr "ذخیره زمینه به‌عنوان..."
 msgid "Open '%s' in Godot online documentation."
 msgstr "گشودن '%s' در مستندات آنلاین گودوت."
 
+msgid "Open in Online Docs"
+msgstr "گشودن در مستندات آنلاین"
+
 msgid "Online Docs"
 msgstr "مستندات آنلاین"
 
@@ -9667,6 +10662,9 @@ msgstr "پیدا کردن پیشین"
 msgid "Filter Scripts"
 msgstr "پالایش اسکریپت‌ها"
 
+msgid "Toggle alphabetical sorting of the method list."
+msgstr "تغییر ترتیب حروف‌چینی فهرست روش‌ها."
+
 msgid "Sort"
 msgstr "چینش"
 
@@ -9682,9 +10680,15 @@ msgstr "بار کردن..."
 msgid "Save All"
 msgstr "ذخیره‌سازی همه"
 
+msgid "Soft Reload Tool Script"
+msgstr "بارگذاری مجدد نرم اسکریپت ابزار"
+
 msgid "Copy Script Path"
 msgstr "روگرفت مسیر اسکریپت"
 
+msgid "Copy Script UID"
+msgstr "روگرفت شناسهٔ یکتای اسکریپت"
+
 msgid "History Previous"
 msgstr "تاریخچهٔ پیشین"
 
@@ -9730,6 +10734,9 @@ msgstr "دور انداختن"
 msgid "Search Results"
 msgstr "نتیجه‌های جستجو"
 
+msgid "There are unsaved changes in the following built-in script(s):"
+msgstr "تغییرات ذخیره‌نشده در اسکریپت(های) داخلی زیر وجود دارد:"
+
 msgid "Save changes to the following script(s) before quitting?"
 msgstr "پیش از بیرون رفتن دگرش‌ها را در اسکریپت(ها)‌ی زیر ذخیره می‌کنید؟"
 
@@ -9754,6 +10761,9 @@ msgstr "استاندارد"
 msgid "JSON"
 msgstr "JSON"
 
+msgid "Markdown"
+msgstr "مارک‌داون"
+
 msgid "Connections to method:"
 msgstr "اتصالات به روش:"
 
@@ -9766,6 +10776,10 @@ msgstr "هدف"
 msgid "Error at (%d, %d):"
 msgstr "خطا در (%d, %d):"
 
+msgid ""
+"Missing connected method '%s' for signal '%s' from node '%s' to node '%s'."
+msgstr "روش متصل‌شده «%s» برای سیگنال «%s» از گره «%s» به گره «%s» گم شده است."
+
 msgid "[Ignore]"
 msgstr "[چشم پوشی]"
 
@@ -9778,9 +10792,25 @@ msgstr "خط %d:"
 msgid "Go to Function"
 msgstr "رفتن به تابع"
 
+msgid ""
+"The resource does not have a valid path because it has not been saved.\n"
+"Please save the scene or resource that contains this resource and try again."
+msgstr ""
+"منبع مسیر معتبر ندارد زیرا ذخیره نشده است.\n"
+"لطفاً صحنه یا منبعی که حاوی این منبع است را ذخیره کرده و دوباره تلاش کنید."
+
+msgid "Preloading internal resources is not supported."
+msgstr "پیش‌بارگذاری منابع داخلی پشتیبانی نمی‌شود."
+
 msgid "Can't drop nodes without an open scene."
 msgstr "نمی‌توان بدون یک صحنهٔ گشوده گره‌ها را انداخت."
 
+msgid "Can't drop nodes because script '%s' does not inherit Node."
+msgstr "نمی‌توان گره‌ها را رها کرد زیرا اسکریپت «%s» از گره ارث‌بری نمی‌کند."
+
+msgid "Emoji & Symbols"
+msgstr "ایموجی و نمادها"
+
 msgid "Pick Color"
 msgstr "انتخاب رنگ"
 
@@ -9799,6 +10829,9 @@ msgstr "برو به"
 msgid "Delete Line"
 msgstr "زدایش خط"
 
+msgid "Unindent"
+msgstr "کاهش تورفتگی"
+
 msgid "Create Code Region"
 msgstr "ساخت دامنهٔ کد"
 
@@ -9811,6 +10844,12 @@ msgstr "دوتاسازی خط‌ها"
 msgid "Evaluate Selection"
 msgstr "ارزیابی برگزیده"
 
+msgid "Trim Trailing Whitespace"
+msgstr "حذف فضای خالی انتهای خط"
+
+msgid "Trim Final Newlines"
+msgstr "حذف خط‌های جدید انتهایی"
+
 msgid "Convert Indent to Spaces"
 msgstr "تبدیل تورفتگی به فاصله‌ها"
 
@@ -9844,12 +10883,21 @@ msgstr "رفتن به تابع..."
 msgid "Go to Line..."
 msgstr "برو به خط..."
 
+msgid "Lookup Symbol"
+msgstr "جستجوی نماد"
+
 msgid "Toggle Breakpoint"
 msgstr "یک Breakpoint درج کن"
 
+msgid "Remove All Breakpoints"
+msgstr "حذف تمام نقاط توقف"
+
 msgid "Save changes to the following shaders(s) before quitting?"
 msgstr "پیش از بیرون رفتن دگرش‌ها را در سایه‌زن(ها)‌ی زیر ذخیره می‌کنید؟"
 
+msgid "There are unsaved changes in the following built-in shaders(s):"
+msgstr "تغییرات ذخیره‌نشده در سایه‌زن‌های داخلی زیر وجود دارد:"
+
 msgid "New Shader Include..."
 msgstr "دربرگیری سایه‌زن نو..."
 
@@ -9871,24 +10919,57 @@ msgstr "بستن پرونده"
 msgid "Shader Editor"
 msgstr "ویراستار سایه‌زن"
 
+msgid "No valid shader stages found."
+msgstr "هیچ مرحله‌ی سایه‌زنی معتبری یافت نشد."
+
+msgid "Shader stage compiled without errors."
+msgstr "مرحله‌ی سایه‌زنی بدون خطا کامپایل شد."
+
+msgid ""
+"File structure for '%s' contains unrecoverable errors:\n"
+"\n"
+msgstr ""
+"ساختار پرونده برای «%s» حاوی خطاهای غیرقابل بازیابی است:\n"
+"\n"
+
 msgid "This skeleton has no bones, create some children Bone2D nodes."
 msgstr "این استخوان‌بندی هیچ استخوانی ندارد، چند گرهٔ فرزند Bone2D بسازید."
 
+msgid "Set Rest Pose to Bones"
+msgstr "وضعیت استراحت را به استخوان‌ها تنظیم کن"
+
 msgid "Create Rest Pose from Bones"
 msgstr "ساختن ژست استراحت از استخوان‌ها"
 
 msgid "Skeleton2D"
 msgstr "استخوان‌بندی دوبعدی"
 
+msgid "Overwrite Rest Pose"
+msgstr "وضعیت استراحت را بازنویسی کن"
+
 msgid "Add Bone Metadata"
 msgstr "افزودن فرادادهٔ استخوان"
 
 msgid "Set Bone Transform"
 msgstr "نشاندن ترادیسی استخوان"
 
+msgid "Modify metadata '%s' for bone '%s'"
+msgstr "ویرایش فراداده «%s» برای استخوان «%s»"
+
+msgid "Remove metadata '%s' from bone '%s'"
+msgstr "حذف فراداده «%s» از استخوان «%s»"
+
+msgid "Cannot create a physical skeleton for a Skeleton3D node with no bones."
+msgstr "نمی‌توان یک اسکلت فیزیکی برای گره Skeleton3D بدون استخوان‌ها ایجاد کرد."
+
 msgid "Create physical bones"
 msgstr "ساخت استخوان‌های فیزیکی"
 
+msgid "Cannot export a SkeletonProfile for a Skeleton3D node with no bones."
+msgstr ""
+"نمی‌توان یک SkeletonProfile برای گره Skeleton3D که هیچ استخوانی ندارد، برون‌بری "
+"کرد."
+
 msgid "Export Skeleton Profile As..."
 msgstr "برون‌برد نمایهٔ استخوان‌بندی به‌عنوان..."
 
@@ -9898,6 +10979,12 @@ msgstr "نشاندن درصد استخوان"
 msgid "Skeleton3D"
 msgstr "استخوان‌بندی سه‌بعدی"
 
+msgid "Apply All Poses to Rests"
+msgstr "اعمال تمام حالات به استراحت‌ها"
+
+msgid "Apply Selected Poses to Rests"
+msgstr "‍اعمال حالت‌های انتخاب‌شده به استراحت‌ها"
+
 msgid "Export Skeleton Profile"
 msgstr "برون‌برد نمایهٔ استخوان‌بندی"
 
@@ -10017,7 +11104,7 @@ msgid "Paste Texture"
 msgstr "چسباندن بافت"
 
 msgid "Add Empty"
-msgstr "اضافه کردن خالی"
+msgstr "افزودن تهی"
 
 msgid "Move Frame"
 msgstr "حرکت دادن فریم"
@@ -10206,6 +11293,9 @@ msgstr "جدایی:"
 msgid "Edit Region"
 msgstr "ویرایش دامنه"
 
+msgid "Styleboxes"
+msgstr "استایل‌باکس‌ها"
+
 msgid "1 color"
 msgid_plural "{num} colors"
 msgstr[0] "۱ رنگ"
@@ -10520,12 +11610,27 @@ msgstr "نشاندن گونهٔ پایه"
 msgid "Show Default"
 msgstr "نمایش پیشفرض"
 
+msgid "Show default type items alongside items that have been overridden."
+msgstr "نمایش آیتم‌های نوع پیش‌فرض در کنار آیتم‌هایی که بازنویسی شده‌اند."
+
 msgid "Override All"
 msgstr "بازنویسی همه"
 
+msgid "Override all default type items."
+msgstr "بازنویسی تمام آیتم‌های نوع پیش‌فرض."
+
 msgid "Base Type"
 msgstr "نوع پایه"
 
+msgid "Select the variation base type from a list of available types."
+msgstr "نوع پایه واریانت را از فهرست انواع موجود انتخاب کنید."
+
+msgid ""
+"A type associated with a built-in class cannot be marked as a variation of "
+"another type."
+msgstr ""
+"یک نوع مرتبط با کلاس داخلی نمی‌تواند به عنوان واریانت نوع دیگری علامت‌گذاری شود."
+
 msgid "Theme:"
 msgstr "زمینه:"
 
@@ -10544,6 +11649,12 @@ msgstr "پیش‌نمایش پیش‌فرض"
 msgid "Select UI Scene:"
 msgstr "گزینش صحنهٔ میانای کاربری:"
 
+msgid ""
+"Toggle the control picker, allowing to visually select control types for edit."
+msgstr ""
+"پیکر کنترل را تغییر دهید تا امکان انتخاب بصری انواع کنترل برای ویرایش فراهم "
+"شود."
+
 msgid "Toggle Button"
 msgstr "دکمهٔ تغییر"
 
@@ -10562,9 +11673,21 @@ msgstr "بررسی مورد"
 msgid "Checked Item"
 msgstr "مورد بررسی‌شده"
 
+msgid "Checked Radio Item"
+msgstr "مورد رادیویی انتخاب‌شده"
+
+msgid "Named Separator"
+msgstr "فاصله‌گذار نام‌دار"
+
 msgid "Submenu"
 msgstr "زیر‌گزینگان"
 
+msgid "Subitem 1"
+msgstr "زیرمورد ۱"
+
+msgid "Subitem 2"
+msgstr "زیرمورد ۲"
+
 msgid "Has"
 msgstr "دارد"
 
@@ -10592,9 +11715,19 @@ msgstr "زیر‌درخت"
 msgid "Has,Many,Options"
 msgstr "دارد،بسیار،گزینه‌ها"
 
+msgid "Invalid path, the PackedScene resource was probably moved or removed."
+msgstr "مسیر نامعتبر است، احتمالاً منبع PackedScene جابجا یا حذف شده است."
+
+msgid "Invalid PackedScene resource, must have a Control node at its root."
+msgstr ""
+"منبع PackedScene نامعتبر است، باید یک گره کنترل در ریشه آن وجود داشته باشد."
+
 msgid "Invalid file, not a PackedScene resource."
 msgstr "پرونده نامعتبر است، بنمایهٔ صحنهٔ بسته‌بندی شده نیست."
 
+msgid "Reload the scene to reflect its most actual state."
+msgstr "صحنه را بارگذاری مجدد کنید تا جدیدترین وضعیت آن منعطف شود."
+
 msgid "Merge TileSetAtlasSource"
 msgstr "یکی کردن TileSetAtlasSource"
 
@@ -10613,6 +11746,22 @@ msgstr "یکی کردن"
 msgid "Next Line After Column"
 msgstr "خط بعدی پس از ستون"
 
+msgid ""
+"Source: %d\n"
+"Atlas coordinates: %s\n"
+"Alternative: 0"
+msgstr ""
+"منبع: %d\n"
+"مختصات اطلس: %s\n"
+"جایگزین: ۰"
+
+msgid ""
+"The selected atlas source has no valid texture. Assign a texture in the "
+"TileSet bottom tab."
+msgstr ""
+"منبع اطلس انتخاب‌شده هیچ بافت معتبری ندارد. یک بافت را در زبانه پایین TileSet "
+"اختصاص دهید."
+
 msgid "Base Tiles"
 msgstr "کاشی‌های پایه"
 
@@ -10664,21 +11813,49 @@ msgstr "به صورت عمودی قرینه شود"
 msgid "Disable Snap"
 msgstr "ازکاراندازی چفت"
 
+msgid "Half-Pixel Snap"
+msgstr "چسباندن نیم‌پیکسل"
+
+msgid "Painting:"
+msgstr "رنگ‌آمیزی:"
+
+msgid "No terrain"
+msgstr "بدون زمین‌"
+
+msgid "Painting Terrain Set"
+msgstr "تنظیم مجموعه نقاشی زمین"
+
 msgid "Can't transform scene tiles."
 msgstr "نمی‌توان کاشی‌های صحنه را ترادیسید."
 
 msgid "Can't rotate patterns when using non-square tile grid."
 msgstr "نمی‌توان هنگام به‌کارگیری کاشی نامربعی توری الگوها را چرخاند."
 
+msgid "Empty Scene Collection Source (ID: %d)"
+msgstr "منبع مجموعه صحنه خالی (شناسه: %d)"
+
+msgid "Unknown Type Source (ID: %d)"
+msgstr "منبع نوع ناشناخته (شناسه: %d)"
+
 msgid "Add TileSet pattern"
 msgstr "افزودن الگوی دسته‌کاشی"
 
 msgid "Remove TileSet patterns"
 msgstr "برچیدن الگوهای دسته‌کاشی"
 
+msgid "Index: %d"
+msgstr "اندیس: %d"
+
 msgid "Tile with Invalid Scene"
 msgstr "کاشی با صحنهٔ نامعتبر"
 
+msgid ""
+"The selected scene collection source has no scenes. Add scenes in the TileSet "
+"bottom tab."
+msgstr ""
+"منبع مجموعه صحنه انتخاب‌شده فاقد صحنه است. صحنه‌ها را در زبانه پایین TileSet "
+"اضافه کنید."
+
 msgid "Delete tiles"
 msgstr "زدایش کاشی‌ها"
 
@@ -10700,9 +11877,24 @@ msgstr "چرخش کاشی به چپ"
 msgid "Rotate Tile Right"
 msgstr "چرخش کاشی به راست"
 
+msgid "Place Random Tile"
+msgstr "قرار دادن کاشی تصادفی"
+
+msgid ""
+"Modifies the chance of painting nothing instead of a randomly selected tile."
+msgstr ""
+"شانس رنگ‌آمیزی هیچ‌چیز به جای یک کاشی انتخاب‌شده به‌طور تصادفی را تغییر می‌دهد."
+
 msgid "Tiles"
 msgstr "کاشی"
 
+msgid ""
+"This TileMap's TileSet has no Tile Source configured. Go to the TileSet "
+"bottom panel to add one."
+msgstr ""
+"TileSet این TileMap هیچ منبع کاشی پیکربندی‌شده‌ای ندارد. به پانل پایین TileSet "
+"بروید تا یکی اضافه کنید."
+
 msgid "Sort sources"
 msgstr "چینش منبع‌ها"
 
@@ -10715,9 +11907,45 @@ msgstr "چینش بر پایهٔ شناسه‌ (از پایین به بالا)"
 msgid "Patterns"
 msgstr "الگوها"
 
+msgid "Drag and drop or paste a TileMap selection here to store a pattern."
+msgstr ""
+"یک انتخاب TileMap را اینجا بکشید و رها کنید یا بچسبانید تا الگو را ذخیره کنید."
+
+msgid "Matches Corners and Sides"
+msgstr "هماهنگی گوشه‌ها و کناره‌ها"
+
+msgid ""
+"Connect mode: paints a terrain, then connects it with the surrounding tiles "
+"with the same terrain."
+msgstr ""
+"حالت اتصال: یک زمین را رنگ‌آمیزی می‌کند، سپس آن را با کاشی‌های اطراف که همان "
+"زمین را دارند، متصل می‌کند."
+
+msgid ""
+"Path mode: paints a terrain, then connects it to the previous tile painted "
+"within the same stroke."
+msgstr ""
+"حالت مسیر: یک زمین را رنگ‌آمیزی می‌کند، سپس آن را به کاشی قبلی که در همان ضربه "
+"رنگ‌آمیزی شده متصل می‌کند."
+
+msgid "Terrains"
+msgstr "زمین‌ها"
+
 msgid "No Layers"
 msgstr "بی لایه"
 
+msgid "Extract TileMap layers as individual TileMapLayer nodes"
+msgstr "لایه‌های TileMap را به عنوان گره‌های جداگانه TileMapLayer استخراج کنید"
+
+msgid "Can't edit multiple layers at once."
+msgstr "نمی‌توان چندین لایه را هم‌زمان ویرایش کرد."
+
+msgid "The selected TileMap has no layer to edit."
+msgstr "TileMap انتخاب‌شده لایه‌ای برای ویرایش ندارد."
+
+msgid "The edited layer is disabled or invisible"
+msgstr "لایه ویرایش‌شده غیرفعال یا نامرئی است"
+
 msgid ""
 "The edited TileMap or TileMapLayer node has no TileSet resource.\n"
 "Create or load a TileSet resource in the Tile Set property in the inspector."
@@ -10728,6 +11956,9 @@ msgstr ""
 msgid "Select Next Tile Map Layer"
 msgstr "گزینش لایهٔ نقشه‌کاشی بعدی"
 
+msgid "Select Previous Tile Map Layer"
+msgstr "لایه نقشه کاشی قبلی را انتخاب کنید"
+
 msgid "TileMap Layers"
 msgstr "لایه‌های نقشه‌کاشی"
 
@@ -10749,6 +11980,36 @@ msgstr "برجسته‌سازی لایهٔ نقشه‌کاشی برگزیده"
 msgid "Toggle grid visibility."
 msgstr "روشن/خاموش کردن پدیداری توری."
 
+msgid "Automatically Replace Tiles with Proxies"
+msgstr "به‌طور خودکار کاشی‌ها را با پروکسی‌ها جایگزین کنید"
+
+msgid "Create Alternative-level Tile Proxy"
+msgstr "پروکسی سطح جایگزین کاشی ایجاد کنید"
+
+msgid "Create Coords-level Tile Proxy"
+msgstr "پروکسی سطح مختصات کاشی ایجاد کنید"
+
+msgid "Create source-level Tile Proxy"
+msgstr "پروکسی سطح منبع کاشی ایجاد کنید"
+
+msgid "Delete All Invalid Tile Proxies"
+msgstr "حذف تمام پروکسی‌های کاشی نامعتبر"
+
+msgid "Tile Proxies Management"
+msgstr "مدیریت پروکسی‌های کاشی"
+
+msgid "Source-level proxies"
+msgstr "پروکسی‌های سطح منبع"
+
+msgid "Coords-level proxies"
+msgstr "پروکسی‌های سطح مختصات"
+
+msgid "Alternative-level proxies"
+msgstr "پروکسی‌های سطح جایگزین"
+
+msgid "Add a new tile proxy:"
+msgstr "یک پروکسی کاشی جدید اضافه کنید:"
+
 msgid "From Source"
 msgstr "از منبع"
 
@@ -10870,9 +12131,58 @@ msgstr ""
 msgid "Animation speed in frames per second."
 msgstr "تندی پویانمایی به فریم‌برثانیه."
 
+msgid ""
+"The sorting order for this tile. Higher values will make the tile render in "
+"front of others on the same layer. The index is relative to the TileMap's own "
+"Z index."
+msgstr ""
+"ترتیب مرتب‌سازی برای این کاشی. مقادیر بالاتر باعث می‌شوند که کاشی در جلوی دیگر "
+"کاشی‌ها در همان لایه رندر شود. اندیس نسبت به اندیس Z خود TileMap است."
+
+msgid ""
+"The vertical offset to use for tile sorting based on its Y coordinate (in "
+"pixels). This allows using layers as if they were on different height for top-"
+"down games. Adjusting this can help alleviate issues with sorting certain "
+"tiles. Only effective if Y Sort Enabled is true on the TileMap layer the tile "
+"is placed on."
+msgstr ""
+"افزایش عمودی که برای مرتب‌سازی کاشی‌ها بر اساس مختصات Y آن‌ها (به پیکسل) استفاده "
+"می‌شود. این امکان را می‌دهد که لایه‌ها به‌طور فرضی در ارتفاعات مختلف برای بازی‌های "
+"بالا به پایین قرار گیرند. تنظیم این مقدار می‌تواند به رفع مشکلات مربوط به "
+"مرتب‌سازی برخی کاشی‌ها کمک کند. تنها در صورتی مؤثر است که گزینه «مرتب‌سازی بر "
+"اساس Y» در لایه TileMap که کاشی در آن قرار دارد فعال باشد."
+
+msgid ""
+"The index of the terrain set this tile belongs to. [code]-1[/code] means it "
+"will not be used in terrains."
+msgstr ""
+"اندیس مجموعه زمین که این کاشی به آن تعلق دارد. [code]-1[/code] به این معنی "
+"است که در زمین‌ها استفاده نخواهد شد."
+
+msgid ""
+"The index of the terrain inside the terrain set this tile belongs to. "
+"[code]-1[/code] means it will not be used in terrains."
+msgstr ""
+"اندیس زمین داخل مجموعه زمین که این کاشی به آن تعلق دارد. [code]-1[/code] به "
+"این معنی است که در زمین‌ها استفاده نخواهد شد."
+
+msgid ""
+"The relative probability of this tile appearing when painting with \"Place "
+"Random Tile\" enabled."
+msgstr ""
+"احتمال نسبی ظاهر شدن این کاشی هنگام نقاشی با گزینه «قرار دادن کاشی تصادفی» "
+"فعال باشد."
+
 msgid "Setup"
 msgstr "آماده‌سازی"
 
+msgid ""
+"Atlas setup. Add/Remove tiles tool (use the shift key to create big tiles, "
+"control for rectangle editing)."
+msgstr ""
+"تنظیمات اطلس. ابزار افزودن/حذف کاشی‌ها (برای ایجاد کاشی‌های بزرگ از کلید شیفت و "
+"برای ویرایش مستطیلی از کلید کنترل استفاده کنید)."
+
 msgid "Select tiles."
 msgstr "انتخاب کاشی‌ها."
 
@@ -10889,9 +12199,32 @@ msgstr ""
 msgid "Paint Properties:"
 msgstr "ویژگی‌های نقاشی:"
 
+msgid "Create Tiles in Non-Transparent Texture Regions"
+msgstr "ایجاد کاشی‌ها در نواحی بافت غیرشفاف"
+
+msgid "Remove Tiles in Fully Transparent Texture Regions"
+msgstr "حذف کاشی‌ها در نواحی بافت کاملاً شفاف"
+
+msgid ""
+"The current atlas source has tiles outside the texture.\n"
+"You can clear it using \"%s\" option in the 3 dots menu."
+msgstr ""
+"منبع اطلس فعلی کاشی‌هایی خارج از بافت دارد.\n"
+"شما می‌توانید آن را با استفاده از گزینه «%s» در منوی سه نقطه پاک کنید."
+
 msgid "Create a Tile"
 msgstr "ساخت یک کاشی"
 
+msgid "Auto Create Tiles in Non-Transparent Texture Regions?"
+msgstr "آیا کاشی‌ها به‌طور خودکار در نواحی بافت غیرشفاف ایجاد شوند؟"
+
+msgid ""
+"The atlas's texture was modified.\n"
+"Would you like to automatically create tiles in the atlas?"
+msgstr ""
+"بافت اطلس تغییر کرده است.\n"
+"آیا می‌خواهید کاشی‌ها به‌طور خودکار در اطلس ایجاد شوند؟"
+
 msgid "Yes"
 msgstr "آره"
 
@@ -10901,18 +12234,55 @@ msgstr "نه"
 msgid "Invalid texture selected."
 msgstr "بافت نامعتبری برگزیدید."
 
+msgid "Add atlas source"
+msgstr "افزودن منبع اطلس"
+
 msgid "A palette of tiles made from a texture."
 msgstr "تخته‌رنگی از کاشی‌ها که از یک بافت ساخته شده است."
 
+msgid "A collection of scenes that can be instantiated and placed as tiles."
+msgstr "مجموعه‌ای از صحنه‌ها که می‌توانند به‌عنوان کاشی ایجاد و قرار داده شوند."
+
+msgid "Open Atlas Merging Tool"
+msgstr "گشودن ادغام اطلس"
+
+msgid ""
+"No TileSet source selected. Select or create a TileSet source.\n"
+"You can create a new source by using the Add button on the left or by "
+"dropping a tileset texture onto the source list."
+msgstr ""
+"هیچ منبع TileSet انتخاب نشده است. یک منبع TileSet را انتخاب یا ایجاد کنید.\n"
+"شما می‌توانید یک منبع جدید را با استفاده از دکمه افزودن در سمت چپ یا با کشیدن "
+"بافت TileSet به فهرست منابع ایجاد کنید."
+
 msgid "Add new patterns in the TileMap editing mode."
 msgstr "افزودن الگوهای نو در حالت ویرایش نقشه‌کاشی."
 
+msgid ""
+"Warning: Modifying a source ID will result in all TileMaps using that source "
+"to reference an invalid source instead. This may result in unexpected data "
+"loss. Change this ID carefully."
+msgstr ""
+"هشدار: تغییر شناسه منبع منجر به این می‌شود که تمامی TileMapهایی که از آن منبع "
+"استفاده می‌کنند به یک منبع نامعتبر ارجاع دهند. این ممکن است باعث از دست دادن "
+"داده‌های غیرمنتظره شود. شناسه را با دقت تغییر دهید."
+
 msgid "Add a Scene Tile"
 msgstr "افزودن یک کاشی صحنه"
 
 msgid "Remove a Scene Tile"
 msgstr "برچیدن یک کاشی صحنه"
 
+msgid "Drag and drop scenes here or use the Add button."
+msgstr "صحنه‌ها را اینجا بکشید و رها کنید یا از دکمه افزودن استفاده کنید."
+
+msgid ""
+"The human-readable name for the scene collection. Use a descriptive name here "
+"for organizational purposes (such as \"obstacles\", \"decoration\", etc.)."
+msgstr ""
+"نام قابل خواندن انسان برای مجموعه صحنه‌ها. از یک نام توصیفی در اینجا برای "
+"اهداف سازماندهی استفاده کنید (مانند «موانع»، «تزئینات» و غیره)."
+
 msgid "Scenes collection properties:"
 msgstr "ویژگی‌های مجموعه صحنه‌ها:"
 
@@ -11022,7 +12392,7 @@ msgid "Modified"
 msgstr "تغییر کرده"
 
 msgid "Renamed"
-msgstr "نام تغییر یافت"
+msgstr "بازنامگذاری شد"
 
 msgid "Deleted"
 msgstr "زدوده‌شده"
@@ -11061,7 +12431,7 @@ msgid "Sqrt2 constant (1.414214). Square root of 2."
 msgstr "ثابت Sqrt (۱.۴۱۴۲۱۴). ریشهٔ دوم ۲."
 
 msgid "Add Input"
-msgstr "اضافه کردن ورودی"
+msgstr "افزودن درونداد"
 
 msgid "Add Output"
 msgstr "افزودن برونداد"
@@ -11288,9 +12658,38 @@ msgstr "ثابت بردار سه‌بعدی."
 msgid "4D vector constant."
 msgstr "ثابت بردار ۴بعدی."
 
+msgid ""
+"Custom Godot Shader Language expression, with custom amount of input and "
+"output ports. This is a direct injection of code into the vertex/fragment/"
+"light function, do not use it to write the function declarations inside."
+msgstr ""
+"عبارت زبان شیدر سفارشی گودو، با تعداد دلخواه ورودی و خروجی. این یک تزریق "
+"مستقیم کد به داخل تابع راس/قطعه/نور است، از آن برای نوشتن اعلان‌های توابع "
+"استفاده نکنید."
+
+msgid ""
+"Custom Godot Shader Language expression, which is placed on top of the "
+"resulted shader. You can place various function definitions inside and call "
+"it later in the Expressions. You can also declare varyings, parameters and "
+"constants."
+msgstr ""
+"عبارت زبان شیدر سفارشی گودو، که در بالای شیدر حاصل قرار می‌گیرد. شما می‌توانید "
+"تعریف‌های مختلف تابع را داخل آن قرار دهید و بعداً در عبارات از آن‌ها استفاده "
+"کنید. همچنین می‌توانید متغیرهای متغیر، پارامترها و ثابت‌ها را اعلام کنید."
+
+msgid ""
+"Reroute connections freely, can be used to connect multiple input ports to "
+"single output port."
+msgstr ""
+"اتصالات را آزادانه تغییر مسیر دهید، می‌توان از آن برای اتصال چندین پورت ورودی "
+"به یک پورت خروجی استفاده کرد."
+
 msgid "Edit Visual Property: %s"
 msgstr "ویرایش ویژگی دیداری: %s"
 
+msgid "Voxel GI data is not local to the scene."
+msgstr "داده‌های GI وکسل محلی به صحنه نیستند."
+
 msgid "Bake VoxelGI"
 msgstr "بیک ووکسل‌جی‌آی"
 
@@ -11518,7 +12917,7 @@ msgid "Edit Project"
 msgstr "ویرایش پروژه"
 
 msgid "Rename Project"
-msgstr "تغییر نام پروژه"
+msgstr "بازنامگذاری پروژه"
 
 msgid "Manage Tags"
 msgstr "مدیریت برچسب‌ها"
@@ -11572,7 +12971,7 @@ msgid "All Tags"
 msgstr "همه برچسب‌ها"
 
 msgid "Click tag to add it to the project."
-msgstr "برروی برچسب کلیک کنید تا به پروژه اضافه شود."
+msgstr "برای افزودن به پروژه روی برچسب کلیک کنید."
 
 msgid "Create New Tag"
 msgstr "ساختن برچسب تازه"
@@ -11739,11 +13138,14 @@ msgid "Erase Input Action"
 msgstr "پاک کردن کنش درونداد"
 
 msgid "Rename Input Action"
-msgstr "تغییر نام اکشن ورودی"
+msgstr "بازنامگذاری کنش درونداد"
 
 msgid "Project Settings (project.godot)"
 msgstr "تنظیمات پروژه (project.godot)"
 
+msgid "Input Map"
+msgstr "نقشهٔ درونداد"
+
 msgid "Localization"
 msgstr "بومی‌سازی"
 
@@ -11819,8 +13221,8 @@ msgstr "گره تغییر والد"
 msgid "Keep Global Transform"
 msgstr "نگهداری ترادیسی جهانی"
 
-msgid "Pick"
-msgstr "برداشتن"
+msgid "Reparent"
+msgstr "تغییر والد"
 
 msgid "Scene name is empty."
 msgstr "نام صحنه تهی است."
@@ -12184,41 +13586,6 @@ msgstr "نام باید یک شناسهٔ معتبر باشد."
 msgid "Restart & Upgrade"
 msgstr "بازراه‌اندازی و ارتقا"
 
-msgid ""
-"As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
-"\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
-msgstr ""
-"از گودوت ۴.۴ به بعد، صحنه‌ها و بنمایه‌ها برای بازبرد کردن اسکریپت‌ها و سایه‌زن‌ها "
-"شناسه‌های یکتا (یو.آی.دی) را به کار می‌برند.\n"
-"\n"
-"بهنجارانه، این به‌روزرسانی برای تنها یک صحنه یا بنمایه هنگامی که آن را برای "
-"نخستین بار در گودوت ۴.۴ ذخیره کنید به کار بسته می‌شود. اگر صحنه یا بنمایه‌های "
-"بسیاری دارید، دستی انجامیدن این کار شاید زمان‌گیر باشد. این ابزار همهٔ صحنه‌ها و "
-"بنمایه‌های پروژه را در یک آن به‌روز خواهد کرد.\n"
-"\n"
-"برای بازراه‌اندازی ویراستار و به‌روزرسانی همهٔ صحنه‌ها و بنمایه‌های این پروژه روی "
-"«بازراه‌اندازی و ارتقا» کلیک کنید. بسته به اندازهٔ پروژه، شاید چند دقیقه زمان "
-"ببرد.\n"
-"\n"
-"بدانید: خواهشمندیم پیش از اجرای ابزار از داشتن نسخهٔ پشتیبان از پروژهٔ خود "
-"مطمئن شوید تا از احتمال از دست دادن داده پیشگیری شود. همچنین، مطمئن شوید همهٔ "
-"پرونده‌های .uid را در کنترل نسخه کامیت کرده‌اید (و آنها را به فهرست‌های "
-"نادیده‌گیری همچون .gitignore نیفزوده‌اید)."
-
 msgid "Export Scene to glTF 2.0 File"
 msgstr "برون‌برد صحنه به پروندهٔ glTF 2.0"
 
@@ -12302,6 +13669,15 @@ msgstr "پالایش مش‌ها"
 msgid "Disabled"
 msgstr "ازکارانداخته"
 
+msgid "Fade-In"
+msgstr "محو به درون"
+
+msgid "Fade-Out"
+msgstr "محو به بیرون"
+
+msgid "Cross-Fade"
+msgstr "محو متقاطع"
+
 msgid "Automatic"
 msgstr "خودکار"
 
@@ -12383,6 +13759,9 @@ msgstr "افزودن ویژگی به همگام‌ساز..."
 msgid "Add from path"
 msgstr "افزودن از مسیر"
 
+msgid "Spawn"
+msgstr "تولید"
+
 msgid ""
 "Add properties using the options above, or\n"
 "drag them from the inspector and drop them here."
@@ -12467,6 +13846,9 @@ msgstr "برچیدن کلیدها"
 msgid "Pose"
 msgstr "ژست"
 
+msgid "Haptic"
+msgstr "بساوشی (لمسی)"
+
 msgid "Unknown"
 msgstr "ناشناخته"
 
@@ -12803,9 +14185,80 @@ msgstr ""
 msgid "Path property must point to a valid Node2D node to work."
 msgstr "دارایی Path باید به یک گره Node2D معتبر اشاره کند تا کار کند."
 
+msgid ""
+"External Skeleton3D node not set! Please set a path to an external Skeleton3D "
+"node."
+msgstr ""
+"گره Skeleton3D خارجی تنظیم نشده است! لطفاً یک مسیر به گره Skeleton3D خارجی "
+"تعیین کنید."
+
+msgid ""
+"BoneAttachment3D node is not bound to any bones! Please select a bone to "
+"attach this node."
+msgstr ""
+"گره BoneAttachment3D به هیچ استخوانی متصل نیست! لطفاً یک استخوان برای اتصال "
+"این گره برگزینید."
+
 msgid "Nothing is visible because no mesh has been assigned."
 msgstr "چیزی پدیدار نیست چون هیچ مشی واگذار نشده است."
 
+msgid ""
+"CPUParticles3D animation requires the usage of a StandardMaterial3D whose "
+"Billboard Mode is set to \"Particle Billboard\"."
+msgstr ""
+"پویانمایی CPUParticles3D نیازمند استفاده از یک StandardMaterial3D است که حالت "
+"بیلبورد آن روی \"Particle Billboard\" تنظیم شده باشد."
+
+msgid "Decals are only available when using the Forward+ or Mobile renderers."
+msgstr ""
+"برچسب‌ها تنها زمانی در دسترس هستند که از رندرگرهای فوروارد+ یا موبایل استفاده "
+"شود."
+
+msgid ""
+"Fog Volumes need volumetric fog to be enabled in the scene's Environment in "
+"order to be visible."
+msgstr ""
+"حجم‌های مه نیاز به فعال بودن مه حجمی در محیط صحنه دارند تا قابل مشاهده باشند."
+
+msgid "Nothing is visible because meshes have not been assigned to draw passes."
+msgstr "هیچ چیزی قابل مشاهده نیست زیرا مش‌ها به عبورهای رسم اختصاص داده نشده‌اند."
+
+msgid ""
+"Particles animation requires the usage of a BaseMaterial3D whose Billboard "
+"Mode is set to \"Particle Billboard\"."
+msgstr ""
+"پویانمایی ذرات نیاز به استفاده از یک BaseMaterial3D دارد که حالت بیلبورد آن "
+"روی \"Particle Billboard\" تنظیم شده باشد."
+
+msgid ""
+"Particle sub-emitters are only available when using the Forward+ or Mobile "
+"renderers."
+msgstr ""
+"زیرپراکنش‌های ذره فقط زمانی در دسترس هستند که از رندرگرهای فوروارد+ یا موبایل "
+"استفاده شود."
+
+msgid ""
+"The Bake Mask has no bits enabled, which means baking will not produce any "
+"collision for this GPUParticlesCollisionSDF3D.\n"
+"To resolve this, enable at least one bit in the Bake Mask property."
+msgstr ""
+"ماسک پخت هیچ بیتی فعال نکرده است، به این معنی که پخت هیچ برخوردی برای این "
+"GPUParticlesCollisionSDF3D تولید نخواهد کرد.\n"
+"برای حل این مشکل، حداقل یک بیت در ویژگی ماسک پخت فعال کنید."
+
+msgid "A light's scale does not affect the visual size of the light."
+msgstr "مقیاس یک نور بر اندازه بصری نور تأثیر نمی‌گذارد."
+
+msgid ""
+"Projector textures are not supported when using the Compatibility renderer "
+"yet. Support will be added in a future release."
+msgstr ""
+"‬بافت‌های پروژه‌تور هنوز در هنگام استفاده از رندرگر سازگاری پشتیبانی نمی‌شوند. "
+"پشتیبانی از آن در نسخه‌های آینده اضافه خواهد شد."
+
+msgid "A SpotLight3D with an angle wider than 90 degrees cannot cast shadows."
+msgstr "یک SpotLight3D با زاویه‌ای بزرگتر از ۹۰ درجه نمی‌تواند سایه بیندازد."
+
 msgid "Finding meshes, lights and probes"
 msgstr "یافتن مش‌، نور و کاوَندها"
 
@@ -12821,6 +14274,51 @@ msgstr "ساختن کاوَندها از مش %d/%d"
 msgid "Preparing Environment"
 msgstr "آماده‌سازی محیط"
 
+msgid "NavigationObstacle3D does not support negative or zero scaling."
+msgstr "‏NavigationObstacle3D از مقیاس‌گذاری منفی یا صفر پشتیبانی نمی‌کند."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest scale value along "
+"the three axes will be used."
+msgstr ""
+"شعاع مامور تنها می‌تواند به‌صورت یکنواخت مقیاس شود. بزرگ‌ترین مقدار مقیاس در "
+"میان سه محور استفاده خواهد شد."
+
+msgid ""
+"Occlusion culling is disabled in the Project Settings, which means occlusion "
+"culling won't be performed in the root viewport.\n"
+"To resolve this, open the Project Settings and enable Rendering > Occlusion "
+"Culling > Use Occlusion Culling."
+msgstr ""
+"پنهان‌سازی انسدادی در تنظیمات پروژه غیرفعال است، به این معنی که پنهان‌سازی "
+"انسدادی در درگاه دید ریشه انجام نخواهد شد.\n"
+"برای حل این مشکل، تنظیمات پروژه را باز کرده و Rendering > Occlusion Culling > "
+"Use Occlusion Culling را فعال کنید."
+
+msgid ""
+"No occluder mesh is defined in the Occluder property, so no occlusion culling "
+"will be performed using this OccluderInstance3D.\n"
+"To resolve this, set the Occluder property to one of the primitive occluder "
+"types or bake the scene meshes by selecting the OccluderInstance3D and "
+"pressing the Bake Occluders button at the top of the 3D editor viewport."
+msgstr ""
+"هیچ مش انسدادگری در ویژگی Occluder تعریف نشده است، بنابراین پنهان‌سازی انسدادی "
+"با استفاده از این OccluderInstance3D انجام نخواهد شد.\n"
+"برای حل این مشکل، ویژگی Occluder را روی یکی از انواع انسدادگرهای اولیه تنظیم "
+"کنید یا با انتخاب **OccluderInstance3D** و فشار دادن دکمه Bake Occluders در "
+"بالای درگاه دید ویرایشگر ۳‌بعدی، مش‌های صحنه را بپزید."
+
+msgid ""
+"The occluder mesh has less than 3 vertices, so no occlusion culling will be "
+"performed using this OccluderInstance3D.\n"
+"To generate a proper occluder mesh, select the OccluderInstance3D then use "
+"the Bake Occluders button at the top of the 3D editor viewport."
+msgstr ""
+"مش انسدادگر کمتر از ۳ رأس دارد، بنابراین پنهان‌سازی انسدادی با استفاده از این "
+"OccluderInstance3D انجام نخواهد شد.\n"
+"برای ایجاد یک مش انسدادگر مناسب، OccluderInstance3D را انتخاب کرده و از دکمه "
+"Bake Occluders در بالای درگاه دید ویرایشگر ۳‌بعدی استفاده کنید."
+
 msgid ""
 "The polygon occluder has less than 3 vertices, so no occlusion culling will "
 "be performed using this OccluderInstance3D.\n"
@@ -12842,8 +14340,16 @@ msgstr ""
 "برای تعریف کردن شکل آن، می‌توانید یک (CollisionShape3D) یا "
 "(CollisionPolygon3D) را به‌عنوان فرزند به آن بیفزایید."
 
-msgid "An empty CollisionPolygon3D has no effect on collision."
-msgstr "یک CollisionPolygon3D تهی بر برخوردگاه تاثیری ندارد."
+msgid ""
+"CollisionPolygon3D only serves to provide a collision shape to a "
+"CollisionObject3D derived node.\n"
+"Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, "
+"CharacterBody3D, etc. to give them a shape."
+msgstr ""
+"CollisionPolygon3D تنها برای ارائه یک شکل برخورد به گره‌ای مشتق‌شده از "
+"CollisionObject3D استفاده می‌شود.\n"
+"لطفاً تنها از آن به‌عنوان فرزند Area3D، StaticBody3D، RigidBody3D، "
+"CharacterBody3D و غیره برای اختصاص دادن یک شکل به آن‌ها استفاده کنید."
 
 msgid ""
 "A shape must be provided for CollisionShape3D to function. Please create a "
@@ -12852,6 +14358,41 @@ msgstr ""
 "باید یک شکل برای (CollisionShape3D) فراهم شود تا کار کند. خواهشمندیم یک "
 "بنمایهٔ شکل برای آن بسازید."
 
+msgid ""
+"When used for collision, ConcavePolygonShape3D is intended to work with "
+"static CollisionObject3D nodes like StaticBody3D.\n"
+"It will likely not behave well for %ss (except when frozen and freeze_mode "
+"set to FREEZE_MODE_STATIC)."
+msgstr ""
+"هنگام استفاده برای برخورد، **ConcavePolygonShape3D** برای کار با گره‌های "
+"**CollisionObject3D** ایستا مانند **StaticBody3D** طراحی شده است.\n"
+"احتمالاً برای **%s** به‌درستی عمل نخواهد کرد (مگر در حالتی که منجمد شده باشد و "
+"**freeze_mode** روی **FREEZE_MODE_STATIC** تنظیم شود)."
+
+msgid ""
+"WorldBoundaryShape3D doesn't support RigidBody3D in another mode than static."
+msgstr ""
+"WorldBoundaryShape3D از **RigidBody3D در حالتی غیر از ایستا پشتیبانی نمی‌کند."
+
+msgid ""
+"When used for collision, ConcavePolygonShape3D is intended to work with "
+"static CollisionObject3D nodes like StaticBody3D.\n"
+"It will likely not behave well for CharacterBody3Ds."
+msgstr ""
+"هنگامی که برای برخورد استفاده می‌شود، ConcavePolygonShape3D برای کار با گره‌های "
+"ایستای CollisionObject3D مانند StaticBody3D طراحی شده است.\n"
+"احتمالاً برای CharacterBody3Dها رفتار مناسبی نخواهد داشت."
+
+msgid ""
+"A non-uniformly scaled CollisionShape3D node will probably not function as "
+"expected.\n"
+"Please make its scale uniform (i.e. the same on all axes), and change the "
+"size of its shape resource instead."
+msgstr ""
+"گره CollisionShape3D با مقیاس نامتوازن احتمالاً طبق انتظار عمل نخواهد کرد.\n"
+"لطفاً مقیاس آن را یکنواخت کنید (یعنی در همه محور‌ها یکسان باشد) و به‌جای آن، "
+"اندازه منبع شکل آن را تغییر دهید."
+
 msgid "Node A and Node B must be PhysicsBody3Ds"
 msgstr "گره الف و گره ب باید PhysicsBody3D باشند"
 
@@ -12867,9 +14408,45 @@ msgstr "مفصل به هیچ PhysicsBody3D متصل نیست"
 msgid "Node A and Node B must be different PhysicsBody3Ds"
 msgstr "گره الف و گره ب باید PhysicsBody3Dهای متفاوت باشند"
 
+msgid ""
+"Scale changes to RigidBody3D will be overridden by the physics engine when "
+"running.\n"
+"Please change the size in children collision shapes instead."
+msgstr ""
+"تغییرات مقیاس در **RigidBody3D** هنگام اجرا توسط موتور فیزیک نادیده گرفته "
+"خواهند شد.\n"
+"لطفاً اندازه را در اشکال برخورد فرزند آن تغییر دهید."
+
+msgid ""
+"This node cannot interact with other objects unless a Shape3D is assigned."
+msgstr ""
+"این گره نمی‌تواند با سایر اشیا تعامل داشته باشد، مگر اینکه یک Shape3D اختصاص "
+"داده شده باشد."
+
+msgid ""
+"ShapeCast3D does not support ConcavePolygonShape3Ds. Collisions will not be "
+"reported."
+msgstr ""
+"ShapeCast3D از ConcavePolygonShape3D پشتیبانی نمی‌کند. برخوردها گزارش نخواهند "
+"شد."
+
+msgid ""
+"VehicleWheel3D serves to provide a wheel system to a VehicleBody3D. Please "
+"use it as a child of a VehicleBody3D."
+msgstr ""
+"VehicleWheel3D برای ارائه سیستم چرخ به VehicleBody3D استفاده می‌شود. لطفاً از "
+"آن به‌عنوان فرزند VehicleBody3D استفاده کنید."
+
+msgid "Skeleton3D node not set! SkeletonModifier3D must be child of Skeleton3D."
+msgstr ""
+"گره Skeleton3D تنظیم نشده است! SkeletonModifier3D باید فرزند Skeleton3D باشد."
+
 msgid "This body will be ignored until you set a mesh."
 msgstr "این بدن تا زمانی که یک مش بنشانید نادیده خواهد گرفته شد."
 
+msgid "Parent node should be a SpringBoneSimulator3D node."
+msgstr "گره والد باید یک گره SpringBoneSimulator3D باشد."
+
 msgid ""
 "A SpriteFrames resource must be created or set in the \"Sprite Frames\" "
 "property in order for AnimatedSprite3D to display frames."
@@ -12877,24 +14454,162 @@ msgstr ""
 "یک بنمایهٔ فریم‌های اسپرایت باید درون ویژگی \"فریم‌های اسپرایت\" نشانده یا ساخته "
 "شود تا AnimatedSprite3D بتواند فریم‌ها را نمایش دهد."
 
+msgid ""
+"The GeometryInstance3D visibility range's End distance is set to a non-zero "
+"value, but is lower than the Begin distance.\n"
+"This means the GeometryInstance3D will never be visible.\n"
+"To resolve this, set the End distance to 0 or to a value greater than the "
+"Begin distance."
+msgstr ""
+"مقدار فاصله انتهایی بازه دید GeometryInstance3D به مقداری غیرصفر تنظیم شده "
+"است، اما از فاصله شروع کمتر است.\n"
+"این بدان معناست که GeometryInstance3D هرگز قابل مشاهده نخواهد بود.\n"
+"برای رفع این مشکل، فاصله انتهایی را به ۰ یا به مقداری بیشتر از فاصله شروع "
+"تنظیم کنید."
+
+msgid ""
+"The GeometryInstance3D is configured to fade in smoothly over distance, but "
+"the fade transition distance is set to 0.\n"
+"To resolve this, increase Visibility Range Begin Margin above 0."
+msgstr ""
+"GeometryInstance3D برای محو شدن تدریجی بر اساس فاصله تنظیم شده است، اما فاصله "
+"انتقال محو شدن روی ۰ تنظیم شده است.\n"
+"برای رفع این مشکل، Visibility Range Begin Margin را بیشتر از ۰ افزایش دهید."
+
+msgid ""
+"GeometryInstance3D visibility range transparency fade is only available when "
+"using the Forward+ rendering method."
+msgstr ""
+"محدوده شفافیت کاهش دید هندسه‌نمونه‌۳‌بعدی تنها زمانی در دسترس است که از روش رندر "
+"Forward+ استفاده شود."
+
+msgid "Plotting Meshes"
+msgstr "ترسیم مش‌ها"
+
+msgid "Finishing Plot"
+msgstr "پایان ترسیم"
+
+msgid ""
+"VoxelGI nodes are not supported when using the Compatibility renderer yet. "
+"Support will be added in a future release."
+msgstr ""
+"‫گره‌های VoxelGI هنگام استفاده از رندر سازگاری پشتیبانی نمی‌شوند. پشتیبانی از آن "
+"در نسخه‌های آینده اضافه خواهد شد."
+
 msgid ""
 "Only one WorldEnvironment is allowed per scene (or set of instantiated "
 "scenes)."
 msgstr ""
 "تنها یک WorldEnvironment در هر صحنه (یا گروهی از صحنه‌های نمونه‌ساخته) مجاز است."
 
+msgid ""
+"XRCamera3D may not function as expected without an XROrigin3D node as its "
+"parent."
+msgstr ""
+"XRCamera3D ممکن است بدون گره XROrigin3D به عنوان والد، به درستی عمل نکند."
+
+msgid ""
+"XRNode3D may not function as expected without an XROrigin3D node as its "
+"parent."
+msgstr "XRNode3D ممکن است بدون گره XROrigin3D به عنوان والد، به درستی عمل نکند."
+
 msgid "No pose is set."
 msgstr "ژستی نشانده نشده است."
 
+msgid "XROrigin3D requires an XRCamera3D child node."
+msgstr "XROrigin3D به یک گره فرزند XRCamera3D نیاز دارد."
+
+msgid ""
+"XR shaders are not enabled in project settings. Stereoscopic output is not "
+"supported unless they are enabled. Please enable `xr/shaders/enabled` to use "
+"stereoscopic output."
+msgstr ""
+"شیدرهای XR در تنظیمات پروژه فعال نیستند. خروجی استریوسکوپی پشتیبانی نمی‌شود "
+"مگر اینکه فعال شوند. لطفاً «xr/shaders/enabled» را برای استفاده از خروجی "
+"استریوسکوپی فعال کنید."
+
+msgid "On BlendTree node '%s', animation not found: '%s'"
+msgstr "در گره BlendTree «%s»، پویانمایی یافت نشد: «%s»"
+
 msgid "Animation not found: '%s'"
 msgstr "پویانمایی یافت نشد: '%s'"
 
 msgid "Nothing connected to input '%s' of node '%s'."
 msgstr "چیزی به درونداد '%s' گرهٔ '%s' متصل نیست."
 
+msgid "No root AnimationNode for the graph is set."
+msgstr "هیچ AnimationNode ریشه‌ای برای گراف تنظیم نشده است."
+
+msgid ""
+"ButtonGroup is intended to be used only with buttons that have toggle_mode "
+"set to true."
+msgstr ""
+"ButtonGroup فقط برای استفاده با دکمه‌هایی که ویژگی toggle_mode آنها روی true "
+"تنظیم شده است، طراحی شده است."
+
+msgid "Switch between hexadecimal and code values."
+msgstr "بین مقادیر هگزادسیمال و کد جابه‌جا شوید."
+
+msgid ""
+"Container by itself serves no purpose unless a script configures its children "
+"placement behavior.\n"
+"If you don't intend to add a script, use a plain Control node instead."
+msgstr ""
+"یک کانتینر به‌تنهایی هیچ کاربردی ندارد مگر اینکه یک اسکریپت نحوه قرارگیری "
+"فرزندان آن را پیکربندی کند.\n"
+"اگر قصد افزودن اسکریپت ندارید، به جای آن از یک گره Control ساده استفاده کنید."
+
+msgid ""
+"The Hint Tooltip won't be displayed as the control's Mouse Filter is set to "
+"\"Ignore\". To solve this, set the Mouse Filter to \"Stop\" or \"Pass\"."
+msgstr ""
+"نکته‌ی راهنما نمایش داده نخواهد شد زیرا فیلتر ماوس کنترل روی «نادیده‌گرفتن» "
+"تنظیم شده است. برای حل این مشکل، فیلتر ماوس را روی «توقف» یا «عبور» قرار دهید."
+
+msgid ""
+"Please be aware that GraphEdit and GraphNode will undergo extensive "
+"refactoring in a future 4.x version involving compatibility-breaking API "
+"changes."
+msgstr ""
+"لطفاً توجه داشته باشید که GraphEdit و GraphNode در نسخه‌های آینده ۴.x دستخوش "
+"بازنگری گسترده‌ای خواهند شد که شامل تغییرات API ناسازگار خواهد بود."
+
+msgid ""
+"Labels with autowrapping enabled must have a custom minimum size configured "
+"to work correctly inside a container."
+msgstr ""
+"برچسب‌هایی که پیچش خودکار متن در آن‌ها فعال است، باید حداقل اندازه‌ی سفارشی "
+"داشته باشند تا درون یک ظرف به‌درستی کار کنند."
+
+msgid ""
+"The current font does not support rendering one or more characters used in "
+"this Label's text."
+msgstr ""
+"فونت فعلی از نمایش یک یا چند نویسه‌ی استفاده‌شده در متن این برچسب پشتیبانی "
+"نمی‌کند."
+
+msgid ""
+"The current theme style has shadows and/or rounded corners for popups, but "
+"those won't display correctly if \"display/window/per_pixel_transparency/"
+"allowed\" isn't enabled in the Project Settings, nor if it isn't supported."
+msgstr ""
+"‪سبک فعلی پوسته دارای سایه‌ها و/یا گوشه‌های گرد برای پنجره‌های بازشو است، اما این "
+"موارد به‌درستی نمایش داده نخواهند شد اگر **display/window/"
+"per_pixel_transparency/allowed** در تنظیمات پروژه فعال نباشد یا این قابلیت "
+"پشتیبانی نشود."
+
 msgid "If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0."
 msgstr "اگر \"Exp ویرایش\" فعال است, \"حداقل داده\" باید بزرگتر از 0 باشد."
 
+msgid ""
+"ScrollContainer is intended to work with a single child control.\n"
+"Use a container as child (VBox, HBox, etc.), or a Control and set the custom "
+"minimum size manually."
+msgstr ""
+"گره ScrollContainer برای کار با یک کنترل فرزند طراحی شده است.\n"
+"از یک کانتینر به‌عنوان فرزند (مثل VBox، HBox و غیره) یا یک گره Control استفاده "
+"کنید و اندازه حداقل سفارشی را به‌صورت دستی تنظیم کنید."
+
 msgid ""
 "This node doesn't have a SubViewport as child, so it can't display its "
 "intended content.\n"
@@ -12905,6 +14620,45 @@ msgstr ""
 "برای فراهم کردن چیزی نمایش‌پذیر، افزودن زیردیدگستره‌ای به‌عنوان فرزند را در نظر "
 "بگیرید."
 
+msgid ""
+"The default mouse cursor shape of SubViewportContainer has no effect.\n"
+"Consider leaving it at its initial value `CURSOR_ARROW`."
+msgstr ""
+"شکل پیش‌فرض اشاره‌گر ماوس در گره SubViewportContainer هیچ تأثیری ندارد.\n"
+"توصیه می‌شود آن را بر روی مقدار اولیه `CURSOR_ARROW` قرار دهید."
+
+msgid ""
+"This node was an instance of scene '%s', which was no longer available when "
+"this scene was loaded."
+msgstr ""
+"این گره یک نمونه از صحنه '%s' بود، که دیگر در دسترس نبود زمانی که این صحنه "
+"بارگذاری شد."
+
+msgid ""
+"Saving current scene will discard instance and all its properties, including "
+"editable children edits (if existing)."
+msgstr ""
+"ذخیره صحنه جاری باعث از دست رفتن نمونه و تمامی ویژگی‌های آن، از جمله ویرایش‌های "
+"فرزندان قابل ویرایش (در صورت وجود) خواهد شد."
+
+msgid ""
+"This node was saved as class type '%s', which was no longer available when "
+"this scene was loaded."
+msgstr ""
+"این گره به عنوان نوع کلاس '%s' ذخیره شده بود، که دیگر در دسترس نبود زمانی که "
+"این صحنه بارگذاری شد."
+
+msgid ""
+"Data from the original node is kept as a placeholder until this type of node "
+"is available again. It can hence be safely re-saved without risk of data loss."
+msgstr ""
+"داده‌های گره اصلی به عنوان یک جای‌گزین نگهداری می‌شوند تا زمانی که این نوع گره "
+"دوباره در دسترس قرار گیرد. بنابراین، می‌توان آن را با خیال راحت دوباره ذخیره "
+"کرد بدون خطر از دست دادن داده‌ها."
+
+msgid "Unrecognized missing node. Check scene dependency errors for details."
+msgstr "‫گره‌ی گم‌شده‌ی ناشناخته. برای جزئیات، خطاهای وابستگی صحنه را بررسی کنید."
+
 msgid ""
 "This node is marked as deprecated and will be removed in future versions.\n"
 "Please check the Godot documentation for information about migration."
@@ -12912,6 +14666,45 @@ msgstr ""
 "این گره به‌عنوان منسوخ نشانه‌گذاری شده است و در نسخه‌های آینده برچیده خواهد شد.\n"
 "خواهشمندیم مستندات گودوت را برای اطلاعات دربارهٔ مهاجرت بررسی کنید."
 
+msgid ""
+"This node is marked as experimental and may be subject to removal or major "
+"changes in future versions."
+msgstr ""
+"این گره به‌عنوان آزمایشی علامت‌گذاری شده است و ممکن است در نسخه‌های آینده حذف یا "
+"تغییرات عمده‌ای در آن اعمال شود."
+
+msgid ""
+"ShaderGlobalsOverride is not active because another node of the same type is "
+"in the scene."
+msgstr ""
+"ShaderGlobalsOverride فعال نیست زیرا گره دیگری از همان نوع در صحنه وجود دارد."
+
+msgid ""
+"Very low timer wait times (< 0.05 seconds) may behave in significantly "
+"different ways depending on the rendered or physics frame rate.\n"
+"Consider using a script's process loop instead of relying on a Timer for very "
+"low wait times."
+msgstr ""
+"‬زمان‌های انتظار تایمر بسیار کم (< ۰.۰۵ ثانیه) ممکن است بسته به نرخ فریم رندر "
+"یا فیزیک، رفتارهای متفاوتی از خود نشان دهند.\n"
+"توصیه می‌شود به جای استفاده از تایمر برای زمان‌های انتظار بسیار کم، از حلقه "
+"پردازش اسکریپت استفاده کنید."
+
+msgid ""
+"The Viewport size must be greater than or equal to 2 pixels on both "
+"dimensions to render anything."
+msgstr "اندازه درگاه دید باید در هر دو بعد حداقل ۲ پیکسل باشد تا چیزی رندر شود."
+
+msgid ""
+"An incoming node's name clashes with %s already in the scene (presumably, "
+"from a more nested instance).\n"
+"The less nested node will be renamed. Please fix and re-save the scene."
+msgstr ""
+"نام یک گره ورودی با «%s» که قبلاً در صحنه وجود دارد، تداخل دارد (احتمالاً از یک "
+"نمونه‌سازی تو در توتر).\n"
+"گره با عمق کمتری تغییر نام خواهد یافت. لطفاً مشکل را برطرف کرده و صحنه را "
+"دوباره ذخیره کنید."
+
 msgid ""
 "Shader keywords cannot be used as parameter names.\n"
 "Choose another name."
@@ -12919,12 +14712,49 @@ msgstr ""
 "کلیدواژه‌های سایه‌زن نمی‌توانند به‌عنوان نام پارامترها بکارروند.\n"
 "نام دیگری برگزینید."
 
+msgid "This parameter type does not support the '%s' qualifier."
+msgstr "نوع این پارامتر از ویژگی «%s» پشتیبانی نمی‌کند."
+
+msgid ""
+"Global parameter '%s' does not exist.\n"
+"Create it in the Project Settings."
+msgstr ""
+"پارامتر جهانی «%s» وجود ندارد.\n"
+"آن را در تنظیمات پروژه ایجاد کنید."
+
+msgid ""
+"Global parameter '%s' has an incompatible type for this kind of node.\n"
+"Change it in the Project Settings."
+msgstr ""
+"پارامتر جهانی «%s» نوع ناسازگاری برای این نوع گره دارد.\n"
+"آن را در تنظیمات پروژه تغییر دهید."
+
+msgid ""
+"The sampler port is connected but not used. Consider changing the source to "
+"'SamplerPort'."
+msgstr ""
+"درگاه نمونه‌گیر متصل است اما استفاده نمی‌شود. در نظر بگیرید که منبع را به "
+"'SamplerPort' تغییر دهید."
+
 msgid "Invalid source for preview."
 msgstr "منبع نامعتبر برای پیش نمایش."
 
 msgid "Invalid source for shader."
 msgstr "منبع نامعتبر برای شیدر."
 
+msgid ""
+"`%s` precision mode is not available for `gl_compatibility` profile.\n"
+"Reverted to `None` precision."
+msgstr ""
+"حالت دقت `%s` برای نمایه `gl_compatibility` در دسترس نیست.\n"
+"به دقت `None` بازگشت داده شد."
+
+msgid "'%s' type is incompatible with '%s' source."
+msgstr "نوع '%s' با منبع '%s' ناسازگار است."
+
+msgid "'%s' default color is incompatible with '%s' source."
+msgstr "نوع '%s' با منبع '%s' ناسازگار است."
+
 msgid "Default Color"
 msgstr "رنگ پیشفرض"
 
@@ -12937,18 +14767,521 @@ msgstr "تابع همسنجی برای آن گونه نامعتبر است."
 msgid "2D Mode"
 msgstr "حالت دوبعدی"
 
+msgid "Division by zero error."
+msgstr "خطای تقسیم بر صفر."
+
+msgid "Modulo by zero error."
+msgstr "خطای مدولوی بر صفر."
+
+msgid ""
+"Invalid number of arguments when calling stage function '%s', which expects "
+"%d arguments."
+msgstr ""
+"‬تعداد نادرست آرگومان‌ها هنگام فراخوانی تابع مرحله '%s'، که انتظار %d آرگومان "
+"را دارد."
+
+msgid ""
+"Invalid argument type when calling stage function '%s', type expected is '%s'."
+msgstr ""
+"نوع آرگومان نادرست هنگام فراخوانی تابع مرحله '%s'، نوع مورد انتظار '%s' است."
+
+msgid "Expected integer constant within [%d..%d] range."
+msgstr "انتظار می‌رود که یک ثابت صحیح در بازه [%d..%d] وارد شود."
+
+msgid "Argument %d of function '%s' is not a variable, array, or member."
+msgstr "آرگومان %d تابع '%s' یک متغیر، آرایه یا عضو نیست."
+
+msgid "Varyings cannot be passed for the '%s' parameter."
+msgstr "متغیرها نمی‌توانند برای پارامتر '%s' عبور داده شوند."
+
+msgid "A constant value cannot be passed for the '%s' parameter."
+msgstr "‪یک مقدار ثابت نمی‌تواند برای پارامتر '%s' عبور داده شود."
+
+msgid ""
+"Argument %d of function '%s' can only take a local variable, array, or member."
+msgstr ""
+"آرگومان %d تابع '%s' تنها می‌تواند یک متغیر محلی، آرایه یا عضو را بپذیرد."
+
+msgid "Built-in function \"%s(%s)\" is only supported on high-end platforms."
+msgstr "تابع داخلی \"%s(%s)\" تنها در پلتفرم‌های پیشرفته پشتیبانی می‌شود."
+
+msgid "Invalid arguments for the built-in function: \"%s(%s)\"."
+msgstr "آرگومان‌های نادرست برای تابع داخلی: \"%s(%s)\""
+
+msgid "Function '%s' can't be called from source code."
+msgstr "تابع '%s' نمی‌تواند از کد منبع فراخوانی شود."
+
+msgid ""
+"Invalid argument for \"%s(%s)\" function: argument %d should be %s but is %s."
+msgstr ""
+"آرگومان نادرست برای تابع \"%s(%s)\": آرگومان %d باید %s باشد اما %s است."
+
+msgid ""
+"Too few arguments for \"%s(%s)\" call. Expected at least %d but received %d."
+msgstr ""
+"آرگومان‌های کافی برای فراخوانی \"%s(%s)\" وارد نشده‌اند. حداقل %d مورد انتظار "
+"بود اما %d دریافت شد."
+
+msgid ""
+"Too many arguments for \"%s(%s)\" call. Expected at most %d but received %d."
+msgstr ""
+"آرگومان‌های بیش از حد برای فراخوانی \"%s(%s)\" وارد شده‌اند. حداکثر %d مورد "
+"انتظار بود اما %d دریافت شد."
+
+msgid "Expected ',' or ')' after argument."
+msgstr "انتظار می‌رود که پس از آرگومان ',' یا ')' وارد شود."
+
+msgid "Varying may not be assigned in the '%s' function."
+msgstr "متغیر نمی‌تواند در تابع '%s' به آن مقدار داده شود."
+
+msgid "Varying with '%s' data type may only be assigned in the '%s' function."
+msgstr "متغیر با نوع داده '%s' تنها می‌تواند در تابع '%s' مقداردهی شود."
+
+msgid ""
+"Varyings which assigned in '%s' function may not be reassigned in '%s' or "
+"'%s'."
+msgstr ""
+"متغیرهایی که در تابع '%s' مقداردهی شده‌اند، نمی‌توانند در توابع '%s' یا '%s' "
+"دوباره مقداردهی شوند."
+
+msgid "'%s' cannot be used within the '%s' processor function."
+msgstr "'%s' نمی‌تواند در داخل تابع پردازشگر '%s' استفاده شود."
+
+msgid ""
+"'%s' cannot be used here, because '%s' is called by the '%s' processor "
+"function (which is not allowed)."
+msgstr ""
+"'%s' نمی‌تواند اینجا استفاده شود، زیرا '%s' توسط تابع پردازشگر '%s' فراخوانی "
+"می‌شود (که مجاز نیست)."
+
+msgid "Assignment to function."
+msgstr "انتساب به تابع."
+
+msgid "Swizzling assignment contains duplicates."
+msgstr "مقداردهی سوییزلینگ شامل مقادیر تکراری است."
+
+msgid "Assignment to uniform."
+msgstr "واگذاری به یونیفرم."
+
 msgid "Constants cannot be modified."
 msgstr "ثوابت قابل تغییر نیستند."
 
+msgid ""
+"Sampler argument %d of function '%s' called more than once using both built-"
+"ins and uniform textures, this is not supported (use either one or the other)."
+msgstr ""
+"آرگومان سمپلر «%d» تابع «%s» بیش از یک‌بار با استفاده از هر دو تکسچر پیش‌ساخته "
+"و یونیفرم فراخوانی شده است، این مورد پشتیبانی نمی‌شود (از یکی از آن‌ها استفاده "
+"کنید)."
+
+msgid ""
+"Sampler argument %d of function '%s' called more than once using textures "
+"that differ in either filter, repeat, or texture hint setting."
+msgstr ""
+"آرگومان نمونه‌گیر %d از تابع '%s' بیش از یک‌بار با استفاده از بافت‌هایی که در "
+"فیلتر، تکرار یا تنظیم راهنمای بافت متفاوت هستند، فراخوانی شده است."
+
+msgid ""
+"Sampler argument %d of function '%s' called more than once using different "
+"built-ins. Only calling with the same built-in is supported."
+msgstr ""
+"آرگومان نمونه‌گیر %d از تابع «%s» بیش از یک‌بار با استفاده از توابع داخلی مختلف "
+"فراخوانی شده است. تنها فراخوانی با همان تابع داخلی پشتیبانی می‌شود."
+
+msgid "Array size is already defined."
+msgstr "‎اندازه آرایه از پیش تعریف شده است."
+
+msgid "Unknown array size is forbidden in that context."
+msgstr "اندازه نامشخص آرایه در این زمینه مجاز نیست."
+
+msgid "Expected a positive integer constant."
+msgstr "انتظار می‌رود که یک ثابت صحیح مثبت وارد شود."
+
+msgid "Array size mismatch. Expected %d elements (found %d)."
+msgstr "اندازه آرایه هم‌خوانی ندارد. انتظار می‌رفت %d عنصر باشد (اما %d یافت شد)."
+
+msgid "Expected array initialization."
+msgstr "انتظار می‌رود که آرایه مقداردهی اولیه شود."
+
+msgid "Cannot convert from '%s' to '%s'."
+msgstr "نمی‌توان از «%s» به «%s» تبدیل کرد."
+
+msgid "Expected ')' in expression."
+msgstr "انتظار می‌رود که ')' در عبارت وارد شود."
+
+msgid "Expected '(' after the type name."
+msgstr "انتظار می‌رود بعد از نام نوع، '(' وارد شود."
+
 msgid "Expected a function name."
 msgstr "نام تابع مورد انتظار است."
 
+msgid "No matching function found for: '%s'."
+msgstr "هیچ تابعی برای «%s» پیدا نشد."
+
+msgid "Varying '%s' cannot be passed for the '%s' parameter in that context."
+msgstr "متغیر '%s' را نمی‌توان برای پارامتر '%s' در این زمینه ارسال کرد."
+
+msgid ""
+"Unable to pass a multiview texture sampler as a parameter to custom function. "
+"Consider to sample it in the main function and then pass the vector result to "
+"it."
+msgstr ""
+"قادر به ارسال نمونه‌بردار بافت چندنمایی به عنوان پارامتر به تابع سفارشی نیست. "
+"در نظر بگیرید که آن را در تابع اصلی نمونه‌برداری کنید و سپس بردار حاصل را به "
+"آن ارسال کنید."
+
+msgid "Unknown identifier in expression: '%s'."
+msgstr "شناسه ناشناخته در عبارت: '%s'."
+
+msgid ""
+"%s has been removed in favor of using hint_%s with a uniform.\n"
+"To continue with minimal code changes add 'uniform sampler2D %s : hint_%s, "
+"filter_linear_mipmap;' near the top of your shader."
+msgstr ""
+"%s به‌منظور استفاده از hint_%s با یک یونیفرم حذف شده است.\n"
+"برای ادامه با حداقل تغییرات در کد، 'uniform sampler2D %s : hint_%s, "
+"filter_linear_mipmap;' را در نزدیکی بالای شیدر خود اضافه کنید."
+
+msgid "Can't use function as identifier: '%s'."
+msgstr "نمی‌توان از تابع به‌عنوان شناسه استفاده کرد: '%s'."
+
+msgid "Varying with '%s' data type may only be used in the '%s' function."
+msgstr "‎متغیر متغیر با نوع داده '%s' تنها می‌تواند در تابع '%s' استفاده شود."
+
+msgid "Varying '%s' must be assigned in the '%s' function first."
+msgstr "متغیر «%s» باید ابتدا در تابع «%s» مقداردهی شود."
+
+msgid "Only integer expressions are allowed for indexing."
+msgstr "فقط عبارت‌های صحیح برای ایندکس‌گذاری مجاز هستند."
+
+msgid "Index [%d] out of range [%d..%d]."
+msgstr "اندیس [%d] خارج از محدوده [%d..%d] است."
+
+msgid "Expected expression, found: '%s'."
+msgstr "انتظار می‌رفت عبارت وارد شود، اما «%s» یافت شد."
+
+msgid "Expected an identifier as a member."
+msgstr "انتظار می‌رود که یک شناسه به عنوان عضو وارد شود."
+
+msgid "Cannot combine symbols from different sets in expression '.%s'."
+msgstr "نمی‌توان نمادهای متعلق به مجموعه‌های مختلف را در عبارت «.%s» ترکیب کرد."
+
+msgid "Invalid member for '%s' expression: '.%s'."
+msgstr "عضو نامعتبر برای عبارت «%s»: «.%s»."
+
+msgid "An object of type '%s' can't be indexed."
+msgstr "یک شیء از نوع «%s» نمی‌تواند ایندکس شود."
+
+msgid "Invalid base type for increment/decrement operator."
+msgstr "نوع پایه نامعتبر برای عملگر افزایش/کاهش."
+
+msgid "Invalid token for the operator: '%s'."
+msgstr "توکن نامعتبر برای عملگر: «%s»."
+
+msgid "Unexpected end of expression."
+msgstr "پایان غیرمنتظره عبارت."
+
+msgid "Invalid arguments to unary operator '%s': %s."
+msgstr "آرگومان‌های نامعتبر برای عملگر یک‌طرفه «%s»: %s."
+
+msgid "Missing matching ':' for select operator."
+msgstr "عملگر گزینش، «:» مطابقت ندارد."
+
+msgid "Invalid arguments to operator '%s': '%s'."
+msgstr "آرگومان‌های نامعتبر برای عملگر «%s»: «%s»."
+
+msgid "A switch may only contain '%s' and '%s' blocks."
+msgstr "یک سوییچ تنها می‌تواند شامل بلوک‌های «%s» و «%s» باشد."
+
+msgid "Expected variable type after precision modifier."
+msgstr "انتظار می‌رود که نوع متغیر پس از اصلاح‌گر دقت وارد شود."
+
+msgid "Invalid variable type (samplers are not allowed)."
+msgstr "نوع متغیر نامعتبر است (استفاده از نمونه‌گیرها مجاز نیست)."
+
+msgid "Expected an identifier or '[' after type."
+msgstr "انتظار می‌رود که پس از نوع، یک شناسه یا «[» وارد شود."
+
+msgid "Expected an identifier."
+msgstr "انتظار می‌رود که یک شناسه وارد شود."
+
+msgid "Expected array initializer."
+msgstr "انتظار می‌رود مقداردهی اولیه آرایه وارد شود."
+
+msgid "Expected data type after precision modifier."
+msgstr "انتظار می‌رود نوع داده پس از اصلاح‌کننده دقت وارد شود."
+
+msgid "Expected a constant expression."
+msgstr "انتظار می‌رود یک عبارت ثابت وارد شود."
+
+msgid "Expected initialization of constant."
+msgstr "انتظار می‌رود مقداردهی اولیه ثابت وارد شود."
+
+msgid "Expected constant expression for argument %d of function call after '='."
+msgstr ""
+"انتظار می‌رود که یک عبارت ثابت برای آرگومان «%d» در فراخوانی تابع پس از «=» "
+"وارد شود."
+
+msgid "Expected a boolean expression."
+msgstr "انتظار می‌رود یک عبارت بولی وارد شود."
+
+msgid "Cases must be defined before default case."
+msgstr "حالات باید قبل از حالت پیش‌فرض تعریف شوند."
+
+msgid "Default case must be defined only once."
+msgstr "حالت پیش‌فرض باید تنها یک‌بار تعریف شود."
+
+msgid "'%s' must be placed within a '%s' block."
+msgstr "«%s» باید درون یک بلوک «%s» قرار گیرد."
+
+msgid "Expected an integer constant."
+msgstr "انتظار می‌رود که یک ثابت صحیح وارد شود."
+
+msgid "Using '%s' in the '%s' processor function is incorrect."
+msgstr "استفاده از «%s» در تابع پردازشگر «%s» نادرست است."
+
+msgid "Expected '%s' with an expression of type '%s'."
+msgstr "انتظار می‌رود '%s' با یک عبارت از نوع '%s'."
+
+msgid "'%s' function cannot return a value."
+msgstr "تابع '%s' نمی‌تواند مقداری بازگرداند."
+
+msgid "Expected return with an expression of type '%s'."
+msgstr "انتظار می‌رود که بازگشت با عبارتی از نوع '%s' باشد."
+
+msgid "'%s' is not allowed outside of a loop or '%s' statement."
+msgstr "'%s' خارج از یک حلقه یا عبارت '%s' مجاز نیست."
+
+msgid "'%s' is not allowed outside of a loop."
+msgstr "'%s' خارج از یک حلقه مجاز نیست."
+
+msgid "The middle expression is expected to have a boolean data type."
+msgstr "انتظار می‌رود عبارت میانه نوع داده بولی (Boolean) داشته باشد."
+
+msgid "The left expression is expected to be a variable declaration."
+msgstr "عبارت سمت چپ باید یک اعلان متغیر باشد."
+
+msgid "The precision modifier cannot be used on structs."
+msgstr "تعدیل‌کننده‌ی دقت را نمی‌توان روی ساختارها استفاده کرد."
+
+msgid "The precision modifier cannot be used on boolean types."
+msgstr "تعدیل‌کننده‌ی دقت را نمی‌توان روی انواع بولی استفاده کرد."
+
+msgid "Expected '%s' at the beginning of shader. Valid types are: %s."
+msgstr "انتظار می‌رفت «%s» در ابتدای سایه‌زن باشد. انواع معتبر: %s."
+
+msgid ""
+"Expected an identifier after '%s', indicating the type of shader. Valid types "
+"are: %s."
+msgstr ""
+"انتظار می‌رفت یک شناسه پس از «%s» باشد که نوع سایه‌زن را مشخص کند. انواع معتبر: "
+"%s."
+
+msgid "Expected an identifier for render mode."
+msgstr "انتظار می‌رفت یک شناسه برای حالت رندر."
+
+msgid ""
+"Redefinition of render mode: '%s'. The '%s' mode has already been set to '%s'."
+msgstr "تعریف مجدد حالت رندر: «%s». حالت «%s» قبلاً به «%s» تنظیم شده است."
+
+msgid "Expected a struct identifier."
+msgstr "شناسه ساختار انتظار می‌رفت."
+
+msgid "Nested structs are not allowed."
+msgstr "ساختارهای تو در تو مجاز نیستند."
+
+msgid "A '%s' data type is not allowed here."
+msgstr "نوع داده‌ی «%s» در اینجا مجاز نیست."
+
+msgid "Expected an identifier or '['."
+msgstr "یک شناسه یا '[' انتظار می‌رفت."
+
+msgid "Empty structs are not allowed."
+msgstr "ساختارهای خالی مجاز نیستند."
+
+msgid "Uniform instances are not yet implemented for '%s' shaders."
+msgstr "نمونه‌های یونیفرم هنوز برای سایه‌زن‌های «%s» پیاده‌سازی نشده‌اند."
+
+msgid "Interpolation qualifiers are not supported for uniforms."
+msgstr "تعیین‌کننده‌های درون‌یابی برای یونیفرم‌ها پشتیبانی نمی‌شوند."
+
+msgid "The '%s' data type is not supported for uniforms."
+msgstr "نوع داده '%s' برای یونیفرم‌ها پشتیبانی نمی‌شود."
+
+msgid "Interpolation modifier '%s' cannot be used with boolean types."
+msgstr "مدیر interpolation '%s' نمی‌تواند با نوع‌های بولی استفاده شود."
+
+msgid "Global uniform '%s' does not exist. Create it in Project Settings."
+msgstr "یونیفرم جهانی '%s' وجود ندارد. آن را در تنظیمات پروژه ایجاد کنید."
+
+msgid "Global uniform '%s' must be of type '%s'."
+msgstr "یونیفرم جهانی '%s' باید از نوع '%s' باشد."
+
+msgid "The '%s' qualifier is not supported for sampler types."
+msgstr "مؤلفه '%s' برای نوع‌های نمونه‌گیر پشتیبانی نمی‌شود."
+
+msgid "The '%s' qualifier is not supported for matrix types."
+msgstr "مؤلفه '%s' برای انواع ماتریس پشتیبانی نمی‌شود."
+
+msgid "The '%s' qualifier is not supported for uniform arrays."
+msgstr "مؤلفه '%s' برای آرایه‌های یونیفرم پشتیبانی نمی‌شود."
+
+msgid "Expected valid type hint after ':'."
+msgstr "انتظار می‌رود که یک اشاره‌گر نوع معتبر پس از ':' وارد شود."
+
+msgid "This hint is not supported for uniform arrays."
+msgstr "این اشاره‌گر برای آرایه‌های یونیفرم پشتیبانی نمی‌شود."
+
+msgid "Source color hint is for '%s', '%s' or sampler types only."
+msgstr "اشاره‌گر رنگ منبع فقط برای نوع‌های '%s'، '%s' یا نمونه‌گیرهاست."
+
+msgid "Duplicated hint: '%s'."
+msgstr "راهنمای تکراری: '%s'."
+
+msgid "Range hint is for '%s' and '%s' only."
+msgstr "اشاره‌گر بازه فقط برای '%s' و '%s' است."
+
+msgid "Expected ',' after integer constant."
+msgstr "انتظار می‌رود که پس از ثابت صحیح ',' وارد شود."
+
+msgid "Enum hint is for '%s' only."
+msgstr "راهنمای نوع شمارشی فقط برای '%s' است."
+
+msgid "Expected ',' or ')' after string constant."
+msgstr "انتظار می‌رود ',' یا ')' پس از ثابت رشته‌ای وارد شود."
+
+msgid "Can only specify '%s' once."
+msgstr "فقط می‌توان '%s' را یک بار مشخص کرد."
+
+msgid "The instance index can't be negative."
+msgstr "اندیس نمونه نمی‌تواند منفی باشد."
+
+msgid "Allowed instance uniform indices must be within [0..%d] range."
+msgstr "اندیس‌های یونیفرم مجاز باید در بازه [0..%d] قرار داشته باشند."
+
+msgid ""
+"'hint_normal_roughness_texture' is only available when using the Forward+ "
+"renderer."
+msgstr ""
+"'hint_normal_roughness_texture' فقط هنگام استفاده از رندرر Forward+ در دسترس "
+"است."
+
+msgid "'hint_normal_roughness_texture' is not supported in '%s' shaders."
+msgstr "'hint_normal_roughness_texture' در شیدرهای '%s' پشتیبانی نمی‌شود."
+
+msgid "'hint_depth_texture' is not supported in '%s' shaders."
+msgstr "'hint_depth_texture' در شیدرهای '%s' پشتیبانی نمی‌شود."
+
+msgid "This hint is only for sampler types."
+msgstr "این راهنما فقط برای نوع‌های نمونه‌بردار است."
+
+msgid "Redefinition of hint: '%s'. The hint has already been set to '%s'."
+msgstr "بازتعریف راهنما: '%s'. این راهنما قبلاً به '%s' تنظیم شده است."
+
 msgid "Duplicated filter mode: '%s'."
 msgstr "حالت پالایهٔ دوتاسازی شده: '%s'."
 
+msgid ""
+"Redefinition of filter mode: '%s'. The filter mode has already been set to "
+"'%s'."
+msgstr "بازتعریف حالت فیلتر: '%s'. حالت فیلتر قبلاً به '%s' تنظیم شده است."
+
+msgid "Duplicated repeat mode: '%s'."
+msgstr "حالت تکرار تکراری: '%s'."
+
+msgid ""
+"Redefinition of repeat mode: '%s'. The repeat mode has already been set to "
+"'%s'."
+msgstr "بازتعریف حالت تکرار: '%s'. حالت تکرار قبلاً به '%s' تنظیم شده است."
+
+msgid "Too many '%s' uniforms in shader, maximum supported is %d."
+msgstr ""
+"یونیفرم‌های '%s' در سایه‌زن بیش از حد مجاز هستند، حداکثر پشتیبانی شده %d است."
+
+msgid "Setting default values to uniform arrays is not supported."
+msgstr "تنظیم مقادیر پیش‌فرض برای آرایه‌های یونیفرم پشتیبانی نمی‌شود."
+
+msgid "Expected constant expression after '='."
+msgstr "انتظار می‌رود که عبارت ثابت پس از '=' وارد شود."
+
+msgid "Can't convert constant to '%s'."
+msgstr "نمی‌توان ثابت را به '%s' تبدیل کرد."
+
+msgid "Expected an uniform subgroup identifier."
+msgstr "انتظار می‌رود که یک شناسه زیرگروه یونیفرم وارد شود."
+
+msgid "Expected an uniform group identifier."
+msgstr "انتظار می‌رود که یک شناسه گروه یونیفرم وارد شود."
+
+msgid "Expected an uniform group identifier or `;`."
+msgstr "انتظار می‌رود که یک شناسه گروه یونیفرم یا `;` وارد شود."
+
+msgid "Shader type is already defined."
+msgstr "نوع سایه‌زن قبلاً تعریف شده است."
+
+msgid "Expected constant, function, uniform or varying."
+msgstr "انتظار می‌رود که ثابت، تابع، یونیفرم یا متغیر وارد شود."
+
+msgid "Invalid constant type (samplers are not allowed)."
+msgstr "نوع ثابت نامعتبر است (نمونه‌بردارها مجاز نیستند)."
+
+msgid "Invalid function type (samplers are not allowed)."
+msgstr "نوع تابع نامعتبر است (نمونه‌بردارها مجاز نیستند)."
+
+msgid "Expected a function name after type."
+msgstr "انتظار می‌رود که پس از نوع، نام تابع وارد شود."
+
+msgid "Expected '(' after function identifier."
+msgstr "پس از شناسای تابع، پرانتز '(' مورد انتظار است."
+
+msgid ""
+"Global non-constant variables are not supported. Expected '%s' keyword before "
+"constant definition."
+msgstr ""
+"متغیرهای سراسری غیر ثابت پشتیبانی نمی‌شوند. کلمه‌کلیدی '%s' قبل از تعریف ثابت "
+"مورد انتظار است."
+
+msgid "Expected an identifier after type."
+msgstr "پس از نوع، شناسه مورد انتظار است."
+
+msgid "'%s' qualifier cannot be used with a function return type."
+msgstr "مؤلفه '%s' نمی‌تواند با نوع بازگشتی تابع استفاده شود."
+
+msgid ""
+"The '%s' qualifier cannot be used within a function parameter declared with "
+"'%s'."
+msgstr ""
+"کیفیت‌دهنده '%s' نمی‌تواند درون پارامتر تابعی که با '%s' اعلام شده است، استفاده "
+"شود."
+
+msgid "Expected a valid data type for argument."
+msgstr "انتظار می‌رود که یک نوع داده معتبر برای آرگومان وارد شود."
+
+msgid "Opaque types cannot be output parameters."
+msgstr "نوع‌های اپاک نمی‌توانند پارامترهای خروجی باشند."
+
+msgid "Expected an identifier for argument name."
+msgstr "‫یک شناسه برای نام آرگومان مورد انتظار است."
+
+msgid "Function '%s' expects no arguments."
+msgstr "توابع '%s' آرگومان نمی‌پذیرد."
+
+msgid "Function '%s' must be of '%s' return type."
+msgstr "توابع '%s' باید از نوع بازگشتی '%s' باشد."
+
 msgid "Expected a '{' to begin function."
 msgstr "برای شروع یک تابع '{' انتظار میرود."
 
+msgid ""
+"Varying with integer data type must be declared with `%s` interpolation "
+"qualifier."
+msgstr "متغیر با نوع داده صحیح باید با مشخصهٔ درون‌یابی `%s` اعلام شود."
+
+msgid "Too many varyings used in shader (%d used, maximum supported is %d)."
+msgstr ""
+"‫تعداد زیادی متغیر در سایه‌زن استفاده شده است (%d استفاده شده، حداکثر پشتیبانی "
+"شده %d است)."
+
 msgid "Expected a '%s'."
 msgstr "%s انتظار میرود."
 
@@ -12961,9 +15294,24 @@ msgstr "%s بعد از %s انتظار میردود."
 msgid "Redefinition of '%s'."
 msgstr "تعریف دوبارهٔ %s."
 
+msgid "Unknown directive."
+msgstr "دستور ناشناخته."
+
+msgid "Macro redefinition."
+msgstr "تعریف مجدد ماکرو."
+
 msgid "Invalid argument name."
 msgstr "نام آرگومان نامعتبر."
 
+msgid "Expected a comma in the macro argument list."
+msgstr "وارد کردن ویرگول در فهرست آرگومان‌های ماکرو مورد انتظار است."
+
+msgid "'##' must not appear at beginning of macro expansion."
+msgstr "'##' نباید در ابتدای گسترش ماکرو ظاهر شود."
+
+msgid "'##' must not appear at end of macro expansion."
+msgstr "'##' نباید در انتهای گسترش ماکرو ظاهر شود."
+
 msgid "Missing condition."
 msgstr "نبود شرط."
 
@@ -12973,6 +15321,25 @@ msgstr "خطای ارزیابی شرط."
 msgid "Shader include file does not exist:"
 msgstr "فایل سایه‌زن موجود نیست:"
 
+msgid ""
+"Shader include load failed. Does the shader include exist? Is there a cyclic "
+"dependency?"
+msgstr ""
+"بارگذاری گنجاندن سایه‌زن ناموفق بود. آیا گنجاندن سایه‌زن وجود دارد؟ آیا وابستگی "
+"حلقوی وجود دارد؟"
+
+msgid "Cyclic include found"
+msgstr "گنجاندن حلقوی پیدا شد"
+
+msgid "Shader max include depth exceeded."
+msgstr "حق گنجاندن حداکثر سایه‌زن فراتر رفته است."
+
+msgid "Cannot use '%s' on built-in define."
+msgstr "امکان استفاده از «%s» روی تعریف داخلی وجود ندارد."
+
+msgid "Macro expansion limit exceeded."
+msgstr "از حد مجاز گسترش ماکرو فراتر رفت."
+
 msgid "Invalid macro argument list."
 msgstr "لیست آرگومان های کوچک نامعتبر."
 
@@ -12981,3 +15348,56 @@ msgstr "آرگومان کوچک نامعتبر."
 
 msgid "Invalid macro argument count."
 msgstr "تعداد آرگومان کوچک نامعتبر."
+
+msgid "Can't find matching branch directive."
+msgstr "دستور شاخه‌ی تطبیق یافت نشد."
+
+msgid "Unmatched conditional statement."
+msgstr "بیانیه شرطی تطابق ندارد."
+
+msgid ""
+"Direct floating-point comparison (this may not evaluate to `true` as you "
+"expect). Instead, use `abs(a - b) < 0.0001` for an approximate but "
+"predictable comparison."
+msgstr ""
+"مقایسه مستقیم اعداد اعشاری (این ممکن است به صورت مورد انتظار شما ارزیابی "
+"نشود). به جای آن، از `abs(a - b) < 0.0001` برای مقایسه تقریبی اما قابل "
+"پیش‌بینی استفاده کنید."
+
+msgid "The const '%s' is declared but never used."
+msgstr "ثابت '%s' اعلام شده اما هرگز استفاده نشده است."
+
+msgid "The function '%s' is declared but never used."
+msgstr "تابع '%s' اعلام شده اما هرگز استفاده نشده است."
+
+msgid "The struct '%s' is declared but never used."
+msgstr "ساختار '%s' اعلام شده اما هرگز استفاده نشده است."
+
+msgid "The uniform '%s' is declared but never used."
+msgstr "یونیفرم '%s' اعلام شده اما هرگز استفاده نشده است."
+
+msgid "The varying '%s' is declared but never used."
+msgstr "متغیر '%s' اعلام شده اما هرگز استفاده نشده است."
+
+msgid "The local variable '%s' is declared but never used."
+msgstr "متغیر محلی '%s' اعلام شده اما هرگز استفاده نشده است."
+
+msgid ""
+"The total size of the %s for this shader on this device has been exceeded (%d/"
+"%d). The shader may not work correctly."
+msgstr ""
+"حجم کل %s برای این سایه‌زن در این دستگاه از حد مجاز عبور کرده است (%d/%d). "
+"ممکن است سایه‌زن به درستی کار نکند."
+
+msgid ""
+"You are attempting to assign the VERTEX position in model space to the vertex "
+"POSITION in clip space. The definition of clip space changed in version 4.3, "
+"so if this code was written prior to 4.3, it will not continue to work. "
+"Consider specifying the clip space z-component directly i.e. use `vec4(VERTEX."
+"xy, 1.0, 1.0)`."
+msgstr ""
+"شما در حال تلاش برای تخصیص موقعیت VERTEX در فضای مدل به موقعیت POSITION در "
+"فضای کلیپ هستید. تعریف فضای کلیپ در نسخه ۴.۳ تغییر کرده است، بنابراین اگر این "
+"کد پیش از نسخه ۴.۳ نوشته شده باشد، دیگر کار نخواهد کرد. در نظر بگیرید که "
+"مؤلفه z فضای کلیپ را به طور مستقیم مشخص کنید، به عنوان مثال از `vec4(VERTEX."
+"xy, 1.0, 1.0)` استفاده کنید."
diff --git a/engine/editor/translations/editor/fi.po b/engine/editor/translations/editor/fi.po
index 15eefff1..7b69e0f0 100644
--- a/engine/editor/translations/editor/fi.po
+++ b/engine/editor/translations/editor/fi.po
@@ -25,13 +25,14 @@
 # Emil Hakala <emil.hakala44@gmail.com>, 2024.
 # Ricky Tigg <ricky.tigg@gmail.com>, 2025.
 # V Lo <vil.lokasaari@gmail.com>, 2025.
+# voeron <olsio@hotmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-24 06:34+0000\n"
-"Last-Translator: V Lo <vil.lokasaari@gmail.com>\n"
+"PO-Revision-Date: 2025-03-03 21:49+0000\n"
+"Last-Translator: voeron <olsio@hotmail.com>\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/fi/>\n"
 "Language: fi\n"
@@ -39,7 +40,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Main Thread"
 msgstr "Pääsäie"
@@ -466,6 +467,9 @@ msgstr "Palauta toimenpide"
 msgid "Add Event"
 msgstr "Lisää tapahtuma"
 
+msgid "Remove Action"
+msgstr "Poista Toiminto"
+
 msgid "Cannot Remove Action"
 msgstr "Ei voida poistaa toimenpidettä"
 
@@ -481,14 +485,17 @@ msgstr "Suodata nimellä"
 msgid "Clear All"
 msgstr "Tyhjennä kaikki"
 
+msgid "Clear all search filters."
+msgstr "Tyhjennä kaikki hakukriteerit."
+
 msgid "Add New Action"
-msgstr "Lisää uusi toimenpide"
+msgstr "Lisää uusi toiminto"
 
 msgid "Add"
 msgstr "Lisää"
 
 msgid "Show Built-in Actions"
-msgstr "Näytä sisäänrakennetut toimenpiteet"
+msgstr "Näytä valmiit toiminnot"
 
 msgid "Action"
 msgstr "Toiminto"
@@ -503,7 +510,7 @@ msgid "Type:"
 msgstr "Tyyppi:"
 
 msgid "Metadata name is valid."
-msgstr "Metadatan nimi on kelvollinen."
+msgstr "Metadatan nimi on validi."
 
 msgid "Add Metadata Property for \"%s\""
 msgstr "Lisää Metadata Ominaisuus \"%s\""
@@ -512,7 +519,7 @@ msgid "Metadata name can't be empty."
 msgstr "Metadatan nimi ei voi olla tyhjä."
 
 msgid "Metadata name must be a valid identifier."
-msgstr "Metadatan nimen täytyy olla kelvollinen tunniste."
+msgstr "Metadatan nimen täytyy olla validi tunniste."
 
 msgid "Metadata with name \"%s\" already exists."
 msgstr "Metadata nimellä \"%s\" on jo olemassa."
@@ -548,10 +555,10 @@ msgid "Delete Selected Key(s)"
 msgstr "Poista valitut avaimet"
 
 msgid "Make Handles Free"
-msgstr "Vapauta Käsittelijät"
+msgstr "Vapauta Kahvat"
 
 msgid "Make Handles Linear"
-msgstr "Muuta Käsittelijät Lineaarisiksi"
+msgstr "Muuta Kahvat Lineaarisiksi"
 
 msgid "Make Handles Balanced"
 msgstr "Muuta Käsittelijät Tasapainotetuiksi"
@@ -574,6 +581,12 @@ msgstr "Siirrä Bezier-pisteitä"
 msgid "Animation Duplicate Keys"
 msgstr "Animaatio: Monista avaimet"
 
+msgid "Animation Cut Keys"
+msgstr "Animaatio: Leikkaa avaimet"
+
+msgid "Animation Paste Keys"
+msgstr "Animaatio: Liitä avaimet"
+
 msgid "Animation Delete Keys"
 msgstr "Animaatio: Poista avaimet"
 
diff --git a/engine/editor/translations/editor/fr.po b/engine/editor/translations/editor/fr.po
index f6fef7dc..c6dd6aaf 100644
--- a/engine/editor/translations/editor/fr.po
+++ b/engine/editor/translations/editor/fr.po
@@ -125,7 +125,7 @@
 # Hugo cartier <hugo.toticartier@gmail.com>, 2023.
 # Rémy Lapointe <remy-lapointe@hotmail.ca>, 2023.
 # "Dimitri A." <dimitripilot3@gmail.com>, 2023.
-# Donovan Cartier <donovan.cartier0@gmail.com>, 2023.
+# Donovan Cartier <donovan.cartier0@gmail.com>, 2023, 2025.
 # Rémi Verschelde <remi@godotengine.org>, 2023, 2024.
 # Nifou <nifou@mailfence.com>, 2023.
 # Antonia Carrier <carrier.antonia@gmail.com>, 2023.
@@ -185,13 +185,14 @@
 # aioshiro <aioshiro57@proton.me>, 2025.
 # Valentin Pecatte <v.pecatte@gmail.com>, 2025.
 # xpeuvr327 <phucbaodomi@gmail.com>, 2025.
+# Alastair L <alockepublic+weblate@proton.me>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-03-02 03:07+0000\n"
-"Last-Translator: xpeuvr327 <phucbaodomi@gmail.com>\n"
+"PO-Revision-Date: 2025-03-10 12:20+0000\n"
+"Last-Translator: Alastair L <alockepublic+weblate@proton.me>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/godot/"
 "fr/>\n"
 "Language: fr\n"
@@ -1681,6 +1682,9 @@ msgstr "Délier les Arguments du Signal :"
 msgid "Receiver Method:"
 msgstr "Méthode du récepteur :"
 
+msgid "Pick"
+msgstr "Choisir"
+
 msgid "Advanced"
 msgstr "Options avancées"
 
@@ -5180,6 +5184,9 @@ msgstr "Installer depuis un fichier"
 msgid "Install templates from a local file."
 msgstr "Installer des modèles d'exportation depuis un fichier local."
 
+msgid "Go Online"
+msgstr "Passer en mode en ligne"
+
 msgid "Cancel the download of the templates."
 msgstr "Annuler le téléchargement des modèles d'exportation."
 
@@ -6115,7 +6122,7 @@ msgid ""
 "performance impact:"
 msgstr ""
 "Le démarrage automatique est activé pour les profileurs suivants, ce qui peut "
-"avoir un impact sur la performance:"
+"avoir un impact sur la performance :"
 
 msgid "Network Profiler"
 msgstr "Profileur réseau"
@@ -6128,7 +6135,7 @@ msgstr ""
 "Godot a ouvert le projet en Mode Récupération, qui est un mode spécial qui "
 "peut aider à récupérer des projets qui plantent le moteur lors de "
 "l'initialisation. Les fonctionnalités suivantes ont été temporairements "
-"désactivées:"
+"désactivées :"
 
 msgid "Automatic scene restoring"
 msgstr "Récupération de scène automatique"
@@ -6253,6 +6260,16 @@ msgstr ""
 "Date de la validation Git : %s\n"
 "Cliquez pour copier les informations de version."
 
+msgid ""
+"The root node of a scene is recommended to not be transformed, since "
+"instances of the scene will usually override this. Reset the transform and "
+"reload the scene to remove this warning."
+msgstr ""
+"Il n'est pas recommandé de changer la transformation d'un nœud racine d'une "
+"scène, car généralement les instances de la scène la remplaceront. "
+"Réinitialisez la transformation et rechargez la scène pour retirer cet "
+"avertissement."
+
 msgid "Toggle Visible"
 msgstr "Rendre visible"
 
@@ -6372,6 +6389,14 @@ msgstr "Avertissement de configuration de nœud !"
 msgid "Revoke"
 msgstr "Révoquer"
 
+msgid ""
+"This dialog can also be enabled/disabled in the Editor Settings: Docks > "
+"Scene Tree > Ask Before Revoking Unique Name."
+msgstr ""
+"Cette boîte de dialogue peut aussi être activée/désactivée dans les "
+"Paramètres de l'éditeur : Docks > Arborescence de scène > Ask Before Revoking "
+"Unique Name."
+
 msgid "Allowed:"
 msgstr "Autorisé :"
 
@@ -7861,9 +7886,6 @@ msgstr ""
 "La Bibliothèque d'Assets nécessite une connexion internet et implique l'envoi "
 "de données par Internet."
 
-msgid "Go Online"
-msgstr "Passer en mode en ligne"
-
 msgid "Failed to get repository configuration."
 msgstr "Échec de récupération de la configuration du répertoire."
 
@@ -8837,12 +8859,143 @@ msgstr "Variation"
 msgid "Unable to preview font"
 msgstr "Impossible de prévisualiser la police"
 
+msgid "Game starting..."
+msgstr "Lancement du jeu en cours..."
+
+msgid "Game running not embedded."
+msgstr "Le jeu est lancé en mode non intégré."
+
 msgid "Press play to start the game."
 msgstr "Appuyez sur jouer pour démarrer le jeu."
 
+msgid "Embedding is disabled."
+msgstr "L'intégration du jeu est désactivée."
+
+msgid ""
+"Game embedding not available on Wayland.\n"
+"Wayland can be disabled in the Editor Settings (Run > Platforms > Linux/*BSD "
+"> Prefer Wayland)."
+msgstr ""
+"Le jeu en mode intégré n'est pas disponible sur Wayland.\n"
+"Wayland peut être désactivé dans les Paramètres de l'éditeur (Exécuter > "
+"Plateformes > Linux/*BSD > Préférer Wayland)."
+
 msgid "Game embedding not available on your OS."
 msgstr "La prévisualisation du jeu n'est pas disponible sur votre OS."
 
+msgid ""
+"Game embedding not available for the Display Server: '%s'.\n"
+"Display Server can be modified in the Project Settings (Display > Display "
+"Server > Driver)."
+msgstr ""
+"Le jeu en mode intégré n'est pas disponible pour ce serveur d'affichage : "
+"'%s'.\n"
+"Le serveur d'affichage peut être modifié dans les Paramètres du projet "
+"(Affichage > Affichage serveur > Pilote)."
+
+msgid ""
+"Game embedding not available when the game starts minimized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Le jeu en mode intégré n'est pas disponible quand le jeu démarre en fenêtre "
+"minimisée.\n"
+"Envisagez de surcharger le mode de fenêtre du projet avec la valeur Windowed "
+"en utilisant le tag de fonctionnalité \"editor\" afin d'utiliser le jeu en "
+"mode intégré tout en laissant intact le projet exporté."
+
+msgid ""
+"Game embedding not available when the game starts maximized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Le jeu en mode intégré n'est pas disponible quand le jeu démarre en fenêtre "
+"maximisée.\n"
+"Envisagez de surcharger le mode de fenêtre du projet avec la valeur Windowed "
+"en utilisant le tag de fonctionnalité \"editor\" afin d'utiliser le jeu en "
+"mode intégré tout en laissant intact le projet exporté."
+
+msgid ""
+"Game embedding not available when the game starts in fullscreen.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Le jeu en mode intégré n'est pas disponible quand le jeu démarre en plein "
+"écran.\n"
+"Envisagez de surcharger le mode de fenêtre du projet avec la valeur Windowed "
+"en utilisant le tag de fonctionnalité \"editor\" afin d'utiliser le jeu en "
+"mode intégré tout en laissant intact le projet exporté."
+
+msgid "Game embedding not available in single window mode."
+msgstr ""
+"Le jeu en mode intégré n'est pas disponible avec le mode fenêtre unique."
+
+msgid "Suspend"
+msgstr "Suspendre"
+
+msgid "Allow game input."
+msgstr "Autoriser les entrées du jeu."
+
+msgid ""
+"Disable game input and allow to select Node2Ds, Controls, and manipulate the "
+"2D camera."
+msgstr ""
+"Désactiver les entrées du jeu et permettre de sélectionner les Node2Ds et les "
+"Controls, ainsi que de manipuler la caméra 2D."
+
+msgid ""
+"Disable game input and allow to select Node3Ds and manipulate the 3D camera."
+msgstr ""
+"Désactiver les entrées du jeu et permettre de sélectionner les Node3Ds ainsi "
+"que de manipuler la caméra 3D."
+
+msgid "Toggle Selection Visibility"
+msgstr "Basculer la visibilité de la sélection"
+
+msgid "Camera Override Options"
+msgstr "Options de surcharge de la caméra"
+
+msgid "Reset 2D Camera"
+msgstr "Réinitialiser la caméra 2D"
+
+msgid "Reset 3D Camera"
+msgstr "Réinitialiser la caméra 3D"
+
+msgid "Manipulate In-Game"
+msgstr "Manipuler en jeu"
+
+msgid "Manipulate From Editors"
+msgstr "Manipuler depuis les éditeurs"
+
+msgid ""
+"Embedded game size is based on project settings.\n"
+"The 'Keep Aspect' mode is used when the Game Workspace is smaller than the "
+"desired size."
+msgstr ""
+"La taille du jeu en mode intégré est basée sur les paramètres du projet.\n"
+"Le mode \"Conserver les proportions\" est utilisé quand l'espace de travail "
+"du jeu est plus petit que la taille désirée."
+
+msgid "Keep the aspect ratio of the embedded game."
+msgstr "Conserver les proportions du jeu en mode intégré."
+
+msgid "Embedded game size stretches to fit the Game Workspace."
+msgstr ""
+"La taille du jeu en mode intégré s'étire pour s'adapter à l'espace de travail "
+"du jeu."
+
+msgid "Embedding Options"
+msgstr "Options du mode intégré"
+
+msgid "Embed Game on Next Play"
+msgstr "Intégrer le jeu lors du prochain lancement"
+
+msgid "Make Game Workspace Floating on Next Play"
+msgstr "Rendre l'espace de travail du jeu flottant lors du prochain lancement"
+
 msgid "Change AudioStreamPlayer3D Emission Angle"
 msgstr "Changer l'angle d'émission AudioStreamPlayer3D"
 
@@ -14482,6 +14635,24 @@ msgstr ""
 "Supprimer tous les projets manquants de la liste ?\n"
 "Le contenu des dossiers du projet ne sera pas modifié."
 
+msgid ""
+"It looks like Godot crashed when opening this project the last time. If "
+"you're having problems editing this project, you can try to open it in "
+"Recovery Mode."
+msgstr ""
+"On dirait que Godot a planté durant la dernière ouverture du projet. Si vous "
+"avez des problèmes pour éditer ce projet, vous pouvez essayer de l'ouvrir en "
+"mode Récupération."
+
+msgid ""
+"Recovery Mode is a special mode that may help to recover projects that crash "
+"the engine during initialization. This mode temporarily disables the "
+"following features:"
+msgstr ""
+"Le mode Récupération est un mode spécial qui peut aider à récupérer des "
+"projets qui plantent le moteur durant l'initialisation. Ce mode désactive "
+"temporairement les fonctionnalités suivantes :"
+
 msgid "Couldn't load project at '%s'. It may be missing or corrupted."
 msgstr ""
 "N'a pas pu charger le projet à \"%s\". Il peut être manquant ou corrompu."
@@ -14554,8 +14725,8 @@ msgid ""
 "Asset Library!"
 msgstr ""
 "Commencez par en créer un nouveau,\n"
-"en important un qui existe, ou en téléchargeant un modèle de projet depuis la "
-"bibliothèque d'actifs !"
+"en importer un qui existe, ou en téléchargeant un modèle de projet depuis la "
+"bibliothèque d'assets !"
 
 msgid "Create New Project"
 msgstr "Créer un nouveau projet"
@@ -15067,9 +15238,6 @@ msgstr "Balises de fonctionnalités"
 msgid "Pick Root Node Type"
 msgstr "Choisir le type de nœud racine"
 
-msgid "Pick"
-msgstr "Choisir"
-
 msgid "Scene name is empty."
 msgstr "Le nom de la scène est vide."
 
@@ -15760,41 +15928,8 @@ msgstr ""
 msgid "Restart & Upgrade"
 msgstr "Redémarrer et mettre à jour"
 
-msgid ""
-"As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
-"\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
-msgstr ""
-"Avec la version 4.4 de Godot, les scènes et les ressources utilisent des UIDs "
-"pour référencer les scripts et les shaders.\n"
-"\n"
-"Normalement, cette mise à jour est appliquée à une scène ou à une ressource "
-"une fois sauvegardée avec Godot 4.4 pour la première fois. Si vous avez "
-"beaucoup de scènes et/ou de ressources, faire cela manuellement peut être "
-"chronophage. Cet outil va mettre à jour chaque scène et ressource du projet.\n"
-"\n"
-"Cliquez sur « Redémarrer et mettre à jour » pour redémarrer l'éditeur et "
-"mettre à jour toutes les scènes et ressources de ce projet. Cela peut prendre "
-"plusieurs minutes en fonction de la taille de votre projet.\n"
-"\n"
-"Note : Veuillez vous assurer qu'une copie de votre projet est sauvegardée "
-"avant de lancer cet outil, pour éviter la possibilité de perte de données. De "
-"plus, veuillez commit tous les fichiers .uid dans les logiciels de gestion de "
-"versions (et ne les ajoutez pas dans les listes pour ignorer les fichiers "
-"comme .gitignore)."
+msgid "Learn More"
+msgstr "En savoir plus"
 
 msgid "Make this panel floating in the screen %d."
 msgstr "Rendre ce panneau flottant sur l'écran %d."
@@ -15809,6 +15944,19 @@ msgstr ""
 msgid "Select Screen"
 msgstr "Sélectionner un écran"
 
+msgid ""
+"The CSGShape3D has an empty shape.\n"
+"CSGShape3D empty shapes typically occur because the mesh is not manifold.\n"
+"A manifold mesh forms a solid object without gaps, holes, or loose edges.\n"
+"Each edge must be a member of exactly two faces."
+msgstr ""
+"Le CSGShape3D a une forme vide.\n"
+"Les formes vides de CSGShape3D se produisent généralement parce que le "
+"maillage n'est pas manifold.\n"
+"Un maillage manifold forme un objet solide sans écarts, trous ou arrêtes "
+"isolées.\n"
+"Chaque arrête doit être un membre d'exactement deux faces."
+
 msgid "Change Torus Inner Radius"
 msgstr "Changer le rayon intérieur de la tour"
 
diff --git a/engine/editor/translations/editor/ga.po b/engine/editor/translations/editor/ga.po
index 77f2e2d2..48d03a98 100644
--- a/engine/editor/translations/editor/ga.po
+++ b/engine/editor/translations/editor/ga.po
@@ -1409,6 +1409,9 @@ msgstr "Argóintí Comhartha Unbind:"
 msgid "Receiver Method:"
 msgstr "Modh glacadóra:"
 
+msgid "Pick"
+msgstr "Pioc"
+
 msgid "Advanced"
 msgstr "Ardrang"
 
@@ -4757,6 +4760,9 @@ msgstr "Suiteáil ó Chomhad"
 msgid "Install templates from a local file."
 msgstr "Suiteáil teimpléid ó chomhad logánta."
 
+msgid "Go Online"
+msgstr "Téigh Ar Líne"
+
 msgid "Cancel the download of the templates."
 msgstr "Cealaigh íoslódáil na dteimpléad."
 
@@ -7284,9 +7290,6 @@ msgstr ""
 "Teastaíonn nasc ar líne ón Leabharlann Sócmhainní agus is éard atá i gceist "
 "léi ná sonraí a sheoladh ar an idirlíon."
 
-msgid "Go Online"
-msgstr "Téigh Ar Líne"
-
 msgid "Failed to get repository configuration."
 msgstr "Theip ar chumraíocht an stóir a fháil."
 
@@ -14408,9 +14411,6 @@ msgstr "Clibeanna Gné"
 msgid "Pick Root Node Type"
 msgstr "Roghnaigh Cineál Nód Fréimhe"
 
-msgid "Pick"
-msgstr "Pioc"
-
 msgid "Scene name is empty."
 msgstr "Tá ainm an radhairc folamh."
 
diff --git a/engine/editor/translations/editor/id.po b/engine/editor/translations/editor/id.po
index 4f753ff2..15bac6b0 100644
--- a/engine/editor/translations/editor/id.po
+++ b/engine/editor/translations/editor/id.po
@@ -65,13 +65,14 @@
 # Bintang AP <prep77070@gmail.com>, 2024.
 # "Achmad Izzuddin (Adin)" <achmadizzuddin999@gmail.com>, 2024.
 # meghundul <meghundul@gmail.com>, 2025.
+# Fatih Faisal Faruk <honeylimecraft@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-01-23 17:31+0000\n"
-"Last-Translator: meghundul <meghundul@gmail.com>\n"
+"PO-Revision-Date: 2025-03-18 23:08+0000\n"
+"Last-Translator: Fatih Faisal Faruk <honeylimecraft@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/id/>\n"
 "Language: id\n"
@@ -79,7 +80,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.10-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Utas Utama"
@@ -437,6 +438,9 @@ msgstr "Tampilkan Tersembunyi"
 msgid "Swap Input Direction"
 msgstr "Tukar Arah Masukan"
 
+msgid "Start Unicode Character Input"
+msgstr "Mulai Input Karakter Unicode"
+
 msgid "Invalid input %d (not passed) in expression"
 msgstr "Masukkan tidak sah %d (tidak lulus) dalam ekspresi"
 
@@ -2611,6 +2615,9 @@ msgstr "Impor Profil"
 msgid "Manage Editor Feature Profiles"
 msgstr "Kelola Editor Profil Fitur"
 
+msgid "Initializing plugins..."
+msgstr "Menginisialisasi plugin..."
+
 msgid "Restart"
 msgstr "Mulai Ulang"
 
@@ -2633,6 +2640,9 @@ msgstr "Mengimpor ulang Aset"
 msgid "Import resources of type: %s"
 msgstr "Mengimpor sumber daya dengan tipe: %s"
 
+msgid "Finalizing Asset Import..."
+msgstr "Menyelesaikan impor asset..."
+
 msgid "This method supports a variable number of arguments."
 msgstr "Metode ini mendukung jumlah argumen yang bervariasi."
 
@@ -2916,6 +2926,12 @@ msgstr "Anggota ini ditandai sebagai tidak digunakan lagi."
 msgid "This member is marked as experimental."
 msgstr "Anggota ini ditandai sebagai eksperimental."
 
+msgid "Make this property be put back at its original place."
+msgstr "Buat properti ini diletakkan kembali di posisi semula."
+
+msgid "Make this property be placed at the top for all objects of this class."
+msgstr "Buat properti ini diletakkan di atas untuk semua objek di kelas ini."
+
 msgid "Pin Value"
 msgstr "Nilai Pin"
 
@@ -3103,6 +3119,9 @@ msgstr "Inspektur Sumber Shader Asli"
 msgid "Unnamed Project"
 msgstr "Proyek Tanpa Nama"
 
+msgid "Recovery Mode is enabled. Editor functionality has been restricted."
+msgstr "Mode pemulihan diaktifkan. Fungsionalitas editor dibatasi."
+
 msgid ""
 "Spins when the editor window redraws.\n"
 "Update Continuously is enabled, which can increase power usage. Click to "
@@ -3235,6 +3254,9 @@ msgstr ""
 msgid "Save Scene As..."
 msgstr "Simpan Adegan Sebagai..."
 
+msgid "Pack Project as ZIP..."
+msgstr "Bungkus proyek sebagai ZIP..."
+
 msgid "Can't undo while mouse buttons are pressed."
 msgstr "Tidak bisa membatalkan ketika tombol mouse ditekan."
 
@@ -4017,9 +4039,15 @@ msgstr "Gagal untuk ekstrak biner tipis."
 msgid "Invalid binary format."
 msgstr "Format biner tidak valid."
 
+msgid "Already signed!"
+msgstr "Sudah ditandai!"
+
 msgid "Failed to create _CodeSignature subfolder."
 msgstr "Gagal membuat subfolder _CodeSignature."
 
+msgid "Can't resize signature load command."
+msgstr "Tidak bisa mengubah signatur komando load."
+
 msgid "Failed to create fat binary."
 msgstr "Gagal membuat biner tebal."
 
diff --git a/engine/editor/translations/editor/it.po b/engine/editor/translations/editor/it.po
index 25f019b6..42e88c9b 100644
--- a/engine/editor/translations/editor/it.po
+++ b/engine/editor/translations/editor/it.po
@@ -61,7 +61,7 @@
 # Daniele Basso <tiziodcaio@gmail.com>, 2021.
 # Riteo Siuga <riteo@posteo.net>, 2021, 2022, 2023, 2024.
 # Luigi <luibass92@live.it>, 2021.
-# Micky <micheledevita2@gmail.com>, 2021, 2022, 2023, 2024.
+# Micky <micheledevita2@gmail.com>, 2021, 2022, 2023, 2024, 2025.
 # Fabio Plos <altre0cose@gmail.com>, 2021.
 # Theraloss <danilo.polani@gmail.com>, 2021.
 # Pietro Grungo <pietro.grungo@libero.it>, 2021.
@@ -112,13 +112,15 @@
 # SG <s.gallerini@users.noreply.hosted.weblate.org>, 2025.
 # BloodyBlade05 <giacomo.alfano@studenti.unipg.it>, 2025.
 # Davide Rinarelli <rinarellidavide@gmail.com>, 2025.
+# Gabriele Ellena <kitzugaming2001@proton.me>, 2025.
+# Kero0x9 <tekken857@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-28 19:26+0000\n"
-"Last-Translator: Davide Rinarelli <rinarellidavide@gmail.com>\n"
+"PO-Revision-Date: 2025-03-14 14:07+0000\n"
+"Last-Translator: Micky <micheledevita2@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/it/>\n"
 "Language: it\n"
@@ -126,7 +128,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Thread principale"
@@ -485,7 +487,7 @@ msgid "Swap Input Direction"
 msgstr "Inverti la direzione di input"
 
 msgid "Start Unicode Character Input"
-msgstr "Avviare l'immissione dei caratteri Unicode"
+msgstr "Avvia inserimento di un carattere Unicode"
 
 msgid "Invalid input %d (not passed) in expression"
 msgstr "Input %d non valido (assente) nell'espressione"
@@ -737,12 +739,13 @@ msgid ""
 "settings and select the animation.\n"
 "You can then change the loop mode from the inspector menu."
 msgstr ""
-"Non è possibile cambiare la modalità di ripetizione sulla animazione "
+"Non è possibile cambiare la modalità di ripetizione in un'animazione "
 "istanziata da una scena importata.\n"
 "\n"
-"Per cambiare questa modalità di ripetizione, navigare alle impostazioni di "
-"importo avanzate della scena e selezionare la animazione.\n"
-"Puoi cambiare la modalità di ripetizione dal menu ispettore."
+"Per cambiare la modalità di ripetizione di questa animazione, navigare alle "
+"impostazioni avanzate di importo della scena e selezionare l'animazione.\n"
+"È possibile successivamente cambiare la modalità di ripetizione dal menu "
+"ispettore."
 
 msgid "Can't change loop mode on animation instanced from an imported resource."
 msgstr ""
@@ -754,15 +757,15 @@ msgid ""
 "\n"
 "You must open this scene and change the animation's loop mode from there."
 msgstr ""
-"Impossibile cambiare la modalità di ripetizione di un'animazione integrata in "
-"un'altra scena.\n"
+"Impossibile cambiare la modalità di ripetizione di un'animazione incorporata "
+"in un'altra scena.\n"
 "\n"
-"Devi aprire quella scena e cambiare la modalità di ripetizione da li."
+"È necessario aprire tale scena e cambiare la modalità di ripetizione da lì."
 
 msgid "Can't change loop mode on animation embedded in another resource."
 msgstr ""
-"Impossibile cambiare la modalità di ripetizione di un'animazione integrata in "
-"un'altra risorsa."
+"Impossibile cambiare la modalità di ripetizione di un'animazione incorporata "
+"in un'altra risorsa."
 
 msgid "Property Track..."
 msgstr "Traccia di proprietà..."
@@ -1166,8 +1169,14 @@ msgstr "Mostra solo le tracce dei nodi selezionati nell'albero."
 msgid "Group tracks by node or display them as plain list."
 msgstr "Raggruppa le tracce per nodo o le visualizza in una lista semplice."
 
+msgid "Apply snapping to timeline cursor."
+msgstr "Applica l'agganciamento al cursore della timeline."
+
+msgid "Apply snapping to selected key(s)."
+msgstr "Applica l'agganciamento alle chiavi selezionate."
+
 msgid "Apply snapping to the nearest integer FPS."
-msgstr "Applicare lo snapping al valore FPS intero più vicino."
+msgstr "Applica l'agganciamento al valore intero più vicino degli FPS."
 
 msgid "Animation step value."
 msgstr "Valore del passo dell'animazione."
@@ -1389,28 +1398,75 @@ msgstr "Seleziona/Deseleziona tutto"
 msgid "Animation Change Keyframe Time"
 msgstr "Cambia il tempo di un fotogramma chiave di un'animazione"
 
+msgid "Marker name is read-only in the inspector."
+msgstr "Questo marcatore è di sola lettura nell'ispettore."
+
 msgid ""
 "A marker's name can only be changed by right-clicking it in the animation "
 "editor and selecting \"Rename Marker\", in order to make sure that marker "
 "names are all unique."
 msgstr ""
-"Il nome di un marcatore può essere cambiato solo facendo clic con il pulsante "
-"destro del mouse nell'editor di animazione e selezionando \"Rinomina "
-"Marcatore\", al fine di assicurarsi che i nomi dei marcatori siano tutti "
-"unici."
+"Il nome di un marcatore può essere cambiato solo cliccando con il pulsante "
+"destro nell'editor di animazione e selezionando \"Rinomina marcatore\", per "
+"assicurarsi che i nomi dei marcatori siano tutti univoci."
+
+msgid "Insert Marker..."
+msgstr "Inserisci marcatore..."
 
 msgid "Rename Marker"
-msgstr "Rinomina Marcatore"
+msgstr "Rinomina marcatore"
+
+msgid "Delete Marker(s)"
+msgstr "Elimina marcatore(i)"
+
+msgid "Show All Marker Names"
+msgstr "Mostra tutti i nomi dei marcatori"
 
 msgid "Marker:"
 msgstr "Marcatore:"
 
+msgid "Animation Move Markers"
+msgstr "Sposta i marcatori di un'animazione"
+
+msgid "Animation Delete Markers"
+msgstr "Elimina i marcatori di un'animazione"
+
+msgid "Marker '%s' already exists!"
+msgstr "Il marcatore \"%s\" esiste già!"
+
+msgid "Add Marker Key"
+msgstr "Aggiungi una chiave di marcatore"
+
+msgid "Empty marker names are not allowed."
+msgstr "I nomi vuoti per i marcatori non sono consentiti."
+
+msgid "Insert Marker"
+msgstr "Inserisci marcatore"
+
+msgid "Marker Name"
+msgstr "Nome del marcatore"
+
+msgid "Marker Color"
+msgstr "Colore del marcatore"
+
 msgid "Close"
 msgstr "Chiudi"
 
 msgid "Error!"
 msgstr "Errore!"
 
+msgid "Change Marker Name:"
+msgstr "Cambia il nome del marcatore:"
+
+msgid "Edit Marker Color"
+msgstr "Modifica il colore di un marcatore"
+
+msgid "Multi Edit Marker Color"
+msgstr "Modifica il colore di più marcatori"
+
+msgid "Animation Change Marker Time"
+msgstr "Cambia il tempo di un fotogramma chiave di un'animazione"
+
 msgid "Add Audio Track Clip"
 msgstr "Aggiungi una clip in una traccia audio"
 
@@ -1442,6 +1498,12 @@ msgid_plural "%d of %d matches"
 msgstr[0] "%d di %d corrispondenza"
 msgstr[1] "%d di %d corrispondenze"
 
+msgid "Hide Replace"
+msgstr "Nascondi Sostituisci"
+
+msgid "Show Replace"
+msgstr "Mostra Sostituisci"
+
 msgid "Find"
 msgstr "Trova"
 
@@ -1502,8 +1564,8 @@ msgid ""
 "%sMouse wheel, %s/%s: Finetune\n"
 "%s: Reset"
 msgstr ""
-"%sRotella del mouse, %s/%s: Sintonizzare\n"
-"%s: Ripristino"
+"%sRotella del mouse, %s/%s: Regola\n"
+"%s: Ripristina"
 
 msgid "Line and column numbers."
 msgstr "Numeri di riga e di colonna."
@@ -1583,6 +1645,9 @@ msgstr "Disconnetti argomenti segnale:"
 msgid "Receiver Method:"
 msgstr "Metodo ricevitore:"
 
+msgid "Pick"
+msgstr "Scegli"
+
 msgid "Advanced"
 msgstr "Opzioni avanzate"
 
@@ -1667,6 +1732,12 @@ msgstr "Crea un nuovo %s"
 msgid "No results for \"%s\"."
 msgstr "Nessun risultato per \"%s\"."
 
+msgid "Script path: %s"
+msgstr "Percorso dello script: %s"
+
+msgid "The script will run in the editor."
+msgstr "Questo script verrà avviato nell'editor."
+
 msgid "This class is marked as deprecated."
 msgstr "Questa classe è stata segnata come deprecata."
 
@@ -1733,6 +1804,12 @@ msgstr "Commuta visibilità"
 msgid "Expression to evaluate"
 msgstr "Espressione da valutare"
 
+msgid "Clear on Run"
+msgstr "Svuota all'avvio"
+
+msgid "Evaluate"
+msgstr "Valuta"
+
 msgid "Clear"
 msgstr "Rimuovi tutto"
 
@@ -1778,6 +1855,9 @@ msgstr "Ferma"
 msgid "Start"
 msgstr "Inizia"
 
+msgid "Autostart"
+msgstr "Avvio automatico"
+
 msgid "Measure:"
 msgstr "Misura:"
 
@@ -2066,6 +2146,9 @@ msgstr ""
 msgid "Cannot remove:"
 msgstr "Impossibile rimuovere:"
 
+msgid "Files to be deleted:"
+msgstr "File da eliminare:"
+
 msgid "Dependencies of files to be deleted:"
 msgstr "Dipendenze dei file da eliminare:"
 
@@ -2105,15 +2188,27 @@ msgstr "Risorse senza un proprietario esplicito:"
 msgid "Name cannot be empty."
 msgstr "Il nome non può essere vuoto."
 
+msgid "File name can't end with /."
+msgstr "Il nome del file non può terminare con /."
+
+msgid "File name cannot be empty."
+msgstr "Il nome del file non può essere vuoto."
+
 msgid "Folder name cannot be empty."
 msgstr "Il nome della cartella non può essere vuoto."
 
+msgid "File name contains invalid characters."
+msgstr "Il nome del file contiene caratteri non validi."
+
 msgid "Folder name contains invalid characters."
 msgstr "Il nome della cartella contiene caratteri non validi."
 
 msgid "File name begins with a dot."
 msgstr "Il nome del file comincia con un punto."
 
+msgid "Folder name begins with a dot."
+msgstr "Il nome della cartella inizia con un punto."
+
 msgid "File with that name already exists."
 msgstr "Esiste già un file con questo nome."
 
@@ -2124,6 +2219,19 @@ msgid "Using slashes in folder names will create subfolders recursively."
 msgstr ""
 "L'uso degli slash nei nomi delle cartelle creerà sottocartelle ricorsivamente."
 
+msgid ""
+"Using slashes in path will create the file in subfolder, creating new "
+"subfolders if necessary."
+msgstr ""
+"L'uso degli slash nel percorso creerà il file in una sottocartella, creando "
+"nuove sottocartelle se necessario."
+
+msgid "File name is valid."
+msgstr "Il nome del file è valido."
+
+msgid "Base path: %s"
+msgstr "Percorso base: %s"
+
 msgid "Folder name is valid."
 msgstr "Il nome della cartella è valido."
 
@@ -2233,7 +2341,7 @@ msgid "Uncompressing Assets"
 msgstr "Estraendo i contenuti"
 
 msgid "The following files failed extraction from asset \"%s\":"
-msgstr "L'estrazione dei seguenti file dal contenuto \"%s\" è fallita:"
+msgstr "Non è stato possibile estrarre i seguenti file dal contenuto \"%s\":"
 
 msgid "(and %s more files)"
 msgstr "(e %s altri file)"
@@ -2407,6 +2515,9 @@ msgstr "Layout dei bus audio"
 msgid "Invalid name."
 msgstr "Nome non valido."
 
+msgid "Must be a valid Unicode identifier."
+msgstr "Deve essere un identificatore Unicode valido."
+
 msgid "Must not collide with an existing engine class name."
 msgstr "Non deve coincidere con un nome di classe esistente nell'engine."
 
@@ -2677,6 +2788,12 @@ msgstr "[vuoto]"
 msgid "[unsaved]"
 msgstr "[non salvato]"
 
+msgid "Open the %s dock."
+msgstr "Apri il pannello %s."
+
+msgid "Focus on the %s dock."
+msgstr "Focalizza sul pannello %s."
+
 msgid "%s - Godot Engine"
 msgstr "%s - Godot Engine"
 
@@ -2728,6 +2845,9 @@ msgstr "Pannello d'importazione"
 msgid "History Dock"
 msgstr "Pannello della cronologia"
 
+msgid "Game View"
+msgstr "Schermata di gioco"
+
 msgid "Allows to view and edit 3D scenes."
 msgstr "Permette di visualizzare e modificare scene 3D."
 
@@ -2765,17 +2885,17 @@ msgstr ""
 msgid "Provides tools for selecting and debugging nodes at runtime."
 msgstr ""
 "Fornisce strumenti per selezionare ed eseguire il debug dei nodi in fase di "
-"runtime."
+"esecuzione."
 
 msgid "(current)"
-msgstr "(Attuale)"
+msgstr "(attuale)"
 
 msgid "(none)"
-msgstr "(nulla)"
+msgstr "(nessuno)"
 
 msgid "Remove currently selected profile, '%s'? Cannot be undone."
 msgstr ""
-"Rimuovere il profilo '%s' attualmente selezionato? Ciò non potrà essere "
+"Rimuovere il profilo \"%s\" attualmente selezionato? Ciò non potrà essere "
 "annullato."
 
 msgid "Profile must be a valid filename and must not contain '.'"
@@ -2858,8 +2978,29 @@ msgstr "Importa i profili"
 msgid "Manage Editor Feature Profiles"
 msgstr "Gestisci i profili di funzionalità dell'editor"
 
+msgid "Project initialization"
+msgstr "Inizializzazione del progetto"
+
+msgid "Scanning file structure..."
+msgstr "Scansione della struttura dei file..."
+
+msgid "Loading global class names..."
+msgstr "Caricamento dei nomi delle classi globali…"
+
+msgid "Verifying GDExtensions..."
+msgstr "Verifica dei GDExtension..."
+
+msgid "Creating autoload scripts..."
+msgstr "Creazione degli script autoload..."
+
 msgid "Initializing plugins..."
-msgstr "Inizializzazione dei plugin..."
+msgstr "Inizializzazione delle estensioni..."
+
+msgid "Starting file scan..."
+msgstr "Avvio della scansione dei file..."
+
+msgid "Scanning actions..."
+msgstr "Scansione delle azioni..."
 
 msgid "Some extensions need the editor to restart to take effect."
 msgstr ""
@@ -2874,6 +3015,15 @@ msgstr "Salva e riavvia"
 msgid "ScanSources"
 msgstr "Scansiona i sorgenti"
 
+msgid "Registering global classes..."
+msgstr "Registrazione delle classi globali…"
+
+msgid "Updating scripts documentation"
+msgstr "Aggiornamento della documentazione degli script"
+
+msgid "Updating Scene Groups"
+msgstr "Aggiornamento dei gruppi di scena"
+
 msgid ""
 "There are multiple importers for different types pointing to file %s, import "
 "aborted"
@@ -2884,6 +3034,9 @@ msgstr ""
 msgid "(Re)Importing Assets"
 msgstr "Reimportando i contenuti"
 
+msgid "Preparing files to reimport..."
+msgstr "Preparazione dei file da reimportare..."
+
 msgid "Executing pre-reimport operations..."
 msgstr "Esecuzione delle operazioni pre-reimportazione..."
 
@@ -2891,11 +3044,14 @@ msgid "Import resources of type: %s"
 msgstr "Importa risorse di tipo: %s"
 
 msgid "Finalizing Asset Import..."
-msgstr "Finalizzazione importazione degli Asset..."
+msgstr "Finalizzazione dell'importazione delle risorse..."
 
 msgid "Executing post-reimport operations..."
 msgstr "Esecuzione delle operazioni post-reimportazione..."
 
+msgid "Copying files..."
+msgstr "Copia dei file..."
+
 msgid "This method supports a variable number of arguments."
 msgstr "Questo metodo supporta un numero variabile di argomenti."
 
@@ -2920,6 +3076,9 @@ msgstr ""
 "Questo metodo non richiede un'istanza per essere chiamato.\n"
 "Può essere chiamato direttamente utilizzando il nome della classe."
 
+msgid "Code snippet copied to clipboard."
+msgstr "Snippet di codice copiato negli appunti."
+
 msgid "No return value."
 msgstr "Nessun valore di ritorno."
 
@@ -3071,6 +3230,11 @@ msgstr "Icone"
 msgid "Styles"
 msgstr "Stili"
 
+msgid "This theme property may be changed or removed in future versions."
+msgstr ""
+"Questa proprietà del tema potrebbe cambiare o essere rimossa in versioni "
+"future."
+
 msgid "There is currently no description for this theme property."
 msgstr "Attualmente non c'è alcuna descrizione per questa proprietà del tema."
 
@@ -3150,9 +3314,16 @@ msgstr "Editor"
 msgid "Click to copy."
 msgstr "Premi per copiare."
 
+msgid "Click to open in browser."
+msgstr "Clicca per aprire nel browser."
+
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
+msgid "This annotation may be changed or removed in future versions."
+msgstr ""
+"Questa annotazione potrebbe cambiare o essere rimossa in versioni future."
+
 msgid "Show in FileSystem"
 msgstr "Mostra nel filesystem"
 
@@ -3162,12 +3333,24 @@ msgstr "Apri nel gestore dei file"
 msgid "Class"
 msgstr "Classe"
 
+msgid "Enumeration"
+msgstr "Enumerazione"
+
 msgid "Constant"
 msgstr "Costante"
 
+msgid "Metadata"
+msgstr "Metadati"
+
+msgid "Setting"
+msgstr "Impostazione"
+
 msgid "Property"
 msgstr "Proprietà"
 
+msgid "Internal Property"
+msgstr "Proprietà interna"
+
 msgid "This property can only be set in the Inspector."
 msgstr "Questa proprietà può essere impostata solo nell'Ispettore."
 
@@ -3183,9 +3366,36 @@ msgstr "Segnale"
 msgid "Annotation"
 msgstr "Annotazione"
 
+msgid "Local Constant"
+msgstr "Costante locale"
+
+msgid "Local Variable"
+msgstr "Variabile locale"
+
+msgid "This variable may be changed or removed in future versions."
+msgstr "Questa variabile potrebbe cambiare o essere rimossa in versioni future."
+
+msgid "TextFile"
+msgstr "File di testo"
+
 msgid "File"
 msgstr "File"
 
+msgid "Directory"
+msgstr "Cartella"
+
+msgid "Invalid UID"
+msgstr "UID non valido"
+
+msgid "This UID does not point to any valid Resource."
+msgstr "Questo UID non punta ad alcuna risorsa valida."
+
+msgid "Invalid path"
+msgstr "Percorso non valido"
+
+msgid "This path does not exist."
+msgstr "Questo percorso non esiste."
+
 msgid "%d match."
 msgstr "%d corrispondenza."
 
@@ -3252,12 +3462,18 @@ msgstr "Questo membro è segnato come deprecato."
 msgid "This member is marked as experimental."
 msgstr "Questo membro è segnato come sperimentale."
 
+msgid "Unfavorite Property"
+msgstr "Rimuovi proprietà dai preferiti"
+
 msgid "Make this property be put back at its original place."
-msgstr "Fai tornare questa proprietà al suo posto originale."
+msgstr "Ritorna questa proprietà al suo posto originale."
+
+msgid "Favorite Property"
+msgstr "Aggiungi proprietà ai preferiti"
 
 msgid "Make this property be placed at the top for all objects of this class."
 msgstr ""
-"Fai piazzare questa proprietà in cima per tutti gli oggetti di questa classe."
+"Posiziona questa proprietà in cima per tutti gli oggetti di questa classe."
 
 msgid "Pin Value"
 msgstr "Fissa il valore"
@@ -3270,6 +3486,9 @@ msgstr ""
 "Fissa un valore per forzane il salvataggio anche se è uguale al valore "
 "predefinito."
 
+msgid "Unfavorite All"
+msgstr "Rimuovi tutti dai preferiti"
+
 msgid "(%d change)"
 msgid_plural "(%d changes)"
 msgstr[0] "(%d modifica)"
@@ -3677,7 +3896,7 @@ msgid "Save Scene As..."
 msgstr "Salva la scena come…"
 
 msgid "Pack Project as ZIP..."
-msgstr "Impacchetta il Progetto come ZIP..."
+msgstr "Impacchetta il progetto come ZIP..."
 
 msgid "Can't undo while mouse buttons are pressed."
 msgstr "Impossibile tornare indietro mentre i tasti del mouse sono premuti."
@@ -3761,6 +3980,9 @@ msgstr "Questa operazione non può essere eseguita senza una scena."
 msgid "Export Mesh Library"
 msgstr "Esporta una libreria di mesh"
 
+msgid "Quick Open Color Palette..."
+msgstr "Apri tavolozza di colori rapidamente…"
+
 msgid "Unable to enable addon plugin at: '%s' parsing of config failed."
 msgstr ""
 "Impossibile abilitare l'estensione in '%s'. Analisi della configurazione non "
@@ -3847,6 +4069,54 @@ msgstr "Pulisci scene recenti"
 msgid "There is no defined scene to run."
 msgstr "Non è stata definita alcuna scena da eseguire."
 
+msgid "Loading editor"
+msgstr "Caricamento dell'editor"
+
+msgid "Loading editor layout..."
+msgstr "Caricamento della disposizione dell'editor..."
+
+msgid "Loading docks..."
+msgstr "Caricamento dei pannelli…"
+
+msgid "Reopening scenes..."
+msgstr "Riapertura delle scene..."
+
+msgid "Loading central editor layout..."
+msgstr "Caricamento della disposizione dell'editor centrale..."
+
+msgid "Loading plugin window layout..."
+msgstr "Caricamento della disposizione della finestra delle estensioni..."
+
+msgid "Editor layout ready."
+msgstr "Disposizione dell'editor preparata."
+
+msgid ""
+"No main scene has ever been defined. Select one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"Non è stata mai definita alcuna scena principale. Sceglierne una?\n"
+"Potrai cambiarla in seguito da \"Impostazioni del progetto\" sotto la "
+"categoria \"Applicazione\"."
+
+msgid ""
+"Selected scene '%s' does not exist. Select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"La scena selezionata '%s' non esiste. Sceglierne una valida?\n"
+"Potrai cambiarla in seguito da \"Impostazioni del progetto\" sotto la "
+"categoria \"Applicazione\"."
+
+msgid ""
+"Selected scene '%s' is not a scene file. Select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"La scena selezionata '%s' non è un file di scena. Sceglierne una valida?\n"
+"Potrai cambiarla in seguito da \"Impostazioni del progetto\" sotto la "
+"categoria \"Applicazione\"."
+
 msgid "Save Layout..."
 msgstr "Salva disposizione..."
 
@@ -4073,6 +4343,9 @@ msgstr "Personalizza la configurazione di costruzione del motore..."
 msgid "Upgrade Mesh Surfaces..."
 msgstr "Aggiorna superfici di mesh..."
 
+msgid "Upgrade UIDs..."
+msgstr "Aggiorna UID..."
+
 msgid "Reload Current Project"
 msgstr "Ricarica progetto attuale"
 
@@ -4089,7 +4362,7 @@ msgid "Editor Layout"
 msgstr "Disposizione dell'editor"
 
 msgid "Take Screenshot"
-msgstr "Cattura schermata"
+msgstr "Cattura screenshot"
 
 msgid "Screenshots are stored in the user data folder (\"user://\")."
 msgstr ""
@@ -4232,6 +4505,21 @@ msgstr "Libreria d'esportazione"
 msgid "Open & Run a Script"
 msgstr "Apri ed esegui uno script"
 
+msgid "Files have been modified outside Godot"
+msgstr "I file sono stati modificati al di fuori di Godot"
+
+msgid "The following files are newer on disk:"
+msgstr "I seguenti file sono più recenti sul disco:"
+
+msgid "What action should be taken?"
+msgstr "Quale azione dovrebbe essere presa?"
+
+msgid "Reload from disk"
+msgstr "Ricarica dal disco"
+
+msgid "Ignore external changes"
+msgstr "Ignora le modifiche esterne"
+
 msgid "Create/Override Version Control Metadata..."
 msgstr "Crea/Sovrascrivi metadati di controllo versione..."
 
@@ -4256,6 +4544,9 @@ msgstr "Apri l'editor 3D"
 msgid "Open Script Editor"
 msgstr "Apri l'editor degli script"
 
+msgid "Open Game View"
+msgstr "Apri la schermata di gioco"
+
 msgid "Open Asset Library"
 msgstr "Apri la libreria dei contenuti"
 
@@ -4386,6 +4677,12 @@ msgstr "Nuovo valore:"
 msgid "(Nil) %s"
 msgstr "(Nullo) %s"
 
+msgid "%s%s (size %d)"
+msgstr "%s%s (dimensione %d)"
+
+msgid "%s (size %d)"
+msgstr "%s (dimensione %d)"
+
 msgid "Size:"
 msgstr "Dimensione:"
 
@@ -4455,6 +4752,12 @@ msgstr "Estendi script..."
 msgid "New Shader..."
 msgstr "Nuovo shader..."
 
+msgid "No Remote Deploy export presets configured."
+msgstr "Nessuna preimpostazione di distribuzione remota configurata."
+
+msgid "Remote Deploy"
+msgstr "Distribuzione remota"
+
 msgid ""
 "No runnable export preset found for this platform.\n"
 "Please add a runnable preset in the Export menu or define an existing preset "
@@ -4465,17 +4768,28 @@ msgstr ""
 "Per favore, aggiungerne una nel menù di esportazione o impostarne una già "
 "esistente come eseguibile."
 
+msgid ""
+"Warning: The CPU architecture \"%s\" is not active in your export preset.\n"
+"\n"
+msgstr ""
+"Avviso: L'architettura di CPU \"%s\" non è attiva nelle tue preimpostazioni "
+"d'esportazione.\n"
+"\n"
+
+msgid "Run \"Remote Deploy\" anyway?"
+msgstr "Eseguire comunque \"Distribuzione remota\"?"
+
 msgid "Deploy to First Device in List"
-msgstr "Distribuisci al primo Dispositivo nella lista"
+msgstr "Distribuisci al primo dispositivo nella lista"
 
 msgid "Deploy to Second Device in List"
-msgstr "Distribuisci al secondo Dispositivo nella lista"
+msgstr "Distribuisci al secondo dispositivo nella lista"
 
 msgid "Deploy to Third Device in List"
-msgstr "Distribuisci al terzo Dispositivo nella lista"
+msgstr "Distribuisci al terzo dispositivo nella lista"
 
 msgid "Deploy to Fourth Device in List"
-msgstr "Distribuisci al quarto Dispositivo nella lista"
+msgstr "Distribuisci al quarto dispositivo nella lista"
 
 msgid "Project Run"
 msgstr "Esecuzione di progetto"
@@ -4498,9 +4812,15 @@ msgstr "Modifica la scorciatoia: %s"
 msgid "None"
 msgstr "Nessuno"
 
+msgid "Primary"
+msgstr "Primario"
+
 msgid "Common"
 msgstr "Comuni"
 
+msgid "Event %d"
+msgstr "Evento %d"
+
 msgid "Editor Settings"
 msgstr "Impostazioni dell'editor"
 
@@ -4703,6 +5023,12 @@ msgstr "Errore Sconosciuto"
 msgid "Export failed with error code %d."
 msgstr "Esportazione fallita con codice d'errore %d."
 
+msgid "Patch Creation"
+msgstr "Creazione di una patch"
+
+msgid "Could not load patch pack with path \"%s\"."
+msgstr "Impossibile caricare il pacchetto di patch con il percorso \"%s\"."
+
 msgid "Storing File: %s"
 msgstr "Memorizzazione file: %s"
 
@@ -4712,6 +5038,31 @@ msgstr "Memorizzazione file:"
 msgid "No export template found at the expected path:"
 msgstr "Nessun modello d'esportazione trovato nel percorso specificato:"
 
+msgid ""
+"Using user provided text server data, text display in the exported project "
+"might be broken if export template was built with different ICU version!"
+msgstr ""
+"Utilizzando i dati del server di testo forniti dall'utente, la "
+"visualizzazione del testo nel progetto esportato potrebbe non funzionare "
+"correttamente se il modello di esportazione è stato compilato con una "
+"versione ICU diversa!"
+
+msgid ""
+"Using editor embedded text server data, text display in the exported project "
+"might be broken if export template was built with different ICU version!"
+msgstr ""
+"Utilizzando i dati del server di testo incorporati nell'editor, la "
+"visualizzazione del testo nel progetto esportato potrebbe non funzionare "
+"correttamente se il modello di esportazione è stato compilato con una "
+"versione ICU diversa!"
+
+msgid ""
+"Missing text server data, text display in the exported project might be "
+"broken!"
+msgstr ""
+"Dati mancanti del server di testo, la visualizzazione del testo nel progetto "
+"esportato potrebbe non funzionare correttamente!"
+
 msgid "ZIP Creation"
 msgstr "Creazione d'un ZIP"
 
@@ -4730,6 +5081,9 @@ msgstr "impossibile creare il file \"%s\"."
 msgid "Failed to export project files."
 msgstr "Impossibile esportare i file del progetto."
 
+msgid "No files or changes to export."
+msgstr "Nessun file o cambiamento da esportare."
+
 msgid "Can't open file for writing at path \"%s\"."
 msgstr "Impossibile aprire il file per scrittura al percorso \"%s\"."
 
@@ -4748,6 +5102,9 @@ msgstr "impossibile aprire file da leggere dalla path \"%s\"."
 msgid "Save ZIP"
 msgstr "Salva ZIP"
 
+msgid "Failed to move temporary file \"%s\" to \"%s\"."
+msgstr "Impossibile muovere il file temporaneo \"%s\" in \"%s\"."
+
 msgid "Custom debug template not found."
 msgstr "Modello di sviluppo personalizzato non trovato."
 
@@ -4781,6 +5138,12 @@ msgstr ""
 "Il PCK integrato non può essere più grande di 4 GiB nelle esportazioni a 32 "
 "bit."
 
+msgid "GDExtension"
+msgstr "GDExtension"
+
+msgid "Failed to copy shared object \"%s\"."
+msgstr "Impossibile copiare l'oggetto condiviso \"%s\"."
+
 msgid "Plugin \"%s\" is not supported on \"%s\""
 msgstr "L'estensione \"%s\" non é supportata su \"%s\""
 
@@ -4914,6 +5277,15 @@ msgstr "Modelli di esportazione mancanti. Scaricarli o installarli da un file."
 msgid "Export templates are missing. Install them from a file."
 msgstr "Modelli di esportazione mancanti. Installali da un file."
 
+msgid "Not available in offline mode"
+msgstr "Non disponibile in modalità offline"
+
+msgid "Template downloading is disabled in offline mode."
+msgstr "Il download dei modelli è disabilitato in modalità offline."
+
+msgid "No templates for development builds"
+msgstr "Nessun modello per le build di sviluppo"
+
 msgid "Official export templates aren't available for development builds."
 msgstr ""
 "I template ufficiali per l'esportazione non sono disponibili per le build di "
@@ -4969,6 +5341,9 @@ msgstr "Installa da file"
 msgid "Install templates from a local file."
 msgstr "Importa i modelli da un file locale."
 
+msgid "Go Online"
+msgstr "Vai online"
+
 msgid "Cancel the download of the templates."
 msgstr "Annulla lo scaricamento dei modelli."
 
@@ -5026,11 +5401,17 @@ msgstr "Risorse da esportare:"
 msgid "(Inherited)"
 msgstr "(Ereditato)"
 
+msgid "Delete patch '%s' from list?"
+msgstr "Eliminare la patch \"%s\" dalla lista?"
+
 msgid "Export With Debug"
 msgstr "Esporta con debug"
 
+msgid "Export As Patch"
+msgstr "Esporta come patch"
+
 msgid "%s Export"
-msgstr "Esporta %s"
+msgstr "Esporta per %s"
 
 msgid "Release"
 msgstr "Rilascio"
@@ -5113,9 +5494,18 @@ msgstr ""
 "Filtri per escludere file/cartelle dal progetto\n"
 "(separati da virgole, per esempio: *.json, *.txt, docs/*)"
 
+msgid "Patches"
+msgstr "Patch"
+
+msgid "Base Packs:"
+msgstr "Pacchetti base:"
+
 msgid "Godot Project Pack"
 msgstr "Pacchetto di progetto Godot"
 
+msgid "Add Pack"
+msgstr "Aggiungi pacchetto"
+
 msgid "Features"
 msgstr "Funzionalità"
 
@@ -5155,6 +5545,9 @@ msgstr ""
 msgid "Encryption Key (256-bits as hexadecimal):"
 msgstr "Chiave di crittografia (256 bit in esadecimale):"
 
+msgid "Initialization vector seed"
+msgstr "Seme del vettore di inizializzazione"
+
 msgid ""
 "Note: Encryption key needs to be stored in the binary,\n"
 "you need to build the export templates from source."
@@ -5275,7 +5668,7 @@ msgid "Confirm Path"
 msgstr "Conferma il percorso"
 
 msgid "Link to: %s"
-msgstr "Link a: %s"
+msgstr "Collegamento a: %s"
 
 msgid "View items as a grid of thumbnails."
 msgstr "Visualizza gli elementi in una griglia di miniature."
@@ -5306,6 +5699,9 @@ msgstr "Errore spostamento:"
 msgid "Error duplicating:"
 msgstr "Errore nella duplicazione:"
 
+msgid "Error duplicating directory:"
+msgstr "Errore nella duplicazione della cartella:"
+
 msgid "Unable to update dependencies for:"
 msgstr "Impossibile aggiornare le dipendenze per:"
 
@@ -5333,6 +5729,9 @@ msgstr ""
 msgid "A file or folder with this name already exists."
 msgstr "Un file o cartella con questo nome esiste già."
 
+msgid "Could not create base directory: %s"
+msgstr "Impossibile creare la cartella di base: %s"
+
 msgid ""
 "The following files or folders conflict with items in the target location "
 "'%s':"
@@ -5378,6 +5777,9 @@ msgstr ""
 "Vuoi convertire questi file in %s? (Questa operazione non può essere "
 "annullata!)"
 
+msgid "Could not create folder: %s"
+msgstr "Impossibile creare la cartella: %s"
+
 msgid "New Inherited Scene"
 msgstr "Nuova scena ereditata"
 
@@ -5438,12 +5840,18 @@ msgstr "Aggiungi ai preferiti"
 msgid "Remove from Favorites"
 msgstr "Rimuovi dai preferiti"
 
+msgid "Convert to..."
+msgstr "Converti in..."
+
 msgid "Reimport"
 msgstr "Reimporta"
 
 msgid "Open in Terminal"
 msgstr "Apri nel terminale"
 
+msgid "Open Folder in Terminal"
+msgstr "Apri cartella nel terminale"
+
 msgid "New Folder..."
 msgstr "Nuova cartella..."
 
@@ -5553,6 +5961,9 @@ msgstr "Mantieni entrambi"
 msgid "Create Script"
 msgstr "Crea uno script"
 
+msgid "Convert"
+msgstr "Converti"
+
 msgid "Find in Files"
 msgstr "Trova nei file"
 
@@ -5590,6 +6001,9 @@ msgstr "Sostituisci tutto (irreversibile)"
 msgid "Searching..."
 msgstr "Ricerca..."
 
+msgid "Remove result"
+msgstr "Rimuovi risultato"
+
 msgid "%d match in %d file"
 msgstr "%d corrispondenza in %d file"
 
@@ -5680,6 +6094,27 @@ msgstr "Aggiungi un nuovo gruppo."
 msgid "Filter Groups"
 msgstr "Filtra i gruppi"
 
+msgid ""
+"Scroll Left\n"
+"Hold Ctrl to scroll to the begin.\n"
+"Hold Shift to scroll one page."
+msgstr ""
+"Scorri a sinistra\n"
+"Tieni premuto Ctrl per scorrere all'inizio.\n"
+"Tieni premuto Shift per scorrere una pagina alla volta."
+
+msgid ""
+"Scroll Right\n"
+"Hold Ctrl to scroll to the end.\n"
+"Hold Shift to scroll one page."
+msgstr ""
+"Scorri a destra\n"
+"Tieni premuto Ctrl per scorrere alla fine.\n"
+"Tieni premuto Shift per scorrere una pagina alla volta."
+
+msgid "Pin Bottom Panel Switching"
+msgstr "Fissa il cambiamento del pannello inferiore"
+
 msgid "Expand Bottom Panel"
 msgstr "Espandi pannello inferiore"
 
@@ -5773,6 +6208,9 @@ msgstr "Commuta la modalità"
 msgid "Focus Path"
 msgstr "Focalizza il percorso"
 
+msgid "Focus Filter"
+msgstr "Focalizza il filtro"
+
 msgid "Move Favorite Up"
 msgstr "Sposta preferito in su"
 
@@ -5803,9 +6241,18 @@ msgstr "File e cartelle:"
 msgid "Toggle the visibility of hidden files."
 msgstr "Mostra/nascondi i file nascosti."
 
+msgid "Sort files"
+msgstr "Ordina i file"
+
+msgid "Toggle the visibility of the filter for file names."
+msgstr "Mostra/nascondi il filtro per i nomi dei file."
+
 msgid "Preview:"
 msgstr "Anteprima:"
 
+msgid "Filter:"
+msgstr "Filtro:"
+
 msgid "Filter"
 msgstr "Filtro"
 
@@ -5828,17 +6275,44 @@ msgstr "Nessuna sotto-risorsa trovata."
 msgid "Open a list of sub-resources."
 msgstr "Apri una lista di sotto-risorse."
 
+msgid "Search files..."
+msgstr "Cerca file..."
+
+msgid "Select Resource"
+msgstr "Seleziona una risorsa"
+
+msgid "Select Scene"
+msgstr "Seleziona una scena"
+
+msgid "Fuzzy Search"
+msgstr "Ricerca approssimata"
+
+msgid "Enable fuzzy matching"
+msgstr "Abilita ricerca approssimata"
+
 msgid "Addons"
-msgstr "Componenti Aggiuntivi"
+msgstr "Componenti aggiuntivi"
 
 msgid "Include files from addons"
-msgstr "Includere i file dai Componenti Aggiuntivi"
+msgstr "Includi i file dai componenti aggiuntivi"
+
+msgid "No files found for this type"
+msgstr "Nessun file trovato per questo tipo"
 
 msgid "Start searching to find files..."
 msgstr "Inizia a cercare per trovare i file..."
 
+msgid "No results found"
+msgstr "Nessun risultato trovato"
+
+msgid " (recently opened)"
+msgstr " (aperto recentemente)"
+
+msgid "Grid view"
+msgstr "Visualizzazione a griglia"
+
 msgid "List view"
-msgstr "Visualizzazione ad elenco"
+msgstr "Visualizzazione a elenco"
 
 msgid "Play the project."
 msgstr "Esegui il progetto."
@@ -5877,31 +6351,62 @@ msgid "Recovery Mode is enabled. Disable it to run the project."
 msgstr ""
 "La modalità di recupero è abilitata. Disattivarla per eseguire il progetto."
 
+msgid ""
+"Autostart is enabled for the following profilers, which can have a "
+"performance impact:"
+msgstr ""
+"L'avvio automatico è abilitato nei seguenti profiler, il che può avere un "
+"impatto sulle prestazioni:"
+
 msgid "Network Profiler"
 msgstr "Profiler di rete"
 
+msgid "Click to open the first profiler for which autostart is enabled."
+msgstr ""
+"Clicca per aprire il primo profiler per cui è abilitato l'avvio automatico."
+
+msgid "Recovery Mode"
+msgstr "Modalità di recupero"
+
 msgid ""
 "Godot opened the project in Recovery Mode, which is a special mode that can "
 "help recover projects that crash the engine upon initialization. The "
 "following features have been temporarily disabled:"
 msgstr ""
-"Godot ha aperto il progetto in modalità Recupero. Questa è una modalità "
-"speciale che può aiutarti a recuperare i progetti che hanno arrestato in modo "
-"anomalo (crash) Godot dopo l'inizializzazione. Le seguenti funzionalità sono "
+"Godot ha aperto il progetto in modalità di recupero. Questa è una modalità "
+"speciale che può aiutare a recuperare i progetti che provocano l'arresto "
+"anomalo di Godot durante l'inizializzazione. Le seguenti funzionalità sono "
 "state temporaneamente disabilitate:"
 
+msgid "Tool scripts"
+msgstr "Script di strumento (tool)"
+
+msgid "Editor plugins"
+msgstr "Estensioni dell'editor"
+
 msgid "GDExtension addons"
-msgstr "Componenti aggiuntivi GDExtension"
+msgstr "Componenti aggiuntivi in GDExtension"
 
 msgid "Automatic scene restoring"
-msgstr "Ripristino automatico della scena"
+msgstr "Recupero automatico delle scene"
+
+msgid ""
+"If the project cannot be opened outside of this mode, then it's very likely "
+"any of these components is preventing this project from launching. This mode "
+"is intended only for basic editing to troubleshoot such issues, and therefore "
+"it is not possible to run a project in this mode."
+msgstr ""
+"Se il progetto non può essere aperto al di fuori di questa modalità, è molto "
+"probabile che uno di questi componenti impedisca l'avvio del progetto. Questa "
+"modalità è pensata solo per modifiche di base per risolvere tali problemi e "
+"pertanto non è possibile eseguire un progetto in questa modalità."
 
 msgid ""
 "To disable Recovery Mode, reload the project by pressing the Reload button "
 "next to the Recovery Mode banner, or by reopening the project normally."
 msgstr ""
-"Per disabilitare la modalità di recupero, ricaricare il progetto premendo il "
-"pulsante Ricarica accanto al banner Modalità di ripristino, o riaprendo "
+"Per disabilitare la modalità di recupero, ricaricare il progetto, premendo il "
+"pulsante Ricarica accanto al banner della modalità di ripristino o riaprendo "
 "normalmente il progetto."
 
 msgid "Disable recovery mode and reload the project."
@@ -5923,16 +6428,16 @@ msgid "Pause Running Project"
 msgstr "Sospendi progetto in esecuzione"
 
 msgid "Stop the currently running project."
-msgstr "Ferma progetto in esecuzione."
+msgstr "Arresta il progetto attualmente in esecuzione."
 
 msgid "Stop Running Project"
 msgstr "Arresta progetto in esecuzione"
 
 msgid "Run Scene in Regular Mode"
-msgstr "Esegui la scena in Modalità Regolare"
+msgstr "Esegui scena in modalità regolare"
 
 msgid "Run Scene in XR Mode"
-msgstr "Esegui la scena in Modalità XR"
+msgstr "Esegui scena in modalità XR"
 
 msgid "Run the currently edited scene."
 msgstr "Esegui la scena attualmente in fase di modifica."
@@ -5940,6 +6445,12 @@ msgstr "Esegui la scena attualmente in fase di modifica."
 msgid "Run Current Scene"
 msgstr "Esegui scena attuale"
 
+msgid "Run in Regular Mode"
+msgstr "Esegui in modalità regolare"
+
+msgid "Run in XR Mode"
+msgstr "Esegui in modalità XR"
+
 msgid "Run a specific scene."
 msgstr "Esegui una scena specifica."
 
@@ -6005,6 +6516,15 @@ msgstr ""
 "Data di Git commit: %s\n"
 "Clicca per copiare le informazioni di versione."
 
+msgid ""
+"The root node of a scene is recommended to not be transformed, since "
+"instances of the scene will usually override this. Reset the transform and "
+"reload the scene to remove this warning."
+msgstr ""
+"Si consiglia di non cambiare la trasformazione del nodo radice di una scena, "
+"poiché le istanze della scena solitamente la sovrascrivono. Ripristina la "
+"trasformazione e ricarica la scena per rimuovere questo avviso."
+
 msgid "Toggle Visible"
 msgstr "Commuta visibilità"
 
@@ -6014,8 +6534,11 @@ msgstr "Sblocca nodo"
 msgid "Ungroup Children"
 msgstr "Separa figli"
 
+msgid "Revoke unique name for node \"%s\"?"
+msgstr "Revocare il nome univoco per il nodo \"%s\"?"
+
 msgid "Disable Scene Unique Name"
-msgstr "Revoca un nome unico nella Scena"
+msgstr "Disattiva un nome univoco nella scena"
 
 msgid "(Connecting From)"
 msgstr "(Collegamento da)"
@@ -6023,8 +6546,15 @@ msgstr "(Collegamento da)"
 msgid "Node configuration warning:"
 msgstr "Avviso sulla configurazione del nodo:"
 
+msgid ""
+"This node can be accessed from anywhere within the scene it belongs to by "
+"using the '%s' prefix in the node path."
+msgstr ""
+"È possibile accedere a questo nodo da qualunque punto della scena "
+"prefissandolo con '%s' in un percorso di nodo."
+
 msgid "Click to disable this."
-msgstr "Fare click per disabilitare."
+msgstr "Clicca per disabilitarlo."
 
 msgid "Node has one connection."
 msgid_plural "Node has {num} connections."
@@ -6039,6 +6569,9 @@ msgstr[1] "I nodi sono nei gruppi seguenti:"
 msgid "Click to show signals dock."
 msgstr "Clicca per mostrare il pannello dei segnali."
 
+msgid "Click to show groups dock."
+msgstr "Clicca per mostrare il pannello dei gruppi."
+
 msgid ""
 "This script can run in the editor.\n"
 "It is currently disabled due to recovery mode."
@@ -6082,6 +6615,13 @@ msgstr "Apri nell'editor"
 msgid "\"%s\" is not a known filter."
 msgstr "\"%s\" non è un filtro conosciuto."
 
+msgid ""
+"Root nodes cannot be accessed as unique names in their own scene. Instantiate "
+"in another scene and set as unique name there."
+msgstr ""
+"Non è possibile accedere ai nodi radice come nomi univoci nella loro scena. "
+"Istanziali in un'altra scena e impostali come nomi univoci lì."
+
 msgid "Invalid node name, the following characters are not allowed:"
 msgstr "Nome di nodo invalido, i caratteri seguenti non sono consentiti:"
 
@@ -6104,7 +6644,18 @@ msgid "Node Configuration Warning!"
 msgstr "Avviso sulla configurazione del nodo!"
 
 msgid "Revoke"
-msgstr "Revocare"
+msgstr "Revoca"
+
+msgid "Don't Ask Again"
+msgstr "Non chiedere di nuovo"
+
+msgid ""
+"This dialog can also be enabled/disabled in the Editor Settings: Docks > "
+"Scene Tree > Ask Before Revoking Unique Name."
+msgstr ""
+"Questa finestra di dialogo può essere abilitata/disabilitata anche nelle "
+"Impostazioni dell'editor: Pannelli > Albero di scene > Chiedi prima di "
+"revocare un nome univoco."
 
 msgid "Allowed:"
 msgstr "Consentiti:"
@@ -6281,7 +6832,13 @@ msgid "Materials"
 msgstr "Materiali"
 
 msgid "Selected Animation Play/Pause"
-msgstr "Riproduci/Pausa animazione selezionata"
+msgstr "Riproduci/pausa animazione selezionata"
+
+msgid "Selected Animation Stop"
+msgstr "Ferma animazione selezionata"
+
+msgid "Toggle Animation Skeleton Visibility"
+msgstr "Alterna visibilità dello scheletro d'animazione"
 
 msgid "Rotate Lights With Model"
 msgstr "Ruota le luci con il modello"
@@ -6729,9 +7286,24 @@ msgstr "Gestisci le proprietà dell'oggetto."
 msgid "This cannot be undone. Are you sure?"
 msgstr "Questo operazione non può essere annullata. Continuare?"
 
+msgid "Add %d Translation"
+msgid_plural "Add %d Translations"
+msgstr[0] "Aggiungi %d traduzione"
+msgstr[1] "Aggiungi %d traduzioni"
+
 msgid "Remove Translation"
 msgstr "Rimuovi una traduzione"
 
+msgid "Translation Resource Remap: Add %d Path"
+msgid_plural "Translation Resource Remap: Add %d Paths"
+msgstr[0] "Rimappatura di risorse per la traduzione: Aggiungi %d percorso"
+msgstr[1] "Rimappatura di risorse per la traduzione: Aggiungi %d percorsi"
+
+msgid "Translation Resource Remap: Add %d Remap"
+msgid_plural "Translation Resource Remap: Add %d Remaps"
+msgstr[0] "Rimappatura di risorse per la traduzione: Aggiungi %d rimappatura"
+msgstr[1] "Rimappatura di risorse per la traduzione: Aggiungi %d rimappature"
+
 msgid "Change Resource Remap Language"
 msgstr "Cambia la lingua per la rimappatura di risorse"
 
@@ -6741,6 +7313,11 @@ msgstr "Rimuovi una rimappatura di risorse"
 msgid "Remove Resource Remap Option"
 msgstr "Rimuovi un'opzione di rimappatura di risorse"
 
+msgid "Add %d file for POT generation"
+msgid_plural "Add %d files for POT generation"
+msgstr[0] "Aggiungi %d file per la generazione del POT"
+msgstr[1] "Aggiungi %d file per la generazione del POT"
+
 msgid "Remove file from POT generation"
 msgstr "Rimuovi un file dalla generazione del POT"
 
@@ -7015,6 +7592,24 @@ msgstr "Riempi figli di selezione"
 msgid "Invert"
 msgstr "Inverti"
 
+msgid "Start of Animation"
+msgstr "Inizio dell'animazione"
+
+msgid "End of Animation"
+msgstr "Fine dell'animazione"
+
+msgid "Set Custom Timeline from Marker"
+msgstr "Imposta timeline personalizzata da un marcatore"
+
+msgid "Select Markers"
+msgstr "Seleziona marcatori"
+
+msgid "Start Marker"
+msgstr "Marcatore d'inizio"
+
+msgid "End Marker"
+msgstr "Marcatore di fine"
+
 msgid "Library Name:"
 msgstr "Nome della libreria:"
 
@@ -7250,6 +7845,21 @@ msgstr "Nome dell'animazione duplicata:"
 msgid "Onion skinning requires a RESET animation."
 msgstr "Per l'onion skinning è necessaria di una animazione RESET."
 
+msgid "Play Animation Backwards"
+msgstr "Riproduci animazione all'indietro"
+
+msgid "Play Animation Backwards from End"
+msgstr "Riproduci animazione all'indietro dalla fine"
+
+msgid "Pause/Stop Animation"
+msgstr "Pausa/ferma animazione"
+
+msgid "Play Animation from Start"
+msgstr "Riproduci animazione dall'inizio"
+
+msgid "Play Animation"
+msgstr "Riproduci animazione"
+
 msgid "Animation position (in seconds)."
 msgstr "Posizione dell'animazione (in secondi)."
 
@@ -7326,6 +7936,12 @@ msgstr "Tempi di fusione:"
 msgid "Next (Auto Queue):"
 msgstr "Seguente (coda automatica):"
 
+msgid "Go to Next Keyframe"
+msgstr "Vai al fotogramma chiave successivo"
+
+msgid "Go to Previous Keyframe"
+msgstr "Vai al fotogramma chiave precedente"
+
 msgid "Toggle Animation Bottom Panel"
 msgstr "Commuta il pannello inferiore d'Animazione"
 
@@ -7564,9 +8180,6 @@ msgstr ""
 "La Libreria dei contenuti richiede una connessione online e comporta l'invio "
 "dei dati tramite internet."
 
-msgid "Go Online"
-msgstr "Vai online"
-
 msgid "Failed to get repository configuration."
 msgstr "Impossibile ottenere la configurazione del repository."
 
@@ -7816,6 +8429,9 @@ msgstr ""
 "Alt+Clic destro: Mostra una lista di tutti i nodi presenti nella posizione "
 "cliccata, compresi quelli bloccati."
 
+msgid "(Available in all modes.)"
+msgstr "(Disponibile in tutte le modalità.)"
+
 msgid "RMB: Add node at position clicked."
 msgstr "Clic destro: Aggiungi un nodo alla posizione cliccata."
 
@@ -7834,6 +8450,19 @@ msgstr "Maiusc: Ridimensiona proporzionalmente."
 msgid "Show list of selectable nodes at position clicked."
 msgstr "Mostra una lista di nodi selezionabili nella posizione cliccata."
 
+msgid "Click to change object's pivot."
+msgstr "Clicca per modificare il punto di rotazione dell'oggetto."
+
+msgid "Shift: Set temporary pivot."
+msgstr "Maiusc: Imposta il punto di rotazione temporaneo."
+
+msgid ""
+"Click this button while holding Shift to put the temporary pivot in the "
+"center of the selected nodes."
+msgstr ""
+"Clicca su questo pulsante tenendo premuto Maiusc per collocare il punto di "
+"rotazione temporaneo al centro dei nodi selezionati."
+
 msgid "Pan Mode"
 msgstr "Modalità navigazione"
 
@@ -8449,6 +9078,13 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr "Modifica estensione"
 
+msgid ""
+"Recovery mode is enabled. Enabled plugins will not run while this mode is "
+"active."
+msgstr ""
+"La modalità di recupero è abilitata. Le estensioni abilitate non saranno "
+"eseguite mentre questa modalità è attiva."
+
 msgid "Installed Plugins:"
 msgstr "Estensioni installate:"
 
@@ -8525,9 +9161,180 @@ msgstr "Larghezza dei caratteri dell'Asia orientale"
 msgid "Numeral Alignment"
 msgstr "Allineamento numerico"
 
+msgid "Variation"
+msgstr "Variazione"
+
 msgid "Unable to preview font"
 msgstr "Impossibile visualizzare l'anteprima del font"
 
+msgid "Connection impossible to the game process."
+msgstr "Impossibile connettersi al processo del gioco."
+
+msgid "Game starting..."
+msgstr "Avvio del gioco..."
+
+msgid "Game running not embedded."
+msgstr "Il gioco è in esecuzione non incorporato."
+
+msgid "Press play to start the game."
+msgstr "Premi riproduci per avviare il gioco."
+
+msgid "Embedding is disabled."
+msgstr "L'incorporamento è disabilitato."
+
+msgid ""
+"Game embedding not available on Wayland.\n"
+"Wayland can be disabled in the Editor Settings (Run > Platforms > Linux/*BSD "
+"> Prefer Wayland)."
+msgstr ""
+"L'incorporamento del gioco non è disponibile su Wayland.\n"
+"È possibile disattivare Wayland nelle Impostazioni dell'editor (Esecuzione > "
+"Piattaforme > Linux/*BSD > Preferisci Wayland)."
+
+msgid "Game embedding not available on your OS."
+msgstr "L'incorporamento del gioco non è disponibile su tuo OS."
+
+msgid ""
+"Game embedding not available for the Display Server: '%s'.\n"
+"Display Server can be modified in the Project Settings (Display > Display "
+"Server > Driver)."
+msgstr ""
+"L'incorporamento del gioco non è disponibile per il server di "
+"visualizzazione: \"%s\".\n"
+"È possibile modificare il server di visualizzazione nelle Impostazioni del "
+"progetto (Schermo > Server di visualizzazione > Driver)."
+
+msgid ""
+"Game embedding not available when the game starts minimized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"L'incorporamento del gioco non è disponibile quando il gioco è avviato "
+"minimizzato.\n"
+"Considera di sovrascrivere l'impostazione del progetto \"Modalità finestra\" "
+"con il tag della funzionalità \"editor\" su \"Windowed\" per usare "
+"l'incorporamento del gioco, lasciando intatto il progetto esportato."
+
+msgid ""
+"Game embedding not available when the game starts maximized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"L'incorporamento del gioco non è disponibile quando il gioco è avviato "
+"massimizzato.\n"
+"Considera di sovrascrivere l'impostazione del progetto \"Modalità finestra\" "
+"con il tag della funzionalità \"editor\" su \"Windowed\" per usare "
+"l'incorporamento del gioco, lasciando intatto il progetto esportato."
+
+msgid ""
+"Game embedding not available when the game starts in fullscreen.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"L'incorporamento del gioco non è disponibile quando il gioco è avviato a "
+"schermo intero.\n"
+"Considera di sovrascrivere l'impostazione del progetto \"Modalità finestra\" "
+"con il tag della funzionalità \"editor\" su \"Windowed\" per usare "
+"l'incorporamento del gioco, lasciando intatto il progetto esportato."
+
+msgid "Game embedding not available in single window mode."
+msgstr ""
+"L'incorporamento del gioco non è disponibile in modalità finestra singola."
+
+msgid "Suspend"
+msgstr "Sospendi"
+
+msgid "Next Frame"
+msgstr "Prossimo frame"
+
+msgid "Input"
+msgstr "Input"
+
+msgid "Allow game input."
+msgstr "Permetti input di gioco."
+
+msgid ""
+"Disable game input and allow to select Node2Ds, Controls, and manipulate the "
+"2D camera."
+msgstr ""
+"Disabilita l'input di gioco e permette di selezionare i Node2D, i Control e "
+"di manipolare la telecamera 2D."
+
+msgid ""
+"Disable game input and allow to select Node3Ds and manipulate the 3D camera."
+msgstr ""
+"Disabilita l'input di gioco e permette di selezionare i Node3D e di "
+"manipolare la telecamera 3D."
+
+msgid "Toggle Selection Visibility"
+msgstr "Alterna visibilità della selezione"
+
+msgid "Alt+RMB: Show list of all nodes at position clicked."
+msgstr ""
+"Alt+Clic destro: Mostra una lista di tutti i nodi presenti nella posizione "
+"cliccata."
+
+msgid "Override the in-game camera."
+msgstr "Sostituisci la telecamera di gioco."
+
+msgid "Camera Override Options"
+msgstr "Opzioni di sostituzione della telecamera"
+
+msgid "Reset 2D Camera"
+msgstr "Ripristina telecamera 2D"
+
+msgid "Reset 3D Camera"
+msgstr "Ripristina telecamera 3D"
+
+msgid "Manipulate In-Game"
+msgstr "Manipola nel gioco"
+
+msgid "Manipulate From Editors"
+msgstr "Manipola dagli editor"
+
+msgid ""
+"Embedded game size is based on project settings.\n"
+"The 'Keep Aspect' mode is used when the Game Workspace is smaller than the "
+"desired size."
+msgstr ""
+"Le dimensioni del gioco incorporato si basano sulle impostazioni del "
+"progetto.\n"
+"La modalità \"Mantieni aspetto\" viene utilizzata quando l'area di lavoro del "
+"gioco è più piccola delle dimensioni desiderate."
+
+msgid "Keep the aspect ratio of the embedded game."
+msgstr "Mantieni il rapporto d'aspetto del gioco incorporato."
+
+msgid "Embedded game size stretches to fit the Game Workspace."
+msgstr ""
+"Le dimensioni del gioco incorporato si estendono per adattarsi all'area di "
+"lavoro del gioco."
+
+msgid "Embedding Options"
+msgstr "Opzioni di incorporamento"
+
+msgid "Embed Game on Next Play"
+msgstr "Incorpora gioco al prossimo avvio"
+
+msgid "Make Game Workspace Floating on Next Play"
+msgstr "Rendi fluttuante l'area di lavoro del gioco al prossimo avvio"
+
+msgid "Game Workspace"
+msgstr "Area di lavoro del gioco"
+
+msgid ""
+"No \"%s\" library found for GDExtension: \"%s\". Possible feature flags for "
+"your platform: %s"
+msgstr ""
+"Nessuna libreria \"%s\" rilevata per GDExtension: \"%s\". Possibili flag di "
+"funzionalità per la tua piattaforma: %s"
+
+msgid "Multiple \"%s\" libraries found for GDExtension: \"%s\": \"%s\"."
+msgstr "Rilevata più di una libreria \"%s\" per GDExtension \"%s\": %s\"."
+
 msgid "Change AudioStreamPlayer3D Emission Angle"
 msgstr "Cambia l'angolo di emissione di un AudioStreamPlayer3D"
 
@@ -8665,6 +9472,47 @@ msgstr ""
 "Impossibile determinare un percorso di salvataggio per le immagini lightmap.\n"
 "Salva la scena e riprova."
 
+msgid ""
+"No meshes with lightmapping support to bake. Make sure they contain UV2 data "
+"and their Global Illumination property is set to Static."
+msgstr ""
+"Nessuna mesh con supporto per il lightmapping da precalcolare. Assicurati che "
+"contengano dati UV2 e che la loro proprietà \"Illuminazione globale\" sia "
+"impostata su \"Static\"."
+
+msgid ""
+"To import a scene with lightmapping support, set Meshes > Light Baking to "
+"Static Lightmaps in the Import dock."
+msgstr ""
+"Per importare una scena con supporto per il lightmapping, imposta \"Mesh > "
+"Precalcolo della luce\" su \"Static Lightmaps\" nel pannello d'importazione."
+
+msgid ""
+"To enable lightmapping support on a primitive mesh, edit the PrimitiveMesh "
+"resource in the inspector and check Add UV2."
+msgstr ""
+"Per abilitare supporto per il lightmapping su una mesh primitiva, modifica la "
+"risorsa PrimitiveMesh nell'ispettore e seleziona l'opzione \"Aggiungi UV2\"."
+
+msgid ""
+"To enable lightmapping support on a CSG mesh, select the root CSG node and "
+"choose CSG > Bake Mesh Instance at the top of the 3D editor viewport.\n"
+"Select the generated MeshInstance3D node and choose Mesh > Unwrap UV2 for "
+"Lightmap/AO at the top of the 3D editor viewport."
+msgstr ""
+"Per abilitare il supporto per il lightmapping su una mesh CSG, seleziona il "
+"nodo CSG radice e scegli \"CSG > Prepara istanza di mesh\" in cima alla "
+"viewport dell'editor 3D.\n"
+"Seleziona il nodo MeshInstance3D generato e scegli \"Mesh > Unwrap UV2 per "
+"Lightmap/AO\" in cima alla viewport dell'editor 3D."
+
+msgid ""
+"Failed creating lightmap images. Make sure the lightmap destination path is "
+"writable."
+msgstr ""
+"Errore nella creazione delle immagini lightmap. Assicurarsi che il percorso "
+"di destinazione delle lightmap sia scrivibile."
+
 msgid "No editor scene root found."
 msgstr "Nessun nodo radice della scena dell'editor trovato."
 
@@ -8681,6 +9529,16 @@ msgstr ""
 "Sebbene questo possa essere risolto aumentando le dimensioni massime della "
 "texture, si consiglia invece di suddividere la scena in più oggetti."
 
+msgid ""
+"Failed creating lightmap images. Make sure all meshes to bake have the "
+"Lightmap Size Hint property set high enough, and the LightmapGI's Texel Scale "
+"value is not too low."
+msgstr ""
+"Errore nella creazione delle immagini lightmap. Assicurarsi che tutte le mesh "
+"selezionate per il precalcolo abbiano la proprietà \"Lightmap Size Hint\" "
+"impostata a un valore sufficientemente alto e che il valore \"Texel Scale\" "
+"del LightmapGI non sia troppo basso."
+
 msgid ""
 "Failed fitting a lightmap image into an atlas. This should never happen and "
 "should be reported."
@@ -8691,12 +9549,28 @@ msgstr ""
 msgid "Bake Lightmaps"
 msgstr "Precalcola le lightmap"
 
+msgid "Lightmap baking is not supported on this GPU (%s)."
+msgstr "La preparazione delle lightmap non è supportata su questa GPU (%s)."
+
+msgid "Lightmaps cannot be baked on %s."
+msgstr "Non è possibile preparare le lightmap su %s."
+
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time."
+msgstr ""
+"Non è possibile preparare le lightmap, poiché il modulo `lightmapper_rd` è "
+"stato disabilitato in fase di compilazione."
+
 msgid "LightMap Bake"
 msgstr "Precalcolo di lightmap"
 
 msgid "Select lightmap bake file:"
 msgstr "Seleziona il file di precalcolo della lightmap:"
 
+msgid "Preview is not available for this shader mode."
+msgstr "L'anteprima non è disponibile per questa modalità di shader."
+
 msgid "Couldn't create a Trimesh collision shape."
 msgstr "Impossibile creare una forma di collisione Trimesh."
 
@@ -8894,6 +9768,30 @@ msgstr ""
 msgid "UV Channel Debug"
 msgstr "Debug del canale UV"
 
+msgid "Create NavigationMesh"
+msgstr "Crea NavigationMesh"
+
+msgid ""
+"Before converting a rendering mesh to a navigation mesh, please verify:\n"
+"\n"
+"- The mesh is two-dimensional.\n"
+"- The mesh has no surface overlap.\n"
+"- The mesh has no self-intersection.\n"
+"- The mesh surfaces have indices.\n"
+"\n"
+"If the mesh does not fulfill these requirements, the pathfinding will be "
+"broken."
+msgstr ""
+"Prima di convertire una mesh a una mesh di navigazione, assicurati che:\n"
+"\n"
+"- La mesh è bidimensionale.\n"
+"- La mesh non ha sovrapposizioni di superficie.\n"
+"- La mesh non ha autointersezioni.\n"
+"- Le superfici della mesh hanno indici.\n"
+"\n"
+"Se la mesh non soddisfa questi requisiti, il rilevamento del percorso sarà "
+"incorretto."
+
 msgid "Remove item %d?"
 msgstr "Rimuovere l'elemento %d?"
 
@@ -9009,9 +9907,45 @@ msgstr "Imposta la posizione di partenza"
 msgid "Set end_position"
 msgstr "Imposta la posizione di arrivo"
 
+msgid "Set Obstacle Vertices"
+msgstr "Imposta i vertici di un ostacolo"
+
+msgid "Edit Obstacle (Flip Winding)"
+msgstr "Modifica un ostacolo (inverti l'avvolgimento)"
+
+msgid "Edit Obstacle (Clear Vertices)"
+msgstr "Modifica un ostacolo (svuota i vertici)"
+
+msgid "Add Vertex"
+msgstr "Aggiungi vertice"
+
+msgid "Edit Vertex"
+msgstr "Modifica vertice"
+
+msgid "Delete Vertex"
+msgstr "Elimina vertice"
+
+msgid "Flip Winding"
+msgstr "Inverti avvolgimento"
+
+msgid "Clear Vertices"
+msgstr "Svuota vertici"
+
+msgid "Edit Obstacle (Add Vertex)"
+msgstr "Modifica un ostacolo (aggiungi un vertice)"
+
+msgid "Edit Obstacle (Move Vertex)"
+msgstr "Modifica un ostacolo (muovi un vertice)"
+
+msgid "Edit Obstacle (Remove Vertex)"
+msgstr "Modifica un ostacolo (rimuovi un vertice)"
+
 msgid "Please Confirm..."
 msgstr "Per favore conferma..."
 
+msgid "Remove all vertices?"
+msgstr "Rimuovere tutti i vertici?"
+
 msgid "Create Navigation Polygon"
 msgstr "Crea un poligono di navigazione"
 
@@ -9085,6 +10019,9 @@ msgstr "Ortogonale da dietro"
 msgid "Rear Perspective"
 msgstr "Prospettica da dietro"
 
+msgid "[auto]"
+msgstr "[auto]"
+
 msgid "X-Axis Transform."
 msgstr "Trasformazione sull'asse X."
 
@@ -9289,6 +10226,9 @@ msgstr "Vedi ambiente"
 msgid "View Gizmos"
 msgstr "Vedi gizmo"
 
+msgid "View Transform Gizmo"
+msgstr "Vedi gizmo di trasformazione"
+
 msgid "View Grid"
 msgstr "Vedi griglia"
 
@@ -9313,6 +10253,24 @@ msgstr "Anteprima cinematografica"
 msgid "Not available when using the OpenGL renderer."
 msgstr "Non disponibile quando il renderer OpenGL è in uso."
 
+msgid "Viewport Orbit Modifier 1"
+msgstr "Modificatore 1 di orbita della viewport"
+
+msgid "Viewport Orbit Modifier 2"
+msgstr "Modificatore 2 di orbita della viewport"
+
+msgid "Viewport Pan Modifier 1"
+msgstr "Modificatore 1 di panoramica della viewport"
+
+msgid "Viewport Pan Modifier 2"
+msgstr "Modificatore 2 di panoramica della viewport"
+
+msgid "Viewport Zoom Modifier 1"
+msgstr "Modificatore 1 di zoom della viewport"
+
+msgid "Viewport Zoom Modifier 2"
+msgstr "Modificatore 2 di zoom della viewport"
+
 msgid "Freelook Left"
 msgstr "Vista libera sinistra"
 
@@ -9364,6 +10322,9 @@ msgstr "Inizia trasformazione di rotazione"
 msgid "Begin Scale Transformation"
 msgstr "Inizia trasformazione di scala"
 
+msgid "Reposition Using Collisions"
+msgstr "Riposiziona usando collisioni"
+
 msgid "Toggle Camera Preview"
 msgstr "Alterna anteprima della telecamera"
 
@@ -9450,6 +10411,10 @@ msgstr ""
 "venga selezionato quando si clicca su qualsiasi nodo figlio nella vista 2D e "
 "3D."
 
+msgid "LMB+Drag: Measure the distance between two points in 3D space."
+msgstr ""
+"Clic sinistro+Trascina: Misura la distanza tra due punti nello spazio 3D."
+
 msgid "Use Local Space"
 msgstr "Usa coordinate locali"
 
@@ -9769,6 +10734,11 @@ msgstr ""
 msgid "Generating..."
 msgstr "Generazione in corso..."
 
+msgid "Loading emission mask requires ParticleProcessMaterial."
+msgstr ""
+"Il caricamento di una maschera di emissione richiede un "
+"ParticleProcessMaterial."
+
 msgid "GPUParticles2D"
 msgstr "GPUParticles2D"
 
@@ -9834,6 +10804,9 @@ msgstr "Sorgente di emissione:"
 msgid "A processor material of type 'ParticleProcessMaterial' is required."
 msgstr "È richiesto un materiale processore di tipo 'ParticleProcessMaterial'."
 
+msgid "Create Emission Points"
+msgstr "Crea punti di emissione"
+
 msgid "GPUParticles3D"
 msgstr "GPUParticles3D"
 
@@ -9876,6 +10849,9 @@ msgstr "Chiudi la curva"
 msgid "Clear Curve Points"
 msgstr "Azzera i punti di una curva"
 
+msgid "Create Curve in Path2D"
+msgstr "Crea una curva in Path2D"
+
 msgid "Select Points"
 msgstr "Seleziona i punti"
 
@@ -9915,6 +10891,9 @@ msgstr "Specchia angoli di maniglia"
 msgid "Mirror Handle Lengths"
 msgstr "Specchia lunghezze di maniglia"
 
+msgid "Create Curve"
+msgstr "Crea una curva"
+
 msgid "Curve Point #"
 msgstr "Punto di curva #"
 
@@ -9954,6 +10933,12 @@ msgstr "Ripristina un punto \"In-Control\""
 msgid "Reset Point Tilt"
 msgstr "Ripristina l'Inclinazione di un punto"
 
+msgid "Toggle Open/Closed Curve"
+msgstr "Alterna tra curva aperta/chiusa"
+
+msgid "Create Curve in Path3D"
+msgstr "Crea una curva in Path3D"
+
 msgid "Shift+Click: Select multiple Points"
 msgstr "Maiusc+Clic: Seleziona più di un punto"
 
@@ -10058,6 +11043,13 @@ msgstr ""
 msgid "Script Name:"
 msgstr "Nome di script:"
 
+msgid ""
+"Optional. The name of the script file. If left empty, will default to the "
+"subfolder name."
+msgstr ""
+"Opzionale. Il nome del file dello script. Se lasciato vuoto, sarà usato il "
+"nome della sotto-cartella."
+
 msgid "Activate now?"
 msgstr "Attivare ora?"
 
@@ -10129,9 +11121,15 @@ msgstr "Ossa"
 msgid "Move Points"
 msgstr "Sposta punti"
 
+msgid "%s: Rotate"
+msgstr "%s: Ruota"
+
 msgid "Shift: Move All"
 msgstr "Maiusc: Muovi tutti"
 
+msgid "%s + Shift: Scale"
+msgstr "%s + Maiusc: Scala"
+
 msgid "Move Polygon"
 msgstr "Sposta il poligono"
 
@@ -10200,6 +11198,12 @@ msgstr "Passo Y della griglia:"
 msgid "Sync Bones to Polygon"
 msgstr "Sincronizza le ossa con il poligono"
 
+msgid "Polygon"
+msgstr "Poligono"
+
+msgid "Toggle Polygon Bottom Panel"
+msgstr "Commuta il pannello inferiore di poligono"
+
 msgid "Create Polygon3D"
 msgstr "Crea un Polygon3D"
 
@@ -10242,6 +11246,12 @@ msgstr ""
 "AnimationMixer non ha un percorso valido verso il nodo radice, non è perciò "
 "possibile recuperare i nomi delle tracce."
 
+msgid "(truncated)"
+msgstr "(abbreviato)"
+
+msgid "Current value: "
+msgstr "Valore attuale: "
+
 msgid "Can't open '%s'. The file could have been moved or deleted."
 msgstr ""
 "Impossibile aprire '%s'. Il file potrebbe essere stato spostato o eliminato."
@@ -10370,6 +11380,9 @@ msgstr "Ricarica script (parziale)"
 msgid "Copy Script Path"
 msgstr "Copia percorso dello script"
 
+msgid "Copy Script UID"
+msgstr "Copia UID dello script"
+
 msgid "History Previous"
 msgstr "Precedente in cronologia"
 
@@ -10409,6 +11422,13 @@ msgstr "Vai al documento modificato precedente."
 msgid "Go to next edited document."
 msgstr "Vai al documento modificato successivo."
 
+msgid ""
+"Make the script editor floating.\n"
+"Right-click to open the screen selector."
+msgstr ""
+"Rendi l'editor di script fluttuante.\n"
+"Clic destro per aprire la selezione schermo."
+
 msgid "Discard"
 msgstr "Scarta"
 
@@ -10448,6 +11468,9 @@ msgstr "Testo semplice"
 msgid "JSON"
 msgstr "JSON"
 
+msgid "Markdown"
+msgstr "Markdown"
+
 msgid "Connections to method:"
 msgstr "Connessioni al metodo:"
 
@@ -10494,6 +11517,9 @@ msgstr "Non è possibile trascinare nodi senza una scena aperta."
 msgid "Can't drop nodes because script '%s' does not inherit Node."
 msgstr "Impossibile rilasciare nodi perché lo script '%s' non eredita da Node."
 
+msgid "Emoji & Symbols"
+msgstr "Emoji e simboli"
+
 msgid "Pick Color"
 msgstr "Scegli colore"
 
@@ -10626,12 +11652,22 @@ msgstr "Salva file"
 msgid "Open File in Inspector"
 msgstr "Apri file nell'Ispettore"
 
+msgid "Inspect Native Shader Code..."
+msgstr "Esamina codice di shader generato..."
+
 msgid "Close File"
 msgstr "Chiudi file"
 
 msgid "Shader Editor"
 msgstr "Editor di shader"
 
+msgid ""
+"Make the shader editor floating.\n"
+"Right-click to open the screen selector."
+msgstr ""
+"Rendi l'editor di shader fluttuante.\n"
+"Clic destro per aprire la selezione schermo."
+
 msgid "Toggle Shader Editor Bottom Panel"
 msgstr "Commuta pannello inferiore dell'Editor di shader"
 
@@ -10672,9 +11708,24 @@ msgstr "Ripristina a posa di riposo"
 msgid "Overwrite Rest Pose"
 msgstr "Sovrascrivi posa di riposo"
 
+msgid "Bone Metadata"
+msgstr "Metadati d'osso"
+
+msgid "Add Bone Metadata"
+msgstr "Aggiungi metadati d'osso"
+
 msgid "Set Bone Transform"
 msgstr "Imposta la trasformazione di un osso"
 
+msgid "Modify metadata '%s' for bone '%s'"
+msgstr "Modifica il metadato \"%s\" per l'osso \"%s\""
+
+msgid "Remove metadata '%s' from bone '%s'"
+msgstr "Rimuovi il metadato \"%s\" dall'osso \"%s\""
+
+msgid "Add metadata '%s' to bone '%s'"
+msgstr "Aggiungi il metadato \"%s\" all'osso \"%s\""
+
 msgid "Set Bone Rest"
 msgstr "Imposta la posa di riposo di un osso"
 
@@ -10695,6 +11746,12 @@ msgstr "Esporta il profilo dello scheletro come..."
 msgid "Set Bone Parentage"
 msgstr "Imposta la parentela di un osso"
 
+msgid "Revert Bone"
+msgstr "Ripristina un osso"
+
+msgid "Revert"
+msgstr "Ripristina"
+
 msgid "Skeleton3D"
 msgstr "Scheletro 3D"
 
@@ -11777,6 +12834,9 @@ msgstr "Disegna tasselli"
 msgid "Paste tiles"
 msgstr "Incolla tasselli"
 
+msgid "Selection Tool"
+msgstr "Strumento di selezione"
+
 msgid "Shift: Draw line."
 msgstr "Maiusc: Disegna una linea."
 
@@ -11822,6 +12882,13 @@ msgstr "Dispersione:"
 msgid "Tiles"
 msgstr "Tasselli"
 
+msgid ""
+"This TileMap's TileSet has no Tile Source configured. Go to the TileSet "
+"bottom panel to add one."
+msgstr ""
+"Il TileSet di questa TileMap non ha alcuna sorgente di tasselli configurata. "
+"Vai nel pannello inferiore del TileSet per aggiungerne una."
+
 msgid "Sort sources"
 msgstr "Ordina le sorgenti"
 
@@ -12375,6 +13442,9 @@ msgstr "Rimuovi una sorgente"
 msgid "Add atlas source"
 msgstr "Aggiungi una sorgente d'atlante"
 
+msgid "Tile Sources"
+msgstr "Sorgenti di tasselli"
+
 msgid "Sort Sources"
 msgstr "Ordina le sorgenti"
 
@@ -12459,6 +13529,24 @@ msgstr "Proprietà della collezione di scene:"
 msgid "Tile properties:"
 msgstr "Proprietà del tassello:"
 
+msgid "Paint Tool"
+msgstr "Strumento di disegno"
+
+msgid "Line Tool"
+msgstr "Strumento di linea"
+
+msgid "Rect Tool"
+msgstr "Strumento di rettangolo"
+
+msgid "Bucket Tool"
+msgstr "Strumento di secchio"
+
+msgid "Eraser Tool"
+msgstr "Strumento di gomma"
+
+msgid "Picker Tool"
+msgstr "Strumento di prelievo"
+
 msgid "TileMap"
 msgstr "TileMap"
 
@@ -12731,6 +13819,12 @@ msgstr ""
 "L'anteprima 2D non può mostrare correttamente il risultato prelevato dal "
 "parametro dell'istanza."
 
+msgid "Copy Preview Shader Parameters From Material"
+msgstr "Copia parametri di shader d'anteprima dal materiale"
+
+msgid "Paste Preview Shader Parameters To Material"
+msgstr "Incolla parametri di shader d'anteprima al materiale"
+
 msgid "Add Input Port"
 msgstr "Aggiungi porta d'ingresso"
 
@@ -12848,6 +13942,9 @@ msgstr "Abilita autoriduzione"
 msgid "Enable Tint Color"
 msgstr "Abilita colore di tinta"
 
+msgid "Edit Preview Parameter: %s"
+msgstr "Anteprima di modifica del parametro: %s"
+
 msgid "Duplicate VisualShader Node(s)"
 msgstr "Duplica dei nodi di VisualShader"
 
@@ -12875,9 +13972,15 @@ msgstr "Nome non valido per un varying."
 msgid "Varying with that name is already exist."
 msgstr "Un varying con quel nome esiste già."
 
+msgid "Boolean type cannot be used with `%s` varying mode."
+msgstr "Il tipo booleano non può essere usato con la modalità di varying `%s`."
+
 msgid "Add Node(s) to Visual Shader"
 msgstr "Aggiungi dei nodi a uno shader visivo"
 
+msgid "Hold %s Key To Swap Connections"
+msgstr "Tieni premuto il tasto %s per scambiare le connessioni"
+
 msgid "Vertex"
 msgstr "Vertice"
 
@@ -12911,6 +14014,9 @@ msgstr "Rimuovi varying"
 msgid "Show generated shader code."
 msgstr "Mostra il codice di shader generato."
 
+msgid "Toggle shader preview."
+msgstr "Commuta l'anteprima dello shader."
+
 msgid "Generated Shader Code"
 msgstr "Codice di shader generato"
 
@@ -12926,6 +14032,15 @@ msgstr "Inserisci nuovo nodo"
 msgid "Insert New Reroute"
 msgstr "Inserisci nuovo reindirizzamento"
 
+msgid "Filter Parameters"
+msgstr "Filtra i parametri"
+
+msgid "Copy Parameters From Material"
+msgstr "Copia parametri dal materiale"
+
+msgid "Paste Parameters To Material"
+msgstr "Incolla parametri al materiale"
+
 msgid "High-end node"
 msgstr "Nodo di fascia alta"
 
@@ -12950,12 +14065,18 @@ msgstr "Funzione scala di grigi."
 msgid "Converts HSV vector to RGB equivalent."
 msgstr "Converte un vettore HSV nell'equivalente RGB."
 
+msgid "Converts color from linear to sRGB color space."
+msgstr "Converte il colore dallo spazio colore lineare allo spazio colore sRGB."
+
 msgid "Converts RGB vector to HSV equivalent."
 msgstr "Converte un vettore RGB nell'equivalente HSV."
 
 msgid "Sepia function."
 msgstr "Funzione seppia."
 
+msgid "Converts color from sRGB to linear color space."
+msgstr "Converte il colore dallo spazio colore sRGB allo spazio colore lineare."
+
 msgid "Burn operator."
 msgstr "Operatore brucia."
 
@@ -12992,6 +14113,9 @@ msgstr "Parametro di colore."
 msgid "(Fragment/Light mode only) Derivative function."
 msgstr "(Solo in modalità Fragment/Light) Funzione derivata."
 
+msgid "Derivative function."
+msgstr "Funzione derivata."
+
 msgid "Returns the boolean result of the %s comparison between two parameters."
 msgstr ""
 "Restituisce il risultato booleano del confronto di %s tra due parametri."
@@ -13243,6 +14367,12 @@ msgstr ""
 "(Solo in modalità Fragment/Light) (Scalare) Derivata in \"y\" utilizzando la "
 "differenziazione locale."
 
+msgid "(Scalar) Derivative in 'x' using local differencing."
+msgstr "(Scalare) Derivata in \"x\" utilizzando la differenziazione locale."
+
+msgid "(Scalar) Derivative in 'y' using local differencing."
+msgstr "(Scalare) Derivata in \"y\" utilizzando la differenziazione locale."
+
 msgid "Base-e Exponential."
 msgstr "Esponenziale in base e."
 
@@ -13295,6 +14425,11 @@ msgstr "Converte una quantità di gradi in radianti."
 msgid "1.0 / scalar"
 msgstr "1.0 / scalare"
 
+msgid "Remaps a value from the input range to the output range."
+msgstr ""
+"Riassegna un valore d'ingresso dall'intervallo d'ingresso all'intervallo di "
+"uscita."
+
 msgid "Finds the nearest integer to the parameter."
 msgstr "Trova il numero intero più vicino al parametro."
 
@@ -13344,6 +14479,9 @@ msgstr ""
 "(Solo in modalità Fragment/Light) (Scalare) Somma delle derivate assolute in "
 "\"x\" e \"y\"."
 
+msgid "(Scalar) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Scalare) Somma delle derivate assolute in \"x\" e \"y\"."
+
 msgid "Returns the tangent of the parameter."
 msgstr "Restituisce la tangente del parametro."
 
@@ -13692,6 +14830,12 @@ msgstr ""
 "(Solo in modalità Fragment/Light) (Vettore) Derivata in \"y\" utilizzando la "
 "differenziazione locale."
 
+msgid "(Vector) Derivative in 'x' using local differencing."
+msgstr "(Vettore) Derivata in \"x\" utilizzando la differenziazione locale."
+
+msgid "(Vector) Derivative in 'y' using local differencing."
+msgstr "(Vettore) Derivata in \"y\" utilizzando la differenziazione locale."
+
 msgid "Returns the distance between two points."
 msgstr "Restituisce la distanza tra due punti."
 
@@ -13749,6 +14893,16 @@ msgstr ""
 msgid "Returns the vector that points in the direction of refraction."
 msgstr "Restituisce un vettore che punta nella direzione della refrazione."
 
+msgid "Remaps a vector from the input range to the output range."
+msgstr "Rimappa un vettore dall'intervallo d'ingresso all'intervallo di uscita."
+
+msgid ""
+"Remaps a vector from the input range to the output range. Ranges defined with "
+"scalars."
+msgstr ""
+"Rimappa un vettore dall'intervallo d'ingresso all'intervallo di uscita. Gli "
+"intervalli sono definiti con scalari."
+
 msgid ""
 "SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n"
 "\n"
@@ -13799,6 +14953,9 @@ msgstr ""
 "(Solo in modalità Fragment/Light) (Vettore) Somma delle derivate assolute in "
 "\"x\" e \"y\"."
 
+msgid "(Vector) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Vettore) Somma delle derivate assolute in \"x\" e \"y\"."
+
 msgid "Adds 2D vector to 2D vector."
 msgstr "Aggiunge un vettore 2D a un vettore 2D."
 
@@ -14129,6 +15286,36 @@ msgstr ""
 "Rimuovere tutti i progetti mancanti dall'elenco?\n"
 "Il contenuto delle cartelle dei progetti non verrà modificato."
 
+msgid ""
+"It looks like Godot crashed when opening this project the last time. If "
+"you're having problems editing this project, you can try to open it in "
+"Recovery Mode."
+msgstr ""
+"Sembra che Godot si sia arrestato inaspettatamente durante l'ultima apertura "
+"di questo progetto. Se hai problemi a modificare questo progetto, puoi "
+"provare ad aprirlo in modalità di recupero."
+
+msgid ""
+"Recovery Mode is a special mode that may help to recover projects that crash "
+"the engine during initialization. This mode temporarily disables the "
+"following features:"
+msgstr ""
+"La modalità di recupero è una modalità speciale che può aiutare a recuperare "
+"progetti che bloccano il motore durante l'inizializzazione. Questa modalità "
+"disabilita temporaneamente le seguenti funzionalità:"
+
+msgid ""
+"This mode is intended only for basic editing to troubleshoot such issues, and "
+"therefore it will not be possible to run the project during this mode. It is "
+"also a good idea to make a backup of your project before proceeding."
+msgstr ""
+"Questa modalità è pensata solo per modifiche di base per risolvere tali "
+"problemi e pertanto non è possibile eseguire un progetto in questa modalità. "
+"È anche una buona idea effettuare un backup del progetto prima di procedere."
+
+msgid "Edit the project in Recovery Mode?"
+msgstr "Modificare il progetto in modalità di recupero?"
+
 msgid "Couldn't load project at '%s'. It may be missing or corrupted."
 msgstr ""
 "Impossibile caricare il progetto in '%s'. Potrebbe essere mancante o corrotto."
@@ -14220,6 +15407,9 @@ msgstr ""
 msgid "Edit Project"
 msgstr "Modifica progetto"
 
+msgid "Edit in recovery mode"
+msgstr "Modifica il progetto in modalità di recupero"
+
 msgid "Rename Project"
 msgstr "Rinomina progetto"
 
@@ -14245,6 +15435,12 @@ msgstr "Scegli una cartella da scansionare"
 msgid "Remove All"
 msgstr "Rimuovi tutti"
 
+msgid "Edit normally"
+msgstr "Modifica normalmente"
+
+msgid "Edit in Recovery Mode"
+msgstr "Modifica in modalità di recupero"
+
 msgid "Convert Full Project"
 msgstr "Converti intero progetto"
 
@@ -14386,6 +15582,9 @@ msgstr "Rendering rapido per scene semplici."
 msgid "Supports desktop, mobile + web platforms."
 msgstr "Supporta le piattaforme desktop, mobili e web."
 
+msgid "Least advanced 3D graphics."
+msgstr "Grafica 3D meno avanzata."
+
 msgid "Intended for low-end/older devices."
 msgstr "Progettato per dispositivi di fascia bassa o più vecchi."
 
@@ -14446,6 +15645,15 @@ msgstr "Percorso d'installazione del progetto:"
 msgid "Renderer:"
 msgstr "Renderer:"
 
+msgid ""
+"RenderingDevice-based methods not available on this GPU:\n"
+"%s\n"
+"Please use the Compatibility renderer."
+msgstr ""
+"I metodi basati sul RenderingDevice non sono disponibili su questa GPU:\n"
+"%s\n"
+"Si prega di usare il renderer di Compatibilità."
+
 msgid "The renderer can be changed later, but scenes may need to be adjusted."
 msgstr ""
 "Il renderer può essere cambiato in seguito, ma potrebbe essere necessario "
@@ -14457,6 +15665,9 @@ msgstr "Metadati di controllo di versione:"
 msgid "Git"
 msgstr "Git"
 
+msgid "Edit Now"
+msgstr "Modifica ora"
+
 msgid "This project was last edited in a different Godot version: "
 msgstr ""
 "Questo progetto è stato modificato l'ultima volta in una versione diversa di "
@@ -14473,6 +15684,12 @@ msgstr "Errore: Il progetto non è presente nel filesystem."
 msgid "Last edited timestamp"
 msgstr "Data dell'ultima modifica"
 
+msgid "Scanning"
+msgstr "Scansione"
+
+msgid "Scanning for projects..."
+msgstr "Scansione dei progetti..."
+
 msgid "Missing Project"
 msgstr "Progetto mancante"
 
@@ -14714,9 +15931,6 @@ msgstr "Tag di funzionalità"
 msgid "Pick Root Node Type"
 msgstr "Scegli il tipo del nodo radice"
 
-msgid "Pick"
-msgstr "Scegli"
-
 msgid "Scene name is empty."
 msgstr "Il nome della scena è vuoto."
 
@@ -14988,6 +16202,15 @@ msgstr "Riaccoppia a nuovo nodo"
 msgid "This operation requires a single selected node."
 msgstr "Questa operazione richiede un solo nodo selezionato."
 
+msgid "Reset Position"
+msgstr "Ripristina posizione"
+
+msgid "Reset Scale"
+msgstr "Ripristina scala"
+
+msgid "Reset Rotation"
+msgstr "Ripristina rotazione"
+
 msgid ""
 "Couldn't save new scene. Likely dependencies (instances) couldn't be "
 "satisfied."
@@ -15004,6 +16227,9 @@ msgstr "Errore nel duplicare la scena per salvarla."
 msgid "Instantiate Script"
 msgstr "Istanzia uno script"
 
+msgid "<unknown>"
+msgstr "<sconosciuto>"
+
 msgid "Sub-Resources"
 msgstr "Sotto-risorse"
 
@@ -15035,6 +16261,9 @@ msgstr ""
 "Se abilitato, \"Riaccoppia a nuovo nodo\" creerà il nuovo nodo al centro dei "
 "nodi selezionati, se è possibile."
 
+msgid "Hide Filtered Out Parents"
+msgstr "Nascondi genitori filtrati"
+
 msgid "All Scene Sub-Resources"
 msgstr "Tutte le sotto-risorse di scena"
 
@@ -15147,6 +16376,9 @@ msgstr "Allega un nuovo script o uno già esistente al nodo selezionato."
 msgid "Detach the script from the selected node."
 msgstr "Rimuovi lo script dal nodo selezionato."
 
+msgid "Extend the script of the selected node."
+msgstr "Estendi lo script del nodo selezionato."
+
 msgid "Extra scene options."
 msgstr "Ulteriori opzioni di scena."
 
@@ -15400,6 +16632,12 @@ msgstr ""
 msgid "Restart & Upgrade"
 msgstr "Riavvia e aggiorna"
 
+msgid "Updating Script UIDs"
+msgstr "Aggiornamento degli UID degli script"
+
+msgid "Learn More"
+msgstr "Ulteriori informazioni"
+
 msgid "Make this panel floating in the screen %d."
 msgstr "Rendi questo panello fluttuare nello schermo %d."
 
@@ -15408,11 +16646,73 @@ msgid ""
 "Right-click to open the screen selector."
 msgstr ""
 "Rendi questo panello fluttuante.\n"
-"Click destro per aprire la selezione schermo."
+"Clic destro per aprire la selezione schermo."
 
 msgid "Select Screen"
 msgstr "Seleziona uno schermo"
 
+msgid ""
+"The CSGShape3D has an empty shape.\n"
+"CSGShape3D empty shapes typically occur because the mesh is not manifold.\n"
+"A manifold mesh forms a solid object without gaps, holes, or loose edges.\n"
+"Each edge must be a member of exactly two faces."
+msgstr ""
+"Lo CSGShape3D ha una forma vuota.\n"
+"Solitamente, le forme CSGShape3D vuote si verificano perché la mesh non è "
+"manifold.\n"
+"Una mesh manifold è costituita da un oggetto solido senza spazi vuoti, buchi "
+"o bordi staccati.\n"
+"Ogni bordo deve essere un membro di esattamente due facce."
+
+msgid "CSG operation returned an empty array."
+msgstr "L'operazione CSG ha restituito un array vuoto."
+
+msgid ""
+"Can not add a baked mesh as sibling for the scene root.\n"
+"Move the CSG root node below a parent node."
+msgstr ""
+"Impossibile aggiungere una mesh preparata di collisione come fratello del "
+"nodo radice della scena.\n"
+"Muovi il nodo CSG radice in basso a un nodo genitore."
+
+msgid "CSG operation returned an empty mesh."
+msgstr "L'operazione CSG ha restituito una mesh vuota."
+
+msgid "Create baked CSGShape3D Mesh Instance"
+msgstr "Crea un'istanza di mesh CSGShape3D preparata"
+
+msgid ""
+"Can not add a baked collision shape as sibling for the scene root.\n"
+"Move the CSG root node below a parent node."
+msgstr ""
+"Impossibile aggiungere una forma preparata di collisione come fratello del "
+"nodo radice della scena.\n"
+"Muovi il nodo CSG radice in basso a un nodo genitore."
+
+msgid "CSG operation returned an empty shape."
+msgstr "L'operazione CSG ha restituito una forma vuota."
+
+msgid "Create baked CSGShape3D Collision Shape"
+msgstr "Crea una forma di collisione CSGShape3D preparata"
+
+msgid "CSG"
+msgstr "CSG"
+
+msgid "Bake Mesh Instance"
+msgstr "Prepara istanza di mesh"
+
+msgid "Bake Collision Shape"
+msgstr "Prepara forma di collisione"
+
+msgid "Change CSG Box Size"
+msgstr "Modifica le dimensioni di una scatola CSG"
+
+msgid "Change CSG Cylinder Radius"
+msgstr "Modifica il raggio di un cilindro CSG"
+
+msgid "Change CSG Cylinder Height"
+msgstr "Modifica l'altezza di un cilindro CSG"
+
 msgid "Change Torus Inner Radius"
 msgstr "Modifica il raggio interno di un toroide"
 
@@ -15428,6 +16728,30 @@ msgstr "Impossibile ridimensionare l'array."
 msgid "Step argument is zero!"
 msgstr "Argomento step è zero!"
 
+msgid "Not a script with an instance."
+msgstr "Non è uno script con un'istanza."
+
+msgid "Not based on a script."
+msgstr "Non basato su uno script."
+
+msgid "Not based on a resource file."
+msgstr "Non basato su un file di risorsa."
+
+msgid "Invalid instance dictionary format (missing @path)."
+msgstr "Formato di dizionario d'istanza non valido (manca il @path)."
+
+msgid "Invalid instance dictionary format (can't load script at @path)."
+msgstr ""
+"Formato di dizionario d'istanza non valido (impossibile caricare lo script "
+"dal @path)."
+
+msgid "Invalid instance dictionary format (invalid script at @path)."
+msgstr ""
+"Formato di dizionario d'istanza non valido (script non valido al @path)."
+
+msgid "Invalid instance dictionary (invalid subclasses)."
+msgstr "Dizionario d'istanza non valido (sottoclassi non valide)."
+
 msgid "Cannot instantiate GDScript class."
 msgstr "Impossible istanziare la classe GDScript."
 
@@ -15552,6 +16876,12 @@ msgstr "Modifica asse Y"
 msgid "Edit Z Axis"
 msgstr "Modifica asse Z"
 
+msgid "Keep Selection"
+msgstr "Mantieni selezione"
+
+msgid "Clear Rotation"
+msgstr "Cancella rotazione"
+
 msgid "GridMap Settings"
 msgstr "Impostazioni di GridMap"
 
@@ -15561,6 +16891,9 @@ msgstr "Distanza di prelievo:"
 msgid "Selection"
 msgstr "Selezione"
 
+msgid "Erase"
+msgstr "Cancella"
+
 msgid "Cursor Rotate X"
 msgstr "Ruota cursore X"
 
@@ -15570,6 +16903,15 @@ msgstr "Ruota cursore Y"
 msgid "Cursor Rotate Z"
 msgstr "Ruota cursore Z"
 
+msgid ""
+"Change Grid Floor:\n"
+"Previous Plane (%s)\n"
+"Next Plane (%s)"
+msgstr ""
+"Cambia il pavimento della griglia:\n"
+"Piano precedente (%s)\n"
+"Piano successivo (%s)"
+
 msgid "Filter Meshes"
 msgstr "Filtra le mesh"
 
@@ -15577,6 +16919,12 @@ msgid "Give a MeshLibrary resource to this GridMap to use its meshes."
 msgstr ""
 "Assegna una risorsa MeshLibrary a questa GridMap per utilizzare le sue mesh."
 
+msgid "GridMap"
+msgstr "GridMap"
+
+msgid "Toggle GridMap Bottom Panel"
+msgstr "Commuta pannello inferiore della GridMap"
+
 msgid "All Clips"
 msgstr "Tutte le clip"
 
@@ -15703,12 +17051,18 @@ msgstr "De-occludendo la geometria"
 msgid "Plot direct lighting"
 msgstr "Pianifica l'illuminazione diretta"
 
+msgid "Plot direct lighting %d%%"
+msgstr "Pianifica l'illuminazione diretta %d%%"
+
 msgid "Integrate indirect lighting"
 msgstr "Integrando l'illuminazione indiretta"
 
 msgid "Integrate indirect lighting %d%%"
 msgstr "Integrando l'illuminazione indiretta %d%%"
 
+msgid "Baking light probes"
+msgstr "Preparazione delle sonde di luce"
+
 msgid "Integrating light probes %d%%"
 msgstr "Integrando le sonde di luce %d%%"
 
@@ -15727,6 +17081,20 @@ msgstr "Il nome della classe deve essere un identificatore valido"
 msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr "Byte insufficienti per la decodifica, o formato non valido."
 
+msgid ""
+"Unable to load .NET runtime, no compatible version was found.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+"Impossibile caricare eseguibile .NET, nessuna versione compatibile è stata "
+"trovata.\n"
+"Tentare di creare o modificare un progetto provocherà un arresto anomalo.\n"
+"\n"
+"Si prega di installare il .NET SDK 8.0 o più recenti da https://get.dot.net e "
+"riavviare Godot."
+
 msgid "Failed to load .NET runtime"
 msgstr "Errore durante il caricamento dell'eseguibile .NET"
 
@@ -15740,6 +17108,19 @@ msgstr ""
 msgid ".NET assemblies not found"
 msgstr "Assembly .NET non trovato"
 
+msgid ""
+"Unable to load .NET runtime, specifically hostfxr.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+"Impossibile caricare eseguibile .NET, specificamente hostfxr.\n"
+"Tentare di creare o modificare un progetto provocherà un arresto anomalo.\n"
+"\n"
+"Si prega di installare il .NET SDK 8.0 o più recenti da https://get.dot.net e "
+"riavviare Godot."
+
 msgid "%d (%s)"
 msgstr "%d (%s)"
 
@@ -15996,6 +17377,22 @@ msgstr "Aggiungi un'azione."
 msgid "Remove action set."
 msgstr "Rimuovi un insieme di azioni."
 
+msgid "Remove binding modifier."
+msgstr "Rimuovi un modificatore di associazione."
+
+msgid "Remove binding modifier"
+msgstr "Rimuovi un modificatore di associazione"
+
+msgid "Add binding modifier"
+msgstr "Aggiungi un modificatore di associazione"
+
+msgid "Note: modifiers will only be applied if supported on the host system."
+msgstr ""
+"Nota: i modificatori saranno applicati solo se supportati dal sistema host."
+
+msgid "Binding modifiers for:"
+msgstr "Modificatori di associazione per:"
+
 msgid "OpenXR Action Map"
 msgstr "Mappa delle azioni OpenXR"
 
@@ -16005,12 +17402,23 @@ msgstr "Commuta pannello inferiore della Mappa delle azioni OpenXR"
 msgid "Remove action from interaction profile"
 msgstr "Rimuovi un'azione dal profilo d'interazione"
 
+msgid "Edit binding modifiers"
+msgstr "Modifica i modificatori delle associazioni"
+
+msgid "Note: This interaction profile requires extension %s support."
+msgstr ""
+"Nota: questo profilo d'interazione richiede supporto per l'estensione %s."
+
 msgid "Add binding"
 msgstr "Aggiungi un'associazione"
 
 msgid "Remove binding"
 msgstr "Rimuovi un'associazione"
 
+msgid "Note: This binding path requires extension %s support."
+msgstr ""
+"Nota: questo percorso di associazione richiede supporto per l'estensione %s."
+
 msgid "Pose"
 msgstr "Posa"
 
@@ -16026,6 +17434,10 @@ msgstr "Selezionare un'azione"
 msgid "Select an interaction profile"
 msgstr "Seleziona un profilo d'interazione"
 
+msgid "All interaction profiles have been added to the action map."
+msgstr ""
+"Tutti i profili di interazione sono stati aggiunti alla mappa delle azioni."
+
 msgid "Choose an XR runtime."
 msgstr "Scegli un eseguibile XR."
 
@@ -16036,9 +17448,16 @@ msgstr ""
 "Non è possibile usare lo stesso SubViewport con più di un livello di "
 "composizione OpenXR. Rimuovilo prima dal suo livello attuale."
 
+msgid ""
+"Cannot set SubViewport on an OpenXR composition layer when using an Android "
+"surface."
+msgstr ""
+"Non è possibile impostare SubViewport su un livello di composizione OpenXR "
+"quando si utilizza una superficie di Android."
+
 msgid "OpenXR composition layers must have an XROrigin3D node as their parent."
 msgstr ""
-"I livelli di composizione OpenXR devono avere un nodo XROrigin3D come "
+"I livelli di composizione OpenXR devono avere un nodo XROrigin3D come loro "
 "genitore."
 
 msgid ""
@@ -16054,6 +17473,11 @@ msgstr ""
 "La perforazione non funzionerà come previsto a meno che l'ordinamento non sia "
 "minore di zero."
 
+msgid "OpenXR visibility mask must have an XRCamera3D node as their parent."
+msgstr ""
+"La maschera di visibilità OpenXR deve avere un nodo XRCamera3D come suo "
+"genitore."
+
 msgid "Package name is missing."
 msgstr "Manca il nome del pacchetto."
 
@@ -16086,6 +17510,9 @@ msgstr "Chiave pubblica non valida per l'espansione dell'APK."
 msgid "Invalid package name:"
 msgstr "Nome del pacchetto non valido:"
 
+msgid "\"Use Gradle Build\" is required to enable \"Swipe to dismiss\"."
+msgstr "\"Use Gradle Build\" è necessario per attivare \"Scorri per ignorare\"."
+
 msgid "\"Use Gradle Build\" must be enabled to use the plugins."
 msgstr ""
 "\"Use Gradle Build\" deve essere abilitato per utilizzare le estensioni."
@@ -16136,6 +17563,21 @@ msgstr ""
 "La versione di \"Target SDK\" dovrebbe essere maggiore o uguale alla versione "
 "di \"Min SDK\"."
 
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show In Android Tv\"."
+msgstr ""
+"\"Use Gradle Build\" deve essere abilitato per attivare \"Mostra su Android "
+"TV\"."
+
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show As Launcher App\"."
+msgstr ""
+"\"Use Gradle Build\" deve essere abilitato per attivare \"Mostra come "
+"launcher dell'applicazione\"."
+
+msgid "\"Use Gradle Build\" must be enabled to disable \"Show In App Library\"."
+msgstr ""
+"\"Use Gradle Build\" deve essere abilitato per disattivare \"Mostra nella "
+"libreria delle applicazioni\"."
+
 msgid "Select device from the list"
 msgstr "Seleziona il dispositivo dall'elenco"
 
@@ -16165,9 +17607,28 @@ msgstr ""
 "Errore: Si è verificato un problema durante la convalida del nome utente e "
 "della password del keystore"
 
+msgid ""
+"Unable to determine the C# project's TFM, it may be incompatible. The export "
+"template only supports '%s'. Make sure the project targets '%s' or consider "
+"using gradle builds instead."
+msgstr ""
+"Impossibile determinare il TFM del progetto C#, potrebbe essere "
+"incompatibile. Il modello di esportazione supporta solo '%s'. Assicurati che "
+"il progetto indirizzi '%s' o considera invece l'utilizzo di build gradle."
+
+msgid ""
+"C# project targets '%s' but the export template only supports '%s'. Consider "
+"using gradle builds instead."
+msgstr ""
+"Il progetto C# indirizza '%s' ma il modello di esportazione supporta solo "
+"'%s'. Si consiglia di utilizzare invece le build gradle."
+
 msgid "Exporting to Android when using C#/.NET is experimental."
 msgstr "L'esportazione di un progetto C#/. NET su Android è sperimentale."
 
+msgid "Gradle build is not supported for the Android editor."
+msgstr "La build Gradle non è compatibile con l'editor di Android."
+
 msgid "Custom Android source template not found."
 msgstr "Il modello personalizzato della sorgente Android non è stato trovato."
 
@@ -16276,9 +17737,38 @@ msgstr ""
 msgid "Code Signing"
 msgstr "Firma del codice"
 
+msgid "AAB signing is not supported"
+msgstr "La firma AAB non é supportata"
+
+msgid "Signing debug APK..."
+msgstr "Firma dell'APK di debug..."
+
+msgid "Signing release APK..."
+msgstr "Firma dell'APK di rilascio..."
+
 msgid "Could not find keystore, unable to export."
 msgstr "Non è stato possibile trovare il keystore, impossible esportare."
 
+msgid "Unable to sign apk."
+msgstr "Impossibile firmare l'apk."
+
+msgid ""
+"All 'apksigner' tools located in Android SDK 'build-tools' directory failed "
+"to execute. Please check that you have the correct version installed for your "
+"target sdk version. The resulting APK is unsigned."
+msgstr ""
+"Non è stato possibile eseguire tutti gli strumenti \"apksigner\" nella "
+"cartella \"build-tools\" dell'SDK di Android. Si prega di verificare di aver "
+"installato la versione corretta per la propria versione dell'SDK di "
+"destinazione. L'APK risultante non è firmato."
+
+msgid ""
+"'apksigner' could not be found. Please check that the command is available in "
+"the Android SDK build-tools directory. The resulting APK is unsigned."
+msgstr ""
+"Impossibile trovare \"apksigner\". Verificare che il comando sia disponibile "
+"nella directory build-tools del SDK Android. L'APK risultante non è firmato."
+
 msgid "Could not start apksigner executable."
 msgstr "Non è stato possibile avviare l'eseguibile apksigner."
 
@@ -16292,6 +17782,15 @@ msgstr ""
 "uscita:\n"
 "%s"
 
+msgid "Verifying APK..."
+msgstr "Verifica dell'APK..."
+
+msgid "Unable to verify signed apk."
+msgstr "Impossible verificare l'apk firmato."
+
+msgid "'apksigner' verification of APK failed."
+msgstr "La verifica dell'APK con 'apksigner' non è riuscita."
+
 msgid "Target folder does not exist or is inaccessible: \"%s\""
 msgstr "La cartella di destinazione non esiste o è inaccessibile: %s"
 
@@ -16359,6 +17858,12 @@ msgstr "Spostando il risultato"
 msgid "Unable to copy and rename export file:"
 msgstr "Impossibile copiare e rinominare il file di esportazione:"
 
+msgid "Debug export template not found: \"%s\"."
+msgstr "Modello di esportazione di debug non trovato: \"%s\"."
+
+msgid "Release export template not found: \"%s\"."
+msgstr "Modello di esportazione di rilascio non trovato: \"%s\"."
+
 msgid "Creating APK..."
 msgstr "Creazione dell'APK..."
 
@@ -16479,7 +17984,7 @@ msgstr ""
 "Firma del codice fallita, verificare il registro dell'editor per i dettagli."
 
 msgid "Xcode Build"
-msgstr "Xcode Build"
+msgstr "Build Xcode"
 
 msgid "Failed to run xcodebuild with code %d"
 msgstr "Impossibile eseguire xcodebuild con il codice %d"
@@ -16511,6 +18016,9 @@ msgstr "L'esportazione di un progetto C#/. NET su iOS è sperimentale."
 msgid "Invalid additional PList content: "
 msgstr "Contenuto aggiuntivo di PList non valido: "
 
+msgid "Metal renderer require iOS 14+."
+msgstr "Il renderer Metal necessita di iOS 14+."
+
 msgid "Identifier is missing."
 msgstr "Identificatore mancante."
 
@@ -16544,12 +18052,33 @@ msgstr "Esportazione di script di debug"
 msgid "Could not open file \"%s\"."
 msgstr "Impossibile aprire il file \"%s\"."
 
+msgid ""
+"Mismatching custom export template executable architecture, found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"Incompatibilità nell'architettura dell'esecutibile dal modello di "
+"esportazione personalizzato: rilevato \"%s\", previsto \"%s\"."
+
 msgid "Debug Console Export"
 msgstr "Esportazione della console di debug"
 
 msgid "Could not create console wrapper."
 msgstr "Impossibile creare il wrapper per la console."
 
+msgid ""
+"Mismatching custom debug export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Incompatibilità nell'architettura dell'esecutibile dal modello di "
+"esportazione personalizzato di debug: rilevato \"%s\", previsto \"%s\"."
+
+msgid ""
+"Mismatching custom release export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Incompatibilità nell'architettura dell'esecutibile dal modello di "
+"esportazione personalizzato di rilascio: rilevato \"%s\", previsto \"%s\"."
+
 msgid "Failed to open executable file \"%s\"."
 msgstr "Impossibile aprire l'eseguibile \"%s\"."
 
@@ -16812,6 +18341,13 @@ msgstr ""
 msgid "Could not created symlink \"%s\" -> \"%s\"."
 msgstr "Impossibile creare il collegamento simbolico \"%s\" -> \"%s\"."
 
+msgid ""
+"Unable to set Unix permissions for executable \"%s\". Use \"chmod +x\" to set "
+"it after transferring the exported .app to macOS or Linux."
+msgstr ""
+"Impossibile impostare i permessi Unix per l'esecutibile \"%s\". Usa \"chmod "
+"+x\" per impostarli dopo aver trasferito il file .app su macOS o Linux."
+
 msgid "Could not open \"%s\"."
 msgstr "Impossibile aprire \"%s\"."
 
@@ -17013,6 +18549,13 @@ msgstr "Modifica delle risorse"
 msgid "Icon size \"%d\" is missing."
 msgstr "La dimensione dell'icona \"%d\" è mancante."
 
+msgid ""
+"Mismatching custom export template executable architecture: found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"Incompatibilità nell'architettura dell'esecutibile dal modello di "
+"esportazione personalizzato: rilevato \"%s\", previsto \"%s\"."
+
 msgid "Failed to rename temporary file \"%s\"."
 msgstr "Impossibile rinominare il file temporaneo \"%s\"."
 
@@ -17142,6 +18685,19 @@ msgstr ""
 "L'animazione di particelle 2D richiede l'uso di un CanvasItemMaterial con "
 "\"Animazione di Particelle\" abilitata."
 
+msgid ""
+"Particle trails are only available when using the Forward+ or Mobile "
+"renderers."
+msgstr ""
+"Le scie di particelle sono disponibili solo quando si usano i renderer "
+"Forward+ o Mobile."
+
+msgid ""
+"Particle sub-emitters are not available when using the Compatibility renderer."
+msgstr ""
+"I sotto-emittori di particelle non sono disponibili quando si usa il renderer "
+"di Compatibilità."
+
 msgid ""
 "A texture with the shape of the light must be supplied to the \"Texture\" "
 "property."
@@ -17152,7 +18708,7 @@ msgstr ""
 msgid ""
 "An occluder polygon must be set (or drawn) for this occluder to take effect."
 msgstr ""
-"Un poligono di occlusione deve essere impostato (o disegnato) affinché questo "
+"Un poligono occlusore deve essere impostato (o disegnato) affinché questo "
 "occlusore abbia effetto."
 
 msgid "The occluder polygon for this occluder is empty. Please draw a polygon."
@@ -17172,6 +18728,22 @@ msgstr ""
 "Per essere utile, la posizione iniziale di NavigationLink2D deve essere "
 "diversa da quella finale."
 
+msgid "NavigationObstacle2D does not support negative or zero scaling."
+msgstr "NavigationObstacle2D non supporta scala negativa o zero."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest value along the "
+"two axes of the global scale will be used to scale the radius. This value may "
+"change in unexpected ways when the node is rotated."
+msgstr ""
+"Il raggio dell'agente può essere solo ridimensionato in modo uniforme. Sarà "
+"utilizzato il valore più grande della scala globale tra le due assi per "
+"ridimensionare il raggio. Questo valore potrebbe cambiare in modo inaspettato "
+"quando il nodo viene ruotato."
+
+msgid "Skew has no effect on the agent radius."
+msgstr "L'inclinazione non ha alcun effetto sul raggio dell'agente."
+
 msgid ""
 "A NavigationMesh resource must be set or created for this node to work. "
 "Please set a property or draw a polygon."
@@ -17248,6 +18820,13 @@ msgstr ""
 "È necessario fornire una forma affinché il CollisionShape2D funzioni. Si "
 "prega di creare una risorsa di forma (Shape2D)!"
 
+msgid ""
+"The CollisionShape2D node has limited editing options for polygon-based "
+"shapes. Consider using a CollisionPolygon2D node instead."
+msgstr ""
+"Il nodo CollisionShape2D ha opzioni di modifica limitate per le forme basate "
+"su poligoni. Considera di usare invece un nodo CollisionPolygon2D."
+
 msgid "Node A and Node B must be PhysicsBody2Ds"
 msgstr "Il Nodo A e il Nodo B devono essere di tipo PhysicsBody2D"
 
@@ -17400,6 +18979,11 @@ msgstr ""
 "L'animazione di CPUParticles3D richiede l'uso di uno StandardMaterial3D la "
 "cui modalità Billboard è impostata su \"Particle Billboard\"."
 
+msgid "Decals are only available when using the Forward+ or Mobile renderers."
+msgstr ""
+"Le decalcomanie sono disponibili solo quando si utilizzano i renderer "
+"Forward+ o Mobile."
+
 msgid ""
 "The decal has no textures loaded into any of its texture properties, and will "
 "therefore not be visible."
@@ -17430,6 +19014,10 @@ msgstr ""
 "Per risolvere questo problema, abilitare almeno un bit nella proprietà "
 "maschera di culling."
 
+msgid "Fog Volumes are only visible when using the Forward+ renderer."
+msgstr ""
+"I volumi di nebbia sono visibili solo quando si usa il renderer Forward+."
+
 msgid ""
 "Fog Volumes need volumetric fog to be enabled in the scene's Environment in "
 "order to be visible."
@@ -17471,6 +19059,13 @@ msgstr ""
 "Scie attive, ma uno o più materiali di mesh mancano oppure non sono impostati "
 "per il rendering delle scie."
 
+msgid ""
+"Particle sub-emitters are only available when using the Forward+ or Mobile "
+"renderers."
+msgstr ""
+"I sotto-emettitori di particelle sono disponibili solo quando si utilizzano i "
+"renderer Forward+ o Mobile."
+
 msgid ""
 "The Bake Mask has no bits enabled, which means baking will not produce any "
 "collision for this GPUParticlesCollisionSDF3D.\n"
@@ -17488,6 +19083,13 @@ msgstr "La scala di una luce non altera la sua dimensione visiva."
 msgid "Projector texture only works with shadows active."
 msgstr "Le texture di proiettore funzionano solo con le ombre attive."
 
+msgid ""
+"Projector textures are not supported when using the Compatibility renderer "
+"yet. Support will be added in a future release."
+msgstr ""
+"Le texture del proiettore non sono ancora supportate quando si utilizza il "
+"renderer di Compatibilità. Il supporto verrà aggiunto in una versione futura."
+
 msgid "A SpotLight3D with an angle wider than 90 degrees cannot cast shadows."
 msgstr ""
 "Un SpotLight3D con un angolo più ampio di 90 gradi non può proiettare delle "
@@ -17517,6 +19119,49 @@ msgstr "Generando i volumi di sonda"
 msgid "Generating Probe Acceleration Structures"
 msgstr "Generando le strutture di accelerazione delle sonde"
 
+msgid ""
+"Lightmaps can only be baked from a GPU that supports the RenderingDevice "
+"backends.\n"
+"Your GPU (%s) does not support RenderingDevice, as it does not support "
+"Vulkan, Direct3D 12, or Metal.\n"
+"Lightmap baking will not be available on this device, although rendering "
+"existing baked lightmaps will work."
+msgstr ""
+"È possibile preparare le lightmap solo da una GPU che supporta i backend di "
+"RenderingDevice.\n"
+"La tua GPU (%s) non supporta RenderingDevice, in quanto non supporta Vulkan, "
+"Direct3D 12 o Metal.\n"
+"La preparazione delle lightmap non sarà disponibile su questo dispositivo, "
+"anche se le lightmap preparate in precedenza saranno renderizzate "
+"correttamente."
+
+msgid ""
+"The lightmap has no baked shadowmask textures. Please rebake with the "
+"Shadowmask Mode set to anything other than None."
+msgstr ""
+"La lightmap non contiene texture preparate per la shadowmask. Si prega di "
+"prepararla nuovamente con la modalità di shadowmask impostata su un'opzione "
+"diversa da \"None\" (\"nessuna\")."
+
+msgid ""
+"Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will "
+"still work."
+msgstr ""
+"Non è possibile preparare le lightmap su %s. Le lightmap preparate in "
+"precedenza saranno comunque renderizzate correttamente."
+
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time. Rendering existing baked lightmaps will still work."
+msgstr ""
+"Non è possibile preparare le lightmap, poiché il modulo `lightmapper_rd` è "
+"stato disabilitato in fase di compilazione. Le lightmap preparate in "
+"precedenza saranno comunque renderizzate correttamente."
+
+msgid "Forward axis and primary rotation axis must not be parallel."
+msgstr ""
+"L'asse anteriore e l'asse di rotazione primario non devono essere paralleli."
+
 msgid ""
 "The NavigationAgent3D can be used only under a Node3D inheriting parent node."
 msgstr ""
@@ -17530,6 +19175,25 @@ msgstr ""
 "Per essere utile, la posizione iniziale di NavigationLink3D deve essere "
 "diversa da quella finale."
 
+msgid ""
+"NavigationObstacle3D only takes global rotation around the y-axis into "
+"account. Rotations around the x-axis or z-axis might lead to unexpected "
+"results."
+msgstr ""
+"NavigationObstacle3D prende in considerazione solo la rotazione globale "
+"attorno all'asse y. Le rotazioni attorno all'asse x o all'asse z potrebbero "
+"causare risultati inaspettati."
+
+msgid "NavigationObstacle3D does not support negative or zero scaling."
+msgstr "NavigationObstacle3D non supporta scala negativa o zero."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest scale value along "
+"the three axes will be used."
+msgstr ""
+"Il raggio dell'agente può essere solo ridimensionato in modo uniforme. Sarà "
+"utilizzato il valore più grande di scala tra i tre assi."
+
 msgid ""
 "Occlusion culling is disabled in the Project Settings, which means occlusion "
 "culling won't be performed in the root viewport.\n"
@@ -17751,6 +19415,9 @@ msgstr ""
 "La proprietà \"Remote Path\" deve puntare a un Node3D o a un nodo derivato da "
 "Node3D per funzionare."
 
+msgid "There is no child Skeleton3D!"
+msgstr "Non è presente uno Skeleton3D figlio!"
+
 msgid "Skeleton3D node not set! SkeletonModifier3D must be child of Skeleton3D."
 msgstr ""
 "Nodo Skeleton3D non impostato! SkeletonModifier3D deve essere figlio di "
@@ -17759,6 +19426,9 @@ msgstr ""
 msgid "This body will be ignored until you set a mesh."
 msgstr "Questo corpo verrà ignorato finché non imposterai una mesh."
 
+msgid "Parent node should be a SpringBoneSimulator3D node."
+msgstr "Il nodo genitore dovrebbe essere un nodo SpringBoneSimulator3D."
+
 msgid ""
 "A SpriteFrames resource must be created or set in the \"Sprite Frames\" "
 "property in order for AnimatedSprite3D to display frames."
@@ -17824,6 +19494,13 @@ msgstr "Generando il campo di distanza"
 msgid "Finishing Plot"
 msgstr "Finalizzazione della pianificazione"
 
+msgid ""
+"VoxelGI nodes are not supported when using the Compatibility renderer yet. "
+"Support will be added in a future release."
+msgstr ""
+"I nodi VoxelGI non sono supportati ancora quando si utilizza il renderer di "
+"Compatibilità. Il supporto verrà aggiunto in una versione futura."
+
 msgid ""
 "No VoxelGI data set, so this node is disabled. Bake static objects to enable "
 "GI."
@@ -17904,6 +19581,15 @@ msgstr ""
 msgid "Copy this constructor in a script."
 msgstr "Copia questo costruttore in uno script."
 
+msgid "Load Color Palette"
+msgstr "Carica tavolozza di colori"
+
+msgid "Save Color Palette"
+msgstr "Salva tavolozza di colori"
+
+msgid "Quick Load"
+msgstr "Caricamento rapido"
+
 msgid "Switch between hexadecimal and code values."
 msgstr "Cambia tra valori esadecimali e valori di codice."
 
@@ -17949,6 +19635,16 @@ msgstr ""
 "Il font attuale non supporta il rendering di uno o più caratteri utilizzati "
 "nel testo di questo Label."
 
+msgid ""
+"The current theme style has shadows and/or rounded corners for popups, but "
+"those won't display correctly if \"display/window/per_pixel_transparency/"
+"allowed\" isn't enabled in the Project Settings, nor if it isn't supported."
+msgstr ""
+"Il lo stile attuale del tema contiene ombre e/o angoli arrotondati per i "
+"popup, ma questi non saranno visualizzati correttamente se \"display/window/"
+"per_pixel_transparency/allowed\" non è abilitato nelle Impostazioni del "
+"progetto, oppure se non è supportato."
+
 msgid "If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0."
 msgstr "Se \"Exp Edit\" è abilitato, \"Min Value\" deve essere maggiore di 0."
 
@@ -18137,6 +19833,12 @@ msgstr "Usa tutte le superfici"
 msgid "Surface Index"
 msgstr "Indice di superficie"
 
+msgid "Division by zero error."
+msgstr "La divisione per zero non è consentita."
+
+msgid "Modulo by zero error."
+msgstr "Il modulo di zero non è consentito."
+
 msgid ""
 "Invalid number of arguments when calling stage function '%s', which expects "
 "%d arguments."
@@ -18213,6 +19915,18 @@ msgstr "Prevista una \",\" o una \")\" dopo l'argomento."
 msgid "Varying may not be assigned in the '%s' function."
 msgstr "I varying non possono essere assegnati nella funzione '%s'."
 
+msgid "Varying with '%s' data type may only be assigned in the '%s' function."
+msgstr ""
+"Un varying con il tipo di dato '%s' può solo essere assegnato nella funzione "
+"'%s'."
+
+msgid ""
+"Varyings which assigned in '%s' function may not be reassigned in '%s' or "
+"'%s'."
+msgstr ""
+"I varying assegnati nella funzione '%s' non possono essere riassegnati nelle "
+"funzioni '%s' o '%s'."
+
 msgid "'%s' cannot be used within the '%s' processor function."
 msgstr "'%s' non può essere utilizzato nella funzione processore '%s'."
 
@@ -18272,8 +19986,12 @@ msgstr "Prevista una costante intera positiva."
 msgid "Invalid data type for the array."
 msgstr "Tipo di dato non valido per l'array."
 
+msgid "Array size mismatch. Expected %d elements (found %d)."
+msgstr ""
+"La dimensione dell'array non corrisponde. Previsti %d elementi (rilevati %d)."
+
 msgid "Expected array initialization."
-msgstr "Prevista inizializzazione dell'array."
+msgstr "Prevista l'inizializzazione dell'array."
 
 msgid "Cannot convert from '%s' to '%s'."
 msgstr "Impossibile convertire da '%s' a '%s'."
@@ -18308,7 +20026,7 @@ msgid ""
 "Consider to sample it in the main function and then pass the vector result to "
 "it."
 msgstr ""
-"Impossibile passare un campionatore di texture multivista come parametro alla "
+"Impossibile passare un campionatore di texture multiview come parametro alla "
 "funzione personalizzata. Considera di campionarla nella funzione principale e "
 "poi passargli il vettore risultate."
 
@@ -18328,6 +20046,14 @@ msgstr ""
 msgid "Can't use function as identifier: '%s'."
 msgstr "Impossibile utilizzare una funzione come identificatore: \"%s\"."
 
+msgid "Varying with '%s' data type may only be used in the '%s' function."
+msgstr ""
+"Un varying con il tipo di dato '%s' può solo essere utilizzato nella funzione "
+"'%s'."
+
+msgid "Varying '%s' must be assigned in the '%s' function first."
+msgstr "Il varying '%s' deve essere prima assegnato nella funzione '%s'."
+
 msgid "Only integer expressions are allowed for indexing."
 msgstr "Solo espressioni numeriche intere sono ammesse per l'indicizzazione."
 
@@ -18409,6 +20135,9 @@ msgstr ""
 msgid "Expected a boolean expression."
 msgstr "Prevista un'espressione booleana."
 
+msgid "Expected an integer or unsigned integer expression."
+msgstr "Prevista un'espressione intera o intera senza segno."
+
 msgid "Cases must be defined before default case."
 msgstr "I case devono essere definiti prima del case predefinito."
 
@@ -18418,6 +20147,9 @@ msgstr "Il case predefinito può essere definito solo una volta."
 msgid "'%s' must be placed within a '%s' block."
 msgstr "'%s' deve essere piazzato in un blocco '%s'."
 
+msgid "Expected an unsigned integer constant."
+msgstr "Prevista una costante intera senza segno."
+
 msgid "Expected an integer constant."
 msgstr "Prevista una costante intera."
 
@@ -18430,9 +20162,15 @@ msgstr "Non è corretto utilizzare '%s' nella funzione processore '%s'."
 msgid "Expected '%s' with an expression of type '%s'."
 msgstr "Previsto '%s' con un'espressione di tipo '%s'."
 
+msgid "'%s' function cannot return a value."
+msgstr "La funzione '%s' non può restituire un valore."
+
 msgid "Expected return with an expression of type '%s'."
 msgstr "Previsto un valore restituito con un'espressione di tipo '%s'."
 
+msgid "Use of '%s' is not supported for the '%s' shader type."
+msgstr "L'uso di '%s' non è supportato per il tipo di shader '%s'."
+
 msgid "'%s' is not allowed outside of a loop or '%s' statement."
 msgstr ""
 "'%s' non è consentito al di fuori di un ciclo o di una dichiarazione '%s'."
@@ -18440,6 +20178,9 @@ msgstr ""
 msgid "'%s' is not allowed outside of a loop."
 msgstr "'%s' non è consentito al di fuori di un ciclo."
 
+msgid "The middle expression is expected to have a boolean data type."
+msgstr "L'espressione in mezzo deve essere un tipo di dato booleano."
+
 msgid "The left expression is expected to be a variable declaration."
 msgstr "L'espressione a sinistra deve essere una dichiarazione di variable."
 
@@ -18485,7 +20226,7 @@ msgid "Expected a struct identifier."
 msgstr "Previsto un identificatore struct."
 
 msgid "Nested structs are not allowed."
-msgstr "Le strutture annidate non sono consentite."
+msgstr "Gli struct annidati non sono consentiti."
 
 msgid "Expected data type."
 msgstr "Previsto un tipo di dato."
@@ -18562,6 +20303,15 @@ msgstr "Previsto ',' dopo una costante di tipo intero."
 msgid "Expected an integer constant after ','."
 msgstr "Prevista una costante di tipo intero dopo ','."
 
+msgid "Enum hint is for '%s' only."
+msgstr "Il suggerimento di enumerazione è soltanto per '%s'."
+
+msgid "Expected a string constant."
+msgstr "Prevista una costante di tipo stringa."
+
+msgid "Expected ',' or ')' after string constant."
+msgstr "Previsto ',' o \")\" dopo una costante di tipo stringa."
+
 msgid "Can only specify '%s' once."
 msgstr "Si può specificare '%s' solo una volta."
 
@@ -18573,6 +20323,13 @@ msgstr ""
 "Gli indici consentiti per gli uniformi d'istanza devono essere compresi "
 "nell'intervallo [0..%d]."
 
+msgid ""
+"'hint_normal_roughness_texture' is only available when using the Forward+ "
+"renderer."
+msgstr ""
+"'hint_normal_roughness_texture' è disponibile solo quando si utilizza il "
+"renderer Forward+."
+
 msgid "'hint_normal_roughness_texture' is not supported in '%s' shaders."
 msgstr ""
 "'hint_normal_roughness_texture' non è supportato negli shader di tipo '%s'."
@@ -18661,6 +20418,11 @@ msgstr ""
 msgid "Expected an identifier after type."
 msgstr "Previsto un identificatore dopo il tipo."
 
+msgid "'%s' qualifier cannot be used with a function return type."
+msgstr ""
+"Il qualificatore '%s' non può essere utilizzato con il tipo restituito da una "
+"funzione."
+
 msgid ""
 "The '%s' qualifier cannot be used within a function parameter declared with "
 "'%s'."
@@ -18694,6 +20456,17 @@ msgstr ""
 "Previsto almeno una dichiarazione '%s' in una funzione con un valore "
 "restituito."
 
+msgid ""
+"Varying with integer data type must be declared with `%s` interpolation "
+"qualifier."
+msgstr ""
+"Un varying con un tipo di dato intero deve essere dichiarato con il "
+"qualificatore di interpolazione `%s`."
+
+msgid "Too many varyings used in shader (%d used, maximum supported is %d)."
+msgstr ""
+"Troppi varying usati nello shader (%d usati, il massimo supportato è %d)."
+
 msgid "uniform buffer"
 msgstr "buffer di uniform"
 
@@ -18730,12 +20503,18 @@ msgstr "'##' non deve apparire all'inizio di un'espansione macro."
 msgid "'##' must not appear at end of macro expansion."
 msgstr "'##' non deve apparire alla fine di un'espansione macro."
 
+msgid "Unmatched '%s' directive."
+msgstr "Direttiva \"%s\" senza corrispondenze."
+
 msgid "Missing condition."
 msgstr "Condizione mancante."
 
 msgid "Condition evaluation error."
 msgstr "Errore di valutazione della condizione."
 
+msgid "Invalid '%s' directive."
+msgstr "Direttiva \"%s\" non valida."
+
 msgid "Shader include file does not exist:"
 msgstr "Il file di inclusione dello shader non esiste:"
 
@@ -18755,6 +20534,9 @@ msgstr "Inclusione ciclica individuata"
 msgid "Shader max include depth exceeded."
 msgstr "La profondità massima di inclusioni di shader è stata superata."
 
+msgid "Cannot use '%s' on built-in define."
+msgstr "Impossibile usare \"%s\" su una definizione integrata."
+
 msgid "Macro expansion limit exceeded."
 msgstr "Il limite d'espansione macro è stato superato."
 
diff --git a/engine/editor/translations/editor/ja.po b/engine/editor/translations/editor/ja.po
index 0c86f209..d12ea891 100644
--- a/engine/editor/translations/editor/ja.po
+++ b/engine/editor/translations/editor/ja.po
@@ -1599,6 +1599,9 @@ msgstr "シグナルの引数を変更:"
 msgid "Receiver Method:"
 msgstr "受信側メソッド:"
 
+msgid "Pick"
+msgstr "選択"
+
 msgid "Advanced"
 msgstr "高度な設定"
 
@@ -5227,6 +5230,9 @@ msgstr "ファイルからインストール"
 msgid "Install templates from a local file."
 msgstr "ローカルファイルからテンプレートをインストールする。"
 
+msgid "Go Online"
+msgstr "オンライン"
+
 msgid "Cancel the download of the templates."
 msgstr "テンプレートのダウンロードをキャンセルする。"
 
@@ -7940,9 +7946,6 @@ msgstr ""
 "アセットライブラリにはオンライン接続が必要で、インターネット経由でデータを送信"
 "します。"
 
-msgid "Go Online"
-msgstr "オンライン"
-
 msgid "Failed to get repository configuration."
 msgstr "リポジトリ設定の取得に失敗しました。"
 
@@ -15115,9 +15118,6 @@ msgstr "機能タグ"
 msgid "Pick Root Node Type"
 msgstr "ルートノードタイプを選択"
 
-msgid "Pick"
-msgstr "選択"
-
 msgid "Scene name is empty."
 msgstr "シーン名が空です。"
 
@@ -15793,40 +15793,6 @@ msgstr "再起動してアップグレード"
 msgid "Updating Script UIDs"
 msgstr "スクリプトのUIDをアップデート中"
 
-msgid ""
-"As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
-"\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
-msgstr ""
-"Godot 4.4以降、シーンとリソースはスクリプトやシェーダーの参照にUIDを使用しま"
-"す。\n"
-"\n"
-"通常このアップデートは、シーンやリソースごとにGodot 4.4で初めて保存した時点で"
-"適用されます。しかし、シーンやリソースが多数存在する場合、手動でこれを行うのは"
-"時間がかかる可能性があります。このツールは、プロジェクトの全てのシーンとリソー"
-"スを一度にアップデートします。\n"
-"\n"
-"\"再起動してアップグレード\"をクリックすることで、エディタを再起動してこのプロ"
-"ジェクトのすべてのシーンとリソースをアップデートします。プロジェクトのサイズに"
-"よっては数分かかる場合があります。\n"
-"\n"
-"注意: データ損失の可能性を避けるため、ツールを実行する前にプロジェクトをバック"
-"アップしてください。また、すべての.uidファイルはバージョン管理にコミットしてく"
-"ださい（.gitignoreのような無視リストに追加しないでください）。"
-
 msgid "Learn More"
 msgstr "詳細を表示"
 
diff --git a/engine/editor/translations/editor/ka.po b/engine/editor/translations/editor/ka.po
index a74c4e7b..ed4ef3f6 100644
--- a/engine/editor/translations/editor/ka.po
+++ b/engine/editor/translations/editor/ka.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-11 01:02+0000\n"
+"PO-Revision-Date: 2025-03-17 08:22+0000\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ka/>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "მთავარი ნაკადი"
@@ -478,6 +478,9 @@ msgstr ""
 msgid "property '%s'"
 msgstr "თვისება '%s'"
 
+msgid "Nearest FPS: %d"
+msgstr "უახლოესი FPS: %d"
+
 msgid "Change Animation Step"
 msgstr "ანიმაციის ბიჯის შეცვლა"
 
@@ -768,6 +771,9 @@ msgstr "სიგნალის არგუმენტების მოხ
 msgid "Receiver Method:"
 msgstr "მიმღების მეთოდი:"
 
+msgid "Pick"
+msgstr "აირჩიეთ"
+
 msgid "Advanced"
 msgstr "დამატებითი"
 
@@ -3822,9 +3828,6 @@ msgstr "გაშვებული ასლების გაშვება"
 msgid "Pick Root Node Type"
 msgstr "აირჩიეთ ძირითადი კვანძის ტიპი"
 
-msgid "Pick"
-msgstr "აირჩიეთ"
-
 msgid "Scene name is empty."
 msgstr "სცენის სახელი ცარიელია."
 
diff --git a/engine/editor/translations/editor/ko.po b/engine/editor/translations/editor/ko.po
index 1e39c63a..98c07267 100644
--- a/engine/editor/translations/editor/ko.po
+++ b/engine/editor/translations/editor/ko.po
@@ -1582,6 +1582,9 @@ msgstr "시그널 인수 바인드 해제:"
 msgid "Receiver Method:"
 msgstr "받는 메서드:"
 
+msgid "Pick"
+msgstr "선택"
+
 msgid "Advanced"
 msgstr "고급"
 
@@ -4783,6 +4786,9 @@ msgstr "파일에서 설치"
 msgid "Install templates from a local file."
 msgstr "로컬 파일로부터 템플릿을 설치합니다."
 
+msgid "Go Online"
+msgstr "온라인으로"
+
 msgid "Cancel the download of the templates."
 msgstr "템플릿의 다운로드를 취소합니다."
 
@@ -7191,9 +7197,6 @@ msgid ""
 msgstr ""
 "에셋 라이브러리는 인터넷으로 데이터 전송이 가능한 온라인 연결이 필요합니다."
 
-msgid "Go Online"
-msgstr "온라인으로"
-
 msgid "Failed to get repository configuration."
 msgstr "저장소 환경 설정을 가져오는 데 실패했습니다."
 
@@ -13833,9 +13836,6 @@ msgstr "기능 태그"
 msgid "Pick Root Node Type"
 msgstr "루트 노드 타입 선택"
 
-msgid "Pick"
-msgstr "선택"
-
 msgid "Scene name is empty."
 msgstr "씬 이름이 비었습니다."
 
diff --git a/engine/editor/translations/editor/lv.po b/engine/editor/translations/editor/lv.po
index f563355f..b76a5bd9 100644
--- a/engine/editor/translations/editor/lv.po
+++ b/engine/editor/translations/editor/lv.po
@@ -11,15 +11,16 @@
 # M E <gruffy7932@gmail.com>, 2021, 2022.
 # D āvis <dlektauers@gmail.com>, 2022.
 # Agnis Aldiņš <agnis16@gmail.com>, 2023.
-# Andrejs <ledaviskylv@gmail.com>, 2023.
+# Andrejs <ledaviskylv@gmail.com>, 2023, 2025.
 # Peter Lauris <peterlauris@gmail.com>, 2023.
+# GGLVXD <85647114+GGLVXD@users.noreply.github.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2023-11-16 07:52+0000\n"
-"Last-Translator: Peter Lauris <peterlauris@gmail.com>\n"
+"PO-Revision-Date: 2025-03-17 01:28+0000\n"
+"Last-Translator: Andrejs <ledaviskylv@gmail.com>\n"
 "Language-Team: Latvian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/lv/>\n"
 "Language: lv\n"
@@ -28,7 +29,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n % 10 == 0 || n % 100 >= 11 && n % 100 <= "
 "19) ? 0 : ((n % 10 == 1 && n % 100 != 11) ? 1 : 2);\n"
-"X-Generator: Weblate 5.2\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Galvenais Pavediens"
@@ -75,18 +76,117 @@ msgstr "Dubultklikšķis"
 msgid "Mouse motion at position (%s) with velocity (%s)"
 msgstr "Peles kustība pozīcijā (%s) ar ātrumu (%s)"
 
+msgid "Left Stick X-Axis, Joystick 0 X-Axis"
+msgstr "Kreisā svira X-Axis, Kursorsvira 0 X-Axis"
+
+msgid "Left Stick Y-Axis, Joystick 0 Y-Axis"
+msgstr "Kreisā sviras Y-ass, kursorsviras 0 Y-ass"
+
+msgid "Right Stick X-Axis, Joystick 1 X-Axis"
+msgstr "Labā svira X-Axis, Kursorsvira 1 X-Axis"
+
+msgid "Right Stick Y-Axis, Joystick 1 Y-Axis"
+msgstr "Labā sviras Y-ass, kursorsviras 1 Y-ass"
+
+msgid "Joystick 2 X-Axis, Left Trigger, Sony L2, Xbox LT"
+msgstr "Kursorsvira 2 X-Axis, kreisais trigeris, Sony L2, Xbox LT"
+
+msgid "Joystick 2 Y-Axis, Right Trigger, Sony R2, Xbox RT"
+msgstr "Kursorsvira 2 Y-ass, labais trigeris, Sony R2, Xbox RT"
+
+msgid "Joystick 3 X-Axis"
+msgstr "Kursorsvira 3 X-Axis"
+
+msgid "Joystick 3 Y-Axis"
+msgstr "Kursorsvira 3 Y-ass"
+
+msgid "Joystick 4 X-Axis"
+msgstr "Kursorsvira 4 X-Axis"
+
+msgid "Joystick 4 Y-Axis"
+msgstr "Kursorsvira 4 Y-ass"
+
+msgid "Unknown Joypad Axis"
+msgstr "Nezināma Joypad ass"
+
+msgid "Joypad Motion on Axis %d (%s) with Value %.2f"
+msgstr "Joypad kustība uz ass %d (%s) ar vērtību %.2f"
+
+msgid "Bottom Action, Sony Cross, Xbox A, Nintendo B"
+msgstr "Apakšējā Darbība, Sony Cross, Xbox A, Nintendo B"
+
+msgid "Right Action, Sony Circle, Xbox B, Nintendo A"
+msgstr "Labā Darbība, Sony Aplis, Xbox B, Nintendo A"
+
+msgid "Left Action, Sony Square, Xbox X, Nintendo Y"
+msgstr "Kreisā Darbība, Sony Kvadrāts, Xbox X, Nintendo Y"
+
+msgid "Top Action, Sony Triangle, Xbox Y, Nintendo X"
+msgstr "Augšējā Darbība, Sony Trīsstūris, Xbox Y, Nintendo X"
+
+msgid "Back, Sony Select, Xbox Back, Nintendo -"
+msgstr "Atpakaļ, Sony Izvēlne, Xbox Atpakaļ, Nintendo -"
+
+msgid "Guide, Sony PS, Xbox Home"
+msgstr "Rokasgrāmata, Sony PS, Xbox Home"
+
 msgid "Start, Xbox Menu, Nintendo +"
 msgstr "Sākums, Xbox Izvēlne, Nintendo +"
 
+msgid "Left Stick, Sony L3, Xbox L/LS"
+msgstr "Kreisā Svira, Sony L3, Xbox L/LS"
+
+msgid "Right Stick, Sony R3, Xbox R/RS"
+msgstr "Labā Svira, Sony R3, Xbox R/RS"
+
+msgid "Left Shoulder, Sony L1, Xbox LB"
+msgstr "Kreisais plecs, Sony L1, Xbox LB"
+
+msgid "Right Shoulder, Sony R1, Xbox RB"
+msgstr "Labais plecs, Sony R1, Xbox RB"
+
+msgid "D-pad Up"
+msgstr "D-pad uz augšu"
+
+msgid "D-pad Down"
+msgstr "D-pad uz leju"
+
+msgid "D-pad Left"
+msgstr "D-pad pa kreisi"
+
+msgid "D-pad Right"
+msgstr "D-pad pa labi"
+
 msgid "Xbox Share, PS5 Microphone, Nintendo Capture"
 msgstr "Xbox Dalīties, PS5 Mikrofons, Nintendo Notvert"
 
+msgid "Xbox Paddle 1"
+msgstr "Xbox Lāpstiņa 1"
+
+msgid "Xbox Paddle 2"
+msgstr "Xbox Lāpstiņa 2"
+
+msgid "Xbox Paddle 3"
+msgstr "Xbox Lāpstiņa 3"
+
+msgid "Xbox Paddle 4"
+msgstr "Xbox Lāpstiņa 4"
+
+msgid "PS4/5 Touchpad"
+msgstr "PS4/5 Skārienpaliktnis"
+
 msgid "Joypad Button %d"
 msgstr "Joypad Poga %d"
 
 msgid "Pressure:"
 msgstr "Spiediens:"
 
+msgid "canceled"
+msgstr "atcelts"
+
+msgid "touched"
+msgstr "pieskārās"
+
 msgid "released"
 msgstr "atlaists"
 
@@ -256,6 +356,9 @@ msgstr "Atlasīt Vārdu Zem Kursora"
 msgid "Add Selection for Next Occurrence"
 msgstr "Pievienot Atlasi Nākamajai Reizei"
 
+msgid "Skip Selection for Next Occurrence"
+msgstr "Izlaist Atlasi Nākamajai Reizei"
+
 msgid "Clear Carets and Selection"
 msgstr "Notīrīt Kursorus un Atlasi"
 
@@ -283,6 +386,9 @@ msgstr "Rādīt Paslēptos"
 msgid "Swap Input Direction"
 msgstr "Mainīt Ievades Virzienu"
 
+msgid "Start Unicode Character Input"
+msgstr "Sākt Unicode Rakstzīmes Ievadi"
+
 msgid "Invalid input %d (not passed) in expression"
 msgstr "Nederīga ievade %d (nav padota) izteikumā"
 
@@ -341,12 +447,18 @@ msgstr ""
 msgid "An action with the name '%s' already exists."
 msgstr "Darbība ar nosaukumu '%s' jau pastāv."
 
+msgid "Cannot Revert - Action is same as initial"
+msgstr "Nevar Atsaukt - Darbība ir tāda pati kā sākotnējā"
+
 msgid "Revert Action"
 msgstr "Atsaukt Darbību"
 
 msgid "Add Event"
 msgstr "Pievienot Notikumu"
 
+msgid "Remove Action"
+msgstr "Noņemt Darbību"
+
 msgid "Cannot Remove Action"
 msgstr "Nevar Noņemt Darbību"
 
@@ -356,9 +468,15 @@ msgstr "Rediģēt Notikumu"
 msgid "Remove Event"
 msgstr "Noņemt Notikumu"
 
+msgid "Filter by Name"
+msgstr "Filtrēt pēc nosaukuma"
+
 msgid "Clear All"
 msgstr "Iztīrīt Visu"
 
+msgid "Clear all search filters."
+msgstr "Notīrīt visus meklēšanas filtrus."
+
 msgid "Add New Action"
 msgstr "Pievienot Jaunu Darbību"
 
@@ -374,6 +492,28 @@ msgstr "Darbība"
 msgid "Deadzone"
 msgstr "Beigtā zona"
 
+msgid "Name:"
+msgstr "Nosaukums:"
+
+msgid "Type:"
+msgstr "Tips:"
+
+msgid "Add Metadata Property for \"%s\""
+msgstr "Pievienot Metadatu Mainīgo priekš \"%s\""
+
+msgid "Metadata name can't be empty."
+msgstr "Metadatu nosaukums nevar būt tukšs."
+
+msgid "Metadata name must be a valid identifier."
+msgstr "Metadatu nosaukumam jābūt derīgam identifikatoram."
+
+msgid "Metadata with name \"%s\" already exists."
+msgstr "Metadati ar nosaukumu \"%s\" jau eksistē."
+
+msgid "Names starting with _ are reserved for editor-only metadata."
+msgstr ""
+"Nosaukumi, kuri sākas ar _, ir rezervēti tikai priekš redaktora metadatiem."
+
 msgid "Time:"
 msgstr "Laiks:"
 
@@ -389,6 +529,15 @@ msgstr "Ievadiet Atslēgu Šeit"
 msgid "Duplicate Selected Key(s)"
 msgstr "Izveidot Dublikātu Izvēlētajai(ām) Atslēgai(ām)"
 
+msgid "Cut Selected Key(s)"
+msgstr "Izgriezt Atlasīto(ās) Atslēgu(as)"
+
+msgid "Copy Selected Key(s)"
+msgstr "Kopēt Izvēlēto(ās) Atslēgu(as)"
+
+msgid "Paste Key(s)"
+msgstr "Ielīmēt Atslēgu(as)"
+
 msgid "Delete Selected Key(s)"
 msgstr "Izdzēst Izvēlēto(ās) Atslēgu(as)"
 
@@ -413,6 +562,12 @@ msgstr "Pārvietot Bezjē Punktus"
 msgid "Animation Duplicate Keys"
 msgstr "Animācija Dublēt Atslēgas"
 
+msgid "Animation Cut Keys"
+msgstr "Izgriezt Animācijas Atslēgas"
+
+msgid "Animation Paste Keys"
+msgstr "Ielīmēt Animācijas Atslēgas"
+
 msgid "Animation Delete Keys"
 msgstr "Animācija Izdzēst Atslēgas"
 
@@ -428,6 +583,15 @@ msgstr "Atcelt Visu Atslēgu Atlasi"
 msgid "Animation Change Transition"
 msgstr "Animācija Izmainīt Pāreju"
 
+msgid "Animation Change Position3D"
+msgstr "Nomainīt Animācijas Position3D"
+
+msgid "Animation Change Rotation3D"
+msgstr "Nomainīt Animācijas Rotation3D"
+
+msgid "Animation Change Scale3D"
+msgstr "Nomainīt Animācijas Scale3D"
+
 msgid "Animation Change Keyframe Value"
 msgstr "Animācija Izmainīt Atslēgkadra Vērtību"
 
@@ -437,6 +601,15 @@ msgstr "Animācija Izmainīt Izsaukumu"
 msgid "Animation Multi Change Transition"
 msgstr "Animācija Vairākkārt Izmainīt Pāreju"
 
+msgid "Animation Multi Change Position3D"
+msgstr "Vairākkārt Nomainīt Animācijas Position3D"
+
+msgid "Animation Multi Change Rotation3D"
+msgstr "Vairākkārt Nomainīt Animācijas Rotation3D"
+
+msgid "Animation Multi Change Scale3D"
+msgstr "Vairākkārt Nomainīt Animācijas Scale3D"
+
 msgid "Animation Multi Change Keyframe Value"
 msgstr "Animācija Vairākkārt Izmainīt Atslēgkadra Vērtību"
 
@@ -449,9 +622,62 @@ msgstr "Izmainīt Animācijas Garumu"
 msgid "Change Animation Loop"
 msgstr "Izmainīt Animācijas Atkārtošanos"
 
-msgid "Can't change loop mode on animation instanced from imported scene."
+msgid ""
+"Can't change loop mode on animation instanced from an imported scene.\n"
+"\n"
+"To change this animation's loop mode, navigate to the scene's Advanced Import "
+"settings and select the animation.\n"
+"You can then change the loop mode from the inspector menu."
 msgstr ""
-"Nevar mainīt atkārtošanās režīmu animācijai, kas iegūta no importētās ainas."
+"Nevar nomainīt animācijas atkārtošanās režīmu, kas radīta no importētas "
+"ainas.\n"
+"\n"
+"Lai nomainītu šīs animācijas atkārtošanās režīmu, dodieties uz ainas "
+"Advancētajiem Importēšanas iestatījumiem un atlasiet animāciju.\n"
+"Tad Jūs varat nomainīt atkārtošanās režīmu no inspector menu."
+
+msgid "Can't change loop mode on animation instanced from an imported resource."
+msgstr ""
+"Nevar mainīt atkārtošanās režīmu animācijai, kas iegūta no importētās resursa."
+
+msgid ""
+"Can't change loop mode on animation embedded in another scene.\n"
+"\n"
+"You must open this scene and change the animation's loop mode from there."
+msgstr ""
+"Nevar mainīt atkārtošanās režīmu animācijai, kas iegulta citā ainā.\n"
+"\n"
+"Jums jāatver šī aina un tur jānomaina animācijas atkārtošanās režīms."
+
+msgid "Can't change loop mode on animation embedded in another resource."
+msgstr "Nevar mainīt atkārtošanās režīmu animācijai, kas iegulta citā resursā."
+
+msgid "Property Track..."
+msgstr "Mainīgo Celiņš..."
+
+msgid "3D Position Track..."
+msgstr "3D Pozīcijas Celiņš..."
+
+msgid "3D Rotation Track..."
+msgstr "3D Rotācijas Celiņš..."
+
+msgid "3D Scale Track..."
+msgstr "3D Transformācijas Celiņš..."
+
+msgid "Blend Shape Track..."
+msgstr "Formu Sajaukšanas Celiņš..."
+
+msgid "Call Method Track..."
+msgstr "Izsaukt Metožu Celiņu..."
+
+msgid "Bezier Curve Track..."
+msgstr "Bezjē Līkņu Celiņš..."
+
+msgid "Audio Playback Track..."
+msgstr "Audio Atskaņošanas Celiņš..."
+
+msgid "Animation Playback Track..."
+msgstr "Animācijas Atskaņošanas Celiņš..."
 
 msgid "Animation length (frames)"
 msgstr "Animācijas garums (kadri)"
@@ -477,6 +703,9 @@ msgstr "Izmainīt Ceļu uz Celiņa"
 msgid "Toggle this track on/off."
 msgstr "Pārslēgt šo celiņu ieslēgts/izslēgts."
 
+msgid "Use Blend"
+msgstr "Sapludināt"
+
 msgid "Update Mode (How this property is set)"
 msgstr "Atjaunošanas Režīms (Kā šis mainīgais tiek iestatīts)"
 
@@ -489,11 +718,26 @@ msgstr "Atkārtošanās Aptīšanas Režīms (Interpolē beigas ar cilpas sākum
 msgid "Remove this track."
 msgstr "Noņemt šo celiņu."
 
+msgid "Time (s):"
+msgstr "Laiks (s):"
+
+msgid "Position:"
+msgstr "Pozīcija:"
+
+msgid "Rotation:"
+msgstr "Rotācija:"
+
 msgid "Scale:"
 msgstr "Mērogs:"
 
-msgid "Type:"
-msgstr "Tips:"
+msgid "Blend Shape:"
+msgstr "Sapludināt Formu:"
+
+msgid "(Invalid, expected type: %s)"
+msgstr "(Nederīgs, gaidīja %s tipu)"
+
+msgid "Easing:"
+msgstr "Pāreja:"
 
 msgid "Handle mode: Free\n"
 msgstr "Rīkošanās režīms: Brīvs\n"
@@ -510,6 +754,9 @@ msgstr "Rīkošanās režīms: Atspoguļots\n"
 msgid "Stream:"
 msgstr "Straume:"
 
+msgid "Start (s):"
+msgstr "Sākums (s):"
+
 msgid "End (s):"
 msgstr "Beigas:"
 
@@ -537,15 +784,30 @@ msgstr "Lineārs"
 msgid "Cubic"
 msgstr "Kubisks"
 
+msgid "Linear Angle"
+msgstr "Lineārs Leņķis"
+
+msgid "Cubic Angle"
+msgstr "Kubisks Leņķis"
+
 msgid "Clamp Loop Interp"
 msgstr "Apgriezt Cilpas Interpolāciju"
 
 msgid "Wrap Loop Interp"
 msgstr "Aptīt Cilpas Interpolāciju"
 
+msgid "Insert Key..."
+msgstr "Ievietot Atslēgu..."
+
 msgid "Duplicate Key(s)"
 msgstr "Dublicēt atslēgvietnes"
 
+msgid "Cut Key(s)"
+msgstr "Izgriezt Atslēgu(as)"
+
+msgid "Copy Key(s)"
+msgstr "Kopēt Atslēgu(as)"
+
 msgid "Add RESET Value(s)"
 msgstr "Pievienot RESET vērtību(-as)"
 
@@ -561,6 +823,9 @@ msgstr "Izmainīt Animācijas Interpolācijas Režīmu"
 msgid "Change Animation Loop Mode"
 msgstr "Izmainīt Animācijas Atkārtošanās Režīmu"
 
+msgid "Change Animation Use Blend"
+msgstr "Nomainīt Animāciju Izmantot Sapludināšanu"
+
 msgid ""
 "Compressed tracks can't be edited or removed. Re-import the animation with "
 "compression disabled in order to edit."
@@ -571,9 +836,22 @@ msgstr ""
 msgid "Remove Anim Track"
 msgstr "Noņemt Anim. Celiņu"
 
+msgid "Create new track for %s and insert key?"
+msgstr "Izveidot jaunu celiņu priekš %s un ievietot atslēgu?"
+
+msgid "Create %d new tracks and insert keys?"
+msgstr "Izveidot %d jaunus celiņus un ievietot atslēgas?"
+
+msgid "Hold Shift when clicking the key icon to skip this dialog."
+msgstr ""
+"Turiet Shift, kad spiežat atslēgas ikonu, lai izlaistu šo dialoglodziņu."
+
 msgid "Create"
 msgstr "Izveidot"
 
+msgid "Animation Insert Key"
+msgstr "Ievietot Animācijas Atslēgu"
+
 msgid "node '%s'"
 msgstr "mezgls '%s'"
 
@@ -586,12 +864,18 @@ msgstr "AnimationPlayer nevar animēt pats sevi, tikai citus spēlētājus."
 msgid "property '%s'"
 msgstr "vērtība '%s'"
 
+msgid "Nearest FPS: %d"
+msgstr "Tuvākais FPS: %d"
+
 msgid "Change Animation Step"
 msgstr "Izmainīt Animācijas Soli"
 
 msgid "Rearrange Tracks"
 msgstr "Pārkārtot Celiņus"
 
+msgid "Blend Shape tracks only apply to MeshInstance3D nodes."
+msgstr "Saplūšanas Formu celiņi tiek tikai pievienoti MeshInstance3D mezgliem."
+
 msgid ""
 "Audio tracks can only point to nodes of type:\n"
 "-AudioStreamPlayer\n"
@@ -658,9 +942,6 @@ msgstr "Rādīt celiņus tikai no mezgliem izvēlētajā kokā."
 msgid "Group tracks by node or display them as plain list."
 msgstr "Sagrupēt celiņus atkarībā no mezgliem vai rādīt tos vienkāršā sarakstā."
 
-msgid "Snap:"
-msgstr "Pievilkt:"
-
 msgid "Animation step value."
 msgstr "Animācijas soļa vērtība."
 
@@ -736,6 +1017,12 @@ msgstr "Izvēlēties Celiņus ko Kopēt"
 msgid "Select All/None"
 msgstr "Izvēlēties Visus/Nevienu"
 
+msgid "Close"
+msgstr "Aizvērt"
+
+msgid "Error!"
+msgstr "Kļūda!"
+
 msgid "Add Audio Track Clip"
 msgstr "Pievienot Audio Celiņa Klipu"
 
@@ -849,9 +1136,6 @@ msgstr "Atvieno signālu pēc tā pirmās izstarošanas."
 msgid "Cannot connect signal"
 msgstr "Nevar savienot signālu"
 
-msgid "Close"
-msgstr "Aizvērt"
-
 msgid "Connect"
 msgstr "Savienot"
 
@@ -944,6 +1228,9 @@ msgstr "Kopēt mezgla ceļu"
 msgid "Toggle Visibility"
 msgstr "Pārslēgt redzamību"
 
+msgid "Clear"
+msgstr "Notīrīt"
+
 msgid "Value"
 msgstr "Vērtība"
 
@@ -953,9 +1240,6 @@ msgstr "Pārtraukt"
 msgid "Start"
 msgstr "Sākt"
 
-msgid "Clear"
-msgstr "Notīrīt"
-
 msgid "Measure:"
 msgstr "Mērogs:"
 
@@ -1115,12 +1399,6 @@ msgstr "Pieder"
 msgid "Resources Without Explicit Ownership:"
 msgstr "Resursi bez izteiktas piederības:"
 
-msgid "Could not create folder."
-msgstr "Neizdevās izveidot mapi."
-
-msgid "Create Folder"
-msgstr "Izveidot mapi"
-
 msgid "Thanks from the Godot community!"
 msgstr "Paldies no Godot sabiedrības!"
 
@@ -1279,12 +1557,6 @@ msgstr "Jaunā izkārtojuma lokācija..."
 msgid "Open Audio Bus Layout"
 msgstr "Atvērt audio kopnes izkārtojumu"
 
-msgid "There is no '%s' file."
-msgstr "Fails '%s' neeksistē."
-
-msgid "Invalid file, not an audio bus layout."
-msgstr "Nepareizs fails, nav audio kopnes izkārtojuma."
-
 msgid "Error saving file: %s"
 msgstr "Kļūda saglabājot failu: %s"
 
@@ -1615,20 +1887,14 @@ msgstr ""
 msgid "Editor"
 msgstr "Redaktors"
 
-msgid "Property:"
-msgstr "Parametrs:"
+msgid "Show in FileSystem"
+msgstr "Parādīt failu sistēmā"
 
-msgid "Signal:"
-msgstr "Signāls:"
+msgid "Open in File Manager"
+msgstr "Atvērt Failu Pārlūkā"
 
-msgid "%d matches."
-msgstr "%d sakritības."
-
-msgid "Method"
-msgstr "Metode"
-
-msgid "Signal"
-msgstr "Signāls"
+msgid "Class"
+msgstr "Klase"
 
 msgid "Constant"
 msgstr "Konstante"
@@ -1639,6 +1905,18 @@ msgstr "Mainīgais"
 msgid "Theme Property"
 msgstr "Motīva Mainīgais"
 
+msgid "Method"
+msgstr "Metode"
+
+msgid "Signal"
+msgstr "Signāls"
+
+msgid "File"
+msgstr "Fails"
+
+msgid "%d matches."
+msgstr "%d sakritības."
+
 msgid "Search Help"
 msgstr "Meklēt Palīdzību"
 
@@ -1672,9 +1950,6 @@ msgstr "Tikai Motīva Iestatījumus"
 msgid "Member Type"
 msgstr "Dalībnieka veids"
 
-msgid "Class"
-msgstr "Klase"
-
 msgid "Pinning a value forces it to be saved even if it's equal to the default."
 msgstr ""
 "Vērtības piespraušana liek to saglabāt, pat ja tā ir vienāda ar noklusējuma "
@@ -1695,8 +1970,8 @@ msgstr "Likt %s"
 msgid "Unpinned %s"
 msgstr "Atsprausts %s"
 
-msgid "Name:"
-msgstr "Nosaukums:"
+msgid "Favorites"
+msgstr "Favorīti"
 
 msgid "Copy Property Path"
 msgstr "Kopēt mainīgā ceļu"
@@ -1803,15 +2078,6 @@ msgstr ""
 msgid "Open Base Scene"
 msgstr "Atvērt bāzes ainu"
 
-msgid "Quick Open..."
-msgstr "Ātri Atvērt..."
-
-msgid "Quick Open Scene..."
-msgstr "Ātri atvērt ainu..."
-
-msgid "Quick Open Script..."
-msgstr "ātri atvērt skriptu..."
-
 msgid ""
 "A root node is required to save the scene. You can add a root node using the "
 "Scene tree dock."
@@ -1822,9 +2088,6 @@ msgstr ""
 msgid "Save Scene As..."
 msgstr "Saglabāt ainu kā..."
 
-msgid "Current scene not saved. Open anyway?"
-msgstr "Pašreizējā aina nav saglabāta. Vienalga atvērt ?"
-
 msgid "Can't undo while mouse buttons are pressed."
 msgstr "Nevar atgriezt, kad peles pogas ir nospiestas."
 
@@ -1894,30 +2157,6 @@ msgstr "Ainai '%s' ir bojātas atkarības:"
 msgid "Clear Recent Scenes"
 msgstr "Notīrīt nesenās ainas"
 
-msgid ""
-"No main scene has ever been defined, select one?\n"
-"You can change it later in \"Project Settings\" under the 'application' "
-"category."
-msgstr ""
-"Galvenā aina vēl nav definēta, izvēlēties tagad?\n"
-"To var mainīt vēlāk projekta Iestatījumos sadaļā 'aplikācija'."
-
-msgid ""
-"Selected scene '%s' does not exist, select a valid one?\n"
-"You can change it later in \"Project Settings\" under the 'application' "
-"category."
-msgstr ""
-"Izvēlētā aina '%s' nepastāv, izvēlieties derīgu?\n"
-"To var mainīt vēlāk \"Projekta iestatījumi\" sadaļā 'lietojumprogramma'."
-
-msgid ""
-"Selected scene '%s' is not a scene file, select a valid one?\n"
-"You can change it later in \"Project Settings\" under the 'application' "
-"category."
-msgstr ""
-"Izvēlētā aina '%s' nav ainas fails, izvēlieties derīgu?\n"
-"To var mainīt vēlāk projekta iestatījumos sadaļā 'aplikācija'."
-
 msgid "Default"
 msgstr "Noklusējuma"
 
@@ -1981,6 +2220,15 @@ msgstr "Atvērt nesenu"
 msgid "Save Scene"
 msgstr "Saglabāt ainu"
 
+msgid "Quick Open..."
+msgstr "Ātri Atvērt..."
+
+msgid "Quick Open Scene..."
+msgstr "Ātri atvērt ainu..."
+
+msgid "Quick Open Script..."
+msgstr "ātri atvērt skriptu..."
+
 msgid "MeshLibrary..."
 msgstr "TīklaBibliotēka..."
 
@@ -2095,13 +2343,6 @@ msgstr "Šablona pakotne"
 msgid "Export Library"
 msgstr "Eksportēt bibliotēku"
 
-msgid ""
-"The following files are newer on disk.\n"
-"What action should be taken?"
-msgstr ""
-"Sekojošie faili ir jaunāki uz diska.\n"
-"Kādu darbību veikt ?"
-
 msgid "Load Errors"
 msgstr "Ielādes kļūdas"
 
@@ -2162,9 +2403,6 @@ msgstr "Ielādē..."
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-msgid "Show in FileSystem"
-msgstr "Parādīt failu sistēmā"
-
 msgid "Convert to %s"
 msgstr "Konvertēt uz %s"
 
@@ -2234,6 +2472,9 @@ msgstr "Importē:"
 msgid "Remove templates for the version '%s'?"
 msgstr "Noņemt šablonus versijai '%s'?"
 
+msgid "Official export templates aren't available for development builds."
+msgstr "Oficiālie eksporta šabloni nav pieejami eksperimentālajām būvēm."
+
 msgid "Uncompressing Android Build Sources"
 msgstr "Atspiež Android būves avotus"
 
@@ -2261,9 +2502,6 @@ msgstr "Kopēt spoguļa linku"
 msgid "Download and Install"
 msgstr "Lejuplādēt un instalēt"
 
-msgid "Official export templates aren't available for development builds."
-msgstr "Oficiālie eksporta šabloni nav pieejami eksperimentālajām būvēm."
-
 msgid "Install from File"
 msgstr "Instalēt no Faila"
 
@@ -2295,9 +2533,6 @@ msgstr "Pārvaldīt Eksporta Šablonus"
 msgid "Browse"
 msgstr "Pārlūkot"
 
-msgid "Favorites"
-msgstr "Favorīti"
-
 msgid "View items as a grid of thumbnails."
 msgstr "Skatīt vienumus kā režģi ar sīktēliem."
 
@@ -2307,6 +2542,9 @@ msgstr "Skatīt lietas kā sarakstu."
 msgid "Error moving:"
 msgstr "Kļūda parvietojot:"
 
+msgid "Create Folder"
+msgstr "Izveidot mapi"
+
 msgid "Open Scenes"
 msgstr "Atvērt Ainas"
 
@@ -2319,9 +2557,6 @@ msgstr "Noņemt no Favorītiem"
 msgid "Reimport"
 msgstr "Reimportēt"
 
-msgid "Open in File Manager"
-msgstr "Atvērt Failu Pārlūkā"
-
 msgid "New Folder..."
 msgstr "Jauna mape..."
 
@@ -2373,12 +2608,6 @@ msgstr "Izvēlēties pašreizējo mapi"
 msgid "Select This Folder"
 msgstr "Izvēlēties Šo Mapi"
 
-msgid "All Recognized"
-msgstr "Viss atpazīts"
-
-msgid "All Files (*)"
-msgstr "Visi faili (*)"
-
 msgid "Open a File"
 msgstr "Atvērt failu"
 
@@ -2394,6 +2623,9 @@ msgstr "Atvērt failu vai mapi"
 msgid "Save a File"
 msgstr "Saglabāt failu"
 
+msgid "Could not create folder."
+msgstr "Neizdevās izveidot mapi."
+
 msgid "Go Back"
 msgstr "Doties atpakaļ"
 
@@ -2436,15 +2668,18 @@ msgstr "Atjaunot failus."
 msgid "(Un)favorite current folder."
 msgstr "Pievienot/noņemt pašreizējo mapi pie/no favorītiem."
 
-msgid "Toggle the visibility of hidden files."
-msgstr "Pārslēgt slēpto failu redzamību."
-
 msgid "Directories & Files:"
 msgstr "Mapes & Faili:"
 
+msgid "Toggle the visibility of hidden files."
+msgstr "Pārslēgt slēpto failu redzamību."
+
 msgid "Preview:"
 msgstr "Priekškatījums:"
 
+msgid "Filter"
+msgstr "Filtrēt"
+
 msgid "File:"
 msgstr "Fails:"
 
@@ -2460,9 +2695,6 @@ msgstr "Atskaņot projektu."
 msgid "Play the edited scene."
 msgstr "Atskaņot rediģēto ainu."
 
-msgid "Quick Run Scene..."
-msgstr "Ātri palaist ainu..."
-
 msgid "Run Project"
 msgstr "Palaist Projektu"
 
@@ -2526,9 +2758,6 @@ msgstr "Atvērt dokumentāciju šim objektam."
 msgid "Manage object properties."
 msgstr "Pārvaldīt objekta rekvizītus."
 
-msgid "Add %d Translations"
-msgstr "Pievienot %d tulkojumus"
-
 msgid "Groups"
 msgstr "Grupas"
 
@@ -2610,9 +2839,6 @@ msgstr "Dziļums"
 msgid "1 step"
 msgstr "1 solis"
 
-msgid "Error!"
-msgstr "Kļūda!"
-
 msgid "Transition exists!"
 msgstr "Pāreja eksistē!"
 
@@ -2834,12 +3060,6 @@ msgstr "Instalētie spraudņi:"
 msgid "Version"
 msgstr "Versija"
 
-msgid " - Variation"
-msgstr " - Dažādība"
-
-msgid "Convert to CPUParticles2D"
-msgstr "Konvertēt uz CPUParticles2D"
-
 msgid "Select lightmap bake file:"
 msgstr "Izvēlēties gaismas kartes cepšanas failu:"
 
@@ -2858,6 +3078,9 @@ msgstr "Daudzums:"
 msgid "Populate"
 msgstr "Apdzīvot"
 
+msgid "Please Confirm..."
+msgstr "Lūdzu apstipriniet..."
+
 msgid "Perspective"
 msgstr "Perspektīva"
 
@@ -2867,30 +3090,162 @@ msgstr "Iespējot doppler"
 msgid "Pre"
 msgstr "iepriekš"
 
-msgid "Please Confirm..."
-msgstr "Lūdzu apstipriniet..."
+msgid "Convert to CPUParticles2D"
+msgstr "Konvertēt uz CPUParticles2D"
 
 msgid "Author:"
 msgstr "Autors:"
 
+msgid "Create Polygon & UV"
+msgstr "Izveidot Daudzstūri un UV"
+
+msgid "Create Internal Vertex"
+msgstr "Izveidot Iekšējo Virsotni"
+
+msgid "Remove Internal Vertex"
+msgstr "Noņemt Iekšējo Virsotni"
+
+msgid "Invalid Polygon (need 3 different vertices)"
+msgstr "Nederīgs Daudzstūris (vajag 3 dažādas virsotnes)"
+
 msgid "Add Custom Polygon"
 msgstr "Pievienot pielāgotu daudzstūri"
 
 msgid "Remove Custom Polygon"
 msgstr "Noņemt pielāgotu daudzstūri"
 
+msgid "Transform UV Map"
+msgstr "Transformēt UV Karti"
+
 msgid "Transform Polygon"
 msgstr "Transformēt daudzstūri"
 
+msgid "Paint Bone Weights"
+msgstr "Krāsot Kaulu Svarus"
+
+msgid "Points"
+msgstr "Punkti"
+
 msgid "Polygons"
 msgstr "Daudzstūri"
 
+msgid "UV"
+msgstr "UV"
+
+msgid "Bones"
+msgstr "Kauli"
+
+msgid "%s + Shift: Scale"
+msgstr "%s + Shift: Mainīt Izmēru"
+
+msgid "Move Polygon"
+msgstr "Pārvietot Daudzstūri"
+
+msgid "Rotate Polygon"
+msgstr "Rotēt Daudzstūri"
+
+msgid "Scale Polygon"
+msgstr "Mainīt Izmēru Daudzstūrim"
+
+msgid "Create a custom polygon. Enables custom polygon rendering."
+msgstr "Izveidot pielāgotu daudzstūri. Ļauj renderēt pielāgotus daudzstūrus."
+
+msgid ""
+"Remove a custom polygon. If none remain, custom polygon rendering is disabled."
+msgstr ""
+"Noņemt pielāgotu daudzstūri. Ja vairs nav pielāgotu daudzstūru, tiek atslēgta "
+"to renderēšana."
+
+msgid "Paint weights with specified intensity."
+msgstr "Krāsot svarus ar konkrētu intensitāti."
+
+msgid "Unpaint weights with specified intensity."
+msgstr "Nekrāsot svarus ar konkrētu intensitāti."
+
+msgid "Radius:"
+msgstr "Rādiuss:"
+
+msgid "Copy Polygon to UV"
+msgstr "Kopēt Daudzstūri uz UV"
+
 msgid "Copy UV to Polygon"
 msgstr "Kopēt UV uz daudzstūra"
 
+msgid "Clear UV"
+msgstr "Notīrīt UV"
+
+msgid "Grid Settings"
+msgstr "Režģa Iestatījumi"
+
+msgid "Snap"
+msgstr "Piestiprināt"
+
+msgid "Enable Snap"
+msgstr "Ieslēgt Piestiprināšanu"
+
+msgid "Show Grid"
+msgstr "Parādīt Režģi"
+
+msgid "Configure Grid:"
+msgstr "Mainīt Režģi:"
+
+msgid "Grid Offset X:"
+msgstr "Režģa Novirze X asī:"
+
+msgid "Grid Offset Y:"
+msgstr "Režģa Novirze Y asī:"
+
+msgid "Grid Step X:"
+msgstr "Režģa Solis X asī:"
+
+msgid "Grid Step Y:"
+msgstr "Režģa Solis Y asī:"
+
+msgid "Sync Bones to Polygon"
+msgstr "Sinhronizēt Kaulus ar Daudzstūri"
+
 msgid "Create Polygon3D"
 msgstr "Izveidot Daudzstūris3D"
 
+msgid "Edit Poly"
+msgstr "Rediģēt Daudzstūri"
+
+msgid "Edit Poly (Remove Point)"
+msgstr "Rediģēt Daudzstūri (Noņemt Punktu)"
+
+msgid "ERROR: Couldn't load resource!"
+msgstr "KĻŪDA: Nevarēja ielādēt resursu!"
+
+msgid "Add Resource"
+msgstr "Pievienot Resursu"
+
+msgid "Rename Resource"
+msgstr "Pārsaukt Resursu"
+
+msgid "Delete Resource"
+msgstr "Izdzēst Resursu"
+
+msgid "Resource clipboard is empty!"
+msgstr "Resursu starpliktuve ir tukša!"
+
+msgid "Paste Resource"
+msgstr "Ielīmēt Resursu"
+
+msgid "Load Resource"
+msgstr "Ielādēt Resursu"
+
+msgid "Toggle ResourcePreloader Bottom Panel"
+msgstr "Pārslēgt ResourcePreloader Apakšējo Paneli"
+
+msgid ""
+"AnimationMixer has no valid root node path, so unable to retrieve track names."
+msgstr ""
+"AnimationMixer nav derīga saknes mezgla ceļa, tādēļ nav iespējams iegūt "
+"celiņu nosaukumus."
+
+msgid "(truncated)"
+msgstr "(saīsināts)"
+
 msgid "Can't open '%s'. The file could have been moved or deleted."
 msgstr "Nevar atvērt '%s'. Fails ir pārvietots vai dzēsts."
 
@@ -2912,6 +3267,37 @@ msgstr "Atvērt failu"
 msgid "Save File As..."
 msgstr "Saglabāt Failu Kā..."
 
+msgid "Can't obtain the script for reloading."
+msgstr "Nevar iegūt skriptu priekš pārlādes."
+
+msgid "Reload only takes effect on tool scripts."
+msgstr "Pārlāde tikai ietekmē rīku skriptus."
+
+msgid "Cannot run the edited file because it's not a script."
+msgstr "Nevar palaist rediģēto failu, jo tas nav skripts."
+
+msgid "Cannot run the script because it contains errors, check the output log."
+msgstr "Nevar palaist skriptu, jo tajā ir kļūdas. Pārbaudiet izejas žurnālu."
+
+msgid "Cannot run the script because it doesn't extend EditorScript."
+msgstr "Nevar palaist skriptu, jo tas nepaplašina EditorScript."
+
+msgid ""
+"Cannot run the script because it's not a tool script (add the @tool "
+"annotation at the top)."
+msgstr ""
+"Nevar palaist skriptu, jo tas nav rīka skripts (pievienojiet @tool anotāciju "
+"skripta augšā)."
+
+msgid "Cannot run the script because it's not a tool script."
+msgstr "Nevar palaist skriptu, jo tas nav rīka skripts."
+
+msgid "Import Theme"
+msgstr "Importēt Motīvu"
+
+msgid "Error saving"
+msgstr "Kļūdu saglabāšana"
+
 msgid "Save Theme As..."
 msgstr "Saglabāt motīvu kā..."
 
@@ -2921,9 +3307,21 @@ msgstr "Tiešsaistes Dokumenti"
 msgid "Open Godot online documentation."
 msgstr "Atvērt Godot tiešsaistes dokumentāciju."
 
+msgid "Unsaved file."
+msgstr "Nesaglabāts fails."
+
+msgid "%s Class Reference"
+msgstr "%s Klases Reference"
+
 msgid "Find Next"
 msgstr "Atrast Nākamo"
 
+msgid "Find Previous"
+msgstr "Atrast Iepriekšējo"
+
+msgid "Toggle alphabetical sorting of the method list."
+msgstr "Pārslēgt alfabētisko kārtojumu metožu sarakstam."
+
 msgid "Sort"
 msgstr "Šķirot"
 
@@ -2933,42 +3331,106 @@ msgstr "Nākamais skripts"
 msgid "Previous Script"
 msgstr "Iepriekšējais skripts"
 
-msgid "File"
-msgstr "Fails"
-
 msgid "Open..."
 msgstr "Atvērt..."
 
 msgid "Save All"
 msgstr "Saglabāt visu"
 
+msgid "Soft Reload Tool Script"
+msgstr "Maigi Pārlādēt Rīka Skriptu"
+
+msgid "Copy Script Path"
+msgstr "Kopēt Skripta Ceļu"
+
+msgid "History Previous"
+msgstr "Vēstures Iepriekšējais"
+
+msgid "History Next"
+msgstr "Vēstures Nākamais"
+
+msgid "Import Theme..."
+msgstr "Importēt Motīvu..."
+
+msgid "Reload Theme"
+msgstr "Pārlādēt Motīvu"
+
+msgid "Theme"
+msgstr "Motīvs"
+
 msgid "Save Theme"
 msgstr "Saglabāt motīvu"
 
 msgid "Close All"
 msgstr "Aizvērt Visu"
 
+msgid "Close Docs"
+msgstr "Aizvērt Dokumentāciju"
+
 msgid "Run"
 msgstr "Palaist"
 
 msgid "Search"
 msgstr "Meklēt"
 
+msgid "Search the reference documentation."
+msgstr "Meklēt atsauces dokumentāciju."
+
+msgid "Go to previous edited document."
+msgstr "Doties uz iepriekš rediģēto dokumentu."
+
+msgid "Go to next edited document."
+msgstr "Doties uz nākamo rediģēto dokumentu."
+
+msgid ""
+"Make the script editor floating.\n"
+"Right-click to open the screen selector."
+msgstr ""
+"Padarīt skripta redaktoru peldošu.\n"
+"Lai atvērtu ekrāna atlasītāju, nospiediet ar labo peles pogu."
+
 msgid "Discard"
 msgstr "Atmest"
 
+msgid "There are unsaved changes in the following built-in script(s):"
+msgstr "Ir nesaglabātas izmaiņas šajā(os) iebūvētajā(os) skriptā(os):"
+
 msgid "Reopen Closed Script"
 msgstr "Atvērt aizvērto skriptu"
 
 msgid "Clear Recent Scripts"
 msgstr "Notīrīt nesenos skriptus"
 
+msgid "Uppercase"
+msgstr "Lielie burti"
+
+msgid "Lowercase"
+msgstr "Mazie burti"
+
+msgid "Capitalize"
+msgstr "Pārvērst lielajos burtos"
+
 msgid "Standard"
 msgstr "Standarts"
 
+msgid "JSON"
+msgstr "JSON"
+
+msgid "Markdown"
+msgstr "Markdown"
+
+msgid "Connections to method:"
+msgstr "Savienojumi ar metodi:"
+
 msgid "Source"
 msgstr "Avots"
 
+msgid "Target"
+msgstr "Mērķis"
+
+msgid "Error at (%d, %d):"
+msgstr "Kļūda (%d, %d):"
+
 msgid ""
 "Missing connected method '%s' for signal '%s' from node '%s' to node '%s'."
 msgstr ""
@@ -2980,21 +3442,86 @@ msgstr "[Ignorēt]"
 msgid "Go to Function"
 msgstr "Iet uz funkciju"
 
+msgid ""
+"The resource does not have a valid path because it has not been saved.\n"
+"Please save the scene or resource that contains this resource and try again."
+msgstr ""
+"Resursam nav derīgs ceļš, jo tas nav saglabāts.\n"
+"Lūdzu, saglabājiet ainu vai resursu, kurā atrodas šis resurss, un pamēģiniet "
+"atkal."
+
+msgid "Preloading internal resources is not supported."
+msgstr "Nav atbalsta iepriekšielādēt iekšējos resursus."
+
+msgid "Can't drop nodes because script '%s' does not inherit Node."
+msgstr "Nevar nomest mezglus, jo skripts '%s' nepaplašina Node."
+
+msgid "Emoji & Symbols"
+msgstr "Emocijzīmes un Simboli"
+
+msgid "Pick Color"
+msgstr "Atlasiet Krāsu"
+
 msgid "Line"
 msgstr "Rinda"
 
+msgid "Syntax Highlighter"
+msgstr "Sintakses Marķētājs"
+
 msgid "Bookmarks"
 msgstr "Grāmatzīmes"
 
 msgid "Go To"
 msgstr "Iet uz"
 
+msgid "Delete Line"
+msgstr "Izdzēst Rindu"
+
+msgid "Unindent"
+msgstr "Noņemt Atkāpi"
+
+msgid "Toggle Comment"
+msgstr "Pārslēgt Komentāru"
+
+msgid "Fold/Unfold Line"
+msgstr "Savērst/Atvērst Rindu"
+
+msgid "Fold All Lines"
+msgstr "Savērst Visas Rindas"
+
+msgid "Unfold All Lines"
+msgstr "Atvērst Visas Rindas"
+
 msgid "Duplicate Selection"
 msgstr "Izveidot Dublikātu Izvēlētajam"
 
 msgid "Evaluate Selection"
 msgstr "Novērtēt izvēli"
 
+msgid "Trim Trailing Whitespace"
+msgstr "Apgriezt Beigu Caurredzamās Rakstzīmes"
+
+msgid "Trim Final Newlines"
+msgstr "Apgriezt Beigu Jaunās Rindiņas"
+
+msgid "Convert Indent to Spaces"
+msgstr "Pārvērst Atkāpes par Atstarpēm"
+
+msgid "Convert Indent to Tabs"
+msgstr "Pārvērst Atkāpes Par TAB"
+
+msgid "Auto Indent"
+msgstr "Automātiski Atkāpt"
+
+msgid "Find in Files..."
+msgstr "Atrast Failos..."
+
+msgid "Contextual Help"
+msgstr "Kontekstuālā Palīdzība"
+
+msgid "Toggle Bookmark"
+msgstr "Pārslēgt Grāmatzīmi"
+
 msgid "Go to Next Bookmark"
 msgstr "Doties uz nākamo grāmatzīmi"
 
@@ -3010,15 +3537,62 @@ msgstr "Doties uz Funkciju..."
 msgid "Go to Line..."
 msgstr "Doties uz Rindu..."
 
+msgid "Lookup Symbol"
+msgstr "Uzmeklēt Simbolu"
+
+msgid "Toggle Breakpoint"
+msgstr "Pārslēgt Pārrāvumpunktu"
+
+msgid "Remove All Breakpoints"
+msgstr "Noņemt Visus Pārrāvumpunktus"
+
 msgid "Go to Next Breakpoint"
 msgstr "Doties uz nākamo pārrāvumpunktu"
 
 msgid "Go to Previous Breakpoint"
 msgstr "Doties uz iepriekšējo pārrāvumpunktu"
 
+msgid ""
+"Make the shader editor floating.\n"
+"Right-click to open the screen selector."
+msgstr ""
+"Padarīt visus ēnotāja redaktorus peldošus.\n"
+"Lai atvērtu ekrāna atlasītāju, nospiediet ar labo peles pogu."
+
+msgid "No valid shader stages found."
+msgstr "Netika atrasti derīgi ēnotāja posmi."
+
+msgid "Shader stage compiled without errors."
+msgstr "Ēnotāja posms tika kompilēts bez kļūdām."
+
+msgid ""
+"File structure for '%s' contains unrecoverable errors:\n"
+"\n"
+msgstr ""
+"Failu struktūra priekš '%s' satur neatgūstamas kļūdas:\n"
+"\n"
+
+msgid "This skeleton has no bones, create some children Bone2D nodes."
+msgstr "Šim skeletam nav kaulu, izveido dažus Bone2D apakšmezglus."
+
+msgid "Set Rest Pose to Bones"
+msgstr "Iestatīt Miera Pozu Kauliem"
+
+msgid "Create Rest Pose from Bones"
+msgstr "Izveidot Miera Pozu no Kauliem"
+
+msgid "Skeleton2D"
+msgstr "Skelets2D"
+
 msgid "Reset to Rest Pose"
 msgstr "Atiestatīt uz atpūtas pozu"
 
+msgid "Overwrite Rest Pose"
+msgstr "Pārrakstīt Miera Pozu"
+
+msgid "Add Bone Metadata"
+msgstr "Pievienot Kaulu Metadatus"
+
 msgid "Create Polygon2D"
 msgstr "Izveidot Polygon2D"
 
@@ -3103,15 +3677,48 @@ msgstr "Pievienot fonta vienumu"
 msgid "Add Icon Item"
 msgstr "Pievienot ikonas vienumu"
 
+msgid "Rename Stylebox Item"
+msgstr "Pārsaukt Stila kastes Priekšmetu"
+
+msgid "Invalid file, not a Theme resource."
+msgstr "Nederīgs fails, nav Motīva resurss."
+
+msgid "Invalid file, same as the edited Theme resource."
+msgstr "Nederīgs fails, tāds pats kā rediģētais Motīva resurss."
+
+msgid "Manage Theme Items"
+msgstr "Pārvaldīt Motīva Vienumus"
+
 msgid "Edit Items"
 msgstr "Rediģēt vienumus"
 
+msgid "Types:"
+msgstr "Tipi:"
+
+msgid "Add Type:"
+msgstr "Pievienot Tipu:"
+
+msgid "Add Item:"
+msgstr "Pievienot Vienumu:"
+
+msgid "Add StyleBox Item"
+msgstr "Pievienot Stila kastes Vienumu"
+
 msgid "Remove Items:"
 msgstr "Noņemt vienumus:"
 
+msgid "Remove Class Items"
+msgstr "Noņemt Klases Vienumus"
+
 msgid "Remove Custom Items"
 msgstr "Noņemt pielāgotos vienumus"
 
+msgid "Remove All Items"
+msgstr "Noņemt Visus Vienumus"
+
+msgid "Add Theme Item"
+msgstr "Pievienot Motīva Vienumu"
+
 msgid "Old Name:"
 msgstr "Vecais vārds:"
 
@@ -3127,15 +3734,65 @@ msgstr "Redaktora motīvs"
 msgid "Select Another Theme Resource:"
 msgstr "Izvēlēties citu motīva resursu:"
 
+msgid "Another Theme"
+msgstr "Cits Motīvs"
+
+msgid "Filter the list of types or create a new custom type:"
+msgstr "Filtrēt tipu sarakstu vai izveidot jaunu pielāgotu tipu:"
+
 msgid "Type name is empty!"
 msgstr "Tipa nosaukums ir tukšs!"
 
+msgid "Confirm Item Rename"
+msgstr "Apstiprināt Vienuma Pārsaukšanu"
+
 msgid "Cancel Item Rename"
 msgstr "Atcelt pārsaukšanu"
 
+msgid "Override Item"
+msgstr "Pārrakstīt Vienumu"
+
+msgid "Unpin this StyleBox as a main style."
+msgstr "Atspraust šo Stila kasti no galvenā stila."
+
+msgid ""
+"Pin this StyleBox as a main style. Editing its properties will update the "
+"same properties in all other StyleBoxes of this type."
+msgstr ""
+"Piespraust šo Stila kasti kā galveno stilu. Rediģējot tās īpašības, tiks "
+"atjauninātas arī tās pašas īpašības visās pārējās Stila kastēs ar tādu pašu "
+"tipu."
+
+msgid "Add Item Type"
+msgstr "Pievienot Vienuma Tipu"
+
 msgid "Add Type"
 msgstr "Pievienot tipu"
 
+msgid "Override All Default Theme Items"
+msgstr "Pārrakstīt Visus Noklusējuma Motīva Vienumus"
+
+msgid "Set Font Size Item in Theme"
+msgstr "Iestatīt Vienuma Fonta Izmēru Motīvā"
+
+msgid "Set Font Item in Theme"
+msgstr "Iestatīt Vienuma Fontu Motīvā"
+
+msgid "Set Icon Item in Theme"
+msgstr "Iestatīt Vienuma Ikonu Motīvā"
+
+msgid "Set Stylebox Item in Theme"
+msgstr "Iestatīt Stila kastes Vienumu Motīvā"
+
+msgid "Pin Stylebox"
+msgstr "Piespraust Stila kasti"
+
+msgid "Unpin Stylebox"
+msgstr "Atspraust Stila kasti"
+
+msgid "Add a type from a list of available types or create a new one."
+msgstr "Pievieno tipu no saraksta ar pieejamiem tipiem vai izveido jaunu."
+
 msgid "Show Default"
 msgstr "Rādīt noklusējumu"
 
@@ -3301,9 +3958,6 @@ msgstr "Kļūda atverot failu arhīvu, nav ZIP formātā."
 msgid "The following files failed extraction from package:"
 msgstr "Sekojošie faili netika izvilkti no paketes:"
 
-msgid "Install & Edit"
-msgstr "Instalēt & Rediģēt"
-
 msgid "Project Path:"
 msgstr "Projekta ceļš:"
 
@@ -3430,15 +4084,6 @@ msgstr "Režģkartes ielīmēšanas izvēle"
 msgid "GridMap Selection"
 msgstr "Režģkartes izvēle"
 
-msgid "Paste Selects"
-msgstr "Ielīmēt izvēlnes"
-
-msgid "Cut Selection"
-msgstr "Griezt izvēlēto"
-
-msgid "Fill Selection"
-msgstr "Aizpildīt izvēlni"
-
 msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr "Nepietiekams skaits baitu lai dekodētu baitus vai nepareizs formāts."
 
@@ -3491,9 +4136,6 @@ msgstr "Nederīgs avots priekšskatījumam."
 msgid "Invalid source for shader."
 msgstr "Nederīgs fēnotāja avots."
 
-msgid "Filter"
-msgstr "Filtrēt"
-
 msgid "Repeat"
 msgstr "Atkārtot"
 
diff --git a/engine/editor/translations/editor/nl.po b/engine/editor/translations/editor/nl.po
index 5171c3b4..5b8d6d6c 100644
--- a/engine/editor/translations/editor/nl.po
+++ b/engine/editor/translations/editor/nl.po
@@ -1549,6 +1549,9 @@ msgstr "Signaalargumenten ontbinden:"
 msgid "Receiver Method:"
 msgstr "Ontvangende methode:"
 
+msgid "Pick"
+msgstr "Kiezen"
+
 msgid "Advanced"
 msgstr "Geavanceerd"
 
@@ -9034,9 +9037,6 @@ msgstr "Ouder veranderen"
 msgid "Run Instances"
 msgstr "Run Instanties"
 
-msgid "Pick"
-msgstr "Kiezen"
-
 msgid "2D Scene"
 msgstr "2D Scène"
 
diff --git a/engine/editor/translations/editor/pl.po b/engine/editor/translations/editor/pl.po
index 1102d309..0947725c 100644
--- a/engine/editor/translations/editor/pl.po
+++ b/engine/editor/translations/editor/pl.po
@@ -95,7 +95,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-21 19:26+0000\n"
+"PO-Revision-Date: 2025-03-16 22:14+0000\n"
 "Last-Translator: Tomek <kobewi4e@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/godot/"
 "pl/>\n"
@@ -105,7 +105,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Główny Wątek"
@@ -963,6 +963,9 @@ msgstr ""
 msgid "property '%s'"
 msgstr "właściwość \"%s\""
 
+msgid "Nearest FPS: %d"
+msgstr "Najbliższy FPS: %d"
+
 msgid "Change Animation Step"
 msgstr "Zmień krok animacji"
 
@@ -1610,6 +1613,9 @@ msgstr "Odwiąż argumenty sygnału:"
 msgid "Receiver Method:"
 msgstr "Metoda odbiorcy:"
 
+msgid "Pick"
+msgstr "Wybierz"
+
 msgid "Advanced"
 msgstr "Zaawansowane"
 
@@ -5247,6 +5253,12 @@ msgstr "Zainstaluj z pliku"
 msgid "Install templates from a local file."
 msgstr "Zainstaluj szablony z lokalnego pliku."
 
+msgid "Online mode is needed to download the templates."
+msgstr "Tryb online jest wymagany do pobrania szablonów."
+
+msgid "Go Online"
+msgstr "Przejdź do trybu online"
+
 msgid "Cancel the download of the templates."
 msgstr "Anuluj pobieranie szablonów."
 
@@ -8065,9 +8077,6 @@ msgstr ""
 "Biblioteka Zasobów wymaga połączenia online i obejmuje przesyłanie danych "
 "przez internet."
 
-msgid "Go Online"
-msgstr "Przejdź do trybu online"
-
 msgid "Failed to get repository configuration."
 msgstr "Nie udało się pobrać konfiguracji repozytorium."
 
@@ -14858,6 +14867,9 @@ msgstr ""
 "Dowolnie przekierowuje połączenia, może być użyte do połączenia wielu portów "
 "wejściowych do jednego portu wyjścia."
 
+msgid "[None]"
+msgstr "[Brak]"
+
 msgid "Edit Visual Property: %s"
 msgstr "Edytuj właściwość wizualną: %s"
 
@@ -15712,9 +15724,6 @@ msgstr "Tagi funkcjonalności"
 msgid "Pick Root Node Type"
 msgstr "Wybierz typ korzenia"
 
-msgid "Pick"
-msgstr "Wybierz"
-
 msgid "Scene name is empty."
 msgstr "Nazwa sceny jest pusta."
 
@@ -16413,38 +16422,20 @@ msgstr "Aktualizowanie UID skryptów"
 
 msgid ""
 "As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
+"shaders. Upgrades apply on the next save of each scene/resource.\n"
 "\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
+"To save time, this tool can open and save each of these files. Depending on "
+"the project size, it may take several minutes."
 msgstr ""
-"Od Godota 4.4, sceny i zasoby używają UID, żeby odwołać się do skryptów i "
-"shaderów.\n"
+"W Godocie 4.4 sceny i zasoby używają UID, by odnosić się do skryptów i "
+"shaderów. Zmiany te są zastosowane przy następnym zapisaniu każdej sceny/"
+"zasobu.\n"
 "\n"
-"Normalnie ta aktualizacja jest stosowana do pojedynczej sceny lub zasobu, "
-"kiedy zapiszesz je w Godocie 4.4 za pierwszym razem. Jeśli masz dużo scen i/"
-"lub zasobów, robienie tego ręcznie może być czasochłonne. To narzędzie "
-"zaktualizuje wszystkie sceny i zasoby projektu za jednym razem.\n"
-"\n"
-"Kliknij \"Zrestartuj i zaktualizuj\", by zrestartować edytor i zaktualizować "
-"wszystkie sceny i zasoby w tym projekcie. W zależności od rozmiaru projektu "
-"może to zająć kilka minut.\n"
-"\n"
-"Uwaga: upewnij się, że twój projekt ma kopię zapasową zanim uruchomisz to "
-"narzędzie, by uniknąć możliwości utraty danych. Dodatkowo upewnij się, że "
-"zatwierdzasz wszystkie pliki .uid w kontroli wersji (i nie dodawaj ich do "
-"list ignorowania typu .gitignore)."
+"By oszczędzić czas, to narzędzie może otworzyć i zapisać każdy z tych plików. "
+"W zależności od rozmiaru projektu, może to zająć parę minut."
+
+msgid "Re-save all scenes and resources to use UIDs"
+msgstr "Zapisz ponownie wszystkie sceny i zasoby, by używały UID"
 
 msgid "Learn More"
 msgstr "Dowiedz się więcej"
@@ -19782,6 +19773,9 @@ msgstr ""
 "By kontynuować z minimalnymi zmianami kodu, dodaj \"uniform sampler2D %s : "
 "hint_%s, filter_linear_mipmap\" w okolicy góry swojego shadera."
 
+msgid "Can't use function as identifier: '%s'."
+msgstr "Nie można użyć funkcji jako identyfikatora: \"%s\"."
+
 msgid "Varying with '%s' data type may only be used in the '%s' function."
 msgstr "Varying z typem danych \"%s\" może być użyty tylko w funkcji \"%s\"."
 
@@ -19789,9 +19783,6 @@ msgid "Varying '%s' must be assigned in the '%s' function first."
 msgstr ""
 "Zmienna varying \"%s\" musi najpierw zostać przypisana w funkcji \"%s\"."
 
-msgid "Can't use function as identifier: '%s'."
-msgstr "Nie można użyć funkcji jako identyfikatora: \"%s\"."
-
 msgid "Only integer expressions are allowed for indexing."
 msgstr "Do indeksowania dozwolone są tylko wyrażenia całkowite."
 
diff --git a/engine/editor/translations/editor/pt.po b/engine/editor/translations/editor/pt.po
index 9a925812..e6ba75e6 100644
--- a/engine/editor/translations/editor/pt.po
+++ b/engine/editor/translations/editor/pt.po
@@ -1592,6 +1592,9 @@ msgstr "Argumentos de Sinal de Desvinculação:"
 msgid "Receiver Method:"
 msgstr "Método Recetor:"
 
+msgid "Pick"
+msgstr "Escolher"
+
 msgid "Advanced"
 msgstr "Avançado"
 
@@ -5247,6 +5250,9 @@ msgstr "Instalar do Ficheiro"
 msgid "Install templates from a local file."
 msgstr "Instalar modelos a partir de um ficheiro local."
 
+msgid "Go Online"
+msgstr "Ficar Online"
+
 msgid "Cancel the download of the templates."
 msgstr "Cancelar a transferência dos modelos."
 
@@ -8054,9 +8060,6 @@ msgstr ""
 "A Biblioteca de Assets requer uma conexão online e envolve a transferência de "
 "dados através da internet."
 
-msgid "Go Online"
-msgstr "Ficar Online"
-
 msgid "Failed to get repository configuration."
 msgstr "Incapaz de obter configuração de repositório."
 
@@ -15439,9 +15442,6 @@ msgstr "Marcadores de recursos"
 msgid "Pick Root Node Type"
 msgstr "Escolha o Tipo de Nó Raiz"
 
-msgid "Pick"
-msgstr "Escolher"
-
 msgid "Scene name is empty."
 msgstr "O nome da cena está vazio."
 
diff --git a/engine/editor/translations/editor/pt_BR.po b/engine/editor/translations/editor/pt_BR.po
index 256743df..fce53500 100644
--- a/engine/editor/translations/editor/pt_BR.po
+++ b/engine/editor/translations/editor/pt_BR.po
@@ -66,7 +66,7 @@
 # Gustavo da Silva Santos <gustavo94.rb@gmail.com>, 2019.
 # Rafael Roque <rafael.roquec@gmail.com>, 2019.
 # José Victor Dias Rodrigues <zoldyakopersonal@gmail.com>, 2019.
-# Fupi Brazil <fupicat@gmail.com>, 2019, 2020, 2024.
+# Fupi Brazil <fupicat@gmail.com>, 2019, 2020, 2024, 2025.
 # Julio Pinto Coelho <juliopcrj@gmail.com>, 2019.
 # Perrottacooking <perrottacooking@gmail.com>, 2019.
 # Wow Bitch <hahaj@itmailr.com>, 2019.
@@ -153,7 +153,7 @@
 # Mauricio Mazur <mauricio.mazur12@gmail.com>, 2022.
 # ! Zyll <emanueljunior756@gmail.com>, 2022.
 # Kirrby <kirrby.gaming@gmail.com>, 2022.
-# Murilo Gama <murilovsky2030@gmail.com>, 2022, 2023, 2024.
+# Murilo Gama <murilovsky2030@gmail.com>, 2022, 2023, 2024, 2025.
 # Kauã Azevedo <Kazevic@pm.me>, 2022.
 # Zer0-Zer0 <dankmemerson@tutanota.com>, 2022.
 # Levi Ferreira <leviferreiramorais@gmail.com>, 2023.
@@ -199,13 +199,15 @@
 # dweob <dweob@c0de.wtf>, 2024.
 # DX_studios1 <biel.escarabichi@gmail.com>, 2025.
 # Smiter <friverick321@gmail.com>, 2025.
+# Gabriel Rauta Zanette <fupicat@gmail.com>, 2025.
+# "Lucas E." <lukas.ed45@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: 2016-05-30\n"
-"PO-Revision-Date: 2025-02-11 01:02+0000\n"
-"Last-Translator: Smiter <friverick321@gmail.com>\n"
+"PO-Revision-Date: 2025-03-13 02:50+0000\n"
+"Last-Translator: Gabriel Rauta Zanette <fupicat@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/godot-"
 "engine/godot/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -213,7 +215,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Main Thread"
 msgstr "Thread Principal"
@@ -261,16 +263,16 @@ msgid "Mouse motion at position (%s) with velocity (%s)"
 msgstr "Movimento do mouse na posição (%s) com velocidade (%s)"
 
 msgid "Left Stick X-Axis, Joystick 0 X-Axis"
-msgstr "Eixo-X Alavanca Esquerda, Eixo-X Joystick 0"
+msgstr "Eixo-X Analógico Esquerdo, Eixo-X Joystick 0"
 
 msgid "Left Stick Y-Axis, Joystick 0 Y-Axis"
-msgstr "Eixo-Y Alavanca Esquerda, Eixo-Y Joystick 0"
+msgstr "Eixo-Y Analógico Esquerdo, Eixo-Y Joystick 0"
 
 msgid "Right Stick X-Axis, Joystick 1 X-Axis"
-msgstr "Eixo-X Alavanca Direita, Eixo-X Joystick 1"
+msgstr "Eixo-X Analógico Direito, Eixo-X Joystick 1"
 
 msgid "Right Stick Y-Axis, Joystick 1 Y-Axis"
-msgstr "Eixo-Y Alavanca Direita, Eixo-Y Joystick 1"
+msgstr "Eixo-Y Analógico Direito, Eixo-Y Joystick 1"
 
 msgid "Joystick 2 X-Axis, Left Trigger, Sony L2, Xbox LT"
 msgstr "Eixo-X Joystick 2, Gatilho Esquerdo, Sony L2, Xbox LT"
@@ -297,7 +299,7 @@ msgid "Joypad Motion on Axis %d (%s) with Value %.2f"
 msgstr "Movimento do Joypad no Eixo %d (%s) com Valor %.2f"
 
 msgid "Bottom Action, Sony Cross, Xbox A, Nintendo B"
-msgstr "Botão de Ação, Sony X, Xbox A, Nintendo B"
+msgstr "Botão de Ação Inferior, Sony X, Xbox A, Nintendo B"
 
 msgid "Right Action, Sony Circle, Xbox B, Nintendo A"
 msgstr "Botão de Ação Direito, Sony Círculo, Xbox B, Nintendo A"
@@ -318,10 +320,10 @@ msgid "Start, Xbox Menu, Nintendo +"
 msgstr "Iniciar, Xbox Menu, Nintendo +"
 
 msgid "Left Stick, Sony L3, Xbox L/LS"
-msgstr "Alavanca Esquerda, Sony L3, Xbox L/LS"
+msgstr "Analógico Esquerdo, Sony L3, Xbox L/LS"
 
 msgid "Right Stick, Sony R3, Xbox R/RS"
-msgstr "Alavanca Direita, Sony R3, Xbox R/RS"
+msgstr "Analógico Direito, Sony R3, Xbox R/RS"
 
 msgid "Left Shoulder, Sony L1, Xbox LB"
 msgstr "Ombro Esquerdo, Sony L1, Xbox LB"
@@ -366,7 +368,7 @@ msgid "Pressure:"
 msgstr "Pressão:"
 
 msgid "canceled"
-msgstr "Cancelado"
+msgstr "cancelado"
 
 msgid "touched"
 msgstr "tocado"
@@ -467,22 +469,22 @@ msgid "Dedent"
 msgstr "Desindentar"
 
 msgid "Backspace"
-msgstr "Retroceder"
+msgstr "Apagar à Esquerda"
 
 msgid "Backspace Word"
-msgstr "Retroceder Palavra"
+msgstr "Apagar Palavra à Esquerda"
 
 msgid "Backspace all to Left"
-msgstr "Retroceder totalmente à Esquerda"
+msgstr "Apagar tudo à Esquerda"
 
 msgid "Delete"
-msgstr "Excluir"
+msgstr "Apagar à Direita"
 
 msgid "Delete Word"
-msgstr "Excluir Palavra"
+msgstr "Apagar Palavra à Direita"
 
 msgid "Delete all to Right"
-msgstr "Excluir tudo à Direita"
+msgstr "Apagar tudo à Direita"
 
 msgid "Caret Left"
 msgstr "Cursor para a Esquerda"
@@ -521,10 +523,10 @@ msgid "Caret Document End"
 msgstr "Cursor no Final do Documento"
 
 msgid "Caret Add Below"
-msgstr "Adicionar Cursor Abaixo"
+msgstr "Cursor Adicionar Abaixo"
 
 msgid "Caret Add Above"
-msgstr "Adicionar Cursor Acima"
+msgstr "Cursor Adicionar Acima"
 
 msgid "Scroll Up"
 msgstr "Rolar para Cima"
@@ -571,6 +573,9 @@ msgstr "Mostrar Ocultos"
 msgid "Swap Input Direction"
 msgstr "Trocar Direção da Entrada"
 
+msgid "Start Unicode Character Input"
+msgstr "Iniciar Entrada de Caracteres Unicode"
+
 msgid "Invalid input %d (not passed) in expression"
 msgstr "Entrada inválida %d (não passada) na expressão"
 
@@ -584,7 +589,7 @@ msgid "Invalid index of type %s for base type %s"
 msgstr "Índice de tipo %s inválido para tipo base %s"
 
 msgid "Invalid named index '%s' for base type %s"
-msgstr "Nome inválido de índice '%s' para base tipo %s"
+msgstr "Índice nomeado '%s' inválido para tipo base %s"
 
 msgid "Invalid arguments to construct '%s'"
 msgstr "Argumentos inválidos para o construto '%s'"
@@ -651,7 +656,7 @@ msgid "Remove Event"
 msgstr "Remover Evento"
 
 msgid "Filter by Name"
-msgstr "Filtrar por nome"
+msgstr "Filtrar por Nome"
 
 msgid "Clear All"
 msgstr "Limpar Tudo"
@@ -693,7 +698,7 @@ msgid "Metadata name must be a valid identifier."
 msgstr "O nome dos metadados deve ser um identificador válido."
 
 msgid "Metadata with name \"%s\" already exists."
-msgstr "Metadados com o nome \"%s\" já existem."
+msgstr "Já existem metadados com o nome \"%s\"."
 
 msgid "Names starting with _ are reserved for editor-only metadata."
 msgstr "Os nomes que começam com _ são reservados para metadados do editor."
@@ -726,22 +731,22 @@ msgid "Delete Selected Key(s)"
 msgstr "Excluir Chave(s) Selecionada(s)"
 
 msgid "Make Handles Free"
-msgstr "Liberar Manipuladores"
+msgstr "Pontos de Controle Livres"
 
 msgid "Make Handles Linear"
-msgstr "Tornar os Manipuladores Lineares"
+msgstr "Pontos de Controle Lineares"
 
 msgid "Make Handles Balanced"
-msgstr "Balancear Manipuladores"
+msgstr "Pontos de Controle Equilibrados"
 
 msgid "Make Handles Mirrored"
-msgstr "Espelhar os Manipuladores"
+msgstr "Pontos de Controle Espelhados"
 
 msgid "Make Handles Balanced (Auto Tangent)"
-msgstr "Tornar Manipuladores Balanceados (Tangente Automática)"
+msgstr "Pontos de Controle Equilibrados (Tangente Automática)"
 
 msgid "Make Handles Mirrored (Auto Tangent)"
-msgstr "Espelhar Manipuladores (Tangente Automática)"
+msgstr "Pontos de Controle Espelhados (Tangente Automática)"
 
 msgid "Add Bezier Point"
 msgstr "Adicionar um Ponto Bezier"
@@ -762,13 +767,13 @@ msgid "Animation Delete Keys"
 msgstr "Excluir Chaves da Animação"
 
 msgid "Focus"
-msgstr "Foco"
+msgstr "Focar"
 
 msgid "Select All Keys"
-msgstr "Selecionar Todas as Teclas"
+msgstr "Selecionar Todas as Chaves"
 
 msgid "Deselect All Keys"
-msgstr "Desselecionar Todas as Teclas"
+msgstr "Desselecionar Todas as Chaves"
 
 msgid "Animation Change Transition"
 msgstr "Alterar Transição da Animação"
@@ -826,8 +831,28 @@ msgstr ""
 "Avançadas de Importação da cena e selecione a animação.\n"
 "Em seguida você poderá ajustar o modo de repetição diretamente no Inspetor."
 
+msgid "Can't change loop mode on animation instanced from an imported resource."
+msgstr ""
+"Não é possível alterar o modo de repetição em uma animação instanciada de um "
+"recurso importado."
+
+msgid ""
+"Can't change loop mode on animation embedded in another scene.\n"
+"\n"
+"You must open this scene and change the animation's loop mode from there."
+msgstr ""
+"Não é possível alterar o modo de repetição de uma animação incorporada em "
+"outra cena.\n"
+"\n"
+"Você precisa abrir essa cena e mudar o modo de repetição da animação por lá."
+
+msgid "Can't change loop mode on animation embedded in another resource."
+msgstr ""
+"Não é possível alterar o modo de repetição de uma animação incorporada em "
+"outro recurso."
+
 msgid "Property Track..."
-msgstr "Faixa de Propriedades..."
+msgstr "Faixa de Propriedade..."
 
 msgid "3D Position Track..."
 msgstr "Faixa de Posição 3D..."
@@ -863,7 +888,7 @@ msgid "Add Track"
 msgstr "Adicionar Faixa"
 
 msgid "Animation Looping"
-msgstr "Repetir Animação"
+msgstr "Repetição da Animação"
 
 msgid "Functions:"
 msgstr "Funções:"
@@ -917,22 +942,22 @@ msgid "Easing:"
 msgstr "Suavização:"
 
 msgid "In-Handle:"
-msgstr "Manipulador de Entrada:"
+msgstr "Ponto de Controle de Entrada:"
 
 msgid "Out-Handle:"
-msgstr "Manipulador de Saída:"
+msgstr "Ponto de Controle de Saída:"
 
 msgid "Handle mode: Free\n"
-msgstr "Modo de manipular: Livre\n"
+msgstr "Modo do Ponto de Controle: Livre\n"
 
 msgid "Handle mode: Linear\n"
-msgstr "Modo de manipular: Linear\n"
+msgstr "Modo do Ponto de Controle: Linear\n"
 
 msgid "Handle mode: Balanced\n"
-msgstr "Modo de manipular: Equilibrado\n"
+msgstr "Modo do Ponto de Controle: Equilibrado\n"
 
 msgid "Handle mode: Mirrored\n"
-msgstr "Modo de manipular: Espelhado\n"
+msgstr "Modo do Ponto de Controle: Espelhado\n"
 
 msgid "Stream:"
 msgstr "Fluxo:"
@@ -962,7 +987,7 @@ msgid "Capture"
 msgstr "Captura"
 
 msgid "Nearest"
-msgstr "Aproximada"
+msgstr "Mais próxima"
 
 msgid "Linear"
 msgstr "Linear"
@@ -1050,7 +1075,7 @@ msgid "property '%s'"
 msgstr "propriedade '%s'"
 
 msgid "Change Animation Step"
-msgstr "Alterar FPS da Animação"
+msgstr "Alterar Andamento da Animação"
 
 msgid "Rearrange Tracks"
 msgstr "Reordenar Faixas"
@@ -1212,16 +1237,25 @@ msgid "Warning: AnimationPlayer is inactive"
 msgstr "Alerta: AnimationPlayer está inativo"
 
 msgid "Toggle between the bezier curve editor and track editor."
-msgstr "Alterne entre o editor de curvas de Bezier e o editor de trilhas."
+msgstr "Alternar entre o editor de curvas de Bezier e o editor de faixas."
 
 msgid "Only show tracks from nodes selected in tree."
-msgstr "Mostra apenas as faixas dos nós selecionados na árvore."
+msgstr "Mostrar apenas as faixas dos nós selecionados na árvore."
 
 msgid "Group tracks by node or display them as plain list."
-msgstr "Agrupe as faixas pelo nó ou exiba-as como lista simples."
+msgstr "Agrupar as faixas pelo nó ou exibí-las numa lista simples."
+
+msgid "Apply snapping to timeline cursor."
+msgstr "Aplicar atração ao cursor da linha do tempo."
+
+msgid "Apply snapping to selected key(s)."
+msgstr "Aplicar atração à(s) chave(s) selecionada(s)."
+
+msgid "Apply snapping to the nearest integer FPS."
+msgstr "Aplicar atração ao FPS inteiro mais próximo."
 
 msgid "Animation step value."
-msgstr "Valor do passo de animação."
+msgstr "Valor do andamento da animação."
 
 msgid "Seconds"
 msgstr "Segundos"
@@ -1242,7 +1276,7 @@ msgid "Copy Tracks..."
 msgstr "Copiar Faixas..."
 
 msgid "Scale Selection..."
-msgstr "Escalonar seleção..."
+msgstr "Escalonar Seleção..."
 
 msgid "Scale From Cursor..."
 msgstr "Escalonar a Partir do Cursor..."
@@ -1260,7 +1294,7 @@ msgid "Duplicate Selected Keys"
 msgstr "Duplicar Chaves Selecionadas"
 
 msgid "Cut Selected Keys"
-msgstr "Excluir Chaves Selecionadas"
+msgstr "Recortar Chaves Selecionadas"
 
 msgid "Copy Selected Keys"
 msgstr "Copiar Chaves Selecionadas"
@@ -1275,13 +1309,13 @@ msgid "Move Last Selected Key to Cursor"
 msgstr "Mover Última Chave Selecionada Para o Cursor"
 
 msgid "Delete Selection"
-msgstr "Deletar Seleção"
+msgstr "Excluir Seleção"
 
 msgid "Go to Next Step"
-msgstr "Ir ao Próximo Passo"
+msgstr "Ir ao Próximo Incremento"
 
 msgid "Go to Previous Step"
-msgstr "Ir ao Passo Anterior"
+msgstr "Ir ao Incremento Anterior"
 
 msgid "Apply Reset"
 msgstr "Redefinir"
@@ -1311,7 +1345,7 @@ msgid "Max Velocity Error:"
 msgstr "Erro de Velocidade Máxima:"
 
 msgid "Max Angular Error:"
-msgstr "Erro de Máximo Angular:"
+msgstr "Erro de Ângulo Máximo:"
 
 msgid "Max Precision Error:"
 msgstr "Erro de Precisão Máxima:"
@@ -1320,10 +1354,10 @@ msgid "Optimize"
 msgstr "Otimizar"
 
 msgid "Trim keys placed in negative time"
-msgstr "Recortar chaves colocadas em tempo negativo"
+msgstr "Remover chaves colocadas em tempo negativo"
 
 msgid "Trim keys placed exceed the animation length"
-msgstr "Recortar chaves que excedem o tempo da animação"
+msgstr "Remover chaves que excedem o tempo da animação"
 
 msgid "Remove invalid keys"
 msgstr "Remover chaves inválidas"
@@ -1344,7 +1378,7 @@ msgid "Scale Ratio:"
 msgstr "Razão de Escala:"
 
 msgid "Select Transition and Easing"
-msgstr "Selecione a Transição e Suavização"
+msgstr "Selecionar Transição e Suavização"
 
 msgctxt "Transition Type"
 msgid "Linear"
@@ -1356,15 +1390,15 @@ msgstr "Senoidal"
 
 msgctxt "Transition Type"
 msgid "Quint"
-msgstr "Quíntico"
+msgstr "Quíntica"
 
 msgctxt "Transition Type"
 msgid "Quart"
-msgstr "Quártico"
+msgstr "Quártica"
 
 msgctxt "Transition Type"
 msgid "Quad"
-msgstr "Quadrático"
+msgstr "Quadrática"
 
 msgctxt "Transition Type"
 msgid "Expo"
@@ -1372,7 +1406,7 @@ msgstr "Exponencial"
 
 msgctxt "Transition Type"
 msgid "Elastic"
-msgstr "Elástico"
+msgstr "Elástica"
 
 msgctxt "Transition Type"
 msgid "Cubic"
@@ -1384,11 +1418,11 @@ msgstr "Circular"
 
 msgctxt "Transition Type"
 msgid "Bounce"
-msgstr "Rebatimentos"
+msgstr "Quicando"
 
 msgctxt "Transition Type"
 msgid "Back"
-msgstr "Trás"
+msgstr "Vai-e-volta"
 
 msgctxt "Transition Type"
 msgid "Spring"
@@ -1417,7 +1451,7 @@ msgid "Ease Type:"
 msgstr "Tipo de Suavização:"
 
 msgid "FPS:"
-msgstr "QPS:"
+msgstr "FPS:"
 
 msgid "Animation Baker"
 msgstr "Gerar Animação"
@@ -1440,12 +1474,75 @@ msgstr "Selecionar Todas/Nenhuma"
 msgid "Animation Change Keyframe Time"
 msgstr "Alterar Tempo do Quadro-Chave da Animação"
 
+msgid "Marker name is read-only in the inspector."
+msgstr "Nome do marcador é apenas-leitura no inspetor."
+
+msgid ""
+"A marker's name can only be changed by right-clicking it in the animation "
+"editor and selecting \"Rename Marker\", in order to make sure that marker "
+"names are all unique."
+msgstr ""
+"O nome de um marcador só pode ser alterado ao clicar nele com o botão direito "
+"no editor de animação e selecionar \"Renomear Marcador\", para garantir que "
+"todos os nomes de marcador serão únicos."
+
+msgid "Insert Marker..."
+msgstr "Inserir Marcador..."
+
+msgid "Rename Marker"
+msgstr "Renomear Marcador"
+
+msgid "Delete Marker(s)"
+msgstr "Excluir Marcador(es)"
+
+msgid "Show All Marker Names"
+msgstr "Mostrar Todos os Nomes de Marcadores"
+
+msgid "Marker:"
+msgstr "Marcador:"
+
+msgid "Animation Move Markers"
+msgstr "Mover Marcadores da Animação"
+
+msgid "Animation Delete Markers"
+msgstr "Excluir Marcadores da Animação"
+
+msgid "Marker '%s' already exists!"
+msgstr "Marcador '%s' já existe!"
+
+msgid "Add Marker Key"
+msgstr "Adicionar Chave de Marcador"
+
+msgid "Empty marker names are not allowed."
+msgstr "Nomes de marcador vazios não são permitidos."
+
+msgid "Insert Marker"
+msgstr "Inserir Marcador"
+
+msgid "Marker Name"
+msgstr "Nome do Marcador"
+
+msgid "Marker Color"
+msgstr "Cor do Marcador"
+
 msgid "Close"
 msgstr "Fechar"
 
 msgid "Error!"
 msgstr "Erro!"
 
+msgid "Change Marker Name:"
+msgstr "Alterar Nome do Marcador:"
+
+msgid "Edit Marker Color"
+msgstr "Alterar Cor do Marcador"
+
+msgid "Multi Edit Marker Color"
+msgstr "Alterar Cor de Vários Marcadores"
+
+msgid "Animation Change Marker Time"
+msgstr "Alterar Tempo do Marcador da Animação"
+
 msgid "Add Audio Track Clip"
 msgstr "Adicionar Clipe de Faixa de Áudio"
 
@@ -1477,14 +1574,20 @@ msgid_plural "%d of %d matches"
 msgstr[0] "%d de %d correspondência"
 msgstr[1] "%d de %d correspondências"
 
+msgid "Hide Replace"
+msgstr "Esconder Substituição"
+
+msgid "Show Replace"
+msgstr "Mostrar Substituição"
+
 msgid "Find"
 msgstr "Encontrar"
 
 msgid "Previous Match"
-msgstr "Combinação Anterior"
+msgstr "Correspondência Anterior"
 
 msgid "Next Match"
-msgstr "Próxima Combinação"
+msgstr "Próxima Correspondência"
 
 msgid "Match Case"
 msgstr "Diferenciar Maiúsculas e Minúsculas"
@@ -1533,11 +1636,18 @@ msgstr "Avisos"
 msgid "Zoom factor"
 msgstr "Quantidade de zoom"
 
+msgid ""
+"%sMouse wheel, %s/%s: Finetune\n"
+"%s: Reset"
+msgstr ""
+"%sRoda do mouse, %s/%s: Ajuste fino\n"
+"%s: Redefinir"
+
 msgid "Line and column numbers."
 msgstr "Números de linha e coluna."
 
 msgid "Indentation"
-msgstr "Identação"
+msgstr "Indentação"
 
 msgid "Method in target node must be specified."
 msgstr "O método no nó de destino deve ser especificado."
@@ -1556,8 +1666,7 @@ msgid "Attached Script"
 msgstr "Script Anexado"
 
 msgid "%s: Callback code won't be generated, please add it manually."
-msgstr ""
-"%s:Código de Callback não pode ser gerado, por favor adicione manualmente."
+msgstr "%s: Código de Callback não será gerado, por favor adicione manualmente."
 
 msgid "Connect to Node:"
 msgstr "Conectar ao Nó:"
@@ -1584,7 +1693,7 @@ msgid "Filter Methods"
 msgstr "Filtrar Métodos"
 
 msgid "No method found matching given filters."
-msgstr "Nenhum método encontrado corresponde aos filtros aplicados."
+msgstr "Nenhum método corresponde aos filtros aplicados."
 
 msgid "Script Methods Only"
 msgstr "Somente Métodos de Script"
@@ -1610,16 +1719,20 @@ msgstr "Argumentos de Sinal de Desvinculação:"
 msgid "Receiver Method:"
 msgstr "Método Receptor:"
 
+msgid "Pick"
+msgstr "Escolher"
+
 msgid "Advanced"
 msgstr "Avançado"
 
 msgid "Deferred"
-msgstr "Deferido"
+msgstr "Adiado"
 
 msgid ""
 "Defers the signal, storing it in a queue and only firing it at idle time."
 msgstr ""
-"Adia o sinal, armazenando-o em uma fila e disparando-o apenas quando ocioso."
+"Adia o sinal, armazenando-o em uma fila e disparando-o apenas quando o "
+"processador estiver ocioso."
 
 msgid "One Shot"
 msgstr "Disparo Único"
@@ -1634,7 +1747,7 @@ msgid "Connect"
 msgstr "Conectar"
 
 msgid "Connect '%s' to '%s'"
-msgstr "Conectar \"%s\" a \"%s\""
+msgstr "Conectar '%s' a '%s'"
 
 msgid "Disconnect '%s' from '%s'"
 msgstr "Desconectar '%s' de '%s'"
@@ -1693,6 +1806,12 @@ msgstr "Criar Novo %s"
 msgid "No results for \"%s\"."
 msgstr "Sem resultados para \"%s\"."
 
+msgid "Script path: %s"
+msgstr "Caminho do Script: %s"
+
+msgid "The script will run in the editor."
+msgstr "Este script será executado no editor."
+
 msgid "This class is marked as deprecated."
 msgstr "Esta classe está marcada como obsoleta."
 
@@ -1723,6 +1842,9 @@ msgstr "Descrição:"
 msgid "Remote %s:"
 msgstr "%s remoto:"
 
+msgid "Session %d"
+msgstr "%d de Sessão"
+
 msgid "Debugger"
 msgstr "Depurador"
 
@@ -1746,15 +1868,24 @@ msgid ""
 "%s\n"
 "Click to open the original file in the Editor."
 msgstr ""
-"Este nó foi instanciado do arquivo PackedScene:\n"
+"Este nó foi instanciado de um arquivo PackedScene:\n"
 "%s\n"
 "Clique para abrir o arquivo original no Editor."
 
 msgid "Toggle Visibility"
 msgstr "Alternar Visibilidade"
 
+msgid "Expression to evaluate"
+msgstr "Expressão para executar"
+
+msgid "Clear on Run"
+msgstr "Apagar ao Executar"
+
+msgid "Evaluate"
+msgstr "Executar"
+
 msgid "Clear"
-msgstr "Limpar"
+msgstr "Apagar"
 
 msgid "Updating assets on target device:"
 msgstr "Atualizando recursos no dispositivo alvo:"
@@ -1790,7 +1921,7 @@ msgid "Value"
 msgstr "Valor"
 
 msgid "Pick one or more items from the list to display the graph."
-msgstr "Escolhe um ou mais itens da lista para mostrar o gráfico."
+msgstr "Escolha um ou mais itens da lista para mostrar o gráfico."
 
 msgid "Stop"
 msgstr "Parar"
@@ -1798,6 +1929,9 @@ msgstr "Parar"
 msgid "Start"
 msgstr "Iniciar"
 
+msgid "Autostart"
+msgstr "Início automático"
+
 msgid "Measure:"
 msgstr "Medida:"
 
@@ -1811,7 +1945,7 @@ msgid "Frame %"
 msgstr "Quadro %"
 
 msgid "Physics Frame %"
-msgstr "Frame de Física %"
+msgstr "Quadro de Física %"
 
 msgid "Inclusive"
 msgstr "Inclusivo"
@@ -1868,7 +2002,7 @@ msgid "Bytes:"
 msgstr "Bytes:"
 
 msgid "Warning:"
-msgstr "Avisos:"
+msgstr "Aviso:"
 
 msgid "Error:"
 msgstr "Erro:"
@@ -1883,7 +2017,7 @@ msgid "%s Source"
 msgstr "Origem %s"
 
 msgid "%s Source:"
-msgstr "%s Origem:"
+msgstr "Origem %s:"
 
 msgid "Stack Trace"
 msgstr "Rastreamento de Pilha"
@@ -1907,7 +2041,7 @@ msgid "Delete All Breakpoints in:"
 msgstr "Excluir Todos os Pontos de Interrupção em:"
 
 msgid "Delete All Breakpoints"
-msgstr "Remover Todos os Pontos de Interrupção"
+msgstr "Excluir Todos os Pontos de Interrupção"
 
 msgid "Copy Error"
 msgstr "Copiar Erro"
@@ -1940,7 +2074,7 @@ msgid "Thread:"
 msgstr "Thread:"
 
 msgid "Stack Frames"
-msgstr "Empilhar Quadros"
+msgstr "Quadros de Pilha"
 
 msgid "Filter Stack Variables"
 msgstr "Filtrar Variáveis de Pilha"
@@ -1954,6 +2088,9 @@ msgstr "Expandir Tudo"
 msgid "Collapse All"
 msgstr "Recolher Tudo"
 
+msgid "Evaluator"
+msgstr "Executor"
+
 msgid "Profiler"
 msgstr "Analisador"
 
@@ -1961,7 +2098,7 @@ msgid "Visual Profiler"
 msgstr "Analisador Gráfico"
 
 msgid "List of Video Memory Usage by Resource:"
-msgstr "Lista o Uso de Memória de Vídeo por Recurso:"
+msgstr "Lista de Uso de Memória de Vídeo por Recurso:"
 
 msgid "Total:"
 msgstr "Total:"
@@ -1997,7 +2134,7 @@ msgid "Set From Tree"
 msgstr "Definir a Partir da Árvore"
 
 msgid "Export measures as CSV"
-msgstr "Exporta medidas como CSV"
+msgstr "Exportar medidas como CSV"
 
 msgid "Search Replacement For:"
 msgstr "Procurar Substituto Para:"
@@ -2010,14 +2147,14 @@ msgid ""
 "Changes will only take effect when reloaded."
 msgstr ""
 "A cena '%s' está sendo editada no momento.\n"
-"As alterações só terão efeito quando recarregadas."
+"Suas alterações só serão aplicadas ao recarregar."
 
 msgid ""
 "Resource '%s' is in use.\n"
 "Changes will only take effect when reloaded."
 msgstr ""
-"O recurso '%s' está em uso.\n"
-"As alterações só terão efeito quando recarregadas."
+"O recurso '%s' está sendo usado no momento.\n"
+"Suas alterações só serão aplicadas ao recarregar."
 
 msgid "Dependencies"
 msgstr "Dependências"
@@ -2062,7 +2199,7 @@ msgid ""
 "Depending on your filesystem configuration, the files will either be moved to "
 "the system trash or deleted permanently."
 msgstr ""
-"Remover os arquivos selecionados do projeto? (Não pode ser desfeito.)\n"
+"Remover os arquivos selecionados do projeto? (Irreversível.)\n"
 "Dependendo da configuração do sistema de arquivos, os arquivos serão movidos "
 "para a lixeira do sistema ou excluídos permanentemente."
 
@@ -2082,6 +2219,12 @@ msgstr ""
 msgid "Cannot remove:"
 msgstr "Não pode remover:"
 
+msgid "Files to be deleted:"
+msgstr "Arquivos a serem excluídos:"
+
+msgid "Dependencies of files to be deleted:"
+msgstr "Dependências de arquivos a serem excluídos:"
+
 msgid "Error loading:"
 msgstr "Erro ao carregar:"
 
@@ -2116,16 +2259,28 @@ msgid "Resources Without Explicit Ownership:"
 msgstr "Recursos Sem Vínculo Explícito:"
 
 msgid "Name cannot be empty."
-msgstr "O Nome não pode ser vazio."
+msgstr "O nome não pode estar vazio."
+
+msgid "File name can't end with /."
+msgstr "Nome de arquivo não pode terminar em /."
+
+msgid "File name cannot be empty."
+msgstr "Nome de arquivo não pode estar vazio."
 
 msgid "Folder name cannot be empty."
-msgstr "Nome da pasta não poder ser vazio."
+msgstr "Nome da pasta não pode estar vazio."
+
+msgid "File name contains invalid characters."
+msgstr "Nome de arquivo contém caracteres inválidos."
 
 msgid "Folder name contains invalid characters."
-msgstr "O nome da pasta contém caracteres inválidos."
+msgstr "Nome da pasta contém caracteres inválidos."
 
 msgid "File name begins with a dot."
-msgstr "O nome do arquivo começa com um ponto."
+msgstr "Nome de arquivo começa com um ponto."
+
+msgid "Folder name begins with a dot."
+msgstr "Nome da pasta começa com um ponto."
 
 msgid "File with that name already exists."
 msgstr "Um arquivo com esse nome já existe."
@@ -2136,11 +2291,24 @@ msgstr "Uma pasta com esse nome já existe."
 msgid "Using slashes in folder names will create subfolders recursively."
 msgstr "Usar barras em nome de pastas irá criar subpastas recursivamente."
 
+msgid ""
+"Using slashes in path will create the file in subfolder, creating new "
+"subfolders if necessary."
+msgstr ""
+"Usar barras no caminho criará o arquivo em uma subpasta, criando novas "
+"subpastas se necessário."
+
+msgid "File name is valid."
+msgstr "O nome do arquivo é válido."
+
+msgid "Base path: %s"
+msgstr "Caminho base: %s"
+
 msgid "Folder name is valid."
 msgstr "O nome da pasta é válido."
 
 msgid "Double-click to open in browser."
-msgstr "Faça um duplo clique para abrir no navegador."
+msgstr "Clique duplo para abrir no navegador."
 
 msgid "Thanks from the Godot community!"
 msgstr "Agradecimentos da comunidade Godot!"
@@ -2177,7 +2345,7 @@ msgid "Silver Sponsors"
 msgstr "Patrocinadores Prata"
 
 msgid "Diamond Members"
-msgstr "Patrocinadores Diamante"
+msgstr "Membros Diamante"
 
 msgid "Titanium Members"
 msgstr "Membros Titânio"
@@ -2203,7 +2371,7 @@ msgid ""
 "an exhaustive list of all such third-party components with their respective "
 "copyright statements and license terms."
 msgstr ""
-"Godot Engine depende de várias bibliotecas de código aberto e gratuitas de "
+"Godot Engine depende de várias bibliotecas livres e de código aberto de "
 "terceiros, todas compatíveis com os termos de sua licença MIT. Veja abaixo a "
 "lista completa de todos esses componentes de terceiros com suas respectivas "
 "declarações de direitos autorais e termos de licença."
@@ -2225,8 +2393,8 @@ msgstr "%s (já existe)"
 
 msgid "%d file conflicts with your project and won't be installed"
 msgid_plural "%d files conflict with your project and won't be installed"
-msgstr[0] "%d arquivo esta em conflito com seu projeto e não será instalado"
-msgstr[1] "%d arquivos estão em conflito com seu projeto e não serão instalados"
+msgstr[0] "Arquivo %d está em conflito com seu projeto e não será instalado"
+msgstr[1] "Arquivos %d estão em conflito com seu projeto e não serão instalados"
 
 msgid "This asset doesn't have a root directory, so it can't be ignored."
 msgstr "Este recurso não possui um diretório raiz, então não pode ser ignorado."
@@ -2235,7 +2403,7 @@ msgid "Ignore the root directory when extracting files."
 msgstr "Ignorar o diretório raiz ao extrair os arquivos."
 
 msgid "Select Install Folder"
-msgstr "Selecionar pasta para instalação"
+msgstr "Selecionar Pasta para Instalação"
 
 msgid "Uncompressing Assets"
 msgstr "Descompactando Recursos"
@@ -2260,7 +2428,7 @@ msgstr ""
 "Abra a lista de conteúdos do recurso e selecione quais arquivos instalar."
 
 msgid "Change Install Folder"
-msgstr "Alterar local de instalação"
+msgstr "Alterar Local de Instalação"
 
 msgid ""
 "Change the folder where the contents of the asset are going to be installed."
@@ -2273,16 +2441,16 @@ msgid "No files conflict with your project"
 msgstr "Nenhum arquivo conflita com o seu projeto"
 
 msgid "Show contents of the asset and conflicting files."
-msgstr "Mostrar o conteúdo do Recurso e arquivos conflitantes."
+msgstr "Mostrar o conteúdo do recurso e arquivos conflitantes."
 
 msgid "Contents of the asset:"
-msgstr "Conteúdos do Recurso:"
+msgstr "Conteúdos do recurso:"
 
 msgid "Installation preview:"
-msgstr "Pré-visualização da Instalação:"
+msgstr "Pré-visualização da instalação:"
 
 msgid "Configure Asset Before Installing"
-msgstr "Configurar Recurso antes de instalar"
+msgstr "Configurar Recurso Antes de Instalar"
 
 msgid "Install"
 msgstr "Instalar"
@@ -2306,10 +2474,10 @@ msgid "Toggle Audio Bus Mute"
 msgstr "Alternar Silenciamento do Canal de Áudio"
 
 msgid "Toggle Audio Bus Bypass Effects"
-msgstr "Alternar Efeitos de Desvio do Canal de Áudio"
+msgstr "Alternar Ignorar Efeitos do Canal de Áudio"
 
 msgid "Select Audio Bus Send"
-msgstr "Selecionar Canal de Áudio para Envio"
+msgstr "Selecionar Envio do Canal de Áudio"
 
 msgid "Add Audio Bus Effect"
 msgstr "Adicionar Efeito ao Canal de Áudio"
@@ -2321,7 +2489,7 @@ msgid "Delete Bus Effect"
 msgstr "Excluir Efeito de Canal"
 
 msgid "Drag & drop to rearrange."
-msgstr "Arrastar e soltar para reorganizar."
+msgstr "Arraste para reorganizar."
 
 msgid "Solo"
 msgstr "Solo"
@@ -2414,7 +2582,10 @@ msgid "Audio Bus Layout"
 msgstr "Layout de Canais de Áudio"
 
 msgid "Invalid name."
-msgstr "Nome invalido."
+msgstr "Nome inválido."
+
+msgid "Must be a valid Unicode identifier."
+msgstr "Deve ser um identificador Unicode válido."
 
 msgid "Must not collide with an existing engine class name."
 msgstr "Não deve coincidir com um nome de classe existente na engine."
@@ -2429,7 +2600,7 @@ msgid "Must not collide with an existing global constant name."
 msgstr "Não deve coincidir com um nome de constante global existente."
 
 msgid "Keyword cannot be used as an Autoload name."
-msgstr "As palavras-chave não podem ser usadas como nomes de Autocarregamento."
+msgstr "Palavra-chave não pode ser usada como nome de Autoload."
 
 msgid "Autoload '%s' already exists!"
 msgstr "Autoload '%s' já existe!"
@@ -2453,7 +2624,7 @@ msgid "Rearrange Autoloads"
 msgstr "Reordenar Autoloads"
 
 msgid "Can't add Autoload:"
-msgstr "Não pode adicionar Autoload:"
+msgstr "Falha ao adicionar Autoload:"
 
 msgid "%s is an invalid path. File does not exist."
 msgstr "%s é um caminho inválido. O arquivo não existe."
@@ -2468,7 +2639,7 @@ msgid "Path:"
 msgstr "Caminho:"
 
 msgid "Set path or press \"%s\" to create a script."
-msgstr "Crie um caminho um pressione \"%s\" para criar um script."
+msgstr "Crie um caminho ou pressione \"%s\" para criar um script."
 
 msgid "Node Name:"
 msgstr "Nome do Nó:"
@@ -2516,10 +2687,10 @@ msgid "SIL Graphite Fonts"
 msgstr "Fontes Grafite SIL"
 
 msgid "Multi-channel Signed Distance Field Font Rendering"
-msgstr "Renderização de Fonte de Campo de Distância Sinalizada Multicanal"
+msgstr "Renderização de Fonte de Campo de Distância com Sinal Multicanal (MSDF)"
 
 msgid "3D Nodes as well as RenderingServer access to 3D features."
-msgstr "Nós 3D, bem como acesso RenderingServer a recursos 3D."
+msgstr "Nós 3D, bem como acesso do RenderingServer a recursos 3D."
 
 msgid "2D Physics nodes and PhysicsServer2D."
 msgstr "Nós de Física 2D e PhysicsServer2D."
@@ -2542,16 +2713,16 @@ msgstr ""
 
 msgid "OpenGL back-end (if disabled, the RenderingDevice back-end is required)."
 msgstr ""
-"OpenGL back-end (se desativado, o back-end RenderingDevice será necessário)."
+"Back-end OpenGL (se desativado, o back-end RenderingDevice será necessário)."
 
 msgid "Vulkan back-end of RenderingDevice."
-msgstr "Vulkan back-end de RenderingDevice."
+msgstr "Back-end Vulkan de RenderingDevice."
 
 msgid ""
 "Fallback implementation of Text Server\n"
 "Supports basic text layouts."
 msgstr ""
-"Implementação alternativa do Servidor de Texto\n"
+"Implementação padrão do Servidor de Texto\n"
 "Suporta layouts de texto básicos."
 
 msgid ""
@@ -2585,7 +2756,7 @@ msgid ""
 "Multi-channel signed distance field font rendering support using msdfgen "
 "library (pre-rendered MSDF fonts can be used even if this option disabled)."
 msgstr ""
-"Suporte de renderização de fonte de campo de distância assinada multicanal "
+"Suporte de renderização de fonte de campo de distância com sinal multicanal "
 "usando a biblioteca msdfgen (fontes MSDF pré-renderizadas podem ser usadas "
 "mesmo se esta opção estiver desativada)."
 
@@ -2613,7 +2784,7 @@ msgid "Nodes and Classes:"
 msgstr "Nós e Classes:"
 
 msgid "File '%s' format is invalid, import aborted."
-msgstr "O formato do arquivo '%s' é inválido, importação abortada."
+msgstr "O formato do arquivo '%s' é inválido, importação cancelada."
 
 msgid "Error saving profile to path: '%s'."
 msgstr "Erro ao salvar perfil no caminho: '%s'."
@@ -2661,7 +2832,7 @@ msgid ""
 "Failed to execute command \"%s\":\n"
 "%s."
 msgstr ""
-"Falhou ao executar comando \"%s\":\n"
+"Falha ao executar comando \"%s\":\n"
 "%s."
 
 msgid "Filter Commands"
@@ -2685,32 +2856,38 @@ msgstr "[vazio]"
 msgid "[unsaved]"
 msgstr "[não salvo]"
 
+msgid "Open the %s dock."
+msgstr "Abrir a aba %s."
+
+msgid "Focus on the %s dock."
+msgstr "Selecionar a aba %s."
+
 msgid "%s - Godot Engine"
 msgstr "%s - Godot Engine"
 
 msgid "Move this dock right one tab."
-msgstr "Mover este dock uma aba para a direita."
+msgstr "Mover esta aba para a direita."
 
 msgid "Move this dock left one tab."
-msgstr "Mover este dock uma aba para a esquerda."
+msgstr "Mover esta aba para a esquerda."
 
 msgid "Dock Position"
-msgstr "Pos. do Dock"
+msgstr "Pos. da Aba"
 
 msgid "Make Floating"
 msgstr "Tornar Flutuante"
 
 msgid "Make this dock floating."
-msgstr "Tornar este dock flutuante."
+msgstr "Tornar esta aba flutuante."
 
 msgid "Move to Bottom"
-msgstr "Mover para o fundo"
+msgstr "Mover para o Fundo"
 
 msgid "Move this dock to the bottom panel."
-msgstr "Mover este dock para o painel inferior."
+msgstr "Mover esta aba para o painel inferior."
 
 msgid "Close this dock."
-msgstr "Fechar este dock."
+msgstr "Fechar esta aba."
 
 msgid "3D Editor"
 msgstr "Editor 3D"
@@ -2725,16 +2902,19 @@ msgid "Scene Tree Editing"
 msgstr "Edição da Árvore de Cena"
 
 msgid "Node Dock"
-msgstr "Dock de Nós"
+msgstr "Aba de Nó"
 
 msgid "FileSystem Dock"
-msgstr "Dock de Sistema de Arquivos"
+msgstr "Aba de Arquivos"
 
 msgid "Import Dock"
-msgstr "Importar Dock"
+msgstr "Aba de Importar"
 
 msgid "History Dock"
-msgstr "Histórico de Dock"
+msgstr "Aba de Histórico"
+
+msgid "Game View"
+msgstr "Visão de Jogo"
 
 msgid "Allows to view and edit 3D scenes."
 msgstr "Permite visualizar e editar cenas 3D."
@@ -2746,35 +2926,38 @@ msgid "Provides built-in access to the Asset Library."
 msgstr "Fornece acesso integrado à Biblioteca de Recursos."
 
 msgid "Allows editing the node hierarchy in the Scene dock."
-msgstr "Permite editar a hierarquia do nó no painel Cena."
+msgstr "Permite editar a hierarquia de nós na aba Cena."
 
 msgid ""
 "Allows to work with signals and groups of the node selected in the Scene dock."
-msgstr "Permite trabalhar com sinais e grupos do nó selecionado no painel Cena."
+msgstr "Permite trabalhar com sinais e grupos do nó selecionado na aba Cena."
 
 msgid "Allows to browse the local file system via a dedicated dock."
 msgstr ""
-"Permite navegar pelo sistema de arquivos local através de um painel dedicado."
+"Permite navegar pelo sistema de arquivos local através de uma aba dedicada."
 
 msgid ""
 "Allows to configure import settings for individual assets. Requires the "
 "FileSystem dock to function."
 msgstr ""
 "Permite definir as configurações de importação para recursos individuais. "
-"Requer o painel Arquivos para funcionar."
+"Requer a aba de Arquivos para funcionar."
 
 msgid "Provides an overview of the editor's and each scene's undo history."
 msgstr ""
-"Fornece uma visão geral do editor e do histórico de desfazer de cada cena."
+"Fornece uma visão geral do histórico de desfazer do editor e de cada cena."
+
+msgid "Provides tools for selecting and debugging nodes at runtime."
+msgstr "Fornece ferramentas para selecionar e depurar nós durante a execução."
 
 msgid "(current)"
 msgstr "(atual)"
 
 msgid "(none)"
-msgstr "(Nenhum)"
+msgstr "(nenhum)"
 
 msgid "Remove currently selected profile, '%s'? Cannot be undone."
-msgstr "Remover o perfil selecionado, '%s'? Não pode ser desfeito."
+msgstr "Remover o perfil selecionado, '%s'? Isso é irreversível."
 
 msgid "Profile must be a valid filename and must not contain '.'"
 msgstr "O perfil precisa ter um nome de arquivo válido e não pode conter '.'"
@@ -2806,7 +2989,7 @@ msgstr "Características Principais:"
 msgid ""
 "Profile '%s' already exists. Remove it first before importing, import aborted."
 msgstr ""
-"Perfil '%s' já existe. Remova-o antes de importar, importação interrompida."
+"Perfil '%s' já existe. Remova-o antes de importar, importação cancelada."
 
 msgid "Reset to Default"
 msgstr "Restaurar Padrão"
@@ -2846,7 +3029,7 @@ msgid "New profile name:"
 msgstr "Novo nome de perfil:"
 
 msgid "Godot Feature Profile"
-msgstr "Perfil de Funcionalidades Godot"
+msgstr "Perfil de Funcionalidades do Godot"
 
 msgid "Import Profile(s)"
 msgstr "Importar Perfil/Perfis"
@@ -2854,6 +3037,30 @@ msgstr "Importar Perfil/Perfis"
 msgid "Manage Editor Feature Profiles"
 msgstr "Gerenciar Perfis de Funcionalidades do Editor"
 
+msgid "Project initialization"
+msgstr "Inicialização do Projeto"
+
+msgid "Scanning file structure..."
+msgstr "Escaneando estrutura de arquivos..."
+
+msgid "Loading global class names..."
+msgstr "Carregando nomes de classe globais..."
+
+msgid "Verifying GDExtensions..."
+msgstr "Verificando GDExtensions..."
+
+msgid "Creating autoload scripts..."
+msgstr "Criando scripts autoload..."
+
+msgid "Initializing plugins..."
+msgstr "Inicializando plugins..."
+
+msgid "Starting file scan..."
+msgstr "Iniciando escaneamento de arquivos..."
+
+msgid "Scanning actions..."
+msgstr "Escaneando ações..."
+
 msgid "Some extensions need the editor to restart to take effect."
 msgstr ""
 "Algumas extensões precisam que o editor seja reiniciado para terem efeito."
@@ -2867,19 +3074,43 @@ msgstr "Salvar & Reiniciar"
 msgid "ScanSources"
 msgstr "Buscar Fontes"
 
+msgid "Registering global classes..."
+msgstr "Registrando classes globais..."
+
+msgid "Updating scripts documentation"
+msgstr "Atualizando documentação dos scripts"
+
+msgid "Updating Scene Groups"
+msgstr "Atualizando Grupos de Cenas"
+
 msgid ""
 "There are multiple importers for different types pointing to file %s, import "
 "aborted"
 msgstr ""
 "Existem múltiplos importadores para diferentes tipos que apontam para o "
-"arquivo %s, importação abortada"
+"arquivo %s, importação cancelada"
 
 msgid "(Re)Importing Assets"
 msgstr "(Re)Importando Recursos"
 
+msgid "Preparing files to reimport..."
+msgstr "Preparando arquivos para reimportação..."
+
+msgid "Executing pre-reimport operations..."
+msgstr "Executando operações pré-reimportação..."
+
 msgid "Import resources of type: %s"
 msgstr "Importar recursos do tipo: %s"
 
+msgid "Finalizing Asset Import..."
+msgstr "Finalizando Importação de Recursos..."
+
+msgid "Executing post-reimport operations..."
+msgstr "Executando operações pós-reimportação..."
+
+msgid "Copying files..."
+msgstr "Copiando arquivos..."
+
 msgid "This method supports a variable number of arguments."
 msgstr "Este método suporta um número variável de argumentos."
 
@@ -2904,11 +3135,15 @@ msgstr ""
 "Este método não precisa de uma instância para ser chamado.\n"
 "Ele pode ser chamado diretamente usando o nome da classe."
 
+msgid "Code snippet copied to clipboard."
+msgstr "Fragmento de código copiado para a área de transferência."
+
 msgid "No return value."
 msgstr "Sem valor de retorno."
 
 msgid "This value is an integer composed as a bitmask of the following flags."
-msgstr "Este valor é um integer composto como um bitmask das seguintes flags."
+msgstr ""
+"Este valor é um inteiro composto como um bitmask dos sinalizadores a seguir."
 
 msgid "Deprecated"
 msgstr "Obsoleto"
@@ -2920,7 +3155,7 @@ msgid "Deprecated:"
 msgstr "Obsoleto:"
 
 msgid "Experimental:"
-msgstr "Recurso Experimental:"
+msgstr "Experimental:"
 
 msgid "Constructors"
 msgstr "Construtores"
@@ -2932,19 +3167,19 @@ msgid "Method Descriptions"
 msgstr "Descrições do Método"
 
 msgid "Constructor Descriptions"
-msgstr "Descrições da Propriedade"
+msgstr "Descrições do Construtor"
 
 msgid "Operator Descriptions"
 msgstr "Descrições do Operador"
 
 msgid "This method may be changed or removed in future versions."
-msgstr "Este método mudará ou será removido em versões futuras."
+msgstr "Este método poderá mudar ou ser removido em versões futuras."
 
 msgid "This constructor may be changed or removed in future versions."
-msgstr "Este construtor mudará ou será removido em versões futuras."
+msgstr "Este construtor poderá mudar ou ser removido em versões futuras."
 
 msgid "This operator may be changed or removed in future versions."
-msgstr "Este operador mudará ou será removido em versões futuras."
+msgstr "Este operador poderá mudar ou ser removido em versões futuras."
 
 msgid "Error codes returned:"
 msgstr "Códigos de erro retornados:"
@@ -2962,22 +3197,22 @@ msgid ""
 "There is currently no description for this method. Please help us by "
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
-"Atualmente não há uma descrição para este método. nos ajude com [color=$color]"
-"[url=$url]contribuindo com uma[/url][/color]!"
+"Atualmente não há uma descrição para este método. Ajude-nos [color=$color]"
+"[url=$url]criando uma[/url][/color]!"
 
 msgid ""
 "There is currently no description for this constructor. Please help us by "
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
 "Atualmente não há uma descrição para este construtor. Ajude-nos [color=$color]"
-"[url=$url]contribuindo com uma[/url][/color]!"
+"[url=$url]criando uma[/url][/color]!"
 
 msgid ""
 "There is currently no description for this operator. Please help us by "
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
 "Atualmente não há descrição para este operador. Ajude-nos [color=$color]"
-"[url=$url]contribuindo com uma[/url][/color]!"
+"[url=$url]criando uma[/url][/color]!"
 
 msgid "Top"
 msgstr "Superior"
@@ -2986,7 +3221,7 @@ msgid "Class:"
 msgstr "Classe:"
 
 msgid "This class may be changed or removed in future versions."
-msgstr "Esta classe mudará ou será removida em versões futuras."
+msgstr "Esta classe poderá mudar ou ser removida em versões futuras."
 
 msgid "Inherits:"
 msgstr "Herda:"
@@ -3005,7 +3240,7 @@ msgid ""
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
 "Atualmente não há descrição para esta classe. Ajude-nos [color=$color]"
-"[url=$url]contribuindo com uma[/url][/color]!"
+"[url=$url]criando uma[/url][/color]!"
 
 msgid "Note:"
 msgstr "Observação:"
@@ -3054,6 +3289,10 @@ msgstr "Ícones"
 msgid "Styles"
 msgstr "Estilos"
 
+msgid "This theme property may be changed or removed in future versions."
+msgstr ""
+"Esta propriedade de tema poderá mudar ou ser removida em versões futuras."
+
 msgid "There is currently no description for this theme property."
 msgstr "Atualmente não há descrição para esta propriedade do tema."
 
@@ -3062,10 +3301,10 @@ msgid ""
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
 "Atualmente não há descrição para esta propriedade do tema. Ajude-nos "
-"[color=$color][url=$url]contribuindo com uma[/url][/color]!"
+"[color=$color][url=$url]criando uma[/url][/color]!"
 
 msgid "This signal may be changed or removed in future versions."
-msgstr "Este sinal mudará ou será removido em versões futuras."
+msgstr "Este sinal pode mudar ou ser removido em versões futuras."
 
 msgid "There is currently no description for this signal."
 msgstr "Atualmente não há descrição para este sinal."
@@ -3075,29 +3314,29 @@ msgid ""
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
 "Atualmente não há descrição para este sinal. Ajude-nos [color=$color]"
-"[url=$url]contribuindo com uma[/url][/color]!"
+"[url=$url]criando uma[/url][/color]!"
 
 msgid "Enumerations"
 msgstr "Enumerações"
 
 msgid "This enumeration may be changed or removed in future versions."
-msgstr "Este enumerador mudará ou será removido em versões futuras."
+msgstr "Este enumerador poderá mudar ou ser removido em versões futuras."
 
 msgid "This constant may be changed or removed in future versions."
-msgstr "Esta constante mudará ou será removida em versões futuras."
+msgstr "Esta constante poderá mudar ou ser removida em versões futuras."
 
 msgid "Annotations"
 msgstr "Anotações"
 
 msgid "There is currently no description for this annotation."
-msgstr "No momento, não há descrição para esta anotação."
+msgstr "Atualmente não há descrição para esta anotação."
 
 msgid ""
 "There is currently no description for this annotation. Please help us by "
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
-"No momento, não há descrição para esta anotação. Ajude-nos [color=$color]"
-"[url=$url]contribuindo com uma[/url][/color]!"
+"Atualmente não há descrição para esta anotação. Ajude-nos [color=$color]"
+"[url=$url]criando uma[/url][/color]!"
 
 msgid "Property Descriptions"
 msgstr "Descrições da Propriedade"
@@ -3106,7 +3345,7 @@ msgid "(value)"
 msgstr "(valor)"
 
 msgid "This property may be changed or removed in future versions."
-msgstr "Esta propriedade mudará ou será removida em versões futuras."
+msgstr "Esta propriedade poderá mudar ou ser removida em versões futuras."
 
 msgid "There is currently no description for this property."
 msgstr "Atualmente não há descrição para esta propriedade."
@@ -3116,7 +3355,7 @@ msgid ""
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
 "Atualmente não há descrição para esta propriedade. Ajude-nos [color=$color]"
-"[url=$url]contribuindo com uma[/url][/color]!"
+"[url=$url]criando uma[/url][/color]!"
 
 msgid ""
 "[b]Note:[/b] The returned array is [i]copied[/i] and any changes to it will "
@@ -3131,11 +3370,17 @@ msgstr "Editor"
 msgid "Click to copy."
 msgstr "Clique para copiar."
 
+msgid "Click to open in browser."
+msgstr "Clique duplo para abrir no navegador."
+
 msgid "No description available."
-msgstr "Sem descrição disponível."
+msgstr "Nenhuma descrição disponível."
+
+msgid "This annotation may be changed or removed in future versions."
+msgstr "Esta anotação poderá mudar ou ser removida em versões futuras."
 
 msgid "Show in FileSystem"
-msgstr "Mostrar em Arquivos"
+msgstr "Mostrar nos Arquivos"
 
 msgid "Open in File Manager"
 msgstr "Abrir no Gerenciador de Arquivos"
@@ -3143,12 +3388,24 @@ msgstr "Abrir no Gerenciador de Arquivos"
 msgid "Class"
 msgstr "Classe"
 
+msgid "Enumeration"
+msgstr "Enumeração"
+
 msgid "Constant"
 msgstr "Constante"
 
+msgid "Metadata"
+msgstr "Metadados"
+
+msgid "Setting"
+msgstr "Configuração"
+
 msgid "Property"
 msgstr "Propriedade"
 
+msgid "Internal Property"
+msgstr "Propriedade Interna"
+
 msgid "This property can only be set in the Inspector."
 msgstr "Esta propriedade só pode ser definida no Inspetor."
 
@@ -3162,11 +3419,38 @@ msgid "Signal"
 msgstr "Sinal"
 
 msgid "Annotation"
-msgstr "Anotações"
+msgstr "Anotação"
+
+msgid "Local Constant"
+msgstr "Constante Local"
+
+msgid "Local Variable"
+msgstr "Variável Local"
+
+msgid "This variable may be changed or removed in future versions."
+msgstr "Esta variável poderá mudar ou ser removida em versões futuras."
+
+msgid "TextFile"
+msgstr "Arquivo de Texto"
 
 msgid "File"
 msgstr "Arquivo"
 
+msgid "Directory"
+msgstr "Pasta"
+
+msgid "Invalid UID"
+msgstr "UID inválido"
+
+msgid "This UID does not point to any valid Resource."
+msgstr "Este UID não aponta para nenhum Recurso válido."
+
+msgid "Invalid path"
+msgstr "Caminho inválido"
+
+msgid "This path does not exist."
+msgstr "Este caminho não existe."
+
 msgid "%d match."
 msgstr "%d corresponde."
 
@@ -3224,14 +3508,29 @@ msgstr "Tipo de Membro"
 msgid "Keywords"
 msgstr "Palavras-Chave"
 
+msgid "Matches the \"%s\" keyword."
+msgstr "Corresponde com a palavra-chave \"%s\"."
+
 msgid "This member is marked as deprecated."
 msgstr "Este membro está marcado como obsoleto."
 
 msgid "This member is marked as experimental."
 msgstr "Este membro está marcado como experimental."
 
+msgid "Unfavorite Property"
+msgstr "Desfavoritar Propriedade"
+
+msgid "Make this property be put back at its original place."
+msgstr "Colocar esta propriedade de volta no seu lugar original."
+
+msgid "Favorite Property"
+msgstr "Favoritar Propriedade"
+
+msgid "Make this property be placed at the top for all objects of this class."
+msgstr "Colocar esta propriedade no topo para todos os objetos com esta classe."
+
 msgid "Pin Value"
-msgstr "Fixar valor"
+msgstr "Fixar Valor"
 
 msgid "Pin Value [Disabled because '%s' is editor-only]"
 msgstr "Fixar Valor [Desabilitado porque '%s' é restrito ao editor]"
@@ -3239,27 +3538,29 @@ msgstr "Fixar Valor [Desabilitado porque '%s' é restrito ao editor]"
 msgid "Pinning a value forces it to be saved even if it's equal to the default."
 msgstr "Fixar um valor força que ele seja salvo mesmo que seja igual ao padrão."
 
+msgid "Unfavorite All"
+msgstr "Desfavoritar Tudo"
+
 msgid "(%d change)"
 msgid_plural "(%d changes)"
 msgstr[0] "(%d alteração)"
 msgstr[1] "(%d alterações)"
 
 msgid "Add element to property array with prefix %s."
-msgstr "Adicionar o elemento para a matriz de propriedades com prefixo %s."
+msgstr "Adicionar o elemento para a lista de propriedades com prefixo %s."
 
 msgid "Remove element %d from property array with prefix %s."
-msgstr "Remover o elemento %d da matriz de propriedades com prefixo %s."
+msgstr "Remover o elemento %d da lista de propriedades com prefixo %s."
 
 msgid "Move element %d to position %d in property array with prefix %s."
 msgstr ""
-"Mover o elemento %d para a posição %d na matriz de propriedades com prefixo "
-"%s."
+"Mover o elemento %d para a posição %d na lista de propriedades com prefixo %s."
 
 msgid "Clear Property Array with Prefix %s"
-msgstr "Limpar a matriz de propriedades com prefixo %s"
+msgstr "Apagar Tudo da Lista de Propriedades com Prefixo %s"
 
 msgid "Resize Property Array with Prefix %s"
-msgstr "Redimensionar a matriz de propriedades com prefixo %s"
+msgstr "Redimensionar a Lista de Propriedades com Prefixo %s"
 
 msgid "Element %d: %s%d*"
 msgstr "Elemento %d: %s%d*"
@@ -3277,10 +3578,10 @@ msgid "Insert New After"
 msgstr "Inserir Novo Depois"
 
 msgid "Clear Array"
-msgstr "Limpar Matriz"
+msgstr "Apagar Tudo da Lista"
 
 msgid "Resize Array..."
-msgstr "Redimensionar matriz..."
+msgstr "Redimensionar Lista..."
 
 msgid "Add Element"
 msgstr "Adicionar Elemento"
@@ -3307,10 +3608,10 @@ msgid "Remove metadata %s"
 msgstr "Remover metadados %s"
 
 msgid "Pinned %s"
-msgstr "Fixado %s"
+msgstr "%s fixado"
 
 msgid "Unpinned %s"
-msgstr "%s não fixado"
+msgstr "%s desafixado"
 
 msgid "Add metadata %s"
 msgstr "Adicionar metadados %s"
@@ -3334,22 +3635,22 @@ msgid "Thumbnail..."
 msgstr "Miniatura..."
 
 msgid "Select existing layout:"
-msgstr "Selecione o layout existente:"
+msgstr "Selecione um layout existente:"
 
 msgid "Or enter new layout name"
-msgstr "Ou escolha um novo nome do layoute"
+msgstr "Ou digite um nome para um novo layout"
 
 msgid "Changed Locale Language Filter"
-msgstr "Filtro de Idioma de Localidade Alterado"
+msgstr "Filtro de Localização por Idioma Alterado"
 
 msgid "Changed Locale Script Filter"
-msgstr "Filtro de Script de Localidade Alterado"
+msgstr "Filtro de Localização por Script Alterado"
 
 msgid "Changed Locale Country Filter"
-msgstr "Filtro de Localidade por País Alterado"
+msgstr "Filtro de Localização por País Alterado"
 
 msgid "Changed Locale Filter Mode"
-msgstr "Modo do Filtro de Idioma Alterado"
+msgstr "Modo do Filtro de Localização Alterado"
 
 msgid "[Default]"
 msgstr "[Padrão]"
@@ -3367,7 +3668,7 @@ msgid "Edit Filters"
 msgstr "Editar Filtros"
 
 msgid "Language:"
-msgstr "Linguagem:"
+msgstr "Idioma:"
 
 msgctxt "Locale"
 msgid "Script:"
@@ -3387,13 +3688,13 @@ msgid "Country"
 msgstr "País"
 
 msgid "Variant"
-msgstr "Variante"
+msgstr "Variação"
 
 msgid "Filter Messages"
 msgstr "Filtrar Mensagens"
 
 msgid "Clear Output"
-msgstr "Limpar Saída"
+msgstr "Apagar Saída"
 
 msgid "Copy Selection"
 msgstr "Copiar Seleção"
@@ -3405,7 +3706,7 @@ msgstr ""
 "ocorrências."
 
 msgid "Focus Search/Filter Bar"
-msgstr "Barra de Busca/Filtro"
+msgstr "Selecionar Barra de Busca/Filtro"
 
 msgid "Toggle visibility of standard output messages."
 msgstr "Alternar a visibilidade das mensagens de saída padrão."
@@ -3420,18 +3721,23 @@ msgid "Toggle visibility of editor messages."
 msgstr "Alternar a visibilidade das mensagens do editor."
 
 msgid "Native Shader Source Inspector"
-msgstr "Inspetor Nativo de Shader"
+msgstr "Inspetor de Shaders Nativos"
 
 msgid "Unnamed Project"
 msgstr "Projeto Sem Nome"
 
+msgid "Recovery Mode is enabled. Editor functionality has been restricted."
+msgstr ""
+"O Modo de Recuperação está ativado. Algumas funções do editor estão "
+"indisponíveis."
+
 msgid ""
 "Spins when the editor window redraws.\n"
 "Update Continuously is enabled, which can increase power usage. Click to "
 "disable it."
 msgstr ""
 "Gira quando a janela do editor é redesenhada.\n"
-"Atualizar continuamente está ativado, o que pode aumentar o uso de energia. "
+"Atualizar Continuamente está ativado, o que pode aumentar o uso de energia. "
 "Clique para desativá-lo."
 
 msgid "Spins when the editor window redraws."
@@ -3450,8 +3756,8 @@ msgid ""
 "This resource can't be saved because it does not belong to the edited scene. "
 "Make it unique first."
 msgstr ""
-"O recurso não pode ser salvo porque não pertence à cena editada. Faça-o único "
-"primeiro."
+"O recurso não pode ser salvo porque não pertence à cena editada. Torne-o "
+"único primeiro."
 
 msgid ""
 "This resource can't be saved because it was imported from another file. Make "
@@ -3481,7 +3787,7 @@ msgid "Error while parsing file '%s'."
 msgstr "Erro ao salvar o arquivo '%s'."
 
 msgid "Scene file '%s' appears to be invalid/corrupt."
-msgstr "Arquivo de cena '%s' aparenta estar inválido/corrupto."
+msgstr "Arquivo de cena '%s' parece estar inválido/corrompido."
 
 msgid "Missing file '%s' or one of its dependencies."
 msgstr "Não foi encontrado arquivo %s ou uma de suas dependências."
@@ -3490,8 +3796,8 @@ msgid ""
 "File '%s' is saved in a format that is newer than the formats supported by "
 "this version of Godot, so it can't be opened."
 msgstr ""
-"O arquivo '%s' está salvo em um formato mais novo do que aqueles suportados "
-"por esta versão do Godot, e não pode ser aberto."
+"O arquivo '%s' foi salvo em um formato mais recente do que esta versão do "
+"Godot suporta, então não pode ser aberto."
 
 msgid "Error while loading file '%s'."
 msgstr "Erro ao carregar arquivo '%s'."
@@ -3513,13 +3819,13 @@ msgid ""
 "Please resolve it and then attempt to save again."
 msgstr ""
 "Esta cena não pode ser salva porque há uma inclusão de instância cíclica.\n"
-"Por favor a resolva e tente novamente."
+"Por favor resolva e tente novamente."
 
 msgid ""
 "Couldn't save scene. Likely dependencies (instances or inheritance) couldn't "
 "be satisfied."
 msgstr ""
-"Não é possível salvar a cena. Provavelmente dependências (instâncias ou "
+"Erro ao salvar a cena. Provavelmente suas dependências (instâncias ou "
 "herança) não foram satisfeitas."
 
 msgid "Save scene before running..."
@@ -3532,7 +3838,7 @@ msgid "Save All Scenes"
 msgstr "Salvar Todas as Cenas"
 
 msgid "Can't overwrite scene that is still open!"
-msgstr "Não é possível sobrescrever a cena que ainda está aberta!"
+msgstr "Não é possível sobrescrever uma cena que ainda está aberta!"
 
 msgid "Merge With Existing"
 msgstr "Mesclar com o Existente"
@@ -3603,10 +3909,10 @@ msgstr ""
 "Esta cena foi importada, então as alterações nela não serão mantidas.\n"
 "Instanciar ou herdá-la permitirá que você faça alterações nela.\n"
 "Leia a documentação relevante para importar cenas para entender melhor esse "
-"fluxo de trabalho."
+"procedimento."
 
 msgid "Changes may be lost!"
-msgstr "As alterações podem ser perdidas!"
+msgstr "Suas alterações podem ser perdidas!"
 
 msgid "This object is read-only."
 msgstr "Este objeto é somente leitura."
@@ -3623,18 +3929,21 @@ msgid ""
 "or plugin data were saved anyway."
 msgstr ""
 "A cena atual não tem um nó raiz, mas %d recurso(s) externo(s) modificado(s) e/"
-"ou dados de plugin foram salvos de qualquer forma."
+"ou dados de plugin foram salvos mesmo assim."
 
 msgid ""
 "A root node is required to save the scene. You can add a root node using the "
 "Scene tree dock."
 msgstr ""
 "Um nó-raiz é necessário para salvar a cena. Você pode adicionar um nó-raiz "
-"usando a painel da árvore de cenas."
+"usando a aba da Cena."
 
 msgid "Save Scene As..."
 msgstr "Salvar Cena Como..."
 
+msgid "Pack Project as ZIP..."
+msgstr "Compactar Projeto como ZIP..."
+
 msgid "Can't undo while mouse buttons are pressed."
 msgstr "Não pode desfazer enquanto os botões do mouse estiverem pressionados."
 
@@ -3648,7 +3957,7 @@ msgid "Remote Undo: %s"
 msgstr "Desfazer Remoto: %s"
 
 msgid "Scene Undo: %s"
-msgstr "Cena Desfeita: %s"
+msgstr "Desfazer em Cena: %s"
 
 msgid "Can't redo while mouse buttons are pressed."
 msgstr "Não pode refazer enquanto os botões do mouse estiverem pressionados."
@@ -3663,7 +3972,7 @@ msgid "Remote Redo: %s"
 msgstr "Refazer Remoto: %s"
 
 msgid "Scene Redo: %s"
-msgstr "Refazer Cena: %s"
+msgstr "Refazer em Cena: %s"
 
 msgid "Can't reload a scene that was never saved."
 msgstr "Não foi possível recarregar a cena pois nunca foi salva."
@@ -3676,7 +3985,7 @@ msgid ""
 "Reload the saved scene anyway? This action cannot be undone."
 msgstr ""
 "A cena atual possui alterações não salvas.\n"
-"Recarregar a cena salva mesmo assim? Essa ação não poderá ser desfeita."
+"Recarregar a cena salva mesmo assim? Essa ação é irreversível."
 
 msgid "Save & Reload"
 msgstr "Salvar & Recarregar"
@@ -3685,7 +3994,7 @@ msgid "Save modified resources before reloading?"
 msgstr "Salvar recursos modificados antes de recarregar?"
 
 msgid "Save & Quit"
-msgstr "Salvar & Sair"
+msgstr "Salvar e Sair"
 
 msgid "Save modified resources before closing?"
 msgstr "Salvar recursos modificados antes de fechar?"
@@ -3705,8 +4014,8 @@ msgid ""
 "This option is deprecated. Situations where refresh must be forced are now "
 "considered a bug. Please report."
 msgstr ""
-"Esta opção está depreciada. Situações onde atualizações devem ser forçadas "
-"são agora consideradas bugs. Por favor reporte."
+"Esta opção é obsoleta. Situações onde atualizações devem ser forçadas são "
+"agora consideradas bugs. Por favor reporte."
 
 msgid "Pick a Main Scene"
 msgstr "Escolha uma Cena Principal"
@@ -3717,6 +4026,9 @@ msgstr "Esta operação não pode ser feita sem uma cena."
 msgid "Export Mesh Library"
 msgstr "Exportar Biblioteca de Malhas"
 
+msgid "Quick Open Color Palette..."
+msgstr "Seletor Rápido de Paleta de Cores..."
+
 msgid "Unable to enable addon plugin at: '%s' parsing of config failed."
 msgstr ""
 "Não foi possível ativar o plugin em: '%s' processamento da configuração "
@@ -3726,28 +4038,26 @@ msgid "Unable to find script field for addon plugin at: '%s'."
 msgstr "Não foi possível encontrar o campo script para o plugin em: '%s'."
 
 msgid "Unable to load addon script from path: '%s'."
-msgstr ""
-"Não foi possível localizar a área do script para o complemento do plugin em: "
-"'%s'."
+msgstr "Erro ao carregar script do plugin no caminho: '%s'."
 
 msgid ""
 "Unable to load addon script from path: '%s'. This might be due to a code "
 "error in that script.\n"
 "Disabling the addon at '%s' to prevent further errors."
 msgstr ""
-"Não foi possível carregar o script de complemento do caminho: '%s'. Isso pode "
-"ser devido a um erro de código nesse script.\n"
-"Desativando o complemento em '%s' para evitar mais erros."
+"Não foi possível carregar o script de plugin do caminho: '%s'. Isso pode ser "
+"devido a um erro de código nesse script.\n"
+"Desativando o plugin em '%s' para evitar mais erros."
 
 msgid ""
 "Unable to load addon script from path: '%s'. Base type is not 'EditorPlugin'."
 msgstr ""
-"Não foi possível carregar o script complementar do caminho: '%s' Tipo base "
-"não é 'EditorPlugin'."
+"Não foi possível carregar o script do plugin no caminho: '%s' Tipo base não é "
+"'EditorPlugin'."
 
 msgid "Unable to load addon script from path: '%s'. Script is not in tool mode."
 msgstr ""
-"Não foi possível carregar o script complementar do caminho: '%s'.O script não "
+"Não foi possível carregar o script do plugin no caminho: '%s'. O script não "
 "está em modo ferramenta."
 
 msgid ""
@@ -3796,11 +4106,60 @@ msgstr ""
 "Janelas > Habilitar está desabilitado nas configurações do editor."
 
 msgid "Clear Recent Scenes"
-msgstr "Limpar Cenas Recentes"
+msgstr "Apagar Lista de Cenas Recentes"
 
 msgid "There is no defined scene to run."
 msgstr "Não há cena definida para executar."
 
+msgid "Loading editor"
+msgstr "Carregando editor"
+
+msgid "Loading editor layout..."
+msgstr "Carregando layout do editor..."
+
+msgid "Loading docks..."
+msgstr "Carregando abas..."
+
+msgid "Reopening scenes..."
+msgstr "Reabrindo cenas..."
+
+msgid "Loading central editor layout..."
+msgstr "Carregando layout do editor central..."
+
+msgid "Loading plugin window layout..."
+msgstr "Carregando layout da janela de plugins..."
+
+msgid "Editor layout ready."
+msgstr "Layout do editor pronto."
+
+msgid ""
+"No main scene has ever been defined. Select one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"A cena principal não foi definida. Selecionar uma?\n"
+"Você pode alterá-la mais tarde nas \"Configurações do Projeto\" na categoria "
+"'aplicação'."
+
+msgid ""
+"Selected scene '%s' does not exist. Select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"A cena selecionada '%s' não existe. Selecionar uma válida?\n"
+"Você pode alterá-la mais tarde nas \"Configurações do Projeto\" na categoria "
+"'aplicação'."
+
+msgid ""
+"Selected scene '%s' is not a scene file. Select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"A cena selecionada \"%s\" não é um arquivo de cena. Selecionar uma cena "
+"válida?\n"
+"Você pode alterá-la mais tarde nas \"Configurações do Projeto\" na categoria "
+"'aplicação'."
+
 msgid "Save Layout..."
 msgstr "Salvar Layout..."
 
@@ -3839,22 +4198,22 @@ msgid ""
 "Last saved: %s."
 msgstr ""
 "A cena \"%s\" possui alterações não salvas.\n"
-"Última salva: %s."
+"Salvo pela última vez: %s."
 
 msgid "Save & Close"
-msgstr "Salvar & Fechar"
+msgstr "Salvar e Fechar"
 
 msgid "Save before closing?"
 msgstr "Salvar antes de fechar?"
 
 msgid "%d more files or folders"
-msgstr "%d mais arquivo(s) ou pasta(s)"
+msgstr "Mais %d arquivo(s) ou pasta(s)"
 
 msgid "%d more folders"
-msgstr "%d mais pastas"
+msgstr "Mais %d pastas"
 
 msgid "%d more files"
-msgstr "%d mais arquivo(s)"
+msgstr "Mais %d arquivo(s)"
 
 msgid ""
 "Unable to write to file '%s', file in use, locked or lacking permissions."
@@ -3866,19 +4225,19 @@ msgid "Preparing scenes for reload"
 msgstr "Preparando cenas para recarregamento"
 
 msgid "Analyzing scene %s"
-msgstr "Analisando scene %s"
+msgstr "Analisando cena %s"
 
 msgid "Preparation done."
 msgstr "Preparação concluída."
 
 msgid "Scenes reloading"
-msgstr "Recarregando cenas"
+msgstr "Cenas recarregando"
 
 msgid "Reloading..."
 msgstr "Recarregando..."
 
 msgid "Reloading done."
-msgstr "Recarregar Cena Salva."
+msgstr "Recarregamento finalizado."
 
 msgid ""
 "Changing the renderer requires restarting the editor.\n"
@@ -3888,9 +4247,9 @@ msgid ""
 "- Mobile platforms: %s\n"
 "- Web platform: gl_compatibility"
 msgstr ""
-"A alteração do renderizador requer a reinicialização do editor.\n"
+"Alterar o renderizador requer a reinicialização do editor.\n"
 "\n"
-"Escolher Salvar e Reiniciar, mudará o método de renderização para:\n"
+"Escolha Salvar e Reiniciar para mudar o método de renderização para:\n"
 "- Plataformas de desktop: %s\n"
 "- Dispositivos móveis: %s\n"
 "- Plataforma web: gl_compatibility"
@@ -3908,10 +4267,10 @@ msgid "(Overridden)"
 msgstr "(Sobrescrito)"
 
 msgid "Lock Selected Node(s)"
-msgstr "Bloquear Nó(s) Selecionado(s)"
+msgstr "Trancar Nó(s) Selecionado(s)"
 
 msgid "Unlock Selected Node(s)"
-msgstr "Desbloquear Nó(s) Selecionado(s)"
+msgstr "Destrancar Nó(s) Selecionado(s)"
 
 msgid "Group Selected Node(s)"
 msgstr "Agrupar Nó(s) Selecionado(s)"
@@ -3947,7 +4306,7 @@ msgid "Previous Scene Tab"
 msgstr "Aba de Cena Anterior"
 
 msgid "Focus FileSystem Filter"
-msgstr "Focar Filtro de Arquivos"
+msgstr "Selecionar Filtro de Arquivos"
 
 msgid "Command Palette"
 msgstr "Paleta de Comandos"
@@ -3971,13 +4330,13 @@ msgid "Save Scene"
 msgstr "Salvar Cena"
 
 msgid "Quick Open..."
-msgstr "Abrir Rapidamente..."
+msgstr "Seletor Rápido..."
 
 msgid "Quick Open Scene..."
-msgstr "Abrir Cena Rapidamente..."
+msgstr "Seletor Rápido de Cena..."
 
 msgid "Quick Open Script..."
-msgstr "Abrir Script Rapidamente..."
+msgstr "Seletor Rápido de Script..."
 
 msgid "Export As..."
 msgstr "Exportar Como…"
@@ -4025,7 +4384,10 @@ msgid "Engine Compilation Configuration Editor..."
 msgstr "Editor de Configuração de Compilação da Engine..."
 
 msgid "Upgrade Mesh Surfaces..."
-msgstr "Atualizar Malhas..."
+msgstr "Atualizar Superfícies de Malhas..."
+
+msgid "Upgrade UIDs..."
+msgstr "Atualizar UIDs..."
 
 msgid "Reload Current Project"
 msgstr "Recarregar Projeto Atual"
@@ -4037,7 +4399,7 @@ msgid "Command Palette..."
 msgstr "Paleta de Comandos..."
 
 msgid "Editor Docks"
-msgstr "Painéis do Editor"
+msgstr "Abas do Editor"
 
 msgid "Editor Layout"
 msgstr "Layout do Editor"
@@ -4090,14 +4452,14 @@ msgstr "Copiar Informações do Sistema"
 
 msgid "Copies the system info as a single-line text into the clipboard."
 msgstr ""
-"Copia as informações do sistema como um texto de linha única para a área de "
+"Copia as informações do sistema como uma linha de texto para a área de "
 "transferência."
 
 msgid "Report a Bug"
 msgstr "Reportar um Bug"
 
 msgid "Suggest a Feature"
-msgstr "Sugira uma Funcionalidade"
+msgstr "Sugerir uma Funcionalidade"
 
 msgid "Send Docs Feedback"
 msgstr "Enviar Sugestão de Docs"
@@ -4119,7 +4481,7 @@ msgstr ""
 "Escolha um método de renderização.\n"
 "\n"
 "Notas:\n"
-"- Nos dispositivos moveis, o método de renderização Mobile será usado se "
+"- Nos dispositivos móveis, o método de renderização Mobile será usado se "
 "Forward+ estiver selecionado aqui.\n"
 "- Na plataforma web, o método de renderização Compatibilidade é sempre "
 "utilizado."
@@ -4134,10 +4496,10 @@ msgid "Hide Update Spinner"
 msgstr "Ocultar Ícone de Atualização"
 
 msgid "FileSystem"
-msgstr "Sistema de Arquivos"
+msgstr "Arquivos"
 
 msgid "Toggle FileSystem Bottom Panel"
-msgstr "Alternar Painel Inferior do Sistema de Arquivos"
+msgstr "Alternar Painel Inferior da Aba Arquivos"
 
 msgid "Inspector"
 msgstr "Inspetor"
@@ -4186,6 +4548,21 @@ msgstr "Exportar Biblioteca"
 msgid "Open & Run a Script"
 msgstr "Abrir & Executar um Script"
 
+msgid "Files have been modified outside Godot"
+msgstr "Arquivos foram modificados fora do Godot"
+
+msgid "The following files are newer on disk:"
+msgstr "Os arquivos a seguir são mais recentes no disco:"
+
+msgid "What action should be taken?"
+msgstr "Que ação deve ser tomada?"
+
+msgid "Reload from disk"
+msgstr "Recarregar do disco"
+
+msgid "Ignore external changes"
+msgstr "Ignorar mudanças externas"
+
 msgid "Create/Override Version Control Metadata..."
 msgstr "Criar/Sobrescrever Metadados de Controle de versão..."
 
@@ -4210,6 +4587,9 @@ msgstr "Abrir Editor 3D"
 msgid "Open Script Editor"
 msgstr "Abrir Editor de Script"
 
+msgid "Open Game View"
+msgstr "Abrir Visão de Jogo"
+
 msgid "Open Asset Library"
 msgstr "Abrir Biblioteca de Recursos"
 
@@ -4259,7 +4639,7 @@ msgid "Edit Layer Names"
 msgstr "Editar Nomes de Camadas"
 
 msgid "<empty>"
-msgstr "[vazio]"
+msgstr "<vazio>"
 
 msgid "Temporary Euler may be changed implicitly!"
 msgstr "Euler temporário pode ser alterado implicitamente!"
@@ -4293,7 +4673,7 @@ msgid "Invalid RID"
 msgstr "RID inválido"
 
 msgid "Recursion detected, unable to assign resource to property."
-msgstr "Recursão detectada, incapaz de atribuir recurso à propriedade."
+msgstr "Recursão detectada, não foi possível atribuir recurso à propriedade."
 
 msgid ""
 "Can't create a ViewportTexture in a Texture2D node because the texture will "
@@ -4311,7 +4691,7 @@ msgid ""
 "Resource needs to belong to a scene."
 msgstr ""
 "Não é possível criar uma ViewportTexture em recursos salvos como um arquivo.\n"
-"Os recursos precisam pertencer à cena."
+"Os recursos precisam pertencer a uma cena."
 
 msgid ""
 "Can't create a ViewportTexture on this resource because it's not set as local "
@@ -4321,8 +4701,8 @@ msgid ""
 msgstr ""
 "Não é possível criar uma ViewportTexture neste recurso porque ele não está "
 "definido como local a uma cena.\n"
-"Por favor ative sua propriedade \"local para cena\" (e todos os recursos que "
-"o contém até chegar nele)."
+"Por favor ative sua propriedade \"local à cena\" (e todos os recursos que o "
+"contém até chegar nele)."
 
 msgid "Pick a Viewport"
 msgstr "Escolha uma Viewport"
@@ -4339,6 +4719,12 @@ msgstr "Novo Valor:"
 msgid "(Nil) %s"
 msgstr "(Nil) %s"
 
+msgid "%s%s (size %d)"
+msgstr "%s%s (tamanho %d)"
+
+msgid "%s (size %d)"
+msgstr "%s (tamanho %d)"
+
 msgid "Size:"
 msgstr "Tamanho:"
 
@@ -4349,16 +4735,16 @@ msgid "Add Key/Value Pair"
 msgstr "Adicionar Par de Chave/Valor"
 
 msgid "Localizable String (Nil)"
-msgstr "Traduções da String"
+msgstr "String Traduzível (Nil)"
 
 msgid "Localizable String (size %d)"
-msgstr "Traduções da String (quantidade: %d)"
+msgstr "String Traduzível (quantidade %d)"
 
 msgid "Add Translation"
 msgstr "Adicionar Tradução"
 
 msgid "Lock/Unlock Component Ratio"
-msgstr "Relação de componente de bloqueio/desbloqueio"
+msgstr "Trancar/Destrancar Razão de Componente"
 
 msgid ""
 "The selected resource (%s) does not match any type expected for this property "
@@ -4368,7 +4754,7 @@ msgstr ""
 "propriedade (%s)."
 
 msgid "Quick Load..."
-msgstr "Carregamento Rápido..."
+msgstr "Seletor Rápido..."
 
 msgid "Opens a quick menu to select from a list of allowed Resource files."
 msgstr ""
@@ -4379,7 +4765,7 @@ msgid "Load..."
 msgstr "Carregar..."
 
 msgid "Inspect"
-msgstr "Inspetor"
+msgstr "Inspecionar"
 
 msgid "Make Unique"
 msgstr "Tornar Único"
@@ -4394,7 +4780,7 @@ msgid "Convert to %s"
 msgstr "Converter para %s"
 
 msgid "Select resources to make unique:"
-msgstr "Selecione os recursos a se tornarem únicos:"
+msgstr "Selecione os recursos para tornar únicos:"
 
 msgid "New %s"
 msgstr "Novo %s"
@@ -4408,6 +4794,12 @@ msgstr "Estender Script..."
 msgid "New Shader..."
 msgstr "Novo Shader..."
 
+msgid "No Remote Deploy export presets configured."
+msgstr "Nenhuma predefinição de Implantação Remota configurada."
+
+msgid "Remote Deploy"
+msgstr "Implantação Remota"
+
 msgid ""
 "No runnable export preset found for this platform.\n"
 "Please add a runnable preset in the Export menu or define an existing preset "
@@ -4418,8 +4810,31 @@ msgstr ""
 "Adicione uma predefinição executável no menu Exportar ou defina uma "
 "predefinição existente como executável."
 
+msgid ""
+"Warning: The CPU architecture \"%s\" is not active in your export preset.\n"
+"\n"
+msgstr ""
+"Aviso: A arquitetura de CPU \"%s\" não está ativa nas configurações de "
+"exportação.\n"
+"\n"
+
+msgid "Run \"Remote Deploy\" anyway?"
+msgstr "Executar \"Implantação Remota\" mesmo assim?"
+
+msgid "Deploy to First Device in List"
+msgstr "Implantação no Primeiro Dispositivo na Lista"
+
+msgid "Deploy to Second Device in List"
+msgstr "Implantar no Segundo Dispositivo na Lista"
+
+msgid "Deploy to Third Device in List"
+msgstr "Implantar no Terceiro Dispositivo na Lista"
+
+msgid "Deploy to Fourth Device in List"
+msgstr "Implantar no Quarto Dispositivo na Lista"
+
 msgid "Project Run"
-msgstr "Executar Projeto"
+msgstr "Execução do Projeto"
 
 msgid "Write your logic in the _run() method."
 msgstr "Escreva sua lógica no método _run()."
@@ -4427,8 +4842,11 @@ msgstr "Escreva sua lógica no método _run()."
 msgid "The current scene already has a root node."
 msgstr "A cena atual já possui um nó raiz."
 
+msgid "Advanced settings are always shown when searching."
+msgstr "Configurações avançadas sempre aparecem ao pesquisar."
+
 msgid "Edit Built-in Action: %s"
-msgstr "Editar Ação Integrada:%s"
+msgstr "Editar Ação Integrada: %s"
 
 msgid "Edit Shortcut: %s"
 msgstr "Editar Atalho: %s"
@@ -4436,9 +4854,15 @@ msgstr "Editar Atalho: %s"
 msgid "None"
 msgstr "Nenhum"
 
+msgid "Primary"
+msgstr "Primário"
+
 msgid "Common"
 msgstr "Comum"
 
+msgid "Event %d"
+msgstr "Evento %d"
+
 msgid "Editor Settings"
 msgstr "Configurações do Editor"
 
@@ -4479,7 +4903,7 @@ msgid "Offline mode, update checks disabled."
 msgstr "Modo offline, busca por atualizações desabilitada."
 
 msgid "Update checks disabled."
-msgstr "Checagem de atualização desabilitada."
+msgstr "Busca por atualizações desabilitada."
 
 msgid "An error has occurred. Click to try again."
 msgstr "Um erro ocorreu. Clique para tentar novamente."
@@ -4488,70 +4912,70 @@ msgid "Click to open download page."
 msgstr "Clique para abrir a página de download."
 
 msgid "Left Stick Left, Joystick 0 Left"
-msgstr "Alavanca Esquerda lado Esquerdo, Joystick 0 Esquerdo"
+msgstr "Analógico Esquerdo para a Esquerda, Joystick 0 Esquerdo"
 
 msgid "Left Stick Right, Joystick 0 Right"
-msgstr "Alavanca Esquerda lado Direito, Joystick 0 Direito"
+msgstr "Analógico Esquerdo para a Direita, Joystick 0 Direito"
 
 msgid "Left Stick Up, Joystick 0 Up"
-msgstr "Alavanca Esquerda Acima, Joystick 0 Acima"
+msgstr "Analógico Esquerdo para Cima, Joystick 0 para Cima"
 
 msgid "Left Stick Down, Joystick 0 Down"
-msgstr "Alavanca Esquerda Abaixo, Joystick 0 Abaixo"
+msgstr "Analógico Esquerdo para Baixo, Joystick 0 para Baixo"
 
 msgid "Right Stick Left, Joystick 1 Left"
-msgstr "Alavanca Direita lado Esquerdo, Joystick 1 Esquerdo"
+msgstr "Analógico Direito para a Esquerda, Joystick 1 Esquerdo"
 
 msgid "Right Stick Right, Joystick 1 Right"
-msgstr "Alavanca Direita lado Direito, Joystick 1 Direito"
+msgstr "Analógico Direito para a Direita, Joystick 1 Direito"
 
 msgid "Right Stick Up, Joystick 1 Up"
-msgstr "Alavanca Direita Acima, Joystick 1 Acima"
+msgstr "Analógico Direito para Cima, Joystick 1 para Cima"
 
 msgid "Right Stick Down, Joystick 1 Down"
-msgstr "Alavanca Direita Abaixo, Joystick 1 Abaixo"
+msgstr "Analógico Direito para Baixo, Joystick 1 para Baixo"
 
 msgid "Joystick 2 Left"
-msgstr "Joystick 2 Esquerdo"
+msgstr "Joystick 2 para a Esquerda"
 
 msgid "Left Trigger, Sony L2, Xbox LT, Joystick 2 Right"
-msgstr "Gatilho Esquerdo, Sony L2, Xbox LT, Joystick 2 Direito"
+msgstr "Gatilho Esquerdo, Sony L2, Xbox LT, Joystick 2 para a Direita"
 
 msgid "Joystick 2 Up"
-msgstr "Joystick 2 Acima"
+msgstr "Joystick 2 para Cima"
 
 msgid "Right Trigger, Sony R2, Xbox RT, Joystick 2 Down"
-msgstr "Gatilho Direito, Sony R2, Xbox RT, Joystick 2 Abaixo"
+msgstr "Gatilho Direito, Sony R2, Xbox RT, Joystick 2 para Baixo"
 
 msgid "Joystick 3 Left"
-msgstr "Joystick 3 Esquerdo"
+msgstr "Joystick 3 para a Esquerda"
 
 msgid "Joystick 3 Right"
-msgstr "Joystick 3 Direito"
+msgstr "Joystick 3 para a Direita"
 
 msgid "Joystick 3 Up"
-msgstr "Joystick 3 Acima"
+msgstr "Joystick 3 para Cima"
 
 msgid "Joystick 3 Down"
-msgstr "Joystick 3 Abaixo"
+msgstr "Joystick 3 para Baixo"
 
 msgid "Joystick 4 Left"
-msgstr "Joystick 4 Esquerdo"
+msgstr "Joystick 4 para a Esquerda"
 
 msgid "Joystick 4 Right"
-msgstr "Joystick 4 Direito"
+msgstr "Joystick 4 para a Direita"
 
 msgid "Joystick 4 Up"
-msgstr "Joystick 4 Acima"
+msgstr "Joystick 4 para Cima"
 
 msgid "Joystick 4 Down"
-msgstr "Joystick 4 Abaixo"
+msgstr "Joystick 4 para Baixo"
 
 msgid "or"
-msgstr "or"
+msgstr "ou"
 
 msgid "Unicode"
-msgstr "Padrão Unicode"
+msgstr "Unicode"
 
 msgid "Joypad Axis %d %s (%s)"
 msgstr "Eixo do Joypad %d %s (%s)"
@@ -4563,10 +4987,10 @@ msgid "Device"
 msgstr "Dispositivo"
 
 msgid "Listening for Input"
-msgstr "Aguardando entrada"
+msgstr "Aguardando Entrada"
 
 msgid "Filter by Event"
-msgstr "Filtrar por evento"
+msgstr "Filtrar por Evento"
 
 msgid "Can't get filesystem access."
 msgstr "Não foi possível obter acesso ao sistema de arquivos."
@@ -4614,7 +5038,7 @@ msgid "Can't resize signature load command."
 msgstr "Não é possível redimensionar o comando de carregamento de assinatura."
 
 msgid "Failed to create fat binary."
-msgstr "Falha ao criar binário gordo."
+msgstr "Falha ao criar binário multiarquitetura."
 
 msgid "Unknown bundle type."
 msgstr "Tipo de pacote desconhecido."
@@ -4640,14 +5064,43 @@ msgstr "Erro Desconhecido"
 msgid "Export failed with error code %d."
 msgstr "Falha ao exportar com código de erro %d."
 
+msgid "Patch Creation"
+msgstr "Criação de Patch"
+
+msgid "Could not load patch pack with path \"%s\"."
+msgstr "Não foi possível carregar pacote de patch com caminho \"%s\"."
+
 msgid "Storing File: %s"
-msgstr "Armazenando arquivo: %s"
+msgstr "Armazenando Arquivo: %s"
 
 msgid "Storing File:"
 msgstr "Armazenando Arquivo:"
 
 msgid "No export template found at the expected path:"
-msgstr "Nenhum modelo de exportação encontrado no caminho:"
+msgstr "Nenhum modelo de exportação encontrado no caminho esperado:"
+
+msgid ""
+"Using user provided text server data, text display in the exported project "
+"might be broken if export template was built with different ICU version!"
+msgstr ""
+"Utilizando dados de servidor de texto fornecidos pelo usuário, a renderização "
+"de texto no projeto exportado pode quebrar se o modelo de exportação foi "
+"criado com uma versão diferente do ICU!"
+
+msgid ""
+"Using editor embedded text server data, text display in the exported project "
+"might be broken if export template was built with different ICU version!"
+msgstr ""
+"Utilizando dados de servidor de texto integrados do editor, a renderização de "
+"texto no projeto exportado pode quebrar se o modelo de exportação foi criado "
+"com uma versão diferente do ICU!"
+
+msgid ""
+"Missing text server data, text display in the exported project might be "
+"broken!"
+msgstr ""
+"Dados de servidor de texto inexistentes, a renderização de texto no projeto "
+"exportado pode estar quebrada!"
 
 msgid "ZIP Creation"
 msgstr "Criação de ZIP"
@@ -4668,8 +5121,11 @@ msgstr "Não foi possível criar arquivo \"%s\"."
 msgid "Failed to export project files."
 msgstr "Falha ao exportar arquivos do projeto."
 
+msgid "No files or changes to export."
+msgstr "Nenhum arquivo ou mudança para exportar."
+
 msgid "Can't open file for writing at path \"%s\"."
-msgstr "Não foi possível abrir o arquivo para gravação no caminho \"%s\"."
+msgstr "Não foi possível abrir o arquivo para escrita no caminho \"%s\"."
 
 msgid "Can't open file for reading-writing at path \"%s\"."
 msgstr ""
@@ -4682,11 +5138,14 @@ msgid "Can't open encrypted file to write."
 msgstr "Não foi possível abrir o arquivo criptografado para escrita."
 
 msgid "Can't open file to read from path \"%s\"."
-msgstr "Não é possível abrir arquivo para leitura a partir do caminho \"%s\"."
+msgstr "Não foi possível abrir arquivo para leitura a partir do caminho \"%s\"."
 
 msgid "Save ZIP"
 msgstr "Salvar ZIP"
 
+msgid "Failed to move temporary file \"%s\" to \"%s\"."
+msgstr "Falha ao mover o arquivo temporário \"%s\" para \"%s\"."
+
 msgid "Custom debug template not found."
 msgstr "Modelo personalizado de depuração não encontrado."
 
@@ -4716,7 +5175,13 @@ msgid "PCK Embedding"
 msgstr "Incorporação de PCK"
 
 msgid "On 32-bit exports the embedded PCK cannot be bigger than 4 GiB."
-msgstr "Em exportações de 32 bits, o PCK embutido não pode ser maior que 4GB."
+msgstr "Em exportações de 32 bits, o PCK embutido não pode ser maior que 4 GiB."
+
+msgid "GDExtension"
+msgstr "GDExtension"
+
+msgid "Failed to copy shared object \"%s\"."
+msgstr "Falha ao copiar objeto compartilhado \"%s\"."
 
 msgid "Plugin \"%s\" is not supported on \"%s\""
 msgstr "O plugin \"%s\" não é compatível com \"%s\""
@@ -4731,7 +5196,7 @@ msgid "There are no mirrors available."
 msgstr "Não há espelhos disponíveis."
 
 msgid "Retrieving the mirror list..."
-msgstr "Reconectando a lista de espelhos..."
+msgstr "Obtendo a lista de espelhos..."
 
 msgid "Starting the download..."
 msgstr "Iniciando o download..."
@@ -4764,7 +5229,7 @@ msgid "Download complete; extracting templates..."
 msgstr "Download completo; extraindo modelos..."
 
 msgid "Cannot remove temporary file:"
-msgstr "Não é possível remover o arquivo temporário:"
+msgstr "Não foi possível remover o arquivo temporário:"
 
 msgid ""
 "Templates installation failed.\n"
@@ -4855,6 +5320,15 @@ msgid "Export templates are missing. Install them from a file."
 msgstr ""
 "Os modelos de exportação estão faltando. Instale-os a partir de um arquivo."
 
+msgid "Not available in offline mode"
+msgstr "Indisponível no modo offline"
+
+msgid "Template downloading is disabled in offline mode."
+msgstr "Download de modelos está indisponível no modo offline."
+
+msgid "No templates for development builds"
+msgstr "Não há modelos para compilações de desenvolvimento"
+
 msgid "Official export templates aren't available for development builds."
 msgstr ""
 "Os modelos de exportação oficiais não estão disponíveis para compilações de "
@@ -4876,7 +5350,7 @@ msgid "Open Folder"
 msgstr "Abrir Pasta"
 
 msgid "Open the folder containing installed templates for the current version."
-msgstr "Abre a pasta que contém os modelos instalados para a versão atual."
+msgstr "Abrir a pasta que contém os modelos instalados para a versão atual."
 
 msgid "Uninstall"
 msgstr "Desinstalar"
@@ -4900,15 +5374,18 @@ msgid ""
 "Download and install templates for the current version from the best possible "
 "mirror."
 msgstr ""
-"Baixa e instala modelos para a versão atual a partir do melhor espelho "
+"Baixar e instalar modelos para a versão atual a partir do melhor espelho "
 "possível."
 
 msgid "Install from File"
-msgstr "Instalar a Partir do Arquivo"
+msgstr "Instalar a Partir de Arquivo"
 
 msgid "Install templates from a local file."
 msgstr "Importar modelos de um arquivo local."
 
+msgid "Go Online"
+msgstr "Ativar Acesso Online"
+
 msgid "Cancel the download of the templates."
 msgstr "Cancelar o download dos modelos."
 
@@ -4922,14 +5399,14 @@ msgid "Select Template File"
 msgstr "Selecionar o Arquivo de Modelo"
 
 msgid "Godot Export Templates"
-msgstr "Modelos de Exportação"
+msgstr "Modelos de Exportação do Godot"
 
 msgid ""
 "The templates will continue to download.\n"
 "You may experience a short editor freeze when they finish."
 msgstr ""
 "Os modelos continuarão sendo baixados.\n"
-"Você pode experienciar um pequeno congelamento no editor ao terminar."
+"O editor pode congelar brevemente ao finalizar."
 
 msgid ""
 "Target platform requires '%s' texture compression. Enable 'Import %s' to fix."
@@ -4952,10 +5429,10 @@ msgstr ""
 "Exportar Tudo funcione."
 
 msgid "Delete preset '%s'?"
-msgstr "Apagar predefinição '%s'?"
+msgstr "Excluir predefinição '%s'?"
 
 msgid "Resources to exclude:"
-msgstr "Recursos para excluir:"
+msgstr "Recursos para ignorar:"
 
 msgid "Resources to override export behavior:"
 msgstr "Recursos para sobrescrever comportamento da exportação:"
@@ -4966,11 +5443,17 @@ msgstr "Recursos para exportar:"
 msgid "(Inherited)"
 msgstr "(Herdado)"
 
+msgid "Delete patch '%s' from list?"
+msgstr "Excluir patch '%s' da lista?"
+
 msgid "Export With Debug"
 msgstr "Exportar Com Depuração"
 
+msgid "Export As Patch"
+msgstr "Exportar como Patch"
+
 msgid "%s Export"
-msgstr "Exportar %s"
+msgstr "Exportação para %s"
 
 msgid "Release"
 msgstr "Lançamento"
@@ -4999,7 +5482,7 @@ msgid "Advanced Options"
 msgstr "Opções Avançadas"
 
 msgid "If checked, the advanced options will be shown."
-msgstr "Se selecionado, as opções avançadas serão mostradas."
+msgstr "Ao ativar, as opções avançadas serão mostradas."
 
 msgid "Export Path"
 msgstr "Caminho de Exportação"
@@ -5032,7 +5515,7 @@ msgstr "Modo de Exportação:"
 msgid ""
 "\"Strip Visuals\" will replace the following resources with placeholders:"
 msgstr ""
-"\"Ocultar Gráficos\" substituirá os seguintes recursos por espaços reservados:"
+"\"Ocultar Gráficos\" substituirá os seguintes recursos por placeholders:"
 
 msgid "Strip Visuals"
 msgstr "Ocultar Gráficos"
@@ -5051,26 +5534,35 @@ msgid ""
 "Filters to exclude files/folders from project\n"
 "(comma-separated, e.g: *.json, *.txt, docs/*)"
 msgstr ""
-"Filtros para excluir arquivos/pastas do projeto\n"
+"Filtros para ignorar arquivos/pastas do projeto\n"
 "(separados por vírgula, ex.: *.json, *.txt, docs/*)"
 
+msgid "Patches"
+msgstr "Patches"
+
+msgid "Base Packs:"
+msgstr "Pacotes Base:"
+
 msgid "Godot Project Pack"
-msgstr "Pacote do Projeto Godot"
+msgstr "Pacote de Projeto Godot"
+
+msgid "Add Pack"
+msgstr "Adicionar Pacote"
 
 msgid "Features"
-msgstr "Funcionalidades"
+msgstr "Características"
 
 msgid "Custom (comma-separated):"
-msgstr "Personalizado (separado por vírgula):"
+msgstr "Personalizadas (separado por vírgula):"
 
 msgid "Feature List:"
-msgstr "Lista de Funcionalidades:"
+msgstr "Lista de Características:"
 
 msgid "Encryption"
 msgstr "Criptografia"
 
 msgid "Encrypt Exported PCK"
-msgstr "Criptografar Exportação PCK"
+msgstr "Criptografar PCK Exportado"
 
 msgid "Encrypt Index (File Names and Info)"
 msgstr "Criptografar Índice (Nomes de Arquivo e Informações)"
@@ -5086,7 +5578,7 @@ msgid ""
 "Filters to exclude files/folders\n"
 "(comma-separated, e.g: *.ctex, *.import, music/*)"
 msgstr ""
-"Filtros para excluir arquivos/pastas\n"
+"Filtros para ignorar arquivos/pastas\n"
 "(separados por vírgula, ex.: *.ctex, *.import, music/*)"
 
 msgid "Invalid Encryption Key (must be 64 hexadecimal characters long)"
@@ -5095,12 +5587,15 @@ msgstr "Chave de Criptografia Inválida (deve ter 64 caracteres hexadecimais)"
 msgid "Encryption Key (256-bits as hexadecimal):"
 msgstr "Chave de Criptografia (256 bits como hexadecimal):"
 
+msgid "Initialization vector seed"
+msgstr "Seed do vetor de inicialização"
+
 msgid ""
 "Note: Encryption key needs to be stored in the binary,\n"
 "you need to build the export templates from source."
 msgstr ""
-"Nota: A chave de criptografia precisa ser armazenada no binário,\n"
-"você precisa compilar os modelos de exportação à partir do código fonte.."
+"Nota: A chave de criptografia precisa ser armazenada no executável,\n"
+"você precisa compilar os modelos de exportação a partir do código fonte."
 
 msgid "More Info..."
 msgstr "Mais Informações..."
@@ -5153,11 +5648,10 @@ msgid "ZIP File"
 msgstr "Arquivo ZIP"
 
 msgid "Export templates for this platform are missing:"
-msgstr ""
-"Os seguintes modelos de exportação para esta plataforma não foram encontrados:"
+msgstr "Os modelos de exportação para esta plataforma não foram encontrados:"
 
 msgid "Project Export"
-msgstr "Exportar Projeto"
+msgstr "Exportação de Projeto"
 
 msgid "Manage Export Templates"
 msgstr "Gerenciar Modelos de Exportação"
@@ -5173,10 +5667,10 @@ msgid ""
 "\n"
 "The editor will restart as importers are registered when the editor starts."
 msgstr ""
-"Cancelar este diálogo desabilitará o importador FBX2glTF e usar o importador "
+"Cancelar este diálogo desabilitará o importador FBX2glTF e usará o importador "
 "ufbx .\n"
-"Você pode reativar o FBX2glTF nas Configurações do Projeto em "
-"Arquivos>Importar>FBX>Habilitado.\n"
+"Você pode reativar o FBX2glTF nas Configurações do Projeto em Arquivos > "
+"Importar > FBX > Habilitado.\n"
 "\n"
 "O editor será reiniciado à medida que os importadores forem registrados "
 "quando o editor for iniciado."
@@ -5202,8 +5696,9 @@ msgid ""
 "Please download the necessary tool and provide a valid path to the binary:"
 msgstr ""
 "FBX2glTF é necessário para importar arquivos FBX se estiver usando FBX2glTF.\n"
-"Alternativamente, você pode usar o ufbx caso desabilite FBX2glTF.\n"
-"Faça o download da ferramenta e forneça um caminho válido para o binário:"
+"Alternativamente, você pode usar o ufbx desabilitando o FBX2glTF.\n"
+"Faça o download da ferramenta e forneça um caminho válido para o seu "
+"executável:"
 
 msgid "Click this link to download FBX2glTF"
 msgstr "Clique neste link para baixar o FBX2glTF"
@@ -5214,6 +5709,9 @@ msgstr "Navegar"
 msgid "Confirm Path"
 msgstr "Confirmar Caminho"
 
+msgid "Link to: %s"
+msgstr "Ligação para: %s"
+
 msgid "View items as a grid of thumbnails."
 msgstr "Visualizar itens como uma grade de miniaturas."
 
@@ -5243,6 +5741,9 @@ msgstr "Erro ao mover:"
 msgid "Error duplicating:"
 msgstr "Erro ao duplicar:"
 
+msgid "Error duplicating directory:"
+msgstr "Erro ao duplicar pasta:"
+
 msgid "Unable to update dependencies for:"
 msgstr "Não foi possível atualizar dependências para:"
 
@@ -5262,7 +5763,7 @@ msgid ""
 "anymore."
 msgstr ""
 "Esta extensão de arquivo não é reconhecida pelo editor.\n"
-"Se ainda assim você deseja renomear, utilize o explorador de arquivos do seu "
+"Se ainda assim você deseja renomear, utilize o gerenciador de arquivos do seu "
 "sistema operacional.\n"
 "Após renomear para uma extensão desconhecida, este arquivo não será mais "
 "exibido pelo editor."
@@ -5270,6 +5771,9 @@ msgstr ""
 msgid "A file or folder with this name already exists."
 msgstr "Um arquivo ou pasta com esse nome já existe."
 
+msgid "Could not create base directory: %s"
+msgstr "Não foi possível criar o diretório base: %s"
+
 msgid ""
 "The following files or folders conflict with items in the target location "
 "'%s':"
@@ -5295,7 +5799,7 @@ msgid ""
 "Check `filesystem/external_programs/terminal_emulator` and `filesystem/"
 "external_programs/terminal_emulator_flags` in the Editor Settings."
 msgstr ""
-"Não foi possível executar o programa de terminal (código de erro %d):%s %s\n"
+"Não foi possível executar o programa de terminal (código de erro %d): %s %s\n"
 "Verifique `filesystem/external_programs/terminal_emulator` e `filesystem/"
 "external_programs/terminal_emulator_flags` nas Configurações do Editor."
 
@@ -5308,6 +5812,14 @@ msgstr "Duplicando pasta:"
 msgid "Create Folder"
 msgstr "Criar Pasta"
 
+msgid ""
+"Do you wish to convert these files to %s? (This operation cannot be undone!)"
+msgstr ""
+"Deseja converter estes arquivos para %s? (Essa operação é irreversível!)"
+
+msgid "Could not create folder: %s"
+msgstr "Não foi possível criar a pasta: %s"
+
 msgid "New Inherited Scene"
 msgstr "Nova Cena Herdada"
 
@@ -5357,7 +5869,7 @@ msgid "Set Folder Color..."
 msgstr "Definir Cor da Pasta..."
 
 msgid "Default (Reset)"
-msgstr "Padrão(Redefinir)"
+msgstr "Padrão (Redefinir)"
 
 msgid "Move/Duplicate To..."
 msgstr "Mover/Duplicar para..."
@@ -5368,12 +5880,18 @@ msgstr "Adicionar aos Favoritos"
 msgid "Remove from Favorites"
 msgstr "Remover dos Favoritos"
 
+msgid "Convert to..."
+msgstr "Converter para..."
+
 msgid "Reimport"
 msgstr "Reimportar"
 
 msgid "Open in Terminal"
 msgstr "Abrir no Terminal"
 
+msgid "Open Folder in Terminal"
+msgstr "Abrir Pasta no Terminal"
+
 msgid "New Folder..."
 msgstr "Nova Pasta..."
 
@@ -5402,10 +5920,10 @@ msgid "Sort by Type (Descending)"
 msgstr "Ordenar por Tipo (Decrescente)"
 
 msgid "Sort by Last Modified"
-msgstr "Ordenar por Último Modificado"
+msgstr "Ordenar por Última Modificação"
 
 msgid "Sort by First Modified"
-msgstr "Ordenar por Primeiro Modificado"
+msgstr "Ordenar por Primeira Modificação"
 
 msgid "Copy Path"
 msgstr "Copiar Caminho"
@@ -5483,11 +6001,14 @@ msgstr "Manter Ambos"
 msgid "Create Script"
 msgstr "Criar Script"
 
+msgid "Convert"
+msgstr "Converter"
+
 msgid "Find in Files"
-msgstr "Localizar nos Arquivos"
+msgstr "Buscar nos Arquivos"
 
 msgid "Find:"
-msgstr "Encontrar:"
+msgstr "Buscar:"
 
 msgid "Replace:"
 msgstr "Substituir:"
@@ -5502,11 +6023,11 @@ msgid ""
 "Include the files with the following extensions. Add or remove them in "
 "ProjectSettings."
 msgstr ""
-"Inclua os arquivos com as seguintes extensões. Adicione ou remova-os em "
-"ProjectSettings."
+"Inclua os arquivos com as seguintes extensões. Adicione ou remova-os nas "
+"Configurações do Projeto."
 
 msgid "Find..."
-msgstr "Localizar..."
+msgstr "Buscar..."
 
 msgid "Replace..."
 msgstr "Substituir..."
@@ -5518,7 +6039,10 @@ msgid "Replace all (no undo)"
 msgstr "Substituir tudo (irreversível)"
 
 msgid "Searching..."
-msgstr "Procurando..."
+msgstr "Buscando..."
+
+msgid "Remove result"
+msgstr "Remover resultado"
 
 msgid "%d match in %d file"
 msgstr "%d correspondência no arquivo %d"
@@ -5533,7 +6057,7 @@ msgid "Set Group Description"
 msgstr "Definir Descrição do Grupo"
 
 msgid "Invalid group name. It cannot be empty."
-msgstr "Nome do Grupo inválido.Nome não poder ser vazio."
+msgstr "Nome do grupo inválido. Nome não poder ser vazio."
 
 msgid "A group with the name '%s' already exists."
 msgstr "Já existe um grupo com o nome '%s'."
@@ -5548,7 +6072,7 @@ msgid "Add Group"
 msgstr "Adicionar Grupo"
 
 msgid "Renaming Group References"
-msgstr "Renomeando Referências de Grupo"
+msgstr "Renomeando Referências ao Grupo"
 
 msgid "Removing Group References"
 msgstr "Remover Referências ao Grupo"
@@ -5593,7 +6117,7 @@ msgid "Convert to Global Group"
 msgstr "Converter para Grupo Global"
 
 msgid "Convert to Scene Group"
-msgstr "Converter a Grupo da Cena"
+msgstr "Converter a Grupo de Cena"
 
 msgid "Create New Group"
 msgstr "Criar Novo Grupo"
@@ -5610,6 +6134,27 @@ msgstr "Adicionar um novo grupo."
 msgid "Filter Groups"
 msgstr "Filtrar Grupos"
 
+msgid ""
+"Scroll Left\n"
+"Hold Ctrl to scroll to the begin.\n"
+"Hold Shift to scroll one page."
+msgstr ""
+"Role para a esquerda\n"
+"Segure Ctrl para rolar para o início.\n"
+"Segure Shift para rolar uma página."
+
+msgid ""
+"Scroll Right\n"
+"Hold Ctrl to scroll to the end.\n"
+"Hold Shift to scroll one page."
+msgstr ""
+"Rolar para a direita\n"
+"Segure Ctrl para rolar para o final.\n"
+"Segure Shift para rolar uma página."
+
+msgid "Pin Bottom Panel Switching"
+msgstr "Prevenir Troca Automática de Aba no Painel Inferior"
+
 msgid "Expand Bottom Panel"
 msgstr "Expandir Painel Inferior"
 
@@ -5644,11 +6189,14 @@ msgid ""
 "Do you want to overwrite it?"
 msgstr ""
 "O arquivo \"%s\" já existe.\n"
-"Você deseja sobrescreve-lo?"
+"Deseja sobrescrevê-lo?"
 
 msgid "Select This Folder"
 msgstr "Selecionar Esta Pasta"
 
+msgid "Show Package Contents"
+msgstr "Mostrar Conteúdos do Pacote"
+
 msgid "All Files"
 msgstr "Todos os Arquivos"
 
@@ -5677,7 +6225,7 @@ msgid "Could not create folder."
 msgstr "Não foi possível criar a pasta."
 
 msgid "Favorited folder does not exist anymore and will be removed."
-msgstr "A pasta favorita não existe mais e será removida."
+msgstr "Esta pasta favorita não existe mais e será removida."
 
 msgid "Go Back"
 msgstr "Voltar"
@@ -5686,7 +6234,7 @@ msgid "Go Forward"
 msgstr "Avançar"
 
 msgid "Go Up"
-msgstr "Acima"
+msgstr "Subir um nível"
 
 msgid "Toggle Hidden Files"
 msgstr "Alternar Arquivos Ocultos"
@@ -5698,13 +6246,16 @@ msgid "Toggle Mode"
 msgstr "Alternar Modo"
 
 msgid "Focus Path"
-msgstr "Destacar Caminho"
+msgstr "Selecionar Caminho"
+
+msgid "Focus Filter"
+msgstr "Selecionar Filtro"
 
 msgid "Move Favorite Up"
-msgstr "Mover Favorito Acima"
+msgstr "Mover Favorito para Cima"
 
 msgid "Move Favorite Down"
-msgstr "Mover Favorito Abaixo"
+msgstr "Mover Favorito para Baixo"
 
 msgid "Go to previous folder."
 msgstr "Ir para a pasta anterior."
@@ -5730,9 +6281,18 @@ msgstr "Diretórios & Arquivos:"
 msgid "Toggle the visibility of hidden files."
 msgstr "Alternar a visibilidade de arquivos ocultos."
 
+msgid "Sort files"
+msgstr "Ordenar arquivos"
+
+msgid "Toggle the visibility of the filter for file names."
+msgstr "Alternar a visibilidade do filtro de nomes de arquivo."
+
 msgid "Preview:"
 msgstr "Visualização:"
 
+msgid "Filter:"
+msgstr "Filtro:"
+
 msgid "Filter"
 msgstr "Filtro"
 
@@ -5754,19 +6314,58 @@ msgid "No sub-resources found."
 msgstr "Nenhum sub-recurso encontrado."
 
 msgid "Open a list of sub-resources."
-msgstr "Abra uma lista de sub-recursos."
+msgstr "Abrir uma lista de sub-recursos."
+
+msgid "Search files..."
+msgstr "Buscar arquivos..."
+
+msgid "Select Resource"
+msgstr "Selecionar Recurso"
+
+msgid "Select Scene"
+msgstr "Selecionar Cena"
+
+msgid "Fuzzy Search"
+msgstr "Pesquisa Aproximada"
+
+msgid "Enable fuzzy matching"
+msgstr "Ativar correspondências aproximadas"
+
+msgid "Addons"
+msgstr "Plugins"
+
+msgid "Include files from addons"
+msgstr "Incluir arquivos de plugins"
+
+msgid "No files found for this type"
+msgstr "Nenhum arquivo encontrado para este tipo"
+
+msgid "Start searching to find files..."
+msgstr "Comece a digitar para buscar arquivos..."
+
+msgid "No results found"
+msgstr "Nenhum resultado encontrado"
+
+msgid " (recently opened)"
+msgstr " (aberto recentemente)"
+
+msgid "Grid view"
+msgstr "Visão de grade"
+
+msgid "List view"
+msgstr "Visão de lista"
 
 msgid "Play the project."
-msgstr "Roda o projeto."
+msgstr "Rodar o projeto."
 
 msgid "Play the edited scene."
-msgstr "Roda a cena sendo editada."
+msgstr "Rodar a cena sendo editada."
 
 msgid "Play a custom scene."
-msgstr "Roda uma cena personalizada."
+msgstr "Rodar uma cena personalizada."
 
 msgid "Reload the played scene."
-msgstr "Recarregue a cena reproduzida."
+msgstr "Recarregar a cena executada."
 
 msgid ""
 "Movie Maker mode is enabled, but no movie file path has been specified.\n"
@@ -5777,10 +6376,10 @@ msgid ""
 "specifying the path to a movie file that will be used when recording that "
 "scene."
 msgstr ""
-"Modo Movie Maker está habilitado, mas nenhum caminho de arquivo de vídeo foi "
+"O modo Gravação está habilitado, mas nenhum caminho de arquivo de vídeo foi "
 "especificado.\n"
 "Um caminho de arquivo de vídeo padrão pode ser espeficiado nas configurações "
-"do projeto, em Editor > Movie Writer.\n"
+"do projeto, em Editor > Gravação.\n"
 "Alternativamente, para cenas individuais, uma string de metadados "
 "`movie_file` pode ser adicionada ao nó raiz,\n"
 "especificando o caminho para um arquivo de vídeo que será utilizado ao gravar "
@@ -5789,11 +6388,74 @@ msgstr ""
 msgid "Could not start subprocess(es)!"
 msgstr "Não foi possível iniciar o(s) subprocesso(s)!"
 
+msgid "Recovery Mode is enabled. Disable it to run the project."
+msgstr "O Modo de Recuperação está ativado. Desative para rodar o projeto."
+
+msgid ""
+"Autostart is enabled for the following profilers, which can have a "
+"performance impact:"
+msgstr ""
+"Início automático está habilitado para os analisadores a seguir, o que pode "
+"impactar a performance:"
+
 msgid "Network Profiler"
 msgstr "Analisador de Rede"
 
+msgid "Click to open the first profiler for which autostart is enabled."
+msgstr ""
+"Clique para abrir o primeiro analisador cujo início automático está ativado."
+
+msgid "Recovery Mode"
+msgstr "Modo de Recuperação"
+
+msgid ""
+"Godot opened the project in Recovery Mode, which is a special mode that can "
+"help recover projects that crash the engine upon initialization. The "
+"following features have been temporarily disabled:"
+msgstr ""
+"O Godot abriu o projeto no Modo de Recuperação, um modo especial que pode lhe "
+"ajudar a consertar projetos que crasham a engine quando abertos. As funções a "
+"seguir foram desabilitadas para esta sessão:"
+
+msgid "Tool scripts"
+msgstr "Scripts de Ferramenta"
+
+msgid "Editor plugins"
+msgstr "Plugins do editor"
+
+msgid "GDExtension addons"
+msgstr "Plugins GDExtension"
+
+msgid "Automatic scene restoring"
+msgstr "Restauração de cena automática"
+
+msgid ""
+"If the project cannot be opened outside of this mode, then it's very likely "
+"any of these components is preventing this project from launching. This mode "
+"is intended only for basic editing to troubleshoot such issues, and therefore "
+"it is not possible to run a project in this mode."
+msgstr ""
+"Se você não consegue abrir o projeto fora deste modo, é muito provável que "
+"algum desses componentes está prevenindo que seu projeto abra. Este modo deve "
+"ser usado apenas para edições básicas que te ajudem a solucionar tais "
+"problemas, e portanto não é possível executar um projeto neste modo."
+
+msgid ""
+"To disable Recovery Mode, reload the project by pressing the Reload button "
+"next to the Recovery Mode banner, or by reopening the project normally."
+msgstr ""
+"Para desativar o Modo de Recuperação, recarregue o projeto clicando no botão "
+"de Recarregar próximo ao banner do Modo de Recuperação, ou só reabra o "
+"projeto normalmente."
+
+msgid "Disable recovery mode and reload the project."
+msgstr "Desabilitar modo de recuperação e recarregar o projeto."
+
+msgid "Recovery Mode is enabled. Click for more details."
+msgstr "Modo de Recuperação ativado. Clique para mais detalhes."
+
 msgid "Run the project's default scene."
-msgstr "Execute a cena padrão do projeto."
+msgstr "Executar a cena padrão do projeto."
 
 msgid "Run Project"
 msgstr "Executar Projeto"
@@ -5805,19 +6467,31 @@ msgid "Pause Running Project"
 msgstr "Pausar Projeto em Execução"
 
 msgid "Stop the currently running project."
-msgstr "Para o projeto atualmente em execução."
+msgstr "Parar o projeto em execução."
 
 msgid "Stop Running Project"
-msgstr "Parar de Executar o Projeto"
+msgstr "Parar Projeto em Execução"
+
+msgid "Run Scene in Regular Mode"
+msgstr "Executar Cena no Modo Normal"
+
+msgid "Run Scene in XR Mode"
+msgstr "Executar Cena no Modo XR"
 
 msgid "Run the currently edited scene."
-msgstr "Execute a cena atual editada."
+msgstr "Executar a cena sendo editada."
 
 msgid "Run Current Scene"
 msgstr "Executar Cena Atual"
 
+msgid "Run in Regular Mode"
+msgstr "Executar no Modo Normal"
+
+msgid "Run in XR Mode"
+msgstr "Executar no Modo XR"
+
 msgid "Run a specific scene."
-msgstr "Execute uma cena específica."
+msgstr "Executar uma cena específica."
 
 msgid "Run Specific Scene"
 msgstr "Executar Cena Específica"
@@ -5841,7 +6515,7 @@ msgid "Undo Close Tab"
 msgstr "Desfazer Fechar Aba"
 
 msgid "Close Other Tabs"
-msgstr "Fechas as Outras Abas"
+msgstr "Fechar as Outras Abas"
 
 msgid "Close Tabs to the Right"
 msgstr "Fechar Abas à Direita"
@@ -5881,15 +6555,27 @@ msgstr ""
 "Data do commit git:%s\n"
 "Clique para copiar a informação da versão."
 
+msgid ""
+"The root node of a scene is recommended to not be transformed, since "
+"instances of the scene will usually override this. Reset the transform and "
+"reload the scene to remove this warning."
+msgstr ""
+"Recomenda-se que o nó raiz de uma cena não haja transformações (posição/"
+"rotação/escala), já que as instâncias da cena geralmente irão sobrescrevê-"
+"las. Redefina sua transformação e recarregue a cena para remover este aviso."
+
 msgid "Toggle Visible"
 msgstr "Alternar Visibilidade"
 
 msgid "Unlock Node"
-msgstr "Desbloquear Nó"
+msgstr "Destrancar Nó"
 
 msgid "Ungroup Children"
 msgstr "Desagrupar Filhos"
 
+msgid "Revoke unique name for node \"%s\"?"
+msgstr "Remover nome único do nó \"%s\"?"
+
 msgid "Disable Scene Unique Name"
 msgstr "Desabilitar Nome Único de Cena"
 
@@ -5899,6 +6585,16 @@ msgstr "(Conectando De)"
 msgid "Node configuration warning:"
 msgstr "Aviso de configuração de nó:"
 
+msgid ""
+"This node can be accessed from anywhere within the scene it belongs to by "
+"using the '%s' prefix in the node path."
+msgstr ""
+"Este nó pode ser acessado em qualquer lugar na cena adicionando o prefixo "
+"'%s' em um caminho de nó."
+
+msgid "Click to disable this."
+msgstr "Clique para desativar."
+
 msgid "Node has one connection."
 msgid_plural "Node has {num} connections."
 msgstr[0] "O nó tem uma conexão."
@@ -5910,7 +6606,17 @@ msgstr[0] "O nó está no grupo:"
 msgstr[1] "O nó está nos seguintes grupos:"
 
 msgid "Click to show signals dock."
-msgstr "Clique para mostrar o painel de sinais."
+msgstr "Clique para mostrar a aba de sinais."
+
+msgid "Click to show groups dock."
+msgstr "Clique para mostrar a aba de grupos."
+
+msgid ""
+"This script can run in the editor.\n"
+"It is currently disabled due to recovery mode."
+msgstr ""
+"Este script pode ser executado no editor.\n"
+"Ele está desativado atualmente devido ao modo de recuperação."
 
 msgid "This script is currently running in the editor."
 msgstr "Este script está sendo executado no editor."
@@ -5925,8 +6631,8 @@ msgid ""
 "Node is locked.\n"
 "Click to unlock it."
 msgstr ""
-"O nó está travado.\n"
-"Clique para destravar."
+"O nó está trancado.\n"
+"Clique para destrancar."
 
 msgid ""
 "Children are not selectable.\n"
@@ -5939,8 +6645,8 @@ msgid ""
 "AnimationPlayer is pinned.\n"
 "Click to unpin."
 msgstr ""
-"AnimationPlayer está marcado.\n"
-"Clique para desmarcar."
+"AnimationPlayer está fixado.\n"
+"Clique para desafixar."
 
 msgid "Open in Editor"
 msgstr "Abrir no Editor"
@@ -5948,11 +6654,18 @@ msgstr "Abrir no Editor"
 msgid "\"%s\" is not a known filter."
 msgstr "\"%s\" não é um filtro conhecido."
 
+msgid ""
+"Root nodes cannot be accessed as unique names in their own scene. Instantiate "
+"in another scene and set as unique name there."
+msgstr ""
+"Nós raiz não podem ser acessados com nome único na sua própria cena. "
+"Instancie-a em outra cena e defina o nome único por lá."
+
 msgid "Invalid node name, the following characters are not allowed:"
 msgstr "Nome de nó inválido, os seguintes caracteres não são permitidos:"
 
 msgid "A node with the unique name %s already exists in this scene."
-msgstr "Um nó com um nome único %s já existe nesta cena."
+msgstr "Um nó com o nome único %s já existe nesta cena."
 
 msgid "Enable Scene Unique Name(s)"
 msgstr "Habilitar Nome(s) Único(s) de Cena"
@@ -5969,6 +6682,19 @@ msgstr "Árvore de Cena (Nós):"
 msgid "Node Configuration Warning!"
 msgstr "Aviso de Configuração de Nó!"
 
+msgid "Revoke"
+msgstr "Remover"
+
+msgid "Don't Ask Again"
+msgstr "Não Pergunte Novamente"
+
+msgid ""
+"This dialog can also be enabled/disabled in the Editor Settings: Docks > "
+"Scene Tree > Ask Before Revoking Unique Name."
+msgstr ""
+"Esta janela pode ser ativada/desativada nas Configurações do Editor: Abas > "
+"Árvore da Cena > Perguntar Antes de Remover Nome Único."
+
 msgid "Allowed:"
 msgstr "Permitido:"
 
@@ -5976,7 +6702,7 @@ msgid "Select a Node"
 msgstr "Selecione um Nó"
 
 msgid "Show All"
-msgstr "Mostrar todos"
+msgstr "Mostrar Todos"
 
 msgid "The Beginning"
 msgstr "O Início"
@@ -6012,14 +6738,14 @@ msgid "<Unnamed Material>"
 msgstr "<Material Sem Nome>"
 
 msgid "Import ID: %s"
-msgstr "Importar ID: %s"
+msgstr "ID de Importação: %s"
 
 msgid ""
 "Type: %s\n"
 "Import ID: %s"
 msgstr ""
 "Tipo: %s\n"
-"Importar ID: %s"
+"ID de Importação: %s"
 
 msgid "Error opening scene"
 msgstr "Erro ao abrir cena"
@@ -6049,7 +6775,7 @@ msgid "Will create new file"
 msgstr "Criará um novo arquivo"
 
 msgid "Already External"
-msgstr "Já é externo"
+msgstr "Já é Externo"
 
 msgid ""
 "This material already references an external file, no action will be taken.\n"
@@ -6059,7 +6785,7 @@ msgstr ""
 "Desabilite a propriedade externa para que ele seja extraído novamente."
 
 msgid "No import ID"
-msgstr "Não importar ID"
+msgstr "Sem ID de importação"
 
 msgid ""
 "Material has no name nor any other way to identify on re-import.\n"
@@ -6075,7 +6801,7 @@ msgid "Extract"
 msgstr "Extrair"
 
 msgid "Already Saving"
-msgstr "Já está salvando"
+msgstr "Já está Salvando"
 
 msgid ""
 "This mesh already saves to an external resource, no action will be taken."
@@ -6095,7 +6821,7 @@ msgstr ""
 "Dê um nome a ela ou certifique-se que ela seja exportada com um ID único."
 
 msgid "Set paths to save meshes as resource files on Reimport"
-msgstr "Defina caminhos para salvar malhas como recursos ao Reimportar"
+msgstr "Definir caminhos para salvar malhas como recursos ao Reimportar"
 
 msgid "Set Paths"
 msgstr "Definir Caminhos"
@@ -6130,7 +6856,13 @@ msgid "Materials"
 msgstr "Materiais"
 
 msgid "Selected Animation Play/Pause"
-msgstr "Play/Pause Animação Selecionada"
+msgstr "Tocar/Pausar Animação Selecionada"
+
+msgid "Selected Animation Stop"
+msgstr "Parar Animação Selecionada"
+
+msgid "Toggle Animation Skeleton Visibility"
+msgstr "Alternar Visibilidade do Esqueleto da Animação"
 
 msgid "Rotate Lights With Model"
 msgstr "Rotacionar Luzes com o Modelo"
@@ -6148,7 +6880,7 @@ msgid "Save Extension:"
 msgstr "Salvar Extensão:"
 
 msgid "Text: *.tres"
-msgstr "Textura: *.tres"
+msgstr "Texto: *.tres"
 
 msgid "Binary: *.res"
 msgstr "Binário: *.res"
@@ -6160,7 +6892,7 @@ msgid "Binary Resource"
 msgstr "Recurso Binário"
 
 msgid "Audio Stream Importer: %s"
-msgstr "Importador de Fluxo de Áudio: %s"
+msgstr "Importador de Transmissão de Áudio: %s"
 
 msgid "Enable looping."
 msgstr "Ativar repetição."
@@ -6172,11 +6904,11 @@ msgid ""
 "Loop offset (from beginning). Note that if BPM is set, this setting will be "
 "ignored."
 msgstr ""
-"Deslocar repetição (desde o início). Observe que, se o BPM estiver definido, "
-"essa configuração será ignorada."
+"Deslocamento da repetição (a partir do início). Observe que, se o BPM estiver "
+"definido, essa configuração será ignorada."
 
 msgid "Loop:"
-msgstr "Repetir:"
+msgstr "Repetição:"
 
 msgid "BPM:"
 msgstr "BPM:"
@@ -6185,12 +6917,11 @@ msgid ""
 "Configure the Beats Per Measure (tempo) used for the interactive streams.\n"
 "This is required in order to configure beat information."
 msgstr ""
-"Configure as Batidas Por Medida (de tempo) usadas para os fluxos "
-"interativos.\n"
-"Isso é necessário para configurar as informações da batida."
+"Configure as Batidas Por Minuto (tempo) usadas para os fluxos interativos.\n"
+"Isso é necessário para configurar as informações de batida."
 
 msgid "Beat Count:"
-msgstr "Contagem de Batidas:"
+msgstr "Número de Batidas:"
 
 msgid ""
 "Configure the amount of Beats used for music-aware looping. If zero, it will "
@@ -6198,9 +6929,9 @@ msgid ""
 "It is recommended to set this value (either manually or by clicking on a beat "
 "number in the preview) to ensure looping works properly."
 msgstr ""
-"Configure a quantidade de Batidas usadas para repetir o reconhecimento da "
-"música. Se for zero, será autodetectado a partir do comprimento.\n"
-"É recomendável definir esse valor (manualmente ou clicando em um número de "
+"Configure a quantidade de Batidas usadas para repetimento da música. Se for "
+"zero, será autodetectado a partir da duração.\n"
+"Recomenda-se definir esse valor (manualmente ou clicando em um número de "
 "batidas na visualização) para garantir que a repetição funcione corretamente."
 
 msgid "Bar Beats:"
@@ -6289,10 +7020,10 @@ msgstr ""
 "pré-renderização:"
 
 msgid "Shape all Strings in the Translations and Add Glyphs"
-msgstr "Forme todas as Strings nas Traduções e Adicione Glifos"
+msgstr "Formar todas as Strings nas Traduções e Adicionar Glifos"
 
 msgid "Glyphs from the Text"
-msgstr "Glifos do Texto"
+msgstr "Glifos de um Texto"
 
 msgid ""
 "Enter a text and select OpenType features to shape and add all required "
@@ -6302,7 +7033,7 @@ msgstr ""
 "os glifos necessários à lista de pré-renderização:"
 
 msgid "Shape Text and Add Glyphs"
-msgstr "Molde o Texto e Adicione Glifos"
+msgstr "Moldar o Texto e Adicionar Glifos"
 
 msgid "Glyphs from the Character Map"
 msgstr "Glifos do Mapa de Caracteres"
@@ -6316,20 +7047,20 @@ msgstr ""
 "Adicione ou remova glifos do mapa de caracteres para a lista de pré-"
 "renderização:\n"
 "Nota: algumas alternativas estilísticas e variantes de glifos não têm "
-"correspondência de um para um com o caractere e não são mostradas neste mapa, "
-"use a guia \"Glifos do texto\" para adicioná-los."
+"correspondência exata com o caractere e não são mostradas neste mapa, use a "
+"guia \"Glifos de um Texto\" para adicioná-las."
 
 msgid "Dynamically rendered TrueType/OpenType font"
 msgstr "Fonte TrueType/OpenType renderizada dinamicamente"
 
 msgid "Prerendered multichannel(+true) signed distance field"
-msgstr "Campo de distância com sinal multicanal pré-renderizado (+verdadeiro)"
+msgstr "Campo de distância com sinal multicanal(+verdadeiro) pré-renderizado"
 
 msgid ""
 "Error importing GLSL shader file: '%s'. Open the file in the filesystem dock "
 "in order to see the reason."
 msgstr ""
-"Erro ao importar o arquivo de shader GLSL: '%s'. Abra o arquivo no painel de "
+"Erro ao importar o arquivo de shader GLSL: '%s'. Abra o arquivo na aba de "
 "arquivos para ver o motivo."
 
 msgid ""
@@ -6369,18 +7100,18 @@ msgid ""
 "the `editor/import/atlas_max_width` Project Setting to allow a wider texture, "
 "making the result more even in size."
 msgstr ""
-"%s: Textura Atlas consideravelmente maior em um eixo(%d), considere ajustar a "
-"configuração do projeto `editor/import/atlas_max_width` para permitir uma "
+"%s: Textura Atlas consideravelmente maior em um eixo (%d), considere ajustar "
+"a configuração do projeto `editor/import/atlas_max_width` para permitir uma "
 "textura mais larga, tornando o tamanho do resultado mais equilibrado."
 
 msgid "Importer:"
 msgstr "Importador:"
 
 msgid "Keep File (exported as is)"
-msgstr "Manter Arquivo (exportado como é)"
+msgstr "Manter Arquivo (exportado do jeito que está)"
 
 msgid "Skip File (not exported)"
-msgstr "Ignorar Arquivo (não é exportado)"
+msgstr "Ignorar Arquivo (não exportado)"
 
 msgid "%d Files"
 msgstr "%d Arquivos"
@@ -6399,8 +7130,8 @@ msgid ""
 msgstr ""
 "Você tem mudanças pendentes que não foram aplicadas ainda. Clique em "
 "Reimportar para aplicar as mudanças feitas nas opções de importação.\n"
-"Selecionado outro recurso no painel de Arquivos sem ter clicado em Reimportar "
-"primeiro irá descartar as mudanças feitas no painel de Importar."
+"Selecionar outro recurso na aba de Arquivos sem ter clicado em Reimportar "
+"primeiro irá descartar as mudanças feitas no na aba de Importar."
 
 msgid "Import As:"
 msgstr "Importar Como:"
@@ -6422,8 +7153,8 @@ msgid ""
 "WARNING: Assets exist that use this resource. They may stop loading properly "
 "after changing type."
 msgstr ""
-"AVISO: Existem objetos que usam este recurso. Eles provavelmente pararão de "
-"carregar corretamente após a mudança de tipo."
+"AVISO: Existem objetos que usam este recurso. Eles provavelmente não "
+"carregarão mais corretamente após a mudança de tipo."
 
 msgid ""
 "Select a resource file in the filesystem or in the inspector to adjust import "
@@ -6451,7 +7182,7 @@ msgid "Event Configuration for \"%s\""
 msgstr "Configuração de Evento para \"%s\""
 
 msgid "Event Configuration"
-msgstr "Configuração do Evento"
+msgstr "Configuração de Evento"
 
 msgid "Manual Selection"
 msgstr "Seleção Manual"
@@ -6482,7 +7213,8 @@ msgid "Physical Keycode (Position on US QWERTY Keyboard)"
 msgstr "Keycode Físico (Posição no teclado QWERTY dos EUA)"
 
 msgid "Key Label (Unicode, Case-Insensitive)"
-msgstr "Identificação da Tecla (Unicode, diferencia maiúsculas de minúsculas)"
+msgstr ""
+"Identificação da Tecla (Unicode, não diferencia maiúsculas de minúsculas)"
 
 msgid "Physical location"
 msgstr "Local Físico"
@@ -6512,16 +7244,16 @@ msgid "Property Name Style"
 msgstr "Estilo do Nome da Propriedade"
 
 msgid "Raw (e.g. \"%s\")"
-msgstr "Raw (por exemplo: \"%s\")"
+msgstr "Sem modificação (por exemplo: \"%s\")"
 
 msgid "Capitalized (e.g. \"%s\")"
-msgstr "Capitalizado (por exemplo, \"%s\")"
+msgstr "Maiúsculo (por exemplo, \"%s\")"
 
 msgid "Localized (e.g. \"Z Index\")"
-msgstr "Localizado (por exemplo: \"Z Index\")"
+msgstr "Localizado (por exemplo: \"Índice Z\")"
 
 msgid "Localization not available for current language."
-msgstr "Localização não disponível para idioma atual."
+msgstr "Localização não disponível para o idioma atual."
 
 msgid "Copy Properties"
 msgstr "Copiar Propriedades"
@@ -6530,22 +7262,22 @@ msgid "Paste Properties"
 msgstr "Colar Propriedades"
 
 msgid "Make Sub-Resources Unique"
-msgstr "Tornar Únicos os Sub-recursos"
+msgstr "Tornar Sub-Recursos Únicos"
 
 msgid "Create a new resource in memory and edit it."
-msgstr "Cria um novo recurso na memória e o edita."
+msgstr "Criar um novo recurso na memória e editá-lo."
 
 msgid "Load an existing resource from disk and edit it."
-msgstr "Carrega um recurso existente do disco e o edita."
+msgstr "Carregar um recurso existente do disco e editá-lo."
 
 msgid "Save the currently edited resource."
-msgstr "Salva o recurso editado atualmente."
+msgstr "Salvar o recurso editado atualmente."
 
 msgid "Extra resource options."
-msgstr "Opções de recursos extras."
+msgstr "Opções extra de recursos."
 
 msgid "Edit Resource from Clipboard"
-msgstr "Editar Recursos da Área de Transferência"
+msgstr "Editar Recurso da Área de Transferência"
 
 msgid "Copy Resource"
 msgstr "Copiar Recurso"
@@ -6574,9 +7306,24 @@ msgstr "Gerenciar propriedades do objeto."
 msgid "This cannot be undone. Are you sure?"
 msgstr "Isto não pode ser desfeito. Tem certeza?"
 
+msgid "Add %d Translation"
+msgid_plural "Add %d Translations"
+msgstr[0] "Adicionar %d Tradução"
+msgstr[1] "Adicionar %d Traduções"
+
 msgid "Remove Translation"
 msgstr "Remover Tradução"
 
+msgid "Translation Resource Remap: Add %d Path"
+msgid_plural "Translation Resource Remap: Add %d Paths"
+msgstr[0] "Remapeamento de Recurso de Tradução: Adicionar %d Caminho"
+msgstr[1] "Remapeamento de Recurso de Tradução: Adicionar %d Caminhos"
+
+msgid "Translation Resource Remap: Add %d Remap"
+msgid_plural "Translation Resource Remap: Add %d Remaps"
+msgstr[0] "Remapeamento de Recurso de Tradução: Adicionar %d Remapeamento"
+msgstr[1] "Remapeamento de Recurso de Tradução: Adicionar %d Remapeamentos"
+
 msgid "Change Resource Remap Language"
 msgstr "Alterar Idioma de Remapeamento de Recurso"
 
@@ -6586,6 +7333,11 @@ msgstr "Remover Remapeamento de Recurso"
 msgid "Remove Resource Remap Option"
 msgstr "Remover Opção de Remapeamento de Recurso"
 
+msgid "Add %d file for POT generation"
+msgid_plural "Add %d files for POT generation"
+msgstr[0] "Adicionar %d arquivo para geração de POTs"
+msgstr[1] "Adicionar %d arquivos para geração de POTs"
+
 msgid "Remove file from POT generation"
 msgstr "Remover arquivo da geração de POTs"
 
@@ -6626,13 +7378,13 @@ msgid "Add Built-in Strings to POT"
 msgstr "Adicionar Strings Integradas ao POT"
 
 msgid "Add strings from built-in components such as certain Control nodes."
-msgstr "Adiciona strings de componentes integrados como alguns nós de Control."
+msgstr "Adicionar strings de componentes integrados como alguns nós de Control."
 
 msgid "Set %s on %d nodes"
-msgstr "Definindo %s nós como %d ativos"
+msgstr "Definir %s em %d nós"
 
 msgid "%s (%d Selected)"
-msgstr "%s (%d Selecionado)"
+msgstr "%s (%d Selecionados)"
 
 msgid "Groups"
 msgstr "Grupos"
@@ -6652,8 +7404,8 @@ msgid ""
 "RMB: Erase Point"
 msgstr ""
 "Editar pontos:\n"
-"Botão esquerdo do mouse: Mover Ponto\n"
-"Botão direito do mouse: Apagar Ponto"
+"Clique esquerdo: Mover Ponto\n"
+"Clique direito: Apagar Ponto"
 
 msgid "Erase points."
 msgstr "Apagar pontos."
@@ -6677,13 +7429,13 @@ msgid "Add %s"
 msgstr "Adicionar %s"
 
 msgid "Move Node Point"
-msgstr "Mover o Ponto do Nó"
+msgstr "Mover Ponto do Nó"
 
 msgid "Change BlendSpace1D Config"
 msgstr "Alterar Configuração do BlendSpace1D"
 
 msgid "Change BlendSpace1D Labels"
-msgstr "Alterar Rótulos BlendSpace1D"
+msgstr "Alterar Rótulos do BlendSpace1D"
 
 msgid "This type of node can't be used. Only animation nodes are allowed."
 msgstr ""
@@ -6717,16 +7469,16 @@ msgid "Set the blending position within the space"
 msgstr "Definir posição de mescla dentro do espaço"
 
 msgid "Select and move points, create points with RMB."
-msgstr "Selecione e mova pontos, crie pontos com RMB(botão direito do mouse)."
+msgstr "Selecione e mova pontos, crie pontos com um clique direito."
 
 msgid "Enable snap and show grid."
-msgstr "Habilitar snap e mostrar a grade."
+msgstr "Ativar atração e mostrar a grade."
 
 msgid "Sync:"
-msgstr "Sincronizar:"
+msgstr "Sincronia:"
 
 msgid "Blend:"
-msgstr "Misturar:"
+msgstr "Mistura:"
 
 msgid "Point"
 msgstr "Ponto"
@@ -6744,7 +7496,7 @@ msgid "Add Triangle"
 msgstr "Adicionar Triângulo"
 
 msgid "Change BlendSpace2D Config"
-msgstr "Alterar Configuração BlendSpace2D"
+msgstr "Alterar Configuração do BlendSpace2D"
 
 msgid "Change BlendSpace2D Labels"
 msgstr "Alterar Rótulos de BlendSpace2D"
@@ -6786,7 +7538,7 @@ msgid "Node Moved"
 msgstr "Nó Movido"
 
 msgid "Unable to connect, port may be in use or connection may be invalid."
-msgstr "Incapaz de conectar, a porta pode estar em uso ou a conexão é inválida."
+msgstr "Erro ao conectar, a porta pode estar em uso ou a conexão é inválida."
 
 msgid "Nodes Connected"
 msgstr "Nós Conectados"
@@ -6822,8 +7574,8 @@ msgid ""
 "Animation player has no valid root node path, so unable to retrieve track "
 "names."
 msgstr ""
-"O reprodutor de animações não tem um caminho de nó raiz válido, então não é "
-"possível obter os nomes das faixas."
+"O AnimationPlayer não tem um caminho de nó raiz válido, então não é possível "
+"obter os nomes das faixas."
 
 msgid "Anim Clips"
 msgstr "Clipes de Animação"
@@ -6855,6 +7607,24 @@ msgstr "Preencher Filhos Selecionados"
 msgid "Invert"
 msgstr "Inverter"
 
+msgid "Start of Animation"
+msgstr "Início da Animação"
+
+msgid "End of Animation"
+msgstr "Fim da Animação"
+
+msgid "Set Custom Timeline from Marker"
+msgstr "Definir Linha do Tempo Personalizada a partir de Marcador"
+
+msgid "Select Markers"
+msgstr "Selecionar Marcadores"
+
+msgid "Start Marker"
+msgstr "Marcador de Início"
+
+msgid "End Marker"
+msgstr "Marcador de Fim"
+
 msgid "Library Name:"
 msgstr "Nome da Biblioteca:"
 
@@ -6886,7 +7656,7 @@ msgid "Library name is valid."
 msgstr "Nome da biblioteca é válido."
 
 msgid "Add Animation to Library: %s"
-msgstr "Adicionar Animação a Biblioteca: %s"
+msgstr "Adicionar Animação à Biblioteca: %s"
 
 msgid "Add Animation Library: %s"
 msgstr "Adicionar Biblioteca de Animações: %s"
@@ -6935,10 +7705,10 @@ msgid "Make Animation Unique: %s"
 msgstr "Tornar Animação Única: %s"
 
 msgid "Save Animation library to File: %s"
-msgstr "Salvar Biblioteca de Animações para o Arquivo: %s"
+msgstr "Salvar Biblioteca de Animações como Arquivo: %s"
 
 msgid "Save Animation to File: %s"
-msgstr "Salvar Animação em Arquivo: %s"
+msgstr "Salvar Animação como Arquivo: %s"
 
 msgid "Some AnimationLibrary files were invalid."
 msgstr "Alguns arquivos da AnimationLibrary eram inválidos."
@@ -6955,7 +7725,7 @@ msgstr "Alguns arquivos de Animação eram inválidos."
 
 msgid "Some of the selected animations were already added to the library."
 msgstr ""
-"Algumas das animações selecionadas já tinham sido adicionadas a biblioteca."
+"Algumas das animações selecionadas já tinham sido adicionadas à biblioteca."
 
 msgid "Load Animations into Library"
 msgstr "Carregar Animações na Biblioteca"
@@ -6991,22 +7761,22 @@ msgid "Remove Animation from Library: %s"
 msgstr "Remover Animação da Biblioteca: %s"
 
 msgid "[built-in]"
-msgstr "[Embutido]"
+msgstr "[embutida]"
 
 msgid "[foreign]"
-msgstr "[Avulsa]"
+msgstr "[avulsa]"
 
 msgid "[imported]"
-msgstr "[Importada]"
+msgstr "[importada]"
 
 msgid "Add animation to library."
-msgstr "Adicionar Animação a Biblioteca."
+msgstr "Adicionar animação à biblioteca."
 
 msgid "Load animation from file and add to library."
-msgstr "Carregar animação a partir de arquivo e adicionar a biblioteca."
+msgstr "Carregar arquivo de animação e adicionar à biblioteca."
 
 msgid "Paste animation to library from clipboard."
-msgstr "Colar Animação da área de transferência na Biblioteca."
+msgstr "Colar animação da área de transferência na biblioteca."
 
 msgid "Save animation library to resource on disk."
 msgstr "Salvar biblioteca de animação como recurso em disco."
@@ -7021,7 +7791,7 @@ msgid "Save animation to resource on disk."
 msgstr "Salvar animação como recurso em disco."
 
 msgid "Remove animation from Library."
-msgstr "Remover Animação da Biblioteca."
+msgstr "Remover animação da Biblioteca."
 
 msgid "Edit Animation Libraries"
 msgstr "Editar Bibliotecas de Animações"
@@ -7042,7 +7812,7 @@ msgid "Storage"
 msgstr "Armazenamento"
 
 msgid "Toggle Autoplay"
-msgstr "Alternar Início Automático"
+msgstr "Alternar Reprodução Automática"
 
 msgid "Create New Animation"
 msgstr "Criar Nova Animação"
@@ -7066,13 +7836,13 @@ msgid "Invalid animation name!"
 msgstr "Nome de animação inválido!"
 
 msgid "Animation '%s' already exists!"
-msgstr "A Animação '%s' já existe!"
+msgstr "A animação '%s' já existe!"
 
 msgid "Duplicate Animation"
 msgstr "Duplicar Animação"
 
 msgid "Blend Next Changed"
-msgstr "Mesclar com o Próxima Alteração"
+msgstr "Mesclar com o Próximo Alterado"
 
 msgid "Change Blend Time"
 msgstr "Alterar Tempo de Mesclagem"
@@ -7084,7 +7854,22 @@ msgid "Duplicated Animation Name:"
 msgstr "Nome da Animação Duplicada:"
 
 msgid "Onion skinning requires a RESET animation."
-msgstr "Papel Vegetal requer uma animação de RESET."
+msgstr "Papel vegetal requer uma animação de RESET."
+
+msgid "Play Animation Backwards"
+msgstr "Reproduzir Animação em Reverso"
+
+msgid "Play Animation Backwards from End"
+msgstr "Reproduzir Animação em Reverso a partir do Final"
+
+msgid "Pause/Stop Animation"
+msgstr "Pausar/Parar Animação"
+
+msgid "Play Animation from Start"
+msgstr "Reproduzir Animação do Início"
+
+msgid "Play Animation"
+msgstr "Reproduzir Animação"
 
 msgid "Animation position (in seconds)."
 msgstr "Posição da Animação (em segundos)."
@@ -7108,16 +7893,16 @@ msgid "Edit Transitions..."
 msgstr "Editar Transições..."
 
 msgid "Display list of animations in player."
-msgstr "Mostrar lista de Animações no reprodutor."
+msgstr "Mostrar lista de animações no reprodutor."
 
 msgid "Autoplay on Load"
 msgstr "Auto-reproduzir ao Carregar"
 
 msgid "Enable Onion Skinning"
-msgstr "Ativar Papel Vegetal(transparência)"
+msgstr "Ativar Papel Vegetal (transparência)"
 
 msgid "Onion Skinning Options"
-msgstr "Opções da Transparência"
+msgstr "Opções do Papel Vegetal"
 
 msgid "Directions"
 msgstr "Direções"
@@ -7132,19 +7917,19 @@ msgid "Depth"
 msgstr "Profundidade"
 
 msgid "1 step"
-msgstr "1 passo"
+msgstr "1 incremento"
 
 msgid "2 steps"
-msgstr "2 passos"
+msgstr "2 incrementos"
 
 msgid "3 steps"
-msgstr "3 passos"
+msgstr "3 incrementos"
 
 msgid "Differences Only"
 msgstr "Apenas Diferenças"
 
 msgid "Force White Modulate"
-msgstr "Forçar Módulo Branco"
+msgstr "Forçar Modulação de Cor Branca"
 
 msgid "Include Gizmos (3D)"
 msgstr "Incluir Gizmos (3D)"
@@ -7161,6 +7946,12 @@ msgstr "Tempos de Mesclagem:"
 msgid "Next (Auto Queue):"
 msgstr "Próximo (Auto Enfileirar):"
 
+msgid "Go to Next Keyframe"
+msgstr "Ir ao Próximo Quadro-Chave"
+
+msgid "Go to Previous Keyframe"
+msgstr "Ir ao Quadro-Chave Anterior"
+
 msgid "Toggle Animation Bottom Panel"
 msgstr "Alternar Painel Inferior de Animação"
 
@@ -7171,7 +7962,7 @@ msgid "Transition exists!"
 msgstr "A transição já existe!"
 
 msgid "Play/Travel to %s"
-msgstr "Jogar/Viajar para %s"
+msgstr "Reproduzir/Ir para %s"
 
 msgid "Edit %s"
 msgstr "Editar %s"
@@ -7287,7 +8078,7 @@ msgid "Request failed, return code:"
 msgstr "A solicitação falhou, código de retorno:"
 
 msgid "Cannot save response to:"
-msgstr "Não é possível salvar a resposta para:"
+msgstr "Não foi possível salvar a resposta para:"
 
 msgid "Write error."
 msgstr "Erro ao gravar."
@@ -7308,7 +8099,7 @@ msgid "Failed:"
 msgstr "Falhou:"
 
 msgid "Bad download hash, assuming file has been tampered with."
-msgstr "Hash de download ruim, assumindo que o arquivo foi adulterado."
+msgstr "Hash de download incorreta, o arquivo pode ter sido adulterado."
 
 msgid "Expected:"
 msgstr "Esperado:"
@@ -7353,7 +8144,7 @@ msgid "Recently Updated"
 msgstr "Atualizado Recentemente"
 
 msgid "Least Recently Updated"
-msgstr "Ultima Atualização Recente"
+msgstr "Atualizado Menos Recentemente"
 
 msgid "Name (A-Z)"
 msgstr "Nome (A-Z)"
@@ -7378,7 +8169,7 @@ msgstr "Carregando..."
 
 msgctxt "Pagination"
 msgid "First"
-msgstr "Primeiro"
+msgstr "Primeira"
 
 msgctxt "Pagination"
 msgid "Previous"
@@ -7386,22 +8177,19 @@ msgstr "Anterior"
 
 msgctxt "Pagination"
 msgid "Next"
-msgstr "Próximo"
+msgstr "Próxima"
 
 msgctxt "Pagination"
 msgid "Last"
-msgstr "Último"
+msgstr "Última"
 
 msgid ""
 "The Asset Library requires an online connection and involves sending data "
 "over the internet."
 msgstr ""
-"A Biblioteca de Recursos requer uma conexão on-line e envolve envio de dados "
+"A Biblioteca de Recursos requer uma conexão online e envolve envio de dados "
 "pela Internet."
 
-msgid "Go Online"
-msgstr "Ficar Online"
-
 msgid "Failed to get repository configuration."
 msgstr "Erro ao obter configurações do repositório."
 
@@ -7416,7 +8204,7 @@ msgid ""
 "Check the enabled support levels using the 'Support' button in the top-right "
 "corner."
 msgstr ""
-"Nenhum resultado compatível com %s %s para nível(is) suportado(s): %s.\n"
+"Nenhum resultado compatível com %s %s em nível(is) suportado(s): %s.\n"
 "Verifique os níveis de suporte habilitados no botão de 'Suporte' no canto "
 "superior direito."
 
@@ -7460,13 +8248,13 @@ msgid "Preview"
 msgstr "Visualização"
 
 msgid "Configure Snap"
-msgstr "Configurar Ajuste"
+msgstr "Configurar Atração"
 
 msgid "Grid Offset:"
 msgstr "Deslocamento da Grade:"
 
 msgid "Grid Step:"
-msgstr "Passo de Grade:"
+msgstr "Incremento de Grade:"
 
 msgid "Primary Line Every:"
 msgstr "Linha Primária a Cada:"
@@ -7475,10 +8263,10 @@ msgid "Rotation Offset:"
 msgstr "Deslocamento de Rotação:"
 
 msgid "Rotation Step:"
-msgstr "Passo de Rotação:"
+msgstr "Incremento de Rotação:"
 
 msgid "Scale Step:"
-msgstr "Escala do Passo:"
+msgstr "Incremento de Escala:"
 
 msgid ""
 "Children of a container get their position and size determined only by their "
@@ -7515,34 +8303,34 @@ msgid "Set CanvasItem \"%s\" Pivot Offset to (%d, %d)"
 msgstr "Definir Deslocamento do Pivô do CanvasItem \"%s\" para (%d, %d)"
 
 msgid "Rotate %d CanvasItems"
-msgstr "Rotacionar %d CanvasItem"
+msgstr "Rotacionar %d CanvasItems"
 
 msgid "Rotate CanvasItem \"%s\" to %d degrees"
 msgstr "Rotacionar CanvasItem \"%s\" para %d graus"
 
 msgid "Move CanvasItem \"%s\" Anchor"
-msgstr "Mover Âncora do CanvaItem \"%s\""
+msgstr "Mover Âncora \"%s\" do CanvasItem"
 
 msgid "Scale Node2D \"%s\" to (%s, %s)"
 msgstr "Dimensionar Node2D \"%s\" para (%s, %s)"
 
 msgid "Resize Control \"%s\" to (%d, %d)"
-msgstr "Redimensionar Controle \"%s\" para (%d, %d)"
+msgstr "Redimensionar Control \"%s\" para (%d, %d)"
 
 msgid "Scale %d CanvasItems"
-msgstr "Dimensionar %d CanvasItem"
+msgstr "Dimensionar %d CanvasItems"
 
 msgid "Scale CanvasItem \"%s\" to (%s, %s)"
 msgstr "Redimensionar CanvasItem \"%s\" para (%s, %s)"
 
 msgid "Move %d CanvasItems"
-msgstr "Mover %d CanvaItem"
+msgstr "Mover %d CanvaItems"
 
 msgid "Move CanvasItem \"%s\" to (%d, %d)"
-msgstr "Mover CanvaItem \"%s\" para (%d, %d)"
+msgstr "Mover CanvasItem \"%s\" para (%d, %d)"
 
 msgid "Locked"
-msgstr "Fixar Seleção"
+msgstr "Trancado"
 
 msgid "Grouped"
 msgstr "Agrupado"
@@ -7572,19 +8360,19 @@ msgid "Rotating:"
 msgstr "Rotacionando:"
 
 msgid "Scaling:"
-msgstr "Escala:"
+msgstr "Escalonando:"
 
 msgid "Lock Selected"
-msgstr "Fixar Seleção"
+msgstr "Trancar Seleção"
 
 msgid "Unlock Selected"
-msgstr "Destravar Selecionado"
+msgstr "Destrancar Seleção"
 
 msgid "Group Selected"
-msgstr "Agrupar Selecionados"
+msgstr "Agrupar Seleção"
 
 msgid "Ungroup Selected"
-msgstr "Desagrupar Selecionados"
+msgstr "Desagrupar Seleção"
 
 msgid "Paste Pose"
 msgstr "Colar Pose"
@@ -7593,7 +8381,7 @@ msgid "Clear Guides"
 msgstr "Limpar Guias"
 
 msgid "Create Custom Bone2D(s) from Node(s)"
-msgstr "Crie Bone2D(s) personalizado(s) a partir do(s) nó(s)"
+msgstr "Criar Bone2D(s) personalizado(s) a partir do(s) nó(s)"
 
 msgid "Cancel Transformation"
 msgstr "Cancelar Transformação"
@@ -7629,30 +8417,33 @@ msgid "Zoom to 1600%"
 msgstr "Zoom de 1600%"
 
 msgid "Center View"
-msgstr "Centrar Visualização"
+msgstr "Centralizar Câmera"
 
 msgid "Select Mode"
 msgstr "Modo de Seleção"
 
 msgid "Drag: Rotate selected node around pivot."
-msgstr "Arrastar: Rotação de nódulo selecionado ao redor de pivô."
+msgstr "Arrastar: Rotacionar nó selecionado ao redor do pivô."
 
 msgid "Alt+Drag: Move selected node."
 msgstr "Alt+Arrastar: Mover nó selecionado."
 
 msgid "Alt+Drag: Scale selected node."
-msgstr "Alt+Arrastar: Dimensionar tamanho do nó selecionado."
+msgstr "Alt+Arrastar: Redimensionar nó selecionado."
 
 msgid "V: Set selected node's pivot position."
-msgstr "V: Estabelece a posição do nódulo selecionado."
+msgstr "V: Definir posição do pivô do nó selecionado."
 
 msgid "Alt+RMB: Show list of all nodes at position clicked, including locked."
 msgstr ""
-"Alt+Botão Direito do Mouse: Mostrar a lista de todos os nós na posição "
-"clicada, incluindo os bloqueados."
+"Alt+Clique Direito: Mostrar lista de todos os nós na posição clicada, "
+"inclusive os trancados."
+
+msgid "(Available in all modes.)"
+msgstr "(Disponível em todos os modos.)"
 
 msgid "RMB: Add node at position clicked."
-msgstr "Botão Direito do Mouse: Adiciona nó na posição clicada."
+msgstr "Clique Direito: Adicionar nó na posição clicada."
 
 msgid "Move Mode"
 msgstr "Modo de Movimentação"
@@ -7664,93 +8455,106 @@ msgid "Scale Mode"
 msgstr "Modo de Escalonamento"
 
 msgid "Shift: Scale proportionally."
-msgstr "Shift: Dimensiona proporcionalmente."
+msgstr "Shift: Redimensiona proporcionalmente."
 
 msgid "Show list of selectable nodes at position clicked."
 msgstr "Mostra lista de nós selecionáveis na posição clicada."
 
+msgid "Click to change object's pivot."
+msgstr "Clique para alterar o pivô do objeto."
+
+msgid "Shift: Set temporary pivot."
+msgstr "Shift: Definir pivô temporário."
+
+msgid ""
+"Click this button while holding Shift to put the temporary pivot in the "
+"center of the selected nodes."
+msgstr ""
+"Clique neste botão enquanto segura Shift para posicionar o pivô temporário no "
+"centro dos nós selecionados."
+
 msgid "Pan Mode"
-msgstr "Modo Panorâmico"
+msgstr "Modo de Movimentação da Câmera"
 
 msgid ""
 "You can also use Pan View shortcut (Space by default) to pan in any mode."
 msgstr ""
-"Você também pode usar o atalho de visão Panorâmica (Barra de Espaço por "
-"padrão) para usar Pan em qualquer modo."
+"Você também pode usar o atalho de Mover Câmera (Barra de Espaço por padrão) "
+"para mover a câmera em qualquer modo."
 
 msgid "Ruler Mode"
 msgstr "Modo de Régua"
 
 msgid "Toggle smart snapping."
-msgstr "Alternar Encaixe Inteligente."
+msgstr "Alternar Atração Inteligente."
 
 msgid "Use Smart Snap"
-msgstr "Usar Encaixe Inteligente"
+msgstr "Usar Atração Inteligente"
 
 msgid "Toggle grid snapping."
-msgstr "Alternar encaixe de grade."
+msgstr "Alternar atração à grade."
 
 msgid "Use Grid Snap"
-msgstr "Usar Encaixe de Grade"
+msgstr "Usar Atração à Grade"
 
 msgid "Snapping Options"
-msgstr "Opções de Encaixe"
+msgstr "Opções de Atração"
 
 msgid "Use Rotation Snap"
-msgstr "Usar Encaixe de Rotação"
+msgstr "Usar Atração de Rotação"
 
 msgid "Use Scale Snap"
-msgstr "Usar Encaixe Dimensionado"
+msgstr "Usar Atração de Escalonamento"
 
 msgid "Snap Relative"
-msgstr "Encaixe Relativo"
+msgstr "Atração Relativa"
 
 msgid "Use Pixel Snap"
-msgstr "Usar Encaixe de Pixel"
+msgstr "Usar Atração a Pixels"
 
 msgid "Snap to Parent"
-msgstr "Encaixar no Pai"
+msgstr "Atrair ao Pai"
 
 msgid "Snap to Node Anchor"
-msgstr "Encaixar na Âncora do Nó"
+msgstr "Atrair à Âncora do Nó"
 
 msgid "Snap to Node Sides"
-msgstr "Encaixar nos Lados do Nó"
+msgstr "Atrair aos Lados do Nó"
 
 msgid "Snap to Node Center"
-msgstr "Encaixar no Centro do Nó"
+msgstr "Atrair ao Centro do Nó"
 
 msgid "Snap to Other Nodes"
-msgstr "Encaixar em Outros Nós"
+msgstr "Atrair a Outros Nós"
 
 msgid "Snap to Guides"
-msgstr "Encaixar nas Guias"
+msgstr "Atrair às Guias"
 
 msgid "Smart Snapping"
-msgstr "Encaixe Inteligente"
+msgstr "Atração Inteligente"
 
 msgid "Configure Snap..."
-msgstr "Configurar Encaixe..."
+msgstr "Configurar Atração..."
 
 msgid "Lock selected node, preventing selection and movement."
-msgstr "Travar Nó selecionado, prevenindo sua seleção e movimentação."
+msgstr "Trancar nó selecionado, prevenindo sua seleção e movimentação."
 
 msgid "Unlock selected node, allowing selection and movement."
-msgstr "Destravar o Nó selecionado, permitindo sua seleção e movimentação."
+msgstr "Destrancar o nó selecionado, permitindo sua seleção e movimentação."
 
 msgid ""
 "Groups the selected node with its children. This causes the parent to be "
 "selected when any child node is clicked in 2D and 3D view."
 msgstr ""
 "Agrupa o nó selecionado com seus filhos. Isso faz com que o pai seja "
-"selecionado quando qualquer nó filho é clicado em uma visão da cena 2D e 3D."
+"selecionado sempre que qualquer nó filho for clicado nos editores 2D e 3D."
 
 msgid ""
 "Ungroups the selected node from its children. Child nodes will be individual "
 "items in 2D and 3D view."
 msgstr ""
-"Desagrupa o nó selecionado de seus filhos. Nós filhos serão itens individuais "
-"em uma visão da cena 2D e 3D."
+"Desagrupa o nó selecionado de seus filhos. Nós filhos podem ser selecionados "
+"individualmente nos editores 2D e 3D."
 
 msgid "Skeleton Options"
 msgstr "Opções de Esqueleto"
@@ -7768,7 +8572,7 @@ msgid "Show"
 msgstr "Exibir"
 
 msgid "Show When Snapping"
-msgstr "Exibir ao Encaixar"
+msgstr "Exibir ao Atrair"
 
 msgid "Toggle Grid"
 msgstr "Alternar Grade"
@@ -7804,13 +8608,13 @@ msgid "Gizmos"
 msgstr "Gizmos"
 
 msgid "Center Selection"
-msgstr "Centrar Seleção"
+msgstr "Centralizar Seleção"
 
 msgid "Frame Selection"
 msgstr "Seleção de Quadro"
 
 msgid "Preview Canvas Scale"
-msgstr "Visualização da Escala no Canvas"
+msgstr "Visualizar Escala da Tela"
 
 msgid "Project theme"
 msgstr "Tema do Projeto"
@@ -7822,19 +8626,19 @@ msgid "Default theme"
 msgstr "Tema Padrão"
 
 msgid "Preview Theme"
-msgstr "Pré-visualizar tema"
+msgstr "Pré-visualizar Tema"
 
 msgid "Translation mask for inserting keys."
-msgstr "Máscara de translação para inserção de chaves."
+msgstr "Máscara de posição para inserção de chaves."
 
 msgid "Rotation mask for inserting keys."
 msgstr "Máscara de rotação para inserção de chaves."
 
 msgid "Scale mask for inserting keys."
-msgstr "Máscara de Escala para inserir chaves."
+msgstr "Máscara de escala para inserir chaves."
 
 msgid "Insert keys (based on mask)."
-msgstr "Inserir Chaves (baseado na máscara)."
+msgstr "Inserir chaves (baseado na máscara)."
 
 msgid "Insert Key"
 msgstr "Inserir Chave"
@@ -7845,8 +8649,8 @@ msgid ""
 "Keys are only added to existing tracks, no new tracks will be created.\n"
 "Keys must be inserted manually for the first time."
 msgstr ""
-"Inserir chaves automaticamente quando os objetos são transladados, "
-"rotacionados ou escalonados(com base na máscara).\n"
+"Inserir chaves automaticamente quando os objetos são movidos, rotacionados ou "
+"escalonados (com base na máscara).\n"
 "As chaves são adicionadas apenas às faixas existentes, nenhuma nova faixa "
 "será criada.\n"
 "As chaves devem ser inseridas manualmente na primeira vez."
@@ -7867,10 +8671,10 @@ msgid "Clear Pose"
 msgstr "Limpar Pose"
 
 msgid "Multiply grid step by 2"
-msgstr "Multiplicar o passo da grade por 2"
+msgstr "Multiplicar o incremento da grade por 2"
 
 msgid "Divide grid step by 2"
-msgstr "Dividir o passo da grade por 2"
+msgstr "Dividir o incremento da grade por 2"
 
 msgid "Adding %s..."
 msgstr "Adicionando %s..."
@@ -7894,10 +8698,10 @@ msgid "Creating inherited scene from: %s"
 msgstr "Criando uma cena herdada a partir de: %s"
 
 msgid "Instantiating: "
-msgstr "Instanciando. "
+msgstr "Instanciando: "
 
 msgid "Adding %s and %s..."
-msgstr "Adicionando %s e %s ..."
+msgstr "Adicionando %s e %s..."
 
 msgid ""
 "Drag and drop to add as sibling of selected node (except when root is "
@@ -7910,10 +8714,10 @@ msgid "Hold Shift when dropping to add as child of selected node."
 msgstr "Segure Shift ao soltar para adicionar como filho do nó selecionado."
 
 msgid "Hold Alt when dropping to add as child of root node."
-msgstr "Segure Alt quando for soltar para adicionar como um filho do Nó Raiz."
+msgstr "Segure Alt quando for soltar para adicionar como um filho do nó raiz."
 
 msgid "Hold Alt + Shift when dropping to add as different node type."
-msgstr "Segure Alt+Shift ao soltar para adicionar o nó como um de outro tipo."
+msgstr "Segure Alt + Shift ao soltar para adicionar o nó como outro tipo."
 
 msgid "Change Default Type"
 msgstr "Mudar Tipo Padrão"
@@ -7922,33 +8726,33 @@ msgid ""
 "All selected CanvasItems are either invisible or locked in some way and can't "
 "be transformed."
 msgstr ""
-"Todos os CanvasItems selecionados estão invisíveis ou bloqueados de alguma "
+"Todos os CanvasItems selecionados estão invisíveis ou trancados de alguma "
 "forma e não podem ser transformados."
 
 msgid "Set Target Position"
-msgstr "Definir Posição do Alvo"
+msgstr "Definir Posição Alvo"
 
 msgid "Set Handle"
-msgstr "Definir Manipulador"
+msgstr "Definir Ponto de Controle"
 
 msgid "This node doesn't have a control parent."
-msgstr "Esse Nó não tem um Control como pai."
+msgstr "Este nó não tem um Control como pai."
 
 msgid ""
 "Use the appropriate layout properties depending on where you are going to put "
 "it."
 msgstr ""
 "Use as propriedades de layout apropriadas, dependendo de onde você vai colocá-"
-"la."
+"lo."
 
 msgid "This node is a child of a container."
-msgstr "Este nó é filho de um container."
+msgstr "Este nó é filho de um contêiner."
 
 msgid "Use container properties for positioning."
-msgstr "Usar propriedades do container para o posicionamento."
+msgstr "Use as propriedades do contêiner para definir posicionamento."
 
 msgid "This node is a child of a regular control."
-msgstr "Este nó é filho de um control regular."
+msgstr "Este nó é filho de um Control regular."
 
 msgid "Use anchors and the rectangle for positioning."
 msgstr "Use âncoras e o retângulo para posicionamento."
@@ -7960,7 +8764,7 @@ msgid "Expand positioning hint."
 msgstr "Expandir inferência de posicionamento."
 
 msgid "Container Default"
-msgstr "Padrão do Conteiner"
+msgstr "Padrão do Contêiner"
 
 msgid "Fill"
 msgstr "Preencher"
@@ -7975,7 +8779,7 @@ msgid "Shrink End"
 msgstr "Reduzir ao Final"
 
 msgid "Custom"
-msgstr "Personalizar"
+msgstr "Personalizado"
 
 msgid "Expand"
 msgstr "Expandir"
@@ -7984,13 +8788,13 @@ msgid "Top Left"
 msgstr "Superior Esquerda"
 
 msgid "Center Top"
-msgstr "Centro Superior"
+msgstr "Superior Centro"
 
 msgid "Top Right"
 msgstr "Superior Direita"
 
 msgid "Top Wide"
-msgstr "Largura Superior"
+msgstr "Superior Largura Total"
 
 msgid "Center Left"
 msgstr "Centro Esquerda"
@@ -8002,41 +8806,41 @@ msgid "Center Right"
 msgstr "Centro Direita"
 
 msgid "HCenter Wide"
-msgstr "Largura Centro Horizontal"
+msgstr "Centro Largura Total"
 
 msgid "Bottom Left"
 msgstr "Inferior Esquerda"
 
 msgid "Center Bottom"
-msgstr "Centro Inferior"
+msgstr "Inferior Centro"
 
 msgid "Bottom Right"
 msgstr "Inferior Direita"
 
 msgid "Bottom Wide"
-msgstr "Largura Inferior"
+msgstr "Inferior Largura Total"
 
 msgid "Left Wide"
-msgstr "Largura Esquerda"
+msgstr "Esquerda Altura Total"
 
 msgid "VCenter Wide"
-msgstr "Largura Centro Vertical"
+msgstr "Centro Altura Total"
 
 msgid "Right Wide"
-msgstr "Largura Direita"
+msgstr "Direita Altura Total"
 
 msgid "Full Rect"
-msgstr "Retângulo Completo"
+msgstr "Preencher Retângulo"
 
 msgid ""
 "Enable to also set the Expand flag.\n"
 "Disable to only set Shrink/Fill flags."
 msgstr ""
-"Habilite para definir também o marcador Expandir.\n"
-"Desative para definir apenas os marcadores Encolher/Preencher."
+"Ative para definir também a opção Expandir.\n"
+"Desative para definir apenas as opções Reduzir/Preencher."
 
 msgid "Some parents of the selected nodes do not support the Expand flag."
-msgstr "Alguns pais dos nós selecionados não suportam o marcador Expandir."
+msgstr "Alguns pais dos nós selecionados não suportam a opção Expandir."
 
 msgid "Change Anchors, Offsets, Grow Direction"
 msgstr "Alterar Âncoras, Deslocamentos, Direção de Expansão"
@@ -8045,16 +8849,16 @@ msgid "Change Anchors, Offsets (Keep Ratio)"
 msgstr "Alterar Âncoras, Deslocamentos (Manter Proporção)"
 
 msgid "Change Vertical Size Flags"
-msgstr "Alterar Marcadores Verticais de Tamanho"
+msgstr "Alterar Opções de Tamanho Vertical"
 
 msgid "Change Horizontal Size Flags"
-msgstr "Alterar Marcadores Horizontais de Tamanho"
+msgstr "Alterar Opções de Tamanho Horizontal"
 
 msgid "Change Vertical Expand Flag"
-msgstr "Alterar marcador de Expansão Vertical"
+msgstr "Alterar Opção de Expansão Vertical"
 
 msgid "Change Horizontal Expand Flag"
-msgstr "Alterar marcador de Expansão Horizontal"
+msgstr "Alterar Opção de Expansão Horizontal"
 
 msgid "Presets for the anchor and offset values of a Control node."
 msgstr ""
@@ -8068,18 +8872,17 @@ msgstr "Definir para Proporção Atual"
 
 msgid "Adjust anchors and offsets to match the current rect size."
 msgstr ""
-"Ajusta âncoras e deslocamentos para corresponder ao tamanho do retângulo "
+"Ajustar âncoras e deslocamentos para corresponder ao tamanho do retângulo "
 "atual."
 
 msgid ""
 "When active, moving Control nodes changes their anchors instead of their "
 "offsets."
 msgstr ""
-"Quando ativos, os nós Control em movimento alteram suas âncoras em vez de "
-"seus deslocamentos."
+"Ao ativar, mover nós Control altera suas âncoras em vez de seus deslocamentos."
 
 msgid "Sizing settings for children of a Container node."
-msgstr "Configurações de dimensionamento para filhos de um nó de Container."
+msgstr "Configurações de dimensionamento para filhos de um nó Container."
 
 msgid "Horizontal alignment"
 msgstr "Alinhamento Horizontal"
@@ -8088,10 +8891,10 @@ msgid "Vertical alignment"
 msgstr "Alinhamento Vertical"
 
 msgid "Load Curve Preset"
-msgstr "Carregar Definição de Curva"
+msgstr "Carregar Predefinição de Curva"
 
 msgid "Add Curve Point"
-msgstr "Adicionar ponto de curva"
+msgstr "Adicionar Ponto à Curva"
 
 msgid "Remove Curve Point"
 msgstr "Remover Ponto da Curva"
@@ -8100,34 +8903,34 @@ msgid "Modify Curve Point"
 msgstr "Modificar Ponto da Curva"
 
 msgid "Modify Curve Point's Tangents"
-msgstr "Modifique as tangentes do ponto da curva"
+msgstr "Modificar as Tangentes do Ponto da Curva"
 
 msgid "Modify Curve Point's Left Tangent"
-msgstr "Modifique a tangente esquerda do ponto da curva"
+msgstr "Modificar a Tangente Esquerda do Ponto da Curva"
 
 msgid "Modify Curve Point's Right Tangent"
-msgstr "Modificar a tangente direita do ponto da curva"
+msgstr "Modificar a Tangente Direita do Ponto da Curva"
 
 msgid "Toggle Linear Curve Point's Tangent"
-msgstr "Alternar a tangente do ponto da curva linear"
+msgstr "Alternar a Tangente do Ponto da Curva Linear"
 
 msgid "Hold Shift to edit tangents individually"
 msgstr "Segure Shift para editar tangentes individualmente"
 
 msgid "Ease In"
-msgstr "Esmaecer de Entrada"
+msgstr "Transição de Entrada"
 
 msgid "Ease Out"
-msgstr "Esmaecer de Saída"
+msgstr "Transição de Saída"
 
 msgid "Smoothstep"
-msgstr "Passo Suave"
+msgstr "Incremento Suave"
 
 msgid "Toggle Grid Snap"
-msgstr "Alternar Encaixe da Grade"
+msgstr "Alternar Atração à Grade"
 
 msgid "Debug with External Editor"
-msgstr "Depurar com o Editor Externo"
+msgstr "Depurar com Editor Externo"
 
 msgid "Toggle Debugger Bottom Panel"
 msgstr "Alternar Painel Inferior de Depuração"
@@ -8143,11 +8946,11 @@ msgid ""
 "mobile device).\n"
 "You don't need to enable it to use the GDScript debugger locally."
 msgstr ""
-"Quando esta opção estiver habilitada, usar a implantação com um clique fará "
-"com que o executável tente se conectar ao IP deste computador para que o "
-"projeto em execução possa ser depurado.\n"
-"Esta opção destina-se a ser usada para depuração remota (normalmente com um "
-"dispositivo móvel).\n"
+"Ao ativar esta opção, usar a implantação em um clique fará com que o "
+"executável tente se conectar ao IP deste computador para que o projeto em "
+"execução possa ser depurado.\n"
+"Esta opção serve para fazer depuração remota (normalmente com um dispositivo "
+"móvel).\n"
 "Você não precisa ativá-la para usar o depurador GDScript localmente."
 
 msgid "Small Deploy with Network Filesystem"
@@ -8161,12 +8964,12 @@ msgid ""
 "On Android, deploying will use the USB cable for faster performance. This "
 "option speeds up testing for projects with large assets."
 msgstr ""
-"Quando esta opção estiver habilitada, usar a implantação com um clique para "
-"Android exportará apenas um executável sem os dados do projeto.\n"
-"O sistema de arquivos será fornecido a partir do projeto pelo editor pela "
-"rede.\n"
-"No Android, a implantação usará o cabo USB para um desempenho mais rápido. "
-"Essa opção acelera o teste de projetos com grandes ativos."
+"Ao ativar esta opção, usar a implantação em um clique para Android exportará "
+"apenas um executável sem os dados do projeto.\n"
+"O sistema de arquivos será fornecido diretamente do projeto pelo editor "
+"através rede.\n"
+"No Android, a implantação usará o cabo USB para um melhor desempenho. Esta "
+"opção deixa o teste de projetos com recursos pesados mais eficiente."
 
 msgid "Visible Collision Shapes"
 msgstr "Formas de Colisão Visíveis"
@@ -8175,8 +8978,8 @@ msgid ""
 "When this option is enabled, collision shapes and raycast nodes (for 2D and "
 "3D) will be visible in the running project."
 msgstr ""
-"Quando esta opção está ativa, formas de colisão e nós do tipo RayCast (2D e "
-"3D) serão visíveis durante a execução do projeto."
+"Ao ativar esta opção, formas de colisão e nós do tipo RayCast (2D e 3D) serão "
+"visíveis durante a execução do projeto."
 
 msgid "Visible Paths"
 msgstr "Caminhos Visíveis"
@@ -8185,8 +8988,8 @@ msgid ""
 "When this option is enabled, curve resources used by path nodes will be "
 "visible in the running project."
 msgstr ""
-"Quando esta opção está ativa, recursos de curva usados por Nós de Caminho "
-"estarão visíveis ao rodar o projeto."
+"Ao ativar esta opção, recursos de curva usados por nós de caminho serão "
+"visíveis ao rodar o projeto."
 
 msgid "Visible Navigation"
 msgstr "Navegação Visível"
@@ -8195,8 +8998,8 @@ msgid ""
 "When this option is enabled, navigation meshes, and polygons will be visible "
 "in the running project."
 msgstr ""
-"Quando esta opção está ativa, malhas e polígonos de navegação estarão "
-"visíveis no projeto em execução."
+"Ao ativar esta opção, malhas e polígonos de navegação serão visíveis no "
+"projeto em execução."
 
 msgid "Visible Avoidance"
 msgstr "Evitação Visível"
@@ -8205,20 +9008,20 @@ msgid ""
 "When this option is enabled, avoidance object shapes, radiuses, and "
 "velocities will be visible in the running project."
 msgstr ""
-"Quando esta opção estiver habilitada, as formas, raios e velocidades dos "
-"objetos de evitação ficarão visíveis no projeto em execução."
+"Ao ativar esta opção, as formas, raios e velocidades dos objetos de evitação "
+"serão visíveis no projeto em execução."
 
 msgid "Debug CanvasItem Redraws"
-msgstr "Depurar redesenhos do CanvasItem"
+msgstr "Depurar Redesenhos de CanvasItem"
 
 msgid ""
 "When this option is enabled, redraw requests of 2D objects will become "
 "visible (as a short flash) in the running project.\n"
 "This is useful to troubleshoot low processor mode."
 msgstr ""
-"Quando esta opção está ativa, pedidos de redesenhos de objetos 2D estarão "
-"visíveis (como uma piscada curta) no projeto em execução.\n"
-"Isso é útil para investigação de problemas no modo de processador fraco."
+"Ao ativar esta opção, pedidos de redesenho de objetos 2D serão visíveis (como "
+"uma piscada curta) no projeto em execução.\n"
+"Isso é útil para investigar problemas no modo de processador fraco."
 
 msgid "Synchronize Scene Changes"
 msgstr "Sincronizar Mudanças de Cena"
@@ -8229,10 +9032,10 @@ msgid ""
 "When used remotely on a device, this is more efficient when the network "
 "filesystem option is enabled."
 msgstr ""
-"Quando esta opção estiver ativa, quaisquer alterações feitas na cena do "
-"editor serão replicadas no projeto em execução.\n"
-"Quando usado remotamente em um dispositivo, isso é mais eficiente se a opção "
-"de sistema de arquivos de rede está ativa."
+"Ao ativar esta opção, quaisquer alterações feitas na cena do editor serão "
+"replicadas no projeto em execução.\n"
+"Quando usado em um dispositivo remoto, isso é mais eficiente se a opção de "
+"sistema de arquivos de rede está ativa."
 
 msgid "Synchronize Script Changes"
 msgstr "Sincronizar Alterações de Script"
@@ -8243,10 +9046,10 @@ msgid ""
 "When used remotely on a device, this is more efficient when the network "
 "filesystem option is enabled."
 msgstr ""
-"Quando esta opção está ativa, qualquer script que for salvo será recarregado "
-"no projeto em execução.\n"
-"Quando usado remotamente em um dispositivo, isso é mais eficiente se a opção "
-"de sistema de arquivos via rede estiver ativa."
+"Ao ativar esta opção, qualquer script que for salvo será recarregado no "
+"projeto em execução.\n"
+"Quando usado em um dispositivo remoto, isso é mais eficiente se a opção de "
+"sistema de arquivos via rede estiver ativa."
 
 msgid "Keep Debug Server Open"
 msgstr "Manter Servidor de Depuração Aberto"
@@ -8255,12 +9058,11 @@ msgid ""
 "When this option is enabled, the editor debug server will stay open and "
 "listen for new sessions started outside of the editor itself."
 msgstr ""
-"Quando essa opção está habilitada, o servidor de depuração vai se manter "
-"aberto e verificando por novas sessões que começarem por fora do próprio "
-"editor."
+"Ao ativar esta opção, o servidor de depuração permanecerá aberto e aceitará "
+"novas sessões de fora do editor."
 
 msgid "Customize Run Instances..."
-msgstr "Customizar instancias a Rodar..."
+msgstr "Customizar Instâncias a Rodar..."
 
 msgid ""
 "Name: %s\n"
@@ -8270,7 +9072,7 @@ msgid ""
 "%s"
 msgstr ""
 "Nome:%s\n"
-"Camiho:%s\n"
+"Caminho:%s\n"
 "Script Principal:%s\n"
 "\n"
 "%s"
@@ -8278,6 +9080,13 @@ msgstr ""
 msgid "Edit Plugin"
 msgstr "Editar Plugin"
 
+msgid ""
+"Recovery mode is enabled. Enabled plugins will not run while this mode is "
+"active."
+msgstr ""
+"Modo de recuperação ativado. Plugins habilitados não rodarão enquanto você "
+"estiver nesse modo."
+
 msgid "Installed Plugins:"
 msgstr "Plugins Instalados:"
 
@@ -8309,11 +9118,11 @@ msgid "Length: %0.3fs"
 msgstr "Duração: %0.3fs"
 
 msgid "Overrides (%d)"
-msgstr "Sobrescreveu (%d)"
+msgstr "Substitui (%d)"
 
 msgctxt "Locale"
 msgid "Add Script"
-msgstr "Adicionar Script"
+msgstr "Adicionar Sistema de Escrita"
 
 msgid "Add Locale"
 msgstr "Adicionar Localização"
@@ -8322,7 +9131,7 @@ msgid "Variation Coordinates (%d)"
 msgstr "Coordenadas de Variação (%d)"
 
 msgid "No supported features"
-msgstr "Funcionalidades não suportadas"
+msgstr "Nenhuma funcionalidade suportada"
 
 msgid "Features (%d of %d set)"
 msgstr "Funcionalidades (%d de %d definidas)"
@@ -8331,10 +9140,10 @@ msgid "Add Feature"
 msgstr "Adicionar Funcionalidade"
 
 msgid "Stylistic Sets"
-msgstr "Conjuntos de estilo"
+msgstr "Conjuntos de Estilo"
 
 msgid "Character Variants"
-msgstr "Variantes do Caractere"
+msgstr "Variantes de Caractere"
 
 msgid "Capitals"
 msgstr "Maiúsculas"
@@ -8346,16 +9155,178 @@ msgid "Alternates"
 msgstr "Alternativas"
 
 msgid "East Asian Language"
-msgstr "Linguagem do Leste Asiático"
+msgstr "Idioma do Leste Asiático"
 
 msgid "East Asian Widths"
 msgstr "Medidas do Leste Asiático"
 
 msgid "Numeral Alignment"
-msgstr "Alinhamento Numeral"
+msgstr "Alinhamento dos Números"
+
+msgid "Variation"
+msgstr "Variação"
 
 msgid "Unable to preview font"
-msgstr "Incapaz de visualizar a fonte"
+msgstr "Impossível visualizar a fonte"
+
+msgid "Connection impossible to the game process."
+msgstr "Impossível conectar ao processo do jogo."
+
+msgid "Game starting..."
+msgstr "Iniciando jogo..."
+
+msgid "Game running not embedded."
+msgstr "Jogo rodando em nova janela."
+
+msgid "Press play to start the game."
+msgstr "Execute o jogo para começar."
+
+msgid "Embedding is disabled."
+msgstr "Integração desabilitada."
+
+msgid ""
+"Game embedding not available on Wayland.\n"
+"Wayland can be disabled in the Editor Settings (Run > Platforms > Linux/*BSD "
+"> Prefer Wayland)."
+msgstr ""
+"Integração do jogo não está disponível para Wayland.\n"
+"O Wayland pode ser desativado nas Configurações do Editor (Execução > "
+"Plataformas > Linux/*BSD > Preferir Wayland)."
+
+msgid "Game embedding not available on your OS."
+msgstr "Integração de jogo indisponível para o seu sistema operacional."
+
+msgid ""
+"Game embedding not available for the Display Server: '%s'.\n"
+"Display Server can be modified in the Project Settings (Display > Display "
+"Server > Driver)."
+msgstr ""
+"Integração de jogo indisponível para o Servidor de Exibição: '%s'.\n"
+"O Servidor de Exibição pode ser alterado nas Configurações do Projeto "
+"(Exibição > Servidor de Exibição > Controlador)."
+
+msgid ""
+"Game embedding not available when the game starts minimized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Integração de jogo indisponível quando o jogo inicia minimizado.\n"
+"Considere alterar o modo de janela para Janela quando o seu jogo detectar a "
+"tag de característica \"editor\", assim você pode usar integração de jogo e "
+"ainda manter a minimização no seu projeto exportado."
+
+msgid ""
+"Game embedding not available when the game starts maximized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Integração de jogo indisponível quando o jogo inicia maximizado.\n"
+"Considere alterar o modo de janela para Janela quando o seu jogo detectar a "
+"tag de característica \"editor\", assim você pode usar integração de jogo e "
+"ainda manter a maximização no seu projeto exportado."
+
+msgid ""
+"Game embedding not available when the game starts in fullscreen.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Integração de jogo indisponível quando o jogo inicia em tela cheia.\n"
+"Considere alterar o modo de janela para Janela quando o seu jogo detectar a "
+"tag de característica \"editor\", assim você pode usar integração de jogo e "
+"ainda manter a tela cheia no seu projeto exportado."
+
+msgid "Game embedding not available in single window mode."
+msgstr "Integração de jogo indisponível no modo janela única."
+
+msgid "Suspend"
+msgstr "Suspender"
+
+msgid "Next Frame"
+msgstr "Próximo Quadro"
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "Allow game input."
+msgstr "Permitir envio de entradas para o jogo."
+
+msgid ""
+"Disable game input and allow to select Node2Ds, Controls, and manipulate the "
+"2D camera."
+msgstr ""
+"Desativar entrada no jogo e permitir a seleção de Node2Ds, Controls, e o "
+"movimento da câmera 2D."
+
+msgid ""
+"Disable game input and allow to select Node3Ds and manipulate the 3D camera."
+msgstr ""
+"Desativar entrada no jogo e permitir a seleção de Node3Ds e o movimento da "
+"câmera 3D."
+
+msgid "Toggle Selection Visibility"
+msgstr "Alternar Visibilidade da Seleção"
+
+msgid "Alt+RMB: Show list of all nodes at position clicked."
+msgstr "Alt+Clique Direito: Mostrar lista de todos os nós na posição clicada."
+
+msgid "Override the in-game camera."
+msgstr "Manipular câmera do jogo diretamente."
+
+msgid "Camera Override Options"
+msgstr "Opções de Substituição da Câmera"
+
+msgid "Reset 2D Camera"
+msgstr "Redefinir Câmera 2D"
+
+msgid "Reset 3D Camera"
+msgstr "Redefinir Câmera 3D"
+
+msgid "Manipulate In-Game"
+msgstr "Manipular na Janela do Jogo"
+
+msgid "Manipulate From Editors"
+msgstr "Manipular nos Editores"
+
+msgid ""
+"Embedded game size is based on project settings.\n"
+"The 'Keep Aspect' mode is used when the Game Workspace is smaller than the "
+"desired size."
+msgstr ""
+"Basear tamanho do jogo integrado nas configurações do projeto.\n"
+"O modo 'Manter Proporção' será usado quando a área de trabalho for menor que "
+"o tamanho preferido."
+
+msgid "Keep the aspect ratio of the embedded game."
+msgstr "Manter proporção da tela para o jogo integrado."
+
+msgid "Embedded game size stretches to fit the Game Workspace."
+msgstr "Tamanho do jogo integrado preenche toda a área de trabalho."
+
+msgid "Embedding Options"
+msgstr "Opções de Integração"
+
+msgid "Embed Game on Next Play"
+msgstr "Integrar Jogo na Próxima Execução"
+
+msgid "Make Game Workspace Floating on Next Play"
+msgstr "Abrir Aba de Jogo em uma Nova Janela na Próxima Execução"
+
+msgid "Game Workspace"
+msgstr "Área de Trabalho de Jogo"
+
+msgid ""
+"No \"%s\" library found for GDExtension: \"%s\". Possible feature flags for "
+"your platform: %s"
+msgstr ""
+"Biblioteca \"%s\" não encontrada para GDExtension: \"%s\". Flags de "
+"característica possíveis para a sua plataforma: %s"
+
+msgid "Multiple \"%s\" libraries found for GDExtension: \"%s\": \"%s\"."
+msgstr ""
+"Múltiplas bibliotecas \"%s\" encontradas para GDExtension: \"%s\": \"%s\"."
 
 msgid "Change AudioStreamPlayer3D Emission Angle"
 msgstr "Alterar o Ângulo de Emissão do AudioStreamPlayer3D"
@@ -8436,7 +9407,7 @@ msgid "Cell size: %s"
 msgstr "Tamanho da célula: %s"
 
 msgid "Video RAM size: %s MB (%s)"
-msgstr "RAM de Vídeo: %s MB ( %s)"
+msgstr "Memória de Vídeo: %s MB ( %s)"
 
 msgid "Bake SDF"
 msgstr "Gerar SDF"
@@ -8466,13 +9437,13 @@ msgid "Recolor Gradient Point"
 msgstr "Recolorir Ponto do Gradiente"
 
 msgid "Reverse Gradient"
-msgstr "Gradiente Invertido"
+msgstr "Inverter Gradiente"
 
 msgid "Reverse/Mirror Gradient"
-msgstr "Gradiente Reverso/Espelhado"
+msgstr "Inverter/Espelhar Gradiente"
 
 msgid "Move GradientTexture2D Fill Point"
-msgstr "Mover ponto de preenchimento GradientTexture2D"
+msgstr "Mover Ponto de Preenchimento do GradientTexture2D"
 
 msgid "Swap GradientTexture2D Fill Points"
 msgstr "Trocar Pontos de Preenchimento do GradientTexture2D"
@@ -8494,11 +9465,51 @@ msgstr ""
 "iluminação.\n"
 "Salve sua cena e tente novamente."
 
+msgid ""
+"No meshes with lightmapping support to bake. Make sure they contain UV2 data "
+"and their Global Illumination property is set to Static."
+msgstr ""
+"Nenhuma malha com suporte a lightmap para pré-calcular. Certifique-se que "
+"elas contenham dados UV2 e suas propriedades de Iluminação Global estejam na "
+"opção Estática."
+
+msgid ""
+"To import a scene with lightmapping support, set Meshes > Light Baking to "
+"Static Lightmaps in the Import dock."
+msgstr ""
+"Para importar uma cena com suporte a lightmap, mude a opção Malhas > Geração "
+"de Iluminação para Lightmaps Estáticos na aba de Importar."
+
+msgid ""
+"To enable lightmapping support on a primitive mesh, edit the PrimitiveMesh "
+"resource in the inspector and check Add UV2."
+msgstr ""
+"Para ativar suporte a lightmaps em uma malha primitiva, edite o seu recurso "
+"PrimitiveMesh no inspetor e ative Adicionar UV2."
+
+msgid ""
+"To enable lightmapping support on a CSG mesh, select the root CSG node and "
+"choose CSG > Bake Mesh Instance at the top of the 3D editor viewport.\n"
+"Select the generated MeshInstance3D node and choose Mesh > Unwrap UV2 for "
+"Lightmap/AO at the top of the 3D editor viewport."
+msgstr ""
+"Para ativar suporte a lightmap em uma malha CSG, selecione o nó CSG raiz e "
+"selecione CSB > Gerar Instância de Malha no topo do viewport do editor 3D.\n"
+"Selecione o nó MeshInstance3D gerado e selecione Malha > Achatar UV2 para "
+"Lightmap/OA no topo do viewport do editor 3D."
+
+msgid ""
+"Failed creating lightmap images. Make sure the lightmap destination path is "
+"writable."
+msgstr ""
+"Falha ao criar imagens de lightmap, certifique-se de que o caminho tem "
+"permissões de escrita."
+
 msgid "No editor scene root found."
 msgstr "Nenhuma cena raiz do editor encontrada."
 
 msgid "Lightmap data is not local to the scene."
-msgstr "Os dados do mapa de iluminação não são locais para a cena."
+msgstr "Os dados do lightmap não são locais à cena."
 
 msgid ""
 "Maximum texture size is too small for the lightmap images.\n"
@@ -8506,8 +9517,18 @@ msgid ""
 "recommended you split the scene into more objects instead."
 msgstr ""
 "Tamanho máximo de textura é pequeno demais para as imagens de lightmap.\n"
-"Apesar disso poder ser corrigido aumentando o tamanho máximo das texturas, é "
-"recomendado que você divida a cena em mais objetos em vez disso."
+"Apesar de ser possível corrigir isso aumentando o tamanho máximo da textura, "
+"o mais recomendado é que você separe a cena entre mais objetos."
+
+msgid ""
+"Failed creating lightmap images. Make sure all meshes to bake have the "
+"Lightmap Size Hint property set high enough, and the LightmapGI's Texel Scale "
+"value is not too low."
+msgstr ""
+"Falha ao criar imagens de lightmap. Certifique-se que todas as malhas "
+"selecionadas para o pré-calculo tenham um valor de Inferência de Tamanho do "
+"Lightmap (`lightmap_size_hint`) grande o suficiente, e que o valor do Tamanho "
+"do Texel (`texel_scale`) no LightmapGI não seja pequeno demais."
 
 msgid ""
 "Failed fitting a lightmap image into an atlas. This should never happen and "
@@ -8517,13 +9538,29 @@ msgstr ""
 "acontecer e deve ser reportado."
 
 msgid "Bake Lightmaps"
-msgstr "Gerar Mapas de Iluminação"
+msgstr "Gerar Lightmaps"
+
+msgid "Lightmap baking is not supported on this GPU (%s)."
+msgstr "Pré-calculo de lightmap não é compatível com esta GPT (%s)."
+
+msgid "Lightmaps cannot be baked on %s."
+msgstr "Lightmaps não podem ser gerados em %s."
+
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time."
+msgstr ""
+"Impossível gerar lightmaps, pois o módulo `lightmapper_rd` foi desativado na "
+"compilação."
 
 msgid "LightMap Bake"
-msgstr "Gerar Mapa de Iluminação"
+msgstr "Lightmap Pré-calculado"
 
 msgid "Select lightmap bake file:"
-msgstr "Selecione o arquivo de mapa de iluminação gerado:"
+msgstr "Selecione o arquivo de lightmap pré-calculado:"
+
+msgid "Preview is not available for this shader mode."
+msgstr "Pré-visualização não disponível para este modo de shader."
 
 msgid "Couldn't create a Trimesh collision shape."
 msgstr "Não foi possível criar uma forma de colisão Trimesh."
@@ -8541,52 +9578,52 @@ msgid "Can't create a collision shape as sibling for the scene root."
 msgstr "Não foi possível criar forma de colisão como irmã da raiz da cena."
 
 msgid "Mesh is empty!"
-msgstr "A Malha está vazia!"
+msgstr "A malha está vazia!"
 
 msgid "Create Debug Tangents"
 msgstr "Criar Tangentes de Depuração"
 
 msgid "No mesh to unwrap."
-msgstr "Nenhuma malha para desempacotar."
+msgstr "Nenhuma malha para achatar."
 
 msgid ""
 "Mesh cannot unwrap UVs because it does not belong to the edited scene. Make "
 "it unique first."
 msgstr ""
-"A malha não pode desempacotar UVs porque não pertence à cena editada. Torne -"
+"Impossível achatar UVs da malha porque ela não pertence à cena editada. Torne-"
 "a única primeiro."
 
 msgid ""
 "Mesh cannot unwrap UVs because it belongs to another resource which was "
 "imported from another file type. Make it unique first."
 msgstr ""
-"A malha não pode desempacotar UVs porque pertence a outro recurso que foi "
-"importado de outro tipo de arquivo. Torne -o único primeiro."
+"Impossível achatar UVs da malha porque ela pertence a outro recurso que foi "
+"importado de outro tipo de arquivo. Torne-a única primeiro."
 
 msgid ""
 "Mesh cannot unwrap UVs because it was imported from another file type. Make "
 "it unique first."
 msgstr ""
-"A malha não pode desempacotar UVs porque foi importada de outro tipo de "
-"arquivo. Torne -a única primeiro."
+"Impossível achatar UVs da malha porque ela foi importada de outro tipo de "
+"arquivo. Torne-a única primeiro."
 
 msgid "Unwrap UV2"
-msgstr "Desempacotar UV2"
+msgstr "Achatar UV2"
 
 msgid "Contained Mesh is not of type ArrayMesh."
 msgstr "Malha contida não é do tipo ArrayMesh."
 
 msgid "Can't unwrap mesh with blend shapes."
-msgstr "Não é possível desempacotar a malha com sombras mescladas."
+msgstr "Não é possível achatar malhas com blend shapes."
 
 msgid "Only triangles are supported for lightmap unwrap."
-msgstr "Somente triângulos são suportados para desempacotar a lightmap."
+msgstr "Somente triângulos são suportados ao achatar um lightmap."
 
 msgid "Normals are required for lightmap unwrap."
-msgstr "Normais são necessários para desempacotar a lightmap."
+msgstr "Normais são necessários para achatar um lightmap."
 
 msgid "UV Unwrap failed, mesh may not be manifold?"
-msgstr "Falhou ao desempacotar UV, a malha pode não ser múltipla?"
+msgstr "Falha ao achatar UV, a malha pode ser não-múltipla?"
 
 msgid "No mesh to debug."
 msgstr "Nenhuma malha para depurar."
@@ -8601,10 +9638,10 @@ msgid "MeshInstance3D lacks a Mesh."
 msgstr "MeshInstance3D não possui uma Malha."
 
 msgid "Mesh has no surface to create outlines from."
-msgstr "A malha não tem superfície para criar contornos a partir de."
+msgstr "A malha não tem superfície para criar contornos."
 
 msgid "Mesh primitive type is not PRIMITIVE_TRIANGLES."
-msgstr "O tipo primitivo de malha não é PRIMITIVE_TRIANGLES."
+msgstr "O tipo primitivo da malha não é PRIMITIVE_TRIANGLES."
 
 msgid "Could not create outline."
 msgstr "Não foi possível criar contorno."
@@ -8627,10 +9664,10 @@ msgid ""
 "This can be used instead of the StandardMaterial Grow property when using "
 "that property isn't possible."
 msgstr ""
-"Cria uma malha de esboço estática. A malha de contorno terá suas "
-"perpendiculares invertidas automaticamente.\n"
-"Isso pode ser usado em vez da propriedade StandardMaterial Grow ao usar essa "
-"propriedade se possível."
+"Cria uma malha de contorno estática. A malha de contorno terá suas normais "
+"invertidas automaticamente.\n"
+"Isso pode ser usado em vez da propriedade Aumentar do StandardMaterial caso "
+"não seja possível usá-la."
 
 msgid "View UV1"
 msgstr "Visualizar UV1"
@@ -8639,7 +9676,7 @@ msgid "View UV2"
 msgstr "Visualizar UV2"
 
 msgid "Unwrap UV2 for Lightmap/AO"
-msgstr "Desempacotar UV2 para Lightmap/AO"
+msgstr "Achatar UV2 para Lightmap/OA"
 
 msgid "Create Outline Mesh"
 msgstr "Criar Malha de Contorno"
@@ -8648,7 +9685,7 @@ msgid "Outline Size:"
 msgstr "Tamanho do Contorno:"
 
 msgid "Create Collision Shape"
-msgstr "Criar Formas de Colisão"
+msgstr "Criar Forma de Colisão"
 
 msgid "Collision Shape placement"
 msgstr "Posicionamento de Formas de Colisão"
@@ -8657,13 +9694,13 @@ msgid "Sibling"
 msgstr "Irmã"
 
 msgid "Creates collision shapes as Sibling."
-msgstr "Cria uma Forma de Colisão como Irmã."
+msgstr "Cria formas de colisão como Irmãs."
 
 msgid "Static Body Child"
-msgstr "Filho de Static Body"
+msgstr "Filho de StaticBody"
 
 msgid "Creates a StaticBody3D as child and assigns collision shapes to it."
-msgstr "Cria um StaticBody3D como filho e associa CollisionShapes a ele."
+msgstr "Cria um StaticBody3D como filho e associa as formas de colisão a ele."
 
 msgid "Collision Shape Type"
 msgstr "Tipo de Forma de Colisão"
@@ -8675,7 +9712,7 @@ msgid ""
 "Creates a polygon-based collision shape.\n"
 "This is the most accurate (but slowest) option for collision detection."
 msgstr ""
-"Criar uma forma de colisão baseada em polígono.\n"
+"Cria uma forma de colisão baseada em polígono.\n"
 "Este é a opção mais precisa (mas lenta) para detecção de colisão."
 
 msgid "Single Convex"
@@ -8685,7 +9722,7 @@ msgid ""
 "Creates a single convex collision shape.\n"
 "This is the fastest (but least accurate) option for collision detection."
 msgstr ""
-"Criar uma simples forma convexa de colisão.\n"
+"Cria uma forma de colisão convexa simples.\n"
 "Esta é a opção mais rápida (mas menos precisa) para detecção de colisão."
 
 msgid "Simplified Convex"
@@ -8697,8 +9734,8 @@ msgid ""
 "geometry in some cases, at the cost of accuracy."
 msgstr ""
 "Cria uma forma de colisão convexa simplificada.\n"
-"É semelhante à forma de colisão única, mas pode resultar em uma geometria "
-"mais simples em alguns casos, com menos precisão."
+"É semelhante à forma de colisão simples, mas pode resultar em uma geometria "
+"menos complexa em alguns casos, com menos precisão."
 
 msgid "Multiple Convex"
 msgstr "Convexo Múltiplo"
@@ -8709,12 +9746,37 @@ msgid ""
 "polygon-based collision."
 msgstr ""
 "Cria uma forma de colisão baseada em polígonos.\n"
-"Este é um meio-termo em desempenho entre uma única colisão convexa e uma "
-"colisão baseada em polígono."
+"Seu desempenho é um meio-termo entre uma colisão convexa simples e uma "
+"colisão completa baseada em polígono."
 
 msgid "UV Channel Debug"
 msgstr "Depuração do Canal UV"
 
+msgid "Create NavigationMesh"
+msgstr "Criar NavigationMesh"
+
+msgid ""
+"Before converting a rendering mesh to a navigation mesh, please verify:\n"
+"\n"
+"- The mesh is two-dimensional.\n"
+"- The mesh has no surface overlap.\n"
+"- The mesh has no self-intersection.\n"
+"- The mesh surfaces have indices.\n"
+"\n"
+"If the mesh does not fulfill these requirements, the pathfinding will be "
+"broken."
+msgstr ""
+"Antes de converter uma malha de renderização para uma malha de navegação, por "
+"favor verifique se:\n"
+"\n"
+"- A malha é bidimensional.\n"
+"- A malha não contém sobreposição de superfícies.\n"
+"- A malha não contém auto-intersecção.\n"
+"- As superfícies da malha têm índices.\n"
+"\n"
+"Caso a malha não cumpra todos esses requisitos, o pathfinding não funcionará "
+"corretamente."
+
 msgid "Remove item %d?"
 msgstr "Remover item %d?"
 
@@ -8726,7 +9788,7 @@ msgstr ""
 "%s"
 
 msgid "MeshLibrary"
-msgstr "Biblioteca de Malhas"
+msgstr "MeshLibrary"
 
 msgid "Add Item"
 msgstr "Adicionar Item"
@@ -8751,35 +9813,35 @@ msgstr "Aplicar com Transformações"
 
 msgid "No mesh source specified (and no MultiMesh set in node)."
 msgstr ""
-"Nenhuma malha de origem especificada (e nenhuma MultiMesh definida no nó)."
+"Nenhuma origem de malha especificada (e nenhuma MultiMesh definida no nó)."
 
 msgid "No mesh source specified (and MultiMesh contains no Mesh)."
 msgstr ""
-"Nenhuma malha de origem especificada (e MultiMesh não contém nenhuma Malha)."
+"Nenhuma origem de malha especificada (e MultiMesh não contém nenhuma Malha)."
 
 msgid "Mesh source is invalid (invalid path)."
-msgstr "Malha de origem é inválida (caminho inválido)."
+msgstr "Origem de malha inválida (caminho inválido)."
 
 msgid "Mesh source is invalid (not a MeshInstance3D)."
-msgstr "Malha de origem é inválida (não é uma MeshInstance3D)."
+msgstr "Origem de malha inválida (não é uma MeshInstance3D)."
 
 msgid "Mesh source is invalid (contains no Mesh resource)."
-msgstr "A fonte da Malha é inválida (não contêm um recurso Mesh)."
+msgstr "Origem de malha inválida (não contêm um recurso Mesh)."
 
 msgid "No surface source specified."
-msgstr "Nenhuma superfície de origem especificada."
+msgstr "Nenhuma origem de superfície especificada."
 
 msgid "Surface source is invalid (invalid path)."
-msgstr "Superfície de origem é inválida (Caminho inválido)."
+msgstr "Origem de superfície inválida (caminho inválido)."
 
 msgid "Surface source is invalid (no geometry)."
-msgstr "Superfície de origem é inválida (sem geometria)."
+msgstr "Origem de superfície inválida (sem geometria)."
 
 msgid "Surface source is invalid (no faces)."
-msgstr "Superfície de origem é inválida (sem faces)."
+msgstr "Origem de superfície inválida (sem faces)."
 
 msgid "Select a Source Mesh:"
-msgstr "Selecione uma Malha de Origem:"
+msgstr "Selecione uma Origem de Malha:"
 
 msgid "Select a Target Surface:"
 msgstr "Selecione uma Superfície Destino:"
@@ -8806,7 +9868,7 @@ msgid "Z-Axis"
 msgstr "Eixo-Z"
 
 msgid "Mesh Up Axis:"
-msgstr "Malha Acima do Eixo:"
+msgstr "Eixo da Malha para Cima:"
 
 msgid "Random Rotation:"
 msgstr "Rotação Aleatória:"
@@ -8829,28 +9891,63 @@ msgstr "Definir start_position"
 msgid "Set end_position"
 msgstr "Definir end_position"
 
+msgid "Set Obstacle Vertices"
+msgstr "Definir Vértices do Obstáculo"
+
+msgid "Edit Obstacle (Flip Winding)"
+msgstr "Editar Obstáculo (Inverter Ordem dos Vértices)"
+
+msgid "Edit Obstacle (Clear Vertices)"
+msgstr "Editar Obstáculo (Apagar Vértices)"
+
+msgid "Add Vertex"
+msgstr "Adicionar Vértice"
+
+msgid "Edit Vertex"
+msgstr "Editar Vértice"
+
+msgid "Delete Vertex"
+msgstr "Excluir Vértice"
+
+msgid "Flip Winding"
+msgstr "Inverter Ordem dos Vértices"
+
+msgid "Clear Vertices"
+msgstr "Apagar Vértices"
+
+msgid "Edit Obstacle (Add Vertex)"
+msgstr "Editar Obstáculo (Adicionar Vértice)"
+
+msgid "Edit Obstacle (Move Vertex)"
+msgstr "Editar Obstáculo (Mover Vértice)"
+
+msgid "Edit Obstacle (Remove Vertex)"
+msgstr "Editar Obstáculo (Remover Vértice)"
+
 msgid "Please Confirm..."
 msgstr "Confirme, Por Favor..."
 
+msgid "Remove all vertices?"
+msgstr "Remover todos os vértices?"
+
 msgid "Create Navigation Polygon"
 msgstr "Criar Polígono de Navegação"
 
 msgid "Bake NavigationPolygon"
-msgstr "Pré-calcular Polígono de Navegação"
+msgstr "Gerar NavigationPolygon"
 
 msgid ""
 "Bakes the NavigationPolygon by first parsing the scene for source geometry "
 "and then creating the navigation polygon vertices and polygons."
 msgstr ""
-"Pré-calcula o Polígono de Navegação analizando a geometria da cena, e então "
+"Pré-calcula o NavigationPolygon analizando a geometria da cena, e então "
 "criando os vértices do polígono."
 
 msgid "Clear NavigationPolygon"
-msgstr "Apagar Polígono de Navegação"
+msgstr "Apagar NavigationPolygon"
 
 msgid "Clears the internal NavigationPolygon outlines, vertices and polygons."
-msgstr ""
-"Apaga as bordas, vértices e polígonos internos do Polígono de Navegação."
+msgstr "Apaga as bordas, vértices e polígonos internos do NavigationPolygon."
 
 msgid ""
 "A NavigationPolygon resource must be set or created for this node to work."
@@ -8869,16 +9966,16 @@ msgid "Perspective"
 msgstr "Perspectiva"
 
 msgid "Top Orthogonal"
-msgstr "Ortogonal Superior"
+msgstr "Ortogonal de Cima"
 
 msgid "Top Perspective"
-msgstr "Perspectiva Superior"
+msgstr "Perspectiva de Cima"
 
 msgid "Bottom Orthogonal"
-msgstr "Ortogonal Inferior"
+msgstr "Ortogonal de Baixo"
 
 msgid "Bottom Perspective"
-msgstr "Perspectiva Inferior"
+msgstr "Perspectiva de Baixo"
 
 msgid "Left Orthogonal"
 msgstr "Ortogonal Esquerda"
@@ -8904,20 +10001,23 @@ msgstr "Ortogonal Traseira"
 msgid "Rear Perspective"
 msgstr "Perspectiva Traseira"
 
+msgid "[auto]"
+msgstr "[automático]"
+
 msgid "X-Axis Transform."
-msgstr "Transformada do Eixo-X."
+msgstr "Transformação do Eixo-X."
 
 msgid "Y-Axis Transform."
-msgstr "Transformada do Eixo-Y."
+msgstr "Transformação do Eixo-Y."
 
 msgid "Z-Axis Transform."
-msgstr "Transformada do Eixo-Z."
+msgstr "Transformação do Eixo-Z."
 
 msgid "View Plane Transform."
-msgstr "Ver Transformada do Plano."
+msgstr "Ver Transformação do Plano."
 
 msgid "Keying is disabled (no key inserted)."
-msgstr "A codificação está desativada (nenhuma chave inserida)."
+msgstr "Criação de chaves está desativada (nenhuma chave inserida)."
 
 msgid "Animation Key Inserted."
 msgstr "Chave de Animação Inserida."
@@ -8959,10 +10059,10 @@ msgid "Instantiating:"
 msgstr "Instanciando:"
 
 msgid "Top View."
-msgstr "Visão Superior."
+msgstr "Visão de Cima."
 
 msgid "Bottom View."
-msgstr "Visão Inferior."
+msgstr "Visão de Baixo."
 
 msgid "Left View."
 msgstr "Visão Esquerda."
@@ -8977,19 +10077,19 @@ msgid "Rear View."
 msgstr "Visão Traseira."
 
 msgid "Align Transform with View"
-msgstr "Alinhar Transformada com a Vista"
+msgstr "Alinhar Transformação com a Visão Atual"
 
 msgid "Align Rotation with View"
-msgstr "Alinhar Rotação com a Vista"
+msgstr "Alinhar Rotação com a Visão Atual"
 
 msgid "Set Surface %d Override Material"
-msgstr "Definir Superfície %d Substituir Material"
+msgstr "Definir Material Substituto da Superfície %d"
 
 msgid "Set Material Override"
-msgstr "Definir Substituição de Material"
+msgstr "Definir Material Substituto"
 
 msgid "Can't instantiate: %s."
-msgstr "Não foi possível instanciar: '%s'."
+msgstr "Não foi possível instanciar: %s."
 
 msgid "Circular dependency found at %s"
 msgstr "Dependência circular encontrada em %s"
@@ -8998,7 +10098,7 @@ msgid "Rotate"
 msgstr "Rotacionar"
 
 msgid "Translate"
-msgstr "Translação"
+msgstr "Transladar"
 
 msgid "Rotating %s degrees."
 msgstr "Rotacionando %s graus."
@@ -9016,7 +10116,7 @@ msgid "Auto Orthogonal Enabled"
 msgstr "Auto Ortogonal Habilitado"
 
 msgid "Lock View Rotation"
-msgstr "Bloquear Rotação da Visão"
+msgstr "Trancar Rotação da Visão"
 
 msgid "Display Normal"
 msgstr "Exibição Normal"
@@ -9028,7 +10128,7 @@ msgid "Display Overdraw"
 msgstr "Exibir Overdraw"
 
 msgid "Display Lighting"
-msgstr "Iluminação da Tela"
+msgstr "Exibir Iluminação"
 
 msgid "Display Unshaded"
 msgstr "Exibir Sem Sombreamento"
@@ -9046,7 +10146,7 @@ msgid "Directional Shadow Map"
 msgstr "Mapa de Sombra Direcional"
 
 msgid "Decal Atlas"
-msgstr "Decalque de Mapa"
+msgstr "Mapa de Decalque"
 
 msgid "VoxelGI Lighting"
 msgstr "Iluminação VoxelGI"
@@ -9088,10 +10188,10 @@ msgid "Decal Cluster"
 msgstr "Cluster de Decalque"
 
 msgid "ReflectionProbe Cluster"
-msgstr "Cluster de Sonda de Reflexão"
+msgstr "Cluster de ReflectionProbe"
 
 msgid "Occlusion Culling Buffer"
-msgstr "Buffer de Seleção de Oclusão"
+msgstr "Buffer de Occlusion Culling"
 
 msgid "Motion Vectors"
 msgstr "Vetores de Movimento"
@@ -9103,16 +10203,19 @@ msgid "Display Advanced..."
 msgstr "Exibir Avançado..."
 
 msgid "View Environment"
-msgstr "Visualizar Ambiente"
+msgstr "Exibir Ambiente"
 
 msgid "View Gizmos"
-msgstr "Visualizar Gizmos"
+msgstr "Exibir Gizmos"
+
+msgid "View Transform Gizmo"
+msgstr "Exibir Gizmo de Transformação"
 
 msgid "View Grid"
-msgstr "Ver Grade"
+msgstr "Exibir Grade"
 
 msgid "View Information"
-msgstr "Visualizar Informações"
+msgstr "Exibir Informações"
 
 msgid "View Frame Time"
 msgstr "Exibir Tempo de Quadro"
@@ -9127,34 +10230,52 @@ msgid "Enable Doppler"
 msgstr "Ativar Doppler"
 
 msgid "Cinematic Preview"
-msgstr "Visualizar Cinemática"
+msgstr "Visualização Cinemática"
 
 msgid "Not available when using the OpenGL renderer."
 msgstr "Não disponível ao usar o renderizador OpenGL."
 
+msgid "Viewport Orbit Modifier 1"
+msgstr "Modificador da Órbita do Viewport 1"
+
+msgid "Viewport Orbit Modifier 2"
+msgstr "Modificador da Órbita do Viewport 2"
+
+msgid "Viewport Pan Modifier 1"
+msgstr "Modificador da Movimentação do Viewport 1"
+
+msgid "Viewport Pan Modifier 2"
+msgstr "Modificador da Movimentação do Viewport 2"
+
+msgid "Viewport Zoom Modifier 1"
+msgstr "Modificador do Zoom do Viewport 1"
+
+msgid "Viewport Zoom Modifier 2"
+msgstr "Modificador do Zoom do Viewport 2"
+
 msgid "Freelook Left"
-msgstr "Visão Livre na Esquerda"
+msgstr "Visão Livre para a Esquerda"
 
 msgid "Freelook Right"
-msgstr "Visão Livre na Direita"
+msgstr "Visão Livre para a Direita"
 
 msgid "Freelook Forward"
-msgstr "Visão Livre Frontal"
+msgstr "Visão Livre para Frente"
 
 msgid "Freelook Backwards"
-msgstr "Visão Livre Atrás"
+msgstr "Visão Livre para Trás"
 
 msgid "Freelook Up"
-msgstr "Visão Livre em Cima"
+msgstr "Visão Livre para Cima"
 
 msgid "Freelook Down"
-msgstr "Visão Livre Embaixo"
+msgstr "Visão Livre para Baixo"
 
 msgid "Freelook Speed Modifier"
-msgstr "Modificador de velocidade da Visão Livre"
+msgstr "Modificador de Velocidade da Visão Livre"
 
 msgid "Freelook Slow Modifier"
-msgstr "Modificador de Velocidade Venta da Visão Livre"
+msgstr "Modificador de Velocidade Lenta da Visão Livre"
 
 msgid "Lock Transformation to X axis"
 msgstr "Travar Transformação para o Eixo-X"
@@ -9183,20 +10304,23 @@ msgstr "Iniciar Rotação da Transformação"
 msgid "Begin Scale Transformation"
 msgstr "Iniciar Escala da Transformação"
 
+msgid "Reposition Using Collisions"
+msgstr "Reposicionar Usando Colisões"
+
 msgid "Toggle Camera Preview"
 msgstr "Alternar Visualização da Câmera"
 
 msgid "View Rotation Locked"
-msgstr "Rotação de Vista Bloqueada"
+msgstr "Rotação da Visão Trancada"
 
 msgid ""
 "To zoom further, change the camera's clipping planes (View -> Settings...)"
 msgstr ""
-"Para dar mais zoom, altere os planos de clipping da câmera (Visão -> "
+"Para dar mais zoom, altere os planos de clipping da câmera (Visualizar -> "
 "Configurações...)"
 
 msgid "Overriding material..."
-msgstr "Sobrescrevendo material..."
+msgstr "Substituindo material..."
 
 msgid ""
 "Drag and drop to override the material of any geometry node.\n"
@@ -9217,9 +10341,9 @@ msgid ""
 msgstr ""
 "Clique para alternar entre estados de visibilidade.\n"
 "\n"
-"Olhos abertos: Gizmo está visível.\n"
-"Olhos fechados: Gizmo está escondido.\n"
-"Olhos semiabertos: Gizmo está visível através de superfícies opacas (\"raio-"
+"Olho aberto: Gizmo está visível.\n"
+"Olho fechado: Gizmo está escondido.\n"
+"Olho semiaberto: Gizmo pode ser visto através de superfícies opacas (\"raio-"
 "x\")."
 
 msgid "Snap Nodes to Floor"
@@ -9229,10 +10353,10 @@ msgid "Couldn't find a solid floor to snap the selection to."
 msgstr "Não foi encontrado chão sólido onde encaixar a seleção."
 
 msgid "Add Preview Sun to Scene"
-msgstr "Adicionar Prévia de Sol na Cena"
+msgstr "Adicionar Sol de Prévia na Cena"
 
 msgid "Add Preview Environment to Scene"
-msgstr "Adicionar Visualização de Ambiente na Cena"
+msgstr "Adicionar Ambiente de Prévia na Cena"
 
 msgid ""
 "Scene contains\n"
@@ -9256,47 +10380,50 @@ msgstr ""
 "Visualização desativada."
 
 msgid "Drag: Use snap."
-msgstr "Arrastar: Usar alinhamento."
+msgstr "Arrastar: Usar atração."
 
 msgid ""
 "Groups the selected node with its children. This selects the parent when any "
 "child node is clicked in 2D and 3D view."
 msgstr ""
-"Agrupa o nó selecionado com seu(s) Filho(a). Isto seleciona o Pai quando "
-"qualquer Nó Filho(a) é clicado em 2D e 3D view."
+"Agrupa o nó selecionado com seus filhos. Isto seleciona o pai sempre que "
+"qualquer nó filho for clicado nos editores 2D e 3D."
+
+msgid "LMB+Drag: Measure the distance between two points in 3D space."
+msgstr "Clique Esquerdo+Arrastar: Medir a distância entre dois pontos em 3D."
 
 msgid "Use Local Space"
 msgstr "Usar Espaço Local"
 
 msgid "Use Snap"
-msgstr "Use Encaixar"
+msgstr "Usar Atração"
 
 msgid ""
 "Toggle preview sunlight.\n"
 "If a DirectionalLight3D node is added to the scene, preview sunlight is "
 "disabled."
 msgstr ""
-"Alternar visualização da luz solar.\n"
-"Se um nó DirectionalLight3D for adicionado à cena, a visualização da luz "
-"solar é desativada."
+"Alternar pré-visualização da luz solar.\n"
+"Se um nó DirectionalLight3D for adicionado à cena, a pré-visualização da luz "
+"solar será desativada."
 
 msgid ""
 "Toggle preview environment.\n"
 "If a WorldEnvironment node is added to the scene, preview environment is "
 "disabled."
 msgstr ""
-"Alternar visualização do ambiente.\n"
-"Se um nó WorldEnvironment é adicionado a cena, a visualização de ambiente é "
-"desativada."
+"Alternar pré-visualização do ambiente.\n"
+"Se um nó WorldEnvironment for adicionado a cena, a pré-visualização de "
+"ambiente será desativada."
 
 msgid "Edit Sun and Environment settings."
 msgstr "Editar Configurações de Sol e Ambiente."
 
 msgid "Bottom View"
-msgstr "Visão Inferior"
+msgstr "Visão de Baixo"
 
 msgid "Top View"
-msgstr "Visão Superior"
+msgstr "Visão de Cima"
 
 msgid "Rear View"
 msgstr "Visão Traseira"
@@ -9311,7 +10438,7 @@ msgid "Right View"
 msgstr "Visão Direita"
 
 msgid "Orbit View Down"
-msgstr "Orbitar Visão Para Baixo"
+msgstr "Orbitar Visão para Baixo"
 
 msgid "Orbit View Left"
 msgstr "Orbitar Visão à Esquerda"
@@ -9326,7 +10453,7 @@ msgid "Orbit View 180"
 msgstr "Orbitar Visão 180º"
 
 msgid "Switch Perspective/Orthogonal View"
-msgstr "Alternar Visão Perspectiva/Ortogonal"
+msgstr "Alternar Visão em Perspectiva/Ortogonal"
 
 msgid "Insert Animation Key"
 msgstr "Inserir Chave de Animação"
@@ -9335,7 +10462,7 @@ msgid "Focus Origin"
 msgstr "Focar na Origem"
 
 msgid "Focus Selection"
-msgstr "Focar Seleção"
+msgstr "Focar na Seleção"
 
 msgid "Toggle Freelook"
 msgstr "Alternar Visão Livre"
@@ -9353,10 +10480,10 @@ msgid "Transform"
 msgstr "Transformar"
 
 msgid "Snap Object to Floor"
-msgstr "Encaixar Objeto no Chão"
+msgstr "Atrair Objeto ao Chão"
 
 msgid "Transform Dialog..."
-msgstr "Diálogo da Transformada..."
+msgstr "Diálogo de Transformação..."
 
 msgid "1 Viewport"
 msgstr "1 Viewport"
@@ -9383,16 +10510,16 @@ msgid "Settings..."
 msgstr "Configurações..."
 
 msgid "Snap Settings"
-msgstr "Configurações de Encaixe"
+msgstr "Configurações de Atração"
 
 msgid "Translate Snap:"
-msgstr "Translação do Encaixe:"
+msgstr "Alinhamento da Translação:"
 
 msgid "Rotate Snap (deg.):"
-msgstr "Rotação do Encaixe (graus):"
+msgstr "Alinhamento da Rotação (graus):"
 
 msgid "Scale Snap (%):"
-msgstr "Escala do Encaixe (%):"
+msgstr "Alinhamento da Escala (%):"
 
 msgid "Viewport Settings"
 msgstr "Configurações da Viewport"
@@ -9405,7 +10532,7 @@ msgstr ""
 "usa o modo de aspecto \"manter altura\"."
 
 msgid "Perspective VFOV (deg.):"
-msgstr "Perspectiva FOV (graus):"
+msgstr "VFOV da Perspectiva (graus):"
 
 msgid "View Z-Near:"
 msgstr "Visão Z-Próximo:"
@@ -9414,19 +10541,19 @@ msgid "View Z-Far:"
 msgstr "Visão Z-Longe:"
 
 msgid "Transform Change"
-msgstr "Alterar Transformação"
+msgstr "Mudança na Transformação"
 
 msgid "Translate:"
-msgstr "Translação:"
+msgstr "Transladar:"
 
 msgid "Rotate (deg.):"
-msgstr "Rotação (graus):"
+msgstr "Rotacionar (graus):"
 
 msgid "Scale (ratio):"
-msgstr "Escala (prop.):"
+msgstr "Escalonar (prop.):"
 
 msgid "Transform Type"
-msgstr "Tipo de Transformada"
+msgstr "Tipo de Transformação"
 
 msgid "Pre"
 msgstr "Pré"
@@ -9453,10 +10580,10 @@ msgid "Sun Energy"
 msgstr "Intensidade do Sol"
 
 msgid "Shadow Max Distance"
-msgstr "Distância Máxima do Sombra"
+msgstr "Distância Máxima da Sombra"
 
 msgid "Add Sun to Scene"
-msgstr "Adicionar Sol a Cena"
+msgstr "Adicionar Sol à Cena"
 
 msgid ""
 "Adds a DirectionalLight3D node matching the preview sun settings to the "
@@ -9464,25 +10591,25 @@ msgid ""
 "Hold Shift while clicking to also add the preview environment to the current "
 "scene."
 msgstr ""
-"Adiciona um nó DirectionalLight3D correspondente a visualização do sol na "
+"Adiciona um nó DirectionalLight3D correspondente à pré-visualização do sol na "
 "cena atual.\n"
-"Segure Shift enquanto clica para adicionar também a visualização do ambiente "
-"na cena atual."
+"Clique com Shift pressionado para adicionar também a pré-visualização do "
+"ambiente na cena atual."
 
 msgid "Preview Environment"
-msgstr "Visualizar Ambiente"
+msgstr "Prévia do Ambiente"
 
 msgid "Sky Color"
 msgstr "Cor do Céu"
 
 msgid "Ground Color"
-msgstr "Cor da Chão"
+msgstr "Cor do Chão"
 
 msgid "Sky Energy"
 msgstr "Intensidade do Céu"
 
 msgid "AO"
-msgstr "AO"
+msgstr "OA"
 
 msgid "Glow"
 msgstr "Brilho"
@@ -9505,15 +10632,15 @@ msgid ""
 "Hold Shift while clicking to also add the preview sun to the current scene."
 msgstr ""
 "Adiciona um nó WorldEnvironment que corresponde às configurações do ambiente "
-"de visualização para a cena atual.\n"
-"Segure Shift enquanto clica para adicionar também a visualização do sol à "
-"cena atual."
+"de pré-visualização para a cena atual.\n"
+"Clique com Shift pressionado para adicionar também a pré-visualização do sol "
+"à cena atual."
 
 msgid ""
 "Can't determine a save path for the occluder.\n"
 "Save your scene and try again."
 msgstr ""
-"Não é possível determinar um caminho de salvamento para o oclusor.\n"
+"Não foi possível determinar um caminho de salvamento para o oclusor.\n"
 "Salve sua cena e tente novamente."
 
 msgid ""
@@ -9533,7 +10660,7 @@ msgid "Bake Occluders"
 msgstr "Gerar Oclusores"
 
 msgid "Select occluder bake file:"
-msgstr "Selecione o arquivo de geração de oclusão:"
+msgstr "Selecione o arquivo de oclusão pré-calculado:"
 
 msgid "Convert to Parallax2D"
 msgstr "Converter para Parallax2D"
@@ -9543,7 +10670,7 @@ msgstr "ParallaxBackground"
 
 msgid "Hold Shift to scale around midpoint instead of moving."
 msgstr ""
-"Segure Shift para ajustar a escala em torno do centro ao em vez de mover."
+"Segure Shift para ajustar a escala em torno do centro ao invés de mover."
 
 msgid "Toggle between minimum/maximum and base value/spread modes."
 msgstr "Alterne entre mínimo/máximo e valores de base / modos de spread."
@@ -9576,12 +10703,16 @@ msgid "Capture Colors from Pixel"
 msgstr "Capturar Cores do Pixel"
 
 msgid "Generating Visibility Rect (Waiting for Particle Simulation)"
-msgstr ""
-"Gerando Retângulo de Visibilidade (Aguardando por Simulação de Partículas)"
+msgstr "Gerando Retângulo de Visibilidade (Aguardando Simulação de Partículas)"
 
 msgid "Generating..."
 msgstr "Gerando..."
 
+msgid "Loading emission mask requires ParticleProcessMaterial."
+msgstr ""
+"Você precisa de um ParticleProcessMaterial para carregar uma máscara de "
+"emissão."
+
 msgid "GPUParticles2D"
 msgstr "GPUParticles2D"
 
@@ -9589,7 +10720,7 @@ msgid "Convert to CPUParticles2D"
 msgstr "Converter para CPUParticles2D"
 
 msgid "Generation Time (sec):"
-msgstr "Gerando Tempo (seg.):"
+msgstr "Tempo de Geração (seg.):"
 
 msgid "CPUParticles2D"
 msgstr "CPUParticles2D"
@@ -9645,6 +10776,9 @@ msgstr "Fonte de Emissão:"
 msgid "A processor material of type 'ParticleProcessMaterial' is required."
 msgstr "Um material processador do tipo 'ParticleProcessMaterial' é necessário."
 
+msgid "Create Emission Points"
+msgstr "Criar Pontos de Emissão"
+
 msgid "GPUParticles3D"
 msgstr "GPUParticles3D"
 
@@ -9687,11 +10821,14 @@ msgstr "Fechar Curva"
 msgid "Clear Curve Points"
 msgstr "Limpar Pontos de Curva"
 
+msgid "Create Curve in Path2D"
+msgstr "Criar Curva em Path2D"
+
 msgid "Select Points"
-msgstr "Selecionar pontos"
+msgstr "Selecionar Pontos"
 
 msgid "Shift+Drag: Select Control Points"
-msgstr "Shift+Clique: Selecionar Pontos de Controle"
+msgstr "Shift+Arrastar: Selecionar Pontos de Controle"
 
 msgid "Click: Add Point"
 msgstr "Clique: Adicionar Ponto"
@@ -9715,16 +10852,19 @@ msgid "Close Curve"
 msgstr "Fechar Curva"
 
 msgid "Clear Points"
-msgstr "Limpar Pontos"
+msgstr "Apagar Pontos"
 
 msgid "Remove all curve points?"
-msgstr "Remover Todos os Pontos de curva ?"
+msgstr "Remover todos os pontos da curva?"
 
 msgid "Mirror Handle Angles"
-msgstr "Espelhar Ângulos de Controle"
+msgstr "Espelhar Ângulos dos Controles"
 
 msgid "Mirror Handle Lengths"
-msgstr "Espelhar Comprimento do Controle"
+msgstr "Espelhar Comprimentos dos Controles"
+
+msgid "Create Curve"
+msgstr "Criar Curva"
 
 msgid "Curve Point #"
 msgstr "Ponto da Curva #"
@@ -9745,10 +10885,10 @@ msgid "Set Curve Out Position"
 msgstr "Definir Posição de Saída da Curva"
 
 msgid "Set Curve In Position"
-msgstr "Colocar a Curva na Posição"
+msgstr "Definir Posição de Entrada da Curva"
 
 msgid "Set Curve Point Tilt"
-msgstr "Definir inclinação do Ponto da Curva"
+msgstr "Definir Inclinação do Ponto da Curva"
 
 msgid "Split Path"
 msgstr "Dividir Caminho"
@@ -9763,7 +10903,13 @@ msgid "Reset In-Control Point"
 msgstr "Redefinir Ponto de Controle de Entrada"
 
 msgid "Reset Point Tilt"
-msgstr "Redefinir Ponto de inclinação"
+msgstr "Redefinir Inclinação do Ponto"
+
+msgid "Toggle Open/Closed Curve"
+msgstr "Abrir/Fechar Curva"
+
+msgid "Create Curve in Path3D"
+msgstr "Criar Curva em Path3D"
 
 msgid "Shift+Click: Select multiple Points"
 msgstr "Shift+Clique: Selecionar múltiplos Pontos"
@@ -9781,7 +10927,7 @@ msgid "Split Segment (in curve)"
 msgstr "Dividir Segmentos (na curva)"
 
 msgid "Move Joint"
-msgstr "Mover Junta"
+msgstr "Mover Articulação"
 
 msgid "Plugin name cannot be blank."
 msgstr "Nome do Plugin não pode ficar vazio."
@@ -9794,7 +10940,7 @@ msgstr "Subpasta não pode ser uma que já exista."
 
 msgid "Script extension must match chosen language extension (.%s)."
 msgstr ""
-"Extensão do script deve corresponder à linguagem escolhida da extensão (.%s)."
+"Extensão do script deve corresponder à extensão da linguagem escolhida (.%s)."
 
 msgid ""
 "C# doesn't support activating the plugin on creation because the project must "
@@ -9829,7 +10975,7 @@ msgid ""
 msgstr ""
 "Opcional. O nome da pasta geralmente deve usar a nomenclatura `snake_case` "
 "(evite espaços e caracteres especiais).\n"
-"Se deixada em branco, a pasta receberá o nome do plugin convertido para "
+"Se deixar em branco, a pasta receberá o nome do plugin convertido para "
 "`snake_case`."
 
 msgid ""
@@ -9865,6 +11011,13 @@ msgstr ""
 msgid "Script Name:"
 msgstr "Nome do Script:"
 
+msgid ""
+"Optional. The name of the script file. If left empty, will default to the "
+"subfolder name."
+msgstr ""
+"Opcional. O nome do arquivo de script. Se deixar em branco, será dado o mesmo "
+"nome que a sua subpasta."
+
 msgid "Activate now?"
 msgstr "Ativar agora?"
 
@@ -9891,8 +11044,8 @@ msgid ""
 "Polygon 2D has internal vertices, so it can no longer be edited in the "
 "viewport."
 msgstr ""
-"Polygon2D tem vértices internos, portanto não pode mais ser editado na janela "
-"de exibição."
+"Polygon2D tem vértices internos, portanto não pode mais ser editado no "
+"viewport."
 
 msgid "Create Polygon & UV"
 msgstr "Criar Polígono & UV"
@@ -9919,7 +11072,7 @@ msgid "Transform Polygon"
 msgstr "Transformar Polígono"
 
 msgid "Paint Bone Weights"
-msgstr "Pintar Pesos Ósseo"
+msgstr "Pintar Pesos dos Ossos"
 
 msgid "Points"
 msgstr "Pontos"
@@ -9936,9 +11089,15 @@ msgstr "Ossos"
 msgid "Move Points"
 msgstr "Mover Pontos"
 
+msgid "%s: Rotate"
+msgstr "%s: Rotacionar"
+
 msgid "Shift: Move All"
 msgstr "Shift: Mover Tudo"
 
+msgid "%s + Shift: Scale"
+msgstr "%s + Shift: Escalonar"
+
 msgid "Move Polygon"
 msgstr "Mover Polígono"
 
@@ -9950,14 +11109,14 @@ msgstr "Escalonar Polígono"
 
 msgid "Create a custom polygon. Enables custom polygon rendering."
 msgstr ""
-"Crie um polígono personalizado. Permite renderização de polígono "
+"Criar um polígono personalizado. Permite renderização de polígono "
 "personalizado."
 
 msgid ""
 "Remove a custom polygon. If none remain, custom polygon rendering is disabled."
 msgstr ""
-"Remova um polígono personalizado. Se nenhum permanecer, a renderização de "
-"polígono personalizada será desativada."
+"Remover um polígono personalizado. Se nenhum permanecer, a renderização de "
+"polígono personalizado será desativada."
 
 msgid "Paint weights with specified intensity."
 msgstr "Pintar pesos com intensidade especificada."
@@ -9975,16 +11134,16 @@ msgid "Copy UV to Polygon"
 msgstr "Copiar UV para Polígono"
 
 msgid "Clear UV"
-msgstr "Limpar UV"
+msgstr "Apagar UV"
 
 msgid "Grid Settings"
 msgstr "Configurações da Grade"
 
 msgid "Snap"
-msgstr "Encaixe"
+msgstr "Atração"
 
 msgid "Enable Snap"
-msgstr "Ativar Encaixe"
+msgstr "Ativar Atração"
 
 msgid "Show Grid"
 msgstr "Mostrar Grade"
@@ -9999,14 +11158,20 @@ msgid "Grid Offset Y:"
 msgstr "Deslocamento Y da Grade:"
 
 msgid "Grid Step X:"
-msgstr "Passo X da Grade:"
+msgstr "Incremento X da Grade:"
 
 msgid "Grid Step Y:"
-msgstr "Passo Y da Grade:"
+msgstr "Incremento Y da Grade:"
 
 msgid "Sync Bones to Polygon"
 msgstr "Sincronizar Ossos ao Polígono"
 
+msgid "Polygon"
+msgstr "Polígono"
+
+msgid "Toggle Polygon Bottom Panel"
+msgstr "Alternar Painel Inferior de Polígono"
+
 msgid "Create Polygon3D"
 msgstr "Criar Polygon3D"
 
@@ -10038,7 +11203,7 @@ msgid "Load Resource"
 msgstr "Carregar Recurso"
 
 msgid "Toggle ResourcePreloader Bottom Panel"
-msgstr "Ativar/Desativar Painel Inferior ResourcePreloader"
+msgstr "Alternar Painel Inferior ResourcePreloader"
 
 msgid "Path to AnimationMixer is invalid"
 msgstr "O caminho para o AnimationMixer é inválido"
@@ -10046,8 +11211,14 @@ msgstr "O caminho para o AnimationMixer é inválido"
 msgid ""
 "AnimationMixer has no valid root node path, so unable to retrieve track names."
 msgstr ""
-"O reprodutor de animações não tem um caminho de nó raiz válido, então não é "
-"possível obter os nomes das faixas."
+"O AnimationMixer não tem um caminho de nó raiz válido, então não é possível "
+"obter os nomes das faixas."
+
+msgid "(truncated)"
+msgstr "(cortado)"
+
+msgid "Current value: "
+msgstr "Valor atual: "
 
 msgid "Can't open '%s'. The file could have been moved or deleted."
 msgstr ""
@@ -10057,7 +11228,7 @@ msgid "Close and save changes?"
 msgstr "Fechar e salvar alterações?"
 
 msgid "Error writing TextFile:"
-msgstr "Erro ao gravar o TextFile:"
+msgstr "Erro ao gravar arquivo de texto:"
 
 msgid "Error saving file!"
 msgstr "Erro ao salvar o arquivo!"
@@ -10072,7 +11243,7 @@ msgid "Error importing theme."
 msgstr "Erro ao importar tema."
 
 msgid "Error Importing"
-msgstr "Erro ao importar"
+msgstr "Erro ao Importar"
 
 msgid "New Text File..."
 msgstr "Novo Arquivo de Texto..."
@@ -10090,26 +11261,28 @@ msgid "Can't obtain the script for reloading."
 msgstr "Não é possível obter o script para recarregar."
 
 msgid "Reload only takes effect on tool scripts."
-msgstr "Recarregar só tem efeito sobre scripts de ferramenta."
+msgstr "Recarregar só serve para scripts de ferramenta."
 
 msgid "Cannot run the edited file because it's not a script."
-msgstr "Não pode rodar o arquivo porque não é um script."
+msgstr "Não foi possível rodar o arquivo em edição porque ele não é um script."
 
 msgid "Cannot run the script because it contains errors, check the output log."
-msgstr "Não pode rodar o script porque ele contém erros, olhe o log de saída."
+msgstr ""
+"Não foi possível rodar o script porque ele contém erros, veja o log de saída."
 
 msgid "Cannot run the script because it doesn't extend EditorScript."
-msgstr "Não pode rodar o script porque não estende o tipo EditorScript."
+msgstr ""
+"Não foi possível rodar o script porque ele não herda do tipo EditorScript."
 
 msgid ""
 "Cannot run the script because it's not a tool script (add the @tool "
 "annotation at the top)."
 msgstr ""
-"Não pode rodar o script porque não é um script de ferramenta (adicione a "
-"anotação @tool no topo)."
+"Não foi possível rodar o script porque ele não é um script de ferramenta "
+"(adicione a anotação @tool no topo)."
 
 msgid "Cannot run the script because it's not a tool script."
-msgstr "Não pode rodar o script porque não é um script ferramenta."
+msgstr "Não foi possível rodar o script porque ele não é um script ferramenta."
 
 msgid "Import Theme"
 msgstr "Importar Tema"
@@ -10139,7 +11312,7 @@ msgid "Unsaved file."
 msgstr "Arquivo não salvo."
 
 msgid "%s Class Reference"
-msgstr "%s Referência de Classe"
+msgstr "Referência da Classe %s"
 
 msgid "Find Next"
 msgstr "Localizar Próximo"
@@ -10148,10 +11321,10 @@ msgid "Find Previous"
 msgstr "Localizar Anterior"
 
 msgid "Filter Scripts"
-msgstr "Filtrar Script"
+msgstr "Filtrar Scripts"
 
 msgid "Toggle alphabetical sorting of the method list."
-msgstr "Alternar a classificação alfabética da lista de métodos."
+msgstr "Alternar ordenação alfabética da lista de métodos."
 
 msgid "Sort"
 msgstr "Ordenar"
@@ -10169,11 +11342,14 @@ msgid "Save All"
 msgstr "Salvar Tudo"
 
 msgid "Soft Reload Tool Script"
-msgstr "Ferramenta Recarregar Script"
+msgstr "Reativar Script de Ferramenta"
 
 msgid "Copy Script Path"
 msgstr "Copiar Caminho do Script"
 
+msgid "Copy Script UID"
+msgstr "Copiar UID do Script"
+
 msgid "History Previous"
 msgstr "Anterior no Histórico"
 
@@ -10213,6 +11389,13 @@ msgstr "Ir para o documento editado anteriormente."
 msgid "Go to next edited document."
 msgstr "Ir para o próximo documento editado."
 
+msgid ""
+"Make the script editor floating.\n"
+"Right-click to open the screen selector."
+msgstr ""
+"Abrir o editor de script em uma nova janela.\n"
+"Clique com o botão direito para abrir o seletor de tela."
+
 msgid "Discard"
 msgstr "Descartar"
 
@@ -10223,7 +11406,7 @@ msgid "Toggle Search Results Bottom Panel"
 msgstr "Alternar Painel Inferior de Resultados de Busca"
 
 msgid "There are unsaved changes in the following built-in script(s):"
-msgstr "Há mudanças não salvas nos seguinte(s) script(s) built-in(s):"
+msgstr "Há mudanças não salvas nos seguinte(s) script(s) integrado(s):"
 
 msgid "Save changes to the following script(s) before quitting?"
 msgstr "Salvar alterações no(s) seguinte(s) script(s) antes de sair?"
@@ -10232,16 +11415,16 @@ msgid "Reopen Closed Script"
 msgstr "Reabrir Script Fechado"
 
 msgid "Clear Recent Scripts"
-msgstr "Limpar Scripts Recentes"
+msgstr "Limpar Lista de Scripts Recentes"
 
 msgid "Uppercase"
-msgstr "Maiúscula"
+msgstr "Tudo Maiúsculo"
 
 msgid "Lowercase"
-msgstr "Minúscula"
+msgstr "Tudo Minúsculo"
 
 msgid "Capitalize"
-msgstr "Deixar Maiúscula"
+msgstr "Aplicar Maiúsculas"
 
 msgid "Standard"
 msgstr "Padrão"
@@ -10252,6 +11435,9 @@ msgstr "Texto Simples"
 msgid "JSON"
 msgstr "JSON"
 
+msgid "Markdown"
+msgstr "Markdown"
+
 msgid "Connections to method:"
 msgstr "Conexões com o método:"
 
@@ -10270,7 +11456,7 @@ msgstr ""
 "Método de conexão ausente '%s' para o sinal '%s' do nó '%s' para o nó '%s'."
 
 msgid "[Ignore]"
-msgstr "(Ignorar)"
+msgstr "[Ignorar]"
 
 msgid "Line %d (%s):"
 msgstr "Linha %d (%s):"
@@ -10289,14 +11475,16 @@ msgstr ""
 "Salve a cena ou o recurso que contém esse recurso e tente novamente."
 
 msgid "Preloading internal resources is not supported."
-msgstr "Pré-Carregamento interno de recursos não é suportado."
+msgstr "Não é possível pré-carregar recursos internos."
 
 msgid "Can't drop nodes without an open scene."
-msgstr "Não é possível descartar nós sem uma cena aberta."
+msgstr "Não é possível soltar nós sem uma cena aberta."
 
 msgid "Can't drop nodes because script '%s' does not inherit Node."
-msgstr ""
-"Não é possível descartar nós porque o script '%s' não está herdado nesta cena."
+msgstr "Não é possível soltar nós porque o script '%s' herda da classe Node."
+
+msgid "Emoji & Symbols"
+msgstr "Emoji e Símbolos"
 
 msgid "Pick Color"
 msgstr "Escolher Cor"
@@ -10311,7 +11499,7 @@ msgid "Convert Case"
 msgstr "Converter Maiúsculas/Minúsculas"
 
 msgid "Syntax Highlighter"
-msgstr "Realçar Sintaxe"
+msgstr "Realçador de Sintaxe"
 
 msgid "Bookmarks"
 msgstr "Marcadores"
@@ -10323,22 +11511,22 @@ msgid "Delete Line"
 msgstr "Excluir Linha"
 
 msgid "Unindent"
-msgstr "Retirar Recuo"
+msgstr "Desindentar"
 
 msgid "Toggle Comment"
-msgstr "Alternar Comentário"
+msgstr "Comentar/Descomentar"
 
 msgid "Fold/Unfold Line"
 msgstr "Dobrar/Desdobrar Linha"
 
 msgid "Fold All Lines"
-msgstr "Esconder Todas as Linhas"
+msgstr "Dobrar Todas as Linhas"
 
 msgid "Create Code Region"
 msgstr "Criar Região de Código"
 
 msgid "Unfold All Lines"
-msgstr "Mostrar Todas as Linhas"
+msgstr "Desdobrar Todas as Linhas"
 
 msgid "Duplicate Selection"
 msgstr "Duplicar Seleção"
@@ -10353,22 +11541,22 @@ msgid "Toggle Word Wrap"
 msgstr "Alternar Quebra de Linha"
 
 msgid "Trim Trailing Whitespace"
-msgstr "Apagar Espaços em Branco"
+msgstr "Apagar Espaços em Branco Extra"
 
 msgid "Trim Final Newlines"
-msgstr "Remover quebras de linha ao fim"
+msgstr "Remover Quebras de Linha no Fim"
 
 msgid "Convert Indent to Spaces"
-msgstr "Converter Recuos em Espaços"
+msgstr "Converter Indentação para Espaços"
 
 msgid "Convert Indent to Tabs"
-msgstr "Converter Recuo em Tabulação"
+msgstr "Converter Indentação para Tabulação"
 
 msgid "Auto Indent"
-msgstr "Auto Recuar"
+msgstr "Auto Indentar"
 
 msgid "Find in Files..."
-msgstr "Procurar nos Arquivos..."
+msgstr "Buscar nos Arquivos..."
 
 msgid "Replace in Files..."
 msgstr "Substituir em Arquivos..."
@@ -10395,7 +11583,7 @@ msgid "Go to Line..."
 msgstr "Ir para Linha..."
 
 msgid "Lookup Symbol"
-msgstr "Símbolo de Pesquisa"
+msgstr "Procurar Símbolo"
 
 msgid "Toggle Breakpoint"
 msgstr "Alternar Ponto de Interrupção"
@@ -10404,10 +11592,10 @@ msgid "Remove All Breakpoints"
 msgstr "Remover Todos os Pontos de Interrupção"
 
 msgid "Go to Next Breakpoint"
-msgstr "Vá para o Próximo Ponto de Interrupção"
+msgstr "Ir para o Próximo Ponto de Interrupção"
 
 msgid "Go to Previous Breakpoint"
-msgstr "Ir para Ponto de Interrupção Anterior"
+msgstr "Ir para o Ponto de Interrupção Anterior"
 
 msgid "Save changes to the following shaders(s) before quitting?"
 msgstr "Salvar alterações no(s) seguinte(s) shaders antes de sair?"
@@ -10416,13 +11604,13 @@ msgid "There are unsaved changes in the following built-in shaders(s):"
 msgstr "Há mudanças não salvas nos seguinte(s) shaders integrado(s):"
 
 msgid "New Shader Include..."
-msgstr "Novo Shader incluído..."
+msgstr "Novo Include de Shader..."
 
 msgid "Load Shader File..."
 msgstr "Carregar Arquivo Shader..."
 
 msgid "Load Shader Include File..."
-msgstr "Carregar Arquivo de Inclusão de Shader..."
+msgstr "Carregar Arquivo de Include de Shader..."
 
 msgid "Save File"
 msgstr "Salvar Arquivo"
@@ -10430,20 +11618,30 @@ msgstr "Salvar Arquivo"
 msgid "Open File in Inspector"
 msgstr "Abrir Arquivo no Inspetor"
 
+msgid "Inspect Native Shader Code..."
+msgstr "Inspecionar Código de Shader Nativo..."
+
 msgid "Close File"
 msgstr "Fechar Arquivo"
 
 msgid "Shader Editor"
-msgstr "Editor Shader"
+msgstr "Editor de Shader"
+
+msgid ""
+"Make the shader editor floating.\n"
+"Right-click to open the screen selector."
+msgstr ""
+"Abrir o editor de shader em uma nova janela.\n"
+"Clique com o botão direito para abrir o seletor de tela."
 
 msgid "Toggle Shader Editor Bottom Panel"
 msgstr "Alternar Painel Inferior de Edição de Shader"
 
 msgid "No valid shader stages found."
-msgstr "Não foi encontrado estágio válido de Shader."
+msgstr "Não foi encontrado estágio válido de shader."
 
 msgid "Shader stage compiled without errors."
-msgstr "Estágio de Shader compilado sem erros."
+msgstr "Estágio de shader compilado sem erros."
 
 msgid ""
 "File structure for '%s' contains unrecoverable errors:\n"
@@ -10453,7 +11651,7 @@ msgstr ""
 "\n"
 
 msgid "ShaderFile"
-msgstr "Arquivo Shader"
+msgstr "ShaderFile"
 
 msgid "Toggle ShaderFile Bottom Panel"
 msgstr "Alternar Painel Inferior de ShaderFile"
@@ -10462,22 +11660,37 @@ msgid "This skeleton has no bones, create some children Bone2D nodes."
 msgstr "Este esqueleto não tem ossos, crie alguns nós filhos Bone2D."
 
 msgid "Set Rest Pose to Bones"
-msgstr "Definir Postura de Repouso dos Ossos"
+msgstr "Definir Pose de Repouso dos Ossos"
 
 msgid "Create Rest Pose from Bones"
-msgstr "Criar Postura de Repouso a Partir dos Ossos"
+msgstr "Criar Pose de Repouso a Partir dos Ossos"
 
 msgid "Skeleton2D"
 msgstr "Skeleton2D"
 
 msgid "Reset to Rest Pose"
-msgstr "Redefinir para Postura de Repouso"
+msgstr "Redefinir para Pose de Repouso"
 
 msgid "Overwrite Rest Pose"
-msgstr "Sobrescrever Postura de Repouso"
+msgstr "Sobrescrever Pose de Repouso"
+
+msgid "Bone Metadata"
+msgstr "Metadados do Osso"
+
+msgid "Add Bone Metadata"
+msgstr "Adicionar Metadados do Osso"
 
 msgid "Set Bone Transform"
-msgstr "Definir Transformada de Osso"
+msgstr "Definir Transformação do Osso"
+
+msgid "Modify metadata '%s' for bone '%s'"
+msgstr "Modificar metadado '%s' no osso '%s'"
+
+msgid "Remove metadata '%s' from bone '%s'"
+msgstr "Remover metadado '%s' do osso '%s'"
+
+msgid "Add metadata '%s' to bone '%s'"
+msgstr "Adicionar metadado '%s' ao osso '%s'"
 
 msgid "Set Bone Rest"
 msgstr "Definir Repouso do Osso"
@@ -10499,20 +11712,26 @@ msgstr "Exportar Perfil de Esqueleto Como..."
 msgid "Set Bone Parentage"
 msgstr "Definir Parentesco Ósseo"
 
+msgid "Revert Bone"
+msgstr "Reverter Osso"
+
+msgid "Revert"
+msgstr "Reverter"
+
 msgid "Skeleton3D"
 msgstr "Skeleton3D"
 
 msgid "Reset All Bone Poses"
-msgstr "Redefinir Todas as Posturas do Osso"
+msgstr "Redefinir Todas as Poses do Osso"
 
 msgid "Reset Selected Poses"
-msgstr "Redefinir Posturas Selecionadas"
+msgstr "Redefinir Poses Selecionadas"
 
 msgid "Apply All Poses to Rests"
-msgstr "Aplicar Repouso para Todas as Posturas"
+msgstr "Aplicar Repouso para Todas as Poses"
 
 msgid "Apply Selected Poses to Rests"
-msgstr "Aplicar Posturas Selecionadas para o Repouso"
+msgstr "Aplicar Repouso para Poses Selecionadas"
 
 msgid "Create Physical Skeleton"
 msgstr "Criar Esqueleto Físico"
@@ -10525,7 +11744,7 @@ msgid ""
 "Show buttons on joints."
 msgstr ""
 "Modo Edição\n"
-"Mostrar botões nas junções."
+"Mostrar botões nas articulações."
 
 msgid "Insert key (based on mask) for bones with an existing track."
 msgstr "Inserir chave (baseada na máscara) para ossos com uma faixa existente."
@@ -10537,7 +11756,7 @@ msgid "Insert Key (All Bones)"
 msgstr "Inserir Chave (Todos os Ossos)"
 
 msgid "Bone Transform"
-msgstr "Transformada de Ossos"
+msgstr "Transformação do Osso"
 
 msgid "Play IK"
 msgstr "Executar IK"
@@ -10606,7 +11825,7 @@ msgid "Shrink (Pixels):"
 msgstr "Encolher (Pixels):"
 
 msgid "Grow (Pixels):"
-msgstr "Esticar (Pixels):"
+msgstr "Aumentar (Pixels):"
 
 msgid "Update Preview"
 msgstr "Atualizar Visualização"
@@ -10673,17 +11892,16 @@ msgstr "Quadros da Animação:"
 
 msgid "Play selected animation backwards from current pos. (A)"
 msgstr ""
-"Iniciar animação selecionada de trás pra frente a partir da posição atual. (A)"
+"Reproduzir animação selecionada em reverso a partir da posição atual. (A)"
 
 msgid "Play selected animation backwards from end. (Shift+A)"
-msgstr ""
-"Iniciar animação selecionada de trás pra frente a partir do fim. (Shift+A)"
+msgstr "Reproduzir animação selecionada em reverso a partir do fim. (Shift+A)"
 
 msgid "Pause/stop animation playback. (S)"
-msgstr "Pausar/Parar reprodução da animação. (S)"
+msgstr "Pausar/parar reprodução da animação. (S)"
 
 msgid "Play selected animation from start. (Shift+D)"
-msgstr "Reproduzir animação selecionada do início. (Shift +D)"
+msgstr "Reproduzir animação selecionada do início. (Shift+D)"
 
 msgid "Play selected animation from current pos. (D)"
 msgstr "Reproduzir animação selecionada da posição atual. (D)"
@@ -10698,7 +11916,7 @@ msgid "Add frame from file"
 msgstr "Adicionar quadro de um arquivo"
 
 msgid "Add frames from sprite sheet"
-msgstr "Adicionar Quadros de uma folha de Sprite"
+msgstr "Adicionar quadros de uma spritesheet"
 
 msgid "Delete Frame"
 msgstr "Excluir Quadro"
@@ -10722,10 +11940,10 @@ msgid "Select Frames"
 msgstr "Selecionar Quadros"
 
 msgid "Frame Order"
-msgstr "Ordem do Quadro"
+msgstr "Ordem dos Quadros"
 
 msgid "As Selected"
-msgstr "Conforme selecionado"
+msgstr "Conforme Selecionado"
 
 msgid "By Row"
 msgstr "Por Linha"
@@ -10746,22 +11964,22 @@ msgid "By Column"
 msgstr "Por Coluna"
 
 msgid "Top to Bottom, Left to Right"
-msgstr "De cima para baixo, da esquerda para a direita"
+msgstr "Cima para Baixo, Esquerda para Direita"
 
 msgid "Top to Bottom, Right to Left"
-msgstr "De cima para baixo, da direita para a esquerda"
+msgstr "Cima para Baixo, Direita para Esquerda"
 
 msgid "Bottom to Top, Left to Right"
-msgstr "De baixo para cima, da esquerda para a direita"
+msgstr "Baixo para Cima, Esquerda para Direita"
 
 msgid "Bottom to Top, Right to Left"
-msgstr "De baixo para cima, da direita para a esquerda"
+msgstr "Baixo para Cima, Direita para Esquerda"
 
 msgid "Select None"
-msgstr "Selecionar nenhum"
+msgstr "Selecionar Nenhum"
 
 msgid "Toggle Settings Panel"
-msgstr "Alternar painel de configurações"
+msgstr "Alternar Painel de Configurações"
 
 msgid "Horizontal"
 msgstr "Horizontal"
@@ -10782,10 +12000,10 @@ msgid "Auto Slice"
 msgstr "Auto Fatiar"
 
 msgid "Create Frames from Sprite Sheet"
-msgstr "Criar Quadros a partir da Folha de Sprite"
+msgstr "Criar Quadros a partir de Spritesheet"
 
 msgid "SpriteFrames"
-msgstr "Quadros de Sprite"
+msgstr "SpriteFrames"
 
 msgid "Toggle SpriteFrames Bottom Panel"
 msgstr "Alternar Painel Inferior de SpriteFrames"
@@ -10816,7 +12034,7 @@ msgid "No Mipmaps"
 msgstr "Sem Mipmaps"
 
 msgid "Set Region Rect"
-msgstr "Definir Região do Retângulo"
+msgstr "Definir Retângulo de Região"
 
 msgid "Set Margin"
 msgstr "Definir Margem"
@@ -10825,16 +12043,16 @@ msgid "Region Editor"
 msgstr "Editor de Região"
 
 msgid "Snap Mode:"
-msgstr "Modo de Encaixe:"
+msgstr "Modo de Atração:"
 
 msgid "Pixel Snap"
-msgstr "Encaixe de Pixel"
+msgstr "Atração a Pixels"
 
 msgid "Grid Snap"
-msgstr "Encaixe de Grade"
+msgstr "Atração à Grade"
 
 msgid "Step:"
-msgstr "Passo:"
+msgstr "Incremento:"
 
 msgid "Separation:"
 msgstr "Separação:"
@@ -10914,7 +12132,7 @@ msgid "Finalizing"
 msgstr "Finalizando"
 
 msgid "Import Theme Items"
-msgstr "Importando Itens do Tema"
+msgstr "Importar Itens de Tema"
 
 msgid "Filter Items"
 msgstr "Filtrar Itens"
@@ -10923,64 +12141,64 @@ msgid "With Data"
 msgstr "Com Dados"
 
 msgid "Select by data type:"
-msgstr "Selecione por tipo de dados:"
+msgstr "Marcar por tipo de dados:"
 
 msgid "Select all visible color items."
-msgstr "Selecione todos os itens de cor visíveis."
+msgstr "Marcar todos os itens de cor visíveis."
 
 msgid "Select all visible color items and their data."
-msgstr "Selecione todos os itens de cor visíveis e seus dados."
+msgstr "Marcar todos os itens de cor visíveis e seus dados."
 
 msgid "Deselect all visible color items."
-msgstr "Desmarque todos os itens de cor visíveis."
+msgstr "Desmarcar todos os itens de cor visíveis."
 
 msgid "Select all visible constant items."
-msgstr "Selecione todos os itens constantes visíveis."
+msgstr "Marcar todos os itens constantes visíveis."
 
 msgid "Select all visible constant items and their data."
-msgstr "Selecione todos os itens constantes visíveis e seus dados."
+msgstr "Marcar todos os itens constantes visíveis e seus dados."
 
 msgid "Deselect all visible constant items."
-msgstr "Desmarque todos os itens constantes visíveis."
+msgstr "Desmarcar todos os itens constantes visíveis."
 
 msgid "Select all visible font items."
-msgstr "Selecione todos os itens de fonte visíveis."
+msgstr "Marcar todos os itens de fonte visíveis."
 
 msgid "Select all visible font items and their data."
-msgstr "Selecione todos os itens de fonte visíveis e seus dados."
+msgstr "Marcar todos os itens de fonte visíveis e seus dados."
 
 msgid "Deselect all visible font items."
-msgstr "Desmarque todos os itens de fonte visíveis."
+msgstr "Desmarcar todos os itens de fonte visíveis."
 
 msgid "Font sizes"
-msgstr "Tamanhos da Fonte"
+msgstr "Tamanhos de Fonte"
 
 msgid "Select all visible font size items."
-msgstr "Selecione todos os itens de tamanho de fonte visíveis."
+msgstr "Marcar todos os itens de tamanho de fonte visíveis."
 
 msgid "Select all visible font size items and their data."
-msgstr "Selecione todos os itens de tamanho de fonte visíveis e seus dados."
+msgstr "Marcar todos os itens de tamanho de fonte visíveis e seus dados."
 
 msgid "Deselect all visible font size items."
-msgstr "Desmarque todos os itens de tamanho de fonte visíveis."
+msgstr "Desmarcar todos os itens de tamanho de fonte visíveis."
 
 msgid "Select all visible icon items."
-msgstr "Selecione todos os itens de ícones visíveis."
+msgstr "Marcar todos os itens de ícones visíveis."
 
 msgid "Select all visible icon items and their data."
-msgstr "Selecione todos os itens de ícones visíveis e seus dados."
+msgstr "Marcar todos os itens de ícones visíveis e seus dados."
 
 msgid "Deselect all visible icon items."
-msgstr "Desmarque todos os itens de ícones visíveis."
+msgstr "Desmarcar todos os itens de ícones visíveis."
 
 msgid "Select all visible stylebox items."
-msgstr "Selecione todos os itens visíveis da caixa de estilo."
+msgstr "Marcar todos os itens visíveis da caixa de estilo."
 
 msgid "Select all visible stylebox items and their data."
-msgstr "Selecione todos os itens visíveis da caixa de estilo e seus dados."
+msgstr "Marcar todos os itens de caixa de estilo visíveis e seus dados."
 
 msgid "Deselect all visible stylebox items."
-msgstr "Desmarque todos os itens visíveis da caixa de estilo."
+msgstr "Desmarcar todos os itens de caixa de estilo visíveis."
 
 msgid ""
 "Caution: Adding icon data may considerably increase the size of your Theme "
@@ -10996,13 +12214,13 @@ msgid "Expand types."
 msgstr "Expandir tipos."
 
 msgid "Select all Theme items."
-msgstr "Selecionar todos os itens do Tema."
+msgstr "Marcar todos os itens do Tema."
 
 msgid "Select With Data"
-msgstr "Selecionar Com Dados"
+msgstr "Marcar Com Dados"
 
 msgid "Select all Theme items with item data."
-msgstr "Selecionar todos os itens do Tema com dados."
+msgstr "Marcar todos os itens do Tema com dados."
 
 msgid "Deselect All"
 msgstr "Desmarcar Tudo"
@@ -11018,8 +12236,8 @@ msgid ""
 "this window.\n"
 "Close anyway?"
 msgstr ""
-"A guia de Importação de itens possui alguns itens selecionados. A seleção "
-"será perdida ao fechar esta janela.\n"
+"A guia de Importar Itens possui alguns itens marcados. Sua seleção será "
+"perdida ao fechar esta janela.\n"
 "Fechar mesmo assim?"
 
 msgid "Remove Type"
@@ -11058,7 +12276,7 @@ msgid ""
 "This theme type is empty.\n"
 "Add more items to it manually or by importing from another theme."
 msgstr ""
-"Este modelo de tema está vazio.\n"
+"Este tipo de tema está vazio.\n"
 "Adicione mais itens manualmente ou importe de outro tema."
 
 msgid "Remove Theme Item"
@@ -11125,7 +12343,7 @@ msgid "Rename Theme Item"
 msgstr "Renomear Item do Tema"
 
 msgid "Invalid file, not a Theme resource."
-msgstr "Arquivo inválido, não é um recurso do Tema."
+msgstr "Arquivo inválido, não é um recurso de Tema."
 
 msgid "Invalid file, same as the edited Theme resource."
 msgstr "Arquivo inválido, é o mesmo recurso de Tema sendo editado."
@@ -11223,13 +12441,13 @@ msgid "Add Type"
 msgstr "Adicionar Tipo"
 
 msgid "Override All Default Theme Items"
-msgstr "Substituir Todos os Itens do Modelo Padrão"
+msgstr "Substituir Todos os Itens do Tema Padrão"
 
 msgid "Override Theme Item"
-msgstr "Sobrescrever Item do Tema"
+msgstr "Substituir Item do Tema"
 
 msgid "Set Color Item in Theme"
-msgstr "Definir item Cor no Tema"
+msgstr "Definir Item de Cor no Tema"
 
 msgid "Set Constant Item in Theme"
 msgstr "Definir Item de Constante no Tema"
@@ -11256,7 +12474,7 @@ msgid "Set Theme Type Variation"
 msgstr "Definir Variação do Tipo de Tema"
 
 msgid "Set Variation Base Type"
-msgstr "Definir Tipo de Variação Base"
+msgstr "Definir Tipo Base de Variação"
 
 msgid "Set Base Type"
 msgstr "Definir Tipo Base"
@@ -11268,7 +12486,7 @@ msgid "Show Default"
 msgstr "Mostrar Padrão"
 
 msgid "Show default type items alongside items that have been overridden."
-msgstr "Mostrar itens do modelo padrão ao lado de itens que foram substituídos."
+msgstr "Mostrar itens do tipo padrão ao lado de itens que foram substituídos."
 
 msgid "Override All"
 msgstr "Substituir Todos"
@@ -11281,13 +12499,13 @@ msgstr "Tipo Base"
 
 msgid "Select the variation base type from a list of available types."
 msgstr ""
-"Selecione a variação do tipo base à partir da lista de tipos disponíveis."
+"Selecionar a variação base do tipo a partir de uma lista de tipos disponíveis."
 
 msgid ""
 "A type associated with a built-in class cannot be marked as a variation of "
 "another type."
 msgstr ""
-"Um tipo associado à uma classe padrão não pode ser marcado como variação de "
+"Um tipo associado a uma classe padrão não pode ser marcado como variação de "
 "outro tipo."
 
 msgid "Theme:"
@@ -11306,7 +12524,7 @@ msgid "Default Preview"
 msgstr "Visualização Padrão"
 
 msgid "Select UI Scene:"
-msgstr "Selecione a Cena de UI:"
+msgstr "Selecione uma Cena de UI:"
 
 msgid "Toggle Theme Bottom Panel"
 msgstr "Alternar Painel Inferior de Tema"
@@ -11318,7 +12536,7 @@ msgstr ""
 "controle para edição."
 
 msgid "Toggle Button"
-msgstr "Alternar Botão"
+msgstr "Botão de Alternação"
 
 msgid "Disabled Button"
 msgstr "Botão Desativado"
@@ -11330,7 +12548,7 @@ msgid "Disabled Item"
 msgstr "Item Desativado"
 
 msgid "Check Item"
-msgstr "Marcar Item"
+msgstr "Item de Marcação"
 
 msgid "Checked Item"
 msgstr "Item Marcado"
@@ -11412,7 +12630,7 @@ msgid "Next Line After Column"
 msgstr "Próxima Linha Após Coluna"
 
 msgid "Please select two atlases or more."
-msgstr "Por favor selecione dois atlas ou mais."
+msgstr "Por favor selecione dois ou mais atlas."
 
 msgid ""
 "Source: %d\n"
@@ -11430,7 +12648,7 @@ msgid ""
 msgstr ""
 "Fonte: %d\n"
 "Coordenadas do Atlas: %s\n"
-"Alternativa: %d"
+"Alternativas: %d"
 
 msgid ""
 "The selected atlas source has no valid texture. Assign a texture in the "
@@ -11449,13 +12667,13 @@ msgid "Reset Polygons"
 msgstr "Redefinir Polígonos"
 
 msgid "Clear Polygons"
-msgstr "Limpar Polígonos"
+msgstr "Apagar Polígonos"
 
 msgid "Rotate Polygons Right"
-msgstr "Rotacionar Polígono à Direita"
+msgstr "Rotacionar Polígonos à Direita"
 
 msgid "Rotate Polygons Left"
-msgstr "Rotacionar Polígono à Esquerda"
+msgstr "Rotacionar Polígonos à Esquerda"
 
 msgid "Flip Polygons Horizontally"
 msgstr "Inverter Polígonos Horizontalmente"
@@ -11476,10 +12694,10 @@ msgid "Edit points tool"
 msgstr "Ferramenta editar pontos"
 
 msgid "Delete points tool"
-msgstr "Ferramenta excluir ponto"
+msgstr "Ferramenta excluir pontos"
 
 msgid "Reset to default tile shape"
-msgstr "Redefinir para mosaico tile padrão"
+msgstr "Redefinir para formato de tile padrão"
 
 msgid "Rotate Right"
 msgstr "Girar à Direita"
@@ -11494,10 +12712,10 @@ msgid "Flip Vertically"
 msgstr "Inverter Verticalmente"
 
 msgid "Disable Snap"
-msgstr "Desativar Snap"
+msgstr "Desativar Atração"
 
 msgid "Half-Pixel Snap"
-msgstr "Snap de meio pixel"
+msgstr "Atrair a Meio-Pixel"
 
 msgid "Painting Tiles Property"
 msgstr "Propriedade Pintar Tiles"
@@ -11518,10 +12736,10 @@ msgid "Painting Terrain"
 msgstr "Pintando Terreno"
 
 msgid "Can't transform scene tiles."
-msgstr "Não foi possível transformar os blocos da cena."
+msgstr "Não foi possível transformar os tiles da cena."
 
 msgid "Can't rotate patterns when using non-square tile grid."
-msgstr "Não é possível girar padrões ao usar grade de bloco não quadrada."
+msgstr "Não é possível girar padrões ao usar grade de tiles não quadrada."
 
 msgid "No Texture Atlas Source (ID: %d)"
 msgstr "Sem Fonte de Atlas de Textura (ID: %d)"
@@ -11552,7 +12770,7 @@ msgid ""
 "bottom tab."
 msgstr ""
 "A coleção de cenas selecionadas não possui cenas. Adicione cenas na aba "
-"inferior do TileSet."
+"TileSet inferior."
 
 msgid "Delete tiles"
 msgstr "Excluir tiles"
@@ -11567,45 +12785,49 @@ msgid "Move tiles"
 msgstr "Mover tiles"
 
 msgid "Paint tiles"
-msgstr "Pintar Tiles"
+msgstr "Pintar tiles"
 
 msgid "Paste tiles"
-msgstr "Colar Tiles"
+msgstr "Colar tiles"
+
+msgid "Selection Tool"
+msgstr "Ferramenta de Seleção"
 
 msgid "Shift: Draw line."
-msgstr "Shift: Desenhar Linha."
+msgstr "Shift: Desenhar linha."
 
 msgid "Shift: Draw rectangle."
-msgstr "Shift: Desenha Retângulo."
+msgstr "Shift: Desenha retângulo."
 
 msgid "Alternatively hold %s with other tools to pick tile."
 msgstr ""
 "Como alternativa, segure %s com outras ferramentas para escolher o tile."
 
 msgid "Alternatively use RMB to erase tiles."
-msgstr "Como alternativa, use o RMB para apagar os tiles."
+msgstr "Como alternativa, clique com o botão direito para apagar tiles."
 
 msgid "Rotate Tile Left"
-msgstr "Girar o Tile a esquerda"
+msgstr "Girar o Tile à Esquerda"
 
 msgid "Rotate Tile Right"
-msgstr "Girar o bloco à Direita"
+msgstr "Girar o Tile à Direita"
 
 msgid "Flip Tile Horizontally"
-msgstr "Inverter o bloco Horizontalmente"
+msgstr "Inverter o Tile Horizontalmente"
 
 msgid "Flip Tile Vertically"
-msgstr "Inverter o bloco Verticalmente"
+msgstr "Inverter o Tile Verticalmente"
 
 msgid "Contiguous"
-msgstr "Contiguo"
+msgstr "Contíguo"
 
 msgid "Place Random Tile"
 msgstr "Posicionar Tile Aleatório"
 
 msgid ""
 "Modifies the chance of painting nothing instead of a randomly selected tile."
-msgstr "Modifica a chance de pintar nada ao invés de um tile randômico."
+msgstr ""
+"Modifica a chance de pintar um tile vazio ao invés de um tile aleatório."
 
 msgid "Scattering:"
 msgstr "Espalhamento:"
@@ -11613,8 +12835,15 @@ msgstr "Espalhamento:"
 msgid "Tiles"
 msgstr "Tiles"
 
+msgid ""
+"This TileMap's TileSet has no Tile Source configured. Go to the TileSet "
+"bottom panel to add one."
+msgstr ""
+"O TileSet deste TileMap não tem uma Fonte de Tile configurada. Vá para a aba "
+"inferior TileSet para adicionar um."
+
 msgid "Sort sources"
-msgstr "Classificar fontes"
+msgstr "Ordenar fontes"
 
 msgid "Sort by ID (Ascending)"
 msgstr "Ordenar por ID (Crescente)"
@@ -11629,23 +12858,22 @@ msgid "Patterns"
 msgstr "Padrões"
 
 msgid "Drag and drop or paste a TileMap selection here to store a pattern."
-msgstr ""
-"Arraste e solte ou cole uma seleção TileMap aqui para armazenar um padrão."
+msgstr "Arraste ou cole uma seleção de TileMap aqui para armazenar um padrão."
 
 msgid "Paint terrain"
 msgstr "Pintar o terreno"
 
 msgid "Matches Corners and Sides"
-msgstr "Combinar Cantos e Lados"
+msgstr "Combina Cantos e Lados"
 
 msgid "Matches Corners Only"
-msgstr "Combinar Somente Cantos"
+msgstr "Combina Somente Cantos"
 
 msgid "Matches Sides Only"
-msgstr "Combinar Somente Lados"
+msgstr "Combina Somente Lados"
 
 msgid "Terrain Set %d (%s)"
-msgstr "Definir Terreno %d (%s)"
+msgstr "Conjunto de Terreno %d (%s)"
 
 msgid ""
 "Connect mode: paints a terrain, then connects it with the surrounding tiles "
@@ -11658,8 +12886,8 @@ msgid ""
 "Path mode: paints a terrain, then connects it to the previous tile painted "
 "within the same stroke."
 msgstr ""
-"Modo Caminho: pinta um terreno, então conecta o mesmo ao tile anterior "
-"pintado com o mesmo traço."
+"Modo de caminho: pinta um terreno, e conecta-o ao tile anterior pintado no "
+"mesmo traço."
 
 msgid "Terrains"
 msgstr "Terrenos"
@@ -11674,7 +12902,7 @@ msgid "Extract TileMap layers as individual TileMapLayer nodes"
 msgstr "Extrair camadas do TileMap como nós individuais de TileMapLayer"
 
 msgid "Can't edit multiple layers at once."
-msgstr "Não foi possível editar várias camadas de uma vez só."
+msgstr "Não é possível editar várias camadas de uma vez só."
 
 msgid "The selected TileMap has no layer to edit."
 msgstr "O TileMap selecionado não possui camadas para editar."
@@ -11699,34 +12927,34 @@ msgid "TileMap Layers"
 msgstr "Camadas de TileMap"
 
 msgid "Select previous layer"
-msgstr "Selecionar a Camada Anterior"
+msgstr "Selecionar a camada anterior"
 
 msgid "Select next layer"
-msgstr "Selecionar a Próxima Camada"
+msgstr "Selecionar a próxima camada"
 
 msgid "Select all layers"
-msgstr "Selecionar Todas as Camadas"
+msgstr "Selecionar todas as camadas"
 
 msgid "Select all TileMapLayers in scene"
-msgstr "Selecionar todos os TileMapLayer na cena"
+msgstr "Selecionar todos os TileMapLayers na cena"
 
 msgid "Highlight Selected TileMap Layer"
-msgstr "Destacar a Camada Selecionada de TileMap"
+msgstr "Destacar a Camada de TileMap Selecionada"
 
 msgid "Toggle grid visibility."
-msgstr "Alterna visibilidade da grade."
+msgstr "Alternar visibilidade da grade."
 
 msgid "Automatically Replace Tiles with Proxies"
-msgstr "Automaticamente Substitui Tiles com Proxies"
+msgstr "Substituir Tiles por Proxies Automaticamente"
 
 msgid "Remove Tile Proxies"
 msgstr "Remover Proxies de Tile"
 
 msgid "Create Alternative-level Tile Proxy"
-msgstr "Criar Proxy de Tile de Nível Alternativo"
+msgstr "Criar Proxy de Tile a Nível Alternativo"
 
 msgid "Create Coords-level Tile Proxy"
-msgstr "Criar Proxy de Tile em Nível de Coordenadas"
+msgstr "Criar Proxy de Tile a Nível de Coordenadas"
 
 msgid "Create source-level Tile Proxy"
 msgstr "Criar Proxy de Tile a Nível de Fonte"
@@ -11747,10 +12975,10 @@ msgid "Coords-level proxies"
 msgstr "Proxies a nível de coordenadas"
 
 msgid "Alternative-level proxies"
-msgstr "Proxies de nível alternativo"
+msgstr "Proxies a nível alternativo"
 
 msgid "Add a new tile proxy:"
-msgstr "Adicionar Novo Tile Proxy:"
+msgstr "Adicionar novo proxy de tile:"
 
 msgid "From Source"
 msgstr "De Fonte"
@@ -11768,13 +12996,13 @@ msgid "To Coords"
 msgstr "Para Coordenadas"
 
 msgid "To Alternative"
-msgstr "Para Altermativo"
+msgstr "Para Alternativo"
 
 msgid "Global actions:"
 msgstr "Ações Globais:"
 
 msgid "Clear Invalid"
-msgstr "Limpar Inválidos"
+msgstr "Apagar Inválidos"
 
 msgid "Atlas"
 msgstr "Atlas"
@@ -11809,7 +13037,7 @@ msgid "Z Index"
 msgstr "Índice Z"
 
 msgid "Y Sort Origin"
-msgstr "Ordenar Origem Y"
+msgstr "Origem da Ordenação por Y"
 
 msgid "Occlusion Layer %d"
 msgstr "Camada de Oclusão %d"
@@ -11834,7 +13062,7 @@ msgid "Navigation Layer %d"
 msgstr "Camada de Navegação %d"
 
 msgid "No navigation layers"
-msgstr "Sem Camada(s) de Navegação"
+msgstr "Sem camadas de navegação"
 
 msgid ""
 "Create and customize navigation layers in the inspector of the TileSet "
@@ -11848,7 +13076,7 @@ msgid "Custom Data %d"
 msgstr "Dados Personalizados %d"
 
 msgid "No custom data layers"
-msgstr "Sem Camada(s) de dados personalizadas"
+msgstr "Sem camadas de dados personalizadas"
 
 msgid ""
 "Create and customize custom data layers in the inspector of the TileSet "
@@ -11864,8 +13092,8 @@ msgid ""
 "TileSet is in read-only mode. Make the resource unique to edit TileSet "
 "properties."
 msgstr ""
-"TileSet está em modo de leitura. Torne o recurso editável nas propriedades do "
-"TileSet."
+"TileSet está em modo de leitura. Torne o recurso único para editar "
+"propriedades do TileSet."
 
 msgid "Paint properties."
 msgstr "Propriedades da pintura."
@@ -11908,7 +13136,7 @@ msgid ""
 "ID, so changing one may make tiles invalid."
 msgstr ""
 "O valor que identifica unicamente esse tile dentro do TileSet. Cada tile "
-"armazena seu ID fonte, então mudá-lo pode tornar alguns tiles inválidos."
+"armazena seu ID fonte, então mudá-lo pode tornar tiles inválidos."
 
 msgid ""
 "The human-readable name for the atlas. Use a descriptive name here for "
@@ -11952,9 +13180,10 @@ msgid ""
 "enabled unless you're running into rendering issues due to texture padding."
 msgstr ""
 "Se marcada, adiciona uma borda transparente de 1 píxel ao redor de cada bloco "
-"para evitar sangramento de textura quando a filtragem está habilitada. É "
-"recomendado deixar esta opção ativada, a menos que esteja enfrentando "
-"problemas de renderização devido ao preenchimento de textura."
+"para evitar vazamento das cores de uma textura para a outra quando a "
+"filtragem está habilitada. Recomenda-se deixar esta opção ativada, a menos "
+"que esteja enfrentando problemas de renderização devido ao preenchimento de "
+"textura."
 
 msgid ""
 "The position of the tile's top-left corner in the atlas. The position and "
@@ -11962,14 +13191,14 @@ msgid ""
 "Each painted tile has associated atlas coords, so changing this property may "
 "cause your TileMaps to not display properly."
 msgstr ""
-"A posição do canto superior esquerdo do bloco no atlas. A posição e o tamanho "
-"devem estar no atlas e não podem se sobrepor a outro bloco.\n"
-"Cada bloco pintado possui coordenadas de atlas associadas, portanto, alterar "
+"A posição do canto superior esquerdo do tile no atlas. A posição e o tamanho "
+"devem estar dentro do atlas e não podem se sobrepor a outro tile.\n"
+"Cada tile pintado possui coordenadas de atlas associadas, portanto, alterar "
 "essa propriedade pode fazer com que seus TileMaps não sejam exibidos "
 "corretamente."
 
 msgid "The unit size of the tile."
-msgstr "O tamanho da unidade do bloco."
+msgstr "O tamanho da unidade do tile."
 
 msgid ""
 "Number of columns for the animation grid. If number of columns is lower than "
@@ -11982,22 +13211,22 @@ msgid "The space (in tiles) between each frame of the animation."
 msgstr "O espaço (em tiles) entre cada quadro (frame) da animação."
 
 msgid "Animation speed in frames per second."
-msgstr "Velocidade da animação em Frames por Segundo."
+msgstr "Velocidade da animação em quadros por segundo."
 
 msgid ""
 "Determines how animation will start. In \"Default\" mode all tiles start "
 "animating at the same frame. In \"Random Start Times\" mode, each tile starts "
 "animation with a random offset."
 msgstr ""
-"Determina como a animação será iniciada. No modo ‘Padrão’, todos os Blocos "
-"começam a ser animados no mesmo Quadro. No modo “Tempos de Início "
-"Aleatórios”, cada Bloco inicia a animação com um Deslocamento aleatório."
+"Determina como a animação será iniciada. No modo \"Padrão\", todos os tiles "
+"começam a ser animados no mesmo quadro. No modo \"Tempos de Início "
+"Aleatórios\", cada tile inicia a animação em um quadro aleatório."
 
 msgid "If [code]true[/code], the tile is horizontally flipped."
-msgstr "Se [code]true[/code], o bloco será invertido horizontalmente."
+msgstr "Se for [code]true[/code], o tile será invertido horizontalmente."
 
 msgid "If [code]true[/code], the tile is vertically flipped."
-msgstr "Se [code]true[/code], o bloco será invertido verticalmente."
+msgstr "Se for [code]true[/code], o tile será invertido verticalmente."
 
 msgid ""
 "If [code]true[/code], the tile is rotated 90 degrees [i]counter-clockwise[/i] "
@@ -12007,19 +13236,20 @@ msgid ""
 "H[/b] and [b]Flip V[/b]. To rotate a tile by 270 degrees clockwise, enable "
 "[b]Flip V[/b] and [b]Transpose[/b]."
 msgstr ""
-"Se [code]true[/code], o bloco é girado 90 graus [i]no sentido anti-horário[/"
-"i] e depois virado verticalmente. Na prática, isso significa que para girar "
-"um bloco 90 graus no sentido horário sem o virar, deve habilitar [b]Flip H[/"
-"b] e [b]Transpose[/b]. Para girar um bloco 180 graus no sentido horário, "
-"habilite [b]Flip H[/b] e [b]Flip V[/b]. Para girar um bloco 270 graus no "
-"sentido horário, habilite [b]Flip V[/b] e [b]Transpose[/b]."
+"Se for [code]true[/code], o tile é rotacionado 90 graus [i]no sentido anti-"
+"horário[/i] e depois espelhado verticalmente. Na prática, isso significa que "
+"para girar um tile 90 graus no sentido horário sem o virar, deve-se habilitar "
+"[b]Inverter Horizontalmente[/b] e [b]Transpôr[/b]. Para girar um bloco 180 "
+"graus no sentido horário, habilite [b]Inverter Horizontalmente[/b] e "
+"[b]Inverter Verticalmente[/b]. Para girar um bloco 270 graus no sentido "
+"horário, habilite [b]Inverter Verticalmente[/b] e [b]Transpôr[/b]."
 
 msgid ""
 "The origin to use for drawing the tile. This can be used to visually offset "
 "the tile compared to the base tile."
 msgstr ""
-"A origem a ser usada para desenhar o bloco. Isso pode ser usado para deslocar "
-"visualmente o bloco em comparação com o ladrilho base."
+"A origem a ser usada para desenhar o tile. Isso pode ser usado para deslocar "
+"visualmente o tile em comparação ao tile base."
 
 msgid "The color multiplier to use when rendering the tile."
 msgstr "A cor de multiplicação para utilizar ao renderizar o tile."
@@ -12028,18 +13258,17 @@ msgid ""
 "The material to use for this tile. This can be used to apply a different "
 "blend mode or custom shaders to a single tile."
 msgstr ""
-"O material para utilizar para este tile. Pode-se utilizar essa opção para "
-"aplicar um modo de mistura differente ou shaders personalizados para um único "
-"tile."
+"O material para utilizar para este tile. Pode-se usar esta opção para aplicar "
+"um modo de mistura differente ou shaders personalizados em um único tile."
 
 msgid ""
 "The sorting order for this tile. Higher values will make the tile render in "
 "front of others on the same layer. The index is relative to the TileMap's own "
 "Z index."
 msgstr ""
-"A ordem de classificação para este tile. Valores mais alto farão com que o "
-"tile seja desenhado na frente de outros que estejam na mesma camada. O índice "
-"é relativo ao Z-Index do próprio TileMap."
+"O índice de ordenação deste tile. Valores mais alto farão com que o tile seja "
+"desenhado na frente de outros que estejam na mesma camada. O índice é "
+"relativo ao Índice Z de seu próprio TileMap."
 
 msgid ""
 "The vertical offset to use for tile sorting based on its Y coordinate (in "
@@ -12048,32 +13277,32 @@ msgid ""
 "tiles. Only effective if Y Sort Enabled is true on the TileMap layer the tile "
 "is placed on."
 msgstr ""
-"O deslocamento vertical a ser usado para classificação de blocos com base na "
-"coordenada Y (em pixels). Isso permite usar camadas como se estivessem em "
-"alturas diferentes para jogos Top-Down. Ajustar isso pode ajudar a aliviar "
-"problemas com a classificação de determinados blocos. Efetivo apenas se Y "
-"Sort ativado for verdadeiro na camada TileMap em que o bloco é colocado."
+"O deslocamento vertical a ser usado para ordenação de tiles com base na "
+"coordenada Y (em pixels). Isso permite usar camadas como se cada uma fossem "
+"alturas diferentes para jogos top-down. Ajustar isso pode ajudar com "
+"problemas de ordenação de determinados blocos. Funciona apenas se Ordenação "
+"por Y estiver ativado na camada de TileMap em que o tile for colocado."
 
 msgid ""
 "The index of the terrain set this tile belongs to. [code]-1[/code] means it "
 "will not be used in terrains."
 msgstr ""
-"Index do conjunto de terreno ao qual esta bloco pertence. [code]-1[/code] "
+"Índice do conjunto de terreno ao qual este tile pertence. [code]-1[/code] "
 "significa que não será usado em terrenos."
 
 msgid ""
 "The index of the terrain inside the terrain set this tile belongs to. "
 "[code]-1[/code] means it will not be used in terrains."
 msgstr ""
-"O índice de terreno do terreno deste tile. [code]-1[/code] significa que não "
-"será usado em terrenos."
+"O índice de terreno do conjunto de terreno que contém este tile. [code]-1[/"
+"code] significa que não será usado em terrenos."
 
 msgid ""
 "The relative probability of this tile appearing when painting with \"Place "
 "Random Tile\" enabled."
 msgstr ""
-"A probabilidade relativa deste bloco aparecer ao pintar com \"Colocar bloco "
-"aleatório\" ativado."
+"A probabilidade relativa deste bloco aparecer ao pintar com \"Colocar Tile "
+"Aleatório\" ativado."
 
 msgid "Setup"
 msgstr "Configurar"
@@ -12086,7 +13315,7 @@ msgstr ""
 "para criar tiles grandes, control para editar retângulos)."
 
 msgid "Select tiles."
-msgstr "Selecionar Tiles."
+msgstr "Selecionar tiles."
 
 msgid "Paint"
 msgstr "Pintar"
@@ -12095,8 +13324,8 @@ msgid ""
 "No tiles selected.\n"
 "Select one or more tiles from the palette to edit its properties."
 msgstr ""
-"Nenhum bloco selecionado.\n"
-"Selecione um ou mais blocos da paleta para editar suas propriedades."
+"Nenhum tile selecionado.\n"
+"Selecione um ou mais tiles da paleta para editar suas propriedades."
 
 msgid "Paint Properties:"
 msgstr "Propriedades da Pintura:"
@@ -12111,14 +13340,14 @@ msgid ""
 "The current atlas source has tiles outside the texture.\n"
 "You can clear it using \"%s\" option in the 3 dots menu."
 msgstr ""
-"A fonte do atlas atual possui blocos fora da textura.\n"
-"Você pode limpá-los com a opção \"%s\" no menu de 3 pontos."
+"A fonte do atlas atual possui tiles fora da textura.\n"
+"Você pode apagá-los com a opção \"%s\" no menu de 3 pontos."
 
 msgid "Hold Ctrl to create multiple tiles."
-msgstr "Segure Ctrl para criar múltiplos blocos."
+msgstr "Segure Ctrl para criar múltiplos tiles."
 
 msgid "Hold Shift to create big tiles."
-msgstr "Segure Shift para criar Blocos grandes."
+msgstr "Segure Shift para criar tiles grandes."
 
 msgid "Create an Alternative Tile"
 msgstr "Criar um Tile Alternativo"
@@ -12146,7 +13375,7 @@ msgid "Invalid texture selected."
 msgstr "Textura inválida selecionada."
 
 msgid "Add a new atlas source"
-msgstr "Adicionar uma nova fonte atlas"
+msgstr "Adicionar uma nova fonte de atlas"
 
 msgid "Remove source"
 msgstr "Remover fonte"
@@ -12154,80 +13383,84 @@ msgstr "Remover fonte"
 msgid "Add atlas source"
 msgstr "Adicionar fonte de atlas"
 
+msgid "Tile Sources"
+msgstr "Fontes de Tiles"
+
 msgid "Sort Sources"
 msgstr "Ordenar Fontes"
 
 msgid "A palette of tiles made from a texture."
-msgstr "Uma paleta de blocos feita a partir de uma textura."
+msgstr "Uma paleta de tiles feita a partir de uma textura."
 
 msgid "Scenes Collection"
 msgstr "Coleção de Cenas"
 
 msgid "A collection of scenes that can be instantiated and placed as tiles."
-msgstr "Uma coleção de cenas que pode ser instanciada e usada como blocos."
+msgstr "Uma coleção de cenas que podem ser instanciadas e usadas como tiles."
 
 msgid "Open Atlas Merging Tool"
-msgstr "Abrir Ferramenta de Mesclagem do Atlas"
+msgstr "Abrir Ferramenta de Mesclagem de Atlas"
 
 msgid "Manage Tile Proxies"
-msgstr "Gerenciar Proxies Tile"
+msgstr "Gerenciar Proxies de Tile"
 
 msgid ""
 "No TileSet source selected. Select or create a TileSet source.\n"
 "You can create a new source by using the Add button on the left or by "
 "dropping a tileset texture onto the source list."
 msgstr ""
-"Nenhuma fonte TileSet selecionada. Selecione ou crie uma fonte TileSet.\n"
-"Você pode criar uma nova fonte usando o botão Adicionar à esquerda ou "
-"soltando uma textura de mosaico na lista de fontes."
+"Nenhuma fonte de TileSet selecionada. Selecione ou crie uma fonte de "
+"TileSet.\n"
+"Você pode criar uma nova fonte usando o botão de Adicionar à esquerda, ou "
+"soltando uma textura de tileset na lista de fontes."
 
 msgid "Add new patterns in the TileMap editing mode."
-msgstr "Adicione novos padrões no modo de edição TileMap."
+msgstr "Adicione novos padrões no modo de edição do TileMap."
 
 msgid ""
 "Warning: Modifying a source ID will result in all TileMaps using that source "
 "to reference an invalid source instead. This may result in unexpected data "
 "loss. Change this ID carefully."
 msgstr ""
-"Aviso: Modificar um ID de origem resultará em todos os TileMaps que utilizam "
-"essa origem referenciando uma origem inválida. Isso pode resultar em perda de "
-"dados inesperada. Mude este ID cuidadosamente."
+"Aviso: Modificar um ID de origem invalidará suas referências em todos os "
+"TileMaps que utilizam essa origem. Isso pode resultar em perda de dados "
+"inesperada. Tenha cuidado ao mudar este ID."
 
 msgid "Add a Scene Tile"
-msgstr "Adicionar um Tile na Cena"
+msgstr "Adicionar um Tile de Cena"
 
 msgid "Remove a Scene Tile"
-msgstr "Remover um Tile da Cena"
+msgstr "Remover um Tile de Cena"
 
 msgid "Drag and drop scenes here or use the Add button."
-msgstr "Arraste e solte cenas aqui ou use o botão de adicionar."
+msgstr "Arraste cenas para cá ou use o botão de Adicionar."
 
 msgid ""
 "The human-readable name for the scene collection. Use a descriptive name here "
 "for organizational purposes (such as \"obstacles\", \"decoration\", etc.)."
 msgstr ""
-"O nome legível para a coleção de cenas. Use um nome descritivo aqui para fins "
-"organizacionais (como “obstáculos”, “decoração”, etc.)."
+"Um nome legível para a coleção de cenas. Use um nome descritivo aqui para "
+"fins organizacionais (como “obstáculos”, “decoração”, etc.)."
 
 msgid ""
 "ID of the scene tile in the collection. Each painted tile has associated ID, "
 "so changing this property may cause your TileMaps to not display properly."
 msgstr ""
-"ID do bloco de cena na coleção. Cada bloco pintado possui um ID associado, "
+"ID do tile de cena na coleção. Cada tile pintado possui seu próprio ID, "
 "portanto, alterar essa propriedade pode fazer com que seus TileMaps não sejam "
 "exibidos corretamente."
 
 msgid "Absolute path to the scene associated with this tile."
-msgstr "Caminho absoluto para a cena associada a este bloco."
+msgstr "Caminho absoluto para a cena associada a este tile."
 
 msgid ""
 "If [code]true[/code], a placeholder marker will be displayed on top of the "
 "scene's preview. The marker is displayed anyway if the scene has no valid "
 "preview."
 msgstr ""
-"Se [code]true[/code], um marcador de espaço reservado será exibido no topo da "
-"visualização da cena. O marcador será exibido de qualquer maneira se a cena "
-"não tiver uma visualização válida."
+"Se for [code]true[/code], um marcador temporário será exibido em cima da "
+"visualização da cena. O marcador será exibido mesmo se a cena não tiver uma "
+"visualização válida."
 
 msgid "Scenes collection properties:"
 msgstr "Propriedades da coleção de cenas:"
@@ -12235,6 +13468,24 @@ msgstr "Propriedades da coleção de cenas:"
 msgid "Tile properties:"
 msgstr "Propriedades do Tile:"
 
+msgid "Paint Tool"
+msgstr "Ferramenta de Pintura"
+
+msgid "Line Tool"
+msgstr "Ferramenta de Linha"
+
+msgid "Rect Tool"
+msgstr "Ferramenta de Retângulo"
+
+msgid "Bucket Tool"
+msgstr "Ferramenta de Balde"
+
+msgid "Eraser Tool"
+msgstr "Ferramenta de Borracha"
+
+msgid "Picker Tool"
+msgstr "Seletor de Tile"
+
 msgid "TileMap"
 msgstr "TileMap"
 
@@ -12251,8 +13502,8 @@ msgid ""
 "No VCS plugins are available in the project. Install a VCS plugin to use VCS "
 "integration features."
 msgstr ""
-"Nenhum plugin VCS está disponível no projeto. Instale um plugin VSC para usar "
-"funcionalidades de integração VCS."
+"Nenhum plugin VCS (controle de versão) está disponível no projeto. Instale um "
+"plugin VSC para usar funcionalidades de integração VCS."
 
 msgid "Error"
 msgstr "Erro"
@@ -12267,7 +13518,7 @@ msgid "Commit"
 msgstr "Commit"
 
 msgid "Open in editor"
-msgstr "Abrir no Editor"
+msgstr "Abrir no editor"
 
 msgid "Discard changes"
 msgstr "Descartar alterações"
@@ -12288,25 +13539,25 @@ msgid "Subtitle:"
 msgstr "Subtítulo:"
 
 msgid "Do you want to remove the %s branch?"
-msgstr "Deseja remover a ramificação %s?"
+msgstr "Deseja remover o ramo %s?"
 
 msgid "Do you want to remove the %s remote?"
 msgstr "Deseja remover o controle remoto %s?"
 
 msgid "Toggle Version Control Bottom Panel"
-msgstr "Alternar Painel Inferior de Controle da Versão"
+msgstr "Alternar Painel Inferior de Controle de Versão"
 
 msgid "Create Version Control Metadata"
 msgstr "Criar Metadados de Controle de versão"
 
 msgid "Create VCS metadata files for:"
-msgstr "Crie arquivos de metadados VCS para:"
+msgstr "Criar arquivos de metadados de VCS para:"
 
 msgid "Existing VCS metadata files will be overwritten."
-msgstr "Os arquivos de metadados VCS existentes serão substituídos."
+msgstr "Os arquivos de metadados de VCS existentes serão substituídos."
 
 msgid "Local Settings"
-msgstr "Configurações de Localização"
+msgstr "Configurações Locais"
 
 msgid "Apply"
 msgstr "Aplicar"
@@ -12321,7 +13572,7 @@ msgid "Remote Login"
 msgstr "Login Remoto"
 
 msgid "Username"
-msgstr "Nome do Usuário"
+msgstr "Nome de Usuário"
 
 msgid "Password"
 msgstr "Senha"
@@ -12352,13 +13603,13 @@ msgstr ""
 "Esta operação é IRREVERSÍVEL. Suas alterações serão excluídas PARA SEMPRE."
 
 msgid "Permanentally delete my changes"
-msgstr "Excluir permanentemente minhas alterações"
+msgstr "Excluir minhas alterações permanentemente"
 
 msgid "Stage all changes"
 msgstr "Preparar todas as alterações"
 
 msgid "Unstage all changes"
-msgstr "Desfazer todas as alterações"
+msgstr "Despreparar todas as alterações"
 
 msgid "Commit Message"
 msgstr "Mensagem de Commit"
@@ -12394,19 +13645,19 @@ msgid "Remove Remote"
 msgstr "Remover Remoto"
 
 msgid "Remote Name"
-msgstr "Nome Remoto"
+msgstr "Nome do Remoto"
 
 msgid "Remote URL"
 msgstr "URL do Remoto"
 
 msgid "Fetch"
-msgstr "Trazer"
+msgstr "Checar Mudanças Remotas"
 
 msgid "Pull"
-msgstr "Puxar"
+msgstr "Puxar Mudanças"
 
 msgid "Push"
-msgstr "Enviar"
+msgstr "Enviar Mudanças"
 
 msgid "Force Push"
 msgstr "Forçar Envio"
@@ -12432,13 +13683,13 @@ msgstr ""
 "recente"
 
 msgid "View:"
-msgstr "Visualizar:"
+msgstr "Visualização:"
 
 msgid "Split"
-msgstr "Dividir"
+msgstr "Dividida"
 
 msgid "Unified"
-msgstr "Unificado"
+msgstr "Unificada"
 
 msgid "E constant (2.718282). Represents the base of the natural logarithm."
 msgstr "Constante E (2,718282). Representa a base de um logaritmo natural."
@@ -12464,6 +13715,9 @@ msgstr "Constante Tau (6,283185) ou 360 graus."
 msgid "Sqrt2 constant (1.414214). Square root of 2."
 msgstr "Constante Sqrt2 (1,414214). Raiz quadrada de 2."
 
+msgid "Drag and drop nodes here to attach them."
+msgstr "Arraste nós para cá para anexá-los."
+
 msgid "Add Input"
 msgstr "Adicionar Entrada"
 
@@ -12480,7 +13734,7 @@ msgid "UInt"
 msgstr "UInt"
 
 msgid "Vector2"
-msgstr "Vetor2"
+msgstr "Vector2"
 
 msgid "Vector3"
 msgstr "Vetor3"
@@ -12492,7 +13746,7 @@ msgid "Boolean"
 msgstr "Booleano"
 
 msgid "Sampler"
-msgstr "Amostrador"
+msgstr "Sampler"
 
 msgid "[default]"
 msgstr "[padrão]"
@@ -12501,8 +13755,14 @@ msgid ""
 "The 2D preview cannot correctly show the result retrieved from instance "
 "parameter."
 msgstr ""
-"A visualização 2D não pode mostrar corretamente o resultado recuperado do "
-"parâmetro de instância."
+"Impossível mostrar corretamente o resultado do parâmetro de instância no "
+"visualizador 2D."
+
+msgid "Copy Preview Shader Parameters From Material"
+msgstr "Copiar Parâmetros do Shader de Prévia do Material"
+
+msgid "Paste Preview Shader Parameters To Material"
+msgstr "Colar Parâmetros do Shader de Prévia neste Material"
 
 msgid "Add Input Port"
 msgstr "Adicionar Porta de Entrada"
@@ -12511,10 +13771,10 @@ msgid "Add Output Port"
 msgstr "Adicionar Porta de Saída"
 
 msgid "Change Input Port Type"
-msgstr "Alterar Tipo de Porta de Entrada"
+msgstr "Alterar Tipo da Porta de Entrada"
 
 msgid "Change Output Port Type"
-msgstr "Alterar Tipo de Porta de Saída"
+msgstr "Alterar Tipo da Porta de Saída"
 
 msgid "Change Input Port Name"
 msgstr "Alterar Nome da Porta de Entrada"
@@ -12538,10 +13798,19 @@ msgid "Set VisualShader Expression"
 msgstr "Definir Expressão do VisualShader"
 
 msgid "Resize VisualShader Node"
-msgstr "Redimensionar Nó do VisualShader"
+msgstr "Redimensionar Nó VisualShader"
+
+msgid "Hide Port Preview"
+msgstr "Ocultar Pré-visualização de Porta"
 
 msgid "Show Port Preview"
-msgstr "Mostrar Visualização da Porta"
+msgstr "Mostrar Pré-visualização de Porta"
+
+msgid "Set Frame Title"
+msgstr "Definir Título do Quadro"
+
+msgid "Set Tint Color"
+msgstr "Definir Cor do Tom"
 
 msgid "Toggle Frame Color"
 msgstr "Alternar Cor do Quadro"
@@ -12549,6 +13818,9 @@ msgstr "Alternar Cor do Quadro"
 msgid "Set Frame Color"
 msgstr "Definir Cor do Quadro"
 
+msgid "Toggle Auto Shrink"
+msgstr "Alternar Encolhimento Automático"
+
 msgid "Set Parameter Name"
 msgstr "Definir Nome do Parâmetro"
 
@@ -12556,7 +13828,7 @@ msgid "Set Input Default Port"
 msgstr "Definir Porta Padrão de Entrada"
 
 msgid "Set Custom Node Option"
-msgstr "Definir opção de nó personalizado"
+msgstr "Definir Opção de Nó Personalizado"
 
 msgid "Add Node to Visual Shader"
 msgstr "Adicionar Nó ao Visual Shader"
@@ -12571,10 +13843,10 @@ msgid "Move VisualShader Node(s)"
 msgstr "Mover Nó(s) VisualShader"
 
 msgid "Move and Attach VisualShader Node(s) to parent frame"
-msgstr "Mover e Acoplar nó(s) VisualShader ao frame pai"
+msgstr "Mover e Anexar Nó(s) VisualShader ao quadro pai"
 
 msgid "Insert node"
-msgstr "Inserir nó (node)"
+msgstr "Inserir nó"
 
 msgid "Convert Constant Node(s) To Parameter(s)"
 msgstr "Converter Nó(s) Constante(s) para Parâmetro(s)"
@@ -12582,6 +13854,9 @@ msgstr "Converter Nó(s) Constante(s) para Parâmetro(s)"
 msgid "Convert Parameter Node(s) To Constant(s)"
 msgstr "Converter Nó(s) de Parâmetro para Constante(s)"
 
+msgid "Detach VisualShader Node(s) from Frame"
+msgstr "Desvincular Nó(s) VisualShader do Quadro"
+
 msgid "Delete VisualShader Node"
 msgstr "Excluir Nó VisualShader"
 
@@ -12597,6 +13872,18 @@ msgstr "Converter Constante(s) para Parâmetro(s)"
 msgid "Convert Parameter(s) to Constant(s)"
 msgstr "Converter Parâmetro(s) para Constante(s)"
 
+msgid "Detach from Parent Frame"
+msgstr "Desvincular do Quadro Pai"
+
+msgid "Enable Auto Shrink"
+msgstr "Ativar Encolhimento Automático"
+
+msgid "Enable Tint Color"
+msgstr "Ativar Cor do Tom"
+
+msgid "Edit Preview Parameter: %s"
+msgstr "Editar Parâmetro de Prévia: %s"
+
 msgid "Duplicate VisualShader Node(s)"
 msgstr "Duplicar Nó(s) VisualShader"
 
@@ -12604,10 +13891,10 @@ msgid "Paste VisualShader Node(s)"
 msgstr "Colar Nó(s) VisualShader"
 
 msgid "Cut VisualShader Node(s)"
-msgstr "Cortar Nó(s) VisualShader"
+msgstr "Recortar Nó(s) VisualShader"
 
 msgid "Visual Shader Input Type Changed"
-msgstr "Tipo de Entrada de Shader Visual Alterado"
+msgstr "Tipo de Entrada do Visual Shader Alterado"
 
 msgid "ParameterRef Name Changed"
 msgstr "Nome do ParameterRef Alterado"
@@ -12624,9 +13911,15 @@ msgstr "Nome Inválido para varying."
 msgid "Varying with that name is already exist."
 msgstr "Varying com esse nome já existe."
 
+msgid "Boolean type cannot be used with `%s` varying mode."
+msgstr "O tipo booleano não pode ser usado com o modo varying `%s`."
+
 msgid "Add Node(s) to Visual Shader"
 msgstr "Adicionar Nó(s) ao Visual Shader"
 
+msgid "Hold %s Key To Swap Connections"
+msgstr "Segure a Tecla %s para Trocar as Conexões"
+
 msgid "Vertex"
 msgstr "Vértice"
 
@@ -12637,10 +13930,10 @@ msgid "Light"
 msgstr "Luz"
 
 msgid "Process"
-msgstr "Processar"
+msgstr "Processamento"
 
 msgid "Collide"
-msgstr "Colidir"
+msgstr "Colisão"
 
 msgid "Sky"
 msgstr "Céu"
@@ -12658,10 +13951,13 @@ msgid "Remove Varying"
 msgstr "Remover Varying"
 
 msgid "Show generated shader code."
-msgstr "Mostra o código do shader gerado."
+msgstr "Mostrar o código de shader gerado."
+
+msgid "Toggle shader preview."
+msgstr "Alternar visualização do shader."
 
 msgid "Generated Shader Code"
-msgstr "Código Shader Gerado"
+msgstr "Código de Shader Gerado"
 
 msgid "Add Node"
 msgstr "Adicionar Nó"
@@ -12673,13 +13969,22 @@ msgid "Insert New Node"
 msgstr "Inserir Novo Nó"
 
 msgid "Insert New Reroute"
-msgstr "Inserir novo redirecionamento"
+msgstr "Inserir Novo Redirecionamento"
+
+msgid "Filter Parameters"
+msgstr "Filtrar Parâmetros"
+
+msgid "Copy Parameters From Material"
+msgstr "Copiar Parâmetros do Material"
+
+msgid "Paste Parameters To Material"
+msgstr "Colar Parâmetros no Material"
 
 msgid "High-end node"
 msgstr "Nó Superior"
 
 msgid "Create Shader Node"
-msgstr "Criar Nó Shader"
+msgstr "Criar Nó de Shader"
 
 msgid "Create Shader Varying"
 msgstr "Criar Varying de Shader"
@@ -12688,28 +13993,34 @@ msgid "Delete Shader Varying"
 msgstr "Excluir Varying de Shader"
 
 msgid "Color function."
-msgstr "Função cor."
+msgstr "Função de cor."
 
 msgid "Color operator."
 msgstr "Operador de cor."
 
 msgid "Grayscale function."
-msgstr "Função Escala de Cinza."
+msgstr "Função escala de cinza."
 
 msgid "Converts HSV vector to RGB equivalent."
-msgstr "Converter vetor HSV para um RGB equivalente."
+msgstr "Converte um vetor HSV para um RGB equivalente."
+
+msgid "Converts color from linear to sRGB color space."
+msgstr "Converte cores do espaço de cor linear para sRGB."
 
 msgid "Converts RGB vector to HSV equivalent."
-msgstr "Converter vetor RGB para um HSV equivalente."
+msgstr "Converte um vetor RGB para um HSV equivalente."
 
 msgid "Sepia function."
-msgstr "Função Sépia."
+msgstr "Função sépia."
+
+msgid "Converts color from sRGB to linear color space."
+msgstr "Converte cores do espaço de cor sRGB para linear."
 
 msgid "Burn operator."
-msgstr "Operador de gravação."
+msgstr "Operador de gravar."
 
 msgid "Darken operator."
-msgstr "Operador de escurecimento."
+msgstr "Operador de escurecer."
 
 msgid "Difference operator."
 msgstr "Operador de diferença."
@@ -12721,10 +14032,10 @@ msgid "HardLight operator."
 msgstr "Operador HardLight."
 
 msgid "Lighten operator."
-msgstr "Operador Lighten."
+msgstr "Operador de clarear."
 
 msgid "Overlay operator."
-msgstr "Operador de sobreposição."
+msgstr "Operador de sobrepor."
 
 msgid "Screen operator."
 msgstr "Operador de tela."
@@ -12733,13 +14044,16 @@ msgid "SoftLight operator."
 msgstr "Operador SoftLight."
 
 msgid "Color constant."
-msgstr "Constante cor."
+msgstr "Constante de cor."
 
 msgid "Color parameter."
 msgstr "Parâmetro de cor."
 
 msgid "(Fragment/Light mode only) Derivative function."
-msgstr "(Apenas modo Fragmento/Luz) Função derivada."
+msgstr "(Apenas no modo Fragmento/Luz) Função derivada."
+
+msgid "Derivative function."
+msgstr "Função derivada."
 
 msgid "Returns the boolean result of the %s comparison between two parameters."
 msgstr "Retorna o resultado booleano da comparação %s entre dois parâmetros."
@@ -12763,7 +14077,7 @@ msgid ""
 "Returns the boolean result of the comparison between INF and a scalar "
 "parameter."
 msgstr ""
-"Retorna o resultado booleano da comparação entre INF e o parâmetro escalar."
+"Retorna o resultado booleano da comparação entre INF e um parâmetro escalar."
 
 msgid ""
 "Returns the boolean result of the comparison between NaN and a scalar "
@@ -12794,6 +14108,13 @@ msgstr ""
 "Retorna um vetor 3D associado se o valor booleano fornecido for verdadeiro ou "
 "falso."
 
+msgid ""
+"Returns an associated 4D vector if the provided boolean value is true or "
+"false."
+msgstr ""
+"Retorna um vetor 4D associado se o valor booleano fornecido for verdadeiro ou "
+"falso."
+
 msgid ""
 "Returns an associated boolean if the provided boolean value is true or false."
 msgstr ""
@@ -12804,21 +14125,21 @@ msgid ""
 "Returns an associated floating-point scalar if the provided boolean value is "
 "true or false."
 msgstr ""
-"Retorna um escalar de ponto flutuante associado se o valor booleano fornecido "
-"for verdadeiro ou falso."
+"Retorna um float associado se o valor booleano fornecido for verdadeiro ou "
+"falso."
 
 msgid ""
 "Returns an associated integer scalar if the provided boolean value is true or "
 "false."
 msgstr ""
-"Retorna um escalar inteiro associado se o valor booleano fornecido for "
-"verdadeiro ou falso."
+"Retorna um inteiro associado se o valor booleano fornecido for verdadeiro ou "
+"falso."
 
 msgid ""
 "Returns an associated transform if the provided boolean value is true or "
 "false."
 msgstr ""
-"Retorna uma transformada associada se o valor booleano fornecido for "
+"Retorna uma transformação associada se o valor booleano fornecido for "
 "verdadeiro ou falso."
 
 msgid ""
@@ -12854,13 +14175,14 @@ msgid "Input parameter."
 msgstr "Parâmetro de entrada."
 
 msgid "'%s' input parameter for vertex and fragment shader modes."
-msgstr "Parâmetro de entrada '%s' para os modos vértice e fragmento de shader."
+msgstr ""
+"Parâmetro de entrada '%s' para os modos de shader de vértice e fragmento."
 
 msgid "'%s' input parameter for fragment and light shader modes."
-msgstr "Parâmetro de entrada '%s' para os modos de fragmento e shader de luz."
+msgstr "Parâmetro de entrada '%s' para os modos de shader de fragmento e luz."
 
 msgid "'%s' input parameter for fragment shader mode."
-msgstr "Parâmetro de entrada '%s' para o modo de fragmento de shader."
+msgstr "Parâmetro de entrada '%s' para o modo de shader de fragmento."
 
 msgid "'%s' input parameter for sky shader mode."
 msgstr "Parâmetro de entrada '%s' para o modo de shader de céu."
@@ -12881,35 +14203,37 @@ msgid "'%s' input parameter for process shader mode."
 msgstr "Parâmetro de entrada '%s' para o modo de shader de processamento."
 
 msgid "'%s' input parameter for start and process shader modes."
-msgstr "Parâmetro de entrada '%s' para os modos shader inicial e processo."
+msgstr ""
+"Parâmetro de entrada '%s' para os modos de shader inicial e de processamento."
 
 msgid "'%s' input parameter for process and collide shader modes."
-msgstr "Parâmetro de entrada '%s' para os modos shader processo e colisão."
+msgstr ""
+"Parâmetro de entrada '%s' para os modos de shader de processamento e colisão."
 
 msgid ""
 "A node for help to multiply a position input vector by rotation using "
 "specific axis. Intended to work with emitters."
 msgstr ""
-"Um nó para ajudar a multiplicar um vetor de entrada de posição por rotação "
-"usando um eixo específico. Destinado a trabalhar com emissores."
+"Um nó para ajudar a multiplicar um vetor de entrada de posição por uma "
+"rotação usando um eixo específico. Feito para uso por emissores."
 
 msgid "Float function."
-msgstr "Função Float."
+msgstr "Função de float."
 
 msgid "Float operator."
-msgstr "Operador Float."
+msgstr "Operador de float."
 
 msgid "Integer function."
-msgstr "Função Integer."
+msgstr "Função de inteiro."
 
 msgid "Integer operator."
-msgstr "Operador Integer."
+msgstr "Operador de inteiro."
 
 msgid "Unsigned integer function."
-msgstr "Função inteira sem sinal."
+msgstr "Função de inteiro sem sinal."
 
 msgid "Unsigned integer operator."
-msgstr "Operador inteiro sem sinal."
+msgstr "Operador de inteiro sem sinal."
 
 msgid "Returns the absolute value of the parameter."
 msgstr "Retorna o valor absoluto do parâmetro."
@@ -12927,7 +14251,7 @@ msgid "Returns the inverse hyperbolic sine of the parameter."
 msgstr "Retorna o seno hiperbólico inverso do parâmetro."
 
 msgid "Returns the arc-tangent of the parameter."
-msgstr "Retorna o arco tangente do parâmetro."
+msgstr "Retorna o arco-tangente do parâmetro."
 
 msgid "Returns the arc-tangent of the parameters."
 msgstr "Retorna o arco-tangente dos parâmetros."
@@ -12957,30 +14281,36 @@ msgid "Returns the hyperbolic cosine of the parameter."
 msgstr "Retorna o cosseno hiperbólico do parâmetro."
 
 msgid "Converts a quantity in radians to degrees."
-msgstr "Converte um valor em radianos para graus."
+msgstr "Converte um valor de radianos para graus."
 
 msgid ""
 "(Fragment/Light mode only) (Scalar) Derivative in 'x' using local "
 "differencing."
 msgstr ""
-"(Apenas modo Fragmento/Luz) (Escalar) Derivada em 'x' usando diferenciação "
+"(Apenas no modo Fragmento/Luz) (Escalar) Derivada em 'x' usando diferenciação "
 "local."
 
 msgid ""
 "(Fragment/Light mode only) (Scalar) Derivative in 'y' using local "
 "differencing."
 msgstr ""
-"(Apenas modo Fragmento/Luz) (Escalar) Derivada em 'y' usando diferenciação "
+"(Apenas no modo Fragmento/Luz) (Escalar) Derivada em 'y' usando diferenciação "
 "local."
 
+msgid "(Scalar) Derivative in 'x' using local differencing."
+msgstr "(Escalar) Derivada em 'x' usando diferenciação local."
+
+msgid "(Scalar) Derivative in 'y' using local differencing."
+msgstr "(Escalar) Derivada em 'y' usando diferenciação local."
+
 msgid "Base-e Exponential."
-msgstr "Exponencial de base-e."
+msgstr "Exponencial de Base-e."
 
 msgid "Base-2 Exponential."
-msgstr "Exponencial de base-2."
+msgstr "Exponencial de Base-2."
 
 msgid "Finds the nearest integer less than or equal to the parameter."
-msgstr "Localiza o inteiro mais próximo menor ou igual ao parâmetro."
+msgstr "Encontra o inteiro mais próximo menor ou igual ao parâmetro."
 
 msgid "Computes the fractional part of the argument."
 msgstr "Calcula a parte fracionária do argumento."
@@ -13019,11 +14349,14 @@ msgid ""
 msgstr "Retorna o valor do primeiro parâmetro elevado a potência do segundo."
 
 msgid "Converts a quantity in degrees to radians."
-msgstr "Converte uma quantidade em graus para radianos."
+msgstr "Converte um valor de graus para radianos."
 
 msgid "1.0 / scalar"
 msgstr "1,0 / escalar"
 
+msgid "Remaps a value from the input range to the output range."
+msgstr "Remapeia um valor do intervalo de entrada para o intervalo de saída."
+
 msgid "Finds the nearest integer to the parameter."
 msgstr "Encontra o inteiro mais próximo do parâmetro."
 
@@ -13054,8 +14387,8 @@ msgid ""
 msgstr ""
 "SmoothStep function( scalar(edge0), scalar(edge1), scalar(x) ).\n"
 "\n"
-"Retorna 0.0 se 'x' é menor que 'edge0' e 1.0 se 'x' é maior que 'edge1'. Caso "
-"contrário, o valor retornado é interpolado entre 0.0 e 1.0 utilizando "
+"Retorna 0,0 se 'x' é menor que 'edge0' e 1,0 se 'x' é maior que 'edge1'. Caso "
+"contrário, o valor retornado é interpolado entre 0,0 e 1,0 utilizando "
 "polinômios de Hermite."
 
 msgid ""
@@ -13070,7 +14403,11 @@ msgstr ""
 msgid ""
 "(Fragment/Light mode only) (Scalar) Sum of absolute derivative in 'x' and 'y'."
 msgstr ""
-"(Apenas modo Fragmento/Luz) (Escalar) Soma da derivada absoluta em 'x' e 'y'."
+"(Apenas no modo Fragmento/Luz) (Escalar) Soma da derivada absoluta em 'x' e "
+"'y'."
+
+msgid "(Scalar) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Escalar) Soma da derivada absoluta em 'x' e 'y'."
 
 msgid "Returns the tangent of the parameter."
 msgstr "Retorna a tangente do parâmetro."
@@ -13082,7 +14419,7 @@ msgid "Finds the truncated value of the parameter."
 msgstr "Encontra o valor truncado do parâmetro."
 
 msgid "Sums two floating-point scalars."
-msgstr "Soma dois escalares de ponto flutuante."
+msgstr "Soma dois escalares float."
 
 msgid "Sums two integer scalars."
 msgstr "Soma dois escalares inteiros."
@@ -13145,7 +14482,7 @@ msgstr ""
 "Retorna o resultado da operação bit a bit XOR (a ^ b) no inteiro sem sinal."
 
 msgid "Divides two floating-point scalars."
-msgstr "Divide dois escalares de ponto flutuante."
+msgstr "Divide dois escalares float."
 
 msgid "Divides two integer scalars."
 msgstr "Divide dois escalares inteiros."
@@ -13154,7 +14491,7 @@ msgid "Divides two unsigned integer scalars."
 msgstr "Divide dois escalares inteiros sem sinal."
 
 msgid "Multiplies two floating-point scalars."
-msgstr "Multiplica dois escalares de ponto flutuante."
+msgstr "Multiplica dois escalares float."
 
 msgid "Multiplies two integer scalars."
 msgstr "Multiplica dois escalares inteiros."
@@ -13163,7 +14500,7 @@ msgid "Multiplies two unsigned integer scalars."
 msgstr "Multiplica dois escalares inteiros sem sinal."
 
 msgid "Returns the remainder of the two floating-point scalars."
-msgstr "Retorna o resto de dois escalares de ponto flutuante."
+msgstr "Retorna o resto de dois escalares float."
 
 msgid "Returns the remainder of the two integer scalars."
 msgstr "Retorna o resto de dois escalares inteiros."
@@ -13172,7 +14509,7 @@ msgid "Returns the remainder of the two unsigned integer scalars."
 msgstr "Retorna o resto de dois escalares inteiros sem sinal."
 
 msgid "Subtracts two floating-point scalars."
-msgstr "Subtrai dois escalares de ponto flutuante."
+msgstr "Subtrai dois escalares float."
 
 msgid "Subtracts two integer scalars."
 msgstr "Subtrai dois escalares inteiros."
@@ -13181,7 +14518,7 @@ msgid "Subtracts two unsigned integer scalars."
 msgstr "Subtrai dois escalares inteiros sem sinal."
 
 msgid "Scalar floating-point constant."
-msgstr "Constante de ponto flutuante escalar."
+msgstr "Constante escalar float."
 
 msgid "Scalar integer constant."
 msgstr "Constante escalar inteira."
@@ -13190,43 +14527,43 @@ msgid "Scalar unsigned integer constant."
 msgstr "Constante escalar inteira sem sinal."
 
 msgid "Scalar floating-point parameter."
-msgstr "Parâmetro de ponto flutuante escalar."
+msgstr "Parâmetro escalar float."
 
 msgid "Scalar integer parameter."
-msgstr "Parâmetro inteiro escalar."
+msgstr "Parâmetro escalar inteiro."
 
 msgid "Scalar unsigned integer parameter."
-msgstr "Parâmetro inteiro sem sinal escalar."
+msgstr "Parâmetro escalar inteiro sem sinal."
 
 msgid "Converts screen UV to a SDF."
-msgstr "Converte tela UV para um SDF."
+msgstr "Converte UV da tela para um SDF."
 
 msgid "Casts a ray against the screen SDF and returns the distance travelled."
-msgstr "Lança um raio contra a tela SDF e retorna a distância percorrida."
+msgstr "Lança um raio contra o SDF da tela e retorna a distância percorrida."
 
 msgid "Converts a SDF to screen UV."
-msgstr "Converte um SDF em tela UV."
+msgstr "Converte um SDF para UV de tela."
 
 msgid "Performs a SDF texture lookup."
-msgstr "Executa uma pesquisa de textura SDF."
+msgstr "Executa uma busca por textura SDF."
 
 msgid "Performs a SDF normal texture lookup."
-msgstr "Executa uma pesquisa de textura normal SDF."
+msgstr "Executa uma busca por textura normal SDF."
 
 msgid "Function to be applied on texture coordinates."
 msgstr "Função a ser aplicada nas coordenadas de textura."
 
 msgid "Polar coordinates conversion applied on texture coordinates."
-msgstr "Conversão de coordenadas polares aplicada em coordenadas de textura."
+msgstr "Conversão para coordenadas polares aplicada em coordenadas de textura."
 
 msgid "Perform the cubic texture lookup."
-msgstr "Execute a pesquisa de textura cúbica."
+msgstr "Executar a busca por textura cúbica."
 
 msgid "Perform the curve texture lookup."
-msgstr "Execute a pesquisa de textura de curva."
+msgstr "Executar a busca por textura de curva."
 
 msgid "Perform the three components curve texture lookup."
-msgstr "Execute a pesquisa de textura de curva de três componentes."
+msgstr "Executar a busca por textura de curva de três componentes."
 
 msgid ""
 "Returns the depth value obtained from the depth prepass in a linear space."
@@ -13235,46 +14572,46 @@ msgstr ""
 "espaço linear."
 
 msgid "Reconstructs the World Position of the Node from the depth texture."
-msgstr "Reconstrói a posição geral do nó a partir da textura de profundidade."
+msgstr "Reconstrói a Posição Global do Nó a partir da textura de profundidade."
 
 msgid "Unpacks the Screen Normal Texture in World Space"
-msgstr "Descompacta a textura normal da tela no espaço do mundo"
+msgstr "Achata a Textura Normal da Tela no Espaço Global"
 
 msgid "Perform the 2D texture lookup."
-msgstr "Execute a pesquisa de textura 2D."
+msgstr "Executar a busca por textura 2D."
 
 msgid "Perform the 2D-array texture lookup."
-msgstr "Execute a pesquisa de textura de matriz 2D."
+msgstr "Executar a busca por textura de array 2D."
 
 msgid "Perform the 3D texture lookup."
-msgstr "Execute a pesquisa de textura 3D."
+msgstr "Executar a busca por textura 3D."
 
 msgid "Apply panning function on texture coordinates."
-msgstr "Aplique a função de panorâmica nas coordenadas de textura."
+msgstr "Aplicar função de movimento em coordenadas de textura."
 
 msgid "Apply scaling function on texture coordinates."
-msgstr "Aplique a função de dimensionamento nas coordenadas de textura."
+msgstr "Aplicar função de escalonamento em coordenadas de textura."
 
 msgid "Cubic texture parameter lookup."
-msgstr "Pesquisa de parâmetro de textura cúbica."
+msgstr "Busca por parâmetro de textura cúbica."
 
 msgid "2D texture parameter lookup."
-msgstr "Pesquisa de parâmetros de textura 2D."
+msgstr "Busca por parâmetros de textura 2D."
 
 msgid "2D texture parameter lookup with triplanar."
-msgstr "Pesquisa de parâmetros de textura 2D com triplanar."
+msgstr "Busca por parâmetros de textura 2D com triplanar."
 
 msgid "2D array of textures parameter lookup."
-msgstr "Matriz 2D de pesquisa de parâmetros de texturas."
+msgstr "Busca por parâmetros de array 2D de texturas."
 
 msgid "3D texture parameter lookup."
-msgstr "Pesquisa de parâmetros de textura 3D."
+msgstr "Busca por parâmetros de textura 3D."
 
 msgid "Transform function."
-msgstr "Função transformada."
+msgstr "Função de transformação."
 
 msgid "Transform operator."
-msgstr "Operador transformada."
+msgstr "Operador de transformação."
 
 msgid ""
 "Calculate the outer product of a pair of vectors.\n"
@@ -13285,56 +14622,56 @@ msgid ""
 "whose number of rows is the number of components in 'c' and whose number of "
 "columns is the number of components in 'r'."
 msgstr ""
-"Calcule o produto externo de um par de vetores.\n"
+"Calcular o produto externo de um par de vetores.\n"
 "\n"
 "OuterProduct trata o primeiro parâmetro 'c' como um vetor coluna (matriz com "
 "uma coluna) e o segundo parâmetro 'r' como um vetor linha (matriz com uma "
-"linha) e faz uma matriz algébrica linear multiplicar 'c * r', produzindo uma "
-"matriz cujo número de linhas é o número de componentes em 'c' e cujo número "
-"de colunas é o número de componentes em 'r'."
+"linha) e faz uma multiplicação de matriz algébrica linear 'c * r', produzindo "
+"uma matriz cujo número de linhas é o número de componentes em 'c' e cujo "
+"número de colunas é o número de componentes em 'r'."
 
 msgid "Composes transform from four vectors."
-msgstr "Compõe a transformada de quatro vetores."
+msgstr "Compõe transformação a partir de quatro vetores."
 
 msgid "Decomposes transform to four vectors."
-msgstr "Decompõe transformada em quatro vetores."
+msgstr "Decompõe transformação em quatro vetores."
 
 msgid "Calculates the determinant of a transform."
-msgstr "Calcula o determinante de uma transformada."
+msgstr "Calcula o determinante de uma transformação."
 
 msgid ""
 "Calculates how the object should face the camera to be applied on Model View "
 "Matrix output port for 3D objects."
 msgstr ""
 "Calcula como o objeto deve ficar voltado para a câmera a ser aplicada na "
-"porta de saída do Modelo de Visualização da Matriz para objetos 3D."
+"porta de saída da Matriz de Visualização de Modelo para objetos 3D."
 
 msgid "Calculates the inverse of a transform."
-msgstr "Calcula a inversa de uma transformada."
+msgstr "Calcula a inversa de uma transformação."
 
 msgid "Calculates the transpose of a transform."
-msgstr "Calcula a transposta de uma transformada."
+msgstr "Calcula a transposta de uma transformação."
 
 msgid "Sums two transforms."
-msgstr "Soma duas transformadas."
+msgstr "Soma duas transformações."
 
 msgid "Divides two transforms."
-msgstr "Divide duas transformadas."
+msgstr "Divide duas transformações."
 
 msgid "Multiplies two transforms."
-msgstr "Multiplica duas transformadas."
+msgstr "Multiplica duas transformações."
 
 msgid "Performs per-component multiplication of two transforms."
-msgstr "Executa a multiplicação por componente de duas transformadas."
+msgstr "Executa multiplicação por componente de duas transformações."
 
 msgid "Subtracts two transforms."
-msgstr "Subtrai duas transformadas."
+msgstr "Subtrai duas transformações."
 
 msgid "Multiplies vector by transform."
-msgstr "Multiplica vetor por transformada."
+msgstr "Multiplica vetor por transformação."
 
 msgid "Transform constant."
-msgstr "Transformar em constante."
+msgstr "Constante de transformação."
 
 msgid "Transform parameter."
 msgstr "Parâmetro de transformação."
@@ -13374,25 +14711,25 @@ msgid "Composes vector from scalars."
 msgstr "Compõe um vetor a partir de escalares."
 
 msgid "Decomposes vector to scalars."
-msgstr "Decompõe vetores em escalares."
+msgstr "Decompõe um vetor em escalares."
 
 msgid "Composes 2D vector from two scalars."
 msgstr "Compõe um vetor 2D a partir de dois escalares."
 
 msgid "Decomposes 2D vector to two scalars."
-msgstr "Decompõe o vetor 2D em dois escalares."
+msgstr "Decompõe um vetor 2D em dois escalares."
 
 msgid "Composes 3D vector from three scalars."
 msgstr "Compõe um vetor 3D a partir de três escalares."
 
 msgid "Decomposes 3D vector to three scalars."
-msgstr "Decompõe o vetor 3D em três escalares."
+msgstr "Decompõe um vetor 3D em três escalares."
 
 msgid "Composes 4D vector from four scalars."
 msgstr "Compõe um vetor 4D a partir de quatro escalares."
 
 msgid "Decomposes 4D vector to four scalars."
-msgstr "Decompõe o vetor 4D em quatro escalares."
+msgstr "Decompõe um vetor 4D em quatro escalares."
 
 msgid "Calculates the cross product of two vectors."
 msgstr "Calcula o produto vetorial de dois vetores."
@@ -13401,16 +14738,22 @@ msgid ""
 "(Fragment/Light mode only) (Vector) Derivative in 'x' using local "
 "differencing."
 msgstr ""
-"(Apenas modo Fragmento/Luz) (Vetor) Derivativo em 'x' usando diferenciação "
+"(Apenas no modo Fragmento/Luz) (Vetor) Derivada em 'x' usando diferenciação "
 "local."
 
 msgid ""
 "(Fragment/Light mode only) (Vector) Derivative in 'y' using local "
 "differencing."
 msgstr ""
-"(Apenas modo Fragmento/Luz) (Vetor) Derivada em 'y' usando diferenciação "
+"(Apenas no modo Fragmento/Luz) (Vetor) Derivada em 'y' usando diferenciação "
 "local."
 
+msgid "(Vector) Derivative in 'x' using local differencing."
+msgstr "(Vetor) Derivada em 'x' usando diferenciação local."
+
+msgid "(Vector) Derivative in 'y' using local differencing."
+msgstr "(Vetor) Derivada em 'y' usando diferenciação local."
+
 msgid "Returns the distance between two points."
 msgstr "Retorna a distância entre dois pontos."
 
@@ -13462,12 +14805,22 @@ msgid ""
 "Returns the vector that points in the direction of reflection ( a : incident "
 "vector, b : normal vector )."
 msgstr ""
-"Retorna o vetor que aponta na direção da reflexão ( a: vetor incidente, b: "
+"Retorna o vetor que aponta na direção da reflexão ( a : vetor incidente, b : "
 "vetor normal )."
 
 msgid "Returns the vector that points in the direction of refraction."
 msgstr "Retorna o vetor que aponta na direção da refração."
 
+msgid "Remaps a vector from the input range to the output range."
+msgstr "Remapeia um vetor do intervalo de entrada para o intervalo de saída."
+
+msgid ""
+"Remaps a vector from the input range to the output range. Ranges defined with "
+"scalars."
+msgstr ""
+"Remapeia um vetor do intervalo de entrada para o intervalo de saída. "
+"Intervalos definidos com escalares."
+
 msgid ""
 "SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n"
 "\n"
@@ -13477,8 +14830,8 @@ msgid ""
 msgstr ""
 "SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n"
 "\n"
-"Retorna 0.0 se 'x' é menor que 'edge0' e 1.0 se 'x' é maior que 'edge1'. Caso "
-"contrário, o valor retornado é interpolado entre 0.0 e 1.0 utilizando "
+"Retorna 0,0 se 'x' é menor que 'edge0' e 1,0 se 'x' é maior que 'edge1'. Caso "
+"contrário, o valor retornado é interpolado entre 0,0 e 1,0 utilizando "
 "polinômios de Hermite."
 
 msgid ""
@@ -13488,10 +14841,10 @@ msgid ""
 "'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 using "
 "Hermite polynomials."
 msgstr ""
-"SmoothStep function( scalar(edge0), scalar(edge1), vector(x) ).\n"
+"SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n"
 "\n"
-"Retorna 0.0 se 'x' é menor que 'edge0' e 1.0 se 'x' é maior que 'edge1'. Caso "
-"contrário, o valor retornado é interpolado entre 0.0 e 1.0 utilizando "
+"Retorna 0,0 se 'x' é menor que 'edge0' e 1,0 se 'x' é maior que 'edge1'. Caso "
+"contrário, o valor retornado é interpolado entre 0,0 e 1,0 utilizando "
 "polinômios de Hermite."
 
 msgid ""
@@ -13501,7 +14854,7 @@ msgid ""
 msgstr ""
 "Step function( vector(edge), vector(x) ).\n"
 "\n"
-"Retorna 0.0 se 'x' é menor que 'edge' e 1.0 caso contrário."
+"Retorna 0,0 se 'x' é menor que 'edge' e 1,0 caso contrário."
 
 msgid ""
 "Step function( scalar(edge), vector(x) ).\n"
@@ -13510,12 +14863,15 @@ msgid ""
 msgstr ""
 "Step function( scalar(edge), vector(x) ).\n"
 "\n"
-"Retorna 0.0 se 'x' é menor que 'edge' e 1.0 caso contrário."
+"Retorna 0,0 se 'x' é menor que 'edge' e 1,0 caso contrário."
 
 msgid ""
 "(Fragment/Light mode only) (Vector) Sum of absolute derivative in 'x' and 'y'."
 msgstr ""
-"(Apenas modo Fragmento/Luz) (Vetor) Soma da derivada absoluta em 'x' e 'y'."
+"(Apenas no modo Fragmento/Luz) (Vetor) Soma da derivada absoluta em 'x' e 'y'."
+
+msgid "(Vector) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Vetor) Soma da derivada absoluta em 'x' e 'y'."
 
 msgid "Adds 2D vector to 2D vector."
 msgstr "Soma vetor 2D com vetor 2D."
@@ -13527,13 +14883,13 @@ msgid "Adds 4D vector to 4D vector."
 msgstr "Soma vetor 4D com vetor 4D."
 
 msgid "Divides 2D vector by 2D vector."
-msgstr "Divide vetor 2D com vetor 2D."
+msgstr "Divide vetor 2D por vetor 2D."
 
 msgid "Divides 3D vector by 3D vector."
-msgstr "Divide vetor 3D com vetor 3D."
+msgstr "Divide vetor 3D por vetor 3D."
 
 msgid "Divides 4D vector by 4D vector."
-msgstr "Divide vetor 4D com vetor 4D."
+msgstr "Divide vetor 4D por vetor 4D."
 
 msgid "Multiplies 2D vector by 2D vector."
 msgstr "Multiplica vetor 2D por vetor 2D."
@@ -13572,7 +14928,7 @@ msgid "3D vector constant."
 msgstr "Constante vetorial 3D."
 
 msgid "3D vector parameter."
-msgstr "Parâmetro do vetor 3D."
+msgstr "Parâmetro vetorial 3D."
 
 msgid "4D vector constant."
 msgstr "Constante vetorial 4D."
@@ -13590,10 +14946,10 @@ msgid ""
 "output ports. This is a direct injection of code into the vertex/fragment/"
 "light function, do not use it to write the function declarations inside."
 msgstr ""
-"Expressão personalizada da Linguagem Shader do Godot, com quantidade "
+"Expressão personalizada na Linguagem de Shader do Godot, com quantidade "
 "personalizada de portas de entrada e saída. Esta é uma injeção direta de "
-"código na função vértice/fragmento/luz, não a use para escrever as "
-"declarações da função dentro dela."
+"código na função vértice/fragmento/luz, não use para escrever declarações de "
+"função."
 
 msgid ""
 "Custom Godot Shader Language expression, which is placed on top of the "
@@ -13601,10 +14957,10 @@ msgid ""
 "it later in the Expressions. You can also declare varyings, parameters and "
 "constants."
 msgstr ""
-"Expressão personalizada da Linguagem Shader do Godot, que é colocada sobre o "
-"shader resultante. Você pode colocar várias definições de função dentro e "
-"chamá-las posteriormente nas Expressões. Você também pode declarar varying, "
-"parâmetros e constantes."
+"Expressão personalizada na Linguagem de Shader do Godot, que é colocada no "
+"topo do shader resultante. Você pode colocar várias definições de função aqui "
+"e chamá-las posteriormente nas Expressões. Você também pode declarar "
+"varyings, parâmetros e constantes."
 
 msgid "A reference to an existing parameter."
 msgstr "Uma referência a um parâmetro existente."
@@ -13626,51 +14982,53 @@ msgid "Edit Visual Property: %s"
 msgstr "Editar Propriedade Visual: %s"
 
 msgid "Visual Shader Mode Changed"
-msgstr "Modo Visual Shader Alterado"
+msgstr "Modo do Visual Shader Alterado"
 
 msgid "Voxel GI data is not local to the scene."
-msgstr "Os dados Voxel GI não são locais para a cena."
+msgstr "Os dados do Voxel GI não são locais à cena."
 
 msgid "Voxel GI data is part of an imported resource."
-msgstr "Os dados Voxel GI fazem parte de um recurso importado."
+msgstr "Os dados do Voxel GI fazem parte de um recurso importado."
 
 msgid "Voxel GI data is an imported resource."
-msgstr "Os dados Voxel GI são um recurso importado."
+msgstr "Os dados do Voxel GI são um recurso importado."
 
 msgid "Bake VoxelGI"
 msgstr "Gerar VoxelGI"
 
 msgid "Select path for VoxelGI Data File"
-msgstr "Selecione o caminho para o arquivo de dados VoxelGI"
+msgstr "Selecione o caminho para o arquivo de dados do VoxelGI"
 
 msgid "Go Online and Open Asset Library"
-msgstr "Fique online e Abra a Biblioteca de recursos"
+msgstr "Ativar o Acesso Online e Abrir a Biblioteca de Recursos"
 
 msgid "Are you sure to run %d projects at once?"
-msgstr "Tem certeza de que deseja executar %d projetos de modo simultâneo?"
+msgstr "Tem certeza que quer executar %d projetos ao mesmo tempo?"
 
 msgid ""
 "Can't run project: Project has no main scene defined.\n"
 "Please edit the project and set the main scene in the Project Settings under "
 "the \"Application\" category."
 msgstr ""
-"Não é possível executar o projeto: Nenhuma cena foi definida como principal.\n"
+"Não foi possível executar o projeto: Nenhuma cena foi definida como "
+"principal.\n"
 "Por favor, edite o projeto e defina a cena principal nas Configurações do "
-"Projeto, na categoria \"Aplicativo\"."
+"Projeto, na categoria \"Aplicação\"."
 
 msgid ""
 "Can't run project: Assets need to be imported first.\n"
 "Please edit the project to trigger the initial import."
 msgstr ""
-"Não é possível executar o projeto: Os recursos precisam ser importados.\n"
-"Edite o projeto para setar a importação inicial."
+"Não foi possível executar o projeto: Os recursos devem ser importados "
+"primeiro.\n"
+"Edite o projeto para executar a importação inicial."
 
 msgid ""
 "Can't open project at '%s'.\n"
 "Project file doesn't exist or is inaccessible."
 msgstr ""
 "Não foi possível abrir o projeto em ' %s'.\n"
-"O arquivo do Projeto não existe ou está inacessível."
+"O arquivo do projeto não existe ou está inacessível."
 
 msgid ""
 "Can't open project at '%s'.\n"
@@ -13683,9 +15041,9 @@ msgid ""
 "You requested to open %d projects in parallel. Do you confirm?\n"
 "Note that usual checks for engine version compatibility will be bypassed."
 msgstr ""
-"Você solicitou a abertura de %d projetos em paralelo. Você confirma?\n"
-"Observe que as verificações usuais de compatibilidade da versão da engine "
-"serão ignoradas."
+"Você solicitou a abertura de %d projetos em paralelo. Tem certeza?\n"
+"Observe que não serão realizadas verificações de compatibilidade da versão da "
+"engine."
 
 msgid ""
 "The selected project \"%s\" does not specify its supported Godot version in "
@@ -13699,8 +15057,8 @@ msgid ""
 "Warning: You won't be able to open the project with previous versions of the "
 "engine anymore."
 msgstr ""
-"O projeto selecionado \"%s\" não especifica sua versão Godot suportada em seu "
-"arquivo de configuração (\"project.godot\").\n"
+"O projeto selecionado \"%s\" não especifica qual versão do Godot ele suporta "
+"em seu arquivo de configuração (\"project.godot\").\n"
 "\n"
 "Caminho do projeto: %s\n"
 "\n"
@@ -13741,7 +15099,7 @@ msgstr ""
 "projeto com versões anteriores da engine."
 
 msgid "Convert project.godot Only"
-msgstr "Converter Somente project.godot"
+msgstr "Converter Apenas project.godot"
 
 msgid ""
 "The selected project \"%s\" was generated by an older engine version, and "
@@ -13764,7 +15122,7 @@ msgstr ""
 "Aviso: você não poderá mais abrir o projeto com versões anteriores da engine."
 
 msgid "Convert project.godot"
-msgstr "Converter(project.godot)"
+msgstr "Converter project.godot"
 
 msgid ""
 "Can't open project \"%s\" at the following path:\n"
@@ -13798,7 +15156,7 @@ msgid ""
 "\n"
 msgstr ""
 "Aviso: Este projeto usa C#, mas esta compilação do Godot não possui\n"
-"o módulo mono. Se você continuar, não poderá usar nenhum script C#.\n"
+"o módulo Mono. Se você continuar, não poderá usar nenhum script em C#.\n"
 "\n"
 
 msgid ""
@@ -13806,8 +15164,8 @@ msgid ""
 "Godot %s.\n"
 "\n"
 msgstr ""
-"Aviso: Este projeto foi editado pela última vez em Godot %s. A abertura o "
-"mudará para Godot %s.\n"
+"Aviso: Este projeto foi editado pela última vez no Godot %s. Se abrir, será "
+"mudado para Godot %s.\n"
 "\n"
 
 msgid ""
@@ -13837,11 +15195,41 @@ msgid ""
 "The project folders' contents won't be modified."
 msgstr ""
 "Remover todos os projetos ausentes da lista?\n"
-"O conteúdo das pastas do projeto não será modificado."
+"O conteúdo das pastas dos projetos não será modificado."
+
+msgid ""
+"It looks like Godot crashed when opening this project the last time. If "
+"you're having problems editing this project, you can try to open it in "
+"Recovery Mode."
+msgstr ""
+"Parece que o Godot crashou ao abrir este projeto da última vez. Se você "
+"estiver tendo problemas ao editar este projeto, você pode tentar abrí-lo em "
+"Modo de Recuperação."
+
+msgid ""
+"Recovery Mode is a special mode that may help to recover projects that crash "
+"the engine during initialization. This mode temporarily disables the "
+"following features:"
+msgstr ""
+"O Modo de Recuperação é um modo especial que pode ajudar a recuperar um "
+"projeto que fecha a engine durante a inicialização. Esse modo desabilita "
+"temporariamente as seguintes funcionalidades:"
+
+msgid ""
+"This mode is intended only for basic editing to troubleshoot such issues, and "
+"therefore it will not be possible to run the project during this mode. It is "
+"also a good idea to make a backup of your project before proceeding."
+msgstr ""
+"Este modo é feito apenas para edições básicas para solucionar tais problemas, "
+"e por isso não será possível executar o projeto enquanto se está neste modo. "
+"Também é uma boa ideia fazer um backup do seu projeto antes de prosseguir."
+
+msgid "Edit the project in Recovery Mode?"
+msgstr "Editar o projeto em Modo de Recuperação?"
 
 msgid "Couldn't load project at '%s'. It may be missing or corrupted."
 msgstr ""
-"Não foi possível carregar o Projeto em '%s'. Ele pode estar ausente ou "
+"Não foi possível carregar o projeto em '%s'. Ele pode estar ausente ou "
 "corrompido."
 
 msgid "Couldn't save project at '%s' (error %d)."
@@ -13903,7 +15291,7 @@ msgid "Tags"
 msgstr "Tags"
 
 msgid "You don't have any projects yet."
-msgstr "Ainda não tem nenhum projeto."
+msgstr "Você não tem nenhum projeto ainda."
 
 msgid ""
 "Get started by creating a new one,\n"
@@ -13924,12 +15312,15 @@ msgid ""
 "Note: The Asset Library requires an online connection and involves sending "
 "data over the internet."
 msgstr ""
-"Nota: A Biblioteca de Recursos requer uma conexão on-line e envolve envio de "
+"Nota: A Biblioteca de Recursos requer uma conexão online e envolve envio de "
 "dados pela Internet."
 
 msgid "Edit Project"
 msgstr "Editar Projeto"
 
+msgid "Edit in recovery mode"
+msgstr "Editar em modo de recuperação"
+
 msgid "Rename Project"
 msgstr "Renomear Projeto"
 
@@ -13940,21 +15331,27 @@ msgid "Remove Project"
 msgstr "Remover Projeto"
 
 msgid "Remove Missing"
-msgstr "Remover Ausente"
+msgstr "Remover Ausentes"
 
 msgid ""
 "Asset Library not available (due to using Web editor, or because SSL support "
 "disabled)."
 msgstr ""
-"Biblioteca de Recursos não disponível (devido ao uso do editor da Web ou "
-"porque o suporte SSL está desativado)."
+"Biblioteca de Recursos indisponível (ou você está usando o editor Web, ou o "
+"suporte a SSL está desativado)."
 
 msgid "Select a Folder to Scan"
-msgstr "Selecione uma Pasta para Analisar"
+msgstr "Selecione uma Pasta para Escanear"
 
 msgid "Remove All"
 msgstr "Remover Tudo"
 
+msgid "Edit normally"
+msgstr "Editar normalmente"
+
+msgid "Edit in Recovery Mode"
+msgstr "Editar em Modo de Recuperação"
+
 msgid "Convert Full Project"
 msgstr "Converter Projeto Completo"
 
@@ -13972,15 +15369,16 @@ msgstr ""
 "Esta opção realizará a conversão completa do projeto, atualizando cenas, "
 "recursos e scripts do Godot 3 para funcionar no Godot 4.\n"
 "\n"
-"Observe que esta é uma conversão de melhor esforço, ou seja, facilita a "
-"atualização do projeto, mas não será aberta imediatamente e ainda exigirá "
+"Observe que esta é uma conversão de melhor esforço, ou seja, facilitará a "
+"atualização do projeto, mas pode ser que não abra imediatamente e pode exigir "
 "ajustes manuais.\n"
 "\n"
-"IMPORTANTE: Certifique-se de fazer backup do seu projeto antes de converter, "
-"pois esta operação impossibilita a abertura em versões mais antigas do Godot."
+"IMPORTANTE: Não esqueça de fazer backup do seu projeto antes de converter, "
+"pois esta operação fará com que seu projeto não abra mais em versões mais "
+"antigas do Godot."
 
 msgid "Manage Project Tags"
-msgstr "Gerenciar tags de projeto"
+msgstr "Gerenciar Tags de Projeto"
 
 msgid "Project Tags"
 msgstr "Tags de Projeto"
@@ -14001,14 +15399,14 @@ msgid "Tags are capitalized automatically when displayed."
 msgstr "As tags são capitalizadas automaticamente quando exibidas."
 
 msgid "It would be a good idea to name your project."
-msgstr "Seria uma boa ideia nomear o seu projeto."
+msgstr "Você provavelmente devia dar um nome ao seu projeto."
 
 msgid "Invalid \".zip\" project file; it is not in ZIP format."
-msgstr "Arquivo de Projeto \".zip\" inválido; isso não está no formato ZIP."
+msgstr "Arquivo de projeto \".zip\" inválido; ele não está no formato ZIP."
 
 msgid ""
 "Invalid \".zip\" project file; it doesn't contain a \"project.godot\" file."
-msgstr "Projeto '.zip' inválido; não contém um arquivo 'project.godot'."
+msgstr "Projeto \".zip\" inválido; ele não contém um arquivo \"project.godot\"."
 
 msgid "Valid project found at path."
 msgstr "Projeto válido encontrado neste caminho."
@@ -14016,8 +15414,8 @@ msgstr "Projeto válido encontrado neste caminho."
 msgid ""
 "Please choose a \"project.godot\", a directory with one, or a \".zip\" file."
 msgstr ""
-"Por favor, escolha um \"project.godot\", um diretório com um, ou um arquivo "
-"\".zip\"."
+"Por favor, escolha um \"project.godot\", um diretório contento um, ou um "
+"arquivo \".zip\"."
 
 msgid ""
 "The directory name specified contains invalid characters or trailing "
@@ -14030,7 +15428,7 @@ msgid ""
 "is not allowed, as it would prevent the project manager from starting."
 msgstr ""
 "Criar um projeto no diretório da engine ou diretório executável não é "
-"permitido, pois impediria o gerenciador do projeto de iniciar."
+"permitido, pois impediria o gerenciador de projeto de iniciar."
 
 msgid ""
 "You cannot save a project at the selected path. Please create a subfolder or "
@@ -14070,7 +15468,7 @@ msgid "Advanced 3D graphics available."
 msgstr "Gráficos 3D avançados disponíveis."
 
 msgid "Can scale to large complex scenes."
-msgstr "Pode escalar para cenas grandes e complexas."
+msgstr "Suporta cenas grandes e complexas."
 
 msgid "Uses RenderingDevice backend."
 msgstr "Suporta dispositivos de renderização atuais."
@@ -14093,6 +15491,9 @@ msgstr "Renderização rápida de cenas simples."
 msgid "Supports desktop, mobile + web platforms."
 msgstr "Suporta desktop, plataformas mobile + web."
 
+msgid "Least advanced 3D graphics."
+msgstr "Gráficos 3D menos avançados."
+
 msgid "Intended for low-end/older devices."
 msgstr "Destinado a dispositivos modestos/antigos."
 
@@ -14152,17 +15553,29 @@ msgstr "Caminho de Instalação do Projeto:"
 msgid "Renderer:"
 msgstr "Renderizador:"
 
+msgid ""
+"RenderingDevice-based methods not available on this GPU:\n"
+"%s\n"
+"Please use the Compatibility renderer."
+msgstr ""
+"Métodos baseados no RenderingDevice não estão disponíveis nesta GPU:\n"
+"%s\n"
+"Use o renderizador Compatibility."
+
 msgid "The renderer can be changed later, but scenes may need to be adjusted."
 msgstr ""
 "O renderizador pode ser alterado posteriormente, mas as cenas podem precisar "
 "de ajustes."
 
 msgid "Version Control Metadata:"
-msgstr "Controle de Versão:"
+msgstr "Metadados do Controle de Versão:"
 
 msgid "Git"
 msgstr "Git"
 
+msgid "Edit Now"
+msgstr "Editar Agora"
+
 msgid "This project was last edited in a different Godot version: "
 msgstr ""
 "Este projeto foi editado pela última vez em uma versão diferente do Godot: "
@@ -14173,27 +15586,39 @@ msgstr "Este projeto usa recursos não suportados pela compilação atual:"
 msgid "Error: Project is missing on the filesystem."
 msgstr "Erro: Projeto não encontrado no sistema de arquivos."
 
+msgid "Last edited timestamp"
+msgstr "Horário da Última Modificação"
+
+msgid "Scanning"
+msgstr "Escaneando"
+
+msgid "Scanning for projects..."
+msgstr "Escaneando por projetos…"
+
 msgid "Missing Project"
 msgstr "Projeto Ausente"
 
+msgid "Missing Date"
+msgstr "Data Ausente"
+
 msgid "Restart Now"
 msgstr "Reiniciar Agora"
 
 msgid "Quick Settings"
-msgstr "Configuração rápidas"
+msgstr "Configuração Rápidas"
 
 msgid "Interface Theme"
-msgstr "Tema da interface"
+msgstr "Tema da Interface"
 
 msgid "Custom preset can be further configured in the editor."
 msgstr ""
 "A predefinição personalizada pode ser configurada posteriormente no editor."
 
 msgid "Display Scale"
-msgstr "Escala de exibição"
+msgstr "Escala de Exibição"
 
 msgid "Network Mode"
-msgstr "Modo de rede"
+msgstr "Modo de Rede"
 
 msgid "Directory Naming Convention"
 msgstr "Convenção de Nomenclatura de Diretórios"
@@ -14203,7 +15628,7 @@ msgid ""
 "effect."
 msgstr ""
 "Configurações alteradas! O Gerenciador de Projetos deve ser reiniciado para "
-"as alterações terem efeito."
+"que as alterações tenham efeito."
 
 msgid "Add Project Setting"
 msgstr "Adicionar Configuração ao Projeto"
@@ -14218,7 +15643,7 @@ msgid "Add Input Action"
 msgstr "Adicionar Ação de Entrada"
 
 msgid "Change Action deadzone"
-msgstr "Alterar zona morta de Ação"
+msgstr "Alterar zona morta da Ação"
 
 msgid "Change Input Action Event(s)"
 msgstr "Alterar Evento(s) de Ação de Entrada"
@@ -14236,11 +15661,10 @@ msgid "Project Settings (project.godot)"
 msgstr "Configurações do Projeto (project.godot)"
 
 msgid "Select a Setting or Type its Name"
-msgstr "Selecione uma Configuração ou Digite seu Nome"
+msgstr "Selecione uma Configuração ou Digite o Nome"
 
 msgid "Changed settings will be applied to the editor after restarting."
-msgstr ""
-"As configurações alteradas serão aplicadas ao editor após a reinicialização."
+msgstr "As configurações alteradas serão aplicadas ao editor após reiniciar."
 
 msgid "Input Map"
 msgstr "Mapa de Entrada"
@@ -14270,7 +15694,7 @@ msgid "Select Virtual Method"
 msgstr "Selecionar Método Virtual"
 
 msgid "Batch Rename"
-msgstr "Renomear em Lote"
+msgstr "Renomear Vários"
 
 msgid "Prefix:"
 msgstr "Prefixo:"
@@ -14279,7 +15703,7 @@ msgid "Suffix:"
 msgstr "Sufixo:"
 
 msgid "Use Regular Expressions"
-msgstr "Utilize Expressões Regulares"
+msgstr "Utilizar Expressões Regulares"
 
 msgid "Substitute"
 msgstr "Substituto"
@@ -14288,7 +15712,7 @@ msgid "Node name."
 msgstr "Nome do nó."
 
 msgid "Node's parent name, if available."
-msgstr "Nome pai do nó, se disponível."
+msgstr "Nome do pai do nó, se disponível."
 
 msgid "Node type."
 msgstr "Tipo de nó."
@@ -14303,8 +15727,8 @@ msgid ""
 "Sequential integer counter.\n"
 "Compare counter options."
 msgstr ""
-"Contador inteiro sequencial.\n"
-"Compare opções do contador."
+"Contador de inteiros sequencial.\n"
+"Comparar opções do contador."
 
 msgid "Per-level Counter"
 msgstr "Contador por nível"
@@ -14316,7 +15740,7 @@ msgid "Initial value for the counter."
 msgstr "Valor inicial do contador."
 
 msgid "Step"
-msgstr "Passo"
+msgstr "Incremento"
 
 msgid "Amount by which counter is incremented for each node."
 msgstr "Quantidade pela qual o contador é incrementado para cada nó."
@@ -14344,13 +15768,13 @@ msgid "snake_case to PascalCase"
 msgstr "snake_case para PascalCase"
 
 msgid "Case"
-msgstr "Caso"
+msgstr "Capitalização"
 
 msgid "To Lowercase"
-msgstr "Para Minúsculas"
+msgstr "Tornar Minúsculo"
 
 msgid "To Uppercase"
-msgstr "Para Maiúsculas"
+msgstr "Tornar Maiúsculo"
 
 msgid "Reset"
 msgstr "Redefinir"
@@ -14359,10 +15783,10 @@ msgid "Regular Expression Error:"
 msgstr "Erro de Expressão Regular:"
 
 msgid "At character %s"
-msgstr "Para caractere %s"
+msgstr "No caractere %s"
 
 msgid "Reparent Node"
-msgstr "Reassociar Nó"
+msgstr "Trocar Pai do Nó"
 
 msgid "Select new parent:"
 msgstr "Selecione o novo pai:"
@@ -14371,19 +15795,19 @@ msgid "Keep Global Transform"
 msgstr "Manter Transformação Global"
 
 msgid "Reparent"
-msgstr "Reassociar"
+msgstr "Trocar Pai"
 
 msgid "Run Instances"
-msgstr "Executar instâncias"
+msgstr "Executar Instâncias"
 
 msgid "Enable Multiple Instances"
-msgstr "Habilitar múltiplas instâncias"
+msgstr "Habilitar Múltiplas Instâncias"
 
 msgid "Main Run Args:"
-msgstr "Argumentos de execução principal:"
+msgstr "Argumentos de Execução Principais:"
 
 msgid "Main Feature Tags:"
-msgstr "Tags de funcionalidade principais:"
+msgstr "Tags de Característica Principais:"
 
 msgid "Space-separated arguments, example: host player1 blue"
 msgstr "Argumentos separados por espaço, exemplo: host player1 blue"
@@ -14392,25 +15816,22 @@ msgid "Comma-separated tags, example: demo, steam, event"
 msgstr "Tags separadas por vírgula, exemplo: demo, steam, event"
 
 msgid "Instance Configuration"
-msgstr "Configuração da instância"
+msgstr "Configuração da Instância"
 
 msgid "Override Main Run Args"
-msgstr "Substituir argumentos de execução principal"
+msgstr "Substituir Argumentos de Execução Principais"
 
 msgid "Launch Arguments"
-msgstr "Argumentos de início"
+msgstr "Argumentos de Execução"
 
 msgid "Override Main Tags"
-msgstr "Substituir tags principais"
+msgstr "Substituir Tags Principais"
 
 msgid "Feature Tags"
-msgstr "Tags de funcionalidade"
+msgstr "Tags de Característica"
 
 msgid "Pick Root Node Type"
-msgstr "Escolha o Tipo de Nó Raiz"
-
-msgid "Pick"
-msgstr "Escolher"
+msgstr "Escolha o Tipo do Nó Raiz"
 
 msgid "Scene name is empty."
 msgstr "O nome da cena está vazio."
@@ -14453,7 +15874,7 @@ msgid ""
 "\"editor/naming/node_name_casing\" project setting."
 msgstr ""
 "Quando vazio, o nome do nó raiz é derivado do nome da cena com base na "
-"configuração do projeto 'editor/naming/node_name_casing'."
+"configuração do projeto \"editor/naming/node_name_casing\"."
 
 msgid "Scene name is valid."
 msgstr "O nome da cena é válido."
@@ -14471,7 +15892,7 @@ msgid "No parent to instantiate the scenes at."
 msgstr "Nenhum pai para instanciar as cenas."
 
 msgid "Error loading scene from %s"
-msgstr "Erro ao carregar a cena de %s"
+msgstr "Erro ao carregar cena de %s"
 
 msgid "Error instantiating scene from %s"
 msgstr "Erro ao instanciar cena de %s"
@@ -14506,18 +15927,18 @@ msgid "This operation can't be done on the tree root."
 msgstr "Esta operação não pode ser feita na raiz da árvore."
 
 msgid "Move Node in Parent"
-msgstr "Mover nó no pai"
+msgstr "Mover Nó no Pai"
 
 msgid "Move Nodes in Parent"
-msgstr "Mover nós no pai"
+msgstr "Mover Nós no Pai"
 
 msgid "Duplicate Node(s)"
 msgstr "Duplicar Nó(s)"
 
 msgid "Can't reparent nodes in inherited scenes, order of nodes can't change."
 msgstr ""
-"Não é possível reassociar nós em cenas herdadas, a ordem dos nós não pode ser "
-"alterada."
+"Não é possível trocar o pai de nós em cenas herdadas, a ordem dos nós não "
+"pode ser alterada."
 
 msgid "Node must belong to the edited scene to become root."
 msgstr "O nó deve pertencer à cena editada para se tornar raiz."
@@ -14573,9 +15994,9 @@ msgid ""
 "To create a variation of a scene, you can make an inherited scene based on "
 "the instantiated scene using Scene > New Inherited Scene... instead."
 msgstr ""
-"Não é possível salvar a ramificação de uma cena já instanciada.\n"
+"Não é possível salvar o ramo de uma cena já instanciada.\n"
 "Para criar uma variação de uma cena, você pode criar uma cena herdada com "
-"base na cena instanciada usando Cena > Nova Cena Herdada... em vez disso."
+"base na cena instanciada usando Cena > Nova Cena Herdada."
 
 msgid ""
 "Can't save a branch which is a child of an already instantiated scene.\n"
@@ -14583,19 +16004,17 @@ msgid ""
 "on this branch, and select \"Save Branch as Scene\"."
 msgstr ""
 "Não é possível salvar um ramo que é filho de uma cena já instanciada.\n"
-"Para salvar esta ramificação em sua própria cena, abra a cena original, "
-"clique com o botão direito nesta ramificação e selecione \"Salvar Ramo como "
-"Cena\"."
+"Para salvar este ramo como sua própria cena, abra a cena original, clique com "
+"o botão direito neste ramo e selecione \"Salvar Ramo como Cena\"."
 
 msgid ""
 "Can't save a branch which is part of an inherited scene.\n"
 "To save this branch into its own scene, open the original scene, right click "
 "on this branch, and select \"Save Branch as Scene\"."
 msgstr ""
-"Não é possível salvar uma ramificação que faz parte de uma cena herdada.\n"
-"Para salvar esta ramificação em sua própria cena, abra a cena original, "
-"clique com o botão direito nesta ramificação e selecione \"Salvar Ramo como "
-"Cena\"."
+"Não é possível salvar um ramo que faz parte de uma cena herdada.\n"
+"Para salvar este ramo como sua própria cena, abra a cena original, clique com "
+"o botão direito neste ramo e selecione \"Salvar Ramo como Cena\"."
 
 msgid "Save New Scene As..."
 msgstr "Salvar Nova Cena Como..."
@@ -14611,8 +16030,8 @@ msgid ""
 "Enabling \"Load as Placeholder\" will disable \"Editable Children\" and cause "
 "all properties of the node to be reverted to their default."
 msgstr ""
-"Habilitar \"Substituto\" desativará \"Filhos editáveis\" e fará com que todas "
-"as propriedades do nó sejam revertidas ao padrão."
+"Habilitar \"Carregar como Substituto\" desativará \"Filhos Editáveis\" e fará "
+"com que todas as propriedades do nó sejam revertidas ao padrão."
 
 msgid "Make Local"
 msgstr "Tornar Local"
@@ -14624,7 +16043,7 @@ msgid "Unique names already used by another node in the scene:"
 msgstr "Nomes únicos já estão sendo usados por outro nó na cena:"
 
 msgid "Disable Scene Unique Name(s)"
-msgstr "Desabilitar Nome(s) Único(s) de Cena"
+msgstr "Desabilitar Nome(s) Único(s) na Cena"
 
 msgid "New Scene Root"
 msgstr "Nova Cena Raiz"
@@ -14648,7 +16067,7 @@ msgid "Can't operate on nodes from a foreign scene!"
 msgstr "Não é possível operar em nós de uma cena externa!"
 
 msgid "Can't operate on nodes the current scene inherits from!"
-msgstr "Incapaz de operar em nós herdados pela cena atual!"
+msgstr "Não é possível operar em nós herdados pela cena atual!"
 
 msgid "This operation can't be done on instantiated scenes."
 msgstr "Esta operação não pode ser feita em cenas instanciadas."
@@ -14660,7 +16079,10 @@ msgid "Set Shader"
 msgstr "Definir Shader"
 
 msgid "Toggle Editable Children"
-msgstr "Alternar filhos editáveis"
+msgstr "Alternar Filhos Editáveis"
+
+msgid "Cut Node(s)"
+msgstr "Recortar Nó(s)"
 
 msgid "Remove Node(s)"
 msgstr "Remover Nó(s)"
@@ -14669,11 +16091,20 @@ msgid "Change type of node(s)"
 msgstr "Alterar tipo do(s) nó(s)"
 
 msgid "Reparent to New Node"
-msgstr "Reparentar para Novo Nó"
+msgstr "Trocar Pai para Novo Nó"
 
 msgid "This operation requires a single selected node."
 msgstr "Essa operação requer um único nó selecionado."
 
+msgid "Reset Position"
+msgstr "Redefinir Posição"
+
+msgid "Reset Scale"
+msgstr "Redefinir Escala"
+
+msgid "Reset Rotation"
+msgstr "Redefinir Rotação"
+
 msgid ""
 "Couldn't save new scene. Likely dependencies (instances) couldn't be "
 "satisfied."
@@ -14685,19 +16116,25 @@ msgid "Error saving scene."
 msgstr "Erro ao salvar cena."
 
 msgid "Error duplicating scene to save it."
-msgstr "Erro duplicando cena ao salvar."
+msgstr "Erro ao duplicar cena ao salvar."
 
 msgid "Instantiate Script"
 msgstr "Instanciar Script"
 
+msgid "<unknown>"
+msgstr "<desconhecido>"
+
 msgid "Sub-Resources"
 msgstr "Sub-Recursos"
 
+msgid "Revoke Unique Name"
+msgstr "Revogar Nome Único"
+
 msgid "Access as Unique Name"
-msgstr "Acesso como Nome Único"
+msgstr "Acessar com Nome Único"
 
 msgid "Clear Inheritance"
-msgstr "Limpar Herança"
+msgstr "Apagar Herança"
 
 msgid "Editable Children"
 msgstr "Filhos Editáveis"
@@ -14708,15 +16145,21 @@ msgstr "Carregar como Substituto"
 msgid "Auto Expand to Selected"
 msgstr "Auto Expandir Selecionados"
 
+msgid "Center Node on Reparent"
+msgstr "Centralizar Nó ao Trocar Pai"
+
 msgid ""
 "If enabled, Reparent to New Node will create the new node in the center of "
 "the selected nodes, if possible."
 msgstr ""
-"Se ativo, Reassociar o novo nó irá criar um novo nó no centro dos nó "
+"Ao ativar, Trocar Pai para Novo Nó criará um novo nó no centro dos nós "
 "selecionados, se possível."
 
+msgid "Hide Filtered Out Parents"
+msgstr "Esconder Pais Filtrados"
+
 msgid "All Scene Sub-Resources"
-msgstr "Todos os sub-recursos de cena"
+msgstr "Todos os Sub-Recursos da Cena"
 
 msgid ""
 "Filter nodes by entering a part of their name, type (if prefixed with \"type:"
@@ -14742,8 +16185,8 @@ msgid ""
 "Selects all Nodes belonging to the given group.\n"
 "If empty, selects any Node belonging to any group."
 msgstr ""
-"Seleciona todos os Nós pertencentes ao grupo determinado.\n"
-"Se vazio, seleciona qualquer nó pertencente a qualquer grupo."
+"Seleciona todos os Nós pertencentes ao grupo fornecido.\n"
+"Se estiver vazio, seleciona qualquer Nó pertencente a qualquer grupo."
 
 msgid ""
 "Cannot attach a script: there are no languages registered.\n"
@@ -14761,10 +16204,10 @@ msgid "Paste Node(s) as Sibling of %s"
 msgstr "Colar Nó(s) como Irmão(s) de %s"
 
 msgid "Paste Node(s) as Child of %s"
-msgstr "Colar Nó(s) como filho(a) de %s"
+msgstr "Colar Nó(s) como Filho(s) de %s"
 
 msgid "Paste Node(s) as Root"
-msgstr "Colar Nó(s) como Root"
+msgstr "Colar Nó(s) como Raiz"
 
 msgid "<Unnamed> at %s"
 msgstr "<Sem nome> em %s"
@@ -14773,7 +16216,7 @@ msgid "(used %d times)"
 msgstr "(usado %d vezes)"
 
 msgid "Batch Rename..."
-msgstr "Renomear em Lote..."
+msgstr "Renomear Vários..."
 
 msgid "Add Child Node..."
 msgstr "Adicionar Nó Filho..."
@@ -14791,19 +16234,19 @@ msgid "Attach Script..."
 msgstr "Adicionar Script..."
 
 msgid "Reparent..."
-msgstr "Reparentar..."
+msgstr "Trocar pai..."
 
 msgid "Reparent to New Node..."
-msgstr "Reparentar para Novo Nó..."
+msgstr "Trocar Pai para Novo Nó..."
 
 msgid "Make Scene Root"
-msgstr "Tornar Cena Raiz"
+msgstr "Tornar Raiz da Cena"
 
 msgid "Save Branch as Scene..."
 msgstr "Salvar Ramo como Cena..."
 
 msgid "Toggle Access as Unique Name"
-msgstr "Alternar Acesso como Nome Único"
+msgstr "Alternar Acesso com Nome Único"
 
 msgid "Delete (No Confirm)"
 msgstr "Excluir (Sem Confirmação)"
@@ -14815,41 +16258,44 @@ msgid ""
 "Instantiate a scene file as a Node. Creates an inherited scene if no root "
 "node exists."
 msgstr ""
-"Instancia um arquivo de cena como Nó. Cria uma cena herdada se não existir "
+"Instanciar um arquivo de cena como Nó. Cria uma cena herdada se não existir "
 "nenhum nó raiz."
 
 msgid "Filter: name, t:type, g:group"
 msgstr "Filtro: nome, t:tipo, g:grupo"
 
 msgid "Attach a new or existing script to the selected node."
-msgstr "Adicionar um novo script, ou um já existente, para o nó selecionado."
+msgstr "Associar um novo script, ou um já existente, ao nó selecionado."
 
 msgid "Detach the script from the selected node."
-msgstr "Remove o script do nó selecionado."
+msgstr "Remover o script do nó selecionado."
+
+msgid "Extend the script of the selected node."
+msgstr "Estender o script do nó selecionado."
 
 msgid "Extra scene options."
 msgstr "Opções extras de cena."
 
 msgid "Remote"
-msgstr "Remoto"
+msgstr "Remota"
 
 msgid ""
 "If selected, the Remote scene tree dock will cause the project to stutter "
 "every time it updates.\n"
 "Switch back to the Local scene tree dock to improve performance."
 msgstr ""
-"Se selecionado, o painel da árvore de cena Remota vai fazer o projeto travar "
-"toda vez que atualizar.\n"
-"Volte para o painel da árvore de cena Local para melhorar o desempenho."
+"Ao selecionar, a aba da árvore de cena Remota vai fazer o projeto travar toda "
+"vez que atualizar.\n"
+"Volte para a aba da árvore de cena Local para melhorar o desempenho."
 
 msgid "Local"
 msgstr "Local"
 
 msgid "Delete Related Animation Tracks"
-msgstr "Excluir faixas de animação relacionadas"
+msgstr "Excluir Faixas de Animação Relacionadas"
 
 msgid "Clear Inheritance? (No Undo!)"
-msgstr "Limpar Herança? (Irreversível!)"
+msgstr "Apagar Herança? (Irreversível!)"
 
 msgid "Path is empty."
 msgstr "Caminho vazio."
@@ -14897,19 +16343,19 @@ msgid "Open Script"
 msgstr "Abrir script"
 
 msgid "Inherit %s"
-msgstr "Herda %s"
+msgstr "Herdar %s"
 
 msgid "Inherit"
-msgstr "Herda"
+msgstr "Herdar"
 
 msgid "Invalid path."
 msgstr "Caminho inválido."
 
 msgid "Invalid inherited parent name or path."
-msgstr "Nome ou caminho pai herdado inválido."
+msgstr "Nome ou caminho de pai herdado inválido."
 
 msgid "File exists, it will be reused."
-msgstr "O arquivo já existe, será reaproveitado."
+msgstr "O arquivo já existe, será reutilizado."
 
 msgid ""
 "Note: Built-in scripts have some limitations and can't be edited using an "
@@ -14957,7 +16403,7 @@ msgstr "Adicionar Script ao Nó"
 
 msgid "Error - Could not create shader include in filesystem."
 msgstr ""
-"Erro - Não foi possível criar a inclusão do shader no sistema de arquivos."
+"Erro - Não foi possível criar o include de shader no sistema de arquivos."
 
 msgid "Error - Could not create shader in filesystem."
 msgstr "Erro - Não foi possível criar o shader no sistema de arquivos."
@@ -14966,16 +16412,16 @@ msgid "Error loading shader from %s"
 msgstr "Erro ao carregar shader em %s"
 
 msgid "N/A"
-msgstr "N/D"
+msgstr "N/A"
 
 msgid "Open Shader / Choose Location"
-msgstr "Abrir Shader/ Escolher Local"
+msgstr "Abrir Shader / Escolher Local"
 
 msgid "Invalid base path."
 msgstr "Caminho base inválido."
 
 msgid "Wrong extension chosen."
-msgstr "Extensão errada escolhida."
+msgstr "Extensão incorreta escolhida."
 
 msgid "Note: Built-in shaders can't be edited using an external editor."
 msgstr ""
@@ -15006,7 +16452,7 @@ msgid "Create Shader"
 msgstr "Criar Shader"
 
 msgid "Set Shader Global Variable"
-msgstr "Definir Variável Global Shader"
+msgstr "Definir Variável de Shader Global"
 
 msgid "Name must be a valid identifier."
 msgstr "O nome deve ser um identificador válido."
@@ -15018,7 +16464,7 @@ msgid "Name '%s' is a reserved shader language keyword."
 msgstr "O nome '%s' é uma palavra-chave reservada da linguagem de shader."
 
 msgid "Add Shader Global Parameter"
-msgstr "Adicionar Parâmetro Global Shader"
+msgstr "Adicionar Parâmetro de Shader Global"
 
 msgid ""
 "This project uses meshes with an outdated mesh format from previous Godot "
@@ -15029,25 +16475,24 @@ msgid ""
 msgstr ""
 "Este projeto utiliza malhas com um formato obsoleto de versões anteriores do "
 "Godot. A engine precisa atualizar o formato para utilizar essas malhas. Por "
-"favor, use a ferramenta 'Atualizar Superfícies de Malhas' do menu de 'Projeto "
-"> Ferramentas'. Você pode ignorar esta mensagem e continuar utilizando as "
+"favor, use a ferramenta 'Atualizar Superfícies de Malhas' do menu 'Projeto > "
+"Ferramentas'. Você pode ignorar esta mensagem e continuar utilizando as "
 "malhas desatualizadas, mas tenha em mente que isso pode levar a um "
 "carregamento mais lento do projeto sempre que o carregar."
 
 msgid ""
 "This project uses meshes with an outdated mesh format. Check the output log."
 msgstr ""
-"Este projeto utiliza malhas com um formato de malha obsoleto. Confira o "
-"registro de saída."
+"Este projeto utiliza malhas com um formato obsoleto. Confira o log de saída."
 
 msgid "Upgrading All Meshes in Project"
-msgstr "Atualizando Todos as malhas do projeto"
+msgstr "Atualizando Todas as Malhas do Projeto"
 
 msgid "Attempting to re-save "
-msgstr "Tentando salvar novamente. "
+msgstr "Tentando salvar novamente "
 
 msgid "Attempting to remove "
-msgstr "Tentando remover. "
+msgstr "Tentando remover "
 
 msgid ""
 "The mesh format has changed in Godot 4.2, which affects both imported meshes "
@@ -15063,14 +16508,15 @@ msgid ""
 "mesh in memory, but the update will not be saved. Choosing this option will "
 "lead to slower load times every time this project is loaded."
 msgstr ""
-"O formato de malha mudou na versão 4.2 do Godot, que afeta tanto malhas "
+"O formato de malha mudou na versão 4.2 do Godot, o que afeta tanto malhas "
 "importadas quanto malhas criadas dentro do Godot. A engine precisa atualizar "
 "o formato para utilizar essas malhas.\n"
 "\n"
 "Se o seu projeto precede o Godot 4.2 e contém malhas, nós recomendamos que "
-"você execute essa ferramenta de conversão única. Essa atualização reiniciará "
-"o editor e poderá levar vários minutos. Atualizar as malhas fará com que elas "
-"sejam incompatíveis com versões anteriores do Godot.\n"
+"você execute essa ferramenta de conversão - ela só precisa ser usada uma vez. "
+"Essa atualização reiniciará o editor e poderá levar vários minutos. Atualizar "
+"as malhas fará com que elas sejam incompatíveis com versões anteriores do "
+"Godot.\n"
 "\n"
 "Você ainda pode usar as malhas como estão. A engine irá atualizar cada malha "
 "na memória, porém essa atualização não será salva. Escolher essa opção levará "
@@ -15079,18 +16525,85 @@ msgstr ""
 msgid "Restart & Upgrade"
 msgstr "Reiniciar & Atualizar"
 
+msgid "Updating Script UIDs"
+msgstr "Atualizando UIDs dos Scripts"
+
+msgid "Learn More"
+msgstr "Saiba Mais"
+
 msgid "Make this panel floating in the screen %d."
-msgstr "Faça este painel flutuar na tela %d."
+msgstr "Abrir este painel em uma nova janela na tela %d."
 
 msgid ""
 "Make this panel floating.\n"
 "Right-click to open the screen selector."
 msgstr ""
-"Torne este painel flutuante.\n"
+"Abrir este painel em uma nova janela.\n"
 "Clique com o botão direito para abrir o seletor de tela."
 
 msgid "Select Screen"
-msgstr "Selecionar tela"
+msgstr "Selecionar Tela"
+
+msgid ""
+"The CSGShape3D has an empty shape.\n"
+"CSGShape3D empty shapes typically occur because the mesh is not manifold.\n"
+"A manifold mesh forms a solid object without gaps, holes, or loose edges.\n"
+"Each edge must be a member of exactly two faces."
+msgstr ""
+"Este CSGShape3D tem uma forma vazia.\n"
+"Formas vazias no CSGShape3D costumam acontecer porque a malha é não-"
+"múltipla.\n"
+"Uma malha múltipla forma um objeto sólido sem vãos, buracos, ou pontas "
+"soltas.\n"
+"Cada aresta deve ser membro de exatamente duas faces."
+
+msgid "CSG operation returned an empty array."
+msgstr "Operação CSG retornou uma array vazia."
+
+msgid ""
+"Can not add a baked mesh as sibling for the scene root.\n"
+"Move the CSG root node below a parent node."
+msgstr ""
+"Não é possível adicionar uma malha pré-calculada como irmã da raiz da cena.\n"
+"Mova o nó raiz do CSG para dentro de um nó pai."
+
+msgid "CSG operation returned an empty mesh."
+msgstr "Operação CSG retornou uma malha vazia."
+
+msgid "Create baked CSGShape3D Mesh Instance"
+msgstr "Gerar Instância de Malha do CSGShape3D"
+
+msgid ""
+"Can not add a baked collision shape as sibling for the scene root.\n"
+"Move the CSG root node below a parent node."
+msgstr ""
+"Não é possível adicionar uma forma de colisão pré-calculada como irmã da raiz "
+"da cena.\n"
+"Mova o nó raiz do CSG para dentro de um nó pai."
+
+msgid "CSG operation returned an empty shape."
+msgstr "Operação CSG retornou uma forma vazia."
+
+msgid "Create baked CSGShape3D Collision Shape"
+msgstr "Gerar Forma de Colisão do CSGShape3D"
+
+msgid "CSG"
+msgstr "CSG"
+
+msgid "Bake Mesh Instance"
+msgstr "Gerar Instância de Malha"
+
+msgid "Bake Collision Shape"
+msgstr "Gerar Forma de Colisão"
+
+msgid "Change CSG Box Size"
+msgstr "Alterar Dimensões da Caixa CSG"
+
+msgid "Change CSG Cylinder Radius"
+msgstr "Alterar Raio do Cilindro CSG"
+
+msgid "Change CSG Cylinder Height"
+msgstr "Alterar Altura do Cilindro CSG"
 
 msgid "Change Torus Inner Radius"
 msgstr "Alterar Raio Interno do Toro"
@@ -15101,8 +16614,35 @@ msgstr "Alterar Raio Externo do Toro"
 msgid "Invalid type argument to convert(), use TYPE_* constants."
 msgstr "Argumento de tipo inválido para convert(), use as constantes TYPE_*."
 
+msgid "Cannot resize array."
+msgstr "Não foi possível redimensionar a array."
+
 msgid "Step argument is zero!"
-msgstr "O argumento de incrementos é zero!"
+msgstr "O argumento de incremento é zero!"
+
+msgid "Not a script with an instance."
+msgstr "Não é um script com instância."
+
+msgid "Not based on a script."
+msgstr "Não é baseado em um script."
+
+msgid "Not based on a resource file."
+msgstr "Não baseado em um arquivo de recurso."
+
+msgid "Invalid instance dictionary format (missing @path)."
+msgstr "Formato inválido de dicionário de instâncias (@path está faltando)."
+
+msgid "Invalid instance dictionary format (can't load script at @path)."
+msgstr ""
+"Formato inválido de dicionário de instâncias (erro ao carregar script em "
+"@path)."
+
+msgid "Invalid instance dictionary format (invalid script at @path)."
+msgstr ""
+"Formato inválido de dicionário de instâncias (script inválido em @path)."
+
+msgid "Invalid instance dictionary (invalid subclasses)."
+msgstr "Dicionário de instâncias inválido (subclasses inválidas)."
 
 msgid "Cannot instantiate GDScript class."
 msgstr "Não é possível instanciar a classe GDScript."
@@ -15118,26 +16658,51 @@ msgstr ""
 "tipos integrados."
 
 msgid "Type argument is a previously freed instance."
-msgstr "O argumento Type é uma instância que já foi liberada."
+msgstr "O argumento de tipo é uma instância que já foi liberada."
+
+msgid ""
+"Invalid type argument for is_instance_of(), should be a TYPE_* constant, a "
+"class or a script."
+msgstr ""
+"Argumento de tipo inválido para is_instance_of(), deve ser uma constante "
+"TYPE_*, uma classe ou um script."
+
+msgid "Value argument is a previously freed instance."
+msgstr "Argumento de valor é uma instância já liberada."
 
 msgid "Export Scene to glTF 2.0 File"
 msgstr "Exportar Cena para Arquivo glTF 2.0"
 
 msgid "Export Settings:"
-msgstr "Exportar Configurações:"
+msgstr "Configurações de Exportação:"
 
 msgid "glTF 2.0 Scene..."
 msgstr "Cena glTF 2.0..."
 
 msgid "Path does not point to a valid executable."
-msgstr "O Caminho não aponta à um executável válido."
+msgstr "O caminho não aponta a um executável válido."
+
+msgid "Couldn't run Blender executable."
+msgstr "Não foi possível iniciar o Blender."
+
+msgid "Unexpected --version output from Blender executable at: %s."
+msgstr "Saída de --version inesperada do Blender em: %s."
+
+msgid "Couldn't extract version information from Blender executable at: %s."
+msgstr "Não foi possível extrair informação da versão do Blender em: %s."
 
 msgid ""
 "Found Blender version %d.x, which is too old for this importer (3.0+ is "
 "required)."
 msgstr ""
-"Versão do Blender %d.x encontrada, que é muito antiga para este importador (é "
-"necessário a versão 3.0+)."
+"Encontrou versão do Blender %d.x, que é antiga demais para este importador "
+"(necessária versão 3.0+)."
+
+msgid "Path to Blender executable is valid (Autodetected)."
+msgstr "O caminho da instalação do Blender é válido (Autodetectado)."
+
+msgid "Path to Blender executable is valid."
+msgstr "O caminho da instalação do Blender é válido."
 
 msgid "Configure Blender Importer"
 msgstr "Configurar Importador do Blender"
@@ -15157,35 +16722,40 @@ msgstr ""
 "app` do Blender."
 
 msgid "Disable '.blend' Import"
-msgstr "Desativar Importação '.blend'"
+msgstr "Desativar Importação de '.blend'"
 
 msgid ""
 "Disables Blender '.blend' files import for this project. Can be re-enabled in "
 "Project Settings."
 msgstr ""
 "Desativa a importação de arquivos '.blend' do Blender para este projeto. Pode "
-"ser reativado nas configurações do projeto."
+"ser reativado nas Configurações do Projeto."
+
+msgid "Disabling '.blend' file import requires restarting the editor."
+msgstr ""
+"Desativar a importação de arquivos '.blend' requer a reinicialização do "
+"editor."
 
 msgid "GridMap Delete Selection"
-msgstr "Excluir Seleção do Mapa de Grade"
+msgstr "Excluir Seleção do GridMap"
 
 msgid "GridMap Fill Selection"
-msgstr "Seleção de Preenchimento do Mapa de Grade"
+msgstr "Preencher Seleção do GridMap"
 
 msgid "GridMap Paste Selection"
-msgstr "Colar Seleção do Mapa de Grade"
+msgstr "Colar Seleção do GridMap"
 
 msgid "GridMap Paint"
-msgstr "Pintar Mapa de Grade"
+msgstr "Pintar GridMap"
 
 msgid "GridMap Selection"
-msgstr "Seleção do Mapa de Grade"
+msgstr "Seleção do GridMap"
 
 msgid "Previous Floor"
-msgstr "Chão Anterior"
+msgstr "Andar Anterior"
 
 msgid "Next Floor"
-msgstr "Próximo Chão"
+msgstr "Próximo Andar"
 
 msgid "Edit X Axis"
 msgstr "Editar Eixo X"
@@ -15196,8 +16766,14 @@ msgstr "Editar Eixo Y"
 msgid "Edit Z Axis"
 msgstr "Editar Eixo Z"
 
+msgid "Keep Selection"
+msgstr "Manter Seleção"
+
+msgid "Clear Rotation"
+msgstr "Zerar Rotação"
+
 msgid "GridMap Settings"
-msgstr "Configurações do Mapa de Grade"
+msgstr "Configurações do GridMap"
 
 msgid "Pick Distance:"
 msgstr "Escolha uma Distância:"
@@ -15205,6 +16781,9 @@ msgstr "Escolha uma Distância:"
 msgid "Selection"
 msgstr "Seleção"
 
+msgid "Erase"
+msgstr "Apagar"
+
 msgid "Cursor Rotate X"
 msgstr "Rotacionar Cursor em X"
 
@@ -15214,12 +16793,38 @@ msgstr "Rotacionar Cursor em Y"
 msgid "Cursor Rotate Z"
 msgstr "Rotacionar Cursor em Z"
 
+msgid ""
+"Change Grid Floor:\n"
+"Previous Plane (%s)\n"
+"Next Plane (%s)"
+msgstr ""
+"Alterar Andar da Grade:\n"
+"Plano Anterior (%s)\n"
+"Próximo Plano (%s)"
+
 msgid "Filter Meshes"
 msgstr "Filtrar Malhas"
 
 msgid "Give a MeshLibrary resource to this GridMap to use its meshes."
-msgstr ""
-"Atribua um recurso MeshLibrary a este Mapa de Grade para usar suas malhas."
+msgstr "Atribua um recurso MeshLibrary a este GridMap para usar suas malhas."
+
+msgid "GridMap"
+msgstr "GridMap"
+
+msgid "Toggle GridMap Bottom Panel"
+msgstr "Alternar Painel Inferior de GridMap"
+
+msgid "All Clips"
+msgstr "Todos os Clipes"
+
+msgid "Add Clip"
+msgstr "Adicionar Clipe"
+
+msgid "Add Stream"
+msgstr "Adicionar Transmissão"
+
+msgid "Disabled"
+msgstr "Desativado"
 
 msgid "Fade-In"
 msgstr "Fade-In"
@@ -15230,9 +16835,30 @@ msgstr "Fade-Out"
 msgid "Cross-Fade"
 msgstr "Cross-Fade"
 
+msgid "Automatic"
+msgstr "Automático"
+
 msgid "Edit Transitions"
 msgstr "Editar Transições"
 
+msgid "Using Any Clip -> %s."
+msgstr "Usando Qualquer Clipe -> %s."
+
+msgid "Using %s -> Any Clip."
+msgstr "Usando %s -> Qualquer Clipe."
+
+msgid "Using All Clips -> Any Clip."
+msgstr "Usando Todos os Clipes -> Qualquer Clipe."
+
+msgid "No transition available."
+msgstr "Sem transição disponível."
+
+msgid "Next Beat"
+msgstr "Próxima Batida"
+
+msgid "Next Bar"
+msgstr "Próxima Barra"
+
 msgid "Clip End"
 msgstr "Fim do Clipe"
 
@@ -15240,6 +16866,10 @@ msgctxt "Transition Time Position"
 msgid "Same"
 msgstr "Igual"
 
+msgctxt "Transition Time Position"
+msgid "Start"
+msgstr "Inicio"
+
 msgctxt "Transition Time Position"
 msgid "Prev"
 msgstr "Anterior"
@@ -15250,6 +16880,9 @@ msgstr "De / Para"
 msgid "Any Clip"
 msgstr "Qualquer Clipe"
 
+msgid "AudioStreamInteractive Transition Editor"
+msgstr "Editor de Transição do AudioStreamInteractive"
+
 msgid "Use Transition:"
 msgstr "Usar Transição:"
 
@@ -15259,20 +16892,32 @@ msgstr "Transicionar De:"
 msgid "Transition To:"
 msgstr "Transicionar Para:"
 
+msgid "Same Position"
+msgstr "Posição Igual"
+
+msgid "Clip Start"
+msgstr "Início do Clipe"
+
 msgid "Prev Position"
 msgstr "Posição Anterior"
 
 msgid "Fade Mode:"
 msgstr "Modo de Fade:"
 
+msgid "Fade Beats:"
+msgstr "Duração do Fade em Batidas:"
+
+msgid "Filler Clip:"
+msgstr "Clipe de Preenchimento:"
+
 msgid "Hold Previous:"
-msgstr "Localizar Anterior:"
+msgstr "Lembrar Anterior:"
 
 msgid "Determining optimal atlas size"
 msgstr "Determinando o tamanho ideal do atlas"
 
 msgid "Blitting albedo and emission"
-msgstr "Blitting albedo e emissão"
+msgstr "Transferindo albedo e emissão (blitting)"
 
 msgid "Plotting mesh into acceleration structure %d/%d"
 msgstr "Plotando a malha na estrutura de aceleração %d/%d"
@@ -15280,6 +16925,9 @@ msgstr "Plotando a malha na estrutura de aceleração %d/%d"
 msgid "Optimizing acceleration structure"
 msgstr "Otimizando a estrutura de aceleração"
 
+msgid "Denoising %d%%"
+msgstr "Eliminando ruído de %d%%"
+
 msgid "Begin Bake"
 msgstr "Iniciar Geração"
 
@@ -15292,12 +16940,18 @@ msgstr "Geometria não oclusiva"
 msgid "Plot direct lighting"
 msgstr "Plotar iluminação direta"
 
+msgid "Plot direct lighting %d%%"
+msgstr "Plotar iluminação direta %d%%"
+
 msgid "Integrate indirect lighting"
 msgstr "Integrar iluminação indireta"
 
 msgid "Integrate indirect lighting %d%%"
 msgstr "Integrar iluminação indireta %d%%"
 
+msgid "Baking light probes"
+msgstr "Gerando sondas de iluminação"
+
 msgid "Integrating light probes %d%%"
 msgstr "Integrando sondas de iluminação %d%%"
 
@@ -15316,11 +16970,45 @@ msgstr "O nome da classe deve ser um identificador válido"
 msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr "Não há bytes suficientes para decodificar, ou o formato é inválido."
 
+msgid ""
+"Unable to load .NET runtime, no compatible version was found.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+"Não foi possível carregar o .NET runtime, nenhuma versão compatível "
+"encontrada.\n"
+"Se tentar criar/editar um projeto, o programa irá crashar.\n"
+"\n"
+"Por favor instale o .NET SDK 6.0 ou superior em https://get.dot.net e "
+"reinicie o Godot."
+
 msgid "Failed to load .NET runtime"
-msgstr "Falha ao carregar tempo de execução .NET"
+msgstr "Falha ao carregar .NET runtime"
+
+msgid ""
+"Unable to find the .NET assemblies directory.\n"
+"Make sure the '%s' directory exists and contains the .NET assemblies."
+msgstr ""
+"Não foi possível encontrar a pasta de assemblies do .NET.\n"
+"Certifique-se de que a pasta '%s' exista e contenha os assemblies do .NET."
 
 msgid ".NET assemblies not found"
-msgstr "Assemblies .NET não encontrados"
+msgstr "Assemblies do .NET não encontrados"
+
+msgid ""
+"Unable to load .NET runtime, specifically hostfxr.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+"Não foi possível carregar o .NET runtime, em específico o hostfxr.\n"
+"Se tentar criar/editar um projeto, o programa irá crashar.\n"
+"\n"
+"Por favor instale o .NET SDK 6.0 ou superior em https://get.dot.net e "
+"reinicie o Godot."
 
 msgid "%d (%s)"
 msgstr "%d (%s)"
@@ -15343,7 +17031,7 @@ msgid "Outgoing RPC"
 msgstr "RPC enviado"
 
 msgid "Synchronizer"
-msgstr "Sincronizar"
+msgstr "Sincronizador"
 
 msgid "Config"
 msgstr "Configuração"
@@ -15351,6 +17039,12 @@ msgstr "Configuração"
 msgid "Count"
 msgstr "Quantidade"
 
+msgid "Replication"
+msgstr "Replicação"
+
+msgid "Toggle Replication Bottom Panel"
+msgstr "Alternar Painel Inferior de Replicação"
+
 msgid "Select a replicator node in order to pick a property to add to it."
 msgstr ""
 "Selecione um nó replicador para escolher uma propriedade para adicionar a ele."
@@ -15397,7 +17091,7 @@ msgid "The MultiplayerSynchronizer needs a root path."
 msgstr "O MultiplayerSynchronizer precisa de um caminho raiz."
 
 msgid "Property/path must not be empty."
-msgstr "A Propriedade/Caminho não pode estar vazia."
+msgstr "A propriedade/caminho não pode estar vazia."
 
 msgid "Invalid property path: '%s'"
 msgstr "Caminho de propriedade inválido: \"%s\""
@@ -15430,12 +17124,16 @@ msgctxt "Replication Mode"
 msgid "Always"
 msgstr "Sempre"
 
+msgctxt "Replication Mode"
+msgid "On Change"
+msgstr "Ao Mudar"
+
 msgid ""
 "A valid NodePath must be set in the \"Spawn Path\" property in order for "
 "MultiplayerSpawner to be able to spawn Nodes."
 msgstr ""
 "Um NodePath válido deve ser definido na propriedade \"Caminho de Geração\" "
-"para que MultiplayerSpawner possa gerar nós."
+"para que o MultiplayerSpawner possa gerar nós."
 
 msgid ""
 "A valid NodePath must be set in the \"Root Path\" property in order for "
@@ -15453,15 +17151,15 @@ msgid ""
 "Cannot generate navigation mesh because it does not belong to the edited "
 "scene. Make it unique first."
 msgstr ""
-"Não é possível gerar malha de navegação porque não pertence à cena editada. "
-"Torne-a única primeiro."
+"Não é possível gerar malha de navegação porque ela não pertence à cena "
+"editada. Torne-a única primeiro."
 
 msgid ""
 "Cannot generate navigation mesh because it belongs to a resource which was "
 "imported."
 msgstr ""
-"Não é possível gerar malha de navegação porque pertence a um recurso que foi "
-"importado."
+"Não é possível gerar malha de navegação porque ela pertence a um recurso que "
+"foi importado."
 
 msgid ""
 "Cannot generate navigation mesh because the resource was imported from "
@@ -15471,29 +17169,29 @@ msgstr ""
 "outro tipo."
 
 msgid "Bake NavigationMesh"
-msgstr "Preparar Malha de Navegação"
+msgstr "Gerar NavigationMesh"
 
 msgid ""
 "Bakes the NavigationMesh by first parsing the scene for source geometry and "
 "then creating the navigation mesh vertices and polygons."
 msgstr ""
-"Prepara o NavigationMesh analisando primeiro a cena em busca da geometria de "
+"Gera o NavigationMesh analisando primeiro a cena em busca da geometria de "
 "origem e, em seguida, criando os vértices e polígonos da malha de navegação."
 
 msgid "Clear NavigationMesh"
-msgstr "Apagar Malha de Navegação"
+msgstr "Apagar NavigationMesh"
 
 msgid "Clears the internal NavigationMesh vertices and polygons."
-msgstr "Limpar os vértices e polígonos internos da Malha de Navegação."
+msgstr "Apaga os vértices e polígonos internos da NavigationMesh."
 
 msgid "Toggles whether the noise preview is computed in 3D space."
-msgstr "Alterna se a visualização do ruído é computada no espaço 3D."
+msgstr "Alterna se a visualização do ruído é computada em 3D."
 
 msgid "Rename Action"
 msgstr "Renomear Ação"
 
 msgid "Rename Actions Localized name"
-msgstr "Renomear Nome Das Ações Traduzidas"
+msgstr "Alterar Nome Traduzido da Ação"
 
 msgid "Change Action Type"
 msgstr "Alterar Tipo de Ação"
@@ -15535,10 +17233,10 @@ msgid "Add profile"
 msgstr "Adicionar Perfil"
 
 msgid "Add an interaction profile."
-msgstr "Adicione um perfil de interação."
+msgstr "Adicionar um perfil de interação."
 
 msgid "Save this OpenXR action map."
-msgstr "Salve este mapa de ação OpenXR."
+msgstr "Salvar este mapa de ação OpenXR."
 
 msgid "Reset to default OpenXR action map."
 msgstr "Redefinir para o mapa de ação OpenXR padrão."
@@ -15550,37 +17248,64 @@ msgid "Rename Action Set"
 msgstr "Renomear Conjunto de Ações"
 
 msgid "Rename Action Sets Localized name"
-msgstr "Renomear Conjuntos de Ações de Nome Localizado"
+msgstr "Alterar Nome Localizado do Conjunto de Ações"
 
 msgid "Change Action Sets priority"
-msgstr "Alterar prioridade do Conjunto de Ações"
+msgstr "Alterar Prioridade do Conjunto de Ações"
 
 msgid "Add action"
-msgstr "Adicionar Ação"
+msgstr "Adicionar ação"
 
 msgid "Delete action"
-msgstr "Excluir Ação"
+msgstr "Excluir ação"
 
 msgid "Add action."
-msgstr "Adicionar Ação."
+msgstr "Adicionar ação."
 
 msgid "Remove action set."
 msgstr "Remover conjunto de ações."
 
+msgid "Remove binding modifier."
+msgstr "Remover modificador de binding."
+
+msgid "Remove binding modifier"
+msgstr "Remover modificador de binding"
+
+msgid "Add binding modifier"
+msgstr "Adicionar modificador de binding"
+
+msgid "Note: modifiers will only be applied if supported on the host system."
+msgstr "Nota: modificadores só serão aplicados se o sistema hóspede suportar."
+
+msgid "Binding modifiers for:"
+msgstr "Modificadores de binding para:"
+
 msgid "OpenXR Action Map"
 msgstr "Mapa de Ação do OpenXR"
 
+msgid "Toggle OpenXR Action Map Bottom Panel"
+msgstr "Alternar Painel Inferior do Mapa de Ação do OpenXR"
+
 msgid "Remove action from interaction profile"
 msgstr "Remover ação do perfil de interação"
 
+msgid "Edit binding modifiers"
+msgstr "Editar modificadores de binding"
+
+msgid "Note: This interaction profile requires extension %s support."
+msgstr "Nota: Este perfil de interação requer suporte à extensão %s."
+
 msgid "Add binding"
-msgstr "Adicionar Vínculo"
+msgstr "Adicionar binding"
 
 msgid "Remove binding"
-msgstr "Remover Vínculo"
+msgstr "Remover binding"
+
+msgid "Note: This binding path requires extension %s support."
+msgstr "Nota: Este caminho de binding requer suporte à extensão %s."
 
 msgid "Pose"
-msgstr "Postura"
+msgstr "Pose"
 
 msgid "Haptic"
 msgstr "Háptico"
@@ -15594,6 +17319,9 @@ msgstr "Selecione uma ação"
 msgid "Select an interaction profile"
 msgstr "Adicione um perfil de interação"
 
+msgid "All interaction profiles have been added to the action map."
+msgstr "Todos os perfis de interação foram adicionados ao mapa de ação."
+
 msgid "Choose an XR runtime."
 msgstr "Escolha um runtime XR."
 
@@ -15602,7 +17330,33 @@ msgid ""
 "Clear it from its current layer first."
 msgstr ""
 "Não é possível usar o mesmo SubViewport com múltiplas camadas de composição "
-"OpenXR. Limpe-o da sua camada atual antes."
+"OpenXR. Apague-o da sua camada atual antes."
+
+msgid ""
+"Cannot set SubViewport on an OpenXR composition layer when using an Android "
+"surface."
+msgstr ""
+"Não é possível definir um SubViewport em uma camada de composição OpenXR "
+"usando uma supoerfície Android."
+
+msgid "OpenXR composition layers must have an XROrigin3D node as their parent."
+msgstr "As camadas de composição OpenXR devem ter um nó XROrigin3D como pai."
+
+msgid ""
+"OpenXR composition layers must have orthonormalized transforms (ie. no scale "
+"or shearing)."
+msgstr ""
+"As camadas de composição OpenXR devem ter transformações orto-normalizadas "
+"(ou seja, sem escala ou cisalhamento)."
+
+msgid ""
+"Hole punching won't work as expected unless the sort order is less than zero."
+msgstr ""
+"A perfuração não funcionará conforme o esperado, a menos que o índice de "
+"ordenação seja menor que zero."
+
+msgid "OpenXR visibility mask must have an XRCamera3D node as their parent."
+msgstr "As máscaras de visibilidade OpenXR devem ter um nó XRCamera3D como pai."
 
 msgid "Package name is missing."
 msgstr "Está faltando o nome do pacote."
@@ -15612,14 +17366,18 @@ msgstr "Segmentos de pacote devem ter tamanho diferente de zero."
 
 msgid "The character '%s' is not allowed in Android application package names."
 msgstr ""
-"O caractere '%s' não é permitido em nomes de pacotes de aplicações do Android."
+"O caractere '%s' não é permitido em nomes de pacotes de aplicativos do "
+"Android."
+
+msgid "A digit cannot be the first character in a package segment."
+msgstr "Um dígito não pode ser o primeiro caractere em um segmento de pacote."
 
 msgid "The character '%s' cannot be the first character in a package segment."
 msgstr ""
-"O caracter '%s' não pode ser o primeiro caracter em um segmento de pacotes."
+"O caracter '%s' não pode ser o primeiro caractere em um segmento de pacote."
 
 msgid "The package must have at least one '.' separator."
-msgstr "O pacote deve possuir no mínimo um separador \".\"."
+msgstr "O pacote deve possuir pelo menos um separador '.'."
 
 msgid "Error creating keystores directory:"
 msgstr "Erro ao criar o diretório de keystores:"
@@ -15630,6 +17388,11 @@ msgstr "Chave pública inválida para expansão do APK."
 msgid "Invalid package name:"
 msgstr "Nome de pacote inválido:"
 
+msgid "\"Use Gradle Build\" is required to enable \"Swipe to dismiss\"."
+msgstr ""
+"\"Usar Compilador Gradle\" deve estar ativado para usar \"Deslize para "
+"fechar\"."
+
 msgid "\"Use Gradle Build\" must be enabled to use the plugins."
 msgstr "\"Usar Compilador Gradle\" deve estar ativado para usar os plug-ins."
 
@@ -15654,7 +17417,7 @@ msgstr ""
 
 msgid "\"Min SDK\" should be a valid integer, but got \"%s\" which is invalid."
 msgstr ""
-"\"Min SDK\" deve ser um número inteiro válido, mas obteve \"%s\" que é "
+"\"Min SDK\" deve ser um número inteiro válido, valor fornecido \"%s\" é "
 "inválido."
 
 msgid ""
@@ -15662,7 +17425,7 @@ msgid ""
 "library."
 msgstr ""
 "\"Min SDK\" não pode ser inferior a %d, que é a versão necessária para a "
-"biblioteca Godot."
+"biblioteca do Godot."
 
 msgid ""
 "\"Target SDK\" can only be overridden when \"Use Gradle Build\" is enabled."
@@ -15673,13 +17436,28 @@ msgstr ""
 msgid ""
 "\"Target SDK\" should be a valid integer, but got \"%s\" which is invalid."
 msgstr ""
-"\"SDK Alvo\" deve ser um número inteiro válido, mas obteve \"%s\", que é "
+"\"SDK Alvo\" deve ser um número inteiro válido, valor fornecido \"%s\" é "
 "inválido."
 
 msgid "\"Target SDK\" version must be greater or equal to \"Min SDK\" version."
 msgstr ""
 "Versão do \"SDK Alvo\" precisa ser igual ou maior que a versão do \"Min SDK\"."
 
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show In Android Tv\"."
+msgstr ""
+"\"Usar Compilador Gradle\" deve estar ativado para ativar \"Mostrar no "
+"Android Tv\"."
+
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show As Launcher App\"."
+msgstr ""
+"\"Usar Compilador Gradle\" deve estar ativado para ativar \"Mostrar como App "
+"de Launcher\"."
+
+msgid "\"Use Gradle Build\" must be enabled to disable \"Show In App Library\"."
+msgstr ""
+"\"Usar Compilador Gradle\" deve estar ativado para desativar \"Mostrar na "
+"Biblioteca de Apps\"."
+
 msgid "Select device from the list"
 msgstr "Selecione um dispositivo da lista"
 
@@ -15705,11 +17483,33 @@ msgid "Could not execute on device."
 msgstr "Não foi possível executar no dispositivo."
 
 msgid "Error: There was a problem validating the keystore username and password"
-msgstr "Erro: Ocorreu um problema ao validar Usuário e senha"
+msgstr "Erro: Ocorreu um problema ao validar usuário e senha do keystore"
+
+msgid ""
+"Unable to determine the C# project's TFM, it may be incompatible. The export "
+"template only supports '%s'. Make sure the project targets '%s' or consider "
+"using gradle builds instead."
+msgstr ""
+"Não foi possível determinar o TFM do projeto C#, pode ser incompatível. O "
+"modelo de exportação só suporta '%s'. Defina o alvo do projeto como '%s' ou "
+"considere usar o compilador gradle."
+
+msgid ""
+"C# project targets '%s' but the export template only supports '%s'. Consider "
+"using gradle builds instead."
+msgstr ""
+"Projeto C# tem como alvo '%s' mas o modelo de exportação só suporta '%s'. "
+"Considere usar o compilador gradle."
 
 msgid "Exporting to Android when using C#/.NET is experimental."
 msgstr "Exportar para Android usando C#/.NET é experimental."
 
+msgid "Gradle build is not supported for the Android editor."
+msgstr "O editor para Android não suporta o compilador gradle."
+
+msgid "Custom Android source template not found."
+msgstr "Modelo fonte do Android customizado não encontrado."
+
 msgid ""
 "Android build template not installed in the project. Install it from the "
 "Project menu."
@@ -15721,31 +17521,32 @@ msgid ""
 "Either Debug Keystore, Debug User AND Debug Password settings must be "
 "configured OR none of them."
 msgstr ""
-"As configurações Keystore de Depuração, Usuário de Depuração e Senha de "
-"Depuração devem ser configuradas OU nenhum deles."
+"Você deve configurar: uma Keystore de Depuração, OU Usuário e Senha de "
+"Depuração, OU nenhum deles."
 
 msgid "Debug keystore not configured in the Editor Settings nor in the preset."
 msgstr ""
-"Porta-chaves de depuração não configurado nas Configurações do Editor e nem "
-"na predefinição."
+"Keystore de Depuração não configurado nas Configurações do Editor e nem na "
+"predefinição."
 
 msgid ""
 "Either Release Keystore, Release User AND Release Password settings must be "
 "configured OR none of them."
 msgstr ""
-"As configurações Versão de Keystore, Usuário da Versão e Senha da Versão "
-"devem ser configuradas OU nenhum deles."
+"Você deve configurar: uma Keystore de Lançamento, OU Usuário e Senha de "
+"Lançamento, OU nenhum deles."
 
 msgid "Release keystore incorrectly configured in the export preset."
 msgstr ""
-"Keystore de versão incorretamente configurada na predefinição de exportação."
+"Keystore de lançamento configurada incorretamente na predefinição de "
+"exportação."
 
 msgid "A valid Java SDK path is required in Editor Settings."
 msgstr ""
 "Um caminho valido para o Java SDK é necessário nas Configurações do Editor."
 
 msgid "Invalid Java SDK path in Editor Settings."
-msgstr "Caminho Invalido do Java SDK nas configurações do Editor."
+msgstr "Caminho Inválido do Java SDK nas configurações do Editor."
 
 msgid "Missing 'bin' directory!"
 msgstr "Diretório 'bin' está ausente!"
@@ -15760,7 +17561,7 @@ msgstr ""
 "Editor."
 
 msgid "A valid Android SDK path is required in Editor Settings."
-msgstr "Um caminho Android SDK é necessário nas Configurações do Editor."
+msgstr "Um caminho ao Android SDK é necessário nas Configurações do Editor."
 
 msgid "Invalid Android SDK path in Editor Settings."
 msgstr "Caminho do Android SDK inválido nas Configurações do Editor."
@@ -15770,7 +17571,8 @@ msgstr "Diretório 'platform-tools' ausente!"
 
 msgid "Unable to find Android SDK platform-tools' adb command."
 msgstr ""
-"Não foi possível encontrar o comando adb da 'platform-tools' do Android SDK."
+"Não foi possível encontrar o comando adb na pasta 'platform-tools' do Android "
+"SDK."
 
 msgid "Please check in the Android SDK directory specified in Editor Settings."
 msgstr ""
@@ -15782,8 +17584,8 @@ msgstr "Diretório 'build-tools' ausente!"
 
 msgid "Unable to find Android SDK build-tools' apksigner command."
 msgstr ""
-"Não foi possível encontrar o comando apksigner na 'build-tools' do Android "
-"SDK."
+"Não foi possível encontrar o comando apksigner na pasta 'build-tools' do "
+"Android SDK."
 
 msgid ""
 "\"Target SDK\" %d is higher than the default version %d. This may work, but "
@@ -15807,13 +17609,44 @@ msgid ""
 "and will be updated to \"%s\". Please explicitly specify the package name if "
 "needed."
 msgstr ""
-"O nome do projeto não atende ao requisito para o formato do nome do pacote e "
-"será atualizado para \"%s\". Especifique explicitamente o nome do pacote se "
+"O nome do projeto não atende ao requisito para o formato de nomes de pacote e "
+"será atualizado para \"%s\". Especifique um nome de pacote explicitamente se "
 "necessário."
 
+msgid "Code Signing"
+msgstr "Assinatura de Código"
+
+msgid "AAB signing is not supported"
+msgstr "Não há suporte para assinatura AAB"
+
+msgid "Signing debug APK..."
+msgstr "Assinando APK de depuração..."
+
+msgid "Signing release APK..."
+msgstr "Assinando APK de lançamento..."
+
 msgid "Could not find keystore, unable to export."
 msgstr "O keystore não foi encontrado, não foi possível exportar."
 
+msgid "Unable to sign apk."
+msgstr "Erro ao assinar APK."
+
+msgid ""
+"All 'apksigner' tools located in Android SDK 'build-tools' directory failed "
+"to execute. Please check that you have the correct version installed for your "
+"target sdk version. The resulting APK is unsigned."
+msgstr ""
+"Todas as ferramentas 'apksigner' localizadas no diretório 'build-tools' do "
+"Android SDK deram erro ao executar. Verifique se você tem a versão correta "
+"instalada para a versão do SDK de destino. O APK resultante não foi assinado."
+
+msgid ""
+"'apksigner' could not be found. Please check that the command is available in "
+"the Android SDK build-tools directory. The resulting APK is unsigned."
+msgstr ""
+"'apksigner' não foi encontrado. Verifique se o comando está disponível no "
+"diretório 'build-tools' do Android SDK. O APK resultante não foi assinado."
+
 msgid "Could not start apksigner executable."
 msgstr "Não foi possível iniciar o executável apksigner."
 
@@ -15824,9 +17657,18 @@ msgid ""
 "output: \n"
 "%s"
 msgstr ""
-"saída:\n"
+"saída: \n"
 "%s"
 
+msgid "Verifying APK..."
+msgstr "Verificando APK..."
+
+msgid "Unable to verify signed apk."
+msgstr "Erro ao verificar APK assinado."
+
+msgid "'apksigner' verification of APK failed."
+msgstr "Verificação de 'apksigner' do APK falhou."
+
 msgid "Target folder does not exist or is inaccessible: \"%s\""
 msgstr "A pasta destino não existe ou está inacessível: \"%s\""
 
@@ -15840,7 +17682,7 @@ msgid "APK Expansion not compatible with Android App Bundle."
 msgstr "Expansão do APK não é compatível com Android App Bundle."
 
 msgid "Invalid filename! Android APK requires the *.apk extension."
-msgstr "Nome de arquivo inválido! Android APK requer a extensão *.apk."
+msgstr "Nome de arquivo inválido! APK Android requer a extensão *.apk."
 
 msgid "Unsupported export format!"
 msgstr "Formato de exportação não suportado!"
@@ -15857,26 +17699,26 @@ msgid ""
 "java_sdk_path'."
 msgstr ""
 "O caminho para o Java SDK pode ser configurado nas Configurações do Editor, "
-"em 'exportar/android/java_sdk_path'."
+"em 'export/android/java_sdk_path'."
 
 msgid ""
 "Android SDK path must be configured in Editor Settings at 'export/android/"
 "android_sdk_path'."
 msgstr ""
-"O caminho do Android SDK pode ser configurado nas Configurações do Editor em "
-"'exportar/android/android_sdk_path'."
+"O caminho do Android SDK deve ser configurado nas Configurações do Editor em "
+"'export/android/android_sdk_path'."
 
 msgid "Unable to overwrite res/*.xml files with project name."
-msgstr "Incapaz de sobrescrever os arquivos res:/*.xml com o nome do projeto."
+msgstr "Erro ao sobrescrever os arquivos res:/*.xml com o nome do projeto."
 
 msgid "Could not export project files to gradle project."
-msgstr "Não foi possível exportar os arquivos do projeto para o projeto Gradle."
+msgstr "Não foi possível exportar os arquivos do projeto para o projeto gradle."
 
 msgid "Could not write expansion package file!"
 msgstr "Não foi possível escrever o arquivo do pacote de expansão!"
 
 msgid "Building Android Project (gradle)"
-msgstr "Construindo Projeto Android (gradle)"
+msgstr "Compilando Projeto Android (gradle)"
 
 msgid "Building of Android project failed, check output for the error:"
 msgstr ""
@@ -15888,11 +17730,17 @@ msgstr "Movendo saída"
 msgid "Unable to copy and rename export file:"
 msgstr "Não foi possível copiar e renomear o arquivo de exportação:"
 
+msgid "Debug export template not found: \"%s\"."
+msgstr "Modelo de exportação de depuração não encontrado: \"%s\"."
+
+msgid "Release export template not found: \"%s\"."
+msgstr "Modelo de exportação de lançamento não encontrado: \"%s\"."
+
 msgid "Creating APK..."
 msgstr "Criando APK..."
 
 msgid "Could not find template APK to export: \"%s\"."
-msgstr "Não foi possível encontrar o modelo de APK para exportação: %s."
+msgstr "Não foi possível encontrar o modelo de APK para exportação: \"%s\"."
 
 msgid ""
 "Missing libraries in the export template for the selected architectures: %s. "
@@ -15916,11 +17764,26 @@ msgid "Could not unzip temporary unaligned APK."
 msgstr "Não foi possível descompactar o APK temporário não alinhado."
 
 msgid "App Store Team ID not specified."
-msgstr "ID da equipe da App Store não especificada."
+msgstr "ID de equipe da App Store não especificada."
 
 msgid "Invalid Identifier:"
 msgstr "Identificador Inválido:"
 
+msgid "At least one file timestamp access reason should be selected."
+msgstr ""
+"Pelo menos um motivo para o acesso às datas de modificação dos arquivos deve "
+"ser selecionado."
+
+msgid "At least one disk space access reason should be selected."
+msgstr ""
+"Pelo menos um motivo para acesso ao espaço de armazenamento deve ser "
+"selecionado."
+
+msgid "At least one system boot time access reason should be selected."
+msgstr ""
+"Pelo menos um motivo para acesso ao tempo de boot do sistema deve ser "
+"selecionado."
+
 msgid "Export Icons"
 msgstr "Exportar Ícones"
 
@@ -15928,7 +17791,10 @@ msgid "Could not open a directory at path \"%s\"."
 msgstr "Não foi possível abir o diretório no caminho \"%s\"."
 
 msgid "Could not write to a file at path \"%s\"."
-msgstr "Não foi possível escrever o arquivo no caminho: \"%s\"."
+msgstr "Não foi possível salvar o arquivo no caminho: \"%s\"."
+
+msgid "Exporting for iOS (Project Files Only)"
+msgstr "Exportando para iOS (Apenas Arquivos de Projeto)"
 
 msgid "Exporting for iOS"
 msgstr "Exportando para iOS"
@@ -15937,21 +17803,21 @@ msgid "Prepare Templates"
 msgstr "Preparando Modelos"
 
 msgid "Export template not found."
-msgstr "Modelo de exportado não encontrado."
+msgstr "Modelo de exportação não encontrado."
 
 msgid ""
 "Unexpected files found in the export destination directory \"%s.xcodeproj\", "
 "delete it manually or select another destination."
 msgstr ""
 "Arquivos inesperados encontrados no diretório de exportação \"%s.xcodeproj\", "
-"delete eles manualmente ou selecione outro destino."
+"exclua-os manualmente ou selecione outro destino."
 
 msgid ""
 "Unexpected files found in the export destination directory \"%s\", delete it "
 "manually or select another destination."
 msgstr ""
-"Arquivos inesperados encontrados no diretório de exportação \"%s\", delete "
-"eles manualmente ou selecione outro destino."
+"Arquivos inesperados encontrados no diretório de exportação \"%s\", exclua-os "
+"manualmente ou selecione outro destino."
 
 msgid "Failed to create the directory: \"%s\""
 msgstr "Não foi possível criar o diretório: \"%s\""
@@ -15959,23 +17825,39 @@ msgstr "Não foi possível criar o diretório: \"%s\""
 msgid "Could not create and open the directory: \"%s\""
 msgstr "Não foi possível criar e abrir o diretório: \"%s\""
 
+msgid "iOS Plugins"
+msgstr "Plugins do iOS"
+
 msgid "Failed to export iOS plugins with code %d. Please check the output log."
 msgstr ""
-"Falha ao exportar os Plugins iOS com o código %d. Verifique a saída do log."
+"Falha ao exportar os plugins do iOS com o código %d. Verifique o log de saída."
 
 msgid "Could not create a directory at path \"%s\"."
 msgstr "Não foi possível criar o diretório no caminho \"%s\"."
 
+msgid ""
+"Requested template library '%s' not found. It might be missing from your "
+"template archive."
+msgstr ""
+"Biblioteca de modelo requisitada '%s' não encontrada. Pode estar faltando nos "
+"seus arquivos de modelo."
+
 msgid "Could not copy a file at path \"%s\" to \"%s\"."
-msgstr "Não foi possível copiar um arquivo/file no caminho \"%s\" para \"%s\"."
+msgstr "Não foi possível copiar um arquivo do caminho \"%s\" para \"%s\"."
+
+msgid "Could not access the filesystem."
+msgstr "Não foi possível acessar o sistema de arquivos."
 
 msgid "Failed to create a file at path \"%s\" with code %d."
-msgstr "Falha ao criar um arquivo/file no caminho \"%s\" com código %d."
+msgstr "Falha ao criar um arquivo no caminho \"%s\" com código %d."
 
 msgid "Code signing failed, see editor log for details."
 msgstr ""
 "A assinatura do código falhou, consulte o log do editor para obter detalhes."
 
+msgid "Xcode Build"
+msgstr "Compilação do Xcode"
+
 msgid "Failed to run xcodebuild with code %d"
 msgstr "Erro ao rodar xcodebuild com o código %d"
 
@@ -15996,23 +17878,74 @@ msgstr ""
 "pacote."
 
 msgid "Exporting to iOS when using C#/.NET is experimental and requires macOS."
-msgstr "Exportar para iOS usando C#/.NET é experimental e requer macOS."
+msgstr "Exportar para iOS usando C#/.NET é experimental e só funciona no macOS."
 
 msgid "Exporting to iOS when using C#/.NET is experimental."
 msgstr "Exportar para iOS usando C#/.NET é experimental."
 
+msgid "Invalid additional PList content: "
+msgstr "Conteúdo PList adicional inválido: "
+
+msgid "Metal renderer require iOS 14+."
+msgstr "Renderizador Metal requer iOS 14+."
+
 msgid "Identifier is missing."
 msgstr "Identificador ausente."
 
+msgid "The character '%s' is not allowed in Identifier."
+msgstr "O caractere '%s' não é permitido no Identificador."
+
+msgid "Could not start ios-deploy executable."
+msgstr "Não foi possível iniciar o executável ios-deploy."
+
+msgid "Installation/running failed, see editor log for details."
+msgstr "A instalação/execução falhou, veja o log do editor para obter detalhes."
+
+msgid "Could not start device executable."
+msgstr "Não foi possível iniciar o executável device."
+
+msgid "Installation failed, see editor log for details."
+msgstr "A instalação falhou, veja o log do editor para obter detalhes."
+
+msgid "Could not start devicectl executable."
+msgstr "Não foi possível iniciar o executável devicectl."
+
+msgid "Running failed, see editor log for details."
+msgstr "A execução falhou, consulte o log do editor para obter detalhes."
+
 msgid "Debug Script Export"
 msgstr "Exportar Script de Depuração"
 
 msgid "Could not open file \"%s\"."
 msgstr "Não foi possível abrir o arquivo \"%s\"."
 
+msgid ""
+"Mismatching custom export template executable architecture, found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"Arquitetura diferente encontrada no modelo de exportação personalizado, "
+"encontrou \"%s\", esperava \"%s\"."
+
+msgid "Debug Console Export"
+msgstr "Exportar Console de Depuração"
+
 msgid "Could not create console wrapper."
 msgstr "Não foi possível criar o wrapper do console."
 
+msgid ""
+"Mismatching custom debug export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Arquitetura diferente encontrada no modelo de exportação de depuração "
+"personalizado: encontrou \"%s\", esperava \"%s\"."
+
+msgid ""
+"Mismatching custom release export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Arquitetura diferente encontrada no modelo de exportação de lançamento "
+"personalizado: encontrou \"%s\", esperava \"%s\"."
+
 msgid "Failed to open executable file \"%s\"."
 msgstr "Falha ao abrir o arquivo executável \"%s\"."
 
@@ -16025,14 +17958,17 @@ msgstr "Executáveis de 32 bits não podem ter dados incorporados >= 4 GiB."
 msgid "Executable \"pck\" section not found."
 msgstr "Seção executável \"pck\" não encontrada."
 
+msgid "Stop and uninstall"
+msgstr "Parar e desinstalar"
+
 msgid "Run on remote Linux/BSD system"
-msgstr "Executar no sistema Linux/BSD remoto"
+msgstr "Executar em sistema Linux/BSD remoto"
 
 msgid "Stop and uninstall running project from the remote system"
 msgstr "Parar e desinstalar projeto em execução do sistema remoto"
 
 msgid "Run exported project on remote Linux/BSD system"
-msgstr "Execute o projeto exportado no sistema Linux/BSD remoto"
+msgstr "Executar projeto exportado em sistema Linux/BSD remoto"
 
 msgid "Running..."
 msgstr "Executando..."
@@ -16059,51 +17995,57 @@ msgid "Invalid bundle identifier:"
 msgstr "Identificador de pacote inválido:"
 
 msgid "App Store distribution with ad-hoc code signing is not supported."
-msgstr ""
-"A distribuição da App Store com assinatura de código ad-hoc não é suportada."
+msgstr "A App Store não permite distribuição com assinatura de código ad-hoc."
 
 msgid "Notarization with an ad-hoc signature is not supported."
 msgstr "Notarização com uma assinatura ad-hoc não é suportada."
 
 msgid "Apple Team ID is required for App Store distribution."
-msgstr "O Apple Team ID é necessário para distribuição na App Store."
+msgstr "Um Apple Team ID é necessário para distribuição na App Store."
 
 msgid "Apple Team ID is required for notarization."
-msgstr "O Apple Team ID é necessário para reconhecimento de firma."
+msgstr "Um Apple Team ID é necessário para notarização."
 
 msgid "Provisioning profile is required for App Store distribution."
 msgstr ""
-"O perfil de provisionamento é necessário para distribuição na App Store."
+"Um perfil de provisionamento é necessário para distribuição na App Store."
 
 msgid "Installer signing identity is required for App Store distribution."
 msgstr ""
-"A identidade de assinatura do instalador é necessária para distribuição na "
+"Uma identidade de assinatura do instalador é necessária para distribuição na "
 "App Store."
 
 msgid "App sandbox is required for App Store distribution."
-msgstr "A sandbox do aplicativo é necessária para distribuição na App Store."
+msgstr "Uma sandbox do aplicativo é necessária para distribuição na App Store."
+
+msgid ""
+"'rcodesign' doesn't support signing applications with embedded dynamic "
+"libraries (GDExtension or .NET)."
+msgstr ""
+"'rcodesign' não suporta aplicativos assinados com bibliotecas dinâmicas "
+"embutidas (GDExtension ou .NET)."
 
 msgid "Code signing is required for App Store distribution."
-msgstr "A assinatura do código é necessária para distribuição na App Store."
+msgstr "Você precisa assinar seu código para distribuir na App Store."
 
 msgid "Code signing is required for notarization."
-msgstr "A assinatura do código é necessária para reconhecimento de firma."
+msgstr "Assinatura do código é necessária para notarização."
 
 msgid ""
 "Neither Apple ID name nor App Store Connect issuer ID name not specified."
 msgstr ""
-"Nem o nome do ID da Apple nem o nome do ID do emissor do App Store Connect "
-"foram especificados."
+"Nem o nome do Apple ID nem o nome do App Store Connect issuer ID foram "
+"especificados."
 
 msgid ""
 "Both Apple ID name and App Store Connect issuer ID name are specified, only "
 "one should be set at the same time."
 msgstr ""
-"Tanto o nome do Apple ID quanto o nome do ID do emissor do App Store Connect "
-"foram especificados, apenas um deve ser definido por vez."
+"Ambos o nome do Apple ID e o nome do App Store Connect issuer ID foram "
+"especificados, apenas um deles deve ser definido."
 
 msgid "Apple ID password not specified."
-msgstr "A senha do ID Apple não foi especificada."
+msgstr "A senha do Apple ID não foi especificada."
 
 msgid "App Store Connect API key ID not specified."
 msgstr "App Store Connect API key ID não foi especificado."
@@ -16113,43 +18055,44 @@ msgstr "O nome do App Store Connect issuer ID não foi especificado."
 
 msgid "Microphone access is enabled, but usage description is not specified."
 msgstr ""
-"O acesso ao microfone está ativado, mas a descrição de uso não é especificada."
+"O acesso ao microfone está ativado, mas a descrição de uso não foi "
+"especificada."
 
 msgid "Camera access is enabled, but usage description is not specified."
 msgstr ""
-"O acesso à câmera está ativado, mas a descrição de uso não é especificada."
+"O acesso à câmera está ativado, mas a descrição de uso não foi especificada."
 
 msgid ""
 "Location information access is enabled, but usage description is not "
 "specified."
 msgstr ""
 "O acesso às informações de localização está ativado, mas a descrição de uso "
-"não está especificada."
+"não foi especificada."
 
 msgid "Address book access is enabled, but usage description is not specified."
 msgstr ""
-"O acesso ao catálogo de endereços está ativado, mas a descrição de uso não "
-"está especificada."
+"O acesso à lista de endereços está ativado, mas a descrição de uso não foi "
+"especificada."
 
 msgid "Calendar access is enabled, but usage description is not specified."
 msgstr ""
-"O acesso ao calendário está ativado, mas a descrição de uso não está "
+"O acesso ao calendário está ativado, mas a descrição de uso não foi "
 "especificada."
 
 msgid "Photo library access is enabled, but usage description is not specified."
 msgstr ""
-"O acesso à biblioteca de fotos está ativado, mas a descrição de uso não é "
+"O acesso à galeria de fotos está ativado, mas a descrição de uso não foi "
 "especificada."
 
 msgid "Notarization"
-msgstr "Autenticação Documental (Notarização)"
+msgstr "Notarização"
 
 msgid ""
 "rcodesign path is not set. Configure rcodesign path in the Editor Settings "
 "(Export > macOS > rcodesign)."
 msgstr ""
-"O caminho do rcodesign não está definido. Configure o caminho rcodesign nas "
-"configurações do editor (Exportar > macOS > rcodesign)."
+"O caminho do rcodesign não está definido. Configure o caminho do rcodesign "
+"nas configurações do editor (Exportar > macOS > rcodesign)."
 
 msgid "Could not start rcodesign executable."
 msgstr "Não foi possível iniciar o executável rcodesign."
@@ -16174,8 +18117,8 @@ msgid ""
 "Run the following command to staple the notarization ticket to the exported "
 "application (optional):"
 msgstr ""
-"Execute o seguinte comando para grampear o tíquete de notarização no "
-"aplicativo exportado (opcional):"
+"Execute o seguinte comando para anexar o tíquete de notarização ao aplicativo "
+"exportado (opcional):"
 
 msgid "Xcode command line tools are not installed."
 msgstr "As ferramentas de linha de comando do Xcode não estão instaladas."
@@ -16190,7 +18133,7 @@ msgid ""
 "Xrcodesign path is not set. Configure rcodesign path in the Editor Settings "
 "(Export > macOS > rcodesign)."
 msgstr ""
-"O caminho Xrcodesign não está definido. Configure o caminho rcodesign nas "
+"O caminho Xrcodesign não está definido. Configure o caminho do rcodesign nas "
 "configurações do editor (Exportar > macOS > rcodesign)."
 
 msgid ""
@@ -16200,6 +18143,9 @@ msgstr ""
 "Não foi possível iniciar o executável do codesign, verifique se as "
 "ferramentas de linha de comando do Xcode estão instaladas."
 
+msgid "Cannot sign directory %s."
+msgstr "Erro ao assinar pasta %s."
+
 msgid "Cannot sign file %s."
 msgstr "Erro ao assinar arquivo %s."
 
@@ -16212,12 +18158,18 @@ msgid "\"%s\": Info.plist missing or invalid, new Info.plist generated."
 msgstr ""
 "\"%s\": Info.plist inválida ou faltando, uma nova Info.plist foi gerada."
 
+msgid "PKG Creation"
+msgstr "Criação de PKG"
+
 msgid "Could not start productbuild executable."
-msgstr "Não foi possível iniciar o executável do productbuild."
+msgstr "Não foi possível iniciar o executável productbuild."
 
 msgid "`productbuild` failed."
 msgstr "`productbuild` falhou."
 
+msgid "DMG Creation"
+msgstr "Criação de DMG"
+
 msgid "Could not start hdiutil executable."
 msgstr "Não foi possível iniciar o executável hdiutil."
 
@@ -16227,8 +18179,11 @@ msgstr "`hdiutil create` falhou - arquivo existe."
 msgid "`hdiutil create` failed."
 msgstr "`hdiutil create` falhou."
 
+msgid "Exporting for macOS"
+msgstr "Exportando para macOS"
+
 msgid "Creating app bundle"
-msgstr "Criando pacote do aplicativo"
+msgstr "Criando pacote de aplicativo"
 
 msgid "Could not find template app to export: \"%s\"."
 msgstr ""
@@ -16253,6 +18208,14 @@ msgstr ""
 msgid "Could not created symlink \"%s\" -> \"%s\"."
 msgstr "Não foi possível criar o link simbólico \"%s\" -> \"%s\"."
 
+msgid ""
+"Unable to set Unix permissions for executable \"%s\". Use \"chmod +x\" to set "
+"it after transferring the exported .app to macOS or Linux."
+msgstr ""
+"Erro ao definir permissões Unix para o executável \"%s\". Execute \"chmod "
+"+x\" para permitir execução após transferir o .app exportado para o macOS ou "
+"Linux."
+
 msgid "Could not open \"%s\"."
 msgstr "Não foi possível abrir \"%s\"."
 
@@ -16273,14 +18236,21 @@ msgid ""
 "Ad-hoc signed applications require the 'Disable Library Validation' "
 "entitlement to load dynamic libraries."
 msgstr ""
-"Aplicativos assinados ad hoc requerem o direito 'Desativar Validação de "
+"Aplicativos assinados ad-hoc requerem o direito 'Desativar Validação de "
 "Biblioteca' para carregar bibliotecas dinâmicas."
 
+msgid ""
+"'rcodesign' doesn't support signing applications with embedded dynamic "
+"libraries."
+msgstr ""
+"'rcodesign' não suporta aplicativos assinados com bibliotecas dinâmicas "
+"embutidas."
+
 msgid "Could not create entitlements file."
-msgstr "Não foi possível criar o arquivo de direitos."
+msgstr "Não foi possível criar o arquivo de permissões."
 
 msgid "Could not create helper entitlements file."
-msgstr "Não foi possível criar o arquivo de direitos de suporte."
+msgstr "Não foi possível criar o arquivo helper de permissões."
 
 msgid "Code signing bundle"
 msgstr "Pacote de assinatura de código"
@@ -16289,10 +18259,10 @@ msgid "Making DMG"
 msgstr "Criando DMG"
 
 msgid "Code signing DMG"
-msgstr "Assinatura de código DMG"
+msgstr "Assinando DMG"
 
 msgid "Making PKG installer"
-msgstr "Criando o instalador do PKG"
+msgstr "Criando instalador PKG"
 
 msgid "Making ZIP"
 msgstr "Criando ZIP"
@@ -16307,6 +18277,24 @@ msgstr ""
 msgid "Sending archive for notarization"
 msgstr "Enviando arquivo para notarização"
 
+msgid ""
+"Cannot export for universal or x86_64 if S3TC BPTC texture format is "
+"disabled. Enable it in the Project Settings (Rendering > Textures > VRAM "
+"Compression > Import S3TC BPTC)."
+msgstr ""
+"Não é possível exportar para universal ou x86_64 se o formato de textura S3TC "
+"BPTC estiver desabilitado. Habilite-o nas Configurações do Projeto "
+"(Renderização > Texturas > Compressão VRAM > Importar S3TC BPTC)."
+
+msgid ""
+"Cannot export for universal or arm64 if ETC2 ASTC texture format is disabled. "
+"Enable it in the Project Settings (Rendering > Textures > VRAM Compression > "
+"Import ETC2 ASTC)."
+msgstr ""
+"Não é possível exportar para universal ou arm64 se o formato da textura ETC2 "
+"ASTC estiver desabilitado. Habilite-o nas Configurações do Projeto "
+"(Renderização > Texturas > Compressão VRAM > Importar ETC2 ASTC)."
+
 msgid "Notarization: Xcode command line tools are not installed."
 msgstr ""
 "Notarização: As ferramentas de linha de comando do Xcode não estão instaladas."
@@ -16315,7 +18303,7 @@ msgid ""
 "Notarization: rcodesign path is not set. Configure rcodesign path in the "
 "Editor Settings (Export > macOS > rcodesign)."
 msgstr ""
-"Notarização: O caminho do rcodesign não foi definido. Configure o caminho "
+"Notarização: O caminho do rcodesign não foi definido. Configure o caminho do "
 "rcodesign nas configurações do editor (Exportar > macOS > rcodesign)."
 
 msgid ""
@@ -16349,13 +18337,14 @@ msgid ""
 "Editor Settings (Export > macOS > rcodesign)."
 msgstr ""
 "Assinatura de Código: O caminho do rcodesign não foi definido. Configure o "
-"caminho rcodesign nas configurações do editor (Exportar > macOS > rcodesign)."
+"caminho do rcodesign nas Configurações do Editor (Exportar > macOS > "
+"rcodesign)."
 
 msgid "Run on remote macOS system"
-msgstr "Executar no sistema macOS remoto"
+msgstr "Executar em sistema macOS remoto"
 
 msgid "Run exported project on remote macOS system"
-msgstr "Execute o projeto exportado no sistema macOS remoto"
+msgstr "Executar o projeto exportado em um sistema macOS remoto"
 
 msgid "Could not open template for export: \"%s\"."
 msgstr "Não foi possível abrir o modelo para exportação: \"%s\"."
@@ -16364,7 +18353,10 @@ msgid "Invalid export template: \"%s\"."
 msgstr "Modelo de exportação inválido: \"%s\"."
 
 msgid "Could not write file: \"%s\"."
-msgstr "Não foi possível escrever o arquivo: \"%s\"."
+msgstr "Não foi possível salvar o arquivo: \"%s\"."
+
+msgid "Icon Creation"
+msgstr "Criação de Ícone"
 
 msgid "Could not read file: \"%s\"."
 msgstr "Não foi possível ler o arquivo: \"%s\"."
@@ -16377,13 +18369,13 @@ msgid ""
 "Use Godot 3 to target Web with C#/Mono instead."
 msgstr ""
 "Atualmente, a exportação para a Web não é suportada no Godot 4 ao usar C#/."
-"NET. Em vez disso, use Godot 3 para direcionar a Web com C#/Mono."
+"NET. Em vez disso, use Godot 3 para exportar para a Web com C#/Mono."
 
 msgid ""
 "If this project does not use C#, use a non-C# editor build to export the "
 "project."
 msgstr ""
-"Se este projeto não usar C#, use uma compilação de editor não C# para "
+"Se este projeto não usar C#, use uma compilação do editor sem C# para "
 "exportar o projeto."
 
 msgid "Could not read HTML shell: \"%s\"."
@@ -16392,6 +18384,12 @@ msgstr "Não foi possível ler o shell HTML: \"%s\"."
 msgid "Run in Browser"
 msgstr "Rodar no Navegador"
 
+msgid "Start HTTP Server"
+msgstr "Iniciar Servidor HTTP"
+
+msgid "Re-export Project"
+msgstr "Reexportar Projeto"
+
 msgid "Stop HTTP Server"
 msgstr "Parar Servidor HTTP"
 
@@ -16399,13 +18397,13 @@ msgid "Run exported HTML in the system's default browser."
 msgstr "Rodar HTML exportado no navegador padrão do sistema."
 
 msgid "Start the HTTP server."
-msgstr "Iniciar Servidor HTTP."
+msgstr "Iniciar o servidor HTTP."
 
 msgid "Export project again to account for updates."
-msgstr "Exportar projeto novamente para considerar atualizações."
+msgstr "Exportar projeto novamente para testar a versão mais atualizada."
 
 msgid "Stop the HTTP server."
-msgstr "Parar Servidor HTTP."
+msgstr "Parar o servidor HTTP."
 
 msgid "Could not create HTTP server directory: %s."
 msgstr "Não foi possível criar o diretório do servidor HTTP: \"%s\"."
@@ -16413,9 +18411,19 @@ msgstr "Não foi possível criar o diretório do servidor HTTP: \"%s\"."
 msgid "Error starting HTTP server: %d."
 msgstr "Erro ao iniciar o servidor HTTP: %d."
 
+msgid "Resources Modification"
+msgstr "Modificação de Recursos"
+
 msgid "Icon size \"%d\" is missing."
 msgstr "O tamanho do ícone \"%d\" está ausente."
 
+msgid ""
+"Mismatching custom export template executable architecture: found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"Arquitetura de executável diferente do modelo de exportação customizado: "
+"encontrou \"%s\", esperava \"%s\"."
+
 msgid "Failed to rename temporary file \"%s\"."
 msgstr "Falha ao renomear arquivo temporário \"%s\"."
 
@@ -16429,7 +18437,7 @@ msgid "Invalid product version."
 msgstr "Versão do produto inválida."
 
 msgid "Could not find rcedit executable at \"%s\"."
-msgstr "Não foi possível encontrar o executável rcedit em \"%s\"."
+msgstr "Não foi possível encontrar o executável do rcedit em \"%s\"."
 
 msgid "Could not find wine executable at \"%s\"."
 msgstr "Não foi possível encontrar o executável do wine em \"%s\"."
@@ -16442,9 +18450,9 @@ msgid ""
 "Settings (Export > Windows > rcedit), or disable \"Application > Modify "
 "Resources\" in the export preset."
 msgstr ""
-"Não foi possível iniciar o executável rcedit. Configure o caminho rcedit nas "
-"Configurações do Editor (Exportar > Windows > rcedit) ou desative "
-"\"Aplicativo > Modificar Recursos\" na predefinição de exportação."
+"Não foi possível iniciar o executável rcedit. Configure o caminho do rcedit "
+"nas Configurações do Editor (Exportar > Windows > rcedit) ou desative "
+"\"Aplicação > Modificar Recursos\" na predefinição de exportação."
 
 msgid "rcedit failed to modify executable: %s."
 msgstr "rcedit falhou ao modificar o executável: %s."
@@ -16462,7 +18470,7 @@ msgid "Invalid identity type."
 msgstr "Tipo de identidade inválido."
 
 msgid "Invalid timestamp server."
-msgstr "Servidor de carimbo de data/hora inválido."
+msgstr "Servidor de data e hora inválido."
 
 msgid ""
 "Could not start signtool executable. Configure signtool path in the Editor "
@@ -16493,17 +18501,24 @@ msgid ""
 "rcedit) to change the icon or app information data."
 msgstr ""
 "A ferramenta rcedit deve ser configurada nas Configurações do Editor "
-"(Exportar > Windows > rcedit) para alterar o ícone ou os dados de informações "
-"do aplicativo."
+"(Exportar > Windows > rcedit) para alterar o ícone ou informações do "
+"aplicativo."
 
 msgid "Windows executables cannot be >= 4 GiB."
-msgstr "Executáveis Windows não podem ser >= 4GiB."
+msgstr "Executáveis do Windows não podem ser >= 4GiB."
 
 msgid "Run on remote Windows system"
 msgstr "Executar em sistema Windows remoto"
 
 msgid "Run exported project on remote Windows system"
-msgstr "Execute o projeto exportado no sistema Windows remoto"
+msgstr "Executar o projeto exportado em um sistema Windows remoto"
+
+msgid ""
+"A SpriteFrames resource must be created or set in the \"Sprite Frames\" "
+"property in order for AnimatedSprite2D to display frames."
+msgstr ""
+"Um recurso SpriteFrames deve ser criado ou definido na propriedade \"Sprite "
+"Frames\" para que o AnimatedSprite2D exiba quadros."
 
 msgid ""
 "Only one visible CanvasModulate is allowed per canvas.\n"
@@ -16511,14 +18526,15 @@ msgid ""
 "undefined."
 msgstr ""
 "Apenas um CanvasModulate visível é permitido por cena (ou conjunto de cenas "
-"instanciadas). Quando houver mais de um, o primeiro \n"
-"criado ficará ativo, enquanto os outros serão ignorados."
+"instanciadas).\n"
+"Quando houver mais de um, apenas um deles ficará ativo. Não se define qual "
+"deles será."
 
 msgid ""
 "CPUParticles2D animation requires the usage of a CanvasItemMaterial with "
 "\"Particles Animation\" enabled."
 msgstr ""
-"A animação CPUParticles2D requer o uso de um CanvasItemMaterial com "
+"Animação de CPUParticles2D requer o uso de um CanvasItemMaterial com "
 "\"Animação de Partículas\" ativada."
 
 msgid ""
@@ -16532,8 +18548,21 @@ msgid ""
 "Particles2D animation requires the usage of a CanvasItemMaterial with "
 "\"Particles Animation\" enabled."
 msgstr ""
-"Animação Particles2D requer o uso de um CanvasItemMaterial com \"Animação de "
-"Partículas\" ativada."
+"Animação de Particles2D requer o uso de um CanvasItemMaterial com \"Animação "
+"de Partículas\" ativada."
+
+msgid ""
+"Particle trails are only available when using the Forward+ or Mobile "
+"renderers."
+msgstr ""
+"As trilhas de partículas estão disponíveis apenas ao usar os renderizadores "
+"Avançado+ ou Mobile."
+
+msgid ""
+"Particle sub-emitters are not available when using the Compatibility renderer."
+msgstr ""
+"Subemissores de partículas não estão disponíveis no renderizador "
+"Compatibilidade."
 
 msgid ""
 "A texture with the shape of the light must be supplied to the \"Texture\" "
@@ -16553,14 +18582,30 @@ msgstr "O polígono para este oclusor está vazio. Por favor desenhe um polígon
 msgid ""
 "The NavigationAgent2D can be used only under a Node2D inheriting parent node."
 msgstr ""
-"O nó NavigationAgent2D pode ser usado apenas em um nó pai herdeiro de Node2D."
+"O nó NavigationAgent2D só pode ser usado como filho de um nó pai herdeiro de "
+"Node2D."
 
 msgid ""
 "NavigationLink2D start position should be different than the end position to "
 "be useful."
 msgstr ""
-"A posição inicial do nó NavigationLink2D deve ser diferente da posição final "
-"para ser utilizado."
+"Um nó NavigationLink2D só é útil se sua posição inicial for diferente da sua "
+"posição final."
+
+msgid "NavigationObstacle2D does not support negative or zero scaling."
+msgstr "O NavigationObstacle2D não suporta escalonamento de zero ou negativo."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest value along the "
+"two axes of the global scale will be used to scale the radius. This value may "
+"change in unexpected ways when the node is rotated."
+msgstr ""
+"O raio do agente só pode ser redimensionado de maneira uniforme. O maior "
+"valor entre ambos eixos da escala global será usado para dimensionar o raio. "
+"Este valor pode mudar de formas inusitadas quando o nó for rotacionado."
+
+msgid "Skew has no effect on the agent radius."
+msgstr "Inclinação não tem efeito no raio do agente."
 
 msgid ""
 "A NavigationMesh resource must be set or created for this node to work. "
@@ -16583,7 +18628,7 @@ msgid ""
 "Consider adding a CollisionShape2D or CollisionPolygon2D as a child to define "
 "its shape."
 msgstr ""
-"Este nó não tem forma, por isso não pode colidir ou interagir com outros "
+"Este nó não tem forma, portanto não pode colidir ou interagir com outros "
 "objetos.\n"
 "Considere adicionar um CollisionShape2D ou CollisionPolygon2D como filho para "
 "definir sua forma."
@@ -16593,8 +18638,8 @@ msgid ""
 "CollisionObject2D derived node. Please only use it as a child of Area2D, "
 "StaticBody2D, RigidBody2D, CharacterBody2D, etc. to give them a shape."
 msgstr ""
-"CollisionPolygon2D apenas serve para fornecer a forma de colisão para um nó "
-"derivado de CollisionObject2D. Por favor use-o apenas como filho de Area2D, "
+"O CollisionPolygon2D serve apenas para definir a forma de colisão para um nó "
+"derivado de CollisionObject2D. Por favor, use-o apenas como filho de Area2D, "
 "StaticBody2D, RigidBody2D, CharacterBody2D, etc. para dá-los forma."
 
 msgid "An empty CollisionPolygon2D has no effect on collision."
@@ -16614,7 +18659,7 @@ msgid ""
 "The One Way Collision property will be ignored when the collision object is "
 "an Area2D."
 msgstr ""
-"A propriedade One Way Collision será ignorada quando o objeto de colisão for "
+"A propriedade Colisão Unidirecional será ignorada se o objeto de colisão for "
 "um Area2D."
 
 msgid ""
@@ -16623,17 +18668,24 @@ msgid ""
 "Please only use it as a child of Area2D, StaticBody2D, RigidBody2D, "
 "CharacterBody2D, etc. to give them a shape."
 msgstr ""
-"CollisionShape2D apenas serve para fornecer a forma de colisão para um nó "
+"O CollisionShape2D serve apenas para definir a forma de colisão para um nó "
 "derivado de CollisionObject2D.\n"
-"Por favor use-o apenas como filho de Area2D, StaticBody2D, RigidBody2D, "
+"Por favor, use-o apenas como filho de Area2D, StaticBody2D, RigidBody2D, "
 "CharacterBody2D, etc. para dá-los forma."
 
 msgid ""
 "A shape must be provided for CollisionShape2D to function. Please create a "
 "shape resource for it!"
 msgstr ""
-"Uma forma deve ser fornecida para que CollisionShape2D funcione. Crie um "
-"recurso de forma para isso!"
+"Uma forma deve ser fornecida para que o CollisionShape2D funcione. Crie um "
+"recurso de forma para ele!"
+
+msgid ""
+"The CollisionShape2D node has limited editing options for polygon-based "
+"shapes. Consider using a CollisionPolygon2D node instead."
+msgstr ""
+"O nó CollisionShape2D tem opções limitadas de edição para formas baseadas em "
+"polígonos. Considere usar um nó CollisionPolygon2D ao invés disso."
 
 msgid "Node A and Node B must be PhysicsBody2Ds"
 msgstr "O Nó A e o Nó B devem ser PhysicsBody2Ds"
@@ -16642,20 +18694,20 @@ msgid "Node A must be a PhysicsBody2D"
 msgstr "O Nó A deve ser um PhysicsBody2D"
 
 msgid "Node B must be a PhysicsBody2D"
-msgstr "O Nó A deve ser um PhysicsBody2D"
+msgstr "O Nó B deve ser um PhysicsBody2D"
 
 msgid "Joint is not connected to two PhysicsBody2Ds"
-msgstr "A Junta não está conectada a dois PhysicsBody2Ds"
+msgstr "A articulação não está conectada a dois PhysicsBody2Ds"
 
 msgid "Node A and Node B must be different PhysicsBody2Ds"
-msgstr "O Nó A e o Nó B devem ser diferentes PhysicsBody2Ds"
+msgstr "O Nó A e o Nó B devem ser PhysicsBody2Ds diferentes"
 
 msgid ""
 "A PhysicalBone2D only works with a Skeleton2D or another PhysicalBone2D as a "
 "parent node!"
 msgstr ""
-"Um PhysicalBone2D só funciona com um Skeleton2D ou outro PhysicalBone2D sendo "
-"nó pai!"
+"Um PhysicalBone2D só funciona se seu pai for um Skeleton2D ou outro "
+"PhysicalBone2D!"
 
 msgid ""
 "A PhysicalBone2D needs to be assigned to a Bone2D node in order to function! "
@@ -16676,9 +18728,9 @@ msgid ""
 "running.\n"
 "Change the size in children collision shapes instead."
 msgstr ""
-"As alterações de tamanho em RigidBody2D serão substituídas pelo mecanismo de "
+"Alterações de tamanho a um RigidBody2D serão substituídas pela engine de "
 "física durante a execução.\n"
-"Em vez disso, altere o tamanho nas formas de colisão dos filhos."
+"Em vez disso, altere o tamanho das formas de colisão dos filhos."
 
 msgid ""
 "This node cannot interact with other objects unless a Shape2D is assigned."
@@ -16688,19 +18740,19 @@ msgstr ""
 
 msgid "Path property must point to a valid Node2D node to work."
 msgstr ""
-"A propriedade Caminho deve apontar para um nó Node2D válido para funcionar."
+"A propriedade de caminho deve apontar para um nó Node2D válido para funcionar."
 
 msgid "This Bone2D chain should end at a Skeleton2D node."
-msgstr "Esta cadeia Bone2D deve terminar em um nó Skeleton2D."
+msgstr "Esta cadeia de Bone2D deve terminar em um nó Skeleton2D."
 
 msgid "A Bone2D only works with a Skeleton2D or another Bone2D as parent node."
-msgstr "Um Bone2D só funciona com um Skeleton2D ou outro Bone2D como nó pai."
+msgstr "Um Bone2D só funciona se for filho de um Skeleton2D ou outro Bone2D."
 
 msgid ""
 "This bone lacks a proper REST pose. Go to the Skeleton2D node and set one."
 msgstr ""
-"Este osso não possui uma posição de DESCANÇO adequada. Vá para o nó "
-"Skeleton2D e defina uma."
+"Este osso não possui uma pose de repouso adequada. Vá para o nó Skeleton2D e "
+"defina uma."
 
 msgid ""
 "The TileMap node is deprecated as it is superseded by the use of multiple "
@@ -16712,8 +18764,8 @@ msgstr ""
 "O nó TileMap está obsoleto, sendo substituído pelo uso de múltiplos nós "
 "TileMapLayer.\n"
 "Para converter um TileMap em um conjunto de nós TileMapLayer, abra o painel "
-"inferior do TileMap com este nó selecionado, clique no ícone de ferramentas "
-"no canto superior direito e escolha \"Extrair camadas de TileMap como nós "
+"inferior de TileMap com este nó selecionado, clique no ícone de ferramentas "
+"no canto superior direito e escolha \"Extrair camadas do TileMap como nós "
 "TileMapLayer individuais\"."
 
 msgid ""
@@ -16721,24 +18773,35 @@ msgid ""
 "This may lead to unwanted behaviors, as a layer that is not Y-sorted will be "
 "Y-sorted as a whole with tiles from Y-sorted layers."
 msgstr ""
-"Uma camada Y-sorted tem o mesmo valor de índice Z que uma camada não Y-"
-"sorted.\n"
-"Isso pode levar a comportamentos indesejados, pois uma camada que não é Y-"
-"sorted será toda Y-sorted com tiles de camadas Y-sorted."
+"Uma camada ordenada por Y tem o mesmo valor de índice Z que uma camada não "
+"ordenada por Y.\n"
+"Isso pode levar a comportamentos indesejados, pois a camada não ordenada por "
+"Y será colocada visualmente no meio dos tiles da camada ordenada por Y."
 
 msgid ""
 "A TileMap layer is set as Y-sorted, but Y-sort is not enabled on the TileMap "
 "node itself."
 msgstr ""
-"Uma camada TileMap é definida como Y-sorted, mas o Y-sorted não está "
-"habilitado no próprio nó TileMap."
+"Uma camada do TileMap está definida como ordenada por Y, mas a ordenação por "
+"Y não está habilitada no próprio nó TileMap."
+
+msgid ""
+"The TileMap node is set as Y-sorted, but Y-sort is not enabled on any of the "
+"TileMap's layers.\n"
+"This may lead to unwanted behaviors, as a layer that is not Y-sorted will be "
+"Y-sorted as a whole."
+msgstr ""
+"O nó TileMap está habilitado para ordenação por Y, mas a ordenação por Y não "
+"foi habilitada em nenhuma das camadas do TileMap.\n"
+"Isso pode levar a comportamentos indesejados, visto que uma camada que não é "
+"ordenada por Y será visualmente ordenada no meio das outras."
 
 msgid ""
 "Isometric TileSet will likely not look as intended without Y-sort enabled for "
 "the TileMap and all of its layers."
 msgstr ""
-"TileSet isométrico provavelmente não terá a aparência pretendida sem Y-sort "
-"ativado para o TileMap e todas as suas camadas."
+"Um TileSet isométrico provavelmente não terá a aparência esperada sem ativar "
+"a ordenação por Y para o TileMap e todas as suas camadas."
 
 msgid ""
 "External Skeleton3D node not set! Please set a path to an external Skeleton3D "
@@ -16770,7 +18833,10 @@ msgid ""
 "Billboard Mode is set to \"Particle Billboard\"."
 msgstr ""
 "A animação CPUParticles3D requer o uso de um StandardMaterial3D cujo Modo "
-"Billboard está definido como \"Particle Billboard\"."
+"Billboard está definido como \"Billboard de Partículas\"."
+
+msgid "Decals are only available when using the Forward+ or Mobile renderers."
+msgstr "Decalques só estão disponíveis nos renderizadores Avançado+ ou Mobile."
 
 msgid ""
 "The decal has no textures loaded into any of its texture properties, and will "
@@ -16801,40 +18867,44 @@ msgstr ""
 "não pintará objetos em nenhuma camada.\n"
 "Para resolver isso, habilite pelo menos um bit na propriedade Cull Mask."
 
+msgid "Fog Volumes are only visible when using the Forward+ renderer."
+msgstr "Volumes de Névoa são visíveis apenas no renderizador Avançado+."
+
 msgid ""
 "Fog Volumes need volumetric fog to be enabled in the scene's Environment in "
 "order to be visible."
 msgstr ""
-"Os Volumes de Névoa precisam que a névoa volumétrica seja ativada no ambiente "
-"da cena para ficar visível."
+"Volumes de Névoa precisam que a névoa volumétrica esteja ativada no ambiente "
+"da cena (Environment) para ficar visível."
 
 msgid "Nothing is visible because meshes have not been assigned to draw passes."
 msgstr ""
-"Nada está visível porque as malhas não foram atribuídas para desenhar passos."
+"Nada está visível porque as malhas não foram atribuídas a passes de "
+"renderização."
 
 msgid ""
 "Particles animation requires the usage of a BaseMaterial3D whose Billboard "
 "Mode is set to \"Particle Billboard\"."
 msgstr ""
-"A animação de partículas requer o uso de um BaseMaterial3D cujo Modo "
-"Billboard está definido como \"Particle Billboard\"."
+"Animação de Partículas requer o uso de um BaseMaterial3D cujo Modo Billboard "
+"está definido como \"Billboard de Partículas\"."
 
 msgid ""
 "Using Trail meshes with a skin causes Skin to override Trail poses. Suggest "
 "removing the Skin."
 msgstr ""
-"O uso de malhas de trilha com uma Skin faz com que a Skin substitua as poses "
-"de trilha. Sugerida a remoção da Skin."
+"O uso de malhas de Trail com uma skin faz com que a Skin substitua as poses "
+"de trilha. Sugere-se remover a Skin."
 
 msgid "Trails active, but neither Trail meshes or a Skin were found."
-msgstr "Trilhas ativas, mas nenhuma malha de trilha ou Skin foi encontrada."
+msgstr "Trilhas ativas, mas nenhuma malha de Trail ou Skin foi encontrada."
 
 msgid ""
 "Only one Trail mesh is supported. If you want to use more than a single mesh, "
 "a Skin is needed (see documentation)."
 msgstr ""
-"Apenas uma malha de trilha é suportada. Se você quiser usar mais de uma única "
-"malha, é necessário um Skin (consulte a documentação)."
+"Apenas uma malha de trilha é suportada. Se você quiser usar mais de uma "
+"malha, você precisa de uma Skin (consulte a documentação)."
 
 msgid ""
 "Trails enabled, but one or more mesh materials are either missing or not set "
@@ -16843,12 +18913,19 @@ msgstr ""
 "Trilhas habilitadas, mas um ou mais materiais de malha estão ausentes ou não "
 "definidos para renderização de trilhas."
 
+msgid ""
+"Particle sub-emitters are only available when using the Forward+ or Mobile "
+"renderers."
+msgstr ""
+"Subemissores de partículas estão disponíveis apenas nos renderizadores "
+"Avançado+ ou Mobile."
+
 msgid ""
 "The Bake Mask has no bits enabled, which means baking will not produce any "
 "collision for this GPUParticlesCollisionSDF3D.\n"
 "To resolve this, enable at least one bit in the Bake Mask property."
 msgstr ""
-"A Bake Mask não tem bits ativados, o que significa que o 'baking' não "
+"A Bake Mask não tem bits ativados, o que significa que o pré-calculo não "
 "produzirá nenhuma colisão para este nó GPUParticlesCollisionSDF3D.\n"
 "Para resolver isso, habilite pelo menos um bit na propriedade Bake Mask."
 
@@ -16856,7 +18933,14 @@ msgid "A light's scale does not affect the visual size of the light."
 msgstr "A escala da iluminação não afeta o tamanho visual da luz."
 
 msgid "Projector texture only works with shadows active."
-msgstr "A textura do projetor só funciona com sombras ativas."
+msgstr "Textura de projetor só funciona com sombras ativas."
+
+msgid ""
+"Projector textures are not supported when using the Compatibility renderer "
+"yet. Support will be added in a future release."
+msgstr ""
+"Texturas de projetor ainda não são suportadas no renderizador "
+"Compatibilidade. Suporte será adicionado em uma versão futura."
 
 msgid "A SpotLight3D with an angle wider than 90 degrees cannot cast shadows."
 msgstr ""
@@ -16875,7 +18959,7 @@ msgid "Creating probes from mesh %d/%d"
 msgstr "Criando sondas da malha %d/%d"
 
 msgid "Preparing Lightmapper"
-msgstr "Preparando o Mapeador de Iluminação"
+msgstr "Preparando o Lightmapper"
 
 msgid "Preparing Environment"
 msgstr "Preparando Ambiente"
@@ -16886,17 +18970,74 @@ msgstr "Gerando Volumes de Sonda"
 msgid "Generating Probe Acceleration Structures"
 msgstr "Gerando Estruturas de Aceleração de Sonda"
 
+msgid ""
+"Lightmaps can only be baked from a GPU that supports the RenderingDevice "
+"backends.\n"
+"Your GPU (%s) does not support RenderingDevice, as it does not support "
+"Vulkan, Direct3D 12, or Metal.\n"
+"Lightmap baking will not be available on this device, although rendering "
+"existing baked lightmaps will work."
+msgstr ""
+"Lightmaps só podem ser gerados por uma GPU que suporta backends baseadas em "
+"RenderingDevice.\n"
+"Sua GPU (%s) não suporta RenderingDevice, pois ela não suporta Vulkan, "
+"Direct3D 12, ou Metal.\n"
+"Lightmaps não podem ser gerados neste dispositivo, mas você ainda pode "
+"renderizar lightmaps previamente gerados."
+
+msgid ""
+"The lightmap has no baked shadowmask textures. Please rebake with the "
+"Shadowmask Mode set to anything other than None."
+msgstr ""
+"O lightmap não tem nenhuma textura de shadowmask gerada. Por favor gere-o "
+"novamente com o Modo de Shadowmask definido como qualquer opção exceto Nenhum."
+
+msgid ""
+"Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will "
+"still work."
+msgstr ""
+"Lightmaps não podem ser gerados em %s, mas você ainda pode renderizar "
+"lightmaps previamente gerados."
+
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time. Rendering existing baked lightmaps will still work."
+msgstr ""
+"Impossível gerar lightmaps, pois o módulo `lightmapper_rd` foi desativado na "
+"compilação. Renderização de lightmaps já gerados ainda funcionará."
+
+msgid "Forward axis and primary rotation axis must not be parallel."
+msgstr "Eixo frontal e eixo de rotação primário não podem ser paralelos."
+
 msgid ""
 "The NavigationAgent3D can be used only under a Node3D inheriting parent node."
 msgstr ""
-"O nó NavigationAgent3D pode ser usado somente em um nó pai herdeiro de Node3D."
+"O nó NavigationAgent3D só pode ser usado se seu pai for herdeiro de Node3D."
 
 msgid ""
 "NavigationLink3D start position should be different than the end position to "
 "be useful."
 msgstr ""
-"A posição inicial do nó NavigationLink3D deve ser diferente da posição final "
-"para ser útil."
+"Um nó NavigationLink3D só é útil se sua posição inicial for diferente da sua "
+"posição final."
+
+msgid ""
+"NavigationObstacle3D only takes global rotation around the y-axis into "
+"account. Rotations around the x-axis or z-axis might lead to unexpected "
+"results."
+msgstr ""
+"O nó NavigationObstacle3D só se importa com sua rotação global ao redor do "
+"eixo Y. Rotacioná-lo nos eixos X ou Z pode ter resultados inesperados."
+
+msgid "NavigationObstacle3D does not support negative or zero scaling."
+msgstr "O NavigationObstacle3D não suporta escalonamento de zero ou negativo."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest scale value along "
+"the three axes will be used."
+msgstr ""
+"O raio do agente só pode ser redimensionado de maneira uniforme. O maior "
+"valor entre os três eixos será usado."
 
 msgid ""
 "Occlusion culling is disabled in the Project Settings, which means occlusion "
@@ -16904,17 +19045,17 @@ msgid ""
 "To resolve this, open the Project Settings and enable Rendering > Occlusion "
 "Culling > Use Occlusion Culling."
 msgstr ""
-"A seleção de oclusão está desativada nas Configurações do Projeto, o que "
-"significa que a seleção de oclusão não será executada na viewport raiz.\n"
-"Para resolver isso, abra as Configurações do Projeto e ative Renderizador> "
-"Seletor de Oclusão > Usar Seletor de Oclusão."
+"Occlusion Culling está desativado nas Configurações do Projeto, portanto o "
+"Occlusion Culling não será executado na viewport raiz.\n"
+"Para resolver isso, abra as Configurações do Projeto e ative Renderização > "
+"Occlusion Culling > Usar Occlusion Culling."
 
 msgid ""
 "The Bake Mask has no bits enabled, which means baking will not produce any "
 "occluder meshes for this OccluderInstance3D.\n"
 "To resolve this, enable at least one bit in the Bake Mask property."
 msgstr ""
-"O Bake Mask não tem bits ativados, o que significa que o 'baking' não "
+"O Bake Mask não tem bits ativados, o que significa que o pré-calculo não "
 "produzirá nenhuma malha oclusora para este nó OccluderInstance3D.\n"
 "Para resolver isso, habilite pelo menos um bit na propriedade Bake Mask."
 
@@ -16925,12 +19066,12 @@ msgid ""
 "types or bake the scene meshes by selecting the OccluderInstance3D and "
 "pressing the Bake Occluders button at the top of the 3D editor viewport."
 msgstr ""
-"Nenhuma malha oclusora foi definida na propriedade 'Occluder', portanto, "
-"nenhuma seleção de oclusão será executada usando este nó OccluderInstance3D.\n"
+"Nenhuma malha oclusora foi definida na propriedade Occluder, portanto, "
+"occlusion culling não será executado usando este nó OccluderInstance3D.\n"
 "Para resolver isso, defina a propriedade Occluder para um dos tipos "
-"primitivos de oclusores ou crie as malhas da cena selecionando "
-"OccluderInstance3D e pressionando o botão Bake Occluders na parte superior da "
-"janela do editor 3D."
+"primitivos de oclusores ou gere as malhas da cena selecionando "
+"OccluderInstance3D e pressionando o botão Gerar Oclusores na parte superior "
+"do viewport do editor 3D."
 
 msgid ""
 "The occluder mesh has less than 3 vertices, so no occlusion culling will be "
@@ -16938,10 +19079,10 @@ msgid ""
 "To generate a proper occluder mesh, select the OccluderInstance3D then use "
 "the Bake Occluders button at the top of the 3D editor viewport."
 msgstr ""
-"A malha do oclusor tem menos de 3 vértices, então nenhuma seleção de oclusão "
-"será realizada usando este nó OccluderInstance3D.\n"
+"A malha do oclusor tem menos de 3 vértices, então occlusion culling não será "
+"realizado usando este nó OccluderInstance3D.\n"
 "Para gerar uma malha oclusora adequada, selecione OccluderInstance3D e use o "
-"botão Bake Occluders na parte superior da janela de visualização do editor 3D."
+"botão Gerar Oclusores na parte superior do viewport do editor 3D."
 
 msgid ""
 "The polygon occluder has less than 3 vertices, so no occlusion culling will "
@@ -16949,20 +19090,20 @@ msgid ""
 "Vertices can be added in the inspector or using the polygon editing tools at "
 "the top of the 3D editor viewport."
 msgstr ""
-"O oclusor de polígono tem menos de 3 vértices, então nenhuma seleção de "
-"oclusão será realizada usando este OccluderInstance3D.\n"
-"Os vértices podem ser adicionados no inspetor ou usando as ferramentas de "
-"edição de polígonos na parte superior da janela do editor 3D."
+"A malha do oclusor tem menos de 3 vértices, então occlusion culling não será "
+"realizado usando este nó OccluderInstance3D.\n"
+"Vértices podem ser adicionados no inspetor ou usando as ferramentas de edição "
+"de polígonos na parte superior do viewport do editor 3D."
 
 msgid "PathFollow3D only works when set as a child of a Path3D node."
-msgstr "PathFollow3D só funciona quando definido como filho de um nó Path3D."
+msgstr "O PathFollow3D só funciona se seu pai for um nó Path3D."
 
 msgid ""
 "PathFollow3D's ROTATION_ORIENTED requires \"Up Vector\" to be enabled in its "
 "parent Path3D's Curve resource."
 msgstr ""
-"O ROTATION_ORIENTED do PathFollow3D requer que \"Up Vector\" seja ativado no "
-"recurso Curve do Path3D pai."
+"A propriedade ROTATION_ORIENTED do PathFollow3D requer que \"Up Vector\" seja "
+"ativado no recurso Curve do Path3D pai."
 
 msgid ""
 "This node has no shape, so it can't collide or interact with other objects.\n"
@@ -16982,7 +19123,7 @@ msgstr ""
 "Com uma escala não uniforme, este nó provavelmente não funcionará como "
 "esperado.\n"
 "Torne sua escala uniforme (ou seja, a mesma em todos os eixos) e, em vez "
-"disso, altere o tamanho nas formas de colisão dos filhos."
+"disso, altere o tamanho das formas de colisão dos filhos."
 
 msgid ""
 "CollisionPolygon3D only serves to provide a collision shape to a "
@@ -16990,7 +19131,7 @@ msgid ""
 "Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, "
 "CharacterBody3D, etc. to give them a shape."
 msgstr ""
-"CollisionPolygon3D serve apenas para fornecer uma forma de colisão para um nó "
+"CollisionPolygon3D serve apenas para definir uma forma de colisão para um nó "
 "derivado de CollisionObject3D.\n"
 "Use-o apenas como filho de Area3D, StaticBody3D, RigidBody3D, "
 "CharacterBody3D, etc... para dar-lhes uma forma."
@@ -17015,7 +19156,7 @@ msgid ""
 "Please only use it as a child of Area3D, StaticBody3D, RigidBody3D, "
 "CharacterBody3D, etc. to give them a shape."
 msgstr ""
-"CollisionShape3D apenas serve para fornecer a forma de colisão para um nó "
+"CollisionShape3D apenas serve para definir a forma de colisão para um nó "
 "derivado de CollisionObject3D.\n"
 "Por favor use-o apenas como filho de Area3D, StaticBody3D, RigidBody3D, "
 "CharacterBody3D, etc. para dá-los forma."
@@ -17034,8 +19175,8 @@ msgid ""
 "set to FREEZE_MODE_STATIC)."
 msgstr ""
 "Quando usado em colisões, ConcavePolygonShape3D foi feito para funcionar com "
-"nós estáticos CollisionObject3D como StaticBody3D.\n"
-"Ele provavelmente não funcionará bem com %ss (exceto quando congelado e o "
+"nós CollisionObject3D estáticos, como o StaticBody3D.\n"
+"Ele provavelmente não funcionará bem com %ss (exceto se estiver congelado e o "
 "freeze_mode foi definido como FREEZE_MODE_STATIC)."
 
 msgid ""
@@ -17050,7 +19191,7 @@ msgid ""
 "It will likely not behave well for CharacterBody3Ds."
 msgstr ""
 "Quando usado em colisões, ConcavePolygonShape3D foi feito para funcionar com "
-"nós estáticos CollisionObject3D como StaticBody3D.\n"
+"nós CollisionObject3D estáticos, como o StaticBody3D.\n"
 "Ele provavelmente não funcionará bem com CharacterBody3Ds."
 
 msgid ""
@@ -17074,19 +19215,19 @@ msgid "Node B must be a PhysicsBody3D"
 msgstr "O nó B deve ser um PhysicsBody3D"
 
 msgid "Joint is not connected to any PhysicsBody3Ds"
-msgstr "Junção não está conectado a nenhum PhysicsBody3Ds"
+msgstr "Articulação não está conectada a nenhum PhysicsBody3Ds"
 
 msgid "Node A and Node B must be different PhysicsBody3Ds"
-msgstr "Nó A e Nó B devem ser diferentes PhysicsBody3Ds"
+msgstr "Nó A e Nó B devem ser PhysicsBody3Ds diferentes"
 
 msgid ""
 "Scale changes to RigidBody3D will be overridden by the physics engine when "
 "running.\n"
 "Please change the size in children collision shapes instead."
 msgstr ""
-"As alterações de escala para RigidBody3D serão substituídas pelo engine de "
+"Alterações de escala em um RigidBody3D serão sobrescritas pela engine de "
 "física durante a execução.\n"
-"Em vez disso, altere o tamanho nas formas de colisão dos filhos."
+"Em vez disso, altere o tamanho das formas de colisão dos filhos."
 
 msgid ""
 "This node cannot interact with other objects unless a Shape3D is assigned."
@@ -17098,15 +19239,15 @@ msgid ""
 "ShapeCast3D does not support ConcavePolygonShape3Ds. Collisions will not be "
 "reported."
 msgstr ""
-"O nó ShapeCast3D não suporta nó ConcavePolygonShape3D. Colisões não serão "
+"O nó ShapeCast3D não suporta o nó ConcavePolygonShape3D. Colisões não serão "
 "relatadas."
 
 msgid ""
 "VehicleWheel3D serves to provide a wheel system to a VehicleBody3D. Please "
 "use it as a child of a VehicleBody3D."
 msgstr ""
-"VehicleWheel3D serve para fornecer um sistema de rodas para um VehicleBody3D. "
-"Use-o como filho de um VehicleBody3D."
+"O VehicleWheel3D serve para fornecer um sistema de rodas para um "
+"VehicleBody3D. Use-o como filho de um VehicleBody3D."
 
 msgid ""
 "The \"Remote Path\" property must point to a valid Node3D or Node3D-derived "
@@ -17115,9 +19256,27 @@ msgstr ""
 "A propriedade \"Caminho Remoto\" deve apontar para um Node3D válido ou nó "
 "derivado de Node3D para funcionar."
 
+msgid "There is no child Skeleton3D!"
+msgstr "Não há filhos Skeleton3D!"
+
+msgid "Skeleton3D node not set! SkeletonModifier3D must be child of Skeleton3D."
+msgstr ""
+"Nó Skeleton3D não definido! Um SkeletonModifier3D deve ser filho de um "
+"Skeleton3D."
+
 msgid "This body will be ignored until you set a mesh."
 msgstr "Este corpo será ignorado até você definir uma malha."
 
+msgid "Parent node should be a SpringBoneSimulator3D node."
+msgstr "Nó pai deve ser um nó SpringBoneSimulator3D."
+
+msgid ""
+"A SpriteFrames resource must be created or set in the \"Sprite Frames\" "
+"property in order for AnimatedSprite3D to display frames."
+msgstr ""
+"Um recurso SpriteFrames deve ser criado ou definido na propriedade \"Sprite "
+"Frames\" para que o nó AnimatedSprite3D mostre quadros."
+
 msgid ""
 "The GeometryInstance3D visibility range's End distance is set to a non-zero "
 "value, but is lower than the Begin distance.\n"
@@ -17125,9 +19284,9 @@ msgid ""
 "To resolve this, set the End distance to 0 or to a value greater than the "
 "Begin distance."
 msgstr ""
-"A distância final do intervalo de visibilidade GeometryInstance3D é definida "
-"como um valor diferente de zero, mas é menor que a distância inicial.\n"
-"Isso significa que GeometryInstance3D nunca ficará visível.\n"
+"A distância final do intervalo de visibilidade do GeometryInstance3D está "
+"definida como um valor diferente de zero, mas menor que a distância inicial.\n"
+"Isso significa que este GeometryInstance3D nunca ficará visível.\n"
 "Para resolver isso, defina a distância final como 0 ou um valor maior que a "
 "distância inicial."
 
@@ -17137,7 +19296,8 @@ msgid ""
 "To resolve this, increase Visibility Range Begin Margin above 0."
 msgstr ""
 "O GeometryInstance3D está configurado para desvanecer suavemente ao longo da "
-"distância, mas a distância de transição de esmaecimento é definida como 0.\n"
+"distância, mas a distância de transição de esmaecimento está definida como "
+"0.\n"
 "Para resolver isso, aumente a Margem Inicial do Alcance de Visibilidade acima "
 "de 0."
 
@@ -17147,11 +19307,25 @@ msgid ""
 "To resolve this, increase Visibility Range End Margin above 0."
 msgstr ""
 "O GeometryInstance3D está configurado para desaparecer gradualmente ao longo "
-"da distância, mas a distância de transição de esmaecimento é definida como "
+"da distância, mas a distância de transição de esmaecimento está definida como "
 "0.\n"
 "Para resolver isso, aumente a Margem Final do Alcance de Visibilidade acima "
 "de 0."
 
+msgid ""
+"GeometryInstance3D transparency is only available when using the Forward+ "
+"rendering method."
+msgstr ""
+"A transparência do GeometryInstance3D está disponível apenas no renderizador "
+"Avançado+."
+
+msgid ""
+"GeometryInstance3D visibility range transparency fade is only available when "
+"using the Forward+ rendering method."
+msgstr ""
+"Desvanecimento gradual de GeometryInstance3D está disponível apenas no "
+"renderizador Avançado+."
+
 msgid "Plotting Meshes"
 msgstr "Plotando Malhas"
 
@@ -17161,21 +19335,28 @@ msgstr "Gerando Campo de Distância"
 msgid "Finishing Plot"
 msgstr "Terminando de Plotar"
 
+msgid ""
+"VoxelGI nodes are not supported when using the Compatibility renderer yet. "
+"Support will be added in a future release."
+msgstr ""
+"Os nós VoxelGI ainda não são suportados no renderizador Compatibilidade. "
+"Suporte será adicionado em uma versão futura."
+
 msgid ""
 "No VoxelGI data set, so this node is disabled. Bake static objects to enable "
 "GI."
 msgstr ""
-"Nenhum conjunto de dados VoxelGI, então este nó está desabilitado. Crie "
-"objetos estáticos para habilitar o GI."
+"Não há dados de VoxelGI, então este nó está desabilitado. Gere objetos "
+"estáticos para habilitar o GI."
 
 msgid ""
 "To have any visible effect, WorldEnvironment requires its \"Environment\" "
 "property to contain an Environment, its \"Camera Attributes\" property to "
 "contain a CameraAttributes resource, or both."
 msgstr ""
-"Para ter qualquer efeito visível, WorldEnvironment requer que sua propriedade "
-"\"Environment\" contenha um Environment, sua propriedade \"Camera "
-"Attributes\" contenha um recurso CameraAttributes ou ambos."
+"Para ter qualquer efeito visível, o WorldEnvironment requer que sua "
+"propriedade \"Environment\" contenha um recurso Environment, sua propriedade "
+"\"Camera Attributes\" contenha um recurso CameraAttributes, ou ambos."
 
 msgid ""
 "Only one WorldEnvironment is allowed per scene (or set of instantiated "
@@ -17184,6 +19365,20 @@ msgstr ""
 "Apenas um WorldEnvironment é permitido por cena (ou conjunto de cenas "
 "instanciadas)."
 
+msgid ""
+"XRCamera3D may not function as expected without an XROrigin3D node as its "
+"parent."
+msgstr ""
+"O XRCamera3D pode não funcionar como esperado sem um nó XROrigin3D como seu "
+"pai."
+
+msgid ""
+"XRNode3D may not function as expected without an XROrigin3D node as its "
+"parent."
+msgstr ""
+"Um XRNode3D pode não funcionar como esperado sem um nó XROrigin3D como seu "
+"pai."
+
 msgid "No tracker name is set."
 msgstr "Nenhum nome de rastreador foi definido."
 
@@ -17193,8 +19388,17 @@ msgstr "Nenhuma pose foi definida."
 msgid "XROrigin3D requires an XRCamera3D child node."
 msgstr "XROrigin3D requer um nó filho XRCamera3D."
 
+msgid ""
+"XR shaders are not enabled in project settings. Stereoscopic output is not "
+"supported unless they are enabled. Please enable `xr/shaders/enabled` to use "
+"stereoscopic output."
+msgstr ""
+"Shaders XR não estão ativados nas configurações do projeto. Saída "
+"estereoscópica não é suportada a menos que eles estejam habilitados. Por "
+"favor, ative `xr/shaders/enabled` para usar a saída estereoscópica."
+
 msgid "On BlendTree node '%s', animation not found: '%s'"
-msgstr "No nó do BlendTree '%s', animação não encontrada: '%s'"
+msgstr "No nó BlendTree '%s', animação não encontrada: '%s'"
 
 msgid "Animation not found: '%s'"
 msgstr "Animação não encontrada: '%s'"
@@ -17206,7 +19410,7 @@ msgid "Nothing connected to input '%s' of node '%s'."
 msgstr "Nada está ligado à entrada '%s' do nó '%s'."
 
 msgid "No root AnimationNode for the graph is set."
-msgstr "Nenhuma raiz AnimationNode para o gráfico foi definida."
+msgstr "Nenhuma raiz AnimationNode para o grafo foi definida."
 
 msgid ""
 "ButtonGroup is intended to be used only with buttons that have toggle_mode "
@@ -17218,8 +19422,17 @@ msgstr ""
 msgid "Copy this constructor in a script."
 msgstr "Copiar este construtor em um script."
 
+msgid "Load Color Palette"
+msgstr "Carregar Paleta de Cores"
+
+msgid "Save Color Palette"
+msgstr "Salvar Paleta de Cores"
+
+msgid "Quick Load"
+msgstr "Carregamento Rápido"
+
 msgid "Switch between hexadecimal and code values."
-msgstr "Alterne entre valores hexadecimais e de código."
+msgstr "Alternar entre valores hexadecimais e de código."
 
 msgid ""
 "Container by itself serves no purpose unless a script configures its children "
@@ -17228,15 +19441,15 @@ msgid ""
 msgstr ""
 "O contêiner por si só não tem nenhum propósito, a menos que um script "
 "configure seu comportamento de posicionamento dos filhos.\n"
-"Se você não pretende adicionar um script, use um nó de Controle simples."
+"Se você não pretende adicionar um script, apenas use um nó Control."
 
 msgid ""
 "The Hint Tooltip won't be displayed as the control's Mouse Filter is set to "
 "\"Ignore\". To solve this, set the Mouse Filter to \"Stop\" or \"Pass\"."
 msgstr ""
-"A Sugestão de Dica não será exibida quando o Filtro do Mouse do controle "
-"estiver definido como \"Ignorar\". Para resolver isto, defina o Filtro do "
-"Mouse como \"Parar\" ou \"Passar\"."
+"A Dica de Ferramenta não será exibida se o Filtro do Mouse do Control estiver "
+"definido como \"Ignorar\". Para resolver isto, defina o Filtro do Mouse como "
+"\"Parar\" ou \"Passar\"."
 
 msgid ""
 "Please be aware that GraphEdit and GraphNode will undergo extensive "
@@ -17247,22 +19460,41 @@ msgstr ""
 "reformulação em uma futura versão 4.x envolvendo alterações de API de quebra "
 "de compatibilidade."
 
+msgid ""
+"Labels with autowrapping enabled must have a custom minimum size configured "
+"to work correctly inside a container."
+msgstr ""
+"Labels com a quebra de linha automática habilitada devem ter um tamanho "
+"mínimo personalizado definido para funcionar corretamente dentro de um "
+"contêiner."
+
 msgid ""
 "The current font does not support rendering one or more characters used in "
 "this Label's text."
 msgstr ""
 "A fonte atual não suporta a renderização de um ou mais caracteres usados no "
-"texto deste Rótulo."
+"texto desta Label."
+
+msgid ""
+"The current theme style has shadows and/or rounded corners for popups, but "
+"those won't display correctly if \"display/window/per_pixel_transparency/"
+"allowed\" isn't enabled in the Project Settings, nor if it isn't supported."
+msgstr ""
+"O atual estilo de tema tem sombra e/ou cantos arredondados para popups, mas "
+"não vai ser exibido corretamente se \"display/window/per_pixel_transparency/"
+"allowed\" não estiver habilitado em Configurações de Projeto, nem se caso não "
+"seja suportável."
 
 msgid "If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0."
-msgstr "Se \"Exp Edit\" estiver habilitado, \"Min Value\" deve ser maior que 0."
+msgstr ""
+"Se \"Exp Edit\" estiver habilitado, \"Valor Mínimo\" deve ser maior que 0."
 
 msgid ""
 "ScrollContainer is intended to work with a single child control.\n"
 "Use a container as child (VBox, HBox, etc.), or a Control and set the custom "
 "minimum size manually."
 msgstr ""
-"Um ScrollContainer foi feito para trabalhar com um único componente filho.\n"
+"O ScrollContainer foi feito para trabalhar com um único controle filho.\n"
 "Use um contêiner como filho (VBox, HBox, etc.) ou um Control e defina o "
 "tamanho mínimo personalizado manualmente."
 
@@ -17272,7 +19504,7 @@ msgid ""
 "Consider adding a SubViewport as a child to provide something displayable."
 msgstr ""
 "Este nó não possui um SubViewport como filho, portanto, não pode exibir seu "
-"conteúdo pretendido.\n"
+"conteúdo.\n"
 "Considere adicionar um SubViewport como filho para fornecer algo que possa "
 "ser exibido."
 
@@ -17280,15 +19512,23 @@ msgid ""
 "The default mouse cursor shape of SubViewportContainer has no effect.\n"
 "Consider leaving it at its initial value `CURSOR_ARROW`."
 msgstr ""
-"O formato do cursor do mouse de SubViewportContainer não tem efeito.\n"
+"O formato padrão do cursor do mouse em uma SubViewportContainer não tem "
+"efeito.\n"
 "Considere deixá-lo em seu valor inicial `CURSOR_ARROW`."
 
+msgid ""
+"This node was an instance of scene '%s', which was no longer available when "
+"this scene was loaded."
+msgstr ""
+"Este nó foi uma instância da cena '%s', que não estava mais disponível quando "
+"esta cena foi carregada."
+
 msgid ""
 "Saving current scene will discard instance and all its properties, including "
 "editable children edits (if existing)."
 msgstr ""
 "Salvar a cena atual descartará a instância e todas as suas propriedades, "
-"incluindo edições filhas editáveis (se existentes)."
+"incluindo edições de filhos editáveis (se houver)."
 
 msgid ""
 "This node was saved as class type '%s', which was no longer available when "
@@ -17315,7 +19555,7 @@ msgid ""
 "Please check the Godot documentation for information about migration."
 msgstr ""
 "Este nó está marcado como obsoleto e será removido em versões futuras.\n"
-"Verifique a documentação do Godot para obter informações sobre migração."
+"Verifique a documentação do Godot para saber como migrar."
 
 msgid ""
 "This node is marked as experimental and may be subject to removal or major "
@@ -17337,10 +19577,9 @@ msgid ""
 "Consider using a script's process loop instead of relying on a Timer for very "
 "low wait times."
 msgstr ""
-"Tempos de espera muito baixos (<0,05 segundos) podem se comportar de maneiras "
-"significativamente diferentes, dependendo da taxa de quadros renderizada ou "
-"de física.\n"
-"Considere o uso de um loop de processo em um script em vez de depender de um "
+"Tempos de espera muito baixos (<0,05 segundos) podem se comportar de maneira "
+"inusitada, dependendo da taxa de quadros de renderização ou de física.\n"
+"Considere usar um loop de processo em um script em vez de depender de um "
 "Timer para tempos de espera muito baixos."
 
 msgid ""
@@ -17355,7 +19594,7 @@ msgid ""
 "from a more nested instance).\n"
 "The less nested node will be renamed. Please fix and re-save the scene."
 msgstr ""
-"O nome de um nó entrante conflita com %s já na cena (presumivelmente, de uma "
+"O nome de um nó entrante conflita com %s já na cena (provavelmente de uma "
 "instância mais aninhada).\n"
 "O nó menos aninhado será renomeado. Corrija e salve novamente a cena."
 
@@ -17363,7 +19602,7 @@ msgid ""
 "Shader keywords cannot be used as parameter names.\n"
 "Choose another name."
 msgstr ""
-"As palavras-chave do shader não podem ser usadas como nomes de parâmetros.\n"
+"Palavras-chave de shaders não podem ser usadas como nomes de parâmetros.\n"
 "Escolha outro nome."
 
 msgid "This parameter type does not support the '%s' qualifier."
@@ -17387,7 +19626,7 @@ msgid ""
 "The sampler port is connected but not used. Consider changing the source to "
 "'SamplerPort'."
 msgstr ""
-"A porta do amostrador está conectada, mas não esta sendo usada. Considere "
+"A porta do sampler está conectada, mas não está sendo usada. Considere "
 "alterar a origem para 'SamplerPort'."
 
 msgid "Invalid source for preview."
@@ -17407,8 +19646,11 @@ msgstr ""
 "`gl_compatibility`.\n"
 "Revertido para a precisão `None`."
 
+msgid "'%s' type is incompatible with '%s' source."
+msgstr "O tipo '%s' é incompatível com a fonte '%s'."
+
 msgid "'%s' default color is incompatible with '%s' source."
-msgstr "A cor padrão de '%s' é incompatível com a fonte '%s'."
+msgstr "A cor padrão '%s' é incompatível com a fonte '%s'."
 
 msgid "Default Color"
 msgstr "Cor Padrão"
@@ -17428,6 +19670,12 @@ msgstr "Usar Todas as Superfícies"
 msgid "Surface Index"
 msgstr "Índice de Superfície"
 
+msgid "Division by zero error."
+msgstr "Erro de divisão por zero."
+
+msgid "Modulo by zero error."
+msgstr "Erro de resto por zero."
+
 msgid ""
 "Invalid number of arguments when calling stage function '%s', which expects "
 "%d arguments."
@@ -17445,7 +19693,7 @@ msgid "Expected integer constant within [%d..%d] range."
 msgstr "Constante inteira esperada dentro do intervalo [%d..%d]."
 
 msgid "Argument %d of function '%s' is not a variable, array, or member."
-msgstr "O argumento %d da função '%s' não é uma variável, matriz ou membro."
+msgstr "O argumento %d da função '%s' não é uma variável, array ou membro."
 
 msgid "Varyings cannot be passed for the '%s' parameter."
 msgstr "Varyings não podem ser passadas para o parâmetro '%s'."
@@ -17456,17 +19704,17 @@ msgstr "Um valor constante não pode ser passado para o parâmetro '%s'."
 msgid ""
 "Argument %d of function '%s' can only take a local variable, array, or member."
 msgstr ""
-"O argumento %d da função '%s' só pode receber uma variável local, matriz ou "
+"O argumento %d da função '%s' só pode receber uma variável local, array ou "
 "membro."
 
 msgid "Built-in function \"%s(%s)\" is only supported on high-end platforms."
-msgstr "A função integrada \"%s(%s)\" só é suportada em plataformas recentes."
+msgstr "A função integrada \"%s(%s)\" só é suportada em plataformas high-end."
 
 msgid "Invalid arguments for the built-in function: \"%s(%s)\"."
 msgstr "Argumentos inválidos para a função integrada: \"%s(%s)\"."
 
 msgid "Recursion is not allowed."
-msgstr "A recursão não é permitida."
+msgstr "Recursão não é permitida."
 
 msgid "Function '%s' can't be called from source code."
 msgstr "A função '%s' não pode ser chamada a partir do código-fonte."
@@ -17480,14 +19728,14 @@ msgstr ""
 msgid ""
 "Too few arguments for \"%s(%s)\" call. Expected at least %d but received %d."
 msgstr ""
-"Poucos argumentos para a chamada \"%s(%s)\". Esperado pelo menos %d, mas "
-"recebido %d."
+"Poucos argumentos para a chamada \"%s(%s)\". Esperava pelo menos %d, mas "
+"recebeu %d."
 
 msgid ""
 "Too many arguments for \"%s(%s)\" call. Expected at most %d but received %d."
 msgstr ""
-"Muitos argumentos para a chamada \"%s(%s)\". Esperado no máximo %d, mas "
-"recebido %d."
+"Muitos argumentos para a chamada \"%s(%s)\". Esperava no máximo %d, mas "
+"recebeu %d."
 
 msgid "Invalid assignment of '%s' to '%s'."
 msgstr "Atribuição inválida de '%s' para '%s'."
@@ -17498,56 +19746,91 @@ msgstr "Expressão constante esperada."
 msgid "Expected ',' or ')' after argument."
 msgstr "Esperado ',' ou ')' após o argumento."
 
+msgid "Varying may not be assigned in the '%s' function."
+msgstr "Varying não pode ser atribuída à função '%s'."
+
+msgid "Varying with '%s' data type may only be assigned in the '%s' function."
+msgstr "Varying com tipo de dados '%s' só pode ser atribuída à função '%s'."
+
+msgid ""
+"Varyings which assigned in '%s' function may not be reassigned in '%s' or "
+"'%s'."
+msgstr ""
+"Varyings atribuídas na função '%s' não podem ser reatribuídas em '%s' ou '%s'."
+
+msgid "'%s' cannot be used within the '%s' processor function."
+msgstr "'%s' não pode ser usado dentro da função de processamento '%s'."
+
 msgid ""
 "'%s' cannot be used here, because '%s' is called by the '%s' processor "
 "function (which is not allowed)."
 msgstr ""
-"'%s' não pode ser usado aqui, porque '%s' é chamado pela função processadora "
-"'%s' (o que não é permitido)."
+"'%s' não pode ser usado aqui, porque '%s' é chamado pela função de "
+"processamento '%s' (o que não é permitido)."
+
+msgid "Assignment to function."
+msgstr "Atribuição à função."
+
+msgid "Swizzling assignment contains duplicates."
+msgstr "A tarefa de swizzling contém duplicatas."
+
+msgid "Assignment to uniform."
+msgstr "Atribuição a um uniforme."
 
 msgid "Constants cannot be modified."
-msgstr "As constantes não podem ser modificadas."
+msgstr "Constantes não podem ser modificadas."
 
 msgid ""
 "Sampler argument %d of function '%s' called more than once using both built-"
 "ins and uniform textures, this is not supported (use either one or the other)."
 msgstr ""
-"Argumento de amostra %d da função '%s' chamado mais de uma vez usando "
+"Argumento de sampler %d da função '%s' chamado mais de uma vez usando "
 "texturas integradas e uniformes, isso não é suportado (use um ou outro)."
 
+msgid ""
+"Sampler argument %d of function '%s' called more than once using textures "
+"that differ in either filter, repeat, or texture hint setting."
+msgstr ""
+"Argumento de sampler %d da função '%s' chamado mais de uma vez usando "
+"texturas que diferem na configuração de filtro, repetição, ou inferência de "
+"textura."
+
 msgid ""
 "Sampler argument %d of function '%s' called more than once using different "
 "built-ins. Only calling with the same built-in is supported."
 msgstr ""
-"Argumento de amostra %d da função '%s' chamado mais de uma vez usando "
-"diferentes integrações. Apenas chamadas com a mesma integração são suportadas."
+"Argumento de sampler %d da função '%s' chamado mais de uma vez usando "
+"integradas diferentes. Apenas chamadas com a mesma integrada são suportadas."
 
 msgid "Array size is already defined."
-msgstr "O tamanho da matriz já foi definido."
+msgstr "O tamanho da array já foi definido."
 
 msgid "Unknown array size is forbidden in that context."
-msgstr "Tamanho de matriz desconhecido é proibido nesse contexto."
+msgstr "Tamanho de array desconhecido é proibido nesse contexto."
 
 msgid "Expected a positive integer constant."
-msgstr "Esperava-se uma constante de número inteiro positivo."
+msgstr "Esperava uma constante de número inteiro positivo."
 
 msgid "Invalid data type for the array."
-msgstr "Tipo de dados inválido para a matriz."
+msgstr "Tipo de dados inválido para a array."
+
+msgid "Array size mismatch. Expected %d elements (found %d)."
+msgstr "Diferença no tamanho da array. Esperava %d elementos (encontrou %d)."
 
 msgid "Expected array initialization."
-msgstr "Inicialização esperada da matriz."
+msgstr "Inicialização de array esperada."
 
 msgid "Cannot convert from '%s' to '%s'."
 msgstr "Não é possível converter de '%s' para '%s'."
 
 msgid "Expected ')' in expression."
-msgstr "Esperado ')' na expressão."
+msgstr "Esperava ')' na expressão."
 
 msgid "Void value not allowed in expression."
-msgstr "Valor nulo não permitido na expressão."
+msgstr "Valor void não permitido na expressão."
 
 msgid "Expected '(' after the type name."
-msgstr "Esperado '(' após o nome do tipo."
+msgstr "Esperava '(' após o nome do tipo."
 
 msgid "No matching constructor found for: '%s'."
 msgstr "Nenhum construtor correspondente encontrado para: '%s'."
@@ -17555,6 +19838,9 @@ msgstr "Nenhum construtor correspondente encontrado para: '%s'."
 msgid "Expected a function name."
 msgstr "Esperava um nome de função."
 
+msgid "Built-in function '%s' is not supported for the '%s' shader type."
+msgstr "A função embutida '%s' não é suportada para o tipo de shader '%s'."
+
 msgid "No matching function found for: '%s'."
 msgstr "Nenhuma função correspondente encontrada para: '%s'."
 
@@ -17566,9 +19852,9 @@ msgid ""
 "Consider to sample it in the main function and then pass the vector result to "
 "it."
 msgstr ""
-"Não é possível passar um amostrador de textura multiview como um parâmetro "
-"para a função personalizada. Considere fazer uma amostra na função principal "
-"e depois passar o resultado do vetor para ela."
+"Não é possível passar um sampler de textura multiview como parâmetro para uma "
+"função personalizada. Considere fazer uma amostra na função principal e "
+"depois passar o resultado do vetor para ela."
 
 msgid "Unknown identifier in expression: '%s'."
 msgstr "Identificador desconhecido na expressão: '%s'."
@@ -17583,7 +19869,13 @@ msgstr ""
 "%s : hint_%s, filter_linear_mipmap;' perto do topo do seu shader."
 
 msgid "Can't use function as identifier: '%s'."
-msgstr "Não é possível usar a função como identificador: '%s'."
+msgstr "Não é possível usar função como identificador: '%s'."
+
+msgid "Varying with '%s' data type may only be used in the '%s' function."
+msgstr "Varying do tipo de dados '%s' só pode ser usada na função '%s'."
+
+msgid "Varying '%s' must be assigned in the '%s' function first."
+msgstr "Varying '%s' deve ser atribuída primeiro na função '%s'."
 
 msgid "Only integer expressions are allowed for indexing."
 msgstr "Somente expressões inteiras são permitidas para indexação."
@@ -17592,13 +19884,13 @@ msgid "Index [%d] out of range [%d..%d]."
 msgstr "Índice [%d] fora do intervalo [%d..%d]."
 
 msgid "Expected expression, found: '%s'."
-msgstr "Expressão esperada, encontrada: '%s'."
+msgstr "Expressão esperada, encontrou: '%s'."
 
 msgid "Empty statement. Remove ';' to fix this warning."
 msgstr "Declaração vazia. Remova ';' para corrigir este aviso."
 
 msgid "Expected an identifier as a member."
-msgstr "Esperava-se um identificador como membro."
+msgstr "Esperava um identificador como membro."
 
 msgid "Cannot combine symbols from different sets in expression '.%s'."
 msgstr ""
@@ -17635,60 +19927,72 @@ msgid "A switch may only contain '%s' and '%s' blocks."
 msgstr "Um switch só pode conter blocos '%s' e '%s'."
 
 msgid "Expected variable type after precision modifier."
-msgstr "Tipo de variável esperado após o modificador de precisão."
+msgstr "Esperava tipo de variável após o modificador de precisão."
 
 msgid "Invalid variable type (samplers are not allowed)."
-msgstr "Tipo de variável inválido (amostradores não são permitidos)."
+msgstr "Tipo de variável inválido (samplers não são permitidos)."
 
 msgid "Expected an identifier or '[' after type."
-msgstr "Esperava-se um identificador ou '[' após o tipo."
+msgstr "Esperava um identificador ou '[' após o tipo."
 
 msgid "Expected an identifier."
-msgstr "Esperado um identificador."
+msgstr "Esperava um identificador."
 
 msgid "Expected array initializer."
-msgstr "Inicializador de matriz esperado."
+msgstr "Esperava um inicializador de array."
 
 msgid "Expected data type after precision modifier."
-msgstr "Tipo de dados esperado após o modificador de precisão."
+msgstr "Esperava tipo de dados após o modificador de precisão."
 
 msgid "Expected a constant expression."
-msgstr "Esperado uma expressão constante."
+msgstr "Esperava uma expressão constante."
 
 msgid "Expected initialization of constant."
-msgstr "Inicialização esperada da constante."
+msgstr "Esperava inicialização da constante."
 
 msgid "Expected constant expression for argument %d of function call after '='."
 msgstr ""
-"Expressão constante esperada para o argumento %d da chamada de função após "
+"Esperava expressão constante para o argumento %d da chamada de função após "
 "'='."
 
 msgid "Expected a boolean expression."
-msgstr "Esperado uma expressão booleana."
+msgstr "Esperava uma expressão booleana."
+
+msgid "Expected an integer or unsigned integer expression."
+msgstr "Esperava uma expressão de número inteiro ou inteiro sem sinal."
 
 msgid "Cases must be defined before default case."
-msgstr "Os casos devem ser definidos antes do caso padrão."
+msgstr "Casos devem ser definidos antes do caso padrão."
 
 msgid "Default case must be defined only once."
-msgstr "O caso padrão deve ser definido apenas uma vez."
+msgstr "Caso padrão deve ser definido apenas uma vez."
 
 msgid "'%s' must be placed within a '%s' block."
 msgstr "'%s' deve ser colocado dentro de um bloco '%s'."
 
+msgid "Expected an unsigned integer constant."
+msgstr "Esperava uma constante de número inteiro sem sinal."
+
 msgid "Expected an integer constant."
-msgstr "Esperado uma constante inteira."
+msgstr "Esperava uma constante de número inteiro."
 
 msgid "Duplicated case label: %d."
 msgstr "Rótulo de caso duplicado: %d."
 
 msgid "Using '%s' in the '%s' processor function is incorrect."
-msgstr "O uso de '%s' na função do processador '%s' está incorreto."
+msgstr "O uso de '%s' na função de processamento '%s' está incorreto."
 
 msgid "Expected '%s' with an expression of type '%s'."
-msgstr "Esperado '%s' com uma expressão do tipo '%s'."
+msgstr "Esperadva '%s' com uma expressão do tipo '%s'."
+
+msgid "'%s' function cannot return a value."
+msgstr "Função '%s' não pode retornar um valor."
 
 msgid "Expected return with an expression of type '%s'."
-msgstr "Retorno esperado com uma expressão do tipo '%s'."
+msgstr "Esperava retorno com uma expressão do tipo '%s'."
+
+msgid "Use of '%s' is not supported for the '%s' shader type."
+msgstr "A função embutida '%s' não é suportada no tipo de shader '%s'."
 
 msgid "'%s' is not allowed outside of a loop or '%s' statement."
 msgstr "'%s' não é permitido fora de um loop ou instrução '%s'."
@@ -17696,30 +20000,33 @@ msgstr "'%s' não é permitido fora de um loop ou instrução '%s'."
 msgid "'%s' is not allowed outside of a loop."
 msgstr "'%s' não é permitido fora de um loop."
 
+msgid "The middle expression is expected to have a boolean data type."
+msgstr "Esperava que a expressão do meio fosse um operador booleano."
+
 msgid "The left expression is expected to be a variable declaration."
-msgstr "Espera-se que a expressão da esquerda seja uma declaração de variável."
+msgstr "Esperava que a expressão da esquerda fosse uma declaração de variável."
 
 msgid "The precision modifier cannot be used on structs."
-msgstr "O modificador de precisão não pode ser usado em structs."
+msgstr "Modificador de precisão não pode ser usado em structs."
 
 msgid "The precision modifier cannot be used on boolean types."
-msgstr "O modificador de precisão não pode ser usado em tipos booleanos."
+msgstr "Modificador de precisão não pode ser usado em tipos booleanos."
 
 msgid "Expected '%s' at the beginning of shader. Valid types are: %s."
-msgstr "Esperado '%s' no início do shader. Os tipos válidos são: %s."
+msgstr "Esperava '%s' no início do shader. Os tipos válidos são: %s."
 
 msgid ""
 "Expected an identifier after '%s', indicating the type of shader. Valid types "
 "are: %s."
 msgstr ""
-"Esperado um identificador após '%s', indicando o tipo de shader. Os tipos "
+"Esperava um identificador após '%s', indicando o tipo de shader. Os tipos "
 "válidos são: %s."
 
 msgid "Invalid shader type. Valid types are: %s"
 msgstr "Tipo de shader inválido. Os tipos válidos são: %s"
 
 msgid "Expected an identifier for render mode."
-msgstr "Esperava-se um identificador para o modo de renderização."
+msgstr "Esperava um identificador para o modo de renderização."
 
 msgid "Duplicated render mode: '%s'."
 msgstr "Modo de renderização duplicado: '%s'."
@@ -17737,19 +20044,19 @@ msgid "Unexpected token: '%s'."
 msgstr "Token inesperado: '%s'."
 
 msgid "Expected a struct identifier."
-msgstr "Esperava-se um identificador de struct."
+msgstr "Esperava um identificador de struct."
 
 msgid "Nested structs are not allowed."
 msgstr "Estruturas aninhadas não são permitidas."
 
 msgid "Expected data type."
-msgstr "Esperado tipo dados."
+msgstr "Esperava tipo de dados."
 
 msgid "A '%s' data type is not allowed here."
 msgstr "Um tipo de dados '%s' não é permitido aqui."
 
 msgid "Expected an identifier or '['."
-msgstr "Esperava-se um identificador ou '['."
+msgstr "Esperava um identificador ou '['."
 
 msgid "Empty structs are not allowed."
 msgstr "Estruturas vazias não são permitidas."
@@ -17761,69 +20068,84 @@ msgid "Varyings cannot be used in '%s' shaders."
 msgstr "Varyings não podem ser usadas em shaders '%s'."
 
 msgid "Interpolation qualifiers are not supported for uniforms."
-msgstr "Os qualificadores de interpolação não são suportados para uniformes."
+msgstr "Qualificadores de interpolação não são suportados para uniformes."
 
 msgid "The '%s' data type is not supported for uniforms."
-msgstr "O tipo de dados '%s' não é suportado para uniformes."
+msgstr "Tipo de dados '%s' não é suportado para uniformes."
 
 msgid "The '%s' data type is not allowed here."
-msgstr "O tipo de dados '%s' não é permitido aqui."
+msgstr "Tipo de dados '%s' não é permitido aqui."
 
 msgid "Interpolation modifier '%s' cannot be used with boolean types."
 msgstr ""
-"O modificador de interpolação '%s' não pode ser usado com tipos booleanos."
+"Modificador de interpolação '%s' não pode ser usado com tipos booleanos."
 
 msgid "Invalid data type for varying."
 msgstr "Tipo de dados inválido para varying."
 
 msgid "Global uniform '%s' does not exist. Create it in Project Settings."
-msgstr "O uniforme global '%s' não existe. Crie-o em Configurações do Projeto."
+msgstr "Uniforme global '%s' não existe. Crie-o nas Configurações do Projeto."
 
 msgid "Global uniform '%s' must be of type '%s'."
-msgstr "O uniforme global '%s' deve ser do tipo '%s'."
+msgstr "Uniforme global '%s' deve ser do tipo '%s'."
 
 msgid "The '%s' qualifier is not supported for sampler types."
-msgstr "O qualificador '%s' não é compatível com tipos de amostrador."
+msgstr "Qualificador '%s' não é compatível com tipos de sampler."
 
 msgid "The '%s' qualifier is not supported for matrix types."
-msgstr "O qualificador '%s' não é suportado para tipos de matriz."
+msgstr "Qualificador '%s' não é suportado para tipos de array."
 
 msgid "The '%s' qualifier is not supported for uniform arrays."
-msgstr "O qualificador '%s' não é suportado para matrizes uniformes."
+msgstr "Qualificador '%s' não é suportado para arrays uniformes."
 
 msgid "Expected valid type hint after ':'."
-msgstr "Esperado tipo válido de inferência após ':'."
+msgstr "Esperava inferência de tipo válida após ':'."
 
 msgid "This hint is not supported for uniform arrays."
-msgstr "Esta inferência não é compatível com matrizes uniformes."
+msgstr "Esta inferência não é compatível com arrays uniformes."
 
 msgid "Source color hint is for '%s', '%s' or sampler types only."
 msgstr ""
-"A inferência da cor de origem é apenas para '%s', '%s' ou tipos de amostra."
+"Inferência de cor de origem é apenas para '%s', '%s' ou tipos de sampler."
 
 msgid "Duplicated hint: '%s'."
 msgstr "Inferência duplicada: '%s'."
 
 msgid "Range hint is for '%s' and '%s' only."
-msgstr "O intervalo de inferência é apenas para '%s' e '%s'."
+msgstr "Intervalo de inferência é apenas para '%s' e '%s'."
 
 msgid "Expected ',' after integer constant."
-msgstr "Esperado ',' após a constante inteira."
+msgstr "Esperava ',' após constante de número inteiro."
 
 msgid "Expected an integer constant after ','."
-msgstr "Esperado uma constante inteira após ','."
+msgstr "Esperava uma constante de número inteiro após ','."
+
+msgid "Enum hint is for '%s' only."
+msgstr "Inferência de Enum é apenas para '%s'."
+
+msgid "Expected a string constant."
+msgstr "Esperava uma constante de string."
+
+msgid "Expected ',' or ')' after string constant."
+msgstr "Esperava ',' ou ')' após uma constante de string."
 
 msgid "Can only specify '%s' once."
 msgstr "Só pode especificar '%s' uma vez."
 
 msgid "The instance index can't be negative."
-msgstr "O índice da instância não pode ser negativo."
+msgstr "Índice da instância não pode ser negativo."
 
 msgid "Allowed instance uniform indices must be within [0..%d] range."
 msgstr ""
 "Índices uniformes de instância permitidos devem estar dentro do intervalo [0.."
 "%d]."
 
+msgid ""
+"'hint_normal_roughness_texture' is only available when using the Forward+ "
+"renderer."
+msgstr ""
+"'hint_normal_roughness_texture' só está disponível no renderizador Avançado+."
+
 msgid "'hint_normal_roughness_texture' is not supported in '%s' shaders."
 msgstr "'hint_normal_roughness_texture' não é suportado em shaders '%s'."
 
@@ -17831,7 +20153,7 @@ msgid "'hint_depth_texture' is not supported in '%s' shaders."
 msgstr "'hint_normal_roughness_texture' não é suportado em shaders '%s'."
 
 msgid "This hint is only for sampler types."
-msgstr "Esta inferência é apenas para tipos de amostrador."
+msgstr "Esta inferência é apenas para tipos de sampler."
 
 msgid "Redefinition of hint: '%s'. The hint has already been set to '%s'."
 msgstr ""
@@ -17861,7 +20183,7 @@ msgid "Too many '%s' uniforms in shader, maximum supported is %d."
 msgstr "Muitos uniformes '%s' no shader, o máximo suportado é %d."
 
 msgid "Setting default values to uniform arrays is not supported."
-msgstr "Não há suporte para definir valores padrão para matrizes uniformes."
+msgstr "Não há suporte para definir valores padrão para arrays uniformes."
 
 msgid "Expected constant expression after '='."
 msgstr "Expressão constante esperada após '='."
@@ -17870,87 +20192,100 @@ msgid "Can't convert constant to '%s'."
 msgstr "Não é possível converter constante para '%s'."
 
 msgid "Expected an uniform subgroup identifier."
-msgstr "Esperava-se um identificador de subgrupo uniforme."
+msgstr "Esperava um identificador de subgrupo uniforme."
 
 msgid "Expected an uniform group identifier."
-msgstr "Esperava-se um identificador de grupo uniforme."
+msgstr "Esperava um identificador de grupo uniforme."
 
 msgid "Expected an uniform group identifier or `;`."
-msgstr "Esperado um identificador de grupo uniforme ou `;`."
+msgstr "Esperava um identificador de grupo uniforme ou `;`."
 
 msgid "Group needs to be opened before."
-msgstr "O grupo precisa ser aberto antes."
+msgstr "Grupo precisa ser aberto antes."
 
 msgid "Shader type is already defined."
-msgstr "O tipo de shader já está definido."
+msgstr "Tipo de shader já está definido."
 
 msgid "Expected constant, function, uniform or varying."
-msgstr "Esperado uma constante, função, uniforme ou varying."
+msgstr "Esperava uma constante, função, uniforme ou varying."
 
 msgid "Invalid constant type (samplers are not allowed)."
-msgstr "Tipo de constante inválido (amostradores não são permitidos)."
+msgstr "Tipo de constante inválido (samplers não são permitidos)."
 
 msgid "Invalid function type (samplers are not allowed)."
-msgstr "Tipo de função inválido (amostradores não são permitidos)."
+msgstr "Tipo de função inválido (samplers não são permitidos)."
 
 msgid "Expected a function name after type."
-msgstr "Esperava-se um nome de função após o tipo."
+msgstr "Esperava um nome de função após o tipo."
 
 msgid "Expected '(' after function identifier."
-msgstr "Esperado '(' após o identificador da função."
+msgstr "Esperava '(' após o identificador da função."
 
 msgid ""
 "Global non-constant variables are not supported. Expected '%s' keyword before "
 "constant definition."
 msgstr ""
-"Variáveis não constantes globais não são suportadas. Palavra-chave '%s' "
+"Variáveis não-constantes globais não são suportadas. Palavra-chave '%s' "
 "esperada antes da definição da constante."
 
 msgid "Expected an identifier after type."
-msgstr "Esperava-se um identificador após o tipo."
+msgstr "Esperava um identificador após o tipo."
+
+msgid "'%s' qualifier cannot be used with a function return type."
+msgstr "Qualificador '%s' não pode ser usado com um tipo de retorno de função."
 
 msgid ""
 "The '%s' qualifier cannot be used within a function parameter declared with "
 "'%s'."
 msgstr ""
-"O qualificador '%s' não pode ser usado em um parâmetro de função declarado "
-"com '%s'."
+"Qualificador '%s' não pode ser usado em um parâmetro de função declarado com "
+"'%s'."
 
 msgid "Expected a valid data type for argument."
-msgstr "Esperava-se um tipo de dados válido para o argumento."
+msgstr "Esperava um tipo de dados válido para o argumento."
 
 msgid "Opaque types cannot be output parameters."
 msgstr "Tipos opacos não podem ser parâmetros de saída."
 
 msgid "Void type not allowed as argument."
-msgstr "Tipo vazio não permitido como argumento."
+msgstr "Tipo void não permitido como argumento."
 
 msgid "Expected an identifier for argument name."
-msgstr "Esperava-se um identificador para o nome do argumento."
+msgstr "Esperava um identificador para o nome do argumento."
 
 msgid "Function '%s' expects no arguments."
-msgstr "A função '%s' não espera argumentos."
+msgstr "Função '%s' não espera argumentos."
 
 msgid "Function '%s' must be of '%s' return type."
-msgstr "A função '%s' deve ser do tipo de retorno '%s'."
+msgstr "Função '%s' deve retornar tipo '%s'."
 
 msgid "Expected a '{' to begin function."
-msgstr "Espera-se um '{' para iniciar a função."
+msgstr "Esperava um '{' para iniciar a função."
 
 msgid "Expected at least one '%s' statement in a non-void function."
-msgstr "Espera-se pelo menos uma instrução '%s' em uma função não nula."
+msgstr "Esperava pelo menos uma instrução '%s' em uma função não-void."
+
+msgid ""
+"Varying with integer data type must be declared with `%s` interpolation "
+"qualifier."
+msgstr ""
+"Varying com o tipo de dados inteiro deve ser declarada com o qualificador de "
+"interpolação `%s`."
+
+msgid "Too many varyings used in shader (%d used, maximum supported is %d)."
+msgstr "Muitas varyings usadas no shader (%d usadas, máximo suportado é %d)."
 
 msgid "uniform buffer"
 msgstr "buffer uniforme"
 
 msgid "Expected a '%s'."
-msgstr "Esperado um '%s'."
+msgstr "Esperava um '%s'."
 
 msgid "Expected a '%s' or '%s'."
-msgstr "Esperado um '%s' ou '%s'."
+msgstr "Esperava um '%s' ou '%s'."
 
 msgid "Expected a '%s' after '%s'."
-msgstr "Esperado um '%s' após '%s'."
+msgstr "Esperava um '%s' após '%s'."
 
 msgid "Redefinition of '%s'."
 msgstr "Redefinição de '%s'."
@@ -17962,13 +20297,13 @@ msgid "Invalid macro name."
 msgstr "Nome de macro inválido."
 
 msgid "Macro redefinition."
-msgstr "Redefinição de macros."
+msgstr "Redefinição de macro."
 
 msgid "Invalid argument name."
 msgstr "Nome de argumento inválido."
 
 msgid "Expected a comma in the macro argument list."
-msgstr "Esperava-se uma vírgula na lista de argumentos da macro."
+msgstr "Esperava uma vírgula na lista de argumentos da macro."
 
 msgid "'##' must not appear at beginning of macro expansion."
 msgstr "'##' não pode aparecer no início de expansão macro."
@@ -17976,30 +20311,39 @@ msgstr "'##' não pode aparecer no início de expansão macro."
 msgid "'##' must not appear at end of macro expansion."
 msgstr "'##' não pode aparecer no final de expansão macro."
 
+msgid "Unmatched '%s' directive."
+msgstr "Diretiva '%s' sem correspondência."
+
 msgid "Missing condition."
 msgstr "Condição ausente."
 
 msgid "Condition evaluation error."
 msgstr "Erro de avaliação de condição."
 
+msgid "Invalid '%s' directive."
+msgstr "Diretiva '%s' inválida."
+
 msgid "Shader include file does not exist:"
-msgstr "O arquivo de inclusão de shader não existe:"
+msgstr "Arquivo include de shader não existe:"
 
 msgid ""
 "Shader include load failed. Does the shader include exist? Is there a cyclic "
 "dependency?"
 msgstr ""
-"Falha na inclusão do shader. O shader incluído existe? Existe uma dependência "
-"cíclica?"
+"Falha no carregamento de include do shader. O include existe? Há uma "
+"dependência cíclica?"
 
 msgid "Shader include resource type is wrong."
-msgstr "O tipo de recurso de inclusão do shader está incorreto."
+msgstr "O tipo de recurso do include de shader está incorreto."
 
 msgid "Cyclic include found"
 msgstr "Inclusão cíclica encontrada"
 
 msgid "Shader max include depth exceeded."
-msgstr "Shader max inclui profundidade excedida."
+msgstr "Profundidade máxima de includes de shader excedida."
+
+msgid "Cannot use '%s' on built-in define."
+msgstr "Não se pode usar '%s' em um define integrado."
 
 msgid "Macro expansion limit exceeded."
 msgstr "Limite de expansão de macro excedido."
@@ -18020,16 +20364,16 @@ msgid "Invalid symbols placed before directive."
 msgstr "Símbolos inválidos colocados antes da diretiva."
 
 msgid "Unmatched conditional statement."
-msgstr "Instrução condicional incomparável."
+msgstr "Instrução condicional sem correspondência."
 
 msgid ""
 "Direct floating-point comparison (this may not evaluate to `true` as you "
 "expect). Instead, use `abs(a - b) < 0.0001` for an approximate but "
 "predictable comparison."
 msgstr ""
-"Comparação direta de ponto flutuante (isso pode não ser avaliado como `true` "
-"como você espera). Em vez disso, use `abs(a - b) < 0.0001` para uma "
-"comparação aproximada, mas previsível."
+"Comparação direta de float (isso pode não ser avaliado como `true` como você "
+"espera). Em vez disso, use `abs(a - b) < 0.0001` para uma comparação "
+"aproximada, mas previsível."
 
 msgid "The const '%s' is declared but never used."
 msgstr "A constante '%s' foi declarada, mas nunca usada."
@@ -18064,7 +20408,7 @@ msgid ""
 "xy, 1.0, 1.0)`."
 msgstr ""
 "Você está tentando atribuir a posição do VÉRTICE no espaço de modelo à "
-"POSIÇÃO do vértice no espaço de clipe. A definição do espaço de clipe mudou "
-"na versão 4.3, então se esse código foi escrito antes da 4.3, ele não "
+"POSIÇÃO do vértice no espaço de clipping. A definição do espaço de clipping "
+"mudou na versão 4.3, então se esse código foi escrito antes da 4.3, ele não "
 "continuará funcionando. Considere especificar o componente z do espaço do "
-"clipe diretamente (use `vec4(VERTEX.xy, 1.0, 1.0)`)."
+"clipping diretamente (use `vec4(VERTEX.xy, 1.0, 1.0)`)."
diff --git a/engine/editor/translations/editor/ro.po b/engine/editor/translations/editor/ro.po
index 2082c4e6..b98b3f0f 100644
--- a/engine/editor/translations/editor/ro.po
+++ b/engine/editor/translations/editor/ro.po
@@ -34,13 +34,14 @@
 # Douper <besinauda@gmail.com>, 2025.
 # Cheesymoon Brainstorms <alexsergiuhd@gmail.com>, 2025.
 # GREEN MONSTER <racovitavvalentin@gmail.com>, 2025.
+# Alin Gheorghe <yovngra@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-17 23:01+0000\n"
-"Last-Translator: GREEN MONSTER <racovitavvalentin@gmail.com>\n"
+"PO-Revision-Date: 2025-03-04 16:11+0000\n"
+"Last-Translator: Alin Gheorghe <yovngra@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ro/>\n"
 "Language: ro\n"
@@ -49,7 +50,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Main Thread"
 msgstr "Fir principal"
@@ -111,6 +112,9 @@ msgstr "Joystick Dreapta axa Y, Joystick 1 axa Y"
 msgid "Joystick 2 X-Axis, Left Trigger, Sony L2, Xbox LT"
 msgstr "Joystick 2 axa X, declanșare stânga, Sony L2, Xbox LT"
 
+msgid "Joystick 2 Y-Axis, Right Trigger, Sony R2, Xbox RT"
+msgstr "Joystick 2 Axa Y, Trigger dreapta, Sony R2, Xbox RT"
+
 msgid "Joystick 3 X-Axis"
 msgstr "Joystick 3 axa X"
 
diff --git a/engine/editor/translations/editor/ru.po b/engine/editor/translations/editor/ru.po
index ce7f86eb..13853198 100644
--- a/engine/editor/translations/editor/ru.po
+++ b/engine/editor/translations/editor/ru.po
@@ -208,13 +208,15 @@
 # JekSun97 <jeksun2022@gmail.com>, 2025.
 # sqwirex <nikolaev.alex.080706@mail.ru>, 2025.
 # Account Rush Royale#1 <ghhh5238unq1@gmail.com>, 2025.
+# Igor Shapilov <shatiger@yandex.ru>, 2025.
+# Deniil <danpko@ya.ru>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-03-02 19:03+0000\n"
-"Last-Translator: Account Rush Royale#1 <ghhh5238unq1@gmail.com>\n"
+"PO-Revision-Date: 2025-03-14 15:16+0000\n"
+"Last-Translator: Deniil <danpko@ya.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/ru/>\n"
 "Language: ru\n"
@@ -223,7 +225,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Главный поток"
@@ -268,7 +270,7 @@ msgid "Double Click"
 msgstr "Двойной щелчок"
 
 msgid "Mouse motion at position (%s) with velocity (%s)"
-msgstr "Перемещение мыши в нужном положении (%s) со скоростью (%s)"
+msgstr "Движение мыши в позиции (%s) со скоростью (%s)"
 
 msgid "Left Stick X-Axis, Joystick 0 X-Axis"
 msgstr "Левый стик по оси X, джойстик 0 по оси X"
@@ -413,10 +415,10 @@ msgid "Cancel"
 msgstr "Отмена"
 
 msgid "Focus Next"
-msgstr "Фокус на следующем элементе"
+msgstr "Фокус на следующем"
 
 msgid "Focus Prev"
-msgstr "Фокус на предыдущем элементе"
+msgstr "Фокус на предыдущем"
 
 msgid "Left"
 msgstr "Влево"
@@ -431,16 +433,16 @@ msgid "Down"
 msgstr "Вниз"
 
 msgid "Page Up"
-msgstr "На страницу вверх"
+msgstr "Page Up"
 
 msgid "Page Down"
-msgstr "На страницу вниз"
+msgstr "Page Down"
 
 msgid "Home"
-msgstr "Домой"
+msgstr "Home"
 
 msgid "End"
-msgstr "Конец"
+msgstr "End"
 
 msgid "Cut"
 msgstr "Вырезать"
@@ -1020,13 +1022,13 @@ msgid "Insert Key..."
 msgstr "Вставить ключ…"
 
 msgid "Duplicate Key(s)"
-msgstr "Дублировать ключи"
+msgstr "Дублировать ключ(и)"
 
 msgid "Cut Key(s)"
-msgstr "Вырезать ключи"
+msgstr "Вырезать ключ(и)"
 
 msgid "Copy Key(s)"
-msgstr "Копировать ключи"
+msgstr "Копировать ключ(и)"
 
 msgid "Add RESET Value(s)"
 msgstr "Добавить RESET-значение(я)"
@@ -1050,8 +1052,8 @@ msgid ""
 "Compressed tracks can't be edited or removed. Re-import the animation with "
 "compression disabled in order to edit."
 msgstr ""
-"Сжатые дорожки не могут быть удалены/изменены. Для редактирования анимации "
-"нужно переимпортировать её с выключенным сжатием."
+"Сжатые треки нельзя редактировать или удалять. Для редактирования повторно "
+"импортируйте анимацию с отключенным сжатием."
 
 msgid "Remove Anim Track"
 msgstr "Удалить дорожку анимации"
@@ -1085,6 +1087,9 @@ msgstr "AnimationPlayer не может анимировать сам себя,
 msgid "property '%s'"
 msgstr "свойство «%s»"
 
+msgid "Nearest FPS: %d"
+msgstr "Ближайший FPS: %d"
+
 msgid "Change Animation Step"
 msgstr "Изменить шаг анимации"
 
@@ -1140,7 +1145,7 @@ msgid "Method not found in object:"
 msgstr "В объекте нет такого метода:"
 
 msgid "Animation Move Keys"
-msgstr "Переместить ключи анимации"
+msgstr "Анимация Перемещение Ключей"
 
 msgid "Position"
 msgstr "Позиция"
@@ -1149,7 +1154,7 @@ msgid "Rotation"
 msgstr "Поворот"
 
 msgid "Scale"
-msgstr "Масштабировать"
+msgstr "Масштаб"
 
 msgid "BlendShape"
 msgstr "Форма смешивания"
@@ -1547,6 +1552,9 @@ msgstr "Редактировать цвет Маркера"
 msgid "Multi Edit Marker Color"
 msgstr "Цвет маркера для мультиредактирования"
 
+msgid "Animation Change Marker Time"
+msgstr "Изменить время Маркера"
+
 msgid "Add Audio Track Clip"
 msgstr "Добавить звуковую дорожку"
 
@@ -1725,6 +1733,9 @@ msgstr "Отключить аргументы сигнала:"
 msgid "Receiver Method:"
 msgstr "Метод-приёмник:"
 
+msgid "Pick"
+msgstr "Выбрать"
+
 msgid "Advanced"
 msgstr "Дополнительно"
 
@@ -4802,6 +4813,9 @@ msgstr "Новый шейдер…"
 msgid "No Remote Deploy export presets configured."
 msgstr "Нет предустановок экспорта для удалённой отладки."
 
+msgid "Remote Deploy"
+msgstr "Удалённое развёртывание"
+
 msgid ""
 "No runnable export preset found for this platform.\n"
 "Please add a runnable preset in the Export menu or define an existing preset "
@@ -5374,6 +5388,12 @@ msgstr "Установить из файла"
 msgid "Install templates from a local file."
 msgstr "Установить шаблоны из локального файла."
 
+msgid "Online mode is needed to download the templates."
+msgstr "Для загрузки шаблонов необходим онлайн-режим."
+
+msgid "Go Online"
+msgstr "Войти в сеть"
+
 msgid "Cancel the download of the templates."
 msgstr "Отменить загрузку шаблонов."
 
@@ -6182,6 +6202,9 @@ msgstr ""
 msgid "Select This Folder"
 msgstr "Выбрать эту папку"
 
+msgid "Show Package Contents"
+msgstr "Показать содержимое пакета"
+
 msgid "All Files"
 msgstr "Все файлы"
 
@@ -6266,6 +6289,9 @@ msgstr "Каталоги и файлы:"
 msgid "Toggle the visibility of hidden files."
 msgstr "Переключить видимость скрытых файлов."
 
+msgid "Sort files"
+msgstr "Сортировать файлы"
+
 msgid "Toggle the visibility of the filter for file names."
 msgstr "Переключить видимость фильтра для имен файлов."
 
@@ -8192,9 +8218,6 @@ msgstr ""
 "Библиотека ассетов требует подключения к сети и использует отправку данных "
 "через Интернет."
 
-msgid "Go Online"
-msgstr "Войти в сеть"
-
 msgid "Failed to get repository configuration."
 msgstr "Не удалось получить конфигурацию репозитория."
 
@@ -8465,6 +8488,9 @@ msgstr "Shift: масштабировать пропорционально."
 msgid "Show list of selectable nodes at position clicked."
 msgstr "Показать список доступных для выбора узлов в выбранной позиции."
 
+msgid "Click to change object's pivot."
+msgstr "Нажмите для изменения точки вращения объекта."
+
 msgid "Shift: Set temporary pivot."
 msgstr "Shift: Установить временную точку вращения."
 
@@ -9177,6 +9203,9 @@ msgstr "Вариация"
 msgid "Unable to preview font"
 msgstr "Не удалось отобразить шрифт"
 
+msgid "Connection impossible to the game process."
+msgstr "Невозможно подключиться к процессу игры."
+
 msgid "Game starting..."
 msgstr "Запуск Игры..."
 
@@ -9210,12 +9239,69 @@ msgstr ""
 "Display Server можно изменить в настройках проекта (Display > Display Server "
 "> Driver)."
 
+msgid ""
+"Game embedding not available when the game starts minimized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Встраивание игры недоступно, если игра запускается в свернутом виде.\n"
+"Рассмотрите возможность переопределения настройки проекта в режиме окна с "
+"помощью тега функции редактора на Оконный, чтобы использовать встраивание "
+"игры, оставив экспортированный проект нетронутым."
+
+msgid ""
+"Game embedding not available when the game starts maximized.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Встраивание игры недоступно, если игра запускается в развернутом виде.\n"
+"Рассмотрите возможность переопределения настройки проекта оконного режима с "
+"помощью тега функции редактора на Windowed, чтобы использовать встраивание "
+"игры, оставив экспортированный проект нетронутым."
+
+msgid ""
+"Game embedding not available when the game starts in fullscreen.\n"
+"Consider overriding the window mode project setting with the editor feature "
+"tag to Windowed to use game embedding while leaving the exported project "
+"intact."
+msgstr ""
+"Встраивание игры недоступно, если игра запускается в полноэкранном режиме.\n"
+"Рассмотрите возможность переопределения настройки проекта оконного режима с "
+"помощью тега функции редактора на Windowed, чтобы использовать встраивание "
+"игры, оставив экспортированный проект нетронутым."
+
 msgid "Game embedding not available in single window mode."
 msgstr "Встраивание игры недоступно в режиме одного окна."
 
+msgid "Suspend"
+msgstr "Приостановить"
+
 msgid "Next Frame"
 msgstr "Следующий Кадр"
 
+msgid "Input"
+msgstr "Ввод"
+
+msgid "Allow game input."
+msgstr "Разрешить игровой ввод."
+
+msgid ""
+"Disable game input and allow to select Node2Ds, Controls, and manipulate the "
+"2D camera."
+msgstr ""
+"Отключить игровой ввод и разрешить выбирать Node2D, Control узлы, и управлять "
+"2D-камерой."
+
+msgid ""
+"Disable game input and allow to select Node3Ds and manipulate the 3D camera."
+msgstr ""
+"Отключить игровой ввод и разрешить выбирать Node3D и управлять 3D-камерой."
+
+msgid "Toggle Selection Visibility"
+msgstr "Переключить видимость выделения"
+
 msgid "Alt+RMB: Show list of all nodes at position clicked."
 msgstr "Alt+ПКМ: Показать список всех узлов в позиции щелчка."
 
@@ -9231,6 +9317,21 @@ msgstr "Сбросить 2D-камеру"
 msgid "Reset 3D Camera"
 msgstr "Сбросить 3D-камеру"
 
+msgid "Manipulate In-Game"
+msgstr "Манипулировать в игре"
+
+msgid "Manipulate From Editors"
+msgstr "Манипулировать из редактора"
+
+msgid ""
+"Embedded game size is based on project settings.\n"
+"The 'Keep Aspect' mode is used when the Game Workspace is smaller than the "
+"desired size."
+msgstr ""
+"Размер встроенной игры зависит от настроек проекта.\n"
+"Режим 'Сохранить соотношение сторон' используется, когда игровое рабочее "
+"пространство меньше желаемого размера."
+
 msgid "Keep the aspect ratio of the embedded game."
 msgstr "Сохраните соотношение сторон встроенной игры."
 
@@ -9242,6 +9343,12 @@ msgstr ""
 msgid "Embedding Options"
 msgstr "Варианты встраивания"
 
+msgid "Embed Game on Next Play"
+msgstr "Встроить игру в Next Play"
+
+msgid "Make Game Workspace Floating on Next Play"
+msgstr "Сделать игровое рабочее пространство плавающим c Next Play"
+
 msgid "Game Workspace"
 msgstr "Игровое рабочее пространство"
 
@@ -9398,6 +9505,39 @@ msgstr ""
 "Нет сеток с поддержкой карт освещения для запекания. Убедитесь, что они "
 "содержат данные UV2, а их свойство Global Illumination установлено на Static."
 
+msgid ""
+"To import a scene with lightmapping support, set Meshes > Light Baking to "
+"Static Lightmaps in the Import dock."
+msgstr ""
+"Чтобы импортировать сцену с поддержкой карт освещения, установите для "
+"параметра «Meshes > Light Baking» на Static Lightmaps в доке импорта."
+
+msgid ""
+"To enable lightmapping support on a primitive mesh, edit the PrimitiveMesh "
+"resource in the inspector and check Add UV2."
+msgstr ""
+"Чтобы включить поддержку освещения на примитиве сетки, отредактируйте ресурс "
+"PrimitiveMesh в инспекторе и установите флажок \"Добавить UV2\"."
+
+msgid ""
+"To enable lightmapping support on a CSG mesh, select the root CSG node and "
+"choose CSG > Bake Mesh Instance at the top of the 3D editor viewport.\n"
+"Select the generated MeshInstance3D node and choose Mesh > Unwrap UV2 for "
+"Lightmap/AO at the top of the 3D editor viewport."
+msgstr ""
+"Чтобы включить поддержку карт освещения на сетке CSG, выберите корневой узел "
+"CSG и выберите \"CSG > Bake Mesh Instance\" в верхней части окна просмотра 3D-"
+"редактора.\n"
+"Выберите сгенерированный узел MeshInstance3D и выберите \"Mesh > Unwrap UV2 "
+"for Lightmap/AO\" в верхней части окна просмотра 3D-редактора."
+
+msgid ""
+"Failed creating lightmap images. Make sure the lightmap destination path is "
+"writable."
+msgstr ""
+"Не удалось создать изображения lightmap. Убедитесь, что путь назначения "
+"lightmap доступен для записи."
+
 msgid "No editor scene root found."
 msgstr "Не найден корень сцены редактора."
 
@@ -9413,6 +9553,15 @@ msgstr ""
 "Хотя это можно исправить, увеличив максимальный размер текстуры, "
 "рекомендуется вместо этого разбить сцену на большее число объектов."
 
+msgid ""
+"Failed creating lightmap images. Make sure all meshes to bake have the "
+"Lightmap Size Hint property set high enough, and the LightmapGI's Texel Scale "
+"value is not too low."
+msgstr ""
+"Не удалось создать изображения карты освещения. Убедитесь, что все сетки для "
+"запекания имеют свойство Lightmap Size Hint, установленное достаточно высоко, "
+"а значение Texel Scale LightmapGI не слишком низкое."
+
 msgid ""
 "Failed fitting a lightmap image into an atlas. This should never happen and "
 "should be reported."
@@ -9774,15 +9923,39 @@ msgstr "Задать start_position"
 msgid "Set end_position"
 msgstr "Задать end_position"
 
+msgid "Set Obstacle Vertices"
+msgstr "Установить вершины Obstacle"
+
+msgid "Edit Obstacle (Flip Winding)"
+msgstr "Редактировать Obstacle (переворот)"
+
+msgid "Edit Obstacle (Clear Vertices)"
+msgstr "Редактировать Obstacle (очистить вершины)"
+
 msgid "Add Vertex"
 msgstr "Добавить Вершину"
 
+msgid "Edit Vertex"
+msgstr "Редактировать вершину"
+
 msgid "Delete Vertex"
 msgstr "Удалить Вершину"
 
+msgid "Flip Winding"
+msgstr "Переворот"
+
 msgid "Clear Vertices"
 msgstr "Очистить Вершины"
 
+msgid "Edit Obstacle (Add Vertex)"
+msgstr "Редактировать Obstacle (добавить вершину)"
+
+msgid "Edit Obstacle (Move Vertex)"
+msgstr "Редактировать Obstacle (переместить вершину)"
+
+msgid "Edit Obstacle (Remove Vertex)"
+msgstr "Редактировать Obstacle (удалить вершину)"
+
 msgid "Please Confirm..."
 msgstr "Подтверждение..."
 
@@ -10069,6 +10242,9 @@ msgstr "Окружение"
 msgid "View Gizmos"
 msgstr "Гизмо"
 
+msgid "View Transform Gizmo"
+msgstr "Просмотр преобразования гизмо"
+
 msgid "View Grid"
 msgstr "Отображать сетку"
 
@@ -10093,6 +10269,24 @@ msgstr "Кинематографический предварительный п
 msgid "Not available when using the OpenGL renderer."
 msgstr "Недоступно при использовании отрисовщика OpenGL."
 
+msgid "Viewport Orbit Modifier 1"
+msgstr "Модификатор орбиты окна просмотра 1"
+
+msgid "Viewport Orbit Modifier 2"
+msgstr "Модификатор орбиты окна просмотра 2"
+
+msgid "Viewport Pan Modifier 1"
+msgstr "Модификатор панорамы окна 1"
+
+msgid "Viewport Pan Modifier 2"
+msgstr "Модификатор панорамы окна 2"
+
+msgid "Viewport Zoom Modifier 1"
+msgstr "Модификатор приближения окна 1"
+
+msgid "Viewport Zoom Modifier 2"
+msgstr "Модификатор приближения окна 2"
+
 msgid "Freelook Left"
 msgstr "Свободный вид, влево"
 
@@ -10144,6 +10338,9 @@ msgstr "Начать трансформацию вращения"
 msgid "Begin Scale Transformation"
 msgstr "Начать трансформацию масштаба"
 
+msgid "Reposition Using Collisions"
+msgstr "Смена размещения при использовании коллизий"
+
 msgid "Toggle Camera Preview"
 msgstr "Переключить превью камеры"
 
@@ -10617,6 +10814,9 @@ msgstr "Источник излучения:"
 msgid "A processor material of type 'ParticleProcessMaterial' is required."
 msgstr "Требуется материал типа «ParticleProcessMaterial»."
 
+msgid "Create Emission Points"
+msgstr "Создать точки излучения"
+
 msgid "GPUParticles3D"
 msgstr "GPUParticles3D"
 
@@ -10849,6 +11049,13 @@ msgstr ""
 msgid "Script Name:"
 msgstr "Имя скрипта:"
 
+msgid ""
+"Optional. The name of the script file. If left empty, will default to the "
+"subfolder name."
+msgstr ""
+"Опционально. Имя файла скрипта. Если оставить поле пустым, значением по "
+"умолчанию будет имя вложенной папки."
+
 msgid "Activate now?"
 msgstr "Активировать сейчас?"
 
@@ -10920,9 +11127,15 @@ msgstr "Кости"
 msgid "Move Points"
 msgstr "Переместить точки"
 
+msgid "%s: Rotate"
+msgstr "%s: Повернуть"
+
 msgid "Shift: Move All"
 msgstr "Shift: переместить все"
 
+msgid "%s + Shift: Scale"
+msgstr "%s + Shift: Масштабировать"
+
 msgid "Move Polygon"
 msgstr "Переместить полигон"
 
@@ -11039,6 +11252,9 @@ msgstr ""
 "AnimationMixer не имеет корректного пути к корневому узлу, поэтому невозможно "
 "получить названия дорожек."
 
+msgid "(truncated)"
+msgstr "(усечено)"
+
 msgid "Current value: "
 msgstr "Текущие значение: "
 
@@ -11256,6 +11472,9 @@ msgstr "Обычный текст"
 msgid "JSON"
 msgstr "JSON"
 
+msgid "Markdown"
+msgstr "Markdown"
+
 msgid "Connections to method:"
 msgstr "Подключения к методу:"
 
@@ -11302,6 +11521,9 @@ msgid "Can't drop nodes because script '%s' does not inherit Node."
 msgstr ""
 "Невозможно перетащить узлы, потому что скрипт «%s» не наследует от Node."
 
+msgid "Emoji & Symbols"
+msgstr "Эмодзи и символы"
+
 msgid "Pick Color"
 msgstr "Выбрать цвет"
 
@@ -11434,6 +11656,9 @@ msgstr "Сохранить файл"
 msgid "Open File in Inspector"
 msgstr "Открыть файл в инспекторе"
 
+msgid "Inspect Native Shader Code..."
+msgstr "Просмотр кода нативного шейдера..."
+
 msgid "Close File"
 msgstr "Закрыть файл"
 
@@ -11524,6 +11749,12 @@ msgstr "Экспортировать профиль скелета как..."
 msgid "Set Bone Parentage"
 msgstr "Задать родительский элемент кости"
 
+msgid "Revert Bone"
+msgstr "Откатить кость"
+
+msgid "Revert"
+msgstr "Откатить"
+
 msgid "Skeleton3D"
 msgstr "Skeleton3D"
 
@@ -12606,6 +12837,9 @@ msgstr "Покрасить тайлы"
 msgid "Paste tiles"
 msgstr "Вставить тайлы"
 
+msgid "Selection Tool"
+msgstr "Инструмент выделения"
+
 msgid "Shift: Draw line."
 msgstr "Shift: рисовать линию."
 
@@ -13301,6 +13535,9 @@ msgstr "Инструмент Заливка"
 msgid "Eraser Tool"
 msgstr "Инструмент Ластик"
 
+msgid "Picker Tool"
+msgstr "Инструмент выбора"
+
 msgid "TileMap"
 msgstr "Карта тайлов"
 
@@ -13572,6 +13809,12 @@ msgstr ""
 "2D-предпросмотр не может корректно отобразить результат, полученный от "
 "параметра экземпляра."
 
+msgid "Copy Preview Shader Parameters From Material"
+msgstr "Копировать параметры предпросмотра шейдера из материала"
+
+msgid "Paste Preview Shader Parameters To Material"
+msgstr "Вставить параметры предпросмотра шейдера в материал"
+
 msgid "Add Input Port"
 msgstr "Добавить входной порт"
 
@@ -13689,6 +13932,9 @@ msgstr "Включить автосжатие"
 msgid "Enable Tint Color"
 msgstr "Включить оттенок цвета"
 
+msgid "Edit Preview Parameter: %s"
+msgstr "Редактировать параметр предпросмотра: %s"
+
 msgid "Duplicate VisualShader Node(s)"
 msgstr "Дублировать узлы VisualShader"
 
@@ -13716,9 +13962,15 @@ msgstr "Недопустимое имя вариации."
 msgid "Varying with that name is already exist."
 msgstr "Вариация с таким именем уже существует."
 
+msgid "Boolean type cannot be used with `%s` varying mode."
+msgstr "Логический тип не может быть использован с режимом вариации `%s`."
+
 msgid "Add Node(s) to Visual Shader"
 msgstr "Добавить узлы в визуальный шейдер"
 
+msgid "Hold %s Key To Swap Connections"
+msgstr "Удерживайте кнопку %s для изменения соединений местами"
+
 msgid "Vertex"
 msgstr "Вершина"
 
@@ -13851,6 +14103,9 @@ msgstr "Параметр цвета."
 msgid "(Fragment/Light mode only) Derivative function."
 msgstr "(Только в режиме фрагмента/света) Производная функция."
 
+msgid "Derivative function."
+msgstr "Производная функция."
+
 msgid "Returns the boolean result of the %s comparison between two parameters."
 msgstr "Возвращает логический результат сравнения %s между двумя параметрами."
 
@@ -14092,6 +14347,14 @@ msgstr ""
 "(Только в режиме фрагмента/света) (Скаляр) Производная по «y» с "
 "использованием локального дифференцирования."
 
+msgid "(Scalar) Derivative in 'x' using local differencing."
+msgstr ""
+"(Скаляр) Производная по 'x' с использованием локального дифференцирования."
+
+msgid "(Scalar) Derivative in 'y' using local differencing."
+msgstr ""
+"(Скаляр) Производная по 'y' с использованием локального дифференцирования."
+
 msgid "Base-e Exponential."
 msgstr "Экспонента с основанием e."
 
@@ -14143,6 +14406,9 @@ msgstr "Переводит значение из градусов в радиа
 msgid "1.0 / scalar"
 msgstr "1.0 / скаляр"
 
+msgid "Remaps a value from the input range to the output range."
+msgstr "Переключает значение из диапазона ввода в диапазон вывода."
+
 msgid "Finds the nearest integer to the parameter."
 msgstr "Находит ближайшее к параметру целое число."
 
@@ -14192,6 +14458,9 @@ msgstr ""
 "(Только в режиме фрагмента/света) (Скаляр) Сумма абсолютных значений "
 "производных по «x» и «y»."
 
+msgid "(Scalar) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Скаляр) Сумма абсолютных значений производных по 'x' и 'y'."
+
 msgid "Returns the tangent of the parameter."
 msgstr "Возвращает тангенс параметра."
 
@@ -14536,6 +14805,14 @@ msgstr ""
 "(Только в режиме фрагмента/света) (Вектор) Производная по «y» с "
 "использованием локального дифференцирования."
 
+msgid "(Vector) Derivative in 'x' using local differencing."
+msgstr ""
+"(Вектор) Производная по 'x' с использованием локального дифференцирования."
+
+msgid "(Vector) Derivative in 'y' using local differencing."
+msgstr ""
+"(Вектор) Производная по 'y' с использованием локального дифференцирования."
+
 msgid "Returns the distance between two points."
 msgstr "Возвращает расстояние между двумя точками."
 
@@ -14593,6 +14870,16 @@ msgstr ""
 msgid "Returns the vector that points in the direction of refraction."
 msgstr "Возвращает вектор, который указывает в направлении преломления."
 
+msgid "Remaps a vector from the input range to the output range."
+msgstr "Переназначает вектор из диапазона ввода в диапазон вывода."
+
+msgid ""
+"Remaps a vector from the input range to the output range. Ranges defined with "
+"scalars."
+msgstr ""
+"Переназначает вектор из диапазона ввода в диапазон вывода. Диапазоны "
+"назначены со скалярами."
+
 msgid ""
 "SmoothStep function( vector(edge0), vector(edge1), vector(x) ).\n"
 "\n"
@@ -14643,6 +14930,9 @@ msgstr ""
 "(Только в режиме фрагмента/света) (Вектор) Сумма абсолютных значений "
 "производных по «x» и «y»."
 
+msgid "(Vector) Sum of absolute derivative in 'x' and 'y'."
+msgstr "(Вектор) Сумма абсолютных значений производных по 'x' и 'y'."
+
 msgid "Adds 2D vector to 2D vector."
 msgstr "Прибавляет 2D-вектор к 2D-вектору."
 
@@ -14747,6 +15037,9 @@ msgstr ""
 "Свободно перенаправляет соединения, может использоваться для подключения "
 "нескольких входных портов к одному выходному порту."
 
+msgid "[None]"
+msgstr "[Никто]"
+
 msgid "Edit Visual Property: %s"
 msgstr "Редактировать визуальное свойство: %s"
 
@@ -15259,6 +15552,9 @@ msgstr "Быстрый рендеринг простых сцен."
 msgid "Supports desktop, mobile + web platforms."
 msgstr "Поддерживает настольные, мобильные и веб-платформы."
 
+msgid "Least advanced 3D graphics."
+msgstr "Наименее продвинутая 3D-графика."
+
 msgid "Intended for low-end/older devices."
 msgstr "Предназначен для бюджетных/старых устройств."
 
@@ -15353,6 +15649,12 @@ msgstr "Ошибка: проект отсутствует в файловой с
 msgid "Last edited timestamp"
 msgstr "Временная метка последнего изменения"
 
+msgid "Scanning"
+msgstr "Сканирование"
+
+msgid "Scanning for projects..."
+msgstr "Сканирование проектов..."
+
 msgid "Missing Project"
 msgstr "Отсутствующий проект"
 
@@ -15591,9 +15893,6 @@ msgstr "Метки возможностей"
 msgid "Pick Root Node Type"
 msgstr "Выбрать тип корневого узла"
 
-msgid "Pick"
-msgstr "Выбрать"
-
 msgid "Scene name is empty."
 msgstr "Пустое имя сцены."
 
@@ -15923,6 +16222,9 @@ msgstr ""
 "Когда этот параметр включён, при использовании опции «Переподчинить новому "
 "узлу» новый узел будет создан в центре выбранных узлов (если это возможно)."
 
+msgid "Hide Filtered Out Parents"
+msgstr "Скрыть отфильтрованных родителей"
+
 msgid "All Scene Sub-Resources"
 msgstr "Все вложенные ресурсы сцены"
 
@@ -16033,6 +16335,9 @@ msgstr "Прикрепить новый или существующий скри
 msgid "Detach the script from the selected node."
 msgstr "Открепить скрипт от выбранного узла."
 
+msgid "Extend the script of the selected node."
+msgstr "Расширить скрипт выбранного узла."
+
 msgid "Extra scene options."
 msgstr "Дополнительные параметры сцены."
 
@@ -16290,38 +16595,21 @@ msgstr "Обновление UID скрипта"
 
 msgid ""
 "As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
+"shaders. Upgrades apply on the next save of each scene/resource.\n"
 "\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
+"To save time, this tool can open and save each of these files. Depending on "
+"the project size, it may take several minutes."
 msgstr ""
-"Начиная с версии Godot 4.4, сцены и ресурсы используют UID для ссылки на "
-"скрипты и шейдеры.\n"
+"Начиная с Godot 4.4, сцены и ресурсы используют UID для ссылки на скрипты и "
+"шейдеры. Обновления применяются при следующем сохранении каждой сцены/"
+"ресурса.\n"
 "\n"
-"Обычно это обновление применяется к одной сцене или ресурсу, как только вы "
-"сохраняете его в Godot 4.4 в первый раз. Если у вас много сцен и/или "
-"ресурсов, выполнение этого вручную может занять много времени. Этот "
-"инструмент обновит все сцены и ресурсы проекта одновременно.\n"
-"\n"
-"Нажмите «Перезапустить и обновить», чтобы перезапустить редактор и обновить "
-"все сцены и ресурсы в этом проекте. В зависимости от размера проекта это "
-"может занять несколько минут.\n"
-"\n"
-"Примечание: Пожалуйста, убедитесь, что у вас есть резервная копия вашего "
-"проекта перед запуском инструмента, чтобы избежать возможной потери данных. "
-"Кроме того, убедитесь, что все файлы .uid переданы в систему контроля версий "
-"(и не добавляйте их в списки игнорирования, такие как .gitignore)."
+"Чтобы сэкономить время, этот инструмент может открывать и сохранять каждый из "
+"этих файлов. В зависимости от размера проекта это может занять несколько "
+"минут."
+
+msgid "Re-save all scenes and resources to use UIDs"
+msgstr "Пересохраните все сцены и ресурсы для использования UID"
 
 msgid "Learn More"
 msgstr "Узнать больше"
@@ -16339,12 +16627,33 @@ msgstr ""
 msgid "Select Screen"
 msgstr "Выбрать экран"
 
+msgid ""
+"The CSGShape3D has an empty shape.\n"
+"CSGShape3D empty shapes typically occur because the mesh is not manifold.\n"
+"A manifold mesh forms a solid object without gaps, holes, or loose edges.\n"
+"Each edge must be a member of exactly two faces."
+msgstr ""
+"CSGShape3D содержит пустую форму.\n"
+"Пустые формы CSGShape3D обычно возникают из-за того, что сетка имеет «дыры».\n"
+"Целая сетка формирует целый объект без промежутков, дыр или свободных рёбер.\n"
+"Каждое ребро должно присутствовать только у двух граней."
+
 msgid "CSG operation returned an empty array."
 msgstr "Операция CSG вернула пустой массив."
 
+msgid ""
+"Can not add a baked mesh as sibling for the scene root.\n"
+"Move the CSG root node below a parent node."
+msgstr ""
+"Не удаётся добавить запечённую сетку в качестве брата для корня сцены.\n"
+"Сдвиньте корневой узел CSG под родительский узел."
+
 msgid "CSG operation returned an empty mesh."
 msgstr "Операция CSG вернула пустую сетку."
 
+msgid "Create baked CSGShape3D Mesh Instance"
+msgstr "Создать запеченный экземпляр сетки CSGShape3D"
+
 msgid ""
 "Can not add a baked collision shape as sibling for the scene root.\n"
 "Move the CSG root node below a parent node."
@@ -16356,9 +16665,27 @@ msgstr ""
 msgid "CSG operation returned an empty shape."
 msgstr "Операция CSG вернула пустую форму."
 
+msgid "Create baked CSGShape3D Collision Shape"
+msgstr "Создать форму столкновений CSGShape3D"
+
 msgid "CSG"
 msgstr "CSG"
 
+msgid "Bake Mesh Instance"
+msgstr "Запечь экземпляр сетки"
+
+msgid "Bake Collision Shape"
+msgstr "Запечь форму столкновений"
+
+msgid "Change CSG Box Size"
+msgstr "Изменить размеры CSG Box"
+
+msgid "Change CSG Cylinder Radius"
+msgstr "Изменить радиус CSG Cylinder"
+
+msgid "Change CSG Cylinder Height"
+msgstr "Изменить высоту CSG Cylinder"
+
 msgid "Change Torus Inner Radius"
 msgstr "Изменить внутренний радиус тора"
 
@@ -16374,6 +16701,28 @@ msgstr "Не удалось изменить размер массива."
 msgid "Step argument is zero!"
 msgstr "Аргумент шага равен нулю!"
 
+msgid "Not a script with an instance."
+msgstr "Не скрипт с экземпляром."
+
+msgid "Not based on a script."
+msgstr "Не на основе скрипта."
+
+msgid "Not based on a resource file."
+msgstr "Не основано на файле ресурса."
+
+msgid "Invalid instance dictionary format (missing @path)."
+msgstr "Недопустимый формат словаря экземпляра (отсутствует @path)."
+
+msgid "Invalid instance dictionary format (can't load script at @path)."
+msgstr ""
+"Недопустимый формат словаря экземпляра (невозможно загрузить скрипт из @path)."
+
+msgid "Invalid instance dictionary format (invalid script at @path)."
+msgstr "Недопустимый формат словаря экземпляра (неверный скрипт в @path)."
+
+msgid "Invalid instance dictionary (invalid subclasses)."
+msgstr "Недопустимый словарь экземпляра (неверные подклассы)."
+
 msgid "Cannot instantiate GDScript class."
 msgstr "Не удалось инстанцировать класс GDScript."
 
@@ -16498,6 +16847,9 @@ msgstr "Изменить ось Y"
 msgid "Edit Z Axis"
 msgstr "Изменить ось Z"
 
+msgid "Keep Selection"
+msgstr "Оставить выбранное"
+
 msgid "Clear Rotation"
 msgstr "Очистить вращение"
 
@@ -16522,6 +16874,15 @@ msgstr "Поворот курсора по Y"
 msgid "Cursor Rotate Z"
 msgstr "Поворот курсора по Z"
 
+msgid ""
+"Change Grid Floor:\n"
+"Previous Plane (%s)\n"
+"Next Plane (%s)"
+msgstr ""
+"Изменить низ сетки:\n"
+"Предыдущая плоскость (%s)\n"
+"Следующая плоскость (%s)"
+
 msgid "Filter Meshes"
 msgstr "Фильтр сеток"
 
@@ -16662,12 +17023,18 @@ msgstr "Отмена заслоняющей геометрии"
 msgid "Plot direct lighting"
 msgstr "Построить прямое освещение"
 
+msgid "Plot direct lighting %d%%"
+msgstr "Построить прямое освещение %d%%"
+
 msgid "Integrate indirect lighting"
 msgstr "Интегрировать непрямое освещение"
 
 msgid "Integrate indirect lighting %d%%"
 msgstr "Интегрировать непрямое освещение %d%%"
 
+msgid "Baking light probes"
+msgstr "Запекание световых зондов"
+
 msgid "Integrating light probes %d%%"
 msgstr "Интеграция световых зондов %d%%"
 
@@ -16686,6 +17053,19 @@ msgstr "Имя класса должно быть допустимым иден
 msgid "Not enough bytes for decoding bytes, or invalid format."
 msgstr "Недостаточно байтов для декодирования байтов или неверный формат."
 
+msgid ""
+"Unable to load .NET runtime, no compatible version was found.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+"Не удалось загрузить среду выполнения .NET, не найдена совместимая версия.\n"
+"Попытка создать или изменить проект приведёт к сбою.\n"
+"\n"
+"Пожалуйста, установите .NET SDK 8.0 или более поздней версии с сайта https://"
+"get.dot.net и перезапустите Godot."
+
 msgid "Failed to load .NET runtime"
 msgstr "Не удалось загрузить среду выполнения .NET"
 
@@ -16699,6 +17079,19 @@ msgstr ""
 msgid ".NET assemblies not found"
 msgstr "Не удалось найти сборки .NET"
 
+msgid ""
+"Unable to load .NET runtime, specifically hostfxr.\n"
+"Attempting to create/edit a project will lead to a crash.\n"
+"\n"
+"Please install the .NET SDK 8.0 or later from https://get.dot.net and restart "
+"Godot."
+msgstr ""
+"Не удалось загрузить среду выполнения .NET, а именно hostfxr.\n"
+"Попытка создать или изменить проект приведёт к сбою.\n"
+"\n"
+"Пожалуйста, установите .NET SDK 8.0 или более поздней версии с сайта https://"
+"get.dot.net и перезапустите Godot."
+
 msgid "%d (%s)"
 msgstr "%d (%s)"
 
@@ -16955,11 +17348,23 @@ msgstr "Добавить действие."
 msgid "Remove action set."
 msgstr "Удалить набор действий."
 
+msgid "Remove binding modifier."
+msgstr "Удалить модификатор привязки."
+
+msgid "Remove binding modifier"
+msgstr "Удалить модификатор привязки"
+
+msgid "Add binding modifier"
+msgstr "Добавить модификатор привязки"
+
 msgid "Note: modifiers will only be applied if supported on the host system."
 msgstr ""
 "Примечание: модификаторы будут применяться только в том случае, если они "
 "поддерживаются хост-системой."
 
+msgid "Binding modifiers for:"
+msgstr "Модификаторы привязки для:"
+
 msgid "OpenXR Action Map"
 msgstr "Карта действий OpenXR"
 
@@ -16969,6 +17374,9 @@ msgstr "Включить или отключить нижнюю панель «
 msgid "Remove action from interaction profile"
 msgstr "Удалить действие из профиля взаимодействия"
 
+msgid "Edit binding modifiers"
+msgstr "Редактировать модификаторы привязки"
+
 msgid "Note: This interaction profile requires extension %s support."
 msgstr "Примечание: для этого профиля требуется поддержка расширения %s."
 
@@ -16978,6 +17386,9 @@ msgstr "Добавить привязку"
 msgid "Remove binding"
 msgstr "Удалить привязку"
 
+msgid "Note: This binding path requires extension %s support."
+msgstr "Примечание: Этот путь привязки требует поддержки расширения %s."
+
 msgid "Pose"
 msgstr "Поза"
 
@@ -16993,6 +17404,9 @@ msgstr "Выберите действие"
 msgid "Select an interaction profile"
 msgstr "Выберите профиль взаимодействия"
 
+msgid "All interaction profiles have been added to the action map."
+msgstr "Все профили взаимодействия добавлены на карту действий."
+
 msgid "Choose an XR runtime."
 msgstr "Выберите среду выполнения XR."
 
@@ -17003,6 +17417,13 @@ msgstr ""
 "Нельзя использовать один и тот же SubViewport для нескольких составных слоёв "
 "OpenXR. Сначала уберите его из текущего слоя."
 
+msgid ""
+"Cannot set SubViewport on an OpenXR composition layer when using an Android "
+"surface."
+msgstr ""
+"Невозможно установить SubViewport на слое композиции OpenXR при использовании "
+"поверхности Android."
+
 msgid "OpenXR composition layers must have an XROrigin3D node as their parent."
 msgstr "У составных слоёв OpenXR должен быть родительский узел XROrigin3D."
 
@@ -17019,6 +17440,9 @@ msgstr ""
 "Пробивание отверстий будет работать ожидаемым образом только в том случае, "
 "если порядок сортировки меньше нуля."
 
+msgid "OpenXR visibility mask must have an XRCamera3D node as their parent."
+msgstr "Маска видимости OpenXR должна иметь родительский узел XRCamera3D."
+
 msgid "Package name is missing."
 msgstr "Отсутствует имя пакета."
 
@@ -17046,6 +17470,11 @@ msgstr "Недействительный открытый ключ для рас
 msgid "Invalid package name:"
 msgstr "Недопустимое имя пакета:"
 
+msgid "\"Use Gradle Build\" is required to enable \"Swipe to dismiss\"."
+msgstr ""
+"Для включения функции \"Смахните для закрытия\" требуется «Использовать "
+"сборку Gradle» (Use Gradle Build)."
+
 msgid "\"Use Gradle Build\" must be enabled to use the plugins."
 msgstr ""
 "Для использования модулей необходимо включить опцию «Использовать сборку "
@@ -17099,6 +17528,21 @@ msgstr ""
 msgid "\"Target SDK\" version must be greater or equal to \"Min SDK\" version."
 msgstr "Версия «Целевого SDK» должна быть больше или равна версии «Мин. SDK»."
 
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show In Android Tv\"."
+msgstr ""
+"Для включения функции \"Показать на Android Tv\" необходимо включить опцию "
+"«Использовать сборку Gradle» (Use Gradle Build)."
+
+msgid "\"Use Gradle Build\" must be enabled to enable \"Show As Launcher App\"."
+msgstr ""
+"Для включения функции \"Показать как приложение\" необходимо включить опцию "
+"«Использовать сборку Gradle» (Use Gradle Build)."
+
+msgid "\"Use Gradle Build\" must be enabled to disable \"Show In App Library\"."
+msgstr ""
+"Для отключения функции \"Показать в библиотеке приложений\" необходимо "
+"включить опцию «Использовать сборку Gradle» (Use Gradle Build)."
+
 msgid "Select device from the list"
 msgstr "Выберите устройство из списка"
 
@@ -17128,9 +17572,28 @@ msgstr ""
 "Ошибка: возникла проблема при проверке имени пользователя и пароля хранилища "
 "ключей"
 
+msgid ""
+"Unable to determine the C# project's TFM, it may be incompatible. The export "
+"template only supports '%s'. Make sure the project targets '%s' or consider "
+"using gradle builds instead."
+msgstr ""
+"Не удалось определить TFM проекта C#, возможно, он несовместим. Шаблон "
+"экспорта поддерживает только '%s'. Убедитесь, что путь проекта указывает на "
+"'%s' или вместо этого рассмотрите возможность использования сборки gradle."
+
+msgid ""
+"C# project targets '%s' but the export template only supports '%s'. Consider "
+"using gradle builds instead."
+msgstr ""
+"Путь шаблона экспорта указывает на '%s', но шаблон экспорта поддерживает "
+"только '%s'. Вместо этого рассмотрите возможность использования сборки gradle."
+
 msgid "Exporting to Android when using C#/.NET is experimental."
 msgstr "Экспорт в Android при использовании C#/.NET является экспериментальным."
 
+msgid "Gradle build is not supported for the Android editor."
+msgstr "Сборка Gradle не поддерживается для редактора Android."
+
 msgid "Custom Android source template not found."
 msgstr "Пользовательский шаблон исходных данных Android не найден."
 
@@ -17228,9 +17691,37 @@ msgstr ""
 msgid "Code Signing"
 msgstr "Подписание кода"
 
+msgid "AAB signing is not supported"
+msgstr "Подписание AAB не поддерживается"
+
+msgid "Signing debug APK..."
+msgstr "Подписание отладочного APK..."
+
+msgid "Signing release APK..."
+msgstr "Подписание релиза APK..."
+
 msgid "Could not find keystore, unable to export."
 msgstr "Не удалось найти хранилище ключей, невозможно выполнить экспорт."
 
+msgid "Unable to sign apk."
+msgstr "Невозможно подписать apk."
+
+msgid ""
+"All 'apksigner' tools located in Android SDK 'build-tools' directory failed "
+"to execute. Please check that you have the correct version installed for your "
+"target sdk version. The resulting APK is unsigned."
+msgstr ""
+"Все инструменты 'apksigner', расположенные в каталоге Android SDK 'build-"
+"tools', не удалось выполнить. Проверьте, установлена ли у вас правильная "
+"версия для целевой версии sdk. Полученный APK не подписан."
+
+msgid ""
+"'apksigner' could not be found. Please check that the command is available in "
+"the Android SDK build-tools directory. The resulting APK is unsigned."
+msgstr ""
+"'apksigner' не найден. Проверьте, доступна ли команда в каталоге Android SDK "
+"build-tools. Полученный APK не подписан."
+
 msgid "Could not start apksigner executable."
 msgstr "Не удалось запустить исполняемый файл apksigner."
 
@@ -17244,6 +17735,15 @@ msgstr ""
 "вывод: \n"
 "%s"
 
+msgid "Verifying APK..."
+msgstr "Проверка APK..."
+
+msgid "Unable to verify signed apk."
+msgstr "Не удалось проверить подписанный apk."
+
+msgid "'apksigner' verification of APK failed."
+msgstr "Проверка APK-файла 'apksigner' не удалась."
+
 msgid "Target folder does not exist or is inaccessible: \"%s\""
 msgstr "Целевая папка не существует или недоступна: «%s»"
 
@@ -17306,6 +17806,12 @@ msgstr "Перемещение выходных данных"
 msgid "Unable to copy and rename export file:"
 msgstr "Невозможно скопировать и переименовать файл экспорта:"
 
+msgid "Debug export template not found: \"%s\"."
+msgstr "Шаблон экспорта отладки не найден: \"%s\"."
+
+msgid "Release export template not found: \"%s\"."
+msgstr "Шаблон экспорта релиза не найден: \"%s\"."
+
 msgid "Creating APK..."
 msgstr "Создание APK..."
 
@@ -17456,6 +17962,9 @@ msgstr "Экспорт в iOS при использовании C#/.NET явля
 msgid "Invalid additional PList content: "
 msgstr "Недопустимое дополнительное содержимое PList: "
 
+msgid "Metal renderer require iOS 14+."
+msgstr "Для рендеринга Metal требуется iOS 14+."
+
 msgid "Identifier is missing."
 msgstr "Отсутствует идентификатор."
 
@@ -17489,12 +17998,33 @@ msgstr "Экспорт скрипта отладки"
 msgid "Could not open file \"%s\"."
 msgstr "Не удалось открыть файл «%s»."
 
+msgid ""
+"Mismatching custom export template executable architecture, found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"Несоответствующая архитектура исполняемого файла пользовательского шаблона "
+"экспорта, обнаружено «%s», ожидалось «%s»."
+
 msgid "Debug Console Export"
 msgstr "Экспорт консоли отладки"
 
 msgid "Could not create console wrapper."
 msgstr "Не удалось создать консольную надстройку."
 
+msgid ""
+"Mismatching custom debug export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Несоответствующая архитектура исполняемого файла шаблона экспорта отладки: "
+"обнаружено «%s», ожидалось «%s»."
+
+msgid ""
+"Mismatching custom release export template executable architecture: found "
+"\"%s\", expected \"%s\"."
+msgstr ""
+"Несоответствующая архитектура исполняемого файла шаблона экспорта "
+"пользовательского релиза: обнаружено «%s», ожидалось «%s»."
+
 msgid "Failed to open executable file \"%s\"."
 msgstr "Не удалось открыть исполняемый файл «%s»."
 
@@ -17748,6 +18278,14 @@ msgstr ""
 msgid "Could not created symlink \"%s\" -> \"%s\"."
 msgstr "Не удалось создать символическую ссылку «%s» -> «%s»."
 
+msgid ""
+"Unable to set Unix permissions for executable \"%s\". Use \"chmod +x\" to set "
+"it after transferring the exported .app to macOS or Linux."
+msgstr ""
+"Не удалось установить разрешения Unix для исполняемого файла \"%s\". "
+"Используйте команду \"chmod +x\", чтобы установить разрешения после передачи "
+"экспортированного файла .app в macOS или Linux."
+
 msgid "Could not open \"%s\"."
 msgstr "Не удалось открыть «%s»."
 
@@ -17946,6 +18484,13 @@ msgstr "Изменение ресурсов"
 msgid "Icon size \"%d\" is missing."
 msgstr "Размер значков «%d» отсутствует."
 
+msgid ""
+"Mismatching custom export template executable architecture: found \"%s\", "
+"expected \"%s\"."
+msgstr ""
+"Несоответствующая архитектура исполняемого файла пользовательского шаблона "
+"экспорта: обнаружено «%s», ожидалось «%s»."
+
 msgid "Failed to rename temporary file \"%s\"."
 msgstr "Невозможно переименовать временный файл «%s»."
 
@@ -18070,6 +18615,17 @@ msgstr ""
 "Для анимации Particles2D требуется использовать CanvasItemMaterial с "
 "включённой опцией «Анимация частиц»."
 
+msgid ""
+"Particle trails are only available when using the Forward+ or Mobile "
+"renderers."
+msgstr ""
+"Следы частиц доступны только при использовании рендеров Forward+ или Mobile."
+
+msgid ""
+"Particle sub-emitters are not available when using the Compatibility renderer."
+msgstr ""
+"Суб-эмиттеры частиц недоступны при использовании рендерера совместимости."
+
 msgid ""
 "A texture with the shape of the light must be supplied to the \"Texture\" "
 "property."
@@ -18095,6 +18651,23 @@ msgid ""
 "be useful."
 msgstr "Начальное положение NavigationLink2D должно отличаться от конечного."
 
+msgid "NavigationObstacle2D does not support negative or zero scaling."
+msgstr ""
+"NavigationObstacle2D не поддерживает отрицательное или нулевое "
+"масштабирование."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest value along the "
+"two axes of the global scale will be used to scale the radius. This value may "
+"change in unexpected ways when the node is rotated."
+msgstr ""
+"Радиус агента может меняться только равномерно. Самое большое значение по "
+"двум осям глобального масштаба будет использовано для масштабирования "
+"радиуса. Это значение может меняться неожиданным образом при повороте узла."
+
+msgid "Skew has no effect on the agent radius."
+msgstr "Перекос не влияет на радиус агента."
+
 msgid ""
 "A NavigationMesh resource must be set or created for this node to work. "
 "Please set a property or draw a polygon."
@@ -18169,6 +18742,13 @@ msgstr ""
 "Для работы CollisionShape2D необходимо предоставить форму. Создайте ресурс "
 "формы."
 
+msgid ""
+"The CollisionShape2D node has limited editing options for polygon-based "
+"shapes. Consider using a CollisionPolygon2D node instead."
+msgstr ""
+"Узел CollisionShape2D имеет ограниченные настройки редактирования для форм, "
+"основанных на полигонах. Рассмотрите использование узла CollisionPolygon2D."
+
 msgid "Node A and Node B must be PhysicsBody2Ds"
 msgstr "Узел A и узел B должны быть экземплярами класса PhysicsBody2D"
 
@@ -18322,6 +18902,9 @@ msgstr ""
 "Для анимации CPUParticles3D требуется использовать StandardMaterial3D, в "
 "котором параметр «Режим билборда» установлен в значение «Particle Billboard»."
 
+msgid "Decals are only available when using the Forward+ or Mobile renderers."
+msgstr "Декали доступны только при использовании рендеров Forward+ или Mobile."
+
 msgid ""
 "The decal has no textures loaded into any of its texture properties, and will "
 "therefore not be visible."
@@ -18351,6 +18934,9 @@ msgstr ""
 "Чтобы устранить эту проблему, включите хотя бы один бит в свойстве маски "
 "отсечения."
 
+msgid "Fog Volumes are only visible when using the Forward+ renderer."
+msgstr "Объемный туман доступен только при использовании рендерера Forward+."
+
 msgid ""
 "Fog Volumes need volumetric fog to be enabled in the scene's Environment in "
 "order to be visible."
@@ -18393,6 +18979,13 @@ msgstr ""
 "Следы включены, но один или несколько материалов сетки отсутствуют или не "
 "установлены для отрисовки следов."
 
+msgid ""
+"Particle sub-emitters are only available when using the Forward+ or Mobile "
+"renderers."
+msgstr ""
+"Суб-эмиттеры частиц доступны только при использовании рендереров Forward+ или "
+"Mobile."
+
 msgid ""
 "The Bake Mask has no bits enabled, which means baking will not produce any "
 "collision for this GPUParticlesCollisionSDF3D.\n"
@@ -18408,6 +19001,13 @@ msgstr "Масштаб света не влияет на визуальный р
 msgid "Projector texture only works with shadows active."
 msgstr "Текстура проектора работает только при активных тенях."
 
+msgid ""
+"Projector textures are not supported when using the Compatibility renderer "
+"yet. Support will be added in a future release."
+msgstr ""
+"Текстуры проектора ещё не поддерживаются при использовании визуализации "
+"Совместимости. Поддержка будет добавлена в будущем выпуске."
+
 msgid "A SpotLight3D with an angle wider than 90 degrees cannot cast shadows."
 msgstr "SpotLight3D с углом более 90 градусов не может отбрасывать тени."
 
@@ -18435,6 +19035,47 @@ msgstr "Генерация объёмов зонда"
 msgid "Generating Probe Acceleration Structures"
 msgstr "Генерация структур ускорения зонда"
 
+msgid ""
+"Lightmaps can only be baked from a GPU that supports the RenderingDevice "
+"backends.\n"
+"Your GPU (%s) does not support RenderingDevice, as it does not support "
+"Vulkan, Direct3D 12, or Metal.\n"
+"Lightmap baking will not be available on this device, although rendering "
+"existing baked lightmaps will work."
+msgstr ""
+"Карты освещения могут быть запечены только при использовании видеокарты с "
+"поддержкой бэкенда RenderingDevice.\n"
+"Ваша видеокарта (%s) не поддерживает RenderingDevice, так как не поддерживает "
+"Vulkan, Direct3D 12, или Metal.\n"
+"Запекание карт освещения не будет доступно на этом устройстве, хотя рендеринг "
+"существующих запечённых карт освещения будет работать."
+
+msgid ""
+"The lightmap has no baked shadowmask textures. Please rebake with the "
+"Shadowmask Mode set to anything other than None."
+msgstr ""
+"Карта освещения не содержит запечённых текстур карт теней. Пожалуйста, "
+"запеките заново с установкой режима карт теней на любое значение, кроме Нет."
+
+msgid ""
+"Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will "
+"still work."
+msgstr ""
+"Карты освещения не могут быть запечены на %s. Рендеринг существующих "
+"запечённых карт освещения всё ещё будет работать."
+
+msgid ""
+"Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at "
+"compile-time. Rendering existing baked lightmaps will still work."
+msgstr ""
+"Карты освещения не могут быть запечены, так как модуль `lightmapper_rd` был "
+"отключен во время компиляции. Рендеринг существующих запечённых карт "
+"освещения всё ещё будет работать."
+
+msgid "Forward axis and primary rotation axis must not be parallel."
+msgstr ""
+"Передняя ось и основная ось вращения не могут быть параллельны друг другу."
+
 msgid ""
 "The NavigationAgent3D can be used only under a Node3D inheriting parent node."
 msgstr ""
@@ -18446,6 +19087,25 @@ msgid ""
 "be useful."
 msgstr "Начальное положение NavigationLink3D должно отличаться от конечного."
 
+msgid ""
+"NavigationObstacle3D only takes global rotation around the y-axis into "
+"account. Rotations around the x-axis or z-axis might lead to unexpected "
+"results."
+msgstr ""
+"NavigationObstacle3D берёт в расчёт только глобальное вращение вокруг оси Y. "
+"Вращения вокруг осей X и Z могут привести к неожиданным результатам."
+
+msgid "NavigationObstacle3D does not support negative or zero scaling."
+msgstr ""
+"NavigationObstacle3D не поддерживает негативное или нулевое масштабирование."
+
+msgid ""
+"The agent radius can only be scaled uniformly. The largest scale value along "
+"the three axes will be used."
+msgstr ""
+"Радиус агента может быть масштабирован только равномерно. Будет использован "
+"наибольший масштаб по трём осям."
+
 msgid ""
 "Occlusion culling is disabled in the Project Settings, which means occlusion "
 "culling won't be performed in the root viewport.\n"
@@ -18668,6 +19328,9 @@ msgstr ""
 "Свойство «Удалённый путь» должно указывать на действительный узел Node3D или "
 "на действительный производный от Node3D узел."
 
+msgid "There is no child Skeleton3D!"
+msgstr "Не назначен дочерний Skeleton3D!"
+
 msgid "Skeleton3D node not set! SkeletonModifier3D must be child of Skeleton3D."
 msgstr ""
 "Узел Skeleton3D не задан! SkeletonModifier3D должен быть дочерним элементом "
@@ -18676,6 +19339,9 @@ msgstr ""
 msgid "This body will be ignored until you set a mesh."
 msgstr "Это тело будет игнорироваться, пока вы не установите сетку."
 
+msgid "Parent node should be a SpringBoneSimulator3D node."
+msgstr "Родительский узел должен быть узлом SpringBoneSimulator3D."
+
 msgid ""
 "A SpriteFrames resource must be created or set in the \"Sprite Frames\" "
 "property in order for AnimatedSprite3D to display frames."
@@ -18739,6 +19405,13 @@ msgstr "Генерация поля расстояния"
 msgid "Finishing Plot"
 msgstr "Завершение построения"
 
+msgid ""
+"VoxelGI nodes are not supported when using the Compatibility renderer yet. "
+"Support will be added in a future release."
+msgstr ""
+"Узлы VoxelGI ещё не поддерживаются при использовании визуализации "
+"Совместимости. Поддержка будет добавлена в будущем выпуске."
+
 msgid ""
 "No VoxelGI data set, so this node is disabled. Bake static objects to enable "
 "GI."
@@ -18819,6 +19492,15 @@ msgstr ""
 msgid "Copy this constructor in a script."
 msgstr "Копировать этот конструктор в скрипт."
 
+msgid "Load Color Palette"
+msgstr "Загрузить палитру"
+
+msgid "Save Color Palette"
+msgstr "Сохранить палитру"
+
+msgid "Quick Load"
+msgstr "Быстрая загрузка"
+
 msgid "Switch between hexadecimal and code values."
 msgstr "Переключение между шестнадцатеричными и кодовыми значениями."
 
@@ -18864,6 +19546,16 @@ msgstr ""
 "Текущий шрифт не поддерживает рендеринг одного или нескольких символов, "
 "которые используются в тексте этой метки."
 
+msgid ""
+"The current theme style has shadows and/or rounded corners for popups, but "
+"those won't display correctly if \"display/window/per_pixel_transparency/"
+"allowed\" isn't enabled in the Project Settings, nor if it isn't supported."
+msgstr ""
+"Текущий стиль темы имеет тени и/или закругленные углы для всплывающих окон, "
+"но они не будут отображаться правильно, если параметр \"display/window/"
+"per_pixel_transparency/allowed\" не включен в настройках проекта или если он "
+"не поддерживается."
+
 msgid "If \"Exp Edit\" is enabled, \"Min Value\" must be greater than 0."
 msgstr "Если «Exp Edit» включён, «Min Value» должно быть больше 0."
 
@@ -19048,6 +19740,12 @@ msgstr "Использовать все поверхности"
 msgid "Surface Index"
 msgstr "Индекс поверхности"
 
+msgid "Division by zero error."
+msgstr "Ошибка деления на ноль."
+
+msgid "Modulo by zero error."
+msgstr "Ошибка деления по модулю на ноль."
+
 msgid ""
 "Invalid number of arguments when calling stage function '%s', which expects "
 "%d arguments."
@@ -19123,6 +19821,16 @@ msgstr "Ожидалось «,» или «)» после аргумента."
 msgid "Varying may not be assigned in the '%s' function."
 msgstr "В функции «%s» нельзя задать вариацию."
 
+msgid "Varying with '%s' data type may only be assigned in the '%s' function."
+msgstr "Вариация с типом данных «%s» может быть задана только в функции '%s'."
+
+msgid ""
+"Varyings which assigned in '%s' function may not be reassigned in '%s' or "
+"'%s'."
+msgstr ""
+"Вариации, заданные в функции '%s', не могут быть переназначены в '%s' или "
+"'%s'."
+
 msgid "'%s' cannot be used within the '%s' processor function."
 msgstr "Нельзя использовать «%s» в функции обработчика «%s»."
 
@@ -19181,6 +19889,9 @@ msgstr "Ожидалась положительная целочисленная
 msgid "Invalid data type for the array."
 msgstr "Неверный тип данных для массива."
 
+msgid "Array size mismatch. Expected %d elements (found %d)."
+msgstr "Несоответствие размера массивов. Ожидается %d элементов (найдено %d)."
+
 msgid "Expected array initialization."
 msgstr "Ожидалась инициализация массива."
 
@@ -19235,6 +19946,13 @@ msgstr ""
 msgid "Can't use function as identifier: '%s'."
 msgstr "Нельзя использовать функцию в качестве идентификатора: «%s»."
 
+msgid "Varying with '%s' data type may only be used in the '%s' function."
+msgstr ""
+"Вариация с типом данных '%s' может использоваться только в функции '%s'."
+
+msgid "Varying '%s' must be assigned in the '%s' function first."
+msgstr "Вариацию '%s' сначала необходимо задать в функции '%s'."
+
 msgid "Only integer expressions are allowed for indexing."
 msgstr "До индексирования допускаются только целочисленные выражения."
 
@@ -19314,6 +20032,9 @@ msgstr ""
 msgid "Expected a boolean expression."
 msgstr "Ожидалось логическое выражение."
 
+msgid "Expected an integer or unsigned integer expression."
+msgstr "Ожидалось целочисленное или беззнаковое целочисленное выражение."
+
 msgid "Cases must be defined before default case."
 msgstr "Необходимо определить варианты перед выбором варианта по умолчанию."
 
@@ -19323,6 +20044,9 @@ msgstr "Вариант по умолчанию должен быть опред
 msgid "'%s' must be placed within a '%s' block."
 msgstr "«%s» необходимо поместить внутри блока «%s»."
 
+msgid "Expected an unsigned integer constant."
+msgstr "Ожидалась целочисленная или беззнаковая целочисленная константа."
+
 msgid "Expected an integer constant."
 msgstr "Ожидалась целочисленная константа."
 
@@ -19335,15 +20059,24 @@ msgstr "Нельзя использовать «%s» в функции обра
 msgid "Expected '%s' with an expression of type '%s'."
 msgstr "Ожидалось «%s» с выражением типа «%s»."
 
+msgid "'%s' function cannot return a value."
+msgstr "Функция '%s' не может возвращать значение."
+
 msgid "Expected return with an expression of type '%s'."
 msgstr "Ожидался результат с выражением типа «%s»."
 
+msgid "Use of '%s' is not supported for the '%s' shader type."
+msgstr "Использование '%s' не поддерживается для типа шейдера '%s'."
+
 msgid "'%s' is not allowed outside of a loop or '%s' statement."
 msgstr "«%s» не может использоваться вне цикла или оператора «%s»."
 
 msgid "'%s' is not allowed outside of a loop."
 msgstr "«%s» не может использоваться вне цикла."
 
+msgid "The middle expression is expected to have a boolean data type."
+msgstr "Ожидается, что выражение посередине будет иметь логический тип данных."
+
 msgid "The left expression is expected to be a variable declaration."
 msgstr "Ожидается, что выражение слева будет объявлением переменной."
 
@@ -19461,6 +20194,15 @@ msgstr "Ожидалось «,» после целочисленной конс
 msgid "Expected an integer constant after ','."
 msgstr "Ожидалась целочисленная константа после «,»."
 
+msgid "Enum hint is for '%s' only."
+msgstr "Подсказка диапазона доступна только для '%s'."
+
+msgid "Expected a string constant."
+msgstr "Ожидалась строковая константа."
+
+msgid "Expected ',' or ')' after string constant."
+msgstr "Ожидалось ',' или ')' после строковой константы."
+
 msgid "Can only specify '%s' once."
 msgstr "Можно указать «%s» только один раз."
 
@@ -19471,6 +20213,13 @@ msgid "Allowed instance uniform indices must be within [0..%d] range."
 msgstr ""
 "Допустимые индексы униформ экземпляров должны находиться в диапазоне [0..%d]."
 
+msgid ""
+"'hint_normal_roughness_texture' is only available when using the Forward+ "
+"renderer."
+msgstr ""
+"Опция 'hint_normal_roughness_texture' доступна только при использовании "
+"визуализации Forward+."
+
 msgid "'hint_normal_roughness_texture' is not supported in '%s' shaders."
 msgstr "«hint_normal_roughness_texture» не поддерживается в шейдерах «%s»."
 
@@ -19558,6 +20307,10 @@ msgstr ""
 msgid "Expected an identifier after type."
 msgstr "Ожидался идентификатор после типа."
 
+msgid "'%s' qualifier cannot be used with a function return type."
+msgstr ""
+"Квалификатор '%s' нельзя использовать в качестве возвращаемого типа функции."
+
 msgid ""
 "The '%s' qualifier cannot be used within a function parameter declared with "
 "'%s'."
@@ -19589,6 +20342,18 @@ msgstr "Ожидалось «{» для начала функции."
 msgid "Expected at least one '%s' statement in a non-void function."
 msgstr "Ожидался хотя бы один оператор «%s» в функции не void-типа."
 
+msgid ""
+"Varying with integer data type must be declared with `%s` interpolation "
+"qualifier."
+msgstr ""
+"Вариацию с целочисленным типом данных необходимо объявить с квалификатором "
+"интерполяции `%s`."
+
+msgid "Too many varyings used in shader (%d used, maximum supported is %d)."
+msgstr ""
+"В шейдере слишком много вариаций (использовано %d, максимальное "
+"поддерживаемое количество — %d)."
+
 msgid "uniform buffer"
 msgstr "буфер параметров шейдера"
 
@@ -19634,6 +20399,9 @@ msgstr "Пропущено условие."
 msgid "Condition evaluation error."
 msgstr "Ошибка вычисления условия."
 
+msgid "Invalid '%s' directive."
+msgstr "Недопустимая директива '%s'."
+
 msgid "Shader include file does not exist:"
 msgstr "Файл включения шейдера не существует:"
 
@@ -19653,6 +20421,9 @@ msgstr "Найдено циклическое включение"
 msgid "Shader max include depth exceeded."
 msgstr "Превышена максимальная глубина включения шейдера."
 
+msgid "Cannot use '%s' on built-in define."
+msgstr "Невозможно использовать '%s' на встроенном назначении."
+
 msgid "Macro expansion limit exceeded."
 msgstr "Превышен лимит раскрытия макроса."
 
diff --git a/engine/editor/translations/editor/sv.po b/engine/editor/translations/editor/sv.po
index 4979df36..47292256 100644
--- a/engine/editor/translations/editor/sv.po
+++ b/engine/editor/translations/editor/sv.po
@@ -44,13 +44,14 @@
 # "Tom B." <burloe@proton.me>, 2024.
 # tygyh <jonis9898@hotmail.com>, 2024.
 # Muhammad <muhammadshamaeem@gmail.com>, 2025.
+# Aglo <wilmer.heltborg2008@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-01-20 18:26+0000\n"
-"Last-Translator: Muhammad <muhammadshamaeem@gmail.com>\n"
+"PO-Revision-Date: 2025-03-09 19:54+0000\n"
+"Last-Translator: Aglo <wilmer.heltborg2008@gmail.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/sv/>\n"
 "Language: sv\n"
@@ -58,7 +59,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Main Thread"
 msgstr "Huvudtråd"
@@ -416,6 +417,9 @@ msgstr "Visa dolda"
 msgid "Swap Input Direction"
 msgstr "Byt inmatningsriktning"
 
+msgid "Start Unicode Character Input"
+msgstr "Starta Unicode karaktär Inmatning"
+
 msgid "Invalid input %d (not passed) in expression"
 msgstr "Ogiltig inmatning %d (passerades inte) i uttrycket"
 
@@ -657,6 +661,28 @@ msgstr "Ändra animationens längd"
 msgid "Change Animation Loop"
 msgstr "Ändra animationens slinga"
 
+msgid ""
+"Can't change loop mode on animation instanced from an imported scene.\n"
+"\n"
+"To change this animation's loop mode, navigate to the scene's Advanced Import "
+"settings and select the animation.\n"
+"You can then change the loop mode from the inspector menu."
+msgstr ""
+"Kan inte ändra loopläge på en animation instanserad från en importerad scen.\n"
+"\n"
+"För att ändra loopläget för denna animation, gå till scenens Avancerade "
+"Importinställningar och välj animationen.\n"
+"Du kan sedan ändra loopläget från inspektörmenyn."
+
+msgid ""
+"Can't change loop mode on animation embedded in another scene.\n"
+"\n"
+"You must open this scene and change the animation's loop mode from there."
+msgstr ""
+"Kan inte ändra sling-läge på animation som är inbäddad i en annan scen.\n"
+"\n"
+"Du måste öppna denna scen och ändra animations sling-läget därifrån."
+
 msgid "Property Track..."
 msgstr "Egenskaps-spår…"
 
@@ -1048,6 +1074,15 @@ msgstr "Visa bara spår från markerade noder i trädet."
 msgid "Group tracks by node or display them as plain list."
 msgstr "Gruppera spår efter nod eller visa dem som enkel lista."
 
+msgid "Apply snapping to timeline cursor."
+msgstr "Applicera snappning till tidslinjemarkören."
+
+msgid "Apply snapping to selected key(s)."
+msgstr "Applicera snappning på markerade nycklar.."
+
+msgid "Apply snapping to the nearest integer FPS."
+msgstr "Applicera snappning till närmaste heltal av FPS."
+
 msgid "Animation step value."
 msgstr "Animations-stegvärde."
 
@@ -1434,6 +1469,9 @@ msgstr "Koppla bort signal-argument:"
 msgid "Receiver Method:"
 msgstr "Mottagarmetod:"
 
+msgid "Pick"
+msgstr "Välj"
+
 msgid "Advanced"
 msgstr "Avancerad"
 
@@ -1518,6 +1556,9 @@ msgstr "Skapa ny %s"
 msgid "No results for \"%s\"."
 msgstr "Inga resultat för ”%s”."
 
+msgid "Script path: %s"
+msgstr "Skript sökväg: %s"
+
 msgid "This class is marked as deprecated."
 msgstr "Den här klassen har markerats som utfasad."
 
@@ -1904,6 +1945,9 @@ msgstr ""
 msgid "Cannot remove:"
 msgstr "Kan inte ta bort:"
 
+msgid "Files to be deleted:"
+msgstr "Radera markerade:"
+
 msgid "Error loading:"
 msgstr "Fel vid inläsning:"
 
@@ -1958,6 +2002,9 @@ msgstr "En mapp med det namnet finns redan."
 msgid "Using slashes in folder names will create subfolders recursively."
 msgstr "Snedstreck i mappnamn skapar rekursiva undermappar."
 
+msgid "Base path: %s"
+msgstr "Grundsökvägen: %s"
+
 msgid "Folder name is valid."
 msgstr "Mappnamnet är giltigt."
 
@@ -2503,6 +2550,12 @@ msgstr "[tom]"
 msgid "[unsaved]"
 msgstr "[osparad]"
 
+msgid "Open the %s dock."
+msgstr "Öppna %s fliken."
+
+msgid "Focus on the %s dock."
+msgstr "Fokusera på %s fliken."
+
 msgid "Move this dock right one tab."
 msgstr "Flytta den här fliken åt höger."
 
@@ -2676,6 +2729,9 @@ msgstr "Spara & starta om"
 msgid "ScanSources"
 msgstr "Scan-källor"
 
+msgid "Updating Scene Groups"
+msgstr "Uppdaterar Scengrupper"
+
 msgid ""
 "There are multiple importers for different types pointing to file %s, import "
 "aborted"
@@ -2686,6 +2742,9 @@ msgstr ""
 msgid "(Re)Importing Assets"
 msgstr "(Om)importerar assets"
 
+msgid "Preparing files to reimport..."
+msgstr "Förbereder scener för omladdning..."
+
 msgid "Import resources of type: %s"
 msgstr "Importerar resurser av typen: %s"
 
@@ -2963,9 +3022,18 @@ msgstr "Klass"
 msgid "Constant"
 msgstr "Konstant"
 
+msgid "Metadata"
+msgstr "Metadata"
+
+msgid "Setting"
+msgstr "Inställning"
+
 msgid "Property"
 msgstr "Egenskap"
 
+msgid "Internal Property"
+msgstr "Intern egenskap"
+
 msgid "This property can only be set in the Inspector."
 msgstr "Den här egenskapen kan bara ställas in i Granskaren."
 
@@ -2981,9 +3049,15 @@ msgstr "Signal"
 msgid "Annotation"
 msgstr "Anteckning"
 
+msgid "TextFile"
+msgstr "Textfil"
+
 msgid "File"
 msgstr "Arkiv"
 
+msgid "Invalid path"
+msgstr "Ogiltig sökväg"
+
 msgid "%d match."
 msgstr "%d träff."
 
@@ -3047,6 +3121,9 @@ msgstr "Den här medlemmen har markerats som utfasad."
 msgid "This member is marked as experimental."
 msgstr "Den här medlemmen har markerats som experimentell."
 
+msgid "Unfavorite Property"
+msgstr "Ta bort från favoriter"
+
 msgid "Pin Value"
 msgstr "Fäst värde"
 
@@ -3610,6 +3687,9 @@ msgstr "Rensa Senaste scener"
 msgid "There is no defined scene to run."
 msgstr "Det finns ingen definierad scen att köra."
 
+msgid "Editor layout ready."
+msgstr "Reddigerarlayout redo."
+
 msgid "Save Layout..."
 msgstr "Spara layout..."
 
@@ -3985,6 +4065,15 @@ msgstr "Mallpaket"
 msgid "Open & Run a Script"
 msgstr "Öppna & kör ett skript"
 
+msgid "The following files are newer on disk:"
+msgstr "Följande filer är nyare på disk:"
+
+msgid "What action should be taken?"
+msgstr "Vilken åtgärd ska tas?"
+
+msgid "Reload from disk"
+msgstr "Ladda om från disk"
+
 msgid "Create/Override Version Control Metadata..."
 msgstr "Skapa/skriv över versionshanterings-metadata..."
 
@@ -4109,6 +4198,12 @@ msgstr "Ny nyckel:"
 msgid "New Value:"
 msgstr "Nytt värde:"
 
+msgid "%s%s (size %d)"
+msgstr "%s%s (storlek %s)"
+
+msgid "%s (size %d)"
+msgstr "%s (storlek %d)"
+
 msgid "Size:"
 msgstr "Storlek:"
 
@@ -4204,6 +4299,9 @@ msgstr "Inget"
 msgid "Common"
 msgstr "Vanliga"
 
+msgid "Event %d"
+msgstr "Händelse %d"
+
 msgid "Editor Settings"
 msgstr "Redigerarinställningar"
 
@@ -4411,6 +4509,9 @@ msgstr "Lagrar filen:"
 msgid "No export template found at the expected path:"
 msgstr "Ingen exportmall hittades i den väntade sökvägen:"
 
+msgid "ZIP Creation"
+msgstr "ZIP Skapande"
+
 msgid "Could not open file to read from path \"%s\"."
 msgstr "Kunde inte öppna fil för läsning med sökvägen \"%s\"."
 
@@ -4426,6 +4527,9 @@ msgstr "Kan inte skapa filen \"%s\"."
 msgid "Failed to export project files."
 msgstr "Kunde inte exportera projektfiler."
 
+msgid "No files or changes to export."
+msgstr "Inga filer eller ändringar att exportera."
+
 msgid "Can't open file for writing at path \"%s\"."
 msgstr "Kan inte öppna fil för skrivning med sökvägen \"%s\"."
 
@@ -4444,6 +4548,9 @@ msgstr "Kan inte öppna fil för läsning med sökvägen \"%s\"."
 msgid "Save ZIP"
 msgstr "Spara ZIP"
 
+msgid "Failed to move temporary file \"%s\" to \"%s\"."
+msgstr "Misslyckades att flytta temporär fil \"%s\" till \"%s\"."
+
 msgid "Custom debug template not found."
 msgstr "Anpassad avlusningsmall hittades ej."
 
@@ -4476,6 +4583,9 @@ msgid "On 32-bit exports the embedded PCK cannot be bigger than 4 GiB."
 msgstr ""
 "Vid 32-bitars-export får den inbäddade PCK:ns storlek inte överskrida 4 GiB."
 
+msgid "Failed to copy shared object \"%s\"."
+msgstr "Misslyckades att kopiera delat objekt \"%s\"."
+
 msgid "Plugin \"%s\" is not supported on \"%s\""
 msgstr "Pluginet \"%s\" stöds inte på \"%s\""
 
@@ -4650,6 +4760,9 @@ msgstr "Installera från fil"
 msgid "Install templates from a local file."
 msgstr "Installera mallar från lokal fil."
 
+msgid "Go Online"
+msgstr "Gå online"
+
 msgid "Cancel the download of the templates."
 msgstr "Avbryt nedladdningen av mallar."
 
@@ -5485,6 +5598,9 @@ msgstr "Inga under-resurser hittades."
 msgid "Open a list of sub-resources."
 msgstr "Öppna en lista med alla under-resurser."
 
+msgid " (recently opened)"
+msgstr " Nyligen uppdaterad"
+
 msgid "Play the project."
 msgstr "Kör projektet."
 
@@ -7080,9 +7196,6 @@ msgstr ""
 "Assetbiblioteket kräver en uppkoppling och innebär att data skickas över "
 "nätet."
 
-msgid "Go Online"
-msgstr "Gå online"
-
 msgid "Failed to get repository configuration."
 msgstr "Kunde inte hämta repo-konfiguration."
 
@@ -8002,6 +8115,9 @@ msgstr "Östasiatiska bredder"
 msgid "Numeral Alignment"
 msgstr "Numerisk rättning"
 
+msgid "Variation"
+msgstr "Variant"
+
 msgid "Unable to preview font"
 msgstr "Kan inte förhandsvisa typsnitt"
 
@@ -8550,6 +8666,9 @@ msgstr "Ortogonal bakifrån"
 msgid "Rear Perspective"
 msgstr "Perspektiv bakifrån"
 
+msgid "[auto]"
+msgstr "[auto]"
+
 msgid "X-Axis Transform."
 msgstr "X-axel-transformering."
 
@@ -13924,9 +14043,6 @@ msgstr "Featuretaggar"
 msgid "Pick Root Node Type"
 msgstr "Välj rotnods-typ"
 
-msgid "Pick"
-msgstr "Välj"
-
 msgid "Scene name is empty."
 msgstr "Scenens namn är tomt."
 
@@ -16166,8 +16282,39 @@ msgstr "Duplicerat filterläge: '%s'."
 msgid "Duplicated repeat mode: '%s'."
 msgstr "Duplicerat repeteringsläge: '%s'."
 
+msgid "Expected '(' after function identifier."
+msgstr "Förväntade '(' efter funktion identifierare."
+
+msgid ""
+"Global non-constant variables are not supported. Expected '%s' keyword before "
+"constant definition."
+msgstr ""
+"Global icke-konstant variabel är inte stöttade. Förväntade '%s' nyckelord "
+"innan konstant definition."
+
+msgid "Expected an identifier after type."
+msgstr "Förväntade en identifierare efter typ."
+
+msgid "Expected a valid data type for argument."
+msgstr "Förväntade en giltig datatyp för argumentet."
+
+msgid "Expected an identifier for argument name."
+msgstr "Förväntade en identifierare för argument namnet."
+
+msgid "Function '%s' expects no arguments."
+msgstr "Funktion '%s' förväntade inga argument."
+
+msgid "Function '%s' must be of '%s' return type."
+msgstr "Funktionen '%s' måste ha returtypen '%s'."
+
+msgid "Expected a '{' to begin function."
+msgstr "Förväntade '{' för att skapa en ny funktion."
+
+msgid "Expected a '%s'."
+msgstr "Förväntade en '%s'."
+
 msgid "Expected a '%s' or '%s'."
-msgstr "Förväntade en'%s' eller '%s'."
+msgstr "Förväntade en '%s' eller '%s'."
 
 msgid "Expected a '%s' after '%s'."
 msgstr "Förväntat \"%s\" efter \"%s\"."
@@ -16175,6 +16322,15 @@ msgstr "Förväntat \"%s\" efter \"%s\"."
 msgid "Redefinition of '%s'."
 msgstr "Omdefiniering av '%s'."
 
+msgid "Unmatched '%s' directive."
+msgstr "Oöverträffad \"%s\" direktiv."
+
+msgid "Missing condition."
+msgstr "Saknar villkor."
+
+msgid "Invalid '%s' directive."
+msgstr "Ogiltigt '%s' direktiv."
+
 msgid "Shader include file does not exist:"
 msgstr "Inkluderbar shaderfil finns inte:"
 
diff --git a/engine/editor/translations/editor/tok.po b/engine/editor/translations/editor/tok.po
new file mode 100644
index 00000000..37377f39
--- /dev/null
+++ b/engine/editor/translations/editor/tok.po
@@ -0,0 +1,4076 @@
+# Toki Pona translation of the Godot Engine editor interface.
+# Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md).
+# Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.
+# This file is distributed under the same license as the Godot source code.
+#
+# Dark King <damir@t1c.ru>, 2024.
+# Julia Allen <juliaallen0626@gmail.com>, 2024.
+# Bee Crankson <ProfB.crankson@gmail.com>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: Godot Engine editor interface\n"
+"Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
+"PO-Revision-Date: 2025-03-19 02:17+0000\n"
+"Last-Translator: Bee Crankson <ProfB.crankson@gmail.com>\n"
+"Language-Team: Toki Pona <https://hosted.weblate.org/projects/godot-engine/"
+"godot/tok/>\n"
+"Language: tok\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 5.11-dev\n"
+
+msgid "Main Thread"
+msgstr "linja lawa"
+
+msgid "Unset"
+msgstr "ala"
+
+msgid "Physical"
+msgstr "lon"
+
+msgid "Left Mouse Button"
+msgstr "nena soto pi ilo luka"
+
+msgid "Right Mouse Button"
+msgstr "nena teje pi ilo luka"
+
+msgid "Middle Mouse Button"
+msgstr "nena meso pi ilo luka"
+
+msgid "Mouse Wheel Up"
+msgstr "tawa sewi tan ilo sike luka"
+
+msgid "Mouse Wheel Down"
+msgstr "tawa anpa tan ilo sike luka"
+
+msgid "Mouse Wheel Left"
+msgstr "tawa soto tan ilo sike luka"
+
+msgid "Mouse Wheel Right"
+msgstr "tawa teje tan ilo sike luka"
+
+msgid "Mouse Thumb Button 1"
+msgstr "nena luka nanpa 1 pi ilo luka"
+
+msgid "Mouse Thumb Button 2"
+msgstr "nena luka nanpa 2 pi ilo luka"
+
+msgid "Button"
+msgstr "nena pali"
+
+msgid "Double Click"
+msgstr "pilin tu"
+
+msgid "Mouse motion at position (%s) with velocity (%s)"
+msgstr "tawa pi ilo pana li lon e (%s) kepeken nanpa tawa (%s)"
+
+msgid "Left Stick X-Axis, Joystick 0 X-Axis"
+msgstr "nasin X pi palisa soto, nasin X pi palisa musi nanpa 0"
+
+msgid "Left Stick Y-Axis, Joystick 0 Y-Axis"
+msgstr "nasin Y pi palisa soto, nasin Y pi palisa musi nanpa 0"
+
+msgid "Right Stick X-Axis, Joystick 1 X-Axis"
+msgstr "nasin X pi palisa teje, nasin X pi palisa musi nanpa 1"
+
+msgid "Right Stick Y-Axis, Joystick 1 Y-Axis"
+msgstr "nasin Y pi palisa teje, nasin Y pi palisa musi nanpa 1"
+
+msgid "Joystick 2 X-Axis, Left Trigger, Sony L2, Xbox LT"
+msgstr ""
+"nasin X pi palisa musi nanpa 2, nena suli soto, nena L2 pi ilo Soni, nena LT "
+"pi ilo Ekipoki"
+
+msgid "Joystick 2 Y-Axis, Right Trigger, Sony R2, Xbox RT"
+msgstr ""
+"nasin Y pi palisa musi nanpa 2, nena suli teje, nena R2 pi ilo Soni, nena RT "
+"pi ilo Ekipoki"
+
+msgid "Joystick 3 X-Axis"
+msgstr "nasin X pi palisa musi nanpa 3"
+
+msgid "Joystick 3 Y-Axis"
+msgstr "nasin Y pi palisa musi nanpa 3"
+
+msgid "Joystick 4 X-Axis"
+msgstr "nasin X pi palisa musi nanpa 4"
+
+msgid "Joystick 4 Y-Axis"
+msgstr "nasin Y pi palisa musi nanpa 4"
+
+msgid "Unknown Joypad Axis"
+msgstr "tawa pi sona mi ala pi nena musi"
+
+msgid "Right Action, Sony Circle, Xbox B, Nintendo A"
+msgstr "pali teje, sike pi ilo Soni, B pi ilo Ekipoki, A pi ilo Nintento"
+
+msgid "Left Action, Sony Square, Xbox X, Nintendo Y"
+msgstr "pali soto, leko pi ilo Soni, X pi ilo Ekipoki, Y pi ilo Nintento"
+
+msgid "Left Stick, Sony L3, Xbox L/LS"
+msgstr "palisa soto, nena L3 pi ilo Soni, nena L/LS pi ilo Ekipoki"
+
+msgid "Right Stick, Sony R3, Xbox R/RS"
+msgstr "palisa teje, nena R3 ilo Soni, nena R/RS pi ilo Ekipoki"
+
+msgid "Left Shoulder, Sony L1, Xbox LB"
+msgstr "nena lili soto, nena L1 pi ilo Soni, nena LB pi ilo Ekipoki"
+
+msgid "Right Shoulder, Sony R1, Xbox RB"
+msgstr "nena lili teje, nena R1 pi ilo Soni, nena RB pi ilo Ekipoki"
+
+msgid "D-pad Up"
+msgstr "sewi pi nena D"
+
+msgid "D-pad Down"
+msgstr "anpa pi nena D"
+
+msgid "D-pad Left"
+msgstr "soto pi nena D"
+
+msgid "D-pad Right"
+msgstr "teje pi nena D"
+
+msgid "Xbox Paddle 1"
+msgstr "nena Patu nanpa 1 pi ilo Ekipoki"
+
+msgid "Xbox Paddle 2"
+msgstr "nena Patu nanpa 2 pi ilo Ekipoki"
+
+msgid "Xbox Paddle 3"
+msgstr "nena Patu nanpa 3 pi ilo Ekipoki"
+
+msgid "Xbox Paddle 4"
+msgstr "nena Patu nanpa 4 pi ilo Ekipoki"
+
+msgid "Joypad Button %d"
+msgstr "nena musi nanpa %d"
+
+msgid "Left"
+msgstr "soto"
+
+msgid "Right"
+msgstr "teje"
+
+msgid "Up"
+msgstr "sewi"
+
+msgid "Down"
+msgstr "anpa"
+
+msgid "Page Up"
+msgstr "tawa lipu sewi"
+
+msgid "Page Down"
+msgstr "tawa lipu anpa"
+
+msgid "Home"
+msgstr "tawa tomo"
+
+msgid "End"
+msgstr "tawa pini"
+
+msgid "Copy"
+msgstr "o jasima"
+
+msgid "New Line"
+msgstr "linja sin"
+
+msgid "New Blank Line"
+msgstr "linja sin pi jo ala"
+
+msgid "New Line Above"
+msgstr "linja sin lon sewi"
+
+msgid "Delete"
+msgstr "o weka"
+
+msgid "Delete Word"
+msgstr "o weka e nimi"
+
+msgid "Duplicate Nodes"
+msgstr "o pali tu e ijo pali"
+
+msgid "Delete Nodes"
+msgstr "o weka e ijo pali"
+
+msgid "B"
+msgstr "B"
+
+msgid "KiB"
+msgstr "KiB"
+
+msgid "MiB"
+msgstr "MiB"
+
+msgid "GiB"
+msgstr "GiB"
+
+msgid "TiB"
+msgstr "TiB"
+
+msgid "PiB"
+msgstr "PiB"
+
+msgid "EiB"
+msgstr "EiB"
+
+msgid ""
+"Invalid action name. It cannot be empty nor contain '/', ':', '=', '\\' or "
+"'\"'"
+msgstr ""
+"nimi pali li ken ala. nimi li ken ala jo e ala e '/', ':', '=', '\\', anu '\"'"
+
+msgid "Clear All"
+msgstr "o weka e ale"
+
+msgid "Name:"
+msgstr "nimi:"
+
+msgid "Time:"
+msgstr "tenpo:"
+
+msgid "Change Animation Length"
+msgstr "o ante e suli pi sitelen tawa"
+
+msgid "Start (s):"
+msgstr "open:"
+
+msgid "End (s):"
+msgstr "pini:"
+
+msgid "node '%s'"
+msgstr "ijo pali '%s'"
+
+msgid "animation"
+msgstr "sitelen tawa"
+
+msgid "Nearest FPS: %d"
+msgstr "FPS poka: %d"
+
+msgid "Rotation"
+msgstr "sike"
+
+msgid "Scale"
+msgstr "suli"
+
+msgid "Audio"
+msgstr "kalama"
+
+msgid "Seconds"
+msgstr "tenpo Sekon"
+
+msgid "FPS"
+msgstr "FPS"
+
+msgid "Edit"
+msgstr "o ante"
+
+msgctxt "Transition Type"
+msgid "Linear"
+msgstr "linja"
+
+msgid "FPS:"
+msgstr "FPS:"
+
+msgid "Error!"
+msgstr "pakala!"
+
+msgid "Go to Line"
+msgstr "o tawa linja"
+
+msgid "Line Number:"
+msgstr "nanpa linja:"
+
+msgid "No match"
+msgstr "sama ala"
+
+msgid "%d match"
+msgid_plural "%d matches"
+msgstr[0] "sama %d"
+
+msgid "%d of %d match"
+msgid_plural "%d of %d matches"
+msgstr[0] "%d tan sama %d"
+
+msgid "Find"
+msgstr "o alasa"
+
+msgid "Previous Match"
+msgstr "sama tawa"
+
+msgid "Next Match"
+msgstr "sama kama"
+
+msgid "Toggle Scripts Panel"
+msgstr "o ante tu e ma pi lipu ilo"
+
+msgid "Errors"
+msgstr "pakala"
+
+msgid "Connect to Node:"
+msgstr "o kulupu tawa ijo pali:"
+
+msgid "Connect to Script:"
+msgstr "o kulupu tawa lipu ilo:"
+
+msgid "Advanced"
+msgstr "namako"
+
+msgid "One Shot"
+msgstr "wan taso"
+
+msgid "Connect"
+msgstr "o kulupu"
+
+msgid "Connect '%s' to '%s'"
+msgstr "o kulupu e '%s' tawa '%s'"
+
+msgid "Disconnect '%s' from '%s'"
+msgstr "o kulupu ala e '%s' tan '%s'"
+
+msgid "Connect..."
+msgstr "o kulupu..."
+
+msgid "Disconnect"
+msgstr "o kulupu ala"
+
+msgid "Edit Connection: '%s'"
+msgstr "o ante e kulupu: '%s'"
+
+msgid "Open Documentation"
+msgstr "o open e lipu toki"
+
+msgid "Copy Name"
+msgstr "o jasima e nimi"
+
+msgid "Edit..."
+msgstr "o ante..."
+
+msgid "Change"
+msgstr "o ante"
+
+msgid "Create New %s"
+msgstr "o pali sin e %s"
+
+msgid "Script path: %s"
+msgstr "nasin pi lipu ilo: %s"
+
+msgid "The script will run in the editor."
+msgstr "kama la lipu ilo li pali lon ilo ante."
+
+msgid "Favorites:"
+msgstr "olin:"
+
+msgid "(Un)favorite selected item."
+msgstr "o olin (ala) e ni."
+
+msgid "Search:"
+msgstr "o alasa:"
+
+msgid "Matches:"
+msgstr "sama:"
+
+msgid "Description:"
+msgstr "toki sona:"
+
+msgid "Copy Node Path"
+msgstr "o jasima e nasin pi ijo pali"
+
+msgid "Toggle Visibility"
+msgstr "o ante tu e ken lukin"
+
+msgid "CPU"
+msgstr "CPU"
+
+msgid "GPU"
+msgstr "GPU"
+
+msgid "Error:"
+msgstr "pakala:"
+
+msgid "%s Error"
+msgstr "pakala %s"
+
+msgid "%s Error:"
+msgstr "pakala %s:"
+
+msgid "Copy Error"
+msgstr "o jasima e pakala"
+
+msgid "Search Replacement For:"
+msgstr "o alasa e sama tan:"
+
+msgid ""
+"Scene '%s' is currently being edited.\n"
+"Changes will only take effect when reloaded."
+msgstr ""
+"tenpo ni la ma pali '%s' li ante.\n"
+"lukin sin la ante li lon taso."
+
+msgid ""
+"Resource '%s' is in use.\n"
+"Changes will only take effect when reloaded."
+msgstr ""
+"ijo li kepeken poki sona '%s'.\n"
+"lukin sin la ante li lon taso."
+
+msgid "Search Replacement Resource:"
+msgstr "o alasa e poki sona sama:"
+
+msgid "Open"
+msgstr "o open"
+
+msgid "Cannot remove:"
+msgstr "ni li ken ala weka:"
+
+msgid "Error loading:"
+msgstr "kama lon la pakala li lon:"
+
+msgid "Errors loading!"
+msgstr "kama lon la pakala li lon!"
+
+msgid "File name contains invalid characters."
+msgstr "nimi lipu li jo e sitelen pi ken ala."
+
+msgid "Folder name contains invalid characters."
+msgstr "nimi pi kulupu lipu li jo e sitelen pi ken ala."
+
+msgid "File with that name already exists."
+msgstr "lipu kepeken nimi ni li lon."
+
+msgid "Folder with that name already exists."
+msgstr "kulupu lipu kepeken nimi ni li lon."
+
+msgid "File name is valid."
+msgstr "nimi lipu li ken."
+
+msgid "Folder name is valid."
+msgstr "nimi pi kulupu lipu li ken."
+
+msgid "Double-click to open in browser."
+msgstr "o pilin tu tawa open lon linja."
+
+msgid "Thanks from the Godot community!"
+msgstr "kulupu pi ilo Koto li pana pona!"
+
+msgid "Godot Engine contributors"
+msgstr "jan pali pi ilo Koto"
+
+msgid "Project Founders"
+msgstr "mama pi ilo Koto"
+
+msgid "Lead Developer"
+msgstr "jan lawa pi toki ilo"
+
+msgctxt "Job Title"
+msgid "Project Manager"
+msgstr "jan lawa pi ilo Koto"
+
+msgid "Developers"
+msgstr "jan pi toki ilo"
+
+msgid "Authors"
+msgstr "jan pali"
+
+msgid "License"
+msgstr "lipu lawa"
+
+msgid "Third-party Licenses"
+msgstr "lipu lawa tan kulupu ante"
+
+msgid ""
+"Godot Engine relies on a number of third-party free and open source "
+"libraries, all compatible with the terms of its MIT license. The following is "
+"an exhaustive list of all such third-party components with their respective "
+"copyright statements and license terms."
+msgstr ""
+"ilo Koto li kepeken lipu open mute pi toki ilo pi mani ala tan kulupu ante. "
+"lipu ni ale li lon toki pi lipu lawa MIT ona. toki kama li lipu ona ale pi "
+"toki ilo e lipu ona pi jasima ala e toki pi lipu ona."
+
+msgid "Licenses"
+msgstr "lipu lawa"
+
+msgid "%s (already exists)"
+msgstr "%s (ni li lon)"
+
+msgid "(and %s more files)"
+msgstr "(en lipu %s)"
+
+msgid "Error saving file: %s"
+msgstr "kama awen e lipu ni la pakala li lon: %s"
+
+msgid "Load"
+msgstr "o kama lon"
+
+msgid "Invalid name."
+msgstr "nimi li ken ala."
+
+msgid "%s is an invalid path. File does not exist."
+msgstr "%s li nasin pi ken ala. lipu li lon ala."
+
+msgid "%s is an invalid path. Not in resource path (res://)."
+msgstr "%s li nasin pi ken ala li lon ala nasin pi poki sona (res://)."
+
+msgid "Path:"
+msgstr "nasin:"
+
+msgid "Node Name:"
+msgstr "nimi pi ijo pali:"
+
+msgid "Global Variable"
+msgstr "nanpa ante pi ma ale"
+
+msgid "XR"
+msgstr "XR"
+
+msgid "File saving failed."
+msgstr "kama awen lipu li pakala."
+
+msgid "New"
+msgstr "o pali sin"
+
+msgid "Save"
+msgstr "o kama awen"
+
+msgid "Please Confirm:"
+msgstr "o toki e lon:"
+
+msgid "Updating scene..."
+msgstr "mi sin e ma pali..."
+
+msgid "[empty]"
+msgstr "[jo ala]"
+
+msgid "[unsaved]"
+msgstr "[awen ala]"
+
+msgid "Open the %s dock."
+msgstr "o open e ma %s."
+
+msgid "%s - Godot Engine"
+msgstr "%s - ilo Koto"
+
+msgid "Move this dock right one tab."
+msgstr "o tawa e ma ni tawa teje wan."
+
+msgid "Move this dock left one tab."
+msgstr "o tawa e ma ni tawa soto wan."
+
+msgid "Dock Position"
+msgstr "lon pi ma ni"
+
+msgid "Move to Bottom"
+msgstr "o tawa anpa"
+
+msgid "Move this dock to the bottom panel."
+msgstr "o tawa e ma ni tawa ma anpa."
+
+msgid "Close this dock."
+msgstr "o pini e ma ni."
+
+msgid "3D Editor"
+msgstr "ilo ante 3D"
+
+msgid "Node Dock"
+msgstr "ma pi ijo pali"
+
+msgid "FileSystem Dock"
+msgstr "ma pi nasin lipu"
+
+msgid "History Dock"
+msgstr "ma pi tenpo pini"
+
+msgid "Game View"
+msgstr "lukin musi"
+
+msgid "(none)"
+msgstr "(ala)"
+
+msgid "Initializing plugins..."
+msgstr "mi open e ilo namako..."
+
+msgid "Restart"
+msgstr "o open sin"
+
+msgid "Save & Restart"
+msgstr "o kama awen o open sin"
+
+msgid "Updating scripts documentation"
+msgstr "mi sin e lipu toki pi lipu ilo"
+
+msgid "Updating Scene Groups"
+msgstr "mi sin e kulupu pi ma pali"
+
+msgid "Copying files..."
+msgstr "mi jasima e lipu..."
+
+msgid "Method Descriptions"
+msgstr "toki sona nasin"
+
+msgid "This method may be changed or removed in future versions."
+msgstr "ken la nasin ni li ante anu weka lon nanpa kama."
+
+msgid "There is currently no description for this method."
+msgstr "tenpo ni la toki sona pi nasin ni li lon ala."
+
+msgid ""
+"There is currently no description for this method. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"tenpo ni la toki sona pi nasin ni li lon ala. sina ken pana pona tan sina "
+"[color=$color][url=$url]pali e wan[/url][/color]!"
+
+msgid "Description"
+msgstr "toki sona"
+
+msgid "Colors"
+msgstr "kule"
+
+msgid "Constants"
+msgstr "nanpa awen"
+
+msgid "Fonts"
+msgstr "nasin sitelen"
+
+msgid "Font Sizes"
+msgstr "suli pi nasin sitelen"
+
+msgid "Icons"
+msgstr "sitelen lili"
+
+msgid "This constant may be changed or removed in future versions."
+msgstr "ken la nanpa awen ni li ante anu weka lon nanpa kama."
+
+msgid "Property Descriptions"
+msgstr "toki sona pi nasin ijo"
+
+msgid "This property may be changed or removed in future versions."
+msgstr "ken la nasin ijo ni li ante anu weka lon nanpa kama."
+
+msgid "There is currently no description for this property."
+msgstr "tenpo ni la toki sona pi nasin ijo ni li lon ala."
+
+msgid ""
+"There is currently no description for this property. Please help us by "
+"[color=$color][url=$url]contributing one[/url][/color]!"
+msgstr ""
+"tenpo ni la toki sona pi nasin ijo ni li lon ala. sina ken pana pona tan sina "
+"[color=$color][url=$url]pali e wan[/url][/color]!"
+
+msgid "Editor"
+msgstr "ilo ante"
+
+msgid "Click to copy."
+msgstr "o pilin tawa jasima."
+
+msgid "Click to open in browser."
+msgstr "o pilin tawa open lon linja."
+
+msgid "No description available."
+msgstr "toki sona li lon ala."
+
+msgid "Show in FileSystem"
+msgstr "o ken lukin lon nasin lipu"
+
+msgid "Open in File Manager"
+msgstr "o open lon lawa lipu"
+
+msgid "Constant"
+msgstr "nanpa awen"
+
+msgid "Setting"
+msgstr "lawa toki"
+
+msgid "Property"
+msgstr "nasin ijo"
+
+msgid "Local Constant"
+msgstr "nanpa awen pi ma ni"
+
+msgid "Local Variable"
+msgstr "nanpa ante pi ma ni"
+
+msgid "TextFile"
+msgstr "lipu toki"
+
+msgid "File"
+msgstr "lipu"
+
+msgid "Invalid UID"
+msgstr "nimi UID li ken ala"
+
+msgid "This UID does not point to any valid Resource."
+msgstr "nimi UID ni li toki ala e poki sona ken."
+
+msgid "Invalid path"
+msgstr "nasin li ken ala"
+
+msgid "This path does not exist."
+msgstr "nasin ni li lon ala."
+
+msgid "%d match."
+msgstr "sama %d."
+
+msgid "%d matches."
+msgstr "sama %d."
+
+msgid "Constants Only"
+msgstr "nanpa awen taso"
+
+msgid "Unfavorite Property"
+msgstr "o olin ala e ni"
+
+msgid "Favorite Property"
+msgstr "o olin e ni"
+
+msgid "Unfavorite All"
+msgstr "o olin ala e ale"
+
+msgid "(%d change)"
+msgid_plural "(%d changes)"
+msgstr[0] "(ante %d)"
+
+msgid "Move Up"
+msgstr "o tawa e ni tawa sewi"
+
+msgid "Move Down"
+msgstr "o tawa e ni tawa anpa"
+
+msgid "Favorites"
+msgstr "olin"
+
+msgid "Language:"
+msgstr "toki:"
+
+msgctxt "Locale"
+msgid "Script:"
+msgstr "sitelen:"
+
+msgid "Country:"
+msgstr "ma:"
+
+msgid "Language"
+msgstr "toki"
+
+msgctxt "Locale"
+msgid "Script"
+msgstr "sitelen"
+
+msgid "Country"
+msgstr "ma"
+
+msgid "Toggle visibility of errors."
+msgstr "o ante tu e ken lukin pakala."
+
+msgid "Toggle visibility of warnings."
+msgstr "o ante tu e ken lukin e toki suli."
+
+msgid "Toggle visibility of editor messages."
+msgstr "o ante e ken lukin pi toki tan ilo ante."
+
+msgid "Unnamed Project"
+msgstr "pali pi nimi ala"
+
+msgid "Recovery Mode is enabled. Editor functionality has been restricted."
+msgstr "nasin alasa li lon. pali pi ilo ante li lili."
+
+msgid "Error saving resource!"
+msgstr "kama awen e poki sona la pakala li lon!"
+
+msgid "Can't open file '%s'. The file could have been moved or deleted."
+msgstr "mi ken ala open e lipu '%s'. ken la lipu li tawa anu weka."
+
+msgid "Error while parsing file '%s'."
+msgstr "kama sona e lipu '%s' la pakala li lon."
+
+msgid "Error while loading file '%s'."
+msgstr "kama lon e lipu '%s' la pakala li lon."
+
+msgid "Save All Scenes"
+msgstr "o kama awen e ma pali ale"
+
+msgid "Layout name not found!"
+msgstr "mi lukin ala e nimi ni: nasin kulupu ma!"
+
+msgid "Reload Saved Scene"
+msgstr "o kama lon sin e ma pali awen"
+
+msgid ""
+"The current scene has unsaved changes.\n"
+"Reload the saved scene anyway? This action cannot be undone."
+msgstr ""
+"ma pali ni li jo e ante pi awen ala.\n"
+"sina wile ala wile kama lon sin e ma pali awen? ni li lon tenpo ale."
+
+msgid "Save & Reload"
+msgstr "o kama awen o kama lon sin"
+
+msgid "Save modified resources before reloading?"
+msgstr "sina wile ala wile kama awen e poki sona ante la o kama lon sin?"
+
+msgid "Save & Quit"
+msgstr "o kama awen o tawa"
+
+msgid "Save changes to the following scene(s) before reloading?"
+msgstr "sina wile ala wile kama awen e ante pi ma pali ni la o kama lon sin?"
+
+msgid "Pick a Main Scene"
+msgstr "o anu e ma pali lawa"
+
+msgid "This operation can't be done without a scene."
+msgstr "sina ken ala ni kepeken ala ma pali."
+
+msgid "Export Mesh Library"
+msgstr "o pana e kulupu selo"
+
+msgid "Unable to find script field for addon plugin at: '%s'."
+msgstr "mi ken ala lukin e ma pi lipu ilo tan ilo namako lon: '%s'."
+
+msgid "Unable to load addon script from path: '%s'."
+msgstr "mi ken ala kama lon e lipu ilo namako tan nasin: '%s'."
+
+msgid ""
+"Unable to load addon script from path: '%s'. This might be due to a code "
+"error in that script.\n"
+"Disabling the addon at '%s' to prevent further errors."
+msgstr ""
+"mi ken ala kama lon e lipu ilo namako tan nasin: '%s'. ken la ni tan pakal pi "
+"toki ilo lon lipu ilo ona.\n"
+"mi ala e ilo namako lon '%s' tan mi wile weka e pakala lon tenpo kama."
+
+msgid "Unable to load addon script from path: '%s'. Script is not in tool mode."
+msgstr ""
+"mi ken ala kama lon e lipu ilo namako tan nasin: '%s'. lipu ilo li lipu @tool "
+"ala."
+
+msgid "Loading editor"
+msgstr "mi kama lon e ilo ante"
+
+msgid "Loading editor layout..."
+msgstr "mi kama lon e nasin kulupu ma pi ilo ante..."
+
+msgid "Loading docks..."
+msgstr "mi kama lon e ma..."
+
+msgid "Reopening scenes..."
+msgstr "mi open sin e ma pali..."
+
+msgid "Loading central editor layout..."
+msgstr "mi kama lon e nasin kulupu ma ni: meso pi ilo ante..."
+
+msgid "Loading plugin window layout..."
+msgstr "mi kama lon e nasin kulupu ma ni: ma pi ilo namako..."
+
+msgid "Editor layout ready."
+msgstr "nasin kulupu ma pi ilo ante li pona."
+
+msgid ""
+"No main scene has ever been defined. Select one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"ma pali lawa li lon ala. sina wile ala wile anu?\n"
+"kama la sina ken ante e ona lon \"lawa toki pi pali ni\" lon kulupu 'ilo'."
+
+msgid ""
+"Selected scene '%s' does not exist. Select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"ma pali '%s' li lon ala. sina wile ala wile anu e ma pali ken?\n"
+"kama la sina ken ante e ona lon \"lawa toki pi pali ni\" lon kulupu 'ilo'."
+
+msgid ""
+"Selected scene '%s' is not a scene file. Select a valid one?\n"
+"You can change it later in \"Project Settings\" under the 'application' "
+"category."
+msgstr ""
+"ma pali '%s' li lipu ala pi ma pali. sina wile ala wile anu e lipu ken?\n"
+"kama la sina ken ante e ona lon \"lawa toki pi pali ni\" lon kulupu 'ilo'."
+
+msgid "Save Layout..."
+msgstr "o kama awen e nasin kulupu ma..."
+
+msgid "Delete Layout..."
+msgstr "o weka e nasin kulupu ma..."
+
+msgid "Default"
+msgstr "meso"
+
+msgid "Save Layout"
+msgstr "o kama awen e nasin kulupu ma"
+
+msgid "Delete Layout"
+msgstr "o weka e nasin kulupu ma"
+
+msgid "This scene was never saved."
+msgstr "ala la ma pali ni li kama awen."
+
+msgid ""
+"Scene \"%s\" has unsaved changes.\n"
+"Last saved: %s."
+msgstr ""
+"ma pali \"%s\" li jo e ante pi awen ala.\n"
+"tenpo poka pi kama awen: %s."
+
+msgid "Save & Close"
+msgstr "o kama awen o pini"
+
+msgid "Save before closing?"
+msgstr "sina wile ala wile kama awen la o pini?"
+
+msgid "Scenes reloading"
+msgstr "ma pali li kama lon sin"
+
+msgid "Reloading..."
+msgstr "kama lon sin..."
+
+msgid "Reloading done."
+msgstr "kama lon sin li pini."
+
+msgid "Copy Text"
+msgstr "o jasima e toki"
+
+msgid "Save Scene"
+msgstr "o kama awen e ma pali"
+
+msgid "Quit"
+msgstr "o tawa"
+
+msgid "Editor Settings..."
+msgstr "lawa toki pi ilo ante..."
+
+msgid "Project Settings..."
+msgstr "lawa toki pi pali ni..."
+
+msgid "Project Settings"
+msgstr "lawa toki pi pali ni"
+
+msgid "Tools"
+msgstr "ilo"
+
+msgid "Upgrade Mesh Surfaces..."
+msgstr "o sin e selo..."
+
+msgid "Upgrade UIDs..."
+msgstr "o sin e nimi UID..."
+
+msgid "Reload Current Project"
+msgstr "o kama lon sin e pali ni"
+
+msgid "Quit to Project List"
+msgstr "o tawa lipu kulupu pali"
+
+msgid "Editor Docks"
+msgstr "ma pi ilo ante"
+
+msgid "Editor Layout"
+msgstr "nasin kulupu ma pi ilo ante"
+
+msgid "Online Documentation"
+msgstr "lipu toki lon linja"
+
+msgid "About Godot..."
+msgstr "sona pi ilo Koto..."
+
+msgid "Support Godot Development"
+msgstr "o pana pona tawa pali pi ilo Koto"
+
+msgid "FileSystem"
+msgstr "nasin lipu"
+
+msgid "Toggle FileSystem Bottom Panel"
+msgstr "o ante tu e ma anpa pi nasin lipu"
+
+msgid "Inspector"
+msgstr "ma pi nasin ijo"
+
+msgid "Node"
+msgstr "ijo pali"
+
+msgid "History"
+msgstr "tenpo pini"
+
+msgid "Output"
+msgstr "pana"
+
+msgid "Toggle Output Bottom Panel"
+msgstr "o ante tu e ma anpa pana"
+
+msgid "Don't Save"
+msgstr "o kama awen ala"
+
+msgid "Show in File Manager"
+msgstr "o ken lukin lon lawa lipu"
+
+msgid "Open & Run a Script"
+msgstr "o open o pali e lipu ilo"
+
+msgid "Files have been modified outside Godot"
+msgstr "lipu li ante lon ilo Koto ala"
+
+msgid "Load Errors"
+msgstr "o kama lon e pakala"
+
+msgid "Open 2D Editor"
+msgstr "o open e ilo ante 2D"
+
+msgid "Open 3D Editor"
+msgstr "o open e ilo ante 3D"
+
+msgid "Open Script Editor"
+msgstr "o open e ilo ante pi lipu ilo"
+
+msgid "Open Game View"
+msgstr "o open e lukin musi"
+
+msgid "Ok"
+msgstr "pona"
+
+msgid "Warning!"
+msgstr "toki suli!"
+
+msgid "Edit Text:"
+msgstr "o ante e toki:"
+
+msgid "On"
+msgstr "open"
+
+msgid "Renaming layer %d:"
+msgstr "sina nimi sin e selo nanpa %d:"
+
+msgid "No name provided."
+msgstr "sina pana ala e nimi."
+
+msgid "Name contains invalid characters."
+msgstr "nimi li jo e sitelen pi ken ala."
+
+msgid "Rename"
+msgstr "o nimi sin"
+
+msgid "Rename layer"
+msgstr "o nimi sin e selo"
+
+msgid "Layer %d"
+msgstr "selo nanpa %d"
+
+msgid "<empty>"
+msgstr "<jo ala>"
+
+msgid "Pick a Viewport"
+msgstr "o anu e ijo Viewport"
+
+msgid "Selected node is not a Viewport!"
+msgstr "ijo pali ni li ijo Viewport ala!"
+
+msgid "%s%s (size %d)"
+msgstr "%s%s (suli %d)"
+
+msgid "%s (size %d)"
+msgstr "%s (suli %d)"
+
+msgid "Size:"
+msgstr "suli:"
+
+msgid "Remove Item"
+msgstr "o weka e ijo"
+
+msgid "Localizable String (Nil)"
+msgstr "toki pi ken ante toki (ala)"
+
+msgid "Localizable String (size %d)"
+msgstr "toki pi ken ante toki (suli %d)"
+
+msgid "Add Translation"
+msgstr "o pana e ante toki"
+
+msgid "Load..."
+msgstr "o kama lon..."
+
+msgid "Convert to %s"
+msgstr "o ante tawa %s"
+
+msgid "New %s"
+msgstr "o pali sin e ijo %s"
+
+msgid "New Script..."
+msgstr "lipu ilo sin..."
+
+msgid "New Shader..."
+msgstr "o pali sin e ilo sitelen..."
+
+msgid "None"
+msgstr "ala"
+
+msgid "Primary"
+msgstr "lawa"
+
+msgid "Common"
+msgstr "meso"
+
+msgid "Editor Settings"
+msgstr "lawa toki pi ilo ante"
+
+msgid "Advanced Settings"
+msgstr "lawa toki namako"
+
+msgid "Failed to check for updates. Error: %d."
+msgstr "mi lukin ala e sin. pakala: %d."
+
+msgid "Update available: %s."
+msgstr "sin li lon: %s."
+
+msgid "An error has occurred. Click to try again."
+msgstr "pakala li lon. o pilin tawa pali sin."
+
+msgid "Click to open download page."
+msgstr "o pilin tawa open e lipu pi kama jo."
+
+msgid "Left Stick Left, Joystick 0 Left"
+msgstr "soto pi palisa soto, soto pi palisa musi nanpa 0"
+
+msgid "Left Stick Right, Joystick 0 Right"
+msgstr "teje pi palisa soto, teje pi palisa musi nanpa 0"
+
+msgid "Left Stick Up, Joystick 0 Up"
+msgstr "sewi pi palisa soto, sewi pi palisa musi nanpa 0"
+
+msgid "Left Stick Down, Joystick 0 Down"
+msgstr "anpa pi palisa soto, anpa pi palisa musi nanpa 0"
+
+msgid "Right Stick Left, Joystick 1 Left"
+msgstr "soto pi palisa teje, soto pi palisa musi nanpa 1"
+
+msgid "Right Stick Right, Joystick 1 Right"
+msgstr "teje pi palisa teje, teje pi palisa musi nanpa 1"
+
+msgid "Right Stick Up, Joystick 1 Up"
+msgstr "sewi pi palisa teje, sewi pi palisa musi nanpa 1"
+
+msgid "Right Stick Down, Joystick 1 Down"
+msgstr "anpa pi palisa teje, anpa pi palisa musi nanpa 1"
+
+msgid "Joystick 2 Left"
+msgstr "soto pi palisa musi nanpa 2"
+
+msgid "Left Trigger, Sony L2, Xbox LT, Joystick 2 Right"
+msgstr ""
+"nena suli soto, nena L2 pi ilo Soni, nena LT pi ilo Ekipoki, soto pi palisa "
+"musi nanpa 2"
+
+msgid "Joystick 2 Up"
+msgstr "sewi pi palisa musi nanpa 2"
+
+msgid "Right Trigger, Sony R2, Xbox RT, Joystick 2 Down"
+msgstr ""
+"nena suli teje, nena R2 pi ilo Soni, nena RT pi ilo Ekipoki, anpa pi palisa "
+"musi nanpa 2"
+
+msgid "Joystick 3 Left"
+msgstr "soto pi palisa musi nanpa 3"
+
+msgid "Joystick 3 Right"
+msgstr "teje pi palisa musi nanpa 3"
+
+msgid "Joystick 3 Up"
+msgstr "sewi pi palisa musi nanpa 3"
+
+msgid "Joystick 3 Down"
+msgstr "anpa pi palisa musi nanpa 3"
+
+msgid "Joystick 4 Left"
+msgstr "soto pi palisa musi nanpa 4"
+
+msgid "Joystick 4 Right"
+msgstr "teje pi palisa musi nanpa 4"
+
+msgid "Joystick 4 Up"
+msgstr "sewi pi palisa musi nanpa 4"
+
+msgid "Joystick 4 Down"
+msgstr "anpa pi palisa musi nanpa 4"
+
+msgid "or"
+msgstr "anu"
+
+msgid "Unicode"
+msgstr "nasin Juniko"
+
+msgid "Joypad Axis %d %s (%s)"
+msgstr "nasin nanpa %d %s pi nena musi (%s)"
+
+msgid "Listening for Input"
+msgstr "mi alasa kute e pana tan sina"
+
+msgid "Failed."
+msgstr "ni li pakala."
+
+msgid "Unknown Error"
+msgstr "pakala pi sona mi ala"
+
+msgid "Cannot create file \"%s\"."
+msgstr "mi ken ala pali sin e lipu \"%s\"."
+
+msgid "GDExtension"
+msgstr "GDExtension"
+
+msgid "Plugin \"%s\" is not supported on \"%s\""
+msgstr "ilo namako \"%s\" li ike tawa \"%s\""
+
+msgid "Starting the download..."
+msgstr "mi open e kama jo..."
+
+msgid "Downloading"
+msgstr "mi kama jo"
+
+msgid "Download from:"
+msgstr "o kama jo tan:"
+
+msgid "Go Online"
+msgstr "o lon linja"
+
+msgid "Duplicate"
+msgstr "o pali tu"
+
+msgid "Cannot move/rename resources root."
+msgstr "mi ken ala nimi sin / tawa e open pi poki sona."
+
+msgid ""
+"This filename begins with a dot rendering the file invisible to the editor.\n"
+"If you want to rename it anyway, use your operating system's file manager."
+msgstr ""
+"open pi nimi lipu li sike lili la ilo ante ken ala lukin e ona.\n"
+"sina wile ante e ona la, o kepeken lawa lipu pi OS sina."
+
+msgid ""
+"This file extension is not recognized by the editor.\n"
+"If you want to rename it anyway, use your operating system's file manager.\n"
+"After renaming to an unknown extension, the file won't be shown in the editor "
+"anymore."
+msgstr ""
+"ilo ante li sona ala e nimi namako lipu ni.\n"
+"sina wile ante e ona la, o kepeken lawa lipu pi OS sina.\n"
+"sina ante e nimi namako pi sona mi ala la, lipu li ken ala lukin lon ilo Koto."
+
+msgid "A file or folder with this name already exists."
+msgstr "(kulupu) lipu kepeken nimi ni li lon."
+
+msgid "Create Folder"
+msgstr "o pali sin e kulupu lipu"
+
+msgid ""
+"Do you wish to convert these files to %s? (This operation cannot be undone!)"
+msgstr "sina wile ala wile ante e lipu ni tawa %s? (ni la ni li lon tenpo ale!)"
+
+msgid "Could not create folder: %s"
+msgstr "mi ken ala pali sin e kulupu lipu: %s"
+
+msgid "Open Scenes"
+msgstr "o open e ma pali"
+
+msgid "Create New"
+msgstr "o pali sin e"
+
+msgid "Folder..."
+msgstr "kulupu lipu..."
+
+msgid "Scene..."
+msgstr "ma pali..."
+
+msgid "Script..."
+msgstr "lipu ilo..."
+
+msgid "Resource..."
+msgstr "poki sona..."
+
+msgid "TextFile..."
+msgstr "lipu toki..."
+
+msgid "Move/Duplicate To..."
+msgstr "o tawa / pali tu tawa..."
+
+msgid "Convert to..."
+msgstr "o ante tawa..."
+
+msgid "New Folder..."
+msgstr "kulupu lipu sin..."
+
+msgid "New Scene..."
+msgstr "ma pali sin..."
+
+msgid "New Resource..."
+msgstr "poki sona sin..."
+
+msgid "New TextFile..."
+msgstr "lipu toki sin..."
+
+msgid "Copy Path"
+msgstr "o jasima e nasin"
+
+msgid "Copy UID"
+msgstr "o jasima e nimi UID"
+
+msgid "Duplicate..."
+msgstr "o pali tu..."
+
+msgid "Rename..."
+msgstr "o nimi sin..."
+
+msgid "Red"
+msgstr "loje"
+
+msgid "Orange"
+msgstr "loje jelo"
+
+msgid "Yellow"
+msgstr "jelo"
+
+msgid "Green"
+msgstr "laso kasi"
+
+msgid "Teal"
+msgstr "laso"
+
+msgid "Blue"
+msgstr "laso telo"
+
+msgid "Purple"
+msgstr "laso loje"
+
+msgid "Pink"
+msgstr "loje walo"
+
+msgid "Gray"
+msgstr "pimeja walo"
+
+msgid "Re-Scan Filesystem"
+msgstr "o lukin sin e nasin lipu"
+
+msgid ""
+"Scanning Files,\n"
+"Please Wait..."
+msgstr ""
+"mi alasa lukin lon lipu,\n"
+"o awen..."
+
+msgid "Find in Files"
+msgstr "o alasa lon lipu"
+
+msgid "Find:"
+msgstr "o alasa:"
+
+msgid "Find..."
+msgstr "o alasa..."
+
+msgid "Searching..."
+msgstr "mi alasa..."
+
+msgid "Invalid group name. It cannot be empty."
+msgstr "nimi kulupu li ken ala. ona li ken ala jo e ala."
+
+msgid "A group with the name '%s' already exists."
+msgstr "kulupu kepeken nimi '%s' li lon."
+
+msgid "Group already exists."
+msgstr "kulupu li lon."
+
+msgid "Rename Group"
+msgstr "o nimi sin e kulupu"
+
+msgid "Remove Group"
+msgstr "o weka e kulupu"
+
+msgid "Delete group \"%s\"?"
+msgstr "sina wile ala wile weka e kulupu \"%s\"?"
+
+msgid "Group name is valid."
+msgstr "nimi kulupu li ken."
+
+msgid "Scene Groups"
+msgstr "kulupu pi ma pali"
+
+msgid "Global Groups"
+msgstr "kulupu pi ma ale"
+
+msgid "Remove from Group"
+msgstr "o weka tan kulupu"
+
+msgid "Convert to Global Group"
+msgstr "o ante tawa kulupu pi ma ale"
+
+msgid "Convert to Scene Group"
+msgstr "o ante tawa kulupu pi ma pali"
+
+msgid "Create New Group"
+msgstr "o pali sin e kulupu"
+
+msgid "Expand Bottom Panel"
+msgstr "o suli e ma anpa"
+
+msgid "Move/Duplicate: %s"
+msgstr "o tawa / pali tu e: %s"
+
+msgid "Move/Duplicate %d Item"
+msgid_plural "Move/Duplicate %d Items"
+msgstr[0] "o tawa / pali tu e ijo %d"
+
+msgid "Move"
+msgstr "o tawa"
+
+msgid "Cannot save file with an empty filename."
+msgstr "mi ken ala kama awen e lipu pi nimi ala."
+
+msgid "Cannot save file with a name starting with a dot."
+msgstr "mi ken ala kama awen e lipu ni tan open li sike lili."
+
+msgid "All Files"
+msgstr "lipu ale"
+
+msgid "Open a File"
+msgstr "o open e lipu"
+
+msgid "Open File(s)"
+msgstr "o open e lipu"
+
+msgid "Save a File"
+msgstr "o kama awen e lipu"
+
+msgid "The path specified is invalid."
+msgstr "nasin ni li ken ala."
+
+msgid "Could not create folder. File with that name already exists."
+msgstr "mi ken ala pali sin e kulupu lipu tan ni: lipu kepeken nimi ni li lon."
+
+msgid "Could not create folder."
+msgstr "mi ken ala pali sin e kulupu lipu."
+
+msgid "Go Back"
+msgstr "o tawa monsi"
+
+msgid "Go Forward"
+msgstr "o tawa sinpin"
+
+msgid "Go Up"
+msgstr "o tawa sewi"
+
+msgid "Toggle Hidden Files"
+msgstr "o ante tu e lipu pi ken lukin ala"
+
+msgid "Toggle Favorite"
+msgstr "o ante tu e olin"
+
+msgid "Toggle Mode"
+msgstr "o ante tu e nasin"
+
+msgid "Move Favorite Up"
+msgstr "o tawa e olin tawa sewi"
+
+msgid "Move Favorite Down"
+msgstr "o tawa e olin tawa anpa"
+
+msgid "Go to previous folder."
+msgstr "o tawa kulupu lipu tawa."
+
+msgid "Go to next folder."
+msgstr "o tawa kulupu lipu kama."
+
+msgid "Go to parent folder."
+msgstr "o tawa kulupu lipu mama."
+
+msgid "(Un)favorite current folder."
+msgstr "o olin (ala) e kulupu lipu ni."
+
+msgid "Create a new folder."
+msgstr "o pali sin e kulupu lipu."
+
+msgid "Toggle the visibility of hidden files."
+msgstr "o ante tu e ken lukin ni: lipu pi ken lukin ala."
+
+msgid "File:"
+msgstr "lipu:"
+
+msgid "Search files..."
+msgstr "o alasa lon lipu..."
+
+msgid "Select Resource"
+msgstr "o anu e poki sona"
+
+msgid "Select Scene"
+msgstr "o anu e ma pali"
+
+msgid "Addons"
+msgstr "ilo namako"
+
+msgid "Start searching to find files..."
+msgstr "o open alasa e lipu..."
+
+msgid "Grid view"
+msgstr "lukin leko"
+
+msgid "List view"
+msgstr "lukin kulupu"
+
+msgid "Play the project."
+msgstr "o pali e pali."
+
+msgid "Play the edited scene."
+msgstr "o pali e ma pali ante."
+
+msgid "Reload the played scene."
+msgstr "o lukin sin e ma pali ni."
+
+msgid "Recovery Mode is enabled. Disable it to run the project."
+msgstr "nasin alasa li lon. o ala e ona tawa pali."
+
+msgid "Recovery Mode"
+msgstr "nasin alasa"
+
+msgid ""
+"Godot opened the project in Recovery Mode, which is a special mode that can "
+"help recover projects that crash the engine upon initialization. The "
+"following features have been temporarily disabled:"
+msgstr ""
+"ilo Koto li open e pali lon nasin alasa. ilo li pakala la nasin ni li alasa e "
+"pali lon tenpo open. tenpo ni la ijo ni li ala:"
+
+msgid "Editor plugins"
+msgstr "ilo namako pi ilo ante"
+
+msgid "GDExtension addons"
+msgstr "ilo namako GDExtension"
+
+msgid "Disable recovery mode and reload the project."
+msgstr "o ala e nasin alasa o lukin sin e pali."
+
+msgid "Recovery Mode is enabled. Click for more details."
+msgstr "nasin alasa li lon. o pilin tawa sona namako."
+
+msgid "Run Project"
+msgstr "o pali"
+
+msgid "Pause Running Project"
+msgstr "o awen e pali ni"
+
+msgid "Stop the currently running project."
+msgstr "o pini e pali ni."
+
+msgid "Stop Running Project"
+msgstr "o pini e pali ni"
+
+msgid "Run Scene in Regular Mode"
+msgstr "o pali e ma pali lon nasin meso"
+
+msgid "Run Scene in XR Mode"
+msgstr "o pali e ma pali lon nasin XR"
+
+msgid "Run Current Scene"
+msgstr "o pali e ma pali ni"
+
+msgid "Run in Regular Mode"
+msgstr "o pali lon nasin meso"
+
+msgid "Run in XR Mode"
+msgstr "o pali lon nasin XR"
+
+msgid ""
+"Enable Movie Maker mode.\n"
+"The project will run at stable FPS and the visual and audio output will be "
+"recorded to a video file."
+msgstr ""
+"o lon e nasin pi pali musi.\n"
+"pali li kepeken tawa FPS. pana lukin en pana kalama li sitelen lon lipu pi "
+"sitelen tawa."
+
+msgid "Toggle Visible"
+msgstr "o ante tu e ken lukin"
+
+msgid "Ungroup Children"
+msgstr "o kulupu ala e ijo pi tan mama"
+
+msgid "Click to disable this."
+msgstr "o pilin tawa ala e ni."
+
+msgid "Node has one connection."
+msgid_plural "Node has {num} connections."
+msgstr[0] "ijo pali li jo e olin {num}."
+
+msgid "Node is in this group:"
+msgid_plural "Node is in the following groups:"
+msgstr[0] "ijo pali li lon kulupu ni:"
+
+msgid "Click to show groups dock."
+msgstr "o pilin tawa ken lukin e ma kulupu."
+
+msgid ""
+"This script can run in the editor.\n"
+"It is currently disabled due to recovery mode."
+msgstr ""
+"lipu ilo li ken pali lon ilo ante.\n"
+"tenpo ni la ona li lon ala tan nasin alasa."
+
+msgid "This script is currently running in the editor."
+msgstr "tenpo ni la lipu ilo ni li pali lon ilo ante."
+
+msgid "Open Script:"
+msgstr "o open e lipu ilo:"
+
+msgid ""
+"Children are not selectable.\n"
+"Click to make them selectable."
+msgstr ""
+"sina ken ala pilin e ijo pi tan mama.\n"
+"o pilin tawa ken pilin e ona."
+
+msgid "Open in Editor"
+msgstr "o open lon ilo ante"
+
+msgid "Rename Node"
+msgstr "o nimi sin e ijo pali"
+
+msgid "Rename Nodes"
+msgstr "o nimi sin e ijo pali"
+
+msgid "Show All"
+msgstr "o ken lukin e ale"
+
+msgid "The Beginning"
+msgstr "open"
+
+msgid "Warning: File exists"
+msgstr "toki suli: lipu li lon"
+
+msgid "Will create new file"
+msgstr "kama la mi pali sin e lipu"
+
+msgid "Will save to new file"
+msgstr "kama la mi kama awen tawa lipu sin"
+
+msgid "Meshes"
+msgstr "selo"
+
+msgid "Save Extension:"
+msgstr "o kama awen e namako:"
+
+msgid "Clear Glyph List"
+msgstr "o weka e kulupu sitelen"
+
+msgid "Glyphs from the Translations"
+msgstr "sitelen tan ante toki"
+
+msgid "Glyphs from the Text"
+msgstr "sitelen tan toki"
+
+msgid "2D"
+msgstr "2D"
+
+msgid "3D"
+msgstr "3D"
+
+msgid "%d Files"
+msgstr "lipu %d"
+
+msgid "Keyboard Keys"
+msgstr "nena pi supa nena"
+
+msgid "Mouse Buttons"
+msgstr "nena pi ilo luka"
+
+msgid "Joypad Buttons"
+msgstr "nena pi nena musi"
+
+msgid "Joypad Axes"
+msgstr "nasin pi nena musi"
+
+msgid "Keycode (Latin Equivalent)"
+msgstr "nimi nena (sama pi sitelen Lasina)"
+
+msgid "Physical Keycode (Position on US QWERTY Keyboard)"
+msgstr "nimi nena lon (lon supa nena QWERTY pi ma Mewika)"
+
+msgid "This object has no resources."
+msgstr "ijo ni li jo e poki sona ala."
+
+msgid "Failed to load resource."
+msgstr "mi kama lon ala e poki sona."
+
+msgid "Copy Resource"
+msgstr "o jasima e poki sona"
+
+msgid "Open documentation for this object."
+msgstr "o open e lipu toki pi ijo ni."
+
+msgid "Add %d Translation"
+msgid_plural "Add %d Translations"
+msgstr[0] "o pana e ante toki %d"
+
+msgid "Remove Translation"
+msgstr "o weka e ante toki"
+
+msgid "Add %d file for POT generation"
+msgid_plural "Add %d files for POT generation"
+msgstr[0] "o pana e lipu %d tawa pali sin POT"
+
+msgid "Remove file from POT generation"
+msgstr "o weka e lipu tan pali sin POT"
+
+msgid "Removed"
+msgstr "ni li weka"
+
+msgid "%s cannot be found."
+msgstr "mi ken ala lukin e %s."
+
+msgid "Translations"
+msgstr "ante toki"
+
+msgid "Translations:"
+msgstr "ante toki:"
+
+msgid "Resources:"
+msgstr "poki sona:"
+
+msgid "POT Generation"
+msgstr "pali sin POT"
+
+msgid "Generate POT"
+msgstr "o pali sin e lipu POT"
+
+msgid "Set %s on %d nodes"
+msgstr "o pana e %s tawa ijo pali %d"
+
+msgid "Groups"
+msgstr "kulupu"
+
+msgid "Create Polygon"
+msgstr "o pali sin e ijo pi linja mute"
+
+msgid "Create points."
+msgstr "o pali sin e lili."
+
+msgid ""
+"Edit points.\n"
+"LMB: Move Point\n"
+"RMB: Erase Point"
+msgstr ""
+"o ante e lili.\n"
+"LMB: o tawa e lili\n"
+"RMB: o weka e lili"
+
+msgid "Erase points."
+msgstr "o weka e lili."
+
+msgid "Edit Polygon"
+msgstr "o ante e ijo pi linja mute"
+
+msgid "Edit Polygon (Remove Point)"
+msgstr "o ante e ijo pi linja mute (o weka e lili)"
+
+msgid "Remove Polygon And Point"
+msgstr "o weka e ijo pi linja mute e lili"
+
+msgid "Point"
+msgstr "lili"
+
+msgid "Open Editor"
+msgstr "o open e ilo ante"
+
+msgid "Open Animation Node"
+msgstr "o open e ijo pali pi sitelen tawa"
+
+msgid "Node Moved"
+msgstr "ijo pali li tawa"
+
+msgid "Nodes Connected"
+msgstr "ijo pali li kulupu"
+
+msgid "Nodes Disconnected"
+msgstr "ijo pali li kulupu ala"
+
+msgid "Delete Node"
+msgstr "o weka e ijo pali"
+
+msgid "Delete Node(s)"
+msgstr "o weka ijo pali"
+
+msgid "Node Renamed"
+msgstr "ijo pali li jo e nimi sin"
+
+msgid "Invert"
+msgstr "o ante jasima"
+
+msgid "Start of Animation"
+msgstr "open pi sitelen tawa"
+
+msgid "End of Animation"
+msgstr "pini pi sitelen tawa"
+
+msgid "Library Name:"
+msgstr "nimi kulupu:"
+
+msgid "Animation name can't be empty."
+msgstr "nimi pi sitelen tawa li ken ala jo e ala."
+
+msgid "Animation name contains invalid characters: '/', ':', ',' or '['."
+msgstr ""
+"nimi pi sitelen tawa li ken ala jo e sitelen nimi ni: '/', ':', ',' anu '['."
+
+msgid "Animation with the same name already exists."
+msgstr "sitelen tawa kepeken nimi sama li lon."
+
+msgid "Enter a library name."
+msgstr "o pana e nimi kulupu."
+
+msgid "Library name contains invalid characters: '/', ':', ',' or '['."
+msgstr "nimi kulupu li jo e sitelen pi ken ala: '/', ':', ',' anu '['."
+
+msgid "Library with the same name already exists."
+msgstr "kulupu kepeken nimi sama li lon."
+
+msgid "Animation name is valid."
+msgstr "nimi pi sitelen tawa li ken."
+
+msgid "Global library will be created."
+msgstr "kama la kulupu pi ma ale li kama pali."
+
+msgid "Library name is valid."
+msgstr "nimi kulupu li ken."
+
+msgid "Add Animation to Library: %s"
+msgstr "o pana e sitelen tawa tawa kulupu: %s"
+
+msgid "Add Animation Library: %s"
+msgstr "o pana e kulupu pi sitelen tawa: %s"
+
+msgid "Load Animation"
+msgstr "o kama lon e sitelen tawa"
+
+msgid "Save Library"
+msgstr "o kama awen e kulupu"
+
+msgid "Save Animation"
+msgstr "o kama awen e sitelen tawa"
+
+msgid "Save Animation library to File: %s"
+msgstr "o kama awen e sitelen tawa tawa lipu: %s"
+
+msgid "Save Animation to File: %s"
+msgstr "o kama awen e sitelen tawa tawa lipu ni: %s"
+
+msgid "Add Animation Libraries"
+msgstr "o pana e kulupu pi sitelen tawa"
+
+msgid "Load Animations into Library"
+msgstr "o kama lon e sitelen tawa tawa kulupu"
+
+msgid "Load Animation into Library: %s"
+msgstr "o kama lon e sitelen tawa tawa kulupu: %s"
+
+msgid "Rename Animation Library: %s"
+msgstr "o nimi sin e kulupu pi sitelen tawa: %s"
+
+msgid "Rename Animation: %s"
+msgstr "o nimi sin e sitelen tawa: %s"
+
+msgid "Animation Name:"
+msgstr "nimi pi sitelen tawa:"
+
+msgid "Open in Inspector"
+msgstr "o open lon ma pi nasin ijo"
+
+msgid "Remove Animation Library: %s"
+msgstr "o weka e kulupu pi sitelen tawa: %s"
+
+msgid "Remove Animation from Library: %s"
+msgstr "o weka e sitelen tawa tan kulupu: %s"
+
+msgid "Create New Animation"
+msgstr "o pali sin e sitelen tawa"
+
+msgid "New Animation Name:"
+msgstr "nimi sin pi sitelen tawa:"
+
+msgid "Rename Animation"
+msgstr "o nimi sin e sitelen tawa"
+
+msgid "Change Animation Name:"
+msgstr "o ante e nimi pi sitelen tawa:"
+
+msgid "Delete Animation '%s'?"
+msgstr "sina wile ala wile weka e sitelen tawa '%s'?"
+
+msgid "Remove Animation"
+msgstr "o weka e sitelen tawa"
+
+msgid "Invalid animation name!"
+msgstr "nimi pi sitelen tawa li ken ala!"
+
+msgid "Animation '%s' already exists!"
+msgstr "sitelen '%s' li lon!"
+
+msgid "Duplicate Animation"
+msgstr "o pali tu e sitelen tawa"
+
+msgid "Pause/Stop Animation"
+msgstr "o awen e sitelen tawa"
+
+msgid "Play Animation from Start"
+msgstr "o pali e sitelen tawa tan open"
+
+msgid "Play Animation"
+msgstr "o pali e sitelen tawa"
+
+msgid "Animation Tools"
+msgstr "ilo pi sitelen tawa"
+
+msgid "Animation"
+msgstr "sitelen tawa"
+
+msgid "Manage Animations..."
+msgstr "o lawa e sitelen tawa..."
+
+msgid "Move Node"
+msgstr "o tawa e ijo pali"
+
+msgid "Transition exists!"
+msgstr "ante tawa li lon!"
+
+msgid "Edit %s"
+msgstr "o ante e %s"
+
+msgid "Create new nodes."
+msgstr "o pali sin e ijo pali."
+
+msgid "Connect nodes."
+msgstr "o kulupu e ijo pali."
+
+msgid "Delete All"
+msgstr "o weka e ale"
+
+msgid "Root"
+msgstr "open"
+
+msgid "AnimationTree"
+msgstr "AnimationTree"
+
+msgid "Toggle AnimationTree Bottom Panel"
+msgstr "o ante tu e ma anpa AnimationTree"
+
+msgid "Download"
+msgstr "o kama jo"
+
+msgid "Can't connect."
+msgstr "mi ken ala kulupu."
+
+msgid "Write error."
+msgstr "pakala sitelen."
+
+msgid "Downloading (%s / %s)..."
+msgstr "mi kama jo (%s / %s)..."
+
+msgid "Downloading..."
+msgstr "mi kama jo..."
+
+msgid "Install..."
+msgstr "o kama jo..."
+
+msgid "Download Error"
+msgstr "pakala pi kama jo"
+
+msgid "Name (A-Z)"
+msgstr "nimi (a-w)"
+
+msgid "Name (Z-A)"
+msgstr "nimi (w-a)"
+
+msgid "License (A-Z)"
+msgstr "lipu lawa (a-w)"
+
+msgid "License (Z-A)"
+msgstr "lipu lawa (w-a)"
+
+msgid "Loading..."
+msgstr "mi kama lon e ni..."
+
+msgctxt "Pagination"
+msgid "First"
+msgstr "nanpa open"
+
+msgctxt "Pagination"
+msgid "Previous"
+msgstr "nanpa tawa"
+
+msgctxt "Pagination"
+msgid "Next"
+msgstr "nanpa kama"
+
+msgctxt "Pagination"
+msgid "Last"
+msgstr "nanpa pini"
+
+msgid "All"
+msgstr "ale"
+
+msgid "Plugins..."
+msgstr "ilo namako..."
+
+msgid "Rotate %d CanvasItems"
+msgstr "o sike e ijo CanvasItem %d"
+
+msgid "Scale Node2D \"%s\" to (%s, %s)"
+msgstr "o suli e ijo Node2D \"%s\" tawa (%s, %s)"
+
+msgid "Scale %d CanvasItems"
+msgstr "o sule e ijo CanvasItem %d"
+
+msgid "Scale CanvasItem \"%s\" to (%s, %s)"
+msgstr "o suli e ijo CanvasItem \"%s\" tawa (%s, %s)"
+
+msgid "Move %d CanvasItems"
+msgstr "o tawa e ijo CanvasItem %d"
+
+msgid "Move CanvasItem \"%s\" to (%d, %d)"
+msgstr "o tawa e ijo CanvasItem \"%s\" tawa (%d,%d)"
+
+msgid "Move Node(s) Here"
+msgstr "o tawa e ijo pali tawa ni"
+
+msgid "Zoom to 3.125%"
+msgstr "o suli e lukin tawa 3.125%"
+
+msgid "Zoom to 6.25%"
+msgstr "o suli e lukin tawa 6.25%"
+
+msgid "Zoom to 12.5%"
+msgstr "o suli e lukin tawa 12.5%"
+
+msgid "Zoom to 25%"
+msgstr "o suli e lukin tawa 25%"
+
+msgid "Zoom to 50%"
+msgstr "o suli e lukin tawa 50%"
+
+msgid "Zoom to 100%"
+msgstr "o suli e lukin tawa 100%"
+
+msgid "Zoom to 200%"
+msgstr "o suli e lukin tawa 200%"
+
+msgid "Zoom to 400%"
+msgstr "o suli e lukin tawa 400%"
+
+msgid "Zoom to 800%"
+msgstr "o suli e lukin tawa 800%"
+
+msgid "Zoom to 1600%"
+msgstr "o suli e lukin tawa 1600%"
+
+msgid "(Available in all modes.)"
+msgstr "(ni li ken lon nasin ale.)"
+
+msgid "Move Mode"
+msgstr "nasin tawa"
+
+msgid "Rotate Mode"
+msgstr "nasin sike"
+
+msgid "View"
+msgstr "lukin"
+
+msgid "Show"
+msgstr "o ken lukin"
+
+msgid "Toggle Grid"
+msgstr "o ante tu e kulupu leko"
+
+msgid "Grid"
+msgstr "kulupu leko"
+
+msgid "Show Viewport"
+msgstr "o ken lukin e ijo Viewport"
+
+msgid "Group"
+msgstr "o kulupu"
+
+msgid "Transformation"
+msgstr "ante"
+
+msgid "Project theme"
+msgstr "poki sona pi ante sitelen pi pali ni"
+
+msgid "Editor theme"
+msgstr "poki sona pi ante sitelen pi ilo ante"
+
+msgid "Default theme"
+msgstr "poki sona meso pi ante sitelen"
+
+msgid "Adding %s..."
+msgstr "mi pana e ijo pali %s..."
+
+msgid "Create Node"
+msgstr "o pali sin e ijo pali"
+
+msgid "Adding %s and %s..."
+msgstr "mi pana e ijo pali %s e ijo pali %s..."
+
+msgid "This node is a child of a container."
+msgstr "ijo pali poki li mama tawa ijo pali ni."
+
+msgid "Expand"
+msgstr "o suli"
+
+msgid "Top Left"
+msgstr "soto sewi"
+
+msgid "Center Top"
+msgstr "sewi meso"
+
+msgid "Top Right"
+msgstr "teje sewi"
+
+msgid "Center Left"
+msgstr "soto meso"
+
+msgid "Center"
+msgstr "meso"
+
+msgid "Center Right"
+msgstr "teje meso"
+
+msgid "Bottom Left"
+msgstr "soto anpa"
+
+msgid "Center Bottom"
+msgstr "anpa meso"
+
+msgid "Bottom Right"
+msgstr "teje anpa"
+
+msgid "Visible Paths"
+msgstr "nasin li ken lukin"
+
+msgid ""
+"When this option is enabled, curve resources used by path nodes will be "
+"visible in the running project."
+msgstr ""
+"lawa toki ni li lon la, ijo pali nasin li kepeken poki sona linja la poki "
+"sona ona li ken lukin lon pali."
+
+msgid ""
+"Name: %s\n"
+"Path: %s\n"
+"Main Script: %s\n"
+"\n"
+"%s"
+msgstr ""
+"nimi: %s\n"
+"nasin:%s\n"
+"lipu ilo lawa: %s\n"
+"\n"
+"%s"
+
+msgid "Edit Plugin"
+msgstr "o ante e ilo namako"
+
+msgid ""
+"Recovery mode is enabled. Enabled plugins will not run while this mode is "
+"active."
+msgstr "nasin alasa li lon. ni lon la ilo namako li pali ala."
+
+msgid "Create New Plugin"
+msgstr "o pali sin e ilo namako"
+
+msgid "Version"
+msgstr "nanpa"
+
+msgid "Size: %s"
+msgstr "suli: %s"
+
+msgid "Dimensions: %d × %d"
+msgstr "suli: %d x %d"
+
+msgid "Game starting..."
+msgstr "musi li open..."
+
+msgid "Input"
+msgstr "pana tan sina"
+
+msgid "Allow game input."
+msgstr "o ken e pana musi tan sina."
+
+msgid "Mesh is empty!"
+msgstr "selo li jo ala!"
+
+msgid "Mesh"
+msgstr "selo"
+
+msgid "Sibling"
+msgstr "ijo tan mama sama"
+
+msgid "X: %s\n"
+msgstr "X: %s\n"
+
+msgid "Y: %s\n"
+msgstr "Y: %s\n"
+
+msgid "Z: %s\n"
+msgstr "Z: %s\n"
+
+msgid "CPU Time: %s ms"
+msgstr "tenpo CPU: ms %s"
+
+msgid "GPU Time: %s ms"
+msgstr "tenpo GPU: ms %s"
+
+msgid "FPS: %d"
+msgstr "FPS: %d"
+
+msgid "Translating:"
+msgstr "tawa:"
+
+msgid "Instantiating:"
+msgstr "open:"
+
+msgid "Top View."
+msgstr "lukin sewi."
+
+msgid "Bottom View."
+msgstr "lukin anpa."
+
+msgid "Left View."
+msgstr "lukin soto."
+
+msgid "Right View."
+msgstr "lukin teje."
+
+msgid "Front View."
+msgstr "lukin sinpin."
+
+msgid "Rear View."
+msgstr "lukin monsi."
+
+msgid "Rotate"
+msgstr "o sike"
+
+msgid ""
+"Scene contains\n"
+"DirectionalLight3D.\n"
+"Preview disabled."
+msgstr ""
+"ma pali li jo e\n"
+"ijo pali DirectionalLight3D.\n"
+"mi ken ala e lukin lili."
+
+msgid "Preview disabled."
+msgstr "mi ken ala e lukin lili."
+
+msgid ""
+"Scene contains\n"
+"WorldEnvironment.\n"
+"Preview disabled."
+msgstr ""
+"ma pali li jo e\n"
+"ijo pali WorldEnvironment.\n"
+"mi ken ala e lukin lili."
+
+msgid "Bottom View"
+msgstr "lukin anpa"
+
+msgid "Top View"
+msgstr "lukin sewi"
+
+msgid "Rear View"
+msgstr "lukin monsi"
+
+msgid "Front View"
+msgstr "lukin sinpin"
+
+msgid "Left View"
+msgstr "lukin soto"
+
+msgid "Right View"
+msgstr "lukin teje"
+
+msgid "Decrease Field of View"
+msgstr "o lili e ma pi lukin sina"
+
+msgid "Increase Field of View"
+msgstr "o suli e ma pi lukin sina"
+
+msgid "Reset Field of View to Default"
+msgstr "o tawa open e ma pi lukin sina tawa meso"
+
+msgid "Transform"
+msgstr "o ante"
+
+msgid "1 Viewport"
+msgstr "ijo Viewport 1"
+
+msgid "2 Viewports"
+msgstr "ijo Viewport 2"
+
+msgid "2 Viewports (Alt)"
+msgstr "ijo Viewport 2 (ante)"
+
+msgid "3 Viewports"
+msgstr "ijo Viewport 3"
+
+msgid "3 Viewports (Alt)"
+msgstr "ijo Viewport 3 (ante)"
+
+msgid "4 Viewports"
+msgstr "ijo Viewport 4"
+
+msgid "Settings..."
+msgstr "lawa toki..."
+
+msgid "Viewport Settings"
+msgstr "lawa toki pi ijo Viewport"
+
+msgid "Convert to Parallax2D"
+msgstr "o ante tawa ijo pali Parallax2D"
+
+msgid "GPUParticles2D"
+msgstr "GPUParticles2D"
+
+msgid "Convert to CPUParticles2D"
+msgstr "o ante tawa ijo pali CPUParticles2D"
+
+msgid "CPUParticles2D"
+msgstr "CPUParticles2D"
+
+msgid "Convert to GPUParticles2D"
+msgstr "o ante tawa ijo pali CPUParticles2D"
+
+msgid "GPUParticles3D"
+msgstr "GPUParticles3D"
+
+msgid "Convert to CPUParticles3D"
+msgstr "o ante tawa ijo pali CPUParticles3D"
+
+msgid "CPUParticles3D"
+msgstr "CPUParticles3D"
+
+msgid "Convert to GPUParticles3D"
+msgstr "o ante tawa ijo pali GPUParticles3D"
+
+msgid "Split Curve"
+msgstr "o tu e linja"
+
+msgid "Right Click: Delete Point"
+msgstr "pilin teje: o weka e lili"
+
+msgid "Delete Point"
+msgstr "o weka e lili"
+
+msgid "Create Curve"
+msgstr "o pali sin e linja"
+
+msgid "Split Path"
+msgstr "o tu e nasin"
+
+msgid "Plugin name cannot be blank."
+msgstr "nimi pi ilo namako li ken ala jo e ala."
+
+msgid "Subfolder name is not a valid folder name."
+msgstr "nimi pi kulupu lipu lili li ken ala."
+
+msgid "Edit a Plugin"
+msgstr "o ante e ilo namako"
+
+msgid "Create a Plugin"
+msgstr "o pali sin e ilo namako"
+
+msgid "Update"
+msgstr "o sin"
+
+msgid "Plugin Name:"
+msgstr "nimi pi ilo namako:"
+
+msgid "Required. This name will be displayed in the list of plugins."
+msgstr "wile mute. nimi ni li lon kulupu pi ilo namako."
+
+msgid ""
+"Optional. The folder name should generally use `snake_case` naming (avoid "
+"spaces and special characters).\n"
+"If left empty, the folder will be named after the plugin name converted to "
+"`snake_case`."
+msgstr ""
+"wile anu wile ala. meso la nimi pi kulupu lipu li wile kepeken e nasin nimi "
+"`snake_case` (li wile ala e jo ala e sitelen wan).\n"
+"ni li jo ala la, nimi pi kulupu lipu li tan nimi pi ilo namako tawa nasin "
+"nimi `snake_case`."
+
+msgid ""
+"Required. The scripting language to use for the script.\n"
+"Note that a plugin may use several languages at once by adding more scripts "
+"to the plugin."
+msgstr ""
+"wile mute. ni li toki pi lipu ilo. lipu ilo ona li kepeken e ni.\n"
+"o sona e ni: ni li ken: ilo namako li kepeken toki mute lon tenpo sama tan "
+"pana e lipu ilo tawa ilo namako."
+
+msgid "Script Name:"
+msgstr "nimi pi lipu ilo:"
+
+msgid ""
+"Optional. The name of the script file. If left empty, will default to the "
+"subfolder name."
+msgstr ""
+"wile anu wile ala. ni li nimi tan lipu pi lipu ilo ni. ona li jo ala la, ni "
+"li tawa nimi pi kulupu lipu lili."
+
+msgid "Plugin name is valid."
+msgstr "nimi pi ilo namako li ken."
+
+msgid "Script extension is valid."
+msgstr "namako pi lipu ilo li ken."
+
+msgid "Invalid Polygon (need 3 different vertices)"
+msgstr "ijo pi linja mute li ken ala (ona li wile e lili ante 3)"
+
+msgid "Polygons"
+msgstr "ijo pi linja mute"
+
+msgid "%s: Rotate"
+msgstr "%s: o sike"
+
+msgid "Shift: Move All"
+msgstr "Shift: o tawa e ale"
+
+msgid "%s + Shift: Scale"
+msgstr "%s + Shift: o ante e suli"
+
+msgid "Move Polygon"
+msgstr "o tawa e ijo pi linja mute"
+
+msgid "Rotate Polygon"
+msgstr "o sike e ijo pi linja mute"
+
+msgid "Scale Polygon"
+msgstr "o suli e ijo pi linja mute"
+
+msgid "Grid Settings"
+msgstr "lawa toki leko"
+
+msgid "Show Grid"
+msgstr "o ken lukin e kulupu leko"
+
+msgid "Polygon"
+msgstr "ijo pi linja mute"
+
+msgid "Toggle Polygon Bottom Panel"
+msgstr "o ante tu e ma anpa ni: ijo pi linja mute"
+
+msgid "Create Polygon3D"
+msgstr "o pali sin e ijo Polygon3D"
+
+msgid "ERROR: Couldn't load resource!"
+msgstr "pakala: mi ken ala kama lon e poki sona!"
+
+msgid "Rename Resource"
+msgstr "o nimi sin e poki sona"
+
+msgid "Delete Resource"
+msgstr "o weka e poki sona"
+
+msgid "Load Resource"
+msgstr "o kama lon e poki sona"
+
+msgid "Can't open '%s'. The file could have been moved or deleted."
+msgstr "mi ken ala open e '%s'. ken la ijo li tawa anu weka e lipu ni."
+
+msgid "Close and save changes?"
+msgstr "sina wile ala wile e ni: o pini o kama awen e ante?"
+
+msgid "Error saving file!"
+msgstr "kama awen e lipu la pakala li lon!"
+
+msgid "Error while saving theme."
+msgstr "kama awen e poki sona pi ante sitelen la pakala li lon."
+
+msgid "New Text File..."
+msgstr "lipu toki sin..."
+
+msgid "Open File"
+msgstr "o open e lipu"
+
+msgid "Could not load file at:"
+msgstr "mi ken ala kama lon e lipu lon:"
+
+msgid "Reload only takes effect on tool scripts."
+msgstr "kama lon sin li ante e lipu ilo @tool taso."
+
+msgid "Cannot run the edited file because it's not a script."
+msgstr "mi ken ala pali e lipu tan lipu li lipu ilo ala."
+
+msgid "Cannot run the script because it contains errors, check the output log."
+msgstr "mi ken ala pali e lipu ilo tan ona li jo e pakala; o lukin e ma pana."
+
+msgid ""
+"Cannot run the script because it's not a tool script (add the @tool "
+"annotation at the top)."
+msgstr ""
+"mi ken ala pali e lipu ilo tan lipu ilo li lipu @tool ala (o pana e nimi "
+"@tool lon sewi)."
+
+msgid "Cannot run the script because it's not a tool script."
+msgstr "mi ken ala pali e lipu ilo tan lipu ilo li lipu @tool ala."
+
+msgid "Error while saving theme"
+msgstr "kama awen e poki sona pi ante sitelen la pakala li lon"
+
+msgid "Open '%s' in Godot online documentation."
+msgstr "o open '%s' lon lipu toki pi ilo Koto lon linja."
+
+msgid "Open in Online Docs"
+msgstr "o open e ni lon lipu toki lon linja"
+
+msgid "Online Docs"
+msgstr "lipu toki lon linja"
+
+msgid "Open Godot online documentation."
+msgstr "o open e lipu toki pi ilo Koto lon linja."
+
+msgid "Unsaved file."
+msgstr "lipu li awen ala."
+
+msgid "Find Next"
+msgstr "o alasa e kama"
+
+msgid "Find Previous"
+msgstr "o alasa e tawa"
+
+msgid "Open..."
+msgstr "o open..."
+
+msgid "Save All"
+msgstr "o kama awen e ale"
+
+msgid "Copy Script Path"
+msgstr "o jasima e nasin pi lipu ilo"
+
+msgid "Copy Script UID"
+msgstr "o jasima e nimi UID pi lipu ilo"
+
+msgid "History Previous"
+msgstr "kama pi tenpo pini"
+
+msgid "History Next"
+msgstr "tawa pi tenpo pini"
+
+msgid "Reload Theme"
+msgstr "o kama lon e poki sona pi ante sitelen"
+
+msgid "Theme"
+msgstr "poki sona pi ante sitelen"
+
+msgid "Save Theme"
+msgstr "o kama awen e poki sona pi ante sitelen"
+
+msgid "Close All"
+msgstr "o weka e ale"
+
+msgid "Close Docs"
+msgstr "o weka e lipu toki"
+
+msgid "Run"
+msgstr "o pali"
+
+msgid "Search"
+msgstr "o alasa"
+
+msgid "Error at (%d, %d):"
+msgstr "pakala li lon (%d,%d):"
+
+msgid "Line %d (%s):"
+msgstr "linja %d (%s):"
+
+msgid "Line %d:"
+msgstr "linja %d:"
+
+msgid "Line"
+msgstr "linja"
+
+msgid "Go To"
+msgstr "o tawa"
+
+msgid "Delete Line"
+msgstr "o weka e linja"
+
+msgid "Toggle Comment"
+msgstr "o ante tu e toki"
+
+msgid "Create Code Region"
+msgstr "o pali sin e ma pi toki ilo"
+
+msgid "Duplicate Selection"
+msgstr "o pali tu e ni"
+
+msgid "Duplicate Lines"
+msgstr "o pali tu e linja"
+
+msgid "Find in Files..."
+msgstr "o alasa lon lipu..."
+
+msgid "Go to Line..."
+msgstr "o tawa linja..."
+
+msgid "Load Shader File..."
+msgstr "o kama lon e lipu pi ilo sitelen..."
+
+msgid "Save File"
+msgstr "o kama awen e lipu"
+
+msgid "Open File in Inspector"
+msgstr "o open e lipu lon ma pi nasin ijo"
+
+msgid "Close File"
+msgstr "o pini e lipu"
+
+msgid "Shader Editor"
+msgstr "ilo ante sitelen"
+
+msgid "Toggle Shader Editor Bottom Panel"
+msgstr "o ante tu e ma anpa pi ilo ante sitelen"
+
+msgid "ShaderFile"
+msgstr "ShaderFile"
+
+msgid "Toggle ShaderFile Bottom Panel"
+msgstr "o ante tu e ma anpa ShaderFile"
+
+msgid "Create Polygon2D"
+msgstr "o pali sin e ijo Polygon2D"
+
+msgid "Polygon2D Preview"
+msgstr "lukin lili pi ijo Polygon2D"
+
+msgid "Convert to MeshInstance2D"
+msgstr "o ante tawa ijo pali MeshInstance2D"
+
+msgid "Convert to Polygon2D"
+msgstr "o ante tawa ijo pali Polygon2D"
+
+msgid "Sprite2D"
+msgstr "Sprite2D"
+
+msgid "Settings:"
+msgstr "lawa toki:"
+
+msgid "Unable to load images"
+msgstr "mi ken ala kama lon e sitelen"
+
+msgid "Move Frame"
+msgstr "o tawa e sitelen"
+
+msgid "Delete Animation?"
+msgstr "sina wile ala wile weka e sitelen tawa?"
+
+msgid "(empty)"
+msgstr "(jo ala)"
+
+msgid "Animations:"
+msgstr "sitelen tawa:"
+
+msgid "Delete Animation"
+msgstr "o weka e sitelen tawa"
+
+msgid "This resource does not have any animations."
+msgstr "poki sona ni li jo ala e sitelen tawa."
+
+msgid "Animation Frames:"
+msgstr "sitelen pi sitelen tawa:"
+
+msgid "Add frame from file"
+msgstr "o pana e sitelen tan lipu"
+
+msgid "Add frames from sprite sheet"
+msgstr "o pana e sitelen tan lipu sitelen"
+
+msgid "Delete Frame"
+msgstr "o weka e sitelen"
+
+msgid "Copy Frame(s)"
+msgstr "o jasima e sitelen"
+
+msgid "Insert Empty (Before Selected)"
+msgstr "o pana e jo ala (lon monsi ni)"
+
+msgid "Insert Empty (After Selected)"
+msgstr "o pana e jo ala (lon sinpin ni)"
+
+msgid "Move Frame Left"
+msgstr "o tawa e sitelen tawa soto"
+
+msgid "Move Frame Right"
+msgstr "o tawa e sitelen tawa teje"
+
+msgid "Select Frames"
+msgstr "o anu e sitelen"
+
+msgid "Left to Right, Top to Bottom"
+msgstr "tan soto tawa teje, tan sewi tawa anpa"
+
+msgid "Left to Right, Bottom to Top"
+msgstr "tan soto tawa teje, tan anpa tawa sewi"
+
+msgid "Right to Left, Top to Bottom"
+msgstr "tan teje tawa soto, tan sewi tawa anpa"
+
+msgid "Right to Left, Bottom to Top"
+msgstr "tan teje tawa soto, tan anpa tawa sewi"
+
+msgid "Top to Bottom, Left to Right"
+msgstr "tan sewi tawa anpa, tan soto tawa teje"
+
+msgid "Top to Bottom, Right to Left"
+msgstr "tan sewi tawa anpa, tan teje tawa soto"
+
+msgid "Bottom to Top, Left to Right"
+msgstr "tan anpa tawa sewi, tan soto tawa teje"
+
+msgid "Bottom to Top, Right to Left"
+msgstr "tan anpa tawa sewi, tan teje tawa soto"
+
+msgid "Select None"
+msgstr "o anu e ala"
+
+msgid "Toggle Settings Panel"
+msgstr "o ante tu e ma pi lawa toki"
+
+msgid "Size"
+msgstr "suli"
+
+msgid "Create Frames from Sprite Sheet"
+msgstr "o pali sin e sitelen tan lipu sitelen"
+
+msgid "SpriteFrames"
+msgstr "SpriteFrames"
+
+msgid "Toggle SpriteFrames Bottom Panel"
+msgstr "o ante tu e ma anpa SpriteFrames"
+
+msgid "Reload"
+msgstr "o lukin sin"
+
+msgid "Resave"
+msgstr "o kama awen sin"
+
+msgid "1 color"
+msgid_plural "{num} colors"
+msgstr[0] "kule {num}"
+
+msgid "No colors found."
+msgstr "mi lukin e kule ala."
+
+msgid "1 constant"
+msgid_plural "{num} constants"
+msgstr[0] "nanpa awen {num}"
+
+msgid "No constants found."
+msgstr "mi lukin e nanpa awen ala."
+
+msgid "1 font"
+msgid_plural "{num} fonts"
+msgstr[0] "nasin sitelen {num}"
+
+msgid "No fonts found."
+msgstr "mi lukin e nasin sitelen ala."
+
+msgid "1 font size"
+msgid_plural "{num} font sizes"
+msgstr[0] "suli {num} pi nasin sitelen"
+
+msgid "No font sizes found."
+msgstr "mi lukin e suli ala pi nasin sitelen."
+
+msgid "1 icon"
+msgid_plural "{num} icons"
+msgstr[0] "sitelen lili {num}"
+
+msgid "No icons found."
+msgstr "mi lukin e sitilen lili ala."
+
+msgid "1 stylebox"
+msgid_plural "{num} styleboxes"
+msgstr[0] "ijo Stylebox {num}"
+
+msgid "No styleboxes found."
+msgstr "mi lukin e ijo Stylebox ala."
+
+msgid "{num} currently selected"
+msgid_plural "{num} currently selected"
+msgstr[0] "ijo {num} li anu lon tenpo ni"
+
+msgid "Updating the editor"
+msgstr "mi sin e ilo ante"
+
+msgid "Finalizing"
+msgstr "mi kama pini"
+
+msgid "Select all visible color items."
+msgstr "o anu e ijo kule ale pi ken lukin."
+
+msgid "Select all visible color items and their data."
+msgstr "o anu e ijo kule ale pi ken lukin e sona ona."
+
+msgid "Deselect all visible color items."
+msgstr "o anu ala e ijo kule ale pi ken lukin."
+
+msgid "Select all visible constant items."
+msgstr "o anu e ijo ale pi nanpa awen pi ken lukin."
+
+msgid "Select all visible constant items and their data."
+msgstr "o anu e ijo ale pi nanpa awen pi ken lukin e sona ona."
+
+msgid "Deselect all visible constant items."
+msgstr "o anu ala e ijo ale pi nanpa awen pi ken lukin."
+
+msgid "Select all visible font items."
+msgstr "o anu e ijo ale pi nasin sitelen pi ken lukin."
+
+msgid "Select all visible font items and their data."
+msgstr "o anu e ijo ale pi nasin sitelen pi ken lukin e sona ona."
+
+msgid "Deselect all visible font items."
+msgstr "o anu ala e ijo ale pi nasin sitelen pi ken lukin."
+
+msgid "Font sizes"
+msgstr "suli pi nasin sitelen"
+
+msgid "Select all visible font size items."
+msgstr "o anu e ijo ale ni pi ken lukin: suli pi nasin sitelen."
+
+msgid "Select all visible font size items and their data."
+msgstr "o anu e ijo ale ni pi ken lukin e sona ona: suli pi nasin sitelen."
+
+msgid "Deselect all visible font size items."
+msgstr "o anu ala e ijo ale ni pi ken lukin: suli pi nasin sitelen."
+
+msgid "Select all visible icon items."
+msgstr "o anu e ijo ale pi sitelen lili pi ken lukin."
+
+msgid "Select all visible icon items and their data."
+msgstr "o anu e ijo ale pi sitelen lili pi ken lukin e sona ona."
+
+msgid "Deselect all visible icon items."
+msgstr "o anu ala e ijo ale pi sitelen lili pi ken lukin."
+
+msgid "Select all visible stylebox items."
+msgstr "o anu e ijo Stylebox ale pi ken lukin."
+
+msgid "Select all visible stylebox items and their data."
+msgstr "o anu e ijo Stylebox ale pi ken lukin e sona ona."
+
+msgid "Deselect all visible stylebox items."
+msgstr "o anu ala e ijo Stylebox ale pi ken lukin."
+
+msgid "Select all Theme items."
+msgstr "o anu e ijo ale ni: poki sona pi ante sitelen."
+
+msgid "Select all Theme items with item data."
+msgstr ""
+"o anu e ijo ale ni: ijo ni li kepeken e sona ijo li poki sona pi ante sitelen."
+
+msgid "Deselect All"
+msgstr "o anu ala e ale"
+
+msgid "Deselect all Theme items."
+msgstr "o anu ala e ijo ale ni: poki sona pi ante sitelen."
+
+msgid "Remove All Color Items"
+msgstr "o weka e ijo kule ale"
+
+msgid "Rename Item"
+msgstr "o nimi sin e ijo"
+
+msgid "Remove All Constant Items"
+msgstr "o weka e ijo ale pi nanpa awen"
+
+msgid "Remove All Font Items"
+msgstr "o weka e ijo ale pi nasin sitelen"
+
+msgid "Remove All Font Size Items"
+msgstr "o weka e ijo ale ni: suli pi nasin sitelen"
+
+msgid "Remove All Icon Items"
+msgstr "o weka e ijo ale pi sitelen lili"
+
+msgid "Remove All StyleBox Items"
+msgstr "o weka e ijo StyleBox ale"
+
+msgid "Remove Theme Item"
+msgstr "o weka e ijo ni: poki sona pi ante sitelen"
+
+msgid "Create Theme Item"
+msgstr "o pali sin e ijo ni: poki sona pi ante sitelen"
+
+msgid "Remove All Items From Theme"
+msgstr "o weka e ijo ale tan poki sona pi ante sitelen"
+
+msgid "Rename Color Item"
+msgstr "o nimi sin e ijo Kule"
+
+msgid "Rename Constant Item"
+msgstr "o nimi sin e ijo pi nanpa awen"
+
+msgid "Rename Font Item"
+msgstr "o nimi sin e ijo pi nasin sitelen"
+
+msgid "Rename Font Size Item"
+msgstr "o nimi sin e ijo ni: suli pi nasin sitelen"
+
+msgid "Rename Icon Item"
+msgstr "o nimi sin e ijo pi sitelen lili"
+
+msgid "Rename Stylebox Item"
+msgstr "o nimi sin e ijo Stylebox"
+
+msgid "Rename Theme Item"
+msgstr "o nimi sin e ijo ni: poki sona pi ante sitelen"
+
+msgid "Invalid file, not a Theme resource."
+msgstr "lipu li ken ala tan ni: lipu li poki sona ala pi ante sitelen."
+
+msgid "Invalid file, same as the edited Theme resource."
+msgstr "lipu li ken ala tan ni: lipu li sama poki sona ante pi ante sitelen."
+
+msgid "Manage Theme Items"
+msgstr "o lawa e ijo ni: poki sona pi ante sitelen"
+
+msgid "Edit Items"
+msgstr "o ante e ijo"
+
+msgid "Add Item:"
+msgstr "o pana e ijo:"
+
+msgid "Add StyleBox Item"
+msgstr "o pana e ijo StyleBox"
+
+msgid "Remove Items:"
+msgstr "o weka e ijo:"
+
+msgid "Remove All Items"
+msgstr "o weka e ijo ale"
+
+msgid "Add Theme Item"
+msgstr "o pana e ijo pi poki sona"
+
+msgid "Old Name:"
+msgstr "nimi majuna:"
+
+msgid "Default Theme"
+msgstr "poki sona meso pi ante sitelen"
+
+msgid "Editor Theme"
+msgstr "poki sona pi ante sitelen pi ilo ante"
+
+msgid "Theme Resource"
+msgstr "poki sona pi ante sitelen"
+
+msgid "Another Theme"
+msgstr "poki sona ante pi ante sitelen"
+
+msgid "Set Color Item in Theme"
+msgstr "o ante e ijo kule lon poki sona"
+
+msgid "Set Constant Item in Theme"
+msgstr "o ante e ijo pi nanpa awen lon poki sona"
+
+msgid "Set Font Size Item in Theme"
+msgstr "o ante e ijo ni lon poki sona: suli pi nasin sitelen"
+
+msgid "Set Font Item in Theme"
+msgstr "o ante e ijo pi nasin sitelen lon poki sona"
+
+msgid "Set Icon Item in Theme"
+msgstr "o ante e ijo pi sitelen lili lon poki sona"
+
+msgid "Set Stylebox Item in Theme"
+msgstr "o ante e ijo Stylebox lon poki sona"
+
+msgid "Theme:"
+msgstr "poki sona pi ante sitelen:"
+
+msgid "Manage Items..."
+msgstr "o lawa e ijo..."
+
+msgid "Toggle Theme Bottom Panel"
+msgstr "o ante tu e ma anpa ni: poki sona pi ante sitelen"
+
+msgid "Toggle Button"
+msgstr "o ante tu e nena"
+
+msgid "Alternative Tiles"
+msgstr "leko ante"
+
+msgid "Reset Polygons"
+msgstr "o tawa open e ijo pi linja mute"
+
+msgid "Clear Polygons"
+msgstr "o weka e ijo pi linja mute"
+
+msgid "Rotate Polygons Right"
+msgstr "o sike teje e ijo pi linja mute"
+
+msgid "Rotate Polygons Left"
+msgstr "o sike soto e ijo pi linja mute"
+
+msgid "Edit Polygons"
+msgstr "o ante e ijo pi linja mute"
+
+msgid "Rotate Right"
+msgstr "o sike teje"
+
+msgid "Rotate Left"
+msgstr "o sike soto"
+
+msgid "Tile with Invalid Scene"
+msgstr "leko kepeken ma pali pi ken ala"
+
+msgid "Delete tiles"
+msgstr "o weka e leko"
+
+msgid "Change selection"
+msgstr "o ante e anu"
+
+msgid "Move tiles"
+msgstr "o tawa e leko"
+
+msgid "Paint tiles"
+msgstr "o sitelen e leko"
+
+msgid "Selection Tool"
+msgstr "ilo anu"
+
+msgid "Shift: Draw line."
+msgstr "Shift: o sitelen e linja."
+
+msgid "Shift: Draw rectangle."
+msgstr "Shift: o sitelen e leko."
+
+msgid "Alternatively hold %s with other tools to pick tile."
+msgstr "ante la o kepeken nena %s kepeken ilo ante tawa anu e leko."
+
+msgid "Alternatively use RMB to erase tiles."
+msgstr "ante la o kepeken nena RMB tawa weka e leko."
+
+msgid "Rotate Tile Left"
+msgstr "o sike soto e leko"
+
+msgid "Rotate Tile Right"
+msgstr "o sike teje e leko"
+
+msgid "Tiles"
+msgstr "leko"
+
+msgid "Paint terrain"
+msgstr "o sitelen e ma"
+
+msgid "Terrain Set %d (%s)"
+msgstr "kulupu ma nanpa %d (%s)"
+
+msgid "Terrains"
+msgstr "ma"
+
+msgid "No Layers"
+msgstr "selo ala"
+
+msgid "Extract TileMap layers as individual TileMapLayer nodes"
+msgstr "o open e selo mute TileMap tawa ijo pali mute TileMapLayer"
+
+msgid "Can't edit multiple layers at once."
+msgstr "sina ken ala ante e lipu mute lon tenpo sama."
+
+msgid "The edited layer is disabled or invisible"
+msgstr "selo ante li ala anu ken lukin ala"
+
+msgid ""
+"The edited TileMap or TileMapLayer node has no TileSet resource.\n"
+"Create or load a TileSet resource in the Tile Set property in the inspector."
+msgstr ""
+"ijo pali ante TileMap anu ijo pali ante TileMapLayer li jo e poki sona "
+"TileSet ala.\n"
+"o pali sin anu kama lon e poki sona TileSet lon nasin ijo pi kulupu leko lon "
+"ma pi nasin ijo."
+
+msgid "Select Next Tile Map Layer"
+msgstr "o anu e lipu kama pi lipu ma leko"
+
+msgid "Select Previous Tile Map Layer"
+msgstr "o anu e lipu tawa pi lipu ma leko"
+
+msgid "TileMap Layers"
+msgstr "lipu pi TileMap"
+
+msgid "Select previous layer"
+msgstr "o anu e lipu tawa"
+
+msgid "Select next layer"
+msgstr "o anu e lipu kama"
+
+msgid "Select all layers"
+msgstr "o anu e lipu ale"
+
+msgid "Select all TileMapLayers in scene"
+msgstr "o anu e ijo pali TileMapLayer ale lon ma pali"
+
+msgid "Highlight Selected TileMap Layer"
+msgstr "o walo e selo TileMap anu"
+
+msgid "Toggle grid visibility."
+msgstr "o ante tu e sijelo lukin pi kulupu leko."
+
+msgid "From Source"
+msgstr "tan open"
+
+msgid "From Coords"
+msgstr "tan lon"
+
+msgid "From Alternative"
+msgstr "tan ante"
+
+msgid "To Source"
+msgstr "tawa open"
+
+msgid "To Coords"
+msgstr "tawa lon"
+
+msgid "To Alternative"
+msgstr "tawa ante"
+
+msgid "Clear Invalid"
+msgstr "o weka e ken ala"
+
+msgid "Create tiles"
+msgstr "o pali sin e leko"
+
+msgid "Create a tile"
+msgstr "o pali sin e leko"
+
+msgid "Remove tiles"
+msgstr "o weka e leko"
+
+msgid "Move a tile"
+msgstr "o tawa e leko"
+
+msgid "Select tiles"
+msgstr "o anu e leko"
+
+msgid "Resize a tile"
+msgstr "o ante e suli leko"
+
+msgid "Remove tile"
+msgstr "o weka e leko"
+
+msgid "Paint Tool"
+msgstr "ilo sitelen"
+
+msgid "Line Tool"
+msgstr "ilo sitelen linja"
+
+msgid "Rect Tool"
+msgstr "ilo sitelen leko"
+
+msgid "Eraser Tool"
+msgstr "ilo sitelen weka"
+
+msgid "TileMap"
+msgstr "TileMap"
+
+msgid "Toggle TileMap Bottom Panel"
+msgstr "o ante tu e ma anpa TileMap"
+
+msgid "TileSet"
+msgstr "TileSet"
+
+msgid "Toggle TileSet Bottom Panel"
+msgstr "o ante tu e ma anpa TileSet"
+
+msgid "Error"
+msgstr "pakala"
+
+msgid "Open in editor"
+msgstr "o open lon ilo ante"
+
+msgid "Discard changes"
+msgstr "o weka e ante"
+
+msgid "Date:"
+msgstr "tenpo:"
+
+msgid "Local Settings"
+msgstr "lawa toki pi ma ni"
+
+msgid "Permanentally delete my changes"
+msgstr "o weka e ante mi lon tenpo ale"
+
+msgid "Renamed"
+msgstr "ni li jo e nimi sin"
+
+msgid "Deleted"
+msgstr "ni li weka"
+
+msgid "Float"
+msgstr "Float"
+
+msgid "Int"
+msgstr "Int"
+
+msgid "UInt"
+msgstr "UInt"
+
+msgid "Vector2"
+msgstr "Vector2"
+
+msgid "Vector3"
+msgstr "Vector3"
+
+msgid "Vector4"
+msgstr "Vector4"
+
+msgid "Boolean"
+msgstr "Boolean"
+
+msgid "Move VisualShader Node(s)"
+msgstr "o tawa e ijo pali VisualShader"
+
+msgid "Delete VisualShader Node"
+msgstr "o weka e ijo pali VisualShader"
+
+msgid "Delete VisualShader Node(s)"
+msgstr "o weka e ijo pali VisualShader"
+
+msgid "Duplicate VisualShader Node(s)"
+msgstr "o pali tu e ijo pali VisualShader"
+
+msgid "Light"
+msgstr "suno"
+
+msgid "Sky"
+msgstr "sewi"
+
+msgid "Fog"
+msgstr "kon pi ken lukin ala"
+
+msgid "Add Node"
+msgstr "o pana e ijo pali"
+
+msgid "Insert New Node"
+msgstr "o pana e ijo pali sin lon ni"
+
+msgid "Create Shader Node"
+msgstr "o pali sin e ijo pali pi ilo sitelen"
+
+msgid "Returns the greater of two values."
+msgstr "ni li pana e suli lon nanpa tu."
+
+msgid "Returns the lesser of two values."
+msgstr "ni li pana e lili lon nanpa tu."
+
+msgid ""
+"SmoothStep function( scalar(edge0), scalar(edge1), scalar(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge0' and 1.0 if x is larger than "
+"'edge1'. Otherwise the return value is interpolated between 0.0 and 1.0 using "
+"Hermite polynomials."
+msgstr ""
+"SmoothStep function( scalar(edge0), scalar(edge1), scalar(x) ).\n"
+"\n"
+"'x' li lili tawa 'edge0' la ni li pana e 0.0. 'x' li sula tawa 'edge1' la ni "
+"li pana e 1.0. ante la nanpa pana li tawa kepeken nasin pi Polynomial Hermite "
+"tan 0.0 tawa 1.0."
+
+msgid ""
+"Step function( scalar(edge), scalar(x) ).\n"
+"\n"
+"Returns 0.0 if 'x' is smaller than 'edge' and otherwise 1.0."
+msgstr ""
+"Step function( scalar(edge), scalar(x) ).\n"
+"\n"
+"'x' li lili tawa 'edge' la ni li pana e 0.0. ante la ni li pana e 1.0."
+
+msgid "Sums two transforms."
+msgstr "ni li wan e ante tu."
+
+msgid "Divides two transforms."
+msgstr "ni li tu e ante tu."
+
+msgid "Multiplies two transforms."
+msgstr "ni li mute e ante tu."
+
+msgid "Edit Visual Property: %s"
+msgstr "o ante e nasin ijo lukin: %s"
+
+msgid "Are you sure to run %d projects at once?"
+msgstr "sina wile ala wile pali e pali %d lon tenpo sama?"
+
+msgid ""
+"Can't run project: Project has no main scene defined.\n"
+"Please edit the project and set the main scene in the Project Settings under "
+"the \"Application\" category."
+msgstr ""
+"mi ken ala pali e pali: pali li jo ala e ma pali lawa.\n"
+"o ante e pali o anu e ma pali lawa lon lawa toki pi pali ni lon kulupu "
+"\"ilo\"."
+
+msgid ""
+"Can't open project at '%s'.\n"
+"Project file doesn't exist or is inaccessible."
+msgstr ""
+"mi ken ala open e pali lon '%s'.\n"
+"lipu pi pali ni li lon ala anu ken ala lukin."
+
+msgid ""
+"Can't open project at '%s'.\n"
+"Failed to start the editor."
+msgstr ""
+"sina ken ala open e lipu lon '%s'.\n"
+"mi open ala e ilo ante."
+
+msgid ""
+"You requested to open %d projects in parallel. Do you confirm?\n"
+"Note that usual checks for engine version compatibility will be bypassed."
+msgstr ""
+"sina wile open e pali %d lon tenpo sama. sina wile ala wile?\n"
+"toki suli: mi lukin ala e pona anu ike pi nanpa ilo."
+
+msgid ""
+"The selected project \"%s\" does not specify its supported Godot version in "
+"its configuration file (\"project.godot\").\n"
+"\n"
+"Project path: %s\n"
+"\n"
+"If you proceed with opening it, it will be converted to Godot's current "
+"configuration file format.\n"
+"\n"
+"Warning: You won't be able to open the project with previous versions of the "
+"engine anymore."
+msgstr ""
+"lipu ni \"%s\" li toki ala e nanpa pona ona pi ilo Koto lon lipu lawa ona "
+"(\"project.godot\").\n"
+"\n"
+"nasin pali: %s\n"
+"\n"
+"sina kama open e ona la, ona li ante tawa nasin pi lipu lawa pi tenpo ni pi "
+"ilo Koto.\n"
+"\n"
+"toki suli: ni la sina ken ala open e pali ni kepeken nanpa tawa pi ilo Koto."
+
+msgid ""
+"The selected project \"%s\" was generated by Godot 3.x, and needs to be "
+"converted for Godot 4.x.\n"
+"\n"
+"Project path: %s\n"
+"\n"
+"You have three options:\n"
+"- Convert only the configuration file (\"project.godot\"). Use this to open "
+"the project without attempting to convert its scenes, resources and scripts.\n"
+"- Convert the entire project including its scenes, resources and scripts "
+"(recommended if you are upgrading).\n"
+"- Do nothing and go back.\n"
+"\n"
+"Warning: If you select a conversion option, you won't be able to open the "
+"project with previous versions of the engine anymore."
+msgstr ""
+"lipu ni \"%s\" li pali sin tan ilo Koto nanpa 3.x, li wile ante tawa ilo Koto "
+"4.x.\n"
+"\n"
+"nasin lipu: %s\n"
+"\n"
+"sina jo e anu tu wan:\n"
+"- o ante e lipu lawa taso (\"project.godot\"). ni li open e pali li ante ala "
+"e ma pali e poki sona e lipu ilo.\n"
+"- o ante e lipu e ma pali ona e poki sona ona e lipu ilo ona (sina sin e ilo "
+"Koto la ni li pona).\n"
+"- o ala o tawa open.\n"
+"\n"
+"toki suli: sina anu e ante la, sina ken ala open e pali ni kepeken nanpa ilo "
+"tawa."
+
+msgid "Convert project.godot Only"
+msgstr "o ante e project.godot taso"
+
+msgid ""
+"The selected project \"%s\" was generated by an older engine version, and "
+"needs to be converted for this version.\n"
+"\n"
+"Project path: %s\n"
+"\n"
+"Do you want to convert it?\n"
+"\n"
+"Warning: You won't be able to open the project with previous versions of the "
+"engine anymore."
+msgstr ""
+"lipu ni \"%s\" li pali sin tan nanpa ilo tawa, li wile ante tawa nanpa ni.\n"
+"\n"
+"nasin lipu: %s\n"
+"\n"
+"sina wile ala wile ante e ona?\n"
+"\n"
+"toki suli: ni la sina ken ala open e pali ni kepeken nanpa ilo tawa."
+
+msgid "Convert project.godot"
+msgstr "o ante e project.godot"
+
+msgid ""
+"Can't open project \"%s\" at the following path:\n"
+"\n"
+"%s\n"
+"\n"
+"The project settings were created by a newer engine version, whose settings "
+"are not compatible with this version."
+msgstr ""
+"mi ken ala open e pali \"%s\" lon nasin ni:\n"
+"\n"
+"%s\n"
+"\n"
+"lawa toki li pali sin tan nanpa ilo pi tenpo kama. lawa ona li ike tawa nanpa "
+"ni."
+
+msgid ""
+"Warning: This project was last edited in Godot %s. Opening will change it to "
+"Godot %s.\n"
+"\n"
+msgstr ""
+"toki suli: ante nanpa pini pi pali ni li lon ilo Koto nanpa %s. sina open e "
+"ona la ona li ante tawa ilo Koto nanpa %s.\n"
+"\n"
+
+msgid ""
+"Warning: This project uses the following features not supported by this build "
+"of Godot:\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+"toki suli: pali ni li kepeken ijo ni. ona li ike tawa nanpa ni pi ilo Koto:\n"
+"\n"
+"%s\n"
+"\n"
+
+msgid "Open anyway? Project will be modified."
+msgstr "sina wile ala wile open? ni la pali li ante."
+
+msgid "Remove %d projects from the list?"
+msgstr "sina wile ala wile weka e pali %d tan kulupu ni?"
+
+msgid "Remove this project from the list?"
+msgstr "sina wile ala wile weka e pali ni tan kulupu ni?"
+
+msgid ""
+"Remove all missing projects from the list?\n"
+"The project folders' contents won't be modified."
+msgstr ""
+"sina wile ala wile weka e pali weka tan kulupu ni?\n"
+"ijo pi kulupu lipu tan pali ni li ante ala."
+
+msgid ""
+"It looks like Godot crashed when opening this project the last time. If "
+"you're having problems editing this project, you can try to open it in "
+"Recovery Mode."
+msgstr ""
+"mi lukin e ni: tawa la pali ni li open la ilo Koto li pakala. sina ante e "
+"pali ni la sina jo e ike, la sina ken open e ona lon nasin alasa."
+
+msgid ""
+"Recovery Mode is a special mode that may help to recover projects that crash "
+"the engine during initialization. This mode temporarily disables the "
+"following features:"
+msgstr ""
+"nasin alasa li nasin wan li ken pona e pali ni: pali li pakala lon open. "
+"tenpo awen ala la nasin ni li ala e ijo ni:"
+
+msgid "Edit the project in Recovery Mode?"
+msgstr "sina wile ala wile ante e pali lon nasin alasa?"
+
+msgid "Couldn't load project at '%s'. It may be missing or corrupted."
+msgstr "mi ken ala pali e pali lon '%s'. ken la ona li lon ala anu pakala."
+
+msgid "Couldn't save project at '%s' (error %d)."
+msgstr "mi ken ala kama awen e pali lon '%s' (pakala nanpa %d)."
+
+msgctxt "Application"
+msgid "Project Manager"
+msgstr "lawa pali"
+
+msgid "Settings"
+msgstr "lawa toki"
+
+msgid "Projects"
+msgstr "pali"
+
+msgid "New Project"
+msgstr "o pali sin"
+
+msgid "Scan"
+msgstr "o alasa lukin"
+
+msgid "Scan Projects"
+msgstr "o alasa lukin lon pali"
+
+msgid "Loading, please wait..."
+msgstr "mi lukin sin, o awen..."
+
+msgid "You don't have any projects yet."
+msgstr "sina jo ala e pali."
+
+msgid "Create New Project"
+msgstr "o pali sin e pali sin"
+
+msgid "Edit Project"
+msgstr "o ante e pali"
+
+msgid "Edit in recovery mode"
+msgstr "o ante lon nasin alasa"
+
+msgid "Rename Project"
+msgstr "o nimi sin e pali"
+
+msgid "Manage Tags"
+msgstr "o lawa e poki"
+
+msgid "Edit normally"
+msgstr "o ante lon meso"
+
+msgid "Edit in Recovery Mode"
+msgstr "o ante lon nasin alasa"
+
+msgid "Convert Full Project"
+msgstr "o ante e pali wan"
+
+msgid ""
+"This option will perform full project conversion, updating scenes, resources "
+"and scripts from Godot 3 to work in Godot 4.\n"
+"\n"
+"Note that this is a best-effort conversion, i.e. it makes upgrading the "
+"project easier, but it will not open out-of-the-box and will still require "
+"manual adjustments.\n"
+"\n"
+"IMPORTANT: Make sure to backup your project before converting, as this "
+"operation makes it impossible to open it in older versions of Godot."
+msgstr ""
+"lawa ni li ante e lipu wan, e ma pali, e poki sona, e lipu ilo, tan ilo Koto "
+"nanpa 3 tawa ilo Koto nanpa 4.\n"
+"\n"
+"o sona: ante ni li pona e sin pali, taso ona li ante ala e wan. ken la sina "
+"ante e ona.\n"
+"\n"
+"toki pi suli mute: o jo e pali sama, la o ante. ni tan ante ni li ken ala e "
+"open pali lon nanpa tawa pi ilo Koto."
+
+msgid "Manage Project Tags"
+msgstr "o lawa e poki pi pali ni"
+
+msgid "Valid project found at path."
+msgstr "mi lukin e pali ken lon nasin."
+
+msgid "The project folder already exists and is empty."
+msgstr "kulupu lipu pi pali ni li lon li jo ala."
+
+msgid "The path specified doesn't exist."
+msgstr "nasin ni li lon ala."
+
+msgid "The project folder exists and is empty."
+msgstr "kulupu lipu pi pali ni li lon li jo ala."
+
+msgid ""
+"The selected path is not empty. Choosing an empty folder is highly "
+"recommended."
+msgstr ""
+"nasin ni li jo e ijo. mi wile mute e ni: sina anu e kulupu lipu pi jo ala."
+
+msgid "New Game Project"
+msgstr "pali musi sin"
+
+msgid "Warning: This folder is not empty"
+msgstr "toki suli: kulupu lipu ni li jo ala e ala"
+
+msgid ""
+"Couldn't load project at '%s' (error %d). It may be missing or corrupted."
+msgstr ""
+"mi ken ala kama lon e pali lon '%s' (pakala nanpa %d). ken la ona li weka anu "
+"ante ike."
+
+msgid "Project Name:"
+msgstr "nimi pali:"
+
+msgid "Project Path:"
+msgstr "nasin pali:"
+
+msgid "Edit Now"
+msgstr "o ante lon ni"
+
+msgid "Error: Project is missing on the filesystem."
+msgstr "pakala: pali li weka lon nasin lipu."
+
+msgid "Scanning"
+msgstr "mi alasa lukin"
+
+msgid "Scanning for projects..."
+msgstr "mi alasa lukin e pali..."
+
+msgid "Restart Now"
+msgstr "o open sin lon tenpo ni"
+
+msgid ""
+"Settings changed! The project manager must be restarted for changes to take "
+"effect."
+msgstr "lawa toki li ante! lawa pali li open sin la ante li lon."
+
+msgid "Delete Item"
+msgstr "o weka e ijo"
+
+msgid "(All)"
+msgstr "(ale)"
+
+msgid "Project Settings (project.godot)"
+msgstr "lawa toki pi pali ni (project.godot)"
+
+msgid "Localization"
+msgstr "ante toki pi ma poka"
+
+msgid "Globals"
+msgstr "ijo lon ale"
+
+msgid "Plugins"
+msgstr "ilo namako"
+
+msgid "Select Property"
+msgstr "o anu e nasin ijo"
+
+msgid "Node name."
+msgstr "nimi pi ijo pali."
+
+msgid "Node's parent name, if available."
+msgstr "nimi li lon la, ni li nimi tan mama pi ijo pali."
+
+msgid "Current scene name."
+msgstr "nimi pi ma pali ni."
+
+msgid "Root node name."
+msgstr "nimi pi ijo pali open."
+
+msgid "Select new parent:"
+msgstr "o anu e mama sin:"
+
+msgid "File name invalid."
+msgstr "nimi lipu li ken ala."
+
+msgid "File already exists."
+msgstr "lipu li lon."
+
+msgid "Invalid root node name."
+msgstr "nimi pi ijo pali li ken ala."
+
+msgid "2D Scene"
+msgstr "ma pali 2D"
+
+msgid "3D Scene"
+msgstr "ma pali 3D"
+
+msgid "Root Name:"
+msgstr "open nimi:"
+
+msgid "Scene name is valid."
+msgstr "nimi pi ma pali li ken."
+
+msgid "Root node valid."
+msgstr "ijo pali open li ken."
+
+msgid "Error loading scene from %s"
+msgstr "kama lon e ma pali tan %s la pakala li lon"
+
+msgid "Move Node in Parent"
+msgstr "o tawa e ijo pali lon mama"
+
+msgid "Move Nodes in Parent"
+msgstr "o tawa e ijo pali lon mama"
+
+msgid "Duplicate Node(s)"
+msgstr "o pali tu e ijo pali"
+
+msgid "Delete %d nodes?"
+msgstr "sina wile ala wile weka e ijo pali %d?"
+
+msgid "Delete the root node \"%s\"?"
+msgstr "sina wile ala wile weka e ijo pali open\"%s\"?"
+
+msgid "Delete node \"%s\" and its children?"
+msgstr "sina wile ala wile weka e ijo pali \"%s\" e ijo tan ona?"
+
+msgid "Delete node \"%s\"?"
+msgstr "sina wile ala wile weka e ijo pali \"%s\"?"
+
+msgid "New Scene Root"
+msgstr "open sin pi ma pali"
+
+msgid "Create Root Node:"
+msgstr "o pali sin e ijo pali open:"
+
+msgid "Toggle the display of favorite nodes."
+msgstr "o ante tu e lukin ni: ijo pali pi olin sina."
+
+msgid "Other Node"
+msgstr "ijo pali ante"
+
+msgid "Remove Node(s)"
+msgstr "o weka e ijo pali"
+
+msgid "Error saving scene."
+msgstr "kama awen e ma pali la pakala li lon."
+
+msgid "Error duplicating scene to save it."
+msgstr "pali tu e ma pali tawa kama awen e ona la pakala li lon."
+
+msgid "<unknown>"
+msgstr "<mi sona ala e ni>"
+
+msgid "Path is empty."
+msgstr "nasin li jo ala."
+
+msgid "Filename is empty."
+msgstr "nimi lipu li jo ala."
+
+msgid "Filename is invalid."
+msgstr "nimi lipu li ken ala."
+
+msgid "Name begins with a dot."
+msgstr "open nimi li sike lili."
+
+msgid "File does not exist."
+msgstr "lipu li lon ala."
+
+msgid "Invalid extension."
+msgstr "namako li ken ala."
+
+msgid "Error - Could not create script in filesystem."
+msgstr "pakala - mi ken ala pali sin e lipu ilo lon nasin lipu."
+
+msgid "Error loading script from %s"
+msgstr "pakala li lon kama lon e lipu ilo tan %s"
+
+msgid "Open Script / Choose Location"
+msgstr "o open e lipu ilo / o anu e ma"
+
+msgid "Open Script"
+msgstr "o open e lipu ilo"
+
+msgid "Invalid path."
+msgstr "nasin li ken ala."
+
+msgid "Using existing script file."
+msgstr "mi kepeken lipu lon pi lipu ilo."
+
+msgid "Will load an existing script file."
+msgstr "kama la mi kama lon e lipu lon pi lipu ilo."
+
+msgid "Script file already exists."
+msgstr "lipu pi lipu ilo li lon."
+
+msgid "Empty"
+msgstr "jo ala"
+
+msgid "Script path/name is valid."
+msgstr "nasin/nimi pi lipu ilo li ken."
+
+msgid "Will create a new script file."
+msgstr "kama la mi pali sin e lipu pi lipu ilo."
+
+msgid "Error - Could not create shader in filesystem."
+msgstr "pakala - mi ken ala pali sin e ilo sitelen lon nasin lipu."
+
+msgid "Error loading shader from %s"
+msgstr "kama lon e ilo sitelen tan %s la pakala li lon"
+
+msgid "N/A"
+msgstr "N/A"
+
+msgid "Open Shader / Choose Location"
+msgstr "o open e ilo sitelen / o anu e ma"
+
+msgid "Shader file already exists."
+msgstr "lipu pi ilo sitelen li lon."
+
+msgid "Shader path/name is valid."
+msgstr "nasin/nimi pi ilo sitelen li ken."
+
+msgid "Mode:"
+msgstr "nasin:"
+
+msgid "Create Shader"
+msgstr "o pali sin e ilo sitelen"
+
+msgid ""
+"This project uses meshes with an outdated mesh format from previous Godot "
+"versions. The engine needs to update the format in order to use those meshes. "
+"Please use the 'Upgrade Mesh Surfaces' tool from the 'Project > Tools' menu. "
+"You can ignore this message and keep using outdated meshes, but keep in mind "
+"that this leads to increased load times every time you load the project."
+msgstr ""
+"pali ni li kepeken seli pi nasin selo ike tan nanpa tawa pi ilo Koto. ilo "
+"Koto li wile sin e nasin tawa kepeken selo ona. o kepeken ilo 'o sin e selo' "
+"tan ma lawa 'pali > ilo'. sina ken e ni: sina lukin ala e toki ni li kepeken "
+"selo ike. taso, o sona e ni: sina kama lon e pali la, tenpo pi kama lon li "
+"suli tawa sina."
+
+msgid "Attempting to re-save "
+msgstr "mi alasa kama awen sin "
+
+msgid "Attempting to remove "
+msgstr "mi alasa weka "
+
+msgid ""
+"The mesh format has changed in Godot 4.2, which affects both imported meshes "
+"and meshes authored inside of Godot. The engine needs to update the format in "
+"order to use those meshes.\n"
+"\n"
+"If your project predates Godot 4.2 and contains meshes, we recommend you run "
+"this one time conversion tool. This update will restart the editor and may "
+"take several minutes. Upgrading will make the meshes incompatible with "
+"previous versions of Godot.\n"
+"\n"
+"You can still use your existing meshes as is. The engine will update each "
+"mesh in memory, but the update will not be saved. Choosing this option will "
+"lead to slower load times every time this project is loaded."
+msgstr ""
+"nasin selo li ante lon ilo Koto nanpa 4.2. ni li ante e selo lanpan e selo "
+"lon ala ilo Koto. ilo Koto li wile sin e nasin tawa kepeken e selo ona.\n"
+"\n"
+"pali sina li sin ala tawa ilo Koto li jo e selo, mi toki e ni tawa sina: o "
+"kepeken e ilo ni pi tenpo wan. sin ni li open sin e ilo ante li lanpan e "
+"tenpo meso. sina sin la selo li ike tawa nanpa tawa pi ilo Koto.\n"
+"\n"
+"sina ken kepeken e selo ni li sin ala. ilo Koto li sin e selo wan lon sona, "
+"taso sin li kama awen ala. sina anu e ni la kama lon pi pali ni li lanpan e "
+"tenpo mute."
+
+msgid "Restart & Upgrade"
+msgstr "o open sin o sin"
+
+msgid "Updating Script UIDs"
+msgstr "mi sin e UID pi lipu ilo"
+
+msgid ""
+"As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
+"shaders. Upgrades apply on the next save of each scene/resource.\n"
+"\n"
+"To save time, this tool can open and save each of these files. Depending on "
+"the project size, it may take several minutes."
+msgstr ""
+"ilo Koto nanpa 4.4 la, ma pali en poki sona li kepeken nimi UID tawa toki e "
+"lipu ilo e ilo sitelen. sin li lon kama awen kama pi ma pali ale / poki sona "
+"ale.\n"
+"\n"
+"tawa awen e tenpo la, ilo ni li ken open li ken kama awen e lipu ni ale. suli "
+"pi pali ni la, ni li lanpan e tenpo mute."
+
+msgid "Re-save all scenes and resources to use UIDs"
+msgstr "o kama awen sin e ma pali ale e poki sona ale tawa kepeken nimi UID"
+
+msgid "Learn More"
+msgstr "o kama sona e namako"
+
+msgid "CSG"
+msgstr "CSG"
+
+msgid "Change CSG Box Size"
+msgstr "o ante e suli pi leko CSG"
+
+msgid "GridMap Settings"
+msgstr "lawa toki GridMap"
+
+msgid "Toggle GridMap Bottom Panel"
+msgstr "o ante tu e ma anpa GridMap"
+
+msgid "%d (%s)"
+msgstr "%d (%s)"
+
+msgid "%s/s"
+msgstr "%s/s"
+
+msgid "Add from path"
+msgstr "o pana tan nasin"
+
+msgid "Property/path must not be empty."
+msgstr "nasin ijo / nasin li ken ala jo ala."
+
+msgid "Invalid property path: '%s'"
+msgstr "nasin pi nasin ijo li ken ala: '%s'"
+
+msgid "Delete Property?"
+msgstr "sina wile ala wile weka e nasin ijo?"
+
+msgid "Remove Property"
+msgstr "o weka e nasin ijo"
+
+msgctxt "Replication Mode"
+msgid "Never"
+msgstr "lon ala"
+
+msgctxt "Replication Mode"
+msgid "Always"
+msgstr "lon ale"
+
+msgctxt "Replication Mode"
+msgid "On Change"
+msgstr "lon ante"
+
+msgid "Error loading %s: %s."
+msgstr "kama lon e %s la pakala li lon: %s."
+
+msgid "Error saving file %s: %s"
+msgstr "kama awen e lipu %s la pakala li lon: %s"
+
+msgid "Uninstalling..."
+msgstr "mi kama jo ala..."
+
+msgid ""
+"output: \n"
+"%s"
+msgstr ""
+"pana: \n"
+"%s"
+
+msgid "iOS Plugins"
+msgstr "ilo namako iOS"
+
+msgid "Failed to export iOS plugins with code %d. Please check the output log."
+msgstr ""
+"mi ken ala pana e ilo namako iOS kepeken toki ilo %d. o lukin e ma pi toki "
+"pana."
+
+msgid "Could not copy a file at path \"%s\" to \"%s\"."
+msgstr "mi ken ala jasima e lipu lon nasn \"%s\" tawa \"%s\"."
+
+msgid "Failed to create a file at path \"%s\" with code %d."
+msgstr "mi pali sin ala e lipu lon nasin \"%s\" kepeken toki ilo %d."
+
+msgid "Could not open file \"%s\"."
+msgstr "mi ken ala open e lipu \"%s\"."
+
+msgid "Stop and uninstall"
+msgstr "o pini o kama jo ala"
+
+msgid "Running..."
+msgstr "mi pali..."
+
+msgid "Exporting project..."
+msgstr "mi pana e pali..."
+
+msgid "Starting project..."
+msgstr "mi open e pali..."
+
+msgid "Microphone access is enabled, but usage description is not specified."
+msgstr "ken kepeken pi ilo kalama li lon, taso toki kepeken li toki ala."
+
+msgid "Camera access is enabled, but usage description is not specified."
+msgstr "ken kepeken pi ilo lukin sitelen li lon, taso toki kepeken li toki ala."
+
+msgid ""
+"Location information access is enabled, but usage description is not "
+"specified."
+msgstr "ken kepeken pi sona ma li lon, taso toki kepeken li toki ala."
+
+msgid "Address book access is enabled, but usage description is not specified."
+msgstr "ken kepeken pi lipu ma li lon, taso toki kepeken li toki ala."
+
+msgid "Calendar access is enabled, but usage description is not specified."
+msgstr "ken kepeken pi ilo tenpo li lon, taso toki kepeken li toki ala."
+
+msgid "Photo library access is enabled, but usage description is not specified."
+msgstr "ken kepeken pi kulupu sitelen li lon, taso toki kepeken li toki ala."
+
+msgid "Could not open \"%s\"."
+msgstr "mi ken ala open e \"%s\"."
+
+msgid "PWA"
+msgstr "PWA"
+
+msgid "Icon size \"%d\" is missing."
+msgstr "suli \"%d\" pi sitelen lili li weka."
+
+msgid "Invalid icon path."
+msgstr "nasin pi sitelen lili li ken ala."
+
+msgid "Invalid file version."
+msgstr "nanpa lipu li ken ala."
+
+msgid "Invalid icon file \"%s\"."
+msgstr "lipu \"%s\" pi sitelen lili li ken ala."
+
+msgid "Node A and Node B must be PhysicsBody2Ds"
+msgstr "ijo pali A en ijo pali B li wile PhysicsBody2D"
+
+msgid "Node A must be a PhysicsBody2D"
+msgstr "ijo pali A li wile PhysicsBody2D"
+
+msgid "Node B must be a PhysicsBody2D"
+msgstr "ijo pali B li wile PhysicsBody2D"
+
+msgid "Node A and Node B must be different PhysicsBody2Ds"
+msgstr "ijo pali A en ijo pali B li wile ijo pali ante PhysicsBody2D"
+
+msgid ""
+"The TileMap node is deprecated as it is superseded by the use of multiple "
+"TileMapLayer nodes.\n"
+"To convert a TileMap to a set of TileMapLayer nodes, open the TileMap bottom "
+"panel with this node selected, click the toolbox icon in the top-right corner "
+"and choose \"Extract TileMap layers as individual TileMapLayer nodes\"."
+msgstr ""
+"ijo pali TileMap li ike tan ijo pali TileMapLayer mute li pona.\n"
+"sina wile ante e ijo pali TileMap tawa kulupu pi ijo pali TileMapLayer la, o "
+"anu e ijo pali ni la o open e ma anpa TileMap, la o pilin e sitelen pi poki "
+"ilo lon ma sewi teje, la o anu e \"o open e selo mute TileMap tawa ijo pali "
+"mute TileMapLayer\"."
+
+msgid "Node A and Node B must be PhysicsBody3Ds"
+msgstr "ijo pali A en ijo pali B li wile PhysicsBody3D"
+
+msgid "Node A must be a PhysicsBody3D"
+msgstr "ijo pali A li wile PhysicsBody3D"
+
+msgid "Node B must be a PhysicsBody3D"
+msgstr "ijo pali B li wile PhysicsBody3D"
+
+msgid "Parent node should be a SpringBoneSimulator3D node."
+msgstr "ijo pali mama li wile ijo pali SpringBoneSimulator3D."
+
+msgid "Animation not found: '%s'"
+msgstr "mi lukin ala e sitelen tawa ni: '%s'"
+
+msgid "Load Color Palette"
+msgstr "o kama lon e kulupu kule"
+
+msgid "Save Color Palette"
+msgstr "o kama awen e kulupu kule"
+
+msgid "Division by zero error."
+msgstr "pakala tan kipisi li kepeken e ala."
+
+msgid "Modulo by zero error."
+msgstr "pakala tan kipisi Motulo li kepeken e ala."
+
+msgid "Constants cannot be modified."
+msgstr "nanpa awen li ken ala ante."
+
+msgid "Can't convert constant to '%s'."
+msgstr "mi ken ala ante e nanpa awen tawa '%s'."
+
+msgid "Expected a '%s'."
+msgstr "mi wile e '%s'."
+
+msgid "Expected a '%s' or '%s'."
+msgstr "mi wile e '%s' anu '%s'."
+
+msgid "Expected a '%s' after '%s'."
+msgstr "mi wile e '%s' lon tawa '%s'."
+
+msgid "The const '%s' is declared but never used."
+msgstr "sina toki e nanpa awen '%s' taso sina kepeken ala e ona."
+
+msgid "The local variable '%s' is declared but never used."
+msgstr "sina toki e nanpa ante '%s' pi ma ni taso sina kepeken ala e ona."
diff --git a/engine/editor/translations/editor/tr.po b/engine/editor/translations/editor/tr.po
index 19043474..ad361b68 100644
--- a/engine/editor/translations/editor/tr.po
+++ b/engine/editor/translations/editor/tr.po
@@ -118,7 +118,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-03-02 14:20+0000\n"
+"PO-Revision-Date: 2025-03-14 11:17+0000\n"
 "Last-Translator: Yılmaz Durmaz <yilmaz_durmaz@hotmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/godot-engine/"
 "godot/tr/>\n"
@@ -127,7 +127,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Ana İş Parçası"
@@ -989,6 +989,9 @@ msgstr ""
 msgid "property '%s'"
 msgstr "'%s' özelliği"
 
+msgid "Nearest FPS: %d"
+msgstr "En yakın FPS: %d"
+
 msgid "Change Animation Step"
 msgstr "Canlandırma Adımını Değiştir"
 
@@ -1243,7 +1246,7 @@ msgid "Optimize Animation (no undo)..."
 msgstr "Canlandırmayı Eniyileştir (geri alınamaz)..."
 
 msgid "Clean-Up Animation (no undo)..."
-msgstr "Canlandırmayı temizle (geri alınamaz)..."
+msgstr "Canlandırmayı Temizle (geri alınamaz)..."
 
 msgid "Pick a node to animate:"
 msgstr "Canlandırılacak düğümü seç:"
@@ -1376,7 +1379,7 @@ msgid "3D Pos/Rot/Scl Track:"
 msgstr "3B Kon/Dön/Ölç İzi:"
 
 msgid "Blendshape Track:"
-msgstr "BlendShape İzi:"
+msgstr "Blendshape İzi:"
 
 msgid "Value Track:"
 msgstr "Değer İzi:"
@@ -1385,7 +1388,7 @@ msgid "Select Tracks to Copy"
 msgstr "Kopyalanacak izleri seç"
 
 msgid "Select All/None"
-msgstr "Tümünü Seç /Seçimleri Kaldır"
+msgstr "Tümünü Seç / Seçimleri Kaldır"
 
 msgid "Animation Change Keyframe Time"
 msgstr "Canlandırma Anahtar Kare Zamanını Değiştir"
@@ -1460,7 +1463,7 @@ msgid "Animation Change Marker Time"
 msgstr "Canlandırma İşaretçi Karesini Değiştir"
 
 msgid "Add Audio Track Clip"
-msgstr "Ses İz Parçası Ekle"
+msgstr "Ses İzi Parçası Ekle"
 
 msgid "Change Audio Track Clip Start Offset"
 msgstr "Ses İzi Parçasının Başlangıç Kaymasını Değiştir"
@@ -1635,6 +1638,9 @@ msgstr "Sinyal Girdi Değişkenlerini Çöz:"
 msgid "Receiver Method:"
 msgstr "Alıcı Yöntem:"
 
+msgid "Pick"
+msgstr "Seç"
+
 msgid "Advanced"
 msgstr "Gelişmiş"
 
@@ -4311,7 +4317,7 @@ msgid "Upgrade Mesh Surfaces..."
 msgstr "Örgü Yüzeylerini Güncelle..."
 
 msgid "Upgrade UIDs..."
-msgstr "Benzersiz kimlikleri (UID) güncelle..."
+msgstr "Benzersiz Kimlikleri (UID) Güncelle..."
 
 msgid "Reload Current Project"
 msgstr "Bu Projeyi Tekrar Yükle"
@@ -5297,6 +5303,12 @@ msgstr "Dosyadan Kur"
 msgid "Install templates from a local file."
 msgstr "Şablonları yerel bir dosyadan kur."
 
+msgid "Online mode is needed to download the templates."
+msgstr "Şablonları indirmek için çevrimiçi mod gereklidir."
+
+msgid "Go Online"
+msgstr "Çevrimiçi Ol"
+
 msgid "Cancel the download of the templates."
 msgstr "Şablonları indirme işlemini iptal et."
 
@@ -8076,7 +8088,7 @@ msgid "Name (A-Z)"
 msgstr "İsim (A-Z)"
 
 msgid "Name (Z-A)"
-msgstr "Name (Z-A)"
+msgstr "İsim (Z-A)"
 
 msgid "License (A-Z)"
 msgstr "Lisans (A-Z)"
@@ -8116,9 +8128,6 @@ msgstr ""
 "Varlık Kütüphanesi çevrimiçi bir bağlantı gerektirir ve internet üzerinden "
 "veri göndermeyi içerir."
 
-msgid "Go Online"
-msgstr "Çevrimiçi Ol"
-
 msgid "Failed to get repository configuration."
 msgstr "Depo yapılandırmasının alınması başarısız oldu."
 
@@ -8141,7 +8150,7 @@ msgid "Search Templates, Projects, and Demos"
 msgstr "Arama Şablonları, Projeler ve Denemelikler"
 
 msgid "Search Assets (Excluding Templates, Projects, and Demos)"
-msgstr "Varlıkları Ara (Şablonlar, Projeler ve Demelikler Hariç)"
+msgstr "Varlıkları Ara (Şablonlar, Projeler ve Denemelikler Hariç)"
 
 msgid "Import..."
 msgstr "İçe Aktar..."
@@ -8476,8 +8485,8 @@ msgid ""
 "Groups the selected node with its children. This causes the parent to be "
 "selected when any child node is clicked in 2D and 3D view."
 msgstr ""
-"Seçili düğümü alt ögeleriyle birlikte gruplar. Bu, 2B ve 3B görünümde "
-"herhangi bir alt düğüme tıklandığında üst öğenin seçilmesine sebep olur."
+"Seçili düğümü alt-ögeleriyle birlikte gruplar. Bu, 2B ve 3B görünümde "
+"herhangi bir alt düğüme tıklandığında üst-ögenin seçilmesine sebep olur."
 
 msgid ""
 "Ungroups the selected node from its children. Child nodes will be individual "
@@ -8764,7 +8773,7 @@ msgid "Right Wide"
 msgstr "Sağ Geniş"
 
 msgid "Full Rect"
-msgstr "Tam Kare"
+msgstr "Tam Dikdörtgen"
 
 msgid ""
 "Enable to also set the Expand flag.\n"
@@ -9413,7 +9422,7 @@ msgid ""
 "Static Lightmaps in the Import dock."
 msgstr ""
 "Işık haritalaması desteği olan bir sahneyi içe aktarmak için, İçe Aktarma "
-"yuvasında Örgüler > Işık Fırınlama öğesini Statik Işık Haritaları olarak "
+"yuvasında Örgüler > Işık Fırınlama ögesini Statik Işık Haritaları olarak "
 "ayarlayın."
 
 msgid ""
@@ -9432,9 +9441,9 @@ msgid ""
 msgstr ""
 "Bir CSG örgüsünde ışık haritalaması desteğini etkinleştirmek için, kök CSG "
 "düğümünü seçin ve 3B düzenleyici çerçevesinin üst kısmında CSG > Örgü "
-"Örneklemesini Fırınla öğesini seçin.\n"
+"Örneklemesini Fırınla ögesini seçin.\n"
 "Oluşturulan MeshInstance3D düğümünü seçin ve 3B düzenleyici çerçevesinin üst "
-"kısmında Örgü > Işık Haritalama/AO için UV2'yi Aç öğesini seçin."
+"kısmında Örgü > Işık Haritalama/AO için UV2'yi Aç ögesini seçin."
 
 msgid ""
 "Failed creating lightmap images. Make sure the lightmap destination path is "
@@ -9995,7 +10004,7 @@ msgid "FPS: %d"
 msgstr "FPS: %d"
 
 msgid "Translating:"
-msgstr "Yeri Değiştiriliyor:"
+msgstr "Öteleniyor:"
 
 msgid "Instantiating:"
 msgstr "Örnekleme Oluşturuluyor:"
@@ -10046,7 +10055,7 @@ msgid "Rotating %s degrees."
 msgstr "%s derece döndürülüyor."
 
 msgid "Translating %s."
-msgstr "Yeri Değiştiriliyor: %s."
+msgstr "Öteleniyor: %s."
 
 msgid "Rotating %f degrees."
 msgstr "%f derece döndürülüyor."
@@ -14931,6 +14940,9 @@ msgstr ""
 "Bağlantıları serbestçe yeniden yönlendir, birden fazla giriş portunu tek bir "
 "çıkış portuna bağlamak için kullanılabilir."
 
+msgid "[None]"
+msgstr "[Yok]"
+
 msgid "Edit Visual Property: %s"
 msgstr "Görsel Özelliği Düzenle: %s"
 
@@ -15785,9 +15797,6 @@ msgstr "Özellik Etiketleri"
 msgid "Pick Root Node Type"
 msgstr "Kök Düğüm Türünü Seç"
 
-msgid "Pick"
-msgstr "Seç"
-
 msgid "Scene name is empty."
 msgstr "Sahne ismi boş."
 
@@ -16104,7 +16113,7 @@ msgid "Auto Expand to Selected"
 msgstr "Seçilene Otomatik Genişlet"
 
 msgid "Center Node on Reparent"
-msgstr "Üst-öge değişiminde Düğümü Ortala"
+msgstr "Üst-öge Değişiminde Düğümü Ortala"
 
 msgid ""
 "If enabled, Reparent to New Node will create the new node in the center of "
@@ -16488,38 +16497,22 @@ msgstr "Betik Benzersiz Kimlikleri (UID) Güncelleniyor"
 
 msgid ""
 "As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
+"shaders. Upgrades apply on the next save of each scene/resource.\n"
 "\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
+"To save time, this tool can open and save each of these files. Depending on "
+"the project size, it may take several minutes."
 msgstr ""
 "Godot 4.4'ten itibaren sahneler ve kaynaklar, betiklere ve gölgelendiricilere "
-"başvurmak için benzersiz kimlikler yani UID'leri kullanır.\n"
+"başvurmak için benzersiz kimlikleri (UID) kullanır. Yükseltmeler her sahnenin/"
+"kaynağın bir sonraki kaydedilmesinde uygulanır.\n"
 "\n"
-"Normalde bu güncelleme Godot 4.4'te, tek bir sahne veya kaynak üzerinde "
-"bunları ilk kez kaydettiğinizde uygulanır. Çok sayıda sahneniz ve/veya "
-"kaynağınız varsa, bunu elinizle yapmak zaman alabilir. Bu araç, projenin tüm "
-"sahnelerini ve kaynaklarını bir kerede güncelleyecektir.\n"
-"\n"
-"Düzenleyiciyi yeniden başlatmak ve bu projedeki tüm sahneleri ve kaynakları "
-"güncellemek için \"Yeniden Başlat ve Yükselt\" seçeneğine tıklayın. Proje "
-"boyutuna bağlı olarak bu işlem birkaç dakika sürebilir.\n"
-"\n"
-"Not: Olası veri kaybını önlemek için lütfen aracı çalıştırmadan önce "
-"projenizi yedeklediğinizden emin olun. Ayrıca, tüm .uid dosyalarını sürüm "
-"kontrolüne işlediğinizden emin olun (ve bunları .gitignore gibi yoksayma "
-"listelerine eklemeyin)."
+"Zamandan tasarruf etmek için, bu araç bu dosyaların her birini açıp "
+"kaydedebilir. Proje boyutuna bağlı olarak bu işlem birkaç dakika sürebilir."
+
+msgid "Re-save all scenes and resources to use UIDs"
+msgstr ""
+"Benzersiz kimlikleri (UID) kullanmak için tüm sahneleri ve kaynakları yeniden "
+"kaydet"
 
 msgid "Learn More"
 msgstr "Daha Fazla Bilgi Edin"
@@ -16557,7 +16550,7 @@ msgid ""
 "Can not add a baked mesh as sibling for the scene root.\n"
 "Move the CSG root node below a parent node."
 msgstr ""
-"Fırınlanmış bir örgü sahne kökü için kardeş öğe olarak eklenemiyor.\n"
+"Fırınlanmış bir örgü sahne kökü için kardeş-öge olarak eklenemiyor.\n"
 "CSG kök düğümünü bir ana düğümün altına taşıyın."
 
 msgid "CSG operation returned an empty mesh."
@@ -16570,7 +16563,7 @@ msgid ""
 "Can not add a baked collision shape as sibling for the scene root.\n"
 "Move the CSG root node below a parent node."
 msgstr ""
-"Fırınlanmış bir çarpışma şekli sahne kökü için kardeş öğe olarak "
+"Fırınlanmış bir çarpışma şekli sahne kökü için kardeş-öge olarak "
 "eklenemiyor.\n"
 "CSG kök düğümünü bir ana düğümün altına taşıyın."
 
@@ -17352,7 +17345,7 @@ msgstr ""
 
 msgid "OpenXR visibility mask must have an XRCamera3D node as their parent."
 msgstr ""
-"OpenXR görünürlük maskesi, üst öğe olarak bir XRCamera3D düğümüne sahip "
+"OpenXR görünürlük maskesi, üst-öge olarak bir XRCamera3D düğümüne sahip "
 "olmalıdır."
 
 msgid "Package name is missing."
@@ -19899,15 +19892,15 @@ msgstr ""
 "kısımlarında bir yerde 'uniform sampler2D %s: hint_%s, filter_linear_mipmap;' "
 "kodunu aynen ekleyin."
 
+msgid "Can't use function as identifier: '%s'."
+msgstr "Fonksiyon, bir tanımlayıcı olarak kullanılamaz: '%s'."
+
 msgid "Varying with '%s' data type may only be used in the '%s' function."
 msgstr "'%s' veri tipli değişen, yalnızca '%s' fonksiyonunda kullanılabilir."
 
 msgid "Varying '%s' must be assigned in the '%s' function first."
 msgstr "'%s' değişeni, ilk olarak '%s' fonksiyonu içinden atanmalıdır."
 
-msgid "Can't use function as identifier: '%s'."
-msgstr "Fonksiyon, bir tanımlayıcı olarak kullanılamaz: '%s'."
-
 msgid "Only integer expressions are allowed for indexing."
 msgstr "Dizin oluşturma için yalnızca tamsayı ifadelerine izin verilir."
 
diff --git a/engine/editor/translations/editor/uk.po b/engine/editor/translations/editor/uk.po
index 7418559b..6cb57b4a 100644
--- a/engine/editor/translations/editor/uk.po
+++ b/engine/editor/translations/editor/uk.po
@@ -56,12 +56,13 @@
 # ogyrec <ogyrec.off@gmail.com>, 2025.
 # Максим Горпиніч <maksimgorpinic2005a@gmail.com>, 2025.
 # Mister Ky <afanasievsergiy3524@gmail.com>, 2025.
+# Veydzher <Veydzher@users.noreply.hosted.weblate.org>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Ukrainian (Godot Engine)\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-21 19:26+0000\n"
+"PO-Revision-Date: 2025-03-14 14:07+0000\n"
 "Last-Translator: Максим Горпиніч <maksimgorpinic2005a@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/"
 "godot/uk/>\n"
@@ -71,7 +72,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Головний потік"
@@ -537,7 +538,7 @@ msgid "Deadzone"
 msgstr "«Мертва» зона"
 
 msgid "Name:"
-msgstr "Ім'я:"
+msgstr "Назва:"
 
 msgid "Type:"
 msgstr "Тип:"
@@ -926,6 +927,9 @@ msgstr "AnimationPlayer не може анімувати себе, лише ін
 msgid "property '%s'"
 msgstr "властивість '%s'"
 
+msgid "Nearest FPS: %d"
+msgstr "Найближчий FPS: %d"
+
 msgid "Change Animation Step"
 msgstr "Змінити крок анімації"
 
@@ -1214,19 +1218,19 @@ msgid "Remove invalid keys"
 msgstr "Вилучити неприпустимі ключі"
 
 msgid "Remove unresolved and empty tracks"
-msgstr "Вилучити невизначені і порожні доріжки"
+msgstr "Вилучити невизначені й порожні доріжки"
 
 msgid "Clean-up all animations"
-msgstr "Очищення всіх анімації"
+msgstr "Підчистити всі анімації"
 
 msgid "Clean-Up Animation(s) (NO UNDO!)"
-msgstr "Очистити анімацію(ї) (НЕ СКАСУВАТИ!)"
+msgstr "Підчистити анімації (НЕ МОЖНА СКАСУВАТИ!)"
 
 msgid "Clean-Up"
-msgstr "Очищення"
+msgstr "Підчистити"
 
 msgid "Scale Ratio:"
-msgstr "Співвідношення масштабу:"
+msgstr "Коефіцієнт масштабу:"
 
 msgid "Select Transition and Easing"
 msgstr "Вибрати Перехід та Плавність"
@@ -1241,19 +1245,19 @@ msgstr "Синусоїдний"
 
 msgctxt "Transition Type"
 msgid "Quint"
-msgstr "Квінт"
+msgstr "Квінтичний"
 
 msgctxt "Transition Type"
 msgid "Quart"
-msgstr "Кварт"
+msgstr "Квартовий"
 
 msgctxt "Transition Type"
 msgid "Quad"
-msgstr "Чотири."
+msgstr "Квадратичний"
 
 msgctxt "Transition Type"
 msgid "Expo"
-msgstr "Експо"
+msgstr "Експоненційний"
 
 msgctxt "Transition Type"
 msgid "Elastic"
@@ -1265,35 +1269,35 @@ msgstr "Кубічний"
 
 msgctxt "Transition Type"
 msgid "Circ"
-msgstr "Кірк"
+msgstr "Коловий"
 
 msgctxt "Transition Type"
 msgid "Bounce"
-msgstr "Відскок"
+msgstr "Стрибковий"
 
 msgctxt "Transition Type"
 msgid "Back"
-msgstr "Назад"
+msgstr "Відкатний"
 
 msgctxt "Transition Type"
 msgid "Spring"
-msgstr "Весна"
+msgstr "Пружинний"
 
 msgctxt "Ease Type"
 msgid "In"
-msgstr "У"
+msgstr "Вхідний"
 
 msgctxt "Ease Type"
 msgid "Out"
-msgstr "З"
+msgstr "Вихідний"
 
 msgctxt "Ease Type"
 msgid "InOut"
-msgstr "Увійшов - вийшов"
+msgstr "Вхідний - Вихідний"
 
 msgctxt "Ease Type"
 msgid "OutIn"
-msgstr "Виходьте У"
+msgstr "Вихідний - Вхідний"
 
 msgid "Transition Type:"
 msgstr "Перехідний тип:"
@@ -1455,7 +1459,7 @@ msgid "Replace All"
 msgstr "Замінити всі"
 
 msgid "Selection Only"
-msgstr "Тільки виділити"
+msgstr "Лише виділення"
 
 msgid "Hide"
 msgstr "Сховати"
@@ -1472,10 +1476,10 @@ msgid "Toggle Scripts Panel"
 msgstr "Перемкнути панель скриптів"
 
 msgid "Zoom In"
-msgstr "Збільшувати"
+msgstr "Наблизити"
 
 msgid "Zoom Out"
-msgstr "Зменшення"
+msgstr "Віддалити"
 
 msgid "Reset Zoom"
 msgstr "Скинути масштаб"
@@ -1572,6 +1576,9 @@ msgstr "Відв'язати аргументи сигналу:"
 msgid "Receiver Method:"
 msgstr "Метод-отримувач:"
 
+msgid "Pick"
+msgstr "Вибирати"
+
 msgid "Advanced"
 msgstr "Додатково"
 
@@ -1597,7 +1604,7 @@ msgid "Connect"
 msgstr "З'єднати"
 
 msgid "Connect '%s' to '%s'"
-msgstr "Приєднати '%s' до %s'"
+msgstr "З'єднати '%s' до %s'"
 
 msgid "Disconnect '%s' from '%s'"
 msgstr "Від'єднати '%s' від '%s'"
@@ -1672,13 +1679,13 @@ msgid "The selected class can't be instantiated."
 msgstr "Вибраний клас не може бути створений."
 
 msgid "Favorites:"
-msgstr "Вибране:"
+msgstr "Обране:"
 
 msgid "Recent:"
-msgstr "Нещодавні:"
+msgstr "Недавні:"
 
 msgid "(Un)favorite selected item."
-msgstr "(Не)обрати вибраний елемент."
+msgstr "Додати/вилучити виділене в обране."
 
 msgid "Search:"
 msgstr "Пошук:"
@@ -1699,7 +1706,7 @@ msgid "Debugger"
 msgstr "Засіб діагностики"
 
 msgid "Debug"
-msgstr "Діагностика"
+msgstr "Налагодження"
 
 msgid "Save Branch as Scene"
 msgstr "Зберегти гілку як сцену"
@@ -2025,7 +2032,7 @@ msgid "Dependency Editor"
 msgstr "Редактор залежностей"
 
 msgid "Search Replacement Resource:"
-msgstr "Знайти замінний ресурс:"
+msgstr "Пошук ресурсу для заміни:"
 
 msgid "Open Scene"
 msgid_plural "Open Scenes"
@@ -2083,7 +2090,7 @@ msgid "Load failed due to missing dependencies:"
 msgstr "Не вдалося завантажити через нестачу залежностей:"
 
 msgid "Open Anyway"
-msgstr "Все одно відкрити"
+msgstr "Усе одно відкрити"
 
 msgid "Which action should be taken?"
 msgstr "Які дії слід вжити?"
@@ -2095,19 +2102,19 @@ msgid "Errors loading!"
 msgstr "Помилки завантаження!"
 
 msgid "Permanently delete %d item(s)? (No undo!)"
-msgstr "Остаточно вилучити %d об'єкт(и)? (Неможливо скасувати)"
+msgstr "Остаточно вилучити елементи (%d )? (Не можна скасувати!)"
 
 msgid "Show Dependencies"
 msgstr "Показати залежності"
 
 msgid "Orphan Resource Explorer"
-msgstr "Огляд підключених ресурсів"
+msgstr "Огляд загублених ресурсів"
 
 msgid "Owns"
-msgstr "Кількість"
+msgstr "Володіння"
 
 msgid "Resources Without Explicit Ownership:"
-msgstr "Ресурси без явної власності:"
+msgstr "Ресурси без явного володіння:"
 
 msgid "Name cannot be empty."
 msgstr "Назва не може бути пустою."
@@ -2164,10 +2171,10 @@ msgid "Double-click to open in browser."
 msgstr "Двічі клацніть, щоб відкрити в браузері."
 
 msgid "Thanks from the Godot community!"
-msgstr "Спасибі від спільноти Godot!"
+msgstr "Подяка від спільноти Godot!"
 
 msgid "Godot Engine contributors"
-msgstr "Автори рушія Godot"
+msgstr "Учасники розробки рушія Godot"
 
 msgid "Project Founders"
 msgstr "Засновники проєкту"
@@ -2177,7 +2184,7 @@ msgstr "Провідний розробник"
 
 msgctxt "Job Title"
 msgid "Project Manager"
-msgstr "Керування проєктами"
+msgstr "Менеджер проєктів"
 
 msgid "Developers"
 msgstr "Розробники"
@@ -2230,10 +2237,10 @@ msgstr ""
 "ліцензійної угоди."
 
 msgid "All Components"
-msgstr "Всі компоненти"
+msgstr "Усі компоненти"
 
 msgid "Components"
-msgstr "Складники"
+msgstr "Компоненти"
 
 msgid "Licenses"
 msgstr "Ліцензії"
@@ -2308,16 +2315,16 @@ msgid "Configure Asset Before Installing"
 msgstr "Налаштуйте актив перед встановленням"
 
 msgid "Install"
-msgstr "Встановити"
+msgstr "Установити"
 
 msgid "Speakers"
 msgstr "Динаміки"
 
 msgid "Add Effect"
-msgstr "Додавання ефекту"
+msgstr "Додати ефект"
 
 msgid "Rename Audio Bus"
-msgstr "Перейменування аудіо шини"
+msgstr "Перейменувати аудіо шини"
 
 msgid "Change Audio Bus Volume"
 msgstr "Змінити гучність звукової шини"
@@ -2335,7 +2342,7 @@ msgid "Select Audio Bus Send"
 msgstr "Вибір передачі аудіо шини"
 
 msgid "Add Audio Bus Effect"
-msgstr "Додавання ефекту аудіо шини"
+msgstr "Додати ефект аудіо шини"
 
 msgid "Move Bus Effect"
 msgstr "Перемістити ефект шини"
@@ -2416,7 +2423,7 @@ msgid "Load"
 msgstr "Завантажити"
 
 msgid "Load an existing Bus Layout."
-msgstr "Завантаження існуючого компонування шини."
+msgstr "Завантажити наявне компонування шини."
 
 msgid "Save As"
 msgstr "Зберегти як"
@@ -2431,7 +2438,7 @@ msgid "Load the default Bus Layout."
 msgstr "Завантажити типове компонування шини."
 
 msgid "Create a new Bus Layout."
-msgstr "Створення нового компонування шини."
+msgstr "Створити нове компонування шини."
 
 msgid "Audio Bus Layout"
 msgstr "Компонування звукової шини"
@@ -2498,7 +2505,7 @@ msgid "Set path or press \"%s\" to create a script."
 msgstr "Вкажіть шлях або натисніть «%s», щоб створити скрипт."
 
 msgid "Node Name:"
-msgstr "Ім'я Вузла:"
+msgstr "Назва вузла:"
 
 msgid "Global Variable"
 msgstr "Загальна змінна"
@@ -2930,7 +2937,7 @@ msgid "Save & Restart"
 msgstr "Зберегти і перезапустити"
 
 msgid "ScanSources"
-msgstr "Сканувати сирці"
+msgstr "Сканувати джерела"
 
 msgid "Registering global classes..."
 msgstr "Реєстрація глобальних класів..."
@@ -2949,7 +2956,7 @@ msgstr ""
 "%s, імпортування перервано"
 
 msgid "(Re)Importing Assets"
-msgstr "Імпортування ресурсів"
+msgstr "(Повторний) імпорт ресурсів"
 
 msgid "Preparing files to reimport..."
 msgstr "Підготовка файлів до повторного імпорту..."
@@ -3219,8 +3226,8 @@ msgid ""
 "There is currently no description for this property. Please help us by "
 "[color=$color][url=$url]contributing one[/url][/color]!"
 msgstr ""
-"У поточній версії немає опису цієї властивості. Будь ласка, [color=$color]"
-"[url=$url]створіть його[/url][/color]!"
+"У поточній версії немає опису цієї властивості. Будь ласка, допоможіть нам "
+"[color=$color][url=$url]створивши його[/url][/color]!"
 
 msgid ""
 "[b]Note:[/b] The returned array is [i]copied[/i] and any changes to it will "
@@ -3384,13 +3391,13 @@ msgid "This member is marked as experimental."
 msgstr "Цей член позначений як експериментальний."
 
 msgid "Unfavorite Property"
-msgstr "Внутрішня власність"
+msgstr "Вилучити властивість з обраного"
 
 msgid "Make this property be put back at its original place."
 msgstr "Повернути це майно на колишнє місце."
 
 msgid "Favorite Property"
-msgstr "Улюблене майно"
+msgstr "Додати властивість в обране"
 
 msgid "Make this property be placed at the top for all objects of this class."
 msgstr ""
@@ -3410,7 +3417,7 @@ msgstr ""
 "стандартним."
 
 msgid "Unfavorite All"
-msgstr "Видалити всі з вибраного"
+msgstr "Вилучити все з обраного"
 
 msgid "(%d change)"
 msgid_plural "(%d changes)"
@@ -3489,7 +3496,7 @@ msgid "Add metadata %s"
 msgstr "Додати метадані %s"
 
 msgid "Favorites"
-msgstr "Вибране"
+msgstr "Обране"
 
 msgid "Copy Value"
 msgstr "Копіювати значення"
@@ -3678,7 +3685,7 @@ msgid "Analyzing"
 msgstr "Аналіз"
 
 msgid "Creating Thumbnail"
-msgstr "Створюємо мініатюру"
+msgstr "Створення мініатюри"
 
 msgid "This operation can't be done without a tree root."
 msgstr "Ця операція не може бути виконана без кореня дерева."
@@ -3711,7 +3718,7 @@ msgid "Can't overwrite scene that is still open!"
 msgstr "Неможливо перезаписати сцену, яка є ще відкритою!"
 
 msgid "Merge With Existing"
-msgstr "Об'єднати з існуючим"
+msgstr "Об'єднати з наявним"
 
 msgid "Apply MeshInstance Transforms"
 msgstr "Змінити перетворення екземпляра сітки"
@@ -3739,7 +3746,7 @@ msgstr ""
 "«Вилучити компонування» для вилучення типового компонування."
 
 msgid "Layout name not found!"
-msgstr "Назву компонування не знайдено!"
+msgstr "Назву макета не знайдено!"
 
 msgid "Restored the Default layout to its base settings."
 msgstr "Відновлено початкові параметри типового компонування."
@@ -3754,10 +3761,9 @@ msgid ""
 "Please read the documentation relevant to importing scenes to better "
 "understand this workflow."
 msgstr ""
-"Цей ресурс належить до сцени, який було імпортовано, тому його не можна "
-"редагувати.\n"
-"Будь ласка, прочитайте документацію, що стосуються імпортування сцен, щоб "
-"краще зрозуміти цей робочий процес."
+"Цей ресурс належить до імпортованої сцени, тому його неможливо редагувати.\n"
+"Просимо ознайомитися з документацією щодо імпортування сцен, щоб краще "
+"зрозуміти цей процес."
 
 msgid ""
 "This resource belongs to a scene that was instantiated or inherited.\n"
@@ -3770,8 +3776,8 @@ msgid ""
 "This resource was imported, so it's not editable. Change its settings in the "
 "import panel and then re-import."
 msgstr ""
-"Цей ресурс імпортовано, тому його не можна редагувати. Змініть свої "
-"налаштування на панелі імпорту, а потім знову імпортуйте."
+"Цей ресурс було імпортовано, тому його неможливо редагувати. Змініть його "
+"налаштування на панелі імпорту, а потім повторно імпортуйте."
 
 msgid ""
 "This scene was imported, so changes to it won't be kept.\n"
@@ -3850,15 +3856,14 @@ msgid "Can't reload a scene that was never saved."
 msgstr "Неможливо перезавантажити сцену, яку ніколи не зберігали."
 
 msgid "Reload Saved Scene"
-msgstr "Перезавантаження збереженої сцени"
+msgstr "Перезавантажити збережену сцену"
 
 msgid ""
 "The current scene has unsaved changes.\n"
 "Reload the saved scene anyway? This action cannot be undone."
 msgstr ""
 "Зміни до поточної сцени не збережено.\n"
-"Перезавантажити збережену сцену попри це? Наслідки перезавантаження не можна "
-"буде скасувати."
+"Усе одно перезавантажити збережену сцену? Цю дію не можна буде скасувати."
 
 msgid "Save & Reload"
 msgstr "Зберегти і перезавантажити"
@@ -3896,21 +3901,21 @@ msgid "This operation can't be done without a scene."
 msgstr "Ця операція не обійдеться без сцени."
 
 msgid "Export Mesh Library"
-msgstr "Експортувати бібліотеку сіті"
+msgstr "Експортувати бібліотеку сітки"
 
 msgid "Quick Open Color Palette..."
 msgstr "Швидке відкриття палітри кольорів..."
 
 msgid "Unable to enable addon plugin at: '%s' parsing of config failed."
 msgstr ""
-"Не вдалося ввімкнути додаток addon: «%s» не вдалося проаналізувати "
-"налаштування."
+"Не вдалося ввімкнути плагін доповнення: «%s» не вдалося проаналізувати "
+"конфігурацію."
 
 msgid "Unable to find script field for addon plugin at: '%s'."
 msgstr "Не вдалося знайти поле скрипту для додатка тут: «%s»."
 
 msgid "Unable to load addon script from path: '%s'."
-msgstr "Неможливо завантажити доповнення скрипт зі шляху: '%s'."
+msgstr "Неможливо завантажити скрипт доповнення зі шляху: '%s'."
 
 msgid ""
 "Unable to load addon script from path: '%s'. This might be due to a code "
@@ -3936,8 +3941,8 @@ msgid ""
 "Scene '%s' was automatically imported, so it can't be modified.\n"
 "To make changes to it, a new inherited scene can be created."
 msgstr ""
-"Сцена '%s' автоматично імпортується, тому її неможливо змінити.\n"
-"Щоб внести зміни, можна створити нову успадковану сцену."
+"Сцена '%s' була імпортована автоматично, тому її неможливо змінити.\n"
+"Щоб внести до неї зміни, можна створити нову успадковану сцену."
 
 msgid ""
 "Error loading scene, it must be inside the project path. Use 'Import' to open "
@@ -4197,7 +4202,7 @@ msgid "Reopen Closed Scene"
 msgstr "Повторно відкрити закриту сцену"
 
 msgid "Open Recent"
-msgstr "Відкрити останні"
+msgstr "Відкрити недавні"
 
 msgid "Save Scene"
 msgstr "Зберегти сцену"
@@ -4284,7 +4289,7 @@ msgid "Screenshots are stored in the user data folder (\"user://\")."
 msgstr "Скріншоти зберігаються в папці даних користувача (\"user://\")."
 
 msgid "Toggle Fullscreen"
-msgstr "Перемикач повноекранного режиму"
+msgstr "На весь екран"
 
 msgid "Open Editor Data/Settings Folder"
 msgstr "Відкриття теки даних/параметрів редактора"
@@ -4417,7 +4422,7 @@ msgid "Export Library"
 msgstr "Експортувати бібліотеку"
 
 msgid "Open & Run a Script"
-msgstr "Відкрити і запустити скрипт"
+msgstr "Відкрити й запустити скрипт"
 
 msgid "Files have been modified outside Godot"
 msgstr "Файли були змінені за межами Godot"
@@ -4480,16 +4485,16 @@ msgid "Edit Text:"
 msgstr "Редагувати текст:"
 
 msgid "On"
-msgstr "Увімкнено"
+msgstr "Увімк."
 
 msgid "Renaming layer %d:"
 msgstr "Перейменування шару %d:"
 
 msgid "No name provided."
-msgstr "Ім'я не вказано."
+msgstr "Назву не вказано."
 
 msgid "Name contains invalid characters."
-msgstr "Назва містить некоректні символи."
+msgstr "Назва містить недійсні символи."
 
 msgid "Bit %d, value %d"
 msgstr "Біт %d, значення %d"
@@ -4707,7 +4712,7 @@ msgid "Project Run"
 msgstr "Запуск проєкту"
 
 msgid "Write your logic in the _run() method."
-msgstr "Напишіть свою логіку в методі _run ()."
+msgstr "Напишіть свою логіку в методі _run()."
 
 msgid "The current scene already has a root node."
 msgstr "У поточній сцені вже є кореневий вузол."
@@ -4734,7 +4739,7 @@ msgid "Event %d"
 msgstr "Елемент %d"
 
 msgid "Editor Settings"
-msgstr "Параметри редактора"
+msgstr "Налаштування редактора"
 
 msgid "General"
 msgstr "Загальне"
@@ -5200,7 +5205,7 @@ msgid "Uncompressing Android Build Sources"
 msgstr "Розпаковуємо код для збирання для Android"
 
 msgid "Export Template Manager"
-msgstr "Менеджер експорту шаблонів"
+msgstr "Менеджер шаблонів експорту"
 
 msgid "Current Version:"
 msgstr "Поточна версія:"
@@ -5245,6 +5250,12 @@ msgstr "Встановити з файла"
 msgid "Install templates from a local file."
 msgstr "Встановити шаблони з локального файла."
 
+msgid "Online mode is needed to download the templates."
+msgstr "Для завантаження шаблонів потрібен режим онлайн."
+
+msgid "Go Online"
+msgstr "Вийти в Інтернет"
+
 msgid "Cancel the download of the templates."
 msgstr "Скасувати отримання шаблонів."
 
@@ -5511,7 +5522,7 @@ msgid "Project Export"
 msgstr "Експортування проєкту"
 
 msgid "Manage Export Templates"
-msgstr "Керування шаблонами експорту"
+msgstr "Керувати шаблонами експорту"
 
 msgid "Disable FBX2glTF & Restart"
 msgstr "Вимкніть FBX2glTF і перезапустіть"
@@ -5625,7 +5636,7 @@ msgstr ""
 "більше не показуватиме файл у списку."
 
 msgid "A file or folder with this name already exists."
-msgstr "Файл або тека з таким іменем вже існує."
+msgstr "Файл або тека з такою назвою уже існує."
 
 msgid "Could not create base directory: %s"
 msgstr "Не вдалося створити базовий каталог: %s"
@@ -5732,16 +5743,16 @@ msgid "Move/Duplicate To..."
 msgstr "Перемістити/дублювати до..."
 
 msgid "Add to Favorites"
-msgstr "Додати до улюблених"
+msgstr "Додати до обраного"
 
 msgid "Remove from Favorites"
-msgstr "Вилучити з улюблених"
+msgstr "Вилучити з обраного"
 
 msgid "Convert to..."
 msgstr "Перетворити на..."
 
 msgid "Reimport"
-msgstr "Переімпортувати"
+msgstr "Повторно імпортувати"
 
 msgid "Open in Terminal"
 msgstr "Відкрийте в терміналі"
@@ -5834,7 +5845,7 @@ msgid "Go to next selected folder/file."
 msgstr "Перейти до наступної теки/файлу."
 
 msgid "Re-Scan Filesystem"
-msgstr "Пересканування файлової системи"
+msgstr "Повторно сканувати файлову систему"
 
 msgid "Change Split Mode"
 msgstr "Змінити режим розділення"
@@ -6065,10 +6076,10 @@ msgid "Open File(s)"
 msgstr "Відкрити файл(и)"
 
 msgid "Open a Directory"
-msgstr "Відкрити каталог"
+msgstr "Відкрити теку"
 
 msgid "Open a File or Directory"
-msgstr "Відкрити файл або каталог"
+msgstr "Відкрити файл або теку"
 
 msgid "Save a File"
 msgstr "Зберегти файл"
@@ -6083,22 +6094,22 @@ msgid "Could not create folder."
 msgstr "Не вдалося створити теку."
 
 msgid "Favorited folder does not exist anymore and will be removed."
-msgstr "Вибрана папка більше не існує і буде видалена."
+msgstr "Тека в обраному більше не існує і буде вилучена."
 
 msgid "Go Back"
-msgstr "Перейти назад"
+msgstr "Назад"
 
 msgid "Go Forward"
-msgstr "Перейти вперед"
+msgstr "Уперед"
 
 msgid "Go Up"
-msgstr "Вгору"
+msgstr "Угору"
 
 msgid "Toggle Hidden Files"
 msgstr "Перемкнути приховані файли"
 
 msgid "Toggle Favorite"
-msgstr "Перемкнути обране"
+msgstr "Перемкнути присутність в обраному"
 
 msgid "Toggle Mode"
 msgstr "Перемкнути режим"
@@ -6110,10 +6121,10 @@ msgid "Focus Filter"
 msgstr "Фільтр фокусування"
 
 msgid "Move Favorite Up"
-msgstr "Перемістити вибране вище"
+msgstr "Перемістити обране вгору"
 
 msgid "Move Favorite Down"
-msgstr "Перемістити вибране нижче"
+msgstr "Перемістити обране вниз"
 
 msgid "Go to previous folder."
 msgstr "Перейти до попередньої теки."
@@ -6128,13 +6139,13 @@ msgid "Refresh files."
 msgstr "Освіжити файли."
 
 msgid "(Un)favorite current folder."
-msgstr "Перемкнути стан вибраності для поточної теки."
+msgstr "Обране: додати/вилучити поточну теку."
 
 msgid "Create a new folder."
 msgstr "Створіть нову папку."
 
 msgid "Directories & Files:"
-msgstr "Каталоги та файли:"
+msgstr "Теки та файли:"
 
 msgid "Toggle the visibility of hidden files."
 msgstr "Увімкнути або вимкнути видимість прихованих файлів."
@@ -6214,10 +6225,10 @@ msgid "List view"
 msgstr "Перегляд списку"
 
 msgid "Play the project."
-msgstr "Запустити проект."
+msgstr "Запустити проєкт."
 
 msgid "Play the edited scene."
-msgstr "Відтворити поточну відредаговану сцену."
+msgstr "Запустити відредаговану сцену."
 
 msgid "Play a custom scene."
 msgstr "Відтворити вибіркову сцену."
@@ -6985,7 +6996,7 @@ msgid "%d Files"
 msgstr "%d файлів"
 
 msgid "Set as Default for '%s'"
-msgstr "Встановити як типове для '%s'"
+msgstr "Задати як типове для '%s'"
 
 msgid "Clear Default for '%s'"
 msgstr "Очистити типове для '%s'"
@@ -7129,10 +7140,10 @@ msgid "Paste Properties"
 msgstr "Вставити властивості"
 
 msgid "Make Sub-Resources Unique"
-msgstr "Зробити суб-ресурси унікальними"
+msgstr "Зробити підресурси унікальними"
 
 msgid "Create a new resource in memory and edit it."
-msgstr "Створення нового ресурсу в пам'яті і редагувати його."
+msgstr "Створити новий ресурс у пам'яті й відредагувати його."
 
 msgid "Load an existing resource from disk and edit it."
 msgstr "Завантажити наявний ресурс із диска та відредагувати його."
@@ -7159,7 +7170,7 @@ msgid "Go to next edited object in history."
 msgstr "Перейти до наступного редагованого об'єкта в історії."
 
 msgid "History of recently edited objects."
-msgstr "Історія нещодавно відредагованих об'єктів."
+msgstr "Історія недавно змінених об'єктів."
 
 msgid "Open documentation for this object."
 msgstr "Відкрити документацію для цього об'єкта."
@@ -7693,13 +7704,13 @@ msgid "Create New Animation"
 msgstr "Створити нову анімацію"
 
 msgid "New Animation Name:"
-msgstr "Нове ім'я анімації:"
+msgstr "Нова назва анімації:"
 
 msgid "Rename Animation"
 msgstr "Перейменувати анімацію"
 
 msgid "Change Animation Name:"
-msgstr "Змінити ім'я анімації:"
+msgstr "Змінити назву анімації:"
 
 msgid "Delete Animation '%s'?"
 msgstr "Видалити анімацію '%s'?"
@@ -7971,7 +7982,7 @@ msgid "Timeout."
 msgstr "Перевищено час очікування на відповідь."
 
 msgid "Failed:"
-msgstr "Не вдалося:"
+msgstr "Помилка:"
 
 msgid "Bad download hash, assuming file has been tampered with."
 msgstr "Розбіжність хеша завантаження, можливо файл був змінений."
@@ -8065,9 +8076,6 @@ msgstr ""
 "Бібліотека ресурсів вимагає підключення до Інтернету і передбачає надсилання "
 "даних через Інтернет."
 
-msgid "Go Online"
-msgstr "Вийти в Інтернет"
-
 msgid "Failed to get repository configuration."
 msgstr "Не вдалося отримати конфігурацію репозиторія."
 
@@ -8262,7 +8270,7 @@ msgid "Create Custom Bone2D(s) from Node(s)"
 msgstr "Створити нетипові кістки2D з вузла(ів)"
 
 msgid "Cancel Transformation"
-msgstr "Скасувати Перетворення"
+msgstr "Скасувати перетворення"
 
 msgid "Zoom to 3.125%"
 msgstr "Масштаб у 3,125%"
@@ -8819,7 +8827,7 @@ msgid "Toggle Debugger Bottom Panel"
 msgstr "Перемкнути нижню панель налагоджувача"
 
 msgid "Deploy with Remote Debug"
-msgstr "Розгортання за допомогою віддаленого налагодження"
+msgstr "Запускати з віддаленим налагодженням"
 
 msgid ""
 "When this option is enabled, using one-click deploy will make the executable "
@@ -8973,13 +8981,13 @@ msgstr ""
 "режим активний."
 
 msgid "Installed Plugins:"
-msgstr "Встановлені плаґіни:"
+msgstr "Установлені доповнення:"
 
 msgid "Create New Plugin"
 msgstr "Створити новий плагін"
 
 msgid "Enabled"
-msgstr "Увімкнути"
+msgstr "Увімкнено"
 
 msgid "Version"
 msgstr "Версія"
@@ -11404,7 +11412,7 @@ msgid "Unfold All Lines"
 msgstr "Розгорнути всі рядки"
 
 msgid "Duplicate Selection"
-msgstr "Дублювати позначене"
+msgstr "Дублювати виділення"
 
 msgid "Duplicate Lines"
 msgstr "Дублювати лінії"
@@ -14854,6 +14862,9 @@ msgstr ""
 "Вільно перенаправляйте підключення, можна використовувати для підключення "
 "кількох вхідних портів до одного вихідного порту."
 
+msgid "[None]"
+msgstr "[Жодного]"
+
 msgid "Edit Visual Property: %s"
 msgstr "Редагувати візуальну властивість: %s"
 
@@ -15707,9 +15718,6 @@ msgstr "Теги функцій"
 msgid "Pick Root Node Type"
 msgstr "Вибрати тип кореневого вузла"
 
-msgid "Pick"
-msgstr "Вибирати"
-
 msgid "Scene name is empty."
 msgstr "Назва сцени порожня."
 
@@ -15932,7 +15940,7 @@ msgid "Create Root Node:"
 msgstr "Створити кореневий вузол:"
 
 msgid "Toggle the display of favorite nodes."
-msgstr "Перемикання відображення улюблених вузлів."
+msgstr "Перемкнути показ обраних вузлів."
 
 msgid "Other Node"
 msgstr "Інший вузол"
@@ -16404,48 +16412,30 @@ msgstr ""
 "до повільнішого завантаження при кожному старті цього проекта."
 
 msgid "Restart & Upgrade"
-msgstr "Перезапуск и обновление"
+msgstr "Перезапустити й оновити"
 
 msgid "Updating Script UIDs"
 msgstr "Оновлення UID сценарію"
 
 msgid ""
 "As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
+"shaders. Upgrades apply on the next save of each scene/resource.\n"
 "\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
+"To save time, this tool can open and save each of these files. Depending on "
+"the project size, it may take several minutes."
 msgstr ""
-"Починаючи з Godot 4.4, сцени та ресурси використовують UID для посилань на "
-"сценарії та шейдери. \n"
+"Починаючи з версії Godot 4.4, сцени та ресурси використовують UID для "
+"посилання на скрипти та шейдери. Оновлення застосовуються при наступному "
+"збереженні кожної сцени/ресурсу.\n"
 "\n"
-"Зазвичай це оновлення застосовується до однієї сцени чи ресурсу, коли ви "
-"вперше зберігаєте його в Godot 4.4. Якщо у вас багато сцен і/або ресурсів, "
-"виконання цього вручну може зайняти багато часу. Цей інструмент оновить усі "
-"сцени та ресурси проекту одночасно. \n"
-"\n"
-"Натисніть «Перезапустити та оновити», щоб перезапустити редактор і оновити "
-"всі сцени та ресурси в цьому проекті. Залежно від розміру проекту це може "
-"зайняти кілька хвилин. \n"
-"\n"
-"Примітка: перед запуском інструменту переконайтеся, що у вас є резервна копія "
-"вашого проекту, щоб уникнути можливості втрати даних. Крім того, "
-"переконайтеся, що всі файли .uid передано в контроль версій (і не додавайте "
-"їх до списків ігнорування, як .gitignore)."
+"Щоб заощадити час, цей інструмент може відкривати і зберігати кожен з цих "
+"файлів. Залежно від розміру проекту це може зайняти кілька хвилин."
+
+msgid "Re-save all scenes and resources to use UIDs"
+msgstr "Перезбережіть усі сцени та ресурси, щоб використовувати UID"
 
 msgid "Learn More"
-msgstr "Дізнайтеся більше"
+msgstr "Дізнатися більше"
 
 msgid "Make this panel floating in the screen %d."
 msgstr "Зробити цю панель плаваючою на екрані %d."
@@ -16779,11 +16769,11 @@ msgstr "Кінець кліпу"
 
 msgctxt "Transition Time Position"
 msgid "Same"
-msgstr "Те саме"
+msgstr "Та сама"
 
 msgctxt "Transition Time Position"
 msgid "Start"
-msgstr "Старт"
+msgstr "Початок"
 
 msgctxt "Transition Time Position"
 msgid "Prev"
@@ -17042,7 +17032,7 @@ msgstr "Завжди"
 
 msgctxt "Replication Mode"
 msgid "On Change"
-msgstr "На зміну"
+msgstr "При зміні"
 
 msgid ""
 "A valid NodePath must be set in the \"Spawn Path\" property in order for "
@@ -19771,15 +19761,15 @@ msgstr ""
 " Щоб продовжити з мінімальними змінами коду, додайте 'uniform sampler2D %s : "
 "hint_%s, filter_linear_mipmap;' біля верхньої частини шейдера."
 
+msgid "Can't use function as identifier: '%s'."
+msgstr "Не можна використовувати функцію як ідентифікатор: '%s'."
+
 msgid "Varying with '%s' data type may only be used in the '%s' function."
 msgstr "Варіанти типу даних \"%s\" можна використовувати лише у функції \"%s\"."
 
 msgid "Varying '%s' must be assigned in the '%s' function first."
 msgstr "Змінний '%s' має бути спочатку призначений у функції '%s'."
 
-msgid "Can't use function as identifier: '%s'."
-msgstr "Не можна використовувати функцію як ідентифікатор: '%s'."
-
 msgid "Only integer expressions are allowed for indexing."
 msgstr "До індексації допускаються лише цілі вирази."
 
diff --git a/engine/editor/translations/editor/vi.po b/engine/editor/translations/editor/vi.po
index 929aec30..3a407e9f 100644
--- a/engine/editor/translations/editor/vi.po
+++ b/engine/editor/translations/editor/vi.po
@@ -45,13 +45,14 @@
 # a <anhkietcb2008@gmail.com>, 2024.
 # Nguyễn Minh Khôi <minhkhoiheovang2007@gmail.com>, 2024.
 # IoeCmcomc <IoeCmcomc@users.noreply.hosted.weblate.org>, 2025.
+# Đức Anh Nguyễn <ducnah2132k9@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine editor interface\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-19 13:35+0000\n"
-"Last-Translator: IoeCmcomc <IoeCmcomc@users.noreply.hosted.weblate.org>\n"
+"PO-Revision-Date: 2025-03-17 05:36+0000\n"
+"Last-Translator: Đức Anh Nguyễn <ducnah2132k9@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/godot-engine/"
 "godot/vi/>\n"
 "Language: vi\n"
@@ -59,7 +60,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "Chủ đề chính"
@@ -187,6 +188,21 @@ msgstr "D-pad trái"
 msgid "D-pad Right"
 msgstr "D-pad phải"
 
+msgid "Xbox Share, PS5 Microphone, Nintendo Capture"
+msgstr "Xbox Share, PS5 Microphone, Nintendo Capture"
+
+msgid "Xbox Paddle 1"
+msgstr "Tay cầm Xbox 1"
+
+msgid "Xbox Paddle 2"
+msgstr "Tay cầm Xbox 2"
+
+msgid "Xbox Paddle 3"
+msgstr "Tay cầm Xbox 3"
+
+msgid "Xbox Paddle 4"
+msgstr "Tay cầm Xbox 4"
+
 msgid "PS4/5 Touchpad"
 msgstr "Bàn Cảm Ứng PS4/5"
 
@@ -377,18 +393,39 @@ msgstr "Bỏ Qua Lựa Chọn Cho Lần Xuât Hiện Tiếp Theo"
 msgid "Clear Carets and Selection"
 msgstr "Xóa Con trỏ Lựa chọn"
 
+msgid "Toggle Insert Mode"
+msgstr "Bật tắt Chức năng"
+
+msgid "Submit Text"
+msgstr "Sửa văn bản"
+
 msgid "Duplicate Nodes"
 msgstr "Nhân bản các nút"
 
 msgid "Delete Nodes"
 msgstr "Xoá các nút"
 
+msgid "Go Up One Level"
+msgstr "Lên Một Cấp"
+
 msgid "Refresh"
 msgstr "Làm mới"
 
+msgid "Show Hidden"
+msgstr "Hiện các tệp ẩn"
+
+msgid "Swap Input Direction"
+msgstr "Thêm hành động đầu vào"
+
+msgid "Start Unicode Character Input"
+msgstr "Bắt đầu nhập ký tự Unicode"
+
 msgid "Invalid input %d (not passed) in expression"
 msgstr "Đầu vào %d không hợp lệ (không được thông qua) trong biểu thức"
 
+msgid "self can't be used because instance is null (not passed)"
+msgstr "không thể gọi self vì giá trị đối tượng là null"
+
 msgid "Invalid operands to operator %s, %s and %s."
 msgstr "Toán hạng không hợp lệ cho toán tử %s, %s và %s."
 
@@ -439,18 +476,39 @@ msgstr "Tên hành động không được trống hoặc chứa '/', ':', '=',
 msgid "An action with the name '%s' already exists."
 msgstr "Hành động với tên '%s' đã tồn tại."
 
+msgid "Cannot Revert - Action is same as initial"
+msgstr "Không thể Hoàn tác - Hành động không giống ban đầu"
+
 msgid "Revert Action"
 msgstr "Hoàn lại Hành động"
 
 msgid "Add Event"
 msgstr "Thêm Sự kiện"
 
+msgid "Remove Action"
+msgstr "Xoá Hàm"
+
 msgid "Cannot Remove Action"
 msgstr "Không thể gỡ bỏ Hành động"
 
+msgid "Edit Event"
+msgstr "Thêm Sự kiện"
+
+msgid "Remove Event"
+msgstr "Xoá điểm"
+
+msgid "Filter by Name"
+msgstr "Lọc theo tên..."
+
+msgid "Clear All"
+msgstr "Đóng tất cả"
+
 msgid "Clear all search filters."
 msgstr "Xóa tất cả bộ lọc tìm kiếm"
 
+msgid "Add New Action"
+msgstr "Thêm hành động đầu vào"
+
 msgid "Add"
 msgstr "Thêm"
 
@@ -469,21 +527,59 @@ msgstr "Tên:"
 msgid "Type:"
 msgstr "Kiểu:"
 
+msgid "Metadata name is valid."
+msgstr "Animation tree khả dụng."
+
+msgid "Add Metadata Property for \"%s\""
+msgstr "Thêm Thuộc tính Siêu dữ liệu cho \" %s \""
+
+msgid "Metadata name can't be empty."
+msgstr "Tên siêu dữ liệu không được để trống."
+
+msgid "Metadata name must be a valid identifier."
+msgstr "Tên phương thức phải là một định danh hợp lệ."
+
+msgid "Metadata with name \"%s\" already exists."
+msgstr "Hành động với tên '%s' đã tồn tại."
+
+msgid "Names starting with _ are reserved for editor-only metadata."
+msgstr ""
+"Tên bắt đầu bằng _ được dành riêng cho siêu dữ liệu chỉ dành cho biên tập "
+"viên ."
+
 msgid "Time:"
 msgstr "Thời gian:"
 
 msgid "Value:"
 msgstr "Giá trị:"
 
+msgid "Update Selected Key Handles"
+msgstr "Nhân đôi các khoá đã chọn"
+
 msgid "Insert Key Here"
 msgstr "Chèn Khóa Tại Đây"
 
 msgid "Duplicate Selected Key(s)"
 msgstr "Nhân đôi các khoá đã chọn"
 
+msgid "Cut Selected Key(s)"
+msgstr "Xoá các khoá được chọn"
+
+msgid "Copy Selected Key(s)"
+msgstr "Xoá các khoá được chọn"
+
+msgid "Paste Key(s)"
+msgstr "Dán phím"
+
 msgid "Delete Selected Key(s)"
 msgstr "Xoá các khoá được chọn"
 
+msgid "Make Handles Free"
+msgstr "Đặt tay nắm"
+
+msgid "Make Handles Linear"
+msgstr "Làm cho tay cầm tuyến tính"
+
 msgid "Make Handles Balanced"
 msgstr "Làm cho tay cầm cân bằng"
 
@@ -502,12 +598,40 @@ msgstr "Thêm điểm Bezier"
 msgid "Move Bezier Points"
 msgstr "Di chuyển các điểm Bezier"
 
+msgid "Animation Duplicate Keys"
+msgstr "Nhân đôi các Animation Key"
+
+msgid "Animation Cut Keys"
+msgstr "Xóa các Animation Key"
+
+msgid "Animation Paste Keys"
+msgstr "Key để scale hoạt ảnh"
+
+msgid "Animation Delete Keys"
+msgstr "Xóa các Animation Key"
+
+msgid "Focus"
+msgstr "Đường dẫn Tập trung"
+
 msgid "Change Animation Length"
 msgstr "Thay Độ Dài Hoạt Ảnh"
 
 msgid "Change Animation Loop"
 msgstr "Chỉnh Vòng Lặp Hoạt Ảnh"
 
+msgid ""
+"Can't change loop mode on animation instanced from an imported scene.\n"
+"\n"
+"To change this animation's loop mode, navigate to the scene's Advanced Import "
+"settings and select the animation.\n"
+"You can then change the loop mode from the inspector menu."
+msgstr ""
+"hoạt ảnh được lấy từ cảnh đã nhập .\n"
+"\n"
+"Để thay đổi chế độ lặp của hoạt ảnh này, hãy điều hướng đến cài đặt Nhập nâng "
+"cao của cảnh và chọn hoạt ảnh .\n"
+"Sau đó, bạn có thể thay đổi chế độ vòng lặp từ menu kiểm tra ."
+
 msgid "Property Track..."
 msgstr "Kênh Thuộc tính..."
 
@@ -670,9 +794,19 @@ msgstr "Đổi chế độ nội suy hoạt ảnh"
 msgid "Change Animation Loop Mode"
 msgstr "Đổi chế độ vòng lặp hoạt ảnh"
 
+msgid ""
+"Compressed tracks can't be edited or removed. Re-import the animation with "
+"compression disabled in order to edit."
+msgstr ""
+"Không thể chỉnh sửa hoặc xóa các bản nhạc đã nén. Hãy nhập lại hoạt ảnh với "
+"chức năng nén đã tắt để chỉnh sửa."
+
 msgid "Remove Anim Track"
 msgstr "Xóa Anim Track"
 
+msgid "Hold Shift when clicking the key icon to skip this dialog."
+msgstr "Giữ phím Shift khi nhấp vào biểu tượng phím để bỏ qua hộp thoại này."
+
 msgid "Create"
 msgstr "Tạo"
 
@@ -711,6 +845,9 @@ msgstr "Các bản hoạt ảnh chỉ có thể trỏ tới các nút AnimationP
 msgid "Not possible to add a new track without a root"
 msgstr "Không thể thêm track mới mà không có root"
 
+msgid "Invalid track for Bezier (no suitable sub-properties)"
+msgstr "Đường dẫn không hợp lệ cho Bezier (không có thuộc tính phụ phù hợp)"
+
 msgid "Add Bezier Track"
 msgstr "Thêm Bezier Track"
 
@@ -750,18 +887,52 @@ msgstr "Clipboard trống!"
 msgid "Paste Tracks"
 msgstr "Dán Tracks"
 
+msgid "Make Easing Keys"
+msgstr "Tạo các phím Easing"
+
+msgid ""
+"Some AnimationPlayerEditor's options are disabled since this is the dummy "
+"AnimationPlayer for preview.\n"
+"\n"
+"The dummy player is forced active, non-deterministic and doesn't have the "
+"root motion track. Furthermore, the original node is inactive temporary."
+msgstr ""
+"Một số tùy chọn của AnimationPlayerEditor bị vô hiệu hóa vì đây là "
+"AnimationPlayer giả để xem trước.\n"
+"\n"
+"Người chơi giả bị buộc phải hoạt động, không xác định và không có đường di "
+"chuyển gốc. Hơn nữa, nút gốc tạm thời không hoạt động."
+
+msgid "AnimationPlayer is inactive. The playback will not be processed."
+msgstr ""
+"AnimationPlayer không hoạt động. Quá trình phát lại sẽ không được xử lý."
+
 msgid "Select an AnimationPlayer node to create and edit animations."
 msgstr "Chọn một AnimationPlayer để tạo và chỉnh sửa Hoạt Ảnh."
 
 msgid "Warning: Editing imported animation"
 msgstr "Cảnh bảo: Chỉnh sửa hoạt ảnh đã nhập"
 
+msgid "Dummy Player"
+msgstr "Người chơi giả"
+
+msgid "Toggle between the bezier curve editor and track editor."
+msgstr ""
+"Chuyển đổi giữa trình chỉnh sửa đường cong Bézier và trình chỉnh sửa đường "
+"ray."
+
 msgid "Only show tracks from nodes selected in tree."
 msgstr "Chỉ hiển thị các track từ các nút đã chọn trong cây."
 
 msgid "Group tracks by node or display them as plain list."
 msgstr "Nhóm các track bởi nút hoặc hiển thị chúng dạng danh sách đơn giản."
 
+msgid "Apply snapping to timeline cursor."
+msgstr "Áp dụng tính năng bám vào con trỏ dòng thời gian."
+
+msgid "Apply snapping to the nearest integer FPS."
+msgstr "Áp dụng tính năng bám dính vào số nguyên FPS gần nhất."
+
 msgid "Animation step value."
 msgstr "Giá trị bước hoạt ảnh."
 
@@ -777,6 +948,18 @@ msgstr "Chỉnh sửa"
 msgid "Animation properties."
 msgstr "Thuộc tính hoạt hình."
 
+msgid "Set Start Offset (Audio)"
+msgstr "Đặt độ lệch bắt đầu (Âm thanh)"
+
+msgid "Set End Offset (Audio)"
+msgstr "Đặt độ lệch cuối (Âm thanh)"
+
+msgid "Move First Selected Key to Cursor"
+msgstr "Di chuyển phím được chọn đầu tiên đến con trỏ"
+
+msgid "Move Last Selected Key to Cursor"
+msgstr "Di chuyển phím được chọn cuối cùng đến con trỏ"
+
 msgid "Delete Selection"
 msgstr "Xoá lựa chọn"
 
@@ -795,6 +978,12 @@ msgstr "Sử dụng đường cong Bezier"
 msgid "Optimize"
 msgstr "Tối ưu"
 
+msgid "Trim keys placed in negative time"
+msgstr "Phím cắt được đặt ở thời gian âm"
+
+msgid "Trim keys placed exceed the animation length"
+msgstr "Các phím cắt được đặt vượt quá độ dài hoạt ảnh"
+
 msgid "Remove invalid keys"
 msgstr "Xóa các khoá không hợp lệ"
 
@@ -813,10 +1002,17 @@ msgstr "Dọn dẹp"
 msgid "Scale Ratio:"
 msgstr "Tỉ lệ phóng đại:"
 
+msgid "Select Transition and Easing"
+msgstr "Chọn Chuyển tiếp và Làm dịu"
+
 msgctxt "Transition Type"
 msgid "Sine"
 msgstr "Sin"
 
+msgctxt "Transition Type"
+msgid "Quad"
+msgstr "Tứ giác"
+
 msgctxt "Transition Type"
 msgid "Elastic"
 msgstr "Đàn hồi"
@@ -845,18 +1041,39 @@ msgctxt "Ease Type"
 msgid "Out"
 msgstr "Ra"
 
+msgid "FPS:"
+msgstr "Tốc độ khung hình/giây:"
+
 msgid "Select Tracks to Copy"
 msgstr "Chọn các Track để sao chép"
 
 msgid "Select All/None"
 msgstr "Chọn/Bỏ tất cả"
 
+msgid ""
+"A marker's name can only be changed by right-clicking it in the animation "
+"editor and selecting \"Rename Marker\", in order to make sure that marker "
+"names are all unique."
+msgstr ""
+"Tên của điểm đánh dấu chỉ có thể được thay đổi bằng cách nhấp chuột phải vào "
+"điểm đánh dấu đó trong trình chỉnh sửa hoạt ảnh và chọn \"Đổi tên điểm đánh "
+"dấu\" để đảm bảo rằng tất cả tên điểm đánh dấu đều là duy nhất."
+
+msgid "Show All Marker Names"
+msgstr "Hiển thị tất cả tên điểm đánh dấu"
+
+msgid "Marker:"
+msgstr "Điểm đánh dấu:"
+
 msgid "Close"
 msgstr "Đóng"
 
 msgid "Error!"
 msgstr "Lỗi!"
 
+msgid "Multi Edit Marker Color"
+msgstr "Màu đánh dấu chỉnh sửa đa"
+
 msgid "Add Audio Track Clip"
 msgstr "Thêm Track Âm thanh"
 
@@ -894,6 +1111,13 @@ msgstr "Thay thế tất cả"
 msgid "Selection Only"
 msgstr "Chỉ chọn"
 
+msgid "Hide"
+msgstr "Ẩn"
+
+msgctxt "Indentation"
+msgid "Spaces"
+msgstr "Khoảng cách"
+
 msgctxt "Indentation"
 msgid "Tabs"
 msgstr "Thẻ"
@@ -919,6 +1143,13 @@ msgstr "Cảnh báo"
 msgid "Zoom factor"
 msgstr "Hệ số phóng to"
 
+msgid ""
+"%sMouse wheel, %s/%s: Finetune\n"
+"%s: Reset"
+msgstr ""
+"%s Bánh xe chuột, %s / %s : Tinh chỉnh\n"
+"%s : Đặt lại"
+
 msgid "Line and column numbers."
 msgstr "Số dòng và cột."
 
@@ -935,6 +1166,9 @@ msgstr ""
 "Phương thức mục tiêu không được tìm thấy. Chỉ định phương thức hợp lệ hoặc "
 "đính kèm tập lệnh vào nút mục tiêu."
 
+msgid "%s: Callback code won't be generated, please add it manually."
+msgstr "%s : Mã gọi lại sẽ không được tạo, vui lòng thêm thủ công."
+
 msgid "Connect to Node:"
 msgstr "Kết nối đến Nút:"
 
@@ -971,6 +1205,9 @@ msgstr "Thêm đối số mở rộng:"
 msgid "Extra Call Arguments:"
 msgstr "Đối số mở rộng được gọi:"
 
+msgid "Allows to drop arguments sent by signal emitter."
+msgstr "Cho phép loại bỏ các đối số được gửi bởi bộ phát tín hiệu ."
+
 msgid "Receiver Method:"
 msgstr "Hàm nhận:"
 
@@ -1081,6 +1318,9 @@ msgstr "Mô tả:"
 msgid "Remote %s:"
 msgstr "Từ xa %s:"
 
+msgid "Session %d"
+msgstr "Phiên %d"
+
 msgid "Debugger"
 msgstr "Trình gỡ lỗi"
 
@@ -1096,9 +1336,27 @@ msgstr "Sao chép đường dẫn nút"
 msgid "Instance:"
 msgstr "Thế:"
 
+msgid "Toggle Visibility"
+msgstr "Chuyển đổi khả năng hiển thị"
+
+msgid "Expression to evaluate"
+msgstr "Biểu thức để đánh giá"
+
 msgid "Clear"
 msgstr "Xoá"
 
+msgid "Updating assets on target device:"
+msgstr "Cập nhật nội dung trên thiết bị mục tiêu:"
+
+msgid "Getting remote file system"
+msgstr "Nhận hệ thống tập tin từ xa"
+
+msgid "Sending list of changed files:"
+msgstr "Gửi danh sách các tập tin đã thay đổi:"
+
+msgid "ms"
+msgstr "bệnh đa xơ cứng"
+
 msgid "Value"
 msgstr "Giá trị"
 
@@ -1144,6 +1402,18 @@ msgstr "Thời gian"
 msgid "Calls"
 msgstr "Lượt gọi"
 
+msgid "Linked"
+msgstr "Liên kết"
+
+msgid "CPU"
+msgstr "Bộ vi xử lý"
+
+msgid "GPU"
+msgstr "Bộ xử lý đồ họa"
+
+msgid "Execution resumed."
+msgstr "Việc thi hành án lại được tiếp tục."
+
 msgid "Bytes:"
 msgstr "Bytes:"
 
@@ -1159,6 +1429,15 @@ msgstr "Nguồn %s"
 msgid "%s Source:"
 msgstr "Nguồn %s:"
 
+msgid "Stack Trace"
+msgstr "Dấu vết ngăn xếp"
+
+msgid "Stack Trace:"
+msgstr "Theo dõi ngăn xếp:"
+
+msgid "Debug session closed."
+msgstr "Phiên gỡ lỗi đã đóng."
+
 msgid "Line %d"
 msgstr "Dòng %d"
 
@@ -1195,6 +1474,9 @@ msgstr "Tiếp tục"
 msgid "Thread:"
 msgstr "Luồng:"
 
+msgid "Stack Frames"
+msgstr "Khung xếp chồng"
+
 msgid "Filter Stack Variables"
 msgstr "Lọc biến ngăn xếp"
 
@@ -1207,6 +1489,9 @@ msgstr "Mở rộng Tất cả"
 msgid "Collapse All"
 msgstr "Thu gọn Tất cả"
 
+msgid "Evaluator"
+msgstr "Người đánh giá"
+
 msgid "Profiler"
 msgstr "Bộ phân tích hiệu suất"
 
@@ -1228,9 +1513,21 @@ msgstr "Sử dụng"
 msgid "Misc"
 msgstr "Khác"
 
+msgid "Clicked Control:"
+msgstr "Đã nhấp vào Kiểm soát:"
+
+msgid "Clicked Control Type:"
+msgstr "Loại điều khiển được nhấp:"
+
+msgid "Live Edit Root:"
+msgstr "Chỉnh sửa gốc trực tiếp:"
+
 msgid "Set From Tree"
 msgstr "Đặt từ cây"
 
+msgid "Export measures as CSV"
+msgstr "Xuất các biện pháp dưới dạng CSV"
+
 msgid "Search Replacement For:"
 msgstr "Tìm kiếm thay thế cho:"
 
@@ -1275,6 +1572,12 @@ msgstr "Tìm kiếm tài nguyên thay thế:"
 msgid "Open"
 msgstr "Mở"
 
+msgid "Owners of: %s (Total: %d)"
+msgstr "Chủ sở hữu của: %s (Tổng cộng: %d )"
+
+msgid "Localization remap for path '%s' and locale '%s'."
+msgstr "Bản đồ bản địa hóa cho đường dẫn ' %s ' và ngôn ngữ ' %s '."
+
 msgid ""
 "Remove the selected files from the project? (Cannot be undone.)\n"
 "Depending on your filesystem configuration, the files will either be moved to "
@@ -1298,6 +1601,9 @@ msgstr ""
 msgid "Cannot remove:"
 msgstr "Không thể gỡ bỏ:"
 
+msgid "Dependencies of files to be deleted:"
+msgstr "Sự phụ thuộc của các tập tin cần xóa:"
+
 msgid "Error loading:"
 msgstr "Lỗi tải nạp:"
 
@@ -1340,12 +1646,27 @@ msgstr "Tên thư mục chứa ký tự không hợp lệ."
 msgid "Folder with that name already exists."
 msgstr "Thư mục với tên này đã tồn tại."
 
+msgid "Using slashes in folder names will create subfolders recursively."
+msgstr ""
+"Sử dụng dấu gạch chéo trong tên thư mục sẽ tạo ra các thư mục con theo cách "
+"đệ quy."
+
+msgid ""
+"Using slashes in path will create the file in subfolder, creating new "
+"subfolders if necessary."
+msgstr ""
+"Sử dụng dấu gạch chéo trong đường dẫn sẽ tạo tệp trong thư mục con, đồng thời "
+"tạo các thư mục con mới nếu cần."
+
 msgid "Base path: %s"
 msgstr "Đường dẫn cơ sở: %s"
 
 msgid "Folder name is valid."
 msgstr "Tên thư mục hợp lệ."
 
+msgid "Double-click to open in browser."
+msgstr "Nhấp đúp để mở trong trình duyệt."
+
 msgid "Thanks from the Godot community!"
 msgstr "Cảm ơn từ cộng đồng Godot!"
 
@@ -1368,6 +1689,9 @@ msgstr "Nhà phát triển"
 msgid "Authors"
 msgstr "Tác giả"
 
+msgid "Patrons"
+msgstr "Người bảo trợ"
+
 msgid "Platinum Sponsors"
 msgstr "Nhà tài trợ Bạch Kim"
 
@@ -1377,6 +1701,12 @@ msgstr "Nhà tài trợ Vàng"
 msgid "Silver Sponsors"
 msgstr "Nhà tài trợ Bạc"
 
+msgid "Diamond Members"
+msgstr "Thành viên kim cương"
+
+msgid "Titanium Members"
+msgstr "Thành viên Titan"
+
 msgid "Donors"
 msgstr "Người ủng hộ"
 
@@ -1412,6 +1742,12 @@ msgstr "Lỗi mở tệp nội dung của \"%s\" (không phải định dạng Z
 msgid "%s (already exists)"
 msgstr "%s (đã tồn tại)"
 
+msgid "This asset doesn't have a root directory, so it can't be ignored."
+msgstr "Tài sản này không có thư mục gốc nên không thể bỏ qua."
+
+msgid "Ignore the root directory when extracting files."
+msgstr "Bỏ qua thư mục gốc khi giải nén tập tin."
+
 msgid "Uncompressing Assets"
 msgstr "Giải nén tài nguyên"
 
@@ -1421,9 +1757,34 @@ msgstr "Các tệp sau không thể trích xuất từ gói \"%s\":"
 msgid "(and %s more files)"
 msgstr "(và %s tệp nữa)"
 
+msgid "Asset \"%s\" installed successfully!"
+msgstr "Tài sản \" %s \" đã được cài đặt thành công!"
+
 msgid "Success!"
 msgstr "Thành công!"
 
+msgid "Open the list of the asset contents and select which files to install."
+msgstr "Mở danh sách nội dung tài sản và chọn tệp cần cài đặt."
+
+msgid ""
+"Change the folder where the contents of the asset are going to be installed."
+msgstr "Thay đổi thư mục nơi nội dung của tài sản sẽ được cài đặt."
+
+msgid "Ignore asset root"
+msgstr "Bỏ qua gốc tài sản"
+
+msgid "No files conflict with your project"
+msgstr "Không có tập tin nào xung đột với dự án của bạn"
+
+msgid "Show contents of the asset and conflicting files."
+msgstr "Hiển thị nội dung của tài sản và các tệp xung đột."
+
+msgid "Contents of the asset:"
+msgstr "Nội dung của tài sản:"
+
+msgid "Configure Asset Before Installing"
+msgstr "Cấu hình tài sản trước khi cài đặt"
+
 msgid "Install"
 msgstr "Cài đặt"
 
@@ -1439,9 +1800,18 @@ msgstr "Đổi tên Bus âm thanh"
 msgid "Change Audio Bus Volume"
 msgstr "Thay đổi âm lượng Bus"
 
+msgid "Toggle Audio Bus Solo"
+msgstr "Chuyển đổi Audio Bus Solo"
+
 msgid "Toggle Audio Bus Mute"
 msgstr "Bật/Tắt Âm Thanh của Bus"
 
+msgid "Toggle Audio Bus Bypass Effects"
+msgstr "Chuyển đổi hiệu ứng bỏ qua Bus âm thanh"
+
+msgid "Select Audio Bus Send"
+msgstr "Chọn Bus âm thanh Gửi"
+
 msgid "Add Audio Bus Effect"
 msgstr "Thêm hiệu ứng vào Bus âm thanh"
 
@@ -1481,6 +1851,9 @@ msgstr "Nhân bản Bus âm thanh"
 msgid "Reset Bus Volume"
 msgstr "Đặt lại âm lượng Bus"
 
+msgid "Move Audio Bus"
+msgstr "Di chuyển Bus âm thanh"
+
 msgid "Save Audio Bus Layout As..."
 msgstr "Lưu bố cục Bus âm thanh thành..."
 
@@ -1520,6 +1893,18 @@ msgstr "Nạp bố cục Bus mặc định."
 msgid "Create a new Bus Layout."
 msgstr "Tạo bố cục Bus mới."
 
+msgid "Must not collide with an existing engine class name."
+msgstr "Không được trùng với tên lớp động cơ hiện có ."
+
+msgid "Must not collide with an existing global script class name."
+msgstr "Không được xung đột với tên lớp tập lệnh toàn cục hiện có ."
+
+msgid "Must not collide with an existing built-in type name."
+msgstr "Không được xung đột với tên kiểu dữ liệu tích hợp sẵn hiện có ."
+
+msgid "Must not collide with an existing global constant name."
+msgstr "Không được xung đột với tên hằng toàn cục hiện có."
+
 msgid "Autoload '%s' already exists!"
 msgstr "Nạp tự động '%s' đã tồn tại!"
 
@@ -1548,6 +1933,9 @@ msgstr ""
 msgid "Path:"
 msgstr "Đường dẫn:"
 
+msgid "Set path or press \"%s\" to create a script."
+msgstr "Đặt đường dẫn hoặc nhấn \" %s \" để tạo một tập lệnh ."
+
 msgid "Node Name:"
 msgstr "Tên Node:"
 
@@ -1563,9 +1951,98 @@ msgstr "Điều hướng"
 msgid "Vulkan"
 msgstr "Vulkan"
 
+msgid "Text Server: Fallback"
+msgstr "Máy chủ văn bản: Dự phòng"
+
+msgid "Text Server: Advanced"
+msgstr "Máy chủ văn bản: Nâng cao"
+
+msgid "TTF, OTF, Type 1, WOFF1 Fonts"
+msgstr "Phông chữ TTF, OTF, Type 1, WOFF1"
+
 msgid "WOFF2 Fonts"
 msgstr "Phông chữ WOFF2"
 
+msgid "SIL Graphite Fonts"
+msgstr "Phông chữ SIL Graphite"
+
+msgid "Multi-channel Signed Distance Field Font Rendering"
+msgstr "Kết xuất phông chữ trường khoảng cách có dấu đa kênh"
+
+msgid "3D Nodes as well as RenderingServer access to 3D features."
+msgstr ""
+"Các nút 3D cũng như quyền truy cập RenderingServer vào các tính năng 3D."
+
+msgid "2D Physics nodes and PhysicsServer2D."
+msgstr "Các nút Vật lý 2D và PhysicsServer2D."
+
+msgid "3D Physics nodes and PhysicsServer3D."
+msgstr "Các nút Vật lý 3D và PhysicsServer3D."
+
+msgid "XR (AR and VR)."
+msgstr "XR (AR và VR)."
+
+msgid ""
+"RenderingDevice based rendering (if disabled, the OpenGL back-end is "
+"required)."
+msgstr ""
+"Kết xuất kết xuất dựa trên thiết bị (nếu tắt, cần có phần phụ trợ OpenGL )."
+
+msgid "OpenGL back-end (if disabled, the RenderingDevice back-end is required)."
+msgstr ""
+"Phần phụ trợ OpenGL (nếu tắt, phần phụ trợ RenderingDevice là bắt buộc)."
+
+msgid "Vulkan back-end of RenderingDevice."
+msgstr "Phần cuối Vulkan của RenderingDevice."
+
+msgid ""
+"Fallback implementation of Text Server\n"
+"Supports basic text layouts."
+msgstr ""
+"Triển khai dự phòng của Máy chủ văn bản\n"
+"Hỗ trợ bố cục văn bản cơ bản."
+
+msgid ""
+"Text Server implementation powered by ICU and HarfBuzz libraries.\n"
+"Supports complex text layouts, BiDi, and contextual OpenType font features."
+msgstr ""
+"Triển khai Máy chủ văn bản sử dụng thư viện ICU và HarfBuzz.\n"
+"Hỗ trợ bố cục văn bản phức tạp, BiDi và các tính năng phông chữ OpenType theo "
+"ngữ cảnh."
+
+msgid ""
+"TrueType, OpenType, Type 1, and WOFF1 font format support using FreeType "
+"library (if disabled, WOFF2 support is also disabled)."
+msgstr ""
+"Hỗ trợ định dạng phông chữ TrueType, OpenType, Type 1 và WOFF1 bằng thư viện "
+"FreeType (nếu tắt, hỗ trợ WOFF2 cũng bị tắt)."
+
+msgid "WOFF2 font format support using FreeType and Brotli libraries."
+msgstr "Hỗ trợ định dạng phông chữ WOFF2 bằng thư viện FreeType và Brotli."
+
+msgid ""
+"SIL Graphite smart font technology support (supported by Advanced Text Server "
+"only)."
+msgstr ""
+"Hỗ trợ công nghệ phông chữ thông minh SIL Graphite (chỉ được hỗ trợ bởi "
+"Advanced Text Server)."
+
+msgid ""
+"Multi-channel signed distance field font rendering support using msdfgen "
+"library (pre-rendered MSDF fonts can be used even if this option disabled)."
+msgstr ""
+"Hỗ trợ hiển thị phông chữ trường khoảng cách có dấu đa kênh bằng thư viện "
+"msdfgen ( có thể sử dụng phông chữ MSDF được hiển thị sẵn ngay cả khi tùy "
+"chọn này bị tắt)."
+
+msgid "Text Rendering and Font Options:"
+msgstr "Hiển thị văn bản và tùy chọn phông chữ:"
+
+msgid "This will scan all files in the current project to detect used classes."
+msgstr ""
+"Lệnh này sẽ quét tất cả các tệp trong dự án hiện tại để phát hiện các lớp đã "
+"sử dụng."
+
 msgid "Nodes and Classes:"
 msgstr "Các nút và lớp:"
 
@@ -1593,6 +2070,9 @@ msgstr "Xin hãy xác nhận:"
 msgid "Export Profile"
 msgstr "Xuất hồ sơ"
 
+msgid "Forced Classes on Detect:"
+msgstr "Các lớp bắt buộc trên Detect:"
+
 msgid ""
 "Failed to execute command \"%s\":\n"
 "%s."
@@ -1621,9 +2101,15 @@ msgstr "[rỗng]"
 msgid "[unsaved]"
 msgstr "[chưa lưu]"
 
+msgid "%s - Godot Engine"
+msgstr "%s- Động cơ Godot"
+
 msgid "Dock Position"
 msgstr "Vị trí Khung"
 
+msgid "Move this dock to the bottom panel."
+msgstr "Di chuyển thanh dock này xuống bảng điều khiển phía dưới."
+
 msgid "3D Editor"
 msgstr "Trình chỉnh sửa 3D"
 
@@ -1651,6 +2137,21 @@ msgstr "Cho phép xem và sửa các cảnh 3D."
 msgid "Allows to edit scripts using the integrated script editor."
 msgstr "Cho phép sửa các tập lệnh bằng trình soạn tập lệnh được tích hợp sẵn."
 
+msgid "Provides built-in access to the Asset Library."
+msgstr "Cung cấp quyền truy cập tích hợp vào Thư viện tài sản."
+
+msgid "Allows editing the node hierarchy in the Scene dock."
+msgstr "Cho phép chỉnh sửa hệ thống phân cấp nút trong Dock cảnh ."
+
+msgid ""
+"Allows to work with signals and groups of the node selected in the Scene dock."
+msgstr ""
+"Cho phép làm việc với các tín hiệu và nhóm nút được chọn trong thanh công cụ "
+"Scene ."
+
+msgid "Allows to browse the local file system via a dedicated dock."
+msgstr "Cho phép duyệt hệ thống tập tin cục bộ thông qua một dock chuyên dụng ."
+
 msgid "(current)"
 msgstr "(hiện tại)"
 
diff --git a/engine/editor/translations/editor/zh_CN.po b/engine/editor/translations/editor/zh_CN.po
index 3c426aec..63d3f34a 100644
--- a/engine/editor/translations/editor/zh_CN.po
+++ b/engine/editor/translations/editor/zh_CN.po
@@ -76,7 +76,7 @@
 # twoBornottwoB <305766341@qq.com>, 2021.
 # Magian <magian1127@gmail.com>, 2021.
 # Weiduo Xie <xwditfr@gmail.com>, 2021.
-# suplife <2634557184@qq.com>, 2021, 2022, 2023.
+# suplife <2634557184@qq.com>, 2021, 2022, 2023, 2025.
 # luoji <564144019@qq.com>, 2021.
 # zeng haochen <m18621006730@163.com>, 2021.
 # Sam Sun <oppositenormal@outlook.com>, 2021.
@@ -101,12 +101,14 @@
 # Mike Allen <itsxwz@gmail.com>, 2024.
 # Mill Xu <2733679597@qq.com>, 2024.
 # J_aphasiac <japhasiac@163.com>, 2025.
+# BuddhaGrape <3248882725@qq.com>, 2025.
+# ChenLei <falsecollector@outlook.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: 2018-01-20 12:15+0200\n"
-"PO-Revision-Date: 2025-02-21 19:26+0000\n"
+"PO-Revision-Date: 2025-03-14 05:10+0000\n"
 "Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n"
 "Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
 "projects/godot-engine/godot/zh_Hans/>\n"
@@ -115,7 +117,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Main Thread"
 msgstr "主线程"
@@ -962,6 +964,9 @@ msgstr "AnimationPlayer 不能动画化自己，只可动画化其他 Player。"
 msgid "property '%s'"
 msgstr "属性“%s”"
 
+msgid "Nearest FPS: %d"
+msgstr "邻近 FPS：%d"
+
 msgid "Change Animation Step"
 msgstr "修改动画步长"
 
@@ -1594,6 +1599,9 @@ msgstr "解绑信号参数："
 msgid "Receiver Method:"
 msgstr "接收方法："
 
+msgid "Pick"
+msgstr "选取"
+
 msgid "Advanced"
 msgstr "高级"
 
@@ -3262,7 +3270,7 @@ msgid "This variable may be changed or removed in future versions."
 msgstr "未来版本中可能会修改或移除该变量。"
 
 msgid "TextFile"
-msgstr "TextFile"
+msgstr "文本文件"
 
 msgid "File"
 msgstr "文件"
@@ -5115,6 +5123,12 @@ msgstr "从文件安装"
 msgid "Install templates from a local file."
 msgstr "从本地文件安装模板。"
 
+msgid "Online mode is needed to download the templates."
+msgstr "下载模板需要在线模式。"
+
+msgid "Go Online"
+msgstr "连接网络"
+
 msgid "Cancel the download of the templates."
 msgstr "取消下载模板。"
 
@@ -7816,9 +7830,6 @@ msgid ""
 "over the internet."
 msgstr "资产库需要连接网络，会通过互联网传输数据。"
 
-msgid "Go Online"
-msgstr "连接网络"
-
 msgid "Failed to get repository configuration."
 msgstr "获取仓库配置失败。"
 
@@ -8819,7 +8830,7 @@ msgstr ""
 "用游戏嵌入，不影响导出后的项目。"
 
 msgid "Game embedding not available in single window mode."
-msgstr "但窗口模式下不支持游戏嵌入。"
+msgstr "单窗口模式下不支持游戏嵌入。"
 
 msgid "Suspend"
 msgstr "挂起"
@@ -8898,7 +8909,7 @@ msgid ""
 msgstr "未找到库“%s”对应 GDExtension：“%s”。当前平台可能的特性标记：%s"
 
 msgid "Multiple \"%s\" libraries found for GDExtension: \"%s\": \"%s\"."
-msgstr "找到多个库“%s”对应 GDExtension：“%s”：“%s”。"
+msgstr "找到多个“%s”库对应 GDExtension：“%s”：“%s”。"
 
 msgid "Change AudioStreamPlayer3D Emission Angle"
 msgstr "修改 AudioStreamPlayer3D 发射角"
@@ -14322,6 +14333,9 @@ msgid ""
 "single output port."
 msgstr "任意调整连接路线，可以将多个输入端口连接到单个输出端口。"
 
+msgid "[None]"
+msgstr "[无]"
+
 msgid "Edit Visual Property: %s"
 msgstr "编辑可视属性：%s"
 
@@ -15135,9 +15149,6 @@ msgstr "特性标签"
 msgid "Pick Root Node Type"
 msgstr "选取根节点类型"
 
-msgid "Pick"
-msgstr "选取"
-
 msgid "Scene name is empty."
 msgstr "场景名称为空。"
 
@@ -15797,33 +15808,18 @@ msgstr "正在更新脚本 UID"
 
 msgid ""
 "As of Godot 4.4, scenes and resources use UIDs to reference scripts and "
-"shaders.\n"
+"shaders. Upgrades apply on the next save of each scene/resource.\n"
 "\n"
-"Normally, this update is applied to a single scene or resource once you save "
-"it in Godot 4.4 for the first time. If you have a lot of scenes and/or "
-"resources, doing this manually may be time-consuming. This tool will update "
-"all of the project's scenes and resources at once.\n"
-"\n"
-"Click \"Restart & Upgrade\" to restart the editor and update all of the "
-"scenes and resources in this project. Depending on the project size, it may "
-"take several minutes.\n"
-"\n"
-"Note: Please make sure you have your project backed up before running the "
-"tool, to avoid the possibility of data loss. Additionally, make sure to "
-"commit all .uid files into version control (and do not add them to ignore-"
-"lists like .gitignore)."
+"To save time, this tool can open and save each of these files. Depending on "
+"the project size, it may take several minutes."
 msgstr ""
-"从 Godot 4.4 开始，场景和资源会使用 UID 来引用脚本和着色器。\n"
+"截至 Godot 4.4，场景和资源使用 UID 来引用脚本和着色器。升级将在各个场景/资源下"
+"次保存时应用。\n"
 "\n"
-"正常情况下，场景和资源文件只有在第一次使用 Godot 4.4 进行保存时才会发生更新。"
-"如果你有很多场景和资源，手动进行此类更新可能非常耗时。这一工具会将项目中的所有"
-"场景和资源一起进行更新。\n"
-"\n"
-"点击“重启并升级”会重启编辑器并更新此项目中的所有场景和资源。这一过程可能持续若"
-"干分钟，取决于项目的大小。\n"
-"\n"
-"注意：在运行工具前，请确认已备份该项目，避免可能的数据丢失。此外，请确保将所"
-"有 .uid 文件都提交进版本控制系统（请勿将其加入 .gitignore 等忽略列表）。"
+"为了节省时间，该工具可以打开并保存每个文件。根据项目的大小，这可能需要几分钟。"
+
+msgid "Re-save all scenes and resources to use UIDs"
+msgstr "使用 UID 重新保存所有场景和资源"
 
 msgid "Learn More"
 msgstr "了解更多"
@@ -18811,15 +18807,15 @@ msgstr ""
 "为了保持最小的代码改动，你可以在着色器顶部附近添加“uniform sampler2D %s : "
 "hint_%s, filter_linear_mipmap;”。"
 
+msgid "Can't use function as identifier: '%s'."
+msgstr "不能使用函数作为标识符：“%s”。"
+
 msgid "Varying with '%s' data type may only be used in the '%s' function."
 msgstr "数据类型为“%s”的 Varying 不能在“%s”函数中使用。"
 
 msgid "Varying '%s' must be assigned in the '%s' function first."
 msgstr "Varying“%s”必须先在“%s”函数中赋值。"
 
-msgid "Can't use function as identifier: '%s'."
-msgstr "不能使用函数作为标识符：“%s”。"
-
 msgid "Only integer expressions are allowed for indexing."
 msgstr "只允许使用整数表达式进行索引。"
 
diff --git a/engine/editor/translations/editor/zh_TW.po b/engine/editor/translations/editor/zh_TW.po
index 6b8518f0..a116a676 100644
--- a/engine/editor/translations/editor/zh_TW.po
+++ b/engine/editor/translations/editor/zh_TW.po
@@ -1450,6 +1450,9 @@ msgstr "解除綁定訊號參數:"
 msgid "Receiver Method:"
 msgstr "接收器方法："
 
+msgid "Pick"
+msgstr "選取"
+
 msgid "Advanced"
 msgstr "進階"
 
@@ -4626,6 +4629,9 @@ msgstr "自檔案安裝"
 msgid "Install templates from a local file."
 msgstr "自本地檔案安裝樣板。"
 
+msgid "Go Online"
+msgstr "線上說明文件"
+
 msgid "Cancel the download of the templates."
 msgstr "取消下載樣板。"
 
@@ -7015,9 +7021,6 @@ msgid ""
 "over the internet."
 msgstr "素材庫需要網路連線，並涉及透過網際網路傳送資料。"
 
-msgid "Go Online"
-msgstr "線上說明文件"
-
 msgid "Failed to get repository configuration."
 msgstr "無法取得儲存庫配置。"
 
@@ -13765,9 +13768,6 @@ msgstr "功能標籤"
 msgid "Pick Root Node Type"
 msgstr "選取根節點型別"
 
-msgid "Pick"
-msgstr "選取"
-
 msgid "Scene name is empty."
 msgstr "場景名稱為空。"
 
diff --git a/engine/editor/translations/extractable/extractable.pot b/engine/editor/translations/extractable/extractable.pot
index 4aa14fd3..0270c9c3 100644
--- a/engine/editor/translations/extractable/extractable.pot
+++ b/engine/editor/translations/extractable/extractable.pot
@@ -87,6 +87,10 @@ msgstr ""
 msgid "Hex code or named color"
 msgstr ""
 
+#: scene/gui/color_picker.cpp
+msgid "Swatches"
+msgstr ""
+
 #: scene/gui/color_picker.cpp
 msgid "Show all options available."
 msgstr ""
diff --git a/engine/editor/translations/extractable/fr.po b/engine/editor/translations/extractable/fr.po
index 6a1f2ab5..1da11453 100644
--- a/engine/editor/translations/extractable/fr.po
+++ b/engine/editor/translations/extractable/fr.po
@@ -84,6 +84,9 @@ msgstr "Hex"
 msgid "Hex code or named color"
 msgstr "Code hexadécimal ou nom de couleur"
 
+msgid "Swatches"
+msgstr "Nuances"
+
 msgid "Show all options available."
 msgstr "Voir toutes les options disponibles."
 
diff --git a/engine/editor/translations/properties/cs.po b/engine/editor/translations/properties/cs.po
index 0ea0ef17..aca26c9f 100644
--- a/engine/editor/translations/properties/cs.po
+++ b/engine/editor/translations/properties/cs.po
@@ -998,6 +998,9 @@ msgstr "Režim spánku s nízkým využitím procesoru (µs)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Nezaměřený režim spánku s nízkým využitím procesoru (µs)"
 
+msgid "V-Sync Mode"
+msgstr "Režim V-Sync"
+
 msgid "Update Continuously"
 msgstr "Aktualizovat průběžně"
 
@@ -1058,6 +1061,9 @@ msgstr "Motiv"
 msgid "Icon and Font Color"
 msgstr "Barva ikon a fontů"
 
+msgid "Contrast"
+msgstr "Kontrast"
+
 msgid "Draw Extra Borders"
 msgstr "Kreslit dodatečné okraje"
 
@@ -1244,6 +1250,9 @@ msgstr "Editor textu"
 msgid "Line Spacing"
 msgstr "Řádkování"
 
+msgid "Color Theme"
+msgstr "Barevný motiv"
+
 msgid "Appearance"
 msgstr "Vzhled"
 
@@ -1775,9 +1784,6 @@ msgstr "Obnovit shadery při načtení"
 msgid "Visual Editors"
 msgstr "Vizuální editory"
 
-msgid "Color Theme"
-msgstr "Barevný motiv"
-
 msgid "Minimap Opacity"
 msgstr "Průhlednost minimapy"
 
@@ -1805,9 +1811,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Umístění okna"
 
+msgid "Rect"
+msgstr "Obdélník"
+
 msgid "Rect Custom Position"
 msgstr "Vlastní pozice obdélníku"
 
+msgid "Screen"
+msgstr "Obrazovka"
+
 msgid "Auto Save"
 msgstr "Automatické ukládání"
 
@@ -1817,6 +1829,9 @@ msgstr "Uložit před spuštěním"
 msgid "Output"
 msgstr "Výstup"
 
+msgid "Font Size"
+msgstr "Velikost fontu"
+
 msgid "Always Clear Output on Play"
 msgstr "Vždy promazat výstup při spuštění"
 
@@ -1841,6 +1856,9 @@ msgstr "Host"
 msgid "Editor TLS Certificates"
 msgstr "TLS certifikáty editoru"
 
+msgid "Enable TLS V 1"
+msgstr "Povolit TLS V 1"
+
 msgid "Remote Host"
 msgstr "Vzdálený host"
 
@@ -2868,9 +2886,6 @@ msgstr "Ruční"
 msgid "Orientation"
 msgstr "Orientace"
 
-msgid "V-Sync Mode"
-msgstr "Režim V-Sync"
-
 msgid "Output Latency"
 msgstr "Latence výstupu"
 
@@ -3828,9 +3843,6 @@ msgstr "Odstranění šumu"
 msgid "Denoiser"
 msgstr "Odstraňovač šumu"
 
-msgid "Enable TLS V 1"
-msgstr "Povolit TLS V 1"
-
 msgid "BPM"
 msgstr "Tempo (BPM)"
 
@@ -4308,9 +4320,6 @@ msgstr "Gesto"
 msgid "Swipe to Dismiss"
 msgstr "Zavřít přejetím prstu"
 
-msgid "Screen"
-msgstr "Obrazovka"
-
 msgid "Immersive Mode"
 msgstr "Imerzivní režim"
 
@@ -4917,9 +4926,6 @@ msgstr "Maximální polyfonie"
 msgid "Copy Mode"
 msgstr "Režim kopírování"
 
-msgid "Rect"
-msgstr "Obdélník"
-
 msgid "Anchor Mode"
 msgstr "Režim ukotvení"
 
@@ -5768,9 +5774,6 @@ msgstr "Priorita vykreslování"
 msgid "Text"
 msgstr "Text"
 
-msgid "Font Size"
-msgstr "Velikost fontu"
-
 msgid "Horizontal Alignment"
 msgstr "Horizontální zarovnání"
 
@@ -7088,9 +7091,6 @@ msgstr "Zdroj"
 msgid "Mix"
 msgstr "Mix"
 
-msgid "Contrast"
-msgstr "Kontrast"
-
 msgid "Features"
 msgstr "Vlastnosti"
 
diff --git a/engine/editor/translations/properties/de.po b/engine/editor/translations/properties/de.po
index 002358f4..59dc76df 100644
--- a/engine/editor/translations/properties/de.po
+++ b/engine/editor/translations/properties/de.po
@@ -92,7 +92,7 @@
 # Janosch Lion <janorico@posteo.de>, 2023.
 # "Dimitri A." <dimitripilot3@gmail.com>, 2023.
 # Roman Wanner <flugtauglicher@gmail.com>, 2023.
-# Ettore Atalan <atalanttore@googlemail.com>, 2023, 2024.
+# Ettore Atalan <atalanttore@googlemail.com>, 2023, 2024, 2025.
 # Lars Bollmann <lars.bollmann@tu-dortmund.de>, 2023.
 # Benedikt Wicklein <benedikt.wicklein@gmail.com>, 2023.
 # Wuzzy <Wuzzy@disroot.org>, 2023.
@@ -104,12 +104,14 @@
 # Cerno_b <jan.biel@arcor.de>, 2023.
 # Cerno_b <cerno.b@gmail.com>, 2023, 2024.
 # tct123 <tct1234@protonmail.com>, 2024.
+# Silikonmanns Kanal <silvan.goeth@gmail.com>, 2025.
+# Tim Nikitin <tim.nikitin@posteo.de>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2024-10-03 21:40+0000\n"
+"PO-Revision-Date: 2025-03-16 12:59+0000\n"
 "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/godot-"
 "properties/de/>\n"
@@ -118,7 +120,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.8-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Application"
 msgstr "Anwendung"
@@ -222,6 +224,9 @@ msgstr "Bis zum Titel erweitern"
 msgid "No Focus"
 msgstr "Kein Fokus"
 
+msgid "Sharp Corners"
+msgstr "Scharfe Ecken"
+
 msgid "Window Width Override"
 msgstr "Fensterbreite überschreiben"
 
@@ -540,6 +545,18 @@ msgstr "Kompatibilität"
 msgid "Legacy Just Pressed Behavior"
 msgstr "Veraltetes „Gerade gedrückt“-Verhalten"
 
+msgid "Sensors"
+msgstr "Sensoren"
+
+msgid "Enable Gravity"
+msgstr "Schwerkraft aktivieren"
+
+msgid "Enable Gyroscope"
+msgstr "Gyroskop aktivieren"
+
+msgid "Enable Magnetometer"
+msgstr "Magnetometer aktivieren"
+
 msgid "Device"
 msgstr "Gerät"
 
@@ -882,6 +899,12 @@ msgstr "Label"
 msgid "Read Only"
 msgstr "Nur Lesezugriff"
 
+msgid "Draw Label"
+msgstr "Zeichne Label"
+
+msgid "Draw Background"
+msgstr "Zeichne Hintergrund"
+
 msgid "Checkable"
 msgstr "Auswählbar"
 
@@ -1011,6 +1034,12 @@ msgstr "Leerlaufzeit im Prozessorenergiesparmodus (μs)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Leerlaufzeit im Prozessorenergiesparmodus bei fehlendem Fokus (μs)"
 
+msgid "Import Resources When Unfocused"
+msgstr "Ressourcen importieren, wenn sie nicht fokussiert sind"
+
+msgid "V-Sync Mode"
+msgstr "V-Sync-Modus"
+
 msgid "Update Continuously"
 msgstr "Fortlaufend aktualisieren"
 
@@ -1068,6 +1097,9 @@ msgstr "Theme"
 msgid "Icon and Font Color"
 msgstr "Icon- und Schriftfarbe"
 
+msgid "Contrast"
+msgstr "Kontrast"
+
 msgid "Draw Extra Borders"
 msgstr "Zusätzliche Ränder zeichnen"
 
@@ -1230,6 +1262,9 @@ msgstr "Texteditor"
 msgid "Line Spacing"
 msgstr "Zeilenzwischenraum"
 
+msgid "Color Theme"
+msgstr "Farbschema"
+
 msgid "Appearance"
 msgstr "Aussehen"
 
@@ -1290,6 +1325,9 @@ msgstr "Zeilen"
 msgid "Code Folding"
 msgstr "Code-Einklappen"
 
+msgid "Word Wrap"
+msgstr "Zeilenumbruch"
+
 msgid "Autowrap Mode"
 msgstr "Automatischer Umbrechungsmodus"
 
@@ -1734,9 +1772,6 @@ msgstr "Shader beim Laden wiederherstellen"
 msgid "Visual Editors"
 msgstr "Visuelle Editoren"
 
-msgid "Color Theme"
-msgstr "Farbschema"
-
 msgid "Minimap Opacity"
 msgstr "Deckkraft der Übersichtskarte"
 
@@ -1764,9 +1799,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Fensterpositionierung"
 
+msgid "Rect"
+msgstr "Rechteck"
+
 msgid "Rect Custom Position"
 msgstr "Eigene Position Rechteck"
 
+msgid "Screen"
+msgstr "Bildschirm"
+
 msgid "Auto Save"
 msgstr "Autospeichern"
 
@@ -1776,6 +1817,9 @@ msgstr "Speichern vor Wiedergabe"
 msgid "Output"
 msgstr "Ausgabe"
 
+msgid "Font Size"
+msgstr "Schriftgröße"
+
 msgid "Always Clear Output on Play"
 msgstr "Ausgabe immer vor Programmstart leeren"
 
@@ -1785,6 +1829,9 @@ msgstr "Max Zeilen"
 msgid "Platforms"
 msgstr "Plattformen"
 
+msgid "Linux/*BSD"
+msgstr "Linux/*BSD"
+
 msgid "Prefer Wayland"
 msgstr "Wayland bevorzugen"
 
@@ -1797,6 +1844,9 @@ msgstr "Hostname"
 msgid "Editor TLS Certificates"
 msgstr "Editor TLS-Zertifikate"
 
+msgid "Enable TLS V 1"
+msgstr "TLS V 1 aktivieren"
+
 msgid "Remote Host"
 msgstr "Remote-Hostname"
 
@@ -1842,6 +1892,9 @@ msgstr "Projektmanager"
 msgid "Sorting Order"
 msgstr "Sortierreihenfolge"
 
+msgid "Directory Naming Convention"
+msgstr "Verzeichnis-Namenskonvention"
+
 msgid "Highlighting"
 msgstr "Hervorhebung"
 
@@ -2782,9 +2835,6 @@ msgstr "Handgerät"
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-msgid "V-Sync Mode"
-msgstr "V-Sync-Modus"
-
 msgid "Output Latency"
 msgstr "Ausgabe-Latenz"
 
@@ -3436,6 +3486,9 @@ msgstr "Child-Elemente"
 msgid "Light"
 msgstr "Licht"
 
+msgid "Object Model Type"
+msgstr "Objektmodell-Typ"
+
 msgid "Joints"
 msgstr "Gelenke"
 
@@ -3517,6 +3570,21 @@ msgstr "Fade-Zeit"
 msgid "Stream Count"
 msgstr "Stream-Anzahl"
 
+msgid "Use Enhanced Internal Edge Removal"
+msgstr "Erweiterte interne Kantenentfernung verwenden"
+
+msgid "Generate All Kinematic Contacts"
+msgstr "Alle kinematischen Kontakte generieren"
+
+msgid "Baumgarte Stabilization Factor"
+msgstr "Baumgarte-Stabilisierungsfaktor"
+
+msgid "Queries"
+msgstr "Abfragen"
+
+msgid "Max Body Pairs"
+msgstr "Max. Körperpaare"
+
 msgid "Lightmapping"
 msgstr "Lightmapping"
 
@@ -3745,6 +3813,9 @@ msgstr "Interaktionsprofilpfad"
 msgid "Runtime Paths"
 msgstr "Runtime-Pfade"
 
+msgid "Is Sticky"
+msgstr "Ist haftend"
+
 msgid "Display Refresh Rate"
 msgstr "Aktualisierungsrate anzeigen"
 
@@ -3883,6 +3954,12 @@ msgstr "Aktivierte Features"
 msgid "Visibility State"
 msgstr "Sichtbarkeitsstatus"
 
+msgid "Install Exported APK"
+msgstr "Exportierte APK installieren"
+
+msgid "Java SDK Path"
+msgstr "Java-SDK-Pfad"
+
 msgid "Force System User"
 msgstr "Systemnutzer erzwingen"
 
@@ -3997,8 +4074,8 @@ msgstr "XR-Features"
 msgid "XR Mode"
 msgstr "XR-Modus"
 
-msgid "Screen"
-msgstr "Bildschirm"
+msgid "Swipe to Dismiss"
+msgstr "Zum Ablehnen wischen"
 
 msgid "Immersive Mode"
 msgstr "Immersionsmodus"
@@ -4129,6 +4206,9 @@ msgstr "Alte Exportdateien bedingungslos löschen"
 msgid "Entitlements"
 msgstr "Ansprüche"
 
+msgid "Increased Memory Limit"
+msgstr "Erhöhtes Speicherlimit"
+
 msgid "Push Notifications"
 msgstr "Push-Benachrichtigungen"
 
@@ -4216,6 +4296,9 @@ msgstr "Skript ausführen"
 msgid "Cleanup Script"
 msgstr "Skript bereinigen"
 
+msgid "macOS"
+msgstr "macOS"
+
 msgid "Distribution Type"
 msgstr "Verteilungstyp"
 
@@ -4588,9 +4671,6 @@ msgstr "Abspielmodus"
 msgid "Copy Mode"
 msgstr "Kopiermodus"
 
-msgid "Rect"
-msgstr "Rechteck"
-
 msgid "Anchor Mode"
 msgstr "Ankermodus"
 
@@ -5742,9 +5822,6 @@ msgstr "Übersicht ändern"
 msgid "Font"
 msgstr "Schriftart"
 
-msgid "Font Size"
-msgstr "Schriftgröße"
-
 msgid "Horizontal Alignment"
 msgstr "Horizontale Ausrichtung"
 
@@ -5907,6 +5984,9 @@ msgstr "Lichtdaten"
 msgid "Target Node"
 msgstr "Ziel-Node"
 
+msgid "Use Secondary Rotation"
+msgstr "Sekundärdrehung verwenden"
+
 msgid "From"
 msgstr "Von"
 
@@ -6342,6 +6422,9 @@ msgstr "Zugkoeffizient"
 msgid "Position Offset"
 msgstr "Positionsversatz"
 
+msgid "Inside"
+msgstr "Innerhalb"
+
 msgid "Track Physics Step"
 msgstr "Physikschritt verfolgen"
 
@@ -8560,9 +8643,6 @@ msgstr "Anpassungen"
 msgid "Brightness"
 msgstr "Helligkeit"
 
-msgid "Contrast"
-msgstr "Kontrast"
-
 msgid "Saturation"
 msgstr "Sättigung"
 
@@ -9394,6 +9474,12 @@ msgstr "Greiferversatz"
 msgid "Updown"
 msgstr "Hochrunter"
 
+msgid "Up"
+msgstr "Oben"
+
+msgid "Down"
+msgstr "Unten"
+
 msgid "Embedded Border"
 msgstr "Eingebetteter Rand"
 
@@ -9451,6 +9537,9 @@ msgstr "Neu laden"
 msgid "Toggle Hidden"
 msgstr "Versteckte ein-/ausschalten"
 
+msgid "Toggle Filename Filter"
+msgstr "Dateinamensfilter umschalten"
+
 msgid "Folder"
 msgstr "Ordner"
 
@@ -10726,5 +10815,8 @@ msgstr "VRS-Stärke"
 msgid "World Origin"
 msgstr "Weltursprung"
 
+msgid "Camera Locked to Origin"
+msgstr "Kamera auf Ursprung fixiert"
+
 msgid "Primary Interface"
 msgstr "Primäre Schnittstelle"
diff --git a/engine/editor/translations/properties/es.po b/engine/editor/translations/properties/es.po
index 0f1d9d32..f5ce13e4 100644
--- a/engine/editor/translations/properties/es.po
+++ b/engine/editor/translations/properties/es.po
@@ -115,7 +115,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-03-02 02:51+0000\n"
+"PO-Revision-Date: 2025-03-18 06:06+0000\n"
 "Last-Translator: Javier <xavier.ocampos@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/es/>\n"
@@ -124,7 +124,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Application"
 msgstr "Aplicación"
@@ -984,6 +984,9 @@ msgstr "Usar Hilos"
 msgid "Localize Settings"
 msgstr "Ajustes de Localización"
 
+msgid "Dock Tab Style"
+msgstr "Estilo de Pestañas del Dock"
+
 msgid "UI Layout Direction"
 msgstr "Orientación del Layout de la UI"
 
@@ -999,6 +1002,12 @@ msgstr "Pantalla del Editor"
 msgid "Project Manager Screen"
 msgstr "Pantalla del Administrador de Proyectos"
 
+msgid "Connection"
+msgstr "Conexión"
+
+msgid "Engine Version Update Mode"
+msgstr "Modo de Actualización de Versión del Motor"
+
 msgid "Use Embedded Menu"
 msgstr "Usar Menú Incrustado"
 
@@ -1008,6 +1017,12 @@ msgstr "Usar Archivo de Diálogos Nativo"
 msgid "Expand to Title"
 msgstr "Expandir al Título"
 
+msgid "Main Font Size"
+msgstr "Tamaño de Fuente Principal"
+
+msgid "Code Font Size"
+msgstr "Tamaño de Fuente Código"
+
 msgid "Code Font Contextual Ligatures"
 msgstr "Ligaduras Contextuales en la Fuente de Código"
 
@@ -1017,6 +1032,12 @@ msgstr "Funciones Personalizadas OpenType de la Fuente de Código"
 msgid "Code Font Custom Variations"
 msgstr "Variaciones Personalizadas de la Fuente de Código"
 
+msgid "Font Antialiasing"
+msgstr "Antialiasing de Fuente"
+
+msgid "Font Hinting"
+msgstr "Hinting de Fuente"
+
 msgid "Font Subpixel Positioning"
 msgstr "Posicionamiento Subpíxel de Fuentes"
 
@@ -1050,6 +1071,9 @@ msgstr "Botones Extra del Mouse para Navegar por el Historial"
 msgid "Save Each Scene on Quit"
 msgstr "Guardar Cada Escena Al Salir"
 
+msgid "Save on Focus Loss"
+msgstr "Guardar al Perder el Foco"
+
 msgid "Accept Dialog Cancel OK Buttons"
 msgstr "Botones Aceptar Cancelar de un cuadro de Diálogo"
 
@@ -1065,6 +1089,12 @@ msgstr "Modo de Reposo con Procesador en Bajo Consumo (µseg)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Modo de Reposo con Procesador en Bajo Consumo no Enfocado (µseg)"
 
+msgid "Import Resources When Unfocused"
+msgstr "Importar Recursos Cuando Pierde el Foco"
+
+msgid "V-Sync Mode"
+msgstr "Modo V-Sync"
+
 msgid "Update Continuously"
 msgstr "Actualizar Continuamente"
 
@@ -1089,9 +1119,18 @@ msgstr "Avisar Antes de Revocar Nombre Único"
 msgid "Inspector"
 msgstr "Inspector"
 
+msgid "Max Array Dictionary Items per Page"
+msgstr "Máximo Array Diccionario Elementos por Página"
+
 msgid "Show Low Level OpenType Features"
 msgstr "Mostrar Características de Bajo Nivel de OpenType"
 
+msgid "Float Drag Speed"
+msgstr "Velocidad de Arrastre Flotante"
+
+msgid "Nested Color Mode"
+msgstr "Modo de Color Anidado"
+
 msgid "Delimitate All Container and Resources"
 msgstr "Delimitar Todos los Contenedores y Recursos"
 
@@ -1119,12 +1158,39 @@ msgstr "Recursos Abiertos en el Inspector Actual"
 msgid "Resources to Open in New Inspector"
 msgstr "Recursos Para Abrir En el Nuevo Inspector"
 
+msgid "Default Color Picker Mode"
+msgstr "Modo de Selector de Color Por Defecto"
+
+msgid "Default Color Picker Shape"
+msgstr "Forma de Selector de Color Por Defecto"
+
 msgid "Theme"
 msgstr "Theme"
 
+msgid "Follow System Theme"
+msgstr "Seguir Tema del Sistema"
+
+msgid "Preset"
+msgstr "Preestablecido"
+
+msgid "Spacing Preset"
+msgstr "Espaciado Preestablecido"
+
 msgid "Icon and Font Color"
 msgstr "Color de Fuente e Ícono"
 
+msgid "Base Color"
+msgstr "Color Base"
+
+msgid "Accent Color"
+msgstr "Color de Acento"
+
+msgid "Use System Accent Color"
+msgstr "Usar Color de Acento del Sistema"
+
+msgid "Contrast"
+msgstr "Contraste"
+
 msgid "Draw Extra Borders"
 msgstr "Dibujar Bordes extras"
 
@@ -1176,12 +1242,36 @@ msgstr "Mostrar Botón de Script"
 msgid "Restore Scenes on Load"
 msgstr "Restaurar Escenas al Cargar"
 
+msgid "Multi Window"
+msgstr "Múltiple Ventana"
+
+msgid "Restore Windows on Load"
+msgstr "Restaurar Ventanas al Inicio"
+
+msgid "Maximize Window"
+msgstr "Maximizar Ventana"
+
 msgid "FileSystem"
 msgstr "Sistema de Archivos"
 
 msgid "External Programs"
 msgstr "Programas Externos"
 
+msgid "Raster Image Editor"
+msgstr "Editor de Imagen Ráster"
+
+msgid "Vector Image Editor"
+msgstr "Editor de Imagen Vectorial"
+
+msgid "Audio Editor"
+msgstr "Editor de Audio"
+
+msgid "3D Model Editor"
+msgstr "Editor de Modelo 3D"
+
+msgid "Terminal Emulator"
+msgstr "Emulador de Terminal"
+
 msgid "Terminal Emulator Flags"
 msgstr "Indicadores del Emulador de Terminal"
 
@@ -1189,7 +1279,10 @@ msgid "Directories"
 msgstr "Directorios"
 
 msgid "Autoscan Project Path"
-msgstr "Autoescaneo de la Ruta del Proyecto"
+msgstr "Ruta de Proyecto de Autoescaneo"
+
+msgid "Default Project Path"
+msgstr "Ruta de Proyecto Por Defecto"
 
 msgid "On Save"
 msgstr "Al Guardar"
@@ -1311,6 +1404,9 @@ msgstr "Editor de Textos"
 msgid "Line Spacing"
 msgstr "Espaciado de Línea"
 
+msgid "Color Theme"
+msgstr "Tema de Color"
+
 msgid "Appearance"
 msgstr "Apariencia"
 
@@ -1371,6 +1467,9 @@ msgstr "Líneas"
 msgid "Code Folding"
 msgstr "Plegado de Código"
 
+msgid "Word Wrap"
+msgstr "Ajuste de Palabras"
+
 msgid "Autowrap Mode"
 msgstr "Modo de Ajuste Automático de Línea"
 
@@ -1548,6 +1647,18 @@ msgstr "Ayuda"
 msgid "Show Help Index"
 msgstr "Mostrar Índice de Ayuda"
 
+msgid "Help Font Size"
+msgstr "Tamaño de Fuente de Ayuda"
+
+msgid "Help Source Font Size"
+msgstr "Tamaño de Fuente del Origen de la Ayuda"
+
+msgid "Help Title Font Size"
+msgstr "Tamaño de Fuente del Título de Ayuda"
+
+msgid "Class Reference Examples"
+msgstr "Ejemplos de Referencia de Clases"
+
 msgid "Sort Functions Alphabetically"
 msgstr "Ordenar Funciones Alfabéticamente"
 
@@ -1560,6 +1671,15 @@ msgstr "Distancia de Selección"
 msgid "Palette Min Width"
 msgstr "Ancho Mínimo de la Paleta"
 
+msgid "Preview Size"
+msgstr "Tamaño de Vista Previa"
+
+msgid "Primary Grid Color"
+msgstr "Color Primario de Cuadrícula"
+
+msgid "Secondary Grid Color"
+msgstr "Color Secundario de Cuadrícula"
+
 msgid "Selection Box Color"
 msgstr "Color de Caja de Selección"
 
@@ -1659,14 +1779,20 @@ msgstr "Forma del Hueso"
 msgid "Path 3D Tilt Disk Size"
 msgstr "Tamaño del Disco de Inclinación de Path 3D"
 
+msgid "Primary Grid Steps"
+msgstr "Pasos Primarios de Cuadrícula"
+
+msgid "Grid Size"
+msgstr "Tamaño de Cuadrícula"
+
 msgid "Grid Division Level Max"
-msgstr "Nivel Máximo de División de Cuadrícula"
+msgstr "Nivel Máximo de Subdivisión de Cuadrícula"
 
 msgid "Grid Division Level Min"
-msgstr "Nivel Mínimo de División de Cuadrícula"
+msgstr "Nivel Mínimo de Subdivisión de Cuadrícula"
 
 msgid "Grid Division Level Bias"
-msgstr "Sesgo del Nivel de División de la Cuadrícula"
+msgstr "Sesgo del Nivel de Subdivisión de Cuadrícula"
 
 msgid "Grid XZ Plane"
 msgstr "Cuadrícula Plano XZ"
@@ -1725,6 +1851,9 @@ msgstr "Sensibilidad de Vista Libre"
 msgid "Freelook Inertia"
 msgstr "Inercia de Vista Libre"
 
+msgid "Freelook Activation Modifier"
+msgstr "Modificador de Activación de Vista Libre"
+
 msgid "Freelook Speed Zoom Link"
 msgstr "Velocidad de Zoom de Vista Libre"
 
@@ -1845,9 +1974,6 @@ msgstr "Restaurar Shaders al Cargar"
 msgid "Visual Editors"
 msgstr "Editores Visuales"
 
-msgid "Color Theme"
-msgstr "Tema de Color"
-
 msgid "Minimap Opacity"
 msgstr "Opacidad del Minimapa"
 
@@ -1875,9 +2001,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Ubicación de la Ventana"
 
+msgid "Rect"
+msgstr "Rect"
+
 msgid "Rect Custom Position"
 msgstr "Posición Personalizada del Rect"
 
+msgid "Screen"
+msgstr "Pantalla"
+
 msgid "Auto Save"
 msgstr "Guardado Automático"
 
@@ -1887,6 +2019,9 @@ msgstr "Guardar Antes de Ejecutar"
 msgid "Output"
 msgstr "Salida"
 
+msgid "Font Size"
+msgstr "Tamaño de Fuente"
+
 msgid "Always Clear Output on Play"
 msgstr "Siempre Limpiar la Salida en la Reproducción"
 
@@ -1917,6 +2052,12 @@ msgstr "Host Remoto"
 msgid "Debugger"
 msgstr "Depurador"
 
+msgid "Auto Switch to Remote Scene Tree"
+msgstr "Cambio Automático al Árbol de Escenas Remoto"
+
+msgid "Auto Switch to Stack Trace"
+msgstr "Cambio Automático a la Traza de Pila"
+
 msgid "Profiler Frame History Size"
 msgstr "Tamaño del Historial del Perfilador de Fotogramas"
 
@@ -1959,6 +2100,9 @@ msgstr "Administrador de Proyectos"
 msgid "Sorting Order"
 msgstr "Orden de Ordenamiento"
 
+msgid "Directory Naming Convention"
+msgstr "Convención de Nombres de Directorio"
+
 msgid "Highlighting"
 msgstr "Resaltado"
 
@@ -2929,9 +3073,6 @@ msgstr "Manipulador"
 msgid "Orientation"
 msgstr "Orientación"
 
-msgid "V-Sync Mode"
-msgstr "Modo V-Sync"
-
 msgid "Output Latency"
 msgstr "Latencia de Salida"
 
@@ -4093,6 +4234,12 @@ msgstr "Características Activadas"
 msgid "Visibility State"
 msgstr "Estado de Visibilidad"
 
+msgid "Install Exported APK"
+msgstr "Instalar APK Exportado"
+
+msgid "Java SDK Path"
+msgstr "Ruta del SDK de Java"
+
 msgid "Force System User"
 msgstr "Forzar Usuario del Sistema"
 
@@ -4210,9 +4357,6 @@ msgstr "Modo XR"
 msgid "Swipe to Dismiss"
 msgstr "Deslizar para Descartar"
 
-msgid "Screen"
-msgstr "Pantalla"
-
 msgid "Immersive Mode"
 msgstr "Modo Inmersivo"
 
@@ -4432,6 +4576,9 @@ msgstr "Ejecutar Script"
 msgid "Cleanup Script"
 msgstr "Limpiar Script"
 
+msgid "macOS"
+msgstr "macOS"
+
 msgid "Distribution Type"
 msgstr "Tipo de Distribución"
 
@@ -4702,6 +4849,18 @@ msgstr "Icono 180 X 180"
 msgid "Icon 512 X 512"
 msgstr "Icono 512 X 512"
 
+msgid "rcedit"
+msgstr "rcedit"
+
+msgid "signtool"
+msgstr "signtool"
+
+msgid "osslsigncode"
+msgstr "osslsigncode"
+
+msgid "wine"
+msgstr "wine"
+
 msgid "Identity Type"
 msgstr "Tipo de Identidad"
 
@@ -4804,9 +4963,6 @@ msgstr "Tipo de Reproducción"
 msgid "Copy Mode"
 msgstr "Modo de Copia"
 
-msgid "Rect"
-msgstr "Rect"
-
 msgid "Anchor Mode"
 msgstr "Modo de Anclaje"
 
@@ -5958,9 +6114,6 @@ msgstr "Modular Contorno"
 msgid "Font"
 msgstr "Fuente"
 
-msgid "Font Size"
-msgstr "Tamaño de Fuente"
-
 msgid "Horizontal Alignment"
 msgstr "Alineación Horizontal"
 
@@ -8818,9 +8971,6 @@ msgstr "Ajustes"
 msgid "Brightness"
 msgstr "Luminosidad"
 
-msgid "Contrast"
-msgstr "Contraste"
-
 msgid "Saturation"
 msgstr "Saturación"
 
diff --git a/engine/editor/translations/properties/et.po b/engine/editor/translations/properties/et.po
index 1659079a..26a36909 100644
--- a/engine/editor/translations/properties/et.po
+++ b/engine/editor/translations/properties/et.po
@@ -721,6 +721,9 @@ msgstr "Näita Sisemisi Vigu Hüpikteate Märguannetes"
 msgid "Show Update Spinner"
 msgstr "Kuva Värskenduse Spinner"
 
+msgid "V-Sync Mode"
+msgstr "V-Sync Režiim"
+
 msgid "Update Continuously"
 msgstr "Värskenda Pidevalt"
 
@@ -772,6 +775,9 @@ msgstr "Teema"
 msgid "Icon and Font Color"
 msgstr "Ikooni Ja Font Värv"
 
+msgid "Contrast"
+msgstr "Kontrast"
+
 msgid "Draw Extra Borders"
 msgstr "Joonista Lisaäärised"
 
@@ -898,6 +904,9 @@ msgstr "Tekstiredaktor"
 msgid "Line Spacing"
 msgstr "Reavahe"
 
+msgid "Color Theme"
+msgstr "Värviskeem"
+
 msgid "Appearance"
 msgstr "Välimus"
 
@@ -1243,9 +1252,6 @@ msgstr "Shader-Redaktor"
 msgid "Visual Editors"
 msgstr "Visuaalsed Redaktorid"
 
-msgid "Color Theme"
-msgstr "Värviskeem"
-
 msgid "Minimap Opacity"
 msgstr "Minikaardi Läbipaistvus"
 
@@ -1264,6 +1270,12 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Akna Asetus"
 
+msgid "Rect"
+msgstr "Kast"
+
+msgid "Screen"
+msgstr "Ekraan"
+
 msgid "Auto Save"
 msgstr "Automaatne Salvestus"
 
@@ -1273,6 +1285,9 @@ msgstr "Salvesta Enne Käivitamist"
 msgid "Output"
 msgstr "Väljund"
 
+msgid "Font Size"
+msgstr "Fondi Suurus"
+
 msgid "Always Clear Output on Play"
 msgstr "Puhasta Alati Väljund Käivitamisel"
 
@@ -1906,9 +1921,6 @@ msgstr "Lõime Mudel"
 msgid "Orientation"
 msgstr "Orientatsioon"
 
-msgid "V-Sync Mode"
-msgstr "V-Sync Režiim"
-
 msgid "Output Latency"
 msgstr "Väljund Viivitus"
 
@@ -2509,9 +2521,6 @@ msgstr "XR Funktsionaalsus"
 msgid "XR Mode"
 msgstr "XR Režiim"
 
-msgid "Screen"
-msgstr "Ekraan"
-
 msgid "Immersive Mode"
 msgstr "Kaasahaarav Režiim"
 
@@ -2830,9 +2839,6 @@ msgstr "Kohandatud HTML-kest"
 msgid "Frame"
 msgstr "Kaader"
 
-msgid "Rect"
-msgstr "Kast"
-
 msgid "Top"
 msgstr "Ülaosa"
 
@@ -2884,9 +2890,6 @@ msgstr "Moduleeri"
 msgid "Text"
 msgstr "Tekst"
 
-msgid "Font Size"
-msgstr "Fondi Suurus"
-
 msgid "Uppercase"
 msgstr "Suurtähed"
 
@@ -3019,9 +3022,6 @@ msgstr "Sära"
 msgid "Fog"
 msgstr "Udu"
 
-msgid "Contrast"
-msgstr "Kontrast"
-
 msgid "Features"
 msgstr "Funktsionaalsused"
 
diff --git a/engine/editor/translations/properties/fa.po b/engine/editor/translations/properties/fa.po
index 96d3cedc..31954335 100644
--- a/engine/editor/translations/properties/fa.po
+++ b/engine/editor/translations/properties/fa.po
@@ -51,7 +51,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-27 22:41+0000\n"
+"PO-Revision-Date: 2025-03-14 14:07+0000\n"
 "Last-Translator: Atur <aturaseman9@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/fa/>\n"
@@ -60,7 +60,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.10.2-rc\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Application"
 msgstr "برنامه"
@@ -831,7 +831,7 @@ msgid "Show Scene Tree Root Selection"
 msgstr "نمایش برگزیدگان ریشهٔ درخت صحنه"
 
 msgid "Docks"
-msgstr "داک‌ها"
+msgstr "لنگرگاه‌ها"
 
 msgid "Scene Tree"
 msgstr "درخت صحنه"
@@ -863,6 +863,9 @@ msgstr "زمینه"
 msgid "Icon and Font Color"
 msgstr "رنگ آیکن و قلم"
 
+msgid "Contrast"
+msgstr "تضاد"
+
 msgid "Icon Saturation"
 msgstr "اشباع آیکون"
 
@@ -902,6 +905,12 @@ msgstr "سامانهٔ پرونده"
 msgid "External Programs"
 msgstr "برنامه‌های خارجی"
 
+msgid "Terminal Emulator"
+msgstr "شبیه‌ساز پایانه"
+
+msgid "Terminal Emulator Flags"
+msgstr "پرچم‌های شبیه‌ساز پایانه"
+
 msgid "Directories"
 msgstr "مسیر ها"
 
@@ -983,6 +992,9 @@ msgstr "ویراستار متن"
 msgid "Line Spacing"
 msgstr "فاصله خطوط"
 
+msgid "Color Theme"
+msgstr "رنگ زمینه"
+
 msgid "Appearance"
 msgstr "ظاهر"
 
@@ -1250,9 +1262,6 @@ msgstr "برگرداندن سایه‌زن‌ها هنگام بارکردن"
 msgid "Visual Editors"
 msgstr "ویراشگر‌های بصری"
 
-msgid "Color Theme"
-msgstr "رنگ زمینه"
-
 msgid "Grid Pattern"
 msgstr "الگوی توری"
 
@@ -1268,6 +1277,12 @@ msgstr "اس‌اس‌اچ"
 msgid "Window Placement"
 msgstr "قرار دادن پنجره"
 
+msgid "Rect"
+msgstr "مستطیل"
+
+msgid "Screen"
+msgstr "صفحه"
+
 msgid "Auto Save"
 msgstr "ذخیره خودکار"
 
@@ -1277,6 +1292,9 @@ msgstr "ذخیره پیش از اجرا"
 msgid "Output"
 msgstr "برونداد"
 
+msgid "Font Size"
+msgstr "اندازهٔ قلم"
+
 msgid "Always Clear Output on Play"
 msgstr "همیشه هنگام پخش برونداد را پاک کن"
 
@@ -1295,6 +1313,9 @@ msgstr "میزبان"
 msgid "Editor TLS Certificates"
 msgstr "گواهی‌های تی.ال.اس ویراستار"
 
+msgid "Enable TLS V 1"
+msgstr "به‌کاراندازی تی.ال.اس نسخهٔ ۱"
+
 msgid "Debugger"
 msgstr "اشکال‌زدا"
 
@@ -1406,6 +1427,9 @@ msgstr "ازکاراندازی هشدار بازنویسی"
 msgid "Bone Renamer"
 msgstr "بازنامگذار استخوان"
 
+msgid "Rename Bones"
+msgstr "بازنامگذاری استخوان‌ها"
+
 msgid "Unique Node"
 msgstr "گرهٔ یکتا"
 
@@ -1989,9 +2013,6 @@ msgstr "گرهٔ جهان"
 msgid "Region Size"
 msgstr "اندازهٔ دامنه"
 
-msgid "Enable TLS V 1"
-msgstr "به‌کاراندازی تی.ال.اس نسخهٔ ۱"
-
 msgid "Loop Offset"
 msgstr "بازه از مبدای چرخه"
 
@@ -2085,9 +2106,6 @@ msgstr "نام یکتا"
 msgid "Graphics"
 msgstr "گرافیک"
 
-msgid "Screen"
-msgstr "صفحه"
-
 msgid "Support Small"
 msgstr "پشتیبانی کوچک"
 
@@ -2250,15 +2268,15 @@ msgstr "کاهانش"
 msgid "Panning Strength"
 msgstr "قدرت سراسرنمایی"
 
+msgid "Bus"
+msgstr "گذرگاه"
+
 msgid "Playback Type"
 msgstr "گونهٔ بازنواخت"
 
 msgid "Copy Mode"
 msgstr "حالت کپی"
 
-msgid "Rect"
-msgstr "مستطیل"
-
 msgid "Anchor Mode"
 msgstr "حالت لنگر"
 
@@ -2968,9 +2986,6 @@ msgstr "نوشتار"
 msgid "Font"
 msgstr "قلم"
 
-msgid "Font Size"
-msgstr "اندازهٔ قلم"
-
 msgid "Horizontal Alignment"
 msgstr "تراز افقی"
 
@@ -3106,6 +3121,9 @@ msgstr "لایهٔ بازتاب"
 msgid "Deprecated"
 msgstr "منسوخ"
 
+msgid "Root Bone"
+msgstr "استخوان ریشه"
+
 msgid "Target"
 msgstr "هدف"
 
@@ -3187,6 +3205,9 @@ msgstr "ریشهٔ گره"
 msgid "Track"
 msgstr "نوار"
 
+msgid "Callback Mode"
+msgstr "حالت بازخوانی"
+
 msgid "Method"
 msgstr "روش"
 
@@ -3575,7 +3596,7 @@ msgid "Canvas Items"
 msgstr "موارد بوم"
 
 msgid "Audio Listener"
-msgstr "شونده صوتی"
+msgstr "شنونده صوت"
 
 msgid "Enable 2D"
 msgstr "به‌کاراندازی دوبعدی"
@@ -3820,9 +3841,6 @@ msgstr "مه گنجایشی"
 msgid "Brightness"
 msgstr "روشنایی"
 
-msgid "Contrast"
-msgstr "تضاد"
-
 msgid "Saturation"
 msgstr "سیری"
 
diff --git a/engine/editor/translations/properties/fr.po b/engine/editor/translations/properties/fr.po
index 8aed68ae..4356fdc0 100644
--- a/engine/editor/translations/properties/fr.po
+++ b/engine/editor/translations/properties/fr.po
@@ -1043,6 +1043,9 @@ msgstr "Mettre en veille le mode processeur faible (µsec)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Mettre en veille le mode processeur faible quand inactif (µsec)"
 
+msgid "V-Sync Mode"
+msgstr "Mode V-Sync"
+
 msgid "Update Continuously"
 msgstr "Mise à jour continue"
 
@@ -1100,6 +1103,9 @@ msgstr "Thème"
 msgid "Icon and Font Color"
 msgstr "Couleur de police et d'icône"
 
+msgid "Contrast"
+msgstr "Contraste"
+
 msgid "Draw Extra Borders"
 msgstr "Dessiner bordures supplémentaires"
 
@@ -1262,6 +1268,9 @@ msgstr "Éditeur de texte"
 msgid "Line Spacing"
 msgstr "Espace entre les lignes"
 
+msgid "Color Theme"
+msgstr "Thème de couleurs"
+
 msgid "Appearance"
 msgstr "Apparence"
 
@@ -1766,9 +1775,6 @@ msgstr "Restaurer les shaders au chargement"
 msgid "Visual Editors"
 msgstr "Éditeurs visuels"
 
-msgid "Color Theme"
-msgstr "Thème de couleurs"
-
 msgid "Minimap Opacity"
 msgstr "Opacité de la mini-carte"
 
@@ -1796,9 +1802,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Placement de la fenêtre"
 
+msgid "Rect"
+msgstr "Rectangle"
+
 msgid "Rect Custom Position"
 msgstr "Position du Rect personnalisée"
 
+msgid "Screen"
+msgstr "Écran"
+
 msgid "Auto Save"
 msgstr "Sauvegarde auto"
 
@@ -1808,6 +1820,9 @@ msgstr "Enregistrer Avant d’Exécuter"
 msgid "Output"
 msgstr "Sortie"
 
+msgid "Font Size"
+msgstr "Taille de la Police"
+
 msgid "Always Clear Output on Play"
 msgstr "Toujours nettoyer la sortie au démarrage"
 
@@ -2814,9 +2829,6 @@ msgstr "Portable"
 msgid "Orientation"
 msgstr "Orientation"
 
-msgid "V-Sync Mode"
-msgstr "Mode V-Sync"
-
 msgid "Output Latency"
 msgstr "Latence de sortie"
 
@@ -3999,9 +4011,6 @@ msgstr "Fonctionnalités XR"
 msgid "XR Mode"
 msgstr "Mode XR"
 
-msgid "Screen"
-msgstr "Écran"
-
 msgid "Immersive Mode"
 msgstr "Mode immersif"
 
@@ -4566,9 +4575,6 @@ msgstr "Masque de zone"
 msgid "Copy Mode"
 msgstr "Mode copie"
 
-msgid "Rect"
-msgstr "Rectangle"
-
 msgid "Anchor Mode"
 msgstr "Mode ancre"
 
@@ -5696,9 +5702,6 @@ msgstr "Moduler le contour"
 msgid "Font"
 msgstr "Police"
 
-msgid "Font Size"
-msgstr "Taille de la Police"
-
 msgid "Horizontal Alignment"
 msgstr "Alignement horizontal"
 
@@ -8379,9 +8382,6 @@ msgstr "Ajustements"
 msgid "Brightness"
 msgstr "Luminosité"
 
-msgid "Contrast"
-msgstr "Contraste"
-
 msgid "Saturation"
 msgstr "Saturation"
 
diff --git a/engine/editor/translations/properties/ga.po b/engine/editor/translations/properties/ga.po
index 641097d8..1ee8ec9b 100644
--- a/engine/editor/translations/properties/ga.po
+++ b/engine/editor/translations/properties/ga.po
@@ -958,6 +958,9 @@ msgstr "Codladh Mód Próiseálaí Íseal (μsec)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Codladh Mód Próiseálaí Íseal Neamhdhírithe (μsec)"
 
+msgid "V-Sync Mode"
+msgstr "Mód V- Sync"
+
 msgid "Update Continuously"
 msgstr "Nuashonraigh go leanúnach"
 
@@ -1018,6 +1021,9 @@ msgstr "Téama"
 msgid "Icon and Font Color"
 msgstr "Deilbhín agus Dath an Chló"
 
+msgid "Contrast"
+msgstr "Codarsnacht"
+
 msgid "Draw Extra Borders"
 msgstr "Tarraing Teorainneacha Breise"
 
@@ -1204,6 +1210,9 @@ msgstr "Eagarthóir Téacs"
 msgid "Line Spacing"
 msgstr "Spásáil Líne"
 
+msgid "Color Theme"
+msgstr "Téama Datha"
+
 msgid "Appearance"
 msgstr "Dealramh"
 
@@ -1738,9 +1747,6 @@ msgstr "Athchóirigh Shaders ar Luchtaigh"
 msgid "Visual Editors"
 msgstr "Eagarthóirí Amhairc"
 
-msgid "Color Theme"
-msgstr "Téama Datha"
-
 msgid "Minimap Opacity"
 msgstr "Teimhneacht Minimap"
 
@@ -1768,9 +1774,15 @@ msgstr "SCPName"
 msgid "Window Placement"
 msgstr "Socrúchán Fuinneoige"
 
+msgid "Rect"
+msgstr "RectName"
+
 msgid "Rect Custom Position"
 msgstr "Suíomh Saincheaptha Rect"
 
+msgid "Screen"
+msgstr "Scáileán"
+
 msgid "Auto Save"
 msgstr "Sábháil Go hUathoibríoch"
 
@@ -1780,6 +1792,9 @@ msgstr "Sábháil Roimh Rith"
 msgid "Output"
 msgstr "Aschur"
 
+msgid "Font Size"
+msgstr "Clómhéid"
+
 msgid "Always Clear Output on Play"
 msgstr "Glan aschur i gcónaí ar an súgradh"
 
@@ -1804,6 +1819,9 @@ msgstr "Óstríomhaire"
 msgid "Editor TLS Certificates"
 msgstr "Teastais TLS Eagarthóra"
 
+msgid "Enable TLS V 1"
+msgstr "Cumasaigh TLS V 1"
+
 msgid "Remote Host"
 msgstr "Cianóstach"
 
@@ -2831,9 +2849,6 @@ msgstr "Ríomhaire Boise"
 msgid "Orientation"
 msgstr "Treoshuíomh"
 
-msgid "V-Sync Mode"
-msgstr "Mód V- Sync"
-
 msgid "Output Latency"
 msgstr "Latency Aschuir"
 
@@ -3791,9 +3806,6 @@ msgstr "Dífuaimiú"
 msgid "Denoiser"
 msgstr "DenoiserName"
 
-msgid "Enable TLS V 1"
-msgstr "Cumasaigh TLS V 1"
-
 msgid "BPM"
 msgstr "BPM"
 
@@ -4277,9 +4289,6 @@ msgstr "Gothaí"
 msgid "Swipe to Dismiss"
 msgstr "Svaidhpeáil chun é a dhífhostú"
 
-msgid "Screen"
-msgstr "Scáileán"
-
 msgid "Immersive Mode"
 msgstr "Mód tumtha"
 
@@ -4916,9 +4925,6 @@ msgstr "Cineál Athsheinm"
 msgid "Copy Mode"
 msgstr "Mód Cóipeála"
 
-msgid "Rect"
-msgstr "RectName"
-
 msgid "Anchor Mode"
 msgstr "Mód Ancaire"
 
@@ -6082,9 +6088,6 @@ msgstr "Mionathrú Imlíneach"
 msgid "Font"
 msgstr "Cló"
 
-msgid "Font Size"
-msgstr "Clómhéid"
-
 msgid "Horizontal Alignment"
 msgstr "Ailíniú Cothrománach"
 
@@ -9083,9 +9086,6 @@ msgstr "Coigeartuithe"
 msgid "Brightness"
 msgstr "Gile"
 
-msgid "Contrast"
-msgstr "Codarsnacht"
-
 msgid "Saturation"
 msgstr "Sáithiú"
 
diff --git a/engine/editor/translations/properties/id.po b/engine/editor/translations/properties/id.po
index 798daf87..13f92999 100644
--- a/engine/editor/translations/properties/id.po
+++ b/engine/editor/translations/properties/id.po
@@ -909,6 +909,9 @@ msgstr "Tampilkan Pembaruan Spinner"
 msgid "Low Processor Mode Sleep (µsec)"
 msgstr "Mode Tidur Prosesor Rendah (µdetik)"
 
+msgid "V-Sync Mode"
+msgstr "Mode V-Sync"
+
 msgid "Update Continuously"
 msgstr "Perbarui Terus-menerus"
 
@@ -966,6 +969,9 @@ msgstr "Tema"
 msgid "Icon and Font Color"
 msgstr "Ikon dan Warna Font"
 
+msgid "Contrast"
+msgstr "Kontras"
+
 msgid "Draw Extra Borders"
 msgstr "Gambar Batas Ekstra"
 
@@ -1107,6 +1113,9 @@ msgstr "Editor Teks"
 msgid "Line Spacing"
 msgstr "Jarak Baris"
 
+msgid "Color Theme"
+msgstr "Tema Warna"
+
 msgid "Appearance"
 msgstr "Penampilan"
 
@@ -1563,9 +1572,6 @@ msgstr "Pulihkan Shaders saat Dimuat"
 msgid "Visual Editors"
 msgstr "Editor Visual"
 
-msgid "Color Theme"
-msgstr "Tema Warna"
-
 msgid "Minimap Opacity"
 msgstr "Kegelapan Peta kecil"
 
@@ -1590,9 +1596,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Penempatan Jendela"
 
+msgid "Rect"
+msgstr "Kotak"
+
 msgid "Rect Custom Position"
 msgstr "Posisi Kotak Kustom"
 
+msgid "Screen"
+msgstr "Layar"
+
 msgid "Auto Save"
 msgstr "Simpan Otomatis"
 
@@ -1602,6 +1614,9 @@ msgstr "Simpan Sebelum Menjalankan"
 msgid "Output"
 msgstr "Luaran"
 
+msgid "Font Size"
+msgstr "Ukuran Fonta"
+
 msgid "Always Clear Output on Play"
 msgstr "Selalu Bersihkan Luaran Ketika Bermain"
 
@@ -2433,9 +2448,6 @@ msgstr "Genggam"
 msgid "Orientation"
 msgstr "Orientasi"
 
-msgid "V-Sync Mode"
-msgstr "Mode V-Sync"
-
 msgid "Output Latency"
 msgstr "Latensi Keluaran"
 
@@ -3387,9 +3399,6 @@ msgstr "Fitur XR"
 msgid "XR Mode"
 msgstr "Mode XR"
 
-msgid "Screen"
-msgstr "Layar"
-
 msgid "Immersive Mode"
 msgstr "Mode Imersif"
 
@@ -3930,9 +3939,6 @@ msgstr "Mask Area"
 msgid "Copy Mode"
 msgstr "Mode Salin"
 
-msgid "Rect"
-msgstr "Kotak"
-
 msgid "Anchor Mode"
 msgstr "Mode Jangkar"
 
@@ -5010,9 +5016,6 @@ msgstr "Modulasi Garis Besar"
 msgid "Font"
 msgstr "Font"
 
-msgid "Font Size"
-msgstr "Ukuran Fonta"
-
 msgid "Horizontal Alignment"
 msgstr "Penjajaran Horisontal"
 
@@ -7542,9 +7545,6 @@ msgstr "Penyesuaian"
 msgid "Brightness"
 msgstr "Kecerahan"
 
-msgid "Contrast"
-msgstr "Kontras"
-
 msgid "Saturation"
 msgstr "Ketepatan Warna"
 
diff --git a/engine/editor/translations/properties/it.po b/engine/editor/translations/properties/it.po
index 75effa2c..8d04ee30 100644
--- a/engine/editor/translations/properties/it.po
+++ b/engine/editor/translations/properties/it.po
@@ -90,12 +90,13 @@
 # Stefano siser <stefano.siser@gmail.com>, 2024.
 # Dark Space <darkspace.lvcnr@gmail.com>, 2024.
 # SG <s.gallerini@users.noreply.hosted.weblate.org>, 2025.
+# Gabriele Ellena <kitzugaming2001@proton.me>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-24 16:25+0000\n"
+"PO-Revision-Date: 2025-03-11 12:06+0000\n"
 "Last-Translator: Micky <micheledevita2@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/it/>\n"
@@ -104,7 +105,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Application"
 msgstr "Applicazione"
@@ -208,6 +209,9 @@ msgstr "Estendi a titolo"
 msgid "No Focus"
 msgstr "Senza focus"
 
+msgid "Sharp Corners"
+msgstr "Bordi netti"
+
 msgid "Window Width Override"
 msgstr "Sovrascrivi larghezza della finestra"
 
@@ -271,9 +275,18 @@ msgstr "Sottofinestre"
 msgid "Embed Subwindows"
 msgstr "Incorpora sottofinestre"
 
+msgid "Frame Pacing"
+msgstr "Andamento dei frame"
+
 msgid "Android"
 msgstr "Android"
 
+msgid "Enable Frame Pacing"
+msgstr "Abilita andamento dei frame"
+
+msgid "Swappy Mode"
+msgstr "Modalità di Swappy"
+
 msgid "Physics"
 msgstr "Fisica"
 
@@ -344,7 +357,7 @@ msgid "Rendering"
 msgstr "Renderer"
 
 msgid "Occlusion Culling"
-msgstr "Determinazione della superficie nascosta"
+msgstr "Occlusion Culling"
 
 msgid "BVH Build Quality"
 msgstr "Qualità compilazione BVH"
@@ -356,7 +369,7 @@ msgid "Internationalization"
 msgstr "Lingue"
 
 msgid "Force Right to Left Layout Direction"
-msgstr "Forza la direzione dei caratteri da destra a sinistra"
+msgstr "Forza la direzione del layout da destra a sinistra"
 
 msgid "Root Node Layout Direction"
 msgstr "Direzione del layout del nodo radice"
@@ -371,7 +384,7 @@ msgid "Timers"
 msgstr "Temporizzazione"
 
 msgid "Incremental Search Max Interval Msec"
-msgstr "Intervallo massimo di ricerca incrementale (ms)"
+msgstr "Intervallo massimo della ricerca incrementale (ms)"
 
 msgid "Tooltip Delay (sec)"
 msgstr "Ritardo dei tooltip (secondi)"
@@ -383,10 +396,10 @@ msgid "Snap Controls to Pixels"
 msgstr "Scatta i nodi Control ai pixel"
 
 msgid "Fonts"
-msgstr "Caratteri"
+msgstr "Font"
 
 msgid "Dynamic Fonts"
-msgstr "Caratteri dinamici"
+msgstr "Font dinamici"
 
 msgid "Use Oversampling"
 msgstr "Usa sovracampionamento"
@@ -487,6 +500,9 @@ msgstr "Smussatura delta"
 msgid "Print Error Messages"
 msgstr "Messaggi di Errore di Stampa"
 
+msgid "Print to stdout"
+msgstr "Stampa su stdout"
+
 msgid "Physics Ticks per Second"
 msgstr "Tick di fisica al secondo"
 
@@ -520,11 +536,20 @@ msgstr "Compatibilità"
 msgid "Legacy Just Pressed Behavior"
 msgstr "Comportamento tradizionale di \"just pressed\""
 
+msgid "Sensors"
+msgstr "Sensori"
+
 msgid "Enable Accelerometer"
-msgstr "Abilita Accelerometro"
+msgstr "Abilita accelerometro"
+
+msgid "Enable Gravity"
+msgstr "Abilita gravità"
+
+msgid "Enable Gyroscope"
+msgstr "Abilita giroscopio"
 
 msgid "Enable Magnetometer"
-msgstr "Abilita Magnetometro"
+msgstr "Abilita magnetometro"
 
 msgid "Device"
 msgstr "Dispositivo"
@@ -868,6 +893,12 @@ msgstr "Etichetta"
 msgid "Read Only"
 msgstr "Sola Lettura"
 
+msgid "Draw Label"
+msgstr "Disegna etichetta"
+
+msgid "Draw Background"
+msgstr "Disegna sfondo"
+
 msgid "Checkable"
 msgstr "Spuntabile"
 
@@ -886,6 +917,12 @@ msgstr "Eliminabile"
 msgid "Selectable"
 msgstr "Selezionabile"
 
+msgid "Use Folding"
+msgstr "Usa chiusura"
+
+msgid "Name Split Ratio"
+msgstr "Rapporto di divisione del nome"
+
 msgid "Distraction Free Mode"
 msgstr "Modalità senza distrazioni"
 
@@ -958,6 +995,9 @@ msgstr "Posizionamento sotto-pixel dei font"
 msgid "Font Disable Embedded Bitmaps"
 msgstr "Disattiva le bitmap incorporate dei font"
 
+msgid "Font Allow MSDF"
+msgstr "Abilita MSDF per il font"
+
 msgid "Main Font"
 msgstr "Font principale"
 
@@ -991,6 +1031,9 @@ msgstr "Mostra errori interni in notifiche toast"
 msgid "Show Update Spinner"
 msgstr "Mostra la rotella di aggiornamento"
 
+msgid "V-Sync Mode"
+msgstr "Modalità della sincronizzazione verticale"
+
 msgid "Update Continuously"
 msgstr "Aggiorna continuamente"
 
@@ -1006,6 +1049,9 @@ msgstr "Pannelli"
 msgid "Scene Tree"
 msgstr "Albero di scene"
 
+msgid "Ask Before Revoking Unique Name"
+msgstr "Chiedi prima di revocare un nome univoco"
+
 msgid "Inspector"
 msgstr "Ispettore"
 
@@ -1042,6 +1088,9 @@ msgstr "Tema"
 msgid "Icon and Font Color"
 msgstr "Colore d'icone e font"
 
+msgid "Contrast"
+msgstr "Contrasto"
+
 msgid "Draw Extra Borders"
 msgstr "Disegna bordi aggiuntivi"
 
@@ -1138,9 +1187,27 @@ msgstr "Modalità di visualizzazione"
 msgid "Thumbnail Size"
 msgstr "Dimensione della miniatura"
 
+msgid "Quick Open Dialog"
+msgstr "Finestra di dialogo di apertura rapida"
+
 msgid "Max Results"
 msgstr "Risultati massimi"
 
+msgid "Show Search Highlight"
+msgstr "Evidenzia caratteri nella ricerca"
+
+msgid "Enable Fuzzy Matching"
+msgstr "Abilita ricerca approssimata"
+
+msgid "Max Fuzzy Misses"
+msgstr "Margine di errore per la ricerca approssimata"
+
+msgid "Include Addons"
+msgstr "Includi componenti aggiuntivi"
+
+msgid "Default Display Mode"
+msgstr "Modalità predefinita di visualizzazione"
+
 msgid "Import"
 msgstr "Importazione"
 
@@ -1183,12 +1250,18 @@ msgstr "Espandi automaticamente alla selezione"
 msgid "Center Node on Reparent"
 msgstr "Centra nodo al cambio di genitore"
 
+msgid "Hide Filtered Out Parents"
+msgstr "Nascondi genitori filtrati"
+
 msgid "Always Show Folders"
 msgstr "Mostra sempre cartelle"
 
 msgid "TextFile Extensions"
 msgstr "Estensioni di file di testo"
 
+msgid "Other File Extensions"
+msgstr "Altre estensioni di file"
+
 msgid "Property Editor"
 msgstr "Editor di proprietà"
 
@@ -1204,6 +1277,9 @@ msgstr "Editor di testo"
 msgid "Line Spacing"
 msgstr "Spaziatura righe"
 
+msgid "Color Theme"
+msgstr "Tema dei colori"
+
 msgid "Appearance"
 msgstr "Aspetto"
 
@@ -1279,6 +1355,9 @@ msgstr "Disegna spazi"
 msgid "Behavior"
 msgstr "Comportamento"
 
+msgid "Empty Selection Clipboard"
+msgstr "Appunti con selezione vuota"
+
 msgid "Navigation"
 msgstr "Navigazione"
 
@@ -1352,7 +1431,7 @@ msgid "Documentation"
 msgstr "Documentazione"
 
 msgid "Enable Tooltips"
-msgstr "Abilita Tooltips"
+msgstr "Abilita i tooltip"
 
 msgid "Script List"
 msgstr "Elenco degli script"
@@ -1370,10 +1449,10 @@ msgid "Script Temperature History Size"
 msgstr "Dimensione cronologia della temperatura degli script"
 
 msgid "Highlight Scene Scripts"
-msgstr "Evidenzia Script della scena"
+msgstr "Evidenzia script della scena"
 
 msgid "Group Help Pages"
-msgstr "Raggruppa Pagine della Guida"
+msgstr "Raggruppa pagine della guida"
 
 msgid "Sort Scripts By"
 msgstr "Ordina script per"
@@ -1396,6 +1475,9 @@ msgstr "Completamento"
 msgid "Idle Parse Delay"
 msgstr "Ritardo di analisi dopo inattività"
 
+msgid "Idle Parse Delay With Errors Found"
+msgstr "Ritardo di analisi dopo inattività con errori individuati"
+
 msgid "Auto Brace Complete"
 msgstr "Completa parentesi automaticamente"
 
@@ -1522,6 +1604,18 @@ msgstr "Osso selezionato"
 msgid "CSG"
 msgstr "CSG"
 
+msgid "GridMap Grid"
+msgstr "Griglia della Gridmap"
+
+msgid "Spring Bone Joint"
+msgstr "Articolazione delle ossa molla"
+
+msgid "Spring Bone Collision"
+msgstr "Collisione delle ossa molla"
+
+msgid "Spring Bone Inside Collision"
+msgstr "Collisione interna delle ossa molla"
+
 msgid "Gizmo Settings"
 msgstr "Impostazioni gizmo"
 
@@ -1570,6 +1664,9 @@ msgstr "Preferenze di navigazione"
 msgid "Orbit Sensitivity"
 msgstr "Sensitività di orbita"
 
+msgid "Translation Sensitivity"
+msgstr "Sensitività di traslazione"
+
 msgid "Orbit Inertia"
 msgstr "Inerzia di orbita"
 
@@ -1702,9 +1799,6 @@ msgstr "Ripristina gli shader al caricamento"
 msgid "Visual Editors"
 msgstr "Editor visuali"
 
-msgid "Color Theme"
-msgstr "Tema dei colori"
-
 msgid "Minimap Opacity"
 msgstr "Opacità minimappa"
 
@@ -1732,9 +1826,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Posizione della finestra"
 
+msgid "Rect"
+msgstr "Rettangolo"
+
 msgid "Rect Custom Position"
 msgstr "Posizione personalizzata del rettangolo"
 
+msgid "Screen"
+msgstr "Schermo"
+
 msgid "Auto Save"
 msgstr "Salvataggio automatico"
 
@@ -1744,6 +1844,9 @@ msgstr "Salva prima di eseguire"
 msgid "Output"
 msgstr "Output"
 
+msgid "Font Size"
+msgstr "Dimensione del font"
+
 msgid "Always Clear Output on Play"
 msgstr "Svuota sempre l'output all'esecuzione"
 
@@ -1768,6 +1871,9 @@ msgstr "Host"
 msgid "Editor TLS Certificates"
 msgstr "Certificati TLS dell'editor"
 
+msgid "Enable TLS V 1"
+msgstr "Abilita TLS V 1"
+
 msgid "Remote Host"
 msgstr "Host remoto"
 
@@ -1780,6 +1886,9 @@ msgstr "Dimensione cronologia di fotogrammi del profiler"
 msgid "Profiler Frame Max Functions"
 msgstr "Massimo di funzioni per fotogramma del profiler"
 
+msgid "Profiler Target FPS"
+msgstr "FPS di destinazione del profiler"
+
 msgid "Remote Scene Tree Refresh Interval"
 msgstr "Intervallo di aggiornamento dell'albero di scene remoto"
 
@@ -2066,9 +2175,15 @@ msgstr "Normalizza Tracce di Posizione"
 msgid "Reset All Bone Poses After Import"
 msgstr "Ripristina tutte le pose delle ossa dopo il reimporto"
 
+msgid "Retarget Method"
+msgstr "Metodo di reindirizzamento"
+
 msgid "Keep Global Rest on Leftovers"
 msgstr "Mantieni riposo globale sul resto"
 
+msgid "Use Global Pose"
+msgstr "Usa posa globale"
+
 msgid "Fix Silhouette"
 msgstr "Aggiusta Silhouette"
 
@@ -2099,6 +2214,15 @@ msgstr "Genera le tangenti"
 msgid "Generate LODs"
 msgstr "Genera LOD"
 
+msgid "Generate Shadow Mesh"
+msgstr "Genera mesh d'ombra"
+
+msgid "Generate Lightmap UV2"
+msgstr "Genera lightmap UV2"
+
+msgid "Generate Lightmap UV2 Texel Size"
+msgstr "Dimensioni dei texel generati della lightmap UV2"
+
 msgid "Scale Mesh"
 msgstr "Scala della mesh"
 
@@ -2300,6 +2424,9 @@ msgstr "Scala di radice"
 msgid "Import as Skeleton Bones"
 msgstr "Importa come ossa di scheletro"
 
+msgid "Use Node Type Suffixes"
+msgstr "Usa suffissi per i tipi dei nodi"
+
 msgid "Meshes"
 msgstr "Mesh"
 
@@ -2369,6 +2496,9 @@ msgstr "Hinting"
 msgid "Subpixel Positioning"
 msgstr "Posizionamento sotto-pixel"
 
+msgid "Keep Rounding Remainders"
+msgstr "Mantieni arrotondato il resto"
+
 msgid "Oversampling"
 msgstr "Sovracampionamento"
 
@@ -2565,6 +2695,9 @@ msgstr "Indice del gruppo attuale"
 msgid "Current Bone Idx"
 msgstr "Indice dell'osso attuale"
 
+msgid "Particles Emission Shape"
+msgstr "Forma d'emissione delle particelle"
+
 msgid "ID"
 msgstr "ID"
 
@@ -2664,6 +2797,9 @@ msgstr "stdout verboso"
 msgid "Physics Interpolation"
 msgstr "Interpolazione della fisica"
 
+msgid "Enable Warnings"
+msgstr "Abilita avvisi"
+
 msgid "Max Chars per Second"
 msgstr "Massimo di caratteri al secondo"
 
@@ -2742,9 +2878,6 @@ msgstr "Portatile"
 msgid "Orientation"
 msgstr "Orientazione"
 
-msgid "V-Sync Mode"
-msgstr "Modalità della sincronizzazione verticale"
-
 msgid "Output Latency"
 msgstr "Latenza d'uscita"
 
@@ -2799,6 +2932,12 @@ msgstr "Segnalazione d'inizio"
 msgid "Extensions"
 msgstr "Estensioni"
 
+msgid "Debug Utils"
+msgstr "Utilità di debug"
+
+msgid "Debug Message Types"
+msgstr "Tipi per i messaggi di debug"
+
 msgid "Hand Tracking"
 msgstr "Tracciamento delle mani"
 
@@ -2808,6 +2947,15 @@ msgstr "Profilo d'interazione delle mani"
 msgid "Eye Gaze Interaction"
 msgstr "Interazione con lo sguardo degli occhi"
 
+msgid "Binding Modifiers"
+msgstr "Modificatori delle associazioni"
+
+msgid "Analog Threshold"
+msgstr "Soglia analogica"
+
+msgid "Dpad Binding"
+msgstr "Associazione del d-pad"
+
 msgid "Boot Splash"
 msgstr "Immagine di avvio"
 
@@ -2970,6 +3118,27 @@ msgstr "Bordi collegati"
 msgid "Edges Free"
 msgstr "Bordi liberi"
 
+msgid "Obstacles"
+msgstr "Ostacoli"
+
+msgid "Pipeline"
+msgstr "Pipeline"
+
+msgid "Compilations Canvas"
+msgstr "Compilazioni di canvas"
+
+msgid "Compilations Mesh"
+msgstr "Compilazioni di mesh"
+
+msgid "Compilations Surface"
+msgstr "Compilazioni di superficie"
+
+msgid "Compilations Draw"
+msgstr "Compilazioni di disegno"
+
+msgid "Compilations Specialization"
+msgstr "Compilazioni specializzate"
+
 msgid "Operation"
 msgstr "Operazione"
 
@@ -3051,6 +3220,9 @@ msgstr "Angolo di semplificazione percorso"
 msgid "Path Rotation"
 msgstr "Rotazione percorso"
 
+msgid "Path Rotation Accurate"
+msgstr "Rotazione percorso accurata"
+
 msgid "Path Local"
 msgstr "Percorso locale"
 
@@ -3123,6 +3295,9 @@ msgstr "Limite dello stack delle chiamate"
 msgid "Exclude Addons"
 msgstr "Escludi componenti aggiuntivi"
 
+msgid "Renamed in Godot 4 Hint"
+msgstr "Rinominato in Godot 4 (suggerimento)"
+
 msgid "Language Server"
 msgstr "Server di lingua"
 
@@ -3235,7 +3410,7 @@ msgid "Buffers"
 msgstr "Buffer"
 
 msgid "Buffer Views"
-msgstr "Viste dei buffer"
+msgstr "Buffer view"
 
 msgid "Accessors"
 msgstr "Accessori"
@@ -3286,7 +3461,7 @@ msgid "Handle Binary Image"
 msgstr "Gestisci immagini binarie"
 
 msgid "Buffer View"
-msgstr "Vista buffer"
+msgstr "Buffer view"
 
 msgid "Byte Offset"
 msgstr "Offset byte"
@@ -3313,7 +3488,7 @@ msgid "Sparse Count"
 msgstr "Conteggio Sparso"
 
 msgid "Sparse Indices Buffer View"
-msgstr "Vista indici sparsi dei buffer"
+msgstr "Buffer view di indici sparsi"
 
 msgid "Sparse Indices Byte Offset"
 msgstr "Scostamento byte degli indici sparsi"
@@ -3322,7 +3497,7 @@ msgid "Sparse Indices Component Type"
 msgstr "Tipo di componente degli indici sparsi"
 
 msgid "Sparse Values Buffer View"
-msgstr "Vista buffer dei valori sparsi"
+msgstr "Buffer view di valori sparsi"
 
 msgid "Sparse Values Byte Offset"
 msgstr "Scostamento byte dei valori sparsi"
@@ -3381,6 +3556,24 @@ msgstr "Figli"
 msgid "Light"
 msgstr "Luce"
 
+msgid "glTF to Godot Expression"
+msgstr "Espressione da glTF a Godot"
+
+msgid "Godot to glTF Expression"
+msgstr "Espressione da Godot a glTF"
+
+msgid "Node Paths"
+msgstr "Percorsi dei nodi"
+
+msgid "Object Model Type"
+msgstr "Tipo di modello dell'oggetto"
+
+msgid "Json Pointers"
+msgstr "Puntatori Json"
+
+msgid "Variant Type"
+msgstr "Tipo di variante"
+
 msgid "Joints"
 msgstr "Articolazioni"
 
@@ -3456,6 +3649,108 @@ msgstr "Tempo di dissolvenza"
 msgid "Stream Count"
 msgstr "Conteggio flussi"
 
+msgid "Jolt Physics 3D"
+msgstr "Fisica Jolt 3D"
+
+msgid "Simulation"
+msgstr "Simulazione"
+
+msgid "Velocity Steps"
+msgstr "Passi di velocità"
+
+msgid "Position Steps"
+msgstr "Passi di posizione"
+
+msgid "Use Enhanced Internal Edge Removal"
+msgstr "Usa la rimozione avanzata dei bordi interni"
+
+msgid "Areas Detect Static Bodies"
+msgstr "Aree rilevano i corpi statici"
+
+msgid "Generate All Kinematic Contacts"
+msgstr "Genera tutti i contatti cinematici"
+
+msgid "Penetration Slop"
+msgstr "Pendenza di penetrazione"
+
+msgid "Speculative Contact Distance"
+msgstr "Distanza di contatto speculativo"
+
+msgid "Baumgarte Stabilization Factor"
+msgstr "Fattore di stabilizzazione Baumgarte"
+
+msgid "Soft Body Point Radius"
+msgstr "Raggio dei punti dei corpi morbidi"
+
+msgid "Bounce Velocity Threshold"
+msgstr "Soglia di velocità di rimbalzo"
+
+msgid "Allow Sleep"
+msgstr "Permetti il riposo"
+
+msgid "Sleep Velocity Threshold"
+msgstr "Soglia di velocità di riposo"
+
+msgid "Sleep Time Threshold"
+msgstr "Soglia di tempo di riposo"
+
+msgid "Continuous CD Movement Threshold"
+msgstr "Soglia di movimento per il rilevamento continuo delle collisioni"
+
+msgid "Continuous CD Max Penetration"
+msgstr "Penetrazione massima per il rilevamento continuo delle collisioni"
+
+msgid "Body Pair Contact Cache Enabled"
+msgstr "Abilita cache dei contatti tra paia di corpi"
+
+msgid "Body Pair Contact Cache Distance Threshold"
+msgstr "Soglia di distanza della cache dei contatti tra paia di corpi"
+
+msgid "Body Pair Contact Cache Angle Threshold"
+msgstr "Soglia angolare della cache dei contatti tra paia di corpi"
+
+msgid "Queries"
+msgstr "Richieste"
+
+msgid "Enable Ray Cast Face Index"
+msgstr "Abilita indici di facce per i raycast"
+
+msgid "Motion Queries"
+msgstr "Richieste di movimento"
+
+msgid "Recovery Iterations"
+msgstr "Iterazioni di recupero"
+
+msgid "Recovery Amount"
+msgstr "Quantità di recupero"
+
+msgid "Collisions"
+msgstr "Collisioni"
+
+msgid "Collision Margin Fraction"
+msgstr "Frazione del margine di collisione"
+
+msgid "Active Edge Threshold"
+msgstr "Soglia del bordo attivo"
+
+msgid "World Node"
+msgstr "Nodo del mondo"
+
+msgid "World Boundary Shape Size"
+msgstr "Dimensione della forme di confine del mondo"
+
+msgid "Max Linear Velocity"
+msgstr "Velocità lineare massima"
+
+msgid "Max Angular Velocity"
+msgstr "Velocità angolare massima"
+
+msgid "Max Body Pairs"
+msgstr "Paia di corpi massime"
+
+msgid "Max Contact Constraints"
+msgstr "Restrizioni di contatto massime"
+
 msgid "Lightmapping"
 msgstr "Mappatura di luce"
 
@@ -3483,6 +3778,9 @@ msgstr "Massimo di raggi per passo"
 msgid "Region Size"
 msgstr "Dimensioni regione"
 
+msgid "Max Transparency Rays"
+msgstr "Raggi di trasparenza massimi"
+
 msgid "Low Quality Probe Ray Count"
 msgstr "Numero di raggi da sonda a qualità bassa"
 
@@ -3675,18 +3973,57 @@ msgstr "Tipo d'azione"
 msgid "Toplevel Paths"
 msgstr "Percorsi di livello superiore"
 
+msgid "Binding Path"
+msgstr "Percorso dell'associazione"
+
 msgid "Interaction Profile Path"
-msgstr "Percorso di profilo d'interazione"
+msgstr "Percorso del profilo d'interazione"
 
 msgid "Runtime Paths"
 msgstr "Percorsi d'esecuzione"
 
+msgid "Action Set"
+msgstr "Insieme di azioni"
+
+msgid "Input Path"
+msgstr "Percorso dell'input"
+
+msgid "Threshold Released"
+msgstr "Soglia di rilascio"
+
+msgid "Center Region"
+msgstr "Regione centrale"
+
+msgid "Wedge Angle"
+msgstr "Angolo degli spicchi"
+
+msgid "Is Sticky"
+msgstr "È appiccicoso"
+
+msgid "On Haptic"
+msgstr "Tattile all'attivazione"
+
+msgid "Off Haptic"
+msgstr "Tattile alla disattivazione"
+
+msgid "On Threshold"
+msgstr "Soglia di attivazione"
+
+msgid "Off Threshold"
+msgstr "Soglia di disattivazione"
+
 msgid "Display Refresh Rate"
 msgstr "Frequenza di aggiornamento del display"
 
 msgid "Render Target Size Multiplier"
 msgstr "Moltiplicatore delle dimensioni finali di renderizzazione"
 
+msgid "Use Android Surface"
+msgstr "Usa superficie Android"
+
+msgid "Android Surface Size"
+msgstr "Dimensioni superficie Android"
+
 msgid "Sort Order"
 msgstr "Tipo di ordinamento"
 
@@ -3792,6 +4129,9 @@ msgstr "Timeout di handshake"
 msgid "Max Queued Packets"
 msgstr "Pacchetti in attesa massimi"
 
+msgid "Heartbeat Interval"
+msgstr "Intervallo di ping"
+
 msgid "Session Mode"
 msgstr "Modalità di sessione"
 
@@ -3835,10 +4175,13 @@ msgid "Main 192 X 192"
 msgstr "Principale 192 X 192"
 
 msgid "Adaptive Foreground 432 X 432"
-msgstr "Primo piano adattivo 432 X 432"
+msgstr "Primo piano adattivo (432×432)"
 
 msgid "Adaptive Background 432 X 432"
-msgstr "Sfondo adattivo 432 X 432"
+msgstr "Sfondo adattivo (432×432)"
+
+msgid "Adaptive Monochrome 432 X 432"
+msgstr "Adattivo monocromatico (432×432)"
 
 msgid "Gradle Build"
 msgstr "Build Gradle"
@@ -3924,8 +4267,11 @@ msgstr "Funzionalità XR"
 msgid "XR Mode"
 msgstr "Modalità XR"
 
-msgid "Screen"
-msgstr "Schermo"
+msgid "Gesture"
+msgstr "Gesti"
+
+msgid "Swipe to Dismiss"
+msgstr "Scorri per ignorare"
 
 msgid "Immersive Mode"
 msgstr "Modalità Immersiva"
@@ -3982,25 +4328,43 @@ msgid "Settings 87 X 87"
 msgstr "Impostazioni (87 x 87)"
 
 msgid "Notification 40 X 40"
-msgstr "Notifica (40 x 40)"
+msgstr "Notifica (40×40)"
 
 msgid "Notification 60 X 60"
-msgstr "Notifica (60 x 60)"
+msgstr "Notifica (60×60)"
+
+msgid "Notification 76 X 76"
+msgstr "Notifica (76×76)"
+
+msgid "Notification 114 X 114"
+msgstr "Notifica (114×114)"
 
 msgid "Spotlight 80 X 80"
-msgstr "Spotlight (80 x 80)"
+msgstr "Spotlight (80×80)"
+
+msgid "Spotlight 120 X 120"
+msgstr "Spotlight (120×120)"
 
 msgid "iPhone 120 X 120"
-msgstr "iPhone (120 x 120)"
+msgstr "iPhone (120×120)"
 
 msgid "iPhone 180 X 180"
-msgstr "iPhone (180 x 180)"
+msgstr "iPhone (180×180)"
 
 msgid "iPad 167 X 167"
-msgstr "iPad (167 x 167)"
+msgstr "iPad (167×167)"
 
 msgid "iPad 152 X 152"
-msgstr "iPad (152 x 152)"
+msgstr "iPad (152×152)"
+
+msgid "iOS 128 X 128"
+msgstr "iOS (128×128)"
+
+msgid "iOS 192 X 192"
+msgstr "iOS (192×192)"
+
+msgid "iOS 136 X 136"
+msgstr "iOS (136×136)"
 
 msgid "App Store 1024 X 1024"
 msgstr "App Store (1024 x 1024)"
@@ -4018,10 +4382,16 @@ msgid "Code Sign Identity Release"
 msgstr "Identità firma del codice Release"
 
 msgid "Provisioning Profile UUID Debug"
-msgstr "Profilo di provisioning UUID Debug"
+msgstr "UUID del profilo di provisioning (debug)"
 
 msgid "Provisioning Profile UUID Release"
-msgstr "Profilo di provisioning UUID Release"
+msgstr "UUID del profilo di provisioning (rilascio)"
+
+msgid "Provisioning Profile Specifier Debug"
+msgstr "Identificatore del profilo di provisioning (debug)"
+
+msgid "Provisioning Profile Specifier Release"
+msgstr "Identificatore del profilo di provisioning (rilascio)"
 
 msgid "Export Method Release"
 msgstr "Metodo di Esportazione Rilascio"
@@ -4056,9 +4426,18 @@ msgstr "Elimina i file esportati in precedenza senza condizioni"
 msgid "Entitlements"
 msgstr "Diritti"
 
+msgid "Increased Memory Limit"
+msgstr "Aumenta limite di memoria"
+
+msgid "Game Center"
+msgstr "Game Center"
+
 msgid "Push Notifications"
 msgstr "Notifiche push"
 
+msgid "Additional"
+msgstr "Addizionali"
+
 msgid "Capabilities"
 msgstr "Funzionalità"
 
@@ -4107,6 +4486,15 @@ msgstr "Abilita tracciamento"
 msgid "Tracking Domains"
 msgstr "Tracciamento di domini"
 
+msgid "Icon 1024 X 1024"
+msgstr "Icona 1024×1024"
+
+msgid "Icon 1024 X 1024 Dark"
+msgstr "Icona 1024×1024 (scura)"
+
+msgid "Icon 1024 X 1024 Tinted"
+msgstr "Icona 1024×1024 (tinta)"
+
 msgid "Storyboard"
 msgstr "Storyboard"
 
@@ -4149,6 +4537,12 @@ msgstr "Tipo di distribuzione"
 msgid "Copyright Localized"
 msgstr "Copyright localizzato"
 
+msgid "Min macOS Version x86 64"
+msgstr "Versione minima di macOS (x86-64)"
+
+msgid "Min macOS Version arm64"
+msgstr "Versione minima di macOS (arm64)"
+
 msgid "Export Angle"
 msgstr "Esporta Angle"
 
@@ -4515,9 +4909,6 @@ msgstr "Tipo di riproduzione"
 msgid "Copy Mode"
 msgstr "Modo di copia"
 
-msgid "Rect"
-msgstr "Rettangolo"
-
 msgid "Anchor Mode"
 msgstr "Modalità ancora"
 
@@ -4611,6 +5002,9 @@ msgstr "Esplosività"
 msgid "Randomness"
 msgstr "Casualità"
 
+msgid "Use Fixed Seed"
+msgstr "Usa seme fisso"
+
 msgid "Lifetime Randomness"
 msgstr "Casualità del tempo di vita"
 
@@ -5380,6 +5774,9 @@ msgstr "Modalità visibilità di collisioni"
 msgid "Navigation Visibility Mode"
 msgstr "Modalità visibilità di navigazione"
 
+msgid "Occlusion Enabled"
+msgstr "Occlusione abilitata"
+
 msgid "Y Sort Origin"
 msgstr "Origine di ordinamento per Y"
 
@@ -5506,6 +5903,9 @@ msgstr "Raggio dell'anello"
 msgid "Ring Inner Radius"
 msgstr "Raggio interno dell'anello"
 
+msgid "Ring Cone Angle"
+msgstr "Angolo del cono dell'anello"
+
 msgid "Rotate Y"
 msgstr "Ruota asse Y"
 
@@ -5654,9 +6054,6 @@ msgstr "Modula contorno"
 msgid "Font"
 msgstr "Font"
 
-msgid "Font Size"
-msgstr "Dimensione del font"
-
 msgid "Horizontal Alignment"
 msgstr "Allineamento orizzontale"
 
@@ -5759,9 +6156,21 @@ msgstr "Spot"
 msgid "Angle Attenuation"
 msgstr "Attenuazione d'angolo"
 
+msgid "Lightmap Textures"
+msgstr "Texture della lightmap"
+
+msgid "Shadowmask Textures"
+msgstr "Texture della shadowmask"
+
 msgid "Quality"
 msgstr "Qualità"
 
+msgid "Supersampling"
+msgstr "Sovracampionamento"
+
+msgid "Supersampling Factor"
+msgstr "Fattore di sovracampionamento"
+
 msgid "Bounces"
 msgstr "Rimbalzi"
 
@@ -5771,6 +6180,9 @@ msgstr "Energia indiretta di rimbalzo"
 msgid "Directional"
 msgstr "Direzionale"
 
+msgid "Shadowmask Mode"
+msgstr "Modalità della shadowmask"
+
 msgid "Use Texture for Bounces"
 msgstr "Usa texture per i rimbalzi"
 
@@ -5807,12 +6219,42 @@ msgstr "Dati di luce"
 msgid "Target Node"
 msgstr "Nodo obiettivo"
 
+msgid "Forward Axis"
+msgstr "Asse in avanti"
+
+msgid "Primary Rotation Axis"
+msgstr "Asse di rotazione primaria"
+
 msgid "Use Secondary Rotation"
-msgstr "Usa Rotazione Secondaria"
+msgstr "Usa rotazione secondaria"
+
+msgid "Origin Settings"
+msgstr "Impostazioni dell'origine"
 
 msgid "From"
 msgstr "Da"
 
+msgid "External Node"
+msgstr "Nodo esterno"
+
+msgid "Time Based Interpolation"
+msgstr "Interpolazione basata sul tempo"
+
+msgid "Transition Type"
+msgstr "Tipo di transizione"
+
+msgid "Ease Type"
+msgstr "Tipo di agevolazione"
+
+msgid "Angle Limitation"
+msgstr "Limitazione angolare"
+
+msgid "Use Angle Limitation"
+msgstr "Usa limitazione angolare"
+
+msgid "Symmetry Limitation"
+msgstr "Limitazione simmetrica"
+
 msgid "Surface Material Override"
 msgstr "Materiale sostitutivi di superfici"
 
@@ -5888,6 +6330,9 @@ msgstr "Selezionabile per i raggi"
 msgid "Capture on Drag"
 msgstr "Cattura al trascinamento"
 
+msgid "Debug Fill"
+msgstr "Riempimento di debug"
+
 msgid "Swing Span"
 msgstr "Arco di oscillazione"
 
@@ -6131,6 +6576,9 @@ msgstr "Spostamento"
 msgid "Max Force"
 msgstr "Forza massima"
 
+msgid "Blend Distance"
+msgstr "Distanza di fusione"
+
 msgid "Origin Offset"
 msgstr "Offset dell'origine"
 
@@ -6239,6 +6687,9 @@ msgstr "Coefficiente di resistenza"
 msgid "Position Offset"
 msgstr "Offset della posizione"
 
+msgid "Rotation Offset"
+msgstr "Offset della rotazione"
+
 msgid "Inside"
 msgstr "Dentro"
 
@@ -6278,6 +6729,9 @@ msgstr "Ignora l'Occlusion Culling"
 msgid "Global Illumination"
 msgstr "Illuminazione Globale"
 
+msgid "Lightmap Texel Scale"
+msgstr "Scala dei texel delle lightmap"
+
 msgid "Lightmap Scale"
 msgstr "Scala di lightmap"
 
@@ -6317,6 +6771,9 @@ msgstr "Scala del mondo"
 msgid "Play Mode"
 msgstr "Modalità riproduzione"
 
+msgid "Advance on Start"
+msgstr "Vai avanti all'avvio"
+
 msgid "Use Custom Timeline"
 msgstr "Utilizza una cronologia personalizzata"
 
@@ -6356,6 +6813,9 @@ msgstr "Ritardo"
 msgid "Random Delay"
 msgstr "Ritardo casuale"
 
+msgid "Explicit Elapse"
+msgstr "Passaggio esplicito"
+
 msgid "Allow Transition to Self"
 msgstr "Permetti transizione verso se stesso"
 
@@ -6407,6 +6867,9 @@ msgstr "Movimento della radice"
 msgid "Track"
 msgstr "Traccia"
 
+msgid "Local"
+msgstr "Locale"
+
 msgid "Callback Mode"
 msgstr "Modalità di callback"
 
@@ -6539,6 +7002,9 @@ msgstr "Usa in alto a sinistra"
 msgid "Symbol Lookup on Click"
 msgstr "Ricerca simboli al click"
 
+msgid "Symbol Tooltip on Hover"
+msgstr "Suggerisci simboli al passaggio del mouse"
+
 msgid "Line Folding"
 msgstr "Compressione righe"
 
@@ -6677,6 +7143,9 @@ msgstr "Localizza sistema numerico"
 msgid "Tooltip"
 msgstr "Tooltip"
 
+msgid "Auto Translate Mode"
+msgstr "Modo di traduzione automatica"
+
 msgid "Focus"
 msgstr "Focus"
 
@@ -6737,6 +7206,9 @@ msgstr "La modalità rimpiazza il titolo"
 msgid "Root Subfolder"
 msgstr "Sottocartella radice"
 
+msgid "Filename Filter"
+msgstr "Filtro del nome di file"
+
 msgid "Use Native Dialog"
 msgstr "Usa la finestra di dialogo nativa"
 
@@ -6767,6 +7239,9 @@ msgstr "Linee di connessione"
 msgid "Curvature"
 msgstr "Curvatura"
 
+msgid "Connections"
+msgstr "Connessioni"
+
 msgid "Zoom Min"
 msgstr "Zoom minimo"
 
@@ -6839,9 +7314,15 @@ msgstr "Permetti la ricerca"
 msgid "Max Text Lines"
 msgstr "Righe di testo massime"
 
+msgid "Auto Width"
+msgstr "Larghezza automatica"
+
 msgid "Auto Height"
 msgstr "Altezza automatica"
 
+msgid "Wraparound Items"
+msgstr "Avvolgi elementi"
+
 msgid "Items"
 msgstr "Elementi"
 
@@ -6866,6 +7347,9 @@ msgstr "Dimensioni fisse d'icona"
 msgid "Label Settings"
 msgstr "Impostazioni di etichetta"
 
+msgid "Paragraph Separator"
+msgstr "Separatore dei paragrafi"
+
 msgid "Ellipsis Char"
 msgstr "Carattere di elissi"
 
@@ -6896,12 +7380,18 @@ msgstr "Testo segnaposto"
 msgid "Max Length"
 msgstr "Lunghezza massima"
 
+msgid "Keep Editing on Text Submit"
+msgstr "Mantieni modifiche all'invio del testo"
+
 msgid "Expand to Text Length"
 msgstr "Espandi alla lunghezza del testo"
 
 msgid "Context Menu Enabled"
 msgstr "Abilita menù contestuale"
 
+msgid "Emoji Menu Enabled"
+msgstr "Abilita menù delle emoji"
+
 msgid "Virtual Keyboard Enabled"
 msgstr "Abilita tastiera virtuale"
 
@@ -7112,6 +7602,9 @@ msgstr "Passo personalizzato"
 msgid "Follow Focus"
 msgstr "Segui il focus"
 
+msgid "Draw Focus Border"
+msgstr "Modalità del focus del bordo"
+
 msgid "Horizontal Custom Step"
 msgstr "Passo orizzontale personalizzato"
 
@@ -7151,12 +7644,30 @@ msgstr "Offset suddivisioni"
 msgid "Collapsed"
 msgstr "Compresso"
 
+msgid "Dragging Enabled"
+msgstr "Abilita trascinamento"
+
 msgid "Dragger Visibility"
 msgstr "Visibilità del dragger"
 
+msgid "Drag Area"
+msgstr "Zona del dragger"
+
+msgid "Margin Begin"
+msgstr "Margine iniziale"
+
+msgid "Margin End"
+msgstr "Margine finale"
+
+msgid "Highlight in Editor"
+msgstr "Evidenzia nell'editor"
+
 msgid "Stretch Shrink"
 msgstr "Restringimento da allungamento"
 
+msgid "Mouse Target"
+msgstr "Destinazione del mouse"
+
 msgid "Current Tab"
 msgstr "Scheda attuale"
 
@@ -7208,6 +7719,9 @@ msgstr "Usa schede nascoste per la dimensione minima"
 msgid "Tab Focus Mode"
 msgstr "Modalità focus della scheda"
 
+msgid "Empty Selection Clipboard Enabled"
+msgstr "Abilita appunti con selezione vuota"
+
 msgid "Wrap Mode"
 msgstr "Modalità di avvolgimento"
 
@@ -7217,6 +7731,9 @@ msgstr "Scorri oltre la fine del file"
 msgid "Fit Content Height"
 msgstr "Aggiusta altezza per il contenuto"
 
+msgid "Fit Content Width"
+msgstr "Aggiusta larghezza per il contenuto"
+
 msgid "Draw"
 msgstr "Disegno"
 
@@ -7320,6 +7837,9 @@ msgstr "Scorrimento orizzontale abilitato"
 msgid "Scroll Vertical Enabled"
 msgstr "Scorrimento verticale abilitato"
 
+msgid "Auto Tooltip"
+msgstr "Tooltip automatico"
+
 msgid "Audio Track"
 msgstr "Traccia audio"
 
@@ -7542,6 +8062,9 @@ msgstr "Tempo di attesa"
 msgid "Autostart"
 msgstr "Riavvio automatico"
 
+msgid "Ignore Time Scale"
+msgstr "Ignora la scala del tempo"
+
 msgid "Viewport Path"
 msgstr "Percorso della viewport"
 
@@ -7683,6 +8206,9 @@ msgstr "Finestra popup"
 msgid "Mouse Passthrough"
 msgstr "Oltrepassaggio del mouse"
 
+msgid "Exclude From Capture"
+msgstr "Escludi dalla cattura"
+
 msgid "Force Native"
 msgstr "Forza nativa"
 
@@ -7960,7 +8486,10 @@ msgid "Item"
 msgstr "Elemento"
 
 msgid "Mesh Transform"
-msgstr "Trasformazione di mesh"
+msgstr "Trasformazione della mesh"
+
+msgid "Mesh Cast Shadow"
+msgstr "Proietta ombre per la mesh"
 
 msgid "Navigation Mesh Transform"
 msgstr "Trasformazione di mesh di navigazione"
@@ -8223,6 +8752,12 @@ msgstr "Effetti di composizione"
 msgid "Load Path"
 msgstr "Percorso di caricamento"
 
+msgid "Min Domain"
+msgstr "Dominio minimo"
+
+msgid "Max Domain"
+msgstr "Dominio massimo"
+
 msgid "Bake Resolution"
 msgstr "Risoluzione di precalcolo"
 
@@ -8436,9 +8971,6 @@ msgstr "Correzioni"
 msgid "Brightness"
 msgstr "Luminosità"
 
-msgid "Contrast"
-msgstr "Contrasto"
-
 msgid "Saturation"
 msgstr "Saturazione"
 
@@ -8493,6 +9025,9 @@ msgstr "Usa HDR"
 msgid "To"
 msgstr "A"
 
+msgid "Paragraph Spacing"
+msgstr "Spaziatura paragrafi"
+
 msgid "Next Pass"
 msgstr "Passo successivo"
 
@@ -8784,6 +9319,9 @@ msgstr "Raggio di anello d'emissione"
 msgid "Emission Ring Inner Radius"
 msgstr "Raggio interno di anello d'emissione"
 
+msgid "Emission Ring Cone Angle"
+msgstr "Angolo del cono di anello d'emissione"
+
 msgid "Inherit Velocity Ratio"
 msgstr "Ratio di velocità ereditata"
 
@@ -8856,6 +9394,9 @@ msgstr "Quantità alla fine"
 msgid "Amount at Collision"
 msgstr "Quantità alla collisione"
 
+msgid "Amount at Start"
+msgstr "Quantità all'inizio"
+
 msgid "Keep Velocity"
 msgstr "Mantieni velocità"
 
@@ -9009,6 +9550,9 @@ msgstr "Valore predefinito abilitato"
 msgid "Default Value"
 msgstr "Valore predefinito"
 
+msgid "Enum Names"
+msgstr "Nomi degli enumeratori"
+
 msgid "Color Default"
 msgstr "Colore predefinito"
 
@@ -9207,6 +9751,9 @@ msgstr "Regione di codice compressa"
 msgid "Folded EOL Icon"
 msgstr "Icona di fine riga compressa"
 
+msgid "Completion Color BG"
+msgstr "Colore di sfondo di completamento"
+
 msgid "Completion Lines"
 msgstr "Righe di completamento"
 
@@ -9276,6 +9823,24 @@ msgstr "Su"
 msgid "Down"
 msgstr "Giù"
 
+msgid "Field and Buttons Separator"
+msgstr "Separatore tra campo e pulsanti"
+
+msgid "Up Down Buttons Separator"
+msgstr "Separatore pulsanti su/giù"
+
+msgid "Buttons Vertical Separation"
+msgstr "Separazione verticale dei pulsanti"
+
+msgid "Field and Buttons Separation"
+msgstr "Separazione tra campo e pulsanti"
+
+msgid "Buttons Width"
+msgstr "Larghezza pulsanti"
+
+msgid "Set Min Buttons Width From Icons"
+msgstr "Imposta larghezza minima dei bottoni dalle icone"
+
 msgid "Embedded Border"
 msgstr "Bordo incorporato"
 
@@ -9318,6 +9883,12 @@ msgstr "Chiudi scostamento V"
 msgid "Buttons Separation"
 msgstr "Separazione pulsanti"
 
+msgid "Load"
+msgstr "Carica"
+
+msgid "Save"
+msgstr "Salva"
+
 msgid "Parent Folder"
 msgstr "Cartella superiore"
 
@@ -9333,6 +9904,9 @@ msgstr "Ricarica"
 msgid "Toggle Hidden"
 msgstr "Interruttore file nascosti"
 
+msgid "Toggle Filename Filter"
+msgstr "Interruttore filtro nome di file"
+
 msgid "Folder"
 msgstr "Cartella"
 
@@ -9723,6 +10297,9 @@ msgstr "Spessore minimo di presa"
 msgid "Autohide"
 msgstr "Nascondi automaticamente"
 
+msgid "Split Bar Background"
+msgstr "Sfondo della barra di divisione"
+
 msgid "Zoom Out"
 msgstr "Rimpicciolisci zoom"
 
@@ -9762,6 +10339,9 @@ msgstr "Attività"
 msgid "Connection Hover Tint Color"
 msgstr "Colore della tinta al passaggio di una connessione"
 
+msgid "Connection Hover Thickness"
+msgstr "Spessore al passaggio di una connessione"
+
 msgid "Connection Valid Target Tint Color"
 msgstr "Colore della tinta di una destinazione valida per una connessione"
 
@@ -9924,6 +10504,9 @@ msgstr "Tempo di ritiro (ms)"
 msgid "Surround"
 msgstr "Surround"
 
+msgid "Mix Rate Mode"
+msgstr "Modalità della frequenza di mixaggio"
+
 msgid "Enable Input"
 msgstr "Abilita l'entrata audio"
 
@@ -9999,6 +10582,12 @@ msgstr "Direzione in alto predefinita"
 msgid "Merge Rasterizer Cell Scale"
 msgstr "Scala per il rasterizzatore di unione delle celle"
 
+msgid "World"
+msgstr "Mondo"
+
+msgid "Map Use Async Iterations"
+msgstr "Usa iterazioni asincrone per la mappa"
+
 msgid "Avoidance Use Multiple Threads"
 msgstr "Usa più di un thread per l'evazione"
 
@@ -10329,6 +10918,9 @@ msgstr "Importa S3TC BPTC"
 msgid "Import ETC2 ASTC"
 msgstr "Importa ETC2 ASTC"
 
+msgid "Compress With GPU"
+msgstr "Comprimi con GPU"
+
 msgid "Lossless Compression"
 msgstr "Compressione senza perdita"
 
@@ -10359,9 +10951,15 @@ msgstr "Atlante a 16 bit"
 msgid "Shadow Atlas"
 msgstr "Atlas delle ombre"
 
+msgid "Batching"
+msgstr "Batching"
+
 msgid "Item Buffer Size"
 msgstr "Dimensione di elemento del buffer"
 
+msgid "Uniform Set Cache Size"
+msgstr "Dimensioni della cache per i set di uniformi"
+
 msgid "Shader Compiler"
 msgstr "Compilatore di shader"
 
@@ -10506,6 +11104,12 @@ msgstr "Mesh primitivi"
 msgid "Texel Size"
 msgstr "Dimensione dei texel"
 
+msgid "Lightmap GI"
+msgstr "GI della lightmap"
+
+msgid "Use Bicubic Filter"
+msgstr "Usa filtro bicubico"
+
 msgid "Probe Ray Count"
 msgstr "Quantità dei raggi di sonde"
 
@@ -10587,8 +11191,14 @@ msgstr "Raggio minimo di VRS"
 msgid "VRS Strength"
 msgstr "Intensità di VRS"
 
+msgid "VRS Render Region"
+msgstr "Regione di rendering VRS"
+
 msgid "World Origin"
 msgstr "Origine del mondo"
 
+msgid "Camera Locked to Origin"
+msgstr "Camera bloccata all'origine"
+
 msgid "Primary Interface"
 msgstr "Interfaccia primaria"
diff --git a/engine/editor/translations/properties/ja.po b/engine/editor/translations/properties/ja.po
index 3762cd2b..f9a11900 100644
--- a/engine/editor/translations/properties/ja.po
+++ b/engine/editor/translations/properties/ja.po
@@ -903,6 +903,9 @@ msgstr "省エネモードスリープ時間 (マイクロ秒)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "非フォーカス時の省エネモードスリープ時間 (マイクロ秒)"
 
+msgid "V-Sync Mode"
+msgstr "垂直同期モード"
+
 msgid "Update Continuously"
 msgstr "継続的に更新"
 
@@ -954,6 +957,9 @@ msgstr "テーマ"
 msgid "Icon and Font Color"
 msgstr "アイコンとフォントのカラー"
 
+msgid "Contrast"
+msgstr "コントラスト"
+
 msgid "Draw Extra Borders"
 msgstr "エクストラボーダーを描画"
 
@@ -1104,6 +1110,9 @@ msgstr "テキストエディター"
 msgid "Line Spacing"
 msgstr "行間隔"
 
+msgid "Color Theme"
+msgstr "カラーテーマ"
+
 msgid "Appearance"
 msgstr "外観"
 
@@ -1536,9 +1545,6 @@ msgstr "シェーダーエディター"
 msgid "Visual Editors"
 msgstr "ビジュアルエディター"
 
-msgid "Color Theme"
-msgstr "カラーテーマ"
-
 msgid "Minimap Opacity"
 msgstr "ミニマップの不透明度"
 
@@ -1554,9 +1560,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "ウィンドウの配置"
 
+msgid "Rect"
+msgstr "四角形"
+
 msgid "Rect Custom Position"
 msgstr "矩形のカスタム位置"
 
+msgid "Screen"
+msgstr "画面"
+
 msgid "Auto Save"
 msgstr "自動保存"
 
@@ -1566,6 +1578,9 @@ msgstr "実行前に保存"
 msgid "Output"
 msgstr "出力"
 
+msgid "Font Size"
+msgstr "フォントサイズ"
+
 msgid "HTTP Proxy"
 msgstr "HTTPプロキシ"
 
@@ -2370,9 +2385,6 @@ msgstr "ポータブル"
 msgid "Orientation"
 msgstr "方向"
 
-msgid "V-Sync Mode"
-msgstr "垂直同期モード"
-
 msgid "Output Latency"
 msgstr "出力レイテンシー"
 
@@ -2913,9 +2925,6 @@ msgstr "署名付き"
 msgid "XR Mode"
 msgstr "XRモード"
 
-msgid "Screen"
-msgstr "画面"
-
 msgid "Command Line"
 msgstr "コマンドライン"
 
@@ -3081,9 +3090,6 @@ msgstr "エリアマスク"
 msgid "Copy Mode"
 msgstr "コピーモード"
 
-msgid "Rect"
-msgstr "四角形"
-
 msgid "Anchor Mode"
 msgstr "アンカーモード"
 
@@ -3336,9 +3342,6 @@ msgstr "フラグ"
 msgid "Text"
 msgstr "テキスト"
 
-msgid "Font Size"
-msgstr "フォントサイズ"
-
 msgid "Uppercase"
 msgstr "大文字"
 
@@ -3684,9 +3687,6 @@ msgstr "ブルーム"
 msgid "Fog"
 msgstr "フォグ"
 
-msgid "Contrast"
-msgstr "コントラスト"
-
 msgid "Color Correction"
 msgstr "色補正"
 
diff --git a/engine/editor/translations/properties/ka.po b/engine/editor/translations/properties/ka.po
index d4885f77..15866a3e 100644
--- a/engine/editor/translations/properties/ka.po
+++ b/engine/editor/translations/properties/ka.po
@@ -797,6 +797,9 @@ msgstr "ნაკლები რესურსების გამოყე
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "უფოკუსო ნაკლები რესურსების გამოყენების რეჟიმის ძილი (µწმ)"
 
+msgid "V-Sync Mode"
+msgstr "V-Sync-ის რეჟიმი"
+
 msgid "Update Continuously"
 msgstr "უწყვეტი განახლება"
 
@@ -818,6 +821,9 @@ msgstr "თემა"
 msgid "Icon and Font Color"
 msgstr "ხატულისა და ფონტის ფერი"
 
+msgid "Contrast"
+msgstr "კონტრასტი"
+
 msgid "Icon Saturation"
 msgstr "ხატულის გაჯერებულობა"
 
@@ -917,6 +923,9 @@ msgstr "ტექსტური რედაქტორი"
 msgid "Line Spacing"
 msgstr "ხაზებს შუა მანძილი"
 
+msgid "Color Theme"
+msgstr "ფერის თემა"
+
 msgid "Appearance"
 msgstr "გარეგნობა"
 
@@ -1139,9 +1148,6 @@ msgstr "შეიდერების აღდგენა ჩატვირ
 msgid "Visual Editors"
 msgstr "ვიზუალური რედაქტორები"
 
-msgid "Color Theme"
-msgstr "ფერის თემა"
-
 msgid "Lines Curvature"
 msgstr "ხაზის სიმრუდე"
 
@@ -1163,15 +1169,24 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "ფანჯრის მდებარეობა"
 
+msgid "Rect"
+msgstr "მართკუთხედი"
+
 msgid "Rect Custom Position"
 msgstr "მართკუთხედი მომხმარებლის მდებარეობა"
 
+msgid "Screen"
+msgstr "ეკრანი"
+
 msgid "Auto Save"
 msgstr "ავტომატური შენახვა"
 
 msgid "Output"
 msgstr "გამოტანა"
 
+msgid "Font Size"
+msgstr "ფონტის ზომა"
+
 msgid "Platforms"
 msgstr "პლატფორმები"
 
@@ -1773,9 +1788,6 @@ msgstr "ჯიბის"
 msgid "Orientation"
 msgstr "ორიენტაცია"
 
-msgid "V-Sync Mode"
-msgstr "V-Sync-ის რეჟიმი"
-
 msgid "Hide Status Bar"
 msgstr "მდგომარეობის ზოლის დამალვა"
 
@@ -2373,9 +2385,6 @@ msgstr "XR თვისებები"
 msgid "XR Mode"
 msgstr "XR რეჟიმი"
 
-msgid "Screen"
-msgstr "ეკრანი"
-
 msgid "Immersive Mode"
 msgstr "ჩაძირვადი რეჟიმი"
 
@@ -2727,9 +2736,6 @@ msgstr "მატარებელი"
 msgid "Copy Mode"
 msgstr "კოპირების რეჟიმი"
 
-msgid "Rect"
-msgstr "მართკუთხედი"
-
 msgid "Anchor Mode"
 msgstr "მიმაგრებაის რეჟიმი"
 
@@ -3446,9 +3452,6 @@ msgstr "კონტური მოდულაცია"
 msgid "Font"
 msgstr "ფონტი"
 
-msgid "Font Size"
-msgstr "ფონტის ზომა"
-
 msgid "Horizontal Alignment"
 msgstr "ჰორიზონტალური სწორება"
 
@@ -5118,9 +5121,6 @@ msgstr "მორგება"
 msgid "Brightness"
 msgstr "სიკაშკაშე"
 
-msgid "Contrast"
-msgstr "კონტრასტი"
-
 msgid "Saturation"
 msgstr "გაჯერებულობა"
 
diff --git a/engine/editor/translations/properties/ko.po b/engine/editor/translations/properties/ko.po
index c468f457..cb9867cb 100644
--- a/engine/editor/translations/properties/ko.po
+++ b/engine/editor/translations/properties/ko.po
@@ -912,6 +912,9 @@ msgstr "내부적인 오류를 토스트 알림에 표시"
 msgid "Show Update Spinner"
 msgstr "업데이트 스피너 표시"
 
+msgid "V-Sync Mode"
+msgstr "수직동기화 모드"
+
 msgid "Update Continuously"
 msgstr "상시 업데이트"
 
@@ -966,6 +969,9 @@ msgstr "테마"
 msgid "Icon and Font Color"
 msgstr "아이콘 및 글꼴 색"
 
+msgid "Contrast"
+msgstr "대비"
+
 msgid "Draw Extra Borders"
 msgstr "추가적인 외곽선 그리기"
 
@@ -1113,6 +1119,9 @@ msgstr "텍스트 에디터"
 msgid "Line Spacing"
 msgstr "라인 간격"
 
+msgid "Color Theme"
+msgstr "색 테마"
+
 msgid "Appearance"
 msgstr "모습"
 
@@ -1584,9 +1593,6 @@ msgstr "불러오기 시 셰이더 복원"
 msgid "Visual Editors"
 msgstr "비주얼 에디터"
 
-msgid "Color Theme"
-msgstr "색 테마"
-
 msgid "Minimap Opacity"
 msgstr "미니맵 불투명도"
 
@@ -1614,9 +1620,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "창 배치"
 
+msgid "Rect"
+msgstr "직사각형"
+
 msgid "Rect Custom Position"
 msgstr "직사각형 사용자 정의 위치"
 
+msgid "Screen"
+msgstr "화면"
+
 msgid "Auto Save"
 msgstr "자동 저장"
 
@@ -1626,6 +1638,9 @@ msgstr "실행하기 전에 저장"
 msgid "Output"
 msgstr "출력"
 
+msgid "Font Size"
+msgstr "폰트 크기"
+
 msgid "Always Clear Output on Play"
 msgstr "실행 시 항상 출력 지우기"
 
@@ -2457,9 +2472,6 @@ msgstr "휴대용"
 msgid "Orientation"
 msgstr "오리엔테이션"
 
-msgid "V-Sync Mode"
-msgstr "수직동기화 모드"
-
 msgid "Output Latency"
 msgstr "출력 레이턴시"
 
@@ -3399,9 +3411,6 @@ msgstr "XR 기능"
 msgid "XR Mode"
 msgstr "XR 모드"
 
-msgid "Screen"
-msgstr "화면"
-
 msgid "Immersive Mode"
 msgstr "몰입형 모드"
 
@@ -3873,9 +3882,6 @@ msgstr "구역 마스크"
 msgid "Copy Mode"
 msgstr "복사 모드"
 
-msgid "Rect"
-msgstr "직사각형"
-
 msgid "Anchor Mode"
 msgstr "앵커 모드"
 
@@ -4938,9 +4944,6 @@ msgstr "윤곽선 조정"
 msgid "Font"
 msgstr "글꼴"
 
-msgid "Font Size"
-msgstr "폰트 크기"
-
 msgid "Horizontal Alignment"
 msgstr "가로 정렬"
 
@@ -6582,9 +6585,6 @@ msgstr "조정"
 msgid "Brightness"
 msgstr "밝기"
 
-msgid "Contrast"
-msgstr "대비"
-
 msgid "Saturation"
 msgstr "포화도"
 
diff --git a/engine/editor/translations/properties/pl.po b/engine/editor/translations/properties/pl.po
index acb3ae45..c8b29f5e 100644
--- a/engine/editor/translations/properties/pl.po
+++ b/engine/editor/translations/properties/pl.po
@@ -102,7 +102,7 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-26 15:06+0000\n"
+"PO-Revision-Date: 2025-03-19 13:33+0000\n"
 "Last-Translator: Tomek <kobewi4e@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/godot-"
 "properties/pl/>\n"
@@ -112,7 +112,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10.2-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Application"
 msgstr "Aplikacja"
@@ -343,7 +343,7 @@ msgid "Zstd"
 msgstr "Zstd"
 
 msgid "Long Distance Matching"
-msgstr "Dopasowanie Na Odległość"
+msgstr "Dopasowanie na odległość"
 
 msgid "Compression Level"
 msgstr "Poziom kompresji"
@@ -972,6 +972,9 @@ msgstr "Używaj wątków"
 msgid "Localize Settings"
 msgstr "Lokalizuj ustawienia"
 
+msgid "Dock Tab Style"
+msgstr "Styl kart doków"
+
 msgid "UI Layout Direction"
 msgstr "Kierunek ułożenia interfejsu użytkownika"
 
@@ -987,6 +990,12 @@ msgstr "Okno Edytora"
 msgid "Project Manager Screen"
 msgstr "Okno Menedżera projektów"
 
+msgid "Connection"
+msgstr "Połączenie"
+
+msgid "Engine Version Update Mode"
+msgstr "Tryb aktualizacji wersji silnika"
+
 msgid "Use Embedded Menu"
 msgstr "Użyj wbudowanego menu"
 
@@ -996,6 +1005,12 @@ msgstr "Użyj natywnych dialogów plików"
 msgid "Expand to Title"
 msgstr "Rozwiń do tytułu"
 
+msgid "Main Font Size"
+msgstr "Rozmiar głównej czcionki"
+
+msgid "Code Font Size"
+msgstr "Rozmiar czcionki kodu"
+
 msgid "Code Font Contextual Ligatures"
 msgstr "Ligatury kontekstowe czcionki kodowej"
 
@@ -1005,6 +1020,12 @@ msgstr "Niestandardowe funkcje OpenType dla czcionki kodowej"
 msgid "Code Font Custom Variations"
 msgstr "Niestandardowe warianty czcionki kodowej"
 
+msgid "Font Antialiasing"
+msgstr "Wygładzanie czcionki"
+
+msgid "Font Hinting"
+msgstr "Hinting czcionki"
+
 msgid "Font Subpixel Positioning"
 msgstr "Pozycjonowanie subpikselowe czcionki"
 
@@ -1038,6 +1059,9 @@ msgstr "Historia nawigacji dodatkowych przycisków myszy"
 msgid "Save Each Scene on Quit"
 msgstr "Zapisz każdą scenę przed wyjściem"
 
+msgid "Save on Focus Loss"
+msgstr "Zapisz przy przejściu w tło"
+
 msgid "Accept Dialog Cancel OK Buttons"
 msgstr "Przyciski akceptacji, anulowania i OK"
 
@@ -1053,6 +1077,12 @@ msgstr "Uśpienie trybu niskiego użycia procesora (µsec)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Uśpienie w tle trybu niskiego użycia procesora (µsec)"
 
+msgid "Import Resources When Unfocused"
+msgstr "Importuj zasoby gdy w tle"
+
+msgid "V-Sync Mode"
+msgstr "Tryb synchronizacji pionowej"
+
 msgid "Update Continuously"
 msgstr "Stale aktualizuj"
 
@@ -1077,9 +1107,18 @@ msgstr "Pytaj przed unieważnieniem unikalnej nazwy"
 msgid "Inspector"
 msgstr "Inspektor"
 
+msgid "Max Array Dictionary Items per Page"
+msgstr "Maksymalne elementy tablicy/słownika na stronę"
+
 msgid "Show Low Level OpenType Features"
 msgstr "Pokaż niskopoziomowe funkcje OpenType"
 
+msgid "Float Drag Speed"
+msgstr "Szybkość przeciągania liczb"
+
+msgid "Nested Color Mode"
+msgstr "Tryb koloru zagnieżdżenia"
+
 msgid "Delimitate All Container and Resources"
 msgstr "Rozgranicz wszystkie kontenery i zasoby"
 
@@ -1107,12 +1146,39 @@ msgstr "Otwórz zasoby w bieżącym inspektorze"
 msgid "Resources to Open in New Inspector"
 msgstr "Zasoby do otwarcia w nowym inspektorze"
 
+msgid "Default Color Picker Mode"
+msgstr "Domyślny tryb próbnika kolorów"
+
+msgid "Default Color Picker Shape"
+msgstr "Domyślny kształt próbnika kolorów"
+
 msgid "Theme"
 msgstr "Motyw"
 
+msgid "Follow System Theme"
+msgstr "Użyj motywu systemu"
+
+msgid "Preset"
+msgstr "Profil"
+
+msgid "Spacing Preset"
+msgstr "Profil odstępów"
+
 msgid "Icon and Font Color"
 msgstr "Ikona i kolor czcionki"
 
+msgid "Base Color"
+msgstr "Kolor podstawowy"
+
+msgid "Accent Color"
+msgstr "Kolor akcentu"
+
+msgid "Use System Accent Color"
+msgstr "Użyj systemowego koloru akcentu"
+
+msgid "Contrast"
+msgstr "Kontrast"
+
 msgid "Draw Extra Borders"
 msgstr "Rysuj dodatkowe obramowania"
 
@@ -1164,12 +1230,36 @@ msgstr "Pokaż przycisk skryptu"
 msgid "Restore Scenes on Load"
 msgstr "Przywróć sceny po załadowaniu"
 
+msgid "Multi Window"
+msgstr "Wiele okien"
+
+msgid "Restore Windows on Load"
+msgstr "Przywróć okna po załadowaniu"
+
+msgid "Maximize Window"
+msgstr "Maksymalizuj okno"
+
 msgid "FileSystem"
 msgstr "System plików"
 
 msgid "External Programs"
 msgstr "Programy zewnętrzne"
 
+msgid "Raster Image Editor"
+msgstr "Edytor obrazów rastrowych"
+
+msgid "Vector Image Editor"
+msgstr "Edytor obrazów wektorowych"
+
+msgid "Audio Editor"
+msgstr "Edytor audio"
+
+msgid "3D Model Editor"
+msgstr "Edytor modeli 3D"
+
+msgid "Terminal Emulator"
+msgstr "Emulator terminalu"
+
 msgid "Terminal Emulator Flags"
 msgstr "Flagi emulatora terminalu"
 
@@ -1179,6 +1269,9 @@ msgstr "Katalogi"
 msgid "Autoscan Project Path"
 msgstr "Automatycznie skanuj ścieżkę projektu"
 
+msgid "Default Project Path"
+msgstr "Domyślna ścieżka projektu"
+
 msgid "On Save"
 msgstr "Przy zapisie"
 
@@ -1300,6 +1393,9 @@ msgstr "Edytor tekstu"
 msgid "Line Spacing"
 msgstr "Odstępy między liniami"
 
+msgid "Color Theme"
+msgstr "Motyw koloru"
+
 msgid "Appearance"
 msgstr "Wygląd"
 
@@ -1360,6 +1456,9 @@ msgstr "Linie"
 msgid "Code Folding"
 msgstr "Zwijanie kodu"
 
+msgid "Word Wrap"
+msgstr "Zawijanie wierszy"
+
 msgid "Autowrap Mode"
 msgstr "Tryb automatycznego zawijania"
 
@@ -1537,6 +1636,18 @@ msgstr "Pomoc"
 msgid "Show Help Index"
 msgstr "Pokaż indeks pomocy"
 
+msgid "Help Font Size"
+msgstr "Rozmiar czcionki pomocy"
+
+msgid "Help Source Font Size"
+msgstr "Rozmiar czcionki kodu w pomocy"
+
+msgid "Help Title Font Size"
+msgstr "Rozmiar czcionki tytułu w pomocy"
+
+msgid "Class Reference Examples"
+msgstr "Przykłady referencji klas"
+
 msgid "Sort Functions Alphabetically"
 msgstr "Sortuj funkcje alfabetycznie"
 
@@ -1544,11 +1655,20 @@ msgid "Grid Map"
 msgstr "Mapa siatek"
 
 msgid "Pick Distance"
-msgstr "Dystans łapania"
+msgstr "Odległość łapania"
 
 msgid "Palette Min Width"
 msgstr "Minimalna szerokość palety"
 
+msgid "Preview Size"
+msgstr "Rozmiar podglądu"
+
+msgid "Primary Grid Color"
+msgstr "Główny kolor siatki"
+
+msgid "Secondary Grid Color"
+msgstr "Drugorzędny kolor siatki"
+
 msgid "Selection Box Color"
 msgstr "Kolor prostopadłościanu zaznaczenia"
 
@@ -1648,6 +1768,12 @@ msgstr "Kształt kości"
 msgid "Path 3D Tilt Disk Size"
 msgstr "Rozmiar dysku nachylenia Ścieżki 3D"
 
+msgid "Primary Grid Steps"
+msgstr "Główne kroki siatki"
+
+msgid "Grid Size"
+msgstr "Rozmiar siatki"
+
 msgid "Grid Division Level Max"
 msgstr "Maksymalny poziom podziału siatki"
 
@@ -1666,12 +1792,36 @@ msgstr "Płaszczyzna siatki XY"
 msgid "Grid YZ Plane"
 msgstr "Płaszczyzna siatki YZ"
 
+msgid "Default FOV"
+msgstr "Domyślny FOV"
+
+msgid "Default Z Near"
+msgstr "Domyślny bliski Z"
+
+msgid "Default Z Far"
+msgstr "Domyślny daleki Z"
+
 msgid "Invert X Axis"
 msgstr "Odwróć oś X"
 
 msgid "Invert Y Axis"
 msgstr "Odwróć oś Y"
 
+msgid "Navigation Scheme"
+msgstr "Schemat nawigacji"
+
+msgid "Orbit Mouse Button"
+msgstr "Przycisk myszy orbity"
+
+msgid "Pan Mouse Button"
+msgstr "Przycisk myszy przesuwania"
+
+msgid "Zoom Mouse Button"
+msgstr "Przycisk myszy przybliżania"
+
+msgid "Zoom Style"
+msgstr "Styl przybliżania"
+
 msgid "Emulate Numpad"
 msgstr "Emuluj klawiaturę numeryczną"
 
@@ -1708,12 +1858,21 @@ msgstr "Pokaż uchwyt nawigacji edytora"
 msgid "Freelook"
 msgstr "Wolny widok"
 
+msgid "Freelook Navigation Scheme"
+msgstr "Schemat nawigacji swobodnego widoku"
+
 msgid "Freelook Sensitivity"
 msgstr "Czułość wolnego widoku"
 
 msgid "Freelook Inertia"
 msgstr "Bezwładność wolnego widoku"
 
+msgid "Freelook Base Speed"
+msgstr "Podstawowa prędkość swobodnego widoku"
+
+msgid "Freelook Activation Modifier"
+msgstr "Modyfikator aktywacji swobodnego widoku"
+
 msgid "Freelook Speed Zoom Link"
 msgstr "Szybkość swobodnego widoku zależna od przybliżenia"
 
@@ -1759,6 +1918,9 @@ msgstr "Kolor obwódki viewportu"
 msgid "Use Integer Zoom by Default"
 msgstr "Domyślnie używaj powiększenia całkowitoliczbowego"
 
+msgid "Zoom Speed Factor"
+msgstr "Czynnik szybkości przybliżania"
+
 msgid "Bone Mapper"
 msgstr "Mapper kości"
 
@@ -1780,6 +1942,15 @@ msgstr "Błąd"
 msgid "Panning"
 msgstr "Panoramowanie"
 
+msgid "2D Editor Panning Scheme"
+msgstr "Schemat przesuwania edytora 2D"
+
+msgid "Sub Editors Panning Scheme"
+msgstr "Schemat przesuwania podedytorów"
+
+msgid "Animation Editors Panning Scheme"
+msgstr "Schemat przesuwania edytorów animacji"
+
 msgid "Simple Panning"
 msgstr "Proste przesuwanie"
 
@@ -1834,9 +2005,6 @@ msgstr "Przywróć shadery po załadowaniu"
 msgid "Visual Editors"
 msgstr "Edytory wizualne"
 
-msgid "Color Theme"
-msgstr "Motyw koloru"
-
 msgid "Minimap Opacity"
 msgstr "Przezroczystość minimapy"
 
@@ -1864,18 +2032,42 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Ustawienie okna"
 
+msgid "Rect"
+msgstr "Prostokąt"
+
 msgid "Rect Custom Position"
 msgstr "Własna pozycja prostokąta"
 
+msgid "Screen"
+msgstr "Ekran"
+
+msgid "Android Window"
+msgstr "Okno Androida"
+
+msgid "Game Embed Mode"
+msgstr "Tryb osadzania gry"
+
 msgid "Auto Save"
 msgstr "Autozapis"
 
 msgid "Save Before Running"
 msgstr "Zapisz przed uruchomieniem"
 
+msgid "Bottom Panel"
+msgstr "Panel dolny"
+
+msgid "Action on Play"
+msgstr "Akcja na granie"
+
+msgid "Action on Stop"
+msgstr "Akcja na zatrzymanie"
+
 msgid "Output"
 msgstr "Konsola"
 
+msgid "Font Size"
+msgstr "Rozmiar czcionki"
+
 msgid "Always Clear Output on Play"
 msgstr "Zawsze czyść dane wyjściowe przy uruchomieniu"
 
@@ -1891,6 +2083,9 @@ msgstr "Linux/*BSD"
 msgid "Prefer Wayland"
 msgstr "Preferuj Wayland"
 
+msgid "Network Mode"
+msgstr "Tryb sieci"
+
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
 
@@ -1900,12 +2095,21 @@ msgstr "Host"
 msgid "Editor TLS Certificates"
 msgstr "Certyfikaty TLS edytora"
 
+msgid "Enable TLS V 1"
+msgstr "Włącz TLS v1"
+
 msgid "Remote Host"
 msgstr "Zdalny host"
 
 msgid "Debugger"
 msgstr "Debugger"
 
+msgid "Auto Switch to Remote Scene Tree"
+msgstr "Automatycznie przełącz na zdalne drzewo sceny"
+
+msgid "Auto Switch to Stack Trace"
+msgstr "Automatycznie przełącz na ślad stosu"
+
 msgid "Profiler Frame History Size"
 msgstr "Rozmiar historii klatek profilera"
 
@@ -1921,6 +2125,9 @@ msgstr "Częstotliwość odświeżania zdalnej struktury scen"
 msgid "Remote Inspect Refresh Interval"
 msgstr "Częstotliwość odświeżania zdalnej inspekcji"
 
+msgid "Profile Native Calls"
+msgstr "Profiluj wywołania natywne"
+
 msgid "Version Control"
 msgstr "Kontrola wersji"
 
@@ -1948,6 +2155,12 @@ msgstr "Menedżer projektów"
 msgid "Sorting Order"
 msgstr "Kolejność sortowania"
 
+msgid "Directory Naming Convention"
+msgstr "Konwencja nazw folderów"
+
+msgid "Default Renderer"
+msgstr "Domyślny renderer"
+
 msgid "Highlighting"
 msgstr "Podświetlanie"
 
@@ -2203,6 +2416,18 @@ msgstr "Normalizuj ścieżki pozycji"
 msgid "Reset All Bone Poses After Import"
 msgstr "Resetuj wszystkie pozy kości po zaimportowaniu"
 
+msgid "Retarget Method"
+msgstr "Metoda retargetowania"
+
+msgid "Keep Global Rest on Leftovers"
+msgstr "Zachowaj globalny spoczynek na pozostałościach"
+
+msgid "Use Global Pose"
+msgstr "Użyj globalnej pozy"
+
+msgid "Original Skeleton Name"
+msgstr "Nazwa oryginalnego szkieletu"
+
 msgid "Fix Silhouette"
 msgstr "Napraw sylwetkę"
 
@@ -2233,6 +2458,15 @@ msgstr "Wygeneruj styczne"
 msgid "Generate LODs"
 msgstr "Wygeneruj LODy"
 
+msgid "Generate Shadow Mesh"
+msgstr "Generuj siatkę cieni"
+
+msgid "Generate Lightmap UV2"
+msgstr "Generuj UV2 mapy światła"
+
+msgid "Generate Lightmap UV2 Texel Size"
+msgstr "Rozmiar teksela generowania UV2 mapy światła"
+
 msgid "Scale Mesh"
 msgstr "Skaluj siatkę"
 
@@ -2345,7 +2579,7 @@ msgid "Radius"
 msgstr "Promień"
 
 msgid "Simplification Distance"
-msgstr "Dystans uproszczenia"
+msgstr "Odległość uproszczenia"
 
 msgid "Save to File"
 msgstr "Zapisz do pliku"
@@ -2434,6 +2668,9 @@ msgstr "Skala korzenia"
 msgid "Import as Skeleton Bones"
 msgstr "Zaimportuj jako kości szkieletu"
 
+msgid "Use Node Type Suffixes"
+msgstr "Użyj przyrostów typu węzłów"
+
 msgid "Meshes"
 msgstr "Siatki"
 
@@ -2503,6 +2740,9 @@ msgstr "Podpowiedź"
 msgid "Subpixel Positioning"
 msgstr "Pozycjonowanie subpikselowe"
 
+msgid "Keep Rounding Remainders"
+msgstr "Zachowaj resztę zaokrąglania"
+
 msgid "Oversampling"
 msgstr "Nadpróbkowanie"
 
@@ -2557,6 +2797,9 @@ msgstr "Separator"
 msgid "Character Ranges"
 msgstr "Zakresy znaków"
 
+msgid "Kerning Pairs"
+msgstr "Pary kerningu"
+
 msgid "Columns"
 msgstr "Kolumny"
 
@@ -2611,6 +2854,9 @@ msgstr "Mapa normalnych"
 msgid "Roughness"
 msgstr "Chropowatość"
 
+msgid "Src Normal"
+msgstr "Źródłowa normalna"
+
 msgid "Process"
 msgstr "Przetwarzanie"
 
@@ -2699,6 +2945,9 @@ msgstr "Indeks aktualnej grupy"
 msgid "Current Bone Idx"
 msgstr "Indeks aktualnej kości"
 
+msgid "Particles Emission Shape"
+msgstr "Kształt emisji cząsteczek"
+
 msgid "ID"
 msgstr "ID"
 
@@ -2714,6 +2963,15 @@ msgstr "Odstęp"
 msgid "Texture Region Size"
 msgstr "Rozmiar obszaru tekstury"
 
+msgid "Use Texture Padding"
+msgstr "Użyj marginesów tekstur"
+
+msgid "Atlas Coords"
+msgstr "Koordynaty w atlasie"
+
+msgid "Size in Atlas"
+msgstr "Rozmiar w atlasie"
+
 msgid "Alternative ID"
 msgstr "Alternatywne ID"
 
@@ -2739,14 +2997,29 @@ msgid "Naming"
 msgstr "Nazewnictwo"
 
 msgid "Default Signal Callback Name"
-msgstr "Domyślna nazwa sygnału callbacka"
+msgstr "Domyślna nazwa callbacku sygnału"
+
+msgid "Default Signal Callback to Self Name"
+msgstr "Domyślna nazwa callbacku sygnału do siebie"
 
 msgid "Scene Name Casing"
-msgstr "Wielkość liter w nazwie Sceny"
+msgstr "Wielkość liter w nazwie sceny"
+
+msgid "Script Name Casing"
+msgstr "Wielkość liter w nazwie skryptu"
 
 msgid "Reimport Missing Imported Files"
 msgstr "Zaimportuj ponownie brakujące importowane pliki"
 
+msgid "Use Multiple Threads"
+msgstr "Używaj wielu wątków"
+
+msgid "Atlas Max Width"
+msgstr "Maksymalny rozmiar atlasu"
+
+msgid "Convert Text Resources to Binary"
+msgstr "Konwertuj zasoby tekstowe na binarne"
+
 msgid "Plugin Name"
 msgstr "Nazwa wtyczki"
 
@@ -2771,9 +3044,24 @@ msgstr "Wyświetl profil GPU"
 msgid "Verbose stdout"
 msgstr "Werbalne stdout"
 
+msgid "Physics Interpolation"
+msgstr "Interpolacja fizyki"
+
+msgid "Enable Warnings"
+msgstr "Włącz ostrzeżenia"
+
+msgid "Max Chars per Second"
+msgstr "Maksymalne znaki na sekundę"
+
+msgid "Max Queued Messages"
+msgstr "Maksymalne zakolejkowane wiadomości"
+
 msgid "Max Errors per Second"
 msgstr "Maksymalna liczba błędów na sekundę"
 
+msgid "Max Warnings per Second"
+msgstr "Maksymalne ostrzeżenia na sekundę"
+
 msgid "File Logging"
 msgstr "Rejestrowanie plików"
 
@@ -2789,12 +3077,30 @@ msgstr "Maksymalna liczba plików z logami"
 msgid "Driver"
 msgstr "Sterownik"
 
+msgid "Fallback to Vulkan"
+msgstr "Awaryjne przejście na Vulkan"
+
+msgid "Fallback to D3D12"
+msgstr "Awaryjne przejście na D3D12"
+
+msgid "Fallback to OpenGL 3"
+msgstr "Awaryjne przejście na OpenGL"
+
 msgid "GL Compatibility"
 msgstr "Kompatybilność GL"
 
 msgid "Nvidia Disable Threaded Optimization"
 msgstr "Wyłącz Optymalizację Wątkową Nvidia"
 
+msgid "Fallback to Angle"
+msgstr "Awaryjne przejście na Angle"
+
+msgid "Fallback to Native"
+msgstr "Awaryjne przejście na Natywny"
+
+msgid "Fallback to GLES"
+msgstr "Awaryjne przejście na GLES"
+
 msgid "Force Angle on Devices"
 msgstr "Wymuś kąt na urządzeniach"
 
@@ -2834,8 +3140,8 @@ msgstr "Konsola przenośna"
 msgid "Orientation"
 msgstr "Ustawienie"
 
-msgid "V-Sync Mode"
-msgstr "Tryb synchronizacji pionowej"
+msgid "Output Latency"
+msgstr "Opóźnienie wyjścia"
 
 msgid "Frame Delay Msec"
 msgstr "Opóźnienie klatki w milisekundach"
@@ -2861,15 +3167,63 @@ msgstr "OpenXR"
 msgid "Default Action Map"
 msgstr "Domyślna mapa akcji"
 
+msgid "Form Factor"
+msgstr "Czynnik formy"
+
 msgid "View Configuration"
 msgstr "Konfiguracja widoku"
 
+msgid "Reference Space"
+msgstr "Przestrzeń odniesienia"
+
+msgid "Environment Blend Mode"
+msgstr "Tryb mieszania środowiska"
+
+msgid "Foveation Level"
+msgstr "Poziom wgłębienia"
+
+msgid "Foveation Dynamic"
+msgstr "Dynamika wgłębienia"
+
+msgid "Submit Depth Buffer"
+msgstr "Prześlij bufor głębi"
+
+msgid "Startup Alert"
+msgstr "Alarm rozpoczęcia"
+
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
+msgid "Debug Utils"
+msgstr "Narzędzia debugowania"
+
+msgid "Debug Message Types"
+msgstr "Typy wiadomości debugowania"
+
 msgid "Hand Tracking"
 msgstr "Śledzenie dłoni"
 
+msgid "Hand Tracking Unobstructed Data Source"
+msgstr "Źródło niezasłoniętych danych śledzenia dłoni"
+
+msgid "Hand Tracking Controller Data Source"
+msgstr "Źródło danych kontrolera śledzenia dłoni"
+
+msgid "Hand Interaction Profile"
+msgstr "Profil interakcji dłoni"
+
+msgid "Eye Gaze Interaction"
+msgstr "Interakcja wzrokowa"
+
+msgid "Binding Modifiers"
+msgstr "Modyfikatory przypisania"
+
+msgid "Analog Threshold"
+msgstr "Próg analogu"
+
+msgid "Dpad Binding"
+msgstr "Przypisanie D-Padu"
+
 msgid "Boot Splash"
 msgstr "Ekran uruchamiania"
 
@@ -2891,6 +3245,12 @@ msgstr "Domyślny pusty kolor"
 msgid "Icon"
 msgstr "Ikona"
 
+msgid "macOS Native Icon"
+msgstr "Natywna ikona macOS"
+
+msgid "Windows Native Icon"
+msgstr "Natywna ikona Windows"
+
 msgid "Text Driver"
 msgstr "Sterownik tekstów"
 
@@ -2936,9 +3296,30 @@ msgstr "Nazwa zespołu"
 msgid "Solution Directory"
 msgstr "Katalog rozwiązania"
 
+msgid "Assembly Reload Attempts"
+msgstr "Próby przeładowania zestawu"
+
 msgid "Time"
 msgstr "Czas"
 
+msgid "Physics Process"
+msgstr "Proces fizyki"
+
+msgid "Navigation Process"
+msgstr "Proces nawigacji"
+
+msgid "Static"
+msgstr "Statyczna"
+
+msgid "Static Max"
+msgstr "Maks. statyczna"
+
+msgid "Msg Buf Max"
+msgstr "Maks. bufor wiadomości"
+
+msgid "Object"
+msgstr "Obiekt"
+
 msgid "Objects"
 msgstr "Obiekty"
 
@@ -2948,11 +3329,29 @@ msgstr "Zasoby"
 msgid "Orphan Nodes"
 msgstr "Osierocone węzły"
 
+msgid "Raster"
+msgstr "Raster"
+
 msgid "Total Objects Drawn"
 msgstr "Wszystkich narysowanych obiektów"
 
+msgid "Total Primitives Drawn"
+msgstr "Wszystkie narysowane prymitywy"
+
 msgid "Total Draw Calls"
-msgstr "Wszystkich draw calls"
+msgstr "Wszystkie instrukcje rysowania"
+
+msgid "Video"
+msgstr "Wideo"
+
+msgid "Video Mem"
+msgstr "Pamięć wideo"
+
+msgid "Texture Mem"
+msgstr "Pamięć tekstur"
+
+msgid "Buffer Mem"
+msgstr "Pamięć bufora"
 
 msgid "Physics 2D"
 msgstr "Fizyka 2D"
@@ -2960,12 +3359,18 @@ msgstr "Fizyka 2D"
 msgid "Active Objects"
 msgstr "Aktywne obiekty"
 
+msgid "Collision Pairs"
+msgstr "Pary kolizji"
+
 msgid "Islands"
 msgstr "Wyspy"
 
 msgid "Physics 3D"
 msgstr "Fizyka 3D"
 
+msgid "Active Maps"
+msgstr "Aktywne mapy"
+
 msgid "Regions"
 msgstr "Obszary"
 
@@ -2982,10 +3387,34 @@ msgid "Edges"
 msgstr "Krawędzie"
 
 msgid "Edges Merged"
-msgstr "Złączonych krawędzi"
+msgstr "Scalone krawędzie"
 
 msgid "Edges Connected"
-msgstr "Połączono krawędzi"
+msgstr "Połączone krawędzie"
+
+msgid "Edges Free"
+msgstr "Wolne krawędzie"
+
+msgid "Obstacles"
+msgstr "Przeszkody"
+
+msgid "Pipeline"
+msgstr "Potok"
+
+msgid "Compilations Canvas"
+msgstr "Kompilacje płótna"
+
+msgid "Compilations Mesh"
+msgstr "Kompilacje siatek"
+
+msgid "Compilations Surface"
+msgstr "Kompilacje powierzchni"
+
+msgid "Compilations Draw"
+msgstr "Kompilacje rysowania"
+
+msgid "Compilations Specialization"
+msgstr "Kompilacje specjalizacji"
 
 msgid "Operation"
 msgstr "Operacja"
@@ -3038,6 +3467,9 @@ msgstr "Promień wewnętrzny"
 msgid "Outer Radius"
 msgstr "promień zewnętrzny"
 
+msgid "Ring Sides"
+msgstr "Boki pierścienia"
+
 msgid "Polygon"
 msgstr "Wielokąt"
 
@@ -3053,15 +3485,27 @@ msgstr "Obróć ściany"
 msgid "Path Node"
 msgstr "Ścieżka węzła"
 
+msgid "Path Interval Type"
+msgstr "Typ odstępu ścieżek"
+
 msgid "Path Interval"
 msgstr "Odstęp między ścieżkami"
 
+msgid "Path Simplify Angle"
+msgstr "Kąt uproszczenia ścieżek"
+
 msgid "Path Rotation"
 msgstr "Obrót ścieżki"
 
+msgid "Path Rotation Accurate"
+msgstr "Dokładny obrót ścieżek"
+
 msgid "Path Local"
 msgstr "Ścieżka lokalna"
 
+msgid "Path Continuous U"
+msgstr "Ciągłe U ścieżki"
+
 msgid "Path U Distance"
 msgstr "Odległość U ścieżki"
 
@@ -3074,30 +3518,108 @@ msgstr "Importer"
 msgid "Allow Geometry Helper Nodes"
 msgstr "Zezwól na węzły pomocnicze geometrii"
 
+msgid "Embedded Image Handling"
+msgstr "Obsługa osadzonych obrazków"
+
 msgid "FBX2glTF"
 msgstr "FBX2glTF"
 
 msgid "GDScript"
 msgstr "GDScript"
 
+msgid "Function Definition Color"
+msgstr "Kolor definicji funkcji"
+
+msgid "Global Function Color"
+msgstr "Kolor globalnej funkcji"
+
 msgid "Node Path Color"
 msgstr "Kolor ścieżki węzła"
 
+msgid "Node Reference Color"
+msgstr "Kolor odniesienia do węzła"
+
+msgid "Annotation Color"
+msgstr "Kolor adnotacji"
+
+msgid "String Name Color"
+msgstr "Kolor ciągu nazwy"
+
+msgid "Comment Markers"
+msgstr "Znaczniki komentarzy"
+
+msgid "Critical Color"
+msgstr "Kolor krytyczny"
+
+msgid "Warning Color"
+msgstr "Kolor ostrzeżenia"
+
+msgid "Notice Color"
+msgstr "Kolor informacji"
+
+msgid "Critical List"
+msgstr "Lista krytycznych"
+
+msgid "Warning List"
+msgstr "Lista ostrzeżeń"
+
 msgid "Notice List"
 msgstr "Lista uwag"
 
+msgid "Max Call Stack"
+msgstr "Maks. stos wywołań"
+
+msgid "Exclude Addons"
+msgstr "Wyklucz dodatki"
+
+msgid "Renamed in Godot 4 Hint"
+msgstr "Wskazówka zmiany nazwy w Godot 4"
+
 msgid "Language Server"
 msgstr "Serwer języka"
 
+msgid "Enable Smart Resolve"
+msgstr "Włącz inteligentne rozstrzyganie"
+
+msgid "Show Native Symbols in Editor"
+msgstr "Pokaż symbole natywne w edytorze"
+
 msgid "Use Thread"
 msgstr "Użyj wątku"
 
+msgid "Poll Limit (µsec)"
+msgstr "Limit sondowania (µsec)"
+
+msgid "Copyright"
+msgstr "Prawa autorskie"
+
+msgid "Bake FPS"
+msgstr "FPS wypalania"
+
+msgid "glTF"
+msgstr "glTF"
+
+msgid "Naming Version"
+msgstr "Wersja nazewnictwa"
+
+msgid "Color"
+msgstr "Kolor"
+
 msgid "Intensity"
 msgstr "Intensywność"
 
+msgid "Light Type"
+msgstr "Typ światła"
+
 msgid "Range"
 msgstr "Przedział"
 
+msgid "Inner Cone Angle"
+msgstr "Kąt wewnętrznego stożka"
+
+msgid "Outer Cone Angle"
+msgstr "Kąt zewnętrznego stożka"
+
 msgid "Diffuse Img"
 msgstr "Rozmycie obrazu"
 
@@ -3110,48 +3632,177 @@ msgstr "Współczynnik połysku"
 msgid "Specular Factor"
 msgstr "Współczynnik lustrzany"
 
+msgid "Spec Gloss Img"
+msgstr "Obrazek lustrzanego połysku"
+
 msgid "Mass"
 msgstr "Masa"
 
+msgid "Linear Velocity"
+msgstr "Prędkość liniowa"
+
+msgid "Angular Velocity"
+msgstr "Prędkość kątowa"
+
+msgid "Center of Mass"
+msgstr "Środek masy"
+
+msgid "Inertia Diagonal"
+msgstr "Przekątna bezwładności"
+
+msgid "Inertia Orientation"
+msgstr "Orientacja bezwładności"
+
+msgid "Inertia Tensor"
+msgstr "Tensor bezwładności"
+
+msgid "Is Trigger"
+msgstr "Jest wyzwalaczem"
+
+msgid "Mesh Index"
+msgstr "Indeks siatki"
+
+msgid "Importer Mesh"
+msgstr "Siatka importera"
+
+msgid "Image Format"
+msgstr "Format obrazu"
+
+msgid "Root Node Mode"
+msgstr "Tryb korzenia"
+
 msgid "Json"
-msgstr "Json"
+msgstr "JSON"
+
+msgid "Major Version"
+msgstr "Wersja główna"
+
+msgid "Minor Version"
+msgstr "Wersja podrzędna"
+
+msgid "GLB Data"
+msgstr "Dane GLB"
+
+msgid "Use Named Skin Binds"
+msgstr "Użyj nazwanych wiązań skórki"
 
 msgid "Buffers"
 msgstr "Bufory"
 
+msgid "Buffer Views"
+msgstr "Widoki buforu"
+
+msgid "Accessors"
+msgstr "Akcesory"
+
 msgid "Materials"
 msgstr "Materiały"
 
 msgid "Scene Name"
 msgstr "Nazwa sceny"
 
+msgid "Base Path"
+msgstr "Ścieżka bazowa"
+
+msgid "Filename"
+msgstr "Nazwa pliku"
+
+msgid "Root Nodes"
+msgstr "Korzenie"
+
+msgid "Texture Samplers"
+msgstr "Próbniki tekstur"
+
 msgid "Images"
 msgstr "Obrazy"
 
 msgid "Cameras"
 msgstr "Kamery"
 
+msgid "Lights"
+msgstr "Światła"
+
+msgid "Unique Names"
+msgstr "Unikalne nazwy"
+
 msgid "Unique Animation Names"
 msgstr "Unikalne nazwy animacji"
 
+msgid "Skeletons"
+msgstr "Szkielety"
+
+msgid "Create Animations"
+msgstr "Utwórz animacje"
+
 msgid "Animations"
 msgstr "Animacje"
 
+msgid "Handle Binary Image"
+msgstr "Obsłuż obraz binarny"
+
+msgid "Buffer View"
+msgstr "Widok bufora"
+
 msgid "Byte Offset"
 msgstr "Przesunięcie bajtu"
 
+msgid "Component Type"
+msgstr "Typ komponentu"
+
+msgid "Normalized"
+msgstr "Znormalizowany"
+
 msgid "Count"
 msgstr "Liczba"
 
+msgid "Accessor Type"
+msgstr "Typ akcesora"
+
+msgid "Min"
+msgstr "Min."
+
+msgid "Max"
+msgstr "Maks."
+
+msgid "Sparse Count"
+msgstr "Liczba rzadkich"
+
 msgid "Sparse Indices Buffer View"
-msgstr "Parsowanie bufora indeksów rzadkich"
+msgstr "Widok bufora indeksów rzadkich"
+
+msgid "Sparse Indices Byte Offset"
+msgstr "Przesunięcie bufora indeksów rzadkich"
 
 msgid "Sparse Indices Component Type"
 msgstr "Parsowanie Geometrii"
 
+msgid "Sparse Values Buffer View"
+msgstr "Widok bufora wartości rzadkich"
+
+msgid "Sparse Values Byte Offset"
+msgstr "Przesunięcie bufora wartości rzadkich"
+
+msgid "Original Name"
+msgstr "Oryginalna nazwa"
+
 msgid "Loop"
 msgstr "Zapętl"
 
+msgid "Buffer"
+msgstr "Bufor"
+
+msgid "Byte Length"
+msgstr "Długość bajtowa"
+
+msgid "Byte Stride"
+msgstr "Krok bajtowy"
+
+msgid "Indices"
+msgstr "Indeksy"
+
+msgid "Vertex Attributes"
+msgstr "Atrybuty wierzchołków"
+
 msgid "Perspective"
 msgstr "Perspektywa"
 
@@ -3161,18 +3812,69 @@ msgstr "FOV"
 msgid "Size Mag"
 msgstr "Rozmiar"
 
+msgid "Depth Far"
+msgstr "Daleka głębokość"
+
+msgid "Depth Near"
+msgstr "Bliska głębokość"
+
+msgid "Blend Weights"
+msgstr "Wagi mieszania"
+
 msgid "Instance Materials"
 msgstr "Materiały instancji"
 
+msgid "Parent"
+msgstr "Nadrzędny"
+
+msgid "Xform"
+msgstr "Przekształcenie"
+
 msgid "Skin"
 msgstr "Skórka"
 
+msgid "Children"
+msgstr "Podrzędne"
+
 msgid "Light"
 msgstr "Światło"
 
+msgid "glTF to Godot Expression"
+msgstr "Wyrażenie glTF do Godot"
+
+msgid "Godot to glTF Expression"
+msgstr "Wyrażenie Godot do glTF"
+
+msgid "Node Paths"
+msgstr "Ścieżki węzłów"
+
+msgid "Object Model Type"
+msgstr "Typ modelu obiektu"
+
+msgid "Json Pointers"
+msgstr "Wskaźniki JSON"
+
+msgid "Variant Type"
+msgstr "Typ Variant"
+
+msgid "Joints"
+msgstr "Złącza"
+
 msgid "Roots"
 msgstr "Korzenie"
 
+msgid "Godot Bone Node"
+msgstr "Węzeł kości Godota"
+
+msgid "Skin Root"
+msgstr "Korzeń skórki"
+
+msgid "Joints Original"
+msgstr "Oryginał złączy"
+
+msgid "Non Joints"
+msgstr "Nie-złącza"
+
 msgid "Godot Skin"
 msgstr "Skórka Godot"
 
@@ -3182,6 +3884,18 @@ msgstr "Obraz źródłowy"
 msgid "Sampler"
 msgstr "Próbnik (sampler)"
 
+msgid "Mag Filter"
+msgstr "Filtr powiększenia"
+
+msgid "Min Filter"
+msgstr "Filtr pomniejszenia"
+
+msgid "Wrap S"
+msgstr "Zawiń S"
+
+msgid "Wrap T"
+msgstr "Zawiń T"
+
 msgid "Mesh Library"
 msgstr "Biblioteka meshów"
 
@@ -3206,18 +3920,192 @@ msgstr "Wyśrodkowanie Z"
 msgid "Priority"
 msgstr "Priorytet"
 
+msgid "Bake Navigation"
+msgstr "Wypal nawigację"
+
+msgid "Clip Count"
+msgstr "Liczba klipów"
+
+msgid "Initial Clip"
+msgstr "Początkowy klip"
+
+msgid "Shuffle"
+msgstr "Przemieszaj"
+
+msgid "Fade Time"
+msgstr "Czas zaniku"
+
+msgid "Stream Count"
+msgstr "Liczba strumieni"
+
+msgid "Jolt Physics 3D"
+msgstr "Fizyka 3D Jolt"
+
+msgid "Simulation"
+msgstr "Symulacja"
+
+msgid "Velocity Steps"
+msgstr "Kroki prędkości"
+
+msgid "Position Steps"
+msgstr "Kroki pozycji"
+
+msgid "Use Enhanced Internal Edge Removal"
+msgstr "Użyj ulepszonego usuwania wewnętrznych krawędzi"
+
+msgid "Areas Detect Static Bodies"
+msgstr "Obszary wykrywają statyczne ciała"
+
+msgid "Generate All Kinematic Contacts"
+msgstr "Generuj wszystkie kinematyczne kontakty"
+
+msgid "Penetration Slop"
+msgstr "Spadek penetracji"
+
+msgid "Speculative Contact Distance"
+msgstr "Odległość spekulacyjnych kontaktów"
+
+msgid "Baumgarte Stabilization Factor"
+msgstr "Czynnik stabilizacji Baumgarta"
+
+msgid "Soft Body Point Radius"
+msgstr "Promień punktu ciał miękkich"
+
+msgid "Bounce Velocity Threshold"
+msgstr "Próg prędkości odbicia"
+
+msgid "Allow Sleep"
+msgstr "Zezwalaj na spanie"
+
+msgid "Sleep Velocity Threshold"
+msgstr "Próg prędkości spania"
+
+msgid "Sleep Time Threshold"
+msgstr "Próg czasu spania"
+
+msgid "Continuous CD Movement Threshold"
+msgstr "Próg ruchu ciągłego wykrywania kolizji"
+
+msgid "Continuous CD Max Penetration"
+msgstr "Maks. penetracja ciągłego wykrywania kolizji"
+
+msgid "Body Pair Contact Cache Enabled"
+msgstr "Włącz pamięć kontaktów par ciał"
+
+msgid "Body Pair Contact Cache Distance Threshold"
+msgstr "Próg odległości pamięci kontaktów par ciał"
+
+msgid "Body Pair Contact Cache Angle Threshold"
+msgstr "Próg kąta pamięci kontaktów par ciał"
+
+msgid "Queries"
+msgstr "Zapytania"
+
+msgid "Enable Ray Cast Face Index"
+msgstr "Włącz indeks ścian rzutu promieni"
+
+msgid "Motion Queries"
+msgstr "Zapytania ruchu"
+
+msgid "Recovery Iterations"
+msgstr "Iteracje ratunkowe"
+
+msgid "Recovery Amount"
+msgstr "Wartość ratowania"
+
+msgid "Collisions"
+msgstr "Kolizje"
+
+msgid "Collision Margin Fraction"
+msgstr "Ułamek marginesu kolizji"
+
+msgid "Active Edge Threshold"
+msgstr "Próg aktywnej krawędzi"
+
+msgid "World Node"
+msgstr "Węzeł świata"
+
+msgid "Temporary Memory Buffer Size"
+msgstr "Rozmiar bufora pamięci tymczasowej"
+
+msgid "World Boundary Shape Size"
+msgstr "Rozmiar kształtu granicy świata"
+
+msgid "Max Linear Velocity"
+msgstr "Maksymalna prędkość liniowa"
+
+msgid "Max Angular Velocity"
+msgstr "Maksymalna prędkość kątowa"
+
+msgid "Max Bodies"
+msgstr "Maksymalne ciała"
+
+msgid "Max Body Pairs"
+msgstr "Maksymalne pary ciał"
+
+msgid "Max Contact Constraints"
+msgstr "Maksymalne ograniczenia kontaktu"
+
 msgid "Lightmapping"
 msgstr "Mapowanie światła"
 
+msgid "Bake Quality"
+msgstr "Jakość wypalania"
+
+msgid "Low Quality Ray Count"
+msgstr "Liczba promieni niskiej jakości"
+
+msgid "Medium Quality Ray Count"
+msgstr "Liczba promieni średniej jakości"
+
+msgid "High Quality Ray Count"
+msgstr "Liczba promieni wysokiej jakości"
+
+msgid "Ultra Quality Ray Count"
+msgstr "Liczba promieni ultra wysokiej jakości"
+
+msgid "Bake Performance"
+msgstr "Wydajność wypalania"
+
+msgid "Max Rays per Pass"
+msgstr "Maks. promienie na przejście"
+
 msgid "Region Size"
 msgstr "Rozmiar regionu"
 
+msgid "Max Transparency Rays"
+msgstr "Maks. promienie przezroczystości"
+
+msgid "Low Quality Probe Ray Count"
+msgstr "Liczba promieni sondy niskiej jakości"
+
+msgid "Medium Quality Probe Ray Count"
+msgstr "Liczba promieni sondy średniej jakości"
+
+msgid "High Quality Probe Ray Count"
+msgstr "Liczba promieni sondy wysokiej jakości"
+
+msgid "Ultra Quality Probe Ray Count"
+msgstr "Liczba promieni sondy ultra wysokiej jakości"
+
+msgid "Max Rays per Probe Pass"
+msgstr "Maks. promienie na przejście sondy"
+
+msgid "Denoising"
+msgstr "Odszumianie"
+
 msgid "Denoiser"
 msgstr "Filtr"
 
 msgid "BPM"
 msgstr "BPM"
 
+msgid "Beat Count"
+msgstr "Liczba uderzeń"
+
+msgid "Bar Beats"
+msgstr "Uderzenia taktu"
+
 msgid "Loop Offset"
 msgstr "Przesunięcie pętli"
 
@@ -3230,6 +4118,12 @@ msgstr "PD"
 msgid "Display Width"
 msgstr "Szerokość wyświetlacza"
 
+msgid "Display to Lens"
+msgstr "Wyświetlacz do soczewki"
+
+msgid "Offset Rect"
+msgstr "Prostokąt przesunięcia"
+
 msgid "Oversample"
 msgstr "Nadpróbkowanie"
 
@@ -3239,15 +4133,60 @@ msgstr "K1"
 msgid "K2"
 msgstr "K2"
 
+msgid "Vulkan VRS"
+msgstr "VRS Vulkana"
+
+msgid "Min Radius"
+msgstr "Minimalny promień"
+
+msgid "Spawn Path"
+msgstr "Ścieżka odradzania"
+
 msgid "Spawn Limit"
 msgstr "Limit odradzania"
 
+msgid "Root Path"
+msgstr "Ścieżka korzenia"
+
+msgid "Replication Interval"
+msgstr "Odstęp między replikacjami"
+
+msgid "Delta Interval"
+msgstr "Odstęp między deltami"
+
+msgid "Visibility Update Mode"
+msgstr "Tryb aktualizowania widoczności"
+
+msgid "Public Visibility"
+msgstr "Widoczność publiczna"
+
+msgid "Auth Callback"
+msgstr "Zawołanie autoryzacji"
+
+msgid "Auth Timeout"
+msgstr "Limit czasu autoryzacji"
+
 msgid "Allow Object Decoding"
 msgstr "Zezwalaj na dekodowanie obiektów"
 
 msgid "Refuse New Connections"
 msgstr "Odmowa nowych połączeń"
 
+msgid "Server Relay"
+msgstr "Przekaźnik serwera"
+
+msgid "Max Sync Packet Size"
+msgstr "Maks. rozmiar pakietu synchronizacji"
+
+msgid "Max Delta Packet Size"
+msgstr "Maks. rozmiar pakietu delty"
+
+msgid "Noise Type"
+msgstr "Typ szumu"
+
+msgid "Frequency"
+msgstr "Częstotliwość"
+
 msgid "Fractal"
 msgstr "Fraktal"
 
@@ -3260,27 +4199,168 @@ msgstr "Lakoniczność"
 msgid "Gain"
 msgstr "Wzmocnienie"
 
+msgid "Weighted Strength"
+msgstr "Siła ważona"
+
+msgid "Ping Pong Strength"
+msgstr "Siła ping-pong"
+
+msgid "Cellular"
+msgstr "Komórkowy"
+
+msgid "Distance Function"
+msgstr "Funkcja odległości"
+
 msgid "Jitter"
 msgstr "Drganie"
 
+msgid "Return Type"
+msgstr "Typ zwracany"
+
+msgid "Domain Warp"
+msgstr "Zawinięcie zakresu"
+
+msgid "Amplitude"
+msgstr "Amplituda"
+
+msgid "Fractal Type"
+msgstr "Typ fraktala"
+
+msgid "Fractal Octaves"
+msgstr "Oktawy fraktala"
+
+msgid "Fractal Lacunarity"
+msgstr "Lakunarność fraktala"
+
+msgid "Fractal Gain"
+msgstr "Wzrost fraktala"
+
 msgid "Width"
 msgstr "Szerokość"
 
 msgid "Invert"
 msgstr "Odwróć"
 
+msgid "In 3D Space"
+msgstr "W przestrzeni 3D"
+
+msgid "Seamless"
+msgstr "Bezszwowy"
+
+msgid "Seamless Blend Skirt"
+msgstr "Brzeg bezszwowego mieszania"
+
 msgid "As Normal Map"
 msgstr "Jako normalna mapa"
 
 msgid "Bump Strength"
 msgstr "Siła uderzenia"
 
+msgid "Color Ramp"
+msgstr "Rampa koloru"
+
 msgid "Noise"
 msgstr "Szum"
 
+msgid "Localized Name"
+msgstr "Nazwa lokalizowana"
+
+msgid "Action Type"
+msgstr "Typ akcji"
+
+msgid "Toplevel Paths"
+msgstr "Ścieżki najwyższego rzędu"
+
+msgid "Binding Path"
+msgstr "Ścieżka wiązania"
+
+msgid "Interaction Profile Path"
+msgstr "Ścieżka profilu interakcji"
+
+msgid "Runtime Paths"
+msgstr "Ścieżki czasu uruchomienia"
+
+msgid "Action Set"
+msgstr "Zestaw akcji"
+
+msgid "Input Path"
+msgstr "Ścieżka wejścia"
+
+msgid "Threshold Released"
+msgstr "Próg puszczenia"
+
+msgid "Center Region"
+msgstr "Obszar środkowy"
+
+msgid "Wedge Angle"
+msgstr "Kąt klinu"
+
+msgid "Is Sticky"
+msgstr "Jest przyczepny"
+
+msgid "On Haptic"
+msgstr "Na dotyku"
+
+msgid "Off Haptic"
+msgstr "Na puszczeniu"
+
+msgid "On Threshold"
+msgstr "Na progu"
+
+msgid "Off Threshold"
+msgstr "Poza progiem"
+
+msgid "Display Refresh Rate"
+msgstr "Pokaż częstotliwość odświeżania"
+
 msgid "Render Target Size Multiplier"
 msgstr "Multiplier rozmiaru obiektu renderowania"
 
+msgid "Layer Viewport"
+msgstr "Ułóż widok"
+
+msgid "Use Android Surface"
+msgstr "Użyj powierzchni Androida"
+
+msgid "Android Surface Size"
+msgstr "Rozmiar powierzchni Androida"
+
+msgid "Sort Order"
+msgstr "Kolejność sortowania"
+
+msgid "Alpha Blend"
+msgstr "Mieszanie alpha"
+
+msgid "Enable Hole Punch"
+msgstr "Włącz wybijanie dziur"
+
+msgid "Aspect Ratio"
+msgstr "Współczynnik proporcji"
+
+msgid "Central Angle"
+msgstr "Kąt środkowy"
+
+msgid "Fallback Segments"
+msgstr "Segmenty awaryjne"
+
+msgid "Central Horizontal Angle"
+msgstr "Kąt środkowy poziomy"
+
+msgid "Upper Vertical Angle"
+msgstr "Kąt pionowy górny"
+
+msgid "Lower Vertical Angle"
+msgstr "Kąt pionowy dolny"
+
+msgid "Quad Size"
+msgstr "Rozmiar czworokąta"
+
+msgid "Hand"
+msgstr "Dłoń"
+
+msgid "Motion Range"
+msgstr "Zakres ruchu"
+
 msgid "Names"
 msgstr "Nazwy"
 
@@ -3335,9 +4415,6 @@ msgstr "Funkcje XR"
 msgid "XR Mode"
 msgstr "Tryb XR"
 
-msgid "Screen"
-msgstr "Ekran"
-
 msgid "Immersive Mode"
 msgstr "Tryb Immersyjny"
 
@@ -3422,9 +4499,6 @@ msgstr "Bieżący"
 msgid "Max Distance"
 msgstr "Odległość maksymalna"
 
-msgid "Rect"
-msgstr "Prostokąt"
-
 msgid "Ignore Rotation"
 msgstr "Ignoruj Obrót"
 
@@ -3623,9 +4697,6 @@ msgstr "Filtr tekstury"
 msgid "Text"
 msgstr "Tekst"
 
-msgid "Font Size"
-msgstr "Rozmiar czcionki"
-
 msgid "Horizontal Alignment"
 msgstr "Poziome Wyrównanie"
 
@@ -3962,9 +5033,6 @@ msgstr "Miks"
 msgid "Fog"
 msgstr "Mgła"
 
-msgid "Contrast"
-msgstr "Kontrast"
-
 msgid "Saturation"
 msgstr "Nasycenie"
 
diff --git a/engine/editor/translations/properties/pt.po b/engine/editor/translations/properties/pt.po
index e4447c41..88702384 100644
--- a/engine/editor/translations/properties/pt.po
+++ b/engine/editor/translations/properties/pt.po
@@ -952,6 +952,9 @@ msgstr "Mostra Ícone de Atualização"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Modo de Baixo Consumo do Processador ao ficar Fora de Foco por (µsec)"
 
+msgid "V-Sync Mode"
+msgstr "Modo V-Sync"
+
 msgid "Update Continuously"
 msgstr "Atualização Contínua"
 
@@ -1003,6 +1006,9 @@ msgstr "Recursos para abrir em Novo Inspetor"
 msgid "Theme"
 msgstr "Tema"
 
+msgid "Contrast"
+msgstr "Contraste"
+
 msgid "Draw Extra Borders"
 msgstr "Desenhar bordas extras"
 
@@ -1144,6 +1150,9 @@ msgstr "Editor de Texto"
 msgid "Line Spacing"
 msgstr "Espaçamento de Linha"
 
+msgid "Color Theme"
+msgstr "Cor do Tema"
+
 msgid "Appearance"
 msgstr "Aparência"
 
@@ -1576,9 +1585,6 @@ msgstr "Restaurar Shaders ao Carregar"
 msgid "Visual Editors"
 msgstr "Editor Visual"
 
-msgid "Color Theme"
-msgstr "Cor do Tema"
-
 msgid "Minimap Opacity"
 msgstr "Opacidade do Minimapa"
 
@@ -1600,9 +1606,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Posicionamento da Janela"
 
+msgid "Rect"
+msgstr "Retângulo"
+
 msgid "Rect Custom Position"
 msgstr "Posição Personalizada do Retângulo"
 
+msgid "Screen"
+msgstr "Tela"
+
 msgid "Auto Save"
 msgstr "Salvamento Automático"
 
@@ -1612,6 +1624,9 @@ msgstr "Salvar Antes de Executar"
 msgid "Output"
 msgstr "Saída"
 
+msgid "Font Size"
+msgstr "Tamanho da Fonte"
+
 msgid "Always Clear Output on Play"
 msgstr "Sempre Limpar a Saída no modo Play"
 
@@ -2467,9 +2482,6 @@ msgstr "Portátil"
 msgid "Orientation"
 msgstr "Orientação"
 
-msgid "V-Sync Mode"
-msgstr "Modo V-Sync"
-
 msgid "Output Latency"
 msgstr "Latência de Saída"
 
@@ -3436,9 +3448,6 @@ msgstr "Funcionalidades XR"
 msgid "XR Mode"
 msgstr "Modo XR"
 
-msgid "Screen"
-msgstr "Tela"
-
 msgid "Immersive Mode"
 msgstr "Modo Imersivo"
 
@@ -3937,9 +3946,6 @@ msgstr "Máscara de Área"
 msgid "Copy Mode"
 msgstr "Mode de Cópia"
 
-msgid "Rect"
-msgstr "Retângulo"
-
 msgid "Anchor Mode"
 msgstr "Modo de Âncora"
 
@@ -4537,9 +4543,6 @@ msgstr "Contorno Modular"
 msgid "Font"
 msgstr "Fonte"
 
-msgid "Font Size"
-msgstr "Tamanho da Fonte"
-
 msgid "Horizontal Alignment"
 msgstr "Alinhamento Horizontal"
 
@@ -6073,9 +6076,6 @@ msgstr "Anisotrópico"
 msgid "Adjustments"
 msgstr "Ajustamentos"
 
-msgid "Contrast"
-msgstr "Contraste"
-
 msgid "Saturation"
 msgstr "Separação"
 
diff --git a/engine/editor/translations/properties/pt_BR.po b/engine/editor/translations/properties/pt_BR.po
index 79dbcb1e..f5fb6cd0 100644
--- a/engine/editor/translations/properties/pt_BR.po
+++ b/engine/editor/translations/properties/pt_BR.po
@@ -168,13 +168,14 @@
 # Ruan Victor <ruanvictordossantoscorrea128@gmail.com>, 2024.
 # GSPAtens <g007sp@gmail.com>, 2024.
 # dweob <dweob@c0de.wtf>, 2024.
+# Gabriel Rauta Zanette <fupicat@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: 2016-05-30\n"
-"PO-Revision-Date: 2024-12-14 01:25+0000\n"
-"Last-Translator: dweob <dweob@c0de.wtf>\n"
+"PO-Revision-Date: 2025-03-13 02:50+0000\n"
+"Last-Translator: Gabriel Rauta Zanette <fupicat@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/godot-"
 "engine/godot-properties/pt_BR/>\n"
 "Language: pt_BR\n"
@@ -182,7 +183,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.9-rc\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Application"
 msgstr "Aplicação"
@@ -203,7 +204,7 @@ msgid "Version"
 msgstr "Versão"
 
 msgid "Run"
-msgstr "Executar"
+msgstr "Execução"
 
 msgid "Main Scene"
 msgstr "Cena Principal"
@@ -215,10 +216,10 @@ msgid "Disable stderr"
 msgstr "Desativar stderr"
 
 msgid "Print Header"
-msgstr "Imprimir Cabeçalho"
+msgstr "Mostrar Cabeçalho"
 
 msgid "Enable Alt Space Menu"
-msgstr "Habilite Menu Alt Space"
+msgstr "Habilitar Menu Alt Space"
 
 msgid "Use Hidden Project Data Directory"
 msgstr "Usar Diretório de Dados de Projeto Oculto"
@@ -230,13 +231,13 @@ msgid "Custom User Dir Name"
 msgstr "Nome do Diretório de Usuário Personalizado"
 
 msgid "Project Settings Override"
-msgstr "Substituição de Configurações do Projeto"
+msgstr "Substituir Configurações do Projeto"
 
 msgid "Main Loop Type"
 msgstr "Tipo de Loop Principal"
 
 msgid "Auto Accept Quit"
-msgstr "Aceitar Sair Automaticamente"
+msgstr "Sair Automaticamente ao Fechar"
 
 msgid "Quit on Go Back"
 msgstr "Encerrar ao Voltar"
@@ -275,22 +276,25 @@ msgid "Borderless"
 msgstr "Sem Bordas"
 
 msgid "Always on Top"
-msgstr "Sempre no topo"
+msgstr "Sempre no Topo"
 
 msgid "Transparent"
 msgstr "Transparente"
 
 msgid "Extend to Title"
-msgstr "Estender até o título"
+msgstr "Estender até a Barra de Título"
 
 msgid "No Focus"
 msgstr "Sem Foco"
 
+msgid "Sharp Corners"
+msgstr "Bordas Pontudas"
+
 msgid "Window Width Override"
-msgstr "Substituição da largura da janela"
+msgstr "Substituir Largura da Janela"
 
 msgid "Window Height Override"
-msgstr "Substituição da altura da janela"
+msgstr "Substituir Altura da Janela"
 
 msgid "Energy Saving"
 msgstr "Economia de Energia"
@@ -305,19 +309,19 @@ msgid "Warnings"
 msgstr "Avisos"
 
 msgid "Check Invalid Track Paths"
-msgstr "Verifique caminhos de trilha inválidos"
+msgstr "Verificar Caminhos de Faixa Inválidos"
 
 msgid "Check Angle Interpolation Type Conflicting"
-msgstr "Verifique o Tipo de Interpolação de Ângulo Conflitante"
+msgstr "Verificar Conflito em Tipo de Interpolação de Ângulo"
 
 msgid "Audio"
 msgstr "Áudio"
 
 msgid "Buses"
-msgstr "Barramento"
+msgstr "Canais"
 
 msgid "Default Bus Layout"
-msgstr "Layout Padrão de Barramento"
+msgstr "Layout Padrão de Canais"
 
 msgid "General"
 msgstr "Geral"
@@ -329,10 +333,10 @@ msgid "Text to Speech"
 msgstr "Texto para Voz"
 
 msgid "2D Panning Strength"
-msgstr "Intensidade da Panorâmica 2D"
+msgstr "Intensidade do Panning 2D"
 
 msgid "3D Panning Strength"
-msgstr "Intensidade da Panorâmica 3D"
+msgstr "Intensidade do Panning 3D"
 
 msgid "iOS"
 msgstr "iOS"
@@ -347,11 +351,20 @@ msgid "Subwindows"
 msgstr "Subjanelas"
 
 msgid "Embed Subwindows"
-msgstr "Subjanelas embutidas"
+msgstr "Subjanelas Embutidas"
+
+msgid "Frame Pacing"
+msgstr "Sincronia de Quadros"
 
 msgid "Android"
 msgstr "Android"
 
+msgid "Enable Frame Pacing"
+msgstr "Ativar Sincronia de Quadros"
+
+msgid "Swappy Mode"
+msgstr "Modo do Swappy"
+
 msgid "Physics"
 msgstr "Física"
 
@@ -359,7 +372,7 @@ msgid "2D"
 msgstr "2D"
 
 msgid "Run on Separate Thread"
-msgstr "Rodar em Thread separada"
+msgstr "Rodar em Thread Separada"
 
 msgid "3D"
 msgstr "3D"
@@ -388,6 +401,9 @@ msgstr "Analisador"
 msgid "Max Functions"
 msgstr "Máximo de Funções"
 
+msgid "Max Timestamp Query Elements"
+msgstr "Máximo de Pedidos de Data e Hora"
+
 msgid "Compression"
 msgstr "Compressão"
 
@@ -398,7 +414,7 @@ msgid "Zstd"
 msgstr "Zstd"
 
 msgid "Long Distance Matching"
-msgstr "Correspondência de longa distância (LDM)"
+msgstr "Correspondência de Longa Distância (LDM)"
 
 msgid "Compression Level"
 msgstr "Nível de Compressão"
@@ -407,34 +423,37 @@ msgid "Window Log Size"
 msgstr "Tamanho da Janela de Log"
 
 msgid "Zlib"
-msgstr "Software Zlib"
+msgstr "Zlib"
 
 msgid "Gzip"
-msgstr "'Gzip'"
+msgstr "Gzip"
 
 msgid "Crash Handler"
-msgstr "Gerenciador de Falhas"
+msgstr "Gerenciador de Crash"
 
 msgid "Message"
 msgstr "Mensagem"
 
 msgid "Rendering"
-msgstr "Renderizando"
+msgstr "Renderização"
 
 msgid "Occlusion Culling"
-msgstr "Seleção de Oclusão"
+msgstr "Occlusion Culling"
 
 msgid "BVH Build Quality"
 msgstr "Qualidade de Build do BVH"
 
+msgid "Jitter Projection"
+msgstr "Projeção contra Jitter"
+
 msgid "Internationalization"
 msgstr "Internacionalização"
 
 msgid "Force Right to Left Layout Direction"
-msgstr "Forçar Direção de Layout Direita para Esquerda"
+msgstr "Forçar Layout da Direita para Esquerda"
 
 msgid "Root Node Layout Direction"
-msgstr "Direção da Estrutura do Nó Raiz"
+msgstr "Direção do Layout do Nó Raiz"
 
 msgid "Root Node Auto Translate"
 msgstr "Auto Traduzir Nó Raiz"
@@ -446,7 +465,7 @@ msgid "Timers"
 msgstr "Temporizadores"
 
 msgid "Incremental Search Max Interval Msec"
-msgstr "Máximo intervalo de busca incremental Msec"
+msgstr "Intervalo Máximo de Busca Incremental Msec"
 
 msgid "Tooltip Delay (sec)"
 msgstr "Delay do Tooltip (seg)"
@@ -455,7 +474,7 @@ msgid "Common"
 msgstr "Comum"
 
 msgid "Snap Controls to Pixels"
-msgstr "Fixar Controles em Pixels"
+msgstr "Alinhar Controles a Pixels"
 
 msgid "Fonts"
 msgstr "Fontes"
@@ -467,7 +486,7 @@ msgid "Use Oversampling"
 msgstr "Utilizar Oversampling"
 
 msgid "Rendering Device"
-msgstr "Aparato de Renderização"
+msgstr "Dispositivo de Renderização"
 
 msgid "V-Sync"
 msgstr "Sincronização Vertical (V-Sync)"
@@ -475,8 +494,11 @@ msgstr "Sincronização Vertical (V-Sync)"
 msgid "Frame Queue Size"
 msgstr "Tamanho da Fila de Quadros"
 
+msgid "Swapchain Image Count"
+msgstr "Número de Imagens Swapchain"
+
 msgid "Staging Buffer"
-msgstr "Buffer de preparação"
+msgstr "Buffer de Preparação"
 
 msgid "Block Size (KB)"
 msgstr "Tamanho de Bloco (KB)"
@@ -485,22 +507,25 @@ msgid "Max Size (MB)"
 msgstr "Tamanho Máximo (MB)"
 
 msgid "Texture Upload Region Size Px"
-msgstr "Tamanho da região de upload de Textura (PX)"
+msgstr "Tamanho da Região de Upload de Textura (Px)"
+
+msgid "Texture Download Region Size Px"
+msgstr "Tamanho da Região de Download de Textura (Px)"
 
 msgid "Pipeline Cache"
-msgstr "Armazenamento Temporário"
+msgstr "Cache do Pipeline"
 
 msgid "Enable"
 msgstr "Habilitar"
 
 msgid "Save Chunk Size (MB)"
-msgstr "Tamanho (MB) dos Blocos Salvos"
+msgstr "Tamanho (MB) para Guardar Blocos"
 
 msgid "Vulkan"
-msgstr "Vulkan(API)"
+msgstr "Vulkan"
 
 msgid "Max Descriptors per Pool"
-msgstr "Máximo de descritores por pool"
+msgstr "Máximo de Descritores por Pool"
 
 msgid "D3D12"
 msgstr "D3D12"
@@ -508,6 +533,15 @@ msgstr "D3D12"
 msgid "Max Resource Descriptors per Frame"
 msgstr "Máximo de Descritores de Recurso por Quadro"
 
+msgid "Max Sampler Descriptors per Frame"
+msgstr "Máximo de Descritores de Sampler por Quadro"
+
+msgid "Max Misc Descriptors per Frame"
+msgstr "Máximo de Descritores Diversos por Quadro"
+
+msgid "Agility SDK Version"
+msgstr "Versão do Agility SDK"
+
 msgid "Textures"
 msgstr "Texturas"
 
@@ -518,43 +552,49 @@ msgid "Default Texture Filter"
 msgstr "Filtro de Textura Padrão"
 
 msgid "Default Texture Repeat"
-msgstr "Padrão de repetição de textura"
+msgstr "Padrão de Repetição de Textura"
 
 msgid "Collada"
 msgstr "Collada"
 
 msgid "Use Ambient"
-msgstr "Utilizar Ambient"
+msgstr "Usar Luzes Ambientes"
 
 msgid "Input Devices"
 msgstr "Dispositivos de Entrada"
 
 msgid "Pointing"
-msgstr "Apontando"
+msgstr "Cursores"
 
 msgid "Enable Long Press as Right Click"
-msgstr "Habilitar pressão longa como clique no botão direito"
+msgstr "Interpretar Toque Longo como Clique Direito"
 
 msgid "Enable Pan and Scale Gestures"
-msgstr "Habilitar Pan e Gestos em Scala"
+msgstr "Habilitar Gestos Multi-toque de Controle da Câmera"
 
 msgid "Rotary Input Scroll Axis"
-msgstr "Eixo rotativo da entrada de rolagem"
+msgstr "Eixo Rotativo da Entrada Rotatória"
 
 msgid "Low Processor Usage Mode"
-msgstr "Modo de Baixo Uso de Processador"
+msgstr "Modo de Baixo Uso do Processador"
+
+msgid "Low Processor Usage Mode Sleep (µsec)"
+msgstr "Modo de Baixo Uso do Processador: Sleep (µsec)"
 
 msgid "Delta Smoothing"
-msgstr "Suavização de Deltas"
+msgstr "Suavização do Tempo Delta"
 
 msgid "Print Error Messages"
-msgstr "Imprimir Mensagens de Erro"
+msgstr "Mostrar Mensagens de Erro"
+
+msgid "Print to stdout"
+msgstr "Mostrar no stdout"
 
 msgid "Physics Ticks per Second"
-msgstr "Ticks de física por segundo"
+msgstr "Ticks de Física por Segundo"
 
 msgid "Max Physics Steps per Frame"
-msgstr "Máximo passos de física por quadro"
+msgstr "Máximo de Ticks de Física por Quadro"
 
 msgid "Max FPS"
 msgstr "FPS Máximo"
@@ -563,25 +603,40 @@ msgid "Time Scale"
 msgstr "Escala de Tempo"
 
 msgid "Physics Jitter Fix"
-msgstr "Correção de Jitter de Física"
+msgstr "Corrigir Jitter de Física"
 
 msgid "Mouse Mode"
 msgstr "Modo do Mouse"
 
 msgid "Use Accumulated Input"
-msgstr "Usar entrada acumulada"
+msgstr "Usar Entrada Acumulada"
 
 msgid "Emulate Mouse From Touch"
-msgstr "Simular Mouse à Partir do Touch"
+msgstr "Simular Mouse a Partir do Toque"
 
 msgid "Emulate Touch From Mouse"
-msgstr "Simular Toque à Partir do Mouse"
+msgstr "Simular Toque a Partir do Mouse"
 
 msgid "Compatibility"
 msgstr "Compatibilidade"
 
 msgid "Legacy Just Pressed Behavior"
-msgstr "Comportamento do Pressionamento Instantâneo Clássico"
+msgstr "Comportamento Antigo de \"Just Pressed\""
+
+msgid "Sensors"
+msgstr "Sensores"
+
+msgid "Enable Accelerometer"
+msgstr "Habilitar Acelerômetro"
+
+msgid "Enable Gravity"
+msgstr "Habilitar Gravidade"
+
+msgid "Enable Gyroscope"
+msgstr "Habilitar Giroscópio"
+
+msgid "Enable Magnetometer"
+msgstr "Habilitar Magnetômetro"
 
 msgid "Device"
 msgstr "Dispositivo"
@@ -590,7 +645,7 @@ msgid "Window ID"
 msgstr "ID da Janela"
 
 msgid "Command or Control Autoremap"
-msgstr "Comando ou Controle Autoremap"
+msgstr "Autoremapear Comando ou Controle"
 
 msgid "Alt Pressed"
 msgstr "Alt Pressionado"
@@ -608,16 +663,16 @@ msgid "Pressed"
 msgstr "Pressionado"
 
 msgid "Keycode"
-msgstr "Keycode (Código de Tecla)"
+msgstr "Keycode"
 
 msgid "Physical Keycode"
-msgstr "Código de Tecla Física"
+msgstr "Keycode Físico"
 
 msgid "Key Label"
 msgstr "Inscrição da Tecla"
 
 msgid "Unicode"
-msgstr "Padrão Unicode"
+msgstr "Unicode"
 
 msgid "Location"
 msgstr "Localização"
@@ -647,7 +702,7 @@ msgid "Double Click"
 msgstr "Clique Duplo"
 
 msgid "Tilt"
-msgstr "Inclinar"
+msgstr "Inclinação"
 
 msgid "Pressure"
 msgstr "Pressão"
@@ -658,9 +713,15 @@ msgstr "Caneta Invertida (\"Borracha\")"
 msgid "Relative"
 msgstr "Relativo"
 
+msgid "Screen Relative"
+msgstr "Relativo à Tela"
+
 msgid "Velocity"
 msgstr "Velocidade"
 
+msgid "Screen Velocity"
+msgstr "Velocidade da Tela"
+
 msgid "Axis"
 msgstr "Eixo"
 
@@ -679,6 +740,9 @@ msgstr "Ação"
 msgid "Strength"
 msgstr "Força"
 
+msgid "Event Index"
+msgstr "Índice do Evento"
+
 msgid "Delta"
 msgstr "Delta"
 
@@ -704,19 +768,19 @@ msgid "Events"
 msgstr "Eventos"
 
 msgid "Include Navigational"
-msgstr "Include Navegacional"
+msgstr "Incluir Navegacionais"
 
 msgid "Include Hidden"
-msgstr "Include Oculto"
+msgstr "Incluir Ocultos"
 
 msgid "Big Endian"
-msgstr "extremidade maior primeiro (Big Endian)"
+msgstr "Big Endian"
 
 msgid "Blocking Mode Enabled"
-msgstr "Modo de bloqueio Ativado"
+msgstr "Modo de Bloqueio Ativado"
 
 msgid "Read Chunk Size"
-msgstr "Ler o tamanho do pedaço"
+msgstr "Tamanho do Chunk de Leitura"
 
 msgid "Data"
 msgstr "Dados"
@@ -725,28 +789,28 @@ msgid "Object ID"
 msgstr "ID do Objeto"
 
 msgid "Encode Buffer Max Size"
-msgstr "Tamanho máximo do buffer de codificação"
+msgstr "Tamanho Máximo do Buffer de Codificação"
 
 msgid "Input Buffer Max Size"
-msgstr "Tamanho máximo do buffer de entrada"
+msgstr "Tamanho Máximo do Buffer de Entrada"
 
 msgid "Output Buffer Max Size"
-msgstr "Tamanho máximo do buffer de saída"
+msgstr "Tamanho Máximo do Buffer de Saída"
 
 msgid "Resource"
 msgstr "Recurso"
 
 msgid "Local to Scene"
-msgstr "Local para cena"
+msgstr "Local à Cena"
 
 msgid "Path"
 msgstr "Caminho"
 
 msgid "Data Array"
-msgstr "Matriz de Dados"
+msgstr "Array de Dados"
 
 msgid "Max Pending Connections"
-msgstr "Conexões Pendentes Máximas"
+msgstr "Máximo de Conexões Pendentes"
 
 msgid "Region"
 msgstr "Região"
@@ -755,7 +819,10 @@ msgid "Offset"
 msgstr "Deslocamento"
 
 msgid "Cell Size"
-msgstr "Tamanho da célula"
+msgstr "Tamanho da Célula"
+
+msgid "Cell Shape"
+msgstr "Formato da Célula"
 
 msgid "Jumping Enabled"
 msgstr "Pulo Habilitado"
@@ -782,7 +849,7 @@ msgid "Limits"
 msgstr "Limites"
 
 msgid "Message Queue"
-msgstr "Fila de mensagens"
+msgstr "Fila de Mensagens"
 
 msgid "Max Steps"
 msgstr "Máximo de Passos"
@@ -797,28 +864,28 @@ msgid "Connect Timeout Seconds"
 msgstr "Segundos de Timeout para Conexão"
 
 msgid "Packet Peer Stream"
-msgstr "Fluxo de Par de Pacotes"
+msgstr "Transmissão de Peer de Pacotes"
 
 msgid "Max Buffer (Power of 2)"
-msgstr "Buffer máximo (ao Quadrado)"
+msgstr "Buffer Máximo (Potência de 2)"
 
 msgid "TLS"
 msgstr "TLS"
 
 msgid "Certificate Bundle Override"
-msgstr "Substituição do pacote de certificado"
+msgstr "Substituir Pacote de Certificado"
 
 msgid "Threading"
-msgstr "Tarefas paralelas (Threading)"
+msgstr "Threading"
 
 msgid "Worker Pool"
-msgstr "Conjunto de Trabalhadores"
+msgstr "Worker Pool"
 
 msgid "Max Threads"
-msgstr "Máx. Threads"
+msgstr "Máximo de Threads"
 
 msgid "Low Priority Thread Ratio"
-msgstr "Taxa de Threads de baixa prioridade"
+msgstr "Proporção de Threads de Baixa Prioridade"
 
 msgid "Locale"
 msgstr "Localidade"
@@ -827,7 +894,7 @@ msgid "Test"
 msgstr "Teste"
 
 msgid "Fallback"
-msgstr "Se_der_Ruim/plano B(Fallback)"
+msgstr "Fallback"
 
 msgid "Pseudolocalization"
 msgstr "Pseudo localização"
@@ -836,13 +903,13 @@ msgid "Use Pseudolocalization"
 msgstr "Usar Pseudo Localização"
 
 msgid "Replace With Accents"
-msgstr "Substituir com acentos"
+msgstr "Substituir por Acentos"
 
 msgid "Double Vowels"
-msgstr "Vogais duplas"
+msgstr "Duplicar Vogais"
 
 msgid "Fake BiDi"
-msgstr "Falso BiDi"
+msgstr "BiDi Falso"
 
 msgid "Override"
 msgstr "Sobrescrever"
@@ -857,7 +924,7 @@ msgid "Suffix"
 msgstr "Sufixo"
 
 msgid "Skip Placeholders"
-msgstr "Escapar espaços reservados"
+msgstr "Pular Placeholders"
 
 msgid "Rotation"
 msgstr "Rotação"
@@ -866,22 +933,25 @@ msgid "Value"
 msgstr "Valor"
 
 msgid "Arg Count"
-msgstr "Quantia de argumentos"
+msgstr "Número de Argumentos"
+
+msgid "Args"
+msgstr "Argumentos"
 
 msgid "Type"
 msgstr "Tipo"
 
 msgid "In Handle"
-msgstr "Manipulador de Entrada"
+msgstr "Ponto de Controle de Entrada"
 
 msgid "Out Handle"
-msgstr "Fora do controle"
+msgstr "Ponto de Controle de Saída"
 
 msgid "Handle Mode"
-msgstr "Modo de Manuseio"
+msgstr "Modo de Ponto de Controle"
 
 msgid "Stream"
-msgstr "Fluxo"
+msgstr "Transmissão"
 
 msgid "Start Offset"
 msgstr "Deslocamento Inicial"
@@ -902,7 +972,7 @@ msgid "Request Timeout"
 msgstr "Tempo Limite de Solicitação"
 
 msgid "Sync Breakpoints"
-msgstr "Pontos de Quebra de Sincronismo"
+msgstr "Sincronizar Pontos de Interrupção"
 
 msgid "Label"
 msgstr "Rótulo"
@@ -910,26 +980,41 @@ msgstr "Rótulo"
 msgid "Read Only"
 msgstr "Apenas Leitura"
 
+msgid "Draw Label"
+msgstr "Desenhar Rótulo"
+
+msgid "Draw Background"
+msgstr "Desenhar Fundo"
+
 msgid "Checkable"
-msgstr "Checável"
+msgstr "Habilitável"
 
 msgid "Checked"
-msgstr "Checado"
+msgstr "Habilitado"
 
 msgid "Draw Warning"
 msgstr "Desenhar Aviso"
 
 msgid "Keying"
-msgstr "Chaveamento"
+msgstr "Inserção de Chaves"
 
 msgid "Deletable"
 msgstr "Deletável"
 
+msgid "Selectable"
+msgstr "Selecionável"
+
+msgid "Use Folding"
+msgstr "Dobragem de Código (Folding)"
+
+msgid "Name Split Ratio"
+msgstr "Proporção de Separação de Nomes"
+
 msgid "Distraction Free Mode"
 msgstr "Modo Sem Distrações"
 
 msgid "Movie Maker Enabled"
-msgstr "Criador de filmes Ativado"
+msgstr "Movie Maker Ativado"
 
 msgid "Base Type"
 msgstr "Tipo Base"
@@ -947,7 +1032,7 @@ msgid "Editor"
 msgstr "Editor"
 
 msgid "Editor Language"
-msgstr "Linguagem do Editor"
+msgstr "Idioma do Editor"
 
 msgid "Asset Library"
 msgstr "Biblioteca de Recursos"
@@ -956,13 +1041,16 @@ msgid "Use Threads"
 msgstr "Usar Threads"
 
 msgid "Localize Settings"
-msgstr "Configurações de Localização"
+msgstr "Traduzir Configurações"
+
+msgid "UI Layout Direction"
+msgstr "Direção do Layout da UI"
 
 msgid "Display Scale"
-msgstr "Exibir Escala"
+msgstr "Escala de Exibição"
 
 msgid "Custom Display Scale"
-msgstr "Escala de Exibição Customizada"
+msgstr "Escala de Exibição Personalizada"
 
 msgid "Editor Screen"
 msgstr "Tela do Editor"
@@ -973,32 +1061,41 @@ msgstr "Tela do Gerenciador de Projetos"
 msgid "Use Embedded Menu"
 msgstr "Usar Menu Integrado"
 
+msgid "Use Native File Dialogs"
+msgstr "Usar Diálogo de Arquivos Nativo"
+
 msgid "Expand to Title"
 msgstr "Expandir para o Título"
 
 msgid "Code Font Contextual Ligatures"
-msgstr "Ligações contextuais da Fonte do código"
+msgstr "Fonte do Código: Ligaduras Contextuais"
 
 msgid "Code Font Custom OpenType Features"
-msgstr "Recursos OpenType personalizados para a Fonte do código"
+msgstr "Fonte do Código: Recursos OpenType Personalizados"
 
 msgid "Code Font Custom Variations"
-msgstr "Variações customizáveis para Fonte do código"
+msgstr "Fonte do Código: Variações Customizáveis"
 
 msgid "Font Subpixel Positioning"
-msgstr "Posicionamento de subpixel da Fonte"
+msgstr "Fonte: Posicionamento de Subpixel"
+
+msgid "Font Disable Embedded Bitmaps"
+msgstr "Fonte: Desabilitar Bitmaps Integrados"
+
+msgid "Font Allow MSDF"
+msgstr "Fonte: Permitir MSDF"
 
 msgid "Main Font"
 msgstr "Fonte Principal"
 
 msgid "Main Font Bold"
-msgstr "Fonte Principal com Negrito"
+msgstr "Fonte em Negrito Principal"
 
 msgid "Code Font"
 msgstr "Fonte do Código"
 
 msgid "Separate Distraction Mode"
-msgstr "Separar Modo Distração"
+msgstr "Modo Sem Distrações Separado"
 
 msgid "Automatically Open Screenshots"
 msgstr "Abrir Capturas de Tela Automaticamente"
@@ -1013,14 +1110,23 @@ msgid "Save Each Scene on Quit"
 msgstr "Salvar Cada Cena ao Sair"
 
 msgid "Accept Dialog Cancel OK Buttons"
-msgstr "Caixa de Diálogo Aceitar: Botões OK/Cancelar"
+msgstr "Diálogo de Confirmação: Botões OK/Cancelar"
 
 msgid "Show Internal Errors in Toast Notifications"
-msgstr "Mostrar Erros Internos em notificações Toast"
+msgstr "Mostrar Erros Internos nas Notificações"
 
 msgid "Show Update Spinner"
 msgstr "Mostrar Spinner de Atualização"
 
+msgid "Low Processor Mode Sleep (µsec)"
+msgstr "Modo de Baixo Processamento: Sleep (µsec)"
+
+msgid "Unfocused Low Processor Mode Sleep (µsec)"
+msgstr "Modo de Baixo Processamento: Sleep Desfocado (µsec)"
+
+msgid "V-Sync Mode"
+msgstr "Modo de V-Sync"
+
 msgid "Update Continuously"
 msgstr "Atualizar Continuamente"
 
@@ -1028,40 +1134,46 @@ msgid "Editors"
 msgstr "Editores"
 
 msgid "Show Scene Tree Root Selection"
-msgstr "Mostrar seleção da hierarquia de cenas"
+msgstr "Mostrar Seleção de Raiz em Novas Cenas"
+
+msgid "Derive Script Globals by Name"
+msgstr "Obter Globais de Script pelo Nome"
 
 msgid "Docks"
-msgstr "Painéis"
+msgstr "Abas"
 
 msgid "Scene Tree"
-msgstr "Árvore de Cena"
+msgstr "Árvore da Cena"
+
+msgid "Ask Before Revoking Unique Name"
+msgstr "Confirmar Remoção de Nome Único"
 
 msgid "Inspector"
 msgstr "Inspetor"
 
 msgid "Show Low Level OpenType Features"
-msgstr "Mostrar atributos de baixo nível OpenType"
+msgstr "Mostrar Atributos OpenType de Baixo Nível"
 
 msgid "Delimitate All Container and Resources"
-msgstr "Delimite todos os contêineres e recursos"
+msgstr "Delimitar Todos os Contêineres e Recursos"
 
 msgid "Default Property Name Style"
 msgstr "Estilo de Nome Padrão de Propriedade"
 
 msgid "Default Float Step"
-msgstr "Passo de Float padrão"
+msgstr "Incremento de Float Padrão"
 
 msgid "Disable Folding"
 msgstr "Desativar Dobragem"
 
 msgid "Auto Unfold Foreign Scenes"
-msgstr "Desdobrar cenas estrangeiras automaticamente"
+msgstr "Desdobrar Cenas Estrangeiras Automaticamente"
 
 msgid "Horizontal Vector2 Editing"
-msgstr "Edição Horizontal do Vector2"
+msgstr "Edição Horizontal de Vector2"
 
 msgid "Horizontal Vector Types Editing"
-msgstr "Edição Horizontal de Tipos de Vetor"
+msgstr "Edição Horizontal de Vetores"
 
 msgid "Open Resources in Current Inspector"
 msgstr "Abrir Recursos no Inspetor Atual"
@@ -1072,11 +1184,17 @@ msgstr "Recursos para abrir em Novo Inspetor"
 msgid "Theme"
 msgstr "Tema"
 
+msgid "Icon and Font Color"
+msgstr "Cor da Fonte e Ícones"
+
+msgid "Contrast"
+msgstr "Contraste"
+
 msgid "Draw Extra Borders"
-msgstr "Desenhar bordas extras"
+msgstr "Desenhar Bordas Extras"
 
 msgid "Icon Saturation"
-msgstr "Saturação do ícone"
+msgstr "Saturação dos Ícones"
 
 msgid "Relationship Line Opacity"
 msgstr "Opacidade da Linha de Relacionamento"
@@ -1085,34 +1203,40 @@ msgid "Border Size"
 msgstr "Tamanho da Borda"
 
 msgid "Corner Radius"
-msgstr "Raio do canto"
+msgstr "Raio dos Cantos"
+
+msgid "Base Spacing"
+msgstr "Separação Base"
 
 msgid "Additional Spacing"
-msgstr "Espaçamento Adicional"
+msgstr "Separação Adicional"
 
 msgid "Custom Theme"
 msgstr "Tema Personalizado"
 
 msgid "Touchscreen"
-msgstr "Tela de Toque"
+msgstr "Touchscreen"
 
 msgid "Scale Gizmo Handles"
-msgstr "Dimensionar alças de gizmo"
+msgstr "Dimensionar Controles do Gizmo"
 
 msgid "Increase Scrollbar Touch Area"
-msgstr "Aumentar barra de rolagem da área de toque"
+msgstr "Aumentar Área da Barra de Rolagem"
 
 msgid "Scene Tabs"
 msgstr "Abas de Cena"
 
 msgid "Display Close Button"
-msgstr "Mostrar botão Fechar"
+msgstr "Mostrar Botão de Fechar"
+
+msgid "Show Thumbnail on Hover"
+msgstr "Exibir Miniatura ao Passar o Mouse"
 
 msgid "Maximum Width"
-msgstr "Largura máxima"
+msgstr "Largura Máxima"
 
 msgid "Show Script Button"
-msgstr "Botão de Exibir Script"
+msgstr "Exibir Botão de Script"
 
 msgid "Restore Scenes on Load"
 msgstr "Restaurar Cenas ao Inicializar"
@@ -1124,13 +1248,13 @@ msgid "External Programs"
 msgstr "Programas Externos"
 
 msgid "Terminal Emulator Flags"
-msgstr "Sinalizadores do Emulador de Terminal"
+msgstr "Flags do Emulador de Terminal"
 
 msgid "Directories"
 msgstr "Diretórios"
 
 msgid "Autoscan Project Path"
-msgstr "Autoescanear Caminho do Projeto"
+msgstr "Autoescanear Pasta do Projeto"
 
 msgid "On Save"
 msgstr "Ao Salvar"
@@ -1138,6 +1262,9 @@ msgstr "Ao Salvar"
 msgid "Compress Binary Resources"
 msgstr "Comprimir Recursos Binários"
 
+msgid "Safe Save on Backup then Rename"
+msgstr "Fazer Backup ao Salvar Arquivos"
+
 msgid "File Server"
 msgstr "Servidor de Arquivos"
 
@@ -1148,7 +1275,7 @@ msgid "Password"
 msgstr "Senha"
 
 msgid "File Dialog"
-msgstr "Janela de Arquivo"
+msgstr "Seletor de Arquivo"
 
 msgid "Show Hidden Files"
 msgstr "Mostrar Arquivos Ocultos"
@@ -1159,17 +1286,41 @@ msgstr "Modo de Exibição"
 msgid "Thumbnail Size"
 msgstr "Tamanho da Miniatura"
 
+msgid "Quick Open Dialog"
+msgstr "Seletor Rápido"
+
+msgid "Max Results"
+msgstr "Máximo de Resultados"
+
+msgid "Show Search Highlight"
+msgstr "Realçar Resultados no Texto"
+
+msgid "Enable Fuzzy Matching"
+msgstr "Habilitar Busca Aproximada"
+
+msgid "Max Fuzzy Misses"
+msgstr "Máximo de Erro Aproximado"
+
+msgid "Include Addons"
+msgstr "Incluir Addons"
+
+msgid "Default Display Mode"
+msgstr "Modo de Exibição Padrão"
+
 msgid "Import"
-msgstr "Importar"
+msgstr "Importação"
 
 msgid "Blender"
-msgstr "'Blender'"
+msgstr "Blender"
+
+msgid "Blender Path"
+msgstr "Caminho para o Blender"
 
 msgid "RPC Port"
 msgstr "Porta RPC"
 
 msgid "RPC Server Uptime"
-msgstr "Servidor RPC Uptime"
+msgstr "Uptime do Servidor RPC"
 
 msgid "FBX"
 msgstr "FBX"
@@ -1177,21 +1328,39 @@ msgstr "FBX"
 msgid "FBX2glTF Path"
 msgstr "Caminho para FBX2glTF"
 
+msgid "Tools"
+msgstr "Ferramentas"
+
 msgid "OIDN"
-msgstr "OIDN(OpenImageDenoise/AbrirRemoção_de_Ruído_de_Imagem/ARRI)"
+msgstr "OIDN"
+
+msgid "OIDN Denoise Path"
+msgstr "Caminho do OIDN Denoise"
+
+msgid "Ask Before Deleting Related Animation Tracks"
+msgstr "Confirmar Remoção de Faixas de Animação Relacionadas"
 
 msgid "Start Create Dialog Fully Expanded"
-msgstr "Iniciar Dialogo de Criação Expandido por Completo"
+msgstr "Iniciar Dialogo de Criação Expandido"
 
 msgid "Auto Expand to Selected"
-msgstr "Auto Expandir Selecionados"
+msgstr "Auto Expandir à Seleção"
 
 msgid "Center Node on Reparent"
-msgstr "Centralizar nó ao reparentar"
+msgstr "Centralizar Nó ao Trocar Pai"
+
+msgid "Hide Filtered Out Parents"
+msgstr "Esconder Pais Filtrados"
 
 msgid "Always Show Folders"
 msgstr "Sempre Exibir Pastas"
 
+msgid "TextFile Extensions"
+msgstr "Extensões de Arquivo de Texto"
+
+msgid "Other File Extensions"
+msgstr "Outras Extensões de Arquivo"
+
 msgid "Property Editor"
 msgstr "Editor de Propriedades"
 
@@ -1205,13 +1374,16 @@ msgid "Text Editor"
 msgstr "Editor de Texto"
 
 msgid "Line Spacing"
-msgstr "Espaçamento de Linha"
+msgstr "Separação de Linha"
+
+msgid "Color Theme"
+msgstr "Tema de Cores"
 
 msgid "Appearance"
 msgstr "Aparência"
 
 msgid "Caret"
-msgstr "Circunflexo"
+msgstr "Cursor"
 
 msgid "Caret Blink"
 msgstr "Piscar Cursor"
@@ -1220,34 +1392,37 @@ msgid "Caret Blink Interval"
 msgstr "Intervalo de Piscar Cursor"
 
 msgid "Highlight Current Line"
-msgstr "Destaque da Linha Atual"
+msgstr "Destacar Linha Atual"
 
 msgid "Highlight All Occurrences"
-msgstr "Destaque de Todas as Ocorrências"
+msgstr "Destacar Todas as Ocorrências"
 
 msgid "Guidelines"
-msgstr "Linhas guia"
+msgstr "Guias"
 
 msgid "Show Line Length Guidelines"
-msgstr "Exibir Guia de Tamanho de Linhas"
+msgstr "Exibir Guia de Comprimento de Linha"
 
 msgid "Line Length Guideline Soft Column"
-msgstr "Tamanho de Linha Guia em Coluna Suave"
+msgstr "Exibir Guia Suave na Coluna"
 
 msgid "Line Length Guideline Hard Column"
-msgstr "Tamanho de Linha Guia em Coluna Rígida"
+msgstr "Exibir Linha Forte na Coluna"
+
+msgid "Gutters"
+msgstr "Margens"
 
 msgid "Show Line Numbers"
 msgstr "Mostrar Números de Linha"
 
 msgid "Line Numbers Zero Padded"
-msgstr "Número das Linha Tem Espaçamento Com Zeros"
+msgstr "Adicionar Zeros à Esquerda"
 
 msgid "Highlight Type Safe Lines"
-msgstr "Destaque de Linhas de Tipo Seguro"
+msgstr "Destacar Linhas Type Safe"
 
 msgid "Show Info Gutter"
-msgstr "Exibir Espaçamento de Informações"
+msgstr "Exibir Margem de Informações"
 
 msgid "Minimap"
 msgstr "Mini-Mapa"
@@ -1258,23 +1433,38 @@ msgstr "Exibir Mini-Mapa"
 msgid "Minimap Width"
 msgstr "Largura do Mini-Mapa"
 
+msgid "Lines"
+msgstr "Linhas"
+
 msgid "Code Folding"
 msgstr "Dobramento de Código (Folding)"
 
+msgid "Autowrap Mode"
+msgstr "Quebra de Linha Automática"
+
+msgid "Whitespace"
+msgstr "Espaços em Branco"
+
 msgid "Draw Tabs"
-msgstr "Desenhar Abas"
+msgstr "Indicar Tabulações"
 
 msgid "Draw Spaces"
-msgstr "Desenhar Espaços"
+msgstr "Indicar Espaços"
 
 msgid "Behavior"
 msgstr "Comportamento"
 
+msgid "Empty Selection Clipboard"
+msgstr "Copiar Sem Seleção"
+
 msgid "Navigation"
 msgstr "Navegação"
 
 msgid "Move Caret on Right Click"
-msgstr "Mover cursor ao clicar com o botão direito"
+msgstr "Clique Direito Move o Cursor"
+
+msgid "Scroll Past End of File"
+msgstr "Rolar Além do Fim do Arquivo"
 
 msgid "Smooth Scrolling"
 msgstr "Rolagem Suave"
@@ -1282,27 +1472,66 @@ msgstr "Rolagem Suave"
 msgid "V Scroll Speed"
 msgstr "Velocidade de Rolagem Vertical"
 
+msgid "Drag and Drop Selection"
+msgstr "Arrastar e Soltar Seleção"
+
+msgid "Stay in Script Editor on Node Selected"
+msgstr "Ficar no Editor de Script ao Selecionar Nó"
+
 msgid "Open Script When Connecting Signal to Existing Method"
-msgstr "Abra o Script Ao Conectar o Sinal ao Método Existente"
+msgstr "Abrir Script ao Conectar Sinal a um Método Existente"
+
+msgid "Use Default Word Separators"
+msgstr "Usar Separadores de Palavra Padrão"
+
+msgid "Use Custom Word Separators"
+msgstr "Usar Separadores de Palavra Personalizados"
+
+msgid "Custom Word Separators"
+msgstr "Separadores de Palavra Personalizados"
 
 msgid "Indent"
-msgstr "Indentar"
+msgstr "Indentação"
 
 msgid "Auto Indent"
-msgstr "Auto Recuar"
+msgstr "Auto Indentar"
 
 msgid "Indent Wrapped Lines"
-msgstr "Recuar linhas quebradas"
+msgstr "Indentar Linhas Quebradas"
 
 msgid "Files"
 msgstr "Arquivos"
 
+msgid "Trim Trailing Whitespace on Save"
+msgstr "Remover Espaços em Branco à Direita ao Salvar"
+
+msgid "Trim Final Newlines on Save"
+msgstr "Remover Quebras de Linha no Fim do Arquivo ao Salvar"
+
 msgid "Autosave Interval Secs"
-msgstr "Intervalo de Salvamento Automático em Segundos"
+msgstr "Intervalo de Salvamento Automático (Segs.)"
+
+msgid "Restore Scripts on Load"
+msgstr "Restaurar Scripts ao Carregar"
 
 msgid "Convert Indent on Save"
 msgstr "Converter Indentação ao Salvar"
 
+msgid "Auto Reload Scripts on External Change"
+msgstr "Recarregar Scripts Quando Houver Alterações Externas"
+
+msgid "Auto Reload and Parse Scripts on Save"
+msgstr "Recarregar e Reinterpretar Scripts ao Salvar"
+
+msgid "Open Dominant Script on Scene Change"
+msgstr "Abrir Script Dominante ao Mudar de Cena"
+
+msgid "Documentation"
+msgstr "Documentação"
+
+msgid "Enable Tooltips"
+msgstr "Habilitar Dicas de Ferramenta"
+
 msgid "Script List"
 msgstr "Lista de Scripts"
 
@@ -1310,13 +1539,16 @@ msgid "Show Members Overview"
 msgstr "Exibir Visão Geral de Membros"
 
 msgid "Sort Members Outline Alphabetically"
-msgstr "Ordenar Prévia de Membros Automaticamente"
+msgstr "Lista de Membros em Ordem Alfabética"
 
 msgid "Script Temperature Enabled"
-msgstr "Temperatura de Script Habilitado"
+msgstr "Habilitar Temperatura de Script"
 
 msgid "Script Temperature History Size"
-msgstr "Tamanho de Histórico de Temperatura de Script"
+msgstr "Tamanho do Histórico de Temperatura de Script"
+
+msgid "Highlight Scene Scripts"
+msgstr "Destacar Scripts da Cena"
 
 msgid "Group Help Pages"
 msgstr "Agrupar Páginas de Ajuda"
@@ -1331,38 +1563,50 @@ msgid "External"
 msgstr "Externo"
 
 msgid "Exec Path"
-msgstr "Caminho de Execução"
+msgstr "Caminho do Executável"
 
 msgid "Exec Flags"
-msgstr "Sinalizadores de Execução"
+msgstr "Flags de Execução"
 
 msgid "Completion"
 msgstr "Sugestões"
 
 msgid "Idle Parse Delay"
-msgstr "Atraso Ocioso Para Interpretação"
+msgstr "Atraso de Interpretação"
+
+msgid "Idle Parse Delay With Errors Found"
+msgstr "Atraso de Interpretação Quando Há Erros"
 
 msgid "Auto Brace Complete"
-msgstr "Fechar Chaves Automaticamente"
+msgstr "Fechar Colchetes"
+
+msgid "Code Complete Enabled"
+msgstr "Habilitar Sugestões de Código"
 
 msgid "Code Complete Delay"
 msgstr "Atraso de Sugestão de Código"
 
 msgid "Put Callhint Tooltip Below Current Line"
-msgstr "Pôr Dica de Sugestão de Chamada na Linha Abaixo da Atual"
+msgstr "Lista de Sugestões Abaixo da Linha Atual"
 
 msgid "Complete File Paths"
-msgstr "Concluir Caminhos de Arquivo"
+msgstr "Sugerir Caminhos de Arquivo"
 
 msgid "Add Type Hints"
-msgstr "Adicionar Dicas de Tipo"
+msgstr "Adicionar Inferências de Tipo"
+
+msgid "Add String Name Literals"
+msgstr "Usar Sintaxe de StringName"
 
 msgid "Add Node Path Literals"
-msgstr "Adicionar Literais de Caminhos de Nós"
+msgstr "Usar Sintaxe de Caminhos de Nós"
 
 msgid "Use Single Quotes"
 msgstr "Usar Aspas Simples"
 
+msgid "Colorize Suggestions"
+msgstr "Colorir Sugestões"
+
 msgid "Use External Editor"
 msgstr "Utilizar Editor Externo"
 
@@ -1373,16 +1617,16 @@ msgid "Show Help Index"
 msgstr "Exibir Índice de Ajuda"
 
 msgid "Sort Functions Alphabetically"
-msgstr "Ordenar funções alfabéticamente"
+msgstr "Funções em Ordem Alfabética"
 
 msgid "Grid Map"
-msgstr "Mapa de Grade"
+msgstr "GridMap"
 
 msgid "Pick Distance"
-msgstr "Escolha a Distância"
+msgstr "Distância Máxima da Câmera"
 
 msgid "Palette Min Width"
-msgstr "Largura Mínima de Paleta"
+msgstr "Largura Mínima da Paleta"
 
 msgid "Selection Box Color"
 msgstr "Cor da Caixa de Seleção"
@@ -1391,16 +1635,19 @@ msgid "3D Gizmos"
 msgstr "Gizmos 3D"
 
 msgid "Gizmo Colors"
-msgstr "Cores do Gismo"
+msgstr "Cores dos Gizmos"
+
+msgid "Instantiated"
+msgstr "Instanciado"
 
 msgid "Joint"
-msgstr "Junção"
+msgstr "Articulação"
 
 msgid "AABB"
 msgstr "AABB"
 
 msgid "Stream Player 3D"
-msgstr "Player de Stream 3D"
+msgstr "Stream Player 3D"
 
 msgid "Camera"
 msgstr "Câmera"
@@ -1421,13 +1668,13 @@ msgid "Particle Collision"
 msgstr "Colisão de Partículas"
 
 msgid "Joint Body A"
-msgstr "Corpo de Encaixe A"
+msgstr "Articulação Corpo A"
 
 msgid "Joint Body B"
-msgstr "Corpo de Encaixe B"
+msgstr "Articulação Corpo B"
 
 msgid "Lightmap Lines"
-msgstr "Linhas de Mapeamento de luz"
+msgstr "Linhas de Lightmap"
 
 msgid "Lightprobe Lines"
 msgstr "Linhas de Lightprobe"
@@ -1436,25 +1683,40 @@ msgid "Occluder"
 msgstr "Oclusor"
 
 msgid "Reflection Probe"
-msgstr "Sonda de Reflexão"
+msgstr "Sonda de Reflexo"
 
 msgid "Visibility Notifier"
 msgstr "Notificador de Visibilidade"
 
 msgid "Voxel GI"
-msgstr "VoxelGI"
+msgstr "Voxel GI"
+
+msgid "Path Tilt"
+msgstr "Inclinação de Path 3D"
 
 msgid "Skeleton"
 msgstr "Esqueleto"
 
 msgid "Selected Bone"
-msgstr "Osso selecionado"
+msgstr "Osso Selecionado"
 
 msgid "CSG"
 msgstr "CSG"
 
+msgid "GridMap Grid"
+msgstr "Grade do Gridmap"
+
+msgid "Spring Bone Joint"
+msgstr "Articulação de Osso Mola"
+
+msgid "Spring Bone Collision"
+msgstr "Colisão de Osso Mola"
+
+msgid "Spring Bone Inside Collision"
+msgstr "Colisão Interna do Osso Mola"
+
 msgid "Gizmo Settings"
-msgstr "Configurações do Gizmo"
+msgstr "Configurações dos Gizmos"
 
 msgid "Bone Axis Length"
 msgstr "Comprimento do Eixo do Osso"
@@ -1463,10 +1725,10 @@ msgid "Bone Shape"
 msgstr "Forma do Osso"
 
 msgid "Path 3D Tilt Disk Size"
-msgstr "Valor de Inclinação do Disco no Caminho 3D"
+msgstr "Tamanho do Disco de Inclinação do Path 3D"
 
 msgid "Grid Division Level Max"
-msgstr "Nível Máximo de Divisão de Grade"
+msgstr "Nível Máximo de Divisão da Grade"
 
 msgid "Grid Division Level Min"
 msgstr "Nível Mínimo de Divisão da Grade"
@@ -1475,13 +1737,13 @@ msgid "Grid Division Level Bias"
 msgstr "Tendência do Nível de Divisão da Grade"
 
 msgid "Grid XZ Plane"
-msgstr "Grade do Plano XZ"
+msgstr "Grade no Plano XZ"
 
 msgid "Grid XY Plane"
-msgstr "Grade do Plano XY"
+msgstr "Grade no Plano XY"
 
 msgid "Grid YZ Plane"
-msgstr "Grade do Plano YZ"
+msgstr "Grade no Plano YZ"
 
 msgid "Invert X Axis"
 msgstr "Inverter Eixo X"
@@ -1493,17 +1755,20 @@ msgid "Emulate Numpad"
 msgstr "Simular o Numpad"
 
 msgid "Emulate 3 Button Mouse"
-msgstr "Simular o Botão 3 Do Mouse"
+msgstr "Simular Mouse de 3 Botões"
 
 msgid "Warped Mouse Panning"
-msgstr "Panorização Distorcida pelo Mouse"
+msgstr "Teleportar Mouse ao Mover Câmera"
 
 msgid "Navigation Feel"
-msgstr "Sensação de Navegação"
+msgstr "Comportamento da Navegação"
 
 msgid "Orbit Sensitivity"
 msgstr "Sensitividade de Órbita"
 
+msgid "Translation Sensitivity"
+msgstr "Sensibilidade de Translação"
+
 msgid "Orbit Inertia"
 msgstr "Inercia de Órbita"
 
@@ -1523,13 +1788,13 @@ msgid "Freelook"
 msgstr "Visão Livre"
 
 msgid "Freelook Sensitivity"
-msgstr "Sensibilidade de Visão Livre"
+msgstr "Sensibilidade da Visão Livre"
 
 msgid "Freelook Inertia"
-msgstr "Inercia de Visão Livre"
+msgstr "Inércia da Visão Livre"
 
 msgid "Freelook Speed Zoom Link"
-msgstr "Velocidade de Ligação do Visão Livre"
+msgstr "Velocidade da Visão Livre Igual ao Zoom"
 
 msgid "Manipulator Gizmo Size"
 msgstr "Tamanho do Gizmo Manipulador"
@@ -1541,10 +1806,10 @@ msgid "Grid Color"
 msgstr "Cor da Grade"
 
 msgid "Guides Color"
-msgstr "Cor Guia"
+msgstr "Cor das Guias"
 
 msgid "Smart Snapping Line Color"
-msgstr "Cor da Linha de Encaixe Inteligente"
+msgstr "Cor da Linha de Ajuste Inteligente"
 
 msgid "Bone Width"
 msgstr "Largura do Osso"
@@ -1556,10 +1821,10 @@ msgid "Bone Color 2"
 msgstr "Cor de Osso 2"
 
 msgid "Bone Selected Color"
-msgstr "Cor Selecionada do Osso"
+msgstr "Cor do Osso Selecionado"
 
 msgid "Bone IK Color"
-msgstr "Cor de Osso IK (cinemática inversa)"
+msgstr "Cor de IK do Osso"
 
 msgid "Bone Outline Color"
 msgstr "Cor de Contorno do Osso"
@@ -1568,43 +1833,64 @@ msgid "Bone Outline Size"
 msgstr "Tamanho do Contorno do Osso"
 
 msgid "Viewport Border Color"
-msgstr "Cor da Borda de Viewport"
+msgstr "Cor da Borda do Viewport"
 
 msgid "Use Integer Zoom by Default"
-msgstr "Usar Zoom Inteiro por Padrão"
+msgstr "Dar Zoom em Números Inteiros por Padrão"
 
 msgid "Bone Mapper"
 msgstr "Mapeador de Ossos"
 
 msgid "Handle Colors"
-msgstr "Manusear Cores"
+msgstr "Cores dos Controles"
 
 msgid "Unset"
-msgstr "Restaurar"
+msgstr "Sem definição"
 
 msgid "Set"
-msgstr "Definir"
+msgstr "Definido"
+
+msgid "Missing"
+msgstr "Ausente"
 
 msgid "Error"
 msgstr "Erro"
 
+msgid "Panning"
+msgstr "Movimentação da Câmera"
+
 msgid "Simple Panning"
-msgstr "Panoramização Simples"
+msgstr "Movimento Simples"
+
+msgid "2D Editor Pan Speed"
+msgstr "Velocidade do Movimento no Editor 2D"
 
 msgid "Tiles Editor"
 msgstr "Editor de Tiles"
 
 msgid "Display Grid"
-msgstr "Mostrar Grid"
+msgstr "Mostrar Grade"
+
+msgid "Highlight Selected Layer"
+msgstr "Destacar Camada Atual"
+
+msgid "Polygon Editor"
+msgstr "Editor de Polígonos"
 
 msgid "Point Grab Radius"
-msgstr "Raio de Agarro ao Ponto"
+msgstr "Raio de Seleção de Ponto"
 
 msgid "Show Previous Outline"
-msgstr "Exibir Prévia Anterior"
+msgstr "Mostrar Contorno Anterior"
+
+msgid "Auto Bake Delay"
+msgstr "Atraso da Geração Automática"
 
 msgid "Autorename Animation Tracks"
-msgstr "Renomear Automaticamente Faixa de Animação"
+msgstr "Renomear Faixas de Animação Automaticamente"
+
+msgid "Confirm Insert Track"
+msgstr "Confirmar Inserção de Faixa"
 
 msgid "Default Create Bezier Tracks"
 msgstr "Criar Faixa de Bezier por Padrão"
@@ -1613,25 +1899,37 @@ msgid "Default Create Reset Tracks"
 msgstr "Criar Faixa RESET Por Padrão"
 
 msgid "Onion Layers Past Color"
-msgstr "Cor da Camada de Cebola Anterior"
+msgstr "Cor do Papel Vegetal Anterior"
 
 msgid "Onion Layers Future Color"
-msgstr "Cor da Camada de Cebola Posterior"
+msgstr "Cor do Papel Vegetal Posterior"
+
+msgid "Shader Editor"
+msgstr "Editor de Shader"
+
+msgid "Restore Shaders on Load"
+msgstr "Restaurar Shaders ao Carregar"
 
 msgid "Visual Editors"
 msgstr "Editores Visuais"
 
-msgid "Color Theme"
-msgstr "Tema de Cores"
-
 msgid "Minimap Opacity"
 msgstr "Opacidade do Mini-Mapa"
 
 msgid "Lines Curvature"
 msgstr "Curvatura das Linhas"
 
+msgid "Grid Pattern"
+msgstr "Padrão da Grade"
+
+msgid "Visual Shader"
+msgstr "VisualShader"
+
+msgid "Port Preview Size"
+msgstr "Tamanho da Prévia de Porta"
+
 msgid "Export"
-msgstr "Exportar"
+msgstr "Exportação"
 
 msgid "SSH"
 msgstr "SSH"
@@ -1642,9 +1940,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Colocação da Janela"
 
+msgid "Rect"
+msgstr "Retângulo"
+
 msgid "Rect Custom Position"
 msgstr "Posição Personalizada Do Retângulo"
 
+msgid "Screen"
+msgstr "Tela"
+
 msgid "Auto Save"
 msgstr "Salvar Automaticamente"
 
@@ -1654,8 +1958,23 @@ msgstr "Salvar Antes de Executar"
 msgid "Output"
 msgstr "Saída"
 
+msgid "Font Size"
+msgstr "Tamanho da Fonte"
+
 msgid "Always Clear Output on Play"
-msgstr "Sempre Limpar a Saída no modo Play"
+msgstr "Sempre Apagar a Saída ao Executar Jogo"
+
+msgid "Max Lines"
+msgstr "Máximo de Linhas"
+
+msgid "Platforms"
+msgstr "Plataformas"
+
+msgid "Linux/*BSD"
+msgstr "Linux/*BSD"
+
+msgid "Prefer Wayland"
+msgstr "Preferir Wayland"
 
 msgid "HTTP Proxy"
 msgstr "Proxy HTTP"
@@ -1664,7 +1983,10 @@ msgid "Host"
 msgstr "Hospedeiro"
 
 msgid "Editor TLS Certificates"
-msgstr "Editor de Certificados TLS"
+msgstr "Certificados TLS do Editor"
+
+msgid "Enable TLS V 1"
+msgstr "Habilitar TLS V 1"
 
 msgid "Remote Host"
 msgstr "Hospedeiro Remoto"
@@ -1673,22 +1995,25 @@ msgid "Debugger"
 msgstr "Depurador"
 
 msgid "Profiler Frame History Size"
-msgstr "Tamanho de histórico disponível no \"Profiler\""
+msgstr "Máximo de Frames no Histórico do Analisador"
 
 msgid "Profiler Frame Max Functions"
-msgstr "Máximo de funções por quadro no \"Profiler\""
+msgstr "Máximo de Funções por Quadro no Analisador"
+
+msgid "Profiler Target FPS"
+msgstr "FPS Alvo do Analisador"
 
 msgid "Remote Scene Tree Refresh Interval"
 msgstr "Intervalo de Atualização da Árvore Remota"
 
 msgid "Remote Inspect Refresh Interval"
-msgstr "Intervalo de Atualização da Inspeção Remota"
+msgstr "Intervalo de Atualização do Inspetor Remoto"
 
 msgid "Version Control"
 msgstr "Controle de Versão"
 
 msgid "Username"
-msgstr "Nome do Usuário"
+msgstr "Nome de Usuário"
 
 msgid "SSH Public Key Path"
 msgstr "Caminho da Chave Pública SSH"
@@ -1700,28 +2025,28 @@ msgid "Input"
 msgstr "Entrada"
 
 msgid "Buffering"
-msgstr "Preparando"
+msgstr "Buffers"
 
 msgid "Agile Event Flushing"
-msgstr "Limpeza de Eventos Agil"
+msgstr "Limpeza de Eventos Ágil"
 
 msgid "Project Manager"
 msgstr "Gerenciador de Projetos"
 
 msgid "Sorting Order"
-msgstr "Ordem de Classificação"
+msgstr "Ordenação"
 
 msgid "Highlighting"
-msgstr "Destacando"
+msgstr "Destaque"
 
 msgid "Symbol Color"
-msgstr "Cor do Simbolo"
+msgstr "Cor de Simbolo"
 
 msgid "Keyword Color"
-msgstr "Cor de Palavra Chave"
+msgstr "Cor de Palavra-Chave"
 
 msgid "Control Flow Keyword Color"
-msgstr "Core de Palavra Chave de Controle de Fluxo"
+msgstr "Cor de Controle de Fluxo"
 
 msgid "Base Type Color"
 msgstr "Cor de Tipo Base"
@@ -1730,13 +2055,16 @@ msgid "Engine Type Color"
 msgstr "Cor de Tipo da Engine"
 
 msgid "User Type Color"
-msgstr "Cor de Tipo Do Usuário"
+msgstr "Cor de Tipo do Usuário"
 
 msgid "Comment Color"
 msgstr "Cor de Comentário"
 
+msgid "Doc Comment Color"
+msgstr "Cor de Comentário de Doc"
+
 msgid "String Color"
-msgstr "Cor da String"
+msgstr "Cor de String"
 
 msgid "Background Color"
 msgstr "Cor de Fundo"
@@ -1751,10 +2079,10 @@ msgid "Completion Existing Color"
 msgstr "Cor de Sugestão Existente"
 
 msgid "Completion Scroll Color"
-msgstr "Cor da Barra de Rolagem de Sugestão"
+msgstr "Cor da Barra de Rolagem das Sugestões"
 
 msgid "Completion Scroll Hovered Color"
-msgstr "Cor da Barra de Rolagem de Sugestão ao pairar"
+msgstr "Cor da Rolagem de Sugestão ao Passar o Mouse"
 
 msgid "Completion Font Color"
 msgstr "Cor da Fonte de Sugestão"
@@ -1763,16 +2091,16 @@ msgid "Text Color"
 msgstr "Cor do Texto"
 
 msgid "Line Number Color"
-msgstr "Cor do Número da Linha"
+msgstr "Cor dos Número de Linha"
 
 msgid "Safe Line Number Color"
-msgstr "Cor do Número da Linha Segura"
+msgstr "Cor dos Números de Linha Segura"
 
 msgid "Caret Color"
 msgstr "Cor do Cursor"
 
 msgid "Caret Background Color"
-msgstr "Cor de Fundo de Acentuação"
+msgstr "Cor de Fundo do Cursor"
 
 msgid "Text Selected Color"
 msgstr "Cor do Texto Selecionado"
@@ -1781,13 +2109,13 @@ msgid "Selection Color"
 msgstr "Cor da Seleção"
 
 msgid "Brace Mismatch Color"
-msgstr "Cor de Chave Incompatível"
+msgstr "Cor de Colchete Incompatível"
 
 msgid "Current Line Color"
 msgstr "Cor da Linha Atual"
 
 msgid "Line Length Guideline Color"
-msgstr "Cor do Tamanho de Linha Guia"
+msgstr "Cor da Guia de Comprimento de Linha"
 
 msgid "Word Highlighted Color"
 msgstr "Cor da Palavra em Destaque"
@@ -1802,13 +2130,13 @@ msgid "Member Variable Color"
 msgstr "Cor de Variável Membro"
 
 msgid "Mark Color"
-msgstr "Cor de Marcação"
+msgstr "Cor de Erro"
 
 msgid "Bookmark Color"
-msgstr "Cor de Bookmark"
+msgstr "Cor de Marcador"
 
 msgid "Breakpoint Color"
-msgstr "Cor de Ponto de Quebra"
+msgstr "Cor de Ponto de Interrupção"
 
 msgid "Executing Line Color"
 msgstr "Cor da Linha em Execução"
@@ -1816,11 +2144,68 @@ msgstr "Cor da Linha em Execução"
 msgid "Code Folding Color"
 msgstr "Cor da Dobradiça de Código"
 
+msgid "Folded Code Region Color"
+msgstr "Cor de Região de Código Dobrada"
+
 msgid "Search Result Color"
-msgstr "Cor do Resultado de Pesquisa"
+msgstr "Cor de Resultado de Pesquisa"
 
 msgid "Search Result Border Color"
-msgstr "Cor da Borda do Resultado de Pesquisa"
+msgstr "Cor da Borda de Resultado de Pesquisa"
+
+msgid "Connection Colors"
+msgstr "Cores de Conexões"
+
+msgid "Scalar Color"
+msgstr "Cor de Escalar"
+
+msgid "Vector2 Color"
+msgstr "Cor de Vector2"
+
+msgid "Vector 3 Color"
+msgstr "Cor de Vector3"
+
+msgid "Vector 4 Color"
+msgstr "Cor de Vector4"
+
+msgid "Boolean Color"
+msgstr "Cor de Booleana"
+
+msgid "Transform Color"
+msgstr "Cor de Transformação"
+
+msgid "Sampler Color"
+msgstr "Cor de Sampler"
+
+msgid "Category Colors"
+msgstr "Cor das Categorias"
+
+msgid "Output Color"
+msgstr "Cor de Saída"
+
+msgid "Color Color"
+msgstr "Cor de Cor"
+
+msgid "Conditional Color"
+msgstr "Cor de Condição"
+
+msgid "Input Color"
+msgstr "Cor de Entrada"
+
+msgid "Textures Color"
+msgstr "Cor de Textura"
+
+msgid "Utility Color"
+msgstr "Cor de Utilidade"
+
+msgid "Vector Color"
+msgstr "Cor de Vetor"
+
+msgid "Special Color"
+msgstr "Cor de Especial"
+
+msgid "Particle Color"
+msgstr "Cor de Partícula"
 
 msgid "Custom Template"
 msgstr "Modelo Customizado"
@@ -1828,6 +2213,9 @@ msgstr "Modelo Customizado"
 msgid "Release"
 msgstr "Lançamento"
 
+msgid "Export Console Wrapper"
+msgstr "Exportar Wrapper de Console"
+
 msgid "Binary Format"
 msgstr "Formato Binário"
 
@@ -1835,7 +2223,13 @@ msgid "Embed PCK"
 msgstr "Embutir PCK"
 
 msgid "Texture Format"
-msgstr "Formato da Textura"
+msgstr "Formato de Textura"
+
+msgid "S3TC BPTC"
+msgstr "S3TC BPTC"
+
+msgid "ETC2 ASTC"
+msgstr "ETC2 ASTC"
 
 msgid "Export Path"
 msgstr "Caminho de Exportação"
@@ -1849,23 +2243,29 @@ msgstr "Modo Arquivo"
 msgid "Filters"
 msgstr "Filtros"
 
+msgid "Options"
+msgstr "Opções"
+
 msgid "Disable Overwrite Warning"
-msgstr "Desativar aviso de substituição"
+msgstr "Desativar Aviso de Substituição"
 
 msgid "Flat"
-msgstr "Raso"
+msgstr "Plano"
 
 msgid "Hide Slider"
-msgstr "Esconder Rolagem"
+msgstr "Esconder Slider"
+
+msgid "Editing Integer"
+msgstr "Editando Inteiro"
 
 msgid "Zoom"
 msgstr "Zoom"
 
 msgid "Retarget"
-msgstr "Alvo de Destino"
+msgstr "Retarget"
 
 msgid "Bone Renamer"
-msgstr "Renomeador do Osso"
+msgstr "Renomeador de Osso"
 
 msgid "Rename Bones"
 msgstr "Renomear Ossos"
@@ -1880,16 +2280,28 @@ msgid "Skeleton Name"
 msgstr "Nome do Esqueleto"
 
 msgid "Rest Fixer"
-msgstr "Fixador pose Descanso"
+msgstr "Consertador de Repouso"
 
 msgid "Apply Node Transforms"
-msgstr "Aplicar Transformações"
+msgstr "Aplicar Transformações do Nó"
 
 msgid "Normalize Position Tracks"
-msgstr "Normalizar faixas de posição"
+msgstr "Normalizar Faixas de Posição"
 
 msgid "Reset All Bone Poses After Import"
-msgstr "Redefinir Todas as Poses Ósseas Após a Importação"
+msgstr "Redefinir Todas as Poses Após Importação"
+
+msgid "Retarget Method"
+msgstr "Método de Retarget"
+
+msgid "Keep Global Rest on Leftovers"
+msgstr "Manter Repouso Global nas Sobras"
+
+msgid "Use Global Pose"
+msgstr "Usar Pose Global"
+
+msgid "Original Skeleton Name"
+msgstr "Nome do Esqueleto Original"
 
 msgid "Fix Silhouette"
 msgstr "Consertar Silhueta"
@@ -1898,46 +2310,61 @@ msgid "Filter"
 msgstr "Filtro"
 
 msgid "Threshold"
-msgstr "Limite"
+msgstr "Limiar"
 
 msgid "Base Height Adjustment"
 msgstr "Ajuste de Altura da Base"
 
 msgid "Remove Tracks"
-msgstr "Remover Trilhas"
+msgstr "Remover Faixas"
 
 msgid "Except Bone Transform"
-msgstr "Exceção na transformação óssea"
+msgstr "Exceto Transformação dos Ossos"
 
 msgid "Unimportant Positions"
-msgstr "Posições sem importância"
+msgstr "Posições Sem Importância"
 
 msgid "Unmapped Bones"
-msgstr "Ossos não mapeados"
+msgstr "Ossos Não Mapeados"
 
 msgid "Generate Tangents"
 msgstr "Gerar Tangentes"
 
 msgid "Generate LODs"
-msgstr "Gerar Pontos LOD"
+msgstr "Gerar LODs"
+
+msgid "Generate Shadow Mesh"
+msgstr "Gerar Malha de Sombra"
+
+msgid "Generate Lightmap UV2"
+msgstr "Gerar UV2 do Lightmap"
+
+msgid "Generate Lightmap UV2 Texel Size"
+msgstr "Gerar Tamanho de Texel do UV2 do Lightmap"
 
 msgid "Scale Mesh"
 msgstr "Redimensionar Malha"
 
 msgid "Offset Mesh"
-msgstr "Malha de Deslocamento"
+msgstr "Deslocar Malha"
+
+msgid "Force Disable Mesh Compression"
+msgstr "Forçar Desabilitar Compressão de Malha"
+
+msgid "Skip Import"
+msgstr "Pular Importação"
 
 msgid "Generate"
 msgstr "Gerar"
 
 msgid "NavMesh"
-msgstr "Malha de navegação"
+msgstr "NavMesh"
 
 msgid "Body Type"
-msgstr "Tipo de corpo"
+msgstr "Tipo de Corpo"
 
 msgid "Shape Type"
-msgstr "Tipo de forma"
+msgstr "Tipo de Forma"
 
 msgid "Physics Material Override"
 msgstr "Substituição de Material de Física"
@@ -1948,9 +2375,30 @@ msgstr "Camada"
 msgid "Mask"
 msgstr "Máscara"
 
+msgid "Mesh Instance"
+msgstr "Instância de Malha"
+
 msgid "Layers"
 msgstr "Camadas"
 
+msgid "Visibility Range Begin"
+msgstr "Início do Alcance de Visibilidade"
+
+msgid "Visibility Range Begin Margin"
+msgstr "Margem do Início do Alcance de Visibilidade"
+
+msgid "Visibility Range End"
+msgstr "Fim do Alcance de Visibilidade"
+
+msgid "Visibility Range End Margin"
+msgstr "Margem do Fim do Alcance de Visibilidade"
+
+msgid "Visibility Range Fade Mode"
+msgstr "Modo de Fade do Alcance de Visibilidade"
+
+msgid "Cast Shadow"
+msgstr "Causar Sombra"
+
 msgid "Decomposition"
 msgstr "Decomposição"
 
@@ -1964,37 +2412,40 @@ msgid "Max Concavity"
 msgstr "Concavidade Máxima"
 
 msgid "Symmetry Planes Clipping Bias"
-msgstr "Corte no Bias de Plano de Simetria"
+msgstr "Viés de Clipping dos Planos de Simetria"
 
 msgid "Revolution Axes Clipping Bias"
-msgstr "Bias de Corte nos eixos de revolução"
+msgstr "Viés de Clipping dos Eixos de Revolução"
 
 msgid "Min Volume per Convex Hull"
-msgstr "Volume mínimo per Convex Hull"
+msgstr "Volume Mínimo por Envoltória Convexa"
 
 msgid "Resolution"
 msgstr "Resolução"
 
 msgid "Max Num Vertices per Convex Hull"
-msgstr "Número Máximo de Vértices por Convex Hull"
+msgstr "Número Máximo de Vértices por Envoltória Convexa"
 
 msgid "Plane Downsampling"
-msgstr "Rebaixamento de plano"
+msgstr "Downsampling de Plano"
 
 msgid "Convexhull Downsampling"
-msgstr "Rebaixamento de Convexhull"
+msgstr "Downsampling de Envoltória Convexa"
+
+msgid "Normalize Mesh"
+msgstr "Normalizar Malha"
 
 msgid "Convexhull Approximation"
-msgstr "Aproximação Convexhull"
+msgstr "Aproximação de Envoltória Convexa"
 
 msgid "Max Convex Hulls"
-msgstr "Convexhull Máximo"
+msgstr "Máximo de Envoltórias Convexas"
 
 msgid "Project Hull Vertices"
-msgstr "Vértices Hull do projeto"
+msgstr "Projetar Vérticas da Envoltória"
 
 msgid "Primitive"
-msgstr "Primitivo"
+msgstr "Primitiva"
 
 msgid "Height"
 msgstr "Altura"
@@ -2005,23 +2456,29 @@ msgstr "Raio"
 msgid "Simplification Distance"
 msgstr "Distância de Simplificação"
 
+msgid "Save to File"
+msgstr "Salvar como Arquivo"
+
 msgid "Enabled"
 msgstr "Habilitado"
 
 msgid "Shadow Meshes"
-msgstr "Malhas de Shader"
+msgstr "Malhas de Sombra"
+
+msgid "Lightmap UV"
+msgstr "UV do Lightmap"
 
 msgid "LODs"
-msgstr "LOD (Níveis de detalhe)"
+msgstr "LODs"
 
 msgid "Normal Merge Angle"
-msgstr "Ângulo de junção da NORMAL"
+msgstr "Ângulo de Junção da Normal"
 
 msgid "Use External"
 msgstr "Usar Externo"
 
 msgid "Loop Mode"
-msgstr "Modo Repetição"
+msgstr "Modo de Repetição"
 
 msgid "Keep Custom Tracks"
 msgstr "Manter Faixas Personalizadas"
@@ -2036,19 +2493,34 @@ msgid "Optimizer"
 msgstr "Otimizador"
 
 msgid "Max Velocity Error"
-msgstr "Erro de Máx. Velocidade"
+msgstr "Erro Máx. de Velocidade"
 
 msgid "Max Angular Error"
-msgstr "Erro Angular Máximo"
+msgstr "Erro Máx. de Ângulo"
 
 msgid "Max Precision Error"
-msgstr "Erro de Máxima Precisão"
+msgstr "Erro Máx. de Precisão"
 
 msgid "Page Size"
 msgstr "Tamanho da Página"
 
 msgid "Import Tracks"
-msgstr "Importar Trilhas"
+msgstr "Importar Faixas"
+
+msgid "Rest Pose"
+msgstr "Pose de Repouso"
+
+msgid "Load Pose"
+msgstr "Carregar Pose"
+
+msgid "External Animation Library"
+msgstr "Biblioteca de Animação Externa"
+
+msgid "Selected Animation"
+msgstr "Animação Selecionada"
+
+msgid "Selected Timestamp"
+msgstr "Tempo Selecionado"
 
 msgid "Bone Map"
 msgstr "Mapa de Ossos"
@@ -2071,6 +2543,9 @@ msgstr "Escala da Raiz"
 msgid "Import as Skeleton Bones"
 msgstr "Importar como Ossos de Esqueleto"
 
+msgid "Use Node Type Suffixes"
+msgstr "Usar Sufixos de Tipo de Nó"
+
 msgid "Meshes"
 msgstr "Malhas"
 
@@ -2078,40 +2553,52 @@ msgid "Ensure Tangents"
 msgstr "Garantir Tangentes"
 
 msgid "Create Shadow Meshes"
-msgstr "Criar Malha de Sombra"
+msgstr "Criar Malhas de Sombra"
 
 msgid "Light Baking"
-msgstr "Bake de Mapa de Luz"
+msgstr "Pré-cálculo de Luz"
 
 msgid "Lightmap Texel Size"
-msgstr "Tamanho do Texel no Mapa de Luz"
+msgstr "Tamanho de Texel do Lightmap"
+
+msgid "Force Disable Compression"
+msgstr "Forçar Desativar Compressão"
 
 msgid "Skins"
-msgstr "Peles"
+msgstr "Skins"
 
 msgid "Use Named Skins"
-msgstr "Utilizar Peles com Nome"
+msgstr "Utilizar Skins com Nome"
 
 msgid "FPS"
 msgstr "FPS"
 
 msgid "Trimming"
-msgstr "Aparar"
+msgstr "Limpeza"
 
 msgid "Remove Immutable Tracks"
-msgstr "Remover Trilhas Sem mudança"
+msgstr "Remover Faixas Imutáveis"
+
+msgid "Import Rest as Reset"
+msgstr "Importar Repouso como Reset"
 
 msgid "Import Script"
-msgstr "Script de Importação"
+msgstr "Importar Script"
+
+msgid "Antialiasing"
+msgstr "Antisserrilhamento"
 
 msgid "Generate Mipmaps"
 msgstr "Gerar Mipmaps"
 
+msgid "Disable Embedded Bitmaps"
+msgstr "Desativar Bitmaps Integrados"
+
 msgid "Multichannel Signed Distance Field"
-msgstr "SDF multicanal"
+msgstr "SDF Multicanal"
 
 msgid "MSDF Pixel Range"
-msgstr "Escala de pixel de MSDF"
+msgstr "Alcance de Pixel do MSDF"
 
 msgid "MSDF Size"
 msgstr "Tamanho do MSDF"
@@ -2123,25 +2610,31 @@ msgid "Force Autohinter"
 msgstr "Forçar Autohinter"
 
 msgid "Hinting"
-msgstr "Sugestão"
+msgstr "Hinting"
 
 msgid "Subpixel Positioning"
 msgstr "Posicionamento de Subpixel"
 
+msgid "Keep Rounding Remainders"
+msgstr "Continuar Arredondando Restos"
+
 msgid "Oversampling"
-msgstr "Excesso de Amostragem"
+msgstr "Oversampling"
 
 msgid "Metadata Overrides"
-msgstr "Sobrescrever Metadata"
+msgstr "Substitutos de Metadados"
+
+msgid "Language Support"
+msgstr "Idiomas Suportados"
 
 msgid "Script Support"
-msgstr "Suporte de Script"
+msgstr "Sistemas de Escrita Suportados"
 
 msgid "OpenType Features"
 msgstr "Funcionalidades OpenType"
 
 msgid "Fallbacks"
-msgstr "Planos B's"
+msgstr "Fallbacks"
 
 msgid "Compress"
 msgstr "Comprimir"
@@ -2156,25 +2649,31 @@ msgid "Variation"
 msgstr "Variação"
 
 msgid "OpenType"
-msgstr "Tipo aberto"
+msgstr "OpenType"
 
 msgid "Embolden"
-msgstr "Aumento Boldem"
+msgstr "Negrito"
 
 msgid "Face Index"
-msgstr "Índice da Face da fonte"
+msgstr "Índice da Face"
 
 msgid "Transform"
 msgstr "Transformar"
 
 msgid "Create From"
-msgstr "Criar à Partir de"
+msgstr "Criar a Partir de"
+
+msgid "Scaling Mode"
+msgstr "Modo de Escalonamento"
 
 msgid "Delimiter"
 msgstr "Delimitador"
 
 msgid "Character Ranges"
-msgstr "Medidas do Personagem"
+msgstr "Alcances de Caractere"
+
+msgid "Kerning Pairs"
+msgstr "Pares de Kerning"
 
 msgid "Columns"
 msgstr "Colunas"
@@ -2186,7 +2685,7 @@ msgid "Image Margin"
 msgstr "Margem da Imagem"
 
 msgid "Character Margin"
-msgstr "Marem do Caractere"
+msgstr "Margem do Caractere"
 
 msgid "Ascent"
 msgstr "Subida"
@@ -2198,7 +2697,7 @@ msgid "High Quality"
 msgstr "Alta Qualidade"
 
 msgid "Lossy Quality"
-msgstr "Com Perda de Qualidade"
+msgstr "Perda de Qualidade"
 
 msgid "HDR Compression"
 msgstr "Compressão HDR"
@@ -2207,7 +2706,7 @@ msgid "Channel Pack"
 msgstr "Pacote de Canal"
 
 msgid "Mipmaps"
-msgstr "LOD em Textura (Mipmaps)"
+msgstr "Mipmaps"
 
 msgid "Limit"
 msgstr "Limite"
@@ -2231,13 +2730,13 @@ msgid "Roughness"
 msgstr "Rugosidade"
 
 msgid "Src Normal"
-msgstr "‘Src’ Normal"
+msgstr "Fonte Normal"
 
 msgid "Process"
-msgstr "Processar"
+msgstr "Processamento"
 
 msgid "Fix Alpha Border"
-msgstr "Corrigir Alpha da Borda"
+msgstr "Corrigir Borda do Alpha"
 
 msgid "Premult Alpha"
 msgstr "Pré-Multiplicar Alpha"
@@ -2249,7 +2748,7 @@ msgid "HDR as sRGB"
 msgstr "HDR como sRGB"
 
 msgid "HDR Clamp Exposure"
-msgstr "Exposição de grampo HDR"
+msgstr "Limitar Exposição HDR"
 
 msgid "Size Limit"
 msgstr "Limite de Tamanho"
@@ -2257,17 +2756,20 @@ msgstr "Limite de Tamanho"
 msgid "Detect 3D"
 msgstr "Detectar 3D"
 
+msgid "Compress To"
+msgstr "Comprimir Para"
+
 msgid "SVG"
 msgstr "SVG"
 
 msgid "Scale With Editor Scale"
-msgstr "Escalonar com o Editor de Escala"
+msgstr "Redimensionar com a Escala do Editor"
 
 msgid "Convert Colors With Editor Theme"
-msgstr "Converter cores com Editor de temas"
+msgstr "Converter Cores com Tema do Editor"
 
 msgid "Atlas File"
-msgstr "Arquivo do Atlas"
+msgstr "Arquivo de Atlas"
 
 msgid "Import Mode"
 msgstr "Modo de Importação"
@@ -2276,7 +2778,11 @@ msgid "Crop to Region"
 msgstr "Cortar para Região"
 
 msgid "Trim Alpha Border From Region"
-msgstr "Aparar Borda Alfa da Região"
+msgstr "Aparar Borda Alpha da Região"
+
+msgctxt "Enforce"
+msgid "Force"
+msgstr "Forçar"
 
 msgid "8 Bit"
 msgstr "8 Bits"
@@ -2309,10 +2815,13 @@ msgid "Available URLs"
 msgstr "URLs disponíveis"
 
 msgid "Current Group Idx"
-msgstr "Idx de grupo atual"
+msgstr "Índice do Grupo Atual"
 
 msgid "Current Bone Idx"
-msgstr "Idx de Osso Atual"
+msgstr "Índice do Osso Atual"
+
+msgid "Particles Emission Shape"
+msgstr "Forma de Emissão de Partículas"
 
 msgid "ID"
 msgstr "ID"
@@ -2330,7 +2839,7 @@ msgid "Texture Region Size"
 msgstr "Tamanho da Região da Textura"
 
 msgid "Use Texture Padding"
-msgstr "Usar distanciamento da textura"
+msgstr "Usar Distanciamento de Textura"
 
 msgid "Atlas Coords"
 msgstr "Coordenadas de Atlas"
@@ -2345,7 +2854,7 @@ msgid "Speed"
 msgstr "Velocidade"
 
 msgid "Frames Count"
-msgstr "Contagem de Frames"
+msgstr "Número de Frames"
 
 msgid "Duration"
 msgstr "Duração"
@@ -2357,76 +2866,118 @@ msgid "Script"
 msgstr "Script"
 
 msgid "Templates Search Path"
-msgstr "Caminho de Pesquisa de Templates"
+msgstr "Caminho de Pesquisa de Modelos"
 
 msgid "Naming"
-msgstr "Nomear"
+msgstr "Nomes"
 
 msgid "Default Signal Callback Name"
-msgstr "Nome padrão de sinal de Callback"
+msgstr "Nome Padrão de Callback de Sinal"
 
 msgid "Default Signal Callback to Self Name"
-msgstr "Padrão de \"Self Name\" do Callback"
+msgstr "Nome Padrão de Callback de Sinal no Mesmo Nó"
 
 msgid "Scene Name Casing"
-msgstr "Caixa do Nome da Cena"
+msgstr "Padrão de Nomes de Cena"
+
+msgid "Script Name Casing"
+msgstr "Padrão de Nomes de Script"
 
 msgid "Reimport Missing Imported Files"
-msgstr "Reimportar arquivos importados perdidos"
+msgstr "Reimportar Arquivos Importados Ausentes"
 
 msgid "Use Multiple Threads"
-msgstr "Usar Threads Múltiplas"
+msgstr "Usar Múltiplas Threads"
+
+msgid "Atlas Max Width"
+msgstr "Largura Máxima do Atlas"
+
+msgid "Convert Text Resources to Binary"
+msgstr "Converter Recursos de Texto para Binário"
 
 msgid "Plugin Name"
 msgstr "Nome do Plugin"
 
+msgid "Autoload on Startup"
+msgstr "Carregar ao Abrir Editor"
+
+msgid "Flush stdout on Print"
+msgstr "Enviar Prints para stdout"
+
 msgid "Low Processor Mode"
-msgstr "Modo Processamento Baixo"
+msgstr "Modo de Baixo Processamento"
 
 msgid "stdout"
-msgstr "stdout(padão de saída)"
+msgstr "stdout"
 
 msgid "Print FPS"
-msgstr "Mostrar FPS"
+msgstr "Mostrar FPS no Console"
 
 msgid "Print GPU Profile"
-msgstr "Perfil Atual da GPU"
+msgstr "Mostrar Perfil da GPU no Console"
 
 msgid "Verbose stdout"
 msgstr "stdout Verboso"
 
+msgid "Physics Interpolation"
+msgstr "Interpolação de Física"
+
+msgid "Enable Warnings"
+msgstr "Habilitar Avisos"
+
 msgid "Max Chars per Second"
 msgstr "Máximo de Caracteres por Segundo"
 
+msgid "Max Queued Messages"
+msgstr "Máximo de Pacotes de Saída"
+
 msgid "Max Errors per Second"
 msgstr "Máximo de Erros por Segundo"
 
 msgid "Max Warnings per Second"
-msgstr "Máximo de Advertências por Segundo"
+msgstr "Máximo de Avisos por Segundo"
 
 msgid "File Logging"
-msgstr "Registrando Log de Arquivos"
+msgstr "Arquivos de Log"
 
 msgid "Enable File Logging"
-msgstr "Habilitar Log de Arquivos"
+msgstr "Habilitar Arquivos de Log"
 
 msgid "Log Path"
 msgstr "Caminho de Log"
 
 msgid "Max Log Files"
-msgstr "Máximo Arquivos de Log"
+msgstr "Máximo de Arquivos de Log"
 
 msgid "Driver"
-msgstr "Controlador"
+msgstr "Driver"
+
+msgid "Fallback to Vulkan"
+msgstr "Regredir ao Vulkan"
+
+msgid "Fallback to D3D12"
+msgstr "Regredir ao D3D12"
+
+msgid "Fallback to OpenGL 3"
+msgstr "Regredir ao OpenGL 3"
 
 msgid "GL Compatibility"
 msgstr "Compatibilidade GL"
 
 msgid "Nvidia Disable Threaded Optimization"
-msgstr "Nvidia Desativar \"Threaded Optimization\""
+msgstr "Nvidia: Desativar \"Threaded Optimization\""
+
+msgid "Fallback to Angle"
+msgstr "Regredir ao ANGLE"
+
+msgid "Fallback to Native"
+msgstr "Regredir a Renderização Nativa"
+
+msgid "Fallback to GLES"
+msgstr "Regredir ao GLES"
 
 msgid "Force Angle on Devices"
-msgstr "Forçar Ângulo em Dispositivos"
+msgstr "Forçar ANGLE nestes Dispositivos"
 
 msgid "Renderer"
 msgstr "Renderizador"
@@ -2435,7 +2986,7 @@ msgid "Rendering Method"
 msgstr "Método de Renderização"
 
 msgid "Include Text Server Data"
-msgstr "Incluir dados de Servidor de Texto"
+msgstr "Incluir Dados de Servidor de Texto"
 
 msgid "DPI"
 msgstr "DPI"
@@ -2447,7 +2998,7 @@ msgid "Per Pixel Transparency"
 msgstr "Transparência por Pixel"
 
 msgid "Allowed"
-msgstr "Permitido"
+msgstr "Ativada"
 
 msgid "Threads"
 msgstr "Threads"
@@ -2455,15 +3006,15 @@ msgstr "Threads"
 msgid "Thread Model"
 msgstr "Modelo de Thread"
 
+msgid "Display Server"
+msgstr "Servidor de Exibição"
+
 msgid "Handheld"
-msgstr "Portátil (Handheld)"
+msgstr "Portátil"
 
 msgid "Orientation"
 msgstr "Orientação"
 
-msgid "V-Sync Mode"
-msgstr "Modo V-Sync"
-
 msgid "Output Latency"
 msgstr "Latência de Saída"
 
@@ -2480,43 +3031,91 @@ msgid "Hide Status Bar"
 msgstr "Esconder Barra de Status"
 
 msgid "Suppress UI Gesture"
-msgstr "Suprimir Interface de Usuário para Gestures"
+msgstr "Suprimir Gestos de UI"
 
 msgid "XR"
 msgstr "XR"
 
 msgid "OpenXR"
-msgstr "Tecnologia OpenXR"
+msgstr "OpenXR"
 
 msgid "Default Action Map"
 msgstr "Mapa de Ações Padrão"
 
 msgid "Form Factor"
-msgstr "Fator de Formulário"
+msgstr "Formato"
 
 msgid "View Configuration"
 msgstr "Configuração de Vista"
 
+msgid "Reference Space"
+msgstr "Espaço de Referência"
+
+msgid "Environment Blend Mode"
+msgstr "Modo de Mistura do Ambiente"
+
+msgid "Foveation Level"
+msgstr "Nível de Foveação"
+
 msgid "Foveation Dynamic"
 msgstr "Foveação Dinâmica"
 
 msgid "Submit Depth Buffer"
 msgstr "Enviar Buffer de Profundidade"
 
+msgid "Startup Alert"
+msgstr "Alerta ao Iniciar"
+
+msgid "Extensions"
+msgstr "Extensões"
+
+msgid "Debug Utils"
+msgstr "Utilidades de Depuração"
+
+msgid "Debug Message Types"
+msgstr "Tipos de Mensagem de Depuração"
+
+msgid "Hand Tracking"
+msgstr "Detecção de Mãos"
+
+msgid "Hand Tracking Unobstructed Data Source"
+msgstr "Detecção de Mãos: Fonte de Dados Sem Obstruções"
+
+msgid "Hand Tracking Controller Data Source"
+msgstr "Detecção de Mãos: Fonte de Dados do Controle"
+
+msgid "Hand Interaction Profile"
+msgstr "Perfil de Interação da Mão"
+
+msgid "Eye Gaze Interaction"
+msgstr "Interação de Olhar"
+
+msgid "Binding Modifiers"
+msgstr "Modificadores de Binding"
+
+msgid "Analog Threshold"
+msgstr "Limiar Analógico"
+
+msgid "Dpad Binding"
+msgstr "Binding de Dpad"
+
 msgid "Boot Splash"
-msgstr "Imagem de Exibição ao Iniciar"
+msgstr "Imagem de Carregamento"
 
 msgid "BG Color"
-msgstr "Cor do Plano de Fundo"
+msgstr "Cor de Fundo"
 
 msgid "Pen Tablet"
-msgstr "Tablet de Caneta Gráfica"
+msgstr "Mesa Digitalizadora"
 
 msgid "Environment"
 msgstr "Ambiente"
 
+msgid "Defaults"
+msgstr "Padrões"
+
 msgid "Default Clear Color"
-msgstr "Cor Limpa Padrão"
+msgstr "Cor de Fundo Padrão"
 
 msgid "Icon"
 msgstr "Ícone"
@@ -2537,19 +3136,19 @@ msgid "Mouse Cursor"
 msgstr "Cursor do Mouse"
 
 msgid "Custom Image"
-msgstr "Imagem customizada"
+msgstr "Imagem Personalizada"
 
 msgid "Custom Image Hotspot"
-msgstr "Imagem Personalizada de Hotspot"
+msgstr "Hotspot da Imagem Personalizada"
 
 msgid "Tooltip Position Offset"
-msgstr "Deslocamento de Posição da Dica de Ferramenta"
+msgstr "Deslocamento da Dica de Ferramenta"
 
 msgid "Show Image"
 msgstr "Mostrar Imagem"
 
 msgid "Fullsize"
-msgstr "Tamanho Inteiro"
+msgstr "Janela Inteira"
 
 msgid "Use Filter"
 msgstr "Usar Filtro"
@@ -2558,35 +3157,140 @@ msgid "Image"
 msgstr "Imagem"
 
 msgid "Minimum Display Time"
-msgstr "Tempo mínimo de exibição"
+msgstr "Tempo Mínimo de Exibição"
 
 msgid "Dotnet"
-msgstr ".NET"
+msgstr "Dotnet"
 
 msgid "Project"
 msgstr "Projeto"
 
 msgid "Assembly Name"
-msgstr "Nome de Montagem"
+msgstr "Nome do Assembly"
 
 msgid "Solution Directory"
 msgstr "Diretório da Solução"
 
 msgid "Assembly Reload Attempts"
-msgstr "Tentativas de Recarregar Montagem"
+msgstr "Tentativas de Recarregar Assembly"
 
 msgid "Time"
 msgstr "Tempo"
 
+msgid "Physics Process"
+msgstr "Processo de Física"
+
+msgid "Navigation Process"
+msgstr "Processo de Navegação"
+
+msgid "Static"
+msgstr "Estático"
+
+msgid "Static Max"
+msgstr "Estático Máximo"
+
+msgid "Msg Buf Max"
+msgstr "Máx Buf Msg"
+
+msgid "Object"
+msgstr "Objeto"
+
+msgid "Objects"
+msgstr "Objetos"
+
+msgid "Resources"
+msgstr "Recursos"
+
+msgid "Orphan Nodes"
+msgstr "Nós Órfãos"
+
+msgid "Raster"
+msgstr "Raster"
+
+msgid "Total Objects Drawn"
+msgstr "Objetos Desenhados no Total"
+
+msgid "Total Primitives Drawn"
+msgstr "Primitivos Desenhados no Total"
+
+msgid "Total Draw Calls"
+msgstr "Chamadas de Desenho no Total"
+
+msgid "Video"
+msgstr "Vídeo"
+
+msgid "Video Mem"
+msgstr "Mem. de Vídeo"
+
+msgid "Texture Mem"
+msgstr "Mem. de Textura"
+
+msgid "Buffer Mem"
+msgstr "Mem. de Buffer"
+
+msgid "Physics 2D"
+msgstr "Física 2D"
+
+msgid "Active Objects"
+msgstr "Objetos Ativos"
+
+msgid "Collision Pairs"
+msgstr "Pares de Colisão"
+
+msgid "Islands"
+msgstr "Ilhas"
+
+msgid "Physics 3D"
+msgstr "Física 3D"
+
+msgid "Active Maps"
+msgstr "Mapas Ativos"
+
+msgid "Regions"
+msgstr "Regiões"
+
 msgid "Agents"
 msgstr "Agentes"
 
+msgid "Links"
+msgstr "Ligações"
+
 msgid "Polygons"
 msgstr "Polígonos"
 
 msgid "Edges"
 msgstr "Arestas"
 
+msgid "Edges Merged"
+msgstr "Arestas Combinadas"
+
+msgid "Edges Connected"
+msgstr "Arestas Conectadas"
+
+msgid "Edges Free"
+msgstr "Arestas Livres"
+
+msgid "Obstacles"
+msgstr "Obstáculos"
+
+msgid "Pipeline"
+msgstr "Pipeline"
+
+msgid "Compilations Canvas"
+msgstr "Compilações Tela"
+
+msgid "Compilations Mesh"
+msgstr "Compilações Malha"
+
+msgid "Compilations Surface"
+msgstr "Compilações Superfície"
+
+msgid "Compilations Draw"
+msgstr "Compilações Desenho"
+
+msgid "Compilations Specialization"
+msgstr "Compilações Especialização"
+
 msgid "Operation"
 msgstr "Operação"
 
@@ -2630,7 +3334,7 @@ msgid "Sides"
 msgstr "Lados"
 
 msgid "Cone"
-msgstr "Cone()"
+msgstr "Cone"
 
 msgid "Inner Radius"
 msgstr "Raio Interno"
@@ -2648,10 +3352,10 @@ msgid "Depth"
 msgstr "Profundidade"
 
 msgid "Spin Degrees"
-msgstr "Graus de Rotação"
+msgstr "Graus de Giro"
 
 msgid "Spin Sides"
-msgstr "Lados de Rotação"
+msgstr "Lados de Giro"
 
 msgid "Path Node"
 msgstr "Caminho do Nó"
@@ -2668,11 +3372,14 @@ msgstr "Ângulo de Simplificação de Caminho"
 msgid "Path Rotation"
 msgstr "Rotação do Caminho"
 
+msgid "Path Rotation Accurate"
+msgstr "Rotação Precisa do Caminho"
+
 msgid "Path Local"
 msgstr "Caminho Local"
 
 msgid "Path Continuous U"
-msgstr "Caminho Continuo U"
+msgstr "Caminho Contínuo U"
 
 msgid "Path U Distance"
 msgstr "Distância do Caminho U"
@@ -2680,11 +3387,17 @@ msgstr "Distância do Caminho U"
 msgid "Path Joined"
 msgstr "Caminho Unido"
 
+msgid "Importer"
+msgstr "Importador"
+
 msgid "Allow Geometry Helper Nodes"
 msgstr "Permitir Nós Auxiliares de Geometria"
 
 msgid "Embedded Image Handling"
-msgstr "Manuseio de imagens embutido"
+msgstr "Manuseio de Imagens Embutido"
+
+msgid "FBX2glTF"
+msgstr "FBX2glTF"
 
 msgid "GDScript"
 msgstr "GDScript"
@@ -2696,37 +3409,73 @@ msgid "Global Function Color"
 msgstr "Cor de Função Global"
 
 msgid "Node Path Color"
-msgstr "Cor do Caminho do Nó"
+msgstr "Cor de Caminho de Nó"
 
 msgid "Node Reference Color"
-msgstr "Cor de referência do nó"
+msgstr "Cor de Referência de Nó"
 
 msgid "Annotation Color"
 msgstr "Cor de Anotação"
 
+msgid "String Name Color"
+msgstr "Cor de StringName"
+
+msgid "Comment Markers"
+msgstr "Marcadores de Comentário"
+
+msgid "Critical Color"
+msgstr "Cor de Erro Crítico"
+
+msgid "Warning Color"
+msgstr "Cor de Aviso"
+
+msgid "Notice Color"
+msgstr "Cor de Observação"
+
+msgid "Critical List"
+msgstr "Lista de Erros Críticos"
+
+msgid "Warning List"
+msgstr "Lista de Avisos"
+
+msgid "Notice List"
+msgstr "Lista de Observações"
+
 msgid "Max Call Stack"
-msgstr "Máximo Empilhamento de Chamadas"
+msgstr "Call Stack Máxima"
 
 msgid "Exclude Addons"
-msgstr "Excluir Addons"
+msgstr "Ignorar Addons"
+
+msgid "Renamed in Godot 4 Hint"
+msgstr "Dica Renomeado no Godot 4"
 
 msgid "Language Server"
-msgstr "Servidor de Idioma"
+msgstr "Servidor de Linguagem"
 
 msgid "Enable Smart Resolve"
 msgstr "Habilitar Resolução Inteligente"
 
+msgid "Show Native Symbols in Editor"
+msgstr "Exibir Símbolos Nativos no Editor"
+
 msgid "Use Thread"
-msgstr "Utilize Thread"
+msgstr "Utilizar Thread"
 
 msgid "Poll Limit (µsec)"
-msgstr "Limite de pesquisa (µseg)"
+msgstr "Limite de Polling (µseg)"
 
 msgid "Copyright"
 msgstr "Direitos Autorais"
 
+msgid "Bake FPS"
+msgstr "FPS de Pré-cálculo"
+
 msgid "glTF"
-msgstr "'glTF'"
+msgstr "glTF"
+
+msgid "Naming Version"
+msgstr "Versão de Nomeação"
 
 msgid "Color"
 msgstr "Cor"
@@ -2738,13 +3487,13 @@ msgid "Light Type"
 msgstr "Tipo de Luz"
 
 msgid "Range"
-msgstr "Intervalo"
+msgstr "Alcance"
 
 msgid "Inner Cone Angle"
-msgstr "Ângulo interno do cone"
+msgstr "Ângulo Interno do Cone"
 
 msgid "Outer Cone Angle"
-msgstr "Ângulo externo do cone"
+msgstr "Ângulo Externo do Cone"
 
 msgid "Diffuse Img"
 msgstr "Imagem Difusa"
@@ -2759,37 +3508,64 @@ msgid "Specular Factor"
 msgstr "Fator Especular"
 
 msgid "Spec Gloss Img"
-msgstr "Imagem Especular Lustrosa"
+msgstr "Imagem Especular Brilhosa"
 
 msgid "Mass"
 msgstr "Massa"
 
+msgid "Linear Velocity"
+msgstr "Velocidade Linear"
+
 msgid "Angular Velocity"
 msgstr "Velocidade Angular"
 
+msgid "Center of Mass"
+msgstr "Centro de Massa"
+
+msgid "Inertia Diagonal"
+msgstr "Inércia Diagonal"
+
+msgid "Inertia Orientation"
+msgstr "Inércia Orientação"
+
+msgid "Inertia Tensor"
+msgstr "Inércia Tensor"
+
 msgid "Is Trigger"
 msgstr "É Gatilho"
 
+msgid "Mesh Index"
+msgstr "Índice de Malha"
+
+msgid "Importer Mesh"
+msgstr "Malha de Importador"
+
+msgid "Image Format"
+msgstr "Formato de Imagem"
+
+msgid "Root Node Mode"
+msgstr "Modo do Nó Raiz"
+
 msgid "Json"
-msgstr "Formato Json"
+msgstr "Json"
 
 msgid "Major Version"
-msgstr "Versão Importante"
+msgstr "Versão Maior"
 
 msgid "Minor Version"
-msgstr "Versão Minoritária"
+msgstr "Versão Menor"
 
 msgid "GLB Data"
 msgstr "Dados do GLB"
 
 msgid "Use Named Skin Binds"
-msgstr "Usar Associações de Pele com nome"
+msgstr "Usar Associações de Skin com Nome"
 
 msgid "Buffers"
-msgstr "Preparações"
+msgstr "Buffers"
 
 msgid "Buffer Views"
-msgstr "Visão Buffer"
+msgstr "Visões de Buffer"
 
 msgid "Accessors"
 msgstr "Assessores"
@@ -2803,6 +3579,9 @@ msgstr "Nome da Cena"
 msgid "Base Path"
 msgstr "Caminho Base"
 
+msgid "Filename"
+msgstr "Nome do Arquivo"
+
 msgid "Root Nodes"
 msgstr "Nós Raízes"
 
@@ -2851,29 +3630,35 @@ msgstr "Normalizado"
 msgid "Count"
 msgstr "Quantidade"
 
+msgid "Accessor Type"
+msgstr "Tipo do Acessor"
+
 msgid "Min"
-msgstr "Min"
+msgstr "Mín"
 
 msgid "Max"
-msgstr "Max"
+msgstr "Máx"
 
 msgid "Sparse Count"
-msgstr "Contagem Escassa"
+msgstr "Contagem de Esparsos"
 
 msgid "Sparse Indices Buffer View"
-msgstr "Visualização de Buffer dos Indices Esparsos"
+msgstr "Índices Esparsos: Ver Buffer"
 
 msgid "Sparse Indices Byte Offset"
-msgstr "Deslocação de Byte dos Índices Esparsos"
+msgstr "Índices Esparsos: Deslocação de Byte"
 
 msgid "Sparse Indices Component Type"
-msgstr "Tipo de Componente de Índices Esparsos"
+msgstr "Índices Esparsos: Tipo de Componente"
 
 msgid "Sparse Values Buffer View"
-msgstr "Visualização de Buffer dos Valores Esparsos"
+msgstr "Valores Esparsos: Ver Buffer"
 
 msgid "Sparse Values Byte Offset"
-msgstr "Deslocação de Byte dos Valores Esparsos"
+msgstr "Valores Esparsos: Deslocação de Byte"
+
+msgid "Original Name"
+msgstr "Nome Original"
 
 msgid "Loop"
 msgstr "Repetir"
@@ -2882,7 +3667,7 @@ msgid "Buffer"
 msgstr "Buffer"
 
 msgid "Byte Length"
-msgstr "Largura do byte"
+msgstr "Largura do Byte"
 
 msgid "Byte Stride"
 msgstr "Separação dos Bytes"
@@ -2890,20 +3675,26 @@ msgstr "Separação dos Bytes"
 msgid "Indices"
 msgstr "Índices"
 
+msgid "Vertex Attributes"
+msgstr "Atributos de Vértice"
+
 msgid "Perspective"
 msgstr "Perspectiva"
 
 msgid "FOV"
 msgstr "FOV"
 
+msgid "Size Mag"
+msgstr "Magnitude do Tamanho"
+
 msgid "Depth Far"
 msgstr "Profundidade Distante"
 
 msgid "Depth Near"
-msgstr "Profundidade Perto"
+msgstr "Profundidade Próxima"
 
 msgid "Blend Weights"
-msgstr "Peso da mesclagem"
+msgstr "Pesos de Blend"
 
 msgid "Instance Materials"
 msgstr "Materiais da Instância"
@@ -2912,10 +3703,10 @@ msgid "Parent"
 msgstr "Pai"
 
 msgid "Xform"
-msgstr "Plataforma(Xform)"
+msgstr "Xform"
 
 msgid "Skin"
-msgstr "Pele"
+msgstr "Skin"
 
 msgid "Children"
 msgstr "Filhos"
@@ -2923,32 +3714,56 @@ msgstr "Filhos"
 msgid "Light"
 msgstr "Luz"
 
+msgid "glTF to Godot Expression"
+msgstr "glTF para Expressão do Godot"
+
+msgid "Godot to glTF Expression"
+msgstr "Godot para Expressão glTF"
+
+msgid "Node Paths"
+msgstr "Caminhos de Nó"
+
+msgid "Object Model Type"
+msgstr "Tipo do Modelo de Objeto"
+
+msgid "Json Pointers"
+msgstr "Pointers Json"
+
+msgid "Variant Type"
+msgstr "Tipo do Variante"
+
 msgid "Joints"
-msgstr "Pontos"
+msgstr "Articulações"
 
 msgid "Roots"
 msgstr "Raízes"
 
 msgid "Godot Bone Node"
-msgstr "Nó de Osso Godot"
+msgstr "Nó de Osso do Godot"
 
 msgid "Skin Root"
 msgstr "Raiz da Skin"
 
 msgid "Joints Original"
-msgstr "Pontos Originais"
+msgstr "Articulações Originais"
 
 msgid "Non Joints"
-msgstr "Não-Juntas"
+msgstr "Não-Articulações"
 
 msgid "Godot Skin"
-msgstr "Skin Godot"
+msgstr "Skin do Godot"
 
 msgid "Src Image"
-msgstr "Imagem fonte"
+msgstr "Imagem Fonte"
 
 msgid "Sampler"
-msgstr "Amostrador"
+msgstr "Sampler"
+
+msgid "Mag Filter"
+msgstr "Filtro de Magnificação"
+
+msgid "Min Filter"
+msgstr "Filtro de Minificação"
 
 msgid "Wrap S"
 msgstr "Envoltório S"
@@ -2966,7 +3781,7 @@ msgid "Cell"
 msgstr "Célula"
 
 msgid "Octant Size"
-msgstr "Tamanho Octante"
+msgstr "Tamanho de Oitante"
 
 msgid "Center X"
 msgstr "Centro X"
@@ -2981,19 +3796,139 @@ msgid "Priority"
 msgstr "Prioridade"
 
 msgid "Bake Navigation"
-msgstr "Navegação Pré-Processada"
+msgstr "Gerar Navegação"
+
+msgid "Clip Count"
+msgstr "Número de Clipes"
+
+msgid "Initial Clip"
+msgstr "Clipe Inicial"
 
 msgid "Shuffle"
 msgstr "Embaralhar"
 
+msgid "Fade Time"
+msgstr "Tempo de Fade"
+
+msgid "Stream Count"
+msgstr "Número de Transmissões"
+
+msgid "Jolt Physics 3D"
+msgstr "Jolt Physics 3D"
+
+msgid "Simulation"
+msgstr "Simulação"
+
+msgid "Velocity Steps"
+msgstr "Passos de Velocidade"
+
+msgid "Position Steps"
+msgstr "Passos de Posição"
+
+msgid "Use Enhanced Internal Edge Removal"
+msgstr "Usar Removedor de Canto Interno"
+
+msgid "Areas Detect Static Bodies"
+msgstr "Áreas Detectam StaticBodies"
+
+msgid "Generate All Kinematic Contacts"
+msgstr "Gerar Todos os Contatos Cinemáticos"
+
+msgid "Penetration Slop"
+msgstr "Penetração Máxima"
+
+msgid "Speculative Contact Distance"
+msgstr "Distância de Previsão de Contato"
+
+msgid "Baumgarte Stabilization Factor"
+msgstr "Fator de Estabilização Baumgarte"
+
+msgid "Soft Body Point Radius"
+msgstr "Raio de Ponto de SoftBody"
+
+msgid "Bounce Velocity Threshold"
+msgstr "Velocidade Mínima para Quicar"
+
+msgid "Allow Sleep"
+msgstr "Permitir Repouso"
+
+msgid "Sleep Velocity Threshold"
+msgstr "Velocidade Mínima para Repousar"
+
+msgid "Sleep Time Threshold"
+msgstr "Espera Pré-Repouso"
+
+msgid "Continuous CD Movement Threshold"
+msgstr "Movimento Mínimo para CD Contínuo"
+
+msgid "Continuous CD Max Penetration"
+msgstr "Penetração Máximo de CD Contínuo"
+
+msgid "Body Pair Contact Cache Enabled"
+msgstr "Habilitar Cache de Pares de Contato"
+
+msgid "Body Pair Contact Cache Distance Threshold"
+msgstr "Distância Mínima para o Cache de Pares de Contato"
+
+msgid "Body Pair Contact Cache Angle Threshold"
+msgstr "Ângulo Mínimo para o Cache de Pares de Contato"
+
+msgid "Queries"
+msgstr "Consultas"
+
+msgid "Enable Ray Cast Face Index"
+msgstr "Habilitar Índice de Face de Ray Cast"
+
+msgid "Motion Queries"
+msgstr "Consultas de Movimento"
+
+msgid "Recovery Iterations"
+msgstr "Iterações de Recuperação"
+
+msgid "Recovery Amount"
+msgstr "Quantidade de Recuperação"
+
+msgid "Collisions"
+msgstr "Colisões"
+
+msgid "Collision Margin Fraction"
+msgstr "Fração de Margem de Colisão"
+
+msgid "Active Edge Threshold"
+msgstr "Ângulo Máximo de Aresta Ativa"
+
+msgid "World Node"
+msgstr "Nó Mundo"
+
+msgid "Temporary Memory Buffer Size"
+msgstr "Tamanho Temporário do Buffer de Memória"
+
+msgid "World Boundary Shape Size"
+msgstr "Tamanho da Forma de Limite do Mundo"
+
+msgid "Max Linear Velocity"
+msgstr "Velocidade Linear Máxima"
+
+msgid "Max Angular Velocity"
+msgstr "Velocidade Angular Máxima"
+
+msgid "Max Bodies"
+msgstr "Máximo de Corpos"
+
+msgid "Max Body Pairs"
+msgstr "Máximo de Pares de Corpo"
+
+msgid "Max Contact Constraints"
+msgstr "Máximo de Restrições de Contato"
+
 msgid "Lightmapping"
-msgstr "Mapeamento de luz"
+msgstr "Lightmapping"
 
 msgid "Bake Quality"
-msgstr "Qualidade Bake"
+msgstr "Qualidade do Pré-cálculo"
 
 msgid "Low Quality Ray Count"
-msgstr "Quantidade de Raios de Baixa Qualidade"
+msgstr "Quantidade de Raios de Qualidade Baixa"
 
 msgid "Medium Quality Ray Count"
 msgstr "Quantidade de Raios de Qualidade Média"
@@ -3005,52 +3940,67 @@ msgid "Ultra Quality Ray Count"
 msgstr "Quantidade de Raios de Qualidade Ultra"
 
 msgid "Bake Performance"
-msgstr "Performance do Bake"
+msgstr "Performance do Pré-Cálculo"
 
 msgid "Max Rays per Pass"
-msgstr "Máximo de Raios por Passagem"
+msgstr "Máximo de Raios por Passe"
 
 msgid "Region Size"
 msgstr "Tamanho da Região"
 
+msgid "Max Transparency Rays"
+msgstr "Máximo de Raios de Transparência"
+
 msgid "Low Quality Probe Ray Count"
-msgstr "Sonda Contadora de Raios de Baixa Qualidade"
+msgstr "Quantidade de Raios de Sonda de Qualidade Baixa"
 
 msgid "Medium Quality Probe Ray Count"
-msgstr "Sonda Contadora de Raios de Qualidade Média"
+msgstr "Quantidade de Raios de Sonda de Qualidade Média"
 
 msgid "High Quality Probe Ray Count"
-msgstr "Sonda Contadora de Raios de Qualidade Alta"
+msgstr "Quantidade de Raios de Sonda de Qualidade Alta"
 
 msgid "Ultra Quality Probe Ray Count"
-msgstr "Sonda Contadora de Raios de Qualidade Ultra"
+msgstr "Quantidade de Raios de Sonda de Qualidade Ultra"
 
 msgid "Max Rays per Probe Pass"
-msgstr "Máximo de Raios por Passagem pela Sonda"
+msgstr "Máximo de Raios por Passe de Sonda"
+
+msgid "Denoising"
+msgstr "Redução de Ruído"
+
+msgid "Denoiser"
+msgstr "Redutor de Ruído"
 
 msgid "BPM"
-msgstr "'BPM'"
+msgstr "BPM"
 
 msgid "Beat Count"
-msgstr "Contador de Batidas"
+msgstr "Número de Batidas"
 
 msgid "Bar Beats"
-msgstr "Barra de beats"
+msgstr "Batidas por Barra"
 
 msgid "Loop Offset"
-msgstr "Deslocamento do Loop"
+msgstr "Deslocamento da Repetição"
 
 msgid "Eye Height"
 msgstr "Altura do Olho"
 
 msgid "IOD"
-msgstr "'IOD'"
+msgstr "Distância Interocular"
 
 msgid "Display Width"
 msgstr "Largura de Tela"
 
+msgid "Display to Lens"
+msgstr "Distância Entre Tela e Lentes"
+
+msgid "Offset Rect"
+msgstr "Retângulo de Deslocamento"
+
 msgid "Oversample"
-msgstr "Amostragem em excesso"
+msgstr "Oversample"
 
 msgid "K1"
 msgstr "K1"
@@ -3058,11 +4008,17 @@ msgstr "K1"
 msgid "K2"
 msgstr "K2"
 
+msgid "Vulkan VRS"
+msgstr "Vulkan VRS"
+
+msgid "Min Radius"
+msgstr "Raio Mínimo"
+
 msgid "Spawn Path"
-msgstr "Caminho Salvamento Spawn"
+msgstr "Caminho da Cena para Gerar"
 
 msgid "Spawn Limit"
-msgstr "Limites de Geração"
+msgstr "Limite de Geração"
 
 msgid "Root Path"
 msgstr "Caminho Raíz"
@@ -3070,6 +4026,9 @@ msgstr "Caminho Raíz"
 msgid "Replication Interval"
 msgstr "Intervalo de Replicação"
 
+msgid "Delta Interval"
+msgstr "Intervalo de Sincronia"
+
 msgid "Visibility Update Mode"
 msgstr "Modo de Atualização de Visibilidade"
 
@@ -3077,10 +4036,10 @@ msgid "Public Visibility"
 msgstr "Visibilidade Pública"
 
 msgid "Auth Callback"
-msgstr "Auth do Callback"
+msgstr "Callback de Autenticação"
 
 msgid "Auth Timeout"
-msgstr "Tempo Limite de Espera Auth"
+msgstr "Tempo Limite de Autenticação"
 
 msgid "Allow Object Decoding"
 msgstr "Permitir a Decodificação de Objetos"
@@ -3089,7 +4048,13 @@ msgid "Refuse New Connections"
 msgstr "Recusar Novas Conexões"
 
 msgid "Server Relay"
-msgstr "Retransmissor de Servidor"
+msgstr "Servidor Repetidor"
+
+msgid "Max Sync Packet Size"
+msgstr "Tamanho Máximo de Pacote de Sincronização"
+
+msgid "Max Delta Packet Size"
+msgstr "Tamanho Máximo de Pacote Delta"
 
 msgid "Noise Type"
 msgstr "Tipo de Ruído"
@@ -3098,7 +4063,7 @@ msgid "Frequency"
 msgstr "Frequência"
 
 msgid "Fractal"
-msgstr "'Fractal'"
+msgstr "Fractal"
 
 msgid "Octaves"
 msgstr "Oitavas"
@@ -3109,6 +4074,9 @@ msgstr "Lacunaridade"
 msgid "Gain"
 msgstr "Ganho"
 
+msgid "Weighted Strength"
+msgstr "Peso da Força"
+
 msgid "Ping Pong Strength"
 msgstr "Força Ping-Pong"
 
@@ -3119,19 +4087,19 @@ msgid "Distance Function"
 msgstr "Função de Distância"
 
 msgid "Jitter"
-msgstr "Nervosidade (Jitter)"
+msgstr "Jitter"
 
 msgid "Return Type"
 msgstr "Tipo de Retorno"
 
 msgid "Domain Warp"
-msgstr "Aberração Dominante"
+msgstr "Aberração do Domínio"
 
 msgid "Amplitude"
-msgstr "Amplitude()"
+msgstr "Amplitude"
 
 msgid "Fractal Type"
-msgstr "Tipo Fractal"
+msgstr "Tipo de Fractal"
 
 msgid "Fractal Octaves"
 msgstr "Oitavas Fractais"
@@ -3149,13 +4117,13 @@ msgid "Invert"
 msgstr "Inverter"
 
 msgid "In 3D Space"
-msgstr "No espaço 3D"
+msgstr "No Espaço 3D"
 
 msgid "Seamless"
-msgstr "Sem Emenda"
+msgstr "Sem Emendas"
 
 msgid "Seamless Blend Skirt"
-msgstr "Mistura da mesclagem"
+msgstr "Raio de Mistura das Emendas"
 
 msgid "As Normal Map"
 msgstr "Como Mapa Normal"
@@ -3170,7 +4138,7 @@ msgid "Noise"
 msgstr "Ruído"
 
 msgid "Localized Name"
-msgstr "Nome Localizado"
+msgstr "Nome Traduzido"
 
 msgid "Action Type"
 msgstr "Tipo de Ação"
@@ -3178,18 +4146,105 @@ msgstr "Tipo de Ação"
 msgid "Toplevel Paths"
 msgstr "Caminhos Toplevel"
 
+msgid "Binding Path"
+msgstr "Caminho de Binding"
+
 msgid "Interaction Profile Path"
 msgstr "Caminho do Perfil de Interação"
 
+msgid "Runtime Paths"
+msgstr "Caminhos de Runtimes"
+
+msgid "Action Set"
+msgstr "Conjunto de Ação"
+
+msgid "Input Path"
+msgstr "Caminho de Entrada"
+
+msgid "Threshold Released"
+msgstr "Limiar de Soltamento"
+
+msgid "Center Region"
+msgstr "Região Central"
+
+msgid "Wedge Angle"
+msgstr "Ângulo de Direção"
+
+msgid "Is Sticky"
+msgstr "É Aderente"
+
+msgid "On Haptic"
+msgstr "Háptico Ativado"
+
+msgid "Off Haptic"
+msgstr "Háptico Desativado"
+
+msgid "On Threshold"
+msgstr "Limiar Ativado"
+
+msgid "Off Threshold"
+msgstr "Limiar Desativado"
+
 msgid "Display Refresh Rate"
 msgstr "Mostrar Taxa de Atualização"
 
+msgid "Render Target Size Multiplier"
+msgstr "Multiplicador de Tamanho do Alvo de Renderização"
+
+msgid "Layer Viewport"
+msgstr "Viewport da Camada"
+
+msgid "Use Android Surface"
+msgstr "Usar Superfície Android"
+
+msgid "Android Surface Size"
+msgstr "Tamanho da Superfície Android"
+
+msgid "Sort Order"
+msgstr "Ordenação"
+
+msgid "Alpha Blend"
+msgstr "Mistura Alfa"
+
+msgid "Enable Hole Punch"
+msgstr "Habilitar Perfurador"
+
+msgid "Aspect Ratio"
+msgstr "Proporção de Tela"
+
+msgid "Central Angle"
+msgstr "Ângulo Inicial"
+
+msgid "Fallback Segments"
+msgstr "Segmentos de Fallback"
+
+msgid "Central Horizontal Angle"
+msgstr "Ângulo Horizontal Central"
+
+msgid "Upper Vertical Angle"
+msgstr "Ângulo Vertical Superior"
+
+msgid "Lower Vertical Angle"
+msgstr "Ângulo Vertical Inferior"
+
+msgid "Quad Size"
+msgstr "Tamanho do Quad"
+
+msgid "Hand"
+msgstr "Mão"
+
 msgid "Motion Range"
-msgstr "Escala de Movimentação"
+msgstr "Alcance de Movimentação"
 
 msgid "Hand Skeleton"
 msgstr "Esqueleto da Mão"
 
+msgid "Skeleton Rig"
+msgstr "Rig do Esqueleto"
+
+msgid "Bone Update"
+msgstr "Atualização de Osso"
+
 msgid "Subject"
 msgstr "Sujeito"
 
@@ -3200,7 +4255,7 @@ msgid "Strings"
 msgstr "Strings"
 
 msgid "Discover Multicast If"
-msgstr "Descobrir if Multicast"
+msgstr "Descobrir Multicast Caso"
 
 msgid "Discover Local Port"
 msgstr "Descobrir Porta Local"
@@ -3221,10 +4276,10 @@ msgid "IGD Service Type"
 msgstr "Tipo de Serviço IGD"
 
 msgid "IGD Our Addr"
-msgstr "IGD (nosso endereço)"
+msgstr "IGD Nosso Endereço"
 
 msgid "IGD Status"
-msgstr "Estado do IGD"
+msgstr "Status do IGD"
 
 msgid "WebRTC"
 msgstr "WebRTC"
@@ -3241,9 +4296,21 @@ msgstr "Protocolos Suportados"
 msgid "Handshake Headers"
 msgstr "Cabeçalhos de Handshake"
 
+msgid "Inbound Buffer Size"
+msgstr "Tamanho Máximo do Buffer de Entrada"
+
+msgid "Outbound Buffer Size"
+msgstr "Tamanho Máximo do Buffer de Saída"
+
 msgid "Handshake Timeout"
 msgstr "Tempo de Handshake Esgotado"
 
+msgid "Max Queued Packets"
+msgstr "Máximo de Pacotes de Saída"
+
+msgid "Heartbeat Interval"
+msgstr "Intervalo de Heartbeat"
+
 msgid "Session Mode"
 msgstr "Modo Sessão"
 
@@ -3259,38 +4326,59 @@ msgstr "Tipos de Espaço de Referência Solicitados"
 msgid "Reference Space Type"
 msgstr "Tipo de Espaço de Referência"
 
+msgid "Enabled Features"
+msgstr "Funcionalidades Ativadas"
+
 msgid "Visibility State"
 msgstr "Estado de Visibilidade"
 
 msgid "Force System User"
 msgstr "Forçar Usuário do Sistema"
 
+msgid "Shutdown ADB on Exit"
+msgstr "Desligar ADB ao Sair"
+
+msgid "One Click Deploy Clear Previous Install"
+msgstr "Implantação em Um Clique: Apagar Instalação Anterior"
+
 msgid "Use Wi-Fi for Remote Debug"
-msgstr "Use Wi-Fi para Depuração Remota"
+msgstr "Usar Wi-Fi para Depuração Remota"
+
+msgid "Wi-Fi Remote Debug Host"
+msgstr "Hospedeiro de Depuração Remota por Wi-Fi"
 
 msgid "Launcher Icons"
-msgstr "Ícones do Iniciador"
+msgstr "Ícones de Launcher"
 
 msgid "Main 192 X 192"
 msgstr "Principal 192 X 192"
 
 msgid "Adaptive Foreground 432 X 432"
-msgstr "Primeiro Plano Adaptável 432 X 432"
+msgstr "Adaptável: Primeiro Plano 432 X 432"
 
 msgid "Adaptive Background 432 X 432"
-msgstr "Fundo Adaptável 432 X 432"
+msgstr "Adaptável: Fundo 432 X 432"
+
+msgid "Adaptive Monochrome 432 X 432"
+msgstr "Adaptável: Monocromático 432 X 432"
 
 msgid "Gradle Build"
-msgstr "'Gradle'"
+msgstr "Compilador Gradle"
 
 msgid "Use Gradle Build"
-msgstr "Usar Build Gradle Personalizada"
+msgstr "Usar Compilador Gradle"
+
+msgid "Gradle Build Directory"
+msgstr "Pasta do Compilador Gradle"
+
+msgid "Android Source Template"
+msgstr "Fonte do Modelo para Android"
 
 msgid "Compress Native Libraries"
-msgstr "Compactar bibliotecas nativas"
+msgstr "Compactar Bibliotecas Nativas"
 
 msgid "Export Format"
-msgstr "Exportar Formato"
+msgstr "Formato de Exportação"
 
 msgid "Min SDK"
 msgstr "SDK Mínimo"
@@ -3305,19 +4393,19 @@ msgid "Architectures"
 msgstr "Arquiteturas"
 
 msgid "Keystore"
-msgstr "Armazenamento de chaves"
+msgstr "Keystore"
 
 msgid "Debug User"
-msgstr "Depurar Usuário"
+msgstr "Usuário de Depuração"
 
 msgid "Debug Password"
-msgstr "Depurar Senha"
+msgstr "Senha de Depuração"
 
 msgid "Release User"
-msgstr "Liberar Usuário"
+msgstr "Usuário de Lançamento"
 
 msgid "Release Password"
-msgstr "Liberar Senha"
+msgstr "Senha de Lançamento"
 
 msgid "Code"
 msgstr "Código"
@@ -3334,14 +4422,20 @@ msgstr "Assinado"
 msgid "App Category"
 msgstr "Categoria do Aplicativo"
 
+msgid "Retain Data on Uninstall"
+msgstr "Manter Dados ao Desinstalar"
+
 msgid "Exclude From Recents"
 msgstr "Excluir de Recentes"
 
 msgid "Show in Android TV"
 msgstr "Mostrar na Android TV"
 
+msgid "Show in App Library"
+msgstr "Mostrar na Biblioteca de Apps"
+
 msgid "Show as Launcher App"
-msgstr "Mostrar como Aplicativo Inicializavel"
+msgstr "Mostrar como Aplicativo de Launcher"
 
 msgid "Graphics"
 msgstr "Gráficos"
@@ -3355,23 +4449,26 @@ msgstr "Funcionalidades XR"
 msgid "XR Mode"
 msgstr "Modo XR"
 
-msgid "Screen"
-msgstr "Tela"
+msgid "Gesture"
+msgstr "Gesto"
+
+msgid "Swipe to Dismiss"
+msgstr "Deslize para Fechar"
 
 msgid "Immersive Mode"
 msgstr "Modo Imersivo"
 
 msgid "Support Small"
-msgstr "Suporte Pequeno"
+msgstr "Suporta Pequena"
 
 msgid "Support Normal"
-msgstr "Suporte Normal"
+msgstr "Suporta Normal"
 
 msgid "Support Large"
-msgstr "Suporte Grande"
+msgstr "Suporta Grande"
 
 msgid "Support Xlarge"
-msgstr "Suporte Extra-grande"
+msgstr "Suporta Extra-grande"
 
 msgid "User Data Backup"
 msgstr "Backup de Dados do Usuário"
@@ -3413,31 +4510,52 @@ msgid "Settings 87 X 87"
 msgstr "Configurações 87 X 87"
 
 msgid "Notification 40 X 40"
-msgstr "Notificações 40 X 40"
+msgstr "Notificação 40 X 40"
 
 msgid "Notification 60 X 60"
-msgstr "Notificações 60 X 60"
+msgstr "Notificação 60 X 60"
+
+msgid "Notification 76 X 76"
+msgstr "Notificação 76 X 76"
+
+msgid "Notification 114 X 114"
+msgstr "Notificação 114 X 114"
 
 msgid "Spotlight 80 X 80"
-msgstr "'Spotlight 80 X 80'"
+msgstr "Spotlight 80 X 80"
+
+msgid "Spotlight 120 X 120"
+msgstr "Spotlight 120 X 120"
 
 msgid "iPhone 120 X 120"
-msgstr "'iPhone 120 X 120'"
+msgstr "iPhone 120 X 120"
 
 msgid "iPhone 180 X 180"
-msgstr "'iPhone 180 X 180'"
+msgstr "iPhone 180 X 180"
 
 msgid "iPad 167 X 167"
-msgstr "'iPad 167 X 167'"
+msgstr "iPad 167 X 167"
 
 msgid "iPad 152 X 152"
-msgstr "'iPad 152 X 152'"
+msgstr "iPad 152 X 152"
+
+msgid "iOS 128 X 128"
+msgstr "iOS 128 X 128"
+
+msgid "iOS 192 X 192"
+msgstr "iOS 192 X 192"
+
+msgid "iOS 136 X 136"
+msgstr "iOS 136 X 136"
 
 msgid "App Store 1024 X 1024"
-msgstr "Apple Store 1024 X 1024"
+msgstr "App Store 1024 X 1024"
 
 msgid "App Store Team ID"
-msgstr "ID da 'App Store Team'"
+msgstr "ID da Equipe da App Store"
+
+msgid "Export Method Debug"
+msgstr "Exportar com Depuração"
 
 msgid "Code Sign Identity Debug"
 msgstr "Identidade de Assinatura de Código para Depuração"
@@ -3446,19 +4564,25 @@ msgid "Code Sign Identity Release"
 msgstr "Identidade de Assinatura de Código para Release"
 
 msgid "Provisioning Profile UUID Debug"
-msgstr "Perfil Provisório UUID de Depuração"
+msgstr "UUID de Perfil de Provisionamento de Depuração"
 
 msgid "Provisioning Profile UUID Release"
-msgstr "UUID de depuração para perfil provisório"
+msgstr "UUID de Perfil de Provisionamento de Lançamento"
+
+msgid "Provisioning Profile Specifier Debug"
+msgstr "Especificador de Perfil de Provisionamento de Depuração"
+
+msgid "Provisioning Profile Specifier Release"
+msgstr "Especificador de Perfil de Provisionamento de Lançamento"
 
 msgid "Export Method Release"
-msgstr "Modo de Exportação Lançamento"
+msgstr "Exportar para Lançamento"
 
 msgid "Targeted Device Family"
 msgstr "Família de Equipamentos Alvo"
 
 msgid "Bundle Identifier"
-msgstr "Identificador de empacotamento"
+msgstr "Identificador de Pacote"
 
 msgid "Signature"
 msgstr "Assinatura"
@@ -3466,18 +4590,36 @@ msgstr "Assinatura"
 msgid "Short Version"
 msgstr "Versão Curta"
 
+msgid "Min iOS Version"
+msgstr "Versão Mínima do iOS"
+
+msgid "Additional Plist Content"
+msgstr "Conteúdo Adicional da Plist"
+
 msgid "Icon Interpolation"
 msgstr "Interpolação de Ícone"
 
+msgid "Export Project Only"
+msgstr "Exportar Apenas Projeto"
+
 msgid "Delete Old Export Files Unconditionally"
-msgstr "Exclua arquivos de exportação antigos incondicionalmente"
+msgstr "Excluir Arquivos de Exportação Antigos Incondicionalmente"
 
 msgid "Entitlements"
-msgstr "Direitos"
+msgstr "Permissões"
+
+msgid "Increased Memory Limit"
+msgstr "Memória Limite Aumentada"
+
+msgid "Game Center"
+msgstr "Game Center"
 
 msgid "Push Notifications"
 msgstr "Notificações Push"
 
+msgid "Additional"
+msgstr "Adicional"
+
 msgid "Capabilities"
 msgstr "Capacidades"
 
@@ -3485,34 +4627,58 @@ msgid "Access Wi-Fi"
 msgstr "Acessar Wi-Fi"
 
 msgid "Performance Gaming Tier"
-msgstr "Nível de Desempenho do jogo"
+msgstr "Performance Elevada para Jogos"
+
+msgid "Performance A 12"
+msgstr "Performance A 12"
 
 msgid "User Data"
 msgstr "Dados do Usuário"
 
 msgid "Accessible From Files App"
-msgstr "Acesso da 'Files App'"
+msgstr "Acessível no Aplicativo de Arquivos"
 
 msgid "Accessible From iTunes Sharing"
-msgstr "Acesso da 'iTunes Sharing'"
+msgstr "Acessível no Compartilhamento pelo iTunes"
 
 msgid "Privacy"
 msgstr "Privacidade"
 
 msgid "Camera Usage Description"
-msgstr "Descrição do Uso da Câmera"
+msgstr "Descrição de Uso da Câmera"
+
+msgid "Camera Usage Description Localized"
+msgstr "Descrição de Uso Traduzida da Câmera"
 
 msgid "Microphone Usage Description"
-msgstr "Descrição do Uso do Microfone"
+msgstr "Descrição de Uso do Microfone"
+
+msgid "Microphone Usage Description Localized"
+msgstr "Descrição de Uso Traduzida do Microfone"
 
 msgid "Photolibrary Usage Description"
-msgstr "Descrições da Biblioteca de Fotos"
+msgstr "Descrição de Uso da Galeria de Fotos"
 
 msgid "Photolibrary Usage Description Localized"
-msgstr "Descrição Localizada do Uso da Biblioteca de Fotos"
+msgstr "Descrição de Uso Traduzida da Galeria de Fotos"
+
+msgid "Tracking Enabled"
+msgstr "Habilitar Rastreio"
+
+msgid "Tracking Domains"
+msgstr "Domínios de Rastreio"
+
+msgid "Icon 1024 X 1024"
+msgstr "Ícone 1024 X 1024"
+
+msgid "Icon 1024 X 1024 Dark"
+msgstr "Ícone 1024 XX 1024 Escuro"
+
+msgid "Icon 1024 X 1024 Tinted"
+msgstr "Ícone 1024 X 1024 Colorido"
 
 msgid "Storyboard"
-msgstr "'Storyboard'"
+msgstr "Storyboard"
 
 msgid "Image Scale Mode"
 msgstr "Modo de Escalonamento de Imagem"
@@ -3533,7 +4699,7 @@ msgid "Architecture"
 msgstr "Arquitetura"
 
 msgid "SSH Remote Deploy"
-msgstr "Deploy remoto SSH"
+msgstr "Implantação Remota SSH"
 
 msgid "Extra Args SSH"
 msgstr "SSH Argumentos Extra"
@@ -3825,9 +4991,6 @@ msgstr "Máscara de Área"
 msgid "Copy Mode"
 msgstr "Modo de Cópia"
 
-msgid "Rect"
-msgstr "Retângulo"
-
 msgid "Anchor Mode"
 msgstr "Modo de Âncora"
 
@@ -4317,6 +5480,9 @@ msgstr "dB"
 msgid "Doppler"
 msgstr "Filtro"
 
+msgid "Tracking"
+msgstr "Rastreio"
+
 msgid "Bone Name"
 msgstr "Nome do Osso"
 
@@ -4329,6 +5495,9 @@ msgstr "Máscara Cull"
 msgid "Attributes"
 msgstr "Atributos"
 
+msgid "Doppler Tracking"
+msgstr "Rastreamento Doppler"
+
 msgid "Projection"
 msgstr "Projeção"
 
@@ -4407,9 +5576,6 @@ msgstr "Contorno Modular"
 msgid "Font"
 msgstr "Fonte"
 
-msgid "Font Size"
-msgstr "Tamanho da Fonte"
-
 msgid "Horizontal Alignment"
 msgstr "Alinhamento Horizontal"
 
@@ -4524,6 +5690,9 @@ msgstr "Modo de Rotação"
 msgid "Use Model Front"
 msgstr "Usar modelo frontal"
 
+msgid "Tilt Enabled"
+msgstr "Habilitar Inclinação"
+
 msgid "Reverb Bus"
 msgstr "Barramento de reverberação"
 
@@ -4696,7 +5865,7 @@ msgid "Drag Coefficient"
 msgstr "Coeficiente de arrasto"
 
 msgid "Track Physics Step"
-msgstr "Faixa de Etapa Física"
+msgstr "Rastrear Simulação de Física"
 
 msgid "Geometry"
 msgstr "Geometria"
@@ -4722,11 +5891,23 @@ msgstr "Alcance Dinâmico"
 msgid "Use Two Bounces"
 msgstr "Usar dois saltos"
 
+msgid "Body Tracker"
+msgstr "Detector de Corpo"
+
+msgid "Face Tracker"
+msgstr "Detector de Rosto"
+
+msgid "Hand Tracker"
+msgstr "Detector de Mãos"
+
+msgid "Tracker"
+msgstr "Detector"
+
 msgid "Pose"
 msgstr "Postura"
 
 msgid "Show When Tracked"
-msgstr "Mostrar quando rastreado"
+msgstr "Mostrar ao Detectar"
 
 msgid "World Scale"
 msgstr "Escala do Mundo"
@@ -4800,6 +5981,9 @@ msgstr "Nó Raiz"
 msgid "Root Motion"
 msgstr "Movimento Raiz"
 
+msgid "Track"
+msgstr "Faixa"
+
 msgid "Method"
 msgstr "Método"
 
@@ -5187,6 +6371,9 @@ msgstr "Esconder Raiz"
 msgid "Drop Mode Flags"
 msgstr "Sinalizadores de Modo Drop"
 
+msgid "Audio Track"
+msgstr "Faixa de Áudio"
+
 msgid "Paused"
 msgstr "Pausado"
 
@@ -5754,9 +6941,6 @@ msgstr "Anisotrópico"
 msgid "Adjustments"
 msgstr "Ajustes"
 
-msgid "Contrast"
-msgstr "Contraste"
-
 msgid "Saturation"
 msgstr "Separação"
 
@@ -6570,6 +7754,12 @@ msgstr "Sombreadores"
 msgid "Shader Language"
 msgstr "Linguagem Shader"
 
+msgid "Has Tracking Data"
+msgstr "Contém Dados de Rastreio"
+
+msgid "Hand Tracking Source"
+msgstr "Fonte de Detecção de Mãos"
+
 msgid "Is Primary"
 msgstr "É Principal"
 
@@ -6583,4 +7773,4 @@ msgid "Is Anchor Detection Enabled"
 msgstr "A detecção de âncora está habilitada"
 
 msgid "Tracking Confidence"
-msgstr "Rastreando a confiança"
+msgstr "Confiança de Detecção"
diff --git a/engine/editor/translations/properties/ru.po b/engine/editor/translations/properties/ru.po
index 0cdd6416..a820a2c8 100644
--- a/engine/editor/translations/properties/ru.po
+++ b/engine/editor/translations/properties/ru.po
@@ -177,13 +177,15 @@
 # Mikhail <mikhail.khadzhaev832@gmail.com>, 2024.
 # Olesya_Gerasimenko <gammaray@basealt.ru>, 2024.
 # Mister Ky <afanasievsergiy3524@gmail.com>, 2025.
+# Igor Shapilov <shatiger@yandex.ru>, 2025.
+# Aleksandr <sasha7onoff@gmail.com>, 2025.
 msgid ""
 msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-08 02:28+0000\n"
-"Last-Translator: Mister Ky <afanasievsergiy3524@gmail.com>\n"
+"PO-Revision-Date: 2025-03-10 04:25+0000\n"
+"Last-Translator: Aleksandr <sasha7onoff@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/ru/>\n"
 "Language: ru\n"
@@ -192,7 +194,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 msgid "Application"
 msgstr "Приложение"
@@ -368,6 +370,9 @@ msgstr "Скорость кадров"
 msgid "Android"
 msgstr "Android"
 
+msgid "Enable Frame Pacing"
+msgstr "Включить синхронизацию кадров"
+
 msgid "Physics"
 msgstr "Физика"
 
@@ -1001,6 +1006,9 @@ msgstr "Удаляемый"
 msgid "Selectable"
 msgstr "Доступно для выбора"
 
+msgid "Name Split Ratio"
+msgstr "Коэффициент разделения имени"
+
 msgid "Distraction Free Mode"
 msgstr "Режим без отвлечения"
 
@@ -1073,6 +1081,9 @@ msgstr "Субпиксельное позиционирование шрифта
 msgid "Font Disable Embedded Bitmaps"
 msgstr "Отключение встроенных растровых представлений шрифта"
 
+msgid "Font Allow MSDF"
+msgstr "Разрешить шрифт MSDF"
+
 msgid "Main Font"
 msgstr "Основной шрифт"
 
@@ -1114,6 +1125,9 @@ msgstr ""
 "Задержка в режиме низкой нагрузки процессора без фокуса на окне редактора "
 "(мкс)"
 
+msgid "V-Sync Mode"
+msgstr "Режим V-Sync"
+
 msgid "Update Continuously"
 msgstr "Непрерывное обновление"
 
@@ -1132,6 +1146,9 @@ msgstr "Панели"
 msgid "Scene Tree"
 msgstr "Дерево сцены"
 
+msgid "Ask Before Revoking Unique Name"
+msgstr "Спрашивать перед отменой уникального имени"
+
 msgid "Inspector"
 msgstr "Инспектор"
 
@@ -1171,6 +1188,9 @@ msgstr "Тема"
 msgid "Icon and Font Color"
 msgstr "Цвет значков и шрифтов"
 
+msgid "Contrast"
+msgstr "Контраст"
+
 msgid "Draw Extra Borders"
 msgstr "Рисовать дополнительные границы"
 
@@ -1271,6 +1291,12 @@ msgstr "Размер миниатюр"
 msgid "Max Results"
 msgstr "Макс. кол-во результатов"
 
+msgid "Show Search Highlight"
+msgstr "Показать выделение поиска"
+
+msgid "Enable Fuzzy Matching"
+msgstr "Включить приближенное соответствие строк"
+
 msgid "Include Addons"
 msgstr "Включать дополнения"
 
@@ -1346,6 +1372,9 @@ msgstr "Текстовый редактор"
 msgid "Line Spacing"
 msgstr "Межстрочный интервал"
 
+msgid "Color Theme"
+msgstr "Цветовая тема"
+
 msgid "Appearance"
 msgstr "Внешний вид"
 
@@ -1421,6 +1450,9 @@ msgstr "Рисовать пробелы"
 msgid "Behavior"
 msgstr "Поведение"
 
+msgid "Empty Selection Clipboard"
+msgstr "Очистить буфер обмена выбора"
+
 msgid "Navigation"
 msgstr "Навигация"
 
@@ -1490,6 +1522,12 @@ msgstr "Автоматически перезагружать и анализи
 msgid "Open Dominant Script on Scene Change"
 msgstr "Открывать основной скрипт при смене сцены"
 
+msgid "Documentation"
+msgstr "Документация"
+
+msgid "Enable Tooltips"
+msgstr "Включить подсказки"
+
 msgid "Script List"
 msgstr "Список скриптов"
 
@@ -1661,6 +1699,12 @@ msgstr "CSG"
 msgid "GridMap Grid"
 msgstr "Сетка GridMap"
 
+msgid "Spring Bone Collision"
+msgstr "Коллизия пружинной кости"
+
+msgid "Spring Bone Inside Collision"
+msgstr "Пружинная кость внутри коллизии"
+
 msgid "Gizmo Settings"
 msgstr "Параметры гизмо"
 
@@ -1859,9 +1903,6 @@ msgstr "Восстанавливать шейдеры при загрузке"
 msgid "Visual Editors"
 msgstr "Визуальные редакторы"
 
-msgid "Color Theme"
-msgstr "Цветовая тема"
-
 msgid "Minimap Opacity"
 msgstr "Непрозрачность миникарты"
 
@@ -1889,9 +1930,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Размещение окон"
 
+msgid "Rect"
+msgstr "Прямоугольник"
+
 msgid "Rect Custom Position"
 msgstr "Пользовательская позиция прямоугольника"
 
+msgid "Screen"
+msgstr "Экран"
+
 msgid "Auto Save"
 msgstr "Автосохранение"
 
@@ -1901,6 +1948,9 @@ msgstr "Сохранять перед запуском"
 msgid "Output"
 msgstr "Вывод"
 
+msgid "Font Size"
+msgstr "Размер шрифта"
+
 msgid "Always Clear Output on Play"
 msgstr "Всегда очищать панель вывода при запуске"
 
@@ -1937,6 +1987,9 @@ msgstr "Размер истории кадров профайлера"
 msgid "Profiler Frame Max Functions"
 msgstr "Максимум функций для кадра в профайлере"
 
+msgid "Profiler Target FPS"
+msgstr "Целевая частота кадров профайлера"
+
 msgid "Remote Scene Tree Refresh Interval"
 msgstr "Интервал обновления удалённого дерева сцены"
 
@@ -2228,6 +2281,9 @@ msgstr "Сбросить все позы костей после импорта"
 msgid "Keep Global Rest on Leftovers"
 msgstr "Сохранить глобальный покой на остатках"
 
+msgid "Original Skeleton Name"
+msgstr "Оригинальное имя скелета"
+
 msgid "Fix Silhouette"
 msgstr "Исправить силуэт"
 
@@ -2465,6 +2521,9 @@ msgstr "Масштаб корня"
 msgid "Import as Skeleton Bones"
 msgstr "Импортировать как кости скелета"
 
+msgid "Use Node Type Suffixes"
+msgstr "Использовать суффиксы типа узла"
+
 msgid "Meshes"
 msgstr "Сетки"
 
@@ -2534,6 +2593,9 @@ msgstr "Хинтинг"
 msgid "Subpixel Positioning"
 msgstr "Субпиксельное позиционирование"
 
+msgid "Keep Rounding Remainders"
+msgstr "Продолжить округлять остатки"
+
 msgid "Oversampling"
 msgstr "Передискретизация"
 
@@ -2736,6 +2798,9 @@ msgstr "Индекс текущей группы"
 msgid "Current Bone Idx"
 msgstr "Индекс текущей кости"
 
+msgid "Particles Emission Shape"
+msgstr "Форма излучения частиц"
+
 msgid "ID"
 msgstr "Идентификатор"
 
@@ -2930,9 +2995,6 @@ msgstr "Портативный"
 msgid "Orientation"
 msgstr "Ориентация"
 
-msgid "V-Sync Mode"
-msgstr "Режим V-Sync"
-
 msgid "Output Latency"
 msgstr "Выходная задержка"
 
@@ -2996,6 +3058,12 @@ msgstr "Типы отладочных сообщений"
 msgid "Hand Tracking"
 msgstr "Отслеживание положения и ориентации рук"
 
+msgid "Hand Tracking Unobstructed Data Source"
+msgstr "Беспрепятственный источник данных отслеживания рук"
+
+msgid "Hand Tracking Controller Data Source"
+msgstr "Источник данных контроллера отслеживания рук"
+
 msgid "Hand Interaction Profile"
 msgstr "Профиль взаимодействия рук"
 
@@ -3185,6 +3253,12 @@ msgstr "Края свободны"
 msgid "Obstacles"
 msgstr "Препятствия"
 
+msgid "Pipeline"
+msgstr "Конвейер"
+
+msgid "Compilations Canvas"
+msgstr "Холст компиляций"
+
 msgid "Compilations Draw"
 msgstr "Розыгрыш компиляций"
 
@@ -3341,6 +3415,9 @@ msgstr "Макс. размер стека вызовов"
 msgid "Exclude Addons"
 msgstr "Исключить дополнения"
 
+msgid "Renamed in Godot 4 Hint"
+msgstr "Переименовано в Godot 4 Hint"
+
 msgid "Language Server"
 msgstr "Языковой сервер"
 
@@ -3605,9 +3682,18 @@ msgstr "Дочерние элементы"
 msgid "Light"
 msgstr "Свет"
 
+msgid "glTF to Godot Expression"
+msgstr "glTF к выражению Godot"
+
+msgid "Godot to glTF Expression"
+msgstr "Godot к выражению glTF"
+
 msgid "Node Paths"
 msgstr "Пути к узлам"
 
+msgid "Object Model Type"
+msgstr "Тип модели объекта"
+
 msgid "Json Pointers"
 msgstr "Json Указатели"
 
@@ -3701,6 +3787,33 @@ msgstr "Jolt Physics 3D"
 msgid "Simulation"
 msgstr "Симуляция"
 
+msgid "Use Enhanced Internal Edge Removal"
+msgstr "Использовать расширенное удаление внутренних сторон"
+
+msgid "Generate All Kinematic Contacts"
+msgstr "Генерировать все кинематические контакты"
+
+msgid "Baumgarte Stabilization Factor"
+msgstr "Коэффициент стабилизации Баумгарта"
+
+msgid "Bounce Velocity Threshold"
+msgstr "Порог скорости отскока"
+
+msgid "Continuous CD Movement Threshold"
+msgstr "Порог продолжительного движения CD"
+
+msgid "Body Pair Contact Cache Enabled"
+msgstr "Кэш контакта пары тел включен"
+
+msgid "Body Pair Contact Cache Distance Threshold"
+msgstr "Порог расстояния кэша контакта пары тел"
+
+msgid "Body Pair Contact Cache Angle Threshold"
+msgstr "Порог угла кэша контакта пары тел"
+
+msgid "Queries"
+msgstr "Запросы"
+
 msgid "Lightmapping"
 msgstr "Карты освещения"
 
@@ -4182,9 +4295,6 @@ msgstr "Возможности XR"
 msgid "XR Mode"
 msgstr "Режим XR"
 
-msgid "Screen"
-msgstr "Экран"
-
 msgid "Immersive Mode"
 msgstr "Режим погружения"
 
@@ -4773,9 +4883,6 @@ msgstr "Тип воспроизведения"
 msgid "Copy Mode"
 msgstr "Режим копирования"
 
-msgid "Rect"
-msgstr "Прямоугольник"
-
 msgid "Anchor Mode"
 msgstr "Режим якорей"
 
@@ -5929,9 +6036,6 @@ msgstr "Цвет контура текста"
 msgid "Font"
 msgstr "Шрифт"
 
-msgid "Font Size"
-msgstr "Размер шрифта"
-
 msgid "Horizontal Alignment"
 msgstr "Горизонтальное выравнивание"
 
@@ -8751,9 +8855,6 @@ msgstr "Настройки"
 msgid "Brightness"
 msgstr "Яркость"
 
-msgid "Contrast"
-msgstr "Контраст"
-
 msgid "Saturation"
 msgstr "Насыщенность"
 
@@ -9587,6 +9688,15 @@ msgstr "Смещение захвата"
 msgid "Updown"
 msgstr "Пользовательская текстура для стрелок «вверх» и «вниз»"
 
+msgid "Buttons Vertical Separation"
+msgstr "Вертикальное разделение кнопок"
+
+msgid "Field and Buttons Separation"
+msgstr "Разделение поля и кнопок"
+
+msgid "Buttons Width"
+msgstr "Ширина кнопок"
+
 msgid "Embedded Border"
 msgstr "Встроенная граница"
 
@@ -9629,6 +9739,12 @@ msgstr "Верт. смещение кнопки закрытия"
 msgid "Buttons Separation"
 msgstr "Разделение кнопок"
 
+msgid "Load"
+msgstr "Загрузить"
+
+msgid "Save"
+msgstr "Сохранить"
+
 msgid "Parent Folder"
 msgstr "Родительская папка"
 
@@ -9644,6 +9760,9 @@ msgstr "Перезагрузить"
 msgid "Toggle Hidden"
 msgstr "Переключение скрытых"
 
+msgid "Toggle Filename Filter"
+msgstr "Переключить фильтр имени файла"
+
 msgid "Folder"
 msgstr "Папка"
 
@@ -9725,6 +9844,9 @@ msgstr "Гор. смещение порта"
 msgid "Hovered"
 msgstr "Наведение"
 
+msgid "Hovered Dimmed"
+msgstr "Наведение затемненное"
+
 msgid "Selected Focus"
 msgstr "Выбранные элементы, когда список элементов в фокусе"
 
@@ -10703,6 +10825,9 @@ msgstr "Атлас 16 бит"
 msgid "Shadow Atlas"
 msgstr "Атлас теней"
 
+msgid "Batching"
+msgstr "Пакетирование"
+
 msgid "Item Buffer Size"
 msgstr "Размер буфера элементов"
 
@@ -10850,6 +10975,9 @@ msgstr "Сетки примитивов"
 msgid "Texel Size"
 msgstr "Размер текселя"
 
+msgid "Use Bicubic Filter"
+msgstr "Использовать бикубический фильтр"
+
 msgid "Probe Ray Count"
 msgstr "Количество лучей зонда"
 
diff --git a/engine/editor/translations/properties/ta.po b/engine/editor/translations/properties/ta.po
index d9a62493..3d365c6e 100644
--- a/engine/editor/translations/properties/ta.po
+++ b/engine/editor/translations/properties/ta.po
@@ -910,6 +910,9 @@ msgstr "குறைந்த செயலி பயன்முறை தூக
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "கவனம் செலுத்தப்படாத குறைந்த செயலி பயன்முறை தூக்கம் (µSEC)"
 
+msgid "V-Sync Mode"
+msgstr "வி-ஒத்திசைவு பயன்முறை"
+
 msgid "Update Continuously"
 msgstr "தொடர்ந்து புதுப்பிக்கவும்"
 
@@ -967,6 +970,9 @@ msgstr "கருப்பொருள்"
 msgid "Icon and Font Color"
 msgstr "படவுரு மற்றும் எழுத்துரு நிறம்"
 
+msgid "Contrast"
+msgstr "மாறுபாடு"
+
 msgid "Draw Extra Borders"
 msgstr "கூடுதல் எல்லைகளை வரையவும்"
 
@@ -1129,6 +1135,9 @@ msgstr "உரை ஆசிரியர்"
 msgid "Line Spacing"
 msgstr "வரி இடைவெளி"
 
+msgid "Color Theme"
+msgstr "வண்ண கருப்பொருள்"
+
 msgid "Appearance"
 msgstr "தோற்றம்"
 
@@ -1633,9 +1642,6 @@ msgstr "சுமைகளில் சேடர்களை மீட்டம
 msgid "Visual Editors"
 msgstr "காட்சி ஆசிரியர்கள்"
 
-msgid "Color Theme"
-msgstr "வண்ண கருப்பொருள்"
-
 msgid "Minimap Opacity"
 msgstr "மினிமேப் ஒளிபுகாநிலை"
 
@@ -1663,9 +1669,15 @@ msgstr "எச்.சி.பி."
 msgid "Window Placement"
 msgstr "சாளர வேலை வாய்ப்பு"
 
+msgid "Rect"
+msgstr "செவ்வகம்"
+
 msgid "Rect Custom Position"
 msgstr "செவ்வக தனிப்பயன் நிலை"
 
+msgid "Screen"
+msgstr "திரை"
+
 msgid "Auto Save"
 msgstr "தானியங்கு சேமிப்பு"
 
@@ -1675,6 +1687,9 @@ msgstr "ஓடுவதற்கு முன் சேமிக்கவும
 msgid "Output"
 msgstr "வெளியீடு"
 
+msgid "Font Size"
+msgstr "எழுத்துரு அளவு"
+
 msgid "Always Clear Output on Play"
 msgstr "விளையாட்டில் எப்போதும் வெளியீட்டை அழிக்கவும்"
 
@@ -2681,9 +2696,6 @@ msgstr "கையடக்க"
 msgid "Orientation"
 msgstr "நோக்குநிலை"
 
-msgid "V-Sync Mode"
-msgstr "வி-ஒத்திசைவு பயன்முறை"
-
 msgid "Output Latency"
 msgstr "வெளியீட்டு நேரந்தவறுகை"
 
@@ -3896,9 +3908,6 @@ msgstr "எக்ச்ஆர் நற்பொருத்தங்கள்"
 msgid "XR Mode"
 msgstr "எக்ச்ஆர் பயன்முறை"
 
-msgid "Screen"
-msgstr "திரை"
-
 msgid "Immersive Mode"
 msgstr "அதிவேக முறை"
 
@@ -4487,9 +4496,6 @@ msgstr "பின்னணி வகை"
 msgid "Copy Mode"
 msgstr "நகல் பயன்முறை"
 
-msgid "Rect"
-msgstr "செவ்வகம்"
-
 msgid "Anchor Mode"
 msgstr "நங்கூரம் பயன்முறை"
 
@@ -5641,9 +5647,6 @@ msgstr "அவுட்லைன் மாடுலேட்"
 msgid "Font"
 msgstr "எழுத்துரு"
 
-msgid "Font Size"
-msgstr "எழுத்துரு அளவு"
-
 msgid "Horizontal Alignment"
 msgstr "கிடைமட்ட சீரமைப்பு"
 
@@ -8459,9 +8462,6 @@ msgstr "சரிசெய்தல்"
 msgid "Brightness"
 msgstr "ஒளி"
 
-msgid "Contrast"
-msgstr "மாறுபாடு"
-
 msgid "Saturation"
 msgstr "தெவிட்டல்"
 
diff --git a/engine/editor/translations/properties/tr.po b/engine/editor/translations/properties/tr.po
index 1e9b9507..96e5df07 100644
--- a/engine/editor/translations/properties/tr.po
+++ b/engine/editor/translations/properties/tr.po
@@ -101,8 +101,8 @@ msgstr ""
 "Project-Id-Version: Godot Engine properties\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-03-01 20:22+0000\n"
-"Last-Translator: ulk <ulk.info@gmail.com>\n"
+"PO-Revision-Date: 2025-03-14 11:17+0000\n"
+"Last-Translator: Yılmaz Durmaz <yilmaz_durmaz@hotmail.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/tr/>\n"
 "Language: tr\n"
@@ -110,7 +110,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.10.3-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Application"
 msgstr "Uygulama"
@@ -970,6 +970,9 @@ msgstr "İş Parçacıklarını Kullan"
 msgid "Localize Settings"
 msgstr "Ayarları Yerelleştir"
 
+msgid "Dock Tab Style"
+msgstr "Yuva Sekmesi Tarzı"
+
 msgid "UI Layout Direction"
 msgstr "UI Yerleşim Düzeni Yönü"
 
@@ -985,6 +988,12 @@ msgstr "Düzenleyici Ekranı"
 msgid "Project Manager Screen"
 msgstr "Proje Yöneticisi Ekranı"
 
+msgid "Connection"
+msgstr "Bağlantı"
+
+msgid "Engine Version Update Mode"
+msgstr "Motor Sürümü Güncelleme Modu"
+
 msgid "Use Embedded Menu"
 msgstr "Gömülü Menüyü Kullan"
 
@@ -994,6 +1003,12 @@ msgstr "Özgün Dosya Diyaloglarını Kullan"
 msgid "Expand to Title"
 msgstr "Başlığa Genişlet"
 
+msgid "Main Font Size"
+msgstr "Ana Yazı Tipi Boyutu"
+
+msgid "Code Font Size"
+msgstr "Kod Yazı Tipi Boyutu"
+
 msgid "Code Font Contextual Ligatures"
 msgstr "Kod Yazı Tipi İçeriksel Bağlar"
 
@@ -1003,6 +1018,12 @@ msgstr "Kod Yazı Tipi Özel OpenType Özellikleri"
 msgid "Code Font Custom Variations"
 msgstr "Kod Yazı Tipi Özel Değişimler"
 
+msgid "Font Antialiasing"
+msgstr "Yazı Tipi Kenar Yumuşatması"
+
+msgid "Font Hinting"
+msgstr "Yazı Tipi İpucu"
+
 msgid "Font Subpixel Positioning"
 msgstr "Yazı Tipi Alt-piksel Konumlandırması"
 
@@ -1036,6 +1057,9 @@ msgstr "Ek Fare Butonları Geçmişte Gezinmek İçin"
 msgid "Save Each Scene on Quit"
 msgstr "Çıkışta Her Sahneyi Kaydet"
 
+msgid "Save on Focus Loss"
+msgstr "Odak Kaybında Kaydet"
+
 msgid "Accept Dialog Cancel OK Buttons"
 msgstr "Onay Penceresinde Vazgeç ve Tamam Düğmeleri"
 
@@ -1051,6 +1075,12 @@ msgstr "Düşük İşlemci Kipi Uyku (µsec)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Odaklanılmamış Düşük İşlemci Kipi Uyku (µsec)"
 
+msgid "Import Resources When Unfocused"
+msgstr "Kaynakları Odakta olmadığında İçe Aktar"
+
+msgid "V-Sync Mode"
+msgstr "Dikey-Eşleme Kipi"
+
 msgid "Update Continuously"
 msgstr "Sürekli Güncelle"
 
@@ -1075,9 +1105,15 @@ msgstr "Benzersiz Adı İptal Etmeden Önce Sor"
 msgid "Inspector"
 msgstr "Denetleyici"
 
+msgid "Max Array Dictionary Items per Page"
+msgstr "Sayfa Başına En Fazla Dizi Sözlüğü Öğesi"
+
 msgid "Show Low Level OpenType Features"
 msgstr "Düşük Seviye OpenType Özelliklerini Göster"
 
+msgid "Nested Color Mode"
+msgstr "İç İçe Renk Modu"
+
 msgid "Delimitate All Container and Resources"
 msgstr "Tüm Taşıyıcı ve Kaynakların Sınırlarını Belirle"
 
@@ -1105,12 +1141,39 @@ msgstr "Kaynakları Mevcut Denetleyicide Aç"
 msgid "Resources to Open in New Inspector"
 msgstr "Kaynakları Yeni Denetleyicide Aç"
 
+msgid "Default Color Picker Mode"
+msgstr "Varsayılan Renk Seçici Modu"
+
+msgid "Default Color Picker Shape"
+msgstr "Varsayılan Renk Seçici Şekli"
+
 msgid "Theme"
 msgstr "Tema"
 
+msgid "Follow System Theme"
+msgstr "Sistem Temasını Takip Et"
+
+msgid "Preset"
+msgstr "Hazırayar"
+
+msgid "Spacing Preset"
+msgstr "Yazım Aralığı Hazır Ayarı"
+
 msgid "Icon and Font Color"
 msgstr "Simge ve Yazı Tipi Rengi"
 
+msgid "Base Color"
+msgstr "Temel Renk"
+
+msgid "Accent Color"
+msgstr "Vurgu Rengi"
+
+msgid "Use System Accent Color"
+msgstr "Sistem Vurgu Rengini Kullan"
+
+msgid "Contrast"
+msgstr "Karşıtlık"
+
 msgid "Draw Extra Borders"
 msgstr "Fazladan Kenarlar Çiz"
 
@@ -1162,12 +1225,30 @@ msgstr "Betik Düğmesini Göster"
 msgid "Restore Scenes on Load"
 msgstr "Açılışta Sahneleri Geri Yükle"
 
+msgid "Multi Window"
+msgstr "Çoklu Pencere"
+
+msgid "Restore Windows on Load"
+msgstr "Açılışta Pencereleri Geri Yükle"
+
+msgid "Maximize Window"
+msgstr "Pencereyi Büyüt"
+
 msgid "FileSystem"
 msgstr "DosyaSistemi"
 
 msgid "External Programs"
 msgstr "Harici Uygulamalar"
 
+msgid "Vector Image Editor"
+msgstr "Vektör Görüntü Düzenleyici"
+
+msgid "Audio Editor"
+msgstr "Ses Düzenleyici"
+
+msgid "3D Model Editor"
+msgstr "3B Model Düzenleyici"
+
 msgid "Terminal Emulator Flags"
 msgstr "Terminal Emülatörü Bayrakları"
 
@@ -1177,6 +1258,9 @@ msgstr "Klasörler"
 msgid "Autoscan Project Path"
 msgstr "Proje Yolunu Otomatik Tara"
 
+msgid "Default Project Path"
+msgstr "Varsayılan Proje Yolu"
+
 msgid "On Save"
 msgstr "Kaydetme Sırasında"
 
@@ -1268,7 +1352,7 @@ msgid "Auto Expand to Selected"
 msgstr "Seçilene Otomatik Genişlet"
 
 msgid "Center Node on Reparent"
-msgstr "Üst-öğe değişiminde Düğümü Merkeze Ortala"
+msgstr "Üst-öge Değişiminde Düğümü Merkeze Ortala"
 
 msgid "Hide Filtered Out Parents"
 msgstr "Filtrelenmiş Üst Öğeleri Gizle"
@@ -1297,6 +1381,9 @@ msgstr "Metin Düzenleyici"
 msgid "Line Spacing"
 msgstr "Satır Aralığı"
 
+msgid "Color Theme"
+msgstr "Renk Teması"
+
 msgid "Appearance"
 msgstr "Dış görünüş"
 
@@ -1534,6 +1621,18 @@ msgstr "Yardım"
 msgid "Show Help Index"
 msgstr "Yardım İndeksini Göster"
 
+msgid "Help Font Size"
+msgstr "Yardım Yazı Tipi Boyutu"
+
+msgid "Help Source Font Size"
+msgstr "Yardım Kaynak Yazı Tipi Boyutu"
+
+msgid "Help Title Font Size"
+msgstr "Yardım Başlık Yazı Tipi Boyutu"
+
+msgid "Class Reference Examples"
+msgstr "Sınıf Başvuru Örnekleri"
+
 msgid "Sort Functions Alphabetically"
 msgstr "Fonksiyonları Alfabetik Olarak Sırala"
 
@@ -1546,6 +1645,15 @@ msgstr "Mesafe Seç"
 msgid "Palette Min Width"
 msgstr "Palet En Az Genişliği"
 
+msgid "Preview Size"
+msgstr "Önizleme Boyutu"
+
+msgid "Primary Grid Color"
+msgstr "Birincil Izgara Rengi"
+
+msgid "Secondary Grid Color"
+msgstr "İkincil Izgara Rengi"
+
 msgid "Selection Box Color"
 msgstr "Seçim Kutusu Rengi"
 
@@ -1645,6 +1753,12 @@ msgstr "Kemik Şekli"
 msgid "Path 3D Tilt Disk Size"
 msgstr "3B Yolu Eğme Diski Boyutu"
 
+msgid "Primary Grid Steps"
+msgstr "Birincil Izgara Adımları"
+
+msgid "Grid Size"
+msgstr "Izgara Boyutu"
+
 msgid "Grid Division Level Max"
 msgstr "En Fazla Izgara Bölme Seviyesi"
 
@@ -1663,12 +1777,33 @@ msgstr "Izgara XY Düzlemi"
 msgid "Grid YZ Plane"
 msgstr "Izgara YZ Düzlemi"
 
+msgid "Default FOV"
+msgstr "Varsayılan Görüş Alanı (FOV)"
+
+msgid "Default Z Near"
+msgstr "Varsayılan Z Yakın"
+
+msgid "Default Z Far"
+msgstr "Varsayılan Z Uzak"
+
 msgid "Invert X Axis"
 msgstr "X Eksenini Çevir"
 
 msgid "Invert Y Axis"
 msgstr "Y Eksenini Çevir"
 
+msgid "Navigation Scheme"
+msgstr "Gezinti Düzeni"
+
+msgid "Pan Mouse Button"
+msgstr "Kaydırma Fare Düğmesi"
+
+msgid "Zoom Mouse Button"
+msgstr "Yakınlaştırma Fare Düğmesi"
+
+msgid "Zoom Style"
+msgstr "Yakınlaştırma Tarzı"
+
 msgid "Emulate Numpad"
 msgstr "Sayı Tuşlarına Benzeşim Yap"
 
@@ -1705,12 +1840,21 @@ msgstr "Çerçevede Gezinti Aletini Göster"
 msgid "Freelook"
 msgstr "Serbest Bakış"
 
+msgid "Freelook Navigation Scheme"
+msgstr "Serbest Bakış Gezinti Düzeni"
+
 msgid "Freelook Sensitivity"
 msgstr "Serbest Bakış Hassasiyeti"
 
 msgid "Freelook Inertia"
 msgstr "Serbest Bakış Ataleti"
 
+msgid "Freelook Base Speed"
+msgstr "Serbest Bakış Temel Hız"
+
+msgid "Freelook Activation Modifier"
+msgstr "Serbest Bakış Etkinleştirme Değiştirici"
+
 msgid "Freelook Speed Zoom Link"
 msgstr "Serbest Bakış Hızlı Yakınlaştırma Bağı"
 
@@ -1756,6 +1900,9 @@ msgstr "Çerçeve Kenar Rengi"
 msgid "Use Integer Zoom by Default"
 msgstr "Varsayılan Olarak Tamsayı Yakınlaştırma Kullan"
 
+msgid "Zoom Speed Factor"
+msgstr "Yakınlaştırma Hız Çarpanı"
+
 msgid "Bone Mapper"
 msgstr "Kemik Haritalayıcı"
 
@@ -1777,6 +1924,15 @@ msgstr "Hata"
 msgid "Panning"
 msgstr "Kaydırma"
 
+msgid "2D Editor Panning Scheme"
+msgstr "2B Düzenleyici Kaydırma Düzeni"
+
+msgid "Sub Editors Panning Scheme"
+msgstr "Alt Düzenleyici Kaydırma Düzeni"
+
+msgid "Animation Editors Panning Scheme"
+msgstr "Canlandırma Düzenleyici Kaydırma Düzeni"
+
 msgid "Simple Panning"
 msgstr "Basit Kaydırma"
 
@@ -1831,9 +1987,6 @@ msgstr "Açılışta Gölgelendiricileri Geri Yükle"
 msgid "Visual Editors"
 msgstr "Görsel Düzenleyiciler"
 
-msgid "Color Theme"
-msgstr "Renk Teması"
-
 msgid "Minimap Opacity"
 msgstr "Mini Harita Şeffaflığı"
 
@@ -1861,18 +2014,36 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Pencere Yerleşimi"
 
+msgid "Rect"
+msgstr "Dikdörtgen"
+
 msgid "Rect Custom Position"
 msgstr "Dikdörtgen Özel Konumu"
 
+msgid "Screen"
+msgstr "Ekran"
+
+msgid "Android Window"
+msgstr "Android Penceresi"
+
+msgid "Game Embed Mode"
+msgstr "Oyun Gömme Modu"
+
 msgid "Auto Save"
 msgstr "Otomatik Kaydet"
 
 msgid "Save Before Running"
 msgstr "Çalıştırmadan Önce Kaydet"
 
+msgid "Bottom Panel"
+msgstr "Alt Panel"
+
 msgid "Output"
 msgstr "Çıktı"
 
+msgid "Font Size"
+msgstr "Yazı Tipi Boyutu"
+
 msgid "Always Clear Output on Play"
 msgstr "Oynatıldığında Çıktıyı Her Zaman Temizle"
 
@@ -1888,6 +2059,9 @@ msgstr "Linux/*BSD"
 msgid "Prefer Wayland"
 msgstr "Wayland Tercih Et"
 
+msgid "Network Mode"
+msgstr "Ağ Modu"
+
 msgid "HTTP Proxy"
 msgstr "HTTP Vekil"
 
@@ -1897,12 +2071,21 @@ msgstr "Ana Bilgisayar"
 msgid "Editor TLS Certificates"
 msgstr "Düzenleyici TLS Sertifikası"
 
+msgid "Enable TLS V 1"
+msgstr "TLS V 1'i etkinleştir"
+
 msgid "Remote Host"
 msgstr "Uzak Ana Bilgisayar"
 
 msgid "Debugger"
 msgstr "Hata Ayıklayıcı"
 
+msgid "Auto Switch to Remote Scene Tree"
+msgstr "Uzak Sahne Ağacına Otomatik Geçiş"
+
+msgid "Auto Switch to Stack Trace"
+msgstr "Yığın İzlemeye Otomatik Geçiş"
+
 msgid "Profiler Frame History Size"
 msgstr "Profil Oluşturucu Kare Geçmişi Boyutu"
 
@@ -1918,6 +2101,9 @@ msgstr "Uzak Sahne Ağacı Yenileme Sıklığı"
 msgid "Remote Inspect Refresh Interval"
 msgstr "Uzak Denetleme Yenileme Aralığı"
 
+msgid "Profile Native Calls"
+msgstr "Profil Yerel Çağrılar"
+
 msgid "Version Control"
 msgstr "Sürüm Kontrol"
 
@@ -1945,6 +2131,12 @@ msgstr "Proje Yöneticisi"
 msgid "Sorting Order"
 msgstr "Sıralama Düzeni"
 
+msgid "Directory Naming Convention"
+msgstr "Dizin Adlandırma Kuralı"
+
+msgid "Default Renderer"
+msgstr "Varsayılan İşleyici"
+
 msgid "Highlighting"
 msgstr "Vurgulama"
 
@@ -2924,9 +3116,6 @@ msgstr "Elde-taşınır"
 msgid "Orientation"
 msgstr "Yönelim"
 
-msgid "V-Sync Mode"
-msgstr "Dikey-Eşleme Kipi"
-
 msgid "Output Latency"
 msgstr "Çıkış Gecikmesi"
 
@@ -3621,7 +3810,7 @@ msgid "Skin"
 msgstr "Deri, Cilt, Kaplama"
 
 msgid "Children"
-msgstr "Alt-öğeler"
+msgstr "Alt-ögeler"
 
 msgid "Light"
 msgstr "Işık"
@@ -3884,9 +4073,6 @@ msgstr "Gürültü Giderme"
 msgid "Denoiser"
 msgstr "Gürültü Giderici"
 
-msgid "Enable TLS V 1"
-msgstr "TLS V 1'i etkinleştir"
-
 msgid "BPM"
 msgstr "Dakika Başına Vuruş (BPM)"
 
@@ -4247,6 +4433,21 @@ msgstr "Etkinleştirilmiş Özellikler"
 msgid "Visibility State"
 msgstr "Görünebilirlik Durumu"
 
+msgid "Debug Keystore"
+msgstr "Hata Ayıklama Anahtar Deposu"
+
+msgid "Debug Keystore User"
+msgstr "Hata Ayıklama Anahtar Deposu Kullanıcısı"
+
+msgid "Install Exported APK"
+msgstr "Dışa Aktarılan APK'yı Kur"
+
+msgid "Java SDK Path"
+msgstr "Java SDK Yolu"
+
+msgid "Android SDK Path"
+msgstr "Android SDK Yolu"
+
 msgid "Force System User"
 msgstr "Sistem Kullanıcısına Zorla"
 
@@ -4370,9 +4571,6 @@ msgstr "Parmak Hareketleri"
 msgid "Swipe to Dismiss"
 msgstr "Kapatmak için Kaydır"
 
-msgid "Screen"
-msgstr "Ekran"
-
 msgid "Immersive Mode"
 msgstr "Yoğun Etkili Kip"
 
@@ -4631,6 +4829,12 @@ msgstr "Çalıştırma Betiği"
 msgid "Cleanup Script"
 msgstr "Temizleme Betiği"
 
+msgid "macOS"
+msgstr "macOS"
+
+msgid "rcodesign"
+msgstr "rcodesign"
+
 msgid "Distribution Type"
 msgstr "Dağıtım Türü"
 
@@ -4907,6 +5111,21 @@ msgstr "Simge 180 X 180"
 msgid "Icon 512 X 512"
 msgstr "Simge 512 X 512"
 
+msgid "Windows"
+msgstr "Windows"
+
+msgid "rcedit"
+msgstr "rcedit"
+
+msgid "signtool"
+msgstr "signtool"
+
+msgid "osslsigncode"
+msgstr "osslsigncode"
+
+msgid "wine"
+msgstr "wine"
+
 msgid "Identity Type"
 msgstr "Kimlik Türü"
 
@@ -5009,9 +5228,6 @@ msgstr "Oynatma Türü"
 msgid "Copy Mode"
 msgstr "Kopyalama Kipi"
 
-msgid "Rect"
-msgstr "Dikdörtgen"
-
 msgid "Anchor Mode"
 msgstr "Çapa Kipi"
 
@@ -6175,9 +6391,6 @@ msgstr "Anahat Ton Değişimi"
 msgid "Font"
 msgstr "Yazı Tipi"
 
-msgid "Font Size"
-msgstr "Yazı Tipi Boyutu"
-
 msgid "Horizontal Alignment"
 msgstr "Yatay Hizalama"
 
@@ -6845,7 +7058,7 @@ msgid "Spatial Attachment Path"
 msgstr "Uzaysal Eklenti Yolu"
 
 msgid "Parent Collision Ignore"
-msgstr "Üst-öğe Çarpışmayı Yoksay"
+msgstr "Üst-öge Çarpışmayı Yoksay"
 
 msgid "Simulation Precision"
 msgstr "Benzetim Hassasiyeti"
@@ -6997,6 +7210,9 @@ msgstr "Gecikme"
 msgid "Random Delay"
 msgstr "Rastgele Gecikme"
 
+msgid "Explicit Elapse"
+msgstr "Serbest Zaman Atlama"
+
 msgid "Xfade Time"
 msgstr "X-Solma Süresi"
 
@@ -8055,10 +8271,10 @@ msgid "Self Modulate"
 msgstr "Kendine Ton Değiştirme"
 
 msgid "Show Behind Parent"
-msgstr "Üst-öğenin Arkasında Göster"
+msgstr "Üst-ögenin Arkasında Göster"
 
 msgid "Clip Children"
-msgstr "Alt-öğeleri Kes"
+msgstr "Alt-ögeleri Kes"
 
 msgid "Light Mask"
 msgstr "Işık Maskesi"
@@ -8079,7 +8295,7 @@ msgid "Y Sort Enabled"
 msgstr "Y Sıralama Etkin"
 
 msgid "Use Parent Material"
-msgstr "Üst-öğe Malzemesini Kullan"
+msgstr "Üst-öge Malzemesini Kullan"
 
 msgid "Diffuse"
 msgstr "Karışma"
@@ -9173,9 +9389,6 @@ msgstr "Ayarlamalar"
 msgid "Brightness"
 msgstr "Aydınlık"
 
-msgid "Contrast"
-msgstr "Karşıtlık"
-
 msgid "Saturation"
 msgstr "Doygunluk"
 
diff --git a/engine/editor/translations/properties/uk.po b/engine/editor/translations/properties/uk.po
index 3bcac40a..c20cf286 100644
--- a/engine/editor/translations/properties/uk.po
+++ b/engine/editor/translations/properties/uk.po
@@ -42,7 +42,7 @@ msgstr ""
 "Project-Id-Version: Ukrainian (Godot Engine)\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2025-02-21 19:26+0000\n"
+"PO-Revision-Date: 2025-03-14 17:05+0000\n"
 "Last-Translator: Максим Горпиніч <maksimgorpinic2005a@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/"
 "godot-properties/uk/>\n"
@@ -52,7 +52,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Application"
 msgstr "Застосування"
@@ -912,6 +912,9 @@ msgstr "Використовувати потоки обробки"
 msgid "Localize Settings"
 msgstr "Параметри локалізації"
 
+msgid "Dock Tab Style"
+msgstr "Стиль вкладки Dock"
+
 msgid "UI Layout Direction"
 msgstr "Напрямок макета інтерфейсу користувача"
 
@@ -927,6 +930,12 @@ msgstr "Екран редактора"
 msgid "Project Manager Screen"
 msgstr "Екран менеджера проекту"
 
+msgid "Connection"
+msgstr "Підключення"
+
+msgid "Engine Version Update Mode"
+msgstr "Режим оновлення версії двигуна"
+
 msgid "Use Embedded Menu"
 msgstr "Використання вбудованого меню"
 
@@ -936,6 +945,12 @@ msgstr "Використовуйте рідні діалоги файлів"
 msgid "Expand to Title"
 msgstr "Розгорнути до заголовка"
 
+msgid "Main Font Size"
+msgstr "Основний розмір шрифту"
+
+msgid "Code Font Size"
+msgstr "Розмір шрифту коду"
+
 msgid "Code Font Contextual Ligatures"
 msgstr "Контекстні лігатури кодового шрифту"
 
@@ -945,6 +960,12 @@ msgstr "Користувацькі функції OpenType шрифту коду
 msgid "Code Font Custom Variations"
 msgstr "Користувацькі варіанти шрифту коду"
 
+msgid "Font Antialiasing"
+msgstr "Згладжування шрифту"
+
+msgid "Font Hinting"
+msgstr "Підказка шрифту"
+
 msgid "Font Subpixel Positioning"
 msgstr "Позиціонування субпікселів шрифту"
 
@@ -978,6 +999,9 @@ msgstr "Додаткові кнопки миші для навігації жу
 msgid "Save Each Scene on Quit"
 msgstr "Зберігати усі сцени при виході"
 
+msgid "Save on Focus Loss"
+msgstr "Заощаджуйте на втраті фокусу"
+
 msgid "Accept Dialog Cancel OK Buttons"
 msgstr "Погоджувати діалогові кнопки Скасувати ОК"
 
@@ -993,6 +1017,12 @@ msgstr "Низький режим сну процесора (мкс)"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "Несфокусований низький рівень сну в режимі процесора (мкс)"
 
+msgid "Import Resources When Unfocused"
+msgstr "Імпортуйте ресурси, коли вони не сфокусовані"
+
+msgid "V-Sync Mode"
+msgstr "Режим верт. синхронізації"
+
 msgid "Update Continuously"
 msgstr "Оновлювати неперервно"
 
@@ -1017,9 +1047,18 @@ msgstr "Запитувати перед відкликанням унікаль
 msgid "Inspector"
 msgstr "Інспектор"
 
+msgid "Max Array Dictionary Items per Page"
+msgstr "Макс. масив словникових елементів на сторінку"
+
 msgid "Show Low Level OpenType Features"
 msgstr "Показати низькорівневі функції OpenType"
 
+msgid "Float Drag Speed"
+msgstr "Швидкість перетягування"
+
+msgid "Nested Color Mode"
+msgstr "Режим вкладених кольорів"
+
 msgid "Delimitate All Container and Resources"
 msgstr "Розмежуйте всі контейнери та ресурси"
 
@@ -1047,12 +1086,39 @@ msgstr "Відкрити ресурси у поточному Інспектор
 msgid "Resources to Open in New Inspector"
 msgstr "Ресурси, які слід відкрити у новому Інспекторі"
 
+msgid "Default Color Picker Mode"
+msgstr "Режим вибору кольорів за замовчуванням"
+
+msgid "Default Color Picker Shape"
+msgstr "Типова форма палітри кольорів"
+
 msgid "Theme"
 msgstr "Тема"
 
+msgid "Follow System Theme"
+msgstr "Слідкуйте за системною темою"
+
+msgid "Preset"
+msgstr "Попереднє налаштування"
+
+msgid "Spacing Preset"
+msgstr "Попередній інтервал"
+
 msgid "Icon and Font Color"
 msgstr "Колір піктограм і шрифту"
 
+msgid "Base Color"
+msgstr "Базовий колір"
+
+msgid "Accent Color"
+msgstr "Колір акценту"
+
+msgid "Use System Accent Color"
+msgstr "Використовуйте колір системного акценту"
+
+msgid "Contrast"
+msgstr "Контрастність"
+
 msgid "Draw Extra Borders"
 msgstr "Малювати додаткові рамки"
 
@@ -1104,12 +1170,36 @@ msgstr "Показувати кнопку скрипту"
 msgid "Restore Scenes on Load"
 msgstr "Відновлення сцен під час завантаження"
 
+msgid "Multi Window"
+msgstr "Багато вікон"
+
+msgid "Restore Windows on Load"
+msgstr "Відновити Windows під час завантаження"
+
+msgid "Maximize Window"
+msgstr "Розгорнути вікно"
+
 msgid "FileSystem"
 msgstr "Файлова система"
 
 msgid "External Programs"
 msgstr "Зовнішні програми"
 
+msgid "Raster Image Editor"
+msgstr "Редактор растрових зображень"
+
+msgid "Vector Image Editor"
+msgstr "Редактор векторних зображень"
+
+msgid "Audio Editor"
+msgstr "Аудіоредактор"
+
+msgid "3D Model Editor"
+msgstr "Редактор 3D моделей"
+
+msgid "Terminal Emulator"
+msgstr "Емулятор терміналу"
+
 msgid "Terminal Emulator Flags"
 msgstr "Прапори емулятора терміналу"
 
@@ -1119,6 +1209,9 @@ msgstr "Каталоги"
 msgid "Autoscan Project Path"
 msgstr "Автоматичне сканування шляху проєкту"
 
+msgid "Default Project Path"
+msgstr "Шлях проекту за замовчуванням"
+
 msgid "On Save"
 msgstr "При зберіганні"
 
@@ -1239,6 +1332,9 @@ msgstr "Текстовий редактор"
 msgid "Line Spacing"
 msgstr "Інтервал між рядками"
 
+msgid "Color Theme"
+msgstr "Тема кольорів"
+
 msgid "Appearance"
 msgstr "Вигляд"
 
@@ -1299,6 +1395,9 @@ msgstr "Рядки"
 msgid "Code Folding"
 msgstr "Згортання коду"
 
+msgid "Word Wrap"
+msgstr "Перенесення слів"
+
 msgid "Autowrap Mode"
 msgstr "Режим автозгортки"
 
@@ -1476,6 +1575,18 @@ msgstr "Довідка"
 msgid "Show Help Index"
 msgstr "Показати покажчик довідки"
 
+msgid "Help Font Size"
+msgstr "Розмір шрифту довідки"
+
+msgid "Help Source Font Size"
+msgstr "Довідка Джерело Розмір шрифту"
+
+msgid "Help Title Font Size"
+msgstr "Розмір шрифту заголовка довідки"
+
+msgid "Class Reference Examples"
+msgstr "Приклади посилання на клас"
+
 msgid "Sort Functions Alphabetically"
 msgstr "Упорядкувати функції за абеткою"
 
@@ -1488,6 +1599,15 @@ msgstr "Відстань вибору"
 msgid "Palette Min Width"
 msgstr "Мінімальна ширина палітри"
 
+msgid "Preview Size"
+msgstr "Розмір попереднього перегляду"
+
+msgid "Primary Grid Color"
+msgstr "Основний колір сітки"
+
+msgid "Secondary Grid Color"
+msgstr "Колір вторинної сітки"
+
 msgid "Selection Box Color"
 msgstr "Колір прямокутника позначення"
 
@@ -1587,6 +1707,12 @@ msgstr "Форма кістки"
 msgid "Path 3D Tilt Disk Size"
 msgstr "Розмір диска Path 3D Tilt"
 
+msgid "Primary Grid Steps"
+msgstr "Основні кроки сітки"
+
+msgid "Grid Size"
+msgstr "Розмір сітки"
+
 msgid "Grid Division Level Max"
 msgstr "Макс. рівень поділу сітки"
 
@@ -1605,12 +1731,36 @@ msgstr "Площина XY сітки"
 msgid "Grid YZ Plane"
 msgstr "Площина YZ сітки"
 
+msgid "Default FOV"
+msgstr "Поле зору за замовчуванням"
+
+msgid "Default Z Near"
+msgstr "За замовчуванням Z поблизу"
+
+msgid "Default Z Far"
+msgstr "За замовчуванням Z Far"
+
 msgid "Invert X Axis"
 msgstr "Інвертувати вісь X"
 
 msgid "Invert Y Axis"
 msgstr "Інвертувати вісь Y"
 
+msgid "Navigation Scheme"
+msgstr "Навігаційна схема"
+
+msgid "Orbit Mouse Button"
+msgstr "Кнопка орбіти миші"
+
+msgid "Pan Mouse Button"
+msgstr "Кнопка панорамування миші"
+
+msgid "Zoom Mouse Button"
+msgstr "Кнопка масштабування миші"
+
+msgid "Zoom Style"
+msgstr "Стиль масштабування"
+
 msgid "Emulate Numpad"
 msgstr "Імітувати цифрову панель"
 
@@ -1647,12 +1797,21 @@ msgstr "Показати Gizmo Viewport Navigation"
 msgid "Freelook"
 msgstr "Довільний огляд"
 
+msgid "Freelook Navigation Scheme"
+msgstr "Схема навігації Freelook"
+
 msgid "Freelook Sensitivity"
 msgstr "Чутливість довільного огляду"
 
 msgid "Freelook Inertia"
 msgstr "Інерція довільного огляду"
 
+msgid "Freelook Base Speed"
+msgstr "Базова швидкість Freelook"
+
+msgid "Freelook Activation Modifier"
+msgstr "Редагування активації Freelook"
+
 msgid "Freelook Speed Zoom Link"
 msgstr "Зв'язок швидкості масштабування довільного огляду"
 
@@ -1698,6 +1857,9 @@ msgstr "Колір рамки панелі перегляду"
 msgid "Use Integer Zoom by Default"
 msgstr "Використовувати цілочисельне масштабування за замовчуванням"
 
+msgid "Zoom Speed Factor"
+msgstr "Коефіцієнт швидкості масштабування"
+
 msgid "Bone Mapper"
 msgstr "Картограф кісток"
 
@@ -1719,6 +1881,15 @@ msgstr "Помилка"
 msgid "Panning"
 msgstr "Панорамування"
 
+msgid "2D Editor Panning Scheme"
+msgstr "Схема панорамування 2D редактора"
+
+msgid "Sub Editors Panning Scheme"
+msgstr "Схема панорамування підредакторів"
+
+msgid "Animation Editors Panning Scheme"
+msgstr "Схема панорамування редакторів анімації"
+
 msgid "Simple Panning"
 msgstr "Просте панорамування"
 
@@ -1773,9 +1944,6 @@ msgstr "Відновити шейдери під час завантаження
 msgid "Visual Editors"
 msgstr "Візуальні редактори"
 
-msgid "Color Theme"
-msgstr "Тема кольорів"
-
 msgid "Minimap Opacity"
 msgstr "Непрозорість мінікарти"
 
@@ -1803,18 +1971,42 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "Розташування вікон"
 
+msgid "Rect"
+msgstr "Прямокутник"
+
 msgid "Rect Custom Position"
 msgstr "Нетипове розташування прямокутника"
 
+msgid "Screen"
+msgstr "Екран"
+
+msgid "Android Window"
+msgstr "Вікно Android"
+
+msgid "Game Embed Mode"
+msgstr "Режим вставки гри"
+
 msgid "Auto Save"
 msgstr "Автозбереження"
 
 msgid "Save Before Running"
 msgstr "Зберігати перед запуском"
 
+msgid "Bottom Panel"
+msgstr "Нижня панель"
+
+msgid "Action on Play"
+msgstr "Дія в Play"
+
+msgid "Action on Stop"
+msgstr "Дія при зупинці"
+
 msgid "Output"
 msgstr "Вивід"
 
+msgid "Font Size"
+msgstr "Розмір шрифту"
+
 msgid "Always Clear Output on Play"
 msgstr "Завжди очищувати вивід при відтворенні"
 
@@ -1830,6 +2022,9 @@ msgstr "Linux/*BSD"
 msgid "Prefer Wayland"
 msgstr "Віддайте перевагу Wayland"
 
+msgid "Network Mode"
+msgstr "Режим мережі"
+
 msgid "HTTP Proxy"
 msgstr "HTTP-проксі"
 
@@ -1839,12 +2034,21 @@ msgstr "Вузол"
 msgid "Editor TLS Certificates"
 msgstr "Сертифікати TLS редактора"
 
+msgid "Enable TLS V 1"
+msgstr "Увімкніть TLS V1"
+
 msgid "Remote Host"
 msgstr "Віддалений вузол"
 
 msgid "Debugger"
 msgstr "Засіб діагностики"
 
+msgid "Auto Switch to Remote Scene Tree"
+msgstr "Автоматичний перехід до віддаленого дерева сцен"
+
+msgid "Auto Switch to Stack Trace"
+msgstr "Автоматичний перехід до трасування стека"
+
 msgid "Profiler Frame History Size"
 msgstr "Розмір журналу панелі засобу профілювання"
 
@@ -1860,6 +2064,9 @@ msgstr "Інтервал оновлення ієрархії віддалено
 msgid "Remote Inspect Refresh Interval"
 msgstr "Інтервал оновлення віддаленого інспектування"
 
+msgid "Profile Native Calls"
+msgstr "Профіль Native Calls"
+
 msgid "Version Control"
 msgstr "Керування версіями"
 
@@ -1887,6 +2094,12 @@ msgstr "Керування проєктами"
 msgid "Sorting Order"
 msgstr "Режим упорядковування"
 
+msgid "Directory Naming Convention"
+msgstr "Правила іменування каталогів"
+
+msgid "Default Renderer"
+msgstr "Рендерер за замовчуванням"
+
 msgid "Highlighting"
 msgstr "Підсвічування"
 
@@ -2866,9 +3079,6 @@ msgstr "Кишеньковий пристрій"
 msgid "Orientation"
 msgstr "Орієнтація"
 
-msgid "V-Sync Mode"
-msgstr "Режим верт. синхронізації"
-
 msgid "Output Latency"
 msgstr "Затримка виведення"
 
@@ -3826,9 +4036,6 @@ msgstr "Усунення шуму"
 msgid "Denoiser"
 msgstr "Деноайзер"
 
-msgid "Enable TLS V 1"
-msgstr "Увімкніть TLS V1"
-
 msgid "BPM"
 msgstr "BPM"
 
@@ -4189,6 +4396,24 @@ msgstr "Увімкнені функції"
 msgid "Visibility State"
 msgstr "Перемкнути видимість"
 
+msgid "Debug Keystore"
+msgstr "Сховище ключів налагодження"
+
+msgid "Debug Keystore User"
+msgstr "Налагодити користувача сховища ключів"
+
+msgid "Debug Keystore Pass"
+msgstr "Налагодження Keystore Pass"
+
+msgid "Install Exported APK"
+msgstr "Установіть експортований APK"
+
+msgid "Java SDK Path"
+msgstr "Шлях Java SDK"
+
+msgid "Android SDK Path"
+msgstr "Шлях Android SDK"
+
 msgid "Force System User"
 msgstr "Примусовий користувач системи"
 
@@ -4312,9 +4537,6 @@ msgstr "Жест"
 msgid "Swipe to Dismiss"
 msgstr "Проведіть пальцем, щоб відхилити"
 
-msgid "Screen"
-msgstr "Екран"
-
 msgid "Immersive Mode"
 msgstr "Режим занурення"
 
@@ -4573,6 +4795,12 @@ msgstr "Запустіть сценарій"
 msgid "Cleanup Script"
 msgstr "Сценарій очищення"
 
+msgid "macOS"
+msgstr "macOS"
+
+msgid "rcodesign"
+msgstr "rcodesign"
+
 msgid "Distribution Type"
 msgstr "Тип розподілу"
 
@@ -4849,6 +5077,21 @@ msgstr "Піктограма 180⨯180"
 msgid "Icon 512 X 512"
 msgstr "Піктограма 512⨯12"
 
+msgid "Windows"
+msgstr "Windows"
+
+msgid "rcedit"
+msgstr "rcedit"
+
+msgid "signtool"
+msgstr "інструмент підпису"
+
+msgid "osslsigncode"
+msgstr "osslsigncode"
+
+msgid "wine"
+msgstr "wine"
+
 msgid "Identity Type"
 msgstr "Тип профілю"
 
@@ -4951,9 +5194,6 @@ msgstr "Тип відтворення"
 msgid "Copy Mode"
 msgstr "Режим копіювання"
 
-msgid "Rect"
-msgstr "Прямокутник"
-
 msgid "Anchor Mode"
 msgstr "Режим піктограм"
 
@@ -6117,9 +6357,6 @@ msgstr "Контурний модуль"
 msgid "Font"
 msgstr "Шрифт"
 
-msgid "Font Size"
-msgstr "Розмір шрифту"
-
 msgid "Horizontal Alignment"
 msgstr "Горизонтальне вирівнювання"
 
@@ -9118,9 +9355,6 @@ msgstr "Коригування"
 msgid "Brightness"
 msgstr "Яскравість"
 
-msgid "Contrast"
-msgstr "Контрастність"
-
 msgid "Saturation"
 msgstr "Насиченість"
 
diff --git a/engine/editor/translations/properties/vi.po b/engine/editor/translations/properties/vi.po
index 2f9b9451..21222f40 100644
--- a/engine/editor/translations/properties/vi.po
+++ b/engine/editor/translations/properties/vi.po
@@ -682,6 +682,9 @@ msgstr "Chỉnh sửa Kiểu Vector ngang"
 msgid "Theme"
 msgstr "Tông màu"
 
+msgid "Contrast"
+msgstr "Tương phản"
+
 msgid "Draw Extra Borders"
 msgstr "Vẽ Đường viền Bổ sung"
 
@@ -1078,6 +1081,9 @@ msgstr "SSH"
 msgid "Window Placement"
 msgstr "Vị trí cửa sổ"
 
+msgid "Screen"
+msgstr "Màn hình"
+
 msgid "Auto Save"
 msgstr "Tự động lưu"
 
@@ -1939,9 +1945,6 @@ msgstr "Hiển thị trong Android TV"
 msgid "Show as Launcher App"
 msgstr "Hiển thị dưới dạng ứng dụng Launcher"
 
-msgid "Screen"
-msgstr "Màn hình"
-
 msgid "Allow"
 msgstr "Cho phép"
 
@@ -3307,9 +3310,6 @@ msgstr "Độ dị hướng"
 msgid "Adjustments"
 msgstr "Điều chỉnh"
 
-msgid "Contrast"
-msgstr "Tương phản"
-
 msgid "Features"
 msgstr "Tính năng"
 
diff --git a/engine/editor/translations/properties/zh_CN.po b/engine/editor/translations/properties/zh_CN.po
index 510db99c..e043ac79 100644
--- a/engine/editor/translations/properties/zh_CN.po
+++ b/engine/editor/translations/properties/zh_CN.po
@@ -98,7 +98,7 @@ msgstr ""
 "Project-Id-Version: Chinese (Simplified) (Godot Engine)\n"
 "Report-Msgid-Bugs-To: https://github.com/godotengine/godot\n"
 "POT-Creation-Date: 2018-01-20 12:15+0200\n"
-"PO-Revision-Date: 2025-02-21 19:26+0000\n"
+"PO-Revision-Date: 2025-03-14 05:10+0000\n"
 "Last-Translator: Haoyu Qiu <timothyqiu32@gmail.com>\n"
 "Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
 "projects/godot-engine/godot-properties/zh_Hans/>\n"
@@ -107,7 +107,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.10.1-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 msgid "Application"
 msgstr "应用"
@@ -967,6 +967,9 @@ msgstr "使用线程"
 msgid "Localize Settings"
 msgstr "设置本地化"
 
+msgid "Dock Tab Style"
+msgstr "停靠面板标签页样式"
+
 msgid "UI Layout Direction"
 msgstr "UI 布局方向"
 
@@ -982,6 +985,12 @@ msgstr "编辑器屏幕"
 msgid "Project Manager Screen"
 msgstr "项目管理器屏幕"
 
+msgid "Connection"
+msgstr "连接"
+
+msgid "Engine Version Update Mode"
+msgstr "引擎版本更新模式"
+
 msgid "Use Embedded Menu"
 msgstr "使用嵌入式菜单"
 
@@ -991,6 +1000,12 @@ msgstr "使用原生文件对话框"
 msgid "Expand to Title"
 msgstr "扩展至标题栏"
 
+msgid "Main Font Size"
+msgstr "主字体大小"
+
+msgid "Code Font Size"
+msgstr "代码字体大小"
+
 msgid "Code Font Contextual Ligatures"
 msgstr "代码字体上下文连字"
 
@@ -1000,6 +1015,12 @@ msgstr "代码字体自定义 OpenType 特性"
 msgid "Code Font Custom Variations"
 msgstr "代码字体自定义变体"
 
+msgid "Font Antialiasing"
+msgstr "字体抗锯齿"
+
+msgid "Font Hinting"
+msgstr "字体微调"
+
 msgid "Font Subpixel Positioning"
 msgstr "字体次像素定位"
 
@@ -1033,6 +1054,9 @@ msgstr "使用专门鼠标按键查看历史"
 msgid "Save Each Scene on Quit"
 msgstr "退出时保存各场景"
 
+msgid "Save on Focus Loss"
+msgstr "焦点丢失时保存"
+
 msgid "Accept Dialog Cancel OK Buttons"
 msgstr "AcceptDialog 取消/确定按钮"
 
@@ -1048,6 +1072,12 @@ msgstr "低处理器模式睡眠（微秒）"
 msgid "Unfocused Low Processor Mode Sleep (µsec)"
 msgstr "未聚焦低处理器模式睡眠（微秒）"
 
+msgid "Import Resources When Unfocused"
+msgstr "未聚焦时导入资源"
+
+msgid "V-Sync Mode"
+msgstr "垂直同步模式"
+
 msgid "Update Continuously"
 msgstr "持续更新"
 
@@ -1072,9 +1102,18 @@ msgstr "唯一名称废除前询问"
 msgid "Inspector"
 msgstr "检查器"
 
+msgid "Max Array Dictionary Items per Page"
+msgstr "数组字典单页条目数"
+
 msgid "Show Low Level OpenType Features"
 msgstr "显示低阶 OpenType 特性"
 
+msgid "Float Drag Speed"
+msgstr "浮点数拖动速度"
+
+msgid "Nested Color Mode"
+msgstr "嵌套颜色模式"
+
 msgid "Delimitate All Container and Resources"
 msgstr "为所有容器和资源定界"
 
@@ -1102,12 +1141,39 @@ msgstr "在当前检查器中打开资源"
 msgid "Resources to Open in New Inspector"
 msgstr "在新检查器中打开的资源"
 
+msgid "Default Color Picker Mode"
+msgstr "默认取色器模式"
+
+msgid "Default Color Picker Shape"
+msgstr "默认取色器形状"
+
 msgid "Theme"
 msgstr "主题"
 
+msgid "Follow System Theme"
+msgstr "跟随系统主题"
+
+msgid "Preset"
+msgstr "预设"
+
+msgid "Spacing Preset"
+msgstr "间隙预设"
+
 msgid "Icon and Font Color"
 msgstr "图标与字体颜色"
 
+msgid "Base Color"
+msgstr "基础色"
+
+msgid "Accent Color"
+msgstr "主题色"
+
+msgid "Use System Accent Color"
+msgstr "使用系统主题色"
+
+msgid "Contrast"
+msgstr "对比度"
+
 msgid "Draw Extra Borders"
 msgstr "绘制额外边框"
 
@@ -1159,12 +1225,36 @@ msgstr "显示脚本按钮"
 msgid "Restore Scenes on Load"
 msgstr "加载时恢复场景"
 
+msgid "Multi Window"
+msgstr "多窗口"
+
+msgid "Restore Windows on Load"
+msgstr "加载时恢复窗口"
+
+msgid "Maximize Window"
+msgstr "最大化窗口"
+
 msgid "FileSystem"
 msgstr "文件系统"
 
 msgid "External Programs"
 msgstr "外部程序"
 
+msgid "Raster Image Editor"
+msgstr "位图编辑器"
+
+msgid "Vector Image Editor"
+msgstr "矢量图编辑器"
+
+msgid "Audio Editor"
+msgstr "音频编辑器"
+
+msgid "3D Model Editor"
+msgstr "3D 模型编辑器"
+
+msgid "Terminal Emulator"
+msgstr "终端模拟器"
+
 msgid "Terminal Emulator Flags"
 msgstr "终端模拟器参数"
 
@@ -1174,6 +1264,9 @@ msgstr "目录"
 msgid "Autoscan Project Path"
 msgstr "自动扫描项目路径"
 
+msgid "Default Project Path"
+msgstr "默认项目路径"
+
 msgid "On Save"
 msgstr "保存时"
 
@@ -1294,6 +1387,9 @@ msgstr "文本编辑器"
 msgid "Line Spacing"
 msgstr "行间距"
 
+msgid "Color Theme"
+msgstr "颜色主题"
+
 msgid "Appearance"
 msgstr "外观"
 
@@ -1354,6 +1450,9 @@ msgstr "行"
 msgid "Code Folding"
 msgstr "代码折叠"
 
+msgid "Word Wrap"
+msgstr "自动换行"
+
 msgid "Autowrap Mode"
 msgstr "自动换行模式"
 
@@ -1531,6 +1630,18 @@ msgstr "帮助"
 msgid "Show Help Index"
 msgstr "显示帮助索引"
 
+msgid "Help Font Size"
+msgstr "帮助字体大小"
+
+msgid "Help Source Font Size"
+msgstr "帮助源码字体大小"
+
+msgid "Help Title Font Size"
+msgstr "帮助标题字体大小"
+
+msgid "Class Reference Examples"
+msgstr "类参考示例"
+
 msgid "Sort Functions Alphabetically"
 msgstr "按字母序排列函数"
 
@@ -1543,6 +1654,15 @@ msgstr "拾取距离"
 msgid "Palette Min Width"
 msgstr "调色板最小宽度"
 
+msgid "Preview Size"
+msgstr "预览大小"
+
+msgid "Primary Grid Color"
+msgstr "主栅格颜色"
+
+msgid "Secondary Grid Color"
+msgstr "次栅格颜色"
+
 msgid "Selection Box Color"
 msgstr "选择框颜色"
 
@@ -1642,6 +1762,12 @@ msgstr "骨骼形状"
 msgid "Path 3D Tilt Disk Size"
 msgstr "Path3D 倾斜盘大小"
 
+msgid "Primary Grid Steps"
+msgstr "主栅格步长"
+
+msgid "Grid Size"
+msgstr "栅格大小"
+
 msgid "Grid Division Level Max"
 msgstr "栅格细分级别上限"
 
@@ -1660,12 +1786,36 @@ msgstr "栅格 XY 平面"
 msgid "Grid YZ Plane"
 msgstr "栅格 YZ 平面"
 
+msgid "Default FOV"
+msgstr "默认 FOV"
+
+msgid "Default Z Near"
+msgstr "默认近裁剪面"
+
+msgid "Default Z Far"
+msgstr "默认远裁剪面"
+
 msgid "Invert X Axis"
 msgstr "翻转 X 轴"
 
 msgid "Invert Y Axis"
 msgstr "翻转 Y 轴"
 
+msgid "Navigation Scheme"
+msgstr "导航方案"
+
+msgid "Orbit Mouse Button"
+msgstr "视轨鼠标按钮"
+
+msgid "Pan Mouse Button"
+msgstr "平移鼠标按钮"
+
+msgid "Zoom Mouse Button"
+msgstr "缩放鼠标按钮"
+
+msgid "Zoom Style"
+msgstr "缩放样式"
+
 msgid "Emulate Numpad"
 msgstr "模拟小键盘"
 
@@ -1702,12 +1852,21 @@ msgstr "显示视口导航小工具"
 msgid "Freelook"
 msgstr "自由观看"
 
+msgid "Freelook Navigation Scheme"
+msgstr "自由观看导航方案"
+
 msgid "Freelook Sensitivity"
 msgstr "自由观看灵敏度"
 
 msgid "Freelook Inertia"
 msgstr "自由观看惯性"
 
+msgid "Freelook Base Speed"
+msgstr "自由观看基础速度"
+
+msgid "Freelook Activation Modifier"
+msgstr "自由观看激活修饰键"
+
 msgid "Freelook Speed Zoom Link"
 msgstr "自由观看速度缩放关联"
 
@@ -1753,6 +1912,9 @@ msgstr "视口边框颜色"
 msgid "Use Integer Zoom by Default"
 msgstr "默认使用整数缩放"
 
+msgid "Zoom Speed Factor"
+msgstr "缩放速度系数"
+
 msgid "Bone Mapper"
 msgstr "骨骼映射器"
 
@@ -1774,6 +1936,15 @@ msgstr "错误"
 msgid "Panning"
 msgstr "平移"
 
+msgid "2D Editor Panning Scheme"
+msgstr "2D 编辑器平移方案"
+
+msgid "Sub Editors Panning Scheme"
+msgstr "子编辑器平移方案"
+
+msgid "Animation Editors Panning Scheme"
+msgstr "动画编辑器平移方案"
+
 msgid "Simple Panning"
 msgstr "简单平移"
 
@@ -1828,9 +1999,6 @@ msgstr "加载时恢复着色器"
 msgid "Visual Editors"
 msgstr "可视化编辑器"
 
-msgid "Color Theme"
-msgstr "颜色主题"
-
 msgid "Minimap Opacity"
 msgstr "小地图不透明度"
 
@@ -1858,18 +2026,42 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "窗口放置"
 
+msgid "Rect"
+msgstr "矩形"
+
 msgid "Rect Custom Position"
 msgstr "矩形自定义位置"
 
+msgid "Screen"
+msgstr "屏幕"
+
+msgid "Android Window"
+msgstr "Android 窗口"
+
+msgid "Game Embed Mode"
+msgstr "游戏嵌入式模式"
+
 msgid "Auto Save"
 msgstr "自动保存"
 
 msgid "Save Before Running"
 msgstr "运行前保存"
 
+msgid "Bottom Panel"
+msgstr "底部面板"
+
+msgid "Action on Play"
+msgstr "运行时动作"
+
+msgid "Action on Stop"
+msgstr "停止时动作"
+
 msgid "Output"
 msgstr "输出"
 
+msgid "Font Size"
+msgstr "字体大小"
+
 msgid "Always Clear Output on Play"
 msgstr "运行时清空输出"
 
@@ -1885,6 +2077,9 @@ msgstr "Linux/*BSD"
 msgid "Prefer Wayland"
 msgstr "首选 Wayland"
 
+msgid "Network Mode"
+msgstr "网络模式"
+
 msgid "HTTP Proxy"
 msgstr "HTTP 代理"
 
@@ -1894,12 +2089,21 @@ msgstr "主机"
 msgid "Editor TLS Certificates"
 msgstr "编辑器 TLS 证书"
 
+msgid "Enable TLS V 1"
+msgstr "启用 TLSv1"
+
 msgid "Remote Host"
 msgstr "远程主机"
 
 msgid "Debugger"
 msgstr "调试器"
 
+msgid "Auto Switch to Remote Scene Tree"
+msgstr "自动切换至远程场景树"
+
+msgid "Auto Switch to Stack Trace"
+msgstr "自动切换至栈追踪"
+
 msgid "Profiler Frame History Size"
 msgstr "性能分析器帧历史大小"
 
@@ -1915,6 +2119,9 @@ msgstr "远程场景树刷新间隔"
 msgid "Remote Inspect Refresh Interval"
 msgstr "远程检查器刷新间隔"
 
+msgid "Profile Native Calls"
+msgstr "分析原生调用"
+
 msgid "Version Control"
 msgstr "版本控制"
 
@@ -1942,6 +2149,12 @@ msgstr "项目管理器"
 msgid "Sorting Order"
 msgstr "排序方式"
 
+msgid "Directory Naming Convention"
+msgstr "目录命名约定"
+
+msgid "Default Renderer"
+msgstr "默认渲染器"
+
 msgid "Highlighting"
 msgstr "高亮"
 
@@ -2921,9 +3134,6 @@ msgstr "手持设备"
 msgid "Orientation"
 msgstr "朝向"
 
-msgid "V-Sync Mode"
-msgstr "垂直同步模式"
-
 msgid "Output Latency"
 msgstr "输出延迟"
 
@@ -3881,9 +4091,6 @@ msgstr "降噪"
 msgid "Denoiser"
 msgstr "降噪器"
 
-msgid "Enable TLS V 1"
-msgstr "启用 TLSv1"
-
 msgid "BPM"
 msgstr "BPM"
 
@@ -4244,6 +4451,24 @@ msgstr "启用特性"
 msgid "Visibility State"
 msgstr "可见状态"
 
+msgid "Debug Keystore"
+msgstr "调试密钥库"
+
+msgid "Debug Keystore User"
+msgstr "调试密钥库用户"
+
+msgid "Debug Keystore Pass"
+msgstr "调试密钥库密码"
+
+msgid "Install Exported APK"
+msgstr "安装导出的 APK"
+
+msgid "Java SDK Path"
+msgstr "Java SDK 路径"
+
+msgid "Android SDK Path"
+msgstr "Android SDK 路径"
+
 msgid "Force System User"
 msgstr "强制系统用户"
 
@@ -4367,9 +4592,6 @@ msgstr "手势"
 msgid "Swipe to Dismiss"
 msgstr "滑动关闭"
 
-msgid "Screen"
-msgstr "屏幕"
-
 msgid "Immersive Mode"
 msgstr "沉浸模式"
 
@@ -4628,6 +4850,12 @@ msgstr "运行脚本"
 msgid "Cleanup Script"
 msgstr "清理脚本"
 
+msgid "macOS"
+msgstr "macOS"
+
+msgid "rcodesign"
+msgstr "rcodesign"
+
 msgid "Distribution Type"
 msgstr "分发类型"
 
@@ -4904,6 +5132,21 @@ msgstr "图标 180×180"
 msgid "Icon 512 X 512"
 msgstr "图标 512×512"
 
+msgid "Windows"
+msgstr "Windows"
+
+msgid "rcedit"
+msgstr "rcedit"
+
+msgid "signtool"
+msgstr "signtool"
+
+msgid "osslsigncode"
+msgstr "osslsigncode"
+
+msgid "wine"
+msgstr "wine"
+
 msgid "Identity Type"
 msgstr "身份类型"
 
@@ -5006,9 +5249,6 @@ msgstr "回放类型"
 msgid "Copy Mode"
 msgstr "复制模式"
 
-msgid "Rect"
-msgstr "矩形"
-
 msgid "Anchor Mode"
 msgstr "锚点模式"
 
@@ -6172,9 +6412,6 @@ msgstr "轮廓调制"
 msgid "Font"
 msgstr "字体"
 
-msgid "Font Size"
-msgstr "字体大小"
-
 msgid "Horizontal Alignment"
 msgstr "水平对齐"
 
@@ -9173,9 +9410,6 @@ msgstr "调整"
 msgid "Brightness"
 msgstr "亮度"
 
-msgid "Contrast"
-msgstr "对比度"
-
 msgid "Saturation"
 msgstr "饱和度"
 
diff --git a/engine/editor/translations/properties/zh_TW.po b/engine/editor/translations/properties/zh_TW.po
index 6870dab0..fea74ea0 100644
--- a/engine/editor/translations/properties/zh_TW.po
+++ b/engine/editor/translations/properties/zh_TW.po
@@ -868,6 +868,9 @@ msgstr "在 Toast 通知中顯示內部錯誤"
 msgid "Show Update Spinner"
 msgstr "顯示更新旋轉圖"
 
+msgid "V-Sync Mode"
+msgstr "垂直同步模式"
+
 msgid "Update Continuously"
 msgstr "持續更新"
 
@@ -922,6 +925,9 @@ msgstr "主題"
 msgid "Icon and Font Color"
 msgstr "圖示及字體顏色"
 
+msgid "Contrast"
+msgstr "對比度"
+
 msgid "Draw Extra Borders"
 msgstr "繪製額外邊框"
 
@@ -1063,6 +1069,9 @@ msgstr "文字編輯器"
 msgid "Line Spacing"
 msgstr "行間距"
 
+msgid "Color Theme"
+msgstr "顏色主題"
+
 msgid "Appearance"
 msgstr "外觀"
 
@@ -1528,9 +1537,6 @@ msgstr "載入時恢復著色器"
 msgid "Visual Editors"
 msgstr "視覺化編輯器"
 
-msgid "Color Theme"
-msgstr "顏色主題"
-
 msgid "Minimap Opacity"
 msgstr "迷你地圖不透明度"
 
@@ -1555,9 +1561,15 @@ msgstr "SCP"
 msgid "Window Placement"
 msgstr "視窗擺放"
 
+msgid "Rect"
+msgstr "矩形"
+
 msgid "Rect Custom Position"
 msgstr "矩形自定義位置"
 
+msgid "Screen"
+msgstr "螢幕"
+
 msgid "Auto Save"
 msgstr "自動保存"
 
@@ -1567,6 +1579,9 @@ msgstr "執行前儲存"
 msgid "Output"
 msgstr "輸出"
 
+msgid "Font Size"
+msgstr "字體大小"
+
 msgid "Always Clear Output on Play"
 msgstr "執行時永遠清除輸出"
 
@@ -2419,9 +2434,6 @@ msgstr "掌上型"
 msgid "Orientation"
 msgstr "朝向"
 
-msgid "V-Sync Mode"
-msgstr "垂直同步模式"
-
 msgid "Output Latency"
 msgstr "輸出延遲"
 
@@ -3427,9 +3439,6 @@ msgstr "XR 功能"
 msgid "XR Mode"
 msgstr "XR 模式"
 
-msgid "Screen"
-msgstr "螢幕"
-
 msgid "Immersive Mode"
 msgstr "沉浸模式"
 
@@ -3982,9 +3991,6 @@ msgstr "區域遮罩"
 msgid "Copy Mode"
 msgstr "複製模式"
 
-msgid "Rect"
-msgstr "矩形"
-
 msgid "Anchor Mode"
 msgstr "錨點模式"
 
@@ -5074,9 +5080,6 @@ msgstr "輪廓調變"
 msgid "Font"
 msgstr "字體"
 
-msgid "Font Size"
-msgstr "字體大小"
-
 msgid "Horizontal Alignment"
 msgstr "水平對齊"
 
@@ -7711,9 +7714,6 @@ msgstr "調整"
 msgid "Brightness"
 msgstr "亮度"
 
-msgid "Contrast"
-msgstr "對比度"
-
 msgid "Saturation"
 msgstr "飽和度"
 
diff --git a/engine/editor/uid_upgrade_tool.cpp b/engine/editor/uid_upgrade_tool.cpp
deleted file mode 100644
index 1d44471c..00000000
--- a/engine/editor/uid_upgrade_tool.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/**************************************************************************/
-/*  uid_upgrade_tool.cpp                                                  */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "uid_upgrade_tool.h"
-
-#include "editor/editor_file_system.h"
-#include "editor/editor_log.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "editor/gui/editor_scene_tabs.h"
-#include "editor/gui/editor_toaster.h"
-#include "editor/themes/editor_scale.h"
-#include "servers/rendering_server.h"
-
-void UIDUpgradeTool::_add_files(EditorFileSystemDirectory *p_dir, Vector<String> &r_resave_paths) {
-	for (int i = 0; i < p_dir->get_subdir_count(); i++) {
-		_add_files(p_dir->get_subdir(i), r_resave_paths);
-	}
-
-	for (int i = 0; i < p_dir->get_file_count(); i++) {
-		if (p_dir->get_file_type(i) == "PackedScene" || p_dir->get_file_type(i) == "Resource") {
-			r_resave_paths.append(p_dir->get_file_path(i));
-		}
-	}
-}
-
-void UIDUpgradeTool::prepare_upgrade() {
-	EditorSettings::get_singleton()->set_project_metadata(META_UID_UPGRADE_TOOL, META_RUN_ON_RESTART, true);
-	Vector<String> resave_paths;
-	_add_files(EditorFileSystem::get_singleton()->get_filesystem(), resave_paths);
-
-	EditorSettings::get_singleton()->set_project_metadata(META_UID_UPGRADE_TOOL, META_RESAVE_PATHS, resave_paths);
-
-	// Delay to avoid deadlocks, since this dialog can be triggered by loading a scene.
-	callable_mp(EditorNode::get_singleton(), &EditorNode::restart_editor).call_deferred(false);
-}
-
-void UIDUpgradeTool::begin_upgrade() {
-	EditorSettings::get_singleton()->set_project_metadata(META_UID_UPGRADE_TOOL, META_RUN_ON_RESTART, false);
-}
-
-void UIDUpgradeTool::finish_upgrade() {
-	EditorNode::get_singleton()->trigger_menu_option(EditorSceneTabs::SCENE_CLOSE_ALL, true);
-
-	Vector<String> resave_paths = EditorSettings::get_singleton()->get_project_metadata(META_UID_UPGRADE_TOOL, META_RESAVE_PATHS, Variant());
-	EditorProgress ep("uid_upgrade_resave", TTR("Updating Script UIDs"), resave_paths.size());
-
-	int step = 0;
-	for (const String &file_path : resave_paths) {
-		Ref<Resource> res = ResourceLoader::load(file_path, "", ResourceFormatLoader::CACHE_MODE_REPLACE);
-		ep.step(TTR("Attempting to re-save ") + file_path, step++);
-		if (res.is_valid()) {
-			ResourceSaver::save(res);
-		}
-	}
-	EditorSettings::get_singleton()->set_project_metadata(META_UID_UPGRADE_TOOL, META_RESAVE_PATHS, Vector<String>());
-
-	emit_signal(SNAME(UPGRADE_FINISHED));
-}
-
-void UIDUpgradeTool::_bind_methods() {
-	ADD_SIGNAL(MethodInfo(UPGRADE_FINISHED));
-}
-
-UIDUpgradeTool::UIDUpgradeTool() {
-	singleton = this;
-}
-
-UIDUpgradeTool::~UIDUpgradeTool() {
-	singleton = nullptr;
-}
-
-void UIDUpgradeDialog::popup_on_demand() {
-	const String confirmation_message = TTR("As of Godot 4.4, scenes and resources use UIDs to reference scripts and shaders.\n\nNormally, this update is applied to a single scene or resource once you save it in Godot 4.4 for the first time. If you have a lot of scenes and/or resources, doing this manually may be time-consuming. This tool will update all of the project's scenes and resources at once.\n\nClick \"Restart & Upgrade\" to restart the editor and update all of the scenes and resources in this project. Depending on the project size, it may take several minutes.\n\nNote: Please make sure you have your project backed up before running the tool, to avoid the possibility of data loss. Additionally, make sure to commit all .uid files into version control (and do not add them to ignore-lists like .gitignore).");
-	set_text(confirmation_message);
-	get_ok_button()->set_text("Restart & Upgrade");
-	popup_centered(Size2(750 * EDSCALE, 0));
-}
-
-void UIDUpgradeDialog::_on_custom_action(const String &p_action) {
-	if (p_action == UID_UPGRADE_LEARN_MORE) {
-		OS::get_singleton()->shell_open("https://godotengine.org/article/uid-changes-coming-to-godot-4-4/");
-	}
-}
-
-void UIDUpgradeDialog::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_READY:
-			connect(SceneStringName(confirmed), callable_mp(UIDUpgradeTool::get_singleton(), &UIDUpgradeTool::prepare_upgrade));
-			connect(SNAME("custom_action"), callable_mp(this, &UIDUpgradeDialog::_on_custom_action));
-			break;
-	}
-}
-
-UIDUpgradeDialog::UIDUpgradeDialog() {
-	set_autowrap(true);
-	get_label()->set_custom_minimum_size(Size2(750 * EDSCALE, 0));
-	learn_more_button = add_button(TTR("Learn More"), true, UID_UPGRADE_LEARN_MORE);
-}
diff --git a/engine/editor/window_wrapper.cpp b/engine/editor/window_wrapper.cpp
index 6d24a9fd..8aed4010 100644
--- a/engine/editor/window_wrapper.cpp
+++ b/engine/editor/window_wrapper.cpp
@@ -497,7 +497,7 @@ ScreenSelect::ScreenSelect() {
 		set_disabled(true);
 		set_tooltip_text(EditorNode::get_singleton()->get_multiwindow_support_tooltip_text());
 	} else {
-		set_tooltip_text(TTR("Make this panel floating.\nRight-click to open the screen selector."));
+		set_tooltip_text(TTR("Make this panel floating.") + "\n" + TTR("Right-click to open the screen selector."));
 	}
 
 	// Create the popup.
diff --git a/engine/editor/window_wrapper.h b/engine/editor/window_wrapper.h
index 3fedf397..e3ca68d6 100644
--- a/engine/editor/window_wrapper.h
+++ b/engine/editor/window_wrapper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WINDOW_WRAPPER_H
-#define WINDOW_WRAPPER_H
+#pragma once
 
 #include "core/math/rect2.h"
 #include "scene/gui/margin_container.h"
@@ -116,5 +115,3 @@ protected:
 public:
 	ScreenSelect();
 };
-
-#endif // WINDOW_WRAPPER_H
diff --git a/engine/gles3_builders.py b/engine/gles3_builders.py
index a9d735ae..c10af000 100644
--- a/engine/gles3_builders.py
+++ b/engine/gles3_builders.py
@@ -1,9 +1,8 @@
 """Functions used to generate source files during build time"""
 
 import os.path
-from typing import Optional
 
-from methods import print_error, to_raw_cstring
+from methods import generated_wrapper, print_error, to_raw_cstring
 
 
 class GLES3HeaderStruct:
@@ -189,402 +188,333 @@ def include_file_in_gles3_header(filename: str, header_data: GLES3HeaderStruct,
     return header_data
 
 
-def build_gles3_header(
-    filename: str,
-    include: str,
-    class_suffix: str,
-    optional_output_filename: Optional[str] = None,
-    header_data: Optional[GLES3HeaderStruct] = None,
-):
-    header_data = header_data or GLES3HeaderStruct()
-    include_file_in_gles3_header(filename, header_data, 0)
+def build_gles3_header(filename: str, shader: str) -> None:
+    include_file_in_gles3_header(shader, header_data := GLES3HeaderStruct(), 0)
+    out_file_class = (
+        os.path.basename(shader).replace(".glsl", "").title().replace("_", "").replace(".", "") + "ShaderGLES3"
+    )
 
-    if optional_output_filename is None:
-        out_file = filename + ".gen.h"
-    else:
-        out_file = optional_output_filename
-
-    with open(out_file, "w", encoding="utf-8", newline="\n") as fd:
+    with generated_wrapper(filename) as file:
         defspec = 0
         defvariant = ""
 
-        fd.write("/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */\n")
+        file.write(f"""\
+#include "drivers/gles3/shader_gles3.h"
 
-        out_file_base = out_file
-        out_file_base = out_file_base[out_file_base.rfind("/") + 1 :]
-        out_file_base = out_file_base[out_file_base.rfind("\\") + 1 :]
-        out_file_ifdef = out_file_base.replace(".", "_").upper()
-        fd.write("#ifndef " + out_file_ifdef + class_suffix + "_GLES3\n")
-        fd.write("#define " + out_file_ifdef + class_suffix + "_GLES3\n")
-
-        out_file_class = (
-            out_file_base.replace(".glsl.gen.h", "").title().replace("_", "").replace(".", "") + "Shader" + class_suffix
-        )
-        fd.write("\n\n")
-        fd.write('#include "' + include + '"\n\n\n')
-        fd.write("class " + out_file_class + " : public Shader" + class_suffix + " {\n\n")
-
-        fd.write("public:\n\n")
+class {out_file_class} : public ShaderGLES3 {{
+public:
+""")
 
         if header_data.uniforms:
-            fd.write("\tenum Uniforms {\n")
-            for x in header_data.uniforms:
-                fd.write("\t\t" + x.upper() + ",\n")
-            fd.write("\t};\n\n")
+            uniforms = ",\n\t\t".join(uniform.upper() for uniform in header_data.uniforms)
+            file.write(f"""\
+	enum Uniforms {{
+		{uniforms},
+	}};
+
+""")
 
         if header_data.variant_names:
-            fd.write("\tenum ShaderVariant {\n")
-            for x in header_data.variant_names:
-                fd.write("\t\t" + x + ",\n")
-            fd.write("\t};\n\n")
+            variant_names = ",\n\t\t".join(name for name in header_data.variant_names)
         else:
-            fd.write("\tenum ShaderVariant { DEFAULT };\n\n")
-            defvariant = "=DEFAULT"
+            variant_names = "DEFAULT"
+            defvariant = " = DEFAULT"
+        file.write(f"""\
+	enum ShaderVariant {{
+		{variant_names},
+	}};
+
+""")
 
         if header_data.specialization_names:
-            fd.write("\tenum Specializations {\n")
-            counter = 0
-            for x in header_data.specialization_names:
-                fd.write("\t\t" + x.upper() + "=" + str(1 << counter) + ",\n")
-                counter += 1
-            fd.write("\t};\n\n")
+            specialization_names = ",\n\t\t".join(
+                f"{name.upper()} = {1 << index}" for index, name in enumerate(header_data.specialization_names)
+            )
+            file.write(f"""\
+	enum Specializations {{
+		{specialization_names},
+	}};
 
-        for i in range(len(header_data.specialization_names)):
-            defval = header_data.specialization_values[i].strip()
-            if defval.upper() == "TRUE" or defval == "1":
-                defspec |= 1 << i
+""")
+        for index, specialization_value in enumerate(header_data.specialization_values):
+            if specialization_value.strip().upper() in ["TRUE", "1"]:
+                defspec |= 1 << index
 
-        fd.write(
-            "\t_FORCE_INLINE_ bool version_bind_shader(RID p_version,ShaderVariant p_variant"
-            + defvariant
-            + ",uint64_t p_specialization="
-            + str(defspec)
-            + ") { return _version_bind_shader(p_version,p_variant,p_specialization); }\n\n"
-        )
+        file.write(f"""\
+	_FORCE_INLINE_ bool version_bind_shader(RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		return _version_bind_shader(p_version, p_variant, p_specialization);
+	}}
+
+""")
 
         if header_data.uniforms:
-            fd.write(
-                "\t_FORCE_INLINE_ int version_get_uniform(Uniforms p_uniform,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { return _version_get_uniform(p_uniform,p_version,p_variant,p_specialization); }\n\n"
-            )
+            file.write(f"""\
+	_FORCE_INLINE_ int version_get_uniform(Uniforms p_uniform, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		return _version_get_uniform(p_uniform, p_version, p_variant, p_specialization);
+	}}
 
-            fd.write(
-                "\t#define _FU if (version_get_uniform(p_uniform,p_version,p_variant,p_specialization)<0) return; \n\n "
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1f(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, double p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1f(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, uint8_t p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1ui(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, int8_t p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1i(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, uint16_t p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1ui(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, int16_t p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1i(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, uint32_t p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1ui(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, int32_t p_value,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform1i(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_value); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Color& p_color,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU GLfloat col[4]={p_color.r,p_color.g,p_color.b,p_color.a}; glUniform4fv(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),1,col); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Vector2& p_vec2,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU GLfloat vec2[2]={float(p_vec2.x),float(p_vec2.y)}; glUniform2fv(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),1,vec2); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Size2i& p_vec2,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU GLint vec2[2]={GLint(p_vec2.x),GLint(p_vec2.y)}; glUniform2iv(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),1,vec2); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Vector3& p_vec3,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU GLfloat vec3[3]={float(p_vec3.x),float(p_vec3.y),float(p_vec3.z)}; glUniform3fv(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),1,vec3); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Vector4& p_vec4,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU GLfloat vec4[4]={float(p_vec4.x),float(p_vec4.y),float(p_vec4.z),float(p_vec4.w)}; glUniform4fv(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),1,vec4); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_a, float p_b,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform2f(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_a,p_b); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform3f(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_a,p_b,p_c); }\n\n"
-            )
-            fd.write(
-                "\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c, float p_d,RID p_version,ShaderVariant p_variant"
-                + defvariant
-                + ",uint64_t p_specialization="
-                + str(defspec)
-                + ") { _FU glUniform4f(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),p_a,p_b,p_c,p_d); }\n\n"
-            )
+	/* clang-format off */
+#define TRY_GET_UNIFORM if (version_get_uniform(p_uniform, p_version, p_variant, p_specialization) < 0) return
+	/* clang-format on */
 
-            fd.write(
-                """\t_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Transform3D& p_transform,RID p_version,ShaderVariant p_variant"""
-                + defvariant
-                + """,uint64_t p_specialization="""
-                + str(defspec)
-                + """) {  _FU
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1f(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-                const Transform3D &tr = p_transform;
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, double p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1f(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-                GLfloat matrix[16]={ /* build a 16x16 matrix */
-                    (GLfloat)tr.basis.rows[0][0],
-                    (GLfloat)tr.basis.rows[1][0],
-                    (GLfloat)tr.basis.rows[2][0],
-                    (GLfloat)0,
-                    (GLfloat)tr.basis.rows[0][1],
-                    (GLfloat)tr.basis.rows[1][1],
-                    (GLfloat)tr.basis.rows[2][1],
-                    (GLfloat)0,
-                    (GLfloat)tr.basis.rows[0][2],
-                    (GLfloat)tr.basis.rows[1][2],
-                    (GLfloat)tr.basis.rows[2][2],
-                    (GLfloat)0,
-                    (GLfloat)tr.origin.x,
-                    (GLfloat)tr.origin.y,
-                    (GLfloat)tr.origin.z,
-                    (GLfloat)1
-                };
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, uint8_t p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1ui(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-                        glUniformMatrix4fv(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),1,false,matrix);
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, int8_t p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1i(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-            }
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, uint16_t p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1ui(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-            """
-            )
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, int16_t p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1i(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-            fd.write(
-                """_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Transform2D& p_transform,RID p_version,ShaderVariant p_variant"""
-                + defvariant
-                + """,uint64_t p_specialization="""
-                + str(defspec)
-                + """) {  _FU
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, uint32_t p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1ui(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-                const Transform2D &tr = p_transform;
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, int32_t p_value, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform1i(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_value);
+	}}
 
-            GLfloat matrix[16]={ /* build a 16x16 matrix */
-                (GLfloat)tr.columns[0][0],
-                (GLfloat)tr.columns[0][1],
-                (GLfloat)0,
-                (GLfloat)0,
-                (GLfloat)tr.columns[1][0],
-                (GLfloat)tr.columns[1][1],
-                (GLfloat)0,
-                (GLfloat)0,
-                (GLfloat)0,
-                (GLfloat)0,
-                (GLfloat)1,
-                (GLfloat)0,
-                (GLfloat)tr.columns[2][0],
-                (GLfloat)tr.columns[2][1],
-                (GLfloat)0,
-                (GLfloat)1
-            };
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Color &p_color, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		GLfloat col[4] = {{ p_color.r, p_color.g, p_color.b, p_color.a }};
+		glUniform4fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, col);
+	}}
 
-                glUniformMatrix4fv(version_get_uniform(p_uniform,p_version,p_variant,p_specialization),1,false,matrix);
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Vector2 &p_vec2, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		GLfloat vec2[2] = {{ float(p_vec2.x), float(p_vec2.y) }};
+		glUniform2fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, vec2);
+	}}
 
-            }
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Size2i &p_vec2, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		GLint vec2[2] = {{ GLint(p_vec2.x), GLint(p_vec2.y) }};
+		glUniform2iv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, vec2);
+	}}
 
-            """
-            )
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Vector3 &p_vec3, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		GLfloat vec3[3] = {{ float(p_vec3.x), float(p_vec3.y), float(p_vec3.z) }};
+		glUniform3fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, vec3);
+	}}
 
-            fd.write(
-                """_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Projection& p_matrix, RID p_version, ShaderVariant p_variant"""
-                + defvariant
-                + """,uint64_t p_specialization="""
-                + str(defspec)
-                + """) {  _FU
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Vector4 &p_vec4, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		GLfloat vec4[4] = {{ float(p_vec4.x), float(p_vec4.y), float(p_vec4.z), float(p_vec4.w) }};
+		glUniform4fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, vec4);
+	}}
 
-                GLfloat matrix[16];
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_a, float p_b, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform2f(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_a, p_b);
+	}}
 
-                for (int i = 0; i < 4; i++) {
-                    for (int j = 0; j < 4; j++) {
-                        matrix[i * 4 + j] = p_matrix.columns[i][j];
-                    }
-                }
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform3f(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_a, p_b, p_c);
+	}}
 
-                glUniformMatrix4fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, false, matrix);
-        }"""
-            )
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, float p_a, float p_b, float p_c, float p_d, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		glUniform4f(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), p_a, p_b, p_c, p_d);
+	}}
 
-            fd.write("\n\n#undef _FU\n\n\n")
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Transform3D &p_transform, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		const Transform3D &tr = p_transform;
 
-        fd.write("protected:\n\n")
+		GLfloat matrix[16] = {{ /* build a 16x16 matrix */
+			(GLfloat)tr.basis.rows[0][0],
+			(GLfloat)tr.basis.rows[1][0],
+			(GLfloat)tr.basis.rows[2][0],
+			(GLfloat)0,
+			(GLfloat)tr.basis.rows[0][1],
+			(GLfloat)tr.basis.rows[1][1],
+			(GLfloat)tr.basis.rows[2][1],
+			(GLfloat)0,
+			(GLfloat)tr.basis.rows[0][2],
+			(GLfloat)tr.basis.rows[1][2],
+			(GLfloat)tr.basis.rows[2][2],
+			(GLfloat)0,
+			(GLfloat)tr.origin.x,
+			(GLfloat)tr.origin.y,
+			(GLfloat)tr.origin.z,
+			(GLfloat)1
+		}};
 
-        fd.write("\tvirtual void _init() override {\n\n")
+		glUniformMatrix4fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, false, matrix);
+	}}
+
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Transform2D &p_transform, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		const Transform2D &tr = p_transform;
+
+		GLfloat matrix[16] = {{ /* build a 16x16 matrix */
+			(GLfloat)tr.columns[0][0],
+			(GLfloat)tr.columns[0][1],
+			(GLfloat)0,
+			(GLfloat)0,
+			(GLfloat)tr.columns[1][0],
+			(GLfloat)tr.columns[1][1],
+			(GLfloat)0,
+			(GLfloat)0,
+			(GLfloat)0,
+			(GLfloat)0,
+			(GLfloat)1,
+			(GLfloat)0,
+			(GLfloat)tr.columns[2][0],
+			(GLfloat)tr.columns[2][1],
+			(GLfloat)0,
+			(GLfloat)1
+		}};
+
+		glUniformMatrix4fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, false, matrix);
+	}}
+
+	_FORCE_INLINE_ void version_set_uniform(Uniforms p_uniform, const Projection &p_matrix, RID p_version, ShaderVariant p_variant{defvariant}, uint64_t p_specialization = {defspec}) {{
+		TRY_GET_UNIFORM;
+		GLfloat matrix[16];
+
+		for (int i = 0; i < 4; i++) {{
+			for (int j = 0; j < 4; j++) {{
+				matrix[i * 4 + j] = p_matrix.columns[i][j];
+			}}
+		}}
+
+		glUniformMatrix4fv(version_get_uniform(p_uniform, p_version, p_variant, p_specialization), 1, false, matrix);
+	}}
+
+#undef TRY_GET_UNIFORM
+
+""")
+
+        file.write("""\
+protected:
+	virtual void _init() override {
+""")
 
         if header_data.uniforms:
-            fd.write("\t\tstatic const char* _uniform_strings[]={\n")
-            if header_data.uniforms:
-                for x in header_data.uniforms:
-                    fd.write('\t\t\t"' + x + '",\n')
-            fd.write("\t\t};\n\n")
+            uniforms = ",\n\t\t\t".join(f'"{uniform}"' for uniform in header_data.uniforms)
+            file.write(f"""\
+		static const char *_uniform_strings[] = {{
+			{uniforms}
+		}};
+""")
         else:
-            fd.write("\t\tstatic const char **_uniform_strings=nullptr;\n")
+            file.write("""\
+		static const char **_uniform_strings = nullptr;
+""")
 
-        variant_count = 1
-        if len(header_data.variant_defines) > 0:
-            fd.write("\t\tstatic const char* _variant_defines[]={\n")
-            for x in header_data.variant_defines:
-                fd.write('\t\t\t"' + x + '",\n')
-            fd.write("\t\t};\n\n")
+        if header_data.variant_defines:
             variant_count = len(header_data.variant_defines)
+            variant_defines = ",\n\t\t\t".join(f'"{define}"' for define in header_data.variant_defines)
+            file.write(f"""\
+		static const char *_variant_defines[] = {{
+			{variant_defines},
+		}};
+""")
         else:
-            fd.write('\t\tstatic const char **_variant_defines[]={" "};\n')
+            variant_count = 1
+            file.write("""\
+		static const char **_variant_defines[] = {" "};
+""")
 
         if header_data.texunits:
-            fd.write("\t\tstatic TexUnitPair _texunit_pairs[]={\n")
-            for x in header_data.texunits:
-                fd.write('\t\t\t{"' + x[0] + '",' + x[1] + "},\n")
-            fd.write("\t\t};\n\n")
+            texunits = ",\n\t\t\t".join(f'{{ "{name}", {texunit} }}' for name, texunit in header_data.texunits)
+            file.write(f"""\
+		static TexUnitPair _texunit_pairs[] = {{
+			{texunits},
+		}};
+""")
         else:
-            fd.write("\t\tstatic TexUnitPair *_texunit_pairs=nullptr;\n")
+            file.write("""\
+		static TexUnitPair *_texunit_pairs = nullptr;
+""")
 
         if header_data.ubos:
-            fd.write("\t\tstatic UBOPair _ubo_pairs[]={\n")
-            for x in header_data.ubos:
-                fd.write('\t\t\t{"' + x[0] + '",' + x[1] + "},\n")
-            fd.write("\t\t};\n\n")
+            ubos = ",\n\t\t\t".join(f'{{ "{name}", {ubo} }}' for name, ubo in header_data.ubos)
+            file.write(f"""\
+		static UBOPair _ubo_pairs[] = {{
+			{ubos},
+		}};
+""")
         else:
-            fd.write("\t\tstatic UBOPair *_ubo_pairs=nullptr;\n")
-
-        specializations_found = []
+            file.write("""\
+		static UBOPair *_ubo_pairs = nullptr;
+""")
 
         if header_data.specialization_names:
-            fd.write("\t\tstatic Specialization _spec_pairs[]={\n")
-            for i in range(len(header_data.specialization_names)):
-                defval = header_data.specialization_values[i].strip()
-                if defval.upper() == "TRUE" or defval == "1":
-                    defval = "true"
-                else:
-                    defval = "false"
-
-                fd.write('\t\t\t{"' + header_data.specialization_names[i] + '",' + defval + "},\n")
-                specializations_found.append(header_data.specialization_names[i])
-            fd.write("\t\t};\n\n")
+            specializations = ",\n\t\t\t".join(
+                f'{{ "{name}", {"true" if header_data.specialization_values[index].strip().upper() in ["TRUE", "1"] else "false"} }}'
+                for index, name in enumerate(header_data.specialization_names)
+            )
+            file.write(f"""\
+		static Specialization _spec_pairs[] = {{
+			{specializations},
+		}};
+""")
         else:
-            fd.write("\t\tstatic Specialization *_spec_pairs=nullptr;\n")
-
-        feedback_count = 0
+            file.write("""\
+		static Specialization *_spec_pairs = nullptr;
+""")
 
         if header_data.feedbacks:
-            fd.write("\t\tstatic const Feedback _feedbacks[]={\n")
-            for x in header_data.feedbacks:
-                name = x[0]
-                spec = x[1]
-                if spec in specializations_found:
-                    fd.write('\t\t\t{"' + name + '",' + str(1 << specializations_found.index(spec)) + "},\n")
-                else:
-                    fd.write('\t\t\t{"' + name + '",0},\n')
-
-                feedback_count += 1
-
-            fd.write("\t\t};\n\n")
+            feedbacks = ",\n\t\t\t".join(
+                f'{{ "{name}", {0 if spec not in header_data.specialization_names else (1 << header_data.specialization_names.index(spec))} }}'
+                for name, spec in header_data.feedbacks
+            )
+            file.write(f"""\
+		static const Feedback _feedbacks[] = {{
+			{feedbacks},
+		}};
+""")
         else:
-            fd.write("\t\tstatic const Feedback* _feedbacks=nullptr;\n")
+            file.write("""\
+		static const Feedback *_feedbacks = nullptr;
+""")
 
-        fd.write("\t\tstatic const char _vertex_code[]={\n")
-        fd.write(to_raw_cstring(header_data.vertex_lines))
-        fd.write("\n\t\t};\n\n")
+        file.write(f"""\
+		static const char _vertex_code[] = {{
+{to_raw_cstring(header_data.vertex_lines)}
+		}};
 
-        fd.write("\t\tstatic const char _fragment_code[]={\n")
-        fd.write(to_raw_cstring(header_data.fragment_lines))
-        fd.write("\n\t\t};\n\n")
+		static const char _fragment_code[] = {{
+{to_raw_cstring(header_data.fragment_lines)}
+		}};
 
-        fd.write(
-            '\t\t_setup(_vertex_code,_fragment_code,"'
-            + out_file_class
-            + '",'
-            + str(len(header_data.uniforms))
-            + ",_uniform_strings,"
-            + str(len(header_data.ubos))
-            + ",_ubo_pairs,"
-            + str(feedback_count)
-            + ",_feedbacks,"
-            + str(len(header_data.texunits))
-            + ",_texunit_pairs,"
-            + str(len(header_data.specialization_names))
-            + ",_spec_pairs,"
-            + str(variant_count)
-            + ",_variant_defines);\n"
-        )
-
-        fd.write("\t}\n\n")
-
-        fd.write("};\n\n")
-        fd.write("#endif\n")
+		_setup(_vertex_code, _fragment_code, "{out_file_class}",
+				{len(header_data.uniforms)}, _uniform_strings, {len(header_data.ubos)}, _ubo_pairs,
+				{len(header_data.feedbacks)}, _feedbacks, {len(header_data.texunits)}, _texunit_pairs,
+				{len(header_data.specialization_names)}, _spec_pairs, {variant_count}, _variant_defines);
+	}}
+}};
+""")
 
 
 def build_gles3_headers(target, source, env):
     env.NoCache(target)
-    for x in source:
-        build_gles3_header(str(x), include="drivers/gles3/shader_gles3.h", class_suffix="GLES3")
+    for src in source:
+        build_gles3_header(f"{src}.gen.h", str(src))
diff --git a/engine/glsl_builders.py b/engine/glsl_builders.py
index 98a274dd..dbe9d5ad 100644
--- a/engine/glsl_builders.py
+++ b/engine/glsl_builders.py
@@ -1,9 +1,8 @@
 """Functions used to generate source files during build time"""
 
 import os.path
-from typing import Optional
 
-from methods import print_error, to_raw_cstring
+from methods import generated_wrapper, print_error, to_raw_cstring
 
 
 class RDHeaderStruct:
@@ -92,65 +91,49 @@ def include_file_in_rd_header(filename: str, header_data: RDHeaderStruct, depth:
     return header_data
 
 
-def build_rd_header(
-    filename: str, optional_output_filename: Optional[str] = None, header_data: Optional[RDHeaderStruct] = None
-) -> None:
-    header_data = header_data or RDHeaderStruct()
-    include_file_in_rd_header(filename, header_data, 0)
-
-    if optional_output_filename is None:
-        out_file = filename + ".gen.h"
-    else:
-        out_file = optional_output_filename
-
-    out_file_base = out_file
-    out_file_base = out_file_base[out_file_base.rfind("/") + 1 :]
-    out_file_base = out_file_base[out_file_base.rfind("\\") + 1 :]
-    out_file_ifdef = out_file_base.replace(".", "_").upper()
-    out_file_class = out_file_base.replace(".glsl.gen.h", "").title().replace("_", "").replace(".", "") + "ShaderRD"
-
-    if header_data.compute_lines:
-        body_parts = [
-            "static const char _compute_code[] = {\n%s\n\t\t};" % to_raw_cstring(header_data.compute_lines),
-            f'setup(nullptr, nullptr, _compute_code, "{out_file_class}");',
-        ]
-    else:
-        body_parts = [
-            "static const char _vertex_code[] = {\n%s\n\t\t};" % to_raw_cstring(header_data.vertex_lines),
-            "static const char _fragment_code[] = {\n%s\n\t\t};" % to_raw_cstring(header_data.fragment_lines),
-            f'setup(_vertex_code, _fragment_code, nullptr, "{out_file_class}");',
-        ]
-
-    body_content = "\n\t\t".join(body_parts)
-
-    # Intended curly brackets are doubled so f-string doesn't eat them up.
-    shader_template = f"""/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */
-#ifndef {out_file_ifdef}_RD
-#define {out_file_ifdef}_RD
+def build_rd_header(filename: str, shader: str) -> None:
+    include_file_in_rd_header(shader, header_data := RDHeaderStruct(), 0)
+    class_name = os.path.basename(shader).replace(".glsl", "").title().replace("_", "").replace(".", "") + "ShaderRD"
 
+    with generated_wrapper(filename) as file:
+        file.write(f"""\
 #include "servers/rendering/renderer_rd/shader_rd.h"
 
-class {out_file_class} : public ShaderRD {{
-
+class {class_name} : public ShaderRD {{
 public:
+	{class_name}() {{
+""")
 
-	{out_file_class}() {{
+        if header_data.compute_lines:
+            file.write(f"""\
+		static const char *_vertex_code = nullptr;
+		static const char *_fragment_code = nullptr;
+		static const char _compute_code[] = {{
+{to_raw_cstring(header_data.compute_lines)}
+		}};
+""")
+        else:
+            file.write(f"""\
+		static const char _vertex_code[] = {{
+{to_raw_cstring(header_data.vertex_lines)}
+		}};
+		static const char _fragment_code[] = {{
+{to_raw_cstring(header_data.fragment_lines)}
+		}};
+		static const char *_compute_code = nullptr;
+""")
 
-		{body_content}
+        file.write(f"""\
+		setup(_vertex_code, _fragment_code, _compute_code, "{class_name}");
 	}}
 }};
-
-#endif
-"""
-
-    with open(out_file, "w", encoding="utf-8", newline="\n") as fd:
-        fd.write(shader_template)
+""")
 
 
 def build_rd_headers(target, source, env):
     env.NoCache(target)
-    for x in source:
-        build_rd_header(filename=str(x))
+    for src in source:
+        build_rd_header(f"{src}.gen.h", str(src))
 
 
 class RAWHeaderStruct:
@@ -175,37 +158,18 @@ def include_file_in_raw_header(filename: str, header_data: RAWHeaderStruct, dept
             line = fs.readline()
 
 
-def build_raw_header(
-    filename: str, optional_output_filename: Optional[str] = None, header_data: Optional[RAWHeaderStruct] = None
-):
-    header_data = header_data or RAWHeaderStruct()
-    include_file_in_raw_header(filename, header_data, 0)
+def build_raw_header(filename: str, shader: str) -> None:
+    include_file_in_raw_header(shader, header_data := RAWHeaderStruct(), 0)
 
-    if optional_output_filename is None:
-        out_file = filename + ".gen.h"
-    else:
-        out_file = optional_output_filename
-
-    out_file_base = out_file.replace(".glsl.gen.h", "_shader_glsl")
-    out_file_base = out_file_base[out_file_base.rfind("/") + 1 :]
-    out_file_base = out_file_base[out_file_base.rfind("\\") + 1 :]
-    out_file_ifdef = out_file_base.replace(".", "_").upper()
-
-    shader_template = f"""/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */
-#ifndef {out_file_ifdef}_RAW_H
-#define {out_file_ifdef}_RAW_H
-
-static const char {out_file_base}[] = {{
+    with generated_wrapper(filename) as file:
+        file.write(f"""\
+static const char {os.path.basename(shader).replace(".glsl", "_shader_glsl")}[] = {{
 {to_raw_cstring(header_data.code)}
 }};
-#endif
-"""
-
-    with open(out_file, "w", encoding="utf-8", newline="\n") as f:
-        f.write(shader_template)
+""")
 
 
 def build_raw_headers(target, source, env):
     env.NoCache(target)
-    for x in source:
-        build_raw_header(filename=str(x))
+    for src in source:
+        build_raw_header(f"{src}.gen.h", str(src))
diff --git a/engine/icon.svg b/engine/icon.svg
index 692a3820..726ca89c 100644
--- a/engine/icon.svg
+++ b/engine/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/icon_outlined.svg b/engine/icon_outlined.svg
index 70473ffc..a6af754d 100644
--- a/engine/icon_outlined.svg
+++ b/engine/icon_outlined.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="none" stroke="#fff" stroke-linejoin="round" stroke-width="64" d="M105 745c0 276 813 276 814 0V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81v318z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="none" stroke="#fff" stroke-linejoin="round" stroke-width="64" d="M105 745c0 276 813 276 814 0V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81v318z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/logo.svg b/engine/logo.svg
index 9352d7ad..96139b24 100644
--- a/engine/logo.svg
+++ b/engine/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="414"><path fill="#414042" d="M523.82 188.382c-9.142-.142-19.603 1.764-19.603 1.764v17.842h10.52l-.117 7.953c0 2.946-2.92 4.427-8.747 4.427-5.831 0-10.982-2.47-15.45-7.395-4.48-4.932-6.708-12.141-6.708-21.64 0-9.519 2.176-16.537 6.536-21.065 4.35-4.524 10.05-6.794 17.064-6.794 2.946 0 5.996.476 9.168 1.445 3.174.962 5.293 1.863 6.375 2.707 1.072.867 2.09 1.277 3.056 1.277.96 0 2.513-1.122 4.66-3.392 2.153-2.263 4.082-5.693 5.782-10.267 1.694-4.598 2.543-8.122 2.543-10.621 0-2.48-.054-4.19-.164-5.092-2.379-2.603-6.767-4.666-13.168-6.2-6.39-1.53-13.552-2.289-21.476-2.289-17.438 0-31.073 5.49-40.92 16.47-9.855 10.982-14.773 25.24-14.773 42.79 0 20.607 5.035 36.227 15.103 46.868 10.085 10.64 23.327 15.953 39.743 15.953 8.827 0 16.664-.76 23.51-2.289 6.853-1.523 11.41-3.088 13.676-4.67l.68-53.137c0-3.087-8.149-4.488-17.29-4.645m84.247-24.804c-5.431 0-9.98 2.496-13.671 7.47-3.672 4.98-5.517 11.969-5.517 20.963 0 9.013 1.754 15.914 5.27 20.722 3.508 4.823 8.117 7.225 13.835 7.225 5.715 0 10.358-2.432 13.924-7.313q5.351-7.293 5.353-20.884c0-9.054-1.846-16.023-5.524-20.89q-5.51-7.292-13.67-7.293m-.083 89.477c-15.9 0-28.868-5.203-38.89-15.61q-15.016-15.624-15.017-45.592c0-19.992 5.063-35.128 15.191-45.435 10.131-10.293 23.209-15.444 39.228-15.444 16.016 0 28.954 5.058 38.795 15.204 9.858 10.126 14.778 25.477 14.778 46.009 0 20.546-5.034 35.828-15.114 45.856-10.08 10.008-23.062 15.012-38.971 15.012m101.95-88.298v50.788c0 2.37.176 3.866.515 4.493.337.624 1.358.937 3.052.937 6.232 0 10.954-2.328 14.181-6.97 3.235-4.636 4.835-12.356 4.835-23.168 0-10.817-1.674-17.865-5-21.139-3.344-3.283-8.64-4.94-15.884-4.94zm-32.599 78.798V141.681c0-2.832.704-5.067 2.126-6.724 1.413-1.632 3.25-2.461 5.521-2.461h28.357c17.994 0 31.664 4.54 40.994 13.597 9.347 9.054 14.02 23.31 14.02 42.784 0 41.66-17.778 62.486-53.326 62.486h-29.03c-5.769 0-8.662-2.597-8.662-7.808m156.544-79.977c-5.432 0-9.994 2.496-13.678 7.47q-5.507 7.471-5.508 20.963c0 9.013 1.758 15.914 5.262 20.722 3.505 4.823 8.119 7.225 13.837 7.225 5.717 0 10.363-2.432 13.924-7.313q5.354-7.293 5.355-20.884c0-9.054-1.843-16.023-5.522-20.89-3.68-4.861-8.23-7.293-13.67-7.293m-.087 89.477q-23.86 0-38.88-15.61-15.03-15.624-15.03-45.592c0-19.992 5.065-35.128 15.191-45.435 10.139-10.293 23.209-15.444 39.233-15.444 16.02 0 28.946 5.058 38.8 15.204 9.85 10.126 14.772 25.477 14.772 46.009 0 20.546-5.037 35.828-15.115 45.856-10.076 10.008-23.07 15.012-38.971 15.012m117.69-4.17c0 2.251-5.597 3.392-16.809 3.392-11.202 0-16.815-1.141-16.815-3.392v-85.248h-20.371c-1.928 0-3.286-2.597-4.077-7.818a56 56 0 0 1-.501-7.636c0-2.592.162-5.146.501-7.636.79-5.205 2.15-7.823 4.077-7.823h73.864c1.924 0 3.277 2.617 4.078 7.823.333 2.49.505 5.043.505 7.636 0 2.608-.172 5.152-.505 7.637-.8 5.22-2.154 7.817-4.078 7.817h-19.87z"/><path fill="#6d6e71" d="M487.93 322.997c-.94 1.926-2.664 3.691-5.188 5.289-2.52 1.607-5.722 2.406-9.611 2.406-5.132 0-9.259-1.617-12.394-4.887-3.122-3.243-4.686-7.92-4.686-14.022V296.57c0-5.97 1.473-10.548 4.431-13.743 2.95-3.17 6.903-4.78 11.84-4.78 4.824 0 8.564 1.27 11.212 3.781 2.639 2.519 4.025 6.038 4.146 10.532l-.066.2h-3.94c-.14-3.443-1.14-6.101-3.022-7.979-1.871-1.861-4.655-2.803-8.33-2.803-3.72 0-6.668 1.259-8.823 3.785-2.15 2.518-3.224 6.17-3.224 10.968v15.301q.001 7.462 3.476 11.382c2.316 2.592 5.438 3.892 9.38 3.892 2.876 0 5.19-.51 6.92-1.554 1.738-1.028 2.942-2.285 3.624-3.775V308.45h-10.618v-3.704h14.873zm19.557 3.902c2.336 0 4.416-.661 6.232-2.01 1.82-1.353 3.096-3.063 3.852-5.146v-8.224h-6.756q-4.31 0-6.896 2.442c-1.726 1.617-2.581 3.637-2.581 6.037 0 2.03.534 3.696 1.616 4.981 1.08 1.289 2.59 1.92 4.533 1.92m10.715 3.068a99 99 0 0 1-.48-3.225 22 22 0 0 1-.15-2.562 14.9 14.9 0 0 1-4.483 4.675c-1.836 1.236-3.878 1.848-6.128 1.848-3.147 0-5.567-.975-7.28-2.927-1.702-1.96-2.563-4.6-2.563-7.936 0-3.523 1.237-6.35 3.72-8.448 2.48-2.098 5.85-3.147 10.09-3.147h6.643v-4.672c0-2.686-.686-4.802-2.032-6.331-1.375-1.51-3.264-2.275-5.701-2.275-2.268 0-4.139.722-5.608 2.182-1.463 1.45-2.19 3.224-2.19 5.337l-3.944-.035-.07-.206c-.11-2.866.973-5.4 3.261-7.646 2.279-2.24 5.203-3.352 8.761-3.352 3.517 0 6.347 1.069 8.509 3.2q3.224 3.227 3.226 9.21v18.645c0 1.358.064 2.677.183 3.936a25 25 0 0 0 .627 3.729zm16.905-38.108.36 5.9c1-2.112 2.339-3.739 3.998-4.896q2.498-1.711 5.874-1.711c2.296 0 4.232.668 5.794 2.02 1.562 1.347 2.714 3.387 3.446 6.127.938-2.529 2.264-4.528 3.986-5.975 1.722-1.45 3.812-2.172 6.23-2.172 3.335 0 5.923 1.35 7.755 4.05 1.841 2.705 2.759 6.856 2.759 12.464v22.207h-4.246v-22.28c0-4.663-.645-7.946-1.9-9.834-1.261-1.89-3.071-2.842-5.41-2.842-2.462 0-4.384 1.04-5.767 3.152-1.375 2.112-2.223 4.754-2.531 7.945v23.86h-4.224v-22.258c0-4.554-.639-7.812-1.945-9.759-1.299-1.946-3.107-2.912-5.427-2.912-2.218 0-4.013.677-5.358 2.02-1.353 1.349-2.315 3.195-2.899 5.538v27.369h-4.22v-38.014zm61.457 3.021q-3.966 0-6.517 3.613c-1.705 2.415-2.585 5.392-2.656 8.938h17.537v-1.626c0-3.137-.736-5.75-2.21-7.822-1.482-2.075-3.53-3.103-6.154-3.103m.598 35.735c-4.099 0-7.451-1.543-10.055-4.621q-3.895-4.61-3.896-11.793v-6.313c0-4.798 1.303-8.798 3.912-11.979 2.616-3.167 5.758-4.75 9.441-4.75 3.983 0 7.068 1.413 9.27 4.246q3.313 4.257 3.312 11.434v4.171H587.39v3.162c0 3.68.882 6.744 2.635 9.19 1.757 2.45 4.144 3.666 7.136 3.666 2.077 0 3.888-.367 5.396-1.089a11.1 11.1 0 0 0 3.877-3.132l1.728 2.99c-1.148 1.456-2.634 2.633-4.45 3.505-1.811.868-4 1.312-6.551 1.312m46.411-35.734q-3.976 0-6.528 3.613-2.54 3.62-2.652 8.938h17.54v-1.626c0-3.137-.733-5.75-2.216-7.822-1.475-2.075-3.52-3.103-6.144-3.103m.593 35.735c-4.1 0-7.446-1.543-10.045-4.621q-3.91-4.61-3.91-11.793v-6.313c0-4.798 1.309-8.798 3.913-11.979 2.623-3.167 5.766-4.75 9.45-4.75 3.975 0 7.072 1.413 9.27 4.246 2.2 2.837 3.304 6.65 3.304 11.434v4.171h-21.755v3.162q0 5.52 2.647 9.19c1.747 2.45 4.124 3.666 7.125 3.666 2.087 0 3.888-.367 5.392-1.089a11.2 11.2 0 0 0 3.894-3.132l1.717 2.99c-1.15 1.456-2.633 2.633-4.451 3.505-1.81.868-3.997 1.312-6.55 1.312m23.189-38.755.345 6.284c1.014-2.23 2.353-3.962 4.034-5.166 1.667-1.21 3.63-1.824 5.887-1.824 3.396 0 5.998 1.256 7.804 3.78 1.826 2.518 2.73 6.434 2.73 11.749v23.191h-4.249V306.72c0-4.343-.636-7.377-1.9-9.137-1.258-1.76-3.107-2.636-5.513-2.636-2.158 0-3.968.701-5.419 2.126-1.457 1.412-2.543 3.294-3.267 5.666v27.134h-4.219V291.86zm33.27 22.395c0 3.858.73 6.926 2.213 9.208 1.465 2.304 3.695 3.443 6.671 3.443 2.04 0 3.757-.544 5.167-1.657 1.405-1.113 2.514-2.662 3.336-4.627V301.79c-.79-2.025-1.874-3.66-3.244-4.92-1.368-1.24-3.102-1.863-5.186-1.863-2.97 0-5.216 1.294-6.708 3.891-1.502 2.603-2.25 5.995-2.25 10.161zm-4.262-5.195c0-5.386 1.088-9.714 3.274-12.975 2.169-3.245 5.187-4.871 9.03-4.871 2.134 0 4.007.52 5.607 1.564 1.603 1.024 2.928 2.523 3.992 4.43l.412-5.287h3.581v38.048c0 4.871-1.13 8.646-3.4 11.317-2.271 2.66-5.499 4.009-9.666 4.009-1.5 0-3.11-.235-4.832-.691-1.724-.456-3.252-1.054-4.59-1.805l1.168-3.704a14.1 14.1 0 0 0 3.831 1.716 15.2 15.2 0 0 0 4.352.616q4.536-.001 6.71-2.905c1.452-1.961 2.18-4.798 2.18-8.553v-4.597c-1.079 1.71-2.402 3.024-3.97 3.93-1.563.912-3.39 1.368-5.448 1.368-3.818 0-6.814-1.496-8.976-4.486-2.167-2.983-3.255-6.965-3.255-11.93zm40.2 20.916h-4.266V291.86h4.266zm0-48.968h-4.266v-6.005h4.266zm13.774 10.852.346 6.284c1.016-2.23 2.35-3.962 4.027-5.166 1.677-1.21 3.643-1.824 5.89-1.824 3.397 0 6.01 1.256 7.82 3.78 1.821 2.518 2.717 6.434 2.717 11.749v23.191h-4.248V306.72c0-4.343-.635-7.377-1.897-9.137-1.268-1.76-3.103-2.636-5.517-2.636-2.157 0-3.962.701-5.412 2.126-1.455 1.412-2.545 3.294-3.266 5.666v27.134h-4.224V291.86zm42.074 3.021q-3.978 0-6.518 3.613-2.547 3.62-2.66 8.938h17.54v-1.626c0-3.137-.731-5.75-2.21-7.822-1.476-2.075-3.525-3.103-6.152-3.103m.602 35.735c-4.11 0-7.456-1.543-10.048-4.621q-3.903-4.61-3.903-11.793v-6.313c0-4.798 1.302-8.798 3.91-11.979q3.924-4.75 9.439-4.75c3.978 0 7.077 1.413 9.283 4.246 2.197 2.837 3.3 6.65 3.3 11.434v4.171h-21.76v3.162c0 3.68.887 6.744 2.642 9.19 1.754 2.45 4.133 3.666 7.137 3.666 2.08 0 3.88-.367 5.382-1.089a11.16 11.16 0 0 0 3.897-3.132l1.725 2.99c-1.156 1.456-2.64 2.633-4.454 3.505-1.81.868-3.998 1.312-6.55 1.312"/><g fill="#fff" transform="matrix(.36 0 0 .36 30.24 21.6)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="matrix(.36 0 0 .36 30.24 21.6)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="414"><path fill="#414042" d="M523.82 188.382c-9.142-.142-19.603 1.764-19.603 1.764v17.842h10.52l-.117 7.953c0 2.946-2.92 4.427-8.747 4.427-5.831 0-10.982-2.47-15.45-7.395-4.48-4.932-6.708-12.141-6.708-21.64 0-9.519 2.176-16.537 6.536-21.065 4.35-4.524 10.05-6.794 17.064-6.794 2.946 0 5.996.476 9.168 1.445 3.174.962 5.293 1.863 6.375 2.707 1.072.867 2.09 1.277 3.056 1.277.96 0 2.513-1.122 4.66-3.392 2.153-2.263 4.082-5.693 5.782-10.267 1.694-4.598 2.543-8.122 2.543-10.621 0-2.48-.054-4.19-.164-5.092-2.379-2.603-6.767-4.666-13.168-6.2-6.39-1.53-13.552-2.289-21.476-2.289-17.438 0-31.073 5.49-40.92 16.47-9.855 10.982-14.773 25.24-14.773 42.79 0 20.607 5.035 36.227 15.103 46.868 10.085 10.64 23.327 15.953 39.743 15.953 8.827 0 16.664-.76 23.51-2.289 6.853-1.523 11.41-3.088 13.676-4.67l.68-53.137c0-3.087-8.149-4.488-17.29-4.645m84.247-24.804c-5.431 0-9.98 2.496-13.671 7.47-3.672 4.98-5.517 11.969-5.517 20.963 0 9.013 1.754 15.914 5.27 20.722 3.508 4.823 8.117 7.225 13.835 7.225 5.715 0 10.358-2.432 13.924-7.313q5.351-7.293 5.353-20.884c0-9.054-1.846-16.023-5.524-20.89q-5.51-7.292-13.67-7.293m-.083 89.477c-15.9 0-28.868-5.203-38.89-15.61q-15.016-15.624-15.017-45.592c0-19.992 5.063-35.128 15.191-45.435 10.131-10.293 23.209-15.444 39.228-15.444 16.016 0 28.954 5.058 38.795 15.204 9.858 10.126 14.778 25.477 14.778 46.009 0 20.546-5.034 35.828-15.114 45.856-10.08 10.008-23.062 15.012-38.971 15.012m101.95-88.298v50.788c0 2.37.176 3.866.515 4.493.337.624 1.358.937 3.052.937 6.232 0 10.954-2.328 14.181-6.97 3.235-4.636 4.835-12.356 4.835-23.168 0-10.817-1.674-17.865-5-21.139-3.344-3.283-8.64-4.94-15.884-4.94zm-32.599 78.798V141.681c0-2.832.704-5.067 2.126-6.724 1.413-1.632 3.25-2.461 5.521-2.461h28.357c17.994 0 31.664 4.54 40.994 13.597 9.347 9.054 14.02 23.31 14.02 42.784 0 41.66-17.778 62.486-53.326 62.486h-29.03c-5.769 0-8.662-2.597-8.662-7.808m156.544-79.977c-5.432 0-9.994 2.496-13.678 7.47q-5.507 7.471-5.508 20.963c0 9.013 1.758 15.914 5.262 20.722 3.505 4.823 8.119 7.225 13.837 7.225 5.717 0 10.363-2.432 13.924-7.313q5.354-7.293 5.355-20.884c0-9.054-1.843-16.023-5.522-20.89-3.68-4.861-8.23-7.293-13.67-7.293m-.087 89.477q-23.86 0-38.88-15.61-15.03-15.624-15.03-45.592c0-19.992 5.065-35.128 15.191-45.435 10.139-10.293 23.209-15.444 39.233-15.444 16.02 0 28.946 5.058 38.8 15.204 9.85 10.126 14.772 25.477 14.772 46.009 0 20.546-5.037 35.828-15.115 45.856-10.076 10.008-23.07 15.012-38.971 15.012m117.69-4.17c0 2.251-5.597 3.392-16.809 3.392-11.202 0-16.815-1.141-16.815-3.392v-85.248h-20.371c-1.928 0-3.286-2.597-4.077-7.818a56 56 0 0 1-.501-7.636c0-2.592.162-5.146.501-7.636.79-5.205 2.15-7.823 4.077-7.823h73.864c1.924 0 3.277 2.617 4.078 7.823.333 2.49.505 5.043.505 7.636 0 2.608-.172 5.152-.505 7.637-.8 5.22-2.154 7.817-4.078 7.817h-19.87z"/><path fill="#6d6e71" d="M487.93 322.997c-.94 1.926-2.664 3.691-5.188 5.289-2.52 1.607-5.722 2.406-9.611 2.406-5.132 0-9.259-1.617-12.394-4.887-3.122-3.243-4.686-7.92-4.686-14.022V296.57c0-5.97 1.473-10.548 4.431-13.743 2.95-3.17 6.903-4.78 11.84-4.78 4.824 0 8.564 1.27 11.212 3.781 2.639 2.519 4.025 6.038 4.146 10.532l-.066.2h-3.94c-.14-3.443-1.14-6.101-3.022-7.979-1.871-1.861-4.655-2.803-8.33-2.803-3.72 0-6.668 1.259-8.823 3.785-2.15 2.518-3.224 6.17-3.224 10.968v15.301q.001 7.462 3.476 11.382c2.316 2.592 5.438 3.892 9.38 3.892 2.876 0 5.19-.51 6.92-1.554 1.738-1.028 2.942-2.285 3.624-3.775V308.45h-10.618v-3.704h14.873zm19.557 3.902c2.336 0 4.416-.661 6.232-2.01 1.82-1.353 3.096-3.063 3.852-5.146v-8.224h-6.756q-4.31 0-6.896 2.442c-1.726 1.617-2.581 3.637-2.581 6.037 0 2.03.534 3.696 1.616 4.981 1.08 1.289 2.59 1.92 4.533 1.92m10.715 3.068a99 99 0 0 1-.48-3.225 22 22 0 0 1-.15-2.562 14.9 14.9 0 0 1-4.483 4.675c-1.836 1.236-3.878 1.848-6.128 1.848-3.147 0-5.567-.975-7.28-2.927-1.702-1.96-2.563-4.6-2.563-7.936 0-3.523 1.237-6.35 3.72-8.448 2.48-2.098 5.85-3.147 10.09-3.147h6.643v-4.672c0-2.686-.686-4.802-2.032-6.331-1.375-1.51-3.264-2.275-5.701-2.275-2.268 0-4.139.722-5.608 2.182-1.463 1.45-2.19 3.224-2.19 5.337l-3.944-.035-.07-.206c-.11-2.866.973-5.4 3.261-7.646 2.279-2.24 5.203-3.352 8.761-3.352 3.517 0 6.347 1.069 8.509 3.2q3.224 3.227 3.226 9.21v18.645c0 1.358.064 2.677.183 3.936a25 25 0 0 0 .627 3.729zm16.905-38.108.36 5.9c1-2.112 2.339-3.739 3.998-4.896q2.498-1.711 5.874-1.711c2.296 0 4.232.668 5.794 2.02 1.562 1.347 2.714 3.387 3.446 6.127.938-2.529 2.264-4.528 3.986-5.975 1.722-1.45 3.812-2.172 6.23-2.172 3.335 0 5.923 1.35 7.755 4.05 1.841 2.705 2.759 6.856 2.759 12.464v22.207h-4.246v-22.28c0-4.663-.645-7.946-1.9-9.834-1.261-1.89-3.071-2.842-5.41-2.842-2.462 0-4.384 1.04-5.767 3.152-1.375 2.112-2.223 4.754-2.531 7.945v23.86h-4.224v-22.258c0-4.554-.639-7.812-1.945-9.759-1.299-1.946-3.107-2.912-5.427-2.912-2.218 0-4.013.677-5.358 2.02-1.353 1.349-2.315 3.195-2.899 5.538v27.369h-4.22v-38.014zm61.457 3.021q-3.966 0-6.517 3.613c-1.705 2.415-2.585 5.392-2.656 8.938h17.537v-1.626c0-3.137-.736-5.75-2.21-7.822-1.482-2.075-3.53-3.103-6.154-3.103m.598 35.735c-4.099 0-7.451-1.543-10.055-4.621q-3.895-4.61-3.896-11.793v-6.313c0-4.798 1.303-8.798 3.912-11.979 2.616-3.167 5.758-4.75 9.441-4.75 3.983 0 7.068 1.413 9.27 4.246q3.313 4.257 3.312 11.434v4.171H587.39v3.162c0 3.68.882 6.744 2.635 9.19 1.757 2.45 4.144 3.666 7.136 3.666 2.077 0 3.888-.367 5.396-1.089a11.1 11.1 0 0 0 3.877-3.132l1.728 2.99c-1.148 1.456-2.634 2.633-4.45 3.505-1.811.868-4 1.312-6.551 1.312m46.411-35.734q-3.976 0-6.528 3.613-2.54 3.62-2.652 8.938h17.54v-1.626c0-3.137-.733-5.75-2.216-7.822-1.475-2.075-3.52-3.103-6.144-3.103m.593 35.735c-4.1 0-7.446-1.543-10.045-4.621q-3.91-4.61-3.91-11.793v-6.313c0-4.798 1.309-8.798 3.913-11.979 2.623-3.167 5.766-4.75 9.45-4.75 3.975 0 7.072 1.413 9.27 4.246 2.2 2.837 3.304 6.65 3.304 11.434v4.171h-21.755v3.162q0 5.52 2.647 9.19c1.747 2.45 4.124 3.666 7.125 3.666 2.087 0 3.888-.367 5.392-1.089a11.2 11.2 0 0 0 3.894-3.132l1.717 2.99c-1.15 1.456-2.633 2.633-4.451 3.505-1.81.868-3.997 1.312-6.55 1.312m23.189-38.755.345 6.284c1.014-2.23 2.353-3.962 4.034-5.166 1.667-1.21 3.63-1.824 5.887-1.824 3.396 0 5.998 1.256 7.804 3.78 1.826 2.518 2.73 6.434 2.73 11.749v23.191h-4.249V306.72c0-4.343-.636-7.377-1.9-9.137-1.258-1.76-3.107-2.636-5.513-2.636-2.158 0-3.968.701-5.419 2.126-1.457 1.412-2.543 3.294-3.267 5.666v27.134h-4.219V291.86zm33.27 22.395c0 3.858.73 6.926 2.213 9.208 1.465 2.304 3.695 3.443 6.671 3.443 2.04 0 3.757-.544 5.167-1.657 1.405-1.113 2.514-2.662 3.336-4.627V301.79c-.79-2.025-1.874-3.66-3.244-4.92-1.368-1.24-3.102-1.863-5.186-1.863-2.97 0-5.216 1.294-6.708 3.891-1.502 2.603-2.25 5.995-2.25 10.161zm-4.262-5.195c0-5.386 1.088-9.714 3.274-12.975 2.169-3.245 5.187-4.871 9.03-4.871 2.134 0 4.007.52 5.607 1.564 1.603 1.024 2.928 2.523 3.992 4.43l.412-5.287h3.581v38.048c0 4.871-1.13 8.646-3.4 11.317-2.271 2.66-5.499 4.009-9.666 4.009-1.5 0-3.11-.235-4.832-.691-1.724-.456-3.252-1.054-4.59-1.805l1.168-3.704a14.1 14.1 0 0 0 3.831 1.716 15.2 15.2 0 0 0 4.352.616q4.536-.001 6.71-2.905c1.452-1.961 2.18-4.798 2.18-8.553v-4.597c-1.079 1.71-2.402 3.024-3.97 3.93-1.563.912-3.39 1.368-5.448 1.368-3.818 0-6.814-1.496-8.976-4.486-2.167-2.983-3.255-6.965-3.255-11.93zm40.2 20.916h-4.266V291.86h4.266zm0-48.968h-4.266v-6.005h4.266zm13.774 10.852.346 6.284c1.016-2.23 2.35-3.962 4.027-5.166 1.677-1.21 3.643-1.824 5.89-1.824 3.397 0 6.01 1.256 7.82 3.78 1.821 2.518 2.717 6.434 2.717 11.749v23.191h-4.248V306.72c0-4.343-.635-7.377-1.897-9.137-1.268-1.76-3.103-2.636-5.517-2.636-2.157 0-3.962.701-5.412 2.126-1.455 1.412-2.545 3.294-3.266 5.666v27.134h-4.224V291.86zm42.074 3.021q-3.978 0-6.518 3.613-2.547 3.62-2.66 8.938h17.54v-1.626c0-3.137-.731-5.75-2.21-7.822-1.476-2.075-3.525-3.103-6.152-3.103m.602 35.735c-4.11 0-7.456-1.543-10.048-4.621q-3.903-4.61-3.903-11.793v-6.313c0-4.798 1.302-8.798 3.91-11.979q3.924-4.75 9.439-4.75c3.978 0 7.077 1.413 9.283 4.246 2.197 2.837 3.3 6.65 3.3 11.434v4.171h-21.76v3.162c0 3.68.887 6.744 2.642 9.19 1.754 2.45 4.133 3.666 7.137 3.666 2.08 0 3.88-.367 5.382-1.089a11.16 11.16 0 0 0 3.897-3.132l1.725 2.99c-1.156 1.456-2.64 2.633-4.454 3.505-1.81.868-3.998 1.312-6.55 1.312"/><g fill="#fff" transform="matrix(.36 0 0 .36 30.24 21.6)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="matrix(.36 0 0 .36 30.24 21.6)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/logo_outlined.svg b/engine/logo_outlined.svg
index 7adc2826..d9470088 100644
--- a/engine/logo_outlined.svg
+++ b/engine/logo_outlined.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="414"><path stroke="#fff" stroke-linejoin="round" stroke-width="23.5" d="M523.82 188.382c-9.142-.142-19.603 1.764-19.603 1.764v17.842h10.52l-.117 7.953c0 2.946-2.92 4.427-8.747 4.427-5.831 0-10.982-2.47-15.45-7.395-4.48-4.932-6.708-12.141-6.708-21.64 0-9.519 2.176-16.537 6.536-21.065 4.35-4.524 10.05-6.794 17.064-6.794 2.946 0 5.996.476 9.168 1.445 3.174.962 5.293 1.863 6.375 2.707 1.072.867 2.09 1.277 3.056 1.277.96 0 2.513-1.122 4.66-3.392 2.153-2.263 4.082-5.693 5.782-10.267 1.694-4.598 2.543-8.122 2.543-10.621 0-2.48-.054-4.19-.164-5.092-2.379-2.603-6.767-4.666-13.168-6.2-6.39-1.53-13.552-2.289-21.476-2.289-17.438 0-31.073 5.49-40.92 16.47-9.855 10.982-14.773 25.24-14.773 42.79 0 20.607 5.035 36.227 15.103 46.868 10.085 10.64 23.327 15.953 39.743 15.953 8.827 0 16.664-.76 23.51-2.289 6.853-1.523 11.41-3.088 13.676-4.67l.68-53.137c0-3.087-8.149-4.488-17.29-4.645zm84.247-24.804c-5.431 0-9.98 2.496-13.671 7.47-3.672 4.98-5.517 11.969-5.517 20.963 0 9.013 1.754 15.914 5.27 20.722 3.508 4.823 8.117 7.225 13.835 7.225 5.715 0 10.358-2.432 13.924-7.313q5.351-7.293 5.353-20.884c0-9.054-1.846-16.023-5.524-20.89q-5.51-7.292-13.67-7.293m-.083 89.477c-15.9 0-28.868-5.203-38.89-15.61q-15.016-15.624-15.017-45.592c0-19.992 5.063-35.128 15.191-45.435 10.131-10.293 23.209-15.444 39.228-15.444 16.016 0 28.954 5.058 38.795 15.204 9.858 10.126 14.778 25.477 14.778 46.009 0 20.546-5.034 35.828-15.114 45.856-10.08 10.008-23.062 15.012-38.971 15.012m101.95-88.298v50.788c0 2.37.176 3.866.515 4.493.337.624 1.358.937 3.052.937 6.232 0 10.954-2.328 14.181-6.97 3.235-4.636 4.835-12.356 4.835-23.168 0-10.817-1.674-17.865-5-21.139-3.344-3.283-8.64-4.94-15.884-4.94zm-32.599 78.798V141.681c0-2.832.704-5.067 2.126-6.724 1.413-1.632 3.25-2.461 5.521-2.461h28.357c17.994 0 31.664 4.54 40.994 13.597 9.347 9.054 14.02 23.31 14.02 42.784 0 41.66-17.778 62.486-53.326 62.486h-29.03c-5.769 0-8.662-2.597-8.662-7.808m156.544-79.977c-5.432 0-9.994 2.496-13.678 7.47q-5.507 7.471-5.508 20.963c0 9.013 1.758 15.914 5.262 20.722 3.505 4.823 8.119 7.225 13.837 7.225 5.717 0 10.363-2.432 13.924-7.313q5.354-7.293 5.355-20.884c0-9.054-1.843-16.023-5.522-20.89-3.68-4.861-8.23-7.293-13.67-7.293m-.087 89.477q-23.86 0-38.88-15.61-15.03-15.624-15.03-45.592c0-19.992 5.065-35.128 15.191-45.435 10.139-10.293 23.209-15.444 39.233-15.444 16.02 0 28.946 5.058 38.8 15.204 9.85 10.126 14.772 25.477 14.772 46.009 0 20.546-5.037 35.828-15.115 45.856-10.076 10.008-23.07 15.012-38.971 15.012m117.69-4.17c0 2.251-5.597 3.392-16.809 3.392-11.202 0-16.815-1.141-16.815-3.392v-85.248h-20.371c-1.928 0-3.286-2.597-4.077-7.818a56 56 0 0 1-.501-7.636c0-2.592.162-5.146.501-7.636.79-5.205 2.15-7.823 4.077-7.823h73.864c1.924 0 3.277 2.617 4.078 7.823.333 2.49.505 5.043.505 7.636 0 2.608-.172 5.152-.505 7.637-.8 5.22-2.154 7.817-4.078 7.817h-19.87z"/><path fill="#414042" d="M523.82 188.382c-9.142-.142-19.603 1.764-19.603 1.764v17.842h10.52l-.117 7.953c0 2.946-2.92 4.427-8.747 4.427-5.831 0-10.982-2.47-15.45-7.395-4.48-4.932-6.708-12.141-6.708-21.64 0-9.519 2.176-16.537 6.536-21.065 4.35-4.524 10.05-6.794 17.064-6.794 2.946 0 5.996.476 9.168 1.445 3.174.962 5.293 1.863 6.375 2.707 1.072.867 2.09 1.277 3.056 1.277.96 0 2.513-1.122 4.66-3.392 2.153-2.263 4.082-5.693 5.782-10.267 1.694-4.598 2.543-8.122 2.543-10.621 0-2.48-.054-4.19-.164-5.092-2.379-2.603-6.767-4.666-13.168-6.2-6.39-1.53-13.552-2.289-21.476-2.289-17.438 0-31.073 5.49-40.92 16.47-9.855 10.982-14.773 25.24-14.773 42.79 0 20.607 5.035 36.227 15.103 46.868 10.085 10.64 23.327 15.953 39.743 15.953 8.827 0 16.664-.76 23.51-2.289 6.853-1.523 11.41-3.088 13.676-4.67l.68-53.137c0-3.087-8.149-4.488-17.29-4.645m84.247-24.804c-5.431 0-9.98 2.496-13.671 7.47-3.672 4.98-5.517 11.969-5.517 20.963 0 9.013 1.754 15.914 5.27 20.722 3.508 4.823 8.117 7.225 13.835 7.225 5.715 0 10.358-2.432 13.924-7.313q5.351-7.293 5.353-20.884c0-9.054-1.846-16.023-5.524-20.89q-5.51-7.292-13.67-7.293m-.083 89.477c-15.9 0-28.868-5.203-38.89-15.61q-15.016-15.624-15.017-45.592c0-19.992 5.063-35.128 15.191-45.435 10.131-10.293 23.209-15.444 39.228-15.444 16.016 0 28.954 5.058 38.795 15.204 9.858 10.126 14.778 25.477 14.778 46.009 0 20.546-5.034 35.828-15.114 45.856-10.08 10.008-23.062 15.012-38.971 15.012m101.95-88.298v50.788c0 2.37.176 3.866.515 4.493.337.624 1.358.937 3.052.937 6.232 0 10.954-2.328 14.181-6.97 3.235-4.636 4.835-12.356 4.835-23.168 0-10.817-1.674-17.865-5-21.139-3.344-3.283-8.64-4.94-15.884-4.94zm-32.599 78.798V141.681c0-2.832.704-5.067 2.126-6.724 1.413-1.632 3.25-2.461 5.521-2.461h28.357c17.994 0 31.664 4.54 40.994 13.597 9.347 9.054 14.02 23.31 14.02 42.784 0 41.66-17.778 62.486-53.326 62.486h-29.03c-5.769 0-8.662-2.597-8.662-7.808m156.544-79.977c-5.432 0-9.994 2.496-13.678 7.47q-5.507 7.471-5.508 20.963c0 9.013 1.758 15.914 5.262 20.722 3.505 4.823 8.119 7.225 13.837 7.225 5.717 0 10.363-2.432 13.924-7.313q5.354-7.293 5.355-20.884c0-9.054-1.843-16.023-5.522-20.89-3.68-4.861-8.23-7.293-13.67-7.293m-.087 89.477q-23.86 0-38.88-15.61-15.03-15.624-15.03-45.592c0-19.992 5.065-35.128 15.191-45.435 10.139-10.293 23.209-15.444 39.233-15.444 16.02 0 28.946 5.058 38.8 15.204 9.85 10.126 14.772 25.477 14.772 46.009 0 20.546-5.037 35.828-15.115 45.856-10.076 10.008-23.07 15.012-38.971 15.012m117.69-4.17c0 2.251-5.597 3.392-16.809 3.392-11.202 0-16.815-1.141-16.815-3.392v-85.248h-20.371c-1.928 0-3.286-2.597-4.077-7.818a56 56 0 0 1-.501-7.636c0-2.592.162-5.146.501-7.636.79-5.205 2.15-7.823 4.077-7.823h73.864c1.924 0 3.277 2.617 4.078 7.823.333 2.49.505 5.043.505 7.636 0 2.608-.172 5.152-.505 7.637-.8 5.22-2.154 7.817-4.078 7.817h-19.87z"/><path stroke="#fff" stroke-linejoin="round" stroke-width="23.5" d="M487.93 322.997c-.94 1.926-2.664 3.691-5.188 5.289-2.52 1.607-5.722 2.406-9.611 2.406-5.132 0-9.259-1.617-12.394-4.887-3.122-3.243-4.686-7.92-4.686-14.022V296.57c0-5.97 1.473-10.548 4.431-13.743 2.95-3.17 6.903-4.78 11.84-4.78 4.824 0 8.564 1.27 11.212 3.781 2.639 2.519 4.025 6.038 4.146 10.532l-.066.2h-3.94c-.14-3.443-1.14-6.101-3.022-7.979-1.871-1.861-4.655-2.803-8.33-2.803-3.72 0-6.668 1.259-8.823 3.785-2.15 2.518-3.224 6.17-3.224 10.968v15.301q.001 7.462 3.476 11.382c2.316 2.592 5.438 3.892 9.38 3.892 2.876 0 5.19-.51 6.92-1.554 1.738-1.028 2.942-2.285 3.624-3.775V308.45h-10.618v-3.704h14.873zm19.557 3.902c2.336 0 4.416-.661 6.232-2.01 1.82-1.353 3.096-3.063 3.852-5.146v-8.224h-6.756q-4.31 0-6.896 2.442c-1.726 1.617-2.581 3.637-2.581 6.037 0 2.03.534 3.696 1.616 4.981 1.08 1.289 2.59 1.92 4.533 1.92m10.715 3.068a99 99 0 0 1-.48-3.225 22 22 0 0 1-.15-2.562 14.9 14.9 0 0 1-4.483 4.675c-1.836 1.236-3.878 1.848-6.128 1.848-3.147 0-5.567-.975-7.28-2.927-1.702-1.96-2.563-4.6-2.563-7.936 0-3.523 1.237-6.35 3.72-8.448 2.48-2.098 5.85-3.147 10.09-3.147h6.643v-4.672c0-2.686-.686-4.802-2.032-6.331-1.375-1.51-3.264-2.275-5.701-2.275-2.268 0-4.139.722-5.608 2.182-1.463 1.45-2.19 3.224-2.19 5.337l-3.944-.035-.07-.206c-.11-2.866.973-5.4 3.261-7.646 2.279-2.24 5.203-3.352 8.761-3.352 3.517 0 6.347 1.069 8.509 3.2q3.224 3.227 3.226 9.21v18.645c0 1.358.064 2.677.183 3.936a25 25 0 0 0 .627 3.729zm16.905-38.108.36 5.9c1-2.112 2.339-3.739 3.998-4.896q2.498-1.711 5.874-1.711c2.296 0 4.232.668 5.794 2.02 1.562 1.347 2.714 3.387 3.446 6.127.938-2.529 2.264-4.528 3.986-5.975 1.722-1.45 3.812-2.172 6.23-2.172 3.335 0 5.923 1.35 7.755 4.05 1.841 2.705 2.759 6.856 2.759 12.464v22.207h-4.246v-22.28c0-4.663-.645-7.946-1.9-9.834-1.261-1.89-3.071-2.842-5.41-2.842-2.462 0-4.384 1.04-5.767 3.152-1.375 2.112-2.223 4.754-2.531 7.945v23.86h-4.224v-22.258c0-4.554-.639-7.812-1.945-9.759-1.299-1.946-3.107-2.912-5.427-2.912-2.218 0-4.013.677-5.358 2.02-1.353 1.349-2.315 3.195-2.899 5.538v27.369h-4.22v-38.014zm61.457 3.021q-3.966 0-6.517 3.613c-1.705 2.415-2.585 5.392-2.656 8.938h17.537v-1.626c0-3.137-.736-5.75-2.21-7.822-1.482-2.075-3.53-3.103-6.154-3.103m.598 35.735c-4.099 0-7.451-1.543-10.055-4.621q-3.895-4.61-3.896-11.793v-6.313c0-4.798 1.303-8.798 3.912-11.979 2.616-3.167 5.758-4.75 9.441-4.75 3.983 0 7.068 1.413 9.27 4.246q3.313 4.257 3.312 11.434v4.171H587.39v3.162c0 3.68.882 6.744 2.635 9.19 1.757 2.45 4.144 3.666 7.136 3.666 2.077 0 3.888-.367 5.396-1.089a11.1 11.1 0 0 0 3.877-3.132l1.728 2.99c-1.148 1.456-2.634 2.633-4.45 3.505-1.811.868-4 1.312-6.551 1.312m46.411-35.734q-3.976 0-6.528 3.613-2.54 3.62-2.652 8.938h17.54v-1.626c0-3.137-.733-5.75-2.216-7.822-1.475-2.075-3.52-3.103-6.144-3.103m.593 35.735c-4.1 0-7.446-1.543-10.045-4.621q-3.91-4.61-3.91-11.793v-6.313c0-4.798 1.309-8.798 3.913-11.979 2.623-3.167 5.766-4.75 9.45-4.75 3.975 0 7.072 1.413 9.27 4.246 2.2 2.837 3.304 6.65 3.304 11.434v4.171h-21.755v3.162q0 5.52 2.647 9.19c1.747 2.45 4.124 3.666 7.125 3.666 2.087 0 3.888-.367 5.392-1.089a11.2 11.2 0 0 0 3.894-3.132l1.717 2.99c-1.15 1.456-2.633 2.633-4.451 3.505-1.81.868-3.997 1.312-6.55 1.312m23.189-38.755.345 6.284c1.014-2.23 2.353-3.962 4.034-5.166 1.667-1.21 3.63-1.824 5.887-1.824 3.396 0 5.998 1.256 7.804 3.78 1.826 2.518 2.73 6.434 2.73 11.749v23.191h-4.249V306.72c0-4.343-.636-7.377-1.9-9.137-1.258-1.76-3.107-2.636-5.513-2.636-2.158 0-3.968.701-5.419 2.126-1.457 1.412-2.543 3.294-3.267 5.666v27.134h-4.219V291.86zm33.27 22.395c0 3.858.73 6.926 2.213 9.208 1.465 2.304 3.695 3.443 6.671 3.443 2.04 0 3.757-.544 5.167-1.657 1.405-1.113 2.514-2.662 3.336-4.627V301.79c-.79-2.025-1.874-3.66-3.244-4.92-1.368-1.24-3.102-1.863-5.186-1.863-2.97 0-5.216 1.294-6.708 3.891-1.502 2.603-2.25 5.995-2.25 10.161zm-4.262-5.195c0-5.386 1.088-9.714 3.274-12.975 2.169-3.245 5.187-4.871 9.03-4.871 2.134 0 4.007.52 5.607 1.564 1.603 1.024 2.928 2.523 3.992 4.43l.412-5.287h3.581v38.048c0 4.871-1.13 8.646-3.4 11.317-2.271 2.66-5.499 4.009-9.666 4.009-1.5 0-3.11-.235-4.832-.691-1.724-.456-3.252-1.054-4.59-1.805l1.168-3.704a14.1 14.1 0 0 0 3.831 1.716 15.2 15.2 0 0 0 4.352.616q4.536-.001 6.71-2.905c1.452-1.961 2.18-4.798 2.18-8.553v-4.597c-1.079 1.71-2.402 3.024-3.97 3.93-1.563.912-3.39 1.368-5.448 1.368-3.818 0-6.814-1.496-8.976-4.486-2.167-2.983-3.255-6.965-3.255-11.93zm40.2 20.916h-4.266V291.86h4.266zm0-48.968h-4.266v-6.005h4.266zm13.774 10.852.346 6.284c1.016-2.23 2.35-3.962 4.027-5.166 1.677-1.21 3.643-1.824 5.89-1.824 3.397 0 6.01 1.256 7.82 3.78 1.821 2.518 2.717 6.434 2.717 11.749v23.191h-4.248V306.72c0-4.343-.635-7.377-1.897-9.137-1.268-1.76-3.103-2.636-5.517-2.636-2.157 0-3.962.701-5.412 2.126-1.455 1.412-2.545 3.294-3.266 5.666v27.134h-4.224V291.86zm42.074 3.021q-3.978 0-6.518 3.613-2.547 3.62-2.66 8.938h17.54v-1.626c0-3.137-.731-5.75-2.21-7.822-1.476-2.075-3.525-3.103-6.152-3.103m.602 35.735c-4.11 0-7.456-1.543-10.048-4.621q-3.903-4.61-3.903-11.793v-6.313c0-4.798 1.302-8.798 3.91-11.979q3.924-4.75 9.439-4.75c3.978 0 7.077 1.413 9.283 4.246 2.197 2.837 3.3 6.65 3.3 11.434v4.171h-21.76v3.162c0 3.68.887 6.744 2.642 9.19 1.754 2.45 4.133 3.666 7.137 3.666 2.08 0 3.88-.367 5.382-1.089a11.16 11.16 0 0 0 3.897-3.132l1.725 2.99c-1.156 1.456-2.64 2.633-4.454 3.505-1.81.868-3.998 1.312-6.55 1.312"/><path fill="#6d6e71" d="M487.93 322.997c-.94 1.926-2.664 3.691-5.188 5.289-2.52 1.607-5.722 2.406-9.611 2.406-5.132 0-9.259-1.617-12.394-4.887-3.122-3.243-4.686-7.92-4.686-14.022V296.57c0-5.97 1.473-10.548 4.431-13.743 2.95-3.17 6.903-4.78 11.84-4.78 4.824 0 8.564 1.27 11.212 3.781 2.639 2.519 4.025 6.038 4.146 10.532l-.066.2h-3.94c-.14-3.443-1.14-6.101-3.022-7.979-1.871-1.861-4.655-2.803-8.33-2.803-3.72 0-6.668 1.259-8.823 3.785-2.15 2.518-3.224 6.17-3.224 10.968v15.301q.001 7.462 3.476 11.382c2.316 2.592 5.438 3.892 9.38 3.892 2.876 0 5.19-.51 6.92-1.554 1.738-1.028 2.942-2.285 3.624-3.775V308.45h-10.618v-3.704h14.873zm19.557 3.902c2.336 0 4.416-.661 6.232-2.01 1.82-1.353 3.096-3.063 3.852-5.146v-8.224h-6.756q-4.31 0-6.896 2.442c-1.726 1.617-2.581 3.637-2.581 6.037 0 2.03.534 3.696 1.616 4.981 1.08 1.289 2.59 1.92 4.533 1.92m10.715 3.068a99 99 0 0 1-.48-3.225 22 22 0 0 1-.15-2.562 14.9 14.9 0 0 1-4.483 4.675c-1.836 1.236-3.878 1.848-6.128 1.848-3.147 0-5.567-.975-7.28-2.927-1.702-1.96-2.563-4.6-2.563-7.936 0-3.523 1.237-6.35 3.72-8.448 2.48-2.098 5.85-3.147 10.09-3.147h6.643v-4.672c0-2.686-.686-4.802-2.032-6.331-1.375-1.51-3.264-2.275-5.701-2.275-2.268 0-4.139.722-5.608 2.182-1.463 1.45-2.19 3.224-2.19 5.337l-3.944-.035-.07-.206c-.11-2.866.973-5.4 3.261-7.646 2.279-2.24 5.203-3.352 8.761-3.352 3.517 0 6.347 1.069 8.509 3.2q3.224 3.227 3.226 9.21v18.645c0 1.358.064 2.677.183 3.936a25 25 0 0 0 .627 3.729zm16.905-38.108.36 5.9c1-2.112 2.339-3.739 3.998-4.896q2.498-1.711 5.874-1.711c2.296 0 4.232.668 5.794 2.02 1.562 1.347 2.714 3.387 3.446 6.127.938-2.529 2.264-4.528 3.986-5.975 1.722-1.45 3.812-2.172 6.23-2.172 3.335 0 5.923 1.35 7.755 4.05 1.841 2.705 2.759 6.856 2.759 12.464v22.207h-4.246v-22.28c0-4.663-.645-7.946-1.9-9.834-1.261-1.89-3.071-2.842-5.41-2.842-2.462 0-4.384 1.04-5.767 3.152-1.375 2.112-2.223 4.754-2.531 7.945v23.86h-4.224v-22.258c0-4.554-.639-7.812-1.945-9.759-1.299-1.946-3.107-2.912-5.427-2.912-2.218 0-4.013.677-5.358 2.02-1.353 1.349-2.315 3.195-2.899 5.538v27.369h-4.22v-38.014zm61.457 3.021q-3.966 0-6.517 3.613c-1.705 2.415-2.585 5.392-2.656 8.938h17.537v-1.626c0-3.137-.736-5.75-2.21-7.822-1.482-2.075-3.53-3.103-6.154-3.103m.598 35.735c-4.099 0-7.451-1.543-10.055-4.621q-3.895-4.61-3.896-11.793v-6.313c0-4.798 1.303-8.798 3.912-11.979 2.616-3.167 5.758-4.75 9.441-4.75 3.983 0 7.068 1.413 9.27 4.246q3.313 4.257 3.312 11.434v4.171H587.39v3.162c0 3.68.882 6.744 2.635 9.19 1.757 2.45 4.144 3.666 7.136 3.666 2.077 0 3.888-.367 5.396-1.089a11.1 11.1 0 0 0 3.877-3.132l1.728 2.99c-1.148 1.456-2.634 2.633-4.45 3.505-1.811.868-4 1.312-6.551 1.312m46.411-35.734q-3.976 0-6.528 3.613-2.54 3.62-2.652 8.938h17.54v-1.626c0-3.137-.733-5.75-2.216-7.822-1.475-2.075-3.52-3.103-6.144-3.103m.593 35.735c-4.1 0-7.446-1.543-10.045-4.621q-3.91-4.61-3.91-11.793v-6.313c0-4.798 1.309-8.798 3.913-11.979 2.623-3.167 5.766-4.75 9.45-4.75 3.975 0 7.072 1.413 9.27 4.246 2.2 2.837 3.304 6.65 3.304 11.434v4.171h-21.755v3.162q0 5.52 2.647 9.19c1.747 2.45 4.124 3.666 7.125 3.666 2.087 0 3.888-.367 5.392-1.089a11.2 11.2 0 0 0 3.894-3.132l1.717 2.99c-1.15 1.456-2.633 2.633-4.451 3.505-1.81.868-3.997 1.312-6.55 1.312m23.189-38.755.345 6.284c1.014-2.23 2.353-3.962 4.034-5.166 1.667-1.21 3.63-1.824 5.887-1.824 3.396 0 5.998 1.256 7.804 3.78 1.826 2.518 2.73 6.434 2.73 11.749v23.191h-4.249V306.72c0-4.343-.636-7.377-1.9-9.137-1.258-1.76-3.107-2.636-5.513-2.636-2.158 0-3.968.701-5.419 2.126-1.457 1.412-2.543 3.294-3.267 5.666v27.134h-4.219V291.86zm33.27 22.395c0 3.858.73 6.926 2.213 9.208 1.465 2.304 3.695 3.443 6.671 3.443 2.04 0 3.757-.544 5.167-1.657 1.405-1.113 2.514-2.662 3.336-4.627V301.79c-.79-2.025-1.874-3.66-3.244-4.92-1.368-1.24-3.102-1.863-5.186-1.863-2.97 0-5.216 1.294-6.708 3.891-1.502 2.603-2.25 5.995-2.25 10.161zm-4.262-5.195c0-5.386 1.088-9.714 3.274-12.975 2.169-3.245 5.187-4.871 9.03-4.871 2.134 0 4.007.52 5.607 1.564 1.603 1.024 2.928 2.523 3.992 4.43l.412-5.287h3.581v38.048c0 4.871-1.13 8.646-3.4 11.317-2.271 2.66-5.499 4.009-9.666 4.009-1.5 0-3.11-.235-4.832-.691-1.724-.456-3.252-1.054-4.59-1.805l1.168-3.704a14.1 14.1 0 0 0 3.831 1.716 15.2 15.2 0 0 0 4.352.616q4.536-.001 6.71-2.905c1.452-1.961 2.18-4.798 2.18-8.553v-4.597c-1.079 1.71-2.402 3.024-3.97 3.93-1.563.912-3.39 1.368-5.448 1.368-3.818 0-6.814-1.496-8.976-4.486-2.167-2.983-3.255-6.965-3.255-11.93zm40.2 20.916h-4.266V291.86h4.266zm0-48.968h-4.266v-6.005h4.266zm13.774 10.852.346 6.284c1.016-2.23 2.35-3.962 4.027-5.166 1.677-1.21 3.643-1.824 5.89-1.824 3.397 0 6.01 1.256 7.82 3.78 1.821 2.518 2.717 6.434 2.717 11.749v23.191h-4.248V306.72c0-4.343-.635-7.377-1.897-9.137-1.268-1.76-3.103-2.636-5.517-2.636-2.157 0-3.962.701-5.412 2.126-1.455 1.412-2.545 3.294-3.266 5.666v27.134h-4.224V291.86zm42.074 3.021q-3.978 0-6.518 3.613-2.547 3.62-2.66 8.938h17.54v-1.626c0-3.137-.731-5.75-2.21-7.822-1.476-2.075-3.525-3.103-6.152-3.103m.602 35.735c-4.11 0-7.456-1.543-10.048-4.621q-3.903-4.61-3.903-11.793v-6.313c0-4.798 1.302-8.798 3.91-11.979q3.924-4.75 9.439-4.75c3.978 0 7.077 1.413 9.283 4.246 2.197 2.837 3.3 6.65 3.3 11.434v4.171h-21.76v3.162c0 3.68.887 6.744 2.642 9.19 1.754 2.45 4.133 3.666 7.137 3.666 2.08 0 3.88-.367 5.382-1.089a11.16 11.16 0 0 0 3.897-3.132l1.725 2.99c-1.156 1.456-2.64 2.633-4.454 3.505-1.81.868-3.998 1.312-6.55 1.312"/><g fill="#fff" transform="translate(30.492 21.054)scale(.363)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="none" stroke="#fff" stroke-linejoin="round" stroke-width="64" d="M105 745c0 276 813 276 814 0V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81v318z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(30.492 21.054)scale(.363)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="414"><path stroke="#fff" stroke-linejoin="round" stroke-width="23.5" d="M523.82 188.382c-9.142-.142-19.603 1.764-19.603 1.764v17.842h10.52l-.117 7.953c0 2.946-2.92 4.427-8.747 4.427-5.831 0-10.982-2.47-15.45-7.395-4.48-4.932-6.708-12.141-6.708-21.64 0-9.519 2.176-16.537 6.536-21.065 4.35-4.524 10.05-6.794 17.064-6.794 2.946 0 5.996.476 9.168 1.445 3.174.962 5.293 1.863 6.375 2.707 1.072.867 2.09 1.277 3.056 1.277.96 0 2.513-1.122 4.66-3.392 2.153-2.263 4.082-5.693 5.782-10.267 1.694-4.598 2.543-8.122 2.543-10.621 0-2.48-.054-4.19-.164-5.092-2.379-2.603-6.767-4.666-13.168-6.2-6.39-1.53-13.552-2.289-21.476-2.289-17.438 0-31.073 5.49-40.92 16.47-9.855 10.982-14.773 25.24-14.773 42.79 0 20.607 5.035 36.227 15.103 46.868 10.085 10.64 23.327 15.953 39.743 15.953 8.827 0 16.664-.76 23.51-2.289 6.853-1.523 11.41-3.088 13.676-4.67l.68-53.137c0-3.087-8.149-4.488-17.29-4.645zm84.247-24.804c-5.431 0-9.98 2.496-13.671 7.47-3.672 4.98-5.517 11.969-5.517 20.963 0 9.013 1.754 15.914 5.27 20.722 3.508 4.823 8.117 7.225 13.835 7.225 5.715 0 10.358-2.432 13.924-7.313q5.351-7.293 5.353-20.884c0-9.054-1.846-16.023-5.524-20.89q-5.51-7.292-13.67-7.293m-.083 89.477c-15.9 0-28.868-5.203-38.89-15.61q-15.016-15.624-15.017-45.592c0-19.992 5.063-35.128 15.191-45.435 10.131-10.293 23.209-15.444 39.228-15.444 16.016 0 28.954 5.058 38.795 15.204 9.858 10.126 14.778 25.477 14.778 46.009 0 20.546-5.034 35.828-15.114 45.856-10.08 10.008-23.062 15.012-38.971 15.012m101.95-88.298v50.788c0 2.37.176 3.866.515 4.493.337.624 1.358.937 3.052.937 6.232 0 10.954-2.328 14.181-6.97 3.235-4.636 4.835-12.356 4.835-23.168 0-10.817-1.674-17.865-5-21.139-3.344-3.283-8.64-4.94-15.884-4.94zm-32.599 78.798V141.681c0-2.832.704-5.067 2.126-6.724 1.413-1.632 3.25-2.461 5.521-2.461h28.357c17.994 0 31.664 4.54 40.994 13.597 9.347 9.054 14.02 23.31 14.02 42.784 0 41.66-17.778 62.486-53.326 62.486h-29.03c-5.769 0-8.662-2.597-8.662-7.808m156.544-79.977c-5.432 0-9.994 2.496-13.678 7.47q-5.507 7.471-5.508 20.963c0 9.013 1.758 15.914 5.262 20.722 3.505 4.823 8.119 7.225 13.837 7.225 5.717 0 10.363-2.432 13.924-7.313q5.354-7.293 5.355-20.884c0-9.054-1.843-16.023-5.522-20.89-3.68-4.861-8.23-7.293-13.67-7.293m-.087 89.477q-23.86 0-38.88-15.61-15.03-15.624-15.03-45.592c0-19.992 5.065-35.128 15.191-45.435 10.139-10.293 23.209-15.444 39.233-15.444 16.02 0 28.946 5.058 38.8 15.204 9.85 10.126 14.772 25.477 14.772 46.009 0 20.546-5.037 35.828-15.115 45.856-10.076 10.008-23.07 15.012-38.971 15.012m117.69-4.17c0 2.251-5.597 3.392-16.809 3.392-11.202 0-16.815-1.141-16.815-3.392v-85.248h-20.371c-1.928 0-3.286-2.597-4.077-7.818a56 56 0 0 1-.501-7.636c0-2.592.162-5.146.501-7.636.79-5.205 2.15-7.823 4.077-7.823h73.864c1.924 0 3.277 2.617 4.078 7.823.333 2.49.505 5.043.505 7.636 0 2.608-.172 5.152-.505 7.637-.8 5.22-2.154 7.817-4.078 7.817h-19.87z"/><path fill="#414042" d="M523.82 188.382c-9.142-.142-19.603 1.764-19.603 1.764v17.842h10.52l-.117 7.953c0 2.946-2.92 4.427-8.747 4.427-5.831 0-10.982-2.47-15.45-7.395-4.48-4.932-6.708-12.141-6.708-21.64 0-9.519 2.176-16.537 6.536-21.065 4.35-4.524 10.05-6.794 17.064-6.794 2.946 0 5.996.476 9.168 1.445 3.174.962 5.293 1.863 6.375 2.707 1.072.867 2.09 1.277 3.056 1.277.96 0 2.513-1.122 4.66-3.392 2.153-2.263 4.082-5.693 5.782-10.267 1.694-4.598 2.543-8.122 2.543-10.621 0-2.48-.054-4.19-.164-5.092-2.379-2.603-6.767-4.666-13.168-6.2-6.39-1.53-13.552-2.289-21.476-2.289-17.438 0-31.073 5.49-40.92 16.47-9.855 10.982-14.773 25.24-14.773 42.79 0 20.607 5.035 36.227 15.103 46.868 10.085 10.64 23.327 15.953 39.743 15.953 8.827 0 16.664-.76 23.51-2.289 6.853-1.523 11.41-3.088 13.676-4.67l.68-53.137c0-3.087-8.149-4.488-17.29-4.645m84.247-24.804c-5.431 0-9.98 2.496-13.671 7.47-3.672 4.98-5.517 11.969-5.517 20.963 0 9.013 1.754 15.914 5.27 20.722 3.508 4.823 8.117 7.225 13.835 7.225 5.715 0 10.358-2.432 13.924-7.313q5.351-7.293 5.353-20.884c0-9.054-1.846-16.023-5.524-20.89q-5.51-7.292-13.67-7.293m-.083 89.477c-15.9 0-28.868-5.203-38.89-15.61q-15.016-15.624-15.017-45.592c0-19.992 5.063-35.128 15.191-45.435 10.131-10.293 23.209-15.444 39.228-15.444 16.016 0 28.954 5.058 38.795 15.204 9.858 10.126 14.778 25.477 14.778 46.009 0 20.546-5.034 35.828-15.114 45.856-10.08 10.008-23.062 15.012-38.971 15.012m101.95-88.298v50.788c0 2.37.176 3.866.515 4.493.337.624 1.358.937 3.052.937 6.232 0 10.954-2.328 14.181-6.97 3.235-4.636 4.835-12.356 4.835-23.168 0-10.817-1.674-17.865-5-21.139-3.344-3.283-8.64-4.94-15.884-4.94zm-32.599 78.798V141.681c0-2.832.704-5.067 2.126-6.724 1.413-1.632 3.25-2.461 5.521-2.461h28.357c17.994 0 31.664 4.54 40.994 13.597 9.347 9.054 14.02 23.31 14.02 42.784 0 41.66-17.778 62.486-53.326 62.486h-29.03c-5.769 0-8.662-2.597-8.662-7.808m156.544-79.977c-5.432 0-9.994 2.496-13.678 7.47q-5.507 7.471-5.508 20.963c0 9.013 1.758 15.914 5.262 20.722 3.505 4.823 8.119 7.225 13.837 7.225 5.717 0 10.363-2.432 13.924-7.313q5.354-7.293 5.355-20.884c0-9.054-1.843-16.023-5.522-20.89-3.68-4.861-8.23-7.293-13.67-7.293m-.087 89.477q-23.86 0-38.88-15.61-15.03-15.624-15.03-45.592c0-19.992 5.065-35.128 15.191-45.435 10.139-10.293 23.209-15.444 39.233-15.444 16.02 0 28.946 5.058 38.8 15.204 9.85 10.126 14.772 25.477 14.772 46.009 0 20.546-5.037 35.828-15.115 45.856-10.076 10.008-23.07 15.012-38.971 15.012m117.69-4.17c0 2.251-5.597 3.392-16.809 3.392-11.202 0-16.815-1.141-16.815-3.392v-85.248h-20.371c-1.928 0-3.286-2.597-4.077-7.818a56 56 0 0 1-.501-7.636c0-2.592.162-5.146.501-7.636.79-5.205 2.15-7.823 4.077-7.823h73.864c1.924 0 3.277 2.617 4.078 7.823.333 2.49.505 5.043.505 7.636 0 2.608-.172 5.152-.505 7.637-.8 5.22-2.154 7.817-4.078 7.817h-19.87z"/><path stroke="#fff" stroke-linejoin="round" stroke-width="23.5" d="M487.93 322.997c-.94 1.926-2.664 3.691-5.188 5.289-2.52 1.607-5.722 2.406-9.611 2.406-5.132 0-9.259-1.617-12.394-4.887-3.122-3.243-4.686-7.92-4.686-14.022V296.57c0-5.97 1.473-10.548 4.431-13.743 2.95-3.17 6.903-4.78 11.84-4.78 4.824 0 8.564 1.27 11.212 3.781 2.639 2.519 4.025 6.038 4.146 10.532l-.066.2h-3.94c-.14-3.443-1.14-6.101-3.022-7.979-1.871-1.861-4.655-2.803-8.33-2.803-3.72 0-6.668 1.259-8.823 3.785-2.15 2.518-3.224 6.17-3.224 10.968v15.301q.001 7.462 3.476 11.382c2.316 2.592 5.438 3.892 9.38 3.892 2.876 0 5.19-.51 6.92-1.554 1.738-1.028 2.942-2.285 3.624-3.775V308.45h-10.618v-3.704h14.873zm19.557 3.902c2.336 0 4.416-.661 6.232-2.01 1.82-1.353 3.096-3.063 3.852-5.146v-8.224h-6.756q-4.31 0-6.896 2.442c-1.726 1.617-2.581 3.637-2.581 6.037 0 2.03.534 3.696 1.616 4.981 1.08 1.289 2.59 1.92 4.533 1.92m10.715 3.068a99 99 0 0 1-.48-3.225 22 22 0 0 1-.15-2.562 14.9 14.9 0 0 1-4.483 4.675c-1.836 1.236-3.878 1.848-6.128 1.848-3.147 0-5.567-.975-7.28-2.927-1.702-1.96-2.563-4.6-2.563-7.936 0-3.523 1.237-6.35 3.72-8.448 2.48-2.098 5.85-3.147 10.09-3.147h6.643v-4.672c0-2.686-.686-4.802-2.032-6.331-1.375-1.51-3.264-2.275-5.701-2.275-2.268 0-4.139.722-5.608 2.182-1.463 1.45-2.19 3.224-2.19 5.337l-3.944-.035-.07-.206c-.11-2.866.973-5.4 3.261-7.646 2.279-2.24 5.203-3.352 8.761-3.352 3.517 0 6.347 1.069 8.509 3.2q3.224 3.227 3.226 9.21v18.645c0 1.358.064 2.677.183 3.936a25 25 0 0 0 .627 3.729zm16.905-38.108.36 5.9c1-2.112 2.339-3.739 3.998-4.896q2.498-1.711 5.874-1.711c2.296 0 4.232.668 5.794 2.02 1.562 1.347 2.714 3.387 3.446 6.127.938-2.529 2.264-4.528 3.986-5.975 1.722-1.45 3.812-2.172 6.23-2.172 3.335 0 5.923 1.35 7.755 4.05 1.841 2.705 2.759 6.856 2.759 12.464v22.207h-4.246v-22.28c0-4.663-.645-7.946-1.9-9.834-1.261-1.89-3.071-2.842-5.41-2.842-2.462 0-4.384 1.04-5.767 3.152-1.375 2.112-2.223 4.754-2.531 7.945v23.86h-4.224v-22.258c0-4.554-.639-7.812-1.945-9.759-1.299-1.946-3.107-2.912-5.427-2.912-2.218 0-4.013.677-5.358 2.02-1.353 1.349-2.315 3.195-2.899 5.538v27.369h-4.22v-38.014zm61.457 3.021q-3.966 0-6.517 3.613c-1.705 2.415-2.585 5.392-2.656 8.938h17.537v-1.626c0-3.137-.736-5.75-2.21-7.822-1.482-2.075-3.53-3.103-6.154-3.103m.598 35.735c-4.099 0-7.451-1.543-10.055-4.621q-3.895-4.61-3.896-11.793v-6.313c0-4.798 1.303-8.798 3.912-11.979 2.616-3.167 5.758-4.75 9.441-4.75 3.983 0 7.068 1.413 9.27 4.246q3.313 4.257 3.312 11.434v4.171H587.39v3.162c0 3.68.882 6.744 2.635 9.19 1.757 2.45 4.144 3.666 7.136 3.666 2.077 0 3.888-.367 5.396-1.089a11.1 11.1 0 0 0 3.877-3.132l1.728 2.99c-1.148 1.456-2.634 2.633-4.45 3.505-1.811.868-4 1.312-6.551 1.312m46.411-35.734q-3.976 0-6.528 3.613-2.54 3.62-2.652 8.938h17.54v-1.626c0-3.137-.733-5.75-2.216-7.822-1.475-2.075-3.52-3.103-6.144-3.103m.593 35.735c-4.1 0-7.446-1.543-10.045-4.621q-3.91-4.61-3.91-11.793v-6.313c0-4.798 1.309-8.798 3.913-11.979 2.623-3.167 5.766-4.75 9.45-4.75 3.975 0 7.072 1.413 9.27 4.246 2.2 2.837 3.304 6.65 3.304 11.434v4.171h-21.755v3.162q0 5.52 2.647 9.19c1.747 2.45 4.124 3.666 7.125 3.666 2.087 0 3.888-.367 5.392-1.089a11.2 11.2 0 0 0 3.894-3.132l1.717 2.99c-1.15 1.456-2.633 2.633-4.451 3.505-1.81.868-3.997 1.312-6.55 1.312m23.189-38.755.345 6.284c1.014-2.23 2.353-3.962 4.034-5.166 1.667-1.21 3.63-1.824 5.887-1.824 3.396 0 5.998 1.256 7.804 3.78 1.826 2.518 2.73 6.434 2.73 11.749v23.191h-4.249V306.72c0-4.343-.636-7.377-1.9-9.137-1.258-1.76-3.107-2.636-5.513-2.636-2.158 0-3.968.701-5.419 2.126-1.457 1.412-2.543 3.294-3.267 5.666v27.134h-4.219V291.86zm33.27 22.395c0 3.858.73 6.926 2.213 9.208 1.465 2.304 3.695 3.443 6.671 3.443 2.04 0 3.757-.544 5.167-1.657 1.405-1.113 2.514-2.662 3.336-4.627V301.79c-.79-2.025-1.874-3.66-3.244-4.92-1.368-1.24-3.102-1.863-5.186-1.863-2.97 0-5.216 1.294-6.708 3.891-1.502 2.603-2.25 5.995-2.25 10.161zm-4.262-5.195c0-5.386 1.088-9.714 3.274-12.975 2.169-3.245 5.187-4.871 9.03-4.871 2.134 0 4.007.52 5.607 1.564 1.603 1.024 2.928 2.523 3.992 4.43l.412-5.287h3.581v38.048c0 4.871-1.13 8.646-3.4 11.317-2.271 2.66-5.499 4.009-9.666 4.009-1.5 0-3.11-.235-4.832-.691-1.724-.456-3.252-1.054-4.59-1.805l1.168-3.704a14.1 14.1 0 0 0 3.831 1.716 15.2 15.2 0 0 0 4.352.616q4.536-.001 6.71-2.905c1.452-1.961 2.18-4.798 2.18-8.553v-4.597c-1.079 1.71-2.402 3.024-3.97 3.93-1.563.912-3.39 1.368-5.448 1.368-3.818 0-6.814-1.496-8.976-4.486-2.167-2.983-3.255-6.965-3.255-11.93zm40.2 20.916h-4.266V291.86h4.266zm0-48.968h-4.266v-6.005h4.266zm13.774 10.852.346 6.284c1.016-2.23 2.35-3.962 4.027-5.166 1.677-1.21 3.643-1.824 5.89-1.824 3.397 0 6.01 1.256 7.82 3.78 1.821 2.518 2.717 6.434 2.717 11.749v23.191h-4.248V306.72c0-4.343-.635-7.377-1.897-9.137-1.268-1.76-3.103-2.636-5.517-2.636-2.157 0-3.962.701-5.412 2.126-1.455 1.412-2.545 3.294-3.266 5.666v27.134h-4.224V291.86zm42.074 3.021q-3.978 0-6.518 3.613-2.547 3.62-2.66 8.938h17.54v-1.626c0-3.137-.731-5.75-2.21-7.822-1.476-2.075-3.525-3.103-6.152-3.103m.602 35.735c-4.11 0-7.456-1.543-10.048-4.621q-3.903-4.61-3.903-11.793v-6.313c0-4.798 1.302-8.798 3.91-11.979q3.924-4.75 9.439-4.75c3.978 0 7.077 1.413 9.283 4.246 2.197 2.837 3.3 6.65 3.3 11.434v4.171h-21.76v3.162c0 3.68.887 6.744 2.642 9.19 1.754 2.45 4.133 3.666 7.137 3.666 2.08 0 3.88-.367 5.382-1.089a11.16 11.16 0 0 0 3.897-3.132l1.725 2.99c-1.156 1.456-2.64 2.633-4.454 3.505-1.81.868-3.998 1.312-6.55 1.312"/><path fill="#6d6e71" d="M487.93 322.997c-.94 1.926-2.664 3.691-5.188 5.289-2.52 1.607-5.722 2.406-9.611 2.406-5.132 0-9.259-1.617-12.394-4.887-3.122-3.243-4.686-7.92-4.686-14.022V296.57c0-5.97 1.473-10.548 4.431-13.743 2.95-3.17 6.903-4.78 11.84-4.78 4.824 0 8.564 1.27 11.212 3.781 2.639 2.519 4.025 6.038 4.146 10.532l-.066.2h-3.94c-.14-3.443-1.14-6.101-3.022-7.979-1.871-1.861-4.655-2.803-8.33-2.803-3.72 0-6.668 1.259-8.823 3.785-2.15 2.518-3.224 6.17-3.224 10.968v15.301q.001 7.462 3.476 11.382c2.316 2.592 5.438 3.892 9.38 3.892 2.876 0 5.19-.51 6.92-1.554 1.738-1.028 2.942-2.285 3.624-3.775V308.45h-10.618v-3.704h14.873zm19.557 3.902c2.336 0 4.416-.661 6.232-2.01 1.82-1.353 3.096-3.063 3.852-5.146v-8.224h-6.756q-4.31 0-6.896 2.442c-1.726 1.617-2.581 3.637-2.581 6.037 0 2.03.534 3.696 1.616 4.981 1.08 1.289 2.59 1.92 4.533 1.92m10.715 3.068a99 99 0 0 1-.48-3.225 22 22 0 0 1-.15-2.562 14.9 14.9 0 0 1-4.483 4.675c-1.836 1.236-3.878 1.848-6.128 1.848-3.147 0-5.567-.975-7.28-2.927-1.702-1.96-2.563-4.6-2.563-7.936 0-3.523 1.237-6.35 3.72-8.448 2.48-2.098 5.85-3.147 10.09-3.147h6.643v-4.672c0-2.686-.686-4.802-2.032-6.331-1.375-1.51-3.264-2.275-5.701-2.275-2.268 0-4.139.722-5.608 2.182-1.463 1.45-2.19 3.224-2.19 5.337l-3.944-.035-.07-.206c-.11-2.866.973-5.4 3.261-7.646 2.279-2.24 5.203-3.352 8.761-3.352 3.517 0 6.347 1.069 8.509 3.2q3.224 3.227 3.226 9.21v18.645c0 1.358.064 2.677.183 3.936a25 25 0 0 0 .627 3.729zm16.905-38.108.36 5.9c1-2.112 2.339-3.739 3.998-4.896q2.498-1.711 5.874-1.711c2.296 0 4.232.668 5.794 2.02 1.562 1.347 2.714 3.387 3.446 6.127.938-2.529 2.264-4.528 3.986-5.975 1.722-1.45 3.812-2.172 6.23-2.172 3.335 0 5.923 1.35 7.755 4.05 1.841 2.705 2.759 6.856 2.759 12.464v22.207h-4.246v-22.28c0-4.663-.645-7.946-1.9-9.834-1.261-1.89-3.071-2.842-5.41-2.842-2.462 0-4.384 1.04-5.767 3.152-1.375 2.112-2.223 4.754-2.531 7.945v23.86h-4.224v-22.258c0-4.554-.639-7.812-1.945-9.759-1.299-1.946-3.107-2.912-5.427-2.912-2.218 0-4.013.677-5.358 2.02-1.353 1.349-2.315 3.195-2.899 5.538v27.369h-4.22v-38.014zm61.457 3.021q-3.966 0-6.517 3.613c-1.705 2.415-2.585 5.392-2.656 8.938h17.537v-1.626c0-3.137-.736-5.75-2.21-7.822-1.482-2.075-3.53-3.103-6.154-3.103m.598 35.735c-4.099 0-7.451-1.543-10.055-4.621q-3.895-4.61-3.896-11.793v-6.313c0-4.798 1.303-8.798 3.912-11.979 2.616-3.167 5.758-4.75 9.441-4.75 3.983 0 7.068 1.413 9.27 4.246q3.313 4.257 3.312 11.434v4.171H587.39v3.162c0 3.68.882 6.744 2.635 9.19 1.757 2.45 4.144 3.666 7.136 3.666 2.077 0 3.888-.367 5.396-1.089a11.1 11.1 0 0 0 3.877-3.132l1.728 2.99c-1.148 1.456-2.634 2.633-4.45 3.505-1.811.868-4 1.312-6.551 1.312m46.411-35.734q-3.976 0-6.528 3.613-2.54 3.62-2.652 8.938h17.54v-1.626c0-3.137-.733-5.75-2.216-7.822-1.475-2.075-3.52-3.103-6.144-3.103m.593 35.735c-4.1 0-7.446-1.543-10.045-4.621q-3.91-4.61-3.91-11.793v-6.313c0-4.798 1.309-8.798 3.913-11.979 2.623-3.167 5.766-4.75 9.45-4.75 3.975 0 7.072 1.413 9.27 4.246 2.2 2.837 3.304 6.65 3.304 11.434v4.171h-21.755v3.162q0 5.52 2.647 9.19c1.747 2.45 4.124 3.666 7.125 3.666 2.087 0 3.888-.367 5.392-1.089a11.2 11.2 0 0 0 3.894-3.132l1.717 2.99c-1.15 1.456-2.633 2.633-4.451 3.505-1.81.868-3.997 1.312-6.55 1.312m23.189-38.755.345 6.284c1.014-2.23 2.353-3.962 4.034-5.166 1.667-1.21 3.63-1.824 5.887-1.824 3.396 0 5.998 1.256 7.804 3.78 1.826 2.518 2.73 6.434 2.73 11.749v23.191h-4.249V306.72c0-4.343-.636-7.377-1.9-9.137-1.258-1.76-3.107-2.636-5.513-2.636-2.158 0-3.968.701-5.419 2.126-1.457 1.412-2.543 3.294-3.267 5.666v27.134h-4.219V291.86zm33.27 22.395c0 3.858.73 6.926 2.213 9.208 1.465 2.304 3.695 3.443 6.671 3.443 2.04 0 3.757-.544 5.167-1.657 1.405-1.113 2.514-2.662 3.336-4.627V301.79c-.79-2.025-1.874-3.66-3.244-4.92-1.368-1.24-3.102-1.863-5.186-1.863-2.97 0-5.216 1.294-6.708 3.891-1.502 2.603-2.25 5.995-2.25 10.161zm-4.262-5.195c0-5.386 1.088-9.714 3.274-12.975 2.169-3.245 5.187-4.871 9.03-4.871 2.134 0 4.007.52 5.607 1.564 1.603 1.024 2.928 2.523 3.992 4.43l.412-5.287h3.581v38.048c0 4.871-1.13 8.646-3.4 11.317-2.271 2.66-5.499 4.009-9.666 4.009-1.5 0-3.11-.235-4.832-.691-1.724-.456-3.252-1.054-4.59-1.805l1.168-3.704a14.1 14.1 0 0 0 3.831 1.716 15.2 15.2 0 0 0 4.352.616q4.536-.001 6.71-2.905c1.452-1.961 2.18-4.798 2.18-8.553v-4.597c-1.079 1.71-2.402 3.024-3.97 3.93-1.563.912-3.39 1.368-5.448 1.368-3.818 0-6.814-1.496-8.976-4.486-2.167-2.983-3.255-6.965-3.255-11.93zm40.2 20.916h-4.266V291.86h4.266zm0-48.968h-4.266v-6.005h4.266zm13.774 10.852.346 6.284c1.016-2.23 2.35-3.962 4.027-5.166 1.677-1.21 3.643-1.824 5.89-1.824 3.397 0 6.01 1.256 7.82 3.78 1.821 2.518 2.717 6.434 2.717 11.749v23.191h-4.248V306.72c0-4.343-.635-7.377-1.897-9.137-1.268-1.76-3.103-2.636-5.517-2.636-2.157 0-3.962.701-5.412 2.126-1.455 1.412-2.545 3.294-3.266 5.666v27.134h-4.224V291.86zm42.074 3.021q-3.978 0-6.518 3.613-2.547 3.62-2.66 8.938h17.54v-1.626c0-3.137-.731-5.75-2.21-7.822-1.476-2.075-3.525-3.103-6.152-3.103m.602 35.735c-4.11 0-7.456-1.543-10.048-4.621q-3.903-4.61-3.903-11.793v-6.313c0-4.798 1.302-8.798 3.91-11.979q3.924-4.75 9.439-4.75c3.978 0 7.077 1.413 9.283 4.246 2.197 2.837 3.3 6.65 3.3 11.434v4.171h-21.76v3.162c0 3.68.887 6.744 2.642 9.19 1.754 2.45 4.133 3.666 7.137 3.666 2.08 0 3.88-.367 5.382-1.089a11.16 11.16 0 0 0 3.897-3.132l1.725 2.99c-1.156 1.456-2.64 2.633-4.454 3.505-1.81.868-3.998 1.312-6.55 1.312"/><g fill="#fff" transform="translate(30.492 21.054)scale(.363)"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="none" stroke="#fff" stroke-linejoin="round" stroke-width="64" d="M105 745c0 276 813 276 814 0V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81v318z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042" transform="translate(30.492 21.054)scale(.363)"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g></svg>
diff --git a/engine/main/SCsub b/engine/main/SCsub
index 71bee465..18e6a7ba 100644
--- a/engine/main/SCsub
+++ b/engine/main/SCsub
@@ -17,7 +17,6 @@ if env["steamapi"] and env.editor_build:
 if env["tests"]:
     env_main.Append(CPPDEFINES=["TESTS_ENABLED"])
 
-env_main.Depends("#main/splash.gen.h", "#main/splash.png")
 env_main.CommandNoCache(
     "#main/splash.gen.h",
     "#main/splash.png",
@@ -25,14 +24,12 @@ env_main.CommandNoCache(
 )
 
 if env_main.editor_build and not env_main["no_editor_splash"]:
-    env_main.Depends("#main/splash_editor.gen.h", "#main/splash_editor.png")
     env_main.CommandNoCache(
         "#main/splash_editor.gen.h",
         "#main/splash_editor.png",
         env.Run(main_builders.make_splash_editor),
     )
 
-env_main.Depends("#main/app_icon.gen.h", "#main/app_icon.png")
 env_main.CommandNoCache(
     "#main/app_icon.gen.h",
     "#main/app_icon.png",
diff --git a/engine/main/main.cpp b/engine/main/main.cpp
index 10064b35..25ed1404 100644
--- a/engine/main/main.cpp
+++ b/engine/main/main.cpp
@@ -72,24 +72,36 @@
 #include "servers/display_server.h"
 #include "servers/movie_writer/movie_writer.h"
 #include "servers/movie_writer/movie_writer_mjpeg.h"
-#include "servers/navigation_server_3d.h"
-#include "servers/navigation_server_3d_dummy.h"
 #include "servers/register_server_types.h"
 #include "servers/rendering/rendering_server_default.h"
 #include "servers/text/text_server_dummy.h"
 #include "servers/text_server.h"
 
 // 2D
+#ifndef NAVIGATION_2D_DISABLED
 #include "servers/navigation_server_2d.h"
 #include "servers/navigation_server_2d_dummy.h"
+#endif // NAVIGATION_2D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
 #include "servers/physics_server_2d.h"
 #include "servers/physics_server_2d_dummy.h"
+#endif // PHYSICS_2D_DISABLED
 
-#ifndef _3D_DISABLED
+// 3D
+#ifndef NAVIGATION_3D_DISABLED
+#include "servers/navigation_server_3d.h"
+#include "servers/navigation_server_3d_dummy.h"
+#endif // NAVIGATION_3D_DISABLED
+
+#ifndef PHYSICS_3D_DISABLED
 #include "servers/physics_server_3d.h"
 #include "servers/physics_server_3d_dummy.h"
+#endif // PHYSICS_3D_DISABLED
+
+#ifndef XR_DISABLED
 #include "servers/xr_server.h"
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 #ifdef TESTS_ENABLED
 #include "tests/test_main.h"
@@ -164,13 +176,17 @@ static DisplayServer *display_server = nullptr;
 static RenderingServer *rendering_server = nullptr;
 static TextServerManager *tsman = nullptr;
 static ThemeDB *theme_db = nullptr;
+#ifndef PHYSICS_2D_DISABLED
 static PhysicsServer2DManager *physics_server_2d_manager = nullptr;
 static PhysicsServer2D *physics_server_2d = nullptr;
-#ifndef _3D_DISABLED
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 static PhysicsServer3DManager *physics_server_3d_manager = nullptr;
 static PhysicsServer3D *physics_server_3d = nullptr;
+#endif // PHYSICS_3D_DISABLED
+#ifndef XR_DISABLED
 static XRServer *xr_server = nullptr;
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 // We error out if setup2() doesn't turn this true
 static bool _start_success = false;
 
@@ -186,6 +202,8 @@ static int audio_driver_idx = -1;
 
 // Engine config/tools
 
+static DisplayServer::AccessibilityMode accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO;
+static bool accessibility_mode_set = false;
 static bool single_window = false;
 static bool editor = false;
 static bool project_manager = false;
@@ -228,6 +246,12 @@ static bool init_use_custom_pos = false;
 static bool init_use_custom_screen = false;
 static Vector2 init_custom_pos;
 static int64_t init_embed_parent_window_id = 0;
+#ifdef TOOLS_ENABLED
+static bool init_display_scale_found = false;
+static int init_display_scale = 0;
+static float init_custom_scale = 1.0;
+static bool init_expand_to_title = false;
+#endif
 static bool use_custom_res = true;
 static bool force_res = false;
 
@@ -240,6 +264,7 @@ static bool debug_paths = false;
 static bool debug_navigation = false;
 static bool debug_avoidance = false;
 static bool debug_canvas_item_redraw = false;
+static bool debug_mute_audio = false;
 #endif
 static int max_fps = -1;
 static int frame_delay = 0;
@@ -286,11 +311,11 @@ static String unescape_cmdline(const String &p_str) {
 }
 
 static String get_full_version_string() {
-	String hash = String(VERSION_HASH);
+	String hash = String(GODOT_VERSION_HASH);
 	if (!hash.is_empty()) {
 		hash = "." + hash.left(9);
 	}
-	return String(VERSION_FULL_BUILD) + hash;
+	return String(GODOT_VERSION_FULL_BUILD) + hash;
 }
 
 #if defined(TOOLS_ENABLED) && defined(MODULE_GDSCRIPT_ENABLED)
@@ -320,7 +345,7 @@ static Vector<String> get_files_with_extension(const String &p_root, const Strin
 
 // FIXME: Could maybe be moved to have less code in main.cpp.
 void initialize_physics() {
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	/// 3D Physics Server
 	physics_server_3d = PhysicsServer3DManager::get_singleton()->new_server(
 			GLOBAL_GET(PhysicsServer3DManager::setting_property_name));
@@ -338,8 +363,9 @@ void initialize_physics() {
 	// Should be impossible, but make sure it's not null.
 	ERR_FAIL_NULL_MSG(physics_server_3d, "Failed to initialize PhysicsServer3D.");
 	physics_server_3d->init();
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
 	// 2D Physics server
 	physics_server_2d = PhysicsServer2DManager::get_singleton()->new_server(
 			GLOBAL_GET(PhysicsServer2DManager::get_singleton()->setting_property_name));
@@ -357,16 +383,19 @@ void initialize_physics() {
 	// Should be impossible, but make sure it's not null.
 	ERR_FAIL_NULL_MSG(physics_server_2d, "Failed to initialize PhysicsServer2D.");
 	physics_server_2d->init();
+#endif // PHYSICS_2D_DISABLED
 }
 
 void finalize_physics() {
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	physics_server_3d->finish();
 	memdelete(physics_server_3d);
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
 	physics_server_2d->finish();
 	memdelete(physics_server_2d);
+#endif // PHYSICS_2D_DISABLED
 }
 
 void finalize_display() {
@@ -393,18 +422,18 @@ void finalize_theme_db() {
 #endif
 
 void Main::print_header(bool p_rich) {
-	if (VERSION_TIMESTAMP > 0) {
+	if (GODOT_VERSION_TIMESTAMP > 0) {
 		// Version timestamp available.
 		if (p_rich) {
-			Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(VERSION_TIMESTAMP, true) + " UTC) - \u001b[4m" + String(VERSION_WEBSITE));
+			Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(GODOT_VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(GODOT_VERSION_TIMESTAMP, true) + " UTC) - \u001b[4m" + String(GODOT_VERSION_WEBSITE));
 		} else {
-			Engine::get_singleton()->print_header(String(VERSION_NAME) + " v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(VERSION_TIMESTAMP, true) + " UTC) - " + String(VERSION_WEBSITE));
+			Engine::get_singleton()->print_header(String(GODOT_VERSION_NAME) + " v" + get_full_version_string() + " (" + Time::get_singleton()->get_datetime_string_from_unix_time(GODOT_VERSION_TIMESTAMP, true) + " UTC) - " + String(GODOT_VERSION_WEBSITE));
 		}
 	} else {
 		if (p_rich) {
-			Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " - \u001b[4m" + String(VERSION_WEBSITE));
+			Engine::get_singleton()->print_header_rich("\u001b[38;5;39m" + String(GODOT_VERSION_NAME) + "\u001b[0m v" + get_full_version_string() + " - \u001b[4m" + String(GODOT_VERSION_WEBSITE));
 		} else {
-			Engine::get_singleton()->print_header(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
+			Engine::get_singleton()->print_header(String(GODOT_VERSION_NAME) + " v" + get_full_version_string() + " - " + String(GODOT_VERSION_WEBSITE));
 		}
 	}
 }
@@ -589,10 +618,12 @@ void Main::print_help(const char *p_binary) {
 	print_help_option("--xr-mode <mode>", "Select XR (Extended Reality) mode [\"default\", \"off\", \"on\"].\n");
 #endif
 	print_help_option("--wid <window_id>", "Request parented to window.\n");
+	print_help_option("--accessibility <mode>", "Select accessibility mode ['auto' (when screen reader is running, default), 'always', 'disabled'].\n");
 
 	print_help_title("Debug options");
 	print_help_option("-d, --debug", "Debug (local stdout debugger).\n");
 	print_help_option("-b, --breakpoints", "Breakpoint list as source::line comma-separated pairs, no spaces (use %%20 instead).\n");
+	print_help_option("--ignore-error-breaks", "If debugger is connected, prevents sending error breakpoints.\n");
 	print_help_option("--profiling", "Enable profiling in the script debugger.\n");
 	print_help_option("--gpu-profile", "Show a GPU profile of the tasks that took the most time during frame rendering.\n");
 	print_help_option("--gpu-validation", "Enable graphics API validation layers for debugging.\n");
@@ -699,10 +730,12 @@ Error Main::test_setup() {
 		tsman->add_interface(ts);
 	}
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	physics_server_3d_manager = memnew(PhysicsServer3DManager);
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 	physics_server_2d_manager = memnew(PhysicsServer2DManager);
+#endif // PHYSICS_2D_DISABLED
 
 	// From `Main::setup2()`.
 	register_early_core_singletons();
@@ -713,9 +746,9 @@ Error Main::test_setup() {
 
 	/** INITIALIZE SERVERS **/
 	register_server_types();
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	XRServer::set_xr_mode(XRServer::XRMODE_OFF); // Skip in tests.
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 	initialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS);
 	GDExtensionManager::get_singleton()->initialize_extensions(GDExtension::INITIALIZATION_LEVEL_SERVERS);
 
@@ -732,8 +765,12 @@ Error Main::test_setup() {
 	// Default theme will be initialized later, after modules and ScriptServer are ready.
 	initialize_theme_db();
 
-	NavigationServer3DManager::initialize_server(); // 3D server first because 2D depends on it.
+#ifndef NAVIGATION_3D_DISABLED
+	NavigationServer3DManager::initialize_server();
+#endif // NAVIGATION_3D_DISABLED
+#ifndef NAVIGATION_2D_DISABLED
 	NavigationServer2DManager::initialize_server();
+#endif // NAVIGATION_2D_DISABLED
 
 	register_scene_types();
 	register_driver_types();
@@ -817,8 +854,12 @@ void Main::test_cleanup() {
 
 	finalize_theme_db();
 
-	NavigationServer2DManager::finalize_server(); // 2D goes first as it uses the 3D server behind the scene.
+#ifndef NAVIGATION_2D_DISABLED
+	NavigationServer2DManager::finalize_server();
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 	NavigationServer3DManager::finalize_server();
+#endif // NAVIGATION_3D_DISABLED
 
 	GDExtensionManager::get_singleton()->deinitialize_extensions(GDExtension::INITIALIZATION_LEVEL_SERVERS);
 	uninitialize_modules(MODULE_INITIALIZATION_LEVEL_SERVERS);
@@ -836,14 +877,16 @@ void Main::test_cleanup() {
 	if (tsman) {
 		memdelete(tsman);
 	}
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	if (physics_server_3d_manager) {
 		memdelete(physics_server_3d_manager);
 	}
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 	if (physics_server_2d_manager) {
 		memdelete(physics_server_2d_manager);
 	}
+#endif // PHYSICS_2D_DISABLED
 	if (globals) {
 		memdelete(globals);
 	}
@@ -979,11 +1022,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	String project_path = ".";
 	bool upwards = false;
 	String debug_uri = "";
-#if defined(TOOLS_ENABLED) && defined(WINDOWS_ENABLED)
+#if defined(TOOLS_ENABLED) && (defined(WINDOWS_ENABLED) || defined(LINUXBSD_ENABLED))
 	bool test_rd_creation = false;
 	bool test_rd_support = false;
 #endif
 	bool skip_breakpoints = false;
+	bool ignore_error_breaks = false;
 	String main_pack;
 	bool quiet_stdout = false;
 	int separate_thread_render = -1; // Tri-state: -1 = not set, 0 = false, 1 = true.
@@ -1259,6 +1303,27 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		} else if (arg == "--single-window") { // force single window
 
 			single_window = true;
+		} else if (arg == "--accessibility") {
+			if (N) {
+				String string = N->get();
+				if (string == "auto") {
+					accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO;
+					accessibility_mode_set = true;
+				} else if (string == "always") {
+					accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_ALWAYS;
+					accessibility_mode_set = true;
+				} else if (string == "disabled") {
+					accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED;
+					accessibility_mode_set = true;
+				} else {
+					OS::get_singleton()->print("Accessibility mode argument not recognized, aborting.\n");
+					goto error;
+				}
+				N = N->next();
+			} else {
+				OS::get_singleton()->print("Missing accessibility mode argument, aborting.\n");
+				goto error;
+			}
 		} else if (arg == "-t" || arg == "--always-on-top") { // force always-on-top window
 
 			init_always_on_top = true;
@@ -1274,8 +1339,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 					goto error;
 				}
 
-				int w = vm.get_slice("x", 0).to_int();
-				int h = vm.get_slice("x", 1).to_int();
+				int w = vm.get_slicec('x', 0).to_int();
+				int h = vm.get_slicec('x', 1).to_int();
 
 				if (w <= 0 || h <= 0) {
 					OS::get_singleton()->print("Invalid resolution '%s', width and height must be above 0.\n",
@@ -1317,8 +1382,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 					goto error;
 				}
 
-				int x = vm.get_slice(",", 0).to_int();
-				int y = vm.get_slice(",", 1).to_int();
+				int x = vm.get_slicec(',', 0).to_int();
+				int y = vm.get_slicec(',', 1).to_int();
 
 				init_custom_pos = Point2(x, y);
 				init_use_custom_pos = true;
@@ -1670,8 +1735,10 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			debug_canvas_item_redraw = true;
 		} else if (arg == "--debug-stringnames") {
 			StringName::set_debug_stringnames(true);
+		} else if (arg == "--debug-mute-audio") {
+			debug_mute_audio = true;
 #endif
-#if defined(TOOLS_ENABLED) && defined(WINDOWS_ENABLED)
+#if defined(TOOLS_ENABLED) && (defined(WINDOWS_ENABLED) || defined(LINUXBSD_ENABLED))
 		} else if (arg == "--test-rd-support") {
 			test_rd_support = true;
 		} else if (arg == "--test-rd-creation") {
@@ -1734,7 +1801,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			OS::get_singleton()->disable_crash_handler();
 		} else if (arg == "--skip-breakpoints") {
 			skip_breakpoints = true;
-#ifndef _3D_DISABLED
+		} else if (I->get() == "--ignore-error-breaks") {
+			ignore_error_breaks = true;
+#ifndef XR_DISABLED
 		} else if (arg == "--xr-mode") {
 			if (N) {
 				String xr_mode = N->get().to_lower();
@@ -1753,7 +1822,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 				OS::get_singleton()->print("Missing --xr-mode argument, aborting.\n");
 				goto error;
 			}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 		} else if (arg == "--benchmark") {
 			OS::get_singleton()->set_use_benchmark(true);
 		} else if (arg == "--benchmark-file") {
@@ -1880,12 +1949,55 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 #endif
 	}
 
-#if defined(TOOLS_ENABLED) && defined(WINDOWS_ENABLED)
+#ifdef TOOLS_ENABLED
+	if (!project_manager && !editor) {
+		// If we didn't find a project, we fall back to the project manager.
+		project_manager = !found_project && !cmdline_tool;
+	}
+
+	{
+		// Synced with https://github.com/baldurk/renderdoc/blob/2b01465c7/renderdoc/driver/vulkan/vk_layer.cpp#L118-L165
+		LocalVector<String> layers_to_disable = {
+			"DISABLE_RTSS_LAYER", // GH-57937.
+			"DISABLE_VULKAN_OBS_CAPTURE", // GH-103800.
+			"DISABLE_VULKAN_OW_OBS_CAPTURE", // GH-104154.
+			"DISABLE_SAMPLE_LAYER", // GH-104154.
+			"DISABLE_GAMEPP_LAYER", // GH-104154.
+			"DISABLE_VK_LAYER_TENCENT_wegame_cross_overlay_1", // GH-104154.
+			// "NODEVICE_SELECT", // Kept as it's useful - GH-104592.
+			"VK_LAYER_bandicam_helper_DEBUG_1", // GH-101480.
+			"DISABLE_VK_LAYER_bandicam_helper_1", // GH-101480.
+			"DISABLE_VK_LAYER_reshade_1", // GH-70849.
+			"DISABLE_VK_LAYER_GPUOpen_GRS", // GH-104154.
+			"DISABLE_LAYER", // GH-104154 (fpsmon).
+			"DISABLE_MANGOHUD", // GH-57403.
+			"DISABLE_VKBASALT",
+		};
+
+#if defined(WINDOWS_ENABLED) || defined(LINUXBSD_ENABLED)
+		if (editor || project_manager || test_rd_support || test_rd_creation) {
+#else
+		if (editor || project_manager) {
+#endif
+			// Disable Vulkan overlays in editor, they cause various issues.
+			for (const String &layer_disable : layers_to_disable) {
+				OS::get_singleton()->set_environment(layer_disable, "1");
+			}
+		} else {
+			// Re-allow using Vulkan overlays, disabled while using the editor.
+			for (const String &layer_disable : layers_to_disable) {
+				OS::get_singleton()->unset_environment(layer_disable);
+			}
+		}
+	}
+#endif
+
+#if defined(TOOLS_ENABLED) && (defined(WINDOWS_ENABLED) || defined(LINUXBSD_ENABLED))
 	if (test_rd_support) {
 		// Test Rendering Device creation and exit.
 
 		OS::get_singleton()->set_crash_handler_silent();
-		if (OS::get_singleton()->_test_create_rendering_device()) {
+		if (OS::get_singleton()->_test_create_rendering_device(display_driver)) {
 			exit_err = ERR_HELP;
 		} else {
 			exit_err = ERR_UNAVAILABLE;
@@ -1895,7 +2007,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		// Test OpenGL context and Rendering Device simultaneous creation and exit.
 
 		OS::get_singleton()->set_crash_handler_silent();
-		if (OS::get_singleton()->_test_create_rendering_device_and_gl()) {
+		if (OS::get_singleton()->_test_create_rendering_device_and_gl(display_driver)) {
 			exit_err = ERR_HELP;
 		} else {
 			exit_err = ERR_UNAVAILABLE;
@@ -1919,11 +2031,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		}
 	}
 
-	if (!project_manager && !editor) {
-		// If we didn't find a project, we fall back to the project manager.
-		project_manager = !found_project && !cmdline_tool;
-	}
-
 	if (project_manager) {
 		Engine::get_singleton()->set_project_manager_hint(true);
 	}
@@ -1984,7 +2091,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "network/limits/debugger/max_errors_per_second", PROPERTY_HINT_RANGE, "1,200,1,or_greater"), 400);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "network/limits/debugger/max_warnings_per_second", PROPERTY_HINT_RANGE, "1,200,1,or_greater"), 400);
 
-	EngineDebugger::initialize(debug_uri, skip_breakpoints, breakpoints, []() {
+	EngineDebugger::initialize(debug_uri, skip_breakpoints, ignore_error_breaks, breakpoints, []() {
 		if (editor_pid) {
 			DisplayServer::get_singleton()->enable_for_stealing_focus(editor_pid);
 		}
@@ -2026,7 +2133,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		OS::get_singleton()->add_logger(memnew(RotatedFileLogger(base_path, max_files)));
 	}
 
-	if (main_args.size() == 0 && String(GLOBAL_GET("application/run/main_scene")) == "") {
+	if (main_args.is_empty() && String(GLOBAL_GET("application/run/main_scene")) == "") {
 #ifdef TOOLS_ENABLED
 		if (!editor && !project_manager) {
 #endif
@@ -2277,18 +2384,17 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		default_renderer_mobile = "gl_compatibility";
 	}
 #endif
-	if (renderer_hints.is_empty()) {
-		ERR_PRINT("No renderers available.");
-	}
 
 	if (!rendering_method.is_empty()) {
 		if (rendering_method != "forward_plus" &&
 				rendering_method != "mobile" &&
-				rendering_method != "gl_compatibility") {
+				rendering_method != "gl_compatibility" &&
+				rendering_method != "dummy") {
 			OS::get_singleton()->print("Unknown rendering method '%s', aborting.\nValid options are ",
 					rendering_method.utf8().get_data());
 
-			const Vector<String> rendering_method_hints = renderer_hints.split(",");
+			Vector<String> rendering_method_hints = renderer_hints.split(",");
+			rendering_method_hints.push_back("dummy");
 			for (int i = 0; i < rendering_method_hints.size(); i++) {
 				if (i == rendering_method_hints.size() - 1) {
 					OS::get_singleton()->print(" and ");
@@ -2302,6 +2408,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			goto error;
 		}
 	}
+	if (renderer_hints.is_empty()) {
+		renderer_hints = "dummy";
+	}
 
 	if (!rendering_driver.is_empty()) {
 		// As the rendering drivers available may depend on the display driver and renderer
@@ -2352,7 +2461,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 
 		// Set a default renderer if none selected. Try to choose one that matches the driver.
 		if (rendering_method.is_empty()) {
-			if (rendering_driver == "opengl3" || rendering_driver == "opengl3_angle" || rendering_driver == "opengl3_es") {
+			if (rendering_driver == "dummy") {
+				rendering_method = "dummy";
+			} else if (rendering_driver == "opengl3" || rendering_driver == "opengl3_angle" || rendering_driver == "opengl3_es") {
 				rendering_method = "gl_compatibility";
 			} else {
 				rendering_method = "forward_plus";
@@ -2380,6 +2491,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 			available_drivers.push_back("opengl3_es");
 		}
 #endif
+		if (rendering_method == "dummy") {
+			available_drivers.push_back("dummy");
+		}
 		if (available_drivers.is_empty()) {
 			OS::get_singleton()->print("Unknown renderer name '%s', aborting.\n", rendering_method.utf8().get_data());
 			goto error;
@@ -2405,7 +2519,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		}
 	}
 
-	default_renderer = renderer_hints.get_slice(",", 0);
+	default_renderer = renderer_hints.get_slicec(',', 0);
 	GLOBAL_DEF_RST_BASIC(PropertyInfo(Variant::STRING, "rendering/renderer/rendering_method", PROPERTY_HINT_ENUM, renderer_hints), default_renderer);
 	GLOBAL_DEF_RST_BASIC("rendering/renderer/rendering_method.mobile", default_renderer_mobile);
 	GLOBAL_DEF_RST_BASIC("rendering/renderer/rendering_method.web", "gl_compatibility"); // This is a bit of a hack until we have WebGPU support.
@@ -2416,7 +2530,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	}
 
 	if (rendering_driver.is_empty()) {
-		if (rendering_method == "gl_compatibility") {
+		if (rendering_method == "dummy") {
+			rendering_driver = "dummy";
+		} else if (rendering_method == "gl_compatibility") {
 			rendering_driver = GLOBAL_GET("rendering/gl_compatibility/driver");
 		} else {
 			rendering_driver = GLOBAL_GET("rendering/rendering_device/driver");
@@ -2459,6 +2575,12 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		if (!bool(GLOBAL_GET("display/window/size/resizable"))) {
 			window_flags |= DisplayServer::WINDOW_FLAG_RESIZE_DISABLED_BIT;
 		}
+		if (bool(GLOBAL_GET("display/window/size/minimize_disabled"))) {
+			window_flags |= DisplayServer::WINDOW_FLAG_MINIMIZE_DISABLED_BIT;
+		}
+		if (bool(GLOBAL_GET("display/window/size/maximize_disabled"))) {
+			window_flags |= DisplayServer::WINDOW_FLAG_MAXIMIZE_DISABLED_BIT;
+		}
 		if (bool(GLOBAL_GET("display/window/size/borderless"))) {
 			window_flags |= DisplayServer::WINDOW_FLAG_BORDERLESS_BIT;
 		}
@@ -2479,27 +2601,27 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 		}
 		window_mode = (DisplayServer::WindowMode)(GLOBAL_GET("display/window/size/mode").operator int());
 		int initial_position_type = GLOBAL_GET("display/window/size/initial_position_type").operator int();
-		if (initial_position_type == 0) { // Absolute.
+		if (initial_position_type == Window::WINDOW_INITIAL_POSITION_ABSOLUTE) { // Absolute.
 			if (!init_use_custom_pos) {
 				init_custom_pos = GLOBAL_GET("display/window/size/initial_position").operator Vector2i();
 				init_use_custom_pos = true;
 			}
-		} else if (initial_position_type == 1) { // Center of Primary Screen.
+		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_PRIMARY_SCREEN || initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_MAIN_WINDOW_SCREEN) { // Center of Primary Screen.
 			if (!init_use_custom_screen) {
 				init_screen = DisplayServer::SCREEN_PRIMARY;
 				init_use_custom_screen = true;
 			}
-		} else if (initial_position_type == 2) { // Center of Other Screen.
+		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_OTHER_SCREEN) { // Center of Other Screen.
 			if (!init_use_custom_screen) {
 				init_screen = GLOBAL_GET("display/window/size/initial_screen").operator int();
 				init_use_custom_screen = true;
 			}
-		} else if (initial_position_type == 3) { // Center of Screen With Mouse Pointer.
+		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_SCREEN_WITH_MOUSE_FOCUS) { // Center of Screen With Mouse Pointer.
 			if (!init_use_custom_screen) {
 				init_screen = DisplayServer::SCREEN_WITH_MOUSE_FOCUS;
 				init_use_custom_screen = true;
 			}
-		} else if (initial_position_type == 4) { // Center of Screen With Keyboard Focus.
+		} else if (initial_position_type == Window::WINDOW_INITIAL_POSITION_CENTER_SCREEN_WITH_KEYBOARD_FOCUS) { // Center of Screen With Keyboard Focus.
 			if (!init_use_custom_screen) {
 				init_screen = DisplayServer::SCREEN_WITH_KEYBOARD_FOCUS;
 				init_use_custom_screen = true;
@@ -2516,21 +2638,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
 	if (editor || project_manager) {
 		// The editor and project manager always detect and use hiDPI if needed.
 		OS::get_singleton()->_allow_hidpi = true;
-		// Disable Vulkan overlays in editor, they cause various issues.
-		OS::get_singleton()->set_environment("DISABLE_MANGOHUD", "1"); // GH-57403.
-		OS::get_singleton()->set_environment("DISABLE_RTSS_LAYER", "1"); // GH-57937.
-		OS::get_singleton()->set_environment("DISABLE_VKBASALT", "1");
-		OS::get_singleton()->set_environment("DISABLE_VK_LAYER_reshade_1", "1"); // GH-70849.
-		OS::get_singleton()->set_environment("VK_LAYER_bandicam_helper_DEBUG_1", "1"); // GH-101480.
-		OS::get_singleton()->set_environment("DISABLE_VK_LAYER_bandicam_helper_1", "1"); // GH-101480.
-	} else {
-		// Re-allow using Vulkan overlays, disabled while using the editor.
-		OS::get_singleton()->unset_environment("DISABLE_MANGOHUD");
-		OS::get_singleton()->unset_environment("DISABLE_RTSS_LAYER");
-		OS::get_singleton()->unset_environment("DISABLE_VKBASALT");
-		OS::get_singleton()->unset_environment("DISABLE_VK_LAYER_reshade_1");
-		OS::get_singleton()->unset_environment("VK_LAYER_bandicam_helper_DEBUG_1");
-		OS::get_singleton()->unset_environment("DISABLE_VK_LAYER_bandicam_helper_1");
 	}
 #endif
 
@@ -2786,6 +2893,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 	print_header(false);
 
 #ifdef TOOLS_ENABLED
+	int tablet_driver_editor = -1;
 	if (editor || project_manager || cmdline_tool) {
 		OS::get_singleton()->benchmark_begin_measure("Startup", "Initialize Early Settings");
 
@@ -2820,6 +2928,8 @@ Error Main::setup2(bool p_show_boot_logo) {
 					bool prefer_wayland_found = false;
 					bool prefer_wayland = false;
 
+					bool tablet_found = false;
+
 					if (editor) {
 						screen_property = "interface/editor/editor_screen";
 					} else if (project_manager) {
@@ -2834,7 +2944,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 						prefer_wayland_found = true;
 					}
 
-					while (!screen_found || !prefer_wayland_found) {
+					while (!screen_found || !prefer_wayland_found || !tablet_found) {
 						assign = Variant();
 						next_tag.fields.clear();
 						next_tag.name = String();
@@ -2853,11 +2963,22 @@ Error Main::setup2(bool p_show_boot_logo) {
 									restore_editor_window_layout = value.operator int() == EditorSettings::InitialScreen::INITIAL_SCREEN_AUTO;
 								}
 							}
-
-							if (!prefer_wayland_found && assign == "run/platforms/linuxbsd/prefer_wayland") {
+							if (assign == "interface/editor/expand_to_title") {
+								init_expand_to_title = value;
+							} else if (assign == "interface/editor/display_scale") {
+								init_display_scale = value;
+								init_display_scale_found = true;
+							} else if (assign == "interface/editor/custom_display_scale") {
+								init_custom_scale = value;
+							} else if (!prefer_wayland_found && assign == "run/platforms/linuxbsd/prefer_wayland") {
 								prefer_wayland = value;
 								prefer_wayland_found = true;
 							}
+
+							if (!tablet_found && assign == "interface/editor/tablet_driver") {
+								tablet_driver_editor = value;
+								tablet_found = true;
+							}
 						}
 					}
 
@@ -2925,10 +3046,12 @@ Error Main::setup2(bool p_show_boot_logo) {
 		tsman->add_interface(ts);
 	}
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	physics_server_3d_manager = memnew(PhysicsServer3DManager);
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 	physics_server_2d_manager = memnew(PhysicsServer2DManager);
+#endif // PHYSICS_2D_DISABLED
 
 	register_server_types();
 	{
@@ -3005,6 +3128,17 @@ Error Main::setup2(bool p_show_boot_logo) {
 			window_flags = DisplayServer::WINDOW_FLAG_BORDERLESS_BIT;
 		}
 
+#ifdef TOOLS_ENABLED
+		if ((project_manager || editor) && init_expand_to_title) {
+			window_flags |= DisplayServer::WINDOW_FLAG_EXTEND_TO_TITLE_BIT;
+		}
+#endif
+
+		if (!accessibility_mode_set) {
+			accessibility_mode = (DisplayServer::AccessibilityMode)GLOBAL_GET("accessibility/general/accessibility_support").operator int64_t();
+		}
+		DisplayServer::accessibility_set_mode(accessibility_mode);
+
 		// rendering_driver now held in static global String in main and initialized in setup()
 		Error err;
 		display_server = DisplayServer::create(display_driver_idx, rendering_driver, window_mode, window_vsync_mode, window_flags, window_position, window_size, init_screen, context, init_embed_parent_window_id, err);
@@ -3045,18 +3179,62 @@ Error Main::setup2(bool p_show_boot_logo) {
 			if (tsman) {
 				memdelete(tsman);
 			}
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 			if (physics_server_3d_manager) {
 				memdelete(physics_server_3d_manager);
 			}
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 			if (physics_server_2d_manager) {
 				memdelete(physics_server_2d_manager);
 			}
+#endif // PHYSICS_2D_DISABLED
 
 			return err;
 		}
 
+#ifdef TOOLS_ENABLED
+		if (project_manager && init_display_scale_found) {
+			float ui_scale = init_custom_scale;
+			switch (init_display_scale) {
+				case 0:
+					ui_scale = EditorSettings::get_auto_display_scale();
+					break;
+				case 1:
+					ui_scale = 0.75;
+					break;
+				case 2:
+					ui_scale = 1.0;
+					break;
+				case 3:
+					ui_scale = 1.25;
+					break;
+				case 4:
+					ui_scale = 1.5;
+					break;
+				case 5:
+					ui_scale = 1.75;
+					break;
+				case 6:
+					ui_scale = 2.0;
+					break;
+				default:
+					break;
+			}
+			if (!(force_res || use_custom_res)) {
+				display_server->window_set_size(Size2(window_size) * ui_scale, DisplayServer::MAIN_WINDOW_ID);
+			}
+			if (display_server->has_feature(DisplayServer::FEATURE_SUBWINDOWS) && !display_server->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
+				Size2 real_size = DisplayServer::get_singleton()->window_get_size();
+				Rect2i scr_rect = display_server->screen_get_usable_rect(init_screen);
+				display_server->window_set_position(scr_rect.position + (scr_rect.size - real_size) / 2, DisplayServer::MAIN_WINDOW_ID);
+			}
+		}
+#endif
+		if (display_server->has_feature(DisplayServer::FEATURE_SUBWINDOWS)) {
+			display_server->show_window(DisplayServer::MAIN_WINDOW_ID);
+		}
+
 		if (display_server->has_feature(DisplayServer::FEATURE_ORIENTATION)) {
 			display_server->screen_set_orientation(window_orientation);
 		}
@@ -3126,6 +3304,12 @@ Error Main::setup2(bool p_show_boot_logo) {
 		GLOBAL_DEF_RST_NOVAL("input_devices/pen_tablet/driver", "");
 		GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::STRING, "input_devices/pen_tablet/driver.windows", PROPERTY_HINT_ENUM, "auto,winink,wintab,dummy"), "");
 
+#ifdef TOOLS_ENABLED
+		if (tablet_driver.is_empty() && tablet_driver_editor != -1) {
+			tablet_driver = DisplayServer::get_singleton()->tablet_get_driver_name(tablet_driver_editor);
+		}
+#endif
+
 		if (tablet_driver.is_empty()) { // specified in project.godot
 			tablet_driver = GLOBAL_GET("input_devices/pen_tablet/driver");
 			if (tablet_driver.is_empty()) {
@@ -3196,7 +3380,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 		OS::get_singleton()->benchmark_end_measure("Servers", "Audio");
 	}
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	/* Initialize XR Server */
 
 	{
@@ -3206,7 +3390,7 @@ Error Main::setup2(bool p_show_boot_logo) {
 
 		OS::get_singleton()->benchmark_end_measure("Servers", "XR");
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 	OS::get_singleton()->benchmark_end_measure("Startup", "Servers");
 
@@ -3372,10 +3556,16 @@ Error Main::setup2(bool p_show_boot_logo) {
 	// Default theme will be initialized later, after modules and ScriptServer are ready.
 	initialize_theme_db();
 
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 	MAIN_PRINT("Main: Load Navigation");
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 
-	NavigationServer3DManager::initialize_server(); // 3D server first because 2D depends on it.
+#ifndef NAVIGATION_3D_DISABLED
+	NavigationServer3DManager::initialize_server();
+#endif // NAVIGATION_3D_DISABLED
+#ifndef NAVIGATION_2D_DISABLED
 	NavigationServer2DManager::initialize_server();
+#endif // NAVIGATION_2D_DISABLED
 
 	register_scene_types();
 	register_driver_types();
@@ -3609,7 +3799,7 @@ int Main::start() {
 #ifdef TOOLS_ENABLED
 	String doc_tool_path;
 	bool doc_tool_implicit_cwd = false;
-	BitField<DocTools::GenerateFlags> gen_flags;
+	BitField<DocTools::GenerateFlags> gen_flags = {};
 	String _export_preset;
 	Vector<String> patches;
 	bool export_debug = false;
@@ -3978,20 +4168,41 @@ int Main::start() {
 		if (debug_paths) {
 			sml->set_debug_paths_hint(true);
 		}
+
 		if (debug_navigation) {
 			sml->set_debug_navigation_hint(true);
+#ifndef NAVIGATION_2D_DISABLED
+			NavigationServer2D::get_singleton()->set_debug_navigation_enabled(true);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 			NavigationServer3D::get_singleton()->set_debug_navigation_enabled(true);
+#endif // NAVIGATION_3D_DISABLED
 		}
 		if (debug_avoidance) {
+#ifndef NAVIGATION_2D_DISABLED
+			NavigationServer2D::get_singleton()->set_debug_avoidance_enabled(true);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 			NavigationServer3D::get_singleton()->set_debug_avoidance_enabled(true);
+#endif // NAVIGATION_3D_DISABLED
 		}
 		if (debug_navigation || debug_avoidance) {
+#ifndef NAVIGATION_2D_DISABLED
+			NavigationServer2D::get_singleton()->set_active(true);
+			NavigationServer2D::get_singleton()->set_debug_enabled(true);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 			NavigationServer3D::get_singleton()->set_active(true);
 			NavigationServer3D::get_singleton()->set_debug_enabled(true);
+#endif // NAVIGATION_3D_DISABLED
 		}
 		if (debug_canvas_item_redraw) {
 			RenderingServer::get_singleton()->canvas_item_set_debug_redraw(true);
 		}
+
+		if (debug_mute_audio) {
+			AudioServer::get_singleton()->set_debug_mute(true);
+		}
 #endif
 
 		if (single_threaded_scene) {
@@ -4115,6 +4326,7 @@ int Main::start() {
 		if (editor) {
 			OS::get_singleton()->benchmark_begin_measure("Startup", "Editor");
 
+			sml->get_root()->set_translation_domain("godot.editor");
 			if (editor_pseudolocalization) {
 				translation_server->get_editor_domain()->set_pseudolocalization_enabled(true);
 			}
@@ -4213,7 +4425,7 @@ int Main::start() {
 
 		String local_game_path;
 		if (!game_path.is_empty() && !project_manager) {
-			local_game_path = game_path.replace("\\", "/");
+			local_game_path = game_path.replace_char('\\', '/');
 
 			if (!local_game_path.begins_with("res://")) {
 				bool absolute =
@@ -4235,7 +4447,7 @@ int Main::start() {
 							Ref<DirAccess> da = DirAccess::open(local_game_path.substr(0, sep));
 							if (da.is_valid()) {
 								local_game_path = da->get_current_dir().path_join(
-										local_game_path.substr(sep + 1, local_game_path.length()));
+										local_game_path.substr(sep + 1));
 							}
 						}
 					}
@@ -4312,11 +4524,12 @@ int Main::start() {
 			OS::get_singleton()->benchmark_begin_measure("Startup", "Project Manager");
 			Engine::get_singleton()->set_editor_hint(true);
 
+			sml->get_root()->set_translation_domain("godot.editor");
 			if (editor_pseudolocalization) {
 				translation_server->get_editor_domain()->set_pseudolocalization_enabled(true);
 			}
 
-			ProjectManager *pmanager = memnew(ProjectManager(force_res || use_custom_res));
+			ProjectManager *pmanager = memnew(ProjectManager);
 			ProgressDialog *progress_dialog = memnew(ProgressDialog);
 			pmanager->add_child(progress_dialog);
 
@@ -4412,7 +4625,9 @@ bool Main::iteration() {
 
 	uint64_t physics_process_ticks = 0;
 	uint64_t process_ticks = 0;
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 	uint64_t navigation_process_ticks = 0;
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 
 	frame += ticks_elapsed;
 
@@ -4427,12 +4642,16 @@ bool Main::iteration() {
 	bool exit = false;
 
 	// process all our active interfaces
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	XRServer::get_singleton()->_process();
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
+#ifndef NAVIGATION_2D_DISABLED
 	NavigationServer2D::get_singleton()->sync();
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 	NavigationServer3D::get_singleton()->sync();
+#endif // NAVIGATION_3D_DISABLED
 
 	for (int iters = 0; iters < advance.physics_steps; ++iters) {
 		if (Input::get_singleton()->is_agile_input_event_flushing()) {
@@ -4449,41 +4668,54 @@ bool Main::iteration() {
 		// may be the same, and no interpolation takes place.
 		OS::get_singleton()->get_main_loop()->iteration_prepare();
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 		PhysicsServer3D::get_singleton()->sync();
 		PhysicsServer3D::get_singleton()->flush_queries();
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
 		PhysicsServer2D::get_singleton()->sync();
 		PhysicsServer2D::get_singleton()->flush_queries();
+#endif // PHYSICS_2D_DISABLED
 
 		if (OS::get_singleton()->get_main_loop()->physics_process(physics_step * time_scale)) {
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 			PhysicsServer3D::get_singleton()->end_sync();
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 			PhysicsServer2D::get_singleton()->end_sync();
+#endif // PHYSICS_2D_DISABLED
 
 			Engine::get_singleton()->_in_physics = false;
 			exit = true;
 			break;
 		}
 
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 		uint64_t navigation_begin = OS::get_singleton()->get_ticks_usec();
 
-		NavigationServer3D::get_singleton()->process(physics_step * time_scale);
+#ifndef NAVIGATION_2D_DISABLED
+		NavigationServer2D::get_singleton()->physics_process(physics_step * time_scale);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+		NavigationServer3D::get_singleton()->physics_process(physics_step * time_scale);
+#endif // NAVIGATION_3D_DISABLED
 
 		navigation_process_ticks = MAX(navigation_process_ticks, OS::get_singleton()->get_ticks_usec() - navigation_begin); // keep the largest one for reference
 		navigation_process_max = MAX(OS::get_singleton()->get_ticks_usec() - navigation_begin, navigation_process_max);
 
 		message_queue->flush();
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 		PhysicsServer3D::get_singleton()->end_sync();
 		PhysicsServer3D::get_singleton()->step(physics_step * time_scale);
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
 		PhysicsServer2D::get_singleton()->end_sync();
 		PhysicsServer2D::get_singleton()->step(physics_step * time_scale);
+#endif // PHYSICS_2D_DISABLED
 
 		message_queue->flush();
 
@@ -4506,6 +4738,13 @@ bool Main::iteration() {
 	}
 	message_queue->flush();
 
+#ifndef NAVIGATION_2D_DISABLED
+	NavigationServer2D::get_singleton()->process(process_step * time_scale);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+	NavigationServer3D::get_singleton()->process(process_step * time_scale);
+#endif // NAVIGATION_3D_DISABLED
+
 	RenderingServer::get_singleton()->sync(); //sync if still drawing from previous frames.
 
 	const bool has_pending_resources_for_processing = RD::get_singleton() && RD::get_singleton()->has_pending_resources_for_processing();
@@ -4596,7 +4835,12 @@ bool Main::iteration() {
 		return exit;
 	}
 
-	OS::get_singleton()->add_frame_delay(DisplayServer::get_singleton()->window_can_draw());
+	SceneTree *scene_tree = SceneTree::get_singleton();
+	bool skip_delay = scene_tree && scene_tree->is_accessibility_enabled();
+
+	if (!skip_delay) {
+		OS::get_singleton()->add_frame_delay(DisplayServer::get_singleton()->window_can_draw());
+	}
 
 #ifdef TOOLS_ENABLED
 	if (auto_build_solutions) {
@@ -4660,6 +4904,12 @@ void Main::cleanup(bool p_force) {
 	ResourceSaver::remove_custom_savers();
 	PropertyListHelper::clear_base_helpers();
 
+	// Remove the lock file if the engine exits successfully. Some automated processes such as
+	// --export/--import can bypass and/or finish faster than the existing check to remove the lock file.
+	if (OS::get_singleton()->get_exit_code() == EXIT_SUCCESS) {
+		OS::get_singleton()->remove_lock_file();
+	}
+
 	// Flush before uninitializing the scene, but delete the MessageQueue as late as possible.
 	message_queue->flush();
 
@@ -4683,13 +4933,13 @@ void Main::cleanup(bool p_force) {
 	//clear global shader variables before scene and other graphics stuff are deinitialized.
 	rendering_server->global_shader_parameters_clear();
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	if (xr_server) {
 		// Now that we're unregistering properly in plugins we need to keep access to xr_server for a little longer
 		// We do however unset our primary interface
 		xr_server->set_primary_interface(Ref<XRInterface>());
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 #ifdef TOOLS_ENABLED
 	GDExtensionManager::get_singleton()->deinitialize_extensions(GDExtension::INITIALIZATION_LEVEL_EDITOR);
@@ -4709,9 +4959,13 @@ void Main::cleanup(bool p_force) {
 
 	finalize_theme_db();
 
-	// Before deinitializing server extensions, finalize servers which may be loaded as extensions.
-	NavigationServer2DManager::finalize_server(); // 2D goes first as it uses the 3D server behind the scene.
+// Before deinitializing server extensions, finalize servers which may be loaded as extensions.
+#ifndef NAVIGATION_2D_DISABLED
+	NavigationServer2DManager::finalize_server();
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 	NavigationServer3DManager::finalize_server();
+#endif // NAVIGATION_3D_DISABLED
 	finalize_physics();
 
 	GDExtensionManager::get_singleton()->deinitialize_extensions(GDExtension::INITIALIZATION_LEVEL_SERVERS);
@@ -4720,11 +4974,11 @@ void Main::cleanup(bool p_force) {
 
 	EngineDebugger::deinitialize();
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	if (xr_server) {
 		memdelete(xr_server);
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 	if (audio_server) {
 		audio_server->finish();
@@ -4758,14 +5012,16 @@ void Main::cleanup(bool p_force) {
 	if (tsman) {
 		memdelete(tsman);
 	}
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	if (physics_server_3d_manager) {
 		memdelete(physics_server_3d_manager);
 	}
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 	if (physics_server_2d_manager) {
 		memdelete(physics_server_2d_manager);
 	}
+#endif // PHYSICS_2D_DISABLED
 	if (globals) {
 		memdelete(globals);
 	}
diff --git a/engine/main/main.h b/engine/main/main.h
index 6dd2ff7d..bc432d93 100644
--- a/engine/main/main.h
+++ b/engine/main/main.h
@@ -28,10 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MAIN_H
-#define MAIN_H
+#pragma once
 
-#include "core/error/error_list.h"
 #include "core/os/thread.h"
 #include "core/typedefs.h"
 
@@ -102,5 +100,3 @@ public:
 	if (run_test) {                                                \
 		return return_code;                                        \
 	}
-
-#endif // MAIN_H
diff --git a/engine/main/main_builders.py b/engine/main/main_builders.py
index b693df73..a184dafd 100644
--- a/engine/main/main_builders.py
+++ b/engine/main/main_builders.py
@@ -1,60 +1,42 @@
 """Functions used to generate source files during build time"""
 
+import methods
+
 
 def make_splash(target, source, env):
-    src = str(source[0])
-    dst = str(target[0])
+    buffer = methods.get_buffer(str(source[0]))
 
-    with open(src, "rb") as f:
-        buf = f.read()
-
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef BOOT_SPLASH_H\n")
-        g.write("#define BOOT_SPLASH_H\n")
+    with methods.generated_wrapper(str(target[0])) as file:
         # Use a neutral gray color to better fit various kinds of projects.
-        g.write("static const Color boot_splash_bg_color = Color(0.14, 0.14, 0.14);\n")
-        g.write("static const unsigned char boot_splash_png[] = {\n")
-        for i in range(len(buf)):
-            g.write(str(buf[i]) + ",\n")
-        g.write("};\n")
-        g.write("#endif")
+        file.write(f"""\
+static const Color boot_splash_bg_color = Color(0.14, 0.14, 0.14);
+inline constexpr const unsigned char boot_splash_png[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
+""")
 
 
 def make_splash_editor(target, source, env):
-    src = str(source[0])
-    dst = str(target[0])
+    buffer = methods.get_buffer(str(source[0]))
 
-    with open(src, "rb") as f:
-        buf = f.read()
-
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef BOOT_SPLASH_EDITOR_H\n")
-        g.write("#define BOOT_SPLASH_EDITOR_H\n")
+    with methods.generated_wrapper(str(target[0])) as file:
         # The editor splash background color is taken from the default editor theme's background color.
         # This helps achieve a visually "smoother" transition between the splash screen and the editor.
-        g.write("static const Color boot_splash_editor_bg_color = Color(0.125, 0.145, 0.192);\n")
-        g.write("static const unsigned char boot_splash_editor_png[] = {\n")
-        for i in range(len(buf)):
-            g.write(str(buf[i]) + ",\n")
-        g.write("};\n")
-        g.write("#endif")
+        file.write(f"""\
+static const Color boot_splash_editor_bg_color = Color(0.125, 0.145, 0.192);
+inline constexpr const unsigned char boot_splash_editor_png[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
+""")
 
 
 def make_app_icon(target, source, env):
-    src = str(source[0])
-    dst = str(target[0])
+    buffer = methods.get_buffer(str(source[0]))
 
-    with open(src, "rb") as f:
-        buf = f.read()
-
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef APP_ICON_H\n")
-        g.write("#define APP_ICON_H\n")
-        g.write("static const unsigned char app_icon_png[] = {\n")
-        for i in range(len(buf)):
-            g.write(str(buf[i]) + ",\n")
-        g.write("};\n")
-        g.write("#endif")
+    with methods.generated_wrapper(str(target[0])) as file:
+        # Use a neutral gray color to better fit various kinds of projects.
+        file.write(f"""\
+inline constexpr const unsigned char app_icon_png[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
+""")
diff --git a/engine/main/main_timer_sync.h b/engine/main/main_timer_sync.h
index d8b5d4a0..59dac84b 100644
--- a/engine/main/main_timer_sync.h
+++ b/engine/main/main_timer_sync.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MAIN_TIMER_SYNC_H
-#define MAIN_TIMER_SYNC_H
+#pragma once
 
 #include "core/config/engine.h"
 
@@ -161,5 +160,3 @@ public:
 	// advance one frame, return timesteps to take
 	MainFrameTime advance(double p_physics_step, int p_physics_ticks_per_second);
 };
-
-#endif // MAIN_TIMER_SYNC_H
diff --git a/engine/main/performance.cpp b/engine/main/performance.cpp
index 214e8969..f679d7dc 100644
--- a/engine/main/performance.cpp
+++ b/engine/main/performance.cpp
@@ -35,15 +35,21 @@
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
 #include "servers/audio_server.h"
+#ifndef NAVIGATION_2D_DISABLED
+#include "servers/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_server_3d.h"
+#endif // NAVIGATION_3D_DISABLED
 #include "servers/rendering_server.h"
 
-// 2D
+#ifndef PHYSICS_2D_DISABLED
 #include "servers/physics_server_2d.h"
+#endif // PHYSICS_2D_DISABLED
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 #include "servers/physics_server_3d.h"
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
 Performance *Performance::singleton = nullptr;
 
@@ -82,6 +88,7 @@ void Performance::_bind_methods() {
 	BIND_ENUM_CONSTANT(PHYSICS_3D_ISLAND_COUNT);
 #endif // _3D_DISABLED
 	BIND_ENUM_CONSTANT(AUDIO_OUTPUT_LATENCY);
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 	BIND_ENUM_CONSTANT(NAVIGATION_ACTIVE_MAPS);
 	BIND_ENUM_CONSTANT(NAVIGATION_REGION_COUNT);
 	BIND_ENUM_CONSTANT(NAVIGATION_AGENT_COUNT);
@@ -92,11 +99,36 @@ void Performance::_bind_methods() {
 	BIND_ENUM_CONSTANT(NAVIGATION_EDGE_CONNECTION_COUNT);
 	BIND_ENUM_CONSTANT(NAVIGATION_EDGE_FREE_COUNT);
 	BIND_ENUM_CONSTANT(NAVIGATION_OBSTACLE_COUNT);
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 	BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_CANVAS);
 	BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_MESH);
 	BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_SURFACE);
 	BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_DRAW);
 	BIND_ENUM_CONSTANT(PIPELINE_COMPILATIONS_SPECIALIZATION);
+#ifndef NAVIGATION_2D_DISABLED
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_ACTIVE_MAPS);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_REGION_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_AGENT_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_LINK_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_POLYGON_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_EDGE_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_EDGE_MERGE_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_EDGE_CONNECTION_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_EDGE_FREE_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_2D_OBSTACLE_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_ACTIVE_MAPS);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_REGION_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_AGENT_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_LINK_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_POLYGON_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_EDGE_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_EDGE_MERGE_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_EDGE_CONNECTION_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_EDGE_FREE_COUNT);
+	BIND_ENUM_CONSTANT(NAVIGATION_3D_OBSTACLE_COUNT);
+#endif // NAVIGATION_3D_DISABLED
 	BIND_ENUM_CONSTANT(MONITOR_MAX);
 }
 
@@ -136,6 +168,7 @@ String Performance::get_monitor_name(Monitor p_monitor) const {
 		PNAME("physics_3d/collision_pairs"),
 		PNAME("physics_3d/islands"),
 		PNAME("audio/driver/output_latency"),
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 		PNAME("navigation/active_maps"),
 		PNAME("navigation/regions"),
 		PNAME("navigation/agents"),
@@ -146,18 +179,45 @@ String Performance::get_monitor_name(Monitor p_monitor) const {
 		PNAME("navigation/edges_connected"),
 		PNAME("navigation/edges_free"),
 		PNAME("navigation/obstacles"),
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 		PNAME("pipeline/compilations_canvas"),
 		PNAME("pipeline/compilations_mesh"),
 		PNAME("pipeline/compilations_surface"),
 		PNAME("pipeline/compilations_draw"),
 		PNAME("pipeline/compilations_specialization"),
+#ifndef NAVIGATION_2D_DISABLED
+		PNAME("navigation_2d/active_maps"),
+		PNAME("navigation_2d/regions"),
+		PNAME("navigation_2d/agents"),
+		PNAME("navigation_2d/links"),
+		PNAME("navigation_2d/polygons"),
+		PNAME("navigation_2d/edges"),
+		PNAME("navigation_2d/edges_merged"),
+		PNAME("navigation_2d/edges_connected"),
+		PNAME("navigation_2d/edges_free"),
+		PNAME("navigation_2d/obstacles"),
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+		PNAME("navigation_3d/active_maps"),
+		PNAME("navigation_3d/regions"),
+		PNAME("navigation_3d/agents"),
+		PNAME("navigation_3d/links"),
+		PNAME("navigation_3d/polygons"),
+		PNAME("navigation_3d/edges"),
+		PNAME("navigation_3d/edges_merged"),
+		PNAME("navigation_3d/edges_connected"),
+		PNAME("navigation_3d/edges_free"),
+		PNAME("navigation_3d/obstacles"),
+#endif // NAVIGATION_3D_DISABLED
 	};
-	static_assert((sizeof(names) / sizeof(const char *)) == MONITOR_MAX);
+	static_assert(std::size(names) == MONITOR_MAX);
 
 	return names[p_monitor];
 }
 
 double Performance::get_monitor(Monitor p_monitor) const {
+	int info = 0;
+
 	switch (p_monitor) {
 		case TIME_FPS:
 			return Engine::get_singleton()->get_frames_per_second();
@@ -203,50 +263,175 @@ double Performance::get_monitor(Monitor p_monitor) const {
 			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_DRAW);
 		case PIPELINE_COMPILATIONS_SPECIALIZATION:
 			return RS::get_singleton()->get_rendering_info(RS::RENDERING_INFO_PIPELINE_COMPILATIONS_SPECIALIZATION);
+#ifndef PHYSICS_2D_DISABLED
 		case PHYSICS_2D_ACTIVE_OBJECTS:
 			return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_ACTIVE_OBJECTS);
 		case PHYSICS_2D_COLLISION_PAIRS:
 			return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_COLLISION_PAIRS);
 		case PHYSICS_2D_ISLAND_COUNT:
 			return PhysicsServer2D::get_singleton()->get_process_info(PhysicsServer2D::INFO_ISLAND_COUNT);
-#ifdef _3D_DISABLED
-		case PHYSICS_3D_ACTIVE_OBJECTS:
-			return 0;
-		case PHYSICS_3D_COLLISION_PAIRS:
-			return 0;
-		case PHYSICS_3D_ISLAND_COUNT:
-			return 0;
 #else
+		case PHYSICS_2D_ACTIVE_OBJECTS:
+			return 0;
+		case PHYSICS_2D_COLLISION_PAIRS:
+			return 0;
+		case PHYSICS_2D_ISLAND_COUNT:
+			return 0;
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 		case PHYSICS_3D_ACTIVE_OBJECTS:
 			return PhysicsServer3D::get_singleton()->get_process_info(PhysicsServer3D::INFO_ACTIVE_OBJECTS);
 		case PHYSICS_3D_COLLISION_PAIRS:
 			return PhysicsServer3D::get_singleton()->get_process_info(PhysicsServer3D::INFO_COLLISION_PAIRS);
 		case PHYSICS_3D_ISLAND_COUNT:
 			return PhysicsServer3D::get_singleton()->get_process_info(PhysicsServer3D::INFO_ISLAND_COUNT);
-#endif // _3D_DISABLED
+#else
+		case PHYSICS_3D_ACTIVE_OBJECTS:
+			return 0;
+		case PHYSICS_3D_COLLISION_PAIRS:
+			return 0;
+		case PHYSICS_3D_ISLAND_COUNT:
+			return 0;
+#endif // PHYSICS_3D_DISABLED
 
 		case AUDIO_OUTPUT_LATENCY:
 			return AudioServer::get_singleton()->get_output_latency();
+
 		case NAVIGATION_ACTIVE_MAPS:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_ACTIVE_MAPS);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_ACTIVE_MAPS);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_REGION_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_REGION_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_REGION_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_REGION_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_AGENT_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_AGENT_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_AGENT_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_AGENT_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_LINK_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_LINK_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_LINK_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_LINK_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_POLYGON_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_POLYGON_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_POLYGON_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_POLYGON_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_EDGE_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_EDGE_MERGE_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_MERGE_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_MERGE_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_MERGE_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_EDGE_CONNECTION_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_CONNECTION_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_CONNECTION_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_CONNECTION_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_EDGE_FREE_COUNT:
-			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_FREE_COUNT);
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_FREE_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_FREE_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
 		case NAVIGATION_OBSTACLE_COUNT:
+#ifndef NAVIGATION_2D_DISABLED
+			info = NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_OBSTACLE_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+			info += NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_OBSTACLE_COUNT);
+#endif // NAVIGATION_3D_DISABLED
+			return info;
+
+#ifndef NAVIGATION_2D_DISABLED
+		case NAVIGATION_2D_ACTIVE_MAPS:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS);
+		case NAVIGATION_2D_REGION_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_REGION_COUNT);
+		case NAVIGATION_2D_AGENT_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_AGENT_COUNT);
+		case NAVIGATION_2D_LINK_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_LINK_COUNT);
+		case NAVIGATION_2D_POLYGON_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_POLYGON_COUNT);
+		case NAVIGATION_2D_EDGE_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_COUNT);
+		case NAVIGATION_2D_EDGE_MERGE_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_MERGE_COUNT);
+		case NAVIGATION_2D_EDGE_CONNECTION_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_CONNECTION_COUNT);
+		case NAVIGATION_2D_EDGE_FREE_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_EDGE_FREE_COUNT);
+		case NAVIGATION_2D_OBSTACLE_COUNT:
+			return NavigationServer2D::get_singleton()->get_process_info(NavigationServer2D::INFO_OBSTACLE_COUNT);
+#endif // NAVIGATION_2D_DISABLED
+
+#ifndef NAVIGATION_3D_DISABLED
+		case NAVIGATION_3D_ACTIVE_MAPS:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_ACTIVE_MAPS);
+		case NAVIGATION_3D_REGION_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_REGION_COUNT);
+		case NAVIGATION_3D_AGENT_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_AGENT_COUNT);
+		case NAVIGATION_3D_LINK_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_LINK_COUNT);
+		case NAVIGATION_3D_POLYGON_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_POLYGON_COUNT);
+		case NAVIGATION_3D_EDGE_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_COUNT);
+		case NAVIGATION_3D_EDGE_MERGE_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_MERGE_COUNT);
+		case NAVIGATION_3D_EDGE_CONNECTION_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_CONNECTION_COUNT);
+		case NAVIGATION_3D_EDGE_FREE_COUNT:
+			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_EDGE_FREE_COUNT);
+		case NAVIGATION_3D_OBSTACLE_COUNT:
 			return NavigationServer3D::get_singleton()->get_process_info(NavigationServer3D::INFO_OBSTACLE_COUNT);
+#endif // NAVIGATION_3D_DISABLED
 
 		default: {
 		}
@@ -298,6 +483,26 @@ Performance::MonitorType Performance::get_monitor_type(Monitor p_monitor) const
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
 		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
+		MONITOR_TYPE_QUANTITY,
 
 	};
 	static_assert((sizeof(types) / sizeof(MonitorType)) == MONITOR_MAX);
diff --git a/engine/main/performance.h b/engine/main/performance.h
index e88bdcb3..0fdac285 100644
--- a/engine/main/performance.h
+++ b/engine/main/performance.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PERFORMANCE_H
-#define PERFORMANCE_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/templates/hash_map.h"
@@ -106,6 +105,26 @@ public:
 		PIPELINE_COMPILATIONS_SURFACE,
 		PIPELINE_COMPILATIONS_DRAW,
 		PIPELINE_COMPILATIONS_SPECIALIZATION,
+		NAVIGATION_2D_ACTIVE_MAPS,
+		NAVIGATION_2D_REGION_COUNT,
+		NAVIGATION_2D_AGENT_COUNT,
+		NAVIGATION_2D_LINK_COUNT,
+		NAVIGATION_2D_POLYGON_COUNT,
+		NAVIGATION_2D_EDGE_COUNT,
+		NAVIGATION_2D_EDGE_MERGE_COUNT,
+		NAVIGATION_2D_EDGE_CONNECTION_COUNT,
+		NAVIGATION_2D_EDGE_FREE_COUNT,
+		NAVIGATION_2D_OBSTACLE_COUNT,
+		NAVIGATION_3D_ACTIVE_MAPS,
+		NAVIGATION_3D_REGION_COUNT,
+		NAVIGATION_3D_AGENT_COUNT,
+		NAVIGATION_3D_LINK_COUNT,
+		NAVIGATION_3D_POLYGON_COUNT,
+		NAVIGATION_3D_EDGE_COUNT,
+		NAVIGATION_3D_EDGE_MERGE_COUNT,
+		NAVIGATION_3D_EDGE_CONNECTION_COUNT,
+		NAVIGATION_3D_EDGE_FREE_COUNT,
+		NAVIGATION_3D_OBSTACLE_COUNT,
 		MONITOR_MAX
 	};
 
@@ -138,5 +157,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(Performance::Monitor);
-
-#endif // PERFORMANCE_H
diff --git a/engine/main/steam_tracker.h b/engine/main/steam_tracker.h
index 9fda0ba4..2e111c71 100644
--- a/engine/main/steam_tracker.h
+++ b/engine/main/steam_tracker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STEAM_TRACKER_H
-#define STEAM_TRACKER_H
+#pragma once
 
 #if defined(STEAMAPI_ENABLED)
 
@@ -70,5 +69,3 @@ public:
 };
 
 #endif // STEAMAPI_ENABLED
-
-#endif // STEAM_TRACKER_H
diff --git a/engine/methods.py b/engine/methods.py
index 85fdf197..78d88c7f 100644
--- a/engine/methods.py
+++ b/engine/methods.py
@@ -6,16 +6,20 @@ import os
 import re
 import subprocess
 import sys
+import textwrap
+import zlib
 from collections import OrderedDict
 from io import StringIO, TextIOBase
 from pathlib import Path
 from typing import Generator, List, Optional, Union, cast
 
 from misc.utility.color import print_error, print_info, print_warning
+from platform_methods import detect_arch
 
 # Get the "Godot" folder name ahead of time
-base_folder_path = str(os.path.abspath(Path(__file__).parent)) + "/"
-base_folder_only = os.path.basename(os.path.normpath(base_folder_path))
+base_folder = Path(__file__).resolve().parent
+
+compiler_version_cache = None
 
 # Listing all the folders we have converted
 # for SCU in scu_builders.py
@@ -79,34 +83,45 @@ def add_source_files(self, sources, files, allow_gen=False):
     return True
 
 
+def redirect_emitter(target, source, env):
+    """
+    Emitter to automatically redirect object/library build files to the `bin/obj` directory,
+    retaining subfolder structure. External build files will attempt to retain subfolder
+    structure relative to their environment's parent directory, sorted under `bin/obj/external`.
+    If `redirect_build_objects` is `False`, or an external build file isn't relative to the
+    passed environment, this emitter does nothing.
+    """
+    if not env["redirect_build_objects"]:
+        return target, source
+
+    redirected_targets = []
+    for item in target:
+        if base_folder in (path := Path(item.get_abspath()).resolve()).parents:
+            item = env.File(f"#bin/obj/{path.relative_to(base_folder)}")
+        elif (alt_base := Path(env.Dir(".").get_abspath()).resolve().parent) in path.parents:
+            item = env.File(f"#bin/obj/external/{path.relative_to(alt_base)}")
+        else:
+            print_warning(f'Failed to redirect "{path}"')
+        redirected_targets.append(item)
+    return redirected_targets, source
+
+
 def disable_warnings(self):
     # 'self' is the environment
     if self.msvc and not using_clang(self):
-        # We have to remove existing warning level defines before appending /w,
-        # otherwise we get: "warning D9025 : overriding '/W3' with '/w'"
-        WARN_FLAGS = ["/Wall", "/W4", "/W3", "/W2", "/W1", "/W0"]
-        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if x not in WARN_FLAGS]
-        self["CFLAGS"] = [x for x in self["CFLAGS"] if x not in WARN_FLAGS]
-        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if x not in WARN_FLAGS]
-        self.AppendUnique(CCFLAGS=["/w"])
+        self["WARNLEVEL"] = "/w"
     else:
-        self.AppendUnique(CCFLAGS=["-w"])
+        self["WARNLEVEL"] = "-w"
 
 
 def force_optimization_on_debug(self):
     # 'self' is the environment
     if self["target"] == "template_release":
         return
-
-    if self.msvc:
-        # We have to remove existing optimization level defines before appending /O2,
-        # otherwise we get: "warning D9025 : overriding '/0d' with '/02'"
-        self["CCFLAGS"] = [x for x in self["CCFLAGS"] if not x.startswith("/O")]
-        self["CFLAGS"] = [x for x in self["CFLAGS"] if not x.startswith("/O")]
-        self["CXXFLAGS"] = [x for x in self["CXXFLAGS"] if not x.startswith("/O")]
-        self.AppendUnique(CCFLAGS=["/O2"])
+    elif self.msvc:
+        self["OPTIMIZELEVEL"] = "/O2"
     else:
-        self.AppendUnique(CCFLAGS=["-O3"])
+        self["OPTIMIZELEVEL"] = "-O3"
 
 
 def add_module_version_string(self, s):
@@ -142,30 +157,36 @@ def get_version_info(module_version_string="", silent=False):
         if not silent:
             print_info(f"Using version status '{version_info['status']}', overriding the original '{version.status}'.")
 
+    return version_info
+
+
+def get_git_info():
+    os.chdir(base_folder)
+
     # Parse Git hash if we're in a Git repo.
-    githash = ""
-    gitfolder = ".git"
+    git_hash = ""
+    git_folder = ".git"
 
     if os.path.isfile(".git"):
         with open(".git", "r", encoding="utf-8") as file:
             module_folder = file.readline().strip()
         if module_folder.startswith("gitdir: "):
-            gitfolder = module_folder[8:]
+            git_folder = module_folder[8:]
 
-    if os.path.isfile(os.path.join(gitfolder, "HEAD")):
-        with open(os.path.join(gitfolder, "HEAD"), "r", encoding="utf8") as file:
+    if os.path.isfile(os.path.join(git_folder, "HEAD")):
+        with open(os.path.join(git_folder, "HEAD"), "r", encoding="utf8") as file:
             head = file.readline().strip()
         if head.startswith("ref: "):
             ref = head[5:]
             # If this directory is a Git worktree instead of a root clone.
-            parts = gitfolder.split("/")
+            parts = git_folder.split("/")
             if len(parts) > 2 and parts[-2] == "worktrees":
-                gitfolder = "/".join(parts[0:-2])
-            head = os.path.join(gitfolder, ref)
-            packedrefs = os.path.join(gitfolder, "packed-refs")
+                git_folder = "/".join(parts[0:-2])
+            head = os.path.join(git_folder, ref)
+            packedrefs = os.path.join(git_folder, "packed-refs")
             if os.path.isfile(head):
                 with open(head, "r", encoding="utf-8") as file:
-                    githash = file.readline().strip()
+                    git_hash = file.readline().strip()
             elif os.path.isfile(packedrefs):
                 # Git may pack refs into a single file. This code searches .git/packed-refs file for the current ref's hash.
                 # https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-pack-refs.html
@@ -174,26 +195,26 @@ def get_version_info(module_version_string="", silent=False):
                         continue
                     (line_hash, line_ref) = line.split(" ")
                     if ref == line_ref:
-                        githash = line_hash
+                        git_hash = line_hash
                         break
         else:
-            githash = head
-
-    version_info["git_hash"] = githash
-    # Fallback to 0 as a timestamp (will be treated as "unknown" in the engine).
-    version_info["git_timestamp"] = 0
+            git_hash = head
 
     # Get the UNIX timestamp of the build commit.
+    git_timestamp = 0
     if os.path.exists(".git"):
         try:
-            version_info["git_timestamp"] = subprocess.check_output(
-                ["git", "log", "-1", "--pretty=format:%ct", "--no-show-signature", githash]
-            ).decode("utf-8")
+            git_timestamp = subprocess.check_output(
+                ["git", "log", "-1", "--pretty=format:%ct", "--no-show-signature", git_hash], encoding="utf-8"
+            )
         except (subprocess.CalledProcessError, OSError):
             # `git` not found in PATH.
             pass
 
-    return version_info
+    return {
+        "git_hash": git_hash,
+        "git_timestamp": git_timestamp,
+    }
 
 
 def get_cmdline_bool(option, default):
@@ -396,9 +417,9 @@ def use_windows_spawn_fix(self, platform=None):
 
 
 def no_verbose(env):
-    from misc.utility.color import Ansi
+    from misc.utility.color import Ansi, is_stdout_color
 
-    colors = [Ansi.BLUE, Ansi.BOLD, Ansi.REGULAR, Ansi.RESET]
+    colors = [Ansi.BLUE, Ansi.BOLD, Ansi.REGULAR, Ansi.RESET] if is_stdout_color() else ["", "", "", ""]
 
     # There is a space before "..." to ensure that source file names can be
     # Ctrl + clicked in the VS Code terminal.
@@ -553,7 +574,7 @@ def glob_recursive(pattern, node="."):
 
 
 def precious_program(env, program, sources, **args):
-    program = env.ProgramOriginal(program, sources, **args)
+    program = env.Program(program, sources, **args)
     env.Precious(program)
     return program
 
@@ -635,6 +656,11 @@ def get_compiler_version(env):
     - metadata1, metadata2: Extra information
     - date: Date of the build
     """
+
+    global compiler_version_cache
+    if compiler_version_cache is not None:
+        return compiler_version_cache
+
     import shlex
 
     ret = {
@@ -681,7 +707,7 @@ def get_compiler_version(env):
                     ret["metadata1"] = split[1]
         except (subprocess.CalledProcessError, OSError):
             print_warning("Couldn't find vswhere to determine compiler version.")
-        return ret
+        return update_compiler_version_cache(ret)
 
     # Not using -dumpversion as some GCC distros only return major, and
     # Clang used to return hardcoded 4.2.1: # https://reviews.llvm.org/D56803
@@ -691,7 +717,7 @@ def get_compiler_version(env):
         ).strip()
     except (subprocess.CalledProcessError, OSError):
         print_warning("Couldn't parse CXX environment variable to infer compiler version.")
-        return ret
+        return update_compiler_version_cache(ret)
 
     match = re.search(
         r"(?:(?<=version )|(?<=\) )|(?<=^))"
@@ -734,7 +760,13 @@ def get_compiler_version(env):
         "apple_patch3",
     ]:
         ret[key] = int(ret[key] or -1)
-    return ret
+    return update_compiler_version_cache(ret)
+
+
+def update_compiler_version_cache(value):
+    global compiler_version_cache
+    compiler_version_cache = value
+    return value
 
 
 def using_gcc(env):
@@ -754,7 +786,7 @@ def show_progress(env):
     if env["ninja"]:
         return
 
-    NODE_COUNT_FILENAME = f"{base_folder_path}.scons_node_count"
+    NODE_COUNT_FILENAME = base_folder / ".scons_node_count"
 
     class ShowProgress:
         def __init__(self):
@@ -768,9 +800,10 @@ def show_progress(env):
 
             # Progress reporting is not available in non-TTY environments since it
             # messes with the output (for example, when writing to a file).
-            self.display = cast(bool, self.max and env["progress"] and sys.stdout.isatty())
+            self.display = cast(bool, env["progress"] and sys.stdout.isatty())
             if self.display and not self.max:
                 print_info("Performing initial build, progress percentage unavailable!")
+                self.display = False
 
         def __call__(self, node, *args, **kw):
             self.count += 1
@@ -853,9 +886,6 @@ def clean_cache(cache_path: str, cache_limit: int, verbose: bool) -> None:
 
 
 def prepare_cache(env) -> None:
-    if env.GetOption("clean"):
-        return
-
     cache_path = ""
     if env["cache_path"]:
         cache_path = cast(str, env["cache_path"])
@@ -878,11 +908,9 @@ def prepare_cache(env) -> None:
     # Convert GiB to bytes; treat negative numbers as 0 (unlimited).
     cache_limit = max(0, int(cache_limit * 1024 * 1024 * 1024))
     if env["verbose"]:
-        print(
-            "Current cache limit is {} (used: {})".format(
-                convert_size(cache_limit) if cache_limit else "∞",
-                convert_size(get_size(cache_path)),
-            )
+        print_info(
+            f"Current cache size is {convert_size(get_size(cache_path))}"
+            + (f" (limit: {convert_size(cache_limit)})" if cache_limit else "")
         )
 
     atexit.register(clean_cache, cache_path, cache_limit, env["verbose"])
@@ -907,21 +935,19 @@ def prepare_timer():
     def print_elapsed_time(time_at_start: float):
         time_elapsed = time.time() - time_at_start
         time_formatted = time.strftime("%H:%M:%S", time.gmtime(time_elapsed))
-        time_centiseconds = round((time_elapsed % 1) * 100)
-        print_info(f"Time elapsed: {time_formatted}.{time_centiseconds}")
+        time_centiseconds = (time_elapsed % 1) * 100
+        print_info(f"Time elapsed: {time_formatted}.{time_centiseconds:02.0f}")
 
     atexit.register(print_elapsed_time, time.time())
 
 
 def dump(env):
-    # Dumps latest build information for debugging purposes and external tools.
-    from json import dump
+    """
+    Dumps latest build information for debugging purposes and external tools.
+    """
 
-    def non_serializable(obj):
-        return "<<non-serializable: %s>>" % (type(obj).__qualname__)
-
-    with open(".scons_env.json", "w", encoding="utf-8", newline="\n") as f:
-        dump(env.Dictionary(), f, indent=4, default=non_serializable)
+    with open(".scons_env.json", "w", encoding="utf-8", newline="\n") as file:
+        file.write(env.Dump(format="json"))
 
 
 # Custom Visual Studio project generation logic that supports any platform that has a msvs.py
@@ -1030,8 +1056,22 @@ def generate_vs_project(env, original_args, project_name="godot"):
     platform = env["platform"]
     target = env["target"]
     arch = env["arch"]
+    host_arch = detect_arch()
+
+    host_platform = "windows"
+    if (
+        sys.platform.startswith("linux")
+        or sys.platform.startswith("dragonfly")
+        or sys.platform.startswith("freebsd")
+        or sys.platform.startswith("netbsd")
+        or sys.platform.startswith("openbsd")
+    ):
+        host_platform = "linuxbsd"
+    elif sys.platform == "darwin":
+        host_platform = "macos"
 
     vs_configuration = {}
+    host_vs_configuration = {}
     common_build_prefix = []
     confs = []
     for x in sorted(glob.glob("platform/*")):
@@ -1060,6 +1100,12 @@ def generate_vs_project(env, original_args, project_name="godot"):
             if platform == platform_name:
                 common_build_prefix = msvs.get_build_prefix(env)
                 vs_configuration = vsconf
+            if platform_name == host_platform:
+                host_vs_configuration = vsconf
+                for a in vsconf["arches"]:
+                    if host_arch == a["architecture"]:
+                        host_arch = a["platform"]
+                        break
         except Exception:
             pass
 
@@ -1217,29 +1263,29 @@ def generate_vs_project(env, original_args, project_name="godot"):
             properties.append(
                 "<ActiveProjectItemList_%s>;%s;</ActiveProjectItemList_%s>" % (x, ";".join(itemlist[x]), x)
             )
-        output = f"bin\\godot{env['PROGSUFFIX']}"
+        output = os.path.join("bin", f"godot{env['PROGSUFFIX']}")
 
         with open("misc/msvs/props.template", "r", encoding="utf-8") as file:
             props_template = file.read()
 
-        props_template = props_template.replace("%%VSCONF%%", vsconf)
         props_template = props_template.replace("%%CONDITION%%", condition)
         props_template = props_template.replace("%%PROPERTIES%%", "\n    ".join(properties))
         props_template = props_template.replace("%%EXTRA_ITEMS%%", "\n    ".join(extraItems))
 
         props_template = props_template.replace("%%OUTPUT%%", output)
 
-        proplist = [format_key_value(v) for v in list(env["CPPDEFINES"])]
+        proplist = [format_key_value(j) for j in list(env["CPPDEFINES"])]
         proplist += [format_key_value(j) for j in env.get("VSHINT_DEFINES", [])]
         props_template = props_template.replace("%%DEFINES%%", ";".join(proplist))
 
         proplist = [str(j) for j in env["CPPPATH"]]
         proplist += [str(j) for j in env.get("VSHINT_INCLUDES", [])]
+        proplist += [str(j) for j in get_default_include_paths(env)]
         props_template = props_template.replace("%%INCLUDES%%", ";".join(proplist))
 
-        proplist = env["CCFLAGS"]
-        proplist += [x for x in env["CXXFLAGS"] if not x.startswith("$")]
-        proplist += [str(j) for j in env.get("VSHINT_OPTIONS", [])]
+        proplist = [env.subst("$CCFLAGS")]
+        proplist += [env.subst("$CXXFLAGS")]
+        proplist += [env.subst("$VSHINT_OPTIONS")]
         props_template = props_template.replace("%%OPTIONS%%", " ".join(proplist))
 
         # Windows allows us to have spaces in paths, so we need
@@ -1270,17 +1316,17 @@ def generate_vs_project(env, original_args, project_name="godot"):
 
         commands = "scons"
         if len(common_build_prefix) == 0:
-            commands = "echo Starting SCons &amp;&amp; cmd /V /C " + commands
+            commands = "echo Starting SCons &amp; " + commands
         else:
-            common_build_prefix[0] = "echo Starting SCons &amp;&amp; cmd /V /C " + common_build_prefix[0]
+            common_build_prefix[0] = "echo Starting SCons &amp; " + common_build_prefix[0]
 
-        cmd = " ^&amp; ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)])
+        cmd = " ".join(common_build_prefix + [" ".join([commands] + common_build_postfix)])
         props_template = props_template.replace("%%BUILD%%", cmd)
 
-        cmd = " ^&amp; ".join(common_build_prefix + [" ".join([commands] + cmd_rebuild)])
+        cmd = " ".join(common_build_prefix + [" ".join([commands] + cmd_rebuild)])
         props_template = props_template.replace("%%REBUILD%%", cmd)
 
-        cmd = " ^&amp; ".join(common_build_prefix + [" ".join([commands] + cmd_clean)])
+        cmd = " ".join(common_build_prefix + [" ".join([commands] + cmd_clean)])
         props_template = props_template.replace("%%CLEAN%%", cmd)
 
         with open(
@@ -1311,18 +1357,45 @@ def generate_vs_project(env, original_args, project_name="godot"):
     section2 = []
     for conf in confs:
         godot_platform = conf["platform"]
+        has_editor = "editor" in conf["targets"]
+
+        # Skip any platforms that can build the editor and don't match the host platform.
+        #
+        # When both Windows and Mac define an editor target, it's defined as platform+target+arch (windows+editor+x64 for example).
+        # VS only supports two attributes, a "Configuration" and a "Platform", and we currently map our target to the Configuration
+        # (i.e. editor/template_debug/template_release), and our architecture to the "Platform" (i.e. x64, arm64, etc).
+        # Those two are not enough to disambiguate multiple godot targets for different godot platforms with the same architecture,
+        # i.e. editor|x64 would currently match both windows editor intel 64 and linux editor intel 64.
+        #
+        # TODO: More work is needed in order to support generating VS projects that unambiguously support all platform+target+arch variations.
+        # The VS "Platform" has to be a known architecture that VS recognizes, so we can only play around with the "Configuration" part of the combo.
+        if has_editor and godot_platform != host_vs_configuration["platform"]:
+            continue
+
         for p in conf["arches"]:
             sln_plat = p["platform"]
             proj_plat = sln_plat
             godot_arch = p["architecture"]
 
-            # Redirect editor configurations for non-Windows platforms to the Windows one, so the solution has all the permutations
-            # and VS doesn't complain about missing project configurations.
+            # Redirect editor configurations for platforms that don't support the editor target to the default editor target on the
+            # active host platform, so the solution has all the permutations and VS doesn't complain about missing project configurations.
             # These configurations are disabled, so they show up but won't build.
-            if godot_platform != "windows":
+            if not has_editor:
                 section1 += [f"editor|{sln_plat} = editor|{proj_plat}"]
-                section2 += [
-                    f"{{{proj_uuid}}}.editor|{proj_plat}.ActiveCfg = editor|{proj_plat}",
+                section2 += [f"{{{proj_uuid}}}.editor|{proj_plat}.ActiveCfg = editor|{host_arch}"]
+
+                configurations += [
+                    f'<ProjectConfiguration Include="editor|{proj_plat}">',
+                    "  <Configuration>editor</Configuration>",
+                    f"  <Platform>{proj_plat}</Platform>",
+                    "</ProjectConfiguration>",
+                ]
+
+                properties += [
+                    f"<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='editor|{proj_plat}'\">",
+                    "  <GodotConfiguration>editor</GodotConfiguration>",
+                    f"  <GodotPlatform>{proj_plat}</GodotPlatform>",
+                    "</PropertyGroup>",
                 ]
 
             for t in conf["targets"]:
@@ -1346,21 +1419,6 @@ def generate_vs_project(env, original_args, project_name="godot"):
                     "</PropertyGroup>",
                 ]
 
-                if godot_platform != "windows":
-                    configurations += [
-                        f'<ProjectConfiguration Include="editor|{proj_plat}">',
-                        "  <Configuration>editor</Configuration>",
-                        f"  <Platform>{proj_plat}</Platform>",
-                        "</ProjectConfiguration>",
-                    ]
-
-                    properties += [
-                        f"<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='editor|{proj_plat}'\">",
-                        "  <GodotConfiguration>editor</GodotConfiguration>",
-                        f"  <GodotPlatform>{proj_plat}</GodotPlatform>",
-                        "</PropertyGroup>",
-                    ]
-
                 p = f"{project_name}.{godot_platform}.{godot_target}.{godot_arch}.generated.props"
                 imports += [
                     f'<Import Project="$(MSBuildProjectDirectory)\\{p}" Condition="Exists(\'$(MSBuildProjectDirectory)\\{p}\')"/>'
@@ -1408,6 +1466,11 @@ def generate_vs_project(env, original_args, project_name="godot"):
         sys.exit()
 
 
+############################################################
+# FILE GENERATION & FORMATTING
+############################################################
+
+
 def generate_copyright_header(filename: str) -> str:
     MARGIN = 70
     TEMPLATE = """\
@@ -1441,81 +1504,87 @@ def generate_copyright_header(filename: str) -> str:
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 """
-    filename = filename.split("/")[-1].ljust(MARGIN)
-    if len(filename) > MARGIN:
+    if len(filename := os.path.basename(filename).ljust(MARGIN)) > MARGIN:
         print_warning(f'Filename "{filename}" too large for copyright header.')
     return TEMPLATE % filename
 
 
 @contextlib.contextmanager
 def generated_wrapper(
-    path,  # FIXME: type with `Union[str, Node, List[Node]]` when pytest conflicts are resolved
+    path: str,
     guard: Optional[bool] = None,
-    prefix: str = "",
-    suffix: str = "",
 ) -> Generator[TextIOBase, None, None]:
     """
     Wrapper class to automatically handle copyright headers and header guards
     for generated scripts. Meant to be invoked via `with` statement similar to
     creating a file.
 
-    - `path`: The path of the file to be created. Can be passed a raw string, an
-    isolated SCons target, or a full SCons target list. If a target list contains
-    multiple entries, produces a warning & only creates the first entry.
-    - `guard`: Optional bool to determine if a header guard should be added. If
-    unassigned, header guards are determined by the file extension.
-    - `prefix`: Custom prefix to prepend to a header guard. Produces a warning if
-    provided a value when `guard` evaluates to `False`.
-    - `suffix`: Custom suffix to append to a header guard. Produces a warning if
-    provided a value when `guard` evaluates to `False`.
+    - `path`: The path of the file to be created.
+    - `guard`: Optional bool to determine if `#pragma once` should be added. If
+    unassigned, the value is determined by file extension.
     """
 
-    # Handle unfiltered SCons target[s] passed as path.
-    if not isinstance(path, str):
-        if isinstance(path, list):
-            if len(path) > 1:
-                print_warning(
-                    f"Attempting to use generated wrapper with multiple targets; will only use first entry: {path[0]}"
-                )
-            path = path[0]
-        if not hasattr(path, "get_abspath"):
-            raise TypeError(f'Expected type "str", "Node" or "List[Node]"; was passed {type(path)}.')
-        path = path.get_abspath()
-
-    path = str(path).replace("\\", "/")
-    if guard is None:
-        guard = path.endswith((".h", ".hh", ".hpp", ".inc"))
-    if not guard and (prefix or suffix):
-        print_warning(f'Trying to assign header guard prefix/suffix while `guard` is disabled: "{path}".')
-
-    header_guard = ""
-    if guard:
-        if prefix:
-            prefix += "_"
-        if suffix:
-            suffix = f"_{suffix}"
-        split = path.split("/")[-1].split(".")
-        header_guard = (f"{prefix}{split[0]}{suffix}.{'.'.join(split[1:])}".upper()
-                .replace(".", "_").replace("-", "_").replace(" ", "_").replace("__", "_"))  # fmt: skip
-
     with open(path, "wt", encoding="utf-8", newline="\n") as file:
-        file.write(generate_copyright_header(path))
-        file.write("\n/* THIS FILE IS GENERATED. EDITS WILL BE LOST. */\n\n")
+        if not path.endswith(".out"):  # For test output, we only care about the content.
+            file.write(generate_copyright_header(path))
+            file.write("\n/* THIS FILE IS GENERATED. EDITS WILL BE LOST. */\n\n")
 
-        if guard:
-            file.write(f"#ifndef {header_guard}\n")
-            file.write(f"#define {header_guard}\n\n")
+            if guard is None:
+                guard = path.endswith((".h", ".hh", ".hpp", ".hxx", ".inc"))
+            if guard:
+                file.write("#pragma once\n\n")
 
         with StringIO(newline="\n") as str_io:
             yield str_io
             file.write(str_io.getvalue().strip() or "/* NO CONTENT */")
 
-        if guard:
-            file.write(f"\n\n#endif // {header_guard}")
-
         file.write("\n")
 
 
+def get_buffer(path: str) -> bytes:
+    with open(path, "rb") as file:
+        return file.read()
+
+
+def compress_buffer(buffer: bytes) -> bytes:
+    # Use maximum zlib compression level to further reduce file size
+    # (at the cost of initial build times).
+    return zlib.compress(buffer, zlib.Z_BEST_COMPRESSION)
+
+
+def format_buffer(buffer: bytes, indent: int = 0, width: int = 120, initial_indent: bool = False) -> str:
+    return textwrap.fill(
+        ", ".join(str(byte) for byte in buffer),
+        width=width,
+        initial_indent="\t" * indent if initial_indent else "",
+        subsequent_indent="\t" * indent,
+        tabsize=4,
+    )
+
+
+############################################################
+# CSTRING PARSING
+############################################################
+
+C_ESCAPABLES = [
+    ("\\", "\\\\"),
+    ("\a", "\\a"),
+    ("\b", "\\b"),
+    ("\f", "\\f"),
+    ("\n", "\\n"),
+    ("\r", "\\r"),
+    ("\t", "\\t"),
+    ("\v", "\\v"),
+    # ("'", "\\'"),  # Skip, as we're only dealing with full strings.
+    ('"', '\\"'),
+]
+C_ESCAPE_TABLE = str.maketrans(dict((x, y) for x, y in C_ESCAPABLES))
+
+
+def to_escaped_cstring(value: str) -> str:
+    return value.translate(C_ESCAPE_TABLE)
+
+
 def to_raw_cstring(value: Union[str, List[str]]) -> str:
     MAX_LITERAL = 16 * 1024
 
@@ -1553,4 +1622,23 @@ def to_raw_cstring(value: Union[str, List[str]]) -> str:
 
         split += [segment]
 
-    return " ".join(f'R"<!>({x.decode()})<!>"' for x in split)
+    if len(split) == 1:
+        return f'R"<!>({split[0].decode()})<!>"'
+    else:
+        # Wrap multiple segments in parenthesis to suppress `string-concatenation` warnings on clang.
+        return "({})".format(" ".join(f'R"<!>({segment.decode()})<!>"' for segment in split))
+
+
+def get_default_include_paths(env):
+    if env.msvc:
+        return []
+    compiler = env.subst("$CXX")
+    target = os.path.join(env.Dir("#main").abspath, "main.cpp")
+    args = [compiler, target, "-x", "c++", "-v"]
+    ret = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+    output = ret.stdout
+    match = re.search(r"#include <\.\.\.> search starts here:([\S\s]*)End of search list.", output)
+    if not match:
+        print_warning("Failed to find the include paths in the compiler output.")
+        return []
+    return [x.strip() for x in match[1].strip().splitlines()]
diff --git a/engine/misc/dist/document_icons/gdscript.svg b/engine/misc/dist/document_icons/gdscript.svg
index 27326f67..8145f759 100644
--- a/engine/misc/dist/document_icons/gdscript.svg
+++ b/engine/misc/dist/document_icons/gdscript.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.543-141.93-39.865-197.505-34.983 2.17-68.048 31.457-117.656-37.966-177.026m-415.32-32.623h302.11c77.128-2.02 126.554 37.835 178.444 84.881l123.665 109.83c63.819 56.94 89.13 110.625 96 188.174v542.886h-700.219z"/><text x="207.666" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="207.666" y="878.644" font-size="112">GDSCRIPT</tspan></text><path fill="#478cbf" d="m481.818 300.713-17.037 68.149a150.92 150.92 0 0 0 -20.81 8.43l-60.015-36.021-42.683 42.683 36.079 60.19a150.92 150.92 0 0 0 -8.608 20.693l-68.031 16.978v60.368l68.149 17.037a150.92 150.92 0 0 0 8.43 20.752l-36.021 60.072 42.683 42.683 60.19-36.079a150.92 150.92 0 0 0 20.693 8.608l16.978 68.031h60.368l17.037-68.149a150.92 150.92 0 0 0 20.752-8.43l60.072 36.021 42.683-42.683-36.079-60.19a150.92 150.92 0 0 0 8.608-20.693l68.031-16.978v-60.368l-68.149-17.037a150.92 150.92 0 0 0 -8.43-20.752l36.021-60.072-42.683-42.683-60.19 36.079a150.92 150.92 0 0 0 -20.693-8.608l-16.978-68.031h-60.368zm30.184 150.92a60.368 60.368 0 0 1 60.368 60.367 60.368 60.368 0 0 1 -60.368 60.368 60.368 60.368 0 0 1 -60.368-60.368 60.368 60.368 0 0 1 60.368-60.368z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.543-141.93-39.865-197.505-34.983 2.17-68.048 31.457-117.656-37.966-177.026m-415.32-32.623h302.11c77.128-2.02 126.554 37.835 178.444 84.881l123.665 109.83c63.819 56.94 89.13 110.625 96 188.174v542.886h-700.219z"/><text x="207.666" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="207.666" y="878.644" font-size="112">GDSCRIPT</tspan></text><path fill="#478cbf" d="m481.818 300.713-17.037 68.149a150.92 150.92 0 0 0 -20.81 8.43l-60.015-36.021-42.683 42.683 36.079 60.19a150.92 150.92 0 0 0 -8.608 20.693l-68.031 16.978v60.368l68.149 17.037a150.92 150.92 0 0 0 8.43 20.752l-36.021 60.072 42.683 42.683 60.19-36.079a150.92 150.92 0 0 0 20.693 8.608l16.978 68.031h60.368l17.037-68.149a150.92 150.92 0 0 0 20.752-8.43l60.072 36.021 42.683-42.683-36.079-60.19a150.92 150.92 0 0 0 8.608-20.693l68.031-16.978v-60.368l-68.149-17.037a150.92 150.92 0 0 0 -8.43-20.752l36.021-60.072-42.683-42.683-60.19 36.079a150.92 150.92 0 0 0 -20.693-8.608l-16.978-68.031h-60.368zm30.184 150.92a60.368 60.368 0 0 1 60.368 60.367 60.368 60.368 0 0 1 -60.368 60.368 60.368 60.368 0 0 1 -60.368-60.368 60.368 60.368 0 0 1 60.368-60.368z"/></svg>
diff --git a/engine/misc/dist/document_icons/gdscript_extra_small.svg b/engine/misc/dist/document_icons/gdscript_extra_small.svg
index 0a4ce3c2..e47f27a4 100644
--- a/engine/misc/dist/document_icons/gdscript_extra_small.svg
+++ b/engine/misc/dist/document_icons/gdscript_extra_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51H7.25c1.205-.032 1.977.591 2.788 1.326L11.97 3.81c.998.89 1.393 1.729 1.5 2.94v8.483H2.53z"/><path fill="#478cbf" d="M7.39 4.721l-.346 1.38a3.056 3.056 0 0 0-.421.171l-1.216-.73-.864.865.73 1.219a3.056 3.056 0 0 0-.174.419l-1.377.344V9.61l1.38.345a3.056 3.056 0 0 0 .17.42l-.729 1.217.864.864 1.22-.73a3.056 3.056 0 0 0 .418.174l.344 1.377h1.222l.345-1.38a3.056 3.056 0 0 0 .42-.17l1.217.73.864-.865-.73-1.219a3.056 3.056 0 0 0 .174-.42l1.378-.343V8.39l-1.38-.345a3.056 3.056 0 0 0-.17-.42l.729-1.217-.865-.864-1.219.73a3.056 3.056 0 0 0-.419-.174L8.611 4.72H7.39zM8 7.777A1.222 1.222 0 0 1 9.223 9 1.222 1.222 0 0 1 8 10.222 1.222 1.222 0 0 1 6.778 9 1.222 1.222 0 0 1 8 7.777z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51H7.25c1.205-.032 1.977.591 2.788 1.326L11.97 3.81c.998.89 1.393 1.729 1.5 2.94v8.483H2.53z"/><path fill="#478cbf" d="M7.39 4.721l-.346 1.38a3.056 3.056 0 0 0-.421.171l-1.216-.73-.864.865.73 1.219a3.056 3.056 0 0 0-.174.419l-1.377.344V9.61l1.38.345a3.056 3.056 0 0 0 .17.42l-.729 1.217.864.864 1.22-.73a3.056 3.056 0 0 0 .418.174l.344 1.377h1.222l.345-1.38a3.056 3.056 0 0 0 .42-.17l1.217.73.864-.865-.73-1.219a3.056 3.056 0 0 0 .174-.42l1.378-.343V8.39l-1.38-.345a3.056 3.056 0 0 0-.17-.42l.729-1.217-.865-.864-1.219.73a3.056 3.056 0 0 0-.419-.174L8.611 4.72H7.39zM8 7.777A1.222 1.222 0 0 1 9.223 9 1.222 1.222 0 0 1 8 10.222 1.222 1.222 0 0 1 6.778 9 1.222 1.222 0 0 1 8 7.777z"/></svg>
diff --git a/engine/misc/dist/document_icons/gdscript_small.svg b/engine/misc/dist/document_icons/gdscript_small.svg
index fce35a42..68efb178 100644
--- a/engine/misc/dist/document_icons/gdscript_small.svg
+++ b/engine/misc/dist/document_icons/gdscript_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532M5.059 1.536H14.5c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965H5.059z"/><path fill="#478cbf" d="M15.057 11.397l-.532 2.13a4.716 4.716 0 0 0-.65.263l-1.876-1.126-1.334 1.334 1.128 1.881a4.716 4.716 0 0 0-.27.647l-2.125.53v1.887l2.13.532a4.716 4.716 0 0 0 .263.649L10.665 22 12 23.335l1.881-1.127a4.716 4.716 0 0 0 .647.269l.53 2.125h1.887l.532-2.13a4.716 4.716 0 0 0 .649-.263l1.877 1.126 1.334-1.334-1.128-1.88a4.716 4.716 0 0 0 .27-.647l2.125-.531v-1.886l-2.13-.533a4.716 4.716 0 0 0-.263-.648l1.126-1.878-1.334-1.333-1.881 1.127a4.716 4.716 0 0 0-.647-.269l-.53-2.126h-1.887zm.944 4.716A1.887 1.887 0 0 1 17.887 18a1.887 1.887 0 0 1-1.886 1.886A1.887 1.887 0 0 1 14.114 18a1.887 1.887 0 0 1 1.887-1.887z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532M5.059 1.536H14.5c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965H5.059z"/><path fill="#478cbf" d="M15.057 11.397l-.532 2.13a4.716 4.716 0 0 0-.65.263l-1.876-1.126-1.334 1.334 1.128 1.881a4.716 4.716 0 0 0-.27.647l-2.125.53v1.887l2.13.532a4.716 4.716 0 0 0 .263.649L10.665 22 12 23.335l1.881-1.127a4.716 4.716 0 0 0 .647.269l.53 2.125h1.887l.532-2.13a4.716 4.716 0 0 0 .649-.263l1.877 1.126 1.334-1.334-1.128-1.88a4.716 4.716 0 0 0 .27-.647l2.125-.531v-1.886l-2.13-.533a4.716 4.716 0 0 0-.263-.648l1.126-1.878-1.334-1.333-1.881 1.127a4.716 4.716 0 0 0-.647-.269l-.53-2.126h-1.887zm.944 4.716A1.887 1.887 0 0 1 17.887 18a1.887 1.887 0 0 1-1.886 1.886A1.887 1.887 0 0 1 14.114 18a1.887 1.887 0 0 1 1.887-1.887z"/></svg>
diff --git a/engine/misc/dist/document_icons/project.svg b/engine/misc/dist/document_icons/project.svg
index 3f71da74..0f26ed47 100644
--- a/engine/misc/dist/document_icons/project.svg
+++ b/engine/misc/dist/document_icons/project.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.542-141.93-39.864-197.505-34.983 2.17-68.048 31.457-117.655-37.966-177.025m-415.32-32.625h302.11c77.128-2.02 126.554 37.836 178.444 84.882l123.665 109.83c63.819 56.94 89.13 110.624 96 188.174v542.885h-700.219z"/><g stroke-width=".32"><path fill="#fff" d="m712.572 590.17s-.666-4.089-1.056-4.052l-74.179 7.157a12.056 12.056 0 0 0 -10.9 11.191l-2.038 29.21-57.387 4.094-3.905-26.472c-.868-5.888-6.01-10.327-11.961-10.327h-78.292c-5.95 0-11.09 4.439-11.96 10.327l-3.906 26.472-57.387-4.095-2.038-29.208a12.057 12.057 0 0 0 -10.901-11.194l-74.214-7.155c-.384-.037-.665 4.056-1.049 4.056l-.1 16.052 62.853 10.136 2.059 29.47c.416 5.965 5.23 10.788 11.2 11.217l79.035 5.638c.299.021.594.033.89.033 5.94 0 11.072-4.44 11.941-10.329l4.017-27.237h57.414l4.017 27.237c.867 5.886 6.006 10.326 11.953 10.326.292 0 .583-.009.868-.03l79.046-5.638c5.967-.428 10.783-5.252 11.2-11.218l2.056-29.469 62.826-10.18z"/><path fill="#478cbf" d="m311.398 469.127v121.042c.221.003.443.01.662.031l74.207 7.155c3.88703.37478 6.93367 3.50431 7.204 7.4l2.289 32.756 64.731 4.619 4.46-30.234c.57822-3.91981 3.94178-6.82377 7.904-6.824h78.292c3.96222.00023 7.32578 2.90419 7.904 6.824l4.458 30.234 64.733-4.619 2.287-32.757c.27147-3.89481 3.31693-7.02357 7.203-7.4l74.178-7.154c.22-.02.44-.028.66-.031v-9.658l.032-.01v-111.373c10.4496-13.15476 20.3441-27.66594 27.925-39.874-11.586-19.722-25.78-37.347-40.954-53.677-14.073 7.083-27.74 15.108-40.65 23.647-6.46-6.421-13.736-11.674-20.883-17.164-7.022-5.64-14.936-9.775-22.44-14.593 2.234-16.641 3.339-33.024 3.783-50.122-19.366-9.747-40.017-16.209-60.905-20.85-8.34 14.017-15.967 29.196-22.61 44.035-7.876-1.316-15.79-1.804-23.713-1.898v-.013c-.055 0-.107.013-.154.013-.05 0-.1-.013-.15-.013v.013c-7.937.095-15.845.582-23.724 1.898-6.638-14.84-14.261-30.018-22.613-44.035-20.879 4.641-41.532 11.104-60.895 20.85.442 17.098 1.548 33.48 3.788 50.122-7.52 4.818-15.423 8.953-22.447 14.592-7.137 5.491-14.425 10.745-20.887 17.165-12.91-8.539-26.573-16.564-40.65-23.646-15.173 16.329-29.36 33.953-40.95 53.676 9.10746 14.29708 18.8786 28.66782 27.925 39.873z"/><path fill="#478cbf" d="m646 612.615-2.3 32.93a7.992 7.992 0 0 1 -7.402 7.413l-79.044 5.64a7.991 7.991 0 0 1 -8.474-6.806l-4.531-30.74h-64.496l-4.533 30.74c-.608 4.137-4.308 7.112-8.474 6.806l-79.043-5.64a7.992 7.992 0 0 1 -7.402-7.413l-2.3-32.931-66.726-6.434c.032 7.173.124 15.028.124 16.592 0 70.472 89.397 104.344 200.465 104.734h.273c111.07-.39 200.435-34.262 200.435-104.734 0-1.592.096-9.416.129-16.592z"/><path fill="#fff" d="m451.527 518.261c0 24.71-20.02 44.725-44.72 44.725-24.688 0-44.714-20.016-44.714-44.725 0-24.691 20.026-44.697 44.713-44.697 24.7 0 44.72 20.006 44.72 44.697"/><path fill="#414042" d="m440.766 520.915c0 16.388-13.283 29.671-29.684 29.671-16.393 0-29.684-13.283-29.684-29.671 0-16.39 13.29-29.685 29.684-29.685 16.401 0 29.684 13.295 29.684 29.685"/><path fill="#fff" d="m511.997 567.054c-7.951 0-14.394-5.86-14.394-13.081v-41.17c0-7.216 6.444-13.08 14.394-13.08s14.408 5.864 14.408 13.08v41.17c0 7.222-6.458 13.081-14.408 13.081m60.477-48.793c0 24.71 20.02 44.725 44.724 44.725 24.686 0 44.71-20.016 44.71-44.725 0-24.691-20.024-44.697-44.71-44.697-24.704 0-44.724 20.006-44.724 44.697"/><path fill="#414042" d="m583.238 520.915c0 16.388 13.279 29.671 29.668 29.671 16.405 0 29.683-13.283 29.683-29.671 0-16.39-13.278-29.685-29.684-29.685-16.388 0-29.668 13.295-29.668 29.685"/></g><text x="234.416" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="234.416" y="878.644" font-size="112">PROJECT</tspan></text></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.542-141.93-39.864-197.505-34.983 2.17-68.048 31.457-117.655-37.966-177.025m-415.32-32.625h302.11c77.128-2.02 126.554 37.836 178.444 84.882l123.665 109.83c63.819 56.94 89.13 110.624 96 188.174v542.885h-700.219z"/><g stroke-width=".32"><path fill="#fff" d="m712.572 590.17s-.666-4.089-1.056-4.052l-74.179 7.157a12.056 12.056 0 0 0 -10.9 11.191l-2.038 29.21-57.387 4.094-3.905-26.472c-.868-5.888-6.01-10.327-11.961-10.327h-78.292c-5.95 0-11.09 4.439-11.96 10.327l-3.906 26.472-57.387-4.095-2.038-29.208a12.057 12.057 0 0 0 -10.901-11.194l-74.214-7.155c-.384-.037-.665 4.056-1.049 4.056l-.1 16.052 62.853 10.136 2.059 29.47c.416 5.965 5.23 10.788 11.2 11.217l79.035 5.638c.299.021.594.033.89.033 5.94 0 11.072-4.44 11.941-10.329l4.017-27.237h57.414l4.017 27.237c.867 5.886 6.006 10.326 11.953 10.326.292 0 .583-.009.868-.03l79.046-5.638c5.967-.428 10.783-5.252 11.2-11.218l2.056-29.469 62.826-10.18z"/><path fill="#478cbf" d="m311.398 469.127v121.042c.221.003.443.01.662.031l74.207 7.155c3.88703.37478 6.93367 3.50431 7.204 7.4l2.289 32.756 64.731 4.619 4.46-30.234c.57822-3.91981 3.94178-6.82377 7.904-6.824h78.292c3.96222.00023 7.32578 2.90419 7.904 6.824l4.458 30.234 64.733-4.619 2.287-32.757c.27147-3.89481 3.31693-7.02357 7.203-7.4l74.178-7.154c.22-.02.44-.028.66-.031v-9.658l.032-.01v-111.373c10.4496-13.15476 20.3441-27.66594 27.925-39.874-11.586-19.722-25.78-37.347-40.954-53.677-14.073 7.083-27.74 15.108-40.65 23.647-6.46-6.421-13.736-11.674-20.883-17.164-7.022-5.64-14.936-9.775-22.44-14.593 2.234-16.641 3.339-33.024 3.783-50.122-19.366-9.747-40.017-16.209-60.905-20.85-8.34 14.017-15.967 29.196-22.61 44.035-7.876-1.316-15.79-1.804-23.713-1.898v-.013c-.055 0-.107.013-.154.013-.05 0-.1-.013-.15-.013v.013c-7.937.095-15.845.582-23.724 1.898-6.638-14.84-14.261-30.018-22.613-44.035-20.879 4.641-41.532 11.104-60.895 20.85.442 17.098 1.548 33.48 3.788 50.122-7.52 4.818-15.423 8.953-22.447 14.592-7.137 5.491-14.425 10.745-20.887 17.165-12.91-8.539-26.573-16.564-40.65-23.646-15.173 16.329-29.36 33.953-40.95 53.676 9.10746 14.29708 18.8786 28.66782 27.925 39.873z"/><path fill="#478cbf" d="m646 612.615-2.3 32.93a7.992 7.992 0 0 1 -7.402 7.413l-79.044 5.64a7.991 7.991 0 0 1 -8.474-6.806l-4.531-30.74h-64.496l-4.533 30.74c-.608 4.137-4.308 7.112-8.474 6.806l-79.043-5.64a7.992 7.992 0 0 1 -7.402-7.413l-2.3-32.931-66.726-6.434c.032 7.173.124 15.028.124 16.592 0 70.472 89.397 104.344 200.465 104.734h.273c111.07-.39 200.435-34.262 200.435-104.734 0-1.592.096-9.416.129-16.592z"/><path fill="#fff" d="m451.527 518.261c0 24.71-20.02 44.725-44.72 44.725-24.688 0-44.714-20.016-44.714-44.725 0-24.691 20.026-44.697 44.713-44.697 24.7 0 44.72 20.006 44.72 44.697"/><path fill="#414042" d="m440.766 520.915c0 16.388-13.283 29.671-29.684 29.671-16.393 0-29.684-13.283-29.684-29.671 0-16.39 13.29-29.685 29.684-29.685 16.401 0 29.684 13.295 29.684 29.685"/><path fill="#fff" d="m511.997 567.054c-7.951 0-14.394-5.86-14.394-13.081v-41.17c0-7.216 6.444-13.08 14.394-13.08s14.408 5.864 14.408 13.08v41.17c0 7.222-6.458 13.081-14.408 13.081m60.477-48.793c0 24.71 20.02 44.725 44.724 44.725 24.686 0 44.71-20.016 44.71-44.725 0-24.691-20.024-44.697-44.71-44.697-24.704 0-44.724 20.006-44.724 44.697"/><path fill="#414042" d="m583.238 520.915c0 16.388 13.279 29.671 29.668 29.671 16.405 0 29.683-13.283 29.683-29.671 0-16.39-13.278-29.685-29.684-29.685-16.388 0-29.668 13.295-29.668 29.685"/></g><text x="234.416" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="234.416" y="878.644" font-size="112">PROJECT</tspan></text></svg>
diff --git a/engine/misc/dist/document_icons/project_extra_small.svg b/engine/misc/dist/document_icons/project_extra_small.svg
index 6b659fd3..da19ddf2 100644
--- a/engine/misc/dist/document_icons/project_extra_small.svg
+++ b/engine/misc/dist/document_icons/project_extra_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51h4.721c1.205-.032 1.977.591 2.788 1.326l1.932 1.716c.998.89 1.393 1.729 1.5 2.94v8.483h-10.94z"/><g stroke-width=".32"><path fill="#fff" d="m12.062 10.583s-.014-.083-.022-.082l-1.502.145a.244.244 0 0 0 -.22.226l-.042.592-1.162.083-.079-.536a.246.246 0 0 0 -.242-.21h-1.585c-.12 0-.225.09-.243.21l-.079.536-1.162-.083-.041-.592a.244.244 0 0 0 -.22-.226l-1.505-.146c-.007-.001-.013.082-.02.082l-.003.325 1.273.205.042.597c.008.12.105.218.226.227l1.6.114h.019c.12 0 .224-.089.242-.208l.081-.552h1.163l.08.552a.246.246 0 0 0 .26.208l1.601-.114a.246.246 0 0 0 .227-.227l.042-.597 1.272-.206z"/><path fill="#478cbf" d="m3.938 8.132v2.45l.013.001 1.503.145c.078773.0076.1405059.07105.146.15l.046.663 1.311.094.09-.612c.01187-.07924.079879-.137895.16-.138h1.586c.080121.000105.1481303.05876.16.138l.09.612 1.311-.094.046-.663c.0055-.07895.06723-.142375.146-.15l1.502-.145h.014v-2.451c.22118-.2597567.402804-.5673567.566-.808-.236303-.3914463-.514617-.7559371-.83-1.087-.283508.1437236-.558316.3040004-.823.48-.13-.13-.278-.237-.422-.348-.143-.115-.303-.198-.455-.296.044019-.3366902.069724-.6755224.077-1.015-.392294-.1911688-.8067944-.3329185-1.234-.422-.1691916.2883902-.3217734.5862085-.457.892-.158761-.0253078-.3192359-.0383464-.48-.039h-.004-.003c-.16.002-.32.012-.48.039-.135411-.3058816-.288331-.6037083-.458-.892-.4268603.0891708-.841019.2309186-1.233.422.009.346.031.678.076 1.015-.152.098-.312.181-.454.296-.145.11-.292.217-.423.347-.264694-.1756817-.5395029-.3356251-.823-.479-.307.331-.595.688-.83 1.087.1718588.2982703.3967405.5717122.566.808z"/><path fill="#478cbf" d="m10.714 11.037-.047.667a.162.162 0 0 1 -.15.15l-1.6.114a.162.162 0 0 1 -.172-.137l-.092-.623h-1.306l-.092.623a.162.162 0 0 1 -.171.137l-1.6-.114a.162.162 0 0 1 -.15-.15l-.047-.667-1.351-.13.002.336c0 1.427 1.81 2.113 4.06 2.12h.005c2.25-.007 4.059-.693 4.059-2.12l.002-.336z"/><path fill="#fff" d="m6.776 9.127a.905.905 0 1 1 -1.811 0 .905.905 0 0 1 1.81 0"/><path fill="#414042" d="m6.558 9.18a.6.6 0 1 1 -1.202 0 .6.6 0 0 1 1.202 0"/><path fill="#fff" d="m8 10.115c-.16 0-.291-.119-.291-.265v-.834c0-.146.13-.265.291-.265s.292.119.292.265v.834c0 .146-.13.265-.292.265m1.225-.988a.906.906 0 1 0 1.81 0 .906.906 0 0 0 -1.81 0"/><path fill="#414042" d="m9.443 9.18a.6.6 0 1 0 1.201 0 .6.6 0 0 0 -1.201 0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51h4.721c1.205-.032 1.977.591 2.788 1.326l1.932 1.716c.998.89 1.393 1.729 1.5 2.94v8.483h-10.94z"/><g stroke-width=".32"><path fill="#fff" d="m12.062 10.583s-.014-.083-.022-.082l-1.502.145a.244.244 0 0 0 -.22.226l-.042.592-1.162.083-.079-.536a.246.246 0 0 0 -.242-.21h-1.585c-.12 0-.225.09-.243.21l-.079.536-1.162-.083-.041-.592a.244.244 0 0 0 -.22-.226l-1.505-.146c-.007-.001-.013.082-.02.082l-.003.325 1.273.205.042.597c.008.12.105.218.226.227l1.6.114h.019c.12 0 .224-.089.242-.208l.081-.552h1.163l.08.552a.246.246 0 0 0 .26.208l1.601-.114a.246.246 0 0 0 .227-.227l.042-.597 1.272-.206z"/><path fill="#478cbf" d="m3.938 8.132v2.45l.013.001 1.503.145c.078773.0076.1405059.07105.146.15l.046.663 1.311.094.09-.612c.01187-.07924.079879-.137895.16-.138h1.586c.080121.000105.1481303.05876.16.138l.09.612 1.311-.094.046-.663c.0055-.07895.06723-.142375.146-.15l1.502-.145h.014v-2.451c.22118-.2597567.402804-.5673567.566-.808-.236303-.3914463-.514617-.7559371-.83-1.087-.283508.1437236-.558316.3040004-.823.48-.13-.13-.278-.237-.422-.348-.143-.115-.303-.198-.455-.296.044019-.3366902.069724-.6755224.077-1.015-.392294-.1911688-.8067944-.3329185-1.234-.422-.1691916.2883902-.3217734.5862085-.457.892-.158761-.0253078-.3192359-.0383464-.48-.039h-.004-.003c-.16.002-.32.012-.48.039-.135411-.3058816-.288331-.6037083-.458-.892-.4268603.0891708-.841019.2309186-1.233.422.009.346.031.678.076 1.015-.152.098-.312.181-.454.296-.145.11-.292.217-.423.347-.264694-.1756817-.5395029-.3356251-.823-.479-.307.331-.595.688-.83 1.087.1718588.2982703.3967405.5717122.566.808z"/><path fill="#478cbf" d="m10.714 11.037-.047.667a.162.162 0 0 1 -.15.15l-1.6.114a.162.162 0 0 1 -.172-.137l-.092-.623h-1.306l-.092.623a.162.162 0 0 1 -.171.137l-1.6-.114a.162.162 0 0 1 -.15-.15l-.047-.667-1.351-.13.002.336c0 1.427 1.81 2.113 4.06 2.12h.005c2.25-.007 4.059-.693 4.059-2.12l.002-.336z"/><path fill="#fff" d="m6.776 9.127a.905.905 0 1 1 -1.811 0 .905.905 0 0 1 1.81 0"/><path fill="#414042" d="m6.558 9.18a.6.6 0 1 1 -1.202 0 .6.6 0 0 1 1.202 0"/><path fill="#fff" d="m8 10.115c-.16 0-.291-.119-.291-.265v-.834c0-.146.13-.265.291-.265s.292.119.292.265v.834c0 .146-.13.265-.292.265m1.225-.988a.906.906 0 1 0 1.81 0 .906.906 0 0 0 -1.81 0"/><path fill="#414042" d="m9.443 9.18a.6.6 0 1 0 1.201 0 .6.6 0 0 0 -1.201 0"/></g></svg>
diff --git a/engine/misc/dist/document_icons/project_small.svg b/engine/misc/dist/document_icons/project_small.svg
index fd50f25d..03b73e8f 100644
--- a/engine/misc/dist/document_icons/project_small.svg
+++ b/engine/misc/dist/document_icons/project_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532m-12.979-1.019h9.441c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965h-21.882z"/><g stroke-width=".32"><path fill="#fff" d="m22.268 20.443s-.02-.128-.033-.127l-2.318.224a.377.377 0 0 0 -.34.35l-.064.912-1.793.128-.122-.827a.38.38 0 0 0 -.374-.323h-2.447a.38.38 0 0 0 -.374.323l-.122.827-1.793-.128-.064-.913a.377.377 0 0 0 -.34-.35l-2.32-.223c-.011-.001-.02.127-.032.127l-.003.501 1.964.317.064.921a.38.38 0 0 0 .35.35l2.47.177h.028a.38.38 0 0 0 .373-.322l.125-.851h1.795l.125.851a.38.38 0 0 0 .4.322l2.471-.176a.38.38 0 0 0 .35-.351l.064-.92 1.964-.32z"/><path fill="#478cbf" d="m9.732 16.66v3.783h.02l2.32.224c.120882.01233.215393.109796.224.231l.072 1.024 2.023.144.14-.945c.01825-.121952.122691-.212385.246-.213h2.447c.123688.000122.228694.09067.247.213l.14.945 2.022-.144.072-1.024c.0091-.121156.104074-.218195.225-.23l2.318-.225h.02v-.302h.001v-3.481c.337369-.403598.623887-.872775.873-1.246-.364428-.603874-.793632-1.166199-1.28-1.677-.44.22-.867.472-1.27.738-.202-.2-.43-.364-.653-.536-.22-.176-.466-.305-.701-.456.07-.52.104-1.032.118-1.566-.604936-.295179-1.244149-.514184-1.903-.652-.26.438-.499.913-.707 1.376-.244789-.03861-.492185-.05834-.74-.059h-.01c-.248507.00091-.496575.02097-.742.06-.208692-.472178-.444416-.93194-.706-1.377-.658846.137836-1.298056.35684-1.903.652.014.534.048 1.046.118 1.566-.235.15-.482.28-.701.456-.223.172-.451.336-.653.536-.403-.266-.83-.517-1.27-.738-.4863434.510822-.9155458 1.073144-1.28 1.677.2695251.457258.6077461.88389.873 1.246z"/><path fill="#478cbf" d="m20.188 21.144-.072 1.029a.25.25 0 0 1 -.231.232l-2.47.176a.25.25 0 0 1 -.265-.213l-.142-.96h-2.015l-.142.96a.25.25 0 0 1 -.265.213l-2.47-.176a.25.25 0 0 1 -.231-.232l-.072-1.03-2.085-.2c0 .224.004.47.004.518 0 2.203 2.793 3.261 6.264 3.273h.009c3.47-.012 6.263-1.07 6.263-3.273l.004-.518z"/><path fill="#fff" d="m14.11 18.195a1.397 1.397 0 1 1 -2.794.001 1.397 1.397 0 0 1 2.795 0"/><path fill="#414042" d="m13.774 18.278a.927.927 0 1 1 -1.854 0 .927.927 0 0 1 1.854 0"/><path fill="#fff" d="m16 19.72c-.248 0-.45-.183-.45-.409v-1.286c0-.226.202-.409.45-.409.249 0 .45.183.45.409v1.286c0 .226-.201.41-.45.41m1.89-1.526a1.397 1.397 0 1 0 2.795 0 1.397 1.397 0 0 0 -2.795 0"/><path fill="#414042" d="m18.227 18.278a.927.927 0 1 0 1.854 0 .927.927 0 0 0 -1.854 0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532m-12.979-1.019h9.441c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965h-21.882z"/><g stroke-width=".32"><path fill="#fff" d="m22.268 20.443s-.02-.128-.033-.127l-2.318.224a.377.377 0 0 0 -.34.35l-.064.912-1.793.128-.122-.827a.38.38 0 0 0 -.374-.323h-2.447a.38.38 0 0 0 -.374.323l-.122.827-1.793-.128-.064-.913a.377.377 0 0 0 -.34-.35l-2.32-.223c-.011-.001-.02.127-.032.127l-.003.501 1.964.317.064.921a.38.38 0 0 0 .35.35l2.47.177h.028a.38.38 0 0 0 .373-.322l.125-.851h1.795l.125.851a.38.38 0 0 0 .4.322l2.471-.176a.38.38 0 0 0 .35-.351l.064-.92 1.964-.32z"/><path fill="#478cbf" d="m9.732 16.66v3.783h.02l2.32.224c.120882.01233.215393.109796.224.231l.072 1.024 2.023.144.14-.945c.01825-.121952.122691-.212385.246-.213h2.447c.123688.000122.228694.09067.247.213l.14.945 2.022-.144.072-1.024c.0091-.121156.104074-.218195.225-.23l2.318-.225h.02v-.302h.001v-3.481c.337369-.403598.623887-.872775.873-1.246-.364428-.603874-.793632-1.166199-1.28-1.677-.44.22-.867.472-1.27.738-.202-.2-.43-.364-.653-.536-.22-.176-.466-.305-.701-.456.07-.52.104-1.032.118-1.566-.604936-.295179-1.244149-.514184-1.903-.652-.26.438-.499.913-.707 1.376-.244789-.03861-.492185-.05834-.74-.059h-.01c-.248507.00091-.496575.02097-.742.06-.208692-.472178-.444416-.93194-.706-1.377-.658846.137836-1.298056.35684-1.903.652.014.534.048 1.046.118 1.566-.235.15-.482.28-.701.456-.223.172-.451.336-.653.536-.403-.266-.83-.517-1.27-.738-.4863434.510822-.9155458 1.073144-1.28 1.677.2695251.457258.6077461.88389.873 1.246z"/><path fill="#478cbf" d="m20.188 21.144-.072 1.029a.25.25 0 0 1 -.231.232l-2.47.176a.25.25 0 0 1 -.265-.213l-.142-.96h-2.015l-.142.96a.25.25 0 0 1 -.265.213l-2.47-.176a.25.25 0 0 1 -.231-.232l-.072-1.03-2.085-.2c0 .224.004.47.004.518 0 2.203 2.793 3.261 6.264 3.273h.009c3.47-.012 6.263-1.07 6.263-3.273l.004-.518z"/><path fill="#fff" d="m14.11 18.195a1.397 1.397 0 1 1 -2.794.001 1.397 1.397 0 0 1 2.795 0"/><path fill="#414042" d="m13.774 18.278a.927.927 0 1 1 -1.854 0 .927.927 0 0 1 1.854 0"/><path fill="#fff" d="m16 19.72c-.248 0-.45-.183-.45-.409v-1.286c0-.226.202-.409.45-.409.249 0 .45.183.45.409v1.286c0 .226-.201.41-.45.41m1.89-1.526a1.397 1.397 0 1 0 2.795 0 1.397 1.397 0 0 0 -2.795 0"/><path fill="#414042" d="m18.227 18.278a.927.927 0 1 0 1.854 0 .927.927 0 0 0 -1.854 0"/></g></svg>
diff --git a/engine/misc/dist/document_icons/resource.svg b/engine/misc/dist/document_icons/resource.svg
index ca5c7d41..99d1dd4a 100644
--- a/engine/misc/dist/document_icons/resource.svg
+++ b/engine/misc/dist/document_icons/resource.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.543-141.93-39.865-197.505-34.983 2.17-68.048 31.457-117.656-37.966-177.026m-415.32-32.623h302.11c77.128-2.02 126.554 37.835 178.444 84.881l123.665 109.83c63.819 56.94 89.13 110.625 96 188.174v542.886h-700.219z"/><text x="183.282" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="183.282" y="878.644" font-size="112">RESOURCE</tspan></text><path fill="#478cbf" fill-rule="evenodd" d="m510.825 290.281a31.683 31.683 0 0 0 -12.994 3.28l-190.081 95.039a31.683 31.683 0 0 0 -17.51 28.339v190.08a31.683 31.683 0 0 0 17.51 28.338l190.08 95.04a31.683 31.683 0 0 0 28.338 0l190.08-95.04a31.683 31.683 0 0 0 17.51-28.338v-190.079a31.683 31.683 0 0 0 -17.51-28.34l-190.08-95.04a31.683 31.683 0 0 0 -15.345-3.279zm1.175 67.073 119.234 59.587-43.747 21.904-119.234-59.647 43.747-21.842zm-158.4 110.88 126.72 63.36v119.234l-126.72-63.36zm316.8 0v119.234l-126.72 63.36v-119.234z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.543-141.93-39.865-197.505-34.983 2.17-68.048 31.457-117.656-37.966-177.026m-415.32-32.623h302.11c77.128-2.02 126.554 37.835 178.444 84.881l123.665 109.83c63.819 56.94 89.13 110.625 96 188.174v542.886h-700.219z"/><text x="183.282" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="183.282" y="878.644" font-size="112">RESOURCE</tspan></text><path fill="#478cbf" fill-rule="evenodd" d="m510.825 290.281a31.683 31.683 0 0 0 -12.994 3.28l-190.081 95.039a31.683 31.683 0 0 0 -17.51 28.339v190.08a31.683 31.683 0 0 0 17.51 28.338l190.08 95.04a31.683 31.683 0 0 0 28.338 0l190.08-95.04a31.683 31.683 0 0 0 17.51-28.338v-190.079a31.683 31.683 0 0 0 -17.51-28.34l-190.08-95.04a31.683 31.683 0 0 0 -15.345-3.279zm1.175 67.073 119.234 59.587-43.747 21.904-119.234-59.647 43.747-21.842zm-158.4 110.88 126.72 63.36v119.234l-126.72-63.36zm316.8 0v119.234l-126.72 63.36v-119.234z"/></svg>
diff --git a/engine/misc/dist/document_icons/resource_extra_small.svg b/engine/misc/dist/document_icons/resource_extra_small.svg
index a0326eb5..3277285d 100644
--- a/engine/misc/dist/document_icons/resource_extra_small.svg
+++ b/engine/misc/dist/document_icons/resource_extra_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51h4.721c1.205-.032 1.977.591 2.788 1.326l1.932 1.716c.998.89 1.393 1.729 1.5 2.94v8.483h-10.94z"/><path fill="#478cbf" fill-rule="evenodd" d="m7.976 4.51a.642.642 0 0 0 -.263.067l-3.849 1.923a.642.642 0 0 0 -.354.574v3.849a.642.642 0 0 0 .354.574l3.85 1.924a.642.642 0 0 0 .573 0l3.85-1.924a.642.642 0 0 0 .354-.574v-3.85a.642.642 0 0 0 -.355-.573l-3.849-1.924a.642.642 0 0 0 -.31-.066zm.024 1.358 2.415 1.207-.886.444-2.415-1.209zm-3.207 2.246 2.566 1.283v2.414l-2.566-1.283zm6.415 0v2.414l-2.566 1.283v-2.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51h4.721c1.205-.032 1.977.591 2.788 1.326l1.932 1.716c.998.89 1.393 1.729 1.5 2.94v8.483h-10.94z"/><path fill="#478cbf" fill-rule="evenodd" d="m7.976 4.51a.642.642 0 0 0 -.263.067l-3.849 1.923a.642.642 0 0 0 -.354.574v3.849a.642.642 0 0 0 .354.574l3.85 1.924a.642.642 0 0 0 .573 0l3.85-1.924a.642.642 0 0 0 .354-.574v-3.85a.642.642 0 0 0 -.355-.573l-3.849-1.924a.642.642 0 0 0 -.31-.066zm.024 1.358 2.415 1.207-.886.444-2.415-1.209zm-3.207 2.246 2.566 1.283v2.414l-2.566-1.283zm6.415 0v2.414l-2.566 1.283v-2.414z"/></svg>
diff --git a/engine/misc/dist/document_icons/resource_small.svg b/engine/misc/dist/document_icons/resource_small.svg
index b5a7e388..266e5a75 100644
--- a/engine/misc/dist/document_icons/resource_small.svg
+++ b/engine/misc/dist/document_icons/resource_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532m-12.979-1.019h9.441c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965h-21.882z"/><path fill="#478cbf" fill-rule="evenodd" d="m15.964 11.071a.99.99 0 0 0 -.406.103l-5.94 2.97a.99.99 0 0 0 -.547.885v5.94a.99.99 0 0 0 .547.886l5.94 2.97a.99.99 0 0 0 .885 0l5.94-2.97a.99.99 0 0 0 .547-.886v-5.94a.99.99 0 0 0 -.547-.885l-5.94-2.97a.99.99 0 0 0 -.48-.103zm.036 2.096 3.726 1.862-1.367.685-3.727-1.864zm-4.95 3.465 3.96 1.98v3.726l-3.96-1.98zm9.9 0v3.726l-3.96 1.98v-3.726z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532m-12.979-1.019h9.441c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965h-21.882z"/><path fill="#478cbf" fill-rule="evenodd" d="m15.964 11.071a.99.99 0 0 0 -.406.103l-5.94 2.97a.99.99 0 0 0 -.547.885v5.94a.99.99 0 0 0 .547.886l5.94 2.97a.99.99 0 0 0 .885 0l5.94-2.97a.99.99 0 0 0 .547-.886v-5.94a.99.99 0 0 0 -.547-.885l-5.94-2.97a.99.99 0 0 0 -.48-.103zm.036 2.096 3.726 1.862-1.367.685-3.727-1.864zm-4.95 3.465 3.96 1.98v3.726l-3.96-1.98zm9.9 0v3.726l-3.96 1.98v-3.726z"/></svg>
diff --git a/engine/misc/dist/document_icons/scene.svg b/engine/misc/dist/document_icons/scene.svg
index 8f66fb34..2456a019 100644
--- a/engine/misc/dist/document_icons/scene.svg
+++ b/engine/misc/dist/document_icons/scene.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.542-141.93-39.864-197.505-34.983 2.17-68.048 31.457-117.655-37.966-177.025m-415.32-32.625h302.11c77.128-2.02 126.554 37.836 178.444 84.882l123.665 109.83c63.819 56.94 89.13 110.624 96 188.174v542.885h-700.219z"/><text x="315.088" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="315.088" y="878.644" font-size="112">SCENE</tspan></text><path fill="#478cbf" d="m714.504 315.805-67.735 9.904 24.7 57.361 51.76-7.546zm-127.458 18.57-59.719 8.725 24.702 57.419 59.719-8.725zm-119.498 17.45-59.719 8.725 24.701 57.419 59.72-8.725zm-119.438 17.45-51.76 7.546 8.725 59.719 67.736-9.904zm-43.036 97.449v181.104c0 33.34 27.027 60.368 60.368 60.368h362.208v-241.472z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="m812.681 293.783c-23.575-32.542-141.93-39.864-197.505-34.983 2.17-68.048 31.457-117.655-37.966-177.025m-415.32-32.625h302.11c77.128-2.02 126.554 37.836 178.444 84.882l123.665 109.83c63.819 56.94 89.13 110.624 96 188.174v542.885h-700.219z"/><text x="315.088" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="315.088" y="878.644" font-size="112">SCENE</tspan></text><path fill="#478cbf" d="m714.504 315.805-67.735 9.904 24.7 57.361 51.76-7.546zm-127.458 18.57-59.719 8.725 24.702 57.419 59.719-8.725zm-119.498 17.45-59.719 8.725 24.701 57.419 59.72-8.725zm-119.438 17.45-51.76 7.546 8.725 59.719 67.736-9.904zm-43.036 97.449v181.104c0 33.34 27.027 60.368 60.368 60.368h362.208v-241.472z"/></svg>
diff --git a/engine/misc/dist/document_icons/scene_extra_small.svg b/engine/misc/dist/document_icons/scene_extra_small.svg
index 0d80ad81..9a3557ce 100644
--- a/engine/misc/dist/document_icons/scene_extra_small.svg
+++ b/engine/misc/dist/document_icons/scene_extra_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51h4.721c1.205-.032 1.977.591 2.788 1.326l1.932 1.716c.998.89 1.393 1.729 1.5 2.94v8.483h-10.94z"/><path fill="#478cbf" d="m12.101 5.027-1.372.2.5 1.162 1.049-.153zm-2.581.376-1.21.177.5 1.162 1.21-.176zm-2.42.353-1.21.177.501 1.163 1.21-.177zm-2.419.354-1.048.152.177 1.21 1.372-.2zm-.871 1.973v3.667c0 .676.547 1.223 1.222 1.223h7.335v-4.89z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="m12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51h4.721c1.205-.032 1.977.591 2.788 1.326l1.932 1.716c.998.89 1.393 1.729 1.5 2.94v8.483h-10.94z"/><path fill="#478cbf" d="m12.101 5.027-1.372.2.5 1.162 1.049-.153zm-2.581.376-1.21.177.5 1.162 1.21-.176zm-2.42.353-1.21.177.501 1.163 1.21-.177zm-2.419.354-1.048.152.177 1.21 1.372-.2zm-.871 1.973v3.667c0 .676.547 1.223 1.222 1.223h7.335v-4.89z"/></svg>
diff --git a/engine/misc/dist/document_icons/scene_small.svg b/engine/misc/dist/document_icons/scene_small.svg
index d5c6eaaf..836438b6 100644
--- a/engine/misc/dist/document_icons/scene_small.svg
+++ b/engine/misc/dist/document_icons/scene_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532M5.059 1.536H14.5c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965H5.059z"/><path fill="#478cbf" d="M22.329 11.869l-2.117.31.772 1.792 1.617-.236zm-3.983.58l-1.867.273.772 1.794 1.867-.273zm-3.735.545l-1.866.273.772 1.794 1.866-.272zm-3.732.546l-1.618.235.273 1.867 2.117-.31zm-1.345 3.045v5.66c0 1.041.845 1.886 1.887 1.886H22.74v-7.546z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532M5.059 1.536H14.5c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965H5.059z"/><path fill="#478cbf" d="M22.329 11.869l-2.117.31.772 1.792 1.617-.236zm-3.983.58l-1.867.273.772 1.794 1.867-.273zm-3.735.545l-1.866.273.772 1.794 1.866-.272zm-3.732.546l-1.618.235.273 1.867 2.117-.31zm-1.345 3.045v5.66c0 1.041.845 1.886 1.887 1.886H22.74v-7.546z"/></svg>
diff --git a/engine/misc/dist/document_icons/shader.svg b/engine/misc/dist/document_icons/shader.svg
index c5bff05a..65e62c9e 100644
--- a/engine/misc/dist/document_icons/shader.svg
+++ b/engine/misc/dist/document_icons/shader.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="M812.681 293.783c-23.575-32.543-141.93-39.865-197.505-34.983 2.17-68.048 31.457-117.656-37.966-177.026M161.89 49.151H464c77.128-2.02 126.554 37.835 178.444 84.881l123.665 109.83c63.819 56.94 89.13 110.625 96 188.174v542.886H161.89z"/><text x="249.582" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="249.582" y="878.644" font-size="112">SHADER</tspan></text><path fill="#478cbf" d="M640.44 348.066c-10.54 0-21.102 4.097-29.145 12.276l-35.64 36.254-47.725 48.529h-.004l-47.676 48.53-33.98 34.546 13.744 13.98h89.002l47.675-48.529 47.723-48.527h.006l25.12-25.543c6.375-6.486 10.147-14.571 11.468-22.986h-.002c2.01-12.81-1.762-26.38-11.469-36.254-8.042-8.18-18.558-12.276-29.098-12.276zM460.013 542.184l44.502 45.257 44.5-45.257h-89.002zm-46.848 13.834c-9.932.124-18.509 4.228-24.668 11.236-5.21 5.927-8.55 14.024-9.668 23.459-.254 2.153-.52 4.295-.52 6.588 0 33.842-55.28 6.971-28.53 41.94h117.626c6.64-15.57 5.836-33.447-2.13-48.528h-.003c-2.48-4.695-5.392-9.213-9.289-13.176-13.348-13.578-26.713-20.143-38.48-21.326h-.002a38.536 38.536 0 0 0-4.336-.193zm-63.387 83.224c4.467 5.84 10.605 12.952 20.33 22.844 21.446 21.814 64.428 16.264 85.875-5.547 5.035-5.12 8.751-11.034 11.422-17.297H349.78z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" stroke-width="19.603" d="M812.681 293.783c-23.575-32.543-141.93-39.865-197.505-34.983 2.17-68.048 31.457-117.656-37.966-177.026M161.89 49.151H464c77.128-2.02 126.554 37.835 178.444 84.881l123.665 109.83c63.819 56.94 89.13 110.625 96 188.174v542.886H161.89z"/><text x="249.582" y="878.644" fill="#333f67" font-family="Montserrat" font-size="16" font-weight="800" letter-spacing="0" word-spacing="0"><tspan x="249.582" y="878.644" font-size="112">SHADER</tspan></text><path fill="#478cbf" d="M640.44 348.066c-10.54 0-21.102 4.097-29.145 12.276l-35.64 36.254-47.725 48.529h-.004l-47.676 48.53-33.98 34.546 13.744 13.98h89.002l47.675-48.529 47.723-48.527h.006l25.12-25.543c6.375-6.486 10.147-14.571 11.468-22.986h-.002c2.01-12.81-1.762-26.38-11.469-36.254-8.042-8.18-18.558-12.276-29.098-12.276zM460.013 542.184l44.502 45.257 44.5-45.257h-89.002zm-46.848 13.834c-9.932.124-18.509 4.228-24.668 11.236-5.21 5.927-8.55 14.024-9.668 23.459-.254 2.153-.52 4.295-.52 6.588 0 33.842-55.28 6.971-28.53 41.94h117.626c6.64-15.57 5.836-33.447-2.13-48.528h-.003c-2.48-4.695-5.392-9.213-9.289-13.176-13.348-13.578-26.713-20.143-38.48-21.326h-.002a38.536 38.536 0 0 0-4.336-.193zm-63.387 83.224c4.467 5.84 10.605 12.952 20.33 22.844 21.446 21.814 64.428 16.264 85.875-5.547 5.035-5.12 8.751-11.034 11.422-17.297H349.78z"/></svg>
diff --git a/engine/misc/dist/document_icons/shader_extra_small.svg b/engine/misc/dist/document_icons/shader_extra_small.svg
index 1499e830..51f13247 100644
--- a/engine/misc/dist/document_icons/shader_extra_small.svg
+++ b/engine/misc/dist/document_icons/shader_extra_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51H7.25c1.205-.032 1.977.591 2.788 1.326L11.97 3.81c.998.89 1.393 1.729 1.5 2.94v8.483H2.53z"/><path fill="#478cbf" d="M10.77 5.465a.88.88 0 0 0-.627.264l-.77.78-1.03 1.048-1.027 1.047-.734.744.299.3h1.918l1.027-1.044 1.03-1.047.54-.551a.902.902 0 0 0 .249-.496.91.91 0 0 0-.249-.781.877.877 0 0 0-.626-.264zM8.799 9.648 6.88 9.65l.959.975.959-.977zm-2.975.301a.715.715 0 0 0-.486.24.922.922 0 0 0-.21.506h.003c-.006.046-.014.093-.014.143 0 .73-1.19.15-.613.904.096.126.227.28.437.492.462.47 1.39.351 1.852-.119a1.21 1.21 0 0 0 .246-.373 1.22 1.22 0 0 0-.047-1.047 1.19 1.19 0 0 0-.199-.283c-.288-.293-.576-.436-.83-.46a.715.715 0 0 0-.139-.003z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M12.698 4.59c-.368-.508-2.218-.623-3.086-.546.034-1.064.492-1.839-.593-2.766m-6.49-.51H7.25c1.205-.032 1.977.591 2.788 1.326L11.97 3.81c.998.89 1.393 1.729 1.5 2.94v8.483H2.53z"/><path fill="#478cbf" d="M10.77 5.465a.88.88 0 0 0-.627.264l-.77.78-1.03 1.048-1.027 1.047-.734.744.299.3h1.918l1.027-1.044 1.03-1.047.54-.551a.902.902 0 0 0 .249-.496.91.91 0 0 0-.249-.781.877.877 0 0 0-.626-.264zM8.799 9.648 6.88 9.65l.959.975.959-.977zm-2.975.301a.715.715 0 0 0-.486.24.922.922 0 0 0-.21.506h.003c-.006.046-.014.093-.014.143 0 .73-1.19.15-.613.904.096.126.227.28.437.492.462.47 1.39.351 1.852-.119a1.21 1.21 0 0 0 .246-.373 1.22 1.22 0 0 0-.047-1.047 1.19 1.19 0 0 0-.199-.283c-.288-.293-.576-.436-.83-.46a.715.715 0 0 0-.139-.003z"/></svg>
diff --git a/engine/misc/dist/document_icons/shader_small.svg b/engine/misc/dist/document_icons/shader_small.svg
index 5290c405..e4125b1e 100644
--- a/engine/misc/dist/document_icons/shader_small.svg
+++ b/engine/misc/dist/document_icons/shader_small.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532M5.059 1.536H14.5c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965H5.059z"/><path fill="#478cbf" d="M21.295 11.242c-.434 0-.871.17-1.201.506l-1.471 1.494-1.965 2h-.002l-1.963 2-1.4 1.426.566.574 1.834 1.867 1.834-1.867 1.963-2 1.967-2 1.037-1.05a1.73 1.73 0 0 0 .473-.95 1.74 1.74 0 0 0-.475-1.494 1.676 1.676 0 0 0-1.197-.506zm-9.453 8.572a1.367 1.367 0 0 0-.932.463c-.215.244-.35.577-.396.965-.01.09-.024.179-.024.274 0 1.395-2.277.285-1.174 1.726.184.241.436.536.836.944.884.899 2.657.668 3.541-.23.207-.21.36-.455.47-.714a2.33 2.33 0 0 0-.089-2 2.273 2.273 0 0 0-.383-.543c-.55-.56-1.099-.829-1.584-.877a1.367 1.367 0 0 0-.265-.008z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#eff1f5" stroke="#9f9fa1" stroke-linecap="round" stroke-linejoin="round" d="M25.396 9.18c-.736-1.016-4.435-1.245-6.172-1.093.068-2.126.983-3.676-1.186-5.532M5.059 1.536H14.5c2.41-.063 3.955 1.182 5.576 2.652l3.865 3.433c1.994 1.779 2.785 3.457 3 5.88v16.965H5.059z"/><path fill="#478cbf" d="M21.295 11.242c-.434 0-.871.17-1.201.506l-1.471 1.494-1.965 2h-.002l-1.963 2-1.4 1.426.566.574 1.834 1.867 1.834-1.867 1.963-2 1.967-2 1.037-1.05a1.73 1.73 0 0 0 .473-.95 1.74 1.74 0 0 0-.475-1.494 1.676 1.676 0 0 0-1.197-.506zm-9.453 8.572a1.367 1.367 0 0 0-.932.463c-.215.244-.35.577-.396.965-.01.09-.024.179-.024.274 0 1.395-2.277.285-1.174 1.726.184.241.436.536.836.944.884.899 2.657.668 3.541-.23.207-.21.36-.455.47-.714a2.33 2.33 0 0 0-.089-2 2.273 2.273 0 0 0-.383-.543c-.55-.56-1.099-.829-1.584-.877a1.367 1.367 0 0 0-.265-.008z"/></svg>
diff --git a/engine/misc/dist/html/logo.svg b/engine/misc/dist/html/logo.svg
index e0312eb0..83b82ec0 100644
--- a/engine/misc/dist/html/logo.svg
+++ b/engine/misc/dist/html/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="1024" height="414" viewBox="0 0 960 388.125"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M 0,595.276 H 841.89 V 0 H 0 Z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(1.25 0 0 -1.25 -94.25 597.499)"><path fill="#e0e0e0" d="m 0,0 c -3.611,0 -6.636,-1.659 -9.09,-4.967 -2.441,-3.311 -3.668,-7.958 -3.668,-13.938 0,-5.993 1.166,-10.581 3.503,-13.778 2.333,-3.207 5.398,-4.804 9.2,-4.804 3.8,0 6.887,1.617 9.258,4.862 2.371,3.233 3.559,7.861 3.559,13.886 0,6.02 -1.227,10.654 -3.673,13.89 C 6.646,-1.617 3.616,0 0,0 m -0.055,-59.493 c -10.573,0 -19.195,3.46 -25.859,10.379 -6.655,6.925 -9.984,17.03 -9.984,30.314 0,13.292 3.367,23.356 10.101,30.209 6.736,6.844 15.431,10.269 26.082,10.269 10.649,0 19.251,-3.363 25.794,-10.109 6.555,-6.733 9.827,-16.94 9.827,-30.591 0,-13.661 -3.348,-23.822 -10.05,-30.49 -6.702,-6.654 -15.333,-9.981 -25.911,-9.981" transform="translate(531.45 355.316)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 v -33.768 c 0,-1.577 0.116,-2.571 0.342,-2.988 0.224,-0.415 0.903,-0.623 2.029,-0.623 4.144,0 7.283,1.548 9.429,4.634 2.151,3.083 3.215,8.216 3.215,15.405 0,7.192 -1.113,11.878 -3.325,14.055 C 9.467,-1.102 5.946,0 1.129,0 Z m -21.675,-52.392 v 67.735 c 0,1.883 0.468,3.369 1.413,4.471 0.939,1.085 2.161,1.636 3.671,1.636 H 2.263 c 11.965,0 21.053,-3.018 27.257,-9.04 6.215,-6.02 9.322,-15.499 9.322,-28.447 0,-27.7 -11.821,-41.547 -35.456,-41.547 h -19.302 c -3.836,0 -5.759,1.727 -5.759,5.192" transform="translate(607.851 354.431)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -3.612,0 -6.645,-1.659 -9.095,-4.967 -2.44,-3.311 -3.662,-7.958 -3.662,-13.938 0,-5.993 1.169,-10.581 3.499,-13.778 2.33,-3.207 5.398,-4.804 9.2,-4.804 3.801,0 6.89,1.617 9.258,4.862 2.372,3.233 3.56,7.861 3.56,13.886 0,6.02 -1.225,10.654 -3.671,13.89 C 6.642,-1.617 3.616,0 0,0 m -0.058,-59.493 c -10.577,0 -19.193,3.46 -25.851,10.379 -6.663,6.925 -9.993,17.03 -9.993,30.314 0,13.292 3.367,23.356 10.1,30.209 6.741,6.844 15.431,10.269 26.086,10.269 10.651,0 19.246,-3.363 25.797,-10.109 6.55,-6.733 9.822,-16.94 9.822,-30.591 0,-13.661 -3.349,-23.822 -10.05,-30.49 -6.699,-6.654 -15.338,-9.981 -25.911,-9.981" transform="translate(700.81 355.316)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c 0,-1.496 -3.721,-2.255 -11.176,-2.255 -7.448,0 -11.18,0.759 -11.18,2.255 v 56.681 h -13.545 c -1.281,0 -2.185,1.727 -2.71,5.198 -0.226,1.652 -0.334,3.343 -0.334,5.077 0,1.724 0.108,3.422 0.334,5.077 0.525,3.462 1.429,5.202 2.71,5.202 h 49.112 c 1.279,0 2.179,-1.74 2.712,-5.202 0.221,-1.655 0.335,-3.353 0.335,-5.077 0,-1.734 -0.114,-3.425 -0.335,-5.077 C 15.39,58.408 14.49,56.681 13.211,56.681 H 0 Z" transform="translate(789.011 291.335)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -6.078,0.094 -13.034,-1.173 -13.034,-1.173 v -11.863 h 6.995 l -0.078,-5.288 c 0,-1.959 -1.942,-2.943 -5.815,-2.943 -3.878,0 -7.303,1.642 -10.274,4.917 -2.978,3.279 -4.459,8.072 -4.459,14.388 0,6.329 1.447,10.995 4.345,14.006 2.892,3.008 6.683,4.517 11.346,4.517 1.959,0 3.987,-0.316 6.096,-0.961 2.11,-0.639 3.519,-1.238 4.238,-1.799 0.713,-0.577 1.391,-0.85 2.032,-0.85 0.638,0 1.671,0.746 3.1,2.255 1.431,1.505 2.713,3.786 3.844,6.827 1.126,3.057 1.69,5.4 1.69,7.062 0,1.649 -0.036,2.786 -0.109,3.386 -1.581,1.73 -4.499,3.102 -8.755,4.122 -4.248,1.017 -9.011,1.522 -14.28,1.522 -11.594,0 -20.66,-3.65 -27.207,-10.95 -6.552,-7.303 -9.822,-16.783 -9.822,-28.452 0,-13.701 3.347,-24.087 10.041,-31.162 6.706,-7.074 15.51,-10.607 26.425,-10.607 5.87,0 11.08,0.505 15.632,1.522 4.557,1.013 7.586,2.053 9.093,3.105 l 0.452,35.33 C 11.496,-1.036 6.078,-0.104 0,0" transform="translate(468.265 336.713)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -0.624,-1.28 -1.771,-2.454 -3.449,-3.516 -1.676,-1.069 -3.805,-1.6 -6.391,-1.6 -3.412,0 -6.156,1.075 -8.24,3.249 -2.076,2.157 -3.116,5.266 -3.116,9.323 v 10.116 c 0,3.969 0.98,7.013 2.946,9.138 1.962,2.108 4.59,3.177 7.872,3.177 3.208,0 5.695,-0.844 7.455,-2.513 1.755,-1.675 2.677,-4.015 2.757,-7.003 L -0.21,20.238 h -2.619 c -0.094,2.29 -0.759,4.057 -2.01,5.305 -1.244,1.238 -3.095,1.864 -5.539,1.864 -2.473,0 -4.432,-0.837 -5.866,-2.516 -1.43,-1.675 -2.143,-4.103 -2.143,-7.293 V 7.424 c 0,-3.308 0.771,-5.83 2.311,-7.567 1.54,-1.724 3.616,-2.588 6.236,-2.588 1.913,0 3.451,0.339 4.602,1.033 1.155,0.684 1.956,1.519 2.409,2.51 v 8.861 h -7.06 v 2.463 H 0 Z" transform="translate(441.347 235.751)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c 1.553,0 2.936,0.44 4.144,1.336 1.21,0.9 2.058,2.037 2.561,3.422 v 5.468 H 2.213 c -1.91,0 -3.44,-0.541 -4.585,-1.623 C -3.52,7.528 -4.088,6.185 -4.088,4.588 -4.088,3.239 -3.733,2.131 -3.014,1.277 -2.296,0.42 -1.292,0 0,0 M 7.124,-2.04 C 6.984,-1.164 6.875,-0.453 6.806,0.104 6.739,0.671 6.705,1.235 6.705,1.808 5.938,0.554 4.948,-0.486 3.725,-1.301 2.504,-2.122 1.146,-2.529 -0.35,-2.529 c -2.092,0 -3.701,0.648 -4.84,1.946 -1.132,1.303 -1.704,3.059 -1.704,5.276 0,2.343 0.823,4.223 2.473,5.618 1.649,1.395 3.89,2.092 6.709,2.092 h 4.417 v 3.106 c 0,1.786 -0.456,3.193 -1.351,4.21 -0.914,1.004 -2.17,1.512 -3.791,1.512 -1.508,0 -2.752,-0.479 -3.728,-1.45 -0.973,-0.965 -1.456,-2.144 -1.456,-3.549 l -2.623,0.023 -0.046,0.137 c -0.074,1.906 0.647,3.591 2.168,5.084 1.515,1.489 3.459,2.229 5.825,2.229 2.338,0 4.22,-0.711 5.657,-2.128 1.429,-1.431 2.146,-3.471 2.146,-6.124 V 3.057 c 0,-0.903 0.042,-1.78 0.121,-2.617 0.081,-0.848 0.212,-1.665 0.417,-2.48 z" transform="translate(456.015 232.825)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 0.24,-3.923 c 0.664,1.404 1.554,2.486 2.657,3.255 1.107,0.759 2.41,1.138 3.906,1.138 1.527,0 2.814,-0.444 3.852,-1.343 1.039,-0.896 1.805,-2.252 2.292,-4.074 0.623,1.682 1.505,3.011 2.65,3.973 1.145,0.964 2.534,1.444 4.143,1.444 2.217,0 3.937,-0.897 5.156,-2.692 1.224,-1.799 1.834,-4.559 1.834,-8.288 v -14.765 h -2.823 v 14.814 c 0,3.1 -0.429,5.283 -1.263,6.538 -0.839,1.257 -2.042,1.89 -3.598,1.89 -1.637,0 -2.915,-0.691 -3.834,-2.096 -0.914,-1.405 -1.478,-3.161 -1.683,-5.282 v -0.655 -15.209 H 10.72 v 14.798 c 0,3.027 -0.424,5.194 -1.292,6.488 -0.864,1.294 -2.066,1.936 -3.609,1.936 -1.475,0 -2.668,-0.45 -3.562,-1.342 -0.9,-0.897 -1.54,-2.125 -1.928,-3.683 V -25.275 H -2.477 V 0 Z" transform="translate(476.73 259.105)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -1.758,0 -3.202,-0.802 -4.334,-2.402 -1.133,-1.606 -1.718,-3.585 -1.765,-5.944 h 11.66 v 1.082 c 0,2.086 -0.489,3.823 -1.469,5.201 C 3.106,-0.684 1.745,0 0,0 m 0.397,-23.76 c -2.725,0 -4.954,1.026 -6.685,3.073 -1.726,2.043 -2.591,4.657 -2.591,7.841 v 4.197 c 0,3.19 0.867,5.85 2.602,7.965 1.739,2.105 3.828,3.158 6.277,3.158 2.648,0 4.699,-0.939 6.164,-2.823 1.468,-1.887 2.201,-4.422 2.201,-7.603 v -2.773 H -6.099 v -2.102 c 0,-2.447 0.586,-4.484 1.752,-6.11 1.168,-1.63 2.755,-2.438 4.744,-2.438 1.382,0 2.585,0.244 3.588,0.724 1.003,0.491 1.863,1.179 2.578,2.082 l 1.149,-1.988 C 6.949,-21.525 5.96,-22.307 4.753,-22.887 3.549,-23.464 2.094,-23.76 0.397,-23.76" transform="translate(522.823 256.839)scale(1.13105)"/><path fill="#e0e0e0" d="M 0,0 C -1.763,0 -3.21,-0.802 -4.341,-2.402 -5.467,-4.008 -6.053,-5.987 -6.104,-8.346 H 5.559 v 1.082 c 0,2.086 -0.488,3.823 -1.474,5.201 C 3.104,-0.684 1.744,0 0,0 m 0.394,-23.76 c -2.726,0 -4.951,1.026 -6.679,3.073 -1.733,2.043 -2.6,4.657 -2.6,7.841 v 4.197 c 0,3.19 0.871,5.85 2.602,7.965 1.744,2.105 3.834,3.158 6.283,3.158 2.643,0 4.703,-0.939 6.164,-2.823 1.463,-1.887 2.197,-4.422 2.197,-7.603 v -2.773 H -6.104 v -2.102 c 0,-2.447 0.587,-4.484 1.76,-6.11 1.162,-1.63 2.742,-2.438 4.738,-2.438 1.387,0 2.585,0.244 3.585,0.724 1.007,0.491 1.866,1.179 2.589,2.082 l 1.141,-1.988 c -0.764,-0.968 -1.75,-1.75 -2.959,-2.33 -1.204,-0.577 -2.658,-0.873 -4.356,-0.873" transform="translate(558.08 256.839)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 0.23,-4.178 c 0.674,1.483 1.564,2.634 2.682,3.435 1.108,0.805 2.413,1.213 3.914,1.213 2.258,0 3.988,-0.835 5.189,-2.513 1.214,-1.675 1.815,-4.279 1.815,-7.812 v -15.42 h -2.825 v 15.394 c 0,2.888 -0.423,4.905 -1.264,6.075 -0.836,1.17 -2.065,1.753 -3.665,1.753 -1.435,0 -2.638,-0.466 -3.603,-1.414 C 1.504,-4.406 0.782,-5.657 0.301,-7.234 V -25.275 H -2.504 V 0 Z" transform="translate(575.917 259.105)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c 0,-2.565 0.486,-4.605 1.472,-6.123 0.974,-1.532 2.457,-2.288 4.436,-2.288 1.356,0 2.498,0.361 3.435,1.101 0.934,0.74 1.672,1.77 2.218,3.077 v 12.52 c -0.525,1.346 -1.246,2.434 -2.157,3.272 -0.91,0.824 -2.062,1.238 -3.448,1.238 -1.975,0 -3.468,-0.86 -4.46,-2.587 C 0.497,8.48 0,6.224 0,3.454 Z m -2.833,3.454 c 0,3.582 0.723,6.459 2.177,8.627 1.442,2.157 3.448,3.239 6.004,3.239 1.419,0 2.664,-0.346 3.728,-1.04 1.066,-0.681 1.947,-1.678 2.654,-2.946 l 0.274,3.516 h 2.381 v -25.298 c 0,-3.239 -0.751,-5.749 -2.26,-7.525 -1.511,-1.769 -3.657,-2.665 -6.428,-2.665 -0.996,0 -2.067,0.156 -3.212,0.459 -1.147,0.303 -2.162,0.701 -3.052,1.2 l 0.776,2.463 c 0.759,-0.492 1.608,-0.873 2.548,-1.141 0.932,-0.277 1.895,-0.41 2.894,-0.41 2.009,0 3.498,0.645 4.46,1.932 0.966,1.304 1.45,3.19 1.45,5.687 v 3.057 c -0.717,-1.138 -1.597,-2.011 -2.64,-2.614 -1.039,-0.606 -2.253,-0.909 -3.622,-0.909 -2.539,0 -4.53,0.994 -5.968,2.982 C -2.11,-5.948 -2.833,-3.301 -2.833,0 Z" transform="translate(600.869 242.309)scale(1.13105)"/><path fill="#e0e0e0" d="m 627.82321,230.5176 h -3.20089 v 28.58738 h 3.20089 z m 0,36.72644 h -3.20089 v 4.50385 h 3.20089 z"/><path fill="#e0e0e0" d="m 0,0 0.23,-4.178 c 0.676,1.483 1.562,2.634 2.678,3.435 1.115,0.805 2.422,1.213 3.916,1.213 2.258,0 3.995,-0.835 5.199,-2.513 1.211,-1.675 1.807,-4.279 1.807,-7.812 v -15.42 h -2.825 v 15.394 c 0,2.888 -0.422,4.905 -1.261,6.075 -0.843,1.17 -2.063,1.753 -3.668,1.753 -1.434,0 -2.635,-0.466 -3.599,-1.414 C 1.51,-4.406 0.785,-5.657 0.306,-7.234 V -25.275 H -2.503 V 0 Z" transform="translate(638.154 259.105)scale(1.13105)"/><path fill="#e0e0e0" d="M 0,0 C -1.763,0 -3.208,-0.802 -4.334,-2.402 -5.463,-4.008 -6.052,-5.987 -6.102,-8.346 H 5.56 v 1.082 c 0,2.086 -0.486,3.823 -1.47,5.201 C 3.109,-0.684 1.747,0 0,0 m 0.401,-23.76 c -2.733,0 -4.958,1.026 -6.681,3.073 -1.73,2.043 -2.595,4.657 -2.595,7.841 v 4.197 c 0,3.19 0.865,5.85 2.6,7.965 1.739,2.105 3.831,3.158 6.275,3.158 2.646,0 4.706,-0.939 6.172,-2.823 1.462,-1.887 2.195,-4.422 2.195,-7.603 v -2.773 H -6.102 v -2.102 c 0,-2.447 0.59,-4.484 1.757,-6.11 1.166,-1.63 2.748,-2.438 4.746,-2.438 1.382,0 2.579,0.244 3.578,0.724 1.012,0.491 1.869,1.179 2.591,2.082 l 1.147,-1.988 c -0.769,-0.968 -1.755,-1.75 -2.962,-2.33 -1.203,-0.577 -2.658,-0.873 -4.354,-0.873" transform="translate(669.709 256.839)scale(1.13105)"/><path fill="#fff" d="m 0,0 c 0,0 -0.325,1.994 -0.515,1.976 l -36.182,-3.491 c -2.879,-0.278 -5.115,-2.574 -5.317,-5.459 l -0.994,-14.247 -27.992,-1.997 -1.904,12.912 c -0.424,2.872 -2.932,5.037 -5.835,5.037 h -38.188 c -2.902,0 -5.41,-2.165 -5.834,-5.037 l -1.905,-12.912 -27.992,1.997 -0.994,14.247 c -0.202,2.886 -2.438,5.182 -5.317,5.46 l -36.2,3.49 c -0.187,0.018 -0.324,-1.978 -0.511,-1.978 l -0.049,-7.83 30.658,-4.944 1.004,-14.374 c 0.203,-2.91 2.551,-5.263 5.463,-5.472 l 38.551,-2.75 c 0.146,-0.01 0.29,-0.016 0.434,-0.016 2.897,0 5.401,2.166 5.825,5.038 l 1.959,13.286 h 28.005 l 1.959,-13.286 c 0.423,-2.871 2.93,-5.037 5.831,-5.037 0.142,0 0.284,0.005 0.423,0.015 l 38.556,2.75 c 2.911,0.209 5.26,2.562 5.463,5.472 l 1.003,14.374 30.645,4.966 z" transform="translate(348.131 279.267)scale(1.13105)"/><path fill="#478cbf" d="m 0,0 v -47.514 -6.035 -5.492 c 0.108,-0.001 0.216,-0.005 0.323,-0.015 l 36.196,-3.49 c 1.896,-0.183 3.382,-1.709 3.514,-3.609 l 1.116,-15.978 31.574,-2.253 2.175,14.747 c 0.282,1.912 1.922,3.329 3.856,3.329 h 38.188 c 1.933,0 3.573,-1.417 3.855,-3.329 l 2.175,-14.747 31.575,2.253 1.115,15.978 c 0.133,1.9 1.618,3.425 3.514,3.609 l 36.182,3.49 c 0.107,0.01 0.214,0.014 0.322,0.015 v 4.711 l 0.015,0.005 V 0 c 5.09692,6.4164715 9.92323,13.494208 13.621,19.449 -5.651,9.62 -12.575,18.217 -19.976,26.182 -6.864,-3.455 -13.531,-7.369 -19.828,-11.534 -3.151,3.132 -6.7,5.694 -10.186,8.372 -3.425,2.751 -7.285,4.768 -10.946,7.118 1.09,8.117 1.629,16.108 1.846,24.448 -9.446,4.754 -19.519,7.906 -29.708,10.17 -4.068,-6.837 -7.788,-14.241 -11.028,-21.479 -3.842,0.642 -7.702,0.88 -11.567,0.926 v 0.006 c -0.027,0 -0.052,-0.006 -0.075,-0.006 -0.024,0 -0.049,0.006 -0.073,0.006 V 63.652 C 93.903,63.606 90.046,63.368 86.203,62.726 82.965,69.964 79.247,77.368 75.173,84.205 64.989,81.941 54.915,78.789 45.47,74.035 45.686,65.695 46.225,57.704 47.318,49.587 43.65,47.237 39.795,45.22 36.369,42.469 32.888,39.791 29.333,37.229 26.181,34.097 19.884,38.262 13.219,42.176 6.353,45.631 -1.048,37.666 -7.968,29.069 -13.621,19.449 -9.1783421,12.475308 -4.4130298,5.4661124 0,0 Z" transform="translate(126.806 346.045)scale(1.13105)"/><path fill="#478cbf" d="m 0,0 -1.121,-16.063 c -0.135,-1.936 -1.675,-3.477 -3.611,-3.616 l -38.555,-2.751 c -0.094,-0.007 -0.188,-0.01 -0.281,-0.01 -1.916,0 -3.569,1.406 -3.852,3.33 l -2.211,14.994 H -81.09 l -2.211,-14.994 c -0.297,-2.018 -2.101,-3.469 -4.133,-3.32 l -38.555,2.751 c -1.936,0.139 -3.476,1.68 -3.611,3.616 L -130.721,0 -163.268,3.138 c 0.015,-3.498 0.06,-7.33 0.06,-8.093 0,-34.374 43.605,-50.896 97.781,-51.086 h 0.066 0.067 c 54.176,0.19 97.766,16.712 97.766,51.086 0,0.777 0.047,4.593 0.063,8.093 z" transform="translate(311.403 266.884)scale(1.13105)"/><path fill="#fff" d="m 0,0 c 0,-12.052 -9.765,-21.815 -21.813,-21.815 -12.042,0 -21.81,9.763 -21.81,21.815 0,12.044 9.768,21.802 21.81,21.802 C -9.765,21.802 0,12.044 0,0" transform="translate(204.114 318.938)scale(1.13105)"/><path fill="#414042" d="m 0,0 c 0,-7.994 -6.479,-14.473 -14.479,-14.473 -7.996,0 -14.479,6.479 -14.479,14.473 0,7.994 6.483,14.479 14.479,14.479 C -6.479,14.479 0,7.994 0,0" transform="translate(198.177 317.474)scale(1.13105)"/><path fill="#fff" d="m 0,0 c -3.878,0 -7.021,2.858 -7.021,6.381 v 20.081 c 0,3.52 3.143,6.381 7.021,6.381 3.878,0 7.028,-2.861 7.028,-6.381 V 6.381 C 7.028,2.858 3.878,0 0,0" transform="translate(237.475 292.02)scale(1.13105)"/><path fill="#fff" d="m 0,0 c 0,-12.052 9.765,-21.815 21.815,-21.815 12.041,0 21.808,9.763 21.808,21.815 0,12.044 -9.767,21.802 -21.808,21.802 C 9.765,21.802 0,12.044 0,0" transform="translate(270.84 318.938)scale(1.13105)"/><path fill="#414042" d="m 0,0 c 0,-7.994 6.477,-14.473 14.471,-14.473 8.002,0 14.479,6.479 14.479,14.473 0,7.994 -6.477,14.479 -14.479,14.479 C 6.477,14.479 0,7.994 0,0" transform="translate(276.778 317.474)scale(1.13105)"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="1024" height="414" viewBox="0 0 960 388.125"><defs><clipPath id="a" clipPathUnits="userSpaceOnUse"><path d="M 0,595.276 H 841.89 V 0 H 0 Z"/></clipPath></defs><g clip-path="url(#a)" transform="matrix(1.25 0 0 -1.25 -94.25 597.499)"><path fill="#e0e0e0" d="m 0,0 c -3.611,0 -6.636,-1.659 -9.09,-4.967 -2.441,-3.311 -3.668,-7.958 -3.668,-13.938 0,-5.993 1.166,-10.581 3.503,-13.778 2.333,-3.207 5.398,-4.804 9.2,-4.804 3.8,0 6.887,1.617 9.258,4.862 2.371,3.233 3.559,7.861 3.559,13.886 0,6.02 -1.227,10.654 -3.673,13.89 C 6.646,-1.617 3.616,0 0,0 m -0.055,-59.493 c -10.573,0 -19.195,3.46 -25.859,10.379 -6.655,6.925 -9.984,17.03 -9.984,30.314 0,13.292 3.367,23.356 10.101,30.209 6.736,6.844 15.431,10.269 26.082,10.269 10.649,0 19.251,-3.363 25.794,-10.109 6.555,-6.733 9.827,-16.94 9.827,-30.591 0,-13.661 -3.348,-23.822 -10.05,-30.49 -6.702,-6.654 -15.333,-9.981 -25.911,-9.981" transform="translate(531.45 355.316)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 v -33.768 c 0,-1.577 0.116,-2.571 0.342,-2.988 0.224,-0.415 0.903,-0.623 2.029,-0.623 4.144,0 7.283,1.548 9.429,4.634 2.151,3.083 3.215,8.216 3.215,15.405 0,7.192 -1.113,11.878 -3.325,14.055 C 9.467,-1.102 5.946,0 1.129,0 Z m -21.675,-52.392 v 67.735 c 0,1.883 0.468,3.369 1.413,4.471 0.939,1.085 2.161,1.636 3.671,1.636 H 2.263 c 11.965,0 21.053,-3.018 27.257,-9.04 6.215,-6.02 9.322,-15.499 9.322,-28.447 0,-27.7 -11.821,-41.547 -35.456,-41.547 h -19.302 c -3.836,0 -5.759,1.727 -5.759,5.192" transform="translate(607.851 354.431)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -3.612,0 -6.645,-1.659 -9.095,-4.967 -2.44,-3.311 -3.662,-7.958 -3.662,-13.938 0,-5.993 1.169,-10.581 3.499,-13.778 2.33,-3.207 5.398,-4.804 9.2,-4.804 3.801,0 6.89,1.617 9.258,4.862 2.372,3.233 3.56,7.861 3.56,13.886 0,6.02 -1.225,10.654 -3.671,13.89 C 6.642,-1.617 3.616,0 0,0 m -0.058,-59.493 c -10.577,0 -19.193,3.46 -25.851,10.379 -6.663,6.925 -9.993,17.03 -9.993,30.314 0,13.292 3.367,23.356 10.1,30.209 6.741,6.844 15.431,10.269 26.086,10.269 10.651,0 19.246,-3.363 25.797,-10.109 6.55,-6.733 9.822,-16.94 9.822,-30.591 0,-13.661 -3.349,-23.822 -10.05,-30.49 -6.699,-6.654 -15.338,-9.981 -25.911,-9.981" transform="translate(700.81 355.316)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c 0,-1.496 -3.721,-2.255 -11.176,-2.255 -7.448,0 -11.18,0.759 -11.18,2.255 v 56.681 h -13.545 c -1.281,0 -2.185,1.727 -2.71,5.198 -0.226,1.652 -0.334,3.343 -0.334,5.077 0,1.724 0.108,3.422 0.334,5.077 0.525,3.462 1.429,5.202 2.71,5.202 h 49.112 c 1.279,0 2.179,-1.74 2.712,-5.202 0.221,-1.655 0.335,-3.353 0.335,-5.077 0,-1.734 -0.114,-3.425 -0.335,-5.077 C 15.39,58.408 14.49,56.681 13.211,56.681 H 0 Z" transform="translate(789.011 291.335)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -6.078,0.094 -13.034,-1.173 -13.034,-1.173 v -11.863 h 6.995 l -0.078,-5.288 c 0,-1.959 -1.942,-2.943 -5.815,-2.943 -3.878,0 -7.303,1.642 -10.274,4.917 -2.978,3.279 -4.459,8.072 -4.459,14.388 0,6.329 1.447,10.995 4.345,14.006 2.892,3.008 6.683,4.517 11.346,4.517 1.959,0 3.987,-0.316 6.096,-0.961 2.11,-0.639 3.519,-1.238 4.238,-1.799 0.713,-0.577 1.391,-0.85 2.032,-0.85 0.638,0 1.671,0.746 3.1,2.255 1.431,1.505 2.713,3.786 3.844,6.827 1.126,3.057 1.69,5.4 1.69,7.062 0,1.649 -0.036,2.786 -0.109,3.386 -1.581,1.73 -4.499,3.102 -8.755,4.122 -4.248,1.017 -9.011,1.522 -14.28,1.522 -11.594,0 -20.66,-3.65 -27.207,-10.95 -6.552,-7.303 -9.822,-16.783 -9.822,-28.452 0,-13.701 3.347,-24.087 10.041,-31.162 6.706,-7.074 15.51,-10.607 26.425,-10.607 5.87,0 11.08,0.505 15.632,1.522 4.557,1.013 7.586,2.053 9.093,3.105 l 0.452,35.33 C 11.496,-1.036 6.078,-0.104 0,0" transform="translate(468.265 336.713)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -0.624,-1.28 -1.771,-2.454 -3.449,-3.516 -1.676,-1.069 -3.805,-1.6 -6.391,-1.6 -3.412,0 -6.156,1.075 -8.24,3.249 -2.076,2.157 -3.116,5.266 -3.116,9.323 v 10.116 c 0,3.969 0.98,7.013 2.946,9.138 1.962,2.108 4.59,3.177 7.872,3.177 3.208,0 5.695,-0.844 7.455,-2.513 1.755,-1.675 2.677,-4.015 2.757,-7.003 L -0.21,20.238 h -2.619 c -0.094,2.29 -0.759,4.057 -2.01,5.305 -1.244,1.238 -3.095,1.864 -5.539,1.864 -2.473,0 -4.432,-0.837 -5.866,-2.516 -1.43,-1.675 -2.143,-4.103 -2.143,-7.293 V 7.424 c 0,-3.308 0.771,-5.83 2.311,-7.567 1.54,-1.724 3.616,-2.588 6.236,-2.588 1.913,0 3.451,0.339 4.602,1.033 1.155,0.684 1.956,1.519 2.409,2.51 v 8.861 h -7.06 v 2.463 H 0 Z" transform="translate(441.347 235.751)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c 1.553,0 2.936,0.44 4.144,1.336 1.21,0.9 2.058,2.037 2.561,3.422 v 5.468 H 2.213 c -1.91,0 -3.44,-0.541 -4.585,-1.623 C -3.52,7.528 -4.088,6.185 -4.088,4.588 -4.088,3.239 -3.733,2.131 -3.014,1.277 -2.296,0.42 -1.292,0 0,0 M 7.124,-2.04 C 6.984,-1.164 6.875,-0.453 6.806,0.104 6.739,0.671 6.705,1.235 6.705,1.808 5.938,0.554 4.948,-0.486 3.725,-1.301 2.504,-2.122 1.146,-2.529 -0.35,-2.529 c -2.092,0 -3.701,0.648 -4.84,1.946 -1.132,1.303 -1.704,3.059 -1.704,5.276 0,2.343 0.823,4.223 2.473,5.618 1.649,1.395 3.89,2.092 6.709,2.092 h 4.417 v 3.106 c 0,1.786 -0.456,3.193 -1.351,4.21 -0.914,1.004 -2.17,1.512 -3.791,1.512 -1.508,0 -2.752,-0.479 -3.728,-1.45 -0.973,-0.965 -1.456,-2.144 -1.456,-3.549 l -2.623,0.023 -0.046,0.137 c -0.074,1.906 0.647,3.591 2.168,5.084 1.515,1.489 3.459,2.229 5.825,2.229 2.338,0 4.22,-0.711 5.657,-2.128 1.429,-1.431 2.146,-3.471 2.146,-6.124 V 3.057 c 0,-0.903 0.042,-1.78 0.121,-2.617 0.081,-0.848 0.212,-1.665 0.417,-2.48 z" transform="translate(456.015 232.825)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 0.24,-3.923 c 0.664,1.404 1.554,2.486 2.657,3.255 1.107,0.759 2.41,1.138 3.906,1.138 1.527,0 2.814,-0.444 3.852,-1.343 1.039,-0.896 1.805,-2.252 2.292,-4.074 0.623,1.682 1.505,3.011 2.65,3.973 1.145,0.964 2.534,1.444 4.143,1.444 2.217,0 3.937,-0.897 5.156,-2.692 1.224,-1.799 1.834,-4.559 1.834,-8.288 v -14.765 h -2.823 v 14.814 c 0,3.1 -0.429,5.283 -1.263,6.538 -0.839,1.257 -2.042,1.89 -3.598,1.89 -1.637,0 -2.915,-0.691 -3.834,-2.096 -0.914,-1.405 -1.478,-3.161 -1.683,-5.282 v -0.655 -15.209 H 10.72 v 14.798 c 0,3.027 -0.424,5.194 -1.292,6.488 -0.864,1.294 -2.066,1.936 -3.609,1.936 -1.475,0 -2.668,-0.45 -3.562,-1.342 -0.9,-0.897 -1.54,-2.125 -1.928,-3.683 V -25.275 H -2.477 V 0 Z" transform="translate(476.73 259.105)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c -1.758,0 -3.202,-0.802 -4.334,-2.402 -1.133,-1.606 -1.718,-3.585 -1.765,-5.944 h 11.66 v 1.082 c 0,2.086 -0.489,3.823 -1.469,5.201 C 3.106,-0.684 1.745,0 0,0 m 0.397,-23.76 c -2.725,0 -4.954,1.026 -6.685,3.073 -1.726,2.043 -2.591,4.657 -2.591,7.841 v 4.197 c 0,3.19 0.867,5.85 2.602,7.965 1.739,2.105 3.828,3.158 6.277,3.158 2.648,0 4.699,-0.939 6.164,-2.823 1.468,-1.887 2.201,-4.422 2.201,-7.603 v -2.773 H -6.099 v -2.102 c 0,-2.447 0.586,-4.484 1.752,-6.11 1.168,-1.63 2.755,-2.438 4.744,-2.438 1.382,0 2.585,0.244 3.588,0.724 1.003,0.491 1.863,1.179 2.578,2.082 l 1.149,-1.988 C 6.949,-21.525 5.96,-22.307 4.753,-22.887 3.549,-23.464 2.094,-23.76 0.397,-23.76" transform="translate(522.823 256.839)scale(1.13105)"/><path fill="#e0e0e0" d="M 0,0 C -1.763,0 -3.21,-0.802 -4.341,-2.402 -5.467,-4.008 -6.053,-5.987 -6.104,-8.346 H 5.559 v 1.082 c 0,2.086 -0.488,3.823 -1.474,5.201 C 3.104,-0.684 1.744,0 0,0 m 0.394,-23.76 c -2.726,0 -4.951,1.026 -6.679,3.073 -1.733,2.043 -2.6,4.657 -2.6,7.841 v 4.197 c 0,3.19 0.871,5.85 2.602,7.965 1.744,2.105 3.834,3.158 6.283,3.158 2.643,0 4.703,-0.939 6.164,-2.823 1.463,-1.887 2.197,-4.422 2.197,-7.603 v -2.773 H -6.104 v -2.102 c 0,-2.447 0.587,-4.484 1.76,-6.11 1.162,-1.63 2.742,-2.438 4.738,-2.438 1.387,0 2.585,0.244 3.585,0.724 1.007,0.491 1.866,1.179 2.589,2.082 l 1.141,-1.988 c -0.764,-0.968 -1.75,-1.75 -2.959,-2.33 -1.204,-0.577 -2.658,-0.873 -4.356,-0.873" transform="translate(558.08 256.839)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 0.23,-4.178 c 0.674,1.483 1.564,2.634 2.682,3.435 1.108,0.805 2.413,1.213 3.914,1.213 2.258,0 3.988,-0.835 5.189,-2.513 1.214,-1.675 1.815,-4.279 1.815,-7.812 v -15.42 h -2.825 v 15.394 c 0,2.888 -0.423,4.905 -1.264,6.075 -0.836,1.17 -2.065,1.753 -3.665,1.753 -1.435,0 -2.638,-0.466 -3.603,-1.414 C 1.504,-4.406 0.782,-5.657 0.301,-7.234 V -25.275 H -2.504 V 0 Z" transform="translate(575.917 259.105)scale(1.13105)"/><path fill="#e0e0e0" d="m 0,0 c 0,-2.565 0.486,-4.605 1.472,-6.123 0.974,-1.532 2.457,-2.288 4.436,-2.288 1.356,0 2.498,0.361 3.435,1.101 0.934,0.74 1.672,1.77 2.218,3.077 v 12.52 c -0.525,1.346 -1.246,2.434 -2.157,3.272 -0.91,0.824 -2.062,1.238 -3.448,1.238 -1.975,0 -3.468,-0.86 -4.46,-2.587 C 0.497,8.48 0,6.224 0,3.454 Z m -2.833,3.454 c 0,3.582 0.723,6.459 2.177,8.627 1.442,2.157 3.448,3.239 6.004,3.239 1.419,0 2.664,-0.346 3.728,-1.04 1.066,-0.681 1.947,-1.678 2.654,-2.946 l 0.274,3.516 h 2.381 v -25.298 c 0,-3.239 -0.751,-5.749 -2.26,-7.525 -1.511,-1.769 -3.657,-2.665 -6.428,-2.665 -0.996,0 -2.067,0.156 -3.212,0.459 -1.147,0.303 -2.162,0.701 -3.052,1.2 l 0.776,2.463 c 0.759,-0.492 1.608,-0.873 2.548,-1.141 0.932,-0.277 1.895,-0.41 2.894,-0.41 2.009,0 3.498,0.645 4.46,1.932 0.966,1.304 1.45,3.19 1.45,5.687 v 3.057 c -0.717,-1.138 -1.597,-2.011 -2.64,-2.614 -1.039,-0.606 -2.253,-0.909 -3.622,-0.909 -2.539,0 -4.53,0.994 -5.968,2.982 C -2.11,-5.948 -2.833,-3.301 -2.833,0 Z" transform="translate(600.869 242.309)scale(1.13105)"/><path fill="#e0e0e0" d="m 627.82321,230.5176 h -3.20089 v 28.58738 h 3.20089 z m 0,36.72644 h -3.20089 v 4.50385 h 3.20089 z"/><path fill="#e0e0e0" d="m 0,0 0.23,-4.178 c 0.676,1.483 1.562,2.634 2.678,3.435 1.115,0.805 2.422,1.213 3.916,1.213 2.258,0 3.995,-0.835 5.199,-2.513 1.211,-1.675 1.807,-4.279 1.807,-7.812 v -15.42 h -2.825 v 15.394 c 0,2.888 -0.422,4.905 -1.261,6.075 -0.843,1.17 -2.063,1.753 -3.668,1.753 -1.434,0 -2.635,-0.466 -3.599,-1.414 C 1.51,-4.406 0.785,-5.657 0.306,-7.234 V -25.275 H -2.503 V 0 Z" transform="translate(638.154 259.105)scale(1.13105)"/><path fill="#e0e0e0" d="M 0,0 C -1.763,0 -3.208,-0.802 -4.334,-2.402 -5.463,-4.008 -6.052,-5.987 -6.102,-8.346 H 5.56 v 1.082 c 0,2.086 -0.486,3.823 -1.47,5.201 C 3.109,-0.684 1.747,0 0,0 m 0.401,-23.76 c -2.733,0 -4.958,1.026 -6.681,3.073 -1.73,2.043 -2.595,4.657 -2.595,7.841 v 4.197 c 0,3.19 0.865,5.85 2.6,7.965 1.739,2.105 3.831,3.158 6.275,3.158 2.646,0 4.706,-0.939 6.172,-2.823 1.462,-1.887 2.195,-4.422 2.195,-7.603 v -2.773 H -6.102 v -2.102 c 0,-2.447 0.59,-4.484 1.757,-6.11 1.166,-1.63 2.748,-2.438 4.746,-2.438 1.382,0 2.579,0.244 3.578,0.724 1.012,0.491 1.869,1.179 2.591,2.082 l 1.147,-1.988 c -0.769,-0.968 -1.755,-1.75 -2.962,-2.33 -1.203,-0.577 -2.658,-0.873 -4.354,-0.873" transform="translate(669.709 256.839)scale(1.13105)"/><path fill="#fff" d="m 0,0 c 0,0 -0.325,1.994 -0.515,1.976 l -36.182,-3.491 c -2.879,-0.278 -5.115,-2.574 -5.317,-5.459 l -0.994,-14.247 -27.992,-1.997 -1.904,12.912 c -0.424,2.872 -2.932,5.037 -5.835,5.037 h -38.188 c -2.902,0 -5.41,-2.165 -5.834,-5.037 l -1.905,-12.912 -27.992,1.997 -0.994,14.247 c -0.202,2.886 -2.438,5.182 -5.317,5.46 l -36.2,3.49 c -0.187,0.018 -0.324,-1.978 -0.511,-1.978 l -0.049,-7.83 30.658,-4.944 1.004,-14.374 c 0.203,-2.91 2.551,-5.263 5.463,-5.472 l 38.551,-2.75 c 0.146,-0.01 0.29,-0.016 0.434,-0.016 2.897,0 5.401,2.166 5.825,5.038 l 1.959,13.286 h 28.005 l 1.959,-13.286 c 0.423,-2.871 2.93,-5.037 5.831,-5.037 0.142,0 0.284,0.005 0.423,0.015 l 38.556,2.75 c 2.911,0.209 5.26,2.562 5.463,5.472 l 1.003,14.374 30.645,4.966 z" transform="translate(348.131 279.267)scale(1.13105)"/><path fill="#478cbf" d="m 0,0 v -47.514 -6.035 -5.492 c 0.108,-0.001 0.216,-0.005 0.323,-0.015 l 36.196,-3.49 c 1.896,-0.183 3.382,-1.709 3.514,-3.609 l 1.116,-15.978 31.574,-2.253 2.175,14.747 c 0.282,1.912 1.922,3.329 3.856,3.329 h 38.188 c 1.933,0 3.573,-1.417 3.855,-3.329 l 2.175,-14.747 31.575,2.253 1.115,15.978 c 0.133,1.9 1.618,3.425 3.514,3.609 l 36.182,3.49 c 0.107,0.01 0.214,0.014 0.322,0.015 v 4.711 l 0.015,0.005 V 0 c 5.09692,6.4164715 9.92323,13.494208 13.621,19.449 -5.651,9.62 -12.575,18.217 -19.976,26.182 -6.864,-3.455 -13.531,-7.369 -19.828,-11.534 -3.151,3.132 -6.7,5.694 -10.186,8.372 -3.425,2.751 -7.285,4.768 -10.946,7.118 1.09,8.117 1.629,16.108 1.846,24.448 -9.446,4.754 -19.519,7.906 -29.708,10.17 -4.068,-6.837 -7.788,-14.241 -11.028,-21.479 -3.842,0.642 -7.702,0.88 -11.567,0.926 v 0.006 c -0.027,0 -0.052,-0.006 -0.075,-0.006 -0.024,0 -0.049,0.006 -0.073,0.006 V 63.652 C 93.903,63.606 90.046,63.368 86.203,62.726 82.965,69.964 79.247,77.368 75.173,84.205 64.989,81.941 54.915,78.789 45.47,74.035 45.686,65.695 46.225,57.704 47.318,49.587 43.65,47.237 39.795,45.22 36.369,42.469 32.888,39.791 29.333,37.229 26.181,34.097 19.884,38.262 13.219,42.176 6.353,45.631 -1.048,37.666 -7.968,29.069 -13.621,19.449 -9.1783421,12.475308 -4.4130298,5.4661124 0,0 Z" transform="translate(126.806 346.045)scale(1.13105)"/><path fill="#478cbf" d="m 0,0 -1.121,-16.063 c -0.135,-1.936 -1.675,-3.477 -3.611,-3.616 l -38.555,-2.751 c -0.094,-0.007 -0.188,-0.01 -0.281,-0.01 -1.916,0 -3.569,1.406 -3.852,3.33 l -2.211,14.994 H -81.09 l -2.211,-14.994 c -0.297,-2.018 -2.101,-3.469 -4.133,-3.32 l -38.555,2.751 c -1.936,0.139 -3.476,1.68 -3.611,3.616 L -130.721,0 -163.268,3.138 c 0.015,-3.498 0.06,-7.33 0.06,-8.093 0,-34.374 43.605,-50.896 97.781,-51.086 h 0.066 0.067 c 54.176,0.19 97.766,16.712 97.766,51.086 0,0.777 0.047,4.593 0.063,8.093 z" transform="translate(311.403 266.884)scale(1.13105)"/><path fill="#fff" d="m 0,0 c 0,-12.052 -9.765,-21.815 -21.813,-21.815 -12.042,0 -21.81,9.763 -21.81,21.815 0,12.044 9.768,21.802 21.81,21.802 C -9.765,21.802 0,12.044 0,0" transform="translate(204.114 318.938)scale(1.13105)"/><path fill="#414042" d="m 0,0 c 0,-7.994 -6.479,-14.473 -14.479,-14.473 -7.996,0 -14.479,6.479 -14.479,14.473 0,7.994 6.483,14.479 14.479,14.479 C -6.479,14.479 0,7.994 0,0" transform="translate(198.177 317.474)scale(1.13105)"/><path fill="#fff" d="m 0,0 c -3.878,0 -7.021,2.858 -7.021,6.381 v 20.081 c 0,3.52 3.143,6.381 7.021,6.381 3.878,0 7.028,-2.861 7.028,-6.381 V 6.381 C 7.028,2.858 3.878,0 0,0" transform="translate(237.475 292.02)scale(1.13105)"/><path fill="#fff" d="m 0,0 c 0,-12.052 9.765,-21.815 21.815,-21.815 12.041,0 21.808,9.763 21.808,21.815 0,12.044 -9.767,21.802 -21.808,21.802 C 9.765,21.802 0,12.044 0,0" transform="translate(270.84 318.938)scale(1.13105)"/><path fill="#414042" d="m 0,0 c 0,-7.994 6.477,-14.473 14.471,-14.473 8.002,0 14.479,6.479 14.479,14.473 0,7.994 -6.477,14.479 -14.479,14.479 C 6.477,14.479 0,7.994 0,0" transform="translate(276.778 317.474)scale(1.13105)"/></g></svg>
diff --git a/engine/misc/dist/icon_console.svg b/engine/misc/dist/icon_console.svg
index c81f24cd..a2a019f7 100644
--- a/engine/misc/dist/icon_console.svg
+++ b/engine/misc/dist/icon_console.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g><rect width="430" height="330" x="550" y="650" fill="#414042" stroke="#fff" stroke-width="20" rx="20"/><path fill="#fff" d="M590 750a10 10 0 0 0 0 14.142l70 70-70 70a10 10 0 0 0 0 14.142l20 20a10 10 0 0 0 14.142 0l97.071-97.071a10 10 0 0 0 0-14.142L624.142 730A10 10 0 0 0 610 730zm180 145a10 10 0 0 0-10 10v25a10 10 0 0 0 10 10h160a10 10 0 0 0 10-10v-25a10 10 0 0 0-10-10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024"><g fill="#fff"><path d="M105 673v33q407 354 814 0v-33z"/><path fill="#478cbf" d="m105 673 152 14q12 1 15 14l4 67 132 10 8-61q2-11 15-15h162q13 4 15 15l8 61 132-10 4-67q3-13 15-14l152-14V427q30-39 56-81-35-59-83-108-43 20-82 47-40-37-88-64 7-51 8-102-59-28-123-42-26 43-46 89-49-7-98 0-20-46-46-89-64 14-123 42 1 51 8 102-48 27-88 64-39-27-82-47-48 49-83 108 26 42 56 81zm0 33v39c0 276 813 276 814 0v-39l-134 12-5 69q-2 10-14 13l-162 11q-12 0-16-11l-10-65H446l-10 65q-4 11-16 11l-162-11q-12-3-14-13l-5-69z"/><path d="M483 600c0 34 58 34 58 0v-86c0-34-58-34-58 0z"/><circle cx="725" cy="526" r="90"/><circle cx="299" cy="526" r="90"/></g><g fill="#414042"><circle cx="307" cy="532" r="60"/><circle cx="717" cy="532" r="60"/></g><rect width="430" height="330" x="550" y="650" fill="#414042" stroke="#fff" stroke-width="20" rx="20"/><path fill="#fff" d="M590 750a10 10 0 0 0 0 14.142l70 70-70 70a10 10 0 0 0 0 14.142l20 20a10 10 0 0 0 14.142 0l97.071-97.071a10 10 0 0 0 0-14.142L624.142 730A10 10 0 0 0 610 730zm180 145a10 10 0 0 0-10 10v25a10 10 0 0 0 10 10h160a10 10 0 0 0 10-10v-25a10 10 0 0 0-10-10z"/></svg>
diff --git a/engine/misc/dist/ios_xcode/godot_ios/dummy.h b/engine/misc/dist/ios_xcode/godot_ios/dummy.h
index 23f1795b..a29be476 100644
--- a/engine/misc/dist/ios_xcode/godot_ios/dummy.h
+++ b/engine/misc/dist/ios_xcode/godot_ios/dummy.h
@@ -28,4 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 // #import <Foundation/Foundation.h>
diff --git a/engine/misc/dist/linux/org.godotengine.Godot.desktop b/engine/misc/dist/linux/org.godotengine.Godot.desktop
index 6483f51d..0e6ba4d3 100644
--- a/engine/misc/dist/linux/org.godotengine.Godot.desktop
+++ b/engine/misc/dist/linux/org.godotengine.Godot.desktop
@@ -17,7 +17,6 @@ Comment[zh_CN]=多平台 2D 和 3D 游戏引擎，带有功能丰富的编辑器
 Exec=godot %f
 Icon=godot
 Terminal=false
-PrefersNonDefaultGPU=true
 Type=Application
 MimeType=application/x-godot-project;
 Categories=Development;IDE;
diff --git a/engine/misc/dist/macos_tools.app/Contents/Info.plist b/engine/misc/dist/macos_tools.app/Contents/Info.plist
index 9078701c..83d191a8 100644
--- a/engine/misc/dist/macos_tools.app/Contents/Info.plist
+++ b/engine/misc/dist/macos_tools.app/Contents/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.4</string>
+	<string>4.5</string>
 	<key>CFBundleSignature</key>
 	<string>GODO</string>
 	<key>CFBundleVersion</key>
-	<string>4.4</string>
+	<string>4.5</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Microphone access is required to capture audio.</string>
 	<key>NSCameraUsageDescription</key>
diff --git a/engine/misc/dist/windows/godot.iss b/engine/misc/dist/windows/godot.iss
index 35f318cc..9bf2f0eb 100644
--- a/engine/misc/dist/windows/godot.iss
+++ b/engine/misc/dist/windows/godot.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Godot Engine"
-#define MyAppVersion "4.4"
+#define MyAppVersion "4.5"
 #define MyAppPublisher "Godot Engine contributors"
 #define MyAppURL "https://godotengine.org/"
 #define MyAppExeName "godot.exe"
diff --git a/engine/misc/error_suppressions/tsan.txt b/engine/misc/error_suppressions/tsan.txt
index ac46371f..9aa1d787 100644
--- a/engine/misc/error_suppressions/tsan.txt
+++ b/engine/misc/error_suppressions/tsan.txt
@@ -4,4 +4,5 @@
 deadlock:tests/core/templates/test_command_queue.h
 deadlock:modules/text_server_adv/text_server_adv.cpp
 deadlock:modules/text_server_fb/text_server_fb.cpp
-race:modules/navigation/nav_map.cpp
+race:modules/navigation_2d/nav_map_2d.cpp
+race:modules/navigation_3d/nav_map_3d.cpp
diff --git a/engine/misc/extension_api_validation/4.3-stable.expected b/engine/misc/extension_api_validation/4.3-stable_4.4-stable.expected
similarity index 98%
rename from engine/misc/extension_api_validation/4.3-stable.expected
rename to engine/misc/extension_api_validation/4.3-stable_4.4-stable.expected
index 527aa0fa..eaa89fbe 100644
--- a/engine/misc/extension_api_validation/4.3-stable.expected
+++ b/engine/misc/extension_api_validation/4.3-stable_4.4-stable.expected
@@ -1,12 +1,8 @@
-This file contains the expected output of --validate-extension-api when run against the extension_api.json of the
-4.3-stable tag (the basename of this file).
-
-Only lines that start with "Validate extension JSON:" matter, everything else is considered a comment and ignored. They
-should instead be used to justify these changes and describe how users should work around these changes.
-
-Add new entries at the end of the file.
+This file contains, when concatenated to the expected output since 4.4, the expected output of --validate-extension-api
+when run against the extension_api.json of the 4.3-stable tag (first part of the basename of this file).
 
 ## Changes between 4.3-stable and 4.4-stable
+
 GH-95374
 --------
 Validate extension JSON: Error: Field 'classes/ShapeCast2D/properties/collision_result': getter changed value in new API, from "_get_collision_result" to &"get_collision_result".
diff --git a/engine/misc/extension_api_validation/4.4-stable.expected b/engine/misc/extension_api_validation/4.4-stable.expected
new file mode 100644
index 00000000..d5e9e91e
--- /dev/null
+++ b/engine/misc/extension_api_validation/4.4-stable.expected
@@ -0,0 +1,50 @@
+This file contains the expected output of --validate-extension-api when run against the extension_api.json of the
+4.4-stable tag (the basename of this file).
+
+Only lines that start with "Validate extension JSON:" matter, everything else is considered a comment and ignored. They
+should instead be used to justify these changes and describe how users should work around these changes.
+
+Add new entries at the end of the file.
+
+## Changes between 4.4-stable and 4.5-stable
+
+GH-98194
+--------
+Validate extension JSON: Error: Field 'classes/DisplayServer/methods/file_dialog_show/arguments': size changed value in new API, from 7 to 8.
+Validate extension JSON: Error: Field 'classes/DisplayServer/methods/file_dialog_with_options_show/arguments': size changed value in new API, from 9 to 10.
+
+Optional argument added. Compatibility methods registered.
+
+
+GH-104087
+---------
+Validate extension JSON: Error: Field 'classes/OpenXRAPIExtension/methods/register_composition_layer_provider/arguments/0': type changed value in new API, from "OpenXRExtensionWrapperExtension" to "OpenXRExtensionWrapper".
+Validate extension JSON: Error: Field 'classes/OpenXRAPIExtension/methods/unregister_composition_layer_provider/arguments/0': type changed value in new API, from "OpenXRExtensionWrapperExtension" to "OpenXRExtensionWrapper".
+Validate extension JSON: Error: Field 'classes/OpenXRAPIExtension/methods/register_projection_views_extension/arguments/0': type changed value in new API, from "OpenXRExtensionWrapperExtension" to "OpenXRExtensionWrapper".
+Validate extension JSON: Error: Field 'classes/OpenXRAPIExtension/methods/unregister_projection_views_extension/arguments/0': type changed value in new API, from "OpenXRExtensionWrapperExtension" to "OpenXRExtensionWrapper".
+
+Switched from `OpenXRExtensionWrapperExtension` to parent `OpenXRExtensionWrapper`. Compatibility methods registered.
+
+
+GH-104890
+---------
+Validate extension JSON: API was removed: classes/JSONRPC/methods/set_scope
+
+Replaced `set_scope` with `set_method`. Compatibility method registered for binary compatibility. Manual upgrade required by users to retain functionality.
+
+
+GH-76829
+--------
+Validate extension JSON: Error: Field 'classes/RichTextLabel/methods/add_image/arguments': size changed value in new API, from 6 to 11.
+Validate extension JSON: Error: Field 'classes/RichTextLabel/methods/add_image/arguments': size changed value in new API, from 10 to 11.
+Validate extension JSON: Error: Field 'classes/RichTextLabel/methods/push_table/arguments': size changed value in new API, from 3 to 4.
+Validate extension JSON: Error: Field 'classes/TreeItem/methods/add_button/arguments': size changed value in new API, from 5 to 6.
+
+Added optional arguments. Compatibility methods registered.
+
+
+GH-71542
+--------
+Validate extension JSON: JSON file: Field was added in a way that breaks compatibility 'classes/EditorExportPlatform/methods/get_forced_export_files': arguments
+
+Optional argument added. Compatibility methods registered.
diff --git a/engine/misc/msvs/nmake.substitution.props b/engine/misc/msvs/nmake.substitution.props
new file mode 100644
index 00000000..05a155eb
--- /dev/null
+++ b/engine/misc/msvs/nmake.substitution.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+      <!-- override the PlatformToolset, which is set in the godot.vcxproj-->
+      <!-- Unknown matches to a set of conservative rules for the code analysis-->
+    <PlatformToolset>Unknown</PlatformToolset>
+    <LocalDebuggerCommand Condition="'$(LocalDebuggerCommand)' == ''">$(NMakeOutput)</LocalDebuggerCommand>
+  </PropertyGroup>
+  <!-- Build/Rebuild/Clean targets for NMake are defined in MSVC, so we need to provide them, when using MSBuild without MSVC targets -->
+  <Target Name="Build">
+    <Exec Command="$(NMakeBuildCommandLine)"/>
+  </Target>
+  <Target Name="Rebuild">
+    <Exec Command="$(NMakeReBuildCommandLine)"/>
+  </Target>
+  <Target Name="Clean">
+    <Exec Command="$(NMakeCleanCommandLine)"/>
+  </Target>
+</Project>
diff --git a/engine/misc/msvs/props.template b/engine/misc/msvs/props.template
index 82e3e81f..57483703 100644
--- a/engine/misc/msvs/props.template
+++ b/engine/misc/msvs/props.template
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(GodotConfiguration)|$(GodotPlatform)'=='%%VSCONF%%'">
+  <PropertyGroup Condition="%%CONDITION%%">
     <NMakeBuildCommandLine>%%BUILD%%</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>%%REBUILD%%</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>%%CLEAN%%</NMakeCleanCommandLine>
@@ -18,6 +18,9 @@
   <ItemGroup Condition="%%CONDITION%%">
     %%EXTRA_ITEMS%%
   </ItemGroup>
+
+  <!-- Build/Rebuild/Clean targets for NMake are defined in MSVC, so we need to provide them, when using MSBuild without MSVC targets -->
+  <Import Project="$(MSBuildProjectDirectory)\misc\msvs\nmake.substitution.props" Condition="%%CONDITION%% And !Exists('$(VCTargetsPath)\Microsoft.Cpp.targets')" />
 </Project>
 <!-- CHECKSUM
 %%HASH%%
diff --git a/engine/misc/msvs/vcxproj.template b/engine/misc/msvs/vcxproj.template
index 2cdb82d0..0261e906 100644
--- a/engine/misc/msvs/vcxproj.template
+++ b/engine/misc/msvs/vcxproj.template
@@ -10,31 +10,32 @@
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
   </PropertyGroup>
   %%PROPERTIES%%
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.Default.props') "/>
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Makefile</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset> <!--Might be overridden in the platform specific import or Microsoft.Cpp.$(GodotPlatform).user.props -->
+    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)'==''"/> <!--Workaround until https://youtrack.jetbrains.com/issue/RIDER-123783 is resolved. -->
     <OutDir>$(SolutionDir)\bin\$(GodotPlatform)\$(GodotConfiguration)\</OutDir>
     <IntDir>obj\$(GodotPlatform)\$(GodotConfiguration)\</IntDir>
     <LayoutDir>$(OutDir)\Layout</LayoutDir>
   </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.props') "/>
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(GodotPlatform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(GodotPlatform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(GodotPlatform).user.props" Condition="Exists('$(UserRootDir)\Microsoft.Cpp.$(GodotPlatform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  %%IMPORTS%%
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <ActiveProjectItemList></ActiveProjectItemList>
   </PropertyGroup>
-  %%IMPORTS%%
   <ItemGroup Condition="'$(IncludeListImported)'==''">
     %%DEFAULT_ITEMS%%
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.targets') "/>
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
diff --git a/engine/misc/scripts/char_range_fetch.py b/engine/misc/scripts/char_range_fetch.py
new file mode 100755
index 00000000..d4b8ffed
--- /dev/null
+++ b/engine/misc/scripts/char_range_fetch.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+
+# Script used to dump char ranges for specific properties from
+# the Unicode Character Database to the `char_range.inc` file.
+# NOTE: This script is deliberately not integrated into the build system;
+# you should run it manually whenever you want to update the data.
+
+import os
+import sys
+from typing import Final, List, Tuple
+from urllib.request import urlopen
+
+if __name__ == "__main__":
+    sys.path.insert(1, os.path.join(os.path.dirname(__file__), "../../"))
+
+from methods import generate_copyright_header
+
+URL: Final[str] = "https://www.unicode.org/Public/16.0.0/ucd/DerivedCoreProperties.txt"
+
+
+xid_start: List[Tuple[int, int]] = []
+xid_continue: List[Tuple[int, int]] = []
+uppercase_letter: List[Tuple[int, int]] = []
+lowercase_letter: List[Tuple[int, int]] = []
+unicode_letter: List[Tuple[int, int]] = []
+
+
+def merge_ranges(ranges: List[Tuple[int, int]]) -> None:
+    if len(ranges) < 2:
+        return
+
+    last_start: int = ranges[0][0]
+    last_end: int = ranges[0][1]
+    original_ranges: List[Tuple[int, int]] = ranges[1:]
+
+    ranges.clear()
+
+    for curr_range in original_ranges:
+        curr_start: int = curr_range[0]
+        curr_end: int = curr_range[1]
+        if last_end + 1 != curr_start:
+            ranges.append((last_start, last_end))
+            last_start = curr_start
+        last_end = curr_end
+
+    ranges.append((last_start, last_end))
+
+
+def parse_unicode_data() -> None:
+    lines: List[str] = [line.decode("utf-8") for line in urlopen(URL)]
+
+    for line in lines:
+        if line.startswith("#") or not line.strip():
+            continue
+
+        split_line: List[str] = line.split(";")
+
+        char_range: str = split_line[0].strip()
+        char_property: str = split_line[1].strip().split("#")[0].strip()
+
+        range_start: str = char_range
+        range_end: str = char_range
+        if ".." in char_range:
+            range_start, range_end = char_range.split("..")
+
+        range_tuple: Tuple[int, int] = (int(range_start, 16), int(range_end, 16))
+
+        if char_property == "XID_Start":
+            xid_start.append(range_tuple)
+        elif char_property == "XID_Continue":
+            xid_continue.append(range_tuple)
+        elif char_property == "Uppercase":
+            uppercase_letter.append(range_tuple)
+        elif char_property == "Lowercase":
+            lowercase_letter.append(range_tuple)
+        elif char_property == "Alphabetic":
+            unicode_letter.append(range_tuple)
+
+    # Underscore technically isn't in XID_Start, but for our purposes it's included.
+    xid_start.append((0x005F, 0x005F))
+    xid_start.sort(key=lambda x: x[0])
+
+    merge_ranges(xid_start)
+    merge_ranges(xid_continue)
+    merge_ranges(uppercase_letter)
+    merge_ranges(lowercase_letter)
+    merge_ranges(unicode_letter)
+
+
+def make_array(array_name: str, range_list: List[Tuple[int, int]]) -> str:
+    result: str = f"constexpr inline CharRange {array_name}[] = {{\n"
+
+    for start, end in range_list:
+        result += f"\t{{ 0x{start:x}, 0x{end:x} }},\n"
+
+    result += "};\n\n"
+
+    return result
+
+
+def generate_char_range_inc() -> None:
+    parse_unicode_data()
+
+    source: str = generate_copyright_header("char_range.inc")
+
+    source += f"""
+// This file was generated using the `misc/scripts/char_range_fetch.py` script.
+
+#pragma once
+
+#include "core/typedefs.h"
+
+// Unicode Derived Core Properties
+// Source: {URL}
+
+struct CharRange {{
+\tchar32_t start;
+\tchar32_t end;
+}};\n\n"""
+
+    source += make_array("xid_start", xid_start)
+    source += make_array("xid_continue", xid_continue)
+    source += make_array("uppercase_letter", uppercase_letter)
+    source += make_array("lowercase_letter", lowercase_letter)
+    source += make_array("unicode_letter", unicode_letter)
+
+    char_range_path: str = os.path.join(os.path.dirname(__file__), "../../core/string/char_range.inc")
+    with open(char_range_path, "w", newline="\n") as f:
+        f.write(source)
+
+    print("`char_range.inc` generated successfully.")
+
+
+if __name__ == "__main__":
+    generate_char_range_inc()
diff --git a/engine/misc/scripts/header_guards.py b/engine/misc/scripts/header_guards.py
index 4d4150a0..63a6b75f 100755
--- a/engine/misc/scripts/header_guards.py
+++ b/engine/misc/scripts/header_guards.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import sys
-from pathlib import Path
 
 if len(sys.argv) < 2:
     print("Invalid usage of header_guards.py, it should be called with a path to one or multiple files.")
@@ -13,7 +12,7 @@ invalid = []
 
 for file in sys.argv[1:]:
     header_start = -1
-    HEADER_CHECK_OFFSET = -1
+    header_end = -1
 
     with open(file.strip(), "rt", encoding="utf-8", newline="\n") as f:
         lines = f.readlines()
@@ -28,17 +27,21 @@ for file in sys.argv[1:]:
             if sline.startswith("/**********"):  # Godot header starts this way.
                 header_start = idx
             else:
-                HEADER_CHECK_OFFSET = 0  # There is no Godot header.
+                header_end = 0  # There is no Godot header.
                 break
         else:
-            if not sline.startswith("*") and not sline.startswith("/*"):  # Not in the Godot header anymore.
-                HEADER_CHECK_OFFSET = idx + 1  # The include should be two lines below the Godot header.
+            if not sline.startswith(("*", "/*")):  # Not in the Godot header anymore.
+                header_end = idx + 1  # The guard should be two lines below the Godot header.
                 break
 
-    if HEADER_CHECK_OFFSET < 0:
+    if (HEADER_CHECK_OFFSET := header_end) < 0 or HEADER_CHECK_OFFSET >= len(lines):
         invalid.append(file)
         continue
 
+    if lines[HEADER_CHECK_OFFSET].startswith("#pragma once"):
+        continue
+
+    # Might be using legacy header guards.
     HEADER_BEGIN_OFFSET = HEADER_CHECK_OFFSET + 1
     HEADER_END_OFFSET = len(lines) - 1
 
@@ -46,124 +49,35 @@ for file in sys.argv[1:]:
         invalid.append(file)
         continue
 
-    split = file.split("/")  # Already in posix-format.
-
-    prefix = ""
-    if split[0] == "modules" and split[-1] == "register_types.h":
-        prefix = f"{split[1]}_"  # Name of module.
-    elif split[0] == "platform" and (file.endswith("api/api.h") or "/export/" in file):
-        prefix = f"{split[1]}_"  # Name of platform.
-    elif file.startswith("modules/mono/utils") and "mono" not in split[-1]:
-        prefix = "MONO_"
-    elif file == "servers/rendering/storage/utilities.h":
-        prefix = "RENDERER_"
-
-    suffix = ""
-    if "dummy" in file and "dummy" not in split[-1]:
-        suffix = "_DUMMY"
-    elif "gles3" in file and "gles3" not in split[-1]:
-        suffix = "_GLES3"
-    elif "renderer_rd" in file and "rd" not in split[-1]:
-        suffix = "_RD"
-    elif split[-1] == "ustring.h":
-        suffix = "_GODOT"
-
-    name = (f"{prefix}{Path(file).stem}{suffix}{Path(file).suffix}".upper()
-            .replace(".", "_").replace("-", "_").replace(" ", "_"))  # fmt: skip
-
-    HEADER_CHECK = f"#ifndef {name}\n"
-    HEADER_BEGIN = f"#define {name}\n"
-    HEADER_END = f"#endif // {name}\n"
-
-    if (
-        lines[HEADER_CHECK_OFFSET] == HEADER_CHECK
-        and lines[HEADER_BEGIN_OFFSET] == HEADER_BEGIN
-        and lines[HEADER_END_OFFSET] == HEADER_END
-    ):
-        continue
-
-    # Guards might exist but with the wrong names.
     if (
         lines[HEADER_CHECK_OFFSET].startswith("#ifndef")
         and lines[HEADER_BEGIN_OFFSET].startswith("#define")
         and lines[HEADER_END_OFFSET].startswith("#endif")
     ):
-        lines[HEADER_CHECK_OFFSET] = HEADER_CHECK
-        lines[HEADER_BEGIN_OFFSET] = HEADER_BEGIN
-        lines[HEADER_END_OFFSET] = HEADER_END
+        lines[HEADER_CHECK_OFFSET] = "#pragma once"
+        lines[HEADER_BEGIN_OFFSET] = "\n"
+        lines.pop()
         with open(file, "wt", encoding="utf-8", newline="\n") as f:
             f.writelines(lines)
         changed.append(file)
         continue
 
-    header_check = -1
-    header_begin = -1
-    header_end = -1
-    pragma_once = -1
-    objc = False
-
-    for idx, line in enumerate(lines):
-        if line.startswith("// #import"):  # Some dummy obj-c files only have commented out import lines.
-            objc = True
-            break
-        if not line.startswith("#"):
-            continue
-        elif line.startswith("#ifndef") and header_check == -1:
-            header_check = idx
-        elif line.startswith("#define") and header_begin == -1:
-            header_begin = idx
-        elif line.startswith("#endif") and header_end == -1:
-            header_end = idx
-        elif line.startswith("#pragma once"):
-            pragma_once = idx
-            break
-        elif line.startswith("#import"):
-            objc = True
+    # Verify `#pragma once` doesn't exist at invalid location.
+    misplaced = False
+    for line in lines:
+        if line.startswith("#pragma once"):
+            misplaced = True
             break
 
-    if objc:
+    if misplaced:
+        invalid.append(file)
         continue
 
-    if pragma_once != -1:
-        lines.pop(pragma_once)
-        lines.insert(HEADER_CHECK_OFFSET, HEADER_CHECK)
-        lines.insert(HEADER_BEGIN_OFFSET, HEADER_BEGIN)
-        lines.append("\n")
-        lines.append(HEADER_END)
-        with open(file, "wt", encoding="utf-8", newline="\n") as f:
-            f.writelines(lines)
-        changed.append(file)
-        continue
-
-    if header_check == -1 and header_begin == -1 and header_end == -1:
-        # Guards simply didn't exist
-        lines.insert(HEADER_CHECK_OFFSET, HEADER_CHECK)
-        lines.insert(HEADER_BEGIN_OFFSET, HEADER_BEGIN)
-        lines.append("\n")
-        lines.append(HEADER_END)
-        with open(file, "wt", encoding="utf-8", newline="\n") as f:
-            f.writelines(lines)
-        changed.append(file)
-        continue
-
-    if header_check != -1 and header_begin != -1 and header_end != -1:
-        # All prepends "found", see if we can salvage this.
-        if header_check == header_begin - 1 and header_begin < header_end:
-            lines.pop(header_check)
-            lines.pop(header_begin - 1)
-            lines.pop(header_end - 2)
-            if lines[header_end - 3] == "\n":
-                lines.pop(header_end - 3)
-            lines.insert(HEADER_CHECK_OFFSET, HEADER_CHECK)
-            lines.insert(HEADER_BEGIN_OFFSET, HEADER_BEGIN)
-            lines.append("\n")
-            lines.append(HEADER_END)
-            with open(file, "wt", encoding="utf-8", newline="\n") as f:
-                f.writelines(lines)
-            changed.append(file)
-            continue
-
-    invalid.append(file)
+    # Assume that we're simply missing a guard entirely.
+    lines.insert(HEADER_CHECK_OFFSET, "#pragma once\n\n")
+    with open(file, "wt", encoding="utf-8", newline="\n") as f:
+        f.writelines(lines)
+    changed.append(file)
 
 if changed:
     for file in changed:
diff --git a/engine/misc/scripts/install_d3d12_sdk_windows.py b/engine/misc/scripts/install_d3d12_sdk_windows.py
index 26e5181d..7425000e 100644
--- a/engine/misc/scripts/install_d3d12_sdk_windows.py
+++ b/engine/misc/scripts/install_d3d12_sdk_windows.py
@@ -8,7 +8,7 @@ import urllib.request
 
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
 
-from misc.utility.color import Ansi
+from misc.utility.color import Ansi, color_print
 
 # Base Godot dependencies path
 # If cross-compiling (no LOCALAPPDATA), we install in `bin`
@@ -42,7 +42,7 @@ if not os.path.exists(deps_folder):
     os.makedirs(deps_folder)
 
 # Mesa NIR
-print(f"{Ansi.BOLD}[1/3] Mesa NIR{Ansi.RESET}")
+color_print(f"{Ansi.BOLD}[1/3] Mesa NIR")
 if os.path.isfile(mesa_archive):
     os.remove(mesa_archive)
 print(f"Downloading Mesa NIR {mesa_filename} ...")
@@ -69,7 +69,7 @@ if dlltool == "":
     dlltool = shutil.which("x86_64-w64-mingw32-dlltool") or ""
 has_mingw = gendef != "" and dlltool != ""
 
-print(f"{Ansi.BOLD}[2/3] WinPixEventRuntime{Ansi.RESET}")
+color_print(f"{Ansi.BOLD}[2/3] WinPixEventRuntime")
 if os.path.isfile(pix_archive):
     os.remove(pix_archive)
 print(f"Downloading WinPixEventRuntime {pix_version} ...")
@@ -100,7 +100,7 @@ else:
 print(f"WinPixEventRuntime {pix_version} installed successfully.\n")
 
 # DirectX 12 Agility SDK
-print(f"{Ansi.BOLD}[3/3] DirectX 12 Agility SDK{Ansi.RESET}")
+color_print(f"{Ansi.BOLD}[3/3] DirectX 12 Agility SDK")
 if os.path.isfile(agility_sdk_archive):
     os.remove(agility_sdk_archive)
 print(f"Downloading DirectX 12 Agility SDK {agility_sdk_version} ...")
@@ -116,5 +116,5 @@ os.remove(agility_sdk_archive)
 print(f"DirectX 12 Agility SDK {agility_sdk_version} installed successfully.\n")
 
 # Complete message
-print(f'{Ansi.GREEN}All Direct3D 12 SDK components were installed to "{deps_folder}" successfully!{Ansi.RESET}')
-print(f'{Ansi.GREEN}You can now build Godot with Direct3D 12 support enabled by running "scons d3d12=yes".{Ansi.RESET}')
+color_print(f'{Ansi.GREEN}All Direct3D 12 SDK components were installed to "{deps_folder}" successfully!')
+color_print(f'{Ansi.GREEN}You can now build Godot with Direct3D 12 support enabled by running "scons d3d12=yes".')
diff --git a/engine/misc/scripts/make_tarball.sh b/engine/misc/scripts/make_tarball.sh
index 9e02b80a..eac9848c 100755
--- a/engine/misc/scripts/make_tarball.sh
+++ b/engine/misc/scripts/make_tarball.sh
@@ -54,7 +54,7 @@ echo "    $(dirname $CURDIR)/$NAME.tar.gz"
 
 git archive $HEAD --prefix=$NAME/ -o $TMPDIR/$NAME.tar
 
-# Adding custom .git/HEAD to tarball so that we can generate VERSION_HASH.
+# Adding custom .git/HEAD to tarball so that we can generate GODOT_VERSION_HASH.
 cd $TMPDIR
 mkdir -p $NAME/.git
 echo $HEAD > $NAME/.git/HEAD
diff --git a/engine/misc/scripts/purge_cache.py b/engine/misc/scripts/purge_cache.py
new file mode 100755
index 00000000..5f9b584b
--- /dev/null
+++ b/engine/misc/scripts/purge_cache.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+import argparse
+import glob
+import os
+
+if __name__ != "__main__":
+    raise ImportError(f"{__name__} should not be used as a module.")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Cleanup old cache files")
+    parser.add_argument("timestamp", type=int, help="Unix timestamp cutoff")
+    parser.add_argument("directory", help="Path to cache directory")
+    args = parser.parse_args()
+
+    ret = 0
+
+    # TODO: Convert to non-hardcoded path
+    if os.path.exists("redundant.txt"):
+        with open("redundant.txt") as redundant:
+            for item in map(str.strip, redundant):
+                if os.path.isfile(item):
+                    try:
+                        os.remove(item)
+                    except OSError:
+                        print(f'Failed to handle "{item}"; skipping.')
+                        ret += 1
+
+    for file in glob.glob(os.path.join(args.directory, "*", "*")):
+        try:
+            if os.path.getatime(file) < args.timestamp:
+                os.remove(file)
+        except OSError:
+            print(f'Failed to handle "{file}"; skipping.')
+            ret += 1
+
+    return ret
+
+
+try:
+    raise SystemExit(main())
+except KeyboardInterrupt:
+    import signal
+
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
+    os.kill(os.getpid(), signal.SIGINT)
diff --git a/engine/misc/scripts/ucaps_fetch.py b/engine/misc/scripts/ucaps_fetch.py
index 2aeaeed7..8cdecc87 100755
--- a/engine/misc/scripts/ucaps_fetch.py
+++ b/engine/misc/scripts/ucaps_fetch.py
@@ -55,8 +55,7 @@ def generate_ucaps_fetch() -> None:
     source: str = generate_copyright_header("ucaps.h")
 
     source += f"""
-#ifndef UCAPS_H
-#define UCAPS_H
+#pragma once
 
 // This file was generated using the `misc/scripts/ucaps_fetch.py` script.
 
@@ -105,8 +104,6 @@ static int _find_lower(int ch) {
 
 \treturn ch;
 }
-
-#endif // UCAPS_H
 """
 
     ucaps_path: str = os.path.join(os.path.dirname(__file__), "../../core/string/ucaps.h")
diff --git a/engine/misc/utility/color.py b/engine/misc/utility/color.py
index 9ab48f1b..e482b6a7 100644
--- a/engine/misc/utility/color.py
+++ b/engine/misc/utility/color.py
@@ -1,85 +1,58 @@
 from __future__ import annotations
 
 import os
+import re
 import sys
 from enum import Enum
 from typing import Final
 
 # Colors are disabled in non-TTY environments such as pipes. This means if output is redirected
-# to a file, it won't contain color codes. Colors are always enabled on continuous integration.
+# to a file, it won't contain color codes. Colors are enabled by default on continuous integration.
 
 IS_CI: Final[bool] = bool(os.environ.get("CI"))
+NO_COLOR: Final[bool] = bool(os.environ.get("NO_COLOR"))
+CLICOLOR_FORCE: Final[bool] = bool(os.environ.get("CLICOLOR_FORCE"))
 STDOUT_TTY: Final[bool] = bool(sys.stdout.isatty())
 STDERR_TTY: Final[bool] = bool(sys.stderr.isatty())
 
 
-def _color_supported(stdout: bool) -> bool:
+_STDOUT_ORIGINAL: Final[bool] = False if NO_COLOR else CLICOLOR_FORCE or IS_CI or STDOUT_TTY
+_STDERR_ORIGINAL: Final[bool] = False if NO_COLOR else CLICOLOR_FORCE or IS_CI or STDERR_TTY
+_stdout_override: bool = _STDOUT_ORIGINAL
+_stderr_override: bool = _STDERR_ORIGINAL
+
+
+def is_stdout_color() -> bool:
+    return _stdout_override
+
+
+def is_stderr_color() -> bool:
+    return _stderr_override
+
+
+def force_stdout_color(value: bool) -> None:
     """
-    Validates if the current environment supports colored output. Attempts to enable ANSI escape
-    code support on Windows 10 and later.
+    Explicitly set `stdout` support for ANSI escape codes.
+    If environment overrides exist, does nothing.
     """
-    if IS_CI:
-        return True
-
-    if sys.platform != "win32":
-        return STDOUT_TTY if stdout else STDERR_TTY
-    else:
-        from ctypes import POINTER, WINFUNCTYPE, WinError, windll
-        from ctypes.wintypes import BOOL, DWORD, HANDLE
-
-        STD_HANDLE = -11 if stdout else -12
-        ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
-
-        def err_handler(result, func, args):
-            if not result:
-                raise WinError()
-            return args
-
-        GetStdHandle = WINFUNCTYPE(HANDLE, DWORD)(("GetStdHandle", windll.kernel32), ((1, "nStdHandle"),))
-        GetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, POINTER(DWORD))(
-            ("GetConsoleMode", windll.kernel32),
-            ((1, "hConsoleHandle"), (2, "lpMode")),
-        )
-        GetConsoleMode.errcheck = err_handler
-        SetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, DWORD)(
-            ("SetConsoleMode", windll.kernel32),
-            ((1, "hConsoleHandle"), (1, "dwMode")),
-        )
-        SetConsoleMode.errcheck = err_handler
-
-        try:
-            handle = GetStdHandle(STD_HANDLE)
-            flags = GetConsoleMode(handle)
-            SetConsoleMode(handle, flags | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-            return True
-        except OSError:
-            return False
-
-
-STDOUT_COLOR: Final[bool] = _color_supported(True)
-STDERR_COLOR: Final[bool] = _color_supported(False)
-_stdout_override: bool = STDOUT_COLOR
-_stderr_override: bool = STDERR_COLOR
-
-
-def toggle_color(stdout: bool, value: bool | None = None) -> None:
-    """
-    Explicitly toggle color codes, regardless of support.
-
-    - `stdout`: A boolean to choose the output stream. `True` for stdout, `False` for stderr.
-    - `value`: An optional boolean to explicitly set the color state instead of toggling.
-    """
-    if stdout:
+    if not NO_COLOR or not CLICOLOR_FORCE:
         global _stdout_override
-        _stdout_override = value if value is not None else not _stdout_override
-    else:
+        _stdout_override = value
+
+
+def force_stderr_color(value: bool) -> None:
+    """
+    Explicitly set `stderr` support for ANSI escape codes.
+    If environment overrides exist, does nothing.
+    """
+    if not NO_COLOR or not CLICOLOR_FORCE:
         global _stderr_override
-        _stderr_override = value if value is not None else not _stderr_override
+        _stderr_override = value
 
 
 class Ansi(Enum):
     """
-    Enum class for adding ansi codepoints directly into strings. Automatically converts values to
+    Enum class for adding ANSI codepoints directly into strings. Automatically converts values to
     strings representing their internal value.
     """
 
@@ -106,25 +79,74 @@ class Ansi(Enum):
         return self.value
 
 
+RE_ANSI = re.compile(r"\x1b\[[=\?]?[;\d]+[a-zA-Z]")
+
+
+def color_print(*values: object, sep: str | None = " ", end: str | None = "\n", flush: bool = False) -> None:
+    """Prints a colored message to `stdout`. If disabled, ANSI codes are automatically stripped."""
+    if is_stdout_color():
+        print(*values, sep=sep, end=f"{Ansi.RESET}{end}", flush=flush)
+    else:
+        print(RE_ANSI.sub("", (sep or " ").join(map(str, values))), sep="", end=end, flush=flush)
+
+
+def color_printerr(*values: object, sep: str | None = " ", end: str | None = "\n", flush: bool = False) -> None:
+    """Prints a colored message to `stderr`. If disabled, ANSI codes are automatically stripped."""
+    if is_stderr_color():
+        print(*values, sep=sep, end=f"{Ansi.RESET}{end}", flush=flush, file=sys.stderr)
+    else:
+        print(RE_ANSI.sub("", (sep or " ").join(map(str, values))), sep="", end=end, flush=flush, file=sys.stderr)
+
+
 def print_info(*values: object) -> None:
     """Prints a informational message with formatting."""
-    if _stdout_override:
-        print(f"{Ansi.GRAY}{Ansi.BOLD}INFO:{Ansi.REGULAR}", *values, Ansi.RESET)
-    else:
-        print("INFO:", *values)
+    color_print(f"{Ansi.GRAY}{Ansi.BOLD}INFO:{Ansi.REGULAR}", *values)
 
 
 def print_warning(*values: object) -> None:
     """Prints a warning message with formatting."""
-    if _stderr_override:
-        print(f"{Ansi.YELLOW}{Ansi.BOLD}WARNING:{Ansi.REGULAR}", *values, Ansi.RESET, file=sys.stderr)
-    else:
-        print("WARNING:", *values, file=sys.stderr)
+    color_printerr(f"{Ansi.YELLOW}{Ansi.BOLD}WARNING:{Ansi.REGULAR}", *values)
 
 
 def print_error(*values: object) -> None:
     """Prints an error message with formatting."""
-    if _stderr_override:
-        print(f"{Ansi.RED}{Ansi.BOLD}ERROR:{Ansi.REGULAR}", *values, Ansi.RESET, file=sys.stderr)
-    else:
-        print("ERROR:", *values, file=sys.stderr)
+    color_printerr(f"{Ansi.RED}{Ansi.BOLD}ERROR:{Ansi.REGULAR}", *values)
+
+
+if sys.platform == "win32":
+
+    def _win_color_fix():
+        """Attempts to enable ANSI escape code support on Windows 10 and later."""
+        from ctypes import POINTER, WINFUNCTYPE, WinError, windll
+        from ctypes.wintypes import BOOL, DWORD, HANDLE
+
+        STDOUT_HANDLE = -11
+        STDERR_HANDLE = -12
+        ENABLE_VIRTUAL_TERMINAL_PROCESSING = 4
+
+        def err_handler(result, func, args):
+            if not result:
+                raise WinError()
+            return args
+
+        GetStdHandle = WINFUNCTYPE(HANDLE, DWORD)(("GetStdHandle", windll.kernel32), ((1, "nStdHandle"),))
+        GetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, POINTER(DWORD))(
+            ("GetConsoleMode", windll.kernel32),
+            ((1, "hConsoleHandle"), (2, "lpMode")),
+        )
+        GetConsoleMode.errcheck = err_handler
+        SetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, DWORD)(
+            ("SetConsoleMode", windll.kernel32),
+            ((1, "hConsoleHandle"), (1, "dwMode")),
+        )
+        SetConsoleMode.errcheck = err_handler
+
+        for handle_id in [STDOUT_HANDLE, STDERR_HANDLE]:
+            try:
+                handle = GetStdHandle(handle_id)
+                flags = GetConsoleMode(handle)
+                SetConsoleMode(handle, flags | ENABLE_VIRTUAL_TERMINAL_PROCESSING)
+            except OSError:
+                pass
+
+    _win_color_fix()
diff --git a/engine/misc/utility/svgo.config.mjs b/engine/misc/utility/svgo.config.mjs
index d4c14f00..3849103e 100644
--- a/engine/misc/utility/svgo.config.mjs
+++ b/engine/misc/utility/svgo.config.mjs
@@ -1,6 +1,10 @@
 export default {
 	multipass: true,
 	precision: 2,
+	js2svg: {
+		eol: "lf",
+		finalNewline: true,
+	},
 	plugins: [
 		{
 			name: "preset-default",
diff --git a/engine/modules/SCsub b/engine/modules/SCsub
index 09944241..c2400fbe 100644
--- a/engine/modules/SCsub
+++ b/engine/modules/SCsub
@@ -17,8 +17,9 @@ Export("env_modules")
 
 # Header with MODULE_*_ENABLED defines.
 def modules_enabled_builder(target, source, env):
-    with methods.generated_wrapper(target) as file:
-        for module in source[0].read():
+    modules = sorted(source[0].read())
+    with methods.generated_wrapper(str(target[0])) as file:
+        for module in modules:
             file.write(f"#define MODULE_{module.upper()}_ENABLED\n")
 
 
@@ -29,14 +30,26 @@ modules_enabled = env.CommandNoCache(
 
 def register_module_types_builder(target, source, env):
     modules = source[0].read()
-    mod_inc = "\n".join([f'#include "{p}/register_types.h"' for p in modules.values()])
+    mod_inc = "\n".join([f'#include "{value}/register_types.h"' for value in modules.values()])
     mod_init = "\n".join(
-        [f"#ifdef MODULE_{n.upper()}_ENABLED\n\tinitialize_{n}_module(p_level);\n#endif" for n in modules.keys()]
+        [
+            f"""\
+#ifdef MODULE_{key.upper()}_ENABLED
+	initialize_{key}_module(p_level);
+#endif"""
+            for key in modules.keys()
+        ]
     )
     mod_uninit = "\n".join(
-        [f"#ifdef MODULE_{n.upper()}_ENABLED\n\tuninitialize_{n}_module(p_level);\n#endif" for n in modules.keys()]
+        [
+            f"""\
+#ifdef MODULE_{key.upper()}_ENABLED
+	uninitialize_{key}_module(p_level);
+#endif"""
+            for key in modules.keys()
+        ]
     )
-    with methods.generated_wrapper(target) as file:
+    with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             f"""\
 #include "register_module_types.h"
@@ -88,9 +101,10 @@ for name, path in env.module_list.items():
 if env["tests"]:
 
     def modules_tests_builder(target, source, env):
-        with methods.generated_wrapper(target) as file:
-            for header in source:
-                file.write('#include "{}"\n'.format(os.path.normpath(header.path).replace("\\", "/")))
+        headers = sorted([os.path.relpath(src.path, methods.base_folder).replace("\\", "/") for src in source])
+        with methods.generated_wrapper(str(target[0])) as file:
+            for header in headers:
+                file.write(f'#include "{header}"\n')
 
     env.CommandNoCache("modules_tests.gen.h", test_headers, env.Run(modules_tests_builder))
 
diff --git a/engine/modules/astcenc/SCsub b/engine/modules/astcenc/SCsub
index bb8bc8d8..12c660fa 100644
--- a/engine/modules/astcenc/SCsub
+++ b/engine/modules/astcenc/SCsub
@@ -37,7 +37,7 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_astcenc.Prepend(CPPPATH=[thirdparty_dir])
+env_astcenc.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 env_thirdparty = env_astcenc.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/modules/astcenc/image_compress_astcenc.h b/engine/modules/astcenc/image_compress_astcenc.h
index 790a3bd3..21e96c07 100644
--- a/engine/modules/astcenc/image_compress_astcenc.h
+++ b/engine/modules/astcenc/image_compress_astcenc.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_COMPRESS_ASTCENC_H
-#define IMAGE_COMPRESS_ASTCENC_H
+#pragma once
 
 #include "core/io/image.h"
 
@@ -38,5 +37,3 @@ void _compress_astc(Image *r_img, Image::ASTCFormat p_format);
 #endif
 
 void _decompress_astc(Image *r_img);
-
-#endif // IMAGE_COMPRESS_ASTCENC_H
diff --git a/engine/modules/astcenc/register_types.h b/engine/modules/astcenc/register_types.h
index 636da9ff..65445bde 100644
--- a/engine/modules/astcenc/register_types.h
+++ b/engine/modules/astcenc/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ASTCENC_REGISTER_TYPES_H
-#define ASTCENC_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_astcenc_module(ModuleInitializationLevel p_level);
 void uninitialize_astcenc_module(ModuleInitializationLevel p_level);
-
-#endif // ASTCENC_REGISTER_TYPES_H
diff --git a/engine/modules/basis_universal/SCsub b/engine/modules/basis_universal/SCsub
index b8cce67f..f58554bb 100644
--- a/engine/modules/basis_universal/SCsub
+++ b/engine/modules/basis_universal/SCsub
@@ -42,18 +42,14 @@ if basisu_encoder:
 
 transcoder_sources = [thirdparty_dir + "transcoder/basisu_transcoder.cpp"]
 
-# Treat Basis headers as system headers to avoid raising warnings. Not supported on MSVC.
-if not env.msvc:
-    env_basisu.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
-else:
-    env_basisu.Prepend(CPPPATH=[thirdparty_dir])
+env_basisu.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 if basisu_encoder:
-    env_basisu.Prepend(CPPPATH=["#thirdparty/jpeg-compressor"])
-    env_basisu.Prepend(CPPPATH=["#thirdparty/tinyexr"])
+    env_basisu.Prepend(CPPEXTPATH=["#thirdparty/jpeg-compressor"])
+    env_basisu.Prepend(CPPEXTPATH=["#thirdparty/tinyexr"])
 
 if env["builtin_zstd"]:
-    env_basisu.Prepend(CPPPATH=["#thirdparty/zstd"])
+    env_basisu.Prepend(CPPEXTPATH=["#thirdparty/zstd"])
 
 env_thirdparty = env_basisu.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/modules/basis_universal/image_compress_basisu.cpp b/engine/modules/basis_universal/image_compress_basisu.cpp
index be28d895..5027b8a4 100644
--- a/engine/modules/basis_universal/image_compress_basisu.cpp
+++ b/engine/modules/basis_universal/image_compress_basisu.cpp
@@ -275,6 +275,7 @@ Ref<Image> basis_universal_unpacker_ptr(const uint8_t *p_data, int p_size) {
 	bool rgtc_supported = RS::get_singleton()->has_os_feature("rgtc");
 	bool s3tc_supported = RS::get_singleton()->has_os_feature("s3tc");
 	bool etc2_supported = RS::get_singleton()->has_os_feature("etc2");
+	bool astc_hdr_supported = RS::get_singleton()->has_os_feature("astc_hdr");
 
 	bool needs_ra_rg_swap = false;
 	bool needs_rg_trim = false;
@@ -379,7 +380,7 @@ Ref<Image> basis_universal_unpacker_ptr(const uint8_t *p_data, int p_size) {
 			if (bptc_supported) {
 				basisu_format = basist::transcoder_texture_format::cTFBC6H;
 				image_format = Image::FORMAT_BPTC_RGBFU;
-			} else if (astc_supported) {
+			} else if (astc_hdr_supported) {
 				basisu_format = basist::transcoder_texture_format::cTFASTC_HDR_4x4_RGBA;
 				image_format = Image::FORMAT_ASTC_4x4_HDR;
 			} else {
diff --git a/engine/modules/basis_universal/image_compress_basisu.h b/engine/modules/basis_universal/image_compress_basisu.h
index 81c8511f..1002ba9c 100644
--- a/engine/modules/basis_universal/image_compress_basisu.h
+++ b/engine/modules/basis_universal/image_compress_basisu.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_COMPRESS_BASISU_H
-#define IMAGE_COMPRESS_BASISU_H
+#pragma once
 
 #include "core/io/image.h"
 
@@ -58,5 +57,3 @@ Vector<uint8_t> basis_universal_packer(const Ref<Image> &p_image, Image::UsedCha
 
 Ref<Image> basis_universal_unpacker_ptr(const uint8_t *p_data, int p_size);
 Ref<Image> basis_universal_unpacker(const Vector<uint8_t> &p_buffer);
-
-#endif // IMAGE_COMPRESS_BASISU_H
diff --git a/engine/modules/basis_universal/register_types.h b/engine/modules/basis_universal/register_types.h
index 84607f15..92d5e249 100644
--- a/engine/modules/basis_universal/register_types.h
+++ b/engine/modules/basis_universal/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BASIS_UNIVERSAL_REGISTER_TYPES_H
-#define BASIS_UNIVERSAL_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_basis_universal_module(ModuleInitializationLevel p_level);
 void uninitialize_basis_universal_module(ModuleInitializationLevel p_level);
-
-#endif // BASIS_UNIVERSAL_REGISTER_TYPES_H
diff --git a/engine/modules/bcdec/image_decompress_bcdec.cpp b/engine/modules/bcdec/image_decompress_bcdec.cpp
index ad0c1729..784ac0f8 100644
--- a/engine/modules/bcdec/image_decompress_bcdec.cpp
+++ b/engine/modules/bcdec/image_decompress_bcdec.cpp
@@ -48,14 +48,14 @@ static void decompress_image(BCdecFormat format, const void *src, void *dst, con
 	const uint8_t *src_blocks = reinterpret_cast<const uint8_t *>(src);
 	uint8_t *dec_blocks = reinterpret_cast<uint8_t *>(dst);
 
-#define DECOMPRESS_LOOP(func, block_size, color_bytesize, color_components)            \
-	for (uint64_t y = 0; y < height; y += 4) {                                         \
-		for (uint64_t x = 0; x < width; x += 4) {                                      \
-			func(&src_blocks[src_pos], &dec_blocks[dst_pos], width *color_components); \
-			src_pos += block_size;                                                     \
-			dst_pos += 4 * color_bytesize;                                             \
-		}                                                                              \
-		dst_pos += 3 * width * color_bytesize;                                         \
+#define DECOMPRESS_LOOP(func, block_size, color_bytesize, color_components)             \
+	for (uint64_t y = 0; y < height; y += 4) {                                          \
+		for (uint64_t x = 0; x < width; x += 4) {                                       \
+			func(&src_blocks[src_pos], &dec_blocks[dst_pos], width * color_components); \
+			src_pos += block_size;                                                      \
+			dst_pos += 4 * color_bytesize;                                              \
+		}                                                                               \
+		dst_pos += 3 * width * color_bytesize;                                          \
 	}
 
 #define DECOMPRESS_LOOP_SAFE(func, block_size, color_bytesize, color_components, output)                                                              \
diff --git a/engine/modules/bcdec/image_decompress_bcdec.h b/engine/modules/bcdec/image_decompress_bcdec.h
index b82ceed9..3dcfd33e 100644
--- a/engine/modules/bcdec/image_decompress_bcdec.h
+++ b/engine/modules/bcdec/image_decompress_bcdec.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_DECOMPRESS_BCDEC_H
-#define IMAGE_DECOMPRESS_BCDEC_H
+#pragma once
 
 #include "core/io/image.h"
 
@@ -45,5 +44,3 @@ enum BCdecFormat {
 };
 
 void image_decompress_bcdec(Image *p_image);
-
-#endif // IMAGE_DECOMPRESS_BCDEC_H
diff --git a/engine/modules/bcdec/register_types.h b/engine/modules/bcdec/register_types.h
index eb721e3f..59c6f2e2 100644
--- a/engine/modules/bcdec/register_types.h
+++ b/engine/modules/bcdec/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BCDEC_REGISTER_TYPES_H
-#define BCDEC_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_bcdec_module(ModuleInitializationLevel p_level);
 void uninitialize_bcdec_module(ModuleInitializationLevel p_level);
-
-#endif // BCDEC_REGISTER_TYPES_H
diff --git a/engine/modules/betsy/bc6h.glsl b/engine/modules/betsy/bc6h.glsl
index 73540876..d00bbafb 100644
--- a/engine/modules/betsy/bc6h.glsl
+++ b/engine/modules/betsy/bc6h.glsl
@@ -89,12 +89,36 @@ float CalcMSLE(float3 a, float3 b) {
 
 	return result;
 }
+
+// Adapt the log function to make sense when a < 0
+float3 customLog2(float3 a) {
+	return float3(
+			a.x >= 0 ? log2(a.x + 1.0f) : -log2(-a.x + 1.0f),
+			a.y >= 0 ? log2(a.y + 1.0f) : -log2(-a.y + 1.0f),
+			a.z >= 0 ? log2(a.z + 1.0f) : -log2(-a.z + 1.0f));
+}
+
+// Inverse of customLog2()
+float3 customExp2(float3 a) {
+	return float3(
+			a.x >= 0 ? exp2(a.x) - 1.0f : -(exp2(-a.x) - 1.0f),
+			a.y >= 0 ? exp2(a.y) - 1.0f : -(exp2(-a.y) - 1.0f),
+			a.z >= 0 ? exp2(a.z) - 1.0f : -(exp2(-a.z) - 1.0f));
+}
 #else
 float CalcMSLE(float3 a, float3 b) {
 	float3 err = log2((b + 1.0f) / (a + 1.0f));
 	err = err * err;
 	return err.x + err.y + err.z;
 }
+
+float3 customLog2(float3 a) {
+	return log2(a + 1.0f);
+}
+
+float3 customExp2(float3 a) {
+	return exp2(a) - 1.0f;
+}
 #endif
 
 uint PatternFixupID(uint i) {
@@ -272,15 +296,15 @@ void EncodeP1(inout uint4 block, inout float blockMSLE, float3 texels[16]) {
 		refinedBlockMax = max(refinedBlockMax, texels[i] == blockMax ? refinedBlockMax : texels[i]);
 	}
 
-	float3 logBlockMax = log2(blockMax + 1.0f);
-	float3 logBlockMin = log2(blockMin + 1.0f);
-	float3 logRefinedBlockMax = log2(refinedBlockMax + 1.0f);
-	float3 logRefinedBlockMin = log2(refinedBlockMin + 1.0f);
+	float3 logBlockMax = customLog2(blockMax);
+	float3 logBlockMin = customLog2(blockMin);
+	float3 logRefinedBlockMax = customLog2(refinedBlockMax);
+	float3 logRefinedBlockMin = customLog2(refinedBlockMin);
 	float3 logBlockMaxExt = (logBlockMax - logBlockMin) * (1.0f / 32.0f);
 	logBlockMin += min(logRefinedBlockMin - logBlockMin, logBlockMaxExt);
 	logBlockMax -= min(logBlockMax - logRefinedBlockMax, logBlockMaxExt);
-	blockMin = exp2(logBlockMin) - 1.0f;
-	blockMax = exp2(logBlockMax) - 1.0f;
+	blockMin = customExp2(logBlockMin);
+	blockMax = customExp2(logBlockMax);
 
 	float3 blockDir = blockMax - blockMin;
 	blockDir = blockDir / (blockDir.x + blockDir.y + blockDir.z);
diff --git a/engine/modules/betsy/betsy_bc1.h b/engine/modules/betsy/betsy_bc1.h
index 2274ed0a..2c62f60b 100644
--- a/engine/modules/betsy/betsy_bc1.h
+++ b/engine/modules/betsy/betsy_bc1.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BETSY_BC1_H
-#define BETSY_BC1_H
+#pragma once
 
 constexpr const float dxt1_encoding_table[1024] = {
 	0,
@@ -1057,5 +1056,3 @@ constexpr const float dxt1_encoding_table[1024] = {
 	63,
 	63,
 };
-
-#endif // BETSY_BC1_H
diff --git a/engine/modules/betsy/image_compress_betsy.cpp b/engine/modules/betsy/image_compress_betsy.cpp
index 4138ad76..c5782f50 100644
--- a/engine/modules/betsy/image_compress_betsy.cpp
+++ b/engine/modules/betsy/image_compress_betsy.cpp
@@ -259,6 +259,14 @@ void BetsyCompressor::_thread_exit() {
 				compress_rd->free(cached_shaders[i].compiled);
 			}
 		}
+
+		// Free the RD (and RCD if necessary).
+		memdelete(compress_rd);
+		compress_rd = nullptr;
+		if (compress_rcd != nullptr) {
+			memdelete(compress_rcd);
+			compress_rcd = nullptr;
+		}
 	}
 }
 
@@ -268,16 +276,6 @@ void BetsyCompressor::finish() {
 		WorkerThreadPool::get_singleton()->wait_for_task_completion(task_id);
 		task_id = WorkerThreadPool::INVALID_TASK_ID;
 	}
-
-	if (compress_rd != nullptr) {
-		// Free the RD (and RCD if necessary).
-		memdelete(compress_rd);
-		compress_rd = nullptr;
-		if (compress_rcd != nullptr) {
-			memdelete(compress_rcd);
-			compress_rcd = nullptr;
-		}
-	}
 }
 
 // Helper functions.
@@ -373,6 +371,13 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
 		return ERR_INVALID_DATA;
 	}
 
+	int img_width = r_img->get_width();
+	int img_height = r_img->get_height();
+	if (img_width % 4 != 0 || img_height % 4 != 0) {
+		img_width = img_width <= 2 ? img_width : (img_width + 3) & ~3;
+		img_height = img_height <= 2 ? img_height : (img_height + 3) & ~3;
+	}
+
 	Error err = OK;
 
 	// Destination format.
@@ -443,7 +448,7 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
 
 	// Container for the compressed data.
 	Vector<uint8_t> dst_data;
-	dst_data.resize(Image::get_image_data_size(r_img->get_width(), r_img->get_height(), dest_format, r_img->has_mipmaps()));
+	dst_data.resize(Image::get_image_data_size(img_width, img_height, dest_format, r_img->has_mipmaps()));
 	uint8_t *dst_data_ptr = dst_data.ptrw();
 
 	Vector<Vector<uint8_t>> src_images;
@@ -452,9 +457,12 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
 
 	// Compress each mipmap.
 	for (int i = 0; i < mip_count; i++) {
-		int64_t ofs, size;
 		int width, height;
-		r_img->get_mipmap_offset_size_and_dimensions(i, ofs, size, width, height);
+		Image::get_image_mipmap_offset_and_dimensions(img_width, img_height, dest_format, i, width, height);
+
+		int64_t src_mip_ofs, src_mip_size;
+		int src_mip_w, src_mip_h;
+		r_img->get_mipmap_offset_size_and_dimensions(i, src_mip_ofs, src_mip_size, src_mip_w, src_mip_h);
 
 		// Set the source texture width and size.
 		src_texture_format.height = height;
@@ -464,9 +472,38 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
 		dst_texture_format.height = (height + 3) >> 2;
 		dst_texture_format.width = (width + 3) >> 2;
 
-		// Create a buffer filled with the source mip layer data.
-		src_image_ptr[0].resize(size);
-		memcpy(src_image_ptr[0].ptrw(), r_img->ptr() + ofs, size);
+		// Pad textures to nearest block by smearing.
+		if (width != src_mip_w || height != src_mip_h) {
+			const uint8_t *src_mip_read = r_img->ptr() + src_mip_ofs;
+
+			// Reserve the buffer for padded image data.
+			int px_size = Image::get_format_pixel_size(r_img->get_format());
+			src_image_ptr[0].resize(width * height * px_size);
+			uint8_t *ptrw = src_image_ptr[0].ptrw();
+
+			int x = 0, y = 0;
+			for (y = 0; y < src_mip_h; y++) {
+				for (x = 0; x < src_mip_w; x++) {
+					memcpy(ptrw + (width * y + x) * px_size, src_mip_read + (src_mip_w * y + x) * px_size, px_size);
+				}
+
+				// First, smear in x.
+				for (; x < width; x++) {
+					memcpy(ptrw + (width * y + x) * px_size, ptrw + (width * y + x - 1) * px_size, px_size);
+				}
+			}
+
+			// Then, smear in y.
+			for (; y < height; y++) {
+				for (x = 0; x < width; x++) {
+					memcpy(ptrw + (width * y + x) * px_size, ptrw + (width * y + x - width) * px_size, px_size);
+				}
+			}
+		} else {
+			// Create a buffer filled with the source mip layer data.
+			src_image_ptr[0].resize(src_mip_size);
+			memcpy(src_image_ptr[0].ptrw(), r_img->ptr() + src_mip_ofs, src_mip_size);
+		}
 
 		// Create the textures on the GPU.
 		RID src_texture = compress_rd->texture_create(src_texture_format, RD::TextureView(), src_images);
@@ -646,7 +683,7 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
 
 		// Copy data from the GPU to the buffer.
 		const Vector<uint8_t> texture_data = compress_rd->texture_get_data(dst_texture_rid, 0);
-		int64_t dst_ofs = Image::get_image_mipmap_offset(r_img->get_width(), r_img->get_height(), dest_format, i);
+		int64_t dst_ofs = Image::get_image_mipmap_offset(img_width, img_height, dest_format, i);
 
 		memcpy(dst_data_ptr + dst_ofs, texture_data.ptr(), texture_data.size());
 
@@ -658,12 +695,12 @@ Error BetsyCompressor::_compress(BetsyFormat p_format, Image *r_img) {
 	src_images.clear();
 
 	// Set the compressed data to the image.
-	r_img->set_data(r_img->get_width(), r_img->get_height(), r_img->has_mipmaps(), dest_format, dst_data);
+	r_img->set_data(img_width, img_height, r_img->has_mipmaps(), dest_format, dst_data);
 
 	print_verbose(
 			vformat("Betsy: Encoding a %dx%d image with %d mipmaps as %s took %d ms.",
-					r_img->get_width(),
-					r_img->get_height(),
+					img_width,
+					img_height,
 					r_img->get_mipmap_count(),
 					Image::get_format_name(dest_format),
 					OS::get_singleton()->get_ticks_msec() - start_time));
diff --git a/engine/modules/betsy/image_compress_betsy.h b/engine/modules/betsy/image_compress_betsy.h
index 841b6f61..829f5916 100644
--- a/engine/modules/betsy/image_compress_betsy.h
+++ b/engine/modules/betsy/image_compress_betsy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_COMPRESS_BETSY_H
-#define IMAGE_COMPRESS_BETSY_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/object/worker_thread_pool.h"
@@ -128,5 +127,3 @@ public:
 		return err;
 	}
 };
-
-#endif // IMAGE_COMPRESS_BETSY_H
diff --git a/engine/modules/betsy/register_types.h b/engine/modules/betsy/register_types.h
index 0ce6c553..a17ec850 100644
--- a/engine/modules/betsy/register_types.h
+++ b/engine/modules/betsy/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BETSY_REGISTER_TYPES_H
-#define BETSY_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_betsy_module(ModuleInitializationLevel p_level);
 void uninitialize_betsy_module(ModuleInitializationLevel p_level);
-
-#endif // BETSY_REGISTER_TYPES_H
diff --git a/engine/modules/bmp/image_loader_bmp.h b/engine/modules/bmp/image_loader_bmp.h
index cb51d7f0..528e42be 100644
--- a/engine/modules/bmp/image_loader_bmp.h
+++ b/engine/modules/bmp/image_loader_bmp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_BMP_H
-#define IMAGE_LOADER_BMP_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -106,5 +105,3 @@ public:
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	ImageLoaderBMP();
 };
-
-#endif // IMAGE_LOADER_BMP_H
diff --git a/engine/modules/bmp/register_types.h b/engine/modules/bmp/register_types.h
index 38258bf7..555d1551 100644
--- a/engine/modules/bmp/register_types.h
+++ b/engine/modules/bmp/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BMP_REGISTER_TYPES_H
-#define BMP_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_bmp_module(ModuleInitializationLevel p_level);
 void uninitialize_bmp_module(ModuleInitializationLevel p_level);
-
-#endif // BMP_REGISTER_TYPES_H
diff --git a/engine/modules/camera/buffer_decoder.h b/engine/modules/camera/buffer_decoder.h
index 97cc66b6..5fd645e0 100644
--- a/engine/modules/camera/buffer_decoder.h
+++ b/engine/modules/camera/buffer_decoder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BUFFER_DECODER_H
-#define BUFFER_DECODER_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/templates/vector.h"
@@ -112,5 +111,3 @@ public:
 	JpegBufferDecoder(CameraFeed *p_camera_feed);
 	virtual void decode(StreamingBuffer p_buffer) override;
 };
-
-#endif // BUFFER_DECODER_H
diff --git a/engine/modules/camera/camera_feed_linux.cpp b/engine/modules/camera/camera_feed_linux.cpp
index 0a02e3ee..a1993669 100644
--- a/engine/modules/camera/camera_feed_linux.cpp
+++ b/engine/modules/camera/camera_feed_linux.cpp
@@ -52,7 +52,7 @@ void CameraFeedLinux::_update_buffer() {
 }
 
 void CameraFeedLinux::_query_device(const String &p_device_name) {
-	file_descriptor = open(p_device_name.ascii(), O_RDWR | O_NONBLOCK, 0);
+	file_descriptor = open(p_device_name.ascii().get_data(), O_RDWR | O_NONBLOCK, 0);
 	ERR_FAIL_COND_MSG(file_descriptor == -1, vformat("Cannot open file descriptor for %s. Error: %d.", p_device_name, errno));
 
 	struct v4l2_capability capability;
@@ -235,7 +235,7 @@ String CameraFeedLinux::get_device_name() const {
 
 bool CameraFeedLinux::activate_feed() {
 	ERR_FAIL_COND_V_MSG(selected_format == -1, false, "CameraFeed format needs to be set before activating.");
-	file_descriptor = open(device_name.ascii(), O_RDWR | O_NONBLOCK, 0);
+	file_descriptor = open(device_name.ascii().get_data(), O_RDWR | O_NONBLOCK, 0);
 	if (_request_buffers() && _start_capturing()) {
 		buffer_decoder = _create_buffer_decoder();
 		_start_thread();
@@ -315,7 +315,7 @@ bool CameraFeedLinux::set_format(int p_index, const Dictionary &p_parameters) {
 
 	FeedFormat feed_format = formats[p_index];
 
-	file_descriptor = open(device_name.ascii(), O_RDWR | O_NONBLOCK, 0);
+	file_descriptor = open(device_name.ascii().get_data(), O_RDWR | O_NONBLOCK, 0);
 
 	struct v4l2_format format;
 	memset(&format, 0, sizeof(format));
diff --git a/engine/modules/camera/camera_feed_linux.h b/engine/modules/camera/camera_feed_linux.h
index bf29201c..9222bf7d 100644
--- a/engine/modules/camera/camera_feed_linux.h
+++ b/engine/modules/camera/camera_feed_linux.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_FEED_LINUX_H
-#define CAMERA_FEED_LINUX_H
+#pragma once
 
 #include "buffer_decoder.h"
 
@@ -41,6 +40,8 @@
 struct StreamingBuffer;
 
 class CameraFeedLinux : public CameraFeed {
+	GDSOFTCLASS(CameraFeedLinux, CameraFeed);
+
 private:
 	SafeFlag exit_flag;
 	Thread *thread = nullptr;
@@ -65,14 +66,12 @@ private:
 
 public:
 	String get_device_name() const;
-	bool activate_feed();
-	void deactivate_feed();
-	bool set_format(int p_index, const Dictionary &p_parameters);
-	Array get_formats() const;
-	FeedFormat get_format() const;
+	bool activate_feed() override;
+	void deactivate_feed() override;
+	bool set_format(int p_index, const Dictionary &p_parameters) override;
+	Array get_formats() const override;
+	FeedFormat get_format() const override;
 
 	CameraFeedLinux(const String &p_device_name);
-	virtual ~CameraFeedLinux();
+	~CameraFeedLinux() override;
 };
-
-#endif // CAMERA_FEED_LINUX_H
diff --git a/engine/modules/camera/camera_linux.cpp b/engine/modules/camera/camera_linux.cpp
index b774d1be..c9506944 100644
--- a/engine/modules/camera/camera_linux.cpp
+++ b/engine/modules/camera/camera_linux.cpp
@@ -113,7 +113,7 @@ void CameraLinux::_add_device(const String &p_device_name) {
 int CameraLinux::_open_device(const String &p_device_name) {
 	struct stat s;
 
-	if (stat(p_device_name.ascii(), &s) == -1) {
+	if (stat(p_device_name.ascii().get_data(), &s) == -1) {
 		return -1;
 	}
 
@@ -121,7 +121,7 @@ int CameraLinux::_open_device(const String &p_device_name) {
 		return -1;
 	}
 
-	return open(p_device_name.ascii(), O_RDWR | O_NONBLOCK, 0);
+	return open(p_device_name.ascii().get_data(), O_RDWR | O_NONBLOCK, 0);
 }
 
 // TODO any cheaper/cleaner way to check if file descriptor is invalid?
@@ -162,11 +162,25 @@ bool CameraLinux::_can_query_format(int p_file_descriptor, int p_type) {
 	return ioctl(p_file_descriptor, VIDIOC_G_FMT, &format) != -1;
 }
 
-CameraLinux::CameraLinux() {
-	camera_thread.start(CameraLinux::camera_thread_func, this);
+inline void CameraLinux::set_monitoring_feeds(bool p_monitoring_feeds) {
+	if (p_monitoring_feeds == monitoring_feeds) {
+		return;
+	}
+
+	CameraServer::set_monitoring_feeds(p_monitoring_feeds);
+	if (p_monitoring_feeds) {
+		camera_thread.start(CameraLinux::camera_thread_func, this);
+	} else {
+		exit_flag.set();
+		if (camera_thread.is_started()) {
+			camera_thread.wait_to_finish();
+		}
+	}
 }
 
 CameraLinux::~CameraLinux() {
 	exit_flag.set();
-	camera_thread.wait_to_finish();
+	if (camera_thread.is_started()) {
+		camera_thread.wait_to_finish();
+	}
 }
diff --git a/engine/modules/camera/camera_linux.h b/engine/modules/camera/camera_linux.h
index 66f6aa0f..10710943 100644
--- a/engine/modules/camera/camera_linux.h
+++ b/engine/modules/camera/camera_linux.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_LINUX_H
-#define CAMERA_LINUX_H
+#pragma once
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
@@ -53,8 +52,8 @@ private:
 	bool _can_query_format(int p_file_descriptor, int p_type);
 
 public:
-	CameraLinux();
+	CameraLinux() = default;
 	~CameraLinux();
-};
 
-#endif // CAMERA_LINUX_H
+	void set_monitoring_feeds(bool p_monitoring_feeds) override;
+};
diff --git a/engine/modules/camera/camera_macos.h b/engine/modules/camera/camera_macos.h
index 9d09d4bf..38a822e6 100644
--- a/engine/modules/camera/camera_macos.h
+++ b/engine/modules/camera/camera_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_MACOS_H
-#define CAMERA_MACOS_H
+#pragma once
 
 ///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!!
 // If you fix something here, make sure you fix it there as well!
@@ -37,10 +36,11 @@
 #include "servers/camera_server.h"
 
 class CameraMacOS : public CameraServer {
+	GDSOFTCLASS(CameraMacOS, CameraServer);
+
 public:
-	CameraMacOS();
+	CameraMacOS() = default;
 
 	void update_feeds();
+	void set_monitoring_feeds(bool p_monitoring_feeds) override;
 };
-
-#endif // CAMERA_MACOS_H
diff --git a/engine/modules/camera/camera_macos.mm b/engine/modules/camera/camera_macos.mm
index d242444b..5bb6adfb 100644
--- a/engine/modules/camera/camera_macos.mm
+++ b/engine/modules/camera/camera_macos.mm
@@ -31,7 +31,7 @@
 ///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!!
 // If you fix something here, make sure you fix it there as well!
 
-#include "camera_macos.h"
+#import "camera_macos.h"
 
 #include "servers/camera/camera_feed.h"
 
@@ -195,6 +195,8 @@
 // CameraFeedMacOS - Subclass for camera feeds in macOS
 
 class CameraFeedMacOS : public CameraFeed {
+	GDSOFTCLASS(CameraFeedMacOS, CameraFeed);
+
 private:
 	AVCaptureDevice *device;
 	MyCaptureSession *capture_session;
@@ -206,8 +208,8 @@ public:
 
 	void set_device(AVCaptureDevice *p_device);
 
-	bool activate_feed();
-	void deactivate_feed();
+	bool activate_feed() override;
+	void deactivate_feed() override;
 };
 
 AVCaptureDevice *CameraFeedMacOS::get_device() const {
@@ -359,10 +361,20 @@ void CameraMacOS::update_feeds() {
 	};
 }
 
-CameraMacOS::CameraMacOS() {
-	// Find available cameras we have at this time
-	update_feeds();
+void CameraMacOS::set_monitoring_feeds(bool p_monitoring_feeds) {
+	if (p_monitoring_feeds == monitoring_feeds) {
+		return;
+	}
 
-	// should only have one of these....
-	device_notifications = [[MyDeviceNotifications alloc] initForServer:this];
+	CameraServer::set_monitoring_feeds(p_monitoring_feeds);
+	if (p_monitoring_feeds) {
+		// Find available cameras we have at this time.
+		update_feeds();
+
+		// Get notified on feed changes.
+		device_notifications = [[MyDeviceNotifications alloc] initForServer:this];
+	} else {
+		// Stop monitoring feed changes.
+		device_notifications = nil;
+	}
 }
diff --git a/engine/modules/camera/camera_win.h b/engine/modules/camera/camera_win.h
index 8817e2de..044dfbe2 100644
--- a/engine/modules/camera/camera_win.h
+++ b/engine/modules/camera/camera_win.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_WIN_H
-#define CAMERA_WIN_H
+#pragma once
 
 #include "servers/camera/camera_feed.h"
 #include "servers/camera_server.h"
@@ -42,5 +41,3 @@ public:
 	CameraWindows();
 	~CameraWindows() {}
 };
-
-#endif // CAMERA_WIN_H
diff --git a/engine/modules/camera/register_types.h b/engine/modules/camera/register_types.h
index c068f83f..c914645b 100644
--- a/engine/modules/camera/register_types.h
+++ b/engine/modules/camera/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_REGISTER_TYPES_H
-#define CAMERA_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_camera_module(ModuleInitializationLevel p_level);
 void uninitialize_camera_module(ModuleInitializationLevel p_level);
-
-#endif // CAMERA_REGISTER_TYPES_H
diff --git a/engine/modules/csg/SCsub b/engine/modules/csg/SCsub
index 5b880f15..32bc240a 100644
--- a/engine/modules/csg/SCsub
+++ b/engine/modules/csg/SCsub
@@ -31,7 +31,7 @@ thirdparty_sources = [
 ]
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
-env_csg.Prepend(CPPPATH=[thirdparty_dir + "include"])
+env_csg.Prepend(CPPEXTPATH=[thirdparty_dir + "include"])
 env_thirdparty = env_csg.Clone()
 env_thirdparty.disable_warnings()
 env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
diff --git a/engine/modules/csg/csg.h b/engine/modules/csg/csg.h
index 3c1d4d8f..496d8773 100644
--- a/engine/modules/csg/csg.h
+++ b/engine/modules/csg/csg.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CSG_H
-#define CSG_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/transform_3d.h"
@@ -65,5 +64,3 @@ struct CSGBrush {
 	void build_from_faces(const Vector<Vector3> &p_vertices, const Vector<Vector2> &p_uvs, const Vector<bool> &p_smooth, const Vector<Ref<Material>> &p_materials, const Vector<bool> &p_invert_faces);
 	void copy_from(const CSGBrush &p_brush, const Transform3D &p_xform);
 };
-
-#endif // CSG_H
diff --git a/engine/modules/csg/csg_shape.cpp b/engine/modules/csg/csg_shape.cpp
index 12d807be..b6e65981 100644
--- a/engine/modules/csg/csg_shape.cpp
+++ b/engine/modules/csg/csg_shape.cpp
@@ -36,10 +36,13 @@
 #include "core/math/geometry_2d.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
+#ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_server_3d.h"
+#endif // NAVIGATION_3D_DISABLED
 
 #include <manifold/manifold.h>
 
+#ifndef NAVIGATION_3D_DISABLED
 Callable CSGShape3D::_navmesh_source_geometry_parsing_callback;
 RID CSGShape3D::_navmesh_source_geometry_parser;
 
@@ -60,9 +63,13 @@ void CSGShape3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navi
 	}
 
 	NavigationMesh::ParsedGeometryType parsed_geometry_type = p_navigation_mesh->get_parsed_geometry_type();
-	uint32_t parsed_collision_mask = p_navigation_mesh->get_collision_mask();
 
-	if (parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_MESH_INSTANCES || (parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS && csgshape3d->is_using_collision() && (csgshape3d->get_collision_layer() & parsed_collision_mask)) || parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_BOTH) {
+#ifndef PHYSICS_3D_DISABLED
+	bool nav_collision = (parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS && csgshape3d->is_using_collision() && (csgshape3d->get_collision_layer() & p_navigation_mesh->get_collision_mask()));
+#else
+	bool nav_collision = false;
+#endif // PHYSICS_3D_DISABLED
+	if (parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_MESH_INSTANCES || nav_collision || parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_BOTH) {
 		Array meshes = csgshape3d->get_meshes();
 		if (!meshes.is_empty()) {
 			Ref<Mesh> mesh = meshes[1];
@@ -72,7 +79,9 @@ void CSGShape3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navi
 		}
 	}
 }
+#endif // NAVIGATION_3D_DISABLED
 
+#ifndef PHYSICS_3D_DISABLED
 void CSGShape3D::set_use_collision(bool p_enable) {
 	if (use_collision == p_enable) {
 		return;
@@ -186,6 +195,7 @@ void CSGShape3D::set_collision_priority(real_t p_priority) {
 real_t CSGShape3D::get_collision_priority() const {
 	return collision_priority;
 }
+#endif // PHYSICS_3D_DISABLED
 
 bool CSGShape3D::is_root_shape() const {
 	return !parent_shape;
@@ -207,15 +217,20 @@ float CSGShape3D::get_snap() const {
 #endif // DISABLE_DEPRECATED
 
 void CSGShape3D::_make_dirty(bool p_parent_removing) {
+#ifndef PHYSICS_3D_DISABLED
 	if ((p_parent_removing || is_root_shape()) && !dirty) {
-		callable_mp(this, &CSGShape3D::_update_shape).call_deferred(); // Must be deferred; otherwise, is_root_shape() will use the previous parent.
+		callable_mp(this, &CSGShape3D::update_shape).call_deferred(); // Must be deferred; otherwise, is_root_shape() will use the previous parent.
 	}
+#endif // PHYSICS_3D_DISABLED
 
 	if (!is_root_shape()) {
 		parent_shape->_make_dirty();
-	} else if (!dirty) {
-		callable_mp(this, &CSGShape3D::_update_shape).call_deferred();
 	}
+#ifndef PHYSICS_3D_DISABLED
+	else if (!dirty) {
+		callable_mp(this, &CSGShape3D::update_shape).call_deferred();
+	}
+#endif // PHYSICS_3D_DISABLED
 
 	dirty = true;
 }
@@ -550,7 +565,7 @@ void CSGShape3D::mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const
 	surface.tansw[i++] = d < 0 ? -1 : 1;
 }
 
-void CSGShape3D::_update_shape() {
+void CSGShape3D::update_shape() {
 	if (!is_root_shape()) {
 		return;
 	}
@@ -711,9 +726,20 @@ void CSGShape3D::_update_shape() {
 
 	set_base(root_mesh->get_rid());
 
+#ifndef PHYSICS_3D_DISABLED
 	_update_collision_faces();
+#endif // PHYSICS_3D_DISABLED
 }
 
+Ref<ArrayMesh> CSGShape3D::bake_static_mesh() {
+	Ref<ArrayMesh> baked_mesh;
+	if (is_root_shape() && root_mesh.is_valid()) {
+		baked_mesh = root_mesh;
+	}
+	return baked_mesh;
+}
+
+#ifndef PHYSICS_3D_DISABLED
 Vector<Vector3> CSGShape3D::_get_brush_collision_faces() {
 	Vector<Vector3> collision_faces;
 	CSGBrush *n = _get_brush();
@@ -746,14 +772,6 @@ void CSGShape3D::_update_collision_faces() {
 	}
 }
 
-Ref<ArrayMesh> CSGShape3D::bake_static_mesh() {
-	Ref<ArrayMesh> baked_mesh;
-	if (is_root_shape() && root_mesh.is_valid()) {
-		baked_mesh = root_mesh;
-	}
-	return baked_mesh;
-}
-
 Ref<ConcavePolygonShape3D> CSGShape3D::bake_collision_shape() {
 	Ref<ConcavePolygonShape3D> baked_collision_shape;
 	if (is_root_shape() && root_collision_shape.is_valid()) {
@@ -800,6 +818,7 @@ void CSGShape3D::_on_transform_changed() {
 		RS::get_singleton()->instance_set_transform(root_collision_debug_instance, debug_shape_old_transform);
 	}
 }
+#endif // PHYSICS_3D_DISABLED
 
 AABB CSGShape3D::get_aabb() const {
 	return node_aabb;
@@ -872,6 +891,7 @@ void CSGShape3D::_notification(int p_what) {
 			}
 		} break;
 
+#ifndef PHYSICS_3D_DISABLED
 		case NOTIFICATION_ENTER_TREE: {
 			if (use_collision && is_root_shape()) {
 				root_collision_shape.instantiate();
@@ -904,6 +924,7 @@ void CSGShape3D::_notification(int p_what) {
 			}
 			_on_transform_changed();
 		} break;
+#endif // PHYSICS_3D_DISABLED
 	}
 }
 
@@ -969,17 +990,18 @@ Ref<TriangleMesh> CSGShape3D::generate_triangle_mesh() const {
 }
 
 void CSGShape3D::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("_update_shape"), &CSGShape3D::_update_shape);
 	ClassDB::bind_method(D_METHOD("is_root_shape"), &CSGShape3D::is_root_shape);
 
 	ClassDB::bind_method(D_METHOD("set_operation", "operation"), &CSGShape3D::set_operation);
 	ClassDB::bind_method(D_METHOD("get_operation"), &CSGShape3D::get_operation);
 
 #ifndef DISABLE_DEPRECATED
+	ClassDB::bind_method(D_METHOD("_update_shape"), &CSGShape3D::update_shape);
 	ClassDB::bind_method(D_METHOD("set_snap", "snap"), &CSGShape3D::set_snap);
 	ClassDB::bind_method(D_METHOD("get_snap"), &CSGShape3D::get_snap);
 #endif // DISABLE_DEPRECATED
 
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_use_collision", "operation"), &CSGShape3D::set_use_collision);
 	ClassDB::bind_method(D_METHOD("is_using_collision"), &CSGShape3D::is_using_collision);
 
@@ -1000,13 +1022,15 @@ void CSGShape3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_collision_priority", "priority"), &CSGShape3D::set_collision_priority);
 	ClassDB::bind_method(D_METHOD("get_collision_priority"), &CSGShape3D::get_collision_priority);
 
+	ClassDB::bind_method(D_METHOD("bake_collision_shape"), &CSGShape3D::bake_collision_shape);
+#endif // PHYSICS_3D_DISABLED
+
 	ClassDB::bind_method(D_METHOD("set_calculate_tangents", "enabled"), &CSGShape3D::set_calculate_tangents);
 	ClassDB::bind_method(D_METHOD("is_calculating_tangents"), &CSGShape3D::is_calculating_tangents);
 
 	ClassDB::bind_method(D_METHOD("get_meshes"), &CSGShape3D::get_meshes);
 
 	ClassDB::bind_method(D_METHOD("bake_static_mesh"), &CSGShape3D::bake_static_mesh);
-	ClassDB::bind_method(D_METHOD("bake_collision_shape"), &CSGShape3D::bake_collision_shape);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "operation", PROPERTY_HINT_ENUM, "Union,Intersection,Subtraction"), "set_operation", "get_operation");
 #ifndef DISABLE_DEPRECATED
@@ -1014,11 +1038,13 @@ void CSGShape3D::_bind_methods() {
 #endif // DISABLE_DEPRECATED
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "calculate_tangents"), "set_calculate_tangents", "is_calculating_tangents");
 
+#ifndef PHYSICS_3D_DISABLED
 	ADD_GROUP("Collision", "collision_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_collision"), "set_use_collision", "is_using_collision");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_layer", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_layer", "get_collision_layer");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_priority"), "set_collision_priority", "get_collision_priority");
+#endif // PHYSICS_3D_DISABLED
 
 	BIND_ENUM_CONSTANT(OPERATION_UNION);
 	BIND_ENUM_CONSTANT(OPERATION_INTERSECTION);
@@ -1109,13 +1135,13 @@ CSGBrush *CSGMesh3D::_build_brush() {
 
 		Array arrays = mesh->surface_get_arrays(i);
 
-		if (arrays.size() == 0) {
+		if (arrays.is_empty()) {
 			_make_dirty();
 			ERR_FAIL_COND_V(arrays.is_empty(), memnew(CSGBrush));
 		}
 
 		Vector<Vector3> avertices = arrays[Mesh::ARRAY_VERTEX];
-		if (avertices.size() == 0) {
+		if (avertices.is_empty()) {
 			continue;
 		}
 
@@ -1231,7 +1257,7 @@ CSGBrush *CSGMesh3D::_build_brush() {
 		}
 	}
 
-	if (vertices.size() == 0) {
+	if (vertices.is_empty()) {
 		return memnew(CSGBrush);
 	}
 
@@ -1322,14 +1348,14 @@ CSGBrush *CSGSphere3D::_build_brush() {
 
 		// We want to follow an order that's convenient for UVs.
 		// For latitude step we start at the top and move down like in an image.
-		const double latitude_step = -Math_PI / rings;
-		const double longitude_step = Math_TAU / radial_segments;
+		const double latitude_step = -Math::PI / rings;
+		const double longitude_step = Math::TAU / radial_segments;
 		int face = 0;
 		for (int i = 0; i < rings; i++) {
 			double cos0 = 0;
 			double sin0 = 1;
 			if (i > 0) {
-				double latitude0 = latitude_step * i + Math_TAU / 4;
+				double latitude0 = latitude_step * i + Math::TAU / 4;
 				cos0 = Math::cos(latitude0);
 				sin0 = Math::sin(latitude0);
 			}
@@ -1338,7 +1364,7 @@ CSGBrush *CSGSphere3D::_build_brush() {
 			double cos1 = 0;
 			double sin1 = -1;
 			if (i < rings - 1) {
-				double latitude1 = latitude_step * (i + 1) + Math_TAU / 4;
+				double latitude1 = latitude_step * (i + 1) + Math::TAU / 4;
 				cos1 = Math::cos(latitude1);
 				sin1 = Math::sin(latitude1);
 			}
@@ -1701,8 +1727,8 @@ CSGBrush *CSGCylinder3D::_build_brush() {
 					inc_n = 0;
 				}
 
-				float ang = inc * Math_TAU;
-				float ang_n = inc_n * Math_TAU;
+				float ang = inc * Math::TAU;
+				float ang_n = inc_n * Math::TAU;
 
 				Vector3 face_base(Math::cos(ang), 0, Math::sin(ang));
 				Vector3 face_base_n(Math::cos(ang_n), 0, Math::sin(ang_n));
@@ -1944,8 +1970,8 @@ CSGBrush *CSGTorus3D::_build_brush() {
 					inci_n = 0;
 				}
 
-				float angi = inci * Math_TAU;
-				float angi_n = inci_n * Math_TAU;
+				float angi = inci * Math::TAU;
+				float angi_n = inci_n * Math::TAU;
 
 				Vector3 normali = Vector3(Math::cos(angi), 0, Math::sin(angi));
 				Vector3 normali_n = Vector3(Math::cos(angi_n), 0, Math::sin(angi_n));
@@ -1957,8 +1983,8 @@ CSGBrush *CSGTorus3D::_build_brush() {
 						incj_n = 0;
 					}
 
-					float angj = incj * Math_TAU;
-					float angj_n = incj_n * Math_TAU;
+					float angj = incj * Math::TAU;
+					float angj_n = incj_n * Math::TAU;
 
 					Vector2 normalj = Vector2(Math::cos(angj), Math::sin(angj)) * radius + Vector2(min_radius + radius, 0);
 					Vector2 normalj_n = Vector2(Math::cos(angj_n), Math::sin(angj_n)) * radius + Vector2(min_radius + radius, 0);
diff --git a/engine/modules/csg/csg_shape.h b/engine/modules/csg/csg_shape.h
index 2331bce4..6eee0deb 100644
--- a/engine/modules/csg/csg_shape.h
+++ b/engine/modules/csg/csg_shape.h
@@ -28,14 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CSG_SHAPE_H
-#define CSG_SHAPE_H
+#pragma once
 
 #include "csg.h"
 
 #include "scene/3d/path_3d.h"
 #include "scene/3d/visual_instance_3d.h"
+
+#ifndef PHYSICS_3D_DISABLED
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
+#endif // PHYSICS_3D_DISABLED
 
 #include "thirdparty/misc/mikktspace.h"
 
@@ -65,6 +67,7 @@ private:
 	bool last_visible = false;
 	float snap = 0.001;
 
+#ifndef PHYSICS_3D_DISABLED
 	bool use_collision = false;
 	uint32_t collision_layer = 1;
 	uint32_t collision_mask = 1;
@@ -73,6 +76,7 @@ private:
 	RID root_collision_instance;
 	RID root_collision_debug_instance;
 	Transform3D debug_shape_old_transform;
+#endif // PHYSICS_3D_DISABLED
 
 	bool calculate_tangents = true;
 
@@ -110,13 +114,14 @@ private:
 	static void mikktSetTSpaceDefault(const SMikkTSpaceContext *pContext, const float fvTangent[], const float fvBiTangent[], const float fMagS, const float fMagT,
 			const tbool bIsOrientationPreserving, const int iFace, const int iVert);
 
-	void _update_shape();
+#ifndef PHYSICS_3D_DISABLED
 	void _update_collision_faces();
 	bool _is_debug_collision_shape_visible();
 	void _update_debug_collision_shape();
 	void _clear_debug_collision_shape();
 	void _on_transform_changed();
 	Vector<Vector3> _get_brush_collision_faces();
+#endif // PHYSICS_3D_DISABLED
 
 protected:
 	void _notification(int p_what);
@@ -133,6 +138,7 @@ protected:
 
 public:
 	Array get_meshes() const;
+	void update_shape();
 
 	void set_operation(Operation p_operation);
 	Operation get_operation() const;
@@ -172,10 +178,13 @@ public:
 	bool is_root_shape() const;
 
 	Ref<ArrayMesh> bake_static_mesh();
+#ifndef PHYSICS_3D_DISABLED
 	Ref<ConcavePolygonShape3D> bake_collision_shape();
+#endif // PHYSICS_3D_DISABLED
 
 	virtual Ref<TriangleMesh> generate_triangle_mesh() const override;
 
+#ifndef NAVIGATION_3D_DISABLED
 private:
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
@@ -183,6 +192,7 @@ private:
 public:
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_3D_DISABLED
 
 	CSGShape3D();
 	~CSGShape3D();
@@ -482,5 +492,3 @@ public:
 VARIANT_ENUM_CAST(CSGPolygon3D::Mode)
 VARIANT_ENUM_CAST(CSGPolygon3D::PathRotation)
 VARIANT_ENUM_CAST(CSGPolygon3D::PathIntervalType)
-
-#endif // CSG_SHAPE_H
diff --git a/engine/modules/csg/doc_classes/CSGShape3D.xml b/engine/modules/csg/doc_classes/CSGShape3D.xml
index 8ea471e6..848c7b72 100644
--- a/engine/modules/csg/doc_classes/CSGShape3D.xml
+++ b/engine/modules/csg/doc_classes/CSGShape3D.xml
@@ -5,11 +5,10 @@
 	</brief_description>
 	<description>
 		This is the CSG base class that provides CSG operation support to the various CSG nodes in Godot.
-		[b]Performance:[/b] CSG nodes are only intended for prototyping as they have a significant CPU performance cost.
-		Consider baking final CSG operation results into static geometry that replaces the CSG nodes.
+		[b]Performance:[/b] CSG nodes are only intended for prototyping as they have a significant CPU performance cost. Consider baking final CSG operation results into static geometry that replaces the CSG nodes.
 		Individual CSG root node results can be baked to nodes with static resources with the editor menu that appears when a CSG root node is selected.
 		Individual CSG root nodes can also be baked to static resources with scripts by calling [method bake_static_mesh] for the visual mesh or [method bake_collision_shape] for the physics collision.
-		Entire scenes of CSG nodes can be baked to static geometry and exported with the editor gltf scene exporter.
+		Entire scenes of CSG nodes can be baked to static geometry and exported with the editor glTF scene exporter: [b]Scene &gt; Export As... &gt; glTF 2.0 Scene...[/b]
 	</description>
 	<tutorials>
 		<link title="Prototyping levels with CSG">$DOCS_URL/tutorials/3d/csg_tools.html</link>
@@ -20,12 +19,14 @@
 			<description>
 				Returns a baked physics [ConcavePolygonShape3D] of this node's CSG operation result. Returns an empty shape if the node is not a CSG root node or has no valid geometry.
 				[b]Performance:[/b] If the CSG operation results in a very detailed geometry with many faces physics performance will be very slow. Concave shapes should in general only be used for static level geometry and not with dynamic objects that are moving.
+				[b]Note:[/b] CSG mesh data updates are deferred, which means they are updated with a delay of one rendered frame. To avoid getting an empty shape or outdated mesh data, make sure to call [code]await get_tree().process_frame[/code] before using [method bake_collision_shape] in [method Node._ready] or after changing properties on the [CSGShape3D].
 			</description>
 		</method>
 		<method name="bake_static_mesh">
 			<return type="ArrayMesh" />
 			<description>
 				Returns a baked static [ArrayMesh] of this node's CSG operation result. Materials from involved CSG nodes are added as extra mesh surfaces. Returns an empty mesh if the node is not a CSG root node or has no valid geometry.
+				[b]Note:[/b] CSG mesh data updates are deferred, which means they are updated with a delay of one rendered frame. To avoid getting an empty mesh or outdated mesh data, make sure to call [code]await get_tree().process_frame[/code] before using [method bake_static_mesh] in [method Node._ready] or after changing properties on the [CSGShape3D].
 			</description>
 		</method>
 		<method name="get_collision_layer_value" qualifiers="const">
@@ -46,6 +47,7 @@
 			<return type="Array" />
 			<description>
 				Returns an [Array] with two elements, the first is the [Transform3D] of this node and the second is the root [Mesh] of this node. Only works when this node is the root shape.
+				[b]Note:[/b] CSG mesh data updates are deferred, which means they are updated with a delay of one rendered frame. To avoid getting an empty shape or outdated mesh data, make sure to call [code]await get_tree().process_frame[/code] before using [method get_meshes] in [method Node._ready] or after changing properties on the [CSGShape3D].
 			</description>
 		</method>
 		<method name="is_root_shape" qualifiers="const">
@@ -73,7 +75,7 @@
 	</methods>
 	<members>
 		<member name="calculate_tangents" type="bool" setter="set_calculate_tangents" getter="is_calculating_tangents" default="true">
-			Calculate tangents for the CSG shape which allows the use of normal maps. This is only applied on the root shape, this setting is ignored on any child.
+			Calculate tangents for the CSG shape which allows the use of normal and height maps. This is only applied on the root shape, this setting is ignored on any child. Setting this to [code]false[/code] can speed up shape generation slightly.
 		</member>
 		<member name="collision_layer" type="int" setter="set_collision_layer" getter="get_collision_layer" default="1">
 			The physics layers this area is in.
diff --git a/engine/modules/csg/editor/csg_gizmos.cpp b/engine/modules/csg/editor/csg_gizmos.cpp
index 9a5d8fa0..88173d19 100644
--- a/engine/modules/csg/editor/csg_gizmos.cpp
+++ b/engine/modules/csg/editor/csg_gizmos.cpp
@@ -30,8 +30,6 @@
 
 #include "csg_gizmos.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
@@ -156,6 +154,8 @@ CSGShapeEditor::CSGShapeEditor() {
 	options->hide();
 	options->set_text(TTR("CSG"));
 	options->set_switch_on_hover(true);
+	options->set_flat(false);
+	options->set_theme_type_variation("FlatMenuButton");
 	Node3DEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->get_popup()->add_item(TTR("Bake Mesh Instance"), MENU_OPTION_BAKE_MESH_INSTANCE);
@@ -187,9 +187,6 @@ CSGShape3DGizmoPlugin::CSGShape3DGizmoPlugin() {
 	create_handle_material("handles");
 }
 
-CSGShape3DGizmoPlugin::~CSGShape3DGizmoPlugin() {
-}
-
 String CSGShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary) const {
 	CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_node_3d());
 
@@ -227,7 +224,7 @@ Variant CSGShape3DGizmoPlugin::get_handle_value(const EditorNode3DGizmo *p_gizmo
 
 	if (Object::cast_to<CSGCylinder3D>(cs)) {
 		CSGCylinder3D *s = Object::cast_to<CSGCylinder3D>(cs);
-		return p_id == 0 ? s->get_radius() : s->get_height();
+		return Vector2(s->get_radius(), s->get_height());
 	}
 
 	if (Object::cast_to<CSGTorus3D>(cs)) {
@@ -384,7 +381,7 @@ void CSGShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
 
 	Vector<Vector3> faces = cs->get_brush_faces();
 
-	if (faces.size() == 0) {
+	if (faces.is_empty()) {
 		return;
 	}
 
@@ -508,5 +505,3 @@ EditorPluginCSG::EditorPluginCSG() {
 	csg_shape_editor = memnew(CSGShapeEditor);
 	EditorNode::get_singleton()->get_gui_base()->add_child(csg_shape_editor);
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/csg/editor/csg_gizmos.h b/engine/modules/csg/editor/csg_gizmos.h
index d410290d..32f5ba6a 100644
--- a/engine/modules/csg/editor/csg_gizmos.h
+++ b/engine/modules/csg/editor/csg_gizmos.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CSG_GIZMOS_H
-#define CSG_GIZMOS_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "../csg_shape.h"
 
@@ -62,7 +59,6 @@ public:
 	virtual void commit_handle(const EditorNode3DGizmo *p_gizmo, int p_id, bool p_secondary, const Variant &p_restore, bool p_cancel) override;
 
 	CSGShape3DGizmoPlugin();
-	~CSGShape3DGizmoPlugin();
 };
 
 class CSGShapeEditor : public Control {
@@ -104,7 +100,3 @@ public:
 
 	EditorPluginCSG();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // CSG_GIZMOS_H
diff --git a/engine/modules/csg/icons/CSGBox3D.svg b/engine/modules/csg/icons/CSGBox3D.svg
index ad3e490d..78fab7ac 100644
--- a/engine/modules/csg/icons/CSGBox3D.svg
+++ b/engine/modules/csg/icons/CSGBox3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5" mask="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="m8 2 6 3v6l-6 3-6-3V5zm0 12V8l6-3M8 8 2 5" mask="url(#a)"/></svg>
diff --git a/engine/modules/csg/icons/CSGCapsule3D.svg b/engine/modules/csg/icons/CSGCapsule3D.svg
index 54a5e3d6..7cd91651 100644
--- a/engine/modules/csg/icons/CSGCapsule3D.svg
+++ b/engine/modules/csg/icons/CSGCapsule3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M4 6a4 4 0 0 1 8 0v4a4 4 0 0 1-8 0zm0 1.25a2.5 1 0 0 0 8 0m-4-5v12" mask="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M4 6a4 4 0 0 1 8 0v4a4 4 0 0 1-8 0zm0 1.25a2.5 1 0 0 0 8 0m-4-5v12" mask="url(#a)"/></svg>
diff --git a/engine/modules/csg/icons/CSGCombiner3D.svg b/engine/modules/csg/icons/CSGCombiner3D.svg
index e65bb1c0..a526b4d7 100644
--- a/engine/modules/csg/icons/CSGCombiner3D.svg
+++ b/engine/modules/csg/icons/CSGCombiner3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="#fc7f7f" d="M3 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM1 5v2h2V5zm12 0v2h2V5zM1 9v2h2V9zm0 4a2 2 0 0 0 2 2v-2zm4 0v2h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="#fc7f7f" d="M3 1a2 2 0 0 0-2 2h2zm2 0v2h2V1zm4 0v2h2V1zm4 0v2h2a2 2 0 0 0-2-2zM1 5v2h2V5zm12 0v2h2V5zM1 9v2h2V9zm0 4a2 2 0 0 0 2 2v-2zm4 0v2h2v-2z"/></svg>
diff --git a/engine/modules/csg/icons/CSGCylinder3D.svg b/engine/modules/csg/icons/CSGCylinder3D.svg
index 366f1d9c..5999f8f5 100644
--- a/engine/modules/csg/icons/CSGCylinder3D.svg
+++ b/engine/modules/csg/icons/CSGCylinder3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M2 4v8a6 2 0 0 0 12 0V4A6 2 0 0 0 2 4a6 2 0 0 0 12 0" mask="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M2 4v8a6 2 0 0 0 12 0V4A6 2 0 0 0 2 4a6 2 0 0 0 12 0" mask="url(#a)"/></svg>
diff --git a/engine/modules/csg/icons/CSGMesh3D.svg b/engine/modules/csg/icons/CSGMesh3D.svg
index d115a64f..48340e01 100644
--- a/engine/modules/csg/icons/CSGMesh3D.svg
+++ b/engine/modules/csg/icons/CSGMesh3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.729 14H8v-2H4.729A2 2 0 0 0 4 11.271V5.415l4.914 4.916A2 2 0 0 1 9.998 10a2 2 0 0 1 .33-1.084L5.414 4h5.856a2 2 0 0 0 .73.729V8h2V4.729A2 2 0 1 0 11.27 2z"/><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="M4.73 2A2 2 0 1 0 2 4.73v6.541A2 2 0 1 0 4.729 14H8v-2H4.729A2 2 0 0 0 4 11.271V5.415l4.914 4.916A2 2 0 0 1 9.998 10a2 2 0 0 1 .33-1.084L5.414 4h5.856a2 2 0 0 0 .73.729V8h2V4.729A2 2 0 1 0 11.27 2z"/><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/></svg>
diff --git a/engine/modules/csg/icons/CSGPolygon3D.svg b/engine/modules/csg/icons/CSGPolygon3D.svg
index ab7f6113..4f46ea88 100644
--- a/engine/modules/csg/icons/CSGPolygon3D.svg
+++ b/engine/modules/csg/icons/CSGPolygon3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="m8 2 6 3.5v5L8 14l-6-3.5v-5h6zm6 3.5L8 9 2 5.5M8 9v5" mask="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-linejoin="round" stroke-width="2" d="m8 2 6 3.5v5L8 14l-6-3.5v-5h6zm6 3.5L8 9 2 5.5M8 9v5" mask="url(#a)"/></svg>
diff --git a/engine/modules/csg/icons/CSGSphere3D.svg b/engine/modules/csg/icons/CSGSphere3D.svg
index 96a63df1..10dd86a9 100644
--- a/engine/modules/csg/icons/CSGSphere3D.svg
+++ b/engine/modules/csg/icons/CSGSphere3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2v12M2.05 7.4a6 2 0 0 0 11.9 0" mask="url(#a)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><path fill="none" stroke="#fc7f7f" stroke-width="2" d="M8 2a6 6 0 0 0 0 12A6 6 0 0 0 8 2v12M2.05 7.4a6 2 0 0 0 11.9 0" mask="url(#a)"/></svg>
diff --git a/engine/modules/csg/icons/CSGTorus3D.svg b/engine/modules/csg/icons/CSGTorus3D.svg
index 1f756578..e33b0538 100644
--- a/engine/modules/csg/icons/CSGTorus3D.svg
+++ b/engine/modules/csg/icons/CSGTorus3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><g fill="none" stroke="#fc7f7f" mask="url(#a)"><path stroke-width="2" d="M2.5 10a6 4 0 0 0 11 0 4 4 0 0 0 0-4 6 4 0 0 0-11 0 4 4 0 0 0 0 4z"/><path stroke-linecap="round" stroke-width="1.75" d="M6.2 7.2a2 1 0 1 0 3.6 0"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><mask id="a"><path fill="#fefefe" d="M0 0h16v10a2 2 0 0 0-2-2h-2a2 2 0 0 0-2 2 2 2 0 0 0-2 2v2a2 2 0 0 0 2 2H0z"/></mask><path fill="#5fb2ff" d="M12 9a1 1 0 0 0-1 1v1h2v2h1a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1zm1 4h-2v-2h-1a1 1 0 0 0-1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1z"/><g fill="none" stroke="#fc7f7f" mask="url(#a)"><path stroke-width="2" d="M2.5 10a6 4 0 0 0 11 0 4 4 0 0 0 0-4 6 4 0 0 0-11 0 4 4 0 0 0 0 4z"/><path stroke-linecap="round" stroke-width="1.75" d="M6.2 7.2a2 1 0 1 0 3.6 0"/></g></svg>
diff --git a/engine/modules/csg/register_types.cpp b/engine/modules/csg/register_types.cpp
index 465ede4c..b157e329 100644
--- a/engine/modules/csg/register_types.cpp
+++ b/engine/modules/csg/register_types.cpp
@@ -47,7 +47,9 @@ void initialize_csg_module(ModuleInitializationLevel p_level) {
 		GDREGISTER_CLASS(CSGTorus3D);
 		GDREGISTER_CLASS(CSGPolygon3D);
 		GDREGISTER_CLASS(CSGCombiner3D);
+#ifndef NAVIGATION_3D_DISABLED
 		CSGShape3D::navmesh_parse_init();
+#endif // NAVIGATION_3D_DISABLED
 	}
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
diff --git a/engine/modules/csg/register_types.h b/engine/modules/csg/register_types.h
index 9a21660a..e4c27b0b 100644
--- a/engine/modules/csg/register_types.h
+++ b/engine/modules/csg/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CSG_REGISTER_TYPES_H
-#define CSG_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_csg_module(ModuleInitializationLevel p_level);
 void uninitialize_csg_module(ModuleInitializationLevel p_level);
-
-#endif // CSG_REGISTER_TYPES_H
diff --git a/engine/modules/csg/tests/test_csg.h b/engine/modules/csg/tests/test_csg.h
index b93714a5..73860051 100644
--- a/engine/modules/csg/tests/test_csg.h
+++ b/engine/modules/csg/tests/test_csg.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CSG_H
-#define TEST_CSG_H
+#pragma once
 
 #include "../csg.h"
 #include "../csg_shape.h"
@@ -110,5 +109,3 @@ TEST_CASE("[SceneTree][CSG] CSGPolygon3D") {
 }
 
 } // namespace TestCSG
-
-#endif // TEST_CSG_H
diff --git a/engine/modules/cvtt/SCsub b/engine/modules/cvtt/SCsub
index 44e56ab6..8b58dcd9 100644
--- a/engine/modules/cvtt/SCsub
+++ b/engine/modules/cvtt/SCsub
@@ -26,7 +26,7 @@ thirdparty_sources = [
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_cvtt.Prepend(CPPPATH=[thirdparty_dir])
+env_cvtt.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 env_thirdparty = env_cvtt.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/modules/cvtt/image_compress_cvtt.cpp b/engine/modules/cvtt/image_compress_cvtt.cpp
index 2087dde2..c0d7c7f8 100644
--- a/engine/modules/cvtt/image_compress_cvtt.cpp
+++ b/engine/modules/cvtt/image_compress_cvtt.cpp
@@ -46,7 +46,7 @@ struct CVTTCompressionJobParams {
 };
 
 struct CVTTCompressionRowTask {
-	const uint8_t *in_mm_bytes = nullptr;
+	Vector<uint8_t> in_mm;
 	uint8_t *out_mm_bytes = nullptr;
 	int y_start = 0;
 	int width = 0;
@@ -61,7 +61,7 @@ struct CVTTCompressionJobQueue {
 };
 
 static void _digest_row_task(const CVTTCompressionJobParams &p_job_params, const CVTTCompressionRowTask &p_row_task) {
-	const uint8_t *in_bytes = p_row_task.in_mm_bytes;
+	const uint8_t *in_bytes = p_row_task.in_mm.ptr();
 	uint8_t *out_bytes = p_row_task.out_mm_bytes;
 	int w = p_row_task.width;
 	int h = p_row_task.height;
@@ -151,6 +151,11 @@ void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels) {
 	int w = p_image->get_width();
 	int h = p_image->get_height();
 
+	if (w % 4 != 0 || h % 4 != 0) {
+		w = w <= 2 ? w : (w + 3) & ~3;
+		h = h <= 2 ? h : (h + 3) & ~3;
+	}
+
 	bool is_ldr = (p_image->get_format() <= Image::FORMAT_RGBA8);
 	bool is_hdr = (p_image->get_format() >= Image::FORMAT_RF) && (p_image->get_format() <= Image::FORMAT_RGBE9995);
 
@@ -180,8 +185,6 @@ void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels) {
 		p_image->convert(Image::FORMAT_RGBA8); //still uses RGBA to convert
 	}
 
-	const uint8_t *rb = p_image->get_data().ptr();
-
 	Vector<uint8_t> data;
 	int64_t target_size = Image::get_image_data_size(w, h, target_format, p_image->has_mipmaps());
 	int mm_count = p_image->has_mipmaps() ? Image::get_image_required_mipmaps(w, h, target_format) : 0;
@@ -209,20 +212,59 @@ void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels) {
 	Vector<CVTTCompressionRowTask> tasks;
 
 	for (int i = 0; i <= mm_count; i++) {
-		int bw = w % 4 != 0 ? w + (4 - w % 4) : w;
-		int bh = h % 4 != 0 ? h + (4 - h % 4) : h;
+		Vector<uint8_t> in_data;
+		int width, height;
+		Image::get_image_mipmap_offset_and_dimensions(w, h, target_format, i, width, height);
 
-		int64_t src_ofs = p_image->get_mipmap_offset(i);
+		int bw = width % 4 != 0 ? width + (4 - width % 4) : width;
+		int bh = height % 4 != 0 ? height + (4 - height % 4) : height;
 
-		const uint8_t *in_bytes = &rb[src_ofs];
+		int64_t src_mip_ofs, src_mip_size;
+		int src_mip_w, src_mip_h;
+		p_image->get_mipmap_offset_size_and_dimensions(i, src_mip_ofs, src_mip_size, src_mip_w, src_mip_h);
+
+		// Pad textures to nearest block by smearing.
+		if (width != src_mip_w || height != src_mip_h) {
+			const uint8_t *src_mip_read = p_image->ptr() + src_mip_ofs;
+
+			// Reserve the buffer for padded image data.
+			int px_size = Image::get_format_pixel_size(p_image->get_format());
+			in_data.resize(width * height * px_size);
+			uint8_t *ptrw = in_data.ptrw();
+
+			int x = 0, y = 0;
+			for (y = 0; y < src_mip_h; y++) {
+				for (x = 0; x < src_mip_w; x++) {
+					memcpy(ptrw + (width * y + x) * px_size, src_mip_read + (src_mip_w * y + x) * px_size, px_size);
+				}
+
+				// First, smear in x.
+				for (; x < width; x++) {
+					memcpy(ptrw + (width * y + x) * px_size, ptrw + (width * y + x - 1) * px_size, px_size);
+				}
+			}
+
+			// Then, smear in y.
+			for (; y < height; y++) {
+				for (x = 0; x < width; x++) {
+					memcpy(ptrw + (width * y + x) * px_size, ptrw + (width * y + x - width) * px_size, px_size);
+				}
+			}
+		} else {
+			// Create a buffer filled with the source mip layer data.
+			in_data.resize(src_mip_size);
+			memcpy(in_data.ptrw(), p_image->ptr() + src_mip_ofs, src_mip_size);
+		}
+
+		//const uint8_t *in_bytes = &rb[src_ofs];
 		uint8_t *out_bytes = &wb[dst_ofs];
 
-		for (int y_start = 0; y_start < h; y_start += 4) {
+		for (int y_start = 0; y_start < height; y_start += 4) {
 			CVTTCompressionRowTask row_task;
-			row_task.width = w;
-			row_task.height = h;
+			row_task.width = width;
+			row_task.height = height;
 			row_task.y_start = y_start;
-			row_task.in_mm_bytes = in_bytes;
+			row_task.in_mm = in_data;
 			row_task.out_mm_bytes = out_bytes;
 
 			tasks.push_back(row_task);
@@ -231,8 +273,6 @@ void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels) {
 		}
 
 		dst_ofs += (MAX(4, bw) * MAX(4, bh)) >> shift;
-		w = MAX(w / 2, 1);
-		h = MAX(h / 2, 1);
 	}
 
 	const CVTTCompressionRowTask *tasks_rb = tasks.ptr();
@@ -242,7 +282,7 @@ void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels) {
 	WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_singleton()->add_native_group_task(&_digest_job_queue, &job_queue, WorkerThreadPool::get_singleton()->get_thread_count(), -1, true, SNAME("CVTT Compress"));
 	WorkerThreadPool::get_singleton()->wait_for_group_task_completion(group_task);
 
-	p_image->set_data(p_image->get_width(), p_image->get_height(), p_image->has_mipmaps(), target_format, data);
+	p_image->set_data(w, h, p_image->has_mipmaps(), target_format, data);
 
 	print_verbose(vformat("CVTT: Encoding took %d ms.", OS::get_singleton()->get_ticks_msec() - start_time));
 }
diff --git a/engine/modules/cvtt/image_compress_cvtt.h b/engine/modules/cvtt/image_compress_cvtt.h
index ca88a9d4..8913fda5 100644
--- a/engine/modules/cvtt/image_compress_cvtt.h
+++ b/engine/modules/cvtt/image_compress_cvtt.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_COMPRESS_CVTT_H
-#define IMAGE_COMPRESS_CVTT_H
+#pragma once
 
 #include "core/io/image.h"
 
 void image_compress_cvtt(Image *p_image, Image::UsedChannels p_channels);
 void image_decompress_cvtt(Image *p_image);
-
-#endif // IMAGE_COMPRESS_CVTT_H
diff --git a/engine/modules/cvtt/register_types.h b/engine/modules/cvtt/register_types.h
index f1fb620d..bd88c6d3 100644
--- a/engine/modules/cvtt/register_types.h
+++ b/engine/modules/cvtt/register_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CVTT_REGISTER_TYPES_H
-#define CVTT_REGISTER_TYPES_H
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
@@ -39,5 +38,3 @@ void initialize_cvtt_module(ModuleInitializationLevel p_level);
 void uninitialize_cvtt_module(ModuleInitializationLevel p_level);
 
 #endif // TOOLS_ENABLED
-
-#endif // CVTT_REGISTER_TYPES_H
diff --git a/engine/modules/dds/dds_enums.h b/engine/modules/dds/dds_enums.h
new file mode 100644
index 00000000..ea204736
--- /dev/null
+++ b/engine/modules/dds/dds_enums.h
@@ -0,0 +1,203 @@
+/**************************************************************************/
+/*  dds_enums.h                                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/io/image.h"
+
+#define PF_FOURCC(m_s) ((uint32_t)(((m_s)[3] << 24U) | ((m_s)[2] << 16U) | ((m_s)[1] << 8U) | ((m_s)[0])))
+
+// Reference: https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header
+
+enum {
+	DDS_MAGIC = 0x20534444,
+	DDS_HEADER_SIZE = 124,
+	DDS_PIXELFORMAT_SIZE = 32,
+
+	DDSD_PITCH = 0x00000008,
+	DDSD_LINEARSIZE = 0x00080000,
+	DDSD_MIPMAPCOUNT = 0x00020000,
+	DDSD_CAPS = 0x1,
+	DDSD_HEIGHT = 0x2,
+	DDSD_WIDTH = 0x4,
+	DDSD_PIXELFORMAT = 0x1000,
+	DDPF_ALPHAPIXELS = 0x00000001,
+	DDPF_ALPHAONLY = 0x00000002,
+	DDPF_FOURCC = 0x00000004,
+	DDPF_RGB = 0x00000040,
+	DDPF_RG_SNORM = 0x00080000,
+
+	DDSC2_CUBEMAP = 0x200,
+	DDSC2_VOLUME = 0x200000,
+
+	DX10D_1D = 2,
+	DX10D_2D = 3,
+	DX10D_3D = 4,
+};
+
+enum DDSFourCC {
+	DDFCC_DXT1 = PF_FOURCC("DXT1"),
+	DDFCC_DXT2 = PF_FOURCC("DXT2"),
+	DDFCC_DXT3 = PF_FOURCC("DXT3"),
+	DDFCC_DXT4 = PF_FOURCC("DXT4"),
+	DDFCC_DXT5 = PF_FOURCC("DXT5"),
+	DDFCC_ATI1 = PF_FOURCC("ATI1"),
+	DDFCC_BC4U = PF_FOURCC("BC4U"),
+	DDFCC_ATI2 = PF_FOURCC("ATI2"),
+	DDFCC_BC5U = PF_FOURCC("BC5U"),
+	DDFCC_A2XY = PF_FOURCC("A2XY"),
+	DDFCC_DX10 = PF_FOURCC("DX10"),
+	DDFCC_R16F = 111,
+	DDFCC_RG16F = 112,
+	DDFCC_RGBA16F = 113,
+	DDFCC_R32F = 114,
+	DDFCC_RG32F = 115,
+	DDFCC_RGBA32F = 116,
+};
+
+// Reference: https://learn.microsoft.com/en-us/windows/win32/api/dxgiformat/ne-dxgiformat-dxgi_format
+enum DXGIFormat {
+	DXGI_R32G32B32A32_FLOAT = 2,
+	DXGI_R32G32B32_FLOAT = 6,
+	DXGI_R16G16B16A16_FLOAT = 10,
+	DXGI_R32G32_FLOAT = 16,
+	DXGI_R10G10B10A2_UNORM = 24,
+	DXGI_R8G8B8A8_UNORM = 28,
+	DXGI_R8G8B8A8_UNORM_SRGB = 29,
+	DXGI_R16G16_FLOAT = 34,
+	DXGI_R32_FLOAT = 41,
+	DXGI_R8G8_UNORM = 49,
+	DXGI_R16_FLOAT = 54,
+	DXGI_R8_UNORM = 61,
+	DXGI_A8_UNORM = 65,
+	DXGI_R9G9B9E5 = 67,
+	DXGI_BC1_UNORM = 71,
+	DXGI_BC1_UNORM_SRGB = 72,
+	DXGI_BC2_UNORM = 74,
+	DXGI_BC2_UNORM_SRGB = 75,
+	DXGI_BC3_UNORM = 77,
+	DXGI_BC3_UNORM_SRGB = 78,
+	DXGI_BC4_UNORM = 80,
+	DXGI_BC5_UNORM = 83,
+	DXGI_B5G6R5_UNORM = 85,
+	DXGI_B5G5R5A1_UNORM = 86,
+	DXGI_B8G8R8A8_UNORM = 87,
+	DXGI_BC6H_UF16 = 95,
+	DXGI_BC6H_SF16 = 96,
+	DXGI_BC7_UNORM = 98,
+	DXGI_BC7_UNORM_SRGB = 99,
+	DXGI_B4G4R4A4_UNORM = 115,
+};
+
+// The legacy bitmasked format names here represent the actual data layout in the files,
+// while their official names are flipped (e.g. RGBA8 layout is officially called ABGR8).
+enum DDSFormat {
+	DDS_DXT1,
+	DDS_DXT3,
+	DDS_DXT5,
+	DDS_ATI1,
+	DDS_ATI2,
+	DDS_BC6U,
+	DDS_BC6S,
+	DDS_BC7,
+	DDS_R16F,
+	DDS_RG16F,
+	DDS_RGBA16F,
+	DDS_R32F,
+	DDS_RG32F,
+	DDS_RGB32F,
+	DDS_RGBA32F,
+	DDS_RGB9E5,
+	DDS_RGB8,
+	DDS_RGBA8,
+	DDS_BGR8,
+	DDS_BGRA8,
+	DDS_BGR5A1,
+	DDS_BGR565,
+	DDS_B2GR3,
+	DDS_B2GR3A8,
+	DDS_BGR10A2,
+	DDS_RGB10A2,
+	DDS_BGRA4,
+	DDS_LUMINANCE,
+	DDS_LUMINANCE_ALPHA,
+	DDS_LUMINANCE_ALPHA_4,
+	DDS_MAX
+};
+
+enum DDSType {
+	DDST_2D = 1,
+	DDST_CUBEMAP,
+	DDST_3D,
+
+	DDST_TYPE_MASK = 0x7F,
+	DDST_ARRAY = 0x80,
+};
+
+struct DDSFormatInfo {
+	const char *name = nullptr;
+	bool compressed = false;
+	uint32_t divisor = 0;
+	uint32_t block_size = 0;
+	Image::Format format = Image::Format::FORMAT_BPTC_RGBA;
+};
+
+static const DDSFormatInfo dds_format_info[DDS_MAX] = {
+	{ "DXT1/BC1", true, 4, 8, Image::FORMAT_DXT1 },
+	{ "DXT2/DXT3/BC2", true, 4, 16, Image::FORMAT_DXT3 },
+	{ "DXT4/DXT5/BC3", true, 4, 16, Image::FORMAT_DXT5 },
+	{ "ATI1/BC4", true, 4, 8, Image::FORMAT_RGTC_R },
+	{ "ATI2/A2XY/BC5", true, 4, 16, Image::FORMAT_RGTC_RG },
+	{ "BC6UF", true, 4, 16, Image::FORMAT_BPTC_RGBFU },
+	{ "BC6SF", true, 4, 16, Image::FORMAT_BPTC_RGBF },
+	{ "BC7", true, 4, 16, Image::FORMAT_BPTC_RGBA },
+	{ "R16F", false, 1, 2, Image::FORMAT_RH },
+	{ "RG16F", false, 1, 4, Image::FORMAT_RGH },
+	{ "RGBA16F", false, 1, 8, Image::FORMAT_RGBAH },
+	{ "R32F", false, 1, 4, Image::FORMAT_RF },
+	{ "RG32F", false, 1, 8, Image::FORMAT_RGF },
+	{ "RGB32F", false, 1, 12, Image::FORMAT_RGBF },
+	{ "RGBA32F", false, 1, 16, Image::FORMAT_RGBAF },
+	{ "RGB9E5", false, 1, 4, Image::FORMAT_RGBE9995 },
+	{ "RGB8", false, 1, 3, Image::FORMAT_RGB8 },
+	{ "RGBA8", false, 1, 4, Image::FORMAT_RGBA8 },
+	{ "BGR8", false, 1, 3, Image::FORMAT_RGB8 },
+	{ "BGRA8", false, 1, 4, Image::FORMAT_RGBA8 },
+	{ "BGR5A1", false, 1, 2, Image::FORMAT_RGBA8 },
+	{ "BGR565", false, 1, 2, Image::FORMAT_RGB8 },
+	{ "B2GR3", false, 1, 1, Image::FORMAT_RGB8 },
+	{ "B2GR3A8", false, 1, 2, Image::FORMAT_RGBA8 },
+	{ "BGR10A2", false, 1, 4, Image::FORMAT_RGBA8 },
+	{ "RGB10A2", false, 1, 4, Image::FORMAT_RGBA8 },
+	{ "BGRA4", false, 1, 2, Image::FORMAT_RGBA8 },
+	{ "GRAYSCALE", false, 1, 1, Image::FORMAT_L8 },
+	{ "GRAYSCALE_ALPHA", false, 1, 2, Image::FORMAT_LA8 },
+	{ "GRAYSCALE_ALPHA_4", false, 1, 1, Image::FORMAT_LA8 },
+};
diff --git a/engine/modules/dds/image_saver_dds.cpp b/engine/modules/dds/image_saver_dds.cpp
new file mode 100644
index 00000000..eaa6a412
--- /dev/null
+++ b/engine/modules/dds/image_saver_dds.cpp
@@ -0,0 +1,487 @@
+/**************************************************************************/
+/*  image_saver_dds.cpp                                                   */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "image_saver_dds.h"
+
+#include "dds_enums.h"
+
+#include "core/io/file_access.h"
+#include "core/io/stream_peer.h"
+
+Error save_dds(const String &p_path, const Ref<Image> &p_img) {
+	Vector<uint8_t> buffer = save_dds_buffer(p_img);
+
+	Ref<FileAccess> file = FileAccess::open(p_path, FileAccess::WRITE);
+	if (file.is_null()) {
+		return ERR_CANT_CREATE;
+	}
+
+	file->store_buffer(buffer.ptr(), buffer.size());
+
+	return OK;
+}
+
+enum DDSFormatType {
+	DDFT_BITMASK,
+	DDFT_FOURCC,
+	DDFT_DXGI,
+};
+
+DDSFormatType _dds_format_get_type(DDSFormat p_format) {
+	switch (p_format) {
+		case DDS_DXT1:
+		case DDS_DXT3:
+		case DDS_DXT5:
+		case DDS_ATI1:
+		case DDS_ATI2:
+		case DDS_R16F:
+		case DDS_RG16F:
+		case DDS_RGBA16F:
+		case DDS_R32F:
+		case DDS_RG32F:
+		case DDS_RGBA32F:
+			return DDFT_FOURCC;
+
+		case DDS_BC6S:
+		case DDS_BC6U:
+		case DDS_BC7:
+		case DDS_RGB9E5:
+		case DDS_RGB32F:
+			return DDFT_DXGI;
+
+		default:
+			return DDFT_BITMASK;
+	}
+}
+
+DDSFormat _image_format_to_dds_format(Image::Format p_image_format) {
+	switch (p_image_format) {
+		case Image::FORMAT_RGBAF: {
+			return DDS_RGBA32F;
+		}
+		case Image::FORMAT_RGBF: {
+			return DDS_RGB32F;
+		}
+		case Image::FORMAT_RGBAH: {
+			return DDS_RGBA16F;
+		}
+		case Image::FORMAT_RGF: {
+			return DDS_RG32F;
+		}
+		case Image::FORMAT_RGBA8: {
+			return DDS_RGBA8;
+		}
+		case Image::FORMAT_RGH: {
+			return DDS_RG16F;
+		}
+		case Image::FORMAT_RF: {
+			return DDS_R32F;
+		}
+		case Image::FORMAT_L8:
+		case Image::FORMAT_R8: {
+			return DDS_LUMINANCE;
+		}
+		case Image::FORMAT_RH: {
+			return DDS_R16F;
+		}
+		case Image::FORMAT_LA8:
+		case Image::FORMAT_RG8: {
+			return DDS_LUMINANCE_ALPHA;
+		}
+		case Image::FORMAT_RGBA4444: {
+			return DDS_BGRA4;
+		}
+		case Image::FORMAT_RGB565: {
+			return DDS_BGR565;
+		}
+		case Image::FORMAT_RGBE9995: {
+			return DDS_RGB9E5;
+		}
+		case Image::FORMAT_DXT1: {
+			return DDS_DXT1;
+		}
+		case Image::FORMAT_DXT3: {
+			return DDS_DXT3;
+		}
+		case Image::FORMAT_DXT5: {
+			return DDS_DXT5;
+		}
+		case Image::FORMAT_RGTC_R: {
+			return DDS_ATI1;
+		}
+		case Image::FORMAT_RGTC_RG: {
+			return DDS_ATI2;
+		}
+		case Image::FORMAT_RGB8: {
+			return DDS_RGB8;
+		}
+		case Image::FORMAT_BPTC_RGBFU: {
+			return DDS_BC6U;
+		}
+		case Image::FORMAT_BPTC_RGBF: {
+			return DDS_BC6S;
+		}
+		case Image::FORMAT_BPTC_RGBA: {
+			return DDS_BC7;
+		}
+		default: {
+			return DDS_MAX;
+		}
+	}
+}
+
+uint32_t _image_format_to_fourcc_format(Image::Format p_format) {
+	switch (p_format) {
+		case Image::FORMAT_DXT1:
+			return DDFCC_DXT1;
+		case Image::FORMAT_DXT3:
+			return DDFCC_DXT3;
+		case Image::FORMAT_DXT5:
+			return DDFCC_DXT5;
+		case Image::FORMAT_RGTC_R:
+			return DDFCC_ATI1;
+		case Image::FORMAT_RGTC_RG:
+			return DDFCC_ATI2;
+		case Image::FORMAT_RF:
+			return DDFCC_R32F;
+		case Image::FORMAT_RGF:
+			return DDFCC_RG32F;
+		case Image::FORMAT_RGBAF:
+			return DDFCC_RGBA32F;
+		case Image::FORMAT_RH:
+			return DDFCC_R16F;
+		case Image::FORMAT_RGH:
+			return DDFCC_RG16F;
+		case Image::FORMAT_RGBAH:
+			return DDFCC_RGBA16F;
+
+		default:
+			return 0;
+	}
+}
+
+uint32_t _image_format_to_dxgi_format(Image::Format p_format) {
+	switch (p_format) {
+		case Image::FORMAT_DXT1:
+			return DXGI_BC1_UNORM;
+		case Image::FORMAT_DXT3:
+			return DXGI_BC2_UNORM;
+		case Image::FORMAT_DXT5:
+			return DXGI_BC3_UNORM;
+		case Image::FORMAT_RGTC_R:
+			return DXGI_BC4_UNORM;
+		case Image::FORMAT_RGTC_RG:
+			return DXGI_BC5_UNORM;
+		case Image::FORMAT_BPTC_RGBFU:
+			return DXGI_BC6H_UF16;
+		case Image::FORMAT_BPTC_RGBF:
+			return DXGI_BC6H_SF16;
+		case Image::FORMAT_BPTC_RGBA:
+			return DXGI_BC7_UNORM;
+		case Image::FORMAT_RF:
+			return DXGI_R32_FLOAT;
+		case Image::FORMAT_RGF:
+			return DXGI_R32G32_FLOAT;
+		case Image::FORMAT_RGBF:
+			return DXGI_R32G32B32_FLOAT;
+		case Image::FORMAT_RGBAF:
+			return DXGI_R32G32B32A32_FLOAT;
+		case Image::FORMAT_RH:
+			return DXGI_R16_FLOAT;
+		case Image::FORMAT_RGH:
+			return DXGI_R16G16_FLOAT;
+		case Image::FORMAT_RGBAH:
+			return DXGI_R16G16B16A16_FLOAT;
+		case Image::FORMAT_RGBE9995:
+			return DXGI_R9G9B9E5;
+
+		default:
+			return 0;
+	}
+}
+
+void _get_dds_pixel_bitmask(Image::Format p_format, uint32_t &r_bit_count, uint32_t &r_red_mask, uint32_t &r_green_mask, uint32_t &r_blue_mask, uint32_t &r_alpha_mask) {
+	switch (p_format) {
+		case Image::FORMAT_R8:
+		case Image::FORMAT_L8: {
+			r_bit_count = 8;
+			r_red_mask = 0xff;
+			r_green_mask = 0;
+			r_blue_mask = 0;
+			r_alpha_mask = 0;
+		} break;
+		case Image::FORMAT_RG8:
+		case Image::FORMAT_LA8: {
+			r_bit_count = 16;
+			r_red_mask = 0xff;
+			r_green_mask = 0;
+			r_blue_mask = 0;
+			r_alpha_mask = 0xff00;
+		} break;
+		case Image::FORMAT_RGB8: {
+			// BGR8
+			r_bit_count = 24;
+			r_red_mask = 0xff0000;
+			r_green_mask = 0xff00;
+			r_blue_mask = 0xff;
+			r_alpha_mask = 0;
+		} break;
+		case Image::FORMAT_RGBA8: {
+			r_bit_count = 32;
+			r_red_mask = 0xff;
+			r_green_mask = 0xff00;
+			r_blue_mask = 0xff0000;
+			r_alpha_mask = 0xff000000;
+		} break;
+		case Image::FORMAT_RGBA4444: {
+			// BGRA4444
+			r_bit_count = 16;
+			r_red_mask = 0xf00;
+			r_green_mask = 0xf0;
+			r_blue_mask = 0xf;
+			r_alpha_mask = 0xf000;
+		} break;
+		case Image::FORMAT_RGB565: {
+			// BGR565
+			r_bit_count = 16;
+			r_red_mask = 0xf800;
+			r_green_mask = 0x7e0;
+			r_blue_mask = 0x1f;
+			r_alpha_mask = 0;
+		} break;
+
+		default: {
+			r_bit_count = 0;
+			r_red_mask = 0;
+			r_green_mask = 0;
+			r_blue_mask = 0;
+			r_alpha_mask = 0;
+		} break;
+	}
+}
+
+Vector<uint8_t> save_dds_buffer(const Ref<Image> &p_img) {
+	Ref<StreamPeerBuffer> stream_buffer;
+	stream_buffer.instantiate();
+
+	Ref<Image> image = p_img;
+
+	stream_buffer->put_32(DDS_MAGIC);
+	stream_buffer->put_32(DDS_HEADER_SIZE);
+
+	uint32_t flags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT | DDSD_PITCH | DDSD_LINEARSIZE;
+
+	if (image->has_mipmaps()) {
+		flags |= DDSD_MIPMAPCOUNT;
+	}
+
+	stream_buffer->put_32(flags);
+
+	uint32_t height = image->get_height();
+	stream_buffer->put_32(height);
+
+	uint32_t width = image->get_width();
+	stream_buffer->put_32(width);
+
+	DDSFormat dds_format = _image_format_to_dds_format(image->get_format());
+	const DDSFormatInfo &info = dds_format_info[dds_format];
+
+	uint32_t depth = 1; // Default depth for 2D textures
+
+	uint32_t pitch;
+	if (info.compressed) {
+		pitch = ((MAX(info.divisor, width) + info.divisor - 1) / info.divisor) * ((MAX(info.divisor, height) + info.divisor - 1) / info.divisor) * info.block_size;
+	} else {
+		pitch = width * info.block_size;
+	}
+
+	stream_buffer->put_32(pitch);
+	stream_buffer->put_32(depth);
+
+	uint32_t mipmaps = image->get_mipmap_count() + 1;
+	stream_buffer->put_32(mipmaps);
+
+	uint32_t reserved = 0;
+	for (int i = 0; i < 11; i++) {
+		stream_buffer->put_32(reserved);
+	}
+
+	stream_buffer->put_32(DDS_PIXELFORMAT_SIZE);
+
+	uint32_t pf_flags = 0;
+
+	DDSFormatType format_type = _dds_format_get_type(dds_format);
+
+	if (format_type == DDFT_BITMASK) {
+		pf_flags = DDPF_RGB;
+
+		if (image->get_format() == Image::FORMAT_LA8 || image->get_format() == Image::FORMAT_RG8 || image->get_format() == Image::FORMAT_RGBA8 || image->get_format() == Image::FORMAT_RGBA4444) {
+			pf_flags |= DDPF_ALPHAPIXELS;
+		}
+	} else {
+		pf_flags = DDPF_FOURCC;
+	}
+
+	stream_buffer->put_32(pf_flags);
+
+	bool needs_pixeldata_swap = false;
+
+	if (format_type == DDFT_BITMASK) {
+		// Uncompressed bitmasked.
+		stream_buffer->put_32(0); // FourCC
+
+		uint32_t bit_count, r_mask, g_mask, b_mask, a_mask;
+		_get_dds_pixel_bitmask(image->get_format(), bit_count, r_mask, g_mask, b_mask, a_mask);
+
+		stream_buffer->put_32(bit_count);
+		stream_buffer->put_32(r_mask);
+		stream_buffer->put_32(g_mask);
+		stream_buffer->put_32(b_mask);
+		stream_buffer->put_32(a_mask);
+
+		if (image->get_format() == Image::FORMAT_RGBA4444 || image->get_format() == Image::FORMAT_RGB565 || image->get_format() == Image::FORMAT_RGB8) {
+			needs_pixeldata_swap = true;
+		}
+	} else if (format_type == DDFT_FOURCC) {
+		// FourCC.
+		uint32_t fourcc = _image_format_to_fourcc_format(image->get_format());
+		stream_buffer->put_32(fourcc);
+
+		stream_buffer->put_32(0); // Bit count
+		stream_buffer->put_32(0); // R Bitmask
+		stream_buffer->put_32(0); // G Bitmask
+		stream_buffer->put_32(0); // B Bitmask
+		stream_buffer->put_32(0); // A Bitmask
+	} else {
+		// DXGI format and DX10 header.
+		stream_buffer->put_32(DDFCC_DX10);
+
+		stream_buffer->put_32(0); // Bit count
+		stream_buffer->put_32(0); // R Bitmask
+		stream_buffer->put_32(0); // G Bitmask
+		stream_buffer->put_32(0); // B Bitmask
+		stream_buffer->put_32(0); // A Bitmask
+	}
+
+	uint32_t caps1 = info.compressed ? DDSD_LINEARSIZE : DDSD_PITCH;
+	stream_buffer->put_32(caps1);
+
+	stream_buffer->put_32(0); // Caps2
+	stream_buffer->put_32(0); // Caps3
+	stream_buffer->put_32(0); // Caps4
+	stream_buffer->put_32(0); // Reserved 2
+
+	if (format_type == DDFT_DXGI) {
+		// DX10 header.
+		uint32_t dxgi_format = _image_format_to_dxgi_format(image->get_format());
+		stream_buffer->put_32(dxgi_format);
+		stream_buffer->put_32(DX10D_2D);
+		stream_buffer->put_32(0); // Misc flags 1
+		stream_buffer->put_32(1); // Array size
+		stream_buffer->put_32(0); // Misc flags 2
+	}
+
+	for (uint32_t mip_i = 0; mip_i < mipmaps; mip_i++) {
+		uint32_t mip_width = MAX(1u, width >> mip_i);
+		uint32_t mip_height = MAX(1u, height >> mip_i);
+
+		uint32_t expected_size = 0;
+		if (info.compressed) {
+			uint32_t blocks_x = (mip_width + info.divisor - 1) / info.divisor;
+			uint32_t blocks_y = (mip_height + info.divisor - 1) / info.divisor;
+			expected_size = blocks_x * blocks_y * info.block_size;
+		} else {
+			expected_size = mip_width * mip_height * info.block_size;
+		}
+
+		if (needs_pixeldata_swap) {
+			// The image's channels need to be swapped.
+			Ref<Image> mip_image = image->get_image_from_mipmap(mip_i);
+			Vector<uint8_t> data = mip_image->get_data();
+
+			ERR_FAIL_COND_V_MSG(data.size() != expected_size, Vector<uint8_t>(),
+					"Image data size mismatch for mipmap level " + itos(mip_i) +
+							". Expected size: " + itos(expected_size) + ", actual size: " + itos(data.size()) + ".");
+
+			if (mip_image->get_format() == Image::FORMAT_RGBA4444) {
+				// RGBA4 to BGRA4
+				const int64_t data_size = data.size();
+				uint8_t *wb = data.ptrw();
+
+				for (int64_t data_i = 0; data_i < data_size; data_i += 2) {
+					uint8_t ar = wb[data_i + 0];
+					uint8_t gb = wb[data_i + 1];
+
+					wb[data_i + 1] = ((ar & 0x0F) << 4) | ((gb & 0xF0) >> 4);
+					wb[data_i + 0] = ((ar & 0xF0) >> 4) | ((gb & 0x0F) << 4);
+				}
+			} else if (mip_image->get_format() == Image::FORMAT_RGB565) {
+				// RGB565 to BGR565
+				const int64_t data_size = data.size();
+				uint8_t *wb = data.ptrw();
+
+				for (int64_t data_i = 0; data_i < data_size; data_i += 2) {
+					uint16_t px = wb[data_i] | (wb[data_i + 1] << 8);
+
+					uint8_t r = (px >> 11) & 0x1F;
+					uint8_t g = (px >> 5) & 0x3F;
+					uint8_t b = px & 0x1F;
+
+					uint16_t out_px = (b << 11) | (g << 5) | r;
+
+					wb[data_i + 0] = out_px & 0xFF;
+					wb[data_i + 1] = (out_px >> 8) & 0xFF;
+				}
+			} else if (mip_image->get_format() == Image::FORMAT_RGB8) {
+				// RGB8 to BGR8
+				const int64_t data_size = data.size();
+				uint8_t *wb = data.ptrw();
+
+				for (int64_t data_i = 0; data_i < data_size; data_i += 3) {
+					SWAP(wb[data_i], wb[data_i + 2]);
+				}
+			}
+
+			stream_buffer->put_data(data.ptr(), data.size());
+		} else {
+			int64_t ofs, size;
+
+			image->get_mipmap_offset_and_size(mip_i, ofs, size);
+
+			ERR_FAIL_COND_V_MSG(size != expected_size, Vector<uint8_t>(),
+					"Image data size mismatch for mipmap level " + itos(mip_i) +
+							". Expected size: " + itos(expected_size) + ", actual size: " + itos(size) + ".");
+
+			stream_buffer->put_data(image->ptr() + ofs, size);
+		}
+	}
+
+	return stream_buffer->get_data_array();
+}
diff --git a/engine/modules/dds/image_saver_dds.h b/engine/modules/dds/image_saver_dds.h
new file mode 100644
index 00000000..aa71513c
--- /dev/null
+++ b/engine/modules/dds/image_saver_dds.h
@@ -0,0 +1,36 @@
+/**************************************************************************/
+/*  image_saver_dds.h                                                     */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/io/image.h"
+
+Error save_dds(const String &p_path, const Ref<Image> &p_img);
+Vector<uint8_t> save_dds_buffer(const Ref<Image> &p_img);
diff --git a/engine/modules/dds/register_types.cpp b/engine/modules/dds/register_types.cpp
index d336269e..75a18046 100644
--- a/engine/modules/dds/register_types.cpp
+++ b/engine/modules/dds/register_types.cpp
@@ -30,8 +30,11 @@
 
 #include "register_types.h"
 
+#include "image_saver_dds.h"
 #include "texture_loader_dds.h"
 
+#include "scene/resources/texture.h"
+
 static Ref<ResourceFormatDDS> resource_loader_dds;
 
 void initialize_dds_module(ModuleInitializationLevel p_level) {
@@ -39,8 +42,13 @@ void initialize_dds_module(ModuleInitializationLevel p_level) {
 		return;
 	}
 
-	resource_loader_dds.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_dds);
+	Image::save_dds_func = save_dds;
+	Image::save_dds_buffer_func = save_dds_buffer;
+
+	if (GD_IS_CLASS_ENABLED(Texture)) {
+		resource_loader_dds.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_dds);
+	}
 }
 
 void uninitialize_dds_module(ModuleInitializationLevel p_level) {
@@ -48,6 +56,11 @@ void uninitialize_dds_module(ModuleInitializationLevel p_level) {
 		return;
 	}
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_dds);
-	resource_loader_dds.unref();
+	if (GD_IS_CLASS_ENABLED(Texture)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_dds);
+		resource_loader_dds.unref();
+	}
+
+	Image::save_dds_func = nullptr;
+	Image::save_dds_buffer_func = nullptr;
 }
diff --git a/engine/modules/dds/register_types.h b/engine/modules/dds/register_types.h
index 51b2f667..9097c235 100644
--- a/engine/modules/dds/register_types.h
+++ b/engine/modules/dds/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DDS_REGISTER_TYPES_H
-#define DDS_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_dds_module(ModuleInitializationLevel p_level);
 void uninitialize_dds_module(ModuleInitializationLevel p_level);
-
-#endif // DDS_REGISTER_TYPES_H
diff --git a/engine/modules/dds/tests/test_dds.h b/engine/modules/dds/tests/test_dds.h
new file mode 100644
index 00000000..8f723a44
--- /dev/null
+++ b/engine/modules/dds/tests/test_dds.h
@@ -0,0 +1,161 @@
+/**************************************************************************/
+/*  test_dds.h                                                            */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "../image_saver_dds.h"
+
+#include "core/config/project_settings.h"
+#include "core/io/dir_access.h"
+#include "core/io/image.h"
+#include "tests/core/config/test_project_settings.h"
+#include "tests/test_macros.h"
+#include "tests/test_utils.h"
+
+namespace TestDDS {
+String init(const String &p_test, const String &p_copy_target = String()) {
+	String old_resource_path = TestProjectSettingsInternalsAccessor::resource_path();
+	Error err;
+	// Setup project settings since it's needed for the import process.
+	String project_folder = TestUtils::get_temp_path(p_test.get_file().get_basename());
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	da->make_dir_recursive(project_folder.path_join(".godot").path_join("imported"));
+	// Initialize res:// to `project_folder`.
+	TestProjectSettingsInternalsAccessor::resource_path() = project_folder;
+	err = ProjectSettings::get_singleton()->setup(project_folder, String(), true);
+
+	if (p_copy_target.is_empty()) {
+		return old_resource_path;
+	}
+
+	// Copy all the necessary test data files to the res:// directory.
+	da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	String test_data = String("tests/data").path_join(p_test);
+	da = DirAccess::open(test_data);
+	CHECK_MESSAGE(da.is_valid(), "Unable to open folder.");
+	da->list_dir_begin();
+	for (String item = da->get_next(); !item.is_empty(); item = da->get_next()) {
+		if (!FileAccess::exists(test_data.path_join(item))) {
+			continue;
+		}
+		Ref<FileAccess> output = FileAccess::open(p_copy_target.path_join(item), FileAccess::WRITE, &err);
+		CHECK_MESSAGE(err == OK, "Unable to open output file.");
+		output->store_buffer(FileAccess::get_file_as_bytes(test_data.path_join(item)));
+		output->close();
+	}
+	da->list_dir_end();
+	return old_resource_path;
+}
+
+TEST_CASE("[SceneTree][DDSSaver] Save DDS - Save valid image with mipmap" * doctest::skip(true)) {
+	String old_resource_path = init("save_dds_valid_image_with_mipmap");
+	Ref<Image> image = Image::create_empty(4, 4, false, Image::FORMAT_RGBA8);
+	image->fill(Color(1, 0, 0)); // Fill with red color
+	image->generate_mipmaps();
+	image->compress_from_channels(Image::COMPRESS_S3TC, Image::USED_CHANNELS_RGBA);
+	Error err = save_dds("res://valid_image_with_mipmap.dds", image);
+	CHECK(err == OK);
+
+	Ref<Image> loaded_image;
+	loaded_image.instantiate();
+	Vector<uint8_t> buffer = FileAccess::get_file_as_bytes("res://valid_image_with_mipmap.dds", &err);
+	CHECK(err == OK);
+	err = loaded_image->load_dds_from_buffer(buffer);
+	CHECK(err == OK);
+	Dictionary metrics = image->compute_image_metrics(loaded_image, false);
+	CHECK(metrics.size() > 0);
+	CHECK_MESSAGE(metrics.has("root_mean_squared"), "Metrics dictionary contains 'root_mean_squared'.");
+	float rms = metrics["root_mean_squared"];
+	CHECK(rms == 0.0f);
+	TestProjectSettingsInternalsAccessor::resource_path() = old_resource_path;
+}
+
+TEST_CASE("[SceneTree][DDSSaver] Save DDS - Save valid image with BPTC and S3TC compression" * doctest::skip(true)) {
+	String old_resource_path = init("save_dds_valid_image_bptc_s3tc");
+	Ref<Image> image_bptc = Image::create_empty(4, 4, false, Image::FORMAT_RGBA8);
+	image_bptc->fill(Color(0, 0, 1)); // Fill with blue color
+	image_bptc->compress_from_channels(Image::COMPRESS_BPTC, Image::USED_CHANNELS_RGBA);
+	Error err_bptc = image_bptc->save_dds("res://valid_image_bptc.dds");
+	CHECK(err_bptc == OK);
+
+	Ref<Image> image_s3tc = Image::create_empty(4, 4, false, Image::FORMAT_RGBA8);
+	image_s3tc->fill(Color(1, 1, 1)); // Fill with white color
+	image_s3tc->compress_from_channels(Image::COMPRESS_S3TC, Image::USED_CHANNELS_RGBA);
+	Error err_s3tc = image_s3tc->save_dds("res://valid_image_s3tc_combined.dds");
+	CHECK(err_s3tc == OK);
+
+	// Validate BPTC image
+	Ref<Image> loaded_image_bptc;
+	loaded_image_bptc.instantiate();
+	Vector<uint8_t> buffer_bptc = FileAccess::get_file_as_bytes("res://valid_image_bptc.dds", &err_bptc);
+	CHECK(err_bptc == OK);
+	err_bptc = loaded_image_bptc->load_dds_from_buffer(buffer_bptc);
+	CHECK(err_bptc == OK);
+	Dictionary metrics_bptc = image_bptc->compute_image_metrics(loaded_image_bptc, false);
+	CHECK(metrics_bptc.size() > 0);
+	CHECK_MESSAGE(metrics_bptc.has("root_mean_squared"), "Metrics dictionary contains 'root_mean_squared' for BPTC.");
+	float rms_bptc = metrics_bptc["root_mean_squared"];
+	CHECK(rms_bptc == 0.0f);
+
+	// Validate S3TC image
+	Ref<Image> loaded_image_s3tc;
+	loaded_image_s3tc.instantiate();
+	Vector<uint8_t> buffer_s3tc = FileAccess::get_file_as_bytes("res://valid_image_s3tc_combined.dds", &err_s3tc);
+	CHECK(err_s3tc == OK);
+	err_s3tc = loaded_image_s3tc->load_dds_from_buffer(buffer_s3tc);
+	CHECK(err_s3tc == OK);
+	Dictionary metrics_s3tc = image_s3tc->compute_image_metrics(loaded_image_s3tc, false);
+	CHECK(metrics_s3tc.size() > 0);
+	CHECK_MESSAGE(metrics_s3tc.has("root_mean_squared"), "Metrics dictionary contains 'root_mean_squared' for S3TC.");
+	float rms_s3tc = metrics_s3tc["root_mean_squared"];
+	CHECK(rms_s3tc == 0.0f);
+	TestProjectSettingsInternalsAccessor::resource_path() = old_resource_path;
+}
+
+TEST_CASE("[SceneTree][DDSSaver] Save DDS - Save valid uncompressed image") {
+	String old_resource_path = init("save_dds_valid_uncompressed");
+	Ref<Image> image = Image::create_empty(4, 4, false, Image::FORMAT_RGBA8);
+	image->fill(Color(0, 0, 1)); // Fill with blue color
+	Error err = image->save_dds("res://valid_image_uncompressed.dds");
+	CHECK(err == OK);
+	Vector<uint8_t> buffer = FileAccess::get_file_as_bytes("res://valid_image_uncompressed.dds", &err);
+	CHECK(err == OK);
+	Ref<Image> loaded_image;
+	loaded_image.instantiate();
+	err = loaded_image->load_dds_from_buffer(buffer);
+	CHECK(err == OK);
+	Dictionary metrics = image->compute_image_metrics(loaded_image, false);
+	CHECK(metrics.size() > 0);
+	CHECK_MESSAGE(metrics.has("root_mean_squared"), "Metrics dictionary contains 'root_mean_squared' for uncompressed.");
+	float rms = metrics["root_mean_squared"];
+	CHECK(rms == 0.0f);
+	TestProjectSettingsInternalsAccessor::resource_path() = old_resource_path;
+}
+} //namespace TestDDS
diff --git a/engine/modules/dds/texture_loader_dds.cpp b/engine/modules/dds/texture_loader_dds.cpp
index 667de70d..c360dd88 100644
--- a/engine/modules/dds/texture_loader_dds.cpp
+++ b/engine/modules/dds/texture_loader_dds.cpp
@@ -30,171 +30,13 @@
 
 #include "texture_loader_dds.h"
 
+#include "dds_enums.h"
+
 #include "core/io/file_access.h"
+#include "core/io/file_access_memory.h"
 #include "scene/resources/image_texture.h"
 
-#define PF_FOURCC(s) ((uint32_t)(((s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0])))
-
-// Reference: https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header
-
-enum {
-	DDS_MAGIC = 0x20534444,
-	DDSD_PITCH = 0x00000008,
-	DDSD_LINEARSIZE = 0x00080000,
-	DDSD_MIPMAPCOUNT = 0x00020000,
-	DDPF_ALPHAPIXELS = 0x00000001,
-	DDPF_ALPHAONLY = 0x00000002,
-	DDPF_FOURCC = 0x00000004,
-	DDPF_RGB = 0x00000040,
-	DDPF_RG_SNORM = 0x00080000,
-	DDSC2_CUBEMAP = 0x200,
-	DDSC2_VOLUME = 0x200000,
-	DX10D_1D = 2,
-	DX10D_2D = 3,
-	DX10D_3D = 4,
-};
-
-enum DDSFourCC {
-	DDFCC_DXT1 = PF_FOURCC("DXT1"),
-	DDFCC_DXT2 = PF_FOURCC("DXT2"),
-	DDFCC_DXT3 = PF_FOURCC("DXT3"),
-	DDFCC_DXT4 = PF_FOURCC("DXT4"),
-	DDFCC_DXT5 = PF_FOURCC("DXT5"),
-	DDFCC_ATI1 = PF_FOURCC("ATI1"),
-	DDFCC_BC4U = PF_FOURCC("BC4U"),
-	DDFCC_ATI2 = PF_FOURCC("ATI2"),
-	DDFCC_BC5U = PF_FOURCC("BC5U"),
-	DDFCC_A2XY = PF_FOURCC("A2XY"),
-	DDFCC_DX10 = PF_FOURCC("DX10"),
-	DDFCC_R16F = 111,
-	DDFCC_RG16F = 112,
-	DDFCC_RGBA16F = 113,
-	DDFCC_R32F = 114,
-	DDFCC_RG32F = 115,
-	DDFCC_RGBA32F = 116
-};
-
-// Reference: https://learn.microsoft.com/en-us/windows/win32/api/dxgiformat/ne-dxgiformat-dxgi_format
-enum DXGIFormat {
-	DXGI_R32G32B32A32_FLOAT = 2,
-	DXGI_R32G32B32_FLOAT = 6,
-	DXGI_R16G16B16A16_FLOAT = 10,
-	DXGI_R32G32_FLOAT = 16,
-	DXGI_R10G10B10A2_UNORM = 24,
-	DXGI_R8G8B8A8_UNORM = 28,
-	DXGI_R8G8B8A8_UNORM_SRGB = 29,
-	DXGI_R16G16_FLOAT = 34,
-	DXGI_R32_FLOAT = 41,
-	DXGI_R8G8_UNORM = 49,
-	DXGI_R16_FLOAT = 54,
-	DXGI_R8_UNORM = 61,
-	DXGI_A8_UNORM = 65,
-	DXGI_R9G9B9E5 = 67,
-	DXGI_BC1_UNORM = 71,
-	DXGI_BC1_UNORM_SRGB = 72,
-	DXGI_BC2_UNORM = 74,
-	DXGI_BC2_UNORM_SRGB = 75,
-	DXGI_BC3_UNORM = 77,
-	DXGI_BC3_UNORM_SRGB = 78,
-	DXGI_BC4_UNORM = 80,
-	DXGI_BC5_UNORM = 83,
-	DXGI_B5G6R5_UNORM = 85,
-	DXGI_B5G5R5A1_UNORM = 86,
-	DXGI_B8G8R8A8_UNORM = 87,
-	DXGI_BC6H_UF16 = 95,
-	DXGI_BC6H_SF16 = 96,
-	DXGI_BC7_UNORM = 98,
-	DXGI_BC7_UNORM_SRGB = 99,
-	DXGI_B4G4R4A4_UNORM = 115
-};
-
-// The legacy bitmasked format names here represent the actual data layout in the files,
-// while their official names are flipped (e.g. RGBA8 layout is officially called ABGR8).
-enum DDSFormat {
-	DDS_DXT1,
-	DDS_DXT3,
-	DDS_DXT5,
-	DDS_ATI1,
-	DDS_ATI2,
-	DDS_BC6U,
-	DDS_BC6S,
-	DDS_BC7,
-	DDS_R16F,
-	DDS_RG16F,
-	DDS_RGBA16F,
-	DDS_R32F,
-	DDS_RG32F,
-	DDS_RGB32F,
-	DDS_RGBA32F,
-	DDS_RGB9E5,
-	DDS_RGB8,
-	DDS_RGBA8,
-	DDS_BGR8,
-	DDS_BGRA8,
-	DDS_BGR5A1,
-	DDS_BGR565,
-	DDS_B2GR3,
-	DDS_B2GR3A8,
-	DDS_BGR10A2,
-	DDS_RGB10A2,
-	DDS_BGRA4,
-	DDS_LUMINANCE,
-	DDS_LUMINANCE_ALPHA,
-	DDS_LUMINANCE_ALPHA_4,
-	DDS_MAX
-};
-
-enum DDSType {
-	DDST_2D = 1,
-	DDST_CUBEMAP,
-	DDST_3D,
-
-	DDST_TYPE_MASK = 0x7F,
-	DDST_ARRAY = 0x80,
-};
-
-struct DDSFormatInfo {
-	const char *name = nullptr;
-	bool compressed = false;
-	uint32_t divisor = 0;
-	uint32_t block_size = 0;
-	Image::Format format = Image::Format::FORMAT_BPTC_RGBA;
-};
-
-static const DDSFormatInfo dds_format_info[DDS_MAX] = {
-	{ "DXT1/BC1", true, 4, 8, Image::FORMAT_DXT1 },
-	{ "DXT2/DXT3/BC2", true, 4, 16, Image::FORMAT_DXT3 },
-	{ "DXT4/DXT5/BC3", true, 4, 16, Image::FORMAT_DXT5 },
-	{ "ATI1/BC4", true, 4, 8, Image::FORMAT_RGTC_R },
-	{ "ATI2/A2XY/BC5", true, 4, 16, Image::FORMAT_RGTC_RG },
-	{ "BC6UF", true, 4, 16, Image::FORMAT_BPTC_RGBFU },
-	{ "BC6SF", true, 4, 16, Image::FORMAT_BPTC_RGBF },
-	{ "BC7", true, 4, 16, Image::FORMAT_BPTC_RGBA },
-	{ "R16F", false, 1, 2, Image::FORMAT_RH },
-	{ "RG16F", false, 1, 4, Image::FORMAT_RGH },
-	{ "RGBA16F", false, 1, 8, Image::FORMAT_RGBAH },
-	{ "R32F", false, 1, 4, Image::FORMAT_RF },
-	{ "RG32F", false, 1, 8, Image::FORMAT_RGF },
-	{ "RGB32F", false, 1, 12, Image::FORMAT_RGBF },
-	{ "RGBA32F", false, 1, 16, Image::FORMAT_RGBAF },
-	{ "RGB9E5", false, 1, 4, Image::FORMAT_RGBE9995 },
-	{ "RGB8", false, 1, 3, Image::FORMAT_RGB8 },
-	{ "RGBA8", false, 1, 4, Image::FORMAT_RGBA8 },
-	{ "BGR8", false, 1, 3, Image::FORMAT_RGB8 },
-	{ "BGRA8", false, 1, 4, Image::FORMAT_RGBA8 },
-	{ "BGR5A1", false, 1, 2, Image::FORMAT_RGBA8 },
-	{ "BGR565", false, 1, 2, Image::FORMAT_RGB8 },
-	{ "B2GR3", false, 1, 1, Image::FORMAT_RGB8 },
-	{ "B2GR3A8", false, 1, 2, Image::FORMAT_RGBA8 },
-	{ "BGR10A2", false, 1, 4, Image::FORMAT_RGBA8 },
-	{ "RGB10A2", false, 1, 4, Image::FORMAT_RGBA8 },
-	{ "BGRA4", false, 1, 2, Image::FORMAT_RGBA8 },
-	{ "GRAYSCALE", false, 1, 1, Image::FORMAT_L8 },
-	{ "GRAYSCALE_ALPHA", false, 1, 2, Image::FORMAT_LA8 },
-	{ "GRAYSCALE_ALPHA_4", false, 1, 1, Image::FORMAT_LA8 }
-};
-
-inline DDSFormat _dxgi_to_dds_format(uint32_t p_dxgi_format) {
+DDSFormat _dxgi_to_dds_format(uint32_t p_dxgi_format) {
 	switch (p_dxgi_format) {
 		case DXGI_R32G32B32A32_FLOAT: {
 			return DDS_RGBA32F;
@@ -323,8 +165,8 @@ static Ref<Image> _dds_load_layer(Ref<FileAccess> p_file, DDSFormat p_dds_format
 		uint32_t size = p_width * p_height * info.block_size;
 
 		for (uint32_t i = 1; i < p_mipmaps; i++) {
-			w = (w + 1) >> 1;
-			h = (h + 1) >> 1;
+			w = MAX(1u, w >> 1);
+			h = MAX(1u, h >> 1);
 			size += w * h * info.block_size;
 		}
 
@@ -543,7 +385,295 @@ static Ref<Image> _dds_load_layer(Ref<FileAccess> p_file, DDSFormat p_dds_format
 	return memnew(Image(p_width, p_height, p_mipmaps > 1, info.format, r_src_data));
 }
 
-Ref<Resource> ResourceFormatDDS::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+static Vector<Ref<Image>> _dds_load_images(Ref<FileAccess> p_f, DDSFormat p_dds_format, uint32_t p_width, uint32_t p_height, uint32_t p_mipmaps, uint32_t p_pitch, uint32_t p_flags, uint32_t p_layer_count) {
+	Vector<uint8_t> src_data;
+	Vector<Ref<Image>> images;
+	images.resize(p_layer_count);
+
+	for (uint32_t i = 0; i < p_layer_count; i++) {
+		images.write[i] = _dds_load_layer(p_f, p_dds_format, p_width, p_height, p_mipmaps, p_pitch, p_flags, src_data);
+	}
+
+	return images;
+}
+
+static Ref<Resource> _dds_create_texture(const Vector<Ref<Image>> &p_images, uint32_t p_dds_type, uint32_t p_width, uint32_t p_height, uint32_t p_layer_count, uint32_t p_mipmaps, Error *r_error) {
+	if ((p_dds_type & DDST_TYPE_MASK) == DDST_2D) {
+		if (p_dds_type & DDST_ARRAY) {
+			Ref<Texture2DArray> texture;
+			texture.instantiate();
+			texture->create_from_images(p_images);
+
+			if (r_error) {
+				*r_error = OK;
+			}
+
+			return texture;
+
+		} else {
+			if (r_error) {
+				*r_error = OK;
+			}
+
+			return ImageTexture::create_from_image(p_images[0]);
+		}
+
+	} else if ((p_layer_count & DDST_TYPE_MASK) == DDST_CUBEMAP) {
+		ERR_FAIL_COND_V(p_layer_count % 6 != 0, Ref<Resource>());
+
+		if (p_dds_type & DDST_ARRAY) {
+			Ref<CubemapArray> texture;
+			texture.instantiate();
+			texture->create_from_images(p_images);
+
+			if (r_error) {
+				*r_error = OK;
+			}
+
+			return texture;
+
+		} else {
+			Ref<Cubemap> texture;
+			texture.instantiate();
+			texture->create_from_images(p_images);
+
+			if (r_error) {
+				*r_error = OK;
+			}
+
+			return texture;
+		}
+
+	} else if ((p_dds_type & DDST_TYPE_MASK) == DDST_3D) {
+		Ref<ImageTexture3D> texture;
+		texture.instantiate();
+		texture->create(p_images[0]->get_format(), p_width, p_height, p_layer_count, p_mipmaps > 1, p_images);
+
+		if (r_error) {
+			*r_error = OK;
+		}
+
+		return texture;
+	}
+
+	return Ref<Resource>();
+}
+
+static Ref<Resource> _dds_create_texture_from_images(const Vector<Ref<Image>> &p_images, DDSFormat p_dds_format, uint32_t p_width, uint32_t p_height, uint32_t p_mipmaps, uint32_t p_pitch, uint32_t p_flags, uint32_t p_layer_count, uint32_t p_dds_type, Error *r_error) {
+	return _dds_create_texture(p_images, p_dds_type, p_width, p_height, p_layer_count, p_mipmaps, r_error);
+}
+
+static Vector<Ref<Image>> _dds_load_images_from_buffer(Ref<FileAccess> p_f, DDSFormat &r_dds_format, uint32_t &r_width, uint32_t &r_height, uint32_t &r_mipmaps, uint32_t &r_pitch, uint32_t &r_flags, uint32_t &r_layer_count, uint32_t &r_dds_type, const String &p_path = "") {
+	ERR_FAIL_COND_V_MSG(p_f.is_null(), Vector<Ref<Image>>(), vformat("Empty DDS texture file."));
+	ERR_FAIL_COND_V_MSG(!p_f->get_length(), Vector<Ref<Image>>(), vformat("Empty DDS texture file."));
+
+	uint32_t magic = p_f->get_32();
+	uint32_t hsize = p_f->get_32();
+	r_flags = p_f->get_32();
+	r_height = p_f->get_32();
+	r_width = p_f->get_32();
+	r_pitch = p_f->get_32();
+	uint32_t depth = p_f->get_32();
+	r_mipmaps = p_f->get_32();
+
+	// Skip reserved.
+	for (int i = 0; i < 11; i++) {
+		p_f->get_32();
+	}
+
+	// Validate.
+	// We don't check DDSD_CAPS or DDSD_PIXELFORMAT, as they're mandatory when writing,
+	// but non-mandatory when reading (as some writers don't set them).
+	if (magic != DDS_MAGIC || hsize != 124) {
+		ERR_FAIL_V_MSG(Vector<Ref<Image>>(), vformat("Invalid or unsupported DDS texture file '%s'.", p_path));
+	}
+
+	/* uint32_t format_size = */ p_f->get_32();
+	uint32_t format_flags = p_f->get_32();
+	uint32_t format_fourcc = p_f->get_32();
+	uint32_t format_rgb_bits = p_f->get_32();
+	uint32_t format_red_mask = p_f->get_32();
+	uint32_t format_green_mask = p_f->get_32();
+	uint32_t format_blue_mask = p_f->get_32();
+	uint32_t format_alpha_mask = p_f->get_32();
+
+	/* uint32_t caps_1 = */ p_f->get_32();
+	uint32_t caps_2 = p_f->get_32();
+	/* uint32_t caps_3 = */ p_f->get_32();
+	/* uint32_t caps_4 = */ p_f->get_32();
+
+	// Skip reserved.
+	p_f->get_32();
+
+	if (p_f->get_position() < 128) {
+		p_f->seek(128);
+	}
+
+	r_layer_count = 1;
+	r_dds_type = DDST_2D;
+
+	if (caps_2 & DDSC2_CUBEMAP) {
+		r_dds_type = DDST_CUBEMAP;
+		r_layer_count *= 6;
+
+	} else if (caps_2 & DDSC2_VOLUME) {
+		r_dds_type = DDST_3D;
+		r_layer_count = depth;
+	}
+
+	r_dds_format = DDS_MAX;
+
+	if (format_flags & DDPF_FOURCC) {
+		// FourCC formats.
+		switch (format_fourcc) {
+			case DDFCC_DXT1: {
+				r_dds_format = DDS_DXT1;
+			} break;
+			case DDFCC_DXT2:
+			case DDFCC_DXT3: {
+				r_dds_format = DDS_DXT3;
+			} break;
+			case DDFCC_DXT4:
+			case DDFCC_DXT5: {
+				r_dds_format = DDS_DXT5;
+			} break;
+			case DDFCC_ATI1:
+			case DDFCC_BC4U: {
+				r_dds_format = DDS_ATI1;
+			} break;
+			case DDFCC_ATI2:
+			case DDFCC_BC5U:
+			case DDFCC_A2XY: {
+				r_dds_format = DDS_ATI2;
+			} break;
+			case DDFCC_R16F: {
+				r_dds_format = DDS_R16F;
+			} break;
+			case DDFCC_RG16F: {
+				r_dds_format = DDS_RG16F;
+			} break;
+			case DDFCC_RGBA16F: {
+				r_dds_format = DDS_RGBA16F;
+			} break;
+			case DDFCC_R32F: {
+				r_dds_format = DDS_R32F;
+			} break;
+			case DDFCC_RG32F: {
+				r_dds_format = DDS_RG32F;
+			} break;
+			case DDFCC_RGBA32F: {
+				r_dds_format = DDS_RGBA32F;
+			} break;
+			case DDFCC_DX10: {
+				uint32_t dxgi_format = p_f->get_32();
+				uint32_t dimension = p_f->get_32();
+				/* uint32_t misc_flags_1 = */ p_f->get_32();
+				uint32_t array_size = p_f->get_32();
+				/* uint32_t misc_flags_2 = */ p_f->get_32();
+
+				if (dimension == DX10D_3D) {
+					r_dds_type = DDST_3D;
+					r_layer_count = depth;
+				}
+
+				if (array_size > 1) {
+					r_layer_count *= array_size;
+					r_dds_type |= DDST_ARRAY;
+				}
+
+				r_dds_format = _dxgi_to_dds_format(dxgi_format);
+			} break;
+
+			default: {
+				ERR_FAIL_V_MSG(Vector<Ref<Image>>(), vformat("Unrecognized or unsupported FourCC in DDS '%s'.", p_path));
+			}
+		}
+
+	} else if (format_flags & DDPF_RGB) {
+		// Channel-bitmasked formats.
+		if (format_flags & DDPF_ALPHAPIXELS) {
+			// With alpha.
+			if (format_rgb_bits == 32 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff && format_alpha_mask == 0xff000000) {
+				r_dds_format = DDS_BGRA8;
+			} else if (format_rgb_bits == 32 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000 && format_alpha_mask == 0xff000000) {
+				r_dds_format = DDS_RGBA8;
+			} else if (format_rgb_bits == 16 && format_red_mask == 0x00007c00 && format_green_mask == 0x000003e0 && format_blue_mask == 0x0000001f && format_alpha_mask == 0x00008000) {
+				r_dds_format = DDS_BGR5A1;
+			} else if (format_rgb_bits == 32 && format_red_mask == 0x3ff00000 && format_green_mask == 0xffc00 && format_blue_mask == 0x3ff && format_alpha_mask == 0xc0000000) {
+				r_dds_format = DDS_BGR10A2;
+			} else if (format_rgb_bits == 32 && format_red_mask == 0x3ff && format_green_mask == 0xffc00 && format_blue_mask == 0x3ff00000 && format_alpha_mask == 0xc0000000) {
+				r_dds_format = DDS_RGB10A2;
+			} else if (format_rgb_bits == 16 && format_red_mask == 0xf00 && format_green_mask == 0xf0 && format_blue_mask == 0xf && format_alpha_mask == 0xf000) {
+				r_dds_format = DDS_BGRA4;
+			} else if (format_rgb_bits == 16 && format_red_mask == 0xe0 && format_green_mask == 0x1c && format_blue_mask == 0x3 && format_alpha_mask == 0xff00) {
+				r_dds_format = DDS_B2GR3A8;
+			}
+
+		} else {
+			// Without alpha.
+			if (format_rgb_bits == 24 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff) {
+				r_dds_format = DDS_BGR8;
+			} else if (format_rgb_bits == 24 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000) {
+				r_dds_format = DDS_RGB8;
+			} else if (format_rgb_bits == 16 && format_red_mask == 0x0000f800 && format_green_mask == 0x000007e0 && format_blue_mask == 0x0000001f) {
+				r_dds_format = DDS_BGR565;
+			} else if (format_rgb_bits == 8 && format_red_mask == 0xe0 && format_green_mask == 0x1c && format_blue_mask == 0x3) {
+				r_dds_format = DDS_B2GR3;
+			}
+		}
+
+	} else {
+		// Other formats.
+		if (format_flags & DDPF_ALPHAONLY && format_rgb_bits == 8 && format_alpha_mask == 0xff) {
+			// Alpha only.
+			r_dds_format = DDS_LUMINANCE;
+		}
+	}
+
+	// Depending on the writer, luminance formats may or may not have the DDPF_RGB or DDPF_LUMINANCE flags defined,
+	// so we check for these formats after everything else failed.
+	if (r_dds_format == DDS_MAX) {
+		if (format_flags & DDPF_ALPHAPIXELS) {
+			// With alpha.
+			if (format_rgb_bits == 16 && format_red_mask == 0xff && format_alpha_mask == 0xff00) {
+				r_dds_format = DDS_LUMINANCE_ALPHA;
+			} else if (format_rgb_bits == 8 && format_red_mask == 0xf && format_alpha_mask == 0xf0) {
+				r_dds_format = DDS_LUMINANCE_ALPHA_4;
+			}
+
+		} else {
+			// Without alpha.
+			if (format_rgb_bits == 8 && format_red_mask == 0xff) {
+				r_dds_format = DDS_LUMINANCE;
+			}
+		}
+	}
+
+	// No format detected, error.
+	if (r_dds_format == DDS_MAX) {
+		ERR_FAIL_V_MSG(Vector<Ref<Image>>(), vformat("Unrecognized or unsupported color layout in DDS '%s'.", p_path));
+	}
+
+	if (!(r_flags & DDSD_MIPMAPCOUNT)) {
+		r_mipmaps = 1;
+	}
+
+	return _dds_load_images(p_f, r_dds_format, r_width, r_height, r_mipmaps, r_pitch, r_flags, r_layer_count);
+}
+
+static Ref<Resource> _dds_load_from_buffer(Ref<FileAccess> p_f, Error *r_error, const String &p_path = "") {
+	if (r_error) {
+		*r_error = ERR_FILE_CORRUPT;
+	}
+
+	DDSFormat dds_format;
+	uint32_t width = 0, height = 0, mipmaps = 0, pitch = 0, flags = 0, layer_count = 0, dds_type = 0;
+
+	Vector<Ref<Image>> images = _dds_load_images_from_buffer(p_f, dds_format, width, height, mipmaps, pitch, flags, layer_count, dds_type, p_path);
+	return _dds_create_texture_from_images(images, dds_format, width, height, mipmaps, pitch, flags, layer_count, dds_type, r_error);
+}
+
+static Ref<Resource> _dds_load_from_file(const String &p_path, Error *r_error) {
 	if (r_error) {
 		*r_error = ERR_CANT_OPEN;
 	}
@@ -554,268 +684,11 @@ Ref<Resource> ResourceFormatDDS::load(const String &p_path, const String &p_orig
 		return Ref<Resource>();
 	}
 
-	Ref<FileAccess> fref(f);
-	if (r_error) {
-		*r_error = ERR_FILE_CORRUPT;
-	}
+	return _dds_load_from_buffer(f, r_error, p_path);
+}
 
-	ERR_FAIL_COND_V_MSG(err != OK, Ref<Resource>(), vformat("Unable to open DDS texture file '%s'.", p_path));
-
-	uint32_t magic = f->get_32();
-	uint32_t hsize = f->get_32();
-	uint32_t flags = f->get_32();
-	uint32_t height = f->get_32();
-	uint32_t width = f->get_32();
-	uint32_t pitch = f->get_32();
-	uint32_t depth = f->get_32();
-	uint32_t mipmaps = f->get_32();
-
-	// Skip reserved.
-	for (int i = 0; i < 11; i++) {
-		f->get_32();
-	}
-
-	// Validate.
-	// We don't check DDSD_CAPS or DDSD_PIXELFORMAT, as they're mandatory when writing,
-	// but non-mandatory when reading (as some writers don't set them).
-	if (magic != DDS_MAGIC || hsize != 124) {
-		ERR_FAIL_V_MSG(Ref<Resource>(), vformat("Invalid or unsupported DDS texture file '%s'.", p_path));
-	}
-
-	/* uint32_t format_size = */ f->get_32();
-	uint32_t format_flags = f->get_32();
-	uint32_t format_fourcc = f->get_32();
-	uint32_t format_rgb_bits = f->get_32();
-	uint32_t format_red_mask = f->get_32();
-	uint32_t format_green_mask = f->get_32();
-	uint32_t format_blue_mask = f->get_32();
-	uint32_t format_alpha_mask = f->get_32();
-
-	/* uint32_t caps_1 = */ f->get_32();
-	uint32_t caps_2 = f->get_32();
-	/* uint32_t caps_3 = */ f->get_32();
-	/* uint32_t caps_4 = */ f->get_32();
-
-	// Skip reserved.
-	f->get_32();
-
-	if (f->get_position() < 128) {
-		f->seek(128);
-	}
-
-	uint32_t layer_count = 1;
-	uint32_t dds_type = DDST_2D;
-
-	if (caps_2 & DDSC2_CUBEMAP) {
-		dds_type = DDST_CUBEMAP;
-		layer_count *= 6;
-
-	} else if (caps_2 & DDSC2_VOLUME) {
-		dds_type = DDST_3D;
-		layer_count = depth;
-	}
-
-	DDSFormat dds_format = DDS_MAX;
-
-	if (format_flags & DDPF_FOURCC) {
-		// FourCC formats.
-		switch (format_fourcc) {
-			case DDFCC_DXT1: {
-				dds_format = DDS_DXT1;
-			} break;
-			case DDFCC_DXT2:
-			case DDFCC_DXT3: {
-				dds_format = DDS_DXT3;
-			} break;
-			case DDFCC_DXT4:
-			case DDFCC_DXT5: {
-				dds_format = DDS_DXT5;
-			} break;
-			case DDFCC_ATI1:
-			case DDFCC_BC4U: {
-				dds_format = DDS_ATI1;
-			} break;
-			case DDFCC_ATI2:
-			case DDFCC_BC5U:
-			case DDFCC_A2XY: {
-				dds_format = DDS_ATI2;
-			} break;
-			case DDFCC_R16F: {
-				dds_format = DDS_R16F;
-			} break;
-			case DDFCC_RG16F: {
-				dds_format = DDS_RG16F;
-			} break;
-			case DDFCC_RGBA16F: {
-				dds_format = DDS_RGBA16F;
-			} break;
-			case DDFCC_R32F: {
-				dds_format = DDS_R32F;
-			} break;
-			case DDFCC_RG32F: {
-				dds_format = DDS_RG32F;
-			} break;
-			case DDFCC_RGBA32F: {
-				dds_format = DDS_RGBA32F;
-			} break;
-			case DDFCC_DX10: {
-				uint32_t dxgi_format = f->get_32();
-				uint32_t dimension = f->get_32();
-				/* uint32_t misc_flags_1 = */ f->get_32();
-				uint32_t array_size = f->get_32();
-				/* uint32_t misc_flags_2 = */ f->get_32();
-
-				if (dimension == DX10D_3D) {
-					dds_type = DDST_3D;
-					layer_count = depth;
-				}
-
-				if (array_size > 1) {
-					layer_count *= array_size;
-					dds_type |= DDST_ARRAY;
-				}
-
-				dds_format = _dxgi_to_dds_format(dxgi_format);
-			} break;
-
-			default: {
-				ERR_FAIL_V_MSG(Ref<Resource>(), vformat("Unrecognized or unsupported FourCC in DDS '%s'.", p_path));
-			}
-		}
-
-	} else if (format_flags & DDPF_RGB) {
-		// Channel-bitmasked formats.
-		if (format_flags & DDPF_ALPHAPIXELS) {
-			// With alpha.
-			if (format_rgb_bits == 32 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff && format_alpha_mask == 0xff000000) {
-				dds_format = DDS_BGRA8;
-			} else if (format_rgb_bits == 32 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000 && format_alpha_mask == 0xff000000) {
-				dds_format = DDS_RGBA8;
-			} else if (format_rgb_bits == 16 && format_red_mask == 0x00007c00 && format_green_mask == 0x000003e0 && format_blue_mask == 0x0000001f && format_alpha_mask == 0x00008000) {
-				dds_format = DDS_BGR5A1;
-			} else if (format_rgb_bits == 32 && format_red_mask == 0x3ff00000 && format_green_mask == 0xffc00 && format_blue_mask == 0x3ff && format_alpha_mask == 0xc0000000) {
-				dds_format = DDS_BGR10A2;
-			} else if (format_rgb_bits == 32 && format_red_mask == 0x3ff && format_green_mask == 0xffc00 && format_blue_mask == 0x3ff00000 && format_alpha_mask == 0xc0000000) {
-				dds_format = DDS_RGB10A2;
-			} else if (format_rgb_bits == 16 && format_red_mask == 0xf00 && format_green_mask == 0xf0 && format_blue_mask == 0xf && format_alpha_mask == 0xf000) {
-				dds_format = DDS_BGRA4;
-			} else if (format_rgb_bits == 16 && format_red_mask == 0xe0 && format_green_mask == 0x1c && format_blue_mask == 0x3 && format_alpha_mask == 0xff00) {
-				dds_format = DDS_B2GR3A8;
-			}
-
-		} else {
-			// Without alpha.
-			if (format_rgb_bits == 24 && format_red_mask == 0xff0000 && format_green_mask == 0xff00 && format_blue_mask == 0xff) {
-				dds_format = DDS_BGR8;
-			} else if (format_rgb_bits == 24 && format_red_mask == 0xff && format_green_mask == 0xff00 && format_blue_mask == 0xff0000) {
-				dds_format = DDS_RGB8;
-			} else if (format_rgb_bits == 16 && format_red_mask == 0x0000f800 && format_green_mask == 0x000007e0 && format_blue_mask == 0x0000001f) {
-				dds_format = DDS_BGR565;
-			} else if (format_rgb_bits == 8 && format_red_mask == 0xe0 && format_green_mask == 0x1c && format_blue_mask == 0x3) {
-				dds_format = DDS_B2GR3;
-			}
-		}
-
-	} else {
-		// Other formats.
-		if (format_flags & DDPF_ALPHAONLY && format_rgb_bits == 8 && format_alpha_mask == 0xff) {
-			// Alpha only.
-			dds_format = DDS_LUMINANCE;
-		}
-	}
-
-	// Depending on the writer, luminance formats may or may not have the DDPF_RGB or DDPF_LUMINANCE flags defined,
-	// so we check for these formats after everything else failed.
-	if (dds_format == DDS_MAX) {
-		if (format_flags & DDPF_ALPHAPIXELS) {
-			// With alpha.
-			if (format_rgb_bits == 16 && format_red_mask == 0xff && format_alpha_mask == 0xff00) {
-				dds_format = DDS_LUMINANCE_ALPHA;
-			} else if (format_rgb_bits == 8 && format_red_mask == 0xf && format_alpha_mask == 0xf0) {
-				dds_format = DDS_LUMINANCE_ALPHA_4;
-			}
-
-		} else {
-			// Without alpha.
-			if (format_rgb_bits == 8 && format_red_mask == 0xff) {
-				dds_format = DDS_LUMINANCE;
-			}
-		}
-	}
-
-	// No format detected, error.
-	if (dds_format == DDS_MAX) {
-		ERR_FAIL_V_MSG(Ref<Resource>(), vformat("Unrecognized or unsupported color layout in DDS '%s'.", p_path));
-	}
-
-	if (!(flags & DDSD_MIPMAPCOUNT)) {
-		mipmaps = 1;
-	}
-
-	Vector<uint8_t> src_data;
-
-	Vector<Ref<Image>> images;
-	images.resize(layer_count);
-
-	for (uint32_t i = 0; i < layer_count; i++) {
-		images.write[i] = _dds_load_layer(f, dds_format, width, height, mipmaps, pitch, flags, src_data);
-	}
-
-	if ((dds_type & DDST_TYPE_MASK) == DDST_2D) {
-		if (dds_type & DDST_ARRAY) {
-			Ref<Texture2DArray> texture = memnew(Texture2DArray());
-			texture->create_from_images(images);
-
-			if (r_error) {
-				*r_error = OK;
-			}
-
-			return texture;
-
-		} else {
-			if (r_error) {
-				*r_error = OK;
-			}
-
-			return ImageTexture::create_from_image(images[0]);
-		}
-
-	} else if ((dds_type & DDST_TYPE_MASK) == DDST_CUBEMAP) {
-		ERR_FAIL_COND_V(layer_count % 6 != 0, Ref<Resource>());
-
-		if (dds_type & DDST_ARRAY) {
-			Ref<CubemapArray> texture = memnew(CubemapArray());
-			texture->create_from_images(images);
-
-			if (r_error) {
-				*r_error = OK;
-			}
-
-			return texture;
-
-		} else {
-			Ref<Cubemap> texture = memnew(Cubemap());
-			texture->create_from_images(images);
-
-			if (r_error) {
-				*r_error = OK;
-			}
-
-			return texture;
-		}
-
-	} else if ((dds_type & DDST_TYPE_MASK) == DDST_3D) {
-		Ref<ImageTexture3D> texture = memnew(ImageTexture3D());
-		texture->create(images[0]->get_format(), width, height, layer_count, mipmaps > 1, images);
-
-		if (r_error) {
-			*r_error = OK;
-		}
-
-		return texture;
-	}
-
-	return Ref<Resource>();
+Ref<Resource> ResourceFormatDDS::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress, CacheMode p_cache_mode) {
+	return _dds_load_from_file(p_path, r_error);
 }
 
 void ResourceFormatDDS::get_recognized_extensions(List<String> *p_extensions) const {
@@ -832,3 +705,24 @@ String ResourceFormatDDS::get_resource_type(const String &p_path) const {
 	}
 	return "";
 }
+
+Ref<Image> load_mem_dds(const uint8_t *p_dds, int p_size) {
+	ERR_FAIL_NULL_V(p_dds, Ref<Image>());
+	ERR_FAIL_COND_V(!p_size, Ref<Image>());
+	Ref<FileAccessMemory> memfile;
+	memfile.instantiate();
+	Error open_memfile_error = memfile->open_custom(p_dds, p_size);
+	ERR_FAIL_COND_V_MSG(open_memfile_error, Ref<Image>(), "Could not create memfile for DDS image buffer.");
+
+	DDSFormat dds_format;
+	uint32_t width, height, mipmaps, pitch, flags, layer_count, dds_type;
+
+	Vector<Ref<Image>> images = _dds_load_images_from_buffer(memfile, dds_format, width, height, mipmaps, pitch, flags, layer_count, dds_type);
+	ERR_FAIL_COND_V_MSG(images.is_empty(), Ref<Image>(), "Failed to load DDS image.");
+
+	return images[0];
+}
+
+ResourceFormatDDS::ResourceFormatDDS() {
+	Image::_dds_mem_loader_func = load_mem_dds;
+}
diff --git a/engine/modules/dds/texture_loader_dds.h b/engine/modules/dds/texture_loader_dds.h
index ce5b7f40..ff9234ad 100644
--- a/engine/modules/dds/texture_loader_dds.h
+++ b/engine/modules/dds/texture_loader_dds.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_LOADER_DDS_H
-#define TEXTURE_LOADER_DDS_H
+#pragma once
 
 #include "core/io/resource_loader.h"
 
@@ -40,7 +39,6 @@ public:
 	virtual bool handles_type(const String &p_type) const override;
 	virtual String get_resource_type(const String &p_path) const override;
 
+	ResourceFormatDDS();
 	virtual ~ResourceFormatDDS() {}
 };
-
-#endif // TEXTURE_LOADER_DDS_H
diff --git a/engine/modules/enet/SCsub b/engine/modules/enet/SCsub
index af64f2be..1855281d 100644
--- a/engine/modules/enet/SCsub
+++ b/engine/modules/enet/SCsub
@@ -24,7 +24,7 @@ if env["builtin_enet"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_enet.Prepend(CPPPATH=[thirdparty_dir])
+    env_enet.Prepend(CPPEXTPATH=[thirdparty_dir])
     env_enet.Append(CPPDEFINES=["GODOT_ENET"])
 
     env_thirdparty = env_enet.Clone()
diff --git a/engine/modules/enet/enet_connection.cpp b/engine/modules/enet/enet_connection.cpp
index f66f5867..db0faf2e 100644
--- a/engine/modules/enet/enet_connection.cpp
+++ b/engine/modules/enet/enet_connection.cpp
@@ -72,8 +72,8 @@ Error ENetConnection::create_host(int p_max_peers, int p_max_channels, int p_in_
 
 void ENetConnection::destroy() {
 	ERR_FAIL_NULL_MSG(host, "Host already destroyed.");
-	for (List<Ref<ENetPacketPeer>>::Element *E = peers.front(); E; E = E->next()) {
-		E->get()->_on_disconnect();
+	for (const Ref<ENetPacketPeer> &peer : peers) {
+		peer->_on_disconnect();
 	}
 	peers.clear();
 	enet_host_destroy(host);
@@ -320,14 +320,10 @@ Error ENetConnection::_create(ENetAddress *p_address, int p_max_peers, int p_max
 }
 
 Array ENetConnection::_service(int p_timeout) {
-	Array out;
 	Event event;
 	Ref<ENetPacketPeer> peer;
 	EventType ret = service(p_timeout, event);
-	out.push_back(ret);
-	out.push_back(event.peer);
-	out.push_back(event.data);
-	out.push_back(event.channel_id);
+	Array out = { ret, event.peer, event.data, event.channel_id };
 	if (event.packet && event.peer.is_valid()) {
 		event.peer->_queue_packet(event.packet);
 	}
diff --git a/engine/modules/enet/enet_connection.h b/engine/modules/enet/enet_connection.h
index 616402be..3375d11b 100644
--- a/engine/modules/enet/enet_connection.h
+++ b/engine/modules/enet/enet_connection.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENET_CONNECTION_H
-#define ENET_CONNECTION_H
+#pragma once
 
 #include "enet_packet_peer.h"
 
@@ -140,5 +139,3 @@ public:
 VARIANT_ENUM_CAST(ENetConnection::CompressionMode);
 VARIANT_ENUM_CAST(ENetConnection::EventType);
 VARIANT_ENUM_CAST(ENetConnection::HostStatistic);
-
-#endif // ENET_CONNECTION_H
diff --git a/engine/modules/enet/enet_multiplayer_peer.cpp b/engine/modules/enet/enet_multiplayer_peer.cpp
index 3a8f16a3..da41378b 100644
--- a/engine/modules/enet/enet_multiplayer_peer.cpp
+++ b/engine/modules/enet/enet_multiplayer_peer.cpp
@@ -334,7 +334,7 @@ Error ENetMultiplayerPeer::get_packet(const uint8_t **r_buffer, int &r_buffer_si
 Error ENetMultiplayerPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
 	ERR_FAIL_COND_V_MSG(!_is_active(), ERR_UNCONFIGURED, "The multiplayer instance isn't currently active.");
 	ERR_FAIL_COND_V_MSG(connection_status != CONNECTION_CONNECTED, ERR_UNCONFIGURED, "The multiplayer instance isn't currently connected to any server or client.");
-	ERR_FAIL_COND_V_MSG(target_peer != 0 && !peers.has(ABS(target_peer)), ERR_INVALID_PARAMETER, vformat("Invalid target peer: %d", target_peer));
+	ERR_FAIL_COND_V_MSG(target_peer != 0 && !peers.has(Math::abs(target_peer)), ERR_INVALID_PARAMETER, vformat("Invalid target peer: %d", target_peer));
 	ERR_FAIL_COND_V(active_mode == MODE_CLIENT && !peers.has(1), ERR_BUG);
 
 	int packet_flags = 0;
@@ -394,7 +394,7 @@ Error ENetMultiplayerPeer::put_packet(const uint8_t *p_buffer, int p_buffer_size
 
 	} else {
 		if (target_peer <= 0) {
-			int exclude = ABS(target_peer);
+			int exclude = Math::abs(target_peer);
 			for (KeyValue<int, Ref<ENetPacketPeer>> &E : peers) {
 				if (E.key == exclude) {
 					continue;
diff --git a/engine/modules/enet/enet_multiplayer_peer.h b/engine/modules/enet/enet_multiplayer_peer.h
index 930af2d8..e56df733 100644
--- a/engine/modules/enet/enet_multiplayer_peer.h
+++ b/engine/modules/enet/enet_multiplayer_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENET_MULTIPLAYER_PEER_H
-#define ENET_MULTIPLAYER_PEER_H
+#pragma once
 
 #include "enet_connection.h"
 
@@ -132,5 +131,3 @@ public:
 	ENetMultiplayerPeer();
 	~ENetMultiplayerPeer();
 };
-
-#endif // ENET_MULTIPLAYER_PEER_H
diff --git a/engine/modules/enet/enet_packet_peer.h b/engine/modules/enet/enet_packet_peer.h
index b41d67e8..cdc968cd 100644
--- a/engine/modules/enet/enet_packet_peer.h
+++ b/engine/modules/enet/enet_packet_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENET_PACKET_PEER_H
-#define ENET_PACKET_PEER_H
+#pragma once
 
 #include "core/io/packet_peer.h"
 
@@ -128,5 +127,3 @@ public:
 
 VARIANT_ENUM_CAST(ENetPacketPeer::PeerState);
 VARIANT_ENUM_CAST(ENetPacketPeer::PeerStatistic);
-
-#endif // ENET_PACKET_PEER_H
diff --git a/engine/modules/enet/register_types.h b/engine/modules/enet/register_types.h
index ae883fee..1e8d1e27 100644
--- a/engine/modules/enet/register_types.h
+++ b/engine/modules/enet/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENET_REGISTER_TYPES_H
-#define ENET_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_enet_module(ModuleInitializationLevel p_level);
 void uninitialize_enet_module(ModuleInitializationLevel p_level);
-
-#endif // ENET_REGISTER_TYPES_H
diff --git a/engine/modules/etcpak/SCsub b/engine/modules/etcpak/SCsub
index e6ecb2bc..0d8d7c4c 100644
--- a/engine/modules/etcpak/SCsub
+++ b/engine/modules/etcpak/SCsub
@@ -20,7 +20,7 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_etcpak.Prepend(CPPPATH=[thirdparty_dir])
+env_etcpak.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 env_thirdparty = env_etcpak.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/modules/etcpak/image_compress_etcpak.h b/engine/modules/etcpak/image_compress_etcpak.h
index 7599d2a5..eb57297b 100644
--- a/engine/modules/etcpak/image_compress_etcpak.h
+++ b/engine/modules/etcpak/image_compress_etcpak.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_COMPRESS_ETCPAK_H
-#define IMAGE_COMPRESS_ETCPAK_H
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
@@ -56,5 +55,3 @@ void _compress_bc(Image *r_img, Image::UsedChannels p_channels);
 void _compress_etcpak(EtcpakType p_compress_type, Image *r_img);
 
 #endif // TOOLS_ENABLED
-
-#endif // IMAGE_COMPRESS_ETCPAK_H
diff --git a/engine/modules/etcpak/image_decompress_etcpak.h b/engine/modules/etcpak/image_decompress_etcpak.h
index 15021476..0cbbf015 100644
--- a/engine/modules/etcpak/image_decompress_etcpak.h
+++ b/engine/modules/etcpak/image_decompress_etcpak.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_DECOMPRESS_ETCPAK_H
-#define IMAGE_DECOMPRESS_ETCPAK_H
+#pragma once
 
 #include "core/io/image.h"
 
@@ -41,5 +40,3 @@ enum EtcpakFormat {
 };
 
 void _decompress_etc(Image *p_image);
-
-#endif // IMAGE_DECOMPRESS_ETCPAK_H
diff --git a/engine/modules/etcpak/register_types.h b/engine/modules/etcpak/register_types.h
index 4967f3c3..24935070 100644
--- a/engine/modules/etcpak/register_types.h
+++ b/engine/modules/etcpak/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ETCPAK_REGISTER_TYPES_H
-#define ETCPAK_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_etcpak_module(ModuleInitializationLevel p_level);
 void uninitialize_etcpak_module(ModuleInitializationLevel p_level);
-
-#endif // ETCPAK_REGISTER_TYPES_H
diff --git a/engine/modules/fbx/SCsub b/engine/modules/fbx/SCsub
index 6f9fbba0..05a15c3b 100644
--- a/engine/modules/fbx/SCsub
+++ b/engine/modules/fbx/SCsub
@@ -13,7 +13,7 @@ thirdparty_obj = []
 thirdparty_dir = "#thirdparty/ufbx/"
 thirdparty_sources = [thirdparty_dir + "ufbx.c"]
 
-env_fbx.Prepend(CPPPATH=[thirdparty_dir])
+env_fbx.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 env_thirdparty = env_fbx.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp b/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp
index 3881fcdf..61747173 100644
--- a/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp
+++ b/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_scene_importer_fbx2gltf.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "core/config/project_settings.h"
 #include "editor/editor_settings.h"
 #include "editor_scene_importer_ufbx.h"
@@ -142,5 +140,3 @@ void EditorSceneFormatImporterFBX2GLTF::handle_compatibility_options(HashMap<Str
 		p_import_params["fbx/importer"] = EditorSceneFormatImporterUFBX::FBX_IMPORTER_UFBX;
 	}
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.h b/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.h
index 1b68ccfe..ae134343 100644
--- a/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.h
+++ b/engine/modules/fbx/editor/editor_scene_importer_fbx2gltf.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCENE_IMPORTER_FBX2GLTF_H
-#define EDITOR_SCENE_IMPORTER_FBX2GLTF_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "editor/import/3d/resource_importer_scene.h"
 
@@ -52,7 +49,3 @@ public:
 			const HashMap<StringName, Variant> &p_options) override;
 	virtual void handle_compatibility_options(HashMap<StringName, Variant> &p_import_params) const override;
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_SCENE_IMPORTER_FBX2GLTF_H
diff --git a/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp b/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp
index 9da03a50..e5381fc5 100644
--- a/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp
+++ b/engine/modules/fbx/editor/editor_scene_importer_ufbx.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_scene_importer_ufbx.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "../fbx_document.h"
 #include "editor_scene_importer_fbx2gltf.h"
 
@@ -104,5 +102,3 @@ void EditorSceneFormatImporterUFBX::handle_compatibility_options(HashMap<StringN
 		p_import_params["fbx/importer"] = EditorSceneFormatImporterUFBX::FBX_IMPORTER_FBX2GLTF;
 	}
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/fbx/editor/editor_scene_importer_ufbx.h b/engine/modules/fbx/editor/editor_scene_importer_ufbx.h
index f81b3a82..7a0cc7e2 100644
--- a/engine/modules/fbx/editor/editor_scene_importer_ufbx.h
+++ b/engine/modules/fbx/editor/editor_scene_importer_ufbx.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCENE_IMPORTER_UFBX_H
-#define EDITOR_SCENE_IMPORTER_UFBX_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "editor/import/3d/resource_importer_scene.h"
 
@@ -56,6 +53,3 @@ public:
 			const HashMap<StringName, Variant> &p_options) override;
 	virtual void handle_compatibility_options(HashMap<StringName, Variant> &p_import_params) const override;
 };
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_SCENE_IMPORTER_UFBX_H
diff --git a/engine/modules/fbx/fbx_document.cpp b/engine/modules/fbx/fbx_document.cpp
index d6c304d0..a9ee9b3c 100644
--- a/engine/modules/fbx/fbx_document.cpp
+++ b/engine/modules/fbx/fbx_document.cpp
@@ -251,18 +251,16 @@ static bool _thread_pool_init_fn(void *user, ufbx_thread_pool_context ctx, const
 	return true;
 }
 
-static bool _thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count) {
+static void _thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count) {
 	ThreadPoolFBX *pool = (ThreadPoolFBX *)user;
 	ThreadPoolFBX::Group &pool_group = pool->groups[group];
 	pool_group.start_index = start_index;
 	pool_group.task_id = pool->pool->add_native_group_task(_thread_pool_task, &pool_group, (int)count, -1, true, "ufbx");
-	return true;
 }
 
-static bool _thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index) {
+static void _thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index) {
 	ThreadPoolFBX *pool = (ThreadPoolFBX *)user;
 	pool->pool->wait_for_group_task_completion(pool->groups[group].task_id);
-	return true;
 }
 
 String FBXDocument::_gen_unique_name(HashSet<String> &unique_names, const String &p_name) {
@@ -1082,7 +1080,7 @@ Error FBXDocument::_parse_images(Ref<FBXState> p_state, const String &p_base_pat
 			}
 			// Fallback to loading as byte array.
 			data = FileAccess::get_file_as_bytes(path);
-			if (data.size() == 0) {
+			if (data.is_empty()) {
 				WARN_PRINT(vformat("FBX: Image index '%d' couldn't be loaded from path: %s because there was no data to load. Skipping it.", texture_i, path));
 				p_state->images.push_back(Ref<Texture2D>()); // Placeholder to keep count.
 				p_state->source_images.push_back(Ref<Image>());
@@ -1658,8 +1656,7 @@ void FBXDocument::_generate_scene_node(Ref<FBXState> p_state, const GLTFNodeInde
 	// Add the node we generated and set the owner to the scene root.
 	p_scene_parent->add_child(current_node, true);
 	if (current_node != p_scene_root) {
-		Array args;
-		args.append(p_scene_root);
+		Array args = { p_scene_root };
 		current_node->propagate_call(StringName("set_owner"), args);
 	}
 	current_node->set_transform(fbx_node->transform);
@@ -1746,8 +1743,7 @@ void FBXDocument::_generate_skeleton_bone_node(Ref<FBXState> p_state, const GLTF
 		// Add the node we generated and set the owner to the scene root.
 		p_scene_parent->add_child(current_node, true);
 		if (current_node != p_scene_root) {
-			Array args;
-			args.append(p_scene_root);
+			Array args = { p_scene_root };
 			current_node->propagate_call(StringName("set_owner"), args);
 		}
 		// Do not set transform here. Transform is already applied to our bone.
diff --git a/engine/modules/fbx/fbx_document.h b/engine/modules/fbx/fbx_document.h
index 96f19058..3e6240c4 100644
--- a/engine/modules/fbx/fbx_document.h
+++ b/engine/modules/fbx/fbx_document.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FBX_DOCUMENT_H
-#define FBX_DOCUMENT_H
+#pragma once
 
 #include "fbx_state.h"
 
@@ -99,5 +98,3 @@ public:
 			const GLTFAnimationIndex p_index, const bool p_trimming, const bool p_remove_immutable_tracks);
 	Error _parse(Ref<FBXState> p_state, String p_path, Ref<FileAccess> p_file);
 };
-
-#endif // FBX_DOCUMENT_H
diff --git a/engine/modules/fbx/fbx_state.h b/engine/modules/fbx/fbx_state.h
index e52f47e0..0472a076 100644
--- a/engine/modules/fbx/fbx_state.h
+++ b/engine/modules/fbx/fbx_state.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FBX_STATE_H
-#define FBX_STATE_H
+#pragma once
 
 #include "modules/gltf/gltf_defines.h"
 #include "modules/gltf/gltf_state.h"
@@ -65,5 +64,3 @@ public:
 	bool get_allow_geometry_helper_nodes();
 	void set_allow_geometry_helper_nodes(bool p_allow_geometry_helper_nodes);
 };
-
-#endif // FBX_STATE_H
diff --git a/engine/modules/fbx/register_types.cpp b/engine/modules/fbx/register_types.cpp
index d8c5b706..ba6a0b77 100644
--- a/engine/modules/fbx/register_types.cpp
+++ b/engine/modules/fbx/register_types.cpp
@@ -61,10 +61,6 @@ void initialize_fbx_module(ModuleInitializationLevel p_level) {
 
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
-		// Editor-specific API.
-		ClassDB::APIType prev_api = ClassDB::get_current_api();
-		ClassDB::set_current_api(ClassDB::API_EDITOR);
-
 		GDREGISTER_CLASS(EditorSceneFormatImporterUFBX);
 
 		GLOBAL_DEF_RST_BASIC("filesystem/import/fbx2gltf/enabled", true);
@@ -72,7 +68,6 @@ void initialize_fbx_module(ModuleInitializationLevel p_level) {
 		GLOBAL_DEF_RST("filesystem/import/fbx2gltf/enabled.android", false);
 		GLOBAL_DEF_RST("filesystem/import/fbx2gltf/enabled.web", false);
 
-		ClassDB::set_current_api(prev_api);
 		EditorNode::add_init_callback(_editor_init);
 	}
 #endif // TOOLS_ENABLED
diff --git a/engine/modules/fbx/register_types.h b/engine/modules/fbx/register_types.h
index e4050081..a5b4f83f 100644
--- a/engine/modules/fbx/register_types.h
+++ b/engine/modules/fbx/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FBX_REGISTER_TYPES_H
-#define FBX_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_fbx_module(ModuleInitializationLevel p_level);
 void uninitialize_fbx_module(ModuleInitializationLevel p_level);
-
-#endif // FBX_REGISTER_TYPES_H
diff --git a/engine/modules/freetype/SCsub b/engine/modules/freetype/SCsub
index dc46513a..0a52ef46 100644
--- a/engine/modules/freetype/SCsub
+++ b/engine/modules/freetype/SCsub
@@ -62,15 +62,15 @@ if env["builtin_freetype"]:
     if env["brotli"]:
         env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
 
-    env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"])
+    env_freetype.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
     # Also needed in main env for scene/
-    env.Prepend(CPPPATH=[thirdparty_dir + "/include"])
+    env.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
 
     env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"])
 
     # Also requires libpng headers
     if env["builtin_libpng"]:
-        env_freetype.Prepend(CPPPATH=["#thirdparty/libpng"])
+        env_freetype.Prepend(CPPEXTPATH=["#thirdparty/libpng"])
 
     sfnt = thirdparty_dir + "src/sfnt/sfnt.c"
     # Must be done after all CPPDEFINES are being set so we can copy them.
diff --git a/engine/modules/freetype/register_types.h b/engine/modules/freetype/register_types.h
index 8ed3995d..f2cd8b87 100644
--- a/engine/modules/freetype/register_types.h
+++ b/engine/modules/freetype/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FREETYPE_REGISTER_TYPES_H
-#define FREETYPE_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_freetype_module(ModuleInitializationLevel p_level);
 void uninitialize_freetype_module(ModuleInitializationLevel p_level);
-
-#endif // FREETYPE_REGISTER_TYPES_H
diff --git a/engine/modules/gdscript/doc_classes/@GDScript.xml b/engine/modules/gdscript/doc_classes/@GDScript.xml
index caed2a80..90fb91d0 100644
--- a/engine/modules/gdscript/doc_classes/@GDScript.xml
+++ b/engine/modules/gdscript/doc_classes/@GDScript.xml
@@ -107,7 +107,7 @@
 			<return type="Dictionary" />
 			<param index="0" name="instance" type="Object" />
 			<description>
-				Returns the passed [param instance] converted to a Dictionary. Can be useful for serializing.
+				Returns the passed [param instance] converted to a [Dictionary]. Can be useful for serializing.
 				[codeblock]
 				var foo = "bar"
 				func _ready():
@@ -133,7 +133,7 @@
 				- A constant from the [enum Variant.Type] enumeration, for example [constant TYPE_INT].
 				- An [Object]-derived class which exists in [ClassDB], for example [Node].
 				- A [Script] (you can use any class, including inner one).
-				Unlike the right operand of the [code]is[/code] operator, [param type] can be a non-constant value. The [code]is[/code] operator supports more features (such as typed arrays). Use the operator instead of this method if you do not need dynamic type checking.
+				Unlike the right operand of the [code]is[/code] operator, [param type] can be a non-constant value. The [code]is[/code] operator supports more features (such as typed arrays). Use the operator instead of this method if you do not need to check the type dynamically.
 				[b]Examples:[/b]
 				[codeblock]
 				print(is_instance_of(a, TYPE_INT))
diff --git a/engine/modules/gdscript/editor/gdscript_docgen.cpp b/engine/modules/gdscript/editor/gdscript_docgen.cpp
index 49be21fe..733de258 100644
--- a/engine/modules/gdscript/editor/gdscript_docgen.cpp
+++ b/engine/modules/gdscript/editor/gdscript_docgen.cpp
@@ -105,7 +105,7 @@ void GDScriptDocGen::_doctype_from_gdtype(const GDType &p_gdtype, String &r_type
 			return;
 		case GDType::SCRIPT:
 			if (p_gdtype.is_meta_type) {
-				r_type = p_gdtype.script_type.is_valid() ? p_gdtype.script_type->get_class() : Script::get_class_static();
+				r_type = p_gdtype.script_type.is_valid() ? p_gdtype.script_type->get_class_name() : Script::get_class_static();
 				return;
 			}
 			if (p_gdtype.script_type.is_valid()) {
@@ -216,15 +216,15 @@ String GDScriptDocGen::_docvalue_from_variant(const Variant &p_variant, int p_re
 			} else {
 				result += "{";
 
-				List<Variant> keys;
-				dict.get_key_list(&keys);
+				LocalVector<Variant> keys = dict.get_key_list();
 				keys.sort_custom<StringLikeVariantOrder>();
 
-				for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
-					if (E->prev()) {
+				for (uint32_t i = 0; i < keys.size(); i++) {
+					const Variant &key = keys[i];
+					if (i > 0) {
 						result += ", ";
 					}
-					result += _docvalue_from_variant(E->get(), p_recursion_level + 1) + ": " + _docvalue_from_variant(dict[E->get()], p_recursion_level + 1);
+					result += _docvalue_from_variant(key, p_recursion_level + 1) + ": " + _docvalue_from_variant(dict[key], p_recursion_level + 1);
 				}
 
 				result += "}";
diff --git a/engine/modules/gdscript/editor/gdscript_docgen.h b/engine/modules/gdscript/editor/gdscript_docgen.h
index 6618043f..360906fe 100644
--- a/engine/modules/gdscript/editor/gdscript_docgen.h
+++ b/engine/modules/gdscript/editor/gdscript_docgen.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_DOCGEN_H
-#define GDSCRIPT_DOCGEN_H
+#pragma once
 
 #include "../gdscript_parser.h"
 
@@ -52,5 +51,3 @@ public:
 	static void doctype_from_gdtype(const GDType &p_gdtype, String &r_type, String &r_enum, bool p_is_return = false);
 	static String docvalue_from_expression(const GDP::ExpressionNode *p_expression);
 };
-
-#endif // GDSCRIPT_DOCGEN_H
diff --git a/engine/modules/gdscript/editor/gdscript_highlighter.cpp b/engine/modules/gdscript/editor/gdscript_highlighter.cpp
index 88e634f4..278e584a 100644
--- a/engine/modules/gdscript/editor/gdscript_highlighter.cpp
+++ b/engine/modules/gdscript/editor/gdscript_highlighter.cpp
@@ -150,6 +150,15 @@ Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_l
 								break;
 							}
 						}
+						// "#region" and "#endregion" only highlighted if they're the first region on the line.
+						if (color_regions[c].type == ColorRegion::TYPE_CODE_REGION) {
+							Vector<String> str_stripped_split = str.strip_edges().split_spaces(1);
+							if (!str_stripped_split.is_empty() &&
+									str_stripped_split[0] != "#region" &&
+									str_stripped_split[0] != "#endregion") {
+								match = false;
+							}
+						}
 						if (!match) {
 							continue;
 						}
@@ -777,8 +786,8 @@ void GDScriptSyntaxHighlighter::_update_cache() {
 	List<String> comments;
 	gdscript->get_comment_delimiters(&comments);
 	for (const String &comment : comments) {
-		String beg = comment.get_slice(" ", 0);
-		String end = comment.get_slice_count(" ") > 1 ? comment.get_slice(" ", 1) : String();
+		String beg = comment.get_slicec(' ', 0);
+		String end = comment.get_slice_count(" ") > 1 ? comment.get_slicec(' ', 1) : String();
 		add_color_region(ColorRegion::TYPE_COMMENT, beg, end, comment_color, end.is_empty());
 	}
 
@@ -787,8 +796,8 @@ void GDScriptSyntaxHighlighter::_update_cache() {
 	List<String> doc_comments;
 	gdscript->get_doc_comment_delimiters(&doc_comments);
 	for (const String &doc_comment : doc_comments) {
-		String beg = doc_comment.get_slice(" ", 0);
-		String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slice(" ", 1) : String();
+		String beg = doc_comment.get_slicec(' ', 0);
+		String end = doc_comment.get_slice_count(" ") > 1 ? doc_comment.get_slicec(' ', 1) : String();
 		add_color_region(ColorRegion::TYPE_COMMENT, beg, end, doc_comment_color, end.is_empty());
 	}
 
diff --git a/engine/modules/gdscript/editor/gdscript_highlighter.h b/engine/modules/gdscript/editor/gdscript_highlighter.h
index ec471956..e227f4de 100644
--- a/engine/modules/gdscript/editor/gdscript_highlighter.h
+++ b/engine/modules/gdscript/editor/gdscript_highlighter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_HIGHLIGHTER_H
-#define GDSCRIPT_HIGHLIGHTER_H
+#pragma once
 
 #include "editor/plugins/script_editor_plugin.h"
 
@@ -116,5 +115,3 @@ public:
 
 	virtual Ref<EditorSyntaxHighlighter> _create() const override;
 };
-
-#endif // GDSCRIPT_HIGHLIGHTER_H
diff --git a/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.h b/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.h
index 9882c1c2..cfa8faad 100644
--- a/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.h
+++ b/engine/modules/gdscript/editor/gdscript_translation_parser_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
-#define GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
+#pragma once
 
 #include "../gdscript_parser.h"
 #include "../gdscript_tokenizer.h"
@@ -82,5 +81,3 @@ public:
 
 	GDScriptEditorTranslationParserPlugin();
 };
-
-#endif // GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
diff --git a/engine/modules/gdscript/editor/script_templates/EditorPlugin/plugin.gd b/engine/modules/gdscript/editor/script_templates/EditorPlugin/plugin.gd
index 547943b9..8ed97868 100644
--- a/engine/modules/gdscript/editor/script_templates/EditorPlugin/plugin.gd
+++ b/engine/modules/gdscript/editor/script_templates/EditorPlugin/plugin.gd
@@ -4,6 +4,16 @@
 extends _BASE_
 
 
+func _enable_plugin() -> void:
+	# Add autoloads here.
+	pass
+
+
+func _disable_plugin() -> void:
+	# Remove autoloads here.
+	pass
+
+
 func _enter_tree() -> void:
 	# Initialization of the plugin goes here.
 	pass
diff --git a/engine/modules/gdscript/gdscript.cpp b/engine/modules/gdscript/gdscript.cpp
index 8ff0c63b..f2273d7e 100644
--- a/engine/modules/gdscript/gdscript.cpp
+++ b/engine/modules/gdscript/gdscript.cpp
@@ -59,8 +59,6 @@
 #include "editor/editor_paths.h"
 #endif
 
-#include <stdint.h>
-
 ///////////////////////////
 
 GDScriptNativeClass::GDScriptNativeClass(const StringName &p_name) {
@@ -1123,7 +1121,7 @@ Error GDScript::load_source_code(const String &p_path) {
 	w[len] = 0;
 
 	String s;
-	if (s.parse_utf8((const char *)w, len) != OK) {
+	if (s.append_utf8((const char *)w, len) != OK) {
 		ERR_FAIL_V_MSG(ERR_INVALID_DATA, "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
 	}
 
@@ -1625,6 +1623,27 @@ void GDScript::clear(ClearData *p_clear_data) {
 	}
 }
 
+void GDScript::cancel_pending_functions(bool warn) {
+	MutexLock lock(GDScriptLanguage::get_singleton()->mutex);
+
+	while (SelfList<GDScriptFunctionState> *E = pending_func_states.first()) {
+		// Order matters since clearing the stack may already cause
+		// the GDScriptFunctionState to be destroyed and thus removed from the list.
+		pending_func_states.remove(E);
+		GDScriptFunctionState *state = E->self();
+#ifdef DEBUG_ENABLED
+		if (warn) {
+			WARN_PRINT("Canceling suspended execution of \"" + state->get_readable_function() + "\" due to a script reload.");
+		}
+#endif
+		ObjectID state_id = state->get_instance_id();
+		state->_clear_connections();
+		if (ObjectDB::get_instance(state_id)) {
+			state->_clear_stack();
+		}
+	}
+}
+
 GDScript::~GDScript() {
 	if (destructing) {
 		return;
@@ -1640,21 +1659,7 @@ GDScript::~GDScript() {
 
 	clear();
 
-	{
-		MutexLock lock(GDScriptLanguage::get_singleton()->mutex);
-
-		while (SelfList<GDScriptFunctionState> *E = pending_func_states.first()) {
-			// Order matters since clearing the stack may already cause
-			// the GDScriptFunctionState to be destroyed and thus removed from the list.
-			pending_func_states.remove(E);
-			GDScriptFunctionState *state = E->self();
-			ObjectID state_id = state->get_instance_id();
-			state->_clear_connections();
-			if (ObjectDB::get_instance(state_id)) {
-				state->_clear_stack();
-			}
-		}
-	}
+	cancel_pending_functions(false);
 
 	{
 		MutexLock lock(GDScriptLanguage::get_singleton()->mutex);
@@ -2249,10 +2254,10 @@ void GDScriptLanguage::init() {
 		_add_global(StaticCString::create(CoreConstants::get_global_constant_name(i)), CoreConstants::get_global_constant_value(i));
 	}
 
-	_add_global(StaticCString::create("PI"), Math_PI);
-	_add_global(StaticCString::create("TAU"), Math_TAU);
-	_add_global(StaticCString::create("INF"), INFINITY);
-	_add_global(StaticCString::create("NAN"), NAN);
+	_add_global(StaticCString::create("PI"), Math::PI);
+	_add_global(StaticCString::create("TAU"), Math::TAU);
+	_add_global(StaticCString::create("INF"), Math::INF);
+	_add_global(StaticCString::create("NAN"), Math::NaN);
 
 	//populate native classes
 
@@ -2699,8 +2704,7 @@ void GDScriptLanguage::reload_scripts(const Array &p_scripts, bool p_soft_reload
 }
 
 void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) {
-	Array scripts;
-	scripts.push_back(p_script);
+	Array scripts = { p_script };
 	reload_scripts(scripts, p_soft_reload);
 }
 
@@ -2849,7 +2853,7 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b
 		while (subclass) {
 			if (subclass->extends_used) {
 				if (!subclass->extends_path.is_empty()) {
-					if (subclass->extends.size() == 0) {
+					if (subclass->extends.is_empty()) {
 						get_global_class_name(subclass->extends_path, r_base_type);
 						subclass = nullptr;
 						break;
@@ -3066,6 +3070,62 @@ void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<S
 	}
 }
 
+void ResourceFormatLoaderGDScript::get_classes_used(const String &p_path, HashSet<StringName> *r_classes) {
+	Ref<GDScript> scr = ResourceLoader::load(p_path);
+	if (scr.is_null()) {
+		return;
+	}
+
+	const String source = scr->get_source_code();
+	GDScriptTokenizerText tokenizer;
+	tokenizer.set_source_code(source);
+	GDScriptTokenizer::Token current = tokenizer.scan();
+	while (current.type != GDScriptTokenizer::Token::TK_EOF) {
+		if (!current.is_identifier()) {
+			current = tokenizer.scan();
+			continue;
+		}
+
+		int insert_idx = 0;
+		for (int i = 0; i < current.start_line - 1; i++) {
+			insert_idx = source.find("\n", insert_idx) + 1;
+		}
+		// Insert the "cursor" character, needed for the lookup to work.
+		const String source_with_cursor = source.insert(insert_idx + current.start_column, String::chr(0xFFFF));
+
+		ScriptLanguage::LookupResult result;
+		if (scr->get_language()->lookup_code(source_with_cursor, current.get_identifier(), p_path, nullptr, result) == OK) {
+			if (!result.class_name.is_empty() && ClassDB::class_exists(result.class_name)) {
+				r_classes->insert(result.class_name);
+			}
+
+			if (result.type == ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY) {
+				PropertyInfo prop;
+				if (ClassDB::get_property_info(result.class_name, result.class_member, &prop)) {
+					if (!prop.class_name.is_empty() && ClassDB::class_exists(prop.class_name)) {
+						r_classes->insert(prop.class_name);
+					}
+					if (!prop.hint_string.is_empty() && ClassDB::class_exists(prop.hint_string)) {
+						r_classes->insert(prop.hint_string);
+					}
+				}
+			} else if (result.type == ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD) {
+				MethodInfo met;
+				if (ClassDB::get_method_info(result.class_name, result.class_member, &met)) {
+					if (!met.return_val.class_name.is_empty() && ClassDB::class_exists(met.return_val.class_name)) {
+						r_classes->insert(met.return_val.class_name);
+					}
+					if (!met.return_val.hint_string.is_empty() && ClassDB::class_exists(met.return_val.hint_string)) {
+						r_classes->insert(met.return_val.hint_string);
+					}
+				}
+			}
+		}
+
+		current = tokenizer.scan();
+	}
+}
+
 Error ResourceFormatSaverGDScript::save(const Ref<Resource> &p_resource, const String &p_path, uint32_t p_flags) {
 	Ref<GDScript> sqscr = p_resource;
 	ERR_FAIL_COND_V(sqscr.is_null(), ERR_INVALID_PARAMETER);
diff --git a/engine/modules/gdscript/gdscript.h b/engine/modules/gdscript/gdscript.h
index fa141d65..0f2b1c07 100644
--- a/engine/modules/gdscript/gdscript.h
+++ b/engine/modules/gdscript/gdscript.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_H
-#define GDSCRIPT_H
+#pragma once
 
 #include "gdscript_function.h"
 
@@ -244,6 +243,9 @@ public:
 
 	void clear(GDScript::ClearData *p_clear_data = nullptr);
 
+	// Cancels all functions of the script that are are waiting to be resumed after using await.
+	void cancel_pending_functions(bool warn);
+
 	virtual bool is_valid() const override { return valid; }
 	virtual bool is_abstract() const override { return false; } // GDScript does not support abstract classes.
 
@@ -655,6 +657,7 @@ public:
 	virtual bool handles_type(const String &p_type) const override;
 	virtual String get_resource_type(const String &p_path) const override;
 	virtual void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false) override;
+	virtual void get_classes_used(const String &p_path, HashSet<StringName> *r_classes) override;
 };
 
 class ResourceFormatSaverGDScript : public ResourceFormatSaver {
@@ -663,5 +666,3 @@ public:
 	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
 	virtual bool recognize(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // GDSCRIPT_H
diff --git a/engine/modules/gdscript/gdscript_analyzer.cpp b/engine/modules/gdscript/gdscript_analyzer.cpp
index 99fab724..7c5c6291 100644
--- a/engine/modules/gdscript/gdscript_analyzer.cpp
+++ b/engine/modules/gdscript/gdscript_analyzer.cpp
@@ -1640,13 +1640,12 @@ void GDScriptAnalyzer::resolve_annotation(GDScriptParser::AnnotationNode *p_anno
 
 	const MethodInfo &annotation_info = parser->valid_annotations[p_annotation->name].info;
 
-	const List<PropertyInfo>::Element *E = annotation_info.arguments.front();
-	for (int i = 0; i < p_annotation->arguments.size(); i++) {
+	for (int64_t i = 0, j = 0; i < p_annotation->arguments.size(); i++) {
 		GDScriptParser::ExpressionNode *argument = p_annotation->arguments[i];
-		const PropertyInfo &argument_info = E->get();
+		const PropertyInfo &argument_info = annotation_info.arguments[j];
 
-		if (E->next() != nullptr) {
-			E = E->next();
+		if (j + 1 < annotation_info.arguments.size()) {
+			++j;
 		}
 
 		reduce_expression(argument);
@@ -1715,6 +1714,12 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
 		static_context = p_function->is_static;
 	}
 
+	MethodInfo method_info;
+	method_info.name = function_name;
+	if (p_function->is_static) {
+		method_info.flags |= MethodFlags::METHOD_FLAG_STATIC;
+	}
+
 	GDScriptParser::DataType prev_datatype = p_function->get_datatype();
 
 	GDScriptParser::DataType resolving_datatype;
@@ -1734,6 +1739,7 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
 
 	for (int i = 0; i < p_function->parameters.size(); i++) {
 		resolve_parameter(p_function->parameters[i]);
+		method_info.arguments.push_back(p_function->parameters[i]->get_datatype().to_property_info(p_function->parameters[i]->identifier->name));
 #ifdef DEBUG_ENABLED
 		if (p_function->parameters[i]->usages == 0 && !String(p_function->parameters[i]->identifier->name).begins_with("_")) {
 			parser->push_warning(p_function->parameters[i]->identifier, GDScriptWarning::UNUSED_PARAMETER, function_visible_name, p_function->parameters[i]->identifier->name);
@@ -1797,7 +1803,7 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
 		GDScriptParser::DataType parent_return_type;
 		List<GDScriptParser::DataType> parameters_types;
 		int default_par_count = 0;
-		BitField<MethodFlags> method_flags;
+		BitField<MethodFlags> method_flags = {};
 		StringName native_base;
 		if (!p_is_lambda && get_function_signature(p_function, false, base_type, function_name, parent_return_type, parameters_types, default_par_count, method_flags, &native_base)) {
 			bool valid = p_function->is_static == method_flags.has_flag(METHOD_FLAG_STATIC);
@@ -1884,6 +1890,10 @@ void GDScriptAnalyzer::resolve_function_signature(GDScriptParser::FunctionNode *
 	}
 #endif
 
+	method_info.default_arguments.append_array(p_function->default_arg_values);
+	method_info.return_val = p_function->get_datatype().to_property_info("");
+	p_function->info = method_info;
+
 	if (p_function->get_datatype().is_resolving()) {
 		p_function->set_datatype(prev_datatype);
 	}
@@ -2158,7 +2168,7 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
 			GDScriptParser::IdentifierNode *callee = static_cast<GDScriptParser::IdentifierNode *>(call->callee);
 			if (callee->name == "range") {
 				list_resolved = true;
-				if (call->arguments.size() < 1) {
+				if (call->arguments.is_empty()) {
 					push_error(R"*(Invalid call for "range()" function. Expected at least 1 argument, none given.)*", call->callee);
 				} else if (call->arguments.size() > 3) {
 					push_error(vformat(R"*(Invalid call for "range()" function. Expected at most 3 arguments, %d given.)*", call->arguments.size()), call->callee);
@@ -2266,7 +2276,7 @@ void GDScriptAnalyzer::resolve_for(GDScriptParser::ForNode *p_for) {
 			GDScriptParser::DataType return_type;
 			List<GDScriptParser::DataType> par_types;
 			int default_arg_count = 0;
-			BitField<MethodFlags> method_flags;
+			BitField<MethodFlags> method_flags = {};
 			if (get_function_signature(p_for->list, false, list_type, CoreStringName(_iter_get), return_type, par_types, default_arg_count, method_flags)) {
 				variable_type = return_type;
 				variable_type.type_source = list_type.type_source;
@@ -3323,28 +3333,24 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
 
 					bool types_match = true;
 
-					{
-						List<PropertyInfo>::ConstIterator arg_itr = info.arguments.begin();
-						for (int i = 0; i < p_call->arguments.size(); ++arg_itr, ++i) {
-							GDScriptParser::DataType par_type = type_from_property(*arg_itr, true);
-							GDScriptParser::DataType arg_type = p_call->arguments[i]->get_datatype();
-							if (!is_type_compatible(par_type, arg_type, true)) {
-								types_match = false;
-								break;
+					for (int64_t i = 0; i < p_call->arguments.size(); ++i) {
+						GDScriptParser::DataType par_type = type_from_property(info.arguments[i], true);
+						GDScriptParser::DataType arg_type = p_call->arguments[i]->get_datatype();
+						if (!is_type_compatible(par_type, arg_type, true)) {
+							types_match = false;
+							break;
 #ifdef DEBUG_ENABLED
-							} else {
-								if (par_type.builtin_type == Variant::INT && arg_type.builtin_type == Variant::FLOAT && builtin_type != Variant::INT) {
-									parser->push_warning(p_call, GDScriptWarning::NARROWING_CONVERSION, function_name);
-								}
-#endif
+						} else {
+							if (par_type.builtin_type == Variant::INT && arg_type.builtin_type == Variant::FLOAT && builtin_type != Variant::INT) {
+								parser->push_warning(p_call, GDScriptWarning::NARROWING_CONVERSION, function_name);
 							}
+#endif
 						}
 					}
 
 					if (types_match) {
-						List<PropertyInfo>::ConstIterator arg_itr = info.arguments.begin();
-						for (int i = 0; i < p_call->arguments.size(); ++arg_itr, ++i) {
-							GDScriptParser::DataType par_type = type_from_property(*arg_itr, true);
+						for (int64_t i = 0; i < p_call->arguments.size(); ++i) {
+							GDScriptParser::DataType par_type = type_from_property(info.arguments[i], true);
 							if (p_call->arguments[i]->is_constant) {
 								update_const_expression_builtin_type(p_call->arguments[i], par_type, "pass");
 							}
@@ -3561,7 +3567,7 @@ void GDScriptAnalyzer::reduce_call(GDScriptParser::CallNode *p_call, bool p_is_a
 	}
 
 	int default_arg_count = 0;
-	BitField<MethodFlags> method_flags;
+	BitField<MethodFlags> method_flags = {};
 	GDScriptParser::DataType return_type;
 	List<GDScriptParser::DataType> par_types;
 
@@ -5574,7 +5580,7 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_property(const PropertyInfo
 			result.set_container_element_type(0, elem_type);
 		} else if (p_property.type == Variant::DICTIONARY && p_property.hint == PROPERTY_HINT_DICTIONARY_TYPE) {
 			// Check element type.
-			StringName key_elem_type_name = p_property.hint_string.get_slice(";", 0);
+			StringName key_elem_type_name = p_property.hint_string.get_slicec(';', 0);
 			GDScriptParser::DataType key_elem_type;
 			key_elem_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
 
@@ -5599,7 +5605,7 @@ GDScriptParser::DataType GDScriptAnalyzer::type_from_property(const PropertyInfo
 			}
 			key_elem_type.is_constant = false;
 
-			StringName value_elem_type_name = p_property.hint_string.get_slice(";", 1);
+			StringName value_elem_type_name = p_property.hint_string.get_slicec(';', 1);
 			GDScriptParser::DataType value_elem_type;
 			value_elem_type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
 
diff --git a/engine/modules/gdscript/gdscript_analyzer.h b/engine/modules/gdscript/gdscript_analyzer.h
index 6acc3410..2a90e65c 100644
--- a/engine/modules/gdscript/gdscript_analyzer.h
+++ b/engine/modules/gdscript/gdscript_analyzer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_ANALYZER_H
-#define GDSCRIPT_ANALYZER_H
+#pragma once
 
 #include "gdscript_cache.h"
 #include "gdscript_parser.h"
@@ -167,5 +166,3 @@ public:
 
 	GDScriptAnalyzer(GDScriptParser *p_parser);
 };
-
-#endif // GDSCRIPT_ANALYZER_H
diff --git a/engine/modules/gdscript/gdscript_byte_codegen.h b/engine/modules/gdscript/gdscript_byte_codegen.h
index 6303db71..11c84d06 100644
--- a/engine/modules/gdscript/gdscript_byte_codegen.h
+++ b/engine/modules/gdscript/gdscript_byte_codegen.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_BYTE_CODEGEN_H
-#define GDSCRIPT_BYTE_CODEGEN_H
+#pragma once
 
 #include "gdscript_codegen.h"
 #include "gdscript_function.h"
@@ -552,5 +551,3 @@ public:
 
 	virtual ~GDScriptByteCodeGenerator();
 };
-
-#endif // GDSCRIPT_BYTE_CODEGEN_H
diff --git a/engine/modules/gdscript/gdscript_cache.cpp b/engine/modules/gdscript/gdscript_cache.cpp
index 90af67cc..3e11c006 100644
--- a/engine/modules/gdscript/gdscript_cache.cpp
+++ b/engine/modules/gdscript/gdscript_cache.cpp
@@ -189,7 +189,7 @@ void GDScriptCache::remove_script(const String &p_path) {
 
 	if (HashMap<String, Vector<ObjectID>>::Iterator E = singleton->abandoned_parser_map.find(p_path)) {
 		for (ObjectID parser_ref_id : E->value) {
-			Ref<GDScriptParserRef> parser_ref{ ObjectDB::get_instance(parser_ref_id) };
+			Ref<GDScriptParserRef> parser_ref = { ObjectDB::get_instance(parser_ref_id) };
 			if (parser_ref.is_valid()) {
 				parser_ref->clear();
 			}
@@ -275,7 +275,7 @@ String GDScriptCache::get_source_code(const String &p_path) {
 	source_file.write[len] = 0;
 
 	String source;
-	if (source.parse_utf8((const char *)source_file.ptr(), len) != OK) {
+	if (source.append_utf8((const char *)source_file.ptr(), len) != OK) {
 		ERR_FAIL_V_MSG("", "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
 	}
 	return source;
@@ -460,7 +460,7 @@ void GDScriptCache::clear() {
 
 	for (const KeyValue<String, Vector<ObjectID>> &KV : singleton->abandoned_parser_map) {
 		for (ObjectID parser_ref_id : KV.value) {
-			Ref<GDScriptParserRef> parser_ref{ ObjectDB::get_instance(parser_ref_id) };
+			Ref<GDScriptParserRef> parser_ref = { ObjectDB::get_instance(parser_ref_id) };
 			if (parser_ref.is_valid()) {
 				parser_ref->clear();
 			}
@@ -485,6 +485,7 @@ void GDScriptCache::clear() {
 	parser_map_refs.clear();
 	singleton->shallow_gdscript_cache.clear();
 	singleton->full_gdscript_cache.clear();
+	singleton->static_gdscript_cache.clear();
 }
 
 GDScriptCache::GDScriptCache() {
diff --git a/engine/modules/gdscript/gdscript_cache.h b/engine/modules/gdscript/gdscript_cache.h
index 4903da92..3930bfeb 100644
--- a/engine/modules/gdscript/gdscript_cache.h
+++ b/engine/modules/gdscript/gdscript_cache.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_CACHE_H
-#define GDSCRIPT_CACHE_H
+#pragma once
 
 #include "gdscript.h"
 
@@ -42,6 +41,8 @@ class GDScriptAnalyzer;
 class GDScriptParser;
 
 class GDScriptParserRef : public RefCounted {
+	GDSOFTCLASS(GDScriptParserRef, RefCounted);
+
 public:
 	enum Status {
 		EMPTY,
@@ -122,5 +123,3 @@ public:
 	GDScriptCache();
 	~GDScriptCache();
 };
-
-#endif // GDSCRIPT_CACHE_H
diff --git a/engine/modules/gdscript/gdscript_codegen.h b/engine/modules/gdscript/gdscript_codegen.h
index f3c4acf1..831daa5a 100644
--- a/engine/modules/gdscript/gdscript_codegen.h
+++ b/engine/modules/gdscript/gdscript_codegen.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_CODEGEN_H
-#define GDSCRIPT_CODEGEN_H
+#pragma once
 
 #include "gdscript_function.h"
 #include "gdscript_utility_functions.h"
@@ -165,5 +164,3 @@ public:
 
 	virtual ~GDScriptCodeGenerator() {}
 };
-
-#endif // GDSCRIPT_CODEGEN_H
diff --git a/engine/modules/gdscript/gdscript_compiler.cpp b/engine/modules/gdscript/gdscript_compiler.cpp
index e52486e2..4e7c5ce3 100644
--- a/engine/modules/gdscript/gdscript_compiler.cpp
+++ b/engine/modules/gdscript/gdscript_compiler.cpp
@@ -129,7 +129,7 @@ GDScriptDataType GDScriptCompiler::_gdtype_from_datatype(const GDScriptParser::D
 			if (p_handle_metatype && p_datatype.is_meta_type) {
 				result.kind = GDScriptDataType::NATIVE;
 				result.builtin_type = Variant::OBJECT;
-				result.native_type = p_datatype.script_type.is_valid() ? p_datatype.script_type->get_class() : Script::get_class_static();
+				result.native_type = p_datatype.script_type.is_valid() ? p_datatype.script_type->get_class_name() : Script::get_class_static();
 				break;
 			}
 
@@ -243,9 +243,8 @@ static bool _can_use_validate_call(const MethodBind *p_method, const Vector<GDSc
 	}
 	MethodInfo info;
 	ClassDB::get_method_info(p_method->get_instance_class(), p_method->get_name(), &info);
-	int i = 0;
-	for (List<PropertyInfo>::ConstIterator itr = info.arguments.begin(); itr != info.arguments.end(); ++itr, ++i) {
-		if (!_is_exact_type(*itr, p_arguments[i].type)) {
+	for (int64_t i = 0; i < info.arguments.size(); ++i) {
+		if (!_is_exact_type(info.arguments[i], p_arguments[i].type)) {
 			return false;
 		}
 	}
@@ -2660,6 +2659,8 @@ Error GDScriptCompiler::_prepare_compilation(GDScript *p_script, const GDScriptP
 
 	p_script->clearing = true;
 
+	p_script->cancel_pending_functions(true);
+
 	p_script->native = Ref<GDScriptNativeClass>();
 	p_script->base = Ref<GDScript>();
 	p_script->_base = nullptr;
diff --git a/engine/modules/gdscript/gdscript_compiler.h b/engine/modules/gdscript/gdscript_compiler.h
index 45f0f9e1..c1e8a6a1 100644
--- a/engine/modules/gdscript/gdscript_compiler.h
+++ b/engine/modules/gdscript/gdscript_compiler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_COMPILER_H
-#define GDSCRIPT_COMPILER_H
+#pragma once
 
 #include "gdscript.h"
 #include "gdscript_codegen.h"
@@ -186,5 +185,3 @@ public:
 
 	GDScriptCompiler();
 };
-
-#endif // GDSCRIPT_COMPILER_H
diff --git a/engine/modules/gdscript/gdscript_editor.cpp b/engine/modules/gdscript/gdscript_editor.cpp
index 0e3fab3a..e5d66f2a 100644
--- a/engine/modules/gdscript/gdscript_editor.cpp
+++ b/engine/modules/gdscript/gdscript_editor.cpp
@@ -488,22 +488,22 @@ void GDScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const
 void GDScriptLanguage::get_public_constants(List<Pair<String, Variant>> *p_constants) const {
 	Pair<String, Variant> pi;
 	pi.first = "PI";
-	pi.second = Math_PI;
+	pi.second = Math::PI;
 	p_constants->push_back(pi);
 
 	Pair<String, Variant> tau;
 	tau.first = "TAU";
-	tau.second = Math_TAU;
+	tau.second = Math::TAU;
 	p_constants->push_back(tau);
 
 	Pair<String, Variant> infinity;
 	infinity.first = "INF";
-	infinity.second = INFINITY;
+	infinity.second = Math::INF;
 	p_constants->push_back(infinity);
 
 	Pair<String, Variant> nan;
 	nan.first = "NAN";
-	nan.second = NAN;
+	nan.second = Math::NaN;
 	p_constants->push_back(nan);
 }
 
@@ -530,9 +530,9 @@ String GDScriptLanguage::make_function(const String &p_class, const String &p_na
 			if (i > 0) {
 				s += ", ";
 			}
-			s += p_args[i].get_slice(":", 0);
+			s += p_args[i].get_slicec(':', 0);
 			if (th) {
-				String type = p_args[i].get_slice(":", 1);
+				String type = p_args[i].get_slicec(':', 1);
 				if (!type.is_empty()) {
 					s += ": " + type;
 				}
@@ -722,8 +722,8 @@ static String _get_visual_datatype(const PropertyInfo &p_info, bool p_is_arg, co
 	} else if (p_info.type == Variant::ARRAY && p_info.hint == PROPERTY_HINT_ARRAY_TYPE && !p_info.hint_string.is_empty()) {
 		return "Array[" + _trim_parent_class(p_info.hint_string, p_base_class) + "]";
 	} else if (p_info.type == Variant::DICTIONARY && p_info.hint == PROPERTY_HINT_DICTIONARY_TYPE && !p_info.hint_string.is_empty()) {
-		const String key = p_info.hint_string.get_slice(";", 0);
-		const String value = p_info.hint_string.get_slice(";", 1);
+		const String key = p_info.hint_string.get_slicec(';', 0);
+		const String value = p_info.hint_string.get_slicec(';', 1);
 		return "Dictionary[" + _trim_parent_class(key, p_base_class) + ", " + _trim_parent_class(value, p_base_class) + "]";
 	} else if (p_info.type == Variant::NIL) {
 		if (p_is_arg || (p_info.usage & PROPERTY_USAGE_NIL_IS_VARIANT)) {
@@ -921,8 +921,8 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
 		node.insert_text = node.display.quote(p_quote_style);
 		r_result.insert(node.display, node);
 
-		List<StringName> native_classes;
-		ClassDB::get_inheriters_from_class("Node", &native_classes);
+		LocalVector<StringName> native_classes;
+		ClassDB::get_inheriters_from_class("Node", native_classes);
 		for (const StringName &E : native_classes) {
 			if (!ClassDB::is_class_exposed(E)) {
 				continue;
@@ -1091,9 +1091,9 @@ static void _find_identifiers_in_suite(const GDScriptParser::SuiteNode *p_suite,
 	}
 }
 
-static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, bool p_types_only, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth);
+static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, bool p_types_only, bool p_add_braces, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth);
 
-static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class, bool p_only_functions, bool p_types_only, bool p_static, bool p_parent_only, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
+static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class, bool p_only_functions, bool p_types_only, bool p_static, bool p_parent_only, bool p_add_braces, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
 	ERR_FAIL_COND(p_recursion_depth > COMPLETION_RECURSION_LIMIT);
 
 	if (!p_parent_only) {
@@ -1147,12 +1147,14 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
 							continue;
 						}
 						option = ScriptLanguage::CodeCompletionOption(member.function->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION, location);
-						if (member.function->parameters.size() > 0 || (member.function->info.flags & METHOD_FLAG_VARARG)) {
-							option.insert_text += "(";
-							option.display += U"(\u2026)";
-						} else {
-							option.insert_text += "()";
-							option.display += "()";
+						if (p_add_braces) {
+							if (member.function->parameters.size() > 0 || (member.function->info.flags & METHOD_FLAG_VARARG)) {
+								option.insert_text += "(";
+								option.display += U"(\u2026)";
+							} else {
+								option.insert_text += "()";
+								option.display += "()";
+							}
 						}
 						break;
 					case GDScriptParser::ClassNode::Member::SIGNAL:
@@ -1183,25 +1185,27 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
 	base_type.type = p_class->base_type;
 	base_type.type.is_meta_type = p_static;
 
-	_find_identifiers_in_base(base_type, p_only_functions, p_types_only, r_result, p_recursion_depth + 1);
+	_find_identifiers_in_base(base_type, p_only_functions, p_types_only, p_add_braces, r_result, p_recursion_depth + 1);
 }
 
-static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, bool p_types_only, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
+static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, bool p_types_only, bool p_add_braces, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
 	ERR_FAIL_COND(p_recursion_depth > COMPLETION_RECURSION_LIMIT);
 
 	GDScriptParser::DataType base_type = p_base.type;
 
 	if (!p_types_only && base_type.is_meta_type && base_type.kind != GDScriptParser::DataType::BUILTIN && base_type.kind != GDScriptParser::DataType::ENUM) {
 		ScriptLanguage::CodeCompletionOption option("new", ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION, ScriptLanguage::LOCATION_LOCAL);
-		option.insert_text += "(";
-		option.display += U"(\u2026)";
+		if (p_add_braces) {
+			option.insert_text += "(";
+			option.display += U"(\u2026)";
+		}
 		r_result.insert(option.display, option);
 	}
 
 	while (!base_type.has_no_type()) {
 		switch (base_type.kind) {
 			case GDScriptParser::DataType::CLASS: {
-				_find_identifiers_in_class(base_type.class_type, p_only_functions, p_types_only, base_type.is_meta_type, false, r_result, p_recursion_depth);
+				_find_identifiers_in_class(base_type.class_type, p_only_functions, p_types_only, base_type.is_meta_type, false, p_add_braces, r_result, p_recursion_depth);
 				// This already finds all parent identifiers, so we are done.
 				base_type = GDScriptParser::DataType();
 			} break;
@@ -1252,12 +1256,14 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
 							}
 							int location = p_recursion_depth + _get_method_location(scr->get_class_name(), E.name);
 							ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION, location);
-							if (E.arguments.size() || (E.flags & METHOD_FLAG_VARARG)) {
-								option.insert_text += "(";
-								option.display += U"(\u2026)";
-							} else {
-								option.insert_text += "()";
-								option.display += "()";
+							if (p_add_braces) {
+								if (E.arguments.size() || (E.flags & METHOD_FLAG_VARARG)) {
+									option.insert_text += "(";
+									option.display += U"(\u2026)";
+								} else {
+									option.insert_text += "()";
+									option.display += "()";
+								}
 							}
 							r_result.insert(option.display, option);
 						}
@@ -1340,12 +1346,14 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
 					}
 					int location = p_recursion_depth + _get_method_location(type, E.name);
 					ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION, location);
-					if (E.arguments.size() || (E.flags & METHOD_FLAG_VARARG)) {
-						option.insert_text += "(";
-						option.display += U"(\u2026)";
-					} else {
-						option.insert_text += "()";
-						option.display += "()";
+					if (p_add_braces) {
+						if (E.arguments.size() || (E.flags & METHOD_FLAG_VARARG)) {
+							option.insert_text += "(";
+							option.display += U"(\u2026)";
+						} else {
+							option.insert_text += "()";
+							option.display += "()";
+						}
 					}
 					r_result.insert(option.display, option);
 				}
@@ -1413,12 +1421,14 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
 						continue;
 					}
 					ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION, location);
-					if (E.arguments.size() || (E.flags & METHOD_FLAG_VARARG)) {
-						option.insert_text += "(";
-						option.display += U"(\u2026)";
-					} else {
-						option.insert_text += "()";
-						option.display += "()";
+					if (p_add_braces) {
+						if (E.arguments.size() || (E.flags & METHOD_FLAG_VARARG)) {
+							option.insert_text += "(";
+							option.display += U"(\u2026)";
+						} else {
+							option.insert_text += "()";
+							option.display += "()";
+						}
 					}
 					r_result.insert(option.display, option);
 				}
@@ -1432,14 +1442,14 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
 	}
 }
 
-static void _find_identifiers(const GDScriptParser::CompletionContext &p_context, bool p_only_functions, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
+static void _find_identifiers(const GDScriptParser::CompletionContext &p_context, bool p_only_functions, bool p_add_braces, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
 	if (!p_only_functions && p_context.current_suite) {
 		// This includes function parameters, since they are also locals.
 		_find_identifiers_in_suite(p_context.current_suite, r_result);
 	}
 
 	if (p_context.current_class) {
-		_find_identifiers_in_class(p_context.current_class, p_only_functions, false, (!p_context.current_function || p_context.current_function->is_static), false, r_result, p_recursion_depth);
+		_find_identifiers_in_class(p_context.current_class, p_only_functions, false, (!p_context.current_function || p_context.current_function->is_static), false, p_add_braces, r_result, p_recursion_depth);
 	}
 
 	List<StringName> functions;
@@ -1448,12 +1458,14 @@ static void _find_identifiers(const GDScriptParser::CompletionContext &p_context
 	for (const StringName &E : functions) {
 		MethodInfo function = GDScriptUtilityFunctions::get_function_info(E);
 		ScriptLanguage::CodeCompletionOption option(String(E), ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
-		if (function.arguments.size() || (function.flags & METHOD_FLAG_VARARG)) {
-			option.insert_text += "(";
-			option.display += U"(\u2026)";
-		} else {
-			option.insert_text += "()";
-			option.display += "()";
+		if (p_add_braces) {
+			if (function.arguments.size() || (function.flags & METHOD_FLAG_VARARG)) {
+				option.insert_text += "(";
+				option.display += U"(\u2026)";
+			} else {
+				option.insert_text += "()";
+				option.display += "()";
+			}
 		}
 		r_result.insert(option.display, option);
 	}
@@ -1499,8 +1511,10 @@ static void _find_identifiers(const GDScriptParser::CompletionContext &p_context
 	const char **kwa = _keywords_with_args;
 	while (*kwa) {
 		ScriptLanguage::CodeCompletionOption option(*kwa, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
-		option.insert_text += "(";
-		option.display += U"(\u2026)";
+		if (p_add_braces) {
+			option.insert_text += "(";
+			option.display += U"(\u2026)";
+		}
 		r_result.insert(option.display, option);
 		kwa++;
 	}
@@ -1508,10 +1522,13 @@ static void _find_identifiers(const GDScriptParser::CompletionContext &p_context
 	List<StringName> utility_func_names;
 	Variant::get_utility_function_list(&utility_func_names);
 
-	for (List<StringName>::Element *E = utility_func_names.front(); E; E = E->next()) {
-		ScriptLanguage::CodeCompletionOption option(E->get(), ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
+	for (const StringName &util_func_name : utility_func_names) {
+		ScriptLanguage::CodeCompletionOption option(util_func_name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
 		option.insert_text += "(";
-		option.display += U"(\u2026)"; // As all utility functions contain an argument or more, this is hardcoded here.
+		if (p_add_braces) {
+			option.insert_text += "(";
+			option.display += U"(\u2026)"; // As all utility functions contain an argument or more, this is hardcoded here.
+		}
 		r_result.insert(option.display, option);
 	}
 
@@ -1621,6 +1638,16 @@ static GDScriptCompletionIdentifier _type_from_property(const PropertyInfo &p_pr
 	return ci;
 }
 
+static GDScriptCompletionIdentifier _callable_type_from_method_info(const MethodInfo &p_method) {
+	GDScriptCompletionIdentifier ci;
+	ci.type.kind = GDScriptParser::DataType::BUILTIN;
+	ci.type.builtin_type = Variant::CALLABLE;
+	ci.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
+	ci.type.is_constant = true;
+	ci.type.method_info = p_method;
+	return ci;
+}
+
 #define MAX_COMPLETION_RECURSION 100
 struct RecursionCheck {
 	int *counter;
@@ -1866,7 +1893,7 @@ static bool _guess_expression_type(GDScriptParser::CompletionContext &p_context,
 								if (all_is_const && call->function_name == SNAME("get_node") && ClassDB::is_parent_class(native_type.native_type, SNAME("Node")) && args.size()) {
 									String arg1 = args[0];
 									if (arg1.begins_with("/root/")) {
-										String which = arg1.get_slice("/", 2);
+										String which = arg1.get_slicec('/', 2);
 										if (!which.is_empty()) {
 											// Try singletons first
 											if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(which)) {
@@ -2458,14 +2485,13 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
 							r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
 							r_type.type.kind = GDScriptParser::DataType::BUILTIN;
 							r_type.type.builtin_type = Variant::SIGNAL;
+							r_type.type.method_info = member.signal->method_info;
 							return true;
 						case GDScriptParser::ClassNode::Member::FUNCTION:
 							if (is_static && !member.function->is_static) {
 								return false;
 							}
-							r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
-							r_type.type.kind = GDScriptParser::DataType::BUILTIN;
-							r_type.type.builtin_type = Variant::CALLABLE;
+							r_type = _callable_type_from_method_info(member.function->info);
 							return true;
 						case GDScriptParser::ClassNode::Member::CLASS:
 							r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
@@ -2505,6 +2531,12 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
 						}
 					}
 
+					if (scr->has_method(p_identifier)) {
+						MethodInfo mi = scr->get_method_info(p_identifier);
+						r_type = _callable_type_from_method_info(mi);
+						return true;
+					}
+
 					Ref<Script> parent = scr->get_base_script();
 					if (parent.is_valid()) {
 						base_type.script_type = parent;
@@ -2539,23 +2571,35 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
 						return true;
 					}
 				}
+
+				MethodInfo method;
+				if (ClassDB::get_method_info(class_name, p_identifier, &method)) {
+					r_type = _callable_type_from_method_info(method);
+					return true;
+				}
+
 				return false;
 			} break;
 			case GDScriptParser::DataType::BUILTIN: {
-				Callable::CallError err;
-				Variant tmp;
-				Variant::construct(base_type.builtin_type, tmp, nullptr, 0, err);
-
-				if (err.error != Callable::CallError::CALL_OK) {
-					return false;
-				}
-				bool valid = false;
-				Variant res = tmp.get(p_identifier, &valid);
-				if (valid) {
-					r_type = _type_from_variant(res, p_context);
-					r_type.value = Variant();
-					r_type.type.is_constant = false;
+				if (Variant::has_builtin_method(base_type.builtin_type, p_identifier)) {
+					r_type = _callable_type_from_method_info(Variant::get_builtin_method_info(base_type.builtin_type, p_identifier));
 					return true;
+				} else {
+					Callable::CallError err;
+					Variant tmp;
+					Variant::construct(base_type.builtin_type, tmp, nullptr, 0, err);
+
+					if (err.error != Callable::CallError::CALL_OK) {
+						return false;
+					}
+					bool valid = false;
+					Variant res = tmp.get(p_identifier, &valid);
+					if (valid) {
+						r_type = _type_from_variant(res, p_context);
+						r_type.value = Variant();
+						r_type.type.is_constant = false;
+						return true;
+					}
 				}
 				return false;
 			} break;
@@ -2726,6 +2770,22 @@ static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContex
 	return false;
 }
 
+static bool _guess_expecting_callable(GDScriptParser::CompletionContext &p_context) {
+	if (p_context.call.call != nullptr && p_context.call.call->type == GDScriptParser::Node::CALL) {
+		GDScriptParser::CallNode *call_node = static_cast<GDScriptParser::CallNode *>(p_context.call.call);
+		GDScriptCompletionIdentifier ci;
+		if (_guess_expression_type(p_context, call_node->callee, ci)) {
+			if (ci.type.kind == GDScriptParser::DataType::BUILTIN && ci.type.builtin_type == Variant::CALLABLE) {
+				if (p_context.call.argument >= 0 && p_context.call.argument < ci.type.method_info.arguments.size()) {
+					return ci.type.method_info.arguments.get(p_context.call.argument).type == Variant::CALLABLE;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
 static void _find_enumeration_candidates(GDScriptParser::CompletionContext &p_context, const String &p_enum_hint, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) {
 	if (!p_enum_hint.contains_char('.')) {
 		// Global constant or in the current class.
@@ -2745,8 +2805,8 @@ static void _find_enumeration_candidates(GDScriptParser::CompletionContext &p_co
 			}
 		}
 	} else {
-		String class_name = p_enum_hint.get_slice(".", 0);
-		String enum_name = p_enum_hint.get_slice(".", 1);
+		String class_name = p_enum_hint.get_slicec('.', 0);
+		String enum_name = p_enum_hint.get_slicec('.', 1);
 
 		if (!ClassDB::class_exists(class_name)) {
 			return;
@@ -2839,9 +2899,9 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 								// Handle user preference.
 								if (opt.is_quoted()) {
 									opt = opt.unquote().quote(quote_style);
-									if (use_string_names && info.arguments.get(p_argidx).type == Variant::STRING_NAME) {
+									if (use_string_names && info.arguments[p_argidx].type == Variant::STRING_NAME) {
 										opt = "&" + opt;
-									} else if (use_node_paths && info.arguments.get(p_argidx).type == Variant::NODE_PATH) {
+									} else if (use_node_paths && info.arguments[p_argidx].type == Variant::NODE_PATH) {
 										opt = "^" + opt;
 									}
 								}
@@ -2852,7 +2912,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 					}
 
 					if (p_argidx < method_args) {
-						const PropertyInfo &arg_info = info.arguments.get(p_argidx);
+						const PropertyInfo &arg_info = info.arguments[p_argidx];
 						if (arg_info.usage & (PROPERTY_USAGE_CLASS_IS_ENUM | PROPERTY_USAGE_CLASS_IS_BITFIELD)) {
 							_find_enumeration_candidates(p_context, arg_info.class_name, r_result);
 						}
@@ -2949,7 +3009,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 						if (!s.begins_with("autoload/")) {
 							continue;
 						}
-						String name = s.get_slice("/", 1);
+						String name = s.get_slicec('/', 1);
 						String path = ("/root/" + name).quote(quote_style);
 						if (use_node_paths) {
 							path = "^" + path;
@@ -2968,7 +3028,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 						if (!s.begins_with("input/")) {
 							continue;
 						}
-						String name = s.get_slice("/", 1).quote(quote_style);
+						String name = s.get_slicec('/', 1).quote(quote_style);
 						if (use_string_names) {
 							name = "&" + name;
 						}
@@ -3267,10 +3327,12 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 				for (const StringName &E : methods) {
 					if (Variant::is_builtin_method_static(completion_context.builtin_type, E)) {
 						ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
-						if (Variant::get_builtin_method_argument_count(completion_context.builtin_type, E) > 0 || Variant::is_builtin_method_vararg(completion_context.builtin_type, E)) {
-							option.insert_text += "(";
-						} else {
-							option.insert_text += "()";
+						if (!_guess_expecting_callable(completion_context)) {
+							if (Variant::get_builtin_method_argument_count(completion_context.builtin_type, E) > 0 || Variant::is_builtin_method_vararg(completion_context.builtin_type, E)) {
+								option.insert_text += "(";
+							} else {
+								option.insert_text += "()";
+							}
 						}
 						options.insert(option.display, option);
 					}
@@ -3328,7 +3390,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 				break;
 			}
 			if (!_guess_expression_type(completion_context, static_cast<const GDScriptParser::AssignmentNode *>(completion_context.node)->assignee, type)) {
-				_find_identifiers(completion_context, false, options, 0);
+				_find_identifiers(completion_context, false, true, options, 0);
 				r_forced = true;
 				break;
 			}
@@ -3337,7 +3399,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 				_find_enumeration_candidates(completion_context, type.enumeration, options);
 				r_forced = options.size() > 0;
 			} else {
-				_find_identifiers(completion_context, false, options, 0);
+				_find_identifiers(completion_context, false, true, options, 0);
 				r_forced = true;
 			}
 		} break;
@@ -3345,7 +3407,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 			is_function = true;
 			[[fallthrough]];
 		case GDScriptParser::COMPLETION_IDENTIFIER: {
-			_find_identifiers(completion_context, is_function, options, 0);
+			_find_identifiers(completion_context, is_function, !_guess_expecting_callable(completion_context), options, 0);
 		} break;
 		case GDScriptParser::COMPLETION_ATTRIBUTE_METHOD:
 			is_function = true;
@@ -3360,7 +3422,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 					break;
 				}
 
-				_find_identifiers_in_base(base, is_function, false, options, 0);
+				_find_identifiers_in_base(base, is_function, false, !_guess_expecting_callable(completion_context), options, 0);
 			}
 		} break;
 		case GDScriptParser::COMPLETION_SUBSCRIPT: {
@@ -3380,20 +3442,20 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 					}
 				}
 				if (!subscript->index || subscript->index->type != GDScriptParser::Node::LITERAL) {
-					_find_identifiers(completion_context, false, options, 0);
+					_find_identifiers(completion_context, false, !_guess_expecting_callable(completion_context), options, 0);
 				}
 			} else if (res) {
 				if (!subscript->is_attribute) {
 					// Quote the options if they are not accessed as attribute.
 
 					HashMap<String, ScriptLanguage::CodeCompletionOption> opt;
-					_find_identifiers_in_base(base, false, false, opt, 0);
+					_find_identifiers_in_base(base, false, false, false, opt, 0);
 					for (const KeyValue<String, CodeCompletionOption> &E : opt) {
 						ScriptLanguage::CodeCompletionOption option(E.value.insert_text.quote(quote_style), E.value.kind, E.value.location);
 						options.insert(option.display, option);
 					}
 				} else {
-					_find_identifiers_in_base(base, false, false, options, 0);
+					_find_identifiers_in_base(base, false, false, !_guess_expecting_callable(completion_context), options, 0);
 				}
 			}
 		} break;
@@ -3437,7 +3499,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 			}
 
 			if (found) {
-				_find_identifiers_in_base(base, false, true, options, 0);
+				_find_identifiers_in_base(base, false, true, true, options, 0);
 			}
 			r_forced = true;
 		} break;
@@ -3491,21 +3553,21 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 			for (const MethodInfo &mi : virtual_methods) {
 				String method_hint = mi.name;
 				if (method_hint.contains_char(':')) {
-					method_hint = method_hint.get_slice(":", 0);
+					method_hint = method_hint.get_slicec(':', 0);
 				}
 				method_hint += "(";
 
-				for (List<PropertyInfo>::ConstIterator arg_itr = mi.arguments.begin(); arg_itr != mi.arguments.end(); ++arg_itr) {
-					if (arg_itr != mi.arguments.begin()) {
+				for (int64_t i = 0; i < mi.arguments.size(); ++i) {
+					if (i > 0) {
 						method_hint += ", ";
 					}
-					String arg = arg_itr->name;
+					String arg = mi.arguments[i].name;
 					if (arg.contains_char(':')) {
 						arg = arg.substr(0, arg.find_char(':'));
 					}
 					method_hint += arg;
 					if (use_type_hint) {
-						method_hint += ": " + _get_visual_datatype(*arg_itr, true, class_name);
+						method_hint += ": " + _get_visual_datatype(mi.arguments[i], true, class_name);
 					}
 				}
 				method_hint += ")";
@@ -3578,7 +3640,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
 			if (!completion_context.current_class) {
 				break;
 			}
-			_find_identifiers_in_class(completion_context.current_class, true, false, false, true, options, 0);
+			_find_identifiers_in_class(completion_context.current_class, true, false, false, true, !_guess_expecting_callable(completion_context), options, 0);
 		} break;
 	}
 
@@ -3630,7 +3692,7 @@ void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_t
 			}
 		}
 
-		String st = l.substr(tc, l.length()).strip_edges();
+		String st = l.substr(tc).strip_edges();
 		if (st.is_empty() || st.begins_with("#")) {
 			continue; //ignore!
 		}
diff --git a/engine/modules/gdscript/gdscript_function.h b/engine/modules/gdscript/gdscript_function.h
index 6433072b..56383523 100644
--- a/engine/modules/gdscript/gdscript_function.h
+++ b/engine/modules/gdscript/gdscript_function.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_FUNCTION_H
-#define GDSCRIPT_FUNCTION_H
+#pragma once
 
 #include "gdscript_utility_functions.h"
 
@@ -616,11 +615,16 @@ public:
 	bool is_valid(bool p_extended_check = false) const;
 	Variant resume(const Variant &p_arg = Variant());
 
+#ifdef DEBUG_ENABLED
+	// Returns a human-readable representation of the function.
+	String get_readable_function() {
+		return state.function_name;
+	}
+#endif
+
 	void _clear_stack();
 	void _clear_connections();
 
 	GDScriptFunctionState();
 	~GDScriptFunctionState();
 };
-
-#endif // GDSCRIPT_FUNCTION_H
diff --git a/engine/modules/gdscript/gdscript_lambda_callable.cpp b/engine/modules/gdscript/gdscript_lambda_callable.cpp
index d767324b..762d69ff 100644
--- a/engine/modules/gdscript/gdscript_lambda_callable.cpp
+++ b/engine/modules/gdscript/gdscript_lambda_callable.cpp
@@ -45,7 +45,9 @@ bool GDScriptLambdaCallable::compare_less(const CallableCustom *p_a, const Calla
 }
 
 bool GDScriptLambdaCallable::is_valid() const {
-	return CallableCustom::is_valid() && function != nullptr;
+	// Don't need to call CallableCustom::is_valid():
+	// It just verifies our script exists, which we know to be true because it is RefCounted.
+	return function != nullptr;
 }
 
 uint32_t GDScriptLambdaCallable::hash() const {
diff --git a/engine/modules/gdscript/gdscript_lambda_callable.h b/engine/modules/gdscript/gdscript_lambda_callable.h
index 2d27b8d6..a4e0c956 100644
--- a/engine/modules/gdscript/gdscript_lambda_callable.h
+++ b/engine/modules/gdscript/gdscript_lambda_callable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_LAMBDA_CALLABLE_H
-#define GDSCRIPT_LAMBDA_CALLABLE_H
+#pragma once
 
 #include "gdscript.h"
 
@@ -97,5 +96,3 @@ public:
 	GDScriptLambdaSelfCallable(Object *p_self, GDScriptFunction *p_function, const Vector<Variant> &p_captures);
 	virtual ~GDScriptLambdaSelfCallable() = default;
 };
-
-#endif // GDSCRIPT_LAMBDA_CALLABLE_H
diff --git a/engine/modules/gdscript/gdscript_parser.cpp b/engine/modules/gdscript/gdscript_parser.cpp
index 077ab6f0..231b2400 100644
--- a/engine/modules/gdscript/gdscript_parser.cpp
+++ b/engine/modules/gdscript/gdscript_parser.cpp
@@ -269,6 +269,9 @@ void GDScriptParser::override_completion_context(const Node *p_for_node, Complet
 	context.current_argument = p_argument;
 	context.node = p_node;
 	context.parser = this;
+	if (!completion_call_stack.is_empty()) {
+		context.call = completion_call_stack.back()->get();
+	}
 	completion_context = context;
 }
 
@@ -288,6 +291,9 @@ void GDScriptParser::make_completion_context(CompletionType p_type, Node *p_node
 	context.current_argument = p_argument;
 	context.node = p_node;
 	context.parser = this;
+	if (!completion_call_stack.is_empty()) {
+		context.call = completion_call_stack.back()->get();
+	}
 	completion_context = context;
 }
 
@@ -306,6 +312,9 @@ void GDScriptParser::make_completion_context(CompletionType p_type, Variant::Typ
 	context.current_line = tokenizer->get_cursor_line();
 	context.builtin_type = p_builtin_type;
 	context.parser = this;
+	if (!completion_call_stack.is_empty()) {
+		context.call = completion_call_stack.back()->get();
+	}
 	completion_context = context;
 }
 
@@ -317,9 +326,6 @@ void GDScriptParser::push_completion_call(Node *p_call) {
 	call.call = p_call;
 	call.argument = 0;
 	completion_call_stack.push_back(call);
-	if (previous.cursor_place == GDScriptTokenizerText::CURSOR_MIDDLE || previous.cursor_place == GDScriptTokenizerText::CURSOR_END || current.cursor_place == GDScriptTokenizerText::CURSOR_BEGINNING) {
-		completion_call = call;
-	}
 }
 
 void GDScriptParser::pop_completion_call() {
@@ -331,7 +337,7 @@ void GDScriptParser::pop_completion_call() {
 }
 
 void GDScriptParser::set_last_completion_call_arg(int p_argument) {
-	if (!for_completion || passed_cursor) {
+	if (!for_completion) {
 		return;
 	}
 	ERR_FAIL_COND_MSG(completion_call_stack.is_empty(), "Trying to set argument on empty completion call stack");
@@ -477,12 +483,6 @@ GDScriptTokenizer::Token GDScriptParser::advance() {
 	if (current.type == GDScriptTokenizer::Token::TK_EOF) {
 		ERR_FAIL_COND_V_MSG(current.type == GDScriptTokenizer::Token::TK_EOF, current, "GDScript parser bug: Trying to advance past the end of stream.");
 	}
-	if (for_completion && !completion_call_stack.is_empty()) {
-		if (completion_call.call == nullptr && tokenizer->is_past_cursor()) {
-			completion_call = completion_call_stack.back()->get();
-			passed_cursor = true;
-		}
-	}
 	previous = current;
 	current = tokenizer->scan();
 	while (current.type == GDScriptTokenizer::Token::ERROR) {
@@ -613,12 +613,12 @@ void GDScriptParser::parse_program() {
 	current_class = head;
 	bool can_have_class_or_extends = true;
 
-#define PUSH_PENDING_ANNOTATIONS_TO_HEAD                  \
-	if (!annotation_stack.is_empty()) {                   \
-		for (AnnotationNode * annot : annotation_stack) { \
-			head->annotations.push_back(annot);           \
-		}                                                 \
-		annotation_stack.clear();                         \
+#define PUSH_PENDING_ANNOTATIONS_TO_HEAD                 \
+	if (!annotation_stack.is_empty()) {                  \
+		for (AnnotationNode *annot : annotation_stack) { \
+			head->annotations.push_back(annot);          \
+		}                                                \
+		annotation_stack.clear();                        \
 	}
 
 	while (!check(GDScriptTokenizer::Token::TK_EOF)) {
@@ -672,14 +672,16 @@ void GDScriptParser::parse_program() {
 		}
 	}
 
+	if (current.type == GDScriptTokenizer::Token::CLASS_NAME || current.type == GDScriptTokenizer::Token::EXTENDS) {
+		// Set range of the class to only start at extends or class_name if present.
+		reset_extents(head, current);
+	}
+
 	while (can_have_class_or_extends) {
 		// Order here doesn't matter, but there should be only one of each at most.
 		switch (current.type) {
 			case GDScriptTokenizer::Token::CLASS_NAME:
 				PUSH_PENDING_ANNOTATIONS_TO_HEAD;
-				if (head->start_line == 1) {
-					reset_extents(head, current);
-				}
 				advance();
 				if (head->identifier != nullptr) {
 					push_error(R"("class_name" can only be used once.)");
@@ -689,9 +691,6 @@ void GDScriptParser::parse_program() {
 				break;
 			case GDScriptTokenizer::Token::EXTENDS:
 				PUSH_PENDING_ANNOTATIONS_TO_HEAD;
-				if (head->start_line == 1) {
-					reset_extents(head, current);
-				}
 				advance();
 				if (head->extends_used) {
 					push_error(R"("extends" can only be used once.)");
@@ -2721,16 +2720,16 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_builtin_constant(Expressio
 
 	switch (op_type) {
 		case GDScriptTokenizer::Token::CONST_PI:
-			constant->value = Math_PI;
+			constant->value = Math::PI;
 			break;
 		case GDScriptTokenizer::Token::CONST_TAU:
-			constant->value = Math_TAU;
+			constant->value = Math::TAU;
 			break;
 		case GDScriptTokenizer::Token::CONST_INF:
-			constant->value = INFINITY;
+			constant->value = Math::INF;
 			break;
 		case GDScriptTokenizer::Token::CONST_NAN:
-			constant->value = NAN;
+			constant->value = Math::NaN;
 			break;
 		default:
 			return nullptr; // Unreachable.
@@ -3302,7 +3301,11 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_pre
 			IdentifierNode *identifier = parse_identifier();
 			call->callee = identifier;
 			call->function_name = identifier->name;
-			consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected "(" after function name.)");
+			if (!consume(GDScriptTokenizer::Token::PARENTHESIS_OPEN, R"(Expected "(" after function name.)")) {
+				pop_multiline();
+				complete_extents(call);
+				return nullptr;
+			}
 		}
 	} else {
 		call->callee = p_previous_operand;
@@ -3337,6 +3340,7 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_pre
 	int argument_index = 0;
 	do {
 		make_completion_context(ct, call, argument_index);
+		set_last_completion_call_arg(argument_index);
 		if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
 			// Allow for trailing comma.
 			break;
@@ -4131,7 +4135,7 @@ GDScriptParser::ParseRule *GDScriptParser::get_rule(GDScriptTokenizer::Token::Ty
 	};
 	/* clang-format on */
 	// Avoid desync.
-	static_assert(sizeof(rules) / sizeof(rules[0]) == GDScriptTokenizer::Token::TK_MAX, "Amount of parse rules don't match the amount of token types.");
+	static_assert(std::size(rules) == GDScriptTokenizer::Token::TK_MAX, "Amount of parse rules don't match the amount of token types.");
 
 	// Let's assume this is never invalid, since nothing generates a TK_MAX.
 	return &rules[p_token_type];
@@ -4354,7 +4358,7 @@ static StringName _find_narrowest_native_or_global_class(const GDScriptParser::D
 			}
 
 			if (p_type.is_meta_type) {
-				return script.is_valid() ? script->get_class() : Script::get_class_static();
+				return script.is_valid() ? script->get_class_name() : Script::get_class_static();
 			}
 			if (script.is_null()) {
 				return p_type.native_type;
@@ -5254,7 +5258,7 @@ PropertyInfo GDScriptParser::DataType::to_property_info(const String &p_name) co
 		case SCRIPT:
 			result.type = Variant::OBJECT;
 			if (is_meta_type) {
-				result.class_name = script_type.is_valid() ? script_type->get_class() : Script::get_class_static();
+				result.class_name = script_type.is_valid() ? script_type->get_class_name() : Script::get_class_static();
 			} else if (script_type.is_valid() && script_type->get_global_name() != StringName()) {
 				result.class_name = script_type->get_global_name();
 			} else {
diff --git a/engine/modules/gdscript/gdscript_parser.h b/engine/modules/gdscript/gdscript_parser.h
index 5da2bc80..a7f41c18 100644
--- a/engine/modules/gdscript/gdscript_parser.h
+++ b/engine/modules/gdscript/gdscript_parser.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_PARSER_H
-#define GDSCRIPT_PARSER_H
+#pragma once
 
 #include "gdscript_cache.h"
 #include "gdscript_tokenizer.h"
@@ -1311,6 +1310,11 @@ public:
 		COMPLETION_TYPE_NAME_OR_VOID, // Same as TYPE_NAME, but allows void (in function return type).
 	};
 
+	struct CompletionCall {
+		Node *call = nullptr;
+		int argument = -1;
+	};
+
 	struct CompletionContext {
 		CompletionType type = COMPLETION_NONE;
 		ClassNode *current_class = nullptr;
@@ -1322,11 +1326,7 @@ public:
 		Node *node = nullptr;
 		Object *base = nullptr;
 		GDScriptParser *parser = nullptr;
-	};
-
-	struct CompletionCall {
-		Node *call = nullptr;
-		int argument = -1;
+		CompletionCall call;
 	};
 
 private:
@@ -1373,9 +1373,7 @@ private:
 	SuiteNode *current_suite = nullptr;
 
 	CompletionContext completion_context;
-	CompletionCall completion_call;
 	List<CompletionCall> completion_call_stack;
-	bool passed_cursor = false;
 	bool in_lambda = false;
 	bool lambda_ended = false; // Marker for when a lambda ends, to apply an end of statement if needed.
 
@@ -1587,7 +1585,6 @@ public:
 	static Variant::Type get_builtin_type(const StringName &p_type); // Excluding `Variant::NIL` and `Variant::OBJECT`.
 
 	CompletionContext get_completion_context() const { return completion_context; }
-	CompletionCall get_completion_call() const { return completion_call; }
 	void get_annotation_list(List<MethodInfo> *r_annotations) const;
 	bool annotation_exists(const String &p_annotation_name) const;
 
@@ -1667,5 +1664,3 @@ public:
 #endif // DEBUG_ENABLED
 	static void cleanup();
 };
-
-#endif // GDSCRIPT_PARSER_H
diff --git a/engine/modules/gdscript/gdscript_rpc_callable.h b/engine/modules/gdscript/gdscript_rpc_callable.h
index 2ca62909..46032d31 100644
--- a/engine/modules/gdscript/gdscript_rpc_callable.h
+++ b/engine/modules/gdscript/gdscript_rpc_callable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_RPC_CALLABLE_H
-#define GDSCRIPT_RPC_CALLABLE_H
+#pragma once
 
 #include "core/variant/callable.h"
 #include "core/variant/variant.h"
@@ -59,5 +58,3 @@ public:
 	GDScriptRPCCallable(Object *p_object, const StringName &p_method);
 	virtual ~GDScriptRPCCallable() = default;
 };
-
-#endif // GDSCRIPT_RPC_CALLABLE_H
diff --git a/engine/modules/gdscript/gdscript_tokenizer.cpp b/engine/modules/gdscript/gdscript_tokenizer.cpp
index 2bc4b703..9a05dae9 100644
--- a/engine/modules/gdscript/gdscript_tokenizer.cpp
+++ b/engine/modules/gdscript/gdscript_tokenizer.cpp
@@ -157,7 +157,7 @@ static const char *token_names[] = {
 };
 
 // Avoid desync.
-static_assert(sizeof(token_names) / sizeof(token_names[0]) == GDScriptTokenizer::Token::TK_MAX, "Amount of token names don't match the amount of token types.");
+static_assert(std::size(token_names) == GDScriptTokenizer::Token::TK_MAX, "Amount of token names don't match the amount of token types.");
 
 const char *GDScriptTokenizer::Token::get_name() const {
 	ERR_FAIL_INDEX_V_MSG(type, TK_MAX, "<error>", "Using token type out of the enum.");
@@ -366,7 +366,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::make_token(Token::Type p_type) {
 	token.end_column = column;
 	token.leftmost_column = leftmost_column;
 	token.rightmost_column = rightmost_column;
-	token.source = String(_start, _current - _start);
+	token.source = String::utf32(Span(_start, _current - _start));
 
 	if (p_type != Token::ERROR && cursor_line > -1) {
 		// Also count whitespace after token.
@@ -588,7 +588,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::potential_identifier() {
 		return token;
 	}
 
-	String name(_start, len);
+	String name = String::utf32(Span(_start, len));
 	if (len < MIN_KEYWORD_LENGTH || len > MAX_KEYWORD_LENGTH) {
 		// Cannot be a keyword, as the length doesn't match any.
 		return make_identifier(name);
@@ -863,7 +863,7 @@ GDScriptTokenizer::Token GDScriptTokenizerText::number() {
 
 	// Create a string with the whole number.
 	int len = _current - _start;
-	String number = String(_start, len).replace("_", "");
+	String number = String::utf32(Span(_start, len)).remove_char('_');
 
 	// Convert to the appropriate literal type.
 	if (base == 16) {
@@ -1337,7 +1337,7 @@ void GDScriptTokenizerText::check_indent() {
 }
 
 String GDScriptTokenizerText::_get_indent_char_name(char32_t ch) {
-	ERR_FAIL_COND_V(ch != ' ' && ch != '\t', String(&ch, 1).c_escape());
+	ERR_FAIL_COND_V(ch != ' ' && ch != '\t', String::chr(ch).c_escape());
 
 	return ch == ' ' ? "space" : "tab";
 }
diff --git a/engine/modules/gdscript/gdscript_tokenizer.h b/engine/modules/gdscript/gdscript_tokenizer.h
index 5812199b..9b7fecc6 100644
--- a/engine/modules/gdscript/gdscript_tokenizer.h
+++ b/engine/modules/gdscript/gdscript_tokenizer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_TOKENIZER_H
-#define GDSCRIPT_TOKENIZER_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
@@ -312,5 +311,3 @@ public:
 
 	GDScriptTokenizerText();
 };
-
-#endif // GDSCRIPT_TOKENIZER_H
diff --git a/engine/modules/gdscript/gdscript_tokenizer_buffer.cpp b/engine/modules/gdscript/gdscript_tokenizer_buffer.cpp
index 2046480f..d9b6ec68 100644
--- a/engine/modules/gdscript/gdscript_tokenizer_buffer.cpp
+++ b/engine/modules/gdscript/gdscript_tokenizer_buffer.cpp
@@ -182,7 +182,7 @@ Error GDScriptTokenizerBuffer::set_code_buffer(const Vector<uint8_t> &p_buffer)
 			cs.write[j] = decode_uint32(tmp);
 		}
 
-		String s(reinterpret_cast<const char32_t *>(cs.ptr()), len);
+		String s = String::utf32(Span(reinterpret_cast<const char32_t *>(cs.ptr()), len));
 		b += len * 4;
 		total_len -= len * 4;
 		identifiers.write[i] = s;
diff --git a/engine/modules/gdscript/gdscript_tokenizer_buffer.h b/engine/modules/gdscript/gdscript_tokenizer_buffer.h
index d5d2a4d0..4507cd60 100644
--- a/engine/modules/gdscript/gdscript_tokenizer_buffer.h
+++ b/engine/modules/gdscript/gdscript_tokenizer_buffer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_TOKENIZER_BUFFER_H
-#define GDSCRIPT_TOKENIZER_BUFFER_H
+#pragma once
 
 #include "gdscript_tokenizer.h"
 
@@ -89,5 +88,3 @@ public:
 
 	virtual Token scan() override;
 };
-
-#endif // GDSCRIPT_TOKENIZER_BUFFER_H
diff --git a/engine/modules/gdscript/gdscript_utility_callable.h b/engine/modules/gdscript/gdscript_utility_callable.h
index c5736e81..5312c869 100644
--- a/engine/modules/gdscript/gdscript_utility_callable.h
+++ b/engine/modules/gdscript/gdscript_utility_callable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_UTILITY_CALLABLE_H
-#define GDSCRIPT_UTILITY_CALLABLE_H
+#pragma once
 
 #include "gdscript_utility_functions.h"
 
@@ -62,5 +61,3 @@ public:
 
 	GDScriptUtilityCallable(const StringName &p_function_name);
 };
-
-#endif // GDSCRIPT_UTILITY_CALLABLE_H
diff --git a/engine/modules/gdscript/gdscript_utility_functions.cpp b/engine/modules/gdscript/gdscript_utility_functions.cpp
index 448f8a8f..645400f0 100644
--- a/engine/modules/gdscript/gdscript_utility_functions.cpp
+++ b/engine/modules/gdscript/gdscript_utility_functions.cpp
@@ -624,8 +624,8 @@ StringName GDScriptUtilityFunctions::get_function_return_class(const StringName
 Variant::Type GDScriptUtilityFunctions::get_function_argument_type(const StringName &p_function, int p_arg) {
 	GDScriptUtilityFunctionInfo *info = utility_function_table.lookup_ptr(p_function);
 	ERR_FAIL_NULL_V(info, Variant::NIL);
-	ERR_FAIL_COND_V(p_arg >= info->info.arguments.size(), Variant::NIL);
-	return info->info.arguments.get(p_arg).type;
+	ERR_FAIL_INDEX_V(p_arg, info->info.arguments.size(), Variant::NIL);
+	return info->info.arguments[p_arg].type;
 }
 
 int GDScriptUtilityFunctions::get_function_argument_count(const StringName &p_function) {
diff --git a/engine/modules/gdscript/gdscript_utility_functions.h b/engine/modules/gdscript/gdscript_utility_functions.h
index 1c4e4452..ee658641 100644
--- a/engine/modules/gdscript/gdscript_utility_functions.h
+++ b/engine/modules/gdscript/gdscript_utility_functions.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_UTILITY_FUNCTIONS_H
-#define GDSCRIPT_UTILITY_FUNCTIONS_H
+#pragma once
 
 #include "core/string/string_name.h"
 #include "core/variant/variant.h"
@@ -57,5 +56,3 @@ public:
 	static void register_functions();
 	static void unregister_functions();
 };
-
-#endif // GDSCRIPT_UTILITY_FUNCTIONS_H
diff --git a/engine/modules/gdscript/gdscript_vm.cpp b/engine/modules/gdscript/gdscript_vm.cpp
index fb454490..df8d34bb 100644
--- a/engine/modules/gdscript/gdscript_vm.cpp
+++ b/engine/modules/gdscript/gdscript_vm.cpp
@@ -387,7 +387,7 @@ void (*type_init_function_table[])(Variant *) = {
 		&&OPCODE_LINE,                                   \
 		&&OPCODE_END                                     \
 	};                                                   \
-	static_assert((sizeof(switch_table_ops) / sizeof(switch_table_ops[0]) == (OPCODE_END + 1)), "Opcodes in jump table aren't the same as opcodes in enum.");
+	static_assert(std::size(switch_table_ops) == (OPCODE_END + 1), "Opcodes in jump table aren't the same as opcodes in enum.");
 
 #define OPCODE(m_op) \
 	m_op:
@@ -3246,7 +3246,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 			ip += 5;                                                                                                       \
 		} else {                                                                                                           \
 			int jumpto = _code_ptr[ip + 4];                                                                                \
-			GD_ERR_BREAK(jumpto<0 || jumpto> _code_size);                                                                  \
+			GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size);                                                               \
 			ip = jumpto;                                                                                                   \
 		}                                                                                                                  \
 	}                                                                                                                      \
@@ -3284,9 +3284,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 #endif
 
 				*counter = Variant();
-
-				Array ref;
-				ref.push_back(*counter);
+				Array ref = { *counter };
 				Variant vref;
 				VariantInternal::initialize(&vref, Variant::ARRAY);
 				*VariantInternal::get_array(&vref) = ref;
@@ -3578,7 +3576,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 		(*idx)++;                                                                                   \
 		if (*idx >= array->size()) {                                                                \
 			int jumpto = _code_ptr[ip + 4];                                                         \
-			GD_ERR_BREAK(jumpto<0 || jumpto> _code_size);                                           \
+			GD_ERR_BREAK(jumpto < 0 || jumpto > _code_size);                                        \
 			ip = jumpto;                                                                            \
 		} else {                                                                                    \
 			GET_VARIANT_PTR(iterator, 2);                                                           \
@@ -3619,8 +3617,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				Object *obj = *VariantInternal::get_object(container);
 #endif
 
-				Array ref;
-				ref.push_back(*counter);
+				Array ref = { *counter };
 				Variant vref;
 				VariantInternal::initialize(&vref, Variant::ARRAY);
 				*VariantInternal::get_array(&vref) = ref;
diff --git a/engine/modules/gdscript/gdscript_warning.cpp b/engine/modules/gdscript/gdscript_warning.cpp
index f14b38a1..8354d551 100644
--- a/engine/modules/gdscript/gdscript_warning.cpp
+++ b/engine/modules/gdscript/gdscript_warning.cpp
@@ -245,7 +245,7 @@ String GDScriptWarning::get_name_from_code(Code p_code) {
 #endif
 	};
 
-	static_assert((sizeof(names) / sizeof(*names)) == WARNING_MAX, "Amount of warning types don't match the amount of warning names.");
+	static_assert(std::size(names) == WARNING_MAX, "Amount of warning types don't match the amount of warning names.");
 
 	return names[(int)p_code];
 }
diff --git a/engine/modules/gdscript/gdscript_warning.h b/engine/modules/gdscript/gdscript_warning.h
index e9ab309c..e86cd3b5 100644
--- a/engine/modules/gdscript/gdscript_warning.h
+++ b/engine/modules/gdscript/gdscript_warning.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_WARNING_H
-#define GDSCRIPT_WARNING_H
+#pragma once
 
 #ifdef DEBUG_ENABLED
 
@@ -154,7 +153,7 @@ public:
 #endif
 	};
 
-	static_assert((sizeof(default_warning_levels) / sizeof(default_warning_levels[0])) == WARNING_MAX, "Amount of default levels does not match the amount of warnings.");
+	static_assert(std::size(default_warning_levels) == WARNING_MAX, "Amount of default levels does not match the amount of warnings.");
 
 	Code code = WARNING_MAX;
 	int start_line = -1, end_line = -1;
@@ -171,5 +170,3 @@ public:
 };
 
 #endif // DEBUG_ENABLED
-
-#endif // GDSCRIPT_WARNING_H
diff --git a/engine/modules/gdscript/icons/GDScript.svg b/engine/modules/gdscript/icons/GDScript.svg
index e44adf60..84b3b8d1 100644
--- a/engine/modules/gdscript/icons/GDScript.svg
+++ b/engine/modules/gdscript/icons/GDScript.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1-.565 2.258a5 5 0 0 0-.689.28L3.758 2.343 2.344 3.758l1.195 1.994a5 5 0 0 0-.285.685L1 7v2l2.258.564a5 5 0 0 0 .279.688l-1.193 1.99 1.414 1.414 1.994-1.195a5 5 0 0 0 .685.285L7 15h2l.564-2.258a5 5 0 0 0 .688-.28l1.99 1.194 1.414-1.414-1.195-1.994a5 5 0 0 0 .285-.685L15 9V7l-2.258-.564a5 5 0 0 0-.28-.688l1.194-1.99-1.414-1.414-1.994 1.195a5 5 0 0 0-.686-.285L9 1H7zm1 5a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1-.565 2.258a5 5 0 0 0-.689.28L3.758 2.343 2.344 3.758l1.195 1.994a5 5 0 0 0-.285.685L1 7v2l2.258.564a5 5 0 0 0 .279.688l-1.193 1.99 1.414 1.414 1.994-1.195a5 5 0 0 0 .685.285L7 15h2l.564-2.258a5 5 0 0 0 .688-.28l1.99 1.194 1.414-1.414-1.195-1.994a5 5 0 0 0 .285-.685L15 9V7l-2.258-.564a5 5 0 0 0-.28-.688l1.194-1.99-1.414-1.414-1.994 1.195a5 5 0 0 0-.686-.285L9 1H7zm1 5a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
diff --git a/engine/modules/gdscript/icons/GDScriptInternal.svg b/engine/modules/gdscript/icons/GDScriptInternal.svg
index 57471729..2b5d677d 100644
--- a/engine/modules/gdscript/icons/GDScriptInternal.svg
+++ b/engine/modules/gdscript/icons/GDScriptInternal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" d="m7 1-.565 2.258a5 5 0 0 0-.689.28L3.758 2.343 2.344 3.758l1.195 1.994a5 5 0 0 0-.285.685L1 7v2l2.258.564a5 5 0 0 0 .279.688l-1.193 1.99 1.414 1.414 1.994-1.195a5 5 0 0 0 .685.285L7 15h2l.564-2.258a5 5 0 0 0 .688-.28l1.99 1.194 1.414-1.414-1.195-1.994a5 5 0 0 0 .285-.685L15 9V7l-2.258-.564a5 5 0 0 0-.28-.688l1.194-1.99-1.414-1.414-1.994 1.195a5 5 0 0 0-.686-.285L9 1H7zm1 5a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#e0e0e0" d="m7 1-.565 2.258a5 5 0 0 0-.689.28L3.758 2.343 2.344 3.758l1.195 1.994a5 5 0 0 0-.285.685L1 7v2l2.258.564a5 5 0 0 0 .279.688l-1.193 1.99 1.414 1.414 1.994-1.195a5 5 0 0 0 .685.285L7 15h2l.564-2.258a5 5 0 0 0 .688-.28l1.99 1.194 1.414-1.414-1.195-1.994a5 5 0 0 0 .285-.685L15 9V7l-2.258-.564a5 5 0 0 0-.28-.688l1.194-1.99-1.414-1.414-1.994 1.195a5 5 0 0 0-.686-.285L9 1H7zm1 5a2 2 0 0 1 0 4 2 2 0 0 1 0-4z"/></svg>
diff --git a/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp b/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp
index 4513644e..f8df46b2 100644
--- a/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_extend_parser.cpp
@@ -44,8 +44,8 @@ int get_indent_size() {
 	}
 }
 
-lsp::Position GodotPosition::to_lsp(const Vector<String> &p_lines) const {
-	lsp::Position res;
+LSP::Position GodotPosition::to_lsp(const Vector<String> &p_lines) const {
+	LSP::Position res;
 
 	// Special case: `line = 0` -> root class (range covers everything).
 	if (line <= 0) {
@@ -89,7 +89,7 @@ lsp::Position GodotPosition::to_lsp(const Vector<String> &p_lines) const {
 	return res;
 }
 
-GodotPosition GodotPosition::from_lsp(const lsp::Position p_pos, const Vector<String> &p_lines) {
+GodotPosition GodotPosition::from_lsp(const LSP::Position p_pos, const Vector<String> &p_lines) {
 	GodotPosition res(p_pos.line + 1, p_pos.character + 1);
 
 	// Line outside of actual text is valid (-> pos/cursor at end of text).
@@ -113,14 +113,14 @@ GodotPosition GodotPosition::from_lsp(const lsp::Position p_pos, const Vector<St
 	return res;
 }
 
-lsp::Range GodotRange::to_lsp(const Vector<String> &p_lines) const {
-	lsp::Range res;
+LSP::Range GodotRange::to_lsp(const Vector<String> &p_lines) const {
+	LSP::Range res;
 	res.start = start.to_lsp(p_lines);
 	res.end = end.to_lsp(p_lines);
 	return res;
 }
 
-GodotRange GodotRange::from_lsp(const lsp::Range &p_range, const Vector<String> &p_lines) {
+GodotRange GodotRange::from_lsp(const LSP::Range &p_range, const Vector<String> &p_lines) {
 	GodotPosition start = GodotPosition::from_lsp(p_range.start, p_lines);
 	GodotPosition end = GodotPosition::from_lsp(p_range.end, p_lines);
 	return GodotRange(start, end);
@@ -131,13 +131,13 @@ void ExtendGDScriptParser::update_diagnostics() {
 
 	const List<ParserError> &parser_errors = get_errors();
 	for (const ParserError &error : parser_errors) {
-		lsp::Diagnostic diagnostic;
-		diagnostic.severity = lsp::DiagnosticSeverity::Error;
+		LSP::Diagnostic diagnostic;
+		diagnostic.severity = LSP::DiagnosticSeverity::Error;
 		diagnostic.message = error.message;
 		diagnostic.source = "gdscript";
 		diagnostic.code = -1;
-		lsp::Range range;
-		lsp::Position pos;
+		LSP::Range range;
+		LSP::Position pos;
 		const PackedStringArray line_array = get_lines();
 		int line = CLAMP(LINE_NUMBER_TO_INDEX(error.line), 0, line_array.size() - 1);
 		const String &line_text = line_array[line];
@@ -152,13 +152,13 @@ void ExtendGDScriptParser::update_diagnostics() {
 
 	const List<GDScriptWarning> &parser_warnings = get_warnings();
 	for (const GDScriptWarning &warning : parser_warnings) {
-		lsp::Diagnostic diagnostic;
-		diagnostic.severity = lsp::DiagnosticSeverity::Warning;
+		LSP::Diagnostic diagnostic;
+		diagnostic.severity = LSP::DiagnosticSeverity::Warning;
 		diagnostic.message = "(" + warning.get_name() + "): " + warning.get_message();
 		diagnostic.source = "gdscript";
 		diagnostic.code = warning.code;
-		lsp::Range range;
-		lsp::Position pos;
+		LSP::Range range;
+		LSP::Position pos;
 		int line = LINE_NUMBER_TO_INDEX(warning.start_line);
 		const String &line_text = get_lines()[line];
 		pos.line = line;
@@ -178,14 +178,14 @@ void ExtendGDScriptParser::update_symbols() {
 		parse_class_symbol(gdclass, class_symbol);
 
 		for (int i = 0; i < class_symbol.children.size(); i++) {
-			const lsp::DocumentSymbol &symbol = class_symbol.children[i];
+			const LSP::DocumentSymbol &symbol = class_symbol.children[i];
 			members.insert(symbol.name, &symbol);
 
 			// Cache level one inner classes.
-			if (symbol.kind == lsp::SymbolKind::Class) {
+			if (symbol.kind == LSP::SymbolKind::Class) {
 				ClassMembers inner_class;
 				for (int j = 0; j < symbol.children.size(); j++) {
-					const lsp::DocumentSymbol &s = symbol.children[j];
+					const LSP::DocumentSymbol &s = symbol.children[j];
 					inner_class.insert(s.name, &s);
 				}
 				inner_classes.insert(symbol.name, inner_class);
@@ -208,14 +208,14 @@ void ExtendGDScriptParser::update_document_links(const String &p_code) {
 			const Variant &const_val = token.literal;
 			if (const_val.get_type() == Variant::STRING) {
 				String scr_path = const_val;
-				bool exists = fs->file_exists(scr_path);
-				if (!exists) {
-					scr_path = get_path().get_base_dir() + "/" + scr_path;
-					exists = fs->file_exists(scr_path);
+				if (scr_path.is_relative_path()) {
+					scr_path = get_path().get_base_dir().path_join(scr_path).simplify_path();
 				}
+				bool exists = fs->file_exists(scr_path);
+
 				if (exists) {
 					String value = const_val;
-					lsp::DocumentLink link;
+					LSP::DocumentLink link;
 					link.target = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_uri(scr_path);
 					link.range = GodotRange(GodotPosition(token.start_line, token.start_column), GodotPosition(token.end_line, token.end_column)).to_lsp(lines);
 					document_links.push_back(link);
@@ -225,13 +225,13 @@ void ExtendGDScriptParser::update_document_links(const String &p_code) {
 	}
 }
 
-lsp::Range ExtendGDScriptParser::range_of_node(const GDScriptParser::Node *p_node) const {
+LSP::Range ExtendGDScriptParser::range_of_node(const GDScriptParser::Node *p_node) const {
 	GodotPosition start(p_node->start_line, p_node->start_column);
 	GodotPosition end(p_node->end_line, p_node->end_column);
 	return GodotRange(start, end).to_lsp(lines);
 }
 
-void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol &r_symbol) {
+void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p_class, LSP::DocumentSymbol &r_symbol) {
 	const String uri = get_uri();
 
 	r_symbol.uri = uri;
@@ -241,7 +241,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 	if (r_symbol.name.is_empty()) {
 		r_symbol.name = path.get_file();
 	}
-	r_symbol.kind = lsp::SymbolKind::Class;
+	r_symbol.kind = LSP::SymbolKind::Class;
 	r_symbol.deprecated = false;
 	r_symbol.range = range_of_node(p_class);
 	if (p_class->identifier) {
@@ -276,9 +276,9 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 
 		switch (m.type) {
 			case ClassNode::Member::VARIABLE: {
-				lsp::DocumentSymbol symbol;
+				LSP::DocumentSymbol symbol;
 				symbol.name = m.variable->identifier->name;
-				symbol.kind = m.variable->property == VariableNode::PROP_NONE ? lsp::SymbolKind::Variable : lsp::SymbolKind::Property;
+				symbol.kind = m.variable->property == VariableNode::PROP_NONE ? LSP::SymbolKind::Variable : LSP::SymbolKind::Property;
 				symbol.deprecated = false;
 				symbol.range = range_of_node(m.variable);
 				symbol.selectionRange = range_of_node(m.variable->identifier);
@@ -299,20 +299,20 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 
 				if (m.variable->initializer && m.variable->initializer->type == GDScriptParser::Node::LAMBDA) {
 					GDScriptParser::LambdaNode *lambda_node = (GDScriptParser::LambdaNode *)m.variable->initializer;
-					lsp::DocumentSymbol lambda;
+					LSP::DocumentSymbol lambda;
 					parse_function_symbol(lambda_node->function, lambda);
 					// Merge lambda into current variable.
 					symbol.children.append_array(lambda.children);
 				}
 
 				if (m.variable->getter && m.variable->getter->type == GDScriptParser::Node::FUNCTION) {
-					lsp::DocumentSymbol get_symbol;
+					LSP::DocumentSymbol get_symbol;
 					parse_function_symbol(m.variable->getter, get_symbol);
 					get_symbol.local = true;
 					symbol.children.push_back(get_symbol);
 				}
 				if (m.variable->setter && m.variable->setter->type == GDScriptParser::Node::FUNCTION) {
-					lsp::DocumentSymbol set_symbol;
+					LSP::DocumentSymbol set_symbol;
 					parse_function_symbol(m.variable->setter, set_symbol);
 					set_symbol.local = true;
 					symbol.children.push_back(set_symbol);
@@ -321,10 +321,10 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::CONSTANT: {
-				lsp::DocumentSymbol symbol;
+				LSP::DocumentSymbol symbol;
 
 				symbol.name = m.constant->identifier->name;
-				symbol.kind = lsp::SymbolKind::Constant;
+				symbol.kind = LSP::SymbolKind::Constant;
 				symbol.deprecated = false;
 				symbol.range = range_of_node(m.constant);
 				symbol.selectionRange = range_of_node(m.constant->identifier);
@@ -361,9 +361,9 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::SIGNAL: {
-				lsp::DocumentSymbol symbol;
+				LSP::DocumentSymbol symbol;
 				symbol.name = m.signal->identifier->name;
-				symbol.kind = lsp::SymbolKind::Event;
+				symbol.kind = LSP::SymbolKind::Event;
 				symbol.deprecated = false;
 				symbol.range = range_of_node(m.signal);
 				symbol.selectionRange = range_of_node(m.signal->identifier);
@@ -380,9 +380,9 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				symbol.detail += ")";
 
 				for (GDScriptParser::ParameterNode *param : m.signal->parameters) {
-					lsp::DocumentSymbol param_symbol;
+					LSP::DocumentSymbol param_symbol;
 					param_symbol.name = param->identifier->name;
-					param_symbol.kind = lsp::SymbolKind::Variable;
+					param_symbol.kind = LSP::SymbolKind::Variable;
 					param_symbol.deprecated = false;
 					param_symbol.local = true;
 					param_symbol.range = range_of_node(param);
@@ -398,10 +398,10 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::ENUM_VALUE: {
-				lsp::DocumentSymbol symbol;
+				LSP::DocumentSymbol symbol;
 
 				symbol.name = m.enum_value.identifier->name;
-				symbol.kind = lsp::SymbolKind::EnumMember;
+				symbol.kind = LSP::SymbolKind::EnumMember;
 				symbol.deprecated = false;
 				symbol.range.start = GodotPosition(m.enum_value.line, m.enum_value.leftmost_column).to_lsp(lines);
 				symbol.range.end = GodotPosition(m.enum_value.line, m.enum_value.rightmost_column).to_lsp(lines);
@@ -415,9 +415,9 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::ENUM: {
-				lsp::DocumentSymbol symbol;
+				LSP::DocumentSymbol symbol;
 				symbol.name = m.m_enum->identifier->name;
-				symbol.kind = lsp::SymbolKind::Enum;
+				symbol.kind = LSP::SymbolKind::Enum;
 				symbol.range = range_of_node(m.m_enum);
 				symbol.selectionRange = range_of_node(m.m_enum->identifier);
 				symbol.documentation = m.m_enum->doc_data.description;
@@ -434,10 +434,10 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				symbol.detail += "}";
 
 				for (GDScriptParser::EnumNode::Value value : m.m_enum->values) {
-					lsp::DocumentSymbol child;
+					LSP::DocumentSymbol child;
 
 					child.name = value.identifier->name;
-					child.kind = lsp::SymbolKind::EnumMember;
+					child.kind = LSP::SymbolKind::EnumMember;
 					child.deprecated = false;
 					child.range.start = GodotPosition(value.line, value.leftmost_column).to_lsp(lines);
 					child.range.end = GodotPosition(value.line, value.rightmost_column).to_lsp(lines);
@@ -454,12 +454,12 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::FUNCTION: {
-				lsp::DocumentSymbol symbol;
+				LSP::DocumentSymbol symbol;
 				parse_function_symbol(m.function, symbol);
 				r_symbol.children.push_back(symbol);
 			} break;
 			case ClassNode::Member::CLASS: {
-				lsp::DocumentSymbol symbol;
+				LSP::DocumentSymbol symbol;
 				parse_class_symbol(m.m_class, symbol);
 				r_symbol.children.push_back(symbol);
 			} break;
@@ -471,13 +471,13 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
 	}
 }
 
-void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol &r_symbol) {
+void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionNode *p_func, LSP::DocumentSymbol &r_symbol) {
 	const String uri = get_uri();
 
 	bool is_named = p_func->identifier != nullptr;
 
 	r_symbol.name = is_named ? p_func->identifier->name : "";
-	r_symbol.kind = (p_func->is_static || p_func->source_lambda != nullptr) ? lsp::SymbolKind::Function : lsp::SymbolKind::Method;
+	r_symbol.kind = (p_func->is_static || p_func->source_lambda != nullptr) ? LSP::SymbolKind::Function : LSP::SymbolKind::Method;
 	r_symbol.detail = "func";
 	if (is_named) {
 		r_symbol.detail += " " + String(p_func->identifier->name);
@@ -570,9 +570,9 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 		const GDScriptParser::SuiteNode *suite_node = N->get();
 		for (int i = 0; i < suite_node->locals.size(); i++) {
 			const SuiteNode::Local &local = suite_node->locals[i];
-			lsp::DocumentSymbol symbol;
+			LSP::DocumentSymbol symbol;
 			symbol.name = local.name;
-			symbol.kind = local.type == SuiteNode::Local::CONSTANT ? lsp::SymbolKind::Constant : lsp::SymbolKind::Variable;
+			symbol.kind = local.type == SuiteNode::Local::CONSTANT ? LSP::SymbolKind::Constant : LSP::SymbolKind::Variable;
 			switch (local.type) {
 				case SuiteNode::Local::CONSTANT:
 					symbol.range = range_of_node(local.constant);
@@ -583,7 +583,7 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 					symbol.selectionRange = range_of_node(local.variable->identifier);
 					if (local.variable->initializer && local.variable->initializer->type == GDScriptParser::Node::LAMBDA) {
 						GDScriptParser::LambdaNode *lambda_node = (GDScriptParser::LambdaNode *)local.variable->initializer;
-						lsp::DocumentSymbol lambda;
+						LSP::DocumentSymbol lambda;
 						parse_function_symbol(lambda_node->function, lambda);
 						// Merge lambda into current variable.
 						// -> Only interested in new variables, not lambda itself.
@@ -629,14 +629,14 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN
 	}
 }
 
-String ExtendGDScriptParser::get_text_for_completion(const lsp::Position &p_cursor) const {
+String ExtendGDScriptParser::get_text_for_completion(const LSP::Position &p_cursor) const {
 	String longthing;
 	int len = lines.size();
 	for (int i = 0; i < len; i++) {
 		if (i == p_cursor.line) {
 			longthing += lines[i].substr(0, p_cursor.character);
 			longthing += String::chr(0xFFFF); // Not unicode, represents the cursor.
-			longthing += lines[i].substr(p_cursor.character, lines[i].size());
+			longthing += lines[i].substr(p_cursor.character);
 		} else {
 			longthing += lines[i];
 		}
@@ -649,7 +649,7 @@ String ExtendGDScriptParser::get_text_for_completion(const lsp::Position &p_curs
 	return longthing;
 }
 
-String ExtendGDScriptParser::get_text_for_lookup_symbol(const lsp::Position &p_cursor, const String &p_symbol, bool p_func_required) const {
+String ExtendGDScriptParser::get_text_for_lookup_symbol(const LSP::Position &p_cursor, const String &p_symbol, bool p_func_required) const {
 	String longthing;
 	int len = lines.size();
 	for (int i = 0; i < len; i++) {
@@ -687,7 +687,7 @@ String ExtendGDScriptParser::get_text_for_lookup_symbol(const lsp::Position &p_c
 	return longthing;
 }
 
-String ExtendGDScriptParser::get_identifier_under_position(const lsp::Position &p_position, lsp::Range &r_range) const {
+String ExtendGDScriptParser::get_identifier_under_position(const LSP::Position &p_position, LSP::Range &r_range) const {
 	ERR_FAIL_INDEX_V(p_position.line, lines.size(), "");
 	String line = lines[p_position.line];
 	if (line.is_empty()) {
@@ -709,7 +709,7 @@ String ExtendGDScriptParser::get_identifier_under_position(const lsp::Position &
 	// -> Move position to previous character if:
 	//    * Position not on valid identifier char.
 	//    * Prev position is valid identifier char.
-	lsp::Position pos = p_position;
+	LSP::Position pos = p_position;
 	if (
 			pos.character >= line.length() // Cursor at end of line.
 			|| (!is_ascii_identifier_char(line[pos.character]) // Not on valid identifier char.
@@ -753,8 +753,8 @@ String ExtendGDScriptParser::get_uri() const {
 	return GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_uri(path);
 }
 
-const lsp::DocumentSymbol *ExtendGDScriptParser::search_symbol_defined_at_line(int p_line, const lsp::DocumentSymbol &p_parent, const String &p_symbol_name) const {
-	const lsp::DocumentSymbol *ret = nullptr;
+const LSP::DocumentSymbol *ExtendGDScriptParser::search_symbol_defined_at_line(int p_line, const LSP::DocumentSymbol &p_parent, const String &p_symbol_name) const {
+	const LSP::DocumentSymbol *ret = nullptr;
 	if (p_line < p_parent.range.start.line) {
 		return ret;
 	} else if (p_parent.range.start.line == p_line && (p_symbol_name.is_empty() || p_parent.name == p_symbol_name)) {
@@ -770,7 +770,7 @@ const lsp::DocumentSymbol *ExtendGDScriptParser::search_symbol_defined_at_line(i
 	return ret;
 }
 
-Error ExtendGDScriptParser::get_left_function_call(const lsp::Position &p_position, lsp::Position &r_func_pos, int &r_arg_index) const {
+Error ExtendGDScriptParser::get_left_function_call(const LSP::Position &p_position, LSP::Position &r_func_pos, int &r_arg_index) const {
 	ERR_FAIL_INDEX_V(p_position.line, lines.size(), ERR_INVALID_PARAMETER);
 
 	int bracket_stack = 0;
@@ -814,22 +814,22 @@ Error ExtendGDScriptParser::get_left_function_call(const lsp::Position &p_positi
 	return ERR_METHOD_NOT_FOUND;
 }
 
-const lsp::DocumentSymbol *ExtendGDScriptParser::get_symbol_defined_at_line(int p_line, const String &p_symbol_name) const {
+const LSP::DocumentSymbol *ExtendGDScriptParser::get_symbol_defined_at_line(int p_line, const String &p_symbol_name) const {
 	if (p_line <= 0) {
 		return &class_symbol;
 	}
 	return search_symbol_defined_at_line(p_line, class_symbol, p_symbol_name);
 }
 
-const lsp::DocumentSymbol *ExtendGDScriptParser::get_member_symbol(const String &p_name, const String &p_subclass) const {
+const LSP::DocumentSymbol *ExtendGDScriptParser::get_member_symbol(const String &p_name, const String &p_subclass) const {
 	if (p_subclass.is_empty()) {
-		const lsp::DocumentSymbol *const *ptr = members.getptr(p_name);
+		const LSP::DocumentSymbol *const *ptr = members.getptr(p_name);
 		if (ptr) {
 			return *ptr;
 		}
 	} else {
 		if (const ClassMembers *_class = inner_classes.getptr(p_subclass)) {
-			const lsp::DocumentSymbol *const *ptr = _class->getptr(p_name);
+			const LSP::DocumentSymbol *const *ptr = _class->getptr(p_name);
 			if (ptr) {
 				return *ptr;
 			}
@@ -839,15 +839,15 @@ const lsp::DocumentSymbol *ExtendGDScriptParser::get_member_symbol(const String
 	return nullptr;
 }
 
-const List<lsp::DocumentLink> &ExtendGDScriptParser::get_document_links() const {
+const List<LSP::DocumentLink> &ExtendGDScriptParser::get_document_links() const {
 	return document_links;
 }
 
 const Array &ExtendGDScriptParser::get_member_completions() {
 	if (member_completions.is_empty()) {
-		for (const KeyValue<String, const lsp::DocumentSymbol *> &E : members) {
-			const lsp::DocumentSymbol *symbol = E.value;
-			lsp::CompletionItem item = symbol->make_completion_item();
+		for (const KeyValue<String, const LSP::DocumentSymbol *> &E : members) {
+			const LSP::DocumentSymbol *symbol = E.value;
+			LSP::CompletionItem item = symbol->make_completion_item();
 			item.data = JOIN_SYMBOLS(path, E.key);
 			member_completions.push_back(item.to_json());
 		}
@@ -855,9 +855,9 @@ const Array &ExtendGDScriptParser::get_member_completions() {
 		for (const KeyValue<String, ClassMembers> &E : inner_classes) {
 			const ClassMembers *inner_class = &E.value;
 
-			for (const KeyValue<String, const lsp::DocumentSymbol *> &F : *inner_class) {
-				const lsp::DocumentSymbol *symbol = F.value;
-				lsp::CompletionItem item = symbol->make_completion_item();
+			for (const KeyValue<String, const LSP::DocumentSymbol *> &F : *inner_class) {
+				const LSP::DocumentSymbol *symbol = F.value;
+				LSP::CompletionItem item = symbol->make_completion_item();
 				item.data = JOIN_SYMBOLS(path, JOIN_SYMBOLS(E.key, F.key));
 				member_completions.push_back(item.to_json());
 			}
@@ -883,7 +883,7 @@ Dictionary ExtendGDScriptParser::dump_function_api(const GDScriptParser::Functio
 		}
 		parameters.push_back(arg);
 	}
-	if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_func->start_line))) {
+	if (const LSP::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_func->start_line))) {
 		func["signature"] = symbol->detail;
 		func["description"] = symbol->documentation;
 	}
@@ -906,7 +906,7 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 	class_api["extends_file"] = String(p_class->extends_path);
 	class_api["icon"] = String(p_class->icon_path);
 
-	if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_class->start_line))) {
+	if (const LSP::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(p_class->start_line))) {
 		class_api["signature"] = symbol->detail;
 		class_api["description"] = symbol->documentation;
 	}
@@ -929,7 +929,7 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 				api["name"] = m.constant->identifier->name;
 				api["value"] = m.constant->initializer->reduced_value;
 				api["data_type"] = m.constant->get_datatype().to_string();
-				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.constant->start_line))) {
+				if (const LSP::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.constant->start_line))) {
 					api["signature"] = symbol->detail;
 					api["description"] = symbol->documentation;
 				}
@@ -940,7 +940,7 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 				api["name"] = m.enum_value.identifier->name;
 				api["value"] = m.enum_value.value;
 				api["data_type"] = m.get_datatype().to_string();
-				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.enum_value.line))) {
+				if (const LSP::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.enum_value.line))) {
 					api["signature"] = symbol->detail;
 					api["description"] = symbol->documentation;
 				}
@@ -956,7 +956,7 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 				api["name"] = m.m_enum->identifier->name;
 				api["value"] = enum_dict;
 				api["data_type"] = m.get_datatype().to_string();
-				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.m_enum->start_line))) {
+				if (const LSP::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.m_enum->start_line))) {
 					api["signature"] = symbol->detail;
 					api["description"] = symbol->documentation;
 				}
@@ -970,7 +970,7 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 				api["setter"] = m.variable->setter ? ("@" + String(m.variable->identifier->name) + "_setter") : (m.variable->setter_pointer != nullptr ? String(m.variable->setter_pointer->name) : String());
 				api["getter"] = m.variable->getter ? ("@" + String(m.variable->identifier->name) + "_getter") : (m.variable->getter_pointer != nullptr ? String(m.variable->getter_pointer->name) : String());
 				api["export"] = m.variable->exported;
-				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.variable->start_line))) {
+				if (const LSP::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.variable->start_line))) {
 					api["signature"] = symbol->detail;
 					api["description"] = symbol->documentation;
 				}
@@ -984,7 +984,7 @@ Dictionary ExtendGDScriptParser::dump_class_api(const GDScriptParser::ClassNode
 					pars.append(String(m.signal->parameters[j]->identifier->name));
 				}
 				api["arguments"] = pars;
-				if (const lsp::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.signal->start_line))) {
+				if (const LSP::DocumentSymbol *symbol = get_symbol_defined_at_line(LINE_NUMBER_TO_INDEX(m.signal->start_line))) {
 					api["signature"] = symbol->detail;
 					api["description"] = symbol->documentation;
 				}
diff --git a/engine/modules/gdscript/language_server/gdscript_extend_parser.h b/engine/modules/gdscript/language_server/gdscript_extend_parser.h
index 87ce9eb4..e7f6e41e 100644
--- a/engine/modules/gdscript/language_server/gdscript_extend_parser.h
+++ b/engine/modules/gdscript/language_server/gdscript_extend_parser.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_EXTEND_PARSER_H
-#define GDSCRIPT_EXTEND_PARSER_H
+#pragma once
 
 #include "../gdscript_parser.h"
 #include "godot_lsp.h"
@@ -51,12 +50,12 @@
 #define JOIN_SYMBOLS(p_path, name) ((p_path) + SYMBOL_SEPARATOR + (name))
 #endif
 
-typedef HashMap<String, const lsp::DocumentSymbol *> ClassMembers;
+typedef HashMap<String, const LSP::DocumentSymbol *> ClassMembers;
 
 /**
- * Represents a Position as used by GDScript Parser. Used for conversion to and from `lsp::Position`.
+ * Represents a Position as used by GDScript Parser. Used for conversion to and from `LSP::Position`.
  *
- * Difference to `lsp::Position`:
+ * Difference to `LSP::Position`:
  * * Line & Char/column: 1-based
  * 		* LSP: both 0-based
  * * Tabs are expanded to columns using tab size (`text_editor/behavior/indent/size`).
@@ -80,8 +79,8 @@ struct GodotPosition {
 	GodotPosition(int p_line, int p_column) :
 			line(p_line), column(p_column) {}
 
-	lsp::Position to_lsp(const Vector<String> &p_lines) const;
-	static GodotPosition from_lsp(const lsp::Position p_pos, const Vector<String> &p_lines);
+	LSP::Position to_lsp(const Vector<String> &p_lines) const;
+	static GodotPosition from_lsp(const LSP::Position p_pos, const Vector<String> &p_lines);
 
 	bool operator==(const GodotPosition &p_other) const {
 		return line == p_other.line && column == p_other.column;
@@ -99,8 +98,8 @@ struct GodotRange {
 	GodotRange(GodotPosition p_start, GodotPosition p_end) :
 			start(p_start), end(p_end) {}
 
-	lsp::Range to_lsp(const Vector<String> &p_lines) const;
-	static GodotRange from_lsp(const lsp::Range &p_range, const Vector<String> &p_lines);
+	LSP::Range to_lsp(const Vector<String> &p_lines) const;
+	static GodotRange from_lsp(const LSP::Range &p_range, const Vector<String> &p_lines);
 
 	bool operator==(const GodotRange &p_other) const {
 		return start == p_other.start && end == p_other.end;
@@ -115,41 +114,41 @@ class ExtendGDScriptParser : public GDScriptParser {
 	String path;
 	Vector<String> lines;
 
-	lsp::DocumentSymbol class_symbol;
-	Vector<lsp::Diagnostic> diagnostics;
-	List<lsp::DocumentLink> document_links;
+	LSP::DocumentSymbol class_symbol;
+	Vector<LSP::Diagnostic> diagnostics;
+	List<LSP::DocumentLink> document_links;
 	ClassMembers members;
 	HashMap<String, ClassMembers> inner_classes;
 
-	lsp::Range range_of_node(const GDScriptParser::Node *p_node) const;
+	LSP::Range range_of_node(const GDScriptParser::Node *p_node) const;
 
 	void update_diagnostics();
 
 	void update_symbols();
 	void update_document_links(const String &p_code);
-	void parse_class_symbol(const GDScriptParser::ClassNode *p_class, lsp::DocumentSymbol &r_symbol);
-	void parse_function_symbol(const GDScriptParser::FunctionNode *p_func, lsp::DocumentSymbol &r_symbol);
+	void parse_class_symbol(const GDScriptParser::ClassNode *p_class, LSP::DocumentSymbol &r_symbol);
+	void parse_function_symbol(const GDScriptParser::FunctionNode *p_func, LSP::DocumentSymbol &r_symbol);
 
 	Dictionary dump_function_api(const GDScriptParser::FunctionNode *p_func) const;
 	Dictionary dump_class_api(const GDScriptParser::ClassNode *p_class) const;
 
-	const lsp::DocumentSymbol *search_symbol_defined_at_line(int p_line, const lsp::DocumentSymbol &p_parent, const String &p_symbol_name = "") const;
+	const LSP::DocumentSymbol *search_symbol_defined_at_line(int p_line, const LSP::DocumentSymbol &p_parent, const String &p_symbol_name = "") const;
 
 	Array member_completions;
 
 public:
 	_FORCE_INLINE_ const String &get_path() const { return path; }
 	_FORCE_INLINE_ const Vector<String> &get_lines() const { return lines; }
-	_FORCE_INLINE_ const lsp::DocumentSymbol &get_symbols() const { return class_symbol; }
-	_FORCE_INLINE_ const Vector<lsp::Diagnostic> &get_diagnostics() const { return diagnostics; }
+	_FORCE_INLINE_ const LSP::DocumentSymbol &get_symbols() const { return class_symbol; }
+	_FORCE_INLINE_ const Vector<LSP::Diagnostic> &get_diagnostics() const { return diagnostics; }
 	_FORCE_INLINE_ const ClassMembers &get_members() const { return members; }
 	_FORCE_INLINE_ const HashMap<String, ClassMembers> &get_inner_classes() const { return inner_classes; }
 
-	Error get_left_function_call(const lsp::Position &p_position, lsp::Position &r_func_pos, int &r_arg_index) const;
+	Error get_left_function_call(const LSP::Position &p_position, LSP::Position &r_func_pos, int &r_arg_index) const;
 
-	String get_text_for_completion(const lsp::Position &p_cursor) const;
-	String get_text_for_lookup_symbol(const lsp::Position &p_cursor, const String &p_symbol = "", bool p_func_required = false) const;
-	String get_identifier_under_position(const lsp::Position &p_position, lsp::Range &r_range) const;
+	String get_text_for_completion(const LSP::Position &p_cursor) const;
+	String get_text_for_lookup_symbol(const LSP::Position &p_cursor, const String &p_symbol = "", bool p_func_required = false) const;
+	String get_identifier_under_position(const LSP::Position &p_position, LSP::Range &r_range) const;
 	String get_uri() const;
 
 	/**
@@ -160,14 +159,12 @@ public:
 	 * -> Without `p_symbol_name`: returns `handle_arg`. Even if parameter (`arg`) is wanted.
 	 *    With `p_symbol_name`: symbol name MUST match `p_symbol_name`: returns `arg`.
 	 */
-	const lsp::DocumentSymbol *get_symbol_defined_at_line(int p_line, const String &p_symbol_name = "") const;
-	const lsp::DocumentSymbol *get_member_symbol(const String &p_name, const String &p_subclass = "") const;
-	const List<lsp::DocumentLink> &get_document_links() const;
+	const LSP::DocumentSymbol *get_symbol_defined_at_line(int p_line, const String &p_symbol_name = "") const;
+	const LSP::DocumentSymbol *get_member_symbol(const String &p_name, const String &p_subclass = "") const;
+	const List<LSP::DocumentLink> &get_document_links() const;
 
 	const Array &get_member_completions();
 	Dictionary generate_api() const;
 
 	Error parse(const String &p_code, const String &p_path);
 };
-
-#endif // GDSCRIPT_EXTEND_PARSER_H
diff --git a/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp b/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp
index b636dbe5..6042f991 100644
--- a/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_language_protocol.cpp
@@ -60,8 +60,7 @@ Error GDScriptLanguageProtocol::LSPeer::handle_data() {
 			// End of headers
 			if (l > 3 && r[l] == '\n' && r[l - 1] == '\r' && r[l - 2] == '\n' && r[l - 3] == '\r') {
 				r[l - 3] = '\0'; // Null terminate to read string
-				String header;
-				header.parse_utf8(r);
+				String header = String::utf8(r);
 				content_length = header.substr(16).to_int();
 				has_header = true;
 				req_pos = 0;
@@ -87,8 +86,7 @@ Error GDScriptLanguageProtocol::LSPeer::handle_data() {
 		}
 
 		// Parse data
-		String msg;
-		msg.parse_utf8((const char *)req_buf, req_pos);
+		String msg = String::utf8((const char *)req_buf, req_pos);
 
 		// Reset to read again
 		req_pos = 0;
@@ -171,7 +169,7 @@ void GDScriptLanguageProtocol::_bind_methods() {
 }
 
 Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
-	lsp::InitializeResult ret;
+	LSP::InitializeResult ret;
 
 	String root_uri = p_params["rootUri"];
 	String root = p_params["rootPath"];
@@ -179,7 +177,7 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
 #ifndef WINDOWS_ENABLED
 	is_same_workspace = root.to_lower() == workspace->root.to_lower();
 #else
-	is_same_workspace = root.replace("\\", "/").to_lower() == workspace->root.to_lower();
+	is_same_workspace = root.replace_char('\\', '/').to_lower() == workspace->root.to_lower();
 #endif
 
 	if (root_uri.length() && is_same_workspace) {
@@ -213,11 +211,11 @@ Dictionary GDScriptLanguageProtocol::initialize(const Dictionary &p_params) {
 }
 
 void GDScriptLanguageProtocol::initialized(const Variant &p_params) {
-	lsp::GodotCapabilities capabilities;
+	LSP::GodotCapabilities capabilities;
 
 	DocTools *doc = EditorHelp::get_doc_data();
 	for (const KeyValue<String, DocData::ClassDoc> &E : doc->class_list) {
-		lsp::GodotNativeClassInfo gdclass;
+		LSP::GodotNativeClassInfo gdclass;
 		gdclass.name = E.value.name;
 		gdclass.class_doc = &(E.value);
 		if (ClassDB::ClassInfo *ptr = ClassDB::classes.getptr(StringName(E.value.name))) {
@@ -336,13 +334,50 @@ bool GDScriptLanguageProtocol::is_goto_native_symbols_enabled() const {
 	return bool(_EDITOR_GET("network/language_server/show_native_symbols_in_editor"));
 }
 
+// clang-format off
+#define SET_DOCUMENT_METHOD(m_method) set_method(_STR(textDocument/m_method), callable_mp(text_document.ptr(), &GDScriptTextDocument::m_method))
+#define SET_COMPLETION_METHOD(m_method) set_method(_STR(completionItem/m_method), callable_mp(text_document.ptr(), &GDScriptTextDocument::m_method))
+#define SET_WORKSPACE_METHOD(m_method) set_method(_STR(workspace/m_method), callable_mp(workspace.ptr(), &GDScriptWorkspace::m_method))
+// clang-format on
+
 GDScriptLanguageProtocol::GDScriptLanguageProtocol() {
 	server.instantiate();
 	singleton = this;
 	workspace.instantiate();
 	text_document.instantiate();
-	set_scope("textDocument", text_document.ptr());
-	set_scope("completionItem", text_document.ptr());
-	set_scope("workspace", workspace.ptr());
+
+	SET_DOCUMENT_METHOD(didOpen);
+	SET_DOCUMENT_METHOD(didClose);
+	SET_DOCUMENT_METHOD(didChange);
+	SET_DOCUMENT_METHOD(willSaveWaitUntil);
+	SET_DOCUMENT_METHOD(didSave);
+
+	SET_DOCUMENT_METHOD(documentSymbol);
+	SET_DOCUMENT_METHOD(completion);
+	SET_DOCUMENT_METHOD(rename);
+	SET_DOCUMENT_METHOD(prepareRename);
+	SET_DOCUMENT_METHOD(references);
+	SET_DOCUMENT_METHOD(foldingRange);
+	SET_DOCUMENT_METHOD(codeLens);
+	SET_DOCUMENT_METHOD(documentLink);
+	SET_DOCUMENT_METHOD(colorPresentation);
+	SET_DOCUMENT_METHOD(hover);
+	SET_DOCUMENT_METHOD(definition);
+	SET_DOCUMENT_METHOD(declaration);
+	SET_DOCUMENT_METHOD(signatureHelp);
+
+	SET_DOCUMENT_METHOD(nativeSymbol); // Custom method.
+
+	SET_COMPLETION_METHOD(resolve);
+
+	SET_WORKSPACE_METHOD(didDeleteFiles);
+
+	set_method("initialize", callable_mp(this, &GDScriptLanguageProtocol::initialize));
+	set_method("initialized", callable_mp(this, &GDScriptLanguageProtocol::initialized));
+
 	workspace->root = ProjectSettings::get_singleton()->get_resource_path();
 }
+
+#undef SET_DOCUMENT_METHOD
+#undef SET_COMPLETION_METHOD
+#undef SET_WORKSPACE_METHOD
diff --git a/engine/modules/gdscript/language_server/gdscript_language_protocol.h b/engine/modules/gdscript/language_server/gdscript_language_protocol.h
index 7f3f1d6d..afdd849b 100644
--- a/engine/modules/gdscript/language_server/gdscript_language_protocol.h
+++ b/engine/modules/gdscript/language_server/gdscript_language_protocol.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_LANGUAGE_PROTOCOL_H
-#define GDSCRIPT_LANGUAGE_PROTOCOL_H
+#pragma once
 
 #include "gdscript_text_document.h"
 #include "gdscript_workspace.h"
@@ -37,12 +36,7 @@
 #include "core/io/stream_peer_tcp.h"
 #include "core/io/tcp_server.h"
 
-#include "modules/modules_enabled.gen.h" // For jsonrpc.
-#ifdef MODULE_JSONRPC_ENABLED
 #include "modules/jsonrpc/jsonrpc.h"
-#else
-#error "Can't build GDScript LSP without JSONRPC module."
-#endif
 
 #define LSP_MAX_BUFFER_SIZE 4194304
 #define LSP_MAX_CLIENTS 8
@@ -115,5 +109,3 @@ public:
 
 	GDScriptLanguageProtocol();
 };
-
-#endif // GDSCRIPT_LANGUAGE_PROTOCOL_H
diff --git a/engine/modules/gdscript/language_server/gdscript_language_server.h b/engine/modules/gdscript/language_server/gdscript_language_server.h
index 481ea9eb..b71e55b3 100644
--- a/engine/modules/gdscript/language_server/gdscript_language_server.h
+++ b/engine/modules/gdscript/language_server/gdscript_language_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_LANGUAGE_SERVER_H
-#define GDSCRIPT_LANGUAGE_SERVER_H
+#pragma once
 
 #include "gdscript_language_protocol.h"
 
@@ -60,5 +59,3 @@ public:
 };
 
 void register_lsp_types();
-
-#endif // GDSCRIPT_LANGUAGE_SERVER_H
diff --git a/engine/modules/gdscript/language_server/gdscript_text_document.cpp b/engine/modules/gdscript/language_server/gdscript_text_document.cpp
index 72170777..eb325deb 100644
--- a/engine/modules/gdscript/language_server/gdscript_text_document.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_text_document.cpp
@@ -63,7 +63,7 @@ void GDScriptTextDocument::_bind_methods() {
 }
 
 void GDScriptTextDocument::didOpen(const Variant &p_param) {
-	lsp::TextDocumentItem doc = load_document_item(p_param);
+	LSP::TextDocumentItem doc = load_document_item(p_param);
 	sync_script_content(doc.uri, doc.text);
 }
 
@@ -73,11 +73,11 @@ void GDScriptTextDocument::didClose(const Variant &p_param) {
 }
 
 void GDScriptTextDocument::didChange(const Variant &p_param) {
-	lsp::TextDocumentItem doc = load_document_item(p_param);
+	LSP::TextDocumentItem doc = load_document_item(p_param);
 	Dictionary dict = p_param;
 	Array contentChanges = dict["contentChanges"];
 	for (int i = 0; i < contentChanges.size(); ++i) {
-		lsp::TextDocumentContentChangeEvent evt;
+		LSP::TextDocumentContentChangeEvent evt;
 		evt.load(contentChanges[i]);
 		doc.text = evt.text;
 	}
@@ -85,7 +85,7 @@ void GDScriptTextDocument::didChange(const Variant &p_param) {
 }
 
 void GDScriptTextDocument::willSaveWaitUntil(const Variant &p_param) {
-	lsp::TextDocumentItem doc = load_document_item(p_param);
+	LSP::TextDocumentItem doc = load_document_item(p_param);
 
 	String path = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_path(doc.uri);
 	Ref<Script> scr = ResourceLoader::load(path);
@@ -95,7 +95,7 @@ void GDScriptTextDocument::willSaveWaitUntil(const Variant &p_param) {
 }
 
 void GDScriptTextDocument::didSave(const Variant &p_param) {
-	lsp::TextDocumentItem doc = load_document_item(p_param);
+	LSP::TextDocumentItem doc = load_document_item(p_param);
 	Dictionary dict = p_param;
 	String text = dict["text"];
 
@@ -126,14 +126,14 @@ void GDScriptTextDocument::reload_script(Ref<GDScript> p_to_reload_script) {
 	ScriptEditor::get_singleton()->trigger_live_script_reload(p_to_reload_script->get_path());
 }
 
-lsp::TextDocumentItem GDScriptTextDocument::load_document_item(const Variant &p_param) {
-	lsp::TextDocumentItem doc;
+LSP::TextDocumentItem GDScriptTextDocument::load_document_item(const Variant &p_param) {
+	LSP::TextDocumentItem doc;
 	Dictionary params = p_param;
 	doc.load(params["textDocument"]);
 	return doc;
 }
 
-void GDScriptTextDocument::notify_client_show_symbol(const lsp::DocumentSymbol *symbol) {
+void GDScriptTextDocument::notify_client_show_symbol(const LSP::DocumentSymbol *symbol) {
 	ERR_FAIL_NULL(symbol);
 	GDScriptLanguageProtocol::get_singleton()->notify_client("gdscript/show_native_symbol", symbol->to_json(true));
 }
@@ -143,9 +143,9 @@ void GDScriptTextDocument::initialize() {
 		for (const KeyValue<StringName, ClassMembers> &E : GDScriptLanguageProtocol::get_singleton()->get_workspace()->native_members) {
 			const ClassMembers &members = E.value;
 
-			for (const KeyValue<String, const lsp::DocumentSymbol *> &F : members) {
-				const lsp::DocumentSymbol *symbol = members.get(F.key);
-				lsp::CompletionItem item = symbol->make_completion_item();
+			for (const KeyValue<String, const LSP::DocumentSymbol *> &F : members) {
+				const LSP::DocumentSymbol *symbol = members.get(F.key);
+				LSP::CompletionItem item = symbol->make_completion_item();
 				item.data = JOIN_SYMBOLS(String(E.key), F.key);
 				native_member_completions.push_back(item.to_json());
 			}
@@ -156,10 +156,10 @@ void GDScriptTextDocument::initialize() {
 Variant GDScriptTextDocument::nativeSymbol(const Dictionary &p_params) {
 	Variant ret;
 
-	lsp::NativeSymbolInspectParams params;
+	LSP::NativeSymbolInspectParams params;
 	params.load(p_params);
 
-	if (const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_native_symbol(params)) {
+	if (const LSP::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_native_symbol(params)) {
 		ret = symbol->to_json(true);
 		notify_client_show_symbol(symbol);
 	}
@@ -173,7 +173,7 @@ Array GDScriptTextDocument::documentSymbol(const Dictionary &p_params) {
 	String path = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_path(uri);
 	Array arr;
 	if (HashMap<String, ExtendGDScriptParser *>::ConstIterator parser = GDScriptLanguageProtocol::get_singleton()->get_workspace()->scripts.find(path)) {
-		lsp::DocumentSymbol symbol = parser->value->get_symbols();
+		LSP::DocumentSymbol symbol = parser->value->get_symbols();
 		arr.push_back(symbol.to_json(true));
 	}
 	return arr;
@@ -182,7 +182,7 @@ Array GDScriptTextDocument::documentSymbol(const Dictionary &p_params) {
 Array GDScriptTextDocument::completion(const Dictionary &p_params) {
 	Array arr;
 
-	lsp::CompletionParams params;
+	LSP::CompletionParams params;
 	params.load(p_params);
 	Dictionary request_data = params.to_json();
 
@@ -194,41 +194,41 @@ Array GDScriptTextDocument::completion(const Dictionary &p_params) {
 		arr.resize(options.size());
 
 		for (const ScriptLanguage::CodeCompletionOption &option : options) {
-			lsp::CompletionItem item;
+			LSP::CompletionItem item;
 			item.label = option.display;
 			item.data = request_data;
 			item.insertText = option.insert_text;
 
 			switch (option.kind) {
 				case ScriptLanguage::CODE_COMPLETION_KIND_ENUM:
-					item.kind = lsp::CompletionItemKind::Enum;
+					item.kind = LSP::CompletionItemKind::Enum;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_CLASS:
-					item.kind = lsp::CompletionItemKind::Class;
+					item.kind = LSP::CompletionItemKind::Class;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_MEMBER:
-					item.kind = lsp::CompletionItemKind::Property;
+					item.kind = LSP::CompletionItemKind::Property;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION:
-					item.kind = lsp::CompletionItemKind::Method;
+					item.kind = LSP::CompletionItemKind::Method;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_SIGNAL:
-					item.kind = lsp::CompletionItemKind::Event;
+					item.kind = LSP::CompletionItemKind::Event;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT:
-					item.kind = lsp::CompletionItemKind::Constant;
+					item.kind = LSP::CompletionItemKind::Constant;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_VARIABLE:
-					item.kind = lsp::CompletionItemKind::Variable;
+					item.kind = LSP::CompletionItemKind::Variable;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_FILE_PATH:
-					item.kind = lsp::CompletionItemKind::File;
+					item.kind = LSP::CompletionItemKind::File;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_NODE_PATH:
-					item.kind = lsp::CompletionItemKind::Snippet;
+					item.kind = LSP::CompletionItemKind::Snippet;
 					break;
 				case ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT:
-					item.kind = lsp::CompletionItemKind::Text;
+					item.kind = LSP::CompletionItemKind::Text;
 					break;
 				default: {
 				}
@@ -242,7 +242,7 @@ Array GDScriptTextDocument::completion(const Dictionary &p_params) {
 }
 
 Dictionary GDScriptTextDocument::rename(const Dictionary &p_params) {
-	lsp::TextDocumentPositionParams params;
+	LSP::TextDocumentPositionParams params;
 	params.load(p_params);
 	String new_name = p_params["newName"];
 
@@ -250,11 +250,11 @@ Dictionary GDScriptTextDocument::rename(const Dictionary &p_params) {
 }
 
 Variant GDScriptTextDocument::prepareRename(const Dictionary &p_params) {
-	lsp::TextDocumentPositionParams params;
+	LSP::TextDocumentPositionParams params;
 	params.load(p_params);
 
-	lsp::DocumentSymbol symbol;
-	lsp::Range range;
+	LSP::DocumentSymbol symbol;
+	LSP::Range range;
 	if (GDScriptLanguageProtocol::get_singleton()->get_workspace()->can_rename(params, symbol, range)) {
 		return Variant(range.to_json());
 	}
@@ -266,16 +266,16 @@ Variant GDScriptTextDocument::prepareRename(const Dictionary &p_params) {
 Array GDScriptTextDocument::references(const Dictionary &p_params) {
 	Array res;
 
-	lsp::ReferenceParams params;
+	LSP::ReferenceParams params;
 	params.load(p_params);
 
-	const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params);
+	const LSP::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params);
 	if (symbol) {
-		Vector<lsp::Location> usages = GDScriptLanguageProtocol::get_singleton()->get_workspace()->find_all_usages(*symbol);
+		Vector<LSP::Location> usages = GDScriptLanguageProtocol::get_singleton()->get_workspace()->find_all_usages(*symbol);
 		res.resize(usages.size());
 		int declaration_adjustment = 0;
 		for (int i = 0; i < usages.size(); i++) {
-			lsp::Location usage = usages[i];
+			LSP::Location usage = usages[i];
 			if (!params.context.includeDeclaration && usage.range == symbol->range) {
 				declaration_adjustment++;
 				continue;
@@ -292,17 +292,17 @@ Array GDScriptTextDocument::references(const Dictionary &p_params) {
 }
 
 Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
-	lsp::CompletionItem item;
+	LSP::CompletionItem item;
 	item.load(p_params);
 
-	lsp::CompletionParams params;
+	LSP::CompletionParams params;
 	Variant data = p_params["data"];
 
-	const lsp::DocumentSymbol *symbol = nullptr;
+	const LSP::DocumentSymbol *symbol = nullptr;
 
 	if (data.get_type() == Variant::DICTIONARY) {
 		params.load(p_params["data"]);
-		symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params, item.label, item.kind == lsp::CompletionItemKind::Method || item.kind == lsp::CompletionItemKind::Function);
+		symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params, item.label, item.kind == LSP::CompletionItemKind::Method || item.kind == LSP::CompletionItemKind::Function);
 
 	} else if (data.is_string()) {
 		String query = data;
@@ -318,7 +318,7 @@ Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
 			}
 
 			if (const ClassMembers *members = GDScriptLanguageProtocol::get_singleton()->get_workspace()->native_members.getptr(class_name)) {
-				if (const lsp::DocumentSymbol *const *member = members->getptr(member_name)) {
+				if (const LSP::DocumentSymbol *const *member = members->getptr(member_name)) {
 					symbol = *member;
 				}
 			}
@@ -335,15 +335,15 @@ Dictionary GDScriptTextDocument::resolve(const Dictionary &p_params) {
 		item.documentation = symbol->render();
 	}
 
-	if (item.kind == lsp::CompletionItemKind::Event) {
-		if (params.context.triggerKind == lsp::CompletionTriggerKind::TriggerCharacter && (params.context.triggerCharacter == "(")) {
+	if (item.kind == LSP::CompletionItemKind::Event) {
+		if (params.context.triggerKind == LSP::CompletionTriggerKind::TriggerCharacter && (params.context.triggerCharacter == "(")) {
 			const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
 			item.insertText = item.label.quote(quote_style);
 		}
 	}
 
-	if (item.kind == lsp::CompletionItemKind::Method) {
-		bool is_trigger_character = params.context.triggerKind == lsp::CompletionTriggerKind::TriggerCharacter;
+	if (item.kind == LSP::CompletionItemKind::Method) {
+		bool is_trigger_character = params.context.triggerKind == LSP::CompletionTriggerKind::TriggerCharacter;
 		bool is_quote_character = params.context.triggerCharacter == "\"" || params.context.triggerCharacter == "'";
 
 		if (is_trigger_character && is_quote_character && item.insertText.is_quoted()) {
@@ -367,12 +367,12 @@ Array GDScriptTextDocument::codeLens(const Dictionary &p_params) {
 Array GDScriptTextDocument::documentLink(const Dictionary &p_params) {
 	Array ret;
 
-	lsp::DocumentLinkParams params;
+	LSP::DocumentLinkParams params;
 	params.load(p_params);
 
-	List<lsp::DocumentLink> links;
+	List<LSP::DocumentLink> links;
 	GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_document_links(params.textDocument.uri, links);
-	for (const lsp::DocumentLink &E : links) {
+	for (const LSP::DocumentLink &E : links) {
 		ret.push_back(E.to_json());
 	}
 	return ret;
@@ -384,12 +384,12 @@ Array GDScriptTextDocument::colorPresentation(const Dictionary &p_params) {
 }
 
 Variant GDScriptTextDocument::hover(const Dictionary &p_params) {
-	lsp::TextDocumentPositionParams params;
+	LSP::TextDocumentPositionParams params;
 	params.load(p_params);
 
-	const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params);
+	const LSP::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params);
 	if (symbol) {
-		lsp::Hover hover;
+		LSP::Hover hover;
 		hover.contents = symbol->render();
 		hover.range.start = params.position;
 		hover.range.end = params.position;
@@ -398,10 +398,10 @@ Variant GDScriptTextDocument::hover(const Dictionary &p_params) {
 	} else if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
 		Dictionary ret;
 		Array contents;
-		List<const lsp::DocumentSymbol *> list;
+		List<const LSP::DocumentSymbol *> list;
 		GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_related_symbols(params, list);
-		for (const lsp::DocumentSymbol *&E : list) {
-			if (const lsp::DocumentSymbol *s = E) {
+		for (const LSP::DocumentSymbol *&E : list) {
+			if (const LSP::DocumentSymbol *s = E) {
 				contents.push_back(s->render().value);
 			}
 		}
@@ -413,38 +413,38 @@ Variant GDScriptTextDocument::hover(const Dictionary &p_params) {
 }
 
 Array GDScriptTextDocument::definition(const Dictionary &p_params) {
-	lsp::TextDocumentPositionParams params;
+	LSP::TextDocumentPositionParams params;
 	params.load(p_params);
-	List<const lsp::DocumentSymbol *> symbols;
+	List<const LSP::DocumentSymbol *> symbols;
 	Array arr = find_symbols(params, symbols);
 	return arr;
 }
 
 Variant GDScriptTextDocument::declaration(const Dictionary &p_params) {
-	lsp::TextDocumentPositionParams params;
+	LSP::TextDocumentPositionParams params;
 	params.load(p_params);
-	List<const lsp::DocumentSymbol *> symbols;
+	List<const LSP::DocumentSymbol *> symbols;
 	Array arr = find_symbols(params, symbols);
 	if (arr.is_empty() && !symbols.is_empty() && !symbols.front()->get()->native_class.is_empty()) { // Find a native symbol
-		const lsp::DocumentSymbol *symbol = symbols.front()->get();
+		const LSP::DocumentSymbol *symbol = symbols.front()->get();
 		if (GDScriptLanguageProtocol::get_singleton()->is_goto_native_symbols_enabled()) {
 			String id;
 			switch (symbol->kind) {
-				case lsp::SymbolKind::Class:
+				case LSP::SymbolKind::Class:
 					id = "class_name:" + symbol->name;
 					break;
-				case lsp::SymbolKind::Constant:
+				case LSP::SymbolKind::Constant:
 					id = "class_constant:" + symbol->native_class + ":" + symbol->name;
 					break;
-				case lsp::SymbolKind::Property:
-				case lsp::SymbolKind::Variable:
+				case LSP::SymbolKind::Property:
+				case LSP::SymbolKind::Variable:
 					id = "class_property:" + symbol->native_class + ":" + symbol->name;
 					break;
-				case lsp::SymbolKind::Enum:
+				case LSP::SymbolKind::Enum:
 					id = "class_enum:" + symbol->native_class + ":" + symbol->name;
 					break;
-				case lsp::SymbolKind::Method:
-				case lsp::SymbolKind::Function:
+				case LSP::SymbolKind::Method:
+				case LSP::SymbolKind::Function:
 					id = "class_method:" + symbol->native_class + ":" + symbol->name;
 					break;
 				default:
@@ -462,10 +462,10 @@ Variant GDScriptTextDocument::declaration(const Dictionary &p_params) {
 Variant GDScriptTextDocument::signatureHelp(const Dictionary &p_params) {
 	Variant ret;
 
-	lsp::TextDocumentPositionParams params;
+	LSP::TextDocumentPositionParams params;
 	params.load(p_params);
 
-	lsp::SignatureHelp s;
+	LSP::SignatureHelp s;
 	if (OK == GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_signature(params, s)) {
 		ret = s.to_json();
 	}
@@ -488,11 +488,11 @@ void GDScriptTextDocument::show_native_symbol_in_editor(const String &p_symbol_i
 	DisplayServer::get_singleton()->window_move_to_foreground();
 }
 
-Array GDScriptTextDocument::find_symbols(const lsp::TextDocumentPositionParams &p_location, List<const lsp::DocumentSymbol *> &r_list) {
+Array GDScriptTextDocument::find_symbols(const LSP::TextDocumentPositionParams &p_location, List<const LSP::DocumentSymbol *> &r_list) {
 	Array arr;
-	const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(p_location);
+	const LSP::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(p_location);
 	if (symbol) {
-		lsp::Location location;
+		LSP::Location location;
 		location.uri = symbol->uri;
 		location.range = symbol->selectionRange;
 		const String &path = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_path(symbol->uri);
@@ -501,12 +501,12 @@ Array GDScriptTextDocument::find_symbols(const lsp::TextDocumentPositionParams &
 		}
 		r_list.push_back(symbol);
 	} else if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
-		List<const lsp::DocumentSymbol *> list;
+		List<const LSP::DocumentSymbol *> list;
 		GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_related_symbols(p_location, list);
-		for (const lsp::DocumentSymbol *&E : list) {
-			if (const lsp::DocumentSymbol *s = E) {
+		for (const LSP::DocumentSymbol *&E : list) {
+			if (const LSP::DocumentSymbol *s = E) {
 				if (!s->uri.is_empty()) {
-					lsp::Location location;
+					LSP::Location location;
 					location.uri = s->uri;
 					location.range = s->selectionRange;
 					arr.push_back(location.to_json());
diff --git a/engine/modules/gdscript/language_server/gdscript_text_document.h b/engine/modules/gdscript/language_server/gdscript_text_document.h
index 6b89adfe..5e3ef821 100644
--- a/engine/modules/gdscript/language_server/gdscript_text_document.h
+++ b/engine/modules/gdscript/language_server/gdscript_text_document.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_TEXT_DOCUMENT_H
-#define GDSCRIPT_TEXT_DOCUMENT_H
+#pragma once
 
 #include "godot_lsp.h"
 
@@ -45,6 +44,14 @@ protected:
 
 	Ref<FileAccess> file_checker;
 
+	Array native_member_completions;
+
+private:
+	Array find_symbols(const LSP::TextDocumentPositionParams &p_location, List<const LSP::DocumentSymbol *> &r_list);
+	LSP::TextDocumentItem load_document_item(const Variant &p_param);
+	void notify_client_show_symbol(const LSP::DocumentSymbol *symbol);
+
+public:
 	void didOpen(const Variant &p_param);
 	void didClose(const Variant &p_param);
 	void didChange(const Variant &p_param);
@@ -55,14 +62,6 @@ protected:
 	void sync_script_content(const String &p_path, const String &p_content);
 	void show_native_symbol_in_editor(const String &p_symbol_id);
 
-	Array native_member_completions;
-
-private:
-	Array find_symbols(const lsp::TextDocumentPositionParams &p_location, List<const lsp::DocumentSymbol *> &r_list);
-	lsp::TextDocumentItem load_document_item(const Variant &p_param);
-	void notify_client_show_symbol(const lsp::DocumentSymbol *symbol);
-
-public:
 	Variant nativeSymbol(const Dictionary &p_params);
 	Array documentSymbol(const Dictionary &p_params);
 	Array completion(const Dictionary &p_params);
@@ -83,5 +82,3 @@ public:
 
 	GDScriptTextDocument();
 };
-
-#endif // GDSCRIPT_TEXT_DOCUMENT_H
diff --git a/engine/modules/gdscript/language_server/gdscript_workspace.cpp b/engine/modules/gdscript/language_server/gdscript_workspace.cpp
index ed58588f..b891c42e 100644
--- a/engine/modules/gdscript/language_server/gdscript_workspace.cpp
+++ b/engine/modules/gdscript/language_server/gdscript_workspace.cpp
@@ -45,7 +45,7 @@
 
 void GDScriptWorkspace::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("apply_new_signal"), &GDScriptWorkspace::apply_new_signal);
-	ClassDB::bind_method(D_METHOD("didDeleteFiles"), &GDScriptWorkspace::did_delete_files);
+	ClassDB::bind_method(D_METHOD("didDeleteFiles"), &GDScriptWorkspace::didDeleteFiles);
 	ClassDB::bind_method(D_METHOD("parse_script", "path", "content"), &GDScriptWorkspace::parse_script);
 	ClassDB::bind_method(D_METHOD("parse_local_script", "path"), &GDScriptWorkspace::parse_local_script);
 	ClassDB::bind_method(D_METHOD("get_file_path", "uri"), &GDScriptWorkspace::get_file_path);
@@ -89,7 +89,7 @@ void GDScriptWorkspace::apply_new_signal(Object *obj, String function, PackedStr
 	}
 	function_body += ":\n\tpass # Replace with function body.\n";
 
-	lsp::TextEdit text_edit;
+	LSP::TextEdit text_edit;
 
 	if (first_class != -1) {
 		function_body += "\n\n";
@@ -100,13 +100,13 @@ void GDScriptWorkspace::apply_new_signal(Object *obj, String function, PackedStr
 
 	String uri = get_file_uri(scr->get_path());
 
-	lsp::ApplyWorkspaceEditParams params;
+	LSP::ApplyWorkspaceEditParams params;
 	params.edit.add_edit(uri, text_edit);
 
 	GDScriptLanguageProtocol::get_singleton()->request_client("workspace/applyEdit", params.to_json());
 }
 
-void GDScriptWorkspace::did_delete_files(const Dictionary &p_params) {
+void GDScriptWorkspace::didDeleteFiles(const Dictionary &p_params) {
 	Array files = p_params["files"];
 	for (int i = 0; i < files.size(); ++i) {
 		Dictionary file = files[i];
@@ -137,19 +137,19 @@ void GDScriptWorkspace::remove_cache_parser(const String &p_path) {
 	}
 }
 
-const lsp::DocumentSymbol *GDScriptWorkspace::get_native_symbol(const String &p_class, const String &p_member) const {
+const LSP::DocumentSymbol *GDScriptWorkspace::get_native_symbol(const String &p_class, const String &p_member) const {
 	StringName class_name = p_class;
 	StringName empty;
 
 	while (class_name != empty) {
-		if (HashMap<StringName, lsp::DocumentSymbol>::ConstIterator E = native_symbols.find(class_name)) {
-			const lsp::DocumentSymbol &class_symbol = E->value;
+		if (HashMap<StringName, LSP::DocumentSymbol>::ConstIterator E = native_symbols.find(class_name)) {
+			const LSP::DocumentSymbol &class_symbol = E->value;
 
 			if (p_member.is_empty()) {
 				return &class_symbol;
 			} else {
 				for (int i = 0; i < class_symbol.children.size(); i++) {
-					const lsp::DocumentSymbol &symbol = class_symbol.children[i];
+					const LSP::DocumentSymbol &symbol = class_symbol.children[i];
 					if (symbol.name == p_member) {
 						return &symbol;
 					}
@@ -162,7 +162,7 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_native_symbol(const String &p_
 	return nullptr;
 }
 
-const lsp::DocumentSymbol *GDScriptWorkspace::get_script_symbol(const String &p_path) const {
+const LSP::DocumentSymbol *GDScriptWorkspace::get_script_symbol(const String &p_path) const {
 	HashMap<String, ExtendGDScriptParser *>::ConstIterator S = scripts.find(p_path);
 	if (S) {
 		return &(S->value->get_symbols());
@@ -170,9 +170,9 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_script_symbol(const String &p_
 	return nullptr;
 }
 
-const lsp::DocumentSymbol *GDScriptWorkspace::get_parameter_symbol(const lsp::DocumentSymbol *p_parent, const String &symbol_identifier) {
+const LSP::DocumentSymbol *GDScriptWorkspace::get_parameter_symbol(const LSP::DocumentSymbol *p_parent, const String &symbol_identifier) {
 	for (int i = 0; i < p_parent->children.size(); ++i) {
-		const lsp::DocumentSymbol *parameter_symbol = &p_parent->children[i];
+		const LSP::DocumentSymbol *parameter_symbol = &p_parent->children[i];
 		if (!parameter_symbol->detail.is_empty() && parameter_symbol->name == symbol_identifier) {
 			return parameter_symbol;
 		}
@@ -181,11 +181,11 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_parameter_symbol(const lsp::Do
 	return nullptr;
 }
 
-const lsp::DocumentSymbol *GDScriptWorkspace::get_local_symbol_at(const ExtendGDScriptParser *p_parser, const String &p_symbol_identifier, const lsp::Position p_position) {
+const LSP::DocumentSymbol *GDScriptWorkspace::get_local_symbol_at(const ExtendGDScriptParser *p_parser, const String &p_symbol_identifier, const LSP::Position p_position) {
 	// Go down and pick closest `DocumentSymbol` with `p_symbol_identifier`.
 
-	const lsp::DocumentSymbol *current = &p_parser->get_symbols();
-	const lsp::DocumentSymbol *best_match = nullptr;
+	const LSP::DocumentSymbol *current = &p_parser->get_symbols();
+	const LSP::DocumentSymbol *best_match = nullptr;
 
 	while (current) {
 		if (current->name == p_symbol_identifier) {
@@ -197,9 +197,9 @@ const lsp::DocumentSymbol *GDScriptWorkspace::get_local_symbol_at(const ExtendGD
 			best_match = current;
 		}
 
-		const lsp::DocumentSymbol *parent = current;
+		const LSP::DocumentSymbol *parent = current;
 		current = nullptr;
-		for (const lsp::DocumentSymbol &child : parent->children) {
+		for (const LSP::DocumentSymbol &child : parent->children) {
 			if (child.range.contains(p_position)) {
 				current = &child;
 				break;
@@ -287,11 +287,11 @@ Error GDScriptWorkspace::initialize() {
 	DocTools *doc = EditorHelp::get_doc_data();
 	for (const KeyValue<String, DocData::ClassDoc> &E : doc->class_list) {
 		const DocData::ClassDoc &class_data = E.value;
-		lsp::DocumentSymbol class_symbol;
+		LSP::DocumentSymbol class_symbol;
 		String class_name = E.key;
 		class_symbol.name = class_name;
 		class_symbol.native_class = class_name;
-		class_symbol.kind = lsp::SymbolKind::Class;
+		class_symbol.kind = LSP::SymbolKind::Class;
 		class_symbol.detail = String("<Native> class ") + class_name;
 		if (!class_data.inherits.is_empty()) {
 			class_symbol.detail += " extends " + class_data.inherits;
@@ -300,10 +300,10 @@ Error GDScriptWorkspace::initialize() {
 
 		for (int i = 0; i < class_data.constants.size(); i++) {
 			const DocData::ConstantDoc &const_data = class_data.constants[i];
-			lsp::DocumentSymbol symbol;
+			LSP::DocumentSymbol symbol;
 			symbol.name = const_data.name;
 			symbol.native_class = class_name;
-			symbol.kind = lsp::SymbolKind::Constant;
+			symbol.kind = LSP::SymbolKind::Constant;
 			symbol.detail = "const " + class_name + "." + const_data.name;
 			if (const_data.enumeration.length()) {
 				symbol.detail += ": " + const_data.enumeration;
@@ -315,10 +315,10 @@ Error GDScriptWorkspace::initialize() {
 
 		for (int i = 0; i < class_data.properties.size(); i++) {
 			const DocData::PropertyDoc &data = class_data.properties[i];
-			lsp::DocumentSymbol symbol;
+			LSP::DocumentSymbol symbol;
 			symbol.name = data.name;
 			symbol.native_class = class_name;
-			symbol.kind = lsp::SymbolKind::Property;
+			symbol.kind = LSP::SymbolKind::Property;
 			symbol.detail = "var " + class_name + "." + data.name;
 			if (data.enumeration.length()) {
 				symbol.detail += ": " + data.enumeration;
@@ -331,10 +331,10 @@ Error GDScriptWorkspace::initialize() {
 
 		for (int i = 0; i < class_data.theme_properties.size(); i++) {
 			const DocData::ThemeItemDoc &data = class_data.theme_properties[i];
-			lsp::DocumentSymbol symbol;
+			LSP::DocumentSymbol symbol;
 			symbol.name = data.name;
 			symbol.native_class = class_name;
-			symbol.kind = lsp::SymbolKind::Property;
+			symbol.kind = LSP::SymbolKind::Property;
 			symbol.detail = "<Theme> var " + class_name + "." + data.name + ": " + data.type;
 			symbol.documentation = data.description;
 			class_symbol.children.push_back(symbol);
@@ -350,19 +350,19 @@ Error GDScriptWorkspace::initialize() {
 		for (int i = 0; i < methods_signals.size(); i++) {
 			const DocData::MethodDoc &data = methods_signals[i];
 
-			lsp::DocumentSymbol symbol;
+			LSP::DocumentSymbol symbol;
 			symbol.name = data.name;
 			symbol.native_class = class_name;
-			symbol.kind = i >= signal_start_idx ? lsp::SymbolKind::Event : lsp::SymbolKind::Method;
+			symbol.kind = i >= signal_start_idx ? LSP::SymbolKind::Event : LSP::SymbolKind::Method;
 
 			String params = "";
 			bool arg_default_value_started = false;
 			for (int j = 0; j < data.arguments.size(); j++) {
 				const DocData::ArgumentDoc &arg = data.arguments[j];
 
-				lsp::DocumentSymbol symbol_arg;
+				LSP::DocumentSymbol symbol_arg;
 				symbol_arg.name = arg.name;
-				symbol_arg.kind = lsp::SymbolKind::Variable;
+				symbol_arg.kind = LSP::SymbolKind::Variable;
 				symbol_arg.detail = arg.type;
 
 				if (!arg_default_value_started && !arg.default_value.is_empty()) {
@@ -398,11 +398,11 @@ Error GDScriptWorkspace::initialize() {
 	reload_all_workspace_scripts();
 
 	if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
-		for (const KeyValue<StringName, lsp::DocumentSymbol> &E : native_symbols) {
+		for (const KeyValue<StringName, LSP::DocumentSymbol> &E : native_symbols) {
 			ClassMembers members;
-			const lsp::DocumentSymbol &class_symbol = E.value;
+			const LSP::DocumentSymbol &class_symbol = E.value;
 			for (int i = 0; i < class_symbol.children.size(); i++) {
-				const lsp::DocumentSymbol &symbol = class_symbol.children[i];
+				const LSP::DocumentSymbol &symbol = class_symbol.children[i];
 				members.insert(symbol.name, &symbol);
 			}
 			native_members.insert(E.key, members);
@@ -443,7 +443,7 @@ Error GDScriptWorkspace::parse_script(const String &p_path, const String &p_cont
 	return err;
 }
 
-static bool is_valid_rename_target(const lsp::DocumentSymbol *p_symbol) {
+static bool is_valid_rename_target(const LSP::DocumentSymbol *p_symbol) {
 	// Must be valid symbol.
 	if (!p_symbol) {
 		return false;
@@ -462,14 +462,14 @@ static bool is_valid_rename_target(const lsp::DocumentSymbol *p_symbol) {
 	return true;
 }
 
-Dictionary GDScriptWorkspace::rename(const lsp::TextDocumentPositionParams &p_doc_pos, const String &new_name) {
-	lsp::WorkspaceEdit edit;
+Dictionary GDScriptWorkspace::rename(const LSP::TextDocumentPositionParams &p_doc_pos, const String &new_name) {
+	LSP::WorkspaceEdit edit;
 
-	const lsp::DocumentSymbol *reference_symbol = resolve_symbol(p_doc_pos);
+	const LSP::DocumentSymbol *reference_symbol = resolve_symbol(p_doc_pos);
 	if (is_valid_rename_target(reference_symbol)) {
-		Vector<lsp::Location> usages = find_all_usages(*reference_symbol);
+		Vector<LSP::Location> usages = find_all_usages(*reference_symbol);
 		for (int i = 0; i < usages.size(); ++i) {
-			lsp::Location loc = usages[i];
+			LSP::Location loc = usages[i];
 
 			edit.add_change(loc.uri, loc.range.start.line, loc.range.start.character, loc.range.end.character, new_name);
 		}
@@ -478,8 +478,8 @@ Dictionary GDScriptWorkspace::rename(const lsp::TextDocumentPositionParams &p_do
 	return edit.to_json();
 }
 
-bool GDScriptWorkspace::can_rename(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::DocumentSymbol &r_symbol, lsp::Range &r_range) {
-	const lsp::DocumentSymbol *reference_symbol = resolve_symbol(p_doc_pos);
+bool GDScriptWorkspace::can_rename(const LSP::TextDocumentPositionParams &p_doc_pos, LSP::DocumentSymbol &r_symbol, LSP::Range &r_range) {
+	const LSP::DocumentSymbol *reference_symbol = resolve_symbol(p_doc_pos);
 	if (!is_valid_rename_target(reference_symbol)) {
 		return false;
 	}
@@ -494,8 +494,8 @@ bool GDScriptWorkspace::can_rename(const lsp::TextDocumentPositionParams &p_doc_
 	return false;
 }
 
-Vector<lsp::Location> GDScriptWorkspace::find_usages_in_file(const lsp::DocumentSymbol &p_symbol, const String &p_file_path) {
-	Vector<lsp::Location> usages;
+Vector<LSP::Location> GDScriptWorkspace::find_usages_in_file(const LSP::DocumentSymbol &p_symbol, const String &p_file_path) {
+	Vector<LSP::Location> usages;
 
 	String identifier = p_symbol.name;
 	if (const ExtendGDScriptParser *parser = get_parse_result(p_file_path)) {
@@ -505,19 +505,19 @@ Vector<lsp::Location> GDScriptWorkspace::find_usages_in_file(const lsp::Document
 
 			int character = line.find(identifier);
 			while (character > -1) {
-				lsp::TextDocumentPositionParams params;
+				LSP::TextDocumentPositionParams params;
 
-				lsp::TextDocumentIdentifier text_doc;
+				LSP::TextDocumentIdentifier text_doc;
 				text_doc.uri = get_file_uri(p_file_path);
 
 				params.textDocument = text_doc;
 				params.position.line = i;
 				params.position.character = character;
 
-				const lsp::DocumentSymbol *other_symbol = resolve_symbol(params);
+				const LSP::DocumentSymbol *other_symbol = resolve_symbol(params);
 
 				if (other_symbol == &p_symbol) {
-					lsp::Location loc;
+					LSP::Location loc;
 					loc.uri = text_doc.uri;
 					loc.range.start = params.position;
 					loc.range.end.line = params.position.line;
@@ -533,7 +533,7 @@ Vector<lsp::Location> GDScriptWorkspace::find_usages_in_file(const lsp::Document
 	return usages;
 }
 
-Vector<lsp::Location> GDScriptWorkspace::find_all_usages(const lsp::DocumentSymbol &p_symbol) {
+Vector<LSP::Location> GDScriptWorkspace::find_all_usages(const LSP::DocumentSymbol &p_symbol) {
 	if (p_symbol.local) {
 		// Only search in current document.
 		return find_usages_in_file(p_symbol, p_symbol.script_path);
@@ -542,9 +542,9 @@ Vector<lsp::Location> GDScriptWorkspace::find_all_usages(const lsp::DocumentSymb
 	List<String> paths;
 	list_script_files("res://", paths);
 
-	Vector<lsp::Location> usages;
-	for (List<String>::Element *PE = paths.front(); PE; PE = PE->next()) {
-		usages.append_array(find_usages_in_file(p_symbol, PE->get()));
+	Vector<LSP::Location> usages;
+	for (const String &path : paths) {
+		usages.append_array(find_usages_in_file(p_symbol, path));
 	}
 	return usages;
 }
@@ -559,8 +559,8 @@ Error GDScriptWorkspace::parse_local_script(const String &p_path) {
 }
 
 String GDScriptWorkspace::get_file_path(const String &p_uri) const {
-	String path = p_uri.uri_decode();
-	String base_uri = root_uri.uri_decode();
+	String path = p_uri.uri_file_decode();
+	String base_uri = root_uri.uri_file_decode();
 	path = path.replacen(base_uri + "/", "res://");
 	return path;
 }
@@ -576,7 +576,7 @@ void GDScriptWorkspace::publish_diagnostics(const String &p_path) {
 	Array errors;
 	HashMap<String, ExtendGDScriptParser *>::ConstIterator ele = parse_results.find(p_path);
 	if (ele) {
-		const Vector<lsp::Diagnostic> &list = ele->value->get_diagnostics();
+		const Vector<LSP::Diagnostic> &list = ele->value->get_diagnostics();
 		errors.resize(list.size());
 		for (int i = 0; i < list.size(); ++i) {
 			errors[i] = list[i].to_json();
@@ -632,7 +632,7 @@ Node *GDScriptWorkspace::_get_owner_scene_node(String p_path) {
 	return owner_scene_node;
 }
 
-void GDScriptWorkspace::completion(const lsp::CompletionParams &p_params, List<ScriptLanguage::CodeCompletionOption> *r_options) {
+void GDScriptWorkspace::completion(const LSP::CompletionParams &p_params, List<ScriptLanguage::CodeCompletionOption> *r_options) {
 	String path = get_file_path(p_params.textDocument.uri);
 	String call_hint;
 	bool forced = false;
@@ -670,8 +670,8 @@ void GDScriptWorkspace::completion(const lsp::CompletionParams &p_params, List<S
 	}
 }
 
-const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocumentPositionParams &p_doc_pos, const String &p_symbol_name, bool p_func_required) {
-	const lsp::DocumentSymbol *symbol = nullptr;
+const LSP::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const LSP::TextDocumentPositionParams &p_doc_pos, const String &p_symbol_name, bool p_func_required) {
+	const LSP::DocumentSymbol *symbol = nullptr;
 
 	String path = get_file_path(p_doc_pos.textDocument.uri);
 	if (const ExtendGDScriptParser *parser = get_parse_result(path)) {
@@ -681,9 +681,9 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 			symbol_identifier = identifier_parts[0];
 		}
 
-		lsp::Position pos = p_doc_pos.position;
+		LSP::Position pos = p_doc_pos.position;
 		if (symbol_identifier.is_empty()) {
-			lsp::Range range;
+			LSP::Range range;
 			symbol_identifier = parser->get_identifier_under_position(p_doc_pos.position, range);
 			pos.character = range.end.character;
 		}
@@ -695,7 +695,7 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 
 			} else {
 				ScriptLanguage::LookupResult ret;
-				if (symbol_identifier == "new" && parser->get_lines()[p_doc_pos.position.line].replace(" ", "").replace("\t", "").contains("new(")) {
+				if (symbol_identifier == "new" && parser->get_lines()[p_doc_pos.position.line].remove_chars(" \t").contains("new(")) {
 					symbol_identifier = "_init";
 				}
 				if (OK == GDScriptLanguage::get_singleton()->lookup_code(parser->get_text_for_lookup_symbol(pos, symbol_identifier, p_func_required), symbol_identifier, path, nullptr, ret)) {
@@ -712,7 +712,7 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 
 							if (symbol) {
 								switch (symbol->kind) {
-									case lsp::SymbolKind::Function: {
+									case LSP::SymbolKind::Function: {
 										if (symbol->name != symbol_identifier) {
 											symbol = get_parameter_symbol(symbol, symbol_identifier);
 										}
@@ -740,16 +740,16 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_symbol(const lsp::TextDocu
 	return symbol;
 }
 
-void GDScriptWorkspace::resolve_related_symbols(const lsp::TextDocumentPositionParams &p_doc_pos, List<const lsp::DocumentSymbol *> &r_list) {
+void GDScriptWorkspace::resolve_related_symbols(const LSP::TextDocumentPositionParams &p_doc_pos, List<const LSP::DocumentSymbol *> &r_list) {
 	String path = get_file_path(p_doc_pos.textDocument.uri);
 	if (const ExtendGDScriptParser *parser = get_parse_result(path)) {
 		String symbol_identifier;
-		lsp::Range range;
+		LSP::Range range;
 		symbol_identifier = parser->get_identifier_under_position(p_doc_pos.position, range);
 
 		for (const KeyValue<StringName, ClassMembers> &E : native_members) {
 			const ClassMembers &members = native_members.get(E.key);
-			if (const lsp::DocumentSymbol *const *symbol = members.getptr(symbol_identifier)) {
+			if (const LSP::DocumentSymbol *const *symbol = members.getptr(symbol_identifier)) {
 				r_list.push_back(*symbol);
 			}
 		}
@@ -757,13 +757,13 @@ void GDScriptWorkspace::resolve_related_symbols(const lsp::TextDocumentPositionP
 		for (const KeyValue<String, ExtendGDScriptParser *> &E : scripts) {
 			const ExtendGDScriptParser *scr = E.value;
 			const ClassMembers &members = scr->get_members();
-			if (const lsp::DocumentSymbol *const *symbol = members.getptr(symbol_identifier)) {
+			if (const LSP::DocumentSymbol *const *symbol = members.getptr(symbol_identifier)) {
 				r_list.push_back(*symbol);
 			}
 
 			for (const KeyValue<String, ClassMembers> &F : scr->get_inner_classes()) {
 				const ClassMembers *inner_class = &F.value;
-				if (const lsp::DocumentSymbol *const *symbol = inner_class->getptr(symbol_identifier)) {
+				if (const LSP::DocumentSymbol *const *symbol = inner_class->getptr(symbol_identifier)) {
 					r_list.push_back(*symbol);
 				}
 			}
@@ -771,9 +771,9 @@ void GDScriptWorkspace::resolve_related_symbols(const lsp::TextDocumentPositionP
 	}
 }
 
-const lsp::DocumentSymbol *GDScriptWorkspace::resolve_native_symbol(const lsp::NativeSymbolInspectParams &p_params) {
-	if (HashMap<StringName, lsp::DocumentSymbol>::Iterator E = native_symbols.find(p_params.native_class)) {
-		const lsp::DocumentSymbol &symbol = E->value;
+const LSP::DocumentSymbol *GDScriptWorkspace::resolve_native_symbol(const LSP::NativeSymbolInspectParams &p_params) {
+	if (HashMap<StringName, LSP::DocumentSymbol>::Iterator E = native_symbols.find(p_params.native_class)) {
+		const LSP::DocumentSymbol &symbol = E->value;
 		if (p_params.symbol_name.is_empty() || p_params.symbol_name == symbol.name) {
 			return &symbol;
 		}
@@ -788,10 +788,10 @@ const lsp::DocumentSymbol *GDScriptWorkspace::resolve_native_symbol(const lsp::N
 	return nullptr;
 }
 
-void GDScriptWorkspace::resolve_document_links(const String &p_uri, List<lsp::DocumentLink> &r_list) {
+void GDScriptWorkspace::resolve_document_links(const String &p_uri, List<LSP::DocumentLink> &r_list) {
 	if (const ExtendGDScriptParser *parser = get_parse_successed_script(get_file_path(p_uri))) {
-		const List<lsp::DocumentLink> &links = parser->get_document_links();
-		for (const lsp::DocumentLink &E : links) {
+		const List<LSP::DocumentLink> &links = parser->get_document_links();
+		for (const LSP::DocumentLink &E : links) {
 			r_list.push_back(E);
 		}
 	}
@@ -805,29 +805,29 @@ Dictionary GDScriptWorkspace::generate_script_api(const String &p_path) {
 	return api;
 }
 
-Error GDScriptWorkspace::resolve_signature(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::SignatureHelp &r_signature) {
+Error GDScriptWorkspace::resolve_signature(const LSP::TextDocumentPositionParams &p_doc_pos, LSP::SignatureHelp &r_signature) {
 	if (const ExtendGDScriptParser *parser = get_parse_result(get_file_path(p_doc_pos.textDocument.uri))) {
-		lsp::TextDocumentPositionParams text_pos;
+		LSP::TextDocumentPositionParams text_pos;
 		text_pos.textDocument = p_doc_pos.textDocument;
 
 		if (parser->get_left_function_call(p_doc_pos.position, text_pos.position, r_signature.activeParameter) == OK) {
-			List<const lsp::DocumentSymbol *> symbols;
+			List<const LSP::DocumentSymbol *> symbols;
 
-			if (const lsp::DocumentSymbol *symbol = resolve_symbol(text_pos)) {
+			if (const LSP::DocumentSymbol *symbol = resolve_symbol(text_pos)) {
 				symbols.push_back(symbol);
 			} else if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
 				GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_related_symbols(text_pos, symbols);
 			}
 
-			for (const lsp::DocumentSymbol *const &symbol : symbols) {
-				if (symbol->kind == lsp::SymbolKind::Method || symbol->kind == lsp::SymbolKind::Function) {
-					lsp::SignatureInformation signature_info;
+			for (const LSP::DocumentSymbol *const &symbol : symbols) {
+				if (symbol->kind == LSP::SymbolKind::Method || symbol->kind == LSP::SymbolKind::Function) {
+					LSP::SignatureInformation signature_info;
 					signature_info.label = symbol->detail;
 					signature_info.documentation = symbol->render();
 
 					for (int i = 0; i < symbol->children.size(); i++) {
-						const lsp::DocumentSymbol &arg = symbol->children[i];
-						lsp::ParameterInformation arg_info;
+						const LSP::DocumentSymbol &arg = symbol->children[i];
+						LSP::ParameterInformation arg_info;
 						arg_info.label = arg.name;
 						signature_info.parameters.push_back(arg_info);
 					}
diff --git a/engine/modules/gdscript/language_server/gdscript_workspace.h b/engine/modules/gdscript/language_server/gdscript_workspace.h
index 0b2d43b8..cd527f04 100644
--- a/engine/modules/gdscript/language_server/gdscript_workspace.h
+++ b/engine/modules/gdscript/language_server/gdscript_workspace.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_WORKSPACE_H
-#define GDSCRIPT_WORKSPACE_H
+#pragma once
 
 #include "../gdscript_parser.h"
 #include "gdscript_extend_parser.h"
@@ -49,12 +48,12 @@ protected:
 	static void _bind_methods();
 	void remove_cache_parser(const String &p_path);
 	bool initialized = false;
-	HashMap<StringName, lsp::DocumentSymbol> native_symbols;
+	HashMap<StringName, LSP::DocumentSymbol> native_symbols;
 
-	const lsp::DocumentSymbol *get_native_symbol(const String &p_class, const String &p_member = "") const;
-	const lsp::DocumentSymbol *get_script_symbol(const String &p_path) const;
-	const lsp::DocumentSymbol *get_parameter_symbol(const lsp::DocumentSymbol *p_parent, const String &symbol_identifier);
-	const lsp::DocumentSymbol *get_local_symbol_at(const ExtendGDScriptParser *p_parser, const String &p_symbol_identifier, const lsp::Position p_position);
+	const LSP::DocumentSymbol *get_native_symbol(const String &p_class, const String &p_member = "") const;
+	const LSP::DocumentSymbol *get_script_symbol(const String &p_path) const;
+	const LSP::DocumentSymbol *get_parameter_symbol(const LSP::DocumentSymbol *p_parent, const String &symbol_identifier);
+	const LSP::DocumentSymbol *get_local_symbol_at(const ExtendGDScriptParser *p_parser, const String &p_symbol_identifier, const LSP::Position p_position);
 
 	void reload_all_workspace_scripts();
 
@@ -83,22 +82,20 @@ public:
 	String get_file_uri(const String &p_path) const;
 
 	void publish_diagnostics(const String &p_path);
-	void completion(const lsp::CompletionParams &p_params, List<ScriptLanguage::CodeCompletionOption> *r_options);
+	void completion(const LSP::CompletionParams &p_params, List<ScriptLanguage::CodeCompletionOption> *r_options);
 
-	const lsp::DocumentSymbol *resolve_symbol(const lsp::TextDocumentPositionParams &p_doc_pos, const String &p_symbol_name = "", bool p_func_required = false);
-	void resolve_related_symbols(const lsp::TextDocumentPositionParams &p_doc_pos, List<const lsp::DocumentSymbol *> &r_list);
-	const lsp::DocumentSymbol *resolve_native_symbol(const lsp::NativeSymbolInspectParams &p_params);
-	void resolve_document_links(const String &p_uri, List<lsp::DocumentLink> &r_list);
+	const LSP::DocumentSymbol *resolve_symbol(const LSP::TextDocumentPositionParams &p_doc_pos, const String &p_symbol_name = "", bool p_func_required = false);
+	void resolve_related_symbols(const LSP::TextDocumentPositionParams &p_doc_pos, List<const LSP::DocumentSymbol *> &r_list);
+	const LSP::DocumentSymbol *resolve_native_symbol(const LSP::NativeSymbolInspectParams &p_params);
+	void resolve_document_links(const String &p_uri, List<LSP::DocumentLink> &r_list);
 	Dictionary generate_script_api(const String &p_path);
-	Error resolve_signature(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::SignatureHelp &r_signature);
-	void did_delete_files(const Dictionary &p_params);
-	Dictionary rename(const lsp::TextDocumentPositionParams &p_doc_pos, const String &new_name);
-	bool can_rename(const lsp::TextDocumentPositionParams &p_doc_pos, lsp::DocumentSymbol &r_symbol, lsp::Range &r_range);
-	Vector<lsp::Location> find_usages_in_file(const lsp::DocumentSymbol &p_symbol, const String &p_file_path);
-	Vector<lsp::Location> find_all_usages(const lsp::DocumentSymbol &p_symbol);
+	Error resolve_signature(const LSP::TextDocumentPositionParams &p_doc_pos, LSP::SignatureHelp &r_signature);
+	void didDeleteFiles(const Dictionary &p_params);
+	Dictionary rename(const LSP::TextDocumentPositionParams &p_doc_pos, const String &new_name);
+	bool can_rename(const LSP::TextDocumentPositionParams &p_doc_pos, LSP::DocumentSymbol &r_symbol, LSP::Range &r_range);
+	Vector<LSP::Location> find_usages_in_file(const LSP::DocumentSymbol &p_symbol, const String &p_file_path);
+	Vector<LSP::Location> find_all_usages(const LSP::DocumentSymbol &p_symbol);
 
 	GDScriptWorkspace();
 	~GDScriptWorkspace();
 };
-
-#endif // GDSCRIPT_WORKSPACE_H
diff --git a/engine/modules/gdscript/language_server/godot_lsp.h b/engine/modules/gdscript/language_server/godot_lsp.h
index 6e19cd7a..508e515f 100644
--- a/engine/modules/gdscript/language_server/godot_lsp.h
+++ b/engine/modules/gdscript/language_server/godot_lsp.h
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_LSP_H
-#define GODOT_LSP_H
+#pragma once
 
 #include "core/doc_data.h"
 #include "core/object/class_db.h"
 #include "core/templates/list.h"
 
-namespace lsp {
+namespace LSP {
 
 typedef String DocumentUri;
 
@@ -384,7 +383,7 @@ struct Command {
 };
 
 // Use namespace instead of enumeration to follow the LSP specifications.
-// `lsp::EnumName::EnumValue` is OK but `lsp::EnumValue` is not.
+// `LSP::EnumName::EnumValue` is OK but `LSP::EnumValue` is not.
 
 namespace TextDocumentSyncKind {
 /**
@@ -861,7 +860,7 @@ struct MarkupContent {
 };
 
 // Use namespace instead of enumeration to follow the LSP specifications
-// `lsp::EnumName::EnumValue` is OK but `lsp::EnumValue` is not.
+// `LSP::EnumName::EnumValue` is OK but `LSP::EnumValue` is not.
 // And here C++ compilers are unhappy with our enumeration name like `Color`, `File`, `RefCounted` etc.
 /**
  * The kind of a completion entry.
@@ -1118,7 +1117,7 @@ struct CompletionList {
 };
 
 // Use namespace instead of enumeration to follow the LSP specifications
-// `lsp::EnumName::EnumValue` is OK but `lsp::EnumValue` is not
+// `LSP::EnumName::EnumValue` is OK but `LSP::EnumValue` is not
 // And here C++ compilers are unhappy with our enumeration name like `String`, `Array`, `Object` etc
 /**
  * A symbol kind.
@@ -1259,7 +1258,7 @@ struct DocumentSymbol {
 	}
 
 	_FORCE_INLINE_ CompletionItem make_completion_item(bool resolved = false) const {
-		lsp::CompletionItem item;
+		LSP::CompletionItem item;
 		item.label = name;
 
 		if (resolved) {
@@ -1267,33 +1266,33 @@ struct DocumentSymbol {
 		}
 
 		switch (kind) {
-			case lsp::SymbolKind::Enum:
-				item.kind = lsp::CompletionItemKind::Enum;
+			case LSP::SymbolKind::Enum:
+				item.kind = LSP::CompletionItemKind::Enum;
 				break;
-			case lsp::SymbolKind::Class:
-				item.kind = lsp::CompletionItemKind::Class;
+			case LSP::SymbolKind::Class:
+				item.kind = LSP::CompletionItemKind::Class;
 				break;
-			case lsp::SymbolKind::Property:
-				item.kind = lsp::CompletionItemKind::Property;
+			case LSP::SymbolKind::Property:
+				item.kind = LSP::CompletionItemKind::Property;
 				break;
-			case lsp::SymbolKind::Method:
-			case lsp::SymbolKind::Function:
-				item.kind = lsp::CompletionItemKind::Method;
+			case LSP::SymbolKind::Method:
+			case LSP::SymbolKind::Function:
+				item.kind = LSP::CompletionItemKind::Method;
 				break;
-			case lsp::SymbolKind::Event:
-				item.kind = lsp::CompletionItemKind::Event;
+			case LSP::SymbolKind::Event:
+				item.kind = LSP::CompletionItemKind::Event;
 				break;
-			case lsp::SymbolKind::Constant:
-				item.kind = lsp::CompletionItemKind::Constant;
+			case LSP::SymbolKind::Constant:
+				item.kind = LSP::CompletionItemKind::Constant;
 				break;
-			case lsp::SymbolKind::Variable:
-				item.kind = lsp::CompletionItemKind::Variable;
+			case LSP::SymbolKind::Variable:
+				item.kind = LSP::CompletionItemKind::Variable;
 				break;
-			case lsp::SymbolKind::File:
-				item.kind = lsp::CompletionItemKind::File;
+			case LSP::SymbolKind::File:
+				item.kind = LSP::CompletionItemKind::File;
 				break;
 			default:
-				item.kind = lsp::CompletionItemKind::Text;
+				item.kind = LSP::CompletionItemKind::Text;
 				break;
 		}
 
@@ -1753,7 +1752,7 @@ struct ServerCapabilities {
 	/**
 	 * The server provides workspace symbol support.
 	 */
-	bool workspaceSymbolProvider = true;
+	bool workspaceSymbolProvider = false;
 
 	/**
 	 * The server supports workspace folder.
@@ -1874,7 +1873,7 @@ struct GodotNativeClassInfo {
 	const DocData::ClassDoc *class_doc = nullptr;
 	const ClassDB::ClassInfo *class_info = nullptr;
 
-	Dictionary to_json() {
+	Dictionary to_json() const {
 		Dictionary dict;
 		dict["name"] = name;
 		dict["inherits"] = class_doc->inherits;
@@ -1889,11 +1888,11 @@ struct GodotCapabilities {
 	 */
 	List<GodotNativeClassInfo> native_classes;
 
-	Dictionary to_json() {
+	Dictionary to_json() const {
 		Dictionary dict;
 		Array classes;
-		for (List<GodotNativeClassInfo>::Element *E = native_classes.front(); E; E = E->next()) {
-			classes.push_back(E->get().to_json());
+		for (const GodotNativeClassInfo &native_class : native_classes) {
+			classes.push_back(native_class.to_json());
 		}
 		dict["native_classes"] = classes;
 		return dict;
@@ -1917,7 +1916,7 @@ static String marked_documentation(const String &p_bbcode) {
 			in_code_block = true;
 			line = "\n";
 		} else if (in_code_block) {
-			line = "\t" + line.substr(code_block_indent, line.length());
+			line = "\t" + line.substr(code_block_indent);
 		}
 
 		if (in_code_block && line.contains("[/codeblock]")) {
@@ -1940,8 +1939,7 @@ static String marked_documentation(const String &p_bbcode) {
 			line = line.replace("[signal ", "`");
 			line = line.replace("[enum ", "`");
 			line = line.replace("[constant ", "`");
-			line = line.replace("[", "`");
-			line = line.replace("]", "`");
+			line = line.replace_chars("[]", '`');
 		}
 
 		if (!in_code_block && i < lines.size() - 1) {
@@ -1953,6 +1951,4 @@ static String marked_documentation(const String &p_bbcode) {
 	}
 	return markdown;
 }
-} // namespace lsp
-
-#endif // GODOT_LSP_H
+} // namespace LSP
diff --git a/engine/modules/gdscript/register_types.cpp b/engine/modules/gdscript/register_types.cpp
index 7ae81db1..5e7bb30d 100644
--- a/engine/modules/gdscript/register_types.cpp
+++ b/engine/modules/gdscript/register_types.cpp
@@ -101,8 +101,7 @@ protected:
 			return;
 		}
 
-		String source;
-		source.parse_utf8(reinterpret_cast<const char *>(file.ptr()), file.size());
+		String source = String::utf8(reinterpret_cast<const char *>(file.ptr()), file.size());
 		GDScriptTokenizerBuffer::CompressMode compress_mode = script_mode == EditorExportPreset::MODE_SCRIPT_BINARY_TOKENS_COMPRESSED ? GDScriptTokenizerBuffer::COMPRESS_ZSTD : GDScriptTokenizerBuffer::COMPRESS_NONE;
 		file = GDScriptTokenizerBuffer::parse_code_string(source, compress_mode);
 		if (file.is_empty()) {
@@ -162,12 +161,7 @@ void initialize_gdscript_module(ModuleInitializationLevel p_level) {
 		gdscript_translation_parser_plugin.instantiate();
 		EditorTranslationParser::get_singleton()->add_parser(gdscript_translation_parser_plugin, EditorTranslationParser::STANDARD);
 	} else if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
-		ClassDB::APIType prev_api = ClassDB::get_current_api();
-		ClassDB::set_current_api(ClassDB::API_EDITOR);
-
 		GDREGISTER_CLASS(GDScriptSyntaxHighlighter);
-
-		ClassDB::set_current_api(prev_api);
 	}
 #endif // TOOLS_ENABLED
 }
diff --git a/engine/modules/gdscript/register_types.h b/engine/modules/gdscript/register_types.h
index f7ec521e..95172f0b 100644
--- a/engine/modules/gdscript/register_types.h
+++ b/engine/modules/gdscript/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_REGISTER_TYPES_H
-#define GDSCRIPT_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_gdscript_module(ModuleInitializationLevel p_level);
 void uninitialize_gdscript_module(ModuleInitializationLevel p_level);
-
-#endif // GDSCRIPT_REGISTER_TYPES_H
diff --git a/engine/modules/gdscript/tests/gdscript_test_runner.cpp b/engine/modules/gdscript/tests/gdscript_test_runner.cpp
index c7f92daa..f428604c 100644
--- a/engine/modules/gdscript/tests/gdscript_test_runner.cpp
+++ b/engine/modules/gdscript/tests/gdscript_test_runner.cpp
@@ -478,7 +478,7 @@ void GDScriptTest::error_handler(void *p_this, const char *p_function, const cha
 
 	if (include_source_info) {
 		header += vformat(" at %s:%d on %s()",
-				String::utf8(p_file).trim_prefix(self->base_dir).replace("\\", "/"),
+				String::utf8(p_file).trim_prefix(self->base_dir).replace_char('\\', '/'),
 				p_line,
 				String::utf8(p_function));
 	}
diff --git a/engine/modules/gdscript/tests/gdscript_test_runner.h b/engine/modules/gdscript/tests/gdscript_test_runner.h
index 57e3ac86..1e464198 100644
--- a/engine/modules/gdscript/tests/gdscript_test_runner.h
+++ b/engine/modules/gdscript/tests/gdscript_test_runner.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_TEST_RUNNER_H
-#define GDSCRIPT_TEST_RUNNER_H
+#pragma once
 
 #include "../gdscript.h"
 
@@ -136,5 +135,3 @@ public:
 };
 
 } // namespace GDScriptTests
-
-#endif // GDSCRIPT_TEST_RUNNER_H
diff --git a/engine/modules/gdscript/tests/gdscript_test_runner_suite.h b/engine/modules/gdscript/tests/gdscript_test_runner_suite.h
index d6befd2d..78a257a9 100644
--- a/engine/modules/gdscript/tests/gdscript_test_runner_suite.h
+++ b/engine/modules/gdscript/tests/gdscript_test_runner_suite.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GDSCRIPT_TEST_RUNNER_SUITE_H
-#define GDSCRIPT_TEST_RUNNER_SUITE_H
+#pragma once
 
 #include "gdscript_test_runner.h"
 
@@ -81,9 +80,8 @@ TEST_CASE("[Modules][GDScript] Validate built-in API") {
 
 	SUBCASE("[Modules][GDScript] Validate built-in methods") {
 		for (const MethodInfo &mi : builtin_methods) {
-			int i = 0;
-			for (List<PropertyInfo>::ConstIterator itr = mi.arguments.begin(); itr != mi.arguments.end(); ++itr, ++i) {
-				TEST_COND((itr->name.is_empty() || itr->name.begins_with("_unnamed_arg")),
+			for (int64_t i = 0; i < mi.arguments.size(); ++i) {
+				TEST_COND((mi.arguments[i].name.is_empty() || mi.arguments[i].name.begins_with("_unnamed_arg")),
 						vformat("Unnamed argument in position %d of built-in method '%s'.", i, mi.name));
 			}
 		}
@@ -95,9 +93,8 @@ TEST_CASE("[Modules][GDScript] Validate built-in API") {
 
 	SUBCASE("[Modules][GDScript] Validate built-in annotations") {
 		for (const MethodInfo &ai : builtin_annotations) {
-			int i = 0;
-			for (List<PropertyInfo>::ConstIterator itr = ai.arguments.begin(); itr != ai.arguments.end(); ++itr, ++i) {
-				TEST_COND((itr->name.is_empty() || itr->name.begins_with("_unnamed_arg")),
+			for (int64_t i = 0; i < ai.arguments.size(); ++i) {
+				TEST_COND((ai.arguments[i].name.is_empty() || ai.arguments[i].name.begins_with("_unnamed_arg")),
 						vformat("Unnamed argument in position %d of built-in annotation '%s'.", i, ai.name));
 			}
 		}
@@ -105,5 +102,3 @@ TEST_CASE("[Modules][GDScript] Validate built-in API") {
 }
 
 } // namespace GDScriptTests
-
-#endif // GDSCRIPT_TEST_RUNNER_SUITE_H
diff --git a/engine/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd b/engine/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd
index abeadbe5..6b4f1b6e 100644
--- a/engine/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/argument_options/play_inferred.gd
@@ -1,3 +1,5 @@
+extends Node
+
 @onready var anim := $AnimationPlayer
 
 func test():
diff --git a/engine/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd b/engine/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd
index d11f81e9..4b8b0015 100644
--- a/engine/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/argument_options/play_typed.gd
@@ -1,3 +1,5 @@
+extends Node
+
 @onready var anim: AnimationPlayer = $AnimationPlayer
 
 func test():
diff --git a/engine/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd b/engine/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd
index 4ddfd21a..fb3fe915 100644
--- a/engine/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/argument_options/play_untyped.gd
@@ -1,3 +1,5 @@
+extends Node
+
 @onready var anim = $AnimationPlayer
 
 func test():
diff --git a/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_1.cfg b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_1.cfg
new file mode 100644
index 00000000..cd0153fb
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_1.cfg
@@ -0,0 +1,5 @@
+[output]
+include=[
+    ; GDScript: class_a.notest.gd
+    {"display": "func_of_a()"},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_1.gd b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_1.gd
new file mode 100644
index 00000000..443df9fb
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_1.gd
@@ -0,0 +1,7 @@
+extends "res://completion/class_a.notest.gd"
+
+func test():
+	super.➡
+
+	if true:
+		pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_2.cfg b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_2.cfg
new file mode 100644
index 00000000..cd0153fb
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_2.cfg
@@ -0,0 +1,5 @@
+[output]
+include=[
+    ; GDScript: class_a.notest.gd
+    {"display": "func_of_a()"},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_2.gd b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_2.gd
new file mode 100644
index 00000000..de5c4b16
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/common/invalid_super_call_2.gd
@@ -0,0 +1,7 @@
+extends "res://completion/class_a.notest.gd"
+
+func test():
+	super.f➡
+
+	if true:
+		pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd
index dc7cc995..55863179 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/literal/dollar.gd
@@ -1,5 +1,5 @@
 extends Node
 
 func a():
-    %AnimationPlayer.➡
+    $UniqueAnimationPlayer.➡
     pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd
index 55863179..dc7cc995 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/literal/percent.gd
@@ -1,5 +1,5 @@
 extends Node
 
 func a():
-    $UniqueAnimationPlayer.➡
+    %AnimationPlayer.➡
     pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.cfg b/engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.cfg
rename to engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.gd
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/local_infered/local_infered.gd
rename to engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred/local_inferred.gd
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.cfg b/engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.cfg
rename to engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.gd
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/class_local_infered_scene.gd
rename to engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/class_local_inferred_scene.gd
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.cfg b/engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.cfg
rename to engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.gd
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/local_infered_scene/native_local_infered_scene.gd
rename to engine/modules/gdscript/tests/scripts/completion/get_node/local_inferred_scene/native_local_inferred_scene.gd
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.cfg b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.cfg
rename to engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.gd
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/member_infered/member_infered.gd
rename to engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred/member_inferred.gd
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.cfg b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.cfg
rename to engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.gd
similarity index 66%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.gd
rename to engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.gd
index 402fd1d2..877ac442 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/class_member_infered_scene.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/class_member_inferred_scene.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test := $A
+@onready var test := $A
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.cfg b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.cfg
rename to engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.gd
similarity index 55%
rename from engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.gd
rename to engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.gd
index 97b28833..0b511e4c 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_infered_scene/native_member_infered_scene.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_inferred_scene/native_member_inferred_scene.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test := $AnimationPlayer
+@onready var test := $AnimationPlayer
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd
index 6188a6e8..0dad2428 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/class_member_scene.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test = $A
+@onready var test = $A
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd
index 80b49439..43e6c3bc 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_scene/native_member_scene.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test = $AnimationPlayer
+@onready var test = $AnimationPlayer
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd
index 7f2cb4e8..f4a0c6d7 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene/native_member_typehint_scene.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test: AnimationPlayer = $AnimationPlayer
+@onready var test: AnimationPlayer = $AnimationPlayer
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd
index aac450be..5df4c0ec 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/class_member_typehint_scene_broad.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test: Node = $A
+@onready var test: Node = $A
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd
index 9eb10e49..991449d7 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_broad/native_member_typehint_scene_broad.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test: Node = $AnimationPlayer
+@onready var test: Node = $AnimationPlayer
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd
index ff8214c4..a3cdece9 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/class_member_typehint_scene_incompatible.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test: Area2D = $A
+@onready var test: Area2D = $A
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd
index 30cd7d6a..b0c99d4e 100644
--- a/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd
+++ b/engine/modules/gdscript/tests/scripts/completion/get_node/member_typehint_scene_incompatible/native_member_typehint_scene_incompatible.gd
@@ -1,6 +1,6 @@
 extends Node
 
-var test: Area2D = $AnimationPlayer
+@onready var test: Area2D = $AnimationPlayer
 
 func a():
     test.➡
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_complete_braces.cfg b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_complete_braces.cfg
new file mode 100644
index 00000000..ba03115b
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_complete_braces.cfg
@@ -0,0 +1,8 @@
+[output]
+include=[
+    {"display": "hello_world", "insert_text": "hello_world"},
+]
+exclude=[
+    {"insert_text": "hello_world()"},
+    {"insert_text": "hello_world("},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_complete_braces.gd b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_complete_braces.gd
new file mode 100644
index 00000000..e58cdc2a
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_complete_braces.gd
@@ -0,0 +1,8 @@
+signal test
+
+func _init() -> void:
+    test.connect(h➡)
+    pass
+
+func hello_world():
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_incomplete_braces.cfg b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_incomplete_braces.cfg
new file mode 100644
index 00000000..ba03115b
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_incomplete_braces.cfg
@@ -0,0 +1,8 @@
+[output]
+include=[
+    {"display": "hello_world", "insert_text": "hello_world"},
+]
+exclude=[
+    {"insert_text": "hello_world()"},
+    {"insert_text": "hello_world("},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_incomplete_braces.gd b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_incomplete_braces.gd
new file mode 100644
index 00000000..58ea318e
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/builtin_incomplete_braces.gd
@@ -0,0 +1,8 @@
+var arr: Array
+
+func _init() -> void:
+    arr.sort_custom(h➡
+    pass
+
+func hello_world():
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_0.cfg b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_0.cfg
new file mode 100644
index 00000000..ba03115b
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_0.cfg
@@ -0,0 +1,8 @@
+[output]
+include=[
+    {"display": "hello_world", "insert_text": "hello_world"},
+]
+exclude=[
+    {"insert_text": "hello_world()"},
+    {"insert_text": "hello_world("},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_0.gd b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_0.gd
new file mode 100644
index 00000000..6782e68f
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_0.gd
@@ -0,0 +1,9 @@
+func test(a: Callable, b):
+    pass
+
+func _init() -> void:
+    test(h➡)
+    pass
+
+func hello_world():
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_1.cfg b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_1.cfg
new file mode 100644
index 00000000..ba03115b
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_1.cfg
@@ -0,0 +1,8 @@
+[output]
+include=[
+    {"display": "hello_world", "insert_text": "hello_world"},
+]
+exclude=[
+    {"insert_text": "hello_world()"},
+    {"insert_text": "hello_world("},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_1.gd b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_1.gd
new file mode 100644
index 00000000..196bbd08
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_callable_arg_1.gd
@@ -0,0 +1,9 @@
+func test(a, b: Callable):
+    pass
+
+func _init() -> void:
+    test(hello_world(), h➡)
+    pass
+
+func hello_world():
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_variant_arg_0.cfg b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_variant_arg_0.cfg
new file mode 100644
index 00000000..d45277ba
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_variant_arg_0.cfg
@@ -0,0 +1,8 @@
+[output]
+include=[
+    {"display": "hello_world()", "insert_text": "hello_world()"},
+]
+exclude=[
+    {"insert_text": "hello_world"},
+    {"insert_text": "hello_world("},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_variant_arg_0.gd b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_variant_arg_0.gd
new file mode 100644
index 00000000..39c7cb02
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/local_method_variant_arg_0.gd
@@ -0,0 +1,9 @@
+func test(a, b: Callable):
+    pass
+
+func _init() -> void:
+    test(h➡)
+    pass
+
+func hello_world():
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/native.cfg b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/native.cfg
new file mode 100644
index 00000000..b2af9da1
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/native.cfg
@@ -0,0 +1,8 @@
+[output]
+include=[
+    {"display": "hello_world", "insert_text": "hello_world"},
+]
+exclude=[
+    {"display": "hello_world", "insert_text": "hello_world()"},
+    {"display": "hello_world", "insert_text": "hello_world("},
+]
diff --git a/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/native.gd b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/native.gd
new file mode 100644
index 00000000..a5e14aad
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/completion/no_parenthesis_when_callable_is_expected/native.gd
@@ -0,0 +1,8 @@
+extends Node
+
+func _init() -> void:
+    create_tween().tween_callback(h➡)
+    pass
+
+func hello_world():
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/completion/types/local/infered.cfg b/engine/modules/gdscript/tests/scripts/completion/types/local/inferred.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/types/local/infered.cfg
rename to engine/modules/gdscript/tests/scripts/completion/types/local/inferred.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/types/local/infered.gd b/engine/modules/gdscript/tests/scripts/completion/types/local/inferred.gd
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/types/local/infered.gd
rename to engine/modules/gdscript/tests/scripts/completion/types/local/inferred.gd
diff --git a/engine/modules/gdscript/tests/scripts/completion/types/member/infered.cfg b/engine/modules/gdscript/tests/scripts/completion/types/member/inferred.cfg
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/types/member/infered.cfg
rename to engine/modules/gdscript/tests/scripts/completion/types/member/inferred.cfg
diff --git a/engine/modules/gdscript/tests/scripts/completion/types/member/infered.gd b/engine/modules/gdscript/tests/scripts/completion/types/member/inferred.gd
similarity index 100%
rename from engine/modules/gdscript/tests/scripts/completion/types/member/infered.gd
rename to engine/modules/gdscript/tests/scripts/completion/types/member/inferred.gd
diff --git a/engine/modules/gdscript/tests/scripts/lsp/first_line_class_name.gd b/engine/modules/gdscript/tests/scripts/lsp/first_line_class_name.gd
new file mode 100644
index 00000000..2a836b71
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/lsp/first_line_class_name.gd
@@ -0,0 +1,5 @@
+class_name Test
+extends Node
+
+func _init():
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function.notest.gd b/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function.notest.gd
new file mode 100644
index 00000000..7ac8f994
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function.notest.gd
@@ -0,0 +1,12 @@
+# TODO: This test is currently disabled since it triggers some complex memory leaks. Try enabling it again once GH-101830 is fixed.
+
+signal finished
+
+const scr: GDScript = preload("reload_suspended_function_helper.notest.gd")
+
+func test():
+	@warning_ignore("UNSAFE_METHOD_ACCESS")
+	scr.test(self)
+	@warning_ignore("RETURN_VALUE_DISCARDED")
+	scr.reload(true)
+	finished.emit()
diff --git a/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function.out b/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function.out
new file mode 100644
index 00000000..d86e9868
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function.out
@@ -0,0 +1,2 @@
+GDTEST_RUNTIME_ERROR
+>> WARNING: Canceling suspended execution of "test" due to a script reload.
diff --git a/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function_helper.notest.gd b/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function_helper.notest.gd
new file mode 100644
index 00000000..cc876f76
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/runtime/errors/reload_suspended_function_helper.notest.gd
@@ -0,0 +1,3 @@
+static func test(a):
+	await a.finished
+	pass
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/callv_readonly_array.gd b/engine/modules/gdscript/tests/scripts/runtime/features/callv_readonly_array.gd
new file mode 100644
index 00000000..85c712cb
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/runtime/features/callv_readonly_array.gd
@@ -0,0 +1,26 @@
+var array_var: Array = ["one", "two", "three", "four"]
+const array_const: Array = ["one", "two", "three", "four"]
+
+var array_nested_var: Array = [["one"], ["two"], ["three"], ["four"]]
+const array_nested_const: Array = [["one"], ["two"], ["three"], ["four"]]
+
+
+func test():
+    Utils.check(array_const.is_read_only() == true)
+    Utils.check(array_nested_const.is_read_only() == true)
+
+    print("TEST Callable::callv")
+    print_four_variants.callv(array_var)
+    print_four_variants.callv(array_const)
+    print_four_variants.callv(array_nested_var)
+    print_four_variants.callv(array_nested_const)
+
+    print("TEST Object::callv")
+    self.callv("print_four_variants", array_var)
+    self.callv("print_four_variants", array_const)
+    self.callv("print_four_variants", array_nested_var)
+    self.callv("print_four_variants", array_nested_const)
+
+
+func print_four_variants(v1, v2, v3, v4):
+    print("%s %s %s %s" % [v1, v2, v3, v4])
diff --git a/engine/modules/gdscript/tests/scripts/runtime/features/callv_readonly_array.out b/engine/modules/gdscript/tests/scripts/runtime/features/callv_readonly_array.out
new file mode 100644
index 00000000..c2ed23ab
--- /dev/null
+++ b/engine/modules/gdscript/tests/scripts/runtime/features/callv_readonly_array.out
@@ -0,0 +1,11 @@
+GDTEST_OK
+TEST Callable::callv
+one two three four
+one two three four
+["one"] ["two"] ["three"] ["four"]
+["one"] ["two"] ["three"] ["four"]
+TEST Object::callv
+one two three four
+one two three four
+["one"] ["two"] ["three"] ["four"]
+["one"] ["two"] ["three"] ["four"]
diff --git a/engine/modules/gdscript/tests/test_completion.h b/engine/modules/gdscript/tests/test_completion.h
index 844c2675..02c13f49 100644
--- a/engine/modules/gdscript/tests/test_completion.h
+++ b/engine/modules/gdscript/tests/test_completion.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_COMPLETION_H
-#define TEST_COMPLETION_H
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
@@ -161,6 +160,8 @@ static void test_directory(const String &p_dir) {
 				owner = scene->get_node(conf.get_value("input", "node_path", "."));
 			}
 
+			// The only requirement is for the script to be parsable, warnings and errors from the analyzer might happen and completion should still work.
+			ERR_PRINT_OFF;
 			if (owner != nullptr) {
 				// Remove the line which contains the sentinel char, to get a valid script.
 				Ref<GDScript> scr;
@@ -184,6 +185,8 @@ static void test_directory(const String &p_dir) {
 			}
 
 			GDScriptLanguage::get_singleton()->complete_code(code, res_path, owner, &options, forced, call_hint);
+			ERR_PRINT_ON;
+
 			String contains_excluded;
 			for (ScriptLanguage::CodeCompletionOption &option : options) {
 				for (const Dictionary &E : exclude) {
@@ -232,5 +235,3 @@ TEST_SUITE("[Modules][GDScript][Completion]") {
 } // namespace GDScriptTests
 
 #endif
-
-#endif // TEST_COMPLETION_H
diff --git a/engine/modules/gdscript/tests/test_gdscript.cpp b/engine/modules/gdscript/tests/test_gdscript.cpp
index ec20ed19..aca1ed5a 100644
--- a/engine/modules/gdscript/tests/test_gdscript.cpp
+++ b/engine/modules/gdscript/tests/test_gdscript.cpp
@@ -309,8 +309,7 @@ void test(TestType p_type) {
 	fa->get_buffer(buf.ptrw(), flen);
 	buf.write[flen] = 0;
 
-	String code;
-	code.parse_utf8((const char *)&buf[0]);
+	String code = String::utf8((const char *)&buf[0]);
 
 	Vector<String> lines;
 	int last = 0;
diff --git a/engine/modules/gdscript/tests/test_gdscript.h b/engine/modules/gdscript/tests/test_gdscript.h
index 32f278d5..4330b05b 100644
--- a/engine/modules/gdscript/tests/test_gdscript.h
+++ b/engine/modules/gdscript/tests/test_gdscript.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GDSCRIPT_H
-#define TEST_GDSCRIPT_H
+#pragma once
 
 #include "gdscript_test_runner.h"
 
@@ -48,5 +47,3 @@ enum TestType {
 void test(TestType p_type);
 
 } // namespace GDScriptTests
-
-#endif // TEST_GDSCRIPT_H
diff --git a/engine/modules/gdscript/tests/test_lsp.h b/engine/modules/gdscript/tests/test_lsp.h
index e184a405..288eb71e 100644
--- a/engine/modules/gdscript/tests/test_lsp.h
+++ b/engine/modules/gdscript/tests/test_lsp.h
@@ -28,11 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_LSP_H
-#define TEST_LSP_H
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
+#include "modules/modules_enabled.gen.h" // For jsonrpc.
+
+#ifdef MODULE_JSONRPC_ENABLED
+
 #include "tests/test_macros.h"
 
 #include "../language_server/gdscript_extend_parser.h"
@@ -52,15 +55,15 @@
 #include "thirdparty/doctest/doctest.h"
 
 template <>
-struct doctest::StringMaker<lsp::Position> {
-	static doctest::String convert(const lsp::Position &p_val) {
+struct doctest::StringMaker<LSP::Position> {
+	static doctest::String convert(const LSP::Position &p_val) {
 		return p_val.to_string().utf8().get_data();
 	}
 };
 
 template <>
-struct doctest::StringMaker<lsp::Range> {
-	static doctest::String convert(const lsp::Range &p_val) {
+struct doctest::StringMaker<LSP::Range> {
+	static doctest::String convert(const LSP::Range &p_val) {
 		return p_val.to_string().utf8().get_data();
 	}
 };
@@ -102,32 +105,32 @@ GDScriptLanguageProtocol *initialize(const String &p_root) {
 	return proto;
 }
 
-lsp::Position pos(const int p_line, const int p_character) {
-	lsp::Position p;
+LSP::Position pos(const int p_line, const int p_character) {
+	LSP::Position p;
 	p.line = p_line;
 	p.character = p_character;
 	return p;
 }
 
-lsp::Range range(const lsp::Position p_start, const lsp::Position p_end) {
-	lsp::Range r;
+LSP::Range range(const LSP::Position p_start, const LSP::Position p_end) {
+	LSP::Range r;
 	r.start = p_start;
 	r.end = p_end;
 	return r;
 }
 
-lsp::TextDocumentPositionParams pos_in(const lsp::DocumentUri &p_uri, const lsp::Position p_pos) {
-	lsp::TextDocumentPositionParams params;
+LSP::TextDocumentPositionParams pos_in(const LSP::DocumentUri &p_uri, const LSP::Position p_pos) {
+	LSP::TextDocumentPositionParams params;
 	params.textDocument.uri = p_uri;
 	params.position = p_pos;
 	return params;
 }
 
-const lsp::DocumentSymbol *test_resolve_symbol_at(const String &p_uri, const lsp::Position p_pos, const String &p_expected_uri, const String &p_expected_name, const lsp::Range &p_expected_range) {
+const LSP::DocumentSymbol *test_resolve_symbol_at(const String &p_uri, const LSP::Position p_pos, const String &p_expected_uri, const String &p_expected_name, const LSP::Range &p_expected_range) {
 	Ref<GDScriptWorkspace> workspace = GDScriptLanguageProtocol::get_singleton()->get_workspace();
 
-	lsp::TextDocumentPositionParams params = pos_in(p_uri, p_pos);
-	const lsp::DocumentSymbol *symbol = workspace->resolve_symbol(params);
+	LSP::TextDocumentPositionParams params = pos_in(p_uri, p_pos);
+	const LSP::DocumentSymbol *symbol = workspace->resolve_symbol(params);
 	CHECK(symbol);
 
 	if (symbol) {
@@ -140,7 +143,7 @@ const lsp::DocumentSymbol *test_resolve_symbol_at(const String &p_uri, const lsp
 }
 
 struct InlineTestData {
-	lsp::Range range;
+	LSP::Range range;
 	String text;
 	String name;
 	String ref;
@@ -257,7 +260,7 @@ void test_resolve_symbol(const String &p_uri, const InlineTestData &p_test_data,
 		REQUIRE_MESSAGE(target, vformat("No target for ref '%s'", p_test_data.ref));
 
 		Ref<GDScriptWorkspace> workspace = GDScriptLanguageProtocol::get_singleton()->get_workspace();
-		lsp::Position pos = p_test_data.range.start;
+		LSP::Position pos = p_test_data.range.start;
 
 		SUBCASE("start of identifier") {
 			pos.character = p_test_data.range.start.character;
@@ -308,17 +311,17 @@ void assert_no_errors_in(const String &p_path) {
 	REQUIRE_MESSAGE(err == OK, vformat("Errors while analyzing '%s'", p_path));
 }
 
-inline lsp::Position lsp_pos(int line, int character) {
-	lsp::Position p;
+inline LSP::Position lsp_pos(int line, int character) {
+	LSP::Position p;
 	p.line = line;
 	p.character = character;
 	return p;
 }
 
-void test_position_roundtrip(lsp::Position p_lsp, GodotPosition p_gd, const PackedStringArray &p_lines) {
+void test_position_roundtrip(LSP::Position p_lsp, GodotPosition p_gd, const PackedStringArray &p_lines) {
 	GodotPosition actual_gd = GodotPosition::from_lsp(p_lsp, p_lines);
 	CHECK_EQ(p_gd, actual_gd);
-	lsp::Position actual_lsp = p_gd.to_lsp(p_lines);
+	LSP::Position actual_lsp = p_gd.to_lsp(p_lines);
 	CHECK_EQ(p_lsp, actual_lsp);
 }
 
@@ -343,25 +346,25 @@ func f():
 		PackedStringArray lines = code.split("\n");
 
 		SUBCASE("line after end") {
-			lsp::Position lsp = lsp_pos(7, 0);
+			LSP::Position lsp = lsp_pos(7, 0);
 			GodotPosition gd(8, 1);
 			test_position_roundtrip(lsp, gd, lines);
 		}
 		SUBCASE("first char in first line") {
-			lsp::Position lsp = lsp_pos(0, 0);
+			LSP::Position lsp = lsp_pos(0, 0);
 			GodotPosition gd(1, 1);
 			test_position_roundtrip(lsp, gd, lines);
 		}
 
 		SUBCASE("with tabs") {
 			// On `v` in `value` in `var value := ...`.
-			lsp::Position lsp = lsp_pos(5, 6);
+			LSP::Position lsp = lsp_pos(5, 6);
 			GodotPosition gd(6, 13);
 			test_position_roundtrip(lsp, gd, lines);
 		}
 
 		SUBCASE("doesn't fail with column outside of character length") {
-			lsp::Position lsp = lsp_pos(2, 100);
+			LSP::Position lsp = lsp_pos(2, 100);
 			GodotPosition::from_lsp(lsp, lines);
 
 			GodotPosition gd(3, 100);
@@ -369,7 +372,7 @@ func f():
 		}
 
 		SUBCASE("doesn't fail with line outside of line length") {
-			lsp::Position lsp = lsp_pos(200, 100);
+			LSP::Position lsp = lsp_pos(200, 100);
 			GodotPosition::from_lsp(lsp, lines);
 
 			GodotPosition gd(300, 100);
@@ -378,26 +381,26 @@ func f():
 
 		SUBCASE("special case: zero column for root class") {
 			GodotPosition gd(1, 0);
-			lsp::Position expected = lsp_pos(0, 0);
-			lsp::Position actual = gd.to_lsp(lines);
+			LSP::Position expected = lsp_pos(0, 0);
+			LSP::Position actual = gd.to_lsp(lines);
 			CHECK_EQ(actual, expected);
 		}
 		SUBCASE("special case: zero line and column for root class") {
 			GodotPosition gd(0, 0);
-			lsp::Position expected = lsp_pos(0, 0);
-			lsp::Position actual = gd.to_lsp(lines);
+			LSP::Position expected = lsp_pos(0, 0);
+			LSP::Position actual = gd.to_lsp(lines);
 			CHECK_EQ(actual, expected);
 		}
 		SUBCASE("special case: negative line for root class") {
 			GodotPosition gd(-1, 0);
-			lsp::Position expected = lsp_pos(0, 0);
-			lsp::Position actual = gd.to_lsp(lines);
+			LSP::Position expected = lsp_pos(0, 0);
+			LSP::Position actual = gd.to_lsp(lines);
 			CHECK_EQ(actual, expected);
 		}
 		SUBCASE("special case: lines.length() + 1 for root class") {
 			GodotPosition gd(lines.size() + 1, 0);
-			lsp::Position expected = lsp_pos(lines.size(), 0);
-			lsp::Position actual = gd.to_lsp(lines);
+			LSP::Position expected = lsp_pos(lines.size(), 0);
+			LSP::Position actual = gd.to_lsp(lines);
 			CHECK_EQ(actual, expected);
 		}
 	}
@@ -489,15 +492,21 @@ func f():
 		REQUIRE(proto);
 
 		SUBCASE("selectionRange of root class must be inside range") {
-			String path = "res://lsp/first_line_comment.gd";
-			assert_no_errors_in(path);
-			GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_local_script(path);
-			ExtendGDScriptParser *parser = GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_results[path];
-			REQUIRE(parser);
-			lsp::DocumentSymbol cls = parser->get_symbols();
+			LocalVector<String> paths = {
+				"res://lsp/first_line_comment.gd", // Comment on first line
+				"res://lsp/first_line_class_name.gd", // class_name (and thus selection range) before extends
+			};
 
-			REQUIRE(((cls.range.start.line == cls.selectionRange.start.line && cls.range.start.character <= cls.selectionRange.start.character) || (cls.range.start.line < cls.selectionRange.start.line)));
-			REQUIRE(((cls.range.end.line == cls.selectionRange.end.line && cls.range.end.character >= cls.selectionRange.end.character) || (cls.range.end.line > cls.selectionRange.end.line)));
+			for (const String &path : paths) {
+				assert_no_errors_in(path);
+				GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_local_script(path);
+				ExtendGDScriptParser *parser = GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_results[path];
+				REQUIRE(parser);
+				LSP::DocumentSymbol cls = parser->get_symbols();
+
+				REQUIRE(((cls.range.start.line == cls.selectionRange.start.line && cls.range.start.character <= cls.selectionRange.start.character) || (cls.range.start.line < cls.selectionRange.start.line)));
+				REQUIRE(((cls.range.end.line == cls.selectionRange.end.line && cls.range.end.character >= cls.selectionRange.end.character) || (cls.range.end.line > cls.selectionRange.end.line)));
+			}
 		}
 
 		memdelete(proto);
@@ -507,6 +516,6 @@ func f():
 
 } // namespace GDScriptTests
 
-#endif // TOOLS_ENABLED
+#endif // MODULE_JSONRPC_ENABLED
 
-#endif // TEST_LSP_H
+#endif // TOOLS_ENABLED
diff --git a/engine/modules/glslang/SCsub b/engine/modules/glslang/SCsub
index b6e3da23..4b1f0177 100644
--- a/engine/modules/glslang/SCsub
+++ b/engine/modules/glslang/SCsub
@@ -62,13 +62,9 @@ if env["builtin_glslang"]:
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    # Treat glslang headers as system headers to avoid raising warnings. Not supported on MSVC.
     # Include `#thirdparty` to workaround mismatch between location of `SPIRV` in library source
     # and in installed public headers.
-    if not env.msvc:
-        env_glslang.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path, "-isystem", Dir("#thirdparty").path])
-    else:
-        env_glslang.Prepend(CPPPATH=[thirdparty_dir, "#thirdparty"])
+    env_glslang.Prepend(CPPEXTPATH=[thirdparty_dir, "#thirdparty"])
 
     env_glslang.Append(CPPDEFINES=["ENABLE_OPT=0"])
 
diff --git a/engine/modules/glslang/register_types.h b/engine/modules/glslang/register_types.h
index d0b8cdd3..920db9e8 100644
--- a/engine/modules/glslang/register_types.h
+++ b/engine/modules/glslang/register_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLSLANG_REGISTER_TYPES_H
-#define GLSLANG_REGISTER_TYPES_H
+#pragma once
 
 #define MODULE_GLSLANG_HAS_PREREGISTER
 
@@ -37,5 +36,3 @@
 
 void initialize_glslang_module(ModuleInitializationLevel p_level);
 void uninitialize_glslang_module(ModuleInitializationLevel p_level);
-
-#endif // GLSLANG_REGISTER_TYPES_H
diff --git a/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml b/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml
index e3433e6e..5d78aa44 100644
--- a/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml
+++ b/engine/modules/gltf/doc_classes/EditorSceneFormatImporterBlend.xml
@@ -5,7 +5,7 @@
 	</brief_description>
 	<description>
 		Imports Blender scenes in the [code].blend[/code] file format through the glTF 2.0 3D import pipeline. This importer requires Blender to be installed by the user, so that it can be used to export the scene as glTF 2.0.
-		The location of the Blender binary is set via the [code]filesystem/import/blender/blender_path[/code] editor setting.
+		The location of the Blender binary is set via the [member EditorSettings.filesystem/import/blender/blender_path] setting.
 		This importer is only used if [member ProjectSettings.filesystem/import/blender/enabled] is enabled, otherwise [code].blend[/code] files present in the project folder are not imported.
 		Blend import requires Blender 3.0.
 		Internally, the EditorSceneFormatImporterBlend uses the Blender glTF "Use Original" mode to reference external textures.
diff --git a/engine/modules/gltf/doc_classes/GLTFAccessor.xml b/engine/modules/gltf/doc_classes/GLTFAccessor.xml
index 271f0988..905eb557 100644
--- a/engine/modules/gltf/doc_classes/GLTFAccessor.xml
+++ b/engine/modules/gltf/doc_classes/GLTFAccessor.xml
@@ -13,7 +13,7 @@
 	</tutorials>
 	<members>
 		<member name="accessor_type" type="int" setter="set_accessor_type" getter="get_accessor_type" enum="GLTFAccessor.GLTFAccessorType" default="0">
-			The glTF accessor type as an enum. Possible values are 0 for "SCALAR", 1 for "VEC2", 2 for "VEC3", 3 for "VEC4", 4 for "MAT2", 5 for "MAT3", and 6 for "MAT4".
+			The glTF accessor type, as an enum.
 		</member>
 		<member name="buffer_view" type="int" setter="set_buffer_view" getter="get_buffer_view" default="-1">
 			The index of the buffer view this accessor is referencing. If [code]-1[/code], this accessor is not referencing any buffer view.
@@ -55,7 +55,7 @@
 			The offset relative to the start of the bufferView in bytes.
 		</member>
 		<member name="type" type="int" setter="set_type" getter="get_type" deprecated="Use [member accessor_type] instead.">
-			The glTF accessor type as an enum. Use [member accessor_type] instead.
+			The glTF accessor type, as an [int]. Possible values are [code]0[/code] for "SCALAR", [code]1[/code] for "VEC2", [code]2[/code] for "VEC3", [code]3[/code] for "VEC4", [code]4[/code] for "MAT2", [code]5[/code] for "MAT3", and [code]6[/code] for "MAT4".
 		</member>
 	</members>
 	<constants>
diff --git a/engine/modules/gltf/doc_classes/GLTFLight.xml b/engine/modules/gltf/doc_classes/GLTFLight.xml
index e07d24a1..e87c123b 100644
--- a/engine/modules/gltf/doc_classes/GLTFLight.xml
+++ b/engine/modules/gltf/doc_classes/GLTFLight.xml
@@ -53,7 +53,8 @@
 	</methods>
 	<members>
 		<member name="color" type="Color" setter="set_color" getter="get_color" default="Color(1, 1, 1, 1)" keywords="colour">
-			The [Color] of the light. Defaults to white. A black color causes the light to have no effect.
+			The [Color] of the light in linear space. Defaults to white. A black color causes the light to have no effect.
+			This value is linear to match glTF, but will be converted to nonlinear sRGB when creating a Godot [Light3D] node upon import, or converted to linear when exporting a Godot [Light3D] to glTF.
 		</member>
 		<member name="inner_cone_angle" type="float" setter="set_inner_cone_angle" getter="get_inner_cone_angle" default="0.0">
 			The inner angle of the cone in a spotlight. Must be less than or equal to the outer cone angle.
@@ -70,7 +71,7 @@
 			At this angle, the light drops off to zero brightness. Between the inner and outer cone angles, there is a transition from full brightness to zero brightness. If this angle is a half turn, then the spotlight emits in all directions. When creating a Godot [SpotLight3D], the outer cone angle is used as the angle of the spotlight.
 		</member>
 		<member name="range" type="float" setter="set_range" getter="get_range" default="inf">
-			The range of the light, beyond which the light has no effect. glTF lights with no range defined behave like physical lights (which have infinite range). When creating a Godot light, the range is clamped to 4096.
+			The range of the light, beyond which the light has no effect. glTF lights with no range defined behave like physical lights (which have infinite range). When creating a Godot light, the range is clamped to [code]4096.0[/code].
 		</member>
 	</members>
 </class>
diff --git a/engine/modules/gltf/doc_classes/GLTFNode.xml b/engine/modules/gltf/doc_classes/GLTFNode.xml
index 0fb85e40..ed05fde7 100644
--- a/engine/modules/gltf/doc_classes/GLTFNode.xml
+++ b/engine/modules/gltf/doc_classes/GLTFNode.xml
@@ -48,7 +48,7 @@
 	</methods>
 	<members>
 		<member name="camera" type="int" setter="set_camera" getter="get_camera" default="-1">
-			If this glTF node is a camera, the index of the [GLTFCamera] in the [GLTFState] that describes the camera's properties. If -1, this node is not a camera.
+			If this glTF node is a camera, the index of the [GLTFCamera] in the [GLTFState] that describes the camera's properties. If [code]-1[/code], this node is not a camera.
 		</member>
 		<member name="children" type="PackedInt32Array" setter="set_children" getter="get_children" default="PackedInt32Array()">
 			The indices of the child nodes in the [GLTFState]. If this glTF node has no children, this will be an empty array.
diff --git a/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml b/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml
index a457d94c..92f90ec7 100644
--- a/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml
+++ b/engine/modules/gltf/doc_classes/GLTFObjectModelProperty.xml
@@ -63,7 +63,7 @@
 			If set, this [Expression] will be used to convert the property value from the Godot property to the value expected by the glTF object model. This is useful when the glTF object model uses a different unit system, or when the data needs to be transformed in some way. If [code]null[/code], the value will be copied as-is.
 		</member>
 		<member name="json_pointers" type="PackedStringArray[]" setter="set_json_pointers" getter="get_json_pointers" default="[]">
-			The glTF object model JSON pointers used to identify the property in the glTF object model. In most cases, there will be only one item in this array, but niche cases may require multiple pointers. The items are themselves arrays which represent the JSON pointer split into its components.
+			The glTF object model JSON pointers used to identify the property in the glTF object model. In most cases, there will be only one item in this array, but specific cases may require multiple pointers. The items are themselves arrays which represent the JSON pointer split into its components.
 		</member>
 		<member name="node_paths" type="NodePath[]" setter="set_node_paths" getter="get_node_paths" default="[]">
 			An array of [NodePath]s that point to a property, or multiple properties, in the Godot scene tree. On import, this will either be set by [GLTFDocument], or by a [GLTFDocumentExtension] class. For simple cases, use [method append_path_to_property] to add properties to this array.
diff --git a/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml b/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml
index 1a76b190..fdee3a98 100644
--- a/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml
+++ b/engine/modules/gltf/doc_classes/GLTFPhysicsBody.xml
@@ -43,7 +43,9 @@
 			The angular velocity of the physics body, in radians per second. This is only used when the body type is "rigid" or "vehicle".
 		</member>
 		<member name="body_type" type="String" setter="set_body_type" getter="get_body_type" default="&quot;rigid&quot;">
-			The type of the body. When importing, this controls what type of [CollisionObject3D] node Godot should generate. Valid values are "static", "animatable", "character", "rigid", "vehicle", and "trigger". When exporting, this will be squashed down to one of "static", "kinematic", or "dynamic" motion types, or the "trigger" property.
+			The type of the body.
+			When importing, this controls what type of [CollisionObject3D] node Godot should generate. Valid values are [code]"static"[/code], [code]"animatable"[/code], [code]"character"[/code], [code]"rigid"[/code], [code]"vehicle"[/code], and [code]"trigger"[/code].
+			When exporting, this will be squashed down to one of [code]"static"[/code], [code]"kinematic"[/code], or [code]"dynamic"[/code] motion types, or the [code]"trigger"[/code] property.
 		</member>
 		<member name="center_of_mass" type="Vector3" setter="set_center_of_mass" getter="get_center_of_mass" default="Vector3(0, 0, 0)">
 			The center of mass of the body, in meters. This is in local space relative to the body. By default, the center of the mass is the body's origin.
diff --git a/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml b/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml
index 53872a94..588e4dd0 100644
--- a/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml
+++ b/engine/modules/gltf/doc_classes/GLTFPhysicsShape.xml
@@ -56,26 +56,26 @@
 	</methods>
 	<members>
 		<member name="height" type="float" setter="set_height" getter="get_height" default="2.0">
-			The height of the shape, in meters. This is only used when the shape type is "capsule" or "cylinder". This value should not be negative, and for "capsule" it should be at least twice the radius.
+			The height of the shape, in meters. This is only used when the shape type is [code]"capsule"[/code] or [code]"cylinder"[/code]. This value should not be negative, and for [code]"capsule"[/code] it should be at least twice the radius.
 		</member>
 		<member name="importer_mesh" type="ImporterMesh" setter="set_importer_mesh" getter="get_importer_mesh">
-			The [ImporterMesh] resource of the shape. This is only used when the shape type is "hull" (convex hull) or "trimesh" (concave trimesh).
+			The [ImporterMesh] resource of the shape. This is only used when the shape type is [code]"hull"[/code] (convex hull) or [code]"trimesh"[/code] (concave trimesh).
 		</member>
 		<member name="is_trigger" type="bool" setter="set_is_trigger" getter="get_is_trigger" default="false">
-			If [code]true[/code], indicates that this shape is a trigger. For Godot, this means that the shape should be a child of an Area3D node.
+			If [code]true[/code], indicates that this shape is a trigger. For Godot, this means that the shape should be a child of an [Area3D] node.
 			This is the only variable not used in the [method to_node] method, it's intended to be used alongside when deciding where to add the generated node as a child.
 		</member>
 		<member name="mesh_index" type="int" setter="set_mesh_index" getter="get_mesh_index" default="-1">
-			The index of the shape's mesh in the glTF file. This is only used when the shape type is "hull" (convex hull) or "trimesh" (concave trimesh).
+			The index of the shape's mesh in the glTF file. This is only used when the shape type is [code]"hull"[/code] (convex hull) or [code]"trimesh"[/code] (concave trimesh).
 		</member>
 		<member name="radius" type="float" setter="set_radius" getter="get_radius" default="0.5">
-			The radius of the shape, in meters. This is only used when the shape type is "capsule", "cylinder", or "sphere". This value should not be negative.
+			The radius of the shape, in meters. This is only used when the shape type is [code]"capsule"[/code], [code]"cylinder"[/code], or [code]"sphere"[/code]. This value should not be negative.
 		</member>
 		<member name="shape_type" type="String" setter="set_shape_type" getter="get_shape_type" default="&quot;&quot;">
-			The type of shape this shape represents. Valid values are "box", "capsule", "cylinder", "sphere", "hull", and "trimesh".
+			The type of shape this shape represents. Valid values are [code]"box"[/code], [code]"capsule"[/code], [code]"cylinder"[/code], [code]"sphere"[/code], [code]"hull"[/code], and [code]"trimesh"[/code].
 		</member>
 		<member name="size" type="Vector3" setter="set_size" getter="get_size" default="Vector3(1, 1, 1)">
-			The size of the shape, in meters. This is only used when the shape type is "box", and it represents the "diameter" of the box. This value should not be negative.
+			The size of the shape, in meters. This is only used when the shape type is [code]"box"[/code], and it represents the [code]"diameter"[/code] of the box. This value should not be negative.
 		</member>
 	</members>
 </class>
diff --git a/engine/modules/gltf/doc_classes/GLTFState.xml b/engine/modules/gltf/doc_classes/GLTFState.xml
index 1904e9bc..5d19d336 100644
--- a/engine/modules/gltf/doc_classes/GLTFState.xml
+++ b/engine/modules/gltf/doc_classes/GLTFState.xml
@@ -25,7 +25,7 @@
 			<param index="0" name="data" type="PackedByteArray" />
 			<param index="1" name="deduplication" type="bool" />
 			<description>
-				Appends the given byte array data to the buffers and creates a [GLTFBufferView] for it. The index of the destination [GLTFBufferView] is returned. If [param deduplication] is [code]true[/code], the buffers will first be searched for duplicate data, otherwise new bytes will always be appended.
+				Appends the given byte array [param data] to the buffers and creates a [GLTFBufferView] for it. The index of the destination [GLTFBufferView] is returned. If [param deduplication] is [code]true[/code], the buffers are first searched for duplicate data, otherwise new bytes are always appended.
 			</description>
 		</method>
 		<method name="append_gltf_node">
@@ -34,7 +34,7 @@
 			<param index="1" name="godot_scene_node" type="Node" />
 			<param index="2" name="parent_node_index" type="int" />
 			<description>
-				Append the given [GLTFNode] to the state, and return its new index. This can be used to export one Godot node as multiple glTF nodes, or inject new glTF nodes at import time. On import, this must be called before [method GLTFDocumentExtension._generate_scene_node] finishes for the parent node. On export, this must be called before [method GLTFDocumentExtension._export_node] runs for the parent node.
+				Appends the given [GLTFNode] to the state, and returns its new index. This can be used to export one Godot node as multiple glTF nodes, or inject new glTF nodes at import time. On import, this must be called before [method GLTFDocumentExtension._generate_scene_node] finishes for the parent node. On export, this must be called before [method GLTFDocumentExtension._export_node] runs for the parent node.
 				The [param godot_scene_node] parameter is the Godot scene node that corresponds to this glTF node. This is highly recommended to be set to a valid node, but may be [code]null[/code] if there is no corresponding Godot scene node. One Godot scene node may be used for multiple glTF nodes, so if exporting multiple glTF nodes for one Godot scene node, use the same Godot scene node for each.
 				The [param parent_node_index] parameter is the index of the parent [GLTFNode] in the state. If [code]-1[/code], the node will be a root node, otherwise the new node will be added to the parent's list of children. The index will also be written to the [member GLTFNode.parent] property of the new node.
 			</description>
diff --git a/engine/modules/gltf/editor/editor_import_blend_runner.cpp b/engine/modules/gltf/editor/editor_import_blend_runner.cpp
index 22c8adfe..f10ca527 100644
--- a/engine/modules/gltf/editor/editor_import_blend_runner.cpp
+++ b/engine/modules/gltf/editor/editor_import_blend_runner.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_import_blend_runner.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "core/io/http_client.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
@@ -94,11 +92,10 @@ bpy.ops.export_scene.gltf(**opts['gltf_options'])
 
 String dict_to_python(const Dictionary &p_dict) {
 	String entries;
-	Array dict_keys = p_dict.keys();
-	for (int i = 0; i < dict_keys.size(); i++) {
-		const String key = dict_keys[i];
+	for (const KeyValue<Variant, Variant> &kv : p_dict) {
+		const String &key = kv.key;
 		String value;
-		Variant raw_value = p_dict[key];
+		const Variant &raw_value = kv.value;
 
 		switch (raw_value.get_type()) {
 			case Variant::Type::BOOL: {
@@ -127,11 +124,10 @@ String dict_to_python(const Dictionary &p_dict) {
 
 String dict_to_xmlrpc(const Dictionary &p_dict) {
 	String members;
-	Array dict_keys = p_dict.keys();
-	for (int i = 0; i < dict_keys.size(); i++) {
-		const String key = dict_keys[i];
+	for (const KeyValue<Variant, Variant> &kv : p_dict) {
+		const String &key = kv.key;
 		String value;
-		Variant raw_value = p_dict[key];
+		const Variant &raw_value = kv.value;
 
 		switch (raw_value.get_type()) {
 			case Variant::Type::BOOL: {
@@ -392,5 +388,3 @@ EditorImportBlendRunner::EditorImportBlendRunner() {
 
 	EditorFileSystem::get_singleton()->connect("resources_reimported", callable_mp(this, &EditorImportBlendRunner::_resources_reimported));
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/gltf/editor/editor_import_blend_runner.h b/engine/modules/gltf/editor/editor_import_blend_runner.h
index b3b49ebf..c2a087b7 100644
--- a/engine/modules/gltf/editor/editor_import_blend_runner.h
+++ b/engine/modules/gltf/editor/editor_import_blend_runner.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_IMPORT_BLEND_RUNNER_H
-#define EDITOR_IMPORT_BLEND_RUNNER_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "core/io/http_client.h"
 #include "core/os/os.h"
@@ -66,7 +63,3 @@ public:
 
 	EditorImportBlendRunner();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_IMPORT_BLEND_RUNNER_H
diff --git a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
index 17b70941..cb59377e 100644
--- a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
+++ b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_scene_exporter_gltf_plugin.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "editor_scene_exporter_gltf_settings.h"
 
 #include "editor/editor_file_system.h"
@@ -118,5 +116,3 @@ void SceneExporterGLTFPlugin::_export_scene_as_gltf(const String &p_file_path) {
 	}
 	EditorFileSystem::get_singleton()->scan_changes();
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
index 85b8ce3b..65b3d19e 100644
--- a/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
+++ b/engine/modules/gltf/editor/editor_scene_exporter_gltf_plugin.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H
-#define EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "../gltf_document.h"
 #include "editor_scene_exporter_gltf_settings.h"
@@ -56,7 +53,3 @@ public:
 	bool has_main_screen() const override;
 	SceneExporterGLTFPlugin();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_SCENE_EXPORTER_GLTF_PLUGIN_H
diff --git a/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.h b/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.h
index aa0e5407..ed25643b 100644
--- a/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.h
+++ b/engine/modules/gltf/editor/editor_scene_exporter_gltf_settings.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCENE_EXPORTER_GLTF_SETTINGS_H
-#define EDITOR_SCENE_EXPORTER_GLTF_SETTINGS_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "../gltf_document.h"
 
@@ -63,7 +60,3 @@ public:
 	double get_bake_fps() const;
 	void set_bake_fps(const double p_bake_fps);
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_SCENE_EXPORTER_GLTF_SETTINGS_H
diff --git a/engine/modules/gltf/editor/editor_scene_importer_blend.cpp b/engine/modules/gltf/editor/editor_scene_importer_blend.cpp
index c9540220..c55b9ba2 100644
--- a/engine/modules/gltf/editor/editor_scene_importer_blend.cpp
+++ b/engine/modules/gltf/editor/editor_scene_importer_blend.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_scene_importer_blend.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "../gltf_defines.h"
 #include "../gltf_document.h"
 #include "editor_import_blend_runner.h"
@@ -517,6 +515,7 @@ bool EditorFileSystemImportFormatSupportQueryBlend::query() {
 
 		blender_path = memnew(LineEdit);
 		blender_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+		blender_path->set_accessibility_name(TTRC("Path"));
 		hb->add_child(blender_path);
 
 		blender_path_browse = memnew(Button);
@@ -595,8 +594,3 @@ bool EditorFileSystemImportFormatSupportQueryBlend::query() {
 
 	return false;
 }
-
-EditorFileSystemImportFormatSupportQueryBlend::EditorFileSystemImportFormatSupportQueryBlend() {
-}
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/gltf/editor/editor_scene_importer_blend.h b/engine/modules/gltf/editor/editor_scene_importer_blend.h
index a4f40143..996f897f 100644
--- a/engine/modules/gltf/editor/editor_scene_importer_blend.h
+++ b/engine/modules/gltf/editor/editor_scene_importer_blend.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCENE_IMPORTER_BLEND_H
-#define EDITOR_SCENE_IMPORTER_BLEND_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "editor/editor_file_system.h"
 #include "editor/import/3d/resource_importer_scene.h"
@@ -108,10 +105,4 @@ public:
 	virtual bool is_active() const override;
 	virtual Vector<String> get_file_extensions() const override;
 	virtual bool query() override;
-
-	EditorFileSystemImportFormatSupportQueryBlend();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_SCENE_IMPORTER_BLEND_H
diff --git a/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp b/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp
index e63b3ec9..6b08af19 100644
--- a/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp
+++ b/engine/modules/gltf/editor/editor_scene_importer_gltf.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_scene_importer_gltf.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "../gltf_defines.h"
 #include "../gltf_document.h"
 
@@ -103,5 +101,3 @@ Variant EditorSceneFormatImporterGLTF::get_option_visibility(const String &p_pat
 		const String &p_option, const HashMap<StringName, Variant> &p_options) {
 	return true;
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/gltf/editor/editor_scene_importer_gltf.h b/engine/modules/gltf/editor/editor_scene_importer_gltf.h
index 1dee456c..c62367bc 100644
--- a/engine/modules/gltf/editor/editor_scene_importer_gltf.h
+++ b/engine/modules/gltf/editor/editor_scene_importer_gltf.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_SCENE_IMPORTER_GLTF_H
-#define EDITOR_SCENE_IMPORTER_GLTF_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "editor/import/3d/resource_importer_scene.h"
 
@@ -52,7 +49,3 @@ public:
 	virtual Variant get_option_visibility(const String &p_path, const String &p_scene_import_type,
 			const String &p_option, const HashMap<StringName, Variant> &p_options) override;
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_SCENE_IMPORTER_GLTF_H
diff --git a/engine/modules/gltf/extensions/SCsub b/engine/modules/gltf/extensions/SCsub
index e403cd6f..310fdcbc 100644
--- a/engine/modules/gltf/extensions/SCsub
+++ b/engine/modules/gltf/extensions/SCsub
@@ -9,4 +9,5 @@ env_gltf = env_modules.Clone()
 # Godot source files
 
 env_gltf.add_source_files(env.modules_sources, "*.cpp")
-env_gltf.add_source_files(env.modules_sources, "physics/*.cpp")
+if not env["disable_physics_3d"]:
+    env_gltf.add_source_files(env.modules_sources, "physics/*.cpp")
diff --git a/engine/modules/gltf/extensions/gltf_document_extension.h b/engine/modules/gltf/extensions/gltf_document_extension.h
index a6368ea7..b6edb04d 100644
--- a/engine/modules/gltf/extensions/gltf_document_extension.h
+++ b/engine/modules/gltf/extensions/gltf_document_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_DOCUMENT_EXTENSION_H
-#define GLTF_DOCUMENT_EXTENSION_H
+#pragma once
 
 #include "../gltf_state.h"
 
@@ -94,5 +93,3 @@ public:
 	GDVIRTUAL4R(Error, _export_node, Ref<GLTFState>, Ref<GLTFNode>, Dictionary, Node *);
 	GDVIRTUAL1R(Error, _export_post, Ref<GLTFState>);
 };
-
-#endif // GLTF_DOCUMENT_EXTENSION_H
diff --git a/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h b/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h
index fdd04d08..b06b98ad 100644
--- a/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h
+++ b/engine/modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_DOCUMENT_EXTENSION_CONVERT_IMPORTER_MESH_H
-#define GLTF_DOCUMENT_EXTENSION_CONVERT_IMPORTER_MESH_H
+#pragma once
 
 #include "gltf_document_extension.h"
 
@@ -45,5 +44,3 @@ public:
 	static MeshInstance3D *convert_importer_mesh_instance_3d(ImporterMeshInstance3D *p_importer_mesh_instance_3d);
 	Error import_post(Ref<GLTFState> p_state, Node *p_root) override;
 };
-
-#endif // GLTF_DOCUMENT_EXTENSION_CONVERT_IMPORTER_MESH_H
diff --git a/engine/modules/gltf/extensions/gltf_document_extension_texture_ktx.h b/engine/modules/gltf/extensions/gltf_document_extension_texture_ktx.h
index e4cb38a0..ee9d6e96 100644
--- a/engine/modules/gltf/extensions/gltf_document_extension_texture_ktx.h
+++ b/engine/modules/gltf/extensions/gltf_document_extension_texture_ktx.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_DOCUMENT_EXTENSION_TEXTURE_KTX_H
-#define GLTF_DOCUMENT_EXTENSION_TEXTURE_KTX_H
+#pragma once
 
 #include "gltf_document_extension.h"
 
@@ -43,5 +42,3 @@ public:
 	Error parse_image_data(Ref<GLTFState> p_state, const PackedByteArray &p_image_data, const String &p_mime_type, Ref<Image> r_image) override;
 	Error parse_texture_json(Ref<GLTFState> p_state, const Dictionary &p_texture_json, Ref<GLTFTexture> r_gltf_texture) override;
 };
-
-#endif // GLTF_DOCUMENT_EXTENSION_TEXTURE_KTX_H
diff --git a/engine/modules/gltf/extensions/gltf_document_extension_texture_webp.h b/engine/modules/gltf/extensions/gltf_document_extension_texture_webp.h
index 2113bd47..9ed2641e 100644
--- a/engine/modules/gltf/extensions/gltf_document_extension_texture_webp.h
+++ b/engine/modules/gltf/extensions/gltf_document_extension_texture_webp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_DOCUMENT_EXTENSION_TEXTURE_WEBP_H
-#define GLTF_DOCUMENT_EXTENSION_TEXTURE_WEBP_H
+#pragma once
 
 #include "gltf_document_extension.h"
 
@@ -49,5 +48,3 @@ public:
 	Error save_image_at_path(Ref<GLTFState> p_state, Ref<Image> p_image, const String &p_full_path, const String &p_image_format, float p_lossy_quality) override;
 	Error serialize_texture_json(Ref<GLTFState> p_state, Dictionary p_texture_json, Ref<GLTFTexture> p_gltf_texture, const String &p_image_format) override;
 };
-
-#endif // GLTF_DOCUMENT_EXTENSION_TEXTURE_WEBP_H
diff --git a/engine/modules/gltf/extensions/gltf_light.cpp b/engine/modules/gltf/extensions/gltf_light.cpp
index 41680baf..d8a0acff 100644
--- a/engine/modules/gltf/extensions/gltf_light.cpp
+++ b/engine/modules/gltf/extensions/gltf_light.cpp
@@ -130,7 +130,7 @@ Ref<GLTFLight> GLTFLight::from_node(const Light3D *p_light) {
 	Ref<GLTFLight> l;
 	l.instantiate();
 	ERR_FAIL_NULL_V_MSG(p_light, l, "Tried to create a GLTFLight from a Light3D node, but the given node was null.");
-	l->color = p_light->get_color();
+	l->color = p_light->get_color().srgb_to_linear();
 	if (cast_to<DirectionalLight3D>(p_light)) {
 		l->light_type = "directional";
 		const DirectionalLight3D *light = cast_to<const DirectionalLight3D>(p_light);
@@ -156,33 +156,33 @@ Ref<GLTFLight> GLTFLight::from_node(const Light3D *p_light) {
 }
 
 Light3D *GLTFLight::to_node() const {
+	Light3D *light = nullptr;
 	if (light_type == "directional") {
-		DirectionalLight3D *light = memnew(DirectionalLight3D);
-		light->set_param(Light3D::PARAM_ENERGY, intensity);
-		light->set_color(color);
-		return light;
-	}
-	if (light_type == "point") {
-		OmniLight3D *light = memnew(OmniLight3D);
-		light->set_param(OmniLight3D::PARAM_ENERGY, intensity);
-		light->set_param(OmniLight3D::PARAM_RANGE, CLAMP(range, 0, 4096));
-		light->set_color(color);
-		return light;
-	}
-	if (light_type == "spot") {
-		SpotLight3D *light = memnew(SpotLight3D);
-		light->set_param(SpotLight3D::PARAM_ENERGY, intensity);
-		light->set_param(SpotLight3D::PARAM_RANGE, CLAMP(range, 0, 4096));
-		light->set_param(SpotLight3D::PARAM_SPOT_ANGLE, Math::rad_to_deg(outer_cone_angle));
-		light->set_color(color);
+		DirectionalLight3D *dir_light = memnew(DirectionalLight3D);
+		dir_light->set_param(Light3D::PARAM_ENERGY, intensity);
+		light = dir_light;
+	} else if (light_type == "point") {
+		OmniLight3D *omni_light = memnew(OmniLight3D);
+		omni_light->set_param(OmniLight3D::PARAM_ENERGY, intensity);
+		omni_light->set_param(OmniLight3D::PARAM_RANGE, CLAMP(range, 0, 4096));
+		light = omni_light;
+	} else if (light_type == "spot") {
+		SpotLight3D *spot_light = memnew(SpotLight3D);
+		spot_light->set_param(SpotLight3D::PARAM_ENERGY, intensity);
+		spot_light->set_param(SpotLight3D::PARAM_RANGE, CLAMP(range, 0, 4096));
+		spot_light->set_param(SpotLight3D::PARAM_SPOT_ANGLE, Math::rad_to_deg(outer_cone_angle));
 		// Line of best fit derived from guessing, see https://www.desmos.com/calculator/biiflubp8b
 		// The points in desmos are not exact, except for (1, infinity).
 		float angle_ratio = inner_cone_angle / outer_cone_angle;
 		float angle_attenuation = 0.2 / (1 - angle_ratio) - 0.1;
-		light->set_param(SpotLight3D::PARAM_SPOT_ATTENUATION, angle_attenuation);
-		return light;
+		spot_light->set_param(SpotLight3D::PARAM_SPOT_ATTENUATION, angle_attenuation);
+		light = spot_light;
+	} else {
+		ERR_PRINT("Failed to create a Light3D node from GLTFLight, unknown light type '" + light_type + "'.");
+		return nullptr;
 	}
-	return memnew(Light3D);
+	light->set_color(color.linear_to_srgb());
+	return light;
 }
 
 Ref<GLTFLight> GLTFLight::from_dictionary(const Dictionary p_dictionary) {
@@ -195,7 +195,7 @@ Ref<GLTFLight> GLTFLight::from_dictionary(const Dictionary p_dictionary) {
 	if (p_dictionary.has("color")) {
 		const Array &arr = p_dictionary["color"];
 		if (arr.size() == 3) {
-			light->color = Color(arr[0], arr[1], arr[2]).linear_to_srgb();
+			light->color = Color(arr[0], arr[1], arr[2]);
 		} else {
 			ERR_PRINT("Error parsing glTF light: The color must have exactly 3 numbers.");
 		}
@@ -232,7 +232,7 @@ Dictionary GLTFLight::to_dictionary() const {
 	if (intensity != 1.0f) {
 		d["intensity"] = intensity;
 	}
-	if (light_type != "directional" && range != INFINITY) {
+	if (light_type != "directional" && range != Math::INF) {
 		d["range"] = range;
 	}
 	if (light_type == "spot") {
diff --git a/engine/modules/gltf/extensions/gltf_light.h b/engine/modules/gltf/extensions/gltf_light.h
index 3d522bd1..27c30801 100644
--- a/engine/modules/gltf/extensions/gltf_light.h
+++ b/engine/modules/gltf/extensions/gltf_light.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_LIGHT_H
-#define GLTF_LIGHT_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -49,9 +48,9 @@ private:
 	Color color = Color(1.0f, 1.0f, 1.0f);
 	float intensity = 1.0f;
 	String light_type;
-	float range = INFINITY;
+	float range = Math::INF;
 	float inner_cone_angle = 0.0f;
-	float outer_cone_angle = Math_TAU / 8.0f;
+	float outer_cone_angle = Math::TAU / 8.0f;
 	Dictionary additional_data;
 
 public:
@@ -84,5 +83,3 @@ public:
 	Variant get_additional_data(const StringName &p_extension_name);
 	void set_additional_data(const StringName &p_extension_name, Variant p_additional_data);
 };
-
-#endif // GLTF_LIGHT_H
diff --git a/engine/modules/gltf/extensions/gltf_spec_gloss.h b/engine/modules/gltf/extensions/gltf_spec_gloss.h
index 46acd679..59c48fac 100644
--- a/engine/modules/gltf/extensions/gltf_spec_gloss.h
+++ b/engine/modules/gltf/extensions/gltf_spec_gloss.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_SPEC_GLOSS_H
-#define GLTF_SPEC_GLOSS_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -70,5 +69,3 @@ public:
 	Ref<Image> get_spec_gloss_img();
 	void set_spec_gloss_img(Ref<Image> p_spec_gloss_img);
 };
-
-#endif // GLTF_SPEC_GLOSS_H
diff --git a/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h b/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h
index 76a60a63..003f0927 100644
--- a/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h
+++ b/engine/modules/gltf/extensions/physics/gltf_document_extension_physics.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_DOCUMENT_EXTENSION_PHYSICS_H
-#define GLTF_DOCUMENT_EXTENSION_PHYSICS_H
+#pragma once
 
 #include "../gltf_document_extension.h"
 #include "gltf_physics_body.h"
@@ -51,5 +50,3 @@ public:
 	Ref<GLTFObjectModelProperty> export_object_model_property(Ref<GLTFState> p_state, const NodePath &p_node_path, const Node *p_godot_node, GLTFNodeIndex p_gltf_node_index, const Object *p_target_object, int p_target_depth) override;
 	Error export_node(Ref<GLTFState> p_state, Ref<GLTFNode> p_gltf_node, Dictionary &r_node_json, Node *p_scene_node) override;
 };
-
-#endif // GLTF_DOCUMENT_EXTENSION_PHYSICS_H
diff --git a/engine/modules/gltf/extensions/physics/gltf_physics_body.h b/engine/modules/gltf/extensions/physics/gltf_physics_body.h
index ec139054..702a7c15 100644
--- a/engine/modules/gltf/extensions/physics/gltf_physics_body.h
+++ b/engine/modules/gltf/extensions/physics/gltf_physics_body.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_PHYSICS_BODY_H
-#define GLTF_PHYSICS_BODY_H
+#pragma once
 
 #include "scene/3d/physics/physics_body_3d.h"
 
@@ -103,5 +102,3 @@ public:
 	static Ref<GLTFPhysicsBody> from_dictionary(const Dictionary p_dictionary);
 	Dictionary to_dictionary() const;
 };
-
-#endif // GLTF_PHYSICS_BODY_H
diff --git a/engine/modules/gltf/extensions/physics/gltf_physics_shape.h b/engine/modules/gltf/extensions/physics/gltf_physics_shape.h
index a6974473..7695a89d 100644
--- a/engine/modules/gltf/extensions/physics/gltf_physics_shape.h
+++ b/engine/modules/gltf/extensions/physics/gltf_physics_shape.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_PHYSICS_SHAPE_H
-#define GLTF_PHYSICS_SHAPE_H
+#pragma once
 
 #include "../../gltf_defines.h"
 
@@ -89,5 +88,3 @@ public:
 	static Ref<GLTFPhysicsShape> from_dictionary(const Dictionary p_dictionary);
 	Dictionary to_dictionary() const;
 };
-
-#endif // GLTF_PHYSICS_SHAPE_H
diff --git a/engine/modules/gltf/gltf_defines.h b/engine/modules/gltf/gltf_defines.h
index 4d88f7c3..dda72491 100644
--- a/engine/modules/gltf/gltf_defines.h
+++ b/engine/modules/gltf/gltf_defines.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_DEFINES_H
-#define GLTF_DEFINES_H
+#pragma once
 
 // This file should only be included by other headers.
 
@@ -66,5 +65,3 @@ using GLTFSkeletonIndex = int;
 using GLTFSkinIndex = int;
 using GLTFTextureIndex = int;
 using GLTFTextureSamplerIndex = int;
-
-#endif // GLTF_DEFINES_H
diff --git a/engine/modules/gltf/gltf_document.cpp b/engine/modules/gltf/gltf_document.cpp
index 45778b07..7dc7a2bc 100644
--- a/engine/modules/gltf/gltf_document.cpp
+++ b/engine/modules/gltf/gltf_document.cpp
@@ -62,6 +62,15 @@
 #include "editor/editor_file_system.h"
 #endif
 
+#include "modules/modules_enabled.gen.h" // For csg, gridmap.
+
+#ifdef MODULE_CSG_ENABLED
+#include "modules/csg/csg_shape.h"
+#endif
+#ifdef MODULE_GRIDMAP_ENABLED
+#include "modules/gridmap/grid_map.h"
+#endif
+
 // FIXME: Hardcoded to avoid editor dependency.
 #define GLTF_IMPORT_GENERATE_TANGENT_ARRAYS 8
 #define GLTF_IMPORT_USE_NAMED_SKIN_BINDS 16
@@ -70,7 +79,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <cstdint>
 
 constexpr int COMPONENT_COUNT_FOR_ACCESSOR_TYPE[7] = {
 	1, 2, 3, 4, 4, 9, 16
@@ -291,8 +299,7 @@ Error GLTFDocument::_parse_json(const String &p_path, Ref<GLTFState> p_state) {
 	Vector<uint8_t> array;
 	array.resize(file->get_length());
 	file->get_buffer(array.ptrw(), array.size());
-	String text;
-	text.parse_utf8((const char *)array.ptr(), array.size());
+	String text = String::utf8((const char *)array.ptr(), array.size());
 
 	JSON json;
 	err = json.parse(text);
@@ -322,8 +329,7 @@ Error GLTFDocument::_parse_glb(Ref<FileAccess> p_file, Ref<GLTFState> p_state) {
 	uint32_t len = p_file->get_buffer(json_data.ptrw(), chunk_length);
 	ERR_FAIL_COND_V(len != chunk_length, ERR_FILE_CORRUPT);
 
-	String text;
-	text.parse_utf8((const char *)json_data.ptr(), json_data.size());
+	String text = String::utf8((const char *)json_data.ptr(), json_data.size());
 
 	JSON json;
 	Error err = json.parse(text);
@@ -525,8 +531,7 @@ String GLTFDocument::_gen_unique_animation_name(Ref<GLTFState> p_state, const St
 
 String GLTFDocument::_sanitize_bone_name(const String &p_name) {
 	String bone_name = p_name;
-	bone_name = bone_name.replace(":", "_");
-	bone_name = bone_name.replace("/", "_");
+	bone_name = bone_name.replace_chars(":/", '_');
 	return bone_name;
 }
 
@@ -735,7 +740,7 @@ Error GLTFDocument::_encode_buffer_glb(Ref<GLTFState> p_state, const String &p_p
 		if (file.is_null()) {
 			return err;
 		}
-		if (buffer_data.size() == 0) {
+		if (buffer_data.is_empty()) {
 			return OK;
 		}
 		file->create(FileAccess::ACCESS_RESOURCES);
@@ -767,7 +772,7 @@ Error GLTFDocument::_encode_buffer_bins(Ref<GLTFState> p_state, const String &p_
 		if (file.is_null()) {
 			return err;
 		}
-		if (buffer_data.size() == 0) {
+		if (buffer_data.is_empty()) {
 			return OK;
 		}
 		file->create(FileAccess::ACCESS_RESOURCES);
@@ -806,8 +811,8 @@ Error GLTFDocument::_parse_buffers(Ref<GLTFState> p_state, const String &p_base_
 					buffer_data = _parse_base64_uri(uri);
 				} else { // Relative path to an external image file.
 					ERR_FAIL_COND_V(p_base_path.is_empty(), ERR_INVALID_PARAMETER);
-					uri = uri.uri_decode();
-					uri = p_base_path.path_join(uri).replace("\\", "/"); // Fix for Windows.
+					uri = uri.uri_file_decode();
+					uri = p_base_path.path_join(uri).replace_char('\\', '/'); // Fix for Windows.
 					ERR_FAIL_COND_V_MSG(!FileAccess::exists(uri), ERR_FILE_NOT_FOUND, "glTF: Binary file not found: " + uri);
 					buffer_data = FileAccess::get_file_as_bytes(uri);
 					ERR_FAIL_COND_V_MSG(buffer_data.is_empty(), ERR_PARSE_ERROR, "glTF: Couldn't load binary file as an array: " + uri);
@@ -882,6 +887,9 @@ Error GLTFDocument::_parse_buffer_views(Ref<GLTFState> p_state) {
 
 		if (d.has("byteStride")) {
 			buffer_view->byte_stride = d["byteStride"];
+			if (buffer_view->byte_stride < 4 || buffer_view->byte_stride > 252 || buffer_view->byte_stride % 4 != 0) {
+				ERR_PRINT("glTF import: Invalid byte stride " + itos(buffer_view->byte_stride) + " for buffer view at index " + itos(i) + " while importing file '" + p_state->filename + "'. If defined, byte stride must be a multiple of 4 and between 4 and 252.");
+			}
 		}
 
 		if (d.has("target")) {
@@ -1023,6 +1031,9 @@ Error GLTFDocument::_parse_accessors(Ref<GLTFState> p_state) {
 		accessor->component_type = (GLTFAccessor::GLTFComponentType)(int32_t)d["componentType"];
 		ERR_FAIL_COND_V(!d.has("count"), ERR_PARSE_ERROR);
 		accessor->count = d["count"];
+		if (accessor->count <= 0) {
+			ERR_PRINT("glTF import: Invalid accessor count " + itos(accessor->count) + " for accessor at index " + itos(i) + " while importing file '" + p_state->filename + "'. Accessor count must be greater than 0.");
+		}
 		ERR_FAIL_COND_V(!d.has("type"), ERR_PARSE_ERROR);
 		accessor->accessor_type = _get_accessor_type_from_str(d["type"]);
 
@@ -1426,7 +1437,7 @@ Error GLTFDocument::_decode_buffer_view(Ref<GLTFState> p_state, double *p_dst, c
 	const Ref<GLTFBufferView> bv = p_state->buffer_views[p_buffer_view];
 
 	int stride = p_element_size;
-	if (bv->byte_stride != -1) {
+	if (bv->byte_stride > 0) {
 		stride = bv->byte_stride;
 	}
 	if (p_for_vertex && stride % 4) {
@@ -1641,7 +1652,7 @@ Vector<double> GLTFDocument::_decode_accessor(Ref<GLTFState> p_state, const GLTF
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_ints(Ref<GLTFState> p_state, const Vector<int32_t> p_attribs, const bool p_for_vertex, const bool p_for_vertex_indices) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 	const int element_count = 1;
@@ -1706,7 +1717,7 @@ Vector<int> GLTFDocument::_decode_accessor_as_ints(Ref<GLTFState> p_state, const
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<int> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -1731,7 +1742,7 @@ Vector<float> GLTFDocument::_decode_accessor_as_floats(Ref<GLTFState> p_state, c
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<float> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -1762,7 +1773,7 @@ void GLTFDocument::_round_min_max_components(Vector<double> &r_type_min, Vector<
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_vec2(Ref<GLTFState> p_state, const Vector<Vector2> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 	const int element_count = 2;
@@ -1812,7 +1823,7 @@ GLTFAccessorIndex GLTFDocument::_encode_accessor_as_vec2(Ref<GLTFState> p_state,
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_color(Ref<GLTFState> p_state, const Vector<Color> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 
@@ -1878,7 +1889,7 @@ void GLTFDocument::_calc_accessor_min_max(int p_i, const int p_element_count, Ve
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_weights(Ref<GLTFState> p_state, const Vector<Color> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 
@@ -1932,7 +1943,7 @@ GLTFAccessorIndex GLTFDocument::_encode_accessor_as_weights(Ref<GLTFState> p_sta
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_joints(Ref<GLTFState> p_state, const Vector<Color> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 
@@ -1983,7 +1994,7 @@ GLTFAccessorIndex GLTFDocument::_encode_accessor_as_joints(Ref<GLTFState> p_stat
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_quaternions(Ref<GLTFState> p_state, const Vector<Quaternion> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 	const int element_count = 4;
@@ -2039,7 +2050,7 @@ Vector<Vector2> GLTFDocument::_decode_accessor_as_vec2(Ref<GLTFState> p_state, c
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<Vector2> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -2062,7 +2073,7 @@ Vector<Vector2> GLTFDocument::_decode_accessor_as_vec2(Ref<GLTFState> p_state, c
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_floats(Ref<GLTFState> p_state, const Vector<double> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 	const int element_count = 1;
@@ -2111,7 +2122,7 @@ GLTFAccessorIndex GLTFDocument::_encode_accessor_as_floats(Ref<GLTFState> p_stat
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_vec3(Ref<GLTFState> p_state, const Vector<Vector3> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 	const int element_count = 3;
@@ -2161,7 +2172,7 @@ GLTFAccessorIndex GLTFDocument::_encode_accessor_as_vec3(Ref<GLTFState> p_state,
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_sparse_accessor_as_vec3(Ref<GLTFState> p_state, const Vector<Vector3> p_attribs, const Vector<Vector3> p_reference_attribs, const float p_reference_multiplier, const bool p_for_vertex, const GLTFAccessorIndex p_reference_accessor) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 
@@ -2270,7 +2281,7 @@ GLTFAccessorIndex GLTFDocument::_encode_sparse_accessor_as_vec3(Ref<GLTFState> p
 }
 
 GLTFAccessorIndex GLTFDocument::_encode_accessor_as_xform(Ref<GLTFState> p_state, const Vector<Transform3D> p_attribs, const bool p_for_vertex) {
-	if (p_attribs.size() == 0) {
+	if (p_attribs.is_empty()) {
 		return -1;
 	}
 	const int element_count = 16;
@@ -2345,7 +2356,7 @@ Vector<Vector3> GLTFDocument::_decode_accessor_as_vec3(Ref<GLTFState> p_state, c
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<Vector3> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -2371,7 +2382,7 @@ Vector<Color> GLTFDocument::_decode_accessor_as_color(Ref<GLTFState> p_state, co
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<Color> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -2403,7 +2414,7 @@ Vector<Quaternion> GLTFDocument::_decode_accessor_as_quaternion(Ref<GLTFState> p
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<Quaternion> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -2422,7 +2433,7 @@ Vector<Transform2D> GLTFDocument::_decode_accessor_as_xform2d(Ref<GLTFState> p_s
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<Transform2D> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -2439,7 +2450,7 @@ Vector<Basis> GLTFDocument::_decode_accessor_as_basis(Ref<GLTFState> p_state, co
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<Basis> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -2457,7 +2468,7 @@ Vector<Transform3D> GLTFDocument::_decode_accessor_as_xform(Ref<GLTFState> p_sta
 	const Vector<double> attribs = _decode_accessor(p_state, p_accessor, p_for_vertex);
 	Vector<Transform3D> ret;
 
-	if (attribs.size() == 0) {
+	if (attribs.is_empty()) {
 		return ret;
 	}
 
@@ -3185,9 +3196,11 @@ Error GLTFDocument::_serialize_meshes(Ref<GLTFState> p_state) {
 			primitives.push_back(primitive);
 		}
 
-		Dictionary e;
-		e["targetNames"] = target_names;
-		gltf_mesh["extras"] = e;
+		if (!target_names.is_empty()) {
+			Dictionary e;
+			e["targetNames"] = target_names;
+			gltf_mesh["extras"] = e;
+		}
 		_attach_meta_to_extras(import_mesh, gltf_mesh);
 
 		weights.resize(target_names.size());
@@ -3573,11 +3586,16 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> p_state) {
 				// Compression is enabled, so let's validate that the normals and tangents are correct.
 				Vector<Vector3> normals = array[Mesh::ARRAY_NORMAL];
 				Vector<float> tangents = array[Mesh::ARRAY_TANGENT];
-				for (int vert = 0; vert < normals.size(); vert++) {
-					Vector3 tan = Vector3(tangents[vert * 4 + 0], tangents[vert * 4 + 1], tangents[vert * 4 + 2]);
-					if (abs(tan.dot(normals[vert])) > 0.0001) {
-						// Tangent is not perpendicular to the normal, so we can't use compression.
-						flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+				if (unlikely(tangents.size() < normals.size() * 4)) {
+					ERR_PRINT("glTF import: Mesh " + itos(i) + " has invalid tangents.");
+					flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+				} else {
+					for (int vert = 0; vert < normals.size(); vert++) {
+						Vector3 tan = Vector3(tangents[vert * 4 + 0], tangents[vert * 4 + 1], tangents[vert * 4 + 2]);
+						if (abs(tan.dot(normals[vert])) > 0.0001) {
+							// Tangent is not perpendicular to the normal, so we can't use compression.
+							flags &= ~RS::ARRAY_FLAG_COMPRESS_ATTRIBUTES;
+						}
 					}
 				}
 			}
@@ -3824,10 +3842,9 @@ Error GLTFDocument::_serialize_images(Ref<GLTFState> p_state) {
 		if (p_state->filename.to_lower().ends_with("gltf")) {
 			String img_name = p_state->images[i]->get_name();
 			if (img_name.is_empty()) {
-				img_name = itos(i);
+				img_name = itos(i).pad_zeros(3);
 			}
 			img_name = _gen_unique_name(p_state, img_name);
-			img_name = img_name.pad_zeros(3);
 			String relative_texture_dir = "textures";
 			String full_texture_dir = p_state->base_path.path_join(relative_texture_dir);
 			Ref<DirAccess> da = DirAccess::open(p_state->base_path);
@@ -4116,8 +4133,8 @@ Error GLTFDocument::_parse_images(Ref<GLTFState> p_state, const String &p_base_p
 				}
 			} else { // Relative path to an external image file.
 				ERR_FAIL_COND_V(p_base_path.is_empty(), ERR_INVALID_PARAMETER);
-				uri = uri.uri_decode();
-				uri = p_base_path.path_join(uri).replace("\\", "/"); // Fix for Windows.
+				uri = uri.uri_file_decode();
+				uri = p_base_path.path_join(uri).replace_char('\\', '/'); // Fix for Windows.
 				resource_uri = uri.simplify_path();
 				// ResourceLoader will rely on the file extension to use the relevant loader.
 				// The spec says that if mimeType is defined, it should take precedence (e.g.
@@ -4141,7 +4158,7 @@ Error GLTFDocument::_parse_images(Ref<GLTFState> p_state, const String &p_base_p
 				// Fallback to loading as byte array. This enables us to support the
 				// spec's requirement that we honor mimetype regardless of file URI.
 				data = FileAccess::get_file_as_bytes(resource_uri);
-				if (data.size() == 0) {
+				if (data.is_empty()) {
 					WARN_PRINT(vformat("glTF: Image index '%d' couldn't be loaded as a buffer of MIME type '%s' from URI: %s because there was no data to load. Skipping it.", i, mime_type, resource_uri));
 					p_state->images.push_back(Ref<Texture2D>()); // Placeholder to keep count.
 					p_state->source_images.push_back(Ref<Image>());
@@ -4396,12 +4413,8 @@ Error GLTFDocument::_serialize_materials(Ref<GLTFState> p_state) {
 
 		Dictionary mr;
 		{
-			Array arr;
 			const Color c = base_material->get_albedo().srgb_to_linear();
-			arr.push_back(c.r);
-			arr.push_back(c.g);
-			arr.push_back(c.b);
-			arr.push_back(c.a);
+			Array arr = { c.r, c.g, c.b, c.a };
 			mr["baseColorFactor"] = arr;
 		}
 		if (_image_format != "None") {
@@ -4607,10 +4620,7 @@ Error GLTFDocument::_serialize_materials(Ref<GLTFState> p_state) {
 
 		if (base_material->get_feature(BaseMaterial3D::FEATURE_EMISSION)) {
 			const Color c = base_material->get_emission().linear_to_srgb();
-			Array arr;
-			arr.push_back(c.r);
-			arr.push_back(c.g);
-			arr.push_back(c.b);
+			Array arr = { c.r, c.g, c.b };
 			d["emissiveFactor"] = arr;
 		}
 
@@ -5912,10 +5922,12 @@ void GLTFDocument::_convert_scene_node(Ref<GLTFState> p_state, Node *p_current,
 	}
 }
 
-#ifdef MODULE_CSG_ENABLED
 void GLTFDocument::_convert_csg_shape_to_gltf(CSGShape3D *p_current, GLTFNodeIndex p_gltf_parent, Ref<GLTFNode> p_gltf_node, Ref<GLTFState> p_state) {
+#ifndef MODULE_CSG_ENABLED
+	ERR_FAIL_MSG("csg module is disabled.");
+#else
 	CSGShape3D *csg = p_current;
-	csg->call("_update_shape");
+	csg->update_shape();
 	Array meshes = csg->get_meshes();
 	if (meshes.size() != 2) {
 		return;
@@ -5964,8 +5976,8 @@ void GLTFDocument::_convert_csg_shape_to_gltf(CSGShape3D *p_current, GLTFNodeInd
 	p_gltf_node->transform = csg->get_transform();
 	p_gltf_node->set_original_name(csg->get_name());
 	p_gltf_node->set_name(_gen_unique_name(p_state, csg->get_name()));
-}
 #endif // MODULE_CSG_ENABLED
+}
 
 void GLTFDocument::_check_visibility(Node *p_node, bool &r_retflag) {
 	r_retflag = true;
@@ -5996,8 +6008,10 @@ void GLTFDocument::_convert_light_to_gltf(Light3D *light, Ref<GLTFState> p_state
 	}
 }
 
-#ifdef MODULE_GRIDMAP_ENABLED
 void GLTFDocument::_convert_grid_map_to_gltf(GridMap *p_grid_map, GLTFNodeIndex p_parent_node_index, GLTFNodeIndex p_root_node_index, Ref<GLTFNode> p_gltf_node, Ref<GLTFState> p_state) {
+#ifndef MODULE_GRIDMAP_ENABLED
+	ERR_FAIL_MSG("gridmap module is disabled.");
+#else
 	Array cells = p_grid_map->get_used_cells();
 	for (int32_t k = 0; k < cells.size(); k++) {
 		GLTFNode *new_gltf_node = memnew(GLTFNode);
@@ -6025,8 +6039,8 @@ void GLTFDocument::_convert_grid_map_to_gltf(GridMap *p_grid_map, GLTFNodeIndex
 		new_gltf_node->set_original_name(p_grid_map->get_mesh_library()->get_item_name(cell));
 		new_gltf_node->set_name(_gen_unique_name(p_state, p_grid_map->get_mesh_library()->get_item_name(cell)));
 	}
-}
 #endif // MODULE_GRIDMAP_ENABLED
+}
 
 void GLTFDocument::_convert_multi_mesh_instance_to_gltf(
 		MultiMeshInstance3D *p_multi_mesh_instance,
@@ -6959,7 +6973,7 @@ void GLTFDocument::_import_animation(Ref<GLTFState> p_state, AnimationPlayer *p_
 		animation->set_loop_mode(Animation::LOOP_LINEAR);
 	}
 
-	double anim_start = p_trimming ? INFINITY : 0.0;
+	double anim_start = p_trimming ? Math::INF : 0.0;
 	double anim_end = 0.0;
 
 	for (const KeyValue<int, GLTFAnimation::NodeTrack> &track_i : anim->get_node_tracks()) {
@@ -7646,7 +7660,7 @@ bool GLTFDocument::_convert_animation_node_track(Ref<GLTFState> p_state, GLTFAni
 						} else {
 							Vector3 rotation_euler = p_godot_animation->track_get_key_value(p_godot_anim_track_index, key_i);
 							if (node_prop == "rotation_degrees") {
-								rotation_euler *= Math_TAU / 360.0;
+								rotation_euler *= Math::TAU / 360.0;
 							}
 							rotation_quaternion = Quaternion::from_euler(rotation_euler);
 						}
@@ -8067,15 +8081,15 @@ Dictionary GLTFDocument::_serialize_texture_transform_uv2(Ref<BaseMaterial3D> p_
 
 Error GLTFDocument::_serialize_asset_header(Ref<GLTFState> p_state) {
 	const String version = "2.0";
-	p_state->major_version = version.get_slice(".", 0).to_int();
-	p_state->minor_version = version.get_slice(".", 1).to_int();
+	p_state->major_version = version.get_slicec('.', 0).to_int();
+	p_state->minor_version = version.get_slicec('.', 1).to_int();
 	Dictionary asset;
 	asset["version"] = version;
 	if (!p_state->copyright.is_empty()) {
 		asset["copyright"] = p_state->copyright;
 	}
-	String hash = String(VERSION_HASH);
-	asset["generator"] = String(VERSION_FULL_NAME) + String("@") + (hash.is_empty() ? String("unknown") : hash);
+	String hash = String(GODOT_VERSION_HASH);
+	asset["generator"] = String(GODOT_VERSION_FULL_NAME) + String("@") + (hash.is_empty() ? String("unknown") : hash);
 	p_state->json["asset"] = asset;
 	ERR_FAIL_COND_V(!asset.has("version"), Error::FAILED);
 	ERR_FAIL_COND_V(!p_state->json.has("asset"), Error::FAILED);
@@ -8349,8 +8363,8 @@ Error GLTFDocument::_parse_asset_header(Ref<GLTFState> p_state) {
 		return ERR_PARSE_ERROR;
 	}
 	String version = asset["version"];
-	p_state->major_version = version.get_slice(".", 0).to_int();
-	p_state->minor_version = version.get_slice(".", 1).to_int();
+	p_state->major_version = version.get_slicec('.', 0).to_int();
+	p_state->minor_version = version.get_slicec('.', 1).to_int();
 	if (asset.has("copyright")) {
 		p_state->copyright = asset["copyright"];
 	}
@@ -8540,18 +8554,16 @@ Error GLTFDocument::append_from_scene(Node *p_node, Ref<GLTFState> p_state, uint
 	// Add the root node(s) and their descendants to the state.
 	if (_root_node_mode == RootNodeMode::ROOT_NODE_MODE_MULTI_ROOT) {
 		const int child_count = p_node->get_child_count();
-		if (child_count > 0) {
-			for (int i = 0; i < child_count; i++) {
-				_convert_scene_node(state, p_node->get_child(i), -1, -1);
-			}
-			state->scene_name = p_node->get_name();
-			return OK;
+		for (int i = 0; i < child_count; i++) {
+			_convert_scene_node(state, p_node->get_child(i), -1, -1);
 		}
+		state->scene_name = p_node->get_name();
+	} else {
+		if (_root_node_mode == RootNodeMode::ROOT_NODE_MODE_SINGLE_ROOT) {
+			state->extensions_used.append("GODOT_single_root");
+		}
+		_convert_scene_node(state, p_node, -1, -1);
 	}
-	if (_root_node_mode == RootNodeMode::ROOT_NODE_MODE_SINGLE_ROOT) {
-		state->extensions_used.append("GODOT_single_root");
-	}
-	_convert_scene_node(state, p_node, -1, -1);
 	// Run post-convert for each extension, in case an extension needs to do something after converting the scene.
 	for (Ref<GLTFDocumentExtension> ext : document_extensions) {
 		ERR_CONTINUE(ext.is_null());
diff --git a/engine/modules/gltf/gltf_document.h b/engine/modules/gltf/gltf_document.h
index 7d32fdc5..38e66860 100644
--- a/engine/modules/gltf/gltf_document.h
+++ b/engine/modules/gltf/gltf_document.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_DOCUMENT_H
-#define GLTF_DOCUMENT_H
+#pragma once
 
 #include "extensions/gltf_document_extension.h"
 #include "extensions/gltf_spec_gloss.h"
@@ -39,13 +38,8 @@
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
 
-#include "modules/modules_enabled.gen.h" // For csg, gridmap.
-#ifdef MODULE_CSG_ENABLED
-#include "modules/csg/csg_shape.h"
-#endif // MODULE_CSG_ENABLED
-#ifdef MODULE_GRIDMAP_ENABLED
-#include "modules/gridmap/grid_map.h"
-#endif // MODULE_GRIDMAP_ENABLED
+class CSGShape3D;
+class GridMap;
 
 class GLTFDocument : public Resource {
 	GDCLASS(GLTFDocument, Resource);
@@ -340,20 +334,16 @@ public:
 			const GLTFNodeIndex p_gltf_current,
 			const GLTFNodeIndex p_gltf_root);
 
-#ifdef MODULE_CSG_ENABLED
 	void _convert_csg_shape_to_gltf(CSGShape3D *p_current, GLTFNodeIndex p_gltf_parent, Ref<GLTFNode> p_gltf_node, Ref<GLTFState> p_state);
-#endif // MODULE_CSG_ENABLED
 
 	void _check_visibility(Node *p_node, bool &r_retflag);
 	void _convert_camera_to_gltf(Camera3D *p_camera, Ref<GLTFState> p_state,
 			Ref<GLTFNode> p_gltf_node);
-#ifdef MODULE_GRIDMAP_ENABLED
 	void _convert_grid_map_to_gltf(
 			GridMap *p_grid_map,
 			GLTFNodeIndex p_parent_node_index,
 			GLTFNodeIndex p_root_node_index,
 			Ref<GLTFNode> p_gltf_node, Ref<GLTFState> p_state);
-#endif // MODULE_GRIDMAP_ENABLED
 	void _convert_multi_mesh_instance_to_gltf(
 			MultiMeshInstance3D *p_multi_mesh_instance,
 			GLTFNodeIndex p_parent_node_index,
@@ -388,5 +378,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(GLTFDocument::RootNodeMode);
-
-#endif // GLTF_DOCUMENT_H
diff --git a/engine/modules/gltf/gltf_state.h b/engine/modules/gltf/gltf_state.h
index 403f94b1..1c75a760 100644
--- a/engine/modules/gltf/gltf_state.h
+++ b/engine/modules/gltf/gltf_state.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_STATE_H
-#define GLTF_STATE_H
+#pragma once
 
 #include "extensions/gltf_light.h"
 #include "structures/gltf_accessor.h"
@@ -252,5 +251,3 @@ public:
 	Variant get_additional_data(const StringName &p_extension_name);
 	void set_additional_data(const StringName &p_extension_name, Variant p_additional_data);
 };
-
-#endif // GLTF_STATE_H
diff --git a/engine/modules/gltf/gltf_template_convert.h b/engine/modules/gltf/gltf_template_convert.h
index 46f18586..e78962cd 100644
--- a/engine/modules/gltf/gltf_template_convert.h
+++ b/engine/modules/gltf/gltf_template_convert.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_TEMPLATE_CONVERT_H
-#define GLTF_TEMPLATE_CONVERT_H
+#pragma once
 
 #include "core/templates/hash_set.h"
 #include "core/variant/array.h"
@@ -85,11 +84,8 @@ static Dictionary to_dictionary(const HashMap<K, V> &p_inp) {
 template <typename K, typename V>
 static void set_from_dictionary(HashMap<K, V> &r_out, const Dictionary &p_inp) {
 	r_out.clear();
-	Array keys = p_inp.keys();
-	for (int i = 0; i < keys.size(); i++) {
-		r_out[keys[i]] = p_inp[keys[i]];
+	for (const KeyValue<Variant, Variant> &kv : p_inp) {
+		r_out[kv.key] = kv.value;
 	}
 }
 } //namespace GLTFTemplateConvert
-
-#endif // GLTF_TEMPLATE_CONVERT_H
diff --git a/engine/modules/gltf/register_types.cpp b/engine/modules/gltf/register_types.cpp
index fbc3ae61..38c5b874 100644
--- a/engine/modules/gltf/register_types.cpp
+++ b/engine/modules/gltf/register_types.cpp
@@ -34,11 +34,14 @@
 #include "extensions/gltf_document_extension_texture_ktx.h"
 #include "extensions/gltf_document_extension_texture_webp.h"
 #include "extensions/gltf_spec_gloss.h"
-#include "extensions/physics/gltf_document_extension_physics.h"
 #include "gltf_document.h"
 #include "gltf_state.h"
 #include "structures/gltf_object_model_property.h"
 
+#ifndef PHYSICS_3D_DISABLED
+#include "extensions/physics/gltf_document_extension_physics.h"
+#endif // PHYSICS_3D_DISABLED
+
 #ifdef TOOLS_ENABLED
 #include "editor/editor_import_blend_runner.h"
 #include "editor/editor_scene_exporter_gltf_plugin.h"
@@ -114,17 +117,21 @@ void initialize_gltf_module(ModuleInitializationLevel p_level) {
 		GDREGISTER_CLASS(GLTFMesh);
 		GDREGISTER_CLASS(GLTFNode);
 		GDREGISTER_CLASS(GLTFObjectModelProperty);
+#ifndef PHYSICS_3D_DISABLED
 		GDREGISTER_CLASS(GLTFPhysicsBody);
 		GDREGISTER_CLASS(GLTFPhysicsShape);
+#endif // PHYSICS_3D_DISABLED
 		GDREGISTER_CLASS(GLTFSkeleton);
 		GDREGISTER_CLASS(GLTFSkin);
 		GDREGISTER_CLASS(GLTFSpecGloss);
 		GDREGISTER_CLASS(GLTFState);
 		GDREGISTER_CLASS(GLTFTexture);
 		GDREGISTER_CLASS(GLTFTextureSampler);
-		// Register GLTFDocumentExtension classes with GLTFDocument.
+// Register GLTFDocumentExtension classes with GLTFDocument.
+#ifndef PHYSICS_3D_DISABLED
 		// Ensure physics is first in this list so that physics nodes are created before other nodes.
 		GLTF_REGISTER_DOCUMENT_EXTENSION(GLTFDocumentExtensionPhysics);
+#endif // PHYSICS_3D_DISABLED
 		GLTF_REGISTER_DOCUMENT_EXTENSION(GLTFDocumentExtensionTextureKTX);
 		GLTF_REGISTER_DOCUMENT_EXTENSION(GLTFDocumentExtensionTextureWebP);
 		bool is_editor = Engine::get_singleton()->is_editor_hint();
@@ -135,10 +142,6 @@ void initialize_gltf_module(ModuleInitializationLevel p_level) {
 
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
-		// Editor-specific API.
-		ClassDB::APIType prev_api = ClassDB::get_current_api();
-		ClassDB::set_current_api(ClassDB::API_EDITOR);
-
 		GDREGISTER_CLASS(EditorSceneFormatImporterGLTF);
 		EditorPlugins::add_by_type<SceneExporterGLTFPlugin>();
 
@@ -149,10 +152,8 @@ void initialize_gltf_module(ModuleInitializationLevel p_level) {
 		GLOBAL_DEF_RST("filesystem/import/blender/enabled.android", false);
 		GLOBAL_DEF_RST("filesystem/import/blender/enabled.web", false);
 
-		ClassDB::set_current_api(prev_api);
 		EditorNode::add_init_callback(_editor_init);
 	}
-
 #endif // TOOLS_ENABLED
 }
 
diff --git a/engine/modules/gltf/register_types.h b/engine/modules/gltf/register_types.h
index c8a736c4..55076a23 100644
--- a/engine/modules/gltf/register_types.h
+++ b/engine/modules/gltf/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_REGISTER_TYPES_H
-#define GLTF_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_gltf_module(ModuleInitializationLevel p_level);
 void uninitialize_gltf_module(ModuleInitializationLevel p_level);
-
-#endif // GLTF_REGISTER_TYPES_H
diff --git a/engine/modules/gltf/skin_tool.cpp b/engine/modules/gltf/skin_tool.cpp
index 1522c0e3..dc98a64d 100644
--- a/engine/modules/gltf/skin_tool.cpp
+++ b/engine/modules/gltf/skin_tool.cpp
@@ -520,7 +520,7 @@ Error SkinTool::_determine_skeleton_roots(
 
 	skeleton->roots = roots;
 
-	if (roots.size() == 0) {
+	if (roots.is_empty()) {
 		return FAILED;
 	} else if (roots.size() == 1) {
 		return OK;
@@ -810,7 +810,6 @@ Error SkinTool::_asset_parse_skins(
 
 String SkinTool::_sanitize_bone_name(const String &p_name) {
 	String bone_name = p_name;
-	bone_name = bone_name.replace(":", "_");
-	bone_name = bone_name.replace("/", "_");
+	bone_name = bone_name.replace_chars(":/", '_');
 	return bone_name;
 }
diff --git a/engine/modules/gltf/skin_tool.h b/engine/modules/gltf/skin_tool.h
index 1ba95853..11a80f28 100644
--- a/engine/modules/gltf/skin_tool.h
+++ b/engine/modules/gltf/skin_tool.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKIN_TOOL_H
-#define SKIN_TOOL_H
+#pragma once
 
 #include "gltf_defines.h"
 
@@ -95,5 +94,3 @@ public:
 			HashMap<GLTFNodeIndex, Node *> &r_scene_nodes);
 	static Error _create_skins(Vector<Ref<GLTFSkin>> &skins, Vector<Ref<GLTFNode>> &nodes, bool use_named_skin_binds, HashSet<String> &unique_names);
 };
-
-#endif // SKIN_TOOL_H
diff --git a/engine/modules/gltf/structures/gltf_accessor.h b/engine/modules/gltf/structures/gltf_accessor.h
index b00e6a0f..aabd3783 100644
--- a/engine/modules/gltf/structures/gltf_accessor.h
+++ b/engine/modules/gltf/structures/gltf_accessor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_ACCESSOR_H
-#define GLTF_ACCESSOR_H
+#pragma once
 
 #include "../gltf_defines.h"
 
@@ -133,5 +132,3 @@ public:
 
 VARIANT_ENUM_CAST(GLTFAccessor::GLTFAccessorType);
 VARIANT_ENUM_CAST(GLTFAccessor::GLTFComponentType);
-
-#endif // GLTF_ACCESSOR_H
diff --git a/engine/modules/gltf/structures/gltf_animation.h b/engine/modules/gltf/structures/gltf_animation.h
index 755e4ebd..e4e65bbf 100644
--- a/engine/modules/gltf/structures/gltf_animation.h
+++ b/engine/modules/gltf/structures/gltf_animation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_ANIMATION_H
-#define GLTF_ANIMATION_H
+#pragma once
 
 #include "scene/resources/animation.h"
 
@@ -86,5 +85,3 @@ public:
 
 	GLTFAnimation();
 };
-
-#endif // GLTF_ANIMATION_H
diff --git a/engine/modules/gltf/structures/gltf_buffer_view.h b/engine/modules/gltf/structures/gltf_buffer_view.h
index 6495efe8..841b6f4a 100644
--- a/engine/modules/gltf/structures/gltf_buffer_view.h
+++ b/engine/modules/gltf/structures/gltf_buffer_view.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_BUFFER_VIEW_H
-#define GLTF_BUFFER_VIEW_H
+#pragma once
 
 #include "../gltf_defines.h"
 
@@ -80,5 +79,3 @@ public:
 
 	Vector<uint8_t> load_buffer_view_data(const Ref<GLTFState> p_state) const;
 };
-
-#endif // GLTF_BUFFER_VIEW_H
diff --git a/engine/modules/gltf/structures/gltf_camera.h b/engine/modules/gltf/structures/gltf_camera.h
index 497b6cd4..76b829a9 100644
--- a/engine/modules/gltf/structures/gltf_camera.h
+++ b/engine/modules/gltf/structures/gltf_camera.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_CAMERA_H
-#define GLTF_CAMERA_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -74,5 +73,3 @@ public:
 	static Ref<GLTFCamera> from_dictionary(const Dictionary p_dictionary);
 	virtual Dictionary to_dictionary() const;
 };
-
-#endif // GLTF_CAMERA_H
diff --git a/engine/modules/gltf/structures/gltf_mesh.h b/engine/modules/gltf/structures/gltf_mesh.h
index 6983efeb..efe2a9f2 100644
--- a/engine/modules/gltf/structures/gltf_mesh.h
+++ b/engine/modules/gltf/structures/gltf_mesh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_MESH_H
-#define GLTF_MESH_H
+#pragma once
 
 #include "../gltf_defines.h"
 
@@ -60,5 +59,3 @@ public:
 	Variant get_additional_data(const StringName &p_extension_name);
 	void set_additional_data(const StringName &p_extension_name, Variant p_additional_data);
 };
-
-#endif // GLTF_MESH_H
diff --git a/engine/modules/gltf/structures/gltf_node.h b/engine/modules/gltf/structures/gltf_node.h
index f72b65a0..b0f75eea 100644
--- a/engine/modules/gltf/structures/gltf_node.h
+++ b/engine/modules/gltf/structures/gltf_node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_NODE_H
-#define GLTF_NODE_H
+#pragma once
 
 #include "../gltf_defines.h"
 
@@ -108,5 +107,3 @@ public:
 
 	NodePath get_scene_node_path(Ref<GLTFState> p_state, bool p_handle_skeletons = true);
 };
-
-#endif // GLTF_NODE_H
diff --git a/engine/modules/gltf/structures/gltf_object_model_property.h b/engine/modules/gltf/structures/gltf_object_model_property.h
index d8a4ed42..9a24d273 100644
--- a/engine/modules/gltf/structures/gltf_object_model_property.h
+++ b/engine/modules/gltf/structures/gltf_object_model_property.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_OBJECT_MODEL_PROPERTY_H
-#define GLTF_OBJECT_MODEL_PROPERTY_H
+#pragma once
 
 #include "core/math/expression.h"
 #include "core/variant/typed_array.h"
@@ -100,5 +99,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(GLTFObjectModelProperty::GLTFObjectModelType);
-
-#endif // GLTF_OBJECT_MODEL_PROPERTY_H
diff --git a/engine/modules/gltf/structures/gltf_skeleton.h b/engine/modules/gltf/structures/gltf_skeleton.h
index 2ed85b0c..99bbee5c 100644
--- a/engine/modules/gltf/structures/gltf_skeleton.h
+++ b/engine/modules/gltf/structures/gltf_skeleton.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_SKELETON_H
-#define GLTF_SKELETON_H
+#pragma once
 
 #include "../gltf_defines.h"
 
@@ -103,5 +102,3 @@ public:
 
 	int32_t get_bone_attachment_count();
 };
-
-#endif // GLTF_SKELETON_H
diff --git a/engine/modules/gltf/structures/gltf_skin.cpp b/engine/modules/gltf/structures/gltf_skin.cpp
index 18aa90a6..546b570a 100644
--- a/engine/modules/gltf/structures/gltf_skin.cpp
+++ b/engine/modules/gltf/structures/gltf_skin.cpp
@@ -145,9 +145,8 @@ Dictionary GLTFSkin::get_joint_i_to_name() {
 
 void GLTFSkin::set_joint_i_to_name(Dictionary p_joint_i_to_name) {
 	joint_i_to_name = HashMap<int, StringName>();
-	Array keys = p_joint_i_to_name.keys();
-	for (int i = 0; i < keys.size(); i++) {
-		joint_i_to_name[keys[i]] = p_joint_i_to_name[keys[i]];
+	for (const KeyValue<Variant, Variant> &kv : p_joint_i_to_name) {
+		joint_i_to_name[kv.key] = kv.value;
 	}
 }
 
@@ -205,18 +204,18 @@ Error GLTFSkin::from_dictionary(const Dictionary &dict) {
 	ERR_FAIL_COND_V(!dict.has("joint_i_to_bone_i"), ERR_INVALID_DATA);
 	Dictionary joint_i_to_bone_i_dict = dict["joint_i_to_bone_i"];
 	joint_i_to_bone_i.clear();
-	for (int i = 0; i < joint_i_to_bone_i_dict.keys().size(); ++i) {
-		int key = joint_i_to_bone_i_dict.keys()[i];
-		int value = joint_i_to_bone_i_dict[key];
+	for (const KeyValue<Variant, Variant> &kv : joint_i_to_bone_i_dict) {
+		int key = kv.key;
+		int value = kv.value;
 		joint_i_to_bone_i[key] = value;
 	}
 
 	ERR_FAIL_COND_V(!dict.has("joint_i_to_name"), ERR_INVALID_DATA);
 	Dictionary joint_i_to_name_dict = dict["joint_i_to_name"];
 	joint_i_to_name.clear();
-	for (int i = 0; i < joint_i_to_name_dict.keys().size(); ++i) {
-		int key = joint_i_to_name_dict.keys()[i];
-		StringName value = joint_i_to_name_dict[key];
+	for (const KeyValue<Variant, Variant> &kv : joint_i_to_name_dict) {
+		int key = kv.key;
+		StringName value = kv.value;
 		joint_i_to_name[key] = value;
 	}
 	if (dict.has("godot_skin")) {
diff --git a/engine/modules/gltf/structures/gltf_skin.h b/engine/modules/gltf/structures/gltf_skin.h
index 4649a918..ba867d13 100644
--- a/engine/modules/gltf/structures/gltf_skin.h
+++ b/engine/modules/gltf/structures/gltf_skin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_SKIN_H
-#define GLTF_SKIN_H
+#pragma once
 
 #include "../gltf_defines.h"
 
@@ -116,5 +115,3 @@ public:
 	Dictionary to_dictionary();
 	Error from_dictionary(const Dictionary &dict);
 };
-
-#endif // GLTF_SKIN_H
diff --git a/engine/modules/gltf/structures/gltf_texture.h b/engine/modules/gltf/structures/gltf_texture.h
index 03d07b3b..ced55328 100644
--- a/engine/modules/gltf/structures/gltf_texture.h
+++ b/engine/modules/gltf/structures/gltf_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_TEXTURE_H
-#define GLTF_TEXTURE_H
+#pragma once
 
 #include "../gltf_defines.h"
 
@@ -51,5 +50,3 @@ public:
 	GLTFTextureSamplerIndex get_sampler() const;
 	void set_sampler(GLTFTextureSamplerIndex val);
 };
-
-#endif // GLTF_TEXTURE_H
diff --git a/engine/modules/gltf/structures/gltf_texture_sampler.h b/engine/modules/gltf/structures/gltf_texture_sampler.h
index 32102b54..99dc026b 100644
--- a/engine/modules/gltf/structures/gltf_texture_sampler.h
+++ b/engine/modules/gltf/structures/gltf_texture_sampler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GLTF_TEXTURE_SAMPLER_H
-#define GLTF_TEXTURE_SAMPLER_H
+#pragma once
 
 #include "scene/resources/material.h"
 
@@ -158,5 +157,3 @@ private:
 
 VARIANT_ENUM_CAST(GLTFTextureSampler::FilterMode);
 VARIANT_ENUM_CAST(GLTFTextureSampler::WrapMode);
-
-#endif // GLTF_TEXTURE_SAMPLER_H
diff --git a/engine/modules/gltf/tests/test_gltf.h b/engine/modules/gltf/tests/test_gltf.h
index 0dbc0dde..f9589e47 100644
--- a/engine/modules/gltf/tests/test_gltf.h
+++ b/engine/modules/gltf/tests/test_gltf.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GLTF_H
-#define TEST_GLTF_H
+#pragma once
 
 #include "tests/test_macros.h"
 
@@ -71,8 +70,10 @@ static Node *gltf_import(const String &p_file) {
 
 	// Once editor import convert pngs to ctex, we will need to load it as ctex resource.
 	Ref<ResourceFormatLoaderCompressedTexture2D> resource_loader_stream_texture;
-	resource_loader_stream_texture.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_stream_texture);
+	if (GD_IS_CLASS_ENABLED(CompressedTexture2D)) {
+		resource_loader_stream_texture.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_stream_texture);
+	}
 
 	HashMap<StringName, Variant> options(21);
 	options["nodes/root_type"] = "";
@@ -106,7 +107,10 @@ static Node *gltf_import(const String &p_file) {
 
 	ResourceImporterScene::remove_scene_importer(import_gltf);
 	ResourceFormatImporter::get_singleton()->remove_importer(import_texture);
-	ResourceLoader::remove_resource_format_loader(resource_loader_stream_texture);
+	if (GD_IS_CLASS_ENABLED(CompressedTexture2D)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_stream_texture);
+		resource_loader_stream_texture.unref();
+	}
 	return p_scene;
 }
 
@@ -162,5 +166,3 @@ void init(const String &p_test, const String &p_copy_target = String()) {
 } //namespace TestGltf
 
 #endif // TOOLS_ENABLED
-
-#endif // TEST_GLTF_H
diff --git a/engine/modules/gltf/tests/test_gltf_extras.h b/engine/modules/gltf/tests/test_gltf_extras.h
index 19899d76..219d92b2 100644
--- a/engine/modules/gltf/tests/test_gltf_extras.h
+++ b/engine/modules/gltf/tests/test_gltf_extras.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GLTF_EXTRAS_H
-#define TEST_GLTF_EXTRAS_H
+#pragma once
 
 #include "test_gltf.h"
 #include "tests/test_macros.h"
@@ -174,5 +173,3 @@ TEST_CASE("[SceneTree][Node] GLTF test skeleton and bone export and import") {
 } //namespace TestGltf
 
 #endif // TOOLS_ENABLED
-
-#endif // TEST_GLTF_EXTRAS_H
diff --git a/engine/modules/gltf/tests/test_gltf_images.h b/engine/modules/gltf/tests/test_gltf_images.h
index 969ed396..f364f7aa 100644
--- a/engine/modules/gltf/tests/test_gltf_images.h
+++ b/engine/modules/gltf/tests/test_gltf_images.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GLTF_IMAGES_H
-#define TEST_GLTF_IMAGES_H
+#pragma once
 
 #include "test_gltf.h"
 
@@ -165,5 +164,3 @@ TEST_CASE("[SceneTree][Node][Editor] Import GLTF with embedded texture, check ho
 } //namespace TestGltf
 
 #endif // TOOLS_ENABLED
-
-#endif // TEST_GLTF_IMAGES_H
diff --git a/engine/modules/godot_physics_2d/config.py b/engine/modules/godot_physics_2d/config.py
index d22f9454..1834509a 100644
--- a/engine/modules/godot_physics_2d/config.py
+++ b/engine/modules/godot_physics_2d/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return True
+    return not env["disable_physics_2d"]
 
 
 def configure(env):
diff --git a/engine/modules/godot_physics_2d/godot_area_2d.h b/engine/modules/godot_physics_2d/godot_area_2d.h
index e6c3b45d..17c6e0da 100644
--- a/engine/modules/godot_physics_2d/godot_area_2d.h
+++ b/engine/modules/godot_physics_2d/godot_area_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_AREA_2D_H
-#define GODOT_AREA_2D_H
+#pragma once
 
 #include "godot_collision_object_2d.h"
 
@@ -187,5 +186,3 @@ void GodotArea2D::remove_area_from_query(GodotArea2D *p_area, uint32_t p_area_sh
 		_queue_monitor_update();
 	}
 }
-
-#endif // GODOT_AREA_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_area_pair_2d.h b/engine/modules/godot_physics_2d/godot_area_pair_2d.h
index eb091288..62d59519 100644
--- a/engine/modules/godot_physics_2d/godot_area_pair_2d.h
+++ b/engine/modules/godot_physics_2d/godot_area_pair_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_AREA_PAIR_2D_H
-#define GODOT_AREA_PAIR_2D_H
+#pragma once
 
 #include "godot_area_2d.h"
 #include "godot_body_2d.h"
@@ -74,5 +73,3 @@ public:
 	GodotArea2Pair2D(GodotArea2D *p_area_a, int p_shape_a, GodotArea2D *p_area_b, int p_shape_b);
 	~GodotArea2Pair2D();
 };
-
-#endif // GODOT_AREA_PAIR_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_body_2d.cpp b/engine/modules/godot_physics_2d/godot_body_2d.cpp
index 35d021e3..378cf161 100644
--- a/engine/modules/godot_physics_2d/godot_body_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_body_2d.cpp
@@ -563,7 +563,7 @@ void GodotBody2D::integrate_forces(real_t p_step) {
 		linear_velocity = constant_linear_velocity + motion / p_step;
 
 		real_t rot = new_transform.get_rotation() - get_transform().get_rotation();
-		angular_velocity = constant_angular_velocity + remainder(rot, 2.0 * Math_PI) / p_step;
+		angular_velocity = constant_angular_velocity + remainder(rot, 2.0 * Math::PI) / p_step;
 
 		do_motion = true;
 
@@ -626,7 +626,7 @@ void GodotBody2D::integrate_velocities(real_t p_step) {
 	if (mode == PhysicsServer2D::BODY_MODE_KINEMATIC) {
 		_set_transform(new_transform, false);
 		_set_inv_transform(new_transform.affine_inverse());
-		if (contacts.size() == 0 && linear_velocity == Vector2() && angular_velocity == 0) {
+		if (contacts.is_empty() && linear_velocity == Vector2() && angular_velocity == 0) {
 			set_active(false); //stopped moving, deactivate
 		}
 		return;
diff --git a/engine/modules/godot_physics_2d/godot_body_2d.h b/engine/modules/godot_physics_2d/godot_body_2d.h
index 529305db..bcb55c6d 100644
--- a/engine/modules/godot_physics_2d/godot_body_2d.h
+++ b/engine/modules/godot_physics_2d/godot_body_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BODY_2D_H
-#define GODOT_BODY_2D_H
+#pragma once
 
 #include "godot_area_2d.h"
 #include "godot_collision_object_2d.h"
@@ -182,6 +181,7 @@ public:
 	}
 
 	_FORCE_INLINE_ void set_max_contacts_reported(int p_size) {
+		ERR_FAIL_INDEX(p_size, MAX_CONTACTS_REPORTED_2D_MAX);
 		contacts.resize(p_size);
 		contact_count = 0;
 		if (mode == PhysicsServer2D::BODY_MODE_KINEMATIC && p_size) {
@@ -385,5 +385,3 @@ void GodotBody2D::add_contact(const Vector2 &p_local_pos, const Vector2 &p_local
 	c[idx].collider_velocity_at_pos = p_collider_velocity_at_pos;
 	c[idx].impulse = p_impulse;
 }
-
-#endif // GODOT_BODY_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_body_direct_state_2d.h b/engine/modules/godot_physics_2d/godot_body_direct_state_2d.h
index 90b7c1d3..dcceb860 100644
--- a/engine/modules/godot_physics_2d/godot_body_direct_state_2d.h
+++ b/engine/modules/godot_physics_2d/godot_body_direct_state_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BODY_DIRECT_STATE_2D_H
-#define GODOT_BODY_DIRECT_STATE_2D_H
+#pragma once
 
 #include "servers/physics_server_2d.h"
 
@@ -100,5 +99,3 @@ public:
 
 	virtual real_t get_step() const override;
 };
-
-#endif // GODOT_BODY_DIRECT_STATE_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp b/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp
index 98f11d6c..3cb3f8ee 100644
--- a/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_body_pair_2d.cpp
@@ -36,7 +36,7 @@
 #define ACCUMULATE_IMPULSES
 
 #define MIN_VELOCITY 0.001
-#define MAX_BIAS_ROTATION (Math_PI / 8)
+#define MAX_BIAS_ROTATION (Math::PI / 8)
 
 void GodotBodyPair2D::_add_contact(const Vector2 &p_point_A, const Vector2 &p_point_B, void *p_self) {
 	GodotBodyPair2D *self = static_cast<GodotBodyPair2D *>(p_self);
@@ -244,7 +244,7 @@ real_t combine_bounce(GodotBody2D *A, GodotBody2D *B) {
 }
 
 real_t combine_friction(GodotBody2D *A, GodotBody2D *B) {
-	return ABS(MIN(A->get_friction(), B->get_friction()));
+	return Math::abs(MIN(A->get_friction(), B->get_friction()));
 }
 
 bool GodotBodyPair2D::setup(real_t p_step) {
diff --git a/engine/modules/godot_physics_2d/godot_body_pair_2d.h b/engine/modules/godot_physics_2d/godot_body_pair_2d.h
index 4e9bfa60..3327ffd8 100644
--- a/engine/modules/godot_physics_2d/godot_body_pair_2d.h
+++ b/engine/modules/godot_physics_2d/godot_body_pair_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BODY_PAIR_2D_H
-#define GODOT_BODY_PAIR_2D_H
+#pragma once
 
 #include "godot_body_2d.h"
 #include "godot_constraint_2d.h"
@@ -97,5 +96,3 @@ public:
 	GodotBodyPair2D(GodotBody2D *p_A, int p_shape_A, GodotBody2D *p_B, int p_shape_B);
 	~GodotBodyPair2D();
 };
-
-#endif // GODOT_BODY_PAIR_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_broad_phase_2d.h b/engine/modules/godot_physics_2d/godot_broad_phase_2d.h
index f3c07a69..a356e612 100644
--- a/engine/modules/godot_physics_2d/godot_broad_phase_2d.h
+++ b/engine/modules/godot_physics_2d/godot_broad_phase_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BROAD_PHASE_2D_H
-#define GODOT_BROAD_PHASE_2D_H
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
@@ -67,5 +66,3 @@ public:
 
 	virtual ~GodotBroadPhase2D();
 };
-
-#endif // GODOT_BROAD_PHASE_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.h b/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.h
index 6c1fae5c..cebfe19a 100644
--- a/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.h
+++ b/engine/modules/godot_physics_2d/godot_broad_phase_2d_bvh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BROAD_PHASE_2D_BVH_H
-#define GODOT_BROAD_PHASE_2D_BVH_H
+#pragma once
 
 #include "godot_broad_phase_2d.h"
 
@@ -97,5 +96,3 @@ public:
 	static GodotBroadPhase2D *_create();
 	GodotBroadPhase2DBVH();
 };
-
-#endif // GODOT_BROAD_PHASE_2D_BVH_H
diff --git a/engine/modules/godot_physics_2d/godot_collision_object_2d.h b/engine/modules/godot_physics_2d/godot_collision_object_2d.h
index 129fa27f..e9ad969d 100644
--- a/engine/modules/godot_physics_2d/godot_collision_object_2d.h
+++ b/engine/modules/godot_physics_2d/godot_collision_object_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_COLLISION_OBJECT_2D_H
-#define GODOT_COLLISION_OBJECT_2D_H
+#pragma once
 
 #include "godot_broad_phase_2d.h"
 #include "godot_shape_2d.h"
@@ -194,5 +193,3 @@ public:
 
 	virtual ~GodotCollisionObject2D() {}
 };
-
-#endif // GODOT_COLLISION_OBJECT_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_collision_solver_2d.h b/engine/modules/godot_physics_2d/godot_collision_solver_2d.h
index 1c09714f..0d941d42 100644
--- a/engine/modules/godot_physics_2d/godot_collision_solver_2d.h
+++ b/engine/modules/godot_physics_2d/godot_collision_solver_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_COLLISION_SOLVER_2D_H
-#define GODOT_COLLISION_SOLVER_2D_H
+#pragma once
 
 #include "godot_shape_2d.h"
 
@@ -46,5 +45,3 @@ private:
 public:
 	static bool solve(const GodotShape2D *p_shape_A, const Transform2D &p_transform_A, const Vector2 &p_motion_A, const GodotShape2D *p_shape_B, const Transform2D &p_transform_B, const Vector2 &p_motion_B, CallbackResult p_result_callback, void *p_userdata, Vector2 *r_sep_axis = nullptr, real_t p_margin_A = 0, real_t p_margin_B = 0);
 };
-
-#endif // GODOT_COLLISION_SOLVER_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp b/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
index daa9982b..ba86ffb8 100644
--- a/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
+++ b/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.cpp
@@ -66,7 +66,7 @@ _FORCE_INLINE_ static void _generate_contacts_point_edge(const Vector2 *p_points
 	ERR_FAIL_COND(p_point_count_B != 2);
 #endif
 
-	Vector2 closest_B = Geometry2D::get_closest_point_to_segment_uncapped(*p_points_A, p_points_B);
+	Vector2 closest_B = Geometry2D::get_closest_point_to_segment_uncapped(*p_points_A, p_points_B[0], p_points_B[1]);
 	p_collector->call(*p_points_A, closest_B);
 }
 
diff --git a/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.h b/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.h
index c9183f7e..36801ffd 100644
--- a/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.h
+++ b/engine/modules/godot_physics_2d/godot_collision_solver_2d_sat.h
@@ -28,11 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_COLLISION_SOLVER_2D_SAT_H
-#define GODOT_COLLISION_SOLVER_2D_SAT_H
+#pragma once
 
 #include "godot_collision_solver_2d.h"
 
 bool sat_2d_calculate_penetration(const GodotShape2D *p_shape_A, const Transform2D &p_transform_A, const Vector2 &p_motion_A, const GodotShape2D *p_shape_B, const Transform2D &p_transform_B, const Vector2 &p_motion_B, GodotCollisionSolver2D::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false, Vector2 *sep_axis = nullptr, real_t p_margin_A = 0, real_t p_margin_B = 0);
-
-#endif // GODOT_COLLISION_SOLVER_2D_SAT_H
diff --git a/engine/modules/godot_physics_2d/godot_constraint_2d.h b/engine/modules/godot_physics_2d/godot_constraint_2d.h
index f4136f66..27a7dc68 100644
--- a/engine/modules/godot_physics_2d/godot_constraint_2d.h
+++ b/engine/modules/godot_physics_2d/godot_constraint_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_CONSTRAINT_2D_H
-#define GODOT_CONSTRAINT_2D_H
+#pragma once
 
 #include "godot_body_2d.h"
 
@@ -66,5 +65,3 @@ public:
 
 	virtual ~GodotConstraint2D() {}
 };
-
-#endif // GODOT_CONSTRAINT_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_joints_2d.h b/engine/modules/godot_physics_2d/godot_joints_2d.h
index 54884e11..bb3cdd57 100644
--- a/engine/modules/godot_physics_2d/godot_joints_2d.h
+++ b/engine/modules/godot_physics_2d/godot_joints_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_JOINTS_2D_H
-#define GODOT_JOINTS_2D_H
+#pragma once
 
 #include "godot_body_2d.h"
 #include "godot_constraint_2d.h"
@@ -188,5 +187,3 @@ public:
 
 	GodotDampedSpringJoint2D(const Vector2 &p_anchor_a, const Vector2 &p_anchor_b, GodotBody2D *p_body_a, GodotBody2D *p_body_b);
 };
-
-#endif // GODOT_JOINTS_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_physics_server_2d.h b/engine/modules/godot_physics_2d/godot_physics_server_2d.h
index ce052ddd..dce8b0d2 100644
--- a/engine/modules/godot_physics_2d/godot_physics_server_2d.h
+++ b/engine/modules/godot_physics_2d/godot_physics_server_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_PHYSICS_SERVER_2D_H
-#define GODOT_PHYSICS_SERVER_2D_H
+#pragma once
 
 #include "godot_joints_2d.h"
 #include "godot_shape_2d.h"
@@ -303,5 +302,3 @@ public:
 	GodotPhysicsServer2D(bool p_using_threads = false);
 	~GodotPhysicsServer2D() {}
 };
-
-#endif // GODOT_PHYSICS_SERVER_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_shape_2d.cpp b/engine/modules/godot_physics_2d/godot_shape_2d.cpp
index e691f0a7..df32692d 100644
--- a/engine/modules/godot_physics_2d/godot_shape_2d.cpp
+++ b/engine/modules/godot_physics_2d/godot_shape_2d.cpp
@@ -665,7 +665,7 @@ bool GodotConcavePolygonShape2D::contains_point(const Vector2 &p_point) const {
 }
 
 bool GodotConcavePolygonShape2D::intersect_segment(const Vector2 &p_begin, const Vector2 &p_end, Vector2 &r_point, Vector2 &r_normal) const {
-	if (segments.size() == 0 || points.size() == 0) {
+	if (segments.is_empty() || points.is_empty()) {
 		return false;
 	}
 
@@ -919,7 +919,7 @@ void GodotConcavePolygonShape2D::cull(const Rect2 &p_local_aabb, QueryCallback p
 		stack[i]=0;
 	*/
 
-	if (segments.size() == 0 || points.size() == 0 || bvh.size() == 0) {
+	if (segments.is_empty() || points.is_empty() || bvh.is_empty()) {
 		return;
 	}
 
diff --git a/engine/modules/godot_physics_2d/godot_shape_2d.h b/engine/modules/godot_physics_2d/godot_shape_2d.h
index 28c69574..20d56b96 100644
--- a/engine/modules/godot_physics_2d/godot_shape_2d.h
+++ b/engine/modules/godot_physics_2d/godot_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_SHAPE_2D_H
-#define GODOT_SHAPE_2D_H
+#pragma once
 
 #include "servers/physics_server_2d.h"
 
@@ -535,5 +534,3 @@ public:
 };
 
 #undef DEFAULT_PROJECT_RANGE_CAST
-
-#endif // GODOT_SHAPE_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_space_2d.h b/engine/modules/godot_physics_2d/godot_space_2d.h
index c9fb66a0..c0b5a0d5 100644
--- a/engine/modules/godot_physics_2d/godot_space_2d.h
+++ b/engine/modules/godot_physics_2d/godot_space_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_SPACE_2D_H
-#define GODOT_SPACE_2D_H
+#pragma once
 
 #include "godot_area_2d.h"
 #include "godot_body_2d.h"
@@ -206,5 +205,3 @@ public:
 	GodotSpace2D();
 	~GodotSpace2D();
 };
-
-#endif // GODOT_SPACE_2D_H
diff --git a/engine/modules/godot_physics_2d/godot_step_2d.h b/engine/modules/godot_physics_2d/godot_step_2d.h
index c08c6379..5668669e 100644
--- a/engine/modules/godot_physics_2d/godot_step_2d.h
+++ b/engine/modules/godot_physics_2d/godot_step_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_STEP_2D_H
-#define GODOT_STEP_2D_H
+#pragma once
 
 #include "godot_space_2d.h"
 
@@ -56,5 +55,3 @@ public:
 	GodotStep2D();
 	~GodotStep2D();
 };
-
-#endif // GODOT_STEP_2D_H
diff --git a/engine/modules/godot_physics_2d/register_types.h b/engine/modules/godot_physics_2d/register_types.h
index 1d2d1301..e42ab46c 100644
--- a/engine/modules/godot_physics_2d/register_types.h
+++ b/engine/modules/godot_physics_2d/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_PHYSICS_2D_REGISTER_TYPES_H
-#define GODOT_PHYSICS_2D_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_godot_physics_2d_module(ModuleInitializationLevel p_level);
 void uninitialize_godot_physics_2d_module(ModuleInitializationLevel p_level);
-
-#endif // GODOT_PHYSICS_2D_REGISTER_TYPES_H
diff --git a/engine/modules/godot_physics_3d/config.py b/engine/modules/godot_physics_3d/config.py
index a42f27fb..79b382a7 100644
--- a/engine/modules/godot_physics_3d/config.py
+++ b/engine/modules/godot_physics_3d/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return not env["disable_3d"]
+    return not env["disable_physics_3d"]
 
 
 def configure(env):
diff --git a/engine/modules/godot_physics_3d/gjk_epa.h b/engine/modules/godot_physics_3d/gjk_epa.h
index 48fda996..c29b7868 100644
--- a/engine/modules/godot_physics_3d/gjk_epa.h
+++ b/engine/modules/godot_physics_3d/gjk_epa.h
@@ -28,13 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GJK_EPA_H
-#define GJK_EPA_H
+#pragma once
 
 #include "godot_collision_solver_3d.h"
 #include "godot_shape_3d.h"
 
 bool gjk_epa_calculate_penetration(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, GodotCollisionSolver3D::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false, real_t p_margin_A = 0.0, real_t p_margin_B = 0.0);
 bool gjk_epa_calculate_distance(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, Vector3 &r_result_A, Vector3 &r_result_B);
-
-#endif // GJK_EPA_H
diff --git a/engine/modules/godot_physics_3d/godot_area_3d.h b/engine/modules/godot_physics_3d/godot_area_3d.h
index 2c1a7826..419ecc79 100644
--- a/engine/modules/godot_physics_3d/godot_area_3d.h
+++ b/engine/modules/godot_physics_3d/godot_area_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_AREA_3D_H
-#define GODOT_AREA_3D_H
+#pragma once
 
 #include "godot_collision_object_3d.h"
 
@@ -236,5 +235,3 @@ struct AreaCMP {
 		refCount = 1;
 	}
 };
-
-#endif // GODOT_AREA_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_area_pair_3d.h b/engine/modules/godot_physics_3d/godot_area_pair_3d.h
index a2c5df0f..f5be4c64 100644
--- a/engine/modules/godot_physics_3d/godot_area_pair_3d.h
+++ b/engine/modules/godot_physics_3d/godot_area_pair_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_AREA_PAIR_3D_H
-#define GODOT_AREA_PAIR_3D_H
+#pragma once
 
 #include "godot_area_3d.h"
 #include "godot_body_3d.h"
@@ -94,5 +93,3 @@ public:
 	GodotAreaSoftBodyPair3D(GodotSoftBody3D *p_sof_body, int p_soft_body_shape, GodotArea3D *p_area, int p_area_shape);
 	~GodotAreaSoftBodyPair3D();
 };
-
-#endif // GODOT_AREA_PAIR_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_body_3d.cpp b/engine/modules/godot_physics_3d/godot_body_3d.cpp
index 1edc01ae..397eb0d5 100644
--- a/engine/modules/godot_physics_3d/godot_body_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_body_3d.cpp
@@ -701,7 +701,7 @@ void GodotBody3D::integrate_velocities(real_t p_step) {
 	if (mode == PhysicsServer3D::BODY_MODE_KINEMATIC) {
 		_set_transform(new_transform, false);
 		_set_inv_transform(new_transform.affine_inverse());
-		if (contacts.size() == 0 && linear_velocity == Vector3() && angular_velocity == Vector3()) {
+		if (contacts.is_empty() && linear_velocity == Vector3() && angular_velocity == Vector3()) {
 			set_active(false); //stopped moving, deactivate
 		}
 
diff --git a/engine/modules/godot_physics_3d/godot_body_3d.h b/engine/modules/godot_physics_3d/godot_body_3d.h
index 81b66812..7dcd17b1 100644
--- a/engine/modules/godot_physics_3d/godot_body_3d.h
+++ b/engine/modules/godot_physics_3d/godot_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BODY_3D_H
-#define GODOT_BODY_3D_H
+#pragma once
 
 #include "godot_area_3d.h"
 #include "godot_collision_object_3d.h"
@@ -176,6 +175,7 @@ public:
 	}
 
 	_FORCE_INLINE_ void set_max_contacts_reported(int p_size) {
+		ERR_FAIL_INDEX(p_size, MAX_CONTACTS_REPORTED_3D_MAX);
 		contacts.resize(p_size);
 		contact_count = 0;
 		if (mode == PhysicsServer3D::BODY_MODE_KINEMATIC && p_size) {
@@ -392,5 +392,3 @@ void GodotBody3D::add_contact(const Vector3 &p_local_pos, const Vector3 &p_local
 	c[idx].collider_velocity_at_pos = p_collider_velocity_at_pos;
 	c[idx].impulse = p_impulse;
 }
-
-#endif // GODOT_BODY_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_body_direct_state_3d.h b/engine/modules/godot_physics_3d/godot_body_direct_state_3d.h
index 8066050c..55246857 100644
--- a/engine/modules/godot_physics_3d/godot_body_direct_state_3d.h
+++ b/engine/modules/godot_physics_3d/godot_body_direct_state_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BODY_DIRECT_STATE_3D_H
-#define GODOT_BODY_DIRECT_STATE_3D_H
+#pragma once
 
 #include "servers/physics_server_3d.h"
 
@@ -103,5 +102,3 @@ public:
 
 	virtual real_t get_step() const override;
 };
-
-#endif // GODOT_BODY_DIRECT_STATE_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp b/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp
index 101a7a95..bc69ef1d 100644
--- a/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_body_pair_3d.cpp
@@ -34,7 +34,7 @@
 #include "godot_space_3d.h"
 
 #define MIN_VELOCITY 0.0001
-#define MAX_BIAS_ROTATION (Math_PI / 8)
+#define MAX_BIAS_ROTATION (Math::PI / 8)
 
 void GodotBodyPair3D::_contact_added_callback(const Vector3 &p_point_A, int p_index_A, const Vector3 &p_point_B, int p_index_B, const Vector3 &normal, void *p_userdata) {
 	GodotBodyPair3D *pair = static_cast<GodotBodyPair3D *>(p_userdata);
@@ -255,7 +255,7 @@ real_t combine_bounce(GodotBody3D *A, GodotBody3D *B) {
 }
 
 real_t combine_friction(GodotBody3D *A, GodotBody3D *B) {
-	return ABS(MIN(A->get_friction(), B->get_friction()));
+	return Math::abs(MIN(A->get_friction(), B->get_friction()));
 }
 
 bool GodotBodyPair3D::setup(real_t p_step) {
diff --git a/engine/modules/godot_physics_3d/godot_body_pair_3d.h b/engine/modules/godot_physics_3d/godot_body_pair_3d.h
index a8f5180d..10e02ac4 100644
--- a/engine/modules/godot_physics_3d/godot_body_pair_3d.h
+++ b/engine/modules/godot_physics_3d/godot_body_pair_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BODY_PAIR_3D_H
-#define GODOT_BODY_PAIR_3D_H
+#pragma once
 
 #include "godot_body_3d.h"
 #include "godot_constraint_3d.h"
@@ -143,5 +142,3 @@ public:
 	GodotBodySoftBodyPair3D(GodotBody3D *p_A, int p_shape_A, GodotSoftBody3D *p_B);
 	~GodotBodySoftBodyPair3D();
 };
-
-#endif // GODOT_BODY_PAIR_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_broad_phase_3d.h b/engine/modules/godot_physics_3d/godot_broad_phase_3d.h
index f70321be..1d22b004 100644
--- a/engine/modules/godot_physics_3d/godot_broad_phase_3d.h
+++ b/engine/modules/godot_physics_3d/godot_broad_phase_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BROAD_PHASE_3D_H
-#define GODOT_BROAD_PHASE_3D_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/math_funcs.h"
@@ -68,5 +67,3 @@ public:
 
 	virtual ~GodotBroadPhase3D();
 };
-
-#endif // GODOT_BROAD_PHASE_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_broad_phase_3d_bvh.h b/engine/modules/godot_physics_3d/godot_broad_phase_3d_bvh.h
index 63968dea..0ba57e21 100644
--- a/engine/modules/godot_physics_3d/godot_broad_phase_3d_bvh.h
+++ b/engine/modules/godot_physics_3d/godot_broad_phase_3d_bvh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BROAD_PHASE_3D_BVH_H
-#define GODOT_BROAD_PHASE_3D_BVH_H
+#pragma once
 
 #include "godot_broad_phase_3d.h"
 
@@ -96,5 +95,3 @@ public:
 	static GodotBroadPhase3D *_create();
 	GodotBroadPhase3DBVH();
 };
-
-#endif // GODOT_BROAD_PHASE_3D_BVH_H
diff --git a/engine/modules/godot_physics_3d/godot_collision_object_3d.h b/engine/modules/godot_physics_3d/godot_collision_object_3d.h
index bf28bcc4..506cf06e 100644
--- a/engine/modules/godot_physics_3d/godot_collision_object_3d.h
+++ b/engine/modules/godot_physics_3d/godot_collision_object_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_COLLISION_OBJECT_3D_H
-#define GODOT_COLLISION_OBJECT_3D_H
+#pragma once
 
 #include "godot_broad_phase_3d.h"
 #include "godot_shape_3d.h"
@@ -190,5 +189,3 @@ public:
 
 	virtual ~GodotCollisionObject3D() {}
 };
-
-#endif // GODOT_COLLISION_OBJECT_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp b/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp
index db48111e..071ae66a 100644
--- a/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_collision_solver_3d.cpp
@@ -61,8 +61,8 @@ bool GodotCollisionSolver3D::solve_static_world_boundary(const GodotShape3D *p_s
 		// Use 3 equidistant points on the circle.
 		for (int i = 0; i < 3; ++i) {
 			Vector3 vertex_pos = circle_pos;
-			vertex_pos += circle_axis_1 * Math::cos(2.0 * Math_PI * i / 3.0);
-			vertex_pos += circle_axis_2 * Math::sin(2.0 * Math_PI * i / 3.0);
+			vertex_pos += circle_axis_1 * Math::cos(2.0 * Math::PI * i / 3.0);
+			vertex_pos += circle_axis_2 * Math::sin(2.0 * Math::PI * i / 3.0);
 			supports[i] = vertex_pos;
 		}
 	}
@@ -488,8 +488,8 @@ bool GodotCollisionSolver3D::solve_distance_world_boundary(const GodotShape3D *p
 		// Use 3 equidistant points on the circle.
 		for (int i = 0; i < 3; ++i) {
 			Vector3 vertex_pos = circle_pos;
-			vertex_pos += circle_axis_1 * Math::cos(2.0 * Math_PI * i / 3.0);
-			vertex_pos += circle_axis_2 * Math::sin(2.0 * Math_PI * i / 3.0);
+			vertex_pos += circle_axis_1 * Math::cos(2.0 * Math::PI * i / 3.0);
+			vertex_pos += circle_axis_2 * Math::sin(2.0 * Math::PI * i / 3.0);
 			supports[i] = vertex_pos;
 		}
 	}
diff --git a/engine/modules/godot_physics_3d/godot_collision_solver_3d.h b/engine/modules/godot_physics_3d/godot_collision_solver_3d.h
index 36ea7957..13b097c9 100644
--- a/engine/modules/godot_physics_3d/godot_collision_solver_3d.h
+++ b/engine/modules/godot_physics_3d/godot_collision_solver_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_COLLISION_SOLVER_3D_H
-#define GODOT_COLLISION_SOLVER_3D_H
+#pragma once
 
 #include "godot_shape_3d.h"
 
@@ -53,5 +52,3 @@ public:
 	static bool solve_static(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, CallbackResult p_result_callback, void *p_userdata, Vector3 *r_sep_axis = nullptr, real_t p_margin_A = 0, real_t p_margin_B = 0);
 	static bool solve_distance(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B, const AABB &p_concave_hint, Vector3 *r_sep_axis = nullptr);
 };
-
-#endif // GODOT_COLLISION_SOLVER_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.cpp b/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.cpp
index 2adbb512..31431805 100644
--- a/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.cpp
+++ b/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.cpp
@@ -104,7 +104,7 @@ static void _generate_contacts_point_edge(const Vector3 *p_points_A, int p_point
 	ERR_FAIL_COND(p_point_count_B != 2);
 #endif
 
-	Vector3 closest_B = Geometry3D::get_closest_point_to_segment_uncapped(*p_points_A, p_points_B);
+	Vector3 closest_B = Geometry3D::get_closest_point_to_segment_uncapped(*p_points_A, p_points_B[0], p_points_B[1]);
 	p_callback->call(*p_points_A, closest_B, p_callback->normal);
 }
 
@@ -171,8 +171,8 @@ static void _generate_contacts_edge_edge(const Vector3 *p_points_A, int p_point_
 		d = 1.0;
 	}
 
-	Vector3 closest_A = p_points_A[0] + rel_A * d;
-	Vector3 closest_B = Geometry3D::get_closest_point_to_segment_uncapped(closest_A, p_points_B);
+	const Vector3 closest_A = p_points_A[0] + rel_A * d;
+	const Vector3 closest_B = Geometry3D::get_closest_point_to_segment_uncapped(closest_A, p_points_B[0], p_points_B[1]);
 	// The normal should be perpendicular to both edges.
 	Vector3 normal = rel_A.cross(rel_B);
 	real_t normal_len = normal.length();
@@ -381,7 +381,7 @@ static void _generate_contacts_face_circle(const Vector3 *p_points_A, int p_poin
 	static const int circle_segments = 8;
 	Vector3 circle_points[circle_segments];
 
-	real_t angle_delta = 2.0 * Math_PI / circle_segments;
+	real_t angle_delta = 2.0 * Math::PI / circle_segments;
 
 	for (int i = 0; i < circle_segments; ++i) {
 		Vector3 point_pos = circle_B_pos;
@@ -511,8 +511,8 @@ static void _generate_contacts_circle_circle(const Vector3 *p_points_A, int p_po
 			// Circle A inside circle B.
 			for (int i = 0; i < 3; ++i) {
 				Vector3 circle_A_point = circle_A_pos;
-				circle_A_point += circle_A_line_1 * Math::cos(2.0 * Math_PI * i / 3.0);
-				circle_A_point += circle_A_line_2 * Math::sin(2.0 * Math_PI * i / 3.0);
+				circle_A_point += circle_A_line_1 * Math::cos(2.0 * Math::PI * i / 3.0);
+				circle_A_point += circle_A_line_2 * Math::sin(2.0 * Math::PI * i / 3.0);
 
 				contact_points[num_points] = circle_A_point;
 				++num_points;
@@ -521,8 +521,8 @@ static void _generate_contacts_circle_circle(const Vector3 *p_points_A, int p_po
 			// Circle B inside circle A.
 			for (int i = 0; i < 3; ++i) {
 				Vector3 circle_B_point = circle_B_pos;
-				circle_B_point += circle_B_line_1 * Math::cos(2.0 * Math_PI * i / 3.0);
-				circle_B_point += circle_B_line_2 * Math::sin(2.0 * Math_PI * i / 3.0);
+				circle_B_point += circle_B_line_1 * Math::cos(2.0 * Math::PI * i / 3.0);
+				circle_B_point += circle_B_line_2 * Math::sin(2.0 * Math::PI * i / 3.0);
 
 				Vector3 circle_A_point = circle_B_point - norm_proj;
 
@@ -885,13 +885,12 @@ static void _collision_sphere_capsule(const GodotShape3D *p_a, const Transform3D
 	real_t scale_B = p_transform_b.basis[0].length();
 
 	// Construct the capsule segment (ball-center to ball-center)
-	Vector3 capsule_segment[2];
 	Vector3 capsule_axis = p_transform_b.basis.get_column(1) * (capsule_B->get_height() * 0.5 - capsule_B->get_radius());
-	capsule_segment[0] = p_transform_b.origin + capsule_axis;
-	capsule_segment[1] = p_transform_b.origin - capsule_axis;
+	const Vector3 capsule_segment_a = p_transform_b.origin + capsule_axis;
+	const Vector3 capsule_segment_b = p_transform_b.origin - capsule_axis;
 
 	// Get the capsules closest segment-point to the sphere
-	Vector3 capsule_closest = Geometry3D::get_closest_point_to_segment(p_transform_a.origin, capsule_segment);
+	Vector3 capsule_closest = Geometry3D::get_closest_point_to_segment(p_transform_a.origin, capsule_segment_a, capsule_segment_b);
 
 	// Perform an analytic sphere collision between the sphere and the sphere-collider in the capsule
 	analytic_sphere_collision<withMargin>(
diff --git a/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.h b/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.h
index 49fcab39..20676416 100644
--- a/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.h
+++ b/engine/modules/godot_physics_3d/godot_collision_solver_3d_sat.h
@@ -28,11 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_COLLISION_SOLVER_3D_SAT_H
-#define GODOT_COLLISION_SOLVER_3D_SAT_H
+#pragma once
 
 #include "godot_collision_solver_3d.h"
 
 bool sat_calculate_penetration(const GodotShape3D *p_shape_A, const Transform3D &p_transform_A, const GodotShape3D *p_shape_B, const Transform3D &p_transform_B, GodotCollisionSolver3D::CallbackResult p_result_callback, void *p_userdata, bool p_swap = false, Vector3 *r_prev_axis = nullptr, real_t p_margin_a = 0, real_t p_margin_b = 0);
-
-#endif // GODOT_COLLISION_SOLVER_3D_SAT_H
diff --git a/engine/modules/godot_physics_3d/godot_constraint_3d.h b/engine/modules/godot_physics_3d/godot_constraint_3d.h
index a833aba9..1a17fca3 100644
--- a/engine/modules/godot_physics_3d/godot_constraint_3d.h
+++ b/engine/modules/godot_physics_3d/godot_constraint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_CONSTRAINT_3D_H
-#define GODOT_CONSTRAINT_3D_H
+#pragma once
 
 class GodotBody3D;
 class GodotSoftBody3D;
@@ -77,5 +76,3 @@ public:
 
 	virtual ~GodotConstraint3D() {}
 };
-
-#endif // GODOT_CONSTRAINT_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_joint_3d.h b/engine/modules/godot_physics_3d/godot_joint_3d.h
index 3207723c..2d885b8e 100644
--- a/engine/modules/godot_physics_3d/godot_joint_3d.h
+++ b/engine/modules/godot_physics_3d/godot_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_JOINT_3D_H
-#define GODOT_JOINT_3D_H
+#pragma once
 
 #include "godot_body_3d.h"
 #include "godot_constraint_3d.h"
@@ -40,7 +39,7 @@ protected:
 	bool dynamic_B = false;
 
 	void plane_space(const Vector3 &n, Vector3 &p, Vector3 &q) {
-		if (Math::abs(n.z) > Math_SQRT12) {
+		if (Math::abs(n.z) > Math::SQRT12) {
 			// choose p in y-z plane
 			real_t a = n[1] * n[1] + n[2] * n[2];
 			real_t k = 1.0 / Math::sqrt(a);
@@ -58,7 +57,7 @@ protected:
 	}
 
 	_FORCE_INLINE_ real_t atan2fast(real_t y, real_t x) {
-		real_t coeff_1 = Math_PI / 4.0f;
+		real_t coeff_1 = Math::PI / 4.0f;
 		real_t coeff_2 = 3.0f * coeff_1;
 		real_t abs_y = Math::abs(y);
 		real_t angle;
@@ -97,5 +96,3 @@ public:
 		}
 	}
 };
-
-#endif // GODOT_JOINT_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_physics_server_3d.h b/engine/modules/godot_physics_3d/godot_physics_server_3d.h
index 94003a70..bad7279c 100644
--- a/engine/modules/godot_physics_3d/godot_physics_server_3d.h
+++ b/engine/modules/godot_physics_3d/godot_physics_server_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_PHYSICS_SERVER_3D_H
-#define GODOT_PHYSICS_SERVER_3D_H
+#pragma once
 
 #include "godot_joint_3d.h"
 #include "godot_shape_3d.h"
@@ -381,5 +380,3 @@ public:
 	GodotPhysicsServer3D(bool p_using_threads = false);
 	~GodotPhysicsServer3D() {}
 };
-
-#endif // GODOT_PHYSICS_SERVER_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_shape_3d.cpp b/engine/modules/godot_physics_3d/godot_shape_3d.cpp
index dbda3da8..c5bbff8d 100644
--- a/engine/modules/godot_physics_3d/godot_shape_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_shape_3d.cpp
@@ -216,12 +216,7 @@ bool GodotSeparationRayShape3D::intersect_point(const Vector3 &p_point) const {
 }
 
 Vector3 GodotSeparationRayShape3D::get_closest_point_to(const Vector3 &p_point) const {
-	Vector3 s[2] = {
-		Vector3(0, 0, 0),
-		Vector3(0, 0, length)
-	};
-
-	return Geometry3D::get_closest_point_to_segment(p_point, s);
+	return Geometry3D::get_closest_point_to_segment(p_point, Vector3(0, 0, 0), Vector3(0, 0, length));
 }
 
 Vector3 GodotSeparationRayShape3D::get_moment_of_inertia(real_t p_mass) const {
@@ -455,19 +450,14 @@ Vector3 GodotBoxShape3D::get_closest_point_to(const Vector3 &p_point) const {
 
 	//check segments
 	real_t min_distance = 1e20;
-	Vector3 closest_vertex = half_extents * p_point.sign();
-	Vector3 s[2] = {
-		closest_vertex,
-		closest_vertex
-	};
-
+	const Vector3 closest_vertex = half_extents * p_point.sign();
 	for (int i = 0; i < 3; i++) {
-		s[1] = closest_vertex;
-		s[1][i] = -s[1][i]; //edge
+		Vector3 segment_b = closest_vertex;
+		segment_b[i] = -segment_b[i]; //edge
 
-		Vector3 closest_edge = Geometry3D::get_closest_point_to_segment(p_point, s);
+		const Vector3 closest_edge = Geometry3D::get_closest_point_to_segment(p_point, closest_vertex, segment_b);
 
-		real_t d = p_point.distance_to(closest_edge);
+		const real_t d = p_point.distance_to(closest_edge);
 		if (d < min_distance) {
 			min_point = closest_edge;
 			min_distance = d;
@@ -618,12 +608,10 @@ bool GodotCapsuleShape3D::intersect_point(const Vector3 &p_point) const {
 }
 
 Vector3 GodotCapsuleShape3D::get_closest_point_to(const Vector3 &p_point) const {
-	Vector3 s[2] = {
-		Vector3(0, -height * 0.5 + radius, 0),
-		Vector3(0, height * 0.5 - radius, 0),
-	};
+	const Vector3 segment_a = Vector3(0, -height * 0.5 + radius, 0);
+	const Vector3 segment_b = Vector3(0, height * 0.5 - radius, 0);
 
-	Vector3 p = Geometry3D::get_closest_point_to_segment(p_point, s);
+	const Vector3 p = Geometry3D::get_closest_point_to_segment(p_point, segment_a, segment_b);
 
 	if (p.distance_to(p_point) < radius) {
 		return p_point;
@@ -772,12 +760,10 @@ Vector3 GodotCylinderShape3D::get_closest_point_to(const Vector3 &p_point) const
 
 		return proj_point;
 	} else {
-		Vector3 s[2] = {
-			Vector3(0, -height * 0.5, 0),
-			Vector3(0, height * 0.5, 0),
-		};
+		const Vector3 segment_a = Vector3(0, -height * 0.5, 0);
+		const Vector3 segment_b = Vector3(0, height * 0.5, 0);
 
-		Vector3 p = Geometry3D::get_closest_point_to_segment(p_point, s);
+		const Vector3 p = Geometry3D::get_closest_point_to_segment(p_point, segment_a, segment_b);
 
 		if (p.distance_to(p_point) < radius) {
 			return p_point;
@@ -852,7 +838,7 @@ void GodotConvexPolygonShape3D::project_range(const Vector3 &p_normal, const Tra
 
 Vector3 GodotConvexPolygonShape3D::get_support(const Vector3 &p_normal) const {
 	// Skip if there are no vertices in the mesh
-	if (mesh.vertices.size() == 0) {
+	if (mesh.vertices.is_empty()) {
 		return Vector3();
 	}
 
@@ -960,7 +946,7 @@ void GodotConvexPolygonShape3D::get_supports(const Vector3 &p_normal, int p_max,
 
 	for (int i = 0; i < ec; i++) {
 		real_t dot = (vertices[edges[i].vertex_a] - vertices[edges[i].vertex_b]).normalized().dot(p_normal);
-		dot = ABS(dot);
+		dot = Math::abs(dot);
 		if (dot < edge_support_threshold_lower && (edges[i].vertex_a == vtx || edges[i].vertex_b == vtx)) {
 			r_amount = 2;
 			r_type = FEATURE_EDGE;
@@ -1068,12 +1054,10 @@ Vector3 GodotConvexPolygonShape3D::get_closest_point_to(const Vector3 &p_point)
 	const Geometry3D::MeshData::Edge *edges = mesh.edges.ptr();
 	int ec = mesh.edges.size();
 	for (int i = 0; i < ec; i++) {
-		Vector3 s[2] = {
-			vertices[edges[i].vertex_a],
-			vertices[edges[i].vertex_b]
-		};
+		const Vector3 segment_a = vertices[edges[i].vertex_a];
+		const Vector3 segment_b = vertices[edges[i].vertex_b];
 
-		Vector3 closest = Geometry3D::get_closest_point_to_segment(p_point, s);
+		Vector3 closest = Geometry3D::get_closest_point_to_segment(p_point, segment_a, segment_b);
 		real_t d = closest.distance_to(p_point);
 		if (d < min_distance) {
 			min_distance = d;
@@ -1238,7 +1222,7 @@ void GodotFaceShape3D::get_supports(const Vector3 &p_normal, int p_max, Vector3
 
 		// check if edge is valid as a support
 		real_t dot = (vertex[i] - vertex[nx]).normalized().dot(n);
-		dot = ABS(dot);
+		dot = Math::abs(dot);
 		if (dot < edge_support_threshold_lower) {
 			r_amount = 2;
 			r_type = FEATURE_EDGE;
@@ -1385,7 +1369,7 @@ void GodotConcavePolygonShape3D::_cull_segment(int p_idx, _SegmentCullParams *p_
 }
 
 bool GodotConcavePolygonShape3D::intersect_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 &r_result, Vector3 &r_normal, int &r_face_index, bool p_hit_back_faces) const {
-	if (faces.size() == 0) {
+	if (faces.is_empty()) {
 		return false;
 	}
 
@@ -1465,7 +1449,7 @@ bool GodotConcavePolygonShape3D::_cull(int p_idx, _CullParams *p_params) const {
 
 void GodotConcavePolygonShape3D::cull(const AABB &p_local_aabb, QueryCallback p_callback, void *p_userdata, bool p_invert_backface_collision) const {
 	// make matrix local to concave
-	if (faces.size() == 0) {
+	if (faces.is_empty()) {
 		return;
 	}
 
diff --git a/engine/modules/godot_physics_3d/godot_shape_3d.h b/engine/modules/godot_physics_3d/godot_shape_3d.h
index dbd58ead..05e41aaf 100644
--- a/engine/modules/godot_physics_3d/godot_shape_3d.h
+++ b/engine/modules/godot_physics_3d/godot_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_SHAPE_3D_H
-#define GODOT_SHAPE_3D_H
+#pragma once
 
 #include "core/math/geometry_3d.h"
 #include "core/templates/local_vector.h"
@@ -120,7 +119,7 @@ class GodotWorldBoundaryShape3D : public GodotShape3D {
 public:
 	Plane get_plane() const;
 
-	virtual real_t get_volume() const override { return INFINITY; }
+	virtual real_t get_volume() const override { return Math::INF; }
 	virtual PhysicsServer3D::ShapeType get_type() const override { return PhysicsServer3D::SHAPE_WORLD_BOUNDARY; }
 	virtual void project_range(const Vector3 &p_normal, const Transform3D &p_transform, real_t &r_min, real_t &r_max) const override;
 	virtual Vector3 get_support(const Vector3 &p_normal) const override;
@@ -173,7 +172,7 @@ class GodotSphereShape3D : public GodotShape3D {
 public:
 	real_t get_radius() const;
 
-	virtual real_t get_volume() const override { return 4.0 / 3.0 * Math_PI * radius * radius * radius; }
+	virtual real_t get_volume() const override { return 4.0 / 3.0 * Math::PI * radius * radius * radius; }
 
 	virtual PhysicsServer3D::ShapeType get_type() const override { return PhysicsServer3D::SHAPE_SPHERE; }
 
@@ -227,7 +226,7 @@ public:
 	_FORCE_INLINE_ real_t get_height() const { return height; }
 	_FORCE_INLINE_ real_t get_radius() const { return radius; }
 
-	virtual real_t get_volume() const override { return 4.0 / 3.0 * Math_PI * radius * radius * radius + (height - radius * 2.0) * Math_PI * radius * radius; }
+	virtual real_t get_volume() const override { return 4.0 / 3.0 * Math::PI * radius * radius * radius + (height - radius * 2.0) * Math::PI * radius * radius; }
 
 	virtual PhysicsServer3D::ShapeType get_type() const override { return PhysicsServer3D::SHAPE_CAPSULE; }
 
@@ -256,7 +255,7 @@ public:
 	_FORCE_INLINE_ real_t get_height() const { return height; }
 	_FORCE_INLINE_ real_t get_radius() const { return radius; }
 
-	virtual real_t get_volume() const override { return height * Math_PI * radius * radius; }
+	virtual real_t get_volume() const override { return height * Math::PI * radius * radius; }
 
 	virtual PhysicsServer3D::ShapeType get_type() const override { return PhysicsServer3D::SHAPE_CYLINDER; }
 
@@ -510,5 +509,3 @@ struct GodotMotionShape3D : public GodotShape3D {
 
 	GodotMotionShape3D() { configure(AABB()); }
 };
-
-#endif // GODOT_SHAPE_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp b/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp
index bbee0ecf..13c786cf 100644
--- a/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp
+++ b/engine/modules/godot_physics_3d/godot_soft_body_3d.cpp
@@ -1245,7 +1245,7 @@ struct _SoftBodyIntersectSegmentInfo {
 	Vector3 dir;
 	Vector3 hit_position;
 	uint32_t hit_face_index = -1;
-	real_t hit_dist_sq = INFINITY;
+	real_t hit_dist_sq = Math::INF;
 
 	static bool process_hit(uint32_t p_face_index, void *p_userdata) {
 		_SoftBodyIntersectSegmentInfo &query_info = *(static_cast<_SoftBodyIntersectSegmentInfo *>(p_userdata));
@@ -1276,7 +1276,7 @@ bool GodotSoftBodyShape3D::intersect_segment(const Vector3 &p_begin, const Vecto
 
 	soft_body->query_ray(p_begin, p_end, _SoftBodyIntersectSegmentInfo::process_hit, &query_info);
 
-	if (query_info.hit_dist_sq != INFINITY) {
+	if (query_info.hit_dist_sq != Math::INF) {
 		r_result = query_info.hit_position;
 		r_normal = soft_body->get_face_normal(query_info.hit_face_index);
 		return true;
diff --git a/engine/modules/godot_physics_3d/godot_soft_body_3d.h b/engine/modules/godot_physics_3d/godot_soft_body_3d.h
index e23f4bb9..1fcf349f 100644
--- a/engine/modules/godot_physics_3d/godot_soft_body_3d.h
+++ b/engine/modules/godot_physics_3d/godot_soft_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_SOFT_BODY_3D_H
-#define GODOT_SOFT_BODY_3D_H
+#pragma once
 
 #include "godot_area_3d.h"
 #include "godot_collision_object_3d.h"
@@ -272,5 +271,3 @@ public:
 	GodotSoftBodyShape3D(GodotSoftBody3D *p_soft_body);
 	~GodotSoftBodyShape3D() {}
 };
-
-#endif // GODOT_SOFT_BODY_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_space_3d.h b/engine/modules/godot_physics_3d/godot_space_3d.h
index ef2c21d7..cc306fb1 100644
--- a/engine/modules/godot_physics_3d/godot_space_3d.h
+++ b/engine/modules/godot_physics_3d/godot_space_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_SPACE_3D_H
-#define GODOT_SPACE_3D_H
+#pragma once
 
 #include "godot_area_3d.h"
 #include "godot_body_3d.h"
@@ -210,5 +209,3 @@ public:
 	GodotSpace3D();
 	~GodotSpace3D();
 };
-
-#endif // GODOT_SPACE_3D_H
diff --git a/engine/modules/godot_physics_3d/godot_step_3d.h b/engine/modules/godot_physics_3d/godot_step_3d.h
index 1c9b0af4..4cafeb97 100644
--- a/engine/modules/godot_physics_3d/godot_step_3d.h
+++ b/engine/modules/godot_physics_3d/godot_step_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_STEP_3D_H
-#define GODOT_STEP_3D_H
+#pragma once
 
 #include "godot_space_3d.h"
 
@@ -57,5 +56,3 @@ public:
 	GodotStep3D();
 	~GodotStep3D();
 };
-
-#endif // GODOT_STEP_3D_H
diff --git a/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.cpp b/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.cpp
index 40914227..7641ac68 100644
--- a/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.cpp
+++ b/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.cpp
@@ -112,7 +112,7 @@ bool GodotConeTwistJoint3D::setup(real_t p_timestep) {
 	}
 
 	Vector3 b1Axis1, b1Axis2, b1Axis3;
-	Vector3 b2Axis1, b2Axis2;
+	Vector3 b2Axis1;
 
 	b1Axis1 = A->get_transform().basis.xform(m_rbAFrame.basis.get_column(0));
 	b2Axis1 = B->get_transform().basis.xform(m_rbBFrame.basis.get_column(0));
diff --git a/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.h b/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.h
index f3b683a8..1071080c 100644
--- a/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.h
+++ b/engine/modules/godot_physics_3d/joints/godot_cone_twist_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_CONE_TWIST_JOINT_3D_H
-#define GODOT_CONE_TWIST_JOINT_3D_H
+#pragma once
 
 /*
 Adapted to Godot from the Bullet library.
@@ -80,7 +79,7 @@ public:
 	real_t m_biasFactor = 0.3;
 	real_t m_relaxationFactor = 1.0;
 
-	real_t m_swingSpan1 = Math_TAU / 8.0;
+	real_t m_swingSpan1 = Math::TAU / 8.0;
 	real_t m_swingSpan2 = 0.0;
 	real_t m_twistSpan = 0.0;
 
@@ -138,5 +137,3 @@ public:
 	void set_param(PhysicsServer3D::ConeTwistJointParam p_param, real_t p_value);
 	real_t get_param(PhysicsServer3D::ConeTwistJointParam p_param) const;
 };
-
-#endif // GODOT_CONE_TWIST_JOINT_3D_H
diff --git a/engine/modules/godot_physics_3d/joints/godot_generic_6dof_joint_3d.h b/engine/modules/godot_physics_3d/joints/godot_generic_6dof_joint_3d.h
index 9ee6dd27..a7ced46d 100644
--- a/engine/modules/godot_physics_3d/joints/godot_generic_6dof_joint_3d.h
+++ b/engine/modules/godot_physics_3d/joints/godot_generic_6dof_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_GENERIC_6DOF_JOINT_3D_H
-#define GODOT_GENERIC_6DOF_JOINT_3D_H
+#pragma once
 
 /*
 Adapted to Godot from the Bullet library.
@@ -318,5 +317,3 @@ public:
 	void set_flag(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisFlag p_flag, bool p_value);
 	bool get_flag(Vector3::Axis p_axis, PhysicsServer3D::G6DOFJointAxisFlag p_flag) const;
 };
-
-#endif // GODOT_GENERIC_6DOF_JOINT_3D_H
diff --git a/engine/modules/godot_physics_3d/joints/godot_hinge_joint_3d.h b/engine/modules/godot_physics_3d/joints/godot_hinge_joint_3d.h
index 7f835094..0eb0689c 100644
--- a/engine/modules/godot_physics_3d/joints/godot_hinge_joint_3d.h
+++ b/engine/modules/godot_physics_3d/joints/godot_hinge_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_HINGE_JOINT_3D_H
-#define GODOT_HINGE_JOINT_3D_H
+#pragma once
 
 /*
 Adapted to Godot from the Bullet library.
@@ -76,8 +75,8 @@ class GodotHingeJoint3D : public GodotJoint3D {
 	real_t m_biasFactor = 0.3;
 	real_t m_relaxationFactor = 1.0;
 
-	real_t m_lowerLimit = Math_PI;
-	real_t m_upperLimit = -Math_PI;
+	real_t m_lowerLimit = Math::PI;
+	real_t m_upperLimit = -Math::PI;
 
 	real_t m_kHinge = 0.0;
 
@@ -112,5 +111,3 @@ public:
 	GodotHingeJoint3D(GodotBody3D *rbA, GodotBody3D *rbB, const Transform3D &frameA, const Transform3D &frameB);
 	GodotHingeJoint3D(GodotBody3D *rbA, GodotBody3D *rbB, const Vector3 &pivotInA, const Vector3 &pivotInB, const Vector3 &axisInA, const Vector3 &axisInB);
 };
-
-#endif // GODOT_HINGE_JOINT_3D_H
diff --git a/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h b/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h
index d0c3c48a..d6218e19 100644
--- a/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h
+++ b/engine/modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_JACOBIAN_ENTRY_3D_H
-#define GODOT_JACOBIAN_ENTRY_3D_H
+#pragma once
 
 /*
 Adapted to Godot from the Bullet library.
@@ -165,5 +164,3 @@ public:
 	//Optimization: can be stored in the w/last component of one of the vectors
 	real_t m_Adiag = 1.0;
 };
-
-#endif // GODOT_JACOBIAN_ENTRY_3D_H
diff --git a/engine/modules/godot_physics_3d/joints/godot_pin_joint_3d.h b/engine/modules/godot_physics_3d/joints/godot_pin_joint_3d.h
index 62d3068e..69ce6138 100644
--- a/engine/modules/godot_physics_3d/joints/godot_pin_joint_3d.h
+++ b/engine/modules/godot_physics_3d/joints/godot_pin_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_PIN_JOINT_3D_H
-#define GODOT_PIN_JOINT_3D_H
+#pragma once
 
 /*
 Adapted to Godot from the Bullet library.
@@ -91,5 +90,3 @@ public:
 	GodotPinJoint3D(GodotBody3D *p_body_a, const Vector3 &p_pos_a, GodotBody3D *p_body_b, const Vector3 &p_pos_b);
 	~GodotPinJoint3D();
 };
-
-#endif // GODOT_PIN_JOINT_3D_H
diff --git a/engine/modules/godot_physics_3d/joints/godot_slider_joint_3d.h b/engine/modules/godot_physics_3d/joints/godot_slider_joint_3d.h
index 99fabf86..d7ec86a8 100644
--- a/engine/modules/godot_physics_3d/joints/godot_slider_joint_3d.h
+++ b/engine/modules/godot_physics_3d/joints/godot_slider_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_SLIDER_JOINT_3D_H
-#define GODOT_SLIDER_JOINT_3D_H
+#pragma once
 
 /*
 Adapted to Godot from the Bullet library.
@@ -242,5 +241,3 @@ public:
 
 	virtual PhysicsServer3D::JointType get_type() const override { return PhysicsServer3D::JOINT_TYPE_SLIDER; }
 };
-
-#endif // GODOT_SLIDER_JOINT_3D_H
diff --git a/engine/modules/godot_physics_3d/register_types.h b/engine/modules/godot_physics_3d/register_types.h
index 998fb4a1..4b1ebca3 100644
--- a/engine/modules/godot_physics_3d/register_types.h
+++ b/engine/modules/godot_physics_3d/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_PHYSICS_3D_REGISTER_TYPES_H
-#define GODOT_PHYSICS_3D_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_godot_physics_3d_module(ModuleInitializationLevel p_level);
 void uninitialize_godot_physics_3d_module(ModuleInitializationLevel p_level);
-
-#endif // GODOT_PHYSICS_3D_REGISTER_TYPES_H
diff --git a/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp b/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp
index f4157ca7..4cde5a96 100644
--- a/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp
+++ b/engine/modules/gridmap/editor/grid_map_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "grid_map_editor_plugin.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "core/os/keyboard.h"
 #include "editor/editor_command_palette.h"
 #include "editor/editor_main_screen.h"
@@ -100,14 +98,14 @@ void GridMapEditor::_menu_option(int p_option) {
 			Basis r;
 			if (input_action == INPUT_PASTE) {
 				r = node->get_basis_with_orthogonal_index(paste_indicator.orientation);
-				r.rotate(Vector3(0, 1, 0), -Math_PI / 2.0);
+				r.rotate(Vector3(0, 1, 0), -Math::PI / 2.0);
 				paste_indicator.orientation = node->get_orthogonal_index_from_basis(r);
 				_update_paste_indicator();
 				break;
 			}
 
 			r = node->get_basis_with_orthogonal_index(cursor_rot);
-			r.rotate(Vector3(0, 1, 0), -Math_PI / 2.0);
+			r.rotate(Vector3(0, 1, 0), -Math::PI / 2.0);
 			cursor_rot = node->get_orthogonal_index_from_basis(r);
 			_update_cursor_transform();
 		} break;
@@ -115,14 +113,14 @@ void GridMapEditor::_menu_option(int p_option) {
 			Basis r;
 			if (input_action == INPUT_PASTE) {
 				r = node->get_basis_with_orthogonal_index(paste_indicator.orientation);
-				r.rotate(Vector3(1, 0, 0), -Math_PI / 2.0);
+				r.rotate(Vector3(1, 0, 0), -Math::PI / 2.0);
 				paste_indicator.orientation = node->get_orthogonal_index_from_basis(r);
 				_update_paste_indicator();
 				break;
 			}
 
 			r = node->get_basis_with_orthogonal_index(cursor_rot);
-			r.rotate(Vector3(1, 0, 0), -Math_PI / 2.0);
+			r.rotate(Vector3(1, 0, 0), -Math::PI / 2.0);
 			cursor_rot = node->get_orthogonal_index_from_basis(r);
 			_update_cursor_transform();
 		} break;
@@ -130,14 +128,14 @@ void GridMapEditor::_menu_option(int p_option) {
 			Basis r;
 			if (input_action == INPUT_PASTE) {
 				r = node->get_basis_with_orthogonal_index(paste_indicator.orientation);
-				r.rotate(Vector3(0, 0, 1), -Math_PI / 2.0);
+				r.rotate(Vector3(0, 0, 1), -Math::PI / 2.0);
 				paste_indicator.orientation = node->get_orthogonal_index_from_basis(r);
 				_update_paste_indicator();
 				break;
 			}
 
 			r = node->get_basis_with_orthogonal_index(cursor_rot);
-			r.rotate(Vector3(0, 0, 1), -Math_PI / 2.0);
+			r.rotate(Vector3(0, 0, 1), -Math::PI / 2.0);
 			cursor_rot = node->get_orthogonal_index_from_basis(r);
 			_update_cursor_transform();
 		} break;
@@ -145,14 +143,14 @@ void GridMapEditor::_menu_option(int p_option) {
 			Basis r;
 			if (input_action == INPUT_PASTE) {
 				r = node->get_basis_with_orthogonal_index(paste_indicator.orientation);
-				r.rotate(Vector3(0, 1, 0), Math_PI / 2.0);
+				r.rotate(Vector3(0, 1, 0), Math::PI / 2.0);
 				paste_indicator.orientation = node->get_orthogonal_index_from_basis(r);
 				_update_paste_indicator();
 				break;
 			}
 
 			r = node->get_basis_with_orthogonal_index(cursor_rot);
-			r.rotate(Vector3(0, 1, 0), Math_PI / 2.0);
+			r.rotate(Vector3(0, 1, 0), Math::PI / 2.0);
 			cursor_rot = node->get_orthogonal_index_from_basis(r);
 			_update_cursor_transform();
 		} break;
@@ -160,14 +158,14 @@ void GridMapEditor::_menu_option(int p_option) {
 			Basis r;
 			if (input_action == INPUT_PASTE) {
 				r = node->get_basis_with_orthogonal_index(paste_indicator.orientation);
-				r.rotate(Vector3(1, 0, 0), Math_PI / 2.0);
+				r.rotate(Vector3(1, 0, 0), Math::PI / 2.0);
 				paste_indicator.orientation = node->get_orthogonal_index_from_basis(r);
 				_update_paste_indicator();
 				break;
 			}
 
 			r = node->get_basis_with_orthogonal_index(cursor_rot);
-			r.rotate(Vector3(1, 0, 0), Math_PI / 2.0);
+			r.rotate(Vector3(1, 0, 0), Math::PI / 2.0);
 			cursor_rot = node->get_orthogonal_index_from_basis(r);
 			_update_cursor_transform();
 		} break;
@@ -175,14 +173,14 @@ void GridMapEditor::_menu_option(int p_option) {
 			Basis r;
 			if (input_action == INPUT_PASTE) {
 				r = node->get_basis_with_orthogonal_index(paste_indicator.orientation);
-				r.rotate(Vector3(0, 0, 1), Math_PI / 2.0);
+				r.rotate(Vector3(0, 0, 1), Math::PI / 2.0);
 				paste_indicator.orientation = node->get_orthogonal_index_from_basis(r);
 				_update_paste_indicator();
 				break;
 			}
 
 			r = node->get_basis_with_orthogonal_index(cursor_rot);
-			r.rotate(Vector3(0, 0, 1), Math_PI / 2.0);
+			r.rotate(Vector3(0, 0, 1), Math::PI / 2.0);
 			cursor_rot = node->get_orthogonal_index_from_basis(r);
 			_update_cursor_transform();
 		} break;
@@ -674,7 +672,9 @@ void GridMapEditor::_show_viewports_transform_gizmo(bool p_value) {
 }
 
 EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D *p_camera, const Ref<InputEvent> &p_event) {
-	if (!node) {
+	// If the mouse is currently captured, we are most likely in freelook mode.
+	// In this case, disable shortcuts to avoid conflicts with freelook navigation.
+	if (!node || Input::get_singleton()->get_mouse_mode() == Input::MOUSE_MODE_CAPTURED) {
 		return EditorPlugin::AFTER_GUI_INPUT_PASS;
 	}
 
@@ -867,7 +867,7 @@ EditorPlugin::AfterGUIInput GridMapEditor::forward_spatial_input_event(Camera3D
 			const real_t delta = pan_gesture->get_delta().y * 0.5;
 			accumulated_floor_delta += delta;
 			int step = 0;
-			if (ABS(accumulated_floor_delta) > 1.0) {
+			if (Math::abs(accumulated_floor_delta) > 1.0) {
 				step = SIGN(accumulated_floor_delta);
 				accumulated_floor_delta -= step;
 			}
@@ -1367,6 +1367,7 @@ GridMapEditor::GridMapEditor() {
 	settings_pick_distance->set_min(500.0f);
 	settings_pick_distance->set_step(1.0f);
 	settings_pick_distance->set_value(EDITOR_GET("editors/grid_map/pick_distance"));
+	settings_pick_distance->set_accessibility_name(TTRC("Pick Distance"));
 	settings_vbc->add_margin_child(TTR("Pick Distance:"), settings_pick_distance);
 
 	options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &GridMapEditor::_menu_option));
@@ -1384,6 +1385,7 @@ GridMapEditor::GridMapEditor() {
 	transform_mode_button->set_toggle_mode(true);
 	transform_mode_button->set_button_group(mode_buttons_group);
 	transform_mode_button->set_shortcut(ED_SHORTCUT("grid_map/transform_tool", TTRC("Transform"), Key::T, true));
+	transform_mode_button->set_accessibility_name(TTRC("Transform"));
 	transform_mode_button->connect(SceneStringName(toggled),
 			callable_mp(this, &GridMapEditor::_on_tool_mode_changed).unbind(1));
 	mode_buttons->add_child(transform_mode_button);
@@ -1396,6 +1398,7 @@ GridMapEditor::GridMapEditor() {
 	select_mode_button->set_toggle_mode(true);
 	select_mode_button->set_button_group(mode_buttons_group);
 	select_mode_button->set_shortcut(ED_SHORTCUT("grid_map/selection_tool", TTRC("Selection"), Key::Q, true));
+	select_mode_button->set_accessibility_name(TTRC("Select"));
 	select_mode_button->connect(SceneStringName(toggled),
 			callable_mp(this, &GridMapEditor::_on_tool_mode_changed).unbind(1));
 	mode_buttons->add_child(select_mode_button);
@@ -1406,6 +1409,7 @@ GridMapEditor::GridMapEditor() {
 	erase_mode_button->set_toggle_mode(true);
 	erase_mode_button->set_button_group(mode_buttons_group);
 	erase_mode_button->set_shortcut(ED_SHORTCUT("grid_map/erase_tool", TTRC("Erase"), Key::W, true));
+	erase_mode_button->set_accessibility_name(TTRC("Erase"));
 	mode_buttons->add_child(erase_mode_button);
 	erase_mode_button->connect(SceneStringName(toggled),
 			callable_mp(this, &GridMapEditor::_on_tool_mode_changed).unbind(1));
@@ -1416,6 +1420,7 @@ GridMapEditor::GridMapEditor() {
 	paint_mode_button->set_toggle_mode(true);
 	paint_mode_button->set_button_group(mode_buttons_group);
 	paint_mode_button->set_shortcut(ED_SHORTCUT("grid_map/paint_tool", TTRC("Paint"), Key::E, true));
+	paint_mode_button->set_accessibility_name(TTRC("Paint"));
 	paint_mode_button->connect(SceneStringName(toggled),
 			callable_mp(this, &GridMapEditor::_on_tool_mode_changed).unbind(1));
 	mode_buttons->add_child(paint_mode_button);
@@ -1426,6 +1431,7 @@ GridMapEditor::GridMapEditor() {
 	pick_mode_button->set_toggle_mode(true);
 	pick_mode_button->set_button_group(mode_buttons_group);
 	pick_mode_button->set_shortcut(ED_SHORTCUT("grid_map/pick_tool", TTRC("Pick"), Key::R, true));
+	pick_mode_button->set_accessibility_name(TTRC("Pick"));
 	pick_mode_button->connect(SceneStringName(toggled),
 			callable_mp(this, &GridMapEditor::_on_tool_mode_changed).unbind(1));
 	mode_buttons->add_child(pick_mode_button);
@@ -1440,6 +1446,7 @@ GridMapEditor::GridMapEditor() {
 	fill_action_button = memnew(Button);
 	fill_action_button->set_theme_type_variation(SceneStringName(FlatButton));
 	fill_action_button->set_shortcut(ED_SHORTCUT("grid_map/fill_tool", TTRC("Fill"), Key::Z, true));
+	fill_action_button->set_accessibility_name(TTRC("Fill"));
 	fill_action_button->connect(SceneStringName(pressed),
 			callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_SELECTION_FILL));
 	action_buttons->add_child(fill_action_button);
@@ -1448,6 +1455,7 @@ GridMapEditor::GridMapEditor() {
 	move_action_button = memnew(Button);
 	move_action_button->set_theme_type_variation(SceneStringName(FlatButton));
 	move_action_button->set_shortcut(ED_SHORTCUT("grid_map/move_tool", TTRC("Move"), Key::X, true));
+	fill_action_button->set_accessibility_name(TTRC("Move"));
 	move_action_button->connect(SceneStringName(pressed),
 			callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_SELECTION_CUT));
 	action_buttons->add_child(move_action_button);
@@ -1456,6 +1464,7 @@ GridMapEditor::GridMapEditor() {
 	duplicate_action_button = memnew(Button);
 	duplicate_action_button->set_theme_type_variation(SceneStringName(FlatButton));
 	duplicate_action_button->set_shortcut(ED_SHORTCUT("grid_map/duplicate_tool", TTRC("Duplicate"), Key::C, true));
+	duplicate_action_button->set_accessibility_name(TTRC("Duplicate"));
 	duplicate_action_button->connect(SceneStringName(pressed),
 			callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_SELECTION_DUPLICATE));
 	action_buttons->add_child(duplicate_action_button);
@@ -1464,6 +1473,7 @@ GridMapEditor::GridMapEditor() {
 	delete_action_button = memnew(Button);
 	delete_action_button->set_theme_type_variation(SceneStringName(FlatButton));
 	delete_action_button->set_shortcut(ED_SHORTCUT("grid_map/delete_tool", TTRC("Delete"), Key::V, true));
+	delete_action_button->set_accessibility_name(TTRC("Delete"));
 	delete_action_button->connect(SceneStringName(pressed),
 			callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_SELECTION_CLEAR));
 	action_buttons->add_child(delete_action_button);
@@ -1478,6 +1488,7 @@ GridMapEditor::GridMapEditor() {
 	rotate_x_button = memnew(Button);
 	rotate_x_button->set_theme_type_variation(SceneStringName(FlatButton));
 	rotate_x_button->set_shortcut(ED_SHORTCUT("grid_map/cursor_rotate_x", TTRC("Cursor Rotate X"), Key::A, true));
+	rotate_x_button->set_accessibility_name(TTRC("Rotate X"));
 	rotate_x_button->connect(SceneStringName(pressed),
 			callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_CURSOR_ROTATE_X));
 	rotation_buttons->add_child(rotate_x_button);
@@ -1486,6 +1497,7 @@ GridMapEditor::GridMapEditor() {
 	rotate_y_button = memnew(Button);
 	rotate_y_button->set_theme_type_variation(SceneStringName(FlatButton));
 	rotate_y_button->set_shortcut(ED_SHORTCUT("grid_map/cursor_rotate_y", TTRC("Cursor Rotate Y"), Key::S, true));
+	rotate_y_button->set_accessibility_name(TTRC("Rotate Y"));
 	rotate_y_button->connect(SceneStringName(pressed),
 			callable_mp(this, &GridMapEditor::_menu_option).bind(MENU_OPTION_CURSOR_ROTATE_Y));
 	rotation_buttons->add_child(rotate_y_button);
@@ -1509,6 +1521,7 @@ GridMapEditor::GridMapEditor() {
 	floor->set_min(-32767);
 	floor->set_max(32767);
 	floor->set_step(1);
+	floor->set_accessibility_name(TTRC("Grid Floor"));
 	floor->set_tooltip_text(
 			vformat(TTR("Change Grid Floor:\nPrevious Plane (%s)\nNext Plane (%s)"),
 					ED_GET_SHORTCUT("grid_map/previous_floor")->get_as_text(),
@@ -1523,6 +1536,7 @@ GridMapEditor::GridMapEditor() {
 	search_box = memnew(LineEdit);
 	search_box->add_theme_constant_override("minimum_character_width", 10);
 	search_box->set_placeholder(TTR("Filter Meshes"));
+	search_box->set_accessibility_name(TTRC("Filter Meshes"));
 	search_box->set_clear_button_enabled(true);
 	toolbar->add_child(search_box);
 	search_box->connect(SceneStringName(text_changed), callable_mp(this, &GridMapEditor::_text_changed));
@@ -1539,6 +1553,7 @@ GridMapEditor::GridMapEditor() {
 	mode_thumbnail = memnew(Button);
 	mode_thumbnail->set_theme_type_variation(SceneStringName(FlatButton));
 	mode_thumbnail->set_toggle_mode(true);
+	mode_thumbnail->set_accessibility_name(TTRC("View as Thumbnails"));
 	mode_thumbnail->set_pressed(true);
 	toolbar->add_child(mode_thumbnail);
 	mode_thumbnail->connect(SceneStringName(pressed), callable_mp(this, &GridMapEditor::_set_display_mode).bind(DISPLAY_THUMBNAIL));
@@ -1546,6 +1561,7 @@ GridMapEditor::GridMapEditor() {
 	mode_list = memnew(Button);
 	mode_list->set_theme_type_variation(SceneStringName(FlatButton));
 	mode_list->set_toggle_mode(true);
+	mode_list->set_accessibility_name(TTRC("View as List"));
 	mode_list->set_pressed(false);
 	toolbar->add_child(mode_list);
 	mode_list->connect(SceneStringName(pressed), callable_mp(this, &GridMapEditor::_set_display_mode).bind(DISPLAY_LIST));
@@ -1877,11 +1893,3 @@ int GridMapEditorPlugin::get_selected_palette_item() const {
 		return -1;
 	}
 }
-
-GridMapEditorPlugin::GridMapEditorPlugin() {
-}
-
-GridMapEditorPlugin::~GridMapEditorPlugin() {
-}
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/gridmap/editor/grid_map_editor_plugin.h b/engine/modules/gridmap/editor/grid_map_editor_plugin.h
index 6bab87ba..be42650f 100644
--- a/engine/modules/gridmap/editor/grid_map_editor_plugin.h
+++ b/engine/modules/gridmap/editor/grid_map_editor_plugin.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRID_MAP_EDITOR_PLUGIN_H
-#define GRID_MAP_EDITOR_PLUGIN_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "../grid_map.h"
 
@@ -295,11 +292,4 @@ public:
 	Array get_selected_cells() const;
 	void set_selected_palette_item(int p_item) const;
 	int get_selected_palette_item() const;
-
-	GridMapEditorPlugin();
-	~GridMapEditorPlugin();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // GRID_MAP_EDITOR_PLUGIN_H
diff --git a/engine/modules/gridmap/grid_map.cpp b/engine/modules/gridmap/grid_map.cpp
index 3ede11d1..ff52a67d 100644
--- a/engine/modules/gridmap/grid_map.cpp
+++ b/engine/modules/gridmap/grid_map.cpp
@@ -45,11 +45,14 @@
 #include "scene/resources/3d/sphere_shape_3d.h"
 #include "scene/resources/physics_material.h"
 #include "scene/resources/surface_tool.h"
-#include "servers/navigation_server_3d.h"
 #include "servers/rendering_server.h"
 
+#ifndef NAVIGATION_3D_DISABLED
+#include "servers/navigation_server_3d.h"
+
 Callable GridMap::_navmesh_source_geometry_parsing_callback;
 RID GridMap::_navmesh_source_geometry_parser;
+#endif // NAVIGATION_3D_DISABLED
 
 bool GridMap::_set(const StringName &p_name, const Variant &p_value) {
 	String name = p_name;
@@ -146,6 +149,7 @@ void GridMap::_get_property_list(List<PropertyInfo> *p_list) const {
 	p_list->push_back(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE));
 }
 
+#ifndef PHYSICS_3D_DISABLED
 void GridMap::set_collision_layer(uint32_t p_layer) {
 	collision_layer = p_layer;
 	_update_physics_bodies_collision_properties();
@@ -235,6 +239,7 @@ Array GridMap::get_collision_shapes() const {
 
 	return shapes;
 }
+#endif // PHYSICS_3D_DISABLED
 
 void GridMap::set_bake_navigation(bool p_bake_navigation) {
 	bake_navigation = p_bake_navigation;
@@ -245,6 +250,7 @@ bool GridMap::is_baking_navigation() {
 	return bake_navigation;
 }
 
+#ifndef NAVIGATION_3D_DISABLED
 void GridMap::set_navigation_map(RID p_navigation_map) {
 	map_override = p_navigation_map;
 	for (const KeyValue<OctantKey, Octant *> &E : octant_map) {
@@ -265,6 +271,7 @@ RID GridMap::get_navigation_map() const {
 	}
 	return RID();
 }
+#endif // NAVIGATION_3D_DISABLED
 
 void GridMap::set_mesh_library(const Ref<MeshLibrary> &p_mesh_library) {
 	if (mesh_library.is_valid()) {
@@ -338,9 +345,9 @@ void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) {
 		_recreate_octant_data();
 	}
 
-	ERR_FAIL_INDEX(ABS(p_position.x), 1 << 20);
-	ERR_FAIL_INDEX(ABS(p_position.y), 1 << 20);
-	ERR_FAIL_INDEX(ABS(p_position.z), 1 << 20);
+	ERR_FAIL_INDEX(Math::abs(p_position.x), 1 << 20);
+	ERR_FAIL_INDEX(Math::abs(p_position.y), 1 << 20);
+	ERR_FAIL_INDEX(Math::abs(p_position.z), 1 << 20);
 
 	IndexKey key;
 	key.x = p_position.x;
@@ -373,6 +380,7 @@ void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) {
 		//create octant because it does not exist
 		Octant *g = memnew(Octant);
 		g->dirty = true;
+#ifndef PHYSICS_3D_DISABLED
 		g->static_body = PhysicsServer3D::get_singleton()->body_create();
 		PhysicsServer3D::get_singleton()->body_set_mode(g->static_body, PhysicsServer3D::BODY_MODE_STATIC);
 		PhysicsServer3D::get_singleton()->body_attach_object_instance_id(g->static_body, get_instance_id());
@@ -383,6 +391,7 @@ void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) {
 			PhysicsServer3D::get_singleton()->body_set_param(g->static_body, PhysicsServer3D::BODY_PARAM_FRICTION, physics_material->computed_friction());
 			PhysicsServer3D::get_singleton()->body_set_param(g->static_body, PhysicsServer3D::BODY_PARAM_BOUNCE, physics_material->computed_bounce());
 		}
+#endif // PHYSICS_3D_DISABLED
 		SceneTree *st = SceneTree::get_singleton();
 
 		if (st && st->is_debugging_collisions_hint()) {
@@ -412,9 +421,9 @@ void GridMap::set_cell_item(const Vector3i &p_position, int p_item, int p_rot) {
 }
 
 int GridMap::get_cell_item(const Vector3i &p_position) const {
-	ERR_FAIL_INDEX_V(ABS(p_position.x), 1 << 20, INVALID_CELL_ITEM);
-	ERR_FAIL_INDEX_V(ABS(p_position.y), 1 << 20, INVALID_CELL_ITEM);
-	ERR_FAIL_INDEX_V(ABS(p_position.z), 1 << 20, INVALID_CELL_ITEM);
+	ERR_FAIL_INDEX_V(Math::abs(p_position.x), 1 << 20, INVALID_CELL_ITEM);
+	ERR_FAIL_INDEX_V(Math::abs(p_position.y), 1 << 20, INVALID_CELL_ITEM);
+	ERR_FAIL_INDEX_V(Math::abs(p_position.z), 1 << 20, INVALID_CELL_ITEM);
 
 	IndexKey key;
 	key.x = p_position.x;
@@ -428,9 +437,9 @@ int GridMap::get_cell_item(const Vector3i &p_position) const {
 }
 
 int GridMap::get_cell_item_orientation(const Vector3i &p_position) const {
-	ERR_FAIL_INDEX_V(ABS(p_position.x), 1 << 20, -1);
-	ERR_FAIL_INDEX_V(ABS(p_position.y), 1 << 20, -1);
-	ERR_FAIL_INDEX_V(ABS(p_position.z), 1 << 20, -1);
+	ERR_FAIL_INDEX_V(Math::abs(p_position.x), 1 << 20, -1);
+	ERR_FAIL_INDEX_V(Math::abs(p_position.y), 1 << 20, -1);
+	ERR_FAIL_INDEX_V(Math::abs(p_position.z), 1 << 20, -1);
 
 	IndexKey key;
 	key.x = p_position.x;
@@ -529,12 +538,15 @@ Vector3 GridMap::map_to_local(const Vector3i &p_map_position) const {
 void GridMap::_octant_transform(const OctantKey &p_key) {
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsServer3D::get_singleton()->body_set_state(g.static_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
 
 	if (g.collision_debug_instance.is_valid()) {
 		RS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform());
 	}
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef NAVIGATION_3D_DISABLED
 	// update transform for NavigationServer regions and navigation debugmesh instances
 	for (const KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) {
 		if (bake_navigation) {
@@ -546,6 +558,7 @@ void GridMap::_octant_transform(const OctantKey &p_key) {
 			}
 		}
 	}
+#endif // NAVIGATION_3D_DISABLED
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
 		RS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform());
@@ -559,6 +572,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		return false;
 	}
 
+#ifndef PHYSICS_3D_DISABLED
 	//erase body shapes
 	PhysicsServer3D::get_singleton()->body_clear_shapes(g.static_body);
 
@@ -566,7 +580,9 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 	if (g.collision_debug.is_valid()) {
 		RS::get_singleton()->mesh_clear(g.collision_debug);
 	}
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef NAVIGATION_3D_DISABLED
 	//erase navigation
 	for (KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) {
 		if (E.value.region.is_valid()) {
@@ -579,6 +595,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		}
 	}
 	g.navigation_cell_ids.clear();
+#endif // NAVIGATION_3D_DISABLED
 
 	//erase multimeshes
 
@@ -588,7 +605,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 	}
 	g.multimesh_instances.clear();
 
-	if (g.cells.size() == 0) {
+	if (g.cells.is_empty()) {
 		//octant no longer needed
 		_octant_clean_up(p_key);
 		return true;
@@ -620,7 +637,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		xform.basis = _ortho_bases[c.rot];
 		xform.set_origin(cellpos * cell_size + ofs);
 		xform.basis.scale(Vector3(cell_scale, cell_scale, cell_scale));
-		if (baked_meshes.size() == 0) {
+		if (baked_meshes.is_empty()) {
 			if (mesh_library->get_item_mesh(c.item).is_valid()) {
 				if (!multimesh_items.has(c.item)) {
 					multimesh_items[c.item] = List<Pair<Transform3D, IndexKey>>();
@@ -633,6 +650,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 			}
 		}
 
+#ifndef PHYSICS_3D_DISABLED
 		Vector<MeshLibrary::ShapeData> shapes = mesh_library->get_item_shapes(c.item);
 		// add the item's shape at given xform to octant's static_body
 		for (int i = 0; i < shapes.size(); i++) {
@@ -645,7 +663,9 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 				shapes.write[i].shape->add_vertices_to_array(col_debug, xform * shapes[i].local_transform);
 			}
 		}
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef NAVIGATION_3D_DISABLED
 		// add the item's navigation_mesh at given xform to GridMap's Navigation ancestor
 		Ref<NavigationMesh> navigation_mesh = mesh_library->get_item_navigation_mesh(c.item);
 		if (navigation_mesh.is_valid()) {
@@ -686,16 +706,17 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 			}
 			g.navigation_cell_ids[E] = nm;
 		}
+#endif // NAVIGATION_3D_DISABLED
 	}
 
-#ifdef DEBUG_ENABLED
+#if defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 	if (bake_navigation) {
 		_update_octant_navigation_debug_edge_connections_mesh(p_key);
 	}
-#endif // DEBUG_ENABLED
+#endif // defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 
 	//update multimeshes, only if not baked
-	if (baked_meshes.size() == 0) {
+	if (baked_meshes.is_empty()) {
 		for (const KeyValue<int, List<Pair<Transform3D, IndexKey>>> &E : multimesh_items) {
 			Octant::MultimeshInstance mmi;
 
@@ -736,6 +757,7 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 		}
 	}
 
+#ifndef PHYSICS_3D_DISABLED
 	if (col_debug.size()) {
 		Array arr;
 		arr.resize(RS::ARRAY_MAX);
@@ -747,12 +769,14 @@ bool GridMap::_octant_update(const OctantKey &p_key) {
 			RS::get_singleton()->mesh_surface_set_material(g.collision_debug, 0, st->get_debug_collision_material()->get_rid());
 		}
 	}
+#endif // PHYSICS_3D_DISABLED
 
 	g.dirty = false;
 
 	return false;
 }
 
+#ifndef PHYSICS_3D_DISABLED
 void GridMap::_update_physics_bodies_collision_properties() {
 	for (const KeyValue<OctantKey, Octant *> &E : octant_map) {
 		PhysicsServer3D::get_singleton()->body_set_collision_layer(E.value->static_body, collision_layer);
@@ -773,10 +797,12 @@ void GridMap::_update_physics_bodies_characteristics() {
 		PhysicsServer3D::get_singleton()->body_set_param(E.value->static_body, PhysicsServer3D::BODY_PARAM_BOUNCE, bounce);
 	}
 }
+#endif // PHYSICS_3D_DISABLED
 
 void GridMap::_octant_enter_world(const OctantKey &p_key) {
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsServer3D::get_singleton()->body_set_state(g.static_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
 	PhysicsServer3D::get_singleton()->body_set_space(g.static_body, get_world_3d()->get_space());
 
@@ -784,12 +810,14 @@ void GridMap::_octant_enter_world(const OctantKey &p_key) {
 		RS::get_singleton()->instance_set_scenario(g.collision_debug_instance, get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform());
 	}
+#endif // PHYSICS_3D_DISABLED
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
 		RS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform());
 	}
 
+#ifndef NAVIGATION_3D_DISABLED
 	if (bake_navigation && mesh_library.is_valid()) {
 		for (KeyValue<IndexKey, Octant::NavigationCell> &F : g.navigation_cell_ids) {
 			if (cell_map.has(F.key) && F.value.region.is_valid() == false) {
@@ -824,26 +852,35 @@ void GridMap::_octant_enter_world(const OctantKey &p_key) {
 		}
 #endif // DEBUG_ENABLED
 	}
+#endif // NAVIGATION_3D_DISABLED
 }
 
 void GridMap::_octant_exit_world(const OctantKey &p_key) {
 	ERR_FAIL_NULL(RenderingServer::get_singleton());
+#ifndef PHYSICS_3D_DISABLED
 	ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
+#endif // PHYSICS_3D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
+#endif // NAVIGATION_3D_DISABLED
 
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
+
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsServer3D::get_singleton()->body_set_state(g.static_body, PhysicsServer3D::BODY_STATE_TRANSFORM, get_global_transform());
 	PhysicsServer3D::get_singleton()->body_set_space(g.static_body, RID());
 
 	if (g.collision_debug_instance.is_valid()) {
 		RS::get_singleton()->instance_set_scenario(g.collision_debug_instance, RID());
 	}
+#endif // PHYSICS_3D_DISABLED
 
 	for (int i = 0; i < g.multimesh_instances.size(); i++) {
 		RS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, RID());
 	}
 
+#ifndef NAVIGATION_3D_DISABLED
 	for (KeyValue<IndexKey, Octant::NavigationCell> &F : g.navigation_cell_ids) {
 		if (F.value.region.is_valid()) {
 			NavigationServer3D::get_singleton()->free(F.value.region);
@@ -854,6 +891,7 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) {
 			F.value.navigation_mesh_debug_instance = RID();
 		}
 	}
+#endif // NAVIGATION_3D_DISABLED
 
 #ifdef DEBUG_ENABLED
 	if (bake_navigation) {
@@ -870,12 +908,17 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) {
 
 void GridMap::_octant_clean_up(const OctantKey &p_key) {
 	ERR_FAIL_NULL(RenderingServer::get_singleton());
+#ifndef PHYSICS_3D_DISABLED
 	ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
+#endif // PHYSICS_3D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
+#endif // NAVIGATION_3D_DISABLED
 
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
 
+#ifndef PHYSICS_3D_DISABLED
 	if (g.collision_debug.is_valid()) {
 		RS::get_singleton()->free(g.collision_debug);
 	}
@@ -884,7 +927,9 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
 	}
 
 	PhysicsServer3D::get_singleton()->free(g.static_body);
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef NAVIGATION_3D_DISABLED
 	// Erase navigation
 	for (const KeyValue<IndexKey, Octant::NavigationCell> &E : g.navigation_cell_ids) {
 		if (E.value.region.is_valid()) {
@@ -895,6 +940,7 @@ void GridMap::_octant_clean_up(const OctantKey &p_key) {
 		}
 	}
 	g.navigation_cell_ids.clear();
+#endif // NAVIGATION_3D_DISABLED
 
 #ifdef DEBUG_ENABLED
 	if (bake_navigation) {
@@ -933,11 +979,11 @@ void GridMap::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_ENTER_TREE: {
-#ifdef DEBUG_ENABLED
+#if defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 			if (bake_navigation && NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {
 				_update_navigation_debug_edge_connections();
 			}
-#endif // DEBUG_ENABLED
+#endif // defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 			_update_visibility();
 		} break;
 
@@ -1061,6 +1107,7 @@ void GridMap::_update_octants_callback() {
 }
 
 void GridMap::_bind_methods() {
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_collision_layer", "layer"), &GridMap::set_collision_layer);
 	ClassDB::bind_method(D_METHOD("get_collision_layer"), &GridMap::get_collision_layer);
 
@@ -1078,12 +1125,15 @@ void GridMap::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_physics_material", "material"), &GridMap::set_physics_material);
 	ClassDB::bind_method(D_METHOD("get_physics_material"), &GridMap::get_physics_material);
+#endif // PHYSICS_3D_DISABLED
 
 	ClassDB::bind_method(D_METHOD("set_bake_navigation", "bake_navigation"), &GridMap::set_bake_navigation);
 	ClassDB::bind_method(D_METHOD("is_baking_navigation"), &GridMap::is_baking_navigation);
 
+#ifndef NAVIGATION_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_navigation_map", "navigation_map"), &GridMap::set_navigation_map);
 	ClassDB::bind_method(D_METHOD("get_navigation_map"), &GridMap::get_navigation_map);
+#endif // NAVIGATION_3D_DISABLED
 
 	ClassDB::bind_method(D_METHOD("set_mesh_library", "mesh_library"), &GridMap::set_mesh_library);
 	ClassDB::bind_method(D_METHOD("get_mesh_library"), &GridMap::get_mesh_library);
@@ -1139,10 +1189,12 @@ void GridMap::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cell_center_y"), "set_center_y", "get_center_y");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cell_center_z"), "set_center_z", "get_center_z");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "cell_scale"), "set_cell_scale", "get_cell_scale");
+#ifndef PHYSICS_3D_DISABLED
 	ADD_GROUP("Collision", "collision_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_layer", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_layer", "get_collision_layer");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "collision_priority"), "set_collision_priority", "get_collision_priority");
+#endif // PHYSICS_3D_DISABLED
 	ADD_GROUP("Navigation", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "bake_navigation"), "set_bake_navigation", "is_baking_navigation");
 
@@ -1344,12 +1396,13 @@ RID GridMap::get_bake_mesh_instance(int p_idx) {
 
 GridMap::GridMap() {
 	set_notify_transform(true);
-#ifdef DEBUG_ENABLED
+#if defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 	NavigationServer3D::get_singleton()->connect("map_changed", callable_mp(this, &GridMap::_navigation_map_changed));
 	NavigationServer3D::get_singleton()->connect("navigation_debug_changed", callable_mp(this, &GridMap::_update_navigation_debug_edge_connections));
-#endif // DEBUG_ENABLED
+#endif // defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 }
 
+#ifndef NAVIGATION_3D_DISABLED
 void GridMap::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -1367,7 +1420,9 @@ void GridMap::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigat
 	}
 
 	NavigationMesh::ParsedGeometryType parsed_geometry_type = p_navigation_mesh->get_parsed_geometry_type();
+#ifndef PHYSICS_3D_DISABLED
 	uint32_t parsed_collision_mask = p_navigation_mesh->get_collision_mask();
+#endif // PHYSICS_3D_DISABLED
 
 	if (parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_MESH_INSTANCES || parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_BOTH) {
 		Array meshes = gridmap->get_meshes();
@@ -1379,7 +1434,7 @@ void GridMap::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigat
 			}
 		}
 	}
-
+#ifndef PHYSICS_3D_DISABLED
 	else if ((parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_STATIC_COLLIDERS || parsed_geometry_type == NavigationMesh::PARSED_GEOMETRY_BOTH) && (gridmap->get_collision_layer() & parsed_collision_mask)) {
 		Array shapes = gridmap->get_collision_shapes();
 		for (int i = 0; i < shapes.size(); i += 2) {
@@ -1485,9 +1540,11 @@ void GridMap::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigat
 			}
 		}
 	}
+#endif // PHYSICS_3D_DISABLED
 }
+#endif // NAVIGATION_3D_DISABLED
 
-#ifdef DEBUG_ENABLED
+#if defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 void GridMap::_update_navigation_debug_edge_connections() {
 	if (bake_navigation) {
 		for (const KeyValue<OctantKey, Octant *> &E : octant_map) {
@@ -1501,17 +1558,17 @@ void GridMap::_navigation_map_changed(RID p_map) {
 		_update_navigation_debug_edge_connections();
 	}
 }
-#endif // DEBUG_ENABLED
+#endif // defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 
 GridMap::~GridMap() {
 	clear();
-#ifdef DEBUG_ENABLED
+#if defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 	NavigationServer3D::get_singleton()->disconnect("map_changed", callable_mp(this, &GridMap::_navigation_map_changed));
 	NavigationServer3D::get_singleton()->disconnect("navigation_debug_changed", callable_mp(this, &GridMap::_update_navigation_debug_edge_connections));
-#endif // DEBUG_ENABLED
+#endif // defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 }
 
-#ifdef DEBUG_ENABLED
+#if defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 void GridMap::_update_octant_navigation_debug_edge_connections_mesh(const OctantKey &p_key) {
 	ERR_FAIL_COND(!octant_map.has(p_key));
 	Octant &g = *octant_map[p_key];
@@ -1585,7 +1642,7 @@ void GridMap::_update_octant_navigation_debug_edge_connections_mesh(const Octant
 		}
 	}
 
-	if (vertex_array.size() == 0) {
+	if (vertex_array.is_empty()) {
 		return;
 	}
 
@@ -1609,4 +1666,4 @@ void GridMap::_update_octant_navigation_debug_edge_connections_mesh(const Octant
 		RS::get_singleton()->instance_set_visible(g.navigation_debug_edge_connections_instance, false);
 	}
 }
-#endif // DEBUG_ENABLED
+#endif // defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
diff --git a/engine/modules/gridmap/grid_map.h b/engine/modules/gridmap/grid_map.h
index e82761de..b9db20fe 100644
--- a/engine/modules/gridmap/grid_map.h
+++ b/engine/modules/gridmap/grid_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRID_MAP_H
-#define GRID_MAP_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/mesh_library.h"
@@ -40,7 +39,9 @@
 
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
+#ifndef PHYSICS_3D_DISABLED
 class PhysicsMaterial;
+#endif // PHYSICS_3D_DISABLED
 
 class GridMap : public Node3D {
 	GDCLASS(GridMap, Node3D);
@@ -151,10 +152,12 @@ class GridMap : public Node3D {
 		OctantKey() {}
 	};
 
+#ifndef PHYSICS_3D_DISABLED
 	uint32_t collision_layer = 1;
 	uint32_t collision_mask = 1;
 	real_t collision_priority = 1.0;
 	Ref<PhysicsMaterial> physics_material;
+#endif // PHYSICS_3D_DISABLED
 	bool bake_navigation = false;
 	RID map_override;
 
@@ -188,18 +191,20 @@ class GridMap : public Node3D {
 		return Vector3(p_key.x, p_key.y, p_key.z) * cell_size * octant_size;
 	}
 
+#ifndef PHYSICS_3D_DISABLED
 	void _update_physics_bodies_collision_properties();
 	void _update_physics_bodies_characteristics();
+#endif // PHYSICS_3D_DISABLED
 	void _octant_enter_world(const OctantKey &p_key);
 	void _octant_exit_world(const OctantKey &p_key);
 	bool _octant_update(const OctantKey &p_key);
 	void _octant_clean_up(const OctantKey &p_key);
 	void _octant_transform(const OctantKey &p_key);
-#ifdef DEBUG_ENABLED
+#if defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 	void _update_octant_navigation_debug_edge_connections_mesh(const OctantKey &p_key);
 	void _navigation_map_changed(RID p_map);
 	void _update_navigation_debug_edge_connections();
-#endif // DEBUG_ENABLED
+#endif // defined(DEBUG_ENABLED) && !defined(NAVIGATION_3D_DISABLED)
 	bool awaiting_update = false;
 
 	void _queue_octants_dirty();
@@ -234,6 +239,7 @@ public:
 		INVALID_CELL_ITEM = -1
 	};
 
+#ifndef PHYSICS_3D_DISABLED
 	void set_collision_layer(uint32_t p_layer);
 	uint32_t get_collision_layer() const;
 
@@ -253,12 +259,15 @@ public:
 	Ref<PhysicsMaterial> get_physics_material() const;
 
 	Array get_collision_shapes() const;
+#endif // PHYSICS_3D_DISABLED
 
 	void set_bake_navigation(bool p_bake_navigation);
 	bool is_baking_navigation();
 
+#ifndef NAVIGATION_3D_DISABLED
 	void set_navigation_map(RID p_navigation_map);
 	RID get_navigation_map() const;
+#endif // NAVIGATION_3D_DISABLED
 
 	void set_mesh_library(const Ref<MeshLibrary> &p_mesh_library);
 	Ref<MeshLibrary> get_mesh_library() const;
@@ -302,16 +311,18 @@ public:
 	Array get_bake_meshes();
 	RID get_bake_mesh_instance(int p_idx);
 
+#ifndef NAVIGATION_3D_DISABLED
 private:
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
+#endif // NAVIGATION_3D_DISABLED
 
 public:
+#ifndef NAVIGATION_3D_DISABLED
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_3D_DISABLED
 
 	GridMap();
 	~GridMap();
 };
-
-#endif // GRID_MAP_H
diff --git a/engine/modules/gridmap/icons/GridMap.svg b/engine/modules/gridmap/icons/GridMap.svg
index eddeadbc..46df81ff 100644
--- a/engine/modules/gridmap/icons/GridMap.svg
+++ b/engine/modules/gridmap/icons/GridMap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m8 1-6 3v8l6 3 6-3v-2l-2-1-4 2-2-1v-4l2-1v-2l2-1zm4 2-2 1v2l2 1 2-1v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fc7f7f" d="m8 1-6 3v8l6 3 6-3v-2l-2-1-4 2-2-1v-4l2-1v-2l2-1zm4 2-2 1v2l2 1 2-1v-2z"/></svg>
diff --git a/engine/modules/gridmap/register_types.cpp b/engine/modules/gridmap/register_types.cpp
index 0b065b30..c98086aa 100644
--- a/engine/modules/gridmap/register_types.cpp
+++ b/engine/modules/gridmap/register_types.cpp
@@ -43,7 +43,9 @@
 void initialize_gridmap_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
 		GDREGISTER_CLASS(GridMap);
+#ifndef NAVIGATION_3D_DISABLED
 		GridMap::navmesh_parse_init();
+#endif // NAVIGATION_3D_DISABLED
 	}
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
diff --git a/engine/modules/gridmap/register_types.h b/engine/modules/gridmap/register_types.h
index 095bd740..1714e63f 100644
--- a/engine/modules/gridmap/register_types.h
+++ b/engine/modules/gridmap/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRIDMAP_REGISTER_TYPES_H
-#define GRIDMAP_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_gridmap_module(ModuleInitializationLevel p_level);
 void uninitialize_gridmap_module(ModuleInitializationLevel p_level);
-
-#endif // GRIDMAP_REGISTER_TYPES_H
diff --git a/engine/modules/hdr/image_loader_hdr.h b/engine/modules/hdr/image_loader_hdr.h
index 0a8e91fb..13fd5861 100644
--- a/engine/modules/hdr/image_loader_hdr.h
+++ b/engine/modules/hdr/image_loader_hdr.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_HDR_H
-#define IMAGE_LOADER_HDR_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -40,5 +39,3 @@ public:
 
 	ImageLoaderHDR();
 };
-
-#endif // IMAGE_LOADER_HDR_H
diff --git a/engine/modules/hdr/register_types.h b/engine/modules/hdr/register_types.h
index e3a71c88..0caae6c2 100644
--- a/engine/modules/hdr/register_types.h
+++ b/engine/modules/hdr/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HDR_REGISTER_TYPES_H
-#define HDR_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_hdr_module(ModuleInitializationLevel p_level);
 void uninitialize_hdr_module(ModuleInitializationLevel p_level);
-
-#endif // HDR_REGISTER_TYPES_H
diff --git a/engine/modules/interactive_music/audio_stream_interactive.cpp b/engine/modules/interactive_music/audio_stream_interactive.cpp
index d4d620b0..66c6f3e2 100644
--- a/engine/modules/interactive_music/audio_stream_interactive.cpp
+++ b/engine/modules/interactive_music/audio_stream_interactive.cpp
@@ -123,9 +123,9 @@ void AudioStreamInteractive::set_clip_stream(int p_clip, const Ref<AudioStream>
 		if (clips[p_clip].name == StringName() && p_stream.is_valid()) {
 			String n;
 			if (!clips[p_clip].stream->get_name().is_empty()) {
-				n = clips[p_clip].stream->get_name().replace(",", " ");
+				n = clips[p_clip].stream->get_name().replace_char(',', ' ');
 			} else if (clips[p_clip].stream->get_path().is_resource_file()) {
-				n = clips[p_clip].stream->get_path().get_file().get_basename().replace(",", " ");
+				n = clips[p_clip].stream->get_path().get_file().get_basename().replace_char(',', ' ');
 				n = n.capitalize();
 			}
 
@@ -173,11 +173,9 @@ int AudioStreamInteractive::get_clip_auto_advance_next_clip(int p_clip) const {
 // TRANSITIONS
 
 void AudioStreamInteractive::_set_transitions(const Dictionary &p_transitions) {
-	List<Variant> keys;
-	p_transitions.get_key_list(&keys);
-	for (const Variant &K : keys) {
-		Vector2i k = K;
-		Dictionary data = p_transitions[K];
+	for (const KeyValue<Variant, Variant> &kv : p_transitions) {
+		Vector2i k = kv.key;
+		Dictionary data = kv.value;
 		ERR_CONTINUE(!data.has("from_time"));
 		ERR_CONTINUE(!data.has("to_time"));
 		ERR_CONTINUE(!data.has("fade_mode"));
@@ -397,13 +395,13 @@ String AudioStreamInteractive::_get_streams_hint() const {
 		if (i > 0) {
 			stream_name_cache += ",";
 		}
-		String n = String(clips[i].name).replace(",", " ");
+		String n = String(clips[i].name).replace_char(',', ' ');
 
 		if (n == "" && clips[i].stream.is_valid()) {
 			if (!clips[i].stream->get_name().is_empty()) {
-				n = clips[i].stream->get_name().replace(",", " ");
+				n = clips[i].stream->get_name().replace_char(',', ' ');
 			} else if (clips[i].stream->get_path().is_resource_file()) {
-				n = clips[i].stream->get_path().get_file().replace(",", " ");
+				n = clips[i].stream->get_path().get_file().replace_char(',', ' ');
 			}
 		}
 
diff --git a/engine/modules/interactive_music/audio_stream_interactive.h b/engine/modules/interactive_music/audio_stream_interactive.h
index 15bd3248..922cf888 100644
--- a/engine/modules/interactive_music/audio_stream_interactive.h
+++ b/engine/modules/interactive_music/audio_stream_interactive.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_INTERACTIVE_H
-#define AUDIO_STREAM_INTERACTIVE_H
+#pragma once
 
 #include "servers/audio/audio_stream.h"
 
@@ -183,6 +182,8 @@ public:
 	virtual Ref<AudioStreamPlayback> instantiate_playback() override;
 	virtual String get_stream_name() const override;
 	virtual double get_length() const override { return 0; }
+	virtual bool is_meta_stream() const override { return true; }
+
 	AudioStreamInteractive();
 
 protected:
@@ -267,5 +268,3 @@ public:
 	AudioStreamPlaybackInteractive();
 	~AudioStreamPlaybackInteractive();
 };
-
-#endif // AUDIO_STREAM_INTERACTIVE_H
diff --git a/engine/modules/interactive_music/audio_stream_playlist.h b/engine/modules/interactive_music/audio_stream_playlist.h
index a30f97b7..9bd9d95f 100644
--- a/engine/modules/interactive_music/audio_stream_playlist.h
+++ b/engine/modules/interactive_music/audio_stream_playlist.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_PLAYLIST_H
-#define AUDIO_STREAM_PLAYLIST_H
+#pragma once
 
 #include "servers/audio/audio_stream.h"
 
@@ -70,6 +69,7 @@ public:
 	virtual Ref<AudioStreamPlayback> instantiate_playback() override;
 	virtual String get_stream_name() const override;
 	virtual double get_length() const override;
+	virtual bool is_meta_stream() const override { return true; }
 
 protected:
 	static void _bind_methods();
@@ -121,5 +121,3 @@ public:
 
 	~AudioStreamPlaybackPlaylist();
 };
-
-#endif // AUDIO_STREAM_PLAYLIST_H
diff --git a/engine/modules/interactive_music/audio_stream_synchronized.h b/engine/modules/interactive_music/audio_stream_synchronized.h
index 83798a13..964a5ebb 100644
--- a/engine/modules/interactive_music/audio_stream_synchronized.h
+++ b/engine/modules/interactive_music/audio_stream_synchronized.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_SYNCHRONIZED_H
-#define AUDIO_STREAM_SYNCHRONIZED_H
+#pragma once
 
 #include "servers/audio/audio_stream.h"
 
@@ -66,6 +65,8 @@ public:
 	virtual Ref<AudioStreamPlayback> instantiate_playback() override;
 	virtual String get_stream_name() const override;
 	virtual double get_length() const override;
+	virtual bool is_meta_stream() const override { return true; }
+
 	AudioStreamSynchronized();
 
 protected:
@@ -116,5 +117,3 @@ public:
 	AudioStreamPlaybackSynchronized();
 	~AudioStreamPlaybackSynchronized();
 };
-
-#endif // AUDIO_STREAM_SYNCHRONIZED_H
diff --git a/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp b/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
index a29646e4..36d2913d 100644
--- a/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
+++ b/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
@@ -115,7 +115,7 @@ void AudioStreamInteractiveTransitionEditor::_update_selection() {
 	filler_clip->set_disabled(selected.is_empty());
 	hold_previous->set_disabled(selected.is_empty());
 
-	if (selected.size() == 0) {
+	if (selected.is_empty()) {
 		return;
 	}
 
@@ -341,6 +341,7 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor()
 
 	transition_enabled = memnew(CheckBox);
 	transition_enabled->set_text(TTR("Enabled"));
+	transition_enabled->set_accessibility_name(TTRC("Use Transition"));
 	edit_vb->add_margin_child(TTR("Use Transition:"), transition_enabled);
 	transition_enabled->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited));
 
@@ -350,6 +351,7 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor()
 	transition_from->add_item(TTR("Next Beat"), AudioStreamInteractive::TRANSITION_FROM_TIME_NEXT_BEAT);
 	transition_from->add_item(TTR("Next Bar"), AudioStreamInteractive::TRANSITION_FROM_TIME_NEXT_BAR);
 	transition_from->add_item(TTR("Clip End"), AudioStreamInteractive::TRANSITION_FROM_TIME_END);
+	transition_from->set_accessibility_name(TTRC("Transition From"));
 
 	transition_from->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
 
@@ -358,25 +360,30 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor()
 	transition_to->add_item(TTR("Same Position"), AudioStreamInteractive::TRANSITION_TO_TIME_SAME_POSITION);
 	transition_to->add_item(TTR("Clip Start"), AudioStreamInteractive::TRANSITION_TO_TIME_START);
 	transition_to->add_item(TTR("Prev Position"), AudioStreamInteractive::TRANSITION_TO_TIME_PREVIOUS_POSITION);
+	transition_to->set_accessibility_name(TTRC("Transition To"));
 	transition_to->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
 
 	fade_mode = memnew(OptionButton);
 	edit_vb->add_margin_child(TTR("Fade Mode:"), fade_mode);
 	fade_mode->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
+	fade_mode->set_accessibility_name(TTRC("Fade Mode"));
 
 	fade_beats = memnew(SpinBox);
 	edit_vb->add_margin_child(TTR("Fade Beats:"), fade_beats);
 	fade_beats->set_max(16);
 	fade_beats->set_step(0.1);
 	fade_beats->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
+	fade_beats->set_accessibility_name(TTRC("Fade Beats"));
 
 	filler_clip = memnew(OptionButton);
 	edit_vb->add_margin_child(TTR("Filler Clip:"), filler_clip);
 	filler_clip->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	filler_clip->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
+	filler_clip->set_accessibility_name(TTRC("Filler Clip"));
 
 	hold_previous = memnew(CheckBox);
 	hold_previous->set_text(TTR("Enabled"));
+	hold_previous->set_accessibility_name(TTRC("Hold Previous"));
 	hold_previous->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited));
 	edit_vb->add_margin_child(TTR("Hold Previous:"), hold_previous);
 
diff --git a/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h b/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h
index 1155d70e..b7e527de 100644
--- a/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h
+++ b/engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_INTERACTIVE_EDITOR_PLUGIN_H
-#define AUDIO_STREAM_INTERACTIVE_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
@@ -106,5 +105,3 @@ public:
 
 	AudioStreamInteractiveEditorPlugin();
 };
-
-#endif // AUDIO_STREAM_INTERACTIVE_EDITOR_PLUGIN_H
diff --git a/engine/modules/interactive_music/register_types.h b/engine/modules/interactive_music/register_types.h
index 5625e28b..1e38f330 100644
--- a/engine/modules/interactive_music/register_types.h
+++ b/engine/modules/interactive_music/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INTERACTIVE_MUSIC_REGISTER_TYPES_H
-#define INTERACTIVE_MUSIC_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_interactive_music_module(ModuleInitializationLevel p_level);
 void uninitialize_interactive_music_module(ModuleInitializationLevel p_level);
-
-#endif // INTERACTIVE_MUSIC_REGISTER_TYPES_H
diff --git a/engine/modules/jolt_physics/SCsub b/engine/modules/jolt_physics/SCsub
index d4b02ec4..08500d8f 100644
--- a/engine/modules/jolt_physics/SCsub
+++ b/engine/modules/jolt_physics/SCsub
@@ -132,19 +132,14 @@ thirdparty_sources = [
     "Jolt/Skeleton/Skeleton.cpp",
     "Jolt/Skeleton/SkeletonMapper.cpp",
     "Jolt/Skeleton/SkeletonPose.cpp",
-    "Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.cpp",
-    "Jolt/TriangleGrouper/TriangleGrouperMorton.cpp",
     "Jolt/TriangleSplitter/TriangleSplitter.cpp",
     "Jolt/TriangleSplitter/TriangleSplitterBinning.cpp",
-    "Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.cpp",
-    "Jolt/TriangleSplitter/TriangleSplitterLongestAxis.cpp",
     "Jolt/TriangleSplitter/TriangleSplitterMean.cpp",
-    "Jolt/TriangleSplitter/TriangleSplitterMorton.cpp",
 ]
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_jolt.Prepend(CPPPATH=[thirdparty_dir])
+env_jolt.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 if env.dev_build:
     env_jolt.Append(CPPDEFINES=["JPH_ENABLE_ASSERTS"])
diff --git a/engine/modules/jolt_physics/config.py b/engine/modules/jolt_physics/config.py
index dea89f06..64bd1c73 100644
--- a/engine/modules/jolt_physics/config.py
+++ b/engine/modules/jolt_physics/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return not env["disable_3d"] and not env["arch"] == "ppc32"
+    return not env["disable_physics_3d"] and not env["arch"] == "ppc32"
 
 
 def configure(env):
diff --git a/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h
index 171e8457..e7b9cec3 100644
--- a/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CONE_TWIST_JOINT_3D_H
-#define JOLT_CONE_TWIST_JOINT_3D_H
+#pragma once
 
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
@@ -93,5 +92,3 @@ public:
 
 	virtual void rebuild() override;
 };
-
-#endif // JOLT_CONE_TWIST_JOINT_3D_H
diff --git a/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h
index 9d720489..5ae94910 100644
--- a/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_GENERIC_6DOF_JOINT_3D_H
-#define JOLT_GENERIC_6DOF_JOINT_3D_H
+#pragma once
 
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
@@ -123,5 +122,3 @@ public:
 
 	virtual void rebuild() override;
 };
-
-#endif // JOLT_GENERIC_6DOF_JOINT_3D_H
diff --git a/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h
index 05ac9c3e..8344c830 100644
--- a/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_hinge_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_HINGE_JOINT_3D_H
-#define JOLT_HINGE_JOINT_3D_H
+#pragma once
 
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
@@ -96,5 +95,3 @@ public:
 
 	virtual void rebuild() override;
 };
-
-#endif // JOLT_HINGE_JOINT_3D_H
diff --git a/engine/modules/jolt_physics/joints/jolt_joint_3d.cpp b/engine/modules/jolt_physics/joints/jolt_joint_3d.cpp
index 2f9a9dae..66091c0b 100644
--- a/engine/modules/jolt_physics/joints/jolt_joint_3d.cpp
+++ b/engine/modules/jolt_physics/joints/jolt_joint_3d.cpp
@@ -118,7 +118,7 @@ JoltJoint3D::JoltJoint3D(const JoltJoint3D &p_old_joint, JoltBody3D *p_body_a, J
 		body_b->add_joint(this);
 	}
 
-	if (body_b == nullptr && JoltProjectSettings::use_joint_world_node_a()) {
+	if (body_b == nullptr && JoltProjectSettings::joint_world_node == JOLT_JOINT_WORLD_NODE_A) {
 		// The joint scene nodes will, when omitting one of the two body nodes, always pass in a
 		// null `body_b` to indicate it being the "world node", regardless of which body node you
 		// leave blank. So we need to correct for that if we wish to use the arguably more intuitive
diff --git a/engine/modules/jolt_physics/joints/jolt_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_joint_3d.h
index efb21991..17456827 100644
--- a/engine/modules/jolt_physics/joints/jolt_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_JOINT_3D_H
-#define JOLT_JOINT_3D_H
+#pragma once
 
 #include "servers/physics_server_3d.h"
 
@@ -103,5 +102,3 @@ public:
 
 	virtual void rebuild() {}
 };
-
-#endif // JOLT_JOINT_3D_H
diff --git a/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h
index 55cee1ad..a6b3743f 100644
--- a/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_pin_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_PIN_JOINT_3D_H
-#define JOLT_PIN_JOINT_3D_H
+#pragma once
 
 #include "jolt_joint_3d.h"
 
@@ -60,5 +59,3 @@ public:
 
 	virtual void rebuild() override;
 };
-
-#endif // JOLT_PIN_JOINT_3D_H
diff --git a/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h b/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h
index 31ed1a4c..8f82afbe 100644
--- a/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h
+++ b/engine/modules/jolt_physics/joints/jolt_slider_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SLIDER_JOINT_3D_H
-#define JOLT_SLIDER_JOINT_3D_H
+#pragma once
 
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
@@ -92,5 +91,3 @@ public:
 
 	virtual void rebuild() override;
 };
-
-#endif // JOLT_SLIDER_JOINT_3D_H
diff --git a/engine/modules/jolt_physics/jolt_globals.h b/engine/modules/jolt_physics/jolt_globals.h
index fd3c7708..cfe94731 100644
--- a/engine/modules/jolt_physics/jolt_globals.h
+++ b/engine/modules/jolt_physics/jolt_globals.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_GLOBALS_H
-#define JOLT_GLOBALS_H
+#pragma once
 
 void jolt_initialize();
 void jolt_deinitialize();
-
-#endif // JOLT_GLOBALS_H
diff --git a/engine/modules/jolt_physics/jolt_physics_server_3d.h b/engine/modules/jolt_physics/jolt_physics_server_3d.h
index 416e3df5..869678e6 100644
--- a/engine/modules/jolt_physics/jolt_physics_server_3d.h
+++ b/engine/modules/jolt_physics/jolt_physics_server_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_PHYSICS_SERVER_3D_H
-#define JOLT_PHYSICS_SERVER_3D_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/physics_server_3d.h"
@@ -499,5 +498,3 @@ VARIANT_ENUM_CAST(JoltPhysicsServer3D::ConeTwistJointParamJolt)
 VARIANT_ENUM_CAST(JoltPhysicsServer3D::ConeTwistJointFlagJolt)
 VARIANT_ENUM_CAST(JoltPhysicsServer3D::G6DOFJointAxisParamJolt)
 VARIANT_ENUM_CAST(JoltPhysicsServer3D::G6DOFJointAxisFlagJolt)
-
-#endif // JOLT_PHYSICS_SERVER_3D_H
diff --git a/engine/modules/jolt_physics/jolt_project_settings.cpp b/engine/modules/jolt_physics/jolt_project_settings.cpp
index 7362967e..5f5bd0f2 100644
--- a/engine/modules/jolt_physics/jolt_project_settings.cpp
+++ b/engine/modules/jolt_physics/jolt_project_settings.cpp
@@ -32,15 +32,6 @@
 
 #include "core/config/project_settings.h"
 
-namespace {
-
-enum JoltJointWorldNode : int {
-	JOLT_JOINT_WORLD_NODE_A,
-	JOLT_JOINT_WORLD_NODE_B,
-};
-
-} // namespace
-
 void JoltProjectSettings::register_settings() {
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "physics/jolt_physics_3d/simulation/velocity_steps", PROPERTY_HINT_RANGE, U"2,16,or_greater"), 10);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "physics/jolt_physics_3d/simulation/position_steps", PROPERTY_HINT_RANGE, U"1,16,or_greater"), 2);
@@ -80,149 +71,53 @@ void JoltProjectSettings::register_settings() {
 	GLOBAL_DEF_RST(PropertyInfo(Variant::INT, "physics/jolt_physics_3d/limits/max_bodies", PROPERTY_HINT_RANGE, U"1,10240,or_greater"), 10240);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "physics/jolt_physics_3d/limits/max_body_pairs", PROPERTY_HINT_RANGE, U"8,65536,or_greater"), 65536);
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "physics/jolt_physics_3d/limits/max_contact_constraints", PROPERTY_HINT_RANGE, U"8,20480,or_greater"), 20480);
+
+	read_settings();
+
+	ProjectSettings::get_singleton()->connect("settings_changed", callable_mp_static(JoltProjectSettings::read_settings));
 }
 
-int JoltProjectSettings::get_simulation_velocity_steps() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/velocity_steps");
-}
+void JoltProjectSettings::read_settings() {
+	simulation_velocity_steps = GLOBAL_GET("physics/jolt_physics_3d/simulation/velocity_steps");
+	simulation_position_steps = GLOBAL_GET("physics/jolt_physics_3d/simulation/position_steps");
+	use_enhanced_internal_edge_removal_for_bodies = GLOBAL_GET("physics/jolt_physics_3d/simulation/use_enhanced_internal_edge_removal");
+	areas_detect_static_bodies = GLOBAL_GET("physics/jolt_physics_3d/simulation/areas_detect_static_bodies");
+	generate_all_kinematic_contacts = GLOBAL_GET("physics/jolt_physics_3d/simulation/generate_all_kinematic_contacts");
+	penetration_slop = GLOBAL_GET("physics/jolt_physics_3d/simulation/penetration_slop");
+	speculative_contact_distance = GLOBAL_GET("physics/jolt_physics_3d/simulation/speculative_contact_distance");
+	baumgarte_stabilization_factor = GLOBAL_GET("physics/jolt_physics_3d/simulation/baumgarte_stabilization_factor");
+	soft_body_point_radius = GLOBAL_GET("physics/jolt_physics_3d/simulation/soft_body_point_radius");
+	bounce_velocity_threshold = GLOBAL_GET("physics/jolt_physics_3d/simulation/bounce_velocity_threshold");
+	sleep_allowed = GLOBAL_GET("physics/jolt_physics_3d/simulation/allow_sleep");
+	sleep_velocity_threshold = GLOBAL_GET("physics/jolt_physics_3d/simulation/sleep_velocity_threshold");
+	sleep_time_threshold = GLOBAL_GET("physics/jolt_physics_3d/simulation/sleep_time_threshold");
+	ccd_movement_threshold = GLOBAL_GET("physics/jolt_physics_3d/simulation/continuous_cd_movement_threshold");
+	ccd_max_penetration = GLOBAL_GET("physics/jolt_physics_3d/simulation/continuous_cd_max_penetration");
+	body_pair_contact_cache_enabled = GLOBAL_GET("physics/jolt_physics_3d/simulation/body_pair_contact_cache_enabled");
+	float body_pair_cache_distance = GLOBAL_GET("physics/jolt_physics_3d/simulation/body_pair_contact_cache_distance_threshold");
+	body_pair_cache_distance_sq = body_pair_cache_distance * body_pair_cache_distance;
+	float body_pair_cache_angle = GLOBAL_GET("physics/jolt_physics_3d/simulation/body_pair_contact_cache_angle_threshold");
+	body_pair_cache_angle_cos_div2 = Math::cos(body_pair_cache_angle / 2.0f);
 
-int JoltProjectSettings::get_simulation_position_steps() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/position_steps");
-}
+	use_enhanced_internal_edge_removal_for_queries = GLOBAL_GET("physics/jolt_physics_3d/queries/use_enhanced_internal_edge_removal");
+	enable_ray_cast_face_index = GLOBAL_GET("physics/jolt_physics_3d/queries/enable_ray_cast_face_index");
 
-bool JoltProjectSettings::use_enhanced_internal_edge_removal_for_bodies() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/use_enhanced_internal_edge_removal");
-}
+	use_enhanced_internal_edge_removal_for_motion_queries = GLOBAL_GET("physics/jolt_physics_3d/motion_queries/use_enhanced_internal_edge_removal");
+	motion_query_recovery_iterations = GLOBAL_GET("physics/jolt_physics_3d/motion_queries/recovery_iterations");
+	motion_query_recovery_amount = GLOBAL_GET("physics/jolt_physics_3d/motion_queries/recovery_amount");
 
-bool JoltProjectSettings::areas_detect_static_bodies() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/areas_detect_static_bodies");
-}
+	collision_margin_fraction = GLOBAL_GET("physics/jolt_physics_3d/collisions/collision_margin_fraction");
+	float active_edge_threshold = GLOBAL_GET("physics/jolt_physics_3d/collisions/active_edge_threshold");
+	active_edge_threshold_cos = Math::cos(active_edge_threshold);
 
-bool JoltProjectSettings::should_generate_all_kinematic_contacts() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/generate_all_kinematic_contacts");
-}
+	joint_world_node = (JoltJointWorldNode)(int)GLOBAL_GET("physics/jolt_physics_3d/joints/world_node");
 
-float JoltProjectSettings::get_penetration_slop() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/penetration_slop");
-}
-
-float JoltProjectSettings::get_speculative_contact_distance() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/speculative_contact_distance");
-}
-
-float JoltProjectSettings::get_baumgarte_stabilization_factor() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/baumgarte_stabilization_factor");
-}
-
-float JoltProjectSettings::get_soft_body_point_radius() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/soft_body_point_radius");
-}
-
-float JoltProjectSettings::get_bounce_velocity_threshold() {
-	static const float value = GLOBAL_GET("physics/jolt_physics_3d/simulation/bounce_velocity_threshold");
-	return value;
-}
-
-bool JoltProjectSettings::is_sleep_allowed() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/allow_sleep");
-}
-
-float JoltProjectSettings::get_sleep_velocity_threshold() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/sleep_velocity_threshold");
-}
-
-float JoltProjectSettings::get_sleep_time_threshold() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/sleep_time_threshold");
-}
-
-float JoltProjectSettings::get_ccd_movement_threshold() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/continuous_cd_movement_threshold");
-}
-
-float JoltProjectSettings::get_ccd_max_penetration() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/continuous_cd_max_penetration");
-}
-
-bool JoltProjectSettings::is_body_pair_contact_cache_enabled() {
-	return GLOBAL_GET("physics/jolt_physics_3d/simulation/body_pair_contact_cache_enabled");
-}
-
-float JoltProjectSettings::get_body_pair_cache_distance_sq() {
-	const float value = GLOBAL_GET("physics/jolt_physics_3d/simulation/body_pair_contact_cache_distance_threshold");
-	return value * value;
-}
-
-float JoltProjectSettings::get_body_pair_cache_angle_cos_div2() {
-	return Math::cos((float)GLOBAL_GET("physics/jolt_physics_3d/simulation/body_pair_contact_cache_angle_threshold") / 2.0f);
-}
-
-bool JoltProjectSettings::use_enhanced_internal_edge_removal_for_queries() {
-	static const bool value = GLOBAL_GET("physics/jolt_physics_3d/queries/use_enhanced_internal_edge_removal");
-	return value;
-}
-
-bool JoltProjectSettings::enable_ray_cast_face_index() {
-	static const bool value = GLOBAL_GET("physics/jolt_physics_3d/queries/enable_ray_cast_face_index");
-	return value;
-}
-
-bool JoltProjectSettings::use_enhanced_internal_edge_removal_for_motion_queries() {
-	static const bool value = GLOBAL_GET("physics/jolt_physics_3d/motion_queries/use_enhanced_internal_edge_removal");
-	return value;
-}
-
-int JoltProjectSettings::get_motion_query_recovery_iterations() {
-	static const int value = GLOBAL_GET("physics/jolt_physics_3d/motion_queries/recovery_iterations");
-	return value;
-}
-
-float JoltProjectSettings::get_motion_query_recovery_amount() {
-	static const float value = GLOBAL_GET("physics/jolt_physics_3d/motion_queries/recovery_amount");
-	return value;
-}
-
-float JoltProjectSettings::get_collision_margin_fraction() {
-	static const float value = GLOBAL_GET("physics/jolt_physics_3d/collisions/collision_margin_fraction");
-	return value;
-}
-
-float JoltProjectSettings::get_active_edge_threshold() {
-	static const float value = Math::cos((float)GLOBAL_GET("physics/jolt_physics_3d/collisions/active_edge_threshold"));
-	return value;
-}
-
-bool JoltProjectSettings::use_joint_world_node_a() {
-	return (int)GLOBAL_GET("physics/jolt_physics_3d/joints/world_node") == JOLT_JOINT_WORLD_NODE_A;
-}
-
-int JoltProjectSettings::get_temp_memory_mib() {
-	return GLOBAL_GET("physics/jolt_physics_3d/limits/temporary_memory_buffer_size");
-}
-
-int64_t JoltProjectSettings::get_temp_memory_b() {
-	return get_temp_memory_mib() * 1024 * 1024;
-}
-
-float JoltProjectSettings::get_world_boundary_shape_size() {
-	return GLOBAL_GET("physics/jolt_physics_3d/limits/world_boundary_shape_size");
-}
-
-float JoltProjectSettings::get_max_linear_velocity() {
-	return GLOBAL_GET("physics/jolt_physics_3d/limits/max_linear_velocity");
-}
-
-float JoltProjectSettings::get_max_angular_velocity() {
-	return GLOBAL_GET("physics/jolt_physics_3d/limits/max_angular_velocity");
-}
-
-int JoltProjectSettings::get_max_bodies() {
-	return GLOBAL_GET("physics/jolt_physics_3d/limits/max_bodies");
-}
-
-int JoltProjectSettings::get_max_pairs() {
-	return GLOBAL_GET("physics/jolt_physics_3d/limits/max_body_pairs");
-}
-
-int JoltProjectSettings::get_max_contact_constraints() {
-	return GLOBAL_GET("physics/jolt_physics_3d/limits/max_contact_constraints");
+	temp_memory_mib = GLOBAL_GET("physics/jolt_physics_3d/limits/temporary_memory_buffer_size");
+	temp_memory_b = temp_memory_mib * 1024 * 1024;
+	world_boundary_shape_size = GLOBAL_GET("physics/jolt_physics_3d/limits/world_boundary_shape_size");
+	max_linear_velocity = GLOBAL_GET("physics/jolt_physics_3d/limits/max_linear_velocity");
+	max_angular_velocity = GLOBAL_GET("physics/jolt_physics_3d/limits/max_angular_velocity");
+	max_bodies = GLOBAL_GET("physics/jolt_physics_3d/limits/max_bodies");
+	max_body_pairs = GLOBAL_GET("physics/jolt_physics_3d/limits/max_body_pairs");
+	max_contact_constraints = GLOBAL_GET("physics/jolt_physics_3d/limits/max_contact_constraints");
 }
diff --git a/engine/modules/jolt_physics/jolt_project_settings.h b/engine/modules/jolt_physics/jolt_project_settings.h
index 48710d41..52d9eddc 100644
--- a/engine/modules/jolt_physics/jolt_project_settings.h
+++ b/engine/modules/jolt_physics/jolt_project_settings.h
@@ -28,54 +28,57 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_PROJECT_SETTINGS_H
-#define JOLT_PROJECT_SETTINGS_H
+#pragma once
 
 #include <stdint.h>
 
-class JoltProjectSettings {
-public:
-	static void register_settings();
-
-	static int get_simulation_velocity_steps();
-	static int get_simulation_position_steps();
-	static bool use_enhanced_internal_edge_removal_for_bodies();
-	static bool areas_detect_static_bodies();
-	static bool should_generate_all_kinematic_contacts();
-	static float get_penetration_slop();
-	static float get_speculative_contact_distance();
-	static float get_baumgarte_stabilization_factor();
-	static float get_soft_body_point_radius();
-	static float get_bounce_velocity_threshold();
-	static bool is_sleep_allowed();
-	static float get_sleep_velocity_threshold();
-	static float get_sleep_time_threshold();
-	static float get_ccd_movement_threshold();
-	static float get_ccd_max_penetration();
-	static bool is_body_pair_contact_cache_enabled();
-	static float get_body_pair_cache_distance_sq();
-	static float get_body_pair_cache_angle_cos_div2();
-
-	static bool use_enhanced_internal_edge_removal_for_queries();
-	static bool enable_ray_cast_face_index();
-
-	static bool use_enhanced_internal_edge_removal_for_motion_queries();
-	static int get_motion_query_recovery_iterations();
-	static float get_motion_query_recovery_amount();
-
-	static float get_collision_margin_fraction();
-	static float get_active_edge_threshold();
-
-	static bool use_joint_world_node_a();
-
-	static int get_temp_memory_mib();
-	static int64_t get_temp_memory_b();
-	static float get_world_boundary_shape_size();
-	static float get_max_linear_velocity();
-	static float get_max_angular_velocity();
-	static int get_max_bodies();
-	static int get_max_pairs();
-	static int get_max_contact_constraints();
+enum JoltJointWorldNode : int {
+	JOLT_JOINT_WORLD_NODE_A,
+	JOLT_JOINT_WORLD_NODE_B,
 };
 
-#endif // JOLT_PROJECT_SETTINGS_H
+class JoltProjectSettings {
+public:
+	inline static int simulation_velocity_steps;
+	inline static int simulation_position_steps;
+	inline static bool use_enhanced_internal_edge_removal_for_bodies;
+	inline static bool areas_detect_static_bodies;
+	inline static bool generate_all_kinematic_contacts;
+	inline static float penetration_slop;
+	inline static float speculative_contact_distance;
+	inline static float baumgarte_stabilization_factor;
+	inline static float soft_body_point_radius;
+	inline static float bounce_velocity_threshold;
+	inline static bool sleep_allowed;
+	inline static float sleep_velocity_threshold;
+	inline static float sleep_time_threshold;
+	inline static float ccd_movement_threshold;
+	inline static float ccd_max_penetration;
+	inline static bool body_pair_contact_cache_enabled;
+	inline static float body_pair_cache_distance_sq;
+	inline static float body_pair_cache_angle_cos_div2;
+
+	inline static bool use_enhanced_internal_edge_removal_for_queries;
+	inline static bool enable_ray_cast_face_index;
+
+	inline static bool use_enhanced_internal_edge_removal_for_motion_queries;
+	inline static int motion_query_recovery_iterations;
+	inline static float motion_query_recovery_amount;
+
+	inline static float collision_margin_fraction;
+	inline static float active_edge_threshold_cos;
+
+	inline static JoltJointWorldNode joint_world_node;
+
+	inline static int temp_memory_mib;
+	inline static int64_t temp_memory_b;
+	inline static float world_boundary_shape_size;
+	inline static float max_linear_velocity;
+	inline static float max_angular_velocity;
+	inline static int max_bodies;
+	inline static int max_body_pairs;
+	inline static int max_contact_constraints;
+
+	static void register_settings();
+	static void read_settings();
+};
diff --git a/engine/modules/jolt_physics/misc/jolt_math_funcs.cpp b/engine/modules/jolt_physics/misc/jolt_math_funcs.cpp
new file mode 100644
index 00000000..b0ef5f45
--- /dev/null
+++ b/engine/modules/jolt_physics/misc/jolt_math_funcs.cpp
@@ -0,0 +1,70 @@
+/**************************************************************************/
+/*  jolt_math_funcs.cpp                                                   */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+/*
+Adapted to Godot from the Jolt Physics library.
+*/
+
+/*
+Copyright 2021 Jorrit Rouwe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR
+A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "jolt_math_funcs.h"
+
+void JoltMath::decompose(Basis &p_basis, Vector3 &r_scale) {
+	Vector3 x = p_basis.get_column(Vector3::AXIS_X);
+	Vector3 y = p_basis.get_column(Vector3::AXIS_Y);
+	Vector3 z = p_basis.get_column(Vector3::AXIS_Z);
+
+	const real_t x_dot_x = x.dot(x);
+	y -= x * (y.dot(x) / x_dot_x);
+	z -= x * (z.dot(x) / x_dot_x);
+	const real_t y_dot_y = y.dot(y);
+	z -= y * (z.dot(y) / y_dot_y);
+	const real_t z_dot_z = z.dot(z);
+
+	const real_t det = x.cross(y).dot(z);
+
+	r_scale = SIGN(det) * Vector3(Math::sqrt(x_dot_x), Math::sqrt(y_dot_y), Math::sqrt(z_dot_z));
+
+	p_basis.set_column(Vector3::AXIS_X, x / r_scale.x);
+	p_basis.set_column(Vector3::AXIS_Y, y / r_scale.y);
+	p_basis.set_column(Vector3::AXIS_Z, z / r_scale.z);
+}
diff --git a/engine/modules/jolt_physics/misc/jolt_math_funcs.h b/engine/modules/jolt_physics/misc/jolt_math_funcs.h
new file mode 100644
index 00000000..cf677719
--- /dev/null
+++ b/engine/modules/jolt_physics/misc/jolt_math_funcs.h
@@ -0,0 +1,56 @@
+/**************************************************************************/
+/*  jolt_math_funcs.h                                                     */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/math/transform_3d.h"
+
+class JoltMath {
+public:
+	// Note that `p_basis` is mutated to be right-handed orthonormal.
+	static void decompose(Basis &p_basis, Vector3 &r_scale);
+
+	// Note that `p_transform` is mutated to be right-handed orthonormal.
+	static _FORCE_INLINE_ void decompose(Transform3D &p_transform, Vector3 &r_scale) {
+		decompose(p_transform.basis, r_scale);
+	}
+
+	static _FORCE_INLINE_ void decomposed(const Basis &p_basis, Basis &r_new_basis, Vector3 &r_scale) {
+		Basis new_basis = p_basis;
+		decompose(new_basis, r_scale);
+		r_new_basis = new_basis;
+	}
+
+	static _FORCE_INLINE_ void decomposed(const Transform3D &p_transform, Transform3D &r_new_transform, Vector3 &r_scale) {
+		Transform3D new_transform;
+		decompose(new_transform, r_scale);
+		r_new_transform = new_transform;
+	}
+};
diff --git a/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h b/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
index 0200a451..269f1f59 100644
--- a/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
+++ b/engine/modules/jolt_physics/misc/jolt_stream_wrappers.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_STREAM_WRAPPERS_H
-#define JOLT_STREAM_WRAPPERS_H
+#pragma once
 
 #ifdef DEBUG_ENABLED
 
@@ -77,5 +76,3 @@ public:
 };
 
 #endif
-
-#endif // JOLT_STREAM_WRAPPERS_H
diff --git a/engine/modules/jolt_physics/misc/jolt_type_conversions.h b/engine/modules/jolt_physics/misc/jolt_type_conversions.h
index f735d6e0..19abfe86 100644
--- a/engine/modules/jolt_physics/misc/jolt_type_conversions.h
+++ b/engine/modules/jolt_physics/misc/jolt_type_conversions.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_TYPE_CONVERSIONS_H
-#define JOLT_TYPE_CONVERSIONS_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/color.h"
@@ -143,5 +142,3 @@ _FORCE_INLINE_ JPH::RMat44 to_jolt_r(const Transform3D &p_transform) {
 			JPH::Vec4(b[0][2], b[1][2], b[2][2], 0.0f),
 			JPH::RVec3(o.x, o.y, o.z));
 }
-
-#endif // JOLT_TYPE_CONVERSIONS_H
diff --git a/engine/modules/jolt_physics/objects/jolt_area_3d.cpp b/engine/modules/jolt_physics/objects/jolt_area_3d.cpp
index b0a9ffd6..19fd7a09 100644
--- a/engine/modules/jolt_physics/objects/jolt_area_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_area_3d.cpp
@@ -31,6 +31,7 @@
 #include "jolt_area_3d.h"
 
 #include "../jolt_project_settings.h"
+#include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
 #include "../shapes/jolt_shape_3d.h"
 #include "../spaces/jolt_broad_phase_layer.h"
@@ -76,7 +77,7 @@ void JoltArea3D::_add_to_space() {
 	jolt_settings->mMassPropertiesOverride.mMass = 1.0f;
 	jolt_settings->mMassPropertiesOverride.mInertia = JPH::Mat44::sIdentity();
 
-	if (JoltProjectSettings::areas_detect_static_bodies()) {
+	if (JoltProjectSettings::areas_detect_static_bodies) {
 		jolt_settings->mCollideKinematicVsNonDynamic = true;
 	}
 
@@ -370,7 +371,8 @@ void JoltArea3D::set_default_area(bool p_value) {
 void JoltArea3D::set_transform(Transform3D p_transform) {
 	JOLT_ENSURE_SCALE_NOT_ZERO(p_transform, vformat("An invalid transform was passed to area '%s'.", to_string()));
 
-	const Vector3 new_scale = p_transform.basis.get_scale();
+	Vector3 new_scale;
+	JoltMath::decompose(p_transform, new_scale);
 
 	// Ideally we would do an exact comparison here, but due to floating-point precision this would be invalidated very often.
 	if (!scale.is_equal_approx(new_scale)) {
@@ -378,8 +380,6 @@ void JoltArea3D::set_transform(Transform3D p_transform) {
 		_shapes_changed();
 	}
 
-	p_transform.basis.orthonormalize();
-
 	if (!in_space()) {
 		jolt_settings->mPosition = to_jolt_r(p_transform.origin);
 		jolt_settings->mRotation = to_jolt(p_transform.basis);
diff --git a/engine/modules/jolt_physics/objects/jolt_area_3d.h b/engine/modules/jolt_physics/objects/jolt_area_3d.h
index 30e79efe..6a076c90 100644
--- a/engine/modules/jolt_physics/objects/jolt_area_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_area_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_AREA_3D_H
-#define JOLT_AREA_3D_H
+#pragma once
 
 #include "jolt_shaped_object_3d.h"
 
@@ -228,5 +227,3 @@ public:
 	virtual bool has_custom_center_of_mass() const override { return false; }
 	virtual Vector3 get_center_of_mass_custom() const override { return Vector3(); }
 };
-
-#endif // JOLT_AREA_3D_H
diff --git a/engine/modules/jolt_physics/objects/jolt_body_3d.cpp b/engine/modules/jolt_physics/objects/jolt_body_3d.cpp
index ac2b3747..9e5c437f 100644
--- a/engine/modules/jolt_physics/objects/jolt_body_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_body_3d.cpp
@@ -32,6 +32,7 @@
 
 #include "../joints/jolt_joint_3d.h"
 #include "../jolt_project_settings.h"
+#include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
 #include "../shapes/jolt_shape_3d.h"
 #include "../spaces/jolt_broad_phase_layer.h"
@@ -131,10 +132,10 @@ void JoltBody3D::_add_to_space() {
 	jolt_settings->mAllowSleeping = is_sleep_actually_allowed();
 	jolt_settings->mLinearDamping = 0.0f;
 	jolt_settings->mAngularDamping = 0.0f;
-	jolt_settings->mMaxLinearVelocity = JoltProjectSettings::get_max_linear_velocity();
-	jolt_settings->mMaxAngularVelocity = JoltProjectSettings::get_max_angular_velocity();
+	jolt_settings->mMaxLinearVelocity = JoltProjectSettings::max_linear_velocity;
+	jolt_settings->mMaxAngularVelocity = JoltProjectSettings::max_angular_velocity;
 
-	if (JoltProjectSettings::use_enhanced_internal_edge_removal_for_bodies()) {
+	if (JoltProjectSettings::use_enhanced_internal_edge_removal_for_bodies) {
 		jolt_settings->mEnhancedInternalEdgeRemoval = true;
 	}
 
@@ -543,7 +544,8 @@ JoltBody3D::~JoltBody3D() {
 void JoltBody3D::set_transform(Transform3D p_transform) {
 	JOLT_ENSURE_SCALE_NOT_ZERO(p_transform, vformat("An invalid transform was passed to physics body '%s'.", to_string()));
 
-	const Vector3 new_scale = p_transform.basis.get_scale();
+	Vector3 new_scale;
+	JoltMath::decompose(p_transform, new_scale);
 
 	// Ideally we would do an exact comparison here, but due to floating-point precision this would be invalidated very often.
 	if (!scale.is_equal_approx(new_scale)) {
@@ -551,8 +553,6 @@ void JoltBody3D::set_transform(Transform3D p_transform) {
 		_shapes_changed();
 	}
 
-	p_transform.basis.orthonormalize();
-
 	if (!in_space()) {
 		jolt_settings->mPosition = to_jolt_r(p_transform.origin);
 		jolt_settings->mRotation = to_jolt(p_transform.basis);
@@ -881,7 +881,7 @@ void JoltBody3D::set_center_of_mass_custom(const Vector3 &p_center_of_mass) {
 }
 
 void JoltBody3D::set_max_contacts_reported(int p_count) {
-	ERR_FAIL_COND(p_count < 0);
+	ERR_FAIL_INDEX(p_count, MAX_CONTACTS_REPORTED_3D_MAX);
 
 	if (unlikely((int)contacts.size() == p_count)) {
 		return;
@@ -906,7 +906,7 @@ void JoltBody3D::set_max_contacts_reported(int p_count) {
 }
 
 bool JoltBody3D::reports_all_kinematic_contacts() const {
-	return reports_contacts() && JoltProjectSettings::should_generate_all_kinematic_contacts();
+	return reports_contacts() && JoltProjectSettings::generate_all_kinematic_contacts;
 }
 
 void JoltBody3D::add_contact(const JoltBody3D *p_collider, float p_depth, int p_shape_index, int p_collider_shape_index, const Vector3 &p_normal, const Vector3 &p_position, const Vector3 &p_collider_position, const Vector3 &p_velocity, const Vector3 &p_collider_velocity, const Vector3 &p_impulse) {
diff --git a/engine/modules/jolt_physics/objects/jolt_body_3d.h b/engine/modules/jolt_physics/objects/jolt_body_3d.h
index 9b9472e7..ccf89b9b 100644
--- a/engine/modules/jolt_physics/objects/jolt_body_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_BODY_3D_H
-#define JOLT_BODY_3D_H
+#pragma once
 
 #include "jolt_physics_direct_body_state_3d.h"
 #include "jolt_shaped_object_3d.h"
@@ -305,5 +304,3 @@ public:
 	virtual bool can_interact_with(const JoltSoftBody3D &p_other) const override;
 	virtual bool can_interact_with(const JoltArea3D &p_other) const override;
 };
-
-#endif // JOLT_BODY_3D_H
diff --git a/engine/modules/jolt_physics/objects/jolt_group_filter.h b/engine/modules/jolt_physics/objects/jolt_group_filter.h
index cadffb83..7bfa405b 100644
--- a/engine/modules/jolt_physics/objects/jolt_group_filter.h
+++ b/engine/modules/jolt_physics/objects/jolt_group_filter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_GROUP_FILTER_H
-#define JOLT_GROUP_FILTER_H
+#pragma once
 
 #include "Jolt/Jolt.h"
 
@@ -47,5 +46,3 @@ public:
 	static void encode_object(const JoltObject3D *p_object, JPH::CollisionGroup::GroupID &r_group_id, JPH::CollisionGroup::SubGroupID &r_sub_group_id);
 	static const JoltObject3D *decode_object(JPH::CollisionGroup::GroupID p_group_id, JPH::CollisionGroup::SubGroupID p_sub_group_id);
 };
-
-#endif // JOLT_GROUP_FILTER_H
diff --git a/engine/modules/jolt_physics/objects/jolt_object_3d.h b/engine/modules/jolt_physics/objects/jolt_object_3d.h
index b040e135..624e506f 100644
--- a/engine/modules/jolt_physics/objects/jolt_object_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_object_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_OBJECT_3D_H
-#define JOLT_OBJECT_3D_H
+#pragma once
 
 #include "../shapes/jolt_shape_instance_3d.h"
 
@@ -152,5 +151,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_OBJECT_3D_H
diff --git a/engine/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h b/engine/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h
index e2a7ad78..77220fe9 100644
--- a/engine/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_physics_direct_body_state_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_PHYSICS_DIRECT_BODY_STATE_3D_H
-#define JOLT_PHYSICS_DIRECT_BODY_STATE_3D_H
+#pragma once
 
 #include "servers/physics_server_3d.h"
 
@@ -112,5 +111,3 @@ public:
 
 	virtual PhysicsDirectSpaceState3D *get_space_state() override;
 };
-
-#endif // JOLT_PHYSICS_DIRECT_BODY_STATE_3D_H
diff --git a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp
index bfe77e00..f32ddad0 100644
--- a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "jolt_shaped_object_3d.h"
 
+#include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
 #include "../shapes/jolt_custom_double_sided_shape.h"
 #include "../shapes/jolt_shape_3d.h"
@@ -347,7 +348,10 @@ void JoltShapedObject3D::commit_shapes(bool p_optimize_compound) {
 void JoltShapedObject3D::add_shape(JoltShape3D *p_shape, Transform3D p_transform, bool p_disabled) {
 	JOLT_ENSURE_SCALE_NOT_ZERO(p_transform, vformat("An invalid transform was passed when adding shape at index %d to physics body '%s'.", shapes.size(), to_string()));
 
-	shapes.push_back(JoltShapeInstance3D(this, p_shape, p_transform.orthonormalized(), p_transform.basis.get_scale(), p_disabled));
+	Vector3 shape_scale;
+	JoltMath::decompose(p_transform, shape_scale);
+
+	shapes.push_back(JoltShapeInstance3D(this, p_shape, p_transform, shape_scale, p_disabled));
 
 	_shapes_changed();
 }
@@ -430,8 +434,8 @@ void JoltShapedObject3D::set_shape_transform(int p_index, Transform3D p_transfor
 	ERR_FAIL_INDEX(p_index, (int)shapes.size());
 	JOLT_ENSURE_SCALE_NOT_ZERO(p_transform, "Failed to correctly set transform for shape at index %d in body '%s'.");
 
-	Vector3 new_scale = p_transform.basis.get_scale();
-	p_transform.basis.orthonormalize();
+	Vector3 new_scale;
+	JoltMath::decompose(p_transform, new_scale);
 
 	JoltShapeInstance3D &shape = shapes[p_index];
 
diff --git a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h
index dbb054de..403c1a59 100644
--- a/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_shaped_object_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SHAPED_OBJECT_3D_H
-#define JOLT_SHAPED_OBJECT_3D_H
+#pragma once
 
 #include "jolt_object_3d.h"
 
@@ -129,5 +128,3 @@ public:
 	bool is_shape_disabled(int p_index) const;
 	void set_shape_disabled(int p_index, bool p_disabled);
 };
-
-#endif // JOLT_SHAPED_OBJECT_3D_H
diff --git a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
index 040d98da..3e6a42fe 100644
--- a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
+++ b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.cpp
@@ -115,7 +115,7 @@ void JoltSoftBody3D::_add_to_space() {
 	jolt_settings->mUserData = reinterpret_cast<JPH::uint64>(this);
 	jolt_settings->mObjectLayer = _get_object_layer();
 	jolt_settings->mCollisionGroup = JPH::CollisionGroup(nullptr, group_id, sub_group_id);
-	jolt_settings->mMaxLinearVelocity = JoltProjectSettings::get_max_linear_velocity();
+	jolt_settings->mMaxLinearVelocity = JoltProjectSettings::max_linear_velocity;
 
 	const JPH::BodyID new_jolt_id = space->add_soft_body(*this, *jolt_settings);
 	if (new_jolt_id.IsInvalid()) {
@@ -148,7 +148,7 @@ bool JoltSoftBody3D::_ref_shared_data() {
 		LocalVector<int> &mesh_to_physics = iter_shared_data->value.mesh_to_physics;
 
 		JPH::SoftBodySharedSettings &settings = *iter_shared_data->value.settings;
-		settings.mVertexRadius = JoltProjectSettings::get_soft_body_point_radius();
+		settings.mVertexRadius = JoltProjectSettings::soft_body_point_radius;
 
 		JPH::Array<JPH::SoftBodySharedSettings::Vertex> &physics_vertices = settings.mVertices;
 		JPH::Array<JPH::SoftBodySharedSettings::Face> &physics_faces = settings.mFaces;
diff --git a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h
index 4d7eb039..4ec422e5 100644
--- a/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h
+++ b/engine/modules/jolt_physics/objects/jolt_soft_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SOFT_BODY_3D_H
-#define JOLT_SOFT_BODY_3D_H
+#pragma once
 
 #include "jolt_object_3d.h"
 
@@ -168,5 +167,3 @@ public:
 
 	bool is_vertex_pinned(int p_index) const;
 };
-
-#endif // JOLT_SOFT_BODY_3D_H
diff --git a/engine/modules/jolt_physics/register_types.cpp b/engine/modules/jolt_physics/register_types.cpp
index 9a3fcca8..4feb77e9 100644
--- a/engine/modules/jolt_physics/register_types.cpp
+++ b/engine/modules/jolt_physics/register_types.cpp
@@ -49,31 +49,19 @@ PhysicsServer3D *create_jolt_physics_server() {
 }
 
 void initialize_jolt_physics_module(ModuleInitializationLevel p_level) {
-	switch (p_level) {
-		case MODULE_INITIALIZATION_LEVEL_CORE: {
-		} break;
-		case MODULE_INITIALIZATION_LEVEL_SERVERS: {
-			jolt_initialize();
-			PhysicsServer3DManager::get_singleton()->register_server("Jolt Physics", callable_mp_static(&create_jolt_physics_server));
-			JoltProjectSettings::register_settings();
-		} break;
-		case MODULE_INITIALIZATION_LEVEL_SCENE: {
-		} break;
-		case MODULE_INITIALIZATION_LEVEL_EDITOR: {
-		} break;
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
+		return;
 	}
+
+	jolt_initialize();
+	PhysicsServer3DManager::get_singleton()->register_server("Jolt Physics", callable_mp_static(&create_jolt_physics_server));
+	JoltProjectSettings::register_settings();
 }
 
 void uninitialize_jolt_physics_module(ModuleInitializationLevel p_level) {
-	switch (p_level) {
-		case MODULE_INITIALIZATION_LEVEL_CORE: {
-		} break;
-		case MODULE_INITIALIZATION_LEVEL_SERVERS: {
-			jolt_deinitialize();
-		} break;
-		case MODULE_INITIALIZATION_LEVEL_SCENE: {
-		} break;
-		case MODULE_INITIALIZATION_LEVEL_EDITOR: {
-		} break;
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
+		return;
 	}
+
+	jolt_deinitialize();
 }
diff --git a/engine/modules/jolt_physics/register_types.h b/engine/modules/jolt_physics/register_types.h
index 1be106d0..c3537ee8 100644
--- a/engine/modules/jolt_physics/register_types.h
+++ b/engine/modules/jolt_physics/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_PHYSICS_REGISTER_TYPES_H
-#define JOLT_PHYSICS_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_jolt_physics_module(ModuleInitializationLevel p_level);
 void uninitialize_jolt_physics_module(ModuleInitializationLevel p_level);
-
-#endif // JOLT_PHYSICS_REGISTER_TYPES_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp
index 98c7177d..652f5309 100644
--- a/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.cpp
@@ -37,7 +37,7 @@
 
 JPH::ShapeRefC JoltBoxShape3D::_build() const {
 	const float min_half_extent = (float)half_extents[half_extents.min_axis_index()];
-	const float actual_margin = MIN(margin, min_half_extent * JoltProjectSettings::get_collision_margin_fraction());
+	const float actual_margin = MIN(margin, min_half_extent * JoltProjectSettings::collision_margin_fraction);
 
 	const JPH::BoxShapeSettings shape_settings(to_jolt(half_extents), actual_margin);
 	const JPH::ShapeSettings::ShapeResult shape_result = shape_settings.Create();
diff --git a/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.h
index 896caffe..47609985 100644
--- a/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_box_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_BOX_SHAPE_3D_H
-#define JOLT_BOX_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -53,5 +52,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_BOX_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.h
index 8e3f932e..69fae6e5 100644
--- a/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_capsule_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CAPSULE_SHAPE_3D_H
-#define JOLT_CAPSULE_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -53,5 +52,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_CAPSULE_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp
index e245738a..c8c8add1 100644
--- a/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp
@@ -69,8 +69,8 @@ JPH::ShapeRefC JoltConcavePolygonShape3D::_build() const {
 	}
 
 	JPH::MeshShapeSettings shape_settings(jolt_faces);
-	shape_settings.mActiveEdgeCosThresholdAngle = JoltProjectSettings::get_active_edge_threshold();
-	shape_settings.mPerTriangleUserData = JoltProjectSettings::enable_ray_cast_face_index();
+	shape_settings.mActiveEdgeCosThresholdAngle = JoltProjectSettings::active_edge_threshold_cos;
+	shape_settings.mPerTriangleUserData = JoltProjectSettings::enable_ray_cast_face_index;
 
 	const JPH::ShapeSettings::ShapeResult shape_result = shape_settings.Create();
 	ERR_FAIL_COND_V_MSG(shape_result.HasError(), nullptr, vformat("Failed to build Jolt Physics concave polygon shape with %s. It returned the following error: '%s'. This shape belongs to %s.", to_string(), to_godot(shape_result.GetError()), _owners_to_string()));
diff --git a/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.h
index d865c86a..68b33a0a 100644
--- a/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CONCAVE_POLYGON_SHAPE_3D_H
-#define JOLT_CONCAVE_POLYGON_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -56,5 +55,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_CONCAVE_POLYGON_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp
index 78608c62..033c4a50 100644
--- a/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp
@@ -55,7 +55,7 @@ JPH::ShapeRefC JoltConvexPolygonShape3D::_build() const {
 	}
 
 	const float min_half_extent = _calculate_aabb().get_shortest_axis_size() * 0.5f;
-	const float actual_margin = MIN(margin, min_half_extent * JoltProjectSettings::get_collision_margin_fraction());
+	const float actual_margin = MIN(margin, min_half_extent * JoltProjectSettings::collision_margin_fraction);
 
 	const JPH::ConvexHullShapeSettings shape_settings(jolt_vertices, actual_margin);
 	const JPH::ShapeSettings::ShapeResult shape_result = shape_settings.Create();
diff --git a/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.h
index f623ce75..b75424d5 100644
--- a/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CONVEX_POLYGON_SHAPE_3D_H
-#define JOLT_CONVEX_POLYGON_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -56,5 +55,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_CONVEX_POLYGON_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h
index bbdb7b90..b22ae82d 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_decorated_shape.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CUSTOM_DECORATED_SHAPE_H
-#define JOLT_CUSTOM_DECORATED_SHAPE_H
+#pragma once
 
 #include "jolt_custom_shape_type.h"
 
@@ -91,5 +90,3 @@ public:
 
 	virtual float GetVolume() const override { return mInnerShape->GetVolume(); }
 };
-
-#endif // JOLT_CUSTOM_DECORATED_SHAPE_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp b/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp
index 5d9c06df..ef24d886 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp
@@ -49,7 +49,9 @@ void collide_double_sided_vs_shape(const JPH::Shape *p_shape1, const JPH::Shape
 	const JoltCustomDoubleSidedShape *shape1 = static_cast<const JoltCustomDoubleSidedShape *>(p_shape1);
 
 	JPH::CollideShapeSettings new_collide_shape_settings = p_collide_shape_settings;
-	new_collide_shape_settings.mBackFaceMode = JPH::EBackFaceMode::CollideWithBackFaces;
+	if (shape1->should_collide_with_back_faces()) {
+		new_collide_shape_settings.mBackFaceMode = JPH::EBackFaceMode::CollideWithBackFaces;
+	}
 
 	JPH::CollisionDispatch::sCollideShapeVsShape(shape1->GetInnerShape(), p_shape2, p_scale1, p_scale2, p_center_of_mass_transform1, p_center_of_mass_transform2, p_sub_shape_id_creator1, p_sub_shape_id_creator2, new_collide_shape_settings, p_collector, p_shape_filter);
 }
@@ -60,7 +62,9 @@ void collide_shape_vs_double_sided(const JPH::Shape *p_shape1, const JPH::Shape
 	const JoltCustomDoubleSidedShape *shape2 = static_cast<const JoltCustomDoubleSidedShape *>(p_shape2);
 
 	JPH::CollideShapeSettings new_collide_shape_settings = p_collide_shape_settings;
-	new_collide_shape_settings.mBackFaceMode = JPH::EBackFaceMode::CollideWithBackFaces;
+	if (shape2->should_collide_with_back_faces()) {
+		new_collide_shape_settings.mBackFaceMode = JPH::EBackFaceMode::CollideWithBackFaces;
+	}
 
 	JPH::CollisionDispatch::sCollideShapeVsShape(p_shape1, shape2->GetInnerShape(), p_scale1, p_scale2, p_center_of_mass_transform1, p_center_of_mass_transform2, p_sub_shape_id_creator1, p_sub_shape_id_creator2, new_collide_shape_settings, p_collector, p_shape_filter);
 }
@@ -71,7 +75,9 @@ void cast_shape_vs_double_sided(const JPH::ShapeCast &p_shape_cast, const JPH::S
 	const JoltCustomDoubleSidedShape *shape = static_cast<const JoltCustomDoubleSidedShape *>(p_shape);
 
 	JPH::ShapeCastSettings new_shape_cast_settings = p_shape_cast_settings;
-	new_shape_cast_settings.mBackFaceModeTriangles = JPH::EBackFaceMode::CollideWithBackFaces;
+	if (shape->should_collide_with_back_faces()) {
+		new_shape_cast_settings.mBackFaceModeTriangles = JPH::EBackFaceMode::CollideWithBackFaces;
+	}
 
 	JPH::CollisionDispatch::sCastShapeVsShapeLocalSpace(p_shape_cast, new_shape_cast_settings, shape->GetInnerShape(), p_scale, p_shape_filter, p_center_of_mass_transform2, p_sub_shape_id_creator1, p_sub_shape_id_creator2, p_collector);
 }
@@ -104,8 +110,7 @@ void JoltCustomDoubleSidedShape::register_type() {
 
 void JoltCustomDoubleSidedShape::CastRay(const JPH::RayCast &p_ray, const JPH::RayCastSettings &p_ray_cast_settings, const JPH::SubShapeIDCreator &p_sub_shape_id_creator, JPH::CastRayCollector &p_collector, const JPH::ShapeFilter &p_shape_filter) const {
 	JPH::RayCastSettings new_ray_cast_settings = p_ray_cast_settings;
-
-	if (!back_face_collision) {
+	if (!should_collide_with_back_faces()) {
 		new_ray_cast_settings.SetBackFaceMode(JPH::EBackFaceMode::IgnoreBackFaces);
 	}
 
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.h
index 664b633a..962d2261 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_double_sided_shape.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CUSTOM_DOUBLE_SIDED_SHAPE_H
-#define JOLT_CUSTOM_DOUBLE_SIDED_SHAPE_H
+#pragma once
 
 #include "jolt_custom_decorated_shape.h"
 #include "jolt_custom_shape_type.h"
@@ -69,6 +68,6 @@ public:
 			JoltCustomDecoratedShape(JoltCustomShapeSubType::DOUBLE_SIDED, p_inner_shape), back_face_collision(p_back_face_collision) {}
 
 	virtual void CastRay(const JPH::RayCast &p_ray, const JPH::RayCastSettings &p_ray_cast_settings, const JPH::SubShapeIDCreator &p_sub_shape_id_creator, JPH::CastRayCollector &p_collector, const JPH::ShapeFilter &p_shape_filter = JPH::ShapeFilter()) const override;
-};
 
-#endif // JOLT_CUSTOM_DOUBLE_SIDED_SHAPE_H
+	bool should_collide_with_back_faces() const { return back_face_collision; }
+};
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h
index 329b5b85..79201ed3 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_motion_shape.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CUSTOM_MOTION_SHAPE_H
-#define JOLT_CUSTOM_MOTION_SHAPE_H
+#pragma once
 
 #include "jolt_custom_shape_type.h"
 
@@ -113,5 +112,3 @@ public:
 
 	void set_motion(JPH::Vec3Arg p_motion) { motion = p_motion; }
 };
-
-#endif // JOLT_CUSTOM_MOTION_SHAPE_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h
index faa0a1f7..fb0f95a0 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_ray_shape.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CUSTOM_RAY_SHAPE_H
-#define JOLT_CUSTOM_RAY_SHAPE_H
+#pragma once
 
 #include "jolt_custom_shape_type.h"
 
@@ -103,5 +102,3 @@ public:
 
 	virtual const JPH::ConvexShape::Support *GetSupportFunction(JPH::ConvexShape::ESupportMode p_mode, JPH::ConvexShape::SupportBuffer &p_buffer, JPH::Vec3Arg p_scale) const override;
 };
-
-#endif // JOLT_CUSTOM_RAY_SHAPE_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h b/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h
index 77371640..5e22c507 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_shape_type.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CUSTOM_SHAPE_TYPE_H
-#define JOLT_CUSTOM_SHAPE_TYPE_H
+#pragma once
 
 #include "Jolt/Jolt.h"
 
@@ -43,5 +42,3 @@ constexpr JPH::EShapeSubType RAY = JPH::EShapeSubType::UserConvex1;
 constexpr JPH::EShapeSubType MOTION = JPH::EShapeSubType::UserConvex2;
 
 } // namespace JoltCustomShapeSubType
-
-#endif // JOLT_CUSTOM_SHAPE_TYPE_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.h b/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.h
index a6610c74..ed72909c 100644
--- a/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.h
+++ b/engine/modules/jolt_physics/shapes/jolt_custom_user_data_shape.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CUSTOM_USER_DATA_SHAPE_H
-#define JOLT_CUSTOM_USER_DATA_SHAPE_H
+#pragma once
 
 #include "jolt_custom_decorated_shape.h"
 #include "jolt_custom_shape_type.h"
@@ -57,5 +56,3 @@ public:
 
 	virtual JPH::uint64 GetSubShapeUserData(const JPH::SubShapeID &p_sub_shape_id) const override { return GetUserData(); }
 };
-
-#endif // JOLT_CUSTOM_USER_DATA_SHAPE_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp
index 0d6371b1..3467f0b2 100644
--- a/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp
@@ -38,7 +38,7 @@
 JPH::ShapeRefC JoltCylinderShape3D::_build() const {
 	const float half_height = height / 2.0f;
 	const float min_half_extent = MIN(half_height, radius);
-	const float actual_margin = MIN(margin, min_half_extent * JoltProjectSettings::get_collision_margin_fraction());
+	const float actual_margin = MIN(margin, min_half_extent * JoltProjectSettings::collision_margin_fraction);
 
 	const JPH::CylinderShapeSettings shape_settings(half_height, radius, actual_margin);
 	const JPH::ShapeSettings::ShapeResult shape_result = shape_settings.Create();
diff --git a/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.h
index 889a038c..d825fcc8 100644
--- a/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_cylinder_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CYLINDER_SHAPE_3D_H
-#define JOLT_CYLINDER_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -54,5 +53,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_CYLINDER_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp
index 29672a76..2855ec88 100644
--- a/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp
@@ -103,10 +103,10 @@ JPH::ShapeRefC JoltHeightMapShape3D::_build_height_field() const {
 		}
 	}
 
-	JPH::HeightFieldShapeSettings shape_settings(heights_rev.ptr(), JPH::Vec3(offset_x, 0, offset_y), JPH::Vec3::sReplicate(1.0f), (JPH::uint32)width);
+	JPH::HeightFieldShapeSettings shape_settings(heights_rev.ptr(), JPH::Vec3(offset_x, 0, offset_y), JPH::Vec3::sOne(), (JPH::uint32)width);
 
 	shape_settings.mBitsPerSample = shape_settings.CalculateBitsPerSampleForError(0.0f);
-	shape_settings.mActiveEdgeCosThresholdAngle = JoltProjectSettings::get_active_edge_threshold();
+	shape_settings.mActiveEdgeCosThresholdAngle = JoltProjectSettings::active_edge_threshold_cos;
 
 	const JPH::ShapeSettings::ShapeResult shape_result = shape_settings.Create();
 	ERR_FAIL_COND_V_MSG(shape_result.HasError(), nullptr, vformat("Failed to build Jolt Physics height map shape with %s. It returned the following error: '%s'. This shape belongs to %s.", to_string(), to_godot(shape_result.GetError()), _owners_to_string()));
@@ -160,7 +160,7 @@ JPH::ShapeRefC JoltHeightMapShape3D::_build_mesh() const {
 	}
 
 	JPH::MeshShapeSettings shape_settings(std::move(vertices), std::move(indices));
-	shape_settings.mActiveEdgeCosThresholdAngle = JoltProjectSettings::get_active_edge_threshold();
+	shape_settings.mActiveEdgeCosThresholdAngle = JoltProjectSettings::active_edge_threshold_cos;
 
 	const JPH::ShapeSettings::ShapeResult shape_result = shape_settings.Create();
 	ERR_FAIL_COND_V_MSG(shape_result.HasError(), nullptr, vformat("Failed to build Jolt Physics height map shape (as polygon) with %s. It returned the following error: '%s'. This shape belongs to %s.", to_string(), to_godot(shape_result.GetError()), _owners_to_string()));
diff --git a/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.h
index a929970f..0b9471d9 100644
--- a/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_height_map_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_HEIGHT_MAP_SHAPE_3D_H
-#define JOLT_HEIGHT_MAP_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -65,5 +64,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_HEIGHT_MAP_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_separation_ray_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_separation_ray_shape_3d.h
index b858d84f..b69ae270 100644
--- a/engine/modules/jolt_physics/shapes/jolt_separation_ray_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_separation_ray_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SEPARATION_RAY_SHAPE_3D_H
-#define JOLT_SEPARATION_RAY_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -53,5 +52,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_SEPARATION_RAY_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_shape_3d.h
index a7645ec6..fc101dc7 100644
--- a/engine/modules/jolt_physics/shapes/jolt_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SHAPE_3D_H
-#define JOLT_SHAPE_3D_H
+#pragma once
 
 #include "servers/physics_server_3d.h"
 
@@ -132,5 +131,3 @@ public:
 		(m_scale) = valid_scale;                                                     \
 	} else                                                                           \
 		((void)0)
-
-#endif // JOLT_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h b/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h
index 0a24d06a..ebb08c74 100644
--- a/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_shape_instance_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SHAPE_INSTANCE_3D_H
-#define JOLT_SHAPE_INSTANCE_3D_H
+#pragma once
 
 #include "core/math/transform_3d.h"
 
@@ -99,5 +98,3 @@ public:
 
 	bool try_build();
 };
-
-#endif // JOLT_SHAPE_INSTANCE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.h
index 4127f6a5..7ff159d9 100644
--- a/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_sphere_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SPHERE_SHAPE_3D_H
-#define JOLT_SPHERE_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -52,5 +51,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_SPHERE_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp b/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp
index 7d9b0753..7f6ba20e 100644
--- a/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp
+++ b/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp
@@ -39,7 +39,7 @@ JPH::ShapeRefC JoltWorldBoundaryShape3D::_build() const {
 	const Plane normalized_plane = plane.normalized();
 	ERR_FAIL_COND_V_MSG(normalized_plane == Plane(), nullptr, vformat("Failed to build Jolt Physics world boundary shape with %s. The plane's normal must not be zero. This shape belongs to %s.", to_string(), _owners_to_string()));
 
-	const float half_size = JoltProjectSettings::get_world_boundary_shape_size() / 2.0f;
+	const float half_size = JoltProjectSettings::world_boundary_shape_size / 2.0f;
 	const JPH::PlaneShapeSettings shape_settings(to_jolt(normalized_plane), nullptr, half_size);
 	const JPH::ShapeSettings::ShapeResult shape_result = shape_settings.Create();
 	ERR_FAIL_COND_V_MSG(shape_result.HasError(), nullptr, vformat("Failed to build Jolt Physics world boundary shape with %s. It returned the following error: '%s'. This shape belongs to %s.", to_string(), to_godot(shape_result.GetError()), _owners_to_string()));
@@ -65,7 +65,7 @@ void JoltWorldBoundaryShape3D::set_data(const Variant &p_data) {
 }
 
 AABB JoltWorldBoundaryShape3D::get_aabb() const {
-	const float size = JoltProjectSettings::get_world_boundary_shape_size();
+	const float size = JoltProjectSettings::world_boundary_shape_size;
 	const float half_size = size / 2.0f;
 	return AABB(Vector3(-half_size, -half_size, -half_size), Vector3(size, half_size, size));
 }
diff --git a/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.h b/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.h
index 2d22c0f5..ebe11385 100644
--- a/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.h
+++ b/engine/modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_WORLD_BOUNDARY_SHAPE_3D_H
-#define JOLT_WORLD_BOUNDARY_SHAPE_3D_H
+#pragma once
 
 #include "jolt_shape_3d.h"
 
@@ -52,5 +51,3 @@ public:
 
 	String to_string() const;
 };
-
-#endif // JOLT_WORLD_BOUNDARY_SHAPE_3D_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_body_accessor_3d.h b/engine/modules/jolt_physics/spaces/jolt_body_accessor_3d.h
index f1a88962..6e79c463 100644
--- a/engine/modules/jolt_physics/spaces/jolt_body_accessor_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_body_accessor_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_BODY_ACCESSOR_3D_H
-#define JOLT_BODY_ACCESSOR_3D_H
+#pragma once
 
 #include "../objects/jolt_object_3d.h"
 
@@ -210,5 +209,3 @@ typedef JoltAccessibleBody3D<JoltScopedBodyWriter3D, JPH::Body> JoltWritableBody
 
 typedef JoltAccessibleBodies3D<JoltScopedBodyReader3D, const JPH::Body> JoltReadableBodies3D;
 typedef JoltAccessibleBodies3D<JoltScopedBodyWriter3D, JPH::Body> JoltWritableBodies3D;
-
-#endif // JOLT_BODY_ACCESSOR_3D_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h b/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h
index 8cc115e1..6ebb3c52 100644
--- a/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h
+++ b/engine/modules/jolt_physics/spaces/jolt_broad_phase_layer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_BROAD_PHASE_LAYER_H
-#define JOLT_BROAD_PHASE_LAYER_H
+#pragma once
 
 #include "Jolt/Jolt.h"
 
@@ -48,5 +47,3 @@ constexpr JPH::BroadPhaseLayer AREA_UNDETECTABLE(4);
 constexpr uint32_t COUNT = 5;
 
 } // namespace JoltBroadPhaseLayer
-
-#endif // JOLT_BROAD_PHASE_LAYER_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp
index ae078840..680b341d 100644
--- a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp
@@ -200,7 +200,7 @@ bool JoltContactListener3D::_try_add_contacts(const JPH::Body &p_jolt_body1, con
 	manifold.depth = p_manifold.mPenetrationDepth;
 
 	JPH::CollisionEstimationResult collision;
-	JPH::EstimateCollisionResponse(p_jolt_body1, p_jolt_body2, p_manifold, collision, p_settings.mCombinedFriction, p_settings.mCombinedRestitution, JoltProjectSettings::get_bounce_velocity_threshold(), 5);
+	JPH::EstimateCollisionResponse(p_jolt_body1, p_jolt_body2, p_manifold, collision, p_settings.mCombinedFriction, p_settings.mCombinedRestitution, JoltProjectSettings::bounce_velocity_threshold, 5);
 
 	for (JPH::uint i = 0; i < contact_count; ++i) {
 		const JPH::RVec3 relative_point1 = JPH::RVec3(p_manifold.mRelativeContactPointsOn1[i]);
diff --git a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h
index e18a8a9b..ffef791a 100644
--- a/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_contact_listener_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_CONTACT_LISTENER_3D_H
-#define JOLT_CONTACT_LISTENER_3D_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
@@ -44,7 +43,6 @@
 #include "Jolt/Physics/Collision/ContactListener.h"
 #include "Jolt/Physics/SoftBody/SoftBodyContactListener.h"
 
-#include <stdint.h>
 #include <new>
 
 class JoltShapedObject3D;
@@ -138,5 +136,3 @@ public:
 	void set_max_debug_contacts(int p_count) { debug_contacts.resize(p_count); }
 #endif
 };
-
-#endif // JOLT_CONTACT_LISTENER_3D_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_job_system.h b/engine/modules/jolt_physics/spaces/jolt_job_system.h
index 573a8b17..a64f8d42 100644
--- a/engine/modules/jolt_physics/spaces/jolt_job_system.h
+++ b/engine/modules/jolt_physics/spaces/jolt_job_system.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_JOB_SYSTEM_H
-#define JOLT_JOB_SYSTEM_H
+#pragma once
 
 #include "core/os/spin_lock.h"
 #include "core/templates/hash_map.h"
@@ -39,7 +38,6 @@
 #include "Jolt/Core/FixedSizeFreeList.h"
 #include "Jolt/Core/JobSystemWithBarrier.h"
 
-#include <stdint.h>
 #include <atomic>
 
 class JoltJobSystem final : public JPH::JobSystemWithBarrier {
@@ -103,5 +101,3 @@ public:
 	void flush_timings();
 #endif
 };
-
-#endif // JOLT_JOB_SYSTEM_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_layers.cpp b/engine/modules/jolt_physics/spaces/jolt_layers.cpp
index ccf7bee9..d591dce5 100644
--- a/engine/modules/jolt_physics/spaces/jolt_layers.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_layers.cpp
@@ -64,7 +64,7 @@ public:
 		allow_collision(AREA_UNDETECTABLE, BODY_DYNAMIC);
 		allow_collision(AREA_UNDETECTABLE, AREA_DETECTABLE);
 
-		if (JoltProjectSettings::areas_detect_static_bodies()) {
+		if (JoltProjectSettings::areas_detect_static_bodies) {
 			allow_collision(BODY_STATIC, AREA_DETECTABLE);
 			allow_collision(BODY_STATIC, AREA_UNDETECTABLE);
 			allow_collision(BODY_STATIC_BIG, AREA_DETECTABLE);
diff --git a/engine/modules/jolt_physics/spaces/jolt_layers.h b/engine/modules/jolt_physics/spaces/jolt_layers.h
index 8299b956..59f49b52 100644
--- a/engine/modules/jolt_physics/spaces/jolt_layers.h
+++ b/engine/modules/jolt_physics/spaces/jolt_layers.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_LAYERS_H
-#define JOLT_LAYERS_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
@@ -39,8 +38,6 @@
 #include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
 #include "Jolt/Physics/Collision/ObjectLayer.h"
 
-#include <stdint.h>
-
 class JoltLayers final
 		: public JPH::BroadPhaseLayerInterface,
 		  public JPH::ObjectLayerPairFilter,
@@ -68,5 +65,3 @@ public:
 	JPH::ObjectLayer to_object_layer(JPH::BroadPhaseLayer p_broad_phase_layer, uint32_t p_collision_layer, uint32_t p_collision_mask);
 	void from_object_layer(JPH::ObjectLayer p_encoded_layer, JPH::BroadPhaseLayer &r_broad_phase_layer, uint32_t &r_collision_layer, uint32_t &r_collision_mask) const;
 };
-
-#endif // JOLT_LAYERS_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h b/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h
index 1a3bd637..8b44c892 100644
--- a/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_motion_filter_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_MOTION_FILTER_3D_H
-#define JOLT_MOTION_FILTER_3D_H
+#pragma once
 
 #include "core/object/object_id.h"
 #include "core/templates/hash_set.h"
@@ -68,5 +67,3 @@ public:
 	virtual bool ShouldCollide(const JPH::Shape *p_jolt_shape, const JPH::SubShapeID &p_jolt_shape_id) const override;
 	virtual bool ShouldCollide(const JPH::Shape *p_jolt_shape_self, const JPH::SubShapeID &p_jolt_shape_id_self, const JPH::Shape *p_jolt_shape_other, const JPH::SubShapeID &p_jolt_shape_id_other) const override;
 };
-
-#endif // JOLT_MOTION_FILTER_3D_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp
index 3852e42d..30694956 100644
--- a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.cpp
@@ -32,6 +32,7 @@
 
 #include "../jolt_physics_server_3d.h"
 #include "../jolt_project_settings.h"
+#include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
 #include "../objects/jolt_area_3d.h"
 #include "../objects/jolt_body_3d.h"
@@ -110,7 +111,7 @@ bool JoltPhysicsDirectSpaceState3D::_cast_motion_impl(const JPH::Shape &p_jolt_s
 	};
 
 	// Figure out the number of steps we need in our binary search in order to achieve millimeter precision, within reason.
-	const int step_count = CLAMP(int(logf(1000.0f * motion_length) / (float)Math_LN2), 4, 16);
+	const int step_count = CLAMP(int(logf(1000.0f * motion_length) / (float)Math::LN2), 4, 16);
 
 	bool collided = false;
 
@@ -171,9 +172,6 @@ bool JoltPhysicsDirectSpaceState3D::_cast_motion_impl(const JPH::Shape &p_jolt_s
 }
 
 bool JoltPhysicsDirectSpaceState3D::_body_motion_recover(const JoltBody3D &p_body, const Transform3D &p_transform, float p_margin, const HashSet<RID> &p_excluded_bodies, const HashSet<ObjectID> &p_excluded_objects, Vector3 &r_recovery) const {
-	const int recovery_iterations = JoltProjectSettings::get_motion_query_recovery_iterations();
-	const float recovery_amount = JoltProjectSettings::get_motion_query_recovery_amount();
-
 	const JPH::Shape *jolt_shape = p_body.get_jolt_shape();
 
 	const Vector3 com_scaled = to_godot(jolt_shape->GetCenterOfMass());
@@ -189,10 +187,10 @@ bool JoltPhysicsDirectSpaceState3D::_body_motion_recover(const JoltBody3D &p_bod
 
 	bool recovered = false;
 
-	for (int i = 0; i < recovery_iterations; ++i) {
+	for (int i = 0; i < JoltProjectSettings::motion_query_recovery_iterations; ++i) {
 		collector.reset();
 
-		_collide_shape_kinematics(jolt_shape, JPH::Vec3::sReplicate(1.0f), to_jolt_r(transform_com), settings, to_jolt_r(base_offset), collector, motion_filter, motion_filter, motion_filter, motion_filter);
+		_collide_shape_kinematics(jolt_shape, JPH::Vec3::sOne(), to_jolt_r(transform_com), settings, to_jolt_r(base_offset), collector, motion_filter, motion_filter, motion_filter, motion_filter);
 
 		if (!collector.had_hit()) {
 			break;
@@ -240,7 +238,7 @@ bool JoltPhysicsDirectSpaceState3D::_body_motion_recover(const JoltBody3D &p_bod
 			const JoltBody3D *other_body = other_jolt_body.as_body();
 			ERR_CONTINUE(other_body == nullptr);
 
-			const float recovery_distance = penetration_depth * recovery_amount;
+			const float recovery_distance = penetration_depth * JoltProjectSettings::motion_query_recovery_amount;
 			const float other_priority = other_body->get_collision_priority();
 			const float other_priority_normalized = other_priority / average_priority;
 			const float scaled_recovery_distance = recovery_distance * other_priority_normalized;
@@ -288,15 +286,14 @@ bool JoltPhysicsDirectSpaceState3D::_body_motion_cast(const JoltBody3D &p_body,
 		const Transform3D transform_com_local = transform_local.translated_local(com_scaled);
 		Transform3D transform_com = body_transform * transform_com_local;
 
-		Vector3 scale = transform_com.basis.get_scale();
+		Vector3 scale;
+		JoltMath::decompose(transform_com, scale);
 		JOLT_ENSURE_SCALE_VALID(jolt_shape, scale, "body_test_motion was passed an invalid transform along with body '%s'. This results in invalid scaling for shape at index %d.");
 
-		transform_com.basis.orthonormalize();
-
 		real_t shape_safe_fraction = 1.0;
 		real_t shape_unsafe_fraction = 1.0;
 
-		collided |= _cast_motion_impl(*jolt_shape, transform_com, scale, p_motion, JoltProjectSettings::use_enhanced_internal_edge_removal_for_motion_queries(), false, settings, motion_filter, motion_filter, motion_filter, motion_filter, shape_safe_fraction, shape_unsafe_fraction);
+		collided |= _cast_motion_impl(*jolt_shape, transform_com, scale, p_motion, JoltProjectSettings::use_enhanced_internal_edge_removal_for_motion_queries, false, settings, motion_filter, motion_filter, motion_filter, motion_filter, shape_safe_fraction, shape_unsafe_fraction);
 
 		r_safe_fraction = MIN(r_safe_fraction, shape_safe_fraction);
 		r_unsafe_fraction = MIN(r_unsafe_fraction, shape_unsafe_fraction);
@@ -323,7 +320,7 @@ bool JoltPhysicsDirectSpaceState3D::_body_motion_collide(const JoltBody3D &p_bod
 
 	const JoltMotionFilter3D motion_filter(p_body, p_excluded_bodies, p_excluded_objects);
 	JoltQueryCollectorClosestMulti<JPH::CollideShapeCollector, 32> collector(p_max_collisions);
-	_collide_shape_kinematics(jolt_shape, JPH::Vec3::sReplicate(1.0f), to_jolt_r(transform_com), settings, to_jolt_r(base_offset), collector, motion_filter, motion_filter, motion_filter, motion_filter);
+	_collide_shape_kinematics(jolt_shape, JPH::Vec3::sOne(), to_jolt_r(transform_com), settings, to_jolt_r(base_offset), collector, motion_filter, motion_filter, motion_filter, motion_filter);
 
 	if (!collector.had_hit() || p_result == nullptr) {
 		return collector.had_hit();
@@ -400,7 +397,7 @@ bool JoltPhysicsDirectSpaceState3D::_body_motion_collide(const JoltBody3D &p_bod
 }
 
 int JoltPhysicsDirectSpaceState3D::_try_get_face_index(const JPH::Body &p_body, const JPH::SubShapeID &p_sub_shape_id) {
-	if (!JoltProjectSettings::enable_ray_cast_face_index()) {
+	if (!JoltProjectSettings::enable_ray_cast_face_index) {
 		return -1;
 	}
 
@@ -421,7 +418,7 @@ void JoltPhysicsDirectSpaceState3D::_generate_manifold(const JPH::CollideShapeRe
 	const JPH::PhysicsSettings &physics_settings = physics_system.GetPhysicsSettings();
 	const JPH::Vec3 penetration_axis = p_hit.mPenetrationAxis.Normalized();
 
-	JPH::ManifoldBetweenTwoFaces(p_hit.mContactPointOn1, p_hit.mContactPointOn2, penetration_axis, physics_settings.mManifoldToleranceSq, p_hit.mShape1Face, p_hit.mShape2Face, r_contact_points1, r_contact_points2 JPH_IF_DEBUG_RENDERER(, p_center_of_mass));
+	JPH::ManifoldBetweenTwoFaces(p_hit.mContactPointOn1, p_hit.mContactPointOn2, penetration_axis, physics_settings.mManifoldTolerance, p_hit.mShape1Face, p_hit.mShape2Face, r_contact_points1, r_contact_points2 JPH_IF_DEBUG_RENDERER(, p_center_of_mass));
 
 	if (r_contact_points1.size() > 4) {
 		JPH::PruneContactPoints(penetration_axis, r_contact_points1, r_contact_points2 JPH_IF_DEBUG_RENDERER(, p_center_of_mass));
@@ -439,7 +436,7 @@ void JoltPhysicsDirectSpaceState3D::_collide_shape_queries(
 		const JPH::ObjectLayerFilter &p_object_layer_filter,
 		const JPH::BodyFilter &p_body_filter,
 		const JPH::ShapeFilter &p_shape_filter) const {
-	if (JoltProjectSettings::use_enhanced_internal_edge_removal_for_queries()) {
+	if (JoltProjectSettings::use_enhanced_internal_edge_removal_for_queries) {
 		space->get_narrow_phase_query().CollideShapeWithInternalEdgeRemoval(p_shape, p_scale, p_transform_com, p_settings, p_base_offset, p_collector, p_broad_phase_layer_filter, p_object_layer_filter, p_body_filter, p_shape_filter);
 	} else {
 		space->get_narrow_phase_query().CollideShape(p_shape, p_scale, p_transform_com, p_settings, p_base_offset, p_collector, p_broad_phase_layer_filter, p_object_layer_filter, p_body_filter, p_shape_filter);
@@ -457,7 +454,7 @@ void JoltPhysicsDirectSpaceState3D::_collide_shape_kinematics(
 		const JPH::ObjectLayerFilter &p_object_layer_filter,
 		const JPH::BodyFilter &p_body_filter,
 		const JPH::ShapeFilter &p_shape_filter) const {
-	if (JoltProjectSettings::use_enhanced_internal_edge_removal_for_motion_queries()) {
+	if (JoltProjectSettings::use_enhanced_internal_edge_removal_for_motion_queries) {
 		space->get_narrow_phase_query().CollideShapeWithInternalEdgeRemoval(p_shape, p_scale, p_transform_com, p_settings, p_base_offset, p_collector, p_broad_phase_layer_filter, p_object_layer_filter, p_body_filter, p_shape_filter);
 	} else {
 		space->get_narrow_phase_query().CollideShape(p_shape, p_scale, p_transform_com, p_settings, p_base_offset, p_collector, p_broad_phase_layer_filter, p_object_layer_filter, p_body_filter, p_shape_filter);
@@ -590,11 +587,10 @@ int JoltPhysicsDirectSpaceState3D::intersect_shape(const ShapeParameters &p_para
 	Transform3D transform = p_parameters.transform;
 	JOLT_ENSURE_SCALE_NOT_ZERO(transform, "intersect_shape was passed an invalid transform.");
 
-	Vector3 scale = transform.basis.get_scale();
+	Vector3 scale;
+	JoltMath::decompose(transform, scale);
 	JOLT_ENSURE_SCALE_VALID(jolt_shape, scale, "intersect_shape was passed an invalid transform.");
 
-	transform.basis.orthonormalize();
-
 	const Vector3 com_scaled = to_godot(jolt_shape->GetCenterOfMass());
 	const Transform3D transform_com = transform.translated_local(com_scaled);
 
@@ -647,11 +643,10 @@ bool JoltPhysicsDirectSpaceState3D::cast_motion(const ShapeParameters &p_paramet
 	Transform3D transform = p_parameters.transform;
 	JOLT_ENSURE_SCALE_NOT_ZERO(transform, "cast_motion (maybe from ShapeCast3D?) was passed an invalid transform.");
 
-	Vector3 scale = transform.basis.get_scale();
+	Vector3 scale;
+	JoltMath::decompose(transform, scale);
 	JOLT_ENSURE_SCALE_VALID(jolt_shape, scale, "cast_motion (maybe from ShapeCast3D?) was passed an invalid transform.");
 
-	transform.basis.orthonormalize();
-
 	const Vector3 com_scaled = to_godot(jolt_shape->GetCenterOfMass());
 	Transform3D transform_com = transform.translated_local(com_scaled);
 
@@ -659,7 +654,7 @@ bool JoltPhysicsDirectSpaceState3D::cast_motion(const ShapeParameters &p_paramet
 	settings.mMaxSeparationDistance = (float)p_parameters.margin;
 
 	const JoltQueryFilter3D query_filter(*this, p_parameters.collision_mask, p_parameters.collide_with_bodies, p_parameters.collide_with_areas, p_parameters.exclude);
-	_cast_motion_impl(*jolt_shape, transform_com, scale, p_parameters.motion, JoltProjectSettings::use_enhanced_internal_edge_removal_for_queries(), true, settings, query_filter, query_filter, query_filter, JPH::ShapeFilter(), r_closest_safe, r_closest_unsafe);
+	_cast_motion_impl(*jolt_shape, transform_com, scale, p_parameters.motion, JoltProjectSettings::use_enhanced_internal_edge_removal_for_queries, true, settings, query_filter, query_filter, query_filter, JPH::ShapeFilter(), r_closest_safe, r_closest_unsafe);
 
 	return true;
 }
@@ -684,11 +679,10 @@ bool JoltPhysicsDirectSpaceState3D::collide_shape(const ShapeParameters &p_param
 	Transform3D transform = p_parameters.transform;
 	JOLT_ENSURE_SCALE_NOT_ZERO(transform, "collide_shape was passed an invalid transform.");
 
-	Vector3 scale = transform.basis.get_scale();
+	Vector3 scale;
+	JoltMath::decompose(transform, scale);
 	JOLT_ENSURE_SCALE_VALID(jolt_shape, scale, "collide_shape was passed an invalid transform.");
 
-	transform.basis.orthonormalize();
-
 	const Vector3 com_scaled = to_godot(jolt_shape->GetCenterOfMass());
 	const Transform3D transform_com = transform.translated_local(com_scaled);
 
@@ -754,11 +748,10 @@ bool JoltPhysicsDirectSpaceState3D::rest_info(const ShapeParameters &p_parameter
 	Transform3D transform = p_parameters.transform;
 	JOLT_ENSURE_SCALE_NOT_ZERO(transform, "get_rest_info (maybe from ShapeCast3D?) was passed an invalid transform.");
 
-	Vector3 scale = transform.basis.get_scale();
+	Vector3 scale;
+	JoltMath::decompose(transform, scale);
 	JOLT_ENSURE_SCALE_VALID(jolt_shape, scale, "get_rest_info (maybe from ShapeCast3D?) was passed an invalid transform.");
 
-	transform.basis.orthonormalize();
-
 	const Vector3 com_scaled = to_godot(jolt_shape->GetCenterOfMass());
 	const Transform3D transform_com = transform.translated_local(com_scaled);
 
@@ -794,7 +787,6 @@ bool JoltPhysicsDirectSpaceState3D::rest_info(const ShapeParameters &p_parameter
 	r_info->normal = to_godot(-hit.mPenetrationAxis.Normalized());
 	r_info->rid = object->get_rid();
 	r_info->collider_id = object->get_instance_id();
-	r_info->shape = 0;
 	r_info->linear_velocity = object->get_velocity_at_position(hit_point);
 
 	return true;
@@ -890,8 +882,8 @@ bool JoltPhysicsDirectSpaceState3D::body_test_motion(const JoltBody3D &p_body, c
 	Transform3D transform = p_parameters.from;
 	JOLT_ENSURE_SCALE_NOT_ZERO(transform, vformat("body_test_motion (maybe from move_and_slide?) was passed an invalid transform along with body '%s'.", p_body.to_string()));
 
-	Vector3 scale = transform.basis.get_scale();
-	transform.basis.orthonormalize();
+	Vector3 scale;
+	JoltMath::decompose(transform, scale);
 
 	space->try_optimize();
 
diff --git a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
index ced8d8dd..2b339559 100644
--- a/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_physics_direct_space_state_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_PHYSICS_DIRECT_SPACE_STATE_3D_H
-#define JOLT_PHYSICS_DIRECT_SPACE_STATE_3D_H
+#pragma once
 
 #include "servers/physics_server_3d.h"
 
@@ -83,5 +82,3 @@ public:
 
 	JoltSpace3D &get_space() const { return *space; }
 };
-
-#endif // JOLT_PHYSICS_DIRECT_SPACE_STATE_3D_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_query_collectors.h b/engine/modules/jolt_physics/spaces/jolt_query_collectors.h
index 907419c8..10fa1d20 100644
--- a/engine/modules/jolt_physics/spaces/jolt_query_collectors.h
+++ b/engine/modules/jolt_physics/spaces/jolt_query_collectors.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_QUERY_COLLECTORS_H
-#define JOLT_QUERY_COLLECTORS_H
+#pragma once
 
 #include "../jolt_project_settings.h"
 #include "jolt_space_3d.h"
@@ -244,5 +243,3 @@ public:
 		}
 	}
 };
-
-#endif // JOLT_QUERY_COLLECTORS_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h b/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h
index cba5986b..0d89b6c8 100644
--- a/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_query_filter_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_QUERY_FILTER_3D_H
-#define JOLT_QUERY_FILTER_3D_H
+#pragma once
 
 #include "core/templates/hash_set.h"
 #include "core/templates/rid.h"
@@ -63,5 +62,3 @@ public:
 	virtual bool ShouldCollide(const JPH::BodyID &p_body_id) const override;
 	virtual bool ShouldCollideLocked(const JPH::Body &p_body) const override;
 };
-
-#endif // JOLT_QUERY_FILTER_3D_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp b/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp
index 1304ee25..ec959972 100644
--- a/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_space_3d.cpp
@@ -57,7 +57,7 @@ constexpr double DEFAULT_CONTACT_MAX_SEPARATION = 0.05;
 constexpr double DEFAULT_CONTACT_MAX_ALLOWED_PENETRATION = 0.01;
 constexpr double DEFAULT_CONTACT_DEFAULT_BIAS = 0.8;
 constexpr double DEFAULT_SLEEP_THRESHOLD_LINEAR = 0.1;
-constexpr double DEFAULT_SLEEP_THRESHOLD_ANGULAR = 8.0 * Math_PI / 180;
+constexpr double DEFAULT_SLEEP_THRESHOLD_ANGULAR = 8.0 * Math::PI / 180;
 constexpr double DEFAULT_SOLVER_ITERATIONS = 8;
 
 } // namespace
@@ -98,23 +98,23 @@ JoltSpace3D::JoltSpace3D(JPH::JobSystem *p_job_system) :
 		layers(new JoltLayers()),
 		contact_listener(new JoltContactListener3D(this)),
 		physics_system(new JPH::PhysicsSystem()) {
-	physics_system->Init((JPH::uint)JoltProjectSettings::get_max_bodies(), 0, (JPH::uint)JoltProjectSettings::get_max_pairs(), (JPH::uint)JoltProjectSettings::get_max_contact_constraints(), *layers, *layers, *layers);
+	physics_system->Init((JPH::uint)JoltProjectSettings::max_bodies, 0, (JPH::uint)JoltProjectSettings::max_body_pairs, (JPH::uint)JoltProjectSettings::max_contact_constraints, *layers, *layers, *layers);
 
 	JPH::PhysicsSettings settings;
-	settings.mBaumgarte = JoltProjectSettings::get_baumgarte_stabilization_factor();
-	settings.mSpeculativeContactDistance = JoltProjectSettings::get_speculative_contact_distance();
-	settings.mPenetrationSlop = JoltProjectSettings::get_penetration_slop();
-	settings.mLinearCastThreshold = JoltProjectSettings::get_ccd_movement_threshold();
-	settings.mLinearCastMaxPenetration = JoltProjectSettings::get_ccd_max_penetration();
-	settings.mBodyPairCacheMaxDeltaPositionSq = JoltProjectSettings::get_body_pair_cache_distance_sq();
-	settings.mBodyPairCacheCosMaxDeltaRotationDiv2 = JoltProjectSettings::get_body_pair_cache_angle_cos_div2();
-	settings.mNumVelocitySteps = (JPH::uint)JoltProjectSettings::get_simulation_velocity_steps();
-	settings.mNumPositionSteps = (JPH::uint)JoltProjectSettings::get_simulation_position_steps();
-	settings.mMinVelocityForRestitution = JoltProjectSettings::get_bounce_velocity_threshold();
-	settings.mTimeBeforeSleep = JoltProjectSettings::get_sleep_time_threshold();
-	settings.mPointVelocitySleepThreshold = JoltProjectSettings::get_sleep_velocity_threshold();
-	settings.mUseBodyPairContactCache = JoltProjectSettings::is_body_pair_contact_cache_enabled();
-	settings.mAllowSleeping = JoltProjectSettings::is_sleep_allowed();
+	settings.mBaumgarte = JoltProjectSettings::baumgarte_stabilization_factor;
+	settings.mSpeculativeContactDistance = JoltProjectSettings::speculative_contact_distance;
+	settings.mPenetrationSlop = JoltProjectSettings::penetration_slop;
+	settings.mLinearCastThreshold = JoltProjectSettings::ccd_movement_threshold;
+	settings.mLinearCastMaxPenetration = JoltProjectSettings::ccd_max_penetration;
+	settings.mBodyPairCacheMaxDeltaPositionSq = JoltProjectSettings::body_pair_cache_distance_sq;
+	settings.mBodyPairCacheCosMaxDeltaRotationDiv2 = JoltProjectSettings::body_pair_cache_angle_cos_div2;
+	settings.mNumVelocitySteps = (JPH::uint)JoltProjectSettings::simulation_velocity_steps;
+	settings.mNumPositionSteps = (JPH::uint)JoltProjectSettings::simulation_position_steps;
+	settings.mMinVelocityForRestitution = JoltProjectSettings::bounce_velocity_threshold;
+	settings.mTimeBeforeSleep = JoltProjectSettings::sleep_time_threshold;
+	settings.mPointVelocitySleepThreshold = JoltProjectSettings::sleep_velocity_threshold;
+	settings.mUseBodyPairContactCache = JoltProjectSettings::body_pair_contact_cache_enabled;
+	settings.mAllowSleeping = JoltProjectSettings::sleep_allowed;
 
 	physics_system->SetPhysicsSettings(settings);
 	physics_system->SetGravity(JPH::Vec3::sZero());
@@ -122,7 +122,7 @@ JoltSpace3D::JoltSpace3D(JPH::JobSystem *p_job_system) :
 	physics_system->SetSoftBodyContactListener(contact_listener);
 
 	physics_system->SetCombineFriction([](const JPH::Body &p_body1, const JPH::SubShapeID &p_sub_shape_id1, const JPH::Body &p_body2, const JPH::SubShapeID &p_sub_shape_id2) {
-		return ABS(MIN(p_body1.GetFriction(), p_body2.GetFriction()));
+		return Math::abs(MIN(p_body1.GetFriction(), p_body2.GetFriction()));
 	});
 
 	physics_system->SetCombineRestitution([](const JPH::Body &p_body1, const JPH::SubShapeID &p_sub_shape_id1, const JPH::Body &p_body2, const JPH::SubShapeID &p_sub_shape_id2) {
@@ -169,21 +169,21 @@ void JoltSpace3D::step(float p_step) {
 		WARN_PRINT_ONCE(vformat("Jolt Physics manifold cache exceeded capacity and contacts were ignored. "
 								"Consider increasing maximum number of contact constraints in project settings. "
 								"Maximum number of contact constraints is currently set to %d.",
-				JoltProjectSettings::get_max_contact_constraints()));
+				JoltProjectSettings::max_contact_constraints));
 	}
 
 	if ((update_error & JPH::EPhysicsUpdateError::BodyPairCacheFull) != JPH::EPhysicsUpdateError::None) {
 		WARN_PRINT_ONCE(vformat("Jolt Physics body pair cache exceeded capacity and contacts were ignored. "
 								"Consider increasing maximum number of body pairs in project settings. "
 								"Maximum number of body pairs is currently set to %d.",
-				JoltProjectSettings::get_max_pairs()));
+				JoltProjectSettings::max_body_pairs));
 	}
 
 	if ((update_error & JPH::EPhysicsUpdateError::ContactConstraintsFull) != JPH::EPhysicsUpdateError::None) {
 		WARN_PRINT_ONCE(vformat("Jolt Physics contact constraint buffer exceeded capacity and contacts were ignored. "
 								"Consider increasing maximum number of contact constraints in project settings. "
 								"Maximum number of contact constraints is currently set to %d.",
-				JoltProjectSettings::get_max_contact_constraints()));
+				JoltProjectSettings::max_contact_constraints));
 	}
 
 	_post_step(p_step);
@@ -227,7 +227,7 @@ double JoltSpace3D::get_param(PhysicsServer3D::SpaceParameter p_param) const {
 			return DEFAULT_SLEEP_THRESHOLD_ANGULAR;
 		}
 		case PhysicsServer3D::SPACE_PARAM_BODY_TIME_TO_SLEEP: {
-			return JoltProjectSettings::get_sleep_time_threshold();
+			return JoltProjectSettings::sleep_time_threshold;
 		}
 		case PhysicsServer3D::SPACE_PARAM_SOLVER_ITERATIONS: {
 			return DEFAULT_SOLVER_ITERATIONS;
@@ -353,7 +353,7 @@ JPH::BodyID JoltSpace3D::add_rigid_body(const JoltObject3D &p_object, const JPH:
 		ERR_PRINT_ONCE(vformat("Failed to create underlying Jolt Physics body for '%s'. "
 							   "Consider increasing maximum number of bodies in project settings. "
 							   "Maximum number of bodies is currently set to %d.",
-				p_object.to_string(), JoltProjectSettings::get_max_bodies()));
+				p_object.to_string(), JoltProjectSettings::max_bodies));
 
 		return JPH::BodyID();
 	}
@@ -370,7 +370,7 @@ JPH::BodyID JoltSpace3D::add_soft_body(const JoltObject3D &p_object, const JPH::
 		ERR_PRINT_ONCE(vformat("Failed to create underlying Jolt Physics body for '%s'. "
 							   "Consider increasing maximum number of bodies in project settings. "
 							   "Maximum number of bodies is currently set to %d.",
-				p_object.to_string(), JoltProjectSettings::get_max_bodies()));
+				p_object.to_string(), JoltProjectSettings::max_bodies));
 
 		return JPH::BodyID();
 	}
diff --git a/engine/modules/jolt_physics/spaces/jolt_space_3d.h b/engine/modules/jolt_physics/spaces/jolt_space_3d.h
index 16a8f362..5edc6c0c 100644
--- a/engine/modules/jolt_physics/spaces/jolt_space_3d.h
+++ b/engine/modules/jolt_physics/spaces/jolt_space_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_SPACE_3D_H
-#define JOLT_SPACE_3D_H
+#pragma once
 
 #include "jolt_body_accessor_3d.h"
 
@@ -45,8 +44,6 @@
 #include "Jolt/Physics/Constraints/Constraint.h"
 #include "Jolt/Physics/PhysicsSystem.h"
 
-#include <stdint.h>
-
 class JoltArea3D;
 class JoltBody3D;
 class JoltContactListener3D;
@@ -162,5 +159,3 @@ public:
 	void set_max_debug_contacts(int p_count);
 #endif
 };
-
-#endif // JOLT_SPACE_3D_H
diff --git a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp
index 640ec024..097c981d 100644
--- a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp
+++ b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.cpp
@@ -64,7 +64,7 @@ constexpr TValue align_up(TValue p_value, TAlignment p_alignment) {
 } //namespace
 
 JoltTempAllocator::JoltTempAllocator() :
-		capacity((uint64_t)JoltProjectSettings::get_temp_memory_b()),
+		capacity((uint64_t)JoltProjectSettings::temp_memory_b),
 		base(static_cast<uint8_t *>(JPH::Allocate((size_t)capacity))) {
 }
 
@@ -89,7 +89,7 @@ void *JoltTempAllocator::Allocate(uint32_t p_size) {
 		WARN_PRINT_ONCE(vformat("Jolt Physics temporary memory allocator exceeded capacity of %d MiB. "
 								"Falling back to slower general-purpose allocator. "
 								"Consider increasing maximum temporary memory in project settings.",
-				JoltProjectSettings::get_temp_memory_mib()));
+				JoltProjectSettings::temp_memory_mib));
 
 		ptr = JPH::Allocate(p_size);
 	}
diff --git a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h
index 8d519ae0..5f6017f6 100644
--- a/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h
+++ b/engine/modules/jolt_physics/spaces/jolt_temp_allocator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOLT_TEMP_ALLOCATOR_H
-#define JOLT_TEMP_ALLOCATOR_H
+#pragma once
 
 #include "Jolt/Jolt.h"
 
@@ -49,5 +48,3 @@ public:
 	virtual void *Allocate(JPH::uint p_size) override;
 	virtual void Free(void *p_ptr, JPH::uint p_size) override;
 };
-
-#endif // JOLT_TEMP_ALLOCATOR_H
diff --git a/engine/modules/jpg/SCsub b/engine/modules/jpg/SCsub
index 2d948d33..fbc69a86 100644
--- a/engine/modules/jpg/SCsub
+++ b/engine/modules/jpg/SCsub
@@ -18,7 +18,7 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_jpg.Prepend(CPPPATH=[thirdparty_dir])
+env_jpg.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 env_thirdparty = env_jpg.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/modules/jpg/image_loader_jpegd.h b/engine/modules/jpg/image_loader_jpegd.h
index 678bfe2f..699bf5f5 100644
--- a/engine/modules/jpg/image_loader_jpegd.h
+++ b/engine/modules/jpg/image_loader_jpegd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_JPEGD_H
-#define IMAGE_LOADER_JPEGD_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -39,5 +38,3 @@ public:
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	ImageLoaderJPG();
 };
-
-#endif // IMAGE_LOADER_JPEGD_H
diff --git a/engine/modules/jpg/register_types.h b/engine/modules/jpg/register_types.h
index 0d8f207e..c1d59a59 100644
--- a/engine/modules/jpg/register_types.h
+++ b/engine/modules/jpg/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JPG_REGISTER_TYPES_H
-#define JPG_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_jpg_module(ModuleInitializationLevel p_level);
 void uninitialize_jpg_module(ModuleInitializationLevel p_level);
-
-#endif // JPG_REGISTER_TYPES_H
diff --git a/engine/modules/jsonrpc/jsonrpc.compat.inc b/engine/modules/jsonrpc/jsonrpc.compat.inc
new file mode 100644
index 00000000..ad56dc61
--- /dev/null
+++ b/engine/modules/jsonrpc/jsonrpc.compat.inc
@@ -0,0 +1,41 @@
+/**************************************************************************/
+/*  jsonrpc.compat.inc                                                    */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+void JSONRPC::_set_scope_bind_compat_104890(const String &p_scope, Object *p_obj) {
+	ERR_PRINT("JSONRPC::set_scope is not supported anymore. Upgrade to JSONRPC::set_method.");
+}
+
+void JSONRPC::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_method(D_METHOD("set_scope", "scope", "target"), &JSONRPC::_set_scope_bind_compat_104890);
+}
+
+#endif
diff --git a/engine/modules/jsonrpc/jsonrpc.cpp b/engine/modules/jsonrpc/jsonrpc.cpp
index 0f03e49f..ae463287 100644
--- a/engine/modules/jsonrpc/jsonrpc.cpp
+++ b/engine/modules/jsonrpc/jsonrpc.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "jsonrpc.h"
+#include "jsonrpc.compat.inc"
 
 #include "core/io/json.h"
 
@@ -39,7 +40,7 @@ JSONRPC::~JSONRPC() {
 }
 
 void JSONRPC::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("set_scope", "scope", "target"), &JSONRPC::set_scope);
+	ClassDB::bind_method(D_METHOD("set_method", "name", "callback"), &JSONRPC::set_method);
 	ClassDB::bind_method(D_METHOD("process_action", "action", "recurse"), &JSONRPC::process_action, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("process_string", "action"), &JSONRPC::process_string);
 
@@ -99,9 +100,6 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
 	if (p_action.get_type() == Variant::DICTIONARY) {
 		Dictionary dict = p_action;
 		String method = dict.get("method", "");
-		if (method.begins_with("$/")) {
-			return ret;
-		}
 
 		Array args;
 		if (dict.has("params")) {
@@ -113,14 +111,11 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
 			}
 		}
 
-		Object *object = this;
-		if (method_scopes.has(method.get_base_dir())) {
-			object = method_scopes[method.get_base_dir()];
-			method = method.get_file();
-		}
+		/// A Notification is a Request object without an "id" member.
+		bool is_notification = !dict.has("id");
 
 		Variant id;
-		if (dict.has("id")) {
+		if (!is_notification) {
 			id = dict["id"];
 
 			// Account for implementations that discern between int and float on the json serialization level, by using an int if there is a .0 fraction. See #100914
@@ -129,25 +124,35 @@ Variant JSONRPC::process_action(const Variant &p_action, bool p_process_arr_elem
 			}
 		}
 
-		if (object == nullptr || !object->has_method(method)) {
-			ret = make_response_error(JSONRPC::METHOD_NOT_FOUND, "Method not found: " + method, id);
+		if (methods.has(method)) {
+			Variant call_ret = methods[method].callv(args);
+			ret = make_response(call_ret, id);
 		} else {
-			Variant call_ret = object->callv(method, args);
-			if (id.get_type() != Variant::NIL) {
-				ret = make_response(call_ret, id);
-			}
+			ret = make_response_error(JSONRPC::METHOD_NOT_FOUND, "Method not found: " + method, id);
+		}
+
+		/// The Server MUST NOT reply to a Notification
+		if (is_notification) {
+			ret = Variant();
 		}
 	} else if (p_action.get_type() == Variant::ARRAY && p_process_arr_elements) {
 		Array arr = p_action;
-		int size = arr.size();
-		if (size) {
+		if (!arr.is_empty()) {
 			Array arr_ret;
-			for (int i = 0; i < size; i++) {
-				const Variant &var = arr.get(i);
-				arr_ret.push_back(process_action(var));
+			for (const Variant &var : arr) {
+				Variant res = process_action(var);
+
+				if (res.get_type() != Variant::NIL) {
+					arr_ret.push_back(res);
+				}
+			}
+
+			/// If there are no Response objects contained within the Response array as it is to be sent to the client, the server MUST NOT return an empty Array and should return nothing at all.
+			if (!arr_ret.is_empty()) {
+				ret = arr_ret;
 			}
-			ret = arr_ret;
 		} else {
+			/// If the batch rpc call itself fails to be recognized ... as an Array with at least one value, the response from the Server MUST be a single Response object.
 			ret = make_response_error(JSONRPC::INVALID_REQUEST, "Invalid Request");
 		}
 	} else {
@@ -175,6 +180,6 @@ String JSONRPC::process_string(const String &p_input) {
 	return ret.to_json_string();
 }
 
-void JSONRPC::set_scope(const String &p_scope, Object *p_obj) {
-	method_scopes[p_scope] = p_obj;
+void JSONRPC::set_method(const String &p_name, const Callable &p_callback) {
+	methods[p_name] = p_callback;
 }
diff --git a/engine/modules/jsonrpc/jsonrpc.h b/engine/modules/jsonrpc/jsonrpc.h
index 70dda29a..254bb3fc 100644
--- a/engine/modules/jsonrpc/jsonrpc.h
+++ b/engine/modules/jsonrpc/jsonrpc.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JSONRPC_H
-#define JSONRPC_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/variant/variant.h"
@@ -37,11 +36,16 @@
 class JSONRPC : public Object {
 	GDCLASS(JSONRPC, Object)
 
-	HashMap<String, Object *> method_scopes;
+	HashMap<String, Callable> methods;
 
 protected:
 	static void _bind_methods();
 
+#ifndef DISABLE_DEPRECATED
+	void _set_scope_bind_compat_104890(const String &p_scope, Object *p_obj);
+	static void _bind_compatibility_methods();
+#endif
+
 public:
 	JSONRPC();
 	~JSONRPC();
@@ -62,9 +66,7 @@ public:
 	Variant process_action(const Variant &p_action, bool p_process_arr_elements = false);
 	String process_string(const String &p_input);
 
-	void set_scope(const String &p_scope, Object *p_obj);
+	void set_method(const String &p_name, const Callable &p_callback);
 };
 
 VARIANT_ENUM_CAST(JSONRPC::ErrorCode);
-
-#endif // JSONRPC_H
diff --git a/engine/modules/jsonrpc/register_types.h b/engine/modules/jsonrpc/register_types.h
index ef2359f7..74b83293 100644
--- a/engine/modules/jsonrpc/register_types.h
+++ b/engine/modules/jsonrpc/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JSONRPC_REGISTER_TYPES_H
-#define JSONRPC_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_jsonrpc_module(ModuleInitializationLevel p_level);
 void uninitialize_jsonrpc_module(ModuleInitializationLevel p_level);
-
-#endif // JSONRPC_REGISTER_TYPES_H
diff --git a/engine/modules/jsonrpc/tests/test_jsonrpc.cpp b/engine/modules/jsonrpc/tests/test_jsonrpc.cpp
index 8500ff6d..3b5b8a02 100644
--- a/engine/modules/jsonrpc/tests/test_jsonrpc.cpp
+++ b/engine/modules/jsonrpc/tests/test_jsonrpc.cpp
@@ -57,10 +57,6 @@ String TestClassJSONRPC::something(const String &p_in) {
 	return p_in + ", please";
 }
 
-void TestClassJSONRPC::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("something", "in"), &TestClassJSONRPC::something);
-}
-
 void test_process_action(const Variant &p_in, const Variant &p_expected, bool p_process_array_elements) {
 	TestClassJSONRPC json_rpc = TestClassJSONRPC();
 	const Variant &observed = json_rpc.process_action(p_in, p_process_array_elements);
@@ -83,4 +79,10 @@ void test_process_action_bad_method(const Dictionary &p_in) {
 	check_error_no_method(out_dict);
 }
 
+void test_no_response(const Variant &p_in) {
+	TestClassJSONRPC json_rpc = TestClassJSONRPC();
+	const Variant &res = json_rpc.process_action(p_in, true);
+	CHECK(res.get_type() == Variant::NIL);
+}
+
 } // namespace TestJSONRPC
diff --git a/engine/modules/jsonrpc/tests/test_jsonrpc.h b/engine/modules/jsonrpc/tests/test_jsonrpc.h
index 57705810..9e855d8e 100644
--- a/engine/modules/jsonrpc/tests/test_jsonrpc.h
+++ b/engine/modules/jsonrpc/tests/test_jsonrpc.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_JSONRPC_H
-#define TEST_JSONRPC_H
+#pragma once
 
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
@@ -47,6 +46,7 @@ TEST_CASE("[JSONRPC] process_action invalid") {
 	check_invalid(json_rpc.process_action(1234));
 	check_invalid(json_rpc.process_action(false));
 	check_invalid(json_rpc.process_action(3.14159));
+	check_invalid(json_rpc.process_action(Array()));
 }
 
 void check_invalid_string(const String &p_str);
@@ -58,23 +58,21 @@ TEST_CASE("[JSONRPC] process_string invalid") {
 	check_invalid_string(json_rpc.process_string("1234"));
 	check_invalid_string(json_rpc.process_string("false"));
 	check_invalid_string(json_rpc.process_string("3.14159"));
+	check_invalid_string(json_rpc.process_string("[]"));
 }
 
 class TestClassJSONRPC : public JSONRPC {
-	GDCLASS(TestClassJSONRPC, JSONRPC)
-
 public:
-	String something(const String &p_in);
+	TestClassJSONRPC() {
+		set_method("something", callable_mp(this, &TestClassJSONRPC::something));
+	}
 
-protected:
-	static void _bind_methods();
+	String something(const String &p_in);
 };
 
 void test_process_action(const Variant &p_in, const Variant &p_expected, bool p_process_array_elements = false);
 
 TEST_CASE("[JSONRPC] process_action Dictionary") {
-	ClassDB::register_class<TestClassJSONRPC>();
-
 	Dictionary in_dict = Dictionary();
 	in_dict["method"] = "something";
 	in_dict["id"] = "ID";
@@ -129,11 +127,73 @@ void test_process_action_bad_method(const Dictionary &p_in);
 
 TEST_CASE("[JSONRPC] process_action bad method") {
 	Dictionary in_dict;
+	in_dict["id"] = 1;
 	in_dict["method"] = "nothing";
 
 	test_process_action_bad_method(in_dict);
 }
 
-} // namespace TestJSONRPC
+void test_no_response(const Variant &p_in);
 
-#endif // TEST_JSONRPC_H
+TEST_CASE("[JSONRPC] process_action notification") {
+	Dictionary in_dict = Dictionary();
+	in_dict["method"] = "something";
+	in_dict["params"] = "yes";
+
+	test_no_response(in_dict);
+}
+
+TEST_CASE("[JSONRPC] process_action notification bad method") {
+	Dictionary in_dict;
+	in_dict["method"] = "nothing";
+
+	test_no_response(in_dict);
+}
+
+TEST_CASE("[JSONRPC] process_action notification batch") {
+	Array in;
+	Dictionary in_1;
+	in_1["method"] = "something";
+	in_1["params"] = "more";
+	in.push_back(in_1);
+	Dictionary in_2;
+	in_2["method"] = "something";
+	in_2["params"] = "yes";
+	in.push_back(in_2);
+
+	test_no_response(in);
+}
+
+TEST_CASE("[JSONRPC] mixed batch") {
+	Array in;
+	Dictionary in_1;
+	in_1["method"] = "something";
+	in_1["id"] = 1;
+	in_1["params"] = "more";
+	in.push_back(in_1);
+	Dictionary in_2;
+	in_2["method"] = "something";
+	in_2["id"] = 2;
+	in_2["params"] = "yes";
+	in.push_back(in_2);
+	Dictionary in_3;
+	in_3["method"] = "something";
+	in_3["params"] = "yes";
+	in.push_back(in_3);
+
+	Array expected;
+	Dictionary expected_1;
+	expected_1["jsonrpc"] = "2.0";
+	expected_1["id"] = 1;
+	expected_1["result"] = "more, please";
+	expected.push_back(expected_1);
+	Dictionary expected_2;
+	expected_2["jsonrpc"] = "2.0";
+	expected_2["id"] = 2;
+	expected_2["result"] = "yes, please";
+	expected.push_back(expected_2);
+
+	test_process_action(in, expected, true);
+}
+
+} // namespace TestJSONRPC
diff --git a/engine/modules/ktx/SCsub b/engine/modules/ktx/SCsub
index f4c394d7..df994bf3 100644
--- a/engine/modules/ktx/SCsub
+++ b/engine/modules/ktx/SCsub
@@ -33,18 +33,18 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_ktx.Prepend(CPPPATH=[thirdparty_dir + "include"])
-env_ktx.Prepend(CPPPATH=[thirdparty_dir + "utils"])
-env_ktx.Prepend(CPPPATH=[thirdparty_dir + "lib"])
-env_ktx.Prepend(CPPPATH=[thirdparty_dir + "other_include"])
+env_ktx.Prepend(CPPEXTPATH=[thirdparty_dir + "include"])
+env_ktx.Prepend(CPPEXTPATH=[thirdparty_dir + "utils"])
+env_ktx.Prepend(CPPEXTPATH=[thirdparty_dir + "lib"])
+env_ktx.Prepend(CPPEXTPATH=[thirdparty_dir + "other_include"])
 
-env_ktx.Prepend(CPPPATH=["#thirdparty/basis_universal"])
+env_ktx.Prepend(CPPEXTPATH=["#thirdparty/basis_universal"])
 if env.editor_build:
     # We already build miniz in the basis_universal module (editor only).
     env_ktx.Append(CPPDEFINES=["MINIZ_HEADER_FILE_ONLY"])
 
 if env["vulkan"]:
-    env_ktx.Prepend(CPPPATH=["#thirdparty/vulkan/include"])
+    env_ktx.Prepend(CPPEXTPATH=["#thirdparty/vulkan/include"])
 else:
     # Falls back on bundled `vkformat_enum.h`.
     env_ktx.Append(CPPDEFINES=["LIBKTX"])
diff --git a/engine/modules/ktx/register_types.cpp b/engine/modules/ktx/register_types.cpp
index 1d48e05a..eb68b2f6 100644
--- a/engine/modules/ktx/register_types.cpp
+++ b/engine/modules/ktx/register_types.cpp
@@ -32,6 +32,8 @@
 
 #include "texture_loader_ktx.h"
 
+#include "scene/resources/image_texture.h"
+
 static Ref<ResourceFormatKTX> resource_loader_ktx;
 
 void initialize_ktx_module(ModuleInitializationLevel p_level) {
@@ -39,8 +41,10 @@ void initialize_ktx_module(ModuleInitializationLevel p_level) {
 		return;
 	}
 
-	resource_loader_ktx.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_ktx);
+	if (GD_IS_CLASS_ENABLED(ImageTexture)) {
+		resource_loader_ktx.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_ktx);
+	}
 }
 
 void uninitialize_ktx_module(ModuleInitializationLevel p_level) {
@@ -48,6 +52,8 @@ void uninitialize_ktx_module(ModuleInitializationLevel p_level) {
 		return;
 	}
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_ktx);
-	resource_loader_ktx.unref();
+	if (GD_IS_CLASS_ENABLED(ImageTexture)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_ktx);
+		resource_loader_ktx.unref();
+	}
 }
diff --git a/engine/modules/ktx/register_types.h b/engine/modules/ktx/register_types.h
index a50dc48b..8541514c 100644
--- a/engine/modules/ktx/register_types.h
+++ b/engine/modules/ktx/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KTX_REGISTER_TYPES_H
-#define KTX_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_ktx_module(ModuleInitializationLevel p_level);
 void uninitialize_ktx_module(ModuleInitializationLevel p_level);
-
-#endif // KTX_REGISTER_TYPES_H
diff --git a/engine/modules/ktx/texture_loader_ktx.h b/engine/modules/ktx/texture_loader_ktx.h
index 0de458a7..20ef5848 100644
--- a/engine/modules/ktx/texture_loader_ktx.h
+++ b/engine/modules/ktx/texture_loader_ktx.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_LOADER_KTX_H
-#define TEXTURE_LOADER_KTX_H
+#pragma once
 
 #include "core/io/resource_loader.h"
 #include "scene/resources/texture.h"
@@ -44,5 +43,3 @@ public:
 	virtual ~ResourceFormatKTX() {}
 	ResourceFormatKTX();
 };
-
-#endif // TEXTURE_LOADER_KTX_H
diff --git a/engine/modules/lightmapper_rd/lightmapper_rd.cpp b/engine/modules/lightmapper_rd/lightmapper_rd.cpp
index 1e96efd8..17b64a62 100644
--- a/engine/modules/lightmapper_rd/lightmapper_rd.cpp
+++ b/engine/modules/lightmapper_rd/lightmapper_rd.cpp
@@ -645,19 +645,19 @@ void LightmapperRD::_create_acceleration_structures(RenderingDevice *rd, Size2i
 		r_cluster_aabbs_buffer = rd->storage_buffer_create(cab.size(), cab);
 
 		Vector<uint8_t> lb = lights.to_byte_array();
-		if (lb.size() == 0) {
+		if (lb.is_empty()) {
 			lb.resize(sizeof(Light)); //even if no lights, the buffer must exist
 		}
 		lights_buffer = rd->storage_buffer_create(lb.size(), lb);
 
 		Vector<uint8_t> sb = seam_buffer_vec.to_byte_array();
-		if (sb.size() == 0) {
+		if (sb.is_empty()) {
 			sb.resize(sizeof(Vector2i) * 2); //even if no seams, the buffer must exist
 		}
 		seams_buffer = rd->storage_buffer_create(sb.size(), sb);
 
 		Vector<uint8_t> pb = p_probe_positions.to_byte_array();
-		if (pb.size() == 0) {
+		if (pb.is_empty()) {
 			pb.resize(sizeof(Probe));
 		}
 		probe_positions_buffer = rd->storage_buffer_create(pb.size(), pb);
diff --git a/engine/modules/lightmapper_rd/lightmapper_rd.h b/engine/modules/lightmapper_rd/lightmapper_rd.h
index c856e21b..a6fa3c24 100644
--- a/engine/modules/lightmapper_rd/lightmapper_rd.h
+++ b/engine/modules/lightmapper_rd/lightmapper_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAPPER_RD_H
-#define LIGHTMAPPER_RD_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/3d/lightmapper.h"
@@ -310,5 +309,3 @@ public:
 
 	LightmapperRD();
 };
-
-#endif // LIGHTMAPPER_RD_H
diff --git a/engine/modules/lightmapper_rd/register_types.h b/engine/modules/lightmapper_rd/register_types.h
index 01b7f5dd..64872f15 100644
--- a/engine/modules/lightmapper_rd/register_types.h
+++ b/engine/modules/lightmapper_rd/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAPPER_RD_REGISTER_TYPES_H
-#define LIGHTMAPPER_RD_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_lightmapper_rd_module(ModuleInitializationLevel p_level);
 void uninitialize_lightmapper_rd_module(ModuleInitializationLevel p_level);
-
-#endif // LIGHTMAPPER_RD_REGISTER_TYPES_H
diff --git a/engine/modules/mbedtls/SCsub b/engine/modules/mbedtls/SCsub
index 6183fa59..1db53751 100644
--- a/engine/modules/mbedtls/SCsub
+++ b/engine/modules/mbedtls/SCsub
@@ -120,7 +120,7 @@ if env["builtin_mbedtls"]:
     thirdparty_dir = "#thirdparty/mbedtls/library/"
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_mbed_tls.Prepend(CPPPATH=["#thirdparty/mbedtls/include/"])
+    env_mbed_tls.Prepend(CPPEXTPATH=["#thirdparty/mbedtls/include/"])
     config_path = "thirdparty/mbedtls/include/godot_module_mbedtls_config.h"
     config_path = f"<{config_path}>" if env_mbed_tls["ninja"] and env_mbed_tls.msvc else f'\\"{config_path}\\"'
     env_mbed_tls.Append(CPPDEFINES=[("MBEDTLS_CONFIG_FILE", config_path)])
diff --git a/engine/modules/mbedtls/crypto_mbedtls.cpp b/engine/modules/mbedtls/crypto_mbedtls.cpp
index 3aa5fdd2..0bfdbac3 100644
--- a/engine/modules/mbedtls/crypto_mbedtls.cpp
+++ b/engine/modules/mbedtls/crypto_mbedtls.cpp
@@ -212,7 +212,8 @@ String X509CertificateMbedTLS::save_to_string() {
 		int ret = mbedtls_pem_write_buffer(PEM_BEGIN_CRT, PEM_END_CRT, cert.raw.p, cert.raw.len, w, sizeof(w), &wrote);
 		ERR_FAIL_COND_V_MSG(ret != 0 || wrote == 0, String(), "Error saving the certificate.");
 
-		buffer += String((char *)w, wrote);
+		// PEM is base64, aka ascii
+		buffer += String::ascii(Span((char *)w, wrote));
 		crt = crt->next;
 	}
 	if (buffer.length() <= PEM_MIN_SIZE) {
diff --git a/engine/modules/mbedtls/crypto_mbedtls.h b/engine/modules/mbedtls/crypto_mbedtls.h
index fb0c5798..2db47ebe 100644
--- a/engine/modules/mbedtls/crypto_mbedtls.h
+++ b/engine/modules/mbedtls/crypto_mbedtls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CRYPTO_MBEDTLS_H
-#define CRYPTO_MBEDTLS_H
+#pragma once
 
 #include "core/crypto/crypto.h"
 
@@ -40,6 +39,8 @@
 class CryptoMbedTLS;
 class TLSContextMbedTLS;
 class CryptoKeyMbedTLS : public CryptoKey {
+	GDSOFTCLASS(CryptoKeyMbedTLS, CryptoKey);
+
 private:
 	mbedtls_pk_context pkey;
 	int locks = 0;
@@ -52,17 +53,17 @@ public:
 	static void make_default() { CryptoKey::_create = create; }
 	static void finalize() { CryptoKey::_create = nullptr; }
 
-	virtual Error load(const String &p_path, bool p_public_only);
-	virtual Error save(const String &p_path, bool p_public_only);
-	virtual String save_to_string(bool p_public_only);
-	virtual Error load_from_string(const String &p_string_key, bool p_public_only);
-	virtual bool is_public_only() const { return public_only; }
+	Error load(const String &p_path, bool p_public_only) override;
+	Error save(const String &p_path, bool p_public_only) override;
+	String save_to_string(bool p_public_only) override;
+	Error load_from_string(const String &p_string_key, bool p_public_only) override;
+	bool is_public_only() const override { return public_only; }
 
 	CryptoKeyMbedTLS() {
 		mbedtls_pk_init(&pkey);
 		locks = 0;
 	}
-	~CryptoKeyMbedTLS() {
+	~CryptoKeyMbedTLS() override {
 		mbedtls_pk_free(&pkey);
 	}
 
@@ -74,6 +75,8 @@ public:
 };
 
 class X509CertificateMbedTLS : public X509Certificate {
+	GDSOFTCLASS(X509CertificateMbedTLS, X509Certificate);
+
 private:
 	mbedtls_x509_crt cert;
 	int locks;
@@ -83,17 +86,17 @@ public:
 	static void make_default() { X509Certificate::_create = create; }
 	static void finalize() { X509Certificate::_create = nullptr; }
 
-	virtual Error load(const String &p_path);
-	virtual Error load_from_memory(const uint8_t *p_buffer, int p_len);
-	virtual Error save(const String &p_path);
-	virtual String save_to_string();
-	virtual Error load_from_string(const String &p_string_key);
+	Error load(const String &p_path) override;
+	Error load_from_memory(const uint8_t *p_buffer, int p_len) override;
+	Error save(const String &p_path) override;
+	String save_to_string() override;
+	Error load_from_string(const String &p_string_key) override;
 
 	X509CertificateMbedTLS() {
 		mbedtls_x509_crt_init(&cert);
 		locks = 0;
 	}
-	~X509CertificateMbedTLS() {
+	~X509CertificateMbedTLS() override {
 		mbedtls_x509_crt_free(&cert);
 	}
 
@@ -117,12 +120,12 @@ public:
 
 	static bool is_md_type_allowed(mbedtls_md_type_t p_md_type);
 
-	virtual Error start(HashingContext::HashType p_hash_type, const PackedByteArray &p_key);
-	virtual Error update(const PackedByteArray &p_data);
-	virtual PackedByteArray finish();
+	Error start(HashingContext::HashType p_hash_type, const PackedByteArray &p_key) override;
+	Error update(const PackedByteArray &p_data) override;
+	PackedByteArray finish() override;
 
 	HMACContextMbedTLS() {}
-	~HMACContextMbedTLS();
+	~HMACContextMbedTLS() override;
 };
 
 class CryptoMbedTLS : public Crypto {
@@ -139,16 +142,14 @@ public:
 	static void load_default_certificates(const String &p_path);
 	static mbedtls_md_type_t md_type_from_hashtype(HashingContext::HashType p_hash_type, int &r_size);
 
-	virtual PackedByteArray generate_random_bytes(int p_bytes);
-	virtual Ref<CryptoKey> generate_rsa(int p_bytes);
-	virtual Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, const String &p_issuer_name, const String &p_not_before, const String &p_not_after);
-	virtual Vector<uint8_t> sign(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, Ref<CryptoKey> p_key);
-	virtual bool verify(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, const Vector<uint8_t> &p_signature, Ref<CryptoKey> p_key);
-	virtual Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_plaintext);
-	virtual Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_ciphertext);
+	PackedByteArray generate_random_bytes(int p_bytes) override;
+	Ref<CryptoKey> generate_rsa(int p_bytes) override;
+	Ref<X509Certificate> generate_self_signed_certificate(Ref<CryptoKey> p_key, const String &p_issuer_name, const String &p_not_before, const String &p_not_after) override;
+	Vector<uint8_t> sign(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, Ref<CryptoKey> p_key) override;
+	bool verify(HashingContext::HashType p_hash_type, const Vector<uint8_t> &p_hash, const Vector<uint8_t> &p_signature, Ref<CryptoKey> p_key) override;
+	Vector<uint8_t> encrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_plaintext) override;
+	Vector<uint8_t> decrypt(Ref<CryptoKey> p_key, const Vector<uint8_t> &p_ciphertext) override;
 
 	CryptoMbedTLS();
-	~CryptoMbedTLS();
+	~CryptoMbedTLS() override;
 };
-
-#endif // CRYPTO_MBEDTLS_H
diff --git a/engine/modules/mbedtls/dtls_server_mbedtls.h b/engine/modules/mbedtls/dtls_server_mbedtls.h
index 18661bf5..8ba4f7ef 100644
--- a/engine/modules/mbedtls/dtls_server_mbedtls.h
+++ b/engine/modules/mbedtls/dtls_server_mbedtls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DTLS_SERVER_MBEDTLS_H
-#define DTLS_SERVER_MBEDTLS_H
+#pragma once
 
 #include "tls_context_mbedtls.h"
 
@@ -45,12 +44,10 @@ public:
 	static void initialize();
 	static void finalize();
 
-	virtual Error setup(Ref<TLSOptions> p_options);
-	virtual void stop();
-	virtual Ref<PacketPeerDTLS> take_connection(Ref<PacketPeerUDP> p_peer);
+	Error setup(Ref<TLSOptions> p_options) override;
+	void stop() override;
+	Ref<PacketPeerDTLS> take_connection(Ref<PacketPeerUDP> p_peer) override;
 
 	DTLSServerMbedTLS();
-	~DTLSServerMbedTLS();
+	~DTLSServerMbedTLS() override;
 };
-
-#endif // DTLS_SERVER_MBEDTLS_H
diff --git a/engine/modules/mbedtls/packet_peer_mbed_dtls.h b/engine/modules/mbedtls/packet_peer_mbed_dtls.h
index 881a5fdd..be6b007b 100644
--- a/engine/modules/mbedtls/packet_peer_mbed_dtls.h
+++ b/engine/modules/mbedtls/packet_peer_mbed_dtls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKET_PEER_MBED_DTLS_H
-#define PACKET_PEER_MBED_DTLS_H
+#pragma once
 
 #include "tls_context_mbedtls.h"
 
@@ -83,5 +82,3 @@ public:
 	PacketPeerMbedDTLS();
 	~PacketPeerMbedDTLS();
 };
-
-#endif // PACKET_PEER_MBED_DTLS_H
diff --git a/engine/modules/mbedtls/register_types.h b/engine/modules/mbedtls/register_types.h
index 407abd7a..ba80f55f 100644
--- a/engine/modules/mbedtls/register_types.h
+++ b/engine/modules/mbedtls/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MBEDTLS_REGISTER_TYPES_H
-#define MBEDTLS_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_mbedtls_module(ModuleInitializationLevel p_level);
 void uninitialize_mbedtls_module(ModuleInitializationLevel p_level);
-
-#endif // MBEDTLS_REGISTER_TYPES_H
diff --git a/engine/modules/mbedtls/stream_peer_mbedtls.h b/engine/modules/mbedtls/stream_peer_mbedtls.h
index b4f80b61..40476679 100644
--- a/engine/modules/mbedtls/stream_peer_mbedtls.h
+++ b/engine/modules/mbedtls/stream_peer_mbedtls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STREAM_PEER_MBEDTLS_H
-#define STREAM_PEER_MBEDTLS_H
+#pragma once
 
 #include "tls_context_mbedtls.h"
 
@@ -76,5 +75,3 @@ public:
 	StreamPeerMbedTLS();
 	~StreamPeerMbedTLS();
 };
-
-#endif // STREAM_PEER_MBEDTLS_H
diff --git a/engine/modules/mbedtls/tests/test_crypto_mbedtls.h b/engine/modules/mbedtls/tests/test_crypto_mbedtls.h
index 5ec78d18..c171a25b 100644
--- a/engine/modules/mbedtls/tests/test_crypto_mbedtls.h
+++ b/engine/modules/mbedtls/tests/test_crypto_mbedtls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CRYPTO_MBEDTLS_H
-#define TEST_CRYPTO_MBEDTLS_H
+#pragma once
 
 #include "core/crypto/crypto.h"
 #include "core/crypto/hashing_context.h"
@@ -88,5 +87,3 @@ TEST_CASE("[Crypto] CryptoKey save public_only") {
 }
 
 } // namespace TestCryptoMbedTLS
-
-#endif // TEST_CRYPTO_MBEDTLS_H
diff --git a/engine/modules/mbedtls/tls_context_mbedtls.h b/engine/modules/mbedtls/tls_context_mbedtls.h
index ef964d35..ebe8a52c 100644
--- a/engine/modules/mbedtls/tls_context_mbedtls.h
+++ b/engine/modules/mbedtls/tls_context_mbedtls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TLS_CONTEXT_MBEDTLS_H
-#define TLS_CONTEXT_MBEDTLS_H
+#pragma once
 
 #include "crypto_mbedtls.h"
 
@@ -57,7 +56,7 @@ public:
 	void clear();
 
 	CookieContextMbedTLS();
-	~CookieContextMbedTLS();
+	~CookieContextMbedTLS() override;
 };
 
 class TLSContextMbedTLS : public RefCounted {
@@ -84,7 +83,5 @@ public:
 	mbedtls_ssl_context *get_context();
 
 	TLSContextMbedTLS();
-	~TLSContextMbedTLS();
+	~TLSContextMbedTLS() override;
 };
-
-#endif // TLS_CONTEXT_MBEDTLS_H
diff --git a/engine/modules/meshoptimizer/register_types.h b/engine/modules/meshoptimizer/register_types.h
index 02c52c48..4cbf72fe 100644
--- a/engine/modules/meshoptimizer/register_types.h
+++ b/engine/modules/meshoptimizer/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESHOPTIMIZER_REGISTER_TYPES_H
-#define MESHOPTIMIZER_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_meshoptimizer_module(ModuleInitializationLevel p_level);
 void uninitialize_meshoptimizer_module(ModuleInitializationLevel p_level);
-
-#endif // MESHOPTIMIZER_REGISTER_TYPES_H
diff --git a/engine/modules/minimp3/SCsub b/engine/modules/minimp3/SCsub
index e9491bb7..888f5e53 100644
--- a/engine/modules/minimp3/SCsub
+++ b/engine/modules/minimp3/SCsub
@@ -8,11 +8,7 @@ env_minimp3 = env_modules.Clone()
 
 thirdparty_dir = "#thirdparty/minimp3/"
 
-# Treat minimp3 headers as system headers to avoid raising warnings. Not supported on MSVC.
-if not env.msvc:
-    env_minimp3.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
-else:
-    env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
+env_minimp3.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 if not env["minimp3_extra_formats"]:
     env_minimp3.Append(CPPDEFINES=["MINIMP3_ONLY_MP3"])
diff --git a/engine/modules/minimp3/audio_stream_mp3.h b/engine/modules/minimp3/audio_stream_mp3.h
index d6755492..c8acae30 100644
--- a/engine/modules/minimp3/audio_stream_mp3.h
+++ b/engine/modules/minimp3/audio_stream_mp3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_MP3_H
-#define AUDIO_STREAM_MP3_H
+#pragma once
 
 #include "servers/audio/audio_stream.h"
 
@@ -151,5 +150,3 @@ public:
 	AudioStreamMP3();
 	virtual ~AudioStreamMP3();
 };
-
-#endif // AUDIO_STREAM_MP3_H
diff --git a/engine/modules/minimp3/register_types.cpp b/engine/modules/minimp3/register_types.cpp
index c85f0b33..c9f21fd8 100644
--- a/engine/modules/minimp3/register_types.cpp
+++ b/engine/modules/minimp3/register_types.cpp
@@ -32,40 +32,31 @@
 
 #include "audio_stream_mp3.h"
 
-#ifdef TOOLS_ENABLED
-#include "resource_importer_mp3.h"
-#endif
-
 #ifdef TOOLS_ENABLED
 #include "core/config/engine.h"
+#include "editor/editor_node.h"
+#include "resource_importer_mp3.h"
+
+static void _editor_init() {
+	Ref<ResourceImporterMP3> mp3_import;
+	mp3_import.instantiate();
+	ResourceFormatImporter::get_singleton()->add_importer(mp3_import);
+}
 #endif
 
 void initialize_minimp3_module(ModuleInitializationLevel p_level) {
-	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
-		return;
+	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
+		GDREGISTER_CLASS(AudioStreamMP3);
 	}
 
 #ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint()) {
-		Ref<ResourceImporterMP3> mp3_import;
-		mp3_import.instantiate();
-		ResourceFormatImporter::get_singleton()->add_importer(mp3_import);
+	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
+		GDREGISTER_CLASS(ResourceImporterMP3);
+
+		EditorNode::add_init_callback(_editor_init);
 	}
-
-	ClassDB::APIType prev_api = ClassDB::get_current_api();
-	ClassDB::set_current_api(ClassDB::API_EDITOR);
-
-	// Required to document import options in the class reference.
-	GDREGISTER_CLASS(ResourceImporterMP3);
-
-	ClassDB::set_current_api(prev_api);
 #endif
-
-	GDREGISTER_CLASS(AudioStreamMP3);
 }
 
 void uninitialize_minimp3_module(ModuleInitializationLevel p_level) {
-	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
-		return;
-	}
 }
diff --git a/engine/modules/minimp3/register_types.h b/engine/modules/minimp3/register_types.h
index 24f29b68..922a9a6c 100644
--- a/engine/modules/minimp3/register_types.h
+++ b/engine/modules/minimp3/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MINIMP3_REGISTER_TYPES_H
-#define MINIMP3_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_minimp3_module(ModuleInitializationLevel p_level);
 void uninitialize_minimp3_module(ModuleInitializationLevel p_level);
-
-#endif // MINIMP3_REGISTER_TYPES_H
diff --git a/engine/modules/minimp3/resource_importer_mp3.h b/engine/modules/minimp3/resource_importer_mp3.h
index 9e21c23c..8a8b7809 100644
--- a/engine/modules/minimp3/resource_importer_mp3.h
+++ b/engine/modules/minimp3/resource_importer_mp3.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_MP3_H
-#define RESOURCE_IMPORTER_MP3_H
+#pragma once
 
 #include "audio_stream_mp3.h"
 
@@ -62,5 +61,3 @@ public:
 
 	ResourceImporterMP3();
 };
-
-#endif // RESOURCE_IMPORTER_MP3_H
diff --git a/engine/modules/mobile_vr/config.py b/engine/modules/mobile_vr/config.py
index f6b64fb6..bbacf562 100644
--- a/engine/modules/mobile_vr/config.py
+++ b/engine/modules/mobile_vr/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return not env["disable_3d"]
+    return not env["disable_xr"]
 
 
 def configure(env):
diff --git a/engine/modules/mobile_vr/mobile_vr_interface.cpp b/engine/modules/mobile_vr/mobile_vr_interface.cpp
index dcaa1a12..8134a17f 100644
--- a/engine/modules/mobile_vr/mobile_vr_interface.cpp
+++ b/engine/modules/mobile_vr/mobile_vr_interface.cpp
@@ -135,7 +135,6 @@ void MobileVRInterface::set_position_from_sensors() {
 	// few things we need
 	Input *input = Input::get_singleton();
 	Vector3 down(0.0, -1.0, 0.0); // Down is Y negative
-	Vector3 north(0.0, 0.0, 1.0); // North is Z positive
 
 	// make copies of our inputs
 	bool has_grav = false;
diff --git a/engine/modules/mobile_vr/mobile_vr_interface.h b/engine/modules/mobile_vr/mobile_vr_interface.h
index d054ef14..36e6c0e8 100644
--- a/engine/modules/mobile_vr/mobile_vr_interface.h
+++ b/engine/modules/mobile_vr/mobile_vr_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MOBILE_VR_INTERFACE_H
-#define MOBILE_VR_INTERFACE_H
+#pragma once
 
 #include "servers/xr/xr_interface.h"
 #include "servers/xr/xr_positional_tracker.h"
@@ -175,5 +174,3 @@ public:
 	MobileVRInterface();
 	~MobileVRInterface();
 };
-
-#endif // MOBILE_VR_INTERFACE_H
diff --git a/engine/modules/mobile_vr/register_types.h b/engine/modules/mobile_vr/register_types.h
index 499de36d..10fb846e 100644
--- a/engine/modules/mobile_vr/register_types.h
+++ b/engine/modules/mobile_vr/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MOBILE_VR_REGISTER_TYPES_H
-#define MOBILE_VR_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_mobile_vr_module(ModuleInitializationLevel p_level);
 void uninitialize_mobile_vr_module(ModuleInitializationLevel p_level);
-
-#endif // MOBILE_VR_REGISTER_TYPES_H
diff --git a/engine/modules/mono/class_db_api_json.h b/engine/modules/mono/class_db_api_json.h
index d222988f..5ba42dca 100644
--- a/engine/modules/mono/class_db_api_json.h
+++ b/engine/modules/mono/class_db_api_json.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CLASS_DB_API_JSON_H
-#define CLASS_DB_API_JSON_H
+#pragma once
 
 // 'core/object/method_bind.h' defines DEBUG_METHODS_ENABLED, but it looks like we
 // cannot include it here. That's why we include it through 'core/object/class_db.h'.
@@ -42,5 +41,3 @@
 void class_db_api_to_json(const String &p_output_file, ClassDB::APIType p_api);
 
 #endif // DEBUG_METHODS_ENABLED
-
-#endif // CLASS_DB_API_JSON_H
diff --git a/engine/modules/mono/csharp_script.cpp b/engine/modules/mono/csharp_script.cpp
index 76c3ca3c..7388f8cf 100644
--- a/engine/modules/mono/csharp_script.cpp
+++ b/engine/modules/mono/csharp_script.cpp
@@ -66,8 +66,6 @@
 #include "editor/node_dock.h"
 #endif
 
-#include <stdint.h>
-
 // Types that will be skipped over (in favor of their base types) when setting up instance bindings.
 // This must be a superset of `ignored_types` in bindings_generator.cpp.
 const Vector<String> ignored_types = {};
@@ -364,7 +362,7 @@ Ref<Script> CSharpLanguage::make_template(const String &p_template, const String
 	Ref<CSharpScript> scr;
 	scr.instantiate();
 
-	String class_name_no_spaces = p_class_name.replace(" ", "_");
+	String class_name_no_spaces = p_class_name.replace_char(' ', '_');
 	String base_class_name = get_base_class_name(p_base_class_name, class_name_no_spaces);
 	String processed_template = p_template;
 	processed_template = processed_template.replace("_BINDINGS_NAMESPACE_", BINDINGS_NAMESPACE)
@@ -615,7 +613,7 @@ bool CSharpLanguage::is_assembly_reloading_needed() {
 			return false; // Already up to date
 		}
 	} else {
-		String assembly_name = path::get_csharp_project_name();
+		String assembly_name = Path::get_csharp_project_name();
 
 		assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir()
 								.path_join(assembly_name + ".dll");
@@ -652,7 +650,7 @@ void CSharpLanguage::reload_assemblies(bool p_soft_reload) {
 
 		for (SelfList<CSharpScript> *elem = script_list.first(); elem; elem = elem->next()) {
 			// Do not reload scripts with only non-collectible instances to avoid disrupting event subscriptions and such.
-			bool is_reloadable = elem->self()->instances.size() == 0;
+			bool is_reloadable = elem->self()->instances.is_empty();
 			for (Object *obj : elem->self()->instances) {
 				ERR_CONTINUE(!obj->get_script_instance());
 				CSharpInstance *csi = static_cast<CSharpInstance *>(obj->get_script_instance());
@@ -1059,7 +1057,7 @@ void CSharpLanguage::_editor_init_callback() {
 	const void **interop_funcs = godotsharp::get_editor_interop_funcs(interop_funcs_size);
 
 	Object *editor_plugin_obj = GDMono::get_singleton()->get_plugin_callbacks().LoadToolsAssemblyCallback(
-			GodotSharpDirs::get_data_editor_tools_dir().path_join("GodotTools.dll").utf16(),
+			GodotSharpDirs::get_data_editor_tools_dir().path_join("GodotTools.dll").utf16().get_data(),
 			interop_funcs, interop_funcs_size);
 	CRASH_COND(editor_plugin_obj == nullptr);
 
diff --git a/engine/modules/mono/csharp_script.h b/engine/modules/mono/csharp_script.h
index 4dfed135..3253a867 100644
--- a/engine/modules/mono/csharp_script.h
+++ b/engine/modules/mono/csharp_script.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CSHARP_SCRIPT_H
-#define CSHARP_SCRIPT_H
+#pragma once
 
 #include "mono_gc_handle.h"
 #include "mono_gd/gd_mono.h"
@@ -603,5 +602,3 @@ public:
 	void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
 	bool recognize(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // CSHARP_SCRIPT_H
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
index c5f2dfee..f22870f0 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Godot.NET.Sdk.csproj
@@ -7,7 +7,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>Godot.NET.Sdk</PackageId>
-    <Version>4.4.0</Version>
+    <Version>4.5.0</Version>
     <PackageVersion>$(PackageVersion_Godot_NET_Sdk)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
index d10f9ae0..99e612aa 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.props
@@ -103,15 +103,6 @@
     <GodotDefineConstants>$(GodotDefineConstants);$(GodotPlatformConstants);$(GodotVersionConstants)</GodotDefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- ExportDebug also defines DEBUG like Debug does. -->
-    <DefineConstants Condition=" '$(Configuration)' == 'ExportDebug' ">$(DefineConstants);DEBUG</DefineConstants>
-    <!-- Debug defines TOOLS to differentiate between Debug and ExportDebug configurations. -->
-    <DefineConstants Condition=" '$(Configuration)' == 'Debug' ">$(DefineConstants);TOOLS</DefineConstants>
-
-    <DefineConstants>$(GodotDefineConstants);$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-
   <Import Project="$(MSBuildThisFileDirectory)\Android.props" Condition=" '$(GodotTargetPlatform)' == 'android' " />
   <Import Project="$(MSBuildThisFileDirectory)\iOSNativeAOT.props" Condition=" '$(GodotTargetPlatform)' == 'ios' " />
 </Project>
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
index 29ef76a5..4bc76a85 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk/Sdk/Sdk.targets
@@ -10,6 +10,19 @@
     <DefineConstants Condition=" '$(GodotFloat64)' == 'true' ">GODOT_REAL_T_IS_DOUBLE;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
+  <!--
+  We are defining ExportDebug and Debug in Sdk.targets to ensure that the user cannot
+  override the DefineConstants property in their csproj file and break the editor functionality.
+  -->
+  <PropertyGroup>
+    <!-- ExportDebug also defines DEBUG like Debug does. -->
+    <DefineConstants Condition=" '$(Configuration)' == 'ExportDebug' ">$(DefineConstants);DEBUG</DefineConstants>
+    <!-- Debug defines TOOLS to differentiate between Debug and ExportDebug configurations. -->
+    <DefineConstants Condition=" '$(Configuration)' == 'Debug' ">$(DefineConstants);TOOLS</DefineConstants>
+
+    <DefineConstants>$(GodotDefineConstants);$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+
   <!-- C# source generators -->
   <ItemGroup Condition=" '$(DisableImplicitGodotGeneratorReferences)' != 'true' ">
     <PackageReference Include="Godot.SourceGenerators" Version="$(PackageVersion_Godot_SourceGenerators)" />
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/NestedInGenericTest.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/NestedInGenericTest.cs
new file mode 100644
index 00000000..01d6ab38
--- /dev/null
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/NestedInGenericTest.cs
@@ -0,0 +1,15 @@
+using Xunit;
+
+namespace Godot.SourceGenerators.Tests;
+
+public class NestedInGenericTest
+{
+    [Fact]
+    public async void GenerateScriptMethodsTest()
+    {
+        await CSharpSourceGeneratorVerifier<ScriptMethodsGenerator>.Verify(
+            "NestedInGeneric.cs",
+            "GenericClass(Of T).NestedClass_ScriptMethods.generated.cs"
+        );
+    }
+}
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPropertyDefValGeneratorTests.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPropertyDefValGeneratorTests.cs
index 7711bce1..4abff581 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPropertyDefValGeneratorTests.cs
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/ScriptPropertyDefValGeneratorTests.cs
@@ -22,6 +22,13 @@ public class ScriptPropertyDefValGeneratorTests
         );
     }
 
+    [Fact]
+    public async void ExportedProperties2()
+    {
+        await CSharpSourceGeneratorVerifier<ScriptPropertyDefValGenerator>.Verify(
+            "ExportedProperties2.cs", "ExportedProperties2_ScriptPropertyDefVal.generated.cs");
+    }
+
     [Fact]
     public async void ExportedComplexStrings()
     {
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/ExportedProperties2_ScriptPropertyDefVal.generated.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/ExportedProperties2_ScriptPropertyDefVal.generated.cs
new file mode 100644
index 00000000..9cdb490b
--- /dev/null
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/ExportedProperties2_ScriptPropertyDefVal.generated.cs
@@ -0,0 +1,25 @@
+partial class ExportedProperties2
+{
+#pragma warning disable CS0109 // Disable warning about redundant 'new' keyword
+#if TOOLS
+    /// <summary>
+    /// Get the default values for all properties declared in this class.
+    /// This method is used by Godot to determine the value that will be
+    /// used by the inspector when resetting properties.
+    /// Do not call this method.
+    /// </summary>
+    [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]
+    internal new static global::System.Collections.Generic.Dictionary<global::Godot.StringName, global::Godot.Variant> GetGodotPropertyDefaultValues()
+    {
+        var values = new global::System.Collections.Generic.Dictionary<global::Godot.StringName, global::Godot.Variant>(3);
+        int __Health_default_value = default;
+        values.Add(PropertyName.@Health, global::Godot.Variant.From<int>(__Health_default_value));
+        global::Godot.Resource __SubResource_default_value = default;
+        values.Add(PropertyName.@SubResource, global::Godot.Variant.From<global::Godot.Resource>(__SubResource_default_value));
+        string[] __Strings_default_value = default;
+        values.Add(PropertyName.@Strings, global::Godot.Variant.From<string[]>(__Strings_default_value));
+        return values;
+    }
+#endif // TOOLS
+#pragma warning restore CS0109
+}
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/GenericClass(Of T).NestedClass_ScriptMethods.generated.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/GenericClass(Of T).NestedClass_ScriptMethods.generated.cs
new file mode 100644
index 00000000..94ac7422
--- /dev/null
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/GeneratedSources/GenericClass(Of T).NestedClass_ScriptMethods.generated.cs	
@@ -0,0 +1,16 @@
+using Godot;
+using Godot.NativeInterop;
+
+partial class GenericClass<T>
+{
+partial class NestedClass
+{
+#pragma warning disable CS0109 // Disable warning about redundant 'new' keyword
+    /// <summary>
+    /// Cached StringNames for the methods contained in this class, for fast lookup.
+    /// </summary>
+    public new class MethodName : global::Godot.GodotObject.MethodName {
+    }
+#pragma warning restore CS0109
+}
+}
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/ExportedProperties2.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/ExportedProperties2.cs
new file mode 100644
index 00000000..cd03d643
--- /dev/null
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/ExportedProperties2.cs
@@ -0,0 +1,13 @@
+using Godot;
+using System;
+
+[GlobalClass]
+public partial class ExportedProperties2(int health, Resource subResource, string[] strings) : Resource
+{
+    [Export]
+    public int Health { get; set; } = health;
+    [Export]
+    public Resource SubResource { get; set; } = subResource;
+    [Export]
+    public string[] Strings { get; set; } = strings ?? System.Array.Empty<string>();
+}
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/NestedInGeneric.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/NestedInGeneric.cs
new file mode 100644
index 00000000..32e12d06
--- /dev/null
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators.Tests/TestData/Sources/NestedInGeneric.cs
@@ -0,0 +1,9 @@
+using Godot;
+
+public partial class GenericClass<T>
+{
+	public partial class NestedClass : GodotObject
+	{
+
+	}
+}
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Shipped.md b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Shipped.md
index 19a9aedc..28baa12c 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Shipped.md
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Shipped.md
@@ -28,3 +28,22 @@ Rule ID | Category | Severity | Notes
 GD0107  |  Usage   |  Error   | ScriptPropertyDefValGenerator, [Documentation](https://docs.godotengine.org/en/stable/tutorials/scripting/c_sharp/diagnostics/GD0107.html)
 GD0401  |  Usage   |  Error   | GlobalClassAnalyzer, [Documentation](https://docs.godotengine.org/en/stable/tutorials/scripting/c_sharp/diagnostics/GD0401.html)
 GD0402  |  Usage   |  Error   | GlobalClassAnalyzer, [Documentation](https://docs.godotengine.org/en/stable/tutorials/scripting/c_sharp/diagnostics/GD0402.html)
+
+## Release 4.3
+
+### New Rules
+
+Rule ID | Category | Severity | Notes
+--------|----------|----------|--------------------
+GD0003  |  Usage   |  Error   | ScriptPathAttributeGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0003.html)
+
+## Release 4.4
+
+### New Rules
+
+Rule ID | Category | Severity | Notes
+--------|----------|----------|--------------------
+GD0108  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0108.html)
+GD0109  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0109.html)
+GD0110  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0110.html)
+GD0111  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0111.html)
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Unshipped.md b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Unshipped.md
index aeb9a359..e69de29b 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Unshipped.md
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/AnalyzerReleases.Unshipped.md
@@ -1,9 +0,0 @@
-### New Rules
-
-Rule ID | Category | Severity | Notes
---------|----------|----------|--------------------
-GD0003  |  Usage   |  Error   | ScriptPathAttributeGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0003.html)
-GD0108  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0108.html)
-GD0109  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0109.html)
-GD0110  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0110.html)
-GD0111  |  Usage   |  Error   | ScriptPropertiesGenerator, [Documentation](https://docs.godotengine.org/en/latest/tutorials/scripting/c_sharp/diagnostics/GD0111.html)
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
index 46c44616..12e25389 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ExtensionMethods.cs
@@ -183,7 +183,7 @@ namespace Godot.SourceGenerators
 
         public static string NameWithTypeParameters(this INamedTypeSymbol symbol)
         {
-            return symbol.IsGenericType ?
+            return symbol.IsGenericType && symbol.TypeParameters.Length > 0 ?
                 string.Concat(symbol.Name, "<", string.Join(", ", symbol.TypeParameters), ">") :
                 symbol.Name;
         }
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj
index e8302f41..ecf36ef1 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/Godot.SourceGenerators.csproj
@@ -10,7 +10,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>Godot.SourceGenerators</PackageId>
-    <Version>4.4.0</Version>
+    <Version>4.5.0</Version>
     <PackageVersion>$(PackageVersion_Godot_SourceGenerators)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs
index 626f51ec..fff32a10 100644
--- a/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs
+++ b/engine/modules/mono/editor/Godot.NET.Sdk/Godot.SourceGenerators/ScriptPropertyDefValGenerator.cs
@@ -215,7 +215,11 @@ namespace Godot.SourceGenerators
                     if (propertyDeclarationSyntax.Initializer != null)
                     {
                         var sm = context.Compilation.GetSemanticModel(propertyDeclarationSyntax.Initializer.SyntaxTree);
-                        value = propertyDeclarationSyntax.Initializer.Value.FullQualifiedSyntax(sm);
+                        var initializerValue = propertyDeclarationSyntax.Initializer.Value;
+                        if (!IsStaticallyResolvable(initializerValue, sm))
+                            value = "default";
+                        else
+                            value = propertyDeclarationSyntax.Initializer.Value.FullQualifiedSyntax(sm);
                     }
                     else
                     {
@@ -418,6 +422,106 @@ namespace Godot.SourceGenerators
             context.AddSource(uniqueHint, SourceText.From(source.ToString(), Encoding.UTF8));
         }
 
+        private static bool IsStaticallyResolvable(ExpressionSyntax expression, SemanticModel semanticModel)
+        {
+            // Handle literals (e.g., `10`, `"string"`, `true`, etc.)
+            if (expression is LiteralExpressionSyntax)
+            {
+                return true;
+            }
+
+            // Handle identifiers (e.g., variable names)
+            if (expression is IdentifierNameSyntax identifier)
+            {
+                var symbolInfo = semanticModel.GetSymbolInfo(identifier).Symbol;
+
+                // Ensure it's a static member
+                return symbolInfo is { IsStatic: true };
+            }
+
+            // Handle member access (e.g., `MyClass.StaticValue`)
+            if (expression is MemberAccessExpressionSyntax memberAccess)
+            {
+                var symbolInfo = semanticModel.GetSymbolInfo(memberAccess).Symbol;
+
+                // Ensure it's referring to a static member
+                return symbolInfo is { IsStatic: true };
+            }
+
+            // Handle object creation expressions (e.g., `new Vector2(1.0f, 2.0f)`)
+            if (expression is ObjectCreationExpressionSyntax objectCreation)
+            {
+                // Recursively ensure all its arguments are self-contained
+                if (objectCreation.ArgumentList == null)
+                {
+                    return true;
+                }
+                foreach (var argument in objectCreation.ArgumentList.Arguments)
+                {
+                    if (!IsStaticallyResolvable(argument.Expression, semanticModel))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            if (expression is ImplicitObjectCreationExpressionSyntax)
+            {
+                return true;
+            }
+
+            if (expression is InvocationExpressionSyntax invocationExpression)
+            {
+                // Resolve the method being invoked
+                var symbolInfo = semanticModel.GetSymbolInfo(invocationExpression).Symbol;
+
+                if (symbolInfo is IMethodSymbol methodSymbol)
+                {
+                    // Ensure the method is static
+                    if (methodSymbol.IsStatic)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            if (expression is InterpolatedStringExpressionSyntax interpolatedString)
+            {
+                foreach (var content in interpolatedString.Contents)
+                {
+                    if (content is not InterpolationSyntax interpolation)
+                    {
+                        continue;
+                    }
+                    // Analyze the expression inside `${...}`
+                    var interpolatedExpression = interpolation.Expression;
+
+                    if (!IsStaticallyResolvable(interpolatedExpression, semanticModel))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            if (expression is InitializerExpressionSyntax initializerExpressionSyntax)
+            {
+                foreach (var content in initializerExpressionSyntax.Expressions)
+                {
+                    if (!IsStaticallyResolvable(content, semanticModel))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            // Handle other expressions conservatively (e.g., method calls, instance references, etc.)
+            return false;
+        }
+
         private static bool MemberHasNodeType(ITypeSymbol memberType, MarshalType marshalType)
         {
             if (marshalType == MarshalType.GodotObjectOrDerived)
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs b/engine/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
index 7a07e0a9..22420e2b 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
@@ -191,6 +191,13 @@ namespace GodotTools.ProjectEditor
                 // Otherwise, it can be removed.
                 if (mainTfmVersion > minTfmVersion)
                 {
+                    var propertyTfmVersion = NuGetFramework.Parse(property.Value).Version;
+                    if (propertyTfmVersion == minTfmVersion)
+                    {
+                        // The 'TargetFramework' property already matches the minimum version.
+                        continue;
+                    }
+
                     property.Value = minTfmValue;
                 }
                 else
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs b/engine/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
index ea29896f..cb202907 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/Export/ExportPlugin.cs
@@ -37,8 +37,28 @@ namespace GodotTools.Export
 
         public override Godot.Collections.Array<Godot.Collections.Dictionary> _GetExportOptions(EditorExportPlatform platform)
         {
-            return new Godot.Collections.Array<Godot.Collections.Dictionary>()
+            var exportOptionList = new Godot.Collections.Array<Godot.Collections.Dictionary>();
+
+            if (platform.GetOsName().Equals(OS.Platforms.Android, StringComparison.OrdinalIgnoreCase))
             {
+                exportOptionList.Add
+                (
+                    new Godot.Collections.Dictionary()
+                    {
+                        {
+                            "option", new Godot.Collections.Dictionary()
+                            {
+                                { "name", "dotnet/android_use_linux_bionic" },
+                                { "type", (int)Variant.Type.Bool }
+                            }
+                        },
+                        { "default_value", false }
+                    }
+                );
+            }
+
+            exportOptionList.Add
+            (
                 new Godot.Collections.Dictionary()
                 {
                     {
@@ -49,7 +69,10 @@ namespace GodotTools.Export
                         }
                     },
                     { "default_value", false }
-                },
+                }
+            );
+            exportOptionList.Add
+            (
                 new Godot.Collections.Dictionary()
                 {
                     {
@@ -60,7 +83,10 @@ namespace GodotTools.Export
                         }
                     },
                     { "default_value", true }
-                },
+                }
+            );
+            exportOptionList.Add
+            (
                 new Godot.Collections.Dictionary()
                 {
                     {
@@ -72,7 +98,8 @@ namespace GodotTools.Export
                     },
                     { "default_value", false }
                 }
-            };
+            );
+            return exportOptionList;
         }
 
         private void AddExceptionMessage(EditorExportPlatform platform, Exception exception)
@@ -158,11 +185,12 @@ namespace GodotTools.Export
                 throw new NotImplementedException("Target platform not yet implemented.");
             }
 
+            bool useAndroidLinuxBionic = (bool)GetOption("dotnet/android_use_linux_bionic");
             PublishConfig publishConfig = new()
             {
                 BuildConfig = isDebug ? "ExportDebug" : "ExportRelease",
                 IncludeDebugSymbols = (bool)GetOption("dotnet/include_debug_symbols"),
-                RidOS = DetermineRuntimeIdentifierOS(platform),
+                RidOS = DetermineRuntimeIdentifierOS(platform, useAndroidLinuxBionic),
                 Archs = new List<string>(),
                 UseTempDir = platform != OS.Platforms.iOS, // xcode project links directly to files in the publish dir, so use one that sticks around.
                 BundleOutputs = true,
@@ -329,6 +357,14 @@ namespace GodotTools.Export
 
                                         if (IsSharedObject(fileName))
                                         {
+                                            if (fileName.EndsWith(".so") && !fileName.StartsWith("lib"))
+                                            {
+                                                // Add 'lib' prefix required for all native libraries in Android.
+                                                string newPath = string.Concat(path.AsSpan(0, path.Length - fileName.Length), "lib", fileName);
+                                                Godot.DirAccess.RenameAbsolute(path, newPath);
+                                                path = newPath;
+                                            }
+
                                             AddSharedObject(path, tags: new string[] { arch },
                                                 Path.Join(projectDataDirName,
                                                     Path.GetRelativePath(publishOutputDir,
@@ -453,8 +489,14 @@ namespace GodotTools.Export
             return path;
         }
 
-        private string DetermineRuntimeIdentifierOS(string platform)
-            => OS.DotNetOSPlatformMap[platform];
+        private string DetermineRuntimeIdentifierOS(string platform, bool useAndroidLinuxBionic)
+        {
+            if (platform == OS.Platforms.Android && useAndroidLinuxBionic)
+            {
+                return OS.DotNetOS.LinuxBionic;
+            }
+            return OS.DotNetOSPlatformMap[platform];
+        }
 
         private string DetermineRuntimeIdentifierArch(string arch)
         {
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs b/engine/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs
index 049cc585..ba523803 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/ExternalEditorId.cs
@@ -8,6 +8,7 @@ namespace GodotTools
         MonoDevelop,
         VsCode,
         Rider,
-        CustomEditor
+        CustomEditor,
+        Fleet,
     }
 }
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs b/engine/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
index e1dc1be9..50aa6811 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
@@ -286,9 +286,10 @@ namespace GodotTools
                 case ExternalEditorId.VisualStudioForMac:
                     goto case ExternalEditorId.MonoDevelop;
                 case ExternalEditorId.Rider:
+                case ExternalEditorId.Fleet:
                 {
                     string scriptPath = ProjectSettings.GlobalizePath(script.ResourcePath);
-                    RiderPathManager.OpenFile(GodotSharpDirs.ProjectSlnPath, scriptPath, line + 1, col);
+                    RiderPathManager.OpenFile(editorId, GodotSharpDirs.ProjectSlnPath, scriptPath, line + 1, col);
                     return Error.Ok;
                 }
                 case ExternalEditorId.MonoDevelop:
@@ -568,7 +569,8 @@ namespace GodotTools
                 settingsHintStr += $",Visual Studio:{(int)ExternalEditorId.VisualStudio}" +
                                    $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" +
                                    $",Visual Studio Code and VSCodium:{(int)ExternalEditorId.VsCode}" +
-                                   $",JetBrains Rider and Fleet:{(int)ExternalEditorId.Rider}" +
+                                   $",JetBrains Rider:{(int)ExternalEditorId.Rider}" +
+                                   $",JetBrains Fleet:{(int)ExternalEditorId.Fleet}" +
                                    $",Custom:{(int)ExternalEditorId.CustomEditor}";
             }
             else if (OS.IsMacOS)
@@ -576,14 +578,16 @@ namespace GodotTools
                 settingsHintStr += $",Visual Studio:{(int)ExternalEditorId.VisualStudioForMac}" +
                                    $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" +
                                    $",Visual Studio Code and VSCodium:{(int)ExternalEditorId.VsCode}" +
-                                   $",JetBrains Rider and Fleet:{(int)ExternalEditorId.Rider}" +
+                                   $",JetBrains Rider:{(int)ExternalEditorId.Rider}" +
+                                   $",JetBrains Fleet:{(int)ExternalEditorId.Fleet}" +
                                    $",Custom:{(int)ExternalEditorId.CustomEditor}";
             }
             else if (OS.IsUnixLike)
             {
                 settingsHintStr += $",MonoDevelop:{(int)ExternalEditorId.MonoDevelop}" +
                                    $",Visual Studio Code and VSCodium:{(int)ExternalEditorId.VsCode}" +
-                                   $",JetBrains Rider and Fleet:{(int)ExternalEditorId.Rider}" +
+                                   $",JetBrains Rider:{(int)ExternalEditorId.Rider}" +
+                                   $",JetBrains Fleet:{(int)ExternalEditorId.Fleet}" +
                                    $",Custom:{(int)ExternalEditorId.CustomEditor}";
             }
 
@@ -640,7 +644,6 @@ namespace GodotTools
             _inspectorPluginWeak = WeakRef(inspectorPlugin);
 
             BuildManager.Initialize();
-            RiderPathManager.Initialize();
 
             GodotIdeManager = new GodotIdeManager();
             AddChild(GodotIdeManager);
@@ -664,13 +667,28 @@ namespace GodotTools
 
         private void OnSettingsChanged()
         {
-            // We want to force NoConsoleLogging to true when the VerbosityLevel is at Detailed or above.
-            // At that point, there's so much info logged that it doesn't make sense to display it in
-            // the tiny editor window, and it'd make the editor hang or crash anyway.
-            var verbosityLevel = _editorSettings.GetSetting(Settings.VerbosityLevel).As<VerbosityLevelId>();
-            var hideConsoleLog = (bool)_editorSettings.GetSetting(Settings.NoConsoleLogging);
-            if (verbosityLevel >= VerbosityLevelId.Detailed && !hideConsoleLog)
-                _editorSettings.SetSetting(Settings.NoConsoleLogging, Variant.From(true));
+            var changedSettings = _editorSettings.GetChangedSettings();
+            if (changedSettings.Contains(Settings.VerbosityLevel))
+            {
+                // We want to force NoConsoleLogging to true when the VerbosityLevel is at Detailed or above.
+                // At that point, there's so much info logged that it doesn't make sense to display it in
+                // the tiny editor window, and it'd make the editor hang or crash anyway.
+                var verbosityLevel = _editorSettings.GetSetting(Settings.VerbosityLevel).As<VerbosityLevelId>();
+                var hideConsoleLog = (bool)_editorSettings.GetSetting(Settings.NoConsoleLogging);
+                if (verbosityLevel >= VerbosityLevelId.Detailed && !hideConsoleLog)
+                    _editorSettings.SetSetting(Settings.NoConsoleLogging, Variant.From(true));
+            }
+
+            if (changedSettings.Contains(Settings.ExternalEditor) && !changedSettings.Contains(RiderPathManager.EditorPathSettingName))
+            {
+                var editor = _editorSettings.GetSetting(Settings.ExternalEditor).As<ExternalEditorId>();
+                if (editor != ExternalEditorId.Fleet && editor != ExternalEditorId.Rider)
+                {
+                    return;
+                }
+
+                RiderPathManager.InitializeIfNeeded(editor);
+            }
         }
 
         protected override void Dispose(bool disposing)
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj b/engine/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj
index c82da741..e027b7df 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/GodotTools.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3.0" ExcludeAssets="runtime" PrivateAssets="all" />
-    <PackageReference Include="JetBrains.Rider.PathLocator" Version="1.0.9" />
+    <PackageReference Include="JetBrains.Rider.PathLocator" Version="1.0.12" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <Reference Include="GodotSharp">
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs b/engine/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
index 6563bfbb..8456ac3e 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/Ides/GodotIdeManager.cs
@@ -66,6 +66,8 @@ namespace GodotTools.Ides
                     return "VisualStudioCode";
                 case ExternalEditorId.Rider:
                     return "Rider";
+                case ExternalEditorId.Fleet:
+                    return "Fleet";
                 case ExternalEditorId.VisualStudioForMac:
                     return "VisualStudioForMac";
                 case ExternalEditorId.MonoDevelop:
@@ -107,6 +109,7 @@ namespace GodotTools.Ides
                 case ExternalEditorId.VisualStudio:
                 case ExternalEditorId.VsCode:
                 case ExternalEditorId.Rider:
+                case ExternalEditorId.Fleet:
                 case ExternalEditorId.CustomEditor:
                     throw new NotSupportedException();
                 case ExternalEditorId.VisualStudioForMac:
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs b/engine/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
index 5c54d2d9..94a3bc2a 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/Ides/Rider/RiderPathManager.cs
@@ -9,7 +9,7 @@ namespace GodotTools.Ides.Rider
 {
     public static class RiderPathManager
     {
-        private const string EditorPathSettingName = "dotnet/editor/editor_path_optional";
+        internal const string EditorPathSettingName = "dotnet/editor/editor_path_optional";
 
         private static readonly RiderPathLocator RiderPathLocator;
         private static readonly RiderFileOpener RiderFileOpener;
@@ -32,44 +32,40 @@ namespace GodotTools.Ides.Rider
             return null;
         }
 
-        public static void Initialize()
+        public static void InitializeIfNeeded(ExternalEditorId editor)
         {
             var editorSettings = EditorInterface.Singleton.GetEditorSettings();
-            var editor = editorSettings.GetSetting(GodotSharpEditor.Settings.ExternalEditor).As<ExternalEditorId>();
-            if (editor == ExternalEditorId.Rider)
+            if (!editorSettings.HasSetting(EditorPathSettingName))
             {
-                if (!editorSettings.HasSetting(EditorPathSettingName))
+                Globals.EditorDef(EditorPathSettingName, "");
+                editorSettings.AddPropertyInfo(new Godot.Collections.Dictionary
                 {
-                    Globals.EditorDef(EditorPathSettingName, "");
-                    editorSettings.AddPropertyInfo(new Godot.Collections.Dictionary
-                    {
-                        ["type"] = (int)Variant.Type.String,
-                        ["name"] = EditorPathSettingName,
-                        ["hint"] = (int)PropertyHint.File,
-                        ["hint_string"] = ""
-                    });
-                }
-
-                var riderPath = (string)editorSettings.GetSetting(EditorPathSettingName);
-                if (File.Exists(riderPath))
-                {
-                    Globals.EditorDef(EditorPathSettingName, riderPath);
-                    return;
-                }
-
-                var paths = RiderPathLocator.GetAllRiderPaths();
-                if (paths.Length == 0)
-                {
-                    return;
-                }
-
-                string newPath = paths.Last().Path;
-                Globals.EditorDef(EditorPathSettingName, newPath);
-                editorSettings.SetSetting(EditorPathSettingName, newPath);
+                    ["type"] = (int)Variant.Type.String,
+                    ["name"] = EditorPathSettingName,
+                    ["hint"] = (int)PropertyHint.File,
+                    ["hint_string"] = ""
+                });
             }
+
+            var editorPath = (string)editorSettings.GetSetting(EditorPathSettingName);
+            if (File.Exists(editorPath) && IsMatch(editor, editorPath))
+            {
+                Globals.EditorDef(EditorPathSettingName, editorPath);
+                return;
+            }
+
+            var paths = RiderPathLocator.GetAllRiderPaths().Where(info => IsMatch(editor, info.Path)).ToArray();
+            if (paths.Length == 0)
+            {
+                return;
+            }
+
+            string newPath = paths.Last().Path;
+            Globals.EditorDef(EditorPathSettingName, newPath);
+            editorSettings.SetSetting(EditorPathSettingName, newPath);
         }
 
-        public static bool IsRider(string path)
+        private static bool IsMatch(ExternalEditorId editorId, string path)
         {
             if (path.IndexOfAny(Path.GetInvalidPathChars()) != -1)
             {
@@ -77,14 +73,15 @@ namespace GodotTools.Ides.Rider
             }
 
             var fileInfo = new FileInfo(path);
-            return fileInfo.Name.StartsWith("rider", StringComparison.OrdinalIgnoreCase);
+            var name = editorId == ExternalEditorId.Fleet ? "fleet" : "rider";
+            return fileInfo.Name.StartsWith(name, StringComparison.OrdinalIgnoreCase);
         }
 
-        private static string? CheckAndUpdatePath(string? riderPath)
+        private static string? CheckAndUpdatePath(ExternalEditorId editorId, string? idePath)
         {
-            if (File.Exists(riderPath))
+            if (File.Exists(idePath))
             {
-                return riderPath;
+                return idePath;
             }
 
             var allInfos = RiderPathLocator.GetAllRiderPaths();
@@ -93,9 +90,13 @@ namespace GodotTools.Ides.Rider
                 return null;
             }
 
-            // RiderPathLocator includes Rider and Fleet locations, prefer Rider when available.
-            var preferredInfo = allInfos.LastOrDefault(info => IsRider(info.Path), allInfos[allInfos.Length - 1]);
-            string newPath = preferredInfo.Path;
+            // RiderPathLocator includes Rider and Fleet locations.
+            var matchingIde = allInfos.LastOrDefault(info => IsMatch(editorId, info.Path));
+            var newPath = matchingIde.Path;
+            if (string.IsNullOrEmpty(newPath))
+            {
+                return null;
+            }
 
             var editorSettings = EditorInterface.Singleton.GetEditorSettings();
             editorSettings.SetSetting(EditorPathSettingName, newPath);
@@ -103,10 +104,10 @@ namespace GodotTools.Ides.Rider
             return newPath;
         }
 
-        public static void OpenFile(string slnPath, string scriptPath, int line, int column)
+        public static void OpenFile(ExternalEditorId editorId, string slnPath, string scriptPath, int line, int column)
         {
-            string? pathFromSettings = GetRiderPathFromSettings();
-            string? path = CheckAndUpdatePath(pathFromSettings);
+            var pathFromSettings = GetRiderPathFromSettings();
+            var path = CheckAndUpdatePath(editorId, pathFromSettings);
             if (string.IsNullOrEmpty(path))
             {
                 GD.PushError($"Error when trying to run code editor: JetBrains Rider or Fleet. Could not find path to the editor.");
diff --git a/engine/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs b/engine/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
index 355264e4..7487b753 100644
--- a/engine/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
+++ b/engine/modules/mono/editor/GodotTools/GodotTools/Utils/OS.cs
@@ -55,6 +55,7 @@ namespace GodotTools.Utils
             public const string Linux = "linux";
             public const string Win10 = "win10";
             public const string Android = "android";
+            public const string LinuxBionic = "linux-bionic";
             public const string iOS = "ios";
             public const string iOSSimulator = "iossimulator";
             public const string Browser = "browser";
@@ -99,7 +100,6 @@ namespace GodotTools.Utils
             [Platforms.iOS] = DotNetOS.iOS,
             [Platforms.Web] = DotNetOS.Browser
         };
-
         private static bool IsOS(string name)
         {
             Internal.godot_icall_Utils_OS_GetPlatformName(out godot_string dest);
diff --git a/engine/modules/mono/editor/bindings_generator.cpp b/engine/modules/mono/editor/bindings_generator.cpp
index cf2dc568..bc266cef 100644
--- a/engine/modules/mono/editor/bindings_generator.cpp
+++ b/engine/modules/mono/editor/bindings_generator.cpp
@@ -30,7 +30,7 @@
 
 #include "bindings_generator.h"
 
-#if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
+#ifdef DEBUG_METHODS_ENABLED
 
 #include "../godotsharp_defs.h"
 #include "../utils/naming_utils.h"
@@ -141,6 +141,7 @@ const Vector<String> prop_allowed_inherited_member_hiding = {
 	"MenuBar.TextDirection",
 	"RichTextLabel.TextDirection",
 	"TextEdit.TextDirection",
+	"FoldableContainer.TextDirection",
 	"VisualShaderNodeReroute.PortType",
 	// The following instances are uniquely egregious violations, hiding `GetType()` from `object`.
 	// Included for the sake of CI, with the understanding that they *deserve* warnings.
@@ -172,8 +173,7 @@ static String fix_doc_description(const String &p_bbcode) {
 	// This seems to be the correct way to do this. It's the same EditorHelp does.
 
 	return p_bbcode.dedent()
-			.replace("\t", "")
-			.replace("\r", "")
+			.remove_chars("\t\r")
 			.strip_edges();
 }
 
@@ -218,7 +218,7 @@ String BindingsGenerator::bbcode_to_text(const String &p_bbcode, const TypeInter
 		int brk_end = bbcode.find_char(']', brk_pos + 1);
 
 		if (brk_end == -1) {
-			String text = bbcode.substr(brk_pos, bbcode.length() - brk_pos);
+			String text = bbcode.substr(brk_pos);
 			if (code_tag || tag_stack.size() > 0) {
 				output.append("'" + text + "'");
 			}
@@ -229,7 +229,7 @@ String BindingsGenerator::bbcode_to_text(const String &p_bbcode, const TypeInter
 		String tag = bbcode.substr(brk_pos + 1, brk_end - brk_pos - 1);
 
 		if (tag.begins_with("/")) {
-			bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1, tag.length());
+			bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1);
 
 			if (!tag_ok) {
 				output.append("]");
@@ -246,11 +246,11 @@ String BindingsGenerator::bbcode_to_text(const String &p_bbcode, const TypeInter
 		} else if (tag.begins_with("method ") || tag.begins_with("constructor ") || tag.begins_with("operator ") || tag.begins_with("member ") || tag.begins_with("signal ") || tag.begins_with("enum ") || tag.begins_with("constant ") || tag.begins_with("theme_item ") || tag.begins_with("param ")) {
 			const int tag_end = tag.find_char(' ');
 			const String link_tag = tag.substr(0, tag_end);
-			const String link_target = tag.substr(tag_end + 1, tag.length()).lstrip(" ");
+			const String link_target = tag.substr(tag_end + 1).lstrip(" ");
 
 			const Vector<String> link_target_parts = link_target.split(".");
 
-			if (link_target_parts.size() <= 0 || link_target_parts.size() > 2) {
+			if (link_target_parts.is_empty() || link_target_parts.size() > 2) {
 				ERR_PRINT("Invalid reference format: '" + tag + "'.");
 
 				output.append(tag);
@@ -401,7 +401,7 @@ String BindingsGenerator::bbcode_to_text(const String &p_bbcode, const TypeInter
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag.begins_with("url=")) {
-			String url = tag.substr(4, tag.length());
+			String url = tag.substr(4);
 			// Not supported. Just append the url.
 			output.append(url);
 
@@ -497,7 +497,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 
 		if (brk_end == -1) {
 			if (!line_del) {
-				String text = bbcode.substr(brk_pos, bbcode.length() - brk_pos);
+				String text = bbcode.substr(brk_pos);
 				if (code_tag || tag_stack.size() > 0) {
 					xml_output.append(text.xml_escape());
 				} else {
@@ -522,7 +522,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 		String tag = bbcode.substr(brk_pos + 1, brk_end - brk_pos - 1);
 
 		if (tag.begins_with("/")) {
-			bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1, tag.length());
+			bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1);
 
 			if (!tag_ok) {
 				if (!line_del) {
@@ -558,11 +558,11 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 		} else if (tag.begins_with("method ") || tag.begins_with("constructor ") || tag.begins_with("operator ") || tag.begins_with("member ") || tag.begins_with("signal ") || tag.begins_with("enum ") || tag.begins_with("constant ") || tag.begins_with("theme_item ") || tag.begins_with("param ")) {
 			const int tag_end = tag.find_char(' ');
 			const String link_tag = tag.substr(0, tag_end);
-			const String link_target = tag.substr(tag_end + 1, tag.length()).lstrip(" ");
+			const String link_target = tag.substr(tag_end + 1).lstrip(" ");
 
 			const Vector<String> link_target_parts = link_target.split(".");
 
-			if (link_target_parts.size() <= 0 || link_target_parts.size() > 2) {
+			if (link_target_parts.is_empty() || link_target_parts.size() > 2) {
 				ERR_PRINT("Invalid reference format: '" + tag + "'.");
 
 				xml_output.append("<c>");
@@ -763,7 +763,7 @@ String BindingsGenerator::bbcode_to_xml(const String &p_bbcode, const TypeInterf
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag.begins_with("url=")) {
-			String url = tag.substr(4, tag.length());
+			String url = tag.substr(4);
 			xml_output.append("<a href=\"");
 			xml_output.append(url);
 			xml_output.append("\">");
@@ -1741,8 +1741,8 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 	da->make_dir("Generated");
 	da->make_dir("Generated/GodotObjects");
 
-	String base_gen_dir = path::join(p_proj_dir, "Generated");
-	String godot_objects_gen_dir = path::join(base_gen_dir, "GodotObjects");
+	String base_gen_dir = Path::join(p_proj_dir, "Generated");
+	String godot_objects_gen_dir = Path::join(base_gen_dir, "GodotObjects");
 
 	Vector<String> compile_items;
 
@@ -1750,7 +1750,7 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 	{
 		StringBuilder constants_source;
 		_generate_global_constants(constants_source);
-		String output_file = path::join(base_gen_dir, BINDINGS_GLOBAL_SCOPE_CLASS "_constants.cs");
+		String output_file = Path::join(base_gen_dir, BINDINGS_GLOBAL_SCOPE_CLASS "_constants.cs");
 		Error save_err = _save_file(output_file, constants_source);
 		if (save_err != OK) {
 			return save_err;
@@ -1763,7 +1763,7 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 	{
 		StringBuilder extensions_source;
 		_generate_array_extensions(extensions_source);
-		String output_file = path::join(base_gen_dir, BINDINGS_GLOBAL_SCOPE_CLASS "_extensions.cs");
+		String output_file = Path::join(base_gen_dir, BINDINGS_GLOBAL_SCOPE_CLASS "_extensions.cs");
 		Error save_err = _save_file(output_file, extensions_source);
 		if (save_err != OK) {
 			return save_err;
@@ -1779,7 +1779,7 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 			continue;
 		}
 
-		String output_file = path::join(godot_objects_gen_dir, itype.proxy_name + ".cs");
+		String output_file = Path::join(godot_objects_gen_dir, itype.proxy_name + ".cs");
 		Error err = _generate_cs_type(itype, output_file);
 
 		if (err == ERR_SKIP) {
@@ -1846,7 +1846,7 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 
 		cs_built_in_ctors_content.append(CLOSE_BLOCK);
 
-		String constructors_file = path::join(base_gen_dir, BINDINGS_CLASS_CONSTRUCTOR ".cs");
+		String constructors_file = Path::join(base_gen_dir, BINDINGS_CLASS_CONSTRUCTOR ".cs");
 		Error err = _save_file(constructors_file, cs_built_in_ctors_content);
 
 		if (err != OK) {
@@ -1889,7 +1889,7 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 
 	cs_icalls_content.append(CLOSE_BLOCK);
 
-	String internal_methods_file = path::join(base_gen_dir, BINDINGS_CLASS_NATIVECALLS ".cs");
+	String internal_methods_file = Path::join(base_gen_dir, BINDINGS_CLASS_NATIVECALLS ".cs");
 
 	Error err = _save_file(internal_methods_file, cs_icalls_content);
 	if (err != OK) {
@@ -1905,14 +1905,14 @@ Error BindingsGenerator::generate_cs_core_project(const String &p_proj_dir) {
 								  "  <ItemGroup>\n");
 
 	for (int i = 0; i < compile_items.size(); i++) {
-		String include = path::relative_to(compile_items[i], p_proj_dir).replace("/", "\\");
+		String include = Path::relative_to(compile_items[i], p_proj_dir).replace_char('/', '\\');
 		includes_props_content.append("    <Compile Include=\"" + include + "\" />\n");
 	}
 
 	includes_props_content.append("  </ItemGroup>\n"
 								  "</Project>\n");
 
-	String includes_props_file = path::join(base_gen_dir, "GeneratedIncludes.props");
+	String includes_props_file = Path::join(base_gen_dir, "GeneratedIncludes.props");
 
 	err = _save_file(includes_props_file, includes_props_content);
 	if (err != OK) {
@@ -1937,8 +1937,8 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 	da->make_dir("Generated");
 	da->make_dir("Generated/GodotObjects");
 
-	String base_gen_dir = path::join(p_proj_dir, "Generated");
-	String godot_objects_gen_dir = path::join(base_gen_dir, "GodotObjects");
+	String base_gen_dir = Path::join(p_proj_dir, "Generated");
+	String godot_objects_gen_dir = Path::join(base_gen_dir, "GodotObjects");
 
 	Vector<String> compile_items;
 
@@ -1949,7 +1949,7 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 			continue;
 		}
 
-		String output_file = path::join(godot_objects_gen_dir, itype.proxy_name + ".cs");
+		String output_file = Path::join(godot_objects_gen_dir, itype.proxy_name + ".cs");
 		Error err = _generate_cs_type(itype, output_file);
 
 		if (err == ERR_SKIP) {
@@ -2004,7 +2004,7 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 
 		cs_built_in_ctors_content.append(CLOSE_BLOCK);
 
-		String constructors_file = path::join(base_gen_dir, BINDINGS_CLASS_CONSTRUCTOR_EDITOR ".cs");
+		String constructors_file = Path::join(base_gen_dir, BINDINGS_CLASS_CONSTRUCTOR_EDITOR ".cs");
 		Error err = _save_file(constructors_file, cs_built_in_ctors_content);
 
 		if (err != OK) {
@@ -2049,7 +2049,7 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 
 	cs_icalls_content.append(CLOSE_BLOCK);
 
-	String internal_methods_file = path::join(base_gen_dir, BINDINGS_CLASS_NATIVECALLS_EDITOR ".cs");
+	String internal_methods_file = Path::join(base_gen_dir, BINDINGS_CLASS_NATIVECALLS_EDITOR ".cs");
 
 	Error err = _save_file(internal_methods_file, cs_icalls_content);
 	if (err != OK) {
@@ -2065,14 +2065,14 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 								  "  <ItemGroup>\n");
 
 	for (int i = 0; i < compile_items.size(); i++) {
-		String include = path::relative_to(compile_items[i], p_proj_dir).replace("/", "\\");
+		String include = Path::relative_to(compile_items[i], p_proj_dir).replace_char('/', '\\');
 		includes_props_content.append("    <Compile Include=\"" + include + "\" />\n");
 	}
 
 	includes_props_content.append("  </ItemGroup>\n"
 								  "</Project>\n");
 
-	String includes_props_file = path::join(base_gen_dir, "GeneratedIncludes.props");
+	String includes_props_file = Path::join(base_gen_dir, "GeneratedIncludes.props");
 
 	err = _save_file(includes_props_file, includes_props_content);
 	if (err != OK) {
@@ -2085,7 +2085,7 @@ Error BindingsGenerator::generate_cs_editor_project(const String &p_proj_dir) {
 Error BindingsGenerator::generate_cs_api(const String &p_output_dir) {
 	ERR_FAIL_COND_V(!initialized, ERR_UNCONFIGURED);
 
-	String output_dir = path::abspath(path::realpath(p_output_dir));
+	String output_dir = Path::abspath(Path::realpath(p_output_dir));
 
 	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 	ERR_FAIL_COND_V(da.is_null(), ERR_CANT_CREATE);
@@ -3011,7 +3011,7 @@ Error BindingsGenerator::_generate_cs_method(const BindingsGenerator::TypeInterf
 			}
 
 			// Apparently the name attribute must not include the @
-			String param_tag_name = iarg.name.begins_with("@") ? iarg.name.substr(1, iarg.name.length()) : iarg.name;
+			String param_tag_name = iarg.name.begins_with("@") ? iarg.name.substr(1) : iarg.name;
 			// Escape < and > in the attribute default value
 			String param_def_arg = def_arg.replacen("<", "&lt;").replacen(">", "&gt;");
 
@@ -3201,7 +3201,7 @@ Error BindingsGenerator::_generate_cs_signal(const BindingsGenerator::TypeInterf
 
 	// Generate signal
 	{
-		bool is_parameterless = p_isignal.arguments.size() == 0;
+		bool is_parameterless = p_isignal.arguments.is_empty();
 
 		// Delegate name is [SignalName]EventHandler
 		String delegate_name = is_parameterless ? "Action" : p_isignal.proxy_name + "EventHandler";
@@ -3800,6 +3800,8 @@ bool BindingsGenerator::_arg_default_value_is_assignable_to_type(const Variant &
 		case Variant::VECTOR2:
 		case Variant::RECT2:
 		case Variant::VECTOR3:
+		case Variant::VECTOR4:
+		case Variant::PROJECTION:
 		case Variant::RID:
 		case Variant::PACKED_BYTE_ARRAY:
 		case Variant::PACKED_INT32_ARRAY:
@@ -3829,7 +3831,10 @@ bool BindingsGenerator::_arg_default_value_is_assignable_to_type(const Variant &
 		case Variant::VECTOR3I:
 			return p_arg_type.name == name_cache.type_Vector3 ||
 					p_arg_type.name == Variant::get_type_name(p_val.get_type());
-		default:
+		case Variant::VECTOR4I:
+			return p_arg_type.name == name_cache.type_Vector4 ||
+					p_arg_type.name == Variant::get_type_name(p_val.get_type());
+		case Variant::VARIANT_MAX:
 			CRASH_NOW_MSG("Unexpected Variant type: " + itos(p_val.get_type()));
 			break;
 	}
@@ -4112,9 +4117,8 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 				imethod.return_type.cname = _get_type_name_from_meta(return_info.type, m ? m->get_argument_meta(-1) : (GodotTypeInfo::Metadata)method_info.return_val_metadata);
 			}
 
-			int idx = 0;
-			for (List<PropertyInfo>::ConstIterator itr = method_info.arguments.begin(); itr != method_info.arguments.end(); ++itr, ++idx) {
-				const PropertyInfo &arginfo = *itr;
+			for (int64_t idx = 0; idx < method_info.arguments.size(); ++idx) {
+				const PropertyInfo &arginfo = method_info.arguments[idx];
 
 				String orig_arg_name = arginfo.name;
 
@@ -4204,6 +4208,18 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 			// after all the non-compat methods have been added. The compat methods are added in
 			// reverse so the most recently added ones take precedence over older compat methods.
 			if (imethod.is_compat) {
+				// If the method references deprecated types, mark the method as deprecated as well.
+				for (const ArgumentInterface &iarg : imethod.arguments) {
+					String arg_type_name = iarg.type.cname;
+					String doc_name = arg_type_name.begins_with("_") ? arg_type_name.substr(1) : arg_type_name;
+					const DocData::ClassDoc &class_doc = EditorHelp::get_doc_data()->class_list[doc_name];
+					if (class_doc.is_deprecated) {
+						imethod.is_deprecated = true;
+						imethod.deprecation_message = "This method overload is deprecated.";
+						break;
+					}
+				}
+
 				imethod.is_hidden = true;
 				compat_methods.push_front(imethod);
 				continue;
@@ -4244,9 +4260,8 @@ bool BindingsGenerator::_populate_object_type_interfaces() {
 			isignal.name = method_info.name;
 			isignal.cname = method_info.name;
 
-			int idx = 0;
-			for (List<PropertyInfo>::ConstIterator itr = method_info.arguments.begin(); itr != method_info.arguments.end(); ++itr, ++idx) {
-				const PropertyInfo &arginfo = *itr;
+			for (int64_t idx = 0; idx < method_info.arguments.size(); ++idx) {
+				const PropertyInfo &arginfo = method_info.arguments[idx];
 
 				String orig_arg_name = arginfo.name;
 
@@ -4698,7 +4713,7 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
 					"Parameter of type '" + String(r_iarg.type.cname) + "' can only have null/zero as the default value.");
 			r_iarg.default_argument = "default";
 			break;
-		default:
+		case Variant::VARIANT_MAX:
 			ERR_FAIL_V_MSG(false, "Unexpected Variant type: " + itos(p_val.get_type()));
 			break;
 	}
diff --git a/engine/modules/mono/editor/bindings_generator.h b/engine/modules/mono/editor/bindings_generator.h
index 30a5ba7a..3c85a837 100644
--- a/engine/modules/mono/editor/bindings_generator.h
+++ b/engine/modules/mono/editor/bindings_generator.h
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BINDINGS_GENERATOR_H
-#define BINDINGS_GENERATOR_H
+#pragma once
 
 #include "core/typedefs.h" // DEBUG_METHODS_ENABLED
 
-#if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
+#ifdef DEBUG_METHODS_ENABLED
 
 #include "core/doc_data.h"
 #include "core/object/class_db.h"
@@ -875,5 +874,3 @@ public:
 };
 
 #endif
-
-#endif // BINDINGS_GENERATOR_H
diff --git a/engine/modules/mono/editor/code_completion.cpp b/engine/modules/mono/editor/code_completion.cpp
index 94222f3d..dd19285c 100644
--- a/engine/modules/mono/editor/code_completion.cpp
+++ b/engine/modules/mono/editor/code_completion.cpp
@@ -116,7 +116,7 @@ PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_scr
 					continue;
 				}
 
-				String name = prop.name.substr(prop.name.find_char('/') + 1, prop.name.length());
+				String name = prop.name.substr(prop.name.find_char('/') + 1);
 				suggestions.push_back(quoted(name));
 			}
 		} break;
diff --git a/engine/modules/mono/editor/code_completion.h b/engine/modules/mono/editor/code_completion.h
index 89d19b10..b3e9b664 100644
--- a/engine/modules/mono/editor/code_completion.h
+++ b/engine/modules/mono/editor/code_completion.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CODE_COMPLETION_H
-#define CODE_COMPLETION_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
@@ -52,5 +51,3 @@ enum class CompletionKind {
 
 PackedStringArray get_code_completion(CompletionKind p_kind, const String &p_script_file);
 } // namespace gdmono
-
-#endif // CODE_COMPLETION_H
diff --git a/engine/modules/mono/editor/editor_internal_calls.cpp b/engine/modules/mono/editor/editor_internal_calls.cpp
index df240a59..adc150f1 100644
--- a/engine/modules/mono/editor/editor_internal_calls.cpp
+++ b/engine/modules/mono/editor/editor_internal_calls.cpp
@@ -68,23 +68,15 @@ void godot_icall_GodotSharpDirs_MonoUserDir(godot_string *r_dest) {
 }
 
 void godot_icall_GodotSharpDirs_BuildLogsDirs(godot_string *r_dest) {
-#ifdef TOOLS_ENABLED
 	memnew_placement(r_dest, String(GodotSharpDirs::get_build_logs_dir()));
-#else
-	return nullptr;
-#endif
 }
 
 void godot_icall_GodotSharpDirs_DataEditorToolsDir(godot_string *r_dest) {
-#ifdef TOOLS_ENABLED
 	memnew_placement(r_dest, String(GodotSharpDirs::get_data_editor_tools_dir()));
-#else
-	return nullptr;
-#endif
 }
 
 void godot_icall_GodotSharpDirs_CSharpProjectName(godot_string *r_dest) {
-	memnew_placement(r_dest, String(path::get_csharp_project_name()));
+	memnew_placement(r_dest, String(Path::get_csharp_project_name()));
 }
 
 void godot_icall_EditorProgress_Create(const godot_string *p_task, const godot_string *p_label, int32_t p_amount, bool p_can_cancel) {
@@ -105,7 +97,7 @@ bool godot_icall_EditorProgress_Step(const godot_string *p_task, const godot_str
 }
 
 void godot_icall_Internal_FullExportTemplatesDir(godot_string *r_dest) {
-	String full_templates_dir = EditorPaths::get_singleton()->get_export_templates_dir().path_join(VERSION_FULL_CONFIG);
+	String full_templates_dir = EditorPaths::get_singleton()->get_export_templates_dir().path_join(GODOT_VERSION_FULL_CONFIG);
 	memnew_placement(r_dest, String(full_templates_dir));
 }
 
@@ -152,7 +144,7 @@ bool godot_icall_Internal_IsAssembliesReloadingNeeded() {
 
 void godot_icall_Internal_ReloadAssemblies(bool p_soft_reload) {
 #ifdef GD_MONO_HOT_RELOAD
-	callable_mp(mono_bind::GodotSharp::get_singleton(), &mono_bind::GodotSharp::reload_assemblies).call_deferred(p_soft_reload);
+	callable_mp(MonoBind::GodotSharp::get_singleton(), &MonoBind::GodotSharp::reload_assemblies).call_deferred(p_soft_reload);
 #endif
 }
 
diff --git a/engine/modules/mono/editor/editor_internal_calls.h b/engine/modules/mono/editor/editor_internal_calls.h
index 48da0298..78f1e5d9 100644
--- a/engine/modules/mono/editor/editor_internal_calls.h
+++ b/engine/modules/mono/editor/editor_internal_calls.h
@@ -28,13 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_INTERNAL_CALLS_H
-#define EDITOR_INTERNAL_CALLS_H
+#pragma once
 
 #include "core/typedefs.h"
 
 namespace godotsharp {
 const void **get_editor_interop_funcs(int32_t &r_size);
 }
-
-#endif // EDITOR_INTERNAL_CALLS_H
diff --git a/engine/modules/mono/editor/hostfxr_resolver.cpp b/engine/modules/mono/editor/hostfxr_resolver.cpp
index 76047b19..ba6e8aa2 100644
--- a/engine/modules/mono/editor/hostfxr_resolver.cpp
+++ b/engine/modules/mono/editor/hostfxr_resolver.cpp
@@ -119,8 +119,8 @@ bool get_latest_fxr(const String &fxr_root, String &r_fxr_path) {
 		return false;
 	}
 
-	String fxr_with_ver = path::join(fxr_root, latest_ver_str);
-	String hostfxr_file_path = path::join(fxr_with_ver, get_hostfxr_file_name());
+	String fxr_with_ver = Path::join(fxr_root, latest_ver_str);
+	String hostfxr_file_path = Path::join(fxr_with_ver, get_hostfxr_file_name());
 
 	ERR_FAIL_COND_V_MSG(!FileAccess::exists(hostfxr_file_path), false, "Missing hostfxr library in directory: " + fxr_with_ver);
 
@@ -188,22 +188,22 @@ bool get_default_installation_dir(String &r_dotnet_root) {
 
 #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64)
 	// When emulating x64 on arm
-	String dotnet_root_emulated = path::join(program_files_dir, "dotnet", "x64");
-	if (FileAccess::exists(path::join(dotnet_root_emulated, "dotnet.exe"))) {
+	String dotnet_root_emulated = Path::join(program_files_dir, "dotnet", "x64");
+	if (FileAccess::exists(Path::join(dotnet_root_emulated, "dotnet.exe"))) {
 		r_dotnet_root = dotnet_root_emulated;
 		return true;
 	}
 #endif
 
-	r_dotnet_root = path::join(program_files_dir, "dotnet");
+	r_dotnet_root = Path::join(program_files_dir, "dotnet");
 	return true;
 #elif defined(MACOS_ENABLED)
 	r_dotnet_root = "/usr/local/share/dotnet";
 
 #if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) || defined(_M_X64)
 	// When emulating x64 on arm
-	String dotnet_root_emulated = path::join(r_dotnet_root, "x64");
-	if (FileAccess::exists(path::join(dotnet_root_emulated, "dotnet"))) {
+	String dotnet_root_emulated = Path::join(r_dotnet_root, "x64");
+	if (FileAccess::exists(Path::join(dotnet_root_emulated, "dotnet"))) {
 		r_dotnet_root = dotnet_root_emulated;
 		return true;
 	}
@@ -262,11 +262,11 @@ bool get_dotnet_self_registered_dir(String &r_dotnet_root) {
 		return false;
 	}
 
-	r_dotnet_root = String::utf16((const char16_t *)buffer.ptr()).replace("\\", "/");
+	r_dotnet_root = String::utf16((const char16_t *)buffer.ptr()).replace_char('\\', '/');
 	RegCloseKey(hkey);
 	return true;
 #else
-	String install_location_file = path::join("/etc/dotnet", "install_location_" + get_dotnet_arch().to_lower());
+	String install_location_file = Path::join("/etc/dotnet", "install_location_" + get_dotnet_arch().to_lower());
 	if (get_install_location_from_file(install_location_file, r_dotnet_root)) {
 		return true;
 	}
@@ -276,7 +276,7 @@ bool get_dotnet_self_registered_dir(String &r_dotnet_root) {
 		return false;
 	}
 
-	String legacy_install_location_file = path::join("/etc/dotnet", "install_location");
+	String legacy_install_location_file = Path::join("/etc/dotnet", "install_location");
 	return get_install_location_from_file(legacy_install_location_file, r_dotnet_root);
 #endif
 }
@@ -285,7 +285,7 @@ bool get_file_path_from_env(const String &p_env_key, String &r_dotnet_root) {
 	String env_value = OS::get_singleton()->get_environment(p_env_key);
 
 	if (!env_value.is_empty()) {
-		env_value = path::realpath(env_value);
+		env_value = Path::realpath(env_value);
 
 		if (DirAccess::exists(env_value)) {
 			r_dotnet_root = env_value;
@@ -321,7 +321,7 @@ bool get_dotnet_root_from_env(String &r_dotnet_root) {
 } //namespace
 
 bool godotsharp::hostfxr_resolver::try_get_path_from_dotnet_root(const String &p_dotnet_root, String &r_fxr_path) {
-	String fxr_dir = path::join(p_dotnet_root, "host", "fxr");
+	String fxr_dir = Path::join(p_dotnet_root, "host", "fxr");
 	if (!DirAccess::exists(fxr_dir)) {
 		if (OS::get_singleton()->is_stdout_verbose()) {
 			ERR_PRINT("The host fxr folder does not exist: " + fxr_dir + ".");
diff --git a/engine/modules/mono/editor/hostfxr_resolver.h b/engine/modules/mono/editor/hostfxr_resolver.h
index 398a58c7..f1b24ae1 100644
--- a/engine/modules/mono/editor/hostfxr_resolver.h
+++ b/engine/modules/mono/editor/hostfxr_resolver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HOSTFXR_RESOLVER_H
-#define HOSTFXR_RESOLVER_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -41,5 +40,3 @@ bool try_get_path(String &r_out_dotnet_root, String &r_out_fxr_path);
 
 } //namespace hostfxr_resolver
 } //namespace godotsharp
-
-#endif // HOSTFXR_RESOLVER_H
diff --git a/engine/modules/mono/editor/semver.h b/engine/modules/mono/editor/semver.h
index 2bb72878..935d0e60 100644
--- a/engine/modules/mono/editor/semver.h
+++ b/engine/modules/mono/editor/semver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SEMVER_H
-#define SEMVER_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -103,5 +102,3 @@ public:
 };
 
 } //namespace godotsharp
-
-#endif // SEMVER_H
diff --git a/engine/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/ExtensionMethods.cs b/engine/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/ExtensionMethods.cs
index a0bd9641..3fc27a29 100644
--- a/engine/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/ExtensionMethods.cs
+++ b/engine/modules/mono/glue/GodotSharp/Godot.SourceGenerators.Internal/ExtensionMethods.cs
@@ -96,7 +96,7 @@ internal static class ExtensionMethods
 
     public static string NameWithTypeParameters(this INamedTypeSymbol symbol)
     {
-        return symbol.IsGenericType ?
+        return symbol.IsGenericType && symbol.TypeParameters.Length > 0 ?
             string.Concat(symbol.Name, "<", string.Join(", ", symbol.TypeParameters), ">") :
             symbol.Name;
     }
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
index 9879a781..f83c5513 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
@@ -1035,12 +1035,17 @@ namespace Godot.Collections
     }
 
     /// <summary>
-    /// Typed wrapper around Godot's Array class, an array of Variant
-    /// typed elements allocated in the engine in C++. Useful when
-    /// interfacing with the engine. Otherwise prefer .NET collections
+    /// Typed wrapper around Godot's Array class, an array of <typeparamref name="T"/>
+    /// annotated, Variant typed elements allocated in the engine in C++.
+    /// Useful when interfacing with the engine. Otherwise prefer .NET collections
     /// such as arrays or <see cref="List{T}"/>.
     /// </summary>
     /// <typeparam name="T">The type of the array.</typeparam>
+    /// <remarks>
+    /// While the elements are statically annotated to <typeparamref name="T"/>,
+    /// the underlying array still stores <see cref="Variant"/>, which has the same
+    /// memory footprint per element as an untyped <see cref="Array"/>.
+    /// </remarks>
     [DebuggerTypeProxy(typeof(ArrayDebugView<>))]
     [DebuggerDisplay("Count = {Count}")]
     [SuppressMessage("ReSharper", "RedundantExtendsListEntry")]
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
index dcb94f05..ee337b5e 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
@@ -476,13 +476,18 @@ namespace Godot.Collections
     }
 
     /// <summary>
-    /// Typed wrapper around Godot's Dictionary class, a dictionary of Variant
-    /// typed elements allocated in the engine in C++. Useful when
-    /// interfacing with the engine. Otherwise prefer .NET collections
+    /// Typed wrapper around Godot's Dictionary class, a dictionary of <typeparamref name="TKey"/>
+    /// and <typeparamref name="TValue"/> annotated, Variant typed elements allocated in the engine in C++.
+    /// Useful when interfacing with the engine. Otherwise prefer .NET collections
     /// such as <see cref="System.Collections.Generic.Dictionary{TKey, TValue}"/>.
     /// </summary>
     /// <typeparam name="TKey">The type of the dictionary's keys.</typeparam>
     /// <typeparam name="TValue">The type of the dictionary's values.</typeparam>
+    /// <remarks>
+    /// While the elements are statically annotated to <typeparamref name="TKey"/> and <typeparamref name="TValue"/>,
+    /// the underlying dictionary still stores <see cref="Variant"/>, which has the same memory footprint per element
+    /// as an untyped <see cref="Dictionary"/>.
+    /// </remarks>
     [DebuggerTypeProxy(typeof(DictionaryDebugView<,>))]
     [DebuggerDisplay("Count = {Count}")]
     [SuppressMessage("Design", "CA1001", MessageId = "Types that own disposable fields should be disposable",
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/InteropStructs.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/InteropStructs.cs
index dda776fe..cb180f9a 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/InteropStructs.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/InteropStructs.cs
@@ -455,6 +455,12 @@ namespace Godot.NativeInterop
             get => _data._m_obj_data.obj;
         }
 
+        public readonly ulong ObjectId
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get => _data._m_obj_data.id;
+        }
+
         public void Dispose()
         {
             switch (Type)
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/NativeFuncs.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/NativeFuncs.cs
index eb6fbdda..d42d101a 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/NativeFuncs.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/NativeFuncs.cs
@@ -503,6 +503,9 @@ namespace Godot.NativeInterop
         public static partial void godotsharp_string_simplify_path(scoped in godot_string p_self,
             out godot_string r_simplified_path);
 
+        public static partial void godotsharp_string_capitalize(scoped in godot_string p_self,
+            out godot_string r_capitalized);
+
         public static partial void godotsharp_string_to_camel_case(scoped in godot_string p_self,
             out godot_string r_camel_case);
 
@@ -512,6 +515,9 @@ namespace Godot.NativeInterop
         public static partial void godotsharp_string_to_snake_case(scoped in godot_string p_self,
             out godot_string r_snake_case);
 
+        public static partial void godotsharp_string_to_kebab_case(scoped in godot_string p_self,
+            out godot_string r_kebab_case);
+
         // NodePath
 
         public static partial void godotsharp_node_path_get_as_property_path(in godot_node_path p_self,
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantUtils.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantUtils.cs
index a48e60a3..9e5df0fa 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantUtils.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantUtils.cs
@@ -485,7 +485,14 @@ namespace Godot.NativeInterop
                 NativeFuncs.godotsharp_variant_as_rid(p_var);
 
         public static IntPtr ConvertToGodotObjectPtr(in godot_variant p_var)
-            => p_var.Type == Variant.Type.Object ? p_var.Object : IntPtr.Zero;
+        {
+            if (p_var.Type != Variant.Type.Object || p_var.ObjectId == 0)
+            {
+                return IntPtr.Zero;
+            }
+
+            return NativeFuncs.godotsharp_instance_from_id(p_var.ObjectId);
+        }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static GodotObject ConvertToGodotObject(in godot_variant p_var)
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs
index fed0eb5e..3f4eca55 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs
@@ -845,6 +845,33 @@ namespace Godot
             W = w;
         }
 
+        /// <summary>
+        /// Constructs a projection from 16 scalars.
+        /// </summary>
+        /// <param name="xx">The X column vector's X component, accessed via <c>p.X.X</c> or <c>[0][0]</c>.</param>
+        /// <param name="xy">The X column vector's Y component, accessed via <c>p.X.Y</c> or <c>[0][1]</c>.</param>
+        /// <param name="xz">The X column vector's Z component, accessed via <c>p.X.Z</c> or <c>[0][2]</c>.</param>
+        /// <param name="xw">The X column vector's W component, accessed via <c>p.X.W</c> or <c>[0][3]</c>.</param>
+        /// <param name="yx">The Y column vector's X component, accessed via <c>p.Y.X</c> or <c>[1][0]</c>.</param>
+        /// <param name="yy">The Y column vector's Y component, accessed via <c>p.Y.Y</c> or <c>[1][1]</c>.</param>
+        /// <param name="yz">The Y column vector's Z component, accessed via <c>p.Y.Z</c> or <c>[1][2]</c>.</param>
+        /// <param name="yw">The Y column vector's W component, accessed via <c>p.Y.W</c> or <c>[1][3]</c>.</param>
+        /// <param name="zx">The Z column vector's X component, accessed via <c>p.Z.X</c> or <c>[2][0]</c>.</param>
+        /// <param name="zy">The Z column vector's Y component, accessed via <c>p.Z.Y</c> or <c>[2][1]</c>.</param>
+        /// <param name="zz">The Z column vector's Z component, accessed via <c>p.Z.Z</c> or <c>[2][2]</c>.</param>
+        /// <param name="zw">The Z column vector's W component, accessed via <c>p.Z.W</c> or <c>[2][3]</c>.</param>
+        /// <param name="wx">The W column vector's X component, accessed via <c>p.W.X</c> or <c>[3][0]</c>.</param>
+        /// <param name="wy">The W column vector's Y component, accessed via <c>p.W.Y</c> or <c>[3][1]</c>.</param>
+        /// <param name="wz">The W column vector's Z component, accessed via <c>p.W.Z</c> or <c>[3][2]</c>.</param>
+        /// <param name="ww">The W column vector's W component, accessed via <c>p.W.W</c> or <c>[3][3]</c>.</param>
+        public Projection(real_t xx, real_t xy, real_t xz, real_t xw, real_t yx, real_t yy, real_t yz, real_t yw, real_t zx, real_t zy, real_t zz, real_t zw, real_t wx, real_t wy, real_t wz, real_t ww)
+        {
+            X = new Vector4(xx, xy, xz, xw);
+            Y = new Vector4(yx, yy, yz, yw);
+            Z = new Vector4(zx, zy, zz, zw);
+            W = new Vector4(wx, wy, wz, ww);
+        }
+
         /// <summary>
         /// Constructs a new <see cref="Projection"/> from a <see cref="Transform3D"/>.
         /// </summary>
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs
index a67f626d..56227b89 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/SignalAwaiter.cs
@@ -48,12 +48,19 @@ namespace Godot
 
                 awaiter._completed = true;
 
-                Variant[] signalArgs = new Variant[argCount];
+                if (argCount > 0)
+                {
+                    Variant[] signalArgs = new Variant[argCount];
 
-                for (int i = 0; i < argCount; i++)
-                    signalArgs[i] = Variant.CreateCopyingBorrowed(*args[i]);
+                    for (int i = 0; i < argCount; i++)
+                        signalArgs[i] = Variant.CreateCopyingBorrowed(*args[i]);
 
-                awaiter._result = signalArgs;
+                    awaiter._result = signalArgs;
+                }
+                else
+                {
+                    awaiter._result = [];
+                }
 
                 awaiter._continuation?.Invoke();
             }
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
index 0ca2307e..3fadfda0 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/StringExtensions.cs
@@ -314,22 +314,10 @@ namespace Godot
         /// <returns>The capitalized string.</returns>
         public static string Capitalize(this string instance)
         {
-            string aux = instance.CamelcaseToUnderscore(true).Replace("_", " ", StringComparison.Ordinal).Trim();
-            string cap = string.Empty;
-
-            for (int i = 0; i < aux.GetSliceCount(" "); i++)
-            {
-                string slice = aux.GetSliceCharacter(' ', i);
-                if (slice.Length > 0)
-                {
-                    slice = char.ToUpperInvariant(slice[0]) + slice.Substring(1);
-                    if (i > 0)
-                        cap += " ";
-                    cap += slice;
-                }
-            }
-
-            return cap;
+            using godot_string instanceStr = Marshaling.ConvertStringToNative(instance);
+            NativeFuncs.godotsharp_string_capitalize(instanceStr, out godot_string capitalized);
+            using (capitalized)
+                return Marshaling.ConvertStringToManaged(capitalized);
         }
 
         /// <summary>
@@ -371,49 +359,17 @@ namespace Godot
                 return Marshaling.ConvertStringToManaged(snakeCase);
         }
 
-        private static string CamelcaseToUnderscore(this string instance, bool lowerCase)
+        /// <summary>
+        /// Returns the string converted to <c>kebab-case</c>.
+        /// </summary>
+        /// <param name="instance">The string to convert.</param>
+        /// <returns>The converted string.</returns>
+        public static string ToKebabCase(this string instance)
         {
-            string newString = string.Empty;
-            int startIndex = 0;
-
-            for (int i = 1; i < instance.Length; i++)
-            {
-                bool isUpper = char.IsUpper(instance[i]);
-                bool isNumber = char.IsDigit(instance[i]);
-
-                bool areNext2Lower = false;
-                bool isNextLower = false;
-                bool isNextNumber = false;
-                bool wasPrecedentUpper = char.IsUpper(instance[i - 1]);
-                bool wasPrecedentNumber = char.IsDigit(instance[i - 1]);
-
-                if (i + 2 < instance.Length)
-                {
-                    areNext2Lower = char.IsLower(instance[i + 1]) && char.IsLower(instance[i + 2]);
-                }
-
-                if (i + 1 < instance.Length)
-                {
-                    isNextLower = char.IsLower(instance[i + 1]);
-                    isNextNumber = char.IsDigit(instance[i + 1]);
-                }
-
-                bool condA = isUpper && !wasPrecedentUpper && !wasPrecedentNumber;
-                bool condB = wasPrecedentUpper && isUpper && areNext2Lower;
-                bool condC = isNumber && !wasPrecedentNumber;
-                bool canBreakNumberLetter = isNumber && !wasPrecedentNumber && isNextLower;
-                bool canBreakLetterNumber = !isNumber && wasPrecedentNumber && (isNextLower || isNextNumber);
-
-                bool shouldSplit = condA || condB || condC || canBreakNumberLetter || canBreakLetterNumber;
-                if (shouldSplit)
-                {
-                    newString += string.Concat(instance.AsSpan(startIndex, i - startIndex), "_");
-                    startIndex = i;
-                }
-            }
-
-            newString += instance.Substring(startIndex, instance.Length - startIndex);
-            return lowerCase ? newString.ToLowerInvariant() : newString;
+            using godot_string instanceStr = Marshaling.ConvertStringToNative(instance);
+            NativeFuncs.godotsharp_string_to_kebab_case(instanceStr, out godot_string kebabCase);
+            using (kebabCase)
+                return Marshaling.ConvertStringToManaged(kebabCase);
         }
 
         /// <summary>
@@ -1359,7 +1315,9 @@ namespace Godot
         /// <returns>The concatenated path with the given file name.</returns>
         public static string PathJoin(this string instance, string file)
         {
-            if (instance.Length > 0 && instance[instance.Length - 1] == '/')
+            if (instance.Length == 0)
+                return file;
+            if (instance[^1] == '/' || (file.Length > 0 && file[0] == '/'))
                 return instance + file;
             return instance + "/" + file;
         }
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
index ef66d5bb..9c403d2e 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs
@@ -487,6 +487,23 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns the result of the component-wise minimum between
+        /// this vector and <paramref name="with"/>.
+        /// Equivalent to <c>new Vector3(Mathf.Min(X, with), Mathf.Min(Y, with), Mathf.Min(Z, with))</c>.
+        /// </summary>
+        /// <param name="with">The other value to use.</param>
+        /// <returns>The resulting minimum vector.</returns>
+        public readonly Vector3 Min(real_t with)
+        {
+            return new Vector3
+            (
+                Mathf.Min(X, with),
+                Mathf.Min(Y, with),
+                Mathf.Min(Z, with)
+            );
+        }
+
         /// <summary>
         /// Returns the axis of the vector's highest value. See <see cref="Axis"/>.
         /// If all components are equal, this method returns <see cref="Axis.X"/>.
@@ -751,6 +768,50 @@ namespace Godot
             );
         }
 
+        /// <summary>
+        /// Returns the octahedral-encoded (oct32) form of this Vector3 as a Vector2. Since a Vector2 occupies 1/3 less memory compared to Vector3,
+        /// this form of compression can be used to pass greater amounts of normalized Vector3s without increasing storage or memory requirements.
+        /// See also <see cref="Normalized()"/>, <see cref="OctahedronDecode(Vector2)"/>.
+        /// Note: OctahedronEncode can only be used for normalized vectors. OctahedronEncode does not check whether this Vector3 is normalized,
+        /// and will return a value that does not decompress to the original value if the Vector3 is not normalized.
+		/// Note: Octahedral compression is lossy, although visual differences are rarely perceptible in real world scenarios.
+        /// </summary>
+        /// <returns>The encoded Vector2.</returns>
+        public readonly Vector2 OctahedronEncode()
+        {
+            Vector3 n = this;
+            n /= Mathf.Abs(n.X) + Mathf.Abs(n.Y) + Mathf.Abs(n.Z);
+            Vector2 o;
+            if (n.Z >= 0.0f)
+            {
+                o.X = n.X;
+                o.Y = n.Y;
+            }
+            else
+            {
+                o.X = (1.0f - Mathf.Abs(n.Y)) * (n.X >= 0.0f ? 1.0f : -1.0f);
+                o.Y = (1.0f - Mathf.Abs(n.X)) * (n.Y >= 0.0f ? 1.0f : -1.0f);
+            }
+            o.X = o.X * 0.5f + 0.5f;
+            o.Y = o.Y * 0.5f + 0.5f;
+            return o;
+        }
+
+        /// <summary>
+        /// Returns the Vector3 from an octahedral-compressed form created using <see cref="OctahedronEncode()"/> (stored as a Vector2).
+        /// </summary>
+        /// <param name="oct">Encoded Vector2</param>
+        /// <returns>The decoded normalized Vector3.</returns>
+        public static Vector3 OctahedronDecode(Vector2 oct)
+        {
+            var f = new Vector2(oct.X * 2.0f - 1.0f, oct.Y * 2.0f - 1.0f);
+            var n = new Vector3(f.X, f.Y, 1.0f - Mathf.Abs(f.X) - Mathf.Abs(f.Y));
+            real_t t = Mathf.Clamp(-n.Z, 0.0f, 1.0f);
+            n.X += n.X >= 0 ? -t : t;
+            n.Y += n.Y >= 0 ? -t : t;
+            return n.Normalized();
+        }
+
         // Constants
         private static readonly Vector3 _zero = new Vector3(0, 0, 0);
         private static readonly Vector3 _one = new Vector3(1, 1, 1);
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj b/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
index ab9c5fe1..78c2981f 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj
@@ -19,7 +19,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>GodotSharp</PackageId>
-    <Version>4.4.0</Version>
+    <Version>4.5.0</Version>
     <PackageVersion>$(PackageVersion_GodotSharp)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharp</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj b/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
index 0ccc463d..f7a7f7a7 100644
--- a/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
+++ b/engine/modules/mono/glue/GodotSharp/GodotSharpEditor/GodotSharpEditor.csproj
@@ -15,7 +15,7 @@
     <Authors>Godot Engine contributors</Authors>
 
     <PackageId>GodotSharpEditor</PackageId>
-    <Version>4.4.0</Version>
+    <Version>4.5.0</Version>
     <PackageVersion>$(PackageVersion_GodotSharp)</PackageVersion>
     <RepositoryUrl>https://github.com/godotengine/godot/tree/master/modules/mono/glue/GodotSharp/GodotSharpEditor</RepositoryUrl>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
diff --git a/engine/modules/mono/glue/runtime_interop.cpp b/engine/modules/mono/glue/runtime_interop.cpp
index ab49560e..abe17430 100644
--- a/engine/modules/mono/glue/runtime_interop.cpp
+++ b/engine/modules/mono/glue/runtime_interop.cpp
@@ -934,7 +934,7 @@ bool godotsharp_variant_equals(const godot_variant *p_a, const godot_variant *p_
 
 void godotsharp_string_new_with_utf16_chars(String *r_dest, const char16_t *p_contents) {
 	memnew_placement(r_dest, String());
-	r_dest->parse_utf16(p_contents);
+	r_dest->append_utf16(p_contents);
 }
 
 // string_name.h
@@ -1289,6 +1289,10 @@ void godotsharp_string_simplify_path(const String *p_self, String *r_simplified_
 	memnew_placement(r_simplified_path, String(p_self->simplify_path()));
 }
 
+void godotsharp_string_capitalize(const String *p_self, String *r_capitalized) {
+	memnew_placement(r_capitalized, String(p_self->capitalize()));
+}
+
 void godotsharp_string_to_camel_case(const String *p_self, String *r_camel_case) {
 	memnew_placement(r_camel_case, String(p_self->to_camel_case()));
 }
@@ -1301,6 +1305,10 @@ void godotsharp_string_to_snake_case(const String *p_self, String *r_snake_case)
 	memnew_placement(r_snake_case, String(p_self->to_snake_case()));
 }
 
+void godotsharp_string_to_kebab_case(const String *p_self, String *r_kebab_case) {
+	memnew_placement(r_kebab_case, String(p_self->to_kebab_case()));
+}
+
 void godotsharp_node_path_get_as_property_path(const NodePath *p_ptr, NodePath *r_dest) {
 	memnew_placement(r_dest, NodePath(p_ptr->get_as_property_path()));
 }
@@ -1700,9 +1708,11 @@ static const void *unmanaged_callbacks[]{
 	(void *)godotsharp_dictionary_get_typed_value_script,
 	(void *)godotsharp_dictionary_to_string,
 	(void *)godotsharp_string_simplify_path,
+	(void *)godotsharp_string_capitalize,
 	(void *)godotsharp_string_to_camel_case,
 	(void *)godotsharp_string_to_pascal_case,
 	(void *)godotsharp_string_to_snake_case,
+	(void *)godotsharp_string_to_kebab_case,
 	(void *)godotsharp_node_path_get_as_property_path,
 	(void *)godotsharp_node_path_get_concatenated_names,
 	(void *)godotsharp_node_path_get_concatenated_subnames,
diff --git a/engine/modules/mono/glue/runtime_interop.h b/engine/modules/mono/glue/runtime_interop.h
index c1be4db7..67fda16b 100644
--- a/engine/modules/mono/glue/runtime_interop.h
+++ b/engine/modules/mono/glue/runtime_interop.h
@@ -28,13 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RUNTIME_INTEROP_H
-#define RUNTIME_INTEROP_H
+#pragma once
 
 #include "core/typedefs.h"
 
 namespace godotsharp {
 const void **get_runtime_interop_funcs(int32_t &r_size);
 }
-
-#endif // RUNTIME_INTEROP_H
diff --git a/engine/modules/mono/godotsharp_defs.h b/engine/modules/mono/godotsharp_defs.h
index 08eeffc3..c19a8a54 100644
--- a/engine/modules/mono/godotsharp_defs.h
+++ b/engine/modules/mono/godotsharp_defs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOTSHARP_DEFS_H
-#define GODOTSHARP_DEFS_H
+#pragma once
 
 #define BINDINGS_NAMESPACE "Godot"
 #define BINDINGS_NAMESPACE_COLLECTIONS BINDINGS_NAMESPACE ".Collections"
@@ -40,5 +39,3 @@
 
 #define BINDINGS_CLASS_NATIVECALLS "NativeCalls"
 #define BINDINGS_CLASS_NATIVECALLS_EDITOR "EditorNativeCalls"
-
-#endif // GODOTSHARP_DEFS_H
diff --git a/engine/modules/mono/godotsharp_dirs.cpp b/engine/modules/mono/godotsharp_dirs.cpp
index 039263b4..86b4e12f 100644
--- a/engine/modules/mono/godotsharp_dirs.cpp
+++ b/engine/modules/mono/godotsharp_dirs.cpp
@@ -167,7 +167,7 @@ private:
 #else // TOOLS_ENABLED
 		String platform = _get_platform_name();
 		String arch = Engine::get_singleton()->get_architecture_name();
-		String appname_safe = path::get_csharp_project_name();
+		String appname_safe = Path::get_csharp_project_name();
 		String packed_path = "res://.godot/mono/publish/" + arch;
 		if (DirAccess::exists(packed_path)) {
 			// The dotnet publish data is packed in the pck/zip.
diff --git a/engine/modules/mono/godotsharp_dirs.h b/engine/modules/mono/godotsharp_dirs.h
index 82847f70..bf9dc789 100644
--- a/engine/modules/mono/godotsharp_dirs.h
+++ b/engine/modules/mono/godotsharp_dirs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOTSHARP_DIRS_H
-#define GODOTSHARP_DIRS_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -48,5 +47,3 @@ String get_data_editor_tools_dir();
 #endif
 
 } // namespace GodotSharpDirs
-
-#endif // GODOTSHARP_DIRS_H
diff --git a/engine/modules/mono/icons/BuildCSharp.svg b/engine/modules/mono/icons/BuildCSharp.svg
index 430433dc..c6dfd16e 100644
--- a/engine/modules/mono/icons/BuildCSharp.svg
+++ b/engine/modules/mono/icons/BuildCSharp.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2.256 4.85 1.7 2.945 2.598-1.5 4.5 7.794a1 1-30 0 0 2.598-1.5l-4.65-8.054 3.464-2-.25-.433s-1.25-2.165-3.848-.665l-3.464 2-.31.063z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2.256 4.85 1.7 2.945 2.598-1.5 4.5 7.794a1 1-30 0 0 2.598-1.5l-4.65-8.054 3.464-2-.25-.433s-1.25-2.165-3.848-.665l-3.464 2-.31.063z"/></svg>
diff --git a/engine/modules/mono/icons/CSharpScript.svg b/engine/modules/mono/icons/CSharpScript.svg
index 7f309fe5..3b22b527 100644
--- a/engine/modules/mono/icons/CSharpScript.svg
+++ b/engine/modules/mono/icons/CSharpScript.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 10a3 3 0 1 0 0 6h1v-2H6a1 1 0 0 1 0-2h1v-2zm1-9-.564 2.258a4.91 4.91 0 0 0-.69.28L3.758 2.343 2.344 3.758l1.195 1.994-.285.685L1 7v2h5.27a2 2 0 1 1 3.46 0H15V7l-2.258-.565a5.007 5.007 0 0 0-.28-.687l1.194-1.99-1.414-1.414-1.994 1.195a4.998 4.998 0 0 0-.686-.285L9 1zm4 9a2 2 0 1 0 0 4H9v2h2a2 2 0 1 0 0-4h2v-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M6 10a3 3 0 1 0 0 6h1v-2H6a1 1 0 0 1 0-2h1v-2zm1-9-.564 2.258a4.91 4.91 0 0 0-.69.28L3.758 2.343 2.344 3.758l1.195 1.994-.285.685L1 7v2h5.27a2 2 0 1 1 3.46 0H15V7l-2.258-.565a5.007 5.007 0 0 0-.28-.687l1.194-1.99-1.414-1.414-1.994 1.195a4.998 4.998 0 0 0-.686-.285L9 1zm4 9a2 2 0 1 0 0 4H9v2h2a2 2 0 1 0 0-4h2v-2z"/></svg>
diff --git a/engine/modules/mono/interop_types.h b/engine/modules/mono/interop_types.h
index 811c4441..3a2cc9c5 100644
--- a/engine/modules/mono/interop_types.h
+++ b/engine/modules/mono/interop_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INTEROP_TYPES_H
-#define INTEROP_TYPES_H
+#pragma once
 
 #include "core/math/math_defs.h"
 
@@ -204,5 +203,3 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-
-#endif // INTEROP_TYPES_H
diff --git a/engine/modules/mono/managed_callable.h b/engine/modules/mono/managed_callable.h
index 388c321d..3e5944e3 100644
--- a/engine/modules/mono/managed_callable.h
+++ b/engine/modules/mono/managed_callable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MANAGED_CALLABLE_H
-#define MANAGED_CALLABLE_H
+#pragma once
 
 #include "mono_gc_handle.h"
 
@@ -73,5 +72,3 @@ public:
 	ManagedCallable(GCHandleIntPtr p_delegate_handle, void *p_trampoline, ObjectID p_object_id);
 	~ManagedCallable();
 };
-
-#endif // MANAGED_CALLABLE_H
diff --git a/engine/modules/mono/mono_gc_handle.h b/engine/modules/mono/mono_gc_handle.h
index ff6c6872..014b190e 100644
--- a/engine/modules/mono/mono_gc_handle.h
+++ b/engine/modules/mono/mono_gc_handle.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MONO_GC_HANDLE_H
-#define MONO_GC_HANDLE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -85,5 +84,3 @@ struct MonoGCHandleData {
 			type(p_type) {
 	}
 };
-
-#endif // MONO_GC_HANDLE_H
diff --git a/engine/modules/mono/mono_gd/gd_mono.cpp b/engine/modules/mono/mono_gd/gd_mono.cpp
index 2fb9eb81..22105a31 100644
--- a/engine/modules/mono/mono_gd/gd_mono.cpp
+++ b/engine/modules/mono/mono_gd/gd_mono.cpp
@@ -101,11 +101,11 @@ String find_hostfxr() {
 
 	// hostfxr_resolver doesn't look for dotnet in `PATH`. If it fails, we try to find the dotnet
 	// executable in `PATH` here and pass its location as `dotnet_root` to `get_hostfxr_path`.
-	String dotnet_exe = path::find_executable("dotnet");
+	String dotnet_exe = Path::find_executable("dotnet");
 
 	if (!dotnet_exe.is_empty()) {
 		// The file found in PATH may be a symlink
-		dotnet_exe = path::abspath(path::realpath(dotnet_exe));
+		dotnet_exe = Path::abspath(Path::realpath(dotnet_exe));
 
 		// TODO:
 		// Sometimes, the symlink may not point to the dotnet executable in the dotnet root.
@@ -385,7 +385,7 @@ godot_plugins_initialize_fn initialize_hostfxr_and_godot_plugins(bool &r_runtime
 godot_plugins_initialize_fn initialize_hostfxr_and_godot_plugins(bool &r_runtime_initialized) {
 	godot_plugins_initialize_fn godot_plugins_initialize = nullptr;
 
-	String assembly_name = path::get_csharp_project_name();
+	String assembly_name = Path::get_csharp_project_name();
 
 	HostFxrCharString assembly_path = str_to_hostfxr(GodotSharpDirs::get_api_assemblies_dir()
 					.path_join(assembly_name + ".dll"));
@@ -410,12 +410,14 @@ godot_plugins_initialize_fn initialize_hostfxr_and_godot_plugins(bool &r_runtime
 }
 
 godot_plugins_initialize_fn try_load_native_aot_library(void *&r_aot_dll_handle) {
-	String assembly_name = path::get_csharp_project_name();
+	String assembly_name = Path::get_csharp_project_name();
 
 #if defined(WINDOWS_ENABLED)
 	String native_aot_so_path = GodotSharpDirs::get_api_assemblies_dir().path_join(assembly_name + ".dll");
 #elif defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 	String native_aot_so_path = GodotSharpDirs::get_api_assemblies_dir().path_join(assembly_name + ".dylib");
+#elif defined(ANDROID_ENABLED)
+	String native_aot_so_path = "lib" + assembly_name + ".so";
 #elif defined(UNIX_ENABLED)
 	String native_aot_so_path = GodotSharpDirs::get_api_assemblies_dir().path_join(assembly_name + ".so");
 #else
@@ -461,12 +463,12 @@ String make_tpa_list() {
 godot_plugins_initialize_fn initialize_coreclr_and_godot_plugins(bool &r_runtime_initialized) {
 	godot_plugins_initialize_fn godot_plugins_initialize = nullptr;
 
-	String assembly_name = path::get_csharp_project_name();
+	String assembly_name = Path::get_csharp_project_name();
 
 	String tpa_list = make_tpa_list();
 	const char *prop_keys[] = { "TRUSTED_PLATFORM_ASSEMBLIES" };
 	const char *prop_values[] = { tpa_list.utf8().get_data() };
-	int nprops = sizeof(prop_keys) / sizeof(prop_keys[0]);
+	constexpr int nprops = std::size(prop_keys);
 
 	void *coreclr_handle = nullptr;
 	unsigned int domain_id = 0;
@@ -625,7 +627,7 @@ void GDMono::_init_godot_api_hashes() {
 
 #ifdef TOOLS_ENABLED
 bool GDMono::_load_project_assembly() {
-	String assembly_name = path::get_csharp_project_name();
+	String assembly_name = Path::get_csharp_project_name();
 
 	String assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir()
 								   .path_join(assembly_name + ".dll");
@@ -636,7 +638,7 @@ bool GDMono::_load_project_assembly() {
 	}
 
 	String loaded_assembly_path;
-	bool success = plugin_callbacks.LoadProjectAssemblyCallback(assembly_path.utf16(), &loaded_assembly_path);
+	bool success = plugin_callbacks.LoadProjectAssemblyCallback(assembly_path.utf16().get_data(), &loaded_assembly_path);
 
 	if (success) {
 		project_assembly_path = loaded_assembly_path.simplify_path();
@@ -656,7 +658,7 @@ void GDMono::reload_failure() {
 
 		ERR_PRINT_ED(".NET: Giving up on assembly reloading. Please restart the editor if unloading was failing.");
 
-		String assembly_name = path::get_csharp_project_name();
+		String assembly_name = Path::get_csharp_project_name();
 		String assembly_path = GodotSharpDirs::get_res_temp_assemblies_dir().path_join(assembly_name + ".dll");
 		assembly_path = ProjectSettings::get_singleton()->globalize_path(assembly_path);
 		project_assembly_path = assembly_path.simplify_path();
@@ -714,7 +716,7 @@ GDMono::~GDMono() {
 	singleton = nullptr;
 }
 
-namespace mono_bind {
+namespace MonoBind {
 
 GodotSharp *GodotSharp::singleton = nullptr;
 
@@ -737,4 +739,4 @@ GodotSharp::~GodotSharp() {
 	singleton = nullptr;
 }
 
-} // namespace mono_bind
+} // namespace MonoBind
diff --git a/engine/modules/mono/mono_gd/gd_mono.h b/engine/modules/mono/mono_gd/gd_mono.h
index fae3421a..c985e16e 100644
--- a/engine/modules/mono/mono_gd/gd_mono.h
+++ b/engine/modules/mono/mono_gd/gd_mono.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GD_MONO_H
-#define GD_MONO_H
+#pragma once
 
 #include "../godotsharp_defs.h"
 
@@ -162,7 +161,7 @@ public:
 	~GDMono();
 };
 
-namespace mono_bind {
+namespace MonoBind {
 
 class GodotSharp : public Object {
 	GDCLASS(GodotSharp, Object);
@@ -179,6 +178,4 @@ public:
 	~GodotSharp();
 };
 
-} // namespace mono_bind
-
-#endif // GD_MONO_H
+} // namespace MonoBind
diff --git a/engine/modules/mono/mono_gd/gd_mono_cache.h b/engine/modules/mono/mono_gd/gd_mono_cache.h
index f618921c..bbf32e3c 100644
--- a/engine/modules/mono/mono_gd/gd_mono_cache.h
+++ b/engine/modules/mono/mono_gd/gd_mono_cache.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GD_MONO_CACHE_H
-#define GD_MONO_CACHE_H
+#pragma once
 
 #include "../csharp_script.h"
 #include "../interop_types.h"
@@ -42,8 +41,6 @@
 #include "core/variant/dictionary.h"
 #include "core/variant/variant.h"
 
-#include <stdint.h>
-
 class CSharpScript;
 
 namespace GDMonoCache {
@@ -157,5 +154,3 @@ extern bool godot_api_cache_updated;
 void update_godot_api_cache(const ManagedCallbacks &p_managed_callbacks);
 
 } // namespace GDMonoCache
-
-#endif // GD_MONO_CACHE_H
diff --git a/engine/modules/mono/register_types.cpp b/engine/modules/mono/register_types.cpp
index 4d5426d9..57e528d6 100644
--- a/engine/modules/mono/register_types.cpp
+++ b/engine/modules/mono/register_types.cpp
@@ -38,7 +38,7 @@ CSharpLanguage *script_language_cs = nullptr;
 Ref<ResourceFormatLoaderCSharpScript> resource_loader_cs;
 Ref<ResourceFormatSaverCSharpScript> resource_saver_cs;
 
-mono_bind::GodotSharp *_godotsharp = nullptr;
+MonoBind::GodotSharp *_godotsharp = nullptr;
 
 void initialize_mono_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
@@ -47,17 +47,18 @@ void initialize_mono_module(ModuleInitializationLevel p_level) {
 
 	GDREGISTER_CLASS(CSharpScript);
 
-	_godotsharp = memnew(mono_bind::GodotSharp);
+	_godotsharp = memnew(MonoBind::GodotSharp);
 
 	script_language_cs = memnew(CSharpLanguage);
 	script_language_cs->set_language_index(ScriptServer::get_language_count());
 	ScriptServer::register_language(script_language_cs);
 
-	resource_loader_cs.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_cs);
-
-	resource_saver_cs.instantiate();
-	ResourceSaver::add_resource_format_saver(resource_saver_cs);
+	if (GD_IS_CLASS_ENABLED(CSharpScript)) {
+		resource_loader_cs.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_cs);
+		resource_saver_cs.instantiate();
+		ResourceSaver::add_resource_format_saver(resource_saver_cs);
+	}
 }
 
 void uninitialize_mono_module(ModuleInitializationLevel p_level) {
@@ -71,11 +72,12 @@ void uninitialize_mono_module(ModuleInitializationLevel p_level) {
 		memdelete(script_language_cs);
 	}
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_cs);
-	resource_loader_cs.unref();
-
-	ResourceSaver::remove_resource_format_saver(resource_saver_cs);
-	resource_saver_cs.unref();
+	if (GD_IS_CLASS_ENABLED(CSharpScript)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_cs);
+		resource_loader_cs.unref();
+		ResourceSaver::remove_resource_format_saver(resource_saver_cs);
+		resource_saver_cs.unref();
+	}
 
 	if (_godotsharp) {
 		memdelete(_godotsharp);
diff --git a/engine/modules/mono/register_types.h b/engine/modules/mono/register_types.h
index 8b194434..ba91d071 100644
--- a/engine/modules/mono/register_types.h
+++ b/engine/modules/mono/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MONO_REGISTER_TYPES_H
-#define MONO_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_mono_module(ModuleInitializationLevel p_level);
 void uninitialize_mono_module(ModuleInitializationLevel p_level);
-
-#endif // MONO_REGISTER_TYPES_H
diff --git a/engine/modules/mono/signal_awaiter_utils.h b/engine/modules/mono/signal_awaiter_utils.h
index ed1907af..1354c3a4 100644
--- a/engine/modules/mono/signal_awaiter_utils.h
+++ b/engine/modules/mono/signal_awaiter_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SIGNAL_AWAITER_UTILS_H
-#define SIGNAL_AWAITER_UTILS_H
+#pragma once
 
 #include "csharp_script.h"
 #include "mono_gc_handle.h"
@@ -98,5 +97,3 @@ public:
 
 	EventSignalCallable(Object *p_owner, const StringName &p_event_signal_name);
 };
-
-#endif // SIGNAL_AWAITER_UTILS_H
diff --git a/engine/modules/mono/utils/macos_utils.cpp b/engine/modules/mono/utils/macos_utils.cpp
index 8563c92d..53c8ae0d 100644
--- a/engine/modules/mono/utils/macos_utils.cpp
+++ b/engine/modules/mono/utils/macos_utils.cpp
@@ -28,17 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "macos_utils.h"
-
 #ifdef MACOS_ENABLED
 
+#import "macos_utils.h"
+
 #include "core/string/print_string.h"
 
 #import <CoreFoundation/CoreFoundation.h>
 #import <CoreServices/CoreServices.h>
 
 bool macos_is_app_bundle_installed(const String &p_bundle_id) {
-	CFStringRef bundle_id = CFStringCreateWithCString(nullptr, p_bundle_id.utf8(), kCFStringEncodingUTF8);
+	CFStringRef bundle_id = CFStringCreateWithCString(nullptr, p_bundle_id.utf8().get_data(), kCFStringEncodingUTF8);
 	CFArrayRef result = LSCopyApplicationURLsForBundleIdentifier(bundle_id, nullptr);
 	CFRelease(bundle_id);
 
diff --git a/engine/modules/mono/utils/macos_utils.h b/engine/modules/mono/utils/macos_utils.h
index dfe917db..9ede1fca 100644
--- a/engine/modules/mono/utils/macos_utils.h
+++ b/engine/modules/mono/utils/macos_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MONO_MACOS_UTILS_H
-#define MONO_MACOS_UTILS_H
+#pragma once
 
 #ifdef MACOS_ENABLED
 
@@ -38,5 +37,3 @@
 bool macos_is_app_bundle_installed(const String &p_bundle_id);
 
 #endif
-
-#endif // MONO_MACOS_UTILS_H
diff --git a/engine/modules/mono/utils/macros.h b/engine/modules/mono/utils/macros.h
index 1e073ccb..aa5003ac 100644
--- a/engine/modules/mono/utils/macros.h
+++ b/engine/modules/mono/utils/macros.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MONO_MACROS_H
-#define MONO_MACROS_H
+#pragma once
 
 #define _GD_VARNAME_CONCAT_B_(m_ignore, m_name) m_name
 #define _GD_VARNAME_CONCAT_A_(m_a, m_b, m_c) _GD_VARNAME_CONCAT_B_(hello there, m_a##m_b##m_c)
@@ -68,5 +67,3 @@ public:
 
 #define SCOPE_EXIT \
 	auto GD_UNIQUE_NAME(gd_scope_exit) = gdmono::ScopeExitAux() + [=]() -> void
-
-#endif // MONO_MACROS_H
diff --git a/engine/modules/mono/utils/naming_utils.h b/engine/modules/mono/utils/naming_utils.h
index ac64a5c1..ecd8ff64 100644
--- a/engine/modules/mono/utils/naming_utils.h
+++ b/engine/modules/mono/utils/naming_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MONO_NAMING_UTILS_H
-#define MONO_NAMING_UTILS_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -38,5 +37,3 @@ String pascal_to_pascal_case(const String &p_identifier);
 String snake_to_pascal_case(const String &p_identifier, bool p_input_is_upper = false);
 
 String snake_to_camel_case(const String &p_identifier, bool p_input_is_upper = false);
-
-#endif // MONO_NAMING_UTILS_H
diff --git a/engine/modules/mono/utils/path_utils.cpp b/engine/modules/mono/utils/path_utils.cpp
index 068ac8b4..9c68efe5 100644
--- a/engine/modules/mono/utils/path_utils.cpp
+++ b/engine/modules/mono/utils/path_utils.cpp
@@ -49,7 +49,7 @@
 #define ENV_PATH_SEP ":"
 #endif
 
-namespace path {
+namespace Path {
 
 String find_executable(const String &p_name) {
 #ifdef WINDOWS_ENABLED
@@ -62,7 +62,7 @@ String find_executable(const String &p_name) {
 	}
 
 	for (int i = 0; i < env_path.size(); i++) {
-		String p = path::join(env_path[i], p_name);
+		String p = Path::join(env_path[i], p_name);
 
 #ifdef WINDOWS_ENABLED
 		for (int j = 0; j < exts.size(); j++) {
@@ -92,8 +92,7 @@ String cwd() {
 		return ".";
 	}
 
-	String result;
-	result.parse_utf16(buffer.ptr());
+	String result = String::utf16(buffer.ptr());
 	if (result.is_empty()) {
 		return ".";
 	}
@@ -105,7 +104,7 @@ String cwd() {
 	}
 
 	String result;
-	if (result.parse_utf8(buffer) != OK) {
+	if (result.append_utf8(buffer) != OK) {
 		return ".";
 	}
 
@@ -117,7 +116,7 @@ String abspath(const String &p_path) {
 	if (p_path.is_absolute_path()) {
 		return p_path.simplify_path();
 	} else {
-		return path::join(path::cwd(), p_path).simplify_path();
+		return Path::join(Path::cwd(), p_path).simplify_path();
 	}
 }
 
@@ -145,8 +144,7 @@ String realpath(const String &p_path) {
 
 	::CloseHandle(hFile);
 
-	String result;
-	result.parse_utf16(buffer.ptr());
+	String result = String::utf16(buffer.ptr());
 	if (result.is_empty()) {
 		return p_path;
 	}
@@ -160,7 +158,7 @@ String realpath(const String &p_path) {
 	}
 
 	String result;
-	Error parse_ok = result.parse_utf8(resolved_path);
+	Error parse_ok = result.append_utf8(resolved_path);
 	::free(resolved_path);
 
 	if (parse_ok != OK) {
@@ -186,11 +184,11 @@ String join(const String &p_a, const String &p_b) {
 }
 
 String join(const String &p_a, const String &p_b, const String &p_c) {
-	return path::join(path::join(p_a, p_b), p_c);
+	return Path::join(Path::join(p_a, p_b), p_c);
 }
 
 String join(const String &p_a, const String &p_b, const String &p_c, const String &p_d) {
-	return path::join(path::join(path::join(p_a, p_b), p_c), p_d);
+	return Path::join(Path::join(Path::join(p_a, p_b), p_c), p_d);
 }
 
 String relative_to_impl(const String &p_path, const String &p_relative_to) {
@@ -263,4 +261,4 @@ String get_csharp_project_name() {
 	return name;
 }
 
-} // namespace path
+} // namespace Path
diff --git a/engine/modules/mono/utils/path_utils.h b/engine/modules/mono/utils/path_utils.h
index fc043c3f..0c6fc831 100644
--- a/engine/modules/mono/utils/path_utils.h
+++ b/engine/modules/mono/utils/path_utils.h
@@ -28,12 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MONO_PATH_UTILS_H
-#define MONO_PATH_UTILS_H
+#pragma once
 
 #include "core/string/ustring.h"
 
-namespace path {
+namespace Path {
 
 String find_executable(const String &p_name);
 
@@ -59,6 +58,4 @@ String realpath(const String &p_path);
 String relative_to(const String &p_path, const String &p_relative_to);
 
 String get_csharp_project_name();
-} // namespace path
-
-#endif // MONO_PATH_UTILS_H
+} // namespace Path
diff --git a/engine/modules/mono/utils/string_utils.cpp b/engine/modules/mono/utils/string_utils.cpp
index 2ecb9756..cc239e7b 100644
--- a/engine/modules/mono/utils/string_utils.cpp
+++ b/engine/modules/mono/utils/string_utils.cpp
@@ -110,7 +110,7 @@ String sformat(const String &p_text, const String &p1, const String &p2,
 		search_from = result + 2;
 	}
 
-	new_string += p_text.substr(search_from, p_text.length() - search_from);
+	new_string += p_text.substr(search_from);
 
 	return new_string;
 }
@@ -159,7 +159,7 @@ Error read_all_file_utf8(const String &p_path, String &r_content) {
 	w[len] = 0;
 
 	String source;
-	if (source.parse_utf8((const char *)w, len) != OK) {
+	if (source.append_utf8((const char *)w, len) != OK) {
 		ERR_FAIL_V(ERR_INVALID_DATA);
 	}
 
diff --git a/engine/modules/mono/utils/string_utils.h b/engine/modules/mono/utils/string_utils.h
index c261aaa7..e7b4c786 100644
--- a/engine/modules/mono/utils/string_utils.h
+++ b/engine/modules/mono/utils/string_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MONO_STRING_UTILS_H
-#define MONO_STRING_UTILS_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/variant/variant.h"
@@ -59,5 +58,3 @@ String str_format(const char *p_format, ...) _PRINTF_FORMAT_ATTRIBUTE_1_2;
 String str_format(const char *p_format, va_list p_list) _PRINTF_FORMAT_ATTRIBUTE_1_0;
 char *str_format_new(const char *p_format, ...) _PRINTF_FORMAT_ATTRIBUTE_1_2;
 char *str_format_new(const char *p_format, va_list p_list) _PRINTF_FORMAT_ATTRIBUTE_1_0;
-
-#endif // MONO_STRING_UTILS_H
diff --git a/engine/modules/msdfgen/SCsub b/engine/modules/msdfgen/SCsub
index 55c1394e..391b99e1 100644
--- a/engine/modules/msdfgen/SCsub
+++ b/engine/modules/msdfgen/SCsub
@@ -42,7 +42,7 @@ if env["builtin_msdfgen"]:
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
     env_msdfgen.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
-    env_msdfgen.Prepend(CPPPATH=["#thirdparty/freetype/include", "#thirdparty/msdfgen", "#thirdparty/nanosvg"])
+    env_msdfgen.Prepend(CPPEXTPATH=["#thirdparty/freetype/include", "#thirdparty/msdfgen", "#thirdparty/nanosvg"])
 
     lib = env_msdfgen.add_library("msdfgen_builtin", thirdparty_sources)
     thirdparty_obj += lib
diff --git a/engine/modules/msdfgen/register_types.h b/engine/modules/msdfgen/register_types.h
index ff8d0355..993c3c39 100644
--- a/engine/modules/msdfgen/register_types.h
+++ b/engine/modules/msdfgen/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MSDFGEN_REGISTER_TYPES_H
-#define MSDFGEN_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_msdfgen_module(ModuleInitializationLevel p_level);
 void uninitialize_msdfgen_module(ModuleInitializationLevel p_level);
-
-#endif // MSDFGEN_REGISTER_TYPES_H
diff --git a/engine/modules/multiplayer/editor/editor_network_profiler.cpp b/engine/modules/multiplayer/editor/editor_network_profiler.cpp
index 1f9444ed..0c0f5a45 100644
--- a/engine/modules/multiplayer/editor/editor_network_profiler.cpp
+++ b/engine/modules/multiplayer/editor/editor_network_profiler.cpp
@@ -35,6 +35,7 @@
 #include "editor/gui/editor_run_bar.h"
 #include "editor/themes/editor_scale.h"
 #include "scene/gui/check_box.h"
+#include "scene/gui/flow_container.h"
 
 void EditorNetworkProfiler::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable")));
@@ -297,30 +298,37 @@ bool EditorNetworkProfiler::is_profiling() {
 }
 
 EditorNetworkProfiler::EditorNetworkProfiler() {
-	HBoxContainer *hb = memnew(HBoxContainer);
-	hb->add_theme_constant_override("separation", 8 * EDSCALE);
-	add_child(hb);
+	FlowContainer *container = memnew(FlowContainer);
+	container->add_theme_constant_override(SNAME("h_separation"), 8 * EDSCALE);
+	container->add_theme_constant_override(SNAME("v_separation"), 2 * EDSCALE);
+	add_child(container);
 
 	activate = memnew(Button);
 	activate->set_toggle_mode(true);
 	activate->set_text(TTR("Start"));
 	activate->set_disabled(true);
 	activate->connect(SceneStringName(pressed), callable_mp(this, &EditorNetworkProfiler::_activate_pressed));
-	hb->add_child(activate);
+	container->add_child(activate);
 
 	clear_button = memnew(Button);
 	clear_button->set_text(TTR("Clear"));
 	clear_button->set_disabled(true);
 	clear_button->connect(SceneStringName(pressed), callable_mp(this, &EditorNetworkProfiler::_clear_pressed));
-	hb->add_child(clear_button);
+	container->add_child(clear_button);
 
 	CheckBox *autostart_checkbox = memnew(CheckBox);
 	autostart_checkbox->set_text(TTR("Autostart"));
 	autostart_checkbox->set_pressed(EditorSettings::get_singleton()->get_project_metadata("debug_options", "autostart_network_profiler", false));
 	autostart_checkbox->connect(SceneStringName(toggled), callable_mp(this, &EditorNetworkProfiler::_autostart_toggled));
-	hb->add_child(autostart_checkbox);
+	container->add_child(autostart_checkbox);
 
-	hb->add_spacer();
+	Control *c = memnew(Control);
+	c->set_h_size_flags(SIZE_EXPAND_FILL);
+	container->add_child(c);
+
+	HBoxContainer *hb = memnew(HBoxContainer);
+	hb->add_theme_constant_override(SNAME("separation"), 8 * EDSCALE);
+	container->add_child(hb);
 
 	Label *lb = memnew(Label);
 	// TRANSLATORS: This is the label for the network profiler's incoming bandwidth.
@@ -331,6 +339,7 @@ EditorNetworkProfiler::EditorNetworkProfiler() {
 	incoming_bandwidth_text->set_editable(false);
 	incoming_bandwidth_text->set_custom_minimum_size(Size2(120, 0) * EDSCALE);
 	incoming_bandwidth_text->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
+	incoming_bandwidth_text->set_accessibility_name(TTRC("Incoming Bandwidth"));
 	hb->add_child(incoming_bandwidth_text);
 
 	Control *down_up_spacer = memnew(Control);
@@ -346,6 +355,7 @@ EditorNetworkProfiler::EditorNetworkProfiler() {
 	outgoing_bandwidth_text->set_editable(false);
 	outgoing_bandwidth_text->set_custom_minimum_size(Size2(120, 0) * EDSCALE);
 	outgoing_bandwidth_text->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_RIGHT);
+	outgoing_bandwidth_text->set_accessibility_name(TTRC("Outgoing Bandwidth"));
 	hb->add_child(outgoing_bandwidth_text);
 
 	// Set initial texts in the incoming/outgoing bandwidth labels
@@ -359,7 +369,7 @@ EditorNetworkProfiler::EditorNetworkProfiler() {
 
 	// RPC
 	counters_display = memnew(Tree);
-	counters_display->set_custom_minimum_size(Size2(320, 0) * EDSCALE);
+	counters_display->set_custom_minimum_size(Size2(280, 0) * EDSCALE);
 	counters_display->set_v_size_flags(SIZE_EXPAND_FILL);
 	counters_display->set_h_size_flags(SIZE_EXPAND_FILL);
 	counters_display->set_hide_folding(true);
@@ -382,7 +392,7 @@ EditorNetworkProfiler::EditorNetworkProfiler() {
 
 	// Replication
 	replication_display = memnew(Tree);
-	replication_display->set_custom_minimum_size(Size2(320, 0) * EDSCALE);
+	replication_display->set_custom_minimum_size(Size2(280, 0) * EDSCALE);
 	replication_display->set_v_size_flags(SIZE_EXPAND_FILL);
 	replication_display->set_h_size_flags(SIZE_EXPAND_FILL);
 	replication_display->set_hide_folding(true);
diff --git a/engine/modules/multiplayer/editor/editor_network_profiler.h b/engine/modules/multiplayer/editor/editor_network_profiler.h
index 46931c9f..39fa3b34 100644
--- a/engine/modules/multiplayer/editor/editor_network_profiler.h
+++ b/engine/modules/multiplayer/editor/editor_network_profiler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_NETWORK_PROFILER_H
-#define EDITOR_NETWORK_PROFILER_H
+#pragma once
 
 #include "../multiplayer_debugger.h"
 
@@ -120,5 +119,3 @@ public:
 
 	EditorNetworkProfiler();
 };
-
-#endif // EDITOR_NETWORK_PROFILER_H
diff --git a/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h b/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h
index e8ade539..2a3b3a12 100644
--- a/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h
+++ b/engine/modules/multiplayer/editor/multiplayer_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIPLAYER_EDITOR_PLUGIN_H
-#define MULTIPLAYER_EDITOR_PLUGIN_H
+#pragma once
 
 #include "editor/plugins/editor_debugger_plugin.h"
 #include "editor/plugins/editor_plugin.h"
@@ -51,8 +50,6 @@ public:
 	virtual bool has_capture(const String &p_capture) const override;
 	virtual bool capture(const String &p_message, const Array &p_data, int p_index) override;
 	virtual void setup_session(int p_session_id) override;
-
-	MultiplayerEditorDebugger() {}
 };
 
 class ReplicationEditor;
@@ -80,5 +77,3 @@ public:
 
 	MultiplayerEditorPlugin();
 };
-
-#endif // MULTIPLAYER_EDITOR_PLUGIN_H
diff --git a/engine/modules/multiplayer/editor/replication_editor.cpp b/engine/modules/multiplayer/editor/replication_editor.cpp
index e861acc8..797d2cf3 100644
--- a/engine/modules/multiplayer/editor/replication_editor.cpp
+++ b/engine/modules/multiplayer/editor/replication_editor.cpp
@@ -234,6 +234,7 @@ ReplicationEditor::ReplicationEditor() {
 
 	np_line_edit = memnew(LineEdit);
 	np_line_edit->set_placeholder(":property");
+	np_line_edit->set_accessibility_name(TTRC("Path"));
 	np_line_edit->set_h_size_flags(SIZE_EXPAND_FILL);
 	np_line_edit->connect(SceneStringName(text_submitted), callable_mp(this, &ReplicationEditor::_np_text_submitted));
 	hb->add_child(np_line_edit);
@@ -251,6 +252,7 @@ ReplicationEditor::ReplicationEditor() {
 	pin->set_theme_type_variation(SceneStringName(FlatButton));
 	pin->set_toggle_mode(true);
 	pin->set_tooltip_text(TTR("Pin replication editor"));
+	pin->set_accessibility_name(TTRC("Pin"));
 	hb->add_child(pin);
 
 	tree = memnew(Tree);
diff --git a/engine/modules/multiplayer/editor/replication_editor.h b/engine/modules/multiplayer/editor/replication_editor.h
index 017fa739..7e78f275 100644
--- a/engine/modules/multiplayer/editor/replication_editor.h
+++ b/engine/modules/multiplayer/editor/replication_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REPLICATION_EDITOR_H
-#define REPLICATION_EDITOR_H
+#pragma once
 
 #include "../scene_replication_config.h"
 
@@ -102,7 +101,4 @@ public:
 
 	Button *get_pin() { return pin; }
 	ReplicationEditor();
-	~ReplicationEditor() {}
 };
-
-#endif // REPLICATION_EDITOR_H
diff --git a/engine/modules/multiplayer/multiplayer_debugger.cpp b/engine/modules/multiplayer/multiplayer_debugger.cpp
index c816bd3b..e762f39e 100644
--- a/engine/modules/multiplayer/multiplayer_debugger.cpp
+++ b/engine/modules/multiplayer/multiplayer_debugger.cpp
@@ -150,9 +150,7 @@ void MultiplayerDebugger::BandwidthProfiler::tick(double p_frame_time, double p_
 		int incoming_bandwidth = bandwidth_usage(bandwidth_in, bandwidth_in_ptr);
 		int outgoing_bandwidth = bandwidth_usage(bandwidth_out, bandwidth_out_ptr);
 
-		Array arr;
-		arr.push_back(incoming_bandwidth);
-		arr.push_back(outgoing_bandwidth);
+		Array arr = { incoming_bandwidth, outgoing_bandwidth };
 		EngineDebugger::get_singleton()->send_message("multiplayer:bandwidth", arr);
 	}
 }
@@ -160,8 +158,7 @@ void MultiplayerDebugger::BandwidthProfiler::tick(double p_frame_time, double p_
 // RPCProfiler
 
 Array MultiplayerDebugger::RPCFrame::serialize() {
-	Array arr;
-	arr.push_back(infos.size() * 6);
+	Array arr = { infos.size() * 6 };
 	for (int i = 0; i < infos.size(); ++i) {
 		arr.push_back(uint64_t(infos[i].node));
 		arr.push_back(infos[i].node_path);
@@ -198,7 +195,7 @@ void MultiplayerDebugger::RPCProfiler::init_node(const ObjectID p_node) {
 	}
 	rpc_node_data.insert(p_node, RPCNodeInfo());
 	rpc_node_data[p_node].node = p_node;
-	rpc_node_data[p_node].node_path = Object::cast_to<Node>(ObjectDB::get_instance(p_node))->get_path();
+	rpc_node_data[p_node].node_path = ObjectDB::get_instance<Node>(p_node)->get_path();
 }
 
 void MultiplayerDebugger::RPCProfiler::toggle(bool p_enable, const Array &p_opts) {
@@ -270,8 +267,7 @@ bool MultiplayerDebugger::SyncInfo::read_from_array(const Array &p_arr, int p_of
 }
 
 Array MultiplayerDebugger::ReplicationFrame::serialize() {
-	Array arr;
-	arr.push_back(infos.size() * 7);
+	Array arr = { infos.size() * 7 };
 	for (const KeyValue<ObjectID, SyncInfo> &E : infos) {
 		E.value.write_to_array(arr);
 	}
@@ -304,7 +300,7 @@ void MultiplayerDebugger::ReplicationProfiler::add(const Array &p_data) {
 	const String what = p_data[0];
 	const ObjectID id = p_data[1];
 	const uint64_t size = p_data[2];
-	MultiplayerSynchronizer *sync = Object::cast_to<MultiplayerSynchronizer>(ObjectDB::get_instance(id));
+	MultiplayerSynchronizer *sync = ObjectDB::get_instance<MultiplayerSynchronizer>(id);
 	ERR_FAIL_NULL(sync);
 	if (!sync_data.has(id)) {
 		sync_data[id] = SyncInfo(sync);
diff --git a/engine/modules/multiplayer/multiplayer_debugger.h b/engine/modules/multiplayer/multiplayer_debugger.h
index e2e022d5..64850345 100644
--- a/engine/modules/multiplayer/multiplayer_debugger.h
+++ b/engine/modules/multiplayer/multiplayer_debugger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIPLAYER_DEBUGGER_H
-#define MULTIPLAYER_DEBUGGER_H
+#pragma once
 
 #include "core/debugger/engine_profiler.h"
 
@@ -128,5 +127,3 @@ public:
 	static void initialize();
 	static void deinitialize();
 };
-
-#endif // MULTIPLAYER_DEBUGGER_H
diff --git a/engine/modules/multiplayer/multiplayer_spawner.cpp b/engine/modules/multiplayer/multiplayer_spawner.cpp
index 639ea158..8e38d941 100644
--- a/engine/modules/multiplayer/multiplayer_spawner.cpp
+++ b/engine/modules/multiplayer/multiplayer_spawner.cpp
@@ -185,7 +185,7 @@ void MultiplayerSpawner::_update_spawn_node() {
 	}
 #endif
 	if (spawn_node.is_valid()) {
-		Node *node = Object::cast_to<Node>(ObjectDB::get_instance(spawn_node));
+		Node *node = ObjectDB::get_instance<Node>(spawn_node);
 		if (node && node->is_connected("child_entered_tree", callable_mp(this, &MultiplayerSpawner::_node_added))) {
 			node->disconnect("child_entered_tree", callable_mp(this, &MultiplayerSpawner::_node_added));
 		}
@@ -211,7 +211,7 @@ void MultiplayerSpawner::_notification(int p_what) {
 			_update_spawn_node();
 
 			for (const KeyValue<ObjectID, SpawnInfo> &E : tracked_nodes) {
-				Node *node = Object::cast_to<Node>(ObjectDB::get_instance(E.key));
+				Node *node = ObjectDB::get_instance<Node>(E.key);
 				ERR_CONTINUE(!node);
 				node->disconnect(SceneStringName(tree_exiting), callable_mp(this, &MultiplayerSpawner::_node_exit));
 				get_multiplayer()->object_configuration_remove(node, this);
@@ -265,7 +265,7 @@ void MultiplayerSpawner::_spawn_notify(ObjectID p_id) {
 }
 
 void MultiplayerSpawner::_node_exit(ObjectID p_id) {
-	Node *node = Object::cast_to<Node>(ObjectDB::get_instance(p_id));
+	Node *node = ObjectDB::get_instance<Node>(p_id);
 	ERR_FAIL_NULL(node);
 	if (tracked_nodes.has(p_id)) {
 		tracked_nodes.erase(p_id);
diff --git a/engine/modules/multiplayer/multiplayer_spawner.h b/engine/modules/multiplayer/multiplayer_spawner.h
index 4f649d61..36436310 100644
--- a/engine/modules/multiplayer/multiplayer_spawner.h
+++ b/engine/modules/multiplayer/multiplayer_spawner.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIPLAYER_SPAWNER_H
-#define MULTIPLAYER_SPAWNER_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/main/node.h"
@@ -91,7 +90,7 @@ public:
 	PackedStringArray get_configuration_warnings() const override;
 
 	Node *get_spawn_node() const {
-		return spawn_node.is_valid() ? Object::cast_to<Node>(ObjectDB::get_instance(spawn_node)) : nullptr;
+		return spawn_node.is_valid() ? ObjectDB::get_instance<Node>(spawn_node) : nullptr;
 	}
 
 	void add_spawnable_scene(const String &p_path);
@@ -115,5 +114,3 @@ public:
 
 	MultiplayerSpawner() {}
 };
-
-#endif // MULTIPLAYER_SPAWNER_H
diff --git a/engine/modules/multiplayer/multiplayer_synchronizer.cpp b/engine/modules/multiplayer/multiplayer_synchronizer.cpp
index 852975b8..ced4719a 100644
--- a/engine/modules/multiplayer/multiplayer_synchronizer.cpp
+++ b/engine/modules/multiplayer/multiplayer_synchronizer.cpp
@@ -100,7 +100,7 @@ void MultiplayerSynchronizer::_update_process() {
 }
 
 Node *MultiplayerSynchronizer::get_root_node() {
-	return root_node_cache.is_valid() ? Object::cast_to<Node>(ObjectDB::get_instance(root_node_cache)) : nullptr;
+	return root_node_cache.is_valid() ? ObjectDB::get_instance<Node>(root_node_cache) : nullptr;
 }
 
 void MultiplayerSynchronizer::reset() {
@@ -376,7 +376,7 @@ Error MultiplayerSynchronizer::_watch_changes(uint64_t p_usec) {
 	if (props.size() != watchers.size()) {
 		watchers.resize(props.size());
 	}
-	if (props.size() == 0) {
+	if (props.is_empty()) {
 		return OK;
 	}
 	Node *node = get_root_node();
diff --git a/engine/modules/multiplayer/multiplayer_synchronizer.h b/engine/modules/multiplayer/multiplayer_synchronizer.h
index 192d7a59..a95d5948 100644
--- a/engine/modules/multiplayer/multiplayer_synchronizer.h
+++ b/engine/modules/multiplayer/multiplayer_synchronizer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIPLAYER_SYNCHRONIZER_H
-#define MULTIPLAYER_SYNCHRONIZER_H
+#pragma once
 
 #include "scene_replication_config.h"
 
@@ -125,5 +124,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(MultiplayerSynchronizer::VisibilityUpdateMode);
-
-#endif // MULTIPLAYER_SYNCHRONIZER_H
diff --git a/engine/modules/multiplayer/register_types.cpp b/engine/modules/multiplayer/register_types.cpp
index fe29b4bd..045e6f9e 100644
--- a/engine/modules/multiplayer/register_types.cpp
+++ b/engine/modules/multiplayer/register_types.cpp
@@ -48,8 +48,10 @@ void initialize_multiplayer_module(ModuleInitializationLevel p_level) {
 		GDREGISTER_CLASS(MultiplayerSynchronizer);
 		GDREGISTER_CLASS(OfflineMultiplayerPeer);
 		GDREGISTER_CLASS(SceneMultiplayer);
-		MultiplayerAPI::set_default_interface("SceneMultiplayer");
-		MultiplayerDebugger::initialize();
+		if (GD_IS_CLASS_ENABLED(MultiplayerAPI)) {
+			MultiplayerAPI::set_default_interface("SceneMultiplayer");
+			MultiplayerDebugger::initialize();
+		}
 	}
 #ifdef TOOLS_ENABLED
 	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
@@ -59,5 +61,7 @@ void initialize_multiplayer_module(ModuleInitializationLevel p_level) {
 }
 
 void uninitialize_multiplayer_module(ModuleInitializationLevel p_level) {
-	MultiplayerDebugger::deinitialize();
+	if (GD_IS_CLASS_ENABLED(MultiplayerAPI)) {
+		MultiplayerDebugger::deinitialize();
+	}
 }
diff --git a/engine/modules/multiplayer/register_types.h b/engine/modules/multiplayer/register_types.h
index 0144b0ce..5f7bcdbb 100644
--- a/engine/modules/multiplayer/register_types.h
+++ b/engine/modules/multiplayer/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIPLAYER_REGISTER_TYPES_H
-#define MULTIPLAYER_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_multiplayer_module(ModuleInitializationLevel p_level);
 void uninitialize_multiplayer_module(ModuleInitializationLevel p_level);
-
-#endif // MULTIPLAYER_REGISTER_TYPES_H
diff --git a/engine/modules/multiplayer/scene_cache_interface.cpp b/engine/modules/multiplayer/scene_cache_interface.cpp
index 99c8930e..68cd3a99 100644
--- a/engine/modules/multiplayer/scene_cache_interface.cpp
+++ b/engine/modules/multiplayer/scene_cache_interface.cpp
@@ -100,8 +100,7 @@ void SceneCacheInterface::process_simplify_path(int p_from, const uint8_t *p_pac
 	ERR_FAIL_NULL(root_node);
 	int ofs = 1;
 
-	String methods_md5;
-	methods_md5.parse_utf8((const char *)(p_packet + ofs), 32);
+	String methods_md5 = String::utf8((const char *)(p_packet + ofs), 32);
 	ofs += 33;
 
 	int id = decode_uint32(&p_packet[ofs]);
@@ -109,8 +108,7 @@ void SceneCacheInterface::process_simplify_path(int p_from, const uint8_t *p_pac
 
 	ERR_FAIL_COND_MSG(peers_info[p_from].recv_nodes.has(id), vformat("Duplicate remote cache ID %d for peer %d", id, p_from));
 
-	String paths;
-	paths.parse_utf8((const char *)(p_packet + ofs), p_packet_len - ofs);
+	String paths = String::utf8((const char *)(p_packet + ofs), p_packet_len - ofs);
 
 	const NodePath path = paths;
 
@@ -154,7 +152,7 @@ void SceneCacheInterface::process_confirm_path(int p_from, const uint8_t *p_pack
 	}
 
 	if (valid_rpc_checksum == false) {
-		const Node *node = Object::cast_to<Node>(ObjectDB::get_instance(*oid));
+		const Node *node = ObjectDB::get_instance<Node>(*oid);
 		ERR_FAIL_NULL(node); // Bug.
 		ERR_PRINT("The rpc node checksum failed. Make sure to have the same methods on both nodes. Node path: " + node->get_path());
 	}
@@ -280,7 +278,7 @@ Object *SceneCacheInterface::get_cached_object(int p_from, uint32_t p_cache_id)
 
 	RecvNode *recv_node = pinfo->recv_nodes.getptr(p_cache_id);
 	ERR_FAIL_NULL_V_MSG(recv_node, nullptr, vformat("ID %d not found in cache of peer %d.", p_cache_id, p_from));
-	Node *node = Object::cast_to<Node>(ObjectDB::get_instance(recv_node->oid));
+	Node *node = ObjectDB::get_instance<Node>(recv_node->oid);
 	if (!node) {
 		// Fallback to path lookup.
 		Node *root_node = SceneTree::get_singleton()->get_root()->get_node(multiplayer->get_root_path());
diff --git a/engine/modules/multiplayer/scene_cache_interface.h b/engine/modules/multiplayer/scene_cache_interface.h
index 675bd073..36f1737a 100644
--- a/engine/modules/multiplayer/scene_cache_interface.h
+++ b/engine/modules/multiplayer/scene_cache_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_CACHE_INTERFACE_H
-#define SCENE_CACHE_INTERFACE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -89,5 +88,3 @@ public:
 
 	SceneCacheInterface(SceneMultiplayer *p_multiplayer) { multiplayer = p_multiplayer; }
 };
-
-#endif // SCENE_CACHE_INTERFACE_H
diff --git a/engine/modules/multiplayer/scene_multiplayer.cpp b/engine/modules/multiplayer/scene_multiplayer.cpp
index 8ec89404..cf54c2ef 100644
--- a/engine/modules/multiplayer/scene_multiplayer.cpp
+++ b/engine/modules/multiplayer/scene_multiplayer.cpp
@@ -37,15 +37,14 @@
 #include "core/os/os.h"
 #endif
 
-#include <stdint.h>
-
 #ifdef DEBUG_ENABLED
 _FORCE_INLINE_ void SceneMultiplayer::_profile_bandwidth(const String &p_what, int p_value) {
 	if (EngineDebugger::is_profiling("multiplayer:bandwidth")) {
-		Array values;
-		values.push_back(p_what);
-		values.push_back(OS::get_singleton()->get_ticks_msec());
-		values.push_back(p_value);
+		Array values = {
+			p_what,
+			OS::get_singleton()->get_ticks_msec(),
+			p_value
+		};
 		EngineDebugger::profiler_add_frame_data("multiplayer:bandwidth", values);
 	}
 }
diff --git a/engine/modules/multiplayer/scene_multiplayer.h b/engine/modules/multiplayer/scene_multiplayer.h
index 5b668e16..23a21678 100644
--- a/engine/modules/multiplayer/scene_multiplayer.h
+++ b/engine/modules/multiplayer/scene_multiplayer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_MULTIPLAYER_H
-#define SCENE_MULTIPLAYER_H
+#pragma once
 
 #include "scene_cache_interface.h"
 #include "scene_replication_interface.h"
@@ -204,5 +203,3 @@ public:
 	SceneMultiplayer();
 	~SceneMultiplayer();
 };
-
-#endif // SCENE_MULTIPLAYER_H
diff --git a/engine/modules/multiplayer/scene_replication_config.h b/engine/modules/multiplayer/scene_replication_config.h
index 969a23d7..e54900b4 100644
--- a/engine/modules/multiplayer/scene_replication_config.h
+++ b/engine/modules/multiplayer/scene_replication_config.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_REPLICATION_CONFIG_H
-#define SCENE_REPLICATION_CONFIG_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/variant/typed_array.h"
@@ -108,5 +107,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(SceneReplicationConfig::ReplicationMode);
-
-#endif // SCENE_REPLICATION_CONFIG_H
diff --git a/engine/modules/multiplayer/scene_replication_interface.cpp b/engine/modules/multiplayer/scene_replication_interface.cpp
index edc66c87..2e84349a 100644
--- a/engine/modules/multiplayer/scene_replication_interface.cpp
+++ b/engine/modules/multiplayer/scene_replication_interface.cpp
@@ -43,10 +43,7 @@
 #ifdef DEBUG_ENABLED
 _FORCE_INLINE_ void SceneReplicationInterface::_profile_node_data(const String &p_what, ObjectID p_id, int p_size) {
 	if (EngineDebugger::is_profiling("multiplayer:replication")) {
-		Array values;
-		values.push_back(p_what);
-		values.push_back(p_id);
-		values.push_back(p_size);
+		Array values = { p_what, p_id, p_size };
 		EngineDebugger::profiler_add_frame_data("multiplayer:replication", values);
 	}
 }
diff --git a/engine/modules/multiplayer/scene_replication_interface.h b/engine/modules/multiplayer/scene_replication_interface.h
index cb582a2c..436eddbd 100644
--- a/engine/modules/multiplayer/scene_replication_interface.h
+++ b/engine/modules/multiplayer/scene_replication_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_REPLICATION_INTERFACE_H
-#define SCENE_REPLICATION_INTERFACE_H
+#pragma once
 
 #include "multiplayer_spawner.h"
 #include "multiplayer_synchronizer.h"
@@ -114,7 +113,7 @@ private:
 
 	template <typename T>
 	static T *get_id_as(const ObjectID &p_id) {
-		return p_id.is_valid() ? Object::cast_to<T>(ObjectDB::get_instance(p_id)) : nullptr;
+		return p_id.is_valid() ? ObjectDB::get_instance<T>(p_id) : nullptr;
 	}
 
 #ifdef DEBUG_ENABLED
@@ -151,5 +150,3 @@ public:
 		multiplayer_cache = p_cache;
 	}
 };
-
-#endif // SCENE_REPLICATION_INTERFACE_H
diff --git a/engine/modules/multiplayer/scene_rpc_interface.cpp b/engine/modules/multiplayer/scene_rpc_interface.cpp
index 5d117eb1..45ea6b2d 100644
--- a/engine/modules/multiplayer/scene_rpc_interface.cpp
+++ b/engine/modules/multiplayer/scene_rpc_interface.cpp
@@ -54,10 +54,7 @@
 #ifdef DEBUG_ENABLED
 _FORCE_INLINE_ void SceneRPCInterface::_profile_node_data(const String &p_what, ObjectID p_id, int p_size) {
 	if (EngineDebugger::is_profiling("multiplayer:rpc")) {
-		Array values;
-		values.push_back(p_what);
-		values.push_back(p_id);
-		values.push_back(p_size);
+		Array values = { p_what, p_id, p_size };
 		EngineDebugger::profiler_add_frame_data("multiplayer:rpc", values);
 	}
 }
@@ -138,8 +135,7 @@ Node *SceneRPCInterface::_process_get_node(int p_from, const uint8_t *p_packet,
 
 		ERR_FAIL_COND_V_MSG(ofs >= p_packet_len, nullptr, "Invalid packet received. Size smaller than declared.");
 
-		String paths;
-		paths.parse_utf8((const char *)&p_packet[ofs], p_packet_len - ofs);
+		String paths = String::utf8((const char *)&p_packet[ofs], p_packet_len - ofs);
 
 		NodePath np = paths;
 
@@ -301,7 +297,7 @@ void SceneRPCInterface::_send_rpc(Node *p_node, int p_to, uint16_t p_rpc_id, con
 
 	ERR_FAIL_COND_MSG(p_argcount > 255, "Too many arguments (>255).");
 
-	if (p_to != 0 && !multiplayer->get_connected_peers().has(ABS(p_to))) {
+	if (p_to != 0 && !multiplayer->get_connected_peers().has(Math::abs(p_to))) {
 		ERR_FAIL_COND_MSG(p_to == multiplayer->get_unique_id(), "Attempt to call RPC on yourself! Peer unique ID: " + itos(multiplayer->get_unique_id()) + ".");
 
 		ERR_FAIL_MSG("Attempt to call RPC with unknown peer ID: " + itos(p_to) + ".");
diff --git a/engine/modules/multiplayer/scene_rpc_interface.h b/engine/modules/multiplayer/scene_rpc_interface.h
index 5c9b66d5..0a38457f 100644
--- a/engine/modules/multiplayer/scene_rpc_interface.h
+++ b/engine/modules/multiplayer/scene_rpc_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_RPC_INTERFACE_H
-#define SCENE_RPC_INTERFACE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "scene/main/multiplayer_api.h"
@@ -110,5 +109,3 @@ public:
 		multiplayer_replicator = p_replicator;
 	}
 };
-
-#endif // SCENE_RPC_INTERFACE_H
diff --git a/engine/modules/multiplayer/tests/test_multiplayer_spawner.h b/engine/modules/multiplayer/tests/test_multiplayer_spawner.h
new file mode 100644
index 00000000..7124fcf9
--- /dev/null
+++ b/engine/modules/multiplayer/tests/test_multiplayer_spawner.h
@@ -0,0 +1,445 @@
+/**************************************************************************/
+/*  test_multiplayer_spawner.h                                            */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "tests/test_macros.h"
+#include "tests/test_utils.h"
+
+#include "../multiplayer_spawner.h"
+
+namespace TestMultiplayerSpawner {
+
+static inline Array build_array() {
+	return Array();
+}
+template <typename... Targs>
+static inline Array build_array(Variant item, Targs... Fargs) {
+	Array a = build_array(Fargs...);
+	a.push_front(item);
+	return a;
+}
+
+class Wasp : public Node {
+	GDCLASS(Wasp, Node);
+
+	int _size = 0;
+
+public:
+	int get_size() const {
+		return _size;
+	}
+	void set_size(int p_size) {
+		_size = p_size;
+	}
+
+	Wasp() {
+		set_name("Wasp");
+		set_scene_file_path("wasp.tscn");
+	}
+};
+
+class SpawnWasps : public Object {
+	GDCLASS(SpawnWasps, Object);
+
+protected:
+	static void _bind_methods() {
+		ClassDB::bind_method(D_METHOD("wasp", "size"), &SpawnWasps::create_wasps);
+		{
+			MethodInfo mi;
+			mi.name = "wasp_error";
+			mi.arguments.push_back(PropertyInfo(Variant::INT, "size"));
+
+			ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "wasp_error", &SpawnWasps::create_wasps_error, mi, varray(), false);
+		}
+		ClassDB::bind_method(D_METHOD("echo", "size"), &SpawnWasps::echo_size);
+	}
+
+public:
+	Wasp *create_wasps(int p_size) {
+		Wasp *wasp = memnew(Wasp);
+		wasp->set_size(p_size);
+		return wasp;
+	}
+
+	Wasp *create_wasps_error(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
+		r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT;
+		return nullptr;
+	}
+
+	int echo_size(int p_size) {
+		return p_size;
+	}
+};
+
+TEST_CASE("[Multiplayer][MultiplayerSpawner] Defaults") {
+	MultiplayerSpawner *multiplayer_spawner = memnew(MultiplayerSpawner);
+
+	CHECK_EQ(multiplayer_spawner->get_configuration_warnings().size(), 1);
+	CHECK_EQ(multiplayer_spawner->get_spawn_node(), nullptr);
+	CHECK_EQ(multiplayer_spawner->get_spawnable_scene_count(), 0);
+	CHECK_EQ(multiplayer_spawner->get_spawn_path(), NodePath());
+	CHECK_EQ(multiplayer_spawner->get_spawn_limit(), 0);
+	CHECK_EQ(multiplayer_spawner->get_spawn_function(), Callable());
+
+	memdelete(multiplayer_spawner);
+}
+
+TEST_CASE("[Multiplayer][MultiplayerSpawner][SceneTree] Spawn Path warning") {
+	MultiplayerSpawner *multiplayer_spawner = memnew(MultiplayerSpawner);
+	SceneTree::get_singleton()->get_root()->add_child(multiplayer_spawner);
+
+	// If there is no spawn path, there should be a warning.
+	PackedStringArray warning_messages = multiplayer_spawner->get_configuration_warnings();
+	REQUIRE_EQ(warning_messages.size(), 1);
+	CHECK_MESSAGE(warning_messages[0].contains("\"Spawn Path\""), "Invalid configuration warning");
+
+	// If there is a spawn path, but it doesn't exist a node on it, there should be a warning.
+	multiplayer_spawner->set_spawn_path(NodePath("/root/Foo"));
+	warning_messages = multiplayer_spawner->get_configuration_warnings();
+	REQUIRE_EQ(warning_messages.size(), 1);
+	CHECK_MESSAGE(warning_messages[0].contains("\"Spawn Path\""), "Invalid configuration warning");
+
+	// If there is a spawn path and a node on it, shouldn't be a warning.
+	Node *foo = memnew(Node);
+	foo->set_name("Foo");
+	SceneTree::get_singleton()->get_root()->add_child(foo);
+	warning_messages = multiplayer_spawner->get_configuration_warnings();
+	CHECK_EQ(warning_messages.size(), 0);
+
+	memdelete(foo);
+	memdelete(multiplayer_spawner);
+}
+
+TEST_CASE("[Multiplayer][MultiplayerSpawner][SceneTree] Spawn node") {
+	MultiplayerSpawner *multiplayer_spawner = memnew(MultiplayerSpawner);
+	SceneTree::get_singleton()->get_root()->add_child(multiplayer_spawner);
+	CHECK_EQ(multiplayer_spawner->get_spawn_node(), nullptr);
+
+	Node *foo = memnew(Node);
+	foo->set_name("Foo");
+	SceneTree::get_singleton()->get_root()->add_child(foo);
+
+	SUBCASE("nullptr if spawn path doesn't exists") {
+		multiplayer_spawner->set_spawn_path(NodePath("/root/NotExists"));
+
+		CHECK_EQ(multiplayer_spawner->get_spawn_node(), nullptr);
+	}
+
+	SUBCASE("Get it after setting spawn path with no signal connections") {
+		multiplayer_spawner->set_spawn_path(NodePath("/root/Foo"));
+
+		CHECK_EQ(multiplayer_spawner->get_spawn_node(), foo);
+		CHECK_FALSE(foo->has_connections("child_entered_tree"));
+	}
+
+	SUBCASE("Get it after setting spawn path with signal connections") {
+		multiplayer_spawner->add_spawnable_scene("scene.tscn");
+		multiplayer_spawner->set_spawn_path(NodePath("/root/Foo"));
+
+		CHECK_EQ(multiplayer_spawner->get_spawn_node(), foo);
+		CHECK(foo->has_connections("child_entered_tree"));
+	}
+
+	SUBCASE("Set a new one should disconnect signals from the old one") {
+		multiplayer_spawner->add_spawnable_scene("scene.tscn");
+		multiplayer_spawner->set_spawn_path(NodePath("/root/Foo"));
+
+		CHECK_EQ(multiplayer_spawner->get_spawn_node(), foo);
+		CHECK(foo->has_connections("child_entered_tree"));
+
+		Node *bar = memnew(Node);
+		bar->set_name("Bar");
+		SceneTree::get_singleton()->get_root()->add_child(bar);
+		multiplayer_spawner->set_spawn_path(NodePath("/root/Bar"));
+
+		CHECK_EQ(multiplayer_spawner->get_spawn_node(), bar);
+		CHECK(bar->has_connections("child_entered_tree"));
+		CHECK_FALSE(foo->has_connections("child_entered_tree"));
+
+		memdelete(bar);
+	}
+
+	memdelete(foo);
+	memdelete(multiplayer_spawner);
+}
+
+TEST_CASE("[Multiplayer][MultiplayerSpawner][SceneTree] Spawnable scene") {
+	MultiplayerSpawner *multiplayer_spawner = memnew(MultiplayerSpawner);
+	SceneTree::get_singleton()->get_root()->add_child(multiplayer_spawner);
+	CHECK_EQ(multiplayer_spawner->get_spawnable_scene_count(), 0);
+
+	SUBCASE("Add one") {
+		multiplayer_spawner->add_spawnable_scene("scene.tscn");
+
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene_count(), 1);
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene(0), "scene.tscn");
+	}
+
+	SUBCASE("Add one and if there is a valid spawn path add a connection to it") {
+		Node *foo = memnew(Node);
+		foo->set_name("Foo");
+		multiplayer_spawner->set_spawn_path(NodePath("/root/Foo"));
+		CHECK_FALSE(foo->has_connections("child_entered_tree"));
+
+		// Adding now foo to the tree to avoid set_spawn_path() making the connection.
+		SceneTree::get_singleton()->get_root()->add_child(foo);
+		multiplayer_spawner->notification(Node::NOTIFICATION_POST_ENTER_TREE);
+		CHECK_FALSE(foo->has_connections("child_entered_tree"));
+		multiplayer_spawner->add_spawnable_scene("scene.tscn");
+		CHECK(foo->has_connections("child_entered_tree"));
+
+		memdelete(foo);
+	}
+
+	SUBCASE("Add multiple") {
+		multiplayer_spawner->add_spawnable_scene("scene.tscn");
+		multiplayer_spawner->add_spawnable_scene("other_scene.tscn");
+		multiplayer_spawner->add_spawnable_scene("yet_another_scene.tscn");
+
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene_count(), 3);
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene(0), "scene.tscn");
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene(1), "other_scene.tscn");
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene(2), "yet_another_scene.tscn");
+	}
+
+	SUBCASE("Clear") {
+		Node *foo = memnew(Node);
+		foo->set_name("Foo");
+		SceneTree::get_singleton()->get_root()->add_child(foo);
+		multiplayer_spawner->set_spawn_path(NodePath("/root/Foo"));
+
+		multiplayer_spawner->add_spawnable_scene("scene.tscn");
+		multiplayer_spawner->add_spawnable_scene("other_scene.tscn");
+		multiplayer_spawner->add_spawnable_scene("yet_another_scene.tscn");
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene_count(), 3);
+		CHECK(foo->has_connections("child_entered_tree"));
+
+		multiplayer_spawner->clear_spawnable_scenes();
+
+		CHECK_EQ(multiplayer_spawner->get_spawnable_scene_count(), 0);
+		CHECK_FALSE(foo->has_connections("child_entered_tree"));
+	}
+
+	memdelete(multiplayer_spawner);
+}
+
+TEST_CASE("[Multiplayer][MultiplayerSpawner][SceneTree] Instantiate custom") {
+	MultiplayerSpawner *multiplayer_spawner = memnew(MultiplayerSpawner);
+	SceneTree::get_singleton()->get_root()->add_child(multiplayer_spawner);
+	CHECK_EQ(multiplayer_spawner->get_spawn_node(), nullptr);
+
+	Node *nest = memnew(Node);
+	nest->set_name("Nest");
+	SceneTree::get_singleton()->get_root()->add_child(nest);
+	multiplayer_spawner->set_spawn_path(NodePath("/root/Nest"));
+
+	SpawnWasps *spawn_wasps = memnew(SpawnWasps);
+
+	SUBCASE("Instantiates a node properly") {
+		multiplayer_spawner->add_spawnable_scene("wasp.tscn");
+
+		multiplayer_spawner->set_spawn_limit(1);
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp"));
+		Wasp *wasp = Object::cast_to<Wasp>(multiplayer_spawner->instantiate_custom(Variant(42)));
+		CHECK_NE(wasp, nullptr);
+		CHECK_EQ(wasp->get_name(), "Wasp");
+		CHECK_EQ(wasp->get_size(), 42);
+
+		memdelete(wasp);
+	}
+
+	SUBCASE("Instantiates multiple nodes properly if there is no spawn limit") {
+		multiplayer_spawner->add_spawnable_scene("wasp.tscn");
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp"));
+
+		for (int i = 0; i < 10; i++) {
+			Wasp *wasp = Object::cast_to<Wasp>(multiplayer_spawner->instantiate_custom(Variant(i)));
+			CHECK_NE(wasp, nullptr);
+			CHECK_EQ(wasp->get_name(), "Wasp");
+			CHECK_EQ(wasp->get_size(), i);
+			nest->add_child(wasp, true);
+		}
+	}
+
+	SUBCASE("Fails if spawn limit is reached") {
+		multiplayer_spawner->add_spawnable_scene("wasp.tscn");
+
+		multiplayer_spawner->set_spawn_limit(1);
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp"));
+
+		// This one works.
+		Wasp *wasp = Object::cast_to<Wasp>(multiplayer_spawner->instantiate_custom(Variant(42)));
+		CHECK_NE(wasp, nullptr);
+		CHECK_EQ(wasp->get_name(), "Wasp");
+		CHECK_EQ(wasp->get_size(), 42);
+		// Adding to the spawner node to get it tracked.
+		nest->add_child(wasp);
+
+		// This one fails because spawn limit is reached.
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->instantiate_custom(Variant(255)), nullptr);
+		ERR_PRINT_ON;
+
+		memdelete(wasp);
+	}
+
+	SUBCASE("Fails if spawn function is not set") {
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->instantiate_custom(Variant(42)), nullptr);
+		ERR_PRINT_ON;
+	}
+
+	SUBCASE("Fails when spawn function fails") {
+		multiplayer_spawner->add_spawnable_scene("wasp.tscn");
+
+		multiplayer_spawner->set_spawn_limit(1);
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp_error"));
+
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->instantiate_custom(Variant(42)), nullptr);
+		ERR_PRINT_ON;
+	}
+
+	SUBCASE("Fails when spawn function not returns a node") {
+		multiplayer_spawner->add_spawnable_scene("wasp.tscn");
+
+		multiplayer_spawner->set_spawn_limit(1);
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "echo"));
+
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->instantiate_custom(Variant(42)), nullptr);
+		ERR_PRINT_ON;
+	}
+
+	memdelete(spawn_wasps);
+	memdelete(nest);
+	memdelete(multiplayer_spawner);
+}
+
+TEST_CASE("[Multiplayer][MultiplayerSpawner][SceneTree] Spawn") {
+	MultiplayerSpawner *multiplayer_spawner = memnew(MultiplayerSpawner);
+
+	SUBCASE("Fails because is not inside tree") {
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->spawn(Variant(42)), nullptr);
+		ERR_PRINT_ON;
+	}
+
+	SceneTree::get_singleton()->get_root()->add_child(multiplayer_spawner);
+	CHECK_EQ(multiplayer_spawner->get_spawn_node(), nullptr);
+
+	Node *nest = memnew(Node);
+	nest->set_name("Nest");
+	SceneTree::get_singleton()->get_root()->add_child(nest);
+	multiplayer_spawner->set_spawn_path(NodePath("/root/Nest"));
+
+	SpawnWasps *spawn_wasps = memnew(SpawnWasps);
+	multiplayer_spawner->add_spawnable_scene("wasp.tscn");
+
+	SUBCASE("Spawns a node, track it and add it to spawn node") {
+		multiplayer_spawner->set_spawn_limit(1);
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp"));
+		Wasp *wasp = Object::cast_to<Wasp>(multiplayer_spawner->spawn(Variant(42)));
+		CHECK_NE(wasp, nullptr);
+		CHECK_EQ(wasp->get_name(), "Wasp");
+		CHECK_EQ(wasp->get_size(), 42);
+		CHECK_EQ(wasp->get_parent(), nest);
+		CHECK_EQ(nest->get_child_count(), 1);
+		CHECK_EQ(nest->get_child(0), wasp);
+	}
+
+	SUBCASE("Spawns multiple nodes properly if there is no spawn limit") {
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp"));
+
+		for (int i = 0; i < 10; i++) {
+			Wasp *wasp = Object::cast_to<Wasp>(multiplayer_spawner->spawn(Variant(i)));
+			CHECK_NE(wasp, nullptr);
+			CHECK_EQ(wasp->get_name(), "Wasp" + String((i == 0) ? "" : itos(i + 1)));
+			CHECK_EQ(wasp->get_size(), i);
+			CHECK_EQ(wasp->get_parent(), nest);
+			CHECK_EQ(nest->get_child_count(), i + 1);
+			CHECK_EQ(nest->get_child(i), wasp);
+		}
+	}
+
+	SUBCASE("Fails if spawn limit is reached") {
+		multiplayer_spawner->set_spawn_limit(1);
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp"));
+
+		// This one works.
+		Wasp *wasp = Object::cast_to<Wasp>(multiplayer_spawner->spawn(Variant(42)));
+		CHECK_NE(wasp, nullptr);
+		CHECK_EQ(wasp->get_name(), "Wasp");
+		CHECK_EQ(wasp->get_size(), 42);
+		CHECK_EQ(wasp->get_parent(), nest);
+		CHECK_EQ(nest->get_child_count(), 1);
+		CHECK_EQ(nest->get_child(0), wasp);
+
+		// This one fails because spawn limit is reached.
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->spawn(Variant(255)), nullptr);
+		ERR_PRINT_ON;
+
+		memdelete(wasp);
+	}
+
+	SUBCASE("Fails if spawn function is not set") {
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->spawn(Variant(42)), nullptr);
+		ERR_PRINT_ON;
+	}
+
+	SUBCASE("Fails if spawn node cannot be found") {
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "wasp"));
+		multiplayer_spawner->set_spawn_path(NodePath(""));
+
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->spawn(Variant(42)), nullptr);
+		ERR_PRINT_ON;
+	}
+
+	SUBCASE("Fails when instantiate_custom not returns a node") {
+		multiplayer_spawner->add_spawnable_scene("wasp.tscn");
+
+		multiplayer_spawner->set_spawn_limit(1);
+		multiplayer_spawner->set_spawn_function(Callable(spawn_wasps, "echo"));
+
+		ERR_PRINT_OFF;
+		CHECK_EQ(multiplayer_spawner->spawn(Variant(42)), nullptr);
+		ERR_PRINT_ON;
+	}
+
+	memdelete(spawn_wasps);
+	memdelete(nest);
+	memdelete(multiplayer_spawner);
+}
+
+} // namespace TestMultiplayerSpawner
diff --git a/engine/modules/multiplayer/tests/test_scene_multiplayer.h b/engine/modules/multiplayer/tests/test_scene_multiplayer.h
index 5e526c9b..2d451562 100644
--- a/engine/modules/multiplayer/tests/test_scene_multiplayer.h
+++ b/engine/modules/multiplayer/tests/test_scene_multiplayer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_SCENE_MULTIPLAYER_H
-#define TEST_SCENE_MULTIPLAYER_H
+#pragma once
 
 #include "tests/test_macros.h"
 #include "tests/test_utils.h"
@@ -280,5 +279,3 @@ TEST_CASE("[Multiplayer][SceneMultiplayer][SceneTree] Complete Authentication")
 }
 
 } // namespace TestSceneMultiplayer
-
-#endif // TEST_SCENE_MULTIPLAYER_H
diff --git a/engine/modules/navigation/2d/godot_navigation_server_2d.cpp b/engine/modules/navigation/2d/godot_navigation_server_2d.cpp
deleted file mode 100644
index 5a9dccdd..00000000
--- a/engine/modules/navigation/2d/godot_navigation_server_2d.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/**************************************************************************/
-/*  godot_navigation_server_2d.cpp                                        */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "godot_navigation_server_2d.h"
-
-#ifdef CLIPPER2_ENABLED
-#include "nav_mesh_generator_2d.h"
-#endif // CLIPPER2_ENABLED
-
-#include "servers/navigation_server_3d.h"
-
-#define FORWARD_0(FUNC_NAME)                                     \
-	GodotNavigationServer2D::FUNC_NAME() {                       \
-		return NavigationServer3D::get_singleton()->FUNC_NAME(); \
-	}
-
-#define FORWARD_0_C(FUNC_NAME)                                   \
-	GodotNavigationServer2D::FUNC_NAME()                         \
-			const {                                              \
-		return NavigationServer3D::get_singleton()->FUNC_NAME(); \
-	}
-
-#define FORWARD_1(FUNC_NAME, T_0, D_0, CONV_0)                              \
-	GodotNavigationServer2D::FUNC_NAME(T_0 D_0) {                           \
-		return NavigationServer3D::get_singleton()->FUNC_NAME(CONV_0(D_0)); \
-	}
-
-#define FORWARD_1_C(FUNC_NAME, T_0, D_0, CONV_0)                            \
-	GodotNavigationServer2D::FUNC_NAME(T_0 D_0)                             \
-			const {                                                         \
-		return NavigationServer3D::get_singleton()->FUNC_NAME(CONV_0(D_0)); \
-	}
-
-#define FORWARD_1_R_C(CONV_R, FUNC_NAME, T_0, D_0, CONV_0)                          \
-	GodotNavigationServer2D::FUNC_NAME(T_0 D_0)                                     \
-			const {                                                                 \
-		return CONV_R(NavigationServer3D::get_singleton()->FUNC_NAME(CONV_0(D_0))); \
-	}
-
-#define FORWARD_2(FUNC_NAME, T_0, D_0, T_1, D_1, CONV_0, CONV_1)                         \
-	GodotNavigationServer2D::FUNC_NAME(T_0 D_0, T_1 D_1) {                               \
-		return NavigationServer3D::get_singleton()->FUNC_NAME(CONV_0(D_0), CONV_1(D_1)); \
-	}
-
-#define FORWARD_2_C(FUNC_NAME, T_0, D_0, T_1, D_1, CONV_0, CONV_1)                       \
-	GodotNavigationServer2D::FUNC_NAME(T_0 D_0, T_1 D_1)                                 \
-			const {                                                                      \
-		return NavigationServer3D::get_singleton()->FUNC_NAME(CONV_0(D_0), CONV_1(D_1)); \
-	}
-
-#define FORWARD_2_R_C(CONV_R, FUNC_NAME, T_0, D_0, T_1, D_1, CONV_0, CONV_1)                     \
-	GodotNavigationServer2D::FUNC_NAME(T_0 D_0, T_1 D_1)                                         \
-			const {                                                                              \
-		return CONV_R(NavigationServer3D::get_singleton()->FUNC_NAME(CONV_0(D_0), CONV_1(D_1))); \
-	}
-
-static RID rid_to_rid(const RID d) {
-	return d;
-}
-
-static bool bool_to_bool(const bool d) {
-	return d;
-}
-
-static int int_to_int(const int d) {
-	return d;
-}
-
-static uint32_t uint32_to_uint32(const uint32_t d) {
-	return d;
-}
-
-static real_t real_to_real(const real_t d) {
-	return d;
-}
-
-static Vector3 v2_to_v3(const Vector2 d) {
-	return Vector3(d.x, 0.0, d.y);
-}
-
-static Vector2 v3_to_v2(const Vector3 &d) {
-	return Vector2(d.x, d.z);
-}
-
-static Vector<Vector3> vector_v2_to_v3(const Vector<Vector2> &d) {
-	Vector<Vector3> nd;
-	nd.resize(d.size());
-	for (int i(0); i < nd.size(); i++) {
-		nd.write[i] = v2_to_v3(d[i]);
-	}
-	return nd;
-}
-
-static Vector<Vector2> vector_v3_to_v2(const Vector<Vector3> &d) {
-	Vector<Vector2> nd;
-	nd.resize(d.size());
-	for (int i(0); i < nd.size(); i++) {
-		nd.write[i] = v3_to_v2(d[i]);
-	}
-	return nd;
-}
-
-static Transform3D trf2_to_trf3(const Transform2D &d) {
-	Vector3 o(v2_to_v3(d.get_origin()));
-	Basis b;
-	b.rotate(Vector3(0, -1, 0), d.get_rotation());
-	b.scale(v2_to_v3(d.get_scale()));
-	return Transform3D(b, o);
-}
-
-static Transform2D trf3_to_trf2(const Transform3D &d) {
-	Vector3 o = d.get_origin();
-	Vector3 nx = d.xform(Vector3(1, 0, 0)) - o;
-	Vector3 nz = d.xform(Vector3(0, 0, 1)) - o;
-	return Transform2D(nx.x, nx.z, nz.x, nz.z, o.x, o.z);
-}
-
-static ObjectID id_to_id(const ObjectID &id) {
-	return id;
-}
-
-static Callable callable_to_callable(const Callable &c) {
-	return c;
-}
-
-static Ref<NavigationMesh> poly_to_mesh(Ref<NavigationPolygon> d) {
-	if (d.is_valid()) {
-		return d->get_navigation_mesh();
-	} else {
-		return Ref<NavigationMesh>();
-	}
-}
-
-static Rect2 aabb_to_rect2(AABB aabb) {
-	Rect2 rect2;
-	rect2.position = Vector2(aabb.position.x, aabb.position.z);
-	rect2.size = Vector2(aabb.size.x, aabb.size.z);
-	return rect2;
-}
-
-void GodotNavigationServer2D::init() {
-#ifdef CLIPPER2_ENABLED
-	navmesh_generator_2d = memnew(NavMeshGenerator2D);
-	ERR_FAIL_NULL_MSG(navmesh_generator_2d, "Failed to init NavMeshGenerator2D.");
-	RWLockRead read_lock(geometry_parser_rwlock);
-	navmesh_generator_2d->set_generator_parsers(generator_parsers);
-#endif // CLIPPER2_ENABLED
-}
-
-void GodotNavigationServer2D::sync() {
-#ifdef CLIPPER2_ENABLED
-	if (navmesh_generator_2d) {
-		navmesh_generator_2d->sync();
-	}
-#endif // CLIPPER2_ENABLED
-}
-
-void GodotNavigationServer2D::finish() {
-#ifdef CLIPPER2_ENABLED
-	if (navmesh_generator_2d) {
-		navmesh_generator_2d->finish();
-		memdelete(navmesh_generator_2d);
-		navmesh_generator_2d = nullptr;
-	}
-#endif // CLIPPER2_ENABLED
-}
-
-void GodotNavigationServer2D::parse_source_geometry_data(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, Node *p_root_node, const Callable &p_callback) {
-	ERR_FAIL_COND_MSG(!Thread::is_main_thread(), "The SceneTree can only be parsed on the main thread. Call this function from the main thread or use call_deferred().");
-	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation polygon.");
-	ERR_FAIL_NULL_MSG(p_root_node, "No parsing root node specified.");
-	ERR_FAIL_COND_MSG(!p_root_node->is_inside_tree(), "The root node needs to be inside the SceneTree.");
-
-#ifdef CLIPPER2_ENABLED
-	ERR_FAIL_NULL(NavMeshGenerator2D::get_singleton());
-	NavMeshGenerator2D::get_singleton()->parse_source_geometry_data(p_navigation_mesh, p_source_geometry_data, p_root_node, p_callback);
-#endif // CLIPPER2_ENABLED
-}
-
-void GodotNavigationServer2D::bake_from_source_geometry_data(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, const Callable &p_callback) {
-	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation polygon.");
-	ERR_FAIL_COND_MSG(p_source_geometry_data.is_null(), "Invalid NavigationMeshSourceGeometryData2D.");
-
-#ifdef CLIPPER2_ENABLED
-	ERR_FAIL_NULL(NavMeshGenerator2D::get_singleton());
-	NavMeshGenerator2D::get_singleton()->bake_from_source_geometry_data(p_navigation_mesh, p_source_geometry_data, p_callback);
-#endif // CLIPPER2_ENABLED
-}
-
-void GodotNavigationServer2D::bake_from_source_geometry_data_async(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, const Callable &p_callback) {
-	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation mesh.");
-	ERR_FAIL_COND_MSG(p_source_geometry_data.is_null(), "Invalid NavigationMeshSourceGeometryData2D.");
-
-#ifdef CLIPPER2_ENABLED
-	ERR_FAIL_NULL(NavMeshGenerator2D::get_singleton());
-	NavMeshGenerator2D::get_singleton()->bake_from_source_geometry_data_async(p_navigation_mesh, p_source_geometry_data, p_callback);
-#endif // CLIPPER2_ENABLED
-}
-
-bool GodotNavigationServer2D::is_baking_navigation_polygon(Ref<NavigationPolygon> p_navigation_polygon) const {
-#ifdef CLIPPER2_ENABLED
-	return NavMeshGenerator2D::get_singleton()->is_baking(p_navigation_polygon);
-#else
-	return false;
-#endif
-}
-
-Vector<Vector2> GodotNavigationServer2D::simplify_path(const Vector<Vector2> &p_path, real_t p_epsilon) {
-	return vector_v3_to_v2(NavigationServer3D::get_singleton()->simplify_path(vector_v2_to_v3(p_path), p_epsilon));
-}
-
-GodotNavigationServer2D::GodotNavigationServer2D() {}
-
-GodotNavigationServer2D::~GodotNavigationServer2D() {}
-
-TypedArray<RID> FORWARD_0_C(get_maps);
-
-TypedArray<RID> FORWARD_1_C(map_get_links, RID, p_map, rid_to_rid);
-
-TypedArray<RID> FORWARD_1_C(map_get_regions, RID, p_map, rid_to_rid);
-
-TypedArray<RID> FORWARD_1_C(map_get_agents, RID, p_map, rid_to_rid);
-
-TypedArray<RID> FORWARD_1_C(map_get_obstacles, RID, p_map, rid_to_rid);
-
-RID FORWARD_1_C(region_get_map, RID, p_region, rid_to_rid);
-
-RID FORWARD_1_C(agent_get_map, RID, p_agent, rid_to_rid);
-
-RID FORWARD_0(map_create);
-
-void FORWARD_2(map_set_active, RID, p_map, bool, p_active, rid_to_rid, bool_to_bool);
-
-bool FORWARD_1_C(map_is_active, RID, p_map, rid_to_rid);
-
-void GodotNavigationServer2D::map_force_update(RID p_map) {
-	NavigationServer3D::get_singleton()->map_force_update(p_map);
-}
-
-uint32_t GodotNavigationServer2D::map_get_iteration_id(RID p_map) const {
-	return NavigationServer3D::get_singleton()->map_get_iteration_id(p_map);
-}
-
-void GodotNavigationServer2D::map_set_use_async_iterations(RID p_map, bool p_enabled) {
-	return NavigationServer3D::get_singleton()->map_set_use_async_iterations(p_map, p_enabled);
-}
-
-bool GodotNavigationServer2D::map_get_use_async_iterations(RID p_map) const {
-	return NavigationServer3D::get_singleton()->map_get_use_async_iterations(p_map);
-}
-
-void FORWARD_2(map_set_cell_size, RID, p_map, real_t, p_cell_size, rid_to_rid, real_to_real);
-real_t FORWARD_1_C(map_get_cell_size, RID, p_map, rid_to_rid);
-
-void FORWARD_2(map_set_use_edge_connections, RID, p_map, bool, p_enabled, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(map_get_use_edge_connections, RID, p_map, rid_to_rid);
-
-void FORWARD_2(map_set_edge_connection_margin, RID, p_map, real_t, p_connection_margin, rid_to_rid, real_to_real);
-real_t FORWARD_1_C(map_get_edge_connection_margin, RID, p_map, rid_to_rid);
-
-void FORWARD_2(map_set_link_connection_radius, RID, p_map, real_t, p_connection_radius, rid_to_rid, real_to_real);
-real_t FORWARD_1_C(map_get_link_connection_radius, RID, p_map, rid_to_rid);
-
-Vector<Vector2> GodotNavigationServer2D::map_get_path(RID p_map, Vector2 p_origin, Vector2 p_destination, bool p_optimize, uint32_t p_navigation_layers) {
-	return vector_v3_to_v2(NavigationServer3D::get_singleton()->map_get_path(p_map, v2_to_v3(p_origin), v2_to_v3(p_destination), p_optimize, p_navigation_layers));
-}
-
-Vector2 FORWARD_2_R_C(v3_to_v2, map_get_closest_point, RID, p_map, const Vector2 &, p_point, rid_to_rid, v2_to_v3);
-RID FORWARD_2_C(map_get_closest_point_owner, RID, p_map, const Vector2 &, p_point, rid_to_rid, v2_to_v3);
-
-Vector2 GodotNavigationServer2D::map_get_random_point(RID p_map, uint32_t p_naviation_layers, bool p_uniformly) const {
-	Vector3 result = NavigationServer3D::get_singleton()->map_get_random_point(p_map, p_naviation_layers, p_uniformly);
-	return v3_to_v2(result);
-}
-
-RID FORWARD_0(region_create);
-void FORWARD_2(region_set_enabled, RID, p_region, bool, p_enabled, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(region_get_enabled, RID, p_region, rid_to_rid);
-void FORWARD_2(region_set_use_edge_connections, RID, p_region, bool, p_enabled, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(region_get_use_edge_connections, RID, p_region, rid_to_rid);
-
-void FORWARD_2(region_set_enter_cost, RID, p_region, real_t, p_enter_cost, rid_to_rid, real_to_real);
-real_t FORWARD_1_C(region_get_enter_cost, RID, p_region, rid_to_rid);
-void FORWARD_2(region_set_travel_cost, RID, p_region, real_t, p_travel_cost, rid_to_rid, real_to_real);
-real_t FORWARD_1_C(region_get_travel_cost, RID, p_region, rid_to_rid);
-void FORWARD_2(region_set_owner_id, RID, p_region, ObjectID, p_owner_id, rid_to_rid, id_to_id);
-ObjectID FORWARD_1_C(region_get_owner_id, RID, p_region, rid_to_rid);
-bool FORWARD_2_C(region_owns_point, RID, p_region, const Vector2 &, p_point, rid_to_rid, v2_to_v3);
-
-void FORWARD_2(region_set_map, RID, p_region, RID, p_map, rid_to_rid, rid_to_rid);
-void FORWARD_2(region_set_navigation_layers, RID, p_region, uint32_t, p_navigation_layers, rid_to_rid, uint32_to_uint32);
-uint32_t FORWARD_1_C(region_get_navigation_layers, RID, p_region, rid_to_rid);
-void FORWARD_2(region_set_transform, RID, p_region, Transform2D, p_transform, rid_to_rid, trf2_to_trf3);
-
-Transform2D GodotNavigationServer2D::region_get_transform(RID p_region) const {
-	return trf3_to_trf2(NavigationServer3D::get_singleton()->region_get_transform(p_region));
-}
-
-void GodotNavigationServer2D::region_set_navigation_polygon(RID p_region, Ref<NavigationPolygon> p_navigation_polygon) {
-	NavigationServer3D::get_singleton()->region_set_navigation_mesh(p_region, poly_to_mesh(p_navigation_polygon));
-}
-
-int FORWARD_1_C(region_get_connections_count, RID, p_region, rid_to_rid);
-Vector2 FORWARD_2_R_C(v3_to_v2, region_get_connection_pathway_start, RID, p_region, int, p_connection_id, rid_to_rid, int_to_int);
-Vector2 FORWARD_2_R_C(v3_to_v2, region_get_connection_pathway_end, RID, p_region, int, p_connection_id, rid_to_rid, int_to_int);
-
-Vector2 GodotNavigationServer2D::region_get_closest_point(RID p_region, const Vector2 &p_point) const {
-	Vector3 result = NavigationServer3D::get_singleton()->region_get_closest_point(p_region, v2_to_v3(p_point));
-	return v3_to_v2(result);
-}
-
-Vector2 GodotNavigationServer2D::region_get_random_point(RID p_region, uint32_t p_navigation_layers, bool p_uniformly) const {
-	Vector3 result = NavigationServer3D::get_singleton()->region_get_random_point(p_region, p_navigation_layers, p_uniformly);
-	return v3_to_v2(result);
-}
-
-Rect2 GodotNavigationServer2D::region_get_bounds(RID p_region) const {
-	AABB bounds = NavigationServer3D::get_singleton()->region_get_bounds(p_region);
-	return aabb_to_rect2(bounds);
-}
-
-RID FORWARD_0(link_create);
-
-void FORWARD_2(link_set_map, RID, p_link, RID, p_map, rid_to_rid, rid_to_rid);
-RID FORWARD_1_C(link_get_map, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_enabled, RID, p_link, bool, p_enabled, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(link_get_enabled, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_bidirectional, RID, p_link, bool, p_bidirectional, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(link_is_bidirectional, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_navigation_layers, RID, p_link, uint32_t, p_navigation_layers, rid_to_rid, uint32_to_uint32);
-uint32_t FORWARD_1_C(link_get_navigation_layers, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_start_position, RID, p_link, Vector2, p_position, rid_to_rid, v2_to_v3);
-Vector2 FORWARD_1_R_C(v3_to_v2, link_get_start_position, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_end_position, RID, p_link, Vector2, p_position, rid_to_rid, v2_to_v3);
-Vector2 FORWARD_1_R_C(v3_to_v2, link_get_end_position, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_enter_cost, RID, p_link, real_t, p_enter_cost, rid_to_rid, real_to_real);
-real_t FORWARD_1_C(link_get_enter_cost, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_travel_cost, RID, p_link, real_t, p_travel_cost, rid_to_rid, real_to_real);
-real_t FORWARD_1_C(link_get_travel_cost, RID, p_link, rid_to_rid);
-void FORWARD_2(link_set_owner_id, RID, p_link, ObjectID, p_owner_id, rid_to_rid, id_to_id);
-ObjectID FORWARD_1_C(link_get_owner_id, RID, p_link, rid_to_rid);
-
-RID GodotNavigationServer2D::agent_create() {
-	RID agent = NavigationServer3D::get_singleton()->agent_create();
-	return agent;
-}
-
-void FORWARD_2(agent_set_avoidance_enabled, RID, p_agent, bool, p_enabled, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(agent_get_avoidance_enabled, RID, p_agent, rid_to_rid);
-void FORWARD_2(agent_set_map, RID, p_agent, RID, p_map, rid_to_rid, rid_to_rid);
-void FORWARD_2(agent_set_neighbor_distance, RID, p_agent, real_t, p_dist, rid_to_rid, real_to_real);
-real_t GodotNavigationServer2D::agent_get_neighbor_distance(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_neighbor_distance(p_agent);
-}
-void FORWARD_2(agent_set_max_neighbors, RID, p_agent, int, p_count, rid_to_rid, int_to_int);
-int GodotNavigationServer2D::agent_get_max_neighbors(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_max_neighbors(p_agent);
-}
-void FORWARD_2(agent_set_time_horizon_agents, RID, p_agent, real_t, p_time_horizon, rid_to_rid, real_to_real);
-real_t GodotNavigationServer2D::agent_get_time_horizon_agents(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_time_horizon_agents(p_agent);
-}
-void FORWARD_2(agent_set_time_horizon_obstacles, RID, p_agent, real_t, p_time_horizon, rid_to_rid, real_to_real);
-real_t GodotNavigationServer2D::agent_get_time_horizon_obstacles(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_time_horizon_obstacles(p_agent);
-}
-void FORWARD_2(agent_set_radius, RID, p_agent, real_t, p_radius, rid_to_rid, real_to_real);
-real_t GodotNavigationServer2D::agent_get_radius(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_radius(p_agent);
-}
-void FORWARD_2(agent_set_max_speed, RID, p_agent, real_t, p_max_speed, rid_to_rid, real_to_real);
-real_t GodotNavigationServer2D::agent_get_max_speed(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_max_speed(p_agent);
-}
-void FORWARD_2(agent_set_velocity_forced, RID, p_agent, Vector2, p_velocity, rid_to_rid, v2_to_v3);
-void FORWARD_2(agent_set_velocity, RID, p_agent, Vector2, p_velocity, rid_to_rid, v2_to_v3);
-Vector2 GodotNavigationServer2D::agent_get_velocity(RID p_agent) const {
-	return v3_to_v2(NavigationServer3D::get_singleton()->agent_get_velocity(p_agent));
-}
-void FORWARD_2(agent_set_position, RID, p_agent, Vector2, p_position, rid_to_rid, v2_to_v3);
-Vector2 GodotNavigationServer2D::agent_get_position(RID p_agent) const {
-	return v3_to_v2(NavigationServer3D::get_singleton()->agent_get_position(p_agent));
-}
-bool FORWARD_1_C(agent_is_map_changed, RID, p_agent, rid_to_rid);
-void FORWARD_2(agent_set_paused, RID, p_agent, bool, p_paused, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(agent_get_paused, RID, p_agent, rid_to_rid);
-
-void GodotNavigationServer2D::free(RID p_object) {
-	if (geometry_parser_owner.owns(p_object)) {
-		RWLockWrite write_lock(geometry_parser_rwlock);
-
-		NavMeshGeometryParser2D *parser = geometry_parser_owner.get_or_null(p_object);
-		ERR_FAIL_NULL(parser);
-
-		generator_parsers.erase(parser);
-#ifndef CLIPPER2_ENABLED
-		NavMeshGenerator2D::get_singleton()->set_generator_parsers(generator_parsers);
-#endif
-		geometry_parser_owner.free(parser->self);
-		return;
-	}
-	NavigationServer3D::get_singleton()->free(p_object);
-}
-
-void FORWARD_2(agent_set_avoidance_callback, RID, p_agent, Callable, p_callback, rid_to_rid, callable_to_callable);
-bool GodotNavigationServer2D::agent_has_avoidance_callback(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_has_avoidance_callback(p_agent);
-}
-
-void FORWARD_2(agent_set_avoidance_layers, RID, p_agent, uint32_t, p_layers, rid_to_rid, uint32_to_uint32);
-uint32_t GodotNavigationServer2D::agent_get_avoidance_layers(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_avoidance_layers(p_agent);
-}
-void FORWARD_2(agent_set_avoidance_mask, RID, p_agent, uint32_t, p_mask, rid_to_rid, uint32_to_uint32);
-uint32_t GodotNavigationServer2D::agent_get_avoidance_mask(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_avoidance_mask(p_agent);
-}
-void FORWARD_2(agent_set_avoidance_priority, RID, p_agent, real_t, p_priority, rid_to_rid, real_to_real);
-real_t GodotNavigationServer2D::agent_get_avoidance_priority(RID p_agent) const {
-	return NavigationServer3D::get_singleton()->agent_get_avoidance_priority(p_agent);
-}
-
-RID GodotNavigationServer2D::obstacle_create() {
-	RID obstacle = NavigationServer3D::get_singleton()->obstacle_create();
-	return obstacle;
-}
-void FORWARD_2(obstacle_set_avoidance_enabled, RID, p_obstacle, bool, p_enabled, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(obstacle_get_avoidance_enabled, RID, p_obstacle, rid_to_rid);
-void FORWARD_2(obstacle_set_map, RID, p_obstacle, RID, p_map, rid_to_rid, rid_to_rid);
-RID FORWARD_1_C(obstacle_get_map, RID, p_obstacle, rid_to_rid);
-void FORWARD_2(obstacle_set_paused, RID, p_obstacle, bool, p_paused, rid_to_rid, bool_to_bool);
-bool FORWARD_1_C(obstacle_get_paused, RID, p_obstacle, rid_to_rid);
-void FORWARD_2(obstacle_set_radius, RID, p_obstacle, real_t, p_radius, rid_to_rid, real_to_real);
-real_t GodotNavigationServer2D::obstacle_get_radius(RID p_obstacle) const {
-	return NavigationServer3D::get_singleton()->obstacle_get_radius(p_obstacle);
-}
-void FORWARD_2(obstacle_set_velocity, RID, p_obstacle, Vector2, p_velocity, rid_to_rid, v2_to_v3);
-Vector2 GodotNavigationServer2D::obstacle_get_velocity(RID p_obstacle) const {
-	return v3_to_v2(NavigationServer3D::get_singleton()->obstacle_get_velocity(p_obstacle));
-}
-void FORWARD_2(obstacle_set_position, RID, p_obstacle, Vector2, p_position, rid_to_rid, v2_to_v3);
-Vector2 GodotNavigationServer2D::obstacle_get_position(RID p_obstacle) const {
-	return v3_to_v2(NavigationServer3D::get_singleton()->obstacle_get_position(p_obstacle));
-}
-void FORWARD_2(obstacle_set_avoidance_layers, RID, p_obstacle, uint32_t, p_layers, rid_to_rid, uint32_to_uint32);
-uint32_t GodotNavigationServer2D::obstacle_get_avoidance_layers(RID p_obstacle) const {
-	return NavigationServer3D::get_singleton()->obstacle_get_avoidance_layers(p_obstacle);
-}
-
-void GodotNavigationServer2D::obstacle_set_vertices(RID p_obstacle, const Vector<Vector2> &p_vertices) {
-	NavigationServer3D::get_singleton()->obstacle_set_vertices(p_obstacle, vector_v2_to_v3(p_vertices));
-}
-Vector<Vector2> GodotNavigationServer2D::obstacle_get_vertices(RID p_obstacle) const {
-	return vector_v3_to_v2(NavigationServer3D::get_singleton()->obstacle_get_vertices(p_obstacle));
-}
-
-void GodotNavigationServer2D::query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback) {
-	ERR_FAIL_COND(p_query_parameters.is_null());
-	ERR_FAIL_COND(p_query_result.is_null());
-
-	Ref<NavigationPathQueryParameters3D> query_parameters;
-	query_parameters.instantiate();
-
-	query_parameters->set_map(p_query_parameters->get_map());
-	query_parameters->set_start_position(v2_to_v3(p_query_parameters->get_start_position()));
-	query_parameters->set_target_position(v2_to_v3(p_query_parameters->get_target_position()));
-	query_parameters->set_navigation_layers(p_query_parameters->get_navigation_layers());
-	query_parameters->set_pathfinding_algorithm(NavigationPathQueryParameters3D::PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR);
-
-	switch (p_query_parameters->get_path_postprocessing()) {
-		case NavigationPathQueryParameters2D::PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL: {
-			query_parameters->set_path_postprocessing(NavigationPathQueryParameters3D::PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL);
-		} break;
-		case NavigationPathQueryParameters2D::PathPostProcessing::PATH_POSTPROCESSING_EDGECENTERED: {
-			query_parameters->set_path_postprocessing(NavigationPathQueryParameters3D::PathPostProcessing::PATH_POSTPROCESSING_EDGECENTERED);
-		} break;
-		case NavigationPathQueryParameters2D::PathPostProcessing::PATH_POSTPROCESSING_NONE: {
-			query_parameters->set_path_postprocessing(NavigationPathQueryParameters3D::PathPostProcessing::PATH_POSTPROCESSING_NONE);
-		} break;
-		default: {
-			WARN_PRINT("No match for used PathPostProcessing - fallback to default");
-			query_parameters->set_path_postprocessing(NavigationPathQueryParameters3D::PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL);
-		} break;
-	}
-
-	query_parameters->set_metadata_flags((int64_t)p_query_parameters->get_metadata_flags());
-	query_parameters->set_simplify_path(p_query_parameters->get_simplify_path());
-	query_parameters->set_simplify_epsilon(p_query_parameters->get_simplify_epsilon());
-
-	Ref<NavigationPathQueryResult3D> query_result;
-	query_result.instantiate();
-
-	NavigationServer3D::get_singleton()->query_path(query_parameters, query_result, p_callback);
-
-	p_query_result->set_path(vector_v3_to_v2(query_result->get_path()));
-	p_query_result->set_path_types(query_result->get_path_types());
-	p_query_result->set_path_rids(query_result->get_path_rids());
-	p_query_result->set_path_owner_ids(query_result->get_path_owner_ids());
-}
-
-RID GodotNavigationServer2D::source_geometry_parser_create() {
-	RWLockWrite write_lock(geometry_parser_rwlock);
-
-	RID rid = geometry_parser_owner.make_rid();
-
-	NavMeshGeometryParser2D *parser = geometry_parser_owner.get_or_null(rid);
-	parser->self = rid;
-
-	generator_parsers.push_back(parser);
-#ifdef CLIPPER2_ENABLED
-	NavMeshGenerator2D::get_singleton()->set_generator_parsers(generator_parsers);
-#endif
-	return rid;
-}
-
-void GodotNavigationServer2D::source_geometry_parser_set_callback(RID p_parser, const Callable &p_callback) {
-	RWLockWrite write_lock(geometry_parser_rwlock);
-
-	NavMeshGeometryParser2D *parser = geometry_parser_owner.get_or_null(p_parser);
-	ERR_FAIL_NULL(parser);
-
-	parser->callback = p_callback;
-}
diff --git a/engine/modules/navigation_2d/2d/godot_navigation_server_2d.cpp b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.cpp
new file mode 100644
index 00000000..a3caf0a8
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.cpp
@@ -0,0 +1,1406 @@
+/**************************************************************************/
+/*  godot_navigation_server_2d.cpp                                        */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "godot_navigation_server_2d.h"
+
+#include "core/os/mutex.h"
+#include "scene/main/node.h"
+
+#ifdef CLIPPER2_ENABLED
+#include "nav_mesh_generator_2d.h"
+#endif // CLIPPER2_ENABLED
+
+#define COMMAND_1(F_NAME, T_0, D_0)                                     \
+	struct MERGE(F_NAME, _command_2d) : public SetCommand2D {           \
+		T_0 d_0;                                                        \
+		MERGE(F_NAME, _command_2d)                                      \
+		(T_0 p_d_0) :                                                   \
+				d_0(p_d_0) {}                                           \
+		virtual void exec(GodotNavigationServer2D *p_server) override { \
+			p_server->MERGE(_cmd_, F_NAME)(d_0);                        \
+		}                                                               \
+	};                                                                  \
+	void GodotNavigationServer2D::F_NAME(T_0 D_0) {                     \
+		auto cmd = memnew(MERGE(F_NAME, _command_2d)(                   \
+				D_0));                                                  \
+		add_command(cmd);                                               \
+	}                                                                   \
+	void GodotNavigationServer2D::MERGE(_cmd_, F_NAME)(T_0 D_0)
+
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)                           \
+	struct MERGE(F_NAME, _command_2d) : public SetCommand2D {           \
+		T_0 d_0;                                                        \
+		T_1 d_1;                                                        \
+		MERGE(F_NAME, _command_2d)                                      \
+		(                                                               \
+				T_0 p_d_0,                                              \
+				T_1 p_d_1) :                                            \
+				d_0(p_d_0),                                             \
+				d_1(p_d_1) {}                                           \
+		virtual void exec(GodotNavigationServer2D *p_server) override { \
+			p_server->MERGE(_cmd_, F_NAME)(d_0, d_1);                   \
+		}                                                               \
+	};                                                                  \
+	void GodotNavigationServer2D::F_NAME(T_0 D_0, T_1 D_1) {            \
+		auto cmd = memnew(MERGE(F_NAME, _command_2d)(                   \
+				D_0,                                                    \
+				D_1));                                                  \
+		add_command(cmd);                                               \
+	}                                                                   \
+	void GodotNavigationServer2D::MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
+
+void GodotNavigationServer2D::init() {
+#ifdef CLIPPER2_ENABLED
+	navmesh_generator_2d = memnew(NavMeshGenerator2D);
+	ERR_FAIL_NULL_MSG(navmesh_generator_2d, "Failed to init NavMeshGenerator2D.");
+	RWLockRead read_lock(geometry_parser_rwlock);
+	navmesh_generator_2d->set_generator_parsers(generator_parsers);
+#endif // CLIPPER2_ENABLED
+	// TODO
+}
+
+void GodotNavigationServer2D::sync() {
+#ifdef CLIPPER2_ENABLED
+	if (navmesh_generator_2d) {
+		navmesh_generator_2d->sync();
+	}
+#endif // CLIPPER2_ENABLED
+	// TODO
+}
+
+void GodotNavigationServer2D::finish() {
+#ifdef CLIPPER2_ENABLED
+	if (navmesh_generator_2d) {
+		navmesh_generator_2d->finish();
+		memdelete(navmesh_generator_2d);
+		navmesh_generator_2d = nullptr;
+	}
+#endif // CLIPPER2_ENABLED
+	// TODO
+}
+
+void GodotNavigationServer2D::parse_source_geometry_data(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, Node *p_root_node, const Callable &p_callback) {
+	ERR_FAIL_COND_MSG(!Thread::is_main_thread(), "The SceneTree can only be parsed on the main thread. Call this function from the main thread or use call_deferred().");
+	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation polygon.");
+	ERR_FAIL_NULL_MSG(p_root_node, "No parsing root node specified.");
+	ERR_FAIL_COND_MSG(!p_root_node->is_inside_tree(), "The root node needs to be inside the SceneTree.");
+
+#ifdef CLIPPER2_ENABLED
+	ERR_FAIL_NULL(NavMeshGenerator2D::get_singleton());
+	NavMeshGenerator2D::get_singleton()->parse_source_geometry_data(p_navigation_mesh, p_source_geometry_data, p_root_node, p_callback);
+#endif // CLIPPER2_ENABLED
+}
+
+void GodotNavigationServer2D::bake_from_source_geometry_data(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, const Callable &p_callback) {
+	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation polygon.");
+	ERR_FAIL_COND_MSG(p_source_geometry_data.is_null(), "Invalid NavigationMeshSourceGeometryData2D.");
+
+#ifdef CLIPPER2_ENABLED
+	ERR_FAIL_NULL(NavMeshGenerator2D::get_singleton());
+	NavMeshGenerator2D::get_singleton()->bake_from_source_geometry_data(p_navigation_mesh, p_source_geometry_data, p_callback);
+#endif // CLIPPER2_ENABLED
+}
+
+void GodotNavigationServer2D::bake_from_source_geometry_data_async(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, const Callable &p_callback) {
+	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation mesh.");
+	ERR_FAIL_COND_MSG(p_source_geometry_data.is_null(), "Invalid NavigationMeshSourceGeometryData2D.");
+
+#ifdef CLIPPER2_ENABLED
+	ERR_FAIL_NULL(NavMeshGenerator2D::get_singleton());
+	NavMeshGenerator2D::get_singleton()->bake_from_source_geometry_data_async(p_navigation_mesh, p_source_geometry_data, p_callback);
+#endif // CLIPPER2_ENABLED
+}
+
+bool GodotNavigationServer2D::is_baking_navigation_polygon(Ref<NavigationPolygon> p_navigation_polygon) const {
+#ifdef CLIPPER2_ENABLED
+	return NavMeshGenerator2D::get_singleton()->is_baking(p_navigation_polygon);
+#else
+	return false;
+#endif
+}
+
+Vector<Vector2> GodotNavigationServer2D::simplify_path(const Vector<Vector2> &p_path, real_t p_epsilon) {
+	if (p_path.size() <= 2) {
+		return p_path;
+	}
+
+	p_epsilon = MAX(0.0, p_epsilon);
+
+	LocalVector<Vector2> source_path;
+	{
+		source_path.resize(p_path.size());
+		const Vector2 *r = p_path.ptr();
+		for (uint32_t i = 0; i < p_path.size(); i++) {
+			source_path[i] = r[i];
+		}
+	}
+
+	LocalVector<uint32_t> simplified_path_indices = NavMeshQueries2D::get_simplified_path_indices(source_path, p_epsilon);
+
+	uint32_t index_count = simplified_path_indices.size();
+
+	Vector<Vector2> simplified_path;
+	{
+		simplified_path.resize(index_count);
+		Vector2 *w = simplified_path.ptrw();
+		const Vector2 *r = source_path.ptr();
+		for (uint32_t i = 0; i < index_count; i++) {
+			w[i] = r[simplified_path_indices[i]];
+		}
+	}
+
+	return simplified_path;
+}
+
+GodotNavigationServer2D::GodotNavigationServer2D() {}
+
+GodotNavigationServer2D::~GodotNavigationServer2D() {
+	flush_queries();
+}
+
+void GodotNavigationServer2D::add_command(SetCommand2D *p_command) {
+	MutexLock lock(commands_mutex);
+
+	commands.push_back(p_command);
+}
+
+TypedArray<RID> GodotNavigationServer2D::get_maps() const {
+	TypedArray<RID> all_map_rids;
+	List<RID> maps_owned;
+	map_owner.get_owned_list(&maps_owned);
+	if (maps_owned.size()) {
+		for (const RID &E : maps_owned) {
+			all_map_rids.push_back(E);
+		}
+	}
+	return all_map_rids;
+}
+
+TypedArray<RID> GodotNavigationServer2D::map_get_links(RID p_map) const {
+	TypedArray<RID> link_rids;
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, link_rids);
+
+	const LocalVector<NavLink2D *> &links = map->get_links();
+	link_rids.resize(links.size());
+
+	for (uint32_t i = 0; i < links.size(); i++) {
+		link_rids[i] = links[i]->get_self();
+	}
+	return link_rids;
+}
+
+TypedArray<RID> GodotNavigationServer2D::map_get_regions(RID p_map) const {
+	TypedArray<RID> regions_rids;
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, regions_rids);
+
+	const LocalVector<NavRegion2D *> &regions = map->get_regions();
+	regions_rids.resize(regions.size());
+
+	for (uint32_t i = 0; i < regions.size(); i++) {
+		regions_rids[i] = regions[i]->get_self();
+	}
+	return regions_rids;
+}
+
+TypedArray<RID> GodotNavigationServer2D::map_get_agents(RID p_map) const {
+	TypedArray<RID> agents_rids;
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, agents_rids);
+
+	const LocalVector<NavAgent2D *> &agents = map->get_agents();
+	agents_rids.resize(agents.size());
+
+	for (uint32_t i = 0; i < agents.size(); i++) {
+		agents_rids[i] = agents[i]->get_self();
+	}
+	return agents_rids;
+}
+
+TypedArray<RID> GodotNavigationServer2D::map_get_obstacles(RID p_map) const {
+	TypedArray<RID> obstacles_rids;
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, obstacles_rids);
+	const LocalVector<NavObstacle2D *> obstacles = map->get_obstacles();
+	obstacles_rids.resize(obstacles.size());
+	for (uint32_t i = 0; i < obstacles.size(); i++) {
+		obstacles_rids[i] = obstacles[i]->get_self();
+	}
+	return obstacles_rids;
+}
+
+RID GodotNavigationServer2D::region_get_map(RID p_region) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, RID());
+
+	if (region->get_map()) {
+		return region->get_map()->get_self();
+	}
+	return RID();
+}
+
+RID GodotNavigationServer2D::agent_get_map(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, RID());
+
+	if (agent->get_map()) {
+		return agent->get_map()->get_self();
+	}
+	return RID();
+}
+
+RID GodotNavigationServer2D::map_create() {
+	MutexLock lock(operations_mutex);
+
+	RID rid = map_owner.make_rid();
+	NavMap2D *map = map_owner.get_or_null(rid);
+	map->set_self(rid);
+	return rid;
+}
+
+COMMAND_2(map_set_active, RID, p_map, bool, p_active) {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL(map);
+
+	if (p_active) {
+		if (!map_is_active(p_map)) {
+			active_maps.push_back(map);
+			active_maps_iteration_id.push_back(map->get_iteration_id());
+		}
+	} else {
+		int map_index = active_maps.find(map);
+		ERR_FAIL_COND(map_index < 0);
+		active_maps.remove_at(map_index);
+		active_maps_iteration_id.remove_at(map_index);
+	}
+}
+
+bool GodotNavigationServer2D::map_is_active(RID p_map) const {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, false);
+
+	return active_maps.has(map);
+}
+
+void GodotNavigationServer2D::map_force_update(RID p_map) {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL(map);
+
+	flush_queries();
+
+	map->sync();
+}
+
+uint32_t GodotNavigationServer2D::map_get_iteration_id(RID p_map) const {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, 0);
+
+	return map->get_iteration_id();
+}
+
+COMMAND_2(map_set_use_async_iterations, RID, p_map, bool, p_enabled) {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL(map);
+	map->set_use_async_iterations(p_enabled);
+}
+
+bool GodotNavigationServer2D::map_get_use_async_iterations(RID p_map) const {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, false);
+
+	return map->get_use_async_iterations();
+}
+
+COMMAND_2(map_set_cell_size, RID, p_map, real_t, p_cell_size) {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL(map);
+
+	map->set_cell_size(p_cell_size);
+}
+
+real_t GodotNavigationServer2D::map_get_cell_size(RID p_map) const {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, 0);
+
+	return map->get_cell_size();
+}
+
+COMMAND_2(map_set_use_edge_connections, RID, p_map, bool, p_enabled) {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL(map);
+
+	map->set_use_edge_connections(p_enabled);
+}
+
+bool GodotNavigationServer2D::map_get_use_edge_connections(RID p_map) const {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, false);
+
+	return map->get_use_edge_connections();
+}
+
+COMMAND_2(map_set_edge_connection_margin, RID, p_map, real_t, p_connection_margin) {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL(map);
+
+	map->set_edge_connection_margin(p_connection_margin);
+}
+
+real_t GodotNavigationServer2D::map_get_edge_connection_margin(RID p_map) const {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, 0);
+
+	return map->get_edge_connection_margin();
+}
+
+COMMAND_2(map_set_link_connection_radius, RID, p_map, real_t, p_connection_radius) {
+	NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL(map);
+
+	map->set_link_connection_radius(p_connection_radius);
+}
+
+real_t GodotNavigationServer2D::map_get_link_connection_radius(RID p_map) const {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, 0);
+
+	return map->get_link_connection_radius();
+}
+
+Vector<Vector2> GodotNavigationServer2D::map_get_path(RID p_map, Vector2 p_origin, Vector2 p_destination, bool p_optimize, uint32_t p_navigation_layers) {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, Vector<Vector2>());
+
+	Ref<NavigationPathQueryParameters2D> query_parameters;
+	query_parameters.instantiate();
+
+	query_parameters->set_map(p_map);
+	query_parameters->set_start_position(p_origin);
+	query_parameters->set_target_position(p_destination);
+	query_parameters->set_navigation_layers(p_navigation_layers);
+	query_parameters->set_pathfinding_algorithm(NavigationPathQueryParameters2D::PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR);
+	query_parameters->set_path_postprocessing(NavigationPathQueryParameters2D::PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL);
+	if (!p_optimize) {
+		query_parameters->set_path_postprocessing(NavigationPathQueryParameters2D::PATH_POSTPROCESSING_EDGECENTERED);
+	}
+
+	Ref<NavigationPathQueryResult2D> query_result;
+	query_result.instantiate();
+
+	query_path(query_parameters, query_result);
+
+	return query_result->get_path();
+}
+
+Vector2 GodotNavigationServer2D::map_get_closest_point(RID p_map, const Vector2 &p_point) const {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, Vector2());
+
+	return map->get_closest_point(p_point);
+}
+
+RID GodotNavigationServer2D::map_get_closest_point_owner(RID p_map, const Vector2 &p_point) const {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, RID());
+
+	return map->get_closest_point_owner(p_point);
+}
+
+Vector2 GodotNavigationServer2D::map_get_random_point(RID p_map, uint32_t p_navigation_layers, bool p_uniformly) const {
+	const NavMap2D *map = map_owner.get_or_null(p_map);
+	ERR_FAIL_NULL_V(map, Vector2());
+
+	return map->get_random_point(p_navigation_layers, p_uniformly);
+}
+
+RID GodotNavigationServer2D::region_create() {
+	MutexLock lock(operations_mutex);
+
+	RID rid = region_owner.make_rid();
+	NavRegion2D *reg = region_owner.get_or_null(rid);
+	reg->set_self(rid);
+	return rid;
+}
+
+COMMAND_2(region_set_enabled, RID, p_region, bool, p_enabled) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+
+	region->set_enabled(p_enabled);
+}
+
+bool GodotNavigationServer2D::region_get_enabled(RID p_region) const {
+	const NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, false);
+
+	return region->get_enabled();
+}
+
+COMMAND_2(region_set_use_edge_connections, RID, p_region, bool, p_enabled) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+
+	region->set_use_edge_connections(p_enabled);
+}
+
+bool GodotNavigationServer2D::region_get_use_edge_connections(RID p_region) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, false);
+
+	return region->get_use_edge_connections();
+}
+
+COMMAND_2(region_set_enter_cost, RID, p_region, real_t, p_enter_cost) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+	ERR_FAIL_COND(p_enter_cost < 0.0);
+
+	region->set_enter_cost(p_enter_cost);
+}
+
+real_t GodotNavigationServer2D::region_get_enter_cost(RID p_region) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, 0);
+
+	return region->get_enter_cost();
+}
+
+COMMAND_2(region_set_travel_cost, RID, p_region, real_t, p_travel_cost) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+	ERR_FAIL_COND(p_travel_cost < 0.0);
+
+	region->set_travel_cost(p_travel_cost);
+}
+
+real_t GodotNavigationServer2D::region_get_travel_cost(RID p_region) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, 0);
+
+	return region->get_travel_cost();
+}
+
+COMMAND_2(region_set_owner_id, RID, p_region, ObjectID, p_owner_id) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+
+	region->set_owner_id(p_owner_id);
+}
+
+ObjectID GodotNavigationServer2D::region_get_owner_id(RID p_region) const {
+	const NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, ObjectID());
+
+	return region->get_owner_id();
+}
+
+bool GodotNavigationServer2D::region_owns_point(RID p_region, const Vector2 &p_point) const {
+	const NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, false);
+
+	if (region->get_map()) {
+		RID closest_point_owner = map_get_closest_point_owner(region->get_map()->get_self(), p_point);
+		return closest_point_owner == region->get_self();
+	}
+	return false;
+}
+
+COMMAND_2(region_set_map, RID, p_region, RID, p_map) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+
+	NavMap2D *map = map_owner.get_or_null(p_map);
+
+	region->set_map(map);
+}
+
+COMMAND_2(region_set_navigation_layers, RID, p_region, uint32_t, p_navigation_layers) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+
+	region->set_navigation_layers(p_navigation_layers);
+}
+
+uint32_t GodotNavigationServer2D::region_get_navigation_layers(RID p_region) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, 0);
+
+	return region->get_navigation_layers();
+}
+
+COMMAND_2(region_set_transform, RID, p_region, Transform2D, p_transform) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+
+	region->set_transform(p_transform);
+}
+
+Transform2D GodotNavigationServer2D::region_get_transform(RID p_region) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, Transform2D());
+
+	return region->get_transform();
+}
+
+void GodotNavigationServer2D::region_set_navigation_polygon(RID p_region, Ref<NavigationPolygon> p_navigation_polygon) {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL(region);
+
+	region->set_navigation_polygon(p_navigation_polygon);
+}
+
+int GodotNavigationServer2D::region_get_connections_count(RID p_region) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, 0);
+	NavMap2D *map = region->get_map();
+	if (map) {
+		return map->get_region_connections_count(region);
+	}
+	return 0;
+}
+
+Vector2 GodotNavigationServer2D::region_get_connection_pathway_start(RID p_region, int p_connection_id) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, Vector2());
+	NavMap2D *map = region->get_map();
+	if (map) {
+		return map->get_region_connection_pathway_start(region, p_connection_id);
+	}
+	return Vector2();
+}
+
+Vector2 GodotNavigationServer2D::region_get_connection_pathway_end(RID p_region, int p_connection_id) const {
+	NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, Vector2());
+	NavMap2D *map = region->get_map();
+	if (map) {
+		return map->get_region_connection_pathway_end(region, p_connection_id);
+	}
+	return Vector2();
+}
+
+Vector2 GodotNavigationServer2D::region_get_closest_point(RID p_region, const Vector2 &p_point) const {
+	const NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, Vector2());
+
+	return region->get_closest_point_info(p_point).point;
+}
+
+Vector2 GodotNavigationServer2D::region_get_random_point(RID p_region, uint32_t p_navigation_layers, bool p_uniformly) const {
+	const NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, Vector2());
+
+	return region->get_random_point(p_navigation_layers, p_uniformly);
+}
+
+Rect2 GodotNavigationServer2D::region_get_bounds(RID p_region) const {
+	const NavRegion2D *region = region_owner.get_or_null(p_region);
+	ERR_FAIL_NULL_V(region, Rect2());
+
+	return region->get_bounds();
+}
+
+RID GodotNavigationServer2D::link_create() {
+	MutexLock lock(operations_mutex);
+
+	RID rid = link_owner.make_rid();
+	NavLink2D *link = link_owner.get_or_null(rid);
+	link->set_self(rid);
+	return rid;
+}
+
+COMMAND_2(link_set_map, RID, p_link, RID, p_map) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	NavMap2D *map = map_owner.get_or_null(p_map);
+
+	link->set_map(map);
+}
+
+RID GodotNavigationServer2D::link_get_map(const RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, RID());
+
+	if (link->get_map()) {
+		return link->get_map()->get_self();
+	}
+	return RID();
+}
+
+COMMAND_2(link_set_enabled, RID, p_link, bool, p_enabled) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_enabled(p_enabled);
+}
+
+bool GodotNavigationServer2D::link_get_enabled(RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, false);
+
+	return link->get_enabled();
+}
+
+COMMAND_2(link_set_bidirectional, RID, p_link, bool, p_bidirectional) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_bidirectional(p_bidirectional);
+}
+
+bool GodotNavigationServer2D::link_is_bidirectional(RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, false);
+
+	return link->is_bidirectional();
+}
+
+COMMAND_2(link_set_navigation_layers, RID, p_link, uint32_t, p_navigation_layers) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_navigation_layers(p_navigation_layers);
+}
+
+uint32_t GodotNavigationServer2D::link_get_navigation_layers(const RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, 0);
+
+	return link->get_navigation_layers();
+}
+
+COMMAND_2(link_set_start_position, RID, p_link, Vector2, p_position) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_start_position(p_position);
+}
+
+Vector2 GodotNavigationServer2D::link_get_start_position(RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, Vector2());
+
+	return link->get_start_position();
+}
+
+COMMAND_2(link_set_end_position, RID, p_link, Vector2, p_position) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_end_position(p_position);
+}
+
+Vector2 GodotNavigationServer2D::link_get_end_position(RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, Vector2());
+
+	return link->get_end_position();
+}
+
+COMMAND_2(link_set_enter_cost, RID, p_link, real_t, p_enter_cost) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_enter_cost(p_enter_cost);
+}
+
+real_t GodotNavigationServer2D::link_get_enter_cost(const RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, 0);
+
+	return link->get_enter_cost();
+}
+
+COMMAND_2(link_set_travel_cost, RID, p_link, real_t, p_travel_cost) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_travel_cost(p_travel_cost);
+}
+
+real_t GodotNavigationServer2D::link_get_travel_cost(const RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, 0);
+
+	return link->get_travel_cost();
+}
+
+COMMAND_2(link_set_owner_id, RID, p_link, ObjectID, p_owner_id) {
+	NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL(link);
+
+	link->set_owner_id(p_owner_id);
+}
+
+ObjectID GodotNavigationServer2D::link_get_owner_id(RID p_link) const {
+	const NavLink2D *link = link_owner.get_or_null(p_link);
+	ERR_FAIL_NULL_V(link, ObjectID());
+
+	return link->get_owner_id();
+}
+
+RID GodotNavigationServer2D::agent_create() {
+	MutexLock lock(operations_mutex);
+
+	RID rid = agent_owner.make_rid();
+	NavAgent2D *agent = agent_owner.get_or_null(rid);
+	agent->set_self(rid);
+	return rid;
+}
+
+COMMAND_2(agent_set_avoidance_enabled, RID, p_agent, bool, p_enabled) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_avoidance_enabled(p_enabled);
+}
+
+bool GodotNavigationServer2D::agent_get_avoidance_enabled(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, false);
+
+	return agent->is_avoidance_enabled();
+}
+
+COMMAND_2(agent_set_map, RID, p_agent, RID, p_map) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	NavMap2D *map = map_owner.get_or_null(p_map);
+
+	agent->set_map(map);
+}
+
+COMMAND_2(agent_set_neighbor_distance, RID, p_agent, real_t, p_distance) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_neighbor_distance(p_distance);
+}
+
+real_t GodotNavigationServer2D::agent_get_neighbor_distance(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_neighbor_distance();
+}
+
+COMMAND_2(agent_set_max_neighbors, RID, p_agent, int, p_count) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_max_neighbors(p_count);
+}
+
+int GodotNavigationServer2D::agent_get_max_neighbors(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_max_neighbors();
+}
+
+COMMAND_2(agent_set_time_horizon_agents, RID, p_agent, real_t, p_time_horizon) {
+	ERR_FAIL_COND_MSG(p_time_horizon < 0.0, "Time horizon must be positive.");
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_time_horizon_agents(p_time_horizon);
+}
+
+real_t GodotNavigationServer2D::agent_get_time_horizon_agents(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_time_horizon_agents();
+}
+
+COMMAND_2(agent_set_time_horizon_obstacles, RID, p_agent, real_t, p_time_horizon) {
+	ERR_FAIL_COND_MSG(p_time_horizon < 0.0, "Time horizon must be positive.");
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_time_horizon_obstacles(p_time_horizon);
+}
+
+real_t GodotNavigationServer2D::agent_get_time_horizon_obstacles(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_time_horizon_obstacles();
+}
+
+COMMAND_2(agent_set_radius, RID, p_agent, real_t, p_radius) {
+	ERR_FAIL_COND_MSG(p_radius < 0.0, "Radius must be positive.");
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_radius(p_radius);
+}
+
+real_t GodotNavigationServer2D::agent_get_radius(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_radius();
+}
+
+COMMAND_2(agent_set_max_speed, RID, p_agent, real_t, p_max_speed) {
+	ERR_FAIL_COND_MSG(p_max_speed < 0.0, "Max speed must be positive.");
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_max_speed(p_max_speed);
+}
+
+real_t GodotNavigationServer2D::agent_get_max_speed(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_max_speed();
+}
+
+COMMAND_2(agent_set_velocity_forced, RID, p_agent, Vector2, p_velocity) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_velocity_forced(p_velocity);
+}
+
+COMMAND_2(agent_set_velocity, RID, p_agent, Vector2, p_velocity) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_velocity(p_velocity);
+}
+
+Vector2 GodotNavigationServer2D::agent_get_velocity(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, Vector2());
+
+	return agent->get_velocity();
+}
+
+COMMAND_2(agent_set_position, RID, p_agent, Vector2, p_position) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_position(p_position);
+}
+
+Vector2 GodotNavigationServer2D::agent_get_position(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, Vector2());
+
+	return agent->get_position();
+}
+
+bool GodotNavigationServer2D::agent_is_map_changed(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, false);
+
+	return agent->is_map_changed();
+}
+
+COMMAND_2(agent_set_avoidance_callback, RID, p_agent, Callable, p_callback) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_avoidance_callback(p_callback);
+
+	if (agent->get_map()) {
+		if (p_callback.is_valid()) {
+			agent->get_map()->set_agent_as_controlled(agent);
+		} else {
+			agent->get_map()->remove_agent_as_controlled(agent);
+		}
+	}
+}
+
+bool GodotNavigationServer2D::agent_has_avoidance_callback(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, false);
+
+	return agent->has_avoidance_callback();
+}
+
+COMMAND_2(agent_set_avoidance_layers, RID, p_agent, uint32_t, p_layers) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+	agent->set_avoidance_layers(p_layers);
+}
+
+uint32_t GodotNavigationServer2D::agent_get_avoidance_layers(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_avoidance_layers();
+}
+
+COMMAND_2(agent_set_avoidance_mask, RID, p_agent, uint32_t, p_mask) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+	agent->set_avoidance_mask(p_mask);
+}
+
+uint32_t GodotNavigationServer2D::agent_get_avoidance_mask(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_avoidance_mask();
+}
+
+COMMAND_2(agent_set_avoidance_priority, RID, p_agent, real_t, p_priority) {
+	ERR_FAIL_COND_MSG(p_priority < 0.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
+	ERR_FAIL_COND_MSG(p_priority > 1.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+	agent->set_avoidance_priority(p_priority);
+}
+
+real_t GodotNavigationServer2D::agent_get_avoidance_priority(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, 0);
+
+	return agent->get_avoidance_priority();
+}
+
+COMMAND_2(agent_set_paused, RID, p_agent, bool, p_paused) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL(agent);
+
+	agent->set_paused(p_paused);
+}
+
+bool GodotNavigationServer2D::agent_get_paused(RID p_agent) const {
+	NavAgent2D *agent = agent_owner.get_or_null(p_agent);
+	ERR_FAIL_NULL_V(agent, false);
+
+	return agent->get_paused();
+}
+
+RID GodotNavigationServer2D::obstacle_create() {
+	MutexLock lock(operations_mutex);
+
+	RID rid = obstacle_owner.make_rid();
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(rid);
+	obstacle->set_self(rid);
+
+	RID agent_rid = agent_owner.make_rid();
+	NavAgent2D *agent = agent_owner.get_or_null(agent_rid);
+	agent->set_self(agent_rid);
+
+	obstacle->set_agent(agent);
+
+	return rid;
+}
+
+COMMAND_2(obstacle_set_avoidance_enabled, RID, p_obstacle, bool, p_enabled) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+
+	obstacle->set_avoidance_enabled(p_enabled);
+}
+
+bool GodotNavigationServer2D::obstacle_get_avoidance_enabled(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, false);
+
+	return obstacle->is_avoidance_enabled();
+}
+
+COMMAND_2(obstacle_set_map, RID, p_obstacle, RID, p_map) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+
+	NavMap2D *map = map_owner.get_or_null(p_map);
+
+	obstacle->set_map(map);
+}
+
+RID GodotNavigationServer2D::obstacle_get_map(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, RID());
+	if (obstacle->get_map()) {
+		return obstacle->get_map()->get_self();
+	}
+	return RID();
+}
+
+COMMAND_2(obstacle_set_paused, RID, p_obstacle, bool, p_paused) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+
+	obstacle->set_paused(p_paused);
+}
+
+bool GodotNavigationServer2D::obstacle_get_paused(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, false);
+
+	return obstacle->get_paused();
+}
+
+COMMAND_2(obstacle_set_radius, RID, p_obstacle, real_t, p_radius) {
+	ERR_FAIL_COND_MSG(p_radius < 0.0, "Radius must be positive.");
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+
+	obstacle->set_radius(p_radius);
+}
+
+real_t GodotNavigationServer2D::obstacle_get_radius(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, 0);
+
+	return obstacle->get_radius();
+}
+
+COMMAND_2(obstacle_set_velocity, RID, p_obstacle, Vector2, p_velocity) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+
+	obstacle->set_velocity(p_velocity);
+}
+
+Vector2 GodotNavigationServer2D::obstacle_get_velocity(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, Vector2());
+
+	return obstacle->get_velocity();
+}
+
+COMMAND_2(obstacle_set_position, RID, p_obstacle, Vector2, p_position) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+	obstacle->set_position(p_position);
+}
+
+Vector2 GodotNavigationServer2D::obstacle_get_position(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, Vector2());
+
+	return obstacle->get_position();
+}
+
+COMMAND_2(obstacle_set_avoidance_layers, RID, p_obstacle, uint32_t, p_layers) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+	obstacle->set_avoidance_layers(p_layers);
+}
+
+uint32_t GodotNavigationServer2D::obstacle_get_avoidance_layers(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, 0);
+
+	return obstacle->get_avoidance_layers();
+}
+
+void GodotNavigationServer2D::obstacle_set_vertices(RID p_obstacle, const Vector<Vector2> &p_vertices) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL(obstacle);
+	obstacle->set_vertices(p_vertices);
+}
+
+Vector<Vector2> GodotNavigationServer2D::obstacle_get_vertices(RID p_obstacle) const {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	ERR_FAIL_NULL_V(obstacle, Vector<Vector2>());
+
+	return obstacle->get_vertices();
+}
+
+void GodotNavigationServer2D::flush_queries() {
+	MutexLock lock(commands_mutex);
+	MutexLock lock2(operations_mutex);
+
+	for (SetCommand2D *command : commands) {
+		command->exec(this);
+		memdelete(command);
+	}
+	commands.clear();
+}
+
+COMMAND_1(free, RID, p_object) {
+	if (geometry_parser_owner.owns(p_object)) {
+		RWLockWrite write_lock(geometry_parser_rwlock);
+
+		NavMeshGeometryParser2D *parser = geometry_parser_owner.get_or_null(p_object);
+		ERR_FAIL_NULL(parser);
+
+		generator_parsers.erase(parser);
+#ifndef CLIPPER2_ENABLED
+		NavMeshGenerator2D::get_singleton()->set_generator_parsers(generator_parsers);
+#endif
+		geometry_parser_owner.free(parser->self);
+		return;
+	}
+	if (map_owner.owns(p_object)) {
+		NavMap2D *map = map_owner.get_or_null(p_object);
+
+		// Removes any assigned region.
+		for (NavRegion2D *region : map->get_regions()) {
+			map->remove_region(region);
+			region->set_map(nullptr);
+		}
+
+		// Removes any assigned links.
+		for (NavLink2D *link : map->get_links()) {
+			map->remove_link(link);
+			link->set_map(nullptr);
+		}
+
+		// Remove any assigned agent.
+		for (NavAgent2D *agent : map->get_agents()) {
+			map->remove_agent(agent);
+			agent->set_map(nullptr);
+		}
+
+		// Remove any assigned obstacles.
+		for (NavObstacle2D *obstacle : map->get_obstacles()) {
+			map->remove_obstacle(obstacle);
+			obstacle->set_map(nullptr);
+		}
+
+		int map_index = active_maps.find(map);
+		if (map_index >= 0) {
+			active_maps.remove_at(map_index);
+			active_maps_iteration_id.remove_at(map_index);
+		}
+		map_owner.free(p_object);
+
+	} else if (region_owner.owns(p_object)) {
+		NavRegion2D *region = region_owner.get_or_null(p_object);
+
+		// Removes this region from the map if assigned.
+		if (region->get_map() != nullptr) {
+			region->get_map()->remove_region(region);
+			region->set_map(nullptr);
+		}
+
+		region_owner.free(p_object);
+
+	} else if (link_owner.owns(p_object)) {
+		NavLink2D *link = link_owner.get_or_null(p_object);
+
+		// Removes this link from the map if assigned.
+		if (link->get_map() != nullptr) {
+			link->get_map()->remove_link(link);
+			link->set_map(nullptr);
+		}
+
+		link_owner.free(p_object);
+
+	} else if (agent_owner.owns(p_object)) {
+		internal_free_agent(p_object);
+
+	} else if (obstacle_owner.owns(p_object)) {
+		internal_free_obstacle(p_object);
+
+	} else {
+		ERR_PRINT("Attempted to free a NavigationServer RID that did not exist (or was already freed).");
+	}
+}
+
+void GodotNavigationServer2D::internal_free_agent(RID p_object) {
+	NavAgent2D *agent = agent_owner.get_or_null(p_object);
+	if (agent) {
+		if (agent->get_map() != nullptr) {
+			agent->get_map()->remove_agent(agent);
+			agent->set_map(nullptr);
+		}
+		agent_owner.free(p_object);
+	}
+}
+
+void GodotNavigationServer2D::internal_free_obstacle(RID p_object) {
+	NavObstacle2D *obstacle = obstacle_owner.get_or_null(p_object);
+	if (obstacle) {
+		NavAgent2D *obstacle_agent = obstacle->get_agent();
+		if (obstacle_agent) {
+			RID _agent_rid = obstacle_agent->get_self();
+			internal_free_agent(_agent_rid);
+			obstacle->set_agent(nullptr);
+		}
+		if (obstacle->get_map() != nullptr) {
+			obstacle->get_map()->remove_obstacle(obstacle);
+			obstacle->set_map(nullptr);
+		}
+		obstacle_owner.free(p_object);
+	}
+}
+
+void GodotNavigationServer2D::process(double p_delta_time) {
+	// Called for each main loop iteration AFTER node and user script process() and BEFORE RenderingServer sync.
+	// Will run reliably every rendered frame independent of the physics tick rate.
+	// Use for things that (only) need to update once per main loop iteration and rendered frame or is visible to the user.
+	// E.g. (final) sync of objects for this main loop iteration, updating rendered debug visuals, updating debug statistics, ...
+}
+
+void GodotNavigationServer2D::physics_process(double p_delta_time) {
+	// Called for each physics process step AFTER node and user script physics_process() and BEFORE PhysicsServer sync.
+	// Will NOT run reliably every rendered frame. If there is no physics step this function will not run.
+	// Use for physics or step depending calculations and updates where the result affects the next step calculation.
+	// E.g. anything physics sync related, avoidance simulations, physics space state queries, ...
+	// If physics process needs to play catchup this function will be called multiple times per frame so it should not hold
+	// costly updates that are not important outside the stepped calculations to avoid causing a physics performance death spiral.
+
+	flush_queries();
+
+	if (!active) {
+		return;
+	}
+
+	int _new_pm_region_count = 0;
+	int _new_pm_agent_count = 0;
+	int _new_pm_link_count = 0;
+	int _new_pm_polygon_count = 0;
+	int _new_pm_edge_count = 0;
+	int _new_pm_edge_merge_count = 0;
+	int _new_pm_edge_connection_count = 0;
+	int _new_pm_edge_free_count = 0;
+	int _new_pm_obstacle_count = 0;
+
+	// In c++ we can't be sure that this is performed in the main thread
+	// even with mutable functions.
+	MutexLock lock(operations_mutex);
+	for (uint32_t i(0); i < active_maps.size(); i++) {
+		active_maps[i]->sync();
+		active_maps[i]->step(p_delta_time);
+		active_maps[i]->dispatch_callbacks();
+
+		_new_pm_region_count += active_maps[i]->get_pm_region_count();
+		_new_pm_agent_count += active_maps[i]->get_pm_agent_count();
+		_new_pm_link_count += active_maps[i]->get_pm_link_count();
+		_new_pm_polygon_count += active_maps[i]->get_pm_polygon_count();
+		_new_pm_edge_count += active_maps[i]->get_pm_edge_count();
+		_new_pm_edge_merge_count += active_maps[i]->get_pm_edge_merge_count();
+		_new_pm_edge_connection_count += active_maps[i]->get_pm_edge_connection_count();
+		_new_pm_edge_free_count += active_maps[i]->get_pm_edge_free_count();
+		_new_pm_obstacle_count += active_maps[i]->get_pm_obstacle_count();
+
+		// Emit a signal if a map changed.
+		const uint32_t new_map_iteration_id = active_maps[i]->get_iteration_id();
+		if (new_map_iteration_id != active_maps_iteration_id[i]) {
+			emit_signal(SNAME("map_changed"), active_maps[i]->get_self());
+			active_maps_iteration_id[i] = new_map_iteration_id;
+		}
+	}
+
+	pm_region_count = _new_pm_region_count;
+	pm_agent_count = _new_pm_agent_count;
+	pm_link_count = _new_pm_link_count;
+	pm_polygon_count = _new_pm_polygon_count;
+	pm_edge_count = _new_pm_edge_count;
+	pm_edge_merge_count = _new_pm_edge_merge_count;
+	pm_edge_connection_count = _new_pm_edge_connection_count;
+	pm_edge_free_count = _new_pm_edge_free_count;
+	pm_obstacle_count = _new_pm_obstacle_count;
+}
+
+void GodotNavigationServer2D::set_active(bool p_active) {
+	MutexLock lock(operations_mutex);
+
+	active = p_active;
+}
+
+void GodotNavigationServer2D::query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback) {
+	ERR_FAIL_COND(p_query_parameters.is_null());
+	ERR_FAIL_COND(p_query_result.is_null());
+
+	NavMap2D *map = map_owner.get_or_null(p_query_parameters->get_map());
+	ERR_FAIL_NULL(map);
+
+	NavMeshQueries2D::map_query_path(map, p_query_parameters, p_query_result, p_callback);
+}
+
+RID GodotNavigationServer2D::source_geometry_parser_create() {
+	RWLockWrite write_lock(geometry_parser_rwlock);
+
+	RID rid = geometry_parser_owner.make_rid();
+
+	NavMeshGeometryParser2D *parser = geometry_parser_owner.get_or_null(rid);
+	parser->self = rid;
+
+	generator_parsers.push_back(parser);
+#ifdef CLIPPER2_ENABLED
+	NavMeshGenerator2D::get_singleton()->set_generator_parsers(generator_parsers);
+#endif
+	return rid;
+}
+
+void GodotNavigationServer2D::source_geometry_parser_set_callback(RID p_parser, const Callable &p_callback) {
+	RWLockWrite write_lock(geometry_parser_rwlock);
+
+	NavMeshGeometryParser2D *parser = geometry_parser_owner.get_or_null(p_parser);
+	ERR_FAIL_NULL(parser);
+
+	parser->callback = p_callback;
+}
+
+int GodotNavigationServer2D::get_process_info(ProcessInfo p_info) const {
+	switch (p_info) {
+		case INFO_ACTIVE_MAPS: {
+			return active_maps.size();
+		} break;
+		case INFO_REGION_COUNT: {
+			return pm_region_count;
+		} break;
+		case INFO_AGENT_COUNT: {
+			return pm_agent_count;
+		} break;
+		case INFO_LINK_COUNT: {
+			return pm_link_count;
+		} break;
+		case INFO_POLYGON_COUNT: {
+			return pm_polygon_count;
+		} break;
+		case INFO_EDGE_COUNT: {
+			return pm_edge_count;
+		} break;
+		case INFO_EDGE_MERGE_COUNT: {
+			return pm_edge_merge_count;
+		} break;
+		case INFO_EDGE_CONNECTION_COUNT: {
+			return pm_edge_connection_count;
+		} break;
+		case INFO_EDGE_FREE_COUNT: {
+			return pm_edge_free_count;
+		} break;
+		case INFO_OBSTACLE_COUNT: {
+			return pm_obstacle_count;
+		} break;
+	}
+
+	return 0;
+}
+
+#undef COMMAND_1
+#undef COMMAND_2
diff --git a/engine/modules/navigation/2d/godot_navigation_server_2d.h b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.h
similarity index 65%
rename from engine/modules/navigation/2d/godot_navigation_server_2d.h
rename to engine/modules/navigation_2d/2d/godot_navigation_server_2d.h
index 361b812b..8398d3cd 100644
--- a/engine/modules/navigation/2d/godot_navigation_server_2d.h
+++ b/engine/modules/navigation_2d/2d/godot_navigation_server_2d.h
@@ -28,78 +28,147 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_NAVIGATION_SERVER_2D_H
-#define GODOT_NAVIGATION_SERVER_2D_H
+#pragma once
 
-#include "../nav_agent.h"
-#include "../nav_link.h"
-#include "../nav_map.h"
-#include "../nav_obstacle.h"
-#include "../nav_region.h"
+#include "../nav_agent_2d.h"
+#include "../nav_link_2d.h"
+#include "../nav_map_2d.h"
+#include "../nav_obstacle_2d.h"
+#include "../nav_region_2d.h"
 
+#include "core/templates/local_vector.h"
+#include "core/templates/rid.h"
+#include "core/templates/rid_owner.h"
+#include "servers/navigation/navigation_path_query_parameters_2d.h"
+#include "servers/navigation/navigation_path_query_result_2d.h"
 #include "servers/navigation_server_2d.h"
 
+/// The commands are functions executed during the `sync` phase.
+
+#define MERGE_INTERNAL(A, B) A##B
+#define MERGE(A, B) MERGE_INTERNAL(A, B)
+
+#define COMMAND_1(F_NAME, T_0, D_0)        \
+	virtual void F_NAME(T_0 D_0) override; \
+	void MERGE(_cmd_, F_NAME)(T_0 D_0)
+
+#define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)       \
+	virtual void F_NAME(T_0 D_0, T_1 D_1) override; \
+	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
+
+class GodotNavigationServer2D;
 #ifdef CLIPPER2_ENABLED
 class NavMeshGenerator2D;
 #endif // CLIPPER2_ENABLED
 
+struct SetCommand2D {
+	virtual ~SetCommand2D() {}
+	virtual void exec(GodotNavigationServer2D *p_server) = 0;
+};
+
 // This server exposes the `NavigationServer3D` features in the 2D world.
 class GodotNavigationServer2D : public NavigationServer2D {
 	GDCLASS(GodotNavigationServer2D, NavigationServer2D);
 
+	Mutex commands_mutex;
+	/// Mutex used to make any operation threadsafe.
+	Mutex operations_mutex;
+
+	LocalVector<SetCommand2D *> commands;
+
+	mutable RID_Owner<NavLink2D> link_owner;
+	mutable RID_Owner<NavMap2D> map_owner;
+	mutable RID_Owner<NavRegion2D> region_owner;
+	mutable RID_Owner<NavAgent2D> agent_owner;
+	mutable RID_Owner<NavObstacle2D> obstacle_owner;
+
+	bool active = true;
+	LocalVector<NavMap2D *> active_maps;
+	LocalVector<uint32_t> active_maps_iteration_id;
+
 #ifdef CLIPPER2_ENABLED
 	NavMeshGenerator2D *navmesh_generator_2d = nullptr;
 #endif // CLIPPER2_ENABLED
 
+	// Performance Monitor.
+	int pm_region_count = 0;
+	int pm_agent_count = 0;
+	int pm_link_count = 0;
+	int pm_polygon_count = 0;
+	int pm_edge_count = 0;
+	int pm_edge_merge_count = 0;
+	int pm_edge_connection_count = 0;
+	int pm_edge_free_count = 0;
+	int pm_obstacle_count = 0;
+
 public:
 	GodotNavigationServer2D();
 	virtual ~GodotNavigationServer2D();
 
+	void add_command(SetCommand2D *p_command);
+
 	virtual TypedArray<RID> get_maps() const override;
 
 	virtual RID map_create() override;
-	virtual void map_set_active(RID p_map, bool p_active) override;
+	COMMAND_2(map_set_active, RID, p_map, bool, p_active);
 	virtual bool map_is_active(RID p_map) const override;
-	virtual void map_set_cell_size(RID p_map, real_t p_cell_size) override;
+
+	COMMAND_2(map_set_cell_size, RID, p_map, real_t, p_cell_size);
 	virtual real_t map_get_cell_size(RID p_map) const override;
-	virtual void map_set_use_edge_connections(RID p_map, bool p_enabled) override;
+
+	COMMAND_2(map_set_use_edge_connections, RID, p_map, bool, p_enabled);
 	virtual bool map_get_use_edge_connections(RID p_map) const override;
-	virtual void map_set_edge_connection_margin(RID p_map, real_t p_connection_margin) override;
+
+	COMMAND_2(map_set_edge_connection_margin, RID, p_map, real_t, p_connection_margin);
 	virtual real_t map_get_edge_connection_margin(RID p_map) const override;
-	virtual void map_set_link_connection_radius(RID p_map, real_t p_connection_radius) override;
+
+	COMMAND_2(map_set_link_connection_radius, RID, p_map, real_t, p_connection_radius);
 	virtual real_t map_get_link_connection_radius(RID p_map) const override;
+
 	virtual Vector<Vector2> map_get_path(RID p_map, Vector2 p_origin, Vector2 p_destination, bool p_optimize, uint32_t p_navigation_layers = 1) override;
+
 	virtual Vector2 map_get_closest_point(RID p_map, const Vector2 &p_point) const override;
+
 	virtual RID map_get_closest_point_owner(RID p_map, const Vector2 &p_point) const override;
+
 	virtual TypedArray<RID> map_get_links(RID p_map) const override;
 	virtual TypedArray<RID> map_get_regions(RID p_map) const override;
 	virtual TypedArray<RID> map_get_agents(RID p_map) const override;
 	virtual TypedArray<RID> map_get_obstacles(RID p_map) const override;
+
 	virtual void map_force_update(RID p_map) override;
-	virtual Vector2 map_get_random_point(RID p_map, uint32_t p_navigation_layers, bool p_uniformly) const override;
 	virtual uint32_t map_get_iteration_id(RID p_map) const override;
-	virtual void map_set_use_async_iterations(RID p_map, bool p_enabled) override;
+
+	COMMAND_2(map_set_use_async_iterations, RID, p_map, bool, p_enabled);
 	virtual bool map_get_use_async_iterations(RID p_map) const override;
 
+	virtual Vector2 map_get_random_point(RID p_map, uint32_t p_navigation_layers, bool p_uniformly) const override;
+
 	virtual RID region_create() override;
-	virtual void region_set_enabled(RID p_region, bool p_enabled) override;
+
+	COMMAND_2(region_set_enabled, RID, p_region, bool, p_enabled);
 	virtual bool region_get_enabled(RID p_region) const override;
-	virtual void region_set_use_edge_connections(RID p_region, bool p_enabled) override;
+
+	COMMAND_2(region_set_use_edge_connections, RID, p_region, bool, p_enabled);
 	virtual bool region_get_use_edge_connections(RID p_region) const override;
-	virtual void region_set_enter_cost(RID p_region, real_t p_enter_cost) override;
+
+	COMMAND_2(region_set_enter_cost, RID, p_region, real_t, p_enter_cost);
 	virtual real_t region_get_enter_cost(RID p_region) const override;
-	virtual void region_set_travel_cost(RID p_region, real_t p_travel_cost) override;
+	COMMAND_2(region_set_travel_cost, RID, p_region, real_t, p_travel_cost);
 	virtual real_t region_get_travel_cost(RID p_region) const override;
-	virtual void region_set_owner_id(RID p_region, ObjectID p_owner_id) override;
+
+	COMMAND_2(region_set_owner_id, RID, p_region, ObjectID, p_owner_id);
 	virtual ObjectID region_get_owner_id(RID p_region) const override;
+
 	virtual bool region_owns_point(RID p_region, const Vector2 &p_point) const override;
-	virtual void region_set_map(RID p_region, RID p_map) override;
+
+	COMMAND_2(region_set_map, RID, p_region, RID, p_map);
 	virtual RID region_get_map(RID p_region) const override;
-	virtual void region_set_navigation_layers(RID p_region, uint32_t p_navigation_layers) override;
+	COMMAND_2(region_set_navigation_layers, RID, p_region, uint32_t, p_navigation_layers);
 	virtual uint32_t region_get_navigation_layers(RID p_region) const override;
-	virtual void region_set_transform(RID p_region, Transform2D p_transform) override;
+	COMMAND_2(region_set_transform, RID, p_region, Transform2D, p_transform);
 	virtual Transform2D region_get_transform(RID p_region) const override;
-	virtual void region_set_navigation_polygon(RID p_region, Ref<NavigationPolygon> p_navigation_polygon) override;
+	COMMAND_2(region_set_navigation_polygon, RID, p_region, Ref<NavigationPolygon>, p_navigation_polygon);
 	virtual int region_get_connections_count(RID p_region) const override;
 	virtual Vector2 region_get_connection_pathway_start(RID p_region, int p_connection_id) const override;
 	virtual Vector2 region_get_connection_pathway_end(RID p_region, int p_connection_id) const override;
@@ -110,51 +179,50 @@ public:
 	virtual RID link_create() override;
 
 	/// Set the map of this link.
-	virtual void link_set_map(RID p_link, RID p_map) override;
+	COMMAND_2(link_set_map, RID, p_link, RID, p_map);
 	virtual RID link_get_map(RID p_link) const override;
-
-	virtual void link_set_enabled(RID p_link, bool p_enabled) override;
+	COMMAND_2(link_set_enabled, RID, p_link, bool, p_enabled);
 	virtual bool link_get_enabled(RID p_link) const override;
 
 	/// Set whether this link travels in both directions.
-	virtual void link_set_bidirectional(RID p_link, bool p_bidirectional) override;
+	COMMAND_2(link_set_bidirectional, RID, p_link, bool, p_bidirectional);
 	virtual bool link_is_bidirectional(RID p_link) const override;
 
 	/// Set the link's layers.
-	virtual void link_set_navigation_layers(RID p_link, uint32_t p_navigation_layers) override;
+	COMMAND_2(link_set_navigation_layers, RID, p_link, uint32_t, p_navigation_layers);
 	virtual uint32_t link_get_navigation_layers(RID p_link) const override;
 
 	/// Set the start position of the link.
-	virtual void link_set_start_position(RID p_link, Vector2 p_position) override;
+	COMMAND_2(link_set_start_position, RID, p_link, Vector2, p_position);
 	virtual Vector2 link_get_start_position(RID p_link) const override;
 
 	/// Set the end position of the link.
-	virtual void link_set_end_position(RID p_link, Vector2 p_position) override;
+	COMMAND_2(link_set_end_position, RID, p_link, Vector2, p_position);
 	virtual Vector2 link_get_end_position(RID p_link) const override;
 
 	/// Set the enter cost of the link.
-	virtual void link_set_enter_cost(RID p_link, real_t p_enter_cost) override;
+	COMMAND_2(link_set_enter_cost, RID, p_link, real_t, p_enter_cost);
 	virtual real_t link_get_enter_cost(RID p_link) const override;
 
 	/// Set the travel cost of the link.
-	virtual void link_set_travel_cost(RID p_link, real_t p_travel_cost) override;
+	COMMAND_2(link_set_travel_cost, RID, p_link, real_t, p_travel_cost);
 	virtual real_t link_get_travel_cost(RID p_link) const override;
 
 	/// Set the node which manages this link.
-	virtual void link_set_owner_id(RID p_link, ObjectID p_owner_id) override;
+	COMMAND_2(link_set_owner_id, RID, p_link, ObjectID, p_owner_id);
 	virtual ObjectID link_get_owner_id(RID p_link) const override;
 
 	/// Creates the agent.
 	virtual RID agent_create() override;
 
 	/// Put the agent in the map.
-	virtual void agent_set_map(RID p_agent, RID p_map) override;
+	COMMAND_2(agent_set_map, RID, p_agent, RID, p_map);
 	virtual RID agent_get_map(RID p_agent) const override;
 
-	virtual void agent_set_paused(RID p_agent, bool p_paused) override;
+	COMMAND_2(agent_set_paused, RID, p_agent, bool, p_paused);
 	virtual bool agent_get_paused(RID p_agent) const override;
 
-	virtual void agent_set_avoidance_enabled(RID p_agent, bool p_enabled) override;
+	COMMAND_2(agent_set_avoidance_enabled, RID, p_agent, bool, p_enabled);
 	virtual bool agent_get_avoidance_enabled(RID p_agent) const override;
 
 	/// The maximum distance (center point to
@@ -164,7 +232,7 @@ public:
 	/// time of the simulation. If the number is too
 	/// low, the simulation will not be safe.
 	/// Must be non-negative.
-	virtual void agent_set_neighbor_distance(RID p_agent, real_t p_distance) override;
+	COMMAND_2(agent_set_neighbor_distance, RID, p_agent, real_t, p_distance);
 	virtual real_t agent_get_neighbor_distance(RID p_agent) const override;
 
 	/// The maximum number of other agents this
@@ -173,7 +241,7 @@ public:
 	/// running time of the simulation. If the
 	/// number is too low, the simulation will not
 	/// be safe.
-	virtual void agent_set_max_neighbors(RID p_agent, int p_count) override;
+	COMMAND_2(agent_set_max_neighbors, RID, p_agent, int, p_count);
 	virtual int agent_get_max_neighbors(RID p_agent) const override;
 
 	/// The minimal amount of time for which this
@@ -184,73 +252,82 @@ public:
 	/// other agents, but the less freedom this
 	/// agent has in choosing its velocities.
 	/// Must be positive.
-	virtual void agent_set_time_horizon_agents(RID p_agent, real_t p_time_horizon) override;
+	COMMAND_2(agent_set_time_horizon_agents, RID, p_agent, real_t, p_time_horizon);
 	virtual real_t agent_get_time_horizon_agents(RID p_agent) const override;
-	virtual void agent_set_time_horizon_obstacles(RID p_agent, real_t p_time_horizon) override;
+	COMMAND_2(agent_set_time_horizon_obstacles, RID, p_agent, real_t, p_time_horizon);
 	virtual real_t agent_get_time_horizon_obstacles(RID p_agent) const override;
 
 	/// The radius of this agent.
 	/// Must be non-negative.
-	virtual void agent_set_radius(RID p_agent, real_t p_radius) override;
+	COMMAND_2(agent_set_radius, RID, p_agent, real_t, p_radius);
 	virtual real_t agent_get_radius(RID p_agent) const override;
 
 	/// The maximum speed of this agent.
 	/// Must be non-negative.
-	virtual void agent_set_max_speed(RID p_agent, real_t p_max_speed) override;
+	COMMAND_2(agent_set_max_speed, RID, p_agent, real_t, p_max_speed);
 	virtual real_t agent_get_max_speed(RID p_agent) const override;
 
 	/// forces and agent velocity change in the avoidance simulation, adds simulation instability if done recklessly
-	virtual void agent_set_velocity_forced(RID p_agent, Vector2 p_velocity) override;
+	COMMAND_2(agent_set_velocity_forced, RID, p_agent, Vector2, p_velocity);
 
 	/// The wanted velocity for the agent as a "suggestion" to the avoidance simulation.
 	/// The simulation will try to fulfill this velocity wish if possible but may change the velocity depending on other agent's and obstacles'.
-	virtual void agent_set_velocity(RID p_agent, Vector2 p_velocity) override;
+	COMMAND_2(agent_set_velocity, RID, p_agent, Vector2, p_velocity);
 	virtual Vector2 agent_get_velocity(RID p_agent) const override;
 
 	/// Position of the agent in world space.
-	virtual void agent_set_position(RID p_agent, Vector2 p_position) override;
+	COMMAND_2(agent_set_position, RID, p_agent, Vector2, p_position);
 	virtual Vector2 agent_get_position(RID p_agent) const override;
 
 	/// Returns true if the map got changed the previous frame.
 	virtual bool agent_is_map_changed(RID p_agent) const override;
 
 	/// Callback called at the end of the RVO process
-	virtual void agent_set_avoidance_callback(RID p_agent, Callable p_callback) override;
+	COMMAND_2(agent_set_avoidance_callback, RID, p_agent, Callable, p_callback);
 	virtual bool agent_has_avoidance_callback(RID p_agent) const override;
 
-	virtual void agent_set_avoidance_layers(RID p_agent, uint32_t p_layers) override;
+	COMMAND_2(agent_set_avoidance_layers, RID, p_agent, uint32_t, p_layers);
 	virtual uint32_t agent_get_avoidance_layers(RID p_agent) const override;
 
-	virtual void agent_set_avoidance_mask(RID p_agent, uint32_t p_mask) override;
+	COMMAND_2(agent_set_avoidance_mask, RID, p_agent, uint32_t, p_mask);
 	virtual uint32_t agent_get_avoidance_mask(RID p_agent) const override;
 
-	virtual void agent_set_avoidance_priority(RID p_agent, real_t p_priority) override;
+	COMMAND_2(agent_set_avoidance_priority, RID, p_agent, real_t, p_priority);
 	virtual real_t agent_get_avoidance_priority(RID p_agent) const override;
 
 	virtual RID obstacle_create() override;
-	virtual void obstacle_set_avoidance_enabled(RID p_obstacle, bool p_enabled) override;
+	COMMAND_2(obstacle_set_avoidance_enabled, RID, p_obstacle, bool, p_enabled);
 	virtual bool obstacle_get_avoidance_enabled(RID p_obstacle) const override;
-	virtual void obstacle_set_map(RID p_obstacle, RID p_map) override;
+	COMMAND_2(obstacle_set_map, RID, p_obstacle, RID, p_map);
 	virtual RID obstacle_get_map(RID p_obstacle) const override;
-	virtual void obstacle_set_paused(RID p_obstacle, bool p_paused) override;
+	COMMAND_2(obstacle_set_paused, RID, p_obstacle, bool, p_paused);
 	virtual bool obstacle_get_paused(RID p_obstacle) const override;
-	virtual void obstacle_set_radius(RID p_obstacle, real_t p_radius) override;
+	COMMAND_2(obstacle_set_radius, RID, p_obstacle, real_t, p_radius);
 	virtual real_t obstacle_get_radius(RID p_obstacle) const override;
-	virtual void obstacle_set_velocity(RID p_obstacle, Vector2 p_velocity) override;
+	COMMAND_2(obstacle_set_velocity, RID, p_obstacle, Vector2, p_velocity);
 	virtual Vector2 obstacle_get_velocity(RID p_obstacle) const override;
-	virtual void obstacle_set_position(RID p_obstacle, Vector2 p_position) override;
+	COMMAND_2(obstacle_set_position, RID, p_obstacle, Vector2, p_position);
 	virtual Vector2 obstacle_get_position(RID p_obstacle) const override;
-	virtual void obstacle_set_vertices(RID p_obstacle, const Vector<Vector2> &p_vertices) override;
+	COMMAND_2(obstacle_set_vertices, RID, p_obstacle, const Vector<Vector2> &, p_vertices);
 	virtual Vector<Vector2> obstacle_get_vertices(RID p_obstacle) const override;
-	virtual void obstacle_set_avoidance_layers(RID p_obstacle, uint32_t p_layers) override;
+	COMMAND_2(obstacle_set_avoidance_layers, RID, p_obstacle, uint32_t, p_layers);
 	virtual uint32_t obstacle_get_avoidance_layers(RID p_obstacle) const override;
 
-	virtual void query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback) override;
+	virtual void query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback = Callable()) override;
 
+	COMMAND_1(free, RID, p_object);
+
+	virtual void set_active(bool p_active) override;
+
+	void flush_queries();
+
+	virtual void process(double p_delta_time) override;
+	virtual void physics_process(double p_delta_time) override;
 	virtual void init() override;
 	virtual void sync() override;
 	virtual void finish() override;
-	virtual void free(RID p_object) override;
+
+	virtual int get_process_info(ProcessInfo p_info) const override;
 
 	virtual void parse_source_geometry_data(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, Node *p_root_node, const Callable &p_callback = Callable()) override;
 	virtual void bake_from_source_geometry_data(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, const Callable &p_callback = Callable()) override;
@@ -261,6 +338,11 @@ public:
 	virtual void source_geometry_parser_set_callback(RID p_parser, const Callable &p_callback) override;
 
 	virtual Vector<Vector2> simplify_path(const Vector<Vector2> &p_path, real_t p_epsilon) override;
+
+private:
+	void internal_free_agent(RID p_object);
+	void internal_free_obstacle(RID p_object);
 };
 
-#endif // GODOT_NAVIGATION_SERVER_2D_H
+#undef COMMAND_1
+#undef COMMAND_2
diff --git a/engine/modules/navigation_2d/2d/nav_base_iteration_2d.h b/engine/modules/navigation_2d/2d/nav_base_iteration_2d.h
new file mode 100644
index 00000000..feb7c68f
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/nav_base_iteration_2d.h
@@ -0,0 +1,58 @@
+/**************************************************************************/
+/*  nav_base_iteration_2d.h                                               */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "../nav_utils_2d.h"
+
+#include "servers/navigation/navigation_utilities.h"
+
+struct NavBaseIteration2D {
+	uint32_t id = UINT32_MAX;
+	bool enabled = true;
+	uint32_t navigation_layers = 1;
+	real_t enter_cost = 0.0;
+	real_t travel_cost = 1.0;
+	NavigationUtilities::PathSegmentType owner_type;
+	ObjectID owner_object_id;
+	RID owner_rid;
+	bool owner_use_edge_connections = false;
+	LocalVector<nav_2d::Polygon> navmesh_polygons;
+
+	bool get_enabled() const { return enabled; }
+	NavigationUtilities::PathSegmentType get_type() const { return owner_type; }
+	RID get_self() const { return owner_rid; }
+	ObjectID get_owner_id() const { return owner_object_id; }
+	uint32_t get_navigation_layers() const { return navigation_layers; }
+	real_t get_enter_cost() const { return enter_cost; }
+	real_t get_travel_cost() const { return travel_cost; }
+	bool get_use_edge_connections() const { return owner_use_edge_connections; }
+	const LocalVector<nav_2d::Polygon> &get_navmesh_polygons() const { return navmesh_polygons; }
+};
diff --git a/engine/modules/navigation_2d/2d/nav_map_builder_2d.cpp b/engine/modules/navigation_2d/2d/nav_map_builder_2d.cpp
new file mode 100644
index 00000000..a157bacf
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/nav_map_builder_2d.cpp
@@ -0,0 +1,404 @@
+/**************************************************************************/
+/*  nav_map_builder_2d.cpp                                                */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "nav_map_builder_2d.h"
+
+#include "../nav_link_2d.h"
+#include "../nav_map_2d.h"
+#include "../nav_region_2d.h"
+#include "../triangle2.h"
+#include "nav_map_iteration_2d.h"
+#include "nav_region_iteration_2d.h"
+
+using namespace nav_2d;
+
+PointKey NavMapBuilder2D::get_point_key(const Vector2 &p_pos, const Vector2 &p_cell_size) {
+	const int x = static_cast<int>(Math::floor(p_pos.x / p_cell_size.x));
+	const int y = static_cast<int>(Math::floor(p_pos.y / p_cell_size.y));
+
+	PointKey p;
+	p.key = 0;
+	p.x = x;
+	p.y = y;
+	return p;
+}
+
+void NavMapBuilder2D::build_navmap_iteration(NavMapIterationBuild2D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+
+	performance_data.pm_polygon_count = 0;
+	performance_data.pm_edge_count = 0;
+	performance_data.pm_edge_merge_count = 0;
+	performance_data.pm_edge_connection_count = 0;
+	performance_data.pm_edge_free_count = 0;
+
+	_build_step_gather_region_polygons(r_build);
+
+	_build_step_find_edge_connection_pairs(r_build);
+
+	_build_step_merge_edge_connection_pairs(r_build);
+
+	_build_step_edge_connection_margin_connections(r_build);
+
+	_build_step_navlink_connections(r_build);
+
+	_build_update_map_iteration(r_build);
+}
+
+void NavMapBuilder2D::_build_step_gather_region_polygons(NavMapIterationBuild2D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+	NavMapIteration2D *map_iteration = r_build.map_iteration;
+
+	LocalVector<NavRegionIteration2D> &regions = map_iteration->region_iterations;
+	HashMap<uint32_t, LocalVector<Edge::Connection>> &region_external_connections = map_iteration->external_region_connections;
+
+	// Remove regions connections.
+	region_external_connections.clear();
+	for (const NavRegionIteration2D &region : regions) {
+		region_external_connections[region.id] = LocalVector<Edge::Connection>();
+	}
+
+	// Copy all region polygons in the map.
+	int polygon_count = 0;
+	for (NavRegionIteration2D &region : regions) {
+		if (!region.get_enabled()) {
+			continue;
+		}
+		LocalVector<Polygon> &polygons_source = region.navmesh_polygons;
+		for (uint32_t n = 0; n < polygons_source.size(); n++) {
+			polygons_source[n].id = polygon_count;
+			polygon_count++;
+		}
+	}
+
+	performance_data.pm_polygon_count = polygon_count;
+	r_build.polygon_count = polygon_count;
+}
+
+void NavMapBuilder2D::_build_step_find_edge_connection_pairs(NavMapIterationBuild2D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+	NavMapIteration2D *map_iteration = r_build.map_iteration;
+	int polygon_count = r_build.polygon_count;
+	const Vector2 merge_rasterizer_cell_size = r_build.merge_rasterizer_cell_size;
+	HashMap<EdgeKey, EdgeConnectionPair, EdgeKey> &connection_pairs_map = r_build.iter_connection_pairs_map;
+
+	// Group all edges per key.
+	connection_pairs_map.clear();
+	connection_pairs_map.reserve(polygon_count);
+	int free_edges_count = 0; // How many ConnectionPairs have only one Connection.
+
+	for (NavRegionIteration2D &region : map_iteration->region_iterations) {
+		if (!region.get_enabled()) {
+			continue;
+		}
+
+		for (Polygon &poly : region.navmesh_polygons) {
+			for (uint32_t p = 0; p < poly.vertices.size(); p++) {
+				const int next_point = (p + 1) % poly.vertices.size();
+				const EdgeKey ek(get_point_key(poly.vertices[p], merge_rasterizer_cell_size), get_point_key(poly.vertices[next_point], merge_rasterizer_cell_size));
+
+				HashMap<EdgeKey, EdgeConnectionPair, EdgeKey>::Iterator pair_it = connection_pairs_map.find(ek);
+				if (!pair_it) {
+					pair_it = connection_pairs_map.insert(ek, EdgeConnectionPair());
+					performance_data.pm_edge_count += 1;
+					++free_edges_count;
+				}
+				EdgeConnectionPair &pair = pair_it->value;
+				if (pair.size < 2) {
+					// Add the polygon/edge tuple to this key.
+					Edge::Connection new_connection;
+					new_connection.polygon = &poly;
+					new_connection.edge = p;
+					new_connection.pathway_start = poly.vertices[p];
+					new_connection.pathway_end = poly.vertices[next_point];
+
+					pair.connections[pair.size] = new_connection;
+					++pair.size;
+					if (pair.size == 2) {
+						--free_edges_count;
+					}
+
+				} else {
+					// The edge is already connected with another edge, skip.
+					ERR_PRINT_ONCE("Navigation map synchronization error. Attempted to merge a navigation mesh polygon edge with another already-merged edge. This is usually caused by crossing edges, overlapping polygons, or a mismatch of the NavigationMesh / NavigationPolygon baked 'cell_size' and navigation map 'cell_size'. If you're certain none of above is the case, change 'navigation/3d/merge_rasterizer_cell_scale' to 0.001.");
+				}
+			}
+		}
+	}
+
+	r_build.free_edge_count = free_edges_count;
+}
+
+void NavMapBuilder2D::_build_step_merge_edge_connection_pairs(NavMapIterationBuild2D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+
+	HashMap<EdgeKey, EdgeConnectionPair, EdgeKey> &connection_pairs_map = r_build.iter_connection_pairs_map;
+	LocalVector<Edge::Connection> &free_edges = r_build.iter_free_edges;
+	int free_edges_count = r_build.free_edge_count;
+	bool use_edge_connections = r_build.use_edge_connections;
+
+	free_edges.clear();
+	free_edges.reserve(free_edges_count);
+
+	for (const KeyValue<EdgeKey, EdgeConnectionPair> &pair_it : connection_pairs_map) {
+		const EdgeConnectionPair &pair = pair_it.value;
+		if (pair.size == 2) {
+			// Connect edge that are shared in different polygons.
+			const Edge::Connection &c1 = pair.connections[0];
+			const Edge::Connection &c2 = pair.connections[1];
+			c1.polygon->edges[c1.edge].connections.push_back(c2);
+			c2.polygon->edges[c2.edge].connections.push_back(c1);
+			// Note: The pathway_start/end are full for those connection and do not need to be modified.
+			performance_data.pm_edge_merge_count += 1;
+		} else {
+			CRASH_COND_MSG(pair.size != 1, vformat("Number of connection != 1. Found: %d", pair.size));
+			if (use_edge_connections && pair.connections[0].polygon->owner->get_use_edge_connections()) {
+				free_edges.push_back(pair.connections[0]);
+			}
+		}
+	}
+}
+
+void NavMapBuilder2D::_build_step_edge_connection_margin_connections(NavMapIterationBuild2D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+	NavMapIteration2D *map_iteration = r_build.map_iteration;
+
+	real_t edge_connection_margin = r_build.edge_connection_margin;
+	LocalVector<Edge::Connection> &free_edges = r_build.iter_free_edges;
+	HashMap<uint32_t, LocalVector<Edge::Connection>> &region_external_connections = map_iteration->external_region_connections;
+
+	// Find the compatible near edges.
+	//
+	// Note:
+	// Considering that the edges must be compatible (for obvious reasons)
+	// to be connected, create new polygons to remove that small gap is
+	// not really useful and would result in wasteful computation during
+	// connection, integration and path finding.
+	performance_data.pm_edge_free_count = free_edges.size();
+
+	const real_t edge_connection_margin_squared = edge_connection_margin * edge_connection_margin;
+
+	for (uint32_t i = 0; i < free_edges.size(); i++) {
+		const Edge::Connection &free_edge = free_edges[i];
+		Vector2 edge_p1 = free_edge.polygon->vertices[free_edge.edge];
+		Vector2 edge_p2 = free_edge.polygon->vertices[(free_edge.edge + 1) % free_edge.polygon->vertices.size()];
+
+		for (uint32_t j = 0; j < free_edges.size(); j++) {
+			const Edge::Connection &other_edge = free_edges[j];
+			if (i == j || free_edge.polygon->owner == other_edge.polygon->owner) {
+				continue;
+			}
+
+			Vector2 other_edge_p1 = other_edge.polygon->vertices[other_edge.edge];
+			Vector2 other_edge_p2 = other_edge.polygon->vertices[(other_edge.edge + 1) % other_edge.polygon->vertices.size()];
+
+			// Compute the projection of the opposite edge on the current one.
+			Vector2 edge_vector = edge_p2 - edge_p1;
+			real_t projected_p1_ratio = edge_vector.dot(other_edge_p1 - edge_p1) / edge_vector.length_squared();
+			real_t projected_p2_ratio = edge_vector.dot(other_edge_p2 - edge_p1) / edge_vector.length_squared();
+			if ((projected_p1_ratio < 0.0 && projected_p2_ratio < 0.0) || (projected_p1_ratio > 1.0 && projected_p2_ratio > 1.0)) {
+				continue;
+			}
+
+			// Check if the two edges are close to each other enough and compute a pathway between the two regions.
+			Vector2 self1 = edge_vector * CLAMP(projected_p1_ratio, 0.0, 1.0) + edge_p1;
+			Vector2 other1;
+			if (projected_p1_ratio >= 0.0 && projected_p1_ratio <= 1.0) {
+				other1 = other_edge_p1;
+			} else {
+				other1 = other_edge_p1.lerp(other_edge_p2, (1.0 - projected_p1_ratio) / (projected_p2_ratio - projected_p1_ratio));
+			}
+			if (other1.distance_squared_to(self1) > edge_connection_margin_squared) {
+				continue;
+			}
+
+			Vector2 self2 = edge_vector * CLAMP(projected_p2_ratio, 0.0, 1.0) + edge_p1;
+			Vector2 other2;
+			if (projected_p2_ratio >= 0.0 && projected_p2_ratio <= 1.0) {
+				other2 = other_edge_p2;
+			} else {
+				other2 = other_edge_p1.lerp(other_edge_p2, (0.0 - projected_p1_ratio) / (projected_p2_ratio - projected_p1_ratio));
+			}
+			if (other2.distance_squared_to(self2) > edge_connection_margin_squared) {
+				continue;
+			}
+
+			// The edges can now be connected.
+			Edge::Connection new_connection = other_edge;
+			new_connection.pathway_start = (self1 + other1) / 2.0;
+			new_connection.pathway_end = (self2 + other2) / 2.0;
+			free_edge.polygon->edges[free_edge.edge].connections.push_back(new_connection);
+
+			// Add the connection to the region_connection map.
+			region_external_connections[(uint32_t)free_edge.polygon->owner->id].push_back(new_connection);
+			performance_data.pm_edge_connection_count += 1;
+		}
+	}
+}
+
+void NavMapBuilder2D::_build_step_navlink_connections(NavMapIterationBuild2D &r_build) {
+	NavMapIteration2D *map_iteration = r_build.map_iteration;
+
+	real_t link_connection_radius = r_build.link_connection_radius;
+
+	LocalVector<Polygon> &link_polygons = map_iteration->link_polygons;
+	LocalVector<NavLinkIteration2D> &links = map_iteration->link_iterations;
+	int polygon_count = r_build.polygon_count;
+
+	real_t link_connection_radius_sqr = link_connection_radius * link_connection_radius;
+	uint32_t link_poly_idx = 0;
+	link_polygons.resize(links.size());
+
+	// Search for polygons within range of a nav link.
+	for (const NavLinkIteration2D &link : links) {
+		if (!link.get_enabled()) {
+			continue;
+		}
+		const Vector2 link_start_pos = link.get_start_position();
+		const Vector2 link_end_pos = link.get_end_position();
+
+		Polygon *closest_start_polygon = nullptr;
+		real_t closest_start_sqr_dist = link_connection_radius_sqr;
+		Vector2 closest_start_point;
+
+		Polygon *closest_end_polygon = nullptr;
+		real_t closest_end_sqr_dist = link_connection_radius_sqr;
+		Vector2 closest_end_point;
+
+		for (NavRegionIteration2D &region : map_iteration->region_iterations) {
+			if (!region.get_enabled()) {
+				continue;
+			}
+			Rect2 region_bounds = region.get_bounds().grow(link_connection_radius);
+			if (!region_bounds.has_point(link_start_pos) && !region_bounds.has_point(link_end_pos)) {
+				continue;
+			}
+
+			for (Polygon &polyon : region.navmesh_polygons) {
+				for (uint32_t point_id = 2; point_id < polyon.vertices.size(); point_id += 1) {
+					const Triangle2 triangle(polyon.vertices[0], polyon.vertices[point_id - 1], polyon.vertices[point_id]);
+
+					{
+						const Vector2 start_point = triangle.get_closest_point_to(link_start_pos);
+						const real_t sqr_dist = start_point.distance_squared_to(link_start_pos);
+
+						// Pick the polygon that is within our radius and is closer than anything we've seen yet.
+						if (sqr_dist < closest_start_sqr_dist) {
+							closest_start_sqr_dist = sqr_dist;
+							closest_start_point = start_point;
+							closest_start_polygon = &polyon;
+						}
+					}
+
+					{
+						const Vector2 end_point = triangle.get_closest_point_to(link_end_pos);
+						const real_t sqr_dist = end_point.distance_squared_to(link_end_pos);
+
+						// Pick the polygon that is within our radius and is closer than anything we've seen yet.
+						if (sqr_dist < closest_end_sqr_dist) {
+							closest_end_sqr_dist = sqr_dist;
+							closest_end_point = end_point;
+							closest_end_polygon = &polyon;
+						}
+					}
+				}
+			}
+		}
+
+		// If we have both a start and end point, then create a synthetic polygon to route through.
+		if (closest_start_polygon && closest_end_polygon) {
+			Polygon &new_polygon = link_polygons[link_poly_idx++];
+			new_polygon.id = polygon_count++;
+			new_polygon.owner = &link;
+
+			new_polygon.edges.clear();
+			new_polygon.edges.resize(4);
+			new_polygon.vertices.resize(4);
+
+			// Build a set of vertices that create a thin polygon going from the start to the end point.
+			new_polygon.vertices[0] = closest_start_point;
+			new_polygon.vertices[1] = closest_start_point;
+			new_polygon.vertices[2] = closest_end_point;
+			new_polygon.vertices[3] = closest_end_point;
+
+			// Setup connections to go forward in the link.
+			{
+				Edge::Connection entry_connection;
+				entry_connection.polygon = &new_polygon;
+				entry_connection.edge = -1;
+				entry_connection.pathway_start = new_polygon.vertices[0];
+				entry_connection.pathway_end = new_polygon.vertices[1];
+				closest_start_polygon->edges[0].connections.push_back(entry_connection);
+
+				Edge::Connection exit_connection;
+				exit_connection.polygon = closest_end_polygon;
+				exit_connection.edge = -1;
+				exit_connection.pathway_start = new_polygon.vertices[2];
+				exit_connection.pathway_end = new_polygon.vertices[3];
+				new_polygon.edges[2].connections.push_back(exit_connection);
+			}
+
+			// If the link is bi-directional, create connections from the end to the start.
+			if (link.is_bidirectional()) {
+				Edge::Connection entry_connection;
+				entry_connection.polygon = &new_polygon;
+				entry_connection.edge = -1;
+				entry_connection.pathway_start = new_polygon.vertices[2];
+				entry_connection.pathway_end = new_polygon.vertices[3];
+				closest_end_polygon->edges[0].connections.push_back(entry_connection);
+
+				Edge::Connection exit_connection;
+				exit_connection.polygon = closest_start_polygon;
+				exit_connection.edge = -1;
+				exit_connection.pathway_start = new_polygon.vertices[0];
+				exit_connection.pathway_end = new_polygon.vertices[1];
+				new_polygon.edges[0].connections.push_back(exit_connection);
+			}
+		}
+	}
+}
+
+void NavMapBuilder2D::_build_update_map_iteration(NavMapIterationBuild2D &r_build) {
+	NavMapIteration2D *map_iteration = r_build.map_iteration;
+
+	LocalVector<Polygon> &link_polygons = map_iteration->link_polygons;
+
+	map_iteration->navmesh_polygon_count = r_build.polygon_count;
+	map_iteration->link_polygon_count = link_polygons.size();
+
+	map_iteration->path_query_slots_mutex.lock();
+	for (NavMeshQueries2D::PathQuerySlot &p_path_query_slot : map_iteration->path_query_slots) {
+		p_path_query_slot.traversable_polys.clear();
+		p_path_query_slot.traversable_polys.reserve(map_iteration->navmesh_polygon_count * 0.25);
+		p_path_query_slot.path_corridor.clear();
+		p_path_query_slot.path_corridor.resize(map_iteration->navmesh_polygon_count + map_iteration->link_polygon_count);
+	}
+	map_iteration->path_query_slots_mutex.unlock();
+}
diff --git a/engine/modules/navigation_2d/2d/nav_map_builder_2d.h b/engine/modules/navigation_2d/2d/nav_map_builder_2d.h
new file mode 100644
index 00000000..1a387e50
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/nav_map_builder_2d.h
@@ -0,0 +1,49 @@
+/**************************************************************************/
+/*  nav_map_builder_2d.h                                                  */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "../nav_utils_2d.h"
+
+struct NavMapIterationBuild2D;
+
+class NavMapBuilder2D {
+	static void _build_step_gather_region_polygons(NavMapIterationBuild2D &r_build);
+	static void _build_step_find_edge_connection_pairs(NavMapIterationBuild2D &r_build);
+	static void _build_step_merge_edge_connection_pairs(NavMapIterationBuild2D &r_build);
+	static void _build_step_edge_connection_margin_connections(NavMapIterationBuild2D &r_build);
+	static void _build_step_navlink_connections(NavMapIterationBuild2D &r_build);
+	static void _build_update_map_iteration(NavMapIterationBuild2D &r_build);
+
+public:
+	static nav_2d::PointKey get_point_key(const Vector2 &p_pos, const Vector2 &p_cell_size);
+
+	static void build_navmap_iteration(NavMapIterationBuild2D &r_build);
+};
diff --git a/engine/modules/navigation_2d/2d/nav_map_iteration_2d.h b/engine/modules/navigation_2d/2d/nav_map_iteration_2d.h
new file mode 100644
index 00000000..50ee5a47
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/nav_map_iteration_2d.h
@@ -0,0 +1,110 @@
+/**************************************************************************/
+/*  nav_map_iteration_2d.h                                                */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "../nav_rid_2d.h"
+#include "../nav_utils_2d.h"
+#include "nav_mesh_queries_2d.h"
+
+#include "core/math/math_defs.h"
+#include "core/os/semaphore.h"
+
+struct NavLinkIteration2D;
+class NavRegion2D;
+struct NavRegionIteration2D;
+struct NavMapIteration2D;
+
+struct NavMapIterationBuild2D {
+	Vector2 merge_rasterizer_cell_size;
+	bool use_edge_connections = true;
+	real_t edge_connection_margin;
+	real_t link_connection_radius;
+	nav_2d::PerformanceData performance_data;
+	int polygon_count = 0;
+	int free_edge_count = 0;
+
+	HashMap<nav_2d::EdgeKey, nav_2d::EdgeConnectionPair, nav_2d::EdgeKey> iter_connection_pairs_map;
+	LocalVector<nav_2d::Edge::Connection> iter_free_edges;
+
+	NavMapIteration2D *map_iteration = nullptr;
+
+	int navmesh_polygon_count = 0;
+	int link_polygon_count = 0;
+
+	void reset() {
+		performance_data.reset();
+
+		iter_connection_pairs_map.clear();
+		iter_free_edges.clear();
+		polygon_count = 0;
+		free_edge_count = 0;
+
+		navmesh_polygon_count = 0;
+		link_polygon_count = 0;
+	}
+};
+
+struct NavMapIteration2D {
+	mutable SafeNumeric<uint32_t> users;
+	RWLock rwlock;
+
+	LocalVector<nav_2d::Polygon> link_polygons;
+
+	LocalVector<NavRegionIteration2D> region_iterations;
+	LocalVector<NavLinkIteration2D> link_iterations;
+
+	int navmesh_polygon_count = 0;
+	int link_polygon_count = 0;
+
+	// The edge connections that the map builds on top with the edge connection margin.
+	HashMap<uint32_t, LocalVector<nav_2d::Edge::Connection>> external_region_connections;
+
+	HashMap<NavRegion2D *, uint32_t> region_ptr_to_region_id;
+
+	LocalVector<NavMeshQueries2D::PathQuerySlot> path_query_slots;
+	Mutex path_query_slots_mutex;
+	Semaphore path_query_slots_semaphore;
+};
+
+class NavMapIterationRead2D {
+	const NavMapIteration2D &map_iteration;
+
+public:
+	_ALWAYS_INLINE_ NavMapIterationRead2D(const NavMapIteration2D &p_iteration) :
+			map_iteration(p_iteration) {
+		map_iteration.rwlock.read_lock();
+		map_iteration.users.increment();
+	}
+	_ALWAYS_INLINE_ ~NavMapIterationRead2D() {
+		map_iteration.users.decrement();
+		map_iteration.rwlock.read_unlock();
+	}
+};
diff --git a/engine/modules/navigation/2d/nav_mesh_generator_2d.cpp b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp
similarity index 98%
rename from engine/modules/navigation/2d/nav_mesh_generator_2d.cpp
rename to engine/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp
index 7d79a7e1..191a2ee4 100644
--- a/engine/modules/navigation/2d/nav_mesh_generator_2d.cpp
+++ b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.cpp
@@ -71,7 +71,7 @@ NavMeshGenerator2D::~NavMeshGenerator2D() {
 }
 
 void NavMeshGenerator2D::sync() {
-	if (generator_tasks.size() == 0) {
+	if (generator_tasks.is_empty()) {
 		return;
 	}
 
@@ -93,6 +93,7 @@ void NavMeshGenerator2D::sync() {
 				if (generator_task->callback.is_valid()) {
 					generator_emit_callback(generator_task->callback);
 				}
+				generator_task->navigation_mesh->emit_changed();
 				memdelete(generator_task);
 			}
 		}
@@ -150,6 +151,7 @@ void NavMeshGenerator2D::bake_from_source_geometry_data(Ref<NavigationPolygon> p
 		if (p_callback.is_valid()) {
 			generator_emit_callback(p_callback);
 		}
+		p_navigation_mesh->emit_changed();
 		return;
 	}
 
@@ -169,6 +171,8 @@ void NavMeshGenerator2D::bake_from_source_geometry_data(Ref<NavigationPolygon> p
 	if (p_callback.is_valid()) {
 		generator_emit_callback(p_callback);
 	}
+
+	p_navigation_mesh->emit_changed();
 }
 
 void NavMeshGenerator2D::bake_from_source_geometry_data_async(Ref<NavigationPolygon> p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, const Callable &p_callback) {
@@ -180,6 +184,7 @@ void NavMeshGenerator2D::bake_from_source_geometry_data_async(Ref<NavigationPoly
 		if (p_callback.is_valid()) {
 			generator_emit_callback(p_callback);
 		}
+		p_navigation_mesh->emit_changed();
 		return;
 	}
 
@@ -502,9 +507,7 @@ void NavMeshGenerator2D::generator_bake_from_source_geometry_data(Ref<Navigation
 	Vector<Vector<int>> new_polygons;
 
 	HashMap<Vector2, int> points;
-	for (List<TPPLPoly>::Element *I = tppl_out_polygon.front(); I; I = I->next()) {
-		TPPLPoly &tp = I->get();
-
+	for (const TPPLPoly &tp : tppl_out_polygon) {
 		Vector<int> new_polygon;
 
 		for (int64_t i = 0; i < tp.GetNumPoints(); i++) {
diff --git a/engine/modules/navigation/2d/nav_mesh_generator_2d.h b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.h
similarity index 98%
rename from engine/modules/navigation/2d/nav_mesh_generator_2d.h
rename to engine/modules/navigation_2d/2d/nav_mesh_generator_2d.h
index 1c2ae324..c2704b57 100644
--- a/engine/modules/navigation/2d/nav_mesh_generator_2d.h
+++ b/engine/modules/navigation_2d/2d/nav_mesh_generator_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_MESH_GENERATOR_2D_H
-#define NAV_MESH_GENERATOR_2D_H
+#pragma once
 
 #ifdef CLIPPER2_ENABLED
 
@@ -102,5 +101,3 @@ public:
 };
 
 #endif // CLIPPER2_ENABLED
-
-#endif // NAV_MESH_GENERATOR_2D_H
diff --git a/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
new file mode 100644
index 00000000..4f201589
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.cpp
@@ -0,0 +1,1058 @@
+/**************************************************************************/
+/*  nav_mesh_queries_2d.cpp                                               */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "nav_mesh_queries_2d.h"
+
+#include "../nav_base_2d.h"
+#include "../nav_map_2d.h"
+#include "../triangle2.h"
+#include "nav_region_iteration_2d.h"
+
+#include "core/math/geometry_2d.h"
+#include "servers/navigation/navigation_utilities.h"
+
+using namespace nav_2d;
+
+#define THREE_POINTS_CROSS_PRODUCT(m_a, m_b, m_c) (((m_c) - (m_a)).cross((m_b) - (m_a)))
+
+bool NavMeshQueries2D::emit_callback(const Callable &p_callback) {
+	ERR_FAIL_COND_V(!p_callback.is_valid(), false);
+
+	Callable::CallError ce;
+	Variant result;
+	p_callback.callp(nullptr, 0, result, ce);
+
+	return ce.error == Callable::CallError::CALL_OK;
+}
+
+Vector2 NavMeshQueries2D::polygons_get_random_point(const LocalVector<Polygon> &p_polygons, uint32_t p_navigation_layers, bool p_uniformly) {
+	const LocalVector<Polygon> &region_polygons = p_polygons;
+
+	if (region_polygons.is_empty()) {
+		return Vector2();
+	}
+
+	if (p_uniformly) {
+		real_t accumulated_area = 0;
+		RBMap<real_t, uint32_t> region_area_map;
+
+		for (uint32_t rp_index = 0; rp_index < region_polygons.size(); rp_index++) {
+			const Polygon &region_polygon = region_polygons[rp_index];
+			real_t polyon_area = region_polygon.surface_area;
+
+			if (polyon_area == 0.0) {
+				continue;
+			}
+			region_area_map[accumulated_area] = rp_index;
+			accumulated_area += polyon_area;
+		}
+		if (region_area_map.is_empty() || accumulated_area == 0) {
+			// All polygons have no real surface / no area.
+			return Vector2();
+		}
+
+		real_t region_area_map_pos = Math::random(real_t(0), accumulated_area);
+
+		RBMap<real_t, uint32_t>::Iterator region_E = region_area_map.find_closest(region_area_map_pos);
+		ERR_FAIL_COND_V(!region_E, Vector2());
+		uint32_t rrp_polygon_index = region_E->value;
+		ERR_FAIL_UNSIGNED_INDEX_V(rrp_polygon_index, region_polygons.size(), Vector2());
+
+		const Polygon &rr_polygon = region_polygons[rrp_polygon_index];
+
+		real_t accumulated_polygon_area = 0;
+		RBMap<real_t, uint32_t> polygon_area_map;
+
+		for (uint32_t rpp_index = 2; rpp_index < rr_polygon.vertices.size(); rpp_index++) {
+			real_t triangle_area = Triangle2(rr_polygon.vertices[0], rr_polygon.vertices[rpp_index - 1], rr_polygon.vertices[rpp_index]).get_area();
+
+			if (triangle_area == 0.0) {
+				continue;
+			}
+			polygon_area_map[accumulated_polygon_area] = rpp_index;
+			accumulated_polygon_area += triangle_area;
+		}
+		if (polygon_area_map.is_empty() || accumulated_polygon_area == 0) {
+			// All faces have no real surface / no area.
+			return Vector2();
+		}
+
+		real_t polygon_area_map_pos = Math::random(real_t(0), accumulated_polygon_area);
+
+		RBMap<real_t, uint32_t>::Iterator polygon_E = polygon_area_map.find_closest(polygon_area_map_pos);
+		ERR_FAIL_COND_V(!polygon_E, Vector2());
+		uint32_t rrp_face_index = polygon_E->value;
+		ERR_FAIL_UNSIGNED_INDEX_V(rrp_face_index, rr_polygon.vertices.size(), Vector2());
+
+		const Triangle2 triangle(rr_polygon.vertices[0], rr_polygon.vertices[rrp_face_index - 1], rr_polygon.vertices[rrp_face_index]);
+
+		Vector2 triangle_random_position = triangle.get_random_point_inside();
+		return triangle_random_position;
+
+	} else {
+		uint32_t rrp_polygon_index = Math::random(int(0), region_polygons.size() - 1);
+
+		const Polygon &rr_polygon = region_polygons[rrp_polygon_index];
+
+		uint32_t rrp_face_index = Math::random(int(2), rr_polygon.vertices.size() - 1);
+
+		const Triangle2 triangle(rr_polygon.vertices[0], rr_polygon.vertices[rrp_face_index - 1], rr_polygon.vertices[rrp_face_index]);
+
+		Vector2 triangle_random_position = triangle.get_random_point_inside();
+		return triangle_random_position;
+	}
+}
+
+void NavMeshQueries2D::_query_task_push_back_point_with_metadata(NavMeshPathQueryTask2D &p_query_task, const Vector2 &p_point, const Polygon *p_point_polygon) {
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_TYPES)) {
+		p_query_task.path_meta_point_types.push_back(p_point_polygon->owner->get_type());
+	}
+
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_RIDS)) {
+		p_query_task.path_meta_point_rids.push_back(p_point_polygon->owner->get_self());
+	}
+
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_OWNERS)) {
+		p_query_task.path_meta_point_owners.push_back(p_point_polygon->owner->get_owner_id());
+	}
+
+	p_query_task.path_points.push_back(p_point);
+}
+
+void NavMeshQueries2D::map_query_path(NavMap2D *p_map, const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback) {
+	ERR_FAIL_NULL(p_map);
+	ERR_FAIL_COND(p_query_parameters.is_null());
+	ERR_FAIL_COND(p_query_result.is_null());
+
+	using namespace NavigationUtilities;
+
+	NavMeshQueries2D::NavMeshPathQueryTask2D query_task;
+	query_task.start_position = p_query_parameters->get_start_position();
+	query_task.target_position = p_query_parameters->get_target_position();
+	query_task.navigation_layers = p_query_parameters->get_navigation_layers();
+	query_task.callback = p_callback;
+
+	const TypedArray<RID> &_excluded_regions = p_query_parameters->get_excluded_regions();
+	const TypedArray<RID> &_included_regions = p_query_parameters->get_included_regions();
+
+	uint32_t _excluded_region_count = _excluded_regions.size();
+	uint32_t _included_region_count = _included_regions.size();
+
+	query_task.exclude_regions = _excluded_region_count > 0;
+	query_task.include_regions = _included_region_count > 0;
+
+	if (query_task.exclude_regions) {
+		query_task.excluded_regions.resize(_excluded_region_count);
+		for (uint32_t i = 0; i < _excluded_region_count; i++) {
+			query_task.excluded_regions[i] = _excluded_regions[i];
+		}
+	}
+
+	if (query_task.include_regions) {
+		query_task.included_regions.resize(_included_region_count);
+		for (uint32_t i = 0; i < _included_region_count; i++) {
+			query_task.included_regions[i] = _included_regions[i];
+		}
+	}
+
+	switch (p_query_parameters->get_pathfinding_algorithm()) {
+		case NavigationPathQueryParameters2D::PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR: {
+			query_task.pathfinding_algorithm = PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR;
+		} break;
+		default: {
+			WARN_PRINT("No match for used PathfindingAlgorithm - fallback to default");
+			query_task.pathfinding_algorithm = PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR;
+		} break;
+	}
+
+	switch (p_query_parameters->get_path_postprocessing()) {
+		case NavigationPathQueryParameters2D::PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL: {
+			query_task.path_postprocessing = PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL;
+		} break;
+		case NavigationPathQueryParameters2D::PathPostProcessing::PATH_POSTPROCESSING_EDGECENTERED: {
+			query_task.path_postprocessing = PathPostProcessing::PATH_POSTPROCESSING_EDGECENTERED;
+		} break;
+		case NavigationPathQueryParameters2D::PathPostProcessing::PATH_POSTPROCESSING_NONE: {
+			query_task.path_postprocessing = PathPostProcessing::PATH_POSTPROCESSING_NONE;
+		} break;
+		default: {
+			WARN_PRINT("No match for used PathPostProcessing - fallback to default");
+			query_task.path_postprocessing = PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL;
+		} break;
+	}
+
+	query_task.metadata_flags = (int64_t)p_query_parameters->get_metadata_flags();
+	query_task.simplify_path = p_query_parameters->get_simplify_path();
+	query_task.simplify_epsilon = p_query_parameters->get_simplify_epsilon();
+	query_task.status = NavMeshPathQueryTask2D::TaskStatus::QUERY_STARTED;
+
+	p_map->query_path(query_task);
+
+	p_query_result->set_data(
+			query_task.path_points,
+			query_task.path_meta_point_types,
+			query_task.path_meta_point_rids,
+			query_task.path_meta_point_owners);
+
+	if (query_task.callback.is_valid()) {
+		if (emit_callback(query_task.callback)) {
+			query_task.status = NavMeshPathQueryTask2D::TaskStatus::CALLBACK_DISPATCHED;
+		} else {
+			query_task.status = NavMeshPathQueryTask2D::TaskStatus::CALLBACK_FAILED;
+		}
+	}
+}
+
+void NavMeshQueries2D::_query_task_find_start_end_positions(NavMeshPathQueryTask2D &p_query_task, const NavMapIteration2D &p_map_iteration) {
+	real_t begin_d = FLT_MAX;
+	real_t end_d = FLT_MAX;
+
+	const LocalVector<NavRegionIteration2D> &regions = p_map_iteration.region_iterations;
+
+	for (const NavRegionIteration2D &region : regions) {
+		if (!region.get_enabled()) {
+			continue;
+		}
+
+		if (p_query_task.exclude_regions && p_query_task.excluded_regions.has(region.get_self())) {
+			continue;
+		}
+		if (p_query_task.include_regions && !p_query_task.included_regions.has(region.get_self())) {
+			continue;
+		}
+
+		// Find the initial poly and the end poly on this map.
+		for (const Polygon &p : region.get_navmesh_polygons()) {
+			// Only consider the polygon if it in a region with compatible layers.
+			if ((p_query_task.navigation_layers & p.owner->get_navigation_layers()) == 0) {
+				continue;
+			}
+
+			// For each triangle check the distance between the origin/destination.
+			for (uint32_t point_id = 2; point_id < p.vertices.size(); point_id++) {
+				const Triangle2 triangle(p.vertices[0], p.vertices[point_id - 1], p.vertices[point_id]);
+
+				Vector2 point = triangle.get_closest_point_to(p_query_task.start_position);
+				real_t distance_to_point = point.distance_to(p_query_task.start_position);
+				if (distance_to_point < begin_d) {
+					begin_d = distance_to_point;
+					p_query_task.begin_polygon = &p;
+					p_query_task.begin_position = point;
+				}
+
+				point = triangle.get_closest_point_to(p_query_task.target_position);
+				distance_to_point = point.distance_to(p_query_task.target_position);
+				if (distance_to_point < end_d) {
+					end_d = distance_to_point;
+					p_query_task.end_polygon = &p;
+					p_query_task.end_position = point;
+				}
+			}
+		}
+	}
+}
+
+void NavMeshQueries2D::_query_task_build_path_corridor(NavMeshPathQueryTask2D &p_query_task) {
+	const Vector2 p_target_position = p_query_task.target_position;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
+	const Polygon *end_poly = p_query_task.end_polygon;
+	Vector2 begin_point = p_query_task.begin_position;
+	Vector2 end_point = p_query_task.end_position;
+
+	// Heap of polygons to travel next.
+	Heap<NavigationPoly *, NavPolyTravelCostGreaterThan, NavPolyHeapIndexer>
+			&traversable_polys = p_query_task.path_query_slot->traversable_polys;
+	traversable_polys.clear();
+
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+	for (NavigationPoly &polygon : navigation_polys) {
+		polygon.reset();
+	}
+
+	// Initialize the matching navigation polygon.
+	NavigationPoly &begin_navigation_poly = navigation_polys[begin_poly->id];
+	begin_navigation_poly.poly = begin_poly;
+	begin_navigation_poly.entry = begin_point;
+	begin_navigation_poly.back_navigation_edge_pathway_start = begin_point;
+	begin_navigation_poly.back_navigation_edge_pathway_end = begin_point;
+	begin_navigation_poly.traveled_distance = 0.0;
+
+	// This is an implementation of the A* algorithm.
+	uint32_t least_cost_id = begin_poly->id;
+	bool found_route = false;
+
+	const Polygon *reachable_end = nullptr;
+	real_t distance_to_reachable_end = FLT_MAX;
+	bool is_reachable = true;
+	real_t poly_enter_cost = 0.0;
+
+	while (true) {
+		const NavigationPoly &least_cost_poly = navigation_polys[least_cost_id];
+		real_t poly_travel_cost = least_cost_poly.poly->owner->get_travel_cost();
+
+		// Takes the current least_cost_poly neighbors (iterating over its edges) and compute the traveled_distance.
+		for (const Edge &edge : least_cost_poly.poly->edges) {
+			// Iterate over connections in this edge, then compute the new optimized travel distance assigned to this polygon.
+			for (uint32_t connection_index = 0; connection_index < edge.connections.size(); connection_index++) {
+				const Edge::Connection &connection = edge.connections[connection_index];
+
+				const NavBaseIteration2D *connection_owner = connection.polygon->owner;
+				const bool owner_is_usable = _query_task_is_connection_owner_usable(p_query_task, connection_owner);
+				if (!owner_is_usable) {
+					continue;
+				}
+
+				const Vector2 new_entry = Geometry2D::get_closest_point_to_segment(least_cost_poly.entry, connection.pathway_start, connection.pathway_end);
+				const real_t new_traveled_distance = least_cost_poly.entry.distance_to(new_entry) * poly_travel_cost + poly_enter_cost + least_cost_poly.traveled_distance;
+
+				// Check if the neighbor polygon has already been processed.
+				NavigationPoly &neighbor_poly = navigation_polys[connection.polygon->id];
+				if (new_traveled_distance < neighbor_poly.traveled_distance) {
+					// Add the polygon to the heap of polygons to traverse next.
+					neighbor_poly.back_navigation_poly_id = least_cost_id;
+					neighbor_poly.back_navigation_edge = connection.edge;
+					neighbor_poly.back_navigation_edge_pathway_start = connection.pathway_start;
+					neighbor_poly.back_navigation_edge_pathway_end = connection.pathway_end;
+					neighbor_poly.traveled_distance = new_traveled_distance;
+					neighbor_poly.distance_to_destination =
+							new_entry.distance_to(end_point) *
+							connection_owner->get_travel_cost();
+					neighbor_poly.entry = new_entry;
+
+					if (neighbor_poly.traversable_poly_index != traversable_polys.INVALID_INDEX) {
+						traversable_polys.shift(neighbor_poly.traversable_poly_index);
+					} else {
+						neighbor_poly.poly = connection.polygon;
+						traversable_polys.push(&neighbor_poly);
+					}
+				}
+			}
+		}
+
+		poly_enter_cost = 0;
+		// When the heap of traversable polygons is empty at this point it means the end polygon is
+		// unreachable.
+		if (traversable_polys.is_empty()) {
+			// Thus use the further reachable polygon
+			ERR_BREAK_MSG(is_reachable == false, "It's not expect to not find the most reachable polygons");
+			is_reachable = false;
+			if (reachable_end == nullptr) {
+				// The path is not found and there is not a way out.
+				break;
+			}
+
+			// Set as end point the furthest reachable point.
+			end_poly = reachable_end;
+			real_t end_d = FLT_MAX;
+			for (uint32_t point_id = 2; point_id < end_poly->vertices.size(); point_id++) {
+				Triangle2 t(end_poly->vertices[0], end_poly->vertices[point_id - 1], end_poly->vertices[point_id]);
+				Vector2 spoint = t.get_closest_point_to(p_target_position);
+				real_t dpoint = spoint.distance_squared_to(p_target_position);
+				if (dpoint < end_d) {
+					end_point = spoint;
+					end_d = dpoint;
+				}
+			}
+
+			// Search all faces of start polygon as well.
+			bool closest_point_on_start_poly = false;
+			for (uint32_t point_id = 2; point_id < begin_poly->vertices.size(); point_id++) {
+				Triangle2 t(begin_poly->vertices[0], begin_poly->vertices[point_id - 1], begin_poly->vertices[point_id]);
+				Vector2 spoint = t.get_closest_point_to(p_target_position);
+				real_t dpoint = spoint.distance_squared_to(p_target_position);
+				if (dpoint < end_d) {
+					end_point = spoint;
+					end_d = dpoint;
+					closest_point_on_start_poly = true;
+				}
+			}
+
+			if (closest_point_on_start_poly) {
+				// No point to run PostProcessing when start and end convex polygon is the same.
+				p_query_task.path_clear();
+
+				_query_task_push_back_point_with_metadata(p_query_task, begin_point, begin_poly);
+				_query_task_push_back_point_with_metadata(p_query_task, end_point, begin_poly);
+				p_query_task.status = NavMeshPathQueryTask2D::TaskStatus::QUERY_FINISHED;
+				return;
+			}
+
+			for (NavigationPoly &nav_poly : navigation_polys) {
+				nav_poly.poly = nullptr;
+				nav_poly.traveled_distance = FLT_MAX;
+			}
+			navigation_polys[begin_poly->id].poly = begin_poly;
+			navigation_polys[begin_poly->id].traveled_distance = 0;
+			least_cost_id = begin_poly->id;
+			reachable_end = nullptr;
+		} else {
+			// Pop the polygon with the lowest travel cost from the heap of traversable polygons.
+			least_cost_id = traversable_polys.pop()->poly->id;
+
+			// Store the farthest reachable end polygon in case our goal is not reachable.
+			if (is_reachable) {
+				real_t distance = navigation_polys[least_cost_id].entry.distance_squared_to(p_target_position);
+				if (distance_to_reachable_end > distance) {
+					distance_to_reachable_end = distance;
+					reachable_end = navigation_polys[least_cost_id].poly;
+				}
+			}
+
+			// Check if we reached the end
+			if (navigation_polys[least_cost_id].poly == end_poly) {
+				found_route = true;
+				break;
+			}
+
+			if (navigation_polys[least_cost_id].poly->owner->get_self() != least_cost_poly.poly->owner->get_self()) {
+				poly_enter_cost = least_cost_poly.poly->owner->get_enter_cost();
+			}
+		}
+	}
+
+	// We did not find a route but we have both a start polygon and an end polygon at this point.
+	// Usually this happens because there was not a single external or internal connected edge, e.g. our start polygon is an isolated, single convex polygon.
+	if (!found_route) {
+		real_t end_d = FLT_MAX;
+		// Search all faces of the start polygon for the closest point to our target position.
+		for (uint32_t point_id = 2; point_id < begin_poly->vertices.size(); point_id++) {
+			Triangle2 t(begin_poly->vertices[0], begin_poly->vertices[point_id - 1], begin_poly->vertices[point_id]);
+			Vector2 spoint = t.get_closest_point_to(p_target_position);
+			real_t dpoint = spoint.distance_squared_to(p_target_position);
+			if (dpoint < end_d) {
+				end_point = spoint;
+				end_d = dpoint;
+			}
+		}
+
+		p_query_task.path_clear();
+
+		_query_task_push_back_point_with_metadata(p_query_task, begin_point, begin_poly);
+		_query_task_push_back_point_with_metadata(p_query_task, end_point, begin_poly);
+		p_query_task.status = NavMeshPathQueryTask2D::TaskStatus::QUERY_FINISHED;
+	} else {
+		p_query_task.end_position = end_point;
+		p_query_task.end_polygon = end_poly;
+		p_query_task.begin_position = begin_point;
+		p_query_task.begin_polygon = begin_poly;
+		p_query_task.least_cost_id = least_cost_id;
+	}
+}
+
+void NavMeshQueries2D::query_task_map_iteration_get_path(NavMeshPathQueryTask2D &p_query_task, const NavMapIteration2D &p_map_iteration) {
+	p_query_task.path_clear();
+
+	_query_task_find_start_end_positions(p_query_task, p_map_iteration);
+
+	// Check for trivial cases.
+	if (!p_query_task.begin_polygon || !p_query_task.end_polygon) {
+		p_query_task.status = NavMeshPathQueryTask2D::TaskStatus::QUERY_FINISHED;
+		return;
+	}
+	if (p_query_task.begin_polygon == p_query_task.end_polygon) {
+		p_query_task.path_clear();
+		_query_task_push_back_point_with_metadata(p_query_task, p_query_task.begin_position, p_query_task.begin_polygon);
+		_query_task_push_back_point_with_metadata(p_query_task, p_query_task.end_position, p_query_task.end_polygon);
+		p_query_task.status = NavMeshPathQueryTask2D::TaskStatus::QUERY_FINISHED;
+		return;
+	}
+
+	_query_task_build_path_corridor(p_query_task);
+
+	if (p_query_task.status == NavMeshPathQueryTask2D::TaskStatus::QUERY_FINISHED || p_query_task.status == NavMeshPathQueryTask2D::TaskStatus::QUERY_FAILED) {
+		return;
+	}
+
+	// Post-Process path.
+	switch (p_query_task.path_postprocessing) {
+		case PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL: {
+			_query_task_post_process_corridorfunnel(p_query_task);
+		} break;
+		case PathPostProcessing::PATH_POSTPROCESSING_EDGECENTERED: {
+			_query_task_post_process_edgecentered(p_query_task);
+		} break;
+		case PathPostProcessing::PATH_POSTPROCESSING_NONE: {
+			_query_task_post_process_nopostprocessing(p_query_task);
+		} break;
+		default: {
+			WARN_PRINT("No match for used PathPostProcessing - fallback to default");
+			_query_task_post_process_corridorfunnel(p_query_task);
+		} break;
+	}
+
+	p_query_task.path_reverse();
+
+	if (p_query_task.simplify_path) {
+		_query_task_simplified_path_points(p_query_task);
+	}
+
+#ifdef DEBUG_ENABLED
+	// Ensure post conditions as path meta arrays if used MUST match in array size with the path points.
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_TYPES)) {
+		DEV_ASSERT(p_query_task.path_points.size() == p_query_task.path_meta_point_types.size());
+	}
+
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_RIDS)) {
+		DEV_ASSERT(p_query_task.path_points.size() == p_query_task.path_meta_point_rids.size());
+	}
+
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_OWNERS)) {
+		DEV_ASSERT(p_query_task.path_points.size() == p_query_task.path_meta_point_owners.size());
+	}
+#endif // DEBUG_ENABLED
+
+	p_query_task.status = NavMeshPathQueryTask2D::TaskStatus::QUERY_FINISHED;
+}
+
+void NavMeshQueries2D::_query_task_simplified_path_points(NavMeshPathQueryTask2D &p_query_task) {
+	if (!p_query_task.simplify_path || p_query_task.path_points.size() <= 2) {
+		return;
+	}
+
+	const LocalVector<uint32_t> &simplified_path_indices = NavMeshQueries2D::get_simplified_path_indices(p_query_task.path_points, p_query_task.simplify_epsilon);
+
+	uint32_t index_count = simplified_path_indices.size();
+
+	{
+		Vector2 *points_ptr = p_query_task.path_points.ptr();
+		for (uint32_t i = 0; i < index_count; i++) {
+			points_ptr[i] = points_ptr[simplified_path_indices[i]];
+		}
+		p_query_task.path_points.resize(index_count);
+	}
+
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_TYPES)) {
+		int32_t *types_ptr = p_query_task.path_meta_point_types.ptr();
+		for (uint32_t i = 0; i < index_count; i++) {
+			types_ptr[i] = types_ptr[simplified_path_indices[i]];
+		}
+		p_query_task.path_meta_point_types.resize(index_count);
+	}
+
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_RIDS)) {
+		RID *rids_ptr = p_query_task.path_meta_point_rids.ptr();
+		for (uint32_t i = 0; i < index_count; i++) {
+			rids_ptr[i] = rids_ptr[simplified_path_indices[i]];
+		}
+		p_query_task.path_meta_point_rids.resize(index_count);
+	}
+
+	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_OWNERS)) {
+		int64_t *owners_ptr = p_query_task.path_meta_point_owners.ptr();
+		for (uint32_t i = 0; i < index_count; i++) {
+			owners_ptr[i] = owners_ptr[simplified_path_indices[i]];
+		}
+		p_query_task.path_meta_point_owners.resize(index_count);
+	}
+}
+
+void NavMeshQueries2D::_query_task_post_process_corridorfunnel(NavMeshPathQueryTask2D &p_query_task) {
+	Vector2 end_point = p_query_task.end_position;
+	const Polygon *end_poly = p_query_task.end_polygon;
+	Vector2 begin_point = p_query_task.begin_position;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
+	uint32_t least_cost_id = p_query_task.least_cost_id;
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+
+	// Set the apex poly/point to the end point.
+	NavigationPoly *apex_poly = &navigation_polys[least_cost_id];
+
+	const Vector2 back_edge_closest_point = Geometry2D::get_closest_point_to_segment(end_point, apex_poly->back_navigation_edge_pathway_start, apex_poly->back_navigation_edge_pathway_end);
+	if (end_point.is_equal_approx(back_edge_closest_point)) {
+		// The end point is basically on top of the last crossed edge, funneling around the corners would at best do nothing.
+		// At worst it would add an unwanted path point before the last point due to precision issues so skip to the next polygon.
+		if (apex_poly->back_navigation_poly_id != -1) {
+			apex_poly = &navigation_polys[apex_poly->back_navigation_poly_id];
+		}
+	}
+
+	Vector2 apex_point = end_point;
+
+	NavigationPoly *left_poly = apex_poly;
+	Vector2 left_portal = apex_point;
+	NavigationPoly *right_poly = apex_poly;
+	Vector2 right_portal = apex_point;
+
+	NavigationPoly *p = apex_poly;
+
+	_query_task_push_back_point_with_metadata(p_query_task, end_point, end_poly);
+
+	while (p) {
+		// Set left and right points of the pathway between polygons.
+		Vector2 left = p->back_navigation_edge_pathway_start;
+		Vector2 right = p->back_navigation_edge_pathway_end;
+		if (THREE_POINTS_CROSS_PRODUCT(apex_point, left, right) < 0) {
+			SWAP(left, right);
+		}
+
+		bool skip = false;
+		if (THREE_POINTS_CROSS_PRODUCT(apex_point, left_portal, left) >= 0) {
+			// Process.
+			if (left_portal == apex_point || THREE_POINTS_CROSS_PRODUCT(apex_point, left, right_portal) > 0) {
+				left_poly = p;
+				left_portal = left;
+			} else {
+				_query_task_clip_path(p_query_task, apex_poly, right_portal, right_poly);
+
+				apex_point = right_portal;
+				p = right_poly;
+				left_poly = p;
+				apex_poly = p;
+				left_portal = apex_point;
+				right_portal = apex_point;
+
+				_query_task_push_back_point_with_metadata(p_query_task, apex_point, apex_poly->poly);
+				skip = true;
+			}
+		}
+
+		if (!skip && THREE_POINTS_CROSS_PRODUCT(apex_point, right_portal, right) <= 0) {
+			// Process.
+			if (right_portal == apex_point || THREE_POINTS_CROSS_PRODUCT(apex_point, right, left_portal) < 0) {
+				right_poly = p;
+				right_portal = right;
+			} else {
+				_query_task_clip_path(p_query_task, apex_poly, left_portal, left_poly);
+
+				apex_point = left_portal;
+				p = left_poly;
+				right_poly = p;
+				apex_poly = p;
+				right_portal = apex_point;
+				left_portal = apex_point;
+
+				_query_task_push_back_point_with_metadata(p_query_task, apex_point, apex_poly->poly);
+			}
+		}
+
+		// Go to the previous polygon.
+		if (p->back_navigation_poly_id != -1) {
+			p = &navigation_polys[p->back_navigation_poly_id];
+		} else {
+			// The end
+			p = nullptr;
+		}
+	}
+
+	// If the last point is not the begin point, add it to the list.
+	if (p_query_task.path_points[p_query_task.path_points.size() - 1] != begin_point) {
+		_query_task_push_back_point_with_metadata(p_query_task, begin_point, begin_poly);
+	}
+}
+
+void NavMeshQueries2D::_query_task_post_process_edgecentered(NavMeshPathQueryTask2D &p_query_task) {
+	Vector2 end_point = p_query_task.end_position;
+	const Polygon *end_poly = p_query_task.end_polygon;
+	Vector2 begin_point = p_query_task.begin_position;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
+	uint32_t least_cost_id = p_query_task.least_cost_id;
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+
+	_query_task_push_back_point_with_metadata(p_query_task, end_point, end_poly);
+
+	// Add mid points.
+	int np_id = least_cost_id;
+	while (np_id != -1 && navigation_polys[np_id].back_navigation_poly_id != -1) {
+		if (navigation_polys[np_id].back_navigation_edge != -1) {
+			int prev = navigation_polys[np_id].back_navigation_edge;
+			int prev_n = (navigation_polys[np_id].back_navigation_edge + 1) % navigation_polys[np_id].poly->vertices.size();
+			Vector2 point = (navigation_polys[np_id].poly->vertices[prev] + navigation_polys[np_id].poly->vertices[prev_n]) * 0.5;
+
+			_query_task_push_back_point_with_metadata(p_query_task, point, navigation_polys[np_id].poly);
+		} else {
+			_query_task_push_back_point_with_metadata(p_query_task, navigation_polys[np_id].entry, navigation_polys[np_id].poly);
+		}
+
+		np_id = navigation_polys[np_id].back_navigation_poly_id;
+	}
+
+	_query_task_push_back_point_with_metadata(p_query_task, begin_point, begin_poly);
+}
+
+void NavMeshQueries2D::_query_task_post_process_nopostprocessing(NavMeshPathQueryTask2D &p_query_task) {
+	Vector2 end_point = p_query_task.end_position;
+	const Polygon *end_poly = p_query_task.end_polygon;
+	Vector2 begin_point = p_query_task.begin_position;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
+	uint32_t least_cost_id = p_query_task.least_cost_id;
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+
+	_query_task_push_back_point_with_metadata(p_query_task, end_point, end_poly);
+
+	// Add mid points.
+	int np_id = least_cost_id;
+	while (np_id != -1 && navigation_polys[np_id].back_navigation_poly_id != -1) {
+		_query_task_push_back_point_with_metadata(p_query_task, navigation_polys[np_id].entry, navigation_polys[np_id].poly);
+
+		np_id = navigation_polys[np_id].back_navigation_poly_id;
+	}
+
+	_query_task_push_back_point_with_metadata(p_query_task, begin_point, begin_poly);
+}
+
+Vector2 NavMeshQueries2D::map_iteration_get_closest_point(const NavMapIteration2D &p_map_iteration, const Vector2 &p_point) {
+	ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
+	return cp.point;
+}
+
+RID NavMeshQueries2D::map_iteration_get_closest_point_owner(const NavMapIteration2D &p_map_iteration, const Vector2 &p_point) {
+	ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
+	return cp.owner;
+}
+
+ClosestPointQueryResult NavMeshQueries2D::map_iteration_get_closest_point_info(const NavMapIteration2D &p_map_iteration, const Vector2 &p_point) {
+	ClosestPointQueryResult result;
+	real_t closest_point_distance_squared = FLT_MAX;
+
+	// TODO: Check for further 2D improvements.
+
+	const LocalVector<NavRegionIteration2D> &regions = p_map_iteration.region_iterations;
+	for (const NavRegionIteration2D &region : regions) {
+		for (const Polygon &polygon : region.get_navmesh_polygons()) {
+			real_t cross = (polygon.vertices[1] - polygon.vertices[0]).cross(polygon.vertices[2] - polygon.vertices[0]);
+			Vector2 closest_on_polygon;
+			real_t closest = FLT_MAX;
+			bool inside = true;
+			Vector2 previous = polygon.vertices[polygon.vertices.size() - 1];
+			for (uint32_t point_id = 0; point_id < polygon.vertices.size(); ++point_id) {
+				Vector2 edge = polygon.vertices[point_id] - previous;
+				Vector2 to_point = p_point - previous;
+				real_t edge_to_point_cross = edge.cross(to_point);
+				bool clockwise = (edge_to_point_cross * cross) > 0;
+				// If we are not clockwise, the point will never be inside the polygon and so the closest point will be on an edge.
+				if (!clockwise) {
+					inside = false;
+					real_t point_projected_on_edge = edge.dot(to_point);
+					real_t edge_square = edge.length_squared();
+
+					if (point_projected_on_edge > edge_square) {
+						real_t distance = polygon.vertices[point_id].distance_squared_to(p_point);
+						if (distance < closest) {
+							closest_on_polygon = polygon.vertices[point_id];
+							closest = distance;
+						}
+					} else if (point_projected_on_edge < 0.0) {
+						real_t distance = previous.distance_squared_to(p_point);
+						if (distance < closest) {
+							closest_on_polygon = previous;
+							closest = distance;
+						}
+					} else {
+						// If we project on this edge, this will be the closest point.
+						real_t percent = point_projected_on_edge / edge_square;
+						closest_on_polygon = previous + percent * edge;
+						break;
+					}
+				}
+				previous = polygon.vertices[point_id];
+			}
+
+			if (inside) {
+				closest_point_distance_squared = 0.0;
+				result.point = p_point;
+				result.owner = polygon.owner->get_self();
+
+				break;
+			} else {
+				real_t distance = closest_on_polygon.distance_squared_to(p_point);
+				if (distance < closest_point_distance_squared) {
+					closest_point_distance_squared = distance;
+					result.point = closest_on_polygon;
+					result.owner = polygon.owner->get_self();
+				}
+			}
+		}
+	}
+
+	return result;
+}
+
+Vector2 NavMeshQueries2D::map_iteration_get_random_point(const NavMapIteration2D &p_map_iteration, uint32_t p_navigation_layers, bool p_uniformly) {
+	if (p_map_iteration.region_iterations.is_empty()) {
+		return Vector2();
+	}
+
+	LocalVector<uint32_t> accessible_regions;
+	accessible_regions.reserve(p_map_iteration.region_iterations.size());
+
+	for (uint32_t i = 0; i < p_map_iteration.region_iterations.size(); i++) {
+		const NavRegionIteration2D &region = p_map_iteration.region_iterations[i];
+		if (!region.enabled || (p_navigation_layers & region.navigation_layers) == 0) {
+			continue;
+		}
+		accessible_regions.push_back(i);
+	}
+
+	if (accessible_regions.is_empty()) {
+		// All existing region polygons are disabled.
+		return Vector2();
+	}
+
+	if (p_uniformly) {
+		real_t accumulated_region_surface_area = 0;
+		RBMap<real_t, uint32_t> accessible_regions_area_map;
+
+		for (uint32_t accessible_region_index = 0; accessible_region_index < accessible_regions.size(); accessible_region_index++) {
+			const NavRegionIteration2D &region = p_map_iteration.region_iterations[accessible_regions[accessible_region_index]];
+
+			real_t region_surface_area = region.surface_area;
+
+			if (region_surface_area == 0.0f) {
+				continue;
+			}
+
+			accessible_regions_area_map[accumulated_region_surface_area] = accessible_region_index;
+			accumulated_region_surface_area += region_surface_area;
+		}
+		if (accessible_regions_area_map.is_empty() || accumulated_region_surface_area == 0) {
+			// All faces have no real surface / no area.
+			return Vector2();
+		}
+
+		real_t random_accessible_regions_area_map = Math::random(real_t(0), accumulated_region_surface_area);
+
+		RBMap<real_t, uint32_t>::Iterator E = accessible_regions_area_map.find_closest(random_accessible_regions_area_map);
+		ERR_FAIL_COND_V(!E, Vector2());
+		uint32_t random_region_index = E->value;
+		ERR_FAIL_UNSIGNED_INDEX_V(random_region_index, accessible_regions.size(), Vector2());
+
+		const NavRegionIteration2D &random_region = p_map_iteration.region_iterations[accessible_regions[random_region_index]];
+
+		return NavMeshQueries2D::polygons_get_random_point(random_region.navmesh_polygons, p_navigation_layers, p_uniformly);
+
+	} else {
+		uint32_t random_region_index = Math::random(int(0), accessible_regions.size() - 1);
+
+		const NavRegionIteration2D &random_region = p_map_iteration.region_iterations[accessible_regions[random_region_index]];
+
+		return NavMeshQueries2D::polygons_get_random_point(random_region.navmesh_polygons, p_navigation_layers, p_uniformly);
+	}
+}
+
+Vector2 NavMeshQueries2D::polygons_get_closest_point(const LocalVector<Polygon> &p_polygons, const Vector2 &p_point) {
+	ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
+	return cp.point;
+}
+
+ClosestPointQueryResult NavMeshQueries2D::polygons_get_closest_point_info(const LocalVector<Polygon> &p_polygons, const Vector2 &p_point) {
+	ClosestPointQueryResult result;
+	real_t closest_point_distance_squared = FLT_MAX;
+
+	// TODO: Check for further 2D improvements.
+
+	for (const Polygon &polygon : p_polygons) {
+		real_t cross = (polygon.vertices[1] - polygon.vertices[0]).cross(polygon.vertices[2] - polygon.vertices[0]);
+		Vector2 closest_on_polygon;
+		real_t closest = FLT_MAX;
+		bool inside = true;
+		Vector2 previous = polygon.vertices[polygon.vertices.size() - 1];
+		for (uint32_t point_id = 0; point_id < polygon.vertices.size(); ++point_id) {
+			Vector2 edge = polygon.vertices[point_id] - previous;
+			Vector2 to_point = p_point - previous;
+			real_t edge_to_point_cross = edge.cross(to_point);
+			bool clockwise = (edge_to_point_cross * cross) > 0;
+			// If we are not clockwise, the point will never be inside the polygon and so the closest point will be on an edge.
+			if (!clockwise) {
+				inside = false;
+				real_t point_projected_on_edge = edge.dot(to_point);
+				real_t edge_square = edge.length_squared();
+
+				if (point_projected_on_edge > edge_square) {
+					real_t distance = polygon.vertices[point_id].distance_squared_to(p_point);
+					if (distance < closest) {
+						closest_on_polygon = polygon.vertices[point_id];
+						closest = distance;
+					}
+				} else if (point_projected_on_edge < 0.0) {
+					real_t distance = previous.distance_squared_to(p_point);
+					if (distance < closest) {
+						closest_on_polygon = previous;
+						closest = distance;
+					}
+				} else {
+					// If we project on this edge, this will be the closest point.
+					real_t percent = point_projected_on_edge / edge_square;
+					closest_on_polygon = previous + percent * edge;
+					break;
+				}
+			}
+			previous = polygon.vertices[point_id];
+		}
+
+		if (inside) {
+			closest_point_distance_squared = 0.0;
+			result.point = p_point;
+			result.owner = polygon.owner->get_self();
+			break;
+		} else {
+			real_t distance = closest_on_polygon.distance_squared_to(p_point);
+			if (distance < closest_point_distance_squared) {
+				closest_point_distance_squared = distance;
+				result.point = closest_on_polygon;
+				result.owner = polygon.owner->get_self();
+			}
+		}
+	}
+
+	return result;
+}
+
+RID NavMeshQueries2D::polygons_get_closest_point_owner(const LocalVector<Polygon> &p_polygons, const Vector2 &p_point) {
+	ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
+	return cp.owner;
+}
+
+static bool _line_intersects_segment(const Vector2 &p_line_normal, real_t p_line_d, const Vector2 &p_segment_begin, const Vector2 &p_segment_end, Vector2 &r_intersection) {
+	Vector2 segment = p_segment_begin - p_segment_end;
+	real_t den = p_line_normal.dot(segment);
+
+	if (Math::is_zero_approx(den)) {
+		return false;
+	}
+
+	real_t dist = (p_line_normal.dot(p_segment_begin) - p_line_d) / den;
+
+	if (dist < (real_t)-CMP_EPSILON || dist > (1.0 + (real_t)CMP_EPSILON)) {
+		return false;
+	}
+
+	r_intersection = p_segment_begin - segment * dist;
+	return true;
+}
+
+void NavMeshQueries2D::_query_task_clip_path(NavMeshPathQueryTask2D &p_query_task, const NavigationPoly *p_from_poly, const Vector2 &p_to_point, const NavigationPoly *p_to_poly) {
+	Vector2 from = p_query_task.path_points[p_query_task.path_points.size() - 1];
+	const LocalVector<NavigationPoly> &p_navigation_polys = p_query_task.path_query_slot->path_corridor;
+
+	if (from.is_equal_approx(p_to_point)) {
+		return;
+	}
+
+	// Compute line parameters (equivalent to the Plane case in 3D).
+	const Vector2 normal = -(from - p_to_point).orthogonal().normalized();
+	const real_t d = normal.dot(from);
+
+	while (p_from_poly != p_to_poly) {
+		Vector2 pathway_start = p_from_poly->back_navigation_edge_pathway_start;
+		Vector2 pathway_end = p_from_poly->back_navigation_edge_pathway_end;
+
+		ERR_FAIL_COND(p_from_poly->back_navigation_poly_id == -1);
+		p_from_poly = &p_navigation_polys[p_from_poly->back_navigation_poly_id];
+
+		if (!pathway_start.is_equal_approx(pathway_end)) {
+			Vector2 inters;
+			if (_line_intersects_segment(normal, d, pathway_start, pathway_end, inters)) {
+				if (!inters.is_equal_approx(p_to_point) && !inters.is_equal_approx(p_query_task.path_points[p_query_task.path_points.size() - 1])) {
+					_query_task_push_back_point_with_metadata(p_query_task, inters, p_from_poly->poly);
+				}
+			}
+		}
+	}
+}
+
+bool NavMeshQueries2D::_query_task_is_connection_owner_usable(const NavMeshPathQueryTask2D &p_query_task, const NavBaseIteration2D *p_owner) {
+	bool owner_usable = true;
+
+	if ((p_query_task.navigation_layers & p_owner->get_navigation_layers()) == 0) {
+		// Not usable. No matching bit between task filter bitmask and owner bitmask.
+		owner_usable = false;
+		return owner_usable;
+	}
+
+	if (p_query_task.exclude_regions || p_query_task.include_regions) {
+		switch (p_owner->get_type()) {
+			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
+				if (p_query_task.exclude_regions && p_query_task.excluded_regions.has(p_owner->get_self())) {
+					// Not usable. Exclude region filter is active and this region is excluded.
+					owner_usable = false;
+				} else if (p_query_task.include_regions && !p_query_task.included_regions.has(p_owner->get_self())) {
+					// Not usable. Include region filter is active and this region is not included.
+					owner_usable = false;
+				}
+			} break;
+			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
+				const LocalVector<Polygon> &link_polygons = p_owner->get_navmesh_polygons();
+				if (link_polygons.size() != 2) {
+					// Not usable. Whatever this is, it is not a valid connected link.
+					owner_usable = false;
+				} else {
+					const RID link_start_region = link_polygons[0].owner->get_self();
+					const RID link_end_region = link_polygons[1].owner->get_self();
+					if (p_query_task.exclude_regions && (p_query_task.excluded_regions.has(link_start_region) || p_query_task.excluded_regions.has(link_end_region))) {
+						// Not usable. Exclude region filter is active and at least one region of the link is excluded.
+						owner_usable = false;
+					}
+					if (p_query_task.include_regions && (!p_query_task.included_regions.has(link_start_region) || !p_query_task.excluded_regions.has(link_end_region))) {
+						// Not usable. Include region filter is active and not both regions of the links are included.
+						owner_usable = false;
+					}
+				}
+			} break;
+		}
+	}
+
+	return owner_usable;
+}
+
+LocalVector<uint32_t> NavMeshQueries2D::get_simplified_path_indices(const LocalVector<Vector2> &p_path, real_t p_epsilon) {
+	p_epsilon = MAX(0.0, p_epsilon);
+	real_t squared_epsilon = p_epsilon * p_epsilon;
+
+	LocalVector<uint32_t> simplified_path_indices;
+	simplified_path_indices.reserve(p_path.size());
+	simplified_path_indices.push_back(0);
+	simplify_path_segment(0, p_path.size() - 1, p_path, squared_epsilon, simplified_path_indices);
+	simplified_path_indices.push_back(p_path.size() - 1);
+
+	return simplified_path_indices;
+}
+
+void NavMeshQueries2D::simplify_path_segment(int p_start_inx, int p_end_inx, const LocalVector<Vector2> &p_points, real_t p_epsilon, LocalVector<uint32_t> &r_simplified_path_indices) {
+	real_t point_max_distance = 0.0;
+	int point_max_index = 0;
+
+	for (int i = p_start_inx; i < p_end_inx; i++) {
+		const Vector2 &checked_point = p_points[i];
+
+		const Vector2 closest_point = Geometry2D::get_closest_point_to_segment(checked_point, p_points[p_start_inx], p_points[p_end_inx]);
+		real_t distance_squared = closest_point.distance_squared_to(checked_point);
+
+		if (distance_squared > point_max_distance) {
+			point_max_index = i;
+			point_max_distance = distance_squared;
+		}
+	}
+
+	if (point_max_distance > p_epsilon) {
+		simplify_path_segment(p_start_inx, point_max_index, p_points, p_epsilon, r_simplified_path_indices);
+		r_simplified_path_indices.push_back(point_max_index);
+		simplify_path_segment(point_max_index, p_end_inx, p_points, p_epsilon, r_simplified_path_indices);
+	}
+}
diff --git a/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.h b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.h
new file mode 100644
index 00000000..d15913ce
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/nav_mesh_queries_2d.h
@@ -0,0 +1,141 @@
+/**************************************************************************/
+/*  nav_mesh_queries_2d.h                                                 */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "../nav_utils_2d.h"
+
+#include "servers/navigation/navigation_path_query_parameters_2d.h"
+#include "servers/navigation/navigation_path_query_result_2d.h"
+#include "servers/navigation/navigation_utilities.h"
+
+using namespace NavigationUtilities;
+
+class NavMap2D;
+struct NavMapIteration2D;
+
+class NavMeshQueries2D {
+public:
+	struct PathQuerySlot {
+		LocalVector<nav_2d::NavigationPoly> path_corridor;
+		Heap<nav_2d::NavigationPoly *, nav_2d::NavPolyTravelCostGreaterThan, nav_2d::NavPolyHeapIndexer> traversable_polys;
+		bool in_use = false;
+		uint32_t slot_index = 0;
+	};
+
+	struct NavMeshPathQueryTask2D {
+		enum TaskStatus {
+			QUERY_STARTED,
+			QUERY_FINISHED,
+			QUERY_FAILED,
+			CALLBACK_DISPATCHED,
+			CALLBACK_FAILED,
+		};
+
+		// Parameters.
+		Vector2 start_position;
+		Vector2 target_position;
+		uint32_t navigation_layers;
+		BitField<PathMetadataFlags> metadata_flags = PathMetadataFlags::PATH_INCLUDE_ALL;
+		PathfindingAlgorithm pathfinding_algorithm = PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR;
+		PathPostProcessing path_postprocessing = PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL;
+		bool simplify_path = false;
+		real_t simplify_epsilon = 0.0;
+		bool exclude_regions = false;
+		bool include_regions = false;
+		LocalVector<RID> excluded_regions;
+		LocalVector<RID> included_regions;
+
+		// Path building.
+		Vector2 begin_position;
+		Vector2 end_position;
+		const nav_2d::Polygon *begin_polygon = nullptr;
+		const nav_2d::Polygon *end_polygon = nullptr;
+		uint32_t least_cost_id = 0;
+
+		// Map.
+		NavMap2D *map = nullptr;
+		PathQuerySlot *path_query_slot = nullptr;
+
+		// Path points.
+		LocalVector<Vector2> path_points;
+		LocalVector<int32_t> path_meta_point_types;
+		LocalVector<RID> path_meta_point_rids;
+		LocalVector<int64_t> path_meta_point_owners;
+
+		Ref<NavigationPathQueryParameters2D> query_parameters;
+		Ref<NavigationPathQueryResult2D> query_result;
+		Callable callback;
+		NavMeshPathQueryTask2D::TaskStatus status = NavMeshPathQueryTask2D::TaskStatus::QUERY_STARTED;
+
+		void path_clear() {
+			path_points.clear();
+			path_meta_point_types.clear();
+			path_meta_point_rids.clear();
+			path_meta_point_owners.clear();
+		}
+
+		void path_reverse() {
+			path_points.invert();
+			path_meta_point_types.invert();
+			path_meta_point_rids.invert();
+			path_meta_point_owners.invert();
+		}
+	};
+
+	static bool emit_callback(const Callable &p_callback);
+
+	static Vector2 polygons_get_random_point(const LocalVector<nav_2d::Polygon> &p_polygons, uint32_t p_navigation_layers, bool p_uniformly);
+
+	static Vector2 polygons_get_closest_point(const LocalVector<nav_2d::Polygon> &p_polygons, const Vector2 &p_point);
+	static nav_2d::ClosestPointQueryResult polygons_get_closest_point_info(const LocalVector<nav_2d::Polygon> &p_polygons, const Vector2 &p_point);
+	static RID polygons_get_closest_point_owner(const LocalVector<nav_2d::Polygon> &p_polygons, const Vector2 &p_point);
+
+	static Vector2 map_iteration_get_closest_point(const NavMapIteration2D &p_map_iteration, const Vector2 &p_point);
+	static RID map_iteration_get_closest_point_owner(const NavMapIteration2D &p_map_iteration, const Vector2 &p_point);
+	static nav_2d::ClosestPointQueryResult map_iteration_get_closest_point_info(const NavMapIteration2D &p_map_iteration, const Vector2 &p_point);
+	static Vector2 map_iteration_get_random_point(const NavMapIteration2D &p_map_iteration, uint32_t p_navigation_layers, bool p_uniformly);
+
+	static void map_query_path(NavMap2D *p_map, const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback);
+
+	static void query_task_map_iteration_get_path(NavMeshPathQueryTask2D &p_query_task, const NavMapIteration2D &p_map_iteration);
+	static void _query_task_push_back_point_with_metadata(NavMeshPathQueryTask2D &p_query_task, const Vector2 &p_point, const nav_2d::Polygon *p_point_polygon);
+	static void _query_task_find_start_end_positions(NavMeshPathQueryTask2D &p_query_task, const NavMapIteration2D &p_map_iteration);
+	static void _query_task_build_path_corridor(NavMeshPathQueryTask2D &p_query_task);
+	static void _query_task_post_process_corridorfunnel(NavMeshPathQueryTask2D &p_query_task);
+	static void _query_task_post_process_edgecentered(NavMeshPathQueryTask2D &p_query_task);
+	static void _query_task_post_process_nopostprocessing(NavMeshPathQueryTask2D &p_query_task);
+	static void _query_task_clip_path(NavMeshPathQueryTask2D &p_query_task, const nav_2d::NavigationPoly *p_from_poly, const Vector2 &p_to_point, const nav_2d::NavigationPoly *p_to_poly);
+	static void _query_task_simplified_path_points(NavMeshPathQueryTask2D &p_query_task);
+	static bool _query_task_is_connection_owner_usable(const NavMeshPathQueryTask2D &p_query_task, const NavBaseIteration2D *p_owner);
+
+	static void simplify_path_segment(int p_start_inx, int p_end_inx, const LocalVector<Vector2> &p_points, real_t p_epsilon, LocalVector<uint32_t> &r_simplified_path_indices);
+	static LocalVector<uint32_t> get_simplified_path_indices(const LocalVector<Vector2> &p_path, real_t p_epsilon);
+};
diff --git a/engine/modules/navigation_2d/2d/nav_region_iteration_2d.h b/engine/modules/navigation_2d/2d/nav_region_iteration_2d.h
new file mode 100644
index 00000000..4d50b368
--- /dev/null
+++ b/engine/modules/navigation_2d/2d/nav_region_iteration_2d.h
@@ -0,0 +1,46 @@
+/**************************************************************************/
+/*  nav_region_iteration_2d.h                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "../nav_utils_2d.h"
+#include "nav_base_iteration_2d.h"
+
+#include "core/math/rect2.h"
+
+struct NavRegionIteration2D : NavBaseIteration2D {
+	Transform2D transform;
+	real_t surface_area = 0.0;
+	Rect2 bounds;
+
+	const Transform2D &get_transform() const { return transform; }
+	real_t get_surface_area() const { return surface_area; }
+	Rect2 get_bounds() const { return bounds; }
+};
diff --git a/engine/modules/navigation_2d/SCsub b/engine/modules/navigation_2d/SCsub
new file mode 100644
index 00000000..3babb118
--- /dev/null
+++ b/engine/modules/navigation_2d/SCsub
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+Import("env_modules")
+
+env_navigation_2d = env_modules.Clone()
+
+# Thirdparty source files
+
+thirdparty_obj = []
+
+# RVO 2D Thirdparty source files
+if env["builtin_rvo2_2d"]:
+    thirdparty_dir = "#thirdparty/rvo2/rvo2_2d/"
+    thirdparty_sources = [
+        "Agent2d.cpp",
+        "Obstacle2d.cpp",
+        "KdTree2d.cpp",
+        "RVOSimulator2d.cpp",
+    ]
+    thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
+
+    env_navigation_2d.Prepend(CPPEXTPATH=[thirdparty_dir])
+
+    env_thirdparty = env_navigation_2d.Clone()
+    env_thirdparty.disable_warnings()
+    env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
+
+
+env.modules_sources += thirdparty_obj
+
+# Godot source files
+
+module_obj = []
+
+env_navigation_2d.add_source_files(module_obj, "*.cpp")
+env_navigation_2d.add_source_files(module_obj, "2d/*.cpp")
+env.modules_sources += module_obj
+
+# Needed to force rebuilding the module files when the thirdparty library is updated.
+env.Depends(module_obj, thirdparty_obj)
diff --git a/engine/modules/navigation_2d/config.py b/engine/modules/navigation_2d/config.py
new file mode 100644
index 00000000..17a84825
--- /dev/null
+++ b/engine/modules/navigation_2d/config.py
@@ -0,0 +1,6 @@
+def can_build(env, platform):
+    return not env["disable_navigation_2d"]
+
+
+def configure(env):
+    pass
diff --git a/engine/modules/navigation_2d/nav_agent_2d.cpp b/engine/modules/navigation_2d/nav_agent_2d.cpp
new file mode 100644
index 00000000..ee9deb62
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_agent_2d.cpp
@@ -0,0 +1,315 @@
+/**************************************************************************/
+/*  nav_agent_2d.cpp                                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "nav_agent_2d.h"
+
+#include "nav_map_2d.h"
+
+void NavAgent2D::set_avoidance_enabled(bool p_enabled) {
+	avoidance_enabled = p_enabled;
+	_update_rvo_agent_properties();
+}
+
+void NavAgent2D::_update_rvo_agent_properties() {
+	rvo_agent.neighborDist_ = neighbor_distance;
+	rvo_agent.maxNeighbors_ = max_neighbors;
+	rvo_agent.timeHorizon_ = time_horizon_agents;
+	rvo_agent.timeHorizonObst_ = time_horizon_obstacles;
+	rvo_agent.radius_ = radius;
+	rvo_agent.maxSpeed_ = max_speed;
+	rvo_agent.position_ = RVO2D::Vector2(position.x, position.y);
+	// Replacing the internal velocity directly causes major jitter / bugs due to unpredictable velocity jumps, left line here for testing.
+	//rvo_agent.velocity_ = RVO2D::Vector2(velocity.x, velocity.y);
+	rvo_agent.prefVelocity_ = RVO2D::Vector2(velocity.x, velocity.y);
+	rvo_agent.avoidance_layers_ = avoidance_layers;
+	rvo_agent.avoidance_mask_ = avoidance_mask;
+	rvo_agent.avoidance_priority_ = avoidance_priority;
+
+	if (map != nullptr) {
+		if (avoidance_enabled) {
+			map->set_agent_as_controlled(this);
+		} else {
+			map->remove_agent_as_controlled(this);
+		}
+	}
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_map(NavMap2D *p_map) {
+	if (map == p_map) {
+		return;
+	}
+
+	cancel_sync_request();
+
+	if (map) {
+		map->remove_agent(this);
+	}
+
+	map = p_map;
+	agent_dirty = true;
+
+	if (map) {
+		map->add_agent(this);
+		if (avoidance_enabled) {
+			map->set_agent_as_controlled(this);
+		}
+
+		request_sync();
+	}
+}
+
+bool NavAgent2D::is_map_changed() {
+	if (map) {
+		bool is_changed = map->get_iteration_id() != last_map_iteration_id;
+		last_map_iteration_id = map->get_iteration_id();
+		return is_changed;
+	} else {
+		return false;
+	}
+}
+
+void NavAgent2D::set_avoidance_callback(Callable p_callback) {
+	avoidance_callback = p_callback;
+}
+
+bool NavAgent2D::has_avoidance_callback() const {
+	return avoidance_callback.is_valid();
+}
+
+void NavAgent2D::dispatch_avoidance_callback() {
+	if (!avoidance_callback.is_valid()) {
+		return;
+	}
+
+	Vector3 new_velocity;
+
+	new_velocity = Vector3(rvo_agent.velocity_.x(), 0.0, rvo_agent.velocity_.y());
+
+	if (clamp_speed) {
+		new_velocity = new_velocity.limit_length(max_speed);
+	}
+
+	// Invoke the callback with the new velocity.
+	avoidance_callback.call(new_velocity);
+}
+
+void NavAgent2D::set_neighbor_distance(real_t p_neighbor_distance) {
+	neighbor_distance = p_neighbor_distance;
+	rvo_agent.neighborDist_ = neighbor_distance;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_max_neighbors(int p_max_neighbors) {
+	max_neighbors = p_max_neighbors;
+	rvo_agent.maxNeighbors_ = max_neighbors;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_time_horizon_agents(real_t p_time_horizon) {
+	time_horizon_agents = p_time_horizon;
+	rvo_agent.timeHorizon_ = time_horizon_agents;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_time_horizon_obstacles(real_t p_time_horizon) {
+	time_horizon_obstacles = p_time_horizon;
+	rvo_agent.timeHorizonObst_ = time_horizon_obstacles;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_radius(real_t p_radius) {
+	radius = p_radius;
+	rvo_agent.radius_ = radius;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_max_speed(real_t p_max_speed) {
+	max_speed = p_max_speed;
+	if (avoidance_enabled) {
+		rvo_agent.maxSpeed_ = max_speed;
+	}
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_position(const Vector2 &p_position) {
+	position = p_position;
+	if (avoidance_enabled) {
+		rvo_agent.position_ = RVO2D::Vector2(p_position.x, p_position.y);
+	}
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_target_position(const Vector2 &p_target_position) {
+	target_position = p_target_position;
+}
+
+void NavAgent2D::set_velocity(const Vector2 &p_velocity) {
+	// Sets the "wanted" velocity for an agent as a suggestion
+	// This velocity is not guaranteed, RVO simulation will only try to fulfill it
+	velocity = p_velocity;
+	if (avoidance_enabled) {
+		rvo_agent.prefVelocity_ = RVO2D::Vector2(velocity.x, velocity.y);
+	}
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_velocity_forced(const Vector2 &p_velocity) {
+	// This function replaces the internal rvo simulation velocity
+	// should only be used after the agent was teleported
+	// as it destroys consistency in movement in cramped situations
+	// use velocity instead to update with a safer "suggestion"
+	velocity_forced = p_velocity;
+	if (avoidance_enabled) {
+		rvo_agent.velocity_ = RVO2D::Vector2(p_velocity.x, p_velocity.y);
+	}
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::update() {
+	// Updates this agent with the calculated results from the rvo simulation
+	if (avoidance_enabled) {
+		velocity = Vector2(rvo_agent.velocity_.x(), rvo_agent.velocity_.y());
+	}
+}
+
+void NavAgent2D::set_avoidance_mask(uint32_t p_mask) {
+	avoidance_mask = p_mask;
+	rvo_agent.avoidance_mask_ = avoidance_mask;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_avoidance_layers(uint32_t p_layers) {
+	avoidance_layers = p_layers;
+	rvo_agent.avoidance_layers_ = avoidance_layers;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+void NavAgent2D::set_avoidance_priority(real_t p_priority) {
+	ERR_FAIL_COND_MSG(p_priority < 0.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
+	ERR_FAIL_COND_MSG(p_priority > 1.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
+	avoidance_priority = p_priority;
+	rvo_agent.avoidance_priority_ = avoidance_priority;
+	agent_dirty = true;
+
+	request_sync();
+}
+
+bool NavAgent2D::is_dirty() const {
+	return agent_dirty;
+}
+
+void NavAgent2D::sync() {
+	agent_dirty = false;
+}
+
+const Dictionary NavAgent2D::get_avoidance_data() const {
+	// Returns debug data from RVO simulation internals of this agent.
+	Dictionary _avoidance_data;
+
+	_avoidance_data["max_neighbors"] = int(rvo_agent.maxNeighbors_);
+	_avoidance_data["max_speed"] = float(rvo_agent.maxSpeed_);
+	_avoidance_data["neighbor_distance"] = float(rvo_agent.neighborDist_);
+	_avoidance_data["new_velocity"] = Vector2(rvo_agent.newVelocity_.x(), rvo_agent.newVelocity_.y());
+	_avoidance_data["velocity"] = Vector2(rvo_agent.velocity_.x(), rvo_agent.velocity_.y());
+	_avoidance_data["position"] = Vector2(rvo_agent.position_.x(), rvo_agent.position_.y());
+	_avoidance_data["preferred_velocity"] = Vector2(rvo_agent.prefVelocity_.x(), rvo_agent.prefVelocity_.y());
+	_avoidance_data["radius"] = float(rvo_agent.radius_);
+	_avoidance_data["time_horizon_agents"] = float(rvo_agent.timeHorizon_);
+	_avoidance_data["time_horizon_obstacles"] = float(rvo_agent.timeHorizonObst_);
+	_avoidance_data["avoidance_layers"] = int(rvo_agent.avoidance_layers_);
+	_avoidance_data["avoidance_mask"] = int(rvo_agent.avoidance_mask_);
+	_avoidance_data["avoidance_priority"] = float(rvo_agent.avoidance_priority_);
+	return _avoidance_data;
+}
+
+void NavAgent2D::set_paused(bool p_paused) {
+	if (paused == p_paused) {
+		return;
+	}
+
+	paused = p_paused;
+
+	if (map) {
+		if (paused) {
+			map->remove_agent_as_controlled(this);
+		} else {
+			map->set_agent_as_controlled(this);
+		}
+	}
+}
+
+bool NavAgent2D::get_paused() const {
+	return paused;
+}
+
+void NavAgent2D::request_sync() {
+	if (map && !sync_dirty_request_list_element.in_list()) {
+		map->add_agent_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+void NavAgent2D::cancel_sync_request() {
+	if (map && sync_dirty_request_list_element.in_list()) {
+		map->remove_agent_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+NavAgent2D::NavAgent2D() :
+		sync_dirty_request_list_element(this) {
+}
+
+NavAgent2D::~NavAgent2D() {
+	cancel_sync_request();
+}
diff --git a/engine/modules/navigation_2d/nav_agent_2d.h b/engine/modules/navigation_2d/nav_agent_2d.h
new file mode 100644
index 00000000..cc000f36
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_agent_2d.h
@@ -0,0 +1,148 @@
+/**************************************************************************/
+/*  nav_agent_2d.h                                                        */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "nav_rid_2d.h"
+
+#include "core/object/class_db.h"
+#include "core/templates/self_list.h"
+
+#include <Agent2d.h>
+
+class NavMap2D;
+
+class NavAgent2D : public NavRid2D {
+	Vector2 position;
+	Vector2 target_position;
+	Vector2 velocity;
+	Vector2 velocity_forced;
+	real_t radius = 1.0;
+	real_t max_speed = 1.0;
+	real_t time_horizon_agents = 1.0;
+	real_t time_horizon_obstacles = 0.0;
+	int max_neighbors = 5;
+	real_t neighbor_distance = 5.0;
+	Vector2 safe_velocity;
+	bool clamp_speed = true; // Experimental, clamps velocity to max_speed.
+
+	NavMap2D *map = nullptr;
+
+	RVO2D::Agent2D rvo_agent;
+	bool avoidance_enabled = false;
+
+	uint32_t avoidance_layers = 1;
+	uint32_t avoidance_mask = 1;
+	real_t avoidance_priority = 1.0;
+
+	Callable avoidance_callback;
+
+	bool agent_dirty = true;
+
+	uint32_t last_map_iteration_id = 0;
+	bool paused = false;
+
+	SelfList<NavAgent2D> sync_dirty_request_list_element;
+
+public:
+	NavAgent2D();
+	~NavAgent2D();
+
+	void set_avoidance_enabled(bool p_enabled);
+	bool is_avoidance_enabled() { return avoidance_enabled; }
+
+	void set_map(NavMap2D *p_map);
+	NavMap2D *get_map() { return map; }
+
+	bool is_map_changed();
+
+	RVO2D::Agent2D *get_rvo_agent() { return &rvo_agent; }
+
+	void set_avoidance_callback(Callable p_callback);
+	bool has_avoidance_callback() const;
+
+	void dispatch_avoidance_callback();
+
+	void set_neighbor_distance(real_t p_neighbor_distance);
+	real_t get_neighbor_distance() const { return neighbor_distance; }
+
+	void set_max_neighbors(int p_max_neighbors);
+	int get_max_neighbors() const { return max_neighbors; }
+
+	void set_time_horizon_agents(real_t p_time_horizon);
+	real_t get_time_horizon_agents() const { return time_horizon_agents; }
+
+	void set_time_horizon_obstacles(real_t p_time_horizon);
+	real_t get_time_horizon_obstacles() const { return time_horizon_obstacles; }
+
+	void set_radius(real_t p_radius);
+	real_t get_radius() const { return radius; }
+
+	void set_max_speed(real_t p_max_speed);
+	real_t get_max_speed() const { return max_speed; }
+
+	void set_position(const Vector2 &p_position);
+	Vector2 get_position() const { return position; }
+
+	void set_target_position(const Vector2 &p_target_position);
+	Vector2 get_target_position() const { return target_position; }
+
+	void set_velocity(const Vector2 &p_velocity);
+	Vector2 get_velocity() const { return velocity; }
+
+	void set_velocity_forced(const Vector2 &p_velocity);
+	Vector2 get_velocity_forced() const { return velocity_forced; }
+
+	void set_avoidance_layers(uint32_t p_layers);
+	uint32_t get_avoidance_layers() const { return avoidance_layers; }
+
+	void set_avoidance_mask(uint32_t p_mask);
+	uint32_t get_avoidance_mask() const { return avoidance_mask; }
+
+	void set_avoidance_priority(real_t p_priority);
+	real_t get_avoidance_priority() const { return avoidance_priority; }
+
+	void set_paused(bool p_paused);
+	bool get_paused() const;
+
+	bool is_dirty() const;
+	void sync();
+	void request_sync();
+	void cancel_sync_request();
+
+	// Updates this agent with rvo data after the rvo simulation avoidance step.
+	void update();
+
+	// RVO debug data from the last frame update.
+	const Dictionary get_avoidance_data() const;
+
+private:
+	void _update_rvo_agent_properties();
+};
diff --git a/engine/modules/navigation/nav_base.h b/engine/modules/navigation_2d/nav_base_2d.h
similarity index 92%
rename from engine/modules/navigation/nav_base.h
rename to engine/modules/navigation_2d/nav_base_2d.h
index 23ecea90..ef0e1907 100644
--- a/engine/modules/navigation/nav_base.h
+++ b/engine/modules/navigation_2d/nav_base_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_base.h                                                            */
+/*  nav_base_2d.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_BASE_H
-#define NAV_BASE_H
+#pragma once
 
-#include "nav_rid.h"
-#include "nav_utils.h"
+#include "nav_rid_2d.h"
+#include "nav_utils_2d.h"
 
 #include "servers/navigation/navigation_utilities.h"
 
-class NavMap;
+class NavMap2D;
 
-class NavBase : public NavRid {
+class NavBase2D : public NavRid2D {
 protected:
 	uint32_t navigation_layers = 1;
 	real_t enter_cost = 0.0;
@@ -64,7 +63,5 @@ public:
 	virtual void set_owner_id(ObjectID p_owner_id) {}
 	ObjectID get_owner_id() const { return owner_id; }
 
-	virtual ~NavBase() {}
+	virtual ~NavBase2D() {}
 };
-
-#endif // NAV_BASE_H
diff --git a/engine/modules/navigation_2d/nav_link_2d.cpp b/engine/modules/navigation_2d/nav_link_2d.cpp
new file mode 100644
index 00000000..ecbc594e
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_link_2d.cpp
@@ -0,0 +1,180 @@
+/**************************************************************************/
+/*  nav_link_2d.cpp                                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "nav_link_2d.h"
+
+#include "nav_map_2d.h"
+
+void NavLink2D::set_map(NavMap2D *p_map) {
+	if (map == p_map) {
+		return;
+	}
+
+	cancel_sync_request();
+
+	if (map) {
+		map->remove_link(this);
+	}
+
+	map = p_map;
+	link_dirty = true;
+
+	if (map) {
+		map->add_link(this);
+		request_sync();
+	}
+}
+
+void NavLink2D::set_enabled(bool p_enabled) {
+	if (enabled == p_enabled) {
+		return;
+	}
+	enabled = p_enabled;
+
+	// TODO: This should not require a full rebuild as the link has not really changed.
+	link_dirty = true;
+
+	request_sync();
+}
+
+void NavLink2D::set_bidirectional(bool p_bidirectional) {
+	if (bidirectional == p_bidirectional) {
+		return;
+	}
+	bidirectional = p_bidirectional;
+	link_dirty = true;
+
+	request_sync();
+}
+
+void NavLink2D::set_start_position(const Vector2 &p_position) {
+	if (start_position == p_position) {
+		return;
+	}
+	start_position = p_position;
+	link_dirty = true;
+
+	request_sync();
+}
+
+void NavLink2D::set_end_position(const Vector2 &p_position) {
+	if (end_position == p_position) {
+		return;
+	}
+	end_position = p_position;
+	link_dirty = true;
+
+	request_sync();
+}
+
+void NavLink2D::set_navigation_layers(uint32_t p_navigation_layers) {
+	if (navigation_layers == p_navigation_layers) {
+		return;
+	}
+	navigation_layers = p_navigation_layers;
+	link_dirty = true;
+
+	request_sync();
+}
+
+void NavLink2D::set_enter_cost(real_t p_enter_cost) {
+	real_t new_enter_cost = MAX(p_enter_cost, 0.0);
+	if (enter_cost == new_enter_cost) {
+		return;
+	}
+	enter_cost = new_enter_cost;
+	link_dirty = true;
+
+	request_sync();
+}
+
+void NavLink2D::set_travel_cost(real_t p_travel_cost) {
+	real_t new_travel_cost = MAX(p_travel_cost, 0.0);
+	if (travel_cost == new_travel_cost) {
+		return;
+	}
+	travel_cost = new_travel_cost;
+	link_dirty = true;
+
+	request_sync();
+}
+
+void NavLink2D::set_owner_id(ObjectID p_owner_id) {
+	if (owner_id == p_owner_id) {
+		return;
+	}
+	owner_id = p_owner_id;
+	link_dirty = true;
+
+	request_sync();
+}
+
+bool NavLink2D::is_dirty() const {
+	return link_dirty;
+}
+
+void NavLink2D::sync() {
+	link_dirty = false;
+}
+
+void NavLink2D::request_sync() {
+	if (map && !sync_dirty_request_list_element.in_list()) {
+		map->add_link_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+void NavLink2D::cancel_sync_request() {
+	if (map && sync_dirty_request_list_element.in_list()) {
+		map->remove_link_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+NavLink2D::NavLink2D() :
+		sync_dirty_request_list_element(this) {
+	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
+}
+
+NavLink2D::~NavLink2D() {
+	cancel_sync_request();
+}
+
+void NavLink2D::get_iteration_update(NavLinkIteration2D &r_iteration) {
+	r_iteration.navigation_layers = get_navigation_layers();
+	r_iteration.enter_cost = get_enter_cost();
+	r_iteration.travel_cost = get_travel_cost();
+	r_iteration.owner_object_id = get_owner_id();
+	r_iteration.owner_type = get_type();
+	r_iteration.owner_rid = get_self();
+
+	r_iteration.enabled = get_enabled();
+	r_iteration.start_position = get_start_position();
+	r_iteration.end_position = get_end_position();
+	r_iteration.bidirectional = is_bidirectional();
+}
diff --git a/engine/modules/navigation_2d/nav_link_2d.h b/engine/modules/navigation_2d/nav_link_2d.h
new file mode 100644
index 00000000..1d324e1e
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_link_2d.h
@@ -0,0 +1,99 @@
+/**************************************************************************/
+/*  nav_link_2d.h                                                         */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "2d/nav_base_iteration_2d.h"
+#include "nav_base_2d.h"
+#include "nav_utils_2d.h"
+
+struct NavLinkIteration2D : NavBaseIteration2D {
+	bool bidirectional = true;
+	Vector2 start_position;
+	Vector2 end_position;
+
+	Vector2 get_start_position() const { return start_position; }
+	Vector2 get_end_position() const { return end_position; }
+	bool is_bidirectional() const { return bidirectional; }
+};
+
+#include "core/templates/self_list.h"
+
+class NavLink2D : public NavBase2D {
+	NavMap2D *map = nullptr;
+	bool bidirectional = true;
+	Vector2 start_position;
+	Vector2 end_position;
+	bool enabled = true;
+
+	bool link_dirty = true;
+
+	SelfList<NavLink2D> sync_dirty_request_list_element;
+
+public:
+	NavLink2D();
+	~NavLink2D();
+
+	void set_map(NavMap2D *p_map);
+	NavMap2D *get_map() const {
+		return map;
+	}
+
+	void set_enabled(bool p_enabled);
+	bool get_enabled() const { return enabled; }
+
+	void set_bidirectional(bool p_bidirectional);
+	bool is_bidirectional() const {
+		return bidirectional;
+	}
+
+	void set_start_position(const Vector2 &p_position);
+	Vector2 get_start_position() const {
+		return start_position;
+	}
+
+	void set_end_position(const Vector2 &p_position);
+	Vector2 get_end_position() const {
+		return end_position;
+	}
+
+	// NavBase properties.
+	virtual void set_navigation_layers(uint32_t p_navigation_layers) override;
+	virtual void set_enter_cost(real_t p_enter_cost) override;
+	virtual void set_travel_cost(real_t p_travel_cost) override;
+	virtual void set_owner_id(ObjectID p_owner_id) override;
+
+	bool is_dirty() const;
+	void sync();
+	void request_sync();
+	void cancel_sync_request();
+
+	void get_iteration_update(NavLinkIteration2D &r_iteration);
+};
diff --git a/engine/modules/navigation_2d/nav_map_2d.cpp b/engine/modules/navigation_2d/nav_map_2d.cpp
new file mode 100644
index 00000000..9673f486
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_map_2d.cpp
@@ -0,0 +1,768 @@
+/**************************************************************************/
+/*  nav_map_2d.cpp                                                        */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "nav_map_2d.h"
+
+#include "2d/nav_map_builder_2d.h"
+#include "2d/nav_mesh_queries_2d.h"
+#include "2d/nav_region_iteration_2d.h"
+#include "nav_agent_2d.h"
+#include "nav_link_2d.h"
+#include "nav_obstacle_2d.h"
+#include "nav_region_2d.h"
+
+#include "core/config/project_settings.h"
+#include "core/object/worker_thread_pool.h"
+
+#include <Obstacle2d.h>
+
+using namespace nav_2d;
+
+#ifdef DEBUG_ENABLED
+#define NAVMAP_ITERATION_ZERO_ERROR_MSG() \
+	ERR_PRINT_ONCE("NavigationServer navigation map query failed because it was made before first map synchronization.\n\
+	NavigationServer 'map_changed' signal can be used to receive update notifications.\n\
+	NavigationServer 'map_get_iteration_id()' can be used to check if a map has finished its newest iteration.");
+#else
+#define NAVMAP_ITERATION_ZERO_ERROR_MSG()
+#endif // DEBUG_ENABLED
+
+#define GET_MAP_ITERATION()                                                   \
+	iteration_slot_rwlock.read_lock();                                        \
+	NavMapIteration2D &map_iteration = iteration_slots[iteration_slot_index]; \
+	NavMapIterationRead2D iteration_read_lock(map_iteration);                 \
+	iteration_slot_rwlock.read_unlock();
+
+#define GET_MAP_ITERATION_CONST()                                                   \
+	iteration_slot_rwlock.read_lock();                                              \
+	const NavMapIteration2D &map_iteration = iteration_slots[iteration_slot_index]; \
+	NavMapIterationRead2D iteration_read_lock(map_iteration);                       \
+	iteration_slot_rwlock.read_unlock();
+
+void NavMap2D::set_cell_size(real_t p_cell_size) {
+	if (cell_size == p_cell_size) {
+		return;
+	}
+	cell_size = MAX(p_cell_size, NavigationDefaults2D::navmesh_cell_size_min);
+	_update_merge_rasterizer_cell_dimensions();
+	map_settings_dirty = true;
+}
+
+void NavMap2D::set_merge_rasterizer_cell_scale(float p_value) {
+	if (merge_rasterizer_cell_scale == p_value) {
+		return;
+	}
+	merge_rasterizer_cell_scale = MAX(p_value, NavigationDefaults2D::navmesh_cell_size_min);
+	_update_merge_rasterizer_cell_dimensions();
+	map_settings_dirty = true;
+}
+
+void NavMap2D::set_use_edge_connections(bool p_enabled) {
+	if (use_edge_connections == p_enabled) {
+		return;
+	}
+	use_edge_connections = p_enabled;
+	iteration_dirty = true;
+}
+
+void NavMap2D::set_edge_connection_margin(real_t p_edge_connection_margin) {
+	if (edge_connection_margin == p_edge_connection_margin) {
+		return;
+	}
+	edge_connection_margin = p_edge_connection_margin;
+	iteration_dirty = true;
+}
+
+void NavMap2D::set_link_connection_radius(real_t p_link_connection_radius) {
+	if (link_connection_radius == p_link_connection_radius) {
+		return;
+	}
+	link_connection_radius = p_link_connection_radius;
+	iteration_dirty = true;
+}
+
+Vector2 NavMap2D::get_merge_rasterizer_cell_size() const {
+	return merge_rasterizer_cell_size;
+}
+
+PointKey NavMap2D::get_point_key(const Vector2 &p_pos) const {
+	const int x = static_cast<int>(Math::floor(p_pos.x / merge_rasterizer_cell_size.x));
+	const int y = static_cast<int>(Math::floor(p_pos.y / merge_rasterizer_cell_size.y));
+
+	PointKey p;
+	p.key = 0;
+	p.x = x;
+	p.y = y;
+	return p;
+}
+
+void NavMap2D::query_path(NavMeshQueries2D::NavMeshPathQueryTask2D &p_query_task) {
+	if (iteration_id == 0) {
+		return;
+	}
+
+	GET_MAP_ITERATION();
+
+	map_iteration.path_query_slots_semaphore.wait();
+
+	map_iteration.path_query_slots_mutex.lock();
+	for (NavMeshQueries2D::PathQuerySlot &p_path_query_slot : map_iteration.path_query_slots) {
+		if (!p_path_query_slot.in_use) {
+			p_path_query_slot.in_use = true;
+			p_query_task.path_query_slot = &p_path_query_slot;
+			break;
+		}
+	}
+	map_iteration.path_query_slots_mutex.unlock();
+
+	if (p_query_task.path_query_slot == nullptr) {
+		map_iteration.path_query_slots_semaphore.post();
+		ERR_FAIL_NULL_MSG(p_query_task.path_query_slot, "No unused NavMap2D path query slot found! This should never happen :(.");
+	}
+
+	NavMeshQueries2D::query_task_map_iteration_get_path(p_query_task, map_iteration);
+
+	map_iteration.path_query_slots_mutex.lock();
+	uint32_t used_slot_index = p_query_task.path_query_slot->slot_index;
+	map_iteration.path_query_slots[used_slot_index].in_use = false;
+	p_query_task.path_query_slot = nullptr;
+	map_iteration.path_query_slots_mutex.unlock();
+
+	map_iteration.path_query_slots_semaphore.post();
+}
+
+Vector2 NavMap2D::get_closest_point(const Vector2 &p_point) const {
+	if (iteration_id == 0) {
+		NAVMAP_ITERATION_ZERO_ERROR_MSG();
+		return Vector2();
+	}
+
+	GET_MAP_ITERATION_CONST();
+
+	return NavMeshQueries2D::map_iteration_get_closest_point(map_iteration, p_point);
+}
+
+RID NavMap2D::get_closest_point_owner(const Vector2 &p_point) const {
+	if (iteration_id == 0) {
+		NAVMAP_ITERATION_ZERO_ERROR_MSG();
+		return RID();
+	}
+
+	GET_MAP_ITERATION_CONST();
+
+	return NavMeshQueries2D::map_iteration_get_closest_point_owner(map_iteration, p_point);
+}
+
+ClosestPointQueryResult NavMap2D::get_closest_point_info(const Vector2 &p_point) const {
+	GET_MAP_ITERATION_CONST();
+
+	return NavMeshQueries2D::map_iteration_get_closest_point_info(map_iteration, p_point);
+}
+
+void NavMap2D::add_region(NavRegion2D *p_region) {
+	regions.push_back(p_region);
+	iteration_dirty = true;
+}
+
+void NavMap2D::remove_region(NavRegion2D *p_region) {
+	if (regions.erase_unordered(p_region)) {
+		iteration_dirty = true;
+	}
+}
+
+void NavMap2D::add_link(NavLink2D *p_link) {
+	links.push_back(p_link);
+	iteration_dirty = true;
+}
+
+void NavMap2D::remove_link(NavLink2D *p_link) {
+	if (links.erase_unordered(p_link)) {
+		iteration_dirty = true;
+	}
+}
+
+bool NavMap2D::has_agent(NavAgent2D *p_agent) const {
+	return agents.has(p_agent);
+}
+
+void NavMap2D::add_agent(NavAgent2D *p_agent) {
+	if (!has_agent(p_agent)) {
+		agents.push_back(p_agent);
+		agents_dirty = true;
+	}
+}
+
+void NavMap2D::remove_agent(NavAgent2D *p_agent) {
+	remove_agent_as_controlled(p_agent);
+	if (agents.erase_unordered(p_agent)) {
+		agents_dirty = true;
+	}
+}
+
+bool NavMap2D::has_obstacle(NavObstacle2D *p_obstacle) const {
+	return obstacles.has(p_obstacle);
+}
+
+void NavMap2D::add_obstacle(NavObstacle2D *p_obstacle) {
+	if (p_obstacle->get_paused()) {
+		// No point in adding a paused obstacle, it will add itself when unpaused again.
+		return;
+	}
+
+	if (!has_obstacle(p_obstacle)) {
+		obstacles.push_back(p_obstacle);
+		obstacles_dirty = true;
+	}
+}
+
+void NavMap2D::remove_obstacle(NavObstacle2D *p_obstacle) {
+	if (obstacles.erase_unordered(p_obstacle)) {
+		obstacles_dirty = true;
+	}
+}
+
+void NavMap2D::set_agent_as_controlled(NavAgent2D *p_agent) {
+	remove_agent_as_controlled(p_agent);
+
+	if (p_agent->get_paused()) {
+		// No point in adding a paused agent, it will add itself when unpaused again.
+		return;
+	}
+
+	int64_t agent_index = active_avoidance_agents.find(p_agent);
+	if (agent_index < 0) {
+		active_avoidance_agents.push_back(p_agent);
+		agents_dirty = true;
+	}
+}
+
+void NavMap2D::remove_agent_as_controlled(NavAgent2D *p_agent) {
+	if (active_avoidance_agents.erase_unordered(p_agent)) {
+		agents_dirty = true;
+	}
+}
+
+Vector2 NavMap2D::get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const {
+	GET_MAP_ITERATION_CONST();
+
+	return NavMeshQueries2D::map_iteration_get_random_point(map_iteration, p_navigation_layers, p_uniformly);
+}
+
+void NavMap2D::_build_iteration() {
+	if (!iteration_dirty || iteration_building || iteration_ready) {
+		return;
+	}
+
+	// Get the next free iteration slot that should be potentially unused.
+	iteration_slot_rwlock.read_lock();
+	NavMapIteration2D &next_map_iteration = iteration_slots[(iteration_slot_index + 1) % 2];
+	// Check if the iteration slot is truly free or still used by an external thread.
+	bool iteration_is_free = next_map_iteration.users.get() == 0;
+	iteration_slot_rwlock.read_unlock();
+
+	if (!iteration_is_free) {
+		// A long running pathfinding thread or something is still reading
+		// from this older iteration and needs to finish first.
+		// Return and wait for the next sync cycle to check again.
+		return;
+	}
+
+	// Iteration slot is free and no longer used by anything, let's build.
+
+	iteration_dirty = false;
+	iteration_building = true;
+	iteration_ready = false;
+
+	// We don't need to hold any lock because at this point nothing else can touch it.
+	// All new queries are already forwarded to the other iteration slot.
+
+	iteration_build.reset();
+
+	iteration_build.merge_rasterizer_cell_size = get_merge_rasterizer_cell_size();
+	iteration_build.use_edge_connections = get_use_edge_connections();
+	iteration_build.edge_connection_margin = get_edge_connection_margin();
+	iteration_build.link_connection_radius = get_link_connection_radius();
+
+	uint32_t enabled_region_count = 0;
+	uint32_t enabled_link_count = 0;
+
+	for (NavRegion2D *region : regions) {
+		if (!region->get_enabled()) {
+			continue;
+		}
+		enabled_region_count++;
+	}
+	for (NavLink2D *link : links) {
+		if (!link->get_enabled()) {
+			continue;
+		}
+		enabled_link_count++;
+	}
+
+	next_map_iteration.region_ptr_to_region_id.clear();
+
+	next_map_iteration.region_iterations.clear();
+	next_map_iteration.link_iterations.clear();
+
+	next_map_iteration.region_iterations.resize(enabled_region_count);
+	next_map_iteration.link_iterations.resize(enabled_link_count);
+
+	uint32_t region_id_count = 0;
+	uint32_t link_id_count = 0;
+
+	for (NavRegion2D *region : regions) {
+		if (!region->get_enabled()) {
+			continue;
+		}
+		NavRegionIteration2D &region_iteration = next_map_iteration.region_iterations[region_id_count];
+		region_iteration.id = region_id_count++;
+		region->get_iteration_update(region_iteration);
+		next_map_iteration.region_ptr_to_region_id[region] = (uint32_t)region_iteration.id;
+	}
+	for (NavLink2D *link : links) {
+		if (!link->get_enabled()) {
+			continue;
+		}
+		NavLinkIteration2D &link_iteration = next_map_iteration.link_iterations[link_id_count];
+		link_iteration.id = link_id_count++;
+		link->get_iteration_update(link_iteration);
+	}
+
+	iteration_build.map_iteration = &next_map_iteration;
+
+	if (use_async_iterations) {
+		iteration_build_thread_task_id = WorkerThreadPool::get_singleton()->add_native_task(&NavMap2D::_build_iteration_threaded, &iteration_build, true, SNAME("NavMapBuilder2D"));
+	} else {
+		NavMapBuilder2D::build_navmap_iteration(iteration_build);
+
+		iteration_building = false;
+		iteration_ready = true;
+	}
+}
+
+void NavMap2D::_build_iteration_threaded(void *p_arg) {
+	NavMapIterationBuild2D *_iteration_build = static_cast<NavMapIterationBuild2D *>(p_arg);
+
+	NavMapBuilder2D::build_navmap_iteration(*_iteration_build);
+}
+
+void NavMap2D::_sync_iteration() {
+	if (iteration_building || !iteration_ready) {
+		return;
+	}
+
+	performance_data.pm_polygon_count = iteration_build.performance_data.pm_polygon_count;
+	performance_data.pm_edge_count = iteration_build.performance_data.pm_edge_count;
+	performance_data.pm_edge_merge_count = iteration_build.performance_data.pm_edge_merge_count;
+	performance_data.pm_edge_connection_count = iteration_build.performance_data.pm_edge_connection_count;
+	performance_data.pm_edge_free_count = iteration_build.performance_data.pm_edge_free_count;
+
+	iteration_id = iteration_id % UINT32_MAX + 1;
+
+	// Finally ping-pong switch the iteration slot.
+	iteration_slot_rwlock.write_lock();
+	uint32_t next_iteration_slot_index = (iteration_slot_index + 1) % 2;
+	iteration_slot_index = next_iteration_slot_index;
+	iteration_slot_rwlock.write_unlock();
+
+	iteration_ready = false;
+}
+
+void NavMap2D::sync() {
+	// Performance Monitor.
+	performance_data.pm_region_count = regions.size();
+	performance_data.pm_agent_count = agents.size();
+	performance_data.pm_link_count = links.size();
+	performance_data.pm_obstacle_count = obstacles.size();
+
+	_sync_dirty_map_update_requests();
+
+	if (iteration_dirty && !iteration_building && !iteration_ready) {
+		_build_iteration();
+	}
+	if (use_async_iterations && iteration_build_thread_task_id != WorkerThreadPool::INVALID_TASK_ID) {
+		if (WorkerThreadPool::get_singleton()->is_task_completed(iteration_build_thread_task_id)) {
+			WorkerThreadPool::get_singleton()->wait_for_task_completion(iteration_build_thread_task_id);
+
+			iteration_build_thread_task_id = WorkerThreadPool::INVALID_TASK_ID;
+			iteration_building = false;
+			iteration_ready = true;
+		}
+	}
+	if (iteration_ready) {
+		_sync_iteration();
+	}
+
+	map_settings_dirty = false;
+
+	_sync_avoidance();
+}
+
+void NavMap2D::_sync_avoidance() {
+	_sync_dirty_avoidance_update_requests();
+
+	if (obstacles_dirty || agents_dirty) {
+		_update_rvo_simulation();
+	}
+
+	obstacles_dirty = false;
+	agents_dirty = false;
+}
+
+void NavMap2D::_update_rvo_obstacles_tree() {
+	int obstacle_vertex_count = 0;
+	for (NavObstacle2D *obstacle : obstacles) {
+		obstacle_vertex_count += obstacle->get_vertices().size();
+	}
+
+	// Cleaning old obstacles.
+	for (size_t i = 0; i < rvo_simulation.obstacles_.size(); ++i) {
+		delete rvo_simulation.obstacles_[i];
+	}
+	rvo_simulation.obstacles_.clear();
+
+	// Cannot use LocalVector here as RVO library expects std::vector to build KdTree
+	std::vector<RVO2D::Obstacle2D *> &raw_obstacles = rvo_simulation.obstacles_;
+	raw_obstacles.reserve(obstacle_vertex_count);
+
+	// The following block is modified copy from RVO2D::AddObstacle()
+	// Obstacles are linked and depend on all other obstacles.
+	for (NavObstacle2D *obstacle : obstacles) {
+		const Vector2 &_obstacle_position = obstacle->get_position();
+		const Vector<Vector2> &_obstacle_vertices = obstacle->get_vertices();
+
+		if (_obstacle_vertices.size() < 2) {
+			continue;
+		}
+
+		std::vector<RVO2D::Vector2> rvo_vertices;
+		rvo_vertices.reserve(_obstacle_vertices.size());
+
+		uint32_t _obstacle_avoidance_layers = obstacle->get_avoidance_layers();
+
+		for (const Vector2 &_obstacle_vertex : _obstacle_vertices) {
+			rvo_vertices.push_back(RVO2D::Vector2(_obstacle_vertex.x + _obstacle_position.x, _obstacle_vertex.y + _obstacle_position.y));
+		}
+
+		const size_t obstacleNo = raw_obstacles.size();
+
+		for (size_t i = 0; i < rvo_vertices.size(); i++) {
+			RVO2D::Obstacle2D *rvo_obstacle = new RVO2D::Obstacle2D();
+			rvo_obstacle->point_ = rvo_vertices[i];
+
+			rvo_obstacle->avoidance_layers_ = _obstacle_avoidance_layers;
+
+			if (i != 0) {
+				rvo_obstacle->prevObstacle_ = raw_obstacles.back();
+				rvo_obstacle->prevObstacle_->nextObstacle_ = rvo_obstacle;
+			}
+
+			if (i == rvo_vertices.size() - 1) {
+				rvo_obstacle->nextObstacle_ = raw_obstacles[obstacleNo];
+				rvo_obstacle->nextObstacle_->prevObstacle_ = rvo_obstacle;
+			}
+
+			rvo_obstacle->unitDir_ = normalize(rvo_vertices[(i == rvo_vertices.size() - 1 ? 0 : i + 1)] - rvo_vertices[i]);
+
+			if (rvo_vertices.size() == 2) {
+				rvo_obstacle->isConvex_ = true;
+			} else {
+				rvo_obstacle->isConvex_ = (leftOf(rvo_vertices[(i == 0 ? rvo_vertices.size() - 1 : i - 1)], rvo_vertices[i], rvo_vertices[(i == rvo_vertices.size() - 1 ? 0 : i + 1)]) >= 0.0f);
+			}
+
+			rvo_obstacle->id_ = raw_obstacles.size();
+
+			raw_obstacles.push_back(rvo_obstacle);
+		}
+	}
+
+	rvo_simulation.kdTree_->buildObstacleTree(raw_obstacles);
+}
+
+void NavMap2D::_update_rvo_agents_tree() {
+	// Cannot use LocalVector here as RVO library expects std::vector to build KdTree.
+	std::vector<RVO2D::Agent2D *> raw_agents;
+	raw_agents.reserve(active_avoidance_agents.size());
+	for (NavAgent2D *agent : active_avoidance_agents) {
+		raw_agents.push_back(agent->get_rvo_agent());
+	}
+	rvo_simulation.kdTree_->buildAgentTree(raw_agents);
+}
+
+void NavMap2D::_update_rvo_simulation() {
+	if (obstacles_dirty) {
+		_update_rvo_obstacles_tree();
+	}
+	if (agents_dirty) {
+		_update_rvo_agents_tree();
+	}
+}
+
+void NavMap2D::compute_single_avoidance_step(uint32_t p_index, NavAgent2D **p_agent) {
+	(*(p_agent + p_index))->get_rvo_agent()->computeNeighbors(&rvo_simulation);
+	(*(p_agent + p_index))->get_rvo_agent()->computeNewVelocity(&rvo_simulation);
+	(*(p_agent + p_index))->get_rvo_agent()->update(&rvo_simulation);
+	(*(p_agent + p_index))->update();
+}
+
+void NavMap2D::step(double p_delta_time) {
+	rvo_simulation.setTimeStep(float(p_delta_time));
+
+	if (active_avoidance_agents.size() > 0) {
+		if (use_threads && avoidance_use_multiple_threads) {
+			WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_singleton()->add_template_group_task(this, &NavMap2D::compute_single_avoidance_step, active_avoidance_agents.ptr(), active_avoidance_agents.size(), -1, true, SNAME("RVOAvoidanceAgents2D"));
+			WorkerThreadPool::get_singleton()->wait_for_group_task_completion(group_task);
+		} else {
+			for (NavAgent2D *agent : active_avoidance_agents) {
+				agent->get_rvo_agent()->computeNeighbors(&rvo_simulation);
+				agent->get_rvo_agent()->computeNewVelocity(&rvo_simulation);
+				agent->get_rvo_agent()->update(&rvo_simulation);
+				agent->update();
+			}
+		}
+	}
+}
+
+void NavMap2D::dispatch_callbacks() {
+	for (NavAgent2D *agent : active_avoidance_agents) {
+		agent->dispatch_avoidance_callback();
+	}
+}
+
+void NavMap2D::_update_merge_rasterizer_cell_dimensions() {
+	merge_rasterizer_cell_size.x = cell_size * merge_rasterizer_cell_scale;
+	merge_rasterizer_cell_size.y = cell_size * merge_rasterizer_cell_scale;
+}
+
+int NavMap2D::get_region_connections_count(NavRegion2D *p_region) const {
+	ERR_FAIL_NULL_V(p_region, 0);
+
+	GET_MAP_ITERATION_CONST();
+
+	HashMap<NavRegion2D *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
+	if (found_id) {
+		HashMap<uint32_t, LocalVector<Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
+		if (found_connections) {
+			return found_connections->value.size();
+		}
+	}
+
+	return 0;
+}
+
+Vector2 NavMap2D::get_region_connection_pathway_start(NavRegion2D *p_region, int p_connection_id) const {
+	ERR_FAIL_NULL_V(p_region, Vector2());
+
+	GET_MAP_ITERATION_CONST();
+
+	HashMap<NavRegion2D *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
+	if (found_id) {
+		HashMap<uint32_t, LocalVector<Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
+		if (found_connections) {
+			ERR_FAIL_INDEX_V(p_connection_id, int(found_connections->value.size()), Vector2());
+			return found_connections->value[p_connection_id].pathway_start;
+		}
+	}
+
+	return Vector2();
+}
+
+Vector2 NavMap2D::get_region_connection_pathway_end(NavRegion2D *p_region, int p_connection_id) const {
+	ERR_FAIL_NULL_V(p_region, Vector2());
+
+	GET_MAP_ITERATION_CONST();
+
+	HashMap<NavRegion2D *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
+	if (found_id) {
+		HashMap<uint32_t, LocalVector<Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
+		if (found_connections) {
+			ERR_FAIL_INDEX_V(p_connection_id, int(found_connections->value.size()), Vector2());
+			return found_connections->value[p_connection_id].pathway_end;
+		}
+	}
+
+	return Vector2();
+}
+
+void NavMap2D::add_region_sync_dirty_request(SelfList<NavRegion2D> *p_sync_request) {
+	if (p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.regions.add(p_sync_request);
+}
+
+void NavMap2D::add_link_sync_dirty_request(SelfList<NavLink2D> *p_sync_request) {
+	if (p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.links.add(p_sync_request);
+}
+
+void NavMap2D::add_agent_sync_dirty_request(SelfList<NavAgent2D> *p_sync_request) {
+	if (p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.agents.add(p_sync_request);
+}
+
+void NavMap2D::add_obstacle_sync_dirty_request(SelfList<NavObstacle2D> *p_sync_request) {
+	if (p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.obstacles.add(p_sync_request);
+}
+
+void NavMap2D::remove_region_sync_dirty_request(SelfList<NavRegion2D> *p_sync_request) {
+	if (!p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.regions.remove(p_sync_request);
+}
+
+void NavMap2D::remove_link_sync_dirty_request(SelfList<NavLink2D> *p_sync_request) {
+	if (!p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.links.remove(p_sync_request);
+}
+
+void NavMap2D::remove_agent_sync_dirty_request(SelfList<NavAgent2D> *p_sync_request) {
+	if (!p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.agents.remove(p_sync_request);
+}
+
+void NavMap2D::remove_obstacle_sync_dirty_request(SelfList<NavObstacle2D> *p_sync_request) {
+	if (!p_sync_request->in_list()) {
+		return;
+	}
+	sync_dirty_requests.obstacles.remove(p_sync_request);
+}
+
+void NavMap2D::_sync_dirty_map_update_requests() {
+	// If entire map settings changed make all regions dirty.
+	if (map_settings_dirty) {
+		for (NavRegion2D *region : regions) {
+			region->scratch_polygons();
+		}
+		iteration_dirty = true;
+	}
+
+	if (!iteration_dirty) {
+		iteration_dirty = sync_dirty_requests.regions.first() || sync_dirty_requests.links.first();
+	}
+
+	// Sync NavRegions.
+	for (SelfList<NavRegion2D> *element = sync_dirty_requests.regions.first(); element; element = element->next()) {
+		element->self()->sync();
+	}
+	sync_dirty_requests.regions.clear();
+
+	// Sync NavLinks.
+	for (SelfList<NavLink2D> *element = sync_dirty_requests.links.first(); element; element = element->next()) {
+		element->self()->sync();
+	}
+	sync_dirty_requests.links.clear();
+}
+
+void NavMap2D::_sync_dirty_avoidance_update_requests() {
+	// Sync NavAgents.
+	if (!agents_dirty) {
+		agents_dirty = sync_dirty_requests.agents.first();
+	}
+	for (SelfList<NavAgent2D> *element = sync_dirty_requests.agents.first(); element; element = element->next()) {
+		element->self()->sync();
+	}
+	sync_dirty_requests.agents.clear();
+
+	// Sync NavObstacles.
+	if (!obstacles_dirty) {
+		obstacles_dirty = sync_dirty_requests.obstacles.first();
+	}
+	for (SelfList<NavObstacle2D> *element = sync_dirty_requests.obstacles.first(); element; element = element->next()) {
+		element->self()->sync();
+	}
+	sync_dirty_requests.obstacles.clear();
+}
+
+void NavMap2D::set_use_async_iterations(bool p_enabled) {
+	if (use_async_iterations == p_enabled) {
+		return;
+	}
+#ifdef THREADS_ENABLED
+	use_async_iterations = p_enabled;
+#endif
+}
+
+bool NavMap2D::get_use_async_iterations() const {
+	return use_async_iterations;
+}
+
+NavMap2D::NavMap2D() {
+	avoidance_use_multiple_threads = GLOBAL_GET("navigation/avoidance/thread_model/avoidance_use_multiple_threads");
+	avoidance_use_high_priority_threads = GLOBAL_GET("navigation/avoidance/thread_model/avoidance_use_high_priority_threads");
+
+	path_query_slots_max = GLOBAL_GET("navigation/pathfinding/max_threads");
+
+	int processor_count = OS::get_singleton()->get_processor_count();
+	if (path_query_slots_max < 0) {
+		path_query_slots_max = processor_count;
+	}
+	if (processor_count < path_query_slots_max) {
+		path_query_slots_max = processor_count;
+	}
+	if (path_query_slots_max < 1) {
+		path_query_slots_max = 1;
+	}
+
+	iteration_slots.resize(2);
+
+	for (NavMapIteration2D &iteration_slot : iteration_slots) {
+		iteration_slot.path_query_slots.resize(path_query_slots_max);
+		for (uint32_t i = 0; i < iteration_slot.path_query_slots.size(); i++) {
+			iteration_slot.path_query_slots[i].slot_index = i;
+		}
+		iteration_slot.path_query_slots_semaphore.post(path_query_slots_max);
+	}
+
+#ifdef THREADS_ENABLED
+	use_async_iterations = GLOBAL_GET("navigation/world/map_use_async_iterations");
+#else
+	use_async_iterations = false;
+#endif
+}
+
+NavMap2D::~NavMap2D() {
+	if (iteration_build_thread_task_id != WorkerThreadPool::INVALID_TASK_ID) {
+		WorkerThreadPool::get_singleton()->wait_for_task_completion(iteration_build_thread_task_id);
+		iteration_build_thread_task_id = WorkerThreadPool::INVALID_TASK_ID;
+	}
+}
diff --git a/engine/modules/navigation_2d/nav_map_2d.h b/engine/modules/navigation_2d/nav_map_2d.h
new file mode 100644
index 00000000..1c1abb4d
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_map_2d.h
@@ -0,0 +1,248 @@
+/**************************************************************************/
+/*  nav_map_2d.h                                                          */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "2d/nav_map_iteration_2d.h"
+#include "2d/nav_mesh_queries_2d.h"
+#include "nav_rid_2d.h"
+#include "nav_utils_2d.h"
+
+#include "core/math/math_defs.h"
+#include "core/object/worker_thread_pool.h"
+#include "servers/navigation/navigation_globals.h"
+
+#include <KdTree2d.h>
+#include <RVOSimulator2d.h>
+
+class NavLink2D;
+class NavRegion2D;
+class NavAgent2D;
+class NavObstacle2D;
+
+class NavMap2D : public NavRid2D {
+	/// To find the polygons edges the vertices are displaced in a grid where
+	/// each cell has the following cell_size.
+	real_t cell_size = NavigationDefaults2D::navmesh_cell_size;
+
+	// For the inter-region merging to work, internal rasterization is performed.
+	Vector2 merge_rasterizer_cell_size = Vector2(cell_size, cell_size);
+
+	// This value is used to control sensitivity of internal rasterizer.
+	float merge_rasterizer_cell_scale = 1.0;
+
+	bool use_edge_connections = true;
+	/// This value is used to detect the near edges to connect.
+	real_t edge_connection_margin = NavigationDefaults2D::edge_connection_margin;
+
+	/// This value is used to limit how far links search to find polygons to connect to.
+	real_t link_connection_radius = NavigationDefaults2D::link_connection_radius;
+
+	bool map_settings_dirty = true;
+
+	/// Map regions.
+	LocalVector<NavRegion2D *> regions;
+
+	/// Map links.
+	LocalVector<NavLink2D *> links;
+
+	/// RVO avoidance world.
+	RVO2D::RVOSimulator2D rvo_simulation;
+
+	/// Avoidance controlled agents.
+	LocalVector<NavAgent2D *> active_avoidance_agents;
+
+	/// dirty flag when one of the agent's arrays are modified.
+	bool agents_dirty = true;
+
+	/// All the Agents (even the controlled one).
+	LocalVector<NavAgent2D *> agents;
+
+	/// All the avoidance obstacles (both static and dynamic).
+	LocalVector<NavObstacle2D *> obstacles;
+
+	/// Are rvo obstacles modified?
+	bool obstacles_dirty = true;
+
+	/// Change the id each time the map is updated.
+	uint32_t iteration_id = 0;
+
+	bool use_threads = true;
+	bool avoidance_use_multiple_threads = true;
+	bool avoidance_use_high_priority_threads = true;
+
+	// Performance Monitor
+	nav_2d::PerformanceData performance_data;
+
+	struct {
+		SelfList<NavRegion2D>::List regions;
+		SelfList<NavLink2D>::List links;
+		SelfList<NavAgent2D>::List agents;
+		SelfList<NavObstacle2D>::List obstacles;
+	} sync_dirty_requests;
+
+	int path_query_slots_max = 4;
+
+	bool use_async_iterations = true;
+
+	uint32_t iteration_slot_index = 0;
+	LocalVector<NavMapIteration2D> iteration_slots;
+	mutable RWLock iteration_slot_rwlock;
+
+	NavMapIterationBuild2D iteration_build;
+	bool iteration_build_use_threads = false;
+	WorkerThreadPool::TaskID iteration_build_thread_task_id = WorkerThreadPool::INVALID_TASK_ID;
+	static void _build_iteration_threaded(void *p_arg);
+
+	bool iteration_dirty = true;
+	bool iteration_building = false;
+	bool iteration_ready = false;
+
+	void _build_iteration();
+	void _sync_iteration();
+
+public:
+	NavMap2D();
+	~NavMap2D();
+
+	uint32_t get_iteration_id() const { return iteration_id; }
+
+	void set_cell_size(real_t p_cell_size);
+	real_t get_cell_size() const {
+		return cell_size;
+	}
+
+	void set_merge_rasterizer_cell_scale(float p_value);
+	float get_merge_rasterizer_cell_scale() const {
+		return merge_rasterizer_cell_scale;
+	}
+
+	void set_use_edge_connections(bool p_enabled);
+	bool get_use_edge_connections() const {
+		return use_edge_connections;
+	}
+
+	void set_edge_connection_margin(real_t p_edge_connection_margin);
+	real_t get_edge_connection_margin() const {
+		return edge_connection_margin;
+	}
+
+	void set_link_connection_radius(real_t p_link_connection_radius);
+	real_t get_link_connection_radius() const {
+		return link_connection_radius;
+	}
+
+	nav_2d::PointKey get_point_key(const Vector2 &p_pos) const;
+	Vector2 get_merge_rasterizer_cell_size() const;
+
+	void query_path(NavMeshQueries2D::NavMeshPathQueryTask2D &p_query_task);
+
+	Vector2 get_closest_point(const Vector2 &p_point) const;
+	nav_2d::ClosestPointQueryResult get_closest_point_info(const Vector2 &p_point) const;
+	RID get_closest_point_owner(const Vector2 &p_point) const;
+
+	void add_region(NavRegion2D *p_region);
+	void remove_region(NavRegion2D *p_region);
+	const LocalVector<NavRegion2D *> &get_regions() const {
+		return regions;
+	}
+
+	void add_link(NavLink2D *p_link);
+	void remove_link(NavLink2D *p_link);
+	const LocalVector<NavLink2D *> &get_links() const {
+		return links;
+	}
+
+	bool has_agent(NavAgent2D *p_agent) const;
+	void add_agent(NavAgent2D *p_agent);
+	void remove_agent(NavAgent2D *p_agent);
+	const LocalVector<NavAgent2D *> &get_agents() const {
+		return agents;
+	}
+
+	void set_agent_as_controlled(NavAgent2D *p_agent);
+	void remove_agent_as_controlled(NavAgent2D *p_agent);
+
+	bool has_obstacle(NavObstacle2D *p_obstacle) const;
+	void add_obstacle(NavObstacle2D *p_obstacle);
+	void remove_obstacle(NavObstacle2D *p_obstacle);
+	const LocalVector<NavObstacle2D *> &get_obstacles() const {
+		return obstacles;
+	}
+
+	Vector2 get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const;
+
+	void sync();
+	void step(double p_delta_time);
+	void dispatch_callbacks();
+
+	// Performance Monitor
+	int get_pm_region_count() const { return performance_data.pm_region_count; }
+	int get_pm_agent_count() const { return performance_data.pm_agent_count; }
+	int get_pm_link_count() const { return performance_data.pm_link_count; }
+	int get_pm_polygon_count() const { return performance_data.pm_polygon_count; }
+	int get_pm_edge_count() const { return performance_data.pm_edge_count; }
+	int get_pm_edge_merge_count() const { return performance_data.pm_edge_merge_count; }
+	int get_pm_edge_connection_count() const { return performance_data.pm_edge_connection_count; }
+	int get_pm_edge_free_count() const { return performance_data.pm_edge_free_count; }
+	int get_pm_obstacle_count() const { return performance_data.pm_obstacle_count; }
+
+	int get_region_connections_count(NavRegion2D *p_region) const;
+	Vector2 get_region_connection_pathway_start(NavRegion2D *p_region, int p_connection_id) const;
+	Vector2 get_region_connection_pathway_end(NavRegion2D *p_region, int p_connection_id) const;
+
+	void add_region_sync_dirty_request(SelfList<NavRegion2D> *p_sync_request);
+	void add_link_sync_dirty_request(SelfList<NavLink2D> *p_sync_request);
+	void add_agent_sync_dirty_request(SelfList<NavAgent2D> *p_sync_request);
+	void add_obstacle_sync_dirty_request(SelfList<NavObstacle2D> *p_sync_request);
+
+	void remove_region_sync_dirty_request(SelfList<NavRegion2D> *p_sync_request);
+	void remove_link_sync_dirty_request(SelfList<NavLink2D> *p_sync_request);
+	void remove_agent_sync_dirty_request(SelfList<NavAgent2D> *p_sync_request);
+	void remove_obstacle_sync_dirty_request(SelfList<NavObstacle2D> *p_sync_request);
+
+	void set_use_async_iterations(bool p_enabled);
+	bool get_use_async_iterations() const;
+
+private:
+	void _sync_dirty_map_update_requests();
+	void _sync_dirty_avoidance_update_requests();
+
+	void compute_single_step(uint32_t p_index, NavAgent2D **p_agent);
+
+	void compute_single_avoidance_step(uint32_t p_index, NavAgent2D **p_agent);
+
+	void _sync_avoidance();
+	void _update_rvo_simulation();
+	void _update_rvo_obstacles_tree();
+	void _update_rvo_agents_tree();
+
+	void _update_merge_rasterizer_cell_dimensions();
+};
diff --git a/engine/modules/navigation_2d/nav_obstacle_2d.cpp b/engine/modules/navigation_2d/nav_obstacle_2d.cpp
new file mode 100644
index 00000000..84439ceb
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_obstacle_2d.cpp
@@ -0,0 +1,222 @@
+/**************************************************************************/
+/*  nav_obstacle_2d.cpp                                                   */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "nav_obstacle_2d.h"
+
+#include "nav_agent_2d.h"
+#include "nav_map_2d.h"
+
+void NavObstacle2D::set_agent(NavAgent2D *p_agent) {
+	if (agent == p_agent) {
+		return;
+	}
+
+	agent = p_agent;
+
+	internal_update_agent();
+
+	request_sync();
+}
+
+void NavObstacle2D::set_avoidance_enabled(bool p_enabled) {
+	if (avoidance_enabled == p_enabled) {
+		return;
+	}
+
+	avoidance_enabled = p_enabled;
+	obstacle_dirty = true;
+
+	internal_update_agent();
+
+	request_sync();
+}
+
+void NavObstacle2D::set_map(NavMap2D *p_map) {
+	if (map == p_map) {
+		return;
+	}
+
+	cancel_sync_request();
+
+	if (map) {
+		map->remove_obstacle(this);
+		if (agent) {
+			agent->set_map(nullptr);
+		}
+	}
+
+	map = p_map;
+	obstacle_dirty = true;
+
+	if (map) {
+		map->add_obstacle(this);
+		internal_update_agent();
+
+		request_sync();
+	}
+}
+
+void NavObstacle2D::set_position(const Vector2 &p_position) {
+	if (position == p_position) {
+		return;
+	}
+
+	position = p_position;
+	obstacle_dirty = true;
+
+	if (agent) {
+		agent->set_position(position);
+	}
+
+	request_sync();
+}
+
+void NavObstacle2D::set_radius(real_t p_radius) {
+	if (radius == p_radius) {
+		return;
+	}
+
+	radius = p_radius;
+
+	if (agent) {
+		agent->set_radius(radius);
+	}
+}
+
+void NavObstacle2D::set_velocity(const Vector2 &p_velocity) {
+	velocity = p_velocity;
+
+	if (agent) {
+		agent->set_velocity(velocity);
+	}
+}
+
+void NavObstacle2D::set_vertices(const Vector<Vector2> &p_vertices) {
+	if (vertices == p_vertices) {
+		return;
+	}
+
+	vertices = p_vertices;
+	obstacle_dirty = true;
+
+	request_sync();
+}
+
+bool NavObstacle2D::is_map_changed() {
+	if (map) {
+		bool is_changed = map->get_iteration_id() != last_map_iteration_id;
+		last_map_iteration_id = map->get_iteration_id();
+		return is_changed;
+	} else {
+		return false;
+	}
+}
+
+void NavObstacle2D::set_avoidance_layers(uint32_t p_layers) {
+	if (avoidance_layers == p_layers) {
+		return;
+	}
+
+	avoidance_layers = p_layers;
+	obstacle_dirty = true;
+
+	if (agent) {
+		agent->set_avoidance_layers(avoidance_layers);
+	}
+
+	request_sync();
+}
+
+bool NavObstacle2D::is_dirty() const {
+	return obstacle_dirty;
+}
+
+void NavObstacle2D::sync() {
+	obstacle_dirty = false;
+}
+
+void NavObstacle2D::internal_update_agent() {
+	if (agent) {
+		agent->set_neighbor_distance(0.0);
+		agent->set_max_neighbors(0.0);
+		agent->set_time_horizon_agents(0.0);
+		agent->set_time_horizon_obstacles(0.0);
+		agent->set_avoidance_mask(0.0);
+		agent->set_neighbor_distance(0.0);
+		agent->set_avoidance_priority(1.0);
+		agent->set_map(map);
+		agent->set_paused(paused);
+		agent->set_radius(radius);
+		agent->set_position(position);
+		agent->set_avoidance_layers(avoidance_layers);
+		agent->set_avoidance_enabled(avoidance_enabled);
+	}
+}
+
+void NavObstacle2D::set_paused(bool p_paused) {
+	if (paused == p_paused) {
+		return;
+	}
+
+	paused = p_paused;
+
+	if (map) {
+		if (paused) {
+			map->remove_obstacle(this);
+		} else {
+			map->add_obstacle(this);
+		}
+	}
+	internal_update_agent();
+}
+
+bool NavObstacle2D::get_paused() const {
+	return paused;
+}
+
+void NavObstacle2D::request_sync() {
+	if (map && !sync_dirty_request_list_element.in_list()) {
+		map->add_obstacle_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+void NavObstacle2D::cancel_sync_request() {
+	if (map && sync_dirty_request_list_element.in_list()) {
+		map->remove_obstacle_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+NavObstacle2D::NavObstacle2D() :
+		sync_dirty_request_list_element(this) {
+}
+
+NavObstacle2D::~NavObstacle2D() {
+	cancel_sync_request();
+}
diff --git a/engine/modules/navigation_2d/nav_obstacle_2d.h b/engine/modules/navigation_2d/nav_obstacle_2d.h
new file mode 100644
index 00000000..b18d095f
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_obstacle_2d.h
@@ -0,0 +1,100 @@
+/**************************************************************************/
+/*  nav_obstacle_2d.h                                                     */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "nav_rid_2d.h"
+
+#include "core/object/class_db.h"
+#include "core/templates/self_list.h"
+
+class NavAgent2D;
+class NavMap2D;
+
+class NavObstacle2D : public NavRid2D {
+	NavAgent2D *agent = nullptr;
+	NavMap2D *map = nullptr;
+	Vector2 velocity;
+	Vector2 position;
+	Vector<Vector2> vertices;
+
+	real_t radius = 0.0;
+
+	bool avoidance_enabled = false;
+	uint32_t avoidance_layers = 1;
+
+	bool obstacle_dirty = true;
+
+	uint32_t last_map_iteration_id = 0;
+	bool paused = false;
+
+	SelfList<NavObstacle2D> sync_dirty_request_list_element;
+
+public:
+	NavObstacle2D();
+	~NavObstacle2D();
+
+	void set_avoidance_enabled(bool p_enabled);
+	bool is_avoidance_enabled() { return avoidance_enabled; }
+
+	void set_map(NavMap2D *p_map);
+	NavMap2D *get_map() { return map; }
+
+	void set_agent(NavAgent2D *p_agent);
+	NavAgent2D *get_agent() { return agent; }
+
+	void set_position(const Vector2 &p_position);
+	Vector2 get_position() const { return position; }
+
+	void set_radius(real_t p_radius);
+	real_t get_radius() const { return radius; }
+
+	void set_velocity(const Vector2 &p_velocity);
+	Vector2 get_velocity() const { return velocity; }
+
+	void set_vertices(const Vector<Vector2> &p_vertices);
+	const Vector<Vector2> &get_vertices() const { return vertices; }
+
+	bool is_map_changed();
+
+	void set_avoidance_layers(uint32_t p_layers);
+	uint32_t get_avoidance_layers() const { return avoidance_layers; }
+
+	void set_paused(bool p_paused);
+	bool get_paused() const;
+
+	bool is_dirty() const;
+	void sync();
+	void request_sync();
+	void cancel_sync_request();
+
+private:
+	void internal_update_agent();
+};
diff --git a/engine/modules/navigation_2d/nav_region_2d.cpp b/engine/modules/navigation_2d/nav_region_2d.cpp
new file mode 100644
index 00000000..09f57999
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_region_2d.cpp
@@ -0,0 +1,318 @@
+/**************************************************************************/
+/*  nav_region_2d.cpp                                                     */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "nav_region_2d.h"
+
+#include "nav_map_2d.h"
+#include "triangle2.h"
+
+#include "2d/nav_map_builder_2d.h"
+#include "2d/nav_mesh_queries_2d.h"
+#include "2d/nav_region_iteration_2d.h"
+
+using namespace nav_2d;
+
+void NavRegion2D::set_map(NavMap2D *p_map) {
+	if (map == p_map) {
+		return;
+	}
+
+	cancel_sync_request();
+
+	if (map) {
+		map->remove_region(this);
+	}
+
+	map = p_map;
+	polygons_dirty = true;
+
+	if (map) {
+		map->add_region(this);
+		request_sync();
+	}
+}
+
+void NavRegion2D::set_enabled(bool p_enabled) {
+	if (enabled == p_enabled) {
+		return;
+	}
+	enabled = p_enabled;
+
+	// TODO: This should not require a full rebuild as the region has not really changed.
+	polygons_dirty = true;
+
+	request_sync();
+}
+
+void NavRegion2D::set_use_edge_connections(bool p_enabled) {
+	if (use_edge_connections != p_enabled) {
+		use_edge_connections = p_enabled;
+		polygons_dirty = true;
+	}
+
+	request_sync();
+}
+
+void NavRegion2D::set_transform(const Transform2D &p_transform) {
+	if (transform == p_transform) {
+		return;
+	}
+	transform = p_transform;
+	polygons_dirty = true;
+
+	request_sync();
+}
+
+void NavRegion2D::set_navigation_polygon(Ref<NavigationPolygon> p_navigation_polygon) {
+#ifdef DEBUG_ENABLED
+	if (map && p_navigation_polygon.is_valid() && !Math::is_equal_approx(double(map->get_cell_size()), double(p_navigation_polygon->get_cell_size()))) {
+		ERR_PRINT_ONCE(vformat("Attempted to update a navigation region with a navigation mesh that uses a `cell_size` of %s while assigned to a navigation map set to a `cell_size` of %s. The cell size for navigation maps can be changed by using the NavigationServer map_set_cell_size() function. The cell size for default navigation maps can also be changed in the ProjectSettings.", double(p_navigation_polygon->get_cell_size()), double(map->get_cell_size())));
+	}
+#endif // DEBUG_ENABLED
+
+	RWLockWrite write_lock(navmesh_rwlock);
+
+	pending_navmesh_vertices.clear();
+	pending_navmesh_polygons.clear();
+
+	if (p_navigation_polygon.is_valid()) {
+		p_navigation_polygon->get_data(pending_navmesh_vertices, pending_navmesh_polygons);
+	}
+
+	polygons_dirty = true;
+
+	request_sync();
+}
+
+ClosestPointQueryResult NavRegion2D::get_closest_point_info(const Vector2 &p_point) const {
+	RWLockRead read_lock(region_rwlock);
+
+	return NavMeshQueries2D::polygons_get_closest_point_info(get_polygons(), p_point);
+}
+
+Vector2 NavRegion2D::get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const {
+	RWLockRead read_lock(region_rwlock);
+
+	if (!get_enabled()) {
+		return Vector2();
+	}
+
+	return NavMeshQueries2D::polygons_get_random_point(get_polygons(), p_navigation_layers, p_uniformly);
+}
+
+void NavRegion2D::set_navigation_layers(uint32_t p_navigation_layers) {
+	if (navigation_layers == p_navigation_layers) {
+		return;
+	}
+	navigation_layers = p_navigation_layers;
+	region_dirty = true;
+
+	request_sync();
+}
+
+void NavRegion2D::set_enter_cost(real_t p_enter_cost) {
+	real_t new_enter_cost = MAX(p_enter_cost, 0.0);
+	if (enter_cost == new_enter_cost) {
+		return;
+	}
+	enter_cost = new_enter_cost;
+	region_dirty = true;
+
+	request_sync();
+}
+
+void NavRegion2D::set_travel_cost(real_t p_travel_cost) {
+	real_t new_travel_cost = MAX(p_travel_cost, 0.0);
+	if (travel_cost == new_travel_cost) {
+		return;
+	}
+	travel_cost = new_travel_cost;
+	region_dirty = true;
+
+	request_sync();
+}
+
+void NavRegion2D::set_owner_id(ObjectID p_owner_id) {
+	if (owner_id == p_owner_id) {
+		return;
+	}
+	owner_id = p_owner_id;
+	region_dirty = true;
+
+	request_sync();
+}
+
+bool NavRegion2D::sync() {
+	RWLockWrite write_lock(region_rwlock);
+
+	bool something_changed = region_dirty || polygons_dirty;
+
+	region_dirty = false;
+
+	update_polygons();
+
+	return something_changed;
+}
+
+void NavRegion2D::update_polygons() {
+	if (!polygons_dirty) {
+		return;
+	}
+	navmesh_polygons.clear();
+	surface_area = 0.0;
+	bounds = Rect2();
+	polygons_dirty = false;
+
+	if (map == nullptr) {
+		return;
+	}
+
+	RWLockRead read_lock(navmesh_rwlock);
+
+	if (pending_navmesh_vertices.is_empty() || pending_navmesh_polygons.is_empty()) {
+		return;
+	}
+
+	int len = pending_navmesh_vertices.size();
+	if (len == 0) {
+		return;
+	}
+
+	const Vector2 *vertices_r = pending_navmesh_vertices.ptr();
+
+	navmesh_polygons.resize(pending_navmesh_polygons.size());
+
+	real_t _new_region_surface_area = 0.0;
+	Rect2 _new_bounds;
+
+	bool first_vertex = true;
+	int navigation_mesh_polygon_index = 0;
+
+	for (Polygon &polygon : navmesh_polygons) {
+		polygon.surface_area = 0.0;
+
+		Vector<int> navigation_mesh_polygon = pending_navmesh_polygons[navigation_mesh_polygon_index];
+		navigation_mesh_polygon_index += 1;
+
+		int navigation_mesh_polygon_size = navigation_mesh_polygon.size();
+		if (navigation_mesh_polygon_size < 3) {
+			continue;
+		}
+
+		const int *indices = navigation_mesh_polygon.ptr();
+		bool valid(true);
+
+		polygon.vertices.resize(navigation_mesh_polygon_size);
+		polygon.edges.resize(navigation_mesh_polygon_size);
+
+		real_t _new_polygon_surface_area = 0.0;
+
+		for (int j(2); j < navigation_mesh_polygon_size; j++) {
+			const Triangle2 triangle = Triangle2(
+					transform.xform(vertices_r[indices[0]]),
+					transform.xform(vertices_r[indices[j - 1]]),
+					transform.xform(vertices_r[indices[j]]));
+
+			_new_polygon_surface_area += triangle.get_area();
+		}
+
+		polygon.surface_area = _new_polygon_surface_area;
+		_new_region_surface_area += _new_polygon_surface_area;
+
+		for (int j(0); j < navigation_mesh_polygon_size; j++) {
+			int idx = indices[j];
+			if (idx < 0 || idx >= len) {
+				valid = false;
+				break;
+			}
+
+			Vector2 point_position = transform.xform(vertices_r[idx]);
+			polygon.vertices[j] = point_position;
+
+			if (first_vertex) {
+				first_vertex = false;
+				_new_bounds.position = point_position;
+			} else {
+				_new_bounds.expand_to(point_position);
+			}
+		}
+
+		if (!valid) {
+			ERR_BREAK_MSG(!valid, "The navigation polygon set in this region is not valid!");
+		}
+	}
+
+	surface_area = _new_region_surface_area;
+	bounds = _new_bounds;
+}
+
+void NavRegion2D::get_iteration_update(NavRegionIteration2D &r_iteration) {
+	r_iteration.navigation_layers = get_navigation_layers();
+	r_iteration.enter_cost = get_enter_cost();
+	r_iteration.travel_cost = get_travel_cost();
+	r_iteration.owner_object_id = get_owner_id();
+	r_iteration.owner_type = get_type();
+	r_iteration.owner_rid = get_self();
+
+	r_iteration.enabled = get_enabled();
+	r_iteration.transform = get_transform();
+	r_iteration.owner_use_edge_connections = get_use_edge_connections();
+	r_iteration.bounds = get_bounds();
+	r_iteration.surface_area = get_surface_area();
+
+	r_iteration.navmesh_polygons.clear();
+	r_iteration.navmesh_polygons.resize(navmesh_polygons.size());
+	for (uint32_t i = 0; i < navmesh_polygons.size(); i++) {
+		Polygon &navmesh_polygon = navmesh_polygons[i];
+		navmesh_polygon.owner = &r_iteration;
+		r_iteration.navmesh_polygons[i] = navmesh_polygon;
+	}
+}
+
+void NavRegion2D::request_sync() {
+	if (map && !sync_dirty_request_list_element.in_list()) {
+		map->add_region_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+void NavRegion2D::cancel_sync_request() {
+	if (map && sync_dirty_request_list_element.in_list()) {
+		map->remove_region_sync_dirty_request(&sync_dirty_request_list_element);
+	}
+}
+
+NavRegion2D::NavRegion2D() :
+		sync_dirty_request_list_element(this) {
+	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
+}
+
+NavRegion2D::~NavRegion2D() {
+	cancel_sync_request();
+}
diff --git a/engine/modules/navigation_2d/nav_region_2d.h b/engine/modules/navigation_2d/nav_region_2d.h
new file mode 100644
index 00000000..411a76e3
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_region_2d.h
@@ -0,0 +1,114 @@
+/**************************************************************************/
+/*  nav_region_2d.h                                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "nav_base_2d.h"
+#include "nav_utils_2d.h"
+
+#include "core/os/rw_lock.h"
+#include "scene/resources/2d/navigation_polygon.h"
+
+struct NavRegionIteration2D;
+
+class NavRegion2D : public NavBase2D {
+	RWLock region_rwlock;
+
+	NavMap2D *map = nullptr;
+	Transform2D transform;
+	bool enabled = true;
+
+	bool use_edge_connections = true;
+
+	bool region_dirty = true;
+	bool polygons_dirty = true;
+
+	LocalVector<nav_2d::Polygon> navmesh_polygons;
+
+	real_t surface_area = 0.0;
+	Rect2 bounds;
+
+	RWLock navmesh_rwlock;
+	Vector<Vector2> pending_navmesh_vertices;
+	Vector<Vector<int>> pending_navmesh_polygons;
+
+	SelfList<NavRegion2D> sync_dirty_request_list_element;
+
+public:
+	NavRegion2D();
+	~NavRegion2D();
+
+	void scratch_polygons() {
+		polygons_dirty = true;
+	}
+
+	void set_enabled(bool p_enabled);
+	bool get_enabled() const { return enabled; }
+
+	void set_map(NavMap2D *p_map);
+	NavMap2D *get_map() const {
+		return map;
+	}
+
+	virtual void set_use_edge_connections(bool p_enabled) override;
+	virtual bool get_use_edge_connections() const override { return use_edge_connections; }
+
+	void set_transform(const Transform2D &p_transform);
+	const Transform2D &get_transform() const {
+		return transform;
+	}
+
+	void set_navigation_polygon(Ref<NavigationPolygon> p_navigation_polygon);
+
+	LocalVector<nav_2d::Polygon> const &get_polygons() const {
+		return navmesh_polygons;
+	}
+
+	nav_2d::ClosestPointQueryResult get_closest_point_info(const Vector2 &p_point) const;
+	Vector2 get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const;
+
+	real_t get_surface_area() const { return surface_area; }
+	Rect2 get_bounds() const { return bounds; }
+
+	// NavBase properties.
+	virtual void set_navigation_layers(uint32_t p_navigation_layers) override;
+	virtual void set_enter_cost(real_t p_enter_cost) override;
+	virtual void set_travel_cost(real_t p_travel_cost) override;
+	virtual void set_owner_id(ObjectID p_owner_id) override;
+
+	bool sync();
+	void request_sync();
+	void cancel_sync_request();
+
+	void get_iteration_update(NavRegionIteration2D &r_iteration);
+
+private:
+	void update_polygons();
+};
diff --git a/engine/modules/navigation/nav_rid.h b/engine/modules/navigation_2d/nav_rid_2d.h
similarity index 94%
rename from engine/modules/navigation/nav_rid.h
rename to engine/modules/navigation_2d/nav_rid_2d.h
index 6229985a..ad63c4e7 100644
--- a/engine/modules/navigation/nav_rid.h
+++ b/engine/modules/navigation_2d/nav_rid_2d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_rid.h                                                             */
+/*  nav_rid_2d.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,17 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_RID_H
-#define NAV_RID_H
+#pragma once
 
 #include "core/templates/rid.h"
 
-class NavRid {
+class NavRid2D {
 	RID self;
 
 public:
 	_FORCE_INLINE_ void set_self(const RID &p_self) { self = p_self; }
 	_FORCE_INLINE_ RID get_self() const { return self; }
 };
-
-#endif // NAV_RID_H
diff --git a/engine/modules/navigation_2d/nav_utils_2d.h b/engine/modules/navigation_2d/nav_utils_2d.h
new file mode 100644
index 00000000..ad7dff4d
--- /dev/null
+++ b/engine/modules/navigation_2d/nav_utils_2d.h
@@ -0,0 +1,208 @@
+/**************************************************************************/
+/*  nav_utils_2d.h                                                        */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/math/vector3.h"
+#include "core/templates/hash_map.h"
+#include "core/templates/hashfuncs.h"
+#include "servers/navigation/nav_heap.h"
+#include "servers/navigation/navigation_utilities.h"
+
+struct NavBaseIteration2D;
+
+namespace nav_2d {
+struct Polygon;
+
+union PointKey {
+	struct {
+		int64_t x : 32;
+		int64_t y : 32;
+	};
+
+	uint64_t key = 0;
+};
+
+struct EdgeKey {
+	PointKey a;
+	PointKey b;
+
+	static uint32_t hash(const EdgeKey &p_val) {
+		return hash_one_uint64(p_val.a.key) ^ hash_one_uint64(p_val.b.key);
+	}
+
+	bool operator==(const EdgeKey &p_key) const {
+		return (a.key == p_key.a.key) && (b.key == p_key.b.key);
+	}
+
+	EdgeKey(const PointKey &p_a = PointKey(), const PointKey &p_b = PointKey()) :
+			a(p_a),
+			b(p_b) {
+		if (a.key > b.key) {
+			SWAP(a, b);
+		}
+	}
+};
+
+struct Edge {
+	/// The gateway in the edge, as, in some case, the whole edge might not be navigable.
+	struct Connection {
+		/// Polygon that this connection leads to.
+		Polygon *polygon = nullptr;
+
+		/// Edge of the source polygon where this connection starts from.
+		int edge = -1;
+
+		/// Point on the edge where the gateway leading to the poly starts.
+		Vector2 pathway_start;
+
+		/// Point on the edge where the gateway leading to the poly ends.
+		Vector2 pathway_end;
+	};
+
+	/// Connections from this edge to other polygons.
+	LocalVector<Connection> connections;
+};
+
+struct Polygon {
+	/// Id of the polygon in the map.
+	uint32_t id = UINT32_MAX;
+
+	/// Navigation region or link that contains this polygon.
+	const NavBaseIteration2D *owner = nullptr;
+
+	LocalVector<Vector2> vertices;
+
+	/// The edges of this `Polygon`
+	LocalVector<Edge> edges;
+
+	real_t surface_area = 0.0;
+};
+
+struct NavigationPoly {
+	/// This poly.
+	const Polygon *poly = nullptr;
+
+	/// Index in the heap of traversable polygons.
+	uint32_t traversable_poly_index = UINT32_MAX;
+
+	/// Those 4 variables are used to travel the path backwards.
+	int back_navigation_poly_id = -1;
+	int back_navigation_edge = -1;
+	Vector2 back_navigation_edge_pathway_start;
+	Vector2 back_navigation_edge_pathway_end;
+
+	/// The entry position of this poly.
+	Vector2 entry;
+	/// The distance traveled until now (g cost).
+	real_t traveled_distance = 0.0;
+	/// The distance to the destination (h cost).
+	real_t distance_to_destination = 0.0;
+
+	/// The total travel cost (f cost).
+	real_t total_travel_cost() const {
+		return traveled_distance + distance_to_destination;
+	}
+
+	bool operator==(const NavigationPoly &p_other) const {
+		return poly == p_other.poly;
+	}
+
+	bool operator!=(const NavigationPoly &p_other) const {
+		return !(*this == p_other);
+	}
+
+	void reset() {
+		poly = nullptr;
+		traversable_poly_index = UINT32_MAX;
+		back_navigation_poly_id = -1;
+		back_navigation_edge = -1;
+		traveled_distance = FLT_MAX;
+		distance_to_destination = 0.0;
+	}
+};
+
+struct NavPolyTravelCostGreaterThan {
+	// Returns `true` if the travel cost of `a` is higher than that of `b`.
+	bool operator()(const NavigationPoly *p_poly_a, const NavigationPoly *p_poly_b) const {
+		real_t f_cost_a = p_poly_a->total_travel_cost();
+		real_t h_cost_a = p_poly_a->distance_to_destination;
+		real_t f_cost_b = p_poly_b->total_travel_cost();
+		real_t h_cost_b = p_poly_b->distance_to_destination;
+
+		if (f_cost_a != f_cost_b) {
+			return f_cost_a > f_cost_b;
+		} else {
+			return h_cost_a > h_cost_b;
+		}
+	}
+};
+
+struct NavPolyHeapIndexer {
+	void operator()(NavigationPoly *p_poly, uint32_t p_heap_index) const {
+		p_poly->traversable_poly_index = p_heap_index;
+	}
+};
+
+struct ClosestPointQueryResult {
+	Vector2 point;
+	RID owner;
+};
+
+struct EdgeConnectionPair {
+	Edge::Connection connections[2];
+	int size = 0;
+};
+
+struct PerformanceData {
+	int pm_region_count = 0;
+	int pm_agent_count = 0;
+	int pm_link_count = 0;
+	int pm_polygon_count = 0;
+	int pm_edge_count = 0;
+	int pm_edge_merge_count = 0;
+	int pm_edge_connection_count = 0;
+	int pm_edge_free_count = 0;
+	int pm_obstacle_count = 0;
+
+	void reset() {
+		pm_region_count = 0;
+		pm_agent_count = 0;
+		pm_link_count = 0;
+		pm_polygon_count = 0;
+		pm_edge_count = 0;
+		pm_edge_merge_count = 0;
+		pm_edge_connection_count = 0;
+		pm_edge_free_count = 0;
+		pm_obstacle_count = 0;
+	}
+};
+
+} // namespace nav_2d
diff --git a/engine/modules/navigation_2d/register_types.cpp b/engine/modules/navigation_2d/register_types.cpp
new file mode 100644
index 00000000..4481ba2a
--- /dev/null
+++ b/engine/modules/navigation_2d/register_types.cpp
@@ -0,0 +1,52 @@
+/**************************************************************************/
+/*  register_types.cpp                                                    */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "register_types.h"
+
+#include "2d/godot_navigation_server_2d.h"
+
+#include "core/config/engine.h"
+#include "servers/navigation_server_2d.h"
+
+NavigationServer2D *new_navigation_server_2d() {
+	return memnew(GodotNavigationServer2D);
+}
+
+void initialize_navigation_2d_module(ModuleInitializationLevel p_level) {
+	if (p_level == MODULE_INITIALIZATION_LEVEL_SERVERS) {
+		NavigationServer2DManager::set_default_server(new_navigation_server_2d);
+	}
+}
+
+void uninitialize_navigation_2d_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
+		return;
+	}
+}
diff --git a/engine/modules/navigation/register_types.h b/engine/modules/navigation_2d/register_types.h
similarity index 90%
rename from engine/modules/navigation/register_types.h
rename to engine/modules/navigation_2d/register_types.h
index b07c3b93..f127e628 100644
--- a/engine/modules/navigation/register_types.h
+++ b/engine/modules/navigation_2d/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_REGISTER_TYPES_H
-#define NAVIGATION_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
-void initialize_navigation_module(ModuleInitializationLevel p_level);
-void uninitialize_navigation_module(ModuleInitializationLevel p_level);
-
-#endif // NAVIGATION_REGISTER_TYPES_H
+void initialize_navigation_2d_module(ModuleInitializationLevel p_level);
+void uninitialize_navigation_2d_module(ModuleInitializationLevel p_level);
diff --git a/engine/modules/navigation_2d/triangle2.cpp b/engine/modules/navigation_2d/triangle2.cpp
new file mode 100644
index 00000000..7d56aded
--- /dev/null
+++ b/engine/modules/navigation_2d/triangle2.cpp
@@ -0,0 +1,112 @@
+/**************************************************************************/
+/*  triangle2.cpp                                                         */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "triangle2.h"
+
+Vector2 Triangle2::get_random_point_inside() const {
+	real_t a = Math::random(0.0, 1.0);
+	real_t b = Math::random(0.0, 1.0);
+	if (a > b) {
+		SWAP(a, b);
+	}
+
+	return vertex[0] * a + vertex[1] * (b - a) + vertex[2] * (1.0f - b);
+}
+
+Vector2 Triangle2::get_closest_point_to(const Vector2 &p_point) const {
+	Vector2 edge0 = vertex[1] - vertex[0];
+	Vector2 edge1 = vertex[2] - vertex[0];
+	Vector2 v0 = vertex[0] - p_point;
+
+	real_t a = edge0.dot(edge0);
+	real_t b = edge0.dot(edge1);
+	real_t c = edge1.dot(edge1);
+	real_t d = edge0.dot(v0);
+	real_t e = edge1.dot(v0);
+
+	real_t det = a * c - b * b;
+	real_t s = b * e - c * d;
+	real_t t = b * d - a * e;
+
+	if (s + t < det) {
+		if (s < 0.f) {
+			if (t < 0.f) {
+				if (d < 0.f) {
+					s = CLAMP(-d / a, 0.f, 1.f);
+					t = 0.f;
+				} else {
+					s = 0.f;
+					t = CLAMP(-e / c, 0.f, 1.f);
+				}
+			} else {
+				s = 0.f;
+				t = CLAMP(-e / c, 0.f, 1.f);
+			}
+		} else if (t < 0.f) {
+			s = CLAMP(-d / a, 0.f, 1.f);
+			t = 0.f;
+		} else {
+			real_t inv_det = 1.f / det;
+			s *= inv_det;
+			t *= inv_det;
+		}
+	} else {
+		if (s < 0.f) {
+			real_t tmp0 = b + d;
+			real_t tmp1 = c + e;
+			if (tmp1 > tmp0) {
+				real_t numer = tmp1 - tmp0;
+				real_t denom = a - 2 * b + c;
+				s = CLAMP(numer / denom, 0.f, 1.f);
+				t = 1 - s;
+			} else {
+				t = CLAMP(-e / c, 0.f, 1.f);
+				s = 0.f;
+			}
+		} else if (t < 0.f) {
+			if (a + d > b + e) {
+				real_t numer = c + e - b - d;
+				real_t denom = a - 2 * b + c;
+				s = CLAMP(numer / denom, 0.f, 1.f);
+				t = 1 - s;
+			} else {
+				s = CLAMP(-d / a, 0.f, 1.f);
+				t = 0.f;
+			}
+		} else {
+			real_t numer = c + e - b - d;
+			real_t denom = a - 2 * b + c;
+			s = CLAMP(numer / denom, 0.f, 1.f);
+			t = 1.f - s;
+		}
+	}
+
+	return vertex[0] + s * edge0 + t * edge1;
+}
diff --git a/engine/modules/navigation_2d/triangle2.h b/engine/modules/navigation_2d/triangle2.h
new file mode 100644
index 00000000..a93e5b38
--- /dev/null
+++ b/engine/modules/navigation_2d/triangle2.h
@@ -0,0 +1,52 @@
+/**************************************************************************/
+/*  triangle2.h                                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/math/vector2.h"
+
+struct Triangle2 {
+	Vector2 vertex[3];
+
+	real_t get_area() const {
+		return Math::sqrt((vertex[0] - vertex[1]).cross(vertex[0] - vertex[2])) * 0.5f;
+	}
+
+	Vector2 get_random_point_inside() const;
+
+	Vector2 get_closest_point_to(const Vector2 &p_point) const;
+
+	Triangle2() {}
+	Triangle2(const Vector2 &p_v1, const Vector2 &p_v2, const Vector2 &p_v3) {
+		vertex[0] = p_v1;
+		vertex[1] = p_v2;
+		vertex[2] = p_v3;
+	}
+};
diff --git a/engine/modules/navigation/3d/godot_navigation_server_3d.cpp b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
similarity index 78%
rename from engine/modules/navigation/3d/godot_navigation_server_3d.cpp
rename to engine/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
index 51bc2c0e..4fd569e7 100644
--- a/engine/modules/navigation/3d/godot_navigation_server_3d.cpp
+++ b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.cpp
@@ -33,9 +33,7 @@
 #include "core/os/mutex.h"
 #include "scene/main/node.h"
 
-#ifndef _3D_DISABLED
 #include "nav_mesh_generator_3d.h"
-#endif // _3D_DISABLED
 
 using namespace NavigationUtilities;
 
@@ -44,9 +42,9 @@ using namespace NavigationUtilities;
 /// Then, that struct is stored in an array; the `sync` function consume that array.
 
 #define COMMAND_1(F_NAME, T_0, D_0)                                   \
-	struct MERGE(F_NAME, _command) : public SetCommand {              \
+	struct MERGE(F_NAME, _command_3d) : public SetCommand3D {         \
 		T_0 d_0;                                                      \
-		MERGE(F_NAME, _command)                                       \
+		MERGE(F_NAME, _command_3d)                                    \
 		(T_0 p_d_0) :                                                 \
 				d_0(p_d_0) {}                                         \
 		virtual void exec(GodotNavigationServer3D *server) override { \
@@ -54,17 +52,17 @@ using namespace NavigationUtilities;
 		}                                                             \
 	};                                                                \
 	void GodotNavigationServer3D::F_NAME(T_0 D_0) {                   \
-		auto cmd = memnew(MERGE(F_NAME, _command)(                    \
+		auto cmd = memnew(MERGE(F_NAME, _command_3d)(                 \
 				D_0));                                                \
 		add_command(cmd);                                             \
 	}                                                                 \
 	void GodotNavigationServer3D::MERGE(_cmd_, F_NAME)(T_0 D_0)
 
 #define COMMAND_2(F_NAME, T_0, D_0, T_1, D_1)                         \
-	struct MERGE(F_NAME, _command) : public SetCommand {              \
+	struct MERGE(F_NAME, _command_3d) : public SetCommand3D {         \
 		T_0 d_0;                                                      \
 		T_1 d_1;                                                      \
-		MERGE(F_NAME, _command)                                       \
+		MERGE(F_NAME, _command_3d)                                    \
 		(                                                             \
 				T_0 p_d_0,                                            \
 				T_1 p_d_1) :                                          \
@@ -75,7 +73,7 @@ using namespace NavigationUtilities;
 		}                                                             \
 	};                                                                \
 	void GodotNavigationServer3D::F_NAME(T_0 D_0, T_1 D_1) {          \
-		auto cmd = memnew(MERGE(F_NAME, _command)(                    \
+		auto cmd = memnew(MERGE(F_NAME, _command_3d)(                 \
 				D_0,                                                  \
 				D_1));                                                \
 		add_command(cmd);                                             \
@@ -88,7 +86,7 @@ GodotNavigationServer3D::~GodotNavigationServer3D() {
 	flush_queries();
 }
 
-void GodotNavigationServer3D::add_command(SetCommand *command) {
+void GodotNavigationServer3D::add_command(SetCommand3D *command) {
 	MutexLock lock(commands_mutex);
 
 	commands.push_back(command);
@@ -110,13 +108,13 @@ RID GodotNavigationServer3D::map_create() {
 	MutexLock lock(operations_mutex);
 
 	RID rid = map_owner.make_rid();
-	NavMap *map = map_owner.get_or_null(rid);
+	NavMap3D *map = map_owner.get_or_null(rid);
 	map->set_self(rid);
 	return rid;
 }
 
 COMMAND_2(map_set_active, RID, p_map, bool, p_active) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	if (p_active) {
@@ -133,112 +131,112 @@ COMMAND_2(map_set_active, RID, p_map, bool, p_active) {
 }
 
 bool GodotNavigationServer3D::map_is_active(RID p_map) const {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, false);
 
 	return active_maps.has(map);
 }
 
 COMMAND_2(map_set_up, RID, p_map, Vector3, p_up) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	map->set_up(p_up);
 }
 
 Vector3 GodotNavigationServer3D::map_get_up(RID p_map) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, Vector3());
 
 	return map->get_up();
 }
 
 COMMAND_2(map_set_cell_size, RID, p_map, real_t, p_cell_size) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	map->set_cell_size(p_cell_size);
 }
 
 real_t GodotNavigationServer3D::map_get_cell_size(RID p_map) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, 0);
 
 	return map->get_cell_size();
 }
 
 COMMAND_2(map_set_cell_height, RID, p_map, real_t, p_cell_height) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	map->set_cell_height(p_cell_height);
 }
 
 real_t GodotNavigationServer3D::map_get_cell_height(RID p_map) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, 0);
 
 	return map->get_cell_height();
 }
 
 COMMAND_2(map_set_merge_rasterizer_cell_scale, RID, p_map, float, p_value) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	map->set_merge_rasterizer_cell_scale(p_value);
 }
 
 float GodotNavigationServer3D::map_get_merge_rasterizer_cell_scale(RID p_map) const {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, false);
 
 	return map->get_merge_rasterizer_cell_scale();
 }
 
 COMMAND_2(map_set_use_edge_connections, RID, p_map, bool, p_enabled) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	map->set_use_edge_connections(p_enabled);
 }
 
 bool GodotNavigationServer3D::map_get_use_edge_connections(RID p_map) const {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, false);
 
 	return map->get_use_edge_connections();
 }
 
 COMMAND_2(map_set_edge_connection_margin, RID, p_map, real_t, p_connection_margin) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	map->set_edge_connection_margin(p_connection_margin);
 }
 
 real_t GodotNavigationServer3D::map_get_edge_connection_margin(RID p_map) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, 0);
 
 	return map->get_edge_connection_margin();
 }
 
 COMMAND_2(map_set_link_connection_radius, RID, p_map, real_t, p_connection_radius) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	map->set_link_connection_radius(p_connection_radius);
 }
 
 real_t GodotNavigationServer3D::map_get_link_connection_radius(RID p_map) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, 0);
 
 	return map->get_link_connection_radius();
 }
 
 Vector<Vector3> GodotNavigationServer3D::map_get_path(RID p_map, Vector3 p_origin, Vector3 p_destination, bool p_optimize, uint32_t p_navigation_layers) {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, Vector<Vector3>());
 
 	Ref<NavigationPathQueryParameters3D> query_parameters;
@@ -263,28 +261,28 @@ Vector<Vector3> GodotNavigationServer3D::map_get_path(RID p_map, Vector3 p_origi
 }
 
 Vector3 GodotNavigationServer3D::map_get_closest_point_to_segment(RID p_map, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, Vector3());
 
 	return map->get_closest_point_to_segment(p_from, p_to, p_use_collision);
 }
 
 Vector3 GodotNavigationServer3D::map_get_closest_point(RID p_map, const Vector3 &p_point) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, Vector3());
 
 	return map->get_closest_point(p_point);
 }
 
 Vector3 GodotNavigationServer3D::map_get_closest_point_normal(RID p_map, const Vector3 &p_point) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, Vector3());
 
 	return map->get_closest_point_normal(p_point);
 }
 
 RID GodotNavigationServer3D::map_get_closest_point_owner(RID p_map, const Vector3 &p_point) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, RID());
 
 	return map->get_closest_point_owner(p_point);
@@ -292,10 +290,10 @@ RID GodotNavigationServer3D::map_get_closest_point_owner(RID p_map, const Vector
 
 TypedArray<RID> GodotNavigationServer3D::map_get_links(RID p_map) const {
 	TypedArray<RID> link_rids;
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, link_rids);
 
-	const LocalVector<NavLink *> &links = map->get_links();
+	const LocalVector<NavLink3D *> &links = map->get_links();
 	link_rids.resize(links.size());
 
 	for (uint32_t i = 0; i < links.size(); i++) {
@@ -306,10 +304,10 @@ TypedArray<RID> GodotNavigationServer3D::map_get_links(RID p_map) const {
 
 TypedArray<RID> GodotNavigationServer3D::map_get_regions(RID p_map) const {
 	TypedArray<RID> regions_rids;
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, regions_rids);
 
-	const LocalVector<NavRegion *> &regions = map->get_regions();
+	const LocalVector<NavRegion3D *> &regions = map->get_regions();
 	regions_rids.resize(regions.size());
 
 	for (uint32_t i = 0; i < regions.size(); i++) {
@@ -320,10 +318,10 @@ TypedArray<RID> GodotNavigationServer3D::map_get_regions(RID p_map) const {
 
 TypedArray<RID> GodotNavigationServer3D::map_get_agents(RID p_map) const {
 	TypedArray<RID> agents_rids;
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, agents_rids);
 
-	const LocalVector<NavAgent *> &agents = map->get_agents();
+	const LocalVector<NavAgent3D *> &agents = map->get_agents();
 	agents_rids.resize(agents.size());
 
 	for (uint32_t i = 0; i < agents.size(); i++) {
@@ -334,9 +332,9 @@ TypedArray<RID> GodotNavigationServer3D::map_get_agents(RID p_map) const {
 
 TypedArray<RID> GodotNavigationServer3D::map_get_obstacles(RID p_map) const {
 	TypedArray<RID> obstacles_rids;
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, obstacles_rids);
-	const LocalVector<NavObstacle *> obstacles = map->get_obstacles();
+	const LocalVector<NavObstacle3D *> obstacles = map->get_obstacles();
 	obstacles_rids.resize(obstacles.size());
 	for (uint32_t i = 0; i < obstacles.size(); i++) {
 		obstacles_rids[i] = obstacles[i]->get_self();
@@ -345,7 +343,7 @@ TypedArray<RID> GodotNavigationServer3D::map_get_obstacles(RID p_map) const {
 }
 
 RID GodotNavigationServer3D::region_get_map(RID p_region) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, RID());
 
 	if (region->get_map()) {
@@ -355,7 +353,7 @@ RID GodotNavigationServer3D::region_get_map(RID p_region) const {
 }
 
 RID GodotNavigationServer3D::agent_get_map(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, RID());
 
 	if (agent->get_map()) {
@@ -365,20 +363,20 @@ RID GodotNavigationServer3D::agent_get_map(RID p_agent) const {
 }
 
 COMMAND_2(map_set_use_async_iterations, RID, p_map, bool, p_enabled) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 	map->set_use_async_iterations(p_enabled);
 }
 
 bool GodotNavigationServer3D::map_get_use_async_iterations(RID p_map) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, false);
 
 	return map->get_use_async_iterations();
 }
 
 Vector3 GodotNavigationServer3D::map_get_random_point(RID p_map, uint32_t p_navigation_layers, bool p_uniformly) const {
-	const NavMap *map = map_owner.get_or_null(p_map);
+	const NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, Vector3());
 
 	return map->get_random_point(p_navigation_layers, p_uniformly);
@@ -388,64 +386,64 @@ RID GodotNavigationServer3D::region_create() {
 	MutexLock lock(operations_mutex);
 
 	RID rid = region_owner.make_rid();
-	NavRegion *reg = region_owner.get_or_null(rid);
+	NavRegion3D *reg = region_owner.get_or_null(rid);
 	reg->set_self(rid);
 	return rid;
 }
 
 COMMAND_2(region_set_enabled, RID, p_region, bool, p_enabled) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 
 	region->set_enabled(p_enabled);
 }
 
 bool GodotNavigationServer3D::region_get_enabled(RID p_region) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, false);
 
 	return region->get_enabled();
 }
 
 COMMAND_2(region_set_use_edge_connections, RID, p_region, bool, p_enabled) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 
 	region->set_use_edge_connections(p_enabled);
 }
 
 bool GodotNavigationServer3D::region_get_use_edge_connections(RID p_region) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, false);
 
 	return region->get_use_edge_connections();
 }
 
 COMMAND_2(region_set_map, RID, p_region, RID, p_map) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 
 	region->set_map(map);
 }
 
 COMMAND_2(region_set_transform, RID, p_region, Transform3D, p_transform) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 
 	region->set_transform(p_transform);
 }
 
 Transform3D GodotNavigationServer3D::region_get_transform(RID p_region) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, Transform3D());
 
 	return region->get_transform();
 }
 
 COMMAND_2(region_set_enter_cost, RID, p_region, real_t, p_enter_cost) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 	ERR_FAIL_COND(p_enter_cost < 0.0);
 
@@ -453,14 +451,14 @@ COMMAND_2(region_set_enter_cost, RID, p_region, real_t, p_enter_cost) {
 }
 
 real_t GodotNavigationServer3D::region_get_enter_cost(RID p_region) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, 0);
 
 	return region->get_enter_cost();
 }
 
 COMMAND_2(region_set_travel_cost, RID, p_region, real_t, p_travel_cost) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 	ERR_FAIL_COND(p_travel_cost < 0.0);
 
@@ -468,28 +466,28 @@ COMMAND_2(region_set_travel_cost, RID, p_region, real_t, p_travel_cost) {
 }
 
 real_t GodotNavigationServer3D::region_get_travel_cost(RID p_region) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, 0);
 
 	return region->get_travel_cost();
 }
 
 COMMAND_2(region_set_owner_id, RID, p_region, ObjectID, p_owner_id) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 
 	region->set_owner_id(p_owner_id);
 }
 
 ObjectID GodotNavigationServer3D::region_get_owner_id(RID p_region) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, ObjectID());
 
 	return region->get_owner_id();
 }
 
 bool GodotNavigationServer3D::region_owns_point(RID p_region, const Vector3 &p_point) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, false);
 
 	if (region->get_map()) {
@@ -500,21 +498,21 @@ bool GodotNavigationServer3D::region_owns_point(RID p_region, const Vector3 &p_p
 }
 
 COMMAND_2(region_set_navigation_layers, RID, p_region, uint32_t, p_navigation_layers) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 
 	region->set_navigation_layers(p_navigation_layers);
 }
 
 uint32_t GodotNavigationServer3D::region_get_navigation_layers(RID p_region) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, 0);
 
 	return region->get_navigation_layers();
 }
 
 COMMAND_2(region_set_navigation_mesh, RID, p_region, Ref<NavigationMesh>, p_navigation_mesh) {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL(region);
 
 	region->set_navigation_mesh(p_navigation_mesh);
@@ -527,20 +525,18 @@ void GodotNavigationServer3D::region_bake_navigation_mesh(Ref<NavigationMesh> p_
 
 	WARN_PRINT_ONCE("NavigationServer3D::region_bake_navigation_mesh() is deprecated due to core threading changes. To upgrade existing code, first create a NavigationMeshSourceGeometryData3D resource. Use this resource with method parse_source_geometry_data() to parse the SceneTree for nodes that should contribute to the navigation mesh baking. The SceneTree parsing needs to happen on the main thread. After the parsing is finished use the resource with method bake_from_source_geometry_data() to bake a navigation mesh..");
 
-#ifndef _3D_DISABLED
 	p_navigation_mesh->clear();
 	Ref<NavigationMeshSourceGeometryData3D> source_geometry_data;
 	source_geometry_data.instantiate();
 	parse_source_geometry_data(p_navigation_mesh, source_geometry_data, p_root_node);
 	bake_from_source_geometry_data(p_navigation_mesh, source_geometry_data);
-#endif
 }
 #endif // DISABLE_DEPRECATED
 
 int GodotNavigationServer3D::region_get_connections_count(RID p_region) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, 0);
-	NavMap *map = region->get_map();
+	NavMap3D *map = region->get_map();
 	if (map) {
 		return map->get_region_connections_count(region);
 	}
@@ -548,9 +544,9 @@ int GodotNavigationServer3D::region_get_connections_count(RID p_region) const {
 }
 
 Vector3 GodotNavigationServer3D::region_get_connection_pathway_start(RID p_region, int p_connection_id) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, Vector3());
-	NavMap *map = region->get_map();
+	NavMap3D *map = region->get_map();
 	if (map) {
 		return map->get_region_connection_pathway_start(region, p_connection_id);
 	}
@@ -558,9 +554,9 @@ Vector3 GodotNavigationServer3D::region_get_connection_pathway_start(RID p_regio
 }
 
 Vector3 GodotNavigationServer3D::region_get_connection_pathway_end(RID p_region, int p_connection_id) const {
-	NavRegion *region = region_owner.get_or_null(p_region);
+	NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, Vector3());
-	NavMap *map = region->get_map();
+	NavMap3D *map = region->get_map();
 	if (map) {
 		return map->get_region_connection_pathway_end(region, p_connection_id);
 	}
@@ -568,35 +564,35 @@ Vector3 GodotNavigationServer3D::region_get_connection_pathway_end(RID p_region,
 }
 
 Vector3 GodotNavigationServer3D::region_get_closest_point_to_segment(RID p_region, const Vector3 &p_from, const Vector3 &p_to, bool p_use_collision) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, Vector3());
 
 	return region->get_closest_point_to_segment(p_from, p_to, p_use_collision);
 }
 
 Vector3 GodotNavigationServer3D::region_get_closest_point(RID p_region, const Vector3 &p_point) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, Vector3());
 
 	return region->get_closest_point_info(p_point).point;
 }
 
 Vector3 GodotNavigationServer3D::region_get_closest_point_normal(RID p_region, const Vector3 &p_point) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, Vector3());
 
 	return region->get_closest_point_info(p_point).normal;
 }
 
 Vector3 GodotNavigationServer3D::region_get_random_point(RID p_region, uint32_t p_navigation_layers, bool p_uniformly) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, Vector3());
 
 	return region->get_random_point(p_navigation_layers, p_uniformly);
 }
 
 AABB GodotNavigationServer3D::region_get_bounds(RID p_region) const {
-	const NavRegion *region = region_owner.get_or_null(p_region);
+	const NavRegion3D *region = region_owner.get_or_null(p_region);
 	ERR_FAIL_NULL_V(region, AABB());
 
 	return region->get_bounds();
@@ -606,22 +602,22 @@ RID GodotNavigationServer3D::link_create() {
 	MutexLock lock(operations_mutex);
 
 	RID rid = link_owner.make_rid();
-	NavLink *link = link_owner.get_or_null(rid);
+	NavLink3D *link = link_owner.get_or_null(rid);
 	link->set_self(rid);
 	return rid;
 }
 
 COMMAND_2(link_set_map, RID, p_link, RID, p_map) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 
 	link->set_map(map);
 }
 
 RID GodotNavigationServer3D::link_get_map(const RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, RID());
 
 	if (link->get_map()) {
@@ -631,112 +627,112 @@ RID GodotNavigationServer3D::link_get_map(const RID p_link) const {
 }
 
 COMMAND_2(link_set_enabled, RID, p_link, bool, p_enabled) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_enabled(p_enabled);
 }
 
 bool GodotNavigationServer3D::link_get_enabled(RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, false);
 
 	return link->get_enabled();
 }
 
 COMMAND_2(link_set_bidirectional, RID, p_link, bool, p_bidirectional) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_bidirectional(p_bidirectional);
 }
 
 bool GodotNavigationServer3D::link_is_bidirectional(RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, false);
 
 	return link->is_bidirectional();
 }
 
 COMMAND_2(link_set_navigation_layers, RID, p_link, uint32_t, p_navigation_layers) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_navigation_layers(p_navigation_layers);
 }
 
 uint32_t GodotNavigationServer3D::link_get_navigation_layers(const RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, 0);
 
 	return link->get_navigation_layers();
 }
 
 COMMAND_2(link_set_start_position, RID, p_link, Vector3, p_position) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_start_position(p_position);
 }
 
 Vector3 GodotNavigationServer3D::link_get_start_position(RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, Vector3());
 
 	return link->get_start_position();
 }
 
 COMMAND_2(link_set_end_position, RID, p_link, Vector3, p_position) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_end_position(p_position);
 }
 
 Vector3 GodotNavigationServer3D::link_get_end_position(RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, Vector3());
 
 	return link->get_end_position();
 }
 
 COMMAND_2(link_set_enter_cost, RID, p_link, real_t, p_enter_cost) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_enter_cost(p_enter_cost);
 }
 
 real_t GodotNavigationServer3D::link_get_enter_cost(const RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, 0);
 
 	return link->get_enter_cost();
 }
 
 COMMAND_2(link_set_travel_cost, RID, p_link, real_t, p_travel_cost) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_travel_cost(p_travel_cost);
 }
 
 real_t GodotNavigationServer3D::link_get_travel_cost(const RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, 0);
 
 	return link->get_travel_cost();
 }
 
 COMMAND_2(link_set_owner_id, RID, p_link, ObjectID, p_owner_id) {
-	NavLink *link = link_owner.get_or_null(p_link);
+	NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL(link);
 
 	link->set_owner_id(p_owner_id);
 }
 
 ObjectID GodotNavigationServer3D::link_get_owner_id(RID p_link) const {
-	const NavLink *link = link_owner.get_or_null(p_link);
+	const NavLink3D *link = link_owner.get_or_null(p_link);
 	ERR_FAIL_NULL_V(link, ObjectID());
 
 	return link->get_owner_id();
@@ -746,85 +742,85 @@ RID GodotNavigationServer3D::agent_create() {
 	MutexLock lock(operations_mutex);
 
 	RID rid = agent_owner.make_rid();
-	NavAgent *agent = agent_owner.get_or_null(rid);
+	NavAgent3D *agent = agent_owner.get_or_null(rid);
 	agent->set_self(rid);
 	return rid;
 }
 
 COMMAND_2(agent_set_avoidance_enabled, RID, p_agent, bool, p_enabled) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_avoidance_enabled(p_enabled);
 }
 
 bool GodotNavigationServer3D::agent_get_avoidance_enabled(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, false);
 
 	return agent->is_avoidance_enabled();
 }
 
 COMMAND_2(agent_set_use_3d_avoidance, RID, p_agent, bool, p_enabled) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_use_3d_avoidance(p_enabled);
 }
 
 bool GodotNavigationServer3D::agent_get_use_3d_avoidance(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, false);
 
 	return agent->get_use_3d_avoidance();
 }
 
 COMMAND_2(agent_set_map, RID, p_agent, RID, p_map) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 
 	agent->set_map(map);
 }
 
 COMMAND_2(agent_set_paused, RID, p_agent, bool, p_paused) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_paused(p_paused);
 }
 
 bool GodotNavigationServer3D::agent_get_paused(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, false);
 
 	return agent->get_paused();
 }
 
 COMMAND_2(agent_set_neighbor_distance, RID, p_agent, real_t, p_distance) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_neighbor_distance(p_distance);
 }
 
 real_t GodotNavigationServer3D::agent_get_neighbor_distance(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_neighbor_distance();
 }
 
 COMMAND_2(agent_set_max_neighbors, RID, p_agent, int, p_count) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_max_neighbors(p_count);
 }
 
 int GodotNavigationServer3D::agent_get_max_neighbors(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_max_neighbors();
@@ -832,14 +828,14 @@ int GodotNavigationServer3D::agent_get_max_neighbors(RID p_agent) const {
 
 COMMAND_2(agent_set_time_horizon_agents, RID, p_agent, real_t, p_time_horizon) {
 	ERR_FAIL_COND_MSG(p_time_horizon < 0.0, "Time horizon must be positive.");
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_time_horizon_agents(p_time_horizon);
 }
 
 real_t GodotNavigationServer3D::agent_get_time_horizon_agents(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_time_horizon_agents();
@@ -847,14 +843,14 @@ real_t GodotNavigationServer3D::agent_get_time_horizon_agents(RID p_agent) const
 
 COMMAND_2(agent_set_time_horizon_obstacles, RID, p_agent, real_t, p_time_horizon) {
 	ERR_FAIL_COND_MSG(p_time_horizon < 0.0, "Time horizon must be positive.");
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_time_horizon_obstacles(p_time_horizon);
 }
 
 real_t GodotNavigationServer3D::agent_get_time_horizon_obstacles(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_time_horizon_obstacles();
@@ -862,14 +858,14 @@ real_t GodotNavigationServer3D::agent_get_time_horizon_obstacles(RID p_agent) co
 
 COMMAND_2(agent_set_radius, RID, p_agent, real_t, p_radius) {
 	ERR_FAIL_COND_MSG(p_radius < 0.0, "Radius must be positive.");
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_radius(p_radius);
 }
 
 real_t GodotNavigationServer3D::agent_get_radius(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_radius();
@@ -877,14 +873,14 @@ real_t GodotNavigationServer3D::agent_get_radius(RID p_agent) const {
 
 COMMAND_2(agent_set_height, RID, p_agent, real_t, p_height) {
 	ERR_FAIL_COND_MSG(p_height < 0.0, "Height must be positive.");
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_height(p_height);
 }
 
 real_t GodotNavigationServer3D::agent_get_height(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_height();
@@ -892,63 +888,63 @@ real_t GodotNavigationServer3D::agent_get_height(RID p_agent) const {
 
 COMMAND_2(agent_set_max_speed, RID, p_agent, real_t, p_max_speed) {
 	ERR_FAIL_COND_MSG(p_max_speed < 0.0, "Max speed must be positive.");
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_max_speed(p_max_speed);
 }
 
 real_t GodotNavigationServer3D::agent_get_max_speed(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_max_speed();
 }
 
 COMMAND_2(agent_set_velocity, RID, p_agent, Vector3, p_velocity) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_velocity(p_velocity);
 }
 
 Vector3 GodotNavigationServer3D::agent_get_velocity(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, Vector3());
 
 	return agent->get_velocity();
 }
 
 COMMAND_2(agent_set_velocity_forced, RID, p_agent, Vector3, p_velocity) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_velocity_forced(p_velocity);
 }
 
 COMMAND_2(agent_set_position, RID, p_agent, Vector3, p_position) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_position(p_position);
 }
 
 Vector3 GodotNavigationServer3D::agent_get_position(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, Vector3());
 
 	return agent->get_position();
 }
 
 bool GodotNavigationServer3D::agent_is_map_changed(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, false);
 
 	return agent->is_map_changed();
 }
 
 COMMAND_2(agent_set_avoidance_callback, RID, p_agent, Callable, p_callback) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 
 	agent->set_avoidance_callback(p_callback);
@@ -963,33 +959,33 @@ COMMAND_2(agent_set_avoidance_callback, RID, p_agent, Callable, p_callback) {
 }
 
 bool GodotNavigationServer3D::agent_has_avoidance_callback(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, false);
 
 	return agent->has_avoidance_callback();
 }
 
 COMMAND_2(agent_set_avoidance_layers, RID, p_agent, uint32_t, p_layers) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 	agent->set_avoidance_layers(p_layers);
 }
 
 uint32_t GodotNavigationServer3D::agent_get_avoidance_layers(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_avoidance_layers();
 }
 
 COMMAND_2(agent_set_avoidance_mask, RID, p_agent, uint32_t, p_mask) {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 	agent->set_avoidance_mask(p_mask);
 }
 
 uint32_t GodotNavigationServer3D::agent_get_avoidance_mask(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_avoidance_mask();
@@ -998,13 +994,13 @@ uint32_t GodotNavigationServer3D::agent_get_avoidance_mask(RID p_agent) const {
 COMMAND_2(agent_set_avoidance_priority, RID, p_agent, real_t, p_priority) {
 	ERR_FAIL_COND_MSG(p_priority < 0.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
 	ERR_FAIL_COND_MSG(p_priority > 1.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL(agent);
 	agent->set_avoidance_priority(p_priority);
 }
 
 real_t GodotNavigationServer3D::agent_get_avoidance_priority(RID p_agent) const {
-	NavAgent *agent = agent_owner.get_or_null(p_agent);
+	NavAgent3D *agent = agent_owner.get_or_null(p_agent);
 	ERR_FAIL_NULL_V(agent, 0);
 
 	return agent->get_avoidance_priority();
@@ -1014,11 +1010,11 @@ RID GodotNavigationServer3D::obstacle_create() {
 	MutexLock lock(operations_mutex);
 
 	RID rid = obstacle_owner.make_rid();
-	NavObstacle *obstacle = obstacle_owner.get_or_null(rid);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(rid);
 	obstacle->set_self(rid);
 
 	RID agent_rid = agent_owner.make_rid();
-	NavAgent *agent = agent_owner.get_or_null(agent_rid);
+	NavAgent3D *agent = agent_owner.get_or_null(agent_rid);
 	agent->set_self(agent_rid);
 
 	obstacle->set_agent(agent);
@@ -1027,44 +1023,44 @@ RID GodotNavigationServer3D::obstacle_create() {
 }
 
 COMMAND_2(obstacle_set_avoidance_enabled, RID, p_obstacle, bool, p_enabled) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 
 	obstacle->set_avoidance_enabled(p_enabled);
 }
 
 bool GodotNavigationServer3D::obstacle_get_avoidance_enabled(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, false);
 
 	return obstacle->is_avoidance_enabled();
 }
 
 COMMAND_2(obstacle_set_use_3d_avoidance, RID, p_obstacle, bool, p_enabled) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 
 	obstacle->set_use_3d_avoidance(p_enabled);
 }
 
 bool GodotNavigationServer3D::obstacle_get_use_3d_avoidance(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, false);
 
 	return obstacle->get_use_3d_avoidance();
 }
 
 COMMAND_2(obstacle_set_map, RID, p_obstacle, RID, p_map) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 
 	obstacle->set_map(map);
 }
 
 RID GodotNavigationServer3D::obstacle_get_map(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, RID());
 	if (obstacle->get_map()) {
 		return obstacle->get_map()->get_self();
@@ -1073,14 +1069,14 @@ RID GodotNavigationServer3D::obstacle_get_map(RID p_obstacle) const {
 }
 
 COMMAND_2(obstacle_set_paused, RID, p_obstacle, bool, p_paused) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 
 	obstacle->set_paused(p_paused);
 }
 
 bool GodotNavigationServer3D::obstacle_get_paused(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, false);
 
 	return obstacle->get_paused();
@@ -1088,87 +1084,86 @@ bool GodotNavigationServer3D::obstacle_get_paused(RID p_obstacle) const {
 
 COMMAND_2(obstacle_set_radius, RID, p_obstacle, real_t, p_radius) {
 	ERR_FAIL_COND_MSG(p_radius < 0.0, "Radius must be positive.");
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 
 	obstacle->set_radius(p_radius);
 }
 
 real_t GodotNavigationServer3D::obstacle_get_radius(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, 0);
 
 	return obstacle->get_radius();
 }
 
 COMMAND_2(obstacle_set_height, RID, p_obstacle, real_t, p_height) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 	obstacle->set_height(p_height);
 }
 
 real_t GodotNavigationServer3D::obstacle_get_height(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, 0);
 
 	return obstacle->get_height();
 }
 
 COMMAND_2(obstacle_set_velocity, RID, p_obstacle, Vector3, p_velocity) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 
 	obstacle->set_velocity(p_velocity);
 }
 
 Vector3 GodotNavigationServer3D::obstacle_get_velocity(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, Vector3());
 
 	return obstacle->get_velocity();
 }
 
 COMMAND_2(obstacle_set_position, RID, p_obstacle, Vector3, p_position) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 	obstacle->set_position(p_position);
 }
 
 Vector3 GodotNavigationServer3D::obstacle_get_position(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, Vector3());
 
 	return obstacle->get_position();
 }
 
 void GodotNavigationServer3D::obstacle_set_vertices(RID p_obstacle, const Vector<Vector3> &p_vertices) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 	obstacle->set_vertices(p_vertices);
 }
 
 Vector<Vector3> GodotNavigationServer3D::obstacle_get_vertices(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, Vector<Vector3>());
 
 	return obstacle->get_vertices();
 }
 
 COMMAND_2(obstacle_set_avoidance_layers, RID, p_obstacle, uint32_t, p_layers) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL(obstacle);
 	obstacle->set_avoidance_layers(p_layers);
 }
 
 uint32_t GodotNavigationServer3D::obstacle_get_avoidance_layers(RID p_obstacle) const {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_obstacle);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_obstacle);
 	ERR_FAIL_NULL_V(obstacle, 0);
 
 	return obstacle->get_avoidance_layers();
 }
 
 void GodotNavigationServer3D::parse_source_geometry_data(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, Node *p_root_node, const Callable &p_callback) {
-#ifndef _3D_DISABLED
 	ERR_FAIL_COND_MSG(!Thread::is_main_thread(), "The SceneTree can only be parsed on the main thread. Call this function from the main thread or use call_deferred().");
 	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation mesh.");
 	ERR_FAIL_NULL_MSG(p_root_node, "No parsing root node specified.");
@@ -1176,61 +1171,52 @@ void GodotNavigationServer3D::parse_source_geometry_data(const Ref<NavigationMes
 
 	ERR_FAIL_NULL(NavMeshGenerator3D::get_singleton());
 	NavMeshGenerator3D::get_singleton()->parse_source_geometry_data(p_navigation_mesh, p_source_geometry_data, p_root_node, p_callback);
-#endif // _3D_DISABLED
 }
 
 void GodotNavigationServer3D::bake_from_source_geometry_data(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, const Callable &p_callback) {
-#ifndef _3D_DISABLED
 	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation mesh.");
 	ERR_FAIL_COND_MSG(p_source_geometry_data.is_null(), "Invalid NavigationMeshSourceGeometryData3D.");
 
 	ERR_FAIL_NULL(NavMeshGenerator3D::get_singleton());
 	NavMeshGenerator3D::get_singleton()->bake_from_source_geometry_data(p_navigation_mesh, p_source_geometry_data, p_callback);
-#endif // _3D_DISABLED
 }
 
 void GodotNavigationServer3D::bake_from_source_geometry_data_async(const Ref<NavigationMesh> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, const Callable &p_callback) {
-#ifndef _3D_DISABLED
 	ERR_FAIL_COND_MSG(p_navigation_mesh.is_null(), "Invalid navigation mesh.");
 	ERR_FAIL_COND_MSG(p_source_geometry_data.is_null(), "Invalid NavigationMeshSourceGeometryData3D.");
 
 	ERR_FAIL_NULL(NavMeshGenerator3D::get_singleton());
 	NavMeshGenerator3D::get_singleton()->bake_from_source_geometry_data_async(p_navigation_mesh, p_source_geometry_data, p_callback);
-#endif // _3D_DISABLED
 }
 
 bool GodotNavigationServer3D::is_baking_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) const {
-#ifdef _3D_DISABLED
-	return false;
-#else
 	return NavMeshGenerator3D::get_singleton()->is_baking(p_navigation_mesh);
-#endif // _3D_DISABLED
 }
 
 COMMAND_1(free, RID, p_object) {
 	if (map_owner.owns(p_object)) {
-		NavMap *map = map_owner.get_or_null(p_object);
+		NavMap3D *map = map_owner.get_or_null(p_object);
 
 		// Removes any assigned region
-		for (NavRegion *region : map->get_regions()) {
+		for (NavRegion3D *region : map->get_regions()) {
 			map->remove_region(region);
 			region->set_map(nullptr);
 		}
 
 		// Removes any assigned links
-		for (NavLink *link : map->get_links()) {
+		for (NavLink3D *link : map->get_links()) {
 			map->remove_link(link);
 			link->set_map(nullptr);
 		}
 
 		// Remove any assigned agent
-		for (NavAgent *agent : map->get_agents()) {
+		for (NavAgent3D *agent : map->get_agents()) {
 			map->remove_agent(agent);
 			agent->set_map(nullptr);
 		}
 
 		// Remove any assigned obstacles
-		for (NavObstacle *obstacle : map->get_obstacles()) {
+		for (NavObstacle3D *obstacle : map->get_obstacles()) {
 			map->remove_obstacle(obstacle);
 			obstacle->set_map(nullptr);
 		}
@@ -1243,7 +1229,7 @@ COMMAND_1(free, RID, p_object) {
 		map_owner.free(p_object);
 
 	} else if (region_owner.owns(p_object)) {
-		NavRegion *region = region_owner.get_or_null(p_object);
+		NavRegion3D *region = region_owner.get_or_null(p_object);
 
 		// Removes this region from the map if assigned
 		if (region->get_map() != nullptr) {
@@ -1254,7 +1240,7 @@ COMMAND_1(free, RID, p_object) {
 		region_owner.free(p_object);
 
 	} else if (link_owner.owns(p_object)) {
-		NavLink *link = link_owner.get_or_null(p_object);
+		NavLink3D *link = link_owner.get_or_null(p_object);
 
 		// Removes this link from the map if assigned
 		if (link->get_map() != nullptr) {
@@ -1277,9 +1263,7 @@ COMMAND_1(free, RID, p_object) {
 		ERR_FAIL_NULL(parser);
 
 		generator_parsers.erase(parser);
-#ifndef _3D_DISABLED
 		NavMeshGenerator3D::get_singleton()->set_generator_parsers(generator_parsers);
-#endif
 		geometry_parser_owner.free(parser->self);
 
 	} else {
@@ -1288,7 +1272,7 @@ COMMAND_1(free, RID, p_object) {
 }
 
 void GodotNavigationServer3D::internal_free_agent(RID p_object) {
-	NavAgent *agent = agent_owner.get_or_null(p_object);
+	NavAgent3D *agent = agent_owner.get_or_null(p_object);
 	if (agent) {
 		if (agent->get_map() != nullptr) {
 			agent->get_map()->remove_agent(agent);
@@ -1299,9 +1283,9 @@ void GodotNavigationServer3D::internal_free_agent(RID p_object) {
 }
 
 void GodotNavigationServer3D::internal_free_obstacle(RID p_object) {
-	NavObstacle *obstacle = obstacle_owner.get_or_null(p_object);
+	NavObstacle3D *obstacle = obstacle_owner.get_or_null(p_object);
 	if (obstacle) {
-		NavAgent *obstacle_agent = obstacle->get_agent();
+		NavAgent3D *obstacle_agent = obstacle->get_agent();
 		if (obstacle_agent) {
 			RID _agent_rid = obstacle_agent->get_self();
 			internal_free_agent(_agent_rid);
@@ -1322,12 +1306,10 @@ void GodotNavigationServer3D::set_active(bool p_active) {
 }
 
 void GodotNavigationServer3D::flush_queries() {
-	// In c++ we can't be sure that this is performed in the main thread
-	// even with mutable functions.
 	MutexLock lock(commands_mutex);
 	MutexLock lock2(operations_mutex);
 
-	for (SetCommand *command : commands) {
+	for (SetCommand3D *command : commands) {
 		command->exec(this);
 		memdelete(command);
 	}
@@ -1335,7 +1317,7 @@ void GodotNavigationServer3D::flush_queries() {
 }
 
 void GodotNavigationServer3D::map_force_update(RID p_map) {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL(map);
 
 	flush_queries();
@@ -1344,21 +1326,33 @@ void GodotNavigationServer3D::map_force_update(RID p_map) {
 }
 
 uint32_t GodotNavigationServer3D::map_get_iteration_id(RID p_map) const {
-	NavMap *map = map_owner.get_or_null(p_map);
+	NavMap3D *map = map_owner.get_or_null(p_map);
 	ERR_FAIL_NULL_V(map, 0);
 
 	return map->get_iteration_id();
 }
 
 void GodotNavigationServer3D::sync() {
-#ifndef _3D_DISABLED
 	if (navmesh_generator_3d) {
 		navmesh_generator_3d->sync();
 	}
-#endif // _3D_DISABLED
 }
 
-void GodotNavigationServer3D::process(real_t p_delta_time) {
+void GodotNavigationServer3D::process(double p_delta_time) {
+	// Called for each main loop iteration AFTER node and user script process() and BEFORE RenderingServer sync.
+	// Will run reliably every rendered frame independent of the physics tick rate.
+	// Use for things that (only) need to update once per main loop iteration and rendered frame or is visible to the user.
+	// E.g. (final) sync of objects for this main loop iteration, updating rendered debug visuals, updating debug statistics, ...
+}
+
+void GodotNavigationServer3D::physics_process(double p_delta_time) {
+	// Called for each physics process step AFTER node and user script physics_process() and BEFORE PhysicsServer sync.
+	// Will NOT run reliably every rendered frame. If there is no physics step this function will not run.
+	// Use for physics or step depending calculations and updates where the result affects the next step calculation.
+	// E.g. anything physics sync related, avoidance simulations, physics space state queries, ...
+	// If physics process needs to play catchup this function will be called multiple times per frame so it should not hold
+	// costly updates that are not important outside the stepped calculations to avoid causing a physics performance death spiral.
+
 	flush_queries();
 
 	if (!active) {
@@ -1413,29 +1407,25 @@ void GodotNavigationServer3D::process(real_t p_delta_time) {
 }
 
 void GodotNavigationServer3D::init() {
-#ifndef _3D_DISABLED
 	navmesh_generator_3d = memnew(NavMeshGenerator3D);
 	RWLockRead read_lock(geometry_parser_rwlock);
 	navmesh_generator_3d->set_generator_parsers(generator_parsers);
-#endif // _3D_DISABLED
 }
 
 void GodotNavigationServer3D::finish() {
 	flush_queries();
-#ifndef _3D_DISABLED
 	if (navmesh_generator_3d) {
 		navmesh_generator_3d->finish();
 		memdelete(navmesh_generator_3d);
 		navmesh_generator_3d = nullptr;
 	}
-#endif // _3D_DISABLED
 }
 
 void GodotNavigationServer3D::query_path(const Ref<NavigationPathQueryParameters3D> &p_query_parameters, Ref<NavigationPathQueryResult3D> p_query_result, const Callable &p_callback) {
 	ERR_FAIL_COND(p_query_parameters.is_null());
 	ERR_FAIL_COND(p_query_result.is_null());
 
-	NavMap *map = map_owner.get_or_null(p_query_parameters->get_map());
+	NavMap3D *map = map_owner.get_or_null(p_query_parameters->get_map());
 	ERR_FAIL_NULL(map);
 
 	NavMeshQueries3D::map_query_path(map, p_query_parameters, p_query_result, p_callback);
@@ -1450,9 +1440,7 @@ RID GodotNavigationServer3D::source_geometry_parser_create() {
 	parser->self = rid;
 
 	generator_parsers.push_back(parser);
-#ifndef _3D_DISABLED
 	NavMeshGenerator3D::get_singleton()->set_generator_parsers(generator_parsers);
-#endif
 	return rid;
 }
 
diff --git a/engine/modules/navigation/3d/godot_navigation_server_3d.h b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.h
similarity index 95%
rename from engine/modules/navigation/3d/godot_navigation_server_3d.h
rename to engine/modules/navigation_3d/3d/godot_navigation_server_3d.h
index c595fbc0..35b90536 100644
--- a/engine/modules/navigation/3d/godot_navigation_server_3d.h
+++ b/engine/modules/navigation_3d/3d/godot_navigation_server_3d.h
@@ -28,14 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_NAVIGATION_SERVER_3D_H
-#define GODOT_NAVIGATION_SERVER_3D_H
+#pragma once
 
-#include "../nav_agent.h"
-#include "../nav_link.h"
-#include "../nav_map.h"
-#include "../nav_obstacle.h"
-#include "../nav_region.h"
+#include "../nav_agent_3d.h"
+#include "../nav_link_3d.h"
+#include "../nav_map_3d.h"
+#include "../nav_obstacle_3d.h"
+#include "../nav_region_3d.h"
 
 #include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
@@ -58,12 +57,10 @@
 	void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1)
 
 class GodotNavigationServer3D;
-#ifndef _3D_DISABLED
 class NavMeshGenerator3D;
-#endif // _3D_DISABLED
 
-struct SetCommand {
-	virtual ~SetCommand() {}
+struct SetCommand3D {
+	virtual ~SetCommand3D() {}
 	virtual void exec(GodotNavigationServer3D *server) = 0;
 };
 
@@ -72,21 +69,19 @@ class GodotNavigationServer3D : public NavigationServer3D {
 	/// Mutex used to make any operation threadsafe.
 	Mutex operations_mutex;
 
-	LocalVector<SetCommand *> commands;
+	LocalVector<SetCommand3D *> commands;
 
-	mutable RID_Owner<NavLink> link_owner;
-	mutable RID_Owner<NavMap> map_owner;
-	mutable RID_Owner<NavRegion> region_owner;
-	mutable RID_Owner<NavAgent> agent_owner;
-	mutable RID_Owner<NavObstacle> obstacle_owner;
+	mutable RID_Owner<NavLink3D> link_owner;
+	mutable RID_Owner<NavMap3D> map_owner;
+	mutable RID_Owner<NavRegion3D> region_owner;
+	mutable RID_Owner<NavAgent3D> agent_owner;
+	mutable RID_Owner<NavObstacle3D> obstacle_owner;
 
 	bool active = true;
-	LocalVector<NavMap *> active_maps;
+	LocalVector<NavMap3D *> active_maps;
 	LocalVector<uint32_t> active_maps_iteration_id;
 
-#ifndef _3D_DISABLED
 	NavMeshGenerator3D *navmesh_generator_3d = nullptr;
-#endif // _3D_DISABLED
 
 	// Performance Monitor
 	int pm_region_count = 0;
@@ -103,7 +98,7 @@ public:
 	GodotNavigationServer3D();
 	virtual ~GodotNavigationServer3D();
 
-	void add_command(SetCommand *command);
+	void add_command(SetCommand3D *command);
 
 	virtual TypedArray<RID> get_maps() const override;
 
@@ -285,7 +280,9 @@ public:
 	virtual void set_active(bool p_active) override;
 
 	void flush_queries();
-	virtual void process(real_t p_delta_time) override;
+
+	virtual void process(double p_delta_time) override;
+	virtual void physics_process(double p_delta_time) override;
 	virtual void init() override;
 	virtual void sync() override;
 	virtual void finish() override;
@@ -301,5 +298,3 @@ private:
 
 #undef COMMAND_1
 #undef COMMAND_2
-
-#endif // GODOT_NAVIGATION_SERVER_3D_H
diff --git a/engine/modules/navigation/3d/nav_base_iteration_3d.h b/engine/modules/navigation_3d/3d/nav_base_iteration_3d.h
similarity index 93%
rename from engine/modules/navigation/3d/nav_base_iteration_3d.h
rename to engine/modules/navigation_3d/3d/nav_base_iteration_3d.h
index d289c5d5..63df5bc3 100644
--- a/engine/modules/navigation/3d/nav_base_iteration_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_base_iteration_3d.h
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_BASE_ITERATION_3D_H
-#define NAV_BASE_ITERATION_3D_H
+#pragma once
+
+#include "../nav_utils_3d.h"
 
 #include "servers/navigation/navigation_utilities.h"
 
-struct NavBaseIteration {
+struct NavBaseIteration3D {
 	uint32_t id = UINT32_MAX;
 	bool enabled = true;
 	uint32_t navigation_layers = 1;
@@ -43,6 +44,7 @@ struct NavBaseIteration {
 	ObjectID owner_object_id;
 	RID owner_rid;
 	bool owner_use_edge_connections = false;
+	LocalVector<Nav3D::Polygon> navmesh_polygons;
 
 	bool get_enabled() const { return enabled; }
 	NavigationUtilities::PathSegmentType get_type() const { return owner_type; }
@@ -52,6 +54,5 @@ struct NavBaseIteration {
 	real_t get_enter_cost() const { return enter_cost; }
 	real_t get_travel_cost() const { return travel_cost; }
 	bool get_use_edge_connections() const { return owner_use_edge_connections; }
+	const LocalVector<Nav3D::Polygon> &get_navmesh_polygons() const { return navmesh_polygons; }
 };
-
-#endif // NAV_BASE_ITERATION_3D_H
diff --git a/engine/modules/navigation/3d/nav_map_builder_3d.cpp b/engine/modules/navigation_3d/3d/nav_map_builder_3d.cpp
similarity index 68%
rename from engine/modules/navigation/3d/nav_map_builder_3d.cpp
rename to engine/modules/navigation_3d/3d/nav_map_builder_3d.cpp
index 256d984c..268c98f8 100644
--- a/engine/modules/navigation/3d/nav_map_builder_3d.cpp
+++ b/engine/modules/navigation_3d/3d/nav_map_builder_3d.cpp
@@ -28,22 +28,22 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef _3D_DISABLED
-
 #include "nav_map_builder_3d.h"
 
-#include "../nav_link.h"
-#include "../nav_map.h"
-#include "../nav_region.h"
+#include "../nav_link_3d.h"
+#include "../nav_map_3d.h"
+#include "../nav_region_3d.h"
 #include "nav_map_iteration_3d.h"
 #include "nav_region_iteration_3d.h"
 
-gd::PointKey NavMapBuilder3D::get_point_key(const Vector3 &p_pos, const Vector3 &p_cell_size) {
+using namespace Nav3D;
+
+PointKey NavMapBuilder3D::get_point_key(const Vector3 &p_pos, const Vector3 &p_cell_size) {
 	const int x = static_cast<int>(Math::floor(p_pos.x / p_cell_size.x));
 	const int y = static_cast<int>(Math::floor(p_pos.y / p_cell_size.y));
 	const int z = static_cast<int>(Math::floor(p_pos.z / p_cell_size.z));
 
-	gd::PointKey p;
+	PointKey p;
 	p.key = 0;
 	p.x = x;
 	p.y = y;
@@ -51,8 +51,8 @@ gd::PointKey NavMapBuilder3D::get_point_key(const Vector3 &p_pos, const Vector3
 	return p;
 }
 
-void NavMapBuilder3D::build_navmap_iteration(NavMapIterationBuild &r_build) {
-	gd::PerformanceData &performance_data = r_build.performance_data;
+void NavMapBuilder3D::build_navmap_iteration(NavMapIterationBuild3D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
 
 	performance_data.pm_polygon_count = 0;
 	performance_data.pm_edge_count = 0;
@@ -73,26 +73,26 @@ void NavMapBuilder3D::build_navmap_iteration(NavMapIterationBuild &r_build) {
 	_build_update_map_iteration(r_build);
 }
 
-void NavMapBuilder3D::_build_step_gather_region_polygons(NavMapIterationBuild &r_build) {
-	gd::PerformanceData &performance_data = r_build.performance_data;
-	NavMapIteration *map_iteration = r_build.map_iteration;
+void NavMapBuilder3D::_build_step_gather_region_polygons(NavMapIterationBuild3D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+	NavMapIteration3D *map_iteration = r_build.map_iteration;
 
-	LocalVector<NavRegionIteration> &regions = map_iteration->region_iterations;
-	HashMap<uint32_t, LocalVector<gd::Edge::Connection>> &region_external_connections = map_iteration->external_region_connections;
+	LocalVector<NavRegionIteration3D> &regions = map_iteration->region_iterations;
+	HashMap<uint32_t, LocalVector<Edge::Connection>> &region_external_connections = map_iteration->external_region_connections;
 
 	// Remove regions connections.
 	region_external_connections.clear();
-	for (const NavRegionIteration &region : regions) {
-		region_external_connections[region.id] = LocalVector<gd::Edge::Connection>();
+	for (const NavRegionIteration3D &region : regions) {
+		region_external_connections[region.id] = LocalVector<Edge::Connection>();
 	}
 
 	// Copy all region polygons in the map.
 	int polygon_count = 0;
-	for (NavRegionIteration &region : regions) {
+	for (NavRegionIteration3D &region : regions) {
 		if (!region.get_enabled()) {
 			continue;
 		}
-		LocalVector<gd::Polygon> &polygons_source = region.navmesh_polygons;
+		LocalVector<Polygon> &polygons_source = region.navmesh_polygons;
 		for (uint32_t n = 0; n < polygons_source.size(); n++) {
 			polygons_source[n].id = polygon_count;
 			polygon_count++;
@@ -103,42 +103,42 @@ void NavMapBuilder3D::_build_step_gather_region_polygons(NavMapIterationBuild &r
 	r_build.polygon_count = polygon_count;
 }
 
-void NavMapBuilder3D::_build_step_find_edge_connection_pairs(NavMapIterationBuild &r_build) {
-	gd::PerformanceData &performance_data = r_build.performance_data;
-	NavMapIteration *map_iteration = r_build.map_iteration;
+void NavMapBuilder3D::_build_step_find_edge_connection_pairs(NavMapIterationBuild3D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+	NavMapIteration3D *map_iteration = r_build.map_iteration;
 	int polygon_count = r_build.polygon_count;
-
-	HashMap<gd::EdgeKey, gd::EdgeConnectionPair, gd::EdgeKey> &connection_pairs_map = r_build.iter_connection_pairs_map;
+	const Vector3 merge_rasterizer_cell_size = r_build.merge_rasterizer_cell_size;
+	HashMap<EdgeKey, EdgeConnectionPair, EdgeKey> &connection_pairs_map = r_build.iter_connection_pairs_map;
 
 	// Group all edges per key.
 	connection_pairs_map.clear();
 	connection_pairs_map.reserve(polygon_count);
 	int free_edges_count = 0; // How many ConnectionPairs have only one Connection.
 
-	for (NavRegionIteration &region : map_iteration->region_iterations) {
+	for (NavRegionIteration3D &region : map_iteration->region_iterations) {
 		if (!region.get_enabled()) {
 			continue;
 		}
 
-		for (gd::Polygon &poly : region.navmesh_polygons) {
-			for (uint32_t p = 0; p < poly.points.size(); p++) {
-				const int next_point = (p + 1) % poly.points.size();
-				const gd::EdgeKey ek(poly.points[p].key, poly.points[next_point].key);
+		for (Polygon &poly : region.navmesh_polygons) {
+			for (uint32_t p = 0; p < poly.vertices.size(); p++) {
+				const int next_point = (p + 1) % poly.vertices.size();
+				const EdgeKey ek(get_point_key(poly.vertices[p], merge_rasterizer_cell_size), get_point_key(poly.vertices[next_point], merge_rasterizer_cell_size));
 
-				HashMap<gd::EdgeKey, gd::EdgeConnectionPair, gd::EdgeKey>::Iterator pair_it = connection_pairs_map.find(ek);
+				HashMap<EdgeKey, EdgeConnectionPair, EdgeKey>::Iterator pair_it = connection_pairs_map.find(ek);
 				if (!pair_it) {
-					pair_it = connection_pairs_map.insert(ek, gd::EdgeConnectionPair());
+					pair_it = connection_pairs_map.insert(ek, EdgeConnectionPair());
 					performance_data.pm_edge_count += 1;
 					++free_edges_count;
 				}
-				gd::EdgeConnectionPair &pair = pair_it->value;
+				EdgeConnectionPair &pair = pair_it->value;
 				if (pair.size < 2) {
 					// Add the polygon/edge tuple to this key.
-					gd::Edge::Connection new_connection;
+					Edge::Connection new_connection;
 					new_connection.polygon = &poly;
 					new_connection.edge = p;
-					new_connection.pathway_start = poly.points[p].pos;
-					new_connection.pathway_end = poly.points[next_point].pos;
+					new_connection.pathway_start = poly.vertices[p];
+					new_connection.pathway_end = poly.vertices[next_point];
 
 					pair.connections[pair.size] = new_connection;
 					++pair.size;
@@ -157,23 +157,23 @@ void NavMapBuilder3D::_build_step_find_edge_connection_pairs(NavMapIterationBuil
 	r_build.free_edge_count = free_edges_count;
 }
 
-void NavMapBuilder3D::_build_step_merge_edge_connection_pairs(NavMapIterationBuild &r_build) {
-	gd::PerformanceData &performance_data = r_build.performance_data;
+void NavMapBuilder3D::_build_step_merge_edge_connection_pairs(NavMapIterationBuild3D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
 
-	HashMap<gd::EdgeKey, gd::EdgeConnectionPair, gd::EdgeKey> &connection_pairs_map = r_build.iter_connection_pairs_map;
-	LocalVector<gd::Edge::Connection> &free_edges = r_build.iter_free_edges;
+	HashMap<EdgeKey, EdgeConnectionPair, EdgeKey> &connection_pairs_map = r_build.iter_connection_pairs_map;
+	LocalVector<Edge::Connection> &free_edges = r_build.iter_free_edges;
 	int free_edges_count = r_build.free_edge_count;
 	bool use_edge_connections = r_build.use_edge_connections;
 
 	free_edges.clear();
 	free_edges.reserve(free_edges_count);
 
-	for (const KeyValue<gd::EdgeKey, gd::EdgeConnectionPair> &pair_it : connection_pairs_map) {
-		const gd::EdgeConnectionPair &pair = pair_it.value;
+	for (const KeyValue<EdgeKey, EdgeConnectionPair> &pair_it : connection_pairs_map) {
+		const EdgeConnectionPair &pair = pair_it.value;
 		if (pair.size == 2) {
 			// Connect edge that are shared in different polygons.
-			const gd::Edge::Connection &c1 = pair.connections[0];
-			const gd::Edge::Connection &c2 = pair.connections[1];
+			const Edge::Connection &c1 = pair.connections[0];
+			const Edge::Connection &c2 = pair.connections[1];
 			c1.polygon->edges[c1.edge].connections.push_back(c2);
 			c2.polygon->edges[c2.edge].connections.push_back(c1);
 			// Note: The pathway_start/end are full for those connection and do not need to be modified.
@@ -187,13 +187,13 @@ void NavMapBuilder3D::_build_step_merge_edge_connection_pairs(NavMapIterationBui
 	}
 }
 
-void NavMapBuilder3D::_build_step_edge_connection_margin_connections(NavMapIterationBuild &r_build) {
-	gd::PerformanceData &performance_data = r_build.performance_data;
-	NavMapIteration *map_iteration = r_build.map_iteration;
+void NavMapBuilder3D::_build_step_edge_connection_margin_connections(NavMapIterationBuild3D &r_build) {
+	PerformanceData &performance_data = r_build.performance_data;
+	NavMapIteration3D *map_iteration = r_build.map_iteration;
 
 	real_t edge_connection_margin = r_build.edge_connection_margin;
-	LocalVector<gd::Edge::Connection> &free_edges = r_build.iter_free_edges;
-	HashMap<uint32_t, LocalVector<gd::Edge::Connection>> &region_external_connections = map_iteration->external_region_connections;
+	LocalVector<Edge::Connection> &free_edges = r_build.iter_free_edges;
+	HashMap<uint32_t, LocalVector<Edge::Connection>> &region_external_connections = map_iteration->external_region_connections;
 
 	// Find the compatible near edges.
 	//
@@ -207,18 +207,18 @@ void NavMapBuilder3D::_build_step_edge_connection_margin_connections(NavMapItera
 	const real_t edge_connection_margin_squared = edge_connection_margin * edge_connection_margin;
 
 	for (uint32_t i = 0; i < free_edges.size(); i++) {
-		const gd::Edge::Connection &free_edge = free_edges[i];
-		Vector3 edge_p1 = free_edge.polygon->points[free_edge.edge].pos;
-		Vector3 edge_p2 = free_edge.polygon->points[(free_edge.edge + 1) % free_edge.polygon->points.size()].pos;
+		const Edge::Connection &free_edge = free_edges[i];
+		Vector3 edge_p1 = free_edge.polygon->vertices[free_edge.edge];
+		Vector3 edge_p2 = free_edge.polygon->vertices[(free_edge.edge + 1) % free_edge.polygon->vertices.size()];
 
 		for (uint32_t j = 0; j < free_edges.size(); j++) {
-			const gd::Edge::Connection &other_edge = free_edges[j];
+			const Edge::Connection &other_edge = free_edges[j];
 			if (i == j || free_edge.polygon->owner == other_edge.polygon->owner) {
 				continue;
 			}
 
-			Vector3 other_edge_p1 = other_edge.polygon->points[other_edge.edge].pos;
-			Vector3 other_edge_p2 = other_edge.polygon->points[(other_edge.edge + 1) % other_edge.polygon->points.size()].pos;
+			Vector3 other_edge_p1 = other_edge.polygon->vertices[other_edge.edge];
+			Vector3 other_edge_p2 = other_edge.polygon->vertices[(other_edge.edge + 1) % other_edge.polygon->vertices.size()];
 
 			// Compute the projection of the opposite edge on the current one
 			Vector3 edge_vector = edge_p2 - edge_p1;
@@ -252,7 +252,7 @@ void NavMapBuilder3D::_build_step_edge_connection_margin_connections(NavMapItera
 			}
 
 			// The edges can now be connected.
-			gd::Edge::Connection new_connection = other_edge;
+			Edge::Connection new_connection = other_edge;
 			new_connection.pathway_start = (self1 + other1) / 2.0;
 			new_connection.pathway_end = (self2 + other2) / 2.0;
 			free_edge.polygon->edges[free_edge.edge].connections.push_back(new_connection);
@@ -264,14 +264,13 @@ void NavMapBuilder3D::_build_step_edge_connection_margin_connections(NavMapItera
 	}
 }
 
-void NavMapBuilder3D::_build_step_navlink_connections(NavMapIterationBuild &r_build) {
-	NavMapIteration *map_iteration = r_build.map_iteration;
+void NavMapBuilder3D::_build_step_navlink_connections(NavMapIterationBuild3D &r_build) {
+	NavMapIteration3D *map_iteration = r_build.map_iteration;
 
 	real_t link_connection_radius = r_build.link_connection_radius;
-	Vector3 merge_rasterizer_cell_size = r_build.merge_rasterizer_cell_size;
 
-	LocalVector<gd::Polygon> &link_polygons = map_iteration->link_polygons;
-	LocalVector<NavLinkIteration> &links = map_iteration->link_iterations;
+	LocalVector<Polygon> &link_polygons = map_iteration->link_polygons;
+	LocalVector<NavLinkIteration3D> &links = map_iteration->link_iterations;
 	int polygon_count = r_build.polygon_count;
 
 	real_t link_connection_radius_sqr = link_connection_radius * link_connection_radius;
@@ -279,22 +278,22 @@ void NavMapBuilder3D::_build_step_navlink_connections(NavMapIterationBuild &r_bu
 	link_polygons.resize(links.size());
 
 	// Search for polygons within range of a nav link.
-	for (const NavLinkIteration &link : links) {
+	for (const NavLinkIteration3D &link : links) {
 		if (!link.get_enabled()) {
 			continue;
 		}
 		const Vector3 link_start_pos = link.get_start_position();
 		const Vector3 link_end_pos = link.get_end_position();
 
-		gd::Polygon *closest_start_polygon = nullptr;
+		Polygon *closest_start_polygon = nullptr;
 		real_t closest_start_sqr_dist = link_connection_radius_sqr;
 		Vector3 closest_start_point;
 
-		gd::Polygon *closest_end_polygon = nullptr;
+		Polygon *closest_end_polygon = nullptr;
 		real_t closest_end_sqr_dist = link_connection_radius_sqr;
 		Vector3 closest_end_point;
 
-		for (NavRegionIteration &region : map_iteration->region_iterations) {
+		for (NavRegionIteration3D &region : map_iteration->region_iterations) {
 			if (!region.get_enabled()) {
 				continue;
 			}
@@ -303,10 +302,9 @@ void NavMapBuilder3D::_build_step_navlink_connections(NavMapIterationBuild &r_bu
 				continue;
 			}
 
-			for (gd::Polygon &polyon : region.navmesh_polygons) {
-				//for (gd::Polygon &polyon : polygons) {
-				for (uint32_t point_id = 2; point_id < polyon.points.size(); point_id += 1) {
-					const Face3 face(polyon.points[0].pos, polyon.points[point_id - 1].pos, polyon.points[point_id].pos);
+			for (Polygon &polyon : region.navmesh_polygons) {
+				for (uint32_t point_id = 2; point_id < polyon.vertices.size(); point_id += 1) {
+					const Face3 face(polyon.vertices[0], polyon.vertices[point_id - 1], polyon.vertices[point_id]);
 
 					{
 						const Vector3 start_point = face.get_closest_point_to(link_start_pos);
@@ -337,61 +335,61 @@ void NavMapBuilder3D::_build_step_navlink_connections(NavMapIterationBuild &r_bu
 
 		// If we have both a start and end point, then create a synthetic polygon to route through.
 		if (closest_start_polygon && closest_end_polygon) {
-			gd::Polygon &new_polygon = link_polygons[link_poly_idx++];
+			Polygon &new_polygon = link_polygons[link_poly_idx++];
 			new_polygon.id = polygon_count++;
 			new_polygon.owner = &link;
 
 			new_polygon.edges.clear();
 			new_polygon.edges.resize(4);
-			new_polygon.points.resize(4);
+			new_polygon.vertices.resize(4);
 
 			// Build a set of vertices that create a thin polygon going from the start to the end point.
-			new_polygon.points[0] = { closest_start_point, get_point_key(closest_start_point, merge_rasterizer_cell_size) };
-			new_polygon.points[1] = { closest_start_point, get_point_key(closest_start_point, merge_rasterizer_cell_size) };
-			new_polygon.points[2] = { closest_end_point, get_point_key(closest_end_point, merge_rasterizer_cell_size) };
-			new_polygon.points[3] = { closest_end_point, get_point_key(closest_end_point, merge_rasterizer_cell_size) };
+			new_polygon.vertices[0] = closest_start_point;
+			new_polygon.vertices[1] = closest_start_point;
+			new_polygon.vertices[2] = closest_end_point;
+			new_polygon.vertices[3] = closest_end_point;
 
 			// Setup connections to go forward in the link.
 			{
-				gd::Edge::Connection entry_connection;
+				Edge::Connection entry_connection;
 				entry_connection.polygon = &new_polygon;
 				entry_connection.edge = -1;
-				entry_connection.pathway_start = new_polygon.points[0].pos;
-				entry_connection.pathway_end = new_polygon.points[1].pos;
+				entry_connection.pathway_start = new_polygon.vertices[0];
+				entry_connection.pathway_end = new_polygon.vertices[1];
 				closest_start_polygon->edges[0].connections.push_back(entry_connection);
 
-				gd::Edge::Connection exit_connection;
+				Edge::Connection exit_connection;
 				exit_connection.polygon = closest_end_polygon;
 				exit_connection.edge = -1;
-				exit_connection.pathway_start = new_polygon.points[2].pos;
-				exit_connection.pathway_end = new_polygon.points[3].pos;
+				exit_connection.pathway_start = new_polygon.vertices[2];
+				exit_connection.pathway_end = new_polygon.vertices[3];
 				new_polygon.edges[2].connections.push_back(exit_connection);
 			}
 
 			// If the link is bi-directional, create connections from the end to the start.
 			if (link.is_bidirectional()) {
-				gd::Edge::Connection entry_connection;
+				Edge::Connection entry_connection;
 				entry_connection.polygon = &new_polygon;
 				entry_connection.edge = -1;
-				entry_connection.pathway_start = new_polygon.points[2].pos;
-				entry_connection.pathway_end = new_polygon.points[3].pos;
+				entry_connection.pathway_start = new_polygon.vertices[2];
+				entry_connection.pathway_end = new_polygon.vertices[3];
 				closest_end_polygon->edges[0].connections.push_back(entry_connection);
 
-				gd::Edge::Connection exit_connection;
+				Edge::Connection exit_connection;
 				exit_connection.polygon = closest_start_polygon;
 				exit_connection.edge = -1;
-				exit_connection.pathway_start = new_polygon.points[0].pos;
-				exit_connection.pathway_end = new_polygon.points[1].pos;
+				exit_connection.pathway_start = new_polygon.vertices[0];
+				exit_connection.pathway_end = new_polygon.vertices[1];
 				new_polygon.edges[0].connections.push_back(exit_connection);
 			}
 		}
 	}
 }
 
-void NavMapBuilder3D::_build_update_map_iteration(NavMapIterationBuild &r_build) {
-	NavMapIteration *map_iteration = r_build.map_iteration;
+void NavMapBuilder3D::_build_update_map_iteration(NavMapIterationBuild3D &r_build) {
+	NavMapIteration3D *map_iteration = r_build.map_iteration;
 
-	LocalVector<gd::Polygon> &link_polygons = map_iteration->link_polygons;
+	LocalVector<Polygon> &link_polygons = map_iteration->link_polygons;
 
 	map_iteration->navmesh_polygon_count = r_build.polygon_count;
 	map_iteration->link_polygon_count = link_polygons.size();
@@ -405,5 +403,3 @@ void NavMapBuilder3D::_build_update_map_iteration(NavMapIterationBuild &r_build)
 	}
 	map_iteration->path_query_slots_mutex.unlock();
 }
-
-#endif // _3D_DISABLED
diff --git a/engine/modules/navigation/3d/nav_map_builder_3d.h b/engine/modules/navigation_3d/3d/nav_map_builder_3d.h
similarity index 84%
rename from engine/modules/navigation/3d/nav_map_builder_3d.h
rename to engine/modules/navigation_3d/3d/nav_map_builder_3d.h
index 819097d1..d943231e 100644
--- a/engine/modules/navigation/3d/nav_map_builder_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_map_builder_3d.h
@@ -28,25 +28,22 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_MAP_BUILDER_3D_H
-#define NAV_MAP_BUILDER_3D_H
+#pragma once
 
-#include "../nav_utils.h"
+#include "../nav_utils_3d.h"
 
-struct NavMapIterationBuild;
+struct NavMapIterationBuild3D;
 
 class NavMapBuilder3D {
-	static void _build_step_gather_region_polygons(NavMapIterationBuild &r_build);
-	static void _build_step_find_edge_connection_pairs(NavMapIterationBuild &r_build);
-	static void _build_step_merge_edge_connection_pairs(NavMapIterationBuild &r_build);
-	static void _build_step_edge_connection_margin_connections(NavMapIterationBuild &r_build);
-	static void _build_step_navlink_connections(NavMapIterationBuild &r_build);
-	static void _build_update_map_iteration(NavMapIterationBuild &r_build);
+	static void _build_step_gather_region_polygons(NavMapIterationBuild3D &r_build);
+	static void _build_step_find_edge_connection_pairs(NavMapIterationBuild3D &r_build);
+	static void _build_step_merge_edge_connection_pairs(NavMapIterationBuild3D &r_build);
+	static void _build_step_edge_connection_margin_connections(NavMapIterationBuild3D &r_build);
+	static void _build_step_navlink_connections(NavMapIterationBuild3D &r_build);
+	static void _build_update_map_iteration(NavMapIterationBuild3D &r_build);
 
 public:
-	static gd::PointKey get_point_key(const Vector3 &p_pos, const Vector3 &p_cell_size);
+	static Nav3D::PointKey get_point_key(const Vector3 &p_pos, const Vector3 &p_cell_size);
 
-	static void build_navmap_iteration(NavMapIterationBuild &r_build);
+	static void build_navmap_iteration(NavMapIterationBuild3D &r_build);
 };
-
-#endif // NAV_MAP_BUILDER_3D_H
diff --git a/engine/modules/navigation/3d/nav_map_iteration_3d.h b/engine/modules/navigation_3d/3d/nav_map_iteration_3d.h
similarity index 77%
rename from engine/modules/navigation/3d/nav_map_iteration_3d.h
rename to engine/modules/navigation_3d/3d/nav_map_iteration_3d.h
index 47029f0f..d84df24c 100644
--- a/engine/modules/navigation/3d/nav_map_iteration_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_map_iteration_3d.h
@@ -28,34 +28,33 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_MAP_ITERATION_3D_H
-#define NAV_MAP_ITERATION_3D_H
+#pragma once
 
-#include "../nav_rid.h"
-#include "../nav_utils.h"
+#include "../nav_rid_3d.h"
+#include "../nav_utils_3d.h"
 #include "nav_mesh_queries_3d.h"
 
 #include "core/math/math_defs.h"
 #include "core/os/semaphore.h"
 
-struct NavLinkIteration;
-class NavRegion;
-struct NavRegionIteration;
-struct NavMapIteration;
+struct NavLinkIteration3D;
+class NavRegion3D;
+struct NavRegionIteration3D;
+struct NavMapIteration3D;
 
-struct NavMapIterationBuild {
+struct NavMapIterationBuild3D {
 	Vector3 merge_rasterizer_cell_size;
 	bool use_edge_connections = true;
 	real_t edge_connection_margin;
 	real_t link_connection_radius;
-	gd::PerformanceData performance_data;
+	Nav3D::PerformanceData performance_data;
 	int polygon_count = 0;
 	int free_edge_count = 0;
 
-	HashMap<gd::EdgeKey, gd::EdgeConnectionPair, gd::EdgeKey> iter_connection_pairs_map;
-	LocalVector<gd::Edge::Connection> iter_free_edges;
+	HashMap<Nav3D::EdgeKey, Nav3D::EdgeConnectionPair, Nav3D::EdgeKey> iter_connection_pairs_map;
+	LocalVector<Nav3D::Edge::Connection> iter_free_edges;
 
-	NavMapIteration *map_iteration = nullptr;
+	NavMapIteration3D *map_iteration = nullptr;
 
 	int navmesh_polygon_count = 0;
 	int link_polygon_count = 0;
@@ -73,42 +72,40 @@ struct NavMapIterationBuild {
 	}
 };
 
-struct NavMapIteration {
+struct NavMapIteration3D {
 	mutable SafeNumeric<uint32_t> users;
 	RWLock rwlock;
 
 	Vector3 map_up;
-	LocalVector<gd::Polygon> link_polygons;
+	LocalVector<Nav3D::Polygon> link_polygons;
 
-	LocalVector<NavRegionIteration> region_iterations;
-	LocalVector<NavLinkIteration> link_iterations;
+	LocalVector<NavRegionIteration3D> region_iterations;
+	LocalVector<NavLinkIteration3D> link_iterations;
 
 	int navmesh_polygon_count = 0;
 	int link_polygon_count = 0;
 
 	// The edge connections that the map builds on top with the edge connection margin.
-	HashMap<uint32_t, LocalVector<gd::Edge::Connection>> external_region_connections;
+	HashMap<uint32_t, LocalVector<Nav3D::Edge::Connection>> external_region_connections;
 
-	HashMap<NavRegion *, uint32_t> region_ptr_to_region_id;
+	HashMap<NavRegion3D *, uint32_t> region_ptr_to_region_id;
 
 	LocalVector<NavMeshQueries3D::PathQuerySlot> path_query_slots;
 	Mutex path_query_slots_mutex;
 	Semaphore path_query_slots_semaphore;
 };
 
-class NavMapIterationRead {
-	const NavMapIteration &map_iteration;
+class NavMapIterationRead3D {
+	const NavMapIteration3D &map_iteration;
 
 public:
-	_ALWAYS_INLINE_ NavMapIterationRead(const NavMapIteration &p_iteration) :
+	_ALWAYS_INLINE_ NavMapIterationRead3D(const NavMapIteration3D &p_iteration) :
 			map_iteration(p_iteration) {
 		map_iteration.rwlock.read_lock();
 		map_iteration.users.increment();
 	}
-	_ALWAYS_INLINE_ ~NavMapIterationRead() {
+	_ALWAYS_INLINE_ ~NavMapIterationRead3D() {
 		map_iteration.users.decrement();
 		map_iteration.rwlock.read_unlock();
 	}
 };
-
-#endif // NAV_MAP_ITERATION_3D_H
diff --git a/engine/modules/navigation/3d/nav_mesh_generator_3d.cpp b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.cpp
similarity index 99%
rename from engine/modules/navigation/3d/nav_mesh_generator_3d.cpp
rename to engine/modules/navigation_3d/3d/nav_mesh_generator_3d.cpp
index 05cc2ae5..b489adf5 100644
--- a/engine/modules/navigation/3d/nav_mesh_generator_3d.cpp
+++ b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.cpp
@@ -28,8 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef _3D_DISABLED
-
 #include "nav_mesh_generator_3d.h"
 
 #include "core/config/project_settings.h"
@@ -72,7 +70,7 @@ NavMeshGenerator3D::~NavMeshGenerator3D() {
 }
 
 void NavMeshGenerator3D::sync() {
-	if (generator_tasks.size() == 0) {
+	if (generator_tasks.is_empty()) {
 		return;
 	}
 
@@ -94,6 +92,7 @@ void NavMeshGenerator3D::sync() {
 				if (generator_task->callback.is_valid()) {
 					generator_emit_callback(generator_task->callback);
 				}
+				generator_task->navigation_mesh->emit_changed();
 				memdelete(generator_task);
 			}
 		}
@@ -151,6 +150,7 @@ void NavMeshGenerator3D::bake_from_source_geometry_data(Ref<NavigationMesh> p_na
 		if (p_callback.is_valid()) {
 			generator_emit_callback(p_callback);
 		}
+		p_navigation_mesh->emit_changed();
 		return;
 	}
 
@@ -170,6 +170,8 @@ void NavMeshGenerator3D::bake_from_source_geometry_data(Ref<NavigationMesh> p_na
 	if (p_callback.is_valid()) {
 		generator_emit_callback(p_callback);
 	}
+
+	p_navigation_mesh->emit_changed();
 }
 
 void NavMeshGenerator3D::bake_from_source_geometry_data_async(Ref<NavigationMesh> p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, const Callable &p_callback) {
@@ -181,6 +183,7 @@ void NavMeshGenerator3D::bake_from_source_geometry_data_async(Ref<NavigationMesh
 		if (p_callback.is_valid()) {
 			generator_emit_callback(p_callback);
 		}
+		p_navigation_mesh->emit_changed();
 		return;
 	}
 
@@ -560,5 +563,3 @@ bool NavMeshGenerator3D::generator_emit_callback(const Callable &p_callback) {
 
 	return ce.error == Callable::CallError::CALL_OK;
 }
-
-#endif // _3D_DISABLED
diff --git a/engine/modules/navigation/3d/nav_mesh_generator_3d.h b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.h
similarity index 97%
rename from engine/modules/navigation/3d/nav_mesh_generator_3d.h
rename to engine/modules/navigation_3d/3d/nav_mesh_generator_3d.h
index 65c10141..d099983d 100644
--- a/engine/modules/navigation/3d/nav_mesh_generator_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_mesh_generator_3d.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_MESH_GENERATOR_3D_H
-#define NAV_MESH_GENERATOR_3D_H
-
-#ifndef _3D_DISABLED
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/worker_thread_pool.h"
@@ -100,7 +97,3 @@ public:
 	NavMeshGenerator3D();
 	~NavMeshGenerator3D();
 };
-
-#endif // _3D_DISABLED
-
-#endif // NAV_MESH_GENERATOR_3D_H
diff --git a/engine/modules/navigation/3d/nav_mesh_queries_3d.cpp b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
similarity index 72%
rename from engine/modules/navigation/3d/nav_mesh_queries_3d.cpp
rename to engine/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
index b4ad057b..051c38a0 100644
--- a/engine/modules/navigation/3d/nav_mesh_queries_3d.cpp
+++ b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.cpp
@@ -28,17 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef _3D_DISABLED
-
 #include "nav_mesh_queries_3d.h"
 
-#include "../nav_base.h"
-#include "../nav_map.h"
+#include "../nav_base_3d.h"
+#include "../nav_map_3d.h"
 #include "nav_region_iteration_3d.h"
 
 #include "core/math/geometry_3d.h"
 #include "servers/navigation/navigation_utilities.h"
 
+using namespace Nav3D;
+
 #define THREE_POINTS_CROSS_PRODUCT(m_a, m_b, m_c) (((m_c) - (m_a)).cross((m_b) - (m_a)))
 
 bool NavMeshQueries3D::emit_callback(const Callable &p_callback) {
@@ -51,8 +51,8 @@ bool NavMeshQueries3D::emit_callback(const Callable &p_callback) {
 	return ce.error == Callable::CallError::CALL_OK;
 }
 
-Vector3 NavMeshQueries3D::polygons_get_random_point(const LocalVector<gd::Polygon> &p_polygons, uint32_t p_navigation_layers, bool p_uniformly) {
-	const LocalVector<gd::Polygon> &region_polygons = p_polygons;
+Vector3 NavMeshQueries3D::polygons_get_random_point(const LocalVector<Polygon> &p_polygons, uint32_t p_navigation_layers, bool p_uniformly) {
+	const LocalVector<Polygon> &region_polygons = p_polygons;
 
 	if (region_polygons.is_empty()) {
 		return Vector3();
@@ -63,7 +63,7 @@ Vector3 NavMeshQueries3D::polygons_get_random_point(const LocalVector<gd::Polygo
 		RBMap<real_t, uint32_t> region_area_map;
 
 		for (uint32_t rp_index = 0; rp_index < region_polygons.size(); rp_index++) {
-			const gd::Polygon &region_polygon = region_polygons[rp_index];
+			const Polygon &region_polygon = region_polygons[rp_index];
 			real_t polyon_area = region_polygon.surface_area;
 
 			if (polyon_area == 0.0) {
@@ -84,13 +84,13 @@ Vector3 NavMeshQueries3D::polygons_get_random_point(const LocalVector<gd::Polygo
 		uint32_t rrp_polygon_index = region_E->value;
 		ERR_FAIL_UNSIGNED_INDEX_V(rrp_polygon_index, region_polygons.size(), Vector3());
 
-		const gd::Polygon &rr_polygon = region_polygons[rrp_polygon_index];
+		const Polygon &rr_polygon = region_polygons[rrp_polygon_index];
 
 		real_t accumulated_polygon_area = 0;
 		RBMap<real_t, uint32_t> polygon_area_map;
 
-		for (uint32_t rpp_index = 2; rpp_index < rr_polygon.points.size(); rpp_index++) {
-			real_t face_area = Face3(rr_polygon.points[0].pos, rr_polygon.points[rpp_index - 1].pos, rr_polygon.points[rpp_index].pos).get_area();
+		for (uint32_t rpp_index = 2; rpp_index < rr_polygon.vertices.size(); rpp_index++) {
+			real_t face_area = Face3(rr_polygon.vertices[0], rr_polygon.vertices[rpp_index - 1], rr_polygon.vertices[rpp_index]).get_area();
 
 			if (face_area == 0.0) {
 				continue;
@@ -108,9 +108,9 @@ Vector3 NavMeshQueries3D::polygons_get_random_point(const LocalVector<gd::Polygo
 		RBMap<real_t, uint32_t>::Iterator polygon_E = polygon_area_map.find_closest(polygon_area_map_pos);
 		ERR_FAIL_COND_V(!polygon_E, Vector3());
 		uint32_t rrp_face_index = polygon_E->value;
-		ERR_FAIL_UNSIGNED_INDEX_V(rrp_face_index, rr_polygon.points.size(), Vector3());
+		ERR_FAIL_UNSIGNED_INDEX_V(rrp_face_index, rr_polygon.vertices.size(), Vector3());
 
-		const Face3 face(rr_polygon.points[0].pos, rr_polygon.points[rrp_face_index - 1].pos, rr_polygon.points[rrp_face_index].pos);
+		const Face3 face(rr_polygon.vertices[0], rr_polygon.vertices[rrp_face_index - 1], rr_polygon.vertices[rrp_face_index]);
 
 		Vector3 face_random_position = face.get_random_point_inside();
 		return face_random_position;
@@ -118,18 +118,18 @@ Vector3 NavMeshQueries3D::polygons_get_random_point(const LocalVector<gd::Polygo
 	} else {
 		uint32_t rrp_polygon_index = Math::random(int(0), region_polygons.size() - 1);
 
-		const gd::Polygon &rr_polygon = region_polygons[rrp_polygon_index];
+		const Polygon &rr_polygon = region_polygons[rrp_polygon_index];
 
-		uint32_t rrp_face_index = Math::random(int(2), rr_polygon.points.size() - 1);
+		uint32_t rrp_face_index = Math::random(int(2), rr_polygon.vertices.size() - 1);
 
-		const Face3 face(rr_polygon.points[0].pos, rr_polygon.points[rrp_face_index - 1].pos, rr_polygon.points[rrp_face_index].pos);
+		const Face3 face(rr_polygon.vertices[0], rr_polygon.vertices[rrp_face_index - 1], rr_polygon.vertices[rrp_face_index]);
 
 		Vector3 face_random_position = face.get_random_point_inside();
 		return face_random_position;
 	}
 }
 
-void NavMeshQueries3D::_query_task_push_back_point_with_metadata(NavMeshPathQueryTask3D &p_query_task, const Vector3 &p_point, const gd::Polygon *p_point_polygon) {
+void NavMeshQueries3D::_query_task_push_back_point_with_metadata(NavMeshPathQueryTask3D &p_query_task, const Vector3 &p_point, const Polygon *p_point_polygon) {
 	if (p_query_task.metadata_flags.has_flag(PathMetadataFlags::PATH_INCLUDE_TYPES)) {
 		p_query_task.path_meta_point_types.push_back(p_point_polygon->owner->get_type());
 	}
@@ -145,7 +145,7 @@ void NavMeshQueries3D::_query_task_push_back_point_with_metadata(NavMeshPathQuer
 	p_query_task.path_points.push_back(p_point);
 }
 
-void NavMeshQueries3D::map_query_path(NavMap *map, const Ref<NavigationPathQueryParameters3D> &p_query_parameters, Ref<NavigationPathQueryResult3D> p_query_result, const Callable &p_callback) {
+void NavMeshQueries3D::map_query_path(NavMap3D *map, const Ref<NavigationPathQueryParameters3D> &p_query_parameters, Ref<NavigationPathQueryResult3D> p_query_result, const Callable &p_callback) {
 	ERR_FAIL_NULL(map);
 	ERR_FAIL_COND(p_query_parameters.is_null());
 	ERR_FAIL_COND(p_query_result.is_null());
@@ -158,6 +158,29 @@ void NavMeshQueries3D::map_query_path(NavMap *map, const Ref<NavigationPathQuery
 	query_task.navigation_layers = p_query_parameters->get_navigation_layers();
 	query_task.callback = p_callback;
 
+	const TypedArray<RID> &_excluded_regions = p_query_parameters->get_excluded_regions();
+	const TypedArray<RID> &_included_regions = p_query_parameters->get_included_regions();
+
+	uint32_t _excluded_region_count = _excluded_regions.size();
+	uint32_t _included_region_count = _included_regions.size();
+
+	query_task.exclude_regions = _excluded_region_count > 0;
+	query_task.include_regions = _included_region_count > 0;
+
+	if (query_task.exclude_regions) {
+		query_task.excluded_regions.resize(_excluded_region_count);
+		for (uint32_t i = 0; i < _excluded_region_count; i++) {
+			query_task.excluded_regions[i] = _excluded_regions[i];
+		}
+	}
+
+	if (query_task.include_regions) {
+		query_task.included_regions.resize(_included_region_count);
+		for (uint32_t i = 0; i < _included_region_count; i++) {
+			query_task.included_regions[i] = _included_regions[i];
+		}
+	}
+
 	switch (p_query_parameters->get_pathfinding_algorithm()) {
 		case NavigationPathQueryParameters3D::PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR: {
 			query_task.pathfinding_algorithm = PathfindingAlgorithm::PATHFINDING_ALGORITHM_ASTAR;
@@ -206,27 +229,34 @@ void NavMeshQueries3D::map_query_path(NavMap *map, const Ref<NavigationPathQuery
 	}
 }
 
-void NavMeshQueries3D::_query_task_find_start_end_positions(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration &p_map_iteration) {
+void NavMeshQueries3D::_query_task_find_start_end_positions(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration3D &p_map_iteration) {
 	real_t begin_d = FLT_MAX;
 	real_t end_d = FLT_MAX;
 
-	const LocalVector<NavRegionIteration> &regions = p_map_iteration.region_iterations;
+	const LocalVector<NavRegionIteration3D> &regions = p_map_iteration.region_iterations;
 
-	for (const NavRegionIteration &region : regions) {
+	for (const NavRegionIteration3D &region : regions) {
 		if (!region.get_enabled()) {
 			continue;
 		}
 
+		if (p_query_task.exclude_regions && p_query_task.excluded_regions.has(region.get_self())) {
+			continue;
+		}
+		if (p_query_task.include_regions && !p_query_task.included_regions.has(region.get_self())) {
+			continue;
+		}
+
 		// Find the initial poly and the end poly on this map.
-		for (const gd::Polygon &p : region.get_navmesh_polygons()) {
+		for (const Polygon &p : region.get_navmesh_polygons()) {
 			// Only consider the polygon if it in a region with compatible layers.
 			if ((p_query_task.navigation_layers & p.owner->get_navigation_layers()) == 0) {
 				continue;
 			}
 
 			// For each face check the distance between the origin/destination.
-			for (size_t point_id = 2; point_id < p.points.size(); point_id++) {
-				const Face3 face(p.points[0].pos, p.points[point_id - 1].pos, p.points[point_id].pos);
+			for (uint32_t point_id = 2; point_id < p.vertices.size(); point_id++) {
+				const Face3 face(p.vertices[0], p.vertices[point_id - 1], p.vertices[point_id]);
 
 				Vector3 point = face.get_closest_point_to(p_query_task.start_position);
 				real_t distance_to_point = point.distance_to(p_query_task.start_position);
@@ -250,24 +280,23 @@ void NavMeshQueries3D::_query_task_find_start_end_positions(NavMeshPathQueryTask
 
 void NavMeshQueries3D::_query_task_build_path_corridor(NavMeshPathQueryTask3D &p_query_task) {
 	const Vector3 p_target_position = p_query_task.target_position;
-	const uint32_t p_navigation_layers = p_query_task.navigation_layers;
-	const gd::Polygon *begin_poly = p_query_task.begin_polygon;
-	const gd::Polygon *end_poly = p_query_task.end_polygon;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
+	const Polygon *end_poly = p_query_task.end_polygon;
 	Vector3 begin_point = p_query_task.begin_position;
 	Vector3 end_point = p_query_task.end_position;
 
 	// Heap of polygons to travel next.
-	gd::Heap<gd::NavigationPoly *, gd::NavPolyTravelCostGreaterThan, gd::NavPolyHeapIndexer>
+	Heap<NavigationPoly *, NavPolyTravelCostGreaterThan, NavPolyHeapIndexer>
 			&traversable_polys = p_query_task.path_query_slot->traversable_polys;
 	traversable_polys.clear();
 
-	LocalVector<gd::NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
-	for (gd::NavigationPoly &polygon : navigation_polys) {
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+	for (NavigationPoly &polygon : navigation_polys) {
 		polygon.reset();
 	}
 
 	// Initialize the matching navigation polygon.
-	gd::NavigationPoly &begin_navigation_poly = navigation_polys[begin_poly->id];
+	NavigationPoly &begin_navigation_poly = navigation_polys[begin_poly->id];
 	begin_navigation_poly.poly = begin_poly;
 	begin_navigation_poly.entry = begin_point;
 	begin_navigation_poly.back_navigation_edge_pathway_start = begin_point;
@@ -278,48 +307,49 @@ void NavMeshQueries3D::_query_task_build_path_corridor(NavMeshPathQueryTask3D &p
 	uint32_t least_cost_id = begin_poly->id;
 	bool found_route = false;
 
-	const gd::Polygon *reachable_end = nullptr;
+	const Polygon *reachable_end = nullptr;
 	real_t distance_to_reachable_end = FLT_MAX;
 	bool is_reachable = true;
 	real_t poly_enter_cost = 0.0;
 
 	while (true) {
-		const gd::NavigationPoly &least_cost_poly = navigation_polys[least_cost_id];
+		const NavigationPoly &least_cost_poly = navigation_polys[least_cost_id];
 		real_t poly_travel_cost = least_cost_poly.poly->owner->get_travel_cost();
 
 		// Takes the current least_cost_poly neighbors (iterating over its edges) and compute the traveled_distance.
-		for (const gd::Edge &edge : least_cost_poly.poly->edges) {
+		for (const Edge &edge : least_cost_poly.poly->edges) {
 			// Iterate over connections in this edge, then compute the new optimized travel distance assigned to this polygon.
 			for (uint32_t connection_index = 0; connection_index < edge.connections.size(); connection_index++) {
-				const gd::Edge::Connection &connection = edge.connections[connection_index];
+				const Edge::Connection &connection = edge.connections[connection_index];
 
-				// Only consider the connection to another polygon if this polygon is in a region with compatible layers.
-				const NavBaseIteration *owner = connection.polygon->owner;
-				if ((p_navigation_layers & owner->get_navigation_layers()) != 0) {
-					Vector3 pathway[2] = { connection.pathway_start, connection.pathway_end };
-					const Vector3 new_entry = Geometry3D::get_closest_point_to_segment(least_cost_poly.entry, pathway);
-					const real_t new_traveled_distance = least_cost_poly.entry.distance_to(new_entry) * poly_travel_cost + poly_enter_cost + least_cost_poly.traveled_distance;
+				const NavBaseIteration3D *connection_owner = connection.polygon->owner;
+				const bool owner_is_usable = _query_task_is_connection_owner_usable(p_query_task, connection_owner);
+				if (!owner_is_usable) {
+					continue;
+				}
 
-					// Check if the neighbor polygon has already been processed.
-					gd::NavigationPoly &neighbor_poly = navigation_polys[connection.polygon->id];
-					if (new_traveled_distance < neighbor_poly.traveled_distance) {
-						// Add the polygon to the heap of polygons to traverse next.
-						neighbor_poly.back_navigation_poly_id = least_cost_id;
-						neighbor_poly.back_navigation_edge = connection.edge;
-						neighbor_poly.back_navigation_edge_pathway_start = connection.pathway_start;
-						neighbor_poly.back_navigation_edge_pathway_end = connection.pathway_end;
-						neighbor_poly.traveled_distance = new_traveled_distance;
-						neighbor_poly.distance_to_destination =
-								new_entry.distance_to(end_point) *
-								owner->get_travel_cost();
-						neighbor_poly.entry = new_entry;
+				const Vector3 new_entry = Geometry3D::get_closest_point_to_segment(least_cost_poly.entry, connection.pathway_start, connection.pathway_end);
+				const real_t new_traveled_distance = least_cost_poly.entry.distance_to(new_entry) * poly_travel_cost + poly_enter_cost + least_cost_poly.traveled_distance;
 
-						if (neighbor_poly.traversable_poly_index != traversable_polys.INVALID_INDEX) {
-							traversable_polys.shift(neighbor_poly.traversable_poly_index);
-						} else {
-							neighbor_poly.poly = connection.polygon;
-							traversable_polys.push(&neighbor_poly);
-						}
+				// Check if the neighbor polygon has already been processed.
+				NavigationPoly &neighbor_poly = navigation_polys[connection.polygon->id];
+				if (new_traveled_distance < neighbor_poly.traveled_distance) {
+					// Add the polygon to the heap of polygons to traverse next.
+					neighbor_poly.back_navigation_poly_id = least_cost_id;
+					neighbor_poly.back_navigation_edge = connection.edge;
+					neighbor_poly.back_navigation_edge_pathway_start = connection.pathway_start;
+					neighbor_poly.back_navigation_edge_pathway_end = connection.pathway_end;
+					neighbor_poly.traveled_distance = new_traveled_distance;
+					neighbor_poly.distance_to_destination =
+							new_entry.distance_to(end_point) *
+							connection_owner->get_travel_cost();
+					neighbor_poly.entry = new_entry;
+
+					if (neighbor_poly.traversable_poly_index != traversable_polys.INVALID_INDEX) {
+						traversable_polys.shift(neighbor_poly.traversable_poly_index);
+					} else {
+						neighbor_poly.poly = connection.polygon;
+						traversable_polys.push(&neighbor_poly);
 					}
 				}
 			}
@@ -340,8 +370,8 @@ void NavMeshQueries3D::_query_task_build_path_corridor(NavMeshPathQueryTask3D &p
 			// Set as end point the furthest reachable point.
 			end_poly = reachable_end;
 			real_t end_d = FLT_MAX;
-			for (size_t point_id = 2; point_id < end_poly->points.size(); point_id++) {
-				Face3 f(end_poly->points[0].pos, end_poly->points[point_id - 1].pos, end_poly->points[point_id].pos);
+			for (uint32_t point_id = 2; point_id < end_poly->vertices.size(); point_id++) {
+				Face3 f(end_poly->vertices[0], end_poly->vertices[point_id - 1], end_poly->vertices[point_id]);
 				Vector3 spoint = f.get_closest_point_to(p_target_position);
 				real_t dpoint = spoint.distance_squared_to(p_target_position);
 				if (dpoint < end_d) {
@@ -352,8 +382,8 @@ void NavMeshQueries3D::_query_task_build_path_corridor(NavMeshPathQueryTask3D &p
 
 			// Search all faces of start polygon as well.
 			bool closest_point_on_start_poly = false;
-			for (size_t point_id = 2; point_id < begin_poly->points.size(); point_id++) {
-				Face3 f(begin_poly->points[0].pos, begin_poly->points[point_id - 1].pos, begin_poly->points[point_id].pos);
+			for (uint32_t point_id = 2; point_id < begin_poly->vertices.size(); point_id++) {
+				Face3 f(begin_poly->vertices[0], begin_poly->vertices[point_id - 1], begin_poly->vertices[point_id]);
 				Vector3 spoint = f.get_closest_point_to(p_target_position);
 				real_t dpoint = spoint.distance_squared_to(p_target_position);
 				if (dpoint < end_d) {
@@ -373,7 +403,7 @@ void NavMeshQueries3D::_query_task_build_path_corridor(NavMeshPathQueryTask3D &p
 				return;
 			}
 
-			for (gd::NavigationPoly &nav_poly : navigation_polys) {
+			for (NavigationPoly &nav_poly : navigation_polys) {
 				nav_poly.poly = nullptr;
 				nav_poly.traveled_distance = FLT_MAX;
 			}
@@ -411,8 +441,8 @@ void NavMeshQueries3D::_query_task_build_path_corridor(NavMeshPathQueryTask3D &p
 	if (!found_route) {
 		real_t end_d = FLT_MAX;
 		// Search all faces of the start polygon for the closest point to our target position.
-		for (size_t point_id = 2; point_id < begin_poly->points.size(); point_id++) {
-			Face3 f(begin_poly->points[0].pos, begin_poly->points[point_id - 1].pos, begin_poly->points[point_id].pos);
+		for (uint32_t point_id = 2; point_id < begin_poly->vertices.size(); point_id++) {
+			Face3 f(begin_poly->vertices[0], begin_poly->vertices[point_id - 1], begin_poly->vertices[point_id]);
 			Vector3 spoint = f.get_closest_point_to(p_target_position);
 			real_t dpoint = spoint.distance_squared_to(p_target_position);
 			if (dpoint < end_d) {
@@ -435,7 +465,7 @@ void NavMeshQueries3D::_query_task_build_path_corridor(NavMeshPathQueryTask3D &p
 	}
 }
 
-void NavMeshQueries3D::query_task_map_iteration_get_path(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration &p_map_iteration) {
+void NavMeshQueries3D::query_task_map_iteration_get_path(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration3D &p_map_iteration) {
 	p_query_task.path_clear();
 
 	_query_task_find_start_end_positions(p_query_task, p_map_iteration);
@@ -544,18 +574,17 @@ void NavMeshQueries3D::_query_task_simplified_path_points(NavMeshPathQueryTask3D
 
 void NavMeshQueries3D::_query_task_post_process_corridorfunnel(NavMeshPathQueryTask3D &p_query_task) {
 	Vector3 end_point = p_query_task.end_position;
-	const gd::Polygon *end_poly = p_query_task.end_polygon;
+	const Polygon *end_poly = p_query_task.end_polygon;
 	Vector3 begin_point = p_query_task.begin_position;
-	const gd::Polygon *begin_poly = p_query_task.begin_polygon;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
 	uint32_t least_cost_id = p_query_task.least_cost_id;
-	LocalVector<gd::NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
 	Vector3 p_map_up = p_query_task.map_up;
 
 	// Set the apex poly/point to the end point
-	gd::NavigationPoly *apex_poly = &navigation_polys[least_cost_id];
+	NavigationPoly *apex_poly = &navigation_polys[least_cost_id];
 
-	Vector3 back_pathway[2] = { apex_poly->back_navigation_edge_pathway_start, apex_poly->back_navigation_edge_pathway_end };
-	const Vector3 back_edge_closest_point = Geometry3D::get_closest_point_to_segment(end_point, back_pathway);
+	const Vector3 back_edge_closest_point = Geometry3D::get_closest_point_to_segment(end_point, apex_poly->back_navigation_edge_pathway_start, apex_poly->back_navigation_edge_pathway_end);
 	if (end_point.is_equal_approx(back_edge_closest_point)) {
 		// The end point is basically on top of the last crossed edge, funneling around the corners would at best do nothing.
 		// At worst it would add an unwanted path point before the last point due to precision issues so skip to the next polygon.
@@ -566,12 +595,12 @@ void NavMeshQueries3D::_query_task_post_process_corridorfunnel(NavMeshPathQueryT
 
 	Vector3 apex_point = end_point;
 
-	gd::NavigationPoly *left_poly = apex_poly;
+	NavigationPoly *left_poly = apex_poly;
 	Vector3 left_portal = apex_point;
-	gd::NavigationPoly *right_poly = apex_poly;
+	NavigationPoly *right_poly = apex_poly;
 	Vector3 right_portal = apex_point;
 
-	gd::NavigationPoly *p = apex_poly;
+	NavigationPoly *p = apex_poly;
 
 	_query_task_push_back_point_with_metadata(p_query_task, end_point, end_poly);
 
@@ -640,11 +669,11 @@ void NavMeshQueries3D::_query_task_post_process_corridorfunnel(NavMeshPathQueryT
 
 void NavMeshQueries3D::_query_task_post_process_edgecentered(NavMeshPathQueryTask3D &p_query_task) {
 	Vector3 end_point = p_query_task.end_position;
-	const gd::Polygon *end_poly = p_query_task.end_polygon;
+	const Polygon *end_poly = p_query_task.end_polygon;
 	Vector3 begin_point = p_query_task.begin_position;
-	const gd::Polygon *begin_poly = p_query_task.begin_polygon;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
 	uint32_t least_cost_id = p_query_task.least_cost_id;
-	LocalVector<gd::NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
 
 	_query_task_push_back_point_with_metadata(p_query_task, end_point, end_poly);
 
@@ -653,8 +682,8 @@ void NavMeshQueries3D::_query_task_post_process_edgecentered(NavMeshPathQueryTas
 	while (np_id != -1 && navigation_polys[np_id].back_navigation_poly_id != -1) {
 		if (navigation_polys[np_id].back_navigation_edge != -1) {
 			int prev = navigation_polys[np_id].back_navigation_edge;
-			int prev_n = (navigation_polys[np_id].back_navigation_edge + 1) % navigation_polys[np_id].poly->points.size();
-			Vector3 point = (navigation_polys[np_id].poly->points[prev].pos + navigation_polys[np_id].poly->points[prev_n].pos) * 0.5;
+			int prev_n = (navigation_polys[np_id].back_navigation_edge + 1) % navigation_polys[np_id].poly->vertices.size();
+			Vector3 point = (navigation_polys[np_id].poly->vertices[prev] + navigation_polys[np_id].poly->vertices[prev_n]) * 0.5;
 
 			_query_task_push_back_point_with_metadata(p_query_task, point, navigation_polys[np_id].poly);
 		} else {
@@ -669,11 +698,11 @@ void NavMeshQueries3D::_query_task_post_process_edgecentered(NavMeshPathQueryTas
 
 void NavMeshQueries3D::_query_task_post_process_nopostprocessing(NavMeshPathQueryTask3D &p_query_task) {
 	Vector3 end_point = p_query_task.end_position;
-	const gd::Polygon *end_poly = p_query_task.end_polygon;
+	const Polygon *end_poly = p_query_task.end_polygon;
 	Vector3 begin_point = p_query_task.begin_position;
-	const gd::Polygon *begin_poly = p_query_task.begin_polygon;
+	const Polygon *begin_poly = p_query_task.begin_polygon;
 	uint32_t least_cost_id = p_query_task.least_cost_id;
-	LocalVector<gd::NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
+	LocalVector<NavigationPoly> &navigation_polys = p_query_task.path_query_slot->path_corridor;
 
 	_query_task_push_back_point_with_metadata(p_query_task, end_point, end_poly);
 
@@ -688,17 +717,17 @@ void NavMeshQueries3D::_query_task_post_process_nopostprocessing(NavMeshPathQuer
 	_query_task_push_back_point_with_metadata(p_query_task, begin_point, begin_poly);
 }
 
-Vector3 NavMeshQueries3D::map_iteration_get_closest_point_to_segment(const NavMapIteration &p_map_iteration, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) {
+Vector3 NavMeshQueries3D::map_iteration_get_closest_point_to_segment(const NavMapIteration3D &p_map_iteration, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) {
 	bool use_collision = p_use_collision;
 	Vector3 closest_point;
 	real_t closest_point_distance = FLT_MAX;
 
-	const LocalVector<NavRegionIteration> &regions = p_map_iteration.region_iterations;
-	for (const NavRegionIteration &region : regions) {
-		for (const gd::Polygon &polygon : region.get_navmesh_polygons()) {
+	const LocalVector<NavRegionIteration3D> &regions = p_map_iteration.region_iterations;
+	for (const NavRegionIteration3D &region : regions) {
+		for (const Polygon &polygon : region.get_navmesh_polygons()) {
 			// For each face check the distance to the segment.
-			for (size_t point_id = 2; point_id < polygon.points.size(); point_id += 1) {
-				const Face3 face(polygon.points[0].pos, polygon.points[point_id - 1].pos, polygon.points[point_id].pos);
+			for (uint32_t point_id = 2; point_id < polygon.vertices.size(); point_id += 1) {
+				const Face3 face(polygon.vertices[0], polygon.vertices[point_id - 1], polygon.vertices[point_id]);
 				Vector3 intersection_point;
 				if (face.intersects_segment(p_from, p_to, &intersection_point)) {
 					const real_t d = p_from.distance_to(intersection_point);
@@ -730,14 +759,14 @@ Vector3 NavMeshQueries3D::map_iteration_get_closest_point_to_segment(const NavMa
 			}
 			// Finally, check for a case when shortest distance is between some point located on a face's edge and some point located on a line segment.
 			if (!use_collision) {
-				for (size_t point_id = 0; point_id < polygon.points.size(); point_id += 1) {
+				for (uint32_t point_id = 0; point_id < polygon.vertices.size(); point_id += 1) {
 					Vector3 a, b;
 
 					Geometry3D::get_closest_points_between_segments(
 							p_from,
 							p_to,
-							polygon.points[point_id].pos,
-							polygon.points[(point_id + 1) % polygon.points.size()].pos,
+							polygon.vertices[point_id],
+							polygon.vertices[(point_id + 1) % polygon.vertices.size()],
 							a,
 							b);
 
@@ -754,35 +783,35 @@ Vector3 NavMeshQueries3D::map_iteration_get_closest_point_to_segment(const NavMa
 	return closest_point;
 }
 
-Vector3 NavMeshQueries3D::map_iteration_get_closest_point(const NavMapIteration &p_map_iteration, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
+Vector3 NavMeshQueries3D::map_iteration_get_closest_point(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point) {
+	ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
 	return cp.point;
 }
 
-Vector3 NavMeshQueries3D::map_iteration_get_closest_point_normal(const NavMapIteration &p_map_iteration, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
+Vector3 NavMeshQueries3D::map_iteration_get_closest_point_normal(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point) {
+	ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
 	return cp.normal;
 }
 
-RID NavMeshQueries3D::map_iteration_get_closest_point_owner(const NavMapIteration &p_map_iteration, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
+RID NavMeshQueries3D::map_iteration_get_closest_point_owner(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point) {
+	ClosestPointQueryResult cp = map_iteration_get_closest_point_info(p_map_iteration, p_point);
 	return cp.owner;
 }
 
-gd::ClosestPointQueryResult NavMeshQueries3D::map_iteration_get_closest_point_info(const NavMapIteration &p_map_iteration, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult result;
+ClosestPointQueryResult NavMeshQueries3D::map_iteration_get_closest_point_info(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point) {
+	ClosestPointQueryResult result;
 	real_t closest_point_distance_squared = FLT_MAX;
 
-	const LocalVector<NavRegionIteration> &regions = p_map_iteration.region_iterations;
-	for (const NavRegionIteration &region : regions) {
-		for (const gd::Polygon &polygon : region.get_navmesh_polygons()) {
-			Vector3 plane_normal = (polygon.points[1].pos - polygon.points[0].pos).cross(polygon.points[2].pos - polygon.points[0].pos);
+	const LocalVector<NavRegionIteration3D> &regions = p_map_iteration.region_iterations;
+	for (const NavRegionIteration3D &region : regions) {
+		for (const Polygon &polygon : region.get_navmesh_polygons()) {
+			Vector3 plane_normal = (polygon.vertices[1] - polygon.vertices[0]).cross(polygon.vertices[2] - polygon.vertices[0]);
 			Vector3 closest_on_polygon;
 			real_t closest = FLT_MAX;
 			bool inside = true;
-			Vector3 previous = polygon.points[polygon.points.size() - 1].pos;
-			for (size_t point_id = 0; point_id < polygon.points.size(); ++point_id) {
-				Vector3 edge = polygon.points[point_id].pos - previous;
+			Vector3 previous = polygon.vertices[polygon.vertices.size() - 1];
+			for (uint32_t point_id = 0; point_id < polygon.vertices.size(); ++point_id) {
+				Vector3 edge = polygon.vertices[point_id] - previous;
 				Vector3 to_point = p_point - previous;
 				Vector3 edge_to_point_pormal = edge.cross(to_point);
 				bool clockwise = edge_to_point_pormal.dot(plane_normal) > 0;
@@ -793,9 +822,9 @@ gd::ClosestPointQueryResult NavMeshQueries3D::map_iteration_get_closest_point_in
 					real_t edge_square = edge.length_squared();
 
 					if (point_projected_on_edge > edge_square) {
-						real_t distance = polygon.points[point_id].pos.distance_squared_to(p_point);
+						real_t distance = polygon.vertices[point_id].distance_squared_to(p_point);
 						if (distance < closest) {
-							closest_on_polygon = polygon.points[point_id].pos;
+							closest_on_polygon = polygon.vertices[point_id];
 							closest = distance;
 						}
 					} else if (point_projected_on_edge < 0.f) {
@@ -811,12 +840,12 @@ gd::ClosestPointQueryResult NavMeshQueries3D::map_iteration_get_closest_point_in
 						break;
 					}
 				}
-				previous = polygon.points[point_id].pos;
+				previous = polygon.vertices[point_id];
 			}
 
 			if (inside) {
 				Vector3 plane_normalized = plane_normal.normalized();
-				real_t distance = plane_normalized.dot(p_point - polygon.points[0].pos);
+				real_t distance = plane_normalized.dot(p_point - polygon.vertices[0]);
 				real_t distance_squared = distance * distance;
 				if (distance_squared < closest_point_distance_squared) {
 					closest_point_distance_squared = distance_squared;
@@ -843,7 +872,7 @@ gd::ClosestPointQueryResult NavMeshQueries3D::map_iteration_get_closest_point_in
 	return result;
 }
 
-Vector3 NavMeshQueries3D::map_iteration_get_random_point(const NavMapIteration &p_map_iteration, uint32_t p_navigation_layers, bool p_uniformly) {
+Vector3 NavMeshQueries3D::map_iteration_get_random_point(const NavMapIteration3D &p_map_iteration, uint32_t p_navigation_layers, bool p_uniformly) {
 	if (p_map_iteration.region_iterations.is_empty()) {
 		return Vector3();
 	}
@@ -852,7 +881,7 @@ Vector3 NavMeshQueries3D::map_iteration_get_random_point(const NavMapIteration &
 	accessible_regions.reserve(p_map_iteration.region_iterations.size());
 
 	for (uint32_t i = 0; i < p_map_iteration.region_iterations.size(); i++) {
-		const NavRegionIteration &region = p_map_iteration.region_iterations[i];
+		const NavRegionIteration3D &region = p_map_iteration.region_iterations[i];
 		if (!region.enabled || (p_navigation_layers & region.navigation_layers) == 0) {
 			continue;
 		}
@@ -869,7 +898,7 @@ Vector3 NavMeshQueries3D::map_iteration_get_random_point(const NavMapIteration &
 		RBMap<real_t, uint32_t> accessible_regions_area_map;
 
 		for (uint32_t accessible_region_index = 0; accessible_region_index < accessible_regions.size(); accessible_region_index++) {
-			const NavRegionIteration &region = p_map_iteration.region_iterations[accessible_regions[accessible_region_index]];
+			const NavRegionIteration3D &region = p_map_iteration.region_iterations[accessible_regions[accessible_region_index]];
 
 			real_t region_surface_area = region.surface_area;
 
@@ -892,28 +921,28 @@ Vector3 NavMeshQueries3D::map_iteration_get_random_point(const NavMapIteration &
 		uint32_t random_region_index = E->value;
 		ERR_FAIL_UNSIGNED_INDEX_V(random_region_index, accessible_regions.size(), Vector3());
 
-		const NavRegionIteration &random_region = p_map_iteration.region_iterations[accessible_regions[random_region_index]];
+		const NavRegionIteration3D &random_region = p_map_iteration.region_iterations[accessible_regions[random_region_index]];
 
 		return NavMeshQueries3D::polygons_get_random_point(random_region.navmesh_polygons, p_navigation_layers, p_uniformly);
 
 	} else {
 		uint32_t random_region_index = Math::random(int(0), accessible_regions.size() - 1);
 
-		const NavRegionIteration &random_region = p_map_iteration.region_iterations[accessible_regions[random_region_index]];
+		const NavRegionIteration3D &random_region = p_map_iteration.region_iterations[accessible_regions[random_region_index]];
 
 		return NavMeshQueries3D::polygons_get_random_point(random_region.navmesh_polygons, p_navigation_layers, p_uniformly);
 	}
 }
 
-Vector3 NavMeshQueries3D::polygons_get_closest_point_to_segment(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) {
+Vector3 NavMeshQueries3D::polygons_get_closest_point_to_segment(const LocalVector<Polygon> &p_polygons, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) {
 	bool use_collision = p_use_collision;
 	Vector3 closest_point;
 	real_t closest_point_distance = FLT_MAX;
 
-	for (const gd::Polygon &polygon : p_polygons) {
+	for (const Polygon &polygon : p_polygons) {
 		// For each face check the distance to the segment.
-		for (size_t point_id = 2; point_id < polygon.points.size(); point_id += 1) {
-			const Face3 face(polygon.points[0].pos, polygon.points[point_id - 1].pos, polygon.points[point_id].pos);
+		for (uint32_t point_id = 2; point_id < polygon.vertices.size(); point_id += 1) {
+			const Face3 face(polygon.vertices[0], polygon.vertices[point_id - 1], polygon.vertices[point_id]);
 			Vector3 intersection_point;
 			if (face.intersects_segment(p_from, p_to, &intersection_point)) {
 				const real_t d = p_from.distance_to(intersection_point);
@@ -945,14 +974,14 @@ Vector3 NavMeshQueries3D::polygons_get_closest_point_to_segment(const LocalVecto
 		}
 		// Finally, check for a case when shortest distance is between some point located on a face's edge and some point located on a line segment.
 		if (!use_collision) {
-			for (size_t point_id = 0; point_id < polygon.points.size(); point_id += 1) {
+			for (uint32_t point_id = 0; point_id < polygon.vertices.size(); point_id += 1) {
 				Vector3 a, b;
 
 				Geometry3D::get_closest_points_between_segments(
 						p_from,
 						p_to,
-						polygon.points[point_id].pos,
-						polygon.points[(point_id + 1) % polygon.points.size()].pos,
+						polygon.vertices[point_id],
+						polygon.vertices[(point_id + 1) % polygon.vertices.size()],
 						a,
 						b);
 
@@ -968,28 +997,28 @@ Vector3 NavMeshQueries3D::polygons_get_closest_point_to_segment(const LocalVecto
 	return closest_point;
 }
 
-Vector3 NavMeshQueries3D::polygons_get_closest_point(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
+Vector3 NavMeshQueries3D::polygons_get_closest_point(const LocalVector<Polygon> &p_polygons, const Vector3 &p_point) {
+	ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
 	return cp.point;
 }
 
-Vector3 NavMeshQueries3D::polygons_get_closest_point_normal(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
+Vector3 NavMeshQueries3D::polygons_get_closest_point_normal(const LocalVector<Polygon> &p_polygons, const Vector3 &p_point) {
+	ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
 	return cp.normal;
 }
 
-gd::ClosestPointQueryResult NavMeshQueries3D::polygons_get_closest_point_info(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult result;
+ClosestPointQueryResult NavMeshQueries3D::polygons_get_closest_point_info(const LocalVector<Polygon> &p_polygons, const Vector3 &p_point) {
+	ClosestPointQueryResult result;
 	real_t closest_point_distance_squared = FLT_MAX;
 
-	for (const gd::Polygon &polygon : p_polygons) {
-		Vector3 plane_normal = (polygon.points[1].pos - polygon.points[0].pos).cross(polygon.points[2].pos - polygon.points[0].pos);
+	for (const Polygon &polygon : p_polygons) {
+		Vector3 plane_normal = (polygon.vertices[1] - polygon.vertices[0]).cross(polygon.vertices[2] - polygon.vertices[0]);
 		Vector3 closest_on_polygon;
 		real_t closest = FLT_MAX;
 		bool inside = true;
-		Vector3 previous = polygon.points[polygon.points.size() - 1].pos;
-		for (size_t point_id = 0; point_id < polygon.points.size(); ++point_id) {
-			Vector3 edge = polygon.points[point_id].pos - previous;
+		Vector3 previous = polygon.vertices[polygon.vertices.size() - 1];
+		for (uint32_t point_id = 0; point_id < polygon.vertices.size(); ++point_id) {
+			Vector3 edge = polygon.vertices[point_id] - previous;
 			Vector3 to_point = p_point - previous;
 			Vector3 edge_to_point_pormal = edge.cross(to_point);
 			bool clockwise = edge_to_point_pormal.dot(plane_normal) > 0;
@@ -1000,9 +1029,9 @@ gd::ClosestPointQueryResult NavMeshQueries3D::polygons_get_closest_point_info(co
 				real_t edge_square = edge.length_squared();
 
 				if (point_projected_on_edge > edge_square) {
-					real_t distance = polygon.points[point_id].pos.distance_squared_to(p_point);
+					real_t distance = polygon.vertices[point_id].distance_squared_to(p_point);
 					if (distance < closest) {
-						closest_on_polygon = polygon.points[point_id].pos;
+						closest_on_polygon = polygon.vertices[point_id];
 						closest = distance;
 					}
 				} else if (point_projected_on_edge < 0.f) {
@@ -1018,12 +1047,12 @@ gd::ClosestPointQueryResult NavMeshQueries3D::polygons_get_closest_point_info(co
 					break;
 				}
 			}
-			previous = polygon.points[point_id].pos;
+			previous = polygon.vertices[point_id];
 		}
 
 		if (inside) {
 			Vector3 plane_normalized = plane_normal.normalized();
-			real_t distance = plane_normalized.dot(p_point - polygon.points[0].pos);
+			real_t distance = plane_normalized.dot(p_point - polygon.vertices[0]);
 			real_t distance_squared = distance * distance;
 			if (distance_squared < closest_point_distance_squared) {
 				closest_point_distance_squared = distance_squared;
@@ -1049,14 +1078,14 @@ gd::ClosestPointQueryResult NavMeshQueries3D::polygons_get_closest_point_info(co
 	return result;
 }
 
-RID NavMeshQueries3D::polygons_get_closest_point_owner(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point) {
-	gd::ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
+RID NavMeshQueries3D::polygons_get_closest_point_owner(const LocalVector<Polygon> &p_polygons, const Vector3 &p_point) {
+	ClosestPointQueryResult cp = polygons_get_closest_point_info(p_polygons, p_point);
 	return cp.owner;
 }
 
-void NavMeshQueries3D::_query_task_clip_path(NavMeshPathQueryTask3D &p_query_task, const gd::NavigationPoly *from_poly, const Vector3 &p_to_point, const gd::NavigationPoly *p_to_poly) {
+void NavMeshQueries3D::_query_task_clip_path(NavMeshPathQueryTask3D &p_query_task, const NavigationPoly *from_poly, const Vector3 &p_to_point, const NavigationPoly *p_to_poly) {
 	Vector3 from = p_query_task.path_points[p_query_task.path_points.size() - 1];
-	const LocalVector<gd::NavigationPoly> &p_navigation_polys = p_query_task.path_query_slot->path_corridor;
+	const LocalVector<NavigationPoly> &p_navigation_polys = p_query_task.path_query_slot->path_corridor;
 	const Vector3 p_map_up = p_query_task.map_up;
 
 	if (from.is_equal_approx(p_to_point)) {
@@ -1089,6 +1118,50 @@ void NavMeshQueries3D::_query_task_clip_path(NavMeshPathQueryTask3D &p_query_tas
 	}
 }
 
+bool NavMeshQueries3D::_query_task_is_connection_owner_usable(const NavMeshPathQueryTask3D &p_query_task, const NavBaseIteration3D *p_owner) {
+	bool owner_usable = true;
+
+	if ((p_query_task.navigation_layers & p_owner->get_navigation_layers()) == 0) {
+		// Not usable. No matching bit between task filter bitmask and owner bitmask.
+		owner_usable = false;
+		return owner_usable;
+	}
+
+	if (p_query_task.exclude_regions || p_query_task.include_regions) {
+		switch (p_owner->get_type()) {
+			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION: {
+				if (p_query_task.exclude_regions && p_query_task.excluded_regions.has(p_owner->get_self())) {
+					// Not usable. Exclude region filter is active and this region is excluded.
+					owner_usable = false;
+				} else if (p_query_task.include_regions && !p_query_task.included_regions.has(p_owner->get_self())) {
+					// Not usable. Include region filter is active and this region is not included.
+					owner_usable = false;
+				}
+			} break;
+			case NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK: {
+				const LocalVector<Polygon> &link_polygons = p_owner->get_navmesh_polygons();
+				if (link_polygons.size() != 2) {
+					// Not usable. Whatever this is, it is not a valid connected link.
+					owner_usable = false;
+				} else {
+					const RID link_start_region = link_polygons[0].owner->get_self();
+					const RID link_end_region = link_polygons[1].owner->get_self();
+					if (p_query_task.exclude_regions && (p_query_task.excluded_regions.has(link_start_region) || p_query_task.excluded_regions.has(link_end_region))) {
+						// Not usable. Exclude region filter is active and at least one region of the link is excluded.
+						owner_usable = false;
+					}
+					if (p_query_task.include_regions && (!p_query_task.included_regions.has(link_start_region) || !p_query_task.excluded_regions.has(link_end_region))) {
+						// Not usable. Include region filter is active and not both regions of the links are included.
+						owner_usable = false;
+					}
+				}
+			} break;
+		}
+	}
+
+	return owner_usable;
+}
+
 LocalVector<uint32_t> NavMeshQueries3D::get_simplified_path_indices(const LocalVector<Vector3> &p_path, real_t p_epsilon) {
 	p_epsilon = MAX(0.0, p_epsilon);
 	real_t squared_epsilon = p_epsilon * p_epsilon;
@@ -1103,7 +1176,8 @@ LocalVector<uint32_t> NavMeshQueries3D::get_simplified_path_indices(const LocalV
 }
 
 void NavMeshQueries3D::simplify_path_segment(int p_start_inx, int p_end_inx, const LocalVector<Vector3> &p_points, real_t p_epsilon, LocalVector<uint32_t> &r_simplified_path_indices) {
-	Vector3 path_segment[2] = { p_points[p_start_inx], p_points[p_end_inx] };
+	const Vector3 path_segment_a = p_points[p_start_inx];
+	const Vector3 path_segment_b = p_points[p_end_inx];
 
 	real_t point_max_distance = 0.0;
 	int point_max_index = 0;
@@ -1111,7 +1185,7 @@ void NavMeshQueries3D::simplify_path_segment(int p_start_inx, int p_end_inx, con
 	for (int i = p_start_inx; i < p_end_inx; i++) {
 		const Vector3 &checked_point = p_points[i];
 
-		const Vector3 closest_point = Geometry3D::get_closest_point_to_segment(checked_point, path_segment);
+		const Vector3 closest_point = Geometry3D::get_closest_point_to_segment(checked_point, path_segment_a, path_segment_b);
 		real_t distance_squared = closest_point.distance_squared_to(checked_point);
 
 		if (distance_squared > point_max_distance) {
@@ -1126,5 +1200,3 @@ void NavMeshQueries3D::simplify_path_segment(int p_start_inx, int p_end_inx, con
 		simplify_path_segment(point_max_index, p_end_inx, p_points, p_epsilon, r_simplified_path_indices);
 	}
 }
-
-#endif // _3D_DISABLED
diff --git a/engine/modules/navigation/3d/nav_mesh_queries_3d.h b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.h
similarity index 70%
rename from engine/modules/navigation/3d/nav_mesh_queries_3d.h
rename to engine/modules/navigation_3d/3d/nav_mesh_queries_3d.h
index 3ef97c87..ca9eea32 100644
--- a/engine/modules/navigation/3d/nav_mesh_queries_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_mesh_queries_3d.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_MESH_QUERIES_3D_H
-#define NAV_MESH_QUERIES_3D_H
+#pragma once
 
-#ifndef _3D_DISABLED
-
-#include "../nav_utils.h"
+#include "../nav_utils_3d.h"
 
 #include "servers/navigation/navigation_path_query_parameters_3d.h"
 #include "servers/navigation/navigation_path_query_result_3d.h"
@@ -41,14 +38,14 @@
 
 using namespace NavigationUtilities;
 
-class NavMap;
-struct NavMapIteration;
+class NavMap3D;
+struct NavMapIteration3D;
 
 class NavMeshQueries3D {
 public:
 	struct PathQuerySlot {
-		LocalVector<gd::NavigationPoly> path_corridor;
-		gd::Heap<gd::NavigationPoly *, gd::NavPolyTravelCostGreaterThan, gd::NavPolyHeapIndexer> traversable_polys;
+		LocalVector<Nav3D::NavigationPoly> path_corridor;
+		Heap<Nav3D::NavigationPoly *, Nav3D::NavPolyTravelCostGreaterThan, Nav3D::NavPolyHeapIndexer> traversable_polys;
 		bool in_use = false;
 		uint32_t slot_index = 0;
 	};
@@ -71,17 +68,21 @@ public:
 		PathPostProcessing path_postprocessing = PathPostProcessing::PATH_POSTPROCESSING_CORRIDORFUNNEL;
 		bool simplify_path = false;
 		real_t simplify_epsilon = 0.0;
+		bool exclude_regions = false;
+		bool include_regions = false;
+		LocalVector<RID> excluded_regions;
+		LocalVector<RID> included_regions;
 
 		// Path building.
 		Vector3 begin_position;
 		Vector3 end_position;
-		const gd::Polygon *begin_polygon = nullptr;
-		const gd::Polygon *end_polygon = nullptr;
+		const Nav3D::Polygon *begin_polygon = nullptr;
+		const Nav3D::Polygon *end_polygon = nullptr;
 		uint32_t least_cost_id = 0;
 
 		// Map.
 		Vector3 map_up;
-		NavMap *map = nullptr;
+		NavMap3D *map = nullptr;
 		PathQuerySlot *path_query_slot = nullptr;
 
 		// Path points.
@@ -112,37 +113,34 @@ public:
 
 	static bool emit_callback(const Callable &p_callback);
 
-	static Vector3 polygons_get_random_point(const LocalVector<gd::Polygon> &p_polygons, uint32_t p_navigation_layers, bool p_uniformly);
+	static Vector3 polygons_get_random_point(const LocalVector<Nav3D::Polygon> &p_polygons, uint32_t p_navigation_layers, bool p_uniformly);
 
-	static Vector3 polygons_get_closest_point_to_segment(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision);
-	static Vector3 polygons_get_closest_point(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point);
-	static Vector3 polygons_get_closest_point_normal(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point);
-	static gd::ClosestPointQueryResult polygons_get_closest_point_info(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point);
-	static RID polygons_get_closest_point_owner(const LocalVector<gd::Polygon> &p_polygons, const Vector3 &p_point);
+	static Vector3 polygons_get_closest_point_to_segment(const LocalVector<Nav3D::Polygon> &p_polygons, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision);
+	static Vector3 polygons_get_closest_point(const LocalVector<Nav3D::Polygon> &p_polygons, const Vector3 &p_point);
+	static Vector3 polygons_get_closest_point_normal(const LocalVector<Nav3D::Polygon> &p_polygons, const Vector3 &p_point);
+	static Nav3D::ClosestPointQueryResult polygons_get_closest_point_info(const LocalVector<Nav3D::Polygon> &p_polygons, const Vector3 &p_point);
+	static RID polygons_get_closest_point_owner(const LocalVector<Nav3D::Polygon> &p_polygons, const Vector3 &p_point);
 
-	static Vector3 map_iteration_get_closest_point_to_segment(const NavMapIteration &p_map_iteration, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision);
-	static Vector3 map_iteration_get_closest_point(const NavMapIteration &p_map_iteration, const Vector3 &p_point);
-	static Vector3 map_iteration_get_closest_point_normal(const NavMapIteration &p_map_iteration, const Vector3 &p_point);
-	static RID map_iteration_get_closest_point_owner(const NavMapIteration &p_map_iteration, const Vector3 &p_point);
-	static gd::ClosestPointQueryResult map_iteration_get_closest_point_info(const NavMapIteration &p_map_iteration, const Vector3 &p_point);
-	static Vector3 map_iteration_get_random_point(const NavMapIteration &p_map_iteration, uint32_t p_navigation_layers, bool p_uniformly);
+	static Vector3 map_iteration_get_closest_point_to_segment(const NavMapIteration3D &p_map_iteration, const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision);
+	static Vector3 map_iteration_get_closest_point(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point);
+	static Vector3 map_iteration_get_closest_point_normal(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point);
+	static RID map_iteration_get_closest_point_owner(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point);
+	static Nav3D::ClosestPointQueryResult map_iteration_get_closest_point_info(const NavMapIteration3D &p_map_iteration, const Vector3 &p_point);
+	static Vector3 map_iteration_get_random_point(const NavMapIteration3D &p_map_iteration, uint32_t p_navigation_layers, bool p_uniformly);
 
-	static void map_query_path(NavMap *map, const Ref<NavigationPathQueryParameters3D> &p_query_parameters, Ref<NavigationPathQueryResult3D> p_query_result, const Callable &p_callback);
+	static void map_query_path(NavMap3D *map, const Ref<NavigationPathQueryParameters3D> &p_query_parameters, Ref<NavigationPathQueryResult3D> p_query_result, const Callable &p_callback);
 
-	static void query_task_map_iteration_get_path(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration &p_map_iteration);
-	static void _query_task_push_back_point_with_metadata(NavMeshPathQueryTask3D &p_query_task, const Vector3 &p_point, const gd::Polygon *p_point_polygon);
-	static void _query_task_find_start_end_positions(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration &p_map_iteration);
+	static void query_task_map_iteration_get_path(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration3D &p_map_iteration);
+	static void _query_task_push_back_point_with_metadata(NavMeshPathQueryTask3D &p_query_task, const Vector3 &p_point, const Nav3D::Polygon *p_point_polygon);
+	static void _query_task_find_start_end_positions(NavMeshPathQueryTask3D &p_query_task, const NavMapIteration3D &p_map_iteration);
 	static void _query_task_build_path_corridor(NavMeshPathQueryTask3D &p_query_task);
 	static void _query_task_post_process_corridorfunnel(NavMeshPathQueryTask3D &p_query_task);
 	static void _query_task_post_process_edgecentered(NavMeshPathQueryTask3D &p_query_task);
 	static void _query_task_post_process_nopostprocessing(NavMeshPathQueryTask3D &p_query_task);
-	static void _query_task_clip_path(NavMeshPathQueryTask3D &p_query_task, const gd::NavigationPoly *from_poly, const Vector3 &p_to_point, const gd::NavigationPoly *p_to_poly);
+	static void _query_task_clip_path(NavMeshPathQueryTask3D &p_query_task, const Nav3D::NavigationPoly *from_poly, const Vector3 &p_to_point, const Nav3D::NavigationPoly *p_to_poly);
 	static void _query_task_simplified_path_points(NavMeshPathQueryTask3D &p_query_task);
+	static bool _query_task_is_connection_owner_usable(const NavMeshPathQueryTask3D &p_query_task, const NavBaseIteration3D *p_owner);
 
 	static void simplify_path_segment(int p_start_inx, int p_end_inx, const LocalVector<Vector3> &p_points, real_t p_epsilon, LocalVector<uint32_t> &r_simplified_path_indices);
 	static LocalVector<uint32_t> get_simplified_path_indices(const LocalVector<Vector3> &p_path, real_t p_epsilon);
 };
-
-#endif // _3D_DISABLED
-
-#endif // NAV_MESH_QUERIES_3D_H
diff --git a/engine/modules/navigation/3d/nav_region_iteration_3d.h b/engine/modules/navigation_3d/3d/nav_region_iteration_3d.h
similarity index 89%
rename from engine/modules/navigation/3d/nav_region_iteration_3d.h
rename to engine/modules/navigation_3d/3d/nav_region_iteration_3d.h
index cee1a2d5..20087548 100644
--- a/engine/modules/navigation/3d/nav_region_iteration_3d.h
+++ b/engine/modules/navigation_3d/3d/nav_region_iteration_3d.h
@@ -28,24 +28,19 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_REGION_ITERATION_3D_H
-#define NAV_REGION_ITERATION_3D_H
+#pragma once
 
-#include "../nav_utils.h"
+#include "../nav_utils_3d.h"
 #include "nav_base_iteration_3d.h"
 
 #include "core/math/aabb.h"
 
-struct NavRegionIteration : NavBaseIteration {
+struct NavRegionIteration3D : NavBaseIteration3D {
 	Transform3D transform;
-	LocalVector<gd::Polygon> navmesh_polygons;
 	real_t surface_area = 0.0;
 	AABB bounds;
 
 	const Transform3D &get_transform() const { return transform; }
-	const LocalVector<gd::Polygon> &get_navmesh_polygons() const { return navmesh_polygons; }
 	real_t get_surface_area() const { return surface_area; }
 	AABB get_bounds() const { return bounds; }
 };
-
-#endif // NAV_REGION_ITERATION_3D_H
diff --git a/engine/modules/navigation/3d/navigation_mesh_generator.cpp b/engine/modules/navigation_3d/3d/navigation_mesh_generator.cpp
similarity index 99%
rename from engine/modules/navigation/3d/navigation_mesh_generator.cpp
rename to engine/modules/navigation_3d/3d/navigation_mesh_generator.cpp
index 54df42e2..496bded0 100644
--- a/engine/modules/navigation/3d/navigation_mesh_generator.cpp
+++ b/engine/modules/navigation_3d/3d/navigation_mesh_generator.cpp
@@ -28,8 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef _3D_DISABLED
-
 #include "navigation_mesh_generator.h"
 
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
@@ -74,5 +72,3 @@ void NavigationMeshGenerator::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("parse_source_geometry_data", "navigation_mesh", "source_geometry_data", "root_node", "callback"), &NavigationMeshGenerator::parse_source_geometry_data, DEFVAL(Callable()));
 	ClassDB::bind_method(D_METHOD("bake_from_source_geometry_data", "navigation_mesh", "source_geometry_data", "callback"), &NavigationMeshGenerator::bake_from_source_geometry_data, DEFVAL(Callable()));
 }
-
-#endif
diff --git a/engine/modules/navigation/3d/navigation_mesh_generator.h b/engine/modules/navigation_3d/3d/navigation_mesh_generator.h
similarity index 94%
rename from engine/modules/navigation/3d/navigation_mesh_generator.h
rename to engine/modules/navigation_3d/3d/navigation_mesh_generator.h
index 08fe9f91..eaf2221a 100644
--- a/engine/modules/navigation/3d/navigation_mesh_generator.h
+++ b/engine/modules/navigation_3d/3d/navigation_mesh_generator.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_MESH_GENERATOR_H
-#define NAVIGATION_MESH_GENERATOR_H
+#pragma once
 
-#ifndef _3D_DISABLED
-
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/resources/navigation_mesh.h"
 
 class NavigationMeshSourceGeometryData3D;
@@ -58,7 +55,3 @@ public:
 	void parse_source_geometry_data(const Ref<NavigationMesh> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_root_node, const Callable &p_callback = Callable());
 	void bake_from_source_geometry_data(Ref<NavigationMesh> p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData3D> &p_source_geometry_data, const Callable &p_callback = Callable());
 };
-
-#endif
-
-#endif // NAVIGATION_MESH_GENERATOR_H
diff --git a/engine/modules/navigation/SCsub b/engine/modules/navigation_3d/SCsub
similarity index 69%
rename from engine/modules/navigation/SCsub
rename to engine/modules/navigation_3d/SCsub
index ab578252..d20a8294 100644
--- a/engine/modules/navigation/SCsub
+++ b/engine/modules/navigation_3d/SCsub
@@ -4,11 +4,12 @@ from misc.utility.scons_hints import *
 Import("env")
 Import("env_modules")
 
-env_navigation = env_modules.Clone()
+env_navigation_3d = env_modules.Clone()
 
 # Thirdparty source files
 
 thirdparty_obj = []
+navigation_2d_enabled = "navigation_2d" in env.module_list
 
 # Recast Thirdparty source files
 if env["builtin_recastnavigation"]:
@@ -28,9 +29,9 @@ if env["builtin_recastnavigation"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_navigation.Prepend(CPPPATH=[thirdparty_dir + "Include"])
+    env_navigation_3d.Prepend(CPPEXTPATH=[thirdparty_dir + "Include"])
 
-    env_thirdparty = env_navigation.Clone()
+    env_thirdparty = env_navigation_3d.Clone()
     env_thirdparty.disable_warnings()
     env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 
@@ -45,11 +46,13 @@ if env["builtin_rvo2_2d"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_navigation.Prepend(CPPPATH=[thirdparty_dir])
+    env_navigation_3d.Prepend(CPPEXTPATH=[thirdparty_dir])
 
-    env_thirdparty = env_navigation.Clone()
-    env_thirdparty.disable_warnings()
-    env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
+    # Don't build rvo_2d if 2D navigation is enabled.
+    if not navigation_2d_enabled:
+        env_thirdparty = env_navigation_3d.Clone()
+        env_thirdparty.disable_warnings()
+        env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 
 # RVO 3D Thirdparty source files
 if env["builtin_rvo2_3d"]:
@@ -61,9 +64,9 @@ if env["builtin_rvo2_3d"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_navigation.Prepend(CPPPATH=[thirdparty_dir])
+    env_navigation_3d.Prepend(CPPEXTPATH=[thirdparty_dir])
 
-    env_thirdparty = env_navigation.Clone()
+    env_thirdparty = env_navigation_3d.Clone()
     env_thirdparty.disable_warnings()
     env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 
@@ -74,12 +77,10 @@ env.modules_sources += thirdparty_obj
 
 module_obj = []
 
-env_navigation.add_source_files(module_obj, "*.cpp")
-env_navigation.add_source_files(module_obj, "2d/*.cpp")
-if not env["disable_3d"]:
-    env_navigation.add_source_files(module_obj, "3d/*.cpp")
+env_navigation_3d.add_source_files(module_obj, "*.cpp")
+env_navigation_3d.add_source_files(module_obj, "3d/*.cpp")
 if env.editor_build:
-    env_navigation.add_source_files(module_obj, "editor/*.cpp")
+    env_navigation_3d.add_source_files(module_obj, "editor/*.cpp")
 env.modules_sources += module_obj
 
 # Needed to force rebuilding the module files when the thirdparty library is updated.
diff --git a/engine/modules/navigation/config.py b/engine/modules/navigation_3d/config.py
similarity index 63%
rename from engine/modules/navigation/config.py
rename to engine/modules/navigation_3d/config.py
index ae547836..f47a63fc 100644
--- a/engine/modules/navigation/config.py
+++ b/engine/modules/navigation_3d/config.py
@@ -1,6 +1,9 @@
 def can_build(env, platform):
+    if env["disable_navigation_3d"]:
+        return False
+
     env.module_add_dependencies("navigation", ["csg", "gridmap"], True)
-    return not env["disable_3d"]
+    return True
 
 
 def configure(env):
diff --git a/engine/modules/navigation/editor/navigation_mesh_editor_plugin.cpp b/engine/modules/navigation_3d/editor/navigation_mesh_editor_plugin.cpp
similarity index 97%
rename from engine/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
rename to engine/modules/navigation_3d/editor/navigation_mesh_editor_plugin.cpp
index f5800356..f41dfa6a 100644
--- a/engine/modules/navigation/editor/navigation_mesh_editor_plugin.cpp
+++ b/engine/modules/navigation_3d/editor/navigation_mesh_editor_plugin.cpp
@@ -30,11 +30,9 @@
 
 #include "navigation_mesh_editor_plugin.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "editor/editor_node.h"
 #include "editor/editor_string_names.h"
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/dialogs.h"
@@ -149,9 +147,6 @@ NavigationMeshEditor::NavigationMeshEditor() {
 	node = nullptr;
 }
 
-NavigationMeshEditor::~NavigationMeshEditor() {
-}
-
 void NavigationMeshEditorPlugin::edit(Object *p_object) {
 	navigation_mesh_editor->edit(Object::cast_to<NavigationRegion3D>(p_object));
 }
@@ -178,8 +173,3 @@ NavigationMeshEditorPlugin::NavigationMeshEditorPlugin() {
 	navigation_mesh_editor->hide();
 	navigation_mesh_editor->bake_hbox->hide();
 }
-
-NavigationMeshEditorPlugin::~NavigationMeshEditorPlugin() {
-}
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/navigation/editor/navigation_mesh_editor_plugin.h b/engine/modules/navigation_3d/editor/navigation_mesh_editor_plugin.h
similarity index 93%
rename from engine/modules/navigation/editor/navigation_mesh_editor_plugin.h
rename to engine/modules/navigation_3d/editor/navigation_mesh_editor_plugin.h
index 65cd9707..18fbfb1d 100644
--- a/engine/modules/navigation/editor/navigation_mesh_editor_plugin.h
+++ b/engine/modules/navigation_3d/editor/navigation_mesh_editor_plugin.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_MESH_EDITOR_PLUGIN_H
-#define NAVIGATION_MESH_EDITOR_PLUGIN_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -65,7 +62,6 @@ protected:
 public:
 	void edit(NavigationRegion3D *p_nav_region);
 	NavigationMeshEditor();
-	~NavigationMeshEditor();
 };
 
 class NavigationMeshEditorPlugin : public EditorPlugin {
@@ -81,9 +77,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	NavigationMeshEditorPlugin();
-	~NavigationMeshEditorPlugin();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // NAVIGATION_MESH_EDITOR_PLUGIN_H
diff --git a/engine/modules/navigation/nav_agent.cpp b/engine/modules/navigation_3d/nav_agent_3d.cpp
similarity index 87%
rename from engine/modules/navigation/nav_agent.cpp
rename to engine/modules/navigation_3d/nav_agent_3d.cpp
index aef4d6da..8e30fa0d 100644
--- a/engine/modules/navigation/nav_agent.cpp
+++ b/engine/modules/navigation_3d/nav_agent_3d.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_agent.cpp                                                         */
+/*  nav_agent_3d.cpp                                                      */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,21 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "nav_agent.h"
+#include "nav_agent_3d.h"
 
-#include "nav_map.h"
+#include "nav_map_3d.h"
 
-void NavAgent::set_avoidance_enabled(bool p_enabled) {
+void NavAgent3D::set_avoidance_enabled(bool p_enabled) {
 	avoidance_enabled = p_enabled;
 	_update_rvo_agent_properties();
 }
 
-void NavAgent::set_use_3d_avoidance(bool p_enabled) {
+void NavAgent3D::set_use_3d_avoidance(bool p_enabled) {
 	use_3d_avoidance = p_enabled;
 	_update_rvo_agent_properties();
 }
 
-void NavAgent::_update_rvo_agent_properties() {
+void NavAgent3D::_update_rvo_agent_properties() {
 	if (use_3d_avoidance) {
 		rvo_agent_3d.neighborDist_ = neighbor_distance;
 		rvo_agent_3d.maxNeighbors_ = max_neighbors;
@@ -88,7 +88,7 @@ void NavAgent::_update_rvo_agent_properties() {
 	request_sync();
 }
 
-void NavAgent::set_map(NavMap *p_map) {
+void NavAgent3D::set_map(NavMap3D *p_map) {
 	if (map == p_map) {
 		return;
 	}
@@ -112,7 +112,7 @@ void NavAgent::set_map(NavMap *p_map) {
 	}
 }
 
-bool NavAgent::is_map_changed() {
+bool NavAgent3D::is_map_changed() {
 	if (map) {
 		bool is_changed = map->get_iteration_id() != last_map_iteration_id;
 		last_map_iteration_id = map->get_iteration_id();
@@ -122,15 +122,15 @@ bool NavAgent::is_map_changed() {
 	}
 }
 
-void NavAgent::set_avoidance_callback(Callable p_callback) {
+void NavAgent3D::set_avoidance_callback(Callable p_callback) {
 	avoidance_callback = p_callback;
 }
 
-bool NavAgent::has_avoidance_callback() const {
+bool NavAgent3D::has_avoidance_callback() const {
 	return avoidance_callback.is_valid();
 }
 
-void NavAgent::dispatch_avoidance_callback() {
+void NavAgent3D::dispatch_avoidance_callback() {
 	if (!avoidance_callback.is_valid()) {
 		return;
 	}
@@ -151,7 +151,7 @@ void NavAgent::dispatch_avoidance_callback() {
 	avoidance_callback.call(new_velocity);
 }
 
-void NavAgent::set_neighbor_distance(real_t p_neighbor_distance) {
+void NavAgent3D::set_neighbor_distance(real_t p_neighbor_distance) {
 	neighbor_distance = p_neighbor_distance;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.neighborDist_ = neighbor_distance;
@@ -163,7 +163,7 @@ void NavAgent::set_neighbor_distance(real_t p_neighbor_distance) {
 	request_sync();
 }
 
-void NavAgent::set_max_neighbors(int p_max_neighbors) {
+void NavAgent3D::set_max_neighbors(int p_max_neighbors) {
 	max_neighbors = p_max_neighbors;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.maxNeighbors_ = max_neighbors;
@@ -175,7 +175,7 @@ void NavAgent::set_max_neighbors(int p_max_neighbors) {
 	request_sync();
 }
 
-void NavAgent::set_time_horizon_agents(real_t p_time_horizon) {
+void NavAgent3D::set_time_horizon_agents(real_t p_time_horizon) {
 	time_horizon_agents = p_time_horizon;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.timeHorizon_ = time_horizon_agents;
@@ -187,7 +187,7 @@ void NavAgent::set_time_horizon_agents(real_t p_time_horizon) {
 	request_sync();
 }
 
-void NavAgent::set_time_horizon_obstacles(real_t p_time_horizon) {
+void NavAgent3D::set_time_horizon_obstacles(real_t p_time_horizon) {
 	time_horizon_obstacles = p_time_horizon;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.timeHorizonObst_ = time_horizon_obstacles;
@@ -199,7 +199,7 @@ void NavAgent::set_time_horizon_obstacles(real_t p_time_horizon) {
 	request_sync();
 }
 
-void NavAgent::set_radius(real_t p_radius) {
+void NavAgent3D::set_radius(real_t p_radius) {
 	radius = p_radius;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.radius_ = radius;
@@ -211,7 +211,7 @@ void NavAgent::set_radius(real_t p_radius) {
 	request_sync();
 }
 
-void NavAgent::set_height(real_t p_height) {
+void NavAgent3D::set_height(real_t p_height) {
 	height = p_height;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.height_ = height;
@@ -223,7 +223,7 @@ void NavAgent::set_height(real_t p_height) {
 	request_sync();
 }
 
-void NavAgent::set_max_speed(real_t p_max_speed) {
+void NavAgent3D::set_max_speed(real_t p_max_speed) {
 	max_speed = p_max_speed;
 	if (avoidance_enabled) {
 		if (use_3d_avoidance) {
@@ -237,7 +237,7 @@ void NavAgent::set_max_speed(real_t p_max_speed) {
 	request_sync();
 }
 
-void NavAgent::set_position(const Vector3 p_position) {
+void NavAgent3D::set_position(const Vector3 p_position) {
 	position = p_position;
 	if (avoidance_enabled) {
 		if (use_3d_avoidance) {
@@ -252,11 +252,11 @@ void NavAgent::set_position(const Vector3 p_position) {
 	request_sync();
 }
 
-void NavAgent::set_target_position(const Vector3 p_target_position) {
+void NavAgent3D::set_target_position(const Vector3 p_target_position) {
 	target_position = p_target_position;
 }
 
-void NavAgent::set_velocity(const Vector3 p_velocity) {
+void NavAgent3D::set_velocity(const Vector3 p_velocity) {
 	// Sets the "wanted" velocity for an agent as a suggestion
 	// This velocity is not guaranteed, RVO simulation will only try to fulfill it
 	velocity = p_velocity;
@@ -272,7 +272,7 @@ void NavAgent::set_velocity(const Vector3 p_velocity) {
 	request_sync();
 }
 
-void NavAgent::set_velocity_forced(const Vector3 p_velocity) {
+void NavAgent3D::set_velocity_forced(const Vector3 p_velocity) {
 	// This function replaces the internal rvo simulation velocity
 	// should only be used after the agent was teleported
 	// as it destroys consistency in movement in cramped situations
@@ -290,7 +290,7 @@ void NavAgent::set_velocity_forced(const Vector3 p_velocity) {
 	request_sync();
 }
 
-void NavAgent::update() {
+void NavAgent3D::update() {
 	// Updates this agent with the calculated results from the rvo simulation
 	if (avoidance_enabled) {
 		if (use_3d_avoidance) {
@@ -301,7 +301,7 @@ void NavAgent::update() {
 	}
 }
 
-void NavAgent::set_avoidance_mask(uint32_t p_mask) {
+void NavAgent3D::set_avoidance_mask(uint32_t p_mask) {
 	avoidance_mask = p_mask;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.avoidance_mask_ = avoidance_mask;
@@ -313,7 +313,7 @@ void NavAgent::set_avoidance_mask(uint32_t p_mask) {
 	request_sync();
 }
 
-void NavAgent::set_avoidance_layers(uint32_t p_layers) {
+void NavAgent3D::set_avoidance_layers(uint32_t p_layers) {
 	avoidance_layers = p_layers;
 	if (use_3d_avoidance) {
 		rvo_agent_3d.avoidance_layers_ = avoidance_layers;
@@ -325,7 +325,7 @@ void NavAgent::set_avoidance_layers(uint32_t p_layers) {
 	request_sync();
 }
 
-void NavAgent::set_avoidance_priority(real_t p_priority) {
+void NavAgent3D::set_avoidance_priority(real_t p_priority) {
 	ERR_FAIL_COND_MSG(p_priority < 0.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
 	ERR_FAIL_COND_MSG(p_priority > 1.0, "Avoidance priority must be between 0.0 and 1.0 inclusive.");
 	avoidance_priority = p_priority;
@@ -339,15 +339,15 @@ void NavAgent::set_avoidance_priority(real_t p_priority) {
 	request_sync();
 }
 
-bool NavAgent::is_dirty() const {
+bool NavAgent3D::is_dirty() const {
 	return agent_dirty;
 }
 
-void NavAgent::sync() {
+void NavAgent3D::sync() {
 	agent_dirty = false;
 }
 
-const Dictionary NavAgent::get_avoidance_data() const {
+const Dictionary NavAgent3D::get_avoidance_data() const {
 	// Returns debug data from RVO simulation internals of this agent.
 	Dictionary _avoidance_data;
 	if (use_3d_avoidance) {
@@ -384,7 +384,7 @@ const Dictionary NavAgent::get_avoidance_data() const {
 	return _avoidance_data;
 }
 
-void NavAgent::set_paused(bool p_paused) {
+void NavAgent3D::set_paused(bool p_paused) {
 	if (paused == p_paused) {
 		return;
 	}
@@ -400,26 +400,26 @@ void NavAgent::set_paused(bool p_paused) {
 	}
 }
 
-bool NavAgent::get_paused() const {
+bool NavAgent3D::get_paused() const {
 	return paused;
 }
 
-void NavAgent::request_sync() {
+void NavAgent3D::request_sync() {
 	if (map && !sync_dirty_request_list_element.in_list()) {
 		map->add_agent_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-void NavAgent::cancel_sync_request() {
+void NavAgent3D::cancel_sync_request() {
 	if (map && sync_dirty_request_list_element.in_list()) {
 		map->remove_agent_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-NavAgent::NavAgent() :
+NavAgent3D::NavAgent3D() :
 		sync_dirty_request_list_element(this) {
 }
 
-NavAgent::~NavAgent() {
+NavAgent3D::~NavAgent3D() {
 	cancel_sync_request();
 }
diff --git a/engine/modules/navigation/nav_agent.h b/engine/modules/navigation_3d/nav_agent_3d.h
similarity index 93%
rename from engine/modules/navigation/nav_agent.h
rename to engine/modules/navigation_3d/nav_agent_3d.h
index 06c03843..ad91cbda 100644
--- a/engine/modules/navigation/nav_agent.h
+++ b/engine/modules/navigation_3d/nav_agent_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_agent.h                                                           */
+/*  nav_agent_3d.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,10 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_AGENT_H
-#define NAV_AGENT_H
+#pragma once
 
-#include "nav_rid.h"
+#include "nav_rid_3d.h"
 
 #include "core/object/class_db.h"
 #include "core/templates/self_list.h"
@@ -39,9 +38,9 @@
 #include <Agent2d.h>
 #include <Agent3d.h>
 
-class NavMap;
+class NavMap3D;
 
-class NavAgent : public NavRid {
+class NavAgent3D : public NavRid3D {
 	Vector3 position;
 	Vector3 target_position;
 	Vector3 velocity;
@@ -56,7 +55,7 @@ class NavAgent : public NavRid {
 	Vector3 safe_velocity;
 	bool clamp_speed = true; // Experimental, clamps velocity to max_speed.
 
-	NavMap *map = nullptr;
+	NavMap3D *map = nullptr;
 
 	RVO2D::Agent2D rvo_agent_2d;
 	RVO3D::Agent3D rvo_agent_3d;
@@ -74,11 +73,11 @@ class NavAgent : public NavRid {
 	uint32_t last_map_iteration_id = 0;
 	bool paused = false;
 
-	SelfList<NavAgent> sync_dirty_request_list_element;
+	SelfList<NavAgent3D> sync_dirty_request_list_element;
 
 public:
-	NavAgent();
-	~NavAgent();
+	NavAgent3D();
+	~NavAgent3D();
 
 	void set_avoidance_enabled(bool p_enabled);
 	bool is_avoidance_enabled() { return avoidance_enabled; }
@@ -86,8 +85,8 @@ public:
 	void set_use_3d_avoidance(bool p_enabled);
 	bool get_use_3d_avoidance() { return use_3d_avoidance; }
 
-	void set_map(NavMap *p_map);
-	NavMap *get_map() { return map; }
+	void set_map(NavMap3D *p_map);
+	NavMap3D *get_map() { return map; }
 
 	bool is_map_changed();
 
@@ -158,5 +157,3 @@ public:
 private:
 	void _update_rvo_agent_properties();
 };
-
-#endif // NAV_AGENT_H
diff --git a/engine/modules/navigation_3d/nav_base_3d.h b/engine/modules/navigation_3d/nav_base_3d.h
new file mode 100644
index 00000000..3fd18f11
--- /dev/null
+++ b/engine/modules/navigation_3d/nav_base_3d.h
@@ -0,0 +1,67 @@
+/**************************************************************************/
+/*  nav_base_3d.h                                                         */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "nav_rid_3d.h"
+#include "nav_utils_3d.h"
+
+#include "servers/navigation/navigation_utilities.h"
+
+class NavMap3D;
+
+class NavBase3D : public NavRid3D {
+protected:
+	uint32_t navigation_layers = 1;
+	real_t enter_cost = 0.0;
+	real_t travel_cost = 1.0;
+	ObjectID owner_id;
+	NavigationUtilities::PathSegmentType type;
+
+public:
+	NavigationUtilities::PathSegmentType get_type() const { return type; }
+
+	virtual void set_use_edge_connections(bool p_enabled) {}
+	virtual bool get_use_edge_connections() const { return false; }
+
+	virtual void set_navigation_layers(uint32_t p_navigation_layers) {}
+	uint32_t get_navigation_layers() const { return navigation_layers; }
+
+	virtual void set_enter_cost(real_t p_enter_cost) {}
+	real_t get_enter_cost() const { return enter_cost; }
+
+	virtual void set_travel_cost(real_t p_travel_cost) {}
+	real_t get_travel_cost() const { return travel_cost; }
+
+	virtual void set_owner_id(ObjectID p_owner_id) {}
+	ObjectID get_owner_id() const { return owner_id; }
+
+	virtual ~NavBase3D() {}
+};
diff --git a/engine/modules/navigation/nav_link.cpp b/engine/modules/navigation_3d/nav_link_3d.cpp
similarity index 83%
rename from engine/modules/navigation/nav_link.cpp
rename to engine/modules/navigation_3d/nav_link_3d.cpp
index 9bffd0c3..b33e2978 100644
--- a/engine/modules/navigation/nav_link.cpp
+++ b/engine/modules/navigation_3d/nav_link_3d.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_link.cpp                                                          */
+/*  nav_link_3d.cpp                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "nav_link.h"
+#include "nav_link_3d.h"
 
-#include "nav_map.h"
+#include "nav_map_3d.h"
 
-void NavLink::set_map(NavMap *p_map) {
+void NavLink3D::set_map(NavMap3D *p_map) {
 	if (map == p_map) {
 		return;
 	}
@@ -52,7 +52,7 @@ void NavLink::set_map(NavMap *p_map) {
 	}
 }
 
-void NavLink::set_enabled(bool p_enabled) {
+void NavLink3D::set_enabled(bool p_enabled) {
 	if (enabled == p_enabled) {
 		return;
 	}
@@ -64,7 +64,7 @@ void NavLink::set_enabled(bool p_enabled) {
 	request_sync();
 }
 
-void NavLink::set_bidirectional(bool p_bidirectional) {
+void NavLink3D::set_bidirectional(bool p_bidirectional) {
 	if (bidirectional == p_bidirectional) {
 		return;
 	}
@@ -74,7 +74,7 @@ void NavLink::set_bidirectional(bool p_bidirectional) {
 	request_sync();
 }
 
-void NavLink::set_start_position(const Vector3 p_position) {
+void NavLink3D::set_start_position(const Vector3 p_position) {
 	if (start_position == p_position) {
 		return;
 	}
@@ -84,7 +84,7 @@ void NavLink::set_start_position(const Vector3 p_position) {
 	request_sync();
 }
 
-void NavLink::set_end_position(const Vector3 p_position) {
+void NavLink3D::set_end_position(const Vector3 p_position) {
 	if (end_position == p_position) {
 		return;
 	}
@@ -94,7 +94,7 @@ void NavLink::set_end_position(const Vector3 p_position) {
 	request_sync();
 }
 
-void NavLink::set_navigation_layers(uint32_t p_navigation_layers) {
+void NavLink3D::set_navigation_layers(uint32_t p_navigation_layers) {
 	if (navigation_layers == p_navigation_layers) {
 		return;
 	}
@@ -104,7 +104,7 @@ void NavLink::set_navigation_layers(uint32_t p_navigation_layers) {
 	request_sync();
 }
 
-void NavLink::set_enter_cost(real_t p_enter_cost) {
+void NavLink3D::set_enter_cost(real_t p_enter_cost) {
 	real_t new_enter_cost = MAX(p_enter_cost, 0.0);
 	if (enter_cost == new_enter_cost) {
 		return;
@@ -115,7 +115,7 @@ void NavLink::set_enter_cost(real_t p_enter_cost) {
 	request_sync();
 }
 
-void NavLink::set_travel_cost(real_t p_travel_cost) {
+void NavLink3D::set_travel_cost(real_t p_travel_cost) {
 	real_t new_travel_cost = MAX(p_travel_cost, 0.0);
 	if (travel_cost == new_travel_cost) {
 		return;
@@ -126,7 +126,7 @@ void NavLink::set_travel_cost(real_t p_travel_cost) {
 	request_sync();
 }
 
-void NavLink::set_owner_id(ObjectID p_owner_id) {
+void NavLink3D::set_owner_id(ObjectID p_owner_id) {
 	if (owner_id == p_owner_id) {
 		return;
 	}
@@ -136,36 +136,36 @@ void NavLink::set_owner_id(ObjectID p_owner_id) {
 	request_sync();
 }
 
-bool NavLink::is_dirty() const {
+bool NavLink3D::is_dirty() const {
 	return link_dirty;
 }
 
-void NavLink::sync() {
+void NavLink3D::sync() {
 	link_dirty = false;
 }
 
-void NavLink::request_sync() {
+void NavLink3D::request_sync() {
 	if (map && !sync_dirty_request_list_element.in_list()) {
 		map->add_link_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-void NavLink::cancel_sync_request() {
+void NavLink3D::cancel_sync_request() {
 	if (map && sync_dirty_request_list_element.in_list()) {
 		map->remove_link_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-NavLink::NavLink() :
+NavLink3D::NavLink3D() :
 		sync_dirty_request_list_element(this) {
 	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_LINK;
 }
 
-NavLink::~NavLink() {
+NavLink3D::~NavLink3D() {
 	cancel_sync_request();
 }
 
-void NavLink::get_iteration_update(NavLinkIteration &r_iteration) {
+void NavLink3D::get_iteration_update(NavLinkIteration3D &r_iteration) {
 	r_iteration.navigation_layers = get_navigation_layers();
 	r_iteration.enter_cost = get_enter_cost();
 	r_iteration.travel_cost = get_travel_cost();
diff --git a/engine/modules/navigation/nav_link.h b/engine/modules/navigation_3d/nav_link_3d.h
similarity index 87%
rename from engine/modules/navigation/nav_link.h
rename to engine/modules/navigation_3d/nav_link_3d.h
index e06a10d5..865fa9f9 100644
--- a/engine/modules/navigation/nav_link.h
+++ b/engine/modules/navigation_3d/nav_link_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_link.h                                                            */
+/*  nav_link_3d.h                                                         */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_LINK_H
-#define NAV_LINK_H
+#pragma once
 
 #include "3d/nav_base_iteration_3d.h"
-#include "nav_base.h"
-#include "nav_utils.h"
+#include "nav_base_3d.h"
+#include "nav_utils_3d.h"
 
-struct NavLinkIteration : NavBaseIteration {
+struct NavLinkIteration3D : NavBaseIteration3D {
 	bool bidirectional = true;
 	Vector3 start_position;
 	Vector3 end_position;
-	LocalVector<gd::Polygon> navmesh_polygons;
 
 	Vector3 get_start_position() const { return start_position; }
 	Vector3 get_end_position() const { return end_position; }
@@ -48,8 +46,8 @@ struct NavLinkIteration : NavBaseIteration {
 
 #include "core/templates/self_list.h"
 
-class NavLink : public NavBase {
-	NavMap *map = nullptr;
+class NavLink3D : public NavBase3D {
+	NavMap3D *map = nullptr;
 	bool bidirectional = true;
 	Vector3 start_position;
 	Vector3 end_position;
@@ -57,14 +55,14 @@ class NavLink : public NavBase {
 
 	bool link_dirty = true;
 
-	SelfList<NavLink> sync_dirty_request_list_element;
+	SelfList<NavLink3D> sync_dirty_request_list_element;
 
 public:
-	NavLink();
-	~NavLink();
+	NavLink3D();
+	~NavLink3D();
 
-	void set_map(NavMap *p_map);
-	NavMap *get_map() const {
+	void set_map(NavMap3D *p_map);
+	NavMap3D *get_map() const {
 		return map;
 	}
 
@@ -97,7 +95,5 @@ public:
 	void request_sync();
 	void cancel_sync_request();
 
-	void get_iteration_update(NavLinkIteration &r_iteration);
+	void get_iteration_update(NavLinkIteration3D &r_iteration);
 };
-
-#endif // NAV_LINK_H
diff --git a/engine/modules/navigation/nav_map.cpp b/engine/modules/navigation_3d/nav_map_3d.cpp
similarity index 73%
rename from engine/modules/navigation/nav_map.cpp
rename to engine/modules/navigation_3d/nav_map_3d.cpp
index c5c6e334..0ccbab23 100644
--- a/engine/modules/navigation/nav_map.cpp
+++ b/engine/modules/navigation_3d/nav_map_3d.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_map.cpp                                                           */
+/*  nav_map_3d.cpp                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,23 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "nav_map.h"
+#include "nav_map_3d.h"
 
 #include "3d/nav_map_builder_3d.h"
 #include "3d/nav_mesh_queries_3d.h"
 #include "3d/nav_region_iteration_3d.h"
-#include "nav_agent.h"
-#include "nav_link.h"
-#include "nav_obstacle.h"
-#include "nav_region.h"
+#include "nav_agent_3d.h"
+#include "nav_link_3d.h"
+#include "nav_obstacle_3d.h"
+#include "nav_region_3d.h"
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
 
 #include <Obstacle2d.h>
 
+using namespace Nav3D;
+
 #ifdef DEBUG_ENABLED
 #define NAVMAP_ITERATION_ZERO_ERROR_MSG() \
 	ERR_PRINT_ONCE("NavigationServer navigation map query failed because it was made before first map synchronization.\n\
@@ -52,19 +54,19 @@
 #define NAVMAP_ITERATION_ZERO_ERROR_MSG()
 #endif // DEBUG_ENABLED
 
-#define GET_MAP_ITERATION()                                                 \
-	iteration_slot_rwlock.read_lock();                                      \
-	NavMapIteration &map_iteration = iteration_slots[iteration_slot_index]; \
-	NavMapIterationRead iteration_read_lock(map_iteration);                 \
+#define GET_MAP_ITERATION()                                                   \
+	iteration_slot_rwlock.read_lock();                                        \
+	NavMapIteration3D &map_iteration = iteration_slots[iteration_slot_index]; \
+	NavMapIterationRead3D iteration_read_lock(map_iteration);                 \
 	iteration_slot_rwlock.read_unlock();
 
-#define GET_MAP_ITERATION_CONST()                                                 \
-	iteration_slot_rwlock.read_lock();                                            \
-	const NavMapIteration &map_iteration = iteration_slots[iteration_slot_index]; \
-	NavMapIterationRead iteration_read_lock(map_iteration);                       \
+#define GET_MAP_ITERATION_CONST()                                                   \
+	iteration_slot_rwlock.read_lock();                                              \
+	const NavMapIteration3D &map_iteration = iteration_slots[iteration_slot_index]; \
+	NavMapIterationRead3D iteration_read_lock(map_iteration);                       \
 	iteration_slot_rwlock.read_unlock();
 
-void NavMap::set_up(Vector3 p_up) {
+void NavMap3D::set_up(Vector3 p_up) {
 	if (up == p_up) {
 		return;
 	}
@@ -72,7 +74,7 @@ void NavMap::set_up(Vector3 p_up) {
 	map_settings_dirty = true;
 }
 
-void NavMap::set_cell_size(real_t p_cell_size) {
+void NavMap3D::set_cell_size(real_t p_cell_size) {
 	if (cell_size == p_cell_size) {
 		return;
 	}
@@ -81,7 +83,7 @@ void NavMap::set_cell_size(real_t p_cell_size) {
 	map_settings_dirty = true;
 }
 
-void NavMap::set_cell_height(real_t p_cell_height) {
+void NavMap3D::set_cell_height(real_t p_cell_height) {
 	if (cell_height == p_cell_height) {
 		return;
 	}
@@ -90,7 +92,7 @@ void NavMap::set_cell_height(real_t p_cell_height) {
 	map_settings_dirty = true;
 }
 
-void NavMap::set_merge_rasterizer_cell_scale(float p_value) {
+void NavMap3D::set_merge_rasterizer_cell_scale(float p_value) {
 	if (merge_rasterizer_cell_scale == p_value) {
 		return;
 	}
@@ -99,7 +101,7 @@ void NavMap::set_merge_rasterizer_cell_scale(float p_value) {
 	map_settings_dirty = true;
 }
 
-void NavMap::set_use_edge_connections(bool p_enabled) {
+void NavMap3D::set_use_edge_connections(bool p_enabled) {
 	if (use_edge_connections == p_enabled) {
 		return;
 	}
@@ -107,7 +109,7 @@ void NavMap::set_use_edge_connections(bool p_enabled) {
 	iteration_dirty = true;
 }
 
-void NavMap::set_edge_connection_margin(real_t p_edge_connection_margin) {
+void NavMap3D::set_edge_connection_margin(real_t p_edge_connection_margin) {
 	if (edge_connection_margin == p_edge_connection_margin) {
 		return;
 	}
@@ -115,7 +117,7 @@ void NavMap::set_edge_connection_margin(real_t p_edge_connection_margin) {
 	iteration_dirty = true;
 }
 
-void NavMap::set_link_connection_radius(real_t p_link_connection_radius) {
+void NavMap3D::set_link_connection_radius(real_t p_link_connection_radius) {
 	if (link_connection_radius == p_link_connection_radius) {
 		return;
 	}
@@ -123,16 +125,16 @@ void NavMap::set_link_connection_radius(real_t p_link_connection_radius) {
 	iteration_dirty = true;
 }
 
-const Vector3 &NavMap::get_merge_rasterizer_cell_size() const {
+const Vector3 &NavMap3D::get_merge_rasterizer_cell_size() const {
 	return merge_rasterizer_cell_size;
 }
 
-gd::PointKey NavMap::get_point_key(const Vector3 &p_pos) const {
+PointKey NavMap3D::get_point_key(const Vector3 &p_pos) const {
 	const int x = static_cast<int>(Math::floor(p_pos.x / merge_rasterizer_cell_size.x));
 	const int y = static_cast<int>(Math::floor(p_pos.y / merge_rasterizer_cell_size.y));
 	const int z = static_cast<int>(Math::floor(p_pos.z / merge_rasterizer_cell_size.z));
 
-	gd::PointKey p;
+	PointKey p;
 	p.key = 0;
 	p.x = x;
 	p.y = y;
@@ -140,7 +142,7 @@ gd::PointKey NavMap::get_point_key(const Vector3 &p_pos) const {
 	return p;
 }
 
-void NavMap::query_path(NavMeshQueries3D::NavMeshPathQueryTask3D &p_query_task) {
+void NavMap3D::query_path(NavMeshQueries3D::NavMeshPathQueryTask3D &p_query_task) {
 	if (iteration_id == 0) {
 		return;
 	}
@@ -161,7 +163,7 @@ void NavMap::query_path(NavMeshQueries3D::NavMeshPathQueryTask3D &p_query_task)
 
 	if (p_query_task.path_query_slot == nullptr) {
 		map_iteration.path_query_slots_semaphore.post();
-		ERR_FAIL_NULL_MSG(p_query_task.path_query_slot, "No unused NavMap path query slot found! This should never happen :(.");
+		ERR_FAIL_NULL_MSG(p_query_task.path_query_slot, "No unused NavMap3D path query slot found! This should never happen :(.");
 	}
 
 	p_query_task.map_up = map_iteration.map_up;
@@ -177,7 +179,7 @@ void NavMap::query_path(NavMeshQueries3D::NavMeshPathQueryTask3D &p_query_task)
 	map_iteration.path_query_slots_semaphore.post();
 }
 
-Vector3 NavMap::get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const {
+Vector3 NavMap3D::get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const {
 	if (iteration_id == 0) {
 		NAVMAP_ITERATION_ZERO_ERROR_MSG();
 		return Vector3();
@@ -188,7 +190,7 @@ Vector3 NavMap::get_closest_point_to_segment(const Vector3 &p_from, const Vector
 	return NavMeshQueries3D::map_iteration_get_closest_point_to_segment(map_iteration, p_from, p_to, p_use_collision);
 }
 
-Vector3 NavMap::get_closest_point(const Vector3 &p_point) const {
+Vector3 NavMap3D::get_closest_point(const Vector3 &p_point) const {
 	if (iteration_id == 0) {
 		NAVMAP_ITERATION_ZERO_ERROR_MSG();
 		return Vector3();
@@ -199,7 +201,7 @@ Vector3 NavMap::get_closest_point(const Vector3 &p_point) const {
 	return NavMeshQueries3D::map_iteration_get_closest_point(map_iteration, p_point);
 }
 
-Vector3 NavMap::get_closest_point_normal(const Vector3 &p_point) const {
+Vector3 NavMap3D::get_closest_point_normal(const Vector3 &p_point) const {
 	if (iteration_id == 0) {
 		NAVMAP_ITERATION_ZERO_ERROR_MSG();
 		return Vector3();
@@ -210,7 +212,7 @@ Vector3 NavMap::get_closest_point_normal(const Vector3 &p_point) const {
 	return NavMeshQueries3D::map_iteration_get_closest_point_normal(map_iteration, p_point);
 }
 
-RID NavMap::get_closest_point_owner(const Vector3 &p_point) const {
+RID NavMap3D::get_closest_point_owner(const Vector3 &p_point) const {
 	if (iteration_id == 0) {
 		NAVMAP_ITERATION_ZERO_ERROR_MSG();
 		return RID();
@@ -221,63 +223,57 @@ RID NavMap::get_closest_point_owner(const Vector3 &p_point) const {
 	return NavMeshQueries3D::map_iteration_get_closest_point_owner(map_iteration, p_point);
 }
 
-gd::ClosestPointQueryResult NavMap::get_closest_point_info(const Vector3 &p_point) const {
+ClosestPointQueryResult NavMap3D::get_closest_point_info(const Vector3 &p_point) const {
 	GET_MAP_ITERATION_CONST();
 
 	return NavMeshQueries3D::map_iteration_get_closest_point_info(map_iteration, p_point);
 }
 
-void NavMap::add_region(NavRegion *p_region) {
+void NavMap3D::add_region(NavRegion3D *p_region) {
 	regions.push_back(p_region);
 	iteration_dirty = true;
 }
 
-void NavMap::remove_region(NavRegion *p_region) {
-	int64_t region_index = regions.find(p_region);
-	if (region_index >= 0) {
-		regions.remove_at_unordered(region_index);
+void NavMap3D::remove_region(NavRegion3D *p_region) {
+	if (regions.erase_unordered(p_region)) {
 		iteration_dirty = true;
 	}
 }
 
-void NavMap::add_link(NavLink *p_link) {
+void NavMap3D::add_link(NavLink3D *p_link) {
 	links.push_back(p_link);
 	iteration_dirty = true;
 }
 
-void NavMap::remove_link(NavLink *p_link) {
-	int64_t link_index = links.find(p_link);
-	if (link_index >= 0) {
-		links.remove_at_unordered(link_index);
+void NavMap3D::remove_link(NavLink3D *p_link) {
+	if (links.erase_unordered(p_link)) {
 		iteration_dirty = true;
 	}
 }
 
-bool NavMap::has_agent(NavAgent *agent) const {
+bool NavMap3D::has_agent(NavAgent3D *agent) const {
 	return agents.has(agent);
 }
 
-void NavMap::add_agent(NavAgent *agent) {
+void NavMap3D::add_agent(NavAgent3D *agent) {
 	if (!has_agent(agent)) {
 		agents.push_back(agent);
 		agents_dirty = true;
 	}
 }
 
-void NavMap::remove_agent(NavAgent *agent) {
+void NavMap3D::remove_agent(NavAgent3D *agent) {
 	remove_agent_as_controlled(agent);
-	int64_t agent_index = agents.find(agent);
-	if (agent_index >= 0) {
-		agents.remove_at_unordered(agent_index);
+	if (agents.erase_unordered(agent)) {
 		agents_dirty = true;
 	}
 }
 
-bool NavMap::has_obstacle(NavObstacle *obstacle) const {
+bool NavMap3D::has_obstacle(NavObstacle3D *obstacle) const {
 	return obstacles.has(obstacle);
 }
 
-void NavMap::add_obstacle(NavObstacle *obstacle) {
+void NavMap3D::add_obstacle(NavObstacle3D *obstacle) {
 	if (obstacle->get_paused()) {
 		// No point in adding a paused obstacle, it will add itself when unpaused again.
 		return;
@@ -289,15 +285,13 @@ void NavMap::add_obstacle(NavObstacle *obstacle) {
 	}
 }
 
-void NavMap::remove_obstacle(NavObstacle *obstacle) {
-	int64_t obstacle_index = obstacles.find(obstacle);
-	if (obstacle_index >= 0) {
-		obstacles.remove_at_unordered(obstacle_index);
+void NavMap3D::remove_obstacle(NavObstacle3D *obstacle) {
+	if (obstacles.erase_unordered(obstacle)) {
 		obstacles_dirty = true;
 	}
 }
 
-void NavMap::set_agent_as_controlled(NavAgent *agent) {
+void NavMap3D::set_agent_as_controlled(NavAgent3D *agent) {
 	remove_agent_as_controlled(agent);
 
 	if (agent->get_paused()) {
@@ -320,33 +314,29 @@ void NavMap::set_agent_as_controlled(NavAgent *agent) {
 	}
 }
 
-void NavMap::remove_agent_as_controlled(NavAgent *agent) {
-	int64_t agent_3d_index = active_3d_avoidance_agents.find(agent);
-	if (agent_3d_index >= 0) {
-		active_3d_avoidance_agents.remove_at_unordered(agent_3d_index);
+void NavMap3D::remove_agent_as_controlled(NavAgent3D *agent) {
+	if (active_3d_avoidance_agents.erase_unordered(agent)) {
 		agents_dirty = true;
 	}
-	int64_t agent_2d_index = active_2d_avoidance_agents.find(agent);
-	if (agent_2d_index >= 0) {
-		active_2d_avoidance_agents.remove_at_unordered(agent_2d_index);
+	if (active_2d_avoidance_agents.erase_unordered(agent)) {
 		agents_dirty = true;
 	}
 }
 
-Vector3 NavMap::get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const {
+Vector3 NavMap3D::get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const {
 	GET_MAP_ITERATION_CONST();
 
 	return NavMeshQueries3D::map_iteration_get_random_point(map_iteration, p_navigation_layers, p_uniformly);
 }
 
-void NavMap::_build_iteration() {
+void NavMap3D::_build_iteration() {
 	if (!iteration_dirty || iteration_building || iteration_ready) {
 		return;
 	}
 
 	// Get the next free iteration slot that should be potentially unused.
 	iteration_slot_rwlock.read_lock();
-	NavMapIteration &next_map_iteration = iteration_slots[(iteration_slot_index + 1) % 2];
+	NavMapIteration3D &next_map_iteration = iteration_slots[(iteration_slot_index + 1) % 2];
 	// Check if the iteration slot is truly free or still used by an external thread.
 	bool iteration_is_free = next_map_iteration.users.get() == 0;
 	iteration_slot_rwlock.read_unlock();
@@ -377,13 +367,13 @@ void NavMap::_build_iteration() {
 	uint32_t enabled_region_count = 0;
 	uint32_t enabled_link_count = 0;
 
-	for (NavRegion *region : regions) {
+	for (NavRegion3D *region : regions) {
 		if (!region->get_enabled()) {
 			continue;
 		}
 		enabled_region_count++;
 	}
-	for (NavLink *link : links) {
+	for (NavLink3D *link : links) {
 		if (!link->get_enabled()) {
 			continue;
 		}
@@ -401,20 +391,20 @@ void NavMap::_build_iteration() {
 	uint32_t region_id_count = 0;
 	uint32_t link_id_count = 0;
 
-	for (NavRegion *region : regions) {
+	for (NavRegion3D *region : regions) {
 		if (!region->get_enabled()) {
 			continue;
 		}
-		NavRegionIteration &region_iteration = next_map_iteration.region_iterations[region_id_count];
+		NavRegionIteration3D &region_iteration = next_map_iteration.region_iterations[region_id_count];
 		region_iteration.id = region_id_count++;
 		region->get_iteration_update(region_iteration);
 		next_map_iteration.region_ptr_to_region_id[region] = (uint32_t)region_iteration.id;
 	}
-	for (NavLink *link : links) {
+	for (NavLink3D *link : links) {
 		if (!link->get_enabled()) {
 			continue;
 		}
-		NavLinkIteration &link_iteration = next_map_iteration.link_iterations[link_id_count];
+		NavLinkIteration3D &link_iteration = next_map_iteration.link_iterations[link_id_count];
 		link_iteration.id = link_id_count++;
 		link->get_iteration_update(link_iteration);
 	}
@@ -424,7 +414,7 @@ void NavMap::_build_iteration() {
 	iteration_build.map_iteration = &next_map_iteration;
 
 	if (use_async_iterations) {
-		iteration_build_thread_task_id = WorkerThreadPool::get_singleton()->add_native_task(&NavMap::_build_iteration_threaded, &iteration_build, true, SNAME("NavMapBuilder3D"));
+		iteration_build_thread_task_id = WorkerThreadPool::get_singleton()->add_native_task(&NavMap3D::_build_iteration_threaded, &iteration_build, true, SNAME("NavMapBuilder3D"));
 	} else {
 		NavMapBuilder3D::build_navmap_iteration(iteration_build);
 
@@ -433,13 +423,13 @@ void NavMap::_build_iteration() {
 	}
 }
 
-void NavMap::_build_iteration_threaded(void *p_arg) {
-	NavMapIterationBuild *_iteration_build = static_cast<NavMapIterationBuild *>(p_arg);
+void NavMap3D::_build_iteration_threaded(void *p_arg) {
+	NavMapIterationBuild3D *_iteration_build = static_cast<NavMapIterationBuild3D *>(p_arg);
 
 	NavMapBuilder3D::build_navmap_iteration(*_iteration_build);
 }
 
-void NavMap::_sync_iteration() {
+void NavMap3D::_sync_iteration() {
 	if (iteration_building || !iteration_ready) {
 		return;
 	}
@@ -461,7 +451,7 @@ void NavMap::_sync_iteration() {
 	iteration_ready = false;
 }
 
-void NavMap::sync() {
+void NavMap3D::sync() {
 	// Performance Monitor.
 	performance_data.pm_region_count = regions.size();
 	performance_data.pm_agent_count = agents.size();
@@ -491,7 +481,7 @@ void NavMap::sync() {
 	_sync_avoidance();
 }
 
-void NavMap::_sync_avoidance() {
+void NavMap3D::_sync_avoidance() {
 	_sync_dirty_avoidance_update_requests();
 
 	if (obstacles_dirty || agents_dirty) {
@@ -502,9 +492,9 @@ void NavMap::_sync_avoidance() {
 	agents_dirty = false;
 }
 
-void NavMap::_update_rvo_obstacles_tree_2d() {
+void NavMap3D::_update_rvo_obstacles_tree_2d() {
 	int obstacle_vertex_count = 0;
-	for (NavObstacle *obstacle : obstacles) {
+	for (NavObstacle3D *obstacle : obstacles) {
 		obstacle_vertex_count += obstacle->get_vertices().size();
 	}
 
@@ -520,7 +510,7 @@ void NavMap::_update_rvo_obstacles_tree_2d() {
 
 	// The following block is modified copy from RVO2D::AddObstacle()
 	// Obstacles are linked and depend on all other obstacles.
-	for (NavObstacle *obstacle : obstacles) {
+	for (NavObstacle3D *obstacle : obstacles) {
 		const Vector3 &_obstacle_position = obstacle->get_position();
 		const Vector<Vector3> &_obstacle_vertices = obstacle->get_vertices();
 
@@ -580,27 +570,27 @@ void NavMap::_update_rvo_obstacles_tree_2d() {
 	rvo_simulation_2d.kdTree_->buildObstacleTree(raw_obstacles);
 }
 
-void NavMap::_update_rvo_agents_tree_2d() {
+void NavMap3D::_update_rvo_agents_tree_2d() {
 	// Cannot use LocalVector here as RVO library expects std::vector to build KdTree.
 	std::vector<RVO2D::Agent2D *> raw_agents;
 	raw_agents.reserve(active_2d_avoidance_agents.size());
-	for (NavAgent *agent : active_2d_avoidance_agents) {
+	for (NavAgent3D *agent : active_2d_avoidance_agents) {
 		raw_agents.push_back(agent->get_rvo_agent_2d());
 	}
 	rvo_simulation_2d.kdTree_->buildAgentTree(raw_agents);
 }
 
-void NavMap::_update_rvo_agents_tree_3d() {
+void NavMap3D::_update_rvo_agents_tree_3d() {
 	// Cannot use LocalVector here as RVO library expects std::vector to build KdTree.
 	std::vector<RVO3D::Agent3D *> raw_agents;
 	raw_agents.reserve(active_3d_avoidance_agents.size());
-	for (NavAgent *agent : active_3d_avoidance_agents) {
+	for (NavAgent3D *agent : active_3d_avoidance_agents) {
 		raw_agents.push_back(agent->get_rvo_agent_3d());
 	}
 	rvo_simulation_3d.kdTree_->buildAgentTree(raw_agents);
 }
 
-void NavMap::_update_rvo_simulation() {
+void NavMap3D::_update_rvo_simulation() {
 	if (obstacles_dirty) {
 		_update_rvo_obstacles_tree_2d();
 	}
@@ -610,32 +600,30 @@ void NavMap::_update_rvo_simulation() {
 	}
 }
 
-void NavMap::compute_single_avoidance_step_2d(uint32_t index, NavAgent **agent) {
+void NavMap3D::compute_single_avoidance_step_2d(uint32_t index, NavAgent3D **agent) {
 	(*(agent + index))->get_rvo_agent_2d()->computeNeighbors(&rvo_simulation_2d);
 	(*(agent + index))->get_rvo_agent_2d()->computeNewVelocity(&rvo_simulation_2d);
 	(*(agent + index))->get_rvo_agent_2d()->update(&rvo_simulation_2d);
 	(*(agent + index))->update();
 }
 
-void NavMap::compute_single_avoidance_step_3d(uint32_t index, NavAgent **agent) {
+void NavMap3D::compute_single_avoidance_step_3d(uint32_t index, NavAgent3D **agent) {
 	(*(agent + index))->get_rvo_agent_3d()->computeNeighbors(&rvo_simulation_3d);
 	(*(agent + index))->get_rvo_agent_3d()->computeNewVelocity(&rvo_simulation_3d);
 	(*(agent + index))->get_rvo_agent_3d()->update(&rvo_simulation_3d);
 	(*(agent + index))->update();
 }
 
-void NavMap::step(real_t p_deltatime) {
-	deltatime = p_deltatime;
-
-	rvo_simulation_2d.setTimeStep(float(deltatime));
-	rvo_simulation_3d.setTimeStep(float(deltatime));
+void NavMap3D::step(double p_delta_time) {
+	rvo_simulation_2d.setTimeStep(float(p_delta_time));
+	rvo_simulation_3d.setTimeStep(float(p_delta_time));
 
 	if (active_2d_avoidance_agents.size() > 0) {
 		if (use_threads && avoidance_use_multiple_threads) {
-			WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_singleton()->add_template_group_task(this, &NavMap::compute_single_avoidance_step_2d, active_2d_avoidance_agents.ptr(), active_2d_avoidance_agents.size(), -1, true, SNAME("RVOAvoidanceAgents2D"));
+			WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_singleton()->add_template_group_task(this, &NavMap3D::compute_single_avoidance_step_2d, active_2d_avoidance_agents.ptr(), active_2d_avoidance_agents.size(), -1, true, SNAME("RVOAvoidanceAgents2D"));
 			WorkerThreadPool::get_singleton()->wait_for_group_task_completion(group_task);
 		} else {
-			for (NavAgent *agent : active_2d_avoidance_agents) {
+			for (NavAgent3D *agent : active_2d_avoidance_agents) {
 				agent->get_rvo_agent_2d()->computeNeighbors(&rvo_simulation_2d);
 				agent->get_rvo_agent_2d()->computeNewVelocity(&rvo_simulation_2d);
 				agent->get_rvo_agent_2d()->update(&rvo_simulation_2d);
@@ -646,10 +634,10 @@ void NavMap::step(real_t p_deltatime) {
 
 	if (active_3d_avoidance_agents.size() > 0) {
 		if (use_threads && avoidance_use_multiple_threads) {
-			WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_singleton()->add_template_group_task(this, &NavMap::compute_single_avoidance_step_3d, active_3d_avoidance_agents.ptr(), active_3d_avoidance_agents.size(), -1, true, SNAME("RVOAvoidanceAgents3D"));
+			WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_singleton()->add_template_group_task(this, &NavMap3D::compute_single_avoidance_step_3d, active_3d_avoidance_agents.ptr(), active_3d_avoidance_agents.size(), -1, true, SNAME("RVOAvoidanceAgents3D"));
 			WorkerThreadPool::get_singleton()->wait_for_group_task_completion(group_task);
 		} else {
-			for (NavAgent *agent : active_3d_avoidance_agents) {
+			for (NavAgent3D *agent : active_3d_avoidance_agents) {
 				agent->get_rvo_agent_3d()->computeNeighbors(&rvo_simulation_3d);
 				agent->get_rvo_agent_3d()->computeNewVelocity(&rvo_simulation_3d);
 				agent->get_rvo_agent_3d()->update(&rvo_simulation_3d);
@@ -659,30 +647,30 @@ void NavMap::step(real_t p_deltatime) {
 	}
 }
 
-void NavMap::dispatch_callbacks() {
-	for (NavAgent *agent : active_2d_avoidance_agents) {
+void NavMap3D::dispatch_callbacks() {
+	for (NavAgent3D *agent : active_2d_avoidance_agents) {
 		agent->dispatch_avoidance_callback();
 	}
 
-	for (NavAgent *agent : active_3d_avoidance_agents) {
+	for (NavAgent3D *agent : active_3d_avoidance_agents) {
 		agent->dispatch_avoidance_callback();
 	}
 }
 
-void NavMap::_update_merge_rasterizer_cell_dimensions() {
+void NavMap3D::_update_merge_rasterizer_cell_dimensions() {
 	merge_rasterizer_cell_size.x = cell_size * merge_rasterizer_cell_scale;
 	merge_rasterizer_cell_size.y = cell_height * merge_rasterizer_cell_scale;
 	merge_rasterizer_cell_size.z = cell_size * merge_rasterizer_cell_scale;
 }
 
-int NavMap::get_region_connections_count(NavRegion *p_region) const {
+int NavMap3D::get_region_connections_count(NavRegion3D *p_region) const {
 	ERR_FAIL_NULL_V(p_region, 0);
 
 	GET_MAP_ITERATION_CONST();
 
-	HashMap<NavRegion *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
+	HashMap<NavRegion3D *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
 	if (found_id) {
-		HashMap<uint32_t, LocalVector<gd::Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
+		HashMap<uint32_t, LocalVector<Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
 		if (found_connections) {
 			return found_connections->value.size();
 		}
@@ -691,14 +679,14 @@ int NavMap::get_region_connections_count(NavRegion *p_region) const {
 	return 0;
 }
 
-Vector3 NavMap::get_region_connection_pathway_start(NavRegion *p_region, int p_connection_id) const {
+Vector3 NavMap3D::get_region_connection_pathway_start(NavRegion3D *p_region, int p_connection_id) const {
 	ERR_FAIL_NULL_V(p_region, Vector3());
 
 	GET_MAP_ITERATION_CONST();
 
-	HashMap<NavRegion *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
+	HashMap<NavRegion3D *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
 	if (found_id) {
-		HashMap<uint32_t, LocalVector<gd::Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
+		HashMap<uint32_t, LocalVector<Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
 		if (found_connections) {
 			ERR_FAIL_INDEX_V(p_connection_id, int(found_connections->value.size()), Vector3());
 			return found_connections->value[p_connection_id].pathway_start;
@@ -708,14 +696,14 @@ Vector3 NavMap::get_region_connection_pathway_start(NavRegion *p_region, int p_c
 	return Vector3();
 }
 
-Vector3 NavMap::get_region_connection_pathway_end(NavRegion *p_region, int p_connection_id) const {
+Vector3 NavMap3D::get_region_connection_pathway_end(NavRegion3D *p_region, int p_connection_id) const {
 	ERR_FAIL_NULL_V(p_region, Vector3());
 
 	GET_MAP_ITERATION_CONST();
 
-	HashMap<NavRegion *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
+	HashMap<NavRegion3D *, uint32_t>::ConstIterator found_id = map_iteration.region_ptr_to_region_id.find(p_region);
 	if (found_id) {
-		HashMap<uint32_t, LocalVector<gd::Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
+		HashMap<uint32_t, LocalVector<Edge::Connection>>::ConstIterator found_connections = map_iteration.external_region_connections.find(found_id->value);
 		if (found_connections) {
 			ERR_FAIL_INDEX_V(p_connection_id, int(found_connections->value.size()), Vector3());
 			return found_connections->value[p_connection_id].pathway_end;
@@ -725,66 +713,66 @@ Vector3 NavMap::get_region_connection_pathway_end(NavRegion *p_region, int p_con
 	return Vector3();
 }
 
-void NavMap::add_region_sync_dirty_request(SelfList<NavRegion> *p_sync_request) {
+void NavMap3D::add_region_sync_dirty_request(SelfList<NavRegion3D> *p_sync_request) {
 	if (p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.regions.add(p_sync_request);
 }
 
-void NavMap::add_link_sync_dirty_request(SelfList<NavLink> *p_sync_request) {
+void NavMap3D::add_link_sync_dirty_request(SelfList<NavLink3D> *p_sync_request) {
 	if (p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.links.add(p_sync_request);
 }
 
-void NavMap::add_agent_sync_dirty_request(SelfList<NavAgent> *p_sync_request) {
+void NavMap3D::add_agent_sync_dirty_request(SelfList<NavAgent3D> *p_sync_request) {
 	if (p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.agents.add(p_sync_request);
 }
 
-void NavMap::add_obstacle_sync_dirty_request(SelfList<NavObstacle> *p_sync_request) {
+void NavMap3D::add_obstacle_sync_dirty_request(SelfList<NavObstacle3D> *p_sync_request) {
 	if (p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.obstacles.add(p_sync_request);
 }
 
-void NavMap::remove_region_sync_dirty_request(SelfList<NavRegion> *p_sync_request) {
+void NavMap3D::remove_region_sync_dirty_request(SelfList<NavRegion3D> *p_sync_request) {
 	if (!p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.regions.remove(p_sync_request);
 }
 
-void NavMap::remove_link_sync_dirty_request(SelfList<NavLink> *p_sync_request) {
+void NavMap3D::remove_link_sync_dirty_request(SelfList<NavLink3D> *p_sync_request) {
 	if (!p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.links.remove(p_sync_request);
 }
 
-void NavMap::remove_agent_sync_dirty_request(SelfList<NavAgent> *p_sync_request) {
+void NavMap3D::remove_agent_sync_dirty_request(SelfList<NavAgent3D> *p_sync_request) {
 	if (!p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.agents.remove(p_sync_request);
 }
 
-void NavMap::remove_obstacle_sync_dirty_request(SelfList<NavObstacle> *p_sync_request) {
+void NavMap3D::remove_obstacle_sync_dirty_request(SelfList<NavObstacle3D> *p_sync_request) {
 	if (!p_sync_request->in_list()) {
 		return;
 	}
 	sync_dirty_requests.obstacles.remove(p_sync_request);
 }
 
-void NavMap::_sync_dirty_map_update_requests() {
+void NavMap3D::_sync_dirty_map_update_requests() {
 	// If entire map settings changed make all regions dirty.
 	if (map_settings_dirty) {
-		for (NavRegion *region : regions) {
+		for (NavRegion3D *region : regions) {
 			region->scratch_polygons();
 		}
 		iteration_dirty = true;
@@ -795,24 +783,24 @@ void NavMap::_sync_dirty_map_update_requests() {
 	}
 
 	// Sync NavRegions.
-	for (SelfList<NavRegion> *element = sync_dirty_requests.regions.first(); element; element = element->next()) {
+	for (SelfList<NavRegion3D> *element = sync_dirty_requests.regions.first(); element; element = element->next()) {
 		element->self()->sync();
 	}
 	sync_dirty_requests.regions.clear();
 
 	// Sync NavLinks.
-	for (SelfList<NavLink> *element = sync_dirty_requests.links.first(); element; element = element->next()) {
+	for (SelfList<NavLink3D> *element = sync_dirty_requests.links.first(); element; element = element->next()) {
 		element->self()->sync();
 	}
 	sync_dirty_requests.links.clear();
 }
 
-void NavMap::_sync_dirty_avoidance_update_requests() {
+void NavMap3D::_sync_dirty_avoidance_update_requests() {
 	// Sync NavAgents.
 	if (!agents_dirty) {
 		agents_dirty = sync_dirty_requests.agents.first();
 	}
-	for (SelfList<NavAgent> *element = sync_dirty_requests.agents.first(); element; element = element->next()) {
+	for (SelfList<NavAgent3D> *element = sync_dirty_requests.agents.first(); element; element = element->next()) {
 		element->self()->sync();
 	}
 	sync_dirty_requests.agents.clear();
@@ -821,13 +809,13 @@ void NavMap::_sync_dirty_avoidance_update_requests() {
 	if (!obstacles_dirty) {
 		obstacles_dirty = sync_dirty_requests.obstacles.first();
 	}
-	for (SelfList<NavObstacle> *element = sync_dirty_requests.obstacles.first(); element; element = element->next()) {
+	for (SelfList<NavObstacle3D> *element = sync_dirty_requests.obstacles.first(); element; element = element->next()) {
 		element->self()->sync();
 	}
 	sync_dirty_requests.obstacles.clear();
 }
 
-void NavMap::set_use_async_iterations(bool p_enabled) {
+void NavMap3D::set_use_async_iterations(bool p_enabled) {
 	if (use_async_iterations == p_enabled) {
 		return;
 	}
@@ -836,11 +824,11 @@ void NavMap::set_use_async_iterations(bool p_enabled) {
 #endif
 }
 
-bool NavMap::get_use_async_iterations() const {
+bool NavMap3D::get_use_async_iterations() const {
 	return use_async_iterations;
 }
 
-NavMap::NavMap() {
+NavMap3D::NavMap3D() {
 	avoidance_use_multiple_threads = GLOBAL_GET("navigation/avoidance/thread_model/avoidance_use_multiple_threads");
 	avoidance_use_high_priority_threads = GLOBAL_GET("navigation/avoidance/thread_model/avoidance_use_high_priority_threads");
 
@@ -859,7 +847,7 @@ NavMap::NavMap() {
 
 	iteration_slots.resize(2);
 
-	for (NavMapIteration &iteration_slot : iteration_slots) {
+	for (NavMapIteration3D &iteration_slot : iteration_slots) {
 		iteration_slot.path_query_slots.resize(path_query_slots_max);
 		for (uint32_t i = 0; i < iteration_slot.path_query_slots.size(); i++) {
 			iteration_slot.path_query_slots[i].slot_index = i;
@@ -874,7 +862,7 @@ NavMap::NavMap() {
 #endif
 }
 
-NavMap::~NavMap() {
+NavMap3D::~NavMap3D() {
 	if (iteration_build_thread_task_id != WorkerThreadPool::INVALID_TASK_ID) {
 		WorkerThreadPool::get_singleton()->wait_for_task_completion(iteration_build_thread_task_id);
 		iteration_build_thread_task_id = WorkerThreadPool::INVALID_TASK_ID;
diff --git a/engine/modules/navigation/nav_map.h b/engine/modules/navigation_3d/nav_map_3d.h
similarity index 72%
rename from engine/modules/navigation/nav_map.h
rename to engine/modules/navigation_3d/nav_map_3d.h
index 97fc9c8e..691f9a42 100644
--- a/engine/modules/navigation/nav_map.h
+++ b/engine/modules/navigation_3d/nav_map_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_map.h                                                             */
+/*  nav_map_3d.h                                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,13 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_MAP_H
-#define NAV_MAP_H
+#pragma once
 
 #include "3d/nav_map_iteration_3d.h"
 #include "3d/nav_mesh_queries_3d.h"
-#include "nav_rid.h"
-#include "nav_utils.h"
+#include "nav_rid_3d.h"
+#include "nav_utils_3d.h"
 
 #include "core/math/math_defs.h"
 #include "core/object/worker_thread_pool.h"
@@ -45,12 +44,12 @@
 #include <RVOSimulator2d.h>
 #include <RVOSimulator3d.h>
 
-class NavLink;
-class NavRegion;
-class NavAgent;
-class NavObstacle;
+class NavLink3D;
+class NavRegion3D;
+class NavAgent3D;
+class NavObstacle3D;
 
-class NavMap : public NavRid {
+class NavMap3D : public NavRid3D {
 	/// Map Up
 	Vector3 up = Vector3(0, 1, 0);
 
@@ -75,34 +74,31 @@ class NavMap : public NavRid {
 	bool map_settings_dirty = true;
 
 	/// Map regions
-	LocalVector<NavRegion *> regions;
+	LocalVector<NavRegion3D *> regions;
 
 	/// Map links
-	LocalVector<NavLink *> links;
+	LocalVector<NavLink3D *> links;
 
 	/// RVO avoidance worlds
 	RVO2D::RVOSimulator2D rvo_simulation_2d;
 	RVO3D::RVOSimulator3D rvo_simulation_3d;
 
 	/// avoidance controlled agents
-	LocalVector<NavAgent *> active_2d_avoidance_agents;
-	LocalVector<NavAgent *> active_3d_avoidance_agents;
+	LocalVector<NavAgent3D *> active_2d_avoidance_agents;
+	LocalVector<NavAgent3D *> active_3d_avoidance_agents;
 
 	/// dirty flag when one of the agent's arrays are modified
 	bool agents_dirty = true;
 
 	/// All the Agents (even the controlled one)
-	LocalVector<NavAgent *> agents;
+	LocalVector<NavAgent3D *> agents;
 
 	/// All the avoidance obstacles (both static and dynamic)
-	LocalVector<NavObstacle *> obstacles;
+	LocalVector<NavObstacle3D *> obstacles;
 
 	/// Are rvo obstacles modified?
 	bool obstacles_dirty = true;
 
-	/// Physics delta time
-	real_t deltatime = 0.0;
-
 	/// Change the id each time the map is updated.
 	uint32_t iteration_id = 0;
 
@@ -111,13 +107,13 @@ class NavMap : public NavRid {
 	bool avoidance_use_high_priority_threads = true;
 
 	// Performance Monitor
-	gd::PerformanceData performance_data;
+	Nav3D::PerformanceData performance_data;
 
 	struct {
-		SelfList<NavRegion>::List regions;
-		SelfList<NavLink>::List links;
-		SelfList<NavAgent>::List agents;
-		SelfList<NavObstacle>::List obstacles;
+		SelfList<NavRegion3D>::List regions;
+		SelfList<NavLink3D>::List links;
+		SelfList<NavAgent3D>::List agents;
+		SelfList<NavObstacle3D>::List obstacles;
 	} sync_dirty_requests;
 
 	int path_query_slots_max = 4;
@@ -125,10 +121,10 @@ class NavMap : public NavRid {
 	bool use_async_iterations = true;
 
 	uint32_t iteration_slot_index = 0;
-	LocalVector<NavMapIteration> iteration_slots;
+	LocalVector<NavMapIteration3D> iteration_slots;
 	mutable RWLock iteration_slot_rwlock;
 
-	NavMapIterationBuild iteration_build;
+	NavMapIterationBuild3D iteration_build;
 	bool iteration_build_use_threads = false;
 	WorkerThreadPool::TaskID iteration_build_thread_task_id = WorkerThreadPool::INVALID_TASK_ID;
 	static void _build_iteration_threaded(void *p_arg);
@@ -141,8 +137,8 @@ class NavMap : public NavRid {
 	void _sync_iteration();
 
 public:
-	NavMap();
-	~NavMap();
+	NavMap3D();
+	~NavMap3D();
 
 	uint32_t get_iteration_id() const { return iteration_id; }
 
@@ -179,7 +175,7 @@ public:
 		return link_connection_radius;
 	}
 
-	gd::PointKey get_point_key(const Vector3 &p_pos) const;
+	Nav3D::PointKey get_point_key(const Vector3 &p_pos) const;
 	const Vector3 &get_merge_rasterizer_cell_size() const;
 
 	void query_path(NavMeshQueries3D::NavMeshPathQueryTask3D &p_query_task);
@@ -187,42 +183,42 @@ public:
 	Vector3 get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, const bool p_use_collision) const;
 	Vector3 get_closest_point(const Vector3 &p_point) const;
 	Vector3 get_closest_point_normal(const Vector3 &p_point) const;
-	gd::ClosestPointQueryResult get_closest_point_info(const Vector3 &p_point) const;
+	Nav3D::ClosestPointQueryResult get_closest_point_info(const Vector3 &p_point) const;
 	RID get_closest_point_owner(const Vector3 &p_point) const;
 
-	void add_region(NavRegion *p_region);
-	void remove_region(NavRegion *p_region);
-	const LocalVector<NavRegion *> &get_regions() const {
+	void add_region(NavRegion3D *p_region);
+	void remove_region(NavRegion3D *p_region);
+	const LocalVector<NavRegion3D *> &get_regions() const {
 		return regions;
 	}
 
-	void add_link(NavLink *p_link);
-	void remove_link(NavLink *p_link);
-	const LocalVector<NavLink *> &get_links() const {
+	void add_link(NavLink3D *p_link);
+	void remove_link(NavLink3D *p_link);
+	const LocalVector<NavLink3D *> &get_links() const {
 		return links;
 	}
 
-	bool has_agent(NavAgent *agent) const;
-	void add_agent(NavAgent *agent);
-	void remove_agent(NavAgent *agent);
-	const LocalVector<NavAgent *> &get_agents() const {
+	bool has_agent(NavAgent3D *agent) const;
+	void add_agent(NavAgent3D *agent);
+	void remove_agent(NavAgent3D *agent);
+	const LocalVector<NavAgent3D *> &get_agents() const {
 		return agents;
 	}
 
-	void set_agent_as_controlled(NavAgent *agent);
-	void remove_agent_as_controlled(NavAgent *agent);
+	void set_agent_as_controlled(NavAgent3D *agent);
+	void remove_agent_as_controlled(NavAgent3D *agent);
 
-	bool has_obstacle(NavObstacle *obstacle) const;
-	void add_obstacle(NavObstacle *obstacle);
-	void remove_obstacle(NavObstacle *obstacle);
-	const LocalVector<NavObstacle *> &get_obstacles() const {
+	bool has_obstacle(NavObstacle3D *obstacle) const;
+	void add_obstacle(NavObstacle3D *obstacle);
+	void remove_obstacle(NavObstacle3D *obstacle);
+	const LocalVector<NavObstacle3D *> &get_obstacles() const {
 		return obstacles;
 	}
 
 	Vector3 get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const;
 
 	void sync();
-	void step(real_t p_deltatime);
+	void step(double p_delta_time);
 	void dispatch_callbacks();
 
 	// Performance Monitor
@@ -236,19 +232,19 @@ public:
 	int get_pm_edge_free_count() const { return performance_data.pm_edge_free_count; }
 	int get_pm_obstacle_count() const { return performance_data.pm_obstacle_count; }
 
-	int get_region_connections_count(NavRegion *p_region) const;
-	Vector3 get_region_connection_pathway_start(NavRegion *p_region, int p_connection_id) const;
-	Vector3 get_region_connection_pathway_end(NavRegion *p_region, int p_connection_id) const;
+	int get_region_connections_count(NavRegion3D *p_region) const;
+	Vector3 get_region_connection_pathway_start(NavRegion3D *p_region, int p_connection_id) const;
+	Vector3 get_region_connection_pathway_end(NavRegion3D *p_region, int p_connection_id) const;
 
-	void add_region_sync_dirty_request(SelfList<NavRegion> *p_sync_request);
-	void add_link_sync_dirty_request(SelfList<NavLink> *p_sync_request);
-	void add_agent_sync_dirty_request(SelfList<NavAgent> *p_sync_request);
-	void add_obstacle_sync_dirty_request(SelfList<NavObstacle> *p_sync_request);
+	void add_region_sync_dirty_request(SelfList<NavRegion3D> *p_sync_request);
+	void add_link_sync_dirty_request(SelfList<NavLink3D> *p_sync_request);
+	void add_agent_sync_dirty_request(SelfList<NavAgent3D> *p_sync_request);
+	void add_obstacle_sync_dirty_request(SelfList<NavObstacle3D> *p_sync_request);
 
-	void remove_region_sync_dirty_request(SelfList<NavRegion> *p_sync_request);
-	void remove_link_sync_dirty_request(SelfList<NavLink> *p_sync_request);
-	void remove_agent_sync_dirty_request(SelfList<NavAgent> *p_sync_request);
-	void remove_obstacle_sync_dirty_request(SelfList<NavObstacle> *p_sync_request);
+	void remove_region_sync_dirty_request(SelfList<NavRegion3D> *p_sync_request);
+	void remove_link_sync_dirty_request(SelfList<NavLink3D> *p_sync_request);
+	void remove_agent_sync_dirty_request(SelfList<NavAgent3D> *p_sync_request);
+	void remove_obstacle_sync_dirty_request(SelfList<NavObstacle3D> *p_sync_request);
 
 	void set_use_async_iterations(bool p_enabled);
 	bool get_use_async_iterations() const;
@@ -257,10 +253,10 @@ private:
 	void _sync_dirty_map_update_requests();
 	void _sync_dirty_avoidance_update_requests();
 
-	void compute_single_step(uint32_t index, NavAgent **agent);
+	void compute_single_step(uint32_t index, NavAgent3D **agent);
 
-	void compute_single_avoidance_step_2d(uint32_t index, NavAgent **agent);
-	void compute_single_avoidance_step_3d(uint32_t index, NavAgent **agent);
+	void compute_single_avoidance_step_2d(uint32_t index, NavAgent3D **agent);
+	void compute_single_avoidance_step_3d(uint32_t index, NavAgent3D **agent);
 
 	void _sync_avoidance();
 	void _update_rvo_simulation();
@@ -270,5 +266,3 @@ private:
 
 	void _update_merge_rasterizer_cell_dimensions();
 };
-
-#endif // NAV_MAP_H
diff --git a/engine/modules/navigation/nav_obstacle.cpp b/engine/modules/navigation_3d/nav_obstacle_3d.cpp
similarity index 82%
rename from engine/modules/navigation/nav_obstacle.cpp
rename to engine/modules/navigation_3d/nav_obstacle_3d.cpp
index ced3e065..93fa474e 100644
--- a/engine/modules/navigation/nav_obstacle.cpp
+++ b/engine/modules/navigation_3d/nav_obstacle_3d.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_obstacle.cpp                                                      */
+/*  nav_obstacle_3d.cpp                                                   */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "nav_obstacle.h"
+#include "nav_obstacle_3d.h"
 
-#include "nav_agent.h"
-#include "nav_map.h"
+#include "nav_agent_3d.h"
+#include "nav_map_3d.h"
 
-void NavObstacle::set_agent(NavAgent *p_agent) {
+void NavObstacle3D::set_agent(NavAgent3D *p_agent) {
 	if (agent == p_agent) {
 		return;
 	}
@@ -45,7 +45,7 @@ void NavObstacle::set_agent(NavAgent *p_agent) {
 	request_sync();
 }
 
-void NavObstacle::set_avoidance_enabled(bool p_enabled) {
+void NavObstacle3D::set_avoidance_enabled(bool p_enabled) {
 	if (avoidance_enabled == p_enabled) {
 		return;
 	}
@@ -58,7 +58,7 @@ void NavObstacle::set_avoidance_enabled(bool p_enabled) {
 	request_sync();
 }
 
-void NavObstacle::set_use_3d_avoidance(bool p_enabled) {
+void NavObstacle3D::set_use_3d_avoidance(bool p_enabled) {
 	if (use_3d_avoidance == p_enabled) {
 		return;
 	}
@@ -73,7 +73,7 @@ void NavObstacle::set_use_3d_avoidance(bool p_enabled) {
 	request_sync();
 }
 
-void NavObstacle::set_map(NavMap *p_map) {
+void NavObstacle3D::set_map(NavMap3D *p_map) {
 	if (map == p_map) {
 		return;
 	}
@@ -98,7 +98,7 @@ void NavObstacle::set_map(NavMap *p_map) {
 	}
 }
 
-void NavObstacle::set_position(const Vector3 p_position) {
+void NavObstacle3D::set_position(const Vector3 p_position) {
 	if (position == p_position) {
 		return;
 	}
@@ -113,7 +113,7 @@ void NavObstacle::set_position(const Vector3 p_position) {
 	request_sync();
 }
 
-void NavObstacle::set_radius(real_t p_radius) {
+void NavObstacle3D::set_radius(real_t p_radius) {
 	if (radius == p_radius) {
 		return;
 	}
@@ -125,7 +125,7 @@ void NavObstacle::set_radius(real_t p_radius) {
 	}
 }
 
-void NavObstacle::set_height(const real_t p_height) {
+void NavObstacle3D::set_height(const real_t p_height) {
 	if (height == p_height) {
 		return;
 	}
@@ -140,7 +140,7 @@ void NavObstacle::set_height(const real_t p_height) {
 	request_sync();
 }
 
-void NavObstacle::set_velocity(const Vector3 p_velocity) {
+void NavObstacle3D::set_velocity(const Vector3 p_velocity) {
 	velocity = p_velocity;
 
 	if (agent) {
@@ -148,7 +148,7 @@ void NavObstacle::set_velocity(const Vector3 p_velocity) {
 	}
 }
 
-void NavObstacle::set_vertices(const Vector<Vector3> &p_vertices) {
+void NavObstacle3D::set_vertices(const Vector<Vector3> &p_vertices) {
 	if (vertices == p_vertices) {
 		return;
 	}
@@ -159,7 +159,7 @@ void NavObstacle::set_vertices(const Vector<Vector3> &p_vertices) {
 	request_sync();
 }
 
-bool NavObstacle::is_map_changed() {
+bool NavObstacle3D::is_map_changed() {
 	if (map) {
 		bool is_changed = map->get_iteration_id() != last_map_iteration_id;
 		last_map_iteration_id = map->get_iteration_id();
@@ -169,7 +169,7 @@ bool NavObstacle::is_map_changed() {
 	}
 }
 
-void NavObstacle::set_avoidance_layers(uint32_t p_layers) {
+void NavObstacle3D::set_avoidance_layers(uint32_t p_layers) {
 	if (avoidance_layers == p_layers) {
 		return;
 	}
@@ -184,15 +184,15 @@ void NavObstacle::set_avoidance_layers(uint32_t p_layers) {
 	request_sync();
 }
 
-bool NavObstacle::is_dirty() const {
+bool NavObstacle3D::is_dirty() const {
 	return obstacle_dirty;
 }
 
-void NavObstacle::sync() {
+void NavObstacle3D::sync() {
 	obstacle_dirty = false;
 }
 
-void NavObstacle::internal_update_agent() {
+void NavObstacle3D::internal_update_agent() {
 	if (agent) {
 		agent->set_neighbor_distance(0.0);
 		agent->set_max_neighbors(0.0);
@@ -212,7 +212,7 @@ void NavObstacle::internal_update_agent() {
 	}
 }
 
-void NavObstacle::set_paused(bool p_paused) {
+void NavObstacle3D::set_paused(bool p_paused) {
 	if (paused == p_paused) {
 		return;
 	}
@@ -229,26 +229,26 @@ void NavObstacle::set_paused(bool p_paused) {
 	internal_update_agent();
 }
 
-bool NavObstacle::get_paused() const {
+bool NavObstacle3D::get_paused() const {
 	return paused;
 }
 
-void NavObstacle::request_sync() {
+void NavObstacle3D::request_sync() {
 	if (map && !sync_dirty_request_list_element.in_list()) {
 		map->add_obstacle_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-void NavObstacle::cancel_sync_request() {
+void NavObstacle3D::cancel_sync_request() {
 	if (map && sync_dirty_request_list_element.in_list()) {
 		map->remove_obstacle_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-NavObstacle::NavObstacle() :
+NavObstacle3D::NavObstacle3D() :
 		sync_dirty_request_list_element(this) {
 }
 
-NavObstacle::~NavObstacle() {
+NavObstacle3D::~NavObstacle3D() {
 	cancel_sync_request();
 }
diff --git a/engine/modules/navigation/nav_obstacle.h b/engine/modules/navigation_3d/nav_obstacle_3d.h
similarity index 87%
rename from engine/modules/navigation/nav_obstacle.h
rename to engine/modules/navigation_3d/nav_obstacle_3d.h
index 686a82ca..fe5a9528 100644
--- a/engine/modules/navigation/nav_obstacle.h
+++ b/engine/modules/navigation_3d/nav_obstacle_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_obstacle.h                                                        */
+/*  nav_obstacle_3d.h                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,20 +28,19 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_OBSTACLE_H
-#define NAV_OBSTACLE_H
+#pragma once
 
-#include "nav_rid.h"
+#include "nav_rid_3d.h"
 
 #include "core/object/class_db.h"
 #include "core/templates/self_list.h"
 
-class NavAgent;
-class NavMap;
+class NavAgent3D;
+class NavMap3D;
 
-class NavObstacle : public NavRid {
-	NavAgent *agent = nullptr;
-	NavMap *map = nullptr;
+class NavObstacle3D : public NavRid3D {
+	NavAgent3D *agent = nullptr;
+	NavMap3D *map = nullptr;
 	Vector3 velocity;
 	Vector3 position;
 	Vector<Vector3> vertices;
@@ -58,11 +57,11 @@ class NavObstacle : public NavRid {
 	uint32_t last_map_iteration_id = 0;
 	bool paused = false;
 
-	SelfList<NavObstacle> sync_dirty_request_list_element;
+	SelfList<NavObstacle3D> sync_dirty_request_list_element;
 
 public:
-	NavObstacle();
-	~NavObstacle();
+	NavObstacle3D();
+	~NavObstacle3D();
 
 	void set_avoidance_enabled(bool p_enabled);
 	bool is_avoidance_enabled() { return avoidance_enabled; }
@@ -70,11 +69,11 @@ public:
 	void set_use_3d_avoidance(bool p_enabled);
 	bool get_use_3d_avoidance() { return use_3d_avoidance; }
 
-	void set_map(NavMap *p_map);
-	NavMap *get_map() { return map; }
+	void set_map(NavMap3D *p_map);
+	NavMap3D *get_map() { return map; }
 
-	void set_agent(NavAgent *p_agent);
-	NavAgent *get_agent() { return agent; }
+	void set_agent(NavAgent3D *p_agent);
+	NavAgent3D *get_agent() { return agent; }
 
 	void set_position(const Vector3 p_position);
 	const Vector3 &get_position() const { return position; }
@@ -107,5 +106,3 @@ public:
 private:
 	void internal_update_agent();
 };
-
-#endif // NAV_OBSTACLE_H
diff --git a/engine/modules/navigation/nav_region.cpp b/engine/modules/navigation_3d/nav_region_3d.cpp
similarity index 86%
rename from engine/modules/navigation/nav_region.cpp
rename to engine/modules/navigation_3d/nav_region_3d.cpp
index 9be180f8..2d18f4ae 100644
--- a/engine/modules/navigation/nav_region.cpp
+++ b/engine/modules/navigation_3d/nav_region_3d.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_region.cpp                                                        */
+/*  nav_region_3d.cpp                                                     */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,15 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "nav_region.h"
+#include "nav_region_3d.h"
 
-#include "nav_map.h"
+#include "nav_map_3d.h"
 
 #include "3d/nav_map_builder_3d.h"
 #include "3d/nav_mesh_queries_3d.h"
 #include "3d/nav_region_iteration_3d.h"
 
-void NavRegion::set_map(NavMap *p_map) {
+using namespace Nav3D;
+
+void NavRegion3D::set_map(NavMap3D *p_map) {
 	if (map == p_map) {
 		return;
 	}
@@ -56,7 +58,7 @@ void NavRegion::set_map(NavMap *p_map) {
 	}
 }
 
-void NavRegion::set_enabled(bool p_enabled) {
+void NavRegion3D::set_enabled(bool p_enabled) {
 	if (enabled == p_enabled) {
 		return;
 	}
@@ -68,7 +70,7 @@ void NavRegion::set_enabled(bool p_enabled) {
 	request_sync();
 }
 
-void NavRegion::set_use_edge_connections(bool p_enabled) {
+void NavRegion3D::set_use_edge_connections(bool p_enabled) {
 	if (use_edge_connections != p_enabled) {
 		use_edge_connections = p_enabled;
 		polygons_dirty = true;
@@ -77,7 +79,7 @@ void NavRegion::set_use_edge_connections(bool p_enabled) {
 	request_sync();
 }
 
-void NavRegion::set_transform(Transform3D p_transform) {
+void NavRegion3D::set_transform(Transform3D p_transform) {
 	if (transform == p_transform) {
 		return;
 	}
@@ -93,7 +95,7 @@ void NavRegion::set_transform(Transform3D p_transform) {
 #endif // DEBUG_ENABLED
 }
 
-void NavRegion::set_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) {
+void NavRegion3D::set_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) {
 #ifdef DEBUG_ENABLED
 	if (map && p_navigation_mesh.is_valid() && !Math::is_equal_approx(double(map->get_cell_size()), double(p_navigation_mesh->get_cell_size()))) {
 		ERR_PRINT_ONCE(vformat("Attempted to update a navigation region with a navigation mesh that uses a `cell_size` of %s while assigned to a navigation map set to a `cell_size` of %s. The cell size for navigation maps can be changed by using the NavigationServer map_set_cell_size() function. The cell size for default navigation maps can also be changed in the ProjectSettings.", double(p_navigation_mesh->get_cell_size()), double(map->get_cell_size())));
@@ -118,20 +120,20 @@ void NavRegion::set_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh) {
 	request_sync();
 }
 
-Vector3 NavRegion::get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, bool p_use_collision) const {
+Vector3 NavRegion3D::get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, bool p_use_collision) const {
 	RWLockRead read_lock(region_rwlock);
 
 	return NavMeshQueries3D::polygons_get_closest_point_to_segment(
 			get_polygons(), p_from, p_to, p_use_collision);
 }
 
-gd::ClosestPointQueryResult NavRegion::get_closest_point_info(const Vector3 &p_point) const {
+ClosestPointQueryResult NavRegion3D::get_closest_point_info(const Vector3 &p_point) const {
 	RWLockRead read_lock(region_rwlock);
 
 	return NavMeshQueries3D::polygons_get_closest_point_info(get_polygons(), p_point);
 }
 
-Vector3 NavRegion::get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const {
+Vector3 NavRegion3D::get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const {
 	RWLockRead read_lock(region_rwlock);
 
 	if (!get_enabled()) {
@@ -141,7 +143,7 @@ Vector3 NavRegion::get_random_point(uint32_t p_navigation_layers, bool p_uniform
 	return NavMeshQueries3D::polygons_get_random_point(get_polygons(), p_navigation_layers, p_uniformly);
 }
 
-void NavRegion::set_navigation_layers(uint32_t p_navigation_layers) {
+void NavRegion3D::set_navigation_layers(uint32_t p_navigation_layers) {
 	if (navigation_layers == p_navigation_layers) {
 		return;
 	}
@@ -151,7 +153,7 @@ void NavRegion::set_navigation_layers(uint32_t p_navigation_layers) {
 	request_sync();
 }
 
-void NavRegion::set_enter_cost(real_t p_enter_cost) {
+void NavRegion3D::set_enter_cost(real_t p_enter_cost) {
 	real_t new_enter_cost = MAX(p_enter_cost, 0.0);
 	if (enter_cost == new_enter_cost) {
 		return;
@@ -162,7 +164,7 @@ void NavRegion::set_enter_cost(real_t p_enter_cost) {
 	request_sync();
 }
 
-void NavRegion::set_travel_cost(real_t p_travel_cost) {
+void NavRegion3D::set_travel_cost(real_t p_travel_cost) {
 	real_t new_travel_cost = MAX(p_travel_cost, 0.0);
 	if (travel_cost == new_travel_cost) {
 		return;
@@ -173,7 +175,7 @@ void NavRegion::set_travel_cost(real_t p_travel_cost) {
 	request_sync();
 }
 
-void NavRegion::set_owner_id(ObjectID p_owner_id) {
+void NavRegion3D::set_owner_id(ObjectID p_owner_id) {
 	if (owner_id == p_owner_id) {
 		return;
 	}
@@ -183,7 +185,7 @@ void NavRegion::set_owner_id(ObjectID p_owner_id) {
 	request_sync();
 }
 
-bool NavRegion::sync() {
+bool NavRegion3D::sync() {
 	RWLockWrite write_lock(region_rwlock);
 
 	bool something_changed = region_dirty || polygons_dirty;
@@ -195,7 +197,7 @@ bool NavRegion::sync() {
 	return something_changed;
 }
 
-void NavRegion::update_polygons() {
+void NavRegion3D::update_polygons() {
 	if (!polygons_dirty) {
 		return;
 	}
@@ -229,7 +231,7 @@ void NavRegion::update_polygons() {
 	bool first_vertex = true;
 	int navigation_mesh_polygon_index = 0;
 
-	for (gd::Polygon &polygon : navmesh_polygons) {
+	for (Polygon &polygon : navmesh_polygons) {
 		polygon.surface_area = 0.0;
 
 		Vector<int> navigation_mesh_polygon = pending_navmesh_polygons[navigation_mesh_polygon_index];
@@ -243,7 +245,7 @@ void NavRegion::update_polygons() {
 		const int *indices = navigation_mesh_polygon.ptr();
 		bool valid(true);
 
-		polygon.points.resize(navigation_mesh_polygon_size);
+		polygon.vertices.resize(navigation_mesh_polygon_size);
 		polygon.edges.resize(navigation_mesh_polygon_size);
 
 		real_t _new_polygon_surface_area = 0.0;
@@ -268,8 +270,7 @@ void NavRegion::update_polygons() {
 			}
 
 			Vector3 point_position = transform.xform(vertices_r[idx]);
-			polygon.points[j].pos = point_position;
-			polygon.points[j].key = NavMapBuilder3D::get_point_key(point_position, map->get_merge_rasterizer_cell_size());
+			polygon.vertices[j] = point_position;
 
 			if (first_vertex) {
 				first_vertex = false;
@@ -288,7 +289,7 @@ void NavRegion::update_polygons() {
 	bounds = _new_bounds;
 }
 
-void NavRegion::get_iteration_update(NavRegionIteration &r_iteration) {
+void NavRegion3D::get_iteration_update(NavRegionIteration3D &r_iteration) {
 	r_iteration.navigation_layers = get_navigation_layers();
 	r_iteration.enter_cost = get_enter_cost();
 	r_iteration.travel_cost = get_travel_cost();
@@ -305,29 +306,29 @@ void NavRegion::get_iteration_update(NavRegionIteration &r_iteration) {
 	r_iteration.navmesh_polygons.clear();
 	r_iteration.navmesh_polygons.resize(navmesh_polygons.size());
 	for (uint32_t i = 0; i < navmesh_polygons.size(); i++) {
-		gd::Polygon &navmesh_polygon = navmesh_polygons[i];
+		Polygon &navmesh_polygon = navmesh_polygons[i];
 		navmesh_polygon.owner = &r_iteration;
 		r_iteration.navmesh_polygons[i] = navmesh_polygon;
 	}
 }
 
-void NavRegion::request_sync() {
+void NavRegion3D::request_sync() {
 	if (map && !sync_dirty_request_list_element.in_list()) {
 		map->add_region_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-void NavRegion::cancel_sync_request() {
+void NavRegion3D::cancel_sync_request() {
 	if (map && sync_dirty_request_list_element.in_list()) {
 		map->remove_region_sync_dirty_request(&sync_dirty_request_list_element);
 	}
 }
 
-NavRegion::NavRegion() :
+NavRegion3D::NavRegion3D() :
 		sync_dirty_request_list_element(this) {
 	type = NavigationUtilities::PathSegmentType::PATH_SEGMENT_TYPE_REGION;
 }
 
-NavRegion::~NavRegion() {
+NavRegion3D::~NavRegion3D() {
 	cancel_sync_request();
 }
diff --git a/engine/modules/navigation/nav_region.h b/engine/modules/navigation_3d/nav_region_3d.h
similarity index 85%
rename from engine/modules/navigation/nav_region.h
rename to engine/modules/navigation_3d/nav_region_3d.h
index 1ea4195a..3a947f04 100644
--- a/engine/modules/navigation/nav_region.h
+++ b/engine/modules/navigation_3d/nav_region_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_region.h                                                          */
+/*  nav_region_3d.h                                                       */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,20 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_REGION_H
-#define NAV_REGION_H
+#pragma once
 
-#include "nav_base.h"
-#include "nav_utils.h"
+#include "nav_base_3d.h"
+#include "nav_utils_3d.h"
 
 #include "core/os/rw_lock.h"
 #include "scene/resources/navigation_mesh.h"
 
-struct NavRegionIteration;
+struct NavRegionIteration3D;
 
-class NavRegion : public NavBase {
+class NavRegion3D : public NavBase3D {
 	RWLock region_rwlock;
 
-	NavMap *map = nullptr;
+	NavMap3D *map = nullptr;
 	Transform3D transform;
 	bool enabled = true;
 
@@ -51,7 +50,7 @@ class NavRegion : public NavBase {
 	bool region_dirty = true;
 	bool polygons_dirty = true;
 
-	LocalVector<gd::Polygon> navmesh_polygons;
+	LocalVector<Nav3D::Polygon> navmesh_polygons;
 
 	real_t surface_area = 0.0;
 	AABB bounds;
@@ -60,11 +59,11 @@ class NavRegion : public NavBase {
 	Vector<Vector3> pending_navmesh_vertices;
 	Vector<Vector<int>> pending_navmesh_polygons;
 
-	SelfList<NavRegion> sync_dirty_request_list_element;
+	SelfList<NavRegion3D> sync_dirty_request_list_element;
 
 public:
-	NavRegion();
-	~NavRegion();
+	NavRegion3D();
+	~NavRegion3D();
 
 	void scratch_polygons() {
 		polygons_dirty = true;
@@ -73,8 +72,8 @@ public:
 	void set_enabled(bool p_enabled);
 	bool get_enabled() const { return enabled; }
 
-	void set_map(NavMap *p_map);
-	NavMap *get_map() const {
+	void set_map(NavMap3D *p_map);
+	NavMap3D *get_map() const {
 		return map;
 	}
 
@@ -88,12 +87,12 @@ public:
 
 	void set_navigation_mesh(Ref<NavigationMesh> p_navigation_mesh);
 
-	LocalVector<gd::Polygon> const &get_polygons() const {
+	LocalVector<Nav3D::Polygon> const &get_polygons() const {
 		return navmesh_polygons;
 	}
 
 	Vector3 get_closest_point_to_segment(const Vector3 &p_from, const Vector3 &p_to, bool p_use_collision) const;
-	gd::ClosestPointQueryResult get_closest_point_info(const Vector3 &p_point) const;
+	Nav3D::ClosestPointQueryResult get_closest_point_info(const Vector3 &p_point) const;
 	Vector3 get_random_point(uint32_t p_navigation_layers, bool p_uniformly) const;
 
 	real_t get_surface_area() const { return surface_area; }
@@ -109,10 +108,8 @@ public:
 	void request_sync();
 	void cancel_sync_request();
 
-	void get_iteration_update(NavRegionIteration &r_iteration);
+	void get_iteration_update(NavRegionIteration3D &r_iteration);
 
 private:
 	void update_polygons();
 };
-
-#endif // NAV_REGION_H
diff --git a/engine/modules/navigation_3d/nav_rid_3d.h b/engine/modules/navigation_3d/nav_rid_3d.h
new file mode 100644
index 00000000..017eee31
--- /dev/null
+++ b/engine/modules/navigation_3d/nav_rid_3d.h
@@ -0,0 +1,41 @@
+/**************************************************************************/
+/*  nav_rid_3d.h                                                          */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/templates/rid.h"
+
+class NavRid3D {
+	RID self;
+
+public:
+	_FORCE_INLINE_ void set_self(const RID &p_self) { self = p_self; }
+	_FORCE_INLINE_ RID get_self() const { return self; }
+};
diff --git a/engine/modules/navigation/nav_utils.h b/engine/modules/navigation_3d/nav_utils_3d.h
similarity index 63%
rename from engine/modules/navigation/nav_utils.h
rename to engine/modules/navigation_3d/nav_utils_3d.h
index a0686897..0ce751dc 100644
--- a/engine/modules/navigation/nav_utils.h
+++ b/engine/modules/navigation_3d/nav_utils_3d.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  nav_utils.h                                                           */
+/*  nav_utils_3d.h                                                        */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,18 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAV_UTILS_H
-#define NAV_UTILS_H
+#pragma once
 
 #include "core/math/vector3.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hashfuncs.h"
-#include "core/templates/local_vector.h"
+#include "servers/navigation/nav_heap.h"
 #include "servers/navigation/navigation_utilities.h"
 
-struct NavBaseIteration;
+struct NavBaseIteration3D;
 
-namespace gd {
+namespace Nav3D {
 struct Polygon;
 
 union PointKey {
@@ -73,11 +72,6 @@ struct EdgeKey {
 	}
 };
 
-struct Point {
-	Vector3 pos;
-	PointKey key;
-};
-
 struct Edge {
 	/// The gateway in the edge, as, in some case, the whole edge might not be navigable.
 	struct Connection {
@@ -103,10 +97,9 @@ struct Polygon {
 	uint32_t id = UINT32_MAX;
 
 	/// Navigation region or link that contains this polygon.
-	const NavBaseIteration *owner = nullptr;
+	const NavBaseIteration3D *owner = nullptr;
 
-	/// The points of this `Polygon`
-	LocalVector<Point> points;
+	LocalVector<Vector3> vertices;
 
 	/// The edges of this `Polygon`
 	LocalVector<Edge> edges;
@@ -185,133 +178,8 @@ struct ClosestPointQueryResult {
 	RID owner;
 };
 
-template <typename T>
-struct NoopIndexer {
-	void operator()(const T &p_value, uint32_t p_index) {}
-};
-
-/**
- * A max-heap implementation that notifies of element index changes.
- */
-template <typename T, typename LessThan = Comparator<T>, typename Indexer = NoopIndexer<T>>
-class Heap {
-	LocalVector<T> _buffer;
-
-	LessThan _less_than;
-	Indexer _indexer;
-
-public:
-	static constexpr uint32_t INVALID_INDEX = UINT32_MAX;
-	void reserve(uint32_t p_size) {
-		_buffer.reserve(p_size);
-	}
-
-	uint32_t size() const {
-		return _buffer.size();
-	}
-
-	bool is_empty() const {
-		return _buffer.is_empty();
-	}
-
-	void push(const T &p_element) {
-		_buffer.push_back(p_element);
-		_indexer(p_element, _buffer.size() - 1);
-		_shift_up(_buffer.size() - 1);
-	}
-
-	T pop() {
-		ERR_FAIL_COND_V_MSG(_buffer.is_empty(), T(), "Can't pop an empty heap.");
-		T value = _buffer[0];
-		_indexer(value, INVALID_INDEX);
-		if (_buffer.size() > 1) {
-			_buffer[0] = _buffer[_buffer.size() - 1];
-			_indexer(_buffer[0], 0);
-			_buffer.remove_at(_buffer.size() - 1);
-			_shift_down(0);
-		} else {
-			_buffer.remove_at(_buffer.size() - 1);
-		}
-		return value;
-	}
-
-	/**
-	 * Update the position of the element in the heap if necessary.
-	 */
-	void shift(uint32_t p_index) {
-		ERR_FAIL_UNSIGNED_INDEX_MSG(p_index, _buffer.size(), "Heap element index is out of range.");
-		if (!_shift_up(p_index)) {
-			_shift_down(p_index);
-		}
-	}
-
-	void clear() {
-		for (const T &value : _buffer) {
-			_indexer(value, INVALID_INDEX);
-		}
-		_buffer.clear();
-	}
-
-	Heap() {}
-
-	Heap(const LessThan &p_less_than) :
-			_less_than(p_less_than) {}
-
-	Heap(const Indexer &p_indexer) :
-			_indexer(p_indexer) {}
-
-	Heap(const LessThan &p_less_than, const Indexer &p_indexer) :
-			_less_than(p_less_than), _indexer(p_indexer) {}
-
-private:
-	bool _shift_up(uint32_t p_index) {
-		T value = _buffer[p_index];
-		uint32_t current_index = p_index;
-		uint32_t parent_index = (current_index - 1) / 2;
-		while (current_index > 0 && _less_than(_buffer[parent_index], value)) {
-			_buffer[current_index] = _buffer[parent_index];
-			_indexer(_buffer[current_index], current_index);
-			current_index = parent_index;
-			parent_index = (current_index - 1) / 2;
-		}
-		if (current_index != p_index) {
-			_buffer[current_index] = value;
-			_indexer(value, current_index);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	bool _shift_down(uint32_t p_index) {
-		T value = _buffer[p_index];
-		uint32_t current_index = p_index;
-		uint32_t child_index = 2 * current_index + 1;
-		while (child_index < _buffer.size()) {
-			if (child_index + 1 < _buffer.size() &&
-					_less_than(_buffer[child_index], _buffer[child_index + 1])) {
-				child_index++;
-			}
-			if (_less_than(_buffer[child_index], value)) {
-				break;
-			}
-			_buffer[current_index] = _buffer[child_index];
-			_indexer(_buffer[current_index], current_index);
-			current_index = child_index;
-			child_index = 2 * current_index + 1;
-		}
-		if (current_index != p_index) {
-			_buffer[current_index] = value;
-			_indexer(value, current_index);
-			return true;
-		} else {
-			return false;
-		}
-	}
-};
-
 struct EdgeConnectionPair {
-	gd::Edge::Connection connections[2];
+	Edge::Connection connections[2];
 	int size = 0;
 };
 
@@ -339,6 +207,4 @@ struct PerformanceData {
 	}
 };
 
-} // namespace gd
-
-#endif // NAV_UTILS_H
+} // namespace Nav3D
diff --git a/engine/modules/navigation/register_types.cpp b/engine/modules/navigation_3d/register_types.cpp
similarity index 87%
rename from engine/modules/navigation/register_types.cpp
rename to engine/modules/navigation_3d/register_types.cpp
index dbc9e530..c494067f 100644
--- a/engine/modules/navigation/register_types.cpp
+++ b/engine/modules/navigation_3d/register_types.cpp
@@ -30,13 +30,10 @@
 
 #include "register_types.h"
 
-#include "2d/godot_navigation_server_2d.h"
 #include "3d/godot_navigation_server_3d.h"
 
 #ifndef DISABLE_DEPRECATED
-#ifndef _3D_DISABLED
 #include "3d/navigation_mesh_generator.h"
-#endif
 #endif // DISABLE_DEPRECATED
 
 #ifdef TOOLS_ENABLED
@@ -44,34 +41,24 @@
 #endif
 
 #include "core/config/engine.h"
-#include "servers/navigation_server_2d.h"
 #include "servers/navigation_server_3d.h"
 
 #ifndef DISABLE_DEPRECATED
-#ifndef _3D_DISABLED
 NavigationMeshGenerator *_nav_mesh_generator = nullptr;
-#endif
 #endif // DISABLE_DEPRECATED
 
 NavigationServer3D *new_navigation_server_3d() {
 	return memnew(GodotNavigationServer3D);
 }
 
-NavigationServer2D *new_navigation_server_2d() {
-	return memnew(GodotNavigationServer2D);
-}
-
-void initialize_navigation_module(ModuleInitializationLevel p_level) {
+void initialize_navigation_3d_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SERVERS) {
 		NavigationServer3DManager::set_default_server(new_navigation_server_3d);
-		NavigationServer2DManager::set_default_server(new_navigation_server_2d);
 
 #ifndef DISABLE_DEPRECATED
-#ifndef _3D_DISABLED
 		_nav_mesh_generator = memnew(NavigationMeshGenerator);
 		GDREGISTER_CLASS(NavigationMeshGenerator);
 		Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationMeshGenerator", NavigationMeshGenerator::get_singleton()));
-#endif
 #endif // DISABLE_DEPRECATED
 	}
 
@@ -82,16 +69,14 @@ void initialize_navigation_module(ModuleInitializationLevel p_level) {
 #endif
 }
 
-void uninitialize_navigation_module(ModuleInitializationLevel p_level) {
+void uninitialize_navigation_3d_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
 		return;
 	}
 
 #ifndef DISABLE_DEPRECATED
-#ifndef _3D_DISABLED
 	if (_nav_mesh_generator) {
 		memdelete(_nav_mesh_generator);
 	}
-#endif
 #endif // DISABLE_DEPRECATED
 }
diff --git a/engine/modules/navigation_3d/register_types.h b/engine/modules/navigation_3d/register_types.h
new file mode 100644
index 00000000..80c15d98
--- /dev/null
+++ b/engine/modules/navigation_3d/register_types.h
@@ -0,0 +1,36 @@
+/**************************************************************************/
+/*  register_types.h                                                      */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "modules/register_module_types.h"
+
+void initialize_navigation_3d_module(ModuleInitializationLevel p_level);
+void uninitialize_navigation_3d_module(ModuleInitializationLevel p_level);
diff --git a/engine/modules/noise/SCsub b/engine/modules/noise/SCsub
index dcf51b03..1ef2d955 100644
--- a/engine/modules/noise/SCsub
+++ b/engine/modules/noise/SCsub
@@ -7,12 +7,14 @@ Import("env_modules")
 env_noise = env_modules.Clone()
 
 thirdparty_dir = "#thirdparty/noise/"
-env_noise.Prepend(CPPPATH=[thirdparty_dir])
+env_noise.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 # Godot source files
 
 module_obj = []
 
 env_noise.add_source_files(module_obj, "*.cpp")
-env_noise.add_source_files(module_obj, "editor/*.cpp")
+if env.editor_build:
+    env_noise.add_source_files(module_obj, "editor/*.cpp")
+
 env.modules_sources += module_obj
diff --git a/engine/modules/noise/editor/noise_editor_plugin.cpp b/engine/modules/noise/editor/noise_editor_plugin.cpp
index 4f1df2f4..b1f3cb5e 100644
--- a/engine/modules/noise/editor/noise_editor_plugin.cpp
+++ b/engine/modules/noise/editor/noise_editor_plugin.cpp
@@ -30,8 +30,6 @@
 
 #include "noise_editor_plugin.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "../noise.h"
 #include "../noise_texture_2d.h"
 
@@ -148,5 +146,3 @@ NoiseEditorPlugin::NoiseEditorPlugin() {
 	plugin.instantiate();
 	add_inspector_plugin(plugin);
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/noise/editor/noise_editor_plugin.h b/engine/modules/noise/editor/noise_editor_plugin.h
index 29c8e858..43a50bc0 100644
--- a/engine/modules/noise/editor/noise_editor_plugin.h
+++ b/engine/modules/noise/editor/noise_editor_plugin.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NOISE_EDITOR_PLUGIN_H
-#define NOISE_EDITOR_PLUGIN_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "editor/plugins/editor_plugin.h"
 
@@ -43,7 +40,3 @@ public:
 
 	NoiseEditorPlugin();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // NOISE_EDITOR_PLUGIN_H
diff --git a/engine/modules/noise/fastnoise_lite.h b/engine/modules/noise/fastnoise_lite.h
index 38876e6c..6e35aeb1 100644
--- a/engine/modules/noise/fastnoise_lite.h
+++ b/engine/modules/noise/fastnoise_lite.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FASTNOISE_LITE_H
-#define FASTNOISE_LITE_H
+#pragma once
 
 #include "noise.h"
 
@@ -220,5 +219,3 @@ VARIANT_ENUM_CAST(FastNoiseLite::CellularDistanceFunction);
 VARIANT_ENUM_CAST(FastNoiseLite::CellularReturnType);
 VARIANT_ENUM_CAST(FastNoiseLite::DomainWarpType);
 VARIANT_ENUM_CAST(FastNoiseLite::DomainWarpFractalType);
-
-#endif // FASTNOISE_LITE_H
diff --git a/engine/modules/noise/icons/NoiseTexture2D.svg b/engine/modules/noise/icons/NoiseTexture2D.svg
index 94d550d1..94aa3dcf 100644
--- a/engine/modules/noise/icons/NoiseTexture2D.svg
+++ b/engine/modules/noise/icons/NoiseTexture2D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm3 1v2h2V4zm2 2v2h2v2h2V4h-2v2zm0 2H6V6H4v4h4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zm1 2h10v8H3zm3 1v2h2V4zm2 2v2h2v2h2V4h-2v2zm0 2H6V6H4v4h4z"/></svg>
diff --git a/engine/modules/noise/icons/NoiseTexture3D.svg b/engine/modules/noise/icons/NoiseTexture3D.svg
index 178bac2d..cb9d05a8 100644
--- a/engine/modules/noise/icons/NoiseTexture3D.svg
+++ b/engine/modules/noise/icons/NoiseTexture3D.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13zM3 11h4l1.25-1.25V9H9l1.25-1.25v-2h-2L7 7v.75h-.75v-2h-2L3 7z"/><path fill-opacity=".4" d="M3 7h2l1.25-1.25h-2zm2 2h2V7.75h-.75zm2-2h2l1.25-1.25H8z"/><path fill-opacity=".2" d="M5 7v2l1.25-1.25v-2zm2 2v2l1.25-1.25V9zm2 0V7l1.25-1.25v2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 14a1 1 0 0 0 1 1h9.5a1 1 0 0 0 .707-.293l2.5-2.5A1 1 0 0 0 15 11.5V2a1 1 0 0 0-1-1H4.5a1 1 0 0 0-.707.293l-2.5 2.5A1 1 0 0 0 1 4.5zm1.25-9H11v7H2.25zm10 6.25v-6.5L14 3v6.5zm-1-7.5H3L4.75 2H13zM3 11h4l1.25-1.25V9H9l1.25-1.25v-2h-2L7 7v.75h-.75v-2h-2L3 7z"/><path fill-opacity=".4" d="M3 7h2l1.25-1.25h-2zm2 2h2V7.75h-.75zm2-2h2l1.25-1.25H8z"/><path fill-opacity=".2" d="M5 7v2l1.25-1.25v-2zm2 2v2l1.25-1.25V9zm2 0V7l1.25-1.25v2z"/></svg>
diff --git a/engine/modules/noise/noise.cpp b/engine/modules/noise/noise.cpp
index 9b9fd640..12e9aca3 100644
--- a/engine/modules/noise/noise.cpp
+++ b/engine/modules/noise/noise.cpp
@@ -54,7 +54,7 @@ Vector<Ref<Image>> Noise::_get_seamless_image(int p_width, int p_height, int p_d
 
 Ref<Image> Noise::get_seamless_image(int p_width, int p_height, bool p_invert, bool p_in_3d_space, real_t p_blend_skirt, bool p_normalize) const {
 	Vector<Ref<Image>> images = _get_seamless_image(p_width, p_height, 1, p_invert, p_in_3d_space, p_blend_skirt, p_normalize);
-	if (images.size() == 0) {
+	if (images.is_empty()) {
 		return Ref<Image>();
 	}
 	return images[0];
diff --git a/engine/modules/noise/noise.h b/engine/modules/noise/noise.h
index 6c49c12b..cdac3828 100644
--- a/engine/modules/noise/noise.h
+++ b/engine/modules/noise/noise.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NOISE_H
-#define NOISE_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/variant/typed_array.h"
@@ -298,5 +297,3 @@ public:
 	virtual Ref<Image> get_seamless_image(int p_width, int p_height, bool p_invert = false, bool p_in_3d_space = false, real_t p_blend_skirt = 0.1, bool p_normalize = true) const;
 	virtual TypedArray<Image> get_seamless_image_3d(int p_width, int p_height, int p_depth, bool p_invert = false, real_t p_blend_skirt = 0.1, bool p_normalize = true) const;
 };
-
-#endif // NOISE_H
diff --git a/engine/modules/noise/noise_texture_2d.h b/engine/modules/noise/noise_texture_2d.h
index f53670b6..e0c163f3 100644
--- a/engine/modules/noise/noise_texture_2d.h
+++ b/engine/modules/noise/noise_texture_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NOISE_TEXTURE_2D_H
-#define NOISE_TEXTURE_2D_H
+#pragma once
 
 #include "noise.h"
 
@@ -123,5 +122,3 @@ public:
 	NoiseTexture2D();
 	virtual ~NoiseTexture2D();
 };
-
-#endif // NOISE_TEXTURE_2D_H
diff --git a/engine/modules/noise/noise_texture_3d.h b/engine/modules/noise/noise_texture_3d.h
index d55b78a2..4a0e887b 100644
--- a/engine/modules/noise/noise_texture_3d.h
+++ b/engine/modules/noise/noise_texture_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NOISE_TEXTURE_3D_H
-#define NOISE_TEXTURE_3D_H
+#pragma once
 
 #include "noise.h"
 
@@ -113,5 +112,3 @@ public:
 	NoiseTexture3D();
 	virtual ~NoiseTexture3D();
 };
-
-#endif // NOISE_TEXTURE_3D_H
diff --git a/engine/modules/noise/register_types.h b/engine/modules/noise/register_types.h
index a6086e90..daf54e21 100644
--- a/engine/modules/noise/register_types.h
+++ b/engine/modules/noise/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NOISE_REGISTER_TYPES_H
-#define NOISE_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_noise_module(ModuleInitializationLevel p_level);
 void uninitialize_noise_module(ModuleInitializationLevel p_level);
-
-#endif // NOISE_REGISTER_TYPES_H
diff --git a/engine/modules/noise/tests/test_fastnoise_lite.h b/engine/modules/noise/tests/test_fastnoise_lite.h
index 6e2e263e..8b031690 100644
--- a/engine/modules/noise/tests/test_fastnoise_lite.h
+++ b/engine/modules/noise/tests/test_fastnoise_lite.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_FASTNOISE_LITE_H
-#define TEST_FASTNOISE_LITE_H
+#pragma once
 
 #include "../fastnoise_lite.h"
 
@@ -633,5 +632,3 @@ TEST_CASE("[FastNoiseLite] Generating seamless 2D images (11x11px) and compare t
 }
 
 } //namespace TestFastNoiseLite
-
-#endif // TEST_FASTNOISE_LITE_H
diff --git a/engine/modules/noise/tests/test_noise_texture_2d.h b/engine/modules/noise/tests/test_noise_texture_2d.h
index deb0b1d2..e0908d75 100644
--- a/engine/modules/noise/tests/test_noise_texture_2d.h
+++ b/engine/modules/noise/tests/test_noise_texture_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NOISE_TEXTURE_2D_H
-#define TEST_NOISE_TEXTURE_2D_H
+#pragma once
 
 #include "../noise_texture_2d.h"
 
@@ -266,5 +265,3 @@ TEST_CASE("[NoiseTexture2D][SceneTree] Generating a seamless noise texture") {
 }
 
 } //namespace TestNoiseTexture2D
-
-#endif // TEST_NOISE_TEXTURE_2D_H
diff --git a/engine/modules/noise/tests/test_noise_texture_3d.h b/engine/modules/noise/tests/test_noise_texture_3d.h
index 91ca5639..eb9cc544 100644
--- a/engine/modules/noise/tests/test_noise_texture_3d.h
+++ b/engine/modules/noise/tests/test_noise_texture_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NOISE_TEXTURE_3D_H
-#define TEST_NOISE_TEXTURE_3D_H
+#pragma once
 
 #include "../noise_texture_3d.h"
 
@@ -234,5 +233,3 @@ TEST_CASE("[NoiseTexture3D][SceneTree] Generating a seamless noise texture") {
 }
 
 } //namespace TestNoiseTexture3D
-
-#endif // TEST_NOISE_TEXTURE_3D_H
diff --git a/engine/modules/ogg/SCsub b/engine/modules/ogg/SCsub
index fabd4f93..21298a6a 100644
--- a/engine/modules/ogg/SCsub
+++ b/engine/modules/ogg/SCsub
@@ -18,7 +18,7 @@ if env["builtin_libogg"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_ogg.Prepend(CPPPATH=[thirdparty_dir])
+    env_ogg.Prepend(CPPEXTPATH=[thirdparty_dir])
 
     env_thirdparty = env_ogg.Clone()
     env_thirdparty.disable_warnings()
diff --git a/engine/modules/ogg/ogg_packet_sequence.h b/engine/modules/ogg/ogg_packet_sequence.h
index 922a1656..2a3516e0 100644
--- a/engine/modules/ogg/ogg_packet_sequence.h
+++ b/engine/modules/ogg/ogg_packet_sequence.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OGG_PACKET_SEQUENCE_H
-#define OGG_PACKET_SEQUENCE_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/variant/typed_array.h"
@@ -130,5 +129,3 @@ public:
 	OggPacketSequencePlayback();
 	virtual ~OggPacketSequencePlayback();
 };
-
-#endif // OGG_PACKET_SEQUENCE_H
diff --git a/engine/modules/ogg/register_types.h b/engine/modules/ogg/register_types.h
index a23b86c7..82412477 100644
--- a/engine/modules/ogg/register_types.h
+++ b/engine/modules/ogg/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OGG_REGISTER_TYPES_H
-#define OGG_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_ogg_module(ModuleInitializationLevel p_level);
 void uninitialize_ogg_module(ModuleInitializationLevel p_level);
-
-#endif // OGG_REGISTER_TYPES_H
diff --git a/engine/modules/openxr/SCsub b/engine/modules/openxr/SCsub
index edfe0bbf..b83ad582 100644
--- a/engine/modules/openxr/SCsub
+++ b/engine/modules/openxr/SCsub
@@ -49,7 +49,7 @@ if env["builtin_openxr"]:
     thirdparty_dir = "#thirdparty/openxr"
 
     env_openxr.Prepend(
-        CPPPATH=[
+        CPPEXTPATH=[
             thirdparty_dir,
             thirdparty_dir + "/include",
             thirdparty_dir + "/src",
@@ -65,7 +65,7 @@ if env["builtin_openxr"]:
     if env["disable_exceptions"]:
         env_thirdparty.AppendUnique(CPPDEFINES=["XRLOADER_DISABLE_EXCEPTION_HANDLING", ("JSON_USE_EXCEPTION", 0)])
 
-    env_thirdparty.Append(CPPPATH=[thirdparty_dir + "/src/loader"])
+    env_thirdparty.Append(CPPEXTPATH=[thirdparty_dir + "/src/loader"])
 
     # add in external jsoncpp dependency
     thirdparty_jsoncpp_dir = thirdparty_dir + "/src/external/jsoncpp/src/lib_json/"
diff --git a/engine/modules/openxr/action_map/openxr_action.h b/engine/modules/openxr/action_map/openxr_action.h
index 156a9833..9c3619cd 100644
--- a/engine/modules/openxr/action_map/openxr_action.h
+++ b/engine/modules/openxr/action_map/openxr_action.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ACTION_H
-#define OPENXR_ACTION_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -83,5 +82,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(OpenXRAction::ActionType);
-
-#endif // OPENXR_ACTION_H
diff --git a/engine/modules/openxr/action_map/openxr_action_map.h b/engine/modules/openxr/action_map/openxr_action_map.h
index 7239a853..a2b3451d 100644
--- a/engine/modules/openxr/action_map/openxr_action_map.h
+++ b/engine/modules/openxr/action_map/openxr_action_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ACTION_MAP_H
-#define OPENXR_ACTION_MAP_H
+#pragma once
 
 #include "openxr_action.h"
 #include "openxr_action_set.h"
@@ -79,5 +78,3 @@ public:
 
 	~OpenXRActionMap();
 };
-
-#endif // OPENXR_ACTION_MAP_H
diff --git a/engine/modules/openxr/action_map/openxr_action_set.cpp b/engine/modules/openxr/action_map/openxr_action_set.cpp
index 08e46b65..23470bde 100644
--- a/engine/modules/openxr/action_map/openxr_action_set.cpp
+++ b/engine/modules/openxr/action_map/openxr_action_set.cpp
@@ -84,7 +84,7 @@ int OpenXRActionSet::get_action_count() const {
 
 void OpenXRActionSet::clear_actions() {
 	// Actions held within our action set should be released and destroyed but just in case they are still used some where else
-	if (actions.size() == 0) {
+	if (actions.is_empty()) {
 		return;
 	}
 
diff --git a/engine/modules/openxr/action_map/openxr_action_set.h b/engine/modules/openxr/action_map/openxr_action_set.h
index c63d50bc..9cebabb7 100644
--- a/engine/modules/openxr/action_map/openxr_action_set.h
+++ b/engine/modules/openxr/action_map/openxr_action_set.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ACTION_SET_H
-#define OPENXR_ACTION_SET_H
+#pragma once
 
 #include "openxr_action.h"
 
@@ -71,5 +70,3 @@ public:
 
 	~OpenXRActionSet();
 };
-
-#endif // OPENXR_ACTION_SET_H
diff --git a/engine/modules/openxr/action_map/openxr_binding_modifier.h b/engine/modules/openxr/action_map/openxr_binding_modifier.h
index 51f3b52b..29298c23 100644
--- a/engine/modules/openxr/action_map/openxr_binding_modifier.h
+++ b/engine/modules/openxr/action_map/openxr_binding_modifier.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_BINDING_MODIFIER_H
-#define OPENXR_BINDING_MODIFIER_H
+#pragma once
 
 #include "../action_map/openxr_action.h"
 #include "core/io/resource.h"
@@ -77,5 +76,3 @@ protected:
 public:
 	OpenXRIPBinding *get_ip_binding() const { return ip_binding; }
 };
-
-#endif // OPENXR_BINDING_MODIFIER_H
diff --git a/engine/modules/openxr/action_map/openxr_haptic_feedback.h b/engine/modules/openxr/action_map/openxr_haptic_feedback.h
index d16f1ab1..af5760b4 100644
--- a/engine/modules/openxr/action_map/openxr_haptic_feedback.h
+++ b/engine/modules/openxr/action_map/openxr_haptic_feedback.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_HAPTIC_FEEDBACK_H
-#define OPENXR_HAPTIC_FEEDBACK_H
+#pragma once
 
 #include "core/io/resource.h"
 #include <openxr/openxr.h>
@@ -68,5 +67,3 @@ public:
 
 	OpenXRHapticVibration();
 };
-
-#endif // OPENXR_HAPTIC_FEEDBACK_H
diff --git a/engine/modules/openxr/action_map/openxr_interaction_profile.h b/engine/modules/openxr/action_map/openxr_interaction_profile.h
index 846c9290..53ca0cf2 100644
--- a/engine/modules/openxr/action_map/openxr_interaction_profile.h
+++ b/engine/modules/openxr/action_map/openxr_interaction_profile.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_INTERACTION_PROFILE_H
-#define OPENXR_INTERACTION_PROFILE_H
+#pragma once
 
 #include "openxr_action.h"
 #include "openxr_binding_modifier.h"
@@ -137,5 +136,3 @@ public:
 
 	~OpenXRInteractionProfile();
 };
-
-#endif // OPENXR_INTERACTION_PROFILE_H
diff --git a/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.h b/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.h
index 252e36f0..f7a3d6a8 100644
--- a/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.h
+++ b/engine/modules/openxr/action_map/openxr_interaction_profile_metadata.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_INTERACTION_PROFILE_METADATA_H
-#define OPENXR_INTERACTION_PROFILE_METADATA_H
+#pragma once
 
 ///////////////////////////////////////////////////////////////////////////
 // Stores available interaction profile metadata
@@ -121,5 +120,3 @@ public:
 	void register_io_path(const String &p_interaction_profile, const String &p_display_name, const String &p_toplevel_path, const String &p_openxr_path, const String &p_openxr_extension_name, OpenXRAction::ActionType p_action_type);
 	const IOPath *get_io_path(const String p_interaction_profile, const String p_io_path) const;
 };
-
-#endif // OPENXR_INTERACTION_PROFILE_METADATA_H
diff --git a/engine/modules/openxr/config.py b/engine/modules/openxr/config.py
index ca9e5ff9..a1b44685 100644
--- a/engine/modules/openxr/config.py
+++ b/engine/modules/openxr/config.py
@@ -1,8 +1,8 @@
 def can_build(env, platform):
     if platform in ("linuxbsd", "windows", "android", "macos"):
-        return env["openxr"] and not env["disable_3d"]
+        return not env["disable_xr"]
     else:
-        # not supported on these platforms
+        # Not supported on these platforms.
         return False
 
 
@@ -17,7 +17,10 @@ def get_doc_classes():
         "OpenXRActionSet",
         "OpenXRActionMap",
         "OpenXRAPIExtension",
+        "OpenXRExtensionWrapper",
         "OpenXRExtensionWrapperExtension",
+        "OpenXRFutureResult",
+        "OpenXRFutureExtension",
         "OpenXRInteractionProfile",
         "OpenXRInteractionProfileMetadata",
         "OpenXRIPBinding",
diff --git a/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml b/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml
index 6492bb46..0980a3ca 100644
--- a/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRAPIExtension.xml
@@ -225,18 +225,32 @@
 		</method>
 		<method name="register_composition_layer_provider">
 			<return type="void" />
-			<param index="0" name="extension" type="OpenXRExtensionWrapperExtension" />
+			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
 			<description>
 				Registers the given extension as a composition layer provider.
 			</description>
 		</method>
+		<method name="register_frame_info_extension">
+			<return type="void" />
+			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
+			<description>
+				Registers the given extension as modifying frame info via the [method OpenXRExtensionWrapper._set_frame_wait_info_and_get_next_pointer], [method OpenXRExtensionWrapper._set_view_locate_info_and_get_next_pointer], or [method OpenXRExtensionWrapper._set_frame_end_info_and_get_next_pointer] virtual methods.
+			</description>
+		</method>
 		<method name="register_projection_views_extension">
 			<return type="void" />
-			<param index="0" name="extension" type="OpenXRExtensionWrapperExtension" />
+			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
 			<description>
 				Registers the given extension as a provider of additional data structures to projections views.
 			</description>
 		</method>
+		<method name="set_custom_play_space">
+			<return type="void" />
+			<param index="0" name="space" type="const void*" />
+			<description>
+				Sets the reference space used by OpenXR to the given [url=https://registry.khronos.org/OpenXR/specs/1.0/man/html/XrSpace.html]XrSpace[/url] (cast to a [code]void *[/code]).
+			</description>
+		</method>
 		<method name="set_emulate_environment_blend_mode_alpha_blend">
 			<return type="void" />
 			<param index="0" name="enabled" type="bool" />
@@ -290,14 +304,21 @@
 		</method>
 		<method name="unregister_composition_layer_provider">
 			<return type="void" />
-			<param index="0" name="extension" type="OpenXRExtensionWrapperExtension" />
+			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
 			<description>
 				Unregisters the given extension as a composition layer provider.
 			</description>
 		</method>
+		<method name="unregister_frame_info_extension">
+			<return type="void" />
+			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
+			<description>
+				Unregisters the given extension as modifying frame info.
+			</description>
+		</method>
 		<method name="unregister_projection_views_extension">
 			<return type="void" />
-			<param index="0" name="extension" type="OpenXRExtensionWrapperExtension" />
+			<param index="0" name="extension" type="OpenXRExtensionWrapper" />
 			<description>
 				Unregisters the given extension as a provider of additional data structures to projections views.
 			</description>
diff --git a/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml b/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml
index 8f19c640..87f7828e 100644
--- a/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRAnalogThresholdModifier.xml
@@ -14,13 +14,13 @@
 			Haptic pulse to emit when the user releases the input.
 		</member>
 		<member name="off_threshold" type="float" setter="set_off_threshold" getter="get_off_threshold" default="0.4">
-			When our input value falls below this, our output becomes false.
+			When our input value falls below this, our output becomes [code]false[/code].
 		</member>
 		<member name="on_haptic" type="OpenXRHapticBase" setter="set_on_haptic" getter="get_on_haptic">
 			Haptic pulse to emit when the user presses the input.
 		</member>
 		<member name="on_threshold" type="float" setter="set_on_threshold" getter="get_on_threshold" default="0.6">
-			When our input value is equal or larger than this value, our output becomes true. It stays true until it falls under the [member off_threshold] value.
+			When our input value is equal or larger than this value, our output becomes [code]true[/code]. It stays [code]true[/code] until it falls under the [member off_threshold] value.
 		</member>
 	</members>
 </class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml b/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml
index cfc7cd4d..6d605f50 100644
--- a/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRCompositionLayer.xml
@@ -53,10 +53,109 @@
 			The sort order for this composition layer. Higher numbers will be shown in front of lower numbers.
 			[b]Note:[/b] This will have no effect if a fallback mesh is being used.
 		</member>
+		<member name="swapchain_state_alpha_swizzle" type="int" setter="set_alpha_swizzle" getter="get_alpha_swizzle" enum="OpenXRCompositionLayer.Swizzle" default="3">
+			The swizzle value for the alpha channel of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_blue_swizzle" type="int" setter="set_blue_swizzle" getter="get_blue_swizzle" enum="OpenXRCompositionLayer.Swizzle" default="2">
+			The swizzle value for the blue channel of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_border_color" type="Color" setter="set_border_color" getter="get_border_color" default="Color(0, 0, 0, 0)">
+			The border color of the swapchain state that is used when the wrap mode clamps to the border.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_green_swizzle" type="int" setter="set_green_swizzle" getter="get_green_swizzle" enum="OpenXRCompositionLayer.Swizzle" default="1">
+			The swizzle value for the green channel of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_horizontal_wrap" type="int" setter="set_horizontal_wrap" getter="get_horizontal_wrap" enum="OpenXRCompositionLayer.Wrap" default="0">
+			The horizontal wrap mode of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_mag_filter" type="int" setter="set_mag_filter" getter="get_mag_filter" enum="OpenXRCompositionLayer.Filter" default="1">
+			The magnification filter of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_max_anisotropy" type="float" setter="set_max_anisotropy" getter="get_max_anisotropy" default="1.0">
+			The max anisotropy of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_min_filter" type="int" setter="set_min_filter" getter="get_min_filter" enum="OpenXRCompositionLayer.Filter" default="1">
+			The minification filter of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_mipmap_mode" type="int" setter="set_mipmap_mode" getter="get_mipmap_mode" enum="OpenXRCompositionLayer.MipmapMode" default="2">
+			The mipmap mode of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_red_swizzle" type="int" setter="set_red_swizzle" getter="get_red_swizzle" enum="OpenXRCompositionLayer.Swizzle" default="0">
+			The swizzle value for the red channel of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
+		<member name="swapchain_state_vertical_wrap" type="int" setter="set_vertical_wrap" getter="get_vertical_wrap" enum="OpenXRCompositionLayer.Wrap" default="0">
+			The vertical wrap mode of the swapchain state.
+			[b]Note:[/b] This property only has an effect on devices that support the OpenXR XR_FB_swapchain_update_state OpenGLES/Vulkan extensions.
+		</member>
 		<member name="use_android_surface" type="bool" setter="set_use_android_surface" getter="get_use_android_surface" default="false">
 			If enabled, an Android surface will be created (with the dimensions from [member android_surface_size]) which will provide the 2D content for the composition layer, rather than using [member layer_viewport].
 			See [method get_android_surface] for information about how to get the surface so that your application can draw to it.
 			[b]Note:[/b] This will only work in Android builds.
 		</member>
 	</members>
+	<constants>
+		<constant name="FILTER_NEAREST" value="0" enum="Filter">
+			Perform nearest-neighbor filtering when sampling the texture.
+		</constant>
+		<constant name="FILTER_LINEAR" value="1" enum="Filter">
+			Perform linear filtering when sampling the texture.
+		</constant>
+		<constant name="FILTER_CUBIC" value="2" enum="Filter">
+			Perform cubic filtering when sampling the texture.
+		</constant>
+		<constant name="MIPMAP_MODE_DISABLED" value="0" enum="MipmapMode">
+			Disable mipmapping.
+			[b]Note:[/b] Mipmapping can only be disabled in the compatibility renderer.
+		</constant>
+		<constant name="MIPMAP_MODE_NEAREST" value="1" enum="MipmapMode">
+			Use the mipmap of the nearest resolution.
+		</constant>
+		<constant name="MIPMAP_MODE_LINEAR" value="2" enum="MipmapMode">
+			Use linear interpolation of the two mipmaps of the nearest resolution.
+		</constant>
+		<constant name="WRAP_CLAMP_TO_BORDER" value="0" enum="Wrap">
+			Clamp the texture to its specified border color.
+		</constant>
+		<constant name="WRAP_CLAMP_TO_EDGE" value="1" enum="Wrap">
+			Clamp the texture to its edge color.
+		</constant>
+		<constant name="WRAP_REPEAT" value="2" enum="Wrap">
+			Repeat the texture infinitely.
+		</constant>
+		<constant name="WRAP_MIRRORED_REPEAT" value="3" enum="Wrap">
+			Repeat the texture infinitely, mirroring it on each repeat.
+		</constant>
+		<constant name="WRAP_MIRROR_CLAMP_TO_EDGE" value="4" enum="Wrap">
+			Mirror the texture once and then clamp the texture to its edge color.
+			[b]Note:[/b] This wrap mode is not available in the compatibility renderer.
+		</constant>
+		<constant name="SWIZZLE_RED" value="0" enum="Swizzle">
+			Maps a color channel to the value of the red channel.
+		</constant>
+		<constant name="SWIZZLE_GREEN" value="1" enum="Swizzle">
+			Maps a color channel to the value of the green channel.
+		</constant>
+		<constant name="SWIZZLE_BLUE" value="2" enum="Swizzle">
+			Maps a color channel to the value of the blue channel.
+		</constant>
+		<constant name="SWIZZLE_ALPHA" value="3" enum="Swizzle">
+			Maps a color channel to the value of the alpha channel.
+		</constant>
+		<constant name="SWIZZLE_ZERO" value="4" enum="Swizzle">
+			Maps a color channel to the value of zero.
+		</constant>
+		<constant name="SWIZZLE_ONE" value="5" enum="Swizzle">
+			Maps a color channel to the value of one.
+		</constant>
+	</constants>
 </class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml b/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml
index a65bca79..24714172 100644
--- a/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRDpadBindingModifier.xml
@@ -21,8 +21,8 @@
 			Input path for this dpad binding modifier.
 		</member>
 		<member name="is_sticky" type="bool" setter="set_is_sticky" getter="get_is_sticky" default="false">
-			If [code]false[/code], when the joystick enters a new dpad zone this becomes true.
-			If [code]true[/code], when the joystick remains in active dpad zone, this remains true even if we overlap with another zone.
+			If [code]false[/code], when the joystick enters a new dpad zone this becomes [code]true[/code].
+			If [code]true[/code], when the joystick remains in active dpad zone, this remains [code]true[/code] even if we overlap with another zone.
 		</member>
 		<member name="off_haptic" type="OpenXRHapticBase" setter="set_off_haptic" getter="get_off_haptic">
 			Haptic pulse to emit when the user releases the input.
@@ -31,10 +31,10 @@
 			Haptic pulse to emit when the user presses the input.
 		</member>
 		<member name="threshold" type="float" setter="set_threshold" getter="get_threshold" default="0.6">
-			When our input value is equal or larger than this value, our dpad in that direction becomes true. It stays true until it falls under the [member threshold_released] value.
+			When our input value is equal or larger than this value, our dpad in that direction becomes [code]true[/code]. It stays [code]true[/code] until it falls under the [member threshold_released] value.
 		</member>
 		<member name="threshold_released" type="float" setter="set_threshold_released" getter="get_threshold_released" default="0.4">
-			When our input value falls below this, our output becomes false.
+			When our input value falls below this, our output becomes [code]false[/code].
 		</member>
 		<member name="wedge_angle" type="float" setter="set_wedge_angle" getter="get_wedge_angle" default="1.5708">
 			The angle of each wedge that identifies the 4 directions of the emulated dpad.
diff --git a/engine/modules/openxr/doc_classes/OpenXRExtensionWrapper.xml b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapper.xml
new file mode 100644
index 00000000..b3106c10
--- /dev/null
+++ b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapper.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="OpenXRExtensionWrapper" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+	<brief_description>
+		Allows implementing OpenXR extensions with GDExtension.
+	</brief_description>
+	<description>
+		[OpenXRExtensionWrapper] allows implementing OpenXR extensions with GDExtension. The extension should be registered with [method register_extension_wrapper].
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="_get_composition_layer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="index" type="int" />
+			<description>
+				Returns a pointer to an [code]XrCompositionLayerBaseHeader[/code] struct to provide the given composition layer.
+				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_composition_layer_provider].
+			</description>
+		</method>
+		<method name="_get_composition_layer_count" qualifiers="virtual">
+			<return type="int" />
+			<description>
+				Returns the number of composition layers this extension wrapper provides via [method _get_composition_layer].
+				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_composition_layer_provider].
+			</description>
+		</method>
+		<method name="_get_composition_layer_order" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="index" type="int" />
+			<description>
+				Returns an integer that will be used to sort the given composition layer provided via [method _get_composition_layer]. Lower numbers will move the layer to the front of the list, and higher numbers to the end. The default projection layer has an order of [code]0[/code], so layers provided by this method should probably be above or below (but not exactly) [code]0[/code].
+				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_composition_layer_provider].
+			</description>
+		</method>
+		<method name="_get_requested_extensions" qualifiers="virtual">
+			<return type="Dictionary" />
+			<description>
+				Returns a [Dictionary] of OpenXR extensions related to this extension. The [Dictionary] should contain the name of the extension, mapped to a [code]bool *[/code] cast to an integer:
+				- If the [code]bool *[/code] is a [code]nullptr[/code] this extension is mandatory.
+				- If the [code]bool *[/code] points to a boolean, the boolean will be updated to [code]true[/code] if the extension is enabled.
+			</description>
+		</method>
+		<method name="_get_suggested_tracker_names" qualifiers="virtual">
+			<return type="PackedStringArray" />
+			<description>
+				Returns a [PackedStringArray] of positional tracker names that are used within the extension wrapper.
+			</description>
+		</method>
+		<method name="_get_viewport_composition_layer_extension_properties" qualifiers="virtual">
+			<return type="Dictionary[]" />
+			<description>
+				Gets an array of [Dictionary]s that represent properties, just like [method Object._get_property_list], that will be added to [OpenXRCompositionLayer] nodes.
+			</description>
+		</method>
+		<method name="_get_viewport_composition_layer_extension_property_defaults" qualifiers="virtual">
+			<return type="Dictionary" />
+			<description>
+				Gets a [Dictionary] containing the default values for the properties returned by [method _get_viewport_composition_layer_extension_properties].
+			</description>
+		</method>
+		<method name="_on_before_instance_created" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called before the OpenXR instance is created.
+			</description>
+		</method>
+		<method name="_on_event_polled" qualifiers="virtual">
+			<return type="bool" />
+			<param index="0" name="event" type="const void*" />
+			<description>
+				Called when there is an OpenXR event to process. When implementing, return [code]true[/code] if the event was handled, return [code]false[/code] otherwise.
+			</description>
+		</method>
+		<method name="_on_instance_created" qualifiers="virtual">
+			<return type="void" />
+			<param index="0" name="instance" type="int" />
+			<description>
+				Called right after the OpenXR instance is created.
+			</description>
+		</method>
+		<method name="_on_instance_destroyed" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called right before the OpenXR instance is destroyed.
+			</description>
+		</method>
+		<method name="_on_main_swapchains_created" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called right after the main swapchains are (re)created.
+			</description>
+		</method>
+		<method name="_on_post_draw_viewport" qualifiers="virtual">
+			<return type="void" />
+			<param index="0" name="viewport" type="RID" />
+			<description>
+				Called right after the given viewport is rendered.
+				[b]Note:[/b] The draw commands might only be queued at this point, not executed.
+			</description>
+		</method>
+		<method name="_on_pre_draw_viewport" qualifiers="virtual">
+			<return type="void" />
+			<param index="0" name="viewport" type="RID" />
+			<description>
+				Called right before the given viewport is rendered.
+			</description>
+		</method>
+		<method name="_on_pre_render" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called right before the XR viewports begin their rendering step.
+			</description>
+		</method>
+		<method name="_on_process" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called as part of the OpenXR process handling. This happens right before general and physics processing steps of the main loop. During this step controller data is queried and made available to game logic.
+			</description>
+		</method>
+		<method name="_on_register_metadata" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Allows extensions to register additional controller metadata. This function is called even when the OpenXR API is not constructed as the metadata needs to be available to the editor.
+				Extensions should also provide metadata regardless of whether they are supported on the host system. The controller data is used to setup action maps for users who may have access to the relevant hardware.
+			</description>
+		</method>
+		<method name="_on_session_created" qualifiers="virtual">
+			<return type="void" />
+			<param index="0" name="session" type="int" />
+			<description>
+				Called right after the OpenXR session is created.
+			</description>
+		</method>
+		<method name="_on_session_destroyed" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called right before the OpenXR session is destroyed.
+			</description>
+		</method>
+		<method name="_on_state_exiting" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to exiting.
+			</description>
+		</method>
+		<method name="_on_state_focused" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to focused. This state is the active state when the game runs.
+			</description>
+		</method>
+		<method name="_on_state_idle" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to idle.
+			</description>
+		</method>
+		<method name="_on_state_loss_pending" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to loss pending.
+			</description>
+		</method>
+		<method name="_on_state_ready" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to ready. This means OpenXR is ready to set up the session.
+			</description>
+		</method>
+		<method name="_on_state_stopping" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to stopping.
+			</description>
+		</method>
+		<method name="_on_state_synchronized" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to synchronized. OpenXR also returns to this state when the application loses focus.
+			</description>
+		</method>
+		<method name="_on_state_visible" qualifiers="virtual">
+			<return type="void" />
+			<description>
+				Called when the OpenXR session state is changed to visible. This means OpenXR is now ready to receive frames.
+			</description>
+		</method>
+		<method name="_on_viewport_composition_layer_destroyed" qualifiers="virtual">
+			<return type="void" />
+			<param index="0" name="layer" type="const void*" />
+			<description>
+				Called when a composition layer created via [OpenXRCompositionLayer] is destroyed.
+				[param layer] is a pointer to an [code]XrCompositionLayerBaseHeader[/code] struct.
+			</description>
+		</method>
+		<method name="_set_android_surface_swapchain_create_info_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="property_values" type="Dictionary" />
+			<param index="1" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures to Android surface swapchains created by [OpenXRCompositionLayer].
+				[param property_values] contains the values of the properties returned by [method _get_viewport_composition_layer_extension_properties].
+			</description>
+		</method>
+		<method name="_set_frame_end_info_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures to [code]XrFrameEndInfo[/code].
+				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_frame_info_extension].
+			</description>
+		</method>
+		<method name="_set_frame_wait_info_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures to [code]XrFrameWaitInfo[/code].
+				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_frame_info_extension].
+			</description>
+		</method>
+		<method name="_set_hand_joint_locations_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="hand_index" type="int" />
+			<param index="1" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures when each hand tracker is created.
+			</description>
+		</method>
+		<method name="_set_instance_create_info_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures when the OpenXR instance is created.
+			</description>
+		</method>
+		<method name="_set_projection_views_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="view_index" type="int" />
+			<param index="1" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures to the projection view of the given [param view_index].
+			</description>
+		</method>
+		<method name="_set_reference_space_create_info_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="reference_space_type" type="int" />
+			<param index="1" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures to [code]XrReferenceSpaceCreateInfo[/code].
+			</description>
+		</method>
+		<method name="_set_session_create_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures when the OpenXR session is created.
+			</description>
+		</method>
+		<method name="_set_swapchain_create_info_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures when creating OpenXR swapchains.
+			</description>
+		</method>
+		<method name="_set_system_properties_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures when querying OpenXR system abilities.
+			</description>
+		</method>
+		<method name="_set_view_locate_info_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures to [code]XrViewLocateInfo[/code].
+				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_frame_info_extension].
+			</description>
+		</method>
+		<method name="_set_viewport_composition_layer_and_get_next_pointer" qualifiers="virtual">
+			<return type="int" />
+			<param index="0" name="layer" type="const void*" />
+			<param index="1" name="property_values" type="Dictionary" />
+			<param index="2" name="next_pointer" type="void*" />
+			<description>
+				Adds additional data structures to composition layers created by [OpenXRCompositionLayer].
+				[param property_values] contains the values of the properties returned by [method _get_viewport_composition_layer_extension_properties].
+				[param layer] is a pointer to an [code]XrCompositionLayerBaseHeader[/code] struct.
+			</description>
+		</method>
+		<method name="get_openxr_api">
+			<return type="OpenXRAPIExtension" />
+			<description>
+				Returns the created [OpenXRAPIExtension], which can be used to access the OpenXR API.
+			</description>
+		</method>
+		<method name="register_extension_wrapper">
+			<return type="void" />
+			<description>
+				Registers the extension. This should happen at core module initialization level.
+			</description>
+		</method>
+	</methods>
+</class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml
index cf6cd37c..7887658b 100644
--- a/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRExtensionWrapperExtension.xml
@@ -1,273 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="OpenXRExtensionWrapperExtension" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+<class name="OpenXRExtensionWrapperExtension" inherits="OpenXRExtensionWrapper" deprecated="Use [OpenXRExtensionWrapper] instead." xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
 	<brief_description>
-		Allows clients to implement OpenXR extensions with GDExtension.
+		Allows implementing OpenXR extensions with GDExtension.
 	</brief_description>
 	<description>
-		[OpenXRExtensionWrapperExtension] allows clients to implement OpenXR extensions with GDExtension. The extension should be registered with [method register_extension_wrapper].
+		[OpenXRExtensionWrapperExtension] allows implementing OpenXR extensions with GDExtension. The extension should be registered with [method OpenXRExtensionWrapper.register_extension_wrapper].
 	</description>
 	<tutorials>
 	</tutorials>
-	<methods>
-		<method name="_get_composition_layer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="index" type="int" />
-			<description>
-				Returns a pointer to an [code]XrCompositionLayerBaseHeader[/code] struct to provide the given composition layer.
-				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_composition_layer_provider].
-			</description>
-		</method>
-		<method name="_get_composition_layer_count" qualifiers="virtual">
-			<return type="int" />
-			<description>
-				Returns the number of composition layers this extension wrapper provides via [method _get_composition_layer].
-				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_composition_layer_provider].
-			</description>
-		</method>
-		<method name="_get_composition_layer_order" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="index" type="int" />
-			<description>
-				Returns an integer that will be used to sort the given composition layer provided via [method _get_composition_layer]. Lower numbers will move the layer to the front of the list, and higher numbers to the end. The default projection layer has an order of [code]0[/code], so layers provided by this method should probably be above or below (but not exactly) [code]0[/code].
-				This will only be called if the extension previously registered itself with [method OpenXRAPIExtension.register_composition_layer_provider].
-			</description>
-		</method>
-		<method name="_get_requested_extensions" qualifiers="virtual">
-			<return type="Dictionary" />
-			<description>
-				Returns a [Dictionary] of OpenXR extensions related to this extension. The [Dictionary] should contain the name of the extension, mapped to a [code]bool *[/code] cast to an integer:
-				- If the [code]bool *[/code] is a [code]nullptr[/code] this extension is mandatory.
-				- If the [code]bool *[/code] points to a boolean, the boolean will be updated to [code]true[/code] if the extension is enabled.
-			</description>
-		</method>
-		<method name="_get_suggested_tracker_names" qualifiers="virtual">
-			<return type="PackedStringArray" />
-			<description>
-				Returns a [PackedStringArray] of positional tracker names that are used within the extension wrapper.
-			</description>
-		</method>
-		<method name="_get_viewport_composition_layer_extension_properties" qualifiers="virtual">
-			<return type="Dictionary[]" />
-			<description>
-				Gets an array of [Dictionary]s that represent properties, just like [method Object._get_property_list], that will be added to [OpenXRCompositionLayer] nodes.
-			</description>
-		</method>
-		<method name="_get_viewport_composition_layer_extension_property_defaults" qualifiers="virtual">
-			<return type="Dictionary" />
-			<description>
-				Gets a [Dictionary] containing the default values for the properties returned by [method _get_viewport_composition_layer_extension_properties].
-			</description>
-		</method>
-		<method name="_on_before_instance_created" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called before the OpenXR instance is created.
-			</description>
-		</method>
-		<method name="_on_event_polled" qualifiers="virtual">
-			<return type="bool" />
-			<param index="0" name="event" type="const void*" />
-			<description>
-				Called when there is an OpenXR event to process. When implementing, return [code]true[/code] if the event was handled, return [code]false[/code] otherwise.
-			</description>
-		</method>
-		<method name="_on_instance_created" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="instance" type="int" />
-			<description>
-				Called right after the OpenXR instance is created.
-			</description>
-		</method>
-		<method name="_on_instance_destroyed" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called right before the OpenXR instance is destroyed.
-			</description>
-		</method>
-		<method name="_on_main_swapchains_created" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called right after the main swapchains are (re)created.
-			</description>
-		</method>
-		<method name="_on_post_draw_viewport" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="viewport" type="RID" />
-			<description>
-				Called right after the given viewport is rendered.
-				[b]Note:[/b] The draw commands might only be queued at this point, not executed.
-			</description>
-		</method>
-		<method name="_on_pre_draw_viewport" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="viewport" type="RID" />
-			<description>
-				Called right before the given viewport is rendered.
-			</description>
-		</method>
-		<method name="_on_pre_render" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called right before the XR viewports begin their rendering step.
-			</description>
-		</method>
-		<method name="_on_process" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called as part of the OpenXR process handling. This happens right before general and physics processing steps of the main loop. During this step controller data is queried and made available to game logic.
-			</description>
-		</method>
-		<method name="_on_register_metadata" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Allows extensions to register additional controller metadata. This function is called even when the OpenXR API is not constructed as the metadata needs to be available to the editor.
-				Extensions should also provide metadata regardless of whether they are supported on the host system. The controller data is used to setup action maps for users who may have access to the relevant hardware.
-			</description>
-		</method>
-		<method name="_on_session_created" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="session" type="int" />
-			<description>
-				Called right after the OpenXR session is created.
-			</description>
-		</method>
-		<method name="_on_session_destroyed" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called right before the OpenXR session is destroyed.
-			</description>
-		</method>
-		<method name="_on_state_exiting" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to exiting.
-			</description>
-		</method>
-		<method name="_on_state_focused" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to focused. This state is the active state when the game runs.
-			</description>
-		</method>
-		<method name="_on_state_idle" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to idle.
-			</description>
-		</method>
-		<method name="_on_state_loss_pending" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to loss pending.
-			</description>
-		</method>
-		<method name="_on_state_ready" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to ready. This means OpenXR is ready to set up the session.
-			</description>
-		</method>
-		<method name="_on_state_stopping" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to stopping.
-			</description>
-		</method>
-		<method name="_on_state_synchronized" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to synchronized. OpenXR also returns to this state when the application loses focus.
-			</description>
-		</method>
-		<method name="_on_state_visible" qualifiers="virtual">
-			<return type="void" />
-			<description>
-				Called when the OpenXR session state is changed to visible. This means OpenXR is now ready to receive frames.
-			</description>
-		</method>
-		<method name="_on_viewport_composition_layer_destroyed" qualifiers="virtual">
-			<return type="void" />
-			<param index="0" name="layer" type="const void*" />
-			<description>
-				Called when a composition layer created via [OpenXRCompositionLayer] is destroyed.
-				[param layer] is a pointer to an [code]XrCompositionLayerBaseHeader[/code] struct.
-			</description>
-		</method>
-		<method name="_set_android_surface_swapchain_create_info_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="property_values" type="Dictionary" />
-			<param index="1" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures to Android surface swapchains created by [OpenXRCompositionLayer].
-				[param property_values] contains the values of the properties returned by [method _get_viewport_composition_layer_extension_properties].
-			</description>
-		</method>
-		<method name="_set_hand_joint_locations_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="hand_index" type="int" />
-			<param index="1" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures when each hand tracker is created.
-			</description>
-		</method>
-		<method name="_set_instance_create_info_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures when the OpenXR instance is created.
-			</description>
-		</method>
-		<method name="_set_projection_views_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="view_index" type="int" />
-			<param index="1" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures to the projection view of the given [param view_index].
-			</description>
-		</method>
-		<method name="_set_session_create_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures when the OpenXR session is created.
-			</description>
-		</method>
-		<method name="_set_swapchain_create_info_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures when creating OpenXR swapchains.
-			</description>
-		</method>
-		<method name="_set_system_properties_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures when querying OpenXR system abilities.
-			</description>
-		</method>
-		<method name="_set_viewport_composition_layer_and_get_next_pointer" qualifiers="virtual">
-			<return type="int" />
-			<param index="0" name="layer" type="const void*" />
-			<param index="1" name="property_values" type="Dictionary" />
-			<param index="2" name="next_pointer" type="void*" />
-			<description>
-				Adds additional data structures to composition layers created by [OpenXRCompositionLayer].
-				[param property_values] contains the values of the properties returned by [method _get_viewport_composition_layer_extension_properties].
-				[param layer] is a pointer to an [code]XrCompositionLayerBaseHeader[/code] struct.
-			</description>
-		</method>
-		<method name="get_openxr_api">
-			<return type="OpenXRAPIExtension" />
-			<description>
-				Returns the created [OpenXRAPIExtension], which can be used to access the OpenXR API.
-			</description>
-		</method>
-		<method name="register_extension_wrapper">
-			<return type="void" />
-			<description>
-				Registers the extension. This should happen at core module initialization level.
-			</description>
-		</method>
-	</methods>
 </class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRFutureExtension.xml b/engine/modules/openxr/doc_classes/OpenXRFutureExtension.xml
new file mode 100644
index 00000000..d3237ac1
--- /dev/null
+++ b/engine/modules/openxr/doc_classes/OpenXRFutureExtension.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="OpenXRFutureExtension" inherits="OpenXRExtensionWrapper" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+	<brief_description>
+		The OpenXR Future extension allows for asynchronous APIs to be used.
+	</brief_description>
+	<description>
+		This is a support extension in OpenXR that allows other OpenXR extensions to start asynchronous functions and get a callback after this function finishes. It is not intended for consumption within GDScript but can be accessed from GDExtension.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="cancel_future">
+			<return type="void" />
+			<param index="0" name="future" type="int" />
+			<description>
+				Cancels an in-progress future. [param future] must be an [code]XrFutureEXT[/code] value previously returned by an API that started an asynchronous function.
+			</description>
+		</method>
+		<method name="is_active" qualifiers="const">
+			<return type="bool" />
+			<description>
+				Returns [code]true[/code] if futures are available in the OpenXR runtime used. This function will only return a usable result after OpenXR has been initialized.
+			</description>
+		</method>
+		<method name="register_future">
+			<return type="OpenXRFutureResult" />
+			<param index="0" name="future" type="int" />
+			<param index="1" name="on_success" type="Callable" default="Callable()" />
+			<description>
+				Register an OpenXR Future object so we monitor for completion. [param future] must be an [code]XrFutureEXT[/code] value previously returned by an API that started an asynchronous function.
+				You can optionally specify [param on_success], it will be invoked on successful completion of the future.
+				Or you can use the returned [OpenXRFutureResult] object to [code]await[/code] its [signal OpenXRFutureResult.completed] signal.
+				[codeblock]
+				var future_result = OpenXRFutureExtension.register_future(future)
+				await future_result.completed
+				if future_result.get_status() == OpenXRFutureResult.RESULT_FINISHED:
+				    # Handle your success
+				    pass
+				[/codeblock]
+			</description>
+		</method>
+	</methods>
+</class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRFutureResult.xml b/engine/modules/openxr/doc_classes/OpenXRFutureResult.xml
new file mode 100644
index 00000000..b13f6dac
--- /dev/null
+++ b/engine/modules/openxr/doc_classes/OpenXRFutureResult.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="OpenXRFutureResult" inherits="RefCounted" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../doc/class.xsd">
+	<brief_description>
+		Result object tracking the asynchronous result of an OpenXR Future object.
+	</brief_description>
+	<description>
+		Result object tracking the asynchronous result of an OpenXR Future object, you can use this object to track the result status.
+	</description>
+	<tutorials>
+	</tutorials>
+	<methods>
+		<method name="cancel_future">
+			<return type="void" />
+			<description>
+				Cancel this future, this will interrupt and stop the asynchronous function.
+			</description>
+		</method>
+		<method name="get_future" qualifiers="const">
+			<return type="int" />
+			<description>
+				Return the [code]XrFutureEXT[/code] value this result relates to.
+			</description>
+		</method>
+		<method name="get_status" qualifiers="const">
+			<return type="int" enum="OpenXRFutureResult.ResultStatus" />
+			<description>
+				Returns the status of this result.
+			</description>
+		</method>
+	</methods>
+	<signals>
+		<signal name="completed">
+			<param index="0" name="result" type="OpenXRFutureResult" />
+			<description>
+				Emitted when the asynchronous function is finished or has been cancelled.
+			</description>
+		</signal>
+	</signals>
+	<constants>
+		<constant name="RESULT_RUNNING" value="0" enum="ResultStatus">
+			The asynchronous function is running.
+		</constant>
+		<constant name="RESULT_FINISHED" value="1" enum="ResultStatus">
+			The asynchronous function has finished.
+		</constant>
+		<constant name="RESULT_CANCELLED" value="2" enum="ResultStatus">
+			The asynchronous function has been cancelled.
+		</constant>
+	</constants>
+</class>
diff --git a/engine/modules/openxr/doc_classes/OpenXRInterface.xml b/engine/modules/openxr/doc_classes/OpenXRInterface.xml
index ed5810da..3def8b72 100644
--- a/engine/modules/openxr/doc_classes/OpenXRInterface.xml
+++ b/engine/modules/openxr/doc_classes/OpenXRInterface.xml
@@ -128,6 +128,20 @@
 				Sets the given action set as active or inactive.
 			</description>
 		</method>
+		<method name="set_cpu_level">
+			<return type="void" />
+			<param index="0" name="level" type="int" enum="OpenXRInterface.PerfSettingsLevel" />
+			<description>
+				Sets the CPU performance level of the OpenXR device.
+			</description>
+		</method>
+		<method name="set_gpu_level">
+			<return type="void" />
+			<param index="0" name="level" type="int" enum="OpenXRInterface.PerfSettingsLevel" />
+			<description>
+				Sets the GPU performance level of the OpenXR device.
+			</description>
+		</method>
 		<method name="set_motion_range">
 			<return type="void" />
 			<param index="0" name="hand" type="int" enum="OpenXRInterface.Hand" />
@@ -162,6 +176,22 @@
 		</member>
 	</members>
 	<signals>
+		<signal name="cpu_level_changed">
+			<param index="0" name="sub_domain" type="int" />
+			<param index="1" name="from_level" type="int" />
+			<param index="2" name="to_level" type="int" />
+			<description>
+				Informs the device CPU performance level has changed in the specified subdomain.
+			</description>
+		</signal>
+		<signal name="gpu_level_changed">
+			<param index="0" name="sub_domain" type="int" />
+			<param index="1" name="from_level" type="int" />
+			<param index="2" name="to_level" type="int" />
+			<description>
+				Informs the device GPU performance level has changed in the specified subdomain.
+			</description>
+		</signal>
 		<signal name="instance_exiting">
 			<description>
 				Informs our OpenXR instance is exiting.
@@ -234,7 +264,7 @@
 			The source of hand tracking is a controller, bone positions are inferred from controller inputs.
 		</constant>
 		<constant name="HAND_TRACKED_SOURCE_MAX" value="3" enum="HandTrackedSource">
-			Maximum value for the hand tracked source enum.
+			Represents the size of the [enum HandTrackedSource] enum.
 		</constant>
 		<constant name="HAND_JOINT_PALM" value="0" enum="HandJoints">
 			Palm joint.
@@ -255,67 +285,97 @@
 			Thumb tip joint.
 		</constant>
 		<constant name="HAND_JOINT_INDEX_METACARPAL" value="6" enum="HandJoints">
-			Index metacarpal joint.
+			Index finger metacarpal joint.
 		</constant>
 		<constant name="HAND_JOINT_INDEX_PROXIMAL" value="7" enum="HandJoints">
-			Index proximal joint.
+			Index finger phalanx proximal joint.
 		</constant>
 		<constant name="HAND_JOINT_INDEX_INTERMEDIATE" value="8" enum="HandJoints">
-			Index intermediate joint.
+			Index finger phalanx intermediate joint.
 		</constant>
 		<constant name="HAND_JOINT_INDEX_DISTAL" value="9" enum="HandJoints">
-			Index distal joint.
+			Index finger phalanx distal joint.
 		</constant>
 		<constant name="HAND_JOINT_INDEX_TIP" value="10" enum="HandJoints">
-			Index tip joint.
+			Index finger tip joint.
 		</constant>
 		<constant name="HAND_JOINT_MIDDLE_METACARPAL" value="11" enum="HandJoints">
-			Middle metacarpal joint.
+			Middle finger metacarpal joint.
 		</constant>
 		<constant name="HAND_JOINT_MIDDLE_PROXIMAL" value="12" enum="HandJoints">
-			Middle proximal joint.
+			Middle finger phalanx proximal joint.
 		</constant>
 		<constant name="HAND_JOINT_MIDDLE_INTERMEDIATE" value="13" enum="HandJoints">
-			Middle intermediate joint.
+			Middle finger phalanx intermediate joint.
 		</constant>
 		<constant name="HAND_JOINT_MIDDLE_DISTAL" value="14" enum="HandJoints">
-			Middle distal joint.
+			Middle finger phalanx distal joint.
 		</constant>
 		<constant name="HAND_JOINT_MIDDLE_TIP" value="15" enum="HandJoints">
-			Middle tip joint.
+			Middle finger tip joint.
 		</constant>
 		<constant name="HAND_JOINT_RING_METACARPAL" value="16" enum="HandJoints">
-			Ring metacarpal joint.
+			Ring finger metacarpal joint.
 		</constant>
 		<constant name="HAND_JOINT_RING_PROXIMAL" value="17" enum="HandJoints">
-			Ring proximal joint.
+			Ring finger phalanx proximal joint.
 		</constant>
 		<constant name="HAND_JOINT_RING_INTERMEDIATE" value="18" enum="HandJoints">
-			Ring intermediate joint.
+			Ring finger phalanx intermediate joint.
 		</constant>
 		<constant name="HAND_JOINT_RING_DISTAL" value="19" enum="HandJoints">
-			Ring distal joint.
+			Ring finger phalanx distal joint.
 		</constant>
 		<constant name="HAND_JOINT_RING_TIP" value="20" enum="HandJoints">
-			Ring tip joint.
+			Ring finger tip joint.
 		</constant>
 		<constant name="HAND_JOINT_LITTLE_METACARPAL" value="21" enum="HandJoints">
-			Little metacarpal joint.
+			Pinky finger metacarpal joint.
 		</constant>
 		<constant name="HAND_JOINT_LITTLE_PROXIMAL" value="22" enum="HandJoints">
-			Little proximal joint.
+			Pinky finger phalanx proximal joint.
 		</constant>
 		<constant name="HAND_JOINT_LITTLE_INTERMEDIATE" value="23" enum="HandJoints">
-			Little intermediate joint.
+			Pinky finger phalanx intermediate joint.
 		</constant>
 		<constant name="HAND_JOINT_LITTLE_DISTAL" value="24" enum="HandJoints">
-			Little distal joint.
+			Pinky finger phalanx distal joint.
 		</constant>
 		<constant name="HAND_JOINT_LITTLE_TIP" value="25" enum="HandJoints">
-			Little tip joint.
+			Pinky finger tip joint.
 		</constant>
 		<constant name="HAND_JOINT_MAX" value="26" enum="HandJoints">
-			Maximum value for the hand joint enum.
+			Represents the size of the [enum HandJoints] enum.
+		</constant>
+		<constant name="PERF_SETTINGS_LEVEL_POWER_SAVINGS" value="0" enum="PerfSettingsLevel">
+			The application has entered a non-XR section (head-locked / static screen), during which power savings are to be prioritized.
+		</constant>
+		<constant name="PERF_SETTINGS_LEVEL_SUSTAINED_LOW" value="1" enum="PerfSettingsLevel">
+			The application has entered a low and stable complexity section, during which reducing power is more important than occasional late rendering frames.
+		</constant>
+		<constant name="PERF_SETTINGS_LEVEL_SUSTAINED_HIGH" value="2" enum="PerfSettingsLevel">
+			The application has entered a high or dynamic complexity section, during which the XR Runtime strives for consistent XR compositing and frame rendering within a thermally sustainable range.
+		</constant>
+		<constant name="PERF_SETTINGS_LEVEL_BOOST" value="3" enum="PerfSettingsLevel">
+			The application has entered a section with very high complexity, during which the XR Runtime is allowed to step up beyond the thermally sustainable range.
+		</constant>
+		<constant name="PERF_SETTINGS_SUB_DOMAIN_COMPOSITING" value="0" enum="PerfSettingsSubDomain">
+			The compositing performance within the runtime has reached a new level.
+		</constant>
+		<constant name="PERF_SETTINGS_SUB_DOMAIN_RENDERING" value="1" enum="PerfSettingsSubDomain">
+			The application rendering performance has reached a new level.
+		</constant>
+		<constant name="PERF_SETTINGS_SUB_DOMAIN_THERMAL" value="2" enum="PerfSettingsSubDomain">
+			The temperature of the device has reached a new level.
+		</constant>
+		<constant name="PERF_SETTINGS_NOTIF_LEVEL_NORMAL" value="0" enum="PerfSettingsNotificationLevel">
+			The sub-domain has reached a level where no further actions other than currently applied are necessary.
+		</constant>
+		<constant name="PERF_SETTINGS_NOTIF_LEVEL_WARNING" value="1" enum="PerfSettingsNotificationLevel">
+			The sub-domain has reached an early warning level where the application should start proactive mitigation actions.
+		</constant>
+		<constant name="PERF_SETTINGS_NOTIF_LEVEL_IMPAIRED" value="2" enum="PerfSettingsNotificationLevel">
+			The sub-domain has reached a critical level where the application should start drastic mitigation actions.
 		</constant>
 		<constant name="HAND_JOINT_NONE" value="0" enum="HandJointFlags" is_bitfield="true">
 			No flags are set.
diff --git a/engine/modules/openxr/editor/openxr_action_editor.cpp b/engine/modules/openxr/editor/openxr_action_editor.cpp
index dd5f6378..b4bb6d2f 100644
--- a/engine/modules/openxr/editor/openxr_action_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_action_editor.cpp
@@ -31,6 +31,7 @@
 #include "openxr_action_editor.h"
 
 #include "editor/editor_string_names.h"
+#include "editor/themes/editor_scale.h"
 
 void OpenXRActionEditor::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_do_set_name", "name"), &OpenXRActionEditor::_do_set_name);
@@ -133,25 +134,31 @@ OpenXRActionEditor::OpenXRActionEditor(Ref<OpenXRAction> p_action) {
 
 	action_name = memnew(LineEdit);
 	action_name->set_text(action->get_name());
-	action_name->set_custom_minimum_size(Size2(150.0, 0.0));
+	action_name->set_tooltip_text(TTR("Internal name of the action. Some XR runtimes don't allow spaces or special characters."));
+	action_name->set_custom_minimum_size(Size2(150.0 * EDSCALE, 0.0));
 	action_name->connect(SceneStringName(text_changed), callable_mp(this, &OpenXRActionEditor::_on_action_name_changed));
+	action_name->set_accessibility_name(TTRC("Action Name"));
 	add_child(action_name);
 
 	action_localized_name = memnew(LineEdit);
 	action_localized_name->set_text(action->get_localized_name());
-	action_localized_name->set_custom_minimum_size(Size2(150.0, 0.0));
+	action_localized_name->set_tooltip_text(TTR("Human-readable name of the action. This can be displayed to end users."));
+	action_localized_name->set_custom_minimum_size(Size2(150.0 * EDSCALE, 0.0));
 	action_localized_name->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	action_localized_name->connect(SceneStringName(text_changed), callable_mp(this, &OpenXRActionEditor::_on_action_localized_name_changed));
+	action_localized_name->set_accessibility_name(TTRC("Action Localized Name"));
 	add_child(action_localized_name);
 
 	action_type_button = memnew(OptionButton);
+	action_type_button->set_tooltip_text(TTR("Type of the action"));
 	action_type_button->add_item("Bool", OpenXRAction::OPENXR_ACTION_BOOL);
 	action_type_button->add_item("Float", OpenXRAction::OPENXR_ACTION_FLOAT);
 	action_type_button->add_item("Vector2", OpenXRAction::OPENXR_ACTION_VECTOR2);
 	action_type_button->add_item("Pose", OpenXRAction::OPENXR_ACTION_POSE);
 	action_type_button->add_item("Haptic", OpenXRAction::OPENXR_ACTION_HAPTIC);
+	action_type_button->set_accessibility_name(TTRC("Action Type"));
 	action_type_button->select(int(action->get_action_type()));
-	action_type_button->set_custom_minimum_size(Size2(100.0, 0.0));
+	action_type_button->set_custom_minimum_size(Size2(100.0 * EDSCALE, 0.0));
 	action_type_button->connect(SceneStringName(item_selected), callable_mp(this, &OpenXRActionEditor::_on_item_selected));
 	add_child(action_type_button);
 
@@ -159,6 +166,7 @@ OpenXRActionEditor::OpenXRActionEditor(Ref<OpenXRAction> p_action) {
 
 	rem_action = memnew(Button);
 	rem_action->set_tooltip_text(TTR("Remove action"));
+	rem_action->set_accessibility_name(TTRC("Remove action"));
 	rem_action->connect(SceneStringName(pressed), callable_mp(this, &OpenXRActionEditor::_on_remove_action));
 	rem_action->set_flat(true);
 	add_child(rem_action);
diff --git a/engine/modules/openxr/editor/openxr_action_editor.h b/engine/modules/openxr/editor/openxr_action_editor.h
index b672fe73..e432f993 100644
--- a/engine/modules/openxr/editor/openxr_action_editor.h
+++ b/engine/modules/openxr/editor/openxr_action_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ACTION_EDITOR_H
-#define OPENXR_ACTION_EDITOR_H
+#pragma once
 
 #include "../action_map/openxr_action.h"
 
@@ -71,5 +70,3 @@ public:
 	Ref<OpenXRAction> get_action() { return action; }
 	OpenXRActionEditor(Ref<OpenXRAction> p_action);
 };
-
-#endif // OPENXR_ACTION_EDITOR_H
diff --git a/engine/modules/openxr/editor/openxr_action_map_editor.cpp b/engine/modules/openxr/editor/openxr_action_map_editor.cpp
index 6b33966b..8c29e851 100644
--- a/engine/modules/openxr/editor/openxr_action_map_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_action_map_editor.cpp
@@ -34,6 +34,7 @@
 #include "editor/editor_node.h"
 #include "editor/gui/editor_bottom_panel.h"
 #include "editor/gui/editor_file_dialog.h"
+#include "editor/themes/editor_scale.h"
 
 HashMap<String, String> OpenXRActionMapEditor::interaction_profile_editors;
 HashMap<String, String> OpenXRActionMapEditor::binding_modifier_editors;
@@ -431,7 +432,7 @@ String OpenXRActionMapEditor::get_binding_modifier_editor_class(const String &p_
 
 OpenXRActionMapEditor::OpenXRActionMapEditor() {
 	undo_redo = EditorUndoRedoManager::get_singleton();
-	set_custom_minimum_size(Size2(0.0, 300.0));
+	set_custom_minimum_size(Size2(0.0, 300.0 * EDSCALE));
 
 	top_hb = memnew(HBoxContainer);
 	add_child(top_hb);
@@ -496,6 +497,3 @@ OpenXRActionMapEditor::OpenXRActionMapEditor() {
 	// So load our action map and if it doesn't exist, create it right away.
 	_load_action_map(GLOBAL_GET("xr/openxr/default_action_map"), true);
 }
-
-OpenXRActionMapEditor::~OpenXRActionMapEditor() {
-}
diff --git a/engine/modules/openxr/editor/openxr_action_map_editor.h b/engine/modules/openxr/editor/openxr_action_map_editor.h
index 088bf0c6..e691b35c 100644
--- a/engine/modules/openxr/editor/openxr_action_map_editor.h
+++ b/engine/modules/openxr/editor/openxr_action_map_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ACTION_MAP_EDITOR_H
-#define OPENXR_ACTION_MAP_EDITOR_H
+#pragma once
 
 #include "../action_map/openxr_action_map.h"
 #include "openxr_action_set_editor.h"
@@ -111,7 +110,4 @@ public:
 	void open_action_map(String p_path);
 
 	OpenXRActionMapEditor();
-	~OpenXRActionMapEditor();
 };
-
-#endif // OPENXR_ACTION_MAP_EDITOR_H
diff --git a/engine/modules/openxr/editor/openxr_action_set_editor.cpp b/engine/modules/openxr/editor/openxr_action_set_editor.cpp
index e5e034ef..06c5d48d 100644
--- a/engine/modules/openxr/editor/openxr_action_set_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_action_set_editor.cpp
@@ -31,6 +31,7 @@
 #include "openxr_action_set_editor.h"
 
 #include "editor/editor_string_names.h"
+#include "editor/themes/editor_scale.h"
 #include "openxr_action_editor.h"
 
 void OpenXRActionSetEditor::_bind_methods() {
@@ -230,6 +231,7 @@ OpenXRActionSetEditor::OpenXRActionSetEditor(Ref<OpenXRActionMap> p_action_map,
 	fold_btn = memnew(Button);
 	fold_btn->set_v_size_flags(Control::SIZE_SHRINK_BEGIN);
 	fold_btn->connect(SceneStringName(pressed), callable_mp(this, &OpenXRActionSetEditor::_on_toggle_expand));
+	fold_btn->set_accessibility_name(TTRC("Fold"));
 	fold_btn->set_flat(true);
 	panel_hb->add_child(fold_btn);
 
@@ -243,32 +245,40 @@ OpenXRActionSetEditor::OpenXRActionSetEditor(Ref<OpenXRActionMap> p_action_map,
 
 	action_set_name = memnew(LineEdit);
 	action_set_name->set_text(action_set->get_name());
-	action_set_name->set_custom_minimum_size(Size2(150.0, 0.0));
+	action_set_name->set_tooltip_text(TTR("Internal name of the action. Some XR runtimes don't allow spaces or special characters."));
+	action_set_name->set_custom_minimum_size(Size2(150.0 * EDSCALE, 0.0));
 	action_set_name->connect(SceneStringName(text_changed), callable_mp(this, &OpenXRActionSetEditor::_on_action_set_name_changed));
+	action_set_name->set_accessibility_name(TTRC("Action Set Name"));
 	action_set_hb->add_child(action_set_name);
 
 	action_set_localized_name = memnew(LineEdit);
 	action_set_localized_name->set_text(action_set->get_localized_name());
-	action_set_localized_name->set_custom_minimum_size(Size2(150.0, 0.0));
+	action_set_localized_name->set_tooltip_text(TTR("Human-readable name of the action set. This can be displayed to end users."));
+	action_set_localized_name->set_custom_minimum_size(Size2(150.0 * EDSCALE, 0.0));
 	action_set_localized_name->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	action_set_localized_name->connect(SceneStringName(text_changed), callable_mp(this, &OpenXRActionSetEditor::_on_action_set_localized_name_changed));
+	action_set_localized_name->set_accessibility_name(TTRC("Action Set Localized Name"));
 	action_set_hb->add_child(action_set_localized_name);
 
 	action_set_priority = memnew(TextEdit);
 	action_set_priority->set_text(itos(action_set->get_priority()));
-	action_set_priority->set_custom_minimum_size(Size2(50.0, 0.0));
+	action_set_priority->set_tooltip_text(TTR("Priority of the action set. If multiple action sets bind to the same input, the action set with the highest priority will be updated."));
+	action_set_priority->set_custom_minimum_size(Size2(50.0 * EDSCALE, 0.0));
 	action_set_priority->connect(SceneStringName(text_changed), callable_mp(this, &OpenXRActionSetEditor::_on_action_set_priority_changed));
+	action_set_priority->set_accessibility_name(TTRC("Action Set Priority"));
 	action_set_hb->add_child(action_set_priority);
 
 	add_action = memnew(Button);
 	add_action->set_tooltip_text(TTR("Add action."));
 	add_action->connect(SceneStringName(pressed), callable_mp(this, &OpenXRActionSetEditor::_on_add_action));
+	add_action->set_accessibility_name(TTRC("Add"));
 	add_action->set_flat(true);
 	action_set_hb->add_child(add_action);
 
 	rem_action_set = memnew(Button);
 	rem_action_set->set_tooltip_text(TTR("Remove action set."));
 	rem_action_set->connect(SceneStringName(pressed), callable_mp(this, &OpenXRActionSetEditor::_on_remove_action_set));
+	rem_action_set->set_accessibility_name(TTRC("Remove"));
 	rem_action_set->set_flat(true);
 	action_set_hb->add_child(rem_action_set);
 
diff --git a/engine/modules/openxr/editor/openxr_action_set_editor.h b/engine/modules/openxr/editor/openxr_action_set_editor.h
index 21437aa6..fc1beb94 100644
--- a/engine/modules/openxr/editor/openxr_action_set_editor.h
+++ b/engine/modules/openxr/editor/openxr_action_set_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ACTION_SET_EDITOR_H
-#define OPENXR_ACTION_SET_EDITOR_H
+#pragma once
 
 #include "../action_map/openxr_action_map.h"
 #include "../action_map/openxr_action_set.h"
@@ -94,5 +93,3 @@ public:
 
 	OpenXRActionSetEditor(Ref<OpenXRActionMap> p_action_map, Ref<OpenXRActionSet> p_action_set);
 };
-
-#endif // OPENXR_ACTION_SET_EDITOR_H
diff --git a/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp b/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp
index b8770852..172dc686 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_binding_modifier_editor.cpp
@@ -261,8 +261,9 @@ OpenXRBindingModifierEditor::OpenXRBindingModifierEditor() {
 	header_hb->add_child(binding_modifier_title);
 
 	rem_binding_modifier_btn = memnew(Button);
-	rem_binding_modifier_btn->set_tooltip_text(TTR("Remove binding modifier."));
+	rem_binding_modifier_btn->set_tooltip_text(TTR("Remove this binding modifier."));
 	rem_binding_modifier_btn->connect(SceneStringName(pressed), callable_mp(this, &OpenXRBindingModifierEditor::_on_remove_binding_modifier));
+	rem_binding_modifier_btn->set_accessibility_name(TTRC("Remove"));
 	rem_binding_modifier_btn->set_flat(true);
 	header_hb->add_child(rem_binding_modifier_btn);
 
diff --git a/engine/modules/openxr/editor/openxr_binding_modifier_editor.h b/engine/modules/openxr/editor/openxr_binding_modifier_editor.h
index 53922996..cf1f586c 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifier_editor.h
+++ b/engine/modules/openxr/editor/openxr_binding_modifier_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_BINDING_MODIFIER_EDITOR_H
-#define OPENXR_BINDING_MODIFIER_EDITOR_H
+#pragma once
 
 #include "../action_map/openxr_action_map.h"
 #include "../action_map/openxr_action_set.h"
@@ -109,5 +108,3 @@ public:
 
 	OpenXRBindingModifierEditor();
 };
-
-#endif // OPENXR_BINDING_MODIFIER_EDITOR_H
diff --git a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
index de6411e3..b8fc5029 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
+++ b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.cpp
@@ -32,6 +32,8 @@
 #include "../action_map/openxr_interaction_profile_metadata.h"
 #include "openxr_action_map_editor.h"
 
+#include "editor/themes/editor_scale.h"
+
 void OpenXRBindingModifiersDialog::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_do_add_binding_modifier_editor", "binding_modifier_editor"), &OpenXRBindingModifiersDialog::_do_add_binding_modifier_editor);
 	ClassDB::bind_method(D_METHOD("_do_remove_binding_modifier_editor", "binding_modifier_editor"), &OpenXRBindingModifiersDialog::_do_remove_binding_modifier_editor);
@@ -191,7 +193,7 @@ OpenXRBindingModifiersDialog::OpenXRBindingModifiersDialog() {
 	set_transient(true);
 
 	binding_modifier_sc = memnew(ScrollContainer);
-	binding_modifier_sc->set_custom_minimum_size(Size2(350.0, 0.0));
+	binding_modifier_sc->set_custom_minimum_size(Size2(350.0 * EDSCALE, 0.0));
 	binding_modifier_sc->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	binding_modifier_sc->set_v_size_flags(Control::SIZE_EXPAND_FILL);
 	binding_modifier_sc->set_horizontal_scroll_mode(ScrollContainer::SCROLL_MODE_DISABLED);
diff --git a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h
index c60a3760..12878119 100644
--- a/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h
+++ b/engine/modules/openxr/editor/openxr_binding_modifiers_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_BINDING_MODIFIERS_DIALOG_H
-#define OPENXR_BINDING_MODIFIERS_DIALOG_H
+#pragma once
 
 #include "../action_map/openxr_action_map.h"
 #include "../action_map/openxr_interaction_profile.h"
@@ -77,5 +76,3 @@ public:
 
 	void setup(Ref<OpenXRActionMap> p_action_map, Ref<OpenXRInteractionProfile> p_interaction_profile, Ref<OpenXRIPBinding> p_ip_binding = Ref<OpenXRIPBinding>());
 };
-
-#endif // OPENXR_BINDING_MODIFIERS_DIALOG_H
diff --git a/engine/modules/openxr/editor/openxr_editor_plugin.cpp b/engine/modules/openxr/editor/openxr_editor_plugin.cpp
index aac8fd7b..472d9345 100644
--- a/engine/modules/openxr/editor/openxr_editor_plugin.cpp
+++ b/engine/modules/openxr/editor/openxr_editor_plugin.cpp
@@ -64,6 +64,3 @@ OpenXREditorPlugin::OpenXREditorPlugin() {
 	add_control_to_container(CONTAINER_TOOLBAR, select_runtime);
 #endif
 }
-
-OpenXREditorPlugin::~OpenXREditorPlugin() {
-}
diff --git a/engine/modules/openxr/editor/openxr_editor_plugin.h b/engine/modules/openxr/editor/openxr_editor_plugin.h
index 58debb3f..119f72d1 100644
--- a/engine/modules/openxr/editor/openxr_editor_plugin.h
+++ b/engine/modules/openxr/editor/openxr_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_EDITOR_PLUGIN_H
-#define OPENXR_EDITOR_PLUGIN_H
+#pragma once
 
 #include "openxr_action_map_editor.h"
 #include "openxr_binding_modifier_editor.h"
@@ -54,7 +53,4 @@ public:
 	virtual void make_visible(bool p_visible) override;
 
 	OpenXREditorPlugin();
-	~OpenXREditorPlugin();
 };
-
-#endif // OPENXR_EDITOR_PLUGIN_H
diff --git a/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp b/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp
index 1e9fe3ca..f4f26aeb 100644
--- a/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp
+++ b/engine/modules/openxr/editor/openxr_interaction_profile_editor.cpp
@@ -181,6 +181,7 @@ OpenXRInteractionProfileEditorBase::OpenXRInteractionProfileEditorBase() {
 	binding_modifiers_btn = memnew(Button);
 	binding_modifiers_btn->set_tooltip_text(TTR("Edit binding modifiers"));
 	binding_modifiers_btn->connect("pressed", callable_mp(this, &OpenXRInteractionProfileEditorBase::_on_open_binding_modifiers));
+	binding_modifiers_btn->set_accessibility_name(TTRC("Edit"));
 	// TODO show visual difference if there are binding modifiers for this interaction profile
 	toolbar_vb->add_child(binding_modifiers_btn);
 }
@@ -308,6 +309,7 @@ void OpenXRInteractionProfileEditor::_add_io_path(VBoxContainer *p_container, co
 				action_binding_modifiers_btn->set_flat(true);
 				action_binding_modifiers_btn->set_button_icon(get_theme_icon(SNAME("Modifiers"), EditorStringName(EditorIcons)));
 				action_binding_modifiers_btn->connect(SceneStringName(pressed), callable_mp((Window *)action_binding_modifiers_dialog, &Window::popup_centered).bind(Size2i(500, 400)));
+				action_binding_modifiers_btn->set_accessibility_name(TTRC("Modifiers"));
 				// TODO change style of button if there are binding modifiers
 				action_hb->add_child(action_binding_modifiers_btn);
 
@@ -315,6 +317,7 @@ void OpenXRInteractionProfileEditor::_add_io_path(VBoxContainer *p_container, co
 				action_rem->set_flat(true);
 				action_rem->set_button_icon(get_theme_icon(SNAME("Remove"), EditorStringName(EditorIcons)));
 				action_rem->connect(SceneStringName(pressed), callable_mp((OpenXRInteractionProfileEditor *)this, &OpenXRInteractionProfileEditor::_on_remove_pressed).bind(action->get_name_with_set(), String(p_io_path->openxr_path)));
+				action_rem->set_accessibility_name(TTRC("Remove"));
 				action_hb->add_child(action_rem);
 			}
 		}
diff --git a/engine/modules/openxr/editor/openxr_interaction_profile_editor.h b/engine/modules/openxr/editor/openxr_interaction_profile_editor.h
index 51615af9..7ee0de7a 100644
--- a/engine/modules/openxr/editor/openxr_interaction_profile_editor.h
+++ b/engine/modules/openxr/editor/openxr_interaction_profile_editor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_INTERACTION_PROFILE_EDITOR_H
-#define OPENXR_INTERACTION_PROFILE_EDITOR_H
+#pragma once
 
 #include "../action_map/openxr_action_map.h"
 #include "../action_map/openxr_interaction_profile.h"
@@ -106,5 +105,3 @@ public:
 
 	OpenXRInteractionProfileEditor();
 };
-
-#endif // OPENXR_INTERACTION_PROFILE_EDITOR_H
diff --git a/engine/modules/openxr/editor/openxr_select_action_dialog.cpp b/engine/modules/openxr/editor/openxr_select_action_dialog.cpp
index 89dea09b..96f46006 100644
--- a/engine/modules/openxr/editor/openxr_select_action_dialog.cpp
+++ b/engine/modules/openxr/editor/openxr_select_action_dialog.cpp
@@ -30,6 +30,8 @@
 
 #include "openxr_select_action_dialog.h"
 
+#include "editor/themes/editor_scale.h"
+
 void OpenXRSelectActionDialog::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("action_selected", PropertyInfo(Variant::STRING, "action")));
 }
@@ -124,7 +126,7 @@ OpenXRSelectActionDialog::OpenXRSelectActionDialog(Ref<OpenXRActionMap> p_action
 	set_title(TTR("Select an action"));
 
 	scroll = memnew(ScrollContainer);
-	scroll->set_custom_minimum_size(Size2(600.0, 400.0));
+	scroll->set_custom_minimum_size(Size2(600.0 * EDSCALE, 400.0 * EDSCALE));
 	add_child(scroll);
 
 	main_vb = memnew(VBoxContainer);
diff --git a/engine/modules/openxr/editor/openxr_select_action_dialog.h b/engine/modules/openxr/editor/openxr_select_action_dialog.h
index cf7a7a19..b88f63fc 100644
--- a/engine/modules/openxr/editor/openxr_select_action_dialog.h
+++ b/engine/modules/openxr/editor/openxr_select_action_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_SELECT_ACTION_DIALOG_H
-#define OPENXR_SELECT_ACTION_DIALOG_H
+#pragma once
 
 #include "../action_map/openxr_action_map.h"
 
@@ -64,5 +63,3 @@ public:
 
 	OpenXRSelectActionDialog(Ref<OpenXRActionMap> p_action_map);
 };
-
-#endif // OPENXR_SELECT_ACTION_DIALOG_H
diff --git a/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp b/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
index 009acb12..60a7eb2f 100644
--- a/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
+++ b/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.cpp
@@ -33,6 +33,8 @@
 #include "../action_map/openxr_interaction_profile_metadata.h"
 #include "../openxr_api.h"
 
+#include "editor/themes/editor_scale.h"
+
 void OpenXRSelectInteractionProfileDialog::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("interaction_profile_selected", PropertyInfo(Variant::STRING, "interaction_profile")));
 }
@@ -116,7 +118,7 @@ OpenXRSelectInteractionProfileDialog::OpenXRSelectInteractionProfileDialog() {
 	set_title(TTR("Select an interaction profile"));
 
 	scroll = memnew(ScrollContainer);
-	scroll->set_custom_minimum_size(Size2(600.0, 400.0));
+	scroll->set_custom_minimum_size(Size2(600.0 * EDSCALE, 400.0 * EDSCALE));
 	add_child(scroll);
 
 	main_vb = memnew(VBoxContainer);
diff --git a/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.h b/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.h
index bfcdce16..efb34066 100644
--- a/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.h
+++ b/engine/modules/openxr/editor/openxr_select_interaction_profile_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_SELECT_INTERACTION_PROFILE_DIALOG_H
-#define OPENXR_SELECT_INTERACTION_PROFILE_DIALOG_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/dialogs.h"
@@ -58,5 +57,3 @@ public:
 
 	OpenXRSelectInteractionProfileDialog();
 };
-
-#endif // OPENXR_SELECT_INTERACTION_PROFILE_DIALOG_H
diff --git a/engine/modules/openxr/editor/openxr_select_runtime.cpp b/engine/modules/openxr/editor/openxr_select_runtime.cpp
index 25251aa5..bc90cd3e 100644
--- a/engine/modules/openxr/editor/openxr_select_runtime.cpp
+++ b/engine/modules/openxr/editor/openxr_select_runtime.cpp
@@ -54,10 +54,9 @@ void OpenXRSelectRuntime::_update_items() {
 	set_item_metadata(index, "");
 	index++;
 
-	Array keys = runtimes.keys();
-	for (int i = 0; i < keys.size(); i++) {
-		String key = keys[i];
-		String path = runtimes[key];
+	for (const KeyValue<Variant, Variant> &kv : runtimes) {
+		const String &key = kv.key;
+		const String &path = kv.value;
 		String adj_path = path.replace("~", home_folder);
 
 		if (da->file_exists(adj_path)) {
diff --git a/engine/modules/openxr/editor/openxr_select_runtime.h b/engine/modules/openxr/editor/openxr_select_runtime.h
index f5b2f1da..40a553ec 100644
--- a/engine/modules/openxr/editor/openxr_select_runtime.h
+++ b/engine/modules/openxr/editor/openxr_select_runtime.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_SELECT_RUNTIME_H
-#define OPENXR_SELECT_RUNTIME_H
+#pragma once
 
 #include "scene/gui/option_button.h"
 
@@ -46,5 +45,3 @@ private:
 	void _update_items();
 	void _on_item_selected(int p_which);
 };
-
-#endif // OPENXR_SELECT_RUNTIME_H
diff --git a/engine/modules/openxr/extensions/openxr_composition_layer_depth_extension.h b/engine/modules/openxr/extensions/openxr_composition_layer_depth_extension.h
index 1fda8844..6b4f81cd 100644
--- a/engine/modules/openxr/extensions/openxr_composition_layer_depth_extension.h
+++ b/engine/modules/openxr/extensions/openxr_composition_layer_depth_extension.h
@@ -28,13 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_COMPOSITION_LAYER_DEPTH_EXTENSION_H
-#define OPENXR_COMPOSITION_LAYER_DEPTH_EXTENSION_H
+#pragma once
 
-#include "openxr_composition_layer_provider.h"
 #include "openxr_extension_wrapper.h"
 
-class OpenXRCompositionLayerDepthExtension : public OpenXRExtensionWrapper, public OpenXRCompositionLayerProvider {
+class OpenXRCompositionLayerDepthExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRCompositionLayerDepthExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRCompositionLayerDepthExtension *get_singleton();
 
@@ -52,5 +55,3 @@ private:
 
 	bool available = false;
 };
-
-#endif // OPENXR_COMPOSITION_LAYER_DEPTH_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp b/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp
index f6270288..56badf59 100644
--- a/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_composition_layer_extension.cpp
@@ -35,6 +35,7 @@
 #include <openxr/openxr_platform.h>
 #endif
 
+#include "openxr_fb_update_swapchain_extension.h"
 #include "platform/android/api/java_class_wrapper.h"
 #include "servers/rendering/rendering_server_globals.h"
 
@@ -227,6 +228,13 @@ void OpenXRViewportCompositionLayerProvider::set_viewport(RID p_viewport, Size2i
 void OpenXRViewportCompositionLayerProvider::set_use_android_surface(bool p_use_android_surface, Size2i p_size) {
 #ifdef ANDROID_ENABLED
 	if (p_use_android_surface == use_android_surface) {
+		if (use_android_surface && swapchain_size != p_size) {
+			OpenXRFBUpdateSwapchainExtension *fb_update_swapchain_ext = OpenXRFBUpdateSwapchainExtension::get_singleton();
+			if (fb_update_swapchain_ext && fb_update_swapchain_ext->is_android_ext_enabled()) {
+				swapchain_size = p_size;
+				fb_update_swapchain_ext->update_swapchain_surface_size(android_surface.swapchain, swapchain_size);
+			}
+		}
 		return;
 	}
 
@@ -280,6 +288,8 @@ void OpenXRViewportCompositionLayerProvider::create_android_surface() {
 	jobject surface;
 	composition_layer_extension->create_android_surface_swapchain(&info, &android_surface.swapchain, &surface);
 
+	swapchain_state.dirty = true;
+
 	if (surface) {
 		android_surface.surface.instantiate(JavaClassWrapper::get_singleton()->wrap("android.view.Surface"), surface);
 	}
@@ -327,6 +337,11 @@ void OpenXRViewportCompositionLayerProvider::on_pre_render() {
 			}
 		}
 	}
+
+	if (swapchain_state.dirty) {
+		update_swapchain_state();
+		swapchain_state.dirty = false;
+	}
 }
 
 XrCompositionLayerBaseHeader *OpenXRViewportCompositionLayerProvider::get_composition_layer() {
@@ -393,6 +408,34 @@ XrCompositionLayerBaseHeader *OpenXRViewportCompositionLayerProvider::get_compos
 	return composition_layer;
 }
 
+void OpenXRViewportCompositionLayerProvider::update_swapchain_state() {
+	OpenXRFBUpdateSwapchainExtension *fb_update_swapchain_ext = OpenXRFBUpdateSwapchainExtension::get_singleton();
+	if (!fb_update_swapchain_ext) {
+		return;
+	}
+
+#ifdef ANDROID_ENABLED
+	if (use_android_surface) {
+		if (android_surface.swapchain == XR_NULL_HANDLE) {
+			return;
+		}
+
+		fb_update_swapchain_ext->update_swapchain_state(android_surface.swapchain, &swapchain_state);
+	} else
+#endif
+	{
+		if (subviewport.swapchain_info.get_swapchain() == XR_NULL_HANDLE) {
+			return;
+		}
+
+		fb_update_swapchain_ext->update_swapchain_state(subviewport.swapchain_info.get_swapchain(), &swapchain_state);
+	}
+}
+
+OpenXRViewportCompositionLayerProvider::SwapchainState *OpenXRViewportCompositionLayerProvider::get_swapchain_state() {
+	return &swapchain_state;
+}
+
 void OpenXRViewportCompositionLayerProvider::update_swapchain_sub_image(XrSwapchainSubImage &r_subimage) {
 #ifdef ANDROID_ENABLED
 	if (use_android_surface) {
@@ -451,6 +494,8 @@ bool OpenXRViewportCompositionLayerProvider::update_and_acquire_swapchain(bool p
 		return false;
 	}
 
+	swapchain_state.dirty = true;
+
 	// Acquire our image so we can start rendering into it,
 	// we can ignore should_render here, ret will be false.
 	bool should_render = true;
diff --git a/engine/modules/openxr/extensions/openxr_composition_layer_extension.h b/engine/modules/openxr/extensions/openxr_composition_layer_extension.h
index bce34f09..5ad3d231 100644
--- a/engine/modules/openxr/extensions/openxr_composition_layer_extension.h
+++ b/engine/modules/openxr/extensions/openxr_composition_layer_extension.h
@@ -28,10 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_COMPOSITION_LAYER_EXTENSION_H
-#define OPENXR_COMPOSITION_LAYER_EXTENSION_H
+#pragma once
 
-#include "openxr_composition_layer_provider.h"
 #include "openxr_extension_wrapper.h"
 
 #include "../openxr_api.h"
@@ -50,7 +48,12 @@ class OpenXRViewportCompositionLayerProvider;
 // This extension provides access to composition layers for displaying 2D content through the XR compositor.
 
 // OpenXRCompositionLayerExtension enables the extensions related to this functionality
-class OpenXRCompositionLayerExtension : public OpenXRExtensionWrapper, public OpenXRCompositionLayerProvider {
+class OpenXRCompositionLayerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRCompositionLayerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRCompositionLayerExtension *get_singleton();
 
@@ -97,6 +100,56 @@ private:
 };
 
 class OpenXRViewportCompositionLayerProvider {
+public:
+	// Must be identical to Filter enum definition in OpenXRCompositionLayer.
+	enum Filter {
+		FILTER_NEAREST,
+		FILTER_LINEAR,
+		FILTER_CUBIC,
+	};
+
+	// Must be identical to MipmapMode enum definition in OpenXRCompositionLayer.
+	enum MipmapMode {
+		MIPMAP_MODE_DISABLED,
+		MIPMAP_MODE_NEAREST,
+		MIPMAP_MODE_LINEAR,
+	};
+
+	// Must be identical to Wrap enum definition in OpenXRCompositionLayer.
+	enum Wrap {
+		WRAP_CLAMP_TO_BORDER,
+		WRAP_CLAMP_TO_EDGE,
+		WRAP_REPEAT,
+		WRAP_MIRRORED_REPEAT,
+		WRAP_MIRROR_CLAMP_TO_EDGE,
+	};
+
+	// Must be identical to Swizzle enum definition in OpenXRCompositionLayer.
+	enum Swizzle {
+		SWIZZLE_RED,
+		SWIZZLE_GREEN,
+		SWIZZLE_BLUE,
+		SWIZZLE_ALPHA,
+		SWIZZLE_ZERO,
+		SWIZZLE_ONE,
+	};
+
+	struct SwapchainState {
+		Filter min_filter = Filter::FILTER_LINEAR;
+		Filter mag_filter = Filter::FILTER_LINEAR;
+		MipmapMode mipmap_mode = MipmapMode::MIPMAP_MODE_LINEAR;
+		Wrap horizontal_wrap = Wrap::WRAP_CLAMP_TO_BORDER;
+		Wrap vertical_wrap = Wrap::WRAP_CLAMP_TO_BORDER;
+		Swizzle red_swizzle = Swizzle::SWIZZLE_RED;
+		Swizzle green_swizzle = Swizzle::SWIZZLE_GREEN;
+		Swizzle blue_swizzle = Swizzle::SWIZZLE_BLUE;
+		Swizzle alpha_swizzle = Swizzle::SWIZZLE_ALPHA;
+		float max_anisotropy = 1.0;
+		Color border_color = { 0.0, 0.0, 0.0, 0.0 };
+		bool dirty = false;
+	};
+
+private:
 	XrCompositionLayerBaseHeader *composition_layer = nullptr;
 	int sort_order = 1;
 	bool alpha_blend = false;
@@ -130,6 +183,8 @@ class OpenXRViewportCompositionLayerProvider {
 	void update_swapchain_sub_image(XrSwapchainSubImage &r_swapchain_sub_image);
 	void free_swapchain();
 
+	SwapchainState swapchain_state;
+
 #ifdef ANDROID_ENABLED
 	void create_android_surface();
 #endif
@@ -156,8 +211,9 @@ public:
 	void on_pre_render();
 	XrCompositionLayerBaseHeader *get_composition_layer();
 
+	void update_swapchain_state();
+	SwapchainState *get_swapchain_state();
+
 	OpenXRViewportCompositionLayerProvider(XrCompositionLayerBaseHeader *p_composition_layer);
 	~OpenXRViewportCompositionLayerProvider();
 };
-
-#endif // OPENXR_COMPOSITION_LAYER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_debug_utils_extension.h b/engine/modules/openxr/extensions/openxr_debug_utils_extension.h
index 1ee4c2a1..9c0402e5 100644
--- a/engine/modules/openxr/extensions/openxr_debug_utils_extension.h
+++ b/engine/modules/openxr/extensions/openxr_debug_utils_extension.h
@@ -28,13 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_DEBUG_UTILS_EXTENSION_H
-#define OPENXR_DEBUG_UTILS_EXTENSION_H
+#pragma once
 
 #include "../util.h"
 #include "openxr_extension_wrapper.h"
 
 class OpenXRDebugUtilsExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRDebugUtilsExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRDebugUtilsExtension *get_singleton();
 
@@ -72,5 +76,3 @@ private:
 	EXT_PROTO_XRRESULT_FUNC1(xrSessionEndDebugUtilsLabelRegionEXT, (XrSession), p_session)
 	EXT_PROTO_XRRESULT_FUNC2(xrSessionInsertDebugUtilsLabelEXT, (XrSession), p_session, (const XrDebugUtilsLabelEXT *), p_label_info)
 };
-
-#endif // OPENXR_DEBUG_UTILS_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h b/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h
index e0c8c3e2..30582d93 100644
--- a/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h
+++ b/engine/modules/openxr/extensions/openxr_dpad_binding_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_DPAD_BINDING_EXTENSION_H
-#define OPENXR_DPAD_BINDING_EXTENSION_H
+#pragma once
 
 #include "../action_map/openxr_action_set.h"
 #include "../action_map/openxr_binding_modifier.h"
@@ -38,6 +37,11 @@
 #include "openxr_extension_wrapper.h"
 
 class OpenXRDPadBindingExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRDPadBindingExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRDPadBindingExtension *get_singleton();
 
@@ -105,5 +109,3 @@ public:
 	virtual String get_description() const override { return "DPad modifier"; }
 	virtual PackedByteArray get_ip_modification() override;
 };
-
-#endif // OPENXR_DPAD_BINDING_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_extension_wrapper_extension.cpp b/engine/modules/openxr/extensions/openxr_extension_wrapper.cpp
similarity index 62%
rename from engine/modules/openxr/extensions/openxr_extension_wrapper_extension.cpp
rename to engine/modules/openxr/extensions/openxr_extension_wrapper.cpp
index e6a4c261..866d4c09 100644
--- a/engine/modules/openxr/extensions/openxr_extension_wrapper_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_extension_wrapper.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  openxr_extension_wrapper_extension.cpp                                */
+/*  openxr_extension_wrapper.cpp                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,11 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "openxr_extension_wrapper_extension.h"
+#include "openxr_extension_wrapper.h"
 
 #include "../openxr_api.h"
+#include "../openxr_api_extension.h"
 
-void OpenXRExtensionWrapperExtension::_bind_methods() {
+void OpenXRExtensionWrapper::_bind_methods() {
 	GDVIRTUAL_BIND(_get_requested_extensions);
 	GDVIRTUAL_BIND(_set_system_properties_and_get_next_pointer, "next_pointer");
 	GDVIRTUAL_BIND(_set_instance_create_info_and_get_next_pointer, "next_pointer");
@@ -40,6 +41,10 @@ void OpenXRExtensionWrapperExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_set_swapchain_create_info_and_get_next_pointer, "next_pointer");
 	GDVIRTUAL_BIND(_set_hand_joint_locations_and_get_next_pointer, "hand_index", "next_pointer");
 	GDVIRTUAL_BIND(_set_projection_views_and_get_next_pointer, "view_index", "next_pointer");
+	GDVIRTUAL_BIND(_set_frame_wait_info_and_get_next_pointer, "next_pointer");
+	GDVIRTUAL_BIND(_set_frame_end_info_and_get_next_pointer, "next_pointer");
+	GDVIRTUAL_BIND(_set_view_locate_info_and_get_next_pointer, "next_pointer");
+	GDVIRTUAL_BIND(_set_reference_space_create_info_and_get_next_pointer, "reference_space_type", "next_pointer");
 	GDVIRTUAL_BIND(_get_composition_layer_count);
 	GDVIRTUAL_BIND(_get_composition_layer, "index");
 	GDVIRTUAL_BIND(_get_composition_layer_order, "index");
@@ -70,20 +75,18 @@ void OpenXRExtensionWrapperExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_on_viewport_composition_layer_destroyed, "layer");
 	GDVIRTUAL_BIND(_set_android_surface_swapchain_create_info_and_get_next_pointer, "property_values", "next_pointer");
 
-	ClassDB::bind_method(D_METHOD("get_openxr_api"), &OpenXRExtensionWrapperExtension::get_openxr_api);
-	ClassDB::bind_method(D_METHOD("register_extension_wrapper"), &OpenXRExtensionWrapperExtension::register_extension_wrapper);
+	ClassDB::bind_method(D_METHOD("get_openxr_api"), &OpenXRExtensionWrapper::_gdextension_get_openxr_api);
+	ClassDB::bind_method(D_METHOD("register_extension_wrapper"), &OpenXRExtensionWrapper::_gdextension_register_extension_wrapper);
 }
 
-HashMap<String, bool *> OpenXRExtensionWrapperExtension::get_requested_extensions() {
+HashMap<String, bool *> OpenXRExtensionWrapper::get_requested_extensions() {
 	Dictionary request_extension;
 
 	if (GDVIRTUAL_CALL(_get_requested_extensions, request_extension)) {
 		HashMap<String, bool *> result;
-		Array keys = request_extension.keys();
-		for (int i = 0; i < keys.size(); i++) {
-			String key = keys.get(i);
-			GDExtensionPtr<bool> value = VariantCaster<GDExtensionPtr<bool>>::cast(request_extension.get(key, GDExtensionPtr<bool>(nullptr)));
-			result.insert(key, value);
+		for (const KeyValue<Variant, Variant> &kv : request_extension) {
+			GDExtensionPtr<bool> value = VariantCaster<GDExtensionPtr<bool>>::cast(kv.value);
+			result.insert(kv.key, value);
 		}
 		return result;
 	}
@@ -91,7 +94,7 @@ HashMap<String, bool *> OpenXRExtensionWrapperExtension::get_requested_extension
 	return HashMap<String, bool *>();
 }
 
-void *OpenXRExtensionWrapperExtension::set_system_properties_and_get_next_pointer(void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_system_properties_and_get_next_pointer(void *p_next_pointer) {
 	uint64_t pointer;
 
 	if (GDVIRTUAL_CALL(_set_system_properties_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -101,7 +104,7 @@ void *OpenXRExtensionWrapperExtension::set_system_properties_and_get_next_pointe
 	return nullptr;
 }
 
-void *OpenXRExtensionWrapperExtension::set_instance_create_info_and_get_next_pointer(void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_instance_create_info_and_get_next_pointer(void *p_next_pointer) {
 	uint64_t pointer;
 
 	if (GDVIRTUAL_CALL(_set_instance_create_info_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -111,7 +114,7 @@ void *OpenXRExtensionWrapperExtension::set_instance_create_info_and_get_next_poi
 	return nullptr;
 }
 
-void *OpenXRExtensionWrapperExtension::set_session_create_and_get_next_pointer(void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_session_create_and_get_next_pointer(void *p_next_pointer) {
 	uint64_t pointer;
 
 	if (GDVIRTUAL_CALL(_set_session_create_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -121,7 +124,7 @@ void *OpenXRExtensionWrapperExtension::set_session_create_and_get_next_pointer(v
 	return nullptr;
 }
 
-void *OpenXRExtensionWrapperExtension::set_swapchain_create_info_and_get_next_pointer(void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_swapchain_create_info_and_get_next_pointer(void *p_next_pointer) {
 	uint64_t pointer;
 
 	if (GDVIRTUAL_CALL(_set_swapchain_create_info_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -131,7 +134,7 @@ void *OpenXRExtensionWrapperExtension::set_swapchain_create_info_and_get_next_po
 	return nullptr;
 }
 
-void *OpenXRExtensionWrapperExtension::set_hand_joint_locations_and_get_next_pointer(int p_hand_index, void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_hand_joint_locations_and_get_next_pointer(int p_hand_index, void *p_next_pointer) {
 	uint64_t pointer;
 
 	if (GDVIRTUAL_CALL(_set_hand_joint_locations_and_get_next_pointer, p_hand_index, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -141,7 +144,7 @@ void *OpenXRExtensionWrapperExtension::set_hand_joint_locations_and_get_next_poi
 	return nullptr;
 }
 
-void *OpenXRExtensionWrapperExtension::set_projection_views_and_get_next_pointer(int p_view_index, void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_projection_views_and_get_next_pointer(int p_view_index, void *p_next_pointer) {
 	uint64_t pointer = 0;
 
 	if (GDVIRTUAL_CALL(_set_projection_views_and_get_next_pointer, p_view_index, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -151,7 +154,47 @@ void *OpenXRExtensionWrapperExtension::set_projection_views_and_get_next_pointer
 	return nullptr;
 }
 
-PackedStringArray OpenXRExtensionWrapperExtension::get_suggested_tracker_names() {
+void *OpenXRExtensionWrapper::set_reference_space_create_info_and_get_next_pointer(int p_reference_space_type, void *p_next_pointer) {
+	uint64_t pointer = 0;
+
+	if (GDVIRTUAL_CALL(_set_reference_space_create_info_and_get_next_pointer, p_reference_space_type, GDExtensionPtr<void>(p_next_pointer), pointer)) {
+		return reinterpret_cast<void *>(pointer);
+	}
+
+	return nullptr;
+}
+
+void *OpenXRExtensionWrapper::set_frame_wait_info_and_get_next_pointer(void *p_next_pointer) {
+	uint64_t pointer = 0;
+
+	if (GDVIRTUAL_CALL(_set_frame_wait_info_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
+		return reinterpret_cast<void *>(pointer);
+	}
+
+	return nullptr;
+}
+
+void *OpenXRExtensionWrapper::set_frame_end_info_and_get_next_pointer(void *p_next_pointer) {
+	uint64_t pointer = 0;
+
+	if (GDVIRTUAL_CALL(_set_frame_end_info_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
+		return reinterpret_cast<void *>(pointer);
+	}
+
+	return nullptr;
+}
+
+void *OpenXRExtensionWrapper::set_view_locate_info_and_get_next_pointer(void *p_next_pointer) {
+	uint64_t pointer = 0;
+
+	if (GDVIRTUAL_CALL(_set_view_locate_info_and_get_next_pointer, GDExtensionPtr<void>(p_next_pointer), pointer)) {
+		return reinterpret_cast<void *>(pointer);
+	}
+
+	return nullptr;
+}
+
+PackedStringArray OpenXRExtensionWrapper::get_suggested_tracker_names() {
 	PackedStringArray ret;
 
 	if (GDVIRTUAL_CALL(_get_suggested_tracker_names, ret)) {
@@ -161,13 +204,13 @@ PackedStringArray OpenXRExtensionWrapperExtension::get_suggested_tracker_names()
 	return PackedStringArray();
 }
 
-int OpenXRExtensionWrapperExtension::get_composition_layer_count() {
+int OpenXRExtensionWrapper::get_composition_layer_count() {
 	int count = 0;
 	GDVIRTUAL_CALL(_get_composition_layer_count, count);
 	return count;
 }
 
-XrCompositionLayerBaseHeader *OpenXRExtensionWrapperExtension::get_composition_layer(int p_index) {
+XrCompositionLayerBaseHeader *OpenXRExtensionWrapper::get_composition_layer(int p_index) {
 	uint64_t pointer;
 
 	if (GDVIRTUAL_CALL(_get_composition_layer, p_index, pointer)) {
@@ -177,91 +220,91 @@ XrCompositionLayerBaseHeader *OpenXRExtensionWrapperExtension::get_composition_l
 	return nullptr;
 }
 
-int OpenXRExtensionWrapperExtension::get_composition_layer_order(int p_index) {
+int OpenXRExtensionWrapper::get_composition_layer_order(int p_index) {
 	int order = 0;
 	GDVIRTUAL_CALL(_get_composition_layer_order, p_index, order);
 	return order;
 }
 
-void OpenXRExtensionWrapperExtension::on_register_metadata() {
+void OpenXRExtensionWrapper::on_register_metadata() {
 	GDVIRTUAL_CALL(_on_register_metadata);
 }
 
-void OpenXRExtensionWrapperExtension::on_before_instance_created() {
+void OpenXRExtensionWrapper::on_before_instance_created() {
 	GDVIRTUAL_CALL(_on_before_instance_created);
 }
 
-void OpenXRExtensionWrapperExtension::on_instance_created(const XrInstance p_instance) {
+void OpenXRExtensionWrapper::on_instance_created(const XrInstance p_instance) {
 	uint64_t instance = (uint64_t)p_instance;
 	GDVIRTUAL_CALL(_on_instance_created, instance);
 }
 
-void OpenXRExtensionWrapperExtension::on_instance_destroyed() {
+void OpenXRExtensionWrapper::on_instance_destroyed() {
 	GDVIRTUAL_CALL(_on_instance_destroyed);
 }
 
-void OpenXRExtensionWrapperExtension::on_session_created(const XrSession p_session) {
+void OpenXRExtensionWrapper::on_session_created(const XrSession p_session) {
 	uint64_t session = (uint64_t)p_session;
 	GDVIRTUAL_CALL(_on_session_created, session);
 }
 
-void OpenXRExtensionWrapperExtension::on_process() {
+void OpenXRExtensionWrapper::on_process() {
 	GDVIRTUAL_CALL(_on_process);
 }
 
-void OpenXRExtensionWrapperExtension::on_pre_render() {
+void OpenXRExtensionWrapper::on_pre_render() {
 	GDVIRTUAL_CALL(_on_pre_render);
 }
 
-void OpenXRExtensionWrapperExtension::on_main_swapchains_created() {
+void OpenXRExtensionWrapper::on_main_swapchains_created() {
 	GDVIRTUAL_CALL(_on_main_swapchains_created);
 }
 
-void OpenXRExtensionWrapperExtension::on_session_destroyed() {
+void OpenXRExtensionWrapper::on_session_destroyed() {
 	GDVIRTUAL_CALL(_on_session_destroyed);
 }
 
-void OpenXRExtensionWrapperExtension::on_pre_draw_viewport(RID p_render_target) {
+void OpenXRExtensionWrapper::on_pre_draw_viewport(RID p_render_target) {
 	GDVIRTUAL_CALL(_on_pre_draw_viewport, p_render_target);
 }
 
-void OpenXRExtensionWrapperExtension::on_post_draw_viewport(RID p_render_target) {
+void OpenXRExtensionWrapper::on_post_draw_viewport(RID p_render_target) {
 	GDVIRTUAL_CALL(_on_post_draw_viewport, p_render_target);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_idle() {
+void OpenXRExtensionWrapper::on_state_idle() {
 	GDVIRTUAL_CALL(_on_state_idle);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_ready() {
+void OpenXRExtensionWrapper::on_state_ready() {
 	GDVIRTUAL_CALL(_on_state_ready);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_synchronized() {
+void OpenXRExtensionWrapper::on_state_synchronized() {
 	GDVIRTUAL_CALL(_on_state_synchronized);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_visible() {
+void OpenXRExtensionWrapper::on_state_visible() {
 	GDVIRTUAL_CALL(_on_state_visible);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_focused() {
+void OpenXRExtensionWrapper::on_state_focused() {
 	GDVIRTUAL_CALL(_on_state_focused);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_stopping() {
+void OpenXRExtensionWrapper::on_state_stopping() {
 	GDVIRTUAL_CALL(_on_state_stopping);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_loss_pending() {
+void OpenXRExtensionWrapper::on_state_loss_pending() {
 	GDVIRTUAL_CALL(_on_state_loss_pending);
 }
 
-void OpenXRExtensionWrapperExtension::on_state_exiting() {
+void OpenXRExtensionWrapper::on_state_exiting() {
 	GDVIRTUAL_CALL(_on_state_exiting);
 }
 
-bool OpenXRExtensionWrapperExtension::on_event_polled(const XrEventDataBuffer &p_event) {
+bool OpenXRExtensionWrapper::on_event_polled(const XrEventDataBuffer &p_event) {
 	bool event_polled;
 
 	if (GDVIRTUAL_CALL(_on_event_polled, GDExtensionConstPtr<void>(&p_event), event_polled)) {
@@ -271,7 +314,7 @@ bool OpenXRExtensionWrapperExtension::on_event_polled(const XrEventDataBuffer &p
 	return false;
 }
 
-void *OpenXRExtensionWrapperExtension::set_viewport_composition_layer_and_get_next_pointer(const XrCompositionLayerBaseHeader *p_layer, const Dictionary &p_property_values, void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_viewport_composition_layer_and_get_next_pointer(const XrCompositionLayerBaseHeader *p_layer, const Dictionary &p_property_values, void *p_next_pointer) {
 	uint64_t pointer = 0;
 
 	if (GDVIRTUAL_CALL(_set_viewport_composition_layer_and_get_next_pointer, GDExtensionConstPtr<void>(p_layer), p_property_values, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -281,11 +324,11 @@ void *OpenXRExtensionWrapperExtension::set_viewport_composition_layer_and_get_ne
 	return p_next_pointer;
 }
 
-void OpenXRExtensionWrapperExtension::on_viewport_composition_layer_destroyed(const XrCompositionLayerBaseHeader *p_layer) {
+void OpenXRExtensionWrapper::on_viewport_composition_layer_destroyed(const XrCompositionLayerBaseHeader *p_layer) {
 	GDVIRTUAL_CALL(_on_viewport_composition_layer_destroyed, GDExtensionConstPtr<void>(p_layer));
 }
 
-void OpenXRExtensionWrapperExtension::get_viewport_composition_layer_extension_properties(List<PropertyInfo> *p_property_list) {
+void OpenXRExtensionWrapper::get_viewport_composition_layer_extension_properties(List<PropertyInfo> *p_property_list) {
 	TypedArray<Dictionary> properties;
 
 	if (GDVIRTUAL_CALL(_get_viewport_composition_layer_extension_properties, properties)) {
@@ -295,13 +338,13 @@ void OpenXRExtensionWrapperExtension::get_viewport_composition_layer_extension_p
 	}
 }
 
-Dictionary OpenXRExtensionWrapperExtension::get_viewport_composition_layer_extension_property_defaults() {
+Dictionary OpenXRExtensionWrapper::get_viewport_composition_layer_extension_property_defaults() {
 	Dictionary property_defaults;
 	GDVIRTUAL_CALL(_get_viewport_composition_layer_extension_property_defaults, property_defaults);
 	return property_defaults;
 }
 
-void *OpenXRExtensionWrapperExtension::set_android_surface_swapchain_create_info_and_get_next_pointer(const Dictionary &p_property_values, void *p_next_pointer) {
+void *OpenXRExtensionWrapper::set_android_surface_swapchain_create_info_and_get_next_pointer(const Dictionary &p_property_values, void *p_next_pointer) {
 	uint64_t pointer = 0;
 
 	if (GDVIRTUAL_CALL(_set_android_surface_swapchain_create_info_and_get_next_pointer, p_property_values, GDExtensionPtr<void>(p_next_pointer), pointer)) {
@@ -311,17 +354,14 @@ void *OpenXRExtensionWrapperExtension::set_android_surface_swapchain_create_info
 	return p_next_pointer;
 }
 
-Ref<OpenXRAPIExtension> OpenXRExtensionWrapperExtension::get_openxr_api() {
-	return openxr_api;
+Ref<OpenXRAPIExtension> OpenXRExtensionWrapper::_gdextension_get_openxr_api() {
+	static Ref<OpenXRAPIExtension> openxr_api_extension;
+	if (unlikely(openxr_api_extension.is_null())) {
+		openxr_api_extension.instantiate();
+	}
+	return openxr_api_extension;
 }
 
-void OpenXRExtensionWrapperExtension::register_extension_wrapper() {
+void OpenXRExtensionWrapper::_gdextension_register_extension_wrapper() {
 	OpenXRAPI::register_extension_wrapper(this);
 }
-
-OpenXRExtensionWrapperExtension::OpenXRExtensionWrapperExtension() {
-	openxr_api.instantiate();
-}
-
-OpenXRExtensionWrapperExtension::~OpenXRExtensionWrapperExtension() {
-}
diff --git a/engine/modules/openxr/extensions/openxr_extension_wrapper.h b/engine/modules/openxr/extensions/openxr_extension_wrapper.h
index 1033617a..0119c89c 100644
--- a/engine/modules/openxr/extensions/openxr_extension_wrapper.h
+++ b/engine/modules/openxr/extensions/openxr_extension_wrapper.h
@@ -28,28 +28,42 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_EXTENSION_WRAPPER_H
-#define OPENXR_EXTENSION_WRAPPER_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/math/projection.h"
+#include "core/object/class_db.h"
+#include "core/object/gdvirtual.gen.inc"
 #include "core/templates/hash_map.h"
 #include "core/templates/rid.h"
+#include "core/variant/native_ptr.h"
+#include "core/variant/typed_array.h"
 #include "core/variant/variant.h"
 
 #include <openxr/openxr.h>
 
 class OpenXRAPI;
+class OpenXRAPIExtension;
 class OpenXRActionMap;
 
 // `OpenXRExtensionWrapper` allows us to implement OpenXR extensions.
-class OpenXRExtensionWrapper {
+class OpenXRExtensionWrapper : public Object {
+	GDCLASS(OpenXRExtensionWrapper, Object);
+
+	Ref<OpenXRAPIExtension> _gdextension_get_openxr_api();
+	void _gdextension_register_extension_wrapper();
+
+protected:
+	static void _bind_methods();
+
 public:
 	// `get_requested_extensions` should return a list of OpenXR extensions related to this extension.
 	// If the bool * is a nullptr this extension is mandatory
 	// If the bool * points to a boolean, the boolean will be updated
 	// to true if the extension is enabled.
-	virtual HashMap<String, bool *> get_requested_extensions() = 0;
+	virtual HashMap<String, bool *> get_requested_extensions();
+
+	GDVIRTUAL0R(Dictionary, _get_requested_extensions);
 
 	// These functions allow an extension to add entries to a struct chain.
 	// `p_next_pointer` points to the last struct that was created for this chain
@@ -57,14 +71,36 @@ public:
 	// You should return the pointer to the last struct you define as your result.
 	// If you are not adding any structs, just return `p_next_pointer`.
 	// See existing extensions for examples of this implementation.
-	virtual void *set_system_properties_and_get_next_pointer(void *p_next_pointer) { return p_next_pointer; } // Add additional data structures when we interrogate OpenXRS system abilities.
-	virtual void *set_instance_create_info_and_get_next_pointer(void *p_next_pointer) { return p_next_pointer; } // Add additional data structures when we create our OpenXR instance.
-	virtual void *set_session_create_and_get_next_pointer(void *p_next_pointer) { return p_next_pointer; } // Add additional data structures when we create our OpenXR session.
-	virtual void *set_swapchain_create_info_and_get_next_pointer(void *p_next_pointer) { return p_next_pointer; } // Add additional data structures when creating OpenXR swap chains.
-	virtual void *set_hand_joint_locations_and_get_next_pointer(int p_hand_index, void *p_next_pointer) { return p_next_pointer; }
-	virtual void *set_projection_views_and_get_next_pointer(int p_view_index, void *p_next_pointer) { return p_next_pointer; }
+	virtual void *set_system_properties_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when we interrogate OpenXRS system abilities.
+	virtual void *set_instance_create_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when we create our OpenXR instance.
+	virtual void *set_session_create_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when we create our OpenXR session.
+	virtual void *set_swapchain_create_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when creating OpenXR swap chains.
+	virtual void *set_hand_joint_locations_and_get_next_pointer(int p_hand_index, void *p_next_pointer);
+	virtual void *set_projection_views_and_get_next_pointer(int p_view_index, void *p_next_pointer);
+	virtual void *set_reference_space_create_info_and_get_next_pointer(int p_reference_space_type, void *p_next_pointer);
+	// These will only be called for extensions registered via OpenXRApi::register_frame_info_extension().
+	virtual void *set_frame_wait_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when calling xrWaitFrame
+	virtual void *set_view_locate_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when calling xrLocateViews
+	virtual void *set_frame_end_info_and_get_next_pointer(void *p_next_pointer); // Add additional data structures when calling xrEndFrame
 
-	virtual PackedStringArray get_suggested_tracker_names() { return PackedStringArray(); }
+	//TODO workaround as GDExtensionPtr<void> return type results in build error in godot-cpp
+	GDVIRTUAL1R(uint64_t, _set_system_properties_and_get_next_pointer, GDExtensionPtr<void>);
+	GDVIRTUAL1R(uint64_t, _set_instance_create_info_and_get_next_pointer, GDExtensionPtr<void>);
+	GDVIRTUAL1R(uint64_t, _set_session_create_and_get_next_pointer, GDExtensionPtr<void>);
+	GDVIRTUAL1R(uint64_t, _set_swapchain_create_info_and_get_next_pointer, GDExtensionPtr<void>);
+	GDVIRTUAL2R(uint64_t, _set_hand_joint_locations_and_get_next_pointer, int, GDExtensionPtr<void>);
+	GDVIRTUAL2R(uint64_t, _set_projection_views_and_get_next_pointer, int, GDExtensionPtr<void>);
+	GDVIRTUAL1R(uint64_t, _set_frame_wait_info_and_get_next_pointer, GDExtensionPtr<void>);
+	GDVIRTUAL1R(uint64_t, _set_frame_end_info_and_get_next_pointer, GDExtensionPtr<void>);
+	GDVIRTUAL1R(uint64_t, _set_view_locate_info_and_get_next_pointer, GDExtensionPtr<void>);
+	GDVIRTUAL2R(uint64_t, _set_reference_space_create_info_and_get_next_pointer, int, GDExtensionPtr<void>);
+	GDVIRTUAL0R(int, _get_composition_layer_count);
+	GDVIRTUAL1R(uint64_t, _get_composition_layer, int);
+	GDVIRTUAL1R(int, _get_composition_layer_order, int);
+
+	virtual PackedStringArray get_suggested_tracker_names();
+
+	GDVIRTUAL0R(PackedStringArray, _get_suggested_tracker_names);
 
 	// `on_register_metadata` allows extensions to register additional controller metadata.
 	// This function is called even when OpenXRApi is not constructured as the metadata
@@ -72,43 +108,75 @@ public:
 	// Also extensions should provide metadata regardless of whether they are supported
 	// on the host system as the controller data is used to setup action maps for users
 	// who may have access to the relevant hardware.
-	virtual void on_register_metadata() {}
+	virtual void on_register_metadata();
 
-	virtual void on_before_instance_created() {} // `on_before_instance_created` is called before we create our OpenXR instance.
-	virtual void on_instance_created(const XrInstance p_instance) {} // `on_instance_created` is called right after we've successfully created our OpenXR instance.
-	virtual void on_instance_destroyed() {} // `on_instance_destroyed` is called right before we destroy our OpenXR instance.
-	virtual void on_session_created(const XrSession p_session) {} // `on_session_created` is called right after we've successfully created our OpenXR session.
-	virtual void on_session_destroyed() {} // `on_session_destroyed` is called right before we destroy our OpenXR session.
+	virtual void on_before_instance_created(); // `on_before_instance_created` is called before we create our OpenXR instance.
+	virtual void on_instance_created(const XrInstance p_instance); // `on_instance_created` is called right after we've successfully created our OpenXR instance.
+	virtual void on_instance_destroyed(); // `on_instance_destroyed` is called right before we destroy our OpenXR instance.
+	virtual void on_session_created(const XrSession p_session); // `on_session_created` is called right after we've successfully created our OpenXR session.
+	virtual void on_session_destroyed(); // `on_session_destroyed` is called right before we destroy our OpenXR session.
 
 	// `on_process` is called as part of our OpenXR process handling,
 	// this happens right before physics process and normal processing is run.
 	// This is when controller data is queried and made available to game logic.
-	virtual void on_process() {}
-	virtual void on_pre_render() {} // `on_pre_render` is called right before we start rendering our XR viewports.
-	virtual void on_main_swapchains_created() {} // `on_main_swapchains_created` is called right after our main swapchains are (re)created.
-	virtual void on_pre_draw_viewport(RID p_render_target) {} // `on_pre_draw_viewport` is called right before we start rendering this viewport
-	virtual void on_post_draw_viewport(RID p_render_target) {} // `on_port_draw_viewport` is called right after we start rendering this viewport (note that on Vulkan draw commands may only be queued)
+	virtual void on_process();
+	virtual void on_pre_render(); // `on_pre_render` is called right before we start rendering our XR viewports.
+	virtual void on_main_swapchains_created(); // `on_main_swapchains_created` is called right after our main swapchains are (re)created.
+	virtual void on_pre_draw_viewport(RID p_render_target); // `on_pre_draw_viewport` is called right before we start rendering this viewport
+	virtual void on_post_draw_viewport(RID p_render_target); // `on_port_draw_viewport` is called right after we start rendering this viewport (note that on Vulkan draw commands may only be queued)
 
-	virtual void on_state_idle() {} // `on_state_idle` is called when the OpenXR session state is changed to idle.
-	virtual void on_state_ready() {} // `on_state_ready` is called when the OpenXR session state is changed to ready, this means OpenXR is ready to setup our session.
-	virtual void on_state_synchronized() {} // `on_state_synchronized` is called when the OpenXR session state is changed to synchronized, note that OpenXR also returns to this state when our application looses focus.
-	virtual void on_state_visible() {} // `on_state_visible` is called when the OpenXR session state is changed to visible, OpenXR is now ready to receive frames.
-	virtual void on_state_focused() {} // `on_state_focused` is called when the OpenXR session state is changed to focused, this state is the active state when our game runs.
-	virtual void on_state_stopping() {} // `on_state_stopping` is called when the OpenXR session state is changed to stopping.
-	virtual void on_state_loss_pending() {} // `on_state_loss_pending` is called when the OpenXR session state is changed to loss pending.
-	virtual void on_state_exiting() {} // `on_state_exiting` is called when the OpenXR session state is changed to exiting.
+	GDVIRTUAL0(_on_register_metadata);
+	GDVIRTUAL0(_on_before_instance_created);
+	GDVIRTUAL1(_on_instance_created, uint64_t);
+	GDVIRTUAL0(_on_instance_destroyed);
+	GDVIRTUAL1(_on_session_created, uint64_t);
+	GDVIRTUAL0(_on_process);
+	GDVIRTUAL0(_on_pre_render);
+	GDVIRTUAL0(_on_main_swapchains_created);
+	GDVIRTUAL0(_on_session_destroyed);
+	GDVIRTUAL1(_on_pre_draw_viewport, RID);
+	GDVIRTUAL1(_on_post_draw_viewport, RID);
 
-	virtual void *set_viewport_composition_layer_and_get_next_pointer(const XrCompositionLayerBaseHeader *p_layer, const Dictionary &p_property_values, void *p_next_pointer) { return p_next_pointer; } // Add additional data structures to composition layers created via OpenXRCompositionLayer.
-	virtual void on_viewport_composition_layer_destroyed(const XrCompositionLayerBaseHeader *p_layer) {} // `on_viewport_composition_layer_destroyed` is called when a composition layer created via OpenXRCompositionLayer is destroyed.
-	virtual void get_viewport_composition_layer_extension_properties(List<PropertyInfo> *p_property_list) {} // Get additional property definitions for OpenXRCompositionLayer.
-	virtual Dictionary get_viewport_composition_layer_extension_property_defaults() { return Dictionary(); } // Get the default values for the additional property definitions for OpenXRCompositionLayer.
-	virtual void *set_android_surface_swapchain_create_info_and_get_next_pointer(const Dictionary &p_property_values, void *p_next_pointer) { return p_next_pointer; }
+	virtual void on_state_idle(); // `on_state_idle` is called when the OpenXR session state is changed to idle.
+	virtual void on_state_ready(); // `on_state_ready` is called when the OpenXR session state is changed to ready, this means OpenXR is ready to setup our session.
+	virtual void on_state_synchronized(); // `on_state_synchronized` is called when the OpenXR session state is changed to synchronized, note that OpenXR also returns to this state when our application looses focus.
+	virtual void on_state_visible(); // `on_state_visible` is called when the OpenXR session state is changed to visible, OpenXR is now ready to receive frames.
+	virtual void on_state_focused(); // `on_state_focused` is called when the OpenXR session state is changed to focused, this state is the active state when our game runs.
+	virtual void on_state_stopping(); // `on_state_stopping` is called when the OpenXR session state is changed to stopping.
+	virtual void on_state_loss_pending(); // `on_state_loss_pending` is called when the OpenXR session state is changed to loss pending.
+	virtual void on_state_exiting(); // `on_state_exiting` is called when the OpenXR session state is changed to exiting.
+
+	GDVIRTUAL0(_on_state_idle);
+	GDVIRTUAL0(_on_state_ready);
+	GDVIRTUAL0(_on_state_synchronized);
+	GDVIRTUAL0(_on_state_visible);
+	GDVIRTUAL0(_on_state_focused);
+	GDVIRTUAL0(_on_state_stopping);
+	GDVIRTUAL0(_on_state_loss_pending);
+	GDVIRTUAL0(_on_state_exiting);
+
+	// These will only be called on extensions registered via OpenXRAPI::register_composition_layer_provider().
+	virtual int get_composition_layer_count();
+	virtual XrCompositionLayerBaseHeader *get_composition_layer(int p_index);
+	virtual int get_composition_layer_order(int p_index);
+
+	virtual void *set_viewport_composition_layer_and_get_next_pointer(const XrCompositionLayerBaseHeader *p_layer, const Dictionary &p_property_values, void *p_next_pointer); // Add additional data structures to composition layers created via OpenXRCompositionLayer.
+	virtual void on_viewport_composition_layer_destroyed(const XrCompositionLayerBaseHeader *p_layer); // `on_viewport_composition_layer_destroyed` is called when a composition layer created via OpenXRCompositionLayer is destroyed.
+	virtual void get_viewport_composition_layer_extension_properties(List<PropertyInfo> *p_property_list); // Get additional property definitions for OpenXRCompositionLayer.
+	virtual Dictionary get_viewport_composition_layer_extension_property_defaults(); // Get the default values for the additional property definitions for OpenXRCompositionLayer.
+	virtual void *set_android_surface_swapchain_create_info_and_get_next_pointer(const Dictionary &p_property_values, void *p_next_pointer);
+
+	GDVIRTUAL3R(uint64_t, _set_viewport_composition_layer_and_get_next_pointer, GDExtensionConstPtr<void>, Dictionary, GDExtensionPtr<void>);
+	GDVIRTUAL1(_on_viewport_composition_layer_destroyed, GDExtensionConstPtr<void>);
+	GDVIRTUAL0R(TypedArray<Dictionary>, _get_viewport_composition_layer_extension_properties);
+	GDVIRTUAL0R(Dictionary, _get_viewport_composition_layer_extension_property_defaults);
+	GDVIRTUAL2R(uint64_t, _set_android_surface_swapchain_create_info_and_get_next_pointer, Dictionary, GDExtensionPtr<void>);
 
 	// `on_event_polled` is called when there is an OpenXR event to process.
 	// Should return true if the event was handled, false otherwise.
-	virtual bool on_event_polled(const XrEventDataBuffer &event) {
-		return false;
-	}
+	virtual bool on_event_polled(const XrEventDataBuffer &event);
+
+	GDVIRTUAL1R(bool, _on_event_polled, GDExtensionConstPtr<void>);
 
 	OpenXRExtensionWrapper() = default;
 	virtual ~OpenXRExtensionWrapper() = default;
@@ -125,5 +193,3 @@ public:
 	virtual bool create_projection_fov(const XrFovf p_fov, double p_z_near, double p_z_far, Projection &r_camera_matrix) = 0; // `create_projection_fov` creates a proper projection matrix based on asymmetric FOV data provided by OpenXR.
 	virtual RID get_texture(void *p_swapchain_graphics_data, int p_image_index) = 0; // `get_texture` returns a Godot texture RID for the current active texture in our swapchain.
 };
-
-#endif // OPENXR_EXTENSION_WRAPPER_H
diff --git a/engine/modules/openxr/extensions/openxr_extension_wrapper_extension.h b/engine/modules/openxr/extensions/openxr_extension_wrapper_extension.h
index f9b4c36f..40135c73 100644
--- a/engine/modules/openxr/extensions/openxr_extension_wrapper_extension.h
+++ b/engine/modules/openxr/extensions/openxr_extension_wrapper_extension.h
@@ -28,122 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_EXTENSION_WRAPPER_EXTENSION_H
-#define OPENXR_EXTENSION_WRAPPER_EXTENSION_H
+#pragma once
 
-#include "../openxr_api_extension.h"
 #include "openxr_extension_wrapper.h"
 
-#include "core/object/ref_counted.h"
-#include "core/os/thread_safe.h"
-#include "core/variant/native_ptr.h"
-#include "core/variant/typed_array.h"
-
-class OpenXRExtensionWrapperExtension : public Object, public OpenXRExtensionWrapper, public OpenXRCompositionLayerProvider {
-	GDCLASS(OpenXRExtensionWrapperExtension, Object);
-
-protected:
-	_THREAD_SAFE_CLASS_
-
-	static void _bind_methods();
-
-	Ref<OpenXRAPIExtension> openxr_api;
-
-public:
-	virtual HashMap<String, bool *> get_requested_extensions() override;
-
-	GDVIRTUAL0R(Dictionary, _get_requested_extensions);
-
-	virtual void *set_system_properties_and_get_next_pointer(void *p_next_pointer) override;
-	virtual void *set_instance_create_info_and_get_next_pointer(void *p_next_pointer) override;
-	virtual void *set_session_create_and_get_next_pointer(void *p_next_pointer) override;
-	virtual void *set_swapchain_create_info_and_get_next_pointer(void *p_next_pointer) override;
-	virtual void *set_hand_joint_locations_and_get_next_pointer(int p_hand_index, void *p_next_pointer) override;
-	virtual void *set_projection_views_and_get_next_pointer(int p_view_index, void *p_next_pointer) override;
-
-	virtual int get_composition_layer_count() override;
-	virtual XrCompositionLayerBaseHeader *get_composition_layer(int p_index) override;
-	virtual int get_composition_layer_order(int p_index) override;
-
-	//TODO workaround as GDExtensionPtr<void> return type results in build error in godot-cpp
-	GDVIRTUAL1R(uint64_t, _set_system_properties_and_get_next_pointer, GDExtensionPtr<void>);
-	GDVIRTUAL1R(uint64_t, _set_instance_create_info_and_get_next_pointer, GDExtensionPtr<void>);
-	GDVIRTUAL1R(uint64_t, _set_session_create_and_get_next_pointer, GDExtensionPtr<void>);
-	GDVIRTUAL1R(uint64_t, _set_swapchain_create_info_and_get_next_pointer, GDExtensionPtr<void>);
-	GDVIRTUAL2R(uint64_t, _set_hand_joint_locations_and_get_next_pointer, int, GDExtensionPtr<void>);
-	GDVIRTUAL2R(uint64_t, _set_projection_views_and_get_next_pointer, int, GDExtensionPtr<void>);
-	GDVIRTUAL0R(int, _get_composition_layer_count);
-	GDVIRTUAL1R(uint64_t, _get_composition_layer, int);
-	GDVIRTUAL1R(int, _get_composition_layer_order, int);
-
-	virtual PackedStringArray get_suggested_tracker_names() override;
-
-	GDVIRTUAL0R(PackedStringArray, _get_suggested_tracker_names);
-
-	virtual void on_register_metadata() override;
-	virtual void on_before_instance_created() override;
-	virtual void on_instance_created(const XrInstance p_instance) override;
-	virtual void on_instance_destroyed() override;
-	virtual void on_session_created(const XrSession p_session) override;
-	virtual void on_process() override;
-	virtual void on_pre_render() override;
-	virtual void on_main_swapchains_created() override;
-	virtual void on_session_destroyed() override;
-	virtual void on_pre_draw_viewport(RID p_render_target) override;
-	virtual void on_post_draw_viewport(RID p_render_target) override;
-
-	GDVIRTUAL0(_on_register_metadata);
-	GDVIRTUAL0(_on_before_instance_created);
-	GDVIRTUAL1(_on_instance_created, uint64_t);
-	GDVIRTUAL0(_on_instance_destroyed);
-	GDVIRTUAL1(_on_session_created, uint64_t);
-	GDVIRTUAL0(_on_process);
-	GDVIRTUAL0(_on_pre_render);
-	GDVIRTUAL0(_on_main_swapchains_created);
-	GDVIRTUAL0(_on_session_destroyed);
-	GDVIRTUAL1(_on_pre_draw_viewport, RID);
-	GDVIRTUAL1(_on_post_draw_viewport, RID);
-
-	virtual void on_state_idle() override;
-	virtual void on_state_ready() override;
-	virtual void on_state_synchronized() override;
-	virtual void on_state_visible() override;
-	virtual void on_state_focused() override;
-	virtual void on_state_stopping() override;
-	virtual void on_state_loss_pending() override;
-	virtual void on_state_exiting() override;
-
-	GDVIRTUAL0(_on_state_idle);
-	GDVIRTUAL0(_on_state_ready);
-	GDVIRTUAL0(_on_state_synchronized);
-	GDVIRTUAL0(_on_state_visible);
-	GDVIRTUAL0(_on_state_focused);
-	GDVIRTUAL0(_on_state_stopping);
-	GDVIRTUAL0(_on_state_loss_pending);
-	GDVIRTUAL0(_on_state_exiting);
-
-	virtual bool on_event_polled(const XrEventDataBuffer &p_event) override;
-
-	GDVIRTUAL1R(bool, _on_event_polled, GDExtensionConstPtr<void>);
-
-	virtual void *set_viewport_composition_layer_and_get_next_pointer(const XrCompositionLayerBaseHeader *p_layer, const Dictionary &p_property_values, void *p_next_pointer) override;
-	virtual void on_viewport_composition_layer_destroyed(const XrCompositionLayerBaseHeader *p_layer) override;
-	virtual void get_viewport_composition_layer_extension_properties(List<PropertyInfo> *p_property_list) override;
-	virtual Dictionary get_viewport_composition_layer_extension_property_defaults() override;
-	virtual void *set_android_surface_swapchain_create_info_and_get_next_pointer(const Dictionary &p_property_values, void *p_next_pointer) override;
-
-	GDVIRTUAL3R(uint64_t, _set_viewport_composition_layer_and_get_next_pointer, GDExtensionConstPtr<void>, Dictionary, GDExtensionPtr<void>);
-	GDVIRTUAL1(_on_viewport_composition_layer_destroyed, GDExtensionConstPtr<void>);
-	GDVIRTUAL0R(TypedArray<Dictionary>, _get_viewport_composition_layer_extension_properties);
-	GDVIRTUAL0R(Dictionary, _get_viewport_composition_layer_extension_property_defaults);
-	GDVIRTUAL2R(uint64_t, _set_android_surface_swapchain_create_info_and_get_next_pointer, Dictionary, GDExtensionPtr<void>);
-
-	Ref<OpenXRAPIExtension> get_openxr_api();
-
-	void register_extension_wrapper();
-
-	OpenXRExtensionWrapperExtension();
-	virtual ~OpenXRExtensionWrapperExtension() override;
+class OpenXRExtensionWrapperExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRExtensionWrapperExtension, OpenXRExtensionWrapper);
 };
-
-#endif // OPENXR_EXTENSION_WRAPPER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp b/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp
index eea996ed..d86c0e47 100644
--- a/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp
+++ b/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.cpp
@@ -97,15 +97,15 @@ bool OpenXREyeGazeInteractionExtension::supports_eye_gaze_interaction() {
 }
 
 void OpenXREyeGazeInteractionExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	// Eyes top path
-	metadata->register_top_level_path("Eye gaze tracker", "/user/eyes_ext", XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Eye gaze tracker", "/user/eyes_ext", XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME);
 
 	// Eye gaze interaction
-	metadata->register_interaction_profile("Eye gaze", "/interaction_profiles/ext/eye_gaze_interaction", XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME);
-	metadata->register_io_path("/interaction_profiles/ext/eye_gaze_interaction", "Gaze pose", "/user/eyes_ext", "/user/eyes_ext/input/gaze_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_interaction_profile("Eye gaze", "/interaction_profiles/ext/eye_gaze_interaction", XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/eye_gaze_interaction", "Gaze pose", "/user/eyes_ext", "/user/eyes_ext/input/gaze_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
 }
 
 bool OpenXREyeGazeInteractionExtension::get_eye_gaze_pose(double p_dist, Vector3 &r_eye_pose) {
diff --git a/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.h b/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.h
index 114c1aac..f8a2d43d 100644
--- a/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.h
+++ b/engine/modules/openxr/extensions/openxr_eye_gaze_interaction.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_EYE_GAZE_INTERACTION_H
-#define OPENXR_EYE_GAZE_INTERACTION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXREyeGazeInteractionExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXREyeGazeInteractionExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXREyeGazeInteractionExtension *get_singleton();
 
@@ -62,5 +66,3 @@ private:
 	RID eye_tracker;
 	RID eye_action;
 };
-
-#endif // OPENXR_EYE_GAZE_INTERACTION_H
diff --git a/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h b/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h
index 1048d245..532e353e 100644
--- a/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h
+++ b/engine/modules/openxr/extensions/openxr_fb_display_refresh_rate_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_FB_DISPLAY_REFRESH_RATE_EXTENSION_H
-#define OPENXR_FB_DISPLAY_REFRESH_RATE_EXTENSION_H
+#pragma once
 
 // This extension gives us access to the possible display refresh rates
 // supported by the HMD.
@@ -41,6 +40,11 @@
 #include "openxr_extension_wrapper.h"
 
 class OpenXRDisplayRefreshRateExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRDisplayRefreshRateExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRDisplayRefreshRateExtension *get_singleton();
 
@@ -68,5 +72,3 @@ private:
 	EXT_PROTO_XRRESULT_FUNC2(xrGetDisplayRefreshRateFB, (XrSession), session, (float *), display_refresh_rate);
 	EXT_PROTO_XRRESULT_FUNC2(xrRequestDisplayRefreshRateFB, (XrSession), session, (float), display_refresh_rate);
 };
-
-#endif // OPENXR_FB_DISPLAY_REFRESH_RATE_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h b/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h
index 84bd7011..a40061a6 100644
--- a/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h
+++ b/engine/modules/openxr/extensions/openxr_fb_foveation_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_FB_FOVEATION_EXTENSION_H
-#define OPENXR_FB_FOVEATION_EXTENSION_H
+#pragma once
 
 // This extension implements the FB Foveation extension.
 // This is an extension Meta added due to VRS being unavailable on Android.
@@ -47,6 +46,11 @@
 #include "openxr_fb_update_swapchain_extension.h"
 
 class OpenXRFBFoveationExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRFBFoveationExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRFBFoveationExtension *get_singleton();
 
@@ -100,5 +104,3 @@ private:
 	EXT_PROTO_XRRESULT_FUNC3(xrCreateFoveationProfileFB, (XrSession), session, (const XrFoveationProfileCreateInfoFB *), create_info, (XrFoveationProfileFB *), profile);
 	EXT_PROTO_XRRESULT_FUNC1(xrDestroyFoveationProfileFB, (XrFoveationProfileFB), profile);
 };
-
-#endif // OPENXR_FB_FOVEATION_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp
index c3f69218..a3b31003 100644
--- a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.cpp
@@ -33,6 +33,19 @@
 // Always include this as late as possible.
 #include "../openxr_platform_inc.h"
 
+#ifndef GL_CUBIC_IMG
+#define GL_CUBIC_IMG 0x9139
+#endif
+#ifndef GL_CUBIC_MIPMAP_LINEAR_IMG
+#define GL_CUBIC_MIPMAP_LINEAR_IMG 0x913B
+#endif
+#ifndef GL_CUBIC_MIPMAP_NEAREST_IMG
+#define GL_CUBIC_MIPMAP_NEAREST_IMG 0x913A
+#endif
+#ifndef GL_CLAMP_TO_BORDER
+#define GL_CLAMP_TO_BORDER 0x812D
+#endif
+
 OpenXRFBUpdateSwapchainExtension *OpenXRFBUpdateSwapchainExtension::singleton = nullptr;
 
 OpenXRFBUpdateSwapchainExtension *OpenXRFBUpdateSwapchainExtension::get_singleton() {
@@ -63,6 +76,10 @@ HashMap<String, bool *> OpenXRFBUpdateSwapchainExtension::get_requested_extensio
 #endif
 	}
 
+#ifdef ANDROID_ENABLED
+	request_extensions[XR_FB_SWAPCHAIN_UPDATE_STATE_ANDROID_SURFACE_EXTENSION_NAME] = &fb_swapchain_update_state_android_ext;
+#endif
+
 	return request_extensions;
 }
 
@@ -100,3 +117,231 @@ bool OpenXRFBUpdateSwapchainExtension::is_enabled() const {
 
 	return false;
 }
+
+bool OpenXRFBUpdateSwapchainExtension::is_android_ext_enabled() const {
+	return fb_swapchain_update_state_android_ext;
+}
+
+void OpenXRFBUpdateSwapchainExtension::update_swapchain_state(XrSwapchain p_swapchain, const OpenXRViewportCompositionLayerProvider::SwapchainState *p_swapchain_state) {
+	if (!p_swapchain_state) {
+		return;
+	}
+
+	if (rendering_driver == "vulkan") {
+#ifdef XR_USE_GRAPHICS_API_VULKAN
+		if (!fb_swapchain_update_state_ext || !fb_swapchain_update_state_vulkan_ext) {
+			return;
+		}
+
+		Color border_color = p_swapchain_state->border_color;
+		XrSwapchainStateSamplerVulkanFB swapchain_state = {
+			XR_TYPE_SWAPCHAIN_STATE_SAMPLER_VULKAN_FB, // type
+			nullptr, // next
+			(VkFilter)filter_to_vk(p_swapchain_state->min_filter), // minFilter
+			(VkFilter)filter_to_vk(p_swapchain_state->mag_filter), // magFilter
+			(VkSamplerMipmapMode)mipmap_mode_to_vk(p_swapchain_state->mipmap_mode), // mipmapMode
+			(VkSamplerAddressMode)wrap_to_vk(p_swapchain_state->horizontal_wrap), // wrapModeS;
+			(VkSamplerAddressMode)wrap_to_vk(p_swapchain_state->vertical_wrap), // wrapModeT
+			(VkComponentSwizzle)swizzle_to_vk(p_swapchain_state->red_swizzle), // swizzleRed
+			(VkComponentSwizzle)swizzle_to_vk(p_swapchain_state->green_swizzle), // swizzleGreen
+			(VkComponentSwizzle)swizzle_to_vk(p_swapchain_state->blue_swizzle), // swizzleBlue
+			(VkComponentSwizzle)swizzle_to_vk(p_swapchain_state->alpha_swizzle), // swizzleAlpha
+			p_swapchain_state->max_anisotropy, // maxAnisotropy
+			{ border_color.r, border_color.g, border_color.b, border_color.a } // borderColor
+		};
+
+		XrResult result = xrUpdateSwapchainFB(p_swapchain, (XrSwapchainStateBaseHeaderFB *)&swapchain_state);
+		if (XR_FAILED(result)) {
+			print_error(vformat("OpenXR: Failed to update swapchain [%s]", OpenXRAPI::get_singleton()->get_error_string(result)));
+			return;
+		}
+#endif
+	} else if (rendering_driver == "opengl3") {
+#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+		if (!fb_swapchain_update_state_ext || !fb_swapchain_update_state_opengles_ext) {
+			return;
+		}
+
+		Color border_color = p_swapchain_state->border_color;
+		XrSwapchainStateSamplerOpenGLESFB swapchain_state = {
+			XR_TYPE_SWAPCHAIN_STATE_SAMPLER_OPENGL_ES_FB, // type
+			nullptr, // next
+			filter_to_gl(p_swapchain_state->min_filter, p_swapchain_state->mipmap_mode), // minFilter
+			filter_to_gl(p_swapchain_state->mag_filter), // magFilter
+			wrap_to_gl(p_swapchain_state->horizontal_wrap), // wrapModeS;
+			wrap_to_gl(p_swapchain_state->vertical_wrap), // wrapModeT
+			swizzle_to_gl(p_swapchain_state->red_swizzle), // swizzleRed
+			swizzle_to_gl(p_swapchain_state->green_swizzle), // swizzleGreen
+			swizzle_to_gl(p_swapchain_state->blue_swizzle), // swizzleBlue
+			swizzle_to_gl(p_swapchain_state->alpha_swizzle), // swizzleAlpha
+			p_swapchain_state->max_anisotropy, // maxAnisotropy
+			{ border_color.r, border_color.g, border_color.b, border_color.a } // borderColor
+		};
+
+		XrResult result = xrUpdateSwapchainFB(p_swapchain, (XrSwapchainStateBaseHeaderFB *)&swapchain_state);
+		if (XR_FAILED(result)) {
+			print_error(vformat("OpenXR: Failed to update swapchain [%s]", OpenXRAPI::get_singleton()->get_error_string(result)));
+			return;
+		}
+#endif
+	}
+}
+
+void OpenXRFBUpdateSwapchainExtension::update_swapchain_surface_size(XrSwapchain p_swapchain, const Size2i &p_size) {
+#ifdef ANDROID_ENABLED
+	if (!fb_swapchain_update_state_ext || !fb_swapchain_update_state_android_ext) {
+		return;
+	}
+
+	XrSwapchainStateAndroidSurfaceDimensionsFB swapchain_state = {
+		XR_TYPE_SWAPCHAIN_STATE_ANDROID_SURFACE_DIMENSIONS_FB, // type
+		nullptr, // next
+		(uint32_t)p_size.width, // width
+		(uint32_t)p_size.height // height
+	};
+
+	XrResult result = xrUpdateSwapchainFB(p_swapchain, (XrSwapchainStateBaseHeaderFB *)&swapchain_state);
+	if (XR_FAILED(result)) {
+		print_error(vformat("OpenXR: Failed to update swapchain surface size [%s]", OpenXRAPI::get_singleton()->get_error_string(result)));
+	}
+#endif
+}
+
+uint32_t OpenXRFBUpdateSwapchainExtension::filter_to_gl(OpenXRViewportCompositionLayerProvider::Filter p_filter, OpenXRViewportCompositionLayerProvider::MipmapMode p_mipmap_mode) {
+#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+	switch (p_mipmap_mode) {
+		case OpenXRViewportCompositionLayerProvider::MipmapMode::MIPMAP_MODE_DISABLED:
+			switch (p_filter) {
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_NEAREST:
+					return GL_NEAREST;
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_LINEAR:
+					return GL_LINEAR;
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_CUBIC:
+					return GL_CUBIC_IMG;
+			}
+		case OpenXRViewportCompositionLayerProvider::MipmapMode::MIPMAP_MODE_NEAREST:
+			switch (p_filter) {
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_NEAREST:
+					return GL_NEAREST_MIPMAP_NEAREST;
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_LINEAR:
+					return GL_LINEAR_MIPMAP_NEAREST;
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_CUBIC:
+					return GL_CUBIC_MIPMAP_NEAREST_IMG;
+			}
+		case OpenXRViewportCompositionLayerProvider::MipmapMode::MIPMAP_MODE_LINEAR:
+			switch (p_filter) {
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_NEAREST:
+					return GL_NEAREST_MIPMAP_LINEAR;
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_LINEAR:
+					return GL_LINEAR_MIPMAP_LINEAR;
+				case OpenXRViewportCompositionLayerProvider::Filter::FILTER_CUBIC:
+					return GL_CUBIC_MIPMAP_LINEAR_IMG;
+			}
+	}
+#endif
+	return 0;
+}
+
+uint32_t OpenXRFBUpdateSwapchainExtension::wrap_to_gl(OpenXRViewportCompositionLayerProvider::Wrap p_wrap) {
+#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+	switch (p_wrap) {
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_CLAMP_TO_BORDER:
+			return GL_CLAMP_TO_BORDER;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_CLAMP_TO_EDGE:
+			return GL_CLAMP_TO_EDGE;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_REPEAT:
+			return GL_REPEAT;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_MIRRORED_REPEAT:
+			return GL_MIRRORED_REPEAT;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_MIRROR_CLAMP_TO_EDGE:
+			return GL_CLAMP_TO_EDGE;
+	}
+#endif
+	return 0;
+}
+
+uint32_t OpenXRFBUpdateSwapchainExtension::swizzle_to_gl(OpenXRViewportCompositionLayerProvider::Swizzle p_swizzle) {
+#ifdef XR_USE_GRAPHICS_API_OPENGL_ES
+	switch (p_swizzle) {
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_RED:
+			return GL_RED;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_GREEN:
+			return GL_GREEN;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_BLUE:
+			return GL_BLUE;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_ALPHA:
+			return GL_ALPHA;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_ZERO:
+			return GL_ZERO;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_ONE:
+			return GL_ONE;
+	}
+#endif
+	return 0;
+}
+
+uint32_t OpenXRFBUpdateSwapchainExtension::filter_to_vk(OpenXRViewportCompositionLayerProvider::Filter p_filter) {
+#ifdef XR_USE_GRAPHICS_API_VULKAN
+	switch (p_filter) {
+		case OpenXRViewportCompositionLayerProvider::Filter::FILTER_NEAREST:
+			return VK_FILTER_NEAREST;
+		case OpenXRViewportCompositionLayerProvider::Filter::FILTER_LINEAR:
+			return VK_FILTER_LINEAR;
+		case OpenXRViewportCompositionLayerProvider::Filter::FILTER_CUBIC:
+			return VK_FILTER_CUBIC_EXT;
+	}
+#endif
+	return 0;
+}
+
+uint32_t OpenXRFBUpdateSwapchainExtension::mipmap_mode_to_vk(OpenXRViewportCompositionLayerProvider::MipmapMode p_mipmap_mode) {
+#ifdef XR_USE_GRAPHICS_API_VULKAN
+	switch (p_mipmap_mode) {
+		case OpenXRViewportCompositionLayerProvider::MipmapMode::MIPMAP_MODE_DISABLED:
+			return VK_SAMPLER_MIPMAP_MODE_LINEAR;
+		case OpenXRViewportCompositionLayerProvider::MipmapMode::MIPMAP_MODE_NEAREST:
+			return VK_SAMPLER_MIPMAP_MODE_NEAREST;
+		case OpenXRViewportCompositionLayerProvider::MipmapMode::MIPMAP_MODE_LINEAR:
+			return VK_SAMPLER_MIPMAP_MODE_LINEAR;
+	}
+#endif
+	return 0;
+}
+
+uint32_t OpenXRFBUpdateSwapchainExtension::wrap_to_vk(OpenXRViewportCompositionLayerProvider::Wrap p_wrap) {
+#ifdef XR_USE_GRAPHICS_API_VULKAN
+	switch (p_wrap) {
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_CLAMP_TO_BORDER:
+			return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_CLAMP_TO_EDGE:
+			return VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_REPEAT:
+			return VK_SAMPLER_ADDRESS_MODE_REPEAT;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_MIRRORED_REPEAT:
+			return VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT;
+		case OpenXRViewportCompositionLayerProvider::Wrap::WRAP_MIRROR_CLAMP_TO_EDGE:
+			return VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE;
+	}
+#endif
+	return 0;
+}
+
+uint32_t OpenXRFBUpdateSwapchainExtension::swizzle_to_vk(OpenXRViewportCompositionLayerProvider::Swizzle p_swizzle) {
+#ifdef XR_USE_GRAPHICS_API_VULKAN
+	switch (p_swizzle) {
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_RED:
+			return VK_COMPONENT_SWIZZLE_R;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_GREEN:
+			return VK_COMPONENT_SWIZZLE_G;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_BLUE:
+			return VK_COMPONENT_SWIZZLE_B;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_ALPHA:
+			return VK_COMPONENT_SWIZZLE_A;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_ZERO:
+			return VK_COMPONENT_SWIZZLE_ZERO;
+		case OpenXRViewportCompositionLayerProvider::Swizzle::SWIZZLE_ONE:
+			return VK_COMPONENT_SWIZZLE_ONE;
+	}
+#endif
+	return 0;
+}
diff --git a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h
index a02b550e..5472e853 100644
--- a/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h
+++ b/engine/modules/openxr/extensions/openxr_fb_update_swapchain_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_FB_UPDATE_SWAPCHAIN_EXTENSION_H
-#define OPENXR_FB_UPDATE_SWAPCHAIN_EXTENSION_H
+#pragma once
 
 // This extension implements the FB update swapchain extension.
 // This is an extension Meta added to further configure the swapchain.
@@ -38,9 +37,15 @@
 
 #include "../openxr_api.h"
 #include "../util.h"
+#include "openxr_composition_layer_extension.h"
 #include "openxr_extension_wrapper.h"
 
 class OpenXRFBUpdateSwapchainExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRFBUpdateSwapchainExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 	friend class OpenXRFBFoveationExtension;
 
 public:
@@ -55,6 +60,11 @@ public:
 	virtual void on_instance_destroyed() override;
 
 	bool is_enabled() const;
+	bool is_android_ext_enabled() const;
+
+	void update_swapchain_state(XrSwapchain p_swapchain, const OpenXRViewportCompositionLayerProvider::SwapchainState *p_swapchain_state);
+
+	void update_swapchain_surface_size(XrSwapchain p_swapchain, const Size2i &p_size);
 
 private:
 	static OpenXRFBUpdateSwapchainExtension *singleton;
@@ -64,10 +74,18 @@ private:
 	bool fb_swapchain_update_state_ext = false;
 	bool fb_swapchain_update_state_vulkan_ext = false;
 	bool fb_swapchain_update_state_opengles_ext = false;
+	bool fb_swapchain_update_state_android_ext = false;
+
+	uint32_t filter_to_gl(OpenXRViewportCompositionLayerProvider::Filter p_filter, OpenXRViewportCompositionLayerProvider::MipmapMode p_mipmap_mode = OpenXRViewportCompositionLayerProvider::MipmapMode::MIPMAP_MODE_DISABLED);
+	uint32_t wrap_to_gl(OpenXRViewportCompositionLayerProvider::Wrap p_wrap);
+	uint32_t swizzle_to_gl(OpenXRViewportCompositionLayerProvider::Swizzle p_swizzle);
+
+	uint32_t filter_to_vk(OpenXRViewportCompositionLayerProvider::Filter p_filter);
+	uint32_t mipmap_mode_to_vk(OpenXRViewportCompositionLayerProvider::MipmapMode p_mipmap);
+	uint32_t wrap_to_vk(OpenXRViewportCompositionLayerProvider::Wrap p_wrap);
+	uint32_t swizzle_to_vk(OpenXRViewportCompositionLayerProvider::Swizzle p_swizzle);
 
 	// OpenXR API call wrappers
 	EXT_PROTO_XRRESULT_FUNC2(xrUpdateSwapchainFB, (XrSwapchain), swapchain, (const XrSwapchainStateBaseHeaderFB *), state);
 	EXT_PROTO_XRRESULT_FUNC2(xrGetSwapchainStateFB, (XrSwapchain), swapchain, (XrSwapchainStateBaseHeaderFB *), state);
 };
-
-#endif // OPENXR_FB_UPDATE_SWAPCHAIN_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_future_extension.cpp b/engine/modules/openxr/extensions/openxr_future_extension.cpp
new file mode 100644
index 00000000..33981222
--- /dev/null
+++ b/engine/modules/openxr/extensions/openxr_future_extension.cpp
@@ -0,0 +1,254 @@
+/**************************************************************************/
+/*  openxr_future_extension.cpp                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "openxr_future_extension.h"
+
+#include "../openxr_api.h"
+
+////////////////////////////////////////////////////////////////////////////
+// OpenXRFutureResult
+
+void OpenXRFutureResult::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("get_status"), &OpenXRFutureResult::get_status);
+	ClassDB::bind_method(D_METHOD("get_future"), &OpenXRFutureResult::_get_future);
+	ClassDB::bind_method(D_METHOD("cancel_future"), &OpenXRFutureResult::cancel_future);
+
+	ADD_SIGNAL(MethodInfo("completed", PropertyInfo(Variant::OBJECT, "result", PROPERTY_HINT_RESOURCE_TYPE, "OpenXRFutureResult")));
+
+	BIND_ENUM_CONSTANT(RESULT_RUNNING);
+	BIND_ENUM_CONSTANT(RESULT_FINISHED);
+	BIND_ENUM_CONSTANT(RESULT_CANCELLED);
+}
+
+void OpenXRFutureResult::_mark_as_finished() {
+	// Update our status
+	status = RESULT_FINISHED;
+
+	// Perform our callback
+	on_success_callback.call((uint64_t)future);
+
+	// Emit our signal
+	emit_signal(SNAME("completed"), this);
+}
+
+void OpenXRFutureResult::_mark_as_cancelled() {
+	// Update our status
+	status = RESULT_CANCELLED;
+
+	// There is no point in doing a callback for cancellation as its always user invoked.
+
+	// But we do emit our signal to make sure any await finishes.
+	emit_signal(SNAME("completed"), this);
+}
+
+OpenXRFutureResult::ResultStatus OpenXRFutureResult::get_status() const {
+	return status;
+}
+
+XrFutureEXT OpenXRFutureResult::get_future() const {
+	return future;
+}
+
+uint64_t OpenXRFutureResult::_get_future() const {
+	return (uint64_t)future;
+}
+
+void OpenXRFutureResult::cancel_future() {
+	ERR_FAIL_COND(status != RESULT_RUNNING);
+
+	OpenXRFutureExtension *future_extension = OpenXRFutureExtension::get_singleton();
+	ERR_FAIL_NULL(future_extension);
+
+	future_extension->cancel_future(future);
+}
+
+OpenXRFutureResult::OpenXRFutureResult(XrFutureEXT p_future, const Callable &p_on_success) {
+	future = p_future;
+	on_success_callback = p_on_success;
+}
+
+////////////////////////////////////////////////////////////////////////////
+// OpenXRFutureExtension
+
+OpenXRFutureExtension *OpenXRFutureExtension::singleton = nullptr;
+
+OpenXRFutureExtension *OpenXRFutureExtension::get_singleton() {
+	return singleton;
+}
+
+OpenXRFutureExtension::OpenXRFutureExtension() {
+	singleton = this;
+}
+
+OpenXRFutureExtension::~OpenXRFutureExtension() {
+	singleton = nullptr;
+}
+
+void OpenXRFutureExtension::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("is_active"), &OpenXRFutureExtension::is_active);
+	ClassDB::bind_method(D_METHOD("register_future", "future", "on_success"), &OpenXRFutureExtension::_register_future, DEFVAL(Callable()));
+	ClassDB::bind_method(D_METHOD("cancel_future", "future"), &OpenXRFutureExtension::_cancel_future);
+}
+
+HashMap<String, bool *> OpenXRFutureExtension::get_requested_extensions() {
+	HashMap<String, bool *> request_extensions;
+
+	request_extensions[XR_EXT_FUTURE_EXTENSION_NAME] = &future_ext;
+
+	return request_extensions;
+}
+
+void OpenXRFutureExtension::on_instance_created(const XrInstance p_instance) {
+	if (future_ext) {
+		EXT_INIT_XR_FUNC(xrPollFutureEXT);
+		EXT_INIT_XR_FUNC(xrCancelFutureEXT);
+
+		future_ext = xrPollFutureEXT_ptr && xrCancelFutureEXT_ptr;
+	}
+}
+
+void OpenXRFutureExtension::on_instance_destroyed() {
+	xrPollFutureEXT_ptr = nullptr;
+	xrCancelFutureEXT_ptr = nullptr;
+}
+
+void OpenXRFutureExtension::on_session_destroyed() {
+	if (!is_active()) {
+		return;
+	}
+
+	OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
+	ERR_FAIL_NULL(openxr_api);
+
+	// Cancel any running futures.
+	for (const KeyValue<XrFutureEXT, Ref<OpenXRFutureResult>> &element : futures) {
+		XrFutureCancelInfoEXT cancel_info = {
+			XR_TYPE_FUTURE_CANCEL_INFO_EXT, // type
+			nullptr, // next
+			element.key // future
+		};
+		XrResult result = xrCancelFutureEXT_ptr(openxr_api->get_instance(), &cancel_info);
+		if (XR_FAILED(result)) {
+			WARN_PRINT("OpenXR: Failed to cancel future [" + openxr_api->get_error_string(result) + "]");
+		}
+
+		// Make sure we mark our future result as cancelled
+		element.value->_mark_as_cancelled();
+	}
+	futures.clear();
+}
+
+bool OpenXRFutureExtension::is_active() const {
+	return future_ext;
+}
+
+Ref<OpenXRFutureResult> OpenXRFutureExtension::register_future(XrFutureEXT p_future, const Callable &p_on_success) {
+	ERR_FAIL_COND_V(futures.has(p_future), nullptr);
+
+	Ref<OpenXRFutureResult> future_result;
+	future_result.instantiate(p_future, p_on_success);
+
+	futures[p_future] = future_result;
+
+	return future_result;
+}
+
+Ref<OpenXRFutureResult> OpenXRFutureExtension::_register_future(uint64_t p_future, const Callable &p_on_success) {
+	return register_future((XrFutureEXT)p_future, p_on_success);
+}
+
+void OpenXRFutureExtension::cancel_future(XrFutureEXT p_future) {
+	ERR_FAIL_COND(!futures.has(p_future));
+
+	OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
+	ERR_FAIL_NULL(openxr_api);
+
+	XrFutureCancelInfoEXT cancel_info = {
+		XR_TYPE_FUTURE_CANCEL_INFO_EXT, // type
+		nullptr, // next
+		p_future // future
+	};
+	XrResult result = xrCancelFutureEXT_ptr(openxr_api->get_instance(), &cancel_info);
+	if (XR_FAILED(result)) {
+		WARN_PRINT("OpenXR: Failed to cancel future [" + openxr_api->get_error_string(result) + "]");
+	}
+
+	// Make sure we mark our future result as cancelled
+	futures[p_future]->_mark_as_cancelled();
+
+	// And erase it from the futures we track
+	futures.erase(p_future);
+}
+
+void OpenXRFutureExtension::_cancel_future(uint64_t p_future) {
+	cancel_future((XrFutureEXT)p_future);
+}
+
+void OpenXRFutureExtension::on_process() {
+	if (!is_active()) {
+		return;
+	}
+
+	OpenXRAPI *openxr_api = OpenXRAPI::get_singleton();
+	ERR_FAIL_NULL(openxr_api);
+
+	// Process futures
+	Vector<XrFutureEXT> completed;
+	for (const KeyValue<XrFutureEXT, Ref<OpenXRFutureResult>> &element : futures) {
+		XrFuturePollInfoEXT poll_info = {
+			XR_TYPE_FUTURE_POLL_INFO_EXT, // type
+			nullptr, // next
+			element.key // future
+		};
+		XrFuturePollResultEXT poll_result = {
+			XR_TYPE_FUTURE_POLL_RESULT_EXT, // type
+			nullptr, // next
+			XR_FUTURE_STATE_MAX_ENUM_EXT // state
+		};
+		XrResult result = xrPollFutureEXT_ptr(openxr_api->get_instance(), &poll_info, &poll_result);
+		if (XR_FAILED(result)) {
+			ERR_PRINT("OpenXR: Failed to obtain future status [" + openxr_api->get_error_string(result) + "]");
+			// Maybe remove this depending on the error?
+			continue;
+		}
+		if (poll_result.state == XR_FUTURE_STATE_READY_EXT) {
+			// Mark our future result as finished (this will invoke our callback).
+			element.value->_mark_as_finished();
+
+			// Queue removing this
+			completed.push_back(element.key);
+		}
+	}
+
+	// Now clean up completed futures.
+	for (const XrFutureEXT &future : completed) {
+		futures.erase(future);
+	}
+}
diff --git a/engine/modules/openxr/extensions/openxr_future_extension.h b/engine/modules/openxr/extensions/openxr_future_extension.h
new file mode 100644
index 00000000..cca5b0af
--- /dev/null
+++ b/engine/modules/openxr/extensions/openxr_future_extension.h
@@ -0,0 +1,132 @@
+/**************************************************************************/
+/*  openxr_future_extension.h                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+/*
+	The OpenXR future extension forms the basis of OpenXRs ability to
+	execute logic asynchronously.
+
+	Asynchronous functions will return a future object which can be
+	polled each frame to determine if the asynchronous function has
+	been completed.
+
+	If so the future can be used to obtain final return values.
+	The API call for this is often part of the extension that utilizes
+	the future.
+
+	We will be using Godot Callables to drive responses on futures.
+*/
+
+#include "../util.h"
+#include "core/object/ref_counted.h"
+#include "openxr_extension_wrapper.h"
+
+#include <openxr/openxr.h>
+
+class OpenXRFutureExtension;
+
+class OpenXRFutureResult : public RefCounted {
+	GDCLASS(OpenXRFutureResult, RefCounted);
+
+	friend class OpenXRFutureExtension;
+
+protected:
+	static void _bind_methods();
+
+	void _mark_as_finished();
+	void _mark_as_cancelled();
+
+public:
+	enum ResultStatus {
+		RESULT_RUNNING,
+		RESULT_FINISHED,
+		RESULT_CANCELLED,
+	};
+
+	ResultStatus get_status() const;
+	XrFutureEXT get_future() const;
+
+	void cancel_future();
+
+	OpenXRFutureResult(XrFutureEXT p_future, const Callable &p_on_success);
+
+private:
+	ResultStatus status = RESULT_RUNNING;
+	XrFutureEXT future;
+	Callable on_success_callback;
+
+	uint64_t _get_future() const;
+};
+
+VARIANT_ENUM_CAST(OpenXRFutureResult::ResultStatus);
+
+class OpenXRFutureExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRFutureExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods();
+
+public:
+	static OpenXRFutureExtension *get_singleton();
+
+	OpenXRFutureExtension();
+	virtual ~OpenXRFutureExtension() override;
+
+	virtual HashMap<String, bool *> get_requested_extensions() override;
+
+	virtual void on_instance_created(const XrInstance p_instance) override;
+	virtual void on_instance_destroyed() override;
+	virtual void on_session_destroyed() override;
+
+	virtual void on_process() override;
+
+	bool is_active() const;
+
+	Ref<OpenXRFutureResult> register_future(XrFutureEXT p_future, const Callable &p_on_success = Callable());
+	void cancel_future(XrFutureEXT p_future);
+
+private:
+	static OpenXRFutureExtension *singleton;
+
+	bool future_ext = false;
+
+	HashMap<XrFutureEXT, Ref<OpenXRFutureResult>> futures;
+
+	// Make these accessible from GDExtension and/or GDScript
+	Ref<OpenXRFutureResult> _register_future(uint64_t p_future, const Callable &p_on_success = Callable());
+	void _cancel_future(uint64_t p_future);
+
+	// OpenXR API call wrappers
+
+	// Futures
+	EXT_PROTO_XRRESULT_FUNC3(xrPollFutureEXT, (XrInstance), instance, (const XrFuturePollInfoEXT *), poll_info, (XrFuturePollResultEXT *), poll_result);
+	EXT_PROTO_XRRESULT_FUNC2(xrCancelFutureEXT, (XrInstance), instance, (const XrFutureCancelInfoEXT *), cancel_info);
+};
diff --git a/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp b/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp
index 65de4b23..c72ed426 100644
--- a/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_hand_interaction_extension.cpp
@@ -64,34 +64,34 @@ bool OpenXRHandInteractionExtension::is_available() {
 }
 
 void OpenXRHandInteractionExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	// Hand interaction profile
-	metadata->register_interaction_profile("Hand interaction", "/interaction_profiles/ext/hand_interaction_ext", XR_EXT_HAND_INTERACTION_EXTENSION_NAME);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grip pose", "/user/hand/left", "/user/hand/left/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grip pose", "/user/hand/right", "/user/hand/right/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim pose", "/user/hand/left", "/user/hand/left/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim pose", "/user/hand/right", "/user/hand/right/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch pose", "/user/hand/left", "/user/hand/left/input/pinch_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch pose", "/user/hand/right", "/user/hand/right/input/pinch_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Poke pose", "/user/hand/left", "/user/hand/left/input/poke_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Poke pose", "/user/hand/right", "/user/hand/right/input/poke_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Palm pose", "/user/hand/left", "/user/hand/left/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Palm pose", "/user/hand/right", "/user/hand/right/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_interaction_profile("Hand interaction", "/interaction_profiles/ext/hand_interaction_ext", XR_EXT_HAND_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grip pose", "/user/hand/left", "/user/hand/left/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grip pose", "/user/hand/right", "/user/hand/right/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim pose", "/user/hand/left", "/user/hand/left/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim pose", "/user/hand/right", "/user/hand/right/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch pose", "/user/hand/left", "/user/hand/left/input/pinch_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch pose", "/user/hand/right", "/user/hand/right/input/pinch_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Poke pose", "/user/hand/left", "/user/hand/left/input/poke_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Poke pose", "/user/hand/right", "/user/hand/right/input/poke_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Palm pose", "/user/hand/left", "/user/hand/left/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Palm pose", "/user/hand/right", "/user/hand/right/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch", "/user/hand/left", "/user/hand/left/input/pinch_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch", "/user/hand/right", "/user/hand/right/input/pinch_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch ready", "/user/hand/left", "/user/hand/left/input/pinch_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch ready", "/user/hand/right", "/user/hand/right/input/pinch_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch", "/user/hand/left", "/user/hand/left/input/pinch_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch", "/user/hand/right", "/user/hand/right/input/pinch_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch ready", "/user/hand/left", "/user/hand/left/input/pinch_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Pinch ready", "/user/hand/right", "/user/hand/right/input/pinch_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate", "/user/hand/left", "/user/hand/left/input/aim_activate_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate", "/user/hand/right", "/user/hand/right/input/aim_activate_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate ready", "/user/hand/left", "/user/hand/left/input/aim_activate_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate ready", "/user/hand/right", "/user/hand/right/input/aim_activate_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate", "/user/hand/left", "/user/hand/left/input/aim_activate_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate", "/user/hand/right", "/user/hand/right/input/aim_activate_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate ready", "/user/hand/left", "/user/hand/left/input/aim_activate_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Aim activate ready", "/user/hand/right", "/user/hand/right/input/aim_activate_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp", "/user/hand/left", "/user/hand/left/input/grasp_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp", "/user/hand/right", "/user/hand/right/input/grasp_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp ready", "/user/hand/left", "/user/hand/left/input/grasp_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp ready", "/user/hand/right", "/user/hand/right/input/grasp_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp", "/user/hand/left", "/user/hand/left/input/grasp_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp", "/user/hand/right", "/user/hand/right/input/grasp_ext/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp ready", "/user/hand/left", "/user/hand/left/input/grasp_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/ext/hand_interaction_ext", "Grasp ready", "/user/hand/right", "/user/hand/right/input/grasp_ext/ready_ext", "", OpenXRAction::OPENXR_ACTION_BOOL);
 }
diff --git a/engine/modules/openxr/extensions/openxr_hand_interaction_extension.h b/engine/modules/openxr/extensions/openxr_hand_interaction_extension.h
index 789e300c..e93ce403 100644
--- a/engine/modules/openxr/extensions/openxr_hand_interaction_extension.h
+++ b/engine/modules/openxr/extensions/openxr_hand_interaction_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_HAND_INTERACTION_EXTENSION_H
-#define OPENXR_HAND_INTERACTION_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
@@ -51,6 +50,11 @@
 // for more information.
 
 class OpenXRHandInteractionExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRHandInteractionExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRHandInteractionExtension *get_singleton();
 
@@ -68,5 +72,3 @@ private:
 
 	bool available = false;
 };
-
-#endif // OPENXR_HAND_INTERACTION_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_hand_tracking_extension.cpp b/engine/modules/openxr/extensions/openxr_hand_tracking_extension.cpp
index ea64f077..7552a44b 100644
--- a/engine/modules/openxr/extensions/openxr_hand_tracking_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_hand_tracking_extension.cpp
@@ -253,7 +253,7 @@ void OpenXRHandTrackingExtension::on_process() {
 				// SKELETON_RIG_HUMANOID bone adjustment. This rotation performs:
 				// OpenXR Z+ -> Godot Humanoid Y-  (Back along the bone)
 				// OpenXR Y+ -> Godot Humanoid Z- (Out the back of the hand)
-				const Quaternion bone_adjustment(0.0, -Math_SQRT12, Math_SQRT12, 0.0);
+				const Quaternion bone_adjustment(0.0, -Math::SQRT12, Math::SQRT12, 0.0);
 
 				for (int joint = 0; joint < XR_HAND_JOINT_COUNT_EXT; joint++) {
 					const XrHandJointLocationEXT &location = hand_trackers[i].joint_locations[joint];
@@ -263,7 +263,7 @@ void OpenXRHandTrackingExtension::on_process() {
 					Transform3D transform;
 					Vector3 linear_velocity;
 					Vector3 angular_velocity;
-					BitField<XRHandTracker::HandJointFlags> flags;
+					BitField<XRHandTracker::HandJointFlags> flags = {};
 
 					if (location.locationFlags & XR_SPACE_LOCATION_ORIENTATION_VALID_BIT) {
 						if (pose.orientation.x != 0 || pose.orientation.y != 0 || pose.orientation.z != 0 || pose.orientation.w != 0) {
diff --git a/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h b/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h
index 2c34ff7f..9c433f20 100644
--- a/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h
+++ b/engine/modules/openxr/extensions/openxr_hand_tracking_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_HAND_TRACKING_EXTENSION_H
-#define OPENXR_HAND_TRACKING_EXTENSION_H
+#pragma once
 
 #include "../util.h"
 #include "core/math/quaternion.h"
@@ -37,6 +36,11 @@
 #include "servers/xr/xr_hand_tracker.h"
 
 class OpenXRHandTrackingExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRHandTrackingExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	enum HandTrackedHands {
 		OPENXR_TRACKED_LEFT_HAND,
@@ -122,5 +126,3 @@ private:
 	EXT_PROTO_XRRESULT_FUNC1(xrDestroyHandTrackerEXT, (XrHandTrackerEXT), p_handTracker)
 	EXT_PROTO_XRRESULT_FUNC3(xrLocateHandJointsEXT, (XrHandTrackerEXT), p_handTracker, (const XrHandJointsLocateInfoEXT *), p_locateInfo, (XrHandJointLocationsEXT *), p_locations)
 };
-
-#endif // OPENXR_HAND_TRACKING_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_htc_controller_extension.cpp b/engine/modules/openxr/extensions/openxr_htc_controller_extension.cpp
index 36894cb0..58c1a106 100644
--- a/engine/modules/openxr/extensions/openxr_htc_controller_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_htc_controller_extension.cpp
@@ -55,94 +55,94 @@ bool OpenXRHTCControllerExtension::is_available(HTCControllers p_type) {
 }
 
 void OpenXRHTCControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
-	metadata->register_top_level_path("HTC left hand tracker", "/user/hand_htc/left", XR_HTC_HAND_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("HTC right hand tracker", "/user/hand_htc/right", XR_HTC_HAND_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("HTC left hand tracker", "/user/hand_htc/left", XR_HTC_HAND_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("HTC right hand tracker", "/user/hand_htc/right", XR_HTC_HAND_INTERACTION_EXTENSION_NAME);
 
 	{ // HTC Vive Cosmos controller
 		const String profile_path = "/interaction_profiles/htc/vive_cosmos_controller";
-		metadata->register_interaction_profile("Vive Cosmos controller", profile_path, XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("Vive Cosmos controller", profile_path, XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Shoulder click", user_path, user_path + "/input/shoulder/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Shoulder click", user_path, user_path + "/input/shoulder/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 
-		metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-		metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 	}
 
 	{ // HTC Vive Focus 3 controller
 		const String profile_path = "/interaction_profiles/htc/vive_focus3_controller";
-		metadata->register_interaction_profile("Vive Focus 3 controller", profile_path, XR_HTC_VIVE_FOCUS3_CONTROLLER_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("Vive Focus 3 controller", profile_path, XR_HTC_VIVE_FOCUS3_CONTROLLER_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Squeeze touch", user_path, user_path + "/input/squeeze/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Squeeze touch", user_path, user_path + "/input/squeeze/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbrest touch", user_path, user_path + "/input/thumbrest/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbrest touch", user_path, user_path + "/input/thumbrest/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 
-		metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-		metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 	}
 
 	{ // HTC Hand interaction profile
 		const String profile_path = "/interaction_profiles/htc/hand_interaction";
-		metadata->register_interaction_profile("HTC Hand interaction", profile_path, XR_HTC_HAND_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("HTC Hand interaction", profile_path, XR_HTC_HAND_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand_htc/left", "/user/hand_htc/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Select (pinch)", user_path, user_path + "/input/select/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Select (pinch)", user_path, user_path + "/input/select/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Squeeze (grab)", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Squeeze (grab)", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 		}
 	}
 }
diff --git a/engine/modules/openxr/extensions/openxr_htc_controller_extension.h b/engine/modules/openxr/extensions/openxr_htc_controller_extension.h
index 6f2b2cee..13c9d2ac 100644
--- a/engine/modules/openxr/extensions/openxr_htc_controller_extension.h
+++ b/engine/modules/openxr/extensions/openxr_htc_controller_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_HTC_CONTROLLER_EXTENSION_H
-#define OPENXR_HTC_CONTROLLER_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRHTCControllerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRHTCControllerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	enum HTCControllers {
 		// Note, HTC Vive Wand controllers are part of the core spec and not part of our extension.
@@ -54,5 +58,3 @@ public:
 private:
 	bool available[HTC_MAX_CONTROLLERS] = { false, false };
 };
-
-#endif // OPENXR_HTC_CONTROLLER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp b/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
index 20c07cd2..3dc20df9 100644
--- a/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.cpp
@@ -66,28 +66,28 @@ bool OpenXRHTCViveTrackerExtension::is_available() {
 }
 
 void OpenXRHTCViveTrackerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	// register_top_level_path("Handheld object tracker", "/user/vive_tracker_htcx/role/handheld_object", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Left foot tracker", "/user/vive_tracker_htcx/role/left_foot", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Right foot tracker", "/user/vive_tracker_htcx/role/right_foot", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Left shoulder tracker", "/user/vive_tracker_htcx/role/left_shoulder", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Right shoulder tracker", "/user/vive_tracker_htcx/role/right_shoulder", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Left elbow tracker", "/user/vive_tracker_htcx/role/left_elbow", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Right elbow tracker", "/user/vive_tracker_htcx/role/right_elbow", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Left knee tracker", "/user/vive_tracker_htcx/role/left_knee", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Right knee tracker", "/user/vive_tracker_htcx/role/right_knee", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Waist tracker", "/user/vive_tracker_htcx/role/waist", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Chest tracker", "/user/vive_tracker_htcx/role/chest", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Camera tracker", "/user/vive_tracker_htcx/role/camera", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
-	metadata->register_top_level_path("Keyboard tracker", "/user/vive_tracker_htcx/role/keyboard", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Left foot tracker", "/user/vive_tracker_htcx/role/left_foot", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Right foot tracker", "/user/vive_tracker_htcx/role/right_foot", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Left shoulder tracker", "/user/vive_tracker_htcx/role/left_shoulder", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Right shoulder tracker", "/user/vive_tracker_htcx/role/right_shoulder", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Left elbow tracker", "/user/vive_tracker_htcx/role/left_elbow", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Right elbow tracker", "/user/vive_tracker_htcx/role/right_elbow", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Left knee tracker", "/user/vive_tracker_htcx/role/left_knee", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Right knee tracker", "/user/vive_tracker_htcx/role/right_knee", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Waist tracker", "/user/vive_tracker_htcx/role/waist", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Chest tracker", "/user/vive_tracker_htcx/role/chest", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Camera tracker", "/user/vive_tracker_htcx/role/camera", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_top_level_path("Keyboard tracker", "/user/vive_tracker_htcx/role/keyboard", XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
 
 	{ // HTC Vive tracker
 		// Interestingly enough trackers don't have buttons or inputs, yet these are defined in the spec.
 		// I think this can be supported through attachments on the trackers.
 		const String profile_path = "/interaction_profiles/htc/vive_tracker_htcx";
-		metadata->register_interaction_profile("HTC Vive tracker", profile_path, XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("HTC Vive tracker", profile_path, XR_HTCX_VIVE_TRACKER_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : {
 					 /* "/user/vive_tracker_htcx/role/handheld_object", */
 					 "/user/vive_tracker_htcx/role/left_foot",
@@ -103,23 +103,23 @@ void OpenXRHTCViveTrackerExtension::on_register_metadata() {
 					 "/user/vive_tracker_htcx/role/camera",
 					 "/user/vive_tracker_htcx/role/keyboard",
 			 }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trackpad", user_path, user_path + "/input/trackpad", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad", user_path, user_path + "/input/trackpad", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 	}
 }
diff --git a/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h b/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h
index e9c3d338..a6f766da 100644
--- a/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h
+++ b/engine/modules/openxr/extensions/openxr_htc_vive_tracker_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_HTC_VIVE_TRACKER_EXTENSION_H
-#define OPENXR_HTC_VIVE_TRACKER_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRHTCViveTrackerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRHTCViveTrackerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	virtual HashMap<String, bool *> get_requested_extensions() override;
 
@@ -47,5 +51,3 @@ public:
 private:
 	bool available = false;
 };
-
-#endif // OPENXR_HTC_VIVE_TRACKER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_huawei_controller_extension.cpp b/engine/modules/openxr/extensions/openxr_huawei_controller_extension.cpp
index 844ce22d..a89fb40f 100644
--- a/engine/modules/openxr/extensions/openxr_huawei_controller_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_huawei_controller_extension.cpp
@@ -45,36 +45,36 @@ bool OpenXRHuaweiControllerExtension::is_available() {
 }
 
 void OpenXRHuaweiControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	{ // Huawei controller
 		const String profile_path = "/interaction_profiles/huawei/controller";
-		metadata->register_interaction_profile("Huawei controller", profile_path, XR_HUAWEI_CONTROLLER_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("Huawei controller", profile_path, XR_HUAWEI_CONTROLLER_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Home click", user_path, user_path + "/input/home/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Back click", user_path, user_path + "/input/back/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Home click", user_path, user_path + "/input/home/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Back click", user_path, user_path + "/input/back/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Volume up click", user_path, user_path + "/input/volume_up/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Volume down click", user_path, user_path + "/input/volume_down/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Volume up click", user_path, user_path + "/input/volume_up/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Volume down click", user_path, user_path + "/input/volume_down/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trackpad", user_path, user_path + "/input/trackpad", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad", user_path, user_path + "/input/trackpad", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 	}
 }
diff --git a/engine/modules/openxr/extensions/openxr_huawei_controller_extension.h b/engine/modules/openxr/extensions/openxr_huawei_controller_extension.h
index d4847fb0..77d5bee0 100644
--- a/engine/modules/openxr/extensions/openxr_huawei_controller_extension.h
+++ b/engine/modules/openxr/extensions/openxr_huawei_controller_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_HUAWEI_CONTROLLER_EXTENSION_H
-#define OPENXR_HUAWEI_CONTROLLER_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRHuaweiControllerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRHuaweiControllerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	virtual HashMap<String, bool *> get_requested_extensions() override;
 
@@ -44,5 +48,3 @@ public:
 private:
 	bool available = false;
 };
-
-#endif // OPENXR_HUAWEI_CONTROLLER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_local_floor_extension.h b/engine/modules/openxr/extensions/openxr_local_floor_extension.h
index dff97d99..a3899b4a 100644
--- a/engine/modules/openxr/extensions/openxr_local_floor_extension.h
+++ b/engine/modules/openxr/extensions/openxr_local_floor_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_LOCAL_FLOOR_EXTENSION_H
-#define OPENXR_LOCAL_FLOOR_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRLocalFloorExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRLocalFloorExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRLocalFloorExtension *get_singleton();
 
@@ -49,5 +53,3 @@ private:
 
 	bool available = false;
 };
-
-#endif // OPENXR_LOCAL_FLOOR_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_meta_controller_extension.cpp b/engine/modules/openxr/extensions/openxr_meta_controller_extension.cpp
index ad62f584..add959e7 100644
--- a/engine/modules/openxr/extensions/openxr_meta_controller_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_meta_controller_extension.cpp
@@ -47,115 +47,115 @@ bool OpenXRMetaControllerExtension::is_available(MetaControllers p_type) {
 }
 
 void OpenXRMetaControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	// Note, we register controllers regardless if they are supported on the current hardware.
 
 	{ // Normal touch controller is part of the core spec, but we do have some extensions.
 		const String profile_path = "/interaction_profiles/oculus/touch_controller";
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Trigger proximity", user_path, user_path + "/input/trigger/proximity_fb ", "XR_FB_touch_controller_proximity", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumb proximity", user_path, user_path + "/input/thumb_fb/proximity_fb ", "XR_FB_touch_controller_proximity", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger proximity", user_path, user_path + "/input/trigger/proximity_fb ", "XR_FB_touch_controller_proximity", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumb proximity", user_path, user_path + "/input/thumb_fb/proximity_fb ", "XR_FB_touch_controller_proximity", OpenXRAction::OPENXR_ACTION_BOOL);
 		}
 	}
 
 	{ // Touch controller pro (Quest Pro)
 		const String profile_path = "/interaction_profiles/facebook/touch_controller_pro";
-		metadata->register_interaction_profile("Touch controller pro", profile_path, "XR_FB_touch_controller_pro");
+		openxr_metadata->register_interaction_profile("Touch controller pro", profile_path, "XR_FB_touch_controller_pro");
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trigger proximity", user_path, user_path + "/input/trigger/proximity_fb", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trigger curl", user_path, user_path + "/input/trigger/curl_fb", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger slide", user_path, user_path + "/input/trigger/slide_fb", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger force", user_path, user_path + "/input/trigger/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger proximity", user_path, user_path + "/input/trigger/proximity_fb", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger curl", user_path, user_path + "/input/trigger/curl_fb", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger slide", user_path, user_path + "/input/trigger/slide_fb", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger force", user_path, user_path + "/input/trigger/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Thumb proximity", user_path, user_path + "/input/thumb_fb/proximity_fb", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumb proximity", user_path, user_path + "/input/thumb_fb/proximity_fb", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick X", user_path, user_path + "/input/thumbstick/x", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Thumbstick Y", user_path, user_path + "/input/thumbstick/y", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick X", user_path, user_path + "/input/thumbstick/x", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Y", user_path, user_path + "/input/thumbstick/y", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbrest touch", user_path, user_path + "/input/thumbrest/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbrest force", user_path, user_path + "/input/thumbrest/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Thumbrest touch", user_path, user_path + "/input/thumbrest/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbrest force", user_path, user_path + "/input/thumbrest/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Stylus force", user_path, user_path + "/input/stylus_fb/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Stylus force", user_path, user_path + "/input/stylus_fb/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
-			metadata->register_io_path(profile_path, "Haptic trigger output", user_path, user_path + "/output/haptic_trigger_fb", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
-			metadata->register_io_path(profile_path, "Haptic thumb output", user_path, user_path + "/output/haptic_thumb_fb", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic trigger output", user_path, user_path + "/output/haptic_trigger_fb", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic thumb output", user_path, user_path + "/output/haptic_thumb_fb", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 
-		metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-		metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 	}
 
 	{ // Touch controller plus (Quest 3)
 		const String profile_path = "/interaction_profiles/meta/touch_controller_plus";
-		metadata->register_interaction_profile("Touch controller plus", profile_path, "XR_META_touch_controller_plus");
+		openxr_metadata->register_interaction_profile("Touch controller plus", profile_path, "XR_META_touch_controller_plus");
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trigger proximity", user_path, user_path + "/input/trigger/proximity_meta", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trigger curl", user_path, user_path + "/input/trigger/curl_meta", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger slide", user_path, user_path + "/input/trigger/slide_meta", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger force", user_path, user_path + "/input/trigger/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger proximity", user_path, user_path + "/input/trigger/proximity_meta", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger curl", user_path, user_path + "/input/trigger/curl_meta", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger slide", user_path, user_path + "/input/trigger/slide_meta", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger force", user_path, user_path + "/input/trigger/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Thumb proximity", user_path, user_path + "/input/thumb_meta/proximity_meta", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumb proximity", user_path, user_path + "/input/thumb_meta/proximity_meta", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick X", user_path, user_path + "/input/thumbstick/x", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Thumbstick Y", user_path, user_path + "/input/thumbstick/y", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick X", user_path, user_path + "/input/thumbstick/x", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Y", user_path, user_path + "/input/thumbstick/y", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbrest touch", user_path, user_path + "/input/thumbrest/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbrest touch", user_path, user_path + "/input/thumbrest/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 
-		metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-		metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 	}
 }
diff --git a/engine/modules/openxr/extensions/openxr_meta_controller_extension.h b/engine/modules/openxr/extensions/openxr_meta_controller_extension.h
index 7a60d2a0..fbcdcdd5 100644
--- a/engine/modules/openxr/extensions/openxr_meta_controller_extension.h
+++ b/engine/modules/openxr/extensions/openxr_meta_controller_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_META_CONTROLLER_EXTENSION_H
-#define OPENXR_META_CONTROLLER_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRMetaControllerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRMetaControllerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	enum MetaControllers {
 		META_TOUCH_PROXIMITY, // Proximity extensions for normal touch controllers
@@ -51,5 +55,3 @@ public:
 private:
 	bool available[META_MAX_CONTROLLERS] = { false, false, false };
 };
-
-#endif // OPENXR_META_CONTROLLER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_ml2_controller_extension.cpp b/engine/modules/openxr/extensions/openxr_ml2_controller_extension.cpp
index f3627365..cdf17dee 100644
--- a/engine/modules/openxr/extensions/openxr_ml2_controller_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_ml2_controller_extension.cpp
@@ -45,33 +45,33 @@ bool OpenXRML2ControllerExtension::is_available() {
 }
 
 void OpenXRML2ControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	// Magic Leap 2 Controller
 	const String profile_path = "/interaction_profiles/ml/ml2_controller";
-	metadata->register_interaction_profile("Magic Leap 2 controller", profile_path, XR_ML_ML2_CONTROLLER_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_interaction_profile("Magic Leap 2 controller", profile_path, XR_ML_ML2_CONTROLLER_INTERACTION_EXTENSION_NAME);
 	for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-		metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-		metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+		openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+		openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
 
-		metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-		metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+		openxr_metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-		metadata->register_io_path(profile_path, "Shoulder click", user_path, user_path + "/input/shoulder/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Shoulder click", user_path, user_path + "/input/shoulder/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-		metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Trackpad force", user_path, user_path + "/input/trackpad/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-		metadata->register_io_path(profile_path, "Trackpad X", user_path, user_path + "/input/trackpad/x", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-		metadata->register_io_path(profile_path, "Trackpad Y", user_path, user_path + "/input/trackpad/y", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-		metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-		metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Trackpad force", user_path, user_path + "/input/trackpad/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+		openxr_metadata->register_io_path(profile_path, "Trackpad X", user_path, user_path + "/input/trackpad/x", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+		openxr_metadata->register_io_path(profile_path, "Trackpad Y", user_path, user_path + "/input/trackpad/y", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+		openxr_metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+		openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-		metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+		openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 	}
 }
diff --git a/engine/modules/openxr/extensions/openxr_ml2_controller_extension.h b/engine/modules/openxr/extensions/openxr_ml2_controller_extension.h
index 216cd55a..91801d23 100644
--- a/engine/modules/openxr/extensions/openxr_ml2_controller_extension.h
+++ b/engine/modules/openxr/extensions/openxr_ml2_controller_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ML2_CONTROLLER_EXTENSION_H
-#define OPENXR_ML2_CONTROLLER_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRML2ControllerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRML2ControllerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	virtual HashMap<String, bool *> get_requested_extensions() override;
 
@@ -44,5 +48,3 @@ public:
 private:
 	bool available = false;
 };
-
-#endif // OPENXR_ML2_CONTROLLER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_mxink_extension.cpp b/engine/modules/openxr/extensions/openxr_mxink_extension.cpp
index fe48583c..e0585060 100644
--- a/engine/modules/openxr/extensions/openxr_mxink_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_mxink_extension.cpp
@@ -48,36 +48,36 @@ bool OpenXRMxInkExtension::is_available() {
 }
 
 void OpenXRMxInkExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	// Logitech MX Ink Stylus
-	metadata->register_interaction_profile("Logitech MX Ink Stylus", "/interaction_profiles/logitech/mx_ink_stylus_logitech", XR_LOGITECH_MX_INK_STYLUS_INTERACTION_EXTENSION_NAME);
+	openxr_metadata->register_interaction_profile("Logitech MX Ink Stylus", "/interaction_profiles/logitech/mx_ink_stylus_logitech", XR_LOGITECH_MX_INK_STYLUS_INTERACTION_EXTENSION_NAME);
 
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip Force", "/user/hand/left", "/user/hand/left/input/tip_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Middle force", "/user/hand/left", "/user/hand/left/input/cluster_middle_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front click", "/user/hand/left", "/user/hand/left/input/cluster_front_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front double", "/user/hand/left", "/user/hand/left/input/cluster_front_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back click", "/user/hand/left", "/user/hand/left/input/cluster_back_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back double", "/user/hand/left", "/user/hand/left/input/cluster_back_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "System click", "/user/hand/left", "/user/hand/left/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Docked", "/user/hand/left", "/user/hand/left/input/dock_logitech/docked_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Grip pose", "/user/hand/left", "/user/hand/left/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Aim pose", "/user/hand/left", "/user/hand/left/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip pose", "/user/hand/left", "/user/hand/left/input/tip_logitech/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip Force", "/user/hand/left", "/user/hand/left/input/tip_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Middle force", "/user/hand/left", "/user/hand/left/input/cluster_middle_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front click", "/user/hand/left", "/user/hand/left/input/cluster_front_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front double", "/user/hand/left", "/user/hand/left/input/cluster_front_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back click", "/user/hand/left", "/user/hand/left/input/cluster_back_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back double", "/user/hand/left", "/user/hand/left/input/cluster_back_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "System click", "/user/hand/left", "/user/hand/left/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Docked", "/user/hand/left", "/user/hand/left/input/dock_logitech/docked_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Grip pose", "/user/hand/left", "/user/hand/left/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Aim pose", "/user/hand/left", "/user/hand/left/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip pose", "/user/hand/left", "/user/hand/left/input/tip_logitech/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
 
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip Force", "/user/hand/right", "/user/hand/right/input/tip_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Middle force", "/user/hand/right", "/user/hand/right/input/cluster_middle_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front click", "/user/hand/right", "/user/hand/right/input/cluster_front_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front double", "/user/hand/right", "/user/hand/right/input/cluster_front_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back click", "/user/hand/right", "/user/hand/right/input/cluster_back_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back double", "/user/hand/right", "/user/hand/right/input/cluster_back_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Docked", "/user/hand/right", "/user/hand/right/input/dock_logitech/docked_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Grip pose", "/user/hand/right", "/user/hand/right/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Aim pose", "/user/hand/right", "/user/hand/right/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip pose", "/user/hand/right", "/user/hand/right/input/tip_logitech/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip Force", "/user/hand/right", "/user/hand/right/input/tip_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Middle force", "/user/hand/right", "/user/hand/right/input/cluster_middle_logitech/force", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front click", "/user/hand/right", "/user/hand/right/input/cluster_front_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Front double", "/user/hand/right", "/user/hand/right/input/cluster_front_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back click", "/user/hand/right", "/user/hand/right/input/cluster_back_logitech/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Back double", "/user/hand/right", "/user/hand/right/input/cluster_back_logitech/double_tap_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "System click", "/user/hand/right", "/user/hand/right/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Docked", "/user/hand/right", "/user/hand/right/input/dock_logitech/docked_logitech", "", OpenXRAction::OPENXR_ACTION_BOOL);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Grip pose", "/user/hand/right", "/user/hand/right/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Aim pose", "/user/hand/right", "/user/hand/right/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Tip pose", "/user/hand/right", "/user/hand/right/input/tip_logitech/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
 
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Haptic output", "/user/hand/left", "/user/hand/left/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
-	metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Haptic output", "/user/hand/right", "/user/hand/right/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Haptic output", "/user/hand/left", "/user/hand/left/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+	openxr_metadata->register_io_path("/interaction_profiles/logitech/mx_ink_stylus_logitech", "Haptic output", "/user/hand/right", "/user/hand/right/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 }
diff --git a/engine/modules/openxr/extensions/openxr_mxink_extension.h b/engine/modules/openxr/extensions/openxr_mxink_extension.h
index fe0cf866..5203702b 100644
--- a/engine/modules/openxr/extensions/openxr_mxink_extension.h
+++ b/engine/modules/openxr/extensions/openxr_mxink_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_MXINK_EXTENSION_H
-#define OPENXR_MXINK_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRMxInkExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRMxInkExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	virtual HashMap<String, bool *> get_requested_extensions() override;
 
@@ -44,5 +48,3 @@ public:
 private:
 	bool available = false;
 };
-
-#endif // OPENXR_MXINK_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_palm_pose_extension.h b/engine/modules/openxr/extensions/openxr_palm_pose_extension.h
index 975b8b5d..c94642d6 100644
--- a/engine/modules/openxr/extensions/openxr_palm_pose_extension.h
+++ b/engine/modules/openxr/extensions/openxr_palm_pose_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_PALM_POSE_EXTENSION_H
-#define OPENXR_PALM_POSE_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRPalmPoseExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRPalmPoseExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRPalmPoseExtension *get_singleton();
 
@@ -49,5 +53,3 @@ private:
 
 	bool available = false;
 };
-
-#endif // OPENXR_PALM_POSE_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_performance_settings_extension.cpp b/engine/modules/openxr/extensions/openxr_performance_settings_extension.cpp
new file mode 100644
index 00000000..deb9a285
--- /dev/null
+++ b/engine/modules/openxr/extensions/openxr_performance_settings_extension.cpp
@@ -0,0 +1,156 @@
+/**************************************************************************/
+/*  openxr_performance_settings_extension.cpp                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "openxr_performance_settings_extension.h"
+
+#include "../openxr_api.h"
+
+OpenXRPerformanceSettingsExtension *OpenXRPerformanceSettingsExtension::singleton = nullptr;
+
+OpenXRPerformanceSettingsExtension *OpenXRPerformanceSettingsExtension::get_singleton() {
+	return singleton;
+}
+
+OpenXRPerformanceSettingsExtension::OpenXRPerformanceSettingsExtension() {
+	singleton = this;
+}
+
+OpenXRPerformanceSettingsExtension::~OpenXRPerformanceSettingsExtension() {
+	singleton = nullptr;
+}
+
+HashMap<String, bool *> OpenXRPerformanceSettingsExtension::get_requested_extensions() {
+	HashMap<String, bool *> request_extensions;
+
+	request_extensions[XR_EXT_PERFORMANCE_SETTINGS_EXTENSION_NAME] = &available;
+
+	return request_extensions;
+}
+
+void OpenXRPerformanceSettingsExtension::on_instance_created(const XrInstance p_instance) {
+	if (available) {
+		EXT_INIT_XR_FUNC(xrPerfSettingsSetPerformanceLevelEXT);
+	}
+}
+
+bool OpenXRPerformanceSettingsExtension::on_event_polled(const XrEventDataBuffer &event) {
+	switch (event.type) {
+		case XR_TYPE_EVENT_DATA_PERF_SETTINGS_EXT: {
+			const XrEventDataPerfSettingsEXT *perf_settings_event = (XrEventDataPerfSettingsEXT *)&event;
+
+			OpenXRInterface::PerfSettingsSubDomain sub_domain = openxr_to_sub_domain(perf_settings_event->subDomain);
+			OpenXRInterface::PerfSettingsNotificationLevel from_level = openxr_to_notification_level(perf_settings_event->fromLevel);
+			OpenXRInterface::PerfSettingsNotificationLevel to_level = openxr_to_notification_level(perf_settings_event->toLevel);
+
+			OpenXRInterface *openxr_interface = OpenXRAPI::get_singleton()->get_xr_interface();
+
+			if (perf_settings_event->domain == XR_PERF_SETTINGS_DOMAIN_CPU_EXT) {
+				openxr_interface->on_cpu_level_changed(sub_domain, from_level, to_level);
+			} else if (perf_settings_event->domain == XR_PERF_SETTINGS_DOMAIN_GPU_EXT) {
+				openxr_interface->on_gpu_level_changed(sub_domain, from_level, to_level);
+			} else {
+				print_error(vformat("OpenXR: no matching performance settings domain for %s", perf_settings_event->domain));
+			}
+			return true;
+		} break;
+		default:
+			return false;
+	}
+}
+
+bool OpenXRPerformanceSettingsExtension::is_available() {
+	return available;
+}
+
+void OpenXRPerformanceSettingsExtension::set_cpu_level(OpenXRInterface::PerfSettingsLevel p_level) {
+	XrSession session = OpenXRAPI::get_singleton()->get_session();
+	XrPerfSettingsLevelEXT xr_level = level_to_openxr(p_level);
+
+	XrResult result = xrPerfSettingsSetPerformanceLevelEXT(session, XR_PERF_SETTINGS_DOMAIN_CPU_EXT, xr_level);
+	if (XR_FAILED(result)) {
+		print_error(vformat("OpenXR: failed to set CPU performance level [%s]", OpenXRAPI::get_singleton()->get_error_string(result)));
+	}
+}
+
+void OpenXRPerformanceSettingsExtension::set_gpu_level(OpenXRInterface::PerfSettingsLevel p_level) {
+	XrSession session = OpenXRAPI::get_singleton()->get_session();
+	XrPerfSettingsLevelEXT xr_level = level_to_openxr(p_level);
+
+	XrResult result = xrPerfSettingsSetPerformanceLevelEXT(session, XR_PERF_SETTINGS_DOMAIN_GPU_EXT, xr_level);
+	if (XR_FAILED(result)) {
+		print_error(vformat("OpenXR: failed to set GPU performance level [%s]", OpenXRAPI::get_singleton()->get_error_string(result)));
+	}
+}
+
+XrPerfSettingsLevelEXT OpenXRPerformanceSettingsExtension::level_to_openxr(OpenXRInterface::PerfSettingsLevel p_level) {
+	switch (p_level) {
+		case OpenXRInterface::PerfSettingsLevel::PERF_SETTINGS_LEVEL_POWER_SAVINGS:
+			return XR_PERF_SETTINGS_LEVEL_POWER_SAVINGS_EXT;
+			break;
+		case OpenXRInterface::PerfSettingsLevel::PERF_SETTINGS_LEVEL_SUSTAINED_LOW:
+			return XR_PERF_SETTINGS_LEVEL_SUSTAINED_LOW_EXT;
+			break;
+		case OpenXRInterface::PerfSettingsLevel::PERF_SETTINGS_LEVEL_SUSTAINED_HIGH:
+			return XR_PERF_SETTINGS_LEVEL_SUSTAINED_HIGH_EXT;
+		case OpenXRInterface::PerfSettingsLevel::PERF_SETTINGS_LEVEL_BOOST:
+			return XR_PERF_SETTINGS_LEVEL_BOOST_EXT;
+		default:
+			print_error("Invalid performance settings level.");
+			return XR_PERF_SETTINGS_LEVEL_SUSTAINED_HIGH_EXT;
+	}
+}
+
+OpenXRInterface::PerfSettingsSubDomain OpenXRPerformanceSettingsExtension::openxr_to_sub_domain(XrPerfSettingsSubDomainEXT p_sub_domain) {
+	switch (p_sub_domain) {
+		case XR_PERF_SETTINGS_SUB_DOMAIN_COMPOSITING_EXT:
+			return OpenXRInterface::PerfSettingsSubDomain::PERF_SETTINGS_SUB_DOMAIN_COMPOSITING;
+		case XR_PERF_SETTINGS_SUB_DOMAIN_RENDERING_EXT:
+			return OpenXRInterface::PerfSettingsSubDomain::PERF_SETTINGS_SUB_DOMAIN_RENDERING;
+		case XR_PERF_SETTINGS_SUB_DOMAIN_THERMAL_EXT:
+			return OpenXRInterface::PerfSettingsSubDomain::PERF_SETTINGS_SUB_DOMAIN_THERMAL;
+		default:
+			print_error("Invalid performance settings sub domain.");
+			return OpenXRInterface::PerfSettingsSubDomain::PERF_SETTINGS_SUB_DOMAIN_COMPOSITING;
+	}
+}
+
+OpenXRInterface::PerfSettingsNotificationLevel OpenXRPerformanceSettingsExtension::openxr_to_notification_level(XrPerfSettingsNotificationLevelEXT p_notification_level) {
+	switch (p_notification_level) {
+		case XR_PERF_SETTINGS_NOTIF_LEVEL_NORMAL_EXT:
+			return OpenXRInterface::PerfSettingsNotificationLevel::PERF_SETTINGS_NOTIF_LEVEL_NORMAL;
+		case XR_PERF_SETTINGS_NOTIF_LEVEL_WARNING_EXT:
+			return OpenXRInterface::PerfSettingsNotificationLevel::PERF_SETTINGS_NOTIF_LEVEL_WARNING;
+		case XR_PERF_SETTINGS_NOTIF_LEVEL_IMPAIRED_EXT:
+			return OpenXRInterface::PerfSettingsNotificationLevel::PERF_SETTINGS_NOTIF_LEVEL_IMPAIRED;
+		default:
+			print_error("Invalid performance settings notification level.");
+			return OpenXRInterface::PerfSettingsNotificationLevel::PERF_SETTINGS_NOTIF_LEVEL_NORMAL;
+	}
+}
diff --git a/engine/editor/uid_upgrade_tool.h b/engine/modules/openxr/extensions/openxr_performance_settings_extension.h
similarity index 62%
rename from engine/editor/uid_upgrade_tool.h
rename to engine/modules/openxr/extensions/openxr_performance_settings_extension.h
index 0807b9a3..35b3984d 100644
--- a/engine/editor/uid_upgrade_tool.h
+++ b/engine/modules/openxr/extensions/openxr_performance_settings_extension.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  uid_upgrade_tool.h                                                    */
+/*  openxr_performance_settings_extension.h                               */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,55 +28,37 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UID_UPGRADE_TOOL_H
-#define UID_UPGRADE_TOOL_H
+#pragma once
 
-#include "scene/gui/dialogs.h"
-
-class EditorFileSystemDirectory;
-
-class UIDUpgradeTool : public Object {
-	GDCLASS(UIDUpgradeTool, Object);
-
-	inline static UIDUpgradeTool *singleton = nullptr;
-
-	static constexpr const char *UPGRADE_FINISHED = "upgrade_finished";
-	static constexpr const char *META_RESAVE_PATHS = "resave_paths";
-
-	void _add_files(EditorFileSystemDirectory *p_dir, Vector<String> &r_resave_paths);
-
-protected:
-	static void _bind_methods();
+#include "../openxr_interface.h"
+#include "../util.h"
+#include "openxr_extension_wrapper.h"
 
+class OpenXRPerformanceSettingsExtension : public OpenXRExtensionWrapper {
 public:
-	static constexpr const char *META_UID_UPGRADE_TOOL = "uid_upgrade_tool";
-	static constexpr const char *META_RUN_ON_RESTART = "run_on_restart";
+	static OpenXRPerformanceSettingsExtension *get_singleton();
 
-	static UIDUpgradeTool *get_singleton() { return singleton; }
+	OpenXRPerformanceSettingsExtension();
+	virtual ~OpenXRPerformanceSettingsExtension() override;
 
-	void prepare_upgrade();
-	void begin_upgrade();
-	void finish_upgrade();
+	virtual HashMap<String, bool *> get_requested_extensions() override;
 
-	UIDUpgradeTool();
-	~UIDUpgradeTool();
+	virtual void on_instance_created(const XrInstance p_instance) override;
+	virtual bool on_event_polled(const XrEventDataBuffer &event) override;
+
+	bool is_available();
+
+	void set_cpu_level(OpenXRInterface::PerfSettingsLevel p_level);
+	void set_gpu_level(OpenXRInterface::PerfSettingsLevel p_level);
+
+private:
+	static OpenXRPerformanceSettingsExtension *singleton;
+
+	bool available = false;
+
+	XrPerfSettingsLevelEXT level_to_openxr(OpenXRInterface::PerfSettingsLevel p_level);
+	OpenXRInterface::PerfSettingsSubDomain openxr_to_sub_domain(XrPerfSettingsSubDomainEXT p_sub_domain);
+	OpenXRInterface::PerfSettingsNotificationLevel openxr_to_notification_level(XrPerfSettingsNotificationLevelEXT p_notification_level);
+
+	EXT_PROTO_XRRESULT_FUNC3(xrPerfSettingsSetPerformanceLevelEXT, (XrSession), session, (XrPerfSettingsDomainEXT), domain, (XrPerfSettingsLevelEXT), level)
 };
-
-class UIDUpgradeDialog : public ConfirmationDialog {
-	GDCLASS(UIDUpgradeDialog, ConfirmationDialog);
-
-	static constexpr const char *UID_UPGRADE_LEARN_MORE = "uid_upgrade_learn_more";
-
-	Button *learn_more_button = nullptr;
-
-protected:
-	void _on_custom_action(const String &p_action);
-	void _notification(int p_what);
-
-public:
-	void popup_on_demand();
-
-	UIDUpgradeDialog();
-};
-
-#endif // UID_UPGRADE_TOOL_H
diff --git a/engine/modules/openxr/extensions/openxr_pico_controller_extension.cpp b/engine/modules/openxr/extensions/openxr_pico_controller_extension.cpp
index b4419d10..ef38200b 100644
--- a/engine/modules/openxr/extensions/openxr_pico_controller_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_pico_controller_extension.cpp
@@ -49,85 +49,85 @@ bool OpenXRPicoControllerExtension::is_available() {
 }
 
 void OpenXRPicoControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	// Make sure we switch to our new name.
-	metadata->register_profile_rename("/interaction_profiles/pico/neo3_controller", "/interaction_profiles/bytedance/pico_neo3_controller");
+	openxr_metadata->register_profile_rename("/interaction_profiles/pico/neo3_controller", "/interaction_profiles/bytedance/pico_neo3_controller");
 
 	{ // Pico neo 3 controller.
 		const String profile_path = "/interaction_profiles/bytedance/pico_neo3_controller";
-		metadata->register_interaction_profile("Pico Neo3 controller", profile_path, XR_BD_CONTROLLER_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("Pico Neo3 controller", profile_path, XR_BD_CONTROLLER_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "System click", user_path, user_path + "/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "System click", user_path, user_path + "/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 
-		metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 	}
 
 	{ // Pico 4 controller.
 		const String profile_path = "/interaction_profiles/bytedance/pico4_controller";
-		metadata->register_interaction_profile("Pico 4 controller", profile_path, XR_BD_CONTROLLER_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("Pico 4 controller", profile_path, XR_BD_CONTROLLER_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "System click", user_path, user_path + "/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "System click", user_path, user_path + "/input/system/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger touch", user_path, user_path + "/input/trigger/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick touch", user_path, user_path + "/input/thumbstick/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 
-		metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Menu click", "/user/hand/left", "/user/hand/left/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 		// Note, no menu on right controller!
 
-		metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X touch", "/user/hand/left", "/user/hand/left/input/x/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y touch", "/user/hand/left", "/user/hand/left/input/y/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A touch", "/user/hand/right", "/user/hand/right/input/a/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B touch", "/user/hand/right", "/user/hand/right/input/b/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
 	}
 }
diff --git a/engine/modules/openxr/extensions/openxr_pico_controller_extension.h b/engine/modules/openxr/extensions/openxr_pico_controller_extension.h
index a2a1e2f3..23271ef9 100644
--- a/engine/modules/openxr/extensions/openxr_pico_controller_extension.h
+++ b/engine/modules/openxr/extensions/openxr_pico_controller_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_PICO_CONTROLLER_EXTENSION_H
-#define OPENXR_PICO_CONTROLLER_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRPicoControllerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRPicoControllerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	virtual HashMap<String, bool *> get_requested_extensions() override;
 
@@ -44,5 +48,3 @@ public:
 private:
 	bool available = false;
 };
-
-#endif // OPENXR_PICO_CONTROLLER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h b/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h
index d42eea87..f2b97dd3 100644
--- a/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h
+++ b/engine/modules/openxr/extensions/openxr_valve_analog_threshold_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_VALVE_ANALOG_THRESHOLD_EXTENSION_H
-#define OPENXR_VALVE_ANALOG_THRESHOLD_EXTENSION_H
+#pragma once
 
 #include "../action_map/openxr_binding_modifier.h"
 #include "../action_map/openxr_haptic_feedback.h"
@@ -38,6 +37,11 @@
 #include "openxr_extension_wrapper.h"
 
 class OpenXRValveAnalogThresholdExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRValveAnalogThresholdExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRValveAnalogThresholdExtension *get_singleton();
 
@@ -84,5 +88,3 @@ public:
 	virtual String get_description() const override { return "Analog threshold modifier"; }
 	virtual PackedByteArray get_ip_modification() override;
 };
-
-#endif // OPENXR_VALVE_ANALOG_THRESHOLD_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h b/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h
index ee80dd02..bb5c1b71 100644
--- a/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h
+++ b/engine/modules/openxr/extensions/openxr_visibility_mask_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_VISIBILITY_MASK_EXTENSION_H
-#define OPENXR_VISIBILITY_MASK_EXTENSION_H
+#pragma once
 
 #include "../util.h"
 
@@ -48,6 +47,11 @@
 // https://registry.khronos.org/OpenXR/specs/1.0/html/xrspec.html#XR_KHR_visibility_mask
 
 class OpenXRVisibilityMaskExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRVisibilityMaskExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	static OpenXRVisibilityMaskExtension *get_singleton();
 
@@ -91,5 +95,3 @@ private:
 	// OpenXR API call wrappers
 	EXT_PROTO_XRRESULT_FUNC5(xrGetVisibilityMaskKHR, (XrSession), session, (XrViewConfigurationType), viewConfigurationType, (uint32_t), viewIndex, (XrVisibilityMaskTypeKHR), visibilityMaskType, (XrVisibilityMaskKHR *), visibilityMask);
 };
-
-#endif // OPENXR_VISIBILITY_MASK_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/openxr_wmr_controller_extension.cpp b/engine/modules/openxr/extensions/openxr_wmr_controller_extension.cpp
index 6b0ccca3..bac215bb 100644
--- a/engine/modules/openxr/extensions/openxr_wmr_controller_extension.cpp
+++ b/engine/modules/openxr/extensions/openxr_wmr_controller_extension.cpp
@@ -48,88 +48,88 @@ bool OpenXRWMRControllerExtension::is_available(WMRControllers p_type) {
 }
 
 void OpenXRWMRControllerExtension::on_register_metadata() {
-	OpenXRInteractionProfileMetadata *metadata = OpenXRInteractionProfileMetadata::get_singleton();
-	ERR_FAIL_NULL(metadata);
+	OpenXRInteractionProfileMetadata *openxr_metadata = OpenXRInteractionProfileMetadata::get_singleton();
+	ERR_FAIL_NULL(openxr_metadata);
 
 	{ // HP MR controller (newer G2 controllers)
 		const String profile_path = "/interaction_profiles/hp/mixed_reality_controller";
-		metadata->register_interaction_profile("HPMR controller", profile_path, XR_EXT_HP_MIXED_REALITY_CONTROLLER_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("HPMR controller", profile_path, XR_EXT_HP_MIXED_REALITY_CONTROLLER_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Squeeze", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 
-		metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-		metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "X click", "/user/hand/left", "/user/hand/left/input/x/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "Y click", "/user/hand/left", "/user/hand/left/input/y/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "A click", "/user/hand/right", "/user/hand/right/input/a/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+		openxr_metadata->register_io_path(profile_path, "B click", "/user/hand/right", "/user/hand/right/input/b/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 	}
 
 	{ // Samsung Odyssey controller
 		const String profile_path = "/interaction_profiles/samsung/odyssey_controller";
-		metadata->register_interaction_profile("Samsung Odyssey controller", profile_path, XR_EXT_SAMSUNG_ODYSSEY_CONTROLLER_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("Samsung Odyssey controller", profile_path, XR_EXT_SAMSUNG_ODYSSEY_CONTROLLER_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Menu click", user_path, user_path + "/input/menu/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
-			metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trigger", user_path, user_path + "/input/trigger/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Trigger click", user_path, user_path + "/input/trigger/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Squeeze click", user_path, user_path + "/input/squeeze/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick", user_path, user_path + "/input/thumbstick", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick click", user_path, user_path + "/input/thumbstick/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Up", user_path, user_path + "/input/thumbstick/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Down", user_path, user_path + "/input/thumbstick/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Left", user_path, user_path + "/input/thumbstick/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Thumbstick Dpad Right", user_path, user_path + "/input/thumbstick/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Trackpad", user_path, user_path + "/input/trackpad", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
-			metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
-			metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad", user_path, user_path + "/input/trackpad", "", OpenXRAction::OPENXR_ACTION_VECTOR2);
+			openxr_metadata->register_io_path(profile_path, "Trackpad click", user_path, user_path + "/input/trackpad/click", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad touch", user_path, user_path + "/input/trackpad/touch", "", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Up", user_path, user_path + "/input/trackpad/dpad_up", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Down", user_path, user_path + "/input/trackpad/dpad_down", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Left", user_path, user_path + "/input/trackpad/dpad_left", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Right", user_path, user_path + "/input/trackpad/dpad_right", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
+			openxr_metadata->register_io_path(profile_path, "Trackpad Dpad Center", user_path, user_path + "/input/trackpad/dpad_center", "XR_EXT_dpad_binding", OpenXRAction::OPENXR_ACTION_BOOL);
 
-			metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
+			openxr_metadata->register_io_path(profile_path, "Haptic output", user_path, user_path + "/output/haptic", "", OpenXRAction::OPENXR_ACTION_HAPTIC);
 		}
 	}
 
 	{ // MSFT Hand interaction profile, also supported by other headsets
 		const String profile_path = "/interaction_profiles/microsoft/hand_interaction";
-		metadata->register_interaction_profile("MSFT Hand interaction", profile_path, XR_MSFT_HAND_INTERACTION_EXTENSION_NAME);
+		openxr_metadata->register_interaction_profile("MSFT Hand interaction", profile_path, XR_MSFT_HAND_INTERACTION_EXTENSION_NAME);
 		for (const String user_path : { "/user/hand/left", "/user/hand/right" }) {
-			metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Pinch pose", user_path, user_path + "/input/pinch_ext/pose", XR_EXT_HAND_INTERACTION_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Poke pose", user_path, user_path + "/input/poke_ext/pose", XR_EXT_HAND_INTERACTION_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
-			metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Grip pose", user_path, user_path + "/input/grip/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Aim pose", user_path, user_path + "/input/aim/pose", "", OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Pinch pose", user_path, user_path + "/input/pinch_ext/pose", XR_EXT_HAND_INTERACTION_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Poke pose", user_path, user_path + "/input/poke_ext/pose", XR_EXT_HAND_INTERACTION_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
+			openxr_metadata->register_io_path(profile_path, "Palm pose", user_path, user_path + "/input/palm_ext/pose", XR_EXT_PALM_POSE_EXTENSION_NAME, OpenXRAction::OPENXR_ACTION_POSE);
 
-			metadata->register_io_path(profile_path, "Select (pinch)", user_path, user_path + "/input/select/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Select (pinch)", user_path, user_path + "/input/select/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 
-			metadata->register_io_path(profile_path, "Squeeze (grab)", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
+			openxr_metadata->register_io_path(profile_path, "Squeeze (grab)", user_path, user_path + "/input/squeeze/value", "", OpenXRAction::OPENXR_ACTION_FLOAT);
 		}
 	}
 }
diff --git a/engine/modules/openxr/extensions/openxr_wmr_controller_extension.h b/engine/modules/openxr/extensions/openxr_wmr_controller_extension.h
index c8b50f1b..899a75fe 100644
--- a/engine/modules/openxr/extensions/openxr_wmr_controller_extension.h
+++ b/engine/modules/openxr/extensions/openxr_wmr_controller_extension.h
@@ -28,12 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_WMR_CONTROLLER_EXTENSION_H
-#define OPENXR_WMR_CONTROLLER_EXTENSION_H
+#pragma once
 
 #include "openxr_extension_wrapper.h"
 
 class OpenXRWMRControllerExtension : public OpenXRExtensionWrapper {
+	GDCLASS(OpenXRWMRControllerExtension, OpenXRExtensionWrapper);
+
+protected:
+	static void _bind_methods() {}
+
 public:
 	enum WMRControllers {
 		WMR_HPMR,
@@ -51,5 +55,3 @@ public:
 private:
 	bool available[WMR_MAX_CONTROLLERS] = { false, false };
 };
-
-#endif // OPENXR_WMR_CONTROLLER_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/platform/openxr_android_extension.h b/engine/modules/openxr/extensions/platform/openxr_android_extension.h
index 61f4b02a..0391481b 100644
--- a/engine/modules/openxr/extensions/platform/openxr_android_extension.h
+++ b/engine/modules/openxr/extensions/platform/openxr_android_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_ANDROID_EXTENSION_H
-#define OPENXR_ANDROID_EXTENSION_H
+#pragma once
 
 #include "../../util.h"
 #include "../openxr_extension_wrapper.h"
@@ -59,5 +58,3 @@ private:
 	// Initialize the loader
 	EXT_PROTO_XRRESULT_FUNC1(xrInitializeLoaderKHR, (const XrLoaderInitInfoBaseHeaderKHR *), loaderInitInfo)
 };
-
-#endif // OPENXR_ANDROID_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/platform/openxr_metal_extension.h b/engine/modules/openxr/extensions/platform/openxr_metal_extension.h
index 11bfbcaf..75cf0ee0 100644
--- a/engine/modules/openxr/extensions/platform/openxr_metal_extension.h
+++ b/engine/modules/openxr/extensions/platform/openxr_metal_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_METAL_EXTENSION_H
-#define OPENXR_METAL_EXTENSION_H
+#pragma once
 
 #include "../../openxr_api.h"
 #include "../../util.h"
@@ -68,5 +67,3 @@ private:
 	EXT_PROTO_XRRESULT_FUNC3(xrGetMetalGraphicsRequirementsKHR, (XrInstance), p_instance, (XrSystemId), p_system_id, (XrGraphicsRequirementsMetalKHR *), p_graphics_requirements)
 	EXT_PROTO_XRRESULT_FUNC4(xrEnumerateSwapchainImages, (XrSwapchain), p_swapchain, (uint32_t), p_image_capacity_input, (uint32_t *), p_image_count_output, (XrSwapchainImageBaseHeader *), p_images)
 };
-
-#endif // OPENXR_METAL_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm b/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm
index 0b141f0b..98dd5de5 100644
--- a/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm
+++ b/engine/modules/openxr/extensions/platform/openxr_metal_extension.mm
@@ -28,10 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "openxr_metal_extension.h"
+#import "openxr_metal_extension.h"
 
 #include "../../openxr_util.h"
-#include "drivers/metal/rendering_device_driver_metal.h"
+
+#import "drivers/metal/rendering_device_driver_metal.h"
 #include "servers/rendering/rendering_server_globals.h"
 
 HashMap<String, bool *> OpenXRMetalExtension::get_requested_extensions() {
diff --git a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
index c4a05220..08b3afb0 100644
--- a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
+++ b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.cpp
@@ -141,7 +141,12 @@ XrGraphicsBindingEGLMNDX OpenXROpenGLExtension::graphics_binding_egl;
 #endif
 
 void *OpenXROpenGLExtension::set_session_create_and_get_next_pointer(void *p_next_pointer) {
-	XrVersion desired_version = XR_MAKE_VERSION(3, 3, 0);
+	GLint gl_version_major = 0;
+	GLint gl_version_minor = 0;
+	glGetIntegerv(GL_MAJOR_VERSION, &gl_version_major);
+	glGetIntegerv(GL_MINOR_VERSION, &gl_version_minor);
+
+	XrVersion desired_version = XR_MAKE_VERSION(gl_version_major, gl_version_minor, 0);
 
 	if (!check_graphics_api_support(desired_version)) {
 		print_line("OpenXR: Trying to initialize with OpenGL anyway...");
diff --git a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h
index f4a73c66..6da813d5 100644
--- a/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h
+++ b/engine/modules/openxr/extensions/platform/openxr_opengl_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_OPENGL_EXTENSION_H
-#define OPENXR_OPENGL_EXTENSION_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 
@@ -93,5 +92,3 @@ private:
 };
 
 #endif // GLES3_ENABLED
-
-#endif // OPENXR_OPENGL_EXTENSION_H
diff --git a/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h b/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h
index a3f86a99..06777b35 100644
--- a/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h
+++ b/engine/modules/openxr/extensions/platform/openxr_vulkan_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_VULKAN_EXTENSION_H
-#define OPENXR_VULKAN_EXTENSION_H
+#pragma once
 
 #include "../../openxr_api.h"
 #include "../../util.h"
@@ -87,5 +86,3 @@ private:
 	EXT_PROTO_XRRESULT_FUNC4(xrCreateVulkanDeviceKHR, (XrInstance), p_instance, (const XrVulkanDeviceCreateInfoKHR *), p_create_info, (VkDevice *), r_device, (VkResult *), r_result)
 	EXT_PROTO_XRRESULT_FUNC4(xrEnumerateSwapchainImages, (XrSwapchain), p_swapchain, (uint32_t), p_image_capacity_input, (uint32_t *), p_image_count_output, (XrSwapchainImageBaseHeader *), p_images)
 };
-
-#endif // OPENXR_VULKAN_EXTENSION_H
diff --git a/engine/modules/openxr/openxr_api.cpp b/engine/modules/openxr/openxr_api.cpp
index f4320925..118631cb 100644
--- a/engine/modules/openxr/openxr_api.cpp
+++ b/engine/modules/openxr/openxr_api.cpp
@@ -30,7 +30,6 @@
 
 #include "openxr_api.h"
 
-#include "extensions/openxr_extension_wrapper_extension.h"
 #include "openxr_interface.h"
 #include "openxr_util.h"
 
@@ -61,6 +60,10 @@
 #include "extensions/openxr_fb_update_swapchain_extension.h"
 #include "extensions/openxr_hand_tracking_extension.h"
 
+#ifndef DISABLE_DEPRECATED
+#include "extensions/openxr_extension_wrapper_extension.h"
+#endif // DISABLE_DEPRECATED
+
 #ifdef ANDROID_ENABLED
 #define OPENXR_LOADER_NAME "libopenxr_loader.so"
 #endif
@@ -296,8 +299,7 @@ String OpenXRAPI::get_error_string(XrResult result) const {
 	}
 
 	if (instance == XR_NULL_HANDLE) {
-		Array args;
-		args.push_back(Variant(result));
+		Array args = { Variant(result) };
 		return String("Error code {0}").format(args);
 	}
 
@@ -578,7 +580,7 @@ bool OpenXRAPI::create_instance() {
 
 	Vector<const char *> extension_ptrs;
 	for (int i = 0; i < enabled_extensions.size(); i++) {
-		print_verbose(String("OpenXR: Enabling extension ") + String(enabled_extensions[i]));
+		print_verbose(String("OpenXR: Enabling extension ") + String(enabled_extensions[i].get_data()));
 		extension_ptrs.push_back(enabled_extensions[i].get_data());
 	}
 
@@ -587,7 +589,7 @@ bool OpenXRAPI::create_instance() {
 		"Godot Engine", // applicationName, if we're running a game we'll update this down below.
 		1, // applicationVersion, we don't currently have this
 		"Godot Engine", // engineName
-		VERSION_MAJOR * 10000 + VERSION_MINOR * 100 + VERSION_PATCH, // engineVersion 4.0 -> 40000, 4.0.1 -> 40001, 4.1 -> 40100, etc.
+		GODOT_VERSION_MAJOR * 10000 + GODOT_VERSION_MINOR * 100 + GODOT_VERSION_PATCH, // engineVersion 4.0 -> 40000, 4.0.1 -> 40001, 4.1 -> 40100, etc.
 		XR_API_VERSION_1_0 // apiVersion
 	};
 
@@ -924,7 +926,11 @@ bool OpenXRAPI::setup_play_space() {
 	XrSpace new_play_space = XR_NULL_HANDLE;
 	bool will_emulate_local_floor = false;
 
-	if (is_reference_space_supported(requested_reference_space)) {
+	if (custom_play_space != XR_NULL_HANDLE) {
+		new_play_space = custom_play_space;
+		// We use this to mark custom reference spaces.
+		new_reference_space = XR_REFERENCE_SPACE_TYPE_MAX_ENUM;
+	} else if (is_reference_space_supported(requested_reference_space)) {
 		new_reference_space = requested_reference_space;
 	} else if (requested_reference_space == XR_REFERENCE_SPACE_TYPE_LOCAL_FLOOR_EXT && is_reference_space_supported(XR_REFERENCE_SPACE_TYPE_STAGE)) {
 		print_verbose("OpenXR: LOCAL_FLOOR space isn't supported, emulating using STAGE and LOCAL spaces.");
@@ -982,21 +988,34 @@ bool OpenXRAPI::setup_play_space() {
 		new_reference_space = XR_REFERENCE_SPACE_TYPE_LOCAL;
 	}
 
-	XrReferenceSpaceCreateInfo play_space_create_info = {
-		XR_TYPE_REFERENCE_SPACE_CREATE_INFO, // type
-		nullptr, // next
-		new_reference_space, // referenceSpaceType
-		identityPose, // poseInReferenceSpace
-	};
+	if (new_play_space == XR_NULL_HANDLE) {
+		void *next_pointer = nullptr;
+		for (OpenXRExtensionWrapper *wrapper : registered_extension_wrappers) {
+			void *np = wrapper->set_reference_space_create_info_and_get_next_pointer(
+					new_reference_space, next_pointer);
+			if (np != nullptr) {
+				next_pointer = np;
+			}
+		}
 
-	XrResult result = xrCreateReferenceSpace(session, &play_space_create_info, &new_play_space);
-	if (XR_FAILED(result)) {
-		print_line("OpenXR: Failed to create play space [", get_error_string(result), "]");
-		return false;
+		XrReferenceSpaceCreateInfo play_space_create_info = {
+			XR_TYPE_REFERENCE_SPACE_CREATE_INFO, // type
+			next_pointer, // next
+			new_reference_space, // referenceSpaceType
+			identityPose, // poseInReferenceSpace
+		};
+
+		XrResult result = xrCreateReferenceSpace(session, &play_space_create_info, &new_play_space);
+		if (XR_FAILED(result)) {
+			print_line("OpenXR: Failed to create play space [", get_error_string(result), "]");
+			return false;
+		}
 	}
 
 	// If we've previously created a play space, clean it up first.
-	if (play_space != XR_NULL_HANDLE) {
+	// But if it was a custom reference space, we don't touch it - it's the job of the extension that
+	// created it to clean it up.
+	if (play_space != XR_NULL_HANDLE && reference_space != XR_REFERENCE_SPACE_TYPE_MAX_ENUM) {
 		// TODO Investigate if destroying our play space here is safe,
 		// it may still be used in the rendering thread.
 
@@ -1029,9 +1048,17 @@ bool OpenXRAPI::setup_view_space() {
 		{ 0.0, 0.0, 0.0 }
 	};
 
+	void *next_pointer = nullptr;
+	for (OpenXRExtensionWrapper *wrapper : registered_extension_wrappers) {
+		void *np = wrapper->set_reference_space_create_info_and_get_next_pointer(XR_REFERENCE_SPACE_TYPE_VIEW, next_pointer);
+		if (np != nullptr) {
+			next_pointer = np;
+		}
+	}
+
 	XrReferenceSpaceCreateInfo view_space_create_info = {
 		XR_TYPE_REFERENCE_SPACE_CREATE_INFO, // type
-		nullptr, // next
+		next_pointer, // next
 		XR_REFERENCE_SPACE_TYPE_VIEW, // referenceSpaceType
 		identityPose // poseInReferenceSpace
 	};
@@ -1081,6 +1108,17 @@ bool OpenXRAPI::reset_emulated_floor_height() {
 	};
 
 	XrSpace new_play_space;
+
+	void *next_pointer = nullptr;
+	for (OpenXRExtensionWrapper *wrapper : registered_extension_wrappers) {
+		void *np = wrapper->set_reference_space_create_info_and_get_next_pointer(
+				create_info.referenceSpaceType, next_pointer);
+		if (np != nullptr) {
+			next_pointer = np;
+		}
+	}
+	create_info.next = next_pointer;
+
 	result = xrCreateReferenceSpace(session, &create_info, &new_play_space);
 	if (XR_FAILED(result)) {
 		print_line("OpenXR: Failed to recreate emulated LOCAL_FLOOR play space with latest floor estimate [", get_error_string(result), "]");
@@ -1478,12 +1516,21 @@ void OpenXRAPI::set_view_configuration(XrViewConfigurationType p_view_configurat
 }
 
 bool OpenXRAPI::set_requested_reference_space(XrReferenceSpaceType p_requested_reference_space) {
+	if (custom_play_space != XR_NULL_HANDLE) {
+		return false;
+	}
+
 	requested_reference_space = p_requested_reference_space;
 	play_space_is_dirty = true;
 
 	return true;
 }
 
+void OpenXRAPI::set_custom_play_space(XrSpace p_custom_space) {
+	custom_play_space = p_custom_space;
+	play_space_is_dirty = true;
+}
+
 void OpenXRAPI::set_submit_depth_buffer(bool p_submit_depth_buffer) {
 	ERR_FAIL_COND(is_initialized());
 
@@ -1740,11 +1787,14 @@ void OpenXRAPI::register_extension_metadata() {
 
 void OpenXRAPI::cleanup_extension_wrappers() {
 	for (OpenXRExtensionWrapper *extension_wrapper : registered_extension_wrappers) {
+#ifndef DISABLE_DEPRECATED
 		// Fix crash when the extension wrapper comes from GDExtension.
 		OpenXRExtensionWrapperExtension *gdextension_extension_wrapper = dynamic_cast<OpenXRExtensionWrapperExtension *>(extension_wrapper);
 		if (gdextension_extension_wrapper) {
 			memdelete(gdextension_extension_wrapper);
-		} else {
+		} else
+#endif
+		{
 			memdelete(extension_wrapper);
 		}
 	}
@@ -2111,7 +2161,15 @@ bool OpenXRAPI::process() {
 	// As the name suggests, OpenXR can pause the thread to minimize the time between
 	// retrieving tracking data and using that tracking data to render.
 	// OpenXR thus works best if rendering is performed on a separate thread.
-	XrFrameWaitInfo frame_wait_info = { XR_TYPE_FRAME_WAIT_INFO, nullptr };
+	void *frame_wait_info_next_pointer = nullptr;
+	for (OpenXRExtensionWrapper *extension : frame_info_extensions) {
+		void *np = extension->set_frame_wait_info_and_get_next_pointer(frame_wait_info_next_pointer);
+		if (np != nullptr) {
+			frame_wait_info_next_pointer = np;
+		}
+	}
+
+	XrFrameWaitInfo frame_wait_info = { XR_TYPE_FRAME_WAIT_INFO, frame_wait_info_next_pointer };
 	frame_state.predictedDisplayTime = 0;
 	frame_state.predictedDisplayPeriod = 0;
 	frame_state.shouldRender = false;
@@ -2189,6 +2247,14 @@ void OpenXRAPI::pre_render() {
 		wrapper->on_pre_render();
 	}
 
+	void *view_locate_info_next_pointer = nullptr;
+	for (OpenXRExtensionWrapper *extension : frame_info_extensions) {
+		void *np = extension->set_view_locate_info_and_get_next_pointer(view_locate_info_next_pointer);
+		if (np != nullptr) {
+			view_locate_info_next_pointer = np;
+		}
+	}
+
 	// Get our view info for the frame we're about to render, note from the OpenXR manual:
 	// "Repeatedly calling xrLocateViews with the same time may not necessarily return the same result. Instead the prediction gets increasingly accurate as the function is called closer to the given time for which a prediction is made"
 
@@ -2202,7 +2268,7 @@ void OpenXRAPI::pre_render() {
 
 	XrViewLocateInfo view_locate_info = {
 		XR_TYPE_VIEW_LOCATE_INFO, // type
-		nullptr, // next
+		view_locate_info_next_pointer, // next
 		view_configuration, // viewConfigurationType
 		render_state.predicted_display_time, // displayTime
 		render_state.play_space // space
@@ -2245,7 +2311,7 @@ void OpenXRAPI::pre_render() {
 	};
 	result = xrBeginFrame(session, &frame_begin_info);
 	if (XR_FAILED(result)) {
-		print_line("OpenXR: failed to being frame [", get_error_string(result), "]");
+		print_line("OpenXR: failed to begin frame [", get_error_string(result), "]");
 		return;
 	}
 
@@ -2425,11 +2491,11 @@ void OpenXRAPI::end_frame() {
 	bool projection_layer_is_first = true;
 
 	// Add composition layers from providers
-	for (OpenXRCompositionLayerProvider *provider : composition_layer_providers) {
-		for (int i = 0; i < provider->get_composition_layer_count(); i++) {
+	for (OpenXRExtensionWrapper *extension : composition_layer_providers) {
+		for (int i = 0; i < extension->get_composition_layer_count(); i++) {
 			OrderedCompositionLayer layer = {
-				provider->get_composition_layer(i),
-				provider->get_composition_layer_order(i),
+				extension->get_composition_layer(i),
+				extension->get_composition_layer_order(i),
 			};
 			if (layer.composition_layer) {
 				ordered_layers_list.push_back(layer);
@@ -2476,9 +2542,17 @@ void OpenXRAPI::end_frame() {
 		layers_list.push_back(ordered_layer.composition_layer);
 	}
 
+	void *frame_end_info_next_pointer = nullptr;
+	for (OpenXRExtensionWrapper *extension : frame_info_extensions) {
+		void *np = extension->set_frame_end_info_and_get_next_pointer(frame_end_info_next_pointer);
+		if (np != nullptr) {
+			frame_end_info_next_pointer = np;
+		}
+	}
+
 	XrFrameEndInfo frame_end_info = {
 		XR_TYPE_FRAME_END_INFO, // type
-		nullptr, // next
+		frame_end_info_next_pointer, // next
 		render_state.predicted_display_time, // displayTime
 		environment_blend_mode, // environmentBlendMode
 		static_cast<uint32_t>(layers_list.size()), // layerCount
@@ -2683,12 +2757,8 @@ OpenXRAPI::OpenXRAPI() {
 }
 
 OpenXRAPI::~OpenXRAPI() {
-	// cleanup our composition layer providers
-	for (OpenXRCompositionLayerProvider *provider : composition_layer_providers) {
-		memdelete(provider);
-	}
 	composition_layer_providers.clear();
-
+	frame_info_extensions.clear();
 	supported_extensions.clear();
 	layer_properties.clear();
 
@@ -2712,8 +2782,6 @@ Transform3D OpenXRAPI::transform_from_pose(const XrPosef &p_pose) {
 
 template <typename T>
 XRPose::TrackingConfidence _transform_from_location(const T &p_location, Transform3D &r_transform) {
-	Basis basis;
-	Vector3 origin;
 	XRPose::TrackingConfidence confidence = XRPose::XR_TRACKING_CONFIDENCE_NONE;
 	const XrPosef &pose = p_location.pose;
 
@@ -3596,12 +3664,12 @@ bool OpenXRAPI::trigger_haptic_pulse(RID p_action, RID p_tracker, float p_freque
 	return true;
 }
 
-void OpenXRAPI::register_composition_layer_provider(OpenXRCompositionLayerProvider *provider) {
-	composition_layer_providers.append(provider);
+void OpenXRAPI::register_composition_layer_provider(OpenXRExtensionWrapper *p_extension) {
+	composition_layer_providers.append(p_extension);
 }
 
-void OpenXRAPI::unregister_composition_layer_provider(OpenXRCompositionLayerProvider *provider) {
-	composition_layer_providers.erase(provider);
+void OpenXRAPI::unregister_composition_layer_provider(OpenXRExtensionWrapper *p_extension) {
+	composition_layer_providers.erase(p_extension);
 }
 
 void OpenXRAPI::register_projection_views_extension(OpenXRExtensionWrapper *p_extension) {
@@ -3612,6 +3680,14 @@ void OpenXRAPI::unregister_projection_views_extension(OpenXRExtensionWrapper *p_
 	projection_views_extensions.erase(p_extension);
 }
 
+void OpenXRAPI::register_frame_info_extension(OpenXRExtensionWrapper *p_extension) {
+	frame_info_extensions.append(p_extension);
+}
+
+void OpenXRAPI::unregister_frame_info_extension(OpenXRExtensionWrapper *p_extension) {
+	frame_info_extensions.erase(p_extension);
+}
+
 const Vector<XrEnvironmentBlendMode> OpenXRAPI::get_supported_environment_blend_modes() {
 	return supported_environment_blend_modes;
 }
diff --git a/engine/modules/openxr/openxr_api.h b/engine/modules/openxr/openxr_api.h
index 7c559f19..05ac2151 100644
--- a/engine/modules/openxr/openxr_api.h
+++ b/engine/modules/openxr/openxr_api.h
@@ -28,11 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_API_H
-#define OPENXR_API_H
+#pragma once
 
 #include "action_map/openxr_action.h"
-#include "extensions/openxr_composition_layer_provider.h"
 #include "extensions/openxr_extension_wrapper.h"
 #include "util.h"
 
@@ -95,11 +93,14 @@ private:
 	Vector<CharString> enabled_extensions;
 
 	// composition layer providers
-	Vector<OpenXRCompositionLayerProvider *> composition_layer_providers;
+	Vector<OpenXRExtensionWrapper *> composition_layer_providers;
 
 	// projection views extensions
 	Vector<OpenXRExtensionWrapper *> projection_views_extensions;
 
+	// frame info extensions
+	Vector<OpenXRExtensionWrapper *> frame_info_extensions;
+
 	// view configuration
 	LocalVector<XrViewConfigurationType> supported_view_configuration_types;
 
@@ -155,6 +156,7 @@ private:
 
 	bool play_space_is_dirty = true;
 	XrSpace play_space = XR_NULL_HANDLE;
+	XrSpace custom_play_space = XR_NULL_HANDLE;
 	XrSpace view_space = XR_NULL_HANDLE;
 	XRPose::TrackingConfidence head_pose_confidence = XRPose::XR_TRACKING_CONFIDENCE_NONE;
 
@@ -420,6 +422,8 @@ public:
 	OpenXRGraphicsExtensionWrapper *get_graphics_extension() const { return graphics_extension; }
 	String get_runtime_name() const { return runtime_name; }
 	String get_runtime_version() const { return runtime_version; }
+	String get_system_name() const { return system_name; }
+	uint32_t get_vendor_id() const { return vendor_id; }
 
 	// helper method to convert an XrPosef to a Transform3D
 	Transform3D transform_from_pose(const XrPosef &p_pose);
@@ -465,6 +469,7 @@ public:
 	bool set_requested_reference_space(XrReferenceSpaceType p_requested_reference_space);
 	XrReferenceSpaceType get_requested_reference_space() const { return requested_reference_space; }
 	XrReferenceSpaceType get_reference_space() const { return reference_space; }
+	void set_custom_play_space(XrSpace p_custom_space);
 
 	void set_submit_depth_buffer(bool p_submit_depth_buffer);
 	bool get_submit_depth_buffer() const { return submit_depth_buffer; }
@@ -576,12 +581,15 @@ public:
 	XRPose::TrackingConfidence get_action_pose(RID p_action, RID p_tracker, Transform3D &r_transform, Vector3 &r_linear_velocity, Vector3 &r_angular_velocity);
 	bool trigger_haptic_pulse(RID p_action, RID p_tracker, float p_frequency, float p_amplitude, XrDuration p_duration_ns);
 
-	void register_composition_layer_provider(OpenXRCompositionLayerProvider *provider);
-	void unregister_composition_layer_provider(OpenXRCompositionLayerProvider *provider);
+	void register_composition_layer_provider(OpenXRExtensionWrapper *p_extension);
+	void unregister_composition_layer_provider(OpenXRExtensionWrapper *p_extension);
 
 	void register_projection_views_extension(OpenXRExtensionWrapper *p_extension);
 	void unregister_projection_views_extension(OpenXRExtensionWrapper *p_extension);
 
+	void register_frame_info_extension(OpenXRExtensionWrapper *p_extension);
+	void unregister_frame_info_extension(OpenXRExtensionWrapper *p_extension);
+
 	const Vector<XrEnvironmentBlendMode> get_supported_environment_blend_modes();
 	bool is_environment_blend_mode_supported(XrEnvironmentBlendMode p_blend_mode) const;
 	bool set_environment_blend_mode(XrEnvironmentBlendMode p_blend_mode);
@@ -599,5 +607,3 @@ public:
 	OpenXRAPI();
 	~OpenXRAPI();
 };
-
-#endif // OPENXR_API_H
diff --git a/engine/modules/openxr/openxr_api_extension.compat.inc b/engine/modules/openxr/openxr_api_extension.compat.inc
new file mode 100644
index 00000000..23739799
--- /dev/null
+++ b/engine/modules/openxr/openxr_api_extension.compat.inc
@@ -0,0 +1,58 @@
+/**************************************************************************/
+/*  openxr_api_extension.compat.inc                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+#include "extensions/openxr_extension_wrapper_extension.h"
+
+void OpenXRAPIExtension::_register_composition_layer_provider_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension) {
+	register_composition_layer_provider(p_extension);
+}
+
+void OpenXRAPIExtension::_unregister_composition_layer_provider_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension) {
+	unregister_composition_layer_provider(p_extension);
+}
+
+void OpenXRAPIExtension::_register_projection_views_extension_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension) {
+	register_projection_views_extension(p_extension);
+}
+
+void OpenXRAPIExtension::_unregister_projection_views_extension_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension) {
+	unregister_projection_views_extension(p_extension);
+}
+
+void OpenXRAPIExtension::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_method(D_METHOD("register_composition_layer_provider", "extension"), &OpenXRAPIExtension::_register_composition_layer_provider_bind_compat_104087);
+	ClassDB::bind_compatibility_method(D_METHOD("unregister_composition_layer_provider", "extension"), &OpenXRAPIExtension::_unregister_composition_layer_provider_bind_compat_104087);
+	ClassDB::bind_compatibility_method(D_METHOD("register_projection_views_extension", "extension"), &OpenXRAPIExtension::_register_projection_views_extension_bind_compat_104087);
+	ClassDB::bind_compatibility_method(D_METHOD("unregister_projection_views_extension", "extension"), &OpenXRAPIExtension::_unregister_projection_views_extension_bind_compat_104087);
+}
+
+#endif // DISABLE_DEPRECATED
diff --git a/engine/modules/openxr/openxr_api_extension.cpp b/engine/modules/openxr/openxr_api_extension.cpp
index f570dbea..1824aef6 100644
--- a/engine/modules/openxr/openxr_api_extension.cpp
+++ b/engine/modules/openxr/openxr_api_extension.cpp
@@ -30,7 +30,8 @@
 
 #include "openxr_api_extension.h"
 
-#include "extensions/openxr_extension_wrapper_extension.h"
+#include "extensions/openxr_extension_wrapper.h"
+#include "openxr_api_extension.compat.inc"
 
 void OpenXRAPIExtension::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_instance"), &OpenXRAPIExtension::get_instance);
@@ -51,6 +52,7 @@ void OpenXRAPIExtension::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_initialized"), &OpenXRAPIExtension::is_initialized);
 	ClassDB::bind_method(D_METHOD("is_running"), &OpenXRAPIExtension::is_running);
 
+	ClassDB::bind_method(D_METHOD("set_custom_play_space", "space"), &OpenXRAPIExtension::set_custom_play_space);
 	ClassDB::bind_method(D_METHOD("get_play_space"), &OpenXRAPIExtension::get_play_space);
 	ClassDB::bind_method(D_METHOD("get_predicted_display_time"), &OpenXRAPIExtension::get_predicted_display_time);
 	ClassDB::bind_method(D_METHOD("get_next_frame_time"), &OpenXRAPIExtension::get_next_frame_time);
@@ -67,6 +69,9 @@ void OpenXRAPIExtension::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("register_projection_views_extension", "extension"), &OpenXRAPIExtension::register_projection_views_extension);
 	ClassDB::bind_method(D_METHOD("unregister_projection_views_extension", "extension"), &OpenXRAPIExtension::unregister_projection_views_extension);
 
+	ClassDB::bind_method(D_METHOD("register_frame_info_extension", "extension"), &OpenXRAPIExtension::register_frame_info_extension);
+	ClassDB::bind_method(D_METHOD("unregister_frame_info_extension", "extension"), &OpenXRAPIExtension::unregister_frame_info_extension);
+
 	ClassDB::bind_method(D_METHOD("get_render_state_z_near"), &OpenXRAPIExtension::get_render_state_z_near);
 	ClassDB::bind_method(D_METHOD("get_render_state_z_far"), &OpenXRAPIExtension::get_render_state_z_far);
 
@@ -180,6 +185,11 @@ bool OpenXRAPIExtension::is_running() {
 	return OpenXRAPI::get_singleton()->is_running();
 }
 
+void OpenXRAPIExtension::set_custom_play_space(GDExtensionConstPtr<const void> p_custom_space) {
+	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
+	OpenXRAPI::get_singleton()->set_custom_play_space(*(XrSpace *)p_custom_space.data);
+}
+
 uint64_t OpenXRAPIExtension::get_play_space() {
 	ERR_FAIL_NULL_V(OpenXRAPI::get_singleton(), 0);
 	return (uint64_t)OpenXRAPI::get_singleton()->get_play_space();
@@ -220,26 +230,36 @@ uint64_t OpenXRAPIExtension::get_hand_tracker(int p_hand_index) {
 	return (uint64_t)OpenXRAPI::get_singleton()->get_hand_tracker(p_hand_index);
 }
 
-void OpenXRAPIExtension::register_composition_layer_provider(OpenXRExtensionWrapperExtension *p_extension) {
+void OpenXRAPIExtension::register_composition_layer_provider(OpenXRExtensionWrapper *p_extension) {
 	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
 	OpenXRAPI::get_singleton()->register_composition_layer_provider(p_extension);
 }
 
-void OpenXRAPIExtension::unregister_composition_layer_provider(OpenXRExtensionWrapperExtension *p_extension) {
+void OpenXRAPIExtension::unregister_composition_layer_provider(OpenXRExtensionWrapper *p_extension) {
 	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
 	OpenXRAPI::get_singleton()->unregister_composition_layer_provider(p_extension);
 }
 
-void OpenXRAPIExtension::register_projection_views_extension(OpenXRExtensionWrapperExtension *p_extension) {
+void OpenXRAPIExtension::register_projection_views_extension(OpenXRExtensionWrapper *p_extension) {
 	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
 	OpenXRAPI::get_singleton()->register_projection_views_extension(p_extension);
 }
 
-void OpenXRAPIExtension::unregister_projection_views_extension(OpenXRExtensionWrapperExtension *p_extension) {
+void OpenXRAPIExtension::unregister_projection_views_extension(OpenXRExtensionWrapper *p_extension) {
 	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
 	OpenXRAPI::get_singleton()->unregister_projection_views_extension(p_extension);
 }
 
+void OpenXRAPIExtension::register_frame_info_extension(OpenXRExtensionWrapper *p_extension) {
+	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
+	OpenXRAPI::get_singleton()->register_frame_info_extension(p_extension);
+}
+
+void OpenXRAPIExtension::unregister_frame_info_extension(OpenXRExtensionWrapper *p_extension) {
+	ERR_FAIL_NULL(OpenXRAPI::get_singleton());
+	OpenXRAPI::get_singleton()->unregister_frame_info_extension(p_extension);
+}
+
 double OpenXRAPIExtension::get_render_state_z_near() {
 	ERR_NOT_ON_RENDER_THREAD_V(0.0);
 	ERR_FAIL_NULL_V(OpenXRAPI::get_singleton(), 0.0);
diff --git a/engine/modules/openxr/openxr_api_extension.h b/engine/modules/openxr/openxr_api_extension.h
index 487baf38..85d03447 100644
--- a/engine/modules/openxr/openxr_api_extension.h
+++ b/engine/modules/openxr/openxr_api_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_API_EXTENSION_H
-#define OPENXR_API_EXTENSION_H
+#pragma once
 
 #include "openxr_api.h"
 
@@ -37,6 +36,7 @@
 #include "core/os/thread_safe.h"
 #include "core/variant/native_ptr.h"
 
+class OpenXRExtensionWrapper;
 class OpenXRExtensionWrapperExtension;
 
 class OpenXRAPIExtension : public RefCounted {
@@ -47,6 +47,14 @@ protected:
 
 	static void _bind_methods();
 
+#ifndef DISABLE_DEPRECATED
+	static void _bind_compatibility_methods();
+	void _register_composition_layer_provider_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension);
+	void _unregister_composition_layer_provider_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension);
+	void _register_projection_views_extension_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension);
+	void _unregister_projection_views_extension_bind_compat_104087(OpenXRExtensionWrapperExtension *p_extension);
+#endif
+
 public:
 	uint64_t get_instance();
 	uint64_t get_system_id();
@@ -71,6 +79,7 @@ public:
 	bool is_initialized();
 	bool is_running();
 
+	void set_custom_play_space(GDExtensionConstPtr<const void> p_custom_space);
 	uint64_t get_play_space();
 	int64_t get_predicted_display_time();
 	int64_t get_next_frame_time();
@@ -81,11 +90,14 @@ public:
 
 	uint64_t get_hand_tracker(int p_hand_index);
 
-	void register_composition_layer_provider(OpenXRExtensionWrapperExtension *p_extension);
-	void unregister_composition_layer_provider(OpenXRExtensionWrapperExtension *p_extension);
+	void register_composition_layer_provider(OpenXRExtensionWrapper *p_extension);
+	void unregister_composition_layer_provider(OpenXRExtensionWrapper *p_extension);
 
-	void register_projection_views_extension(OpenXRExtensionWrapperExtension *p_extension);
-	void unregister_projection_views_extension(OpenXRExtensionWrapperExtension *p_extension);
+	void register_projection_views_extension(OpenXRExtensionWrapper *p_extension);
+	void unregister_projection_views_extension(OpenXRExtensionWrapper *p_extension);
+
+	void register_frame_info_extension(OpenXRExtensionWrapper *p_extension);
+	void unregister_frame_info_extension(OpenXRExtensionWrapper *p_extension);
 
 	double get_render_state_z_near();
 	double get_render_state_z_far();
@@ -120,5 +132,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(OpenXRAPIExtension::OpenXRAlphaBlendModeSupport);
-
-#endif // OPENXR_API_EXTENSION_H
diff --git a/engine/modules/openxr/openxr_interface.cpp b/engine/modules/openxr/openxr_interface.cpp
index 7478cdc7..cf9a54a5 100644
--- a/engine/modules/openxr/openxr_interface.cpp
+++ b/engine/modules/openxr/openxr_interface.cpp
@@ -35,6 +35,7 @@
 
 #include "extensions/openxr_eye_gaze_interaction.h"
 #include "extensions/openxr_hand_interaction_extension.h"
+#include "extensions/openxr_performance_settings_extension.h"
 #include "servers/rendering/renderer_compositor.h"
 
 #include <openxr/openxr.h>
@@ -50,6 +51,9 @@ void OpenXRInterface::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("pose_recentered"));
 	ADD_SIGNAL(MethodInfo("refresh_rate_changed", PropertyInfo(Variant::FLOAT, "refresh_rate")));
 
+	ADD_SIGNAL(MethodInfo("cpu_level_changed", PropertyInfo(Variant::INT, "sub_domain"), PropertyInfo(Variant::INT, "from_level"), PropertyInfo(Variant::INT, "to_level")));
+	ADD_SIGNAL(MethodInfo("gpu_level_changed", PropertyInfo(Variant::INT, "sub_domain"), PropertyInfo(Variant::INT, "from_level"), PropertyInfo(Variant::INT, "to_level")));
+
 	// Display refresh rate
 	ClassDB::bind_method(D_METHOD("get_display_refresh_rate"), &OpenXRInterface::get_display_refresh_rate);
 	ClassDB::bind_method(D_METHOD("set_display_refresh_rate", "refresh_rate"), &OpenXRInterface::set_display_refresh_rate);
@@ -104,6 +108,10 @@ void OpenXRInterface::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_vrs_strength"), &OpenXRInterface::get_vrs_strength);
 	ClassDB::bind_method(D_METHOD("set_vrs_strength", "strength"), &OpenXRInterface::set_vrs_strength);
 
+	// Performance settings.
+	ClassDB::bind_method(D_METHOD("set_cpu_level", "level"), &OpenXRInterface::set_cpu_level);
+	ClassDB::bind_method(D_METHOD("set_gpu_level", "level"), &OpenXRInterface::set_gpu_level);
+
 	ADD_GROUP("Vulkan VRS", "vrs_");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "vrs_min_radius", PROPERTY_HINT_RANGE, "1.0,100.0,1.0"), "set_vrs_min_radius", "get_vrs_min_radius");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "vrs_strength", PROPERTY_HINT_RANGE, "0.1,10.0,0.1"), "set_vrs_strength", "get_vrs_strength");
@@ -149,6 +157,19 @@ void OpenXRInterface::_bind_methods() {
 	BIND_ENUM_CONSTANT(HAND_JOINT_LITTLE_TIP);
 	BIND_ENUM_CONSTANT(HAND_JOINT_MAX);
 
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_LEVEL_POWER_SAVINGS);
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_LEVEL_SUSTAINED_LOW);
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_LEVEL_SUSTAINED_HIGH);
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_LEVEL_BOOST);
+
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_SUB_DOMAIN_COMPOSITING);
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_SUB_DOMAIN_RENDERING);
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_SUB_DOMAIN_THERMAL);
+
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_NOTIF_LEVEL_NORMAL);
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_NOTIF_LEVEL_WARNING);
+	BIND_ENUM_CONSTANT(PERF_SETTINGS_NOTIF_LEVEL_IMPAIRED);
+
 	BIND_BITFIELD_FLAG(HAND_JOINT_NONE);
 	BIND_BITFIELD_FLAG(HAND_JOINT_ORIENTATION_VALID);
 	BIND_BITFIELD_FLAG(HAND_JOINT_ORIENTATION_TRACKED);
@@ -705,6 +726,8 @@ Dictionary OpenXRInterface::get_system_info() {
 	if (openxr_api) {
 		dict[SNAME("XRRuntimeName")] = openxr_api->get_runtime_name();
 		dict[SNAME("XRRuntimeVersion")] = openxr_api->get_runtime_version();
+		dict[SNAME("OpenXRSystemName")] = openxr_api->get_system_name();
+		dict[SNAME("OpenXRVendorID")] = openxr_api->get_vendor_id();
 	}
 
 	return dict;
@@ -730,6 +753,8 @@ XRInterface::PlayAreaMode OpenXRInterface::get_play_area_mode() const {
 		return XRInterface::XR_PLAY_AREA_ROOMSCALE;
 	} else if (reference_space == XR_REFERENCE_SPACE_TYPE_STAGE) {
 		return XRInterface::XR_PLAY_AREA_STAGE;
+	} else if (reference_space == XR_REFERENCE_SPACE_TYPE_MAX_ENUM) {
+		return XRInterface::XR_PLAY_AREA_CUSTOM;
 	}
 
 	return XRInterface::XR_PLAY_AREA_UNKNOWN;
@@ -1441,7 +1466,7 @@ OpenXRInterface::HandTrackedSource OpenXRInterface::get_hand_tracking_source(con
 }
 
 BitField<OpenXRInterface::HandJointFlags> OpenXRInterface::get_hand_joint_flags(Hand p_hand, HandJoints p_joint) const {
-	BitField<OpenXRInterface::HandJointFlags> bits;
+	BitField<OpenXRInterface::HandJointFlags> bits = HAND_JOINT_NONE;
 
 	OpenXRHandTrackingExtension *hand_tracking_ext = OpenXRHandTrackingExtension::get_singleton();
 	if (hand_tracking_ext && hand_tracking_ext->get_active()) {
@@ -1536,6 +1561,28 @@ RID OpenXRInterface::get_vrs_texture() {
 	return xr_vrs.make_vrs_texture(target_size, eye_foci);
 }
 
+void OpenXRInterface::set_cpu_level(PerfSettingsLevel p_level) {
+	OpenXRPerformanceSettingsExtension *performance_settings_ext = OpenXRPerformanceSettingsExtension::get_singleton();
+	if (performance_settings_ext && performance_settings_ext->is_available()) {
+		performance_settings_ext->set_cpu_level(p_level);
+	}
+}
+
+void OpenXRInterface::set_gpu_level(PerfSettingsLevel p_level) {
+	OpenXRPerformanceSettingsExtension *performance_settings_ext = OpenXRPerformanceSettingsExtension::get_singleton();
+	if (performance_settings_ext && performance_settings_ext->is_available()) {
+		performance_settings_ext->set_gpu_level(p_level);
+	}
+}
+
+void OpenXRInterface::on_cpu_level_changed(PerfSettingsSubDomain p_sub_domain, PerfSettingsNotificationLevel p_from_level, PerfSettingsNotificationLevel p_to_level) {
+	emit_signal(SNAME("cpu_level_changed"), p_sub_domain, p_from_level, p_to_level);
+}
+
+void OpenXRInterface::on_gpu_level_changed(PerfSettingsSubDomain p_sub_domain, PerfSettingsNotificationLevel p_from_level, PerfSettingsNotificationLevel p_to_level) {
+	emit_signal(SNAME("gpu_level_changed"), p_sub_domain, p_from_level, p_to_level);
+}
+
 OpenXRInterface::OpenXRInterface() {
 	openxr_api = OpenXRAPI::get_singleton();
 	if (openxr_api) {
diff --git a/engine/modules/openxr/openxr_interface.h b/engine/modules/openxr/openxr_interface.h
index 8909d183..19e4c302 100644
--- a/engine/modules/openxr/openxr_interface.h
+++ b/engine/modules/openxr/openxr_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_INTERFACE_H
-#define OPENXR_INTERFACE_H
+#pragma once
 
 // A note on multithreading and thread safety in OpenXR.
 //
@@ -292,6 +291,31 @@ public:
 
 	virtual RID get_vrs_texture() override;
 
+	// Performance settings.
+	enum PerfSettingsLevel {
+		PERF_SETTINGS_LEVEL_POWER_SAVINGS,
+		PERF_SETTINGS_LEVEL_SUSTAINED_LOW,
+		PERF_SETTINGS_LEVEL_SUSTAINED_HIGH,
+		PERF_SETTINGS_LEVEL_BOOST,
+	};
+
+	enum PerfSettingsSubDomain {
+		PERF_SETTINGS_SUB_DOMAIN_COMPOSITING,
+		PERF_SETTINGS_SUB_DOMAIN_RENDERING,
+		PERF_SETTINGS_SUB_DOMAIN_THERMAL,
+	};
+
+	enum PerfSettingsNotificationLevel {
+		PERF_SETTINGS_NOTIF_LEVEL_NORMAL,
+		PERF_SETTINGS_NOTIF_LEVEL_WARNING,
+		PERF_SETTINGS_NOTIF_LEVEL_IMPAIRED,
+	};
+
+	void set_cpu_level(PerfSettingsLevel p_level);
+	void set_gpu_level(PerfSettingsLevel p_level);
+	void on_cpu_level_changed(PerfSettingsSubDomain p_sub_domain, PerfSettingsNotificationLevel p_from_level, PerfSettingsNotificationLevel p_to_level);
+	void on_gpu_level_changed(PerfSettingsSubDomain p_sub_domain, PerfSettingsNotificationLevel p_from_level, PerfSettingsNotificationLevel p_to_level);
+
 	OpenXRInterface();
 	~OpenXRInterface();
 };
@@ -300,6 +324,7 @@ VARIANT_ENUM_CAST(OpenXRInterface::Hand)
 VARIANT_ENUM_CAST(OpenXRInterface::HandMotionRange)
 VARIANT_ENUM_CAST(OpenXRInterface::HandTrackedSource)
 VARIANT_ENUM_CAST(OpenXRInterface::HandJoints)
+VARIANT_ENUM_CAST(OpenXRInterface::PerfSettingsLevel)
+VARIANT_ENUM_CAST(OpenXRInterface::PerfSettingsSubDomain)
+VARIANT_ENUM_CAST(OpenXRInterface::PerfSettingsNotificationLevel)
 VARIANT_BITFIELD_CAST(OpenXRInterface::HandJointFlags)
-
-#endif // OPENXR_INTERFACE_H
diff --git a/engine/modules/openxr/openxr_platform_inc.h b/engine/modules/openxr/openxr_platform_inc.h
index d2268efc..7c0aeedd 100644
--- a/engine/modules/openxr/openxr_platform_inc.h
+++ b/engine/modules/openxr/openxr_platform_inc.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_PLATFORM_INC_H
-#define OPENXR_PLATFORM_INC_H
+#pragma once
 
 // In various places we need to include platform definitions but we can't
 // include these in our normal header files as we'll end up with issues.
@@ -86,5 +85,3 @@
 
 // Include platform dependent structs.
 #include <openxr/openxr_platform.h>
-
-#endif // OPENXR_PLATFORM_INC_H
diff --git a/engine/modules/openxr/openxr_util.h b/engine/modules/openxr/openxr_util.h
index 3f36ab9f..9e2cc66b 100644
--- a/engine/modules/openxr/openxr_util.h
+++ b/engine/modules/openxr/openxr_util.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_UTIL_H
-#define OPENXR_UTIL_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -66,5 +65,3 @@ public:
 	static void XrMatrix4x4f_CreateProjectionFov(XrMatrix4x4f *result, GraphicsAPI graphicsApi, const XrFovf fov,
 			const float nearZ, const float farZ);
 };
-
-#endif // OPENXR_UTIL_H
diff --git a/engine/modules/openxr/register_types.cpp b/engine/modules/openxr/register_types.cpp
index 69c119d0..c7144765 100644
--- a/engine/modules/openxr/register_types.cpp
+++ b/engine/modules/openxr/register_types.cpp
@@ -36,9 +36,12 @@
 #include "action_map/openxr_haptic_feedback.h"
 #include "action_map/openxr_interaction_profile.h"
 #include "action_map/openxr_interaction_profile_metadata.h"
+#include "openxr_api_extension.h"
 #include "openxr_interface.h"
 
+#ifndef DISABLE_DEPRECATED
 #include "extensions/openxr_extension_wrapper_extension.h"
+#endif // DISABLE_DEPRECATED
 
 #include "scene/openxr_composition_layer.h"
 #include "scene/openxr_composition_layer_cylinder.h"
@@ -53,6 +56,7 @@
 #include "extensions/openxr_dpad_binding_extension.h"
 #include "extensions/openxr_eye_gaze_interaction.h"
 #include "extensions/openxr_fb_display_refresh_rate_extension.h"
+#include "extensions/openxr_future_extension.h"
 #include "extensions/openxr_hand_interaction_extension.h"
 #include "extensions/openxr_hand_tracking_extension.h"
 #include "extensions/openxr_htc_controller_extension.h"
@@ -63,6 +67,7 @@
 #include "extensions/openxr_ml2_controller_extension.h"
 #include "extensions/openxr_mxink_extension.h"
 #include "extensions/openxr_palm_pose_extension.h"
+#include "extensions/openxr_performance_settings_extension.h"
 #include "extensions/openxr_pico_controller_extension.h"
 #include "extensions/openxr_valve_analog_threshold_extension.h"
 #include "extensions/openxr_visibility_mask_extension.h"
@@ -110,8 +115,16 @@ static void _editor_init() {
 
 void initialize_openxr_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_CORE) {
-		GDREGISTER_CLASS(OpenXRExtensionWrapperExtension);
+		GDREGISTER_VIRTUAL_CLASS(OpenXRExtensionWrapper);
+#ifndef DISABLE_DEPRECATED
+		GDREGISTER_VIRTUAL_CLASS(OpenXRExtensionWrapperExtension);
+#endif // DISABLE_DEPRECATED
+		GDREGISTER_ABSTRACT_CLASS(OpenXRFutureResult); // Declared abstract, should never be instantiated by a user (Q or should this be internal?)
+		GDREGISTER_CLASS(OpenXRFutureExtension);
 		GDREGISTER_CLASS(OpenXRAPIExtension);
+
+		// Note, we're not registering all wrapper classes here, there is no point in exposing them
+		// if there isn't specific logic to expose.
 	}
 
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SERVERS) {
@@ -139,6 +152,12 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
 			OpenXRAPI::register_extension_wrapper(memnew(OpenXRHandInteractionExtension));
 			OpenXRAPI::register_extension_wrapper(memnew(OpenXRMxInkExtension));
 			OpenXRAPI::register_extension_wrapper(memnew(OpenXRVisibilityMaskExtension));
+			OpenXRAPI::register_extension_wrapper(memnew(OpenXRPerformanceSettingsExtension));
+
+			// Futures extension has to be registered as a singleton so extensions can access it.
+			OpenXRFutureExtension *future_extension = memnew(OpenXRFutureExtension);
+			OpenXRAPI::register_extension_wrapper(future_extension);
+			Engine::get_singleton()->add_singleton(Engine::Singleton("OpenXRFutureExtension", future_extension));
 
 			// register gated extensions
 			if (int(GLOBAL_GET("xr/openxr/extensions/debug_utils")) > 0) {
@@ -223,15 +242,17 @@ void initialize_openxr_module(ModuleInitializationLevel p_level) {
 				openxr_interface->initialize();
 			}
 		}
+	}
 
 #ifdef TOOLS_ENABLED
+	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
 		GDREGISTER_ABSTRACT_CLASS(OpenXRInteractionProfileEditorBase);
 		GDREGISTER_CLASS(OpenXRInteractionProfileEditor);
 		GDREGISTER_CLASS(OpenXRBindingModifierEditor);
 
 		EditorNode::add_init_callback(_editor_init);
-#endif
 	}
+#endif
 }
 
 void uninitialize_openxr_module(ModuleInitializationLevel p_level) {
diff --git a/engine/modules/openxr/register_types.h b/engine/modules/openxr/register_types.h
index f7839051..50679719 100644
--- a/engine/modules/openxr/register_types.h
+++ b/engine/modules/openxr/register_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_REGISTER_TYPES_H
-#define OPENXR_REGISTER_TYPES_H
+#pragma once
 
 #define MODULE_OPENXR_HAS_PREREGISTER
 
@@ -37,5 +36,3 @@
 
 void initialize_openxr_module(ModuleInitializationLevel p_level);
 void uninitialize_openxr_module(ModuleInitializationLevel p_level);
-
-#endif // OPENXR_REGISTER_TYPES_H
diff --git a/engine/modules/openxr/scene/openxr_composition_layer.cpp b/engine/modules/openxr/scene/openxr_composition_layer.cpp
index 47cb4f3a..3c26edcb 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer.cpp
+++ b/engine/modules/openxr/scene/openxr_composition_layer.cpp
@@ -30,12 +30,11 @@
 
 #include "openxr_composition_layer.h"
 
-#include "../extensions/openxr_composition_layer_extension.h"
 #include "../openxr_api.h"
 #include "../openxr_interface.h"
 
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/xr_nodes.h"
+#include "scene/3d/xr/xr_nodes.h"
 #include "scene/main/viewport.h"
 
 #include "platform/android/api/java_class_wrapper.h"
@@ -52,6 +51,7 @@ static const char *HOLE_PUNCH_SHADER_CODE =
 OpenXRCompositionLayer::OpenXRCompositionLayer(XrCompositionLayerBaseHeader *p_composition_layer) {
 	composition_layer_base_header = p_composition_layer;
 	openxr_layer_provider = memnew(OpenXRViewportCompositionLayerProvider(composition_layer_base_header));
+	swapchain_state = openxr_layer_provider->get_swapchain_state();
 
 	openxr_api = OpenXRAPI::get_singleton();
 	composition_layer_extension = OpenXRCompositionLayerExtension::get_singleton();
@@ -113,6 +113,39 @@ void OpenXRCompositionLayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_android_surface"), &OpenXRCompositionLayer::get_android_surface);
 	ClassDB::bind_method(D_METHOD("is_natively_supported"), &OpenXRCompositionLayer::is_natively_supported);
 
+	ClassDB::bind_method(D_METHOD("set_min_filter", "mode"), &OpenXRCompositionLayer::set_min_filter);
+	ClassDB::bind_method(D_METHOD("get_min_filter"), &OpenXRCompositionLayer::get_min_filter);
+
+	ClassDB::bind_method(D_METHOD("set_mag_filter", "mode"), &OpenXRCompositionLayer::set_mag_filter);
+	ClassDB::bind_method(D_METHOD("get_mag_filter"), &OpenXRCompositionLayer::get_mag_filter);
+
+	ClassDB::bind_method(D_METHOD("set_mipmap_mode", "mode"), &OpenXRCompositionLayer::set_mipmap_mode);
+	ClassDB::bind_method(D_METHOD("get_mipmap_mode"), &OpenXRCompositionLayer::get_mipmap_mode);
+
+	ClassDB::bind_method(D_METHOD("set_horizontal_wrap", "mode"), &OpenXRCompositionLayer::set_horizontal_wrap);
+	ClassDB::bind_method(D_METHOD("get_horizontal_wrap"), &OpenXRCompositionLayer::get_horizontal_wrap);
+
+	ClassDB::bind_method(D_METHOD("set_vertical_wrap", "mode"), &OpenXRCompositionLayer::set_vertical_wrap);
+	ClassDB::bind_method(D_METHOD("get_vertical_wrap"), &OpenXRCompositionLayer::get_vertical_wrap);
+
+	ClassDB::bind_method(D_METHOD("set_red_swizzle", "mode"), &OpenXRCompositionLayer::set_red_swizzle);
+	ClassDB::bind_method(D_METHOD("get_red_swizzle"), &OpenXRCompositionLayer::get_red_swizzle);
+
+	ClassDB::bind_method(D_METHOD("set_green_swizzle", "mode"), &OpenXRCompositionLayer::set_green_swizzle);
+	ClassDB::bind_method(D_METHOD("get_green_swizzle"), &OpenXRCompositionLayer::get_green_swizzle);
+
+	ClassDB::bind_method(D_METHOD("set_blue_swizzle", "mode"), &OpenXRCompositionLayer::set_blue_swizzle);
+	ClassDB::bind_method(D_METHOD("get_blue_swizzle"), &OpenXRCompositionLayer::get_blue_swizzle);
+
+	ClassDB::bind_method(D_METHOD("set_alpha_swizzle", "mode"), &OpenXRCompositionLayer::set_alpha_swizzle);
+	ClassDB::bind_method(D_METHOD("get_alpha_swizzle"), &OpenXRCompositionLayer::get_alpha_swizzle);
+
+	ClassDB::bind_method(D_METHOD("set_max_anisotropy", "value"), &OpenXRCompositionLayer::set_max_anisotropy);
+	ClassDB::bind_method(D_METHOD("get_max_anisotropy"), &OpenXRCompositionLayer::get_max_anisotropy);
+
+	ClassDB::bind_method(D_METHOD("set_border_color", "color"), &OpenXRCompositionLayer::set_border_color);
+	ClassDB::bind_method(D_METHOD("get_border_color"), &OpenXRCompositionLayer::get_border_color);
+
 	ClassDB::bind_method(D_METHOD("intersects_ray", "origin", "direction"), &OpenXRCompositionLayer::intersects_ray);
 
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "layer_viewport", PROPERTY_HINT_NODE_TYPE, "SubViewport"), "set_layer_viewport", "get_layer_viewport");
@@ -121,10 +154,45 @@ void OpenXRCompositionLayer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "sort_order", PROPERTY_HINT_NONE, ""), "set_sort_order", "get_sort_order");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "alpha_blend", PROPERTY_HINT_NONE, ""), "set_alpha_blend", "get_alpha_blend");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enable_hole_punch", PROPERTY_HINT_NONE, ""), "set_enable_hole_punch", "get_enable_hole_punch");
+
+	ADD_GROUP("Swapchain State", "swapchain_state_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_min_filter", PROPERTY_HINT_ENUM, "Nearest,Linear,Cubic"), "set_min_filter", "get_min_filter");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_mag_filter", PROPERTY_HINT_ENUM, "Nearest,Linear,Cubic"), "set_mag_filter", "get_mag_filter");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_mipmap_mode", PROPERTY_HINT_ENUM, "Disabled,Nearest,Linear"), "set_mipmap_mode", "get_mipmap_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_horizontal_wrap", PROPERTY_HINT_ENUM, "Clamp to Border,Clamp to Edge,Repeat,Mirrored Repeat,Mirror Clamp to Edge"), "set_horizontal_wrap", "get_horizontal_wrap");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_vertical_wrap", PROPERTY_HINT_ENUM, "Clamp to Border,Clamp to Edge,Repeat,Mirrored Repeat,Mirror Clamp to Edge"), "set_vertical_wrap", "get_vertical_wrap");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_red_swizzle", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Zero,One"), "set_red_swizzle", "get_red_swizzle");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_green_swizzle", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Zero,One"), "set_green_swizzle", "get_green_swizzle");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_blue_swizzle", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Zero,One"), "set_blue_swizzle", "get_blue_swizzle");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "swapchain_state_alpha_swizzle", PROPERTY_HINT_ENUM, "Red,Green,Blue,Alpha,Zero,One"), "set_alpha_swizzle", "get_alpha_swizzle");
+	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "swapchain_state_max_anisotropy", PROPERTY_HINT_RANGE, "1.0,16.0,0.001"), "set_max_anisotropy", "get_max_anisotropy");
+	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "swapchain_state_border_color"), "set_border_color", "get_border_color");
+	ADD_GROUP("", "");
+
+	BIND_ENUM_CONSTANT(FILTER_NEAREST);
+	BIND_ENUM_CONSTANT(FILTER_LINEAR);
+	BIND_ENUM_CONSTANT(FILTER_CUBIC);
+
+	BIND_ENUM_CONSTANT(MIPMAP_MODE_DISABLED);
+	BIND_ENUM_CONSTANT(MIPMAP_MODE_NEAREST);
+	BIND_ENUM_CONSTANT(MIPMAP_MODE_LINEAR);
+
+	BIND_ENUM_CONSTANT(WRAP_CLAMP_TO_BORDER);
+	BIND_ENUM_CONSTANT(WRAP_CLAMP_TO_EDGE);
+	BIND_ENUM_CONSTANT(WRAP_REPEAT);
+	BIND_ENUM_CONSTANT(WRAP_MIRRORED_REPEAT);
+	BIND_ENUM_CONSTANT(WRAP_MIRROR_CLAMP_TO_EDGE);
+
+	BIND_ENUM_CONSTANT(SWIZZLE_RED);
+	BIND_ENUM_CONSTANT(SWIZZLE_GREEN);
+	BIND_ENUM_CONSTANT(SWIZZLE_BLUE);
+	BIND_ENUM_CONSTANT(SWIZZLE_ALPHA);
+	BIND_ENUM_CONSTANT(SWIZZLE_ZERO);
+	BIND_ENUM_CONSTANT(SWIZZLE_ONE);
 }
 
 bool OpenXRCompositionLayer::_should_use_fallback_node() {
-	if (Engine::get_singleton()->is_editor_hint()) {
+	if (Engine::get_singleton()->is_editor_hint() || openxr_api == nullptr) {
 		return true;
 	} else if (openxr_session_running) {
 		return enable_hole_punch || (!is_natively_supported() && !use_android_surface);
@@ -151,6 +219,7 @@ void OpenXRCompositionLayer::_setup_composition_layer_provider() {
 	if (use_android_surface || layer_viewport) {
 		if (composition_layer_extension) {
 			composition_layer_extension->register_viewport_composition_layer_provider(openxr_layer_provider);
+			registered = true;
 		}
 
 		// NOTE: We don't setup/clear when using Android surfaces, so we don't destroy the surface unexpectedly.
@@ -164,6 +233,7 @@ void OpenXRCompositionLayer::_setup_composition_layer_provider() {
 void OpenXRCompositionLayer::_clear_composition_layer_provider() {
 	if (composition_layer_extension) {
 		composition_layer_extension->unregister_viewport_composition_layer_provider(openxr_layer_provider);
+		registered = false;
 	}
 
 	// NOTE: We don't setup/clear when using Android surfaces, so we don't destroy the surface unexpectedly.
@@ -228,6 +298,9 @@ void OpenXRCompositionLayer::set_layer_viewport(SubViewport *p_viewport) {
 	}
 
 	layer_viewport = p_viewport;
+	if (!registered && is_natively_supported() && openxr_session_running && is_inside_tree() && is_visible()) {
+		_setup_composition_layer_provider();
+	}
 
 	if (layer_viewport) {
 		SubViewport::UpdateMode update_mode = layer_viewport->get_update_mode();
@@ -331,12 +404,155 @@ bool OpenXRCompositionLayer::get_alpha_blend() const {
 }
 
 bool OpenXRCompositionLayer::is_natively_supported() const {
-	if (composition_layer_extension) {
+	if (composition_layer_extension && openxr_api) {
 		return composition_layer_extension->is_available(openxr_layer_provider->get_openxr_type());
 	}
 	return false;
 }
 
+void OpenXRCompositionLayer::set_min_filter(Filter p_mode) {
+	if (swapchain_state->min_filter == (OpenXRViewportCompositionLayerProvider::Filter)p_mode) {
+		return;
+	}
+
+	swapchain_state->min_filter = (OpenXRViewportCompositionLayerProvider::Filter)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Filter OpenXRCompositionLayer::get_min_filter() const {
+	return (OpenXRCompositionLayer::Filter)swapchain_state->min_filter;
+}
+
+void OpenXRCompositionLayer::set_mag_filter(Filter p_mode) {
+	if (swapchain_state->mag_filter == (OpenXRViewportCompositionLayerProvider::Filter)p_mode) {
+		return;
+	}
+
+	swapchain_state->mag_filter = (OpenXRViewportCompositionLayerProvider::Filter)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Filter OpenXRCompositionLayer::get_mag_filter() const {
+	return (OpenXRCompositionLayer::Filter)swapchain_state->mag_filter;
+}
+
+void OpenXRCompositionLayer::set_mipmap_mode(MipmapMode p_mode) {
+	if (swapchain_state->mipmap_mode == (OpenXRViewportCompositionLayerProvider::MipmapMode)p_mode) {
+		return;
+	}
+
+	swapchain_state->mipmap_mode = (OpenXRViewportCompositionLayerProvider::MipmapMode)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::MipmapMode OpenXRCompositionLayer::get_mipmap_mode() const {
+	return (OpenXRCompositionLayer::MipmapMode)swapchain_state->mipmap_mode;
+}
+
+void OpenXRCompositionLayer::set_horizontal_wrap(Wrap p_mode) {
+	if (swapchain_state->horizontal_wrap == (OpenXRViewportCompositionLayerProvider::Wrap)p_mode) {
+		return;
+	}
+
+	swapchain_state->horizontal_wrap = (OpenXRViewportCompositionLayerProvider::Wrap)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Wrap OpenXRCompositionLayer::get_horizontal_wrap() const {
+	return (OpenXRCompositionLayer::Wrap)swapchain_state->horizontal_wrap;
+}
+
+void OpenXRCompositionLayer::set_vertical_wrap(Wrap p_mode) {
+	if (swapchain_state->vertical_wrap == (OpenXRViewportCompositionLayerProvider::Wrap)p_mode) {
+		return;
+	}
+
+	swapchain_state->vertical_wrap = (OpenXRViewportCompositionLayerProvider::Wrap)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Wrap OpenXRCompositionLayer::get_vertical_wrap() const {
+	return (OpenXRCompositionLayer::Wrap)swapchain_state->vertical_wrap;
+}
+
+void OpenXRCompositionLayer::set_red_swizzle(Swizzle p_mode) {
+	if (swapchain_state->red_swizzle == (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode) {
+		return;
+	}
+
+	swapchain_state->red_swizzle = (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Swizzle OpenXRCompositionLayer::get_red_swizzle() const {
+	return (OpenXRCompositionLayer::Swizzle)swapchain_state->red_swizzle;
+}
+
+void OpenXRCompositionLayer::set_green_swizzle(Swizzle p_mode) {
+	if (swapchain_state->green_swizzle == (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode) {
+		return;
+	}
+
+	swapchain_state->green_swizzle = (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Swizzle OpenXRCompositionLayer::get_green_swizzle() const {
+	return (OpenXRCompositionLayer::Swizzle)swapchain_state->green_swizzle;
+}
+
+void OpenXRCompositionLayer::set_blue_swizzle(Swizzle p_mode) {
+	if (swapchain_state->blue_swizzle == (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode) {
+		return;
+	}
+
+	swapchain_state->blue_swizzle = (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Swizzle OpenXRCompositionLayer::get_blue_swizzle() const {
+	return (OpenXRCompositionLayer::Swizzle)swapchain_state->blue_swizzle;
+}
+
+void OpenXRCompositionLayer::set_alpha_swizzle(Swizzle p_mode) {
+	if (swapchain_state->alpha_swizzle == (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode) {
+		return;
+	}
+
+	swapchain_state->alpha_swizzle = (OpenXRViewportCompositionLayerProvider::Swizzle)p_mode;
+	swapchain_state->dirty = true;
+}
+
+OpenXRCompositionLayer::Swizzle OpenXRCompositionLayer::get_alpha_swizzle() const {
+	return (OpenXRCompositionLayer::Swizzle)swapchain_state->alpha_swizzle;
+}
+
+void OpenXRCompositionLayer::set_max_anisotropy(float p_value) {
+	if (swapchain_state->max_anisotropy == p_value) {
+		return;
+	}
+
+	swapchain_state->max_anisotropy = p_value;
+	swapchain_state->dirty = true;
+}
+
+float OpenXRCompositionLayer::get_max_anisotropy() const {
+	return swapchain_state->max_anisotropy;
+}
+
+void OpenXRCompositionLayer::set_border_color(Color p_color) {
+	if (swapchain_state->border_color == p_color) {
+		return;
+	}
+
+	swapchain_state->border_color = p_color;
+	swapchain_state->dirty = true;
+}
+
+Color OpenXRCompositionLayer::get_border_color() const {
+	return swapchain_state->border_color;
+}
+
 Ref<JavaObject> OpenXRCompositionLayer::get_android_surface() {
 	return openxr_layer_provider->get_android_surface();
 }
diff --git a/engine/modules/openxr/scene/openxr_composition_layer.h b/engine/modules/openxr/scene/openxr_composition_layer.h
index 26b40236..97838377 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_COMPOSITION_LAYER_H
-#define OPENXR_COMPOSITION_LAYER_H
+#pragma once
 
 #include <openxr/openxr.h>
 
+#include "../extensions/openxr_composition_layer_extension.h"
 #include "scene/3d/node_3d.h"
 
 class JavaObject;
@@ -46,6 +46,41 @@ class SubViewport;
 class OpenXRCompositionLayer : public Node3D {
 	GDCLASS(OpenXRCompositionLayer, Node3D);
 
+public:
+	// Must be identical to Filter enum definition in OpenXRViewportCompositionLayerProvider.
+	enum Filter {
+		FILTER_NEAREST,
+		FILTER_LINEAR,
+		FILTER_CUBIC,
+	};
+
+	// Must be identical to MipmapMode enum definition in OpenXRViewportCompositionLayerProvider.
+	enum MipmapMode {
+		MIPMAP_MODE_DISABLED,
+		MIPMAP_MODE_NEAREST,
+		MIPMAP_MODE_LINEAR,
+	};
+
+	// Must be identical to Wrap enum definition in OpenXRViewportCompositionLayerProvider.
+	enum Wrap {
+		WRAP_CLAMP_TO_BORDER,
+		WRAP_CLAMP_TO_EDGE,
+		WRAP_REPEAT,
+		WRAP_MIRRORED_REPEAT,
+		WRAP_MIRROR_CLAMP_TO_EDGE,
+	};
+
+	// Must be identical to Swizzle enum definition in OpenXRViewportCompositionLayerProvider.
+	enum Swizzle {
+		SWIZZLE_RED,
+		SWIZZLE_GREEN,
+		SWIZZLE_BLUE,
+		SWIZZLE_ALPHA,
+		SWIZZLE_ZERO,
+		SWIZZLE_ONE,
+	};
+
+private:
 	XrCompositionLayerBaseHeader *composition_layer_base_header = nullptr;
 	OpenXRViewportCompositionLayerProvider *openxr_layer_provider = nullptr;
 
@@ -56,6 +91,9 @@ class OpenXRCompositionLayer : public Node3D {
 	MeshInstance3D *fallback = nullptr;
 	bool should_update_fallback_mesh = false;
 	bool openxr_session_running = false;
+	bool registered = false;
+
+	OpenXRViewportCompositionLayerProvider::SwapchainState *swapchain_state = nullptr;
 
 	Dictionary extension_property_values;
 
@@ -115,6 +153,39 @@ public:
 	Ref<JavaObject> get_android_surface();
 	bool is_natively_supported() const;
 
+	void set_min_filter(Filter p_mode);
+	Filter get_min_filter() const;
+
+	void set_mag_filter(Filter p_mode);
+	Filter get_mag_filter() const;
+
+	void set_mipmap_mode(MipmapMode p_mode);
+	MipmapMode get_mipmap_mode() const;
+
+	void set_horizontal_wrap(Wrap p_mode);
+	Wrap get_horizontal_wrap() const;
+
+	void set_vertical_wrap(Wrap p_mode);
+	Wrap get_vertical_wrap() const;
+
+	void set_red_swizzle(Swizzle p_mode);
+	Swizzle get_red_swizzle() const;
+
+	void set_green_swizzle(Swizzle p_mode);
+	Swizzle get_green_swizzle() const;
+
+	void set_blue_swizzle(Swizzle p_mode);
+	Swizzle get_blue_swizzle() const;
+
+	void set_alpha_swizzle(Swizzle p_mode);
+	Swizzle get_alpha_swizzle() const;
+
+	void set_max_anisotropy(float p_value);
+	float get_max_anisotropy() const;
+
+	void set_border_color(Color p_color);
+	Color get_border_color() const;
+
 	virtual PackedStringArray get_configuration_warnings() const override;
 
 	virtual Vector2 intersects_ray(const Vector3 &p_origin, const Vector3 &p_direction) const;
@@ -122,4 +193,7 @@ public:
 	~OpenXRCompositionLayer();
 };
 
-#endif // OPENXR_COMPOSITION_LAYER_H
+VARIANT_ENUM_CAST(OpenXRCompositionLayer::Filter)
+VARIANT_ENUM_CAST(OpenXRCompositionLayer::MipmapMode)
+VARIANT_ENUM_CAST(OpenXRCompositionLayer::Wrap)
+VARIANT_ENUM_CAST(OpenXRCompositionLayer::Swizzle)
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
index a1a1fb23..87dbf933 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
+++ b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.cpp
@@ -77,7 +77,7 @@ Ref<Mesh> OpenXRCompositionLayerCylinder::_create_fallback_mesh() {
 	Vector<int> indices;
 
 	float delta_angle = central_angle / fallback_segments;
-	float start_angle = (-Math_PI / 2.0) - (central_angle / 2.0);
+	float start_angle = (-Math::PI / 2.0) - (central_angle / 2.0);
 
 	for (uint32_t i = 0; i < fallback_segments + 1; i++) {
 		float current_angle = start_angle + (delta_angle * i);
@@ -192,7 +192,7 @@ Vector2 OpenXRCompositionLayerCylinder::intersects_ray(const Vector3 &p_origin,
 	Vector3 intersection = p_origin + p_direction * t;
 
 	Basis correction = cylinder_transform.basis.inverse();
-	correction.rotate(Vector3(0.0, 1.0, 0.0), -Math_PI / 2.0);
+	correction.rotate(Vector3(0.0, 1.0, 0.0), -Math::PI / 2.0);
 	Vector3 relative_point = correction.xform(intersection - cylinder_transform.origin);
 
 	Vector2 projected_point = Vector2(relative_point.x, relative_point.z);
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h
index a7015759..eb4607bf 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer_cylinder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_COMPOSITION_LAYER_CYLINDER_H
-#define OPENXR_COMPOSITION_LAYER_CYLINDER_H
+#pragma once
 
 #include <openxr/openxr.h>
 
@@ -47,13 +46,13 @@ class OpenXRCompositionLayerCylinder : public OpenXRCompositionLayer {
 		{}, // subImage
 		{ { 0, 0, 0, 0 }, { 0, 0, 0 } }, // pose
 		1.0, // radius
-		Math_PI / 2.0, // centralAngle
+		Math::PI / 2.0, // centralAngle
 		1.0, // aspectRatio
 	};
 
 	float radius = 1.0;
 	float aspect_ratio = 1.0;
-	float central_angle = Math_PI / 2.0;
+	float central_angle = Math::PI / 2.0;
 	uint32_t fallback_segments = 10;
 
 protected:
@@ -83,5 +82,3 @@ public:
 	OpenXRCompositionLayerCylinder();
 	~OpenXRCompositionLayerCylinder();
 };
-
-#endif // OPENXR_COMPOSITION_LAYER_CYLINDER_H
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp b/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp
index d89d7077..daea04b1 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp
+++ b/engine/modules/openxr/scene/openxr_composition_layer_equirect.cpp
@@ -80,7 +80,7 @@ Ref<Mesh> OpenXRCompositionLayerEquirect::_create_fallback_mesh() {
 	float step_horizontal = central_horizontal_angle / fallback_segments;
 	float step_vertical = (upper_vertical_angle + lower_vertical_angle) / fallback_segments;
 
-	float start_horizontal_angle = Math_PI - (central_horizontal_angle / 2.0);
+	float start_horizontal_angle = Math::PI - (central_horizontal_angle / 2.0);
 
 	for (uint32_t i = 0; i < fallback_segments + 1; i++) {
 		for (uint32_t j = 0; j < fallback_segments + 1; j++) {
@@ -155,7 +155,7 @@ float OpenXRCompositionLayerEquirect::get_central_horizontal_angle() const {
 }
 
 void OpenXRCompositionLayerEquirect::set_upper_vertical_angle(float p_angle) {
-	ERR_FAIL_COND(p_angle <= 0 || p_angle > (Math_PI / 2.0));
+	ERR_FAIL_COND(p_angle <= 0 || p_angle > (Math::PI / 2.0));
 	upper_vertical_angle = p_angle;
 	composition_layer.upperVerticalAngle = p_angle;
 	update_fallback_mesh();
@@ -166,7 +166,7 @@ float OpenXRCompositionLayerEquirect::get_upper_vertical_angle() const {
 }
 
 void OpenXRCompositionLayerEquirect::set_lower_vertical_angle(float p_angle) {
-	ERR_FAIL_COND(p_angle <= 0 || p_angle > (Math_PI / 2.0));
+	ERR_FAIL_COND(p_angle <= 0 || p_angle > (Math::PI / 2.0));
 	lower_vertical_angle = p_angle;
 	composition_layer.lowerVerticalAngle = -p_angle;
 	update_fallback_mesh();
@@ -209,7 +209,7 @@ Vector2 OpenXRCompositionLayerEquirect::intersects_ray(const Vector3 &p_origin,
 	Vector3 intersection = p_origin + p_direction * t;
 
 	Basis correction = equirect_transform.basis.inverse();
-	correction.rotate(Vector3(0.0, 1.0, 0.0), -Math_PI / 2.0);
+	correction.rotate(Vector3(0.0, 1.0, 0.0), -Math::PI / 2.0);
 	Vector3 relative_point = correction.xform(intersection - equirect_transform.origin);
 
 	float horizontal_intersection_angle = Math::atan2(relative_point.z, relative_point.x);
@@ -217,7 +217,7 @@ Vector2 OpenXRCompositionLayerEquirect::intersects_ray(const Vector3 &p_origin,
 		return Vector2(-1.0, -1.0);
 	}
 
-	float vertical_intersection_angle = Math::acos(relative_point.y / radius) - (Math_PI / 2.0);
+	float vertical_intersection_angle = Math::acos(relative_point.y / radius) - (Math::PI / 2.0);
 	if (vertical_intersection_angle < 0) {
 		if (Math::abs(vertical_intersection_angle) > upper_vertical_angle) {
 			return Vector2(-1.0, -1.0);
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_equirect.h b/engine/modules/openxr/scene/openxr_composition_layer_equirect.h
index 45a65fe5..d6756ae4 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_equirect.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer_equirect.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_COMPOSITION_LAYER_EQUIRECT_H
-#define OPENXR_COMPOSITION_LAYER_EQUIRECT_H
+#pragma once
 
 #include <openxr/openxr.h>
 
@@ -47,15 +46,15 @@ class OpenXRCompositionLayerEquirect : public OpenXRCompositionLayer {
 		{}, // subImage
 		{ { 0, 0, 0, 0 }, { 0, 0, 0 } }, // pose
 		1.0, // radius
-		Math_PI / 2.0, // centralHorizontalAngle
-		Math_PI / 4.0, // upperVerticalAngle
-		-Math_PI / 4.0, // lowerVerticalAngle
+		Math::PI / 2.0, // centralHorizontalAngle
+		Math::PI / 4.0, // upperVerticalAngle
+		-Math::PI / 4.0, // lowerVerticalAngle
 	};
 
 	float radius = 1.0;
-	float central_horizontal_angle = Math_PI / 2.0;
-	float upper_vertical_angle = Math_PI / 4.0;
-	float lower_vertical_angle = Math_PI / 4.0;
+	float central_horizontal_angle = Math::PI / 2.0;
+	float upper_vertical_angle = Math::PI / 4.0;
+	float lower_vertical_angle = Math::PI / 4.0;
 	uint32_t fallback_segments = 10;
 
 protected:
@@ -88,5 +87,3 @@ public:
 	OpenXRCompositionLayerEquirect();
 	~OpenXRCompositionLayerEquirect();
 };
-
-#endif // OPENXR_COMPOSITION_LAYER_EQUIRECT_H
diff --git a/engine/modules/openxr/scene/openxr_composition_layer_quad.h b/engine/modules/openxr/scene/openxr_composition_layer_quad.h
index a4ccfc6d..7b5b6897 100644
--- a/engine/modules/openxr/scene/openxr_composition_layer_quad.h
+++ b/engine/modules/openxr/scene/openxr_composition_layer_quad.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_COMPOSITION_LAYER_QUAD_H
-#define OPENXR_COMPOSITION_LAYER_QUAD_H
+#pragma once
 
 #include <openxr/openxr.h>
 
@@ -69,5 +68,3 @@ public:
 	OpenXRCompositionLayerQuad();
 	~OpenXRCompositionLayerQuad();
 };
-
-#endif // OPENXR_COMPOSITION_LAYER_QUAD_H
diff --git a/engine/modules/openxr/scene/openxr_hand.cpp b/engine/modules/openxr/scene/openxr_hand.cpp
index 2a4104f6..bf21be12 100644
--- a/engine/modules/openxr/scene/openxr_hand.cpp
+++ b/engine/modules/openxr/scene/openxr_hand.cpp
@@ -311,7 +311,7 @@ void OpenXRHand::_update_skeleton() {
 		// SKELETON_RIG_HUMANOID bone adjustment. This rotation performs:
 		// OpenXR Z+ -> Godot Humanoid Y-  (Back along the bone)
 		// OpenXR Y+ -> Godot Humanoid Z- (Out the back of the hand)
-		Quaternion(0.0, -Math_SQRT12, Math_SQRT12, 0.0),
+		Quaternion(0.0, -Math::SQRT12, Math::SQRT12, 0.0),
 	};
 
 	// we cache our transforms so we can quickly calculate local transforms
diff --git a/engine/modules/openxr/scene/openxr_hand.h b/engine/modules/openxr/scene/openxr_hand.h
index 4c77e727..8c0d47c4 100644
--- a/engine/modules/openxr/scene/openxr_hand.h
+++ b/engine/modules/openxr/scene/openxr_hand.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_HAND_H
-#define OPENXR_HAND_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/3d/skeleton_3d.h"
@@ -118,5 +117,3 @@ VARIANT_ENUM_CAST(OpenXRHand::Hands)
 VARIANT_ENUM_CAST(OpenXRHand::MotionRange)
 VARIANT_ENUM_CAST(OpenXRHand::SkeletonRig)
 VARIANT_ENUM_CAST(OpenXRHand::BoneUpdate)
-
-#endif // OPENXR_HAND_H
diff --git a/engine/modules/openxr/scene/openxr_visibility_mask.cpp b/engine/modules/openxr/scene/openxr_visibility_mask.cpp
index 7214fac3..b3006923 100644
--- a/engine/modules/openxr/scene/openxr_visibility_mask.cpp
+++ b/engine/modules/openxr/scene/openxr_visibility_mask.cpp
@@ -32,7 +32,7 @@
 
 #include "../extensions/openxr_visibility_mask_extension.h"
 #include "../openxr_interface.h"
-#include "scene/3d/xr_nodes.h"
+#include "scene/3d/xr/xr_nodes.h"
 
 void OpenXRVisibilityMask::_bind_methods() {
 }
diff --git a/engine/modules/openxr/scene/openxr_visibility_mask.h b/engine/modules/openxr/scene/openxr_visibility_mask.h
index 0acb30fc..419d7b76 100644
--- a/engine/modules/openxr/scene/openxr_visibility_mask.h
+++ b/engine/modules/openxr/scene/openxr_visibility_mask.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_VISIBILITY_MASK_H
-#define OPENXR_VISIBILITY_MASK_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -52,5 +51,3 @@ public:
 	OpenXRVisibilityMask();
 	~OpenXRVisibilityMask();
 };
-
-#endif // OPENXR_VISIBILITY_MASK_H
diff --git a/engine/modules/openxr/util.h b/engine/modules/openxr/util.h
index 4c611d6f..062dec65 100644
--- a/engine/modules/openxr/util.h
+++ b/engine/modules/openxr/util.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UTIL_H
-#define UTIL_H
+#pragma once
 
 #define UNPACK(...) __VA_ARGS__
 
@@ -127,5 +126,3 @@
 		}                                                                                                                                                                                                              \
 		return (*func_name##_ptr)(p_##arg1, p_##arg2, p_##arg3, p_##arg4, p_##arg5, p_##arg6);                                                                                                                         \
 	}
-
-#endif // UTIL_H
diff --git a/engine/modules/raycast/SCsub b/engine/modules/raycast/SCsub
index b2e86382..46e1c329 100644
--- a/engine/modules/raycast/SCsub
+++ b/engine/modules/raycast/SCsub
@@ -62,7 +62,7 @@ if env["builtin_embree"]:
 
     thirdparty_sources = [thirdparty_dir + file for file in embree_src]
 
-    env_raycast.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "include"])
+    env_raycast.Prepend(CPPEXTPATH=[thirdparty_dir, thirdparty_dir + "include"])
     env_raycast.Append(CPPDEFINES=["EMBREE_TARGET_SSE2", "EMBREE_LOWEST_ISA", "TASKING_INTERNAL"])
     env_raycast.AppendUnique(CPPDEFINES=["NDEBUG"])  # No assert() even in debug builds.
 
diff --git a/engine/modules/raycast/lightmap_raycaster_embree.h b/engine/modules/raycast/lightmap_raycaster_embree.h
index 2b4530a3..3335e943 100644
--- a/engine/modules/raycast/lightmap_raycaster_embree.h
+++ b/engine/modules/raycast/lightmap_raycaster_embree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAP_RAYCASTER_EMBREE_H
-#define LIGHTMAP_RAYCASTER_EMBREE_H
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
@@ -78,5 +77,3 @@ public:
 };
 
 #endif // TOOLS_ENABLED
-
-#endif // LIGHTMAP_RAYCASTER_EMBREE_H
diff --git a/engine/modules/raycast/raycast_occlusion_cull.cpp b/engine/modules/raycast/raycast_occlusion_cull.cpp
index 9f95307c..b33e52f5 100644
--- a/engine/modules/raycast/raycast_occlusion_cull.cpp
+++ b/engine/modules/raycast/raycast_occlusion_cull.cpp
@@ -173,7 +173,9 @@ void RaycastOcclusionCull::RaycastHZBuffer::sort_rays(const Vector3 &p_camera_di
 					}
 					int k = tile_i * TILE_SIZE + tile_j;
 					int tile_index = i * tile_grid_size.x + j;
-					mips[0][y * buffer_size.x + x] = camera_rays[tile_index].ray.tfar[k];
+
+					Vector3 ray_dir(camera_rays[tile_index].ray.dir_x[k], camera_rays[tile_index].ray.dir_y[k], camera_rays[tile_index].ray.dir_z[k]);
+					mips[0][y * buffer_size.x + x] = camera_rays[tile_index].ray.tfar[k] * p_camera_dir.dot(ray_dir); // Store z-depth in view space.
 				}
 			}
 		}
@@ -525,14 +527,14 @@ void RaycastOcclusionCull::buffer_set_size(RID p_buffer, const Vector2i &p_size)
 	buffers[p_buffer].resize(p_size);
 }
 
-Vector2 RaycastOcclusionCull::_jitter_half_extents(const Vector2 &p_half_extents, const Size2i &p_viewport_size) {
+Vector2 RaycastOcclusionCull::_get_jitter(const Rect2 &p_viewport_rect, const Size2i &p_buffer_size) {
 	if (!_jitter_enabled) {
-		return p_half_extents;
+		return Vector2();
 	}
 
 	// Prevent divide by zero when using NULL viewport.
-	if ((p_viewport_size.x <= 0) || (p_viewport_size.y <= 0)) {
-		return p_half_extents;
+	if ((p_buffer_size.x <= 0) || (p_buffer_size.y <= 0)) {
+		return Vector2();
 	}
 
 	int32_t frame = Engine::get_singleton()->get_frames_drawn();
@@ -568,8 +570,8 @@ Vector2 RaycastOcclusionCull::_jitter_half_extents(const Vector2 &p_half_extents
 			jitter = Vector2(0.5f, 0.5f);
 		} break;
 	}
-
-	jitter *= Vector2(p_half_extents.x / (float)p_viewport_size.x, p_half_extents.y / (float)p_viewport_size.y);
+	Vector2 half_extents = p_viewport_rect.get_size() * 0.5;
+	jitter *= Vector2(half_extents.x / (float)p_buffer_size.x, half_extents.y / (float)p_buffer_size.y);
 
 	// The multiplier here determines the jitter magnitude in pixels.
 	// It seems like a value of 0.66 matches well the above jittering pattern as it generates subpixel samples at 0, 1/3 and 2/3
@@ -578,7 +580,16 @@ Vector2 RaycastOcclusionCull::_jitter_half_extents(const Vector2 &p_half_extents
 	// False shown can lower percentage that are occluded, and therefore performance.
 	jitter *= 0.66f;
 
-	return p_half_extents + jitter;
+	return jitter;
+}
+
+Rect2 _get_viewport_rect(const Projection &p_cam_projection) {
+	// NOTE: This assumes a rectangular projection plane, i.e. that:
+	// - the matrix is a projection across z-axis (i.e. is invertible and columns[0][1], [0][3], [1][0] and [1][3] == 0)
+	// - the projection plane is rectangular (i.e. columns[0][2] and [1][2] == 0 if columns[2][3] != 0)
+	Size2 half_extents = p_cam_projection.get_viewport_half_extents();
+	Point2 bottom_left = -half_extents * Vector2(p_cam_projection.columns[3][0] * p_cam_projection.columns[3][3] + p_cam_projection.columns[2][0] * p_cam_projection.columns[2][3] + 1, p_cam_projection.columns[3][1] * p_cam_projection.columns[3][3] + p_cam_projection.columns[2][1] * p_cam_projection.columns[2][3] + 1);
+	return Rect2(bottom_left, 2 * half_extents);
 }
 
 void RaycastOcclusionCull::buffer_update(RID p_buffer, const Transform3D &p_cam_transform, const Projection &p_cam_projection, bool p_cam_orthogonal) {
@@ -595,11 +606,12 @@ void RaycastOcclusionCull::buffer_update(RID p_buffer, const Transform3D &p_cam_
 	Scenario &scenario = scenarios[buffer.scenario_rid];
 	scenario.update();
 
-	Vector2 viewport_half = p_cam_projection.get_viewport_half_extents();
-	Vector2 jitter_viewport_half = _jitter_half_extents(viewport_half, buffer.get_occlusion_buffer_size());
-	Vector3 near_bottom_left = Vector3(-jitter_viewport_half.x, -jitter_viewport_half.y, -p_cam_projection.get_z_near());
+	Rect2 vp_rect = _get_viewport_rect(p_cam_projection);
+	Vector2 bottom_left = vp_rect.position;
+	bottom_left += _get_jitter(vp_rect, buffer.get_occlusion_buffer_size());
+	Vector3 near_bottom_left = Vector3(bottom_left.x, bottom_left.y, -p_cam_projection.get_z_near());
 
-	buffer.update_camera_rays(p_cam_transform, near_bottom_left, 2 * viewport_half, p_cam_projection.get_z_far(), p_cam_orthogonal);
+	buffer.update_camera_rays(p_cam_transform, near_bottom_left, vp_rect.get_size(), p_cam_projection.get_z_far(), p_cam_orthogonal);
 
 	scenario.raycast(buffer.camera_rays, buffer.camera_ray_masks.ptr(), buffer.camera_rays_tile_count);
 	buffer.sort_rays(-p_cam_transform.basis.get_column(2), p_cam_orthogonal);
diff --git a/engine/modules/raycast/raycast_occlusion_cull.h b/engine/modules/raycast/raycast_occlusion_cull.h
index f5b7011a..51c1a196 100644
--- a/engine/modules/raycast/raycast_occlusion_cull.h
+++ b/engine/modules/raycast/raycast_occlusion_cull.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RAYCAST_OCCLUSION_CULL_H
-#define RAYCAST_OCCLUSION_CULL_H
+#pragma once
 
 #include "core/math/projection.h"
 #include "core/templates/local_vector.h"
@@ -162,7 +161,7 @@ private:
 	bool _jitter_enabled = false;
 
 	void _init_embree();
-	Vector2 _jitter_half_extents(const Vector2 &p_half_extents, const Size2i &p_viewport_size);
+	Vector2 _get_jitter(const Rect2 &p_viewport_rect, const Size2i &p_buffer_size);
 
 public:
 	virtual bool is_occluder(RID p_rid) override;
@@ -190,5 +189,3 @@ public:
 	RaycastOcclusionCull();
 	~RaycastOcclusionCull();
 };
-
-#endif // RAYCAST_OCCLUSION_CULL_H
diff --git a/engine/modules/raycast/register_types.h b/engine/modules/raycast/register_types.h
index 33181e6d..130fbdb6 100644
--- a/engine/modules/raycast/register_types.h
+++ b/engine/modules/raycast/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RAYCAST_REGISTER_TYPES_H
-#define RAYCAST_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_raycast_module(ModuleInitializationLevel p_level);
 void uninitialize_raycast_module(ModuleInitializationLevel p_level);
-
-#endif // RAYCAST_REGISTER_TYPES_H
diff --git a/engine/modules/raycast/static_raycaster_embree.h b/engine/modules/raycast/static_raycaster_embree.h
index 3ffab32b..a0b66b5c 100644
--- a/engine/modules/raycast/static_raycaster_embree.h
+++ b/engine/modules/raycast/static_raycaster_embree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STATIC_RAYCASTER_EMBREE_H
-#define STATIC_RAYCASTER_EMBREE_H
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
@@ -65,5 +64,3 @@ public:
 };
 
 #endif // TOOLS_ENABLED
-
-#endif // STATIC_RAYCASTER_EMBREE_H
diff --git a/engine/modules/regex/SCsub b/engine/modules/regex/SCsub
index 5d70604e..979995ef 100644
--- a/engine/modules/regex/SCsub
+++ b/engine/modules/regex/SCsub
@@ -22,6 +22,7 @@ if env["builtin_pcre2"]:
         "pcre2_chartables.c",
         "pcre2_chkdint.c",
         "pcre2_compile.c",
+        "pcre2_compile_class.c",
         "pcre2_config.c",
         "pcre2_context.c",
         "pcre2_convert.c",
@@ -52,7 +53,7 @@ if env["builtin_pcre2"]:
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_regex.Prepend(CPPPATH=[thirdparty_dir])
+    env_regex.Prepend(CPPEXTPATH=[thirdparty_dir])
     env_regex.Append(CPPDEFINES=thirdparty_flags)
 
     def pcre2_builtin(width):
diff --git a/engine/modules/regex/icons/RegEx.svg b/engine/modules/regex/icons/RegEx.svg
index ba232f6f..d85a6fce 100644
--- a/engine/modules/regex/icons/RegEx.svg
+++ b/engine/modules/regex/icons/RegEx.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 14h3v-3H2zM6.561 2.855a21 21 0 0 1 2.82 1.185A21 21 0 0 1 9.137 1h1.77a21 21 0 0 1-.28 3.027 21 21 0 0 1 2.88-1.171l.562 1.733a21 21 0 0 1-3.04.684 21 21 0 0 1 2.1 2.307l-1.465 1.037a21 21 0 0 1-1.672-2.624 21 21 0 0 1-1.587 2.624L6.965 7.58a21 21 0 0 1 2.026-2.308A21 21 0 0 1 6 4.59z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 14h3v-3H2zM6.561 2.855a21 21 0 0 1 2.82 1.185A21 21 0 0 1 9.137 1h1.77a21 21 0 0 1-.28 3.027 21 21 0 0 1 2.88-1.171l.562 1.733a21 21 0 0 1-3.04.684 21 21 0 0 1 2.1 2.307l-1.465 1.037a21 21 0 0 1-1.672-2.624 21 21 0 0 1-1.587 2.624L6.965 7.58a21 21 0 0 1 2.026-2.308A21 21 0 0 1 6 4.59z"/></svg>
diff --git a/engine/modules/regex/icons/RegExMatch.svg b/engine/modules/regex/icons/RegExMatch.svg
index 626ff366..3f3bff51 100644
--- a/engine/modules/regex/icons/RegExMatch.svg
+++ b/engine/modules/regex/icons/RegExMatch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 13h2v-2H5zm2.5-8a14 14 0 0 1 1.88.79 14 14 0 0 1-.163-2.027h1.18a14 14 0 0 1-.186 2.018 14 14 0 0 1 1.92-.78l.374 1.155a14 14 0 0 1-2.026.456 14 14 0 0 1 1.4 1.538l-.977.691a14 14 0 0 1-1.115-1.75 14 14 0 0 1-1.058 1.75l-.96-.691A14 14 0 0 1 9.12 6.61a14 14 0 0 1-1.993-.454zM1.67 2C0 5 0 11 1.67 14h2C2 11 2 5 3.67 2zm10.66 0c1.67 3 1.67 9 0 12h2c1.67-3 1.67-9 0-12z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M5 13h2v-2H5zm2.5-8a14 14 0 0 1 1.88.79 14 14 0 0 1-.163-2.027h1.18a14 14 0 0 1-.186 2.018 14 14 0 0 1 1.92-.78l.374 1.155a14 14 0 0 1-2.026.456 14 14 0 0 1 1.4 1.538l-.977.691a14 14 0 0 1-1.115-1.75 14 14 0 0 1-1.058 1.75l-.96-.691A14 14 0 0 1 9.12 6.61a14 14 0 0 1-1.993-.454zM1.67 2C0 5 0 11 1.67 14h2C2 11 2 5 3.67 2zm10.66 0c1.67 3 1.67 9 0 12h2c1.67-3 1.67-9 0-12z"/></svg>
diff --git a/engine/modules/regex/regex.cpp b/engine/modules/regex/regex.cpp
index 9424d57e..544763f6 100644
--- a/engine/modules/regex/regex.cpp
+++ b/engine/modules/regex/regex.cpp
@@ -69,7 +69,7 @@ String RegExMatch::get_subject() const {
 }
 
 int RegExMatch::get_group_count() const {
-	if (data.size() == 0) {
+	if (data.is_empty()) {
 		return 0;
 	}
 	return data.size() - 1;
@@ -197,7 +197,7 @@ Error RegEx::compile(const String &p_pattern, bool p_show_error) {
 			PCRE2_UCHAR32 buf[256];
 			pcre2_get_error_message_32(err, buf, 256);
 			String message = String::num_int64(offset) + ": " + String((const char32_t *)buf);
-			ERR_PRINT(message.utf8());
+			ERR_PRINT(message);
 		}
 		return FAILED;
 	}
@@ -326,7 +326,7 @@ int RegEx::_sub(const String &p_subject, const String &p_replacement, int p_offs
 	pcre2_match_context_free_32(mctx);
 
 	if (res >= 0) {
-		r_output = String(output.ptr(), olength) + p_subject.substr(length);
+		r_output = String::utf32(Span(output.ptr(), olength)) + p_subject.substr(length);
 	}
 
 	return res;
@@ -348,7 +348,7 @@ String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_a
 		PCRE2_UCHAR32 buf[256];
 		pcre2_get_error_message_32(res, buf, 256);
 		String message = "PCRE2 Error: " + String((const char32_t *)buf);
-		ERR_PRINT(message.utf8());
+		ERR_PRINT(message);
 
 		if (res == PCRE2_ERROR_NOSUBSTRING) {
 			flags |= PCRE2_SUBSTITUTE_UNKNOWN_UNSET;
diff --git a/engine/modules/regex/regex.h b/engine/modules/regex/regex.h
index f322ac67..2086fdc7 100644
--- a/engine/modules/regex/regex.h
+++ b/engine/modules/regex/regex.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGEX_H
-#define REGEX_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"
@@ -108,5 +107,3 @@ public:
 	RegEx(const String &p_pattern);
 	~RegEx();
 };
-
-#endif // REGEX_H
diff --git a/engine/modules/regex/register_types.h b/engine/modules/regex/register_types.h
index f05c35b1..612af28b 100644
--- a/engine/modules/regex/register_types.h
+++ b/engine/modules/regex/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGEX_REGISTER_TYPES_H
-#define REGEX_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_regex_module(ModuleInitializationLevel p_level);
 void uninitialize_regex_module(ModuleInitializationLevel p_level);
-
-#endif // REGEX_REGISTER_TYPES_H
diff --git a/engine/modules/regex/tests/test_regex.h b/engine/modules/regex/tests/test_regex.h
index 2843fe19..eb08eab9 100644
--- a/engine/modules/regex/tests/test_regex.h
+++ b/engine/modules/regex/tests/test_regex.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_REGEX_H
-#define TEST_REGEX_H
+#pragma once
 
 #include "../regex.h"
 
@@ -423,5 +422,3 @@ TEST_CASE("[RegEx] Lookbehind groups empty matches") {
 }
 
 } // namespace TestRegEx
-
-#endif // TEST_REGEX_H
diff --git a/engine/modules/register_module_types.h b/engine/modules/register_module_types.h
index 61cda428..08ba2b9c 100644
--- a/engine/modules/register_module_types.h
+++ b/engine/modules/register_module_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_MODULE_TYPES_H
-#define REGISTER_MODULE_TYPES_H
+#pragma once
 
 #include "core/extension/gdextension_interface.h"
 
@@ -42,5 +41,3 @@ enum ModuleInitializationLevel {
 
 void initialize_modules(ModuleInitializationLevel p_level);
 void uninitialize_modules(ModuleInitializationLevel p_level);
-
-#endif // REGISTER_MODULE_TYPES_H
diff --git a/engine/modules/svg/SCsub b/engine/modules/svg/SCsub
index 696e1649..aa7f6a22 100644
--- a/engine/modules/svg/SCsub
+++ b/engine/modules/svg/SCsub
@@ -65,7 +65,7 @@ if env["module_webp_enabled"]:
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_svg.Prepend(CPPPATH=[thirdparty_dir + "inc"])
+env_svg.Prepend(CPPEXTPATH=[thirdparty_dir + "inc"])
 
 # Enable ThorVG static object linking.
 env_svg.Append(CPPDEFINES=["TVG_STATIC"])
@@ -75,7 +75,7 @@ env_svg.Append(CPPDEFINES=["THORVG_FILE_IO_SUPPORT"])
 env_thirdparty = env_svg.Clone()
 env_thirdparty.disable_warnings()
 env_thirdparty.Prepend(
-    CPPPATH=[
+    CPPEXTPATH=[
         thirdparty_dir + "src/common",
         thirdparty_dir + "src/loaders/svg",
         thirdparty_dir + "src/renderer",
@@ -86,11 +86,11 @@ env_thirdparty.Prepend(
     ]
 )
 if env["builtin_libpng"]:
-    env_thirdparty.Prepend(CPPPATH=["#thirdparty/libpng"])
+    env_thirdparty.Prepend(CPPEXTPATH=["#thirdparty/libpng"])
 if env["module_webp_enabled"]:
-    env_thirdparty.Prepend(CPPPATH=[thirdparty_dir + "src/loaders/external_webp"])
+    env_thirdparty.Prepend(CPPEXTPATH=[thirdparty_dir + "src/loaders/external_webp"])
     if env["builtin_libwebp"]:
-        env_thirdparty.Prepend(CPPPATH=["#thirdparty/libwebp/src"])
+        env_thirdparty.Prepend(CPPEXTPATH=["#thirdparty/libwebp/src"])
 
 env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 env.modules_sources += thirdparty_obj
diff --git a/engine/modules/svg/image_loader_svg.cpp b/engine/modules/svg/image_loader_svg.cpp
index 1f7d5504..39292f84 100644
--- a/engine/modules/svg/image_loader_svg.cpp
+++ b/engine/modules/svg/image_loader_svg.cpp
@@ -161,7 +161,7 @@ Error ImageLoaderSVG::load_image(Ref<Image> p_image, Ref<FileAccess> p_fileacces
 	p_fileaccess->get_buffer(buffer.ptrw(), buffer.size());
 
 	String svg;
-	Error err = svg.parse_utf8((const char *)buffer.ptr(), buffer.size());
+	Error err = svg.append_utf8((const char *)buffer.ptr(), buffer.size());
 	if (err != OK) {
 		return err;
 	}
diff --git a/engine/modules/svg/image_loader_svg.h b/engine/modules/svg/image_loader_svg.h
index 90e9458c..c5e3edab 100644
--- a/engine/modules/svg/image_loader_svg.h
+++ b/engine/modules/svg/image_loader_svg.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_SVG_H
-#define IMAGE_LOADER_SVG_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -53,5 +52,3 @@ public:
 
 	ImageLoaderSVG();
 };
-
-#endif // IMAGE_LOADER_SVG_H
diff --git a/engine/modules/svg/register_types.h b/engine/modules/svg/register_types.h
index 8458eadc..004a9ca5 100644
--- a/engine/modules/svg/register_types.h
+++ b/engine/modules/svg/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SVG_REGISTER_TYPES_H
-#define SVG_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_svg_module(ModuleInitializationLevel p_level);
 void uninitialize_svg_module(ModuleInitializationLevel p_level);
-
-#endif // SVG_REGISTER_TYPES_H
diff --git a/engine/modules/text_server_adv/SCsub b/engine/modules/text_server_adv/SCsub
index 30f21eb8..71e1c614 100644
--- a/engine/modules/text_server_adv/SCsub
+++ b/engine/modules/text_server_adv/SCsub
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 from misc.utility.scons_hints import *
 
+import methods
+
 Import("env")
 Import("env_modules")
 
@@ -8,28 +10,21 @@ env_text_server_adv = env_modules.Clone()
 
 
 def make_icu_data(target, source, env):
-    dst = target[0].srcnode().abspath
+    buffer = methods.get_buffer(str(source[0]))
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write(f"""\
+/* (C) 2016 and later: Unicode, Inc. and others. */
+/* License & terms of use: https://www.unicode.org/copyright.html */
 
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("/* (C) 2016 and later: Unicode, Inc. and others. */\n")
-        g.write("/* License & terms of use: https://www.unicode.org/copyright.html */\n")
-        g.write("#ifndef _ICU_DATA_H\n")
-        g.write("#define _ICU_DATA_H\n")
-        g.write('#include "unicode/utypes.h"\n')
-        g.write('#include "unicode/udata.h"\n')
-        g.write('#include "unicode/uversion.h"\n')
+#include <unicode/utypes.h>
+#include <unicode/udata.h>
+#include <unicode/uversion.h>
 
-        with open(source[0].srcnode().abspath, "rb") as f:
-            buf = f.read()
-
-        g.write('extern "C" U_EXPORT const size_t U_ICUDATA_SIZE = ' + str(len(buf)) + ";\n")
-        g.write('extern "C" U_EXPORT const unsigned char U_ICUDATA_ENTRY_POINT[] = {\n')
-        for i in range(len(buf)):
-            g.write("\t" + str(buf[i]) + ",\n")
-
-        g.write("};\n")
-        g.write("#endif")
+extern "C" U_EXPORT const size_t U_ICUDATA_SIZE = {len(buffer)};
+extern "C" U_EXPORT const unsigned char U_ICUDATA_ENTRY_POINT[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
+""")
 
 
 # Thirdparty source files
@@ -40,7 +35,7 @@ msdfgen_enabled = "msdfgen" in env.module_list
 
 if "svg" in env.module_list:
     env_text_server_adv.Prepend(
-        CPPPATH=[
+        CPPEXTPATH=[
             "#thirdparty/thorvg/inc",
             "#thirdparty/thorvg/src/common",
             "#thirdparty/thorvg/src/renderer",
@@ -122,7 +117,7 @@ if env["builtin_harfbuzz"]:
         "src/hb-subset-instancer-iup.cc",
         "src/hb-subset-instancer-solver.cc",
         "src/hb-subset-plan.cc",
-        "src/hb-subset-repacker.cc",
+        "src/hb-subset-serialize.cc",
         "src/hb-subset.cc",
         "src/hb-ucd.cc",
         "src/hb-unicode.cc",
@@ -140,11 +135,11 @@ if env["builtin_harfbuzz"]:
             ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_harfbuzz.Prepend(CPPPATH=["#thirdparty/harfbuzz/src"])
+    env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/harfbuzz/src"])
 
     env_harfbuzz.Append(CCFLAGS=["-DHAVE_ICU"])
     if env["builtin_icu4c"]:
-        env_harfbuzz.Prepend(CPPPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
+        env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
         env_harfbuzz.Append(
             CCFLAGS=[
                 "-DU_STATIC_IMPLEMENTATION",
@@ -167,15 +162,15 @@ if env["builtin_harfbuzz"]:
                 ]
             )
         if env["builtin_freetype"]:
-            env_harfbuzz.Prepend(CPPPATH=["#thirdparty/freetype/include"])
+            env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/freetype/include"])
         if env["builtin_graphite"] and env["graphite"]:
-            env_harfbuzz.Prepend(CPPPATH=["#thirdparty/graphite/include"])
+            env_harfbuzz.Prepend(CPPEXTPATH=["#thirdparty/graphite/include"])
             env_harfbuzz.Append(CCFLAGS=["-DGRAPHITE2_STATIC"])
 
     if env["platform"] in ["android", "linuxbsd", "web"]:
         env_harfbuzz.Append(CCFLAGS=["-DHAVE_PTHREAD"])
 
-    env_text_server_adv.Prepend(CPPPATH=["#thirdparty/harfbuzz/src"])
+    env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/harfbuzz/src"])
 
     lib = env_harfbuzz.add_library("harfbuzz_builtin", thirdparty_sources)
     thirdparty_obj += lib
@@ -238,7 +233,7 @@ if env["builtin_graphite"] and freetype_enabled and env["graphite"]:
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_graphite.Prepend(CPPPATH=["#thirdparty/graphite/src", "#thirdparty/graphite/include"])
+    env_graphite.Prepend(CPPEXTPATH=["#thirdparty/graphite/src", "#thirdparty/graphite/include"])
     env_graphite.Append(
         CCFLAGS=[
             "-DGRAPHITE2_STATIC",
@@ -478,15 +473,10 @@ if env["builtin_icu4c"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    if env.editor_build:
-        env_icu.CommandNoCache(
-            "#thirdparty/icu4c/icudata.gen.h", "#thirdparty/icu4c/icudt_godot.dat", env.Run(make_icu_data)
-        )
-        env_text_server_adv.Prepend(CPPPATH=["#thirdparty/icu4c/"])
-    else:
+    if not env.editor_build:
         thirdparty_sources += ["icu_data/icudata_stub.cpp"]
 
-    env_icu.Prepend(CPPPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
+    env_icu.Prepend(CPPEXTPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
     env_icu.Append(
         CXXFLAGS=[
             "-DU_STATIC_IMPLEMENTATION",
@@ -515,11 +505,18 @@ if env["builtin_icu4c"]:
     if env.editor_build:
         env_text_server_adv.Append(CXXFLAGS=["-DICU_STATIC_DATA"])
 
-    env_text_server_adv.Prepend(CPPPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
+    env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/icu4c/common/", "#thirdparty/icu4c/i18n/"])
 
     lib = env_icu.add_library("icu_builtin", thirdparty_sources)
     thirdparty_obj += lib
 
+    if env.editor_build:
+        icudata = env_icu.CommandNoCache(
+            "#thirdparty/icu4c/icudata.gen.h", "#thirdparty/icu4c/icudt_godot.dat", env.Run(make_icu_data)
+        )
+        env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/icu4c/"])
+        env_icu.Depends(lib, icudata)
+
     # Needs to be appended to arrive after libscene in the linker call,
     # but we don't want it to arrive *after* system libs, so manual hack
     # LIBS contains first SCons Library objects ("SCons.Node.FS.File object")
@@ -539,19 +536,15 @@ if env["builtin_icu4c"]:
 module_obj = []
 
 if env["builtin_msdfgen"] and msdfgen_enabled:
-    # Treat msdfgen headers as system headers to avoid raising warnings. Not supported on MSVC.
     env_text_server_adv.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
-    if not env.msvc:
-        env_text_server_adv.Append(CPPFLAGS=["-isystem", Dir("#thirdparty/msdfgen").path])
-    else:
-        env_text_server_adv.Prepend(CPPPATH=["#thirdparty/msdfgen"])
+    env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/msdfgen"])
 
 if env["builtin_freetype"] and freetype_enabled:
     env_text_server_adv.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
-    env_text_server_adv.Prepend(CPPPATH=["#thirdparty/freetype/include"])
+    env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/freetype/include"])
 
 if env["builtin_graphite"] and freetype_enabled and env["graphite"]:
-    env_text_server_adv.Prepend(CPPPATH=["#thirdparty/graphite/include"])
+    env_text_server_adv.Prepend(CPPEXTPATH=["#thirdparty/graphite/include"])
 
 env_text_server_adv.add_source_files(module_obj, "*.cpp")
 env.modules_sources += module_obj
diff --git a/engine/modules/text_server_adv/gdextension_build/SConstruct b/engine/modules/text_server_adv/gdextension_build/SConstruct
index 36d210ef..041df503 100644
--- a/engine/modules/text_server_adv/gdextension_build/SConstruct
+++ b/engine/modules/text_server_adv/gdextension_build/SConstruct
@@ -362,7 +362,7 @@ thirdparty_harfbuzz_sources = [
     "src/hb-subset-instancer-iup.cc",
     "src/hb-subset-instancer-solver.cc",
     "src/hb-subset-plan.cc",
-    "src/hb-subset-repacker.cc",
+    "src/hb-subset-serialize.cc",
     "src/hb-subset.cc",
     "src/hb-ucd.cc",
     "src/hb-unicode.cc",
diff --git a/engine/modules/text_server_adv/register_types.h b/engine/modules/text_server_adv/register_types.h
index 477e030e..bf1f7d9f 100644
--- a/engine/modules/text_server_adv/register_types.h
+++ b/engine/modules/text_server_adv/register_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SERVER_ADV_REGISTER_TYPES_H
-#define TEXT_SERVER_ADV_REGISTER_TYPES_H
+#pragma once
 
 #ifdef GDEXTENSION
 #include <godot_cpp/core/class_db.hpp>
@@ -40,5 +39,3 @@ using namespace godot;
 
 void initialize_text_server_adv_module(ModuleInitializationLevel p_level);
 void uninitialize_text_server_adv_module(ModuleInitializationLevel p_level);
-
-#endif // TEXT_SERVER_ADV_REGISTER_TYPES_H
diff --git a/engine/modules/text_server_adv/script_iterator.h b/engine/modules/text_server_adv/script_iterator.h
index f7876d6c..ee865fbf 100644
--- a/engine/modules/text_server_adv/script_iterator.h
+++ b/engine/modules/text_server_adv/script_iterator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCRIPT_ITERATOR_H
-#define SCRIPT_ITERATOR_H
+#pragma once
 
 #ifdef GDEXTENSION
 
@@ -74,5 +73,3 @@ private:
 public:
 	ScriptIterator(const String &p_string, int p_start, int p_length);
 };
-
-#endif // SCRIPT_ITERATOR_H
diff --git a/engine/modules/text_server_adv/text_server_adv.cpp b/engine/modules/text_server_adv/text_server_adv.cpp
index 52a61cd9..68db69d3 100644
--- a/engine/modules/text_server_adv/text_server_adv.cpp
+++ b/engine/modules/text_server_adv/text_server_adv.cpp
@@ -60,23 +60,17 @@ using namespace godot;
 // Built-in ICU data.
 
 #ifdef ICU_STATIC_DATA
-#include "icudata.gen.h"
+#include <icudata.gen.h>
 #endif
 
 // Thirdparty headers.
 
 #ifdef MODULE_MSDFGEN_ENABLED
-#ifdef _MSC_VER
-#pragma warning(disable : 4458)
-#endif
 #include <core/EdgeHolder.h>
 #include <core/ShapeDistanceFinder.h>
 #include <core/contour-combiners.h>
 #include <core/edge-selectors.h>
 #include <msdfgen.h>
-#ifdef _MSC_VER
-#pragma warning(default : 4458)
-#endif
 #endif
 
 #ifdef MODULE_SVG_ENABLED
@@ -1318,11 +1312,12 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data,
 			} break;
 		}
 
+		FT_GlyphSlot slot = fd->face->glyph;
+		bool from_svg = (slot->format == FT_GLYPH_FORMAT_SVG); // Need to check before FT_Render_Glyph as it will change format to bitmap.
 		if (!outline) {
 			if (!p_font_data->msdf) {
-				error = FT_Render_Glyph(fd->face->glyph, aa_mode);
+				error = FT_Render_Glyph(slot, aa_mode);
 			}
-			FT_GlyphSlot slot = fd->face->glyph;
 			if (!error) {
 				if (p_font_data->msdf) {
 #ifdef MODULE_MSDFGEN_ENABLED
@@ -1363,6 +1358,7 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_glyph(FontAdvanced *p_font_data,
 		cleanup_stroker:
 			FT_Stroker_Done(stroker);
 		}
+		gl.from_svg = from_svg;
 		E = fd->glyph_map.insert(p_glyph, gl);
 		r_glyph = E->value;
 		return gl.found;
@@ -1417,25 +1413,17 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_f
 			fargs.flags = FT_OPEN_MEMORY;
 			fargs.stream = &fd->stream;
 
-			int max_index = 0;
-			FT_Face tmp_face = nullptr;
-			error = FT_Open_Face(ft_library, &fargs, -1, &tmp_face);
-			if (tmp_face && error == 0) {
-				max_index = tmp_face->num_faces - 1;
-			}
-			if (tmp_face) {
-				FT_Done_Face(tmp_face);
-			}
-
-			error = FT_Open_Face(ft_library, &fargs, CLAMP(p_font_data->face_index, 0, max_index), &fd->face);
+			error = FT_Open_Face(ft_library, &fargs, p_font_data->face_index, &fd->face);
 			if (error) {
-				FT_Done_Face(fd->face);
-				fd->face = nullptr;
+				if (fd->face) {
+					FT_Done_Face(fd->face);
+					fd->face = nullptr;
+				}
 				memdelete(fd);
 				if (p_silent) {
 					return false;
 				} else {
-					ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "'.");
+					ERR_FAIL_V_MSG(false, "FreeType: Error loading font: '" + String(FT_Error_String(error)) + "' (face_index=" + String::num_int64(p_font_data->face_index) + ").");
 				}
 			}
 		}
@@ -1451,10 +1439,10 @@ _FORCE_INLINE_ bool TextServerAdvanced::_ensure_cache_for_size(FontAdvanced *p_f
 
 		if (FT_HAS_COLOR(fd->face) && fd->face->num_fixed_sizes > 0) {
 			int best_match = 0;
-			int diff = ABS(fd->size.x - ((int64_t)fd->face->available_sizes[0].width));
+			int diff = Math::abs(fd->size.x - ((int64_t)fd->face->available_sizes[0].width));
 			fd->scale = double(fd->size.x * fd->oversampling) / fd->face->available_sizes[0].width;
 			for (int i = 1; i < fd->face->num_fixed_sizes; i++) {
-				int ndiff = ABS(fd->size.x - ((int64_t)fd->face->available_sizes[i].width));
+				int ndiff = Math::abs(fd->size.x - ((int64_t)fd->face->available_sizes[i].width));
 				if (ndiff < diff) {
 					best_match = i;
 					diff = ndiff;
@@ -2446,6 +2434,24 @@ bool TextServerAdvanced::_font_is_force_autohinter(const RID &p_font_rid) const
 	return fd->force_autohinter;
 }
 
+void TextServerAdvanced::_font_set_modulate_color_glyphs(const RID &p_font_rid, bool p_modulate) {
+	FontAdvanced *fd = _get_font_data(p_font_rid);
+	ERR_FAIL_NULL(fd);
+
+	MutexLock lock(fd->mutex);
+	if (fd->modulate_color_glyphs != p_modulate) {
+		fd->modulate_color_glyphs = p_modulate;
+	}
+}
+
+bool TextServerAdvanced::_font_is_modulate_color_glyphs(const RID &p_font_rid) const {
+	FontAdvanced *fd = _get_font_data(p_font_rid);
+	ERR_FAIL_NULL_V(fd, false);
+
+	MutexLock lock(fd->mutex);
+	return fd->modulate_color_glyphs;
+}
+
 void TextServerAdvanced::_font_set_hinting(const RID &p_font_rid, TextServer::Hinting p_hinting) {
 	FontAdvanced *fd = _get_font_data(p_font_rid);
 	ERR_FAIL_NULL(fd);
@@ -3312,6 +3318,10 @@ RID TextServerAdvanced::_font_get_glyph_texture_rid(const RID &p_font_rid, const
 			if (ffsd->textures[fgl.texture_idx].dirty) {
 				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
 				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
 				if (fd->mipmaps && !img->has_mipmaps()) {
 					img = tex.image->duplicate();
 					img->generate_mipmaps();
@@ -3360,6 +3370,10 @@ Size2 TextServerAdvanced::_font_get_glyph_texture_size(const RID &p_font_rid, co
 			if (ffsd->textures[fgl.texture_idx].dirty) {
 				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
 				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
 				if (fd->mipmaps && !img->has_mipmaps()) {
 					img = tex.image->duplicate();
 					img->generate_mipmaps();
@@ -3798,7 +3812,7 @@ void TextServerAdvanced::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 		if (fgl.texture_idx != -1) {
 			Color modulate = p_color;
 #ifdef MODULE_FREETYPE_ENABLED
-			if (ffsd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
+			if (!fd->modulate_color_glyphs && ffsd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
 				modulate.r = modulate.g = modulate.b = 1.0;
 			}
 #endif
@@ -3806,6 +3820,10 @@ void TextServerAdvanced::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 				if (ffsd->textures[fgl.texture_idx].dirty) {
 					ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
 					Ref<Image> img = tex.image;
+					if (fgl.from_svg) {
+						// Same as the "fix alpha border" process option when importing SVGs
+						img->fix_alpha_edges();
+					}
 					if (fd->mipmaps && !img->has_mipmaps()) {
 						img = tex.image->duplicate();
 						img->generate_mipmaps();
@@ -4192,6 +4210,8 @@ void TextServerAdvanced::invalidate(TextServerAdvanced::ShapedTextDataAdvanced *
 	p_shaped->uthk = 0.0;
 	p_shaped->glyphs.clear();
 	p_shaped->glyphs_logical.clear();
+	p_shaped->runs.clear();
+	p_shaped->runs_dirty = true;
 	p_shaped->overrun_trim_data = TrimData();
 	p_shaped->utf16 = Char16String();
 	for (int i = 0; i < p_shaped->bidi_iter.size(); i++) {
@@ -4474,6 +4494,213 @@ Variant TextServerAdvanced::_shaped_get_span_embedded_object(const RID &p_shaped
 	}
 }
 
+String TextServerAdvanced::_shaped_get_span_text(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+	ShapedTextDataAdvanced *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, String());
+	}
+	ERR_FAIL_INDEX_V(p_index, span_sd->spans.size(), String());
+	return span_sd->text.substr(span_sd->spans[p_index].start, span_sd->spans[p_index].end - span_sd->spans[p_index].start);
+}
+
+Variant TextServerAdvanced::_shaped_get_span_object(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, Variant());
+	ShapedTextDataAdvanced *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, Variant());
+	}
+	ERR_FAIL_INDEX_V(p_index, span_sd->spans.size(), Variant());
+	return span_sd->spans[p_index].embedded_key;
+}
+
+void TextServerAdvanced::_generate_runs(ShapedTextDataAdvanced *p_sd) const {
+	ERR_FAIL_NULL(p_sd);
+	p_sd->runs.clear();
+
+	ShapedTextDataAdvanced *span_sd = p_sd;
+	if (p_sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(p_sd->parent);
+		ERR_FAIL_NULL(span_sd);
+	}
+
+	int sd_size = p_sd->glyphs.size();
+	const Glyph *sd_gl = p_sd->glyphs.ptr();
+
+	int span_count = span_sd->spans.size();
+	int span = -1;
+	int span_start = -1;
+	int span_end = -1;
+
+	TextRun run;
+	for (int i = 0; i < sd_size; i += sd_gl[i].count) {
+		const Glyph &gl = sd_gl[i];
+		if (gl.start < 0 || gl.end < 0) {
+			continue;
+		}
+		if (gl.start < span_start || gl.start >= span_end) {
+			span = -1;
+			span_start = -1;
+			span_end = -1;
+			for (int j = 0; j < span_count; j++) {
+				if (gl.start >= span_sd->spans[j].start && gl.end <= span_sd->spans[j].end) {
+					span = j;
+					span_start = span_sd->spans[j].start;
+					span_end = span_sd->spans[j].end;
+					break;
+				}
+			}
+		}
+		if (run.font_rid != gl.font_rid || run.font_size != gl.font_size || run.span_index != span || run.rtl != bool(gl.flags & GRAPHEME_IS_RTL)) {
+			if (run.span_index >= 0) {
+				p_sd->runs.push_back(run);
+			}
+			run.range = Vector2i(gl.start, gl.end);
+			run.font_rid = gl.font_rid;
+			run.font_size = gl.font_size;
+			run.rtl = bool(gl.flags & GRAPHEME_IS_RTL);
+			run.span_index = span;
+		}
+		run.range.x = MIN(run.range.x, gl.start);
+		run.range.y = MAX(run.range.y, gl.end);
+	}
+	if (run.span_index >= 0) {
+		p_sd->runs.push_back(run);
+	}
+	p_sd->runs_dirty = false;
+}
+
+int64_t TextServerAdvanced::_shaped_get_run_count(const RID &p_shaped) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, 0);
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	return sd->runs.size();
+}
+
+String TextServerAdvanced::_shaped_get_run_text(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), String());
+	return sd->text.substr(sd->runs[p_index].range.x - sd->start, sd->runs[p_index].range.y - sd->runs[p_index].range.x);
+}
+
+Vector2i TextServerAdvanced::_shaped_get_run_range(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, Vector2i());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), Vector2i());
+	return sd->runs[p_index].range;
+}
+
+RID TextServerAdvanced::_shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, RID());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), RID());
+	return sd->runs[p_index].font_rid;
+}
+
+int TextServerAdvanced::_shaped_get_run_font_size(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, 0);
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), 0);
+	return sd->runs[p_index].font_size;
+}
+
+String TextServerAdvanced::_shaped_get_run_language(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), String());
+
+	int span_idx = sd->runs[p_index].span_index;
+	ShapedTextDataAdvanced *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, String());
+	}
+	ERR_FAIL_INDEX_V(span_idx, span_sd->spans.size(), String());
+	return span_sd->spans[span_idx].language;
+}
+
+TextServer::Direction TextServerAdvanced::_shaped_get_run_direction(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, TextServer::DIRECTION_LTR);
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), TextServer::DIRECTION_LTR);
+	return sd->runs[p_index].rtl ? TextServer::DIRECTION_RTL : TextServer::DIRECTION_LTR;
+}
+
+Variant TextServerAdvanced::_shaped_get_run_object(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, Variant());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerAdvanced *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), Variant());
+
+	int span_idx = sd->runs[p_index].span_index;
+	ShapedTextDataAdvanced *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, Variant());
+	}
+	ERR_FAIL_INDEX_V(span_idx, span_sd->spans.size(), Variant());
+	return span_sd->spans[span_idx].embedded_key;
+}
+
 void TextServerAdvanced::_shaped_set_span_update_font(const RID &p_shaped, int64_t p_index, const TypedArray<RID> &p_fonts, int64_t p_size, const Dictionary &p_opentype_features) {
 	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
 	ERR_FAIL_NULL(sd);
@@ -4557,6 +4784,13 @@ bool TextServerAdvanced::_shaped_text_add_object(const RID &p_shaped, const Vari
 	return true;
 }
 
+String TextServerAdvanced::_shaped_get_text(const RID &p_shaped) const {
+	const ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+
+	return sd->text;
+}
+
 bool TextServerAdvanced::_shaped_text_resize_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align, double p_baseline) {
 	ShapedTextDataAdvanced *sd = shaped_owner.get_or_null(p_shaped);
 	ERR_FAIL_NULL_V(sd, false);
@@ -4753,6 +4987,8 @@ bool TextServerAdvanced::_shape_substr(ShapedTextDataAdvanced *p_new_sd, const S
 	p_new_sd->sort_valid = false;
 	p_new_sd->upos = p_sd->upos;
 	p_new_sd->uthk = p_sd->uthk;
+	p_new_sd->runs.clear();
+	p_new_sd->runs_dirty = true;
 
 	if (p_length > 0) {
 		p_new_sd->text = p_sd->text.substr(p_start - p_sd->start, p_length);
@@ -5650,8 +5886,13 @@ bool TextServerAdvanced::_shaped_text_update_breaks(const RID &p_shaped) {
 				i++;
 			}
 			int r_end = sd->spans[i].end;
-			UBreakIterator *bi = ubrk_open(UBRK_LINE, (language.is_empty()) ? TranslationServer::get_singleton()->get_tool_locale().ascii().get_data() : language.ascii().get_data(), data + _convert_pos_inv(sd, r_start), _convert_pos_inv(sd, r_end - r_start), &err);
-			if (U_FAILURE(err)) {
+			UBreakIterator *bi = _create_line_break_iterator_for_locale(language, &err);
+
+			if (!U_FAILURE(err) && bi) {
+				ubrk_setText(bi, data + _convert_pos_inv(sd, r_start), _convert_pos_inv(sd, r_end - r_start), &err);
+			}
+
+			if (U_FAILURE(err) || !bi) {
 				// No data loaded - use fallback.
 				for (int j = r_start; j < r_end; j++) {
 					char32_t c = sd->text[j - sd->start];
@@ -5679,8 +5920,8 @@ bool TextServerAdvanced::_shaped_text_update_breaks(const RID &p_shaped) {
 						sd->break_inserts++;
 					}
 				}
+				ubrk_close(bi);
 			}
-			ubrk_close(bi);
 			i++;
 		}
 		sd->break_ops_valid = true;
@@ -6108,17 +6349,15 @@ Glyph TextServerAdvanced::_shape_single_glyph(ShapedTextDataAdvanced *p_sd, char
 	return gl;
 }
 
-_FORCE_INLINE_ void TextServerAdvanced::_add_featuers(const Dictionary &p_source, Vector<hb_feature_t> &r_ftrs) {
-	Array keys = p_source.keys();
-	Array values = p_source.values();
-	for (int i = 0; i < keys.size(); i++) {
-		int32_t value = values[i];
+_FORCE_INLINE_ void TextServerAdvanced::_add_features(const Dictionary &p_source, Vector<hb_feature_t> &r_ftrs) {
+	for (const KeyValue<Variant, Variant> &key_value : p_source) {
+		int32_t value = key_value.value;
 		if (value >= 0) {
 			hb_feature_t feature;
-			if (keys[i].is_string()) {
-				feature.tag = _name_to_tag(keys[i]);
+			if (key_value.key.is_string()) {
+				feature.tag = _name_to_tag(key_value.key);
 			} else {
-				feature.tag = keys[i];
+				feature.tag = key_value.key;
 			}
 			feature.value = value;
 			feature.start = 0;
@@ -6128,6 +6367,24 @@ _FORCE_INLINE_ void TextServerAdvanced::_add_featuers(const Dictionary &p_source
 	}
 }
 
+UBreakIterator *TextServerAdvanced::_create_line_break_iterator_for_locale(const String &p_language, UErrorCode *r_err) const {
+	// Creating UBreakIterator (ubrk_open) is surprisingly costly.
+	// However, cloning (ubrk_clone) is cheaper, so we keep around blueprints to accelerate creating new ones.
+
+	const String language = p_language.is_empty() ? TranslationServer::get_singleton()->get_tool_locale() : p_language;
+	_THREAD_SAFE_METHOD_
+	const HashMap<String, UBreakIterator *>::Iterator key_value = line_break_iterators_per_language.find(language);
+	if (key_value) {
+		return ubrk_clone(key_value->value, r_err);
+	}
+	UBreakIterator *bi = ubrk_open(UBRK_LINE, language.ascii().get_data(), nullptr, 0, r_err);
+	if (U_FAILURE(*r_err) || !bi) {
+		return nullptr;
+	}
+	line_break_iterators_per_language.insert(language, bi);
+	return ubrk_clone(bi, r_err);
+}
+
 void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_start, int64_t p_end, hb_script_t p_script, hb_direction_t p_direction, TypedArray<RID> p_fonts, int64_t p_span, int64_t p_fb_index, int64_t p_prev_start, int64_t p_prev_end, RID p_prev_font) {
 	RID f;
 	int fs = p_sd->spans[p_span].font_size;
@@ -6271,8 +6528,8 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
 	hb_buffer_add_utf32(p_sd->hb_buffer, (const uint32_t *)p_sd->text.ptr(), p_sd->text.length(), p_start, p_end - p_start);
 
 	Vector<hb_feature_t> ftrs;
-	_add_featuers(_font_get_opentype_feature_overrides(f), ftrs);
-	_add_featuers(p_sd->spans[p_span].features, ftrs);
+	_add_features(_font_get_opentype_feature_overrides(f), ftrs);
+	_add_features(p_sd->spans[p_span].features, ftrs);
 
 	hb_shape(hb_font, p_sd->hb_buffer, ftrs.is_empty() ? nullptr : &ftrs[0], ftrs.size());
 
@@ -6521,6 +6778,8 @@ bool TextServerAdvanced::_shaped_text_shape(const RID &p_shaped) {
 	} else {
 		bidi_ranges = sd->bidi_override;
 	}
+	sd->runs.clear();
+	sd->runs_dirty = true;
 
 	for (int ov = 0; ov < bidi_ranges.size(); ov++) {
 		// Create BiDi iterator.
@@ -7703,6 +7962,9 @@ TextServerAdvanced::~TextServerAdvanced() {
 		uset_close(allowed);
 		allowed = nullptr;
 	}
+	for (const KeyValue<String, UBreakIterator *> &bi : line_break_iterators_per_language) {
+		ubrk_close(bi.value);
+	}
 
 	std::atexit(u_cleanup);
 }
diff --git a/engine/modules/text_server_adv/text_server_adv.h b/engine/modules/text_server_adv/text_server_adv.h
index 6561667e..deb6e675 100644
--- a/engine/modules/text_server_adv/text_server_adv.h
+++ b/engine/modules/text_server_adv/text_server_adv.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SERVER_ADV_H
-#define TEXT_SERVER_ADV_H
+#pragma once
 
 /*************************************************************************/
 /* ICU/HarfBuzz/Graphite backed Text Server implementation with BiDi,    */
@@ -95,11 +94,6 @@ using namespace godot;
 
 // Thirdparty headers.
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
 #include <unicode/ubidi.h>
 #include <unicode/ubrk.h>
 #include <unicode/uchar.h>
@@ -113,10 +107,6 @@ using namespace godot;
 #include <unicode/ustring.h>
 #include <unicode/utypes.h>
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
 #ifdef MODULE_FREETYPE_ENABLED
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -177,6 +167,10 @@ class TextServerAdvanced : public TextServerExtension {
 	mutable USpoofChecker *sc_spoof = nullptr;
 	mutable USpoofChecker *sc_conf = nullptr;
 
+	mutable HashMap<String, UBreakIterator *> line_break_iterators_per_language;
+
+	UBreakIterator *_create_line_break_iterator_for_locale(const String &p_language, UErrorCode *r_err) const;
+
 	// Font cache data.
 
 #ifdef MODULE_FREETYPE_ENABLED
@@ -272,6 +266,7 @@ class TextServerAdvanced : public TextServerExtension {
 		Rect2 rect;
 		Rect2 uv_rect;
 		Vector2 advance;
+		bool from_svg = false;
 	};
 
 	struct FontForSizeAdvanced {
@@ -326,6 +321,7 @@ class TextServerAdvanced : public TextServerExtension {
 		int fixed_size = 0;
 		bool allow_system_fallback = true;
 		bool force_autohinter = false;
+		bool modulate_color_glyphs = false;
 		TextServer::Hinting hinting = TextServer::HINTING_LIGHT;
 		TextServer::SubpixelPositioning subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_AUTO;
 		bool keep_rounding_remainders = true;
@@ -404,7 +400,7 @@ class TextServerAdvanced : public TextServerExtension {
 	_FORCE_INLINE_ Variant::Type _get_tag_type(int64_t p_tag) const;
 	_FORCE_INLINE_ bool _get_tag_hidden(int64_t p_tag) const;
 	_FORCE_INLINE_ int _font_get_weight_by_name(const String &p_sty_name) const {
-		String sty_name = p_sty_name.replace(" ", "").replace("-", "");
+		String sty_name = p_sty_name.remove_chars(" -");
 		if (sty_name.contains("thin") || sty_name.contains("hairline")) {
 			return 100;
 		} else if (sty_name.contains("extralight") || sty_name.contains("ultralight")) {
@@ -431,7 +427,7 @@ class TextServerAdvanced : public TextServerExtension {
 		return 400;
 	}
 	_FORCE_INLINE_ int _font_get_stretch_by_name(const String &p_sty_name) const {
-		String sty_name = p_sty_name.replace(" ", "").replace("-", "");
+		String sty_name = p_sty_name.remove_chars(" -");
 		if (sty_name.contains("ultracondensed")) {
 			return 50;
 		} else if (sty_name.contains("extracondensed")) {
@@ -462,6 +458,14 @@ class TextServerAdvanced : public TextServerExtension {
 		Vector<Glyph> ellipsis_glyph_buf;
 	};
 
+	struct TextRun {
+		Vector2i range;
+		RID font_rid;
+		int font_size = 0;
+		bool rtl = false;
+		int64_t span_index = -1;
+	};
+
 	struct ShapedTextDataAdvanced {
 		Mutex mutex;
 
@@ -493,6 +497,9 @@ class TextServerAdvanced : public TextServerExtension {
 		int first_span = 0; // First span in the parent ShapedTextData.
 		int last_span = 0;
 
+		Vector<TextRun> runs;
+		bool runs_dirty = true;
+
 		struct EmbeddedObject {
 			int start = -1;
 			int end = -1;
@@ -668,6 +675,7 @@ class TextServerAdvanced : public TextServerExtension {
 	mutable HashMap<String, PackedByteArray> system_font_data;
 
 	void _update_chars(ShapedTextDataAdvanced *p_sd) const;
+	void _generate_runs(ShapedTextDataAdvanced *p_sd) const;
 	void _realign(ShapedTextDataAdvanced *p_sd) const;
 	int64_t _convert_pos(const String &p_utf32, const Char16String &p_utf16, int64_t p_pos) const;
 	int64_t _convert_pos(const ShapedTextDataAdvanced *p_sd, int64_t p_pos) const;
@@ -677,7 +685,7 @@ class TextServerAdvanced : public TextServerExtension {
 	Glyph _shape_single_glyph(ShapedTextDataAdvanced *p_sd, char32_t p_char, hb_script_t p_script, hb_direction_t p_direction, const RID &p_font, int64_t p_font_size);
 	_FORCE_INLINE_ RID _find_sys_font_for_text(const RID &p_fdef, const String &p_script_code, const String &p_language, const String &p_text);
 
-	_FORCE_INLINE_ void _add_featuers(const Dictionary &p_source, Vector<hb_feature_t> &r_ftrs);
+	_FORCE_INLINE_ void _add_features(const Dictionary &p_source, Vector<hb_feature_t> &r_ftrs);
 
 	Mutex ft_mutex;
 
@@ -803,6 +811,9 @@ public:
 	MODBIND2(font_set_force_autohinter, const RID &, bool);
 	MODBIND1RC(bool, font_is_force_autohinter, const RID &);
 
+	MODBIND2(font_set_modulate_color_glyphs, const RID &, bool);
+	MODBIND1RC(bool, font_is_modulate_color_glyphs, const RID &);
+
 	MODBIND2(font_set_subpixel_positioning, const RID &, SubpixelPositioning);
 	MODBIND1RC(SubpixelPositioning, font_get_subpixel_positioning, const RID &);
 
@@ -957,12 +968,24 @@ public:
 	MODBIND7R(bool, shaped_text_add_string, const RID &, const String &, const TypedArray<RID> &, int64_t, const Dictionary &, const String &, const Variant &);
 	MODBIND6R(bool, shaped_text_add_object, const RID &, const Variant &, const Size2 &, InlineAlignment, int64_t, double);
 	MODBIND5R(bool, shaped_text_resize_object, const RID &, const Variant &, const Size2 &, InlineAlignment, double);
+	MODBIND1RC(String, shaped_get_text, const RID &);
 
 	MODBIND1RC(int64_t, shaped_get_span_count, const RID &);
 	MODBIND2RC(Variant, shaped_get_span_meta, const RID &, int64_t);
 	MODBIND2RC(Variant, shaped_get_span_embedded_object, const RID &, int64_t);
+	MODBIND2RC(String, shaped_get_span_text, const RID &, int64_t);
+	MODBIND2RC(Variant, shaped_get_span_object, const RID &, int64_t);
 	MODBIND5(shaped_set_span_update_font, const RID &, int64_t, const TypedArray<RID> &, int64_t, const Dictionary &);
 
+	MODBIND1RC(int64_t, shaped_get_run_count, const RID &);
+	MODBIND2RC(String, shaped_get_run_text, const RID &, int64_t);
+	MODBIND2RC(Vector2i, shaped_get_run_range, const RID &, int64_t);
+	MODBIND2RC(RID, shaped_get_run_font_rid, const RID &, int64_t);
+	MODBIND2RC(int, shaped_get_run_font_size, const RID &, int64_t);
+	MODBIND2RC(String, shaped_get_run_language, const RID &, int64_t);
+	MODBIND2RC(Direction, shaped_get_run_direction, const RID &, int64_t);
+	MODBIND2RC(Variant, shaped_get_run_object, const RID &, int64_t);
+
 	MODBIND3RC(RID, shaped_text_substr, const RID &, int64_t, int64_t);
 	MODBIND1RC(RID, shaped_text_get_parent, const RID &);
 
@@ -1025,5 +1048,3 @@ public:
 	TextServerAdvanced();
 	~TextServerAdvanced();
 };
-
-#endif // TEXT_SERVER_ADV_H
diff --git a/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp b/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp
index 62aadf1b..e88cb682 100644
--- a/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp
+++ b/engine/modules/text_server_adv/thorvg_svg_in_ot.cpp
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#include "thorvg_svg_in_ot.h"
+
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
 
@@ -55,8 +57,6 @@ using namespace godot;
 #ifdef MODULE_SVG_ENABLED
 #ifdef MODULE_FREETYPE_ENABLED
 
-#include "thorvg_svg_in_ot.h"
-
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
diff --git a/engine/modules/text_server_adv/thorvg_svg_in_ot.h b/engine/modules/text_server_adv/thorvg_svg_in_ot.h
index 77a00d17..39c66eb1 100644
--- a/engine/modules/text_server_adv/thorvg_svg_in_ot.h
+++ b/engine/modules/text_server_adv/thorvg_svg_in_ot.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THORVG_SVG_IN_OT_H
-#define THORVG_SVG_IN_OT_H
+#pragma once
 
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
@@ -95,5 +94,3 @@ SVG_RendererHooks *get_tvg_svg_in_ot_hooks();
 
 #endif // MODULE_FREETYPE_ENABLED
 #endif // MODULE_SVG_ENABLED
-
-#endif // THORVG_SVG_IN_OT_H
diff --git a/engine/modules/text_server_fb/SCsub b/engine/modules/text_server_fb/SCsub
index b56df192..50c6abf5 100644
--- a/engine/modules/text_server_fb/SCsub
+++ b/engine/modules/text_server_fb/SCsub
@@ -11,21 +11,17 @@ env_text_server_fb = env_modules.Clone()
 
 if "svg" in env.module_list:
     env_text_server_fb.Prepend(
-        CPPPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/common", "#thirdparty/thorvg/src/renderer"]
+        CPPEXTPATH=["#thirdparty/thorvg/inc", "#thirdparty/thorvg/src/common", "#thirdparty/thorvg/src/renderer"]
     )
     # Enable ThorVG static object linking.
     env_text_server_fb.Append(CPPDEFINES=["TVG_STATIC"])
 
 if env["builtin_msdfgen"] and msdfgen_enabled:
-    # Treat msdfgen headers as system headers to avoid raising warnings. Not supported on MSVC.
     env_text_server_fb.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
-    if not env.msvc:
-        env_text_server_fb.Append(CPPFLAGS=["-isystem", Dir("#thirdparty/msdfgen").path])
-    else:
-        env_text_server_fb.Prepend(CPPPATH=["#thirdparty/msdfgen"])
+    env_text_server_fb.Prepend(CPPEXTPATH=["#thirdparty/msdfgen"])
 
 if env["builtin_freetype"] and freetype_enabled:
     env_text_server_fb.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
-    env_text_server_fb.Prepend(CPPPATH=["#thirdparty/freetype/include"])
+    env_text_server_fb.Prepend(CPPEXTPATH=["#thirdparty/freetype/include"])
 
 env_text_server_fb.add_source_files(env.modules_sources, "*.cpp")
diff --git a/engine/modules/text_server_fb/register_types.h b/engine/modules/text_server_fb/register_types.h
index 0933ea83..dd3c4a16 100644
--- a/engine/modules/text_server_fb/register_types.h
+++ b/engine/modules/text_server_fb/register_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SERVER_FB_REGISTER_TYPES_H
-#define TEXT_SERVER_FB_REGISTER_TYPES_H
+#pragma once
 
 #ifdef GDEXTENSION
 #include <godot_cpp/core/class_db.hpp>
@@ -40,5 +39,3 @@ using namespace godot;
 
 void initialize_text_server_fb_module(ModuleInitializationLevel p_level);
 void uninitialize_text_server_fb_module(ModuleInitializationLevel p_level);
-
-#endif // TEXT_SERVER_FB_REGISTER_TYPES_H
diff --git a/engine/modules/text_server_fb/text_server_fb.cpp b/engine/modules/text_server_fb/text_server_fb.cpp
index 8ca81368..541ad65f 100644
--- a/engine/modules/text_server_fb/text_server_fb.cpp
+++ b/engine/modules/text_server_fb/text_server_fb.cpp
@@ -61,17 +61,11 @@ using namespace godot;
 // Thirdparty headers.
 
 #ifdef MODULE_MSDFGEN_ENABLED
-#ifdef _MSC_VER
-#pragma warning(disable : 4458)
-#endif
 #include <core/EdgeHolder.h>
 #include <core/ShapeDistanceFinder.h>
 #include <core/contour-combiners.h>
 #include <core/edge-selectors.h>
 #include <msdfgen.h>
-#ifdef _MSC_VER
-#pragma warning(default : 4458)
-#endif
 #endif
 
 #ifdef MODULE_FREETYPE_ENABLED
@@ -741,11 +735,12 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data,
 			} break;
 		}
 
+		FT_GlyphSlot slot = fd->face->glyph;
+		bool from_svg = (slot->format == FT_GLYPH_FORMAT_SVG); // Need to check before FT_Render_Glyph as it will change format to bitmap.
 		if (!outline) {
 			if (!p_font_data->msdf) {
-				error = FT_Render_Glyph(fd->face->glyph, aa_mode);
+				error = FT_Render_Glyph(slot, aa_mode);
 			}
-			FT_GlyphSlot slot = fd->face->glyph;
 			if (!error) {
 				if (p_font_data->msdf) {
 #ifdef MODULE_MSDFGEN_ENABLED
@@ -786,6 +781,7 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_glyph(FontFallback *p_font_data,
 		cleanup_stroker:
 			FT_Stroker_Done(stroker);
 		}
+		gl.from_svg = from_svg;
 		E = fd->glyph_map.insert(p_glyph, gl);
 		r_glyph = E->value;
 		return gl.found;
@@ -875,10 +871,10 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_f
 
 		if (FT_HAS_COLOR(fd->face) && fd->face->num_fixed_sizes > 0) {
 			int best_match = 0;
-			int diff = ABS(fd->size.x - ((int64_t)fd->face->available_sizes[0].width));
+			int diff = Math::abs(fd->size.x - ((int64_t)fd->face->available_sizes[0].width));
 			fd->scale = double(fd->size.x * fd->oversampling) / fd->face->available_sizes[0].width;
 			for (int i = 1; i < fd->face->num_fixed_sizes; i++) {
-				int ndiff = ABS(fd->size.x - ((int64_t)fd->face->available_sizes[i].width));
+				int ndiff = Math::abs(fd->size.x - ((int64_t)fd->face->available_sizes[i].width));
 				if (ndiff < diff) {
 					best_match = i;
 					diff = ndiff;
@@ -918,12 +914,14 @@ _FORCE_INLINE_ bool TextServerFallback::_ensure_cache_for_size(FontFallback *p_f
 
 					switch (sfnt_name.platform_id) {
 						case TT_PLATFORM_APPLE_UNICODE: {
-							p_font_data->font_name.parse_utf16((const char16_t *)sfnt_name.string, sfnt_name.string_len / 2, false);
+							p_font_data->font_name.clear();
+							p_font_data->font_name.append_utf16((const char16_t *)sfnt_name.string, sfnt_name.string_len / 2, false);
 						} break;
 
 						case TT_PLATFORM_MICROSOFT: {
 							if (sfnt_name.encoding_id == TT_MS_ID_UNICODE_CS || sfnt_name.encoding_id == TT_MS_ID_UCS_4) {
-								p_font_data->font_name.parse_utf16((const char16_t *)sfnt_name.string, sfnt_name.string_len / 2, false);
+								p_font_data->font_name.clear();
+								p_font_data->font_name.append_utf16((const char16_t *)sfnt_name.string, sfnt_name.string_len / 2, false);
 							}
 						} break;
 					}
@@ -1438,6 +1436,24 @@ bool TextServerFallback::_font_is_force_autohinter(const RID &p_font_rid) const
 	return fd->force_autohinter;
 }
 
+void TextServerFallback::_font_set_modulate_color_glyphs(const RID &p_font_rid, bool p_modulate) {
+	FontFallback *fd = _get_font_data(p_font_rid);
+	ERR_FAIL_NULL(fd);
+
+	MutexLock lock(fd->mutex);
+	if (fd->modulate_color_glyphs != p_modulate) {
+		fd->modulate_color_glyphs = p_modulate;
+	}
+}
+
+bool TextServerFallback::_font_is_modulate_color_glyphs(const RID &p_font_rid) const {
+	FontFallback *fd = _get_font_data(p_font_rid);
+	ERR_FAIL_NULL_V(fd, false);
+
+	MutexLock lock(fd->mutex);
+	return fd->modulate_color_glyphs;
+}
+
 void TextServerFallback::_font_set_hinting(const RID &p_font_rid, TextServer::Hinting p_hinting) {
 	FontFallback *fd = _get_font_data(p_font_rid);
 	ERR_FAIL_NULL(fd);
@@ -2290,6 +2306,10 @@ RID TextServerFallback::_font_get_glyph_texture_rid(const RID &p_font_rid, const
 			if (ffsd->textures[fgl.texture_idx].dirty) {
 				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
 				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
 				if (fd->mipmaps && !img->has_mipmaps()) {
 					img = tex.image->duplicate();
 					img->generate_mipmaps();
@@ -2338,6 +2358,10 @@ Size2 TextServerFallback::_font_get_glyph_texture_size(const RID &p_font_rid, co
 			if (ffsd->textures[fgl.texture_idx].dirty) {
 				ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
 				Ref<Image> img = tex.image;
+				if (fgl.from_svg) {
+					// Same as the "fix alpha border" process option when importing SVGs
+					img->fix_alpha_edges();
+				}
 				if (fd->mipmaps && !img->has_mipmaps()) {
 					img = tex.image->duplicate();
 					img->generate_mipmaps();
@@ -2729,7 +2753,7 @@ void TextServerFallback::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 		if (fgl.texture_idx != -1) {
 			Color modulate = p_color;
 #ifdef MODULE_FREETYPE_ENABLED
-			if (ffsd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
+			if (!fd->modulate_color_glyphs && ffsd->face && ffsd->textures[fgl.texture_idx].image.is_valid() && (ffsd->textures[fgl.texture_idx].image->get_format() == Image::FORMAT_RGBA8) && !lcd_aa && !fd->msdf) {
 				modulate.r = modulate.g = modulate.b = 1.0;
 			}
 #endif
@@ -2737,6 +2761,10 @@ void TextServerFallback::_font_draw_glyph(const RID &p_font_rid, const RID &p_ca
 				if (ffsd->textures[fgl.texture_idx].dirty) {
 					ShelfPackTexture &tex = ffsd->textures.write[fgl.texture_idx];
 					Ref<Image> img = tex.image;
+					if (fgl.from_svg) {
+						// Same as the "fix alpha border" process option when importing SVGs
+						img->fix_alpha_edges();
+					}
 					if (fd->mipmaps && !img->has_mipmaps()) {
 						img = tex.image->duplicate();
 						img->generate_mipmaps();
@@ -3077,6 +3105,8 @@ void TextServerFallback::invalidate(ShapedTextDataFallback *p_shaped) {
 	p_shaped->uthk = 0.0;
 	p_shaped->glyphs.clear();
 	p_shaped->glyphs_logical.clear();
+	p_shaped->runs.clear();
+	p_shaped->runs_dirty = true;
 }
 
 void TextServerFallback::full_copy(ShapedTextDataFallback *p_shaped) {
@@ -3311,6 +3341,212 @@ Variant TextServerFallback::_shaped_get_span_embedded_object(const RID &p_shaped
 	}
 }
 
+String TextServerFallback::_shaped_get_span_text(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+	ShapedTextDataFallback *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, String());
+	}
+	ERR_FAIL_INDEX_V(p_index, span_sd->spans.size(), String());
+	return span_sd->text.substr(span_sd->spans[p_index].start, span_sd->spans[p_index].end - span_sd->spans[p_index].start);
+}
+
+Variant TextServerFallback::_shaped_get_span_object(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, Variant());
+	ShapedTextDataFallback *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, Variant());
+	}
+	ERR_FAIL_INDEX_V(p_index, span_sd->spans.size(), Variant());
+	return span_sd->spans[p_index].embedded_key;
+}
+
+void TextServerFallback::_generate_runs(ShapedTextDataFallback *p_sd) const {
+	ERR_FAIL_NULL(p_sd);
+	p_sd->runs.clear();
+
+	ShapedTextDataFallback *span_sd = p_sd;
+	if (p_sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(p_sd->parent);
+		ERR_FAIL_NULL(span_sd);
+	}
+
+	int sd_size = p_sd->glyphs.size();
+	Glyph *sd_gl = p_sd->glyphs.ptrw();
+
+	int span_count = span_sd->spans.size();
+	int span = -1;
+	int span_start = -1;
+	int span_end = -1;
+
+	TextRun run;
+	for (int i = 0; i < sd_size; i += sd_gl[i].count) {
+		const Glyph &gl = sd_gl[i];
+		if (gl.start < 0 || gl.end < 0) {
+			continue;
+		}
+		if (gl.start < span_start || gl.start >= span_end) {
+			span = -1;
+			span_start = -1;
+			span_end = -1;
+			for (int j = 0; j < span_count; j++) {
+				if (gl.start >= span_sd->spans[j].start && gl.end <= span_sd->spans[j].end) {
+					span = j;
+					span_start = span_sd->spans[j].start;
+					span_end = span_sd->spans[j].end;
+					break;
+				}
+			}
+		}
+		if (run.font_rid != gl.font_rid || run.font_size != gl.font_size || run.span_index != span) {
+			if (run.span_index >= 0) {
+				p_sd->runs.push_back(run);
+			}
+			run.range = Vector2i(gl.start, gl.end);
+			run.font_rid = gl.font_rid;
+			run.font_size = gl.font_size;
+			run.span_index = span;
+		}
+		run.range.x = MIN(run.range.x, gl.start);
+		run.range.y = MAX(run.range.y, gl.end);
+	}
+	if (run.span_index >= 0) {
+		p_sd->runs.push_back(run);
+	}
+	p_sd->runs_dirty = false;
+}
+
+int64_t TextServerFallback::_shaped_get_run_count(const RID &p_shaped) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, 0);
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	return sd->runs.size();
+}
+
+String TextServerFallback::_shaped_get_run_text(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), String());
+	return sd->text.substr(sd->runs[p_index].range.x - sd->start, sd->runs[p_index].range.y - sd->runs[p_index].range.x);
+}
+
+Vector2i TextServerFallback::_shaped_get_run_range(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, Vector2i());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), Vector2i());
+	return sd->runs[p_index].range;
+}
+
+RID TextServerFallback::_shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, RID());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), RID());
+	return sd->runs[p_index].font_rid;
+}
+
+int TextServerFallback::_shaped_get_run_font_size(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, 0);
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), 0);
+	return sd->runs[p_index].font_size;
+}
+
+String TextServerFallback::_shaped_get_run_language(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), String());
+
+	int span_idx = sd->runs[p_index].span_index;
+	ShapedTextDataFallback *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, String());
+	}
+	ERR_FAIL_INDEX_V(span_idx, span_sd->spans.size(), String());
+	return span_sd->spans[span_idx].language;
+}
+
+TextServer::Direction TextServerFallback::_shaped_get_run_direction(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, TextServer::DIRECTION_LTR);
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), TextServer::DIRECTION_LTR);
+	return TextServer::DIRECTION_LTR;
+}
+
+Variant TextServerFallback::_shaped_get_run_object(const RID &p_shaped, int64_t p_index) const {
+	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, Variant());
+	MutexLock lock(sd->mutex);
+	if (!sd->valid.is_set()) {
+		const_cast<TextServerFallback *>(this)->_shaped_text_shape(p_shaped);
+	}
+	if (sd->runs_dirty) {
+		_generate_runs(sd);
+	}
+	ERR_FAIL_INDEX_V(p_index, sd->runs.size(), Variant());
+
+	int span_idx = sd->runs[p_index].span_index;
+	ShapedTextDataFallback *span_sd = sd;
+	if (sd->parent.is_valid()) {
+		span_sd = shaped_owner.get_or_null(sd->parent);
+		ERR_FAIL_NULL_V(span_sd, Variant());
+	}
+	ERR_FAIL_INDEX_V(span_idx, span_sd->spans.size(), Variant());
+	return span_sd->spans[span_idx].embedded_key;
+}
+
 void TextServerFallback::_shaped_set_span_update_font(const RID &p_shaped, int64_t p_index, const TypedArray<RID> &p_fonts, int64_t p_size, const Dictionary &p_opentype_features) {
 	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
 	ERR_FAIL_NULL(sd);
@@ -3422,6 +3658,13 @@ bool TextServerFallback::_shaped_text_add_object(const RID &p_shaped, const Vari
 	return true;
 }
 
+String TextServerFallback::_shaped_get_text(const RID &p_shaped) const {
+	const ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
+	ERR_FAIL_NULL_V(sd, String());
+
+	return sd->text;
+}
+
 bool TextServerFallback::_shaped_text_resize_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align, double p_baseline) {
 	ShapedTextDataFallback *sd = shaped_owner.get_or_null(p_shaped);
 	ERR_FAIL_NULL_V(sd, false);
@@ -4357,6 +4600,8 @@ bool TextServerFallback::_shaped_text_shape(const RID &p_shaped) {
 	sd->descent = 0.0;
 	sd->width = 0.0;
 	sd->glyphs.clear();
+	sd->runs.clear();
+	sd->runs_dirty = true;
 
 	if (sd->text.length() == 0) {
 		sd->valid.set();
diff --git a/engine/modules/text_server_fb/text_server_fb.h b/engine/modules/text_server_fb/text_server_fb.h
index b66f7189..28ce1789 100644
--- a/engine/modules/text_server_fb/text_server_fb.h
+++ b/engine/modules/text_server_fb/text_server_fb.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SERVER_FB_H
-#define TEXT_SERVER_FB_H
+#pragma once
 
 /*************************************************************************/
 /* Fallback Text Server provides simplified TS functionality, without    */
@@ -219,6 +218,7 @@ class TextServerFallback : public TextServerExtension {
 		Rect2 rect;
 		Rect2 uv_rect;
 		Vector2 advance;
+		bool from_svg = false;
 	};
 
 	struct FontForSizeFallback {
@@ -268,6 +268,7 @@ class TextServerFallback : public TextServerExtension {
 		int fixed_size = 0;
 		bool force_autohinter = false;
 		bool allow_system_fallback = true;
+		bool modulate_color_glyphs = false;
 		TextServer::Hinting hinting = TextServer::HINTING_LIGHT;
 		TextServer::SubpixelPositioning subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_AUTO;
 		bool keep_rounding_remainders = true;
@@ -341,7 +342,7 @@ class TextServerFallback : public TextServerExtension {
 	}
 
 	_FORCE_INLINE_ int _font_get_weight_by_name(const String &p_sty_name) const {
-		String sty_name = p_sty_name.replace(" ", "").replace("-", "");
+		String sty_name = p_sty_name.remove_chars(" -");
 		if (sty_name.contains("thin") || sty_name.contains("hairline")) {
 			return 100;
 		} else if (sty_name.contains("extralight") || sty_name.contains("ultralight")) {
@@ -368,7 +369,7 @@ class TextServerFallback : public TextServerExtension {
 		return 400;
 	}
 	_FORCE_INLINE_ int _font_get_stretch_by_name(const String &p_sty_name) const {
-		String sty_name = p_sty_name.replace(" ", "").replace("-", "");
+		String sty_name = p_sty_name.remove_chars(" -");
 		if (sty_name.contains("ultracondensed")) {
 			return 50;
 		} else if (sty_name.contains("extracondensed")) {
@@ -399,6 +400,13 @@ class TextServerFallback : public TextServerExtension {
 		Vector<Glyph> ellipsis_glyph_buf;
 	};
 
+	struct TextRun {
+		Vector2i range;
+		RID font_rid;
+		int font_size = 0;
+		int64_t span_index = -1;
+	};
+
 	struct ShapedTextDataFallback {
 		Mutex mutex;
 
@@ -430,6 +438,9 @@ class TextServerFallback : public TextServerExtension {
 		int first_span = 0; // First span in the parent ShapedTextData.
 		int last_span = 0;
 
+		Vector<TextRun> runs;
+		bool runs_dirty = true;
+
 		struct EmbeddedObject {
 			int start = -1;
 			int end = -1;
@@ -574,6 +585,7 @@ class TextServerFallback : public TextServerExtension {
 	mutable HashMap<SystemFontKey, SystemFontCache, SystemFontKeyHasher> system_fonts;
 	mutable HashMap<String, PackedByteArray> system_font_data;
 
+	void _generate_runs(ShapedTextDataFallback *p_sd) const;
 	void _realign(ShapedTextDataFallback *p_sd) const;
 	_FORCE_INLINE_ RID _find_sys_font_for_text(const RID &p_fdef, const String &p_script_code, const String &p_language, const String &p_text);
 
@@ -662,6 +674,9 @@ public:
 	MODBIND2(font_set_force_autohinter, const RID &, bool);
 	MODBIND1RC(bool, font_is_force_autohinter, const RID &);
 
+	MODBIND2(font_set_modulate_color_glyphs, const RID &, bool);
+	MODBIND1RC(bool, font_is_modulate_color_glyphs, const RID &);
+
 	MODBIND2(font_set_subpixel_positioning, const RID &, SubpixelPositioning);
 	MODBIND1RC(SubpixelPositioning, font_get_subpixel_positioning, const RID &);
 
@@ -816,12 +831,24 @@ public:
 	MODBIND7R(bool, shaped_text_add_string, const RID &, const String &, const TypedArray<RID> &, int64_t, const Dictionary &, const String &, const Variant &);
 	MODBIND6R(bool, shaped_text_add_object, const RID &, const Variant &, const Size2 &, InlineAlignment, int64_t, double);
 	MODBIND5R(bool, shaped_text_resize_object, const RID &, const Variant &, const Size2 &, InlineAlignment, double);
+	MODBIND1RC(String, shaped_get_text, const RID &);
 
 	MODBIND1RC(int64_t, shaped_get_span_count, const RID &);
 	MODBIND2RC(Variant, shaped_get_span_meta, const RID &, int64_t);
 	MODBIND2RC(Variant, shaped_get_span_embedded_object, const RID &, int64_t);
+	MODBIND2RC(String, shaped_get_span_text, const RID &, int64_t);
+	MODBIND2RC(Variant, shaped_get_span_object, const RID &, int64_t);
 	MODBIND5(shaped_set_span_update_font, const RID &, int64_t, const TypedArray<RID> &, int64_t, const Dictionary &);
 
+	MODBIND1RC(int64_t, shaped_get_run_count, const RID &);
+	MODBIND2RC(String, shaped_get_run_text, const RID &, int64_t);
+	MODBIND2RC(Vector2i, shaped_get_run_range, const RID &, int64_t);
+	MODBIND2RC(RID, shaped_get_run_font_rid, const RID &, int64_t);
+	MODBIND2RC(int, shaped_get_run_font_size, const RID &, int64_t);
+	MODBIND2RC(String, shaped_get_run_language, const RID &, int64_t);
+	MODBIND2RC(Direction, shaped_get_run_direction, const RID &, int64_t);
+	MODBIND2RC(Variant, shaped_get_run_object, const RID &, int64_t);
+
 	MODBIND3RC(RID, shaped_text_substr, const RID &, int64_t, int64_t);
 	MODBIND1RC(RID, shaped_text_get_parent, const RID &);
 
@@ -872,5 +899,3 @@ public:
 	TextServerFallback();
 	~TextServerFallback();
 };
-
-#endif // TEXT_SERVER_FB_H
diff --git a/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp b/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp
index 62aadf1b..e88cb682 100644
--- a/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp
+++ b/engine/modules/text_server_fb/thorvg_svg_in_ot.cpp
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#include "thorvg_svg_in_ot.h"
+
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
 
@@ -55,8 +57,6 @@ using namespace godot;
 #ifdef MODULE_SVG_ENABLED
 #ifdef MODULE_FREETYPE_ENABLED
 
-#include "thorvg_svg_in_ot.h"
-
 #include <freetype/otsvg.h>
 #include <ft2build.h>
 
diff --git a/engine/modules/text_server_fb/thorvg_svg_in_ot.h b/engine/modules/text_server_fb/thorvg_svg_in_ot.h
index 77a00d17..39c66eb1 100644
--- a/engine/modules/text_server_fb/thorvg_svg_in_ot.h
+++ b/engine/modules/text_server_fb/thorvg_svg_in_ot.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THORVG_SVG_IN_OT_H
-#define THORVG_SVG_IN_OT_H
+#pragma once
 
 #ifdef GDEXTENSION
 // Headers for building as GDExtension plug-in.
@@ -95,5 +94,3 @@ SVG_RendererHooks *get_tvg_svg_in_ot_hooks();
 
 #endif // MODULE_FREETYPE_ENABLED
 #endif // MODULE_SVG_ENABLED
-
-#endif // THORVG_SVG_IN_OT_H
diff --git a/engine/modules/tga/image_loader_tga.h b/engine/modules/tga/image_loader_tga.h
index cde0c300..3c7372d6 100644
--- a/engine/modules/tga/image_loader_tga.h
+++ b/engine/modules/tga/image_loader_tga.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_TGA_H
-#define IMAGE_LOADER_TGA_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -79,5 +78,3 @@ public:
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	ImageLoaderTGA();
 };
-
-#endif // IMAGE_LOADER_TGA_H
diff --git a/engine/modules/tga/register_types.h b/engine/modules/tga/register_types.h
index 4aa13320..87cb14bc 100644
--- a/engine/modules/tga/register_types.h
+++ b/engine/modules/tga/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TGA_REGISTER_TYPES_H
-#define TGA_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_tga_module(ModuleInitializationLevel p_level);
 void uninitialize_tga_module(ModuleInitializationLevel p_level);
-
-#endif // TGA_REGISTER_TYPES_H
diff --git a/engine/modules/theora/SCsub b/engine/modules/theora/SCsub
index be557c1c..c6014358 100644
--- a/engine/modules/theora/SCsub
+++ b/engine/modules/theora/SCsub
@@ -79,13 +79,13 @@ if env["builtin_libtheora"]:
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_theora.Prepend(CPPPATH=[thirdparty_dir])
+    env_theora.Prepend(CPPEXTPATH=[thirdparty_dir])
 
     # also requires libogg and libvorbis
     if env["builtin_libogg"]:
-        env_theora.Prepend(CPPPATH=["#thirdparty/libogg"])
+        env_theora.Prepend(CPPEXTPATH=["#thirdparty/libogg"])
     if env["builtin_libvorbis"]:
-        env_theora.Prepend(CPPPATH=["#thirdparty/libvorbis"])
+        env_theora.Prepend(CPPEXTPATH=["#thirdparty/libvorbis"])
 
     env_thirdparty = env_theora.Clone()
     env_thirdparty.disable_warnings()
diff --git a/engine/modules/theora/register_types.h b/engine/modules/theora/register_types.h
index 93addcbf..9cf2c0a3 100644
--- a/engine/modules/theora/register_types.h
+++ b/engine/modules/theora/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THEORA_REGISTER_TYPES_H
-#define THEORA_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_theora_module(ModuleInitializationLevel p_level);
 void uninitialize_theora_module(ModuleInitializationLevel p_level);
-
-#endif // THEORA_REGISTER_TYPES_H
diff --git a/engine/modules/theora/video_stream_theora.h b/engine/modules/theora/video_stream_theora.h
index 45b6746d..3e1b33dd 100644
--- a/engine/modules/theora/video_stream_theora.h
+++ b/engine/modules/theora/video_stream_theora.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VIDEO_STREAM_THEORA_H
-#define VIDEO_STREAM_THEORA_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
@@ -154,5 +153,3 @@ public:
 	virtual bool handles_type(const String &p_type) const override;
 	virtual String get_resource_type(const String &p_path) const override;
 };
-
-#endif // VIDEO_STREAM_THEORA_H
diff --git a/engine/modules/tinyexr/SCsub b/engine/modules/tinyexr/SCsub
index 434e99bf..0f22e36c 100644
--- a/engine/modules/tinyexr/SCsub
+++ b/engine/modules/tinyexr/SCsub
@@ -17,7 +17,7 @@ thirdparty_sources = [
 ]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_tinyexr.Prepend(CPPPATH=[thirdparty_dir])
+env_tinyexr.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 # Enable threaded loading with C++11.
 env_tinyexr.Append(CPPDEFINES=["TINYEXR_USE_THREAD"])
diff --git a/engine/modules/tinyexr/image_loader_tinyexr.h b/engine/modules/tinyexr/image_loader_tinyexr.h
index 0b0f2f74..77dd5667 100644
--- a/engine/modules/tinyexr/image_loader_tinyexr.h
+++ b/engine/modules/tinyexr/image_loader_tinyexr.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_TINYEXR_H
-#define IMAGE_LOADER_TINYEXR_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -39,5 +38,3 @@ public:
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	ImageLoaderTinyEXR();
 };
-
-#endif // IMAGE_LOADER_TINYEXR_H
diff --git a/engine/modules/tinyexr/image_saver_tinyexr.cpp b/engine/modules/tinyexr/image_saver_tinyexr.cpp
index 9cd19155..969297d1 100644
--- a/engine/modules/tinyexr/image_saver_tinyexr.cpp
+++ b/engine/modules/tinyexr/image_saver_tinyexr.cpp
@@ -285,7 +285,7 @@ Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale) {
 
 Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale) {
 	const Vector<uint8_t> buffer = save_exr_buffer(p_img, p_grayscale);
-	if (buffer.size() == 0) {
+	if (buffer.is_empty()) {
 		print_error(String("Saving EXR failed."));
 		return ERR_FILE_CANT_WRITE;
 	} else {
diff --git a/engine/modules/tinyexr/image_saver_tinyexr.h b/engine/modules/tinyexr/image_saver_tinyexr.h
index 014c2f2e..b5c773c6 100644
--- a/engine/modules/tinyexr/image_saver_tinyexr.h
+++ b/engine/modules/tinyexr/image_saver_tinyexr.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_SAVER_TINYEXR_H
-#define IMAGE_SAVER_TINYEXR_H
+#pragma once
 
 #include "core/io/image.h"
 
 Error save_exr(const String &p_path, const Ref<Image> &p_img, bool p_grayscale);
 Vector<uint8_t> save_exr_buffer(const Ref<Image> &p_img, bool p_grayscale);
-
-#endif // IMAGE_SAVER_TINYEXR_H
diff --git a/engine/modules/tinyexr/register_types.h b/engine/modules/tinyexr/register_types.h
index 7873c5b2..dfc8a300 100644
--- a/engine/modules/tinyexr/register_types.h
+++ b/engine/modules/tinyexr/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TINYEXR_REGISTER_TYPES_H
-#define TINYEXR_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_tinyexr_module(ModuleInitializationLevel p_level);
 void uninitialize_tinyexr_module(ModuleInitializationLevel p_level);
-
-#endif // TINYEXR_REGISTER_TYPES_H
diff --git a/engine/modules/upnp/SCsub b/engine/modules/upnp/SCsub
index 98a13dbf..44e007a1 100644
--- a/engine/modules/upnp/SCsub
+++ b/engine/modules/upnp/SCsub
@@ -29,13 +29,13 @@ if env["builtin_miniupnpc"] and env["platform"] != "web":
     ]
     thirdparty_sources = [thirdparty_dir + "src/" + file for file in thirdparty_sources]
 
-    env_upnp.Prepend(CPPPATH=[thirdparty_dir + "include"])
+    env_upnp.Prepend(CPPEXTPATH=[thirdparty_dir + "include"])
     env_upnp.Append(CPPDEFINES=["MINIUPNP_STATICLIB"])
     if env["platform"] != "windows":
         env_upnp.Append(CPPDEFINES=["MINIUPNPC_SET_SOCKET_TIMEOUT"])
 
     env_thirdparty = env_upnp.Clone()
-    env_thirdparty.Prepend(CPPPATH=[thirdparty_dir + "include/miniupnpc"])
+    env_thirdparty.Prepend(CPPEXTPATH=[thirdparty_dir + "include/miniupnpc"])
     env_thirdparty.disable_warnings()
     env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
     env.modules_sources += thirdparty_obj
diff --git a/engine/modules/upnp/register_types.h b/engine/modules/upnp/register_types.h
index 4e64d939..6ee615b5 100644
--- a/engine/modules/upnp/register_types.h
+++ b/engine/modules/upnp/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UPNP_REGISTER_TYPES_H
-#define UPNP_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_upnp_module(ModuleInitializationLevel p_level);
 void uninitialize_upnp_module(ModuleInitializationLevel p_level);
-
-#endif // UPNP_REGISTER_TYPES_H
diff --git a/engine/modules/upnp/upnp.h b/engine/modules/upnp/upnp.h
index 566b01ec..00a0523f 100644
--- a/engine/modules/upnp/upnp.h
+++ b/engine/modules/upnp/upnp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UPNP_H
-#define UPNP_H
+#pragma once
 
 #include "upnp_device.h"
 
@@ -113,5 +112,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(UPNP::UPNPResult)
-
-#endif // UPNP_H
diff --git a/engine/modules/upnp/upnp_device.h b/engine/modules/upnp/upnp_device.h
index fdc5bab1..146727d9 100644
--- a/engine/modules/upnp/upnp_device.h
+++ b/engine/modules/upnp/upnp_device.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UPNP_DEVICE_H
-#define UPNP_DEVICE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -90,5 +89,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(UPNPDevice::IGDStatus)
-
-#endif // UPNP_DEVICE_H
diff --git a/engine/modules/upnp/upnp_device_miniupnp.h b/engine/modules/upnp/upnp_device_miniupnp.h
index bea3b1d5..616ecaa6 100644
--- a/engine/modules/upnp/upnp_device_miniupnp.h
+++ b/engine/modules/upnp/upnp_device_miniupnp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UPNP_DEVICE_MINIUPNP_H
-#define UPNP_DEVICE_MINIUPNP_H
+#pragma once
 
 #ifndef WEB_ENABLED
 
@@ -79,5 +78,3 @@ public:
 };
 
 #endif // WEB_ENABLED
-
-#endif // UPNP_DEVICE_MINIUPNP_H
diff --git a/engine/modules/upnp/upnp_miniupnp.h b/engine/modules/upnp/upnp_miniupnp.h
index 82120b01..d8a4cfe4 100644
--- a/engine/modules/upnp/upnp_miniupnp.h
+++ b/engine/modules/upnp/upnp_miniupnp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UPNP_MINIUPNP_H
-#define UPNP_MINIUPNP_H
+#pragma once
 
 #ifndef WEB_ENABLED
 
@@ -89,5 +88,3 @@ public:
 };
 
 #endif // WEB_ENABLED
-
-#endif // UPNP_MINIUPNP_H
diff --git a/engine/modules/vhacd/SCsub b/engine/modules/vhacd/SCsub
index 926cc5b1..1703b96b 100644
--- a/engine/modules/vhacd/SCsub
+++ b/engine/modules/vhacd/SCsub
@@ -27,7 +27,7 @@ thirdparty_sources = [
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_vhacd.Prepend(CPPPATH=[thirdparty_dir + "inc"])
+env_vhacd.Prepend(CPPEXTPATH=[thirdparty_dir + "inc"])
 
 env_thirdparty = env_vhacd.Clone()
 env_thirdparty.disable_warnings()
diff --git a/engine/modules/vhacd/config.py b/engine/modules/vhacd/config.py
index a42f27fb..79b382a7 100644
--- a/engine/modules/vhacd/config.py
+++ b/engine/modules/vhacd/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return not env["disable_3d"]
+    return not env["disable_physics_3d"]
 
 
 def configure(env):
diff --git a/engine/modules/vhacd/register_types.h b/engine/modules/vhacd/register_types.h
index 786dc1cf..c550b2f6 100644
--- a/engine/modules/vhacd/register_types.h
+++ b/engine/modules/vhacd/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VHACD_REGISTER_TYPES_H
-#define VHACD_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_vhacd_module(ModuleInitializationLevel p_level);
 void uninitialize_vhacd_module(ModuleInitializationLevel p_level);
-
-#endif // VHACD_REGISTER_TYPES_H
diff --git a/engine/modules/vorbis/SCsub b/engine/modules/vorbis/SCsub
index f063d97f..82830e3b 100644
--- a/engine/modules/vorbis/SCsub
+++ b/engine/modules/vorbis/SCsub
@@ -42,11 +42,11 @@ if env["builtin_libvorbis"]:
 
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_vorbis.Prepend(CPPPATH=[thirdparty_dir])
+    env_vorbis.Prepend(CPPEXTPATH=[thirdparty_dir])
 
     # also requires libogg
     if env["builtin_libogg"]:
-        env_vorbis.Prepend(CPPPATH=["#thirdparty/libogg"])
+        env_vorbis.Prepend(CPPEXTPATH=["#thirdparty/libogg"])
 
     env_thirdparty = env_vorbis.Clone()
     env_thirdparty.disable_warnings()
diff --git a/engine/modules/vorbis/audio_stream_ogg_vorbis.h b/engine/modules/vorbis/audio_stream_ogg_vorbis.h
index 45fb75e0..6c6f3435 100644
--- a/engine/modules/vorbis/audio_stream_ogg_vorbis.h
+++ b/engine/modules/vorbis/audio_stream_ogg_vorbis.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_OGG_VORBIS_H
-#define AUDIO_STREAM_OGG_VORBIS_H
+#pragma once
 
 #include "core/variant/variant.h"
 #include "servers/audio/audio_stream.h"
@@ -177,5 +176,3 @@ public:
 	AudioStreamOggVorbis();
 	virtual ~AudioStreamOggVorbis();
 };
-
-#endif // AUDIO_STREAM_OGG_VORBIS_H
diff --git a/engine/modules/vorbis/register_types.cpp b/engine/modules/vorbis/register_types.cpp
index def34220..880727aa 100644
--- a/engine/modules/vorbis/register_types.cpp
+++ b/engine/modules/vorbis/register_types.cpp
@@ -33,36 +33,30 @@
 #include "audio_stream_ogg_vorbis.h"
 
 #ifdef TOOLS_ENABLED
+#include "editor/editor_node.h"
 #include "resource_importer_ogg_vorbis.h"
+
+static void _editor_init() {
+	Ref<ResourceImporterOggVorbis> ogg_vorbis_importer;
+	ogg_vorbis_importer.instantiate();
+	ResourceFormatImporter::get_singleton()->add_importer(ogg_vorbis_importer);
+}
 #endif
 
 void initialize_vorbis_module(ModuleInitializationLevel p_level) {
-	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
-		return;
+	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
+		GDREGISTER_CLASS(AudioStreamOggVorbis);
+		GDREGISTER_CLASS(AudioStreamPlaybackOggVorbis);
 	}
 
 #ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint()) {
-		Ref<ResourceImporterOggVorbis> ogg_vorbis_importer;
-		ogg_vorbis_importer.instantiate();
-		ResourceFormatImporter::get_singleton()->add_importer(ogg_vorbis_importer);
+	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
+		GDREGISTER_CLASS(ResourceImporterOggVorbis);
+
+		EditorNode::add_init_callback(_editor_init);
 	}
-
-	ClassDB::APIType prev_api = ClassDB::get_current_api();
-	ClassDB::set_current_api(ClassDB::API_EDITOR);
-
-	// Required to document import options in the class reference.
-	GDREGISTER_CLASS(ResourceImporterOggVorbis);
-
-	ClassDB::set_current_api(prev_api);
 #endif
-
-	GDREGISTER_CLASS(AudioStreamOggVorbis);
-	GDREGISTER_CLASS(AudioStreamPlaybackOggVorbis);
 }
 
 void uninitialize_vorbis_module(ModuleInitializationLevel p_level) {
-	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
-		return;
-	}
 }
diff --git a/engine/modules/vorbis/register_types.h b/engine/modules/vorbis/register_types.h
index 8b70a35e..783b0ae2 100644
--- a/engine/modules/vorbis/register_types.h
+++ b/engine/modules/vorbis/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VORBIS_REGISTER_TYPES_H
-#define VORBIS_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_vorbis_module(ModuleInitializationLevel p_level);
 void uninitialize_vorbis_module(ModuleInitializationLevel p_level);
-
-#endif // VORBIS_REGISTER_TYPES_H
diff --git a/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp b/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp
index ea946616..a30c8490 100644
--- a/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp
+++ b/engine/modules/vorbis/resource_importer_ogg_vorbis.cpp
@@ -45,7 +45,7 @@ String ResourceImporterOggVorbis::get_importer_name() const {
 }
 
 String ResourceImporterOggVorbis::get_visible_name() const {
-	return "oggvorbisstr";
+	return "Ogg Vorbis";
 }
 
 void ResourceImporterOggVorbis::get_recognized_extensions(List<String> *p_extensions) const {
diff --git a/engine/modules/vorbis/resource_importer_ogg_vorbis.h b/engine/modules/vorbis/resource_importer_ogg_vorbis.h
index e737831a..e8d4744f 100644
--- a/engine/modules/vorbis/resource_importer_ogg_vorbis.h
+++ b/engine/modules/vorbis/resource_importer_ogg_vorbis.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_IMPORTER_OGG_VORBIS_H
-#define RESOURCE_IMPORTER_OGG_VORBIS_H
+#pragma once
 
 #include "audio_stream_ogg_vorbis.h"
 
@@ -68,5 +67,3 @@ public:
 
 	ResourceImporterOggVorbis();
 };
-
-#endif // RESOURCE_IMPORTER_OGG_VORBIS_H
diff --git a/engine/modules/webp/SCsub b/engine/modules/webp/SCsub
index a939e2f9..bcc5bba2 100644
--- a/engine/modules/webp/SCsub
+++ b/engine/modules/webp/SCsub
@@ -139,7 +139,7 @@ if env["builtin_libwebp"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_webp.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "src/"])
+    env_webp.Prepend(CPPEXTPATH=[thirdparty_dir, thirdparty_dir + "src/"])
 
     env_thirdparty = env_webp.Clone()
     env_thirdparty.disable_warnings()
diff --git a/engine/modules/webp/image_loader_webp.h b/engine/modules/webp/image_loader_webp.h
index 688223ed..eae0aff0 100644
--- a/engine/modules/webp/image_loader_webp.h
+++ b/engine/modules/webp/image_loader_webp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_LOADER_WEBP_H
-#define IMAGE_LOADER_WEBP_H
+#pragma once
 
 #include "core/io/image_loader.h"
 
@@ -39,5 +38,3 @@ public:
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
 	ImageLoaderWebP();
 };
-
-#endif // IMAGE_LOADER_WEBP_H
diff --git a/engine/modules/webp/register_types.h b/engine/modules/webp/register_types.h
index caac7b48..c90caee6 100644
--- a/engine/modules/webp/register_types.h
+++ b/engine/modules/webp/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBP_REGISTER_TYPES_H
-#define WEBP_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_webp_module(ModuleInitializationLevel p_level);
 void uninitialize_webp_module(ModuleInitializationLevel p_level);
-
-#endif // WEBP_REGISTER_TYPES_H
diff --git a/engine/modules/webp/resource_saver_webp.h b/engine/modules/webp/resource_saver_webp.h
index 65cd4377..3471993c 100644
--- a/engine/modules/webp/resource_saver_webp.h
+++ b/engine/modules/webp/resource_saver_webp.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_SAVER_WEBP_H
-#define RESOURCE_SAVER_WEBP_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/io/resource_saver.h"
@@ -45,5 +44,3 @@ public:
 
 	ResourceSaverWebP();
 };
-
-#endif // RESOURCE_SAVER_WEBP_H
diff --git a/engine/modules/webp/webp_common.h b/engine/modules/webp/webp_common.h
index d73c543e..5a7f9148 100644
--- a/engine/modules/webp/webp_common.h
+++ b/engine/modules/webp/webp_common.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBP_COMMON_H
-#define WEBP_COMMON_H
+#pragma once
 
 #include "core/io/image.h"
 
@@ -43,5 +42,3 @@ Vector<uint8_t> _webp_packer(const Ref<Image> &p_image, float p_quality, bool p_
 Ref<Image> _webp_unpack(const Vector<uint8_t> &p_buffer);
 Error webp_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p_buffer_len);
 } //namespace WebPCommon
-
-#endif // WEBP_COMMON_H
diff --git a/engine/modules/webrtc/register_types.h b/engine/modules/webrtc/register_types.h
index d874c3e5..d238e968 100644
--- a/engine/modules/webrtc/register_types.h
+++ b/engine/modules/webrtc/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_REGISTER_TYPES_H
-#define WEBRTC_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_webrtc_module(ModuleInitializationLevel p_level);
 void uninitialize_webrtc_module(ModuleInitializationLevel p_level);
-
-#endif // WEBRTC_REGISTER_TYPES_H
diff --git a/engine/modules/webrtc/webrtc_data_channel.h b/engine/modules/webrtc/webrtc_data_channel.h
index f35461a5..04496200 100644
--- a/engine/modules/webrtc/webrtc_data_channel.h
+++ b/engine/modules/webrtc/webrtc_data_channel.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_DATA_CHANNEL_H
-#define WEBRTC_DATA_CHANNEL_H
+#pragma once
 
 #include "core/io/packet_peer.h"
 
@@ -79,5 +78,3 @@ public:
 
 VARIANT_ENUM_CAST(WebRTCDataChannel::WriteMode);
 VARIANT_ENUM_CAST(WebRTCDataChannel::ChannelState);
-
-#endif // WEBRTC_DATA_CHANNEL_H
diff --git a/engine/modules/webrtc/webrtc_data_channel_extension.h b/engine/modules/webrtc/webrtc_data_channel_extension.h
index b7afbaf1..ff7a53b2 100644
--- a/engine/modules/webrtc/webrtc_data_channel_extension.h
+++ b/engine/modules/webrtc/webrtc_data_channel_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_DATA_CHANNEL_EXTENSION_H
-#define WEBRTC_DATA_CHANNEL_EXTENSION_H
+#pragma once
 
 #include "webrtc_data_channel.h"
 
@@ -74,5 +73,3 @@ public:
 
 	WebRTCDataChannelExtension() {}
 };
-
-#endif // WEBRTC_DATA_CHANNEL_EXTENSION_H
diff --git a/engine/modules/webrtc/webrtc_data_channel_js.cpp b/engine/modules/webrtc/webrtc_data_channel_js.cpp
index f037e351..6f9a1685 100644
--- a/engine/modules/webrtc/webrtc_data_channel_js.cpp
+++ b/engine/modules/webrtc/webrtc_data_channel_js.cpp
@@ -198,12 +198,14 @@ WebRTCDataChannelJS::WebRTCDataChannelJS(int js_id) {
 	// Parse label
 	char *label = godot_js_rtc_datachannel_label_get(js_id);
 	if (label) {
-		_label.parse_utf8(label);
+		_label.clear();
+		_label.append_utf8(label);
 		free(label);
 	}
 	char *protocol = godot_js_rtc_datachannel_protocol_get(js_id);
 	if (protocol) {
-		_protocol.parse_utf8(protocol);
+		_protocol.clear();
+		_protocol.append_utf8(protocol);
 		free(protocol);
 	}
 }
diff --git a/engine/modules/webrtc/webrtc_data_channel_js.h b/engine/modules/webrtc/webrtc_data_channel_js.h
index 03cb550f..51f189d8 100644
--- a/engine/modules/webrtc/webrtc_data_channel_js.h
+++ b/engine/modules/webrtc/webrtc_data_channel_js.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_DATA_CHANNEL_JS_H
-#define WEBRTC_DATA_CHANNEL_JS_H
+#pragma once
 
 #ifdef WEB_ENABLED
 
@@ -90,5 +89,3 @@ public:
 };
 
 #endif // WEB_ENABLED
-
-#endif // WEBRTC_DATA_CHANNEL_JS_H
diff --git a/engine/modules/webrtc/webrtc_multiplayer_peer.cpp b/engine/modules/webrtc/webrtc_multiplayer_peer.cpp
index eb4632e7..5506882b 100644
--- a/engine/modules/webrtc/webrtc_multiplayer_peer.cpp
+++ b/engine/modules/webrtc/webrtc_multiplayer_peer.cpp
@@ -64,7 +64,7 @@ bool WebRTCMultiplayerPeer::is_server() const {
 }
 
 void WebRTCMultiplayerPeer::poll() {
-	if (peer_map.size() == 0) {
+	if (peer_map.is_empty()) {
 		return;
 	}
 
diff --git a/engine/modules/webrtc/webrtc_multiplayer_peer.h b/engine/modules/webrtc/webrtc_multiplayer_peer.h
index d7f48742..202730be 100644
--- a/engine/modules/webrtc/webrtc_multiplayer_peer.h
+++ b/engine/modules/webrtc/webrtc_multiplayer_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_MULTIPLAYER_PEER_H
-#define WEBRTC_MULTIPLAYER_PEER_H
+#pragma once
 
 #include "webrtc_peer_connection.h"
 
@@ -123,5 +122,3 @@ public:
 
 	virtual ConnectionStatus get_connection_status() const override;
 };
-
-#endif // WEBRTC_MULTIPLAYER_PEER_H
diff --git a/engine/modules/webrtc/webrtc_peer_connection.h b/engine/modules/webrtc/webrtc_peer_connection.h
index 142ab812..3e812cba 100644
--- a/engine/modules/webrtc/webrtc_peer_connection.h
+++ b/engine/modules/webrtc/webrtc_peer_connection.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_PEER_CONNECTION_H
-#define WEBRTC_PEER_CONNECTION_H
+#pragma once
 
 #include "webrtc_data_channel.h"
 
@@ -92,5 +91,3 @@ public:
 VARIANT_ENUM_CAST(WebRTCPeerConnection::ConnectionState);
 VARIANT_ENUM_CAST(WebRTCPeerConnection::GatheringState);
 VARIANT_ENUM_CAST(WebRTCPeerConnection::SignalingState);
-
-#endif // WEBRTC_PEER_CONNECTION_H
diff --git a/engine/modules/webrtc/webrtc_peer_connection_extension.h b/engine/modules/webrtc/webrtc_peer_connection_extension.h
index 9afef314..246f2b47 100644
--- a/engine/modules/webrtc/webrtc_peer_connection_extension.h
+++ b/engine/modules/webrtc/webrtc_peer_connection_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_PEER_CONNECTION_EXTENSION_H
-#define WEBRTC_PEER_CONNECTION_EXTENSION_H
+#pragma once
 
 #include "webrtc_peer_connection.h"
 
@@ -58,5 +57,3 @@ public:
 
 	WebRTCPeerConnectionExtension() {}
 };
-
-#endif // WEBRTC_PEER_CONNECTION_EXTENSION_H
diff --git a/engine/modules/webrtc/webrtc_peer_connection_js.h b/engine/modules/webrtc/webrtc_peer_connection_js.h
index 1d7d10bd..7ded6639 100644
--- a/engine/modules/webrtc/webrtc_peer_connection_js.h
+++ b/engine/modules/webrtc/webrtc_peer_connection_js.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBRTC_PEER_CONNECTION_JS_H
-#define WEBRTC_PEER_CONNECTION_JS_H
+#pragma once
 
 #ifdef WEB_ENABLED
 
@@ -89,5 +88,3 @@ public:
 };
 
 #endif
-
-#endif // WEBRTC_PEER_CONNECTION_JS_H
diff --git a/engine/modules/websocket/SCsub b/engine/modules/websocket/SCsub
index acaa0d3c..bbc39f07 100644
--- a/engine/modules/websocket/SCsub
+++ b/engine/modules/websocket/SCsub
@@ -23,7 +23,7 @@ elif env["builtin_wslay"]:
     ]
     thirdparty_sources = [thirdparty_dir + s for s in thirdparty_sources]
 
-    env_ws.Prepend(CPPPATH=[thirdparty_dir])
+    env_ws.Prepend(CPPEXTPATH=[thirdparty_dir])
     env_ws.Append(CPPDEFINES=["HAVE_CONFIG_H"])
 
     if env["platform"] == "windows":
diff --git a/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp b/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp
index ed51280a..6fc490d3 100644
--- a/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp
+++ b/engine/modules/websocket/editor/editor_debugger_server_websocket.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_debugger_server_websocket.h"
 
-#ifdef TOOLS_ENABLED
-
 #include "../remote_debugger_peer_websocket.h"
 
 #include "editor/editor_log.h"
@@ -135,5 +133,3 @@ EditorDebuggerServer *EditorDebuggerServerWebSocket::create(const String &p_prot
 	ERR_FAIL_COND_V(p_protocol != "ws://", nullptr);
 	return memnew(EditorDebuggerServerWebSocket);
 }
-
-#endif // TOOLS_ENABLED
diff --git a/engine/modules/websocket/editor/editor_debugger_server_websocket.h b/engine/modules/websocket/editor/editor_debugger_server_websocket.h
index aeca227c..173ffdfc 100644
--- a/engine/modules/websocket/editor/editor_debugger_server_websocket.h
+++ b/engine/modules/websocket/editor/editor_debugger_server_websocket.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EDITOR_DEBUGGER_SERVER_WEBSOCKET_H
-#define EDITOR_DEBUGGER_SERVER_WEBSOCKET_H
-
-#ifdef TOOLS_ENABLED
+#pragma once
 
 #include "../websocket_peer.h"
 
@@ -64,7 +61,3 @@ public:
 	EditorDebuggerServerWebSocket();
 	~EditorDebuggerServerWebSocket();
 };
-
-#endif // TOOLS_ENABLED
-
-#endif // EDITOR_DEBUGGER_SERVER_WEBSOCKET_H
diff --git a/engine/modules/websocket/emws_peer.cpp b/engine/modules/websocket/emws_peer.cpp
index d8cb7642..6f834d12 100644
--- a/engine/modules/websocket/emws_peer.cpp
+++ b/engine/modules/websocket/emws_peer.cpp
@@ -37,7 +37,8 @@
 void EMWSPeer::_esws_on_connect(void *p_obj, char *p_proto) {
 	EMWSPeer *peer = static_cast<EMWSPeer *>(p_obj);
 	peer->ready_state = STATE_OPEN;
-	peer->selected_protocol.parse_utf8(p_proto);
+	peer->selected_protocol.clear();
+	peer->selected_protocol.append_utf8(p_proto);
 }
 
 void EMWSPeer::_esws_on_message(void *p_obj, const uint8_t *p_data, int p_data_size, int p_is_string) {
@@ -54,7 +55,8 @@ void EMWSPeer::_esws_on_error(void *p_obj) {
 void EMWSPeer::_esws_on_close(void *p_obj, int p_code, const char *p_reason, int p_was_clean) {
 	EMWSPeer *peer = static_cast<EMWSPeer *>(p_obj);
 	peer->close_code = p_code;
-	peer->close_reason.parse_utf8(p_reason);
+	peer->close_reason.clear();
+	peer->close_reason.append_utf8(p_reason);
 	peer->ready_state = STATE_CLOSED;
 }
 
diff --git a/engine/modules/websocket/emws_peer.h b/engine/modules/websocket/emws_peer.h
index 89dc4fa3..a1f869b6 100644
--- a/engine/modules/websocket/emws_peer.h
+++ b/engine/modules/websocket/emws_peer.h
@@ -28,15 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EMWS_PEER_H
-#define EMWS_PEER_H
+#pragma once
 
 #ifdef WEB_ENABLED
 
 #include "packet_buffer.h"
 #include "websocket_peer.h"
 
-#include "core/error/error_list.h"
 #include "core/io/packet_peer.h"
 #include "core/templates/ring_buffer.h"
 
@@ -111,5 +109,3 @@ public:
 };
 
 #endif // WEB_ENABLED
-
-#endif // EMWS_PEER_H
diff --git a/engine/modules/websocket/packet_buffer.h b/engine/modules/websocket/packet_buffer.h
index 4ab05799..cbcedbe0 100644
--- a/engine/modules/websocket/packet_buffer.h
+++ b/engine/modules/websocket/packet_buffer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKET_BUFFER_H
-#define PACKET_BUFFER_H
+#pragma once
 
 #include "core/templates/ring_buffer.h"
 
@@ -128,5 +127,3 @@ public:
 		clear();
 	}
 };
-
-#endif // PACKET_BUFFER_H
diff --git a/engine/modules/websocket/register_types.h b/engine/modules/websocket/register_types.h
index 320878ec..7813c14f 100644
--- a/engine/modules/websocket/register_types.h
+++ b/engine/modules/websocket/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBSOCKET_REGISTER_TYPES_H
-#define WEBSOCKET_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_websocket_module(ModuleInitializationLevel p_level);
 void uninitialize_websocket_module(ModuleInitializationLevel p_level);
-
-#endif // WEBSOCKET_REGISTER_TYPES_H
diff --git a/engine/modules/websocket/remote_debugger_peer_websocket.h b/engine/modules/websocket/remote_debugger_peer_websocket.h
index 50d0d282..a004488f 100644
--- a/engine/modules/websocket/remote_debugger_peer_websocket.h
+++ b/engine/modules/websocket/remote_debugger_peer_websocket.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REMOTE_DEBUGGER_PEER_WEBSOCKET_H
-#define REMOTE_DEBUGGER_PEER_WEBSOCKET_H
+#pragma once
 
 #include "websocket_peer.h"
 
@@ -58,5 +57,3 @@ public:
 
 	RemoteDebuggerPeerWebSocket(Ref<WebSocketPeer> p_peer = Ref<WebSocketPeer>());
 };
-
-#endif // REMOTE_DEBUGGER_PEER_WEBSOCKET_H
diff --git a/engine/modules/websocket/websocket_multiplayer_peer.h b/engine/modules/websocket/websocket_multiplayer_peer.h
index 2cb3489d..0431a994 100644
--- a/engine/modules/websocket/websocket_multiplayer_peer.h
+++ b/engine/modules/websocket/websocket_multiplayer_peer.h
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBSOCKET_MULTIPLAYER_PEER_H
-#define WEBSOCKET_MULTIPLAYER_PEER_H
+#pragma once
 
 #include "websocket_peer.h"
 
-#include "core/error/error_list.h"
 #include "core/io/tcp_server.h"
 #include "core/templates/list.h"
 #include "scene/main/multiplayer_peer.h"
@@ -140,5 +138,3 @@ public:
 	WebSocketMultiplayerPeer();
 	~WebSocketMultiplayerPeer();
 };
-
-#endif // WEBSOCKET_MULTIPLAYER_PEER_H
diff --git a/engine/modules/websocket/websocket_peer.h b/engine/modules/websocket/websocket_peer.h
index 48541224..b60b9091 100644
--- a/engine/modules/websocket/websocket_peer.h
+++ b/engine/modules/websocket/websocket_peer.h
@@ -28,11 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBSOCKET_PEER_H
-#define WEBSOCKET_PEER_H
+#pragma once
 
 #include "core/crypto/crypto.h"
-#include "core/error/error_list.h"
 #include "core/io/packet_peer.h"
 
 class WebSocketPeer : public PacketPeer {
@@ -127,5 +125,3 @@ public:
 
 VARIANT_ENUM_CAST(WebSocketPeer::WriteMode);
 VARIANT_ENUM_CAST(WebSocketPeer::State);
-
-#endif // WEBSOCKET_PEER_H
diff --git a/engine/modules/websocket/wsl_peer.cpp b/engine/modules/websocket/wsl_peer.cpp
index 1a1f52a8..805cd5d7 100644
--- a/engine/modules/websocket/wsl_peer.cpp
+++ b/engine/modules/websocket/wsl_peer.cpp
@@ -151,7 +151,7 @@ Error WSLPeer::accept_stream(Ref<StreamPeer> p_stream) {
 }
 
 bool WSLPeer::_parse_client_request() {
-	Vector<String> psa = String((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4).split("\r\n");
+	Vector<String> psa = String::ascii(Span((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4)).split("\r\n");
 	int len = psa.size();
 	ERR_FAIL_COND_V_MSG(len < 4, false, "Not enough response headers, got: " + itos(len) + ", expected >= 4.");
 
@@ -416,7 +416,7 @@ void WSLPeer::_do_client_handshake() {
 }
 
 bool WSLPeer::_verify_server_response() {
-	Vector<String> psa = String((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4).split("\r\n");
+	Vector<String> psa = String::ascii(Span((const char *)handshake_buffer->get_data_array().ptr(), handshake_buffer->get_position() - 4)).split("\r\n");
 	int len = psa.size();
 	ERR_FAIL_COND_V_MSG(len < 4, false, "Not enough response headers. Got: " + itos(len) + ", expected >= 4.");
 
@@ -451,7 +451,7 @@ bool WSLPeer::_verify_server_response() {
 	WSL_CHECK_NC("sec-websocket-accept", _compute_key_response(session_key));
 #undef WSL_CHECK_NC
 #undef WSL_CHECK
-	if (supported_protocols.size() == 0) {
+	if (supported_protocols.is_empty()) {
 		// We didn't request a custom protocol
 		ERR_FAIL_COND_V_MSG(headers.has("sec-websocket-protocol"), false, "Received unrequested sub-protocol -> " + headers["sec-websocket-protocol"]);
 	} else {
@@ -646,9 +646,9 @@ void WSLPeer::_wsl_msg_recv_callback(wslay_event_context_ptr ctx, const struct w
 		// Close request or confirmation.
 		peer->close_code = arg->status_code;
 		size_t len = arg->msg_length;
-		peer->close_reason = "";
+		peer->close_reason.clear();
 		if (len > 2 /* first 2 bytes = close code */) {
-			peer->close_reason.parse_utf8((char *)arg->msg + 2, len - 2);
+			peer->close_reason.append_utf8((char *)arg->msg + 2, len - 2);
 		}
 		if (peer->ready_state == STATE_OPEN) {
 			peer->ready_state = STATE_CLOSING;
diff --git a/engine/modules/websocket/wsl_peer.h b/engine/modules/websocket/wsl_peer.h
index 2d3f9b81..6580173b 100644
--- a/engine/modules/websocket/wsl_peer.h
+++ b/engine/modules/websocket/wsl_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WSL_PEER_H
-#define WSL_PEER_H
+#pragma once
 
 #ifndef WEB_ENABLED
 
@@ -37,7 +36,6 @@
 #include "websocket_peer.h"
 
 #include "core/crypto/crypto_core.h"
-#include "core/error/error_list.h"
 #include "core/io/stream_peer_tcp.h"
 
 #include <wslay/wslay.h>
@@ -168,5 +166,3 @@ public:
 };
 
 #endif // WEB_ENABLED
-
-#endif // WSL_PEER_H
diff --git a/engine/modules/webxr/config.py b/engine/modules/webxr/config.py
index 8d75e7f5..357dcde0 100644
--- a/engine/modules/webxr/config.py
+++ b/engine/modules/webxr/config.py
@@ -1,5 +1,5 @@
 def can_build(env, platform):
-    return env["opengl3"] and not env["disable_3d"]
+    return env["opengl3"] and not env["disable_xr"]
 
 
 def configure(env):
diff --git a/engine/modules/webxr/godot_webxr.h b/engine/modules/webxr/godot_webxr.h
index 1b3e3b6a..c6537ff0 100644
--- a/engine/modules/webxr/godot_webxr.h
+++ b/engine/modules/webxr/godot_webxr.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_WEBXR_H
-#define GODOT_WEBXR_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,5 +99,3 @@ extern int godot_webxr_get_supported_frame_rates(float **r_frame_rates);
 #ifdef __cplusplus
 }
 #endif
-
-#endif // GODOT_WEBXR_H
diff --git a/engine/modules/webxr/register_types.h b/engine/modules/webxr/register_types.h
index 30798c07..d0a8050c 100644
--- a/engine/modules/webxr/register_types.h
+++ b/engine/modules/webxr/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBXR_REGISTER_TYPES_H
-#define WEBXR_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_webxr_module(ModuleInitializationLevel p_level);
 void uninitialize_webxr_module(ModuleInitializationLevel p_level);
-
-#endif // WEBXR_REGISTER_TYPES_H
diff --git a/engine/modules/webxr/webxr_interface.h b/engine/modules/webxr/webxr_interface.h
index 241dc9fe..612a3480 100644
--- a/engine/modules/webxr/webxr_interface.h
+++ b/engine/modules/webxr/webxr_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBXR_INTERFACE_H
-#define WEBXR_INTERFACE_H
+#pragma once
 
 #include "servers/xr/xr_controller_tracker.h"
 #include "servers/xr/xr_interface.h"
@@ -78,5 +77,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(WebXRInterface::TargetRayMode);
-
-#endif // WEBXR_INTERFACE_H
diff --git a/engine/modules/webxr/webxr_interface_js.cpp b/engine/modules/webxr/webxr_interface_js.cpp
index f45135a6..2c92ba9d 100644
--- a/engine/modules/webxr/webxr_interface_js.cpp
+++ b/engine/modules/webxr/webxr_interface_js.cpp
@@ -294,7 +294,7 @@ bool WebXRInterfaceJS::initialize() {
 			return false;
 		}
 
-		if (requested_reference_space_types.size() == 0) {
+		if (requested_reference_space_types.is_empty()) {
 			return false;
 		}
 
diff --git a/engine/modules/webxr/webxr_interface_js.h b/engine/modules/webxr/webxr_interface_js.h
index d02c8d26..49be0922 100644
--- a/engine/modules/webxr/webxr_interface_js.h
+++ b/engine/modules/webxr/webxr_interface_js.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBXR_INTERFACE_JS_H
-#define WEBXR_INTERFACE_JS_H
+#pragma once
 
 #ifdef WEB_ENABLED
 
@@ -263,5 +262,3 @@ private:
 };
 
 #endif // WEB_ENABLED
-
-#endif // WEBXR_INTERFACE_JS_H
diff --git a/engine/modules/xatlas_unwrap/SCsub b/engine/modules/xatlas_unwrap/SCsub
index ae82a53b..47885452 100644
--- a/engine/modules/xatlas_unwrap/SCsub
+++ b/engine/modules/xatlas_unwrap/SCsub
@@ -17,7 +17,7 @@ if env["builtin_xatlas"]:
     ]
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_xatlas_unwrap.Prepend(CPPPATH=[thirdparty_dir])
+    env_xatlas_unwrap.Prepend(CPPEXTPATH=[thirdparty_dir])
 
     env_thirdparty = env_xatlas_unwrap.Clone()
     env_thirdparty.disable_warnings()
diff --git a/engine/modules/xatlas_unwrap/register_types.h b/engine/modules/xatlas_unwrap/register_types.h
index 360947d8..d94fd4af 100644
--- a/engine/modules/xatlas_unwrap/register_types.h
+++ b/engine/modules/xatlas_unwrap/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XATLAS_UNWRAP_REGISTER_TYPES_H
-#define XATLAS_UNWRAP_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_xatlas_unwrap_module(ModuleInitializationLevel p_level);
 void uninitialize_xatlas_unwrap_module(ModuleInitializationLevel p_level);
-
-#endif // XATLAS_UNWRAP_REGISTER_TYPES_H
diff --git a/engine/modules/zip/register_types.h b/engine/modules/zip/register_types.h
index 5a05dabc..a8e81dc7 100644
--- a/engine/modules/zip/register_types.h
+++ b/engine/modules/zip/register_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ZIP_REGISTER_TYPES_H
-#define ZIP_REGISTER_TYPES_H
+#pragma once
 
 #include "modules/register_module_types.h"
 
 void initialize_zip_module(ModuleInitializationLevel p_level);
 void uninitialize_zip_module(ModuleInitializationLevel p_level);
-
-#endif // ZIP_REGISTER_TYPES_H
diff --git a/engine/modules/zip/zip_packer.h b/engine/modules/zip/zip_packer.h
index e194f5eb..39405567 100644
--- a/engine/modules/zip/zip_packer.h
+++ b/engine/modules/zip/zip_packer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ZIP_PACKER_H
-#define ZIP_PACKER_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
@@ -64,5 +63,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(ZIPPacker::ZipAppend)
-
-#endif // ZIP_PACKER_H
diff --git a/engine/modules/zip/zip_reader.h b/engine/modules/zip/zip_reader.h
index 874bd81e..02ba01b1 100644
--- a/engine/modules/zip/zip_reader.h
+++ b/engine/modules/zip/zip_reader.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ZIP_READER_H
-#define ZIP_READER_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
@@ -56,5 +55,3 @@ public:
 	ZIPReader();
 	~ZIPReader();
 };
-
-#endif // ZIP_READER_H
diff --git a/engine/platform/SCsub b/engine/platform/SCsub
index 248b4b88..d4f35a2c 100644
--- a/engine/platform/SCsub
+++ b/engine/platform/SCsub
@@ -18,10 +18,10 @@ def export_icon_builder(target, source, env):
     platform = src_path.parent.parent.stem
     with open(str(source[0]), "r") as file:
         svg = file.read()
-    with methods.generated_wrapper(target, prefix=platform) as file:
+    with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             f"""\
-static const char *_{platform}_{src_name}_svg = {methods.to_raw_cstring(svg)};
+inline constexpr const char *_{platform}_{src_name}_svg = {methods.to_raw_cstring(svg)};
 """
         )
 
@@ -37,7 +37,7 @@ def register_platform_apis_builder(target, source, env):
     api_inc = "\n".join([f'#include "{p}/api/api.h"' for p in platforms])
     api_reg = "\n".join([f"\tregister_{p}_api();" for p in platforms])
     api_unreg = "\n".join([f"\tunregister_{p}_api();" for p in platforms])
-    with methods.generated_wrapper(target) as file:
+    with methods.generated_wrapper(str(target[0])) as file:
         file.write(
             f"""\
 #include "register_platform_apis.h"
diff --git a/engine/platform/android/README.md b/engine/platform/android/README.md
index 01eb9c03..4a08bb52 100644
--- a/engine/platform/android/README.md
+++ b/engine/platform/android/README.md
@@ -12,7 +12,7 @@ using [Gradle](https://gradle.org/) as a build system.
 
 ## Artwork license
 
-[`logo.png`](logo.png) and [`run_icon.png`](run_icon.png) are licensed under
+[`logo.svg`](export/logo.svg) and [`run_icon.svg`](export/run_icon.svg) are licensed under
 [Creative Commons Attribution 3.0 Unported](https://developer.android.com/distribute/marketing-tools/brand-guidelines#android_robot)
 per the Android logo usage guidelines:
 
diff --git a/engine/platform/android/SCsub b/engine/platform/android/SCsub
index 2260a84a..72d36eab 100644
--- a/engine/platform/android/SCsub
+++ b/engine/platform/android/SCsub
@@ -44,7 +44,8 @@ env_thirdparty.disable_warnings()
 thirdparty_obj = env_thirdparty.SharedObject("#thirdparty/misc/ifaddrs-android.cc")
 android_objects.append(thirdparty_obj)
 
-lib = env_android.add_shared_library("#bin/libgodot", [android_objects], SHLIBSUFFIX=env["SHLIBSUFFIX"])
+# FIXME: Hardcoded to bin to ensure the directory exists if not redirecting build objects.
+lib = env_android.add_shared_library("#bin/libgodot", android_objects, redirect_build_objects=False)
 
 # Needed to force rebuilding the platform files when the thirdparty code is updated.
 env.Depends(lib, thirdparty_obj)
@@ -78,14 +79,12 @@ if lib_arch_dir != "":
         lib_tools_dir = ""
 
     out_dir = "#platform/android/java/lib/libs/" + lib_tools_dir + lib_type_dir + "/" + lib_arch_dir
-    env_android.Command(
-        out_dir + "/libgodot_android.so", "#bin/libgodot" + env["SHLIBSUFFIX"], Move("$TARGET", "$SOURCE")
-    )
+    env_android.CommandNoCache(out_dir + "/libgodot_android.so", lib, Move("$TARGET", "$SOURCE"))
 
     stl_lib_path = (
         str(env["ANDROID_NDK_ROOT"]) + "/sources/cxx-stl/llvm-libc++/libs/" + lib_arch_dir + "/libc++_shared.so"
     )
-    env_android.Command(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE"))
+    env_android.CommandNoCache(out_dir + "/libc++_shared.so", stl_lib_path, Copy("$TARGET", "$SOURCE"))
 
     def generate_apk(target, source, env):
         gradle_process = []
@@ -113,6 +112,4 @@ if lib_arch_dir != "":
         )
 
     if env["generate_apk"]:
-        generate_apk_command = env_android.Command("generate_apk", [], generate_apk)
-        command = env_android.AlwaysBuild(generate_apk_command)
-        env_android.Depends(command, [lib])
+        env_android.AlwaysBuild(env_android.CommandNoCache("generate_apk", lib, env.Run(generate_apk)))
diff --git a/engine/platform/android/android_input_handler.cpp b/engine/platform/android/android_input_handler.cpp
index 9a5af7a3..ca63bcdf 100644
--- a/engine/platform/android/android_input_handler.cpp
+++ b/engine/platform/android/android_input_handler.cpp
@@ -283,7 +283,7 @@ void AndroidInputHandler::_parse_mouse_event_info(BitField<MouseButtonMask> even
 	}
 	ev->set_pressed(p_pressed);
 	ev->set_canceled(p_canceled);
-	BitField<MouseButtonMask> changed_button_mask = BitField<MouseButtonMask>(buttons_state.operator int64_t() ^ event_buttons_mask.operator int64_t());
+	BitField<MouseButtonMask> changed_button_mask = buttons_state.get_different(event_buttons_mask);
 
 	buttons_state = event_buttons_mask;
 
@@ -337,7 +337,7 @@ void AndroidInputHandler::process_mouse_event(int p_event_action, int p_event_an
 		} break;
 
 		case AMOTION_EVENT_ACTION_MOVE: {
-			if (!mouse_event_info.valid) {
+			if (!p_source_mouse_relative && !mouse_event_info.valid) {
 				return;
 			}
 
@@ -395,7 +395,7 @@ void AndroidInputHandler::_wheel_button_click(BitField<MouseButtonMask> event_bu
 	Ref<InputEventMouseButton> evd = ev->duplicate();
 	_set_key_modifier_state(evd, Key::NONE);
 	evd->set_button_index(wheel_button);
-	evd->set_button_mask(BitField<MouseButtonMask>(event_buttons_mask.operator int64_t() ^ int64_t(mouse_button_to_mask(wheel_button))));
+	evd->set_button_mask(event_buttons_mask.get_different(mouse_button_to_mask(wheel_button)));
 	evd->set_factor(factor);
 	Input::get_singleton()->parse_input_event(evd);
 	Ref<InputEventMouseButton> evdd = evd->duplicate();
@@ -423,7 +423,7 @@ void AndroidInputHandler::process_pan(Point2 p_pos, Vector2 p_delta) {
 }
 
 MouseButton AndroidInputHandler::_button_index_from_mask(BitField<MouseButtonMask> button_mask) {
-	switch (MouseButtonMask(button_mask.operator int64_t())) {
+	switch (button_mask) {
 		case MouseButtonMask::LEFT:
 			return MouseButton::LEFT;
 		case MouseButtonMask::RIGHT:
@@ -440,7 +440,7 @@ MouseButton AndroidInputHandler::_button_index_from_mask(BitField<MouseButtonMas
 }
 
 BitField<MouseButtonMask> AndroidInputHandler::_android_button_mask_to_godot_button_mask(int android_button_mask) {
-	BitField<MouseButtonMask> godot_button_mask;
+	BitField<MouseButtonMask> godot_button_mask = MouseButtonMask::NONE;
 	if (android_button_mask & AMOTION_EVENT_BUTTON_PRIMARY) {
 		godot_button_mask.set_flag(MouseButtonMask::LEFT);
 	}
diff --git a/engine/platform/android/android_input_handler.h b/engine/platform/android/android_input_handler.h
index e3365d8c..7901b066 100644
--- a/engine/platform/android/android_input_handler.h
+++ b/engine/platform/android/android_input_handler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANDROID_INPUT_HANDLER_H
-#define ANDROID_INPUT_HANDLER_H
+#pragma once
 
 #include "core/input/input.h"
 
@@ -63,7 +62,7 @@ public:
 		int index = 0; // Can be either JoyAxis or JoyButton.
 		bool pressed = false;
 		float value = 0;
-		BitField<HatMask> hat;
+		BitField<HatMask> hat = HatMask::CENTER;
 	};
 
 private:
@@ -72,7 +71,7 @@ private:
 	bool control_mem = false;
 	bool meta_mem = false;
 
-	BitField<MouseButtonMask> buttons_state;
+	BitField<MouseButtonMask> buttons_state = MouseButtonMask::NONE;
 
 	Vector<TouchPos> touch;
 	MouseEventInfo mouse_event_info;
@@ -105,5 +104,3 @@ public:
 	void process_joy_event(JoypadEvent p_event);
 	void process_key_event(int p_physical_keycode, int p_unicode, int p_key_label, bool p_pressed, bool p_echo);
 };
-
-#endif // ANDROID_INPUT_HANDLER_H
diff --git a/engine/platform/android/android_keys_utils.h b/engine/platform/android/android_keys_utils.h
index 77c0911f..6322e8c7 100644
--- a/engine/platform/android/android_keys_utils.h
+++ b/engine/platform/android/android_keys_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANDROID_KEYS_UTILS_H
-#define ANDROID_KEYS_UTILS_H
+#pragma once
 
 #include "core/os/keyboard.h"
 
@@ -196,5 +195,3 @@ static AndroidGodotLocationPair android_godot_location_pairs[] = {
 };
 
 KeyLocation godot_location_from_android_code(unsigned int p_code);
-
-#endif // ANDROID_KEYS_UTILS_H
diff --git a/engine/platform/android/api/api.h b/engine/platform/android/api/api.h
index c744e464..2be6c59b 100644
--- a/engine/platform/android/api/api.h
+++ b/engine/platform/android/api/api.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANDROID_API_H
-#define ANDROID_API_H
+#pragma once
 
 void register_android_api();
 void unregister_android_api();
-
-#endif // ANDROID_API_H
diff --git a/engine/platform/android/api/java_class_wrapper.h b/engine/platform/android/api/java_class_wrapper.h
index ae09a9d5..de04c807 100644
--- a/engine/platform/android/api/java_class_wrapper.h
+++ b/engine/platform/android/api/java_class_wrapper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JAVA_CLASS_WRAPPER_H
-#define JAVA_CLASS_WRAPPER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/variant/typed_array.h"
@@ -296,5 +295,3 @@ public:
 #endif
 	JavaClassWrapper();
 };
-
-#endif // JAVA_CLASS_WRAPPER_H
diff --git a/engine/platform/android/api/jni_singleton.h b/engine/platform/android/api/jni_singleton.h
index 5e940819..63df40b1 100644
--- a/engine/platform/android/api/jni_singleton.h
+++ b/engine/platform/android/api/jni_singleton.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JNI_SINGLETON_H
-#define JNI_SINGLETON_H
+#pragma once
 
 #include "java_class_wrapper.h"
 
@@ -103,5 +102,3 @@ public:
 		wrapped_object.unref();
 	}
 };
-
-#endif // JNI_SINGLETON_H
diff --git a/engine/platform/android/audio_driver_opensl.h b/engine/platform/android/audio_driver_opensl.h
index bcd17382..c9f3fc3a 100644
--- a/engine/platform/android/audio_driver_opensl.h
+++ b/engine/platform/android/audio_driver_opensl.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_OPENSL_H
-#define AUDIO_DRIVER_OPENSL_H
+#pragma once
 
 #include "core/os/mutex.h"
 #include "servers/audio_server.h"
@@ -107,5 +106,3 @@ public:
 
 	AudioDriverOpenSL();
 };
-
-#endif // AUDIO_DRIVER_OPENSL_H
diff --git a/engine/platform/android/detect.py b/engine/platform/android/detect.py
index 571cfd98..cac7c3f4 100644
--- a/engine/platform/android/detect.py
+++ b/engine/platform/android/detect.py
@@ -187,7 +187,7 @@ def configure(env: "SConsEnvironment"):
     has_swappy = detect_swappy()
     if not has_swappy:
         print_warning(
-            "Swappy Frame Pacing not detected! It is strongly recommended you download it from https://github.com/darksylinc/godot-swappy/releases and extract it so that the following files can be found:\n"
+            "Swappy Frame Pacing not detected! It is strongly recommended you download it from https://github.com/godotengine/godot-swappy/releases and extract it so that the following files can be found:\n"
             + " thirdparty/swappy-frame-pacing/arm64-v8a/libswappy_static.a\n"
             + " thirdparty/swappy-frame-pacing/armeabi-v7a/libswappy_static.a\n"
             + " thirdparty/swappy-frame-pacing/x86/libswappy_static.a\n"
diff --git a/engine/platform/android/dialog_utils_jni.h b/engine/platform/android/dialog_utils_jni.h
index 7b2da46d..b93254f2 100644
--- a/engine/platform/android/dialog_utils_jni.h
+++ b/engine/platform/android/dialog_utils_jni.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIALOG_UTILS_JNI_H
-#define DIALOG_UTILS_JNI_H
+#pragma once
 
 #include <jni.h>
 
@@ -37,5 +36,3 @@ extern "C" {
 JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_dialogCallback(JNIEnv *env, jclass clazz, jint p_button_index);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_DialogUtils_inputDialogCallback(JNIEnv *env, jclass clazz, jstring p_text);
 }
-
-#endif // DIALOG_UTILS_JNI_H
diff --git a/engine/platform/android/dir_access_jandroid.cpp b/engine/platform/android/dir_access_jandroid.cpp
index 5c5a8be3..8b557295 100644
--- a/engine/platform/android/dir_access_jandroid.cpp
+++ b/engine/platform/android/dir_access_jandroid.cpp
@@ -154,7 +154,7 @@ String DirAccessJAndroid::get_current_dir(bool p_include_drive) const {
 	if (bd.begins_with(root_string)) {
 		return bd;
 	} else if (bd.begins_with("/")) {
-		return root_string + bd.substr(1, bd.length());
+		return root_string + bd.substr(1);
 	} else {
 		return root_string + bd;
 	}
diff --git a/engine/platform/android/dir_access_jandroid.h b/engine/platform/android/dir_access_jandroid.h
index 1d8fe906..1d85ee13 100644
--- a/engine/platform/android/dir_access_jandroid.h
+++ b/engine/platform/android/dir_access_jandroid.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIR_ACCESS_JANDROID_H
-#define DIR_ACCESS_JANDROID_H
+#pragma once
 
 #include "java_godot_lib_jni.h"
 
@@ -43,6 +42,7 @@
 /// The implementation use jni in order to comply with Android filesystem
 /// access restriction.
 class DirAccessJAndroid : public DirAccessUnix {
+	GDSOFTCLASS(DirAccessJAndroid, DirAccessUnix);
 	static jobject dir_access_handler;
 	static jclass cls;
 
@@ -104,5 +104,3 @@ private:
 	void dir_close(int p_id);
 	String get_absolute_path(String p_path);
 };
-
-#endif // DIR_ACCESS_JANDROID_H
diff --git a/engine/platform/android/display_server_android.cpp b/engine/platform/android/display_server_android.cpp
index f8d960f2..b174b178 100644
--- a/engine/platform/android/display_server_android.cpp
+++ b/engine/platform/android/display_server_android.cpp
@@ -145,6 +145,16 @@ void DisplayServerAndroid::emit_system_theme_changed() {
 	}
 }
 
+void DisplayServerAndroid::set_hardware_keyboard_connection_change_callback(const Callable &p_callable) {
+	hardware_keyboard_connection_changed = p_callable;
+}
+
+void DisplayServerAndroid::emit_hardware_keyboard_connection_changed(bool p_connected) {
+	if (hardware_keyboard_connection_changed.is_valid()) {
+		hardware_keyboard_connection_changed.call_deferred(p_connected);
+	}
+}
+
 void DisplayServerAndroid::clipboard_set(const String &p_text) {
 	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
 	ERR_FAIL_NULL(godot_java);
@@ -204,7 +214,7 @@ void DisplayServerAndroid::emit_input_dialog_callback(String p_text) {
 	}
 }
 
-Error DisplayServerAndroid::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
+Error DisplayServerAndroid::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	GodotJavaWrapper *godot_java = OS_Android::get_singleton()->get_godot_java();
 	ERR_FAIL_NULL_V(godot_java, FAILED);
 	file_picker_callback = p_callback;
diff --git a/engine/platform/android/display_server_android.h b/engine/platform/android/display_server_android.h
index 587d8731..fb121214 100644
--- a/engine/platform/android/display_server_android.h
+++ b/engine/platform/android/display_server_android.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_ANDROID_H
-#define DISPLAY_SERVER_ANDROID_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -39,7 +38,7 @@ class RenderingDevice;
 #endif
 
 class DisplayServerAndroid : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerAndroid, DisplayServer);
 
 	String rendering_driver;
 
@@ -90,6 +89,7 @@ class DisplayServerAndroid : public DisplayServer {
 	Callable rect_changed_callback;
 
 	Callable system_theme_changed;
+	Callable hardware_keyboard_connection_changed;
 
 	Callable dialog_callback;
 	Callable input_dialog_callback;
@@ -115,11 +115,10 @@ public:
 	virtual void tts_resume() override;
 	virtual void tts_stop() override;
 
-	void emit_system_theme_changed();
-
 	virtual bool is_dark_mode_supported() const override;
 	virtual bool is_dark_mode() const override;
 	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
+	void emit_system_theme_changed();
 
 	virtual void clipboard_set(const String &p_text) override;
 	virtual String clipboard_get() const override;
@@ -131,7 +130,7 @@ public:
 	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) override;
 	void emit_input_dialog_callback(String p_text);
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, const FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, const FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
 	void emit_file_picker_callback(bool p_ok, const Vector<String> &p_selected_paths);
 
 	virtual Color get_accent_color() const override;
@@ -160,6 +159,8 @@ public:
 	virtual void virtual_keyboard_hide() override;
 	virtual int virtual_keyboard_get_height() const override;
 	virtual bool has_hardware_keyboard() const override;
+	virtual void set_hardware_keyboard_connection_change_callback(const Callable &p_callable) override;
+	void emit_hardware_keyboard_connection_changed(bool p_connected);
 
 	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
 	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) override;
@@ -257,5 +258,3 @@ public:
 	DisplayServerAndroid(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerAndroid();
 };
-
-#endif // DISPLAY_SERVER_ANDROID_H
diff --git a/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml b/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml
index 7f2c825d..5ca5be44 100644
--- a/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml
+++ b/engine/platform/android/doc_classes/EditorExportPlatformAndroid.xml
@@ -597,7 +597,7 @@
 			Allows an application to write to the user dictionary.
 		</member>
 		<member name="screen/immersive_mode" type="bool" setter="" getter="">
-			If [code]true[/code], hides navigation and status bar. See [method DisplayServer.window_set_mode] to toggle it at runtime.
+			If [code]true[/code], hides the navigation and status bar. Set [method DisplayServer.window_set_mode] to change this at runtime.
 		</member>
 		<member name="screen/support_large" type="bool" setter="" getter="">
 			Indicates whether the application supports larger screen form-factors.
diff --git a/engine/platform/android/export/export.h b/engine/platform/android/export/export.h
index bd689a40..9e5e94e4 100644
--- a/engine/platform/android/export/export.h
+++ b/engine/platform/android/export/export.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANDROID_EXPORT_H
-#define ANDROID_EXPORT_H
+#pragma once
 
 void register_android_exporter_types();
 void register_android_exporter();
-
-#endif // ANDROID_EXPORT_H
diff --git a/engine/platform/android/export/export_plugin.cpp b/engine/platform/android/export/export_plugin.cpp
index 13d721da..d5dfc104 100644
--- a/engine/platform/android/export/export_plugin.cpp
+++ b/engine/platform/android/export/export_plugin.cpp
@@ -30,11 +30,9 @@
 
 #include "export_plugin.h"
 
-#include "gradle_export_util.h"
 #include "logo_svg.gen.h"
 #include "run_icon_svg.gen.h"
 
-#include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/image_loader.h"
@@ -396,28 +394,27 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
 							// its format is "[property]: [value]" so changed it as like build.prop
 							String p = props[j];
 							p = p.replace("]: ", "=");
-							p = p.replace("[", "");
-							p = p.replace("]", "");
+							p = p.remove_chars("[]");
 
 							if (p.begins_with("ro.product.model=")) {
-								device = p.get_slice("=", 1).strip_edges();
+								device = p.get_slicec('=', 1).strip_edges();
 							} else if (p.begins_with("ro.product.brand=")) {
-								vendor = p.get_slice("=", 1).strip_edges().capitalize();
+								vendor = p.get_slicec('=', 1).strip_edges().capitalize();
 							} else if (p.begins_with("ro.build.display.id=")) {
-								d.description += "Build: " + p.get_slice("=", 1).strip_edges() + "\n";
+								d.description += "Build: " + p.get_slicec('=', 1).strip_edges() + "\n";
 							} else if (p.begins_with("ro.build.version.release=")) {
-								d.description += "Release: " + p.get_slice("=", 1).strip_edges() + "\n";
+								d.description += "Release: " + p.get_slicec('=', 1).strip_edges() + "\n";
 							} else if (p.begins_with("ro.build.version.sdk=")) {
-								d.api_level = p.get_slice("=", 1).to_int();
+								d.api_level = p.get_slicec('=', 1).to_int();
 							} else if (p.begins_with("ro.product.cpu.abi=")) {
-								d.architecture = p.get_slice("=", 1).strip_edges();
+								d.architecture = p.get_slicec('=', 1).strip_edges();
 								d.description += "CPU: " + d.architecture + "\n";
 							} else if (p.begins_with("ro.product.manufacturer=")) {
-								d.description += "Manufacturer: " + p.get_slice("=", 1).strip_edges() + "\n";
+								d.description += "Manufacturer: " + p.get_slicec('=', 1).strip_edges() + "\n";
 							} else if (p.begins_with("ro.board.platform=")) {
-								d.description += "Chipset: " + p.get_slice("=", 1).strip_edges() + "\n";
+								d.description += "Chipset: " + p.get_slicec('=', 1).strip_edges() + "\n";
 							} else if (p.begins_with("ro.opengles.version=")) {
-								uint32_t opengl = p.get_slice("=", 1).to_int();
+								uint32_t opengl = p.get_slicec('=', 1).to_int();
 								d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl) & 0xFF) + "\n";
 							}
 						}
@@ -480,32 +477,32 @@ void EditorExportPlatformAndroid::_update_preset_status() {
 }
 #endif
 
-String EditorExportPlatformAndroid::get_project_name(const String &p_name) const {
+String EditorExportPlatformAndroid::get_project_name(const Ref<EditorExportPreset> &p_preset, const String &p_name) const {
 	String aname;
 	if (!p_name.is_empty()) {
 		aname = p_name;
 	} else {
-		aname = GLOBAL_GET("application/config/name");
+		aname = get_project_setting(p_preset, "application/config/name");
 	}
 
 	if (aname.is_empty()) {
-		aname = VERSION_NAME;
+		aname = GODOT_VERSION_NAME;
 	}
 
 	return aname;
 }
 
-String EditorExportPlatformAndroid::get_package_name(const String &p_package) const {
+String EditorExportPlatformAndroid::get_package_name(const Ref<EditorExportPreset> &p_preset, const String &p_package) const {
 	String pname = p_package;
-	String name = get_valid_basename();
+	String name = get_valid_basename(p_preset);
 	pname = pname.replace("$genname", name);
 	return pname;
 }
 
 // Returns the project name without invalid characters
 // or the "noname" string if all characters are invalid.
-String EditorExportPlatformAndroid::get_valid_basename() const {
-	String basename = GLOBAL_GET("application/config/name");
+String EditorExportPlatformAndroid::get_valid_basename(const Ref<EditorExportPreset> &p_preset) const {
+	String basename = get_project_setting(p_preset, "application/config/name");
 	basename = basename.to_lower();
 
 	String name;
@@ -533,8 +530,8 @@ String EditorExportPlatformAndroid::get_assets_directory(const Ref<EditorExportP
 	return gradle_build_directory.path_join(p_export_format == EXPORT_FORMAT_AAB ? AAB_ASSETS_DIRECTORY : APK_ASSETS_DIRECTORY);
 }
 
-bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package, String *r_error) const {
-	String pname = get_package_name(p_package);
+bool EditorExportPlatformAndroid::is_package_name_valid(const Ref<EditorExportPreset> &p_preset, const String &p_package, String *r_error) const {
+	String pname = get_package_name(p_preset, p_package);
 
 	if (pname.length() == 0) {
 		if (r_error) {
@@ -596,12 +593,12 @@ bool EditorExportPlatformAndroid::is_package_name_valid(const String &p_package,
 	return true;
 }
 
-bool EditorExportPlatformAndroid::is_project_name_valid() const {
+bool EditorExportPlatformAndroid::is_project_name_valid(const Ref<EditorExportPreset> &p_preset) const {
 	// Get the original project name and convert to lowercase.
-	String basename = GLOBAL_GET("application/config/name");
+	String basename = get_project_setting(p_preset, "application/config/name");
 	basename = basename.to_lower();
 	// Check if there are invalid characters.
-	if (basename != get_valid_basename()) {
+	if (basename != get_valid_basename(p_preset)) {
 		return false;
 	}
 	return true;
@@ -804,7 +801,12 @@ Error EditorExportPlatformAndroid::save_apk_so(void *p_userdata, const SharedObj
 
 Error EditorExportPlatformAndroid::save_apk_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed) {
 	APKExportData *ed = static_cast<APKExportData *>(p_userdata);
-	const String path = ResourceUID::ensure_path(p_path);
+
+	String path = p_path.simplify_path();
+	if (path.begins_with("uid://")) {
+		path = ResourceUID::uid_to_path(path).simplify_path();
+		print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, path));
+	}
 	const String dst_path = path.replace_first("res://", "assets/");
 
 	store_in_apk(ed, dst_path, p_data, _should_compress_asset(path, p_data) ? Z_DEFLATED : 0);
@@ -855,9 +857,9 @@ bool EditorExportPlatformAndroid::_has_manage_external_storage_permission(const
 	return p_permissions.has("android.permission.MANAGE_EXTERNAL_STORAGE");
 }
 
-bool EditorExportPlatformAndroid::_uses_vulkan() {
-	String rendering_method = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
-	String rendering_driver = GLOBAL_GET("rendering/rendering_device/driver.android");
+bool EditorExportPlatformAndroid::_uses_vulkan(const Ref<EditorExportPreset> &p_preset) const {
+	String rendering_method = get_project_setting(p_preset, "rendering/renderer/rendering_method.mobile");
+	String rendering_driver = get_project_setting(p_preset, "rendering/rendering_device/driver.android");
 	return (rendering_method == "forward_plus" || rendering_method == "mobile") && rendering_driver == "vulkan";
 }
 
@@ -939,7 +941,7 @@ void EditorExportPlatformAndroid::_create_editor_debug_keystore_if_needed() {
 	print_verbose("Updated editor debug keystore to " + keystore_path);
 }
 
-void EditorExportPlatformAndroid::_get_permissions(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, Vector<String> &r_permissions) {
+void EditorExportPlatformAndroid::_get_manifest_info(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, Vector<String> &r_permissions, Vector<FeatureInfo> &r_features, Vector<MetadataInfo> &r_metadata) {
 	const char **aperms = ANDROID_PERMS;
 	while (*aperms) {
 		bool enabled = p_preset->get("permissions/" + String(*aperms).to_lower());
@@ -960,6 +962,36 @@ void EditorExportPlatformAndroid::_get_permissions(const Ref<EditorExportPreset>
 			r_permissions.push_back("android.permission.INTERNET");
 		}
 	}
+
+	if (_uses_vulkan(p_preset)) {
+		// Require vulkan hardware level 1 support
+		FeatureInfo vulkan_level = {
+			"android.hardware.vulkan.level", // name
+			false, // required
+			"1" // version
+		};
+		r_features.append(vulkan_level);
+
+		// Require vulkan version 1.0
+		FeatureInfo vulkan_version = {
+			"android.hardware.vulkan.version", // name
+			true, // required
+			"0x400003" // version - Encoded value for api version 1.0
+		};
+		r_features.append(vulkan_version);
+	}
+
+	MetadataInfo rendering_method_metadata = {
+		"org.godotengine.rendering.method",
+		p_preset->get_project_setting("rendering/renderer/rendering_method.mobile")
+	};
+	r_metadata.append(rendering_method_metadata);
+
+	MetadataInfo editor_version_metadata = {
+		"org.godotengine.editor.version",
+		String(GODOT_VERSION_FULL_CONFIG)
+	};
+	r_metadata.append(editor_version_metadata);
 }
 
 void EditorExportPlatformAndroid::_write_tmp_manifest(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, bool p_debug) {
@@ -973,7 +1005,9 @@ void EditorExportPlatformAndroid::_write_tmp_manifest(const Ref<EditorExportPres
 	manifest_text += _get_gles_tag();
 
 	Vector<String> perms;
-	_get_permissions(p_preset, p_give_internet, perms);
+	Vector<FeatureInfo> features;
+	Vector<MetadataInfo> manifest_metadata;
+	_get_manifest_info(p_preset, p_give_internet, perms, features, manifest_metadata);
 	for (int i = 0; i < perms.size(); i++) {
 		String permission = perms.get(i);
 		if (permission == "android.permission.WRITE_EXTERNAL_STORAGE" || (permission == "android.permission.READ_EXTERNAL_STORAGE" && _has_manage_external_storage_permission(perms))) {
@@ -983,9 +1017,8 @@ void EditorExportPlatformAndroid::_write_tmp_manifest(const Ref<EditorExportPres
 		}
 	}
 
-	if (_uses_vulkan()) {
-		manifest_text += "    <uses-feature tools:node=\"replace\" android:name=\"android.hardware.vulkan.level\" android:required=\"false\" android:version=\"1\" />\n";
-		manifest_text += "    <uses-feature tools:node=\"replace\" android:name=\"android.hardware.vulkan.version\" android:required=\"true\" android:version=\"0x400003\" />\n";
+	for (int i = 0; i < features.size(); i++) {
+		manifest_text += vformat("    <uses-feature tools:node=\"replace\" android:name=\"%s\" android:required=\"%s\" android:version=\"%s\" />\n", features[i].name, features[i].required, features[i].version);
 	}
 
 	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
@@ -999,7 +1032,7 @@ void EditorExportPlatformAndroid::_write_tmp_manifest(const Ref<EditorExportPres
 		}
 	}
 
-	manifest_text += _get_application_tag(Ref<EditorExportPlatform>(this), p_preset, _has_read_write_storage_permission(perms), p_debug);
+	manifest_text += _get_application_tag(Ref<EditorExportPlatform>(this), p_preset, _has_read_write_storage_permission(perms), p_debug, manifest_metadata);
 	manifest_text += "</manifest>\n";
 	String manifest_path = ExportTemplateManager::get_android_build_directory(p_preset).path_join(vformat("src/%s/AndroidManifest.xml", (p_debug ? "debug" : "release")));
 
@@ -1087,7 +1120,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 	String package_name = p_preset->get("package/unique_name");
 
 	const int screen_orientation =
-			_get_android_orientation_value(DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation"))));
+			_get_android_orientation_value(DisplayServer::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation"))));
 
 	bool screen_support_small = p_preset->get("screen/support_small");
 	bool screen_support_normal = p_preset->get("screen/support_normal");
@@ -1098,11 +1131,12 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 	int app_category = p_preset->get("package/app_category");
 	bool retain_data_on_uninstall = p_preset->get("package/retain_data_on_uninstall");
 	bool exclude_from_recents = p_preset->get("package/exclude_from_recents");
-	bool is_resizeable = bool(GLOBAL_GET("display/window/size/resizable"));
+	bool is_resizeable = bool(get_project_setting(p_preset, "display/window/size/resizable"));
 
 	Vector<String> perms;
-	// Write permissions into the perms variable.
-	_get_permissions(p_preset, p_give_internet, perms);
+	Vector<FeatureInfo> features;
+	Vector<MetadataInfo> manifest_metadata;
+	_get_manifest_info(p_preset, p_give_internet, perms, features, manifest_metadata);
 	bool has_read_write_storage_permission = _has_read_write_storage_permission(perms);
 
 	while (ofs < (uint32_t)p_manifest.size()) {
@@ -1171,7 +1205,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 
 					//replace project information
 					if (tname == "manifest" && attrname == "package") {
-						string_table.write[attr_value] = get_package_name(package_name);
+						string_table.write[attr_value] = get_package_name(p_preset, package_name);
 					}
 
 					if (tname == "manifest" && attrname == "versionCode") {
@@ -1219,7 +1253,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 					}
 
 					if (tname == "provider" && attrname == "authorities") {
-						string_table.write[attr_value] = get_package_name(package_name) + String(".fileprovider");
+						string_table.write[attr_value] = get_package_name(p_preset, package_name) + String(".fileprovider");
 					}
 
 					if (tname == "supports-screens") {
@@ -1246,42 +1280,25 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 				uint32_t name = decode_uint32(&p_manifest[iofs + 12]);
 				String tname = string_table[name];
 
-				if (tname == "uses-feature") {
-					Vector<String> feature_names;
-					Vector<bool> feature_required_list;
-					Vector<int> feature_versions;
+				if (tname == "manifest" || tname == "application") {
+					// save manifest ending so we can restore it
+					Vector<uint8_t> manifest_end;
+					uint32_t manifest_cur_size = p_manifest.size();
 
-					if (_uses_vulkan()) {
-						// Require vulkan hardware level 1 support
-						feature_names.push_back("android.hardware.vulkan.level");
-						feature_required_list.push_back(false);
-						feature_versions.push_back(1);
+					manifest_end.resize(p_manifest.size() - ofs);
+					memcpy(manifest_end.ptrw(), &p_manifest[ofs], manifest_end.size());
 
-						// Require vulkan version 1.0
-						feature_names.push_back("android.hardware.vulkan.version");
-						feature_required_list.push_back(true);
-						feature_versions.push_back(0x400003); // Encoded value for api version 1.0
+					int32_t attr_name_string = string_table.find("name");
+					ERR_FAIL_COND_MSG(attr_name_string == -1, "Template does not have 'name' attribute.");
+
+					int32_t ns_android_string = string_table.find("http://schemas.android.com/apk/res/android");
+					if (ns_android_string == -1) {
+						string_table.push_back("http://schemas.android.com/apk/res/android");
+						ns_android_string = string_table.size() - 1;
 					}
 
-					if (feature_names.size() > 0) {
-						ofs += 24; // skip over end tag
-
-						// save manifest ending so we can restore it
-						Vector<uint8_t> manifest_end;
-						uint32_t manifest_cur_size = p_manifest.size();
-
-						manifest_end.resize(p_manifest.size() - ofs);
-						memcpy(manifest_end.ptrw(), &p_manifest[ofs], manifest_end.size());
-
-						int32_t attr_name_string = string_table.find("name");
-						ERR_FAIL_COND_MSG(attr_name_string == -1, "Template does not have 'name' attribute.");
-
-						int32_t ns_android_string = string_table.find("http://schemas.android.com/apk/res/android");
-						if (ns_android_string == -1) {
-							string_table.push_back("http://schemas.android.com/apk/res/android");
-							ns_android_string = string_table.size() - 1;
-						}
-
+					if (tname == "manifest") {
+						// Updating manifest features
 						int32_t attr_uses_feature_string = string_table.find("uses-feature");
 						if (attr_uses_feature_string == -1) {
 							string_table.push_back("uses-feature");
@@ -1294,11 +1311,11 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 							attr_required_string = string_table.size() - 1;
 						}
 
-						for (int i = 0; i < feature_names.size(); i++) {
-							const String &feature_name = feature_names[i];
-							bool feature_required = feature_required_list[i];
-							int feature_version = feature_versions[i];
-							bool has_version_attribute = feature_version != -1;
+						for (int i = 0; i < features.size(); i++) {
+							const String &feature_name = features[i].name;
+							bool feature_required = features[i].required;
+							String feature_version = features[i].version;
+							bool has_version_attribute = !feature_version.is_empty();
 
 							print_line("Adding feature " + feature_name);
 
@@ -1326,9 +1343,9 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 									attr_version_string = string_table.size() - 1;
 								}
 
-								version_value = string_table.find(itos(feature_version));
+								version_value = string_table.find(feature_version);
 								if (version_value == -1) {
-									string_table.push_back(itos(feature_version));
+									string_table.push_back(feature_version);
 									version_value = string_table.size() - 1;
 								}
 
@@ -1400,79 +1417,149 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 
 							ofs += 24;
 						}
-						memcpy(&p_manifest.write[ofs], manifest_end.ptr(), manifest_end.size());
-						ofs -= 24; // go back over back end
-					}
-				}
-				if (tname == "manifest") {
-					// save manifest ending so we can restore it
-					Vector<uint8_t> manifest_end;
-					uint32_t manifest_cur_size = p_manifest.size();
 
-					manifest_end.resize(p_manifest.size() - ofs);
-					memcpy(manifest_end.ptrw(), &p_manifest[ofs], manifest_end.size());
-
-					int32_t attr_name_string = string_table.find("name");
-					ERR_FAIL_COND_MSG(attr_name_string == -1, "Template does not have 'name' attribute.");
-
-					int32_t ns_android_string = string_table.find("android");
-					ERR_FAIL_COND_MSG(ns_android_string == -1, "Template does not have 'android' namespace.");
-
-					int32_t attr_uses_permission_string = string_table.find("uses-permission");
-					if (attr_uses_permission_string == -1) {
-						string_table.push_back("uses-permission");
-						attr_uses_permission_string = string_table.size() - 1;
-					}
-
-					for (int i = 0; i < perms.size(); ++i) {
-						print_line("Adding permission " + perms[i]);
-
-						manifest_cur_size += 56 + 24; // node + end node
-						p_manifest.resize(manifest_cur_size);
-
-						// Add permission to the string pool
-						int32_t perm_string = string_table.find(perms[i]);
-						if (perm_string == -1) {
-							string_table.push_back(perms[i]);
-							perm_string = string_table.size() - 1;
+						// Updating manifest permissions
+						int32_t attr_uses_permission_string = string_table.find("uses-permission");
+						if (attr_uses_permission_string == -1) {
+							string_table.push_back("uses-permission");
+							attr_uses_permission_string = string_table.size() - 1;
 						}
 
-						// start tag
-						encode_uint16(0x102, &p_manifest.write[ofs]); // type
-						encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
-						encode_uint32(56, &p_manifest.write[ofs + 4]); // size
-						encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
-						encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
-						encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
-						encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
-						encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
-						encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
-						encode_uint16(1, &p_manifest.write[ofs + 28]); // num_attrs
-						encode_uint16(0, &p_manifest.write[ofs + 30]); // id_index
-						encode_uint16(0, &p_manifest.write[ofs + 32]); // class_index
-						encode_uint16(0, &p_manifest.write[ofs + 34]); // style_index
+						for (int i = 0; i < perms.size(); ++i) {
+							print_line("Adding permission " + perms[i]);
 
-						// attribute
-						encode_uint32(ns_android_string, &p_manifest.write[ofs + 36]); // ns
-						encode_uint32(attr_name_string, &p_manifest.write[ofs + 40]); // 'name'
-						encode_uint32(perm_string, &p_manifest.write[ofs + 44]); // raw_value
-						encode_uint16(8, &p_manifest.write[ofs + 48]); // typedvalue_size
-						p_manifest.write[ofs + 50] = 0; // typedvalue_always0
-						p_manifest.write[ofs + 51] = 0x03; // typedvalue_type (string)
-						encode_uint32(perm_string, &p_manifest.write[ofs + 52]); // typedvalue reference
+							manifest_cur_size += 56 + 24; // node + end node
+							p_manifest.resize(manifest_cur_size);
 
-						ofs += 56;
+							// Add permission to the string pool
+							int32_t perm_string = string_table.find(perms[i]);
+							if (perm_string == -1) {
+								string_table.push_back(perms[i]);
+								perm_string = string_table.size() - 1;
+							}
 
-						// end tag
-						encode_uint16(0x103, &p_manifest.write[ofs]); // type
-						encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
-						encode_uint32(24, &p_manifest.write[ofs + 4]); // size
-						encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
-						encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
-						encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
-						encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
+							// start tag
+							encode_uint16(0x102, &p_manifest.write[ofs]); // type
+							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+							encode_uint32(56, &p_manifest.write[ofs + 4]); // size
+							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+							encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
+							encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
+							encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
+							encode_uint16(1, &p_manifest.write[ofs + 28]); // num_attrs
+							encode_uint16(0, &p_manifest.write[ofs + 30]); // id_index
+							encode_uint16(0, &p_manifest.write[ofs + 32]); // class_index
+							encode_uint16(0, &p_manifest.write[ofs + 34]); // style_index
 
-						ofs += 24;
+							// attribute
+							encode_uint32(ns_android_string, &p_manifest.write[ofs + 36]); // ns
+							encode_uint32(attr_name_string, &p_manifest.write[ofs + 40]); // 'name'
+							encode_uint32(perm_string, &p_manifest.write[ofs + 44]); // raw_value
+							encode_uint16(8, &p_manifest.write[ofs + 48]); // typedvalue_size
+							p_manifest.write[ofs + 50] = 0; // typedvalue_always0
+							p_manifest.write[ofs + 51] = 0x03; // typedvalue_type (string)
+							encode_uint32(perm_string, &p_manifest.write[ofs + 52]); // typedvalue reference
+
+							ofs += 56;
+
+							// end tag
+							encode_uint16(0x103, &p_manifest.write[ofs]); // type
+							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+							encode_uint32(24, &p_manifest.write[ofs + 4]); // size
+							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+							encode_uint32(attr_uses_permission_string, &p_manifest.write[ofs + 20]); // name
+
+							ofs += 24;
+						}
+					}
+
+					if (tname == "application") {
+						// Updating application meta-data
+						int32_t attr_meta_data_string = string_table.find("meta-data");
+						if (attr_meta_data_string == -1) {
+							string_table.push_back("meta-data");
+							attr_meta_data_string = string_table.size() - 1;
+						}
+
+						int32_t attr_value_string = string_table.find("value");
+						if (attr_value_string == -1) {
+							string_table.push_back("value");
+							attr_value_string = string_table.size() - 1;
+						}
+
+						for (int i = 0; i < manifest_metadata.size(); i++) {
+							String meta_data_name = manifest_metadata[i].name;
+							String meta_data_value = manifest_metadata[i].value;
+
+							print_line("Adding application metadata " + meta_data_name);
+
+							int32_t meta_data_name_string = string_table.find(meta_data_name);
+							if (meta_data_name_string == -1) {
+								string_table.push_back(meta_data_name);
+								meta_data_name_string = string_table.size() - 1;
+							}
+
+							int32_t meta_data_value_string = string_table.find(meta_data_value);
+							if (meta_data_value_string == -1) {
+								string_table.push_back(meta_data_value);
+								meta_data_value_string = string_table.size() - 1;
+							}
+
+							int tag_size = 76; // node and two attrs + end node
+							int attr_count = 2;
+							manifest_cur_size += tag_size + 24;
+							p_manifest.resize(manifest_cur_size);
+
+							// start tag
+							encode_uint16(0x102, &p_manifest.write[ofs]); // type
+							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+							encode_uint32(tag_size, &p_manifest.write[ofs + 4]); // size
+							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+							encode_uint32(attr_meta_data_string, &p_manifest.write[ofs + 20]); // name
+							encode_uint16(20, &p_manifest.write[ofs + 24]); // attr_start
+							encode_uint16(20, &p_manifest.write[ofs + 26]); // attr_size
+							encode_uint16(attr_count, &p_manifest.write[ofs + 28]); // num_attrs
+							encode_uint16(0, &p_manifest.write[ofs + 30]); // id_index
+							encode_uint16(0, &p_manifest.write[ofs + 32]); // class_index
+							encode_uint16(0, &p_manifest.write[ofs + 34]); // style_index
+
+							// android:name attribute
+							encode_uint32(ns_android_string, &p_manifest.write[ofs + 36]); // ns
+							encode_uint32(attr_name_string, &p_manifest.write[ofs + 40]); // 'name'
+							encode_uint32(meta_data_name_string, &p_manifest.write[ofs + 44]); // raw_value
+							encode_uint16(8, &p_manifest.write[ofs + 48]); // typedvalue_size
+							p_manifest.write[ofs + 50] = 0; // typedvalue_always0
+							p_manifest.write[ofs + 51] = 0x03; // typedvalue_type (string)
+							encode_uint32(meta_data_name_string, &p_manifest.write[ofs + 52]); // typedvalue reference
+
+							// android:value attribute
+							encode_uint32(ns_android_string, &p_manifest.write[ofs + 56]); // ns
+							encode_uint32(attr_value_string, &p_manifest.write[ofs + 60]); // 'value'
+							encode_uint32(meta_data_value_string, &p_manifest.write[ofs + 64]); // raw_value
+							encode_uint16(8, &p_manifest.write[ofs + 68]); // typedvalue_size
+							p_manifest.write[ofs + 70] = 0; // typedvalue_always0
+							p_manifest.write[ofs + 71] = 0x03; // typedvalue_type (string)
+							encode_uint32(meta_data_value_string, &p_manifest.write[ofs + 72]); // typedvalue reference
+
+							ofs += 76;
+
+							// end tag
+							encode_uint16(0x103, &p_manifest.write[ofs]); // type
+							encode_uint16(16, &p_manifest.write[ofs + 2]); // headersize
+							encode_uint32(24, &p_manifest.write[ofs + 4]); // size
+							encode_uint32(0, &p_manifest.write[ofs + 8]); // lineno
+							encode_uint32(-1, &p_manifest.write[ofs + 12]); // comment
+							encode_uint32(-1, &p_manifest.write[ofs + 16]); // ns
+							encode_uint32(attr_meta_data_string, &p_manifest.write[ofs + 20]); // name
+
+							ofs += 24;
+						}
 					}
 
 					// copy footer back in
@@ -1484,7 +1571,7 @@ void EditorExportPlatformAndroid::_fix_manifest(const Ref<EditorExportPreset> &p
 		ofs += size;
 	}
 
-	//create new andriodmanifest binary
+	// Create new android manifest binary.
 
 	Vector<uint8_t> ret;
 	ret.resize(string_table_begins + string_table.size() * 4);
@@ -1588,9 +1675,7 @@ String EditorExportPlatformAndroid::_parse_string(const uint8_t *p_bytes, bool p
 			str8.write[i] = p_bytes[offset + i];
 		}
 		str8.write[len] = 0;
-		String str;
-		str.parse_utf8((const char *)str8.ptr(), len);
-		return str;
+		return String::utf8((const char *)str8.ptr(), len);
 	} else {
 		String str;
 		for (uint32_t i = 0; i < len; i++) {
@@ -1615,7 +1700,7 @@ void EditorExportPlatformAndroid::_fix_resources(const Ref<EditorExportPreset> &
 	Vector<String> string_table;
 
 	String package_name = p_preset->get("package/name");
-	Dictionary appnames = GLOBAL_GET("application/config/name_localized");
+	Dictionary appnames = get_project_setting(p_preset, "application/config/name_localized");
 
 	for (uint32_t i = 0; i < string_count; i++) {
 		uint32_t offset = decode_uint32(&r_manifest[string_table_begins + i * 4]);
@@ -1626,14 +1711,14 @@ void EditorExportPlatformAndroid::_fix_resources(const Ref<EditorExportPreset> &
 		if (str.begins_with("godot-project-name")) {
 			if (str == "godot-project-name") {
 				//project name
-				str = get_project_name(package_name);
+				str = get_project_name(p_preset, package_name);
 
 			} else {
-				String lang = str.substr(str.rfind_char('-') + 1, str.length()).replace("-", "_");
+				String lang = str.substr(str.rfind_char('-') + 1).replace_char('-', '_');
 				if (appnames.has(lang)) {
 					str = appnames[lang];
 				} else {
-					str = get_project_name(package_name);
+					str = get_project_name(p_preset, package_name);
 				}
 			}
 		}
@@ -1725,7 +1810,7 @@ void EditorExportPlatformAndroid::_process_launcher_icons(const String &p_file_n
 }
 
 void EditorExportPlatformAndroid::load_icon_refs(const Ref<EditorExportPreset> &p_preset, Ref<Image> &icon, Ref<Image> &foreground, Ref<Image> &background, Ref<Image> &monochrome) {
-	String project_icon_path = GLOBAL_GET("application/config/icon");
+	String project_icon_path = get_project_setting(p_preset, "application/config/icon");
 
 	Error err = OK;
 
@@ -1854,7 +1939,7 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport
 			String pn = p_preset->get("package/unique_name");
 			String pn_err;
 
-			if (!is_package_name_valid(pn, &pn_err)) {
+			if (!is_package_name_valid(Ref<EditorExportPreset>(p_preset), pn, &pn_err)) {
 				return TTR("Invalid package name:") + " " + pn_err;
 			}
 		} else if (p_name == "gesture/swipe_to_dismiss") {
@@ -1864,16 +1949,10 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport
 			}
 		} else if (p_name == "gradle_build/use_gradle_build") {
 			bool gradle_build_enabled = p_preset->get("gradle_build/use_gradle_build");
-			String enabled_plugins_names = _get_plugins_names(Ref<EditorExportPreset>(p_preset));
-			if (!enabled_plugins_names.is_empty() && !gradle_build_enabled) {
+			String enabled_deprecated_plugins_names = _get_deprecated_plugins_names(Ref<EditorExportPreset>(p_preset));
+			if (!enabled_deprecated_plugins_names.is_empty() && !gradle_build_enabled) {
 				return TTR("\"Use Gradle Build\" must be enabled to use the plugins.");
 			}
-		} else if (p_name == "xr_features/xr_mode") {
-			bool gradle_build_enabled = p_preset->get("gradle_build/use_gradle_build");
-			int xr_mode_index = p_preset->get("xr_features/xr_mode");
-			if (xr_mode_index == XR_MODE_OPENXR && !gradle_build_enabled) {
-				return TTR("OpenXR requires \"Use Gradle Build\" to be enabled");
-			}
 		} else if (p_name == "gradle_build/compress_native_libraries") {
 			bool gradle_build_enabled = p_preset->get("gradle_build/use_gradle_build");
 			if (bool(p_preset->get("gradle_build/compress_native_libraries")) && !gradle_build_enabled) {
@@ -2041,7 +2120,9 @@ bool EditorExportPlatformAndroid::get_export_option_visibility(const EditorExpor
 	if (p_option == "graphics/opengl_debug" ||
 			p_option == "command_line/extra_args" ||
 			p_option == "permissions/custom_permissions" ||
-			p_option == "gradle_build/compress_native_libraries" ||
+			p_option == "keystore/debug" ||
+			p_option == "keystore/debug_user" ||
+			p_option == "keystore/debug_password" ||
 			p_option == "package/retain_data_on_uninstall" ||
 			p_option == "package/exclude_from_recents" ||
 			p_option == "package/show_in_app_library" ||
@@ -2065,6 +2146,9 @@ bool EditorExportPlatformAndroid::get_export_option_visibility(const EditorExpor
 		return false;
 	}
 
+	if (p_option == "dotnet/android_use_linux_bionic") {
+		return advanced_options_enabled;
+	}
 	return true;
 }
 
@@ -2204,7 +2288,7 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
 			args.push_back("--user");
 			args.push_back("0");
 		}
-		args.push_back(get_package_name(package_name));
+		args.push_back(get_package_name(p_preset, package_name));
 
 		output.clear();
 		err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
@@ -2309,16 +2393,16 @@ Error EditorExportPlatformAndroid::run(const Ref<EditorExportPreset> &p_preset,
 	// Going with implicit launch first based on the LAUNCHER category and the app's package.
 	args.push_back("-c");
 	args.push_back("android.intent.category.LAUNCHER");
-	args.push_back(get_package_name(package_name));
+	args.push_back(get_package_name(p_preset, package_name));
 
 	output.clear();
 	err = OS::get_singleton()->execute(adb, args, &output, &rv, true);
 	print_verbose(output);
 	if (err || rv != 0 || output.contains("Error: Activity not started")) {
 		// The implicit launch failed, let's try an explicit launch by specifying the component name before giving up.
-		const String component_name = get_package_name(package_name) + "/com.godot.game.GodotApp";
+		const String component_name = get_package_name(p_preset, package_name) + "/com.godot.game.GodotApp";
 		print_line("Implicit launch failed.. Trying explicit launch using", component_name);
-		args.erase(get_package_name(package_name));
+		args.erase(get_package_name(p_preset, package_name));
 		args.push_back("-n");
 		args.push_back(component_name);
 
@@ -2531,38 +2615,52 @@ bool EditorExportPlatformAndroid::has_valid_username_and_password(const Ref<Edit
 }
 
 #ifdef MODULE_MONO_ENABLED
+static uint64_t _last_validate_tfm_time = 0;
+static String _last_validate_tfm = "";
+
 bool _validate_dotnet_tfm(const String &required_tfm, String &r_error) {
-	String assembly_name = path::get_csharp_project_name();
+	String assembly_name = Path::get_csharp_project_name();
 	String project_path = ProjectSettings::get_singleton()->globalize_path("res://" + assembly_name + ".csproj");
 
 	if (!FileAccess::exists(project_path)) {
 		return true;
 	}
 
-	String pipe;
-	List<String> args;
-	args.push_back("build");
-	args.push_back(project_path);
-	args.push_back("--getProperty:TargetFramework");
+	uint64_t modified_time = FileAccess::get_modified_time(project_path);
+	String tfm;
 
-	int exitcode;
-	Error err = OS::get_singleton()->execute("dotnet", args, &pipe, &exitcode, true);
-	if (err != OK || exitcode != 0) {
-		if (err != OK) {
-			WARN_PRINT("Failed to execute dotnet command. Error " + String(error_names[err]));
-		} else if (exitcode != 0) {
-			print_line(pipe);
-			WARN_PRINT("dotnet command exited with code " + itos(exitcode) + ". See output above for more details.");
-		}
-		r_error += vformat(TTR("Unable to determine the C# project's TFM, it may be incompatible. The export template only supports '%s'. Make sure the project targets '%s' or consider using gradle builds instead."), required_tfm, required_tfm) + "\n";
+	if (modified_time == _last_validate_tfm_time) {
+		tfm = _last_validate_tfm;
 	} else {
-		String tfm = pipe.strip_edges();
-		if (tfm != required_tfm) {
-			r_error += vformat(TTR("C# project targets '%s' but the export template only supports '%s'. Consider using gradle builds instead."), tfm, required_tfm) + "\n";
-			return false;
+		String pipe;
+		List<String> args;
+		args.push_back("build");
+		args.push_back(project_path);
+		args.push_back("--getProperty:TargetFramework");
+
+		int exitcode;
+		Error err = OS::get_singleton()->execute("dotnet", args, &pipe, &exitcode, true);
+		if (err != OK || exitcode != 0) {
+			if (err != OK) {
+				WARN_PRINT("Failed to execute dotnet command. Error " + String(error_names[err]));
+			} else if (exitcode != 0) {
+				print_line(pipe);
+				WARN_PRINT("dotnet command exited with code " + itos(exitcode) + ". See output above for more details.");
+			}
+			r_error += vformat(TTR("Unable to determine the C# project's TFM, it may be incompatible. The export template only supports '%s'. Make sure the project targets '%s' or consider using gradle builds instead."), required_tfm, required_tfm) + "\n";
+			return true;
+		} else {
+			tfm = pipe.strip_edges();
+			_last_validate_tfm_time = modified_time;
+			_last_validate_tfm = tfm;
 		}
 	}
 
+	if (tfm != required_tfm) {
+		r_error += vformat(TTR("C# project targets '%s' but the export template only supports '%s'. Consider using gradle builds instead."), tfm, required_tfm) + "\n";
+		return false;
+	}
+
 	return true;
 }
 #endif
@@ -2599,6 +2697,7 @@ bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref<Edito
 			if (!dvalid) {
 				template_err += TTR("Custom debug template not found.") + "\n";
 			}
+			has_export_templates |= dvalid;
 		} else {
 			has_export_templates |= exists_export_template("android_debug.apk", &template_err);
 		}
@@ -2608,6 +2707,7 @@ bool EditorExportPlatformAndroid::has_valid_export_configuration(const Ref<Edito
 			if (!rvalid) {
 				template_err += TTR("Custom release template not found.") + "\n";
 			}
+			has_export_templates |= rvalid;
 		} else {
 			has_export_templates |= exists_export_template("android_release.apk", &template_err);
 		}
@@ -2819,23 +2919,23 @@ bool EditorExportPlatformAndroid::has_valid_project_configuration(const Ref<Edit
 		}
 	}
 
-	String current_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
+	String current_renderer = get_project_setting(p_preset, "rendering/renderer/rendering_method.mobile");
 	if (current_renderer == "forward_plus") {
 		// Warning only, so don't override `valid`.
 		err += vformat(TTR("The \"%s\" renderer is designed for Desktop devices, and is not suitable for Android devices."), current_renderer);
 		err += "\n";
 	}
 
-	if (_uses_vulkan() && min_sdk_int < VULKAN_MIN_SDK_VERSION) {
+	if (_uses_vulkan(p_preset) && min_sdk_int < VULKAN_MIN_SDK_VERSION) {
 		// Warning only, so don't override `valid`.
 		err += vformat(TTR("\"Min SDK\" should be greater or equal to %d for the \"%s\" renderer."), VULKAN_MIN_SDK_VERSION, current_renderer);
 		err += "\n";
 	}
 
 	String package_name = p_preset->get("package/unique_name");
-	if (package_name.contains("$genname") && !is_project_name_valid()) {
+	if (package_name.contains("$genname") && !is_project_name_valid(p_preset)) {
 		// Warning only, so don't override `valid`.
-		err += vformat(TTR("The project name does not meet the requirement for the package name format and will be updated to \"%s\". Please explicitly specify the package name if needed."), get_valid_basename());
+		err += vformat(TTR("The project name does not meet the requirement for the package name format and will be updated to \"%s\". Please explicitly specify the package name if needed."), get_valid_basename(p_preset));
 		err += "\n";
 	}
 
@@ -2853,7 +2953,7 @@ List<String> EditorExportPlatformAndroid::get_binary_extensions(const Ref<Editor
 String EditorExportPlatformAndroid::get_apk_expansion_fullpath(const Ref<EditorExportPreset> &p_preset, const String &p_path) {
 	int version_code = p_preset->get("version/code");
 	String package_name = p_preset->get("package/unique_name");
-	String apk_file_name = "main." + itos(version_code) + "." + get_package_name(package_name) + ".obb";
+	String apk_file_name = "main." + itos(version_code) + "." + get_package_name(p_preset, package_name) + ".obb";
 	String fullpath = p_path.get_base_dir().path_join(apk_file_name);
 	return fullpath;
 }
@@ -2965,7 +3065,11 @@ Error EditorExportPlatformAndroid::sign_apk(const Ref<EditorExportPreset> &p_pre
 	}
 
 	if (!FileAccess::exists(keystore)) {
-		add_message(EXPORT_MESSAGE_WARNING, TTR("Code Signing"), TTR("Could not find keystore, unable to export."));
+		if (p_debug) {
+			add_message(EXPORT_MESSAGE_WARNING, TTR("Code Signing"), TTR("Could not find debug keystore, unable to export."));
+		} else {
+			add_message(EXPORT_MESSAGE_WARNING, TTR("Code Signing"), TTR("Could not find release keystore, unable to export."));
+		}
 		return ERR_FILE_CANT_OPEN;
 	}
 
@@ -3151,6 +3255,17 @@ String EditorExportPlatformAndroid::join_abis(const Vector<EditorExportPlatformA
 	return ret;
 }
 
+String EditorExportPlatformAndroid::_get_deprecated_plugins_names(const Ref<EditorExportPreset> &p_preset) const {
+	Vector<String> names;
+
+#ifndef DISABLE_DEPRECATED
+	PluginConfigAndroid::get_plugins_names(get_enabled_plugins(p_preset), names);
+#endif // DISABLE_DEPRECATED
+
+	String plugins_names = String("|").join(names);
+	return plugins_names;
+}
+
 String EditorExportPlatformAndroid::_get_plugins_names(const Ref<EditorExportPreset> &p_preset) const {
 	Vector<String> names;
 
@@ -3320,8 +3435,8 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		print_verbose("Android sdk path: " + sdk_path);
 
 		// TODO: should we use "package/name" or "application/config/name"?
-		String project_name = get_project_name(p_preset->get("package/name"));
-		err = _create_project_name_strings_files(p_preset, project_name, gradle_build_directory); //project name localization.
+		String project_name = get_project_name(p_preset, p_preset->get("package/name"));
+		err = _create_project_name_strings_files(p_preset, project_name, gradle_build_directory, get_project_setting(p_preset, "application/config/name_localized")); //project name localization.
 		if (err != OK) {
 			add_message(EXPORT_MESSAGE_ERROR, TTR("Export"), TTR("Unable to overwrite res/*.xml files with project name."));
 		}
@@ -3382,7 +3497,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		String build_path = ProjectSettings::get_singleton()->globalize_path(gradle_build_directory);
 		build_command = build_path.path_join(build_command);
 
-		String package_name = get_package_name(p_preset->get("package/unique_name"));
+		String package_name = get_package_name(p_preset, p_preset->get("package/unique_name"));
 		String version_code = itos(p_preset->get("version/code"));
 		String version_name = p_preset->get_version("version/name");
 		String min_sdk_version = p_preset->get("gradle_build/min_sdk");
@@ -3456,7 +3571,6 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		}
 
 		String addons_directory = ProjectSettings::get_singleton()->globalize_path("res://addons");
-		String current_renderer = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
 
 		cmdline.push_back("-p"); // argument to specify the start directory.
 		cmdline.push_back(build_path); // start directory.
@@ -3473,8 +3587,6 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		cmdline.push_back("-Pperform_zipalign=" + zipalign_flag); // argument to specify whether the build should be zipaligned.
 		cmdline.push_back("-Pperform_signing=" + sign_flag); // argument to specify whether the build should be signed.
 		cmdline.push_back("-Pcompress_native_libraries=" + compress_native_libraries_flag); // argument to specify whether the build should compress native libraries.
-		cmdline.push_back("-Pgodot_editor_version=" + String(VERSION_FULL_CONFIG));
-		cmdline.push_back("-Pgodot_rendering_method=" + current_renderer);
 
 		// NOTE: The release keystore is not included in the verbose logging
 		// to avoid accidentally leaking sensitive information when sharing verbose logs for troubleshooting.
@@ -3497,7 +3609,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 					debug_keystore = OS::get_singleton()->get_resource_dir().path_join(debug_keystore).simplify_path();
 				}
 				if (!FileAccess::exists(debug_keystore)) {
-					add_message(EXPORT_MESSAGE_ERROR, TTR("Code Signing"), TTR("Could not find keystore, unable to export."));
+					add_message(EXPORT_MESSAGE_ERROR, TTR("Code Signing"), TTR("Could not find debug keystore, unable to export."));
 					return ERR_FILE_CANT_OPEN;
 				}
 
@@ -3513,7 +3625,7 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 					release_keystore = OS::get_singleton()->get_resource_dir().path_join(release_keystore).simplify_path();
 				}
 				if (!FileAccess::exists(release_keystore)) {
-					add_message(EXPORT_MESSAGE_ERROR, TTR("Code Signing"), TTR("Could not find keystore, unable to export."));
+					add_message(EXPORT_MESSAGE_ERROR, TTR("Code Signing"), TTR("Could not find release keystore, unable to export."));
 					return ERR_FILE_CANT_OPEN;
 				}
 
@@ -3655,6 +3767,17 @@ Error EditorExportPlatformAndroid::export_project_helper(const Ref<EditorExportP
 		//write
 		if (file == "AndroidManifest.xml") {
 			_fix_manifest(p_preset, data, p_give_internet);
+
+			// Allow editor export plugins to update the prebuilt manifest as needed.
+			Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
+			for (int i = 0; i < export_plugins.size(); i++) {
+				if (export_plugins[i]->supports_platform(Ref<EditorExportPlatform>(this))) {
+					PackedByteArray export_plugin_data = export_plugins[i]->update_android_prebuilt_manifest(Ref<EditorExportPlatform>(this), data);
+					if (!export_plugin_data.is_empty()) {
+						data = export_plugin_data;
+					}
+				}
+			}
 		}
 		if (file == "resources.arsc") {
 			_fix_resources(p_preset, data);
diff --git a/engine/platform/android/export/export_plugin.h b/engine/platform/android/export/export_plugin.h
index cae5e87e..aefb74ab 100644
--- a/engine/platform/android/export/export_plugin.h
+++ b/engine/platform/android/export/export_plugin.h
@@ -28,13 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANDROID_EXPORT_PLUGIN_H
-#define ANDROID_EXPORT_PLUGIN_H
+#pragma once
 
 #ifndef DISABLE_DEPRECATED
 #include "godot_plugin_config.h"
 #endif // DISABLE_DEPRECATED
 
+#include "gradle_export_util.h"
+
 #include "core/io/image.h"
 #include "core/io/zip_io.h"
 #include "core/os/os.h"
@@ -76,6 +77,12 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 		EditorProgress *ep = nullptr;
 	};
 
+	struct FeatureInfo {
+		String name;
+		bool required;
+		String version;
+	};
+
 #ifndef DISABLE_DEPRECATED
 	mutable Vector<PluginConfigAndroid> android_plugins;
 	mutable SafeFlag android_plugins_changed;
@@ -97,16 +104,16 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 	void _update_preset_status();
 #endif
 
-	String get_project_name(const String &p_name) const;
+	String get_project_name(const Ref<EditorExportPreset> &p_preset, const String &p_name) const;
 
-	String get_package_name(const String &p_package) const;
+	String get_package_name(const Ref<EditorExportPreset> &p_preset, const String &p_package) const;
 
-	String get_valid_basename() const;
+	String get_valid_basename(const Ref<EditorExportPreset> &p_preset) const;
 
 	String get_assets_directory(const Ref<EditorExportPreset> &p_preset, int p_export_format) const;
 
-	bool is_package_name_valid(const String &p_package, String *r_error = nullptr) const;
-	bool is_project_name_valid() const;
+	bool is_package_name_valid(const Ref<EditorExportPreset> &p_preset, const String &p_package, String *r_error = nullptr) const;
+	bool is_project_name_valid(const Ref<EditorExportPreset> &p_preset) const;
 
 	static bool _should_compress_asset(const String &p_path, const Vector<uint8_t> &p_data);
 
@@ -152,7 +159,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 
 	bool _has_manage_external_storage_permission(const Vector<String> &p_permissions);
 
-	void _get_permissions(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, Vector<String> &r_permissions);
+	void _get_manifest_info(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, Vector<String> &r_permissions, Vector<FeatureInfo> &r_features, Vector<MetadataInfo> &r_metadata);
 
 	void _write_tmp_manifest(const Ref<EditorExportPreset> &p_preset, bool p_give_internet, bool p_debug);
 
@@ -182,7 +189,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 
 	static Vector<ABI> get_enabled_abis(const Ref<EditorExportPreset> &p_preset);
 
-	static bool _uses_vulkan();
+	bool _uses_vulkan(const Ref<EditorExportPreset> &p_preset) const;
 
 protected:
 	void _notification(int p_what);
@@ -236,6 +243,8 @@ public:
 
 	virtual List<String> get_binary_extensions(const Ref<EditorExportPreset> &p_preset) const override;
 
+	String _get_deprecated_plugins_names(const Ref<EditorExportPreset> &p_preset) const;
+
 	String _get_plugins_names(const Ref<EditorExportPreset> &p_preset) const;
 
 	String _resolve_export_plugin_android_library_path(const String &p_android_library_path) const;
@@ -269,5 +278,3 @@ public:
 
 	~EditorExportPlatformAndroid();
 };
-
-#endif // ANDROID_EXPORT_PLUGIN_H
diff --git a/engine/platform/android/export/godot_plugin_config.h b/engine/platform/android/export/godot_plugin_config.h
index 8c56d001..1b69262c 100644
--- a/engine/platform/android/export/godot_plugin_config.h
+++ b/engine/platform/android/export/godot_plugin_config.h
@@ -28,13 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANDROID_GODOT_PLUGIN_CONFIG_H
-#define ANDROID_GODOT_PLUGIN_CONFIG_H
+#pragma once
 
 #ifndef DISABLE_DEPRECATED
 
 #include "core/config/project_settings.h"
-#include "core/error/error_list.h"
 #include "core/io/config_file.h"
 #include "core/string/ustring.h"
 
@@ -104,5 +102,3 @@ struct PluginConfigAndroid {
 };
 
 #endif // DISABLE_DEPRECATED
-
-#endif // ANDROID_GODOT_PLUGIN_CONFIG_H
diff --git a/engine/platform/android/export/gradle_export_util.cpp b/engine/platform/android/export/gradle_export_util.cpp
index 54d0e091..26d12884 100644
--- a/engine/platform/android/export/gradle_export_util.cpp
+++ b/engine/platform/android/export/gradle_export_util.cpp
@@ -171,8 +171,14 @@ Error store_string_at_path(const String &p_path, const String &p_data) {
 // This method will be called ONLY when gradle build is enabled.
 Error rename_and_store_file_in_gradle_project(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed) {
 	CustomExportData *export_data = static_cast<CustomExportData *>(p_userdata);
-	const String path = ResourceUID::ensure_path(p_path);
+
+	String path = p_path.simplify_path();
+	if (path.begins_with("uid://")) {
+		path = ResourceUID::uid_to_path(path).simplify_path();
+		print_verbose(vformat(R"(UID referenced exported file name "%s" was replaced with "%s".)", p_path, path));
+	}
 	const String dst_path = path.replace_first("res://", export_data->assets_directory + "/");
+
 	print_verbose("Saving project files from " + path + " into " + dst_path);
 	Error err = store_file_at_path(dst_path, p_data);
 	return err;
@@ -194,10 +200,10 @@ String _android_xml_escape(const String &p_string) {
 }
 
 // Creates strings.xml files inside the gradle project for different locales.
-Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &project_name, const String &p_gradle_build_dir) {
-	print_verbose("Creating strings resources for supported locales for project " + project_name);
+Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &p_project_name, const String &p_gradle_build_dir, const Dictionary &p_appnames) {
+	print_verbose("Creating strings resources for supported locales for project " + p_project_name);
 	// Stores the string into the default values directory.
-	String processed_default_xml_string = vformat(GODOT_PROJECT_NAME_XML_STRING, _android_xml_escape(project_name));
+	String processed_default_xml_string = vformat(GODOT_PROJECT_NAME_XML_STRING, _android_xml_escape(p_project_name));
 	store_string_at_path(p_gradle_build_dir.path_join("res/values/godot_project_name_string.xml"), processed_default_xml_string);
 
 	// Searches the Gradle project res/ directory to find all supported locales
@@ -209,7 +215,6 @@ Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset
 		return ERR_CANT_OPEN;
 	}
 	da->list_dir_begin();
-	Dictionary appnames = GLOBAL_GET("application/config/name_localized");
 	while (true) {
 		String file = da->get_next();
 		if (file.is_empty()) {
@@ -221,8 +226,8 @@ Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset
 		}
 		String locale = file.replace("values-", "").replace("-r", "_");
 		String locale_directory = p_gradle_build_dir.path_join("res/" + file + "/godot_project_name_string.xml");
-		if (appnames.has(locale)) {
-			String locale_project_name = appnames[locale];
+		if (p_appnames.has(locale)) {
+			String locale_project_name = p_appnames[locale];
 			String processed_xml_string = vformat(GODOT_PROJECT_NAME_XML_STRING, _android_xml_escape(locale_project_name));
 			print_verbose("Storing project name for locale " + locale + " under " + locale_directory);
 			store_string_at_path(locale_directory, processed_xml_string);
@@ -246,7 +251,7 @@ String _get_gles_tag() {
 String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset) {
 	String manifest_screen_sizes = "    <supports-screens \n        tools:node=\"replace\"";
 	String sizes[] = { "small", "normal", "large", "xlarge" };
-	size_t num_sizes = sizeof(sizes) / sizeof(sizes[0]);
+	constexpr size_t num_sizes = std::size(sizes);
 	for (size_t i = 0; i < num_sizes; i++) {
 		String feature_name = vformat("screen/support_%s", sizes[i]);
 		String feature_support = bool_to_string(p_preset->get(feature_name));
@@ -258,7 +263,7 @@ String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset) {
 }
 
 String _get_activity_tag(const Ref<EditorExportPlatform> &p_export_platform, const Ref<EditorExportPreset> &p_preset, bool p_debug) {
-	String orientation = _get_android_orientation_label(DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation"))));
+	String orientation = _get_android_orientation_label(DisplayServer::ScreenOrientation(int(p_export_platform->get_project_setting(p_preset, "display/window/handheld/orientation"))));
 	String manifest_activity_text = vformat(
 			"        <activity android:name=\".GodotApp\" "
 			"tools:replace=\"android:screenOrientation,android:excludeFromRecents,android:resizeableActivity\" "
@@ -268,7 +273,7 @@ String _get_activity_tag(const Ref<EditorExportPlatform> &p_export_platform, con
 			"android:resizeableActivity=\"%s\">\n",
 			bool_to_string(p_preset->get("package/exclude_from_recents")),
 			orientation,
-			bool_to_string(bool(GLOBAL_GET("display/window/size/resizable"))));
+			bool_to_string(bool(p_export_platform->get_project_setting(p_preset, "display/window/size/resizable"))));
 
 	manifest_activity_text += "            <intent-filter>\n"
 							  "                <action android:name=\"android.intent.action.MAIN\" />\n"
@@ -306,7 +311,7 @@ String _get_activity_tag(const Ref<EditorExportPlatform> &p_export_platform, con
 	return manifest_activity_text;
 }
 
-String _get_application_tag(const Ref<EditorExportPlatform> &p_export_platform, const Ref<EditorExportPreset> &p_preset, bool p_has_read_write_storage_permission, bool p_debug) {
+String _get_application_tag(const Ref<EditorExportPlatform> &p_export_platform, const Ref<EditorExportPreset> &p_preset, bool p_has_read_write_storage_permission, bool p_debug, const Vector<MetadataInfo> &p_metadata) {
 	int app_category_index = (int)(p_preset->get("package/app_category"));
 	bool is_game = app_category_index == APP_CATEGORY_GAME;
 
@@ -330,6 +335,10 @@ String _get_application_tag(const Ref<EditorExportPlatform> &p_export_platform,
 	}
 	manifest_application_text += "        tools:ignore=\"GoogleAppIndexingWarning\">\n\n";
 
+	for (int i = 0; i < p_metadata.size(); i++) {
+		manifest_application_text += vformat("        <meta-data tools:node=\"replace\" android:name=\"%s\" android:value=\"%s\" />\n", p_metadata[i].name, p_metadata[i].value);
+	}
+
 	Vector<Ref<EditorExportPlugin>> export_plugins = EditorExport::get_singleton()->get_export_plugins();
 	for (int i = 0; i < export_plugins.size(); i++) {
 		if (export_plugins[i]->supports_platform(p_export_platform)) {
diff --git a/engine/platform/android/export/gradle_export_util.h b/engine/platform/android/export/gradle_export_util.h
index ae830914..045e7f14 100644
--- a/engine/platform/android/export/gradle_export_util.h
+++ b/engine/platform/android/export/gradle_export_util.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANDROID_GRADLE_EXPORT_UTIL_H
-#define ANDROID_GRADLE_EXPORT_UTIL_H
+#pragma once
 
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
@@ -69,6 +68,11 @@ struct CustomExportData {
 	Vector<String> libs;
 };
 
+struct MetadataInfo {
+	String name;
+	String value;
+};
+
 int _get_android_orientation_value(DisplayServer::ScreenOrientation screen_orientation);
 
 String _get_android_orientation_label(DisplayServer::ScreenOrientation screen_orientation);
@@ -96,7 +100,7 @@ Error store_string_at_path(const String &p_path, const String &p_data);
 Error rename_and_store_file_in_gradle_project(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total, const Vector<String> &p_enc_in_filters, const Vector<String> &p_enc_ex_filters, const Vector<uint8_t> &p_key, uint64_t p_seed);
 
 // Creates strings.xml files inside the gradle project for different locales.
-Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &project_name, const String &p_gradle_build_dir);
+Error _create_project_name_strings_files(const Ref<EditorExportPreset> &p_preset, const String &p_project_name, const String &p_gradle_build_dir, const Dictionary &p_appnames);
 
 String bool_to_string(bool v);
 
@@ -106,6 +110,4 @@ String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset);
 
 String _get_activity_tag(const Ref<EditorExportPlatform> &p_export_platform, const Ref<EditorExportPreset> &p_preset, bool p_debug);
 
-String _get_application_tag(const Ref<EditorExportPlatform> &p_export_platform, const Ref<EditorExportPreset> &p_preset, bool p_has_read_write_storage_permission, bool p_debug);
-
-#endif // ANDROID_GRADLE_EXPORT_UTIL_H
+String _get_application_tag(const Ref<EditorExportPlatform> &p_export_platform, const Ref<EditorExportPreset> &p_preset, bool p_has_read_write_storage_permission, bool p_debug, const Vector<MetadataInfo> &p_metadata);
diff --git a/engine/platform/android/export/logo.svg b/engine/platform/android/export/logo.svg
index 208a89e1..f4d7dbc3 100644
--- a/engine/platform/android/export/logo.svg
+++ b/engine/platform/android/export/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#56d881" d="M22.904 20.192a1.25 1.25 0 1 1 1.25-1.25 1.25 1.25 0 0 1-1.25 1.25m-13.808 0a1.25 1.25 0 1 1 1.25-1.25 1.25 1.25 0 0 1-1.25 1.25m14.256-7.525 2.496-4.323a.52.52 0 1 0-.899-.52l-2.528 4.378a15.69 15.69 0 0 0-12.842 0L7.051 7.823a.52.52 0 1 0-.9.521l2.497 4.323C4.361 15 1.43 19.34 1 24.467h30c-.43-5.128-3.361-9.468-7.648-11.8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#56d881" d="M22.904 20.192a1.25 1.25 0 1 1 1.25-1.25 1.25 1.25 0 0 1-1.25 1.25m-13.808 0a1.25 1.25 0 1 1 1.25-1.25 1.25 1.25 0 0 1-1.25 1.25m14.256-7.525 2.496-4.323a.52.52 0 1 0-.899-.52l-2.528 4.378a15.69 15.69 0 0 0-12.842 0L7.051 7.823a.52.52 0 1 0-.9.521l2.497 4.323C4.361 15 1.43 19.34 1 24.467h30c-.43-5.128-3.361-9.468-7.648-11.8"/></svg>
diff --git a/engine/platform/android/export/run_icon.svg b/engine/platform/android/export/run_icon.svg
index 4e56391d..05dae67b 100644
--- a/engine/platform/android/export/run_icon.svg
+++ b/engine/platform/android/export/run_icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M11.187 9.936a.577.577 0 1 1 .578-.578.577.577 0 0 1-.578.578m-6.374 0a.577.577 0 1 1 .577-.578.577.577 0 0 1-.577.578m6.581-3.475 1.153-1.996a.24.24 0 1 0-.415-.24l-1.167 2.021a7.244 7.244 0 0 0-5.93 0L3.868 4.225a.24.24 0 1 0-.415.24l1.153 1.996a6.806 6.806 0 0 0-3.532 5.448h13.852a6.807 6.807 0 0 0-3.532-5.448"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M11.187 9.936a.577.577 0 1 1 .578-.578.577.577 0 0 1-.578.578m-6.374 0a.577.577 0 1 1 .577-.578.577.577 0 0 1-.577.578m6.581-3.475 1.153-1.996a.24.24 0 1 0-.415-.24l-1.167 2.021a7.244 7.244 0 0 0-5.93 0L3.868 4.225a.24.24 0 1 0-.415.24l1.153 1.996a6.806 6.806 0 0 0-3.532 5.448h13.852a6.807 6.807 0 0 0-3.532-5.448"/></svg>
diff --git a/engine/platform/android/file_access_android.cpp b/engine/platform/android/file_access_android.cpp
index da49c3e7..c57206ce 100644
--- a/engine/platform/android/file_access_android.cpp
+++ b/engine/platform/android/file_access_android.cpp
@@ -53,9 +53,9 @@ Error FileAccessAndroid::open_internal(const String &p_path, int p_mode_flags) {
 	String path = fix_path(p_path).simplify_path();
 	absolute_path = path;
 	if (path.begins_with("/")) {
-		path = path.substr(1, path.length());
+		path = path.substr(1);
 	} else if (path.begins_with("res://")) {
-		path = path.substr(6, path.length());
+		path = path.substr(6);
 	}
 
 	ERR_FAIL_COND_V(p_mode_flags & FileAccess::WRITE, ERR_UNAVAILABLE); //can't write on android..
@@ -132,6 +132,10 @@ uint64_t FileAccessAndroid::get_buffer(uint8_t *p_dst, uint64_t p_length) const
 	return r;
 }
 
+int64_t FileAccessAndroid::_get_size(const String &p_file) {
+	return AAsset_getLength64(asset);
+}
+
 Error FileAccessAndroid::get_error() const {
 	return eof ? ERR_FILE_EOF : OK; // not sure what else it may happen
 }
@@ -147,9 +151,9 @@ bool FileAccessAndroid::store_buffer(const uint8_t *p_src, uint64_t p_length) {
 bool FileAccessAndroid::file_exists(const String &p_path) {
 	String path = fix_path(p_path).simplify_path();
 	if (path.begins_with("/")) {
-		path = path.substr(1, path.length());
+		path = path.substr(1);
 	} else if (path.begins_with("res://")) {
-		path = path.substr(6, path.length());
+		path = path.substr(6);
 	}
 
 	AAsset *at = AAssetManager_open(asset_manager, path.utf8().get_data(), AASSET_MODE_STREAMING);
diff --git a/engine/platform/android/file_access_android.h b/engine/platform/android/file_access_android.h
index b411f747..2d5744e8 100644
--- a/engine/platform/android/file_access_android.h
+++ b/engine/platform/android/file_access_android.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_ANDROID_H
-#define FILE_ACCESS_ANDROID_H
+#pragma once
 
 #include "core/io/file_access.h"
 
@@ -39,6 +38,7 @@
 #include <stdio.h>
 
 class FileAccessAndroid : public FileAccess {
+	GDSOFTCLASS(FileAccessAndroid, FileAccess);
 	static AAssetManager *asset_manager;
 	static jobject j_asset_manager;
 
@@ -78,6 +78,8 @@ public:
 	virtual bool file_exists(const String &p_path) override; // return true if a file exists
 
 	virtual uint64_t _get_modified_time(const String &p_file) override { return 0; }
+	virtual uint64_t _get_access_time(const String &p_file) override { return 0; }
+	virtual int64_t _get_size(const String &p_file) override;
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override { return 0; }
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override { return ERR_UNAVAILABLE; }
 
@@ -94,5 +96,3 @@ public:
 
 	~FileAccessAndroid();
 };
-
-#endif // FILE_ACCESS_ANDROID_H
diff --git a/engine/platform/android/file_access_filesystem_jandroid.cpp b/engine/platform/android/file_access_filesystem_jandroid.cpp
index 5a1d85a6..d437c011 100644
--- a/engine/platform/android/file_access_filesystem_jandroid.cpp
+++ b/engine/platform/android/file_access_filesystem_jandroid.cpp
@@ -53,7 +53,9 @@ jmethodID FileAccessFilesystemJAndroid::_file_write = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_flush = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_exists = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_last_modified = nullptr;
+jmethodID FileAccessFilesystemJAndroid::_file_last_accessed = nullptr;
 jmethodID FileAccessFilesystemJAndroid::_file_resize = nullptr;
+jmethodID FileAccessFilesystemJAndroid::_file_size = nullptr;
 
 String FileAccessFilesystemJAndroid::get_path() const {
 	return path_src;
@@ -201,7 +203,7 @@ String FileAccessFilesystemJAndroid::get_line() const {
 			if (elem == '\n' || elem == '\0') {
 				// Found the end of the line
 				const_cast<FileAccessFilesystemJAndroid *>(this)->seek(start_position + line_buffer_position + 1);
-				if (result.parse_utf8((const char *)line_buffer.ptr(), line_buffer_position, true)) {
+				if (result.append_utf8((const char *)line_buffer.ptr(), line_buffer_position, true)) {
 					return String();
 				}
 				return result;
@@ -209,7 +211,7 @@ String FileAccessFilesystemJAndroid::get_line() const {
 		}
 	}
 
-	if (result.parse_utf8((const char *)line_buffer.ptr(), line_buffer_position, true)) {
+	if (result.append_utf8((const char *)line_buffer.ptr(), line_buffer_position, true)) {
 		return String();
 	}
 	return result;
@@ -300,7 +302,7 @@ bool FileAccessFilesystemJAndroid::file_exists(const String &p_path) {
 uint64_t FileAccessFilesystemJAndroid::_get_modified_time(const String &p_file) {
 	if (_file_last_modified) {
 		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL_V(env, false);
+		ERR_FAIL_NULL_V(env, 0);
 
 		String path = fix_path(p_file).simplify_path();
 		jstring js = env->NewStringUTF(path.utf8().get_data());
@@ -312,6 +314,36 @@ uint64_t FileAccessFilesystemJAndroid::_get_modified_time(const String &p_file)
 	}
 }
 
+uint64_t FileAccessFilesystemJAndroid::_get_access_time(const String &p_file) {
+	if (_file_last_accessed) {
+		JNIEnv *env = get_jni_env();
+		ERR_FAIL_NULL_V(env, 0);
+
+		String path = fix_path(p_file).simplify_path();
+		jstring js = env->NewStringUTF(path.utf8().get_data());
+		uint64_t result = env->CallLongMethod(file_access_handler, _file_last_accessed, js);
+		env->DeleteLocalRef(js);
+		return result;
+	} else {
+		return 0;
+	}
+}
+
+int64_t FileAccessFilesystemJAndroid::_get_size(const String &p_file) {
+	if (_file_size) {
+		JNIEnv *env = get_jni_env();
+		ERR_FAIL_NULL_V(env, -1);
+
+		String path = fix_path(p_file).simplify_path();
+		jstring js = env->NewStringUTF(path.utf8().get_data());
+		int64_t result = env->CallLongMethod(file_access_handler, _file_size, js);
+		env->DeleteLocalRef(js);
+		return result;
+	} else {
+		return -1;
+	}
+}
+
 void FileAccessFilesystemJAndroid::setup(jobject p_file_access_handler) {
 	JNIEnv *env = get_jni_env();
 	file_access_handler = env->NewGlobalRef(p_file_access_handler);
@@ -332,7 +364,9 @@ void FileAccessFilesystemJAndroid::setup(jobject p_file_access_handler) {
 	_file_flush = env->GetMethodID(cls, "fileFlush", "(I)V");
 	_file_exists = env->GetMethodID(cls, "fileExists", "(Ljava/lang/String;)Z");
 	_file_last_modified = env->GetMethodID(cls, "fileLastModified", "(Ljava/lang/String;)J");
+	_file_last_accessed = env->GetMethodID(cls, "fileLastAccessed", "(Ljava/lang/String;)J");
 	_file_resize = env->GetMethodID(cls, "fileResize", "(IJ)I");
+	_file_size = env->GetMethodID(cls, "fileSize", "(Ljava/lang/String;)J");
 }
 
 void FileAccessFilesystemJAndroid::terminate() {
diff --git a/engine/platform/android/file_access_filesystem_jandroid.h b/engine/platform/android/file_access_filesystem_jandroid.h
index f54a8e9d..03b66d48 100644
--- a/engine/platform/android/file_access_filesystem_jandroid.h
+++ b/engine/platform/android/file_access_filesystem_jandroid.h
@@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_ACCESS_FILESYSTEM_JANDROID_H
-#define FILE_ACCESS_FILESYSTEM_JANDROID_H
+#pragma once
 
 #include "java_godot_lib_jni.h"
 
 #include "core/io/file_access.h"
 
 class FileAccessFilesystemJAndroid : public FileAccess {
+	GDSOFTCLASS(FileAccessFilesystemJAndroid, FileAccess);
 	static jobject file_access_handler;
 	static jclass cls;
 
@@ -52,7 +52,9 @@ class FileAccessFilesystemJAndroid : public FileAccess {
 	static jmethodID _file_close;
 	static jmethodID _file_exists;
 	static jmethodID _file_last_modified;
+	static jmethodID _file_last_accessed;
 	static jmethodID _file_resize;
+	static jmethodID _file_size;
 
 	int id;
 	String absolute_path;
@@ -92,6 +94,8 @@ public:
 	static void terminate();
 
 	virtual uint64_t _get_modified_time(const String &p_file) override;
+	virtual uint64_t _get_access_time(const String &p_file) override;
+	virtual int64_t _get_size(const String &p_file) override;
 	virtual BitField<FileAccess::UnixPermissionFlags> _get_unix_permissions(const String &p_file) override { return 0; }
 	virtual Error _set_unix_permissions(const String &p_file, BitField<FileAccess::UnixPermissionFlags> p_permissions) override { return ERR_UNAVAILABLE; }
 
@@ -105,5 +109,3 @@ public:
 	FileAccessFilesystemJAndroid();
 	~FileAccessFilesystemJAndroid();
 };
-
-#endif // FILE_ACCESS_FILESYSTEM_JANDROID_H
diff --git a/engine/platform/android/game_menu_utils_jni.cpp b/engine/platform/android/game_menu_utils_jni.cpp
index 5ff8f712..e56ad3d5 100644
--- a/engine/platform/android/game_menu_utils_jni.cpp
+++ b/engine/platform/android/game_menu_utils_jni.cpp
@@ -133,4 +133,13 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_GameMenuUtils_playMainSc
 	}
 #endif
 }
+
+JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_GameMenuUtils_setDebugMuteAudio(JNIEnv *env, jclass clazz, jboolean enabled) {
+#ifdef TOOLS_ENABLED
+	GameViewPlugin *game_view_plugin = _get_game_view_plugin();
+	if (game_view_plugin != nullptr && game_view_plugin->get_debugger().is_valid()) {
+		game_view_plugin->get_debugger()->set_debug_mute_audio(enabled);
+	}
+#endif
+}
 }
diff --git a/engine/platform/android/game_menu_utils_jni.h b/engine/platform/android/game_menu_utils_jni.h
index 4f2a11f4..d8412a08 100644
--- a/engine/platform/android/game_menu_utils_jni.h
+++ b/engine/platform/android/game_menu_utils_jni.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GAME_MENU_UTILS_JNI_H
-#define GAME_MENU_UTILS_JNI_H
+#pragma once
 
 #include <jni.h>
 
@@ -44,6 +43,5 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_GameMenuUtils_setCameraM
 JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_GameMenuUtils_resetCamera2DPosition(JNIEnv *env, jclass clazz);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_GameMenuUtils_resetCamera3DPosition(JNIEnv *env, jclass clazz);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_GameMenuUtils_playMainScene(JNIEnv *env, jclass clazz);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_utils_GameMenuUtils_setDebugMuteAudio(JNIEnv *env, jclass clazz, jboolean enabled);
 }
-
-#endif // GAME_MENU_UTILS_JNI_H
diff --git a/engine/platform/android/java/app/AndroidManifest.xml b/engine/platform/android/java/app/AndroidManifest.xml
index 60ce75fd..e99aaa4a 100644
--- a/engine/platform/android/java/app/AndroidManifest.xml
+++ b/engine/platform/android/java/app/AndroidManifest.xml
@@ -29,15 +29,6 @@
             android:enabled="true"
             tools:targetApi="29" />
 
-        <!-- Records the version of the Godot editor used for building -->
-        <meta-data
-            android:name="org.godotengine.editor.version"
-            android:value="${godotEditorVersion}" />
-        <!-- Records the rendering method used by the Godot engine -->
-        <meta-data
-            android:name="org.godotengine.rendering.method"
-            android:value="${godotRenderingMethod}"/>
-
         <activity
             android:name=".GodotApp"
             android:label="@string/godot_project_name_string"
@@ -46,7 +37,7 @@
             android:excludeFromRecents="false"
             android:exported="true"
             android:screenOrientation="landscape"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
+            android:configChanges="layoutDirection|locale|orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
             android:resizeableActivity="false"
             tools:ignore="UnusedAttribute" >
 
diff --git a/engine/platform/android/java/app/build.gradle b/engine/platform/android/java/app/build.gradle
index d4c62dad..a3d1a715 100644
--- a/engine/platform/android/java/app/build.gradle
+++ b/engine/platform/android/java/app/build.gradle
@@ -105,11 +105,6 @@ android {
             abiFilters export_abi_list
         }
 
-        manifestPlaceholders = [
-            godotEditorVersion: getGodotEditorVersion(),
-            godotRenderingMethod: getGodotRenderingMethod()
-        ]
-
         // Feel free to modify the application id to your own.
         applicationId getExportPackageName()
         versionCode getExportVersionCode()
diff --git a/engine/platform/android/java/app/config.gradle b/engine/platform/android/java/app/config.gradle
index 52c47c5d..af32a0de 100644
--- a/engine/platform/android/java/app/config.gradle
+++ b/engine/platform/android/java/app/config.gradle
@@ -71,25 +71,6 @@ ext.getExportTargetSdkVersion = { ->
     }
 }
 
-ext.getGodotRenderingMethod = { ->
-    String renderingMethod = project.hasProperty("godot_rendering_method") ? project.property("godot_rendering_method") : ""
-    return renderingMethod
-}
-
-ext.getGodotEditorVersion = { ->
-    String editorVersion = project.hasProperty("godot_editor_version") ? project.property("godot_editor_version") : ""
-    if (editorVersion == null || editorVersion.isEmpty()) {
-        // Try the library version first
-        editorVersion = getGodotLibraryVersionName()
-
-        if (editorVersion.isEmpty()) {
-            // Fallback value.
-            editorVersion = "custom_build"
-        }
-    }
-    return editorVersion
-}
-
 ext.getGodotLibraryVersionCode = { ->
     String versionName = ""
     int versionCode = 1
diff --git a/engine/platform/android/java/editor/src/horizonos/AndroidManifest.xml b/engine/platform/android/java/editor/src/horizonos/AndroidManifest.xml
index 3f2b87e0..3db83340 100644
--- a/engine/platform/android/java/editor/src/horizonos/AndroidManifest.xml
+++ b/engine/platform/android/java/editor/src/horizonos/AndroidManifest.xml
@@ -90,6 +90,8 @@
         <!-- Enable passthrough background during the splash screen -->
         <meta-data android:name="com.oculus.ossplash.background" android:value="passthrough-contextual"/>
 
+        <meta-data android:name="com.oculus.handtracking.version" android:value="V2.0" />
+
     </application>
 
 </manifest>
diff --git a/engine/platform/android/java/editor/src/main/AndroidManifest.xml b/engine/platform/android/java/editor/src/main/AndroidManifest.xml
index a1971554..b136e348 100644
--- a/engine/platform/android/java/editor/src/main/AndroidManifest.xml
+++ b/engine/platform/android/java/editor/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
 
         <activity
             android:name=".GodotEditor"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
+            android:configChanges="layoutDirection|locale|orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
             android:exported="true"
             android:icon="@mipmap/themed_icon"
             android:launchMode="singleTask"
@@ -59,7 +59,7 @@
         </activity>
         <activity
             android:name=".GodotGame"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
+            android:configChanges="layoutDirection|locale|orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
             android:exported="false"
             android:icon="@mipmap/ic_play_window"
             android:label="@string/godot_game_activity_name"
@@ -74,7 +74,7 @@
         </activity>
         <activity
             android:name=".embed.EmbeddedGodotGame"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
+            android:configChanges="layoutDirection|locale|orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
             android:exported="false"
             android:icon="@mipmap/ic_play_window"
             android:label="@string/godot_game_activity_name"
@@ -87,7 +87,7 @@
             android:screenOrientation="userLandscape" />
         <activity
             android:name=".GodotXRGame"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
+            android:configChanges="layoutDirection|locale|orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
             android:process=":GodotXRGame"
             android:launchMode="singleTask"
             android:icon="@mipmap/ic_play_window"
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
index 4a7612c2..13ce53eb 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotEditor.kt
@@ -37,7 +37,11 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.*
+import android.os.Build
+import android.os.Bundle
+import android.os.Debug
+import android.os.Environment
+import android.os.Process
 import android.preference.PreferenceManager
 import android.util.Log
 import android.view.View
@@ -138,6 +142,7 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		internal const val GAME_MENU_ACTION_RESET_CAMERA_2D_POSITION = "resetCamera2DPosition"
 		internal const val GAME_MENU_ACTION_RESET_CAMERA_3D_POSITION = "resetCamera3DPosition"
 		internal const val GAME_MENU_ACTION_EMBED_GAME_ON_PLAY = "embedGameOnPlay"
+		internal const val GAME_MENU_ACTION_SET_DEBUG_MUTE_AUDIO = "setDebugMuteAudio"
 
 		private const val GAME_WORKSPACE = "Game"
 
@@ -258,12 +263,14 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		super.onGodotSetupCompleted()
 		val longPressEnabled = enableLongPressGestures()
 		val panScaleEnabled = enablePanAndScaleGestures()
+		val overrideVolumeButtonsEnabled = overrideVolumeButtons()
 
 		runOnUiThread {
 			// Enable long press, panning and scaling gestures
 			godotFragment?.godot?.renderView?.inputHandler?.apply {
 				enableLongPress(longPressEnabled)
 				enablePanningAndScalingGestures(panScaleEnabled)
+				setOverrideVolumeButtons(overrideVolumeButtonsEnabled)
 			}
 		}
 	}
@@ -482,12 +489,19 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 	 */
 	protected open fun overrideOrientationRequest() = true
 
+	protected open fun overrideVolumeButtons() = false
+
 	/**
 	 * Enable long press gestures for the Godot Android editor.
 	 */
 	protected open fun enableLongPressGestures() =
 		java.lang.Boolean.parseBoolean(GodotLib.getEditorSetting("interface/touchscreen/enable_long_press_as_right_click"))
 
+	/**
+	 * Disable scroll deadzone for the Godot Android editor.
+	 */
+	protected open fun disableScrollDeadzone() = true
+
 	/**
 	 * Enable pan and scale gestures for the Godot Android editor.
 	 */
@@ -749,6 +763,10 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 				val embedded = actionData.getBoolean(KEY_GAME_MENU_ACTION_PARAM1)
 				embedGameOnPlay(embedded)
 			}
+			GAME_MENU_ACTION_SET_DEBUG_MUTE_AUDIO -> {
+				val enabled = actionData.getBoolean(KEY_GAME_MENU_ACTION_PARAM1)
+				muteAudio(enabled)
+			}
 		}
 	}
 
@@ -812,6 +830,13 @@ abstract class BaseGodotEditor : GodotActivity(), GameMenuFragment.GameMenuListe
 		}
 	}
 
+	override fun muteAudio(enabled: Boolean) {
+		gameMenuState.putBoolean(GAME_MENU_ACTION_SET_DEBUG_MUTE_AUDIO, enabled)
+		godot?.runOnRenderThread {
+			GameMenuUtils.setDebugMuteAudio(enabled)
+		}
+	}
+
 	override fun embedGameOnPlay(embedded: Boolean) {
 		gameMenuState.putBoolean(GAME_MENU_ACTION_EMBED_GAME_ON_PLAY, embedded)
 		godot?.runOnRenderThread {
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotGame.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotGame.kt
index ed1ecb85..3c3837bd 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotGame.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/BaseGodotGame.kt
@@ -46,10 +46,14 @@ abstract class BaseGodotGame: GodotEditor() {
 		private val TAG = BaseGodotGame::class.java.simpleName
 	}
 
+	override fun overrideVolumeButtons() = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/override_volume_buttons"))
+
 	override fun enableLongPressGestures() = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_long_press_as_right_click"))
 
 	override fun enablePanAndScaleGestures() = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_pan_and_scale_gestures"))
 
+	override fun disableScrollDeadzone() = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/disable_scroll_deadzone"))
+
 	override fun onGodotSetupCompleted() {
 		super.onGodotSetupCompleted()
 		Log.v(TAG, "OnGodotSetupCompleted")
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt
index 2f0a45f9..4172ba61 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt
@@ -206,6 +206,14 @@ open class GodotGame : BaseGodotGame() {
 		editorMessageDispatcher.dispatchGameMenuAction(EDITOR_MAIN_INFO, actionBundle)
 	}
 
+	override fun muteAudio(enabled: Boolean) {
+		val actionBundle = Bundle().apply {
+			putString(KEY_GAME_MENU_ACTION, GAME_MENU_ACTION_SET_DEBUG_MUTE_AUDIO)
+			putBoolean(KEY_GAME_MENU_ACTION_PARAM1, enabled)
+		}
+		editorMessageDispatcher.dispatchGameMenuAction(EDITOR_MAIN_INFO, actionBundle)
+	}
+
 	override fun embedGameOnPlay(embedded: Boolean) {
 		val actionBundle = Bundle().apply {
 			putString(KEY_GAME_MENU_ACTION, GAME_MENU_ACTION_EMBED_GAME_ON_PLAY)
diff --git a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt
index 9559bcd4..0c3c76a3 100644
--- a/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt
+++ b/engine/platform/android/java/editor/src/main/java/org/godotengine/editor/embed/GameMenuFragment.kt
@@ -101,6 +101,7 @@ class GameMenuFragment : Fragment(), PopupMenu.OnMenuItemClickListener {
 		fun reset2DCamera()
 		fun reset3DCamera()
 		fun manipulateCamera(mode: CameraMode)
+		fun muteAudio(enabled: Boolean)
 
 		fun isGameEmbeddingSupported(): Boolean
 		fun embedGameOnPlay(embedded: Boolean)
@@ -148,6 +149,9 @@ class GameMenuFragment : Fragment(), PopupMenu.OnMenuItemClickListener {
 	private val listSelectButton: RadioButton? by lazy {
 		view?.findViewById(R.id.game_menu_list_select_button)
 	}
+	private val audioMuteButton: View? by lazy {
+		view?.findViewById(R.id.game_menu_audio_mute_button)
+	}
 	private val optionsButton: View? by lazy {
 		view?.findViewById(R.id.game_menu_options_button)
 	}
@@ -319,6 +323,13 @@ class GameMenuFragment : Fragment(), PopupMenu.OnMenuItemClickListener {
 				}
 			}
 		}
+		audioMuteButton?.apply{
+			setOnClickListener {
+				val isActivated = !it.isActivated
+				menuListener?.muteAudio(isActivated)
+				it.isActivated = isActivated
+			}
+		}
 		optionsButton?.setOnClickListener {
 			popupMenu.show()
 		}
@@ -351,6 +362,8 @@ class GameMenuFragment : Fragment(), PopupMenu.OnMenuItemClickListener {
 		toolSelectButton?.isChecked = selectMode == GameMenuListener.SelectMode.SINGLE
 		listSelectButton?.isChecked = selectMode == GameMenuListener.SelectMode.LIST
 
+		audioMuteButton?.isActivated = gameMenuState.getBoolean(BaseGodotEditor.GAME_MENU_ACTION_SET_DEBUG_MUTE_AUDIO, false)
+
 		popupMenu.menu.apply {
 			if (menuListener?.isGameEmbeddingSupported() == false) {
 				setGroupEnabled(R.id.group_menu_embed_options, false)
diff --git a/engine/platform/android/java/editor/src/main/res/drawable/audio_player.xml b/engine/platform/android/java/editor/src/main/res/drawable/audio_player.xml
new file mode 100644
index 00000000..cad4f24e
--- /dev/null
+++ b/engine/platform/android/java/editor/src/main/res/drawable/audio_player.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="2.4"
+    android:viewportHeight="2.4">
+
+    <path
+        android:pathData="M1.252 0.15 a0.1 0.1 0 0 0-0.082 0.03 L0.6 0.75 H0.318C0.225 0.75 0.15 0.817 0.15 0.9 v0.6c0 0.083 0.075 0.15 0.168 0.15H0.6l0.57 0.57 c0.066 0.067 0.18 0.02 0.18-0.074V0.256A0.106 0.106 0 0 0 1.252 0.15"
+        android:fillColor="@color/game_menu_icons_color_state"/>
+    <path
+        android:strokeWidth=".165"
+        android:strokeLineCap="round"
+        android:pathData="M1.575 0.675 c0.45 0.525 0 1.05 0 1.05m0.3-1.35c0.675 0.825 0 1.65 0 1.65"
+        android:strokeColor="@color/game_menu_icons_color_state"/>
+</vector>
diff --git a/engine/platform/android/java/editor/src/main/res/drawable/audio_player_icon_selector.xml b/engine/platform/android/java/editor/src/main/res/drawable/audio_player_icon_selector.xml
new file mode 100644
index 00000000..237fa08f
--- /dev/null
+++ b/engine/platform/android/java/editor/src/main/res/drawable/audio_player_icon_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/audio_player_muted" android:state_activated="true" />
+    <item android:drawable="@drawable/audio_player" />
+</selector>
diff --git a/engine/platform/android/java/editor/src/main/res/drawable/audio_player_muted.xml b/engine/platform/android/java/editor/src/main/res/drawable/audio_player_muted.xml
new file mode 100644
index 00000000..06831891
--- /dev/null
+++ b/engine/platform/android/java/editor/src/main/res/drawable/audio_player_muted.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="2.4"
+    android:viewportHeight="2.4">
+
+    <path
+        android:pathData="M 1.2518555 0.15 A 0.1 0.1 0 0 0 1.1701172 0.17988281 L 0.6 0.75 L 0.31787109 0.75 C 0.22487119 0.75 0.15 0.81700008 0.15 0.9 L 0.15 1.5 C 0.15 1.5424221 0.16969512 1.5805593 0.20126953 1.6078125 L 1.35 0.45527344 L 1.35 0.25605469 A 0.106 0.106 0 0 0 1.2518555 0.15 z M 1.35 1.6438477 L 0.97236328 2.0223633 L 1.1701172 2.2201172 C 1.2361171 2.2871171 1.35 2.239996 1.35 2.1459961 L 1.35 1.6438477 z"
+        android:fillColor="@color/game_menu_icons_color_state"/>
+    <path
+        android:pathData="M 2.1984375 0.79306641 L 2.0660156 0.92578125 C 2.1142629 1.1320246 2.0935608 1.3239034 2.0487305 1.4882812 C 1.9692536 1.7796963 1.8105469 1.9725586 1.8105469 1.9725586 A 0.0825 0.0825 0 0 0 1.8222656 2.0879883 A 0.0825 0.0825 0 0 0 1.9394531 2.0780273 C 1.9394531 2.0780273 2.1176607 1.8586814 2.2069336 1.5313477 C 2.2638362 1.3227069 2.2834498 1.0648044 2.1984375 0.79306641 z M 1.8539062 1.1384766 L 1.6790039 1.3136719 C 1.6747238 1.3346601 1.6697313 1.3550615 1.6640625 1.3749023 C 1.6131343 1.5531513 1.5117188 1.6719727 1.5117187 1.6719727 A 0.0825 0.0825 0 0 0 1.5213867 1.7871094 A 0.0825 0.0825 0 0 0 1.6368164 1.7791992 C 1.6368164 1.7791992 1.7606941 1.6355198 1.8222656 1.4200195 C 1.8460259 1.3368593 1.8597024 1.2410136 1.8539062 1.1384766 z"
+        android:fillColor="@color/game_menu_icons_color_state"/>
+    <path
+        android:pathData="M0.08295 2.0529 2.0502 0.07965 2.31705 0.34725 0.34965 2.32035ZM-1.2804596 3.0939027 3.0879072-1.2877874Z"
+        android:fillColor="#fc7f7f"/>
+</vector>
diff --git a/engine/platform/android/java/editor/src/main/res/layout/game_menu_fragment_layout.xml b/engine/platform/android/java/editor/src/main/res/layout/game_menu_fragment_layout.xml
index ffa5692d..5160bea7 100644
--- a/engine/platform/android/java/editor/src/main/res/layout/game_menu_fragment_layout.xml
+++ b/engine/platform/android/java/editor/src/main/res/layout/game_menu_fragment_layout.xml
@@ -128,6 +128,15 @@
 					android:drawableStart="@drawable/list_select"
 					android:padding="15dp" />
 			</RadioGroup>
+
+			<ImageButton
+				android:id="@+id/game_menu_audio_mute_button"
+				style="?android:attr/borderlessButtonStyle"
+				android:layout_width="48dp"
+				android:layout_height="48dp"
+				android:background="@drawable/game_menu_button_bg"
+				android:src="@drawable/audio_player_icon_selector" />
+
 		</LinearLayout>
 	</HorizontalScrollView>
 
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
index 550fbe94..52e90bba 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/Godot.kt
@@ -77,7 +77,6 @@ import org.godotengine.godot.xr.XRMode
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
-import java.lang.Exception
 import java.security.MessageDigest
 import java.util.*
 import java.util.concurrent.atomic.AtomicBoolean
@@ -714,11 +713,15 @@ class Godot(private val context: Context) {
 		val longPressEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_long_press_as_right_click"))
 		val panScaleEnabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/enable_pan_and_scale_gestures"))
 		val rotaryInputAxisValue = GodotLib.getGlobal("input_devices/pointing/android/rotary_input_scroll_axis")
+		val overrideVolumeButtons = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/override_volume_buttons"))
+		val scrollDeadzoneDisabled = java.lang.Boolean.parseBoolean(GodotLib.getGlobal("input_devices/pointing/android/disable_scroll_deadzone"))
 
 		runOnUiThread {
 			renderView?.inputHandler?.apply {
 				enableLongPress(longPressEnabled)
 				enablePanningAndScalingGestures(panScaleEnabled)
+				setOverrideVolumeButtons(overrideVolumeButtons)
+				disableScrollDeadzone(scrollDeadzoneDisabled)
 				try {
 					setRotaryInputAxis(Integer.parseInt(rotaryInputAxisValue))
 				} catch (e: NumberFormatException) {
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java b/engine/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java
index d70915a9..5e599432 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java
@@ -268,6 +268,11 @@ public class GodotLib {
 	 */
 	public static native void onNightModeChanged();
 
+	/**
+	 * Invoked on the hardware keyboard connected/disconnected.
+	 */
+	public static native void hardwareKeyboardConnected(boolean connected);
+
 	/**
 	 * Invoked on the file picker closed.
 	 */
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java b/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
index cacc1643..68f5ffd3 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java
@@ -265,13 +265,6 @@ public class GodotEditText extends EditText {
 	}
 
 	public boolean hasHardwareKeyboard() {
-		Configuration config = getResources().getConfiguration();
-		boolean hasHardwareKeyboardConfig = config.keyboard != Configuration.KEYBOARD_NOKEYS &&
-				config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO;
-		if (hasHardwareKeyboardConfig) {
-			return true;
-		}
-
 		return mRenderView.getInputHandler().hasHardwareKeyboard();
 	}
 
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
index 2929a0a0..037898cd 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt
@@ -55,6 +55,8 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 	 */
 	var panningAndScalingEnabled = false
 
+	var scrollDeadzoneDisabled = false
+
 	private var nextDownIsDoubleTap = false
 	private var dragInProgress = false
 	private var scaleInProgress = false
@@ -153,7 +155,7 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 		if (contextClickInProgress) {
 			inputHandler.handleMouseEvent(event, event.actionMasked, MotionEvent.BUTTON_SECONDARY, false)
 			return true
-		} else if (!scaleInProgress) {
+		} else if (scrollDeadzoneDisabled && !scaleInProgress) {
 			// The 'onScroll' event is triggered with a long delay.
 			// Force the 'InputEventScreenDrag' event earlier here.
 			// We don't toggle 'dragInProgress' here so that the scaling logic can override the drag operation if needed.
@@ -191,7 +193,7 @@ internal class GodotGestureHandler(private val inputHandler: GodotInputHandler)
 		distanceY: Float
 	): Boolean {
 		if (scaleInProgress) {
-			if (dragInProgress || lastDragX != 0.0f || lastDragY != 0.0f) {
+			if (dragInProgress || (scrollDeadzoneDisabled && (lastDragX != 0.0f || lastDragY != 0.0f))) {
 				if (originEvent != null) {
 					// Cancel the drag
 					inputHandler.handleMotionEvent(originEvent, MotionEvent.ACTION_CANCEL)
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
index 6f036c15..8ea2414c 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java
@@ -59,6 +59,7 @@ import androidx.annotation.NonNull;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Handles input related events for the {@link GodotRenderView} view.
@@ -83,11 +84,13 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 	/**
 	 * Used to decide whether mouse capture can be enabled.
 	 */
-	private int lastSeenToolType = MotionEvent.TOOL_TYPE_UNKNOWN;
+	private AtomicInteger lastSeenToolType = new AtomicInteger(MotionEvent.TOOL_TYPE_UNKNOWN);
 
 	private int rotaryInputAxis = ROTARY_INPUT_VERTICAL_AXIS;
 
 	private int cachedRotation = -1;
+	private boolean overrideVolumeButtons = false;
+	private boolean hasHardwareKeyboardConfig = false;
 
 	public GodotInputHandler(Context context, Godot godot) {
 		this.godot = godot;
@@ -103,6 +106,9 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			this.scaleGestureDetector.setStylusScaleEnabled(true);
 		}
+		Configuration config = context.getResources().getConfiguration();
+		hasHardwareKeyboardConfig = config.keyboard != Configuration.KEYBOARD_NOKEYS &&
+				config.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO;
 	}
 
 	/**
@@ -112,6 +118,13 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 		this.gestureDetector.setIsLongpressEnabled(enable);
 	}
 
+	/**
+	 * Disable scroll deadzone. This is false by default.
+	 */
+	public void disableScrollDeadzone(boolean disable) {
+		this.godotGestureHandler.setScrollDeadzoneDisabled(disable);
+	}
+
 	/**
 	 * Enable multi-fingers pan & scale gestures. This is false by default.
 	 * <p>
@@ -136,7 +149,14 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 		rotaryInputAxis = axis;
 	}
 
+	public void setOverrideVolumeButtons(boolean value) {
+		overrideVolumeButtons = value;
+	}
+
 	boolean hasHardwareKeyboard() {
+		if (hasHardwareKeyboardConfig) {
+			return true;
+		}
 		return !mHardwareKeyboardIds.isEmpty();
 	}
 
@@ -149,7 +169,8 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 	}
 
 	public boolean canCapturePointer() {
-		return lastSeenToolType == MotionEvent.TOOL_TYPE_MOUSE;
+		return lastSeenToolType.get() == MotionEvent.TOOL_TYPE_MOUSE ||
+				lastSeenToolType.get() == MotionEvent.TOOL_TYPE_UNKNOWN;
 	}
 
 	public void onPointerCaptureChange(boolean hasCapture) {
@@ -157,10 +178,6 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 	}
 
 	public boolean onKeyUp(final int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-			return false;
-		}
-
 		int source = event.getSource();
 		if (isKeyEventGameDevice(source)) {
 			// Check if the device exists
@@ -178,14 +195,14 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 			handleKeyEvent(physical_keycode, unicode, key_label, false, event.getRepeatCount() > 0);
 		};
 
+		if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+			return overrideVolumeButtons;
+		}
+
 		return true;
 	}
 
 	public boolean onKeyDown(final int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
-			return false;
-		}
-
 		int source = event.getSource();
 
 		final int deviceId = event.getDeviceId();
@@ -206,11 +223,15 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 			handleKeyEvent(physical_keycode, unicode, key_label, true, event.getRepeatCount() > 0);
 		}
 
+		if (keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
+			return overrideVolumeButtons;
+		}
+
 		return true;
 	}
 
 	public boolean onTouchEvent(final MotionEvent event) {
-		lastSeenToolType = getEventToolType(event);
+		lastSeenToolType.set(getEventToolType(event));
 
 		this.scaleGestureDetector.onTouchEvent(event);
 		if (this.gestureDetector.onTouchEvent(event)) {
@@ -236,7 +257,7 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 	}
 
 	public boolean onGenericMotionEvent(MotionEvent event) {
-		lastSeenToolType = getEventToolType(event);
+		lastSeenToolType.set(getEventToolType(event));
 
 		if (event.isFromSource(InputDevice.SOURCE_JOYSTICK) && event.getActionMasked() == MotionEvent.ACTION_MOVE) {
 			// Check if the device exists
@@ -790,5 +811,12 @@ public class GodotInputHandler implements InputManager.InputDeviceListener, Sens
 
 	public void onConfigurationChanged(Configuration newConfig) {
 		updateCachedRotation();
+
+		boolean newHardwareKeyboardConfig = newConfig.keyboard != Configuration.KEYBOARD_NOKEYS &&
+				newConfig.hardKeyboardHidden == Configuration.HARDKEYBOARDHIDDEN_NO;
+		if (hasHardwareKeyboardConfig != newHardwareKeyboardConfig) {
+			hasHardwareKeyboardConfig = newHardwareKeyboardConfig;
+			GodotLib.hardwareKeyboardConnected(hasHardwareKeyboard());
+		}
 	}
 }
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt
index d6994eb3..d5e696c5 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/AssetData.kt
@@ -66,6 +66,8 @@ internal class AssetData(context: Context, private val filePath: String, accessF
 		}
 
 		fun fileLastModified(path: String) = 0L
+		fun fileLastAccessed(path: String) = 0L
+		fun fileSize(path: String) = -1L
 
 		fun delete(path: String) = false
 
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt
index 319ec3ec..0a0d8d77 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt
@@ -132,6 +132,24 @@ internal abstract class DataAccess {
 			}
 		}
 
+		fun fileLastAccessed(storageScope: StorageScope, context: Context, path: String): Long {
+			return when(storageScope) {
+				StorageScope.APP -> FileData.fileLastAccessed(path)
+				StorageScope.ASSETS -> AssetData.fileLastAccessed(path)
+				StorageScope.SHARED -> MediaStoreData.fileLastAccessed(context, path)
+				StorageScope.UNKNOWN -> 0L
+			}
+		}
+
+		fun fileSize(storageScope: StorageScope, context: Context, path: String): Long {
+			return when(storageScope) {
+				StorageScope.APP -> FileData.fileSize(path)
+				StorageScope.ASSETS -> AssetData.fileSize(path)
+				StorageScope.SHARED -> MediaStoreData.fileSize(context, path)
+				StorageScope.UNKNOWN -> -1L
+			}
+		}
+
 		fun removeFile(storageScope: StorageScope, context: Context, path: String): Boolean {
 			return when(storageScope) {
 				StorageScope.APP -> FileData.delete(path)
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt
index 21aee339..1e2f3ca0 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt
@@ -228,6 +228,21 @@ class FileAccessHandler(val context: Context) {
 		}
 	}
 
+	fun fileLastAccessed(filepath: String?): Long {
+		val storageScope = storageScopeIdentifier.identifyStorageScope(filepath)
+		if (storageScope == StorageScope.UNKNOWN) {
+			return 0L
+		}
+
+		return try {
+			filepath?.let {
+				DataAccess.fileLastAccessed(storageScope, context, it)
+			} ?: 0L
+		} catch (e: SecurityException) {
+			0L
+		}
+	}
+
 	fun fileResize(fileId: Int, length: Long): Int {
 		if (!hasFileId(fileId)) {
 			return Error.FAILED.toNativeValue()
@@ -236,6 +251,21 @@ class FileAccessHandler(val context: Context) {
 		return files[fileId].resize(length).toNativeValue()
 	}
 
+	fun fileSize(filepath: String?): Long {
+		val storageScope = storageScopeIdentifier.identifyStorageScope(filepath)
+		if (storageScope == StorageScope.UNKNOWN) {
+			return -1L
+		}
+
+		return try {
+			filepath?.let {
+				DataAccess.fileSize(storageScope, context, it)
+			} ?: -1L
+		} catch (e: SecurityException) {
+			-1L
+		}
+	}
+
 	fun fileGetPosition(fileId: Int): Long {
 		if (!hasFileId(fileId)) {
 			return 0L
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt
index 873daada..42e59ca8 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt
@@ -30,10 +30,16 @@
 
 package org.godotengine.godot.io.file
 
+import android.os.*
 import java.io.File
 import java.io.FileOutputStream
 import java.io.RandomAccessFile
 import java.nio.channels.FileChannel
+import java.nio.file.attribute.BasicFileAttributes
+import java.nio.file.Files
+import java.nio.file.FileSystems
+import java.nio.file.Path
+import java.util.concurrent.TimeUnit
 
 /**
  * Implementation of [DataAccess] which handles regular (not scoped) file access and interactions.
@@ -59,6 +65,30 @@ internal class FileData(filePath: String, accessFlag: FileAccessFlags) : DataAcc
 			}
 		}
 
+		fun fileLastAccessed(filepath: String): Long {
+			return try {
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+					Files.readAttributes<BasicFileAttributes>(FileSystems.getDefault().getPath(filepath), BasicFileAttributes::class.java).lastAccessTime().to(TimeUnit.SECONDS)
+				} else {
+					0L
+				}
+			} catch (e: SecurityException) {
+				0L
+			}
+		}
+
+		fun fileSize(filepath: String): Long {
+			return try {
+				if (File(filepath).isFile) {
+					File(filepath).length()
+				} else {
+					-1L
+				}
+			} catch (e: SecurityException) {
+				-1L
+			}
+		}
+
 		fun delete(filepath: String): Boolean {
 			return try {
 				File(filepath).delete()
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt
index 46bd465e..e78b2947 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt
@@ -212,6 +212,20 @@ internal class MediaStoreData(context: Context, filePath: String, accessFlag: Fi
 			return dataItem.dateModified.toLong() / 1000L
 		}
 
+		fun fileLastAccessed(@Suppress("UNUSED_PARAMETER") context: Context, @Suppress("UNUSED_PARAMETER") path: String): Long {
+			return 0L
+		}
+
+		fun fileSize(context: Context, path: String): Long {
+			val result = queryByPath(context, path)
+			if (result.isEmpty()) {
+				return -1L
+			}
+
+			val dataItem = result[0]
+			return dataItem.size.toLong()
+		}
+
 		fun rename(context: Context, from: String, to: String): Boolean {
 			// Ensure the source exists.
 			val sources = queryByPath(context, from)
diff --git a/engine/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt b/engine/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt
index 538bc2ab..d50fbf41 100644
--- a/engine/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt
+++ b/engine/platform/android/java/lib/src/org/godotengine/godot/utils/GameMenuUtils.kt
@@ -90,6 +90,9 @@ object GameMenuUtils {
 	@JvmStatic
 	external fun playMainScene()
 
+	@JvmStatic
+	external fun setDebugMuteAudio(enabled: Boolean)
+
 	/**
 	 * Returns [GameEmbedMode] stored in the editor settings.
 	 *
diff --git a/engine/platform/android/java_class_wrapper.cpp b/engine/platform/android/java_class_wrapper.cpp
index c19196ae..d0f20797 100644
--- a/engine/platform/android/java_class_wrapper.cpp
+++ b/engine/platform/android/java_class_wrapper.cpp
@@ -108,18 +108,21 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
 					}
 				} break;
 				case ARG_TYPE_CLASS: {
-					if (p_args[i]->get_type() != Variant::OBJECT && p_args[i]->get_type() != Variant::NIL) {
+					String cn = E.param_sigs[i].operator String();
+					if (cn.begins_with("L") && cn.ends_with(";")) {
+						cn = cn.substr(1, cn.length() - 2);
+					}
+					if (cn == "org/godotengine/godot/Dictionary") {
+						if (p_args[i]->get_type() != Variant::DICTIONARY) {
+							arg_expected = Variant::DICTIONARY;
+						}
+					} else if (p_args[i]->get_type() != Variant::OBJECT && p_args[i]->get_type() != Variant::NIL) {
 						arg_expected = Variant::OBJECT;
 					} else {
 						Ref<RefCounted> ref = *p_args[i];
 						if (ref.is_valid()) {
 							if (Object::cast_to<JavaObject>(ref.ptr())) {
 								Ref<JavaObject> jo = ref;
-								//could be faster
-								String cn = E.param_sigs[i].operator String();
-								if (cn.begins_with("L") && cn.ends_with(";")) {
-									cn = cn.substr(1, cn.length() - 2);
-								}
 								jclass c = env->FindClass(cn.utf8().get_data());
 								if (!c || !env->IsInstanceOf(jo->instance, c)) {
 									arg_expected = Variant::OBJECT;
@@ -132,6 +135,116 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
 						}
 					}
 				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_BOOLEAN: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::BOOL) {
+							arg_expected = Variant::ARRAY;
+						}
+					} else {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_BYTE:
+				case ARG_ARRAY_BIT | ARG_TYPE_CHAR: {
+					if (p_args[i]->get_type() != Variant::PACKED_BYTE_ARRAY) {
+						arg_expected = Variant::PACKED_BYTE_ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_SHORT:
+				case ARG_ARRAY_BIT | ARG_TYPE_INT: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::INT) {
+							arg_expected = Variant::ARRAY;
+						}
+					} else if (p_args[i]->get_type() != Variant::PACKED_INT32_ARRAY) {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_LONG: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::INT) {
+							arg_expected = Variant::ARRAY;
+						}
+					} else if (p_args[i]->get_type() != Variant::PACKED_INT64_ARRAY) {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_FLOAT: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::FLOAT) {
+							arg_expected = Variant::ARRAY;
+						}
+					} else if (p_args[i]->get_type() != Variant::PACKED_FLOAT32_ARRAY) {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::FLOAT) {
+							arg_expected = Variant::ARRAY;
+						}
+					} else if (p_args[i]->get_type() != Variant::PACKED_FLOAT64_ARRAY) {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_STRING:
+				case ARG_ARRAY_BIT | ARG_TYPE_CHARSEQUENCE: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::STRING) {
+							arg_expected = Variant::ARRAY;
+						}
+					} else if (p_args[i]->get_type() != Variant::PACKED_STRING_ARRAY) {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_CALLABLE: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::CALLABLE) {
+							arg_expected = Variant::ARRAY;
+						}
+					} else {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
+				case ARG_ARRAY_BIT | ARG_TYPE_CLASS: {
+					if (p_args[i]->get_type() == Variant::ARRAY) {
+						Array arr = *p_args[i];
+						if (arr.is_typed() && arr.get_typed_builtin() != Variant::OBJECT) {
+							arg_expected = Variant::ARRAY;
+						} else {
+							String cn = E.param_sigs[i].operator String();
+							if (cn.begins_with("[L") && cn.ends_with(";")) {
+								cn = cn.substr(2, cn.length() - 3);
+							}
+							jclass c = env->FindClass(cn.utf8().get_data());
+							if (c) {
+								for (int j = 0; j < arr.size(); j++) {
+									Ref<JavaObject> jo = arr[j];
+									if (jo.is_valid()) {
+										if (!env->IsInstanceOf(jo->instance, c)) {
+											arg_expected = Variant::ARRAY;
+											break;
+										}
+									} else {
+										arg_expected = Variant::ARRAY;
+										break;
+									}
+								}
+							} else {
+								arg_expected = Variant::ARRAY;
+							}
+						}
+					} else {
+						arg_expected = Variant::ARRAY;
+					}
+				} break;
 				default: {
 					if (p_args[i]->get_type() != Variant::ARRAY) {
 						arg_expected = Variant::ARRAY;
@@ -287,13 +400,16 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
 				to_free.push_back(jcallable);
 			} break;
 			case ARG_TYPE_CLASS: {
-				Ref<JavaObject> jo = *p_args[i];
-				if (jo.is_valid()) {
-					argv[i].l = jo->instance;
+				if (p_args[i]->get_type() == Variant::DICTIONARY) {
+					argv[i].l = _variant_to_jvalue(env, Variant::DICTIONARY, p_args[i]).obj;
 				} else {
-					argv[i].l = nullptr; //I hope this works
+					Ref<JavaObject> jo = *p_args[i];
+					if (jo.is_valid()) {
+						argv[i].l = jo->instance;
+					} else {
+						argv[i].l = nullptr; //I hope this works
+					}
 				}
-
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_BOOLEAN: {
 				Array arr = *p_args[i];
@@ -307,90 +423,171 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
 
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_BYTE: {
-				Array arr = *p_args[i];
-				jbyteArray a = env->NewByteArray(arr.size());
-				for (int j = 0; j < arr.size(); j++) {
-					jbyte val = arr[j];
-					env->SetByteArrayRegion(a, j, 1, &val);
+				jbyteArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewByteArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jbyte val = arr[j];
+						env->SetByteArrayRegion(a, j, 1, &val);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_BYTE_ARRAY) {
+					PackedByteArray arr = *p_args[i];
+					a = env->NewByteArray(arr.size());
+					env->SetByteArrayRegion(a, 0, arr.size(), (const jbyte *)arr.ptr());
 				}
+
 				argv[i].l = a;
 				to_free.push_back(a);
 
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_CHAR: {
-				Array arr = *p_args[i];
-				jcharArray a = env->NewCharArray(arr.size());
-				for (int j = 0; j < arr.size(); j++) {
-					jchar val = arr[j];
-					env->SetCharArrayRegion(a, j, 1, &val);
+				jcharArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewCharArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jchar val = arr[j];
+						env->SetCharArrayRegion(a, j, 1, &val);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_BYTE_ARRAY) {
+					PackedByteArray arr = *p_args[i];
+					// The data is expected to be UTF-16 encoded, so the length is half the size of the byte array.
+					int size = arr.size() / 2;
+					a = env->NewCharArray(size);
+					env->SetCharArrayRegion(a, 0, size, (const jchar *)arr.ptr());
 				}
+
 				argv[i].l = a;
 				to_free.push_back(a);
 
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_SHORT: {
-				Array arr = *p_args[i];
-				jshortArray a = env->NewShortArray(arr.size());
-				for (int j = 0; j < arr.size(); j++) {
-					jshort val = arr[j];
-					env->SetShortArrayRegion(a, j, 1, &val);
+				jshortArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewShortArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jshort val = arr[j];
+						env->SetShortArrayRegion(a, j, 1, &val);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_INT32_ARRAY) {
+					PackedInt32Array arr = *p_args[i];
+					a = env->NewShortArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jshort val = arr[j];
+						env->SetShortArrayRegion(a, j, 1, &val);
+					}
 				}
+
 				argv[i].l = a;
 				to_free.push_back(a);
 
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_INT: {
-				Array arr = *p_args[i];
-				jintArray a = env->NewIntArray(arr.size());
-				for (int j = 0; j < arr.size(); j++) {
-					jint val = arr[j];
-					env->SetIntArrayRegion(a, j, 1, &val);
+				jintArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewIntArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jint val = arr[j];
+						env->SetIntArrayRegion(a, j, 1, &val);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_INT32_ARRAY) {
+					PackedInt32Array arr = *p_args[i];
+					a = env->NewIntArray(arr.size());
+					env->SetIntArrayRegion(a, 0, arr.size(), arr.ptr());
 				}
+
 				argv[i].l = a;
 				to_free.push_back(a);
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_LONG: {
-				Array arr = *p_args[i];
-				jlongArray a = env->NewLongArray(arr.size());
-				for (int j = 0; j < arr.size(); j++) {
-					jlong val = (int64_t)arr[j];
-					env->SetLongArrayRegion(a, j, 1, &val);
+				jlongArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewLongArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jlong val = (int64_t)arr[j];
+						env->SetLongArrayRegion(a, j, 1, &val);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_INT64_ARRAY) {
+					PackedInt64Array arr = *p_args[i];
+					a = env->NewLongArray(arr.size());
+					env->SetLongArrayRegion(a, 0, arr.size(), arr.ptr());
 				}
+
 				argv[i].l = a;
 				to_free.push_back(a);
 
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_FLOAT: {
-				Array arr = *p_args[i];
-				jfloatArray a = env->NewFloatArray(arr.size());
-				for (int j = 0; j < arr.size(); j++) {
-					jfloat val = arr[j];
-					env->SetFloatArrayRegion(a, j, 1, &val);
+				jfloatArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewFloatArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jfloat val = arr[j];
+						env->SetFloatArrayRegion(a, j, 1, &val);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_FLOAT32_ARRAY) {
+					PackedFloat32Array arr = *p_args[i];
+					a = env->NewFloatArray(arr.size());
+					env->SetFloatArrayRegion(a, 0, arr.size(), arr.ptr());
 				}
+
 				argv[i].l = a;
 				to_free.push_back(a);
 
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: {
-				Array arr = *p_args[i];
-				jdoubleArray a = env->NewDoubleArray(arr.size());
-				for (int j = 0; j < arr.size(); j++) {
-					jdouble val = arr[j];
-					env->SetDoubleArrayRegion(a, j, 1, &val);
+				jdoubleArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewDoubleArray(arr.size());
+					for (int j = 0; j < arr.size(); j++) {
+						jdouble val = arr[j];
+						env->SetDoubleArrayRegion(a, j, 1, &val);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_FLOAT64_ARRAY) {
+					PackedFloat64Array arr = *p_args[i];
+					a = env->NewDoubleArray(arr.size());
+					env->SetDoubleArrayRegion(a, 0, arr.size(), arr.ptr());
 				}
+
 				argv[i].l = a;
 				to_free.push_back(a);
 
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_STRING:
 			case ARG_ARRAY_BIT | ARG_TYPE_CHARSEQUENCE: {
-				Array arr = *p_args[i];
-				jobjectArray a = env->NewObjectArray(arr.size(), env->FindClass("java/lang/String"), nullptr);
-				for (int j = 0; j < arr.size(); j++) {
-					String s = arr[j];
-					jstring jStr = env->NewStringUTF(s.utf8().get_data());
-					env->SetObjectArrayElement(a, j, jStr);
-					to_free.push_back(jStr);
+				jobjectArray a = nullptr;
+
+				if (p_args[i]->get_type() == Variant::ARRAY) {
+					Array arr = *p_args[i];
+					a = env->NewObjectArray(arr.size(), env->FindClass("java/lang/String"), nullptr);
+					for (int j = 0; j < arr.size(); j++) {
+						String s = arr[j];
+						jstring jStr = env->NewStringUTF(s.utf8().get_data());
+						env->SetObjectArrayElement(a, j, jStr);
+						to_free.push_back(jStr);
+					}
+				} else if (p_args[i]->get_type() == Variant::PACKED_STRING_ARRAY) {
+					PackedStringArray arr = *p_args[i];
+					a = env->NewObjectArray(arr.size(), env->FindClass("java/lang/String"), nullptr);
+					for (int j = 0; j < arr.size(); j++) {
+						String s = arr[j];
+						jstring jStr = env->NewStringUTF(s.utf8().get_data());
+						env->SetObjectArrayElement(a, j, jStr);
+						to_free.push_back(jStr);
+					}
 				}
 
 				argv[i].l = a;
@@ -410,7 +607,22 @@ bool JavaClass::_call_method(JavaObject *p_instance, const StringName &p_method,
 				to_free.push_back(jarr);
 			} break;
 			case ARG_ARRAY_BIT | ARG_TYPE_CLASS: {
-				argv[i].l = nullptr;
+				String cn = method->param_sigs[i].operator String();
+				if (cn.begins_with("[L") && cn.ends_with(";")) {
+					cn = cn.substr(2, cn.length() - 3);
+				}
+				jclass c = env->FindClass(cn.utf8().get_data());
+				if (c) {
+					Array arr = *p_args[i];
+					jobjectArray jarr = env->NewObjectArray(arr.size(), c, nullptr);
+					for (int j = 0; j < arr.size(); j++) {
+						Ref<JavaObject> jo = arr[j];
+						env->SetObjectArrayElement(jarr, j, jo->instance);
+					}
+
+					argv[i].l = jarr;
+					to_free.push_back(jarr);
+				}
 			} break;
 		}
 	}
@@ -718,7 +930,7 @@ bool JavaClassWrapper::_get_type_sig(JNIEnv *env, jobject obj, uint32_t &sig, St
 	if (str_type.begins_with("[")) {
 		t = JavaClass::ARG_ARRAY_BIT;
 		strsig = "[";
-		str_type = str_type.substr(1, str_type.length() - 1);
+		str_type = str_type.substr(1);
 		if (str_type.begins_with("[")) {
 			print_line("Nested arrays not supported for type: " + str_type);
 			return false;
@@ -790,7 +1002,7 @@ bool JavaClassWrapper::_get_type_sig(JNIEnv *env, jobject obj, uint32_t &sig, St
 		strsig += "Ljava/lang/Double;";
 	} else {
 		//a class likely
-		strsig += "L" + str_type.replace(".", "/") + ";";
+		strsig += "L" + str_type.replace_char('.', '/') + ";";
 		t |= JavaClass::ARG_TYPE_CLASS;
 	}
 
@@ -865,8 +1077,13 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			env->DeleteLocalRef(java_class);
 
 			if (java_class_wrapped.is_valid()) {
-				Ref<JavaObject> ret = Ref<JavaObject>(memnew(JavaObject(java_class_wrapped, obj)));
-				var = ret;
+				String cn = java_class_wrapped->get_java_class_name();
+				if (cn == "org.godotengine.godot.Dictionary" || cn == "java.util.HashMap") {
+					var = _jobject_to_variant(env, obj);
+				} else {
+					Ref<JavaObject> ret = Ref<JavaObject>(memnew(JavaObject(java_class_wrapped, obj)));
+					var = ret;
+				}
 				return true;
 			}
 
@@ -881,11 +1098,12 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
 			for (int i = 0; i < count; i++) {
 				jboolean val;
-				env->GetBooleanArrayRegion((jbooleanArray)arr, 0, 1, &val);
-				ret.push_back(val);
+				env->GetBooleanArrayRegion((jbooleanArray)arr, i, 1, &val);
+				ret[i] = (bool)val;
 			}
 
 			var = ret;
@@ -893,106 +1111,85 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_BYTE: {
-			Array ret;
+			PackedByteArray ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
-
-			for (int i = 0; i < count; i++) {
-				jbyte val;
-				env->GetByteArrayRegion((jbyteArray)arr, 0, 1, &val);
-				ret.push_back(val);
-			}
+			ret.resize(count);
+			env->GetByteArrayRegion((jbyteArray)arr, 0, count, (int8_t *)ret.ptrw());
 
 			var = ret;
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_CHAR: {
-			Array ret;
+			PackedByteArray ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
-
-			for (int i = 0; i < count; i++) {
-				jchar val;
-				env->GetCharArrayRegion((jcharArray)arr, 0, 1, &val);
-				ret.push_back(val);
-			}
+			// Char arrays are UTF-16 encoded, so it's double the length.
+			ret.resize(count * 2);
+			env->GetCharArrayRegion((jcharArray)arr, 0, count, (jchar *)ret.ptrw());
 
 			var = ret;
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_SHORT: {
-			Array ret;
+			PackedInt32Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			int32_t *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jshort val;
-				env->GetShortArrayRegion((jshortArray)arr, 0, 1, &val);
-				ret.push_back(val);
+				env->GetShortArrayRegion((jshortArray)arr, i, 1, &val);
+				ptr[i] = val;
 			}
 
 			var = ret;
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_INT: {
-			Array ret;
+			PackedInt32Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
-
-			for (int i = 0; i < count; i++) {
-				jint val;
-				env->GetIntArrayRegion((jintArray)arr, 0, 1, &val);
-				ret.push_back(val);
-			}
+			ret.resize(count);
+			env->GetIntArrayRegion((jintArray)arr, 0, count, ret.ptrw());
 
 			var = ret;
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_LONG: {
-			Array ret;
+			PackedInt64Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
-
-			for (int i = 0; i < count; i++) {
-				jlong val;
-				env->GetLongArrayRegion((jlongArray)arr, 0, 1, &val);
-				ret.push_back((int64_t)val);
-			}
+			ret.resize(count);
+			env->GetLongArrayRegion((jlongArray)arr, 0, count, ret.ptrw());
 
 			var = ret;
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_FLOAT: {
-			Array ret;
+			PackedFloat32Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
-
-			for (int i = 0; i < count; i++) {
-				jfloat val;
-				env->GetFloatArrayRegion((jfloatArray)arr, 0, 1, &val);
-				ret.push_back(val);
-			}
+			ret.resize(count);
+			env->GetFloatArrayRegion((jfloatArray)arr, 0, count, ret.ptrw());
 
 			var = ret;
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: {
-			Array ret;
+			PackedFloat64Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
-
-			for (int i = 0; i < count; i++) {
-				jdouble val;
-				env->GetDoubleArrayRegion((jdoubleArray)arr, 0, 1, &val);
-				ret.push_back(val);
-			}
+			ret.resize(count);
+			env->GetDoubleArrayRegion((jdoubleArray)arr, 0, count, ret.ptrw());
 
 			var = ret;
 			return true;
@@ -1002,14 +1199,13 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
-				if (!o) {
-					ret.push_back(Variant());
-				} else {
+				if (o) {
 					bool val = env->CallBooleanMethod(o, JavaClassWrapper::singleton->Boolean_booleanValue);
-					ret.push_back(val);
+					ret[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1019,18 +1215,20 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 
 		} break;
 		case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_BYTE: {
-			Array ret;
+			PackedByteArray ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			uint8_t *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
 				if (!o) {
-					ret.push_back(Variant());
+					ptr[i] = 0;
 				} else {
 					int val = env->CallByteMethod(o, JavaClassWrapper::singleton->Byte_byteValue);
-					ret.push_back(val);
+					ptr[i] = (uint8_t)val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1039,18 +1237,22 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_CHAR: {
-			Array ret;
+			PackedByteArray ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			// Char arrays are UTF-16 encoded, so it's double the length.
+			ret.resize(count * 2);
 
+			jchar *ptr = (jchar *)ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
 				if (!o) {
-					ret.push_back(Variant());
+					count = i;
+					break;
 				} else {
 					int val = env->CallCharMethod(o, JavaClassWrapper::singleton->Character_characterValue);
-					ret.push_back(val);
+					ptr[i] = (jchar)val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1059,18 +1261,20 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_SHORT: {
-			Array ret;
+			PackedInt32Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			int32_t *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
 				if (!o) {
-					ret.push_back(Variant());
+					ptr[i] = 0;
 				} else {
 					int val = env->CallShortMethod(o, JavaClassWrapper::singleton->Short_shortValue);
-					ret.push_back(val);
+					ptr[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1079,18 +1283,20 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_INT: {
-			Array ret;
+			PackedInt32Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			int32_t *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
 				if (!o) {
-					ret.push_back(Variant());
+					ptr[i] = 0;
 				} else {
 					int val = env->CallIntMethod(o, JavaClassWrapper::singleton->Integer_integerValue);
-					ret.push_back(val);
+					ptr[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1099,18 +1305,20 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_LONG: {
-			Array ret;
+			PackedInt64Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			int64_t *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
 				if (!o) {
-					ret.push_back(Variant());
+					ptr[i] = 0;
 				} else {
 					int64_t val = env->CallLongMethod(o, JavaClassWrapper::singleton->Long_longValue);
-					ret.push_back(val);
+					ptr[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1119,18 +1327,20 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_FLOAT: {
-			Array ret;
+			PackedFloat32Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			float *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
 				if (!o) {
-					ret.push_back(Variant());
+					ptr[i] = 0.0;
 				} else {
 					float val = env->CallFloatMethod(o, JavaClassWrapper::singleton->Float_floatValue);
-					ret.push_back(val);
+					ptr[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1139,18 +1349,20 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_NUMBER_CLASS_BIT | ARG_ARRAY_BIT | ARG_TYPE_DOUBLE: {
-			Array ret;
+			PackedFloat64Array ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			double *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
 				if (!o) {
-					ret.push_back(Variant());
+					ptr[i] = 0.0;
 				} else {
 					double val = env->CallDoubleMethod(o, JavaClassWrapper::singleton->Double_doubleValue);
-					ret.push_back(val);
+					ptr[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1160,18 +1372,18 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 		} break;
 
 		case ARG_ARRAY_BIT | ARG_TYPE_STRING: {
-			Array ret;
+			PackedStringArray ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			String *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
-				if (!o) {
-					ret.push_back(Variant());
-				} else {
+				if (o) {
 					String val = jstring_to_string((jstring)o, env);
-					ret.push_back(val);
+					ptr[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1180,18 +1392,18 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_CHARSEQUENCE: {
-			Array ret;
+			PackedStringArray ret;
 			jobjectArray arr = (jobjectArray)obj;
 
 			int count = env->GetArrayLength(arr);
+			ret.resize(count);
 
+			String *ptr = ret.ptrw();
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(arr, i);
-				if (!o) {
-					ret.push_back(Variant());
-				} else {
+				if (o) {
 					String val = charsequence_to_string(env, o);
-					ret.push_back(val);
+					ptr[i] = val;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1203,13 +1415,12 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			Array ret;
 			jobjectArray jarr = (jobjectArray)obj;
 			int count = env->GetArrayLength(jarr);
+			ret.resize(count);
 			for (int i = 0; i < count; i++) {
 				jobject o = env->GetObjectArrayElement(jarr, i);
-				if (!o) {
-					ret.push_back(Variant());
-				} else {
+				if (o) {
 					Callable callable = jcallable_to_callable(env, o);
-					ret.push_back(callable);
+					ret[i] = callable;
 				}
 				env->DeleteLocalRef(o);
 			}
@@ -1218,6 +1429,32 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 			return true;
 		} break;
 		case ARG_ARRAY_BIT | ARG_TYPE_CLASS: {
+			Array ret;
+			jobjectArray jarr = (jobjectArray)obj;
+			int count = env->GetArrayLength(jarr);
+			ret.resize(count);
+			for (int i = 0; i < count; i++) {
+				jobject obj = env->GetObjectArrayElement(jarr, i);
+				if (obj) {
+					jclass java_class = env->GetObjectClass(obj);
+					Ref<JavaClass> java_class_wrapped = JavaClassWrapper::singleton->wrap_jclass(java_class);
+					env->DeleteLocalRef(java_class);
+
+					if (java_class_wrapped.is_valid()) {
+						String cn = java_class_wrapped->get_java_class_name();
+						if (cn == "org.godotengine.godot.Dictionary" || cn == "java.util.HashMap") {
+							ret[i] = _jobject_to_variant(env, obj);
+						} else {
+							Ref<JavaObject> java_obj_wrapped = Ref<JavaObject>(memnew(JavaObject(java_class_wrapped, obj)));
+							ret[i] = java_obj_wrapped;
+						}
+					}
+				}
+				env->DeleteLocalRef(obj);
+			}
+
+			var = ret;
+			return true;
 		} break;
 	}
 
@@ -1225,7 +1462,7 @@ bool JavaClass::_convert_object_to_variant(JNIEnv *env, jobject obj, Variant &va
 }
 
 Ref<JavaClass> JavaClassWrapper::_wrap(const String &p_class, bool p_allow_private_methods_access) {
-	String class_name_dots = p_class.replace("/", ".");
+	String class_name_dots = p_class.replace_char('/', '.');
 	if (class_cache.has(class_name_dots)) {
 		return class_cache[class_name_dots];
 	}
@@ -1233,8 +1470,8 @@ Ref<JavaClass> JavaClassWrapper::_wrap(const String &p_class, bool p_allow_priva
 	JNIEnv *env = get_jni_env();
 	ERR_FAIL_NULL_V(env, Ref<JavaClass>());
 
-	jclass bclass = env->FindClass(class_name_dots.replace(".", "/").utf8().get_data());
-	ERR_FAIL_NULL_V(bclass, Ref<JavaClass>());
+	jclass bclass = env->FindClass(class_name_dots.replace_char('.', '/').utf8().get_data());
+	ERR_FAIL_NULL_V_MSG(bclass, Ref<JavaClass>(), vformat("Java class '%s' not found.", p_class));
 
 	jobjectArray constructors = (jobjectArray)env->CallObjectMethod(bclass, Class_getDeclaredConstructors);
 	ERR_FAIL_NULL_V(constructors, Ref<JavaClass>());
diff --git a/engine/platform/android/java_godot_io_wrapper.cpp b/engine/platform/android/java_godot_io_wrapper.cpp
index 941995c7..fc36881f 100644
--- a/engine/platform/android/java_godot_io_wrapper.cpp
+++ b/engine/platform/android/java_godot_io_wrapper.cpp
@@ -30,7 +30,6 @@
 
 #include "java_godot_io_wrapper.h"
 
-#include "core/error/error_list.h"
 #include "core/math/rect2.h"
 #include "core/variant/variant.h"
 
diff --git a/engine/platform/android/java_godot_io_wrapper.h b/engine/platform/android/java_godot_io_wrapper.h
index e5134426..f74be8dd 100644
--- a/engine/platform/android/java_godot_io_wrapper.h
+++ b/engine/platform/android/java_godot_io_wrapper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JAVA_GODOT_IO_WRAPPER_H
-#define JAVA_GODOT_IO_WRAPPER_H
+#pragma once
 
 #include "jni_utils.h"
 
@@ -92,5 +91,3 @@ public:
 	int get_screen_orientation();
 	String get_system_dir(int p_dir, bool p_shared_storage);
 };
-
-#endif // JAVA_GODOT_IO_WRAPPER_H
diff --git a/engine/platform/android/java_godot_lib_jni.cpp b/engine/platform/android/java_godot_lib_jni.cpp
index 054c809c..24c9302b 100644
--- a/engine/platform/android/java_godot_lib_jni.cpp
+++ b/engine/platform/android/java_godot_lib_jni.cpp
@@ -49,10 +49,11 @@
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
 #include "main/main.h"
+#include "servers/rendering_server.h"
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 #include "servers/xr_server.h"
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"
@@ -78,7 +79,6 @@ enum StartupStep {
 
 static SafeNumeric<int> step; // Shared between UI and render threads
 
-static Size2 new_size;
 static Vector3 accelerometer;
 static Vector3 gravity;
 static Vector3 magnetometer;
@@ -272,7 +272,7 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env,
 
 	if (step.get() == STEP_SHOW_LOGO) {
 		bool xr_enabled = false;
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 		// Unlike PCVR, there's no additional 2D screen onto which to render the boot logo,
 		// so we skip this step if xr is enabled.
 		if (XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT) {
@@ -280,7 +280,7 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env,
 		} else {
 			xr_enabled = XRServer::get_xr_mode() == XRServer::XRMODE_ON;
 		}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 		if (!xr_enabled) {
 			Main::setup_boot_logo();
 		}
@@ -398,7 +398,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, j
 	AndroidInputHandler::JoypadEvent jevent;
 	jevent.device = p_device;
 	jevent.type = AndroidInputHandler::JOY_EVENT_HAT;
-	BitField<HatMask> hat;
+	BitField<HatMask> hat = HatMask::CENTER;
 	if (p_hat_x != 0) {
 		if (p_hat_x < 0) {
 			hat.set_flag(HatMask::LEFT);
@@ -548,6 +548,13 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onNightModeChanged(JN
 	}
 }
 
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hardwareKeyboardConnected(JNIEnv *env, jclass clazz, jboolean p_connected) {
+	DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton();
+	if (ds) {
+		ds->emit_hardware_keyboard_connection_changed(p_connected);
+	}
+}
+
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths) {
 	DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton();
 	if (ds) {
diff --git a/engine/platform/android/java_godot_lib_jni.h b/engine/platform/android/java_godot_lib_jni.h
index 22fd9ae5..7cdc22d7 100644
--- a/engine/platform/android/java_godot_lib_jni.h
+++ b/engine/platform/android/java_godot_lib_jni.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JAVA_GODOT_LIB_JNI_H
-#define JAVA_GODOT_LIB_JNI_H
+#pragma once
 
 #include <android/log.h>
 #include <jni.h>
@@ -69,6 +68,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setEditorProjectMetad
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz);
+JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_hardwareKeyboardConnected(JNIEnv *env, jclass clazz, jboolean p_connected);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_filePickerCallback(JNIEnv *env, jclass clazz, jboolean p_ok, jobjectArray p_selected_paths);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz);
@@ -77,5 +77,3 @@ JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getProjectResource
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isEditorHint(JNIEnv *env, jclass clazz);
 JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_isProjectManagerHint(JNIEnv *env, jclass clazz);
 }
-
-#endif // JAVA_GODOT_LIB_JNI_H
diff --git a/engine/platform/android/java_godot_view_wrapper.h b/engine/platform/android/java_godot_view_wrapper.h
index 83abb2dc..991e64c4 100644
--- a/engine/platform/android/java_godot_view_wrapper.h
+++ b/engine/platform/android/java_godot_view_wrapper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JAVA_GODOT_VIEW_WRAPPER_H
-#define JAVA_GODOT_VIEW_WRAPPER_H
+#pragma once
 
 #include "jni_utils.h"
 
@@ -66,5 +65,3 @@ public:
 
 	~GodotJavaViewWrapper();
 };
-
-#endif // JAVA_GODOT_VIEW_WRAPPER_H
diff --git a/engine/platform/android/java_godot_wrapper.h b/engine/platform/android/java_godot_wrapper.h
index c21d443a..e0fd9077 100644
--- a/engine/platform/android/java_godot_wrapper.h
+++ b/engine/platform/android/java_godot_wrapper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JAVA_GODOT_WRAPPER_H
-#define JAVA_GODOT_WRAPPER_H
+#pragma once
 
 #include "java_godot_view_wrapper.h"
 
@@ -141,5 +140,3 @@ public:
 
 	void on_editor_workspace_selected(const String &p_workspace);
 };
-
-#endif // JAVA_GODOT_WRAPPER_H
diff --git a/engine/platform/android/jni_utils.h b/engine/platform/android/jni_utils.h
index 55e1946c..979c4796 100644
--- a/engine/platform/android/jni_utils.h
+++ b/engine/platform/android/jni_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JNI_UTILS_H
-#define JNI_UTILS_H
+#pragma once
 
 #include "thread_jandroid.h"
 
@@ -91,11 +90,9 @@ static inline String jstring_to_string(jstring source, JNIEnv *env = nullptr) {
 		}
 		const char *const source_utf8 = env->GetStringUTFChars(source, nullptr);
 		if (source_utf8) {
-			result.parse_utf8(source_utf8);
+			result.append_utf8(source_utf8);
 			env->ReleaseStringUTFChars(source, source_utf8);
 		}
 	}
 	return result;
 }
-
-#endif // JNI_UTILS_H
diff --git a/engine/platform/android/net_socket_android.h b/engine/platform/android/net_socket_android.h
index c33146d2..e9776e3f 100644
--- a/engine/platform/android/net_socket_android.h
+++ b/engine/platform/android/net_socket_android.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NET_SOCKET_ANDROID_H
-#define NET_SOCKET_ANDROID_H
+#pragma once
 
 #include "drivers/unix/net_socket_unix.h"
 
@@ -74,5 +73,3 @@ public:
 	NetSocketAndroid() {}
 	~NetSocketAndroid();
 };
-
-#endif // NET_SOCKET_ANDROID_H
diff --git a/engine/platform/android/os_android.cpp b/engine/platform/android/os_android.cpp
index 53f41acf..5809c946 100644
--- a/engine/platform/android/os_android.cpp
+++ b/engine/platform/android/os_android.cpp
@@ -454,6 +454,9 @@ void OS_Android::_load_system_font_config() const {
 	Ref<XMLParser> parser;
 	parser.instantiate();
 
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	String root = String(getenv("ANDROID_ROOT")).path_join("fonts");
+
 	Error err = parser->open(String(getenv("ANDROID_ROOT")).path_join("/etc/fonts.xml"));
 	if (err == OK) {
 		bool in_font_node = false;
@@ -530,20 +533,22 @@ void OS_Android::_load_system_font_config() const {
 				if (in_font_node) {
 					fi.filename = parser->get_node_data().strip_edges();
 					fi.font_name = fn;
-					if (!fb.is_empty() && fn.is_empty()) {
-						fi.font_name = fb;
-						fi.priority = 2;
+					if (da->file_exists(root.path_join(fi.filename))) {
+						if (!fb.is_empty() && fn.is_empty()) {
+							fi.font_name = fb;
+							fi.priority = 2;
+						}
+						if (fi.font_name.is_empty()) {
+							fi.font_name = "sans-serif";
+							fi.priority = 5;
+						}
+						if (fi.font_name.ends_with("-condensed")) {
+							fi.stretch = 75;
+							fi.font_name = fi.font_name.trim_suffix("-condensed");
+						}
+						fonts.push_back(fi);
+						font_names.insert(fi.font_name);
 					}
-					if (fi.font_name.is_empty()) {
-						fi.font_name = "sans-serif";
-						fi.priority = 5;
-					}
-					if (fi.font_name.ends_with("-condensed")) {
-						fi.stretch = 75;
-						fi.font_name = fi.font_name.trim_suffix("-condensed");
-					}
-					fonts.push_back(fi);
-					font_names.insert(fi.font_name);
 				}
 			}
 			if (parser->get_node_type() == XMLParser::NODE_ELEMENT_END) {
diff --git a/engine/platform/android/os_android.h b/engine/platform/android/os_android.h
index a59002b7..68136535 100644
--- a/engine/platform/android/os_android.h
+++ b/engine/platform/android/os_android.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_ANDROID_H
-#define OS_ANDROID_H
+#pragma once
 
 #include "audio_driver_opensl.h"
 
@@ -192,5 +191,3 @@ private:
 	static void _on_main_screen_changed(const String &p_screen_name);
 #endif
 };
-
-#endif // OS_ANDROID_H
diff --git a/engine/platform/android/platform_config.h b/engine/platform/android/platform_config.h
index d2376d2d..b69173c6 100644
--- a/engine/platform/android/platform_config.h
+++ b/engine/platform/android/platform_config.h
@@ -28,5 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include <alloca.h>
 #include <malloc.h>
diff --git a/engine/platform/android/platform_gl.h b/engine/platform/android/platform_gl.h
index af6edb10..bf990e25 100644
--- a/engine/platform/android/platform_gl.h
+++ b/engine/platform/android/platform_gl.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLATFORM_GL_H
-#define PLATFORM_GL_H
+#pragma once
 
 #ifndef GLES_API_ENABLED
 #define GLES_API_ENABLED // Allow using GLES.
@@ -39,5 +38,3 @@
 #include <EGL/eglext.h>
 #include <GLES3/gl3.h>
 #include <GLES3/gl3ext.h>
-
-#endif // PLATFORM_GL_H
diff --git a/engine/platform/android/plugin/godot_plugin_jni.h b/engine/platform/android/plugin/godot_plugin_jni.h
index 8c62fb0f..23d5c3cf 100644
--- a/engine/platform/android/plugin/godot_plugin_jni.h
+++ b/engine/platform/android/plugin/godot_plugin_jni.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_PLUGIN_JNI_H
-#define GODOT_PLUGIN_JNI_H
+#pragma once
 
 #include <android/log.h>
 #include <jni.h>
@@ -42,5 +41,3 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegis
 JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params);
 }
-
-#endif // GODOT_PLUGIN_JNI_H
diff --git a/engine/platform/android/rendering_context_driver_vulkan_android.h b/engine/platform/android/rendering_context_driver_vulkan_android.h
index a2a42eef..bd50e4eb 100644
--- a/engine/platform/android/rendering_context_driver_vulkan_android.h
+++ b/engine/platform/android/rendering_context_driver_vulkan_android.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_ANDROID_H
-#define RENDERING_CONTEXT_DRIVER_VULKAN_ANDROID_H
+#pragma once
 
 #ifdef VULKAN_ENABLED
 
@@ -55,5 +54,3 @@ public:
 };
 
 #endif // VULKAN_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_VULKAN_ANDROID_H
diff --git a/engine/platform/android/thread_jandroid.h b/engine/platform/android/thread_jandroid.h
index e3d1df5e..7a5ce955 100644
--- a/engine/platform/android/thread_jandroid.h
+++ b/engine/platform/android/thread_jandroid.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THREAD_JANDROID_H
-#define THREAD_JANDROID_H
+#pragma once
 
 #include <jni.h>
 
@@ -37,5 +36,3 @@ void init_thread_jandroid(JavaVM *p_jvm, JNIEnv *p_env);
 
 void setup_android_thread();
 JNIEnv *get_jni_env();
-
-#endif // THREAD_JANDROID_H
diff --git a/engine/platform/android/tts_android.cpp b/engine/platform/android/tts_android.cpp
index d560f853..3dd9ff7b 100644
--- a/engine/platform/android/tts_android.cpp
+++ b/engine/platform/android/tts_android.cpp
@@ -49,30 +49,37 @@ jmethodID TTS_Android::_stop_speaking = nullptr;
 
 HashMap<int, Char16String> TTS_Android::ids;
 
+void TTS_Android::initialize_tts() {
+	JNIEnv *env = get_jni_env();
+	ERR_FAIL_NULL(env);
+
+	if (_init) {
+		env->CallVoidMethod(tts, _init);
+		initialized = true;
+	}
+}
+
 void TTS_Android::setup(jobject p_tts) {
+	JNIEnv *env = get_jni_env();
+	ERR_FAIL_NULL(env);
+
+	tts = env->NewGlobalRef(p_tts);
+
+	jclass c = env->GetObjectClass(tts);
+	cls = (jclass)env->NewGlobalRef(c);
+
+	_init = env->GetMethodID(cls, "init", "()V");
+	_is_speaking = env->GetMethodID(cls, "isSpeaking", "()Z");
+	_is_paused = env->GetMethodID(cls, "isPaused", "()Z");
+	_get_voices = env->GetMethodID(cls, "getVoices", "()[Ljava/lang/String;");
+	_speak = env->GetMethodID(cls, "speak", "(Ljava/lang/String;Ljava/lang/String;IFFIZ)V");
+	_pause_speaking = env->GetMethodID(cls, "pauseSpeaking", "()V");
+	_resume_speaking = env->GetMethodID(cls, "resumeSpeaking", "()V");
+	_stop_speaking = env->GetMethodID(cls, "stopSpeaking", "()V");
+
 	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
 	if (tts_enabled) {
-		JNIEnv *env = get_jni_env();
-		ERR_FAIL_NULL(env);
-
-		tts = env->NewGlobalRef(p_tts);
-
-		jclass c = env->GetObjectClass(tts);
-		cls = (jclass)env->NewGlobalRef(c);
-
-		_init = env->GetMethodID(cls, "init", "()V");
-		_is_speaking = env->GetMethodID(cls, "isSpeaking", "()Z");
-		_is_paused = env->GetMethodID(cls, "isPaused", "()Z");
-		_get_voices = env->GetMethodID(cls, "getVoices", "()[Ljava/lang/String;");
-		_speak = env->GetMethodID(cls, "speak", "(Ljava/lang/String;Ljava/lang/String;IFFIZ)V");
-		_pause_speaking = env->GetMethodID(cls, "pauseSpeaking", "()V");
-		_resume_speaking = env->GetMethodID(cls, "resumeSpeaking", "()V");
-		_stop_speaking = env->GetMethodID(cls, "stopSpeaking", "()V");
-
-		if (_init) {
-			env->CallVoidMethod(tts, _init);
-			initialized = true;
-		}
+		initialize_tts();
 	}
 }
 
@@ -80,12 +87,19 @@ void TTS_Android::terminate() {
 	JNIEnv *env = get_jni_env();
 	ERR_FAIL_NULL(env);
 
-	env->DeleteGlobalRef(cls);
-	env->DeleteGlobalRef(tts);
+	if (cls) {
+		env->DeleteGlobalRef(cls);
+	}
+	if (tts) {
+		env->DeleteGlobalRef(tts);
+	}
 }
 
 void TTS_Android::_java_utterance_callback(int p_event, int p_id, int p_pos) {
-	ERR_FAIL_COND_MSG(!initialized, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	if (ids.has(p_id)) {
 		int pos = 0;
 		if ((DisplayServer::TTSUtteranceEvent)p_event == DisplayServer::TTS_UTTERANCE_BOUNDARY) {
@@ -106,7 +120,10 @@ void TTS_Android::_java_utterance_callback(int p_event, int p_id, int p_pos) {
 }
 
 bool TTS_Android::is_speaking() {
-	ERR_FAIL_COND_V_MSG(!initialized, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	if (_is_speaking) {
 		JNIEnv *env = get_jni_env();
 
@@ -118,7 +135,10 @@ bool TTS_Android::is_speaking() {
 }
 
 bool TTS_Android::is_paused() {
-	ERR_FAIL_COND_V_MSG(!initialized, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	if (_is_paused) {
 		JNIEnv *env = get_jni_env();
 
@@ -130,7 +150,10 @@ bool TTS_Android::is_paused() {
 }
 
 Array TTS_Android::get_voices() {
-	ERR_FAIL_COND_V_MSG(!initialized, Array(), "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, Array());
 	Array list;
 	if (_get_voices) {
 		JNIEnv *env = get_jni_env();
@@ -158,7 +181,10 @@ Array TTS_Android::get_voices() {
 }
 
 void TTS_Android::speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int p_utterance_id, bool p_interrupt) {
-	ERR_FAIL_COND_MSG(!initialized, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	if (p_interrupt) {
 		stop();
 	}
@@ -183,7 +209,10 @@ void TTS_Android::speak(const String &p_text, const String &p_voice, int p_volum
 }
 
 void TTS_Android::pause() {
-	ERR_FAIL_COND_MSG(!initialized, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	if (_pause_speaking) {
 		JNIEnv *env = get_jni_env();
 
@@ -193,7 +222,10 @@ void TTS_Android::pause() {
 }
 
 void TTS_Android::resume() {
-	ERR_FAIL_COND_MSG(!initialized, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	if (_resume_speaking) {
 		JNIEnv *env = get_jni_env();
 
@@ -203,7 +235,10 @@ void TTS_Android::resume() {
 }
 
 void TTS_Android::stop() {
-	ERR_FAIL_COND_MSG(!initialized, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!initialized)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	for (const KeyValue<int, Char16String> &E : ids) {
 		DisplayServer::get_singleton()->tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E.key);
 	}
diff --git a/engine/platform/android/tts_android.h b/engine/platform/android/tts_android.h
index 4cc7c128..063af552 100644
--- a/engine/platform/android/tts_android.h
+++ b/engine/platform/android/tts_android.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TTS_ANDROID_H
-#define TTS_ANDROID_H
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "core/string/ustring.h"
@@ -55,6 +54,8 @@ class TTS_Android {
 
 	static HashMap<int, Char16String> ids;
 
+	static void initialize_tts();
+
 public:
 	static void setup(jobject p_tts);
 	static void terminate();
@@ -68,5 +69,3 @@ public:
 	static void resume();
 	static void stop();
 };
-
-#endif // TTS_ANDROID_H
diff --git a/engine/platform/android/variant/callable_jni.h b/engine/platform/android/variant/callable_jni.h
index 10d68a47..bba19d35 100644
--- a/engine/platform/android/variant/callable_jni.h
+++ b/engine/platform/android/variant/callable_jni.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CALLABLE_JNI_H
-#define CALLABLE_JNI_H
+#pragma once
 
 #include <jni.h>
 
@@ -39,5 +38,3 @@ JNIEXPORT jobject JNICALL Java_org_godotengine_godot_variant_Callable_nativeCall
 JNIEXPORT void JNICALL Java_org_godotengine_godot_variant_Callable_nativeCallObjectDeferred(JNIEnv *p_env, jclass p_clazz, jlong p_object_id, jstring p_method_name, jobjectArray p_parameters);
 JNIEXPORT void JNICALL Java_org_godotengine_godot_variant_Callable_releaseNativePointer(JNIEnv *p_env, jclass clazz, jlong p_native_pointer);
 }
-
-#endif // CALLABLE_JNI_H
diff --git a/engine/platform/ios/SCsub b/engine/platform/ios/SCsub
index d16dcb1a..bb89b1dc 100644
--- a/engine/platform/ios/SCsub
+++ b/engine/platform/ios/SCsub
@@ -97,9 +97,9 @@ def combine_libs(target=None, source=None, env=None):
     )
 
 
-combine_command = env_ios.Command("#bin/libgodot" + env_ios["LIBSUFFIX"], [ios_lib] + env_ios["LIBS"], combine_libs)
+combine_command = env_ios.CommandNoCache(
+    "#bin/libgodot" + env_ios["LIBSUFFIX"], [ios_lib] + env_ios["LIBS"], env.Run(combine_libs)
+)
 
 if env["generate_bundle"]:
-    generate_bundle_command = env.Command("generate_bundle", [], generate_bundle)
-    command = env.AlwaysBuild(generate_bundle_command)
-    env.Depends(command, [combine_command])
+    env.AlwaysBuild(env.CommandNoCache("generate_bundle", combine_command, env.Run(generate_bundle)))
diff --git a/engine/platform/ios/api/api.h b/engine/platform/ios/api/api.h
index 15634722..c1b76750 100644
--- a/engine/platform/ios/api/api.h
+++ b/engine/platform/ios/api/api.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IOS_API_H
-#define IOS_API_H
+#pragma once
 
 #if defined(IOS_ENABLED)
 extern void godot_ios_plugins_initialize();
@@ -38,5 +37,3 @@ extern void godot_ios_plugins_deinitialize();
 
 void register_ios_api();
 void unregister_ios_api();
-
-#endif // IOS_API_H
diff --git a/engine/platform/ios/app_delegate.h b/engine/platform/ios/app_delegate.h
index d8310792..2f29e087 100644
--- a/engine/platform/ios/app_delegate.h
+++ b/engine/platform/ios/app_delegate.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 @class ViewController;
diff --git a/engine/platform/ios/detect.py b/engine/platform/ios/detect.py
index 6b5b9f50..16ee4385 100644
--- a/engine/platform/ios/detect.py
+++ b/engine/platform/ios/detect.py
@@ -164,7 +164,7 @@ def configure(env: "SConsEnvironment"):
                 "$IOS_SDK_PATH/System/Library/Frameworks/QuartzCore.framework/Headers",
             ]
         )
-        env.Prepend(CPPPATH=["#thirdparty/spirv-cross"])
+        env.Prepend(CPPEXTPATH=["#thirdparty/spirv-cross"])
 
     if env["vulkan"] and env["ios_simulator"]:
         print_warning("iOS simulator does not support the Vulkan rendering driver")
diff --git a/engine/platform/ios/device_metrics.h b/engine/platform/ios/device_metrics.h
index 2eb9e003..b669e457 100644
--- a/engine/platform/ios/device_metrics.h
+++ b/engine/platform/ios/device_metrics.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <Foundation/Foundation.h>
 
 @interface GodotDeviceMetrics : NSObject
diff --git a/engine/platform/ios/display_layer.h b/engine/platform/ios/display_layer.h
index e719a42c..eda3ad21 100644
--- a/engine/platform/ios/display_layer.h
+++ b/engine/platform/ios/display_layer.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <OpenGLES/EAGLDrawable.h>
 #import <QuartzCore/QuartzCore.h>
 
diff --git a/engine/platform/ios/display_server_ios.h b/engine/platform/ios/display_server_ios.h
index 696f72b0..aa4b00d0 100644
--- a/engine/platform/ios/display_server_ios.h
+++ b/engine/platform/ios/display_server_ios.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_IOS_H
-#define DISPLAY_SERVER_IOS_H
+#pragma once
 
 #include "core/input/input.h"
 #include "servers/display_server.h"
@@ -45,7 +44,7 @@
 #endif // VULKAN_ENABLED
 
 #if defined(METAL_ENABLED)
-#include "drivers/metal/rendering_context_driver_metal.h"
+#import "drivers/metal/rendering_context_driver_metal.h"
 #endif // METAL_ENABLED
 #endif // RD_ENABLED
 
@@ -57,7 +56,7 @@
 #import <QuartzCore/CAMetalLayer.h>
 
 class DisplayServerIOS : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerIOS, DisplayServer);
 
 	_THREAD_SAFE_CLASS_
 
@@ -84,6 +83,8 @@ class DisplayServerIOS : public DisplayServer {
 
 	void perform_event(const Ref<InputEvent> &p_event);
 
+	void initialize_tts() const;
+
 	DisplayServerIOS(const String &p_rendering_driver, DisplayServer::WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerIOS();
 
@@ -235,5 +236,3 @@ public:
 	void resize_window(CGSize size);
 	virtual void swap_buffers() override {}
 };
-
-#endif // DISPLAY_SERVER_IOS_H
diff --git a/engine/platform/ios/display_server_ios.mm b/engine/platform/ios/display_server_ios.mm
index 09acc199..7c75fa0f 100644
--- a/engine/platform/ios/display_server_ios.mm
+++ b/engine/platform/ios/display_server_ios.mm
@@ -61,7 +61,7 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode
 	// Init TTS
 	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
 	if (tts_enabled) {
-		tts = [[TTS_IOS alloc] init];
+		initialize_tts();
 	}
 	native_menu = memnew(NativeMenu);
 
@@ -76,11 +76,10 @@ DisplayServerIOS::DisplayServerIOS(const String &p_rendering_driver, WindowMode
 		RenderingContextDriverVulkanIOS::WindowPlatformData vulkan;
 #endif
 #ifdef METAL_ENABLED
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 		// Eliminate "RenderingContextDriverMetal is only available on iOS 14.0 or newer".
 		RenderingContextDriverMetal::WindowPlatformData metal;
-#pragma clang diagnostic pop
+		GODOT_CLANG_WARNING_POP
 #endif
 	} wpd;
 
@@ -389,39 +388,63 @@ bool DisplayServerIOS::has_feature(Feature p_feature) const {
 String DisplayServerIOS::get_name() const {
 	return "iOS";
 }
+void DisplayServerIOS::initialize_tts() const {
+	const_cast<DisplayServerIOS *>(this)->tts = [[TTS_IOS alloc] init];
+}
 
 bool DisplayServerIOS::tts_is_speaking() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return [tts isSpeaking];
 }
 
 bool DisplayServerIOS::tts_is_paused() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return [tts isPaused];
 }
 
 TypedArray<Dictionary> DisplayServerIOS::tts_get_voices() const {
-	ERR_FAIL_NULL_V_MSG(tts, TypedArray<Dictionary>(), "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, TypedArray<Dictionary>());
 	return [tts getVoices];
 }
 
 void DisplayServerIOS::tts_speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int p_utterance_id, bool p_interrupt) {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts speak:p_text voice:p_voice volume:p_volume pitch:p_pitch rate:p_rate utterance_id:p_utterance_id interrupt:p_interrupt];
 }
 
 void DisplayServerIOS::tts_pause() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts pauseSpeaking];
 }
 
 void DisplayServerIOS::tts_resume() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts resumeSpeaking];
 }
 
 void DisplayServerIOS::tts_stop() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts stopSpeaking];
 }
 
@@ -774,7 +797,7 @@ bool DisplayServerIOS::has_hardware_keyboard() const {
 }
 
 void DisplayServerIOS::clipboard_set(const String &p_text) {
-	[UIPasteboard generalPasteboard].string = [NSString stringWithUTF8String:p_text.utf8()];
+	[UIPasteboard generalPasteboard].string = [NSString stringWithUTF8String:p_text.utf8().get_data()];
 }
 
 String DisplayServerIOS::clipboard_get() const {
diff --git a/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml b/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml
index 2387c19a..0632e9f0 100644
--- a/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml
+++ b/engine/platform/ios/doc_classes/EditorExportPlatformIOS.xml
@@ -106,10 +106,10 @@
 			[/codeblock]
 		</member>
 		<member name="entitlements/game_center" type="bool" setter="" getter="">
-			Enable to allow access to Game Center features. [url=https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_game-center]com.apple.developer.game-center[/url].
+			If [code]true[/code], allows access to Game Center features. See [url=https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_game-center]com.apple.developer.game-center[/url].
 		</member>
 		<member name="entitlements/increased_memory_limit" type="bool" setter="" getter="">
-			Enable if app may perform better with a higher memory limit. [url=https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_kernel_increased-memory-limit]com.apple.developer.kernel.increased-memory-limit[/url].
+			If [code]true[/code], hints that the app might perform better with a higher memory limit. See [url=https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_kernel_increased-memory-limit]com.apple.developer.kernel.increased-memory-limit[/url].
 		</member>
 		<member name="entitlements/push_notifications" type="String" setter="" getter="">
 			Environment for Apple Push Notification service. See [url=https://developer.apple.com/documentation/bundleresources/entitlements/aps-environment]aps-environment[/url].
diff --git a/engine/platform/ios/export/export.h b/engine/platform/ios/export/export.h
index 35581105..febd195e 100644
--- a/engine/platform/ios/export/export.h
+++ b/engine/platform/ios/export/export.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IOS_EXPORT_H
-#define IOS_EXPORT_H
+#pragma once
 
 void register_ios_exporter_types();
 void register_ios_exporter();
-
-#endif // IOS_EXPORT_H
diff --git a/engine/platform/ios/export/export_plugin.cpp b/engine/platform/ios/export/export_plugin.cpp
index 84bf722d..ab13f23a 100644
--- a/engine/platform/ios/export/export_plugin.cpp
+++ b/engine/platform/ios/export/export_plugin.cpp
@@ -364,7 +364,7 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
 	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/photolibrary_usage_description", PROPERTY_HINT_PLACEHOLDER_TEXT, "Provide a message if you need access to the photo library"), ""));
 	r_options->push_back(ExportOption(PropertyInfo(Variant::DICTIONARY, "privacy/photolibrary_usage_description_localized", PROPERTY_HINT_LOCALIZABLE_STRING), Dictionary()));
 
-	for (uint64_t i = 0; i < sizeof(api_info) / sizeof(api_info[0]); ++i) {
+	for (uint64_t i = 0; i < std::size(api_info); ++i) {
 		String prop_name = vformat("privacy/%s_access_reasons", api_info[i].prop_name);
 		String hint;
 		for (int j = 0; j < api_info[i].prop_flag_value.size(); j++) {
@@ -381,13 +381,13 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
 
 	{
 		String hint;
-		for (uint64_t i = 0; i < sizeof(data_collect_purpose_info) / sizeof(data_collect_purpose_info[0]); ++i) {
+		for (uint64_t i = 0; i < std::size(data_collect_purpose_info); ++i) {
 			if (i != 0) {
 				hint += ",";
 			}
 			hint += vformat("%s:%d", data_collect_purpose_info[i].prop_name, (1 << i));
 		}
-		for (uint64_t i = 0; i < sizeof(data_collect_type_info) / sizeof(data_collect_type_info[0]); ++i) {
+		for (uint64_t i = 0; i < std::size(data_collect_type_info); ++i) {
 			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("privacy/collected_data/%s/collected", data_collect_type_info[i].prop_name)), false));
 			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("privacy/collected_data/%s/linked_to_user", data_collect_type_info[i].prop_name)), false));
 			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("privacy/collected_data/%s/used_for_tracking", data_collect_type_info[i].prop_name)), false));
@@ -400,7 +400,7 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
 	r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "icons/icon_1024x1024_tinted", PROPERTY_HINT_FILE, "*.svg,*.png,*.webp,*.jpg,*.jpeg"), ""));
 
 	HashSet<String> used_names;
-	for (uint64_t i = 0; i < sizeof(icon_infos) / sizeof(icon_infos[0]); ++i) {
+	for (uint64_t i = 0; i < std::size(icon_infos); ++i) {
 		if (!used_names.has(icon_infos[i].preset_key)) {
 			used_names.insert(icon_infos[i].preset_key);
 			r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, String(icon_infos[i].preset_key), PROPERTY_HINT_FILE, "*.png,*.jpg,*.jpeg"), ""));
@@ -423,8 +423,8 @@ HashMap<String, Variant> EditorExportPlatformIOS::get_custom_project_settings(co
 
 	switch (image_scale_mode) {
 		case 0: {
-			String logo_path = GLOBAL_GET("application/boot_splash/image");
-			bool is_on = GLOBAL_GET("application/boot_splash/fullsize");
+			String logo_path = get_project_setting(p_preset, "application/boot_splash/image");
+			bool is_on = get_project_setting(p_preset, "application/boot_splash/fullsize");
 			// If custom logo is not specified, Godot does not scale default one, so we should do the same.
 			value = (is_on && logo_path.length() > 0) ? "scaleAspectFit" : "center";
 		} break;
@@ -450,9 +450,8 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 	bool valid_rel_specifier = !provisioning_profile_specifier_rel.is_empty();
 	rel_manual |= valid_rel_specifier;
 
-	String str;
+	String str = String::utf8((const char *)pfile.ptr(), pfile.size());
 	String strnew;
-	str.parse_utf8((const char *)pfile.ptr(), pfile.size());
 	Vector<String> lines = str.split("\n");
 	for (int i = 0; i < lines.size(); i++) {
 		if (lines[i].contains("$binary")) {
@@ -587,7 +586,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 		} else if (lines[i].contains("$interface_orientations")) {
 			String orientations;
 			const DisplayServer::ScreenOrientation screen_orientation =
-					DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation")));
+					DisplayServer::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation")));
 
 			switch (screen_orientation) {
 				case DisplayServer::SCREEN_LANDSCAPE:
@@ -625,7 +624,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 		} else if (lines[i].contains("$ipad_interface_orientations")) {
 			String orientations;
 			const DisplayServer::ScreenOrientation screen_orientation =
-					DisplayServer::ScreenOrientation(int(GLOBAL_GET("display/window/handheld/orientation")));
+					DisplayServer::ScreenOrientation(int(get_project_setting(p_preset, "display/window/handheld/orientation")));
 
 			switch (screen_orientation) {
 				case DisplayServer::SCREEN_LANDSCAPE:
@@ -694,8 +693,8 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 
 			switch (image_scale_mode) {
 				case 0: {
-					String logo_path = GLOBAL_GET("application/boot_splash/image");
-					bool is_on = GLOBAL_GET("application/boot_splash/fullsize");
+					String logo_path = get_project_setting(p_preset, "application/boot_splash/image");
+					bool is_on = get_project_setting(p_preset, "application/boot_splash/fullsize");
 					// If custom logo is not specified, Godot does not scale default one, so we should do the same.
 					value = (is_on && logo_path.length() > 0) ? "scaleAspectFit" : "center";
 				} break;
@@ -707,7 +706,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 			strnew += lines[i].replace("$launch_screen_image_mode", value) + "\n";
 		} else if (lines[i].contains("$launch_screen_background_color")) {
 			bool use_custom = p_preset->get("storyboard/use_custom_bg_color");
-			Color color = use_custom ? p_preset->get("storyboard/custom_bg_color") : GLOBAL_GET("application/boot_splash/bg_color");
+			Color color = use_custom ? p_preset->get("storyboard/custom_bg_color") : get_project_setting(p_preset, "application/boot_splash/bg_color");
 			const String value_format = "red=\"$red\" green=\"$green\" blue=\"$blue\" alpha=\"$alpha\"";
 
 			Dictionary value_dictionary;
@@ -720,7 +719,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 			strnew += lines[i].replace("$launch_screen_background_color", value) + "\n";
 		} else if (lines[i].contains("$pbx_locale_file_reference")) {
 			String locale_files;
-			Vector<String> translations = GLOBAL_GET("internationalization/locale/translations");
+			Vector<String> translations = get_project_setting(p_preset, "internationalization/locale/translations");
 			if (translations.size() > 0) {
 				HashSet<String> languages;
 				for (const String &E : translations) {
@@ -739,7 +738,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 			strnew += lines[i].replace("$pbx_locale_file_reference", locale_files);
 		} else if (lines[i].contains("$pbx_locale_build_reference")) {
 			String locale_files;
-			Vector<String> translations = GLOBAL_GET("internationalization/locale/translations");
+			Vector<String> translations = get_project_setting(p_preset, "internationalization/locale/translations");
 			if (translations.size() > 0) {
 				HashSet<String> languages;
 				for (const String &E : translations) {
@@ -787,7 +786,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 			strnew += lines[i].replace("$swift_runtime_build_phase", value) + "\n";
 		} else if (lines[i].contains("$priv_collection")) {
 			bool section_opened = false;
-			for (uint64_t j = 0; j < sizeof(data_collect_type_info) / sizeof(data_collect_type_info[0]); ++j) {
+			for (uint64_t j = 0; j < std::size(data_collect_type_info); ++j) {
 				bool data_collected = p_preset->get(vformat("privacy/collected_data/%s/collected", data_collect_type_info[j].prop_name));
 				bool linked = p_preset->get(vformat("privacy/collected_data/%s/linked_to_user", data_collect_type_info[j].prop_name));
 				bool tracking = p_preset->get(vformat("privacy/collected_data/%s/used_for_tracking", data_collect_type_info[j].prop_name));
@@ -816,7 +815,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 					if (purposes != 0) {
 						strnew += "\t\t\t\t<key>NSPrivacyCollectedDataTypePurposes</key>\n";
 						strnew += "\t\t\t\t<array>\n";
-						for (uint64_t k = 0; k < sizeof(data_collect_purpose_info) / sizeof(data_collect_purpose_info[0]); ++k) {
+						for (uint64_t k = 0; k < std::size(data_collect_purpose_info); ++k) {
 							if (purposes & (1 << k)) {
 								strnew += vformat("\t\t\t\t\t<string>%s</string>\n", data_collect_purpose_info[k].type_name);
 							}
@@ -848,7 +847,7 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
 			}
 		} else if (lines[i].contains("$priv_api_types")) {
 			strnew += "\t<array>\n";
-			for (uint64_t j = 0; j < sizeof(api_info) / sizeof(api_info[0]); ++j) {
+			for (uint64_t j = 0; j < std::size(api_info); ++j) {
 				int api_access = p_preset->get(vformat("privacy/%s_access_reasons", api_info[j].prop_name));
 				if (api_access != 0) {
 					strnew += "\t\t<dict>\n";
@@ -958,7 +957,7 @@ Error EditorExportPlatformIOS::_export_icons(const Ref<EditorExportPreset> &p_pr
 		return ERR_CANT_OPEN;
 	}
 
-	Color boot_bg_color = GLOBAL_GET("application/boot_splash/bg_color");
+	Color boot_bg_color = get_project_setting(p_preset, "application/boot_splash/bg_color");
 
 	enum IconColorMode {
 		ICON_NORMAL,
@@ -968,7 +967,7 @@ Error EditorExportPlatformIOS::_export_icons(const Ref<EditorExportPreset> &p_pr
 	};
 
 	bool first_icon = true;
-	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
+	for (uint64_t i = 0; i < std::size(icon_infos); ++i) {
 		for (int color_mode = ICON_NORMAL; color_mode < ICON_MAX; color_mode++) {
 			IconInfo info = icon_infos[i];
 			int side_size = String(info.actual_size_side).to_int();
@@ -1000,7 +999,7 @@ Error EditorExportPlatformIOS::_export_icons(const Ref<EditorExportPreset> &p_pr
 					continue;
 				}
 				// Resize main app icon.
-				icon_path = GLOBAL_GET("application/config/icon");
+				icon_path = get_project_setting(p_preset, "application/config/icon");
 				Error err = OK;
 				Ref<Image> img = _load_icon_or_splash_image(icon_path, &err);
 				if (err != OK || img.is_null() || img->is_empty()) {
@@ -1134,7 +1133,7 @@ Error EditorExportPlatformIOS::_export_loading_screen_file(const Ref<EditorExpor
 		Error err = OK;
 		Ref<Image> splash;
 
-		const String splash_path = GLOBAL_GET("application/boot_splash/image");
+		const String splash_path = get_project_setting(p_preset, "application/boot_splash/image");
 
 		if (!splash_path.is_empty()) {
 			splash = _load_icon_or_splash_image(splash_path, &err);
@@ -2120,8 +2119,8 @@ Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPres
 
 	print_line("Static framework: " + library_to_use);
 	String pkg_name;
-	if (String(GLOBAL_GET("application/config/name")) != "") {
-		pkg_name = String(GLOBAL_GET("application/config/name"));
+	if (String(get_project_setting(p_preset, "application/config/name")) != "") {
+		pkg_name = String(get_project_setting(p_preset, "application/config/name"));
 	} else {
 		pkg_name = "Unnamed";
 	}
@@ -2282,14 +2281,12 @@ Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPres
 		return ERR_FILE_NOT_FOUND;
 	}
 
-	// Generate translations files.
-
-	Dictionary appnames = GLOBAL_GET("application/config/name_localized");
+	Dictionary appnames = get_project_setting(p_preset, "application/config/name_localized");
 	Dictionary camera_usage_descriptions = p_preset->get("privacy/camera_usage_description_localized");
 	Dictionary microphone_usage_descriptions = p_preset->get("privacy/microphone_usage_description_localized");
 	Dictionary photolibrary_usage_descriptions = p_preset->get("privacy/photolibrary_usage_description_localized");
 
-	Vector<String> translations = GLOBAL_GET("internationalization/locale/translations");
+	Vector<String> translations = get_project_setting(p_preset, "internationalization/locale/translations");
 	if (translations.size() > 0) {
 		{
 			String fname = binary_dir + "/en.lproj";
@@ -2297,7 +2294,7 @@ Error EditorExportPlatformIOS::_export_project_helper(const Ref<EditorExportPres
 			Ref<FileAccess> f = FileAccess::open(fname + "/InfoPlist.strings", FileAccess::WRITE);
 			f->store_line("/* Localized versions of Info.plist keys */");
 			f->store_line("");
-			f->store_line("CFBundleDisplayName = \"" + GLOBAL_GET("application/config/name").operator String() + "\";");
+			f->store_line("CFBundleDisplayName = \"" + get_project_setting(p_preset, "application/config/name").operator String() + "\";");
 			f->store_line("NSCameraUsageDescription = \"" + p_preset->get("privacy/camera_usage_description").operator String() + "\";");
 			f->store_line("NSMicrophoneUsageDescription = \"" + p_preset->get("privacy/microphone_usage_description").operator String() + "\";");
 			f->store_line("NSPhotoLibraryUsageDescription = \"" + p_preset->get("privacy/photolibrary_usage_description").operator String() + "\";");
@@ -2540,8 +2537,8 @@ bool EditorExportPlatformIOS::has_valid_export_configuration(const Ref<EditorExp
 		}
 	}
 
-	String rendering_method = GLOBAL_GET("rendering/renderer/rendering_method.mobile");
-	String rendering_driver = GLOBAL_GET("rendering/rendering_device/driver.ios");
+	String rendering_method = get_project_setting(p_preset, "rendering/renderer/rendering_method.mobile");
+	String rendering_driver = get_project_setting(p_preset, "rendering/rendering_device/driver.ios");
 	if ((rendering_method == "forward_plus" || rendering_method == "mobile") && rendering_driver == "metal") {
 		float version = p_preset->get("application/min_ios_version").operator String().to_float();
 		if (version < 14.0) {
@@ -2735,6 +2732,42 @@ void EditorExportPlatformIOS::_check_for_changes_poll_thread(void *ud) {
 			}
 		}
 
+		// Enum devices (via Xcode).
+		if (ea->has_runnable_preset.is_set() && _check_xcode_install() && (FileAccess::exists("/usr/bin/xcrun") || FileAccess::exists("/bin/xcrun"))) {
+			String devices;
+			List<String> args;
+			args.push_back("devicectl");
+			args.push_back("list");
+			args.push_back("devices");
+			args.push_back("-j");
+			args.push_back("-");
+			args.push_back("-q");
+			int ec = 0;
+			Error err = OS::get_singleton()->execute("xcrun", args, &devices, &ec, true);
+			if (err == OK && ec == 0) {
+				Ref<JSON> json;
+				json.instantiate();
+				err = json->parse(devices);
+				if (err == OK) {
+					const Dictionary &data = json->get_data();
+					const Dictionary &result = data["result"];
+					const Array &devices = result["devices"];
+					for (int i = 0; i < devices.size(); i++) {
+						const Dictionary &device_info = devices[i];
+						const Dictionary &conn_props = device_info["connectionProperties"];
+						const Dictionary &dev_props = device_info["deviceProperties"];
+						if (conn_props["pairingState"] == "paired" && dev_props["developerModeStatus"] == "enabled") {
+							Device nd;
+							nd.id = device_info["identifier"];
+							nd.name = dev_props["name"].operator String() + " (devicectl, " + ((conn_props["transportType"] == "localNetwork") ? "network" : "wired") + ")";
+							nd.wifi = conn_props["transportType"] == "localNetwork";
+							ldevices.push_back(nd);
+						}
+					}
+				}
+			}
+		}
+
 		// Update device list.
 		{
 			MutexLock lock(ea->device_lock);
@@ -2922,7 +2955,7 @@ Error EditorExportPlatformIOS::run(const Ref<EditorExportPreset> &p_preset, int
 			}
 		}
 	} else {
-		// Deploy and run on real device.
+		// Deploy and run on real device (via Xcode).
 		if (ep.step("Installing to device...", 3)) {
 			CLEANUP_AND_RETURN(ERR_SKIP);
 		} else {
diff --git a/engine/platform/ios/export/export_plugin.h b/engine/platform/ios/export/export_plugin.h
index 8fc43615..b2268c37 100644
--- a/engine/platform/ios/export/export_plugin.h
+++ b/engine/platform/ios/export/export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IOS_EXPORT_PLUGIN_H
-#define IOS_EXPORT_PLUGIN_H
+#pragma once
 
 #include "godot_plugin_config.h"
 
@@ -41,7 +40,6 @@
 #include "core/io/zip_io.h"
 #include "core/os/os.h"
 #include "core/templates/safe_refcount.h"
-#include "core/version.h"
 #include "editor/editor_settings.h"
 #include "editor/export/editor_export_platform.h"
 #include "main/splash.gen.h"
@@ -298,5 +296,3 @@ public:
 		return enabled_plugins;
 	}
 };
-
-#endif // IOS_EXPORT_PLUGIN_H
diff --git a/engine/platform/ios/export/godot_plugin_config.h b/engine/platform/ios/export/godot_plugin_config.h
index 5ff5b26a..13f60fc5 100644
--- a/engine/platform/ios/export/godot_plugin_config.h
+++ b/engine/platform/ios/export/godot_plugin_config.h
@@ -28,10 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IOS_GODOT_PLUGIN_CONFIG_H
-#define IOS_GODOT_PLUGIN_CONFIG_H
+#pragma once
 
-#include "core/error/error_list.h"
 #include "core/io/config_file.h"
 #include "core/string/ustring.h"
 
@@ -131,5 +129,3 @@ struct PluginConfigIOS {
 
 	static PluginConfigIOS load_plugin_config(Ref<ConfigFile> config_file, const String &path);
 };
-
-#endif // IOS_GODOT_PLUGIN_CONFIG_H
diff --git a/engine/platform/ios/export/logo.svg b/engine/platform/ios/export/logo.svg
index 5897f9f6..8e14ff43 100644
--- a/engine/platform/ios/export/logo.svg
+++ b/engine/platform/ios/export/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#bfbfbf" d="M1 23.27h2.504V12.61H1zm1.247-12.057c.784 0 1.398-.603 1.398-1.358 0-.764-.614-1.367-1.398-1.367-.774 0-1.388.603-1.388 1.367 0 .755.614 1.358 1.388 1.358zm9.594-2.695c-4.233 0-6.888 2.886-6.888 7.502s2.654 7.492 6.888 7.492c4.224 0 6.88-2.876 6.88-7.492s-2.656-7.502-6.88-7.502zm0 2.212c2.585 0 4.234 2.052 4.234 5.29 0 3.228-1.649 5.28-4.234 5.28-2.594 0-4.233-2.052-4.233-5.28 0-3.238 1.639-5.29 4.233-5.29zm7.936 8.458c.11 2.675 2.303 4.324 5.641 4.324 3.51 0 5.723-1.73 5.723-4.485 0-2.162-1.247-3.379-4.194-4.053l-1.67-.382c-1.78-.422-2.513-.985-2.513-1.95 0-1.208 1.106-2.012 2.745-2.012 1.66 0 2.796.814 2.916 2.172H30.9c-.06-2.554-2.172-4.284-5.37-4.284-3.158 0-5.4 1.74-5.4 4.314 0 2.072 1.267 3.36 3.942 3.973l1.88.442c1.83.433 2.575 1.036 2.575 2.082 0 1.207-1.217 2.072-2.967 2.072-1.77 0-3.107-.875-3.268-2.213h-2.514z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#bfbfbf" d="M1 23.27h2.504V12.61H1zm1.247-12.057c.784 0 1.398-.603 1.398-1.358 0-.764-.614-1.367-1.398-1.367-.774 0-1.388.603-1.388 1.367 0 .755.614 1.358 1.388 1.358zm9.594-2.695c-4.233 0-6.888 2.886-6.888 7.502s2.654 7.492 6.888 7.492c4.224 0 6.88-2.876 6.88-7.492s-2.656-7.502-6.88-7.502zm0 2.212c2.585 0 4.234 2.052 4.234 5.29 0 3.228-1.649 5.28-4.234 5.28-2.594 0-4.233-2.052-4.233-5.28 0-3.238 1.639-5.29 4.233-5.29zm7.936 8.458c.11 2.675 2.303 4.324 5.641 4.324 3.51 0 5.723-1.73 5.723-4.485 0-2.162-1.247-3.379-4.194-4.053l-1.67-.382c-1.78-.422-2.513-.985-2.513-1.95 0-1.208 1.106-2.012 2.745-2.012 1.66 0 2.796.814 2.916 2.172H30.9c-.06-2.554-2.172-4.284-5.37-4.284-3.158 0-5.4 1.74-5.4 4.314 0 2.072 1.267 3.36 3.942 3.973l1.88.442c1.83.433 2.575 1.036 2.575 2.082 0 1.207-1.217 2.072-2.967 2.072-1.77 0-3.107-.875-3.268-2.213h-2.514z"/></svg>
diff --git a/engine/platform/ios/export/run_icon.svg b/engine/platform/ios/export/run_icon.svg
index 9a9460bf..72f55e86 100644
--- a/engine/platform/ios/export/run_icon.svg
+++ b/engine/platform/ios/export/run_icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M.462 11.653H1.72V6.296H.462Zm.627-6.059a.687.687 0 0 0 .702-.682.688.688 0 0 0-.702-.687.687.687 0 0 0-.698.687c0 .38.309.682.698.682zM5.91 4.24c-2.127 0-3.461 1.45-3.461 3.77 0 2.32 1.333 3.765 3.461 3.765 2.123 0 3.457-1.445 3.457-3.765 0-2.32-1.334-3.77-3.457-3.77zm0 1.112c1.299 0 2.128 1.03 2.128 2.658 0 1.622-.829 2.653-2.128 2.653-1.304 0-2.127-1.03-2.127-2.653 0-1.627.823-2.658 2.127-2.658zm3.988 4.25c.055 1.344 1.157 2.173 2.835 2.173 1.764 0 2.876-.87 2.876-2.254 0-1.086-.627-1.698-2.108-2.037l-.839-.192c-.895-.212-1.263-.495-1.263-.98 0-.607.556-1.01 1.38-1.01.834 0 1.405.408 1.465 1.09h1.244c-.03-1.283-1.092-2.152-2.699-2.152-1.587 0-2.714.874-2.714 2.168 0 1.041.637 1.688 1.981 1.997l.945.222c.92.217 1.294.52 1.294 1.046 0 .606-.611 1.041-1.49 1.041-.89 0-1.562-.44-1.643-1.112H9.899Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="M.462 11.653H1.72V6.296H.462Zm.627-6.059a.687.687 0 0 0 .702-.682.688.688 0 0 0-.702-.687.687.687 0 0 0-.698.687c0 .38.309.682.698.682zM5.91 4.24c-2.127 0-3.461 1.45-3.461 3.77 0 2.32 1.333 3.765 3.461 3.765 2.123 0 3.457-1.445 3.457-3.765 0-2.32-1.334-3.77-3.457-3.77zm0 1.112c1.299 0 2.128 1.03 2.128 2.658 0 1.622-.829 2.653-2.128 2.653-1.304 0-2.127-1.03-2.127-2.653 0-1.627.823-2.658 2.127-2.658zm3.988 4.25c.055 1.344 1.157 2.173 2.835 2.173 1.764 0 2.876-.87 2.876-2.254 0-1.086-.627-1.698-2.108-2.037l-.839-.192c-.895-.212-1.263-.495-1.263-.98 0-.607.556-1.01 1.38-1.01.834 0 1.405.408 1.465 1.09h1.244c-.03-1.283-1.092-2.152-2.699-2.152-1.587 0-2.714.874-2.714 2.168 0 1.041.637 1.688 1.981 1.997l.945.222c.92.217 1.294.52 1.294 1.046 0 .606-.611 1.041-1.49 1.041-.89 0-1.562-.44-1.643-1.112H9.899Z"/></svg>
diff --git a/engine/platform/ios/godot_app_delegate.h b/engine/platform/ios/godot_app_delegate.h
index 85dc6bb3..35a90171 100644
--- a/engine/platform/ios/godot_app_delegate.h
+++ b/engine/platform/ios/godot_app_delegate.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 typedef NSObject<UIApplicationDelegate> ApplicationDelegateService;
diff --git a/engine/platform/ios/godot_view.h b/engine/platform/ios/godot_view.h
index b00ca37e..ca774be3 100644
--- a/engine/platform/ios/godot_view.h
+++ b/engine/platform/ios/godot_view.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 class String;
diff --git a/engine/platform/ios/godot_view.mm b/engine/platform/ios/godot_view.mm
index 552c4c26..f2416f2f 100644
--- a/engine/platform/ios/godot_view.mm
+++ b/engine/platform/ios/godot_view.mm
@@ -82,10 +82,9 @@ static const float earth_gravity = 9.80665;
 		layer = [GodotMetalLayer layer];
 #endif
 	} else if ([driverName isEqualToString:@"opengl3"]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // OpenGL is deprecated in iOS 12.0
+		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is deprecated in iOS 12.0.
 		layer = [GodotOpenGLLayer layer];
-#pragma clang diagnostic pop
+		GODOT_CLANG_WARNING_POP
 	} else {
 		return nil;
 	}
@@ -455,22 +454,22 @@ static const float earth_gravity = 9.80665;
 
 	switch (interfaceOrientation) {
 		case UIInterfaceOrientationLandscapeLeft: {
-			DisplayServerIOS::get_singleton()->update_gravity(Vector3(gravity.x, gravity.y, gravity.z).rotated(Vector3(0, 0, 1), -Math_PI * 0.5));
-			DisplayServerIOS::get_singleton()->update_accelerometer(Vector3(acceleration.x + gravity.x, acceleration.y + gravity.y, acceleration.z + gravity.z).rotated(Vector3(0, 0, 1), -Math_PI * 0.5));
-			DisplayServerIOS::get_singleton()->update_magnetometer(Vector3(magnetic.x, magnetic.y, magnetic.z).rotated(Vector3(0, 0, 1), -Math_PI * 0.5));
-			DisplayServerIOS::get_singleton()->update_gyroscope(Vector3(rotation.x, rotation.y, rotation.z).rotated(Vector3(0, 0, 1), -Math_PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_gravity(Vector3(gravity.x, gravity.y, gravity.z).rotated(Vector3(0, 0, 1), -Math::PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_accelerometer(Vector3(acceleration.x + gravity.x, acceleration.y + gravity.y, acceleration.z + gravity.z).rotated(Vector3(0, 0, 1), -Math::PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_magnetometer(Vector3(magnetic.x, magnetic.y, magnetic.z).rotated(Vector3(0, 0, 1), -Math::PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_gyroscope(Vector3(rotation.x, rotation.y, rotation.z).rotated(Vector3(0, 0, 1), -Math::PI * 0.5));
 		} break;
 		case UIInterfaceOrientationLandscapeRight: {
-			DisplayServerIOS::get_singleton()->update_gravity(Vector3(gravity.x, gravity.y, gravity.z).rotated(Vector3(0, 0, 1), Math_PI * 0.5));
-			DisplayServerIOS::get_singleton()->update_accelerometer(Vector3(acceleration.x + gravity.x, acceleration.y + gravity.y, acceleration.z + gravity.z).rotated(Vector3(0, 0, 1), Math_PI * 0.5));
-			DisplayServerIOS::get_singleton()->update_magnetometer(Vector3(magnetic.x, magnetic.y, magnetic.z).rotated(Vector3(0, 0, 1), Math_PI * 0.5));
-			DisplayServerIOS::get_singleton()->update_gyroscope(Vector3(rotation.x, rotation.y, rotation.z).rotated(Vector3(0, 0, 1), Math_PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_gravity(Vector3(gravity.x, gravity.y, gravity.z).rotated(Vector3(0, 0, 1), Math::PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_accelerometer(Vector3(acceleration.x + gravity.x, acceleration.y + gravity.y, acceleration.z + gravity.z).rotated(Vector3(0, 0, 1), Math::PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_magnetometer(Vector3(magnetic.x, magnetic.y, magnetic.z).rotated(Vector3(0, 0, 1), Math::PI * 0.5));
+			DisplayServerIOS::get_singleton()->update_gyroscope(Vector3(rotation.x, rotation.y, rotation.z).rotated(Vector3(0, 0, 1), Math::PI * 0.5));
 		} break;
 		case UIInterfaceOrientationPortraitUpsideDown: {
-			DisplayServerIOS::get_singleton()->update_gravity(Vector3(gravity.x, gravity.y, gravity.z).rotated(Vector3(0, 0, 1), Math_PI));
-			DisplayServerIOS::get_singleton()->update_accelerometer(Vector3(acceleration.x + gravity.x, acceleration.y + gravity.y, acceleration.z + gravity.z).rotated(Vector3(0, 0, 1), Math_PI));
-			DisplayServerIOS::get_singleton()->update_magnetometer(Vector3(magnetic.x, magnetic.y, magnetic.z).rotated(Vector3(0, 0, 1), Math_PI));
-			DisplayServerIOS::get_singleton()->update_gyroscope(Vector3(rotation.x, rotation.y, rotation.z).rotated(Vector3(0, 0, 1), Math_PI));
+			DisplayServerIOS::get_singleton()->update_gravity(Vector3(gravity.x, gravity.y, gravity.z).rotated(Vector3(0, 0, 1), Math::PI));
+			DisplayServerIOS::get_singleton()->update_accelerometer(Vector3(acceleration.x + gravity.x, acceleration.y + gravity.y, acceleration.z + gravity.z).rotated(Vector3(0, 0, 1), Math::PI));
+			DisplayServerIOS::get_singleton()->update_magnetometer(Vector3(magnetic.x, magnetic.y, magnetic.z).rotated(Vector3(0, 0, 1), Math::PI));
+			DisplayServerIOS::get_singleton()->update_gyroscope(Vector3(rotation.x, rotation.y, rotation.z).rotated(Vector3(0, 0, 1), Math::PI));
 		} break;
 		default: { // assume portrait
 			DisplayServerIOS::get_singleton()->update_gravity(Vector3(gravity.x, gravity.y, gravity.z));
diff --git a/engine/platform/ios/godot_view_renderer.h b/engine/platform/ios/godot_view_renderer.h
index 47e615ca..b6a78ffb 100644
--- a/engine/platform/ios/godot_view_renderer.h
+++ b/engine/platform/ios/godot_view_renderer.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 @protocol GodotViewRendererProtocol <NSObject>
diff --git a/engine/platform/ios/ios.h b/engine/platform/ios/ios.h
index cb5be64c..26c11860 100644
--- a/engine/platform/ios/ios.h
+++ b/engine/platform/ios/ios.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IOS_H
-#define IOS_H
+#pragma once
 
 #include "core/object/class_db.h"
 
@@ -58,5 +57,3 @@ public:
 
 	iOS();
 };
-
-#endif // IOS_H
diff --git a/engine/platform/ios/ios_terminal_logger.h b/engine/platform/ios/ios_terminal_logger.h
index 7f0bc37a..8365ace1 100644
--- a/engine/platform/ios/ios_terminal_logger.h
+++ b/engine/platform/ios/ios_terminal_logger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IOS_TERMINAL_LOGGER_H
-#define IOS_TERMINAL_LOGGER_H
+#pragma once
 
 #ifdef IOS_ENABLED
 
@@ -41,5 +40,3 @@ public:
 };
 
 #endif // IOS_ENABLED
-
-#endif // IOS_TERMINAL_LOGGER_H
diff --git a/engine/platform/ios/ios_terminal_logger.mm b/engine/platform/ios/ios_terminal_logger.mm
index b4c9821c..c5a6d111 100644
--- a/engine/platform/ios/ios_terminal_logger.mm
+++ b/engine/platform/ios/ios_terminal_logger.mm
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "ios_terminal_logger.h"
+#import "ios_terminal_logger.h"
 
 #ifdef IOS_ENABLED
 
-#include <os/log.h>
+#import <os/log.h>
 
 void IOSTerminalLogger::log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify, ErrorType p_type) {
 	if (!should_log(true)) {
diff --git a/engine/platform/ios/key_mapping_ios.h b/engine/platform/ios/key_mapping_ios.h
index 8874da30..81abee3c 100644
--- a/engine/platform/ios/key_mapping_ios.h
+++ b/engine/platform/ios/key_mapping_ios.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KEY_MAPPING_IOS_H
-#define KEY_MAPPING_IOS_H
+#pragma once
 
 #include "core/os/keyboard.h"
 
@@ -43,5 +42,3 @@ public:
 	static Key remap_key(CFIndex p_keycode);
 	static KeyLocation key_location(CFIndex p_keycode);
 };
-
-#endif // KEY_MAPPING_IOS_H
diff --git a/engine/platform/ios/keyboard_input_view.h b/engine/platform/ios/keyboard_input_view.h
index 4132afe6..c2e789f5 100644
--- a/engine/platform/ios/keyboard_input_view.h
+++ b/engine/platform/ios/keyboard_input_view.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 @interface GodotKeyboardInputView : UITextView
diff --git a/engine/platform/ios/keyboard_input_view.mm b/engine/platform/ios/keyboard_input_view.mm
index c88a0761..a2e58efb 100644
--- a/engine/platform/ios/keyboard_input_view.mm
+++ b/engine/platform/ios/keyboard_input_view.mm
@@ -122,8 +122,7 @@
 }
 
 - (void)enterText:(NSString *)substring {
-	String characters;
-	characters.parse_utf8([substring UTF8String]);
+	String characters = String::utf8([substring UTF8String]);
 
 	for (int i = 0; i < characters.size(); i++) {
 		int character = characters[i];
diff --git a/engine/platform/ios/os_ios.h b/engine/platform/ios/os_ios.h
index e9cbfd21..f4283958 100644
--- a/engine/platform/ios/os_ios.h
+++ b/engine/platform/ios/os_ios.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_IOS_H
-#define OS_IOS_H
+#pragma once
 
 #ifdef IOS_ENABLED
 
@@ -137,5 +136,3 @@ public:
 };
 
 #endif // IOS_ENABLED
-
-#endif // OS_IOS_H
diff --git a/engine/platform/ios/os_ios.mm b/engine/platform/ios/os_ios.mm
index e1489f02..161b97da 100644
--- a/engine/platform/ios/os_ios.mm
+++ b/engine/platform/ios/os_ios.mm
@@ -359,7 +359,7 @@ String OS_IOS::get_user_data_dir(const String &p_user_dir) const {
 	if (ret.is_empty()) {
 		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
 		if (paths && [paths count] >= 1) {
-			ret.parse_utf8([[paths firstObject] UTF8String]);
+			ret.append_utf8([[paths firstObject] UTF8String]);
 		}
 	}
 	return ret;
@@ -370,7 +370,7 @@ String OS_IOS::get_cache_path() const {
 	if (ret.is_empty()) {
 		NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
 		if (paths && [paths count] >= 1) {
-			ret.parse_utf8([[paths firstObject] UTF8String]);
+			ret.append_utf8([[paths firstObject] UTF8String]);
 		}
 	}
 	return ret;
@@ -393,11 +393,11 @@ String OS_IOS::get_locale() const {
 	NSString *preferredLanguage = [NSLocale preferredLanguages].firstObject;
 
 	if (preferredLanguage) {
-		return String::utf8([preferredLanguage UTF8String]).replace("-", "_");
+		return String::utf8([preferredLanguage UTF8String]).replace_char('-', '_');
 	}
 
 	NSString *localeIdentifier = [[NSLocale currentLocale] localeIdentifier];
-	return String::utf8([localeIdentifier UTF8String]).replace("-", "_");
+	return String::utf8([localeIdentifier UTF8String]).replace_char('-', '_');
 }
 
 String OS_IOS::get_unique_id() const {
@@ -534,23 +534,26 @@ Vector<String> OS_IOS::get_system_font_path_for_text(const String &p_font_name,
 	CTFontDescriptorRef font = CTFontDescriptorCreateWithAttributes(attributes);
 	if (font) {
 		CTFontRef family = CTFontCreateWithFontDescriptor(font, 0, nullptr);
-		CFStringRef string = CFStringCreateWithCString(kCFAllocatorDefault, p_text.utf8().get_data(), kCFStringEncodingUTF8);
-		CFRange range = CFRangeMake(0, CFStringGetLength(string));
-		CTFontRef fallback_family = CTFontCreateForString(family, string, range);
-		if (fallback_family) {
-			CTFontDescriptorRef fallback_font = CTFontCopyFontDescriptor(fallback_family);
-			if (fallback_font) {
-				CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(fallback_font, kCTFontURLAttribute);
-				if (url) {
-					NSString *font_path = [NSString stringWithString:[(__bridge NSURL *)url path]];
-					ret.push_back(String::utf8([font_path UTF8String]));
-					CFRelease(url);
+		if (family) {
+			CFStringRef string = CFStringCreateWithCString(kCFAllocatorDefault, p_text.utf8().get_data(), kCFStringEncodingUTF8);
+			CFRange range = CFRangeMake(0, CFStringGetLength(string));
+			CTFontRef fallback_family = CTFontCreateForString(family, string, range);
+			if (fallback_family) {
+				CTFontDescriptorRef fallback_font = CTFontCopyFontDescriptor(fallback_family);
+				if (fallback_font) {
+					CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(fallback_font, kCTFontURLAttribute);
+					if (url) {
+						NSString *font_path = [NSString stringWithString:[(__bridge NSURL *)url path]];
+						ret.push_back(String::utf8([font_path UTF8String]));
+						CFRelease(url);
+					}
+					CFRelease(fallback_font);
 				}
-				CFRelease(fallback_font);
+				CFRelease(fallback_family);
 			}
-			CFRelease(fallback_family);
+			CFRelease(string);
+			CFRelease(family);
 		}
-		CFRelease(string);
 		CFRelease(font);
 	}
 
diff --git a/engine/platform/ios/platform_config.h b/engine/platform/ios/platform_config.h
index 01b0a12b..bc8b4560 100644
--- a/engine/platform/ios/platform_config.h
+++ b/engine/platform/ios/platform_config.h
@@ -28,8 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include <alloca.h>
 
+#define PLATFORM_THREAD_OVERRIDE
+
 #define PTHREAD_RENAME_SELF
 
 #define _weakify(var) __weak typeof(var) GDWeak_##var = var;
diff --git a/engine/platform/ios/platform_gl.h b/engine/platform/ios/platform_gl.h
index 974ea9d2..8271b43b 100644
--- a/engine/platform/ios/platform_gl.h
+++ b/engine/platform/ios/platform_gl.h
@@ -28,13 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLATFORM_GL_H
-#define PLATFORM_GL_H
+#pragma once
 
 #ifndef GLES_API_ENABLED
 #define GLES_API_ENABLED // Allow using GLES.
 #endif
 
 #include <ES3/gl.h>
-
-#endif // PLATFORM_GL_H
diff --git a/engine/platform/ios/platform_thread.h b/engine/platform/ios/platform_thread.h
new file mode 100644
index 00000000..42827e53
--- /dev/null
+++ b/engine/platform/ios/platform_thread.h
@@ -0,0 +1,33 @@
+/**************************************************************************/
+/*  platform_thread.h                                                     */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "drivers/apple/thread_apple.h"
diff --git a/engine/platform/ios/rendering_context_driver_vulkan_ios.h b/engine/platform/ios/rendering_context_driver_vulkan_ios.h
index dc85ff73..07a08cc8 100644
--- a/engine/platform/ios/rendering_context_driver_vulkan_ios.h
+++ b/engine/platform/ios/rendering_context_driver_vulkan_ios.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_IOS_H
-#define RENDERING_CONTEXT_DRIVER_VULKAN_IOS_H
+#pragma once
 
 #ifdef VULKAN_ENABLED
 
@@ -54,5 +53,3 @@ public:
 };
 
 #endif // VULKAN_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_VULKAN_IOS_H
diff --git a/engine/platform/ios/tts_ios.h b/engine/platform/ios/tts_ios.h
index 217f55da..0282a084 100644
--- a/engine/platform/ios/tts_ios.h
+++ b/engine/platform/ios/tts_ios.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TTS_IOS_H
-#define TTS_IOS_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
@@ -59,5 +58,3 @@
 - (void)speak:(const String &)text voice:(const String &)voice volume:(int)volume pitch:(float)pitch rate:(float)rate utterance_id:(int)utterance_id interrupt:(bool)interrupt;
 - (Array)getVoices;
 @end
-
-#endif // TTS_IOS_H
diff --git a/engine/platform/ios/view_controller.h b/engine/platform/ios/view_controller.h
index e641d761..b39164ca 100644
--- a/engine/platform/ios/view_controller.h
+++ b/engine/platform/ios/view_controller.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #import <UIKit/UIKit.h>
 
 @class GodotView;
diff --git a/engine/platform/linuxbsd/README.md b/engine/platform/linuxbsd/README.md
index c4f287cc..e1a95324 100644
--- a/engine/platform/linuxbsd/README.md
+++ b/engine/platform/linuxbsd/README.md
@@ -14,7 +14,7 @@ used by this platform.
 
 ## Artwork license
 
-[`logo.png`](logo.png) is derived from the [Linux logo](https://isc.tamu.edu/~lewing/linux/):
+[`logo.svg`](export/logo.svg) is derived from the [Linux logo](https://isc.tamu.edu/~lewing/linux/):
 
 > Permission to use and/or modify this image is granted provided you acknowledge me
 > <lewing@isc.tamu.edu> and [The GIMP](https://isc.tamu.edu/~lewing/gimp/)
diff --git a/engine/platform/linuxbsd/SCsub b/engine/platform/linuxbsd/SCsub
index 4def765e..678fc780 100644
--- a/engine/platform/linuxbsd/SCsub
+++ b/engine/platform/linuxbsd/SCsub
@@ -11,6 +11,7 @@ common_linuxbsd = [
     "joypad_linux.cpp",
     "freedesktop_portal_desktop.cpp",
     "freedesktop_screensaver.cpp",
+    "freedesktop_at_spi_monitor.cpp",
 ]
 
 if env["use_sowrap"]:
diff --git a/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp b/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp
index a56a6876..d35e2f99 100644
--- a/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp
+++ b/engine/platform/linuxbsd/crash_handler_linuxbsd.cpp
@@ -81,10 +81,10 @@ static void handle_crash(int sig) {
 	print_error(vformat("%s: Program crashed with signal %d", __FUNCTION__, sig));
 
 	// Print the engine version just before, so that people are reminded to include the version in backtrace reports.
-	if (String(VERSION_HASH).is_empty()) {
-		print_error(vformat("Engine version: %s", VERSION_FULL_NAME));
+	if (String(GODOT_VERSION_HASH).is_empty()) {
+		print_error(vformat("Engine version: %s", GODOT_VERSION_FULL_NAME));
 	} else {
-		print_error(vformat("Engine version: %s (%s)", VERSION_FULL_NAME, VERSION_HASH));
+		print_error(vformat("Engine version: %s (%s)", GODOT_VERSION_FULL_NAME, GODOT_VERSION_HASH));
 	}
 	print_error(vformat("Dumping the backtrace. %s", msg));
 	char **strings = backtrace_symbols(bt_buffer, size);
@@ -137,7 +137,8 @@ static void handle_crash(int sig) {
 				}
 			}
 
-			print_error(vformat("[%d] %s (%s)", (int64_t)i, fname, err == OK ? addr2line_results[i] : ""));
+			// Simplify printed file paths to remove redundant `/./` sections (e.g. `/opt/godot/./core` -> `/opt/godot/core`).
+			print_error(vformat("[%d] %s (%s)", (int64_t)i, fname, err == OK ? addr2line_results[i].replace("/./", "/") : ""));
 		}
 
 		free(strings);
diff --git a/engine/platform/linuxbsd/crash_handler_linuxbsd.h b/engine/platform/linuxbsd/crash_handler_linuxbsd.h
index a14b93e1..1325bb57 100644
--- a/engine/platform/linuxbsd/crash_handler_linuxbsd.h
+++ b/engine/platform/linuxbsd/crash_handler_linuxbsd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CRASH_HANDLER_LINUXBSD_H
-#define CRASH_HANDLER_LINUXBSD_H
+#pragma once
 
 class CrashHandler {
 	bool disabled;
@@ -43,5 +42,3 @@ public:
 	CrashHandler();
 	~CrashHandler();
 };
-
-#endif // CRASH_HANDLER_LINUXBSD_H
diff --git a/engine/platform/linuxbsd/detect.py b/engine/platform/linuxbsd/detect.py
index b5e80f4a..82ada66f 100644
--- a/engine/platform/linuxbsd/detect.py
+++ b/engine/platform/linuxbsd/detect.py
@@ -293,7 +293,7 @@ def configure(env: "SConsEnvironment"):
 
     if not env["builtin_recastnavigation"]:
         # No pkgconfig file so far, hardcode default paths.
-        env.Prepend(CPPPATH=["/usr/include/recastnavigation"])
+        env.Prepend(CPPEXTPATH=["/usr/include/recastnavigation"])
         env.Append(LIBS=["Recast"])
 
     if not env["builtin_embree"] and env["arch"] in ["x86_64", "arm64"]:
@@ -394,7 +394,7 @@ def configure(env: "SConsEnvironment"):
 
     env.Prepend(CPPPATH=["#platform/linuxbsd"])
     if env["use_sowrap"]:
-        env.Prepend(CPPPATH=["#thirdparty/linuxbsd_headers"])
+        env.Prepend(CPPEXTPATH=["#thirdparty/linuxbsd_headers"])
 
     env.Append(
         CPPDEFINES=[
@@ -456,9 +456,9 @@ def configure(env: "SConsEnvironment"):
                 sys.exit(255)
             env.ParseConfig("pkg-config wayland-egl --cflags --libs")
         else:
-            env.Prepend(CPPPATH=["#thirdparty/linuxbsd_headers/wayland/"])
+            env.Prepend(CPPEXTPATH=["#thirdparty/linuxbsd_headers/wayland/"])
             if env["libdecor"]:
-                env.Prepend(CPPPATH=["#thirdparty/linuxbsd_headers/libdecor-0/"])
+                env.Prepend(CPPEXTPATH=["#thirdparty/linuxbsd_headers/libdecor-0/"])
 
         if env["libdecor"]:
             env.Append(CPPDEFINES=["LIBDECOR_ENABLED"])
@@ -466,6 +466,24 @@ def configure(env: "SConsEnvironment"):
         env.Append(CPPDEFINES=["WAYLAND_ENABLED"])
         env.Append(LIBS=["rt"])  # Needed by glibc, used by _allocate_shm_file
 
+    if env["accesskit"]:
+        if env["accesskit_sdk_path"] != "":
+            env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
+            if env["arch"] == "arm64":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/linux/arm64/static/"])
+            elif env["arch"] == "arm32":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/linux/arm32/static/"])
+            elif env["arch"] == "rv64":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/linux/riscv64gc/static/"])
+            elif env["arch"] == "x86_64":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/linux/x86_64/static/"])
+            elif env["arch"] == "x86_32":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/linux/x86/static/"])
+            env.Append(LIBS=["accesskit"])
+        else:
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
+
     if env["vulkan"]:
         env.Append(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
         if not env["use_volk"]:
diff --git a/engine/platform/linuxbsd/export/export.h b/engine/platform/linuxbsd/export/export.h
index f4930478..7ff449d6 100644
--- a/engine/platform/linuxbsd/export/export.h
+++ b/engine/platform/linuxbsd/export/export.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LINUXBSD_EXPORT_H
-#define LINUXBSD_EXPORT_H
+#pragma once
 
 void register_linuxbsd_exporter_types();
 void register_linuxbsd_exporter();
-
-#endif // LINUXBSD_EXPORT_H
diff --git a/engine/platform/linuxbsd/export/export_plugin.cpp b/engine/platform/linuxbsd/export/export_plugin.cpp
index 2a09a582..d3a6d5c6 100644
--- a/engine/platform/linuxbsd/export/export_plugin.cpp
+++ b/engine/platform/linuxbsd/export/export_plugin.cpp
@@ -50,7 +50,7 @@ Error EditorExportPlatformLinuxBSD::_export_debug_script(const Ref<EditorExportP
 	}
 
 	f->store_line("#!/bin/sh");
-	f->store_line("echo -ne '\\033c\\033]0;" + p_app_name + "\\a'");
+	f->store_line("printf '\\033c\\033]0;%s\\a' " + p_app_name);
 	f->store_line("base_path=\"$(dirname \"$(realpath \"$0\")\")\"");
 	f->store_line("\"$base_path/" + p_pkg_name + "\" \"$@\"");
 
@@ -67,16 +67,21 @@ Error EditorExportPlatformLinuxBSD::export_project(const Ref<EditorExportPreset>
 	if (!template_path.is_empty()) {
 		String exe_arch = _get_exe_arch(template_path);
 		if (arch != exe_arch) {
-			add_message(EXPORT_MESSAGE_ERROR, TTR("Prepare Templates"), vformat(TTR("Mismatching custom export template executable architecture, found \"%s\", expected \"%s\"."), exe_arch, arch));
+			add_message(EXPORT_MESSAGE_ERROR, TTR("Prepare Templates"), vformat(TTR("Mismatching custom export template executable architecture: found \"%s\", expected \"%s\"."), exe_arch, arch));
 			return ERR_CANT_CREATE;
 		}
 	}
 
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	if (da->file_exists(template_path.get_base_dir().path_join("libaccesskit." + arch + ".so"))) {
+		da->copy(template_path.get_base_dir().path_join("libaccesskit." + arch + ".so"), p_path.get_base_dir().path_join("libaccesskit." + arch + ".so"), get_chmod_flags());
+	}
+
 	bool export_as_zip = p_path.ends_with("zip");
 
 	String pkg_name;
-	if (String(GLOBAL_GET("application/config/name")) != "") {
-		pkg_name = String(GLOBAL_GET("application/config/name"));
+	if (String(get_project_setting(p_preset, "application/config/name")) != "") {
+		pkg_name = String(get_project_setting(p_preset, "application/config/name"));
 	} else {
 		pkg_name = "Unnamed";
 	}
diff --git a/engine/platform/linuxbsd/export/export_plugin.h b/engine/platform/linuxbsd/export/export_plugin.h
index c8842b3a..d616e3af 100644
--- a/engine/platform/linuxbsd/export/export_plugin.h
+++ b/engine/platform/linuxbsd/export/export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LINUXBSD_EXPORT_PLUGIN_H
-#define LINUXBSD_EXPORT_PLUGIN_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "editor/editor_settings.h"
@@ -92,5 +91,3 @@ public:
 
 	EditorExportPlatformLinuxBSD();
 };
-
-#endif // LINUXBSD_EXPORT_PLUGIN_H
diff --git a/engine/platform/linuxbsd/export/logo.svg b/engine/platform/linuxbsd/export/logo.svg
index c0d2ba1f..b29a0ab3 100644
--- a/engine/platform/linuxbsd/export/logo.svg
+++ b/engine/platform/linuxbsd/export/logo.svg
@@ -1 +1 @@
-<svg width="32" height="32"><path fill="#fff" d="M13 31h6s3 0 6-6c2.864-5.727-6-17-6-17h-6S3.775 18.55 7 25c3 6 6 6 6 6z"/><path fill="#333" d="M15.876 28.636c-.05.322-.116.637-.204.941-.142.496-.35.993-.659 1.416.32.02.649.023.985.007a9.1 9.1 0 0 0 .985-.007c-.309-.423-.516-.92-.659-1.416a7.666 7.666 0 0 1-.203-.94l-.123.003c-.04 0-.081-.003-.122-.004z"/><path fill="#f4bb37" d="M21.693 21.916c-.629.01-.934.633-1.497.7-.694.08-1.128-.722-2.11-.123-.98.6-1.826 7.473.45 8.409 2.274.935 6.506-4.545 6.23-5.662-.275-1.116-1.146-.853-1.582-1.399-.436-.545.003-1.41-.995-1.82a1.246 1.246 0 0 0-.496-.105zm-11.461 0a1.315 1.315 0 0 0-.421.105c-.998.41-.56 1.275-.995 1.82-.436.546-1.31.283-1.586 1.4-.275 1.116 3.956 6.596 6.232 5.66 2.275-.935 1.429-7.808.448-8.408-.981-.6-1.415.204-2.11.122-.584-.068-.888-.739-1.568-.7z"/><path fill="#333" d="M15.998.99c-2.934 0-4.657 1.79-4.982 4.204-.324 2.414.198 2.856-.614 5.328-.813 2.472-4.456 6.71-4.37 10.62.026 1.217.166 2.27.41 3.192.3-.496.743-.846 1.066-.995.253-.117.375-.173.432-.194.008-.062.04-.205.098-.485.08-.386.387-.99.91-1.386-.005-.12-.01-.239-.013-.363-.06-3.033 3.073-6.318 3.65-8.236.577-1.917.326-2.114.421-2.59.096-.477.463-1.032.992-1.475a.23.23 0 0 1 .15-.06c.482-.005.965 1.75 1.898 1.752.933 0 1.419-2.141 1.956-1.692.529.443.896.998.992 1.474.095.477-.156.674.42 2.591.578 1.918 3.708 5.203 3.648 8.236-.003.123-.008.24-.014.36.526.396.834 1.002.914 1.389.058.28.09.423.098.485.057.021.18.08.432.197.323.15.764.499 1.063.995.244-.922.387-1.976.414-3.195.085-3.91-3.562-8.148-4.374-10.62-.813-2.472-.287-2.914-.611-5.328C20.659 2.78 18.933.99 15.998.99z"/></svg>
\ No newline at end of file
+<svg width="32" height="32"><path fill="#fff" d="M13 31h6s3 0 6-6c2.864-5.727-6-17-6-17h-6S3.775 18.55 7 25c3 6 6 6 6 6z"/><path fill="#333" d="M15.876 28.636c-.05.322-.116.637-.204.941-.142.496-.35.993-.659 1.416.32.02.649.023.985.007a9.1 9.1 0 0 0 .985-.007c-.309-.423-.516-.92-.659-1.416a7.666 7.666 0 0 1-.203-.94l-.123.003c-.04 0-.081-.003-.122-.004z"/><path fill="#f4bb37" d="M21.693 21.916c-.629.01-.934.633-1.497.7-.694.08-1.128-.722-2.11-.123-.98.6-1.826 7.473.45 8.409 2.274.935 6.506-4.545 6.23-5.662-.275-1.116-1.146-.853-1.582-1.399-.436-.545.003-1.41-.995-1.82a1.246 1.246 0 0 0-.496-.105zm-11.461 0a1.315 1.315 0 0 0-.421.105c-.998.41-.56 1.275-.995 1.82-.436.546-1.31.283-1.586 1.4-.275 1.116 3.956 6.596 6.232 5.66 2.275-.935 1.429-7.808.448-8.408-.981-.6-1.415.204-2.11.122-.584-.068-.888-.739-1.568-.7z"/><path fill="#333" d="M15.998.99c-2.934 0-4.657 1.79-4.982 4.204-.324 2.414.198 2.856-.614 5.328-.813 2.472-4.456 6.71-4.37 10.62.026 1.217.166 2.27.41 3.192.3-.496.743-.846 1.066-.995.253-.117.375-.173.432-.194.008-.062.04-.205.098-.485.08-.386.387-.99.91-1.386-.005-.12-.01-.239-.013-.363-.06-3.033 3.073-6.318 3.65-8.236.577-1.917.326-2.114.421-2.59.096-.477.463-1.032.992-1.475a.23.23 0 0 1 .15-.06c.482-.005.965 1.75 1.898 1.752.933 0 1.419-2.141 1.956-1.692.529.443.896.998.992 1.474.095.477-.156.674.42 2.591.578 1.918 3.708 5.203 3.648 8.236-.003.123-.008.24-.014.36.526.396.834 1.002.914 1.389.058.28.09.423.098.485.057.021.18.08.432.197.323.15.764.499 1.063.995.244-.922.387-1.976.414-3.195.085-3.91-3.562-8.148-4.374-10.62-.813-2.472-.287-2.914-.611-5.328C20.659 2.78 18.933.99 15.998.99z"/></svg>
diff --git a/engine/platform/linuxbsd/export/run_icon.svg b/engine/platform/linuxbsd/export/run_icon.svg
index c7a2d6b0..aaab6455 100644
--- a/engine/platform/linuxbsd/export/run_icon.svg
+++ b/engine/platform/linuxbsd/export/run_icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M7.941 13.966a3.62 3.62 0 0 1-.096.444 2.129 2.129 0 0 1-.31.668c.15.01.305.01.464.003.16.008.314.007.465-.003a2.129 2.129 0 0 1-.31-.668 3.62 3.62 0 0 1-.097-.444zM8 .914c-1.386 0-2.2.845-2.353 1.985-.153 1.14.094 1.348-.29 2.515s-2.103 3.168-2.063 5.013c.012.575.078 1.072.194 1.507a1.25 1.25 0 0 1 .503-.47 4.37 4.37 0 0 1 .204-.09c.004-.03.019-.098.046-.23.038-.182.183-.467.43-.654a4.773 4.773 0 0 1-.006-.172c-.029-1.431 1.45-2.982 1.723-3.888.272-.905.154-.998.199-1.223.045-.225.218-.487.468-.696.253-.211.483.798.945.799.462 0 .692-1.01.945-.799.25.21.423.471.468.696.045.225-.073.318.199 1.223.272.906 1.75 2.457 1.722 3.888a4.773 4.773 0 0 0-.007.17 1.2 1.2 0 0 1 .432.656c.027.132.042.2.046.23.027.01.085.037.204.092.153.07.36.236.502.47.115-.435.183-.933.195-1.509.04-1.845-1.681-3.846-2.065-5.013-.383-1.167-.135-1.376-.288-2.515C10.2 1.759 9.385.914 7.999.914z"/><path fill="#e0e0e0" d="M10.688 10.793c-.297.005-.441.299-.707.33-.328.038-.533-.34-.996-.058-.463.283-.862 3.528.212 3.97 1.074.442 3.072-2.146 2.942-2.673-.13-.527-.542-.403-.747-.66-.206-.258 0-.666-.47-.86a.588.588 0 0 0-.234-.05zm-5.411 0a.62.62 0 0 0-.199.05c-.47.193-.264.601-.47.859-.205.257-.618.133-.748.66s1.867 3.115 2.942 2.673c1.074-.442.674-3.687.211-3.97-.463-.283-.668.096-.995.058-.277-.032-.42-.349-.741-.33z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M7.941 13.966a3.62 3.62 0 0 1-.096.444 2.129 2.129 0 0 1-.31.668c.15.01.305.01.464.003.16.008.314.007.465-.003a2.129 2.129 0 0 1-.31-.668 3.62 3.62 0 0 1-.097-.444zM8 .914c-1.386 0-2.2.845-2.353 1.985-.153 1.14.094 1.348-.29 2.515s-2.103 3.168-2.063 5.013c.012.575.078 1.072.194 1.507a1.25 1.25 0 0 1 .503-.47 4.37 4.37 0 0 1 .204-.09c.004-.03.019-.098.046-.23.038-.182.183-.467.43-.654a4.773 4.773 0 0 1-.006-.172c-.029-1.431 1.45-2.982 1.723-3.888.272-.905.154-.998.199-1.223.045-.225.218-.487.468-.696.253-.211.483.798.945.799.462 0 .692-1.01.945-.799.25.21.423.471.468.696.045.225-.073.318.199 1.223.272.906 1.75 2.457 1.722 3.888a4.773 4.773 0 0 0-.007.17 1.2 1.2 0 0 1 .432.656c.027.132.042.2.046.23.027.01.085.037.204.092.153.07.36.236.502.47.115-.435.183-.933.195-1.509.04-1.845-1.681-3.846-2.065-5.013-.383-1.167-.135-1.376-.288-2.515C10.2 1.759 9.385.914 7.999.914z"/><path fill="#e0e0e0" d="M10.688 10.793c-.297.005-.441.299-.707.33-.328.038-.533-.34-.996-.058-.463.283-.862 3.528.212 3.97 1.074.442 3.072-2.146 2.942-2.673-.13-.527-.542-.403-.747-.66-.206-.258 0-.666-.47-.86a.588.588 0 0 0-.234-.05zm-5.411 0a.62.62 0 0 0-.199.05c-.47.193-.264.601-.47.859-.205.257-.618.133-.748.66s1.867 3.115 2.942 2.673c1.074-.442.674-3.687.211-3.97-.463-.283-.668.096-.995.058-.277-.032-.42-.349-.741-.33z"/></svg>
diff --git a/engine/platform/linuxbsd/freedesktop_at_spi_monitor.cpp b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.cpp
new file mode 100644
index 00000000..905346ab
--- /dev/null
+++ b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.cpp
@@ -0,0 +1,157 @@
+/**************************************************************************/
+/*  freedesktop_at_spi_monitor.cpp                                        */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "freedesktop_at_spi_monitor.h"
+
+#ifdef DBUS_ENABLED
+
+#include "core/os/os.h"
+
+#ifdef SOWRAP_ENABLED
+#include "dbus-so_wrap.h"
+#else
+#include <dbus/dbus.h>
+#endif
+
+#include <unistd.h>
+
+#define BUS_OBJECT_NAME "org.a11y.Bus"
+#define BUS_OBJECT_PATH "/org/a11y/bus"
+
+#define BUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
+
+void FreeDesktopAtSPIMonitor::monitor_thread_func(void *p_userdata) {
+	FreeDesktopAtSPIMonitor *mon = (FreeDesktopAtSPIMonitor *)p_userdata;
+
+	DBusError error;
+	dbus_error_init(&error);
+
+	DBusConnection *bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
+	if (dbus_error_is_set(&error)) {
+		dbus_error_free(&error);
+		mon->supported.clear();
+		return;
+	}
+
+	static const char *iface = "org.a11y.Status";
+	static const char *member = "IsEnabled";
+
+	while (!mon->exit_thread.is_set()) {
+		DBusMessage *message = dbus_message_new_method_call(BUS_OBJECT_NAME, BUS_OBJECT_PATH, BUS_INTERFACE_PROPERTIES, "Get");
+
+		dbus_message_append_args(
+				message,
+				DBUS_TYPE_STRING, &iface,
+				DBUS_TYPE_STRING, &member,
+				DBUS_TYPE_INVALID);
+
+		DBusMessage *reply = dbus_connection_send_with_reply_and_block(bus, message, 50, &error);
+		dbus_message_unref(message);
+
+		if (!dbus_error_is_set(&error)) {
+			DBusMessageIter iter, iter_variant, iter_struct;
+			dbus_bool_t result;
+			dbus_message_iter_init(reply, &iter);
+			dbus_message_iter_recurse(&iter, &iter_variant);
+			switch (dbus_message_iter_get_arg_type(&iter_variant)) {
+				case DBUS_TYPE_STRUCT: {
+					dbus_message_iter_recurse(&iter_variant, &iter_struct);
+					if (dbus_message_iter_get_arg_type(&iter_struct) == DBUS_TYPE_BOOLEAN) {
+						dbus_message_iter_get_basic(&iter_struct, &result);
+						if (result) {
+							mon->sr_enabled.set();
+						} else {
+							mon->sr_enabled.clear();
+						}
+					}
+				} break;
+				case DBUS_TYPE_BOOLEAN: {
+					dbus_message_iter_get_basic(&iter_variant, &result);
+					if (result) {
+						mon->sr_enabled.set();
+					} else {
+						mon->sr_enabled.clear();
+					}
+				} break;
+				default:
+					break;
+			}
+			dbus_message_unref(reply);
+		} else {
+			dbus_error_free(&error);
+		}
+
+		usleep(50000);
+	}
+
+	dbus_connection_unref(bus);
+}
+
+FreeDesktopAtSPIMonitor::FreeDesktopAtSPIMonitor() {
+#ifdef SOWRAP_ENABLED
+#ifdef DEBUG_ENABLED
+	int dylibloader_verbose = 1;
+#else
+	int dylibloader_verbose = 0;
+#endif
+	if (initialize_dbus(dylibloader_verbose) != 0) {
+		print_verbose("AT-SPI2: Failed to load DBus library!");
+		supported.clear();
+		return;
+	}
+#endif
+	bool ver_ok = false;
+	int version_major = 0;
+	int version_minor = 0;
+	int version_rev = 0;
+	dbus_get_version(&version_major, &version_minor, &version_rev);
+	ver_ok = (version_major == 1 && version_minor >= 10) || (version_major > 1); // 1.10.0
+	print_verbose(vformat("AT-SPI2: DBus %d.%d.%d detected.", version_major, version_minor, version_rev));
+	if (!ver_ok) {
+		print_verbose("AT-SPI2: Unsupported DBus library version!");
+		supported.clear();
+		return;
+	}
+
+	supported.set();
+	sr_enabled.clear();
+	exit_thread.clear();
+
+	thread.start(FreeDesktopAtSPIMonitor::monitor_thread_func, this);
+}
+
+FreeDesktopAtSPIMonitor::~FreeDesktopAtSPIMonitor() {
+	exit_thread.set();
+	if (thread.is_started()) {
+		thread.wait_to_finish();
+	}
+}
+
+#endif // DBUS_ENABLED
diff --git a/engine/modules/openxr/extensions/openxr_composition_layer_provider.h b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.h
similarity index 78%
rename from engine/modules/openxr/extensions/openxr_composition_layer_provider.h
rename to engine/platform/linuxbsd/freedesktop_at_spi_monitor.h
index 44f90a0e..65cec656 100644
--- a/engine/modules/openxr/extensions/openxr_composition_layer_provider.h
+++ b/engine/platform/linuxbsd/freedesktop_at_spi_monitor.h
@@ -1,5 +1,5 @@
 /**************************************************************************/
-/*  openxr_composition_layer_provider.h                                   */
+/*  freedesktop_at_spi_monitor.h                                          */
 /**************************************************************************/
 /*                         This file is part of:                          */
 /*                             GODOT ENGINE                               */
@@ -28,21 +28,29 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPENXR_COMPOSITION_LAYER_PROVIDER_H
-#define OPENXR_COMPOSITION_LAYER_PROVIDER_H
+#pragma once
 
-#include "openxr_extension_wrapper.h"
+#ifdef DBUS_ENABLED
 
-#include <openxr/openxr.h>
+#include "core/os/thread.h"
+#include "core/os/thread_safe.h"
+
+class FreeDesktopAtSPIMonitor {
+private:
+	Thread thread;
+
+	SafeFlag exit_thread;
+	SafeFlag sr_enabled;
+	SafeFlag supported;
+
+	static void monitor_thread_func(void *p_userdata);
 
-// Interface for OpenXR extensions that provide a composition layer.
-class OpenXRCompositionLayerProvider {
 public:
-	virtual int get_composition_layer_count() = 0;
-	virtual XrCompositionLayerBaseHeader *get_composition_layer(int p_index) = 0;
-	virtual int get_composition_layer_order(int p_index) = 0;
+	FreeDesktopAtSPIMonitor();
+	~FreeDesktopAtSPIMonitor();
 
-	virtual ~OpenXRCompositionLayerProvider() {}
+	bool is_supported() { return supported.is_set(); }
+	bool is_active() { return sr_enabled.is_set(); }
 };
 
-#endif // OPENXR_COMPOSITION_LAYER_PROVIDER_H
+#endif // DBUS_ENABLED
diff --git a/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp b/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp
index 81f7e53f..b9ac32bb 100644
--- a/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp
+++ b/engine/platform/linuxbsd/freedesktop_portal_desktop.cpp
@@ -52,8 +52,9 @@
 #define BUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
 #define BUS_INTERFACE_SETTINGS "org.freedesktop.portal.Settings"
 #define BUS_INTERFACE_FILE_CHOOSER "org.freedesktop.portal.FileChooser"
+#define BUS_INTERFACE_SCREENSHOT "org.freedesktop.portal.Screenshot"
 
-bool FreeDesktopPortalDesktop::try_parse_variant(DBusMessage *p_reply_message, int p_type, void *r_value) {
+bool FreeDesktopPortalDesktop::try_parse_variant(DBusMessage *p_reply_message, ReadVariantType p_type, void *r_value) {
 	DBusMessageIter iter[3];
 
 	dbus_message_iter_init(p_reply_message, &iter[0]);
@@ -67,15 +68,49 @@ bool FreeDesktopPortalDesktop::try_parse_variant(DBusMessage *p_reply_message, i
 	}
 
 	dbus_message_iter_recurse(&iter[1], &iter[2]);
-	if (dbus_message_iter_get_arg_type(&iter[2]) != p_type) {
-		return false;
+	if (p_type == VAR_TYPE_COLOR) {
+		if (dbus_message_iter_get_arg_type(&iter[2]) != DBUS_TYPE_STRUCT) {
+			return false;
+		}
+		DBusMessageIter struct_iter;
+		dbus_message_iter_recurse(&iter[2], &struct_iter);
+		int idx = 0;
+		while (dbus_message_iter_get_arg_type(&struct_iter) == DBUS_TYPE_DOUBLE) {
+			double value = 0.0;
+			dbus_message_iter_get_basic(&struct_iter, &value);
+			if (value < 0.0 || value > 1.0) {
+				return false;
+			}
+			if (idx == 0) {
+				static_cast<Color *>(r_value)->r = value;
+			} else if (idx == 1) {
+				static_cast<Color *>(r_value)->g = value;
+			} else if (idx == 2) {
+				static_cast<Color *>(r_value)->b = value;
+			}
+			idx++;
+			if (!dbus_message_iter_next(&struct_iter)) {
+				break;
+			}
+		}
+		if (idx != 3) {
+			return false;
+		}
+	} else if (p_type == VAR_TYPE_UINT32) {
+		if (dbus_message_iter_get_arg_type(&iter[2]) != DBUS_TYPE_UINT32) {
+			return false;
+		}
+		dbus_message_iter_get_basic(&iter[2], r_value);
+	} else if (p_type == VAR_TYPE_BOOL) {
+		if (dbus_message_iter_get_arg_type(&iter[2]) != DBUS_TYPE_BOOLEAN) {
+			return false;
+		}
+		dbus_message_iter_get_basic(&iter[2], r_value);
 	}
-
-	dbus_message_iter_get_basic(&iter[2], r_value);
 	return true;
 }
 
-bool FreeDesktopPortalDesktop::read_setting(const char *p_namespace, const char *p_key, int p_type, void *r_value) {
+bool FreeDesktopPortalDesktop::read_setting(const char *p_namespace, const char *p_key, ReadVariantType p_type, void *r_value) {
 	if (unsupported) {
 		return false;
 	}
@@ -127,8 +162,36 @@ uint32_t FreeDesktopPortalDesktop::get_appearance_color_scheme() {
 	}
 
 	uint32_t value = 0;
-	read_setting("org.freedesktop.appearance", "color-scheme", DBUS_TYPE_UINT32, &value);
-	return value;
+	if (read_setting("org.freedesktop.appearance", "color-scheme", VAR_TYPE_UINT32, &value)) {
+		return value;
+	} else {
+		return 0;
+	}
+}
+
+Color FreeDesktopPortalDesktop::get_appearance_accent_color() {
+	if (unsupported) {
+		return Color(0, 0, 0, 0);
+	}
+
+	Color value;
+	if (read_setting("org.freedesktop.appearance", "accent-color", VAR_TYPE_COLOR, &value)) {
+		return value;
+	} else {
+		return Color(0, 0, 0, 0);
+	}
+}
+
+uint32_t FreeDesktopPortalDesktop::get_high_contrast() {
+	if (unsupported) {
+		return -1;
+	}
+
+	dbus_bool_t value = false;
+	if (read_setting("org.gnome.desktop.a11y.interface", "high-contrast", VAR_TYPE_BOOL, &value)) {
+		return value;
+	}
+	return -1;
 }
 
 static const char *cs_empty = "";
@@ -226,7 +289,7 @@ void FreeDesktopPortalDesktop::append_dbus_dict_filters(DBusMessageIter *p_iter,
 		int filter_slice_count = flt.get_slice_count(",");
 		for (int j = 0; j < filter_slice_count; j++) {
 			dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, nullptr, &array_struct_iter);
-			String str = (flt.get_slice(",", j).strip_edges());
+			String str = (flt.get_slicec(',', j).strip_edges());
 			{
 				const unsigned flt_type = 0;
 				dbus_message_iter_append_basic(&array_struct_iter, DBUS_TYPE_UINT32, &flt_type);
@@ -295,6 +358,61 @@ void FreeDesktopPortalDesktop::append_dbus_dict_bool(DBusMessageIter *p_iter, co
 	dbus_message_iter_close_container(p_iter, &dict_iter);
 }
 
+bool FreeDesktopPortalDesktop::color_picker_parse_response(DBusMessageIter *p_iter, bool &r_cancel, Color &r_color) {
+	ERR_FAIL_COND_V(dbus_message_iter_get_arg_type(p_iter) != DBUS_TYPE_UINT32, false);
+
+	dbus_uint32_t resp_code;
+	dbus_message_iter_get_basic(p_iter, &resp_code);
+	if (resp_code != 0) {
+		r_cancel = true;
+	} else {
+		r_cancel = false;
+		ERR_FAIL_COND_V(!dbus_message_iter_next(p_iter), false);
+		ERR_FAIL_COND_V(dbus_message_iter_get_arg_type(p_iter) != DBUS_TYPE_ARRAY, false);
+
+		DBusMessageIter dict_iter;
+		dbus_message_iter_recurse(p_iter, &dict_iter);
+		while (dbus_message_iter_get_arg_type(&dict_iter) == DBUS_TYPE_DICT_ENTRY) {
+			DBusMessageIter iter;
+			dbus_message_iter_recurse(&dict_iter, &iter);
+			if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) {
+				const char *key;
+				dbus_message_iter_get_basic(&iter, &key);
+				dbus_message_iter_next(&iter);
+
+				DBusMessageIter var_iter;
+				dbus_message_iter_recurse(&iter, &var_iter);
+				if (strcmp(key, "color") == 0) { // (ddd)
+					if (dbus_message_iter_get_arg_type(&var_iter) == DBUS_TYPE_STRUCT) {
+						DBusMessageIter struct_iter;
+						dbus_message_iter_recurse(&var_iter, &struct_iter);
+						int idx = 0;
+						while (dbus_message_iter_get_arg_type(&struct_iter) == DBUS_TYPE_DOUBLE) {
+							double value = 0.0;
+							dbus_message_iter_get_basic(&struct_iter, &value);
+							if (idx == 0) {
+								r_color.r = value;
+							} else if (idx == 1) {
+								r_color.g = value;
+							} else if (idx == 2) {
+								r_color.b = value;
+							}
+							idx++;
+							if (!dbus_message_iter_next(&struct_iter)) {
+								break;
+							}
+						}
+					}
+				}
+			}
+			if (!dbus_message_iter_next(&dict_iter)) {
+				break;
+			}
+		}
+	}
+	return true;
+}
+
 bool FreeDesktopPortalDesktop::file_chooser_parse_response(DBusMessageIter *p_iter, const Vector<String> &p_names, const HashMap<String, String> &p_ids, bool &r_cancel, Vector<String> &r_urls, int &r_index, Dictionary &r_options) {
 	ERR_FAIL_COND_V(dbus_message_iter_get_arg_type(p_iter) != DBUS_TYPE_UINT32, false);
 
@@ -372,7 +490,7 @@ bool FreeDesktopPortalDesktop::file_chooser_parse_response(DBusMessageIter *p_it
 						while (dbus_message_iter_get_arg_type(&uri_iter) == DBUS_TYPE_STRING) {
 							const char *value;
 							dbus_message_iter_get_basic(&uri_iter, &value);
-							r_urls.push_back(String::utf8(value).trim_prefix("file://").uri_decode());
+							r_urls.push_back(String::utf8(value).trim_prefix("file://").uri_file_decode());
 							if (!dbus_message_iter_next(&uri_iter)) {
 								break;
 							}
@@ -388,6 +506,92 @@ bool FreeDesktopPortalDesktop::file_chooser_parse_response(DBusMessageIter *p_it
 	return true;
 }
 
+bool FreeDesktopPortalDesktop::color_picker(const String &p_xid, const Callable &p_callback) {
+	if (unsupported) {
+		return false;
+	}
+
+	DBusError err;
+	dbus_error_init(&err);
+
+	// Open connection and add signal handler.
+	ColorPickerData cd;
+	cd.callback = p_callback;
+
+	CryptoCore::RandomGenerator rng;
+	ERR_FAIL_COND_V_MSG(rng.init(), false, "Failed to initialize random number generator.");
+	uint8_t uuid[64];
+	Error rng_err = rng.get_random_bytes(uuid, 64);
+	ERR_FAIL_COND_V_MSG(rng_err, false, "Failed to generate unique token.");
+
+	String dbus_unique_name = String::utf8(dbus_bus_get_unique_name(monitor_connection));
+	String token = String::hex_encode_buffer(uuid, 64);
+	String path = vformat("/org/freedesktop/portal/desktop/request/%s/%s", dbus_unique_name.replace_char('.', '_').remove_char(':'), token);
+
+	cd.path = path;
+	cd.filter = vformat("type='signal',sender='org.freedesktop.portal.Desktop',path='%s',interface='org.freedesktop.portal.Request',member='Response',destination='%s'", path, dbus_unique_name);
+	dbus_bus_add_match(monitor_connection, cd.filter.utf8().get_data(), &err);
+	if (dbus_error_is_set(&err)) {
+		ERR_PRINT(vformat("Failed to add DBus match: %s", err.message));
+		dbus_error_free(&err);
+		return false;
+	}
+
+	DBusMessage *message = dbus_message_new_method_call(BUS_OBJECT_NAME, BUS_OBJECT_PATH, BUS_INTERFACE_SCREENSHOT, "PickColor");
+	{
+		DBusMessageIter iter;
+		dbus_message_iter_init_append(message, &iter);
+
+		append_dbus_string(&iter, p_xid);
+
+		DBusMessageIter arr_iter;
+		dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &arr_iter);
+		append_dbus_dict_string(&arr_iter, "handle_token", token);
+		dbus_message_iter_close_container(&iter, &arr_iter);
+	}
+	DBusMessage *reply = dbus_connection_send_with_reply_and_block(monitor_connection, message, DBUS_TIMEOUT_INFINITE, &err);
+	dbus_message_unref(message);
+
+	if (!reply || dbus_error_is_set(&err)) {
+		ERR_PRINT(vformat("Failed to send DBus message: %s", err.message));
+		dbus_error_free(&err);
+		dbus_bus_remove_match(monitor_connection, cd.filter.utf8().get_data(), &err);
+		return false;
+	}
+
+	// Update signal path.
+	{
+		DBusMessageIter iter;
+		if (dbus_message_iter_init(reply, &iter)) {
+			if (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_OBJECT_PATH) {
+				const char *new_path = nullptr;
+				dbus_message_iter_get_basic(&iter, &new_path);
+				if (String::utf8(new_path) != path) {
+					dbus_bus_remove_match(monitor_connection, cd.filter.utf8().get_data(), &err);
+					if (dbus_error_is_set(&err)) {
+						ERR_PRINT(vformat("Failed to remove DBus match: %s", err.message));
+						dbus_error_free(&err);
+						return false;
+					}
+					cd.filter = String::utf8(new_path);
+					dbus_bus_add_match(monitor_connection, cd.filter.utf8().get_data(), &err);
+					if (dbus_error_is_set(&err)) {
+						ERR_PRINT(vformat("Failed to add DBus match: %s", err.message));
+						dbus_error_free(&err);
+						return false;
+					}
+				}
+			}
+		}
+	}
+	dbus_message_unref(reply);
+
+	MutexLock lock(color_picker_mutex);
+	color_pickers.push_back(cd);
+
+	return true;
+}
+
 bool FreeDesktopPortalDesktop::_is_interface_supported(const char *p_iface) {
 	bool supported = false;
 	DBusError err;
@@ -443,6 +647,14 @@ bool FreeDesktopPortalDesktop::is_settings_supported() {
 	return supported;
 }
 
+bool FreeDesktopPortalDesktop::is_screenshot_supported() {
+	static int supported = -1;
+	if (supported == -1) {
+		supported = _is_interface_supported(BUS_INTERFACE_SCREENSHOT);
+	}
+	return supported;
+}
+
 Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServer::WindowID p_window_id, const String &p_xid, const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, DisplayServer::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb) {
 	if (unsupported) {
 		return FAILED;
@@ -505,7 +717,7 @@ Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServer::WindowID p_windo
 
 	String dbus_unique_name = String::utf8(dbus_bus_get_unique_name(monitor_connection));
 	String token = String::hex_encode_buffer(uuid, 64);
-	String path = vformat("/org/freedesktop/portal/desktop/request/%s/%s", dbus_unique_name.replace(".", "_").replace(":", ""), token);
+	String path = vformat("/org/freedesktop/portal/desktop/request/%s/%s", dbus_unique_name.replace_char('.', '_').remove_char(':'), token);
 
 	fd.path = path;
 	fd.filter = vformat("type='signal',sender='org.freedesktop.portal.Desktop',path='%s',interface='org.freedesktop.portal.Request',member='Response',destination='%s'", path, dbus_unique_name);
@@ -592,29 +804,47 @@ Error FreeDesktopPortalDesktop::file_dialog_show(DisplayServer::WindowID p_windo
 	return OK;
 }
 
-void FreeDesktopPortalDesktop::process_file_dialog_callbacks() {
-	MutexLock lock(file_dialog_mutex);
-	while (!pending_cbs.is_empty()) {
-		FileDialogCallback cb = pending_cbs.front()->get();
-		pending_cbs.pop_front();
+void FreeDesktopPortalDesktop::process_callbacks() {
+	{
+		MutexLock lock(file_dialog_mutex);
+		while (!pending_file_cbs.is_empty()) {
+			FileDialogCallback cb = pending_file_cbs.front()->get();
+			pending_file_cbs.pop_front();
 
-		if (cb.opt_in_cb) {
-			Variant ret;
-			Callable::CallError ce;
-			const Variant *args[4] = { &cb.status, &cb.files, &cb.index, &cb.options };
+			if (cb.opt_in_cb) {
+				Variant ret;
+				Callable::CallError ce;
+				const Variant *args[4] = { &cb.status, &cb.files, &cb.index, &cb.options };
 
-			cb.callback.callp(args, 4, ret, ce);
-			if (ce.error != Callable::CallError::CALL_OK) {
-				ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(cb.callback, args, 4, ce)));
+				cb.callback.callp(args, 4, ret, ce);
+				if (ce.error != Callable::CallError::CALL_OK) {
+					ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(cb.callback, args, 4, ce)));
+				}
+			} else {
+				Variant ret;
+				Callable::CallError ce;
+				const Variant *args[3] = { &cb.status, &cb.files, &cb.index };
+
+				cb.callback.callp(args, 3, ret, ce);
+				if (ce.error != Callable::CallError::CALL_OK) {
+					ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(cb.callback, args, 3, ce)));
+				}
 			}
-		} else {
+		}
+	}
+	{
+		MutexLock lock(color_picker_mutex);
+		while (!pending_color_cbs.is_empty()) {
+			ColorPickerCallback cb = pending_color_cbs.front()->get();
+			pending_color_cbs.pop_front();
+
 			Variant ret;
 			Callable::CallError ce;
-			const Variant *args[3] = { &cb.status, &cb.files, &cb.index };
+			const Variant *args[2] = { &cb.status, &cb.color };
 
-			cb.callback.callp(args, 3, ret, ce);
+			cb.callback.callp(args, 2, ret, ce);
 			if (ce.error != Callable::CallError::CALL_OK) {
-				ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(cb.callback, args, 3, ce)));
+				ERR_PRINT(vformat("Failed to execute color picker callback: %s.", Variant::get_callable_error_text(cb.callback, args, 2, ce)));
 			}
 		}
 	}
@@ -639,46 +869,78 @@ void FreeDesktopPortalDesktop::_thread_monitor(void *p_ud) {
 						dbus_message_iter_get_basic(&iter, &value);
 						String key = String::utf8(value);
 
-						if (name_space == "org.freedesktop.appearance" && key == "color-scheme") {
+						if (name_space == "org.freedesktop.appearance" && (key == "color-scheme" || key == "accent-color")) {
 							callable_mp(portal, &FreeDesktopPortalDesktop::_system_theme_changed_callback).call_deferred();
 						}
 					}
 				} else if (dbus_message_is_signal(msg, "org.freedesktop.portal.Request", "Response")) {
 					String path = String::utf8(dbus_message_get_path(msg));
-					MutexLock lock(portal->file_dialog_mutex);
-					for (int i = 0; i < portal->file_dialogs.size(); i++) {
-						FreeDesktopPortalDesktop::FileDialogData &fd = portal->file_dialogs.write[i];
-						if (fd.path == path) {
-							DBusMessageIter iter;
-							if (dbus_message_iter_init(msg, &iter)) {
-								bool cancel = false;
-								Vector<String> uris;
-								Dictionary options;
-								int index = 0;
-								file_chooser_parse_response(&iter, fd.filter_names, fd.option_ids, cancel, uris, index, options);
+					{
+						MutexLock lock(portal->file_dialog_mutex);
+						for (int i = 0; i < portal->file_dialogs.size(); i++) {
+							FreeDesktopPortalDesktop::FileDialogData &fd = portal->file_dialogs.write[i];
+							if (fd.path == path) {
+								DBusMessageIter iter;
+								if (dbus_message_iter_init(msg, &iter)) {
+									bool cancel = false;
+									Vector<String> uris;
+									Dictionary options;
+									int index = 0;
+									file_chooser_parse_response(&iter, fd.filter_names, fd.option_ids, cancel, uris, index, options);
 
-								if (fd.callback.is_valid()) {
-									FileDialogCallback cb;
-									cb.callback = fd.callback;
-									cb.status = !cancel;
-									cb.files = uris;
-									cb.index = index;
-									cb.options = options;
-									cb.opt_in_cb = fd.opt_in_cb;
-									portal->pending_cbs.push_back(cb);
-								}
-								if (fd.prev_focus != DisplayServer::INVALID_WINDOW_ID) {
-									callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(fd.prev_focus);
+									if (fd.callback.is_valid()) {
+										FileDialogCallback cb;
+										cb.callback = fd.callback;
+										cb.status = !cancel;
+										cb.files = uris;
+										cb.index = index;
+										cb.options = options;
+										cb.opt_in_cb = fd.opt_in_cb;
+										portal->pending_file_cbs.push_back(cb);
+									}
+									if (fd.prev_focus != DisplayServer::INVALID_WINDOW_ID) {
+										callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(fd.prev_focus);
+									}
 								}
+
+								DBusError err;
+								dbus_error_init(&err);
+								dbus_bus_remove_match(portal->monitor_connection, fd.filter.utf8().get_data(), &err);
+								dbus_error_free(&err);
+
+								portal->file_dialogs.remove_at(i);
+								break;
 							}
+						}
+					}
+					{
+						MutexLock lock(portal->color_picker_mutex);
+						for (int i = 0; i < portal->color_pickers.size(); i++) {
+							FreeDesktopPortalDesktop::ColorPickerData &cd = portal->color_pickers.write[i];
+							if (cd.path == path) {
+								DBusMessageIter iter;
+								if (dbus_message_iter_init(msg, &iter)) {
+									bool cancel = false;
+									Color c;
+									color_picker_parse_response(&iter, cancel, c);
 
-							DBusError err;
-							dbus_error_init(&err);
-							dbus_bus_remove_match(portal->monitor_connection, fd.filter.utf8().get_data(), &err);
-							dbus_error_free(&err);
+									if (cd.callback.is_valid()) {
+										ColorPickerCallback cb;
+										cb.callback = cd.callback;
+										cb.color = c;
+										cb.status = !cancel;
+										portal->pending_color_cbs.push_back(cb);
+									}
+								}
 
-							portal->file_dialogs.remove_at(i);
-							break;
+								DBusError err;
+								dbus_error_init(&err);
+								dbus_bus_remove_match(portal->monitor_connection, cd.filter.utf8().get_data(), &err);
+								dbus_error_free(&err);
+
+								portal->color_pickers.remove_at(i);
+								break;
+							}
 						}
 					}
 				}
diff --git a/engine/platform/linuxbsd/freedesktop_portal_desktop.h b/engine/platform/linuxbsd/freedesktop_portal_desktop.h
index de14021c..5e73a777 100644
--- a/engine/platform/linuxbsd/freedesktop_portal_desktop.h
+++ b/engine/platform/linuxbsd/freedesktop_portal_desktop.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FREEDESKTOP_PORTAL_DESKTOP_H
-#define FREEDESKTOP_PORTAL_DESKTOP_H
+#pragma once
 
 #ifdef DBUS_ENABLED
 
@@ -45,9 +44,15 @@ class FreeDesktopPortalDesktop : public Object {
 private:
 	bool unsupported = false;
 
-	static bool try_parse_variant(DBusMessage *p_reply_message, int p_type, void *r_value);
+	enum ReadVariantType {
+		VAR_TYPE_UINT32, // u
+		VAR_TYPE_BOOL, // b
+		VAR_TYPE_COLOR, // (ddd)
+	};
+
+	static bool try_parse_variant(DBusMessage *p_reply_message, ReadVariantType p_type, void *r_value);
 	// Read a setting from org.freekdesktop.portal.Settings
-	bool read_setting(const char *p_namespace, const char *p_key, int p_type, void *r_value);
+	bool read_setting(const char *p_namespace, const char *p_key, ReadVariantType p_type, void *r_value);
 
 	static void append_dbus_string(DBusMessageIter *p_iter, const String &p_string);
 	static void append_dbus_dict_options(DBusMessageIter *p_iter, const TypedArray<Dictionary> &p_options, HashMap<String, String> &r_ids);
@@ -55,6 +60,23 @@ private:
 	static void append_dbus_dict_string(DBusMessageIter *p_iter, const String &p_key, const String &p_value, bool p_as_byte_array = false);
 	static void append_dbus_dict_bool(DBusMessageIter *p_iter, const String &p_key, bool p_value);
 	static bool file_chooser_parse_response(DBusMessageIter *p_iter, const Vector<String> &p_names, const HashMap<String, String> &p_ids, bool &r_cancel, Vector<String> &r_urls, int &r_index, Dictionary &r_options);
+	static bool color_picker_parse_response(DBusMessageIter *p_iter, bool &r_cancel, Color &r_color);
+
+	struct ColorPickerData {
+		Callable callback;
+		String filter;
+		String path;
+	};
+
+	struct ColorPickerCallback {
+		Callable callback;
+		Variant status;
+		Variant color;
+	};
+	List<ColorPickerCallback> pending_color_cbs;
+
+	Mutex color_picker_mutex;
+	Vector<ColorPickerData> color_pickers;
 
 	struct FileDialogData {
 		Vector<String> filter_names;
@@ -74,7 +96,7 @@ private:
 		Variant options;
 		bool opt_in_cb = false;
 	};
-	List<FileDialogCallback> pending_cbs;
+	List<FileDialogCallback> pending_file_cbs;
 
 	Mutex file_dialog_mutex;
 	Vector<FileDialogData> file_dialogs;
@@ -96,11 +118,11 @@ public:
 	bool is_supported() { return !unsupported; }
 	bool is_file_chooser_supported();
 	bool is_settings_supported();
+	bool is_screenshot_supported();
 
 	// org.freedesktop.portal.FileChooser methods.
-
 	Error file_dialog_show(DisplayServer::WindowID p_window_id, const String &p_xid, const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, DisplayServer::FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb);
-	void process_file_dialog_callbacks();
+	void process_callbacks();
 
 	// org.freedesktop.portal.Settings methods.
 
@@ -109,11 +131,19 @@ public:
 	// 1: Prefer dark appearance.
 	// 2: Prefer light appearance.
 	uint32_t get_appearance_color_scheme();
+	Color get_appearance_accent_color();
 	void set_system_theme_change_callback(const Callable &p_system_theme_changed) {
 		system_theme_changed = p_system_theme_changed;
 	}
+
+	// Retrieve high-contrast setting.
+	// -1: Unknown.
+	// 0: Disabled.
+	// 1: Enabled.
+	uint32_t get_high_contrast();
+
+	// org.freedesktop.portal.Screenshot methods.
+	bool color_picker(const String &p_xid, const Callable &p_callback);
 };
 
 #endif // DBUS_ENABLED
-
-#endif // FREEDESKTOP_PORTAL_DESKTOP_H
diff --git a/engine/platform/linuxbsd/freedesktop_screensaver.cpp b/engine/platform/linuxbsd/freedesktop_screensaver.cpp
index cf179b57..2d1fd074 100644
--- a/engine/platform/linuxbsd/freedesktop_screensaver.cpp
+++ b/engine/platform/linuxbsd/freedesktop_screensaver.cpp
@@ -79,7 +79,7 @@ void FreeDesktopScreenSaver::inhibit() {
 	if (dbus_error_is_set(&error)) {
 		dbus_error_free(&error);
 		dbus_connection_unref(bus);
-		unsupported = false;
+		unsupported = true;
 		return;
 	}
 
@@ -116,6 +116,7 @@ void FreeDesktopScreenSaver::uninhibit() {
 			DBUS_TYPE_INVALID);
 
 	DBusMessage *reply = dbus_connection_send_with_reply_and_block(bus, message, 50, &error);
+	dbus_message_unref(message);
 	if (dbus_error_is_set(&error)) {
 		dbus_error_free(&error);
 		dbus_connection_unref(bus);
@@ -125,7 +126,6 @@ void FreeDesktopScreenSaver::uninhibit() {
 
 	print_verbose("FreeDesktopScreenSaver: Released screensaver inhibition cookie: " + uitos(cookie));
 
-	dbus_message_unref(message);
 	dbus_message_unref(reply);
 	dbus_connection_unref(bus);
 }
diff --git a/engine/platform/linuxbsd/freedesktop_screensaver.h b/engine/platform/linuxbsd/freedesktop_screensaver.h
index e9f0c566..d00a7208 100644
--- a/engine/platform/linuxbsd/freedesktop_screensaver.h
+++ b/engine/platform/linuxbsd/freedesktop_screensaver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FREEDESKTOP_SCREENSAVER_H
-#define FREEDESKTOP_SCREENSAVER_H
+#pragma once
 
 #ifdef DBUS_ENABLED
 
@@ -47,5 +46,3 @@ public:
 };
 
 #endif // DBUS_ENABLED
-
-#endif // FREEDESKTOP_SCREENSAVER_H
diff --git a/engine/platform/linuxbsd/joypad_linux.cpp b/engine/platform/linuxbsd/joypad_linux.cpp
index 49f2690e..f76e54d7 100644
--- a/engine/platform/linuxbsd/joypad_linux.cpp
+++ b/engine/platform/linuxbsd/joypad_linux.cpp
@@ -73,7 +73,7 @@ JoypadLinux::Joypad::~Joypad() {
 }
 
 void JoypadLinux::Joypad::reset() {
-	dpad = 0;
+	dpad.clear();
 	fd = -1;
 	for (int i = 0; i < MAX_ABS; i++) {
 		abs_map[i] = -1;
diff --git a/engine/platform/linuxbsd/joypad_linux.h b/engine/platform/linuxbsd/joypad_linux.h
index bf24d8e5..5f9f3d9e 100644
--- a/engine/platform/linuxbsd/joypad_linux.h
+++ b/engine/platform/linuxbsd/joypad_linux.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOYPAD_LINUX_H
-#define JOYPAD_LINUX_H
+#pragma once
 
 #ifdef JOYDEV_ENABLED
 
@@ -63,7 +62,7 @@ private:
 		float curr_axis[MAX_ABS];
 		int key_map[MAX_KEY];
 		int abs_map[MAX_ABS];
-		BitField<HatMask> dpad;
+		BitField<HatMask> dpad = HatMask::CENTER;
 		int fd = -1;
 
 		String devpath;
@@ -135,5 +134,3 @@ private:
 };
 
 #endif // JOYDEV_ENABLED
-
-#endif // JOYPAD_LINUX_H
diff --git a/engine/platform/linuxbsd/msvs.py b/engine/platform/linuxbsd/msvs.py
new file mode 100644
index 00000000..5dae4e47
--- /dev/null
+++ b/engine/platform/linuxbsd/msvs.py
@@ -0,0 +1,11 @@
+# Tuples with the name of the arch
+def get_platforms():
+    return [("x64", "x86_64")]
+
+
+def get_configurations():
+    return ["editor", "template_debug", "template_release"]
+
+
+def get_build_prefix(env):
+    return []
diff --git a/engine/platform/linuxbsd/os_linuxbsd.cpp b/engine/platform/linuxbsd/os_linuxbsd.cpp
index 9fba97d5..62359a3b 100644
--- a/engine/platform/linuxbsd/os_linuxbsd.cpp
+++ b/engine/platform/linuxbsd/os_linuxbsd.cpp
@@ -37,10 +37,12 @@
 #include "servers/rendering_server.h"
 
 #ifdef X11_ENABLED
+#include "x11/detect_prime_x11.h"
 #include "x11/display_server_x11.h"
 #endif
 
 #ifdef WAYLAND_ENABLED
+#include "wayland/detect_prime_egl.h"
 #include "wayland/display_server_wayland.h"
 #endif
 
@@ -49,6 +51,22 @@
 #include "modules/regex/regex.h"
 #endif
 
+#if defined(RD_ENABLED)
+#include "servers/rendering/rendering_device.h"
+#endif
+
+#if defined(VULKAN_ENABLED)
+#ifdef X11_ENABLED
+#include "x11/rendering_context_driver_vulkan_x11.h"
+#endif
+#ifdef WAYLAND_ENABLED
+#include "wayland/rendering_context_driver_vulkan_wayland.h"
+#endif
+#endif
+#if defined(GLES3_ENABLED)
+#include "drivers/gles3/rasterizer_gles3.h"
+#endif
+
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -74,7 +92,7 @@ void OS_LinuxBSD::alert(const String &p_alert, const String &p_title) {
 	String program;
 
 	for (int i = 0; i < path_elems.size(); i++) {
-		for (uint64_t k = 0; k < sizeof(message_programs) / sizeof(char *); k++) {
+		for (uint64_t k = 0; k < std::size(message_programs); k++) {
 			String tested_path = path_elems[i].path_join(message_programs[k]);
 
 			if (FileAccess::exists(tested_path)) {
@@ -155,7 +173,7 @@ String OS_LinuxBSD::get_unique_id() const {
 		memset(buf, 0, sizeof(buf));
 		size_t len = sizeof(buf) - 1;
 		if (sysctl(mib, 2, buf, &len, 0x0, 0) != -1) {
-			machine_id = String::utf8(buf).replace("-", "");
+			machine_id = String::utf8(buf).remove_char('-');
 		}
 #else
 		Ref<FileAccess> f = FileAccess::open("/etc/machine-id", FileAccess::READ);
@@ -751,7 +769,7 @@ Vector<String> OS_LinuxBSD::get_system_font_path_for_text(const String &p_font_n
 
 	Vector<String> ret;
 	static const char *allowed_formats[] = { "TrueType", "CFF" };
-	for (size_t i = 0; i < sizeof(allowed_formats) / sizeof(const char *); i++) {
+	for (size_t i = 0; i < std::size(allowed_formats); i++) {
 		FcPattern *pattern = FcPatternCreate();
 		if (pattern) {
 			FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
@@ -1180,6 +1198,73 @@ String OS_LinuxBSD::get_system_ca_certificates() {
 	return f->get_as_text();
 }
 
+bool OS_LinuxBSD::_test_create_rendering_device(const String &p_display_driver) const {
+	// Tests Rendering Device creation.
+
+	bool ok = false;
+#if defined(RD_ENABLED)
+	Error err;
+	RenderingContextDriver *rcd = nullptr;
+
+#if defined(VULKAN_ENABLED)
+#ifdef X11_ENABLED
+	if (p_display_driver == "x11" || p_display_driver.is_empty()) {
+		rcd = memnew(RenderingContextDriverVulkanX11);
+	}
+#endif
+#ifdef WAYLAND_ENABLED
+	if (p_display_driver == "wayland") {
+		rcd = memnew(RenderingContextDriverVulkanWayland);
+	}
+#endif
+#endif
+	if (rcd != nullptr) {
+		err = rcd->initialize();
+		if (err == OK) {
+			RenderingDevice *rd = memnew(RenderingDevice);
+			err = rd->initialize(rcd);
+			memdelete(rd);
+			rd = nullptr;
+			if (err == OK) {
+				ok = true;
+			}
+		}
+		memdelete(rcd);
+		rcd = nullptr;
+	}
+#endif
+	return ok;
+}
+
+bool OS_LinuxBSD::_test_create_rendering_device_and_gl(const String &p_display_driver) const {
+	// Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some drivers.
+
+#ifdef GLES3_ENABLED
+#ifdef X11_ENABLED
+	if (p_display_driver == "x11" || p_display_driver.is_empty()) {
+#ifdef SOWRAP_ENABLED
+		if (initialize_xlib(0) != 0) {
+			return false;
+		}
+#endif
+		DetectPrimeX11::create_context();
+	}
+#endif
+#ifdef WAYLAND_ENABLED
+	if (p_display_driver == "wayland") {
+#ifdef SOWRAP_ENABLED
+		if (initialize_wayland_egl(0) != 0) {
+			return false;
+		}
+#endif
+		DetectPrimeEGL::create_context(EGL_PLATFORM_WAYLAND_KHR);
+	}
+#endif
+	RasterizerGLES3::make_current(true);
+#endif
+	return _test_create_rendering_device(p_display_driver);
+}
+
 OS_LinuxBSD::OS_LinuxBSD() {
 	main_loop = nullptr;
 
diff --git a/engine/platform/linuxbsd/os_linuxbsd.h b/engine/platform/linuxbsd/os_linuxbsd.h
index 9084061e..736b0323 100644
--- a/engine/platform/linuxbsd/os_linuxbsd.h
+++ b/engine/platform/linuxbsd/os_linuxbsd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_LINUXBSD_H
-#define OS_LINUXBSD_H
+#pragma once
 
 #include "crash_handler_linuxbsd.h"
 #include "joypad_linux.h"
@@ -138,8 +137,9 @@ public:
 
 	virtual String get_system_ca_certificates() override;
 
+	virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const override;
+	virtual bool _test_create_rendering_device(const String &p_display_driver) const override;
+
 	OS_LinuxBSD();
 	~OS_LinuxBSD();
 };
-
-#endif // OS_LINUXBSD_H
diff --git a/engine/platform/linuxbsd/platform_config.h b/engine/platform/linuxbsd/platform_config.h
index c372ef28..5f5b7da3 100644
--- a/engine/platform/linuxbsd/platform_config.h
+++ b/engine/platform/linuxbsd/platform_config.h
@@ -28,6 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #ifdef __linux__
 #include <alloca.h>
 #endif
diff --git a/engine/platform/linuxbsd/platform_gl.h b/engine/platform/linuxbsd/platform_gl.h
index 5d4c2d89..73477b50 100644
--- a/engine/platform/linuxbsd/platform_gl.h
+++ b/engine/platform/linuxbsd/platform_gl.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLATFORM_GL_H
-#define PLATFORM_GL_H
+#pragma once
 
 #ifndef GL_API_ENABLED
 #define GL_API_ENABLED // Allow using desktop GL.
@@ -41,5 +40,3 @@
 
 #include "thirdparty/glad/glad/egl.h"
 #include "thirdparty/glad/glad/gl.h"
-
-#endif // PLATFORM_GL_H
diff --git a/engine/platform/linuxbsd/tts_linux.cpp b/engine/platform/linuxbsd/tts_linux.cpp
index 95cae58f..2ef89747 100644
--- a/engine/platform/linuxbsd/tts_linux.cpp
+++ b/engine/platform/linuxbsd/tts_linux.cpp
@@ -63,7 +63,7 @@ void TTS_Linux::speech_init_thread_func(void *p_userdata) {
 			} else {
 				class_str = config_name.utf8();
 			}
-			tts->synth = spd_open(class_str, "Godot_Engine_Speech_API", "Godot_Engine", SPD_MODE_THREADED);
+			tts->synth = spd_open(class_str.get_data(), "Godot_Engine_Speech_API", "Godot_Engine", SPD_MODE_THREADED);
 			if (tts->synth) {
 				tts->synth->callback_end = &speech_event_callback;
 				tts->synth->callback_cancel = &speech_event_callback;
diff --git a/engine/platform/linuxbsd/tts_linux.h b/engine/platform/linuxbsd/tts_linux.h
index 00ea88d1..3f48ad00 100644
--- a/engine/platform/linuxbsd/tts_linux.h
+++ b/engine/platform/linuxbsd/tts_linux.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TTS_LINUX_H
-#define TTS_LINUX_H
+#pragma once
 
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
@@ -90,5 +89,3 @@ public:
 	TTS_Linux();
 	~TTS_Linux();
 };
-
-#endif // TTS_LINUX_H
diff --git a/engine/platform/linuxbsd/wayland/detect_prime_egl.h b/engine/platform/linuxbsd/wayland/detect_prime_egl.h
index 3391e020..6a29ee81 100644
--- a/engine/platform/linuxbsd/wayland/detect_prime_egl.h
+++ b/engine/platform/linuxbsd/wayland/detect_prime_egl.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DETECT_PRIME_EGL_H
-#define DETECT_PRIME_EGL_H
+#pragma once
 
 #ifdef GLES3_ENABLED
 #ifdef EGL_ENABLED
@@ -77,13 +76,11 @@ private:
 		{ nullptr, 0 }
 	};
 
+public:
 	static void create_context(EGLenum p_platform_enum);
 
-public:
 	static int detect_prime(EGLenum p_platform_enum);
 };
 
 #endif // GLES3_ENABLED
 #endif // EGL_ENABLED
-
-#endif // DETECT_PRIME_EGL_H
diff --git a/engine/platform/linuxbsd/wayland/display_server_wayland.cpp b/engine/platform/linuxbsd/wayland/display_server_wayland.cpp
index 5334446b..ee09b816 100644
--- a/engine/platform/linuxbsd/wayland/display_server_wayland.cpp
+++ b/engine/platform/linuxbsd/wayland/display_server_wayland.cpp
@@ -39,6 +39,8 @@
 #define DEBUG_LOG_WAYLAND(...)
 #endif
 
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 #ifdef VULKAN_ENABLED
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #endif
@@ -50,6 +52,12 @@
 #include "wayland/egl_manager_wayland_gles.h"
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
+#endif
+
+#define WAYLAND_MAX_FRAME_TIME_US (1'000'000)
+
 String DisplayServerWayland::_get_app_id_from_context(Context p_context) {
 	String app_id;
 
@@ -76,8 +84,10 @@ String DisplayServerWayland::_get_app_id_from_context(Context p_context) {
 	return app_id;
 }
 
-void DisplayServerWayland::_send_window_event(WindowEvent p_event) {
-	WindowData &wd = main_window;
+void DisplayServerWayland::_send_window_event(WindowEvent p_event, WindowID p_window_id) {
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	WindowData &wd = windows[p_window_id];
 
 	if (wd.window_event_callback.is_valid()) {
 		Variant event = int(p_event);
@@ -86,24 +96,58 @@ void DisplayServerWayland::_send_window_event(WindowEvent p_event) {
 }
 
 void DisplayServerWayland::dispatch_input_events(const Ref<InputEvent> &p_event) {
-	((DisplayServerWayland *)(get_singleton()))->_dispatch_input_event(p_event);
+	static_cast<DisplayServerWayland *>(get_singleton())->_dispatch_input_event(p_event);
 }
 
 void DisplayServerWayland::_dispatch_input_event(const Ref<InputEvent> &p_event) {
-	Callable callable = main_window.input_event_callback;
-	if (callable.is_valid()) {
-		callable.call(p_event);
+	Ref<InputEventFromWindow> event_from_window = p_event;
+
+	if (event_from_window.is_valid()) {
+		WindowID window_id = event_from_window->get_window_id();
+
+		Ref<InputEventKey> key_event = p_event;
+		if (!popup_menu_list.is_empty() && key_event.is_valid()) {
+			// Redirect to the highest popup menu.
+			window_id = popup_menu_list.back()->get();
+		}
+
+		// Send to a single window.
+		if (windows.has(window_id)) {
+			Callable callable = windows[window_id].input_event_callback;
+			if (callable.is_valid()) {
+				callable.call(p_event);
+			}
+		}
+	} else {
+		// Send to all windows. Copy all pending callbacks, since callback can erase window.
+		Vector<Callable> cbs;
+		for (KeyValue<WindowID, WindowData> &E : windows) {
+			Callable callable = E.value.input_event_callback;
+			if (callable.is_valid()) {
+				cbs.push_back(callable);
+			}
+		}
+
+		for (const Callable &cb : cbs) {
+			cb.call(p_event);
+		}
 	}
 }
 
-void DisplayServerWayland::_resize_window(const Size2i &p_size) {
-	WindowData &wd = main_window;
+void DisplayServerWayland::_update_window_rect(const Rect2i &p_rect, WindowID p_window_id) {
+	ERR_FAIL_COND(!windows.has(p_window_id));
 
-	wd.rect.size = p_size;
+	WindowData &wd = windows[p_window_id];
+
+	if (wd.rect == p_rect) {
+		return;
+	}
+
+	wd.rect = p_rect;
 
 #ifdef RD_ENABLED
 	if (wd.visible && rendering_context) {
-		rendering_context->window_set_size(MAIN_WINDOW_ID, wd.rect.size.width, wd.rect.size.height);
+		rendering_context->window_set_size(p_window_id, wd.rect.size.width, wd.rect.size.height);
 	}
 #endif
 
@@ -118,78 +162,6 @@ void DisplayServerWayland::_resize_window(const Size2i &p_size) {
 	}
 }
 
-void DisplayServerWayland::_show_window() {
-	MutexLock mutex_lock(wayland_thread.mutex);
-
-	WindowData &wd = main_window;
-
-	if (!wd.visible) {
-		DEBUG_LOG_WAYLAND("Showing window.");
-
-		// Showing this window will reset its mode with whatever the compositor
-		// reports. We'll save the mode beforehand so that we can reapply it later.
-		// TODO: Fix/Port/Move/Whatever to `WaylandThread` APIs.
-		WindowMode setup_mode = wd.mode;
-
-		wayland_thread.window_create(MAIN_WINDOW_ID, wd.rect.size.width, wd.rect.size.height);
-		wayland_thread.window_set_min_size(MAIN_WINDOW_ID, wd.min_size);
-		wayland_thread.window_set_max_size(MAIN_WINDOW_ID, wd.max_size);
-		wayland_thread.window_set_app_id(MAIN_WINDOW_ID, _get_app_id_from_context(context));
-		wayland_thread.window_set_borderless(MAIN_WINDOW_ID, window_get_flag(WINDOW_FLAG_BORDERLESS));
-
-		// NOTE: The XDG shell protocol is built in a way that causes the window to
-		// be immediately shown as soon as a valid buffer is assigned to it. Hence,
-		// the only acceptable way of implementing window showing is to move the
-		// graphics context window creation logic here.
-#ifdef RD_ENABLED
-		if (rendering_context) {
-			union {
-#ifdef VULKAN_ENABLED
-				RenderingContextDriverVulkanWayland::WindowPlatformData vulkan;
-#endif
-			} wpd;
-#ifdef VULKAN_ENABLED
-			if (rendering_driver == "vulkan") {
-				wpd.vulkan.surface = wayland_thread.window_get_wl_surface(wd.id);
-				wpd.vulkan.display = wayland_thread.get_wl_display();
-			}
-#endif
-			Error err = rendering_context->window_create(wd.id, &wpd);
-			ERR_FAIL_COND_MSG(err != OK, vformat("Can't create a %s window", rendering_driver));
-
-			rendering_context->window_set_size(wd.id, wd.rect.size.width, wd.rect.size.height);
-			rendering_context->window_set_vsync_mode(wd.id, wd.vsync_mode);
-
-			emulate_vsync = (rendering_context->window_get_vsync_mode(wd.id) == DisplayServer::VSYNC_ENABLED);
-
-			if (emulate_vsync) {
-				print_verbose("VSYNC: manually throttling frames using MAILBOX.");
-				rendering_context->window_set_vsync_mode(wd.id, DisplayServer::VSYNC_MAILBOX);
-			}
-		}
-#endif
-
-#ifdef GLES3_ENABLED
-		if (egl_manager) {
-			struct wl_surface *wl_surface = wayland_thread.window_get_wl_surface(wd.id);
-			wd.wl_egl_window = wl_egl_window_create(wl_surface, wd.rect.size.width, wd.rect.size.height);
-
-			Error err = egl_manager->window_create(MAIN_WINDOW_ID, wayland_thread.get_wl_display(), wd.wl_egl_window, wd.rect.size.width, wd.rect.size.height);
-			ERR_FAIL_COND_MSG(err == ERR_CANT_CREATE, "Can't show a GLES3 window.");
-
-			window_set_vsync_mode(wd.vsync_mode, MAIN_WINDOW_ID);
-		}
-#endif
-		// NOTE: The public window-handling methods might depend on this flag being
-		// set. Ensure to not make any of these calls before this assignment.
-		wd.visible = true;
-
-		// Actually try to apply the window's mode now that it's visible.
-		window_set_mode(setup_mode);
-
-		wayland_thread.window_set_title(MAIN_WINDOW_ID, wd.title);
-	}
-}
 // Interface methods.
 
 bool DisplayServerWayland::has_feature(Feature p_feature) const {
@@ -210,7 +182,9 @@ bool DisplayServerWayland::has_feature(Feature p_feature) const {
 		case FEATURE_KEEP_SCREEN_ON:
 		case FEATURE_IME:
 		case FEATURE_WINDOW_DRAG:
-		case FEATURE_CLIPBOARD_PRIMARY: {
+		case FEATURE_CLIPBOARD_PRIMARY:
+		case FEATURE_SUBWINDOWS:
+		case FEATURE_SELF_FITTING_WINDOWS: {
 			return true;
 		} break;
 
@@ -222,6 +196,9 @@ bool DisplayServerWayland::has_feature(Feature p_feature) const {
 		case FEATURE_NATIVE_DIALOG_FILE_MIME: {
 			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_file_chooser_supported());
 		} break;
+		case FEATURE_NATIVE_COLOR_PICKER: {
+			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_screenshot_supported());
+		} break;
 #endif
 
 #ifdef SPEECHD_ENABLED
@@ -230,6 +207,12 @@ bool DisplayServerWayland::has_feature(Feature p_feature) const {
 		} break;
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
+		} break;
+#endif
+
 		default: {
 			return false;
 		}
@@ -242,37 +225,62 @@ String DisplayServerWayland::get_name() const {
 
 #ifdef SPEECHD_ENABLED
 
+void DisplayServerWayland::initialize_tts() const {
+	const_cast<DisplayServerWayland *>(this)->tts = memnew(TTS_Linux);
+}
+
 bool DisplayServerWayland::tts_is_speaking() const {
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
 	ERR_FAIL_NULL_V(tts, false);
 	return tts->is_speaking();
 }
 
 bool DisplayServerWayland::tts_is_paused() const {
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
 	ERR_FAIL_NULL_V(tts, false);
 	return tts->is_paused();
 }
 
 TypedArray<Dictionary> DisplayServerWayland::tts_get_voices() const {
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
 	ERR_FAIL_NULL_V(tts, TypedArray<Dictionary>());
 	return tts->get_voices();
 }
 
 void DisplayServerWayland::tts_speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int p_utterance_id, bool p_interrupt) {
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
 	ERR_FAIL_NULL(tts);
 	tts->speak(p_text, p_voice, p_volume, p_pitch, p_rate, p_utterance_id, p_interrupt);
 }
 
 void DisplayServerWayland::tts_pause() {
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
 	ERR_FAIL_NULL(tts);
 	tts->pause();
 }
 
 void DisplayServerWayland::tts_resume() {
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
 	ERR_FAIL_NULL(tts);
 	tts->resume();
 }
 
 void DisplayServerWayland::tts_stop() {
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
 	ERR_FAIL_NULL(tts);
 	tts->stop();
 }
@@ -302,23 +310,39 @@ bool DisplayServerWayland::is_dark_mode() const {
 	}
 }
 
+Color DisplayServerWayland::get_accent_color() const {
+	return portal_desktop->get_appearance_accent_color();
+}
+
 void DisplayServerWayland::set_system_theme_change_callback(const Callable &p_callable) {
 	portal_desktop->set_system_theme_change_callback(p_callable);
 }
 
-Error DisplayServerWayland::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
-	WindowID window_id = MAIN_WINDOW_ID;
-	// TODO: Use window IDs for multiwindow support.
+Error DisplayServerWayland::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	WindowID window_id = p_window_id;
+	if (!windows.has(window_id) || window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, window_id)) {
+		window_id = MAIN_WINDOW_ID;
+	}
+
+	WaylandThread::WindowState *ws = wayland_thread.window_get_state(window_id);
+	ERR_FAIL_NULL_V(ws, ERR_BUG);
 
-	WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wayland_thread.window_get_wl_surface(window_id));
 	return portal_desktop->file_dialog_show(window_id, (ws ? ws->exported_handle : String()), p_title, p_current_directory, String(), p_filename, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false);
 }
 
-Error DisplayServerWayland::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
-	WindowID window_id = MAIN_WINDOW_ID;
-	// TODO: Use window IDs for multiwindow support.
+Error DisplayServerWayland::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	WindowID window_id = p_window_id;
+	if (!windows.has(window_id) || window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, window_id)) {
+		window_id = MAIN_WINDOW_ID;
+	}
+
+	WaylandThread::WindowState *ws = wayland_thread.window_get_state(window_id);
+	ERR_FAIL_NULL_V(ws, ERR_BUG);
 
-	WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wayland_thread.window_get_wl_surface(window_id));
 	return portal_desktop->file_dialog_show(window_id, (ws ? ws->exported_handle : String()), p_title, p_current_directory, p_root, p_filename, p_mode, p_filters, p_options, p_callback, true);
 }
 
@@ -361,6 +385,12 @@ void DisplayServerWayland::_mouse_update_mode() {
 
 	wayland_thread.pointer_set_constraint(constraint);
 
+	if (wanted_mouse_mode == DisplayServer::MOUSE_MODE_CAPTURED) {
+		WindowData *pointed_win = windows.getptr(wayland_thread.pointer_get_pointed_window_id());
+		ERR_FAIL_NULL(pointed_win);
+		wayland_thread.pointer_set_hint(pointed_win->rect.size / 2);
+	}
+
 	mouse_mode = wanted_mouse_mode;
 }
 
@@ -421,6 +451,12 @@ void DisplayServerWayland::warp_mouse(const Point2i &p_to) {
 Point2i DisplayServerWayland::mouse_get_position() const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
+	WindowID pointed_id = wayland_thread.pointer_get_pointed_window_id();
+
+	if (pointed_id != INVALID_WINDOW_ID) {
+		return Input::get_singleton()->get_mouse_position() + windows[pointed_id].rect.position;
+	}
+
 	// We can't properly implement this method by design.
 	// This is the best we can do unfortunately.
 	return Input::get_singleton()->get_mouse_position();
@@ -618,6 +654,8 @@ float DisplayServerWayland::screen_get_refresh_rate(int p_screen) const {
 void DisplayServerWayland::screen_set_keep_on(bool p_enable) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
+	// FIXME: For some reason this does not also windows from the wayland thread.
+
 	if (screen_is_kept_on() == p_enable) {
 		return;
 	}
@@ -636,6 +674,7 @@ void DisplayServerWayland::screen_set_keep_on(bool p_enable) {
 }
 
 bool DisplayServerWayland::screen_is_kept_on() const {
+	// FIXME: Multiwindow support.
 #ifdef DBUS_ENABLED
 	return wayland_thread.window_get_idle_inhibition(MAIN_WINDOW_ID) || screensaver_inhibited;
 #else
@@ -647,11 +686,239 @@ Vector<DisplayServer::WindowID> DisplayServerWayland::get_window_list() const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
 	Vector<int> ret;
-	ret.push_back(MAIN_WINDOW_ID);
-
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
+		ret.push_back(E.key);
+	}
 	return ret;
 }
 
+DisplayServer::WindowID DisplayServerWayland::create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect, bool p_exclusive, WindowID p_transient_parent) {
+	WindowID id = ++window_id_counter;
+	WindowData &wd = windows[id];
+
+	wd.id = id;
+	wd.mode = p_mode;
+	wd.flags = p_flags;
+	wd.vsync_mode = p_vsync_mode;
+
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver && !accessibility_driver->window_create(wd.id, nullptr)) {
+		if (OS::get_singleton()->is_stdout_verbose()) {
+			ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
+		}
+		memdelete(accessibility_driver);
+		accessibility_driver = nullptr;
+	}
+#endif
+
+	// NOTE: Remember to clear its position if this window will be a toplevel. We
+	// can only know once we show it.
+	wd.rect = p_rect;
+
+	wd.title = "Godot";
+	wd.parent_id = p_transient_parent;
+	return id;
+}
+
+void DisplayServerWayland::show_window(WindowID p_window_id) {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	WindowData &wd = windows[p_window_id];
+
+	if (!wd.visible) {
+		DEBUG_LOG_WAYLAND(vformat("Showing window %d", p_window_id));
+		// Showing this window will reset its mode with whatever the compositor
+		// reports. We'll save the mode beforehand so that we can reapply it later.
+		// TODO: Fix/Port/Move/Whatever to `WaylandThread` APIs.
+		WindowMode setup_mode = wd.mode;
+
+		// Let's determine the closest toplevel. For toplevels it will be themselves,
+		// for popups the first toplevel ancestor it finds.
+		WindowID root_id = wd.id;
+		while (root_id != INVALID_WINDOW_ID && window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, root_id)) {
+			root_id = windows[root_id].parent_id;
+		}
+		ERR_FAIL_COND(root_id == INVALID_WINDOW_ID);
+
+		wd.root_id = root_id;
+
+		if (!window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, p_window_id)) {
+			// NOTE: DO **NOT** KEEP THE POSITION SET FOR TOPLEVELS. Wayland does not
+			// track them and we're gonna get our events transformed in unexpected ways.
+			wd.rect.position = Point2i();
+
+			DEBUG_LOG_WAYLAND(vformat("Creating regular window of size %s", wd.rect.size));
+			wayland_thread.window_create(p_window_id, wd.rect.size.width, wd.rect.size.height);
+			wayland_thread.window_set_min_size(p_window_id, wd.min_size);
+			wayland_thread.window_set_max_size(p_window_id, wd.max_size);
+			wayland_thread.window_set_app_id(p_window_id, _get_app_id_from_context(context));
+			wayland_thread.window_set_borderless(p_window_id, window_get_flag(WINDOW_FLAG_BORDERLESS, p_window_id));
+
+			if (wd.parent_id != INVALID_WINDOW_ID) {
+				wayland_thread.window_set_parent(wd.id, wd.parent_id);
+			}
+
+			// Since it can't have a position. Let's tell the window node the news by
+			// the actual rect to it.
+			if (wd.rect_changed_callback.is_valid()) {
+				wd.rect_changed_callback.call(wd.rect);
+			}
+		} else {
+			DEBUG_LOG_WAYLAND("!!!!! Making popup !!!!!");
+
+			windows[root_id].popup_stack.push_back(p_window_id);
+
+			if (window_get_flag(WINDOW_FLAG_POPUP, p_window_id)) {
+				// Reroutes all input to it.
+				popup_menu_list.push_back(p_window_id);
+			}
+
+			wayland_thread.window_create_popup(p_window_id, wd.parent_id, wd.rect);
+		}
+
+		// NOTE: The XDG shell protocol is built in a way that causes the window to
+		// be immediately shown as soon as a valid buffer is assigned to it. Hence,
+		// the only acceptable way of implementing window showing is to move the
+		// graphics context window creation logic here.
+#ifdef RD_ENABLED
+		if (rendering_context) {
+			union {
+#ifdef VULKAN_ENABLED
+				RenderingContextDriverVulkanWayland::WindowPlatformData vulkan;
+#endif
+			} wpd;
+#ifdef VULKAN_ENABLED
+			if (rendering_driver == "vulkan") {
+				wpd.vulkan.surface = wayland_thread.window_get_wl_surface(wd.id);
+				wpd.vulkan.display = wayland_thread.get_wl_display();
+			}
+#endif
+			Error err = rendering_context->window_create(wd.id, &wpd);
+			ERR_FAIL_COND_MSG(err != OK, vformat("Can't create a %s window", rendering_driver));
+
+			rendering_context->window_set_size(wd.id, wd.rect.size.width, wd.rect.size.height);
+
+			// NOTE: Looks like we have to set the vsync mode before creating the screen
+			// or it won't work. Resist any temptation.
+			window_set_vsync_mode(wd.vsync_mode, p_window_id);
+		}
+
+		if (rendering_device) {
+			rendering_device->screen_create(wd.id);
+		}
+#endif
+
+#ifdef GLES3_ENABLED
+		if (egl_manager) {
+			struct wl_surface *wl_surface = wayland_thread.window_get_wl_surface(wd.id);
+			wd.wl_egl_window = wl_egl_window_create(wl_surface, wd.rect.size.width, wd.rect.size.height);
+
+			Error err = egl_manager->window_create(p_window_id, wayland_thread.get_wl_display(), wd.wl_egl_window, wd.rect.size.width, wd.rect.size.height);
+			ERR_FAIL_COND_MSG(err == ERR_CANT_CREATE, "Can't show a GLES3 window.");
+
+			window_set_vsync_mode(wd.vsync_mode, p_window_id);
+		}
+#endif
+
+		// NOTE: The public window-handling methods might depend on this flag being
+		// set. Ensure to not make any of these calls before this assignment.
+		wd.visible = true;
+
+		// Actually try to apply the window's mode now that it's visible.
+		window_set_mode(setup_mode, wd.id);
+
+		wayland_thread.window_set_title(p_window_id, wd.title);
+	}
+}
+
+void DisplayServerWayland::delete_sub_window(WindowID p_window_id) {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowData &wd = windows[p_window_id];
+
+	ERR_FAIL_COND(!windows.has(wd.root_id));
+	WindowData &root_wd = windows[wd.root_id];
+
+	// NOTE: By the time the Wayland thread will send a `WINDOW_EVENT_MOUSE_EXIT`
+	// the window will be gone and the message will be discarded, confusing the
+	// engine. We thus have to send it ourselves.
+	if (wayland_thread.pointer_get_pointed_window_id() == p_window_id) {
+		_send_window_event(WINDOW_EVENT_MOUSE_EXIT, p_window_id);
+	}
+
+	// The XDG shell specification requires us to clear all popups in reverse order.
+	while (!root_wd.popup_stack.is_empty() && root_wd.popup_stack.back()->get() != p_window_id) {
+		_send_window_event(WINDOW_EVENT_FORCE_CLOSE, root_wd.popup_stack.back()->get());
+	}
+
+	if (root_wd.popup_stack.back() && root_wd.popup_stack.back()->get() == p_window_id) {
+		root_wd.popup_stack.pop_back();
+	}
+
+	if (popup_menu_list.back() && popup_menu_list.back()->get() == p_window_id) {
+		popup_menu_list.pop_back();
+	}
+
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		accessibility_driver->window_destroy(p_window_id);
+	}
+#endif
+
+	if (wd.visible) {
+#ifdef VULKAN_ENABLED
+		if (rendering_device) {
+			rendering_device->screen_free(p_window_id);
+		}
+
+		if (rendering_context) {
+			rendering_context->window_destroy(p_window_id);
+		}
+#endif
+
+#ifdef GLES3_ENABLED
+		if (egl_manager) {
+			egl_manager->window_destroy(p_window_id);
+		}
+#endif
+
+		wayland_thread.window_destroy(p_window_id);
+	}
+
+	windows.erase(p_window_id);
+
+	DEBUG_LOG_WAYLAND(vformat("Destroyed window %d", p_window_id));
+}
+
+DisplayServer::WindowID DisplayServerWayland::window_get_active_popup() const {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	if (!popup_menu_list.is_empty()) {
+		return popup_menu_list.back()->get();
+	}
+
+	return INVALID_WINDOW_ID;
+}
+
+void DisplayServerWayland::window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	ERR_FAIL_COND(!windows.has(p_window));
+
+	windows[p_window].safe_rect = p_rect;
+}
+
+Rect2i DisplayServerWayland::window_get_popup_safe_rect(WindowID p_window) const {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	ERR_FAIL_COND_V(!windows.has(p_window), Rect2i());
+
+	return windows[p_window].safe_rect;
+}
+
 int64_t DisplayServerWayland::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
@@ -703,23 +970,31 @@ DisplayServer::WindowID DisplayServerWayland::get_window_at_screen_position(cons
 void DisplayServerWayland::window_attach_instance_id(ObjectID p_instance, WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	main_window.instance_id = p_instance;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	windows[p_window_id].instance_id = p_instance;
 }
 
 ObjectID DisplayServerWayland::window_get_attached_instance_id(WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	return main_window.instance_id;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), ObjectID());
+
+	return windows[p_window_id].instance_id;
 }
 
 void DisplayServerWayland::window_set_title(const String &p_title, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	WindowData &wd = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	WindowData &wd = windows[p_window_id];
 
 	wd.title = p_title;
 
-	wayland_thread.window_set_title(MAIN_WINDOW_ID, wd.title);
+	if (wd.visible) {
+		wayland_thread.window_set_title(p_window_id, wd.title);
+	}
 }
 
 void DisplayServerWayland::window_set_mouse_passthrough(const Vector<Vector2> &p_region, DisplayServer::WindowID p_window_id) {
@@ -730,31 +1005,41 @@ void DisplayServerWayland::window_set_mouse_passthrough(const Vector<Vector2> &p
 void DisplayServerWayland::window_set_rect_changed_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	main_window.rect_changed_callback = p_callable;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	windows[p_window_id].rect_changed_callback = p_callable;
 }
 
 void DisplayServerWayland::window_set_window_event_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	main_window.window_event_callback = p_callable;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	windows[p_window_id].window_event_callback = p_callable;
 }
 
 void DisplayServerWayland::window_set_input_event_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	main_window.input_event_callback = p_callable;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	windows[p_window_id].input_event_callback = p_callable;
 }
 
 void DisplayServerWayland::window_set_input_text_callback(const Callable &p_callable, WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	main_window.input_text_callback = p_callable;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	windows[p_window_id].input_text_callback = p_callable;
 }
 
 void DisplayServerWayland::window_set_drop_files_callback(const Callable &p_callable, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	main_window.drop_files_callback = p_callable;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+
+	windows[p_window_id].drop_files_callback = p_callable;
 }
 
 int DisplayServerWayland::window_get_current_screen(DisplayServer::WindowID p_window_id) const {
@@ -769,16 +1054,13 @@ void DisplayServerWayland::window_set_current_screen(int p_screen, DisplayServer
 Point2i DisplayServerWayland::window_get_position(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	// We can't know the position of toplevels with the standard protocol.
-	return Point2i();
+	return windows[p_window_id].rect.position;
 }
 
 Point2i DisplayServerWayland::window_get_position_with_decorations(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	// We can't know the position of toplevels with the standard protocol, nor can
-	// we get information about the decorations, at least with SSDs.
-	return Point2i();
+	return windows[p_window_id].rect.position;
 }
 
 void DisplayServerWayland::window_set_position(const Point2i &p_position, DisplayServer::WindowID p_window_id) {
@@ -794,7 +1076,8 @@ void DisplayServerWayland::window_set_max_size(const Size2i p_size, DisplayServe
 		ERR_FAIL_MSG("Maximum window size can't be negative!");
 	}
 
-	WindowData &wd = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowData &wd = windows[p_window_id];
 
 	// FIXME: Is `p_size.x < wd.min_size.x || p_size.y < wd.min_size.y` == `p_size < wd.min_size`?
 	if ((p_size != Size2i()) && ((p_size.x < wd.min_size.x) || (p_size.y < wd.min_size.y))) {
@@ -804,25 +1087,45 @@ void DisplayServerWayland::window_set_max_size(const Size2i p_size, DisplayServe
 
 	wd.max_size = p_size;
 
-	wayland_thread.window_set_max_size(MAIN_WINDOW_ID, p_size);
+	if (wd.visible) {
+		wayland_thread.window_set_max_size(p_window_id, p_size);
+	}
 }
 
 Size2i DisplayServerWayland::window_get_max_size(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	return main_window.max_size;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), Size2i());
+	return windows[p_window_id].max_size;
 }
 
 void DisplayServerWayland::gl_window_make_current(DisplayServer::WindowID p_window_id) {
 #ifdef GLES3_ENABLED
 	if (egl_manager) {
-		egl_manager->window_make_current(MAIN_WINDOW_ID);
+		egl_manager->window_make_current(p_window_id);
 	}
 #endif
 }
 
 void DisplayServerWayland::window_set_transient(WindowID p_window_id, WindowID p_parent) {
-	// Currently unsupported.
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowData &wd = windows[p_window_id];
+
+	ERR_FAIL_COND(wd.parent_id == p_parent);
+
+	if (p_parent != INVALID_WINDOW_ID) {
+		ERR_FAIL_COND(!windows.has(p_parent));
+		ERR_FAIL_COND_MSG(wd.parent_id != INVALID_WINDOW_ID, "Window already has a transient parent");
+		wd.parent_id = p_parent;
+
+		// NOTE: Looks like live unparenting is not really practical unfortunately.
+		// See WaylandThread::window_set_parent for more info.
+		if (wd.visible) {
+			wayland_thread.window_set_parent(p_window_id, p_parent);
+		}
+	}
 }
 
 void DisplayServerWayland::window_set_min_size(const Size2i p_size, DisplayServer::WindowID p_window_id) {
@@ -830,7 +1133,8 @@ void DisplayServerWayland::window_set_min_size(const Size2i p_size, DisplayServe
 
 	DEBUG_LOG_WAYLAND(vformat("window minsize set to %s", p_size));
 
-	WindowData &wd = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowData &wd = windows[p_window_id];
 
 	if (p_size.x < 0 || p_size.y < 0) {
 		ERR_FAIL_MSG("Minimum window size can't be negative!");
@@ -844,23 +1148,36 @@ void DisplayServerWayland::window_set_min_size(const Size2i p_size, DisplayServe
 
 	wd.min_size = p_size;
 
-	wayland_thread.window_set_min_size(MAIN_WINDOW_ID, p_size);
+	if (wd.visible) {
+		wayland_thread.window_set_min_size(p_window_id, p_size);
+	}
 }
 
 Size2i DisplayServerWayland::window_get_min_size(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	return main_window.min_size;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), Size2i());
+	return windows[p_window_id].min_size;
 }
 
 void DisplayServerWayland::window_set_size(const Size2i p_size, DisplayServer::WindowID p_window_id) {
-	// The XDG spec doesn't allow non-interactive resizes.
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowData &wd = windows[p_window_id];
+
+	// The XDG spec doesn't allow non-interactive resizes. Let's update the
+	// window's internal representation to account for that.
+	if (wd.rect_changed_callback.is_valid()) {
+		wd.rect_changed_callback.call(wd.rect);
+	}
 }
 
 Size2i DisplayServerWayland::window_get_size(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	return main_window.rect.size;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), Size2i());
+	return windows[p_window_id].rect.size;
 }
 
 Size2i DisplayServerWayland::window_get_size_with_decorations(DisplayServer::WindowID p_window_id) const {
@@ -869,13 +1186,15 @@ Size2i DisplayServerWayland::window_get_size_with_decorations(DisplayServer::Win
 	// I don't think there's a way of actually knowing the size of the window
 	// decoration in Wayland, at least in the case of SSDs, nor that it would be
 	// that useful in this case. We'll just return the main window's size.
-	return main_window.rect.size;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), Size2i());
+	return windows[p_window_id].rect.size;
 }
 
 void DisplayServerWayland::window_set_mode(WindowMode p_mode, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	WindowData &wd = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowData &wd = windows[p_window_id];
 
 	if (!wd.visible) {
 		return;
@@ -887,7 +1206,8 @@ void DisplayServerWayland::window_set_mode(WindowMode p_mode, DisplayServer::Win
 DisplayServer::WindowMode DisplayServerWayland::window_get_mode(DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	const WindowData &wd = main_window;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), WINDOW_MODE_WINDOWED);
+	const WindowData &wd = windows[p_window_id];
 
 	if (!wd.visible) {
 		return WINDOW_MODE_WINDOWED;
@@ -905,13 +1225,24 @@ bool DisplayServerWayland::window_is_maximize_allowed(DisplayServer::WindowID p_
 void DisplayServerWayland::window_set_flag(WindowFlags p_flag, bool p_enabled, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	WindowData &wd = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowData &wd = windows[p_window_id];
 
 	DEBUG_LOG_WAYLAND(vformat("Window set flag %d", p_flag));
 
 	switch (p_flag) {
 		case WINDOW_FLAG_BORDERLESS: {
-			wayland_thread.window_set_borderless(MAIN_WINDOW_ID, p_enabled);
+			wayland_thread.window_set_borderless(p_window_id, p_enabled);
+		} break;
+
+		case WINDOW_FLAG_POPUP: {
+			ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't be popup.");
+			ERR_FAIL_COND_MSG(wd.visible, "Popup flag can't changed while window is opened.");
+		} break;
+
+		case WINDOW_FLAG_POPUP_WM_HINT: {
+			ERR_FAIL_COND_MSG(p_window_id == MAIN_WINDOW_ID, "Main window can't have popup hint.");
+			ERR_FAIL_COND_MSG(wd.visible, "Popup hint can't changed while window is opened.");
 		} break;
 
 		default: {
@@ -928,7 +1259,8 @@ void DisplayServerWayland::window_set_flag(WindowFlags p_flag, bool p_enabled, D
 bool DisplayServerWayland::window_get_flag(WindowFlags p_flag, DisplayServer::WindowID p_window_id) const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	return main_window.flags & (1 << p_flag);
+	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
+	return windows[p_window_id].flags & (1 << p_flag);
 }
 
 void DisplayServerWayland::window_request_attention(DisplayServer::WindowID p_window_id) {
@@ -936,7 +1268,7 @@ void DisplayServerWayland::window_request_attention(DisplayServer::WindowID p_wi
 
 	DEBUG_LOG_WAYLAND("Requested attention.");
 
-	wayland_thread.window_request_attention(MAIN_WINDOW_ID);
+	wayland_thread.window_request_attention(p_window_id);
 }
 
 void DisplayServerWayland::window_move_to_foreground(DisplayServer::WindowID p_window_id) {
@@ -948,6 +1280,19 @@ bool DisplayServerWayland::window_is_focused(WindowID p_window_id) const {
 }
 
 bool DisplayServerWayland::window_can_draw(DisplayServer::WindowID p_window_id) const {
+	MutexLock mutex_lock(wayland_thread.mutex);
+
+	uint64_t last_frame_time = wayland_thread.window_get_last_frame_time(p_window_id);
+	uint64_t time_since_frame = OS::get_singleton()->get_ticks_usec() - last_frame_time;
+
+	if (time_since_frame > WAYLAND_MAX_FRAME_TIME_US) {
+		return false;
+	}
+
+	if (wayland_thread.window_is_suspended(p_window_id)) {
+		return false;
+	}
+
 	return suspend_state == SuspendState::NONE;
 }
 
@@ -958,13 +1303,29 @@ bool DisplayServerWayland::can_any_window_draw() const {
 void DisplayServerWayland::window_set_ime_active(const bool p_active, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	wayland_thread.window_set_ime_active(p_active, MAIN_WINDOW_ID);
+	wayland_thread.window_set_ime_active(p_active, p_window_id);
 }
 
 void DisplayServerWayland::window_set_ime_position(const Point2i &p_pos, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
-	wayland_thread.window_set_ime_position(p_pos, MAIN_WINDOW_ID);
+	wayland_thread.window_set_ime_position(p_pos, p_window_id);
+}
+
+int DisplayServerWayland::accessibility_should_increase_contrast() const {
+#ifdef DBUS_ENABLED
+	return portal_desktop->get_high_contrast();
+#endif
+	return -1;
+}
+
+int DisplayServerWayland::accessibility_screen_reader_active() const {
+#ifdef DBUS_ENABLED
+	if (atspi_monitor->is_supported()) {
+		return atspi_monitor->is_active();
+	}
+#endif
+	return -1;
 }
 
 Point2i DisplayServerWayland::ime_get_selection() const {
@@ -982,13 +1343,15 @@ String DisplayServerWayland::ime_get_text() const {
 void DisplayServerWayland::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, DisplayServer::WindowID p_window_id) {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
+	WindowData &wd = windows[p_window_id];
+
 #ifdef RD_ENABLED
 	if (rendering_context) {
 		rendering_context->window_set_vsync_mode(p_window_id, p_vsync_mode);
 
-		emulate_vsync = (rendering_context->window_get_vsync_mode(p_window_id) == DisplayServer::VSYNC_ENABLED);
+		wd.emulate_vsync = (rendering_context->window_get_vsync_mode(p_window_id) == DisplayServer::VSYNC_ENABLED);
 
-		if (emulate_vsync) {
+		if (wd.emulate_vsync) {
 			print_verbose("VSYNC: manually throttling frames using MAILBOX.");
 			rendering_context->window_set_vsync_mode(p_window_id, DisplayServer::VSYNC_MAILBOX);
 		}
@@ -999,9 +1362,9 @@ void DisplayServerWayland::window_set_vsync_mode(DisplayServer::VSyncMode p_vsyn
 	if (egl_manager) {
 		egl_manager->set_use_vsync(p_vsync_mode != DisplayServer::VSYNC_DISABLED);
 
-		emulate_vsync = egl_manager->is_using_vsync();
+		wd.emulate_vsync = egl_manager->is_using_vsync();
 
-		if (emulate_vsync) {
+		if (wd.emulate_vsync) {
 			print_verbose("VSYNC: manually throttling frames with swap delay 0.");
 			egl_manager->set_use_vsync(false);
 		}
@@ -1010,7 +1373,8 @@ void DisplayServerWayland::window_set_vsync_mode(DisplayServer::VSyncMode p_vsyn
 }
 
 DisplayServer::VSyncMode DisplayServerWayland::window_get_vsync_mode(DisplayServer::WindowID p_window_id) const {
-	if (emulate_vsync) {
+	const WindowData &wd = windows[p_window_id];
+	if (wd.emulate_vsync) {
 		return DisplayServer::VSYNC_ENABLED;
 	}
 
@@ -1110,6 +1474,10 @@ void DisplayServerWayland::cursor_set_custom_image(const Ref<Resource> &p_cursor
 	}
 }
 
+bool DisplayServerWayland::get_swap_cancel_ok() {
+	return swap_cancel_ok;
+}
+
 int DisplayServerWayland::keyboard_get_layout_count() const {
 	MutexLock mutex_lock(wayland_thread.mutex);
 
@@ -1165,14 +1533,31 @@ Key DisplayServerWayland::keyboard_get_keycode_from_physical(Key p_keycode) cons
 	return key;
 }
 
+bool DisplayServerWayland::color_picker(const Callable &p_callback) {
+	WindowID window_id = MAIN_WINDOW_ID;
+	// TODO: Use window IDs for multiwindow support.
+
+	WaylandThread::WindowState *ws = wayland_thread.wl_surface_get_window_state(wayland_thread.window_get_wl_surface(window_id));
+	return portal_desktop->color_picker((ws ? ws->exported_handle : String()), p_callback);
+}
+
 void DisplayServerWayland::try_suspend() {
+	bool must_emulate = false;
+
+	for (KeyValue<DisplayServer::WindowID, WindowData> &pair : windows) {
+		if (pair.value.emulate_vsync) {
+			must_emulate = true;
+			break;
+		}
+	}
+
 	// Due to various reasons, we manually handle display synchronization by
 	// waiting for a frame event (request to draw) or, if available, the actual
 	// window's suspend status. When a window is suspended, we can avoid drawing
 	// altogether, either because the compositor told us that we don't need to or
 	// because the pace of the frame events became unreliable.
-	if (emulate_vsync) {
-		bool frame = wayland_thread.wait_frame_suspend_ms(1000);
+	if (must_emulate) {
+		bool frame = wayland_thread.wait_frame_suspend_ms(WAYLAND_MAX_FRAME_TIME_US / 1000);
 		if (!frame) {
 			suspend_state = SuspendState::TIMEOUT;
 		}
@@ -1198,35 +1583,95 @@ void DisplayServerWayland::process_events() {
 	while (wayland_thread.has_message()) {
 		Ref<WaylandThread::Message> msg = wayland_thread.pop_message();
 
+		// Generic check. Not actual message handling.
+		Ref<WaylandThread::WindowMessage> win_msg = msg;
+		if (win_msg.is_valid()) {
+			ERR_CONTINUE_MSG(win_msg->id == INVALID_WINDOW_ID, "Invalid window ID received from Wayland thread.");
+
+			if (!windows.has(win_msg->id)) {
+				// Window got probably deleted.
+				continue;
+			}
+		}
+
 		Ref<WaylandThread::WindowRectMessage> winrect_msg = msg;
 		if (winrect_msg.is_valid()) {
-			_resize_window(winrect_msg->rect.size);
+			_update_window_rect(winrect_msg->rect, winrect_msg->id);
+			continue;
 		}
 
 		Ref<WaylandThread::WindowEventMessage> winev_msg = msg;
-		if (winev_msg.is_valid()) {
-			_send_window_event(winev_msg->event);
+		if (winev_msg.is_valid() && windows.has(winev_msg->id)) {
+			_send_window_event(winev_msg->event, winev_msg->id);
 
 			if (winev_msg->event == WINDOW_EVENT_FOCUS_IN) {
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(winev_msg->id, true);
+				}
+#endif
 				if (OS::get_singleton()->get_main_loop()) {
 					OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_IN);
 				}
 			} else if (winev_msg->event == WINDOW_EVENT_FOCUS_OUT) {
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(winev_msg->id, false);
+				}
+#endif
 				if (OS::get_singleton()->get_main_loop()) {
 					OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_OUT);
 				}
 				Input::get_singleton()->release_pressed_events();
 			}
+			continue;
 		}
 
 		Ref<WaylandThread::InputEventMessage> inputev_msg = msg;
 		if (inputev_msg.is_valid()) {
-			Input::get_singleton()->parse_input_event(inputev_msg->event);
+			Ref<InputEventMouseButton> mb = inputev_msg->event;
+
+			bool handled = false;
+			if (!popup_menu_list.is_empty() && mb.is_valid()) {
+				// Popup menu handling.
+
+				BitField<MouseButtonMask> mouse_mask = mb->get_button_mask();
+				if (mouse_mask != last_mouse_monitor_mask && mb->is_pressed()) {
+					List<WindowID>::Element *E = popup_menu_list.back();
+					List<WindowID>::Element *C = nullptr;
+
+					// Looking for the oldest popup to close.
+					while (E) {
+						WindowData &wd = windows[E->get()];
+						Point2 global_pos = mb->get_position() + window_get_position(mb->get_window_id());
+						if (wd.rect.has_point(global_pos)) {
+							break;
+						} else if (wd.safe_rect.has_point(global_pos)) {
+							break;
+						}
+
+						C = E;
+						E = E->prev();
+					}
+
+					if (C) {
+						handled = true;
+						_send_window_event(WINDOW_EVENT_CLOSE_REQUEST, C->get());
+					}
+				}
+
+				last_mouse_monitor_mask = mouse_mask;
+			}
+
+			if (!handled) {
+				Input::get_singleton()->parse_input_event(inputev_msg->event);
+			}
+			continue;
 		}
 
 		Ref<WaylandThread::DropFilesEventMessage> dropfiles_msg = msg;
 		if (dropfiles_msg.is_valid()) {
-			WindowData wd = main_window;
+			WindowData wd = windows[dropfiles_msg->id];
 
 			if (wd.drop_files_callback.is_valid()) {
 				Variant v_files = dropfiles_msg->files;
@@ -1238,6 +1683,7 @@ void DisplayServerWayland::process_events() {
 					ERR_PRINT(vformat("Failed to execute drop files callback: %s.", Variant::get_callable_error_text(wd.drop_files_callback, v_args, 1, ce)));
 				}
 			}
+			continue;
 		}
 
 		Ref<WaylandThread::IMECommitEventMessage> ime_commit_msg = msg;
@@ -1247,7 +1693,7 @@ void DisplayServerWayland::process_events() {
 
 				Ref<InputEventKey> ke;
 				ke.instantiate();
-				ke->set_window_id(MAIN_WINDOW_ID);
+				ke->set_window_id(ime_commit_msg->id);
 				ke->set_pressed(true);
 				ke->set_echo(false);
 				ke->set_keycode(Key::NONE);
@@ -1261,6 +1707,7 @@ void DisplayServerWayland::process_events() {
 			ime_selection = Vector2i();
 
 			OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
+			continue;
 		}
 
 		Ref<WaylandThread::IMEUpdateEventMessage> ime_update_msg = msg;
@@ -1271,6 +1718,7 @@ void DisplayServerWayland::process_events() {
 
 				OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
 			}
+			continue;
 		}
 	}
 
@@ -1325,7 +1773,7 @@ void DisplayServerWayland::process_events() {
 
 #ifdef DBUS_ENABLED
 	if (portal_desktop) {
-		portal_desktop->process_file_dialog_callbacks();
+		portal_desktop->process_callbacks();
 	}
 #endif
 
@@ -1381,6 +1829,7 @@ Vector<String> DisplayServerWayland::get_rendering_drivers_func() {
 	drivers.push_back("opengl3");
 	drivers.push_back("opengl3_es");
 #endif
+	drivers.push_back("dummy");
 
 	return drivers;
 }
@@ -1410,6 +1859,10 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 	r_error = ERR_UNAVAILABLE;
 	context = p_context;
 
+	String current_desk = OS::get_singleton()->get_environment("XDG_CURRENT_DESKTOP").to_lower();
+	String session_desk = OS::get_singleton()->get_environment("XDG_SESSION_DESKTOP").to_lower();
+	swap_cancel_ok = (current_desk.contains("kde") || session_desk.contains("kde") || current_desk.contains("lxqt") || session_desk.contains("lxqt"));
+
 	Error thread_err = wayland_thread.init();
 
 	if (thread_err != OK) {
@@ -1424,7 +1877,20 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 
 #ifdef SPEECHD_ENABLED
 	// Init TTS
-	tts = memnew(TTS_Linux);
+	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
+	if (tts_enabled) {
+		initialize_tts();
+	}
+#endif
+
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+	}
 #endif
 
 	rendering_driver = p_rendering_driver;
@@ -1432,6 +1898,11 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 	bool driver_found = false;
 	String executable_name = OS::get_singleton()->get_executable_path().get_file();
 
+	if (rendering_driver == "dummy") {
+		RasterizerDummy::make_current();
+		driver_found = true;
+	}
+
 #ifdef RD_ENABLED
 #ifdef VULKAN_ENABLED
 	if (rendering_driver == "vulkan") {
@@ -1590,7 +2061,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 
 	cursor_set_shape(CURSOR_BUSY);
 
-	WindowData &wd = main_window;
+	WindowData &wd = windows[MAIN_WINDOW_ID];
 
 	wd.id = MAIN_WINDOW_ID;
 	wd.mode = p_mode;
@@ -1599,7 +2070,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 	wd.rect.size = p_resolution;
 	wd.title = "Godot";
 
-	_show_window();
+	show_window(MAIN_WINDOW_ID);
 
 #ifdef RD_ENABLED
 	if (rendering_context) {
@@ -1620,6 +2091,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 
 #ifdef DBUS_ENABLED
 	portal_desktop = memnew(FreeDesktopPortalDesktop);
+	atspi_monitor = memnew(FreeDesktopAtSPIMonitor);
 	screensaver = memnew(FreeDesktopScreenSaver);
 #endif // DBUS_ENABLED
 
@@ -1629,36 +2101,32 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win
 }
 
 DisplayServerWayland::~DisplayServerWayland() {
-	// TODO: Multiwindow support.
-
 	if (native_menu) {
 		memdelete(native_menu);
 		native_menu = nullptr;
 	}
 
-	if (main_window.visible) {
-#ifdef VULKAN_ENABLED
-		if (rendering_device) {
-			rendering_device->screen_free(MAIN_WINDOW_ID);
-		}
+	// Iterating on the window map while we delete stuff from it is a bit
+	// uncomfortable, plus we can't even delete /all/ windows in an arbitrary order
+	// (due to popups).
+	List<WindowID> toplevels;
 
-		if (rendering_context) {
-			rendering_context->window_destroy(MAIN_WINDOW_ID);
-		}
-#endif
+	for (const KeyValue<WindowID, WindowData> &pair : windows) {
+		WindowID id = pair.key;
 
-#ifdef GLES3_ENABLED
-		if (egl_manager) {
-			egl_manager->window_destroy(MAIN_WINDOW_ID);
-		}
+		if (!window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, id)) {
+			toplevels.push_back(id);
+#ifdef ACCESSKIT_ENABLED
+		} else if (accessibility_driver) {
+			accessibility_driver->window_destroy(id);
 #endif
+		}
 	}
 
-#ifdef GLES3_ENABLED
-	if (main_window.wl_egl_window) {
-		wl_egl_window_destroy(main_window.wl_egl_window);
+	for (WindowID &id : toplevels) {
+		delete_sub_window(id);
 	}
-#endif
+	windows.clear();
 
 	wayland_thread.destroy();
 
@@ -1679,9 +2147,16 @@ DisplayServerWayland::~DisplayServerWayland() {
 	}
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
+#endif
+
 #ifdef DBUS_ENABLED
 	if (portal_desktop) {
 		memdelete(portal_desktop);
+		memdelete(atspi_monitor);
 		memdelete(screensaver);
 	}
 #endif
diff --git a/engine/platform/linuxbsd/wayland/display_server_wayland.h b/engine/platform/linuxbsd/wayland/display_server_wayland.h
index 4e21aea6..bc798f95 100644
--- a/engine/platform/linuxbsd/wayland/display_server_wayland.h
+++ b/engine/platform/linuxbsd/wayland/display_server_wayland.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_WAYLAND_H
-#define DISPLAY_SERVER_WAYLAND_H
+#pragma once
 
 #ifdef WAYLAND_ENABLED
 
@@ -53,6 +52,7 @@
 #endif
 
 #ifdef DBUS_ENABLED
+#include "freedesktop_at_spi_monitor.h"
 #include "freedesktop_portal_desktop.h"
 #include "freedesktop_screensaver.h"
 #endif
@@ -67,9 +67,18 @@
 #undef CursorShape
 
 class DisplayServerWayland : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerWayland, DisplayServer);
+
 	struct WindowData {
-		WindowID id;
+		WindowID id = INVALID_WINDOW_ID;
+
+		WindowID parent_id = INVALID_WINDOW_ID;
+
+		// For popups.
+		WindowID root_id = INVALID_WINDOW_ID;
+
+		// For toplevels.
+		List<WindowID> popup_stack;
 
 		Rect2i rect;
 		Size2i max_size;
@@ -77,6 +86,8 @@ class DisplayServerWayland : public DisplayServer {
 
 		Rect2i safe_rect;
 
+		bool emulate_vsync = false;
+
 #ifdef GLES3_ENABLED
 		struct wl_egl_window *wl_egl_window = nullptr;
 #endif
@@ -120,16 +131,25 @@ class DisplayServerWayland : public DisplayServer {
 
 	HashMap<CursorShape, CustomCursor> custom_cursors;
 
-	WindowData main_window;
+	HashMap<WindowID, WindowData> windows;
+	WindowID window_id_counter = MAIN_WINDOW_ID;
+
 	WaylandThread wayland_thread;
 
 	Context context;
+	bool swap_cancel_ok = false;
+
+	// NOTE: These are the based on WINDOW_FLAG_POPUP, which does NOT imply what it
+	// seems. It's particularly confusing for our usecase, but just know that these
+	// are the "take all input thx" windows while the `popup_stack` variable keeps
+	// track of all the generic floating window concept.
+	List<WindowID> popup_menu_list;
+	BitField<MouseButtonMask> last_mouse_monitor_mask = MouseButtonMask::NONE;
 
 	String ime_text;
 	Vector2i ime_selection;
 
 	SuspendState suspend_state = SuspendState::NONE;
-	bool emulate_vsync = false;
 
 	String rendering_driver;
 
@@ -149,23 +169,24 @@ class DisplayServerWayland : public DisplayServer {
 
 #if DBUS_ENABLED
 	FreeDesktopPortalDesktop *portal_desktop = nullptr;
+	FreeDesktopAtSPIMonitor *atspi_monitor = nullptr;
 
 	FreeDesktopScreenSaver *screensaver = nullptr;
 	bool screensaver_inhibited = false;
 #endif
 	static String _get_app_id_from_context(Context p_context);
 
-	void _send_window_event(WindowEvent p_event);
+	void _send_window_event(WindowEvent p_event, WindowID p_window_id = MAIN_WINDOW_ID);
 
 	static void dispatch_input_events(const Ref<InputEvent> &p_event);
 	void _dispatch_input_event(const Ref<InputEvent> &p_event);
 
-	void _resize_window(const Size2i &p_size);
-
-	virtual void _show_window();
+	void _update_window_rect(const Rect2i &p_rect, WindowID p_window_id = MAIN_WINDOW_ID);
 
 	void try_suspend();
 
+	void initialize_tts() const;
+
 public:
 	virtual bool has_feature(Feature p_feature) const override;
 
@@ -185,10 +206,11 @@ public:
 #ifdef DBUS_ENABLED
 	virtual bool is_dark_mode_supported() const override;
 	virtual bool is_dark_mode() const override;
+	virtual Color get_accent_color() const override;
 	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
 #endif
 
 	virtual void beep() const override;
@@ -224,6 +246,14 @@ public:
 
 	virtual Vector<DisplayServer::WindowID> get_window_list() const override;
 
+	virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID) override;
+	virtual void show_window(WindowID p_id) override;
+	virtual void delete_sub_window(WindowID p_id) override;
+
+	virtual WindowID window_get_active_popup() const override;
+	virtual void window_set_popup_safe_rect(WindowID p_window, const Rect2i &p_rect) override;
+	virtual Rect2i window_get_popup_safe_rect(WindowID p_window) const override;
+
 	virtual int64_t window_get_native_handle(HandleType p_handle_type, WindowID p_window = MAIN_WINDOW_ID) const override;
 
 	virtual WindowID get_window_at_screen_position(const Point2i &p_position) const override;
@@ -280,6 +310,9 @@ public:
 	virtual void window_set_ime_active(const bool p_active, WindowID p_window_id = MAIN_WINDOW_ID) override;
 	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window_id = MAIN_WINDOW_ID) override;
 
+	virtual int accessibility_should_increase_contrast() const override;
+	virtual int accessibility_screen_reader_active() const override;
+
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
@@ -293,6 +326,8 @@ public:
 	virtual CursorShape cursor_get_shape() const override;
 	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) override;
 
+	virtual bool get_swap_cancel_ok() override;
+
 	virtual int keyboard_get_layout_count() const override;
 	virtual int keyboard_get_current_layout() const override;
 	virtual void keyboard_set_current_layout(int p_index) override;
@@ -300,6 +335,8 @@ public:
 	virtual String keyboard_get_layout_name(int p_index) const override;
 	virtual Key keyboard_get_keycode_from_physical(Key p_keycode) const override;
 
+	virtual bool color_picker(const Callable &p_callback) override;
+
 	virtual void process_events() override;
 
 	virtual void release_rendering_thread() override;
@@ -319,5 +356,3 @@ public:
 };
 
 #endif // WAYLAND_ENABLED
-
-#endif // DISPLAY_SERVER_WAYLAND_H
diff --git a/engine/platform/linuxbsd/wayland/egl_manager_wayland.h b/engine/platform/linuxbsd/wayland/egl_manager_wayland.h
index 551c1267..56aa2a71 100644
--- a/engine/platform/linuxbsd/wayland/egl_manager_wayland.h
+++ b/engine/platform/linuxbsd/wayland/egl_manager_wayland.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EGL_MANAGER_WAYLAND_H
-#define EGL_MANAGER_WAYLAND_H
+#pragma once
 
 #ifdef WAYLAND_ENABLED
 #ifdef EGL_ENABLED
@@ -49,5 +48,3 @@ public:
 #endif // GLES3_ENABLED
 #endif // EGL_ENABLED
 #endif // WAYLAND_ENABLED
-
-#endif // EGL_MANAGER_WAYLAND_H
diff --git a/engine/platform/linuxbsd/wayland/egl_manager_wayland_gles.h b/engine/platform/linuxbsd/wayland/egl_manager_wayland_gles.h
index f526f182..85e811cc 100644
--- a/engine/platform/linuxbsd/wayland/egl_manager_wayland_gles.h
+++ b/engine/platform/linuxbsd/wayland/egl_manager_wayland_gles.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EGL_MANAGER_WAYLAND_GLES_H
-#define EGL_MANAGER_WAYLAND_GLES_H
+#pragma once
 
 #ifdef WAYLAND_ENABLED
 #ifdef EGL_ENABLED
@@ -49,5 +48,3 @@ public:
 #endif // GLES3_ENABLED
 #endif // EGL_ENABLED
 #endif // WAYLAND_ENABLED
-
-#endif // EGL_MANAGER_WAYLAND_GLES_H
diff --git a/engine/platform/linuxbsd/wayland/key_mapping_xkb.h b/engine/platform/linuxbsd/wayland/key_mapping_xkb.h
index 9b8c90a4..b95385eb 100644
--- a/engine/platform/linuxbsd/wayland/key_mapping_xkb.h
+++ b/engine/platform/linuxbsd/wayland/key_mapping_xkb.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KEY_MAPPING_XKB_H
-#define KEY_MAPPING_XKB_H
+#pragma once
 
 #include "core/os/keyboard.h"
 #include "core/templates/hash_map.h"
@@ -61,5 +60,3 @@ public:
 	static Key get_scancode(unsigned int p_code);
 	static KeyLocation get_location(unsigned int p_code);
 };
-
-#endif // KEY_MAPPING_XKB_H
diff --git a/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h b/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h
index dfebca18..0515471e 100644
--- a/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h
+++ b/engine/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_WAYLAND_H
-#define RENDERING_CONTEXT_DRIVER_VULKAN_WAYLAND_H
+#pragma once
 
 #ifdef VULKAN_ENABLED
 
@@ -53,5 +52,3 @@ public:
 };
 
 #endif // VULKAN_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_VULKAN_WAYLAND_H
diff --git a/engine/platform/linuxbsd/wayland/wayland_thread.cpp b/engine/platform/linuxbsd/wayland/wayland_thread.cpp
index e3480776..5d391ce4 100644
--- a/engine/platform/linuxbsd/wayland/wayland_thread.cpp
+++ b/engine/platform/linuxbsd/wayland/wayland_thread.cpp
@@ -235,7 +235,7 @@ Ref<InputEventKey> WaylandThread::_seat_state_get_key_event(SeatState *p_ss, xkb
 
 	event.instantiate();
 
-	event->set_window_id(DisplayServer::MAIN_WINDOW_ID);
+	event->set_window_id(p_ss->focused_id);
 
 	// Set all pressed modifiers.
 	event->set_shift_pressed(p_ss->shift_pressed);
@@ -727,16 +727,17 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry
 	}
 
 	if (name == registry->wp_viewporter_name) {
-		WindowState *ws = &registry->wayland_thread->main_window;
+		for (KeyValue<DisplayServer::WindowID, WindowState> &pair : registry->wayland_thread->windows) {
+			WindowState ws = pair.value;
+			if (registry->wp_viewporter) {
+				wp_viewporter_destroy(registry->wp_viewporter);
+				registry->wp_viewporter = nullptr;
+			}
 
-		if (registry->wp_viewporter) {
-			wp_viewporter_destroy(registry->wp_viewporter);
-			registry->wp_viewporter = nullptr;
-		}
-
-		if (ws->wp_viewport) {
-			wp_viewport_destroy(ws->wp_viewport);
-			ws->wp_viewport = nullptr;
+			if (ws.wp_viewport) {
+				wp_viewport_destroy(ws.wp_viewport);
+				ws.wp_viewport = nullptr;
+			}
 		}
 
 		registry->wp_viewporter_name = 0;
@@ -745,16 +746,18 @@ void WaylandThread::_wl_registry_on_global_remove(void *data, struct wl_registry
 	}
 
 	if (name == registry->wp_fractional_scale_manager_name) {
-		WindowState *ws = &registry->wayland_thread->main_window;
+		for (KeyValue<DisplayServer::WindowID, WindowState> &pair : registry->wayland_thread->windows) {
+			WindowState ws = pair.value;
 
-		if (registry->wp_fractional_scale_manager) {
-			wp_fractional_scale_manager_v1_destroy(registry->wp_fractional_scale_manager);
-			registry->wp_fractional_scale_manager = nullptr;
-		}
+			if (registry->wp_fractional_scale_manager) {
+				wp_fractional_scale_manager_v1_destroy(registry->wp_fractional_scale_manager);
+				registry->wp_fractional_scale_manager = nullptr;
+			}
 
-		if (ws->wp_fractional_scale) {
-			wp_fractional_scale_v1_destroy(ws->wp_fractional_scale);
-			ws->wp_fractional_scale = nullptr;
+			if (ws.wp_fractional_scale) {
+				wp_fractional_scale_v1_destroy(ws.wp_fractional_scale);
+				ws.wp_fractional_scale = nullptr;
+			}
 		}
 
 		registry->wp_fractional_scale_manager_name = 0;
@@ -1058,9 +1061,10 @@ void WaylandThread::_frame_wl_callback_on_done(void *data, struct wl_callback *w
 	ERR_FAIL_NULL(ws->wayland_thread);
 	ERR_FAIL_NULL(ws->wl_surface);
 
+	ws->last_frame_time = OS::get_singleton()->get_ticks_usec();
 	ws->wayland_thread->set_frame();
 
-	ws->frame_callback = wl_surface_frame(ws->wl_surface),
+	ws->frame_callback = wl_surface_frame(ws->wl_surface);
 	wl_callback_add_listener(ws->frame_callback, &frame_wl_callback_listener, ws);
 
 	if (ws->wl_surface && ws->buffer_scale_changed) {
@@ -1110,8 +1114,10 @@ void WaylandThread::_wl_output_on_geometry(void *data, struct wl_output *wl_outp
 	ss->pending_data.physical_size.width = physical_width;
 	ss->pending_data.physical_size.height = physical_height;
 
-	ss->pending_data.make.parse_utf8(make);
-	ss->pending_data.model.parse_utf8(model);
+	ss->pending_data.make.clear();
+	ss->pending_data.make.append_utf8(make);
+	ss->pending_data.model.clear();
+	ss->pending_data.model.append_utf8(model);
 
 	// `wl_output::done` is a version 2 addition. We'll directly update the data
 	// for compatibility.
@@ -1175,7 +1181,7 @@ void WaylandThread::_xdg_surface_on_configure(void *data, struct xdg_surface *xd
 	WindowState *ws = (WindowState *)data;
 	ERR_FAIL_NULL(ws);
 
-	DEBUG_LOG_WAYLAND_THREAD(vformat("xdg surface on configure width %d height %d", ws->rect.size.width, ws->rect.size.height));
+	DEBUG_LOG_WAYLAND_THREAD(vformat("xdg surface on configure rect %s", ws->rect));
 }
 
 void WaylandThread::_xdg_toplevel_on_configure(void *data, struct xdg_toplevel *xdg_toplevel, int32_t width, int32_t height, struct wl_array *states) {
@@ -1221,6 +1227,7 @@ void WaylandThread::_xdg_toplevel_on_close(void *data, struct xdg_toplevel *xdg_
 
 	Ref<WindowEventMessage> msg;
 	msg.instantiate();
+	msg->id = ws->id;
 	msg->event = DisplayServer::WINDOW_EVENT_CLOSE_REQUEST;
 	ws->wayland_thread->push_message(msg);
 }
@@ -1256,6 +1263,66 @@ void WaylandThread::_xdg_toplevel_on_wm_capabilities(void *data, struct xdg_topl
 	}
 }
 
+void WaylandThread::_xdg_popup_on_configure(void *data, struct xdg_popup *xdg_popup, int32_t x, int32_t y, int32_t width, int32_t height) {
+	WindowState *ws = (WindowState *)data;
+	ERR_FAIL_NULL(ws);
+
+	if (width != 0 && height != 0) {
+		window_state_update_size(ws, width, height);
+	}
+
+	WindowState *parent = ws->wayland_thread->window_get_state(ws->parent_id);
+	ERR_FAIL_NULL(parent);
+
+	Point2i pos = Point2i(x, y);
+	if (parent->libdecor_frame) {
+		int translated_x = x;
+		int translated_y = y;
+		libdecor_frame_translate_coordinate(parent->libdecor_frame, x, y, &translated_x, &translated_y);
+
+		pos.x = translated_x;
+		pos.y = translated_y;
+	}
+
+	// Looks like the position returned here is relative to the parent. We have to
+	// accumulate it or there's gonna be a lot of confusion godot-side.
+	pos += parent->rect.position;
+
+	if (ws->rect.position != pos) {
+		DEBUG_LOG_WAYLAND_THREAD(vformat("Repositioning popup %d from %s to %s", ws->id, ws->rect.position, pos));
+
+		double parent_scale = window_state_get_scale_factor(parent);
+
+		ws->rect.position = pos;
+
+		Ref<WindowRectMessage> rect_msg;
+		rect_msg.instantiate();
+		rect_msg->id = ws->id;
+		rect_msg->rect.position = scale_vector2i(ws->rect.position, parent_scale);
+		rect_msg->rect.size = scale_vector2i(ws->rect.size, parent_scale);
+
+		ws->wayland_thread->push_message(rect_msg);
+	}
+
+	DEBUG_LOG_WAYLAND_THREAD(vformat("xdg popup on configure x%d y%d w%d h%d", x, y, width, height));
+}
+
+void WaylandThread::_xdg_popup_on_popup_done(void *data, struct xdg_popup *xdg_popup) {
+	WindowState *ws = (WindowState *)data;
+	ERR_FAIL_NULL(ws);
+
+	Ref<WindowEventMessage> ev_msg;
+	ev_msg.instantiate();
+	ev_msg->id = ws->id;
+	ev_msg->event = DisplayServer::WINDOW_EVENT_FORCE_CLOSE;
+
+	ws->wayland_thread->push_message(ev_msg);
+}
+
+void WaylandThread::_xdg_popup_on_repositioned(void *data, struct xdg_popup *xdg_popup, uint32_t token) {
+	DEBUG_LOG_WAYLAND_THREAD(vformat("stub xdg popup repositioned %x", token));
+}
+
 // NOTE: Deprecated.
 void WaylandThread::_xdg_exported_v1_on_handle(void *data, zxdg_exported_v1 *exported, const char *handle) {
 	WindowState *ws = (WindowState *)data;
@@ -1338,6 +1405,7 @@ void WaylandThread::libdecor_frame_on_close(struct libdecor_frame *frame, void *
 
 	Ref<WindowEventMessage> winevent_msg;
 	winevent_msg.instantiate();
+	winevent_msg->id = ws->id;
 	winevent_msg->event = DisplayServer::WINDOW_EVENT_CLOSE_REQUEST;
 
 	ws->wayland_thread->push_message(winevent_msg);
@@ -1458,73 +1526,61 @@ void WaylandThread::_cursor_frame_callback_on_done(void *data, struct wl_callbac
 }
 
 void WaylandThread::_wl_pointer_on_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, wl_fixed_t surface_y) {
-	if (!surface || !wl_proxy_is_godot((struct wl_proxy *)surface)) {
+	WindowState *ws = wl_surface_get_window_state(surface);
+	if (!ws) {
 		return;
 	}
 
-	DEBUG_LOG_WAYLAND_THREAD("Pointing window.");
-
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
 	ERR_FAIL_NULL(ss->cursor_surface);
+
+	PointerData &pd = ss->pointer_data_buffer;
+
 	ss->pointer_enter_serial = serial;
-	ss->pointed_surface = surface;
-	ss->last_pointed_surface = surface;
+	pd.pointed_id = ws->id;
+	pd.last_pointed_id = ws->id;
+	pd.position.x = wl_fixed_to_double(surface_x);
+	pd.position.y = wl_fixed_to_double(surface_y);
 
 	seat_state_update_cursor(ss);
 
-	Ref<WindowEventMessage> msg;
-	msg.instantiate();
-	msg->event = DisplayServer::WINDOW_EVENT_MOUSE_ENTER;
-
-	ss->wayland_thread->push_message(msg);
+	DEBUG_LOG_WAYLAND_THREAD(vformat("Pointer entered window %d.", ws->id));
 }
 
 void WaylandThread::_wl_pointer_on_leave(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *surface) {
-	if (!surface || !wl_proxy_is_godot((struct wl_proxy *)surface)) {
-		return;
-	}
-
-	DEBUG_LOG_WAYLAND_THREAD("Left window.");
+	// NOTE: `surface` will probably be null when the surface is destroyed.
+	// See: https://gitlab.freedesktop.org/wayland/wayland/-/issues/366
+	// See: https://gitlab.freedesktop.org/wayland/wayland/-/issues/465
 
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	WaylandThread *wayland_thread = ss->wayland_thread;
-	ERR_FAIL_NULL(wayland_thread);
+	PointerData &pd = ss->pointer_data_buffer;
 
-	ss->pointed_surface = nullptr;
+	if (pd.pointed_id == DisplayServer::INVALID_WINDOW_ID) {
+		// We're probably on a decoration or some other third-party thing.
+		return;
+	}
 
-	ss->pointer_data_buffer.pressed_button_mask.clear();
+	DisplayServer::WindowID id = pd.pointed_id;
 
-	Ref<WindowEventMessage> msg;
-	msg.instantiate();
-	msg->event = DisplayServer::WINDOW_EVENT_MOUSE_EXIT;
+	pd.pointed_id = DisplayServer::INVALID_WINDOW_ID;
+	pd.pressed_button_mask.clear();
 
-	wayland_thread->push_message(msg);
+	DEBUG_LOG_WAYLAND_THREAD(vformat("Pointer left window %d.", id));
 }
 
 void WaylandThread::_wl_pointer_on_motion(void *data, struct wl_pointer *wl_pointer, uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
-	WindowState *ws = wl_surface_get_window_state(ss->pointed_surface);
-	ERR_FAIL_NULL(ws);
-
 	PointerData &pd = ss->pointer_data_buffer;
 
-	// TODO: Scale only when sending the Wayland message.
 	pd.position.x = wl_fixed_to_double(surface_x);
 	pd.position.y = wl_fixed_to_double(surface_y);
 
-	pd.position *= window_state_get_scale_factor(ws);
-
 	pd.motion_time = time;
 }
 
@@ -1532,11 +1588,6 @@ void WaylandThread::_wl_pointer_on_button(void *data, struct wl_pointer *wl_poin
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
 	PointerData &pd = ss->pointer_data_buffer;
 
 	MouseButton button_pressed = MouseButton::NONE;
@@ -1584,11 +1635,6 @@ void WaylandThread::_wl_pointer_on_axis(void *data, struct wl_pointer *wl_pointe
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
 	PointerData &pd = ss->pointer_data_buffer;
 
 	switch (axis) {
@@ -1608,19 +1654,46 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
 	WaylandThread *wayland_thread = ss->wayland_thread;
 	ERR_FAIL_NULL(wayland_thread);
 
-	wayland_thread->_set_current_seat(ss->wl_seat);
-
 	PointerData &old_pd = ss->pointer_data;
 	PointerData &pd = ss->pointer_data_buffer;
 
+	if (pd.pointed_id != old_pd.pointed_id) {
+		if (old_pd.pointed_id != DisplayServer::INVALID_WINDOW_ID) {
+			Ref<WindowEventMessage> msg;
+			msg.instantiate();
+			msg->id = old_pd.pointed_id;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_EXIT;
+
+			wayland_thread->push_message(msg);
+		}
+
+		if (pd.pointed_id != DisplayServer::INVALID_WINDOW_ID) {
+			Ref<WindowEventMessage> msg;
+			msg.instantiate();
+			msg->id = pd.pointed_id;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_ENTER;
+
+			wayland_thread->push_message(msg);
+		}
+	}
+
+	if (pd.pointed_id == DisplayServer::INVALID_WINDOW_ID) {
+		// We're probably on a decoration or some other third-party thing. Let's
+		// "commit" the data and call it a day.
+		old_pd = pd;
+		return;
+	}
+
+	WindowState *ws = ss->wayland_thread->window_get_state(pd.pointed_id);
+	ERR_FAIL_NULL(ws);
+
+	double scale = window_state_get_scale_factor(ws);
+
+	wayland_thread->_set_current_seat(ss->wl_seat);
+
 	if (old_pd.motion_time != pd.motion_time || old_pd.relative_motion_time != pd.relative_motion_time) {
 		Ref<InputEventMouseMotion> mm;
 		mm.instantiate();
@@ -1631,17 +1704,19 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 		mm->set_alt_pressed(ss->alt_pressed);
 		mm->set_meta_pressed(ss->meta_pressed);
 
-		mm->set_window_id(DisplayServer::MAIN_WINDOW_ID);
-		mm->set_button_mask(pd.pressed_button_mask);
-		mm->set_position(pd.position);
-		mm->set_global_position(pd.position);
+		mm->set_window_id(ws->id);
 
-		Vector2 pos_delta = pd.position - old_pd.position;
+		mm->set_button_mask(pd.pressed_button_mask);
+
+		mm->set_position(pd.position * scale);
+		mm->set_global_position(pd.position * scale);
+
+		Vector2 pos_delta = (pd.position - old_pd.position) * scale;
 
 		if (old_pd.relative_motion_time != pd.relative_motion_time) {
 			uint32_t time_delta = pd.relative_motion_time - old_pd.relative_motion_time;
 
-			mm->set_relative(pd.relative_motion);
+			mm->set_relative(pd.relative_motion * scale);
 			mm->set_velocity((Vector2)pos_delta / time_delta);
 		} else {
 			// The spec includes the possibility of having motion events without an
@@ -1650,7 +1725,7 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 			// relative speed anymore though.
 			uint32_t time_delta = pd.motion_time - old_pd.motion_time;
 
-			mm->set_relative(pd.position - old_pd.position);
+			mm->set_relative(pos_delta);
 			mm->set_velocity((Vector2)pos_delta / time_delta);
 		}
 		mm->set_relative_screen_position(mm->get_relative());
@@ -1688,9 +1763,9 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 			pg->set_alt_pressed(ss->alt_pressed);
 			pg->set_meta_pressed(ss->meta_pressed);
 
-			pg->set_position(pd.position);
+			pg->set_position(pd.position * scale);
 
-			pg->set_window_id(DisplayServer::MAIN_WINDOW_ID);
+			pg->set_window_id(ws->id);
 
 			pg->set_delta(pd.scroll_vector);
 
@@ -1704,7 +1779,7 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 	}
 
 	if (old_pd.pressed_button_mask != pd.pressed_button_mask) {
-		BitField<MouseButtonMask> pressed_mask_delta = old_pd.pressed_button_mask ^ pd.pressed_button_mask;
+		BitField<MouseButtonMask> pressed_mask_delta = old_pd.pressed_button_mask.get_different(pd.pressed_button_mask);
 
 		const MouseButton buttons_to_test[] = {
 			MouseButton::LEFT,
@@ -1730,9 +1805,9 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 				mb->set_alt_pressed(ss->alt_pressed);
 				mb->set_meta_pressed(ss->meta_pressed);
 
-				mb->set_window_id(DisplayServer::MAIN_WINDOW_ID);
-				mb->set_position(pd.position);
-				mb->set_global_position(pd.position);
+				mb->set_window_id(ws->id);
+				mb->set_position(pd.position * scale);
+				mb->set_global_position(pd.position * scale);
 
 				if (test_button == MouseButton::WHEEL_UP || test_button == MouseButton::WHEEL_DOWN) {
 					// If this is a discrete scroll, specify how many "clicks" it did for this
@@ -1758,7 +1833,7 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 					pd.last_pressed_position = pd.position;
 				}
 
-				if (old_pd.double_click_begun && mb->is_pressed() && pd.last_button_pressed == old_pd.last_button_pressed && (pd.button_time - old_pd.button_time) < 400 && Vector2(old_pd.last_pressed_position).distance_to(Vector2(pd.last_pressed_position)) < 5) {
+				if (old_pd.double_click_begun && mb->is_pressed() && pd.last_button_pressed == old_pd.last_button_pressed && (pd.button_time - old_pd.button_time) < 400 && Vector2(old_pd.last_pressed_position * scale).distance_to(Vector2(pd.last_pressed_position * scale)) < 5) {
 					pd.double_click_begun = false;
 					mb->set_double_click(true);
 				}
@@ -1780,9 +1855,9 @@ void WaylandThread::_wl_pointer_on_frame(void *data, struct wl_pointer *wl_point
 					Ref<InputEventMouseButton> wh_up;
 					wh_up.instantiate();
 
-					wh_up->set_window_id(DisplayServer::MAIN_WINDOW_ID);
-					wh_up->set_position(pd.position);
-					wh_up->set_global_position(pd.position);
+					wh_up->set_window_id(ws->id);
+					wh_up->set_position(pd.position * scale);
+					wh_up->set_global_position(pd.position * scale);
 
 					// We have to unset the button to avoid it getting stuck.
 					pd.pressed_button_mask.clear_flag(test_button_mask);
@@ -1813,11 +1888,6 @@ void WaylandThread::_wl_pointer_on_axis_source(void *data, struct wl_pointer *wl
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
 	ss->pointer_data_buffer.scroll_type = axis_source;
 }
 
@@ -1831,11 +1901,6 @@ void WaylandThread::_wl_pointer_on_axis_discrete(void *data, struct wl_pointer *
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
 	PointerData &pd = ss->pointer_data_buffer;
 
 	// NOTE: We can allow ourselves to not accumulate this data (and thus just
@@ -1855,11 +1920,6 @@ void WaylandThread::_wl_pointer_on_axis_value120(void *data, struct wl_pointer *
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
 	PointerData &pd = ss->pointer_data_buffer;
 
 	if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL) {
@@ -1900,21 +1960,39 @@ void WaylandThread::_wl_keyboard_on_keymap(void *data, struct wl_keyboard *wl_ke
 }
 
 void WaylandThread::_wl_keyboard_on_enter(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, struct wl_surface *surface, struct wl_array *keys) {
+	WindowState *ws = wl_surface_get_window_state(surface);
+	if (!ws) {
+		return;
+	}
+
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
 	WaylandThread *wayland_thread = ss->wayland_thread;
 	ERR_FAIL_NULL(wayland_thread);
 
+	ss->focused_id = ws->id;
+
 	wayland_thread->_set_current_seat(ss->wl_seat);
 
 	Ref<WindowEventMessage> msg;
 	msg.instantiate();
+	msg->id = ws->id;
 	msg->event = DisplayServer::WINDOW_EVENT_FOCUS_IN;
 	wayland_thread->push_message(msg);
+
+	DEBUG_LOG_WAYLAND_THREAD(vformat("Keyboard focused window %d.", ws->id));
 }
 
 void WaylandThread::_wl_keyboard_on_leave(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, struct wl_surface *surface) {
+	// NOTE: `surface` will probably be null when the surface is destroyed.
+	// See: https://gitlab.freedesktop.org/wayland/wayland/-/issues/366
+	// See: https://gitlab.freedesktop.org/wayland/wayland/-/issues/465
+
+	if (surface && !wl_proxy_is_godot((struct wl_proxy *)surface)) {
+		return;
+	}
+
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
@@ -1923,16 +2001,33 @@ void WaylandThread::_wl_keyboard_on_leave(void *data, struct wl_keyboard *wl_key
 
 	ss->repeating_keycode = XKB_KEYCODE_INVALID;
 
+	if (ss->focused_id == DisplayServer::INVALID_WINDOW_ID) {
+		// We're probably on a decoration or some other third-party thing.
+		return;
+	}
+
+	WindowState *ws = wayland_thread->window_get_state(ss->focused_id);
+	ERR_FAIL_NULL(ws);
+
+	ss->focused_id = DisplayServer::INVALID_WINDOW_ID;
+
 	Ref<WindowEventMessage> msg;
 	msg.instantiate();
+	msg->id = ws->id;
 	msg->event = DisplayServer::WINDOW_EVENT_FOCUS_OUT;
 	wayland_thread->push_message(msg);
+
+	DEBUG_LOG_WAYLAND_THREAD(vformat("Keyboard unfocused window %d.", ws->id));
 }
 
 void WaylandThread::_wl_keyboard_on_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) {
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
+	if (ss->focused_id == DisplayServer::INVALID_WINDOW_ID) {
+		return;
+	}
+
 	WaylandThread *wayland_thread = ss->wayland_thread;
 	ERR_FAIL_NULL(wayland_thread);
 
@@ -2000,9 +2095,16 @@ void WaylandThread::_wl_data_device_on_data_offer(void *data, struct wl_data_dev
 }
 
 void WaylandThread::_wl_data_device_on_enter(void *data, struct wl_data_device *wl_data_device, uint32_t serial, struct wl_surface *surface, wl_fixed_t x, wl_fixed_t y, struct wl_data_offer *id) {
+	WindowState *ws = wl_surface_get_window_state(surface);
+	if (!ws) {
+		return;
+	}
+
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
+	ss->dnd_id = ws->id;
+
 	ss->dnd_enter_serial = serial;
 	ss->wl_data_offer_dnd = id;
 
@@ -2019,6 +2121,7 @@ void WaylandThread::_wl_data_device_on_leave(void *data, struct wl_data_device *
 		memdelete(wl_data_offer_get_offer_state(ss->wl_data_offer_dnd));
 		wl_data_offer_destroy(ss->wl_data_offer_dnd);
 		ss->wl_data_offer_dnd = nullptr;
+		ss->dnd_id = DisplayServer::INVALID_WINDOW_ID;
 	}
 }
 
@@ -2038,12 +2141,13 @@ void WaylandThread::_wl_data_device_on_drop(void *data, struct wl_data_device *w
 	if (os) {
 		Ref<DropFilesEventMessage> msg;
 		msg.instantiate();
+		msg->id = ss->dnd_id;
 
 		Vector<uint8_t> list_data = _wl_data_offer_read(wayland_thread->wl_display, "text/uri-list", ss->wl_data_offer_dnd);
 
 		msg->files = String::utf8((const char *)list_data.ptr(), list_data.size()).split("\r\n", false);
 		for (int i = 0; i < msg->files.size(); i++) {
-			msg->files.write[i] = msg->files[i].replace("file://", "").uri_decode();
+			msg->files.write[i] = msg->files[i].replace("file://", "").uri_file_decode();
 		}
 
 		wayland_thread->push_message(msg);
@@ -2054,6 +2158,7 @@ void WaylandThread::_wl_data_device_on_drop(void *data, struct wl_data_device *w
 	memdelete(wl_data_offer_get_offer_state(ss->wl_data_offer_dnd));
 	wl_data_offer_destroy(ss->wl_data_offer_dnd);
 	ss->wl_data_offer_dnd = nullptr;
+	ss->dnd_id = DisplayServer::INVALID_WINDOW_ID;
 }
 
 void WaylandThread::_wl_data_device_on_selection(void *data, struct wl_data_device *wl_data_device, struct wl_data_offer *id) {
@@ -2161,21 +2266,11 @@ void WaylandThread::_wp_relative_pointer_on_relative_motion(void *data, struct z
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
-	if (!ss->pointed_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
 	PointerData &pd = ss->pointer_data_buffer;
 
-	WindowState *ws = wl_surface_get_window_state(ss->pointed_surface);
-	ERR_FAIL_NULL(ws);
-
 	pd.relative_motion.x = wl_fixed_to_double(dx);
 	pd.relative_motion.y = wl_fixed_to_double(dy);
 
-	pd.relative_motion *= window_state_get_scale_factor(ws);
-
 	pd.relative_motion_time = uptime_lo;
 }
 
@@ -2193,16 +2288,28 @@ void WaylandThread::_wp_pointer_gesture_pinch_on_update(void *data, struct zwp_p
 	SeatState *ss = (SeatState *)data;
 	ERR_FAIL_NULL(ss);
 
+	// NOTE: From what I can tell, this and all other pointer gestures are separate
+	// from the "frame" mechanism of regular pointers. Thus, let's just assume we
+	// can read from the "committed" state.
+	const PointerData &pd = ss->pointer_data;
+
 	WaylandThread *wayland_thread = ss->wayland_thread;
 	ERR_FAIL_NULL(wayland_thread);
 
-	PointerData &pd = ss->pointer_data_buffer;
+	WindowState *ws = wayland_thread->window_get_state(pd.pointed_id);
+	ERR_FAIL_NULL(ws);
+
+	double win_scale = window_state_get_scale_factor(ws);
 
 	if (ss->active_gesture == Gesture::MAGNIFY) {
 		Ref<InputEventMagnifyGesture> mg;
 		mg.instantiate();
 
-		mg->set_window_id(DisplayServer::MAIN_WINDOW_ID);
+		mg->set_window_id(pd.pointed_id);
+
+		if (ws) {
+			mg->set_window_id(ws->id);
+		}
 
 		// Set all pressed modifiers.
 		mg->set_shift_pressed(ss->shift_pressed);
@@ -2210,7 +2317,7 @@ void WaylandThread::_wp_pointer_gesture_pinch_on_update(void *data, struct zwp_p
 		mg->set_alt_pressed(ss->alt_pressed);
 		mg->set_meta_pressed(ss->meta_pressed);
 
-		mg->set_position(pd.position);
+		mg->set_position(pd.position * win_scale);
 
 		wl_fixed_t scale_delta = scale - ss->old_pinch_scale;
 		mg->set_factor(1 + wl_fixed_to_double(scale_delta));
@@ -2226,15 +2333,13 @@ void WaylandThread::_wp_pointer_gesture_pinch_on_update(void *data, struct zwp_p
 		Ref<InputEventPanGesture> pg;
 		pg.instantiate();
 
-		pg->set_window_id(DisplayServer::MAIN_WINDOW_ID);
-
 		// Set all pressed modifiers.
 		pg->set_shift_pressed(ss->shift_pressed);
 		pg->set_ctrl_pressed(ss->ctrl_pressed);
 		pg->set_alt_pressed(ss->alt_pressed);
 		pg->set_meta_pressed(ss->meta_pressed);
 
-		pg->set_position(pd.position);
+		pg->set_position(pd.position * win_scale);
 		pg->set_delta(Vector2(wl_fixed_to_double(dx), wl_fixed_to_double(dy)));
 
 		Ref<InputEventMessage> pan_msg;
@@ -2339,7 +2444,6 @@ void WaylandThread::_wp_tablet_seat_on_tool_added(void *data, struct zwp_tablet_
 
 	wl_proxy_tag_godot((struct wl_proxy *)id);
 	zwp_tablet_tool_v2_add_listener(id, &wp_tablet_tool_listener, state);
-
 	ss->tablet_tools.push_back(id);
 }
 
@@ -2392,67 +2496,48 @@ void WaylandThread::_wp_tablet_tool_on_removed(void *data, struct zwp_tablet_too
 }
 
 void WaylandThread::_wp_tablet_tool_on_proximity_in(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2, uint32_t serial, struct zwp_tablet_v2 *tablet, struct wl_surface *surface) {
-	if (!surface || !wl_proxy_is_godot((struct wl_proxy *)surface)) {
-		// We're probably on a decoration or something.
+	// NOTE: Works pretty much like wl_pointer::enter.
+
+	WindowState *ws = wl_surface_get_window_state(surface);
+	if (!ws) {
 		return;
 	}
 
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
-
-	SeatState *ss = wl_seat_get_seat_state(ts->wl_seat);
-	if (!ss) {
-		return;
-	}
-
-	WaylandThread *wayland_thread = ss->wayland_thread;
-	ERR_FAIL_NULL(wayland_thread);
+	ERR_FAIL_NULL(ts);
 
 	ts->data_pending.proximity_serial = serial;
-	ts->data_pending.proximal_surface = surface;
-	ts->last_surface = surface;
+	ts->data_pending.proximal_id = ws->id;
+	ts->data_pending.last_proximal_id = ws->id;
 
-	Ref<WindowEventMessage> msg;
-	msg.instantiate();
-	msg->event = DisplayServer::WINDOW_EVENT_MOUSE_ENTER;
-	wayland_thread->push_message(msg);
-
-	DEBUG_LOG_WAYLAND_THREAD("Tablet tool entered window.");
+	DEBUG_LOG_WAYLAND_THREAD(vformat("Tablet tool entered window %d.", ts->data_pending.proximal_id));
 }
 
 void WaylandThread::_wp_tablet_tool_on_proximity_out(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2) {
+	// NOTE: Works pretty much like wl_pointer::leave.
+
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts || !ts->data_pending.proximal_surface) {
-		// Not our stuff, we don't care.
+	ERR_FAIL_NULL(ts);
+
+	if (ts->data_pending.proximal_id == DisplayServer::INVALID_WINDOW_ID) {
+		// We're probably on a decoration or some other third-party thing.
 		return;
 	}
 
-	SeatState *ss = wl_seat_get_seat_state(ts->wl_seat);
-	if (!ss) {
-		return;
-	}
+	DisplayServer::WindowID id = ts->data_pending.proximal_id;
 
-	WaylandThread *wayland_thread = ss->wayland_thread;
-	ERR_FAIL_NULL(wayland_thread);
+	ts->data_pending.proximal_id = DisplayServer::INVALID_WINDOW_ID;
+	ts->data_pending.pressed_button_mask.clear();
 
-	ts->data_pending.proximal_surface = nullptr;
-
-	Ref<WindowEventMessage> msg;
-	msg.instantiate();
-	msg->event = DisplayServer::WINDOW_EVENT_MOUSE_EXIT;
-
-	wayland_thread->push_message(msg);
-
-	DEBUG_LOG_WAYLAND_THREAD("Tablet tool left window.");
+	DEBUG_LOG_WAYLAND_THREAD(vformat("Tablet tool left window %d.", id));
 }
 
 void WaylandThread::_wp_tablet_tool_on_down(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2, uint32_t serial) {
+	// NOTE: Works pretty much like wl_pointer::button but only for a pressed left
+	// button.
+
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
+	ERR_FAIL_NULL(ts);
 
 	TabletToolData &td = ts->data_pending;
 
@@ -2466,10 +2551,11 @@ void WaylandThread::_wp_tablet_tool_on_down(void *data, struct zwp_tablet_tool_v
 }
 
 void WaylandThread::_wp_tablet_tool_on_up(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2) {
+	// NOTE: Works pretty much like wl_pointer::button but only for a released left
+	// button.
+
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
+	ERR_FAIL_NULL(ts);
 
 	TabletToolData &td = ts->data_pending;
 
@@ -2481,35 +2567,20 @@ void WaylandThread::_wp_tablet_tool_on_up(void *data, struct zwp_tablet_tool_v2
 }
 
 void WaylandThread::_wp_tablet_tool_on_motion(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2, wl_fixed_t x, wl_fixed_t y) {
+	// NOTE: Works pretty much like wl_pointer::motion.
+
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
-
-	if (!ts->data_pending.proximal_surface) {
-		// We're probably on a decoration or some other third-party thing.
-		return;
-	}
-
-	WindowState *ws = wl_surface_get_window_state(ts->data_pending.proximal_surface);
-	ERR_FAIL_NULL(ws);
+	ERR_FAIL_NULL(ts);
 
 	TabletToolData &td = ts->data_pending;
 
-	double scale_factor = window_state_get_scale_factor(ws);
-
 	td.position.x = wl_fixed_to_double(x);
 	td.position.y = wl_fixed_to_double(y);
-	td.position *= scale_factor;
-
-	td.motion_time = OS::get_singleton()->get_ticks_msec();
 }
 
 void WaylandThread::_wp_tablet_tool_on_pressure(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2, uint32_t pressure) {
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
+	ERR_FAIL_NULL(ts);
 
 	ts->data_pending.pressure = pressure;
 }
@@ -2520,9 +2591,7 @@ void WaylandThread::_wp_tablet_tool_on_distance(void *data, struct zwp_tablet_to
 
 void WaylandThread::_wp_tablet_tool_on_tilt(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2, wl_fixed_t tilt_x, wl_fixed_t tilt_y) {
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
+	ERR_FAIL_NULL(ts);
 
 	TabletToolData &td = ts->data_pending;
 
@@ -2543,10 +2612,10 @@ void WaylandThread::_wp_tablet_tool_on_wheel(void *data, struct zwp_tablet_tool_
 }
 
 void WaylandThread::_wp_tablet_tool_on_button(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2, uint32_t serial, uint32_t button, uint32_t state) {
+	// NOTE: Works pretty much like wl_pointer::button.
+
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
+	ERR_FAIL_NULL(ts);
 
 	TabletToolData &td = ts->data_pending;
 
@@ -2578,15 +2647,13 @@ void WaylandThread::_wp_tablet_tool_on_button(void *data, struct zwp_tablet_tool
 }
 
 void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_v2 *wp_tablet_tool_v2, uint32_t time) {
+	// NOTE: Works pretty much like wl_pointer::frame.
+
 	TabletToolState *ts = wp_tablet_tool_get_state(wp_tablet_tool_v2);
-	if (!ts) {
-		return;
-	}
+	ERR_FAIL_NULL(ts);
 
 	SeatState *ss = wl_seat_get_seat_state(ts->wl_seat);
-	if (!ss) {
-		return;
-	}
+	ERR_FAIL_NULL(ss);
 
 	WaylandThread *wayland_thread = ss->wayland_thread;
 	ERR_FAIL_NULL(wayland_thread);
@@ -2594,11 +2661,44 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
 	TabletToolData &old_td = ts->data;
 	TabletToolData &td = ts->data_pending;
 
+	if (td.proximal_id != old_td.proximal_id) {
+		if (old_td.proximal_id != DisplayServer::INVALID_WINDOW_ID) {
+			Ref<WindowEventMessage> msg;
+			msg.instantiate();
+			msg->id = old_td.proximal_id;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_EXIT;
+
+			wayland_thread->push_message(msg);
+		}
+
+		if (td.proximal_id != DisplayServer::INVALID_WINDOW_ID) {
+			Ref<WindowEventMessage> msg;
+			msg.instantiate();
+			msg->id = td.proximal_id;
+			msg->event = DisplayServer::WINDOW_EVENT_MOUSE_ENTER;
+
+			wayland_thread->push_message(msg);
+		}
+	}
+
+	if (td.proximal_id == DisplayServer::INVALID_WINDOW_ID) {
+		// We're probably on a decoration or some other third-party thing. Let's
+		// "commit" the data and call it a day.
+		old_td = td;
+		return;
+	}
+
+	WindowState *ws = wayland_thread->window_get_state(td.proximal_id);
+	ERR_FAIL_NULL(ws);
+
+	double scale = window_state_get_scale_factor(ws);
 	if (old_td.position != td.position || old_td.tilt != td.tilt || old_td.pressure != td.pressure) {
+		td.motion_time = time;
+
 		Ref<InputEventMouseMotion> mm;
 		mm.instantiate();
 
-		mm->set_window_id(DisplayServer::MAIN_WINDOW_ID);
+		mm->set_window_id(td.proximal_id);
 
 		// Set all pressed modifiers.
 		mm->set_shift_pressed(ss->shift_pressed);
@@ -2608,8 +2708,8 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
 
 		mm->set_button_mask(td.pressed_button_mask);
 
-		mm->set_position(td.position);
-		mm->set_global_position(td.position);
+		mm->set_global_position(td.position * scale);
+		mm->set_position(td.position * scale);
 
 		// NOTE: The Godot API expects normalized values and we store them raw,
 		// straight from the compositor, so we have to normalize them here.
@@ -2627,10 +2727,11 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
 
 		mm->set_pen_inverted(ts->is_eraser);
 
-		mm->set_relative(td.position - old_td.position);
-		mm->set_relative_screen_position(mm->get_relative());
+		Vector2 pos_delta = (td.position - old_td.position) * scale;
+
+		mm->set_relative(pos_delta);
+		mm->set_relative_screen_position(pos_delta);
 
-		Vector2 pos_delta = td.position - old_td.position;
 		uint32_t time_delta = td.motion_time - old_td.motion_time;
 		mm->set_velocity((Vector2)pos_delta / time_delta);
 
@@ -2643,7 +2744,9 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
 	}
 
 	if (old_td.pressed_button_mask != td.pressed_button_mask) {
-		BitField<MouseButtonMask> pressed_mask_delta = BitField<MouseButtonMask>((int64_t)old_td.pressed_button_mask ^ (int64_t)td.pressed_button_mask);
+		td.button_time = time;
+
+		BitField<MouseButtonMask> pressed_mask_delta = old_td.pressed_button_mask.get_different(td.pressed_button_mask);
 
 		for (MouseButton test_button : { MouseButton::LEFT, MouseButton::RIGHT }) {
 			MouseButtonMask test_button_mask = mouse_button_to_mask(test_button);
@@ -2658,9 +2761,9 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
 				mb->set_alt_pressed(ss->alt_pressed);
 				mb->set_meta_pressed(ss->meta_pressed);
 
-				mb->set_window_id(DisplayServer::MAIN_WINDOW_ID);
-				mb->set_position(td.position);
-				mb->set_global_position(td.position);
+				mb->set_window_id(td.proximal_id);
+				mb->set_position(td.position * scale);
+				mb->set_global_position(td.position * scale);
 
 				mb->set_button_mask(td.pressed_button_mask);
 				mb->set_button_index(test_button);
@@ -2673,7 +2776,7 @@ void WaylandThread::_wp_tablet_tool_on_frame(void *data, struct zwp_tablet_tool_
 					td.last_pressed_position = td.position;
 				}
 
-				if (old_td.double_click_begun && mb->is_pressed() && td.last_button_pressed == old_td.last_button_pressed && (td.button_time - old_td.button_time) < 400 && Vector2(td.last_pressed_position).distance_to(Vector2(old_td.last_pressed_position)) < 5) {
+				if (old_td.double_click_begun && mb->is_pressed() && td.last_button_pressed == old_td.last_button_pressed && (td.button_time - old_td.button_time) < 400 && Vector2(td.last_pressed_position * scale).distance_to(Vector2(old_td.last_pressed_position * scale)) < 5) {
 					td.double_click_begun = false;
 					mb->set_double_click(true);
 				}
@@ -2697,6 +2800,12 @@ void WaylandThread::_wp_text_input_on_enter(void *data, struct zwp_text_input_v3
 		return;
 	}
 
+	WindowState *ws = wl_surface_get_window_state(surface);
+	if (!ws) {
+		return;
+	}
+
+	ss->ime_window_id = ws->id;
 	ss->ime_enabled = true;
 }
 
@@ -2706,17 +2815,19 @@ void WaylandThread::_wp_text_input_on_leave(void *data, struct zwp_text_input_v3
 		return;
 	}
 
+	Ref<IMEUpdateEventMessage> msg;
+	msg.instantiate();
+	msg->id = ss->ime_window_id;
+	msg->text = String();
+	msg->selection = Vector2i();
+	ss->wayland_thread->push_message(msg);
+
+	ss->ime_window_id = DisplayServer::INVALID_WINDOW_ID;
 	ss->ime_enabled = false;
 	ss->ime_active = false;
 	ss->ime_text = String();
 	ss->ime_text_commit = String();
 	ss->ime_cursor = Vector2i();
-
-	Ref<IMEUpdateEventMessage> msg;
-	msg.instantiate();
-	msg->text = String();
-	msg->selection = Vector2i();
-	ss->wayland_thread->push_message(msg);
 }
 
 void WaylandThread::_wp_text_input_on_preedit_string(void *data, struct zwp_text_input_v3 *wp_text_input_v3, const char *text, int32_t cursor_begin, int32_t cursor_end) {
@@ -2789,15 +2900,18 @@ void WaylandThread::_wp_text_input_on_done(void *data, struct zwp_text_input_v3
 	if (!ss->ime_text_commit.is_empty()) {
 		Ref<IMECommitEventMessage> msg;
 		msg.instantiate();
+		msg->id = ss->ime_window_id;
 		msg->text = ss->ime_text_commit;
 		ss->wayland_thread->push_message(msg);
 	} else {
 		Ref<IMEUpdateEventMessage> msg;
 		msg.instantiate();
+		msg->id = ss->ime_window_id;
 		msg->text = ss->ime_text;
 		msg->selection = ss->ime_cursor;
 		ss->wayland_thread->push_message(msg);
 	}
+
 	ss->ime_text = String();
 	ss->ime_text_commit = String();
 	ss->ime_cursor = Vector2i();
@@ -3023,8 +3137,8 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 	bool using_fractional = p_ws->preferred_fractional_scale > 0;
 
 	// If neither is true we no-op.
-	bool scale_changed = false;
-	bool size_changed = false;
+	bool scale_changed = true;
+	bool size_changed = true;
 
 	if (p_ws->rect.size.width != p_width || p_ws->rect.size.height != p_height) {
 		p_ws->rect.size.width = p_width;
@@ -3049,7 +3163,7 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 		}
 	}
 
-	if (p_ws->wl_surface && (size_changed || scale_changed)) {
+	if (p_ws->wl_surface) {
 		if (p_ws->wp_viewport) {
 			wp_viewport_set_destination(p_ws->wp_viewport, p_width, p_height);
 		}
@@ -3069,7 +3183,8 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 #endif
 
 	if (size_changed || scale_changed) {
-		Size2i scaled_size = scale_vector2i(p_ws->rect.size, window_state_get_scale_factor(p_ws));
+		double win_scale = window_state_get_scale_factor(p_ws);
+		Size2i scaled_size = scale_vector2i(p_ws->rect.size, win_scale);
 
 		if (using_fractional) {
 			DEBUG_LOG_WAYLAND_THREAD(vformat("Resizing the window from %s to %s (fractional scale x%f).", p_ws->rect.size, scaled_size, p_ws->fractional_scale));
@@ -3082,7 +3197,8 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 
 		Ref<WindowRectMessage> rect_msg;
 		rect_msg.instantiate();
-		rect_msg->rect = p_ws->rect;
+		rect_msg->id = p_ws->id;
+		rect_msg->rect.position = scale_vector2i(p_ws->rect.position, win_scale);
 		rect_msg->rect.size = scaled_size;
 		p_ws->wayland_thread->push_message(rect_msg);
 	}
@@ -3090,6 +3206,7 @@ void WaylandThread::window_state_update_size(WindowState *p_ws, int p_width, int
 	if (scale_changed) {
 		Ref<WindowEventMessage> dpi_msg;
 		dpi_msg.instantiate();
+		dpi_msg->id = p_ws->id;
 		dpi_msg->event = DisplayServer::WINDOW_EVENT_DPI_CHANGE;
 		p_ws->wayland_thread->push_message(dpi_msg);
 	}
@@ -3135,12 +3252,7 @@ void WaylandThread::seat_state_lock_pointer(SeatState *p_ss) {
 	}
 
 	if (p_ss->wp_locked_pointer == nullptr) {
-		struct wl_surface *locked_surface = p_ss->last_pointed_surface;
-
-		if (locked_surface == nullptr) {
-			locked_surface = window_get_wl_surface(DisplayServer::MAIN_WINDOW_ID);
-		}
-
+		struct wl_surface *locked_surface = window_get_wl_surface(p_ss->pointer_data.last_pointed_id);
 		ERR_FAIL_NULL(locked_surface);
 
 		p_ss->wp_locked_pointer = zwp_pointer_constraints_v1_lock_pointer(registry.wp_pointer_constraints, locked_surface, p_ss->wl_pointer, nullptr, ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
@@ -3167,12 +3279,7 @@ void WaylandThread::seat_state_confine_pointer(SeatState *p_ss) {
 	}
 
 	if (p_ss->wp_confined_pointer == nullptr) {
-		struct wl_surface *confined_surface = p_ss->last_pointed_surface;
-
-		if (confined_surface == nullptr) {
-			confined_surface = window_get_wl_surface(DisplayServer::MAIN_WINDOW_ID);
-		}
-
+		struct wl_surface *confined_surface = window_get_wl_surface(p_ss->pointer_data.last_pointed_id);
 		ERR_FAIL_NULL(confined_surface);
 
 		p_ss->wp_confined_pointer = zwp_pointer_constraints_v1_confine_pointer(registry.wp_pointer_constraints, confined_surface, p_ss->wl_pointer, nullptr, ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
@@ -3317,8 +3424,10 @@ Ref<WaylandThread::Message> WaylandThread::pop_message() {
 }
 
 void WaylandThread::window_create(DisplayServer::WindowID p_window_id, int p_width, int p_height) {
-	// TODO: Implement multi-window support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
+
+	ws.id = p_window_id;
 
 	ws.registry = &registry;
 	ws.wayland_thread = this;
@@ -3383,15 +3492,152 @@ void WaylandThread::window_create(DisplayServer::WindowID p_window_id, int p_wid
 
 	// Wait for the surface to be configured before continuing.
 	wl_display_roundtrip(wl_display);
+
+	window_state_update_size(&ws, ws.rect.size.width, ws.rect.size.height);
+}
+
+void WaylandThread::window_create_popup(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id, Rect2i p_rect) {
+	ERR_FAIL_COND(windows.has(p_window_id));
+	ERR_FAIL_COND(!windows.has(p_parent_id));
+
+	WindowState &ws = windows[p_window_id];
+	WindowState &parent = windows[p_parent_id];
+
+	double parent_scale = window_state_get_scale_factor(&parent);
+
+	p_rect.position = scale_vector2i(p_rect.position, 1.0 / parent_scale);
+	p_rect.size = scale_vector2i(p_rect.size, 1.0 / parent_scale);
+
+	ws.id = p_window_id;
+	ws.parent_id = p_parent_id;
+	ws.registry = &registry;
+	ws.wayland_thread = this;
+
+	ws.rect = p_rect;
+
+	ws.wl_surface = wl_compositor_create_surface(registry.wl_compositor);
+	wl_proxy_tag_godot((struct wl_proxy *)ws.wl_surface);
+	wl_surface_add_listener(ws.wl_surface, &wl_surface_listener, &ws);
+
+	if (registry.wp_viewporter) {
+		ws.wp_viewport = wp_viewporter_get_viewport(registry.wp_viewporter, ws.wl_surface);
+
+		if (registry.wp_fractional_scale_manager) {
+			ws.wp_fractional_scale = wp_fractional_scale_manager_v1_get_fractional_scale(registry.wp_fractional_scale_manager, ws.wl_surface);
+			wp_fractional_scale_v1_add_listener(ws.wp_fractional_scale, &wp_fractional_scale_listener, &ws);
+		}
+	}
+
+	ws.xdg_surface = xdg_wm_base_get_xdg_surface(registry.xdg_wm_base, ws.wl_surface);
+	xdg_surface_add_listener(ws.xdg_surface, &xdg_surface_listener, &ws);
+
+	Rect2i positioner_rect;
+	positioner_rect.size = parent.rect.size;
+	struct xdg_surface *parent_xdg_surface = parent.xdg_surface;
+
+	Point2i offset = ws.rect.position - parent.rect.position;
+
+#ifdef LIBDECOR_ENABLED
+	if (!parent_xdg_surface && parent.libdecor_frame) {
+		parent_xdg_surface = libdecor_frame_get_xdg_surface(parent.libdecor_frame);
+
+		int corner_x = 0;
+		int corner_y = 0;
+		libdecor_frame_translate_coordinate(parent.libdecor_frame, 0, 0, &corner_x, &corner_y);
+
+		positioner_rect.position.x = corner_x;
+		positioner_rect.position.y = corner_y;
+
+		positioner_rect.size.width -= corner_x;
+		positioner_rect.size.height -= corner_y;
+	}
+#endif
+
+	ERR_FAIL_NULL(parent_xdg_surface);
+
+	struct xdg_positioner *xdg_positioner = xdg_wm_base_create_positioner(registry.xdg_wm_base);
+	xdg_positioner_set_size(xdg_positioner, ws.rect.size.width, ws.rect.size.height);
+	xdg_positioner_set_anchor(xdg_positioner, XDG_POSITIONER_ANCHOR_TOP_LEFT);
+	xdg_positioner_set_gravity(xdg_positioner, XDG_POSITIONER_GRAVITY_BOTTOM_RIGHT);
+	xdg_positioner_set_constraint_adjustment(xdg_positioner, XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_X | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_SLIDE_Y | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_Y);
+	xdg_positioner_set_anchor_rect(xdg_positioner, positioner_rect.position.x, positioner_rect.position.y, positioner_rect.size.width, positioner_rect.size.height);
+	xdg_positioner_set_offset(xdg_positioner, offset.x, offset.y);
+
+	ws.xdg_popup = xdg_surface_get_popup(ws.xdg_surface, parent_xdg_surface, xdg_positioner);
+	xdg_popup_add_listener(ws.xdg_popup, &xdg_popup_listener, &ws);
+
+	xdg_positioner_destroy(xdg_positioner);
+
+	ws.frame_callback = wl_surface_frame(ws.wl_surface);
+	wl_callback_add_listener(ws.frame_callback, &frame_wl_callback_listener, &ws);
+
+	wl_surface_commit(ws.wl_surface);
+
+	// Wait for the surface to be configured before continuing.
+	wl_display_roundtrip(wl_display);
+}
+
+void WaylandThread::window_destroy(DisplayServer::WindowID p_window_id) {
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
+
+	if (ws.xdg_popup) {
+		xdg_popup_destroy(ws.xdg_popup);
+	}
+
+	if (ws.xdg_toplevel_decoration) {
+		zxdg_toplevel_decoration_v1_destroy(ws.xdg_toplevel_decoration);
+	}
+
+	if (ws.xdg_toplevel) {
+		xdg_toplevel_destroy(ws.xdg_toplevel);
+	}
+
+#ifdef LIBDECOR_ENABLED
+	if (ws.libdecor_frame) {
+		libdecor_frame_unref(ws.libdecor_frame);
+	}
+#endif // LIBDECOR_ENABLED
+
+	if (ws.wp_fractional_scale) {
+		wp_fractional_scale_v1_destroy(ws.wp_fractional_scale);
+	}
+
+	if (ws.wp_viewport) {
+		wp_viewport_destroy(ws.wp_viewport);
+	}
+
+	if (ws.frame_callback) {
+		wl_callback_destroy(ws.frame_callback);
+	}
+
+	if (ws.xdg_surface) {
+		xdg_surface_destroy(ws.xdg_surface);
+	}
+
+	if (ws.wl_surface) {
+		wl_surface_destroy(ws.wl_surface);
+	}
+
+	// Before continuing, let's handle any leftover event that might still refer to
+	// this window.
+	wl_display_roundtrip(wl_display);
+
+	// We can already clean up here, we're done.
+	windows.erase(p_window_id);
 }
 
 struct wl_surface *WaylandThread::window_get_wl_surface(DisplayServer::WindowID p_window_id) const {
-	// TODO: Use window IDs for multiwindow support.
-	const WindowState &ws = main_window;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), nullptr);
+	const WindowState &ws = windows[p_window_id];
 
 	return ws.wl_surface;
 }
 
+WaylandThread::WindowState *WaylandThread::window_get_state(DisplayServer::WindowID p_window_id) {
+	return windows.getptr(p_window_id);
+}
+
 void WaylandThread::beep() const {
 	if (registry.xdg_system_bell) {
 		xdg_system_bell_v1_ring(registry.xdg_system_bell, nullptr);
@@ -3399,8 +3645,8 @@ void WaylandThread::beep() const {
 }
 
 void WaylandThread::window_start_drag(DisplayServer::WindowID p_window_id) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss && ws.xdg_toplevel) {
@@ -3415,8 +3661,8 @@ void WaylandThread::window_start_drag(DisplayServer::WindowID p_window_id) {
 }
 
 void WaylandThread::window_start_resize(DisplayServer::WindowResizeEdge p_edge, DisplayServer::WindowID p_window) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window));
+	WindowState &ws = windows[p_window];
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss && ws.xdg_toplevel) {
@@ -3488,9 +3734,34 @@ void WaylandThread::window_start_resize(DisplayServer::WindowResizeEdge p_edge,
 #endif
 }
 
+void WaylandThread::window_set_parent(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id) {
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	ERR_FAIL_COND(!windows.has(p_parent_id));
+
+	WindowState &child = windows[p_window_id];
+	child.parent_id = p_parent_id;
+
+	WindowState &parent = windows[p_parent_id];
+
+	// NOTE: We can't really unparent as, at the time of writing, libdecor
+	// segfaults when trying to set a null parent. Hopefully unparenting is not
+	// that common. Bummer.
+
+#ifdef LIBDECOR_ENABLED
+	if (child.libdecor_frame && parent.libdecor_frame) {
+		libdecor_frame_set_parent(child.libdecor_frame, parent.libdecor_frame);
+		return;
+	}
+#endif
+
+	if (child.xdg_toplevel && parent.xdg_toplevel) {
+		xdg_toplevel_set_parent(child.xdg_toplevel, parent.xdg_toplevel);
+	}
+}
+
 void WaylandThread::window_set_max_size(DisplayServer::WindowID p_window_id, const Size2i &p_size) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 	Vector2i logical_max_size = p_size / window_state_get_scale_factor(&ws);
 
@@ -3508,8 +3779,8 @@ void WaylandThread::window_set_max_size(DisplayServer::WindowID p_window_id, con
 }
 
 void WaylandThread::window_set_min_size(DisplayServer::WindowID p_window_id, const Size2i &p_size) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 	Size2i logical_min_size = p_size / window_state_get_scale_factor(&ws);
 
@@ -3527,8 +3798,8 @@ void WaylandThread::window_set_min_size(DisplayServer::WindowID p_window_id, con
 }
 
 bool WaylandThread::window_can_set_mode(DisplayServer::WindowID p_window_id, DisplayServer::WindowMode p_window_mode) const {
-	// TODO: Use window IDs for multiwindow support.
-	const WindowState &ws = main_window;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
+	const WindowState &ws = windows[p_window_id];
 
 	switch (p_window_mode) {
 		case DisplayServer::WINDOW_MODE_WINDOWED: {
@@ -3568,8 +3839,8 @@ bool WaylandThread::window_can_set_mode(DisplayServer::WindowID p_window_id, Dis
 }
 
 void WaylandThread::window_try_set_mode(DisplayServer::WindowID p_window_id, DisplayServer::WindowMode p_window_mode) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 	if (ws.mode == p_window_mode) {
 		return;
@@ -3695,8 +3966,8 @@ void WaylandThread::window_try_set_mode(DisplayServer::WindowID p_window_id, Dis
 }
 
 void WaylandThread::window_set_borderless(DisplayServer::WindowID p_window_id, bool p_borderless) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 	if (ws.xdg_toplevel_decoration) {
 		if (p_borderless) {
@@ -3725,47 +3996,47 @@ void WaylandThread::window_set_borderless(DisplayServer::WindowID p_window_id, b
 }
 
 void WaylandThread::window_set_title(DisplayServer::WindowID p_window_id, const String &p_title) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 #ifdef LIBDECOR_ENABLED
 	if (ws.libdecor_frame) {
-		libdecor_frame_set_title(ws.libdecor_frame, p_title.utf8());
+		libdecor_frame_set_title(ws.libdecor_frame, p_title.utf8().get_data());
 	}
 #endif // LIBDECOR_ENABLE
 
 	if (ws.xdg_toplevel) {
-		xdg_toplevel_set_title(ws.xdg_toplevel, p_title.utf8());
+		xdg_toplevel_set_title(ws.xdg_toplevel, p_title.utf8().get_data());
 	}
 }
 
 void WaylandThread::window_set_app_id(DisplayServer::WindowID p_window_id, const String &p_app_id) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 #ifdef LIBDECOR_ENABLED
 	if (ws.libdecor_frame) {
-		libdecor_frame_set_app_id(ws.libdecor_frame, p_app_id.utf8());
+		libdecor_frame_set_app_id(ws.libdecor_frame, p_app_id.utf8().get_data());
 		return;
 	}
 #endif // LIBDECOR_ENABLED
 
 	if (ws.xdg_toplevel) {
-		xdg_toplevel_set_app_id(ws.xdg_toplevel, p_app_id.utf8());
+		xdg_toplevel_set_app_id(ws.xdg_toplevel, p_app_id.utf8().get_data());
 		return;
 	}
 }
 
 DisplayServer::WindowMode WaylandThread::window_get_mode(DisplayServer::WindowID p_window_id) const {
-	// TODO: Use window IDs for multiwindow support.
-	const WindowState &ws = main_window;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), DisplayServer::WINDOW_MODE_WINDOWED);
+	const WindowState &ws = windows[p_window_id];
 
 	return ws.mode;
 }
 
 void WaylandThread::window_request_attention(DisplayServer::WindowID p_window_id) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 	if (registry.xdg_activation) {
 		// Window attention requests are done through the XDG activation protocol.
@@ -3776,8 +4047,8 @@ void WaylandThread::window_request_attention(DisplayServer::WindowID p_window_id
 }
 
 void WaylandThread::window_set_idle_inhibition(DisplayServer::WindowID p_window_id, bool p_enable) {
-	// TODO: Use window IDs for multiwindow support.
-	WindowState &ws = main_window;
+	ERR_FAIL_COND(!windows.has(p_window_id));
+	WindowState &ws = windows[p_window_id];
 
 	if (p_enable) {
 		if (ws.registry->wp_idle_inhibit_manager && !ws.wp_idle_inhibitor) {
@@ -3793,8 +4064,8 @@ void WaylandThread::window_set_idle_inhibition(DisplayServer::WindowID p_window_
 }
 
 bool WaylandThread::window_get_idle_inhibition(DisplayServer::WindowID p_window_id) const {
-	// TODO: Use window IDs for multiwindow support.
-	const WindowState &ws = main_window;
+	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
+	const WindowState &ws = windows[p_window_id];
 
 	return ws.wp_idle_inhibitor != nullptr;
 }
@@ -3813,11 +4084,70 @@ DisplayServer::WindowID WaylandThread::pointer_get_pointed_window_id() const {
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss) {
-		WindowState *ws = wl_surface_get_window_state(ss->pointed_surface);
+		// Let's determine the most recently used tablet tool.
+		TabletToolState *max_ts = nullptr;
+		for (struct zwp_tablet_tool_v2 *tool : ss->tablet_tools) {
+			TabletToolState *ts = wp_tablet_tool_get_state(tool);
+			ERR_CONTINUE(ts == nullptr);
 
-		if (ws) {
-			return ws->id;
+			TabletToolData &td = ts->data;
+
+			if (!max_ts) {
+				max_ts = ts;
+				continue;
+			}
+
+			if (MAX(td.button_time, td.motion_time) > MAX(max_ts->data.button_time, max_ts->data.motion_time)) {
+				max_ts = ts;
+			}
 		}
+
+		const PointerData &pd = ss->pointer_data;
+
+		if (max_ts) {
+			TabletToolData &td = max_ts->data;
+			if (MAX(td.button_time, td.motion_time) > MAX(pd.button_time, pd.motion_time)) {
+				return td.proximal_id;
+			}
+		}
+
+		return ss->pointer_data.pointed_id;
+	}
+
+	return DisplayServer::INVALID_WINDOW_ID;
+}
+DisplayServer::WindowID WaylandThread::pointer_get_last_pointed_window_id() const {
+	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
+
+	if (ss) {
+		// Let's determine the most recently used tablet tool.
+		TabletToolState *max_ts = nullptr;
+		for (struct zwp_tablet_tool_v2 *tool : ss->tablet_tools) {
+			TabletToolState *ts = wp_tablet_tool_get_state(tool);
+			ERR_CONTINUE(ts == nullptr);
+
+			TabletToolData &td = ts->data;
+
+			if (!max_ts) {
+				max_ts = ts;
+				continue;
+			}
+
+			if (MAX(td.button_time, td.motion_time) > MAX(max_ts->data.button_time, max_ts->data.motion_time)) {
+				max_ts = ts;
+			}
+		}
+
+		const PointerData &pd = ss->pointer_data;
+
+		if (max_ts) {
+			TabletToolData &td = max_ts->data;
+			if (MAX(td.button_time, td.motion_time) > MAX(pd.button_time, pd.motion_time)) {
+				return td.last_proximal_id;
+			}
+		}
+
+		return ss->pointer_data.last_pointed_id;
 	}
 
 	return DisplayServer::INVALID_WINDOW_ID;
@@ -3845,7 +4175,7 @@ void WaylandThread::pointer_set_hint(const Point2i &p_hint) {
 		return;
 	}
 
-	WindowState *ws = wl_surface_get_window_state(ss->pointed_surface);
+	WindowState *ws = window_get_state(ss->pointer_data.pointed_id);
 
 	int hint_x = 0;
 	int hint_y = 0;
@@ -4138,10 +4468,7 @@ String WaylandThread::keyboard_get_layout_name(int p_index) const {
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (ss && ss->xkb_keymap) {
-		String ret;
-		ret.parse_utf8(xkb_keymap_layout_get_name(ss->xkb_keymap, p_index));
-
-		return ret;
+		return String::utf8(xkb_keymap_layout_get_name(ss->xkb_keymap, p_index));
 	}
 
 	return "";
@@ -4240,7 +4567,7 @@ Vector<uint8_t> WaylandThread::selection_get_mime(const String &p_mime) const {
 		return Vector<uint8_t>();
 	}
 
-	return _wl_data_offer_read(wl_display, p_mime.utf8(), ss->wl_data_offer_selection);
+	return _wl_data_offer_read(wl_display, p_mime.utf8().get_data(), ss->wl_data_offer_selection);
 }
 
 bool WaylandThread::primary_has_mime(const String &p_mime) const {
@@ -4283,14 +4610,14 @@ Vector<uint8_t> WaylandThread::primary_get_mime(const String &p_mime) const {
 		return Vector<uint8_t>();
 	}
 
-	return _wp_primary_selection_offer_read(wl_display, p_mime.utf8(), ss->wp_primary_selection_offer);
+	return _wp_primary_selection_offer_read(wl_display, p_mime.utf8().get_data(), ss->wp_primary_selection_offer);
 }
 
 void WaylandThread::primary_set_text(const String &p_text) {
 	SeatState *ss = wl_seat_get_seat_state(wl_seat_current);
 
 	if (registry.wp_primary_selection_device_manager == nullptr) {
-		DEBUG_LOG_WAYLAND_THREAD("Couldn't set primary, protocol not available");
+		DEBUG_LOG_WAYLAND_THREAD("Couldn't set primary, protocol not available.");
 		return;
 	}
 
@@ -4322,7 +4649,9 @@ void WaylandThread::primary_set_text(const String &p_text) {
 }
 
 void WaylandThread::commit_surfaces() {
-	wl_surface_commit(main_window.wl_surface);
+	for (KeyValue<DisplayServer::WindowID, WindowState> &pair : windows) {
+		wl_surface_commit(pair.value.wl_surface);
+	}
 }
 
 void WaylandThread::set_frame() {
@@ -4349,9 +4678,9 @@ bool WaylandThread::wait_frame_suspend_ms(int p_timeout) {
 	MutexLock mutex_lock(mutex);
 	wl_display_roundtrip(wl_display);
 
-	if (main_window.suspended) {
-		// The window is suspended! The compositor is telling us _explicitly_ that we
-		// don't need to draw, without letting us guess through the frame event's
+	if (is_suspended()) {
+		// All windows are suspended! The compositor is telling us _explicitly_ that
+		// we don't need to draw, without letting us guess through the frame event's
 		// timing and stuff like that. Our job here is done.
 		return false;
 	}
@@ -4377,7 +4706,7 @@ bool WaylandThread::wait_frame_suspend_ms(int p_timeout) {
 				break;
 			}
 
-			if (main_window.suspended) {
+			if (is_suspended()) {
 				return false;
 			}
 
@@ -4422,7 +4751,7 @@ bool WaylandThread::wait_frame_suspend_ms(int p_timeout) {
 		// Let's try dispatching now...
 		wl_display_dispatch_pending(wl_display);
 
-		if (main_window.suspended) {
+		if (is_suspended()) {
 			return false;
 		}
 
@@ -4438,8 +4767,24 @@ bool WaylandThread::wait_frame_suspend_ms(int p_timeout) {
 	return false;
 }
 
+uint64_t WaylandThread::window_get_last_frame_time(DisplayServer::WindowID p_window_id) const {
+	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
+	return windows[p_window_id].last_frame_time;
+}
+
+bool WaylandThread::window_is_suspended(DisplayServer::WindowID p_window_id) const {
+	ERR_FAIL_COND_V(!windows.has(p_window_id), false);
+	return windows[p_window_id].suspended;
+}
+
 bool WaylandThread::is_suspended() const {
-	return main_window.suspended;
+	for (const KeyValue<DisplayServer::WindowID, WindowState> &E : windows) {
+		if (!E.value.suspended) {
+			return false;
+		}
+	}
+
+	return true;
 }
 
 void WaylandThread::destroy() {
@@ -4457,34 +4802,37 @@ void WaylandThread::destroy() {
 		events_thread.wait_to_finish();
 	}
 
-	if (main_window.wp_fractional_scale) {
-		wp_fractional_scale_v1_destroy(main_window.wp_fractional_scale);
-	}
+	for (KeyValue<DisplayServer::WindowID, WindowState> &pair : windows) {
+		WindowState &ws = pair.value;
+		if (ws.wp_fractional_scale) {
+			wp_fractional_scale_v1_destroy(ws.wp_fractional_scale);
+		}
 
-	if (main_window.wp_viewport) {
-		wp_viewport_destroy(main_window.wp_viewport);
-	}
+		if (ws.wp_viewport) {
+			wp_viewport_destroy(ws.wp_viewport);
+		}
 
-	if (main_window.frame_callback) {
-		wl_callback_destroy(main_window.frame_callback);
-	}
+		if (ws.frame_callback) {
+			wl_callback_destroy(ws.frame_callback);
+		}
 
 #ifdef LIBDECOR_ENABLED
-	if (main_window.libdecor_frame) {
-		libdecor_frame_close(main_window.libdecor_frame);
-	}
+		if (ws.libdecor_frame) {
+			libdecor_frame_close(ws.libdecor_frame);
+		}
 #endif // LIBDECOR_ENABLED
 
-	if (main_window.xdg_toplevel) {
-		xdg_toplevel_destroy(main_window.xdg_toplevel);
-	}
+		if (ws.xdg_toplevel) {
+			xdg_toplevel_destroy(ws.xdg_toplevel);
+		}
 
-	if (main_window.xdg_surface) {
-		xdg_surface_destroy(main_window.xdg_surface);
-	}
+		if (ws.xdg_surface) {
+			xdg_surface_destroy(ws.xdg_surface);
+		}
 
-	if (main_window.wl_surface) {
-		wl_surface_destroy(main_window.wl_surface);
+		if (ws.wl_surface) {
+			wl_surface_destroy(ws.wl_surface);
+		}
 	}
 
 	for (struct wl_seat *wl_seat : registry.wl_seats) {
diff --git a/engine/platform/linuxbsd/wayland/wayland_thread.h b/engine/platform/linuxbsd/wayland/wayland_thread.h
index 053dac35..043b24ae 100644
--- a/engine/platform/linuxbsd/wayland/wayland_thread.h
+++ b/engine/platform/linuxbsd/wayland/wayland_thread.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WAYLAND_THREAD_H
-#define WAYLAND_THREAD_H
+#pragma once
 
 #ifdef WAYLAND_ENABLED
 
@@ -89,41 +88,62 @@ class WaylandThread {
 public:
 	// Messages used for exchanging information between Godot's and Wayland's thread.
 	class Message : public RefCounted {
+		GDSOFTCLASS(Message, RefCounted);
+
 	public:
 		Message() {}
 		virtual ~Message() = default;
 	};
 
+	class WindowMessage : public Message {
+		GDSOFTCLASS(WindowMessage, Message);
+
+	public:
+		DisplayServer::WindowID id = DisplayServer::INVALID_WINDOW_ID;
+	};
+
 	// Message data for window rect changes.
-	class WindowRectMessage : public Message {
+	class WindowRectMessage : public WindowMessage {
+		GDSOFTCLASS(WindowRectMessage, WindowMessage);
+
 	public:
 		// NOTE: This is in "scaled" terms. For example, if there's a 1920x1080 rect
 		// with a scale factor of 2, the actual value of `rect` will be 3840x2160.
 		Rect2i rect;
 	};
 
-	class WindowEventMessage : public Message {
+	class WindowEventMessage : public WindowMessage {
+		GDSOFTCLASS(WindowEventMessage, WindowMessage);
+
 	public:
 		DisplayServer::WindowEvent event;
 	};
 
 	class InputEventMessage : public Message {
+		GDSOFTCLASS(InputEventMessage, Message);
+
 	public:
 		Ref<InputEvent> event;
 	};
 
-	class DropFilesEventMessage : public Message {
+	class DropFilesEventMessage : public WindowMessage {
+		GDSOFTCLASS(DropFilesEventMessage, WindowMessage);
+
 	public:
 		Vector<String> files;
 	};
 
-	class IMEUpdateEventMessage : public Message {
+	class IMEUpdateEventMessage : public WindowMessage {
+		GDSOFTCLASS(IMEUpdateEventMessage, WindowMessage);
+
 	public:
 		String text;
 		Vector2i selection;
 	};
 
-	class IMECommitEventMessage : public Message {
+	class IMECommitEventMessage : public WindowMessage {
+		GDSOFTCLASS(IMECommitEventMessage, WindowMessage);
+
 	public:
 		String text;
 	};
@@ -202,7 +222,8 @@ public:
 	// TODO: Make private?
 
 	struct WindowState {
-		DisplayServer::WindowID id;
+		DisplayServer::WindowID id = DisplayServer::INVALID_WINDOW_ID;
+		DisplayServer::WindowID parent_id = DisplayServer::INVALID_WINDOW_ID;
 
 		Rect2i rect;
 		DisplayServer::WindowMode mode = DisplayServer::WINDOW_MODE_WINDOWED;
@@ -224,6 +245,7 @@ public:
 		// be called even after being destroyed, pointing to probably invalid window
 		// data by then and segfaulting hard.
 		struct wl_callback *frame_callback = nullptr;
+		uint64_t last_frame_time = 0;
 
 		struct wl_surface *wl_surface = nullptr;
 		struct xdg_surface *xdg_surface = nullptr;
@@ -237,6 +259,8 @@ public:
 
 		struct zxdg_exported_v2 *xdg_exported_v2 = nullptr;
 
+		struct xdg_popup *xdg_popup = nullptr;
+
 		String exported_handle;
 
 		// Currently applied buffer scale.
@@ -317,11 +341,14 @@ public:
 		Vector2 relative_motion;
 		uint32_t relative_motion_time = 0;
 
-		BitField<MouseButtonMask> pressed_button_mask;
+		BitField<MouseButtonMask> pressed_button_mask = MouseButtonMask::NONE;
 
 		MouseButton last_button_pressed = MouseButton::NONE;
 		Point2 last_pressed_position;
 
+		DisplayServer::WindowID pointed_id = DisplayServer::INVALID_WINDOW_ID;
+		DisplayServer::WindowID last_pointed_id = DisplayServer::INVALID_WINDOW_ID;
+
 		// This is needed to check for a new double click every time.
 		bool double_click_begun = false;
 
@@ -344,27 +371,24 @@ public:
 		Vector2 tilt;
 		uint32_t pressure = 0;
 
-		BitField<MouseButtonMask> pressed_button_mask;
+		BitField<MouseButtonMask> pressed_button_mask = MouseButtonMask::NONE;
 
 		MouseButton last_button_pressed = MouseButton::NONE;
 		Point2 last_pressed_position;
 
 		bool double_click_begun = false;
 
-		// Note: the protocol doesn't have it (I guess that this isn't really meant to
-		// be used as a mouse...), but we'll hack one in with the current ticks.
 		uint64_t button_time = 0;
-
 		uint64_t motion_time = 0;
 
+		DisplayServer::WindowID proximal_id = DisplayServer::INVALID_WINDOW_ID;
+		DisplayServer::WindowID last_proximal_id = DisplayServer::INVALID_WINDOW_ID;
 		uint32_t proximity_serial = 0;
-		struct wl_surface *proximal_surface = nullptr;
 	};
 
 	struct TabletToolState {
 		struct wl_seat *wl_seat = nullptr;
 
-		struct wl_surface *last_surface = nullptr;
 		bool is_eraser = false;
 
 		TabletToolData data_pending;
@@ -388,9 +412,6 @@ public:
 
 		uint32_t pointer_enter_serial = 0;
 
-		struct wl_surface *pointed_surface = nullptr;
-		struct wl_surface *last_pointed_surface = nullptr;
-
 		struct zwp_relative_pointer_v1 *wp_relative_pointer = nullptr;
 		struct zwp_locked_pointer_v1 *wp_locked_pointer = nullptr;
 		struct zwp_confined_pointer_v1 *wp_confined_pointer = nullptr;
@@ -421,6 +442,9 @@ public:
 		// Keyboard.
 		struct wl_keyboard *wl_keyboard = nullptr;
 
+		// For key events.
+		DisplayServer::WindowID focused_id = DisplayServer::INVALID_WINDOW_ID;
+
 		struct xkb_context *xkb_context = nullptr;
 		struct xkb_keymap *xkb_keymap = nullptr;
 		struct xkb_state *xkb_state = nullptr;
@@ -449,6 +473,7 @@ public:
 		struct wl_data_device *wl_data_device = nullptr;
 
 		// Drag and drop.
+		DisplayServer::WindowID dnd_id = DisplayServer::INVALID_WINDOW_ID;
 		struct wl_data_offer *wl_data_offer_dnd = nullptr;
 		uint32_t dnd_enter_serial = 0;
 
@@ -473,6 +498,7 @@ public:
 
 		// IME.
 		struct zwp_text_input_v3 *wp_text_input = nullptr;
+		DisplayServer::WindowID ime_window_id = DisplayServer::INVALID_WINDOW_ID;
 		bool ime_enabled = false;
 		bool ime_active = false;
 		String ime_text;
@@ -503,7 +529,7 @@ private:
 	Thread events_thread;
 	ThreadData thread_data;
 
-	WindowState main_window;
+	HashMap<DisplayServer::WindowID, WindowState> windows;
 
 	List<Ref<Message>> messages;
 
@@ -615,6 +641,10 @@ private:
 	static void _xdg_toplevel_on_configure_bounds(void *data, struct xdg_toplevel *xdg_toplevel, int32_t width, int32_t height);
 	static void _xdg_toplevel_on_wm_capabilities(void *data, struct xdg_toplevel *xdg_toplevel, struct wl_array *capabilities);
 
+	static void _xdg_popup_on_configure(void *data, struct xdg_popup *xdg_popup, int32_t x, int32_t y, int32_t width, int32_t height);
+	static void _xdg_popup_on_popup_done(void *data, struct xdg_popup *xdg_popup);
+	static void _xdg_popup_on_repositioned(void *data, struct xdg_popup *xdg_popup, uint32_t token);
+
 	// wayland-protocols event handlers.
 	static void _wp_fractional_scale_on_preferred_scale(void *data, struct wp_fractional_scale_v1 *wp_fractional_scale_v1, uint32_t scale);
 
@@ -770,6 +800,12 @@ private:
 		.wm_capabilities = _xdg_toplevel_on_wm_capabilities,
 	};
 
+	static constexpr struct xdg_popup_listener xdg_popup_listener = {
+		.configure = _xdg_popup_on_configure,
+		.popup_done = _xdg_popup_on_popup_done,
+		.repositioned = _xdg_popup_on_repositioned,
+	};
+
 	// wayland-protocols event listeners.
 	static constexpr struct wp_fractional_scale_v1_listener wp_fractional_scale_listener = {
 		.preferred_scale = _wp_fractional_scale_on_preferred_scale,
@@ -955,8 +991,13 @@ public:
 	void beep() const;
 
 	void window_create(DisplayServer::WindowID p_window_id, int p_width, int p_height);
+	void window_create_popup(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id, Rect2i p_rect);
+	void window_destroy(DisplayServer::WindowID p_window_Id);
+
+	void window_set_parent(DisplayServer::WindowID p_window_id, DisplayServer::WindowID p_parent_id);
 
 	struct wl_surface *window_get_wl_surface(DisplayServer::WindowID p_window_id) const;
+	WindowState *window_get_state(DisplayServer::WindowID p_window_id);
 
 	void window_start_resize(DisplayServer::WindowResizeEdge p_edge, DisplayServer::WindowID p_window);
 
@@ -989,6 +1030,7 @@ public:
 	void pointer_set_hint(const Point2i &p_hint);
 	PointerConstraint pointer_get_constraint() const;
 	DisplayServer::WindowID pointer_get_pointed_window_id() const;
+	DisplayServer::WindowID pointer_get_last_pointed_window_id() const;
 	BitField<MouseButtonMask> pointer_get_button_mask() const;
 
 	void cursor_set_visible(bool p_visible);
@@ -1027,6 +1069,8 @@ public:
 	bool get_reset_frame();
 	bool wait_frame_suspend_ms(int p_timeout);
 
+	uint64_t window_get_last_frame_time(DisplayServer::WindowID p_window_id) const;
+	bool window_is_suspended(DisplayServer::WindowID p_window_id) const;
 	bool is_suspended() const;
 
 	Error init();
@@ -1034,5 +1078,3 @@ public:
 };
 
 #endif // WAYLAND_ENABLED
-
-#endif // WAYLAND_THREAD_H
diff --git a/engine/platform/linuxbsd/x11/detect_prime_x11.cpp b/engine/platform/linuxbsd/x11/detect_prime_x11.cpp
index c2cb02b9..5ec5a53b 100644
--- a/engine/platform/linuxbsd/x11/detect_prime_x11.cpp
+++ b/engine/platform/linuxbsd/x11/detect_prime_x11.cpp
@@ -60,25 +60,23 @@ typedef GLXContext (*GLXCREATECONTEXTATTRIBSARBPROC)(Display *, GLXFBConfig, GLX
 // To prevent shadowing warnings
 #undef glGetString
 
-struct vendor {
-	const char *glxvendor = nullptr;
-	int priority = 0;
-};
+int silent_error_handler(Display *display, XErrorEvent *error) {
+	static char message[1024];
+	XGetErrorText(display, error->error_code, message, sizeof(message));
+	print_verbose(vformat("XServer error: %s"
+						  "\n   Major opcode of failed request: %d"
+						  "\n   Serial number of failed request: %d"
+						  "\n   Current serial number in output stream: %d",
+			String::utf8(message), (uint64_t)error->request_code, (uint64_t)error->minor_code, (uint64_t)error->serial));
 
-vendor vendormap[] = {
-	{ "Advanced Micro Devices, Inc.", 30 },
-	{ "AMD", 30 },
-	{ "NVIDIA Corporation", 30 },
-	{ "X.Org", 30 },
-	{ "Intel Open Source Technology Center", 20 },
-	{ "Intel", 20 },
-	{ "nouveau", 10 },
-	{ "Mesa Project", 0 },
-	{ nullptr, 0 }
-};
+	quick_exit(1);
+	return 0;
+}
 
 // Runs inside a child. Exiting will not quit the engine.
-void create_context() {
+void DetectPrimeX11::create_context() {
+	XSetErrorHandler(&silent_error_handler);
+
 	Display *x11_display = XOpenDisplay(nullptr);
 	Window x11_window;
 	GLXContext glx_context;
@@ -137,20 +135,7 @@ void create_context() {
 	XFree(vi);
 }
 
-int silent_error_handler(Display *display, XErrorEvent *error) {
-	static char message[1024];
-	XGetErrorText(display, error->error_code, message, sizeof(message));
-	print_verbose(vformat("XServer error: %s"
-						  "\n   Major opcode of failed request: %d"
-						  "\n   Serial number of failed request: %d"
-						  "\n   Current serial number in output stream: %d",
-			String::utf8(message), (uint64_t)error->request_code, (uint64_t)error->minor_code, (uint64_t)error->serial));
-
-	quick_exit(1);
-	return 0;
-}
-
-int detect_prime() {
+int DetectPrimeX11::detect_prime() {
 	pid_t p;
 	int priorities[2] = {};
 	String vendors[2];
@@ -202,7 +187,6 @@ int detect_prime() {
 			// cleaning up these processes, and fork() makes a copy
 			// of all globals.
 			CoreGlobals::leak_reporting_enabled = false;
-			XSetErrorHandler(&silent_error_handler);
 
 			char string[201];
 
@@ -253,7 +237,7 @@ int detect_prime() {
 	}
 
 	for (int i = 1; i >= 0; --i) {
-		vendor *v = vendormap;
+		const Vendor *v = vendor_map;
 		while (v->glxvendor) {
 			if (v->glxvendor == vendors[i]) {
 				priorities[i] = v->priority;
diff --git a/engine/platform/linuxbsd/x11/detect_prime_x11.h b/engine/platform/linuxbsd/x11/detect_prime_x11.h
index 62fe4260..67796b33 100644
--- a/engine/platform/linuxbsd/x11/detect_prime_x11.h
+++ b/engine/platform/linuxbsd/x11/detect_prime_x11.h
@@ -28,13 +28,33 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DETECT_PRIME_X11_H
-#define DETECT_PRIME_X11_H
+#pragma once
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
-int detect_prime();
+class DetectPrimeX11 {
+private:
+	struct Vendor {
+		const char *glxvendor = nullptr;
+		int priority = 0;
+	};
+
+	static constexpr Vendor vendor_map[] = {
+		{ "Advanced Micro Devices, Inc.", 30 },
+		{ "AMD", 30 },
+		{ "NVIDIA Corporation", 30 },
+		{ "X.Org", 30 },
+		{ "Intel Open Source Technology Center", 20 },
+		{ "Intel", 20 },
+		{ "nouveau", 10 },
+		{ "Mesa Project", 0 },
+		{ nullptr, 0 }
+	};
+
+public:
+	static void create_context();
+
+	static int detect_prime();
+};
 
 #endif // X11_ENABLED && GLES3_ENABLED
-
-#endif // DETECT_PRIME_X11_H
diff --git a/engine/platform/linuxbsd/x11/display_server_x11.cpp b/engine/platform/linuxbsd/x11/display_server_x11.cpp
index 26c94bf2..985209bd 100644
--- a/engine/platform/linuxbsd/x11/display_server_x11.cpp
+++ b/engine/platform/linuxbsd/x11/display_server_x11.cpp
@@ -39,9 +39,12 @@
 #include "core/math/math_funcs.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"
+#include "core/version.h"
 #include "drivers/png/png_driver_common.h"
 #include "main/main.h"
 
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 #if defined(VULKAN_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #endif
@@ -50,6 +53,10 @@
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
+#endif
+
 #include <dlfcn.h>
 #include <limits.h>
 #include <stdio.h>
@@ -111,8 +118,7 @@ struct Hints {
 static String get_atom_name(Display *p_disp, Atom p_atom) {
 	char *name = XGetAtomName(p_disp, p_atom);
 	ERR_FAIL_NULL_V_MSG(name, String(), "Atom is invalid.");
-	String ret;
-	ret.parse_utf8(name);
+	String ret = String::utf8(name);
 	XFree(name);
 	return ret;
 }
@@ -156,6 +162,9 @@ bool DisplayServerX11::has_feature(Feature p_feature) const {
 		case FEATURE_NATIVE_DIALOG_FILE_MIME: {
 			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_file_chooser_supported());
 		} break;
+		case FEATURE_NATIVE_COLOR_PICKER: {
+			return (portal_desktop && portal_desktop->is_supported() && portal_desktop->is_screenshot_supported());
+		} break;
 #endif
 		case FEATURE_SCREEN_CAPTURE: {
 			return !xwayland;
@@ -167,6 +176,12 @@ bool DisplayServerX11::has_feature(Feature p_feature) const {
 		} break;
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
+		} break;
+#endif
+
 		default: {
 			return false;
 		}
@@ -338,38 +353,63 @@ void DisplayServerX11::_flush_mouse_motion() {
 
 #ifdef SPEECHD_ENABLED
 
+void DisplayServerX11::initialize_tts() const {
+	const_cast<DisplayServerX11 *>(this)->tts = memnew(TTS_Linux);
+}
+
 bool DisplayServerX11::tts_is_speaking() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return tts->is_speaking();
 }
 
 bool DisplayServerX11::tts_is_paused() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return tts->is_paused();
 }
 
 TypedArray<Dictionary> DisplayServerX11::tts_get_voices() const {
-	ERR_FAIL_NULL_V_MSG(tts, TypedArray<Dictionary>(), "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, TypedArray<Dictionary>());
 	return tts->get_voices();
 }
 
 void DisplayServerX11::tts_speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int p_utterance_id, bool p_interrupt) {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->speak(p_text, p_voice, p_volume, p_pitch, p_rate, p_utterance_id, p_interrupt);
 }
 
 void DisplayServerX11::tts_pause() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->pause();
 }
 
 void DisplayServerX11::tts_resume() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->resume();
 }
 
 void DisplayServerX11::tts_stop() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->stop();
 }
 
@@ -398,30 +438,34 @@ bool DisplayServerX11::is_dark_mode() const {
 	}
 }
 
+Color DisplayServerX11::get_accent_color() const {
+	return portal_desktop->get_appearance_accent_color();
+}
+
 void DisplayServerX11::set_system_theme_change_callback(const Callable &p_callable) {
 	portal_desktop->set_system_theme_change_callback(p_callable);
 }
 
-Error DisplayServerX11::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
-	WindowID window_id = last_focused_window;
+Error DisplayServerX11::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
+	WindowID window_id = p_window_id;
 
-	if (!windows.has(window_id)) {
+	if (!windows.has(window_id) || windows[window_id].is_popup) {
 		window_id = MAIN_WINDOW_ID;
 	}
 
 	String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
-	return portal_desktop->file_dialog_show(last_focused_window, xid, p_title, p_current_directory, String(), p_filename, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false);
+	return portal_desktop->file_dialog_show(p_window_id, xid, p_title, p_current_directory, String(), p_filename, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false);
 }
 
-Error DisplayServerX11::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
-	WindowID window_id = last_focused_window;
+Error DisplayServerX11::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
+	WindowID window_id = p_window_id;
 
-	if (!windows.has(window_id)) {
+	if (!windows.has(window_id) || windows[window_id].is_popup) {
 		window_id = MAIN_WINDOW_ID;
 	}
 
 	String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
-	return portal_desktop->file_dialog_show(last_focused_window, xid, p_title, p_current_directory, p_root, p_filename, p_mode, p_filters, p_options, p_callback, true);
+	return portal_desktop->file_dialog_show(p_window_id, xid, p_title, p_current_directory, p_root, p_filename, p_mode, p_filters, p_options, p_callback, true);
 }
 
 #endif
@@ -578,7 +622,7 @@ BitField<MouseButtonMask> DisplayServerX11::mouse_get_button_state() const {
 		int root_x, root_y, win_x, win_y;
 		unsigned int mask;
 		if (XQueryPointer(x11_display, XRootWindow(x11_display, i), &root, &child, &root_x, &root_y, &win_x, &win_y, &mask)) {
-			BitField<MouseButtonMask> last_button_state = 0;
+			BitField<MouseButtonMask> last_button_state = MouseButtonMask::NONE;
 
 			if (mask & Button1Mask) {
 				last_button_state.set_flag(MouseButtonMask::LEFT);
@@ -599,7 +643,7 @@ BitField<MouseButtonMask> DisplayServerX11::mouse_get_button_state() const {
 			return last_button_state;
 		}
 	}
-	return 0;
+	return MouseButtonMask::NONE;
 }
 
 void DisplayServerX11::clipboard_set(const String &p_text) {
@@ -759,7 +803,7 @@ String DisplayServerX11::_clipboard_get_impl(Atom p_source, Window x11_window, A
 			}
 
 			if (success && (data_size > 0)) {
-				ret.parse_utf8((const char *)incr_data.ptr(), data_size);
+				ret.append_utf8((const char *)incr_data.ptr(), data_size);
 			}
 		} else if (bytes_left > 0) {
 			// Data is ready and can be processed all at once.
@@ -769,7 +813,7 @@ String DisplayServerX11::_clipboard_get_impl(Atom p_source, Window x11_window, A
 					&len, &dummy, &data);
 
 			if (result == Success) {
-				ret.parse_utf8((const char *)data);
+				ret.append_utf8((const char *)data);
 			} else {
 				print_verbose("Failed to get selection data.");
 			}
@@ -1912,6 +1956,12 @@ void DisplayServerX11::delete_sub_window(WindowID p_id) {
 	}
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		accessibility_driver->window_destroy(p_id);
+	}
+#endif
+
 	if (wd.xic) {
 		XDestroyIC(wd.xic);
 		wd.xic = nullptr;
@@ -2061,7 +2111,7 @@ void DisplayServerX11::_update_window_mouse_passthrough(WindowID p_window) {
 			Region region = XCreateRegion();
 			XShapeCombineRegion(x11_display, windows[p_window].x11_window, ShapeInput, 0, 0, region, ShapeSet);
 			XDestroyRegion(region);
-		} else if (region_path.size() == 0) {
+		} else if (region_path.is_empty()) {
 			XShapeCombineMask(x11_display, windows[p_window].x11_window, ShapeInput, 0, 0, None, ShapeSet);
 		} else {
 			XPoint *points = (XPoint *)memalloc(sizeof(XPoint) * region_path.size());
@@ -2284,6 +2334,40 @@ void DisplayServerX11::_update_size_hints(WindowID p_window) {
 	XFree(xsh);
 }
 
+void DisplayServerX11::_update_actions_hints(WindowID p_window) {
+	WindowData &wd = windows[p_window];
+
+	Atom prop = XInternAtom(x11_display, "_NET_WM_ALLOWED_ACTIONS", False);
+	if (prop != None) {
+		Atom wm_act_max_horz = XInternAtom(x11_display, "_NET_WM_ACTION_MAXIMIZE_HORZ", False);
+		Atom wm_act_max_vert = XInternAtom(x11_display, "_NET_WM_ACTION_MAXIMIZE_VERT", False);
+		Atom wm_act_min = XInternAtom(x11_display, "_NET_WM_ACTION_MINIMIZE", False);
+		Atom type;
+		int format;
+		unsigned long len;
+		unsigned long remaining;
+		unsigned char *data = nullptr;
+		if (XGetWindowProperty(x11_display, wd.x11_window, prop, 0, 1024, False, XA_ATOM, &type, &format, &len, &remaining, &data) == Success) {
+			Atom *atoms = (Atom *)data;
+			Vector<Atom> new_atoms;
+			for (uint64_t i = 0; i < len; i++) {
+				if (atoms[i] != wm_act_max_horz && atoms[i] != wm_act_max_vert && atoms[i] != wm_act_min) {
+					new_atoms.push_back(atoms[i]);
+				}
+			}
+			if (!wd.no_max_btn) {
+				new_atoms.push_back(wm_act_max_horz);
+				new_atoms.push_back(wm_act_max_vert);
+			}
+			if (!wd.no_min_btn) {
+				new_atoms.push_back(wm_act_min);
+			}
+			XChangeProperty(x11_display, wd.x11_window, prop, XA_ATOM, 32, PropModeReplace, (unsigned char *)new_atoms.ptrw(), new_atoms.size());
+			XFree(data);
+		}
+	}
+}
+
 Point2i DisplayServerX11::window_get_position(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
@@ -2338,6 +2422,7 @@ void DisplayServerX11::window_set_position(const Point2i &p_position, WindowID p
 		return;
 	}
 
+	wd.position = p_position;
 	int x = 0;
 	int y = 0;
 	if (!window_get_flag(WINDOW_FLAG_BORDERLESS, p_window)) {
@@ -2563,7 +2648,8 @@ bool DisplayServerX11::_window_maximize_check(WindowID p_window, const char *p_a
 		Atom *atoms = (Atom *)data;
 		Atom wm_act_max_horz;
 		Atom wm_act_max_vert;
-		if (strcmp(p_atom_name, "_NET_WM_STATE") == 0) {
+		bool checking_state = strcmp(p_atom_name, "_NET_WM_STATE") == 0;
+		if (checking_state) {
 			wm_act_max_horz = XInternAtom(x11_display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
 			wm_act_max_vert = XInternAtom(x11_display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
 		} else {
@@ -2581,9 +2667,16 @@ bool DisplayServerX11::_window_maximize_check(WindowID p_window, const char *p_a
 				found_wm_act_max_vert = true;
 			}
 
-			if (found_wm_act_max_horz || found_wm_act_max_vert) {
-				retval = true;
-				break;
+			if (checking_state) {
+				if (found_wm_act_max_horz && found_wm_act_max_vert) {
+					retval = true;
+					break;
+				}
+			} else {
+				if (found_wm_act_max_horz || found_wm_act_max_vert) {
+					retval = true;
+					break;
+				}
 			}
 		}
 
@@ -2961,6 +3054,18 @@ void DisplayServerX11::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 	WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
+			wd.no_max_btn = p_enabled;
+			_update_actions_hints(p_window);
+
+			XFlush(x11_display);
+		} break;
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
+			wd.no_min_btn = p_enabled;
+			_update_actions_hints(p_window);
+
+			XFlush(x11_display);
+		} break;
 		case WINDOW_FLAG_RESIZE_DISABLED: {
 			if (p_enabled && wd.embed_parent) {
 				print_line("Embedded window resize can't be disabled.");
@@ -2969,6 +3074,7 @@ void DisplayServerX11::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 
 			wd.resize_disabled = p_enabled;
 			_update_size_hints(p_window);
+			_update_actions_hints(p_window);
 
 			XFlush(x11_display);
 		} break;
@@ -3055,6 +3161,12 @@ bool DisplayServerX11::window_get_flag(WindowFlags p_flag, WindowID p_window) co
 	const WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
+			return wd.no_max_btn;
+		} break;
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
+			return wd.no_min_btn;
+		} break;
 		case WINDOW_FLAG_RESIZE_DISABLED: {
 			return wd.resize_disabled;
 		} break;
@@ -3244,6 +3356,22 @@ void DisplayServerX11::window_set_ime_position(const Point2i &p_pos, WindowID p_
 	}
 }
 
+int DisplayServerX11::accessibility_should_increase_contrast() const {
+#ifdef DBUS_ENABLED
+	return portal_desktop->get_high_contrast();
+#endif
+	return -1;
+}
+
+int DisplayServerX11::accessibility_screen_reader_active() const {
+#ifdef DBUS_ENABLED
+	if (atspi_monitor->is_supported()) {
+		return atspi_monitor->is_active();
+	}
+#endif
+	return -1;
+}
+
 Point2i DisplayServerX11::ime_get_selection() const {
 	return im_selection;
 }
@@ -3355,6 +3483,10 @@ void DisplayServerX11::cursor_set_custom_image(const Ref<Resource> &p_cursor, Cu
 	}
 }
 
+bool DisplayServerX11::get_swap_cancel_ok() {
+	return swap_cancel_ok;
+}
+
 int DisplayServerX11::keyboard_get_layout_count() const {
 	int _group_count = 0;
 	XkbDescRec *kbd = XkbAllocKeyboard();
@@ -3496,6 +3628,17 @@ Key DisplayServerX11::keyboard_get_label_from_physical(Key p_keycode) const {
 	return (Key)(key | modifiers);
 }
 
+bool DisplayServerX11::color_picker(const Callable &p_callback) {
+	WindowID window_id = last_focused_window;
+
+	if (!windows.has(window_id)) {
+		window_id = MAIN_WINDOW_ID;
+	}
+
+	String xid = vformat("x11:%x", (uint64_t)windows[window_id].x11_window);
+	return portal_desktop->color_picker(xid, p_callback);
+}
+
 DisplayServerX11::Property DisplayServerX11::_read_property(Display *p_display, Window p_window, Atom p_property) {
 	Atom actual_type = None;
 	int actual_format = 0;
@@ -3657,8 +3800,7 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
 				keycode -= 'a' - 'A';
 			}
 
-			String tmp;
-			tmp.parse_utf8(utf8string, utf8bytes);
+			String tmp = String::utf8(utf8string, utf8bytes);
 			for (int i = 0; i < tmp.length(); i++) {
 				Ref<InputEventKey> k;
 				k.instantiate();
@@ -3738,8 +3880,7 @@ void DisplayServerX11::_handle_key_event(WindowID p_window, XKeyEvent *p_event,
 				char str_xkb[256] = {};
 				int str_xkb_size = xkb_compose_state_get_utf8(wd.xkb_state, str_xkb, 255);
 
-				String tmp;
-				tmp.parse_utf8(str_xkb, str_xkb_size);
+				String tmp = String::utf8(str_xkb, str_xkb_size);
 				for (int i = 0; i < tmp.length(); i++) {
 					Ref<InputEventKey> k;
 					k.instantiate();
@@ -3961,7 +4102,7 @@ Atom DisplayServerX11::_process_selection_request_target(Atom p_target, Window p
 				32,
 				PropModeReplace,
 				(unsigned char *)&data,
-				sizeof(data) / sizeof(data[0]));
+				std::size(data));
 		return p_property;
 	} else if (p_target == XInternAtom(x11_display, "SAVE_TARGETS", 0)) {
 		// Request to check if SAVE_TARGETS is supported, nothing special to do.
@@ -4094,7 +4235,7 @@ void DisplayServerX11::_xim_preedit_draw_callback(::XIM xim, ::XPointer client_d
 			if (xim_text->encoding_is_wchar) {
 				changed_text = String(xim_text->string.wide_char);
 			} else {
-				changed_text.parse_utf8(xim_text->string.multi_byte);
+				changed_text.append_utf8(xim_text->string.multi_byte);
 			}
 
 			if (call_data->chg_length < 0) {
@@ -4789,6 +4930,9 @@ void DisplayServerX11::process_events() {
 				XSync(x11_display, False);
 				XGetWindowAttributes(x11_display, wd.x11_window, &xwa);
 
+				_update_actions_hints(window_id);
+				XFlush(x11_display);
+
 				// Set focus when menu window is started.
 				// RevertToPointerRoot is used to make sure we don't lose all focus in case
 				// a subwindow and its parent are both destroyed.
@@ -4878,6 +5022,11 @@ void DisplayServerX11::process_events() {
 				static unsigned int focus_order = 0;
 				wd.focus_order = ++focus_order;
 
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(window_id, true);
+				}
+#endif
 				_send_window_event(wd, WINDOW_EVENT_FOCUS_IN);
 
 				if (mouse_mode_grab) {
@@ -4929,6 +5078,11 @@ void DisplayServerX11::process_events() {
 				wd.focused = false;
 
 				Input::get_singleton()->release_pressed_events();
+#ifdef ACCESSKIT_ENABLED
+				if (accessibility_driver) {
+					accessibility_driver->accessibility_set_window_focused(window_id, false);
+				}
+#endif
 				_send_window_event(wd, WINDOW_EVENT_FOCUS_OUT);
 
 				if (mouse_mode_grab) {
@@ -5164,7 +5318,7 @@ void DisplayServerX11::process_events() {
 					pos = Point2i(windows[focused_window_id].size.width / 2, windows[focused_window_id].size.height / 2);
 				}
 
-				BitField<MouseButtonMask> last_button_state = 0;
+				BitField<MouseButtonMask> last_button_state = MouseButtonMask::NONE;
 				if (event.xmotion.state & Button1Mask) {
 					last_button_state.set_flag(MouseButtonMask::LEFT);
 				}
@@ -5268,7 +5422,7 @@ void DisplayServerX11::process_events() {
 					Vector<String> files = String((char *)p.data).split("\r\n", false);
 					XFree(p.data);
 					for (int i = 0; i < files.size(); i++) {
-						files.write[i] = files[i].replace("file://", "").uri_decode();
+						files.write[i] = files[i].replace("file://", "").uri_file_decode();
 					}
 
 					if (windows[window_id].drop_files_callback.is_valid()) {
@@ -5385,7 +5539,7 @@ void DisplayServerX11::process_events() {
 
 #ifdef DBUS_ENABLED
 	if (portal_desktop) {
-		portal_desktop->process_file_dialog_callbacks();
+		portal_desktop->process_callbacks();
 	}
 #endif
 
@@ -6030,6 +6184,7 @@ Vector<String> DisplayServerX11::get_rendering_drivers_func() {
 	drivers.push_back("opengl3");
 	drivers.push_back("opengl3_es");
 #endif
+	drivers.push_back("dummy");
 
 	return drivers;
 }
@@ -6178,6 +6333,15 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, V
 		if (dead_tbl && xkb_loaded_v05p) {
 			wd.xkb_state = xkb_compose_state_new(dead_tbl, XKB_COMPOSE_STATE_NO_FLAGS);
 		}
+#endif
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver && !accessibility_driver->window_create(id, nullptr)) {
+			if (OS::get_singleton()->is_stdout_verbose()) {
+				ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
+			}
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
 #endif
 		// Enable receiving notification when the window is initialized (MapNotify)
 		// so the focus can be set at the right time.
@@ -6466,8 +6630,12 @@ static ::XIMStyle _get_best_xim_style(const ::XIMStyle &p_style_a, const ::XIMSt
 DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	KeyMappingX11::initialize();
 
+	String current_desk = OS::get_singleton()->get_environment("XDG_CURRENT_DESKTOP").to_lower();
+	String session_desk = OS::get_singleton()->get_environment("XDG_SESSION_DESKTOP").to_lower();
+	swap_cancel_ok = (current_desk.contains("kde") || session_desk.contains("kde") || current_desk.contains("lxqt") || session_desk.contains("lxqt"));
+
 	xwayland = OS::get_singleton()->get_environment("XDG_SESSION_TYPE").to_lower() == "wayland";
-	kde5_embed_workaround = OS::get_singleton()->get_environment("XDG_CURRENT_DESKTOP").to_lower() == "kde" && OS::get_singleton()->get_environment("KDE_SESSION_VERSION") == "5";
+	kde5_embed_workaround = current_desk == "kde" && OS::get_singleton()->get_environment("KDE_SESSION_VERSION") == "5";
 
 	native_menu = memnew(NativeMenu);
 	context = p_context;
@@ -6757,7 +6925,17 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 	// Init TTS
 	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
 	if (tts_enabled) {
-		tts = memnew(TTS_Linux);
+		initialize_tts();
+	}
+#endif
+
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
 	}
 #endif
 
@@ -6770,6 +6948,11 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 
 	// Initialize context and rendering device.
 
+	if (rendering_driver == "dummy") {
+		RasterizerDummy::make_current();
+		driver_found = true;
+	}
+
 #if defined(RD_ENABLED)
 #if defined(VULKAN_ENABLED)
 	if (rendering_driver == "vulkan") {
@@ -6844,7 +7027,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 
 			if (use_prime == -1) {
 				print_verbose("Detecting GPUs, set DRI_PRIME in the environment to override GPU detection logic.");
-				use_prime = detect_prime();
+				use_prime = DetectPrimeX11::detect_prime();
 			}
 
 			if (use_prime) {
@@ -6931,7 +7114,6 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 			window_set_flag(WindowFlags(i), true, main_window);
 		}
 	}
-	show_window(main_window);
 
 #if defined(RD_ENABLED)
 	if (rendering_context) {
@@ -7101,8 +7283,8 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode
 	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 
 	portal_desktop = memnew(FreeDesktopPortalDesktop);
+	atspi_monitor = memnew(FreeDesktopAtSPIMonitor);
 #endif // DBUS_ENABLED
-
 	XSetErrorHandler(&default_window_error_handler);
 
 	r_error = OK;
@@ -7142,6 +7324,12 @@ DisplayServerX11::~DisplayServerX11() {
 		}
 #endif
 
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver) {
+			accessibility_driver->window_destroy(E.key);
+		}
+#endif
+
 		WindowData &wd = E.value;
 		if (wd.xic) {
 			XDestroyIC(wd.xic);
@@ -7216,7 +7404,11 @@ DisplayServerX11::~DisplayServerX11() {
 	if (xmbstring) {
 		memfree(xmbstring);
 	}
-
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
+#endif
 #ifdef SPEECHD_ENABLED
 	if (tts) {
 		memdelete(tts);
@@ -7226,6 +7418,7 @@ DisplayServerX11::~DisplayServerX11() {
 #ifdef DBUS_ENABLED
 	memdelete(screensaver);
 	memdelete(portal_desktop);
+	memdelete(atspi_monitor);
 #endif
 }
 
diff --git a/engine/platform/linuxbsd/x11/display_server_x11.h b/engine/platform/linuxbsd/x11/display_server_x11.h
index b21d9024..a2ccc47c 100644
--- a/engine/platform/linuxbsd/x11/display_server_x11.h
+++ b/engine/platform/linuxbsd/x11/display_server_x11.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_X11_H
-#define DISPLAY_SERVER_X11_H
+#pragma once
 
 #ifdef X11_ENABLED
 
@@ -66,6 +65,7 @@
 #endif
 
 #if defined(DBUS_ENABLED)
+#include "freedesktop_at_spi_monitor.h"
 #include "freedesktop_portal_desktop.h"
 #include "freedesktop_screensaver.h"
 #endif
@@ -123,7 +123,7 @@ typedef struct _xrr_monitor_info {
 #undef CursorShape
 
 class DisplayServerX11 : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerX11, DisplayServer);
 
 	_THREAD_SAFE_CLASS_
 
@@ -160,6 +160,7 @@ class DisplayServerX11 : public DisplayServer {
 
 #if defined(DBUS_ENABLED)
 	FreeDesktopPortalDesktop *portal_desktop = nullptr;
+	FreeDesktopAtSPIMonitor *atspi_monitor = nullptr;
 #endif
 
 	struct WindowData {
@@ -200,6 +201,8 @@ class DisplayServerX11 : public DisplayServer {
 		bool on_top = false;
 		bool borderless = false;
 		bool resize_disabled = false;
+		bool no_min_btn = false;
+		bool no_max_btn = false;
 		Vector2i last_position_before_fs;
 		bool focused = true;
 		bool minimized = false;
@@ -353,6 +356,7 @@ class DisplayServerX11 : public DisplayServer {
 	bool _window_minimize_check(WindowID p_window) const;
 	void _validate_mode_on_map(WindowID p_window);
 	void _update_size_hints(WindowID p_window);
+	void _update_actions_hints(WindowID p_window);
 	void _set_wm_fullscreen(WindowID p_window, bool p_enabled, bool p_exclusive);
 	void _set_wm_maximized(WindowID p_window, bool p_enabled);
 	void _set_wm_minimized(WindowID p_window, bool p_enabled);
@@ -360,6 +364,7 @@ class DisplayServerX11 : public DisplayServer {
 	void _update_context(WindowData &wd);
 
 	Context context = CONTEXT_ENGINE;
+	bool swap_cancel_ok = false;
 
 	WindowID _get_focused_window_or_popup() const;
 	bool _window_focus_check();
@@ -395,6 +400,8 @@ class DisplayServerX11 : public DisplayServer {
 	void _set_window_taskbar_pager_enabled(Window p_window, bool p_enabled);
 	Rect2i _screens_get_full_rect() const;
 
+	void initialize_tts() const;
+
 protected:
 	void _window_changed(XEvent *event);
 
@@ -420,10 +427,11 @@ public:
 #if defined(DBUS_ENABLED)
 	virtual bool is_dark_mode_supported() const override;
 	virtual bool is_dark_mode() const override;
+	virtual Color get_accent_color() const override;
 	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
 #endif
 
 	virtual void beep() const override;
@@ -530,6 +538,9 @@ public:
 	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override;
 	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override;
 
+	virtual int accessibility_should_increase_contrast() const override;
+	virtual int accessibility_screen_reader_active() const override;
+
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
@@ -548,6 +559,8 @@ public:
 	virtual CursorShape cursor_get_shape() const override;
 	virtual void cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) override;
 
+	virtual bool get_swap_cancel_ok() override;
+
 	virtual int keyboard_get_layout_count() const override;
 	virtual int keyboard_get_current_layout() const override;
 	virtual void keyboard_set_current_layout(int p_index) override;
@@ -556,6 +569,8 @@ public:
 	virtual Key keyboard_get_keycode_from_physical(Key p_keycode) const override;
 	virtual Key keyboard_get_label_from_physical(Key p_keycode) const override;
 
+	virtual bool color_picker(const Callable &p_callback) override;
+
 	virtual void process_events() override;
 
 	virtual void release_rendering_thread() override;
@@ -578,5 +593,3 @@ public:
 };
 
 #endif // X11_ENABLED
-
-#endif // DISPLAY_SERVER_X11_H
diff --git a/engine/platform/linuxbsd/x11/gl_manager_x11.h b/engine/platform/linuxbsd/x11/gl_manager_x11.h
index 06e147e3..bac0320b 100644
--- a/engine/platform/linuxbsd/x11/gl_manager_x11.h
+++ b/engine/platform/linuxbsd/x11/gl_manager_x11.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GL_MANAGER_X11_H
-#define GL_MANAGER_X11_H
+#pragma once
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
@@ -134,5 +133,3 @@ public:
 };
 
 #endif // X11_ENABLED && GLES3_ENABLED
-
-#endif // GL_MANAGER_X11_H
diff --git a/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h b/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h
index 405dda3d..653707ea 100644
--- a/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h
+++ b/engine/platform/linuxbsd/x11/gl_manager_x11_egl.h
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GL_MANAGER_X11_EGL_H
-#define GL_MANAGER_X11_EGL_H
+#pragma once
 
 #if defined(X11_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/error/error_list.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
@@ -57,5 +55,3 @@ public:
 };
 
 #endif // X11_ENABLED && GLES3_ENABLED
-
-#endif // GL_MANAGER_X11_EGL_H
diff --git a/engine/platform/linuxbsd/x11/key_mapping_x11.h b/engine/platform/linuxbsd/x11/key_mapping_x11.h
index 27cd8af7..3b08f7aa 100644
--- a/engine/platform/linuxbsd/x11/key_mapping_x11.h
+++ b/engine/platform/linuxbsd/x11/key_mapping_x11.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KEY_MAPPING_X11_H
-#define KEY_MAPPING_X11_H
+#pragma once
 
 #include "core/os/keyboard.h"
 #include "core/templates/hash_map.h"
@@ -68,5 +67,3 @@ public:
 	static char32_t get_unicode_from_keysym(KeySym p_keysym);
 	static KeyLocation get_location(unsigned int p_code);
 };
-
-#endif // KEY_MAPPING_X11_H
diff --git a/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h b/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h
index d525b69e..e9dfd96f 100644
--- a/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h
+++ b/engine/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_X11_H
-#define RENDERING_CONTEXT_DRIVER_VULKAN_X11_H
+#pragma once
 
 #ifdef VULKAN_ENABLED
 
@@ -55,5 +54,3 @@ public:
 };
 
 #endif // VULKAN_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_VULKAN_X11_H
diff --git a/engine/platform/macos/SCsub b/engine/platform/macos/SCsub
index 9efb1a66..a71455cc 100644
--- a/engine/platform/macos/SCsub
+++ b/engine/platform/macos/SCsub
@@ -144,6 +144,4 @@ if env["debug_symbols"] and env["separate_debug_symbols"]:
     env.AddPostAction(prog, env.Run(platform_macos_builders.make_debug_macos))
 
 if env["generate_bundle"]:
-    generate_bundle_command = env.Command("generate_bundle", [], generate_bundle)
-    command = env.AlwaysBuild(generate_bundle_command)
-    env.Depends(command, [prog])
+    env.AlwaysBuild(env.CommandNoCache("generate_bundle", prog, env.Run(generate_bundle)))
diff --git a/engine/platform/macos/crash_handler_macos.h b/engine/platform/macos/crash_handler_macos.h
index d52cb723..d96b9b29 100644
--- a/engine/platform/macos/crash_handler_macos.h
+++ b/engine/platform/macos/crash_handler_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CRASH_HANDLER_MACOS_H
-#define CRASH_HANDLER_MACOS_H
+#pragma once
 
 class CrashHandler {
 	bool disabled;
@@ -43,5 +42,3 @@ public:
 	CrashHandler();
 	~CrashHandler();
 };
-
-#endif // CRASH_HANDLER_MACOS_H
diff --git a/engine/platform/macos/crash_handler_macos.mm b/engine/platform/macos/crash_handler_macos.mm
index 49dc863a..65b3cce5 100644
--- a/engine/platform/macos/crash_handler_macos.mm
+++ b/engine/platform/macos/crash_handler_macos.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "crash_handler_macos.h"
+#import "crash_handler_macos.h"
 
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
@@ -50,8 +50,8 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include <mach-o/dyld.h>
-#include <mach-o/getsect.h>
+#import <mach-o/dyld.h>
+#import <mach-o/getsect.h>
 
 static uint64_t load_address() {
 	const struct segment_command_64 *cmd = getsegbyname("__TEXT");
@@ -105,10 +105,10 @@ static void handle_crash(int sig) {
 	print_error(vformat("%s: Program crashed with signal %d", __FUNCTION__, sig));
 
 	// Print the engine version just before, so that people are reminded to include the version in backtrace reports.
-	if (String(VERSION_HASH).is_empty()) {
-		print_error(vformat("Engine version: %s", VERSION_FULL_NAME));
+	if (String(GODOT_VERSION_HASH).is_empty()) {
+		print_error(vformat("Engine version: %s", GODOT_VERSION_FULL_NAME));
 	} else {
-		print_error(vformat("Engine version: %s (%s)", VERSION_FULL_NAME, VERSION_HASH));
+		print_error(vformat("Engine version: %s (%s)", GODOT_VERSION_FULL_NAME, GODOT_VERSION_HASH));
 	}
 	print_error(vformat("Dumping the backtrace. %s", msg));
 	char **strings = backtrace_symbols(bt_buffer, size);
diff --git a/engine/platform/macos/detect.py b/engine/platform/macos/detect.py
index 22773887..a635e6b1 100644
--- a/engine/platform/macos/detect.py
+++ b/engine/platform/macos/detect.py
@@ -182,6 +182,18 @@ def configure(env: "SConsEnvironment"):
 
     ## Dependencies
 
+    if env["accesskit"]:
+        if env["accesskit_sdk_path"] != "":
+            env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
+            if env["arch"] == "arm64" or env["arch"] == "universal":
+                env.Append(LINKFLAGS=["-L" + env["accesskit_sdk_path"] + "/lib/macos/arm64/static/"])
+            if env["arch"] == "x86_64" or env["arch"] == "universal":
+                env.Append(LINKFLAGS=["-L" + env["accesskit_sdk_path"] + "/lib/macos/x86_64/static/"])
+            env.Append(LINKFLAGS=["-laccesskit"])
+        else:
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
+
     if env["builtin_libtheora"] and env["arch"] == "x86_64":
         env["x86_libtheora_opt_gcc"] = True
 
@@ -231,7 +243,7 @@ def configure(env: "SConsEnvironment"):
             env.Append(LINKFLAGS=["-lANGLE.macos." + env["arch"]])
             env.Append(LINKFLAGS=["-lEGL.macos." + env["arch"]])
             env.Append(LINKFLAGS=["-lGLES.macos." + env["arch"]])
-        env.Prepend(CPPPATH=["#thirdparty/angle/include"])
+        env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
 
     env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"])
 
@@ -246,7 +258,7 @@ def configure(env: "SConsEnvironment"):
         extra_frameworks.add("Metal")
         extra_frameworks.add("MetalKit")
         extra_frameworks.add("MetalFX")
-        env.Prepend(CPPPATH=["#thirdparty/spirv-cross"])
+        env.Prepend(CPPEXTPATH=["#thirdparty/spirv-cross"])
 
     if env["vulkan"]:
         env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
diff --git a/engine/platform/macos/dir_access_macos.h b/engine/platform/macos/dir_access_macos.h
index 17a00b7f..de82f366 100644
--- a/engine/platform/macos/dir_access_macos.h
+++ b/engine/platform/macos/dir_access_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIR_ACCESS_MACOS_H
-#define DIR_ACCESS_MACOS_H
+#pragma once
 
 #if defined(UNIX_ENABLED)
 
@@ -42,6 +41,8 @@
 #include <unistd.h>
 
 class DirAccessMacOS : public DirAccessUnix {
+	GDSOFTCLASS(DirAccessMacOS, DirAccessUnix);
+
 protected:
 	virtual String fix_unicode_name(const char *p_name) const override;
 
@@ -55,5 +56,3 @@ protected:
 };
 
 #endif // UNIX ENABLED
-
-#endif // DIR_ACCESS_MACOS_H
diff --git a/engine/platform/macos/dir_access_macos.mm b/engine/platform/macos/dir_access_macos.mm
index 8d03dc1c..5c066bf0 100644
--- a/engine/platform/macos/dir_access_macos.mm
+++ b/engine/platform/macos/dir_access_macos.mm
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "dir_access_macos.h"
-
-#include "core/config/project_settings.h"
+#import "dir_access_macos.h"
 
 #if defined(UNIX_ENABLED)
 
+#include "core/config/project_settings.h"
+
 #include <errno.h>
 
 #import <AppKit/NSWorkspace.h>
@@ -43,7 +43,7 @@ String DirAccessMacOS::fix_unicode_name(const char *p_name) const {
 	String fname;
 	if (p_name != nullptr) {
 		NSString *nsstr = [[NSString stringWithUTF8String:p_name] precomposedStringWithCanonicalMapping];
-		fname.parse_utf8([nsstr UTF8String]);
+		fname.append_utf8([nsstr UTF8String]);
 	}
 
 	return fname;
@@ -66,7 +66,7 @@ String DirAccessMacOS::get_drive(int p_drive) {
 	String volname;
 	NSString *path = [vols[p_drive] path];
 
-	volname.parse_utf8([path UTF8String]);
+	volname.append_utf8([path UTF8String]);
 
 	return volname;
 }
diff --git a/engine/platform/macos/display_server_macos.h b/engine/platform/macos/display_server_macos.h
index eb536f98..e21da149 100644
--- a/engine/platform/macos/display_server_macos.h
+++ b/engine/platform/macos/display_server_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_MACOS_H
-#define DISPLAY_SERVER_MACOS_H
+#pragma once
 
 #include "core/input/input.h"
 #include "servers/display_server.h"
@@ -39,16 +38,16 @@
 #include "gl_manager_macos_legacy.h"
 #endif // GLES3_ENABLED
 
-#include "native_menu_macos.h"
+#import "native_menu_macos.h"
 
 #if defined(RD_ENABLED)
 #include "servers/rendering/rendering_device.h"
 
 #if defined(VULKAN_ENABLED)
-#include "rendering_context_driver_vulkan_macos.h"
+#import "rendering_context_driver_vulkan_macos.h"
 #endif // VULKAN_ENABLED
 #if defined(METAL_ENABLED)
-#include "drivers/metal/rendering_context_driver_metal.h"
+#import "drivers/metal/rendering_context_driver_metal.h"
 #endif
 #endif // RD_ENABLED
 
@@ -65,7 +64,7 @@
 #undef CursorShape
 
 class DisplayServerMacOS : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerMacOS, DisplayServer);
 
 	_THREAD_SAFE_CLASS_
 
@@ -124,6 +123,8 @@ public:
 		bool on_top = false;
 		bool borderless = false;
 		bool resize_disabled = false;
+		bool no_min_btn = false;
+		bool no_max_btn = false;
 		bool no_focus = false;
 		bool is_popup = false;
 		bool mpass = false;
@@ -236,7 +237,9 @@ private:
 
 	static NSCursor *_cursor_from_selector(SEL p_selector, SEL p_fallback = nil);
 
-	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb);
+	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id);
+
+	void initialize_tts() const;
 
 public:
 	void menu_callback(id p_sender);
@@ -254,6 +257,7 @@ public:
 	void send_event(NSEvent *p_event);
 	void send_window_event(const WindowData &p_wd, WindowEvent p_event);
 	void release_pressed_events();
+	void sync_mouse_state();
 	void get_key_modifier_state(unsigned int p_macos_state, Ref<InputEventWithModifiers> r_state) const;
 	void update_mouse_pos(WindowData &p_wd, NSPoint p_location_in_window);
 	void push_to_key_event_buffer(const KeyEvent &p_event);
@@ -303,8 +307,8 @@ public:
 	virtual Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) override;
 	virtual Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
 
 	virtual void beep() const override;
 
@@ -423,6 +427,11 @@ public:
 	virtual void window_set_window_buttons_offset(const Vector2i &p_offset, WindowID p_window = MAIN_WINDOW_ID) override;
 	virtual Vector3i window_get_safe_title_margins(WindowID p_window = MAIN_WINDOW_ID) const override;
 
+	virtual int accessibility_should_increase_contrast() const override;
+	virtual int accessibility_should_reduce_animation() const override;
+	virtual int accessibility_should_reduce_transparency() const override;
+	virtual int accessibility_screen_reader_active() const override;
+
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
@@ -442,6 +451,7 @@ public:
 	virtual Key keyboard_get_label_from_physical(Key p_keycode) const override;
 	virtual void show_emoji_and_symbol_picker() const override;
 
+	void _process_events(bool p_pump);
 	virtual void process_events() override;
 	virtual void force_process_and_drop_events() override;
 
@@ -469,5 +479,3 @@ public:
 	DisplayServerMacOS(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerMacOS();
 };
-
-#endif // DISPLAY_SERVER_MACOS_H
diff --git a/engine/platform/macos/display_server_macos.mm b/engine/platform/macos/display_server_macos.mm
index 556c4c96..3ec84872 100644
--- a/engine/platform/macos/display_server_macos.mm
+++ b/engine/platform/macos/display_server_macos.mm
@@ -28,19 +28,20 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "display_server_macos.h"
+#import "display_server_macos.h"
 
-#include "godot_button_view.h"
-#include "godot_content_view.h"
-#include "godot_menu_delegate.h"
-#include "godot_menu_item.h"
-#include "godot_open_save_delegate.h"
-#include "godot_status_item.h"
-#include "godot_window.h"
-#include "godot_window_delegate.h"
-#include "key_mapping_macos.h"
-#include "os_macos.h"
-#include "tts_macos.h"
+#import "godot_application_delegate.h"
+#import "godot_button_view.h"
+#import "godot_content_view.h"
+#import "godot_menu_delegate.h"
+#import "godot_menu_item.h"
+#import "godot_open_save_delegate.h"
+#import "godot_status_item.h"
+#import "godot_window.h"
+#import "godot_window_delegate.h"
+#import "key_mapping_macos.h"
+#import "os_macos.h"
+#import "tts_macos.h"
 
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
@@ -52,6 +53,8 @@
 
 #include <AppKit/AppKit.h>
 
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 #if defined(GLES3_ENABLED)
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
@@ -60,6 +63,10 @@
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 #endif
 
+#if defined(ACCESSKIT_ENABLED)
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
+#endif
+
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <IOKit/IOCFPlugIn.h>
@@ -68,14 +75,15 @@
 #import <IOKit/hid/IOHIDLib.h>
 
 DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect) {
-	WindowID id;
 	const float scale = screen_get_max_scale();
+
+	WindowID id = window_id_counter;
 	{
-		WindowData wd;
+		WindowData &wd = windows[id];
 
 		wd.window_delegate = [[GodotWindowDelegate alloc] init];
 		ERR_FAIL_NULL_V_MSG(wd.window_delegate, INVALID_WINDOW_ID, "Can't create a window delegate");
-		[wd.window_delegate setWindowID:window_id_counter];
+		[wd.window_delegate setWindowID:id];
 
 		int rq_screen = get_screen_from_rect(p_rect);
 		if (rq_screen < 0) {
@@ -100,12 +108,15 @@ DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mod
 							backing:NSBackingStoreBuffered
 							  defer:NO];
 		ERR_FAIL_NULL_V_MSG(wd.window_object, INVALID_WINDOW_ID, "Can't create a window");
-		[wd.window_object setWindowID:window_id_counter];
+		[wd.window_object setWindowID:id];
 		[wd.window_object setReleasedWhenClosed:NO];
 
 		wd.window_view = [[GodotContentView alloc] init];
-		ERR_FAIL_NULL_V_MSG(wd.window_view, INVALID_WINDOW_ID, "Can't create a window view");
-		[wd.window_view setWindowID:window_id_counter];
+		if (wd.window_view == nil) {
+			windows.erase(id);
+			ERR_FAIL_V_MSG(INVALID_WINDOW_ID, "Can't create a window view");
+		}
+		[wd.window_view setWindowID:id];
 		[wd.window_view setWantsLayer:TRUE];
 
 		[wd.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
@@ -115,6 +126,16 @@ DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mod
 		[wd.window_object setRestorable:NO];
 		[wd.window_object setColorSpace:[NSColorSpace sRGBColorSpace]];
 
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver && !accessibility_driver->window_create(id, (__bridge void *)wd.window_object)) {
+			if (OS::get_singleton()->is_stdout_verbose()) {
+				ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
+			}
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+#endif
+
 		if ([wd.window_object respondsToSelector:@selector(setTabbingMode:)]) {
 			[wd.window_object setTabbingMode:NSWindowTabbingModeDisallowed];
 		}
@@ -156,23 +177,43 @@ DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mod
 			}
 #endif
 			Error err = rendering_context->window_create(window_id_counter, &wpd);
+#ifdef ACCESSKIT_ENABLED
+			if (err != OK && accessibility_driver) {
+				accessibility_driver->window_destroy(id);
+			}
+#endif
 			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, vformat("Can't create a %s context", rendering_driver));
 
 			rendering_context->window_set_size(window_id_counter, p_rect.size.width, p_rect.size.height);
 			rendering_context->window_set_vsync_mode(window_id_counter, p_vsync_mode);
 		}
 #endif
+
 #if defined(GLES3_ENABLED)
+		bool gl_failed = false;
 		if (gl_manager_legacy) {
 			Error err = gl_manager_legacy->window_create(window_id_counter, wd.window_view, p_rect.size.width, p_rect.size.height);
-			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create an OpenGL context.");
+			if (err != OK) {
+				gl_failed = true;
+			}
 		}
 		if (gl_manager_angle) {
 			CALayer *layer = [(NSView *)wd.window_view layer];
 			Error err = gl_manager_angle->window_create(window_id_counter, nullptr, (__bridge void *)layer, p_rect.size.width, p_rect.size.height);
-			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create an OpenGL context.");
+			if (err != OK) {
+				gl_failed = true;
+			}
 		}
-		window_set_vsync_mode(p_vsync_mode, window_id_counter);
+		if (gl_failed) {
+#ifdef ACCESSKIT_ENABLED
+			if (accessibility_driver) {
+				accessibility_driver->window_destroy(id);
+			}
+#endif
+			windows.erase(id);
+			ERR_FAIL_V_MSG(INVALID_WINDOW_ID, "Can't create an OpenGL context.");
+		}
+		window_set_vsync_mode(p_vsync_mode, id);
 #endif
 		[wd.window_view updateLayerDelegate];
 
@@ -184,10 +225,8 @@ DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mod
 		offset.y = (nsrect.origin.y + nsrect.size.height);
 		offset.y -= (windowRect.origin.y + windowRect.size.height);
 		[wd.window_object setFrameTopLeftPoint:NSMakePoint(wpos.x - offset.x, wpos.y - offset.y)];
-
-		id = window_id_counter++;
-		windows[id] = wd;
 	}
+	window_id_counter++;
 
 	WindowData &wd = windows[id];
 	window_set_mode(p_mode, id);
@@ -265,9 +304,15 @@ void DisplayServerMacOS::set_window_per_pixel_transparency_enabled(bool p_enable
 		return;
 	}
 	if (p_enabled) {
-		[wd.window_object setBackgroundColor:[NSColor clearColor]];
 		[wd.window_object setOpaque:NO];
-		[wd.window_object setHasShadow:NO];
+		if (wd.borderless) {
+			[wd.window_object setBackgroundColor:[NSColor clearColor]];
+			[wd.window_object setHasShadow:NO];
+		} else {
+			// Note: transparent and not borderless - set alpha to non-zero value to ensure window shadow is rendered correctly.
+			[wd.window_object setBackgroundColor:[NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:0.004f]];
+			[wd.window_object setHasShadow:YES];
+		}
 		CALayer *layer = [(NSView *)wd.window_view layer];
 		if (layer) {
 			[layer setBackgroundColor:[NSColor clearColor].CGColor];
@@ -286,7 +331,9 @@ void DisplayServerMacOS::set_window_per_pixel_transparency_enabled(bool p_enable
 		}
 		[wd.window_object setBackgroundColor:bg_color];
 		[wd.window_object setOpaque:YES];
-		[wd.window_object setHasShadow:YES];
+		if (!wd.borderless) {
+			[wd.window_object setHasShadow:YES];
+		}
 		CALayer *layer = [(NSView *)wd.window_view layer];
 		if (layer) {
 			[layer setBackgroundColor:bg_color.CGColor];
@@ -505,10 +552,10 @@ void DisplayServerMacOS::_update_keyboard_layouts() const {
 	for (NSUInteger i = 0; i < [list_ime count]; i++) {
 		LayoutInfo ly;
 		NSString *name = (__bridge NSString *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyLocalizedName);
-		ly.name.parse_utf8([name UTF8String]);
+		ly.name.append_utf8([name UTF8String]);
 
 		NSArray *langs = (__bridge NSArray *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyInputSourceLanguages);
-		ly.code.parse_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
+		ly.code.append_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
 		kbd_layouts.push_back(ly);
 
 		if ([name isEqualToString:cur_name]) {
@@ -522,10 +569,10 @@ void DisplayServerMacOS::_update_keyboard_layouts() const {
 	for (NSUInteger i = 0; i < [list_kbd count]; i++) {
 		LayoutInfo ly;
 		NSString *name = (__bridge NSString *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyLocalizedName);
-		ly.name.parse_utf8([name UTF8String]);
+		ly.name.append_utf8([name UTF8String]);
 
 		NSArray *langs = (__bridge NSArray *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyInputSourceLanguages);
-		ly.code.parse_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
+		ly.code.append_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
 		kbd_layouts.push_back(ly);
 
 		if ([name isEqualToString:cur_name]) {
@@ -673,6 +720,38 @@ void DisplayServerMacOS::release_pressed_events() {
 	}
 }
 
+void DisplayServerMacOS::sync_mouse_state() {
+	_THREAD_SAFE_METHOD_
+	if (Input::get_singleton()) {
+		Vector2i pos = Input::get_singleton()->get_mouse_position();
+		BitField<MouseButtonMask> in_mask = Input::get_singleton()->get_mouse_button_mask();
+		BitField<MouseButtonMask> ds_mask = mouse_get_button_state();
+		for (int btn = (int)MouseButton::LEFT; btn <= (int)MouseButton::MB_XBUTTON2; btn++) {
+			MouseButtonMask mbm = mouse_button_to_mask(MouseButton(btn));
+			if (in_mask.has_flag(mbm) && !ds_mask.has_flag(mbm)) {
+				Ref<InputEventMouseButton> mb;
+				mb.instantiate();
+				mb->set_button_index(MouseButton(btn));
+				mb->set_pressed(false);
+				mb->set_position(pos);
+				mb->set_global_position(pos);
+				mb->set_button_mask(ds_mask);
+				Input::get_singleton()->parse_input_event(mb);
+			}
+			if (!in_mask.has_flag(mbm) && ds_mask.has_flag(mbm)) {
+				Ref<InputEventMouseButton> mb;
+				mb.instantiate();
+				mb->set_button_index(MouseButton(btn));
+				mb->set_pressed(true);
+				mb->set_position(pos);
+				mb->set_global_position(pos);
+				mb->set_button_mask(ds_mask);
+				Input::get_singleton()->parse_input_event(mb);
+			}
+		}
+	}
+}
+
 void DisplayServerMacOS::get_key_modifier_state(unsigned int p_macos_state, Ref<InputEventWithModifiers> r_state) const {
 	r_state->set_shift_pressed((p_macos_state & NSEventModifierFlagShift));
 	r_state->set_ctrl_pressed((p_macos_state & NSEventModifierFlagControl));
@@ -722,6 +801,8 @@ bool DisplayServerMacOS::get_is_resizing() const {
 }
 
 void DisplayServerMacOS::window_destroy(WindowID p_window) {
+	ERR_FAIL_COND(!windows.has(p_window));
+
 #if defined(GLES3_ENABLED)
 	if (gl_manager_legacy) {
 		gl_manager_legacy->window_destroy(p_window);
@@ -735,6 +816,11 @@ void DisplayServerMacOS::window_destroy(WindowID p_window) {
 	if (rendering_context) {
 		rendering_context->window_destroy(p_window);
 	}
+#endif
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		accessibility_driver->window_destroy(p_window);
+	}
 #endif
 	windows.erase(p_window);
 
@@ -795,6 +881,11 @@ bool DisplayServerMacOS::has_feature(Feature p_feature) const {
 		case FEATURE_SCREEN_EXCLUDE_FROM_CAPTURE:
 		case FEATURE_EMOJI_AND_SYMBOL_PICKER:
 			return true;
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
+		} break;
+#endif
 		default: {
 		}
 	}
@@ -818,38 +909,63 @@ Callable DisplayServerMacOS::_help_get_action_callback() const {
 	return help_action_callback;
 }
 
+void DisplayServerMacOS::initialize_tts() const {
+	const_cast<DisplayServerMacOS *>(this)->tts = [[TTS_MacOS alloc] init];
+}
+
 bool DisplayServerMacOS::tts_is_speaking() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return [tts isSpeaking];
 }
 
 bool DisplayServerMacOS::tts_is_paused() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return [tts isPaused];
 }
 
 TypedArray<Dictionary> DisplayServerMacOS::tts_get_voices() const {
-	ERR_FAIL_NULL_V_MSG(tts, Array(), "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, TypedArray<Dictionary>());
 	return [tts getVoices];
 }
 
 void DisplayServerMacOS::tts_speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int p_utterance_id, bool p_interrupt) {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts speak:p_text voice:p_voice volume:p_volume pitch:p_pitch rate:p_rate utterance_id:p_utterance_id interrupt:p_interrupt];
 }
 
 void DisplayServerMacOS::tts_pause() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts pauseSpeaking];
 }
 
 void DisplayServerMacOS::tts_resume() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts resumeSpeaking];
 }
 
 void DisplayServerMacOS::tts_stop() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	[tts stopSpeaking];
 }
 
@@ -903,7 +1019,7 @@ Color DisplayServerMacOS::get_base_color() const {
 		__block NSColor *color = nullptr;
 		if (@available(macOS 11.0, *)) {
 			[NSApp.effectiveAppearance performAsCurrentDrawingAppearance:^{
-				color = [[NSColor controlColor] colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]];
+				color = [[NSColor windowBackgroundColor] colorUsingColorSpace:[NSColorSpace genericRGBColorSpace]];
 			}];
 		} else {
 			NSAppearance *saved_appearance = [NSAppearance currentAppearance];
@@ -979,21 +1095,25 @@ Error DisplayServerMacOS::dialog_show(String p_title, String p_description, Vect
 	return OK;
 }
 
-Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
-	return _file_dialog_with_options_show(p_title, p_current_directory, String(), p_filename, p_show_hidden, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false);
+Error DisplayServerMacOS::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
+	return _file_dialog_with_options_show(p_title, p_current_directory, String(), p_filename, p_show_hidden, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false, p_window_id);
 }
 
-Error DisplayServerMacOS::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
-	return _file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, true);
+Error DisplayServerMacOS::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
+	return _file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, true, p_window_id);
 }
 
-Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb) {
+Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_INDEX_V(int(p_mode), FILE_DIALOG_MODE_SAVE_MAX, FAILED);
 
 	NSString *url = [NSString stringWithUTF8String:p_current_directory.utf8().get_data()];
-	WindowID prev_focus = last_focused_window;
+
+	NSWindow *nswindow = nullptr;
+	if (windows.has(p_window_id) && !windows[p_window_id].is_popup) {
+		nswindow = windows[p_window_id].window_object;
+	}
 
 	GodotOpenSaveDelegate *panel_delegate = [[GodotOpenSaveDelegate alloc] init];
 	if (p_root.length() > 0) {
@@ -1015,98 +1135,102 @@ Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title,
 			[panel setNameFieldStringValue:fileurl];
 		}
 
-		[panel beginSheetModalForWindow:[[NSApplication sharedApplication] mainWindow]
-					  completionHandler:^(NSInteger ret) {
-						  if (ret == NSModalResponseOK) {
-							  // Save bookmark for folder.
-							  if (OS::get_singleton()->is_sandboxed()) {
-								  NSArray *bookmarks = [[NSUserDefaults standardUserDefaults] arrayForKey:@"sec_bookmarks"];
-								  bool skip = false;
-								  for (id bookmark in bookmarks) {
-									  NSError *error = nil;
-									  BOOL isStale = NO;
-									  NSURL *exurl = [NSURL URLByResolvingBookmarkData:bookmark options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error];
-									  if (!error && !isStale && ([[exurl path] compare:[[panel directoryURL] path]] == NSOrderedSame)) {
-										  skip = true;
-										  break;
-									  }
-								  }
-								  if (!skip) {
-									  NSError *error = nil;
-									  NSData *bookmark = [[panel directoryURL] bookmarkDataWithOptions:NSURLBookmarkCreationWithSecurityScope includingResourceValuesForKeys:nil relativeToURL:nil error:&error];
-									  if (!error) {
-										  NSArray *new_bookmarks = [bookmarks arrayByAddingObject:bookmark];
-										  [[NSUserDefaults standardUserDefaults] setObject:new_bookmarks forKey:@"sec_bookmarks"];
-									  }
-								  }
-							  }
-							  // Callback.
-							  Vector<String> files;
-							  String url;
-							  url.parse_utf8([[[panel URL] path] UTF8String]);
-							  files.push_back(url);
-							  if (callback.is_valid()) {
-								  if (p_options_in_cb) {
-									  Variant v_result = true;
-									  Variant v_files = files;
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant v_opt = [panel_delegate getSelection];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
+		void (^completion_handler)(NSInteger ret) = ^(NSInteger ret) {
+			if (ret == NSModalResponseOK) {
+				// Save bookmark for folder.
+				if (OS::get_singleton()->is_sandboxed()) {
+					NSArray *bookmarks = [[NSUserDefaults standardUserDefaults] arrayForKey:@"sec_bookmarks"];
+					bool skip = false;
+					for (id bookmark in bookmarks) {
+						NSError *error = nil;
+						BOOL isStale = NO;
+						NSURL *exurl = [NSURL URLByResolvingBookmarkData:bookmark options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error];
+						if (!error && !isStale && ([[exurl path] compare:[[panel directoryURL] path]] == NSOrderedSame)) {
+							skip = true;
+							break;
+						}
+					}
+					if (!skip) {
+						NSError *error = nil;
+						NSData *bookmark = [[panel directoryURL] bookmarkDataWithOptions:NSURLBookmarkCreationWithSecurityScope includingResourceValuesForKeys:nil relativeToURL:nil error:&error];
+						if (!error) {
+							NSArray *new_bookmarks = [bookmarks arrayByAddingObject:bookmark];
+							[[NSUserDefaults standardUserDefaults] setObject:new_bookmarks forKey:@"sec_bookmarks"];
+						}
+					}
+				}
+				// Callback.
+				Vector<String> files;
+				String url;
+				url.append_utf8([[[panel URL] path] UTF8String]);
+				files.push_back(url);
+				if (callback.is_valid()) {
+					if (p_options_in_cb) {
+						Variant v_result = true;
+						Variant v_files = files;
+						Variant v_index = [panel_delegate getIndex];
+						Variant v_opt = [panel_delegate getSelection];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
 
-									  callback.callp(args, 4, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
-									  }
-								  } else {
-									  Variant v_result = true;
-									  Variant v_files = files;
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[3] = { &v_result, &v_files, &v_index };
+						callback.callp(args, 4, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
+						}
+					} else {
+						Variant v_result = true;
+						Variant v_files = files;
+						Variant v_index = [panel_delegate getIndex];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[3] = { &v_result, &v_files, &v_index };
 
-									  callback.callp(args, 3, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
-									  }
-								  }
-							  }
-						  } else {
-							  if (callback.is_valid()) {
-								  if (p_options_in_cb) {
-									  Variant v_result = false;
-									  Variant v_files = Vector<String>();
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant v_opt = [panel_delegate getSelection];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
+						callback.callp(args, 3, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
+						}
+					}
+				}
+			} else {
+				if (callback.is_valid()) {
+					if (p_options_in_cb) {
+						Variant v_result = false;
+						Variant v_files = Vector<String>();
+						Variant v_index = [panel_delegate getIndex];
+						Variant v_opt = [panel_delegate getSelection];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
 
-									  callback.callp(args, 4, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
-									  }
-								  } else {
-									  Variant v_result = false;
-									  Variant v_files = Vector<String>();
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[3] = { &v_result, &v_files, &v_index };
+						callback.callp(args, 4, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
+						}
+					} else {
+						Variant v_result = false;
+						Variant v_files = Vector<String>();
+						Variant v_index = [panel_delegate getIndex];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[3] = { &v_result, &v_files, &v_index };
 
-									  callback.callp(args, 3, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
-									  }
-								  }
-							  }
-						  }
-						  if (prev_focus != INVALID_WINDOW_ID) {
-							  callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(prev_focus);
-						  }
-					  }];
+						callback.callp(args, 3, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
+						}
+					}
+				}
+			}
+			if (p_window_id != INVALID_WINDOW_ID) {
+				callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(p_window_id);
+			}
+		};
+		if (nswindow) {
+			[panel beginSheetModalForWindow:nswindow completionHandler:completion_handler];
+		} else {
+			[panel beginWithCompletionHandler:completion_handler];
+		}
 	} else {
 		NSOpenPanel *panel = [NSOpenPanel openPanel];
 
@@ -1125,104 +1249,108 @@ Error DisplayServerMacOS::_file_dialog_with_options_show(const String &p_title,
 		}
 		[panel setAllowsMultipleSelection:(p_mode == FILE_DIALOG_MODE_OPEN_FILES)];
 
-		[panel beginSheetModalForWindow:[[NSApplication sharedApplication] mainWindow]
-					  completionHandler:^(NSInteger ret) {
-						  if (ret == NSModalResponseOK) {
-							  // Save bookmark for folder.
-							  NSArray *urls = [(NSOpenPanel *)panel URLs];
-							  if (OS::get_singleton()->is_sandboxed()) {
-								  NSArray *bookmarks = [[NSUserDefaults standardUserDefaults] arrayForKey:@"sec_bookmarks"];
-								  NSMutableArray *new_bookmarks = [bookmarks mutableCopy];
-								  for (NSUInteger i = 0; i != [urls count]; ++i) {
-									  bool skip = false;
-									  for (id bookmark in bookmarks) {
-										  NSError *error = nil;
-										  BOOL isStale = NO;
-										  NSURL *exurl = [NSURL URLByResolvingBookmarkData:bookmark options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error];
-										  if (!error && !isStale && ([[exurl path] compare:[[urls objectAtIndex:i] path]] == NSOrderedSame)) {
-											  skip = true;
-											  break;
-										  }
-									  }
-									  if (!skip) {
-										  NSError *error = nil;
-										  NSData *bookmark = [[urls objectAtIndex:i] bookmarkDataWithOptions:NSURLBookmarkCreationWithSecurityScope includingResourceValuesForKeys:nil relativeToURL:nil error:&error];
-										  if (!error) {
-											  [new_bookmarks addObject:bookmark];
-										  }
-									  }
-								  }
-								  [[NSUserDefaults standardUserDefaults] setObject:new_bookmarks forKey:@"sec_bookmarks"];
-							  }
-							  // Callback.
-							  Vector<String> files;
-							  for (NSUInteger i = 0; i != [urls count]; ++i) {
-								  String url;
-								  url.parse_utf8([[[urls objectAtIndex:i] path] UTF8String]);
-								  files.push_back(url);
-							  }
-							  if (callback.is_valid()) {
-								  if (p_options_in_cb) {
-									  Variant v_result = true;
-									  Variant v_files = files;
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant v_opt = [panel_delegate getSelection];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
+		void (^completion_handler)(NSInteger ret) = ^(NSInteger ret) {
+			if (ret == NSModalResponseOK) {
+				// Save bookmark for folder.
+				NSArray *urls = [(NSOpenPanel *)panel URLs];
+				if (OS::get_singleton()->is_sandboxed()) {
+					NSArray *bookmarks = [[NSUserDefaults standardUserDefaults] arrayForKey:@"sec_bookmarks"];
+					NSMutableArray *new_bookmarks = [bookmarks mutableCopy];
+					for (NSUInteger i = 0; i != [urls count]; ++i) {
+						bool skip = false;
+						for (id bookmark in bookmarks) {
+							NSError *error = nil;
+							BOOL isStale = NO;
+							NSURL *exurl = [NSURL URLByResolvingBookmarkData:bookmark options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error];
+							if (!error && !isStale && ([[exurl path] compare:[[urls objectAtIndex:i] path]] == NSOrderedSame)) {
+								skip = true;
+								break;
+							}
+						}
+						if (!skip) {
+							NSError *error = nil;
+							NSData *bookmark = [[urls objectAtIndex:i] bookmarkDataWithOptions:NSURLBookmarkCreationWithSecurityScope includingResourceValuesForKeys:nil relativeToURL:nil error:&error];
+							if (!error) {
+								[new_bookmarks addObject:bookmark];
+							}
+						}
+					}
+					[[NSUserDefaults standardUserDefaults] setObject:new_bookmarks forKey:@"sec_bookmarks"];
+				}
+				// Callback.
+				Vector<String> files;
+				for (NSUInteger i = 0; i != [urls count]; ++i) {
+					String url;
+					url.append_utf8([[[urls objectAtIndex:i] path] UTF8String]);
+					files.push_back(url);
+				}
+				if (callback.is_valid()) {
+					if (p_options_in_cb) {
+						Variant v_result = true;
+						Variant v_files = files;
+						Variant v_index = [panel_delegate getIndex];
+						Variant v_opt = [panel_delegate getSelection];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
 
-									  callback.callp(args, 4, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
-									  }
-								  } else {
-									  Variant v_result = true;
-									  Variant v_files = files;
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[3] = { &v_result, &v_files, &v_index };
+						callback.callp(args, 4, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
+						}
+					} else {
+						Variant v_result = true;
+						Variant v_files = files;
+						Variant v_index = [panel_delegate getIndex];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[3] = { &v_result, &v_files, &v_index };
 
-									  callback.callp(args, 3, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
-									  }
-								  }
-							  }
-						  } else {
-							  if (callback.is_valid()) {
-								  if (p_options_in_cb) {
-									  Variant v_result = false;
-									  Variant v_files = Vector<String>();
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant v_opt = [panel_delegate getSelection];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
+						callback.callp(args, 3, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
+						}
+					}
+				}
+			} else {
+				if (callback.is_valid()) {
+					if (p_options_in_cb) {
+						Variant v_result = false;
+						Variant v_files = Vector<String>();
+						Variant v_index = [panel_delegate getIndex];
+						Variant v_opt = [panel_delegate getSelection];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[4] = { &v_result, &v_files, &v_index, &v_opt };
 
-									  callback.callp(args, 4, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
-									  }
-								  } else {
-									  Variant v_result = false;
-									  Variant v_files = Vector<String>();
-									  Variant v_index = [panel_delegate getIndex];
-									  Variant ret;
-									  Callable::CallError ce;
-									  const Variant *args[3] = { &v_result, &v_files, &v_index };
+						callback.callp(args, 4, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 4, ce)));
+						}
+					} else {
+						Variant v_result = false;
+						Variant v_files = Vector<String>();
+						Variant v_index = [panel_delegate getIndex];
+						Variant ret;
+						Callable::CallError ce;
+						const Variant *args[3] = { &v_result, &v_files, &v_index };
 
-									  callback.callp(args, 3, ret, ce);
-									  if (ce.error != Callable::CallError::CALL_OK) {
-										  ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
-									  }
-								  }
-							  }
-						  }
-						  if (prev_focus != INVALID_WINDOW_ID) {
-							  callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(prev_focus);
-						  }
-					  }];
+						callback.callp(args, 3, ret, ce);
+						if (ce.error != Callable::CallError::CALL_OK) {
+							ERR_PRINT(vformat("Failed to execute file dialog callback: %s.", Variant::get_callable_error_text(callback, args, 3, ce)));
+						}
+					}
+				}
+			}
+			if (p_window_id != INVALID_WINDOW_ID) {
+				callable_mp(DisplayServer::get_singleton(), &DisplayServer::window_move_to_foreground).call_deferred(p_window_id);
+			}
+		};
+		if (nswindow) {
+			[panel beginSheetModalForWindow:nswindow completionHandler:completion_handler];
+		} else {
+			[panel beginWithCompletionHandler:completion_handler];
+		}
 	}
 
 	return OK;
@@ -1251,7 +1379,7 @@ Error DisplayServerMacOS::dialog_input_text(String p_title, String p_description
 	[window runModal];
 
 	String ret;
-	ret.parse_utf8([[input stringValue] UTF8String]);
+	ret.append_utf8([[input stringValue] UTF8String]);
 
 	if (p_callback.is_valid()) {
 		Variant v_result = ret;
@@ -1486,7 +1614,7 @@ Point2i DisplayServerMacOS::mouse_get_position() const {
 }
 
 BitField<MouseButtonMask> DisplayServerMacOS::mouse_get_button_state() const {
-	BitField<MouseButtonMask> last_button_state = 0;
+	BitField<MouseButtonMask> last_button_state = MouseButtonMask::NONE;
 
 	NSUInteger buttons = [NSEvent pressedMouseButtons];
 	if (buttons & (1 << 0)) {
@@ -1535,7 +1663,7 @@ String DisplayServerMacOS::clipboard_get() const {
 	NSString *string = [objectsToPaste objectAtIndex:0];
 
 	String ret;
-	ret.parse_utf8([string UTF8String]);
+	ret.append_utf8([string UTF8String]);
 	return ret;
 }
 
@@ -1881,6 +2009,11 @@ DisplayServer::WindowID DisplayServerMacOS::create_sub_window(WindowMode p_mode,
 void DisplayServerMacOS::show_window(WindowID p_id) {
 	WindowData &wd = windows[p_id];
 
+	if (p_id == MAIN_WINDOW_ID) {
+		[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+		static_cast<OS_MacOS *>(OS::get_singleton())->activate();
+	}
+
 	popup_open(p_id);
 	if ([wd.window_object isMiniaturized]) {
 		return;
@@ -1901,6 +2034,8 @@ void DisplayServerMacOS::delete_sub_window(WindowID p_id) {
 
 	[wd.window_object setContentView:nil];
 	[wd.window_object close];
+
+	mouse_enter_window(get_window_at_screen_position(mouse_get_position()));
 }
 
 void DisplayServerMacOS::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
@@ -2370,6 +2505,10 @@ void DisplayServerMacOS::window_set_mode(WindowMode p_mode, WindowID p_window) {
 			if (wd.resize_disabled) { // Restore resize disabled.
 				[wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskResizable];
 			}
+			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!wd.no_min_btn];
+			[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:!wd.no_max_btn];
+			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
+			[[wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 			if (wd.min_size != Size2i()) {
 				Size2i size = wd.min_size / screen_get_max_scale();
 				[wd.window_object setContentMinSize:NSMakeSize(size.x, size.y)];
@@ -2455,7 +2594,10 @@ DisplayServer::WindowMode DisplayServerMacOS::window_get_mode(WindowID p_window)
 }
 
 bool DisplayServerMacOS::window_is_maximize_allowed(WindowID p_window) const {
-	return true;
+	ERR_FAIL_COND_V(!windows.has(p_window), false);
+	const WindowData &wd = windows[p_window];
+
+	return [wd.window_object standardWindowButton:NSWindowZoomButton].enabled;
 }
 
 bool DisplayServerMacOS::window_maximize_on_title_dbl_click() const {
@@ -2548,11 +2690,14 @@ void DisplayServerMacOS::window_set_custom_window_buttons(WindowData &p_wd, bool
 		p_wd.window_button_view = [[GodotButtonView alloc] initWithFrame:NSZeroRect];
 		[p_wd.window_button_view initButtons:window_buttons_spacing offset:NSMakePoint(p_wd.wb_offset.x, p_wd.wb_offset.y) rtl:is_rtl];
 		[p_wd.window_view addSubview:p_wd.window_button_view];
+
+		[[p_wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(p_wd.no_min_btn && p_wd.no_max_btn)];
+		[[p_wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(p_wd.no_min_btn && p_wd.no_max_btn)];
 	} else {
 		[p_wd.window_object setTitleVisibility:NSWindowTitleVisible];
 		[[p_wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:NO];
-		[[p_wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:NO];
-		[[p_wd.window_object standardWindowButton:NSWindowCloseButton] setHidden:NO];
+		[[p_wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(p_wd.no_min_btn && p_wd.no_max_btn)];
+		[[p_wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(p_wd.no_min_btn && p_wd.no_max_btn)];
 	}
 }
 
@@ -2563,6 +2708,18 @@ void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, Win
 	WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
+			wd.no_min_btn = p_enabled;
+			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!p_enabled];
+			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
+			[[wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
+		} break;
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
+			wd.no_max_btn = p_enabled;
+			[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:!p_enabled];
+			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
+			[[wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
+		} break;
 		case WINDOW_FLAG_RESIZE_DISABLED: {
 			wd.resize_disabled = p_enabled;
 			if (wd.fullscreen) { // Fullscreen window should be resizable, style will be applied on exiting fullscreen.
@@ -2570,11 +2727,13 @@ void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, Win
 			}
 			if (p_enabled) {
 				[wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskResizable];
-				[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:NO];
 			} else {
 				[wd.window_object setStyleMask:[wd.window_object styleMask] | NSWindowStyleMaskResizable];
-				[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:YES];
 			}
+			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!wd.no_min_btn];
+			[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:!wd.no_max_btn];
+			[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
+			[[wd.window_object standardWindowButton:NSWindowZoomButton] setHidden:(wd.no_min_btn && wd.no_max_btn)];
 		} break;
 		case WINDOW_FLAG_EXTEND_TO_TITLE: {
 			NSRect rect = [wd.window_object frame];
@@ -2610,12 +2769,19 @@ void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, Win
 			wd.borderless = p_enabled;
 			if (p_enabled) {
 				[wd.window_object setStyleMask:NSWindowStyleMaskBorderless];
-			} else {
+				[wd.window_object setHasShadow:NO];
 				if (wd.layered_window) {
-					wd.layered_window = false;
-					set_window_per_pixel_transparency_enabled(false, p_window);
+					[wd.window_object setBackgroundColor:[NSColor clearColor]];
 				}
+			} else {
 				[wd.window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (wd.extend_to_title ? NSWindowStyleMaskFullSizeContentView : 0) | (wd.resize_disabled ? 0 : NSWindowStyleMaskResizable)];
+				[[wd.window_object standardWindowButton:NSWindowMiniaturizeButton] setEnabled:!wd.no_min_btn];
+				[[wd.window_object standardWindowButton:NSWindowZoomButton] setEnabled:!wd.no_max_btn];
+				[wd.window_object setHasShadow:YES];
+				if (wd.layered_window) {
+					// Note: transparent and not borderless - set alpha to non-zero value to ensure window shadow is rendered correctly.
+					[wd.window_object setBackgroundColor:[NSColor colorWithCalibratedRed:0 green:0 blue:0 alpha:0.004f]];
+				}
 				// Force update of the window styles.
 				NSRect frameRect = [wd.window_object frame];
 				[wd.window_object setFrame:NSMakeRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width + 1, frameRect.size.height) display:NO];
@@ -2647,11 +2813,6 @@ void DisplayServerMacOS::window_set_flag(WindowFlags p_flag, bool p_enabled, Win
 			if (wd.fullscreen) {
 				return;
 			}
-			if (p_enabled) {
-				[wd.window_object setStyleMask:NSWindowStyleMaskBorderless]; // Force borderless.
-			} else if (!wd.borderless) {
-				[wd.window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (wd.extend_to_title ? NSWindowStyleMaskFullSizeContentView : 0) | (wd.resize_disabled ? 0 : NSWindowStyleMaskResizable)];
-			}
 			wd.layered_window = p_enabled;
 			set_window_per_pixel_transparency_enabled(p_enabled, p_window);
 			// Force update of the window styles.
@@ -2696,6 +2857,12 @@ bool DisplayServerMacOS::window_get_flag(WindowFlags p_flag, WindowID p_window)
 	const WindowData &wd = windows[p_window];
 
 	switch (p_flag) {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
+			return wd.no_max_btn;
+		} break;
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
+			return wd.no_min_btn;
+		} break;
 		case WINDOW_FLAG_RESIZE_DISABLED: {
 			return wd.resize_disabled;
 		} break;
@@ -2915,6 +3082,22 @@ DisplayServer::VSyncMode DisplayServerMacOS::window_get_vsync_mode(WindowID p_wi
 	return DisplayServer::VSYNC_ENABLED;
 }
 
+int DisplayServerMacOS::accessibility_should_increase_contrast() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getHighContrast];
+}
+
+int DisplayServerMacOS::accessibility_should_reduce_animation() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getReduceMotion];
+}
+
+int DisplayServerMacOS::accessibility_should_reduce_transparency() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getReduceTransparency];
+}
+
+int DisplayServerMacOS::accessibility_screen_reader_active() const {
+	return [(GodotApplicationDelegate *)[[NSApplication sharedApplication] delegate] getVoiceOver];
+}
+
 Point2i DisplayServerMacOS::ime_get_selection() const {
 	return im_selection;
 }
@@ -3182,20 +3365,26 @@ void DisplayServerMacOS::show_emoji_and_symbol_picker() const {
 }
 
 void DisplayServerMacOS::process_events() {
+	_process_events(true);
+}
+
+void DisplayServerMacOS::_process_events(bool p_pump) {
 	ERR_FAIL_COND(!Thread::is_main_thread());
 
-	while (true) {
-		NSEvent *event = [NSApp
-				nextEventMatchingMask:NSEventMaskAny
-							untilDate:[NSDate distantPast]
-							   inMode:NSDefaultRunLoopMode
-							  dequeue:YES];
+	if (p_pump) {
+		while (true) {
+			NSEvent *event = [NSApp
+					nextEventMatchingMask:NSEventMaskAny
+								untilDate:[NSDate distantPast]
+								   inMode:NSDefaultRunLoopMode
+								  dequeue:YES];
 
-		if (event == nil) {
-			break;
+			if (event == nil) {
+				break;
+			}
+
+			[NSApp sendEvent:event];
 		}
-
-		[NSApp sendEvent:event];
 	}
 
 	// Process "menu_callback"s.
@@ -3502,6 +3691,7 @@ Vector<String> DisplayServerMacOS::get_rendering_drivers_func() {
 	drivers.push_back("opengl3");
 	drivers.push_back("opengl3_angle");
 #endif
+	drivers.push_back("dummy");
 
 	return drivers;
 }
@@ -3688,11 +3878,21 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM
 	// Init TTS
 	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
 	if (tts_enabled) {
-		tts = [[TTS_MacOS alloc] init];
+		initialize_tts();
 	}
 
 	native_menu = memnew(NativeMenuMacOS);
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+	}
+#endif
+
 	NSMenuItem *menu_item;
 	NSString *title;
 
@@ -3882,9 +4082,12 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM
 			window_set_flag(WindowFlags(i), true, main_window);
 		}
 	}
-	show_window(MAIN_WINDOW_ID);
 	force_process_and_drop_events();
 
+	if (rendering_driver == "dummy") {
+		RasterizerDummy::make_current();
+	}
+
 #if defined(GLES3_ENABLED)
 	if (rendering_driver == "opengl3") {
 		RasterizerGLES3::make_current(true);
@@ -3953,7 +4156,11 @@ DisplayServerMacOS::~DisplayServerMacOS() {
 		rendering_context = nullptr;
 	}
 #endif
-
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
+#endif
 	CFNotificationCenterRemoveObserver(CFNotificationCenterGetDistributedCenter(), nullptr, kTISNotifySelectedKeyboardInputSourceChanged, nullptr);
 	CGDisplayRemoveReconfigurationCallback(_displays_arrangement_changed, nullptr);
 
diff --git a/engine/platform/macos/export/export.h b/engine/platform/macos/export/export.h
index a7a7dcad..8c22ef3c 100644
--- a/engine/platform/macos/export/export.h
+++ b/engine/platform/macos/export/export.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MACOS_EXPORT_H
-#define MACOS_EXPORT_H
+#pragma once
 
 void register_macos_exporter_types();
 void register_macos_exporter();
-
-#endif // MACOS_EXPORT_H
diff --git a/engine/platform/macos/export/export_plugin.cpp b/engine/platform/macos/export/export_plugin.cpp
index 140839f1..d59b6e0e 100644
--- a/engine/platform/macos/export/export_plugin.cpp
+++ b/engine/platform/macos/export/export_plugin.cpp
@@ -561,13 +561,13 @@ void EditorExportPlatformMacOS::get_export_options(List<ExportOption> *r_options
 
 	{
 		String hint;
-		for (uint64_t i = 0; i < sizeof(data_collect_purpose_info) / sizeof(data_collect_purpose_info[0]); ++i) {
+		for (uint64_t i = 0; i < std::size(data_collect_purpose_info); ++i) {
 			if (i != 0) {
 				hint += ",";
 			}
 			hint += vformat("%s:%d", data_collect_purpose_info[i].prop_name, (1 << i));
 		}
-		for (uint64_t i = 0; i < sizeof(data_collect_type_info) / sizeof(data_collect_type_info[0]); ++i) {
+		for (uint64_t i = 0; i < std::size(data_collect_type_info); ++i) {
 			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("privacy/collected_data/%s/collected", data_collect_type_info[i].prop_name)), false));
 			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("privacy/collected_data/%s/linked_to_user", data_collect_type_info[i].prop_name)), false));
 			r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, vformat("privacy/collected_data/%s/used_for_tracking", data_collect_type_info[i].prop_name)), false));
@@ -671,7 +671,7 @@ void EditorExportPlatformMacOS::_make_icon(const Ref<EditorExportPreset> &p_pres
 		{ "is32", "s8mk", false, 16 } //16×16 24-bit RLE + 8-bit uncompressed mask
 	};
 
-	for (uint64_t i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
+	for (uint64_t i = 0; i < std::size(icon_infos); ++i) {
 		Ref<Image> copy = p_icon->duplicate();
 		copy->convert(Image::FORMAT_RGBA8);
 		copy->resize(icon_infos[i].size, icon_infos[i].size, (Image::Interpolation)(p_preset->get("application/icon_interpolation").operator int()));
@@ -736,14 +736,13 @@ void EditorExportPlatformMacOS::_make_icon(const Ref<EditorExportPreset> &p_pres
 }
 
 void EditorExportPlatformMacOS::_fix_privacy_manifest(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &plist) {
-	String str;
+	String str = String::utf8((const char *)plist.ptr(), plist.size());
 	String strnew;
-	str.parse_utf8((const char *)plist.ptr(), plist.size());
 	Vector<String> lines = str.split("\n");
 	for (int i = 0; i < lines.size(); i++) {
 		if (lines[i].find("$priv_collection") != -1) {
 			bool section_opened = false;
-			for (uint64_t j = 0; j < sizeof(data_collect_type_info) / sizeof(data_collect_type_info[0]); ++j) {
+			for (uint64_t j = 0; j < std::size(data_collect_type_info); ++j) {
 				bool data_collected = p_preset->get(vformat("privacy/collected_data/%s/collected", data_collect_type_info[j].prop_name));
 				bool linked = p_preset->get(vformat("privacy/collected_data/%s/linked_to_user", data_collect_type_info[j].prop_name));
 				bool tracking = p_preset->get(vformat("privacy/collected_data/%s/used_for_tracking", data_collect_type_info[j].prop_name));
@@ -772,7 +771,7 @@ void EditorExportPlatformMacOS::_fix_privacy_manifest(const Ref<EditorExportPres
 					if (purposes != 0) {
 						strnew += "\t\t\t\t<key>NSPrivacyCollectedDataTypePurposes</key>\n";
 						strnew += "\t\t\t\t<array>\n";
-						for (uint64_t k = 0; k < sizeof(data_collect_purpose_info) / sizeof(data_collect_purpose_info[0]); ++k) {
+						for (uint64_t k = 0; k < std::size(data_collect_purpose_info); ++k) {
 							if (purposes & (1 << k)) {
 								strnew += vformat("\t\t\t\t\t<string>%s</string>\n", data_collect_purpose_info[k].type_name);
 							}
@@ -815,15 +814,14 @@ void EditorExportPlatformMacOS::_fix_privacy_manifest(const Ref<EditorExportPres
 }
 
 void EditorExportPlatformMacOS::_fix_plist(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &plist, const String &p_binary) {
-	String str;
+	String str = String::utf8((const char *)plist.ptr(), plist.size());
 	String strnew;
-	str.parse_utf8((const char *)plist.ptr(), plist.size());
 	Vector<String> lines = str.split("\n");
 	for (int i = 0; i < lines.size(); i++) {
 		if (lines[i].contains("$binary")) {
 			strnew += lines[i].replace("$binary", p_binary) + "\n";
 		} else if (lines[i].contains("$name")) {
-			strnew += lines[i].replace("$name", GLOBAL_GET("application/config/name")) + "\n";
+			strnew += lines[i].replace("$name", get_project_setting(p_preset, "application/config/name")) + "\n";
 		} else if (lines[i].contains("$bundle_identifier")) {
 			strnew += lines[i].replace("$bundle_identifier", p_preset->get("application/bundle_identifier")) + "\n";
 		} else if (lines[i].contains("$short_version")) {
@@ -982,7 +980,7 @@ Error EditorExportPlatformMacOS::_notarize(const Ref<EditorExportPreset> &p_pres
 			} else {
 				print_verbose("rcodesign (" + p_path + "):\n" + str);
 				int next_nl = str.find_char('\n', rq_offset);
-				String request_uuid = (next_nl == -1) ? str.substr(rq_offset + 23, -1) : str.substr(rq_offset + 23, next_nl - rq_offset - 23);
+				String request_uuid = (next_nl == -1) ? str.substr(rq_offset + 23) : str.substr(rq_offset + 23, next_nl - rq_offset - 23);
 				add_message(EXPORT_MESSAGE_INFO, TTR("Notarization"), vformat(TTR("Notarization request UUID: \"%s\""), request_uuid));
 				add_message(EXPORT_MESSAGE_INFO, TTR("Notarization"), TTR("The notarization process generally takes less than an hour."));
 				add_message(EXPORT_MESSAGE_INFO, TTR("Notarization"), "\t" + TTR("You can check progress manually by opening a Terminal and running the following command:"));
@@ -1066,7 +1064,7 @@ Error EditorExportPlatformMacOS::_notarize(const Ref<EditorExportPreset> &p_pres
 			} else {
 				print_verbose("notarytool (" + p_path + "):\n" + str);
 				int next_nl = str.find_char('\n', rq_offset);
-				String request_uuid = (next_nl == -1) ? str.substr(rq_offset + 4, -1) : str.substr(rq_offset + 4, next_nl - rq_offset - 4);
+				String request_uuid = (next_nl == -1) ? str.substr(rq_offset + 4) : str.substr(rq_offset + 4, next_nl - rq_offset - 4);
 				add_message(EXPORT_MESSAGE_INFO, TTR("Notarization"), vformat(TTR("Notarization request UUID: \"%s\""), request_uuid));
 				add_message(EXPORT_MESSAGE_INFO, TTR("Notarization"), TTR("The notarization process generally takes less than an hour."));
 				add_message(EXPORT_MESSAGE_INFO, TTR("Notarization"), "\t" + TTR("You can check progress manually by opening a Terminal and running the following command:"));
@@ -1500,7 +1498,7 @@ Error EditorExportPlatformMacOS::_export_debug_script(const Ref<EditorExportPres
 	}
 
 	f->store_line("#!/bin/sh");
-	f->store_line("echo -ne '\\033c\\033]0;" + p_app_name + "\\a'");
+	f->store_line("printf '\\033c\\033]0;%s\\a' " + p_app_name);
 	f->store_line("");
 	f->store_line("function app_realpath() {");
 	f->store_line("    SOURCE=$1");
@@ -1566,8 +1564,8 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 	String binary_to_use = "godot_macos_" + String(p_debug ? "debug" : "release") + "." + architecture;
 
 	String pkg_name;
-	if (String(GLOBAL_GET("application/config/name")) != "") {
-		pkg_name = String(GLOBAL_GET("application/config/name"));
+	if (String(get_project_setting(p_preset, "application/config/name")) != "") {
+		pkg_name = String(get_project_setting(p_preset, "application/config/name"));
 	} else {
 		pkg_name = "Unnamed";
 	}
@@ -1660,7 +1658,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 		}
 	}
 
-	Dictionary appnames = GLOBAL_GET("application/config/name_localized");
+	Dictionary appnames = get_project_setting(p_preset, "application/config/name_localized");
 	Dictionary microphone_usage_descriptions = p_preset->get("privacy/microphone_usage_description_localized");
 	Dictionary camera_usage_descriptions = p_preset->get("privacy/camera_usage_description_localized");
 	Dictionary location_usage_descriptions = p_preset->get("privacy/location_usage_description_localized");
@@ -1674,7 +1672,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 	Dictionary removable_volumes_usage_descriptions = p_preset->get("privacy/removable_volumes_usage_description_localized");
 	Dictionary copyrights = p_preset->get("application/copyright_localized");
 
-	Vector<String> translations = GLOBAL_GET("internationalization/locale/translations");
+	Vector<String> translations = get_project_setting(p_preset, "internationalization/locale/translations");
 	if (translations.size() > 0) {
 		{
 			String fname = tmp_app_path_name + "/Contents/Resources/en.lproj";
@@ -1682,7 +1680,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 			Ref<FileAccess> f = FileAccess::open(fname + "/InfoPlist.strings", FileAccess::WRITE);
 			f->store_line("/* Localized versions of Info.plist keys */");
 			f->store_line("");
-			f->store_line("CFBundleDisplayName = \"" + GLOBAL_GET("application/config/name").operator String() + "\";");
+			f->store_line("CFBundleDisplayName = \"" + get_project_setting(p_preset, "application/config/name").operator String() + "\";");
 			if (!((String)p_preset->get("privacy/microphone_usage_description")).is_empty()) {
 				f->store_line("NSMicrophoneUsageDescription = \"" + p_preset->get("privacy/microphone_usage_description").operator String() + "\";");
 			}
@@ -1781,7 +1779,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 	int export_angle = p_preset->get("application/export_angle");
 	bool include_angle_libs = false;
 	if (export_angle == 0) {
-		include_angle_libs = String(GLOBAL_GET("rendering/gl_compatibility/driver.macos")) == "opengl3_angle";
+		include_angle_libs = String(get_project_setting(p_preset, "rendering/gl_compatibility/driver.macos")) == "opengl3_angle";
 	} else if (export_angle == 1) {
 		include_angle_libs = true;
 	}
@@ -1869,10 +1867,10 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 			String icon_path;
 			if (p_preset->get("application/icon") != "") {
 				icon_path = p_preset->get("application/icon");
-			} else if (GLOBAL_GET("application/config/macos_native_icon") != "") {
-				icon_path = GLOBAL_GET("application/config/macos_native_icon");
+			} else if (get_project_setting(p_preset, "application/config/macos_native_icon") != "") {
+				icon_path = get_project_setting(p_preset, "application/config/macos_native_icon");
 			} else {
-				icon_path = GLOBAL_GET("application/config/icon");
+				icon_path = get_project_setting(p_preset, "application/config/icon");
 			}
 
 			if (!icon_path.is_empty()) {
@@ -2570,8 +2568,8 @@ Error EditorExportPlatformMacOS::run(const Ref<EditorExportPreset> &p_preset, in
 	}
 
 	String pkg_name;
-	if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
-		pkg_name = String(ProjectSettings::get_singleton()->get("application/config/name"));
+	if (String(get_project_setting(p_preset, "application/config/name")) != "") {
+		pkg_name = String(get_project_setting(p_preset, "application/config/name"));
 	} else {
 		pkg_name = "Unnamed";
 	}
diff --git a/engine/platform/macos/export/export_plugin.h b/engine/platform/macos/export/export_plugin.h
index ef8d1bb8..607d98da 100644
--- a/engine/platform/macos/export/export_plugin.h
+++ b/engine/platform/macos/export/export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MACOS_EXPORT_PLUGIN_H
-#define MACOS_EXPORT_PLUGIN_H
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
@@ -38,7 +37,6 @@
 #include "core/io/marshalls.h"
 #include "core/io/resource_saver.h"
 #include "core/os/os.h"
-#include "core/version.h"
 #include "editor/editor_settings.h"
 #include "editor/export/editor_export.h"
 
@@ -173,5 +171,3 @@ public:
 
 	EditorExportPlatformMacOS();
 };
-
-#endif // MACOS_EXPORT_PLUGIN_H
diff --git a/engine/platform/macos/export/logo.svg b/engine/platform/macos/export/logo.svg
index ec1b6ca5..e71bd050 100644
--- a/engine/platform/macos/export/logo.svg
+++ b/engine/platform/macos/export/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 25.6 25.6"><path fill="#1c9ef8" d="M.948 19.474V6.126c0-2.767 2.42-5.178 5.178-5.178h6.904s-2.992 7.506-2.992 13.233c0 .346.337.69.69.69h2.877c0 6.648.906 8.436 1.266 9.781H6.126c-2.75 0-5.178-2.407-5.178-5.178z"/><path fill="none" stroke="#323232" stroke-linecap="round" stroke-width="1.036" d="M7.162 8.312v1.496"/><path fill="#e1e6ed" d="M10.729 14.871c-.352 0-.69-.344-.69-.69C10.038 8.414 13.03.948 13.03.948h6.444c2.77 0 5.178 2.416 5.178 5.178v13.348c0 2.754-2.407 5.178-5.178 5.178h-4.603c-.357-1.333-1.266-2.887-1.266-9.78z"/><g fill="none" stroke="#323232" stroke-linecap="round"><path stroke-width="1.036" d="M17.575 8.255V9.75"/><path stroke-width=".69" d="M5.55 16.943c1.037 1.794 3.907 2.876 6.79 2.876 2.877 0 5.745-1.068 6.789-2.876"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 25.6 25.6"><path fill="#1c9ef8" d="M.948 19.474V6.126c0-2.767 2.42-5.178 5.178-5.178h6.904s-2.992 7.506-2.992 13.233c0 .346.337.69.69.69h2.877c0 6.648.906 8.436 1.266 9.781H6.126c-2.75 0-5.178-2.407-5.178-5.178z"/><path fill="none" stroke="#323232" stroke-linecap="round" stroke-width="1.036" d="M7.162 8.312v1.496"/><path fill="#e1e6ed" d="M10.729 14.871c-.352 0-.69-.344-.69-.69C10.038 8.414 13.03.948 13.03.948h6.444c2.77 0 5.178 2.416 5.178 5.178v13.348c0 2.754-2.407 5.178-5.178 5.178h-4.603c-.357-1.333-1.266-2.887-1.266-9.78z"/><g fill="none" stroke="#323232" stroke-linecap="round"><path stroke-width="1.036" d="M17.575 8.255V9.75"/><path stroke-width=".69" d="M5.55 16.943c1.037 1.794 3.907 2.876 6.79 2.876 2.877 0 5.745-1.068 6.789-2.876"/></g></svg>
diff --git a/engine/platform/macos/export/run_icon.svg b/engine/platform/macos/export/run_icon.svg
index 24d10ef4..069dd768 100644
--- a/engine/platform/macos/export/run_icon.svg
+++ b/engine/platform/macos/export/run_icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M4.418 1.055a3.364 3.364 0 0 0-3.364 3.364v7.164a3.364 3.364 0 0 0 3.364 3.364h7.164a3.364 3.364 0 0 0 3.364-3.364V4.418a3.364 3.364 0 0 0-3.364-3.364H7.729Zm3.875 1.164h3.291a2.2 2.2 0 0 1 2.2 2.2v7.164a2.2 2.2 0 0 1-2.2 2.2h-2.15a8.884 8.884 0 0 1-.358-1.598c-.135.02-.487.082-.693.117a7.345 7.345 0 0 1-1.254 0 7.114 7.114 0 0 1-.926-.139 6.057 6.057 0 0 1-.867-.271 3.843 3.843 0 0 1-.988-.566 3.214 3.214 0 0 1-.397-.378 2.8 2.8 0 0 1-.318-.441.56.56 0 0 1 .968-.56c.083.138.188.26.312.362.096.082.2.158.307.224.12.075.243.142.371.201.285.139.583.247.89.319a5.35 5.35 0 0 0 1.282.158c.065 0 .129-.005.184-.006.056 0 .102-.005.148-.008l.096-.006c.114-.009.228-.02.31-.032.083-.013.11-.021.143-.028.099-.022.204-.058.327-.089a28.438 28.438 0 0 1-.06-1.929V8.53H6.887c.048-1.963.746-4.357 1.181-5.677.1-.293.184-.527.225-.633ZM5.531 6.394a.56.56 0 0 1-1.118 0v-.9a.56.56 0 0 1 1.118 0Zm3.432 4.646.02.306c.02.264.049.527.082.788l.011.05c1.154-.235 2.281-.773 2.806-1.68a.56.56 0 1 0-.968-.56c-.261.454-1.082.873-1.951 1.097zM10 6.364a.56.56 0 0 0 1.118 0v-.9a.56.56 0 0 0-1.118 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="M4.418 1.055a3.364 3.364 0 0 0-3.364 3.364v7.164a3.364 3.364 0 0 0 3.364 3.364h7.164a3.364 3.364 0 0 0 3.364-3.364V4.418a3.364 3.364 0 0 0-3.364-3.364H7.729Zm3.875 1.164h3.291a2.2 2.2 0 0 1 2.2 2.2v7.164a2.2 2.2 0 0 1-2.2 2.2h-2.15a8.884 8.884 0 0 1-.358-1.598c-.135.02-.487.082-.693.117a7.345 7.345 0 0 1-1.254 0 7.114 7.114 0 0 1-.926-.139 6.057 6.057 0 0 1-.867-.271 3.843 3.843 0 0 1-.988-.566 3.214 3.214 0 0 1-.397-.378 2.8 2.8 0 0 1-.318-.441.56.56 0 0 1 .968-.56c.083.138.188.26.312.362.096.082.2.158.307.224.12.075.243.142.371.201.285.139.583.247.89.319a5.35 5.35 0 0 0 1.282.158c.065 0 .129-.005.184-.006.056 0 .102-.005.148-.008l.096-.006c.114-.009.228-.02.31-.032.083-.013.11-.021.143-.028.099-.022.204-.058.327-.089a28.438 28.438 0 0 1-.06-1.929V8.53H6.887c.048-1.963.746-4.357 1.181-5.677.1-.293.184-.527.225-.633ZM5.531 6.394a.56.56 0 0 1-1.118 0v-.9a.56.56 0 0 1 1.118 0Zm3.432 4.646.02.306c.02.264.049.527.082.788l.011.05c1.154-.235 2.281-.773 2.806-1.68a.56.56 0 1 0-.968-.56c-.261.454-1.082.873-1.951 1.097zM10 6.364a.56.56 0 0 0 1.118 0v-.9a.56.56 0 0 0-1.118 0z"/></svg>
diff --git a/engine/platform/macos/gl_manager_macos_angle.h b/engine/platform/macos/gl_manager_macos_angle.h
index 919b8ec9..933ec164 100644
--- a/engine/platform/macos/gl_manager_macos_angle.h
+++ b/engine/platform/macos/gl_manager_macos_angle.h
@@ -28,20 +28,18 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GL_MANAGER_MACOS_ANGLE_H
-#define GL_MANAGER_MACOS_ANGLE_H
+#pragma once
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/error/error_list.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
 #include "servers/display_server.h"
 
-#include <AppKit/AppKit.h>
-#include <ApplicationServices/ApplicationServices.h>
-#include <CoreVideo/CoreVideo.h>
+#import <AppKit/AppKit.h>
+#import <ApplicationServices/ApplicationServices.h>
+#import <CoreVideo/CoreVideo.h>
 
 class GLManagerANGLE_MacOS : public EGLManager {
 private:
@@ -59,5 +57,3 @@ public:
 };
 
 #endif // MACOS_ENABLED && GLES3_ENABLED
-
-#endif // GL_MANAGER_MACOS_ANGLE_H
diff --git a/engine/platform/macos/gl_manager_macos_angle.mm b/engine/platform/macos/gl_manager_macos_angle.mm
index ac2f20ee..85b0693d 100644
--- a/engine/platform/macos/gl_manager_macos_angle.mm
+++ b/engine/platform/macos/gl_manager_macos_angle.mm
@@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "gl_manager_macos_angle.h"
+#import "gl_manager_macos_angle.h"
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <EGL/eglext_angle.h>
+#import <EGL/eglext_angle.h>
 
 const char *GLManagerANGLE_MacOS::_get_platform_extension_name() const {
 	return "EGL_ANGLE_platform_angle";
diff --git a/engine/platform/macos/gl_manager_macos_legacy.h b/engine/platform/macos/gl_manager_macos_legacy.h
index 383c5c33..0f19901d 100644
--- a/engine/platform/macos/gl_manager_macos_legacy.h
+++ b/engine/platform/macos/gl_manager_macos_legacy.h
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GL_MANAGER_MACOS_LEGACY_H
-#define GL_MANAGER_MACOS_LEGACY_H
+#pragma once
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/error/error_list.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "servers/display_server.h"
@@ -42,8 +40,7 @@
 #import <ApplicationServices/ApplicationServices.h>
 #import <CoreVideo/CoreVideo.h>
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // OpenGL is deprecated in macOS 10.14
+GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is deprecated in macOS 10.14.
 
 typedef CGLError (*CGLEnablePtr)(CGLContextObj ctx, CGLContextEnable pname);
 typedef CGLError (*CGLSetParameterPtr)(CGLContextObj ctx, CGLContextParameter pname, const GLint *params);
@@ -91,8 +88,6 @@ public:
 	~GLManagerLegacy_MacOS();
 };
 
-#pragma clang diagnostic push
+GODOT_CLANG_WARNING_PUSH
 
 #endif // MACOS_ENABLED && GLES3_ENABLED
-
-#endif // GL_MANAGER_MACOS_LEGACY_H
diff --git a/engine/platform/macos/gl_manager_macos_legacy.mm b/engine/platform/macos/gl_manager_macos_legacy.mm
index a0d03714..3f73d659 100644
--- a/engine/platform/macos/gl_manager_macos_legacy.mm
+++ b/engine/platform/macos/gl_manager_macos_legacy.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "gl_manager_macos_legacy.h"
+#import "gl_manager_macos_legacy.h"
 
 #if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
 
@@ -36,8 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // OpenGL is deprecated in macOS 10.14
+GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is deprecated in macOS 10.14.
 
 Error GLManagerLegacy_MacOS::create_context(GLWindow &win) {
 	NSOpenGLPixelFormatAttribute attributes[] = {
@@ -204,6 +203,6 @@ GLManagerLegacy_MacOS::~GLManagerLegacy_MacOS() {
 	release_current();
 }
 
-#pragma clang diagnostic pop
+GODOT_CLANG_WARNING_POP
 
 #endif // MACOS_ENABLED && GLES3_ENABLED
diff --git a/engine/platform/macos/godot_application.h b/engine/platform/macos/godot_application.h
index 8749c8fb..44db57ee 100644
--- a/engine/platform/macos/godot_application.h
+++ b/engine/platform/macos/godot_application.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_APPLICATION_H
-#define GODOT_APPLICATION_H
+#pragma once
 
 #include "core/os/os.h"
 
@@ -39,5 +38,3 @@
 
 @interface GodotApplication : NSApplication
 @end
-
-#endif // GODOT_APPLICATION_H
diff --git a/engine/platform/macos/godot_application.mm b/engine/platform/macos/godot_application.mm
index f5e1bb43..900d2ca9 100644
--- a/engine/platform/macos/godot_application.mm
+++ b/engine/platform/macos/godot_application.mm
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_application.h"
+#import "godot_application.h"
 
-#include "display_server_macos.h"
+#import "display_server_macos.h"
 
 @implementation GodotApplication
 
@@ -81,7 +81,7 @@
 		} break;
 	}
 
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
 	if (ds && keycode != Key::NONE) {
 		DisplayServerMacOS::KeyEvent ke;
 
@@ -109,7 +109,7 @@
 		[self mediaKeyEvent:keyCode state:keyState repeat:keyRepeat];
 	}
 
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
 	if (ds) {
 		if ([event type] == NSEventTypeLeftMouseDown || [event type] == NSEventTypeRightMouseDown || [event type] == NSEventTypeOtherMouseDown) {
 			if (ds->mouse_process_popups()) {
diff --git a/engine/platform/macos/godot_application_delegate.h b/engine/platform/macos/godot_application_delegate.h
index 45bd85c4..eeac3794 100644
--- a/engine/platform/macos/godot_application_delegate.h
+++ b/engine/platform/macos/godot_application_delegate.h
@@ -28,19 +28,27 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_APPLICATION_DELEGATE_H
-#define GODOT_APPLICATION_DELEGATE_H
+#pragma once
 
 #include "core/os/os.h"
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
 
-@interface GodotApplicationDelegate : NSObject <NSUserInterfaceItemSearching, NSApplicationDelegate>
+@interface GodotApplicationDelegate : NSObject <NSUserInterfaceItemSearching, NSApplicationDelegate> {
+	bool high_contrast;
+	bool reduce_motion;
+	bool reduce_transparency;
+	bool voice_over;
+}
+
 - (void)forceUnbundledWindowActivationHackStep1;
 - (void)forceUnbundledWindowActivationHackStep2;
 - (void)forceUnbundledWindowActivationHackStep3;
-- (void)handleAppleEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context;
+- (void)accessibilityDisplayOptionsChange:(NSNotification *)notification;
+- (bool)getHighContrast;
+- (bool)getReduceMotion;
+- (bool)getReduceTransparency;
+- (bool)getVoiceOver;
 @end
-
-#endif // GODOT_APPLICATION_DELEGATE_H
diff --git a/engine/platform/macos/godot_application_delegate.mm b/engine/platform/macos/godot_application_delegate.mm
index 02466bab..e7ece517 100644
--- a/engine/platform/macos/godot_application_delegate.mm
+++ b/engine/platform/macos/godot_application_delegate.mm
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_application_delegate.h"
+#import "godot_application_delegate.h"
 
-#include "display_server_macos.h"
-#include "native_menu_macos.h"
-#include "os_macos.h"
+#import "display_server_macos.h"
+#import "native_menu_macos.h"
+#import "os_macos.h"
 
 @implementation GodotApplicationDelegate
 
@@ -48,7 +48,7 @@
 - (void)searchForItemsWithSearchString:(NSString *)searchString resultLimit:(NSInteger)resultLimit matchedItemHandler:(void (^)(NSArray *items))handleMatchedItems {
 	NSMutableArray *found_items = [[NSMutableArray alloc] init];
 
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
 	if (ds && ds->_help_get_search_callback().is_valid()) {
 		Callable cb = ds->_help_get_search_callback();
 
@@ -77,7 +77,7 @@
 }
 
 - (void)performActionForItem:(id)item {
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
 	if (ds && ds->_help_get_action_callback().is_valid()) {
 		Callable cb = ds->_help_get_action_callback();
 
@@ -118,13 +118,19 @@
 }
 
 - (void)system_theme_changed:(NSNotification *)notification {
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
 	if (ds) {
 		ds->emit_system_theme_changed();
 	}
 }
 
-- (void)applicationDidFinishLaunching:(NSNotification *)notice {
+- (void)applicationDidFinishLaunching:(NSNotification *)notification {
+	static_cast<OS_MacOS *>(OS::get_singleton())->start_main();
+}
+
+- (void)activate {
+	[NSApp activateIgnoringOtherApps:YES];
+
 	NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
 	const char *bundled_id = getenv("__CFBundleIdentifier");
 	NSString *nsbundleid_env = [NSString stringWithUTF8String:(bundled_id != nullptr) ? bundled_id : ""];
@@ -137,12 +143,17 @@
 	[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(system_theme_changed:) name:@"AppleColorPreferencesChangedNotification" object:nil];
 }
 
+static const char *godot_ac_ctx = "gd_accessibility_observer_ctx";
+
 - (id)init {
 	self = [super init];
 
-	NSAppleEventManager *aem = [NSAppleEventManager sharedAppleEventManager];
-	[aem setEventHandler:self andSelector:@selector(handleAppleEvent:withReplyEvent:) forEventClass:kInternetEventClass andEventID:kAEGetURL];
-	[aem setEventHandler:self andSelector:@selector(handleAppleEvent:withReplyEvent:) forEventClass:kCoreEventClass andEventID:kAEOpenDocuments];
+	[[NSWorkspace sharedWorkspace] addObserver:self forKeyPath:@"voiceOverEnabled" options:(NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld) context:(void *)godot_ac_ctx];
+	[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(accessibilityDisplayOptionsChange:) name:NSWorkspaceAccessibilityDisplayOptionsDidChangeNotification object:nil];
+	high_contrast = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldIncreaseContrast];
+	reduce_motion = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldReduceMotion];
+	reduce_transparency = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldReduceTransparency];
+	voice_over = [[NSWorkspace sharedWorkspace] isVoiceOverEnabled];
 
 	return self;
 }
@@ -150,38 +161,78 @@
 - (void)dealloc {
 	[[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:@"AppleInterfaceThemeChangedNotification" object:nil];
 	[[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:@"AppleColorPreferencesChangedNotification" object:nil];
+	[[NSWorkspace sharedWorkspace] removeObserver:self forKeyPath:@"voiceOverEnabled" context:(void *)godot_ac_ctx];
 }
 
-- (void)handleAppleEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+	if (context == (void *)godot_ac_ctx) {
+		voice_over = [[NSWorkspace sharedWorkspace] isVoiceOverEnabled];
+	} else {
+		[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+	}
+}
+
+- (void)accessibilityDisplayOptionsChange:(NSNotification *)notification {
+	high_contrast = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldIncreaseContrast];
+	reduce_motion = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldReduceMotion];
+	reduce_transparency = [[NSWorkspace sharedWorkspace] accessibilityDisplayShouldReduceTransparency];
+}
+
+- (bool)getHighContrast {
+	return high_contrast;
+}
+
+- (bool)getReduceMotion {
+	return reduce_motion;
+}
+
+- (bool)getReduceTransparency {
+	return reduce_transparency;
+}
+
+- (bool)getVoiceOver {
+	return voice_over;
+}
+
+- (void)application:(NSApplication *)application openURLs:(NSArray<NSURL *> *)urls {
 	OS_MacOS *os = (OS_MacOS *)OS::get_singleton();
-	if (!event || !os) {
+	if (!os) {
 		return;
 	}
-
 	List<String> args;
-	if (([event eventClass] == kInternetEventClass) && ([event eventID] == kAEGetURL)) {
-		// Opening URL scheme.
-		NSString *url = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
-		args.push_back(vformat("--uri=\"%s\"", String::utf8([url UTF8String])));
-	}
-
-	if (([event eventClass] == kCoreEventClass) && ([event eventID] == kAEOpenDocuments)) {
-		// Opening file association.
-		NSAppleEventDescriptor *files = [event paramDescriptorForKeyword:keyDirectObject];
-		if (files) {
-			NSInteger count = [files numberOfItems];
-			for (NSInteger i = 1; i <= count; i++) {
-				NSURL *url = [NSURL URLWithString:[[files descriptorAtIndex:i] stringValue]];
-				args.push_back(String::utf8([url.path UTF8String]));
-			}
+	for (NSURL *url in urls) {
+		if ([url isFileURL]) {
+			args.push_back(String::utf8([url.path UTF8String]));
+		} else {
+			args.push_back(vformat("--uri=\"%s\"", String::utf8([url.absoluteString UTF8String])));
 		}
 	}
-
 	if (!args.is_empty()) {
 		if (os->get_main_loop()) {
 			// Application is already running, open a new instance with the URL/files as command line arguments.
 			os->create_instance(args);
-		} else {
+		} else if (os->get_cmd_argc() == 0) {
+			// Application is just started, add to the list of command line arguments and continue.
+			os->set_cmdline_platform_args(args);
+		}
+	}
+}
+
+- (void)application:(NSApplication *)sender openFiles:(NSArray<NSString *> *)filenames {
+	OS_MacOS *os = (OS_MacOS *)OS::get_singleton();
+	if (!os) {
+		return;
+	}
+	List<String> args;
+	for (NSString *filename in filenames) {
+		NSURL *url = [NSURL URLWithString:filename];
+		args.push_back(String::utf8([url.path UTF8String]));
+	}
+	if (!args.is_empty()) {
+		if (os->get_main_loop()) {
+			// Application is already running, open a new instance with the URL/files as command line arguments.
+			os->create_instance(args);
+		} else if (os->get_cmd_argc() == 0) {
 			// Application is just started, add to the list of command line arguments and continue.
 			os->set_cmdline_platform_args(args);
 		}
@@ -189,7 +240,7 @@
 }
 
 - (void)applicationDidResignActive:(NSNotification *)notification {
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
 	if (ds) {
 		ds->mouse_process_popups(true);
 	}
@@ -205,7 +256,7 @@
 }
 
 - (void)globalMenuCallback:(id)sender {
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
 	if (ds) {
 		return ds->menu_callback(sender);
 	}
@@ -220,11 +271,23 @@
 	}
 }
 
+- (void)applicationWillTerminate:(NSNotification *)notification {
+	OS_MacOS *os = (OS_MacOS *)OS::get_singleton();
+	if (os) {
+		os->cleanup();
+		exit(os->get_exit_code());
+	}
+}
+
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
-	if (ds) {
+	DisplayServerMacOS *ds = Object::cast_to<DisplayServerMacOS>(DisplayServer::get_singleton());
+	if (ds && ds->has_window(DisplayServerMacOS::MAIN_WINDOW_ID)) {
 		ds->send_window_event(ds->get_window(DisplayServerMacOS::MAIN_WINDOW_ID), DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
 	}
+	OS_MacOS *os = (OS_MacOS *)OS::get_singleton();
+	if (!os || os->os_should_terminate()) {
+		return NSTerminateNow;
+	}
 	return NSTerminateCancel;
 }
 
diff --git a/engine/platform/macos/godot_button_view.h b/engine/platform/macos/godot_button_view.h
index cbf13f7e..9c018e91 100644
--- a/engine/platform/macos/godot_button_view.h
+++ b/engine/platform/macos/godot_button_view.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_BUTTON_VIEW_H
-#define GODOT_BUTTON_VIEW_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -53,5 +52,3 @@
 - (NSPoint)getOffset;
 
 @end
-
-#endif // GODOT_BUTTON_VIEW_H
diff --git a/engine/platform/macos/godot_button_view.mm b/engine/platform/macos/godot_button_view.mm
index db4be044..e892fdd8 100644
--- a/engine/platform/macos/godot_button_view.mm
+++ b/engine/platform/macos/godot_button_view.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_button_view.h"
+#import "godot_button_view.h"
 
 @implementation GodotButtonView
 
diff --git a/engine/platform/macos/godot_content_view.h b/engine/platform/macos/godot_content_view.h
index dc8d11be..98ca51fb 100644
--- a/engine/platform/macos/godot_content_view.h
+++ b/engine/platform/macos/godot_content_view.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_CONTENT_VIEW_H
-#define GODOT_CONTENT_VIEW_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -55,8 +54,7 @@
 
 @end
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // OpenGL is deprecated in macOS 10.14
+GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wdeprecated-declarations") // OpenGL is deprecated in macOS 10.14.
 
 @interface GodotContentView : RootView <NSTextInputClient> {
 	DisplayServer::WindowID window_id;
@@ -79,6 +77,4 @@
 
 @end
 
-#pragma clang diagnostic pop
-
-#endif // GODOT_CONTENT_VIEW_H
+GODOT_CLANG_WARNING_POP
diff --git a/engine/platform/macos/godot_content_view.mm b/engine/platform/macos/godot_content_view.mm
index eff33208..cf965578 100644
--- a/engine/platform/macos/godot_content_view.mm
+++ b/engine/platform/macos/godot_content_view.mm
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_content_view.h"
+#import "godot_content_view.h"
 
-#include "display_server_macos.h"
-#include "key_mapping_macos.h"
+#import "display_server_macos.h"
+#import "key_mapping_macos.h"
 
 #include "main/main.h"
 
@@ -270,8 +270,7 @@
 	text.resize([characters length] + 1);
 	[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
 
-	String u32text;
-	u32text.parse_utf16(text.ptr(), text.length());
+	String u32text = String::utf16(text.ptr(), text.length());
 
 	for (int i = 0; i < u32text.length(); i++) {
 		const char32_t codepoint = u32text[i];
@@ -622,7 +621,7 @@
 		[self removeTrackingArea:tracking_area];
 	}
 
-	NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingActiveInKeyWindow | NSTrackingCursorUpdate | NSTrackingInVisibleRect;
+	NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingActiveWhenFirstResponder | NSTrackingCursorUpdate | NSTrackingInVisibleRect;
 	tracking_area = [[NSTrackingArea alloc] initWithRect:[self bounds] options:options owner:self userInfo:nil];
 
 	[self addTrackingArea:tracking_area];
@@ -652,8 +651,7 @@
 			text.resize([characters length] + 1);
 			[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
 
-			String u32text;
-			u32text.parse_utf16(text.ptr(), text.length());
+			String u32text = String::utf16(text.ptr(), text.length());
 
 			DisplayServerMacOS::KeyEvent ke;
 			ke.window_id = window_id;
diff --git a/engine/platform/macos/godot_main_macos.mm b/engine/platform/macos/godot_main_macos.mm
index eebaed0e..ba341d1b 100644
--- a/engine/platform/macos/godot_main_macos.mm
+++ b/engine/platform/macos/godot_main_macos.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "os_macos.h"
+#import "os_macos.h"
 
 #include "main/main.h"
 
@@ -59,36 +59,12 @@ int main(int argc, char **argv) {
 		}
 	}
 
-	OS_MacOS os;
-	Error err;
+	OS_MacOS os(argv[0], argc - first_arg, &argv[first_arg]);
 
 	// We must override main when testing is enabled.
 	TEST_MAIN_OVERRIDE
 
-	@autoreleasepool {
-		err = Main::setup(argv[0], argc - first_arg, &argv[first_arg]);
-	}
-
-	if (err != OK) {
-		if (err == ERR_HELP) { // Returned by --help and --version, so success.
-			return EXIT_SUCCESS;
-		}
-		return EXIT_FAILURE;
-	}
-
-	int ret;
-	@autoreleasepool {
-		ret = Main::start();
-	}
-	if (ret == EXIT_SUCCESS) {
-		os.run();
-	} else {
-		os.set_exit_code(EXIT_FAILURE);
-	}
-
-	@autoreleasepool {
-		Main::cleanup();
-	}
+	os.run(); // Note: This function will never return.
 
 	return os.get_exit_code();
 }
diff --git a/engine/platform/macos/godot_menu_delegate.h b/engine/platform/macos/godot_menu_delegate.h
index c2da3ad0..893230a4 100644
--- a/engine/platform/macos/godot_menu_delegate.h
+++ b/engine/platform/macos/godot_menu_delegate.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_MENU_DELEGATE_H
-#define GODOT_MENU_DELEGATE_H
+#pragma once
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
@@ -40,5 +39,3 @@
 - (void)doNothing:(id)sender;
 
 @end
-
-#endif // GODOT_MENU_DELEGATE_H
diff --git a/engine/platform/macos/godot_menu_delegate.mm b/engine/platform/macos/godot_menu_delegate.mm
index 16fdd0d1..86d69f79 100644
--- a/engine/platform/macos/godot_menu_delegate.mm
+++ b/engine/platform/macos/godot_menu_delegate.mm
@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_menu_delegate.h"
+#import "godot_menu_delegate.h"
 
-#include "display_server_macos.h"
-#include "godot_menu_item.h"
-#include "key_mapping_macos.h"
-#include "native_menu_macos.h"
+#import "display_server_macos.h"
+#import "godot_menu_item.h"
+#import "key_mapping_macos.h"
+#import "native_menu_macos.h"
 
 @implementation GodotMenuDelegate
 
diff --git a/engine/platform/macos/godot_menu_item.h b/engine/platform/macos/godot_menu_item.h
index e1af3172..95cc91f3 100644
--- a/engine/platform/macos/godot_menu_item.h
+++ b/engine/platform/macos/godot_menu_item.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_MENU_ITEM_H
-#define GODOT_MENU_ITEM_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -51,6 +50,7 @@ enum GlobalMenuCheckType {
 	Callable key_callback;
 	Callable hover_callback;
 	Variant meta;
+	Key accel;
 	GlobalMenuCheckType checkable_type;
 	bool checked;
 	int max_states;
@@ -59,5 +59,3 @@ enum GlobalMenuCheckType {
 }
 
 @end
-
-#endif // GODOT_MENU_ITEM_H
diff --git a/engine/platform/macos/godot_menu_item.mm b/engine/platform/macos/godot_menu_item.mm
index 47954211..49495676 100644
--- a/engine/platform/macos/godot_menu_item.mm
+++ b/engine/platform/macos/godot_menu_item.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_menu_item.h"
+#import "godot_menu_item.h"
 
 @implementation GodotMenuItem
 
@@ -41,6 +41,7 @@
 	self->checked = false;
 	self->max_states = 0;
 	self->state = 0;
+	self->accel = Key::NONE;
 
 	return self;
 }
diff --git a/engine/platform/macos/godot_open_save_delegate.h b/engine/platform/macos/godot_open_save_delegate.h
index 12349ef9..a3682b6f 100644
--- a/engine/platform/macos/godot_open_save_delegate.h
+++ b/engine/platform/macos/godot_open_save_delegate.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_OPEN_SAVE_DELEGATE_H
-#define GODOT_OPEN_SAVE_DELEGATE_H
+#pragma once
 
 #import <AppKit/AppKit.h>
 #import <Foundation/Foundation.h>
@@ -63,5 +62,3 @@
 - (void)setRootPath:(const String &)p_root_path;
 
 @end
-
-#endif // GODOT_OPEN_SAVE_DELEGATE_H
diff --git a/engine/platform/macos/godot_open_save_delegate.mm b/engine/platform/macos/godot_open_save_delegate.mm
index fa986c02..8b431b56 100644
--- a/engine/platform/macos/godot_open_save_delegate.mm
+++ b/engine/platform/macos/godot_open_save_delegate.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_open_save_delegate.h"
+#import "godot_open_save_delegate.h"
 
 @implementation GodotOpenSaveDelegate
 
@@ -124,7 +124,7 @@
 
 					NSMutableArray *type_filters = [[NSMutableArray alloc] init];
 					for (int j = 0; j < filter_slice_count; j++) {
-						String str = (flt.get_slice(",", j).strip_edges());
+						String str = (flt.get_slicec(',', j).strip_edges());
 						if (!str.is_empty()) {
 							if (@available(macOS 11, *)) {
 								UTType *ut = nullptr;
@@ -178,7 +178,7 @@
 
 				NSMutableArray *type_filters = [[NSMutableArray alloc] init];
 				for (int j = 0; j < filter_slice_count; j++) {
-					String str = (flt.get_slice(",", j).strip_edges());
+					String str = (flt.get_slicec(',', j).strip_edges());
 					if (!str.is_empty()) {
 						if (@available(macOS 11, *)) {
 							UTType *ut = nullptr;
diff --git a/engine/platform/macos/godot_status_item.h b/engine/platform/macos/godot_status_item.h
index 5bc79095..17ff950c 100644
--- a/engine/platform/macos/godot_status_item.h
+++ b/engine/platform/macos/godot_status_item.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_STATUS_ITEM_H
-#define GODOT_STATUS_ITEM_H
+#pragma once
 
 #include "core/input/input_enums.h"
 #include "core/variant/callable.h"
@@ -46,5 +45,3 @@
 - (void)setCallback:(const Callable &)callback;
 
 @end
-
-#endif // GODOT_STATUS_ITEM_H
diff --git a/engine/platform/macos/godot_status_item.mm b/engine/platform/macos/godot_status_item.mm
index 1b16d496..56acba0a 100644
--- a/engine/platform/macos/godot_status_item.mm
+++ b/engine/platform/macos/godot_status_item.mm
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_status_item.h"
+#import "godot_status_item.h"
 
-#include "display_server_macos.h"
+#import "display_server_macos.h"
 
 @implementation GodotStatusItemDelegate
 
diff --git a/engine/platform/macos/godot_window.h b/engine/platform/macos/godot_window.h
index 72aa0420..f4df9627 100644
--- a/engine/platform/macos/godot_window.h
+++ b/engine/platform/macos/godot_window.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_WINDOW_H
-#define GODOT_WINDOW_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -45,5 +44,3 @@
 - (void)setAnimDuration:(NSTimeInterval)duration;
 
 @end
-
-#endif // GODOT_WINDOW_H
diff --git a/engine/platform/macos/godot_window.mm b/engine/platform/macos/godot_window.mm
index f4516e5c..7614c283 100644
--- a/engine/platform/macos/godot_window.mm
+++ b/engine/platform/macos/godot_window.mm
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_window.h"
+#import "godot_window.h"
 
-#include "display_server_macos.h"
+#import "display_server_macos.h"
 
 @implementation GodotWindow
 
diff --git a/engine/platform/macos/godot_window_delegate.h b/engine/platform/macos/godot_window_delegate.h
index de801029..44013d9a 100644
--- a/engine/platform/macos/godot_window_delegate.h
+++ b/engine/platform/macos/godot_window_delegate.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_WINDOW_DELEGATE_H
-#define GODOT_WINDOW_DELEGATE_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -43,5 +42,3 @@
 - (void)setWindowID:(DisplayServer::WindowID)wid;
 
 @end
-
-#endif // GODOT_WINDOW_DELEGATE_H
diff --git a/engine/platform/macos/godot_window_delegate.mm b/engine/platform/macos/godot_window_delegate.mm
index 35c053dc..cc9fa0c4 100644
--- a/engine/platform/macos/godot_window_delegate.mm
+++ b/engine/platform/macos/godot_window_delegate.mm
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "godot_window_delegate.h"
+#import "godot_window_delegate.h"
 
-#include "display_server_macos.h"
-#include "godot_button_view.h"
-#include "godot_window.h"
+#import "display_server_macos.h"
+#import "godot_button_view.h"
+#import "godot_window.h"
 
 @implementation GodotWindowDelegate
 
@@ -184,10 +184,12 @@
 	}
 
 	// Restore borderless, transparent and resizability state.
-	if (wd.borderless || wd.layered_window) {
+	if (wd.borderless) {
 		[wd.window_object setStyleMask:NSWindowStyleMaskBorderless];
+		[wd.window_object setHasShadow:NO];
 	} else {
 		[wd.window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (wd.extend_to_title ? NSWindowStyleMaskFullSizeContentView : 0) | (wd.resize_disabled ? 0 : NSWindowStyleMaskResizable)];
+		[wd.window_object setHasShadow:YES];
 	}
 	if (wd.layered_window) {
 		ds->set_window_per_pixel_transparency_enabled(true, window_id);
@@ -322,6 +324,9 @@
 
 	wd.focused = true;
 	ds->set_last_focused_window(window_id);
+#ifdef ACCESSKIT_ENABLED
+	ds->accessibility_set_window_focused(window_id, true);
+#endif
 	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_IN);
 }
 
@@ -339,6 +344,9 @@
 
 	wd.focused = false;
 	ds->release_pressed_events();
+#ifdef ACCESSKIT_ENABLED
+	ds->accessibility_set_window_focused(window_id, false);
+#endif
 	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_OUT);
 }
 
@@ -352,6 +360,9 @@
 
 	wd.focused = false;
 	ds->release_pressed_events();
+#ifdef ACCESSKIT_ENABLED
+	ds->accessibility_set_window_focused(window_id, false);
+#endif
 	ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_OUT);
 }
 
@@ -366,6 +377,9 @@
 	if ([wd.window_object isKeyWindow]) {
 		wd.focused = true;
 		ds->set_last_focused_window(window_id);
+#ifdef ACCESSKIT_ENABLED
+		ds->accessibility_set_window_focused(window_id, true);
+#endif
 		ds->send_window_event(wd, DisplayServerMacOS::WINDOW_EVENT_FOCUS_IN);
 	}
 }
diff --git a/engine/platform/macos/key_mapping_macos.h b/engine/platform/macos/key_mapping_macos.h
index f5b0ff8d..2e519573 100644
--- a/engine/platform/macos/key_mapping_macos.h
+++ b/engine/platform/macos/key_mapping_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KEY_MAPPING_MACOS_H
-#define KEY_MAPPING_MACOS_H
+#pragma once
 
 #include "core/os/keyboard.h"
 
@@ -51,5 +50,3 @@ public:
 	static String keycode_get_native_string(Key p_keycode);
 	static unsigned int keycode_get_native_mask(Key p_keycode);
 };
-
-#endif // KEY_MAPPING_MACOS_H
diff --git a/engine/platform/macos/key_mapping_macos.mm b/engine/platform/macos/key_mapping_macos.mm
index b5e72048..b16dab69 100644
--- a/engine/platform/macos/key_mapping_macos.mm
+++ b/engine/platform/macos/key_mapping_macos.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "key_mapping_macos.h"
+#import "key_mapping_macos.h"
 
 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
@@ -390,7 +390,7 @@ Key KeyMappingMacOS::remap_key(unsigned int p_key, unsigned int p_state, bool p_
 			LMGetKbdType(),
 			kUCKeyTranslateNoDeadKeysBit,
 			&keys_down,
-			sizeof(chars) / sizeof(chars[0]),
+			std::size(chars),
 			&real_length,
 			chars);
 
diff --git a/engine/platform/macos/macos_terminal_logger.h b/engine/platform/macos/macos_terminal_logger.h
index 0120240c..5e3d88c4 100644
--- a/engine/platform/macos/macos_terminal_logger.h
+++ b/engine/platform/macos/macos_terminal_logger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MACOS_TERMINAL_LOGGER_H
-#define MACOS_TERMINAL_LOGGER_H
+#pragma once
 
 #ifdef MACOS_ENABLED
 
@@ -41,5 +40,3 @@ public:
 };
 
 #endif // MACOS_ENABLED
-
-#endif // MACOS_TERMINAL_LOGGER_H
diff --git a/engine/platform/macos/macos_terminal_logger.mm b/engine/platform/macos/macos_terminal_logger.mm
index 44f37dc3..cf4a40e3 100644
--- a/engine/platform/macos/macos_terminal_logger.mm
+++ b/engine/platform/macos/macos_terminal_logger.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "macos_terminal_logger.h"
+#import "macos_terminal_logger.h"
 
 #ifdef MACOS_ENABLED
 
diff --git a/engine/platform/macos/msvs.py b/engine/platform/macos/msvs.py
new file mode 100644
index 00000000..39bc3c59
--- /dev/null
+++ b/engine/platform/macos/msvs.py
@@ -0,0 +1,11 @@
+# Tuples with the name of the arch
+def get_platforms():
+    return [("arm64", "arm64"), ("x64", "x86_64")]
+
+
+def get_configurations():
+    return ["editor", "template_debug", "template_release"]
+
+
+def get_build_prefix(env):
+    return []
diff --git a/engine/platform/macos/native_menu_macos.h b/engine/platform/macos/native_menu_macos.h
index 42cf6740..f307dba0 100644
--- a/engine/platform/macos/native_menu_macos.h
+++ b/engine/platform/macos/native_menu_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NATIVE_MENU_MACOS_H
-#define NATIVE_MENU_MACOS_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 #include "core/templates/rid_owner.h"
@@ -160,5 +159,3 @@ public:
 	NativeMenuMacOS();
 	~NativeMenuMacOS();
 };
-
-#endif // NATIVE_MENU_MACOS_H
diff --git a/engine/platform/macos/native_menu_macos.mm b/engine/platform/macos/native_menu_macos.mm
index 8ec013bb..33bfb210 100644
--- a/engine/platform/macos/native_menu_macos.mm
+++ b/engine/platform/macos/native_menu_macos.mm
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "native_menu_macos.h"
+#import "native_menu_macos.h"
 
-#include "display_server_macos.h"
-#include "godot_menu_item.h"
-#include "key_mapping_macos.h"
+#import "display_server_macos.h"
+#import "godot_menu_item.h"
+#import "key_mapping_macos.h"
 
 #include "scene/resources/image_texture.h"
 
@@ -294,6 +294,9 @@ void NativeMenuMacOS::popup(const RID &p_rid, const Vector2i &p_position) {
 		position /= ds->screen_get_max_scale();
 
 		[md->menu popUpMenuPositioningItem:nil atLocation:NSMakePoint(position.x, position.y - 5) inView:nil]; // Menu vertical position doesn't include rounded corners, add `5` display pixels to better align it with Godot buttons.
+
+		ds->release_pressed_events(); // Note: context menu block main loop and consume events, pressed keys and mouse buttons should be released manually.
+		ds->sync_mouse_state();
 	}
 }
 
@@ -412,6 +415,7 @@ int NativeMenuMacOS::add_item(const RID &p_rid, const String &p_label, const Cal
 		obj->callback = p_callback;
 		obj->key_callback = p_key_callback;
 		obj->meta = p_tag;
+		obj->accel = p_accel;
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
@@ -430,6 +434,7 @@ int NativeMenuMacOS::add_check_item(const RID &p_rid, const String &p_label, con
 		obj->key_callback = p_key_callback;
 		obj->meta = p_tag;
 		obj->checkable_type = CHECKABLE_TYPE_CHECK_BOX;
+		obj->accel = p_accel;
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
@@ -447,6 +452,7 @@ int NativeMenuMacOS::add_icon_item(const RID &p_rid, const Ref<Texture2D> &p_ico
 		obj->callback = p_callback;
 		obj->key_callback = p_key_callback;
 		obj->meta = p_tag;
+		obj->accel = p_accel;
 		DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
 		if (ds && p_icon.is_valid() && p_icon->get_width() > 0 && p_icon->get_height() > 0 && p_icon->get_image().is_valid()) {
 			obj->img = p_icon->get_image();
@@ -476,6 +482,7 @@ int NativeMenuMacOS::add_icon_check_item(const RID &p_rid, const Ref<Texture2D>
 		obj->key_callback = p_key_callback;
 		obj->meta = p_tag;
 		obj->checkable_type = CHECKABLE_TYPE_CHECK_BOX;
+		obj->accel = p_accel;
 		DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
 		if (ds && p_icon.is_valid() && p_icon->get_width() > 0 && p_icon->get_height() > 0 && p_icon->get_image().is_valid()) {
 			obj->img = p_icon->get_image();
@@ -505,6 +512,7 @@ int NativeMenuMacOS::add_radio_check_item(const RID &p_rid, const String &p_labe
 		obj->key_callback = p_key_callback;
 		obj->meta = p_tag;
 		obj->checkable_type = CHECKABLE_TYPE_RADIO_BUTTON;
+		obj->accel = p_accel;
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
@@ -523,6 +531,7 @@ int NativeMenuMacOS::add_icon_radio_check_item(const RID &p_rid, const Ref<Textu
 		obj->key_callback = p_key_callback;
 		obj->meta = p_tag;
 		obj->checkable_type = CHECKABLE_TYPE_RADIO_BUTTON;
+		obj->accel = p_accel;
 		DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
 		if (ds && p_icon.is_valid() && p_icon->get_width() > 0 && p_icon->get_height() > 0 && p_icon->get_image().is_valid()) {
 			obj->img = p_icon->get_image();
@@ -553,6 +562,7 @@ int NativeMenuMacOS::add_multistate_item(const RID &p_rid, const String &p_label
 		obj->meta = p_tag;
 		obj->max_states = p_max_states;
 		obj->state = p_default_state;
+		obj->accel = p_accel;
 		[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)];
 		[menu_item setRepresentedObject:obj];
 	}
@@ -1093,6 +1103,8 @@ void NativeMenuMacOS::set_item_submenu(const RID &p_rid, int p_idx, const RID &p
 		NSMenuItem *menu_item = [md->menu itemAtIndex:p_idx];
 		if (menu_item) {
 			[md->menu setSubmenu:md_sub->menu forItem:menu_item];
+			[menu_item setAction:nil];
+			[menu_item setKeyEquivalent:@""];
 		}
 	} else {
 		int item_start = _get_system_menu_start(md->menu);
@@ -1105,7 +1117,11 @@ void NativeMenuMacOS::set_item_submenu(const RID &p_rid, int p_idx, const RID &p
 				ERR_PRINT("Can't remove open menu!");
 				return;
 			}
+			GodotMenuItem *obj = [menu_item representedObject];
+			String keycode = KeyMappingMacOS::keycode_get_native_string(obj->accel & KeyModifierMask::CODE_MASK);
 			[md->menu setSubmenu:nil forItem:menu_item];
+			[menu_item setAction:@selector(globalMenuCallback:)];
+			[menu_item setKeyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
 		}
 	}
 }
@@ -1121,12 +1137,17 @@ void NativeMenuMacOS::set_item_accelerator(const RID &p_rid, int p_idx, Key p_ke
 	ERR_FAIL_COND(p_idx >= item_start + item_count);
 	NSMenuItem *menu_item = [md->menu itemAtIndex:p_idx];
 	if (menu_item) {
-		if (p_keycode == Key::NONE) {
-			[menu_item setKeyEquivalent:@""];
-		} else {
-			[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_keycode)];
-			String keycode = KeyMappingMacOS::keycode_get_native_string(p_keycode & KeyModifierMask::CODE_MASK);
-			[menu_item setKeyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
+		GodotMenuItem *obj = [menu_item representedObject];
+		obj->accel = p_keycode;
+		NSMenu *sub_menu = [menu_item submenu];
+		if (!sub_menu) {
+			if (p_keycode == Key::NONE) {
+				[menu_item setKeyEquivalent:@""];
+			} else {
+				[menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_keycode)];
+				String keycode = KeyMappingMacOS::keycode_get_native_string(p_keycode & KeyModifierMask::CODE_MASK);
+				[menu_item setKeyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]];
+			}
 		}
 	}
 }
diff --git a/engine/platform/macos/os_macos.h b/engine/platform/macos/os_macos.h
index 334c8eab..0256147e 100644
--- a/engine/platform/macos/os_macos.h
+++ b/engine/platform/macos/os_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_MACOS_H
-#define OS_MACOS_H
+#pragma once
 
 #include "crash_handler_macos.h"
 
@@ -41,6 +40,14 @@
 #include "servers/audio_server.h"
 
 class OS_MacOS : public OS_Unix {
+	const char *execpath = nullptr;
+	int argc = 0;
+	char **argv = nullptr;
+
+	id delegate = nullptr;
+	bool should_terminate = false;
+	bool main_stared = false;
+
 	JoypadApple *joypad_apple = nullptr;
 
 #ifdef COREAUDIO_ENABLED
@@ -52,7 +59,7 @@ class OS_MacOS : public OS_Unix {
 
 	CrashHandler crash_handler;
 
-	CFRunLoopObserverRef pre_wait_observer;
+	CFRunLoopObserverRef pre_wait_observer = nil;
 
 	MainLoop *main_loop = nullptr;
 
@@ -65,6 +72,8 @@ class OS_MacOS : public OS_Unix {
 	static _FORCE_INLINE_ String get_framework_executable(const String &p_path);
 	static void pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActivity p_activiy, void *p_context);
 
+	void terminate();
+
 protected:
 	virtual void initialize_core() override;
 	virtual void initialize() override;
@@ -132,10 +141,13 @@ public:
 	virtual String get_system_ca_certificates() override;
 	virtual OS::PreferredTextureFormat get_preferred_texture_format() const override;
 
-	void run();
+	void run(); // Runs macOS native event loop.
+	void start_main(); // Initializes and runs Godot main loop.
+	void activate();
+	void cleanup();
+	bool os_should_terminate() const { return should_terminate; }
+	int get_cmd_argc() const { return argc; }
 
-	OS_MacOS();
+	OS_MacOS(const char *p_execpath, int p_argc, char **p_argv);
 	~OS_MacOS();
 };
-
-#endif // OS_MACOS_H
diff --git a/engine/platform/macos/os_macos.mm b/engine/platform/macos/os_macos.mm
index fd8156b6..7aa68a72 100644
--- a/engine/platform/macos/os_macos.mm
+++ b/engine/platform/macos/os_macos.mm
@@ -28,13 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "os_macos.h"
+#import "os_macos.h"
 
-#include "dir_access_macos.h"
-#include "display_server_macos.h"
-#include "godot_application.h"
-#include "godot_application_delegate.h"
-#include "macos_terminal_logger.h"
+#import "dir_access_macos.h"
+#import "display_server_macos.h"
+#import "godot_application.h"
+#import "godot_application_delegate.h"
+#import "macos_terminal_logger.h"
 
 #include "core/crypto/crypto_core.h"
 #include "core/version_generated.gen.h"
@@ -42,19 +42,30 @@
 
 #include <dlfcn.h>
 #include <libproc.h>
-#include <mach-o/dyld.h>
+#import <mach-o/dyld.h>
 #include <os/log.h>
 #include <sys/sysctl.h>
 
 void OS_MacOS::pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActivity p_activiy, void *p_context) {
-	// Prevent main loop from sleeping and redraw window during modal popup display.
-	// Do not redraw when rendering is done from the separate thread, it will conflict with the OpenGL context updates.
+	OS_MacOS *os = static_cast<OS_MacOS *>(OS::get_singleton());
 
-	DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
-	if (get_singleton()->get_main_loop() && ds && !get_singleton()->is_separate_thread_rendering_enabled() && !ds->get_is_resizing()) {
-		Main::force_redraw();
-		if (!Main::is_iterating()) { // Avoid cyclic loop.
-			Main::iteration();
+	@autoreleasepool {
+		@try {
+			// Get rid of pending events.
+			DisplayServer *ds = DisplayServer::get_singleton();
+			DisplayServerMacOS *ds_mac = Object::cast_to<DisplayServerMacOS>(ds);
+			if (ds_mac) {
+				ds_mac->_process_events(false);
+			} else if (ds) {
+				ds->process_events();
+			}
+			os->joypad_apple->process_joypads();
+
+			if (Main::iteration()) {
+				os->terminate();
+			}
+		} @catch (NSException *exception) {
+			ERR_PRINT("NSException: " + String::utf8([exception reason].UTF8String));
 		}
 	}
 
@@ -99,8 +110,7 @@ Vector<String> OS_MacOS::get_granted_permissions() const {
 			BOOL isStale = NO;
 			NSURL *url = [NSURL URLByResolvingBookmarkData:bookmark options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error];
 			if (!error && !isStale) {
-				String url_string;
-				url_string.parse_utf8([[url path] UTF8String]);
+				String url_string = String::utf8([[url path] UTF8String]);
 				ret.push_back(url_string);
 			}
 		}
@@ -322,7 +332,7 @@ String OS_MacOS::get_bundle_resource_dir() const {
 	NSBundle *main = [NSBundle mainBundle];
 	if (main) {
 		NSString *resource_path = [main resourcePath];
-		ret.parse_utf8([resource_path UTF8String]);
+		ret.append_utf8([resource_path UTF8String]);
 	}
 	return ret;
 }
@@ -334,7 +344,7 @@ String OS_MacOS::get_bundle_icon_path() const {
 	if (main) {
 		NSString *icon_path = [[main infoDictionary] objectForKey:@"CFBundleIconFile"];
 		if (icon_path) {
-			ret.parse_utf8([icon_path UTF8String]);
+			ret.append_utf8([icon_path UTF8String]);
 		}
 	}
 	return ret;
@@ -342,7 +352,7 @@ String OS_MacOS::get_bundle_icon_path() const {
 
 // Get properly capitalized engine name for system paths
 String OS_MacOS::get_godot_dir_name() const {
-	return String(VERSION_SHORT_NAME).capitalize();
+	return String(GODOT_VERSION_SHORT_NAME).capitalize();
 }
 
 String OS_MacOS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
@@ -377,7 +387,7 @@ String OS_MacOS::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
 	if (found) {
 		NSArray *paths = NSSearchPathForDirectoriesInDomains(id, NSUserDomainMask, YES);
 		if (paths && [paths count] >= 1) {
-			ret.parse_utf8([[paths firstObject] UTF8String]);
+			ret.append_utf8([[paths firstObject] UTF8String]);
 		}
 	}
 
@@ -421,7 +431,7 @@ Error OS_MacOS::shell_open(const String &p_uri) {
 
 String OS_MacOS::get_locale() const {
 	NSString *locale_code = [[NSLocale preferredLanguages] objectAtIndex:0];
-	return String([locale_code UTF8String]).replace("-", "_");
+	return String([locale_code UTF8String]).replace_char('-', '_');
 }
 
 Vector<String> OS_MacOS::get_system_fonts() const {
@@ -544,23 +554,26 @@ Vector<String> OS_MacOS::get_system_font_path_for_text(const String &p_font_name
 	CTFontDescriptorRef font = CTFontDescriptorCreateWithAttributes(attributes);
 	if (font) {
 		CTFontRef family = CTFontCreateWithFontDescriptor(font, 0, nullptr);
-		CFStringRef string = CFStringCreateWithCString(kCFAllocatorDefault, p_text.utf8().get_data(), kCFStringEncodingUTF8);
-		CFRange range = CFRangeMake(0, CFStringGetLength(string));
-		CTFontRef fallback_family = CTFontCreateForString(family, string, range);
-		if (fallback_family) {
-			CTFontDescriptorRef fallback_font = CTFontCopyFontDescriptor(fallback_family);
-			if (fallback_font) {
-				CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(fallback_font, kCTFontURLAttribute);
-				if (url) {
-					NSString *font_path = [NSString stringWithString:[(__bridge NSURL *)url path]];
-					ret.push_back(String::utf8([font_path UTF8String]));
-					CFRelease(url);
+		if (family) {
+			CFStringRef string = CFStringCreateWithCString(kCFAllocatorDefault, p_text.utf8().get_data(), kCFStringEncodingUTF8);
+			CFRange range = CFRangeMake(0, CFStringGetLength(string));
+			CTFontRef fallback_family = CTFontCreateForString(family, string, range);
+			if (fallback_family) {
+				CTFontDescriptorRef fallback_font = CTFontCopyFontDescriptor(fallback_family);
+				if (fallback_font) {
+					CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(fallback_font, kCTFontURLAttribute);
+					if (url) {
+						NSString *font_path = [NSString stringWithString:[(__bridge NSURL *)url path]];
+						ret.push_back(String::utf8([font_path UTF8String]));
+						CFRelease(url);
+					}
+					CFRelease(fallback_font);
 				}
-				CFRelease(fallback_font);
+				CFRelease(fallback_family);
 			}
-			CFRelease(fallback_family);
+			CFRelease(string);
+			CFRelease(family);
 		}
-		CFRelease(string);
 		CFRelease(font);
 	}
 
@@ -637,10 +650,7 @@ String OS_MacOS::get_executable_path() const {
 	if (ret <= 0) {
 		return OS::get_executable_path();
 	} else {
-		String path;
-		path.parse_utf8(pathbuf);
-
-		return path;
+		return String::utf8(pathbuf);
 	}
 }
 
@@ -710,8 +720,7 @@ Error OS_MacOS::create_instance(const List<String> &p_arguments, ProcessID *r_ch
 	// If executable is bundled, always execute editor instances as an app bundle to ensure app window is registered and activated correctly.
 	NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
 	if (nsappname != nil) {
-		String path;
-		path.parse_utf8([[[NSBundle mainBundle] bundlePath] UTF8String]);
+		String path = String::utf8([[[NSBundle mainBundle] bundlePath] UTF8String]);
 		return create_process(path, p_arguments, r_child_id, false);
 	} else {
 		return create_process(get_executable_path(), p_arguments, r_child_id, false);
@@ -745,7 +754,7 @@ String OS_MacOS::get_unique_id() const {
 		}
 
 		if (serial_number_ns_string) {
-			serial_number.parse_utf8([serial_number_ns_string UTF8String]);
+			serial_number.append_utf8([serial_number_ns_string UTF8String]);
 		}
 	}
 
@@ -806,7 +815,8 @@ String OS_MacOS::get_system_ca_certificates() {
 		Error err = CryptoCore::b64_encode(pba.ptrw(), pba.size(), &b64len, (unsigned char *)CFDataGetBytePtr(der), derlen);
 		CFRelease(der);
 		ERR_CONTINUE(err != OK);
-		certs += "-----BEGIN CERTIFICATE-----\n" + String((char *)pba.ptr(), b64len) + "\n-----END CERTIFICATE-----\n";
+		// Certificate is bas64 encoded, aka ascii.
+		certs += "-----BEGIN CERTIFICATE-----\n" + String::ascii(Span((char *)pba.ptr(), b64len)) + "\n-----END CERTIFICATE-----\n";
 	}
 	CFRelease(result);
 	return certs;
@@ -819,36 +829,73 @@ OS::PreferredTextureFormat OS_MacOS::get_preferred_texture_format() const {
 }
 
 void OS_MacOS::run() {
-	if (!main_loop) {
-		return;
-	}
-
-	@autoreleasepool {
-		main_loop->initialize();
-	}
-
-	bool quit = false;
-	while (!quit) {
-		@autoreleasepool {
-			@try {
-				if (DisplayServer::get_singleton()) {
-					DisplayServer::get_singleton()->process_events(); // Get rid of pending events.
-				}
-				joypad_apple->process_joypads();
-
-				if (Main::iteration()) {
-					quit = true;
-				}
-			} @catch (NSException *exception) {
-				ERR_PRINT("NSException: " + String::utf8([exception reason].UTF8String));
-			}
-		}
-	}
-
-	main_loop->finalize();
+	[NSApp run];
 }
 
-OS_MacOS::OS_MacOS() {
+void OS_MacOS::start_main() {
+	Error err;
+	@autoreleasepool {
+		err = Main::setup(execpath, argc, argv);
+	}
+
+	if (err == OK) {
+		main_stared = true;
+
+		int ret;
+		@autoreleasepool {
+			ret = Main::start();
+		}
+		if (ret == EXIT_SUCCESS) {
+			if (main_loop) {
+				@autoreleasepool {
+					main_loop->initialize();
+				}
+				pre_wait_observer = CFRunLoopObserverCreate(kCFAllocatorDefault, kCFRunLoopBeforeWaiting, true, 0, &pre_wait_observer_cb, nullptr);
+				CFRunLoopAddObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
+				return;
+			}
+		} else {
+			set_exit_code(EXIT_FAILURE);
+		}
+	} else if (err == ERR_HELP) { // Returned by --help and --version, so success.
+		set_exit_code(EXIT_SUCCESS);
+	} else {
+		set_exit_code(EXIT_FAILURE);
+	}
+
+	terminate();
+}
+
+void OS_MacOS::activate() {
+	[delegate activate];
+}
+
+void OS_MacOS::terminate() {
+	if (pre_wait_observer) {
+		CFRunLoopRemoveObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
+		CFRelease(pre_wait_observer);
+		pre_wait_observer = nil;
+	}
+
+	should_terminate = true;
+	[NSApp terminate:nil];
+}
+
+void OS_MacOS::cleanup() {
+	if (main_loop) {
+		main_loop->finalize();
+	}
+	if (main_stared) {
+		@autoreleasepool {
+			Main::cleanup();
+		}
+	}
+}
+
+OS_MacOS::OS_MacOS(const char *p_execpath, int p_argc, char **p_argv) {
+	execpath = p_execpath;
+	argc = p_argc;
+	argv = p_argv;
 	if (is_sandboxed()) {
 		// Load security-scoped bookmarks, request access, remove stale or invalid bookmarks.
 		NSArray *bookmarks = [[NSUserDefaults standardUserDefaults] arrayForKey:@"sec_bookmarks"];
@@ -882,7 +929,7 @@ OS_MacOS::OS_MacOS() {
 	[GodotApplication sharedApplication];
 
 	// In case we are unbundled, make us a proper UI application.
-	[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+	[NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory];
 
 	// Menu bar setup must go between sharedApplication above and
 	// finishLaunching below, in order to properly emulate the behavior
@@ -890,35 +937,13 @@ OS_MacOS::OS_MacOS() {
 
 	NSMenu *main_menu = [[NSMenu alloc] initWithTitle:@""];
 	[NSApp setMainMenu:main_menu];
-	[NSApp finishLaunching];
 
-	id delegate = [[GodotApplicationDelegate alloc] init];
+	delegate = [[GodotApplicationDelegate alloc] init];
 	ERR_FAIL_NULL(delegate);
 	[NSApp setDelegate:delegate];
 	[NSApp registerUserInterfaceItemSearchHandler:delegate];
-
-	pre_wait_observer = CFRunLoopObserverCreate(kCFAllocatorDefault, kCFRunLoopBeforeWaiting, true, 0, &pre_wait_observer_cb, nullptr);
-	CFRunLoopAddObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
-
-	// Process application:openFile: event.
-	while (true) {
-		NSEvent *event = [NSApp
-				nextEventMatchingMask:NSEventMaskAny
-							untilDate:[NSDate distantPast]
-							   inMode:NSDefaultRunLoopMode
-							  dequeue:YES];
-
-		if (event == nil) {
-			break;
-		}
-
-		[NSApp sendEvent:event];
-	}
-
-	[NSApp activateIgnoringOtherApps:YES];
 }
 
 OS_MacOS::~OS_MacOS() {
-	CFRunLoopRemoveObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
-	CFRelease(pre_wait_observer);
+	// NOP
 }
diff --git a/engine/platform/macos/platform_config.h b/engine/platform/macos/platform_config.h
index 01b0a12b..bc8b4560 100644
--- a/engine/platform/macos/platform_config.h
+++ b/engine/platform/macos/platform_config.h
@@ -28,8 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include <alloca.h>
 
+#define PLATFORM_THREAD_OVERRIDE
+
 #define PTHREAD_RENAME_SELF
 
 #define _weakify(var) __weak typeof(var) GDWeak_##var = var;
diff --git a/engine/platform/macos/platform_gl.h b/engine/platform/macos/platform_gl.h
index 3bad9d5a..4aefbc4d 100644
--- a/engine/platform/macos/platform_gl.h
+++ b/engine/platform/macos/platform_gl.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLATFORM_GL_H
-#define PLATFORM_GL_H
+#pragma once
 
 #ifndef GL_API_ENABLED
 #define GL_API_ENABLED // Allow using desktop GL.
@@ -48,5 +47,3 @@
 #include "thirdparty/glad/glad/egl.h"
 #endif
 #include "thirdparty/glad/glad/gl.h"
-
-#endif // PLATFORM_GL_H
diff --git a/engine/platform/macos/platform_thread.h b/engine/platform/macos/platform_thread.h
new file mode 100644
index 00000000..42827e53
--- /dev/null
+++ b/engine/platform/macos/platform_thread.h
@@ -0,0 +1,33 @@
+/**************************************************************************/
+/*  platform_thread.h                                                     */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "drivers/apple/thread_apple.h"
diff --git a/engine/platform/macos/rendering_context_driver_vulkan_macos.h b/engine/platform/macos/rendering_context_driver_vulkan_macos.h
index 32f8891a..a91ae353 100644
--- a/engine/platform/macos/rendering_context_driver_vulkan_macos.h
+++ b/engine/platform/macos/rendering_context_driver_vulkan_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_MACOS_H
-#define RENDERING_CONTEXT_DRIVER_VULKAN_MACOS_H
+#pragma once
 
 #ifdef VULKAN_ENABLED
 
@@ -54,5 +53,3 @@ public:
 };
 
 #endif // VULKAN_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_VULKAN_MACOS_H
diff --git a/engine/platform/macos/rendering_context_driver_vulkan_macos.mm b/engine/platform/macos/rendering_context_driver_vulkan_macos.mm
index b617cb8f..f9567152 100644
--- a/engine/platform/macos/rendering_context_driver_vulkan_macos.mm
+++ b/engine/platform/macos/rendering_context_driver_vulkan_macos.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "rendering_context_driver_vulkan_macos.h"
+#import "rendering_context_driver_vulkan_macos.h"
 
 #ifdef VULKAN_ENABLED
 
diff --git a/engine/platform/macos/tts_macos.h b/engine/platform/macos/tts_macos.h
index 35205bd1..ec10f44e 100644
--- a/engine/platform/macos/tts_macos.h
+++ b/engine/platform/macos/tts_macos.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TTS_MACOS_H
-#define TTS_MACOS_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
@@ -67,5 +66,3 @@
 - (void)speak:(const String &)text voice:(const String &)voice volume:(int)volume pitch:(float)pitch rate:(float)rate utterance_id:(int)utterance_id interrupt:(bool)interrupt;
 - (Array)getVoices;
 @end
-
-#endif // TTS_MACOS_H
diff --git a/engine/platform/macos/tts_macos.mm b/engine/platform/macos/tts_macos.mm
index 4e6744e2..47263ef4 100644
--- a/engine/platform/macos/tts_macos.mm
+++ b/engine/platform/macos/tts_macos.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tts_macos.h"
+#import "tts_macos.h"
 
 @implementation TTS_MacOS
 
diff --git a/engine/platform/register_platform_apis.h b/engine/platform/register_platform_apis.h
index bce48688..265f313c 100644
--- a/engine/platform/register_platform_apis.h
+++ b/engine/platform/register_platform_apis.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_PLATFORM_APIS_H
-#define REGISTER_PLATFORM_APIS_H
+#pragma once
 
 void register_platform_apis();
 void unregister_platform_apis();
-
-#endif // REGISTER_PLATFORM_APIS_H
diff --git a/engine/platform/web/README.md b/engine/platform/web/README.md
index 906eb508..eac2c7fe 100644
--- a/engine/platform/web/README.md
+++ b/engine/platform/web/README.md
@@ -17,6 +17,6 @@ this platform such as the html shell (web page).
 
 ## Artwork license
 
-[`logo.png`](logo.png) and [`run_icon.png`](run_icon.png) are licensed under
+[`logo.svg`](export/logo.svg) and [`run_icon.svg`](export/run_icon.svg) are licensed under
 [Creative Commons Attribution 3.0 Unported](https://www.w3.org/html/logo/faq.html#how-licenced)
 per the HTML5 logo usage guidelines.
diff --git a/engine/platform/web/SCsub b/engine/platform/web/SCsub
index be443b44..da3cd905 100644
--- a/engine/platform/web/SCsub
+++ b/engine/platform/web/SCsub
@@ -61,8 +61,12 @@ for lib in sys_env["JS_LIBS"]:
     sys_env.Append(LINKFLAGS=["--js-library", lib.abspath])
 for js in sys_env["JS_PRE"]:
     sys_env.Append(LINKFLAGS=["--pre-js", js.abspath])
+
+# Add JS externs to Closure.
+sys_env["ENV"]["EMCC_CLOSURE_ARGS"] = sys_env["ENV"].get("EMCC_CLOSURE_ARGS", "")
 for ext in sys_env["JS_EXTERNS"]:
     sys_env["ENV"]["EMCC_CLOSURE_ARGS"] += " --externs " + ext.abspath
+sys_env["ENV"]["EMCC_CLOSURE_ARGS"] = sys_env["ENV"]["EMCC_CLOSURE_ARGS"].strip()
 
 build = []
 build_targets = ["#bin/godot${PROGSUFFIX}.js", "#bin/godot${PROGSUFFIX}.wasm"]
@@ -82,7 +86,7 @@ if env["dlink_enabled"]:
     sys_env["LINKFLAGS"].remove("-fvisibility=hidden")
 
     # The main emscripten runtime, with exported standard libraries.
-    sys = sys_env.Program(build_targets, ["web_runtime.cpp"])
+    sys = sys_env.add_program(build_targets, ["web_runtime.cpp"])
 
     # The side library, containing all Godot code.
     wasm = env.add_program("#bin/godot.side${PROGSUFFIX}.wasm", web_files)
@@ -90,7 +94,7 @@ if env["dlink_enabled"]:
 else:
     # We use IDBFS. Since Emscripten 1.39.1 it needs to be linked explicitly.
     sys_env.Append(LIBS=["idbfs.js"])
-    build = sys_env.Program(build_targets, web_files + ["web_runtime.cpp"])
+    build = sys_env.add_program(build_targets, web_files + ["web_runtime.cpp"])
 
 sys_env.Depends(build[0], sys_env["JS_LIBS"])
 sys_env.Depends(build[0], sys_env["JS_PRE"])
@@ -110,7 +114,9 @@ wrap_list = [
     build[0],
     js_engine,
 ]
-js_wrapped = env.Textfile("#bin/godot", [env.File(f) for f in wrap_list], TEXTFILESUFFIX="${PROGSUFFIX}.wrapped.js")
+js_wrapped = env.NoCache(
+    env.Textfile("#bin/godot", [env.File(f) for f in wrap_list], TEXTFILESUFFIX="${PROGSUFFIX}.wrapped.js")
+)
 
 # 0 - unwrapped js file (use wrapped one instead)
 # 1 - wasm file
diff --git a/engine/platform/web/api/api.h b/engine/platform/web/api/api.h
index 234bc6b3..c440da3b 100644
--- a/engine/platform/web/api/api.h
+++ b/engine/platform/web/api/api.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEB_API_H
-#define WEB_API_H
+#pragma once
 
 void register_web_api();
 void unregister_web_api();
-
-#endif // WEB_API_H
diff --git a/engine/platform/web/api/javascript_bridge_singleton.h b/engine/platform/web/api/javascript_bridge_singleton.h
index 80544400..eb07d979 100644
--- a/engine/platform/web/api/javascript_bridge_singleton.h
+++ b/engine/platform/web/api/javascript_bridge_singleton.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JAVASCRIPT_BRIDGE_SINGLETON_H
-#define JAVASCRIPT_BRIDGE_SINGLETON_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
@@ -69,5 +68,3 @@ public:
 	JavaScriptBridge();
 	~JavaScriptBridge();
 };
-
-#endif // JAVASCRIPT_BRIDGE_SINGLETON_H
diff --git a/engine/platform/web/audio_driver_web.cpp b/engine/platform/web/audio_driver_web.cpp
index f3d5b5cd..ab1c8590 100644
--- a/engine/platform/web/audio_driver_web.cpp
+++ b/engine/platform/web/audio_driver_web.cpp
@@ -95,7 +95,7 @@ void AudioDriverWeb::_audio_driver_process(int p_from, int p_samples) {
 }
 
 void AudioDriverWeb::_audio_driver_capture(int p_from, int p_samples) {
-	if (get_input_buffer().size() == 0) {
+	if (get_input_buffer().is_empty()) {
 		return; // Input capture stopped.
 	}
 	const int max_samples = memarr_len(input_rb);
diff --git a/engine/platform/web/audio_driver_web.h b/engine/platform/web/audio_driver_web.h
index c317acff..f29c04e1 100644
--- a/engine/platform/web/audio_driver_web.h
+++ b/engine/platform/web/audio_driver_web.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_WEB_H
-#define AUDIO_DRIVER_WEB_H
+#pragma once
 
 #include "godot_audio.h"
 #include "godot_js.h"
@@ -191,5 +190,3 @@ public:
 
 	AudioDriverScriptProcessor() { singleton = this; }
 };
-
-#endif // AUDIO_DRIVER_WEB_H
diff --git a/engine/platform/web/detect.py b/engine/platform/web/detect.py
index 9b923448..27556926 100644
--- a/engine/platform/web/detect.py
+++ b/engine/platform/web/detect.py
@@ -89,7 +89,17 @@ def get_flags():
     }
 
 
+def library_emitter(target, source, env):
+    # Make every source file dependent on the compiler version.
+    # This makes sure that when emscripten is updated, that the cached files
+    # aren't used and are recompiled instead.
+    env.Depends(source, env.Value(get_compiler_version(env)))
+    return target, source
+
+
 def configure(env: "SConsEnvironment"):
+    env.Append(LIBEMITTER=[library_emitter])
+
     # Validate arch.
     supported_arches = ["wasm32"]
     validate_arch(env["arch"], get_name(), supported_arches)
@@ -120,6 +130,10 @@ def configure(env: "SConsEnvironment"):
     ## Copy env variables.
     env["ENV"] = os.environ
 
+    # This makes `wasm-ld` treat all warnings as errors.
+    if env["werror"]:
+        env.Append(LINKFLAGS=["-Wl,--fatal-warnings"])
+
     # LTO
 
     if env["lto"] == "auto":  # Enable LTO for production.
@@ -171,9 +185,6 @@ def configure(env: "SConsEnvironment"):
     # Add method for creating the final zip file
     env.AddMethod(create_template_zip, "CreateTemplateZip")
 
-    # Closure compiler extern and support for ecmascript specs (const, let, etc).
-    env["ENV"]["EMCC_CLOSURE_ARGS"] = "--language_in ECMASCRIPT_2021"
-
     env["CC"] = "emcc"
     env["CXX"] = "em++"
 
diff --git a/engine/platform/web/display_server_web.cpp b/engine/platform/web/display_server_web.cpp
index 180c05ef..8e99ee27 100644
--- a/engine/platform/web/display_server_web.cpp
+++ b/engine/platform/web/display_server_web.cpp
@@ -384,12 +384,10 @@ const char *DisplayServerWeb::godot2dom_cursor(DisplayServer::CursorShape p_shap
 }
 
 bool DisplayServerWeb::tts_is_speaking() const {
-	ERR_FAIL_COND_V_MSG(!tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
 	return godot_js_tts_is_speaking();
 }
 
 bool DisplayServerWeb::tts_is_paused() const {
-	ERR_FAIL_COND_V_MSG(!tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
 	return godot_js_tts_is_paused();
 }
 
@@ -424,13 +422,11 @@ void DisplayServerWeb::_update_voices_callback(const Vector<String> &p_voices) {
 }
 
 TypedArray<Dictionary> DisplayServerWeb::tts_get_voices() const {
-	ERR_FAIL_COND_V_MSG(!tts, TypedArray<Dictionary>(), "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
 	godot_js_tts_get_voices(update_voices_callback);
 	return voices;
 }
 
 void DisplayServerWeb::tts_speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int p_utterance_id, bool p_interrupt) {
-	ERR_FAIL_COND_MSG(!tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
 	if (p_interrupt) {
 		tts_stop();
 	}
@@ -447,17 +443,14 @@ void DisplayServerWeb::tts_speak(const String &p_text, const String &p_voice, in
 }
 
 void DisplayServerWeb::tts_pause() {
-	ERR_FAIL_COND_MSG(!tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
 	godot_js_tts_pause();
 }
 
 void DisplayServerWeb::tts_resume() {
-	ERR_FAIL_COND_MSG(!tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
 	godot_js_tts_resume();
 }
 
 void DisplayServerWeb::tts_stop() {
-	ERR_FAIL_COND_MSG(!tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
 	for (const KeyValue<int, CharString> &E : utterance_ids) {
 		tts_post_utterance_event(DisplayServer::TTS_UTTERANCE_CANCELED, E.key);
 	}
@@ -1086,7 +1079,6 @@ DisplayServer *DisplayServerWeb::create_func(const String &p_rendering_driver, W
 DisplayServerWeb::DisplayServerWeb(const String &p_rendering_driver, WindowMode p_window_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error) {
 	r_error = OK; // Always succeeds for now.
 
-	tts = GLOBAL_GET("audio/general/text_to_speech");
 	native_menu = memnew(NativeMenu); // Dummy native menu.
 
 	// Ensure the canvas ID.
@@ -1199,7 +1191,7 @@ bool DisplayServerWeb::has_feature(Feature p_feature) const {
 		case FEATURE_VIRTUAL_KEYBOARD:
 			return godot_js_display_vk_available() != 0;
 		case FEATURE_TEXT_TO_SPEECH:
-			return tts && (godot_js_display_tts_available() != 0);
+			return godot_js_display_tts_available() != 0;
 		default:
 			return false;
 	}
diff --git a/engine/platform/web/display_server_web.h b/engine/platform/web/display_server_web.h
index 2d0d13c1..c62d4eb4 100644
--- a/engine/platform/web/display_server_web.h
+++ b/engine/platform/web/display_server_web.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_WEB_H
-#define DISPLAY_SERVER_WEB_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -39,7 +38,7 @@
 #include <emscripten/html5.h>
 
 class DisplayServerWeb : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerWeb, DisplayServer);
 
 private:
 	struct JSTouchEvent {
@@ -103,7 +102,6 @@ private:
 	int key_event_pos = 0;
 
 	bool swap_cancel_ok = false;
-	bool tts = false;
 	NativeMenu *native_menu = nullptr;
 
 	MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
@@ -293,5 +291,3 @@ public:
 	DisplayServerWeb(const String &p_rendering_driver, WindowMode p_window_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Point2i *p_position, const Size2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerWeb();
 };
-
-#endif // DISPLAY_SERVER_WEB_H
diff --git a/engine/platform/web/editor/web_tools_editor_plugin.h b/engine/platform/web/editor/web_tools_editor_plugin.h
index 856e944f..b71de0b9 100644
--- a/engine/platform/web/editor/web_tools_editor_plugin.h
+++ b/engine/platform/web/editor/web_tools_editor_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEB_TOOLS_EDITOR_PLUGIN_H
-#define WEB_TOOLS_EDITOR_PLUGIN_H
+#pragma once
 
 #include "core/io/zip_io.h"
 #include "editor/plugins/editor_plugin.h"
@@ -45,12 +44,3 @@ public:
 
 	WebToolsEditorPlugin();
 };
-
-#else
-
-class WebToolsEditorPlugin {
-public:
-	static void initialize() {}
-};
-
-#endif // WEB_TOOLS_EDITOR_PLUGIN_H
diff --git a/engine/platform/web/emscripten_helpers.py b/engine/platform/web/emscripten_helpers.py
index 6a3855da..87c48ee9 100644
--- a/engine/platform/web/emscripten_helpers.py
+++ b/engine/platform/web/emscripten_helpers.py
@@ -102,12 +102,14 @@ def create_template_zip(env, js, wasm, side):
         in_files.append("#misc/dist/html/offline-export.html")
         out_files.append(zip_dir.File("godot.offline.html"))
 
-    zip_files = env.InstallAs(out_files, in_files)
-    env.Zip(
-        "#bin/godot",
-        zip_files,
-        ZIPROOT=zip_dir,
-        ZIPSUFFIX="${PROGSUFFIX}${ZIPSUFFIX}",
+    zip_files = env.NoCache(env.InstallAs(out_files, in_files))
+    env.NoCache(
+        env.Zip(
+            "#bin/godot",
+            zip_files,
+            ZIPROOT=zip_dir,
+            ZIPSUFFIX="${PROGSUFFIX}${ZIPSUFFIX}",
+        )
     )
 
 
diff --git a/engine/platform/web/export/editor_http_server.h b/engine/platform/web/export/editor_http_server.h
index 4437492b..32fbf4f5 100644
--- a/engine/platform/web/export/editor_http_server.h
+++ b/engine/platform/web/export/editor_http_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEB_EDITOR_HTTP_SERVER_H
-#define WEB_EDITOR_HTTP_SERVER_H
+#pragma once
 
 #include "core/io/image_loader.h"
 #include "core/io/stream_peer_tls.h"
@@ -70,5 +69,3 @@ public:
 	Error listen(int p_port, IPAddress p_address, bool p_use_tls, String p_tls_key, String p_tls_cert);
 	bool is_listening() const;
 };
-
-#endif // WEB_EDITOR_HTTP_SERVER_H
diff --git a/engine/platform/web/export/export.h b/engine/platform/web/export/export.h
index da02bd8d..73beb7a3 100644
--- a/engine/platform/web/export/export.h
+++ b/engine/platform/web/export/export.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEB_EXPORT_H
-#define WEB_EXPORT_H
+#pragma once
 
 void register_web_exporter_types();
 void register_web_exporter();
-
-#endif // WEB_EXPORT_H
diff --git a/engine/platform/web/export/export_plugin.cpp b/engine/platform/web/export/export_plugin.cpp
index 8929699d..6614a921 100644
--- a/engine/platform/web/export/export_plugin.cpp
+++ b/engine/platform/web/export/export_plugin.cpp
@@ -164,15 +164,15 @@ void EditorExportPlatformWeb::_fix_html(Vector<uint8_t> &p_html, const Ref<Edito
 	const String custom_head_include = p_preset->get("html/head_include");
 	HashMap<String, String> replaces;
 	replaces["$GODOT_URL"] = p_name + ".js";
-	replaces["$GODOT_PROJECT_NAME"] = GLOBAL_GET("application/config/name");
+	replaces["$GODOT_PROJECT_NAME"] = get_project_setting(p_preset, "application/config/name");
 	replaces["$GODOT_HEAD_INCLUDE"] = head_include + custom_head_include;
 	replaces["$GODOT_CONFIG"] = str_config;
-	replaces["$GODOT_SPLASH_COLOR"] = "#" + Color(GLOBAL_GET("application/boot_splash/bg_color")).to_html(false);
+	replaces["$GODOT_SPLASH_COLOR"] = "#" + Color(get_project_setting(p_preset, "application/boot_splash/bg_color")).to_html(false);
 
 	LocalVector<String> godot_splash_classes;
-	godot_splash_classes.push_back("show-image--" + String(GLOBAL_GET("application/boot_splash/show_image")));
-	godot_splash_classes.push_back("fullsize--" + String(GLOBAL_GET("application/boot_splash/fullsize")));
-	godot_splash_classes.push_back("use-filter--" + String(GLOBAL_GET("application/boot_splash/use_filter")));
+	godot_splash_classes.push_back("show-image--" + String(get_project_setting(p_preset, "application/boot_splash/show_image")));
+	godot_splash_classes.push_back("fullsize--" + String(get_project_setting(p_preset, "application/boot_splash/fullsize")));
+	godot_splash_classes.push_back("use-filter--" + String(get_project_setting(p_preset, "application/boot_splash/use_filter")));
 	replaces["$GODOT_SPLASH_CLASSES"] = String(" ").join(godot_splash_classes);
 	replaces["$GODOT_SPLASH"] = p_name + ".png";
 
@@ -185,7 +185,7 @@ void EditorExportPlatformWeb::_fix_html(Vector<uint8_t> &p_html, const Ref<Edito
 	_replace_strings(replaces, p_html);
 }
 
-Error EditorExportPlatformWeb::_add_manifest_icon(const String &p_path, const String &p_icon, int p_size, Array &r_arr) {
+Error EditorExportPlatformWeb::_add_manifest_icon(const Ref<EditorExportPreset> &p_preset, const String &p_path, const String &p_icon, int p_size, Array &r_arr) {
 	const String name = p_path.get_file().get_basename();
 	const String icon_name = vformat("%s.%dx%d.png", name, p_size, p_size);
 	const String icon_dest = p_path.get_base_dir().path_join(icon_name);
@@ -202,7 +202,7 @@ Error EditorExportPlatformWeb::_add_manifest_icon(const String &p_path, const St
 			icon->resize(p_size, p_size);
 		}
 	} else {
-		icon = _get_project_icon();
+		icon = _get_project_icon(p_preset);
 		icon->resize(p_size, p_size);
 	}
 	const Error err = icon->save_png(icon_dest);
@@ -219,7 +219,7 @@ Error EditorExportPlatformWeb::_add_manifest_icon(const String &p_path, const St
 }
 
 Error EditorExportPlatformWeb::_build_pwa(const Ref<EditorExportPreset> &p_preset, const String p_path, const Vector<SharedObject> &p_shared_objects) {
-	String proj_name = GLOBAL_GET("application/config/name");
+	String proj_name = get_project_setting(p_preset, "application/config/name");
 	if (proj_name.is_empty()) {
 		proj_name = "Godot Game";
 	}
@@ -236,10 +236,11 @@ Error EditorExportPlatformWeb::_build_pwa(const Ref<EditorExportPreset> &p_prese
 	replaces["___GODOT_ENSURE_CROSSORIGIN_ISOLATION_HEADERS___"] = ensure_crossorigin_isolation_headers ? "true" : "false";
 
 	// Files cached during worker install.
-	Array cache_files;
-	cache_files.push_back(name + ".html");
-	cache_files.push_back(name + ".js");
-	cache_files.push_back(name + ".offline.html");
+	Array cache_files = {
+		name + ".html",
+		name + ".js",
+		name + ".offline.html"
+	};
 	if (p_preset->get("html/export_icon")) {
 		cache_files.push_back(name + ".icon.png");
 		cache_files.push_back(name + ".apple-touch-icon.png");
@@ -250,9 +251,10 @@ Error EditorExportPlatformWeb::_build_pwa(const Ref<EditorExportPreset> &p_prese
 	replaces["___GODOT_CACHE___"] = Variant(cache_files).to_json_string();
 
 	// Heavy files that are cached on demand.
-	Array opt_cache_files;
-	opt_cache_files.push_back(name + ".wasm");
-	opt_cache_files.push_back(name + ".pck");
+	Array opt_cache_files = {
+		name + ".wasm",
+		name + ".pck"
+	};
 	if (extensions) {
 		opt_cache_files.push_back(name + ".side.wasm");
 		for (int i = 0; i < p_shared_objects.size(); i++) {
@@ -306,19 +308,19 @@ Error EditorExportPlatformWeb::_build_pwa(const Ref<EditorExportPreset> &p_prese
 
 	Array icons_arr;
 	const String icon144_path = p_preset->get("progressive_web_app/icon_144x144");
-	err = _add_manifest_icon(p_path, icon144_path, 144, icons_arr);
+	err = _add_manifest_icon(p_preset, p_path, icon144_path, 144, icons_arr);
 	if (err != OK) {
 		// Message is supplied by the subroutine method.
 		return err;
 	}
 	const String icon180_path = p_preset->get("progressive_web_app/icon_180x180");
-	err = _add_manifest_icon(p_path, icon180_path, 180, icons_arr);
+	err = _add_manifest_icon(p_preset, p_path, icon180_path, 180, icons_arr);
 	if (err != OK) {
 		// Message is supplied by the subroutine method.
 		return err;
 	}
 	const String icon512_path = p_preset->get("progressive_web_app/icon_512x512");
-	err = _add_manifest_icon(p_path, icon512_path, 512, icons_arr);
+	err = _add_manifest_icon(p_preset, p_path, icon512_path, 512, icons_arr);
 	if (err != OK) {
 		// Message is supplied by the subroutine method.
 		return err;
@@ -559,7 +561,7 @@ Error EditorExportPlatformWeb::export_project(const Ref<EditorExportPreset> &p_p
 	html.resize(0);
 
 	// Export splash (why?)
-	Ref<Image> splash = _get_project_splash();
+	Ref<Image> splash = _get_project_splash(p_preset);
 	const String splash_png_path = base_path + ".png";
 	if (splash->save_png(splash_png_path) != OK) {
 		add_message(EXPORT_MESSAGE_ERROR, TTR("Export"), vformat(TTR("Could not write file: \"%s\"."), splash_png_path));
@@ -569,7 +571,7 @@ Error EditorExportPlatformWeb::export_project(const Ref<EditorExportPreset> &p_p
 	// Save a favicon that can be accessed without waiting for the project to finish loading.
 	// This way, the favicon can be displayed immediately when loading the page.
 	if (export_icon) {
-		Ref<Image> favicon = _get_project_icon();
+		Ref<Image> favicon = _get_project_icon(p_preset);
 		const String favicon_png_path = base_path + ".icon.png";
 		if (favicon->save_png(favicon_png_path) != OK) {
 			add_message(EXPORT_MESSAGE_ERROR, TTR("Export"), vformat(TTR("Could not write file: \"%s\"."), favicon_png_path));
diff --git a/engine/platform/web/export/export_plugin.h b/engine/platform/web/export/export_plugin.h
index d6de8481..5e6f6fa8 100644
--- a/engine/platform/web/export/export_plugin.h
+++ b/engine/platform/web/export/export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEB_EXPORT_PLUGIN_H
-#define WEB_EXPORT_PLUGIN_H
+#pragma once
 
 #include "editor_http_server.h"
 
@@ -76,11 +75,11 @@ class EditorExportPlatformWeb : public EditorExportPlatform {
 		return name;
 	}
 
-	Ref<Image> _get_project_icon() const {
+	Ref<Image> _get_project_icon(const Ref<EditorExportPreset> &p_preset) const {
 		Error err = OK;
 		Ref<Image> icon;
 		icon.instantiate();
-		const String icon_path = String(GLOBAL_GET("application/config/icon")).strip_edges();
+		const String icon_path = String(get_project_setting(p_preset, "application/config/icon")).strip_edges();
 		if (!icon_path.is_empty()) {
 			icon = _load_icon_or_splash_image(icon_path, &err);
 		}
@@ -90,11 +89,11 @@ class EditorExportPlatformWeb : public EditorExportPlatform {
 		return icon;
 	}
 
-	Ref<Image> _get_project_splash() const {
+	Ref<Image> _get_project_splash(const Ref<EditorExportPreset> &p_preset) const {
 		Error err = OK;
 		Ref<Image> splash;
 		splash.instantiate();
-		const String splash_path = String(GLOBAL_GET("application/boot_splash/image")).strip_edges();
+		const String splash_path = String(get_project_setting(p_preset, "application/boot_splash/image")).strip_edges();
 		if (!splash_path.is_empty()) {
 			splash = _load_icon_or_splash_image(splash_path, &err);
 		}
@@ -107,7 +106,7 @@ class EditorExportPlatformWeb : public EditorExportPlatform {
 	Error _extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa);
 	void _replace_strings(const HashMap<String, String> &p_replaces, Vector<uint8_t> &r_template);
 	void _fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug, BitField<EditorExportPlatform::DebugFlags> p_flags, const Vector<SharedObject> p_shared_objects, const Dictionary &p_file_sizes);
-	Error _add_manifest_icon(const String &p_path, const String &p_icon, int p_size, Array &r_arr);
+	Error _add_manifest_icon(const Ref<EditorExportPreset> &p_preset, const String &p_path, const String &p_icon, int p_size, Array &r_arr);
 	Error _build_pwa(const Ref<EditorExportPreset> &p_preset, const String p_path, const Vector<SharedObject> &p_shared_objects);
 	Error _write_or_error(const uint8_t *p_content, int p_len, String p_path);
 
@@ -152,5 +151,3 @@ public:
 	EditorExportPlatformWeb();
 	~EditorExportPlatformWeb();
 };
-
-#endif // WEB_EXPORT_PLUGIN_H
diff --git a/engine/platform/web/export/logo.svg b/engine/platform/web/export/logo.svg
index 8d874a14..43341932 100644
--- a/engine/platform/web/export/logo.svg
+++ b/engine/platform/web/export/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#fff" d="M7 5h18v21H7z"/><path fill="#eb6428" d="M3.143 1 5.48 27.504 15.967 31l10.553-3.496L28.857 1zM23.78 9.565H11.473l.275 3.308h11.759l-.911 9.937-6.556 1.808v.02h-.073l-6.61-1.828-.402-5.076h3.195l.234 2.552 3.583.97 3.595-.97.402-4.165H8.788L7.93 6.37h16.145z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#fff" d="M7 5h18v21H7z"/><path fill="#eb6428" d="M3.143 1 5.48 27.504 15.967 31l10.553-3.496L28.857 1zM23.78 9.565H11.473l.275 3.308h11.759l-.911 9.937-6.556 1.808v.02h-.073l-6.61-1.828-.402-5.076h3.195l.234 2.552 3.583.97 3.595-.97.402-4.165H8.788L7.93 6.37h16.145z"/></svg>
diff --git a/engine/platform/web/export/run_icon.svg b/engine/platform/web/export/run_icon.svg
index 395db8e5..2f007f17 100644
--- a/engine/platform/web/export/run_icon.svg
+++ b/engine/platform/web/export/run_icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="m2 1 1.09 12.357 4.9 1.63 4.9-1.63L13.98 1zm9.622 3.994h-5.74l.129 1.541h5.482l-.424 4.634-3.057.843v.01h-.033l-3.082-.853-.187-2.367h1.489l.11 1.19 1.67.452 1.676-.453.187-1.942h-5.21l-.4-4.546h7.527z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="m2 1 1.09 12.357 4.9 1.63 4.9-1.63L13.98 1zm9.622 3.994h-5.74l.129 1.541h5.482l-.424 4.634-3.057.843v.01h-.033l-3.082-.853-.187-2.367h1.489l.11 1.19 1.67.452 1.676-.453.187-1.942h-5.21l-.4-4.546h7.527z"/></svg>
diff --git a/engine/platform/web/godot_audio.h b/engine/platform/web/godot_audio.h
index f5a2a856..603f6db3 100644
--- a/engine/platform/web/godot_audio.h
+++ b/engine/platform/web/godot_audio.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_AUDIO_H
-#define GODOT_AUDIO_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -85,5 +84,3 @@ extern void godot_audio_script_start(float *p_in_buf, int p_in_size, float *p_ou
 #ifdef __cplusplus
 }
 #endif
-
-#endif // GODOT_AUDIO_H
diff --git a/engine/platform/web/godot_js.h b/engine/platform/web/godot_js.h
index a3d2632f..2b645aa3 100644
--- a/engine/platform/web/godot_js.h
+++ b/engine/platform/web/godot_js.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_JS_H
-#define GODOT_JS_H
+#pragma once
 
 #define WASM_EXPORT __attribute__((visibility("default")))
 
@@ -136,5 +135,3 @@ extern void godot_js_display_vk_hide();
 #ifdef __cplusplus
 }
 #endif
-
-#endif // GODOT_JS_H
diff --git a/engine/platform/web/godot_midi.h b/engine/platform/web/godot_midi.h
index db8de3ec..7c792b3f 100644
--- a/engine/platform/web/godot_midi.h
+++ b/engine/platform/web/godot_midi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_MIDI_H
-#define GODOT_MIDI_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,5 +46,3 @@ extern void godot_js_webmidi_close_midi_inputs();
 #ifdef __cplusplus
 }
 #endif
-
-#endif // GODOT_MIDI_H
diff --git a/engine/platform/web/godot_webgl2.h b/engine/platform/web/godot_webgl2.h
index 2c9af431..55bde3f6 100644
--- a/engine/platform/web/godot_webgl2.h
+++ b/engine/platform/web/godot_webgl2.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GODOT_WEBGL2_H
-#define GODOT_WEBGL2_H
+#pragma once
 
 #include <GLES3/gl3.h>
 #include <webgl/webgl2.h>
@@ -53,5 +52,3 @@ void godot_webgl2_glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr
 #ifdef __cplusplus
 }
 #endif
-
-#endif // GODOT_WEBGL2_H
diff --git a/engine/platform/web/http_client_web.cpp b/engine/platform/web/http_client_web.cpp
index 80257dc2..c481ef55 100644
--- a/engine/platform/web/http_client_web.cpp
+++ b/engine/platform/web/http_client_web.cpp
@@ -49,11 +49,11 @@ Error HTTPClientWeb::connect_to_host(const String &p_host, int p_port, Ref<TLSOp
 
 	String host_lower = host.to_lower();
 	if (host_lower.begins_with("http://")) {
-		host = host.substr(7, host.length() - 7);
+		host = host.substr(7);
 		use_tls = false;
 	} else if (host_lower.begins_with("https://")) {
 		use_tls = true;
-		host = host.substr(8, host.length() - 8);
+		host = host.substr(8);
 	}
 
 	ERR_FAIL_COND_V(host.length() < HOST_MIN_LEN, ERR_INVALID_PARAMETER);
diff --git a/engine/platform/web/http_client_web.h b/engine/platform/web/http_client_web.h
index f696c5a5..d95d0092 100644
--- a/engine/platform/web/http_client_web.h
+++ b/engine/platform/web/http_client_web.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HTTP_CLIENT_WEB_H
-#define HTTP_CLIENT_WEB_H
+#pragma once
 
 #include "core/io/http_client.h"
 
@@ -104,5 +103,3 @@ public:
 	HTTPClientWeb();
 	~HTTPClientWeb();
 };
-
-#endif // HTTP_CLIENT_WEB_H
diff --git a/engine/platform/web/ip_web.h b/engine/platform/web/ip_web.h
index 2f231cc6..b102bbf0 100644
--- a/engine/platform/web/ip_web.h
+++ b/engine/platform/web/ip_web.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IP_WEB_H
-#define IP_WEB_H
+#pragma once
 
 #include "core/io/ip.h"
 
@@ -47,5 +46,3 @@ public:
 	static void make_default();
 	IPWeb();
 };
-
-#endif // IP_WEB_H
diff --git a/engine/platform/web/javascript_bridge_singleton.cpp b/engine/platform/web/javascript_bridge_singleton.cpp
index 869c2e99..d41fd64a 100644
--- a/engine/platform/web/javascript_bridge_singleton.cpp
+++ b/engine/platform/web/javascript_bridge_singleton.cpp
@@ -64,6 +64,8 @@ extern int godot_js_wrapper_object_transfer_buffer(int p_id, void *p_byte_arr, v
 };
 
 class JavaScriptObjectImpl : public JavaScriptObject {
+	GDSOFTCLASS(JavaScriptObjectImpl, JavaScriptObject);
+
 private:
 	friend class JavaScriptBridge;
 
diff --git a/engine/platform/web/net_socket_web.h b/engine/platform/web/net_socket_web.h
index 8a785cf6..03aa57bb 100644
--- a/engine/platform/web/net_socket_web.h
+++ b/engine/platform/web/net_socket_web.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NET_SOCKET_WEB_H
-#define NET_SOCKET_WEB_H
+#pragma once
 
 #include "core/io/net_socket.h"
 
@@ -68,5 +67,3 @@ public:
 
 	NetSocketWeb() {}
 };
-
-#endif // NET_SOCKET_WEB_H
diff --git a/engine/platform/web/os_web.cpp b/engine/platform/web/os_web.cpp
index ce7c4a4c..f3462e89 100644
--- a/engine/platform/web/os_web.cpp
+++ b/engine/platform/web/os_web.cpp
@@ -184,7 +184,7 @@ void OS_Web::vibrate_handheld(int p_duration_ms, float p_amplitude) {
 
 String OS_Web::get_user_data_dir(const String &p_user_dir) const {
 	String userfs = "/userfs";
-	return userfs.path_join(p_user_dir).replace("\\", "/");
+	return userfs.path_join(p_user_dir).replace_char('\\', '/');
 }
 
 String OS_Web::get_cache_path() const {
diff --git a/engine/platform/web/os_web.h b/engine/platform/web/os_web.h
index 786f7fe9..e29301f1 100644
--- a/engine/platform/web/os_web.h
+++ b/engine/platform/web/os_web.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_WEB_H
-#define OS_WEB_H
+#pragma once
 
 #include "audio_driver_web.h"
 #include "webmidi_driver.h"
@@ -119,5 +118,3 @@ public:
 
 	OS_Web();
 };
-
-#endif // OS_WEB_H
diff --git a/engine/platform/web/platform_config.h b/engine/platform/web/platform_config.h
index c3189bcc..90a67f01 100644
--- a/engine/platform/web/platform_config.h
+++ b/engine/platform/web/platform_config.h
@@ -28,4 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include <alloca.h>
diff --git a/engine/platform/web/platform_gl.h b/engine/platform/web/platform_gl.h
index 8aadab81..20ac8c55 100644
--- a/engine/platform/web/platform_gl.h
+++ b/engine/platform/web/platform_gl.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLATFORM_GL_H
-#define PLATFORM_GL_H
+#pragma once
 
 #ifndef GLES_API_ENABLED
 #define GLES_API_ENABLED // Allow using GLES.
@@ -40,5 +39,3 @@
 #define eglGetProcAddress(n) static_assert(false, "Usage of eglGetProcessAddress() on the web is a bug.")
 
 #include "platform/web/godot_webgl2.h"
-
-#endif // PLATFORM_GL_H
diff --git a/engine/platform/web/webmidi_driver.h b/engine/platform/web/webmidi_driver.h
index 00c7df1a..57944bf3 100644
--- a/engine/platform/web/webmidi_driver.h
+++ b/engine/platform/web/webmidi_driver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEBMIDI_DRIVER_H
-#define WEBMIDI_DRIVER_H
+#pragma once
 
 #include "core/os/midi_driver.h"
 
@@ -57,5 +56,3 @@ public:
 	WASM_EXPORT static void on_midi_message(int p_device_index, int p_status, const uint8_t *p_data, int p_data_len);
 	static void _on_midi_message(int p_device_index, int p_status, const PackedByteArray &p_data, int p_data_len);
 };
-
-#endif // WEBMIDI_DRIVER_H
diff --git a/engine/platform/windows/SCsub b/engine/platform/windows/SCsub
index 1ddefb9c..45487118 100644
--- a/engine/platform/windows/SCsub
+++ b/engine/platform/windows/SCsub
@@ -8,6 +8,8 @@ from pathlib import Path
 
 import platform_windows_builders
 
+from methods import redirect_emitter
+
 sources = []
 
 common_win = [
@@ -49,6 +51,7 @@ def arrange_program_clean(prog):
         Clean(prog, extra_files_to_clean)
 
 
+env["BUILDERS"]["RES"].emitter = redirect_emitter
 res_file = "godot_res.rc"
 res_target = "godot_res" + env["OBJSUFFIX"]
 res_obj = env.RES(res_target, res_file)
@@ -57,6 +60,12 @@ env.Depends(res_obj, "#core/version_generated.gen.h")
 env.add_source_files(sources, common_win)
 sources += res_obj
 
+if env["accesskit"] and not env.msvc:
+    def_file = "uiautomationcore." + env["arch"] + ".def"
+    def_target = "libuiautomationcore." + env["arch"] + ".a"
+    def_obj = env.DEF(def_target, def_file)
+    sources += def_obj
+
 prog = env.add_program("#bin/godot", sources, PROGSUFFIX=env["PROGSUFFIX"])
 arrange_program_clean(prog)
 
@@ -109,7 +118,7 @@ if env["d3d12"]:
         # Whether these are loaded from arch-specific directory or not has to be known at build time.
         target_dir = arch_bin_dir if env["agility_sdk_multiarch"] else "#bin"
         for dll in agility_dlls:
-            env.Command(
+            env.CommandNoCache(
                 target_dir + "/" + dll,
                 env["agility_sdk_path"] + "/build/native/bin/" + agility_arch_subdir + "/" + dll,
                 Copy("$TARGET", "$SOURCE"),
@@ -118,13 +127,13 @@ if env["d3d12"]:
     # PIX
     if env["use_pix"]:
         pix_dll = "WinPixEventRuntime.dll"
-        env.Command(
+        env.CommandNoCache(
             "#bin/" + pix_dll,
             env["pix_path"] + "/bin/" + dxc_arch_subdir + "/" + pix_dll,
             Copy("$TARGET", "$SOURCE"),
         )
 
-if not os.getenv("VCINSTALLDIR"):
+if not env.msvc:
     if env["debug_symbols"]:
         env.AddPostAction(prog, env.Run(platform_windows_builders.make_debug_mingw))
         if env["windows_subsystem"] == "gui":
diff --git a/engine/platform/windows/crash_handler_windows.h b/engine/platform/windows/crash_handler_windows.h
index f47d9ec6..358d0ce3 100644
--- a/engine/platform/windows/crash_handler_windows.h
+++ b/engine/platform/windows/crash_handler_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CRASH_HANDLER_WINDOWS_H
-#define CRASH_HANDLER_WINDOWS_H
+#pragma once
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -56,5 +55,3 @@ public:
 	CrashHandler();
 	~CrashHandler();
 };
-
-#endif // CRASH_HANDLER_WINDOWS_H
diff --git a/engine/platform/windows/crash_handler_windows_seh.cpp b/engine/platform/windows/crash_handler_windows_seh.cpp
index b760440a..288354ee 100644
--- a/engine/platform/windows/crash_handler_windows_seh.cpp
+++ b/engine/platform/windows/crash_handler_windows_seh.cpp
@@ -147,10 +147,10 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {
 	print_error(vformat("%s: Program crashed", __FUNCTION__));
 
 	// Print the engine version just before, so that people are reminded to include the version in backtrace reports.
-	if (String(VERSION_HASH).is_empty()) {
-		print_error(vformat("Engine version: %s", VERSION_FULL_NAME));
+	if (String(GODOT_VERSION_HASH).is_empty()) {
+		print_error(vformat("Engine version: %s", GODOT_VERSION_FULL_NAME));
 	} else {
-		print_error(vformat("Engine version: %s (%s)", VERSION_FULL_NAME, VERSION_HASH));
+		print_error(vformat("Engine version: %s (%s)", GODOT_VERSION_FULL_NAME, GODOT_VERSION_HASH));
 	}
 	print_error(vformat("Dumping the backtrace. %s", msg));
 
diff --git a/engine/platform/windows/crash_handler_windows_signal.cpp b/engine/platform/windows/crash_handler_windows_signal.cpp
index e26cd780..663848d0 100644
--- a/engine/platform/windows/crash_handler_windows_signal.cpp
+++ b/engine/platform/windows/crash_handler_windows_signal.cpp
@@ -153,10 +153,10 @@ extern void CrashHandlerException(int signal) {
 	print_error(vformat("%s: Program crashed with signal %d", __FUNCTION__, signal));
 
 	// Print the engine version just before, so that people are reminded to include the version in backtrace reports.
-	if (String(VERSION_HASH).is_empty()) {
-		print_error(vformat("Engine version: %s", VERSION_FULL_NAME));
+	if (String(GODOT_VERSION_HASH).is_empty()) {
+		print_error(vformat("Engine version: %s", GODOT_VERSION_FULL_NAME));
 	} else {
-		print_error(vformat("Engine version: %s (%s)", VERSION_FULL_NAME, VERSION_HASH));
+		print_error(vformat("Engine version: %s (%s)", GODOT_VERSION_FULL_NAME, GODOT_VERSION_HASH));
 	}
 	print_error(vformat("Dumping the backtrace. %s", msg));
 
@@ -172,7 +172,7 @@ extern void CrashHandlerException(int signal) {
 	if (FileAccess::exists(_execpath + ".debugsymbols")) {
 		_execpath = _execpath + ".debugsymbols";
 	}
-	_execpath = _execpath.replace("/", "\\");
+	_execpath = _execpath.replace_char('/', '\\');
 
 	CharString cs = _execpath.utf8(); // Note: should remain in scope during backtrace_simple call.
 	data.state = backtrace_create_state(cs.get_data(), 0, &error_callback, reinterpret_cast<void *>(&data));
diff --git a/engine/platform/windows/detect.py b/engine/platform/windows/detect.py
index bbdcb9e7..49f0496a 100644
--- a/engine/platform/windows/detect.py
+++ b/engine/platform/windows/detect.py
@@ -5,7 +5,7 @@ import sys
 from typing import TYPE_CHECKING
 
 import methods
-from methods import print_error, print_warning
+from methods import print_error, print_info, print_warning
 from platform_methods import detect_arch, validate_arch
 
 if TYPE_CHECKING:
@@ -47,14 +47,6 @@ def try_cmd(test, prefix, arch, check_clang=False):
 def can_build():
     if os.name == "nt":
         # Building natively on Windows
-        # If VCINSTALLDIR is set in the OS environ, use traditional Godot logic to set up MSVC
-        if os.getenv("VCINSTALLDIR"):  # MSVC, manual setup
-            return True
-
-        # Otherwise, let SCons find MSVC if installed, or else MinGW.
-        # Since we're just returning True here, if there's no compiler
-        # installed, we'll get errors when it tries to build with the
-        # null compiler.
         return True
 
     if os.name == "posix":
@@ -156,10 +148,15 @@ def detect_build_env_arch():
 
 
 def get_tools(env: "SConsEnvironment"):
-    if os.name != "nt" or env["use_mingw"]:
+    from SCons.Tool.MSCommon import msvc_exists
+
+    if os.name != "nt" or env.get("use_mingw") or not msvc_exists():
         return ["mingw"]
     else:
-        return ["default"]
+        msvc_arch_aliases = {"x86_32": "x86", "arm32": "arm"}
+        env["TARGET_ARCH"] = msvc_arch_aliases.get(env["arch"], env["arch"])
+        env["MSVC_VERSION"] = env["MSVS_VERSION"] = env.get("msvc_version")
+        return ["msvc", "mslink", "mslib"]
 
 
 def get_opts():
@@ -194,11 +191,7 @@ def get_opts():
             "0x0601",
         ),
         EnumVariable("windows_subsystem", "Windows subsystem", "gui", ("gui", "console")),
-        (
-            "msvc_version",
-            "MSVC version to use. Ignored if VCINSTALLDIR is set in shell env.",
-            None,
-        ),
+        ("msvc_version", "MSVC version to use. Handled automatically by SCons if omitted.", ""),
         BoolVariable("use_mingw", "Use the Mingw compiler, even if MSVC is installed.", False),
         BoolVariable("use_llvm", "Use the LLVM compiler", False),
         BoolVariable("use_static_cpp", "Link MinGW/MSVC C++ runtime libraries statically", True),
@@ -252,91 +245,45 @@ def get_flags():
     }
 
 
-def setup_msvc_manual(env: "SConsEnvironment"):
-    """Running from VCVARS environment"""
+def build_def_file(target, source, env: "SConsEnvironment"):
+    arch_aliases = {
+        "x86_32": "i386",
+        "x86_64": "i386:x86-64",
+        "arm32": "arm",
+        "arm64": "arm64",
+    }
 
-    env_arch = detect_build_env_arch()
-    if env["arch"] != env_arch:
-        print_error(
-            "Arch argument (%s) is not matching Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings) that is being used to run SCons (%s).\n"
-            "Run SCons again without arch argument (example: scons p=windows) and SCons will attempt to detect what MSVC compiler will be executed and inform you."
-            % (env["arch"], env_arch)
-        )
-        sys.exit(255)
+    cmdbase = "dlltool -m " + arch_aliases[env["arch"]]
+    if env["arch"] != "x86_32":
+        cmdbase += " --no-leading-underscore"
 
-    print("Using VCVARS-determined MSVC, arch %s" % (env_arch))
+    mingw_bin_prefix = get_mingw_bin_prefix(env["mingw_prefix"], env["arch"])
+
+    for x in range(len(source)):
+        ok = True
+        # Try prefixed executable (MinGW on Linux).
+        cmd = mingw_bin_prefix + cmdbase + " -d " + str(source[x]) + " -l " + str(target[x])
+        try:
+            out = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE).communicate()
+            if len(out[1]):
+                ok = False
+        except Exception:
+            ok = False
+
+        # Try generic executable (MSYS2).
+        if not ok:
+            cmd = cmdbase + " -d " + str(source[x]) + " -l " + str(target[x])
+            try:
+                out = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE).communicate()
+                if len(out[1]):
+                    return -1
+            except Exception:
+                return -1
+
+    return 0
 
 
-def setup_msvc_auto(env: "SConsEnvironment"):
-    """Set up MSVC using SCons's auto-detection logic"""
-
-    # If MSVC_VERSION is set by SCons, we know MSVC is installed.
-    # But we may want a different version or target arch.
-
-    # Valid architectures for MSVC's TARGET_ARCH:
-    # ['amd64', 'emt64', 'i386', 'i486', 'i586', 'i686', 'ia64', 'itanium', 'x86', 'x86_64', 'arm', 'arm64', 'aarch64']
-    # Our x86_64 and arm64 are the same, and we need to map the 32-bit
-    # architectures to other names since MSVC isn't as explicit.
-    # The rest we don't need to worry about because they are
-    # aliases or aren't supported by Godot (itanium & ia64).
-    msvc_arch_aliases = {"x86_32": "x86", "arm32": "arm"}
-    if env["arch"] in msvc_arch_aliases.keys():
-        env["TARGET_ARCH"] = msvc_arch_aliases[env["arch"]]
-    else:
-        env["TARGET_ARCH"] = env["arch"]
-
-    # The env may have already been set up with default MSVC tools, so
-    # reset a few things so we can set it up with the tools we want.
-    # (Ideally we'd decide on the tool config before configuring any
-    # environment, and just set the env up once, but this function runs
-    # on an existing env so this is the simplest way.)
-    env["MSVC_SETUP_RUN"] = False  # Need to set this to re-run the tool
-    env["MSVS_VERSION"] = None
-    env["MSVC_VERSION"] = None
-
-    if "msvc_version" in env:
-        env["MSVC_VERSION"] = env["msvc_version"]
-    env.Tool("msvc")
-    env.Tool("mssdk")  # we want the MS SDK
-
-    # Re-add potentially overwritten flags.
-    env.AppendUnique(CCFLAGS=env.get("ccflags", "").split())
-    env.AppendUnique(CXXFLAGS=env.get("cxxflags", "").split())
-    env.AppendUnique(CFLAGS=env.get("cflags", "").split())
-    env.AppendUnique(RCFLAGS=env.get("rcflags", "").split())
-
-    # Note: actual compiler version can be found in env['MSVC_VERSION'], e.g. "14.1" for VS2015
-    print("Using SCons-detected MSVC version %s, arch %s" % (env["MSVC_VERSION"], env["arch"]))
-
-
-def setup_mingw(env: "SConsEnvironment"):
-    """Set up env for use with mingw"""
-
-    env_arch = detect_build_env_arch()
-    if os.getenv("MSYSTEM") == "MSYS":
-        print_error(
-            "Running from base MSYS2 console/environment, use target specific environment instead (e.g., mingw32, mingw64, clang32, clang64)."
-        )
-        sys.exit(255)
-
-    if env_arch != "" and env["arch"] != env_arch:
-        print_error(
-            "Arch argument (%s) is not matching MSYS2 console/environment that is being used to run SCons (%s).\n"
-            "Run SCons again without arch argument (example: scons p=windows) and SCons will attempt to detect what MSYS2 compiler will be executed and inform you."
-            % (env["arch"], env_arch)
-        )
-        sys.exit(255)
-
-    if not try_cmd("gcc --version", env["mingw_prefix"], env["arch"]) and not try_cmd(
-        "clang --version", env["mingw_prefix"], env["arch"]
-    ):
-        print_error("No valid compilers found, use MINGW_PREFIX environment variable to set MinGW path.")
-        sys.exit(255)
-
-    print("Using MinGW, arch %s" % (env["arch"]))
-
-
-def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
+def configure_msvc(env: "SConsEnvironment"):
     """Configure env to work with MSVC"""
 
     ## Build type
@@ -371,7 +318,7 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
         from tempfile import mkstemp
 
         # Ensure we have a location to write captured output to, in case of false positives.
-        capture_path = methods.base_folder_path + "platform/windows/msvc_capture.log"
+        capture_path = methods.base_folder / "platform" / "windows" / "msvc_capture.log"
         with open(capture_path, "wt", encoding="utf-8"):
             pass
 
@@ -454,14 +401,13 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
     # for notes on why this shouldn't be enabled for gcc
     env.AppendUnique(CCFLAGS=["/bigobj"])
 
-    if vcvars_msvc_config:  # should be automatic if SCons found it
-        if os.getenv("WindowsSdkDir") is not None:
-            env.Prepend(CPPPATH=[str(os.getenv("WindowsSdkDir")) + "/Include"])
-        else:
-            print_warning("Missing environment variable: WindowsSdkDir")
-
     validate_win_version(env)
 
+    if env["accesskit"]:
+        if int(env["target_win_version"], 16) < 0x0602:
+            print_info("AcceeKit enabled, targeted Windows version changed to Windows 8 (0x602).")
+            env["target_win_version"] = "0x0602"  # Accessibility API require Windows 8+
+
     env.AppendUnique(
         CPPDEFINES=[
             "WINDOWS_ENABLED",
@@ -518,6 +464,29 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
     if env.debug_features:
         LIBS += ["psapi", "dbghelp"]
 
+    if env["accesskit"]:
+        if env["accesskit_sdk_path"] != "":
+            env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
+            if env["arch"] == "arm64":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/arm64/msvc/static"])
+            elif env["arch"] == "x86_64":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86_64/msvc/static"])
+            elif env["arch"] == "x86_32":
+                env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86/msvc/static"])
+            LIBS += [
+                "accesskit",
+                "uiautomationcore",
+                "runtimeobject",
+                "propsys",
+                "oleaut32",
+                "user32",
+                "userenv",
+                "ntdll",
+            ]
+        else:
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
+
     if env["vulkan"]:
         env.AppendUnique(CPPDEFINES=["VULKAN_ENABLED", "RD_ENABLED"])
         if not env["use_volk"]:
@@ -558,7 +527,7 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
                 "libGLES.windows." + env["arch"] + prebuilt_lib_extra_suffix,
             ]
             LIBS += ["dxgi", "d3d9", "d3d11"]
-        env.Prepend(CPPPATH=["#thirdparty/angle/include"])
+        env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
 
     if env["target"] in ["editor", "template_debug"]:
         LIBS += ["psapi", "dbghelp"]
@@ -568,12 +537,6 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
 
     env.Append(LINKFLAGS=[p + env["LIBSUFFIX"] for p in LIBS])
 
-    if vcvars_msvc_config:
-        if os.getenv("WindowsSdkDir") is not None:
-            env.Append(LIBPATH=[str(os.getenv("WindowsSdkDir")) + "/Lib"])
-        else:
-            print_warning("Missing environment variable: WindowsSdkDir")
-
     ## LTO
 
     if env["lto"] == "auto":  # No LTO by default for MSVC, doesn't help.
@@ -596,14 +559,6 @@ def configure_msvc(env: "SConsEnvironment", vcvars_msvc_config):
             env.AppendUnique(LINKFLAGS=["/LTCG"])
         env.AppendUnique(ARFLAGS=["/LTCG"])
 
-    if vcvars_msvc_config:
-        env.Prepend(CPPPATH=[p for p in str(os.getenv("INCLUDE")).split(";")])
-        env.Append(LIBPATH=[p for p in str(os.getenv("LIB")).split(";")])
-
-    # Incremental linking fix
-    env["BUILDERS"]["ProgramOriginal"] = env["BUILDERS"]["Program"]
-    env["BUILDERS"]["Program"] = methods.precious_program
-
     env.Append(LINKFLAGS=["/NATVIS:platform\\windows\\godot.natvis"])
 
     if env["use_asan"]:
@@ -679,6 +634,25 @@ def tempfile_arg_esc_func(arg):
 
 
 def configure_mingw(env: "SConsEnvironment"):
+    if os.getenv("MSYSTEM") == "MSYS":
+        print_error(
+            "Running from base MSYS2 console/environment, use target specific environment instead (e.g., mingw32, mingw64, clang32, clang64)."
+        )
+        sys.exit(255)
+
+    if (env_arch := detect_build_env_arch()) and env["arch"] != env_arch:
+        print_error(
+            f"Arch argument ({env['arch']}) is not matching MSYS2 console/environment that is being used to run SCons ({env_arch}).\n"
+            "Run SCons again without arch argument (example: scons p=windows) and SCons will attempt to detect what MSYS2 compiler will be executed and inform you."
+        )
+        sys.exit(255)
+
+    if not try_cmd("gcc --version", env["mingw_prefix"], env["arch"]) and not try_cmd(
+        "clang --version", env["mingw_prefix"], env["arch"]
+    ):
+        print_error("No valid compilers found, use MINGW_PREFIX environment variable to set MinGW path.")
+        sys.exit(255)
+
     # Workaround for MinGW. See:
     # https://www.scons.org/wiki/LongCmdLinesOnWin32
     env.use_windows_spawn_fix()
@@ -795,6 +769,11 @@ def configure_mingw(env: "SConsEnvironment"):
 
     validate_win_version(env)
 
+    if env["accesskit"]:
+        if int(env["target_win_version"], 16) < 0x0602:
+            print_info("AcceeKit enabled, targeted Windows version changed to Windows 8 (0x602).")
+            env["target_win_version"] = "0x0602"  # Accessibility API require Windows 8+
+
     if not env["use_llvm"]:
         env.Append(CCFLAGS=["-mwindows"])
 
@@ -859,6 +838,38 @@ def configure_mingw(env: "SConsEnvironment"):
         ]
     )
 
+    if env["accesskit"]:
+        if env["accesskit_sdk_path"] != "":
+            env.Prepend(CPPPATH=[env["accesskit_sdk_path"] + "/include"])
+            if env["use_llvm"]:
+                if env["arch"] == "arm64":
+                    env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/arm64/mingw-llvm/static/"])
+                elif env["arch"] == "x86_64":
+                    env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86_64/mingw-llvm/static/"])
+                elif env["arch"] == "x86_32":
+                    env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86/mingw-llvm/static/"])
+            else:
+                if env["arch"] == "x86_64":
+                    env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86_64/mingw/static/"])
+                elif env["arch"] == "x86_32":
+                    env.Append(LIBPATH=[env["accesskit_sdk_path"] + "/lib/windows/x86/mingw/static/"])
+            env.Append(
+                LIBS=[
+                    "accesskit",
+                    "uiautomationcore." + env["arch"],
+                    "runtimeobject",
+                    "propsys",
+                    "oleaut32",
+                    "user32",
+                    "userenv",
+                    "ntdll",
+                ]
+            )
+        else:
+            env.Append(CPPDEFINES=["ACCESSKIT_DYNAMIC"])
+        env.Append(LIBPATH=["#platform/windows"])
+        env.Append(CPPDEFINES=["ACCESSKIT_ENABLED"])
+
     if env.debug_features:
         env.Append(LIBS=["psapi", "dbghelp"])
 
@@ -900,10 +911,13 @@ def configure_mingw(env: "SConsEnvironment"):
                 ]
             )
             env.Append(LIBS=["dxgi", "d3d9", "d3d11"])
-        env.Prepend(CPPPATH=["#thirdparty/angle/include"])
+        env.Prepend(CPPEXTPATH=["#thirdparty/angle/include"])
 
     env.Append(CPPDEFINES=["MINGW_ENABLED", ("MINGW_HAS_SECURE_API", 1)])
 
+    # dlltool
+    env.Append(BUILDERS={"DEF": env.Builder(action=build_def_file, suffix=".a", src_suffix=".def")})
+
 
 def configure(env: "SConsEnvironment"):
     # Validate arch.
@@ -913,28 +927,10 @@ def configure(env: "SConsEnvironment"):
     # At this point the env has been set up with basic tools/compilers.
     env.Prepend(CPPPATH=["#platform/windows"])
 
-    if os.name == "nt":
-        env["ENV"] = os.environ  # this makes build less repeatable, but simplifies some things
-        env["ENV"]["TMP"] = os.environ["TMP"]
-
-    # First figure out which compiler, version, and target arch we're using
-    if os.getenv("VCINSTALLDIR") and detect_build_env_arch() and not env["use_mingw"]:
-        setup_msvc_manual(env)
-        env.msvc = True
-        vcvars_msvc_config = True
-    elif env.get("MSVC_VERSION", "") and not env["use_mingw"]:
-        setup_msvc_auto(env)
-        env.msvc = True
-        vcvars_msvc_config = False
-    else:
-        setup_mingw(env)
-        env.msvc = False
-
-    # Now set compiler/linker flags
+    env.msvc = "mingw" not in env["TOOLS"]
     if env.msvc:
-        configure_msvc(env, vcvars_msvc_config)
-
-    else:  # MinGW
+        configure_msvc(env)
+    else:
         configure_mingw(env)
 
 
diff --git a/engine/platform/windows/display_server_windows.cpp b/engine/platform/windows/display_server_windows.cpp
index 20b9236e..5e1ded58 100644
--- a/engine/platform/windows/display_server_windows.cpp
+++ b/engine/platform/windows/display_server_windows.cpp
@@ -32,6 +32,7 @@
 
 #include "drop_target_windows.h"
 #include "os_windows.h"
+#include "scene/main/window.h"
 #include "wgl_detect_version.h"
 
 #include "core/config/project_settings.h"
@@ -42,6 +43,8 @@
 #include "main/main.h"
 #include "scene/resources/texture.h"
 
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 #if defined(VULKAN_ENABLED)
 #include "rendering_context_driver_vulkan_windows.h"
 #endif
@@ -52,6 +55,10 @@
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
 
+#if defined(ACCESSKIT_ENABLED)
+#include "drivers/accesskit/accessibility_driver_accesskit.h"
+#endif
+
 #include <avrt.h>
 #include <dwmapi.h>
 #include <propkey.h>
@@ -83,6 +90,8 @@
 
 #define WM_INDICATOR_CALLBACK_MESSAGE (WM_USER + 1)
 
+int constexpr FS_TRANSP_BORDER = 2;
+
 static String format_error_message(DWORD id) {
 	LPWSTR messageBuffer = nullptr;
 	size_t size = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
@@ -139,6 +148,11 @@ bool DisplayServerWindows::has_feature(Feature p_feature) const {
 			return true;
 		case FEATURE_EMOJI_AND_SYMBOL_PICKER:
 			return (os_ver.dwBuildNumber >= 17134); // Windows 10 Redstone 4 (1803)+ only.
+#ifdef ACCESSKIT_ENABLED
+		case FEATURE_ACCESSIBILITY_SCREEN_READER: {
+			return (accessibility_driver != nullptr);
+		} break;
+#endif
 		default:
 			return false;
 	}
@@ -167,8 +181,11 @@ void DisplayServerWindows::_set_mouse_mode_impl(MouseMode p_mode) {
 
 		WindowData &wd = windows[window_id];
 
+		int off_x = (wd.multiwindow_fs || (!wd.fullscreen && wd.borderless && wd.maximized)) ? FS_TRANSP_BORDER : 0;
+
 		RECT clipRect;
 		GetClientRect(wd.hWnd, &clipRect);
+		clipRect.right -= off_x;
 		ClientToScreen(wd.hWnd, (POINT *)&clipRect.left);
 		ClientToScreen(wd.hWnd, (POINT *)&clipRect.right);
 		ClipCursor(&clipRect);
@@ -183,7 +200,12 @@ void DisplayServerWindows::_set_mouse_mode_impl(MouseMode p_mode) {
 		}
 	} else {
 		// Mouse is free to move around (not captured or confined).
-		ReleaseCapture();
+		// When the user is moving a window, it's important to not ReleaseCapture because it will cause
+		// the window movement to stop and if the user tries to move the Windows when it's not activated,
+		// it will prevent the window movement. It's probably impossible to move the Window while it's captured anyway.
+		if (!_has_moving_window()) {
+			ReleaseCapture();
+		}
 		ClipCursor(nullptr);
 
 		_register_raw_input_devices(INVALID_WINDOW_ID);
@@ -206,6 +228,15 @@ DisplayServer::WindowID DisplayServerWindows::_get_focused_window_or_popup() con
 	return last_focused_window;
 }
 
+bool DisplayServerWindows::_has_moving_window() const {
+	for (const KeyValue<WindowID, WindowData> &E : windows) {
+		if (E.value.move_timer_id) {
+			return true;
+		}
+	}
+	return false;
+}
+
 void DisplayServerWindows::_register_raw_input_devices(WindowID p_target_window) {
 	use_raw_input = true;
 
@@ -234,54 +265,75 @@ void DisplayServerWindows::_register_raw_input_devices(WindowID p_target_window)
 	}
 }
 
+void DisplayServerWindows::initialize_tts() const {
+	const_cast<DisplayServerWindows *>(this)->tts = memnew(TTS_Windows);
+}
+
 bool DisplayServerWindows::tts_is_speaking() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return tts->is_speaking();
 }
 
 bool DisplayServerWindows::tts_is_paused() const {
-	ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, false);
 	return tts->is_paused();
 }
 
 TypedArray<Dictionary> DisplayServerWindows::tts_get_voices() const {
-	ERR_FAIL_NULL_V_MSG(tts, TypedArray<Dictionary>(), "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL_V(tts, TypedArray<Dictionary>());
 	return tts->get_voices();
 }
 
 void DisplayServerWindows::tts_speak(const String &p_text, const String &p_voice, int p_volume, float p_pitch, float p_rate, int p_utterance_id, bool p_interrupt) {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->speak(p_text, p_voice, p_volume, p_pitch, p_rate, p_utterance_id, p_interrupt);
 }
 
 void DisplayServerWindows::tts_pause() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->pause();
 }
 
 void DisplayServerWindows::tts_resume() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->resume();
 }
 
 void DisplayServerWindows::tts_stop() {
-	ERR_FAIL_NULL_MSG(tts, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech.");
+	if (unlikely(!tts)) {
+		initialize_tts();
+	}
+	ERR_FAIL_NULL(tts);
 	tts->stop();
 }
 
-Error DisplayServerWindows::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
-	return _file_dialog_with_options_show(p_title, p_current_directory, String(), p_filename, p_show_hidden, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false);
+Error DisplayServerWindows::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
+	return _file_dialog_with_options_show(p_title, p_current_directory, String(), p_filename, p_show_hidden, p_mode, p_filters, TypedArray<Dictionary>(), p_callback, false, p_window_id);
 }
 
-Error DisplayServerWindows::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
-	return _file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, true);
+Error DisplayServerWindows::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
+	return _file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, true, p_window_id);
 }
 
-// Silence warning due to a COM API weirdness.
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#endif
+GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor") // Silence warning due to a COM API weirdness.
 
 class FileDialogEventHandler : public IFileDialogEvents, public IFileDialogControlEvents {
 	LONG ref_count = 1;
@@ -333,7 +385,7 @@ public:
 		if (!lpw_path) {
 			return S_FALSE;
 		}
-		String path = String::utf16((const char16_t *)lpw_path).replace("\\", "/").trim_prefix(R"(\\?\)").simplify_path();
+		String path = String::utf16((const char16_t *)lpw_path).replace_char('\\', '/').trim_prefix(R"(\\?\)").simplify_path();
 		if (!path.begins_with(root.simplify_path())) {
 			return S_FALSE;
 		}
@@ -375,7 +427,7 @@ public:
 		int gid = ctl_id++;
 		int cid = ctl_id++;
 
-		if (p_options.size() == 0) {
+		if (p_options.is_empty()) {
 			// Add check box.
 			p_pfdc->StartVisualGroup(gid, L"");
 			p_pfdc->AddCheckButton(cid, (LPCWSTR)p_name.utf16().get_data(), p_default);
@@ -400,9 +452,7 @@ public:
 	virtual ~FileDialogEventHandler() {}
 };
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+GODOT_GCC_WARNING_POP
 
 LRESULT CALLBACK WndProcFileDialog(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	DisplayServerWindows *ds_win = static_cast<DisplayServerWindows *>(DisplayServer::get_singleton());
@@ -489,7 +539,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 			int filter_slice_count = flt.get_slice_count(",");
 			Vector<String> exts;
 			for (int j = 0; j < filter_slice_count; j++) {
-				String str = (flt.get_slice(",", j).strip_edges());
+				String str = (flt.get_slicec(',', j).strip_edges());
 				if (!str.is_empty()) {
 					exts.push_back(str);
 				}
@@ -568,13 +618,13 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 			current_dir_name.resize(str_len + 1);
 			GetCurrentDirectoryW(current_dir_name.size(), (LPWSTR)current_dir_name.ptrw());
 			if (dir == ".") {
-				dir = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace("\\", "/");
+				dir = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace_char('\\', '/');
 			} else {
-				dir = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace("\\", "/").path_join(dir);
+				dir = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace_char('\\', '/').path_join(dir);
 			}
 		}
 		dir = dir.simplify_path();
-		dir = dir.trim_prefix(R"(\\?\)").replace("/", "\\");
+		dir = dir.trim_prefix(R"(\\?\)").replace_char('/', '\\');
 
 		IShellItem *shellitem = nullptr;
 		hr = SHCreateItemFromParsingName((LPCWSTR)dir.utf16().ptr(), nullptr, IID_IShellItem, (void **)&shellitem);
@@ -617,7 +667,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 						PWSTR file_path = nullptr;
 						hr = result->GetDisplayName(SIGDN_FILESYSPATH, &file_path);
 						if (SUCCEEDED(hr)) {
-							file_names.push_back(String::utf16((const char16_t *)file_path).replace("\\", "/").trim_prefix(R"(\\?\)"));
+							file_names.push_back(String::utf16((const char16_t *)file_path).replace_char('\\', '/').trim_prefix(R"(\\?\)"));
 							CoTaskMemFree(file_path);
 						}
 						result->Release();
@@ -631,7 +681,7 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 					PWSTR file_path = nullptr;
 					hr = result->GetDisplayName(SIGDN_FILESYSPATH, &file_path);
 					if (SUCCEEDED(hr)) {
-						file_names.push_back(String::utf16((const char16_t *)file_path).replace("\\", "/").trim_prefix(R"(\\?\)"));
+						file_names.push_back(String::utf16((const char16_t *)file_path).replace_char('\\', '/').trim_prefix(R"(\\?\)"));
 						CoTaskMemFree(file_path);
 					}
 					result->Release();
@@ -700,18 +750,14 @@ void DisplayServerWindows::_thread_fd_monitor(void *p_ud) {
 	}
 }
 
-Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb) {
+Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id) {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_INDEX_V(int(p_mode), FILE_DIALOG_MODE_SAVE_MAX, FAILED);
 
-	WindowID window_id = _get_focused_window_or_popup();
-	if (!windows.has(window_id)) {
-		window_id = MAIN_WINDOW_ID;
-	}
 	String appname;
 	if (Engine::get_singleton()->is_editor_hint()) {
-		appname = "Godot.GodotEditor." + String(VERSION_BRANCH);
+		appname = "Godot.GodotEditor." + String(GODOT_VERSION_BRANCH);
 	} else {
 		String name = GLOBAL_GET("application/config/name");
 		String version = GLOBAL_GET("application/config/version");
@@ -729,8 +775,8 @@ Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title
 	}
 
 	FileDialogData *fd = memnew(FileDialogData);
-	if (window_id != INVALID_WINDOW_ID) {
-		fd->hwnd_owner = windows[window_id].hWnd;
+	if (windows.has(p_window_id) && !windows[p_window_id].is_popup) {
+		fd->hwnd_owner = windows[p_window_id].hWnd;
 		RECT crect;
 		GetWindowRect(fd->hwnd_owner, &crect);
 		fd->wrect = Rect2i(crect.left, crect.top, crect.right - crect.left, crect.bottom - crect.top);
@@ -745,7 +791,7 @@ Error DisplayServerWindows::_file_dialog_with_options_show(const String &p_title
 	fd->filename = p_filename;
 	fd->show_hidden = p_show_hidden;
 	fd->mode = p_mode;
-	fd->window_id = window_id;
+	fd->window_id = p_window_id;
 	fd->filters = p_filters;
 	fd->options = p_options;
 	fd->callback = p_callback;
@@ -876,7 +922,7 @@ Point2i DisplayServerWindows::mouse_get_position() const {
 }
 
 BitField<MouseButtonMask> DisplayServerWindows::mouse_get_button_state() const {
-	BitField<MouseButtonMask> last_button_state = 0;
+	BitField<MouseButtonMask> last_button_state = MouseButtonMask::NONE;
 
 	if (GetKeyState(VK_LBUTTON) & (1 << 15)) {
 		last_button_state.set_flag(MouseButtonMask::LEFT);
@@ -965,7 +1011,7 @@ String DisplayServerWindows::clipboard_get() const {
 		if (mem != nullptr) {
 			LPTSTR ptr = (LPTSTR)GlobalLock(mem);
 			if (ptr != nullptr) {
-				ret.parse_utf8((const char *)ptr);
+				ret.append_utf8((const char *)ptr);
 				GlobalUnlock(mem);
 			}
 		}
@@ -1587,6 +1633,12 @@ DisplayServer::WindowID DisplayServerWindows::create_sub_window(WindowMode p_mod
 	if (p_flags & WINDOW_FLAG_RESIZE_DISABLED_BIT) {
 		wd.resizable = false;
 	}
+	if (p_flags & WINDOW_FLAG_MINIMIZE_DISABLED_BIT) {
+		wd.no_min_btn = true;
+	}
+	if (p_flags & WINDOW_FLAG_MAXIMIZE_DISABLED_BIT) {
+		wd.no_max_btn = true;
+	}
 	if (p_flags & WINDOW_FLAG_BORDERLESS_BIT) {
 		wd.borderless = true;
 	}
@@ -1929,23 +1981,37 @@ void DisplayServerWindows::window_set_mouse_passthrough(const Vector<Vector2> &p
 
 void DisplayServerWindows::_update_window_mouse_passthrough(WindowID p_window) {
 	ERR_FAIL_COND(!windows.has(p_window));
-	if (windows[p_window].mpass || windows[p_window].mpath.size() == 0) {
-		SetWindowRgn(windows[p_window].hWnd, nullptr, FALSE);
-	} else {
-		POINT *points = (POINT *)memalloc(sizeof(POINT) * windows[p_window].mpath.size());
-		for (int i = 0; i < windows[p_window].mpath.size(); i++) {
-			if (windows[p_window].borderless) {
-				points[i].x = windows[p_window].mpath[i].x;
-				points[i].y = windows[p_window].mpath[i].y;
-			} else {
-				points[i].x = windows[p_window].mpath[i].x + GetSystemMetrics(SM_CXSIZEFRAME);
-				points[i].y = windows[p_window].mpath[i].y + GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYCAPTION);
-			}
-		}
 
-		HRGN region = CreatePolygonRgn(points, windows[p_window].mpath.size(), ALTERNATE);
-		SetWindowRgn(windows[p_window].hWnd, region, FALSE);
-		memfree(points);
+	const WindowData &wd = windows[p_window];
+	bool clip_pixel = (wd.multiwindow_fs || (wd.borderless && wd.maximized));
+	bool pass_set = (wd.mpath.size() > 0);
+	if (!clip_pixel && !pass_set) {
+		SetWindowRgn(wd.hWnd, nullptr, TRUE);
+	} else {
+		HRGN region = nullptr;
+		if (pass_set) {
+			Vector<POINT> points;
+			points.resize(wd.mpath.size());
+			POINT *points_ptr = points.ptrw();
+			for (int i = 0; i < wd.mpath.size(); i++) {
+				if (wd.borderless) {
+					points_ptr[i].x = wd.mpath[i].x;
+					points_ptr[i].y = wd.mpath[i].y;
+				} else {
+					points_ptr[i].x = wd.mpath[i].x + GetSystemMetrics(SM_CXSIZEFRAME);
+					points_ptr[i].y = wd.mpath[i].y + GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYCAPTION);
+				}
+			}
+			region = CreatePolygonRgn(points.ptr(), points.size(), ALTERNATE);
+		} else {
+			region = CreateRectRgn(0, 0, wd.width, wd.height);
+		}
+		if (clip_pixel) {
+			HRGN region_clip = CreateRectRgn(0, 0, wd.width, wd.height);
+			CombineRgn(region, region, region_clip, RGN_AND);
+			DeleteObject(region_clip);
+		}
+		SetWindowRgn(wd.hWnd, region, FALSE);
 	}
 }
 
@@ -1976,14 +2042,16 @@ void DisplayServerWindows::window_set_current_screen(int p_screen, WindowID p_wi
 	if (wd.fullscreen) {
 		Point2 pos = screen_get_position(p_screen) + _get_screens_origin();
 		Size2 size = screen_get_size(p_screen);
+		int off_x = (wd.multiwindow_fs || (!wd.fullscreen && wd.borderless && wd.maximized)) ? FS_TRANSP_BORDER : 0;
 
-		MoveWindow(wd.hWnd, pos.x, pos.y, size.width, size.height, TRUE);
+		MoveWindow(wd.hWnd, pos.x, pos.y, size.width + off_x, size.height, TRUE);
 	} else if (wd.maximized) {
 		Point2 pos = screen_get_position(p_screen) + _get_screens_origin();
 		Size2 size = screen_get_size(p_screen);
+		int off_x = (wd.multiwindow_fs || (!wd.fullscreen && wd.borderless && wd.maximized)) ? FS_TRANSP_BORDER : 0;
 
 		ShowWindow(wd.hWnd, SW_RESTORE);
-		MoveWindow(wd.hWnd, pos.x, pos.y, size.width, size.height, TRUE);
+		MoveWindow(wd.hWnd, pos.x, pos.y, size.width + off_x, size.height, TRUE);
 		ShowWindow(wd.hWnd, SW_MAXIMIZE);
 	} else {
 		Rect2i srect = screen_get_usable_rect(p_screen);
@@ -2232,7 +2300,8 @@ Size2i DisplayServerWindows::window_get_size(WindowID p_window) const {
 
 	RECT r;
 	if (GetClientRect(wd.hWnd, &r)) { // Retrieves area inside of window border, including decoration.
-		return Size2(r.right - r.left, r.bottom - r.top);
+		int off_x = (wd.multiwindow_fs || (!wd.fullscreen && wd.borderless && wd.maximized)) ? FS_TRANSP_BORDER : 0;
+		return Size2(r.right - r.left - off_x, r.bottom - r.top);
 	}
 	return Size2();
 }
@@ -2245,12 +2314,13 @@ Size2i DisplayServerWindows::window_get_size_with_decorations(WindowID p_window)
 
 	RECT r;
 	if (GetWindowRect(wd.hWnd, &r)) { // Retrieves area inside of window border, including decoration.
-		return Size2(r.right - r.left, r.bottom - r.top);
+		int off_x = (wd.multiwindow_fs || (!wd.fullscreen && wd.borderless && wd.maximized)) ? FS_TRANSP_BORDER : 0;
+		return Size2(r.right - r.left - off_x, r.bottom - r.top);
 	}
 	return Size2();
 }
 
-void DisplayServerWindows::_get_window_style(bool p_main_window, bool p_initialized, bool p_fullscreen, bool p_multiwindow_fs, bool p_borderless, bool p_resizable, bool p_minimized, bool p_maximized, bool p_maximized_fs, bool p_no_activate_focus, bool p_embed_child, DWORD &r_style, DWORD &r_style_ex) {
+void DisplayServerWindows::_get_window_style(bool p_main_window, bool p_initialized, bool p_fullscreen, bool p_multiwindow_fs, bool p_borderless, bool p_resizable, bool p_no_min_btn, bool p_no_max_btn, bool p_minimized, bool p_maximized, bool p_maximized_fs, bool p_no_activate_focus, bool p_embed_child, DWORD &r_style, DWORD &r_style_ex) {
 	// Windows docs for window styles:
 	// https://docs.microsoft.com/en-us/windows/win32/winmsg/window-styles
 	// https://docs.microsoft.com/en-us/windows/win32/winmsg/extended-window-styles
@@ -2278,15 +2348,14 @@ void DisplayServerWindows::_get_window_style(bool p_main_window, bool p_initiali
 			r_style |= WS_MAXIMIZE;
 		}
 		if (!p_fullscreen) {
-			r_style |= WS_SYSMENU | WS_MINIMIZEBOX;
-
-			if (p_resizable) {
+			r_style |= WS_SYSMENU;
+			if (!p_no_min_btn) {
+				r_style |= WS_MINIMIZEBOX;
+			}
+			if (!p_no_max_btn) {
 				r_style |= WS_MAXIMIZEBOX;
 			}
 		}
-		if ((p_fullscreen && p_multiwindow_fs) || p_maximized_fs) {
-			r_style |= WS_BORDER; // Allows child windows to be displayed on top of full screen.
-		}
 	} else {
 		if (p_resizable) {
 			if (p_minimized) {
@@ -2296,11 +2365,23 @@ void DisplayServerWindows::_get_window_style(bool p_main_window, bool p_initiali
 			} else {
 				r_style = WS_OVERLAPPEDWINDOW;
 			}
+			if (p_no_min_btn) {
+				r_style &= ~WS_MINIMIZEBOX;
+			}
+			if (p_no_max_btn) {
+				r_style &= ~WS_MAXIMIZEBOX;
+			}
 		} else {
 			if (p_minimized) {
-				r_style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MINIMIZE;
+				r_style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZE;
 			} else {
-				r_style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
+				r_style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU;
+			}
+			if (!p_no_min_btn) {
+				r_style |= WS_MINIMIZEBOX;
+			}
+			if (!p_no_max_btn) {
+				r_style |= WS_MAXIMIZEBOX;
 			}
 		}
 	}
@@ -2330,7 +2411,7 @@ void DisplayServerWindows::_update_window_style(WindowID p_window, bool p_repain
 	DWORD style = 0;
 	DWORD style_ex = 0;
 
-	_get_window_style(p_window == MAIN_WINDOW_ID, wd.initialized, wd.fullscreen, wd.multiwindow_fs, wd.borderless, wd.resizable, wd.minimized, wd.maximized, wd.maximized_fs, wd.no_focus || wd.is_popup, wd.parent_hwnd, style, style_ex);
+	_get_window_style(p_window == MAIN_WINDOW_ID, wd.initialized, wd.fullscreen, wd.multiwindow_fs, wd.borderless, wd.resizable, wd.no_min_btn, wd.no_max_btn, wd.minimized, wd.maximized, wd.maximized_fs, wd.no_focus || wd.is_popup, wd.parent_hwnd, style, style_ex);
 
 	SetWindowLongPtr(wd.hWnd, GWL_STYLE, style);
 	SetWindowLongPtr(wd.hWnd, GWL_EXSTYLE, style_ex);
@@ -2344,8 +2425,8 @@ void DisplayServerWindows::_update_window_style(WindowID p_window, bool p_repain
 	if (p_repaint) {
 		RECT rect;
 		GetWindowRect(wd.hWnd, &rect);
-
-		MoveWindow(wd.hWnd, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, TRUE);
+		int off_x = (wd.multiwindow_fs || (!wd.fullscreen && wd.borderless && wd.maximized)) ? FS_TRANSP_BORDER : 0;
+		MoveWindow(wd.hWnd, rect.left, rect.top, rect.right - rect.left + off_x, rect.bottom - rect.top, TRUE);
 	}
 }
 
@@ -2363,6 +2444,10 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
 	bool was_fullscreen = wd.fullscreen;
 	wd.was_fullscreen_pre_min = false;
 
+	if (p_mode == WINDOW_MODE_MAXIMIZED && wd.borderless) {
+		p_mode = WINDOW_MODE_FULLSCREEN;
+	}
+
 	if (wd.fullscreen && p_mode != WINDOW_MODE_FULLSCREEN && p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		RECT rect;
 
@@ -2414,11 +2499,10 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
 
 	if (p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 		wd.multiwindow_fs = false;
-		_update_window_style(p_window, false);
-	} else {
+	} else if (p_mode == WINDOW_MODE_FULLSCREEN) {
 		wd.multiwindow_fs = true;
-		_update_window_style(p_window, false);
 	}
+	_update_window_style(p_window, false);
 
 	if ((p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) && !wd.fullscreen) {
 		if (wd.minimized || wd.maximized) {
@@ -2444,7 +2528,8 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
 
 		_update_window_style(p_window, false);
 
-		MoveWindow(wd.hWnd, pos.x, pos.y, size.width, size.height, TRUE);
+		int off_x = (wd.multiwindow_fs || (!wd.fullscreen && wd.borderless && wd.maximized)) ? FS_TRANSP_BORDER : 0;
+		MoveWindow(wd.hWnd, pos.x, pos.y, size.width + off_x, size.height, TRUE);
 
 		// If the user has mouse trails enabled in windows, then sometimes the cursor disappears in fullscreen mode.
 		// Save number of trails so we can restore when exiting, then turn off mouse trails
@@ -2453,6 +2538,7 @@ void DisplayServerWindows::window_set_mode(WindowMode p_mode, WindowID p_window)
 			SystemParametersInfoA(SPI_SETMOUSETRAILS, 0, nullptr, 0);
 		}
 	}
+	_update_window_mouse_passthrough(p_window);
 }
 
 DisplayServer::WindowMode DisplayServerWindows::window_get_mode(WindowID p_window) const {
@@ -2480,10 +2566,10 @@ bool DisplayServerWindows::window_is_maximize_allowed(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
+	const WindowData &wd = windows[p_window];
 
-	// FIXME: Implement this, or confirm that it should always be true.
-
-	return true;
+	const DWORD style = GetWindowLongPtr(wd.hWnd, GWL_STYLE);
+	return (style & WS_MAXIMIZEBOX) == WS_MAXIMIZEBOX;
 }
 
 void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
@@ -2492,6 +2578,14 @@ void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, W
 	ERR_FAIL_COND(!windows.has(p_window));
 	WindowData &wd = windows[p_window];
 	switch (p_flag) {
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
+			wd.no_min_btn = p_enabled;
+			_update_window_style(p_window);
+		} break;
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
+			wd.no_max_btn = p_enabled;
+			_update_window_style(p_window);
+		} break;
 		case WINDOW_FLAG_RESIZE_DISABLED: {
 			if (p_enabled && wd.parent_hwnd) {
 				print_line("Embedded window resize can't be disabled.");
@@ -2502,8 +2596,8 @@ void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, W
 		} break;
 		case WINDOW_FLAG_BORDERLESS: {
 			wd.borderless = p_enabled;
-			_update_window_style(p_window);
 			_update_window_mouse_passthrough(p_window);
+			_update_window_style(p_window);
 			ShowWindow(wd.hWnd, (wd.no_focus || wd.is_popup) ? SW_SHOWNOACTIVATE : SW_SHOW); // Show the window.
 		} break;
 		case WINDOW_FLAG_ALWAYS_ON_TOP: {
@@ -2554,7 +2648,6 @@ void DisplayServerWindows::window_set_flag(WindowFlags p_flag, bool p_enabled, W
 		} break;
 		case WINDOW_FLAG_MOUSE_PASSTHROUGH: {
 			wd.mpass = p_enabled;
-			_update_window_mouse_passthrough(p_window);
 		} break;
 		case WINDOW_FLAG_EXCLUDE_FROM_CAPTURE: {
 			wd.hide_from_capture = p_enabled;
@@ -2588,6 +2681,12 @@ bool DisplayServerWindows::window_get_flag(WindowFlags p_flag, WindowID p_window
 	ERR_FAIL_COND_V(!windows.has(p_window), false);
 	const WindowData &wd = windows[p_window];
 	switch (p_flag) {
+		case WINDOW_FLAG_MAXIMIZE_DISABLED: {
+			return wd.no_max_btn;
+		} break;
+		case WINDOW_FLAG_MINIMIZE_DISABLED: {
+			return wd.no_min_btn;
+		} break;
 		case WINDOW_FLAG_RESIZE_DISABLED: {
 			return !wd.resizable;
 		} break;
@@ -2681,6 +2780,46 @@ bool DisplayServerWindows::can_any_window_draw() const {
 	return false;
 }
 
+int DisplayServerWindows::accessibility_should_increase_contrast() const {
+	HIGHCONTRASTA hc;
+	hc.cbSize = sizeof(HIGHCONTRAST);
+	if (!SystemParametersInfoA(SPI_GETHIGHCONTRAST, sizeof(HIGHCONTRAST), &hc, 0)) {
+		return -1;
+	}
+	return (hc.dwFlags & HCF_HIGHCONTRASTON);
+}
+
+int DisplayServerWindows::accessibility_should_reduce_animation() const {
+	bool anim_enabled = false;
+	if (!SystemParametersInfoA(SPI_GETCLIENTAREAANIMATION, 0, &anim_enabled, 0)) {
+		return -1;
+	}
+	return (!anim_enabled);
+}
+
+int DisplayServerWindows::accessibility_should_reduce_transparency() const {
+	bool tr_enabled = false;
+	if (!SystemParametersInfoA(SPI_GETDISABLEOVERLAPPEDCONTENT, 0, &tr_enabled, 0)) {
+		return -1;
+	}
+	return tr_enabled;
+}
+
+int DisplayServerWindows::accessibility_screen_reader_active() const {
+	bool sr_enabled = false;
+	if (SystemParametersInfoA(SPI_GETSCREENREADER, 0, &sr_enabled, 0) && sr_enabled) {
+		return true;
+	}
+
+	static const WCHAR *narrator_mutex_name = L"NarratorRunning";
+	HANDLE narrator_mutex = OpenMutexW(MUTEX_ALL_ACCESS, false, narrator_mutex_name);
+	if (narrator_mutex) {
+		CloseHandle(narrator_mutex);
+		return true;
+	}
+	return false;
+}
+
 Vector2i DisplayServerWindows::ime_get_selection() const {
 	_THREAD_SAFE_METHOD_
 
@@ -2726,7 +2865,7 @@ String DisplayServerWindows::ime_get_text() const {
 	int32_t length = ImmGetCompositionStringW(wd.im_himc, GCS_COMPSTR, nullptr, 0);
 	wchar_t *string = reinterpret_cast<wchar_t *>(memalloc(length));
 	ImmGetCompositionStringW(wd.im_himc, GCS_COMPSTR, string, length);
-	ret.parse_utf16((char16_t *)string, length / sizeof(wchar_t));
+	ret.append_utf16((char16_t *)string, length / sizeof(wchar_t));
 
 	memdelete(string);
 
@@ -4387,7 +4526,7 @@ void DisplayServerWindows::popup_close(WindowID p_window) {
 }
 
 BitField<DisplayServerWindows::WinKeyModifierMask> DisplayServerWindows::_get_mods() const {
-	BitField<WinKeyModifierMask> mask;
+	BitField<WinKeyModifierMask> mask = {};
 	static unsigned char keyboard_state[256];
 	if (GetKeyboardState((PBYTE)&keyboard_state)) {
 		if ((keyboard_state[VK_LSHIFT] & 0x80) || (keyboard_state[VK_RSHIFT] & 0x80)) {
@@ -4468,6 +4607,16 @@ LRESULT DisplayServerWindows::_handle_early_window_message(HWND hWnd, UINT uMsg,
 
 			// Fix this up so we can recognize the remaining messages.
 			pWindowData->hWnd = hWnd;
+
+#ifdef ACCESSKIT_ENABLED
+			if (accessibility_driver && !accessibility_driver->window_create(pWindowData->id, (void *)hWnd)) {
+				if (OS::get_singleton()->is_stdout_verbose()) {
+					ERR_PRINT("Can't create an accessibility adapter for window, accessibility support disabled!");
+				}
+				memdelete(accessibility_driver);
+				accessibility_driver = nullptr;
+			}
+#endif
 		} break;
 		default: {
 			// Additional messages during window creation should happen after we fixed
@@ -4518,6 +4667,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 
 	// Process window messages.
 	switch (uMsg) {
+		case WM_GETOBJECT: {
+			get_object_recieved = true;
+		} break;
 		case WM_MENUCOMMAND: {
 			native_menu->_menu_activate(HMENU(lParam), (int)wParam);
 		} break;
@@ -4533,30 +4685,6 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				SendMessageW(windows[window_id].hWnd, WM_PAINT, 0, 0);
 			}
 		} break;
-		case WM_NCPAINT: {
-			if (RenderingServer::get_singleton() && (windows[window_id].borderless || (windows[window_id].fullscreen && windows[window_id].multiwindow_fs))) {
-				Color color = RenderingServer::get_singleton()->get_default_clear_color();
-				HDC hdc = GetWindowDC(hWnd);
-				if (hdc) {
-					HPEN pen = CreatePen(PS_SOLID, 1, RGB(color.r * 255.f, color.g * 255.f, color.b * 255.f));
-					if (pen) {
-						HGDIOBJ prev_pen = SelectObject(hdc, pen);
-						HGDIOBJ prev_brush = SelectObject(hdc, GetStockObject(NULL_BRUSH));
-
-						RECT rc;
-						GetWindowRect(hWnd, &rc);
-						OffsetRect(&rc, -rc.left, -rc.top);
-						Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom);
-
-						SelectObject(hdc, prev_pen);
-						SelectObject(hdc, prev_brush);
-						DeleteObject(pen);
-					}
-					ReleaseDC(hWnd, hdc);
-				}
-				return 0;
-			}
-		} break;
 		case WM_NCHITTEST: {
 			if (windows[window_id].mpass) {
 				return HTTRANSPARENT;
@@ -4880,8 +5008,8 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 					windows[window_id].last_pressure_update = 0;
 
 					float pressure = float(packet.pkNormalPressure - windows[window_id].min_pressure) / float(windows[window_id].max_pressure - windows[window_id].min_pressure);
-					double azim = (packet.pkOrientation.orAzimuth / 10.0f) * (Math_PI / 180);
-					double alt = Math::tan((Math::abs(packet.pkOrientation.orAltitude / 10.0f)) * (Math_PI / 180));
+					double azim = (packet.pkOrientation.orAzimuth / 10.0f) * (Math::PI / 180);
+					double alt = Math::tan((Math::abs(packet.pkOrientation.orAltitude / 10.0f)) * (Math::PI / 180));
 					bool inverted = packet.pkStatus & TPS_INVERT;
 
 					Vector2 tilt = (windows[window_id].tilt_supported) ? Vector2(Math::atan(Math::sin(azim) / alt), Math::atan(Math::cos(azim) / alt)) : Vector2();
@@ -5008,7 +5136,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			mb.instantiate();
 			mb->set_window_id(window_id);
 
-			BitField<MouseButtonMask> last_button_state = 0;
+			BitField<MouseButtonMask> last_button_state = MouseButtonMask::NONE;
 			if (IS_POINTER_FIRSTBUTTON_WPARAM(wParam)) {
 				last_button_state.set_flag(MouseButtonMask::LEFT);
 				mb->set_button_index(MouseButton::LEFT);
@@ -5070,7 +5198,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			int64_t pen_id = GET_POINTERID_WPARAM(wParam);
 			if (uMsg == WM_POINTERDOWN) {
 				mb->set_pressed(true);
-				if (pointer_down_time.has(pen_id) && (pointer_prev_button[pen_id] == mb->get_button_index()) && (ABS(coords.y - pointer_last_pos[pen_id].y) < GetSystemMetrics(SM_CYDOUBLECLK)) && GetMessageTime() - pointer_down_time[pen_id] < (LONG)GetDoubleClickTime()) {
+				if (pointer_down_time.has(pen_id) && (pointer_prev_button[pen_id] == mb->get_button_index()) && (Math::abs(coords.y - pointer_last_pos[pen_id].y) < GetSystemMetrics(SM_CYDOUBLECLK)) && GetMessageTime() - pointer_down_time[pen_id] < (LONG)GetDoubleClickTime()) {
 					mb->set_double_click(true);
 					pointer_down_time[pen_id] = 0;
 				} else {
@@ -5174,7 +5302,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			mm->set_alt_pressed(mods.has_flag(WinKeyModifierMask::ALT));
 			mm->set_meta_pressed(mods.has_flag(WinKeyModifierMask::META));
 
-			BitField<MouseButtonMask> last_button_state = 0;
+			BitField<MouseButtonMask> last_button_state = MouseButtonMask::NONE;
 			if (IS_POINTER_FIRSTBUTTON_WPARAM(wParam)) {
 				last_button_state.set_flag(MouseButtonMask::LEFT);
 			}
@@ -5562,6 +5690,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 		} break;
 
 		case WM_WINDOWPOSCHANGED: {
+			WindowData &window = windows[window_id];
+
+			int off_x = (window.multiwindow_fs || (!window.fullscreen && window.borderless && IsZoomed(hWnd))) ? FS_TRANSP_BORDER : 0;
 			Rect2i window_client_rect;
 			Rect2i window_rect;
 			{
@@ -5569,17 +5700,16 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				GetClientRect(hWnd, &rect);
 				ClientToScreen(hWnd, (POINT *)&rect.left);
 				ClientToScreen(hWnd, (POINT *)&rect.right);
-				window_client_rect = Rect2i(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
+				window_client_rect = Rect2i(rect.left, rect.top, rect.right - rect.left - off_x, rect.bottom - rect.top);
 				window_client_rect.position -= _get_screens_origin();
 
 				RECT wrect;
 				GetWindowRect(hWnd, &wrect);
-				window_rect = Rect2i(wrect.left, wrect.top, wrect.right - wrect.left, wrect.bottom - wrect.top);
+				window_rect = Rect2i(wrect.left, wrect.top, wrect.right - wrect.left - off_x, wrect.bottom - wrect.top);
 				window_rect.position -= _get_screens_origin();
 			}
 
 			WINDOWPOS *window_pos_params = (WINDOWPOS *)lParam;
-			WindowData &window = windows[window_id];
 
 			bool rect_changed = false;
 			if (!(window_pos_params->flags & SWP_NOSIZE) || window_pos_params->flags & SWP_FRAMECHANGED) {
@@ -5648,6 +5778,7 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 				if (mouse_mode == MOUSE_MODE_CAPTURED || mouse_mode == MOUSE_MODE_CONFINED || mouse_mode == MOUSE_MODE_CONFINED_HIDDEN) {
 					RECT crect;
 					GetClientRect(window.hWnd, &crect);
+					crect.right -= off_x;
 					ClientToScreen(window.hWnd, (POINT *)&crect.left);
 					ClientToScreen(window.hWnd, (POINT *)&crect.right);
 					ClipCursor(&crect);
@@ -5692,6 +5823,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 		case WM_EXITSIZEMOVE: {
 			KillTimer(windows[window_id].hWnd, windows[window_id].move_timer_id);
 			windows[window_id].move_timer_id = 0;
+			// Reset the correct mouse mode because we couldn't call ReleaseCapture in
+			// _set_mouse_mode_impl while in _process_activate_event (because the user was moving a window).
+			_set_mouse_mode_impl(mouse_mode);
 		} break;
 		case WM_TIMER: {
 			if (wParam == windows[window_id].move_timer_id) {
@@ -5834,6 +5968,11 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 			joypad->probe_joypads();
 		} break;
 		case WM_DESTROY: {
+#ifdef ACCESSKIT_ENABLED
+			if (accessibility_driver) {
+				accessibility_driver->window_destroy(window_id);
+			}
+#endif
 			Input::get_singleton()->flush_buffered_events();
 			if (window_mouseover_id == window_id) {
 				window_mouseover_id = INVALID_WINDOW_ID;
@@ -5887,13 +6026,29 @@ void DisplayServerWindows::_process_activate_event(WindowID p_window_id) {
 			SetFocus(wd.hWnd);
 		}
 		wd.window_focused = true;
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver) {
+			accessibility_driver->accessibility_set_window_focused(p_window_id, true);
+		}
+#endif
 		_send_window_event(wd, WINDOW_EVENT_FOCUS_IN);
 	} else { // WM_INACTIVE.
 		Input::get_singleton()->release_pressed_events();
 		track_mouse_leave_event(wd.hWnd);
 		// Release capture unconditionally because it can be set due to dragging, in addition to captured mode.
-		ReleaseCapture();
+		// When the user is moving a window, it's important to not ReleaseCapture because it will cause
+		// the window movement to stop and if the user tries to move the Windows when it's not activated,
+		// it will prevent the window movement. If we are here and a window is moving, it's because we had multiple
+		// opened windows in the editor and we are definitively not in a middle of dragging.
+		if (!_has_moving_window()) {
+			ReleaseCapture();
+		}
 		wd.window_focused = false;
+#ifdef ACCESSKIT_ENABLED
+		if (accessibility_driver) {
+			accessibility_driver->accessibility_set_window_focused(p_window_id, false);
+		}
+#endif
 		_send_window_event(wd, WINDOW_EVENT_FOCUS_OUT);
 	}
 
@@ -6111,28 +6266,31 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 	DWORD dwExStyle;
 	DWORD dwStyle;
 
-	_get_window_style(window_id_counter == MAIN_WINDOW_ID, false, (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN), p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN, p_flags & WINDOW_FLAG_BORDERLESS_BIT, !(p_flags & WINDOW_FLAG_RESIZE_DISABLED_BIT), p_mode == WINDOW_MODE_MINIMIZED, p_mode == WINDOW_MODE_MAXIMIZED, false, (p_flags & WINDOW_FLAG_NO_FOCUS_BIT) | (p_flags & WINDOW_FLAG_POPUP), p_parent_hwnd, dwStyle, dwExStyle);
-
-	RECT WindowRect;
-
-	WindowRect.left = p_rect.position.x;
-	WindowRect.right = p_rect.position.x + p_rect.size.x;
-	WindowRect.top = p_rect.position.y;
-	WindowRect.bottom = p_rect.position.y + p_rect.size.y;
+	_get_window_style(window_id_counter == MAIN_WINDOW_ID, false, (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN), p_mode != WINDOW_MODE_EXCLUSIVE_FULLSCREEN, p_flags & WINDOW_FLAG_BORDERLESS_BIT, !(p_flags & WINDOW_FLAG_RESIZE_DISABLED_BIT), p_flags & WINDOW_FLAG_MINIMIZE_DISABLED_BIT, p_flags & WINDOW_FLAG_MAXIMIZE_DISABLED_BIT, p_mode == WINDOW_MODE_MINIMIZED, p_mode == WINDOW_MODE_MAXIMIZED, false, (p_flags & WINDOW_FLAG_NO_FOCUS_BIT) | (p_flags & WINDOW_FLAG_POPUP_BIT), p_parent_hwnd, dwStyle, dwExStyle);
 
 	int rq_screen = get_screen_from_rect(p_rect);
 	if (rq_screen < 0) {
 		rq_screen = get_primary_screen(); // Requested window rect is outside any screen bounds.
 	}
+	Rect2i usable_rect = screen_get_usable_rect(rq_screen);
 
 	Point2i offset = _get_screens_origin();
 
+	RECT WindowRect;
+
+	int off_x = (p_mode == WINDOW_MODE_FULLSCREEN || ((p_flags & WINDOW_FLAG_BORDERLESS_BIT) && p_mode == WINDOW_MODE_MAXIMIZED)) ? FS_TRANSP_BORDER : 0;
+
+	WindowRect.left = p_rect.position.x;
+	WindowRect.right = p_rect.position.x + p_rect.size.x + off_x;
+	WindowRect.top = p_rect.position.y;
+	WindowRect.bottom = p_rect.position.y + p_rect.size.y;
+
 	if (!p_parent_hwnd) {
 		if (p_mode == WINDOW_MODE_FULLSCREEN || p_mode == WINDOW_MODE_EXCLUSIVE_FULLSCREEN) {
 			Rect2i screen_rect = Rect2i(screen_get_position(rq_screen), screen_get_size(rq_screen));
 
 			WindowRect.left = screen_rect.position.x;
-			WindowRect.right = screen_rect.position.x + screen_rect.size.x;
+			WindowRect.right = screen_rect.position.x + screen_rect.size.x + off_x;
 			WindowRect.top = screen_rect.position.y;
 			WindowRect.bottom = screen_rect.position.y + screen_rect.size.y;
 		} else {
@@ -6143,7 +6301,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 			}
 
 			WindowRect.left = wpos.x;
-			WindowRect.right = wpos.x + p_rect.size.x;
+			WindowRect.right = wpos.x + p_rect.size.x + off_x;
 			WindowRect.top = wpos.y;
 			WindowRect.bottom = wpos.y + p_rect.size.y;
 		}
@@ -6178,6 +6336,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 
 		WindowData &wd = windows[id];
 
+		wd.id = id;
 		wd.hWnd = CreateWindowExW(
 				dwExStyle,
 				L"Engine", L"",
@@ -6281,7 +6440,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 				return INVALID_WINDOW_ID;
 			}
 
-			rendering_context->window_set_size(id, real_client_rect.right - real_client_rect.left, real_client_rect.bottom - real_client_rect.top);
+			rendering_context->window_set_size(id, real_client_rect.right - real_client_rect.left - off_x, real_client_rect.bottom - real_client_rect.top);
 			rendering_context->window_set_vsync_mode(id, p_vsync_mode);
 			wd.context_created = true;
 		}
@@ -6289,7 +6448,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 
 #ifdef GLES3_ENABLED
 		if (gl_manager_native) {
-			if (gl_manager_native->window_create(id, wd.hWnd, hInstance, real_client_rect.right - real_client_rect.left, real_client_rect.bottom - real_client_rect.top) != OK) {
+			if (gl_manager_native->window_create(id, wd.hWnd, hInstance, real_client_rect.right - real_client_rect.left - off_x, real_client_rect.bottom - real_client_rect.top) != OK) {
 				memdelete(gl_manager_native);
 				gl_manager_native = nullptr;
 				windows.erase(id);
@@ -6299,7 +6458,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 		}
 
 		if (gl_manager_angle) {
-			if (gl_manager_angle->window_create(id, nullptr, wd.hWnd, real_client_rect.right - real_client_rect.left, real_client_rect.bottom - real_client_rect.top) != OK) {
+			if (gl_manager_angle->window_create(id, nullptr, wd.hWnd, real_client_rect.right - real_client_rect.left - off_x, real_client_rect.bottom - real_client_rect.top) != OK) {
 				memdelete(gl_manager_angle);
 				gl_manager_angle = nullptr;
 				windows.erase(id);
@@ -6361,7 +6520,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 			PROPVARIANT val;
 			String appname;
 			if (Engine::get_singleton()->is_editor_hint()) {
-				appname = "Godot.GodotEditor." + String(VERSION_FULL_CONFIG);
+				appname = "Godot.GodotEditor." + String(GODOT_VERSION_FULL_CONFIG);
 			} else {
 				String name = GLOBAL_GET("application/config/name");
 				String version = GLOBAL_GET("application/config/version");
@@ -6394,7 +6553,7 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 			ClientToScreen(wd.hWnd, (POINT *)&r.left);
 			ClientToScreen(wd.hWnd, (POINT *)&r.right);
 			wd.last_pos = Point2i(r.left, r.top) - _get_screens_origin();
-			wd.width = r.right - r.left;
+			wd.width = r.right - r.left - off_x;
 			wd.height = r.bottom - r.top;
 		} else {
 			wd.last_pos = p_rect.position;
@@ -6402,13 +6561,12 @@ DisplayServer::WindowID DisplayServerWindows::_create_window(WindowMode p_mode,
 			wd.height = p_rect.size.height;
 		}
 
-		// Set size of maximized borderless window (by default it covers the entire screen).
-		if (p_mode == WINDOW_MODE_MAXIMIZED && (p_flags & WINDOW_FLAG_BORDERLESS_BIT)) {
-			Rect2i srect = screen_get_usable_rect(rq_screen);
-			SetWindowPos(wd.hWnd, HWND_TOP, srect.position.x, srect.position.y, srect.size.width, srect.size.height, SWP_NOZORDER | SWP_NOACTIVATE);
-		}
-
 		wd.create_completed = true;
+		// Set size of maximized borderless window (by default it covers the entire screen).
+		if (!p_parent_hwnd && p_mode == WINDOW_MODE_MAXIMIZED && (p_flags & WINDOW_FLAG_BORDERLESS_BIT)) {
+			SetWindowPos(wd.hWnd, HWND_TOP, usable_rect.position.x - off_x, usable_rect.position.y, usable_rect.size.width + off_x, usable_rect.size.height, SWP_NOZORDER | SWP_NOACTIVATE);
+		}
+		_update_window_mouse_passthrough(id);
 		window_id_counter++;
 	}
 
@@ -6490,8 +6648,8 @@ Vector2i _get_device_ids(const String &p_device_name) {
 			SysFreeString(object_name);
 			if (hr == S_OK) {
 				String device_id = String(V_BSTR(&did));
-				ids.x = device_id.get_slice("&", 0).lstrip("PCI\\VEN_").hex_to_int();
-				ids.y = device_id.get_slice("&", 1).lstrip("DEV_").hex_to_int();
+				ids.x = device_id.get_slicec('&', 0).lstrip("PCI\\VEN_").hex_to_int();
+				ids.y = device_id.get_slicec('&', 1).lstrip("DEV_").hex_to_int();
 			}
 
 			for (ULONG i = 0; i < resultCount; i++) {
@@ -6601,10 +6759,23 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 	// Init TTS
 	bool tts_enabled = GLOBAL_GET("audio/general/text_to_speech");
 	if (tts_enabled) {
-		tts = memnew(TTS_Windows);
+		initialize_tts();
 	}
 	native_menu = memnew(NativeMenuWindows);
 
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_get_mode() != DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		accessibility_driver = memnew(AccessibilityDriverAccessKit);
+		if (accessibility_driver->init() != OK) {
+			if (OS::get_singleton()->is_stdout_verbose()) {
+				ERR_PRINT("Can't create an accessibility driver, accessibility support disabled!");
+			}
+			memdelete(accessibility_driver);
+			accessibility_driver = nullptr;
+		}
+	}
+#endif
+
 	// Enforce default keep screen on value.
 	screen_set_keep_on(GLOBAL_GET("display/window/energy_saving/keep_screen_on"));
 
@@ -6785,6 +6956,11 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 
 	_register_raw_input_devices(INVALID_WINDOW_ID);
 
+	// Init context and rendering device.
+	if (rendering_driver == "dummy") {
+		RasterizerDummy::make_current();
+	}
+
 #if defined(RD_ENABLED)
 	[[maybe_unused]] bool fallback_to_vulkan = GLOBAL_GET("rendering/rendering_device/fallback_to_vulkan");
 	[[maybe_unused]] bool fallback_to_d3d12 = GLOBAL_GET("rendering/rendering_device/fallback_to_d3d12");
@@ -6857,7 +7033,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 		}
 	}
 #endif
-// Init context and rendering device
+
 #if defined(GLES3_ENABLED)
 
 	bool fallback = GLOBAL_GET("rendering/gl_compatibility/fallback_to_angle");
@@ -6968,7 +7144,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 #endif
 	String appname;
 	if (Engine::get_singleton()->is_editor_hint()) {
-		appname = "Godot.GodotEditor." + String(VERSION_FULL_CONFIG);
+		appname = "Godot.GodotEditor." + String(GODOT_VERSION_FULL_CONFIG);
 	} else {
 		String name = GLOBAL_GET("application/config/name");
 		String version = GLOBAL_GET("application/config/version");
@@ -6989,7 +7165,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 		HKEY key;
 		if (RegOpenKeyW(HKEY_CURRENT_USER_LOCAL_SETTINGS, L"Software\\Microsoft\\Windows\\Shell\\MuiCache", &key) == ERROR_SUCCESS) {
 			Char16String cs_name = name.utf16();
-			String value_name = OS::get_singleton()->get_executable_path().replace("/", "\\") + ".FriendlyAppName";
+			String value_name = OS::get_singleton()->get_executable_path().replace_char('/', '\\') + ".FriendlyAppName";
 			RegSetValueExW(key, (LPCWSTR)value_name.utf16().get_data(), 0, REG_SZ, (const BYTE *)cs_name.get_data(), cs_name.size() * sizeof(WCHAR));
 			RegCloseKey(key);
 		}
@@ -7030,7 +7206,25 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
 		}
 	}
 
-	show_window(MAIN_WINDOW_ID);
+	windows[MAIN_WINDOW_ID].initialized = true;
+
+	if (accessibility_screen_reader_active()) {
+		_THREAD_SAFE_LOCK_
+		uint64_t time_wait = OS::get_singleton()->get_ticks_msec();
+		while (true) {
+			MSG msg = {};
+			while (PeekMessageW(&msg, nullptr, 0, 0, PM_REMOVE)) {
+				TranslateMessage(&msg);
+				DispatchMessageW(&msg);
+			}
+
+			uint64_t delta = OS::get_singleton()->get_ticks_msec() - time_wait;
+			if (delta > 500 || get_object_recieved) {
+				break;
+			}
+		}
+		_THREAD_SAFE_UNLOCK_
+	}
 
 #if defined(RD_ENABLED)
 	if (rendering_context) {
@@ -7089,6 +7283,7 @@ Vector<String> DisplayServerWindows::get_rendering_drivers_func() {
 	drivers.push_back("opengl3");
 	drivers.push_back("opengl3_angle");
 #endif
+	drivers.push_back("dummy");
 
 	return drivers;
 }
@@ -7240,6 +7435,11 @@ DisplayServerWindows::~DisplayServerWindows() {
 		memdelete(gl_manager_native);
 		gl_manager_native = nullptr;
 	}
+#endif
+#ifdef ACCESSKIT_ENABLED
+	if (accessibility_driver) {
+		memdelete(accessibility_driver);
+	}
 #endif
 	if (tts) {
 		memdelete(tts);
diff --git a/engine/platform/windows/display_server_windows.h b/engine/platform/windows/display_server_windows.h
index 4a6b51b5..b53da1db 100644
--- a/engine/platform/windows/display_server_windows.h
+++ b/engine/platform/windows/display_server_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_WINDOWS_H
-#define DISPLAY_SERVER_WINDOWS_H
+#pragma once
 
 #include "crash_handler_windows.h"
 #include "joypad_windows.h"
@@ -367,7 +366,7 @@ class DropTargetWindows;
 #endif
 
 class DisplayServerWindows : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerWindows, DisplayServer);
 
 	friend class DropTargetWindows;
 
@@ -460,6 +459,7 @@ class DisplayServerWindows : public DisplayServer {
 	String rendering_driver;
 	bool app_focused = false;
 	bool keep_screen_on = false;
+	bool get_object_recieved = false;
 	HANDLE power_request;
 
 	TTS_Windows *tts = nullptr;
@@ -467,6 +467,7 @@ class DisplayServerWindows : public DisplayServer {
 
 	struct WindowData {
 		HWND hWnd;
+		WindowID id;
 
 		Vector<Vector2> mpath;
 
@@ -480,6 +481,8 @@ class DisplayServerWindows : public DisplayServer {
 		bool multiwindow_fs = false;
 		bool borderless = false;
 		bool resizable = true;
+		bool no_min_btn = false;
+		bool no_max_btn = false;
 		bool window_focused = false;
 		int activate_state = 0;
 		bool was_maximized_pre_fs = false;
@@ -618,7 +621,7 @@ class DisplayServerWindows : public DisplayServer {
 	HashMap<int64_t, Vector2> pointer_last_pos;
 
 	void _send_window_event(const WindowData &wd, WindowEvent p_event);
-	void _get_window_style(bool p_main_window, bool p_initialized, bool p_fullscreen, bool p_multiwindow_fs, bool p_borderless, bool p_resizable, bool p_minimized, bool p_maximized, bool p_maximized_fs, bool p_no_activate_focus, bool p_embed_child, DWORD &r_style, DWORD &r_style_ex);
+	void _get_window_style(bool p_main_window, bool p_initialized, bool p_fullscreen, bool p_multiwindow_fs, bool p_borderless, bool p_resizable, bool p_no_min_btn, bool p_no_max_btn, bool p_minimized, bool p_maximized, bool p_maximized_fs, bool p_no_activate_focus, bool p_embed_child, DWORD &r_style, DWORD &r_style_ex);
 
 	MouseMode mouse_mode;
 	MouseMode mouse_mode_base = MOUSE_MODE_VISIBLE;
@@ -654,6 +657,7 @@ class DisplayServerWindows : public DisplayServer {
 	void _set_mouse_mode_impl(MouseMode p_mode);
 	WindowID _get_focused_window_or_popup() const;
 	void _register_raw_input_devices(WindowID p_target_window);
+	bool _has_moving_window() const;
 
 	void _process_activate_event(WindowID p_window_id);
 	void _process_key_events();
@@ -673,7 +677,7 @@ class DisplayServerWindows : public DisplayServer {
 	};
 	BitField<WinKeyModifierMask> _get_mods() const;
 
-	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb);
+	Error _file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, bool p_options_in_cb, WindowID p_window_id);
 
 	String _get_keyboard_layout_display_name(const String &p_klid) const;
 	String _get_klid(HKL p_hkl) const;
@@ -687,6 +691,8 @@ class DisplayServerWindows : public DisplayServer {
 
 	HWND _find_window_from_process_id(OS::ProcessID p_pid, HWND p_current_hwnd);
 
+	void initialize_tts() const;
+
 public:
 	LRESULT WndProcFileDialog(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 	LRESULT WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@@ -713,8 +719,8 @@ public:
 	virtual Color get_base_color() const override;
 	virtual void set_system_theme_change_callback(const Callable &p_callable) override;
 
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) override;
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) override;
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override;
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override;
 
 	virtual void beep() const override;
 
@@ -821,6 +827,11 @@ public:
 	virtual void window_set_ime_active(const bool p_active, WindowID p_window = MAIN_WINDOW_ID) override;
 	virtual void window_set_ime_position(const Point2i &p_pos, WindowID p_window = MAIN_WINDOW_ID) override;
 
+	virtual int accessibility_should_increase_contrast() const override;
+	virtual int accessibility_should_reduce_animation() const override;
+	virtual int accessibility_should_reduce_transparency() const override;
+	virtual int accessibility_screen_reader_active() const override;
+
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
@@ -888,5 +899,3 @@ public:
 	DisplayServerWindows(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
 	~DisplayServerWindows();
 };
-
-#endif // DISPLAY_SERVER_WINDOWS_H
diff --git a/engine/platform/windows/drop_target_windows.h b/engine/platform/windows/drop_target_windows.h
index bd0e0270..4ab8698c 100644
--- a/engine/platform/windows/drop_target_windows.h
+++ b/engine/platform/windows/drop_target_windows.h
@@ -28,18 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DROP_TARGET_WINDOWS_H
-#define DROP_TARGET_WINDOWS_H
+#pragma once
 
 #include "display_server_windows.h"
 
 #include <shlobj.h>
 
-// Silence warning due to a COM API weirdness.
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#endif
+GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor") // Silence warning due to a COM API weirdness.
 
 // https://learn.microsoft.com/en-us/windows/win32/api/ole2/nf-ole2-dodragdrop#remarks
 class DropTargetWindows : public IDropTarget {
@@ -70,8 +65,4 @@ public:
 	HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) override;
 };
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
-#endif // DROP_TARGET_WINDOWS_H
+GODOT_GCC_WARNING_POP
diff --git a/engine/platform/windows/export/export.h b/engine/platform/windows/export/export.h
index 6c4020f0..c521176e 100644
--- a/engine/platform/windows/export/export.h
+++ b/engine/platform/windows/export/export.h
@@ -28,10 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WINDOWS_EXPORT_H
-#define WINDOWS_EXPORT_H
+#pragma once
 
 void register_windows_exporter_types();
 void register_windows_exporter();
-
-#endif // WINDOWS_EXPORT_H
diff --git a/engine/platform/windows/export/export_plugin.cpp b/engine/platform/windows/export/export_plugin.cpp
index 4111aac8..6b311850 100644
--- a/engine/platform/windows/export/export_plugin.cpp
+++ b/engine/platform/windows/export/export_plugin.cpp
@@ -43,6 +43,29 @@
 
 #include "modules/svg/image_loader_svg.h"
 
+#ifdef WINDOWS_ENABLED
+#include "shlobj.h"
+
+// Converts long path to Windows UNC format.
+static String fix_path(const String &p_path) {
+	String path = p_path;
+	if (p_path.is_relative_path()) {
+		Char16String current_dir_name;
+		size_t str_len = GetCurrentDirectoryW(0, nullptr);
+		current_dir_name.resize(str_len + 1);
+		GetCurrentDirectoryW(current_dir_name.size(), (LPWSTR)current_dir_name.ptrw());
+		path = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace_char('\\', '/').path_join(path);
+	}
+	path = path.simplify_path();
+	path = path.replace_char('/', '\\');
+	if (path.size() >= MAX_PATH && !path.is_network_share_path() && !path.begins_with(R"(\\?\)")) {
+		path = R"(\\?\)" + path;
+	}
+	return path;
+}
+
+#endif
+
 Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &p_preset, const String &p_src_path, const String &p_dst_path) {
 	static const uint8_t icon_size[] = { 16, 32, 48, 64, 128, 0 /*256*/ };
 
@@ -96,7 +119,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
 		Ref<Image> src_image = _load_icon_or_splash_image(p_src_path, &err);
 		ERR_FAIL_COND_V(err != OK || src_image.is_null() || src_image->is_empty(), ERR_CANT_OPEN);
 
-		for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
+		for (size_t i = 0; i < std::size(icon_size); ++i) {
 			int size = (icon_size[i] == 0) ? 256 : icon_size[i];
 
 			Ref<Image> res_image = src_image->duplicate();
@@ -107,7 +130,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
 	}
 
 	uint16_t valid_icon_count = 0;
-	for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
+	for (size_t i = 0; i < std::size(icon_size); ++i) {
 		if (images.has(icon_size[i])) {
 			valid_icon_count++;
 		} else {
@@ -129,7 +152,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
 
 	// Write ICONDIRENTRY.
 	uint32_t img_offset = 6 + 16 * valid_icon_count;
-	for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
+	for (size_t i = 0; i < std::size(icon_size); ++i) {
 		if (images.has(icon_size[i])) {
 			const IconData &di = images[icon_size[i]];
 			fw->store_8(icon_size[i]); // Width in pixels.
@@ -146,7 +169,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
 	}
 
 	// Write image data.
-	for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
+	for (size_t i = 0; i < std::size(icon_size); ++i) {
 		if (images.has(icon_size[i])) {
 			const IconData &di = images[icon_size[i]];
 			fw->store_buffer(di.data.ptr(), di.data.size());
@@ -195,8 +218,8 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
 	bool embedded = p_preset->get("binary_format/embed_pck");
 
 	String pkg_name;
-	if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
-		pkg_name = String(ProjectSettings::get_singleton()->get("application/config/name"));
+	if (String(get_project_setting(p_preset, "application/config/name")) != "") {
+		pkg_name = String(get_project_setting(p_preset, "application/config/name"));
 	} else {
 		pkg_name = "Unnamed";
 	}
@@ -221,15 +244,15 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
 		path = tmp_dir_path.path_join(p_path.get_file().get_basename() + ".exe");
 	}
 
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 	int export_angle = p_preset->get("application/export_angle");
 	bool include_angle_libs = false;
 	if (export_angle == 0) {
-		include_angle_libs = (String(GLOBAL_GET("rendering/gl_compatibility/driver.windows")) == "opengl3_angle") && (String(GLOBAL_GET("rendering/renderer/rendering_method")) == "gl_compatibility");
+		include_angle_libs = (String(get_project_setting(p_preset, "rendering/gl_compatibility/driver.windows")) == "opengl3_angle") && (String(get_project_setting(p_preset, "rendering/renderer/rendering_method")) == "gl_compatibility");
 	} else if (export_angle == 1) {
 		include_angle_libs = true;
 	}
 	if (include_angle_libs) {
-		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 		if (da->file_exists(template_path.get_base_dir().path_join("libEGL." + arch + ".dll"))) {
 			da->copy(template_path.get_base_dir().path_join("libEGL." + arch + ".dll"), path.get_base_dir().path_join("libEGL.dll"), get_chmod_flags());
 		}
@@ -237,17 +260,19 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
 			da->copy(template_path.get_base_dir().path_join("libGLESv2." + arch + ".dll"), path.get_base_dir().path_join("libGLESv2.dll"), get_chmod_flags());
 		}
 	}
+	if (da->file_exists(template_path.get_base_dir().path_join("accesskit." + arch + ".dll"))) {
+		da->copy(template_path.get_base_dir().path_join("accesskit." + arch + ".dll"), path.get_base_dir().path_join("accesskit." + arch + ".dll"), get_chmod_flags());
+	}
 
 	int export_d3d12 = p_preset->get("application/export_d3d12");
 	bool agility_sdk_multiarch = p_preset->get("application/d3d12_agility_sdk_multiarch");
 	bool include_d3d12_extra_libs = false;
 	if (export_d3d12 == 0) {
-		include_d3d12_extra_libs = (String(GLOBAL_GET("rendering/rendering_device/driver.windows")) == "d3d12") && (String(GLOBAL_GET("rendering/renderer/rendering_method")) != "gl_compatibility");
+		include_d3d12_extra_libs = (String(get_project_setting(p_preset, "rendering/rendering_device/driver.windows")) == "d3d12") && (String(get_project_setting(p_preset, "rendering/renderer/rendering_method")) != "gl_compatibility");
 	} else if (export_d3d12 == 1) {
 		include_d3d12_extra_libs = true;
 	}
 	if (include_d3d12_extra_libs) {
-		Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 		if (da->file_exists(template_path.get_base_dir().path_join("D3D12Core." + arch + ".dll"))) {
 			if (agility_sdk_multiarch) {
 				da->make_dir_recursive(path.get_base_dir().path_join(arch));
@@ -316,6 +341,23 @@ Error EditorExportPlatformWindows::export_project(const Ref<EditorExportPreset>
 			tmp_app_dir->change_dir("..");
 			tmp_app_dir->remove(pkg_name);
 		}
+#ifdef WINDOWS_ENABLED
+	} else {
+		// Update Windows icon cache.
+		String w_path = fix_path(path);
+		SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH, (LPCWSTR)w_path.utf16().get_data(), nullptr);
+
+		String wrapper_path = path.get_basename() + ".console.exe";
+		if (FileAccess::exists(wrapper_path)) {
+			String w_wrapper_path = fix_path(wrapper_path);
+			SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH, (LPCWSTR)w_wrapper_path.utf16().get_data(), nullptr);
+		}
+
+		w_path = fix_path(path.get_base_dir());
+		SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH, (LPCWSTR)w_path.utf16().get_data(), nullptr);
+
+		SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, nullptr, nullptr);
+#endif
 	}
 
 	return err;
@@ -489,10 +531,10 @@ Error EditorExportPlatformWindows::_rcedit_add_data(const Ref<EditorExportPreset
 	String icon_path;
 	if (p_preset->get("application/icon") != "") {
 		icon_path = p_preset->get("application/icon");
-	} else if (GLOBAL_GET("application/config/windows_native_icon") != "") {
-		icon_path = GLOBAL_GET("application/config/windows_native_icon");
+	} else if (get_project_setting(p_preset, "application/config/windows_native_icon") != "") {
+		icon_path = get_project_setting(p_preset, "application/config/windows_native_icon");
 	} else {
-		icon_path = GLOBAL_GET("application/config/icon");
+		icon_path = get_project_setting(p_preset, "application/config/icon");
 	}
 	icon_path = ProjectSettings::get_singleton()->globalize_path(icon_path);
 
diff --git a/engine/platform/windows/export/export_plugin.h b/engine/platform/windows/export/export_plugin.h
index 89db4494..1054bfae 100644
--- a/engine/platform/windows/export/export_plugin.h
+++ b/engine/platform/windows/export/export_plugin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WINDOWS_EXPORT_PLUGIN_H
-#define WINDOWS_EXPORT_PLUGIN_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/os/os.h"
@@ -100,5 +99,3 @@ public:
 
 	EditorExportPlatformWindows();
 };
-
-#endif // WINDOWS_EXPORT_PLUGIN_H
diff --git a/engine/platform/windows/export/logo.svg b/engine/platform/windows/export/logo.svg
index fd7d6bd3..07f1f30b 100644
--- a/engine/platform/windows/export/logo.svg
+++ b/engine/platform/windows/export/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#00abed" d="m1 5.132 12.295-1.694v11.879H1zm0 21.736 12.295 1.695V16.83H1zm13.647 1.875L31 31V16.83H14.647zm0-25.486v12.06H31V1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32"><path fill="#00abed" d="m1 5.132 12.295-1.694v11.879H1zm0 21.736 12.295 1.695V16.83H1zm13.647 1.875L31 31V16.83H14.647zm0-25.486v12.06H31V1z"/></svg>
diff --git a/engine/platform/windows/export/run_icon.svg b/engine/platform/windows/export/run_icon.svg
index 5a21fc13..be7caebf 100644
--- a/engine/platform/windows/export/run_icon.svg
+++ b/engine/platform/windows/export/run_icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="m1.095 2.997 5.66-.78v5.469h-5.66zm0 10.006 5.66.78v-5.4h-5.66zm6.282.863 7.528 1.04V8.381H7.377Zm0-11.732v5.552h7.528V1.095Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="16" height="16"><path fill="#e0e0e0" d="m1.095 2.997 5.66-.78v5.469h-5.66zm0 10.006 5.66.78v-5.4h-5.66zm6.282.863 7.528 1.04V8.381H7.377Zm0-11.732v5.552h7.528V1.095Z"/></svg>
diff --git a/engine/platform/windows/gl_manager_windows_angle.h b/engine/platform/windows/gl_manager_windows_angle.h
index 9c02912b..1ae6e8c1 100644
--- a/engine/platform/windows/gl_manager_windows_angle.h
+++ b/engine/platform/windows/gl_manager_windows_angle.h
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GL_MANAGER_WINDOWS_ANGLE_H
-#define GL_MANAGER_WINDOWS_ANGLE_H
+#pragma once
 
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/error/error_list.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "drivers/egl/egl_manager.h"
@@ -57,5 +55,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED && GLES3_ENABLED
-
-#endif // GL_MANAGER_WINDOWS_ANGLE_H
diff --git a/engine/platform/windows/gl_manager_windows_native.cpp b/engine/platform/windows/gl_manager_windows_native.cpp
index 2a66ce00..88fe1d88 100644
--- a/engine/platform/windows/gl_manager_windows_native.cpp
+++ b/engine/platform/windows/gl_manager_windows_native.cpp
@@ -170,7 +170,7 @@ void GLManagerNative_Windows::_nvapi_setup_profile() {
 	// We need a name anyways, so let's use the engine name if an application name is not available
 	// (this is used mostly by the Project Manager)
 	if (app_profile_name.is_empty()) {
-		app_profile_name = VERSION_NAME;
+		app_profile_name = GODOT_VERSION_NAME;
 	}
 	String old_profile_name = app_profile_name + " Nvidia Profile";
 	Char16String app_profile_name_u16 = app_profile_name.utf16();
diff --git a/engine/platform/windows/gl_manager_windows_native.h b/engine/platform/windows/gl_manager_windows_native.h
index 532092ae..c4d66bfa 100644
--- a/engine/platform/windows/gl_manager_windows_native.h
+++ b/engine/platform/windows/gl_manager_windows_native.h
@@ -28,12 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GL_MANAGER_WINDOWS_NATIVE_H
-#define GL_MANAGER_WINDOWS_NATIVE_H
+#pragma once
 
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
-#include "core/error/error_list.h"
 #include "core/os/os.h"
 #include "core/templates/local_vector.h"
 #include "servers/display_server.h"
@@ -105,5 +103,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED && GLES3_ENABLED
-
-#endif // GL_MANAGER_WINDOWS_NATIVE_H
diff --git a/engine/platform/windows/godot_res.rc b/engine/platform/windows/godot_res.rc
index 86191ad9..039fde9d 100644
--- a/engine/platform/windows/godot_res.rc
+++ b/engine/platform/windows/godot_res.rc
@@ -8,8 +8,8 @@ GODOT_ICON ICON platform/windows/godot.ico
 1 RT_MANIFEST "godot.manifest"
 
 1 VERSIONINFO
-FILEVERSION     VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
-PRODUCTVERSION  VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
+FILEVERSION     GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
+PRODUCTVERSION  GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
 FILEOS          4
 FILETYPE        1
 BEGIN
@@ -18,13 +18,13 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName",            "Godot Engine"
-            VALUE "FileDescription",        VERSION_NAME
-            VALUE "FileVersion",            VERSION_NUMBER
-            VALUE "ProductName",            VERSION_NAME
+            VALUE "FileDescription",        GODOT_VERSION_NAME
+            VALUE "FileVersion",            GODOT_VERSION_NUMBER
+            VALUE "ProductName",            GODOT_VERSION_NAME
             VALUE "Licence",                "MIT"
             VALUE "LegalCopyright",         "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors"
             VALUE "Info",                   "https://godotengine.org"
-            VALUE "ProductVersion",         VERSION_FULL_BUILD
+            VALUE "ProductVersion",         GODOT_VERSION_FULL_BUILD
         END
     END
     BLOCK "VarFileInfo"
diff --git a/engine/platform/windows/godot_res_wrap.rc b/engine/platform/windows/godot_res_wrap.rc
index 61e61004..d6e1f0bf 100644
--- a/engine/platform/windows/godot_res_wrap.rc
+++ b/engine/platform/windows/godot_res_wrap.rc
@@ -8,8 +8,8 @@ GODOT_ICON ICON platform/windows/godot_console.ico
 1 RT_MANIFEST "godot.manifest"
 
 1 VERSIONINFO
-FILEVERSION     VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
-PRODUCTVERSION  VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0
+FILEVERSION     GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
+PRODUCTVERSION  GODOT_VERSION_MAJOR,GODOT_VERSION_MINOR,GODOT_VERSION_PATCH,0
 FILEOS          4
 FILETYPE        1
 BEGIN
@@ -18,13 +18,13 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName",            "Godot Engine"
-            VALUE "FileDescription",        VERSION_NAME " (Console)"
-            VALUE "FileVersion",            VERSION_NUMBER
-            VALUE "ProductName",            VERSION_NAME " (Console)"
+            VALUE "FileDescription",        GODOT_VERSION_NAME " (Console)"
+            VALUE "FileVersion",            GODOT_VERSION_NUMBER
+            VALUE "ProductName",            GODOT_VERSION_NAME " (Console)"
             VALUE "Licence",                "MIT"
             VALUE "LegalCopyright",         "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors"
             VALUE "Info",                   "https://godotengine.org"
-            VALUE "ProductVersion",         VERSION_FULL_BUILD
+            VALUE "ProductVersion",         GODOT_VERSION_FULL_BUILD
         END
     END
     BLOCK "VarFileInfo"
diff --git a/engine/platform/windows/joypad_windows.cpp b/engine/platform/windows/joypad_windows.cpp
index 15afaea6..61386191 100644
--- a/engine/platform/windows/joypad_windows.cpp
+++ b/engine/platform/windows/joypad_windows.cpp
@@ -479,7 +479,7 @@ void JoypadWindows::process_joypads() {
 }
 
 void JoypadWindows::post_hat(int p_device, DWORD p_dpad) {
-	BitField<HatMask> dpad_val;
+	BitField<HatMask> dpad_val = HatMask::CENTER;
 
 	// Should be -1 when centered, but according to docs:
 	// "Some drivers report the centered position of the POV indicator as 65,535. Determine whether the indicator is centered as follows:
diff --git a/engine/platform/windows/joypad_windows.h b/engine/platform/windows/joypad_windows.h
index b56f80cb..de0db6d5 100644
--- a/engine/platform/windows/joypad_windows.h
+++ b/engine/platform/windows/joypad_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOYPAD_WINDOWS_H
-#define JOYPAD_WINDOWS_H
+#pragma once
 
 #include "os_windows.h"
 
@@ -148,5 +147,3 @@ private:
 	XInputSetState_t xinput_set_state;
 	joyGetDevCaps_t winmm_get_joycaps; // Only for reading info on XInput joypads.
 };
-
-#endif // JOYPAD_WINDOWS_H
diff --git a/engine/platform/windows/key_mapping_windows.h b/engine/platform/windows/key_mapping_windows.h
index e6f184a2..be4988e8 100644
--- a/engine/platform/windows/key_mapping_windows.h
+++ b/engine/platform/windows/key_mapping_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KEY_MAPPING_WINDOWS_H
-#define KEY_MAPPING_WINDOWS_H
+#pragma once
 
 #include "core/os/keyboard.h"
 
@@ -49,5 +48,3 @@ public:
 	static bool is_extended_key(unsigned int p_code);
 	static KeyLocation get_location(unsigned int p_code, bool p_extended);
 };
-
-#endif // KEY_MAPPING_WINDOWS_H
diff --git a/engine/platform/windows/lang_table.h b/engine/platform/windows/lang_table.h
index e1f4f727..9f2117ec 100644
--- a/engine/platform/windows/lang_table.h
+++ b/engine/platform/windows/lang_table.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LANG_TABLE_H
-#define LANG_TABLE_H
+#pragma once
 
 struct _WinLocale {
 	const char *locale;
@@ -187,5 +186,3 @@ static const _WinLocale _win_locales[] = {
 	{ "zh_TW", LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL },
 	{ 0, 0, 0 },
 };
-
-#endif // LANG_TABLE_H
diff --git a/engine/platform/windows/msvs.py b/engine/platform/windows/msvs.py
index 2d5ebe81..ff8a3798 100644
--- a/engine/platform/windows/msvs.py
+++ b/engine/platform/windows/msvs.py
@@ -12,9 +12,13 @@ def get_configurations():
 
 
 def get_build_prefix(env):
+    if not env.msvc:
+        return []
     batch_file = methods.find_visual_c_batch_file(env)
     return [
+        "cmd /V /C",
         "set &quot;plat=$(PlatformTarget)&quot;",
-        "(if &quot;$(PlatformTarget)&quot;==&quot;x64&quot; (set &quot;plat=x86_amd64&quot;))",
-        f"call &quot;{batch_file}&quot; !plat!",
+        "^&amp; (if &quot;$(PlatformTarget)&quot;==&quot;x64&quot; (set &quot;plat=x86_amd64&quot;))",
+        f"^&amp; call &quot;{batch_file}&quot; !plat!",
+        "^&amp;",
     ]
diff --git a/engine/platform/windows/native_menu_windows.h b/engine/platform/windows/native_menu_windows.h
index c23ac61f..785772c8 100644
--- a/engine/platform/windows/native_menu_windows.h
+++ b/engine/platform/windows/native_menu_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NATIVE_MENU_WINDOWS_H
-#define NATIVE_MENU_WINDOWS_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/templates/hash_map.h"
@@ -153,5 +152,3 @@ public:
 	NativeMenuWindows();
 	~NativeMenuWindows();
 };
-
-#endif // NATIVE_MENU_WINDOWS_H
diff --git a/engine/platform/windows/os_windows.cpp b/engine/platform/windows/os_windows.cpp
index 7ef3de2d..e5737df2 100644
--- a/engine/platform/windows/os_windows.cpp
+++ b/engine/platform/windows/os_windows.cpp
@@ -113,10 +113,10 @@ static String fix_path(const String &p_path) {
 		size_t str_len = GetCurrentDirectoryW(0, nullptr);
 		current_dir_name.resize(str_len + 1);
 		GetCurrentDirectoryW(current_dir_name.size(), (LPWSTR)current_dir_name.ptrw());
-		path = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace("\\", "/").path_join(path);
+		path = String::utf16((const char16_t *)current_dir_name.get_data()).trim_prefix(R"(\\?\)").replace_char('\\', '/').path_join(path);
 	}
 	path = path.simplify_path();
-	path = path.replace("/", "\\");
+	path = path.replace_char('/', '\\');
 	if (path.size() >= MAX_PATH && !path.is_network_share_path() && !path.begins_with(R"(\\?\)")) {
 		path = R"(\\?\)" + path;
 	}
@@ -132,7 +132,7 @@ static String format_error_message(DWORD id) {
 
 	LocalFree(messageBuffer);
 
-	return msg.replace("\r", "").replace("\n", "");
+	return msg.remove_chars("\r\n");
 }
 
 void RedirectStream(const char *p_file_name, const char *p_mode, FILE *p_cpp_stream, const DWORD p_std_handle) {
@@ -195,7 +195,7 @@ bool OS_Windows::is_using_con_wrapper() const {
 			WCHAR proc_name[MAX_PATH];
 			DWORD len = MAX_PATH;
 			if (QueryFullProcessImageNameW(process, 0, &proc_name[0], &len)) {
-				String name = String::utf16((const char16_t *)&proc_name[0], len).replace("\\", "/").to_lower();
+				String name = String::utf16((const char16_t *)&proc_name[0], len).replace_char('\\', '/').to_lower();
 				if (name == exe_name) {
 					found_exe = true;
 				}
@@ -787,7 +787,7 @@ bool OS_Windows::get_user_prefers_integrated_gpu() const {
 			GetCurrentApplicationUserModelIdPtr GetCurrentApplicationUserModelId = (GetCurrentApplicationUserModelIdPtr)(void *)GetProcAddress(kernel32, "GetCurrentApplicationUserModelId");
 
 			if (GetCurrentApplicationUserModelId) {
-				UINT32 length = sizeof(value_name) / sizeof(value_name[0]);
+				UINT32 length = std::size(value_name);
 				LONG result = GetCurrentApplicationUserModelId(&length, value_name);
 				if (result == ERROR_SUCCESS) {
 					is_packaged = true;
@@ -966,13 +966,211 @@ static void _append_to_pipe(char *p_bytes, int p_size, String *r_pipe, Mutex *p_
 		// Let's hope it's compatible with UTF-8.
 		(*r_pipe) += String::utf8(p_bytes, p_size);
 	} else {
-		(*r_pipe) += String(wchars.ptr(), total_wchars);
+		(*r_pipe) += String::utf16((char16_t *)wchars.ptr(), total_wchars);
 	}
 	if (p_pipe_mutex) {
 		p_pipe_mutex->unlock();
 	}
 }
 
+void OS_Windows::_init_encodings() {
+	encodings[""] = 0;
+	encodings["CP_ACP"] = 0;
+	encodings["CP_OEMCP"] = 1;
+	encodings["CP_MACCP"] = 2;
+	encodings["CP_THREAD_ACP"] = 3;
+	encodings["CP_SYMBOL"] = 42;
+	encodings["IBM037"] = 37;
+	encodings["IBM437"] = 437;
+	encodings["IBM500"] = 500;
+	encodings["ASMO-708"] = 708;
+	encodings["ASMO-449"] = 709;
+	encodings["DOS-710"] = 710;
+	encodings["DOS-720"] = 720;
+	encodings["IBM737"] = 737;
+	encodings["IBM775"] = 775;
+	encodings["IBM850"] = 850;
+	encodings["IBM852"] = 852;
+	encodings["IBM855"] = 855;
+	encodings["IBM857"] = 857;
+	encodings["IBM00858"] = 858;
+	encodings["IBM860"] = 860;
+	encodings["IBM861"] = 861;
+	encodings["DOS-862"] = 862;
+	encodings["IBM863"] = 863;
+	encodings["IBM864"] = 864;
+	encodings["IBM865"] = 865;
+	encodings["CP866"] = 866;
+	encodings["IBM869"] = 869;
+	encodings["IBM870"] = 870;
+	encodings["WINDOWS-874"] = 874;
+	encodings["CP875"] = 875;
+	encodings["SHIFT_JIS"] = 932;
+	encodings["GB2312"] = 936;
+	encodings["KS_C_5601-1987"] = 949;
+	encodings["BIG5"] = 950;
+	encodings["IBM1026"] = 1026;
+	encodings["IBM01047"] = 1047;
+	encodings["IBM01140"] = 1140;
+	encodings["IBM01141"] = 1141;
+	encodings["IBM01142"] = 1142;
+	encodings["IBM01143"] = 1143;
+	encodings["IBM01144"] = 1144;
+	encodings["IBM01145"] = 1145;
+	encodings["IBM01146"] = 1146;
+	encodings["IBM01147"] = 1147;
+	encodings["IBM01148"] = 1148;
+	encodings["IBM01149"] = 1149;
+	encodings["UTF-16"] = 1200;
+	encodings["UNICODEFFFE"] = 1201;
+	encodings["WINDOWS-1250"] = 1250;
+	encodings["WINDOWS-1251"] = 1251;
+	encodings["WINDOWS-1252"] = 1252;
+	encodings["WINDOWS-1253"] = 1253;
+	encodings["WINDOWS-1254"] = 1254;
+	encodings["WINDOWS-1255"] = 1255;
+	encodings["WINDOWS-1256"] = 1256;
+	encodings["WINDOWS-1257"] = 1257;
+	encodings["WINDOWS-1258"] = 1258;
+	encodings["JOHAB"] = 1361;
+	encodings["MACINTOSH"] = 10000;
+	encodings["X-MAC-JAPANESE"] = 10001;
+	encodings["X-MAC-CHINESETRAD"] = 10002;
+	encodings["X-MAC-KOREAN"] = 10003;
+	encodings["X-MAC-ARABIC"] = 10004;
+	encodings["X-MAC-HEBREW"] = 10005;
+	encodings["X-MAC-GREEK"] = 10006;
+	encodings["X-MAC-CYRILLIC"] = 10007;
+	encodings["X-MAC-CHINESESIMP"] = 10008;
+	encodings["X-MAC-ROMANIAN"] = 10010;
+	encodings["X-MAC-UKRAINIAN"] = 10017;
+	encodings["X-MAC-THAI"] = 10021;
+	encodings["X-MAC-CE"] = 10029;
+	encodings["X-MAC-ICELANDIC"] = 10079;
+	encodings["X-MAC-TURKISH"] = 10081;
+	encodings["X-MAC-CROATIAN"] = 10082;
+	encodings["UTF-32"] = 12000;
+	encodings["UTF-32BE"] = 12001;
+	encodings["X-CHINESE_CNS"] = 20000;
+	encodings["X-CP20001"] = 20001;
+	encodings["X_CHINESE-ETEN"] = 20002;
+	encodings["X-CP20003"] = 20003;
+	encodings["X-CP20004"] = 20004;
+	encodings["X-CP20005"] = 20005;
+	encodings["X-IA5"] = 20105;
+	encodings["X-IA5-GERMAN"] = 20106;
+	encodings["X-IA5-SWEDISH"] = 20107;
+	encodings["X-IA5-NORWEGIAN"] = 20108;
+	encodings["US-ASCII"] = 20127;
+	encodings["X-CP20261"] = 20261;
+	encodings["X-CP20269"] = 20269;
+	encodings["IBM273"] = 20273;
+	encodings["IBM277"] = 20277;
+	encodings["IBM278"] = 20278;
+	encodings["IBM280"] = 20280;
+	encodings["IBM284"] = 20284;
+	encodings["IBM285"] = 20285;
+	encodings["IBM290"] = 20290;
+	encodings["IBM297"] = 20297;
+	encodings["IBM420"] = 20420;
+	encodings["IBM423"] = 20423;
+	encodings["IBM424"] = 20424;
+	encodings["X-EBCDIC-KOREANEXTENDED"] = 20833;
+	encodings["IBM-THAI"] = 20838;
+	encodings["KOI8-R"] = 20866;
+	encodings["IBM871"] = 20871;
+	encodings["IBM880"] = 20880;
+	encodings["IBM905"] = 20905;
+	encodings["IBM00924"] = 20924;
+	encodings["EUC-JP"] = 20932;
+	encodings["X-CP20936"] = 20936;
+	encodings["X-CP20949"] = 20949;
+	encodings["CP1025"] = 21025;
+	encodings["KOI8-U"] = 21866;
+	encodings["ISO-8859-1"] = 28591;
+	encodings["ISO-8859-2"] = 28592;
+	encodings["ISO-8859-3"] = 28593;
+	encodings["ISO-8859-4"] = 28594;
+	encodings["ISO-8859-5"] = 28595;
+	encodings["ISO-8859-6"] = 28596;
+	encodings["ISO-8859-7"] = 28597;
+	encodings["ISO-8859-8"] = 28598;
+	encodings["ISO-8859-9"] = 28599;
+	encodings["ISO-8859-13"] = 28603;
+	encodings["ISO-8859-15"] = 28605;
+	encodings["X-EUROPA"] = 29001;
+	encodings["ISO-8859-8-I"] = 38598;
+	encodings["ISO-2022-JP"] = 50220;
+	encodings["CSISO2022JP"] = 50221;
+	encodings["ISO-2022-JP"] = 50222;
+	encodings["ISO-2022-KR"] = 50225;
+	encodings["X-CP50227"] = 50227;
+	encodings["EBCDIC-JP"] = 50930;
+	encodings["EBCDIC-US-JP"] = 50931;
+	encodings["EBCDIC-KR"] = 50933;
+	encodings["EBCDIC-CN-eXT"] = 50935;
+	encodings["EBCDIC-CN"] = 50936;
+	encodings["EBCDIC-US-CN"] = 50937;
+	encodings["EBCDIC-JP-EXT"] = 50939;
+	encodings["EUC-JP"] = 51932;
+	encodings["EUC-CN"] = 51936;
+	encodings["EUC-KR"] = 51949;
+	encodings["HZ-GB-2312"] = 52936;
+	encodings["GB18030"] = 54936;
+	encodings["X-ISCII-DE"] = 57002;
+	encodings["X-ISCII-BE"] = 57003;
+	encodings["X-ISCII-TA"] = 57004;
+	encodings["X-ISCII-TE"] = 57005;
+	encodings["X-ISCII-AS"] = 57006;
+	encodings["X-ISCII-OR"] = 57007;
+	encodings["X-ISCII-KA"] = 57008;
+	encodings["X-ISCII-MA"] = 57009;
+	encodings["X-ISCII-GU"] = 57010;
+	encodings["X-ISCII-PA"] = 57011;
+	encodings["UTF-7"] = 65000;
+	encodings["UTF-8"] = 65001;
+}
+
+String OS_Windows::multibyte_to_string(const String &p_encoding, const PackedByteArray &p_array) const {
+	const int *encoding = encodings.getptr(p_encoding.to_upper());
+	ERR_FAIL_NULL_V_MSG(encoding, String(), "Conversion failed: Unknown encoding");
+
+	LocalVector<wchar_t> wchars;
+	int total_wchars = MultiByteToWideChar(*encoding, 0, (const char *)p_array.ptr(), p_array.size(), nullptr, 0);
+	if (total_wchars == 0) {
+		DWORD err_code = GetLastError();
+		ERR_FAIL_V_MSG(String(), vformat("Conversion failed: %s", format_error_message(err_code)));
+	}
+	wchars.resize(total_wchars);
+	if (MultiByteToWideChar(*encoding, 0, (const char *)p_array.ptr(), p_array.size(), wchars.ptr(), total_wchars) == 0) {
+		DWORD err_code = GetLastError();
+		ERR_FAIL_V_MSG(String(), vformat("Conversion failed: %s", format_error_message(err_code)));
+	}
+
+	return String::utf16((const char16_t *)wchars.ptr(), wchars.size());
+}
+
+PackedByteArray OS_Windows::string_to_multibyte(const String &p_encoding, const String &p_string) const {
+	const int *encoding = encodings.getptr(p_encoding.to_upper());
+	ERR_FAIL_NULL_V_MSG(encoding, PackedByteArray(), "Conversion failed: Unknown encoding");
+
+	Char16String charstr = p_string.utf16();
+	PackedByteArray ret;
+	int total_mbchars = WideCharToMultiByte(*encoding, 0, (const wchar_t *)charstr.ptr(), charstr.size(), nullptr, 0, nullptr, nullptr);
+	if (total_mbchars == 0) {
+		DWORD err_code = GetLastError();
+		ERR_FAIL_V_MSG(PackedByteArray(), vformat("Conversion failed: %s", format_error_message(err_code)));
+	}
+
+	ret.resize(total_mbchars);
+	if (WideCharToMultiByte(*encoding, 0, (const wchar_t *)charstr.ptr(), charstr.size(), (char *)ret.ptrw(), ret.size(), nullptr, nullptr) == 0) {
+		DWORD err_code = GetLastError();
+		ERR_FAIL_V_MSG(PackedByteArray(), vformat("Conversion failed: %s", format_error_message(err_code)));
+	}
+
+	return ret;
+}
+
 Dictionary OS_Windows::get_memory_info() const {
 	Dictionary meminfo;
 
@@ -1456,10 +1654,7 @@ Vector<String> OS_Windows::get_system_fonts() const {
 	return ret;
 }
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
-#endif
+GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wnon-virtual-dtor") // Silence warning due to a COM API weirdness.
 
 class FallbackTextAnalysisSource : public IDWriteTextAnalysisSource {
 	LONG _cRef = 1;
@@ -1543,9 +1738,7 @@ public:
 	virtual ~FallbackTextAnalysisSource() {}
 };
 
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+GODOT_GCC_WARNING_POP
 
 String OS_Windows::_get_default_fontname(const String &p_font_name) const {
 	String font_name = p_font_name;
@@ -1686,7 +1879,7 @@ Vector<String> OS_Windows::get_system_font_path_for_text(const String &p_font_na
 		if (FAILED(hr)) {
 			continue;
 		}
-		String fpath = String::utf16((const char16_t *)&file_path[0]).replace("\\", "/");
+		String fpath = String::utf16((const char16_t *)&file_path[0]).replace_char('\\', '/');
 
 		WIN32_FIND_DATAW d;
 		HANDLE fnd = FindFirstFileW((LPCWSTR)&file_path[0], &d);
@@ -1765,7 +1958,7 @@ String OS_Windows::get_system_font_path(const String &p_font_name, int p_weight,
 		if (FAILED(hr)) {
 			continue;
 		}
-		String fpath = String::utf16((const char16_t *)&file_path[0]).replace("\\", "/");
+		String fpath = String::utf16((const char16_t *)&file_path[0]).replace_char('\\', '/');
 
 		WIN32_FIND_DATAW d;
 		HANDLE fnd = FindFirstFileW((LPCWSTR)&file_path[0], &d);
@@ -1785,7 +1978,7 @@ String OS_Windows::get_system_font_path(const String &p_font_name, int p_weight,
 String OS_Windows::get_executable_path() const {
 	WCHAR bufname[4096];
 	GetModuleFileNameW(nullptr, bufname, 4096);
-	String s = String::utf16((const char16_t *)bufname).replace("\\", "/");
+	String s = String::utf16((const char16_t *)bufname).replace_char('\\', '/');
 	return s;
 }
 
@@ -2002,14 +2195,14 @@ String OS_Windows::get_locale() const {
 		}
 
 		if (lang == wl->main_lang && sublang == wl->sublang) {
-			return String(wl->locale).replace("-", "_");
+			return String(wl->locale).replace_char('-', '_');
 		}
 
 		wl++;
 	}
 
 	if (!neutral.is_empty()) {
-		return String(neutral).replace("-", "_");
+		return String(neutral).replace_char('-', '_');
 	}
 
 	return "en";
@@ -2138,7 +2331,7 @@ uint64_t OS_Windows::get_embedded_pck_offset() const {
 
 String OS_Windows::get_config_path() const {
 	if (has_environment("APPDATA")) {
-		return get_environment("APPDATA").replace("\\", "/");
+		return get_environment("APPDATA").replace_char('\\', '/');
 	}
 	return ".";
 }
@@ -2151,7 +2344,7 @@ String OS_Windows::get_cache_path() const {
 	static String cache_path_cache;
 	if (cache_path_cache.is_empty()) {
 		if (has_environment("LOCALAPPDATA")) {
-			cache_path_cache = get_environment("LOCALAPPDATA").replace("\\", "/");
+			cache_path_cache = get_environment("LOCALAPPDATA").replace_char('\\', '/');
 		}
 		if (cache_path_cache.is_empty()) {
 			cache_path_cache = get_temp_path();
@@ -2181,12 +2374,12 @@ String OS_Windows::get_temp_path() const {
 			temp_path_cache = get_config_path();
 		}
 	}
-	return temp_path_cache.replace("\\", "/").trim_suffix("/");
+	return temp_path_cache.replace_char('\\', '/').trim_suffix("/");
 }
 
 // Get properly capitalized engine name for system paths
 String OS_Windows::get_godot_dir_name() const {
-	return String(VERSION_SHORT_NAME).capitalize();
+	return String(GODOT_VERSION_SHORT_NAME).capitalize();
 }
 
 String OS_Windows::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
@@ -2222,19 +2415,19 @@ String OS_Windows::get_system_dir(SystemDir p_dir, bool p_shared_storage) const
 	PWSTR szPath;
 	HRESULT res = SHGetKnownFolderPath(id, 0, nullptr, &szPath);
 	ERR_FAIL_COND_V(res != S_OK, String());
-	String path = String::utf16((const char16_t *)szPath).replace("\\", "/");
+	String path = String::utf16((const char16_t *)szPath).replace_char('\\', '/');
 	CoTaskMemFree(szPath);
 	return path;
 }
 
 String OS_Windows::get_user_data_dir(const String &p_user_dir) const {
-	return get_data_path().path_join(p_user_dir).replace("\\", "/");
+	return get_data_path().path_join(p_user_dir).replace_char('\\', '/');
 }
 
 String OS_Windows::get_unique_id() const {
 	HW_PROFILE_INFOA HwProfInfo;
 	ERR_FAIL_COND_V(!GetCurrentHwProfileA(&HwProfInfo), "");
-	return String((HwProfInfo.szHwProfileGuid), HW_PROFILE_GUIDLEN);
+	return String::ascii(Span((HwProfInfo.szHwProfileGuid), HW_PROFILE_GUIDLEN));
 }
 
 bool OS_Windows::_check_internal_feature_support(const String &p_feature) {
@@ -2307,7 +2500,7 @@ String OS_Windows::get_system_ca_certificates() {
 		PackedByteArray pba;
 		pba.resize(size);
 		CryptBinaryToStringA(curr->pbCertEncoded, curr->cbCertEncoded, CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, (char *)pba.ptrw(), &size);
-		certs += String((char *)pba.ptr(), size);
+		certs += String::ascii(Span((char *)pba.ptr(), size));
 		curr = CertEnumCertificatesInStore(cert_store, curr);
 	}
 	CertCloseStore(cert_store, 0);
@@ -2340,18 +2533,26 @@ void OS_Windows::add_frame_delay(bool p_can_draw) {
 		target_ticks += dynamic_delay;
 		uint64_t current_ticks = get_ticks_usec();
 
-		if (target_ticks > current_ticks + delay_resolution) {
-			uint64_t delay_time = target_ticks - current_ticks - delay_resolution;
-			// Make sure we always sleep for a multiple of delay_resolution to avoid overshooting.
-			// Refer to: https://learn.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sleep#remarks
-			delay_time = (delay_time / delay_resolution) * delay_resolution;
-			if (delay_time > 0) {
-				delay_usec(delay_time);
+		if (!is_in_low_processor_usage_mode()) {
+			if (target_ticks > current_ticks + delay_resolution) {
+				uint64_t delay_time = target_ticks - current_ticks - delay_resolution;
+				// Make sure we always sleep for a multiple of delay_resolution to avoid overshooting.
+				// Refer to: https://learn.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sleep#remarks
+				delay_time = (delay_time / delay_resolution) * delay_resolution;
+				if (delay_time > 0) {
+					delay_usec(delay_time);
+				}
+			}
+			// Busy wait for the remainder of time.
+			while (get_ticks_usec() < target_ticks) {
+				YieldProcessor();
+			}
+		} else {
+			// Use a more relaxed approach for low processor usage mode.
+			// This has worse frame pacing but is more power efficient.
+			if (current_ticks < target_ticks) {
+				delay_usec(target_ticks - current_ticks);
 			}
-		}
-		// Busy wait for the remainder of time.
-		while (get_ticks_usec() < target_ticks) {
-			YieldProcessor();
 		}
 
 		current_ticks = get_ticks_usec();
@@ -2359,7 +2560,7 @@ void OS_Windows::add_frame_delay(bool p_can_draw) {
 	}
 }
 
-bool OS_Windows::_test_create_rendering_device() const {
+bool OS_Windows::_test_create_rendering_device(const String &p_display_driver) const {
 	// Tests Rendering Device creation.
 
 	bool ok = false;
@@ -2394,7 +2595,7 @@ bool OS_Windows::_test_create_rendering_device() const {
 	return ok;
 }
 
-bool OS_Windows::_test_create_rendering_device_and_gl() const {
+bool OS_Windows::_test_create_rendering_device_and_gl(const String &p_display_driver) const {
 	// Tests OpenGL context and Rendering Device simultaneous creation. This function is expected to crash on some NVIDIA drivers.
 
 	WNDCLASSEXW wc_probe;
@@ -2438,7 +2639,7 @@ bool OS_Windows::_test_create_rendering_device_and_gl() const {
 	}
 
 	if (ok) {
-		ok = _test_create_rendering_device();
+		ok = _test_create_rendering_device(p_display_driver);
 	}
 
 #ifdef GLES3_ENABLED
@@ -2455,6 +2656,8 @@ bool OS_Windows::_test_create_rendering_device_and_gl() const {
 OS_Windows::OS_Windows(HINSTANCE _hInstance) {
 	hInstance = _hInstance;
 
+	_init_encodings();
+
 	// Reset CWD to ensure long path is used.
 	Char16String current_dir_name;
 	size_t str_len = GetCurrentDirectoryW(0, nullptr);
diff --git a/engine/platform/windows/os_windows.h b/engine/platform/windows/os_windows.h
index c46d86a6..a7df3e07 100644
--- a/engine/platform/windows/os_windows.h
+++ b/engine/platform/windows/os_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OS_WINDOWS_H
-#define OS_WINDOWS_H
+#pragma once
 
 #include "crash_handler_windows.h"
 #include "key_mapping_windows.h"
@@ -137,6 +136,9 @@ class OS_Windows : public OS {
 
 	bool is_using_con_wrapper() const;
 
+	HashMap<String, int> encodings;
+	void _init_encodings();
+
 	// functions used by main to initialize/deinitialize the OS
 protected:
 	virtual void initialize() override;
@@ -242,6 +244,9 @@ public:
 
 	virtual bool _check_internal_feature_support(const String &p_feature) override;
 
+	virtual String multibyte_to_string(const String &p_encoding, const PackedByteArray &p_array) const override;
+	virtual PackedByteArray string_to_multibyte(const String &p_encoding, const String &p_string) const override;
+
 	virtual void disable_crash_handler() override;
 	virtual bool is_disable_crash_handler() const override;
 	virtual void initialize_debugging() override;
@@ -252,12 +257,10 @@ public:
 
 	void set_main_window(HWND p_main_window) { main_window = p_main_window; }
 
-	virtual bool _test_create_rendering_device_and_gl() const override;
-	virtual bool _test_create_rendering_device() const override;
+	virtual bool _test_create_rendering_device_and_gl(const String &p_display_driver) const override;
+	virtual bool _test_create_rendering_device(const String &p_display_driver) const override;
 
 	HINSTANCE get_hinstance() { return hInstance; }
 	OS_Windows(HINSTANCE _hInstance);
 	~OS_Windows();
 };
-
-#endif // OS_WINDOWS_H
diff --git a/engine/platform/windows/platform_config.h b/engine/platform/windows/platform_config.h
index 964e341c..22c22f77 100644
--- a/engine/platform/windows/platform_config.h
+++ b/engine/platform/windows/platform_config.h
@@ -28,4 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#pragma once
+
 #include <malloc.h>
diff --git a/engine/platform/windows/platform_gl.h b/engine/platform/windows/platform_gl.h
index e4af8b0c..3d4a05c0 100644
--- a/engine/platform/windows/platform_gl.h
+++ b/engine/platform/windows/platform_gl.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLATFORM_GL_H
-#define PLATFORM_GL_H
+#pragma once
 
 #ifndef GL_API_ENABLED
 #define GL_API_ENABLED // Allow using desktop GL.
@@ -49,5 +48,3 @@
 #endif
 
 #include "thirdparty/glad/glad/gl.h"
-
-#endif // PLATFORM_GL_H
diff --git a/engine/platform/windows/rendering_context_driver_vulkan_windows.h b/engine/platform/windows/rendering_context_driver_vulkan_windows.h
index 1bb70cb0..be674c48 100644
--- a/engine/platform/windows/rendering_context_driver_vulkan_windows.h
+++ b/engine/platform/windows/rendering_context_driver_vulkan_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_WINDOWS_H
-#define RENDERING_CONTEXT_DRIVER_VULKAN_WINDOWS_H
+#pragma once
 
 #ifdef VULKAN_ENABLED
 
@@ -56,5 +55,3 @@ public:
 };
 
 #endif // VULKAN_ENABLED
-
-#endif // RENDERING_CONTEXT_DRIVER_VULKAN_WINDOWS_H
diff --git a/engine/platform/windows/tts_windows.h b/engine/platform/windows/tts_windows.h
index 657cb608..ee1f20f2 100644
--- a/engine/platform/windows/tts_windows.h
+++ b/engine/platform/windows/tts_windows.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TTS_WINDOWS_H
-#define TTS_WINDOWS_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
@@ -78,5 +77,3 @@ public:
 	TTS_Windows();
 	~TTS_Windows();
 };
-
-#endif // TTS_WINDOWS_H
diff --git a/engine/platform/windows/uiautomationcore.arm32.def b/engine/platform/windows/uiautomationcore.arm32.def
new file mode 100644
index 00000000..a83dd7cc
--- /dev/null
+++ b/engine/platform/windows/uiautomationcore.arm32.def
@@ -0,0 +1,115 @@
+;
+; Definition file of UIAutomationCore.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "UIAutomationCore.DLL"
+EXPORTS
+DllGetActivationFactory
+DllCanUnloadNow
+DllGetClassObject
+DockPattern_SetDockPosition
+ExpandCollapsePattern_Collapse
+ExpandCollapsePattern_Expand
+GridPattern_GetItem
+IgnoreLeaksInCurrentlyTrackedMemory
+InitializeChannelBasedConnectionForProviderProxy
+InvokePattern_Invoke
+IsIgnoringLeaks
+ItemContainerPattern_FindItemByProperty
+LegacyIAccessiblePattern_DoDefaultAction
+LegacyIAccessiblePattern_GetIAccessible
+LegacyIAccessiblePattern_Select
+LegacyIAccessiblePattern_SetValue
+MultipleViewPattern_GetViewName
+MultipleViewPattern_SetCurrentView
+PostTestCheckForLeaks
+RangeValuePattern_SetValue
+ScrollItemPattern_ScrollIntoView
+ScrollPattern_Scroll
+ScrollPattern_SetScrollPercent
+SelectionItemPattern_AddToSelection
+SelectionItemPattern_RemoveFromSelection
+SelectionItemPattern_Select
+StartIgnoringLeaks
+StopIgnoringLeaks
+SynchronizedInputPattern_Cancel
+SynchronizedInputPattern_StartListening
+TextPattern_GetSelection
+TextPattern_GetVisibleRanges
+TextPattern_RangeFromChild
+TextPattern_RangeFromPoint
+TextPattern_get_DocumentRange
+TextPattern_get_SupportedTextSelection
+TextRange_AddToSelection
+TextRange_Clone
+TextRange_Compare
+TextRange_CompareEndpoints
+TextRange_ExpandToEnclosingUnit
+TextRange_FindAttribute
+TextRange_FindText
+TextRange_GetAttributeValue
+TextRange_GetBoundingRectangles
+TextRange_GetChildren
+TextRange_GetEnclosingElement
+TextRange_GetText
+TextRange_Move
+TextRange_MoveEndpointByRange
+TextRange_MoveEndpointByUnit
+TextRange_RemoveFromSelection
+TextRange_ScrollIntoView
+TextRange_Select
+TogglePattern_Toggle
+TransformPattern_Move
+TransformPattern_Resize
+TransformPattern_Rotate
+UiaAddEvent
+UiaClientsAreListening
+UiaDisconnectAllProviders
+UiaDisconnectProvider
+UiaEventAddWindow
+UiaEventRemoveWindow
+UiaFind
+UiaGetErrorDescription
+UiaGetPatternProvider
+UiaGetPropertyValue
+UiaGetReservedMixedAttributeValue
+UiaGetReservedNotSupportedValue
+UiaGetRootNode
+UiaGetRuntimeId
+UiaGetUpdatedCache
+UiaHPatternObjectFromVariant
+UiaHTextRangeFromVariant
+UiaHUiaNodeFromVariant
+UiaHasServerSideProvider
+UiaHostProviderFromHwnd
+UiaIAccessibleFromProvider
+UiaLookupId
+UiaNavigate
+UiaNodeFromFocus
+UiaNodeFromHandle
+UiaNodeFromPoint
+UiaNodeFromProvider
+UiaNodeRelease
+UiaPatternRelease
+UiaProviderForNonClient
+UiaProviderFromIAccessible
+UiaRaiseActiveTextPositionChangedEvent
+UiaRaiseAsyncContentLoadedEvent
+UiaRaiseAutomationEvent
+UiaRaiseAutomationPropertyChangedEvent
+UiaRaiseChangesEvent
+UiaRaiseNotificationEvent
+UiaRaiseStructureChangedEvent
+UiaRaiseTextEditTextChangedEvent
+UiaRegisterProviderCallback
+UiaRemoveEvent
+UiaReturnRawElementProvider
+UiaSetFocus
+UiaTextRangeRelease
+UpdateErrorLoggingCallback
+ValuePattern_SetValue
+VirtualizedItemPattern_Realize
+WindowPattern_Close
+WindowPattern_SetWindowVisualState
+WindowPattern_WaitForInputIdle
diff --git a/engine/platform/windows/uiautomationcore.arm64.def b/engine/platform/windows/uiautomationcore.arm64.def
new file mode 100644
index 00000000..a83dd7cc
--- /dev/null
+++ b/engine/platform/windows/uiautomationcore.arm64.def
@@ -0,0 +1,115 @@
+;
+; Definition file of UIAutomationCore.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "UIAutomationCore.DLL"
+EXPORTS
+DllGetActivationFactory
+DllCanUnloadNow
+DllGetClassObject
+DockPattern_SetDockPosition
+ExpandCollapsePattern_Collapse
+ExpandCollapsePattern_Expand
+GridPattern_GetItem
+IgnoreLeaksInCurrentlyTrackedMemory
+InitializeChannelBasedConnectionForProviderProxy
+InvokePattern_Invoke
+IsIgnoringLeaks
+ItemContainerPattern_FindItemByProperty
+LegacyIAccessiblePattern_DoDefaultAction
+LegacyIAccessiblePattern_GetIAccessible
+LegacyIAccessiblePattern_Select
+LegacyIAccessiblePattern_SetValue
+MultipleViewPattern_GetViewName
+MultipleViewPattern_SetCurrentView
+PostTestCheckForLeaks
+RangeValuePattern_SetValue
+ScrollItemPattern_ScrollIntoView
+ScrollPattern_Scroll
+ScrollPattern_SetScrollPercent
+SelectionItemPattern_AddToSelection
+SelectionItemPattern_RemoveFromSelection
+SelectionItemPattern_Select
+StartIgnoringLeaks
+StopIgnoringLeaks
+SynchronizedInputPattern_Cancel
+SynchronizedInputPattern_StartListening
+TextPattern_GetSelection
+TextPattern_GetVisibleRanges
+TextPattern_RangeFromChild
+TextPattern_RangeFromPoint
+TextPattern_get_DocumentRange
+TextPattern_get_SupportedTextSelection
+TextRange_AddToSelection
+TextRange_Clone
+TextRange_Compare
+TextRange_CompareEndpoints
+TextRange_ExpandToEnclosingUnit
+TextRange_FindAttribute
+TextRange_FindText
+TextRange_GetAttributeValue
+TextRange_GetBoundingRectangles
+TextRange_GetChildren
+TextRange_GetEnclosingElement
+TextRange_GetText
+TextRange_Move
+TextRange_MoveEndpointByRange
+TextRange_MoveEndpointByUnit
+TextRange_RemoveFromSelection
+TextRange_ScrollIntoView
+TextRange_Select
+TogglePattern_Toggle
+TransformPattern_Move
+TransformPattern_Resize
+TransformPattern_Rotate
+UiaAddEvent
+UiaClientsAreListening
+UiaDisconnectAllProviders
+UiaDisconnectProvider
+UiaEventAddWindow
+UiaEventRemoveWindow
+UiaFind
+UiaGetErrorDescription
+UiaGetPatternProvider
+UiaGetPropertyValue
+UiaGetReservedMixedAttributeValue
+UiaGetReservedNotSupportedValue
+UiaGetRootNode
+UiaGetRuntimeId
+UiaGetUpdatedCache
+UiaHPatternObjectFromVariant
+UiaHTextRangeFromVariant
+UiaHUiaNodeFromVariant
+UiaHasServerSideProvider
+UiaHostProviderFromHwnd
+UiaIAccessibleFromProvider
+UiaLookupId
+UiaNavigate
+UiaNodeFromFocus
+UiaNodeFromHandle
+UiaNodeFromPoint
+UiaNodeFromProvider
+UiaNodeRelease
+UiaPatternRelease
+UiaProviderForNonClient
+UiaProviderFromIAccessible
+UiaRaiseActiveTextPositionChangedEvent
+UiaRaiseAsyncContentLoadedEvent
+UiaRaiseAutomationEvent
+UiaRaiseAutomationPropertyChangedEvent
+UiaRaiseChangesEvent
+UiaRaiseNotificationEvent
+UiaRaiseStructureChangedEvent
+UiaRaiseTextEditTextChangedEvent
+UiaRegisterProviderCallback
+UiaRemoveEvent
+UiaReturnRawElementProvider
+UiaSetFocus
+UiaTextRangeRelease
+UpdateErrorLoggingCallback
+ValuePattern_SetValue
+VirtualizedItemPattern_Realize
+WindowPattern_Close
+WindowPattern_SetWindowVisualState
+WindowPattern_WaitForInputIdle
diff --git a/engine/platform/windows/uiautomationcore.x86_32.def b/engine/platform/windows/uiautomationcore.x86_32.def
new file mode 100644
index 00000000..fce8c03f
--- /dev/null
+++ b/engine/platform/windows/uiautomationcore.x86_32.def
@@ -0,0 +1,115 @@
+;
+; Definition file of UIAutomationCore.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "UIAutomationCore.DLL"
+EXPORTS
+DllGetActivationFactory@8
+DllCanUnloadNow
+DllGetClassObject@12
+DockPattern_SetDockPosition@8
+ExpandCollapsePattern_Collapse@4
+ExpandCollapsePattern_Expand@4
+GridPattern_GetItem@16
+IgnoreLeaksInCurrentlyTrackedMemory
+InitializeChannelBasedConnectionForProviderProxy@12
+InvokePattern_Invoke@4
+IsIgnoringLeaks
+ItemContainerPattern_FindItemByProperty@32
+LegacyIAccessiblePattern_DoDefaultAction@4
+LegacyIAccessiblePattern_GetIAccessible@8
+LegacyIAccessiblePattern_Select@8
+LegacyIAccessiblePattern_SetValue@8
+MultipleViewPattern_GetViewName@12
+MultipleViewPattern_SetCurrentView@8
+PostTestCheckForLeaks@8
+RangeValuePattern_SetValue@12
+ScrollItemPattern_ScrollIntoView@4
+ScrollPattern_Scroll@12
+ScrollPattern_SetScrollPercent@20
+SelectionItemPattern_AddToSelection@4
+SelectionItemPattern_RemoveFromSelection@4
+SelectionItemPattern_Select@4
+StartIgnoringLeaks@4
+StopIgnoringLeaks
+SynchronizedInputPattern_Cancel@4
+SynchronizedInputPattern_StartListening@8
+TextPattern_GetSelection@8
+TextPattern_GetVisibleRanges@8
+TextPattern_RangeFromChild@12
+TextPattern_RangeFromPoint@24
+TextPattern_get_DocumentRange@8
+TextPattern_get_SupportedTextSelection@8
+TextRange_AddToSelection@4
+TextRange_Clone@8
+TextRange_Compare@12
+TextRange_CompareEndpoints@20
+TextRange_ExpandToEnclosingUnit@8
+TextRange_FindAttribute@32
+TextRange_FindText@20
+TextRange_GetAttributeValue@12
+TextRange_GetBoundingRectangles@8
+TextRange_GetChildren@8
+TextRange_GetEnclosingElement@8
+TextRange_GetText@12
+TextRange_Move@16
+TextRange_MoveEndpointByRange@16
+TextRange_MoveEndpointByUnit@20
+TextRange_RemoveFromSelection@4
+TextRange_ScrollIntoView@8
+TextRange_Select@4
+TogglePattern_Toggle@4
+TransformPattern_Move@20
+TransformPattern_Resize@20
+TransformPattern_Rotate@12
+UiaAddEvent@32
+UiaClientsAreListening
+UiaDisconnectAllProviders
+UiaDisconnectProvider@4
+UiaEventAddWindow@8
+UiaEventRemoveWindow@8
+UiaFind@24
+UiaGetErrorDescription@4
+UiaGetPatternProvider@12
+UiaGetPropertyValue@12
+UiaGetReservedMixedAttributeValue@4
+UiaGetReservedNotSupportedValue@4
+UiaGetRootNode@4
+UiaGetRuntimeId@8
+UiaGetUpdatedCache@24
+UiaHPatternObjectFromVariant@8
+UiaHTextRangeFromVariant@8
+UiaHUiaNodeFromVariant@8
+UiaHasServerSideProvider@4
+UiaHostProviderFromHwnd@8
+UiaIAccessibleFromProvider@16
+UiaLookupId@8
+UiaNavigate@24
+UiaNodeFromFocus@12
+UiaNodeFromHandle@8
+UiaNodeFromPoint@28
+UiaNodeFromProvider@8
+UiaNodeRelease@4
+UiaPatternRelease@4
+UiaProviderForNonClient@16
+UiaProviderFromIAccessible@16
+UiaRaiseActiveTextPositionChangedEvent@8
+UiaRaiseAsyncContentLoadedEvent@16
+UiaRaiseAutomationEvent@8
+UiaRaiseAutomationPropertyChangedEvent@40
+UiaRaiseChangesEvent@12
+UiaRaiseNotificationEvent@20
+UiaRaiseStructureChangedEvent@16
+UiaRaiseTextEditTextChangedEvent@12
+UiaRegisterProviderCallback@4
+UiaRemoveEvent@4
+UiaReturnRawElementProvider@16
+UiaSetFocus@4
+UiaTextRangeRelease@4
+UpdateErrorLoggingCallback@4
+ValuePattern_SetValue@8
+VirtualizedItemPattern_Realize@4
+WindowPattern_Close@4
+WindowPattern_SetWindowVisualState@8
+WindowPattern_WaitForInputIdle@12
diff --git a/engine/platform/windows/uiautomationcore.x86_64.def b/engine/platform/windows/uiautomationcore.x86_64.def
new file mode 100644
index 00000000..a83dd7cc
--- /dev/null
+++ b/engine/platform/windows/uiautomationcore.x86_64.def
@@ -0,0 +1,115 @@
+;
+; Definition file of UIAutomationCore.DLL
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "UIAutomationCore.DLL"
+EXPORTS
+DllGetActivationFactory
+DllCanUnloadNow
+DllGetClassObject
+DockPattern_SetDockPosition
+ExpandCollapsePattern_Collapse
+ExpandCollapsePattern_Expand
+GridPattern_GetItem
+IgnoreLeaksInCurrentlyTrackedMemory
+InitializeChannelBasedConnectionForProviderProxy
+InvokePattern_Invoke
+IsIgnoringLeaks
+ItemContainerPattern_FindItemByProperty
+LegacyIAccessiblePattern_DoDefaultAction
+LegacyIAccessiblePattern_GetIAccessible
+LegacyIAccessiblePattern_Select
+LegacyIAccessiblePattern_SetValue
+MultipleViewPattern_GetViewName
+MultipleViewPattern_SetCurrentView
+PostTestCheckForLeaks
+RangeValuePattern_SetValue
+ScrollItemPattern_ScrollIntoView
+ScrollPattern_Scroll
+ScrollPattern_SetScrollPercent
+SelectionItemPattern_AddToSelection
+SelectionItemPattern_RemoveFromSelection
+SelectionItemPattern_Select
+StartIgnoringLeaks
+StopIgnoringLeaks
+SynchronizedInputPattern_Cancel
+SynchronizedInputPattern_StartListening
+TextPattern_GetSelection
+TextPattern_GetVisibleRanges
+TextPattern_RangeFromChild
+TextPattern_RangeFromPoint
+TextPattern_get_DocumentRange
+TextPattern_get_SupportedTextSelection
+TextRange_AddToSelection
+TextRange_Clone
+TextRange_Compare
+TextRange_CompareEndpoints
+TextRange_ExpandToEnclosingUnit
+TextRange_FindAttribute
+TextRange_FindText
+TextRange_GetAttributeValue
+TextRange_GetBoundingRectangles
+TextRange_GetChildren
+TextRange_GetEnclosingElement
+TextRange_GetText
+TextRange_Move
+TextRange_MoveEndpointByRange
+TextRange_MoveEndpointByUnit
+TextRange_RemoveFromSelection
+TextRange_ScrollIntoView
+TextRange_Select
+TogglePattern_Toggle
+TransformPattern_Move
+TransformPattern_Resize
+TransformPattern_Rotate
+UiaAddEvent
+UiaClientsAreListening
+UiaDisconnectAllProviders
+UiaDisconnectProvider
+UiaEventAddWindow
+UiaEventRemoveWindow
+UiaFind
+UiaGetErrorDescription
+UiaGetPatternProvider
+UiaGetPropertyValue
+UiaGetReservedMixedAttributeValue
+UiaGetReservedNotSupportedValue
+UiaGetRootNode
+UiaGetRuntimeId
+UiaGetUpdatedCache
+UiaHPatternObjectFromVariant
+UiaHTextRangeFromVariant
+UiaHUiaNodeFromVariant
+UiaHasServerSideProvider
+UiaHostProviderFromHwnd
+UiaIAccessibleFromProvider
+UiaLookupId
+UiaNavigate
+UiaNodeFromFocus
+UiaNodeFromHandle
+UiaNodeFromPoint
+UiaNodeFromProvider
+UiaNodeRelease
+UiaPatternRelease
+UiaProviderForNonClient
+UiaProviderFromIAccessible
+UiaRaiseActiveTextPositionChangedEvent
+UiaRaiseAsyncContentLoadedEvent
+UiaRaiseAutomationEvent
+UiaRaiseAutomationPropertyChangedEvent
+UiaRaiseChangesEvent
+UiaRaiseNotificationEvent
+UiaRaiseStructureChangedEvent
+UiaRaiseTextEditTextChangedEvent
+UiaRegisterProviderCallback
+UiaRemoveEvent
+UiaReturnRawElementProvider
+UiaSetFocus
+UiaTextRangeRelease
+UpdateErrorLoggingCallback
+ValuePattern_SetValue
+VirtualizedItemPattern_Realize
+WindowPattern_Close
+WindowPattern_SetWindowVisualState
+WindowPattern_WaitForInputIdle
diff --git a/engine/platform/windows/wgl_detect_version.h b/engine/platform/windows/wgl_detect_version.h
index c110b121..c7e47b99 100644
--- a/engine/platform/windows/wgl_detect_version.h
+++ b/engine/platform/windows/wgl_detect_version.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WGL_DETECT_VERSION_H
-#define WGL_DETECT_VERSION_H
+#pragma once
 
 #if defined(WINDOWS_ENABLED) && defined(GLES3_ENABLED)
 
@@ -38,5 +37,3 @@ class Dictionary;
 Dictionary detect_wgl();
 
 #endif // WINDOWS_ENABLED && GLES3_ENABLED
-
-#endif // WGL_DETECT_VERSION_H
diff --git a/engine/platform/windows/windows_terminal_logger.h b/engine/platform/windows/windows_terminal_logger.h
index 60d82bb9..69b813b4 100644
--- a/engine/platform/windows/windows_terminal_logger.h
+++ b/engine/platform/windows/windows_terminal_logger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WINDOWS_TERMINAL_LOGGER_H
-#define WINDOWS_TERMINAL_LOGGER_H
+#pragma once
 
 #ifdef WINDOWS_ENABLED
 
@@ -43,5 +42,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED
-
-#endif // WINDOWS_TERMINAL_LOGGER_H
diff --git a/engine/platform/windows/windows_utils.cpp b/engine/platform/windows/windows_utils.cpp
index d749ed32..4fdaed00 100644
--- a/engine/platform/windows/windows_utils.cpp
+++ b/engine/platform/windows/windows_utils.cpp
@@ -136,7 +136,7 @@ Error WindowsUtils::copy_and_rename_pdb(const String &p_dll_path) {
 		}
 
 		String utf_path;
-		Error err = utf_path.parse_utf8(raw_pdb_path);
+		Error err = utf_path.append_utf8(raw_pdb_path);
 		ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Failed to read PDB path from '%s'.", p_dll_path));
 
 		pdb_info.path = utf_path;
@@ -179,7 +179,8 @@ Error WindowsUtils::copy_and_rename_pdb(const String &p_dll_path) {
 		if (new_expected_buffer_size > original_path_size) {
 			ERR_FAIL_COND_V_MSG(original_path_size < min_base_size + suffix_size, FAILED, vformat("The original PDB path size in bytes is too small: '%s'. Expected size: %d or more bytes, but available %d.", pdb_info.path, min_base_size + suffix_size, original_path_size));
 
-			new_pdb_base_name.parse_utf8(utf8_name, original_path_size - suffix_size);
+			new_pdb_base_name.clear();
+			new_pdb_base_name.append_utf8(utf8_name, original_path_size - suffix_size);
 			new_pdb_base_name[new_pdb_base_name.length() - 1] = '_'; // Restore the last '_'
 			WARN_PRINT(vformat("The original path size of '%s' in bytes was too small to fit the new name, so it was shortened to '%s%d.pdb'.", pdb_info.path, new_pdb_base_name, max_pdb_names - 1));
 		}
@@ -229,10 +230,8 @@ Error WindowsUtils::copy_and_rename_pdb(const String &p_dll_path) {
 		file->store_buffer(u8);
 
 		// Terminate string and fill the remaining part of the original string with the '\0'.
-		// Can be replaced by file->store_8('\0');
 		Vector<uint8_t> padding_buffer;
-		padding_buffer.resize((int64_t)original_path_size - u8.size());
-		padding_buffer.fill('\0');
+		padding_buffer.resize_zeroed((int64_t)original_path_size - u8.size());
 		file->store_buffer(padding_buffer);
 		ERR_FAIL_COND_V_MSG(err != OK, err, vformat("Failed to write a new PDB path to '%s'.", p_dll_path));
 
diff --git a/engine/platform/windows/windows_utils.h b/engine/platform/windows/windows_utils.h
index 3f5d7529..cc40f1a5 100644
--- a/engine/platform/windows/windows_utils.h
+++ b/engine/platform/windows/windows_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WINDOWS_UTILS_H
-#define WINDOWS_UTILS_H
+#pragma once
 
 #ifdef WINDOWS_ENABLED
 
@@ -45,5 +44,3 @@ public:
 };
 
 #endif // WINDOWS_ENABLED
-
-#endif // WINDOWS_UTILS_H
diff --git a/engine/scene/2d/SCsub b/engine/scene/2d/SCsub
index 6f6bf981..027026d2 100644
--- a/engine/scene/2d/SCsub
+++ b/engine/scene/2d/SCsub
@@ -6,4 +6,7 @@ Import("env")
 env.add_source_files(env.scene_sources, "*.cpp")
 
 # Chain load SCsubs
-SConscript("physics/SCsub")
+if not env["disable_physics_2d"]:
+    SConscript("physics/SCsub")
+if not env["disable_navigation_2d"]:
+    SConscript("navigation/SCsub")
diff --git a/engine/scene/2d/animated_sprite_2d.cpp b/engine/scene/2d/animated_sprite_2d.cpp
index 09ca2b3c..bdcb2b83 100644
--- a/engine/scene/2d/animated_sprite_2d.cpp
+++ b/engine/scene/2d/animated_sprite_2d.cpp
@@ -167,6 +167,17 @@ void AnimatedSprite2D::_validate_property(PropertyInfo &p_property) const {
 
 void AnimatedSprite2D::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			Rect2 dst_rect = _get_rect();
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_IMAGE);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, dst_rect);
+		} break;
+
 		case NOTIFICATION_READY: {
 			if (!Engine::get_singleton()->is_editor_hint() && frames.is_valid() && frames->has_animation(autoplay)) {
 				play(autoplay);
@@ -301,7 +312,7 @@ void AnimatedSprite2D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
 
 		List<StringName> al;
 		frames->get_animation_list(&al);
-		if (al.size() == 0) {
+		if (al.is_empty()) {
 			set_animation(StringName());
 			autoplay = String();
 		} else {
diff --git a/engine/scene/2d/animated_sprite_2d.h b/engine/scene/2d/animated_sprite_2d.h
index c7d39850..c390ab35 100644
--- a/engine/scene/2d/animated_sprite_2d.h
+++ b/engine/scene/2d/animated_sprite_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATED_SPRITE_2D_H
-#define ANIMATED_SPRITE_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/sprite_frames.h"
@@ -136,5 +135,3 @@ public:
 
 	AnimatedSprite2D();
 };
-
-#endif // ANIMATED_SPRITE_2D_H
diff --git a/engine/scene/2d/audio_listener_2d.h b/engine/scene/2d/audio_listener_2d.h
index 8e2e6b26..6060bbfd 100644
--- a/engine/scene/2d/audio_listener_2d.h
+++ b/engine/scene/2d/audio_listener_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_LISTENER_2D_H
-#define AUDIO_LISTENER_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -56,5 +55,3 @@ public:
 
 	AudioListener2D();
 };
-
-#endif // AUDIO_LISTENER_2D_H
diff --git a/engine/scene/2d/audio_stream_player_2d.cpp b/engine/scene/2d/audio_stream_player_2d.cpp
index adef60f9..ff97ab8c 100644
--- a/engine/scene/2d/audio_stream_player_2d.cpp
+++ b/engine/scene/2d/audio_stream_player_2d.cpp
@@ -33,13 +33,16 @@
 
 #include "core/config/project_settings.h"
 #include "scene/2d/audio_listener_2d.h"
-#include "scene/2d/physics/area_2d.h"
 #include "scene/audio/audio_stream_player_internal.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/world_2d.h"
 #include "servers/audio/audio_stream.h"
 #include "servers/audio_server.h"
 
+#ifndef PHYSICS_2D_DISABLED
+#include "scene/2d/physics/area_2d.h"
+#endif // PHYSICS_2D_DISABLED
+
 void AudioStreamPlayer2D::_notification(int p_what) {
 	internal->notification(p_what);
 
@@ -76,6 +79,7 @@ void AudioStreamPlayer2D::_notification(int p_what) {
 
 // Interacts with PhysicsServer2D, so can only be called during _physics_process.
 StringName AudioStreamPlayer2D::_get_actual_bus() {
+#ifndef PHYSICS_2D_DISABLED
 	Vector2 global_pos = get_global_position();
 
 	//check if any area is diverting sound into a bus
@@ -93,7 +97,6 @@ StringName AudioStreamPlayer2D::_get_actual_bus() {
 	point_params.collide_with_areas = true;
 
 	int areas = space_state->intersect_point(point_params, sr, MAX_INTERSECT_AREAS);
-
 	for (int i = 0; i < areas; i++) {
 		Area2D *area2d = Object::cast_to<Area2D>(sr[i].collider);
 		if (!area2d) {
@@ -106,6 +109,8 @@ StringName AudioStreamPlayer2D::_get_actual_bus() {
 
 		return area2d->get_audio_bus_name();
 	}
+#endif // PHYSICS_2D_DISABLED
+
 	return internal->bus;
 }
 
diff --git a/engine/scene/2d/audio_stream_player_2d.h b/engine/scene/2d/audio_stream_player_2d.h
index fb429bd5..2d021190 100644
--- a/engine/scene/2d/audio_stream_player_2d.h
+++ b/engine/scene/2d/audio_stream_player_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_PLAYER_2D_H
-#define AUDIO_STREAM_PLAYER_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "servers/audio_server.h"
@@ -149,5 +148,3 @@ public:
 	AudioStreamPlayer2D();
 	~AudioStreamPlayer2D();
 };
-
-#endif // AUDIO_STREAM_PLAYER_2D_H
diff --git a/engine/scene/2d/back_buffer_copy.h b/engine/scene/2d/back_buffer_copy.h
index 9bcb731b..b9c57326 100644
--- a/engine/scene/2d/back_buffer_copy.h
+++ b/engine/scene/2d/back_buffer_copy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BACK_BUFFER_COPY_H
-#define BACK_BUFFER_COPY_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -71,5 +70,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(BackBufferCopy::CopyMode);
-
-#endif // BACK_BUFFER_COPY_H
diff --git a/engine/scene/2d/camera_2d.cpp b/engine/scene/2d/camera_2d.cpp
index cad9e41c..c61086d5 100644
--- a/engine/scene/2d/camera_2d.cpp
+++ b/engine/scene/2d/camera_2d.cpp
@@ -31,22 +31,67 @@
 #include "camera_2d.h"
 
 #include "core/config/project_settings.h"
+#include "core/input/input.h"
 #include "scene/main/viewport.h"
 
-bool Camera2D::_is_editing_in_editor() const {
 #ifdef TOOLS_ENABLED
-	return is_part_of_edited_scene();
-#else
-	return false;
-#endif // TOOLS_ENABLED
+Dictionary Camera2D::_edit_get_state() const {
+	Dictionary state = Node2D::_edit_get_state();
+	state["limit_rect"] = get_limit_rect();
+	return state;
 }
 
+void Camera2D::_edit_set_state(const Dictionary &p_state) {
+	if (p_state.has("limit_rect")) {
+		_set_limit_rect(p_state["limit_rect"]);
+	}
+	Node2D::_edit_set_state(p_state);
+}
+
+void Camera2D::_edit_set_position(const Point2 &p_position) {
+	if (_is_dragging_limit_rect()) {
+		Rect2 rect = get_limit_rect();
+		rect.position = p_position;
+		_set_limit_rect(rect);
+	} else {
+		Node2D::_edit_set_position(p_position);
+	}
+}
+
+Point2 Camera2D::_edit_get_position() const {
+	return _is_dragging_limit_rect() ? get_limit_rect().position : Node2D::_edit_get_position();
+}
+
+void Camera2D::_edit_set_rect(const Rect2 &p_rect) {
+	ERR_FAIL_COND(limit_enabled && !_edit_use_rect());
+	Rect2 rect = p_rect;
+	Vector2 scl = get_global_scale().abs();
+	rect.size *= scl;
+	rect.position = (rect.position + get_global_position()) * scl;
+	_set_limit_rect(rect);
+}
+#endif // TOOLS_ENABLED
+
+#ifdef DEBUG_ENABLED
+Rect2 Camera2D::_edit_get_rect() const {
+	Rect2 rect = get_limit_rect();
+	Vector2 scl = get_global_scale().abs();
+	rect.size /= scl;
+	rect.position = (rect.position - get_global_position()) / scl;
+	return rect;
+}
+
+bool Camera2D::_edit_use_rect() const {
+	return limit_enabled;
+}
+#endif // DEBUG_ENABLED
+
 void Camera2D::_update_scroll() {
 	if (!is_inside_tree() || !viewport) {
 		return;
 	}
 
-	if (_is_editing_in_editor()) {
+	if (is_part_of_edited_scene()) {
 		queue_redraw();
 		return;
 	}
@@ -75,6 +120,10 @@ void Camera2D::_update_scroll() {
 }
 
 #ifdef TOOLS_ENABLED
+bool Camera2D::_is_dragging_limit_rect() const {
+	return _edit_use_rect() && Input::get_singleton()->is_key_pressed(Key::CTRL);
+}
+
 void Camera2D::_project_settings_changed() {
 	if (screen_drawing_enabled) {
 		queue_redraw();
@@ -92,7 +141,7 @@ void Camera2D::_update_process_callback() {
 			WARN_PRINT_ONCE("Camera2D overridden to physics process mode due to use of physics interpolation.");
 		}
 #endif
-	} else if (_is_editing_in_editor()) {
+	} else if (is_part_of_edited_scene()) {
 		set_process_internal(false);
 		set_physics_process_internal(false);
 	} else {
@@ -107,7 +156,7 @@ void Camera2D::_update_process_callback() {
 }
 
 void Camera2D::set_zoom(const Vector2 &p_zoom) {
-	// Setting zoom to zero causes 'affine_invert' issues
+	// Setting zoom to zero causes 'affine_invert' issues.
 	ERR_FAIL_COND_MSG(Math::is_zero_approx(p_zoom.x) || Math::is_zero_approx(p_zoom.y), "Zoom level must be different from 0 (can be negative).");
 
 	zoom = p_zoom;
@@ -135,7 +184,7 @@ Transform2D Camera2D::get_camera_transform() {
 
 	if (!first) {
 		if (anchor_mode == ANCHOR_MODE_DRAG_CENTER) {
-			if (drag_horizontal_enabled && !_is_editing_in_editor() && !drag_horizontal_offset_changed) {
+			if (drag_horizontal_enabled && !is_part_of_edited_scene() && !drag_horizontal_offset_changed) {
 				camera_pos.x = MIN(camera_pos.x, (new_camera_pos.x + screen_size.x * 0.5 * zoom_scale.x * drag_margin[SIDE_LEFT]));
 				camera_pos.x = MAX(camera_pos.x, (new_camera_pos.x - screen_size.x * 0.5 * zoom_scale.x * drag_margin[SIDE_RIGHT]));
 			} else {
@@ -148,7 +197,7 @@ Transform2D Camera2D::get_camera_transform() {
 				drag_horizontal_offset_changed = false;
 			}
 
-			if (drag_vertical_enabled && !_is_editing_in_editor() && !drag_vertical_offset_changed) {
+			if (drag_vertical_enabled && !is_part_of_edited_scene() && !drag_vertical_offset_changed) {
 				camera_pos.y = MIN(camera_pos.y, (new_camera_pos.y + screen_size.y * 0.5 * zoom_scale.y * drag_margin[SIDE_TOP]));
 				camera_pos.y = MAX(camera_pos.y, (new_camera_pos.y - screen_size.y * 0.5 * zoom_scale.y * drag_margin[SIDE_BOTTOM]));
 
@@ -169,7 +218,7 @@ Transform2D Camera2D::get_camera_transform() {
 		Point2 screen_offset = (anchor_mode == ANCHOR_MODE_DRAG_CENTER ? (screen_size * 0.5 * zoom_scale) : Point2());
 		Rect2 screen_rect(-screen_offset + camera_pos, screen_size * zoom_scale);
 
-		if (limit_smoothing_enabled) {
+		if (limit_enabled && limit_smoothing_enabled) {
 			if (screen_rect.position.x < limit[SIDE_LEFT]) {
 				camera_pos.x -= screen_rect.position.x - limit[SIDE_LEFT];
 			}
@@ -192,7 +241,7 @@ Transform2D Camera2D::get_camera_transform() {
 		// It may be called MULTIPLE TIMES on certain frames,
 		// therefore smoothing is not currently applied only once per frame / tick,
 		// which will result in some haphazard results.
-		if (position_smoothing_enabled && !_is_editing_in_editor()) {
+		if (position_smoothing_enabled && !is_part_of_edited_scene()) {
 			bool physics_process = (process_callback == CAMERA2D_PROCESS_PHYSICS) || is_physics_interpolated_and_enabled();
 			real_t delta = physics_process ? get_physics_process_delta_time() : get_process_delta_time();
 			real_t c = position_smoothing_speed * delta;
@@ -211,7 +260,7 @@ Transform2D Camera2D::get_camera_transform() {
 	Point2 screen_offset = (anchor_mode == ANCHOR_MODE_DRAG_CENTER ? (screen_size * 0.5 * zoom_scale) : Point2());
 
 	if (!ignore_rotation) {
-		if (rotation_smoothing_enabled && !_is_editing_in_editor()) {
+		if (rotation_smoothing_enabled && !is_part_of_edited_scene()) {
 			real_t step = rotation_smoothing_speed * (process_callback == CAMERA2D_PROCESS_PHYSICS ? get_physics_process_delta_time() : get_process_delta_time());
 			camera_angle = Math::lerp_angle(camera_angle, get_global_rotation(), step);
 		} else {
@@ -222,7 +271,7 @@ Transform2D Camera2D::get_camera_transform() {
 
 	Rect2 screen_rect(-screen_offset + ret_camera_pos, screen_size * zoom_scale);
 
-	if (!position_smoothing_enabled || !limit_smoothing_enabled) {
+	if (limit_enabled && (!position_smoothing_enabled || !limit_smoothing_enabled)) {
 		if (screen_rect.position.x < limit[SIDE_LEFT]) {
 			screen_rect.position.x = limit[SIDE_LEFT];
 		}
@@ -311,7 +360,7 @@ void Camera2D::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_TRANSFORM_CHANGED: {
-			if ((!position_smoothing_enabled && !is_physics_interpolated_and_enabled()) || _is_editing_in_editor()) {
+			if ((!position_smoothing_enabled && !is_physics_interpolated_and_enabled()) || is_part_of_edited_scene()) {
 				_update_scroll();
 			}
 			if (is_physics_interpolated_and_enabled()) {
@@ -339,7 +388,7 @@ void Camera2D::_notification(int p_what) {
 			add_to_group(group_name);
 			add_to_group(canvas_group_name);
 
-			if (!_is_editing_in_editor() && enabled && !viewport->get_camera_2d()) {
+			if (!is_part_of_edited_scene() && enabled && !viewport->get_camera_2d()) {
 				make_current();
 			}
 
@@ -370,7 +419,7 @@ void Camera2D::_notification(int p_what) {
 
 #ifdef TOOLS_ENABLED
 		case NOTIFICATION_DRAW: {
-			if (!is_inside_tree() || !_is_editing_in_editor()) {
+			if (!is_inside_tree() || !is_part_of_edited_scene()) {
 				break;
 			}
 
@@ -398,8 +447,7 @@ void Camera2D::_notification(int p_what) {
 				}
 			}
 
-			if (limit_drawing_enabled) {
-				Color limit_drawing_color(1, 1, 0.25, 0.63);
+			if (limit_enabled && limit_drawing_enabled) {
 				real_t limit_drawing_width = -1;
 				if (is_current()) {
 					limit_drawing_width = 3;
@@ -415,7 +463,7 @@ void Camera2D::_notification(int p_what) {
 				};
 
 				for (int i = 0; i < 4; i++) {
-					draw_line(limit_points[i], limit_points[(i + 1) % 4], limit_drawing_color, limit_drawing_width);
+					draw_line(limit_points[i], limit_points[(i + 1) % 4], Color(1, 1, 0.25, 0.63), limit_drawing_width);
 				}
 			}
 
@@ -448,6 +496,9 @@ void Camera2D::_notification(int p_what) {
 }
 
 void Camera2D::set_offset(const Vector2 &p_offset) {
+	if (offset == p_offset) {
+		return;
+	}
 	offset = p_offset;
 	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 	_update_scroll();
@@ -459,6 +510,9 @@ Vector2 Camera2D::get_offset() const {
 }
 
 void Camera2D::set_anchor_mode(AnchorMode p_anchor_mode) {
+	if (anchor_mode == p_anchor_mode) {
+		return;
+	}
 	anchor_mode = p_anchor_mode;
 	_update_scroll();
 }
@@ -468,6 +522,9 @@ Camera2D::AnchorMode Camera2D::get_anchor_mode() const {
 }
 
 void Camera2D::set_ignore_rotation(bool p_ignore) {
+	if (ignore_rotation == p_ignore) {
+		return;
+	}
 	ignore_rotation = p_ignore;
 	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 
@@ -484,6 +541,22 @@ bool Camera2D::is_ignoring_rotation() const {
 	return ignore_rotation;
 }
 
+void Camera2D::set_limit_enabled(bool p_limit_enabled) {
+	if (limit_enabled == p_limit_enabled) {
+		return;
+	}
+	limit_enabled = p_limit_enabled;
+	_update_scroll();
+#ifdef TOOLS_ENABLED
+	emit_signal("_camera_limit_enabled_updated"); // Used for Camera2DEditorPlugin.
+#endif
+	notify_property_list_changed();
+}
+
+bool Camera2D::is_limit_enabled() const {
+	return limit_enabled;
+}
+
 void Camera2D::set_process_callback(Camera2DProcessCallback p_mode) {
 	if (process_callback == p_mode) {
 		return;
@@ -494,6 +567,9 @@ void Camera2D::set_process_callback(Camera2DProcessCallback p_mode) {
 }
 
 void Camera2D::set_enabled(bool p_enabled) {
+	if (enabled == p_enabled) {
+		return;
+	}
 	enabled = p_enabled;
 
 	if (!is_inside_tree()) {
@@ -541,13 +617,25 @@ void Camera2D::_make_current(Object *p_which) {
 }
 
 void Camera2D::_update_process_internal_for_smoothing() {
-	bool is_not_in_scene_or_editor = !(is_inside_tree() && _is_editing_in_editor());
+	bool is_not_in_scene_or_editor = !(is_inside_tree() && is_part_of_edited_scene());
 	bool is_any_smoothing_valid = position_smoothing_speed > 0 || rotation_smoothing_speed > 0;
 
 	bool enable = is_any_smoothing_valid && is_not_in_scene_or_editor;
 	set_process_internal(enable);
 }
 
+void Camera2D::_set_limit_rect(const Rect2 &p_limit_rect) {
+	Point2 limit_rect_end = p_limit_rect.get_end();
+	set_limit(SIDE_LEFT, p_limit_rect.position.x);
+	set_limit(SIDE_TOP, p_limit_rect.position.y);
+	set_limit(SIDE_RIGHT, limit_rect_end.x);
+	set_limit(SIDE_BOTTOM, limit_rect_end.y);
+}
+
+Rect2 Camera2D::get_limit_rect() const {
+	return Rect2(limit[SIDE_LEFT], limit[SIDE_TOP], limit[SIDE_RIGHT] - limit[SIDE_LEFT], limit[SIDE_BOTTOM] - limit[SIDE_TOP]);
+}
+
 void Camera2D::make_current() {
 	ERR_FAIL_COND(!enabled || !is_inside_tree());
 	get_tree()->call_group(group_name, "_make_current", this);
@@ -586,6 +674,9 @@ bool Camera2D::is_current() const {
 
 void Camera2D::set_limit(Side p_side, int p_limit) {
 	ERR_FAIL_INDEX((int)p_side, 4);
+	if (limit[p_side] == p_limit) {
+		return;
+	}
 	limit[p_side] = p_limit;
 	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
 	_update_scroll();
@@ -597,8 +688,11 @@ int Camera2D::get_limit(Side p_side) const {
 	return limit[p_side];
 }
 
-void Camera2D::set_limit_smoothing_enabled(bool enable) {
-	limit_smoothing_enabled = enable;
+void Camera2D::set_limit_smoothing_enabled(bool p_enabled) {
+	if (limit_smoothing_enabled == p_enabled) {
+		return;
+	}
+	limit_smoothing_enabled = p_enabled;
 	_update_scroll();
 }
 
@@ -608,6 +702,9 @@ bool Camera2D::is_limit_smoothing_enabled() const {
 
 void Camera2D::set_drag_margin(Side p_side, real_t p_drag_margin) {
 	ERR_FAIL_INDEX((int)p_side, 4);
+	if (drag_margin[p_side] == p_drag_margin) {
+		return;
+	}
 	drag_margin[p_side] = p_drag_margin;
 	queue_redraw();
 }
@@ -655,6 +752,9 @@ void Camera2D::align() {
 }
 
 void Camera2D::set_position_smoothing_speed(real_t p_speed) {
+	if (position_smoothing_speed == p_speed) {
+		return;
+	}
 	position_smoothing_speed = MAX(0, p_speed);
 	_update_process_internal_for_smoothing();
 }
@@ -664,6 +764,9 @@ real_t Camera2D::get_position_smoothing_speed() const {
 }
 
 void Camera2D::set_rotation_smoothing_speed(real_t p_speed) {
+	if (rotation_smoothing_speed == p_speed) {
+		return;
+	}
 	rotation_smoothing_speed = MAX(0, p_speed);
 	_update_process_internal_for_smoothing();
 }
@@ -673,6 +776,9 @@ real_t Camera2D::get_rotation_smoothing_speed() const {
 }
 
 void Camera2D::set_rotation_smoothing_enabled(bool p_enabled) {
+	if (rotation_smoothing_enabled == p_enabled) {
+		return;
+	}
 	rotation_smoothing_enabled = p_enabled;
 	notify_property_list_changed();
 }
@@ -686,7 +792,7 @@ Point2 Camera2D::get_camera_screen_center() const {
 }
 
 Size2 Camera2D::_get_camera_screen_size() const {
-	if (_is_editing_in_editor()) {
+	if (is_part_of_edited_scene()) {
 		return Size2(GLOBAL_GET("display/window/size/viewport_width"), GLOBAL_GET("display/window/size/viewport_height"));
 	}
 	return get_viewport_rect().size;
@@ -709,6 +815,9 @@ bool Camera2D::is_drag_vertical_enabled() const {
 }
 
 void Camera2D::set_drag_vertical_offset(real_t p_offset) {
+	if (drag_vertical_offset == p_offset) {
+		return;
+	}
 	drag_vertical_offset = p_offset;
 	drag_vertical_offset_changed = true;
 	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
@@ -721,6 +830,9 @@ real_t Camera2D::get_drag_vertical_offset() const {
 }
 
 void Camera2D::set_drag_horizontal_offset(real_t p_offset) {
+	if (drag_horizontal_offset == p_offset) {
+		return;
+	}
 	drag_horizontal_offset = p_offset;
 	drag_horizontal_offset_changed = true;
 	Point2 old_smoothed_camera_pos = smoothed_camera_pos;
@@ -732,15 +844,10 @@ real_t Camera2D::get_drag_horizontal_offset() const {
 	return drag_horizontal_offset;
 }
 
-void Camera2D::_set_old_smoothing(real_t p_enable) {
-	//compatibility
-	if (p_enable > 0) {
-		position_smoothing_enabled = true;
-		set_position_smoothing_speed(p_enable);
-	}
-}
-
 void Camera2D::set_position_smoothing_enabled(bool p_enabled) {
+	if (position_smoothing_enabled == p_enabled) {
+		return;
+	}
 	position_smoothing_enabled = p_enabled;
 	notify_property_list_changed();
 }
@@ -751,6 +858,10 @@ bool Camera2D::is_position_smoothing_enabled() const {
 
 void Camera2D::set_custom_viewport(Node *p_viewport) {
 	ERR_FAIL_NULL(p_viewport);
+	if (custom_viewport == p_viewport) {
+		return;
+	}
+
 	if (is_inside_tree()) {
 		remove_from_group(group_name);
 		remove_from_group(canvas_group_name);
@@ -783,8 +894,8 @@ Node *Camera2D::get_custom_viewport() const {
 	return custom_viewport;
 }
 
-void Camera2D::set_screen_drawing_enabled(bool enable) {
-	screen_drawing_enabled = enable;
+void Camera2D::set_screen_drawing_enabled(bool p_enabled) {
+	screen_drawing_enabled = p_enabled;
 #ifdef TOOLS_ENABLED
 	queue_redraw();
 #endif
@@ -794,8 +905,8 @@ bool Camera2D::is_screen_drawing_enabled() const {
 	return screen_drawing_enabled;
 }
 
-void Camera2D::set_limit_drawing_enabled(bool enable) {
-	limit_drawing_enabled = enable;
+void Camera2D::set_limit_drawing_enabled(bool p_enabled) {
+	limit_drawing_enabled = p_enabled;
 #ifdef TOOLS_ENABLED
 	queue_redraw();
 #endif
@@ -805,8 +916,8 @@ bool Camera2D::is_limit_drawing_enabled() const {
 	return limit_drawing_enabled;
 }
 
-void Camera2D::set_margin_drawing_enabled(bool enable) {
-	margin_drawing_enabled = enable;
+void Camera2D::set_margin_drawing_enabled(bool p_enabled) {
+	margin_drawing_enabled = p_enabled;
 #ifdef TOOLS_ENABLED
 	queue_redraw();
 #endif
@@ -817,6 +928,9 @@ bool Camera2D::is_margin_drawing_enabled() const {
 }
 
 void Camera2D::_validate_property(PropertyInfo &p_property) const {
+	if (!limit_enabled && (p_property.name == "limit_smoothed" || p_property.name == "limit_left" || p_property.name == "limit_top" || p_property.name == "limit_right" || p_property.name == "limit_bottom")) {
+		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
+	}
 	if (!position_smoothing_enabled && p_property.name == "position_smoothing_speed") {
 		p_property.usage = PROPERTY_USAGE_NO_EDITOR;
 	}
@@ -847,6 +961,9 @@ void Camera2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_current"), &Camera2D::is_current);
 	ClassDB::bind_method(D_METHOD("_make_current"), &Camera2D::_make_current);
 
+	ClassDB::bind_method(D_METHOD("set_limit_enabled", "limit_enabled"), &Camera2D::set_limit_enabled);
+	ClassDB::bind_method(D_METHOD("is_limit_enabled"), &Camera2D::is_limit_enabled);
+
 	ClassDB::bind_method(D_METHOD("set_limit", "margin", "limit"), &Camera2D::set_limit);
 	ClassDB::bind_method(D_METHOD("get_limit", "margin"), &Camera2D::get_limit);
 
@@ -893,8 +1010,6 @@ void Camera2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("reset_smoothing"), &Camera2D::reset_smoothing);
 	ClassDB::bind_method(D_METHOD("align"), &Camera2D::align);
 
-	ClassDB::bind_method(D_METHOD("_set_old_smoothing", "follow_smoothing"), &Camera2D::_set_old_smoothing);
-
 	ClassDB::bind_method(D_METHOD("set_screen_drawing_enabled", "screen_drawing_enabled"), &Camera2D::set_screen_drawing_enabled);
 	ClassDB::bind_method(D_METHOD("is_screen_drawing_enabled"), &Camera2D::is_screen_drawing_enabled);
 
@@ -913,6 +1028,7 @@ void Camera2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "process_callback", PROPERTY_HINT_ENUM, "Physics,Idle"), "set_process_callback", "get_process_callback");
 
 	ADD_GROUP("Limit", "limit_");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "limit_enabled"), "set_limit_enabled", "is_limit_enabled");
 	ADD_PROPERTYI(PropertyInfo(Variant::INT, "limit_left", PROPERTY_HINT_NONE, "suffix:px"), "set_limit", "get_limit", SIDE_LEFT);
 	ADD_PROPERTYI(PropertyInfo(Variant::INT, "limit_top", PROPERTY_HINT_NONE, "suffix:px"), "set_limit", "get_limit", SIDE_TOP);
 	ADD_PROPERTYI(PropertyInfo(Variant::INT, "limit_right", PROPERTY_HINT_NONE, "suffix:px"), "set_limit", "get_limit", SIDE_RIGHT);
@@ -949,16 +1065,10 @@ void Camera2D::_bind_methods() {
 }
 
 Camera2D::Camera2D() {
-	limit[SIDE_LEFT] = -10000000;
-	limit[SIDE_TOP] = -10000000;
-	limit[SIDE_RIGHT] = 10000000;
-	limit[SIDE_BOTTOM] = 10000000;
-
-	drag_margin[SIDE_LEFT] = 0.2;
-	drag_margin[SIDE_TOP] = 0.2;
-	drag_margin[SIDE_RIGHT] = 0.2;
-	drag_margin[SIDE_BOTTOM] = 0.2;
-
 	set_notify_transform(true);
 	set_hide_clip_children(true);
+
+#ifdef TOOLS_ENABLED
+	add_user_signal(MethodInfo("_camera_limit_enabled_updated")); // Camera2DEditorPlugin listens to this.
+#endif
 }
diff --git a/engine/scene/2d/camera_2d.h b/engine/scene/2d/camera_2d.h
index be2da8b9..70de9614 100644
--- a/engine/scene/2d/camera_2d.h
+++ b/engine/scene/2d/camera_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_2D_H
-#define CAMERA_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -53,7 +52,7 @@ protected:
 	bool first = true;
 	bool just_exited_tree = false;
 
-	ObjectID custom_viewport_id; // to check validity
+	ObjectID custom_viewport_id; // To check validity.
 	Viewport *custom_viewport = nullptr;
 	Viewport *viewport = nullptr;
 
@@ -73,10 +72,11 @@ protected:
 	real_t rotation_smoothing_speed = 5.0;
 	bool rotation_smoothing_enabled = false;
 
-	int limit[4];
+	bool limit_enabled = true;
+	int limit[4] = { -10000000, -10000000, 10000000, 10000000 }; // Left, top, right, bottom.
 	bool limit_smoothing_enabled = false;
 
-	real_t drag_margin[4];
+	real_t drag_margin[4] = { 0.2, 0.2, 0.2, 0.2 };
 	bool drag_horizontal_enabled = false;
 	bool drag_vertical_enabled = false;
 	real_t drag_horizontal_offset = 0.0;
@@ -88,17 +88,19 @@ protected:
 	bool _is_editing_in_editor() const;
 	void _update_process_callback();
 	void _update_scroll();
+
 #ifdef TOOLS_ENABLED
+	bool _is_dragging_limit_rect() const;
 	void _project_settings_changed();
 #endif
 
 	void _make_current(Object *p_which);
 	void _reset_just_exited() { just_exited_tree = false; }
 
-	void _set_old_smoothing(real_t p_enable);
-
 	void _update_process_internal_for_smoothing();
 
+	void _set_limit_rect(const Rect2 &p_limit_rect);
+
 	bool screen_drawing_enabled = true;
 	bool limit_drawing_enabled = false;
 	bool margin_drawing_enabled = false;
@@ -123,6 +125,24 @@ protected:
 	void _validate_property(PropertyInfo &p_property) const;
 
 public:
+#ifdef TOOLS_ENABLED
+	virtual Dictionary _edit_get_state() const override;
+	virtual void _edit_set_state(const Dictionary &p_state) override;
+
+	virtual void _edit_set_position(const Point2 &p_position) override;
+	virtual Point2 _edit_get_position() const override;
+
+	virtual void _edit_set_rect(const Rect2 &p_rect) override;
+	virtual Size2 _edit_get_minimum_size() const override { return Size2(); }
+#endif // TOOLS_ENABLED
+
+#ifdef DEBUG_ENABLED
+	virtual Rect2 _edit_get_rect() const override;
+	virtual bool _edit_use_rect() const override;
+#endif // DEBUG_ENABLED
+
+	Rect2 get_limit_rect() const;
+
 	void set_offset(const Vector2 &p_offset);
 	Vector2 get_offset() const;
 
@@ -132,10 +152,13 @@ public:
 	void set_ignore_rotation(bool p_ignore);
 	bool is_ignoring_rotation() const;
 
+	void set_limit_enabled(bool p_limit_enabled);
+	bool is_limit_enabled() const;
+
 	void set_limit(Side p_side, int p_limit);
 	int get_limit(Side p_side) const;
 
-	void set_limit_smoothing_enabled(bool enable);
+	void set_limit_smoothing_enabled(bool p_enabled);
 	bool is_limit_smoothing_enabled() const;
 
 	void set_drag_horizontal_enabled(bool p_enabled);
@@ -188,13 +211,13 @@ public:
 	void reset_smoothing();
 	void align();
 
-	void set_screen_drawing_enabled(bool enable);
+	void set_screen_drawing_enabled(bool p_enabled);
 	bool is_screen_drawing_enabled() const;
 
-	void set_limit_drawing_enabled(bool enable);
+	void set_limit_drawing_enabled(bool p_enabled);
 	bool is_limit_drawing_enabled() const;
 
-	void set_margin_drawing_enabled(bool enable);
+	void set_margin_drawing_enabled(bool p_enabled);
 	bool is_margin_drawing_enabled() const;
 
 	Camera2D();
@@ -202,5 +225,3 @@ public:
 
 VARIANT_ENUM_CAST(Camera2D::AnchorMode);
 VARIANT_ENUM_CAST(Camera2D::Camera2DProcessCallback);
-
-#endif // CAMERA_2D_H
diff --git a/engine/scene/2d/canvas_group.cpp b/engine/scene/2d/canvas_group.cpp
index bdf93268..42e5c16e 100644
--- a/engine/scene/2d/canvas_group.cpp
+++ b/engine/scene/2d/canvas_group.cpp
@@ -64,6 +64,38 @@ bool CanvasGroup::is_using_mipmaps() const {
 	return use_mipmaps;
 }
 
+PackedStringArray CanvasGroup::get_configuration_warnings() const {
+	PackedStringArray warnings = Node2D::get_configuration_warnings();
+
+	if (is_inside_tree()) {
+		bool warned_about_ancestor_clipping = false;
+		bool warned_about_canvasgroup_ancestor = false;
+		Node *n = get_parent();
+		while (n) {
+			CanvasItem *as_canvas_item = Object::cast_to<CanvasItem>(n);
+			if (!warned_about_ancestor_clipping && as_canvas_item && as_canvas_item->get_clip_children_mode() != CLIP_CHILDREN_DISABLED) {
+				warnings.push_back(vformat(RTR("Ancestor \"%s\" clips its children, so this CanvasGroup will not function properly."), as_canvas_item->get_name()));
+				warned_about_ancestor_clipping = true;
+			}
+
+			CanvasGroup *as_canvas_group = Object::cast_to<CanvasGroup>(n);
+			if (!warned_about_canvasgroup_ancestor && as_canvas_group) {
+				warnings.push_back(vformat(RTR("Ancestor \"%s\" is a CanvasGroup, so this CanvasGroup will not function properly."), as_canvas_group->get_name()));
+				warned_about_canvasgroup_ancestor = true;
+			}
+
+			// Only break out early once both warnings have been triggered, so
+			// that the user is aware of both possible reasons for clipping not working.
+			if (warned_about_ancestor_clipping && warned_about_canvasgroup_ancestor) {
+				break;
+			}
+			n = n->get_parent();
+		}
+	}
+
+	return warnings;
+}
+
 void CanvasGroup::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_fit_margin", "fit_margin"), &CanvasGroup::set_fit_margin);
 	ClassDB::bind_method(D_METHOD("get_fit_margin"), &CanvasGroup::get_fit_margin);
diff --git a/engine/scene/2d/canvas_group.h b/engine/scene/2d/canvas_group.h
index 2493ecb7..509f3065 100644
--- a/engine/scene/2d/canvas_group.h
+++ b/engine/scene/2d/canvas_group.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CANVAS_GROUP_H
-#define CANVAS_GROUP_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -52,8 +51,8 @@ public:
 	void set_use_mipmaps(bool p_use_mipmaps);
 	bool is_using_mipmaps() const;
 
+	virtual PackedStringArray get_configuration_warnings() const override;
+
 	CanvasGroup();
 	~CanvasGroup();
 };
-
-#endif // CANVAS_GROUP_H
diff --git a/engine/scene/2d/canvas_modulate.h b/engine/scene/2d/canvas_modulate.h
index 08ded52e..24b81850 100644
--- a/engine/scene/2d/canvas_modulate.h
+++ b/engine/scene/2d/canvas_modulate.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CANVAS_MODULATE_H
-#define CANVAS_MODULATE_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -59,5 +58,3 @@ public:
 	CanvasModulate();
 	~CanvasModulate();
 };
-
-#endif // CANVAS_MODULATE_H
diff --git a/engine/scene/2d/cpu_particles_2d.cpp b/engine/scene/2d/cpu_particles_2d.cpp
index 279bb8ff..bc8d0e4b 100644
--- a/engine/scene/2d/cpu_particles_2d.cpp
+++ b/engine/scene/2d/cpu_particles_2d.cpp
@@ -116,7 +116,14 @@ void CPUParticles2D::set_use_local_coordinates(bool p_enable) {
 
 	// We only need NOTIFICATION_TRANSFORM_CHANGED
 	// when following an interpolated target.
+
+#ifdef TOOLS_ENABLED
+	set_notify_transform(_interpolation_data.interpolated_follow || (Engine::get_singleton()->is_editor_hint() && !local_coords));
+#else
 	set_notify_transform(_interpolation_data.interpolated_follow);
+#endif
+
+	queue_redraw();
 }
 
 void CPUParticles2D::set_speed_scale(double p_scale) {
@@ -474,14 +481,35 @@ void CPUParticles2D::set_emission_shape(EmissionShape p_shape) {
 	ERR_FAIL_INDEX(p_shape, EMISSION_SHAPE_MAX);
 	emission_shape = p_shape;
 	notify_property_list_changed();
+#ifdef TOOLS_ENABLED
+	if (Engine::get_singleton()->is_editor_hint()) {
+		queue_redraw();
+	}
+#endif
 }
 
 void CPUParticles2D::set_emission_sphere_radius(real_t p_radius) {
+	if (p_radius == emission_sphere_radius) {
+		return;
+	}
 	emission_sphere_radius = p_radius;
+#ifdef TOOLS_ENABLED
+	if (Engine::get_singleton()->is_editor_hint()) {
+		queue_redraw();
+	}
+#endif
 }
 
 void CPUParticles2D::set_emission_rect_extents(Vector2 p_extents) {
+	if (p_extents == emission_rect_extents) {
+		return;
+	}
 	emission_rect_extents = p_extents;
+#ifdef TOOLS_ENABLED
+	if (Engine::get_singleton()->is_editor_hint()) {
+		queue_redraw();
+	}
+#endif
 }
 
 void CPUParticles2D::set_emission_points(const Vector<Vector2> &p_points) {
@@ -569,6 +597,16 @@ void CPUParticles2D::set_seed(uint32_t p_seed) {
 	seed = p_seed;
 }
 
+#ifdef TOOLS_ENABLED
+void CPUParticles2D::set_show_gizmos(bool p_show_gizmos) {
+	if (show_gizmos == p_show_gizmos) {
+		return;
+	}
+	show_gizmos = p_show_gizmos;
+	queue_redraw();
+}
+#endif
+
 uint32_t CPUParticles2D::get_seed() const {
 	return seed;
 }
@@ -637,7 +675,7 @@ static real_t rand_from_seed(uint32_t &seed) {
 }
 
 void CPUParticles2D::_update_internal() {
-	if (particles.size() == 0 || !is_visible_in_tree()) {
+	if (particles.is_empty() || !is_visible_in_tree()) {
 		_set_do_redraw(false);
 		return;
 	}
@@ -853,12 +891,12 @@ void CPUParticles2D::_particles_process(double p_delta) {
 					//do none
 				} break;
 				case EMISSION_SHAPE_SPHERE: {
-					real_t t = Math_TAU * rng->randf();
+					real_t t = Math::TAU * rng->randf();
 					real_t radius = emission_sphere_radius * rng->randf();
 					p.transform[2] = Vector2(Math::cos(t), Math::sin(t)) * radius;
 				} break;
 				case EMISSION_SHAPE_SPHERE_SURFACE: {
-					real_t s = rng->randf(), t = Math_TAU * rng->randf();
+					real_t s = rng->randf(), t = Math::TAU * rng->randf();
 					real_t radius = emission_sphere_radius * Math::sqrt(1.0 - s * s);
 					p.transform[2] = Vector2(Math::cos(t), Math::sin(t)) * radius;
 				} break;
@@ -975,7 +1013,7 @@ void CPUParticles2D::_particles_process(double p_delta) {
 			//orbit velocity
 			real_t orbit_amount = tex_orbit_velocity * Math::lerp(parameters_min[PARAM_ORBIT_VELOCITY], parameters_max[PARAM_ORBIT_VELOCITY], rand_from_seed(_seed));
 			if (orbit_amount != 0.0) {
-				real_t ang = orbit_amount * local_delta * Math_TAU;
+				real_t ang = orbit_amount * local_delta * Math::TAU;
 				// Not sure why the ParticleProcessMaterial code uses a clockwise rotation matrix,
 				// but we use -ang here to reproduce its behavior.
 				Transform2D rot = Transform2D(-ang, Vector2());
@@ -1029,7 +1067,7 @@ void CPUParticles2D::_particles_process(double p_delta) {
 			tex_hue_variation = curve_parameters[PARAM_HUE_VARIATION]->sample(tv);
 		}
 
-		real_t hue_rot_angle = (tex_hue_variation)*Math_TAU * Math::lerp(parameters_min[PARAM_HUE_VARIATION], parameters_max[PARAM_HUE_VARIATION], p.hue_rot_rand);
+		real_t hue_rot_angle = (tex_hue_variation)*Math::TAU * Math::lerp(parameters_min[PARAM_HUE_VARIATION], parameters_max[PARAM_HUE_VARIATION], p.hue_rot_rand);
 		real_t hue_rot_c = Math::cos(hue_rot_angle);
 		real_t hue_rot_s = Math::sin(hue_rot_angle);
 
@@ -1194,8 +1232,6 @@ void CPUParticles2D::_notification(int p_what) {
 
 			_refresh_interpolation_state();
 
-			set_physics_process_internal(emitting && _interpolation_data.interpolated_follow);
-
 			// If we are interpolated following, then reset physics interpolation
 			// when first appearing. This won't be called by canvas item, as in the
 			// following mode, is_physics_interpolated() is actually FALSE.
@@ -1224,6 +1260,13 @@ void CPUParticles2D::_notification(int p_what) {
 			}
 
 			RS::get_singleton()->canvas_item_add_multimesh(get_canvas_item(), multimesh, texrid);
+
+#ifdef TOOLS_ENABLED
+			if (show_gizmos) {
+				_draw_emission_gizmo();
+			}
+#endif
+
 		} break;
 
 		case NOTIFICATION_INTERNAL_PROCESS: {
@@ -1245,6 +1288,11 @@ void CPUParticles2D::_notification(int p_what) {
 					_interpolation_data.global_xform_curr = get_global_transform();
 				}
 			}
+#ifdef TOOLS_ENABLED
+			if (!local_coords) {
+				queue_redraw();
+			}
+#endif
 		} break;
 
 		case NOTIFICATION_RESET_PHYSICS_INTERPOLATION: {
@@ -1255,6 +1303,30 @@ void CPUParticles2D::_notification(int p_what) {
 	}
 }
 
+#ifdef TOOLS_ENABLED
+void CPUParticles2D::_draw_emission_gizmo() {
+	Color emission_ring_color = Color(0.8, 0.7, 0.4, 0.4);
+	Transform2D gizmo_transform;
+	if (!local_coords) {
+		gizmo_transform = get_global_transform();
+	}
+
+	draw_set_transform_matrix(gizmo_transform);
+
+	switch (emission_shape) {
+		case CPUParticles2D::EMISSION_SHAPE_RECTANGLE:
+			draw_rect(Rect2(-emission_rect_extents, emission_rect_extents * 2.0), emission_ring_color, false);
+			break;
+		case CPUParticles2D::EMISSION_SHAPE_SPHERE:
+		case CPUParticles2D::EMISSION_SHAPE_SPHERE_SURFACE:
+			draw_circle(Vector2(), emission_sphere_radius, emission_ring_color, false);
+			break;
+		default:
+			break;
+	}
+}
+#endif
+
 void CPUParticles2D::convert_from_particles(Node *p_particles) {
 	GPUParticles2D *gpu_particles = Object::cast_to<GPUParticles2D>(p_particles);
 	ERR_FAIL_NULL_MSG(gpu_particles, "Only GPUParticles2D nodes can be converted to CPUParticles2D.");
diff --git a/engine/scene/2d/cpu_particles_2d.h b/engine/scene/2d/cpu_particles_2d.h
index 72fdf65a..dc034d1a 100644
--- a/engine/scene/2d/cpu_particles_2d.h
+++ b/engine/scene/2d/cpu_particles_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CPU_PARTICLES_2D_H
-#define CPU_PARTICLES_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -148,6 +147,10 @@ private:
 
 	Transform2D inv_emission_transform;
 
+#ifdef TOOLS_ENABLED
+	bool show_gizmos = false;
+#endif
+
 	DrawOrder draw_order = DRAW_ORDER_INDEX;
 
 	Ref<Texture2D> texture;
@@ -212,6 +215,9 @@ private:
 protected:
 	static void _bind_methods();
 	void _notification(int p_what);
+#ifdef TOOLS_ENABLED
+	void _draw_emission_gizmo();
+#endif
 	void _validate_property(PropertyInfo &p_property) const;
 
 #ifndef DISABLE_DEPRECATED
@@ -258,6 +264,9 @@ public:
 	bool get_use_fixed_seed() const;
 
 	void set_seed(uint32_t p_seed);
+#ifdef TOOLS_ENABLED
+	void set_show_gizmos(bool p_show_gizmos);
+#endif
 	uint32_t get_seed() const;
 
 	void request_particles_process(real_t p_requested_process_time);
@@ -328,5 +337,3 @@ VARIANT_ENUM_CAST(CPUParticles2D::DrawOrder)
 VARIANT_ENUM_CAST(CPUParticles2D::Parameter)
 VARIANT_ENUM_CAST(CPUParticles2D::ParticleFlags)
 VARIANT_ENUM_CAST(CPUParticles2D::EmissionShape)
-
-#endif // CPU_PARTICLES_2D_H
diff --git a/engine/scene/2d/gpu_particles_2d.cpp b/engine/scene/2d/gpu_particles_2d.cpp
index f9806c3e..73ccf953 100644
--- a/engine/scene/2d/gpu_particles_2d.cpp
+++ b/engine/scene/2d/gpu_particles_2d.cpp
@@ -144,7 +144,22 @@ void GPUParticles2D::_update_particle_emission_transform() {
 }
 
 void GPUParticles2D::set_process_material(const Ref<Material> &p_material) {
+	if (process_material == p_material) {
+		return;
+	}
+
+	if (process_material.is_valid() && process_material->is_class("ParticleProcessMaterial")) {
+		process_material->disconnect("emission_shape_changed", callable_mp((CanvasItem *)this, &GPUParticles2D::queue_redraw));
+	}
+
 	process_material = p_material;
+
+	if (process_material.is_valid() && process_material->is_class("ParticleProcessMaterial")) {
+		process_material->connect("emission_shape_changed", callable_mp((CanvasItem *)this, &GPUParticles2D::queue_redraw));
+	}
+
+	queue_redraw();
+
 	Ref<ParticleProcessMaterial> pm = p_material;
 	if (pm.is_valid() && !pm->get_particle_flag(ParticleProcessMaterial::PARTICLE_FLAG_DISABLE_Z) && pm->get_gravity() == Vector3(0, -9.8, 0)) {
 		// Likely a new (3D) material, modify it to match 2D space
@@ -198,8 +213,11 @@ void GPUParticles2D::set_interp_to_end(float p_interp) {
 }
 
 #ifdef TOOLS_ENABLED
-void GPUParticles2D::set_show_visibility_rect(bool p_show_visibility_rect) {
-	show_visibility_rect = p_show_visibility_rect;
+void GPUParticles2D::set_show_gizmos(bool p_show_gizmos) {
+	if (show_gizmos == p_show_gizmos) {
+		return;
+	}
+	show_gizmos = p_show_gizmos;
 	queue_redraw();
 }
 #endif
@@ -370,11 +388,11 @@ PackedStringArray GPUParticles2D::get_configuration_warnings() const {
 		}
 	}
 
-	if (trail_enabled && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+	if (trail_enabled && (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "dummy")) {
 		warnings.push_back(RTR("Particle trails are only available when using the Forward+ or Mobile renderers."));
 	}
 
-	if (sub_emitter != NodePath() && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+	if (sub_emitter != NodePath() && (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "dummy")) {
 		warnings.push_back(RTR("Particle sub-emitters are not available when using the Compatibility renderer."));
 	}
 
@@ -707,8 +725,9 @@ void GPUParticles2D::_notification(int p_what) {
 			RS::get_singleton()->canvas_item_add_particles(get_canvas_item(), particles, texture_rid);
 
 #ifdef TOOLS_ENABLED
-			if (show_visibility_rect) {
+			if (show_gizmos) {
 				draw_rect(visibility_rect, Color(0, 0.7, 0.9, 0.4), false);
+				_draw_emission_gizmo();
 			}
 #endif
 		} break;
@@ -784,6 +803,60 @@ void GPUParticles2D::_notification(int p_what) {
 	}
 }
 
+#ifdef TOOLS_ENABLED
+void GPUParticles2D::_draw_emission_gizmo() {
+	Ref<ParticleProcessMaterial> pm = process_material;
+	Color emission_ring_color = Color(0.8, 0.7, 0.4, 0.4);
+	if (pm.is_null()) {
+		return;
+	}
+	draw_set_transform(
+			Vector2(pm->get_emission_shape_offset().x, pm->get_emission_shape_offset().y),
+			0.0,
+			Vector2(pm->get_emission_shape_scale().x, pm->get_emission_shape_scale().y));
+
+	switch (pm->get_emission_shape()) {
+		case ParticleProcessMaterial::EmissionShape::EMISSION_SHAPE_BOX: {
+			Vector2 extents2d = Vector2(pm->get_emission_box_extents().x, pm->get_emission_box_extents().y);
+			draw_rect(Rect2(-extents2d, extents2d * 2.0), emission_ring_color, false);
+			break;
+		}
+		case ParticleProcessMaterial::EmissionShape::EMISSION_SHAPE_SPHERE:
+		case ParticleProcessMaterial::EmissionShape::EMISSION_SHAPE_SPHERE_SURFACE: {
+			draw_circle(Vector2(), pm->get_emission_sphere_radius(), emission_ring_color, false);
+			break;
+		}
+		case ParticleProcessMaterial::EmissionShape::EMISSION_SHAPE_RING: {
+			Vector3 ring_axis = pm->get_emission_ring_axis();
+			if (ring_axis.is_equal_approx(Vector3(0.0, 0.0, 1.0)) || ring_axis.is_zero_approx()) {
+				draw_circle(Vector2(), pm->get_emission_ring_inner_radius(), emission_ring_color, false);
+				draw_circle(Vector2(), pm->get_emission_ring_radius(), emission_ring_color, false);
+			} else {
+				Vector2 a = Vector2(pm->get_emission_ring_height() / -2.0, pm->get_emission_ring_radius() / -1.0);
+				Vector2 b = Vector2(-a.x, MIN(a.y + tan((90.0 - pm->get_emission_ring_cone_angle()) * 0.01745329) * pm->get_emission_ring_height(), 0.0));
+				Vector2 c = Vector2(b.x, -b.y);
+				Vector2 d = Vector2(a.x, -a.y);
+				if (ring_axis.is_equal_approx(Vector3(1.0, 0.0, 0.0))) {
+					Vector<Vector2> pos = { a, b, b, c, c, d, d, a };
+					draw_multiline(pos, emission_ring_color);
+				} else if (ring_axis.is_equal_approx(Vector3(0.0, 1.0, 0.0))) {
+					a = Vector2(a.y, a.x);
+					b = Vector2(b.y, b.x);
+					c = Vector2(c.y, c.x);
+					d = Vector2(d.y, d.x);
+					Vector<Vector2> pos = { a, b, b, c, c, d, d, a };
+					draw_multiline(pos, emission_ring_color);
+				}
+			}
+			break;
+		}
+		default: {
+			break;
+		}
+	}
+}
+#endif
+
 void GPUParticles2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_emitting", "emitting"), &GPUParticles2D::set_emitting);
 	ClassDB::bind_method(D_METHOD("set_amount", "amount"), &GPUParticles2D::set_amount);
diff --git a/engine/scene/2d/gpu_particles_2d.h b/engine/scene/2d/gpu_particles_2d.h
index ca832698..db3286a0 100644
--- a/engine/scene/2d/gpu_particles_2d.h
+++ b/engine/scene/2d/gpu_particles_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GPU_PARTICLES_2D_H
-#define GPU_PARTICLES_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -69,7 +68,7 @@ private:
 	uint32_t seed = 0;
 	bool use_fixed_seed = false;
 #ifdef TOOLS_ENABLED
-	bool show_visibility_rect = false;
+	bool show_gizmos = false;
 #endif
 	Ref<Material> process_material;
 
@@ -101,6 +100,9 @@ protected:
 	static void _bind_methods();
 	void _validate_property(PropertyInfo &p_property) const;
 	void _notification(int p_what);
+#ifdef TOOLS_ENABLED
+	void _draw_emission_gizmo();
+#endif
 	void _update_collision_size();
 
 #ifndef DISABLE_DEPRECATED
@@ -129,7 +131,7 @@ public:
 	void request_particles_process(real_t p_requested_process_time);
 
 #ifdef TOOLS_ENABLED
-	void set_show_visibility_rect(bool p_show_visibility_rect);
+	void set_show_gizmos(bool p_show_gizmos);
 #endif
 
 	bool is_emitting() const;
@@ -200,5 +202,3 @@ public:
 
 VARIANT_ENUM_CAST(GPUParticles2D::DrawOrder)
 VARIANT_ENUM_CAST(GPUParticles2D::EmitFlags)
-
-#endif // GPU_PARTICLES_2D_H
diff --git a/engine/scene/2d/light_2d.h b/engine/scene/2d/light_2d.h
index 0c1dae07..32e772eb 100644
--- a/engine/scene/2d/light_2d.h
+++ b/engine/scene/2d/light_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_2D_H
-#define LIGHT_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -197,5 +196,3 @@ public:
 
 	DirectionalLight2D();
 };
-
-#endif // LIGHT_2D_H
diff --git a/engine/scene/2d/light_occluder_2d.cpp b/engine/scene/2d/light_occluder_2d.cpp
index 4bf97a59..a0ee730e 100644
--- a/engine/scene/2d/light_occluder_2d.cpp
+++ b/engine/scene/2d/light_occluder_2d.cpp
@@ -51,7 +51,7 @@ Rect2 OccluderPolygon2D::_edit_get_rect() const {
 			}
 			rect_cache_dirty = false;
 		} else {
-			if (polygon.size() == 0) {
+			if (polygon.is_empty()) {
 				item_rect = Rect2();
 			} else {
 				Vector2 d = Vector2(LINE_GRAB_WIDTH, LINE_GRAB_WIDTH);
@@ -74,7 +74,7 @@ bool OccluderPolygon2D::_edit_is_selected_on_click(const Point2 &p_point, double
 		const real_t d = LINE_GRAB_WIDTH / 2 + p_tolerance;
 		const Vector2 *points = polygon.ptr();
 		for (int i = 0; i < polygon.size() - 1; i++) {
-			Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, &points[i]);
+			Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, points[i], points[i + 1]);
 			if (p.distance_to(p_point) <= d) {
 				return true;
 			}
@@ -270,7 +270,7 @@ PackedStringArray LightOccluder2D::get_configuration_warnings() const {
 		warnings.push_back(RTR("An occluder polygon must be set (or drawn) for this occluder to take effect."));
 	}
 
-	if (occluder_polygon.is_valid() && occluder_polygon->get_polygon().size() == 0) {
+	if (occluder_polygon.is_valid() && occluder_polygon->get_polygon().is_empty()) {
 		warnings.push_back(RTR("The occluder polygon for this occluder is empty. Please draw a polygon."));
 	}
 
diff --git a/engine/scene/2d/light_occluder_2d.h b/engine/scene/2d/light_occluder_2d.h
index b9f7eec3..dca9859b 100644
--- a/engine/scene/2d/light_occluder_2d.h
+++ b/engine/scene/2d/light_occluder_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_OCCLUDER_2D_H
-#define LIGHT_OCCLUDER_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -111,5 +110,3 @@ public:
 	LightOccluder2D();
 	~LightOccluder2D();
 };
-
-#endif // LIGHT_OCCLUDER_2D_H
diff --git a/engine/scene/2d/line_2d.cpp b/engine/scene/2d/line_2d.cpp
index f27d729e..917a3b61 100644
--- a/engine/scene/2d/line_2d.cpp
+++ b/engine/scene/2d/line_2d.cpp
@@ -38,7 +38,7 @@ Line2D::Line2D() {
 
 #ifdef DEBUG_ENABLED
 Rect2 Line2D::_edit_get_rect() const {
-	if (_points.size() == 0) {
+	if (_points.is_empty()) {
 		return Rect2(0, 0, 0, 0);
 	}
 	Vector2 min = _points[0];
@@ -58,14 +58,14 @@ bool Line2D::_edit_is_selected_on_click(const Point2 &p_point, double p_toleranc
 	const real_t d = _width / 2 + p_tolerance;
 	const Vector2 *points = _points.ptr();
 	for (int i = 0; i < _points.size() - 1; i++) {
-		Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, &points[i]);
+		Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, points[i], points[i + 1]);
 		if (p_point.distance_to(p) <= d) {
 			return true;
 		}
 	}
+	// Closing segment between the first and last point.
 	if (_closed && _points.size() > 2) {
-		const Vector2 closing_segment[2] = { points[0], points[_points.size() - 1] };
-		Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, closing_segment);
+		Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, points[0], points[_points.size() - 1]);
 		if (p_point.distance_to(p) <= d) {
 			return true;
 		}
diff --git a/engine/scene/2d/line_2d.h b/engine/scene/2d/line_2d.h
index 01563364..0d081b33 100644
--- a/engine/scene/2d/line_2d.h
+++ b/engine/scene/2d/line_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LINE_2D_H
-#define LINE_2D_H
+#pragma once
 
 #include "node_2d.h"
 
@@ -146,5 +145,3 @@ private:
 VARIANT_ENUM_CAST(Line2D::LineJointMode)
 VARIANT_ENUM_CAST(Line2D::LineCapMode)
 VARIANT_ENUM_CAST(Line2D::LineTextureMode)
-
-#endif // LINE_2D_H
diff --git a/engine/scene/2d/line_builder.cpp b/engine/scene/2d/line_builder.cpp
index efc531a0..d4a5b224 100644
--- a/engine/scene/2d/line_builder.cpp
+++ b/engine/scene/2d/line_builder.cpp
@@ -144,7 +144,7 @@ void LineBuilder::build() {
 			} else if (texture_mode == Line2D::LINE_TEXTURE_STRETCH) {
 				uvx0 = width * width_factor / total_distance;
 			}
-			new_arc(pos0, pos_up0 - pos0, -Math_PI, color0, Rect2(0.f, 0.f, uvx0 * 2, 1.f));
+			new_arc(pos0, pos_up0 - pos0, -Math::PI, color0, Rect2(0.f, 0.f, uvx0 * 2, 1.f));
 			current_distance0 += modified_hw;
 			current_distance1 = current_distance0;
 		}
@@ -426,7 +426,7 @@ void LineBuilder::build() {
 			} else if (texture_mode == Line2D::LINE_TEXTURE_STRETCH) {
 				dist = width * width_factor / total_distance;
 			}
-			new_arc(pos1, pos_up1 - pos1, Math_PI, color, Rect2(uvx1 - 0.5f * dist, 0.f, dist, 1.f));
+			new_arc(pos1, pos_up1 - pos1, Math::PI, color, Rect2(uvx1 - 0.5f * dist, 0.f, dist, 1.f));
 		}
 	}
 }
@@ -509,7 +509,7 @@ void LineBuilder::strip_add_arc(Vector2 center, float angle_delta, Orientation o
 	Orientation opposite_orientation = orientation == UP ? DOWN : UP;
 	Vector2 vbegin = vertices[_last_index[opposite_orientation]] - center;
 	float radius = vbegin.length();
-	float angle_step = Math_PI / static_cast<float>(round_precision);
+	float angle_step = Math::PI / static_cast<float>(round_precision);
 	float steps = Math::abs(angle_delta) / angle_step;
 
 	if (angle_delta < 0.f) {
@@ -536,7 +536,7 @@ void LineBuilder::new_arc(Vector2 center, Vector2 vbegin, float angle_delta, Col
 	// with undistorted UVs from within a square section
 
 	float radius = vbegin.length();
-	float angle_step = Math_PI / static_cast<float>(round_precision);
+	float angle_step = Math::PI / static_cast<float>(round_precision);
 	float steps = Math::abs(angle_delta) / angle_step;
 
 	if (angle_delta < 0.f) {
@@ -546,7 +546,7 @@ void LineBuilder::new_arc(Vector2 center, Vector2 vbegin, float angle_delta, Col
 	float t = Vector2(1, 0).angle_to(vbegin);
 	float end_angle = t + angle_delta;
 	Vector2 rpos(0, 0);
-	float tt_begin = -Math_PI / 2.0f;
+	float tt_begin = -Math::PI / 2.0f;
 	float tt = tt_begin;
 
 	// Center vertice
diff --git a/engine/scene/2d/line_builder.h b/engine/scene/2d/line_builder.h
index 3706352d..5ff86e69 100644
--- a/engine/scene/2d/line_builder.h
+++ b/engine/scene/2d/line_builder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LINE_BUILDER_H
-#define LINE_BUILDER_H
+#pragma once
 
 #include "line_2d.h"
 
@@ -82,5 +81,3 @@ private:
 	bool _interpolate_color = false;
 	int _last_index[2] = {}; // Index of last up and down vertices of the strip
 };
-
-#endif // LINE_BUILDER_H
diff --git a/engine/scene/2d/marker_2d.h b/engine/scene/2d/marker_2d.h
index 6a1dfb1c..bd1ce949 100644
--- a/engine/scene/2d/marker_2d.h
+++ b/engine/scene/2d/marker_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MARKER_2D_H
-#define MARKER_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -55,5 +54,3 @@ public:
 
 	Marker2D();
 };
-
-#endif // MARKER_2D_H
diff --git a/engine/scene/2d/mesh_instance_2d.cpp b/engine/scene/2d/mesh_instance_2d.cpp
index a38bfac1..76e73b69 100644
--- a/engine/scene/2d/mesh_instance_2d.cpp
+++ b/engine/scene/2d/mesh_instance_2d.cpp
@@ -30,13 +30,14 @@
 
 #include "mesh_instance_2d.h"
 
+#ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
-#include "scene/scene_string_names.h"
 #include "servers/navigation_server_2d.h"
 
 #include "thirdparty/clipper2/include/clipper2/clipper.h"
 #include "thirdparty/misc/polypartition.h"
+#endif // NAVIGATION_2D_DISABLED
 
 Callable MeshInstance2D::_navmesh_source_geometry_parsing_callback;
 RID MeshInstance2D::_navmesh_source_geometry_parser;
@@ -117,6 +118,7 @@ bool MeshInstance2D::_edit_use_rect() const {
 }
 #endif // DEBUG_ENABLED
 
+#ifndef NAVIGATION_2D_DISABLED
 void MeshInstance2D::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer2D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -211,6 +213,7 @@ void MeshInstance2D::navmesh_parse_source_geometry(const Ref<NavigationPolygon>
 		p_source_geometry_data->add_obstruction_outline(shape_outline);
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 MeshInstance2D::MeshInstance2D() {
 }
diff --git a/engine/scene/2d/mesh_instance_2d.h b/engine/scene/2d/mesh_instance_2d.h
index 77d2ed21..128db834 100644
--- a/engine/scene/2d/mesh_instance_2d.h
+++ b/engine/scene/2d/mesh_instance_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_INSTANCE_2D_H
-#define MESH_INSTANCE_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -64,10 +63,10 @@ private:
 	static RID _navmesh_source_geometry_parser;
 
 public:
+#ifndef NAVIGATION_2D_DISABLED
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_2D_DISABLED
 
 	MeshInstance2D();
 };
-
-#endif // MESH_INSTANCE_2D_H
diff --git a/engine/scene/2d/multimesh_instance_2d.cpp b/engine/scene/2d/multimesh_instance_2d.cpp
index 78b8a277..47926522 100644
--- a/engine/scene/2d/multimesh_instance_2d.cpp
+++ b/engine/scene/2d/multimesh_instance_2d.cpp
@@ -30,13 +30,14 @@
 
 #include "multimesh_instance_2d.h"
 
+#ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
-#include "scene/scene_string_names.h"
 #include "servers/navigation_server_2d.h"
 
 #include "thirdparty/clipper2/include/clipper2/clipper.h"
 #include "thirdparty/misc/polypartition.h"
+#endif // NAVIGATION_2D_DISABLED
 
 Callable MultiMeshInstance2D::_navmesh_source_geometry_parsing_callback;
 RID MultiMeshInstance2D::_navmesh_source_geometry_parser;
@@ -106,6 +107,7 @@ Rect2 MultiMeshInstance2D::_edit_get_rect() const {
 }
 #endif // DEBUG_ENABLED
 
+#ifndef NAVIGATION_2D_DISABLED
 void MultiMeshInstance2D::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer2D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -209,6 +211,7 @@ void MultiMeshInstance2D::navmesh_parse_source_geometry(const Ref<NavigationPoly
 		}
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 MultiMeshInstance2D::MultiMeshInstance2D() {
 }
diff --git a/engine/scene/2d/multimesh_instance_2d.h b/engine/scene/2d/multimesh_instance_2d.h
index c836f93a..f3de5a90 100644
--- a/engine/scene/2d/multimesh_instance_2d.h
+++ b/engine/scene/2d/multimesh_instance_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIMESH_INSTANCE_2D_H
-#define MULTIMESH_INSTANCE_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/multimesh.h"
@@ -64,11 +63,11 @@ private:
 	static RID _navmesh_source_geometry_parser;
 
 public:
+#ifndef NAVIGATION_2D_DISABLED
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_2D_DISABLED
 
 	MultiMeshInstance2D();
 	~MultiMeshInstance2D();
 };
-
-#endif // MULTIMESH_INSTANCE_2D_H
diff --git a/engine/scene/2d/navigation/SCsub b/engine/scene/2d/navigation/SCsub
new file mode 100644
index 00000000..374dc211
--- /dev/null
+++ b/engine/scene/2d/navigation/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.scene_sources, "*.cpp")
diff --git a/engine/scene/2d/navigation_agent_2d.cpp b/engine/scene/2d/navigation/navigation_agent_2d.cpp
similarity index 99%
rename from engine/scene/2d/navigation_agent_2d.cpp
rename to engine/scene/2d/navigation/navigation_agent_2d.cpp
index 786598f0..91d6bcba 100644
--- a/engine/scene/2d/navigation_agent_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_agent_2d.cpp
@@ -31,7 +31,7 @@
 #include "navigation_agent_2d.h"
 
 #include "core/math/geometry_2d.h"
-#include "scene/2d/navigation_link_2d.h"
+#include "scene/2d/navigation/navigation_link_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_server_2d.h"
 
@@ -594,7 +594,7 @@ Vector2 NavigationAgent2D::get_next_path_position() {
 	_update_navigation();
 
 	const Vector<Vector2> &navigation_path = navigation_result->get_path();
-	if (navigation_path.size() == 0) {
+	if (navigation_path.is_empty()) {
 		ERR_FAIL_NULL_V_MSG(agent_parent, Vector2(), "The agent has no parent.");
 		return agent_parent->get_global_position();
 	} else {
@@ -632,7 +632,7 @@ Vector2 NavigationAgent2D::get_final_position() {
 
 Vector2 NavigationAgent2D::_get_final_position() const {
 	const Vector<Vector2> &navigation_path = navigation_result->get_path();
-	if (navigation_path.size() == 0) {
+	if (navigation_path.is_empty()) {
 		return Vector2();
 	}
 	return navigation_path[navigation_path.size() - 1];
@@ -685,17 +685,16 @@ void NavigationAgent2D::_update_navigation() {
 
 	if (NavigationServer2D::get_singleton()->agent_is_map_changed(agent)) {
 		reload_path = true;
-	} else if (navigation_result->get_path().size() == 0) {
+	} else if (navigation_result->get_path().is_empty()) {
 		reload_path = true;
 	} else {
 		// Check if too far from the navigation path
 		if (navigation_path_index > 0) {
 			const Vector<Vector2> &navigation_path = navigation_result->get_path();
 
-			Vector2 segment[2];
-			segment[0] = navigation_path[navigation_path_index - 1];
-			segment[1] = navigation_path[navigation_path_index];
-			Vector2 p = Geometry2D::get_closest_point_to_segment(origin, segment);
+			const Vector2 segment_a = navigation_path[navigation_path_index - 1];
+			const Vector2 segment_b = navigation_path[navigation_path_index];
+			Vector2 p = Geometry2D::get_closest_point_to_segment(origin, segment_a, segment_b);
 			if (origin.distance_to(p) >= path_max_distance) {
 				// To faraway, reload path
 				reload_path = true;
@@ -725,7 +724,7 @@ void NavigationAgent2D::_update_navigation() {
 		emit_signal(SNAME("path_changed"));
 	}
 
-	if (navigation_result->get_path().size() == 0) {
+	if (navigation_result->get_path().is_empty()) {
 		return;
 	}
 
diff --git a/engine/scene/2d/navigation_agent_2d.h b/engine/scene/2d/navigation/navigation_agent_2d.h
similarity index 99%
rename from engine/scene/2d/navigation_agent_2d.h
rename to engine/scene/2d/navigation/navigation_agent_2d.h
index 8741f578..856945e7 100644
--- a/engine/scene/2d/navigation_agent_2d.h
+++ b/engine/scene/2d/navigation/navigation_agent_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_AGENT_2D_H
-#define NAVIGATION_AGENT_2D_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "servers/navigation/navigation_path_query_parameters_2d.h"
@@ -260,5 +259,3 @@ private:
 	void _update_debug_path();
 #endif // DEBUG_ENABLED
 };
-
-#endif // NAVIGATION_AGENT_2D_H
diff --git a/engine/scene/2d/navigation_link_2d.cpp b/engine/scene/2d/navigation/navigation_link_2d.cpp
similarity index 98%
rename from engine/scene/2d/navigation_link_2d.cpp
rename to engine/scene/2d/navigation/navigation_link_2d.cpp
index 790b9f3e..c26d2b4b 100644
--- a/engine/scene/2d/navigation_link_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_link_2d.cpp
@@ -146,9 +146,7 @@ Rect2 NavigationLink2D::_edit_get_rect() const {
 }
 
 bool NavigationLink2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
-	Point2 segment[2] = { get_start_position(), get_end_position() };
-
-	Vector2 closest_point = Geometry2D::get_closest_point_to_segment(p_point, segment);
+	Vector2 closest_point = Geometry2D::get_closest_point_to_segment(p_point, get_start_position(), get_end_position());
 	return p_point.distance_to(closest_point) < p_tolerance;
 }
 #endif // DEBUG_ENABLED
@@ -398,8 +396,8 @@ void NavigationLink2D::_update_debug_mesh() {
 	real_t radius = NavigationServer2D::get_singleton()->map_get_link_connection_radius(get_world_2d()->get_navigation_map());
 
 	draw_line(get_start_position(), get_end_position(), color);
-	draw_arc(get_start_position(), radius, 0, Math_TAU, 10, color);
-	draw_arc(get_end_position(), radius, 0, Math_TAU, 10, color);
+	draw_arc(get_start_position(), radius, 0, Math::TAU, 10, color);
+	draw_arc(get_end_position(), radius, 0, Math::TAU, 10, color);
 
 	const Vector2 link_segment = end_position - start_position;
 	const float arror_len = 5.0;
diff --git a/engine/scene/2d/navigation_link_2d.h b/engine/scene/2d/navigation/navigation_link_2d.h
similarity index 98%
rename from engine/scene/2d/navigation_link_2d.h
rename to engine/scene/2d/navigation/navigation_link_2d.h
index 232efdd0..a7c4ae56 100644
--- a/engine/scene/2d/navigation_link_2d.h
+++ b/engine/scene/2d/navigation/navigation_link_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_LINK_2D_H
-#define NAVIGATION_LINK_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -111,5 +110,3 @@ private:
 	void _link_exit_navigation_map();
 	void _link_update_transform();
 };
-
-#endif // NAVIGATION_LINK_2D_H
diff --git a/engine/scene/2d/navigation_obstacle_2d.cpp b/engine/scene/2d/navigation/navigation_obstacle_2d.cpp
similarity index 99%
rename from engine/scene/2d/navigation_obstacle_2d.cpp
rename to engine/scene/2d/navigation/navigation_obstacle_2d.cpp
index 4a0730f4..0a938edf 100644
--- a/engine/scene/2d/navigation_obstacle_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_obstacle_2d.cpp
@@ -382,7 +382,7 @@ void NavigationObstacle2D::navmesh_parse_source_geometry(const Ref<NavigationPol
 
 		obstruction_circle_vertices.resize(circle_points);
 		Vector2 *circle_vertices_ptrw = obstruction_circle_vertices.ptrw();
-		const real_t circle_point_step = Math_TAU / circle_points;
+		const real_t circle_point_step = Math::TAU / circle_points;
 
 		for (int i = 0; i < circle_points; i++) {
 			const float angle = i * circle_point_step;
diff --git a/engine/scene/2d/navigation_obstacle_2d.h b/engine/scene/2d/navigation/navigation_obstacle_2d.h
similarity index 97%
rename from engine/scene/2d/navigation_obstacle_2d.h
rename to engine/scene/2d/navigation/navigation_obstacle_2d.h
index bb39b6f6..abab3f17 100644
--- a/engine/scene/2d/navigation_obstacle_2d.h
+++ b/engine/scene/2d/navigation/navigation_obstacle_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_OBSTACLE_2D_H
-#define NAVIGATION_OBSTACLE_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -131,5 +130,3 @@ private:
 	void _update_position(const Vector2 p_position);
 	void _update_transform();
 };
-
-#endif // NAVIGATION_OBSTACLE_2D_H
diff --git a/engine/scene/2d/navigation_region_2d.cpp b/engine/scene/2d/navigation/navigation_region_2d.cpp
similarity index 96%
rename from engine/scene/2d/navigation_region_2d.cpp
rename to engine/scene/2d/navigation/navigation_region_2d.cpp
index 365d5ba4..6f4250ae 100644
--- a/engine/scene/2d/navigation_region_2d.cpp
+++ b/engine/scene/2d/navigation/navigation_region_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "navigation_region_2d.h"
 
+#include "core/math/random_pcg.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_server_2d.h"
 
@@ -181,7 +182,7 @@ void NavigationRegion2D::_notification(int p_what) {
 
 		case NOTIFICATION_DRAW: {
 #ifdef DEBUG_ENABLED
-			if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || NavigationServer2D::get_singleton()->get_debug_enabled()) && navigation_polygon.is_valid()) {
+			if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || (NavigationServer2D::get_singleton()->get_debug_enabled() && NavigationServer2D::get_singleton()->get_debug_navigation_enabled())) && navigation_polygon.is_valid()) {
 				_update_debug_mesh();
 				_update_debug_edge_connections_mesh();
 				_update_debug_baking_rect();
@@ -197,27 +198,12 @@ void NavigationRegion2D::set_navigation_polygon(const Ref<NavigationPolygon> &p_
 	}
 
 	navigation_polygon = p_navigation_polygon;
-#ifdef DEBUG_ENABLED
-	debug_mesh_dirty = true;
-#endif // DEBUG_ENABLED
-
-	_update_bounds();
-
-	NavigationServer2D::get_singleton()->region_set_navigation_polygon(region, p_navigation_polygon);
 
 	if (navigation_polygon.is_valid()) {
 		navigation_polygon->connect_changed(callable_mp(this, &NavigationRegion2D::_navigation_polygon_changed));
 	}
 
-#ifdef DEBUG_ENABLED
-	if (navigation_polygon.is_null()) {
-		_set_debug_visible(false);
-	}
-#endif // DEBUG_ENABLED
-
 	_navigation_polygon_changed();
-
-	update_configuration_warnings();
 }
 
 Ref<NavigationPolygon> NavigationRegion2D::get_navigation_polygon() const {
@@ -253,19 +239,18 @@ void NavigationRegion2D::bake_navigation_polygon(bool p_on_thread) {
 	NavigationServer2D::get_singleton()->parse_source_geometry_data(navigation_polygon, source_geometry_data, this);
 
 	if (p_on_thread) {
-		NavigationServer2D::get_singleton()->bake_from_source_geometry_data_async(navigation_polygon, source_geometry_data, callable_mp(this, &NavigationRegion2D::_bake_finished).bind(navigation_polygon));
+		NavigationServer2D::get_singleton()->bake_from_source_geometry_data_async(navigation_polygon, source_geometry_data, callable_mp(this, &NavigationRegion2D::_bake_finished));
 	} else {
-		NavigationServer2D::get_singleton()->bake_from_source_geometry_data(navigation_polygon, source_geometry_data, callable_mp(this, &NavigationRegion2D::_bake_finished).bind(navigation_polygon));
+		NavigationServer2D::get_singleton()->bake_from_source_geometry_data(navigation_polygon, source_geometry_data, callable_mp(this, &NavigationRegion2D::_bake_finished));
 	}
 }
 
-void NavigationRegion2D::_bake_finished(Ref<NavigationPolygon> p_navigation_polygon) {
+void NavigationRegion2D::_bake_finished() {
 	if (!Thread::is_main_thread()) {
-		callable_mp(this, &NavigationRegion2D::_bake_finished).call_deferred(p_navigation_polygon);
+		callable_mp(this, &NavigationRegion2D::_bake_finished).call_deferred();
 		return;
 	}
 
-	set_navigation_polygon(p_navigation_polygon);
 	emit_signal(SNAME("bake_finished"));
 }
 
@@ -274,12 +259,25 @@ bool NavigationRegion2D::is_baking() const {
 }
 
 void NavigationRegion2D::_navigation_polygon_changed() {
+	_update_bounds();
+
+	NavigationServer2D::get_singleton()->region_set_navigation_polygon(region, navigation_polygon);
+
+#ifdef DEBUG_ENABLED
+	debug_mesh_dirty = true;
+
+	if (navigation_polygon.is_null()) {
+		_set_debug_visible(false);
+	}
+
 	if (is_inside_tree() && (Engine::get_singleton()->is_editor_hint() || get_tree()->is_debugging_navigation_hint())) {
 		queue_redraw();
 	}
-	if (navigation_polygon.is_valid()) {
-		NavigationServer2D::get_singleton()->region_set_navigation_polygon(region, navigation_polygon);
-	}
+#endif // DEBUG_ENABLED
+
+	emit_signal(SNAME("navigation_polygon_changed"));
+
+	update_configuration_warnings();
 }
 
 #ifdef DEBUG_ENABLED
@@ -625,8 +623,8 @@ void NavigationRegion2D::_update_debug_edge_connections_mesh() {
 
 			// Draw a circle to illustrate the margins.
 			real_t angle = a.angle_to_point(b);
-			draw_arc(a, radius, angle + Math_PI / 2.0, angle - Math_PI / 2.0 + Math_TAU, 10, debug_edge_connection_color);
-			draw_arc(b, radius, angle - Math_PI / 2.0, angle + Math_PI / 2.0, 10, debug_edge_connection_color);
+			draw_arc(a, radius, angle + Math::PI / 2.0, angle - Math::PI / 2.0 + Math::TAU, 10, debug_edge_connection_color);
+			draw_arc(b, radius, angle - Math::PI / 2.0, angle + Math::PI / 2.0, 10, debug_edge_connection_color);
 		}
 	}
 }
diff --git a/engine/scene/2d/navigation_region_2d.h b/engine/scene/2d/navigation/navigation_region_2d.h
similarity index 96%
rename from engine/scene/2d/navigation_region_2d.h
rename to engine/scene/2d/navigation/navigation_region_2d.h
index 9ea87b1d..01126715 100644
--- a/engine/scene/2d/navigation_region_2d.h
+++ b/engine/scene/2d/navigation/navigation_region_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_REGION_2D_H
-#define NAVIGATION_REGION_2D_H
+#pragma once
 
 #include "scene/resources/2d/navigation_polygon.h"
 
@@ -112,7 +111,7 @@ public:
 	PackedStringArray get_configuration_warnings() const override;
 
 	void bake_navigation_polygon(bool p_on_thread);
-	void _bake_finished(Ref<NavigationPolygon> p_navigation_polygon);
+	void _bake_finished();
 	bool is_baking() const;
 
 	Rect2 get_bounds() const { return bounds; }
@@ -126,5 +125,3 @@ private:
 	void _region_exit_navigation_map();
 	void _region_update_transform();
 };
-
-#endif // NAVIGATION_REGION_2D_H
diff --git a/engine/scene/2d/node_2d.cpp b/engine/scene/2d/node_2d.cpp
index 304e2925..e970656c 100644
--- a/engine/scene/2d/node_2d.cpp
+++ b/engine/scene/2d/node_2d.cpp
@@ -429,6 +429,13 @@ Point2 Node2D::to_global(Point2 p_local) const {
 
 void Node2D::_notification(int p_notification) {
 	switch (p_notification) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			ERR_MAIN_THREAD_GUARD;
 
diff --git a/engine/scene/2d/node_2d.h b/engine/scene/2d/node_2d.h
index de46dbd7..d0e72ffb 100644
--- a/engine/scene/2d/node_2d.h
+++ b/engine/scene/2d/node_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NODE_2D_H
-#define NODE_2D_H
+#pragma once
 
 #include "scene/main/canvas_item.h"
 
@@ -119,5 +118,3 @@ public:
 
 	Node2D() {}
 };
-
-#endif // NODE_2D_H
diff --git a/engine/scene/2d/parallax_2d.h b/engine/scene/2d/parallax_2d.h
index f15e3fa9..0903d4ef 100644
--- a/engine/scene/2d/parallax_2d.h
+++ b/engine/scene/2d/parallax_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARALLAX_2D_H
-#define PARALLAX_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -96,5 +95,3 @@ public:
 
 	Parallax2D();
 };
-
-#endif // PARALLAX_2D_H
diff --git a/engine/scene/2d/parallax_background.h b/engine/scene/2d/parallax_background.h
index 89a87221..4202f044 100644
--- a/engine/scene/2d/parallax_background.h
+++ b/engine/scene/2d/parallax_background.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARALLAX_BACKGROUND_H
-#define PARALLAX_BACKGROUND_H
+#pragma once
 
 #include "scene/main/canvas_layer.h"
 
@@ -81,5 +80,3 @@ public:
 
 	ParallaxBackground();
 };
-
-#endif // PARALLAX_BACKGROUND_H
diff --git a/engine/scene/2d/parallax_layer.h b/engine/scene/2d/parallax_layer.h
index 22fa0dd5..22ea5ad6 100644
--- a/engine/scene/2d/parallax_layer.h
+++ b/engine/scene/2d/parallax_layer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARALLAX_LAYER_H
-#define PARALLAX_LAYER_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -62,5 +61,3 @@ public:
 	PackedStringArray get_configuration_warnings() const override;
 	ParallaxLayer();
 };
-
-#endif // PARALLAX_LAYER_H
diff --git a/engine/scene/2d/path_2d.cpp b/engine/scene/2d/path_2d.cpp
index 9f528715..31fbfd26 100644
--- a/engine/scene/2d/path_2d.cpp
+++ b/engine/scene/2d/path_2d.cpp
@@ -66,19 +66,18 @@ bool Path2D::_edit_is_selected_on_click(const Point2 &p_point, double p_toleranc
 	}
 
 	for (int i = 0; i < curve->get_point_count(); i++) {
-		Vector2 s[2];
-		s[0] = curve->get_point_position(i);
+		Vector2 segment_a = curve->get_point_position(i);
 
 		for (int j = 1; j <= 8; j++) {
 			real_t frac = j / 8.0;
-			s[1] = curve->sample(i, frac);
+			const Vector2 segment_b = curve->sample(i, frac);
 
-			Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, s);
+			Vector2 p = Geometry2D::get_closest_point_to_segment(p_point, segment_a, segment_b);
 			if (p.distance_to(p_point) <= p_tolerance) {
 				return true;
 			}
 
-			s[0] = s[1];
+			segment_a = segment_b;
 		}
 	}
 
diff --git a/engine/scene/2d/path_2d.h b/engine/scene/2d/path_2d.h
index 5162f514..510b27b7 100644
--- a/engine/scene/2d/path_2d.h
+++ b/engine/scene/2d/path_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PATH_2D_H
-#define PATH_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/curve.h"
@@ -110,5 +109,3 @@ public:
 
 	PathFollow2D() {}
 };
-
-#endif // PATH_2D_H
diff --git a/engine/scene/2d/physics/animatable_body_2d.h b/engine/scene/2d/physics/animatable_body_2d.h
index e510d5cc..14e3d29a 100644
--- a/engine/scene/2d/physics/animatable_body_2d.h
+++ b/engine/scene/2d/physics/animatable_body_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATABLE_BODY_2D_H
-#define ANIMATABLE_BODY_2D_H
+#pragma once
 
 #include "scene/2d/physics/static_body_2d.h"
 
@@ -57,5 +56,3 @@ private:
 	void set_sync_to_physics(bool p_enable);
 	bool is_sync_to_physics_enabled() const;
 };
-
-#endif // ANIMATABLE_BODY_2D_H
diff --git a/engine/scene/2d/physics/area_2d.h b/engine/scene/2d/physics/area_2d.h
index 7c59d76e..982346f3 100644
--- a/engine/scene/2d/physics/area_2d.h
+++ b/engine/scene/2d/physics/area_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AREA_2D_H
-#define AREA_2D_H
+#pragma once
 
 #include "core/templates/vset.h"
 #include "scene/2d/physics/collision_object_2d.h"
@@ -198,5 +197,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(Area2D::SpaceOverride);
-
-#endif // AREA_2D_H
diff --git a/engine/scene/2d/physics/character_body_2d.cpp b/engine/scene/2d/physics/character_body_2d.cpp
index 32582cc1..9028a384 100644
--- a/engine/scene/2d/physics/character_body_2d.cpp
+++ b/engine/scene/2d/physics/character_body_2d.cpp
@@ -409,7 +409,7 @@ void CharacterBody2D::_set_collision_direction(const PhysicsServer2D::MotionResu
 		on_wall = true;
 		wall_normal = p_result.collision_normal;
 		// Don't apply wall velocity when the collider is a CharacterBody2D.
-		if (Object::cast_to<CharacterBody2D>(ObjectDB::get_instance(p_result.collider_id)) == nullptr) {
+		if (ObjectDB::get_instance<CharacterBody2D>(p_result.collider_id) == nullptr) {
 			_set_platform_data(p_result);
 		}
 	}
@@ -509,7 +509,7 @@ Ref<KinematicCollision2D> CharacterBody2D::_get_slide_collision(int p_bounce) {
 }
 
 Ref<KinematicCollision2D> CharacterBody2D::_get_last_slide_collision() {
-	if (motion_results.size() == 0) {
+	if (motion_results.is_empty()) {
 		return Ref<KinematicCollision2D>();
 	}
 	return _get_slide_collision(motion_results.size() - 1);
diff --git a/engine/scene/2d/physics/character_body_2d.h b/engine/scene/2d/physics/character_body_2d.h
index 536d0a1e..5c7f44b7 100644
--- a/engine/scene/2d/physics/character_body_2d.h
+++ b/engine/scene/2d/physics/character_body_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CHARACTER_BODY_2D_H
-#define CHARACTER_BODY_2D_H
+#pragma once
 
 #include "scene/2d/physics/kinematic_collision_2d.h"
 #include "scene/2d/physics/physics_body_2d.h"
@@ -168,5 +167,3 @@ protected:
 
 VARIANT_ENUM_CAST(CharacterBody2D::MotionMode);
 VARIANT_ENUM_CAST(CharacterBody2D::PlatformOnLeave);
-
-#endif // CHARACTER_BODY_2D_H
diff --git a/engine/scene/2d/physics/collision_object_2d.cpp b/engine/scene/2d/physics/collision_object_2d.cpp
index 57ab4f9e..c95c84f0 100644
--- a/engine/scene/2d/physics/collision_object_2d.cpp
+++ b/engine/scene/2d/physics/collision_object_2d.cpp
@@ -295,7 +295,7 @@ uint32_t CollisionObject2D::create_shape_owner(Object *p_owner) {
 	ShapeData sd;
 	uint32_t id;
 
-	if (shapes.size() == 0) {
+	if (shapes.is_empty()) {
 		id = 0;
 	} else {
 		id = shapes.back()->key() + 1;
diff --git a/engine/scene/2d/physics/collision_object_2d.h b/engine/scene/2d/physics/collision_object_2d.h
index 2c853466..c63d0ac4 100644
--- a/engine/scene/2d/physics/collision_object_2d.h
+++ b/engine/scene/2d/physics/collision_object_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_OBJECT_2D_H
-#define COLLISION_OBJECT_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/main/viewport.h"
@@ -175,5 +174,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(CollisionObject2D::DisableMode);
-
-#endif // COLLISION_OBJECT_2D_H
diff --git a/engine/scene/2d/physics/collision_polygon_2d.cpp b/engine/scene/2d/physics/collision_polygon_2d.cpp
index f71d561f..e84bd123 100644
--- a/engine/scene/2d/physics/collision_polygon_2d.cpp
+++ b/engine/scene/2d/physics/collision_polygon_2d.cpp
@@ -157,8 +157,8 @@ void CollisionPolygon2D::_notification(int p_what) {
 
 				Vector<Vector2> pts = {
 					line_to + Vector2(0, tsize),
-					line_to + Vector2(Math_SQRT12 * tsize, 0),
-					line_to + Vector2(-Math_SQRT12 * tsize, 0)
+					line_to + Vector2(Math::SQRT12 * tsize, 0),
+					line_to + Vector2(-Math::SQRT12 * tsize, 0)
 				};
 
 				Vector<Color> cols{ dcol, dcol, dcol };
diff --git a/engine/scene/2d/physics/collision_polygon_2d.h b/engine/scene/2d/physics/collision_polygon_2d.h
index 93920124..ad628203 100644
--- a/engine/scene/2d/physics/collision_polygon_2d.h
+++ b/engine/scene/2d/physics/collision_polygon_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_POLYGON_2D_H
-#define COLLISION_POLYGON_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -92,5 +91,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(CollisionPolygon2D::BuildMode);
-
-#endif // COLLISION_POLYGON_2D_H
diff --git a/engine/scene/2d/physics/collision_shape_2d.cpp b/engine/scene/2d/physics/collision_shape_2d.cpp
index 44cde3ce..ae02e313 100644
--- a/engine/scene/2d/physics/collision_shape_2d.cpp
+++ b/engine/scene/2d/physics/collision_shape_2d.cpp
@@ -120,8 +120,8 @@ void CollisionShape2D::_notification(int p_what) {
 
 				Vector<Vector2> pts{
 					line_to + Vector2(0, tsize),
-					line_to + Vector2(Math_SQRT12 * tsize, 0),
-					line_to + Vector2(-Math_SQRT12 * tsize, 0)
+					line_to + Vector2(Math::SQRT12 * tsize, 0),
+					line_to + Vector2(-Math::SQRT12 * tsize, 0)
 				};
 
 				Vector<Color> cols{ draw_col, draw_col, draw_col };
diff --git a/engine/scene/2d/physics/collision_shape_2d.h b/engine/scene/2d/physics/collision_shape_2d.h
index ab72f4cf..5de56c80 100644
--- a/engine/scene/2d/physics/collision_shape_2d.h
+++ b/engine/scene/2d/physics/collision_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_SHAPE_2D_H
-#define COLLISION_SHAPE_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/2d/shape_2d.h"
@@ -91,5 +90,3 @@ public:
 
 	CollisionShape2D();
 };
-
-#endif // COLLISION_SHAPE_2D_H
diff --git a/engine/scene/2d/physics/joints/damped_spring_joint_2d.h b/engine/scene/2d/physics/joints/damped_spring_joint_2d.h
index de9fda80..0db9d044 100644
--- a/engine/scene/2d/physics/joints/damped_spring_joint_2d.h
+++ b/engine/scene/2d/physics/joints/damped_spring_joint_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DAMPED_SPRING_JOINT_2D_H
-#define DAMPED_SPRING_JOINT_2D_H
+#pragma once
 
 #include "scene/2d/physics/joints/joint_2d.h"
 
@@ -63,5 +62,3 @@ public:
 
 	DampedSpringJoint2D();
 };
-
-#endif // DAMPED_SPRING_JOINT_2D_H
diff --git a/engine/scene/2d/physics/joints/groove_joint_2d.h b/engine/scene/2d/physics/joints/groove_joint_2d.h
index b04692fb..b771e366 100644
--- a/engine/scene/2d/physics/joints/groove_joint_2d.h
+++ b/engine/scene/2d/physics/joints/groove_joint_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GROOVE_JOINT_2D_H
-#define GROOVE_JOINT_2D_H
+#pragma once
 
 #include "scene/2d/physics/joints/joint_2d.h"
 
@@ -55,5 +54,3 @@ public:
 
 	GrooveJoint2D();
 };
-
-#endif // GROOVE_JOINT_2D_H
diff --git a/engine/scene/2d/physics/joints/joint_2d.h b/engine/scene/2d/physics/joints/joint_2d.h
index bdd2730b..b9c4a5a6 100644
--- a/engine/scene/2d/physics/joints/joint_2d.h
+++ b/engine/scene/2d/physics/joints/joint_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOINT_2D_H
-#define JOINT_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -80,5 +79,3 @@ public:
 	Joint2D();
 	~Joint2D();
 };
-
-#endif // JOINT_2D_H
diff --git a/engine/scene/2d/physics/joints/pin_joint_2d.h b/engine/scene/2d/physics/joints/pin_joint_2d.h
index c2d78ba3..41a39c2a 100644
--- a/engine/scene/2d/physics/joints/pin_joint_2d.h
+++ b/engine/scene/2d/physics/joints/pin_joint_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PIN_JOINT_2D_H
-#define PIN_JOINT_2D_H
+#pragma once
 
 #include "scene/2d/physics/joints/joint_2d.h"
 
@@ -67,5 +66,3 @@ public:
 
 	PinJoint2D();
 };
-
-#endif // PIN_JOINT_2D_H
diff --git a/engine/scene/2d/physics/kinematic_collision_2d.cpp b/engine/scene/2d/physics/kinematic_collision_2d.cpp
index a8ba211d..28e8f392 100644
--- a/engine/scene/2d/physics/kinematic_collision_2d.cpp
+++ b/engine/scene/2d/physics/kinematic_collision_2d.cpp
@@ -58,7 +58,7 @@ real_t KinematicCollision2D::get_depth() const {
 }
 
 Object *KinematicCollision2D::get_local_shape() const {
-	PhysicsBody2D *owner = Object::cast_to<PhysicsBody2D>(ObjectDB::get_instance(owner_id));
+	PhysicsBody2D *owner = ObjectDB::get_instance<PhysicsBody2D>(owner_id);
 	if (!owner) {
 		return nullptr;
 	}
diff --git a/engine/scene/2d/physics/kinematic_collision_2d.h b/engine/scene/2d/physics/kinematic_collision_2d.h
index 8d3d6ca8..ba2088c1 100644
--- a/engine/scene/2d/physics/kinematic_collision_2d.h
+++ b/engine/scene/2d/physics/kinematic_collision_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KINEMATIC_COLLISION_2D_H
-#define KINEMATIC_COLLISION_2D_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "servers/physics_server_2d.h"
@@ -63,5 +62,3 @@ public:
 	int get_collider_shape_index() const;
 	Vector2 get_collider_velocity() const;
 };
-
-#endif // KINEMATIC_COLLISION_2D_H
diff --git a/engine/scene/2d/physics/physical_bone_2d.h b/engine/scene/2d/physics/physical_bone_2d.h
index 0547469b..e385fe54 100644
--- a/engine/scene/2d/physics/physical_bone_2d.h
+++ b/engine/scene/2d/physics/physical_bone_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICAL_BONE_2D_H
-#define PHYSICAL_BONE_2D_H
+#pragma once
 
 #include "scene/2d/physics/rigid_body_2d.h"
 #include "scene/2d/skeleton_2d.h"
@@ -84,5 +83,3 @@ public:
 	PhysicalBone2D();
 	~PhysicalBone2D();
 };
-
-#endif // PHYSICAL_BONE_2D_H
diff --git a/engine/scene/2d/physics/physics_body_2d.h b/engine/scene/2d/physics/physics_body_2d.h
index 637f76aa..de69c623 100644
--- a/engine/scene/2d/physics/physics_body_2d.h
+++ b/engine/scene/2d/physics/physics_body_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_BODY_2D_H
-#define PHYSICS_BODY_2D_H
+#pragma once
 
 #include "scene/2d/physics/collision_object_2d.h"
 #include "scene/2d/physics/kinematic_collision_2d.h"
@@ -56,5 +55,3 @@ public:
 	void add_collision_exception_with(Node *p_node); //must be physicsbody
 	void remove_collision_exception_with(Node *p_node);
 };
-
-#endif // PHYSICS_BODY_2D_H
diff --git a/engine/scene/2d/physics/ray_cast_2d.h b/engine/scene/2d/physics/ray_cast_2d.h
index 0a856635..822e4f99 100644
--- a/engine/scene/2d/physics/ray_cast_2d.h
+++ b/engine/scene/2d/physics/ray_cast_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RAY_CAST_2D_H
-#define RAY_CAST_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -105,5 +104,3 @@ public:
 
 	RayCast2D();
 };
-
-#endif // RAY_CAST_2D_H
diff --git a/engine/scene/2d/physics/rigid_body_2d.cpp b/engine/scene/2d/physics/rigid_body_2d.cpp
index 4b1cde6b..0992d0c2 100644
--- a/engine/scene/2d/physics/rigid_body_2d.cpp
+++ b/engine/scene/2d/physics/rigid_body_2d.cpp
@@ -498,6 +498,7 @@ bool RigidBody2D::is_sleeping() const {
 }
 
 void RigidBody2D::set_max_contacts_reported(int p_amount) {
+	ERR_FAIL_INDEX_MSG(p_amount, MAX_CONTACTS_REPORTED_2D_MAX, "Max contacts reported allocates memory (about 100 bytes each), and therefore must not be set too high.");
 	max_contacts_reported = p_amount;
 	PhysicsServer2D::get_singleton()->body_set_max_contacts_reported(get_rid(), p_amount);
 }
@@ -643,7 +644,7 @@ PackedStringArray RigidBody2D::get_configuration_warnings() const {
 
 	PackedStringArray warnings = PhysicsBody2D::get_configuration_warnings();
 
-	if (ABS(t.columns[0].length() - 1.0) > 0.05 || ABS(t.columns[1].length() - 1.0) > 0.05) {
+	if (Math::abs(t.columns[0].length() - 1.0) > 0.05 || Math::abs(t.columns[1].length() - 1.0) > 0.05) {
 		warnings.push_back(RTR("Size changes to RigidBody2D will be overridden by the physics engine when running.\nChange the size in children collision shapes instead."));
 	}
 
diff --git a/engine/scene/2d/physics/rigid_body_2d.h b/engine/scene/2d/physics/rigid_body_2d.h
index bee5ecb3..edfdf216 100644
--- a/engine/scene/2d/physics/rigid_body_2d.h
+++ b/engine/scene/2d/physics/rigid_body_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RIGID_BODY_2D_H
-#define RIGID_BODY_2D_H
+#pragma once
 
 #include "core/templates/vset.h"
 #include "scene/2d/physics/physics_body_2d.h"
@@ -246,5 +245,3 @@ VARIANT_ENUM_CAST(RigidBody2D::FreezeMode);
 VARIANT_ENUM_CAST(RigidBody2D::CenterOfMassMode);
 VARIANT_ENUM_CAST(RigidBody2D::DampMode);
 VARIANT_ENUM_CAST(RigidBody2D::CCDMode);
-
-#endif // RIGID_BODY_2D_H
diff --git a/engine/scene/2d/physics/shape_cast_2d.h b/engine/scene/2d/physics/shape_cast_2d.h
index a08f1370..0ea57d21 100644
--- a/engine/scene/2d/physics/shape_cast_2d.h
+++ b/engine/scene/2d/physics/shape_cast_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHAPE_CAST_2D_H
-#define SHAPE_CAST_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/2d/shape_2d.h"
@@ -122,5 +121,3 @@ public:
 
 	ShapeCast2D();
 };
-
-#endif // SHAPE_CAST_2D_H
diff --git a/engine/scene/2d/physics/static_body_2d.cpp b/engine/scene/2d/physics/static_body_2d.cpp
index 9ae3fa25..45771857 100644
--- a/engine/scene/2d/physics/static_body_2d.cpp
+++ b/engine/scene/2d/physics/static_body_2d.cpp
@@ -30,6 +30,7 @@
 
 #include "static_body_2d.h"
 
+#ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/capsule_shape_2d.h"
 #include "scene/resources/2d/circle_shape_2d.h"
 #include "scene/resources/2d/concave_polygon_shape_2d.h"
@@ -38,6 +39,7 @@
 #include "scene/resources/2d/navigation_polygon.h"
 #include "scene/resources/2d/rectangle_shape_2d.h"
 #include "servers/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
 
 Callable StaticBody2D::_navmesh_source_geometry_parsing_callback;
 RID StaticBody2D::_navmesh_source_geometry_parser;
@@ -89,6 +91,7 @@ void StaticBody2D::_reload_physics_characteristics() {
 	}
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void StaticBody2D::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer2D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -156,7 +159,7 @@ void StaticBody2D::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p
 				const real_t capsule_radius = capsule_shape->get_radius();
 
 				Vector<Vector2> shape_outline;
-				const real_t turn_step = Math_TAU / 12.0;
+				const real_t turn_step = Math::TAU / 12.0;
 				shape_outline.resize(14);
 				int shape_outline_inx = 0;
 				for (int i = 0; i < 12; i++) {
@@ -181,7 +184,7 @@ void StaticBody2D::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p
 				int circle_edge_count = 12;
 				shape_outline.resize(circle_edge_count);
 
-				const real_t turn_step = Math_TAU / real_t(circle_edge_count);
+				const real_t turn_step = Math::TAU / real_t(circle_edge_count);
 				for (int i = 0; i < circle_edge_count; i++) {
 					shape_outline.write[i] = static_body_xform.xform(Vector2(Math::cos(i * turn_step), Math::sin(i * turn_step)) * circle_radius);
 				}
@@ -213,6 +216,7 @@ void StaticBody2D::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p
 		}
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 void StaticBody2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_constant_linear_velocity", "vel"), &StaticBody2D::set_constant_linear_velocity);
diff --git a/engine/scene/2d/physics/static_body_2d.h b/engine/scene/2d/physics/static_body_2d.h
index e3a9bf03..a0891b91 100644
--- a/engine/scene/2d/physics/static_body_2d.h
+++ b/engine/scene/2d/physics/static_body_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STATIC_BODY_2D_H
-#define STATIC_BODY_2D_H
+#pragma once
 
 #include "scene/2d/physics/physics_body_2d.h"
 
@@ -64,12 +63,12 @@ private:
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
 
+#ifndef NAVIGATION_2D_DISABLED
 public:
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_2D_DISABLED
 
 private:
 	void _reload_physics_characteristics();
 };
-
-#endif // STATIC_BODY_2D_H
diff --git a/engine/scene/2d/touch_screen_button.cpp b/engine/scene/2d/physics/touch_screen_button.cpp
similarity index 94%
rename from engine/scene/2d/touch_screen_button.cpp
rename to engine/scene/2d/physics/touch_screen_button.cpp
index 88fe2bc7..93ff87d7 100644
--- a/engine/scene/2d/touch_screen_button.cpp
+++ b/engine/scene/2d/physics/touch_screen_button.cpp
@@ -112,8 +112,27 @@ bool TouchScreenButton::is_shape_centered() const {
 	return shape_centered;
 }
 
+void TouchScreenButton::_accessibility_action_click(const Variant &p_data) {
+	_press(0);
+	_release();
+}
+
 void TouchScreenButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			Rect2 dst_rect(Point2(), texture_normal.is_valid() ? texture_normal->get_size() : Size2());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &TouchScreenButton::_accessibility_action_click));
+
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, dst_rect);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (!is_inside_tree()) {
 				return;
diff --git a/engine/scene/2d/touch_screen_button.h b/engine/scene/2d/physics/touch_screen_button.h
similarity index 97%
rename from engine/scene/2d/touch_screen_button.h
rename to engine/scene/2d/physics/touch_screen_button.h
index da75fabf..d9474ec8 100644
--- a/engine/scene/2d/touch_screen_button.h
+++ b/engine/scene/2d/physics/touch_screen_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TOUCH_SCREEN_BUTTON_H
-#define TOUCH_SCREEN_BUTTON_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/2d/rectangle_shape_2d.h"
@@ -75,6 +74,8 @@ protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
 #endif // DISABLE_DEPRECATED
 
+	void _accessibility_action_click(const Variant &p_data);
+
 public:
 #ifdef DEBUG_ENABLED
 	virtual Rect2 _edit_get_rect() const override;
@@ -116,5 +117,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(TouchScreenButton::VisibilityMode);
-
-#endif // TOUCH_SCREEN_BUTTON_H
diff --git a/engine/scene/2d/polygon_2d.cpp b/engine/scene/2d/polygon_2d.cpp
index c5aaff3e..57e0c818 100644
--- a/engine/scene/2d/polygon_2d.cpp
+++ b/engine/scene/2d/polygon_2d.cpp
@@ -31,13 +31,17 @@
 #include "polygon_2d.h"
 
 #include "core/math/geometry_2d.h"
+#ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/2d/navigation_polygon.h"
 #include "servers/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
 #include "skeleton_2d.h"
 
+#ifndef NAVIGATION_2D_DISABLED
 Callable Polygon2D::_navmesh_source_geometry_parsing_callback;
 RID Polygon2D::_navmesh_source_geometry_parser;
+#endif // NAVIGATION_2D_DISABLED
 
 #ifdef TOOLS_ENABLED
 Dictionary Polygon2D::_edit_get_state() const {
@@ -153,7 +157,7 @@ void Polygon2D::_notification(int p_what) {
 			Vector<float> weights;
 
 			int len = polygon.size();
-			if ((invert || polygons.size() == 0) && internal_vertices > 0) {
+			if ((invert || polygons.is_empty()) && internal_vertices > 0) {
 				//if no polygons are around, internal vertices must not be drawn, else let them be
 				len -= internal_vertices;
 			}
@@ -323,7 +327,7 @@ void Polygon2D::_notification(int p_what) {
 
 			Vector<int> index_array;
 
-			if (invert || polygons.size() == 0) {
+			if (invert || polygons.is_empty()) {
 				index_array = Geometry2D::triangulate_polygon(points);
 			} else {
 				//draw individual polygons
@@ -610,6 +614,7 @@ NodePath Polygon2D::get_skeleton() const {
 	return skeleton;
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void Polygon2D::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer2D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -639,6 +644,7 @@ void Polygon2D::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_na
 		p_source_geometry_data->add_obstruction_outline(shape_outline);
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 void Polygon2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_polygon", "polygon"), &Polygon2D::set_polygon);
diff --git a/engine/scene/2d/polygon_2d.h b/engine/scene/2d/polygon_2d.h
index cb77f898..82817629 100644
--- a/engine/scene/2d/polygon_2d.h
+++ b/engine/scene/2d/polygon_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POLYGON_2D_H
-#define POLYGON_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -153,16 +152,18 @@ public:
 	void set_skeleton(const NodePath &p_skeleton);
 	NodePath get_skeleton() const;
 
+#ifndef NAVIGATION_2D_DISABLED
 private:
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
+#endif // NAVIGATION_2D_DISABLED
 
 public:
+#ifndef NAVIGATION_2D_DISABLED
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_2D_DISABLED
 
 	Polygon2D();
 	~Polygon2D();
 };
-
-#endif // POLYGON_2D_H
diff --git a/engine/scene/2d/remote_transform_2d.cpp b/engine/scene/2d/remote_transform_2d.cpp
index 1816a340..a24dd553 100644
--- a/engine/scene/2d/remote_transform_2d.cpp
+++ b/engine/scene/2d/remote_transform_2d.cpp
@@ -51,7 +51,7 @@ void RemoteTransform2D::_update_remote() {
 		return;
 	}
 
-	Node2D *n = Object::cast_to<Node2D>(ObjectDB::get_instance(cache));
+	Node2D *n = ObjectDB::get_instance<Node2D>(cache);
 	if (!n) {
 		return;
 	}
@@ -117,7 +117,7 @@ void RemoteTransform2D::_notification(int p_what) {
 		case NOTIFICATION_RESET_PHYSICS_INTERPOLATION: {
 			if (cache.is_valid()) {
 				_update_remote();
-				Node2D *n = Object::cast_to<Node2D>(ObjectDB::get_instance(cache));
+				Node2D *n = ObjectDB::get_instance<Node2D>(cache);
 				if (n) {
 					n->reset_physics_interpolation();
 				}
diff --git a/engine/scene/2d/remote_transform_2d.h b/engine/scene/2d/remote_transform_2d.h
index 997fd8fc..7aaf3b5c 100644
--- a/engine/scene/2d/remote_transform_2d.h
+++ b/engine/scene/2d/remote_transform_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REMOTE_TRANSFORM_2D_H
-#define REMOTE_TRANSFORM_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -74,5 +73,3 @@ public:
 
 	RemoteTransform2D();
 };
-
-#endif // REMOTE_TRANSFORM_2D_H
diff --git a/engine/scene/2d/skeleton_2d.cpp b/engine/scene/2d/skeleton_2d.cpp
index 508307e0..9459613d 100644
--- a/engine/scene/2d/skeleton_2d.cpp
+++ b/engine/scene/2d/skeleton_2d.cpp
@@ -329,7 +329,7 @@ bool Bone2D::_editor_get_bone_shape(Vector<Vector2> *p_shape, Vector<Vector2> *p
 		rel = Vector2(Math::cos(bone_angle), Math::sin(bone_angle)) * length * get_global_scale();
 	}
 
-	Vector2 relt = rel.rotated(Math_PI * 0.5).normalized() * bone_width;
+	Vector2 relt = rel.rotated(Math::PI * 0.5).normalized() * bone_width;
 	Vector2 reln = rel.normalized();
 	Vector2 reltn = relt.normalized();
 
diff --git a/engine/scene/2d/skeleton_2d.h b/engine/scene/2d/skeleton_2d.h
index 16bd6fd3..36392961 100644
--- a/engine/scene/2d/skeleton_2d.h
+++ b/engine/scene/2d/skeleton_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_2D_H
-#define SKELETON_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -174,5 +173,3 @@ public:
 	Skeleton2D();
 	~Skeleton2D();
 };
-
-#endif // SKELETON_2D_H
diff --git a/engine/scene/2d/sprite_2d.cpp b/engine/scene/2d/sprite_2d.cpp
index 01b3c6ce..4114720b 100644
--- a/engine/scene/2d/sprite_2d.cpp
+++ b/engine/scene/2d/sprite_2d.cpp
@@ -115,6 +115,17 @@ void Sprite2D::_get_rects(Rect2 &r_src_rect, Rect2 &r_dst_rect, bool &r_filter_c
 
 void Sprite2D::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			Rect2 dst_rect = get_rect();
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_IMAGE);
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, dst_rect);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (texture.is_null()) {
 				return;
diff --git a/engine/scene/2d/sprite_2d.h b/engine/scene/2d/sprite_2d.h
index 5198e5ef..d5bfd24a 100644
--- a/engine/scene/2d/sprite_2d.h
+++ b/engine/scene/2d/sprite_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRITE_2D_H
-#define SPRITE_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/texture.h"
@@ -127,5 +126,3 @@ public:
 	Sprite2D();
 	~Sprite2D();
 };
-
-#endif // SPRITE_2D_H
diff --git a/engine/scene/2d/tile_map.compat.inc b/engine/scene/2d/tile_map.compat.inc
index 04937bdf..e0f99e70 100644
--- a/engine/scene/2d/tile_map.compat.inc
+++ b/engine/scene/2d/tile_map.compat.inc
@@ -46,16 +46,20 @@ TileMap::VisibilityMode TileMap::_get_collision_visibility_mode_bind_compat_8711
 	return get_collision_visibility_mode();
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 TileMap::VisibilityMode TileMap::_get_navigation_visibility_mode_bind_compat_87115() {
 	return get_navigation_visibility_mode();
 }
+#endif // NAVIGATION_2D_DISABLED
 
 void TileMap::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("get_used_rect"), &TileMap::_get_used_rect_bind_compat_78328);
 	ClassDB::bind_compatibility_method(D_METHOD("set_quadrant_size", "quadrant_size"), &TileMap::_set_quadrant_size_compat_81070);
 	ClassDB::bind_compatibility_method(D_METHOD("get_quadrant_size"), &TileMap::_get_quadrant_size_compat_81070);
 	ClassDB::bind_compatibility_method(D_METHOD("get_collision_visibility_mode"), &TileMap::_get_collision_visibility_mode_bind_compat_87115);
+#ifndef NAVIGATION_2D_DISABLED
 	ClassDB::bind_compatibility_method(D_METHOD("get_navigation_visibility_mode"), &TileMap::_get_navigation_visibility_mode_bind_compat_87115);
+#endif // NAVIGATION_2D_DISABLED
 }
 
 #endif
diff --git a/engine/scene/2d/tile_map.cpp b/engine/scene/2d/tile_map.cpp
index 5324f11a..e6057ec2 100644
--- a/engine/scene/2d/tile_map.cpp
+++ b/engine/scene/2d/tile_map.cpp
@@ -32,8 +32,10 @@
 #include "tile_map.compat.inc"
 
 #include "core/io/marshalls.h"
+#ifndef NAVIGATION_2D_DISABLED
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "servers/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
 
 #define TILEMAP_CALL_FOR_LAYER(layer, function, ...) \
 	if (layer < 0) {                                 \
@@ -49,8 +51,10 @@
 	ERR_FAIL_INDEX_V(layer, (int)layers.size(), err_value);       \
 	return layers[layer]->function(__VA_ARGS__);
 
+#ifndef NAVIGATION_2D_DISABLED
 Callable TileMap::_navmesh_source_geometry_parsing_callback;
 RID TileMap::_navmesh_source_geometry_parser;
+#endif // NAVIGATION_2D_DISABLED
 
 void TileMap::_tile_set_changed() {
 	update_configuration_warnings();
@@ -376,6 +380,7 @@ int TileMap::get_layer_z_index(int p_layer) const {
 	TILEMAP_CALL_FOR_LAYER_V(p_layer, 0, get_z_index);
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void TileMap::set_layer_navigation_enabled(int p_layer, bool p_enabled) {
 	TILEMAP_CALL_FOR_LAYER(p_layer, set_navigation_enabled, p_enabled);
 }
@@ -391,6 +396,7 @@ void TileMap::set_layer_navigation_map(int p_layer, RID p_map) {
 RID TileMap::get_layer_navigation_map(int p_layer) const {
 	TILEMAP_CALL_FOR_LAYER_V(p_layer, RID(), get_navigation_map);
 }
+#endif // NAVIGATION_2D_DISABLED
 
 void TileMap::set_collision_animatable(bool p_collision_animatable) {
 	if (collision_animatable == p_collision_animatable) {
@@ -423,6 +429,7 @@ TileMap::VisibilityMode TileMap::get_collision_visibility_mode() const {
 	return collision_visibility_mode;
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void TileMap::set_navigation_visibility_mode(TileMap::VisibilityMode p_show_navigation) {
 	if (navigation_visibility_mode == p_show_navigation) {
 		return;
@@ -437,6 +444,7 @@ void TileMap::set_navigation_visibility_mode(TileMap::VisibilityMode p_show_navi
 TileMap::VisibilityMode TileMap::get_navigation_visibility_mode() const {
 	return navigation_visibility_mode;
 }
+#endif // NAVIGATION_2D_DISABLED
 
 void TileMap::set_y_sort_enabled(bool p_enable) {
 	if (is_y_sort_enabled() == p_enable) {
@@ -597,6 +605,7 @@ TileMapCell TileMap::get_cell(int p_layer, const Vector2i &p_coords, bool p_use_
 	TILEMAP_CALL_FOR_LAYER_V(p_layer, TileMapCell(), get_cell, p_coords);
 }
 
+#ifndef PHYSICS_2D_DISABLED
 Vector2i TileMap::get_coords_for_body_rid(RID p_physics_body) {
 	for (const TileMapLayer *layer : layers) {
 		if (layer->has_body_rid(p_physics_body)) {
@@ -614,6 +623,7 @@ int TileMap::get_layer_for_body_rid(RID p_physics_body) {
 	}
 	ERR_FAIL_V_MSG(-1, vformat("No tiles for the given body RID %d.", p_physics_body.get_id()));
 }
+#endif // PHYSICS_2D_DISABLED
 
 void TileMap::fix_invalid_tiles() {
 	for (TileMapLayer *layer : layers) {
@@ -896,8 +906,10 @@ PackedStringArray TileMap::get_configuration_warnings() const {
 
 void TileMap::_bind_methods() {
 #ifndef DISABLE_DEPRECATED
+#ifndef NAVIGATION_2D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_navigation_map", "layer", "map"), &TileMap::set_layer_navigation_map);
 	ClassDB::bind_method(D_METHOD("get_navigation_map", "layer"), &TileMap::get_layer_navigation_map);
+#endif // NAVIGATION_2D_DISABLED
 	ClassDB::bind_method(D_METHOD("force_update", "layer"), &TileMap::force_update, DEFVAL(-1));
 #endif // DISABLE_DEPRECATED
 
@@ -923,18 +935,22 @@ void TileMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_layer_y_sort_origin", "layer"), &TileMap::get_layer_y_sort_origin);
 	ClassDB::bind_method(D_METHOD("set_layer_z_index", "layer", "z_index"), &TileMap::set_layer_z_index);
 	ClassDB::bind_method(D_METHOD("get_layer_z_index", "layer"), &TileMap::get_layer_z_index);
+#ifndef NAVIGATION_2D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_layer_navigation_enabled", "layer", "enabled"), &TileMap::set_layer_navigation_enabled);
 	ClassDB::bind_method(D_METHOD("is_layer_navigation_enabled", "layer"), &TileMap::is_layer_navigation_enabled);
 	ClassDB::bind_method(D_METHOD("set_layer_navigation_map", "layer", "map"), &TileMap::set_layer_navigation_map);
 	ClassDB::bind_method(D_METHOD("get_layer_navigation_map", "layer"), &TileMap::get_layer_navigation_map);
+#endif // NAVIGATION_2D_DISABLED
 
 	ClassDB::bind_method(D_METHOD("set_collision_animatable", "enabled"), &TileMap::set_collision_animatable);
 	ClassDB::bind_method(D_METHOD("is_collision_animatable"), &TileMap::is_collision_animatable);
 	ClassDB::bind_method(D_METHOD("set_collision_visibility_mode", "collision_visibility_mode"), &TileMap::set_collision_visibility_mode);
 	ClassDB::bind_method(D_METHOD("get_collision_visibility_mode"), &TileMap::get_collision_visibility_mode);
 
+#ifndef NAVIGATION_2D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_navigation_visibility_mode", "navigation_visibility_mode"), &TileMap::set_navigation_visibility_mode);
 	ClassDB::bind_method(D_METHOD("get_navigation_visibility_mode"), &TileMap::get_navigation_visibility_mode);
+#endif // NAVIGATION_2D_DISABLED
 
 	ClassDB::bind_method(D_METHOD("set_cell", "layer", "coords", "source_id", "atlas_coords", "alternative_tile"), &TileMap::set_cell, DEFVAL(TileSet::INVALID_SOURCE), DEFVAL(TileSetSource::INVALID_ATLAS_COORDS), DEFVAL(0));
 	ClassDB::bind_method(D_METHOD("erase_cell", "layer", "coords"), &TileMap::erase_cell);
@@ -947,8 +963,10 @@ void TileMap::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_cell_flipped_v", "layer", "coords", "use_proxies"), &TileMap::is_cell_flipped_v, DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("is_cell_transposed", "layer", "coords", "use_proxies"), &TileMap::is_cell_transposed, DEFVAL(false));
 
+#ifndef PHYSICS_2D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_coords_for_body_rid", "body"), &TileMap::get_coords_for_body_rid);
 	ClassDB::bind_method(D_METHOD("get_layer_for_body_rid", "body"), &TileMap::get_layer_for_body_rid);
+#endif // PHYSICS_2D_DISABLED
 
 	ClassDB::bind_method(D_METHOD("get_pattern", "layer", "coords_array"), &TileMap::get_pattern);
 	ClassDB::bind_method(D_METHOD("map_pattern", "position_in_tilemap", "coords_in_pattern", "pattern"), &TileMap::map_pattern);
@@ -982,7 +1000,9 @@ void TileMap::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "rendering_quadrant_size", PROPERTY_HINT_RANGE, "1,128,1"), "set_rendering_quadrant_size", "get_rendering_quadrant_size");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision_animatable"), "set_collision_animatable", "is_collision_animatable");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_visibility_mode", PROPERTY_HINT_ENUM, "Default,Force Show,Force Hide"), "set_collision_visibility_mode", "get_collision_visibility_mode");
+#ifndef NAVIGATION_2D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "navigation_visibility_mode", PROPERTY_HINT_ENUM, "Default,Force Show,Force Hide"), "set_navigation_visibility_mode", "get_navigation_visibility_mode");
+#endif // NAVIGATION_2D_DISABLED
 
 	ADD_ARRAY("layers", "layer_");
 
@@ -1017,7 +1037,9 @@ TileMap::TileMap() {
 		base_property_helper.register_property(PropertyInfo(Variant::BOOL, "y_sort_enabled"), defaults->is_y_sort_enabled(), &TileMap::set_layer_y_sort_enabled, &TileMap::is_layer_y_sort_enabled);
 		base_property_helper.register_property(PropertyInfo(Variant::INT, "y_sort_origin", PROPERTY_HINT_NONE, "suffix:px"), defaults->get_y_sort_origin(), &TileMap::set_layer_y_sort_origin, &TileMap::get_layer_y_sort_origin);
 		base_property_helper.register_property(PropertyInfo(Variant::INT, "z_index"), defaults->get_z_index(), &TileMap::set_layer_z_index, &TileMap::get_layer_z_index);
+#ifndef NAVIGATION_2D_DISABLED
 		base_property_helper.register_property(PropertyInfo(Variant::BOOL, "navigation_enabled"), defaults->is_navigation_enabled(), &TileMap::set_layer_navigation_enabled, &TileMap::is_layer_navigation_enabled);
+#endif // NAVIGATION_2D_DISABLED
 		base_property_helper.register_property(PropertyInfo(Variant::PACKED_INT32_ARRAY, "tile_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NO_EDITOR), Vector<int>(), &TileMap::_set_layer_tile_data, &TileMap::_get_tile_map_data_using_compatibility_format);
 		PropertyListHelper::register_base_helper(&base_property_helper);
 
@@ -1027,6 +1049,7 @@ TileMap::TileMap() {
 	property_helper.setup_for_instance(base_property_helper, this);
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void TileMap::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer2D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -1054,6 +1077,7 @@ void TileMap::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navi
 		}
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 #undef TILEMAP_CALL_FOR_LAYER
 #undef TILEMAP_CALL_FOR_LAYER_V
diff --git a/engine/scene/2d/tile_map.h b/engine/scene/2d/tile_map.h
index cc27e17a..d2331e25 100644
--- a/engine/scene/2d/tile_map.h
+++ b/engine/scene/2d/tile_map.h
@@ -28,15 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_MAP_H
-#define TILE_MAP_H
+#pragma once
 
 #include "scene/2d/tile_map_layer.h"
 #include "scene/property_list_helper.h"
 #include "scene/resources/2d/tile_set.h"
 
 class Control;
+#ifndef NAVIGATION_2D_DISABLED
 class NavigationMeshSourceGeometryData2D;
+#endif // NAVIGATION_2D_DISABLED
 class TileMapLayer;
 class TerrainConstraint;
 
@@ -59,8 +60,6 @@ public:
 	};
 
 private:
-	friend class TileSetPlugin;
-
 	// A compatibility enum to specify how is the data if formatted.
 	mutable TileMapDataFormat format = TileMapDataFormat::TILE_MAP_DATA_FORMAT_3;
 
@@ -69,7 +68,9 @@ private:
 	int rendering_quadrant_size = 16;
 	bool collision_animatable = false;
 	VisibilityMode collision_visibility_mode = VISIBILITY_MODE_DEFAULT;
+#ifndef NAVIGATION_2D_DISABLED
 	VisibilityMode navigation_visibility_mode = VISIBILITY_MODE_DEFAULT;
+#endif // NAVIGATION_2D_DISABLED
 
 	// Layers.
 	LocalVector<TileMapLayer *> layers;
@@ -105,7 +106,9 @@ protected:
 	void _set_quadrant_size_compat_81070(int p_quadrant_size);
 	int _get_quadrant_size_compat_81070() const;
 	VisibilityMode _get_collision_visibility_mode_bind_compat_87115();
+#ifndef NAVIGATION_2D_DISABLED
 	VisibilityMode _get_navigation_visibility_mode_bind_compat_87115();
+#endif // NAVIGATION_2D_DISABLED
 
 	static void _bind_compatibility_methods();
 #endif // DISABLE_DEPRECATED
@@ -144,10 +147,12 @@ public:
 	int get_layer_y_sort_origin(int p_layer) const;
 	void set_layer_z_index(int p_layer, int p_z_index);
 	int get_layer_z_index(int p_layer) const;
+#ifndef NAVIGATION_2D_DISABLED
 	void set_layer_navigation_enabled(int p_layer, bool p_enabled);
 	bool is_layer_navigation_enabled(int p_layer) const;
 	void set_layer_navigation_map(int p_layer, RID p_map);
 	RID get_layer_navigation_map(int p_layer) const;
+#endif // NAVIGATION_2D_DISABLED
 
 	void set_collision_animatable(bool p_collision_animatable);
 	bool is_collision_animatable() const;
@@ -156,8 +161,10 @@ public:
 	void set_collision_visibility_mode(VisibilityMode p_show_collision);
 	VisibilityMode get_collision_visibility_mode() const;
 
+#ifndef NAVIGATION_2D_DISABLED
 	void set_navigation_visibility_mode(VisibilityMode p_show_navigation);
 	VisibilityMode get_navigation_visibility_mode() const;
+#endif // NAVIGATION_2D_DISABLED
 
 	// Cells accessors.
 	void set_cell(int p_layer, const Vector2i &p_coords, int p_source_id = TileSet::INVALID_SOURCE, const Vector2i p_atlas_coords = TileSetSource::INVALID_ATLAS_COORDS, int p_alternative_tile = 0);
@@ -208,10 +215,12 @@ public:
 	virtual void set_texture_filter(CanvasItem::TextureFilter p_texture_filter) override;
 	virtual void set_texture_repeat(CanvasItem::TextureRepeat p_texture_repeat) override;
 
+#ifndef PHYSICS_2D_DISABLED
 	// For finding tiles from collision.
 	Vector2i get_coords_for_body_rid(RID p_physics_body);
 	// For getting their layers as well.
 	int get_layer_for_body_rid(RID p_physics_body);
+#endif // PHYSICS_2D_DISABLED
 
 	// Fixing and clearing methods.
 	void fix_invalid_tiles();
@@ -239,17 +248,19 @@ public:
 	// Configuration warnings.
 	PackedStringArray get_configuration_warnings() const override;
 
+#ifndef NAVIGATION_2D_DISABLED
 private:
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
+#endif // NAVIGATION_2D_DISABLED
 
+#ifndef NAVIGATION_2D_DISABLED
 public:
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_2D_DISABLED
 
 	TileMap();
 };
 
 VARIANT_ENUM_CAST(TileMap::VisibilityMode);
-
-#endif // TILE_MAP_H
diff --git a/engine/scene/2d/tile_map_layer.cpp b/engine/scene/2d/tile_map_layer.cpp
index 2bb190b1..c5e19916 100644
--- a/engine/scene/2d/tile_map_layer.cpp
+++ b/engine/scene/2d/tile_map_layer.cpp
@@ -31,25 +31,34 @@
 #include "tile_map_layer.h"
 
 #include "core/io/marshalls.h"
+#include "core/math/geometry_2d.h"
+#include "core/math/random_pcg.h"
+#include "core/templates/a_hash_map.h"
 #include "scene/2d/tile_map.h"
 #include "scene/gui/control.h"
 #include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
 #include "scene/resources/world_2d.h"
-#include "servers/navigation_server_2d.h"
 
+#ifndef PHYSICS_2D_DISABLED
+#include "servers/physics_server_2d.h"
+#endif // PHYSICS_3D_DISABLED
+
+#ifndef NAVIGATION_2D_DISABLED
+#include "servers/navigation_server_2d.h"
 Callable TileMapLayer::_navmesh_source_geometry_parsing_callback;
 RID TileMapLayer::_navmesh_source_geometry_parser;
+#endif // NAVIGATION_2D_DISABLED
+
+Vector2i TileMapLayer::_coords_to_quadrant_coords(const Vector2i &p_coords, const int p_quadrant_size) const {
+	return Vector2i(
+			p_coords.x > 0 ? p_coords.x / p_quadrant_size : (p_coords.x - (p_quadrant_size - 1)) / p_quadrant_size,
+			p_coords.y > 0 ? p_coords.y / p_quadrant_size : (p_coords.y - (p_quadrant_size - 1)) / p_quadrant_size);
+}
 
 #ifdef DEBUG_ENABLED
 /////////////////////////////// Debug //////////////////////////////////////////
 constexpr int TILE_MAP_DEBUG_QUADRANT_SIZE = 16;
 
-Vector2i TileMapLayer::_coords_to_debug_quadrant_coords(const Vector2i &p_coords) const {
-	return Vector2i(
-			p_coords.x > 0 ? p_coords.x / TILE_MAP_DEBUG_QUADRANT_SIZE : (p_coords.x - (TILE_MAP_DEBUG_QUADRANT_SIZE - 1)) / TILE_MAP_DEBUG_QUADRANT_SIZE,
-			p_coords.y > 0 ? p_coords.y / TILE_MAP_DEBUG_QUADRANT_SIZE : (p_coords.y - (TILE_MAP_DEBUG_QUADRANT_SIZE - 1)) / TILE_MAP_DEBUG_QUADRANT_SIZE);
-}
-
 void TileMapLayer::_debug_update(bool p_force_cleanup) {
 	RenderingServer *rs = RenderingServer::get_singleton();
 
@@ -78,106 +87,92 @@ void TileMapLayer::_debug_update(bool p_force_cleanup) {
 		}
 	}
 
-	// List all debug quadrants to update, creating new ones if needed.
-	SelfList<DebugQuadrant>::List dirty_debug_quadrant_list;
-
+	// List all debug quadrants to update.
+	HashSet<Vector2i> quadrants_to_updates;
 	if (_debug_was_cleaned_up || anything_changed) {
 		// Update all cells.
 		for (KeyValue<Vector2i, CellData> &kv : tile_map_layer_data) {
 			CellData &cell_data = kv.value;
-			_debug_quadrants_update_cell(cell_data, dirty_debug_quadrant_list);
+			quadrants_to_updates.insert(_coords_to_quadrant_coords(cell_data.coords, TILE_MAP_DEBUG_QUADRANT_SIZE));
+#ifndef PHYSICS_2D_DISABLED
+			// Physics quadrants are drawn from their origin.
+			Vector2i physics_quadrant_origin = _coords_to_quadrant_coords(cell_data.coords, physics_quadrant_size) * physics_quadrant_size;
+			quadrants_to_updates.insert(_coords_to_quadrant_coords(physics_quadrant_origin, TILE_MAP_DEBUG_QUADRANT_SIZE));
+#endif // PHYSICS_2D_DISABLED
 		}
 	} else {
 		// Update dirty cells.
 		for (SelfList<CellData> *cell_data_list_element = dirty.cell_list.first(); cell_data_list_element; cell_data_list_element = cell_data_list_element->next()) {
 			CellData &cell_data = *cell_data_list_element->self();
-			_debug_quadrants_update_cell(cell_data, dirty_debug_quadrant_list);
+			quadrants_to_updates.insert(_coords_to_quadrant_coords(cell_data.coords, TILE_MAP_DEBUG_QUADRANT_SIZE));
+#ifndef PHYSICS_2D_DISABLED
+			// Physics quadrants are drawn from their origin.
+			Vector2i physics_quadrant_origin = _coords_to_quadrant_coords(cell_data.coords, physics_quadrant_size) * physics_quadrant_size;
+			quadrants_to_updates.insert(_coords_to_quadrant_coords(physics_quadrant_origin, TILE_MAP_DEBUG_QUADRANT_SIZE));
+#endif // PHYSICS_2D_DISABLED
 		}
 	}
 
 	// Update those quadrants.
 	bool needs_set_not_interpolated = is_inside_tree() && get_tree()->is_physics_interpolation_enabled() && !is_physics_interpolated();
-	for (SelfList<DebugQuadrant> *quadrant_list_element = dirty_debug_quadrant_list.first(); quadrant_list_element;) {
-		SelfList<DebugQuadrant> *next_quadrant_list_element = quadrant_list_element->next(); // "Hack" to clear the list while iterating.
+	for (const Vector2i &quadrant_coords : quadrants_to_updates) {
+		if (!debug_quadrant_map.has(quadrant_coords)) {
+			// Create a new quadrant and add it to the quadrant map.
+			Ref<DebugQuadrant> new_quadrant;
+			new_quadrant.instantiate();
+			new_quadrant->quadrant_coords = quadrant_coords;
+			debug_quadrant_map[quadrant_coords] = new_quadrant;
+		}
 
-		DebugQuadrant &debug_quadrant = *quadrant_list_element->self();
+		Ref<DebugQuadrant> debug_quadrant = debug_quadrant_map[quadrant_coords];
 
-		// Check if the quadrant has a tile.
-		bool has_a_tile = false;
-		RID &ci = debug_quadrant.canvas_item;
-		for (SelfList<CellData> *cell_data_list_element = debug_quadrant.cells.first(); cell_data_list_element; cell_data_list_element = cell_data_list_element->next()) {
+		// Update the quadrant's canvas item.
+		RID &ci = debug_quadrant->canvas_item;
+		if (ci.is_valid()) {
+			rs->canvas_item_clear(ci);
+		} else {
+			ci = rs->canvas_item_create();
+			if (needs_set_not_interpolated) {
+				rs->canvas_item_set_interpolated(ci, false);
+			}
+			rs->canvas_item_set_z_index(ci, RS::CANVAS_ITEM_Z_MAX - 1);
+			rs->canvas_item_set_parent(ci, get_canvas_item());
+		}
+		const Vector2 quadrant_pos = tile_set->map_to_local(debug_quadrant->quadrant_coords * TILE_MAP_DEBUG_QUADRANT_SIZE);
+		Transform2D xform(0, quadrant_pos);
+		rs->canvas_item_set_transform(ci, xform);
+
+#ifndef PHYSICS_2D_DISABLED
+		// Draw physics.
+		_physics_draw_quadrant_debug(ci, *debug_quadrant.ptr());
+#endif // PHYSICS_2D_DISABLED
+
+		// Draw debug info.
+		for (SelfList<CellData> *cell_data_list_element = debug_quadrant->cells.first(); cell_data_list_element; cell_data_list_element = cell_data_list_element->next()) {
 			CellData &cell_data = *cell_data_list_element->self();
 			if (cell_data.cell.source_id != TileSet::INVALID_SOURCE) {
-				has_a_tile = true;
-				break;
+				_rendering_draw_cell_debug(ci, quadrant_pos, cell_data);
+#ifndef NAVIGATION_2D_DISABLED
+				_navigation_draw_cell_debug(ci, quadrant_pos, cell_data);
+#endif // NAVIGATION_2D_DISABLED
+				_scenes_draw_cell_debug(ci, quadrant_pos, cell_data);
+				debug_quadrant->drawn_to = true;
 			}
 		}
 
-		if (has_a_tile) {
-			// Update the quadrant.
-			if (ci.is_valid()) {
-				rs->canvas_item_clear(ci);
-			} else {
-				ci = rs->canvas_item_create();
-				if (needs_set_not_interpolated) {
-					rs->canvas_item_set_interpolated(ci, false);
-				}
-				rs->canvas_item_set_z_index(ci, RS::CANVAS_ITEM_Z_MAX - 1);
-				rs->canvas_item_set_parent(ci, get_canvas_item());
-			}
-
-			const Vector2 quadrant_pos = tile_set->map_to_local(debug_quadrant.quadrant_coords * TILE_MAP_DEBUG_QUADRANT_SIZE);
-			Transform2D xform(0, quadrant_pos);
-			rs->canvas_item_set_transform(ci, xform);
-
-			for (SelfList<CellData> *cell_data_list_element = debug_quadrant.cells.first(); cell_data_list_element; cell_data_list_element = cell_data_list_element->next()) {
-				CellData &cell_data = *cell_data_list_element->self();
-				if (cell_data.cell.source_id != TileSet::INVALID_SOURCE) {
-					_rendering_draw_cell_debug(ci, quadrant_pos, cell_data);
-					_physics_draw_cell_debug(ci, quadrant_pos, cell_data);
-					_navigation_draw_cell_debug(ci, quadrant_pos, cell_data);
-					_scenes_draw_cell_debug(ci, quadrant_pos, cell_data);
-				}
-			}
-		} else {
+		// Free the quadrants that were not drawn to.
+		if (!debug_quadrant->drawn_to) {
 			// Free the quadrant.
 			if (ci.is_valid()) {
 				rs->free(ci);
 			}
-			quadrant_list_element->remove_from_list();
-			debug_quadrant_map.erase(debug_quadrant.quadrant_coords);
+			debug_quadrant_map.erase(quadrant_coords);
 		}
-
-		quadrant_list_element = next_quadrant_list_element;
 	}
 
-	dirty_debug_quadrant_list.clear();
-
 	_debug_was_cleaned_up = false;
 }
 
-void TileMapLayer::_debug_quadrants_update_cell(CellData &r_cell_data, SelfList<DebugQuadrant>::List &r_dirty_debug_quadrant_list) {
-	Vector2i quadrant_coords = _coords_to_debug_quadrant_coords(r_cell_data.coords);
-
-	if (!debug_quadrant_map.has(quadrant_coords)) {
-		// Create a new quadrant and add it to the quadrant map.
-		Ref<DebugQuadrant> new_quadrant;
-		new_quadrant.instantiate();
-		new_quadrant->quadrant_coords = quadrant_coords;
-		debug_quadrant_map[quadrant_coords] = new_quadrant;
-	}
-
-	// Add the cell to its quadrant, if it is not already in there.
-	Ref<DebugQuadrant> &debug_quadrant = debug_quadrant_map[quadrant_coords];
-	if (!r_cell_data.debug_quadrant_list_element.in_list()) {
-		debug_quadrant->cells.add(&r_cell_data.debug_quadrant_list_element);
-	}
-
-	// Mark the quadrant as dirty.
-	if (!debug_quadrant->dirty_quadrant_list_element.in_list()) {
-		r_dirty_debug_quadrant_list.add(&debug_quadrant->dirty_quadrant_list_element);
-	}
-}
 #endif // DEBUG_ENABLED
 
 /////////////////////////////// Rendering //////////////////////////////////////
@@ -321,6 +316,7 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
 						rs->canvas_item_set_light_mask(ci, get_light_mask());
 						rs->canvas_item_set_z_as_relative_to_parent(ci, true);
 						rs->canvas_item_set_z_index(ci, tile_z_index);
+						rs->canvas_item_set_self_modulate(ci, get_self_modulate());
 
 						rs->canvas_item_set_default_texture_filter(ci, RS::CanvasItemTextureFilter(get_texture_filter_in_tree()));
 						rs->canvas_item_set_default_texture_repeat(ci, RS::CanvasItemTextureRepeat(get_texture_repeat_in_tree()));
@@ -341,14 +337,12 @@ void TileMapLayer::_rendering_update(bool p_force_cleanup) {
 					// Random animation offset.
 					real_t random_animation_offset = 0.0;
 					if (atlas_source->get_tile_animation_mode(cell_data.cell.get_atlas_coords()) != TileSetAtlasSource::TILE_ANIMATION_MODE_DEFAULT) {
-						Array to_hash;
-						to_hash.push_back(local_tile_pos);
-						to_hash.push_back(get_instance_id()); // Use instance id as a random hash
+						Array to_hash = { local_tile_pos, get_instance_id() }; // Use instance id as a random hash
 						random_animation_offset = RandomPCG(to_hash.hash()).randf();
 					}
 
 					// Drawing the tile in the canvas item.
-					draw_tile(ci, local_tile_pos - rendering_quadrant->canvas_items_position, tile_set, cell_data.cell.source_id, cell_data.cell.get_atlas_coords(), cell_data.cell.alternative_tile, -1, get_self_modulate(), tile_data, random_animation_offset);
+					draw_tile(ci, local_tile_pos - rendering_quadrant->canvas_items_position, tile_set, cell_data.cell.source_id, cell_data.cell.get_atlas_coords(), cell_data.cell.alternative_tile, -1, tile_data, random_animation_offset);
 				}
 
 				// Reset physics interpolation for any recreated canvas items.
@@ -499,9 +493,7 @@ void TileMapLayer::_rendering_quadrants_update_cell(CellData &r_cell_data, SelfL
 			const Vector2i &coords = r_cell_data.coords;
 
 			// Rounding down, instead of simply rounding towards zero (truncating).
-			quadrant_coords = Vector2i(
-					coords.x > 0 ? coords.x / rendering_quadrant_size : (coords.x - (rendering_quadrant_size - 1)) / rendering_quadrant_size,
-					coords.y > 0 ? coords.y / rendering_quadrant_size : (coords.y - (rendering_quadrant_size - 1)) / rendering_quadrant_size);
+			quadrant_coords = _coords_to_quadrant_coords(coords, rendering_quadrant_size);
 			canvas_items_position = tile_set->map_to_local(rendering_quadrant_size * quadrant_coords);
 		}
 
@@ -674,10 +666,7 @@ void TileMapLayer::_rendering_draw_cell_debug(const RID &p_canvas_item, const Ve
 				Vector2i grid_size = atlas_source->get_atlas_grid_size();
 				if (atlas_source->get_runtime_texture().is_null() || c.get_atlas_coords().x >= grid_size.x || c.get_atlas_coords().y >= grid_size.y) {
 					// Generate a random color from the hashed values of the tiles.
-					Array to_hash;
-					to_hash.push_back(c.source_id);
-					to_hash.push_back(c.get_atlas_coords());
-					to_hash.push_back(c.alternative_tile);
+					Array to_hash = { c.source_id, c.get_atlas_coords(), c.alternative_tile };
 					uint32_t hash = RandomPCG(to_hash.hash()).rand();
 
 					Color color;
@@ -701,32 +690,297 @@ void TileMapLayer::_rendering_draw_cell_debug(const RID &p_canvas_item, const Ve
 
 /////////////////////////////// Physics //////////////////////////////////////
 
+#ifndef PHYSICS_2D_DISABLED
 void TileMapLayer::_physics_update(bool p_force_cleanup) {
+	PhysicsServer2D *ps = PhysicsServer2D::get_singleton();
+
 	// Check if we should cleanup everything.
 	bool forced_cleanup = p_force_cleanup || !enabled || !collision_enabled || !is_inside_tree() || tile_set.is_null();
-	if (forced_cleanup) {
-		// Clean everything.
-		for (KeyValue<Vector2i, CellData> &kv : tile_map_layer_data) {
-			_physics_clear_cell(kv.value);
+
+	// ----------- Quadrants processing -----------
+
+	// List all physics quadrants to update, creating new ones if needed.
+	SelfList<PhysicsQuadrant>::List dirty_physics_quadrant_list;
+
+	// Check if anything changed that might change the quadrant shape.
+	// If so, recreate everything.
+	bool quadrant_shape_changed = dirty.flags[DIRTY_FLAGS_TILE_SET] || dirty.flags[DIRTY_FLAGS_LAYER_PHYSICS_QUADRANT_SIZE];
+
+	// Free all quadrants.
+	if (forced_cleanup || quadrant_shape_changed) {
+		for (const KeyValue<Vector2i, Ref<PhysicsQuadrant>> &kv : physics_quadrant_map) {
+			// Clear bodies.
+			for (KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : kv.value->bodies) {
+				if (kvbody.value.body.is_valid()) {
+					bodies_coords.erase(kvbody.value.body);
+					ps->free(kvbody.value.body);
+				}
+			}
+			kv.value->bodies.clear();
+			kv.value->cells.clear();
 		}
-	} else {
-		if (_physics_was_cleaned_up || dirty.flags[DIRTY_FLAGS_TILE_SET] || dirty.flags[DIRTY_FLAGS_LAYER_USE_KINEMATIC_BODIES] || dirty.flags[DIRTY_FLAGS_LAYER_IN_TREE]) {
+		physics_quadrant_map.clear();
+		_physics_was_cleaned_up = true;
+	}
+
+	if (!forced_cleanup) {
+		RID space = get_world_2d()->get_space();
+		Transform2D gl_transform = get_global_transform();
+
+		// List all quadrants to update, recreating them if needed.
+		if (dirty.flags[DIRTY_FLAGS_LAYER_IN_TREE] || _physics_was_cleaned_up) {
 			// Update all cells.
 			for (KeyValue<Vector2i, CellData> &kv : tile_map_layer_data) {
-				_physics_update_cell(kv.value);
+				CellData &cell_data = kv.value;
+				_physics_quadrants_update_cell(cell_data, dirty_physics_quadrant_list);
 			}
 		} else {
 			// Update dirty cells.
 			for (SelfList<CellData> *cell_data_list_element = dirty.cell_list.first(); cell_data_list_element; cell_data_list_element = cell_data_list_element->next()) {
 				CellData &cell_data = *cell_data_list_element->self();
-				_physics_update_cell(cell_data);
+				_physics_quadrants_update_cell(cell_data, dirty_physics_quadrant_list);
+			}
+		}
+
+		// Update all dirty quadrants.
+		for (SelfList<PhysicsQuadrant> *quadrant_list_element = dirty_physics_quadrant_list.first(); quadrant_list_element;) {
+			SelfList<PhysicsQuadrant> *next_quadrant_list_element = quadrant_list_element->next(); // "Hack" to clear the list while iterating.
+
+			const Ref<PhysicsQuadrant> &physics_quadrant = quadrant_list_element->self();
+
+			// Check if the quadrant has a tile.
+			bool has_a_tile = false;
+			for (SelfList<CellData> *cell_data_list_element = physics_quadrant->cells.first(); cell_data_list_element; cell_data_list_element = cell_data_list_element->next()) {
+				CellData &cell_data = *cell_data_list_element->self();
+				if (cell_data.cell.source_id != TileSet::INVALID_SOURCE) {
+					has_a_tile = true;
+					break;
+				}
+			}
+
+			if (has_a_tile) {
+				// Process the quadrant.
+
+				// First, clear the quadrant bodies.
+				for (KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : physics_quadrant->bodies) {
+					RID &body = kvbody.value.body;
+					if (body.is_valid()) {
+						bodies_coords.erase(body);
+						ps->free(body);
+						body = RID();
+					}
+				}
+				physics_quadrant->bodies.clear();
+				physics_quadrant->shapes.clear();
+
+				// Quadrant origin
+				Vector2 quadrant_origin = tile_set->map_to_local(physics_quadrant->quadrant_coords);
+
+				// Recreate the quadrant bodies.
+				for (uint32_t tile_set_physics_layer = 0; tile_set_physics_layer < (uint32_t)tile_set->get_physics_layers_count(); tile_set_physics_layer++) {
+					Ref<PhysicsMaterial> physics_material = tile_set->get_physics_layer_physics_material(tile_set_physics_layer);
+					uint32_t physics_layer = tile_set->get_physics_layer_collision_layer(tile_set_physics_layer);
+					uint32_t physics_mask = tile_set->get_physics_layer_collision_mask(tile_set_physics_layer);
+
+					// Merge polygons together for each quadrant.
+					for (SelfList<CellData> *cell_data_quadrant_list_element = physics_quadrant->cells.first(); cell_data_quadrant_list_element; cell_data_quadrant_list_element = cell_data_quadrant_list_element->next()) {
+						CellData &cell_data = *cell_data_quadrant_list_element->self();
+
+						TileSetAtlasSource *atlas_source = Object::cast_to<TileSetAtlasSource>(*tile_set->get_source(cell_data.cell.source_id));
+
+						// Get the tile data.
+						const TileData *tile_data;
+						if (cell_data.runtime_tile_data_cache) {
+							tile_data = cell_data.runtime_tile_data_cache;
+						} else {
+							tile_data = atlas_source->get_tile_data(cell_data.cell.get_atlas_coords(), cell_data.cell.alternative_tile);
+						}
+
+						// Transform flags.
+						bool flip_h = (cell_data.cell.alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_H);
+						bool flip_v = (cell_data.cell.alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_V);
+						bool transpose = (cell_data.cell.alternative_tile & TileSetAtlasSource::TRANSFORM_TRANSPOSE);
+
+						Vector2 linear_velocity = tile_data->get_constant_linear_velocity(tile_set_physics_layer);
+						real_t angular_velocity = tile_data->get_constant_angular_velocity(tile_set_physics_layer);
+
+						// Setup polygons for merge.
+						for (int polygon_index = 0; polygon_index < tile_data->get_collision_polygons_count(tile_set_physics_layer); polygon_index++) {
+							// Iterate over the polygons.
+							int shapes_count = tile_data->get_collision_polygon_shapes_count(tile_set_physics_layer, polygon_index);
+
+							// Check if we need to create a new body.
+							PhysicsQuadrant::PhysicsBodyKey physics_body_key;
+							physics_body_key.physics_layer = tile_set_physics_layer;
+							physics_body_key.linear_velocity = linear_velocity;
+							physics_body_key.angular_velocity = angular_velocity;
+							physics_body_key.one_way_collision = tile_data->is_collision_polygon_one_way(tile_set_physics_layer, polygon_index);
+							physics_body_key.one_way_collision_margin = tile_data->get_collision_polygon_one_way_margin(tile_set_physics_layer, polygon_index);
+
+							if (!physics_quadrant->bodies.has(physics_body_key)) {
+								RID body = ps->body_create();
+								physics_quadrant->bodies[physics_body_key] = {};
+								physics_quadrant->bodies[physics_body_key].body = body;
+								bodies_coords[body] = physics_quadrant->quadrant_coords;
+
+								// Create or update the body.
+								ps->body_set_mode(body, use_kinematic_bodies ? PhysicsServer2D::BODY_MODE_KINEMATIC : PhysicsServer2D::BODY_MODE_STATIC);
+								ps->body_set_space(body, space);
+
+								Transform2D xform;
+								xform.set_origin(quadrant_origin);
+								xform = gl_transform * xform;
+								ps->body_set_state(body, PhysicsServer2D::BODY_STATE_TRANSFORM, xform);
+
+								ps->body_attach_object_instance_id(body, tile_map_node ? tile_map_node->get_instance_id() : get_instance_id());
+								ps->body_set_collision_layer(body, physics_layer);
+								ps->body_set_collision_mask(body, physics_mask);
+								ps->body_set_pickable(body, false);
+								ps->body_set_state(body, PhysicsServer2D::BODY_STATE_LINEAR_VELOCITY, linear_velocity);
+								ps->body_set_state(body, PhysicsServer2D::BODY_STATE_ANGULAR_VELOCITY, angular_velocity);
+
+								if (!physics_material.is_valid()) {
+									ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_BOUNCE, 0);
+									ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_FRICTION, 1);
+								} else {
+									ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_BOUNCE, physics_material->computed_bounce());
+									ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_FRICTION, physics_material->computed_friction());
+								}
+							}
+
+							for (int shape_index = 0; shape_index < shapes_count; shape_index++) {
+								Ref<ConvexPolygonShape2D> shape = tile_data->get_collision_polygon_shape(tile_set_physics_layer, polygon_index, shape_index, flip_h, flip_v, transpose);
+
+								// Translate the polygon.
+								Vector<Vector2> convex_polygon = shape->get_points();
+								for (int i = 0; i < convex_polygon.size(); i++) {
+									convex_polygon.set(i, convex_polygon[i] + tile_set->map_to_local(cell_data.coords) - quadrant_origin);
+								}
+
+								physics_quadrant->bodies[physics_body_key].polygons.push_back(convex_polygon);
+							}
+						}
+					}
+				}
+
+				// Iterate over the bodies
+				for (const KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : physics_quadrant->bodies) {
+					// Actually merge the polygons.
+					Vector<Vector<Vector2>> out_polygons;
+					Vector<Vector<Vector2>> out_holes;
+					Geometry2D::merge_many_polygons(kvbody.value.polygons, out_polygons, out_holes);
+					// Create shapes for each polygon.
+					int body_shape_index = 0;
+					Vector<Vector<Vector2>> convex_polygons = Geometry2D::decompose_many_polygons_in_convex(out_polygons, out_holes);
+					for (Vector<Vector2> &convex_polygon : convex_polygons) {
+						Ref<ConvexPolygonShape2D> shape;
+						shape.instantiate();
+						shape->set_points(convex_polygon);
+						ps->body_add_shape(kvbody.value.body, shape->get_rid());
+						ps->body_set_shape_as_one_way_collision(kvbody.value.body, body_shape_index, kvbody.key.one_way_collision, kvbody.key.one_way_collision_margin);
+						physics_quadrant->shapes.push_back(shape);
+						body_shape_index++;
+					}
+				}
+			} else {
+				// Free the quadrant.
+				for (KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kv : physics_quadrant->bodies) {
+					RID &body = kv.value.body;
+					if (body.is_valid()) {
+						bodies_coords.erase(body);
+						ps->free(body);
+					}
+				}
+				physics_quadrant->bodies.clear();
+				physics_quadrant->cells.clear();
+				physics_quadrant_map.erase(physics_quadrant->quadrant_coords);
+			}
+
+			quadrant_list_element = next_quadrant_list_element;
+		}
+
+		dirty_physics_quadrant_list.clear();
+
+		// Updates on physics changes.
+		if (dirty.flags[DIRTY_FLAGS_LAYER_USE_KINEMATIC_BODIES]) {
+			for (KeyValue<Vector2i, Ref<PhysicsQuadrant>> &kv : physics_quadrant_map) {
+				Ref<PhysicsQuadrant> &physics_quadrant = kv.value;
+				for (const KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : physics_quadrant->bodies) {
+					ps->body_set_mode(kvbody.value.body, use_kinematic_bodies ? PhysicsServer2D::BODY_MODE_KINEMATIC : PhysicsServer2D::BODY_MODE_STATIC);
+				}
 			}
 		}
 	}
 
 	// -----------
 	// Mark the physics state as up to date.
-	_physics_was_cleaned_up = forced_cleanup;
+	_physics_was_cleaned_up = forced_cleanup || !occlusion_enabled;
+}
+
+void TileMapLayer::_physics_quadrants_update_cell(CellData &r_cell_data, SelfList<PhysicsQuadrant>::List &r_dirty_physics_quadrant_list) {
+	// Check if the cell is valid and retrieve its y_sort_origin.
+	bool is_valid = false;
+	TileSetSource *source;
+	if (tile_set->has_source(r_cell_data.cell.source_id)) {
+		source = *tile_set->get_source(r_cell_data.cell.source_id);
+		TileSetAtlasSource *atlas_source = Object::cast_to<TileSetAtlasSource>(source);
+		if (atlas_source && atlas_source->has_tile(r_cell_data.cell.get_atlas_coords()) && atlas_source->has_alternative_tile(r_cell_data.cell.get_atlas_coords(), r_cell_data.cell.alternative_tile)) {
+			is_valid = true;
+		}
+	}
+
+	if (is_valid) {
+		// Get the quadrant coords.
+		const Vector2i &coords = r_cell_data.coords;
+		Vector2i quadrant_coords = _coords_to_quadrant_coords(coords, physics_quadrant_size);
+
+		Ref<PhysicsQuadrant> physics_quadrant;
+		if (physics_quadrant_map.has(quadrant_coords)) {
+			// Reuse existing physics quadrant.
+			physics_quadrant = physics_quadrant_map[quadrant_coords];
+		} else {
+			// Create a new physics quadrant.
+			physics_quadrant.instantiate();
+			physics_quadrant->quadrant_coords = quadrant_coords;
+			physics_quadrant_map[quadrant_coords] = physics_quadrant;
+		}
+
+		// Mark the old quadrant as dirty (if it exists).
+		if (r_cell_data.physics_quadrant.is_valid()) {
+			if (!r_cell_data.physics_quadrant->dirty_quadrant_list_element.in_list()) {
+				r_dirty_physics_quadrant_list.add(&r_cell_data.physics_quadrant->dirty_quadrant_list_element);
+			}
+		}
+
+		// Remove the cell from that quadrant.
+		if (r_cell_data.physics_quadrant_list_element.in_list()) {
+			r_cell_data.physics_quadrant_list_element.remove_from_list();
+		}
+
+		// Add the cell to its new quadrant.
+		r_cell_data.physics_quadrant = physics_quadrant;
+		r_cell_data.physics_quadrant->cells.add(&r_cell_data.physics_quadrant_list_element);
+
+		// Add the new quadrant to the dirty quadrant list.
+		if (!physics_quadrant->dirty_quadrant_list_element.in_list()) {
+			r_dirty_physics_quadrant_list.add(&physics_quadrant->dirty_quadrant_list_element);
+		}
+	} else {
+		Ref<PhysicsQuadrant> physics_quadrant = r_cell_data.physics_quadrant;
+
+		// Remove the cell from its quadrant.
+		r_cell_data.physics_quadrant = Ref<PhysicsQuadrant>();
+		if (r_cell_data.physics_quadrant_list_element.in_list()) {
+			physics_quadrant->cells.remove(&r_cell_data.physics_quadrant_list_element);
+		}
+
+		if (physics_quadrant.is_valid()) {
+			// Add the quadrant to the dirty quadrant list.
+			if (!physics_quadrant->dirty_quadrant_list_element.in_list()) {
+				r_dirty_physics_quadrant_list.add(&physics_quadrant->dirty_quadrant_list_element);
+			}
+		}
+	}
 }
 
 void TileMapLayer::_physics_notification(int p_what) {
@@ -737,15 +991,12 @@ void TileMapLayer::_physics_notification(int p_what) {
 		case NOTIFICATION_TRANSFORM_CHANGED:
 			// Move the collisison shapes along with the TileMap.
 			if (is_inside_tree() && tile_set.is_valid()) {
-				for (KeyValue<Vector2i, CellData> &kv : tile_map_layer_data) {
-					const CellData &cell_data = kv.value;
-
-					for (RID body : cell_data.bodies) {
-						if (body.is_valid()) {
-							Transform2D xform(0, tile_set->map_to_local(kv.key));
-							xform = gl_transform * xform;
-							ps->body_set_state(body, PhysicsServer2D::BODY_STATE_TRANSFORM, xform);
-						}
+				for (KeyValue<Vector2i, Ref<PhysicsQuadrant>> &kv : physics_quadrant_map) {
+					for (const KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : kv.value->bodies) {
+						const RID &body = kvbody.value.body;
+						Transform2D xform(0, tile_set->map_to_local(kv.key));
+						xform = gl_transform * xform;
+						ps->body_set_state(body, PhysicsServer2D::BODY_STATE_TRANSFORM, xform);
 					}
 				}
 			}
@@ -755,150 +1006,18 @@ void TileMapLayer::_physics_notification(int p_what) {
 			if (is_inside_tree()) {
 				RID space = get_world_2d()->get_space();
 
-				for (KeyValue<Vector2i, CellData> &kv : tile_map_layer_data) {
-					const CellData &cell_data = kv.value;
-
-					for (RID body : cell_data.bodies) {
-						if (body.is_valid()) {
-							ps->body_set_space(body, space);
-						}
-					}
-				}
-			}
-	}
-}
-
-void TileMapLayer::_physics_clear_cell(CellData &r_cell_data) {
-	PhysicsServer2D *ps = PhysicsServer2D::get_singleton();
-
-	// Clear bodies.
-	for (RID body : r_cell_data.bodies) {
-		if (body.is_valid()) {
-			bodies_coords.erase(body);
-			ps->free(body);
-		}
-	}
-	r_cell_data.bodies.clear();
-}
-
-void TileMapLayer::_physics_update_cell(CellData &r_cell_data) {
-	Transform2D gl_transform = get_global_transform();
-	RID space = get_world_2d()->get_space();
-	PhysicsServer2D *ps = PhysicsServer2D::get_singleton();
-
-	// Recreate bodies and shapes.
-	TileMapCell &c = r_cell_data.cell;
-
-	TileSetSource *source;
-	if (tile_set->has_source(c.source_id)) {
-		source = *tile_set->get_source(c.source_id);
-
-		if (source->has_tile(c.get_atlas_coords()) && source->has_alternative_tile(c.get_atlas_coords(), c.alternative_tile)) {
-			TileSetAtlasSource *atlas_source = Object::cast_to<TileSetAtlasSource>(source);
-			if (atlas_source) {
-				const TileData *tile_data;
-				if (r_cell_data.runtime_tile_data_cache) {
-					tile_data = r_cell_data.runtime_tile_data_cache;
-				} else {
-					tile_data = atlas_source->get_tile_data(c.get_atlas_coords(), c.alternative_tile);
-				}
-
-				// Transform flags.
-				bool flip_h = (c.alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_H);
-				bool flip_v = (c.alternative_tile & TileSetAtlasSource::TRANSFORM_FLIP_V);
-				bool transpose = (c.alternative_tile & TileSetAtlasSource::TRANSFORM_TRANSPOSE);
-
-				// Free unused bodies then resize the bodies array.
-				for (uint32_t i = tile_set->get_physics_layers_count(); i < r_cell_data.bodies.size(); i++) {
-					RID &body = r_cell_data.bodies[i];
-					if (body.is_valid()) {
-						bodies_coords.erase(body);
-						ps->free(body);
-						body = RID();
-					}
-				}
-				r_cell_data.bodies.resize(tile_set->get_physics_layers_count());
-
-				for (uint32_t tile_set_physics_layer = 0; tile_set_physics_layer < (uint32_t)tile_set->get_physics_layers_count(); tile_set_physics_layer++) {
-					Ref<PhysicsMaterial> physics_material = tile_set->get_physics_layer_physics_material(tile_set_physics_layer);
-					uint32_t physics_layer = tile_set->get_physics_layer_collision_layer(tile_set_physics_layer);
-					uint32_t physics_mask = tile_set->get_physics_layer_collision_mask(tile_set_physics_layer);
-					real_t physics_priority = tile_set->get_physics_layer_collision_priority(tile_set_physics_layer);
-
-					RID body = r_cell_data.bodies[tile_set_physics_layer];
-					if (tile_data->get_collision_polygons_count(tile_set_physics_layer) == 0) {
-						// No body needed, free it if it exists.
-						if (body.is_valid()) {
-							bodies_coords.erase(body);
-							ps->free(body);
-						}
-						body = RID();
-					} else {
-						// Create or update the body.
-						if (!body.is_valid()) {
-							body = ps->body_create();
-						}
-						bodies_coords[body] = r_cell_data.coords;
-						ps->body_set_mode(body, use_kinematic_bodies ? PhysicsServer2D::BODY_MODE_KINEMATIC : PhysicsServer2D::BODY_MODE_STATIC);
+				for (KeyValue<Vector2i, Ref<PhysicsQuadrant>> &kv : physics_quadrant_map) {
+					for (const KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : kv.value->bodies) {
+						const RID &body = kvbody.value.body;
 						ps->body_set_space(body, space);
-
-						Transform2D xform;
-						xform.set_origin(tile_set->map_to_local(r_cell_data.coords));
-						xform = gl_transform * xform;
-						ps->body_set_state(body, PhysicsServer2D::BODY_STATE_TRANSFORM, xform);
-
-						ps->body_attach_object_instance_id(body, tile_map_node ? tile_map_node->get_instance_id() : get_instance_id());
-						ps->body_set_collision_layer(body, physics_layer);
-						ps->body_set_collision_mask(body, physics_mask);
-						ps->body_set_collision_priority(body, physics_priority);
-						ps->body_set_pickable(body, false);
-						ps->body_set_state(body, PhysicsServer2D::BODY_STATE_LINEAR_VELOCITY, tile_data->get_constant_linear_velocity(tile_set_physics_layer));
-						ps->body_set_state(body, PhysicsServer2D::BODY_STATE_ANGULAR_VELOCITY, tile_data->get_constant_angular_velocity(tile_set_physics_layer));
-
-						if (physics_material.is_null()) {
-							ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_BOUNCE, 0);
-							ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_FRICTION, 1);
-						} else {
-							ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_BOUNCE, physics_material->computed_bounce());
-							ps->body_set_param(body, PhysicsServer2D::BODY_PARAM_FRICTION, physics_material->computed_friction());
-						}
-
-						// Clear body's shape if needed.
-						ps->body_clear_shapes(body);
-
-						// Add the shapes to the body.
-						int body_shape_index = 0;
-						for (int polygon_index = 0; polygon_index < tile_data->get_collision_polygons_count(tile_set_physics_layer); polygon_index++) {
-							// Iterate over the polygons.
-							bool one_way_collision = tile_data->is_collision_polygon_one_way(tile_set_physics_layer, polygon_index);
-							float one_way_collision_margin = tile_data->get_collision_polygon_one_way_margin(tile_set_physics_layer, polygon_index);
-							int shapes_count = tile_data->get_collision_polygon_shapes_count(tile_set_physics_layer, polygon_index);
-							for (int shape_index = 0; shape_index < shapes_count; shape_index++) {
-								// Add decomposed convex shapes.
-								Ref<ConvexPolygonShape2D> shape = tile_data->get_collision_polygon_shape(tile_set_physics_layer, polygon_index, shape_index, flip_h, flip_v, transpose);
-								ps->body_add_shape(body, shape->get_rid());
-								ps->body_set_shape_as_one_way_collision(body, body_shape_index, one_way_collision, one_way_collision_margin);
-
-								body_shape_index++;
-							}
-						}
 					}
-
-					// Set the body again.
-					r_cell_data.bodies[tile_set_physics_layer] = body;
 				}
-
-				return;
 			}
-		}
 	}
-
-	// If we did not return earlier, clear the cell.
-	_physics_clear_cell(r_cell_data);
 }
 
 #ifdef DEBUG_ENABLED
-void TileMapLayer::_physics_draw_cell_debug(const RID &p_canvas_item, const Vector2 &p_quadrant_pos, const CellData &r_cell_data) {
+void TileMapLayer::_physics_draw_quadrant_debug(const RID &p_canvas_item, DebugQuadrant &r_debug_quadrant) {
 	// Draw the debug collision shapes.
 	ERR_FAIL_COND(tile_set.is_null());
 
@@ -925,32 +1044,188 @@ void TileMapLayer::_physics_draw_cell_debug(const RID &p_canvas_item, const Vect
 	RenderingServer *rs = RenderingServer::get_singleton();
 	PhysicsServer2D *ps = PhysicsServer2D::get_singleton();
 
-	Color debug_collision_color = get_tree()->get_debug_collisions_color();
-	Vector<Color> color;
-	color.push_back(debug_collision_color);
+	const Color &debug_collision_color = get_tree()->get_debug_collisions_color();
 
-	Transform2D quadrant_to_local(0, p_quadrant_pos);
-	Transform2D global_to_quadrant = (get_global_transform() * quadrant_to_local).affine_inverse();
+	RandomPCG rand;
+	rand.seed(hash_murmur3_one_real(r_debug_quadrant.quadrant_coords.y, hash_murmur3_one_real(r_debug_quadrant.quadrant_coords.x)));
 
-	for (RID body : r_cell_data.bodies) {
-		if (body.is_valid()) {
-			Transform2D body_to_quadrant = global_to_quadrant * Transform2D(ps->body_get_state(body, PhysicsServer2D::BODY_STATE_TRANSFORM));
-			rs->canvas_item_add_set_transform(p_canvas_item, body_to_quadrant);
-			for (int shape_index = 0; shape_index < ps->body_get_shape_count(body); shape_index++) {
-				const RID &shape = ps->body_get_shape(body, shape_index);
-				const PhysicsServer2D::ShapeType &type = ps->shape_get_type(shape);
-				if (type == PhysicsServer2D::SHAPE_CONVEX_POLYGON) {
-					rs->canvas_item_add_polygon(p_canvas_item, ps->shape_get_data(shape), color);
-				} else {
-					WARN_PRINT("Wrong shape type for a tile, should be SHAPE_CONVEX_POLYGON.");
+	// Create a mesh.
+	if (!r_debug_quadrant.physics_mesh.is_valid()) {
+		r_debug_quadrant.physics_mesh = rs->mesh_create();
+	}
+	rs->mesh_clear(r_debug_quadrant.physics_mesh);
+
+	// Redraw all shapes from the physics quadrants
+	Rect2i covered_cell_area = Rect2i(r_debug_quadrant.quadrant_coords * TILE_MAP_DEBUG_QUADRANT_SIZE, Vector2i(TILE_MAP_DEBUG_QUADRANT_SIZE, TILE_MAP_DEBUG_QUADRANT_SIZE));
+	Vector2i first_physics_quadrant_coords = _coords_to_quadrant_coords(covered_cell_area.get_position() - Vector2i(1, 1), physics_quadrant_size) + Vector2i(1, 1);
+	Vector2i last_physics_quadrant_coords = _coords_to_quadrant_coords(covered_cell_area.get_end() - Vector2i(1, 1), physics_quadrant_size) + Vector2i(1, 1);
+
+	LocalVector<Vector2> face_vertex_array;
+	LocalVector<Color> face_color_array;
+	LocalVector<int32_t> face_index_array;
+
+	LocalVector<Vector2> line_vertex_array;
+	LocalVector<Color> line_color_array;
+
+	AHashMap<Vector2, int> vertex_map;
+
+	// Arrays to generate a mesh.
+	for (int x = first_physics_quadrant_coords.x; x < last_physics_quadrant_coords.x; x++) {
+		for (int y = first_physics_quadrant_coords.y; y < last_physics_quadrant_coords.y; y++) {
+			const Vector2i physics_quadrant_coords = Vector2i(x, y);
+			if (!physics_quadrant_map.has(physics_quadrant_coords)) {
+				continue;
+			}
+			r_debug_quadrant.drawn_to = true;
+			Ref<PhysicsQuadrant> physics_quadrant = physics_quadrant_map[physics_quadrant_coords];
+
+			const Vector2 debug_quadrant_pos = tile_set->map_to_local(r_debug_quadrant.quadrant_coords * TILE_MAP_DEBUG_QUADRANT_SIZE);
+			Transform2D global_to_debug_quadrant = (get_global_transform() * Transform2D(0, debug_quadrant_pos)).affine_inverse();
+
+			// Clear arrays for new quadrant while keeping allocated memory.
+
+			face_vertex_array.clear();
+			face_color_array.clear();
+			face_index_array.clear();
+
+			line_vertex_array.clear();
+			line_color_array.clear();
+
+			vertex_map.clear();
+
+			for (const KeyValue<PhysicsQuadrant::PhysicsBodyKey, PhysicsQuadrant::PhysicsBodyValue> &kvbody : physics_quadrant->bodies) {
+				const RID &body = kvbody.value.body;
+				int shape_count = ps->body_get_shape_count(body);
+				if (shape_count == 0) {
+					continue;
+				}
+				const Transform2D body_to_quadrant = global_to_debug_quadrant * Transform2D(ps->body_get_state(body, PhysicsServer2D::BODY_STATE_TRANSFORM));
+
+				Color face_random_variation_color;
+				face_random_variation_color.set_hsv(
+						debug_collision_color.get_h() + rand.random(-1.0, 1.0) * 0.05,
+						debug_collision_color.get_s(),
+						debug_collision_color.get_v() + rand.random(-1.0, 1.0) * 0.1,
+						debug_collision_color.a);
+				const Color line_random_variation_color = face_random_variation_color.lightened(0.2);
+
+				for (int shape_index = 0; shape_index < shape_count; shape_index++) {
+					const RID &shape = ps->body_get_shape(body, shape_index);
+					const Transform2D &shape_xform = ps->body_get_shape_transform(body, shape_index);
+					const PhysicsServer2D::ShapeType &type = ps->shape_get_type(shape);
+
+					if (type == PhysicsServer2D::SHAPE_CONVEX_POLYGON) {
+						PackedVector2Array outline = ps->shape_get_data(shape);
+						const int outline_size = outline.size();
+						if (outline_size < 3) {
+							continue;
+						}
+
+						const Transform2D outline_xform = body_to_quadrant * shape_xform;
+
+						// Adds debug mesh lines.
+
+						Vector2 previous_line_vertex = outline_xform.xform(outline[outline_size - 1]);
+
+						for (int i = 0; i < outline_size; i++) {
+							Vector2 line_vertex = outline_xform.xform(outline[i]);
+
+							line_vertex_array.push_back(previous_line_vertex);
+							line_vertex_array.push_back(line_vertex);
+
+							previous_line_vertex = line_vertex;
+
+							line_color_array.push_back(line_random_variation_color);
+							line_color_array.push_back(line_random_variation_color);
+						}
+
+						// Adds debug mesh faces.
+
+						const Vector2 vertex1 = outline_xform.xform(outline[0]);
+						const Vector2 vertex2 = outline_xform.xform(outline[1]);
+						Vector2 vertex3;
+
+						int vertex1_index = -1;
+						int vertex2_index = -1;
+						int vertex3_index = -1;
+
+						int last_vertex3_index = -1;
+
+						// Find triangle fan anchor vertex1 index.
+						{
+							AHashMap<Vector2, int>::Iterator E = vertex_map.find(vertex1);
+							if (!E) {
+								E = vertex_map.insert(vertex1, vertex_map.size());
+								face_vertex_array.push_back(vertex1);
+								face_color_array.push_back(face_random_variation_color);
+							}
+							vertex1_index = E->value;
+						}
+
+						// Find starting vertex2 index.
+						{
+							AHashMap<Vector2, int>::Iterator E = vertex_map.find(vertex2);
+							if (!E) {
+								E = vertex_map.insert(vertex2, vertex_map.size());
+								face_vertex_array.push_back(vertex2);
+								face_color_array.push_back(face_random_variation_color);
+							}
+							vertex2_index = E->value;
+						}
+
+						// Create mesh triangle face fan from outline vertices using vertex_map indices.
+						for (int i = 1; i < outline_size - 1; i++) {
+							if (i > 1) {
+								vertex2_index = last_vertex3_index;
+							}
+
+							vertex3 = outline_xform.xform(outline[i + 1]);
+
+							{
+								AHashMap<Vector2, int>::Iterator E = vertex_map.find(vertex3);
+								if (!E) {
+									E = vertex_map.insert(vertex3, vertex_map.size());
+									face_vertex_array.push_back(vertex3);
+									face_color_array.push_back(face_random_variation_color);
+								}
+								vertex3_index = E->value;
+								last_vertex3_index = vertex3_index;
+							}
+
+							face_index_array.push_back(vertex1_index);
+							face_index_array.push_back(vertex2_index);
+							face_index_array.push_back(vertex3_index);
+						}
+
+					} else {
+						WARN_PRINT("Wrong shape type for a tile, should be SHAPE_CONVEX_POLYGON.");
+					}
 				}
 			}
-			rs->canvas_item_add_set_transform(p_canvas_item, Transform2D());
+
+			if (face_index_array.size() > 2) {
+				Array face_mesh_array;
+				face_mesh_array.resize(Mesh::ARRAY_MAX);
+				face_mesh_array[Mesh::ARRAY_VERTEX] = Vector<Vector2>(face_vertex_array);
+				face_mesh_array[Mesh::ARRAY_INDEX] = Vector<int32_t>(face_index_array);
+				face_mesh_array[Mesh::ARRAY_COLOR] = Vector<Color>(face_color_array);
+				rs->mesh_add_surface_from_arrays(r_debug_quadrant.physics_mesh, RS::PRIMITIVE_TRIANGLES, face_mesh_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
+
+				Array line_mesh_array;
+				line_mesh_array.resize(Mesh::ARRAY_MAX);
+				line_mesh_array[Mesh::ARRAY_VERTEX] = Vector<Vector2>(line_vertex_array);
+				line_mesh_array[Mesh::ARRAY_COLOR] = Vector<Color>(line_color_array);
+
+				rs->mesh_add_surface_from_arrays(r_debug_quadrant.physics_mesh, RS::PRIMITIVE_LINES, line_mesh_array, Array(), Dictionary(), RS::ARRAY_FLAG_USE_2D_VERTICES);
+			}
 		}
 	}
+	rs->canvas_item_add_mesh(p_canvas_item, r_debug_quadrant.physics_mesh, Transform2D());
 }
 #endif // DEBUG_ENABLED
+#endif // PHYSICS_2D_DISABLED
 
+#ifndef NAVIGATION_2D_DISABLED
 /////////////////////////////// Navigation //////////////////////////////////////
 
 void TileMapLayer::_navigation_update(bool p_force_cleanup) {
@@ -1223,6 +1498,7 @@ void TileMapLayer::_navigation_draw_cell_debug(const RID &p_canvas_item, const V
 	}
 }
 #endif // DEBUG_ENABLED
+#endif // NAVIGATION_2D_DISABLED
 
 /////////////////////////////// Scenes //////////////////////////////////////
 
@@ -1334,9 +1610,7 @@ void TileMapLayer::_scenes_draw_cell_debug(const RID &p_canvas_item, const Vecto
 		if (scenes_collection_source) {
 			if (scenes_collection_source->get_scene_tile_scene(c.alternative_tile).is_null() || scenes_collection_source->get_scene_tile_display_placeholder(c.alternative_tile)) {
 				// Generate a random color from the hashed values of the tiles.
-				Array to_hash;
-				to_hash.push_back(c.source_id);
-				to_hash.push_back(c.alternative_tile);
+				Array to_hash = { c.source_id, c.alternative_tile };
 				uint32_t hash = RandomPCG(to_hash.hash()).rand();
 
 				Color color;
@@ -1697,8 +1971,12 @@ void TileMapLayer::_internal_update(bool p_force_cleanup) {
 
 	// Update all subsystems.
 	_rendering_update(p_force_cleanup);
+#ifndef PHYSICS_2D_DISABLED
 	_physics_update(p_force_cleanup);
+#endif // PHYSICS_2D_DISABLED
+#ifndef NAVIGATION_2D_DISABLED
 	_navigation_update(p_force_cleanup);
+#endif // NAVIGATION_2D_DISABLED
 	_scenes_update(p_force_cleanup);
 #ifdef DEBUG_ENABLED
 	_debug_update(p_force_cleanup);
@@ -1799,8 +2077,12 @@ void TileMapLayer::_notification(int p_what) {
 	}
 
 	_rendering_notification(p_what);
+#ifndef PHYSICS_2D_DISABLED
 	_physics_notification(p_what);
+#endif // PHYSICS_2D_DISABLED
+#ifndef NAVIGATION_2D_DISABLED
 	_navigation_notification(p_what);
+#endif // NAVIGATION_2D_DISABLED
 }
 
 void TileMapLayer::_bind_methods() {
@@ -1832,9 +2114,11 @@ void TileMapLayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_cells_terrain_connect", "cells", "terrain_set", "terrain", "ignore_empty_terrains"), &TileMapLayer::set_cells_terrain_connect, DEFVAL(true));
 	ClassDB::bind_method(D_METHOD("set_cells_terrain_path", "path", "terrain_set", "terrain", "ignore_empty_terrains"), &TileMapLayer::set_cells_terrain_path, DEFVAL(true));
 
+#ifndef PHYSICS_2D_DISABLED
 	// --- Physics helpers ---
 	ClassDB::bind_method(D_METHOD("has_body_rid", "body"), &TileMapLayer::has_body_rid);
 	ClassDB::bind_method(D_METHOD("get_coords_for_body_rid", "body"), &TileMapLayer::get_coords_for_body_rid);
+#endif // PHYSICS_2D_DISABLED
 
 	// --- Runtime ---
 	ClassDB::bind_method(D_METHOD("update_internals"), &TileMapLayer::update_internals);
@@ -1870,16 +2154,20 @@ void TileMapLayer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_using_kinematic_bodies"), &TileMapLayer::is_using_kinematic_bodies);
 	ClassDB::bind_method(D_METHOD("set_collision_visibility_mode", "visibility_mode"), &TileMapLayer::set_collision_visibility_mode);
 	ClassDB::bind_method(D_METHOD("get_collision_visibility_mode"), &TileMapLayer::get_collision_visibility_mode);
+	ClassDB::bind_method(D_METHOD("set_physics_quadrant_size", "size"), &TileMapLayer::set_physics_quadrant_size);
+	ClassDB::bind_method(D_METHOD("get_physics_quadrant_size"), &TileMapLayer::get_physics_quadrant_size);
 
 	ClassDB::bind_method(D_METHOD("set_occlusion_enabled", "enabled"), &TileMapLayer::set_occlusion_enabled);
 	ClassDB::bind_method(D_METHOD("is_occlusion_enabled"), &TileMapLayer::is_occlusion_enabled);
 
+#ifndef NAVIGATION_2D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_navigation_enabled", "enabled"), &TileMapLayer::set_navigation_enabled);
 	ClassDB::bind_method(D_METHOD("is_navigation_enabled"), &TileMapLayer::is_navigation_enabled);
 	ClassDB::bind_method(D_METHOD("set_navigation_map", "map"), &TileMapLayer::set_navigation_map);
 	ClassDB::bind_method(D_METHOD("get_navigation_map"), &TileMapLayer::get_navigation_map);
 	ClassDB::bind_method(D_METHOD("set_navigation_visibility_mode", "show_navigation"), &TileMapLayer::set_navigation_visibility_mode);
 	ClassDB::bind_method(D_METHOD("get_navigation_visibility_mode"), &TileMapLayer::get_navigation_visibility_mode);
+#endif // NAVIGATION_2D_DISABLED
 
 	GDVIRTUAL_BIND(_use_tile_data_runtime_update, "coords");
 	GDVIRTUAL_BIND(_tile_data_runtime_update, "coords", "tile_data");
@@ -1898,9 +2186,12 @@ void TileMapLayer::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision_enabled"), "set_collision_enabled", "is_collision_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "use_kinematic_bodies"), "set_use_kinematic_bodies", "is_using_kinematic_bodies");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_visibility_mode", PROPERTY_HINT_ENUM, "Default,Force Show,Force Hide"), "set_collision_visibility_mode", "get_collision_visibility_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "physics_quadrant_size"), "set_physics_quadrant_size", "get_physics_quadrant_size");
+#ifndef NAVIGATION_2D_DISABLED
 	ADD_GROUP("Navigation", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "navigation_enabled"), "set_navigation_enabled", "is_navigation_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "navigation_visibility_mode", PROPERTY_HINT_ENUM, "Default,Force Show,Force Hide"), "set_navigation_visibility_mode", "get_navigation_visibility_mode");
+#endif // NAVIGATION_2D_DISABLED
 
 	ADD_SIGNAL(MethodInfo(CoreStringName(changed)));
 
@@ -1950,7 +2241,6 @@ void TileMapLayer::set_as_tile_map_internal_node(int p_index) {
 	ERR_FAIL_NULL(get_parent());
 	tile_map_node = Object::cast_to<TileMap>(get_parent());
 	set_use_parent_material(true);
-	force_parent_owned();
 	if (layer_index_in_tile_map_node != p_index) {
 		layer_index_in_tile_map_node = p_index;
 		dirty.flags[DIRTY_FLAGS_LAYER_INDEX_IN_TILE_MAP_NODE] = true;
@@ -2277,7 +2567,7 @@ TileMapCell TileMapLayer::get_cell(const Vector2i &p_coords) const {
 	}
 }
 
-void TileMapLayer::draw_tile(RID p_canvas_item, const Vector2 &p_position, const Ref<TileSet> p_tile_set, int p_atlas_source_id, const Vector2i &p_atlas_coords, int p_alternative_tile, int p_frame, Color p_modulation, const TileData *p_tile_data_override, real_t p_normalized_animation_offset) {
+void TileMapLayer::draw_tile(RID p_canvas_item, const Vector2 &p_position, const Ref<TileSet> p_tile_set, int p_atlas_source_id, const Vector2i &p_atlas_coords, int p_alternative_tile, int p_frame, const TileData *p_tile_data_override, real_t p_normalized_animation_offset) {
 	ERR_FAIL_COND(p_tile_set.is_null());
 	ERR_FAIL_COND(!p_tile_set->has_source(p_atlas_source_id));
 	ERR_FAIL_COND(!p_tile_set->get_source(p_atlas_source_id)->has_tile(p_atlas_coords));
@@ -2306,7 +2596,7 @@ void TileMapLayer::draw_tile(RID p_canvas_item, const Vector2 &p_position, const
 		const TileData *tile_data = p_tile_data_override ? p_tile_data_override : atlas_source->get_tile_data(p_atlas_coords, p_alternative_tile);
 
 		// Get the tile modulation.
-		Color modulate = tile_data->get_modulate() * p_modulation;
+		Color modulate = tile_data->get_modulate();
 
 		// Compute the offset.
 		Vector2 tile_offset = tile_data->get_texture_origin();
@@ -2697,6 +2987,7 @@ void TileMapLayer::set_cells_terrain_path(TypedArray<Vector2i> p_path, int p_ter
 	}
 }
 
+#ifndef PHYSICS_2D_DISABLED
 bool TileMapLayer::has_body_rid(RID p_physics_body) const {
 	return bodies_coords.has(p_physics_body);
 }
@@ -2706,6 +2997,7 @@ Vector2i TileMapLayer::get_coords_for_body_rid(RID p_physics_body) const {
 	ERR_FAIL_NULL_V(found, Vector2i());
 	return *found;
 }
+#endif // PHYSICS_2D_DISABLED
 
 void TileMapLayer::update_internals() {
 	_internal_update(false);
@@ -3008,6 +3300,22 @@ TileMapLayer::DebugVisibilityMode TileMapLayer::get_collision_visibility_mode()
 	return collision_visibility_mode;
 }
 
+void TileMapLayer::set_physics_quadrant_size(int p_size) {
+	if (physics_quadrant_size == p_size) {
+		return;
+	}
+	ERR_FAIL_COND_MSG(p_size < 1, "Physics quandrant size cannot be smaller than 1.");
+	physics_quadrant_size = p_size;
+
+	dirty.flags[DIRTY_FLAGS_LAYER_PHYSICS_QUADRANT_SIZE] = true;
+	_queue_internal_update();
+	emit_signal(CoreStringName(changed));
+}
+
+int TileMapLayer::get_physics_quadrant_size() const {
+	return physics_quadrant_size;
+}
+
 void TileMapLayer::set_occlusion_enabled(bool p_enabled) {
 	if (occlusion_enabled == p_enabled) {
 		return;
@@ -3022,6 +3330,7 @@ bool TileMapLayer::is_occlusion_enabled() const {
 	return occlusion_enabled;
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void TileMapLayer::set_navigation_enabled(bool p_enabled) {
 	if (navigation_enabled == p_enabled) {
 		return;
@@ -3090,14 +3399,17 @@ void TileMapLayer::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p
 		return;
 	}
 
-	int physics_layers_count = tile_set->get_physics_layers_count();
 	int navigation_layers_count = tile_set->get_navigation_layers_count();
+#ifndef PHYSICS_2D_DISABLED
+	int physics_layers_count = tile_set->get_physics_layers_count();
 	if (physics_layers_count <= 0 && navigation_layers_count <= 0) {
 		return;
 	}
-
-	NavigationPolygon::ParsedGeometryType parsed_geometry_type = p_navigation_mesh->get_parsed_geometry_type();
-	uint32_t parsed_collision_mask = p_navigation_mesh->get_parsed_collision_mask();
+#else
+	if (navigation_layers_count <= 0) {
+		return;
+	}
+#endif // PHYSICS_2D_DISABLED
 
 	const Transform2D tilemap_xform = p_source_geometry_data->root_node_transform * tile_map_layer->get_global_transform();
 
@@ -3146,6 +3458,10 @@ void TileMapLayer::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p
 			}
 		}
 
+#ifndef PHYSICS_2D_DISABLED
+		NavigationPolygon::ParsedGeometryType parsed_geometry_type = p_navigation_mesh->get_parsed_geometry_type();
+		uint32_t parsed_collision_mask = p_navigation_mesh->get_parsed_collision_mask();
+
 		// Parse obstacles.
 		for (int physics_layer = 0; physics_layer < physics_layers_count; physics_layer++) {
 			if ((parsed_geometry_type == NavigationPolygon::PARSED_GEOMETRY_STATIC_COLLIDERS || parsed_geometry_type == NavigationPolygon::PARSED_GEOMETRY_BOTH) &&
@@ -3174,8 +3490,10 @@ void TileMapLayer::navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p
 				}
 			}
 		}
+#endif // PHYSICS_2D_DISABLED
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 TileMapLayer::TileMapLayer() {
 	set_notify_transform(true);
diff --git a/engine/scene/2d/tile_map_layer.h b/engine/scene/2d/tile_map_layer.h
index e91a558f..40a9c84f 100644
--- a/engine/scene/2d/tile_map_layer.h
+++ b/engine/scene/2d/tile_map_layer.h
@@ -28,12 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_MAP_LAYER_H
-#define TILE_MAP_LAYER_H
+#pragma once
 
 #include "scene/resources/2d/tile_set.h"
 
+#ifndef NAVIGATION_2D_DISABLED
 class NavigationMeshSourceGeometryData2D;
+#endif // NAVIGATION_2D_DISABLED
 class TileSetAtlasSource;
 class TileMap;
 
@@ -98,21 +99,22 @@ public:
 class DebugQuadrant;
 #endif // DEBUG_ENABLED
 class RenderingQuadrant;
+class PhysicsQuadrant;
 
 struct CellData {
 	Vector2i coords;
 	TileMapCell cell;
 
-	// Debug.
-	SelfList<CellData> debug_quadrant_list_element;
-
 	// Rendering.
 	Ref<RenderingQuadrant> rendering_quadrant;
 	SelfList<CellData> rendering_quadrant_list_element;
 	LocalVector<LocalVector<RID>> occluders;
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics.
-	LocalVector<RID> bodies;
+	Ref<PhysicsQuadrant> physics_quadrant;
+	SelfList<CellData> physics_quadrant_list_element;
+#endif // PHYSICS_2D_DISABLED
 
 	// Navigation.
 	LocalVector<RID> navigation_regions;
@@ -135,28 +137,30 @@ struct CellData {
 		coords = p_other.coords;
 		cell = p_other.cell;
 		occluders = p_other.occluders;
-		bodies = p_other.bodies;
 		navigation_regions = p_other.navigation_regions;
 		scene = p_other.scene;
 		runtime_tile_data_cache = p_other.runtime_tile_data_cache;
 	}
 
 	CellData(const CellData &p_other) :
-			debug_quadrant_list_element(this),
 			rendering_quadrant_list_element(this),
+#ifndef PHYSICS_2D_DISABLED
+			physics_quadrant_list_element(this),
+#endif // PHYSICS_2D_DISABLED
 			dirty_list_element(this) {
 		coords = p_other.coords;
 		cell = p_other.cell;
 		occluders = p_other.occluders;
-		bodies = p_other.bodies;
 		navigation_regions = p_other.navigation_regions;
 		scene = p_other.scene;
 		runtime_tile_data_cache = p_other.runtime_tile_data_cache;
 	}
 
 	CellData() :
-			debug_quadrant_list_element(this),
 			rendering_quadrant_list_element(this),
+#ifndef PHYSICS_2D_DISABLED
+			physics_quadrant_list_element(this),
+#endif // PHYSICS_2D_DISABLED
 			dirty_list_element(this) {
 	}
 };
@@ -177,6 +181,11 @@ public:
 	SelfList<CellData>::List cells;
 	RID canvas_item;
 
+	RID physics_mesh;
+
+	// Used to deleted unused quadrants.
+	bool drawn_to = false;
+
 	SelfList<DebugQuadrant> dirty_quadrant_list_element;
 
 	DebugQuadrant() :
@@ -220,6 +229,90 @@ public:
 	}
 };
 
+#ifndef PHYSICS_2D_DISABLED
+class PhysicsQuadrant : public RefCounted {
+	GDCLASS(PhysicsQuadrant, RefCounted);
+
+public:
+	struct PhysicsBodyKey {
+		int physics_layer = 0;
+		Vector2 linear_velocity;
+		real_t angular_velocity = 0.0;
+		bool one_way_collision = false;
+		real_t one_way_collision_margin = 0.0;
+
+		bool operator<(const PhysicsBodyKey &p_other) const {
+			if (physics_layer == p_other.physics_layer) {
+				if (linear_velocity == p_other.linear_velocity) {
+					if (angular_velocity == p_other.angular_velocity) {
+						if (one_way_collision == p_other.one_way_collision) {
+							return one_way_collision_margin < p_other.one_way_collision_margin;
+						}
+						return one_way_collision < p_other.one_way_collision;
+					}
+					return angular_velocity < p_other.angular_velocity;
+				}
+				return linear_velocity < p_other.linear_velocity;
+			}
+			return physics_layer < p_other.physics_layer;
+		}
+
+		bool operator!=(const PhysicsBodyKey &p_other) const {
+			return !this->operator==(p_other);
+		}
+		bool operator==(const PhysicsBodyKey &p_other) const {
+			return physics_layer == p_other.physics_layer &&
+					linear_velocity == p_other.linear_velocity &&
+					angular_velocity == p_other.angular_velocity &&
+					one_way_collision == p_other.one_way_collision &&
+					one_way_collision_margin == p_other.one_way_collision_margin;
+		}
+	};
+
+	struct PhysicsBodyKeyHasher {
+		static uint32_t hash(const PhysicsBodyKey &p_hash) {
+			uint32_t h = hash_murmur3_one_32(p_hash.physics_layer);
+			h = hash_murmur3_one_real(p_hash.linear_velocity.x);
+			h = hash_murmur3_one_real(p_hash.linear_velocity.y, h);
+			h = hash_murmur3_one_real(p_hash.angular_velocity, h);
+			return h;
+		}
+	};
+
+	struct PhysicsBodyValue {
+		RID body;
+		Vector<Vector<Vector2>> polygons;
+	};
+
+	struct CoordsWorldComparator {
+		_ALWAYS_INLINE_ bool operator()(const Vector2 &p_a, const Vector2 &p_b) const {
+			// We sort the cells by their local coords, as it is needed by rendering.
+			if (p_a.y == p_b.y) {
+				return p_a.x > p_b.x;
+			} else {
+				return p_a.y < p_b.y;
+			}
+		}
+	};
+
+	Vector2i quadrant_coords;
+	SelfList<CellData>::List cells;
+
+	HashMap<PhysicsBodyKey, PhysicsBodyValue, PhysicsBodyKeyHasher> bodies;
+	LocalVector<Ref<ConvexPolygonShape2D>> shapes;
+
+	SelfList<PhysicsQuadrant> dirty_quadrant_list_element;
+
+	PhysicsQuadrant() :
+			dirty_quadrant_list_element(this) {
+	}
+
+	~PhysicsQuadrant() {
+		cells.clear();
+	}
+};
+#endif // PHYSICS_2D_DISABLED
+
 class TileMapLayer : public Node2D {
 	GDCLASS(TileMapLayer, Node2D);
 
@@ -254,6 +347,7 @@ public:
 		DIRTY_FLAGS_LAYER_RENDERING_QUADRANT_SIZE,
 		DIRTY_FLAGS_LAYER_COLLISION_ENABLED,
 		DIRTY_FLAGS_LAYER_USE_KINEMATIC_BODIES,
+		DIRTY_FLAGS_LAYER_PHYSICS_QUADRANT_SIZE,
 		DIRTY_FLAGS_LAYER_COLLISION_VISIBILITY_MODE,
 		DIRTY_FLAGS_LAYER_OCCLUSION_ENABLED,
 		DIRTY_FLAGS_LAYER_NAVIGATION_ENABLED,
@@ -288,6 +382,7 @@ private:
 
 	bool collision_enabled = true;
 	bool use_kinematic_bodies = false;
+	int physics_quadrant_size = 16;
 	DebugVisibilityMode collision_visibility_mode = DEBUG_VISIBILITY_MODE_DEFAULT;
 
 	bool occlusion_enabled = true;
@@ -324,13 +419,16 @@ private:
 	void _clear_runtime_update_tile_data_for_cell(CellData &r_cell_data);
 	void _update_cells_callback(bool p_force_cleanup);
 
+	// Coords to quadrant coords
+	Vector2i _coords_to_quadrant_coords(const Vector2i &p_coords, const int p_quadrant_size) const;
+
 	// Per-system methods.
 #ifdef DEBUG_ENABLED
 	HashMap<Vector2i, Ref<DebugQuadrant>> debug_quadrant_map;
-	Vector2i _coords_to_debug_quadrant_coords(const Vector2i &p_coords) const;
 	bool _debug_was_cleaned_up = false;
 	void _debug_update(bool p_force_cleanup);
-	void _debug_quadrants_update_cell(CellData &r_cell_data, SelfList<DebugQuadrant>::List &r_dirty_debug_quadrant_list);
+	void _debug_quadrants_update_cell(CellData &r_cell_data);
+	void _get_debug_quadrant_for_cell(const Vector2i &p_coords);
 #endif // DEBUG_ENABLED
 
 	HashMap<Vector2i, Ref<RenderingQuadrant>> rendering_quadrant_map;
@@ -344,16 +442,21 @@ private:
 	void _rendering_draw_cell_debug(const RID &p_canvas_item, const Vector2 &p_quadrant_pos, const CellData &r_cell_data);
 #endif // DEBUG_ENABLED
 
+#ifndef PHYSICS_2D_DISABLED
+	HashMap<Vector2i, Ref<PhysicsQuadrant>> physics_quadrant_map;
 	HashMap<RID, Vector2i> bodies_coords; // Mapping for RID to coords.
 	bool _physics_was_cleaned_up = false;
 	void _physics_update(bool p_force_cleanup);
 	void _physics_notification(int p_what);
+	void _physics_quadrants_update_cell(CellData &r_cell_data, SelfList<PhysicsQuadrant>::List &r_dirty_physics_quadrant_list);
 	void _physics_clear_cell(CellData &r_cell_data);
 	void _physics_update_cell(CellData &r_cell_data);
 #ifdef DEBUG_ENABLED
-	void _physics_draw_cell_debug(const RID &p_canvas_item, const Vector2 &p_quadrant_pos, const CellData &r_cell_data);
+	void _physics_draw_quadrant_debug(const RID &p_canvas_item, DebugQuadrant &r_debug_quadrant);
 #endif // DEBUG_ENABLED
+#endif // PHYSICS_2D_DISABLED
 
+#ifndef NAVIGATION_2D_DISABLED
 	bool _navigation_was_cleaned_up = false;
 	void _navigation_update(bool p_force_cleanup);
 	void _navigation_notification(int p_what);
@@ -362,6 +465,7 @@ private:
 #ifdef DEBUG_ENABLED
 	void _navigation_draw_cell_debug(const RID &p_canvas_item, const Vector2 &p_quadrant_pos, const CellData &r_cell_data);
 #endif // DEBUG_ENABLED
+#endif // NAVIGATION_2D_DISABLED
 
 	bool _scenes_was_cleaned_up = false;
 	void _scenes_update(bool p_force_cleanup);
@@ -423,7 +527,7 @@ public:
 	// Not exposed to users.
 	TileMapCell get_cell(const Vector2i &p_coords) const;
 
-	static void draw_tile(RID p_canvas_item, const Vector2 &p_position, const Ref<TileSet> p_tile_set, int p_atlas_source_id, const Vector2i &p_atlas_coords, int p_alternative_tile, int p_frame = -1, Color p_modulation = Color(1.0, 1.0, 1.0, 1.0), const TileData *p_tile_data_override = nullptr, real_t p_normalized_animation_offset = 0.0);
+	static void draw_tile(RID p_canvas_item, const Vector2 &p_position, const Ref<TileSet> p_tile_set, int p_atlas_source_id, const Vector2i &p_atlas_coords, int p_alternative_tile, int p_frame = -1, const TileData *p_tile_data_override = nullptr, real_t p_normalized_animation_offset = 0.0);
 
 	////////////// Exposed functions //////////////
 
@@ -455,9 +559,11 @@ public:
 	void set_cells_terrain_connect(TypedArray<Vector2i> p_cells, int p_terrain_set, int p_terrain, bool p_ignore_empty_terrains = true);
 	void set_cells_terrain_path(TypedArray<Vector2i> p_path, int p_terrain_set, int p_terrain, bool p_ignore_empty_terrains = true);
 
+#ifndef PHYSICS_2D_DISABLED
 	// --- Physics helpers ---
 	bool has_body_rid(RID p_physics_body) const;
 	Vector2i get_coords_for_body_rid(RID p_physics_body) const; // For finding tiles from collision.
+#endif // PHYSICS_2D_DISABLED
 
 	// --- Runtime ---
 	void update_internals();
@@ -502,6 +608,8 @@ public:
 	bool is_using_kinematic_bodies() const;
 	void set_collision_visibility_mode(DebugVisibilityMode p_show_collision);
 	DebugVisibilityMode get_collision_visibility_mode() const;
+	void set_physics_quadrant_size(int p_size);
+	int get_physics_quadrant_size() const;
 
 	void set_occlusion_enabled(bool p_enabled);
 	bool is_occlusion_enabled() const;
@@ -514,17 +622,19 @@ public:
 	DebugVisibilityMode get_navigation_visibility_mode() const;
 
 private:
+#ifndef NAVIGATION_2D_DISABLED
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
+#endif // NAVIGATION_2D_DISABLED
 
 public:
+#ifndef NAVIGATION_2D_DISABLED
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationPolygon> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_2D_DISABLED
 
 	TileMapLayer();
 	~TileMapLayer();
 };
 
 VARIANT_ENUM_CAST(TileMapLayer::DebugVisibilityMode);
-
-#endif // TILE_MAP_LAYER_H
diff --git a/engine/scene/2d/visible_on_screen_notifier_2d.cpp b/engine/scene/2d/visible_on_screen_notifier_2d.cpp
index 7bf6371e..79f0ee56 100644
--- a/engine/scene/2d/visible_on_screen_notifier_2d.cpp
+++ b/engine/scene/2d/visible_on_screen_notifier_2d.cpp
@@ -30,13 +30,31 @@
 
 #include "visible_on_screen_notifier_2d.h"
 
+#ifdef TOOLS_ENABLED
+Dictionary VisibleOnScreenNotifier2D::_edit_get_state() const {
+	Dictionary state = Node2D::_edit_get_state();
+	state["rect"] = rect;
+	return state;
+}
+
+void VisibleOnScreenNotifier2D::_edit_set_state(const Dictionary &p_state) {
+	ERR_FAIL_COND(p_state.is_empty() || !p_state.has("rect"));
+	set_rect(p_state["rect"]);
+	Node2D::_edit_set_state(p_state);
+}
+
+void VisibleOnScreenNotifier2D::_edit_set_rect(const Rect2 &p_edit_rect) {
+	set_rect(p_edit_rect);
+}
+#endif // TOOLS_ENABLED
+
 #ifdef DEBUG_ENABLED
 Rect2 VisibleOnScreenNotifier2D::_edit_get_rect() const {
 	return rect;
 }
 
 bool VisibleOnScreenNotifier2D::_edit_use_rect() const {
-	return true;
+	return show_rect;
 }
 #endif // DEBUG_ENABLED
 
@@ -71,6 +89,18 @@ Rect2 VisibleOnScreenNotifier2D::get_rect() const {
 	return rect;
 }
 
+void VisibleOnScreenNotifier2D::set_show_rect(bool p_show_rect) {
+	if (show_rect == p_show_rect) {
+		return;
+	}
+	show_rect = p_show_rect;
+	queue_redraw();
+}
+
+bool VisibleOnScreenNotifier2D::is_showing_rect() const {
+	return show_rect;
+}
+
 void VisibleOnScreenNotifier2D::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
@@ -79,7 +109,7 @@ void VisibleOnScreenNotifier2D::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_DRAW: {
-			if (Engine::get_singleton()->is_editor_hint()) {
+			if (show_rect && Engine::get_singleton()->is_editor_hint()) {
 				draw_rect(rect, Color(1, 0.5, 1, 0.2));
 			}
 		} break;
@@ -98,9 +128,12 @@ bool VisibleOnScreenNotifier2D::is_on_screen() const {
 void VisibleOnScreenNotifier2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_rect", "rect"), &VisibleOnScreenNotifier2D::set_rect);
 	ClassDB::bind_method(D_METHOD("get_rect"), &VisibleOnScreenNotifier2D::get_rect);
+	ClassDB::bind_method(D_METHOD("set_show_rect", "show_rect"), &VisibleOnScreenNotifier2D::set_show_rect);
+	ClassDB::bind_method(D_METHOD("is_showing_rect"), &VisibleOnScreenNotifier2D::is_showing_rect);
 	ClassDB::bind_method(D_METHOD("is_on_screen"), &VisibleOnScreenNotifier2D::is_on_screen);
 
 	ADD_PROPERTY(PropertyInfo(Variant::RECT2, "rect", PROPERTY_HINT_NONE, "suffix:px"), "set_rect", "get_rect");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_rect"), "set_show_rect", "is_showing_rect");
 
 	ADD_SIGNAL(MethodInfo("screen_entered"));
 	ADD_SIGNAL(MethodInfo("screen_exited"));
@@ -154,7 +187,7 @@ NodePath VisibleOnScreenEnabler2D::get_enable_node_path() {
 }
 
 void VisibleOnScreenEnabler2D::_update_enable_mode(bool p_enable) {
-	Node *node = static_cast<Node *>(ObjectDB::get_instance(node_id));
+	Node *node = ObjectDB::get_instance<Node>(node_id);
 	if (node) {
 		if (p_enable) {
 			switch (enable_mode) {
diff --git a/engine/scene/2d/visible_on_screen_notifier_2d.h b/engine/scene/2d/visible_on_screen_notifier_2d.h
index 84545a2d..e4e7cd64 100644
--- a/engine/scene/2d/visible_on_screen_notifier_2d.h
+++ b/engine/scene/2d/visible_on_screen_notifier_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISIBLE_ON_SCREEN_NOTIFIER_2D_H
-#define VISIBLE_ON_SCREEN_NOTIFIER_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 
@@ -40,6 +39,7 @@ class VisibleOnScreenNotifier2D : public Node2D {
 	HashSet<Viewport *> viewports;
 
 	Rect2 rect;
+	bool show_rect = true;
 
 private:
 	bool on_screen = false;
@@ -54,14 +54,27 @@ protected:
 	static void _bind_methods();
 
 public:
+#ifdef TOOLS_ENABLED
+	virtual Dictionary _edit_get_state() const override;
+	virtual void _edit_set_state(const Dictionary &p_state) override;
+
+	virtual Vector2 _edit_get_minimum_size() const override { return Vector2(); }
+
+	virtual void _edit_set_rect(const Rect2 &p_edit_rect) override;
+#endif // TOOLS_ENABLED
+
 #ifdef DEBUG_ENABLED
 	virtual Rect2 _edit_get_rect() const override;
+
 	virtual bool _edit_use_rect() const override;
 #endif // DEBUG_ENABLED
 
 	void set_rect(const Rect2 &p_rect);
 	Rect2 get_rect() const;
 
+	void set_show_rect(bool p_show_rect);
+	bool is_showing_rect() const;
+
 	bool is_on_screen() const;
 
 	VisibleOnScreenNotifier2D();
@@ -101,5 +114,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(VisibleOnScreenEnabler2D::EnableMode);
-
-#endif // VISIBLE_ON_SCREEN_NOTIFIER_2D_H
diff --git a/engine/scene/3d/SCsub b/engine/scene/3d/SCsub
index 6f6bf981..307c95d5 100644
--- a/engine/scene/3d/SCsub
+++ b/engine/scene/3d/SCsub
@@ -6,4 +6,9 @@ Import("env")
 env.add_source_files(env.scene_sources, "*.cpp")
 
 # Chain load SCsubs
-SConscript("physics/SCsub")
+if not env["disable_physics_3d"]:
+    SConscript("physics/SCsub")
+if not env["disable_navigation_3d"]:
+    SConscript("navigation/SCsub")
+if not env["disable_xr"]:
+    SConscript("xr/SCsub")
diff --git a/engine/scene/3d/audio_listener_3d.h b/engine/scene/3d/audio_listener_3d.h
index 4f7e6a6b..1c3c8ebc 100644
--- a/engine/scene/3d/audio_listener_3d.h
+++ b/engine/scene/3d/audio_listener_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_LISTENER_3D_H
-#define AUDIO_LISTENER_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -66,5 +65,3 @@ public:
 	AudioListener3D();
 	~AudioListener3D();
 };
-
-#endif // AUDIO_LISTENER_3D_H
diff --git a/engine/scene/3d/audio_stream_player_3d.cpp b/engine/scene/3d/audio_stream_player_3d.cpp
index ed8dc345..5ab8b552 100644
--- a/engine/scene/3d/audio_stream_player_3d.cpp
+++ b/engine/scene/3d/audio_stream_player_3d.cpp
@@ -34,12 +34,15 @@
 #include "core/config/project_settings.h"
 #include "scene/3d/audio_listener_3d.h"
 #include "scene/3d/camera_3d.h"
-#include "scene/3d/physics/area_3d.h"
 #include "scene/3d/velocity_tracker_3d.h"
 #include "scene/audio/audio_stream_player_internal.h"
 #include "scene/main/viewport.h"
 #include "servers/audio/audio_stream.h"
 
+#ifndef PHYSICS_3D_DISABLED
+#include "scene/3d/physics/area_3d.h"
+#endif // PHYSICS_3D_DISABLED
+
 // Based on "A Novel Multichannel Panning Method for Standard and Arbitrary Loudspeaker Configurations" by Ramy Sadek and Chris Kyriakakis (2004)
 // Speaker-Placement Correction Amplitude Panning (SPCAP)
 class Spcap {
@@ -60,6 +63,8 @@ public:
 			w[speaker_num].direction = speaker_directions[speaker_num];
 			w[speaker_num].squared_gain = 0.0;
 			w[speaker_num].effective_number_of_speakers = 0.0;
+		}
+		for (unsigned int speaker_num = 0; speaker_num < speaker_count; speaker_num++) {
 			for (unsigned int other_speaker_num = 0; other_speaker_num < speaker_count; other_speaker_num++) {
 				w[speaker_num].effective_number_of_speakers += 0.5 * (1.0 + w[speaker_num].direction.dot(w[other_speaker_num].direction));
 			}
@@ -141,6 +146,19 @@ void AudioStreamPlayer3D::_calc_output_vol(const Vector3 &source_dir, real_t tig
 	}
 }
 
+// Set the volume to cosine of half horizontal the angle from the source to the left/right speaker direction ignoring elevation.
+// Then scale `cosx` so that greatest ratio of the speaker volumes is `1-panning_strength`.
+// See https://github.com/godotengine/godot/issues/103989 for evidence that this is the most standard implementation.
+AudioFrame AudioStreamPlayer3D::_calc_output_vol_stereo(const Vector3 &source_dir, real_t panning_strength) {
+	double flatrad = sqrt(source_dir.x * source_dir.x + source_dir.z * source_dir.z);
+	double g = CLAMP((1.0 - panning_strength) * (1.0 - panning_strength), 0.0, 1.0);
+	double f = (1.0 - g) / (1.0 + g);
+	double cosx = CLAMP(source_dir.x / (flatrad == 0.0 ? 1.0 : flatrad), -1.0, 1.0);
+	double fcosx = cosx * f;
+	return AudioFrame(sqrt((-fcosx + 1.0) / 2.0), sqrt((fcosx + 1.0) / 2.0));
+}
+
+#ifndef PHYSICS_3D_DISABLED
 void AudioStreamPlayer3D::_calc_reverb_vol(Area3D *area, Vector3 listener_area_pos, Vector<AudioFrame> direct_path_vol, Vector<AudioFrame> &reverb_vol) {
 	reverb_vol.resize(4);
 	reverb_vol.write[0] = AudioFrame(0, 0);
@@ -209,6 +227,7 @@ void AudioStreamPlayer3D::_calc_reverb_vol(Area3D *area, Vector3 listener_area_p
 		}
 	}
 }
+#endif // PHYSICS_3D_DISABLED
 
 float AudioStreamPlayer3D::_get_attenuation_db(float p_distance) const {
 	float att = 0;
@@ -283,6 +302,7 @@ void AudioStreamPlayer3D::_notification(int p_what) {
 	}
 }
 
+#ifndef PHYSICS_3D_DISABLED
 // Interacts with PhysicsServer3D, so can only be called during _physics_process
 Area3D *AudioStreamPlayer3D::_get_overriding_area() {
 	//check if any area is diverting sound into a bus
@@ -321,13 +341,16 @@ Area3D *AudioStreamPlayer3D::_get_overriding_area() {
 	}
 	return nullptr;
 }
+#endif // PHYSICS_3D_DISABLED
 
 // Interacts with PhysicsServer3D, so can only be called during _physics_process.
 StringName AudioStreamPlayer3D::_get_actual_bus() {
+#ifndef PHYSICS_3D_DISABLED
 	Area3D *overriding_area = _get_overriding_area();
 	if (overriding_area && overriding_area->is_overriding_audio_bus() && !overriding_area->is_using_reverb_bus()) {
 		return overriding_area->get_audio_bus_name();
 	}
+#endif // PHYSICS_3D_DISABLED
 	return internal->bus;
 }
 
@@ -358,7 +381,9 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 	HashSet<Camera3D *> cameras = world_3d->get_cameras();
 	cameras.insert(get_viewport()->get_camera_3d());
 
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsDirectSpaceState3D *space_state = PhysicsServer3D::get_singleton()->space_get_direct_state(world_3d->get_space());
+#endif // PHYSICS_3D_DISABLED
 
 	for (Camera3D *camera : cameras) {
 		if (!camera) {
@@ -388,19 +413,22 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 		Vector3 area_sound_pos;
 		Vector3 listener_area_pos;
 
+#ifndef PHYSICS_3D_DISABLED
 		Area3D *area = _get_overriding_area();
-
 		if (area && area->is_using_reverb_bus() && area->get_reverb_uniformity() > 0) {
 			area_sound_pos = space_state->get_closest_point_to_object_volume(area->get_rid(), listener_node->get_global_transform().origin);
 			listener_area_pos = listener_node->get_global_transform().affine_inverse().xform(area_sound_pos);
 		}
+#endif // PHYSICS_3D_DISABLED
 
 		if (max_distance > 0) {
 			float total_max = max_distance;
 
+#ifndef PHYSICS_3D_DISABLED
 			if (area && area->is_using_reverb_bus() && area->get_reverb_uniformity() > 0) {
 				total_max = MAX(total_max, listener_area_pos.length());
 			}
+#endif // PHYSICS_3D_DISABLED
 			if (dist > total_max || total_max > max_distance) {
 				if (!was_further_than_max_distance_last_frame) {
 					HashMap<StringName, Vector<AudioFrame>> bus_volumes;
@@ -435,16 +463,25 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 		for (Ref<AudioStreamPlayback> &playback : internal->stream_playbacks) {
 			AudioServer::get_singleton()->set_playback_highshelf_params(playback, linear_attenuation, attenuation_filter_cutoff_hz);
 		}
-		// Bake in a constant factor here to allow the project setting defaults for 2d and 3d to be normalized to 1.0.
-		float tightness = cached_global_panning_strength * 2.0f;
-		tightness *= panning_strength;
-		_calc_output_vol(local_pos.normalized(), tightness, output_volume_vector);
+
+		if (AudioServer::get_singleton()->get_speaker_mode() == AudioServer::SPEAKER_MODE_STEREO) {
+			output_volume_vector.write[0] = _calc_output_vol_stereo(local_pos, cached_global_panning_strength * panning_strength);
+			output_volume_vector.write[1] = AudioFrame(0, 0);
+			output_volume_vector.write[2] = AudioFrame(0, 0);
+			output_volume_vector.write[3] = AudioFrame(0, 0);
+		} else {
+			// Bake in a constant factor here to allow the project setting defaults for 2d and 3d to be normalized to 1.0.
+			float tightness = cached_global_panning_strength * 2.0f;
+			tightness *= panning_strength;
+			_calc_output_vol(local_pos.normalized(), tightness, output_volume_vector);
+		}
 
 		for (unsigned int k = 0; k < 4; k++) {
 			output_volume_vector.write[k] = multiplier * output_volume_vector[k];
 		}
 
 		HashMap<StringName, Vector<AudioFrame>> bus_volumes;
+#ifndef PHYSICS_3D_DISABLED
 		if (area) {
 			if (area->is_overriding_audio_bus()) {
 				//override audio bus
@@ -457,7 +494,9 @@ Vector<AudioFrame> AudioStreamPlayer3D::_update_panning() {
 				_calc_reverb_vol(area, listener_area_pos, output_volume_vector, reverb_vol);
 				bus_volumes[reverb_bus_name] = reverb_vol;
 			}
-		} else {
+		} else
+#endif // PHYSICS_3D_DISABLED
+		{
 			bus_volumes[internal->bus] = output_volume_vector;
 		}
 
diff --git a/engine/scene/3d/audio_stream_player_3d.h b/engine/scene/3d/audio_stream_player_3d.h
index 8f18ce08..70108f84 100644
--- a/engine/scene/3d/audio_stream_player_3d.h
+++ b/engine/scene/3d/audio_stream_player_3d.h
@@ -28,13 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_PLAYER_3D_H
-#define AUDIO_STREAM_PLAYER_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "servers/audio_server.h"
 
+#ifndef PHYSICS_3D_DISABLED
 class Area3D;
+#endif // PHYSICS_3D_DISABLED
 struct AudioFrame;
 class AudioStream;
 class AudioStreamPlayback;
@@ -80,15 +81,20 @@ private:
 	bool force_update_panning = false;
 
 	static void _calc_output_vol(const Vector3 &source_dir, real_t tightness, Vector<AudioFrame> &output);
+	static AudioFrame _calc_output_vol_stereo(const Vector3 &source_dir, real_t panning_strength);
 
+#ifndef PHYSICS_3D_DISABLED
 	void _calc_reverb_vol(Area3D *area, Vector3 listener_area_pos, Vector<AudioFrame> direct_path_vol, Vector<AudioFrame> &reverb_vol);
+#endif // PHYSICS_3D_DISABLED
 
 	static void _listener_changed_cb(void *self) { reinterpret_cast<AudioStreamPlayer3D *>(self)->force_update_panning = true; }
 
 	void _set_playing(bool p_enable);
 	bool _is_active() const;
 	StringName _get_actual_bus();
+#ifndef PHYSICS_3D_DISABLED
 	Area3D *_get_overriding_area();
+#endif // PHYSICS_3D_DISABLED
 	Vector<AudioFrame> _update_panning();
 
 	uint32_t area_mask = 1;
@@ -208,5 +214,3 @@ public:
 
 VARIANT_ENUM_CAST(AudioStreamPlayer3D::AttenuationModel)
 VARIANT_ENUM_CAST(AudioStreamPlayer3D::DopplerTracking)
-
-#endif // AUDIO_STREAM_PLAYER_3D_H
diff --git a/engine/scene/3d/bone_attachment_3d.cpp b/engine/scene/3d/bone_attachment_3d.cpp
index 7fe1b707..59647457 100644
--- a/engine/scene/3d/bone_attachment_3d.cpp
+++ b/engine/scene/3d/bone_attachment_3d.cpp
@@ -37,7 +37,7 @@ void BoneAttachment3D::_validate_property(PropertyInfo &p_property) const {
 		const Skeleton3D *parent = nullptr;
 		if (use_external_skeleton) {
 			if (external_skeleton_node_cache.is_valid()) {
-				parent = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(external_skeleton_node_cache));
+				parent = ObjectDB::get_instance<Skeleton3D>(external_skeleton_node_cache);
 			}
 		} else {
 			parent = Object::cast_to<Skeleton3D>(get_parent());
@@ -151,11 +151,11 @@ void BoneAttachment3D::_check_bind() {
 Skeleton3D *BoneAttachment3D::get_skeleton() {
 	if (use_external_skeleton) {
 		if (external_skeleton_node_cache.is_valid()) {
-			return Object::cast_to<Skeleton3D>(ObjectDB::get_instance(external_skeleton_node_cache));
+			return ObjectDB::get_instance<Skeleton3D>(external_skeleton_node_cache);
 		} else {
 			_update_external_skeleton_cache();
 			if (external_skeleton_node_cache.is_valid()) {
-				return Object::cast_to<Skeleton3D>(ObjectDB::get_instance(external_skeleton_node_cache));
+				return ObjectDB::get_instance<Skeleton3D>(external_skeleton_node_cache);
 			}
 		}
 	} else {
@@ -341,7 +341,7 @@ void BoneAttachment3D::notify_skeleton_bones_renamed(Node *p_base_scene, Skeleto
 	const Skeleton3D *parent = nullptr;
 	if (use_external_skeleton) {
 		if (external_skeleton_node_cache.is_valid()) {
-			parent = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(external_skeleton_node_cache));
+			parent = ObjectDB::get_instance<Skeleton3D>(external_skeleton_node_cache);
 		}
 	} else {
 		parent = Object::cast_to<Skeleton3D>(get_parent());
diff --git a/engine/scene/3d/bone_attachment_3d.h b/engine/scene/3d/bone_attachment_3d.h
index d3ba804e..31a7e596 100644
--- a/engine/scene/3d/bone_attachment_3d.h
+++ b/engine/scene/3d/bone_attachment_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BONE_ATTACHMENT_3D_H
-#define BONE_ATTACHMENT_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_3d.h"
 
@@ -99,5 +98,3 @@ public:
 
 	BoneAttachment3D();
 };
-
-#endif // BONE_ATTACHMENT_3D_H
diff --git a/engine/scene/3d/camera_3d.cpp b/engine/scene/3d/camera_3d.cpp
index e527ac74..38671159 100644
--- a/engine/scene/3d/camera_3d.cpp
+++ b/engine/scene/3d/camera_3d.cpp
@@ -691,7 +691,9 @@ void Camera3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_frustum"), &Camera3D::_get_frustum);
 	ClassDB::bind_method(D_METHOD("is_position_in_frustum", "world_point"), &Camera3D::is_position_in_frustum);
 	ClassDB::bind_method(D_METHOD("get_camera_rid"), &Camera3D::get_camera);
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_pyramid_shape_rid"), &Camera3D::get_pyramid_shape_rid);
+#endif // PHYSICS_3D_DISABLED
 
 	ClassDB::bind_method(D_METHOD("set_cull_mask_value", "layer_number", "value"), &Camera3D::set_cull_mask_value);
 	ClassDB::bind_method(D_METHOD("get_cull_mask_value", "layer_number"), &Camera3D::get_cull_mask_value);
@@ -854,6 +856,7 @@ Vector3 Camera3D::get_doppler_tracked_velocity() const {
 	}
 }
 
+#ifndef PHYSICS_3D_DISABLED
 RID Camera3D::get_pyramid_shape_rid() {
 	ERR_FAIL_COND_V_MSG(!is_inside_tree(), RID(), "Camera is not inside scene.");
 	if (pyramid_shape == RID()) {
@@ -881,6 +884,7 @@ RID Camera3D::get_pyramid_shape_rid() {
 
 	return pyramid_shape;
 }
+#endif // PHYSICS_3D_DISABLED
 
 Camera3D::Camera3D() {
 	camera = RenderingServer::get_singleton()->camera_create();
@@ -895,8 +899,10 @@ Camera3D::Camera3D() {
 Camera3D::~Camera3D() {
 	ERR_FAIL_NULL(RenderingServer::get_singleton());
 	RenderingServer::get_singleton()->free(camera);
+#ifndef PHYSICS_3D_DISABLED
 	if (pyramid_shape.is_valid()) {
 		ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
 		PhysicsServer3D::get_singleton()->free(pyramid_shape);
 	}
+#endif // PHYSICS_3D_DISABLED
 }
diff --git a/engine/scene/3d/camera_3d.h b/engine/scene/3d/camera_3d.h
index 3e9f940a..a015d413 100644
--- a/engine/scene/3d/camera_3d.h
+++ b/engine/scene/3d/camera_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_3D_H
-#define CAMERA_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/3d/velocity_tracker_3d.h"
@@ -95,8 +94,10 @@ private:
 	DopplerTracking doppler_tracking = DOPPLER_TRACKING_DISABLED;
 	Ref<VelocityTracker3D> velocity_tracker;
 
+#ifndef PHYSICS_3D_DISABLED
 	RID pyramid_shape;
 	Vector<Vector3> pyramid_shape_points;
+#endif // PHYSICS_3D_DISABLED
 
 	///////////////////////////////////////////////////////
 	// INTERPOLATION FUNCTIONS
@@ -218,7 +219,9 @@ public:
 
 	Vector3 get_doppler_tracked_velocity() const;
 
+#ifndef PHYSICS_3D_DISABLED
 	RID get_pyramid_shape_rid();
+#endif // PHYSICS_3D_DISABLED
 
 	Camera3D();
 	~Camera3D();
@@ -227,5 +230,3 @@ public:
 VARIANT_ENUM_CAST(Camera3D::ProjectionType);
 VARIANT_ENUM_CAST(Camera3D::KeepAspect);
 VARIANT_ENUM_CAST(Camera3D::DopplerTracking);
-
-#endif // CAMERA_3D_H
diff --git a/engine/scene/3d/cpu_particles_3d.cpp b/engine/scene/3d/cpu_particles_3d.cpp
index 8f20c754..2d47c053 100644
--- a/engine/scene/3d/cpu_particles_3d.cpp
+++ b/engine/scene/3d/cpu_particles_3d.cpp
@@ -647,7 +647,7 @@ static real_t rand_from_seed(uint32_t &seed) {
 }
 
 void CPUParticles3D::_update_internal() {
-	if (particles.size() == 0 || !is_visible_in_tree()) {
+	if (particles.is_empty() || !is_visible_in_tree()) {
 		_set_redraw(false);
 		return;
 	}
@@ -886,14 +886,14 @@ void CPUParticles3D::_particles_process(double p_delta) {
 				} break;
 				case EMISSION_SHAPE_SPHERE: {
 					real_t s = 2.0 * rng->randf() - 1.0;
-					real_t t = Math_TAU * rng->randf();
+					real_t t = Math::TAU * rng->randf();
 					real_t x = rng->randf();
 					real_t radius = emission_sphere_radius * Math::sqrt(1.0 - s * s);
 					p.transform.origin = Vector3(0, 0, 0).lerp(Vector3(radius * Math::cos(t), radius * Math::sin(t), emission_sphere_radius * s), x);
 				} break;
 				case EMISSION_SHAPE_SPHERE_SURFACE: {
 					real_t s = 2.0 * rng->randf() - 1.0;
-					real_t t = Math_TAU * rng->randf();
+					real_t t = Math::TAU * rng->randf();
 					real_t radius = emission_sphere_radius * Math::sqrt(1.0 - s * s);
 					p.transform.origin = Vector3(radius * Math::cos(t), radius * Math::sin(t), emission_sphere_radius * s);
 				} break;
@@ -945,7 +945,7 @@ void CPUParticles3D::_particles_process(double p_delta) {
 					real_t y_pos = rng->randf();
 					real_t skew = MAX(MIN(radius_clamped, top_radius) / MAX(radius_clamped, top_radius), 0.5);
 					y_pos = radius_clamped < top_radius ? Math::pow(y_pos, skew) : 1.0 - Math::pow(y_pos, skew);
-					real_t ring_random_angle = rng->randf() * Math_TAU;
+					real_t ring_random_angle = rng->randf() * Math::TAU;
 					real_t ring_random_radius = Math::sqrt(rng->randf() * (radius_clamped * radius_clamped - emission_ring_inner_radius * emission_ring_inner_radius) + emission_ring_inner_radius * emission_ring_inner_radius);
 					ring_random_radius = Math::lerp(ring_random_radius, ring_random_radius * (top_radius / radius_clamped), y_pos);
 					Vector3 axis = emission_ring_axis == Vector3(0.0, 0.0, 0.0) ? Vector3(0.0, 0.0, 1.0) : emission_ring_axis.normalized();
@@ -1064,7 +1064,7 @@ void CPUParticles3D::_particles_process(double p_delta) {
 			if (particle_flags[PARTICLE_FLAG_DISABLE_Z]) {
 				real_t orbit_amount = tex_orbit_velocity * Math::lerp(parameters_min[PARAM_ORBIT_VELOCITY], parameters_max[PARAM_ORBIT_VELOCITY], rand_from_seed(alt_seed));
 				if (orbit_amount != 0.0) {
-					real_t ang = orbit_amount * local_delta * Math_TAU;
+					real_t ang = orbit_amount * local_delta * Math::TAU;
 					// Not sure why the ParticleProcessMaterial code uses a clockwise rotation matrix,
 					// but we use -ang here to reproduce its behavior.
 					Transform2D rot = Transform2D(-ang, Vector2());
@@ -1126,7 +1126,7 @@ void CPUParticles3D::_particles_process(double p_delta) {
 			tex_hue_variation = curve_parameters[PARAM_HUE_VARIATION]->sample(tv);
 		}
 
-		real_t hue_rot_angle = (tex_hue_variation)*Math_TAU * Math::lerp(parameters_min[PARAM_HUE_VARIATION], parameters_max[PARAM_HUE_VARIATION], p.hue_rot_rand);
+		real_t hue_rot_angle = (tex_hue_variation)*Math::TAU * Math::lerp(parameters_min[PARAM_HUE_VARIATION], parameters_max[PARAM_HUE_VARIATION], p.hue_rot_rand);
 		real_t hue_rot_c = Math::cos(hue_rot_angle);
 		real_t hue_rot_s = Math::sin(hue_rot_angle);
 
diff --git a/engine/scene/3d/cpu_particles_3d.h b/engine/scene/3d/cpu_particles_3d.h
index eba98100..748a0e75 100644
--- a/engine/scene/3d/cpu_particles_3d.h
+++ b/engine/scene/3d/cpu_particles_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CPU_PARTICLES_3D_H
-#define CPU_PARTICLES_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -345,5 +344,3 @@ VARIANT_ENUM_CAST(CPUParticles3D::DrawOrder)
 VARIANT_ENUM_CAST(CPUParticles3D::Parameter)
 VARIANT_ENUM_CAST(CPUParticles3D::ParticleFlags)
 VARIANT_ENUM_CAST(CPUParticles3D::EmissionShape)
-
-#endif // CPU_PARTICLES_3D_H
diff --git a/engine/scene/3d/decal.cpp b/engine/scene/3d/decal.cpp
index 82d72f87..0e2dce74 100644
--- a/engine/scene/3d/decal.cpp
+++ b/engine/scene/3d/decal.cpp
@@ -179,7 +179,7 @@ void Decal::_validate_property(PropertyInfo &p_property) const {
 PackedStringArray Decal::get_configuration_warnings() const {
 	PackedStringArray warnings = VisualInstance3D::get_configuration_warnings();
 
-	if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+	if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "dummy") {
 		warnings.push_back(RTR("Decals are only available when using the Forward+ or Mobile renderers."));
 		return warnings;
 	}
diff --git a/engine/scene/3d/decal.h b/engine/scene/3d/decal.h
index 171b5281..e9e16fd1 100644
--- a/engine/scene/3d/decal.h
+++ b/engine/scene/3d/decal.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DECAL_H
-#define DECAL_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -114,5 +113,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(Decal::DecalTexture);
-
-#endif // DECAL_H
diff --git a/engine/scene/3d/fog_volume.h b/engine/scene/3d/fog_volume.h
index 9052ad77..5a9e3348 100644
--- a/engine/scene/3d/fog_volume.h
+++ b/engine/scene/3d/fog_volume.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FOG_VOLUME_H
-#define FOG_VOLUME_H
+#pragma once
 
 #include "core/templates/rid.h"
 #include "scene/3d/visual_instance_3d.h"
@@ -69,5 +68,3 @@ public:
 	FogVolume();
 	~FogVolume();
 };
-
-#endif // FOG_VOLUME_H
diff --git a/engine/scene/3d/gpu_particles_3d.cpp b/engine/scene/3d/gpu_particles_3d.cpp
index 4ae2ca3f..4ed17df0 100644
--- a/engine/scene/3d/gpu_particles_3d.cpp
+++ b/engine/scene/3d/gpu_particles_3d.cpp
@@ -421,12 +421,12 @@ PackedStringArray GPUParticles3D::get_configuration_warnings() const {
 		if ((dp_count || skin.is_valid()) && (missing_trails || no_materials)) {
 			warnings.push_back(RTR("Trails enabled, but one or more mesh materials are either missing or not set for trails rendering."));
 		}
-		if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+		if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "dummy") {
 			warnings.push_back(RTR("Particle trails are only available when using the Forward+ or Mobile renderers."));
 		}
 	}
 
-	if (sub_emitter != NodePath() && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+	if (sub_emitter != NodePath() && (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "dummy")) {
 		warnings.push_back(RTR("Particle sub-emitters are only available when using the Forward+ or Mobile renderers."));
 	}
 
diff --git a/engine/scene/3d/gpu_particles_3d.h b/engine/scene/3d/gpu_particles_3d.h
index 999bb250..d76fc4c6 100644
--- a/engine/scene/3d/gpu_particles_3d.h
+++ b/engine/scene/3d/gpu_particles_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GPU_PARTICLES_3D_H
-#define GPU_PARTICLES_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/3d/skin.h"
@@ -211,5 +210,3 @@ public:
 VARIANT_ENUM_CAST(GPUParticles3D::DrawOrder)
 VARIANT_ENUM_CAST(GPUParticles3D::TransformAlign)
 VARIANT_ENUM_CAST(GPUParticles3D::EmitFlags)
-
-#endif // GPU_PARTICLES_3D_H
diff --git a/engine/scene/3d/gpu_particles_collision_3d.h b/engine/scene/3d/gpu_particles_collision_3d.h
index 3a21851f..59636bce 100644
--- a/engine/scene/3d/gpu_particles_collision_3d.h
+++ b/engine/scene/3d/gpu_particles_collision_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GPU_PARTICLES_COLLISION_3D_H
-#define GPU_PARTICLES_COLLISION_3D_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/3d/visual_instance_3d.h"
@@ -364,5 +363,3 @@ public:
 	GPUParticlesAttractorVectorField3D();
 	~GPUParticlesAttractorVectorField3D();
 };
-
-#endif // GPU_PARTICLES_COLLISION_3D_H
diff --git a/engine/scene/3d/importer_mesh_instance_3d.h b/engine/scene/3d/importer_mesh_instance_3d.h
index 481fb79a..f5ca8345 100644
--- a/engine/scene/3d/importer_mesh_instance_3d.h
+++ b/engine/scene/3d/importer_mesh_instance_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMPORTER_MESH_INSTANCE_3D_H
-#define IMPORTER_MESH_INSTANCE_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/3d/visual_instance_3d.h"
@@ -89,5 +88,3 @@ public:
 	void set_visibility_range_fade_mode(GeometryInstance3D::VisibilityRangeFadeMode p_mode);
 	GeometryInstance3D::VisibilityRangeFadeMode get_visibility_range_fade_mode() const;
 };
-
-#endif // IMPORTER_MESH_INSTANCE_3D_H
diff --git a/engine/scene/3d/label_3d.cpp b/engine/scene/3d/label_3d.cpp
index 0c55cde2..e8738bb0 100644
--- a/engine/scene/3d/label_3d.cpp
+++ b/engine/scene/3d/label_3d.cpp
@@ -86,6 +86,9 @@ void Label3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_autowrap_mode", "autowrap_mode"), &Label3D::set_autowrap_mode);
 	ClassDB::bind_method(D_METHOD("get_autowrap_mode"), &Label3D::get_autowrap_mode);
 
+	ClassDB::bind_method(D_METHOD("set_autowrap_trim_flags", "autowrap_trim_flags"), &Label3D::set_autowrap_trim_flags);
+	ClassDB::bind_method(D_METHOD("get_autowrap_trim_flags"), &Label3D::get_autowrap_trim_flags);
+
 	ClassDB::bind_method(D_METHOD("set_justification_flags", "justification_flags"), &Label3D::set_justification_flags);
 	ClassDB::bind_method(D_METHOD("get_justification_flags"), &Label3D::get_justification_flags);
 
@@ -154,6 +157,7 @@ void Label3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "uppercase"), "set_uppercase", "is_uppercase");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "line_spacing", PROPERTY_HINT_NONE, "suffix:px"), "set_line_spacing", "get_line_spacing");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_mode", PROPERTY_HINT_ENUM, "Off,Arbitrary,Word,Word (Smart)"), "set_autowrap_mode", "get_autowrap_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_trim_flags", PROPERTY_HINT_FLAGS, vformat("Trim Spaces After Break:%d,Trim Spaces Before Break:%d", TextServer::BREAK_TRIM_START_EDGE_SPACES, TextServer::BREAK_TRIM_END_EDGE_SPACES)), "set_autowrap_trim_flags", "get_autowrap_trim_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "justification_flags", PROPERTY_HINT_FLAGS, "Kashida Justification:1,Word Justification:2,Justify Only After Last Tab:8,Skip Last Line:32,Skip Last Line With Visible Characters:64,Do Not Skip Single Line:128"), "set_justification_flags", "get_justification_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "width", PROPERTY_HINT_NONE, "suffix:px"), "set_width", "get_width");
 
@@ -519,7 +523,7 @@ void Label3D::_shape() {
 			case TextServer::AUTOWRAP_OFF:
 				break;
 		}
-		autowrap_flags = autowrap_flags | TextServer::BREAK_TRIM_EDGE_SPACES;
+		autowrap_flags = autowrap_flags | autowrap_flags_trim;
 
 		PackedInt32Array line_breaks = TS->shaped_text_get_line_breaks(text_rid, width, 0, autowrap_flags);
 		float max_line_w = 0.0;
@@ -891,6 +895,18 @@ TextServer::AutowrapMode Label3D::get_autowrap_mode() const {
 	return autowrap_mode;
 }
 
+void Label3D::set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags) {
+	if (autowrap_flags_trim != (p_flags & TextServer::BREAK_TRIM_MASK)) {
+		autowrap_flags_trim = (p_flags & TextServer::BREAK_TRIM_MASK);
+		dirty_lines = true;
+		_queue_update();
+	}
+}
+
+BitField<TextServer::LineBreakFlag> Label3D::get_autowrap_trim_flags() const {
+	return autowrap_flags_trim;
+}
+
 void Label3D::set_justification_flags(BitField<TextServer::JustificationFlag> p_flags) {
 	if (jst_flags != p_flags) {
 		jst_flags = p_flags;
diff --git a/engine/scene/3d/label_3d.h b/engine/scene/3d/label_3d.h
index 01281f29..a27f6d62 100644
--- a/engine/scene/3d/label_3d.h
+++ b/engine/scene/3d/label_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LABEL_3D_H
-#define LABEL_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/font.h"
@@ -112,6 +111,7 @@ private:
 	bool uppercase = false;
 
 	TextServer::AutowrapMode autowrap_mode = TextServer::AUTOWRAP_OFF;
+	BitField<TextServer::LineBreakFlag> autowrap_flags_trim = TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES;
 	BitField<TextServer::JustificationFlag> jst_flags = TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_SKIP_LAST_LINE | TextServer::JUSTIFICATION_DO_NOT_SKIP_SINGLE_LINE;
 	float width = 500.0;
 
@@ -216,6 +216,9 @@ public:
 	void set_autowrap_mode(TextServer::AutowrapMode p_mode);
 	TextServer::AutowrapMode get_autowrap_mode() const;
 
+	void set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags);
+	BitField<TextServer::LineBreakFlag> get_autowrap_trim_flags() const;
+
 	void set_justification_flags(BitField<TextServer::JustificationFlag> p_flags);
 	BitField<TextServer::JustificationFlag> get_justification_flags() const;
 
@@ -261,5 +264,3 @@ public:
 
 VARIANT_ENUM_CAST(Label3D::DrawFlags);
 VARIANT_ENUM_CAST(Label3D::AlphaCutMode);
-
-#endif // LABEL_3D_H
diff --git a/engine/scene/3d/light_3d.cpp b/engine/scene/3d/light_3d.cpp
index f4e7815e..b3808cd0 100644
--- a/engine/scene/3d/light_3d.cpp
+++ b/engine/scene/3d/light_3d.cpp
@@ -166,7 +166,7 @@ AABB Light3D::get_aabb() const {
 		real_t cone_slant_height = param[PARAM_RANGE];
 		real_t cone_angle_rad = Math::deg_to_rad(param[PARAM_SPOT_ANGLE]);
 
-		if (cone_angle_rad > Math_PI / 2.0) {
+		if (cone_angle_rad > Math::PI / 2.0) {
 			// Just return the AABB of an omni light if the spot angle is above 90 degrees.
 			return AABB(Vector3(-1, -1, -1) * cone_slant_height, Vector3(2, 2, 2) * cone_slant_height);
 		}
@@ -632,7 +632,7 @@ PackedStringArray OmniLight3D::get_configuration_warnings() const {
 		warnings.push_back(RTR("Projector texture only works with shadows active."));
 	}
 
-	if (get_projector().is_valid() && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+	if (get_projector().is_valid() && (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "dummy")) {
 		warnings.push_back(RTR("Projector textures are not supported when using the Compatibility renderer yet. Support will be added in a future release."));
 	}
 
@@ -668,7 +668,7 @@ PackedStringArray SpotLight3D::get_configuration_warnings() const {
 		warnings.push_back(RTR("Projector texture only works with shadows active."));
 	}
 
-	if (get_projector().is_valid() && OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
+	if (get_projector().is_valid() && (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility" || OS::get_singleton()->get_current_rendering_method() == "dummy")) {
 		warnings.push_back(RTR("Projector textures are not supported when using the Compatibility renderer yet. Support will be added in a future release."));
 	}
 
diff --git a/engine/scene/3d/light_3d.h b/engine/scene/3d/light_3d.h
index 5f549469..d412350c 100644
--- a/engine/scene/3d/light_3d.h
+++ b/engine/scene/3d/light_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_3D_H
-#define LIGHT_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -239,5 +238,3 @@ public:
 
 	SpotLight3D();
 };
-
-#endif // LIGHT_3D_H
diff --git a/engine/scene/3d/lightmap_gi.cpp b/engine/scene/3d/lightmap_gi.cpp
index 8f21260d..bef73537 100644
--- a/engine/scene/3d/lightmap_gi.cpp
+++ b/engine/scene/3d/lightmap_gi.cpp
@@ -293,8 +293,7 @@ Dictionary LightmapGIData::_get_probe_data() const {
 
 #ifndef DISABLE_DEPRECATED
 void LightmapGIData::set_light_texture(const Ref<TextureLayered> &p_light_texture) {
-	TypedArray<TextureLayered> arr;
-	arr.append(p_light_texture);
+	TypedArray<TextureLayered> arr = { p_light_texture };
 	set_lightmap_textures(arr);
 }
 
@@ -699,7 +698,7 @@ int32_t LightmapGI::_compute_bsp_tree(const Vector<Vector3> &p_points, const Loc
 	BSPNode node;
 	node.plane = best_plane;
 
-	if (indices_under.size() == 0) {
+	if (indices_under.is_empty()) {
 		//nothing to do here
 		node.under = BSPNode::EMPTY_LEAF;
 	} else if (indices_under.size() == 1) {
@@ -708,7 +707,7 @@ int32_t LightmapGI::_compute_bsp_tree(const Vector<Vector3> &p_points, const Loc
 		node.under = _compute_bsp_tree(p_points, p_planes, planes_tested, p_simplices, indices_under, bsp_nodes);
 	}
 
-	if (indices_over.size() == 0) {
+	if (indices_over.is_empty()) {
 		//nothing to do here
 		node.over = BSPNode::EMPTY_LEAF;
 	} else if (indices_over.size() == 1) {
@@ -917,7 +916,7 @@ LightmapGI::BakeError LightmapGI::bake(Node *p_from_node, String p_image_data_pa
 		Vector<MeshesFound> meshes_found;
 		_find_meshes_and_lights(p_from_node ? p_from_node : get_parent(), meshes_found, lights_found, probes_found);
 
-		if (meshes_found.size() == 0) {
+		if (meshes_found.is_empty()) {
 			return BAKE_ERROR_NO_MESHES;
 		}
 		// create mesh data for insert
@@ -1024,8 +1023,8 @@ LightmapGI::BakeError LightmapGI::bake(Node *p_from_node, String p_image_data_pa
 				const Vector3 *nr = nullptr;
 				Vector<int> index = a[Mesh::ARRAY_INDEX];
 
-				ERR_CONTINUE(uv.size() == 0);
-				ERR_CONTINUE(normals.size() == 0);
+				ERR_CONTINUE(uv.is_empty());
+				ERR_CONTINUE(normals.is_empty());
 
 				uvr = uv.ptr();
 				nr = normals.ptr();
@@ -1194,13 +1193,13 @@ LightmapGI::BakeError LightmapGI::bake(Node *p_from_node, String p_image_data_pa
 			} else if (Object::cast_to<OmniLight3D>(light)) {
 				OmniLight3D *l = Object::cast_to<OmniLight3D>(light);
 				if (use_physical_light_units) {
-					energy *= (1.0 / (Math_PI * 4.0));
+					energy *= (1.0 / (Math::PI * 4.0));
 				}
 				lightmapper->add_omni_light(light->get_name(), light->get_bake_mode() == Light3D::BAKE_STATIC, xf.origin, linear_color, energy, indirect_energy, l->get_param(Light3D::PARAM_RANGE), l->get_param(Light3D::PARAM_ATTENUATION), l->get_param(Light3D::PARAM_SIZE), l->get_param(Light3D::PARAM_SHADOW_BLUR));
 			} else if (Object::cast_to<SpotLight3D>(light)) {
 				SpotLight3D *l = Object::cast_to<SpotLight3D>(light);
 				if (use_physical_light_units) {
-					energy *= (1.0 / Math_PI);
+					energy *= (1.0 / Math::PI);
 				}
 				lightmapper->add_spot_light(light->get_name(), light->get_bake_mode() == Light3D::BAKE_STATIC, xf.origin, -xf.basis.get_column(Vector3::AXIS_Z).normalized(), linear_color, energy, indirect_energy, l->get_param(Light3D::PARAM_RANGE), l->get_param(Light3D::PARAM_ATTENUATION), l->get_param(Light3D::PARAM_SPOT_ANGLE), l->get_param(Light3D::PARAM_SPOT_ATTENUATION), l->get_param(Light3D::PARAM_SIZE), l->get_param(Light3D::PARAM_SHADOW_BLUR));
 			}
diff --git a/engine/scene/3d/lightmap_gi.h b/engine/scene/3d/lightmap_gi.h
index 0848239f..9249eead 100644
--- a/engine/scene/3d/lightmap_gi.h
+++ b/engine/scene/3d/lightmap_gi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAP_GI_H
-#define LIGHTMAP_GI_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/3d/light_3d.h"
@@ -361,5 +360,3 @@ VARIANT_ENUM_CAST(LightmapGI::BakeQuality);
 VARIANT_ENUM_CAST(LightmapGI::GenerateProbes);
 VARIANT_ENUM_CAST(LightmapGI::BakeError);
 VARIANT_ENUM_CAST(LightmapGI::EnvironmentMode);
-
-#endif // LIGHTMAP_GI_H
diff --git a/engine/scene/3d/lightmap_probe.h b/engine/scene/3d/lightmap_probe.h
index 7b16e147..da2c9eb8 100644
--- a/engine/scene/3d/lightmap_probe.h
+++ b/engine/scene/3d/lightmap_probe.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAP_PROBE_H
-#define LIGHTMAP_PROBE_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -38,5 +37,3 @@ class LightmapProbe : public Node3D {
 public:
 	LightmapProbe();
 };
-
-#endif // LIGHTMAP_PROBE_H
diff --git a/engine/scene/3d/lightmapper.h b/engine/scene/3d/lightmapper.h
index 46858873..99c1edc8 100644
--- a/engine/scene/3d/lightmapper.h
+++ b/engine/scene/3d/lightmapper.h
@@ -28,23 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHTMAPPER_H
-#define LIGHTMAPPER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
 class Image;
 
-#if !defined(__aligned)
-
-#if defined(_WIN32) && defined(_MSC_VER)
-#define __aligned(...) __declspec(align(__VA_ARGS__))
-#else
-#define __aligned(...) __attribute__((aligned(__VA_ARGS__)))
-#endif
-
-#endif
-
 class LightmapDenoiser : public RefCounted {
 	GDCLASS(LightmapDenoiser, RefCounted)
 protected:
@@ -62,7 +51,7 @@ protected:
 
 public:
 	// Compatible with embree4 rays.
-	struct __aligned(16) Ray {
+	struct alignas(16) Ray {
 		const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h
 
 		/*! Default construction does nothing. */
@@ -74,7 +63,7 @@ public:
 		_FORCE_INLINE_ Ray(const Vector3 &p_org,
 				const Vector3 &p_dir,
 				float p_tnear = 0.0f,
-				float p_tfar = INFINITY) :
+				float p_tfar = Math::INF) :
 				org(p_org),
 				tnear(p_tnear),
 				dir(p_dir),
@@ -200,5 +189,3 @@ public:
 
 	Lightmapper();
 };
-
-#endif // LIGHTMAPPER_H
diff --git a/engine/scene/3d/look_at_modifier_3d.cpp b/engine/scene/3d/look_at_modifier_3d.cpp
index 24a9e6fe..2ed06551 100644
--- a/engine/scene/3d/look_at_modifier_3d.cpp
+++ b/engine/scene/3d/look_at_modifier_3d.cpp
@@ -487,7 +487,7 @@ void LookAtModifier3D::_bind_methods() {
 	BIND_ENUM_CONSTANT(ORIGIN_FROM_EXTERNAL_NODE);
 }
 
-void LookAtModifier3D::_process_modification() {
+void LookAtModifier3D::_process_modification(double p_delta) {
 	if (!is_inside_tree()) {
 		return;
 	}
@@ -502,10 +502,10 @@ void LookAtModifier3D::_process_modification() {
 	int parent_bone = skeleton->get_bone_parent(bone);
 	if (parent_bone < 0) {
 		bone_rest_space = skeleton->get_global_transform();
-		bone_rest_space.origin += skeleton->get_bone_rest(bone).origin;
+		bone_rest_space.translate_local(skeleton->get_bone_rest(bone).origin);
 	} else {
 		bone_rest_space = skeleton->get_global_transform() * skeleton->get_bone_global_pose(parent_bone);
-		bone_rest_space.origin += skeleton->get_bone_rest(bone).origin;
+		bone_rest_space.translate_local(skeleton->get_bone_rest(bone).origin);
 	}
 
 	// Calculate forward_vector and destination.
@@ -554,13 +554,13 @@ void LookAtModifier3D::_process_modification() {
 		Vector3 prev_forward_vector_nrm = forward_vector.normalized();
 		Vector3 rest_forward_vector = get_vector_from_bone_axis(forward_axis);
 		if (symmetry_limitation) {
-			if ((is_not_max_influence || !Math::is_equal_approx(primary_limit_angle, (float)Math_TAU)) &&
+			if ((is_not_max_influence || !Math::is_equal_approx(primary_limit_angle, (float)Math::TAU)) &&
 					prev_forward_vector_nrm.dot(rest_forward_vector) < 0 &&
 					forward_vector_nrm.dot(rest_forward_vector) < 0) {
 				init_transition();
 			}
 		} else {
-			if ((is_not_max_influence || !Math::is_equal_approx(primary_positive_limit_angle + primary_negative_limit_angle, (float)Math_TAU)) &&
+			if ((is_not_max_influence || !Math::is_equal_approx(primary_positive_limit_angle + primary_negative_limit_angle, (float)Math::TAU)) &&
 					prev_forward_vector_nrm.dot(rest_forward_vector) < 0 &&
 					forward_vector_nrm.dot(rest_forward_vector) < 0) {
 				init_transition();
@@ -570,13 +570,7 @@ void LookAtModifier3D::_process_modification() {
 
 	// Do time-based interpolation.
 	if (remaining > 0) {
-		double delta = 0.0;
-		if (skeleton->get_modifier_callback_mode_process() == Skeleton3D::MODIFIER_CALLBACK_MODE_PROCESS_IDLE) {
-			delta = get_process_delta_time();
-		} else {
-			delta = get_physics_process_delta_time();
-		}
-		remaining = MAX(0, remaining - time_step * delta);
+		remaining = MAX(0, remaining - time_step * p_delta);
 		if (is_flippable) {
 			// Interpolate through the rest same as AnimationTree blending for preventing to penetrate the bone into the body.
 			Quaternion rest = skeleton->get_bone_rest(bone).basis.get_rotation_quaternion();
@@ -666,7 +660,7 @@ float LookAtModifier3D::remap_damped(float p_from, float p_to, float p_damp_thre
 		return sign * CLAMP(abs_value, p_from, p_to);
 	}
 
-	double limit = Math_PI;
+	double limit = Math::PI;
 	double inv_to = 1.0 / p_to;
 	double end_x = limit * inv_to;
 	double position = abs_value * inv_to;
diff --git a/engine/scene/3d/look_at_modifier_3d.h b/engine/scene/3d/look_at_modifier_3d.h
index 7f824e1e..f56cdfa5 100644
--- a/engine/scene/3d/look_at_modifier_3d.h
+++ b/engine/scene/3d/look_at_modifier_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LOOK_AT_MODIFIER_3D_H
-#define LOOK_AT_MODIFIER_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
 #include "scene/animation/tween.h"
@@ -72,18 +71,18 @@ private:
 	bool use_angle_limitation = false;
 	bool symmetry_limitation = true;
 
-	float primary_limit_angle = Math_TAU;
+	float primary_limit_angle = Math::TAU;
 	float primary_damp_threshold = 1.0f;
-	float primary_positive_limit_angle = Math_PI;
+	float primary_positive_limit_angle = Math::PI;
 	float primary_positive_damp_threshold = 1.0f;
-	float primary_negative_limit_angle = Math_PI;
+	float primary_negative_limit_angle = Math::PI;
 	float primary_negative_damp_threshold = 1.0f;
 
-	float secondary_limit_angle = Math_TAU;
+	float secondary_limit_angle = Math::TAU;
 	float secondary_damp_threshold = 1.0f;
-	float secondary_positive_limit_angle = Math_PI;
+	float secondary_positive_limit_angle = Math::PI;
 	float secondary_positive_damp_threshold = 1.0f;
-	float secondary_negative_limit_angle = Math_PI;
+	float secondary_negative_limit_angle = Math::PI;
 	float secondary_negative_damp_threshold = 1.0f;
 
 	bool is_within_limitations = false;
@@ -108,7 +107,7 @@ protected:
 
 	static void _bind_methods();
 
-	virtual void _process_modification() override;
+	virtual void _process_modification(double p_delta) override;
 
 public:
 	void set_bone_name(const String &p_bone_name);
@@ -190,5 +189,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(LookAtModifier3D::OriginFrom);
-
-#endif // LOOK_AT_MODIFIER_3D_H
diff --git a/engine/scene/3d/marker_3d.h b/engine/scene/3d/marker_3d.h
index af28c289..10aa49e4 100644
--- a/engine/scene/3d/marker_3d.h
+++ b/engine/scene/3d/marker_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MARKER_3D_H
-#define MARKER_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -47,5 +46,3 @@ public:
 
 	Marker3D();
 };
-
-#endif // MARKER_3D_H
diff --git a/engine/scene/3d/mesh_instance_3d.cpp b/engine/scene/3d/mesh_instance_3d.cpp
index 0157e864..8e68e8fc 100644
--- a/engine/scene/3d/mesh_instance_3d.cpp
+++ b/engine/scene/3d/mesh_instance_3d.cpp
@@ -30,18 +30,23 @@
 
 #include "mesh_instance_3d.h"
 
+#include "scene/3d/skeleton_3d.h"
+
+#ifndef PHYSICS_3D_DISABLED
 #include "scene/3d/physics/collision_shape_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
-#include "scene/3d/skeleton_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef NAVIGATION_3D_DISABLED
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_server_3d.h"
 
 Callable MeshInstance3D::_navmesh_source_geometry_parsing_callback;
 RID MeshInstance3D::_navmesh_source_geometry_parser;
+#endif // NAVIGATION_3D_DISABLED
 
 bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) {
 	//this is not _too_ bad performance wise, really. it only arrives here if the property was not set anywhere else.
@@ -230,6 +235,7 @@ AABB MeshInstance3D::get_aabb() const {
 	return AABB();
 }
 
+#ifndef PHYSICS_3D_DISABLED
 Node *MeshInstance3D::create_trimesh_collision_node() {
 	if (mesh.is_null()) {
 		return nullptr;
@@ -331,6 +337,7 @@ void MeshInstance3D::create_multiple_convex_collisions(const Ref<MeshConvexDecom
 		}
 	}
 }
+#endif // PHYSICS_3D_DISABLED
 
 void MeshInstance3D::_notification(int p_what) {
 	switch (p_what) {
@@ -430,11 +437,11 @@ MeshInstance3D *MeshInstance3D::create_debug_tangents_node() {
 
 		Vector<Vector3> verts = arrays[Mesh::ARRAY_VERTEX];
 		Vector<Vector3> norms = arrays[Mesh::ARRAY_NORMAL];
-		if (norms.size() == 0) {
+		if (norms.is_empty()) {
 			continue;
 		}
 		Vector<float> tangents = arrays[Mesh::ARRAY_TANGENT];
-		if (tangents.size() == 0) {
+		if (tangents.is_empty()) {
 			continue;
 		}
 
@@ -849,6 +856,7 @@ Ref<TriangleMesh> MeshInstance3D::generate_triangle_mesh() const {
 	return Ref<TriangleMesh>();
 }
 
+#ifndef NAVIGATION_3D_DISABLED
 void MeshInstance3D::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -874,6 +882,7 @@ void MeshInstance3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_
 		}
 	}
 }
+#endif // NAVIGATION_3D_DISABLED
 
 void MeshInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_mesh", "mesh"), &MeshInstance3D::set_mesh);
@@ -889,12 +898,14 @@ void MeshInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_surface_override_material", "surface"), &MeshInstance3D::get_surface_override_material);
 	ClassDB::bind_method(D_METHOD("get_active_material", "surface"), &MeshInstance3D::get_active_material);
 
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("create_trimesh_collision"), &MeshInstance3D::create_trimesh_collision);
 	ClassDB::set_method_flags("MeshInstance3D", "create_trimesh_collision", METHOD_FLAGS_DEFAULT);
 	ClassDB::bind_method(D_METHOD("create_convex_collision", "clean", "simplify"), &MeshInstance3D::create_convex_collision, DEFVAL(true), DEFVAL(false));
 	ClassDB::set_method_flags("MeshInstance3D", "create_convex_collision", METHOD_FLAGS_DEFAULT);
 	ClassDB::bind_method(D_METHOD("create_multiple_convex_collisions", "settings"), &MeshInstance3D::create_multiple_convex_collisions, DEFVAL(Ref<MeshConvexDecompositionSettings>()));
 	ClassDB::set_method_flags("MeshInstance3D", "create_multiple_convex_collisions", METHOD_FLAGS_DEFAULT);
+#endif // PHYSICS_3D_DISABLED
 
 	ClassDB::bind_method(D_METHOD("get_blend_shape_count"), &MeshInstance3D::get_blend_shape_count);
 	ClassDB::bind_method(D_METHOD("find_blend_shape_by_name", "name"), &MeshInstance3D::find_blend_shape_by_name);
diff --git a/engine/scene/3d/mesh_instance_3d.h b/engine/scene/3d/mesh_instance_3d.h
index 7e58d837..28ca664a 100644
--- a/engine/scene/3d/mesh_instance_3d.h
+++ b/engine/scene/3d/mesh_instance_3d.h
@@ -28,14 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_INSTANCE_3D_H
-#define MESH_INSTANCE_3D_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/3d/visual_instance_3d.h"
 
+#ifndef NAVIGATION_3D_DISABLED
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
+#endif // NAVIGATION_3D_DISABLED
 class Skin;
 class SkinReference;
 
@@ -90,6 +91,7 @@ public:
 	Ref<Material> get_surface_override_material(int p_surface) const;
 	Ref<Material> get_active_material(int p_surface) const;
 
+#ifndef PHYSICS_3D_DISABLED
 	Node *create_trimesh_collision_node();
 	void create_trimesh_collision();
 
@@ -98,6 +100,7 @@ public:
 
 	Node *create_multiple_convex_collisions_node(const Ref<MeshConvexDecompositionSettings> &p_settings = Ref<MeshConvexDecompositionSettings>());
 	void create_multiple_convex_collisions(const Ref<MeshConvexDecompositionSettings> &p_settings = Ref<MeshConvexDecompositionSettings>());
+#endif // PHYSICS_3D_DISABLED
 
 	MeshInstance3D *create_debug_tangents_node();
 	void create_debug_tangents();
@@ -109,16 +112,18 @@ public:
 
 	virtual Ref<TriangleMesh> generate_triangle_mesh() const override;
 
+#ifndef NAVIGATION_3D_DISABLED
 private:
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
+#endif // NAVIGATION_3D_DISABLED
 
 public:
+#ifndef NAVIGATION_3D_DISABLED
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_3D_DISABLED
 
 	MeshInstance3D();
 	~MeshInstance3D();
 };
-
-#endif // MESH_INSTANCE_3D_H
diff --git a/engine/scene/3d/multimesh_instance_3d.cpp b/engine/scene/3d/multimesh_instance_3d.cpp
index c8cc9bb3..abb548fe 100644
--- a/engine/scene/3d/multimesh_instance_3d.cpp
+++ b/engine/scene/3d/multimesh_instance_3d.cpp
@@ -30,12 +30,14 @@
 
 #include "multimesh_instance_3d.h"
 
+#ifndef NAVIGATION_3D_DISABLED
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/navigation_server_3d.h"
 
 Callable MultiMeshInstance3D::_navmesh_source_geometry_parsing_callback;
 RID MultiMeshInstance3D::_navmesh_source_geometry_parser;
+#endif // NAVIGATION_3D_DISABLED
 
 void MultiMeshInstance3D::_refresh_interpolated() {
 	if (is_inside_tree() && multimesh.is_valid()) {
@@ -103,6 +105,7 @@ AABB MultiMeshInstance3D::get_aabb() const {
 	}
 }
 
+#ifndef NAVIGATION_3D_DISABLED
 void MultiMeshInstance3D::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -137,6 +140,7 @@ void MultiMeshInstance3D::navmesh_parse_source_geometry(const Ref<NavigationMesh
 		}
 	}
 }
+#endif // NAVIGATION_3D_DISABLED
 
 MultiMeshInstance3D::MultiMeshInstance3D() {
 }
diff --git a/engine/scene/3d/multimesh_instance_3d.h b/engine/scene/3d/multimesh_instance_3d.h
index 374298da..7dbc06ef 100644
--- a/engine/scene/3d/multimesh_instance_3d.h
+++ b/engine/scene/3d/multimesh_instance_3d.h
@@ -28,14 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIMESH_INSTANCE_3D_H
-#define MULTIMESH_INSTANCE_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/multimesh.h"
 
+#ifndef NAVIGATION_3D_DISABLED
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
+#endif // NAVIGATION_3D_DISABLED
 
 class MultiMeshInstance3D : public GeometryInstance3D {
 	GDCLASS(MultiMeshInstance3D, GeometryInstance3D);
@@ -58,15 +59,17 @@ public:
 	virtual AABB get_aabb() const override;
 
 private:
+#ifndef NAVIGATION_3D_DISABLED
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
+#endif // NAVIGATION_3D_DISABLED
 
 public:
+#ifndef NAVIGATION_3D_DISABLED
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_3D_DISABLED
 
 	MultiMeshInstance3D();
 	~MultiMeshInstance3D();
 };
-
-#endif // MULTIMESH_INSTANCE_3D_H
diff --git a/engine/scene/3d/navigation/SCsub b/engine/scene/3d/navigation/SCsub
new file mode 100644
index 00000000..374dc211
--- /dev/null
+++ b/engine/scene/3d/navigation/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.scene_sources, "*.cpp")
diff --git a/engine/scene/3d/navigation_agent_3d.cpp b/engine/scene/3d/navigation/navigation_agent_3d.cpp
similarity index 99%
rename from engine/scene/3d/navigation_agent_3d.cpp
rename to engine/scene/3d/navigation/navigation_agent_3d.cpp
index fbdb061a..b90c9e47 100644
--- a/engine/scene/3d/navigation_agent_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_agent_3d.cpp
@@ -30,7 +30,7 @@
 
 #include "navigation_agent_3d.h"
 
-#include "scene/3d/navigation_link_3d.h"
+#include "scene/3d/navigation/navigation_link_3d.h"
 #include "servers/navigation_server_3d.h"
 
 void NavigationAgent3D::_bind_methods() {
@@ -658,7 +658,7 @@ Vector3 NavigationAgent3D::get_next_path_position() {
 	_update_navigation();
 
 	const Vector<Vector3> &navigation_path = navigation_result->get_path();
-	if (navigation_path.size() == 0) {
+	if (navigation_path.is_empty()) {
 		ERR_FAIL_NULL_V_MSG(agent_parent, Vector3(), "The agent has no parent.");
 		return agent_parent->get_global_position();
 	} else {
@@ -696,7 +696,7 @@ Vector3 NavigationAgent3D::get_final_position() {
 
 Vector3 NavigationAgent3D::_get_final_position() const {
 	const Vector<Vector3> &navigation_path = navigation_result->get_path();
-	if (navigation_path.size() == 0) {
+	if (navigation_path.is_empty()) {
 		return Vector3();
 	}
 	return navigation_path[navigation_path.size() - 1] - Vector3(0, path_height_offset, 0);
@@ -751,19 +751,18 @@ void NavigationAgent3D::_update_navigation() {
 
 	if (NavigationServer3D::get_singleton()->agent_is_map_changed(agent)) {
 		reload_path = true;
-	} else if (navigation_result->get_path().size() == 0) {
+	} else if (navigation_result->get_path().is_empty()) {
 		reload_path = true;
 	} else {
 		// Check if too far from the navigation path
 		if (navigation_path_index > 0) {
 			const Vector<Vector3> &navigation_path = navigation_result->get_path();
 
-			Vector3 segment[2];
-			segment[0] = navigation_path[navigation_path_index - 1];
-			segment[1] = navigation_path[navigation_path_index];
-			segment[0].y -= path_height_offset;
-			segment[1].y -= path_height_offset;
-			Vector3 p = Geometry3D::get_closest_point_to_segment(origin, segment);
+			Vector3 segment_a = navigation_path[navigation_path_index - 1];
+			Vector3 segment_b = navigation_path[navigation_path_index];
+			segment_a.y -= path_height_offset;
+			segment_b.y -= path_height_offset;
+			Vector3 p = Geometry3D::get_closest_point_to_segment(origin, segment_a, segment_b);
 			if (origin.distance_to(p) >= path_max_distance) {
 				// To faraway, reload path
 				reload_path = true;
@@ -793,7 +792,7 @@ void NavigationAgent3D::_update_navigation() {
 		emit_signal(SNAME("path_changed"));
 	}
 
-	if (navigation_result->get_path().size() == 0) {
+	if (navigation_result->get_path().is_empty()) {
 		return;
 	}
 
diff --git a/engine/scene/3d/navigation_agent_3d.h b/engine/scene/3d/navigation/navigation_agent_3d.h
similarity index 99%
rename from engine/scene/3d/navigation_agent_3d.h
rename to engine/scene/3d/navigation/navigation_agent_3d.h
index d5721a56..e80e61d5 100644
--- a/engine/scene/3d/navigation_agent_3d.h
+++ b/engine/scene/3d/navigation/navigation_agent_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_AGENT_3D_H
-#define NAVIGATION_AGENT_3D_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "servers/navigation/navigation_path_query_parameters_3d.h"
@@ -278,5 +277,3 @@ private:
 	void _update_debug_path();
 #endif // DEBUG_ENABLED
 };
-
-#endif // NAVIGATION_AGENT_3D_H
diff --git a/engine/scene/3d/navigation_link_3d.cpp b/engine/scene/3d/navigation/navigation_link_3d.cpp
similarity index 99%
rename from engine/scene/3d/navigation_link_3d.cpp
rename to engine/scene/3d/navigation/navigation_link_3d.cpp
index 8f9b7a60..dc518ee4 100644
--- a/engine/scene/3d/navigation_link_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_link_3d.cpp
@@ -262,6 +262,12 @@ void NavigationLink3D::_notification(int p_what) {
 		case NOTIFICATION_EXIT_TREE: {
 			_link_exit_navigation_map();
 		} break;
+
+#ifdef DEBUG_ENABLED
+		case NOTIFICATION_VISIBILITY_CHANGED: {
+			_update_debug_mesh();
+		} break;
+#endif // DEBUG_ENABLED
 	}
 }
 
diff --git a/engine/scene/3d/navigation_link_3d.h b/engine/scene/3d/navigation/navigation_link_3d.h
similarity index 97%
rename from engine/scene/3d/navigation_link_3d.h
rename to engine/scene/3d/navigation/navigation_link_3d.h
index e894761f..ff0c3712 100644
--- a/engine/scene/3d/navigation_link_3d.h
+++ b/engine/scene/3d/navigation/navigation_link_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_LINK_3D_H
-#define NAVIGATION_LINK_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -110,5 +109,3 @@ private:
 	void _link_exit_navigation_map();
 	void _link_update_transform();
 };
-
-#endif // NAVIGATION_LINK_3D_H
diff --git a/engine/scene/3d/navigation_obstacle_3d.cpp b/engine/scene/3d/navigation/navigation_obstacle_3d.cpp
similarity index 99%
rename from engine/scene/3d/navigation_obstacle_3d.cpp
rename to engine/scene/3d/navigation/navigation_obstacle_3d.cpp
index 161b837f..da158706 100644
--- a/engine/scene/3d/navigation_obstacle_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_obstacle_3d.cpp
@@ -464,7 +464,7 @@ void NavigationObstacle3D::navmesh_parse_source_geometry(const Ref<NavigationMes
 
 		obstruction_circle_vertices.resize(circle_points);
 		Vector3 *circle_vertices_ptrw = obstruction_circle_vertices.ptrw();
-		const real_t circle_point_step = Math_TAU / circle_points;
+		const real_t circle_point_step = Math::TAU / circle_points;
 
 		for (int i = 0; i < circle_points; i++) {
 			const float angle = i * circle_point_step;
@@ -581,15 +581,15 @@ void NavigationObstacle3D::_update_fake_agent_radius_debug() {
 		float w;
 
 		v /= (rings + 1);
-		w = sin(Math_PI * v);
-		y = (radius)*cos(Math_PI * v);
+		w = sin(Math::PI * v);
+		y = (radius)*cos(Math::PI * v);
 
 		for (i = 0; i <= radial_segments; i++) {
 			float u = i;
 			u /= radial_segments;
 
-			x = sin(u * Math_TAU);
-			z = cos(u * Math_TAU);
+			x = sin(u * Math::TAU);
+			z = cos(u * Math::TAU);
 
 			Vector3 p = Vector3(x * radius * w, y, z * radius * w);
 			face_vertex_array.push_back(p);
diff --git a/engine/scene/3d/navigation_obstacle_3d.h b/engine/scene/3d/navigation/navigation_obstacle_3d.h
similarity index 98%
rename from engine/scene/3d/navigation_obstacle_3d.h
rename to engine/scene/3d/navigation/navigation_obstacle_3d.h
index 9733a9dd..b7dadd0c 100644
--- a/engine/scene/3d/navigation_obstacle_3d.h
+++ b/engine/scene/3d/navigation/navigation_obstacle_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_OBSTACLE_3D_H
-#define NAVIGATION_OBSTACLE_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -141,5 +140,3 @@ private:
 	void _update_transform();
 	void _update_use_3d_avoidance(bool p_use_3d_avoidance);
 };
-
-#endif // NAVIGATION_OBSTACLE_3D_H
diff --git a/engine/scene/3d/navigation_region_3d.cpp b/engine/scene/3d/navigation/navigation_region_3d.cpp
similarity index 98%
rename from engine/scene/3d/navigation_region_3d.cpp
rename to engine/scene/3d/navigation/navigation_region_3d.cpp
index 34be901e..94d89721 100644
--- a/engine/scene/3d/navigation_region_3d.cpp
+++ b/engine/scene/3d/navigation/navigation_region_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "navigation_region_3d.h"
 
+#include "core/math/random_pcg.h"
 #include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
 #include "servers/navigation_server_3d.h"
 
@@ -193,30 +194,7 @@ void NavigationRegion3D::set_navigation_mesh(const Ref<NavigationMesh> &p_naviga
 		navigation_mesh->connect_changed(callable_mp(this, &NavigationRegion3D::_navigation_mesh_changed));
 	}
 
-	_update_bounds();
-
-	NavigationServer3D::get_singleton()->region_set_navigation_mesh(region, p_navigation_mesh);
-
-#ifdef DEBUG_ENABLED
-	if (is_inside_tree() && NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {
-		if (navigation_mesh.is_valid()) {
-			_update_debug_mesh();
-			_update_debug_edge_connections_mesh();
-		} else {
-			if (debug_instance.is_valid()) {
-				RS::get_singleton()->instance_set_visible(debug_instance, false);
-			}
-			if (debug_edge_connections_instance.is_valid()) {
-				RS::get_singleton()->instance_set_visible(debug_edge_connections_instance, false);
-			}
-		}
-	}
-#endif // DEBUG_ENABLED
-
-	emit_signal(SNAME("navigation_mesh_changed"));
-
-	update_gizmos();
-	update_configuration_warnings();
+	_navigation_mesh_changed();
 }
 
 Ref<NavigationMesh> NavigationRegion3D::get_navigation_mesh() const {
@@ -252,19 +230,18 @@ void NavigationRegion3D::bake_navigation_mesh(bool p_on_thread) {
 	NavigationServer3D::get_singleton()->parse_source_geometry_data(navigation_mesh, source_geometry_data, this);
 
 	if (p_on_thread) {
-		NavigationServer3D::get_singleton()->bake_from_source_geometry_data_async(navigation_mesh, source_geometry_data, callable_mp(this, &NavigationRegion3D::_bake_finished).bind(navigation_mesh));
+		NavigationServer3D::get_singleton()->bake_from_source_geometry_data_async(navigation_mesh, source_geometry_data, callable_mp(this, &NavigationRegion3D::_bake_finished));
 	} else {
-		NavigationServer3D::get_singleton()->bake_from_source_geometry_data(navigation_mesh, source_geometry_data, callable_mp(this, &NavigationRegion3D::_bake_finished).bind(navigation_mesh));
+		NavigationServer3D::get_singleton()->bake_from_source_geometry_data(navigation_mesh, source_geometry_data, callable_mp(this, &NavigationRegion3D::_bake_finished));
 	}
 }
 
-void NavigationRegion3D::_bake_finished(Ref<NavigationMesh> p_navigation_mesh) {
+void NavigationRegion3D::_bake_finished() {
 	if (!Thread::is_main_thread()) {
-		callable_mp(this, &NavigationRegion3D::_bake_finished).call_deferred(p_navigation_mesh);
+		callable_mp(this, &NavigationRegion3D::_bake_finished).call_deferred();
 		return;
 	}
 
-	set_navigation_mesh(p_navigation_mesh);
 	emit_signal(SNAME("bake_finished"));
 }
 
@@ -349,12 +326,32 @@ bool NavigationRegion3D::_get(const StringName &p_name, Variant &r_ret) const {
 #endif // DISABLE_DEPRECATED
 
 void NavigationRegion3D::_navigation_mesh_changed() {
-	update_gizmos();
-	update_configuration_warnings();
+	_update_bounds();
+
+	NavigationServer3D::get_singleton()->region_set_navigation_mesh(region, navigation_mesh);
 
 #ifdef DEBUG_ENABLED
+	if (is_inside_tree() && NavigationServer3D::get_singleton()->get_debug_navigation_enabled()) {
+		if (navigation_mesh.is_valid()) {
+			_update_debug_mesh();
+			_update_debug_edge_connections_mesh();
+		} else {
+			if (debug_instance.is_valid()) {
+				RS::get_singleton()->instance_set_visible(debug_instance, false);
+			}
+			if (debug_edge_connections_instance.is_valid()) {
+				RS::get_singleton()->instance_set_visible(debug_edge_connections_instance, false);
+			}
+		}
+	}
+
 	_update_debug_edge_connections_mesh();
 #endif // DEBUG_ENABLED
+
+	emit_signal(SNAME("navigation_mesh_changed"));
+
+	update_gizmos();
+	update_configuration_warnings();
 }
 
 #ifdef DEBUG_ENABLED
@@ -503,7 +500,7 @@ void NavigationRegion3D::_update_debug_mesh() {
 	debug_mesh->clear_surfaces();
 
 	Vector<Vector3> vertices = navigation_mesh->get_vertices();
-	if (vertices.size() == 0) {
+	if (vertices.is_empty()) {
 		return;
 	}
 
@@ -719,7 +716,7 @@ void NavigationRegion3D::_update_debug_edge_connections_mesh() {
 		vertex_array_ptrw[vertex_array_index++] = right_end_pos;
 	}
 
-	if (vertex_array.size() == 0) {
+	if (vertex_array.is_empty()) {
 		return;
 	}
 
diff --git a/engine/scene/3d/navigation_region_3d.h b/engine/scene/3d/navigation/navigation_region_3d.h
similarity index 96%
rename from engine/scene/3d/navigation_region_3d.h
rename to engine/scene/3d/navigation/navigation_region_3d.h
index 97abe397..c6a5629b 100644
--- a/engine/scene/3d/navigation_region_3d.h
+++ b/engine/scene/3d/navigation/navigation_region_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_REGION_3D_H
-#define NAVIGATION_REGION_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/navigation_mesh.h"
@@ -107,7 +106,7 @@ public:
 	/// Bakes the navigation mesh; once done, automatically
 	/// sets the new navigation mesh and emits a signal
 	void bake_navigation_mesh(bool p_on_thread);
-	void _bake_finished(Ref<NavigationMesh> p_navigation_mesh);
+	void _bake_finished();
 	bool is_baking() const;
 
 	PackedStringArray get_configuration_warnings() const override;
@@ -123,5 +122,3 @@ private:
 	void _region_exit_navigation_map();
 	void _region_update_transform();
 };
-
-#endif // NAVIGATION_REGION_3D_H
diff --git a/engine/scene/3d/node_3d.cpp b/engine/scene/3d/node_3d.cpp
index 1efa1d94..4d8037b1 100644
--- a/engine/scene/3d/node_3d.cpp
+++ b/engine/scene/3d/node_3d.cpp
@@ -131,6 +131,13 @@ void Node3D::_propagate_transform_changed(Node3D *p_origin) {
 
 void Node3D::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			ERR_MAIN_THREAD_GUARD;
 			ERR_FAIL_NULL(get_tree());
diff --git a/engine/scene/3d/node_3d.h b/engine/scene/3d/node_3d.h
index 20288fad..e641d7b8 100644
--- a/engine/scene/3d/node_3d.h
+++ b/engine/scene/3d/node_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NODE_3D_H
-#define NODE_3D_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "scene/resources/3d/world_3d.h"
@@ -305,5 +304,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(Node3D::RotationEditMode)
-
-#endif // NODE_3D_H
diff --git a/engine/scene/3d/occluder_instance_3d.cpp b/engine/scene/3d/occluder_instance_3d.cpp
index 6d88323c..a9d65177 100644
--- a/engine/scene/3d/occluder_instance_3d.cpp
+++ b/engine/scene/3d/occluder_instance_3d.cpp
@@ -321,13 +321,13 @@ void SphereOccluder3D::_update_arrays(PackedVector3Array &r_vertices, PackedInt3
 	int point = 0;
 	for (int j = 0; j <= (RINGS + 1); j++) {
 		float v = j / float(RINGS + 1);
-		float w = Math::sin(Math_PI * v);
-		float y = Math::cos(Math_PI * v);
+		float w = Math::sin(Math::PI * v);
+		float y = Math::cos(Math::PI * v);
 		for (int i = 0; i <= RADIAL_SEGMENTS; i++) {
 			float u = i / float(RADIAL_SEGMENTS);
 
-			float x = Math::cos(u * Math_TAU);
-			float z = Math::sin(u * Math_TAU);
+			float x = Math::cos(u * Math::TAU);
+			float z = Math::sin(u * Math::TAU);
 			vertex_ptr[vertex_i++] = Vector3(x * w, y, z * w) * radius;
 
 			if (i > 0 && j > 0) {
@@ -521,7 +521,7 @@ void OccluderInstance3D::_bake_surface(const Transform3D &p_transform, Array p_s
 	PackedVector3Array vertices = p_surface_arrays[Mesh::ARRAY_VERTEX];
 	PackedInt32Array indices = p_surface_arrays[Mesh::ARRAY_INDEX];
 
-	if (vertices.size() == 0 || indices.size() == 0) {
+	if (vertices.is_empty() || indices.is_empty()) {
 		return;
 	}
 
diff --git a/engine/scene/3d/occluder_instance_3d.h b/engine/scene/3d/occluder_instance_3d.h
index 62e94785..1078317f 100644
--- a/engine/scene/3d/occluder_instance_3d.h
+++ b/engine/scene/3d/occluder_instance_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OCCLUDER_INSTANCE_3D_H
-#define OCCLUDER_INSTANCE_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -209,5 +208,3 @@ public:
 	OccluderInstance3D();
 	~OccluderInstance3D();
 };
-
-#endif // OCCLUDER_INSTANCE_3D_H
diff --git a/engine/scene/3d/path_3d.cpp b/engine/scene/3d/path_3d.cpp
index 2f5ff2e6..dfa3c758 100644
--- a/engine/scene/3d/path_3d.cpp
+++ b/engine/scene/3d/path_3d.cpp
@@ -154,13 +154,15 @@ void Path3D::_update_debug_mesh() {
 	bone_array.resize(Mesh::ARRAY_MAX);
 	bone_array[Mesh::ARRAY_VERTEX] = bones;
 
+	_update_debug_path_material();
+
 	debug_mesh->clear_surfaces();
 	debug_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_LINE_STRIP, ribbon_array);
 	debug_mesh->add_surface_from_arrays(Mesh::PRIMITIVE_LINES, bone_array);
+	debug_mesh->surface_set_material(0, debug_material);
+	debug_mesh->surface_set_material(1, debug_material);
 
 	RS::get_singleton()->instance_set_base(debug_instance, debug_mesh->get_rid());
-	RS::get_singleton()->mesh_surface_set_material(debug_mesh->get_rid(), 0, st->get_debug_paths_material()->get_rid());
-	RS::get_singleton()->mesh_surface_set_material(debug_mesh->get_rid(), 1, st->get_debug_paths_material()->get_rid());
 	if (is_inside_tree()) {
 		RS::get_singleton()->instance_set_scenario(debug_instance, get_world_3d()->get_scenario());
 		RS::get_singleton()->instance_set_transform(debug_instance, get_global_transform());
@@ -168,6 +170,42 @@ void Path3D::_update_debug_mesh() {
 	}
 }
 
+void Path3D::set_debug_custom_color(const Color &p_color) {
+	debug_custom_color = p_color;
+	_update_debug_path_material();
+}
+
+Ref<StandardMaterial3D> Path3D::get_debug_material() {
+	return debug_material;
+}
+
+const Color &Path3D::get_debug_custom_color() const {
+	return debug_custom_color;
+}
+
+void Path3D::_update_debug_path_material() {
+	SceneTree *st = SceneTree::get_singleton();
+	if (!debug_material.is_valid()) {
+		Ref<StandardMaterial3D> material = memnew(StandardMaterial3D);
+		debug_material = material;
+
+		material->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
+		material->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
+		material->set_flag(StandardMaterial3D::FLAG_SRGB_VERTEX_COLOR, true);
+		material->set_flag(StandardMaterial3D::FLAG_ALBEDO_FROM_VERTEX_COLOR, true);
+		material->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
+	}
+
+	Color color = debug_custom_color;
+	if (color == Color(0.0, 0.0, 0.0)) {
+		// Use the default debug path color defined in the Project Settings.
+		color = st->get_debug_paths_color();
+	}
+
+	get_debug_material()->set_albedo(color);
+	emit_signal(SNAME("debug_color_changed"));
+}
+
 void Path3D::_curve_changed() {
 	if (is_inside_tree() && Engine::get_singleton()->is_editor_hint()) {
 		update_gizmos();
@@ -214,9 +252,16 @@ void Path3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_curve", "curve"), &Path3D::set_curve);
 	ClassDB::bind_method(D_METHOD("get_curve"), &Path3D::get_curve);
 
+	ClassDB::bind_method(D_METHOD("set_debug_custom_color", "debug_custom_color"), &Path3D::set_debug_custom_color);
+	ClassDB::bind_method(D_METHOD("get_debug_custom_color"), &Path3D::get_debug_custom_color);
+
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve3D", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_EDITOR_INSTANTIATE_OBJECT), "set_curve", "get_curve");
 
+	ADD_GROUP("Debug Shape", "debug_");
+	ADD_PROPERTY(PropertyInfo(Variant::COLOR, "debug_custom_color"), "set_debug_custom_color", "get_debug_custom_color");
+
 	ADD_SIGNAL(MethodInfo("curve_changed"));
+	ADD_SIGNAL(MethodInfo("debug_color_changed"));
 }
 
 void PathFollow3D::update_transform() {
diff --git a/engine/scene/3d/path_3d.h b/engine/scene/3d/path_3d.h
index fb4f3013..c7822cda 100644
--- a/engine/scene/3d/path_3d.h
+++ b/engine/scene/3d/path_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PATH_3D_H
-#define PATH_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/curve.h"
@@ -40,11 +39,14 @@ class Path3D : public Node3D {
 private:
 	Ref<Curve3D> curve;
 	RID debug_instance;
+	Color debug_custom_color;
 	Ref<ArrayMesh> debug_mesh;
+	Ref<Material> debug_material;
 
 	Callable update_callback; // Used only by CSG currently.
 
 	void _update_debug_mesh();
+	void _update_debug_path_material();
 	void _curve_changed();
 
 protected:
@@ -58,6 +60,14 @@ public:
 	void set_curve(const Ref<Curve3D> &p_curve);
 	Ref<Curve3D> get_curve() const;
 
+	const Color &get_debug_custom_color() const;
+	void set_debug_custom_color(const Color &p_color);
+
+	bool get_debug_show() const;
+	void set_debug_show(bool p_show);
+
+	Ref<StandardMaterial3D> get_debug_material();
+
 	Path3D();
 	~Path3D();
 };
@@ -131,5 +141,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(PathFollow3D::RotationMode);
-
-#endif // PATH_3D_H
diff --git a/engine/scene/3d/physics/animatable_body_3d.h b/engine/scene/3d/physics/animatable_body_3d.h
index 715b6917..5218d717 100644
--- a/engine/scene/3d/physics/animatable_body_3d.h
+++ b/engine/scene/3d/physics/animatable_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATABLE_BODY_3D_H
-#define ANIMATABLE_BODY_3D_H
+#pragma once
 
 #include "scene/3d/physics/static_body_3d.h"
 
@@ -63,5 +62,3 @@ private:
 	void set_sync_to_physics(bool p_enable);
 	bool is_sync_to_physics_enabled() const;
 };
-
-#endif // ANIMATABLE_BODY_3D_H
diff --git a/engine/scene/3d/physics/area_3d.h b/engine/scene/3d/physics/area_3d.h
index 8848f9c2..1a760968 100644
--- a/engine/scene/3d/physics/area_3d.h
+++ b/engine/scene/3d/physics/area_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AREA_3D_H
-#define AREA_3D_H
+#pragma once
 
 #include "core/templates/vset.h"
 #include "scene/3d/physics/collision_object_3d.h"
@@ -231,5 +230,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(Area3D::SpaceOverride);
-
-#endif // AREA_3D_H
diff --git a/engine/scene/3d/physics/character_body_3d.cpp b/engine/scene/3d/physics/character_body_3d.cpp
index 1aea2cbd..f7726071 100644
--- a/engine/scene/3d/physics/character_body_3d.cpp
+++ b/engine/scene/3d/physics/character_body_3d.cpp
@@ -219,7 +219,7 @@ void CharacterBody3D::_move_and_slide_grounded(double p_delta, bool p_was_on_flo
 					// Avoid to move forward on a wall if floor_block_on_wall is true.
 					// Applies only when the motion angle is under 90 degrees,
 					// in order to avoid blocking lateral motion along a wall.
-					if (motion_angle < .5 * Math_PI) {
+					if (motion_angle < .5 * Math::PI) {
 						apply_default_sliding = false;
 						if (p_was_on_floor && !vel_dir_facing_up) {
 							// Cancel the motion.
@@ -569,7 +569,7 @@ void CharacterBody3D::_set_collision_direction(const PhysicsServer3D::MotionResu
 			wall_normal = collision.normal;
 
 			// Don't apply wall velocity when the collider is a CharacterBody3D.
-			if (Object::cast_to<CharacterBody3D>(ObjectDB::get_instance(collision.collider_id)) == nullptr) {
+			if (ObjectDB::get_instance<CharacterBody3D>(collision.collider_id) == nullptr) {
 				_set_platform_data(collision);
 			}
 		}
@@ -717,7 +717,7 @@ Ref<KinematicCollision3D> CharacterBody3D::_get_slide_collision(int p_bounce) {
 }
 
 Ref<KinematicCollision3D> CharacterBody3D::_get_last_slide_collision() {
-	if (motion_results.size() == 0) {
+	if (motion_results.is_empty()) {
 		return Ref<KinematicCollision3D>();
 	}
 	return _get_slide_collision(motion_results.size() - 1);
diff --git a/engine/scene/3d/physics/character_body_3d.h b/engine/scene/3d/physics/character_body_3d.h
index 430d9c35..34c70d64 100644
--- a/engine/scene/3d/physics/character_body_3d.h
+++ b/engine/scene/3d/physics/character_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CHARACTER_BODY_3D_H
-#define CHARACTER_BODY_3D_H
+#pragma once
 
 #include "scene/3d/physics/kinematic_collision_3d.h"
 #include "scene/3d/physics/physics_body_3d.h"
@@ -185,5 +184,3 @@ protected:
 
 VARIANT_ENUM_CAST(CharacterBody3D::MotionMode);
 VARIANT_ENUM_CAST(CharacterBody3D::PlatformOnLeave);
-
-#endif // CHARACTER_BODY_3D_H
diff --git a/engine/scene/3d/physics/collision_object_3d.cpp b/engine/scene/3d/physics/collision_object_3d.cpp
index 653cbd1e..f181c441 100644
--- a/engine/scene/3d/physics/collision_object_3d.cpp
+++ b/engine/scene/3d/physics/collision_object_3d.cpp
@@ -519,7 +519,7 @@ uint32_t CollisionObject3D::create_shape_owner(Object *p_owner) {
 	ShapeData sd;
 	uint32_t id;
 
-	if (shapes.size() == 0) {
+	if (shapes.is_empty()) {
 		id = 0;
 	} else {
 		id = shapes.back()->key() + 1;
diff --git a/engine/scene/3d/physics/collision_object_3d.h b/engine/scene/3d/physics/collision_object_3d.h
index b51423f0..8483e770 100644
--- a/engine/scene/3d/physics/collision_object_3d.h
+++ b/engine/scene/3d/physics/collision_object_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_OBJECT_3D_H
-#define COLLISION_OBJECT_3D_H
+#pragma once
 
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/node_3d.h"
@@ -180,5 +179,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(CollisionObject3D::DisableMode);
-
-#endif // COLLISION_OBJECT_3D_H
diff --git a/engine/scene/3d/physics/collision_polygon_3d.cpp b/engine/scene/3d/physics/collision_polygon_3d.cpp
index 51945452..10281b08 100644
--- a/engine/scene/3d/physics/collision_polygon_3d.cpp
+++ b/engine/scene/3d/physics/collision_polygon_3d.cpp
@@ -41,12 +41,12 @@ void CollisionPolygon3D::_build_polygon() {
 
 	collision_object->shape_owner_clear_shapes(owner_id);
 
-	if (polygon.size() == 0) {
+	if (polygon.is_empty()) {
 		return;
 	}
 
 	Vector<Vector<Vector2>> decomp = Geometry2D::decompose_polygon_in_convex(polygon);
-	if (decomp.size() == 0) {
+	if (decomp.is_empty()) {
 		return;
 	}
 
diff --git a/engine/scene/3d/physics/collision_polygon_3d.h b/engine/scene/3d/physics/collision_polygon_3d.h
index ace69b21..e1893af3 100644
--- a/engine/scene/3d/physics/collision_polygon_3d.h
+++ b/engine/scene/3d/physics/collision_polygon_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_POLYGON_3D_H
-#define COLLISION_POLYGON_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -94,5 +93,3 @@ public:
 
 	CollisionPolygon3D();
 };
-
-#endif // COLLISION_POLYGON_3D_H
diff --git a/engine/scene/3d/physics/collision_shape_3d.h b/engine/scene/3d/physics/collision_shape_3d.h
index 55e7e90b..e0644065 100644
--- a/engine/scene/3d/physics/collision_shape_3d.h
+++ b/engine/scene/3d/physics/collision_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLLISION_SHAPE_3D_H
-#define COLLISION_SHAPE_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/shape_3d.h"
@@ -90,5 +89,3 @@ public:
 	CollisionShape3D();
 	~CollisionShape3D();
 };
-
-#endif // COLLISION_SHAPE_3D_H
diff --git a/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp b/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp
index 3da0cbee..f4e58adc 100644
--- a/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/cone_twist_joint_3d.cpp
@@ -87,8 +87,8 @@ void ConeTwistJoint3D::_configure_joint(RID p_joint, PhysicsBody3D *body_a, Phys
 }
 
 ConeTwistJoint3D::ConeTwistJoint3D() {
-	params[PARAM_SWING_SPAN] = Math_PI * 0.25;
-	params[PARAM_TWIST_SPAN] = Math_PI;
+	params[PARAM_SWING_SPAN] = Math::PI * 0.25;
+	params[PARAM_TWIST_SPAN] = Math::PI;
 	params[PARAM_BIAS] = 0.3;
 	params[PARAM_SOFTNESS] = 0.8;
 	params[PARAM_RELAXATION] = 1.0;
diff --git a/engine/scene/3d/physics/joints/cone_twist_joint_3d.h b/engine/scene/3d/physics/joints/cone_twist_joint_3d.h
index a24c8053..91386cde 100644
--- a/engine/scene/3d/physics/joints/cone_twist_joint_3d.h
+++ b/engine/scene/3d/physics/joints/cone_twist_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONE_TWIST_JOINT_3D_H
-#define CONE_TWIST_JOINT_3D_H
+#pragma once
 
 #include "scene/3d/physics/joints/joint_3d.h"
 
@@ -59,5 +58,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(ConeTwistJoint3D::Param);
-
-#endif // CONE_TWIST_JOINT_3D_H
diff --git a/engine/scene/3d/physics/joints/generic_6dof_joint_3d.h b/engine/scene/3d/physics/joints/generic_6dof_joint_3d.h
index 9b3e4c01..85f0b604 100644
--- a/engine/scene/3d/physics/joints/generic_6dof_joint_3d.h
+++ b/engine/scene/3d/physics/joints/generic_6dof_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GENERIC_6DOF_JOINT_3D_H
-#define GENERIC_6DOF_JOINT_3D_H
+#pragma once
 
 #include "scene/3d/physics/joints/joint_3d.h"
 
@@ -108,5 +107,3 @@ public:
 
 VARIANT_ENUM_CAST(Generic6DOFJoint3D::Param);
 VARIANT_ENUM_CAST(Generic6DOFJoint3D::Flag);
-
-#endif // GENERIC_6DOF_JOINT_3D_H
diff --git a/engine/scene/3d/physics/joints/hinge_joint_3d.cpp b/engine/scene/3d/physics/joints/hinge_joint_3d.cpp
index 92472a45..cf38357d 100644
--- a/engine/scene/3d/physics/joints/hinge_joint_3d.cpp
+++ b/engine/scene/3d/physics/joints/hinge_joint_3d.cpp
@@ -122,8 +122,8 @@ void HingeJoint3D::_configure_joint(RID p_joint, PhysicsBody3D *body_a, PhysicsB
 
 HingeJoint3D::HingeJoint3D() {
 	params[PARAM_BIAS] = 0.3;
-	params[PARAM_LIMIT_UPPER] = Math_PI * 0.5;
-	params[PARAM_LIMIT_LOWER] = -Math_PI * 0.5;
+	params[PARAM_LIMIT_UPPER] = Math::PI * 0.5;
+	params[PARAM_LIMIT_LOWER] = -Math::PI * 0.5;
 	params[PARAM_LIMIT_BIAS] = 0.3;
 	params[PARAM_LIMIT_SOFTNESS] = 0.9;
 	params[PARAM_LIMIT_RELAXATION] = 1.0;
diff --git a/engine/scene/3d/physics/joints/hinge_joint_3d.h b/engine/scene/3d/physics/joints/hinge_joint_3d.h
index cd19a877..84a5ca3e 100644
--- a/engine/scene/3d/physics/joints/hinge_joint_3d.h
+++ b/engine/scene/3d/physics/joints/hinge_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HINGE_JOINT_3D_H
-#define HINGE_JOINT_3D_H
+#pragma once
 
 #include "scene/3d/physics/joints/joint_3d.h"
 
@@ -73,5 +72,3 @@ public:
 
 VARIANT_ENUM_CAST(HingeJoint3D::Param);
 VARIANT_ENUM_CAST(HingeJoint3D::Flag);
-
-#endif // HINGE_JOINT_3D_H
diff --git a/engine/scene/3d/physics/joints/joint_3d.h b/engine/scene/3d/physics/joints/joint_3d.h
index ed502ab2..313e659a 100644
--- a/engine/scene/3d/physics/joints/joint_3d.h
+++ b/engine/scene/3d/physics/joints/joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef JOINT_3D_H
-#define JOINT_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/3d/physics/physics_body_3d.h"
@@ -81,5 +80,3 @@ public:
 	Joint3D();
 	~Joint3D();
 };
-
-#endif // JOINT_3D_H
diff --git a/engine/scene/3d/physics/joints/pin_joint_3d.h b/engine/scene/3d/physics/joints/pin_joint_3d.h
index 34c8db28..fad22a25 100644
--- a/engine/scene/3d/physics/joints/pin_joint_3d.h
+++ b/engine/scene/3d/physics/joints/pin_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PIN_JOINT_3D_H
-#define PIN_JOINT_3D_H
+#pragma once
 
 #include "scene/3d/physics/joints/joint_3d.h"
 
@@ -56,5 +55,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(PinJoint3D::Param);
-
-#endif // PIN_JOINT_3D_H
diff --git a/engine/scene/3d/physics/joints/slider_joint_3d.h b/engine/scene/3d/physics/joints/slider_joint_3d.h
index e0b059e6..5d4c767e 100644
--- a/engine/scene/3d/physics/joints/slider_joint_3d.h
+++ b/engine/scene/3d/physics/joints/slider_joint_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SLIDER_JOINT_3D_H
-#define SLIDER_JOINT_3D_H
+#pragma once
 
 #include "scene/3d/physics/joints/joint_3d.h"
 
@@ -78,5 +77,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(SliderJoint3D::Param);
-
-#endif // SLIDER_JOINT_3D_H
diff --git a/engine/scene/3d/physics/kinematic_collision_3d.cpp b/engine/scene/3d/physics/kinematic_collision_3d.cpp
index 7e19106c..15111258 100644
--- a/engine/scene/3d/physics/kinematic_collision_3d.cpp
+++ b/engine/scene/3d/physics/kinematic_collision_3d.cpp
@@ -66,7 +66,7 @@ real_t KinematicCollision3D::get_angle(int p_collision_index, const Vector3 &p_u
 
 Object *KinematicCollision3D::get_local_shape(int p_collision_index) const {
 	ERR_FAIL_INDEX_V(p_collision_index, result.collision_count, nullptr);
-	PhysicsBody3D *owner = Object::cast_to<PhysicsBody3D>(ObjectDB::get_instance(owner_id));
+	PhysicsBody3D *owner = ObjectDB::get_instance<PhysicsBody3D>(owner_id);
 	if (!owner) {
 		return nullptr;
 	}
diff --git a/engine/scene/3d/physics/kinematic_collision_3d.h b/engine/scene/3d/physics/kinematic_collision_3d.h
index 38852beb..9aec0c65 100644
--- a/engine/scene/3d/physics/kinematic_collision_3d.h
+++ b/engine/scene/3d/physics/kinematic_collision_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef KINEMATIC_COLLISION_3D_H
-#define KINEMATIC_COLLISION_3D_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "servers/physics_server_3d.h"
@@ -61,5 +60,3 @@ public:
 	int get_collider_shape_index(int p_collision_index = 0) const;
 	Vector3 get_collider_velocity(int p_collision_index = 0) const;
 };
-
-#endif // KINEMATIC_COLLISION_3D_H
diff --git a/engine/scene/3d/physics/physical_bone_3d.cpp b/engine/scene/3d/physics/physical_bone_3d.cpp
index cf6af50d..a3108044 100644
--- a/engine/scene/3d/physics/physical_bone_3d.cpp
+++ b/engine/scene/3d/physics/physical_bone_3d.cpp
@@ -30,7 +30,7 @@
 
 #include "physical_bone_3d.h"
 
-#include "scene/3d/physical_bone_simulator_3d.h"
+#include "scene/3d/physics/physical_bone_simulator_3d.h"
 #ifndef DISABLE_DEPRECATED
 #include "scene/3d/skeleton_3d.h"
 #endif //_DISABLE_DEPRECATED
@@ -752,8 +752,9 @@ void PhysicalBone3D::_get_property_list(List<PropertyInfo> *p_list) const {
 
 void PhysicalBone3D::_notification(int p_what) {
 	switch (p_what) {
-		case NOTIFICATION_ENTER_TREE:
-		case NOTIFICATION_PARENTED:
+		// We need to wait until the bone has finished being added to the tree
+		// or none of the global transform calls will work correctly.
+		case NOTIFICATION_POST_ENTER_TREE:
 			_update_simulator_path();
 			update_bone_id();
 			reset_to_rest_position();
@@ -763,6 +764,9 @@ void PhysicalBone3D::_notification(int p_what) {
 			}
 			break;
 
+		// If we're detached from the skeleton we need to
+		// clear our references to it.
+		case NOTIFICATION_UNPARENTED:
 		case NOTIFICATION_EXIT_TREE: {
 			PhysicalBoneSimulator3D *simulator = get_simulator();
 			if (simulator) {
@@ -1052,7 +1056,7 @@ void PhysicalBone3D::_update_simulator_path() {
 }
 
 PhysicalBoneSimulator3D *PhysicalBone3D::get_simulator() const {
-	return Object::cast_to<PhysicalBoneSimulator3D>(ObjectDB::get_instance(simulator_id));
+	return ObjectDB::get_instance<PhysicalBoneSimulator3D>(simulator_id);
 }
 
 Skeleton3D *PhysicalBone3D::get_skeleton() const {
diff --git a/engine/scene/3d/physics/physical_bone_3d.h b/engine/scene/3d/physics/physical_bone_3d.h
index 415eebb0..45fae5e6 100644
--- a/engine/scene/3d/physics/physical_bone_3d.h
+++ b/engine/scene/3d/physics/physical_bone_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICAL_BONE_3D_H
-#define PHYSICAL_BONE_3D_H
+#pragma once
 
 #include "scene/3d/physics/physics_body_3d.h"
 #include "scene/3d/skeleton_3d.h"
@@ -84,8 +83,8 @@ public:
 		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
 		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
 
-		real_t swing_span = Math_PI * 0.25;
-		real_t twist_span = Math_PI;
+		real_t swing_span = Math::PI * 0.25;
+		real_t twist_span = Math::PI;
 		real_t bias = 0.3;
 		real_t softness = 0.8;
 		real_t relaxation = 1.;
@@ -99,8 +98,8 @@ public:
 		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
 
 		bool angular_limit_enabled = false;
-		real_t angular_limit_upper = Math_PI * 0.5;
-		real_t angular_limit_lower = -Math_PI * 0.5;
+		real_t angular_limit_upper = Math::PI * 0.5;
+		real_t angular_limit_lower = -Math::PI * 0.5;
 		real_t angular_limit_bias = 0.3;
 		real_t angular_limit_softness = 0.9;
 		real_t angular_limit_relaxation = 1.;
@@ -307,5 +306,3 @@ private:
 
 VARIANT_ENUM_CAST(PhysicalBone3D::JointType);
 VARIANT_ENUM_CAST(PhysicalBone3D::DampMode);
-
-#endif // PHYSICAL_BONE_3D_H
diff --git a/engine/scene/3d/physical_bone_simulator_3d.cpp b/engine/scene/3d/physics/physical_bone_simulator_3d.cpp
similarity index 97%
rename from engine/scene/3d/physical_bone_simulator_3d.cpp
rename to engine/scene/3d/physics/physical_bone_simulator_3d.cpp
index 4a619da4..fe3cfecb 100644
--- a/engine/scene/3d/physical_bone_simulator_3d.cpp
+++ b/engine/scene/3d/physics/physical_bone_simulator_3d.cpp
@@ -73,9 +73,14 @@ void PhysicalBoneSimulator3D::_pose_updated() {
 	if (!skeleton || simulating) {
 		return;
 	}
-	ERR_FAIL_COND(skeleton->get_bone_count() != bones.size());
-	for (int i = 0; i < skeleton->get_bone_count(); i++) {
-		_bone_pose_updated(skeleton, i);
+	// If this triggers that means that we likely haven't rebuilt the bone list yet.
+	if (skeleton->get_bone_count() != bones.size()) {
+		// NOTE: this is re-entrant and will call _pose_updated again.
+		_bone_list_changed();
+	} else {
+		for (int i = 0; i < skeleton->get_bone_count(); i++) {
+			_bone_pose_updated(skeleton, i);
+		}
 	}
 }
 
@@ -359,7 +364,7 @@ void PhysicalBoneSimulator3D::set_bone_global_pose(int p_bone, const Transform3D
 	bones.write[p_bone].global_pose = p_pose;
 }
 
-void PhysicalBoneSimulator3D::_process_modification() {
+void PhysicalBoneSimulator3D::_process_modification(double p_delta) {
 	Skeleton3D *skeleton = get_skeleton();
 	if (!skeleton) {
 		return;
diff --git a/engine/scene/3d/physical_bone_simulator_3d.h b/engine/scene/3d/physics/physical_bone_simulator_3d.h
similarity index 96%
rename from engine/scene/3d/physical_bone_simulator_3d.h
rename to engine/scene/3d/physics/physical_bone_simulator_3d.h
index 6c1c70b5..f18024b3 100644
--- a/engine/scene/3d/physical_bone_simulator_3d.h
+++ b/engine/scene/3d/physics/physical_bone_simulator_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICAL_BONE_SIMULATOR_3D_H
-#define PHYSICAL_BONE_SIMULATOR_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
 
@@ -73,7 +72,7 @@ protected:
 	void _pose_updated();
 	void _bone_pose_updated(Skeleton3D *skeleton, int p_bone_id);
 
-	virtual void _process_modification() override;
+	virtual void _process_modification(double p_delta) override;
 
 	virtual void _skeleton_changed(Skeleton3D *p_old, Skeleton3D *p_new) override;
 
@@ -104,5 +103,3 @@ public:
 
 	PhysicalBoneSimulator3D();
 };
-
-#endif // PHYSICAL_BONE_SIMULATOR_3D_H
diff --git a/engine/scene/3d/physics/physics_body_3d.h b/engine/scene/3d/physics/physics_body_3d.h
index 5a5dae64..e2145e60 100644
--- a/engine/scene/3d/physics/physics_body_3d.h
+++ b/engine/scene/3d/physics/physics_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_BODY_3D_H
-#define PHYSICS_BODY_3D_H
+#pragma once
 
 #include "scene/3d/physics/collision_object_3d.h"
 #include "scene/3d/physics/kinematic_collision_3d.h"
@@ -65,5 +64,3 @@ public:
 	void add_collision_exception_with(Node *p_node); //must be physicsbody
 	void remove_collision_exception_with(Node *p_node);
 };
-
-#endif // PHYSICS_BODY_3D_H
diff --git a/engine/scene/3d/physics/ray_cast_3d.cpp b/engine/scene/3d/physics/ray_cast_3d.cpp
index 5439d87b..dac3cb19 100644
--- a/engine/scene/3d/physics/ray_cast_3d.cpp
+++ b/engine/scene/3d/physics/ray_cast_3d.cpp
@@ -413,7 +413,7 @@ void RayCast3D::_update_debug_shape_vertices() {
 		int vertices_strip_order[14] = { 4, 5, 0, 1, 2, 5, 6, 4, 7, 0, 3, 2, 7, 6 };
 		for (int v = 0; v < 14; v++) {
 			Vector3 vertex = vertices_strip_order[v] < 4 ? normal : normal / 3.0 + target_position;
-			debug_shape_vertices.push_back(vertex.rotated(dir, Math_PI * (0.5 * (vertices_strip_order[v] % 4) + 0.25)));
+			debug_shape_vertices.push_back(vertex.rotated(dir, Math::PI * (0.5 * (vertices_strip_order[v] % 4) + 0.25)));
 		}
 	}
 }
diff --git a/engine/scene/3d/physics/ray_cast_3d.h b/engine/scene/3d/physics/ray_cast_3d.h
index 40f22236..c0fe0c94 100644
--- a/engine/scene/3d/physics/ray_cast_3d.h
+++ b/engine/scene/3d/physics/ray_cast_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RAY_CAST_3D_H
-#define RAY_CAST_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -135,5 +134,3 @@ public:
 
 	RayCast3D();
 };
-
-#endif // RAY_CAST_3D_H
diff --git a/engine/scene/3d/physics/rigid_body_3d.cpp b/engine/scene/3d/physics/rigid_body_3d.cpp
index 6c8cea1a..b96c4f05 100644
--- a/engine/scene/3d/physics/rigid_body_3d.cpp
+++ b/engine/scene/3d/physics/rigid_body_3d.cpp
@@ -521,6 +521,7 @@ bool RigidBody3D::is_sleeping() const {
 }
 
 void RigidBody3D::set_max_contacts_reported(int p_amount) {
+	ERR_FAIL_INDEX_MSG(p_amount, MAX_CONTACTS_REPORTED_3D_MAX, "Max contacts reported allocates memory (about 80 bytes each), and therefore must not be set too high.");
 	max_contacts_reported = p_amount;
 	PhysicsServer3D::get_singleton()->body_set_max_contacts_reported(get_rid(), p_amount);
 }
@@ -662,7 +663,7 @@ PackedStringArray RigidBody3D::get_configuration_warnings() const {
 	PackedStringArray warnings = PhysicsBody3D::get_configuration_warnings();
 
 	Vector3 scale = get_transform().get_basis().get_scale();
-	if (ABS(scale.x - 1.0) > 0.05 || ABS(scale.y - 1.0) > 0.05 || ABS(scale.z - 1.0) > 0.05) {
+	if (Math::abs(scale.x - 1.0) > 0.05 || Math::abs(scale.y - 1.0) > 0.05 || Math::abs(scale.z - 1.0) > 0.05) {
 		warnings.push_back(RTR("Scale changes to RigidBody3D will be overridden by the physics engine when running.\nPlease change the size in children collision shapes instead."));
 	}
 
diff --git a/engine/scene/3d/physics/rigid_body_3d.h b/engine/scene/3d/physics/rigid_body_3d.h
index 5a37b82b..a10fa460 100644
--- a/engine/scene/3d/physics/rigid_body_3d.h
+++ b/engine/scene/3d/physics/rigid_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RIGID_BODY_3D_H
-#define RIGID_BODY_3D_H
+#pragma once
 
 #include "core/templates/vset.h"
 #include "scene/3d/physics/physics_body_3d.h"
@@ -245,5 +244,3 @@ private:
 VARIANT_ENUM_CAST(RigidBody3D::FreezeMode);
 VARIANT_ENUM_CAST(RigidBody3D::CenterOfMassMode);
 VARIANT_ENUM_CAST(RigidBody3D::DampMode);
-
-#endif // RIGID_BODY_3D_H
diff --git a/engine/scene/3d/physics/shape_cast_3d.h b/engine/scene/3d/physics/shape_cast_3d.h
index 9fc5e716..2c5a857d 100644
--- a/engine/scene/3d/physics/shape_cast_3d.h
+++ b/engine/scene/3d/physics/shape_cast_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHAPE_CAST_3D_H
-#define SHAPE_CAST_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/shape_3d.h"
@@ -143,5 +142,3 @@ public:
 
 	virtual PackedStringArray get_configuration_warnings() const override;
 };
-
-#endif // SHAPE_CAST_3D_H
diff --git a/engine/scene/3d/soft_body_3d.compat.inc b/engine/scene/3d/physics/soft_body_3d.compat.inc
similarity index 100%
rename from engine/scene/3d/soft_body_3d.compat.inc
rename to engine/scene/3d/physics/soft_body_3d.compat.inc
diff --git a/engine/scene/3d/soft_body_3d.cpp b/engine/scene/3d/physics/soft_body_3d.cpp
similarity index 100%
rename from engine/scene/3d/soft_body_3d.cpp
rename to engine/scene/3d/physics/soft_body_3d.cpp
diff --git a/engine/scene/3d/soft_body_3d.h b/engine/scene/3d/physics/soft_body_3d.h
similarity index 99%
rename from engine/scene/3d/soft_body_3d.h
rename to engine/scene/3d/physics/soft_body_3d.h
index 72544b23..f136b7ac 100644
--- a/engine/scene/3d/soft_body_3d.h
+++ b/engine/scene/3d/physics/soft_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SOFT_BODY_3D_H
-#define SOFT_BODY_3D_H
+#pragma once
 
 #include "scene/3d/mesh_instance_3d.h"
 #include "servers/physics_server_3d.h"
@@ -206,5 +205,3 @@ private:
 };
 
 VARIANT_ENUM_CAST(SoftBody3D::DisableMode);
-
-#endif // SOFT_BODY_3D_H
diff --git a/engine/scene/3d/physics/spring_arm_3d.h b/engine/scene/3d/physics/spring_arm_3d.h
index c7e1da35..54293ff0 100644
--- a/engine/scene/3d/physics/spring_arm_3d.h
+++ b/engine/scene/3d/physics/spring_arm_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_ARM_3D_H
-#define SPRING_ARM_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -67,5 +66,3 @@ public:
 private:
 	void process_spring();
 };
-
-#endif // SPRING_ARM_3D_H
diff --git a/engine/scene/3d/physics/static_body_3d.cpp b/engine/scene/3d/physics/static_body_3d.cpp
index 491904e7..37bd275c 100644
--- a/engine/scene/3d/physics/static_body_3d.cpp
+++ b/engine/scene/3d/physics/static_body_3d.cpp
@@ -30,6 +30,7 @@
 
 #include "static_body_3d.h"
 
+#ifndef NAVIGATION_3D_DISABLED
 #include "core/math/convex_hull.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
@@ -47,6 +48,7 @@
 
 Callable StaticBody3D::_navmesh_source_geometry_parsing_callback;
 RID StaticBody3D::_navmesh_source_geometry_parser;
+#endif // NAVIGATION_3D_DISABLED
 
 void StaticBody3D::set_physics_material_override(const Ref<PhysicsMaterial> &p_physics_material_override) {
 	if (physics_material_override.is_valid()) {
@@ -95,6 +97,7 @@ void StaticBody3D::_reload_physics_characteristics() {
 	}
 }
 
+#ifndef NAVIGATION_3D_DISABLED
 void StaticBody3D::navmesh_parse_init() {
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
 	if (!_navmesh_source_geometry_parser.is_valid()) {
@@ -226,6 +229,7 @@ void StaticBody3D::navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_na
 		}
 	}
 }
+#endif // NAVIGATION_3D_DISABLED
 
 void StaticBody3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_constant_linear_velocity", "vel"), &StaticBody3D::set_constant_linear_velocity);
diff --git a/engine/scene/3d/physics/static_body_3d.h b/engine/scene/3d/physics/static_body_3d.h
index 77e5a1e4..f4869575 100644
--- a/engine/scene/3d/physics/static_body_3d.h
+++ b/engine/scene/3d/physics/static_body_3d.h
@@ -28,13 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STATIC_BODY_3D_H
-#define STATIC_BODY_3D_H
+#pragma once
 
 #include "scene/3d/physics/physics_body_3d.h"
 
+#ifndef NAVIGATION_3D_DISABLED
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;
+#endif // NAVIGATION_3D_DISABLED
 
 class StaticBody3D : public PhysicsBody3D {
 	GDCLASS(StaticBody3D, PhysicsBody3D);
@@ -63,12 +64,12 @@ public:
 private:
 	void _reload_physics_characteristics();
 
+#ifndef NAVIGATION_3D_DISABLED
 	static Callable _navmesh_source_geometry_parsing_callback;
 	static RID _navmesh_source_geometry_parser;
 
 public:
 	static void navmesh_parse_init();
 	static void navmesh_parse_source_geometry(const Ref<NavigationMesh> &p_navigation_mesh, Ref<NavigationMeshSourceGeometryData3D> p_source_geometry_data, Node *p_node);
+#endif // NAVIGATION_3D_DISABLED
 };
-
-#endif // STATIC_BODY_3D_H
diff --git a/engine/scene/3d/physics/vehicle_body_3d.cpp b/engine/scene/3d/physics/vehicle_body_3d.cpp
index c5c91530..5289d287 100644
--- a/engine/scene/3d/physics/vehicle_body_3d.cpp
+++ b/engine/scene/3d/physics/vehicle_body_3d.cpp
@@ -852,18 +852,26 @@ void VehicleBody3D::_body_state_changed(PhysicsDirectBodyState3D *p_state) {
 	for (int i = 0; i < wheels.size(); i++) {
 		VehicleWheel3D &wheel = *wheels[i];
 		Vector3 relpos = wheel.m_raycastInfo.m_hardPointWS - p_state->get_transform().origin;
-		Vector3 vel = p_state->get_linear_velocity() + (p_state->get_angular_velocity()).cross(relpos); // * mPos);
+		Vector3 vel = p_state->get_linear_velocity() + (p_state->get_angular_velocity()).cross(relpos);
 
 		if (wheel.m_raycastInfo.m_isInContact) {
 			const Transform3D &chassisWorldTransform = p_state->get_transform();
 
+			// Get forward vector.
 			Vector3 fwd(
 					chassisWorldTransform.basis[0][Vector3::AXIS_Z],
 					chassisWorldTransform.basis[1][Vector3::AXIS_Z],
 					chassisWorldTransform.basis[2][Vector3::AXIS_Z]);
 
+			// Apply steering rotation to forward vector for steerable wheels.
+			if (wheel.steers) {
+				Basis steering_mat(Vector3(0, 1, 0), wheel.m_steering);
+				fwd = steering_mat.xform(fwd);
+			}
+
 			real_t proj = fwd.dot(wheel.m_raycastInfo.m_contactNormalWS);
 			fwd -= wheel.m_raycastInfo.m_contactNormalWS * proj;
+			fwd.normalize();
 
 			real_t proj2 = fwd.dot(vel);
 
@@ -871,7 +879,7 @@ void VehicleBody3D::_body_state_changed(PhysicsDirectBodyState3D *p_state) {
 		}
 
 		wheel.m_rotation += wheel.m_deltaRotation;
-		wheel.m_rpm = ((wheel.m_deltaRotation / step) * 60) / Math_TAU;
+		wheel.m_rpm = ((wheel.m_deltaRotation / step) * 60) / Math::TAU;
 
 		wheel.m_deltaRotation *= real_t(0.99); //damping of rotation when not in contact
 	}
diff --git a/engine/scene/3d/physics/vehicle_body_3d.h b/engine/scene/3d/physics/vehicle_body_3d.h
index 24f120ed..0e366912 100644
--- a/engine/scene/3d/physics/vehicle_body_3d.h
+++ b/engine/scene/3d/physics/vehicle_body_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VEHICLE_BODY_3D_H
-#define VEHICLE_BODY_3D_H
+#pragma once
 
 #include "scene/3d/physics/physics_body_3d.h"
 #include "scene/3d/physics/rigid_body_3d.h"
@@ -214,5 +213,3 @@ public:
 
 	VehicleBody3D();
 };
-
-#endif // VEHICLE_BODY_3D_H
diff --git a/engine/scene/3d/reflection_probe.cpp b/engine/scene/3d/reflection_probe.cpp
index a2c7bf42..0cbef89c 100644
--- a/engine/scene/3d/reflection_probe.cpp
+++ b/engine/scene/3d/reflection_probe.cpp
@@ -105,7 +105,7 @@ void ReflectionProbe::set_size(const Vector3 &p_size) {
 			half_size = 0.01;
 		}
 
-		if (half_size - 0.01 < ABS(origin_offset[i])) {
+		if (half_size - 0.01 < Math::abs(origin_offset[i])) {
 			origin_offset[i] = SIGN(origin_offset[i]) * (half_size - 0.01);
 		}
 	}
@@ -125,7 +125,7 @@ void ReflectionProbe::set_origin_offset(const Vector3 &p_offset) {
 
 	for (int i = 0; i < 3; i++) {
 		float half_size = size[i] / 2;
-		if (half_size - 0.01 < ABS(origin_offset[i])) {
+		if (half_size - 0.01 < Math::abs(origin_offset[i])) {
 			origin_offset[i] = SIGN(origin_offset[i]) * (half_size - 0.01);
 		}
 	}
diff --git a/engine/scene/3d/reflection_probe.h b/engine/scene/3d/reflection_probe.h
index 3c3a38d7..d3fa2065 100644
--- a/engine/scene/3d/reflection_probe.h
+++ b/engine/scene/3d/reflection_probe.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REFLECTION_PROBE_H
-#define REFLECTION_PROBE_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -132,5 +131,3 @@ public:
 
 VARIANT_ENUM_CAST(ReflectionProbe::AmbientMode);
 VARIANT_ENUM_CAST(ReflectionProbe::UpdateMode);
-
-#endif // REFLECTION_PROBE_H
diff --git a/engine/scene/3d/remote_transform_3d.cpp b/engine/scene/3d/remote_transform_3d.cpp
index f970879a..2a69ded0 100644
--- a/engine/scene/3d/remote_transform_3d.cpp
+++ b/engine/scene/3d/remote_transform_3d.cpp
@@ -51,58 +51,50 @@ void RemoteTransform3D::_update_remote() {
 		return;
 	}
 
-	Node3D *n = Object::cast_to<Node3D>(ObjectDB::get_instance(cache));
-	if (!n) {
+	Node3D *target_node = ObjectDB::get_instance<Node3D>(cache);
+	if (!target_node) {
 		return;
 	}
 
-	if (!n->is_inside_tree()) {
+	if (!target_node->is_inside_tree()) {
 		return;
 	}
 
-	//todo make faster
-	if (use_global_coordinates) {
-		if (update_remote_position && update_remote_rotation && update_remote_scale) {
-			n->set_global_transform(get_global_transform());
+	Transform3D our_trans = use_global_coordinates ? get_global_transform() : get_transform();
+
+	if (update_remote_position && update_remote_rotation && update_remote_scale) {
+		if (use_global_coordinates) {
+			target_node->set_global_transform(our_trans);
 		} else {
-			Transform3D our_trans = get_global_transform();
+			target_node->set_transform(our_trans);
+		}
+	} else {
+		Transform3D target_trans = use_global_coordinates ? target_node->get_global_transform() : target_node->get_transform();
 
-			if (update_remote_rotation) {
-				n->set_rotation(our_trans.basis.get_euler_normalized(EulerOrder(n->get_rotation_order())));
+		if (update_remote_rotation && update_remote_scale) {
+			target_trans.basis = our_trans.basis;
+		} else if (update_remote_rotation) {
+			for (int i = 0; i < 3; i++) {
+				Vector3 our_col = our_trans.basis.get_column(i);
+				Vector3 target_col = target_trans.basis.get_column(i);
+				target_trans.basis.set_column(i, our_col.normalized() * target_col.length());
 			}
-
-			if (update_remote_scale) {
-				n->set_scale(our_trans.basis.get_scale());
-			}
-
-			if (update_remote_position) {
-				Transform3D n_trans = n->get_global_transform();
-
-				n_trans.set_origin(our_trans.get_origin());
-				n->set_global_transform(n_trans);
+		} else if (update_remote_scale) {
+			for (int i = 0; i < 3; i++) {
+				Vector3 our_col = our_trans.basis.get_column(i);
+				Vector3 target_col = target_trans.basis.get_column(i);
+				target_trans.basis.set_column(i, target_col.normalized() * our_col.length());
 			}
 		}
 
-	} else {
-		if (update_remote_position && update_remote_rotation && update_remote_scale) {
-			n->set_transform(get_transform());
+		if (update_remote_position) {
+			target_trans.origin = our_trans.origin;
+		}
+
+		if (use_global_coordinates) {
+			target_node->set_global_transform(target_trans);
 		} else {
-			Transform3D our_trans = get_transform();
-
-			if (update_remote_rotation) {
-				n->set_rotation(our_trans.basis.get_euler_normalized(EulerOrder(n->get_rotation_order())));
-			}
-
-			if (update_remote_scale) {
-				n->set_scale(our_trans.basis.get_scale());
-			}
-
-			if (update_remote_position) {
-				Transform3D n_trans = n->get_transform();
-
-				n_trans.set_origin(our_trans.get_origin());
-				n->set_transform(n_trans);
-			}
+			target_node->set_transform(target_trans);
 		}
 	}
 }
@@ -116,7 +108,7 @@ void RemoteTransform3D::_notification(int p_what) {
 		case NOTIFICATION_RESET_PHYSICS_INTERPOLATION: {
 			if (cache.is_valid()) {
 				_update_remote();
-				Node3D *n = Object::cast_to<Node3D>(ObjectDB::get_instance(cache));
+				Node3D *n = ObjectDB::get_instance<Node3D>(cache);
 				if (n) {
 					n->reset_physics_interpolation();
 				}
diff --git a/engine/scene/3d/remote_transform_3d.h b/engine/scene/3d/remote_transform_3d.h
index 3841821d..a9966bfb 100644
--- a/engine/scene/3d/remote_transform_3d.h
+++ b/engine/scene/3d/remote_transform_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REMOTE_TRANSFORM_3D_H
-#define REMOTE_TRANSFORM_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -74,5 +73,3 @@ public:
 
 	RemoteTransform3D();
 };
-
-#endif // REMOTE_TRANSFORM_3D_H
diff --git a/engine/scene/3d/retarget_modifier_3d.cpp b/engine/scene/3d/retarget_modifier_3d.cpp
index 9b070b8d..925e5134 100644
--- a/engine/scene/3d/retarget_modifier_3d.cpp
+++ b/engine/scene/3d/retarget_modifier_3d.cpp
@@ -161,7 +161,7 @@ Vector<RetargetModifier3D::RetargetBoneInfo> RetargetModifier3D::cache_bone_rest
 
 void RetargetModifier3D::_update_child_skeleton_rests(int p_child_skeleton_idx) {
 	ERR_FAIL_INDEX(p_child_skeleton_idx, child_skeletons.size());
-	Skeleton3D *c = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(child_skeletons[p_child_skeleton_idx].skeleton_id));
+	Skeleton3D *c = ObjectDB::get_instance<Skeleton3D>(child_skeletons[p_child_skeleton_idx].skeleton_id);
 	if (!c) {
 		return;
 	}
@@ -192,7 +192,7 @@ void RetargetModifier3D::_update_child_skeletons() {
 
 void RetargetModifier3D::_reset_child_skeleton_poses() {
 	for (const RetargetInfo &E : child_skeletons) {
-		Skeleton3D *c = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(E.skeleton_id));
+		Skeleton3D *c = ObjectDB::get_instance<Skeleton3D>(E.skeleton_id);
 		if (!c) {
 			continue;
 		}
@@ -216,7 +216,7 @@ void RetargetModifier3D::_reset_child_skeletons() {
 #ifdef TOOLS_ENABLED
 void RetargetModifier3D::_force_update_child_skeletons() {
 	for (const RetargetInfo &E : child_skeletons) {
-		Skeleton3D *c = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(E.skeleton_id));
+		Skeleton3D *c = ObjectDB::get_instance<Skeleton3D>(E.skeleton_id);
 		if (!c) {
 			continue;
 		}
@@ -304,7 +304,7 @@ void RetargetModifier3D::_retarget_global_pose() {
 	}
 
 	for (const RetargetInfo &E : child_skeletons) {
-		Skeleton3D *target_skeleton = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(E.skeleton_id));
+		Skeleton3D *target_skeleton = ObjectDB::get_instance<Skeleton3D>(E.skeleton_id);
 		if (!target_skeleton) {
 			continue;
 		}
@@ -338,7 +338,7 @@ void RetargetModifier3D::_retarget_pose() {
 	}
 
 	for (const RetargetInfo &E : child_skeletons) {
-		Skeleton3D *target_skeleton = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(E.skeleton_id));
+		Skeleton3D *target_skeleton = ObjectDB::get_instance<Skeleton3D>(E.skeleton_id);
 		if (!target_skeleton) {
 			continue;
 		}
@@ -370,7 +370,7 @@ void RetargetModifier3D::_retarget_pose() {
 	}
 }
 
-void RetargetModifier3D::_process_modification() {
+void RetargetModifier3D::_process_modification(double p_delta) {
 	if (use_global_pose) {
 		_retarget_global_pose();
 	} else {
diff --git a/engine/scene/3d/retarget_modifier_3d.h b/engine/scene/3d/retarget_modifier_3d.h
index 07bc60a2..f1e4c3e3 100644
--- a/engine/scene/3d/retarget_modifier_3d.h
+++ b/engine/scene/3d/retarget_modifier_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RETARGET_MODIFIER_3D_H
-#define RETARGET_MODIFIER_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
 #include "scene/resources/skeleton_profile.h"
@@ -97,7 +96,7 @@ protected:
 	virtual void remove_child_notify(Node *p_child) override;
 
 	virtual void _set_active(bool p_active) override;
-	virtual void _process_modification() override;
+	virtual void _process_modification(double p_delta) override;
 
 public:
 	virtual PackedStringArray get_configuration_warnings() const override;
@@ -126,5 +125,3 @@ public:
 };
 
 VARIANT_BITFIELD_CAST(RetargetModifier3D::TransformFlag);
-
-#endif // RETARGET_MODIFIER_3D_H
diff --git a/engine/scene/3d/skeleton_3d.cpp b/engine/scene/3d/skeleton_3d.cpp
index 3fd77d46..0ca3e167 100644
--- a/engine/scene/3d/skeleton_3d.cpp
+++ b/engine/scene/3d/skeleton_3d.cpp
@@ -32,9 +32,9 @@
 #include "skeleton_3d.compat.inc"
 
 #include "scene/3d/skeleton_modifier_3d.h"
-#ifndef DISABLE_DEPRECATED
-#include "scene/3d/physical_bone_simulator_3d.h"
-#endif // _DISABLE_DEPRECATED
+#if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
+#include "scene/3d/physics/physical_bone_simulator_3d.h"
+#endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
 
 void SkinReference::_skin_changed() {
 	if (skeleton_node) {
@@ -67,12 +67,12 @@ SkinReference::~SkinReference() {
 ///////////////////////////////////////
 
 bool Skeleton3D::_set(const StringName &p_path, const Variant &p_value) {
-#ifndef DISABLE_DEPRECATED
+#if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 	if (p_path == SNAME("animate_physical_bones")) {
 		set_animate_physical_bones(p_value);
 		return true;
 	}
-#endif
+#endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
 	String path = p_path;
 
 	if (!path.begins_with("bones/")) {
@@ -139,12 +139,12 @@ bool Skeleton3D::_set(const StringName &p_path, const Variant &p_value) {
 }
 
 bool Skeleton3D::_get(const StringName &p_path, Variant &r_ret) const {
-#ifndef DISABLE_DEPRECATED
+#if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 	if (p_path == SNAME("animate_physical_bones")) {
 		r_ret = get_animate_physical_bones();
 		return true;
 	}
-#endif
+#endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
 	String path = p_path;
 
 	if (!path.begins_with("bones/")) {
@@ -297,7 +297,7 @@ StringName Skeleton3D::get_concatenated_bone_names() const {
 	return concatenated_bone_names;
 }
 
-#ifndef DISABLE_DEPRECATED
+#if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 void Skeleton3D::setup_simulator() {
 	if (simulator && simulator->get_parent() == this) {
 		remove_child(simulator);
@@ -310,7 +310,7 @@ void Skeleton3D::setup_simulator() {
 	add_child(simulator, false, INTERNAL_MODE_BACK);
 	set_animate_physical_bones(animate_physical_bones);
 }
-#endif // _DISABLE_DEPRECATED
+#endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
 
 void Skeleton3D::_notification(int p_what) {
 	switch (p_what) {
@@ -319,9 +319,9 @@ void Skeleton3D::_notification(int p_what) {
 			_make_dirty();
 			_make_modifiers_dirty();
 			force_update_all_dirty_bones();
-#ifndef DISABLE_DEPRECATED
+#if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 			setup_simulator();
-#endif // _DISABLE_DEPRECATED
+#endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
 			update_flags = UPDATE_FLAG_POSE;
 			_notification(NOTIFICATION_UPDATE_SKELETON);
 		} break;
@@ -357,7 +357,9 @@ void Skeleton3D::_notification(int p_what) {
 				// Store dirty flags for global bone poses.
 				bone_global_pose_dirty_backup = bone_global_pose_dirty;
 
-				_process_modifiers();
+				if (update_flags & UPDATE_FLAG_MODIFIER) {
+					_process_modifiers();
+				}
 			}
 
 			// Abort if pose is not changed.
@@ -438,13 +440,20 @@ void Skeleton3D::_notification(int p_what) {
 			updating = false;
 			update_flags = UPDATE_FLAG_NONE;
 		} break;
-		case NOTIFICATION_INTERNAL_PROCESS:
-		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
-			_find_modifiers();
-			if (!modifiers.is_empty()) {
-				_update_deferred(UPDATE_FLAG_MODIFIER);
-			}
+		case NOTIFICATION_INTERNAL_PROCESS: {
+			advance(get_process_delta_time());
 		} break;
+		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
+			advance(get_physics_process_delta_time());
+		} break;
+	}
+}
+
+void Skeleton3D::advance(double p_delta) {
+	_find_modifiers();
+	if (!modifiers.is_empty()) {
+		update_delta += p_delta; // Accumulate delta for manual advance as it needs to process in deferred update.
+		_update_deferred(UPDATE_FLAG_MODIFIER);
 	}
 }
 
@@ -467,6 +476,9 @@ void Skeleton3D::_process_changed() {
 	} else if (modifier_callback_mode_process == MODIFIER_CALLBACK_MODE_PROCESS_PHYSICS) {
 		set_process_internal(false);
 		set_physics_process_internal(true);
+	} else {
+		set_process_internal(false);
+		set_physics_process_internal(false);
 	}
 }
 
@@ -838,6 +850,13 @@ bool Skeleton3D::is_show_rest_only() const {
 void Skeleton3D::clear_bones() {
 	bones.clear();
 	name_to_bone_index.clear();
+
+	// All these structures contain references to now invalid bone indices.
+	skin_bindings.clear();
+	bone_global_pose_dirty.clear();
+	parentless_bones.clear();
+	nested_set_offset_to_bone_index.clear();
+
 	process_order_dirty = true;
 	version++;
 	_make_dirty();
@@ -1091,6 +1110,8 @@ void Skeleton3D::_force_update_bone_children_transforms(int p_bone_idx) const {
 	const int bone_size = bones.size();
 	ERR_FAIL_INDEX(p_bone_idx, bone_size);
 
+	_update_process_order();
+
 	Bone *bonesptr = bones.ptr();
 
 	// Loop through nested set.
@@ -1185,7 +1206,7 @@ void Skeleton3D::_process_modifiers() {
 			for (int i = 0; i < get_bone_count(); i++) {
 				old_poses.push_back(get_bone_pose(i));
 			}
-			mod->process_modification();
+			mod->process_modification(update_delta);
 			LocalVector<Transform3D> new_poses;
 			for (int i = 0; i < get_bone_count(); i++) {
 				new_poses.push_back(get_bone_pose(i));
@@ -1197,10 +1218,11 @@ void Skeleton3D::_process_modifiers() {
 				set_bone_pose(i, old_poses[i].interpolate_with(new_poses[i], influence));
 			}
 		} else {
-			mod->process_modification();
+			mod->process_modification(update_delta);
 		}
 		force_update_all_dirty_bones();
 	}
+	update_delta = 0; // Reset accumulated delta.
 }
 
 void Skeleton3D::add_child_notify(Node *p_child) {
@@ -1288,11 +1310,13 @@ void Skeleton3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_modifier_callback_mode_process", "mode"), &Skeleton3D::set_modifier_callback_mode_process);
 	ClassDB::bind_method(D_METHOD("get_modifier_callback_mode_process"), &Skeleton3D::get_modifier_callback_mode_process);
 
+	ClassDB::bind_method(D_METHOD("advance", "delta"), &Skeleton3D::advance);
+
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "motion_scale", PROPERTY_HINT_RANGE, "0.001,10,0.001,or_greater"), "set_motion_scale", "get_motion_scale");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_rest_only"), "set_show_rest_only", "is_show_rest_only");
 
 	ADD_GROUP("Modifier", "modifier_");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "modifier_callback_mode_process", PROPERTY_HINT_ENUM, "Physics,Idle"), "set_modifier_callback_mode_process", "get_modifier_callback_mode_process");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "modifier_callback_mode_process", PROPERTY_HINT_ENUM, "Physics,Idle,Manual"), "set_modifier_callback_mode_process", "get_modifier_callback_mode_process");
 
 	ADD_SIGNAL(MethodInfo("rest_updated"));
 	ADD_SIGNAL(MethodInfo("pose_updated"));
@@ -1304,6 +1328,7 @@ void Skeleton3D::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_UPDATE_SKELETON);
 	BIND_ENUM_CONSTANT(MODIFIER_CALLBACK_MODE_PROCESS_PHYSICS);
 	BIND_ENUM_CONSTANT(MODIFIER_CALLBACK_MODE_PROCESS_IDLE);
+	BIND_ENUM_CONSTANT(MODIFIER_CALLBACK_MODE_PROCESS_MANUAL);
 
 #ifndef DISABLE_DEPRECATED
 	ClassDB::bind_method(D_METHOD("clear_bones_global_pose_override"), &Skeleton3D::clear_bones_global_pose_override);
@@ -1311,6 +1336,7 @@ void Skeleton3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_bone_global_pose_override", "bone_idx"), &Skeleton3D::get_bone_global_pose_override);
 	ClassDB::bind_method(D_METHOD("get_bone_global_pose_no_override", "bone_idx"), &Skeleton3D::get_bone_global_pose_no_override);
 
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_animate_physical_bones", "enabled"), &Skeleton3D::set_animate_physical_bones);
 	ClassDB::bind_method(D_METHOD("get_animate_physical_bones"), &Skeleton3D::get_animate_physical_bones);
 	ClassDB::bind_method(D_METHOD("physical_bones_stop_simulation"), &Skeleton3D::physical_bones_stop_simulation);
@@ -1320,6 +1346,7 @@ void Skeleton3D::_bind_methods() {
 
 	ADD_GROUP("Deprecated", "");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "animate_physical_bones"), "set_animate_physical_bones", "get_animate_physical_bones");
+#endif // PHYSICS_3D_DISABLED
 #endif // _DISABLE_DEPRECATED
 }
 
@@ -1356,6 +1383,7 @@ Transform3D Skeleton3D::get_bone_global_pose_no_override(int p_bone) const {
 	return bones[p_bone].pose_global_no_override;
 }
 
+#ifndef PHYSICS_3D_DISABLED
 Node *Skeleton3D::get_simulator() {
 	return simulator;
 }
@@ -1406,6 +1434,7 @@ void Skeleton3D::physical_bones_remove_collision_exception(RID p_exception) {
 	}
 	sim->physical_bones_remove_collision_exception(p_exception);
 }
+#endif // PHYSICS_3D_DISABLED
 #endif // _DISABLE_DEPRECATED
 
 Skeleton3D::Skeleton3D() {
diff --git a/engine/scene/3d/skeleton_3d.h b/engine/scene/3d/skeleton_3d.h
index 5b91b50c..6e630437 100644
--- a/engine/scene/3d/skeleton_3d.h
+++ b/engine/scene/3d/skeleton_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_3D_H
-#define SKELETON_3D_H
+#pragma once
 
 #include "core/templates/a_hash_map.h"
 #include "scene/3d/node_3d.h"
@@ -70,16 +69,17 @@ class Skeleton3D : public Node3D {
 	bool saving = false;
 #endif //TOOLS_ENABLED
 
-#ifndef DISABLE_DEPRECATED
+#if !defined(DISABLE_DEPRECATED) && !defined(PHYSICS_3D_DISABLED)
 	bool animate_physical_bones = true;
 	Node *simulator = nullptr;
 	void setup_simulator();
-#endif // _DISABLE_DEPRECATED
+#endif // _DISABLE_DEPRECATED && PHYSICS_3D_DISABLED
 
 public:
 	enum ModifierCallbackModeProcess {
 		MODIFIER_CALLBACK_MODE_PROCESS_PHYSICS,
 		MODIFIER_CALLBACK_MODE_PROCESS_IDLE,
+		MODIFIER_CALLBACK_MODE_PROCESS_MANUAL,
 	};
 
 private:
@@ -94,6 +94,7 @@ private:
 	void _update_deferred(UpdateFlag p_update_flag = UPDATE_FLAG_POSE);
 	uint8_t update_flags = UPDATE_FLAG_NONE;
 	bool updating = false; // Is updating now?
+	double update_delta = 0.0;
 
 	struct Bone {
 		String name;
@@ -295,6 +296,8 @@ public:
 	void set_modifier_callback_mode_process(ModifierCallbackModeProcess p_mode);
 	ModifierCallbackModeProcess get_modifier_callback_mode_process() const;
 
+	void advance(double p_delta);
+
 #ifndef DISABLE_DEPRECATED
 	Transform3D get_bone_global_pose_no_override(int p_bone) const;
 	void clear_bones_global_pose_override();
@@ -302,12 +305,14 @@ public:
 	void set_bone_global_pose_override(int p_bone, const Transform3D &p_pose, real_t p_amount, bool p_persistent = false);
 
 	Node *get_simulator();
+#ifndef PHYSICS_3D_DISABLED
 	void set_animate_physical_bones(bool p_enabled);
 	bool get_animate_physical_bones() const;
 	void physical_bones_stop_simulation();
 	void physical_bones_start_simulation_on(const TypedArray<StringName> &p_bones);
 	void physical_bones_add_collision_exception(RID p_exception);
 	void physical_bones_remove_collision_exception(RID p_exception);
+#endif // PHYSICS_3D_DISABLED
 #endif // _DISABLE_DEPRECATED
 
 public:
@@ -316,5 +321,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(Skeleton3D::ModifierCallbackModeProcess);
-
-#endif // SKELETON_3D_H
diff --git a/engine/scene/3d/skeleton_ik_3d.cpp b/engine/scene/3d/skeleton_ik_3d.cpp
index 2476e7d5..3c3c3990 100644
--- a/engine/scene/3d/skeleton_ik_3d.cpp
+++ b/engine/scene/3d/skeleton_ik_3d.cpp
@@ -366,7 +366,7 @@ void SkeletonIK3D::_bind_methods() {
 #endif
 }
 
-void SkeletonIK3D::_process_modification() {
+void SkeletonIK3D::_process_modification(double p_delta) {
 	if (!internal_active) {
 		return;
 	}
@@ -485,7 +485,7 @@ bool SkeletonIK3D::is_running() {
 void SkeletonIK3D::start(bool p_one_time) {
 	if (p_one_time) {
 		internal_active = true;
-		SkeletonModifier3D::process_modification();
+		SkeletonModifier3D::process_modification(0);
 		internal_active = false;
 	} else {
 		internal_active = true;
diff --git a/engine/scene/3d/skeleton_ik_3d.h b/engine/scene/3d/skeleton_ik_3d.h
index 94145a69..3bad4de9 100644
--- a/engine/scene/3d/skeleton_ik_3d.h
+++ b/engine/scene/3d/skeleton_ik_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_IK_3D_H
-#define SKELETON_IK_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
 
@@ -145,7 +144,7 @@ protected:
 	static void _bind_methods();
 	virtual void _notification(int p_what);
 
-	virtual void _process_modification() override;
+	virtual void _process_modification(double p_delta) override;
 
 public:
 	SkeletonIK3D();
@@ -191,5 +190,3 @@ private:
 	void reload_goal();
 	void _solve_chain();
 };
-
-#endif // SKELETON_IK_3D_H
diff --git a/engine/scene/3d/skeleton_modifier_3d.cpp b/engine/scene/3d/skeleton_modifier_3d.cpp
index ad42526f..ccbc6506 100644
--- a/engine/scene/3d/skeleton_modifier_3d.cpp
+++ b/engine/scene/3d/skeleton_modifier_3d.cpp
@@ -45,7 +45,7 @@ PackedStringArray SkeletonModifier3D::get_configuration_warnings() const {
 /* Skeleton3D */
 
 Skeleton3D *SkeletonModifier3D::get_skeleton() const {
-	return Object::cast_to<Skeleton3D>(ObjectDB::get_instance(skeleton_id));
+	return ObjectDB::get_instance<Skeleton3D>(skeleton_id);
 }
 
 void SkeletonModifier3D::_update_skeleton_path() {
@@ -113,16 +113,23 @@ real_t SkeletonModifier3D::get_influence() const {
 	return influence;
 }
 
-void SkeletonModifier3D::process_modification() {
+void SkeletonModifier3D::process_modification(double p_delta) {
 	if (!active) {
 		return;
 	}
-	_process_modification();
+	_process_modification(p_delta);
 	emit_signal(SNAME("modification_processed"));
 }
 
-void SkeletonModifier3D::_process_modification() {
-	GDVIRTUAL_CALL(_process_modification);
+void SkeletonModifier3D::_process_modification(double p_delta) {
+	if (GDVIRTUAL_CALL(_process_modification_with_delta, p_delta)) {
+		return;
+	}
+#ifndef DISABLE_DEPRECATED
+	if (GDVIRTUAL_CALL(_process_modification)) {
+		return;
+	}
+#endif // DISABLE_DEPRECATED
 }
 
 void SkeletonModifier3D::_notification(int p_what) {
@@ -151,7 +158,10 @@ void SkeletonModifier3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "influence", PROPERTY_HINT_RANGE, "0,1,0.001"), "set_influence", "get_influence");
 
 	ADD_SIGNAL(MethodInfo("modification_processed"));
+	GDVIRTUAL_BIND(_process_modification_with_delta, "delta");
+#ifndef DISABLE_DEPRECATED
 	GDVIRTUAL_BIND(_process_modification);
+#endif
 
 	BIND_ENUM_CONSTANT(BONE_AXIS_PLUS_X);
 	BIND_ENUM_CONSTANT(BONE_AXIS_MINUS_X);
diff --git a/engine/scene/3d/skeleton_modifier_3d.h b/engine/scene/3d/skeleton_modifier_3d.h
index c7106cb0..7710539c 100644
--- a/engine/scene/3d/skeleton_modifier_3d.h
+++ b/engine/scene/3d/skeleton_modifier_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFIER_3D_H
-#define SKELETON_MODIFIER_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -69,8 +68,12 @@ protected:
 
 	virtual void _set_active(bool p_active);
 
-	virtual void _process_modification();
+	virtual void _process_modification(double p_delta);
+	// TODO: In Godot 5, should obsolete old GDVIRTUAL0(_process_modification); and replace it with _process_modification_with_delta as GDVIRTUAL1(_process_modification, double).
+	GDVIRTUAL1(_process_modification_with_delta, double);
+#ifndef DISABLE_DEPRECATED
 	GDVIRTUAL0(_process_modification);
+#endif
 
 public:
 	virtual PackedStringArray get_configuration_warnings() const override;
@@ -84,7 +87,7 @@ public:
 
 	Skeleton3D *get_skeleton() const;
 
-	void process_modification();
+	void process_modification(double p_delta);
 
 	// Utility APIs.
 	static Vector3 get_vector_from_bone_axis(BoneAxis p_axis);
@@ -99,5 +102,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(SkeletonModifier3D::BoneAxis);
-
-#endif // SKELETON_MODIFIER_3D_H
diff --git a/engine/scene/3d/spring_bone_collision_3d.h b/engine/scene/3d/spring_bone_collision_3d.h
index 31676ba5..9121eb34 100644
--- a/engine/scene/3d/spring_bone_collision_3d.h
+++ b/engine/scene/3d/spring_bone_collision_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_BONE_COLLISION_3D_H
-#define SPRING_BONE_COLLISION_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_3d.h"
 
@@ -68,5 +67,3 @@ public:
 
 	Vector3 collide(const Transform3D &p_center, float p_bone_radius, float p_bone_length, const Vector3 &p_current) const;
 };
-
-#endif // SPRING_BONE_COLLISION_3D_H
diff --git a/engine/scene/3d/spring_bone_collision_capsule_3d.h b/engine/scene/3d/spring_bone_collision_capsule_3d.h
index 0e24bed6..61ee79cd 100644
--- a/engine/scene/3d/spring_bone_collision_capsule_3d.h
+++ b/engine/scene/3d/spring_bone_collision_capsule_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_BONE_COLLISION_CAPSULE_3D_H
-#define SPRING_BONE_COLLISION_CAPSULE_3D_H
+#pragma once
 
 #include "scene/3d/spring_bone_collision_3d.h"
 
@@ -56,5 +55,3 @@ public:
 	// Helper.
 	Pair<Vector3, Vector3> get_head_and_tail(const Transform3D &p_center) const;
 };
-
-#endif // SPRING_BONE_COLLISION_CAPSULE_3D_H
diff --git a/engine/scene/3d/spring_bone_collision_plane_3d.h b/engine/scene/3d/spring_bone_collision_plane_3d.h
index 0f3896aa..0d6a44e0 100644
--- a/engine/scene/3d/spring_bone_collision_plane_3d.h
+++ b/engine/scene/3d/spring_bone_collision_plane_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_BONE_COLLISION_PLANE_3D_H
-#define SPRING_BONE_COLLISION_PLANE_3D_H
+#pragma once
 
 #include "scene/3d/spring_bone_collision_3d.h"
 
@@ -39,5 +38,3 @@ class SpringBoneCollisionPlane3D : public SpringBoneCollision3D {
 protected:
 	virtual Vector3 _collide(const Transform3D &p_center, float p_bone_radius, float p_bone_length, const Vector3 &p_current) const override;
 };
-
-#endif // SPRING_BONE_COLLISION_PLANE_3D_H
diff --git a/engine/scene/3d/spring_bone_collision_sphere_3d.h b/engine/scene/3d/spring_bone_collision_sphere_3d.h
index 4de0f937..2f109544 100644
--- a/engine/scene/3d/spring_bone_collision_sphere_3d.h
+++ b/engine/scene/3d/spring_bone_collision_sphere_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_BONE_COLLISION_SPHERE_3D_H
-#define SPRING_BONE_COLLISION_SPHERE_3D_H
+#pragma once
 
 #include "scene/3d/spring_bone_collision_3d.h"
 
@@ -55,5 +54,3 @@ public:
 	void set_inside(bool p_enabled);
 	bool is_inside() const;
 };
-
-#endif // SPRING_BONE_COLLISION_SPHERE_3D_H
diff --git a/engine/scene/3d/spring_bone_simulator_3d.cpp b/engine/scene/3d/spring_bone_simulator_3d.cpp
index 3248cd58..cf2e6722 100644
--- a/engine/scene/3d/spring_bone_simulator_3d.cpp
+++ b/engine/scene/3d/spring_bone_simulator_3d.cpp
@@ -607,6 +607,7 @@ void SpringBoneSimulator3D::set_radius(int p_index, float p_radius) {
 }
 
 float SpringBoneSimulator3D::get_radius(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, settings.size(), 0);
 	return settings[p_index]->radius;
 }
 
@@ -640,6 +641,7 @@ void SpringBoneSimulator3D::set_stiffness(int p_index, float p_stiffness) {
 }
 
 float SpringBoneSimulator3D::get_stiffness(int p_index) const {
+	ERR_FAIL_INDEX_V(p_index, settings.size(), 0);
 	return settings[p_index]->stiffness;
 }
 
@@ -762,8 +764,15 @@ SpringBoneSimulator3D::RotationAxis SpringBoneSimulator3D::get_rotation_axis(int
 
 void SpringBoneSimulator3D::set_setting_count(int p_count) {
 	ERR_FAIL_COND(p_count < 0);
-	int delta = p_count - settings.size() + 1;
+
+	int delta = p_count - settings.size();
+	if (delta < 0) {
+		for (int i = delta; i < 0; i++) {
+			memdelete(settings[settings.size() + i]);
+		}
+	}
 	settings.resize(p_count);
+	delta++;
 	if (delta > 1) {
 		for (int i = 1; i < delta; i++) {
 			settings.write[p_count - i] = memnew(SpringBone3DSetting);
@@ -949,8 +958,14 @@ void SpringBoneSimulator3D::set_joint_count(int p_index, int p_count) {
 	ERR_FAIL_INDEX(p_index, settings.size());
 	ERR_FAIL_COND(p_count < 0);
 	Vector<SpringBone3DJointSetting *> &joints = settings[p_index]->joints;
-	int delta = p_count - joints.size() + 1;
+	int delta = p_count - joints.size();
+	if (delta < 0) {
+		for (int i = delta; i < 0; i++) {
+			memdelete(joints[joints.size() + i]);
+		}
+	}
 	joints.resize(p_count);
+	delta++;
 	if (delta > 1) {
 		for (int i = 1; i < delta; i++) {
 			joints.write[p_count - i] = memnew(SpringBone3DJointSetting);
@@ -1098,6 +1113,14 @@ LocalVector<ObjectID> SpringBoneSimulator3D::get_valid_collision_instance_ids(in
 	return settings[p_index]->cached_collisions;
 }
 
+void SpringBoneSimulator3D::set_external_force(const Vector3 &p_force) {
+	external_force = p_force;
+}
+
+Vector3 SpringBoneSimulator3D::get_external_force() const {
+	return external_force;
+}
+
 void SpringBoneSimulator3D::_bind_methods() {
 	// Setting.
 	ClassDB::bind_method(D_METHOD("set_root_bone_name", "index", "bone_name"), &SpringBoneSimulator3D::set_root_bone_name);
@@ -1190,9 +1213,13 @@ void SpringBoneSimulator3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_collision_count", "index"), &SpringBoneSimulator3D::get_collision_count);
 	ClassDB::bind_method(D_METHOD("clear_collisions", "index"), &SpringBoneSimulator3D::clear_collisions);
 
+	ClassDB::bind_method(D_METHOD("set_external_force", "force"), &SpringBoneSimulator3D::set_external_force);
+	ClassDB::bind_method(D_METHOD("get_external_force"), &SpringBoneSimulator3D::get_external_force);
+
 	// To process manually.
 	ClassDB::bind_method(D_METHOD("reset"), &SpringBoneSimulator3D::reset);
 
+	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "external_force", PROPERTY_HINT_RANGE, "-99999,99999,or_greater,or_less,hide_slider,suffix:m/s"), "set_external_force", "get_external_force");
 	ADD_ARRAY_COUNT("Settings", "setting_count", "set_setting_count", "get_setting_count", "settings/");
 
 	BIND_ENUM_CONSTANT(BONE_DIRECTION_PLUS_X);
@@ -1344,6 +1371,9 @@ void SpringBoneSimulator3D::_find_collisions() {
 }
 
 void SpringBoneSimulator3D::_process_collisions() {
+	if (!is_inside_tree()) {
+		return;
+	}
 	for (const ObjectID &oid : collisions) {
 		Object *t_obj = ObjectDB::get_instance(oid);
 		if (!t_obj) {
@@ -1466,7 +1496,11 @@ void SpringBoneSimulator3D::_set_active(bool p_active) {
 	}
 }
 
-void SpringBoneSimulator3D::_process_modification() {
+void SpringBoneSimulator3D::_process_modification(double p_delta) {
+	if (!is_inside_tree()) {
+		return;
+	}
+
 	Skeleton3D *skeleton = get_skeleton();
 	if (!skeleton) {
 		return;
@@ -1480,14 +1514,16 @@ void SpringBoneSimulator3D::_process_modification() {
 	}
 #endif //TOOLS_ENABLED
 
-	double delta = skeleton->get_modifier_callback_mode_process() == Skeleton3D::MODIFIER_CALLBACK_MODE_PROCESS_IDLE ? skeleton->get_process_delta_time() : skeleton->get_physics_process_delta_time();
 	for (int i = 0; i < settings.size(); i++) {
 		_init_joints(skeleton, settings[i]);
-		_process_joints(delta, skeleton, settings[i]->joints, get_valid_collision_instance_ids(i), settings[i]->cached_center, settings[i]->cached_inverted_center, settings[i]->cached_inverted_center.basis.get_rotation_quaternion());
+		_process_joints(p_delta, skeleton, settings[i]->joints, get_valid_collision_instance_ids(i), settings[i]->cached_center, settings[i]->cached_inverted_center, settings[i]->cached_inverted_center.basis.get_rotation_quaternion());
 	}
 }
 
 void SpringBoneSimulator3D::reset() {
+	if (!is_inside_tree()) {
+		return;
+	}
 	Skeleton3D *skeleton = get_skeleton();
 	if (!skeleton) {
 		return;
@@ -1580,7 +1616,7 @@ void SpringBoneSimulator3D::_process_joints(double p_delta, Skeleton3D *p_skelet
 		Transform3D current_world_pose = p_center_transform * current_global_pose;
 		Quaternion current_rot = current_global_pose.basis.get_rotation_quaternion();
 		Vector3 current_origin = p_center_transform.xform(current_global_pose.origin);
-		Vector3 external = p_inverted_center_rotation.xform(p_joints[i]->gravity_direction * p_joints[i]->gravity * p_delta);
+		Vector3 external = p_inverted_center_rotation.xform((external_force + p_joints[i]->gravity_direction * p_joints[i]->gravity) * p_delta);
 
 		// Integration of velocity by verlet.
 		Vector3 next_tail = verlet->current_tail +
@@ -1647,3 +1683,7 @@ Quaternion SpringBoneSimulator3D::get_from_to_rotation(const Vector3 &p_from, co
 	}
 	return Quaternion(axis.normalized(), angle);
 }
+
+SpringBoneSimulator3D::~SpringBoneSimulator3D() {
+	clear_settings();
+}
diff --git a/engine/scene/3d/spring_bone_simulator_3d.h b/engine/scene/3d/spring_bone_simulator_3d.h
index 1954d903..d2398b08 100644
--- a/engine/scene/3d/spring_bone_simulator_3d.h
+++ b/engine/scene/3d/spring_bone_simulator_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRING_BONE_SIMULATOR_3D_H
-#define SPRING_BONE_SIMULATOR_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
 
@@ -142,6 +141,7 @@ public:
 
 protected:
 	Vector<SpringBone3DSetting *> settings;
+	Vector3 external_force;
 
 	bool _get(const StringName &p_path, Variant &r_ret) const;
 	bool _set(const StringName &p_path, const Variant &p_value);
@@ -153,7 +153,7 @@ protected:
 	static void _bind_methods();
 
 	virtual void _set_active(bool p_active) override;
-	virtual void _process_modification() override;
+	virtual void _process_modification(double p_delta) override;
 	void _init_joints(Skeleton3D *p_skeleton, SpringBone3DSetting *p_setting);
 	void _process_joints(double p_delta, Skeleton3D *p_skeleton, Vector<SpringBone3DJointSetting *> &p_joints, const LocalVector<ObjectID> &p_collisions, const Transform3D &p_center_transform, const Transform3D &p_inverted_center_transform, const Quaternion &p_inverted_center_rotation);
 
@@ -269,6 +269,9 @@ public:
 
 	LocalVector<ObjectID> get_valid_collision_instance_ids(int p_index);
 
+	void set_external_force(const Vector3 &p_force);
+	Vector3 get_external_force() const;
+
 	// Helper.
 	static Quaternion get_local_pose_rotation(Skeleton3D *p_skeleton, int p_bone, const Quaternion &p_global_pose_rotation);
 	static Quaternion get_from_to_rotation(const Vector3 &p_from, const Vector3 &p_to, const Quaternion &p_prev_rot);
@@ -281,10 +284,10 @@ public:
 #ifdef TOOLS_ENABLED
 	virtual bool is_processed_on_saving() const override { return true; }
 #endif
+
+	~SpringBoneSimulator3D();
 };
 
 VARIANT_ENUM_CAST(SpringBoneSimulator3D::BoneDirection);
 VARIANT_ENUM_CAST(SpringBoneSimulator3D::CenterFrom);
 VARIANT_ENUM_CAST(SpringBoneSimulator3D::RotationAxis);
-
-#endif // SPRING_BONE_SIMULATOR_3D_H
diff --git a/engine/scene/3d/sprite_3d.cpp b/engine/scene/3d/sprite_3d.cpp
index fb62b46e..4f2f2411 100644
--- a/engine/scene/3d/sprite_3d.cpp
+++ b/engine/scene/3d/sprite_3d.cpp
@@ -1186,7 +1186,7 @@ void AnimatedSprite3D::set_sprite_frames(const Ref<SpriteFrames> &p_frames) {
 
 		List<StringName> al;
 		frames->get_animation_list(&al);
-		if (al.size() == 0) {
+		if (al.is_empty()) {
 			set_animation(StringName());
 			autoplay = String();
 		} else {
diff --git a/engine/scene/3d/sprite_3d.h b/engine/scene/3d/sprite_3d.h
index 87327cac..322904a1 100644
--- a/engine/scene/3d/sprite_3d.h
+++ b/engine/scene/3d/sprite_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRITE_3D_H
-#define SPRITE_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/sprite_frames.h"
@@ -296,5 +295,3 @@ public:
 
 VARIANT_ENUM_CAST(SpriteBase3D::DrawFlags);
 VARIANT_ENUM_CAST(SpriteBase3D::AlphaCutMode);
-
-#endif // SPRITE_3D_H
diff --git a/engine/scene/3d/velocity_tracker_3d.h b/engine/scene/3d/velocity_tracker_3d.h
index 418438ed..9ef5d4ba 100644
--- a/engine/scene/3d/velocity_tracker_3d.h
+++ b/engine/scene/3d/velocity_tracker_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VELOCITY_TRACKER_3D_H
-#define VELOCITY_TRACKER_3D_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -55,5 +54,3 @@ public:
 
 	VelocityTracker3D();
 };
-
-#endif // VELOCITY_TRACKER_3D_H
diff --git a/engine/scene/3d/visible_on_screen_notifier_3d.cpp b/engine/scene/3d/visible_on_screen_notifier_3d.cpp
index a510540e..03307599 100644
--- a/engine/scene/3d/visible_on_screen_notifier_3d.cpp
+++ b/engine/scene/3d/visible_on_screen_notifier_3d.cpp
@@ -144,7 +144,7 @@ NodePath VisibleOnScreenEnabler3D::get_enable_node_path() {
 }
 
 void VisibleOnScreenEnabler3D::_update_enable_mode(bool p_enable) {
-	Node *node = static_cast<Node *>(ObjectDB::get_instance(node_id));
+	Node *node = ObjectDB::get_instance<Node>(node_id);
 	if (node) {
 		if (p_enable) {
 			switch (enable_mode) {
diff --git a/engine/scene/3d/visible_on_screen_notifier_3d.h b/engine/scene/3d/visible_on_screen_notifier_3d.h
index cb4c535c..79114690 100644
--- a/engine/scene/3d/visible_on_screen_notifier_3d.h
+++ b/engine/scene/3d/visible_on_screen_notifier_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISIBLE_ON_SCREEN_NOTIFIER_3D_H
-#define VISIBLE_ON_SCREEN_NOTIFIER_3D_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -93,5 +92,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(VisibleOnScreenEnabler3D::EnableMode);
-
-#endif // VISIBLE_ON_SCREEN_NOTIFIER_3D_H
diff --git a/engine/scene/3d/visual_instance_3d.h b/engine/scene/3d/visual_instance_3d.h
index 7091a8f1..608352a7 100644
--- a/engine/scene/3d/visual_instance_3d.h
+++ b/engine/scene/3d/visual_instance_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISUAL_INSTANCE_3D_H
-#define VISUAL_INSTANCE_3D_H
+#pragma once
 
 #include "scene/3d/node_3d.h"
 
@@ -213,5 +212,3 @@ VARIANT_ENUM_CAST(GeometryInstance3D::ShadowCastingSetting);
 VARIANT_ENUM_CAST(GeometryInstance3D::GIMode);
 VARIANT_ENUM_CAST(GeometryInstance3D::LightmapScale);
 VARIANT_ENUM_CAST(GeometryInstance3D::VisibilityRangeFadeMode);
-
-#endif // VISUAL_INSTANCE_3D_H
diff --git a/engine/scene/3d/voxel_gi.cpp b/engine/scene/3d/voxel_gi.cpp
index 25f5d13f..232df7ce 100644
--- a/engine/scene/3d/voxel_gi.cpp
+++ b/engine/scene/3d/voxel_gi.cpp
@@ -542,6 +542,8 @@ PackedStringArray VoxelGI::get_configuration_warnings() const {
 
 	if (OS::get_singleton()->get_current_rendering_method() == "gl_compatibility") {
 		warnings.push_back(RTR("VoxelGI nodes are not supported when using the Compatibility renderer yet. Support will be added in a future release."));
+	} else if (OS::get_singleton()->get_current_rendering_method() == "dummy") {
+		warnings.push_back(RTR("VoxelGI nodes are not supported when using the Dummy renderer."));
 	} else if (probe_data.is_null()) {
 		warnings.push_back(RTR("No VoxelGI data set, so this node is disabled. Bake static objects to enable GI."));
 	}
diff --git a/engine/scene/3d/voxel_gi.h b/engine/scene/3d/voxel_gi.h
index d7e0d74d..46b0c58d 100644
--- a/engine/scene/3d/voxel_gi.h
+++ b/engine/scene/3d/voxel_gi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VOXEL_GI_H
-#define VOXEL_GI_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 
@@ -170,5 +169,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(VoxelGI::Subdiv)
-
-#endif // VOXEL_GI_H
diff --git a/engine/scene/3d/voxelizer.cpp b/engine/scene/3d/voxelizer.cpp
index 711b265b..41f6e060 100644
--- a/engine/scene/3d/voxelizer.cpp
+++ b/engine/scene/3d/voxelizer.cpp
@@ -86,7 +86,7 @@ void Voxelizer::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, co
 		for (int i = 0; i < 3; i++) {
 			Vector3 axis;
 			axis[i] = 1.0;
-			real_t dot = ABS(normal.dot(axis));
+			real_t dot = Math::abs(normal.dot(axis));
 			if (i == 0 || dot > closest_dot) {
 				closest_axis = i;
 				closest_dot = dot;
@@ -136,7 +136,7 @@ void Voxelizer::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, co
 				Vector3 intersection;
 
 				if (!plane.intersects_segment(ray_from, ray_to, &intersection)) {
-					if (ABS(plane.distance_to(ray_from)) < ABS(plane.distance_to(ray_to))) {
+					if (Math::abs(plane.distance_to(ray_from)) < Math::abs(plane.distance_to(ray_to))) {
 						intersection = plane.project(ray_from);
 					} else {
 						intersection = plane.project(ray_to);
@@ -399,6 +399,9 @@ int Voxelizer::get_bake_steps(Ref<Mesh> &p_mesh) const {
 Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh> &p_mesh, const Vector<Ref<Material>> &p_materials, const Ref<Material> &p_override_material, BakeStepFunc p_bake_step_func) {
 	ERR_FAIL_COND_V_MSG(!p_xform.is_finite(), BAKE_RESULT_INVALID_PARAMETER, "Invalid mesh bake transform.");
 
+	// Precalculate for transforming vertex normals
+	Basis normal_xform = p_xform.basis.inverse().transposed();
+
 	int bake_total = get_bake_steps(p_mesh), bake_current = 0;
 
 	for (int i = 0; i < p_mesh->get_surface_count(); i++) {
@@ -463,7 +466,7 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
 
 				if (nr) {
 					for (int k = 0; k < 3; k++) {
-						normal[k] = nr[ir[j * 3 + k]];
+						normal[k] = normal_xform.xform(nr[ir[j * 3 + k]]).normalized();
 					}
 				}
 
@@ -813,7 +816,6 @@ Vector<int> Voxelizer::get_voxel_gi_level_cell_count() const {
 // https://prideout.net/blog/distance_fields/
 
 #define square(m_s) ((m_s) * (m_s))
-#define INF 1e20
 
 /* dt of 1d function using squared distance */
 static void edt(float *f, int stride, int n) {
@@ -823,8 +825,8 @@ static void edt(float *f, int stride, int n) {
 
 	int k = 0;
 	v[0] = 0;
-	z[0] = -INF;
-	z[1] = +INF;
+	z[0] = -Math::INF;
+	z[1] = +Math::INF;
 	for (int q = 1; q <= n - 1; q++) {
 		float s = ((f[q * stride] + square(q)) - (f[v[k] * stride] + square(v[k]))) / (2 * q - 2 * v[k]);
 		while (s <= z[k]) {
@@ -835,7 +837,7 @@ static void edt(float *f, int stride, int n) {
 		v[k] = q;
 
 		z[k] = s;
-		z[k + 1] = +INF;
+		z[k + 1] = +Math::INF;
 	}
 
 	k = 0;
@@ -859,7 +861,7 @@ Voxelizer::BakeResult Voxelizer::get_sdf_3d_image(Vector<uint8_t> &r_image, Bake
 	uint32_t float_count = octree_size.x * octree_size.y * octree_size.z;
 	float *work_memory = memnew_arr(float, float_count);
 	for (uint32_t i = 0; i < float_count; i++) {
-		work_memory[i] = INF;
+		work_memory[i] = Math::INF;
 	}
 
 	uint32_t y_mult = octree_size.x;
@@ -942,8 +944,6 @@ Voxelizer::BakeResult Voxelizer::get_sdf_3d_image(Vector<uint8_t> &r_image, Bake
 	return BAKE_RESULT_OK;
 }
 
-#undef INF
-
 void Voxelizer::_debug_mesh(int p_idx, int p_level, const AABB &p_aabb, Ref<MultiMesh> &p_multimesh, int &idx) {
 	if (p_level == cell_subdiv - 1) {
 		Vector3 center = p_aabb.get_center();
diff --git a/engine/scene/3d/voxelizer.h b/engine/scene/3d/voxelizer.h
index 161fa0e2..5c5f7c7c 100644
--- a/engine/scene/3d/voxelizer.h
+++ b/engine/scene/3d/voxelizer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VOXELIZER_H
-#define VOXELIZER_H
+#pragma once
 
 #include "scene/resources/multimesh.h"
 
@@ -138,5 +137,3 @@ public:
 	Transform3D get_to_cell_space_xform() const;
 	Voxelizer();
 };
-
-#endif // VOXELIZER_H
diff --git a/engine/scene/3d/world_environment.h b/engine/scene/3d/world_environment.h
index 53a695d7..39ac9012 100644
--- a/engine/scene/3d/world_environment.h
+++ b/engine/scene/3d/world_environment.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WORLD_ENVIRONMENT_H
-#define WORLD_ENVIRONMENT_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "scene/resources/camera_attributes.h"
@@ -65,5 +64,3 @@ public:
 
 	WorldEnvironment();
 };
-
-#endif // WORLD_ENVIRONMENT_H
diff --git a/engine/scene/3d/xr/SCsub b/engine/scene/3d/xr/SCsub
new file mode 100644
index 00000000..374dc211
--- /dev/null
+++ b/engine/scene/3d/xr/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.scene_sources, "*.cpp")
diff --git a/engine/scene/3d/xr_body_modifier_3d.cpp b/engine/scene/3d/xr/xr_body_modifier_3d.cpp
similarity index 99%
rename from engine/scene/3d/xr_body_modifier_3d.cpp
rename to engine/scene/3d/xr/xr_body_modifier_3d.cpp
index 9cdf732d..80f00d8b 100644
--- a/engine/scene/3d/xr_body_modifier_3d.cpp
+++ b/engine/scene/3d/xr/xr_body_modifier_3d.cpp
@@ -238,7 +238,7 @@ void XRBodyModifier3D::_get_joint_data() {
 	}
 }
 
-void XRBodyModifier3D::_process_modification() {
+void XRBodyModifier3D::_process_modification(double p_delta) {
 	Skeleton3D *skeleton = get_skeleton();
 	if (!skeleton) {
 		return;
diff --git a/engine/scene/3d/xr_body_modifier_3d.h b/engine/scene/3d/xr/xr_body_modifier_3d.h
similarity index 96%
rename from engine/scene/3d/xr_body_modifier_3d.h
rename to engine/scene/3d/xr/xr_body_modifier_3d.h
index 78d70146..123daf89 100644
--- a/engine/scene/3d/xr_body_modifier_3d.h
+++ b/engine/scene/3d/xr/xr_body_modifier_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_BODY_MODIFIER_3D_H
-#define XR_BODY_MODIFIER_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
 #include "servers/xr/xr_body_tracker.h"
@@ -72,7 +71,7 @@ protected:
 	static void _bind_methods();
 
 	virtual void _skeleton_changed(Skeleton3D *p_old, Skeleton3D *p_new) override;
-	virtual void _process_modification() override;
+	virtual void _process_modification(double p_delta) override;
 
 private:
 	struct JointData {
@@ -91,5 +90,3 @@ private:
 
 VARIANT_BITFIELD_CAST(XRBodyModifier3D::BodyUpdate)
 VARIANT_ENUM_CAST(XRBodyModifier3D::BoneUpdate)
-
-#endif // XR_BODY_MODIFIER_3D_H
diff --git a/engine/scene/3d/xr_face_modifier_3d.cpp b/engine/scene/3d/xr/xr_face_modifier_3d.cpp
similarity index 99%
rename from engine/scene/3d/xr_face_modifier_3d.cpp
rename to engine/scene/3d/xr/xr_face_modifier_3d.cpp
index a176c3c3..ff2b9ace 100644
--- a/engine/scene/3d/xr_face_modifier_3d.cpp
+++ b/engine/scene/3d/xr/xr_face_modifier_3d.cpp
@@ -341,7 +341,7 @@ static int find_face_blend_shape(const StringName &p_name) {
 	};
 
 	// Convert the name to lower-case and strip non-alphanumeric characters.
-	const String name = String(p_name).to_lower().replace("_", "");
+	const String name = String(p_name).to_lower().remove_char('_');
 
 	// Iterate through the blend map.
 	for (const blend_map_entry &entry : blend_map) {
diff --git a/engine/scene/3d/xr_face_modifier_3d.h b/engine/scene/3d/xr/xr_face_modifier_3d.h
similarity index 96%
rename from engine/scene/3d/xr_face_modifier_3d.h
rename to engine/scene/3d/xr/xr_face_modifier_3d.h
index e5e59afe..75acb79b 100644
--- a/engine/scene/3d/xr_face_modifier_3d.h
+++ b/engine/scene/3d/xr/xr_face_modifier_3d.h
@@ -28,10 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_FACE_MODIFIER_3D_H
-#define XR_FACE_MODIFIER_3D_H
+#pragma once
 
-#include "mesh_instance_3d.h"
+#include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/node_3d.h"
 
 /**
@@ -69,5 +68,3 @@ public:
 
 	void _notification(int p_what);
 };
-
-#endif // XR_FACE_MODIFIER_3D_H
diff --git a/engine/scene/3d/xr_hand_modifier_3d.cpp b/engine/scene/3d/xr/xr_hand_modifier_3d.cpp
similarity index 99%
rename from engine/scene/3d/xr_hand_modifier_3d.cpp
rename to engine/scene/3d/xr/xr_hand_modifier_3d.cpp
index 7a44f1ad..872e169f 100644
--- a/engine/scene/3d/xr_hand_modifier_3d.cpp
+++ b/engine/scene/3d/xr/xr_hand_modifier_3d.cpp
@@ -183,7 +183,7 @@ void XRHandModifier3D::_get_joint_data() {
 	}
 }
 
-void XRHandModifier3D::_process_modification() {
+void XRHandModifier3D::_process_modification(double p_delta) {
 	Skeleton3D *skeleton = get_skeleton();
 	if (!skeleton) {
 		return;
diff --git a/engine/scene/3d/xr_hand_modifier_3d.h b/engine/scene/3d/xr/xr_hand_modifier_3d.h
similarity index 96%
rename from engine/scene/3d/xr_hand_modifier_3d.h
rename to engine/scene/3d/xr/xr_hand_modifier_3d.h
index d58ccd0a..e3075618 100644
--- a/engine/scene/3d/xr_hand_modifier_3d.h
+++ b/engine/scene/3d/xr/xr_hand_modifier_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_HAND_MODIFIER_3D_H
-#define XR_HAND_MODIFIER_3D_H
+#pragma once
 
 #include "scene/3d/skeleton_modifier_3d.h"
 #include "servers/xr/xr_hand_tracker.h"
@@ -63,7 +62,7 @@ protected:
 	static void _bind_methods();
 
 	virtual void _skeleton_changed(Skeleton3D *p_old, Skeleton3D *p_new) override;
-	virtual void _process_modification() override;
+	virtual void _process_modification(double p_delta) override;
 
 private:
 	struct JointData {
@@ -83,5 +82,3 @@ private:
 };
 
 VARIANT_ENUM_CAST(XRHandModifier3D::BoneUpdate)
-
-#endif // XR_HAND_MODIFIER_3D_H
diff --git a/engine/scene/3d/xr_nodes.cpp b/engine/scene/3d/xr/xr_nodes.cpp
similarity index 90%
rename from engine/scene/3d/xr_nodes.cpp
rename to engine/scene/3d/xr/xr_nodes.cpp
index 4ab6e4ca..12e01c78 100644
--- a/engine/scene/3d/xr_nodes.cpp
+++ b/engine/scene/3d/xr/xr_nodes.cpp
@@ -72,7 +72,35 @@ void XRCamera3D::_removed_tracker(const StringName &p_tracker_name, int p_tracke
 
 void XRCamera3D::_pose_changed(const Ref<XRPose> &p_pose) {
 	if (p_pose->get_name() == pose_name) {
-		set_transform(p_pose->get_adjusted_transform());
+		Node3D *parent = Object::cast_to<Node3D>(get_parent());
+
+		if (is_inside_tree() && parent && parent->is_physics_interpolated_and_enabled() && !is_set_as_top_level() && !is_physics_interpolated()) {
+			pose_offset = p_pose->get_adjusted_transform();
+		} else {
+			set_transform(p_pose->get_adjusted_transform());
+		}
+	}
+}
+
+void XRCamera3D::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE: {
+			if (!Engine::get_singleton()->is_editor_hint()) {
+				set_desired_process_modes(true, false);
+			}
+		} break;
+
+		case NOTIFICATION_INTERNAL_PROCESS: {
+			if (!is_inside_tree() || is_physics_interpolated() || Engine::get_singleton()->is_editor_hint()) {
+				break;
+			}
+
+			Node3D *parent = Object::cast_to<Node3D>(get_parent());
+
+			if (parent && parent->is_physics_interpolated_and_enabled() && !is_set_as_top_level()) {
+				set_global_transform(parent->get_global_transform_interpolated() * pose_offset);
+			}
+		} break;
 	}
 }
 
@@ -196,6 +224,9 @@ Vector<Plane> XRCamera3D::get_frustum() const {
 }
 
 XRCamera3D::XRCamera3D() {
+	// XRCamera3D gets its transform updated every render frame and shouldn't be interpolated.
+	set_physics_interpolation_mode(Node::PHYSICS_INTERPOLATION_MODE_OFF);
+
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL(xr_server);
 
@@ -400,7 +431,13 @@ void XRNode3D::_removed_tracker(const StringName &p_tracker_name, int p_tracker_
 
 void XRNode3D::_pose_changed(const Ref<XRPose> &p_pose) {
 	if (p_pose.is_valid() && p_pose->get_name() == pose_name) {
-		set_transform(p_pose->get_adjusted_transform());
+		Node3D *parent = Object::cast_to<Node3D>(get_parent());
+
+		if (is_inside_tree() && parent && parent->is_physics_interpolated_and_enabled() && !is_set_as_top_level() && !is_physics_interpolated()) {
+			pose_offset = p_pose->get_adjusted_transform();
+		} else {
+			set_transform(p_pose->get_adjusted_transform());
+		}
 		_set_has_tracking_data(p_pose->get_has_tracking_data());
 	}
 }
@@ -440,7 +477,32 @@ void XRNode3D::_update_visibility() {
 	}
 }
 
+void XRNode3D::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE: {
+			if (!Engine::get_singleton()->is_editor_hint()) {
+				set_process_internal(true);
+			}
+		} break;
+
+		case NOTIFICATION_INTERNAL_PROCESS: {
+			if (!is_inside_tree() || is_physics_interpolated() || Engine::get_singleton()->is_editor_hint()) {
+				break;
+			}
+
+			Node3D *parent = Object::cast_to<Node3D>(get_parent());
+
+			if (parent && parent->is_physics_interpolated_and_enabled() && !is_set_as_top_level()) {
+				set_global_transform(parent->get_global_transform_interpolated() * pose_offset);
+			}
+		} break;
+	}
+}
+
 XRNode3D::XRNode3D() {
+	// XRNode3D gets its transform updated every render frame and shouldn't be interpolated.
+	set_physics_interpolation_mode(Node::PHYSICS_INTERPOLATION_MODE_OFF);
+
 	XRServer *xr_server = XRServer::get_singleton();
 	ERR_FAIL_NULL(xr_server);
 
@@ -714,6 +776,12 @@ void XROrigin3D::_set_current(bool p_enabled, bool p_update_others) {
 		ERR_FAIL_NULL(xr_server);
 
 		xr_server->set_world_origin(get_global_transform());
+
+		if (is_physics_interpolated()) {
+			set_process_internal(true);
+		}
+	} else if (is_physics_interpolated()) {
+		set_process_internal(false);
 	}
 
 	// Check if we need to update our other origin nodes accordingly
@@ -784,10 +852,16 @@ void XROrigin3D::_notification(int p_what) {
 
 		case NOTIFICATION_LOCAL_TRANSFORM_CHANGED:
 		case NOTIFICATION_TRANSFORM_CHANGED: {
-			if (current && !Engine::get_singleton()->is_editor_hint()) {
+			if (current && !Engine::get_singleton()->is_editor_hint() && !is_physics_interpolated_and_enabled()) {
 				xr_server->set_world_origin(get_global_transform());
 			}
 		} break;
+
+		case NOTIFICATION_INTERNAL_PROCESS: {
+			if (current && !Engine::get_singleton()->is_editor_hint() && is_physics_interpolated_and_enabled()) {
+				xr_server->set_world_origin(get_global_transform_interpolated());
+			}
+		} break;
 	}
 
 	if (current) {
@@ -800,3 +874,9 @@ void XROrigin3D::_notification(int p_what) {
 		}
 	}
 }
+
+void XROrigin3D::_physics_interpolated_changed() {
+	if (current && !Engine::get_singleton()->is_editor_hint()) {
+		set_process_internal(is_physics_interpolated());
+	}
+}
diff --git a/engine/scene/3d/xr_nodes.h b/engine/scene/3d/xr/xr_nodes.h
similarity index 97%
rename from engine/scene/3d/xr_nodes.h
rename to engine/scene/3d/xr/xr_nodes.h
index 80545601..65ba86ab 100644
--- a/engine/scene/3d/xr_nodes.h
+++ b/engine/scene/3d/xr/xr_nodes.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_NODES_H
-#define XR_NODES_H
+#pragma once
 
 #include "scene/3d/camera_3d.h"
 #include "servers/xr/xr_positional_tracker.h"
@@ -47,12 +46,14 @@ protected:
 	StringName tracker_name = "head";
 	StringName pose_name = SceneStringName(default_);
 	Ref<XRPositionalTracker> tracker;
+	Transform3D pose_offset;
 
 	void _bind_tracker();
 	void _unbind_tracker();
 	void _changed_tracker(const StringName &p_tracker_name, int p_tracker_type);
 	void _removed_tracker(const StringName &p_tracker_name, int p_tracker_type);
 	void _pose_changed(const Ref<XRPose> &p_pose);
+	void _notification(int p_what);
 
 public:
 	PackedStringArray get_configuration_warnings() const override;
@@ -80,6 +81,7 @@ private:
 	StringName pose_name = SceneStringName(default_);
 	bool has_tracking_data = false;
 	bool show_when_tracked = false;
+	Transform3D pose_offset;
 
 protected:
 	Ref<XRPositionalTracker> tracker;
@@ -96,6 +98,7 @@ protected:
 	void _set_has_tracking_data(bool p_has_tracking_data);
 
 	void _update_visibility();
+	void _notification(int p_what);
 
 public:
 	void _validate_property(PropertyInfo &p_property) const;
@@ -198,6 +201,7 @@ private:
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
+	virtual void _physics_interpolated_changed() override;
 
 public:
 	PackedStringArray get_configuration_warnings() const override;
@@ -211,5 +215,3 @@ public:
 	XROrigin3D() {}
 	~XROrigin3D() {}
 };
-
-#endif // XR_NODES_H
diff --git a/engine/scene/animation/animation_blend_space_1d.cpp b/engine/scene/animation/animation_blend_space_1d.cpp
index 4716a8fc..acbc892d 100644
--- a/engine/scene/animation/animation_blend_space_1d.cpp
+++ b/engine/scene/animation/animation_blend_space_1d.cpp
@@ -380,7 +380,13 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace1D::_process(const AnimationM
 				Ref<AnimationNodeAnimation> na_c = static_cast<Ref<AnimationNodeAnimation>>(blend_points[cur_closest].node);
 				Ref<AnimationNodeAnimation> na_n = static_cast<Ref<AnimationNodeAnimation>>(blend_points[new_closest].node);
 				if (na_c.is_valid() && na_n.is_valid()) {
+					na_n->process_state = process_state;
+					na_c->process_state = process_state;
+
 					na_n->set_backward(na_c->is_backward());
+
+					na_n = nullptr;
+					na_c = nullptr;
 				}
 				// See how much animation remains.
 				pi.seeked = false;
diff --git a/engine/scene/animation/animation_blend_space_1d.h b/engine/scene/animation/animation_blend_space_1d.h
index 64ae4d05..0bd29cd9 100644
--- a/engine/scene/animation/animation_blend_space_1d.h
+++ b/engine/scene/animation/animation_blend_space_1d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_BLEND_SPACE_1D_H
-#define ANIMATION_BLEND_SPACE_1D_H
+#pragma once
 
 #include "scene/animation/animation_tree.h"
 
@@ -123,5 +122,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AnimationNodeBlendSpace1D::BlendMode)
-
-#endif // ANIMATION_BLEND_SPACE_1D_H
diff --git a/engine/scene/animation/animation_blend_space_2d.cpp b/engine/scene/animation/animation_blend_space_2d.cpp
index 7399fea3..ae936a77 100644
--- a/engine/scene/animation/animation_blend_space_2d.cpp
+++ b/engine/scene/animation/animation_blend_space_2d.cpp
@@ -367,7 +367,7 @@ void AnimationNodeBlendSpace2D::_update_triangles() {
 Vector2 AnimationNodeBlendSpace2D::get_closest_point(const Vector2 &p_point) {
 	_update_triangles();
 
-	if (triangles.size() == 0) {
+	if (triangles.is_empty()) {
 		return Vector2();
 	}
 
@@ -385,11 +385,9 @@ Vector2 AnimationNodeBlendSpace2D::get_closest_point(const Vector2 &p_point) {
 		}
 
 		for (int j = 0; j < 3; j++) {
-			Vector2 s[2] = {
-				points[j],
-				points[(j + 1) % 3]
-			};
-			Vector2 closest_point = Geometry2D::get_closest_point_to_segment(p_point, s);
+			const Vector2 segment_a = points[j];
+			const Vector2 segment_b = points[(j + 1) % 3];
+			Vector2 closest_point = Geometry2D::get_closest_point_to_segment(p_point, segment_a, segment_b);
 			if (first || closest_point.distance_to(p_point) < best_point.distance_to(p_point)) {
 				best_point = closest_point;
 				first = false;
@@ -481,22 +479,20 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(const AnimationM
 			}
 
 			for (int j = 0; j < 3; j++) {
-				Vector2 s[2] = {
-					points[j],
-					points[(j + 1) % 3]
-				};
-				Vector2 closest2 = Geometry2D::get_closest_point_to_segment(blend_pos, s);
+				const Vector2 segment_a = points[j];
+				const Vector2 segment_b = points[(j + 1) % 3];
+				Vector2 closest2 = Geometry2D::get_closest_point_to_segment(blend_pos, segment_a, segment_b);
 				if (first || closest2.distance_to(blend_pos) < best_point.distance_to(blend_pos)) {
 					best_point = closest2;
 					blend_triangle = i;
 					first = false;
-					float d = s[0].distance_to(s[1]);
+					const real_t d = segment_a.distance_to(segment_b);
 					if (d == 0.0) {
 						blend_weights[j] = 1.0;
 						blend_weights[(j + 1) % 3] = 0.0;
 						blend_weights[(j + 2) % 3] = 0.0;
 					} else {
-						float c = s[0].distance_to(closest2) / d;
+						const real_t c = segment_a.distance_to(closest2) / d;
 
 						blend_weights[j] = 1.0 - c;
 						blend_weights[(j + 1) % 3] = c;
@@ -557,7 +553,13 @@ AnimationNode::NodeTimeInfo AnimationNodeBlendSpace2D::_process(const AnimationM
 				Ref<AnimationNodeAnimation> na_c = static_cast<Ref<AnimationNodeAnimation>>(blend_points[cur_closest].node);
 				Ref<AnimationNodeAnimation> na_n = static_cast<Ref<AnimationNodeAnimation>>(blend_points[new_closest].node);
 				if (na_c.is_valid() && na_n.is_valid()) {
+					na_n->process_state = process_state;
+					na_c->process_state = process_state;
+
 					na_n->set_backward(na_c->is_backward());
+
+					na_n = nullptr;
+					na_c = nullptr;
 				}
 				// See how much animation remains.
 				pi.seeked = false;
diff --git a/engine/scene/animation/animation_blend_space_2d.h b/engine/scene/animation/animation_blend_space_2d.h
index 04a1262a..4c4791c2 100644
--- a/engine/scene/animation/animation_blend_space_2d.h
+++ b/engine/scene/animation/animation_blend_space_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_BLEND_SPACE_2D_H
-#define ANIMATION_BLEND_SPACE_2D_H
+#pragma once
 
 #include "scene/animation/animation_tree.h"
 
@@ -149,5 +148,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AnimationNodeBlendSpace2D::BlendMode)
-
-#endif // ANIMATION_BLEND_SPACE_2D_H
diff --git a/engine/scene/animation/animation_blend_tree.cpp b/engine/scene/animation/animation_blend_tree.cpp
index 019a14e5..41414fea 100644
--- a/engine/scene/animation/animation_blend_tree.cpp
+++ b/engine/scene/animation/animation_blend_tree.cpp
@@ -907,7 +907,7 @@ AnimationNode::NodeTimeInfo AnimationNodeBlend3::_process(const AnimationMixer::
 	AnimationMixer::PlaybackInfo pi = p_playback_info;
 	pi.weight = MAX(0, -amount);
 	NodeTimeInfo nti0 = blend_input(0, pi, FILTER_IGNORE, sync, p_test_only);
-	pi.weight = 1.0 - ABS(amount);
+	pi.weight = 1.0 - Math::abs(amount);
 	NodeTimeInfo nti1 = blend_input(1, pi, FILTER_IGNORE, sync, p_test_only);
 	pi.weight = MAX(0, amount);
 	NodeTimeInfo nti2 = blend_input(2, pi, FILTER_IGNORE, sync, p_test_only);
diff --git a/engine/scene/animation/animation_blend_tree.h b/engine/scene/animation/animation_blend_tree.h
index 36a391eb..eb7eb618 100644
--- a/engine/scene/animation/animation_blend_tree.h
+++ b/engine/scene/animation/animation_blend_tree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_BLEND_TREE_H
-#define ANIMATION_BLEND_TREE_H
+#pragma once
 
 #include "scene/animation/animation_tree.h"
 
@@ -485,5 +484,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AnimationNodeBlendTree::ConnectionError)
-
-#endif // ANIMATION_BLEND_TREE_H
diff --git a/engine/scene/animation/animation_mixer.cpp b/engine/scene/animation/animation_mixer.cpp
index 445a034a..c4d6718d 100644
--- a/engine/scene/animation/animation_mixer.cpp
+++ b/engine/scene/animation/animation_mixer.cpp
@@ -77,11 +77,9 @@ bool AnimationMixer::_set(const StringName &p_name, const Variant &p_value) {
 		while (animation_libraries.size()) {
 			remove_animation_library(animation_libraries[0].name);
 		}
-		List<Variant> keys;
-		d.get_key_list(&keys);
-		for (const Variant &K : keys) {
-			Ref<AnimationLibrary> lib = d[K];
-			add_animation_library(K, lib);
+		for (const KeyValue<Variant, Variant> &kv : d) {
+			Ref<AnimationLibrary> lib = kv.value;
+			add_animation_library(kv.key, lib);
 		}
 		emit_signal(SNAME("animation_libraries_updated"));
 
@@ -999,7 +997,7 @@ Variant AnimationMixer::_post_process_key_value(const Ref<Animation> &p_anim, in
 	switch (p_anim->track_get_type(p_track)) {
 		case Animation::TYPE_POSITION_3D: {
 			if (p_object_sub_idx >= 0) {
-				Skeleton3D *skel = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(p_object_id));
+				Skeleton3D *skel = ObjectDB::get_instance<Skeleton3D>(p_object_id);
 				if (skel) {
 					return Vector3(p_value) * skel->get_motion_scale();
 				}
@@ -1591,17 +1589,17 @@ void AnimationMixer::_blend_process(double p_delta, bool p_update_only) {
 							float rot_a = t->value;
 							float rot_b = value;
 							float rot_init = t->init_value;
-							rot_a = Math::fposmod(rot_a, (float)Math_TAU);
-							rot_b = Math::fposmod(rot_b, (float)Math_TAU);
-							rot_init = Math::fposmod(rot_init, (float)Math_TAU);
-							if (rot_init < Math_PI) {
-								rot_a = rot_a > rot_init + Math_PI ? rot_a - Math_TAU : rot_a;
-								rot_b = rot_b > rot_init + Math_PI ? rot_b - Math_TAU : rot_b;
+							rot_a = Math::fposmod(rot_a, (float)Math::TAU);
+							rot_b = Math::fposmod(rot_b, (float)Math::TAU);
+							rot_init = Math::fposmod(rot_init, (float)Math::TAU);
+							if (rot_init < Math::PI) {
+								rot_a = rot_a > rot_init + Math::PI ? rot_a - Math::TAU : rot_a;
+								rot_b = rot_b > rot_init + Math::PI ? rot_b - Math::TAU : rot_b;
 							} else {
-								rot_a = rot_a < rot_init - Math_PI ? rot_a + Math_TAU : rot_a;
-								rot_b = rot_b < rot_init - Math_PI ? rot_b + Math_TAU : rot_b;
+								rot_a = rot_a < rot_init - Math::PI ? rot_a + Math::TAU : rot_a;
+								rot_b = rot_b < rot_init - Math::PI ? rot_b + Math::TAU : rot_b;
 							}
-							t->value = Math::fposmod(rot_a + (rot_b - rot_init) * (float)blend, (float)Math_TAU);
+							t->value = Math::fposmod(rot_a + (rot_b - rot_init) * (float)blend, (float)Math::TAU);
 						} else {
 							value = Animation::cast_to_blendwise(value);
 							if (t->init_value.is_array()) {
@@ -1869,7 +1867,7 @@ void AnimationMixer::_blend_apply() {
 					root_motion_rotation_accumulator = t->rot;
 					root_motion_scale_accumulator = t->scale;
 				} else if (t->skeleton_id.is_valid() && t->bone_idx >= 0) {
-					Skeleton3D *t_skeleton = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(t->skeleton_id));
+					Skeleton3D *t_skeleton = ObjectDB::get_instance<Skeleton3D>(t->skeleton_id);
 					if (!t_skeleton) {
 						return;
 					}
@@ -1884,7 +1882,7 @@ void AnimationMixer::_blend_apply() {
 					}
 
 				} else if (!t->skeleton_id.is_valid()) {
-					Node3D *t_node_3d = Object::cast_to<Node3D>(ObjectDB::get_instance(t->object_id));
+					Node3D *t_node_3d = ObjectDB::get_instance<Node3D>(t->object_id);
 					if (!t_node_3d) {
 						return;
 					}
@@ -1904,7 +1902,7 @@ void AnimationMixer::_blend_apply() {
 #ifndef _3D_DISABLED
 				TrackCacheBlendShape *t = static_cast<TrackCacheBlendShape *>(track);
 
-				MeshInstance3D *t_mesh_3d = Object::cast_to<MeshInstance3D>(ObjectDB::get_instance(t->object_id));
+				MeshInstance3D *t_mesh_3d = ObjectDB::get_instance<MeshInstance3D>(t->object_id);
 				if (t_mesh_3d) {
 					t_mesh_3d->set_blend_shape_value(t->shape_index, t->value);
 				}
@@ -2000,7 +1998,7 @@ void AnimationMixer::_blend_apply() {
 					for (uint32_t erase_idx = 0; erase_idx < erase_streams.size(); erase_idx++) {
 						map.erase(erase_streams[erase_idx]);
 					}
-					if (map.size() == 0) {
+					if (map.is_empty()) {
 						erase_maps.push_back(L.key);
 					}
 				}
@@ -2133,7 +2131,7 @@ void AnimationMixer::_build_backup_track_cache() {
 				if (t->root_motion) {
 					// Do nothing.
 				} else if (t->skeleton_id.is_valid() && t->bone_idx >= 0) {
-					Skeleton3D *t_skeleton = Object::cast_to<Skeleton3D>(ObjectDB::get_instance(t->skeleton_id));
+					Skeleton3D *t_skeleton = ObjectDB::get_instance<Skeleton3D>(t->skeleton_id);
 					if (!t_skeleton) {
 						return;
 					}
@@ -2147,7 +2145,7 @@ void AnimationMixer::_build_backup_track_cache() {
 						t->scale = t_skeleton->get_bone_pose_scale(t->bone_idx);
 					}
 				} else if (!t->skeleton_id.is_valid()) {
-					Node3D *t_node_3d = Object::cast_to<Node3D>(ObjectDB::get_instance(t->object_id));
+					Node3D *t_node_3d = ObjectDB::get_instance<Node3D>(t->object_id);
 					if (!t_node_3d) {
 						return;
 					}
@@ -2166,7 +2164,7 @@ void AnimationMixer::_build_backup_track_cache() {
 			case Animation::TYPE_BLEND_SHAPE: {
 #ifndef _3D_DISABLED
 				TrackCacheBlendShape *t = static_cast<TrackCacheBlendShape *>(track);
-				MeshInstance3D *t_mesh_3d = Object::cast_to<MeshInstance3D>(ObjectDB::get_instance(t->object_id));
+				MeshInstance3D *t_mesh_3d = ObjectDB::get_instance<MeshInstance3D>(t->object_id);
 				if (t_mesh_3d) {
 					t->value = t_mesh_3d->get_blend_shape_value(t->shape_index);
 				}
diff --git a/engine/scene/animation/animation_mixer.h b/engine/scene/animation/animation_mixer.h
index 712b9c2d..edb37f0e 100644
--- a/engine/scene/animation/animation_mixer.h
+++ b/engine/scene/animation/animation_mixer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_MIXER_H
-#define ANIMATION_MIXER_H
+#pragma once
 
 #include "core/templates/a_hash_map.h"
 #include "scene/animation/tween.h"
@@ -509,5 +508,3 @@ public:
 VARIANT_ENUM_CAST(AnimationMixer::AnimationCallbackModeProcess);
 VARIANT_ENUM_CAST(AnimationMixer::AnimationCallbackModeMethod);
 VARIANT_ENUM_CAST(AnimationMixer::AnimationCallbackModeDiscrete);
-
-#endif // ANIMATION_MIXER_H
diff --git a/engine/scene/animation/animation_node_extension.h b/engine/scene/animation/animation_node_extension.h
index 80840b5e..71adcc5b 100644
--- a/engine/scene/animation/animation_node_extension.h
+++ b/engine/scene/animation/animation_node_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_NODE_EXTENSION_H
-#define ANIMATION_NODE_EXTENSION_H
+#pragma once
 
 #include "scene/animation/animation_tree.h"
 
@@ -51,5 +50,3 @@ private:
 	static AnimationNode::NodeTimeInfo _array_to_node_time_info(const PackedFloat32Array &p_array);
 	static PackedFloat64Array _playback_info_to_array(const AnimationMixer::PlaybackInfo &p_playback_info);
 };
-
-#endif // ANIMATION_NODE_EXTENSION_H
diff --git a/engine/scene/animation/animation_node_state_machine.cpp b/engine/scene/animation/animation_node_state_machine.cpp
index 1c4d489d..5573b7bb 100644
--- a/engine/scene/animation/animation_node_state_machine.cpp
+++ b/engine/scene/animation/animation_node_state_machine.cpp
@@ -563,7 +563,7 @@ bool AnimationNodeStateMachinePlayback::_make_travel_path(AnimationTree *p_tree,
 
 	// Begin astar.
 	while (!found_route) {
-		if (open_list.size() == 0) {
+		if (open_list.is_empty()) {
 			break; // No path found.
 		}
 
diff --git a/engine/scene/animation/animation_node_state_machine.h b/engine/scene/animation/animation_node_state_machine.h
index ae28c126..643cde2a 100644
--- a/engine/scene/animation/animation_node_state_machine.h
+++ b/engine/scene/animation/animation_node_state_machine.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_NODE_STATE_MACHINE_H
-#define ANIMATION_NODE_STATE_MACHINE_H
+#pragma once
 
 #include "core/math/expression.h"
 #include "scene/animation/animation_tree.h"
@@ -348,5 +347,3 @@ public:
 
 	AnimationNodeStateMachinePlayback();
 };
-
-#endif // ANIMATION_NODE_STATE_MACHINE_H
diff --git a/engine/scene/animation/animation_player.cpp b/engine/scene/animation/animation_player.cpp
index 8d248594..4ba0ef3f 100644
--- a/engine/scene/animation/animation_player.cpp
+++ b/engine/scene/animation/animation_player.cpp
@@ -256,8 +256,7 @@ void AnimationPlayer::_process_playback_data(PlaybackData &cd, double p_delta, f
 float AnimationPlayer::get_current_blend_amount() {
 	Playback &c = playback;
 	float blend = 1.0;
-	for (List<Blend>::Element *E = c.blend.front(); E; E = E->next()) {
-		Blend &b = E->get();
+	for (const Blend &b : c.blend) {
 		blend = blend - b.blend_left;
 	}
 	return MAX(0, blend);
diff --git a/engine/scene/animation/animation_player.h b/engine/scene/animation/animation_player.h
index b8862ac1..db3c3920 100644
--- a/engine/scene/animation/animation_player.h
+++ b/engine/scene/animation/animation_player.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_PLAYER_H
-#define ANIMATION_PLAYER_H
+#pragma once
 
 #include "animation_mixer.h"
 #include "scene/resources/animation.h"
@@ -246,5 +245,3 @@ public:
 VARIANT_ENUM_CAST(AnimationPlayer::AnimationProcessCallback);
 VARIANT_ENUM_CAST(AnimationPlayer::AnimationMethodCallMode);
 #endif // DISABLE_DEPRECATED
-
-#endif // ANIMATION_PLAYER_H
diff --git a/engine/scene/animation/animation_tree.cpp b/engine/scene/animation/animation_tree.cpp
index f1c01b1e..d5de41fd 100644
--- a/engine/scene/animation/animation_tree.cpp
+++ b/engine/scene/animation/animation_tree.cpp
@@ -121,12 +121,10 @@ AnimationNode::NodeTimeInfo AnimationNode::get_node_time_info() const {
 void AnimationNode::get_child_nodes(List<ChildNode> *r_child_nodes) {
 	Dictionary cn;
 	if (GDVIRTUAL_CALL(_get_child_nodes, cn)) {
-		List<Variant> keys;
-		cn.get_key_list(&keys);
-		for (const Variant &E : keys) {
+		for (const KeyValue<Variant, Variant> &kv : cn) {
 			ChildNode child;
-			child.name = E;
-			child.node = cn[E];
+			child.name = kv.key;
+			child.node = kv.value;
 			r_child_nodes->push_back(child);
 		}
 	}
diff --git a/engine/scene/animation/animation_tree.h b/engine/scene/animation/animation_tree.h
index 5ac24b49..2f068e0a 100644
--- a/engine/scene/animation/animation_tree.h
+++ b/engine/scene/animation/animation_tree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_TREE_H
-#define ANIMATION_TREE_H
+#pragma once
 
 #include "animation_mixer.h"
 #include "scene/resources/animation.h"
@@ -362,5 +361,3 @@ public:
 #ifndef DISABLE_DEPRECATED
 VARIANT_ENUM_CAST(AnimationTree::AnimationProcessCallback);
 #endif // DISABLE_DEPRECATED
-
-#endif // ANIMATION_TREE_H
diff --git a/engine/scene/animation/easing_equations.h b/engine/scene/animation/easing_equations.h
index 91501917..c1bfaf04 100644
--- a/engine/scene/animation/easing_equations.h
+++ b/engine/scene/animation/easing_equations.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EASING_EQUATIONS_H
-#define EASING_EQUATIONS_H
+#pragma once
 
 /*
  * Derived from Robert Penner's easing equations: http://robertpenner.com/easing/
@@ -55,23 +54,23 @@
  * SOFTWARE.
  */
 
-namespace linear {
+namespace Linear {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	return c * t / d + b;
 }
-}; // namespace linear
+}; // namespace Linear
 
-namespace sine {
+namespace Sine {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
-	return -c * cos(t / d * (Math_PI / 2)) + c + b;
+	return -c * cos(t / d * (Math::PI / 2)) + c + b;
 }
 
 static real_t out(real_t t, real_t b, real_t c, real_t d) {
-	return c * sin(t / d * (Math_PI / 2)) + b;
+	return c * sin(t / d * (Math::PI / 2)) + b;
 }
 
 static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
-	return -c / 2 * (cos(Math_PI * t / d) - 1) + b;
+	return -c / 2 * (cos(Math::PI * t / d) - 1) + b;
 }
 
 static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
@@ -81,9 +80,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace sine
+}; // namespace Sine
 
-namespace quint {
+namespace Quint {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	return c * pow(t / d, 5) + b;
 }
@@ -108,9 +107,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace quint
+}; // namespace Quint
 
-namespace quart {
+namespace Quart {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	return c * pow(t / d, 4) + b;
 }
@@ -135,9 +134,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace quart
+}; // namespace Quart
 
-namespace quad {
+namespace Quad {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	return c * pow(t / d, 2) + b;
 }
@@ -163,9 +162,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace quad
+}; // namespace Quad
 
-namespace expo {
+namespace Expo {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	if (t == 0) {
 		return b;
@@ -204,9 +203,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace expo
+}; // namespace Expo
 
-namespace elastic {
+namespace Elastic {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	if (t == 0) {
 		return b;
@@ -222,7 +221,7 @@ static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	float a = c * pow(2, 10 * t);
 	float s = p / 4;
 
-	return -(a * sin((t * d - s) * (2 * Math_PI) / p)) + b;
+	return -(a * sin((t * d - s) * (2 * Math::PI) / p)) + b;
 }
 
 static real_t out(real_t t, real_t b, real_t c, real_t d) {
@@ -238,7 +237,7 @@ static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	float p = d * 0.3f;
 	float s = p / 4;
 
-	return (c * pow(2, -10 * t) * sin((t * d - s) * (2 * Math_PI) / p) + c + b);
+	return (c * pow(2, -10 * t) * sin((t * d - s) * (2 * Math::PI) / p) + c + b);
 }
 
 static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
@@ -257,12 +256,12 @@ static real_t in_out(real_t t, real_t b, real_t c, real_t d) {
 	if (t < 1) {
 		t -= 1;
 		a *= pow(2, 10 * t);
-		return -0.5f * (a * sin((t * d - s) * (2 * Math_PI) / p)) + b;
+		return -0.5f * (a * sin((t * d - s) * (2 * Math::PI) / p)) + b;
 	}
 
 	t -= 1;
 	a *= pow(2, -10 * t);
-	return a * sin((t * d - s) * (2 * Math_PI) / p) * 0.5f + c + b;
+	return a * sin((t * d - s) * (2 * Math::PI) / p) * 0.5f + c + b;
 }
 
 static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
@@ -272,9 +271,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace elastic
+}; // namespace Elastic
 
-namespace cubic {
+namespace Cubic {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 	return c * t * t * t + b;
@@ -302,9 +301,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace cubic
+}; // namespace Cubic
 
-namespace circ {
+namespace Circ {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 	return -c * (sqrt(1 - t * t) - 1) + b;
@@ -332,9 +331,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace circ
+}; // namespace Circ
 
-namespace bounce {
+namespace Bounce {
 static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 
@@ -375,9 +374,9 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace bounce
+}; // namespace Bounce
 
-namespace back {
+namespace Back {
 static real_t in(real_t t, real_t b, real_t c, real_t d) {
 	float s = 1.70158f;
 	t /= d;
@@ -411,13 +410,13 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace back
+}; // namespace Back
 
-namespace spring {
+namespace Spring {
 static real_t out(real_t t, real_t b, real_t c, real_t d) {
 	t /= d;
 	real_t s = 1.0 - t;
-	t = (sin(t * Math_PI * (0.2 + 2.5 * t * t * t)) * pow(s, 2.2) + t) * (1.0 + (1.2 * s));
+	t = (sin(t * Math::PI * (0.2 + 2.5 * t * t * t)) * pow(s, 2.2) + t) * (1.0 + (1.2 * s));
 	return c * t + b;
 }
 
@@ -440,6 +439,4 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) {
 	real_t h = c / 2;
 	return in(t * 2 - d, b + h, h, d);
 }
-}; // namespace spring
-
-#endif // EASING_EQUATIONS_H
+}; // namespace Spring
diff --git a/engine/scene/animation/root_motion_view.h b/engine/scene/animation/root_motion_view.h
index 662259da..ce9eb53b 100644
--- a/engine/scene/animation/root_motion_view.h
+++ b/engine/scene/animation/root_motion_view.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ROOT_MOTION_VIEW_H
-#define ROOT_MOTION_VIEW_H
+#pragma once
 
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/immediate_mesh.h"
@@ -75,5 +74,3 @@ public:
 	RootMotionView();
 	~RootMotionView();
 };
-
-#endif // ROOT_MOTION_VIEW_H
diff --git a/engine/scene/animation/tween.cpp b/engine/scene/animation/tween.cpp
index 4fe3b70d..61497689 100644
--- a/engine/scene/animation/tween.cpp
+++ b/engine/scene/animation/tween.cpp
@@ -39,18 +39,18 @@
 	ERR_FAIL_COND_V_MSG(started, nullptr, "Can't append to a Tween that has started. Use stop() first.");
 
 Tween::interpolater Tween::interpolaters[Tween::TRANS_MAX][Tween::EASE_MAX] = {
-	{ &linear::in, &linear::in, &linear::in, &linear::in }, // Linear is the same for each easing.
-	{ &sine::in, &sine::out, &sine::in_out, &sine::out_in },
-	{ &quint::in, &quint::out, &quint::in_out, &quint::out_in },
-	{ &quart::in, &quart::out, &quart::in_out, &quart::out_in },
-	{ &quad::in, &quad::out, &quad::in_out, &quad::out_in },
-	{ &expo::in, &expo::out, &expo::in_out, &expo::out_in },
-	{ &elastic::in, &elastic::out, &elastic::in_out, &elastic::out_in },
-	{ &cubic::in, &cubic::out, &cubic::in_out, &cubic::out_in },
-	{ &circ::in, &circ::out, &circ::in_out, &circ::out_in },
-	{ &bounce::in, &bounce::out, &bounce::in_out, &bounce::out_in },
-	{ &back::in, &back::out, &back::in_out, &back::out_in },
-	{ &spring::in, &spring::out, &spring::in_out, &spring::out_in },
+	{ &Linear::in, &Linear::in, &Linear::in, &Linear::in }, // Linear is the same for each easing.
+	{ &Sine::in, &Sine::out, &Sine::in_out, &Sine::out_in },
+	{ &Quint::in, &Quint::out, &Quint::in_out, &Quint::out_in },
+	{ &Quart::in, &Quart::out, &Quart::in_out, &Quart::out_in },
+	{ &Quad::in, &Quad::out, &Quad::in_out, &Quad::out_in },
+	{ &Expo::in, &Expo::out, &Expo::in_out, &Expo::out_in },
+	{ &Elastic::in, &Elastic::out, &Elastic::in_out, &Elastic::out_in },
+	{ &Cubic::in, &Cubic::out, &Cubic::in_out, &Cubic::out_in },
+	{ &Circ::in, &Circ::out, &Circ::in_out, &Circ::out_in },
+	{ &Bounce::in, &Bounce::out, &Bounce::in_out, &Bounce::out_in },
+	{ &Back::in, &Back::out, &Back::in_out, &Back::out_in },
+	{ &Spring::in, &Spring::out, &Spring::in_out, &Spring::out_in },
 };
 
 void Tweener::set_tween(const Ref<Tween> &p_tween) {
@@ -63,7 +63,7 @@ void Tweener::start() {
 }
 
 Ref<Tween> Tweener::_get_tween() {
-	return Ref<Tween>(ObjectDB::get_instance(tween_id));
+	return ObjectDB::get_ref<Tween>(tween_id);
 }
 
 void Tweener::_finish() {
@@ -212,6 +212,7 @@ void Tween::play() {
 
 void Tween::kill() {
 	running = false; // For the sake of is_running().
+	valid = false;
 	dead = true;
 }
 
@@ -432,7 +433,7 @@ bool Tween::can_process(bool p_tree_paused) const {
 
 Node *Tween::get_bound_node() const {
 	if (is_bound) {
-		return Object::cast_to<Node>(ObjectDB::get_instance(bound_node));
+		return ObjectDB::get_instance<Node>(bound_node);
 	} else {
 		return nullptr;
 	}
@@ -542,6 +543,20 @@ Tween::Tween(SceneTree *p_parent_tree) {
 	valid = true;
 }
 
+double PropertyTweener::_get_custom_interpolated_value(const Variant &p_value) {
+	const Variant *argptr = &p_value;
+
+	Variant result;
+	Callable::CallError ce;
+	custom_method.callp(&argptr, 1, result, ce);
+	if (ce.error != Callable::CallError::CALL_OK) {
+		ERR_FAIL_V_MSG(false, "Error calling custom method from PropertyTweener: " + Variant::get_callable_error_text(custom_method, &argptr, 1, ce) + ".");
+	} else if (result.get_type() != Variant::FLOAT) {
+		ERR_FAIL_V_MSG(false, vformat("Wrong return type in PropertyTweener custom method. Expected float, got %s.", Variant::get_type_name(result.get_type())));
+	}
+	return result;
+}
+
 Ref<PropertyTweener> PropertyTweener::from(const Variant &p_value) {
 	Ref<Tween> tween = _get_tween();
 	ERR_FAIL_COND_V(tween.is_null(), nullptr);
@@ -638,17 +653,7 @@ bool PropertyTweener::step(double &r_delta) {
 	if (time < duration) {
 		if (custom_method.is_valid()) {
 			const Variant t = tween->interpolate_variant(0.0, 1.0, time, duration, trans_type, ease_type);
-			const Variant *argptr = &t;
-
-			Variant result;
-			Callable::CallError ce;
-			custom_method.callp(&argptr, 1, result, ce);
-			if (ce.error != Callable::CallError::CALL_OK) {
-				ERR_FAIL_V_MSG(false, "Error calling custom method from PropertyTweener: " + Variant::get_callable_error_text(custom_method, &argptr, 1, ce) + ".");
-			} else if (result.get_type() != Variant::FLOAT) {
-				ERR_FAIL_V_MSG(false, vformat("Wrong return type in PropertyTweener custom method. Expected float, got %s.", Variant::get_type_name(result.get_type())));
-			}
-
+			double result = _get_custom_interpolated_value(t);
 			target_instance->set_indexed(property, Animation::interpolate_variant(initial_val, final_val, result));
 		} else {
 			target_instance->set_indexed(property, tween->interpolate_variant(initial_val, delta_val, time, duration, trans_type, ease_type));
@@ -656,7 +661,12 @@ bool PropertyTweener::step(double &r_delta) {
 		r_delta = 0;
 		return true;
 	} else {
-		target_instance->set_indexed(property, final_val);
+		if (custom_method.is_valid()) {
+			double final_t = _get_custom_interpolated_value(1.0);
+			target_instance->set_indexed(property, Animation::interpolate_variant(initial_val, final_val, final_t));
+		} else {
+			target_instance->set_indexed(property, final_val);
+		}
 		r_delta = elapsed_time - delay - duration;
 		_finish();
 		return false;
diff --git a/engine/scene/animation/tween.h b/engine/scene/animation/tween.h
index 8d637467..d987b6e9 100644
--- a/engine/scene/animation/tween.h
+++ b/engine/scene/animation/tween.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TWEEN_H
-#define TWEEN_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -201,6 +200,8 @@ VARIANT_ENUM_CAST(Tween::EaseType);
 class PropertyTweener : public Tweener {
 	GDCLASS(PropertyTweener, Tweener);
 
+	double _get_custom_interpolated_value(const Variant &p_value);
+
 public:
 	Ref<PropertyTweener> from(const Variant &p_value);
 	Ref<PropertyTweener> from_current();
@@ -325,5 +326,3 @@ protected:
 private:
 	double delay = 0;
 };
-
-#endif // TWEEN_H
diff --git a/engine/scene/audio/audio_stream_player.cpp b/engine/scene/audio/audio_stream_player.cpp
index 4fc0f23d..6fbfd254 100644
--- a/engine/scene/audio/audio_stream_player.cpp
+++ b/engine/scene/audio/audio_stream_player.cpp
@@ -35,7 +35,14 @@
 #include "servers/audio/audio_stream.h"
 
 void AudioStreamPlayer::_notification(int p_what) {
-	internal->notification(p_what);
+	if (p_what == NOTIFICATION_ACCESSIBILITY_UPDATE) {
+		RID ae = get_accessibility_element();
+		ERR_FAIL_COND(ae.is_null());
+
+		DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_AUDIO);
+	} else {
+		internal->notification(p_what);
+	}
 }
 
 void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) {
diff --git a/engine/scene/audio/audio_stream_player.h b/engine/scene/audio/audio_stream_player.h
index 02332287..8b19f903 100644
--- a/engine/scene/audio/audio_stream_player.h
+++ b/engine/scene/audio/audio_stream_player.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_PLAYER_H
-#define AUDIO_STREAM_PLAYER_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "servers/audio_server.h"
@@ -118,5 +117,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AudioStreamPlayer::MixTarget)
-
-#endif // AUDIO_STREAM_PLAYER_H
diff --git a/engine/scene/audio/audio_stream_player_internal.h b/engine/scene/audio/audio_stream_player_internal.h
index 7d8faeba..40f05959 100644
--- a/engine/scene/audio/audio_stream_player_internal.h
+++ b/engine/scene/audio/audio_stream_player_internal.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_PLAYER_INTERNAL_H
-#define AUDIO_STREAM_PLAYER_INTERNAL_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/templates/safe_refcount.h"
@@ -113,5 +112,3 @@ public:
 
 	AudioStreamPlayerInternal(Node *p_node, const Callable &p_play_callable, const Callable &p_stop_callable, bool p_physical);
 };
-
-#endif // AUDIO_STREAM_PLAYER_INTERNAL_H
diff --git a/engine/scene/debugger/scene_debugger.cpp b/engine/scene/debugger/scene_debugger.cpp
index c620c5fd..a2e02428 100644
--- a/engine/scene/debugger/scene_debugger.cpp
+++ b/engine/scene/debugger/scene_debugger.cpp
@@ -33,23 +33,33 @@
 #include "core/debugger/debugger_marshalls.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/io/marshalls.h"
+#include "core/math/math_fieldwise.h"
 #include "core/object/script_language.h"
 #include "core/templates/local_vector.h"
-#include "scene/2d/physics/collision_object_2d.h"
-#include "scene/2d/physics/collision_polygon_2d.h"
-#include "scene/2d/physics/collision_shape_2d.h"
-#ifndef _3D_DISABLED
-#include "scene/3d/physics/collision_object_3d.h"
-#include "scene/3d/physics/collision_shape_3d.h"
-#include "scene/3d/visual_instance_3d.h"
-#include "scene/resources/surface_tool.h"
-#endif // _3D_DISABLED
 #include "scene/gui/popup_menu.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/scene_tree.h"
 #include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
+#include "servers/audio_server.h"
+
+#ifndef PHYSICS_2D_DISABLED
+#include "scene/2d/physics/collision_object_2d.h"
+#include "scene/2d/physics/collision_polygon_2d.h"
+#include "scene/2d/physics/collision_shape_2d.h"
+#endif // PHYSICS_2D_DISABLED
+
+#ifndef _3D_DISABLED
+#include "scene/3d/camera_3d.h"
+#ifndef PHYSICS_3D_DISABLED
+#include "scene/3d/physics/collision_object_3d.h"
+#include "scene/3d/physics/collision_shape_3d.h"
+#endif // PHYSICS_3D_DISABLED
+#include "scene/3d/visual_instance_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#include "scene/resources/surface_tool.h"
+#endif // _3D_DISABLED
 
 SceneDebugger::SceneDebugger() {
 	singleton = this;
@@ -59,7 +69,7 @@ SceneDebugger::SceneDebugger() {
 	RuntimeNodeSelect::singleton = memnew(RuntimeNodeSelect);
 
 	EngineDebugger::register_message_capture("scene", EngineDebugger::Capture(nullptr, SceneDebugger::parse_message));
-#endif
+#endif // DEBUG_ENABLED
 }
 
 SceneDebugger::~SceneDebugger() {
@@ -74,7 +84,7 @@ SceneDebugger::~SceneDebugger() {
 		memdelete(RuntimeNodeSelect::singleton);
 		RuntimeNodeSelect::singleton = nullptr;
 	}
-#endif
+#endif // DEBUG_ENABLED
 
 	singleton = nullptr;
 }
@@ -118,20 +128,26 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
 	if (p_msg == "setup_scene") {
 		SceneTree::get_singleton()->get_root()->connect(SceneStringName(window_input), callable_mp_static(SceneDebugger::_handle_input).bind(DebuggerMarshalls::deserialize_key_shortcut(p_args)));
 
-	} else if (p_msg == "request_scene_tree") { // Scene tree
+	} else if (p_msg == "request_scene_tree") { /// Scene Tree
 		live_editor->_send_tree();
 
-	} else if (p_msg == "save_node") { // Save node.
+	} else if (p_msg == "save_node") {
 		ERR_FAIL_COND_V(p_args.size() < 2, ERR_INVALID_DATA);
 		_save_node(p_args[0], p_args[1]);
 		Array arr;
 		arr.append(p_args[1]);
 		EngineDebugger::get_singleton()->send_message("filesystem:update_file", { arr });
 
-	} else if (p_msg == "inspect_object") { // Object Inspect
-		ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
-		ObjectID id = p_args[0];
-		_send_object_id(id);
+	} else if (p_msg == "inspect_objects") { /// Object Inspect
+		ERR_FAIL_COND_V(p_args.size() < 2, ERR_INVALID_DATA);
+		Vector<ObjectID> ids;
+		for (const Variant &id : (Array)p_args[0]) {
+			ids.append(ObjectID(id.operator uint64_t()));
+		}
+		_send_object_ids(ids, p_args[1]);
+
+	} else if (p_msg == "clear_selection") {
+		runtime_node_select->_clear_selection();
 
 	} else if (p_msg == "suspend_changed") {
 		ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
@@ -142,7 +158,12 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
 	} else if (p_msg == "next_frame") {
 		_next_frame();
 
-	} else if (p_msg == "override_cameras") { // Camera
+	} else if (p_msg == "debug_mute_audio") { // Enable/disable audio.
+		ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
+		bool do_mute = p_args[0];
+		AudioServer::get_singleton()->set_debug_mute(do_mute);
+
+	} else if (p_msg == "override_cameras") { /// Camera
 		ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
 		bool enable = p_args[0];
 		bool from_editor = p_args[1];
@@ -180,6 +201,11 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
 		_set_object_property(p_args[0], p_args[1], p_args[2]);
 		runtime_node_select->_queue_selection_update();
 
+	} else if (p_msg == "set_object_property_field") {
+		ERR_FAIL_COND_V(p_args.size() < 4, ERR_INVALID_DATA);
+		_set_object_property(p_args[0], p_args[1], p_args[2], p_args[3]);
+		runtime_node_select->_queue_selection_update();
+
 	} else if (p_msg == "reload_cached_files") {
 		ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
 		PackedStringArray files = p_args[0];
@@ -249,18 +275,12 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
 		} else if (p_msg == "live_remove_node") {
 			ERR_FAIL_COND_V(p_args.is_empty(), ERR_INVALID_DATA);
 			live_editor->_remove_node_func(p_args[0]);
-
-			if (!runtime_node_select->has_selection) {
-				runtime_node_select->_clear_selection();
-			}
+			runtime_node_select->_queue_selection_update();
 
 		} else if (p_msg == "live_remove_and_keep_node") {
 			ERR_FAIL_COND_V(p_args.size() < 2, ERR_INVALID_DATA);
 			live_editor->_remove_and_keep_node_func(p_args[0], p_args[1]);
-
-			if (!runtime_node_select->has_selection) {
-				runtime_node_select->_clear_selection();
-			}
+			runtime_node_select->_queue_selection_update();
 
 		} else if (p_msg == "live_restore_node") {
 			ERR_FAIL_COND_V(p_args.size() < 3, ERR_INVALID_DATA);
@@ -318,7 +338,7 @@ Error SceneDebugger::parse_message(void *p_user, const String &p_msg, const Arra
 }
 
 void SceneDebugger::_save_node(ObjectID id, const String &p_path) {
-	Node *node = Object::cast_to<Node>(ObjectDB::get_instance(id));
+	Node *node = ObjectDB::get_instance<Node>(id);
 	ERR_FAIL_NULL(node);
 
 #ifdef TOOLS_ENABLED
@@ -326,7 +346,7 @@ void SceneDebugger::_save_node(ObjectID id, const String &p_path) {
 	Node *copy = node->duplicate_from_editor(duplimap);
 #else
 	Node *copy = node->duplicate();
-#endif
+#endif // TOOLS_ENABLED
 
 	// Handle Unique Nodes.
 	for (int i = 0; i < copy->get_child_count(false); i++) {
@@ -352,21 +372,55 @@ void SceneDebugger::_set_node_owner_recursive(Node *p_node, Node *p_owner) {
 	}
 }
 
-void SceneDebugger::_send_object_id(ObjectID p_id, int p_max_size) {
-	SceneDebuggerObject obj(p_id);
-	if (obj.id.is_null()) {
-		return;
+void SceneDebugger::_send_object_ids(const Vector<ObjectID> &p_ids, bool p_update_selection) {
+	Vector<ObjectID> ids = p_ids;
+	if (ids.size() > RuntimeNodeSelect::get_singleton()->max_selection) {
+		ids.resize(RuntimeNodeSelect::get_singleton()->max_selection);
+		EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
 	}
 
-	Node *node = Object::cast_to<Node>(ObjectDB::get_instance(p_id));
-	RuntimeNodeSelect::get_singleton()->_select_node(node);
+	LocalVector<Node *> nodes;
+	Array objs;
+	bool objs_missing = false;
+	for (const ObjectID &id : ids) {
+		SceneDebuggerObject obj(id);
+		if (obj.id.is_null()) {
+			objs_missing = true;
+			continue;
+		}
 
-	Array arr;
-	obj.serialize(arr);
-	EngineDebugger::get_singleton()->send_message("scene:inspect_object", arr);
+		if (p_update_selection) {
+			if (Node *node = ObjectDB::get_instance<Node>(id)) {
+				nodes.push_back(node);
+			}
+		}
+
+		Array arr;
+		obj.serialize(arr);
+		objs.append(arr);
+	}
+
+	if (p_update_selection) {
+		RuntimeNodeSelect::get_singleton()->_set_selected_nodes(nodes);
+	}
+
+	if (objs_missing) {
+		Array invalid_selection;
+		for (const ObjectID &id : ids) {
+			invalid_selection.append(id);
+		}
+
+		Array arr;
+		arr.append(invalid_selection);
+		EngineDebugger::get_singleton()->send_message("remote_selection_invalidated", arr);
+
+		EngineDebugger::get_singleton()->send_message(objs.is_empty() ? "remote_nothing_selected" : "remote_objects_selected", objs);
+	} else {
+		EngineDebugger::get_singleton()->send_message(p_update_selection ? "remote_objects_selected" : "scene:inspect_objects", objs);
+	}
 }
 
-void SceneDebugger::_set_object_property(ObjectID p_id, const String &p_property, const Variant &p_value) {
+void SceneDebugger::_set_object_property(ObjectID p_id, const String &p_property, const Variant &p_value, const String &p_field) {
 	Object *obj = ObjectDB::get_instance(p_id);
 	if (!obj) {
 		return;
@@ -378,7 +432,16 @@ void SceneDebugger::_set_object_property(ObjectID p_id, const String &p_property
 		prop_name = ss[ss.size() - 1];
 	}
 
-	obj->set(prop_name, p_value);
+	Variant value;
+	if (p_field.is_empty()) {
+		// Whole value.
+		value = p_value;
+	} else {
+		// Only one field.
+		value = fieldwise_assign(obj->get(prop_name), p_value, p_field);
+	}
+
+	obj->set(prop_name, value);
 }
 
 void SceneDebugger::_next_frame() {
@@ -412,7 +475,7 @@ void SceneDebugger::remove_from_cache(const String &p_filename, Node *p_node) {
 	HashMap<String, HashSet<Node *>>::Iterator E = edit_cache.find(p_filename);
 	if (E) {
 		E->value.erase(p_node);
-		if (E->value.size() == 0) {
+		if (E->value.is_empty()) {
 			edit_cache.remove(E);
 		}
 	}
@@ -547,10 +610,7 @@ void SceneDebuggerObject::serialize(Array &r_arr, int p_max_size) {
 
 		Ref<Resource> res = var;
 
-		Array prop;
-		prop.push_back(pi.name);
-		prop.push_back(pi.type);
-
+		Array prop = { pi.name, pi.type };
 		PropertyHint hint = pi.hint;
 		String hint_string = pi.hint_string;
 		if (res.is_valid() && !res->get_path().is_empty()) {
@@ -1118,7 +1178,7 @@ void LiveEditor::_restore_node_func(ObjectID p_id, const NodePath &p_at, int p_a
 
 		EN->value.remove(FN);
 
-		if (EN->value.size() == 0) {
+		if (EN->value.is_empty()) {
 			live_edit_remove_list.remove(EN);
 		}
 
@@ -1218,19 +1278,11 @@ RuntimeNodeSelect::~RuntimeNodeSelect() {
 		memdelete(selection_list);
 	}
 
-	if (sbox_2d_canvas.is_valid()) {
-		RS::get_singleton()->free(sbox_2d_canvas);
+	if (draw_canvas.is_valid()) {
+		RS::get_singleton()->free(sel_drag_ci);
 		RS::get_singleton()->free(sbox_2d_ci);
+		RS::get_singleton()->free(draw_canvas);
 	}
-
-#ifndef _3D_DISABLED
-	if (sbox_3d_instance.is_valid()) {
-		RS::get_singleton()->free(sbox_3d_instance);
-		RS::get_singleton()->free(sbox_3d_instance_ofs);
-		RS::get_singleton()->free(sbox_3d_instance_xray);
-		RS::get_singleton()->free(sbox_3d_instance_xray_ofs);
-	}
-#endif // _3D_DISABLED
 }
 
 void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
@@ -1240,6 +1292,8 @@ void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
 	root->connect(SceneStringName(window_input), callable_mp(this, &RuntimeNodeSelect::_root_window_input));
 	root->connect("size_changed", callable_mp(this, &RuntimeNodeSelect::_queue_selection_update), CONNECT_DEFERRED);
 
+	max_selection = p_settings.get("debugger/max_node_selection", 1);
+
 	panner.instantiate();
 	panner->set_callbacks(callable_mp(this, &RuntimeNodeSelect::_pan_callback), callable_mp(this, &RuntimeNodeSelect::_zoom_callback));
 
@@ -1251,21 +1305,42 @@ void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
 	panner->setup_warped_panning(root, p_settings.get("editors/panning/warped_mouse_panning", true));
 	panner->set_scroll_speed(pan_speed);
 
+	sel_2d_grab_dist = p_settings.get("editors/polygon_editor/point_grab_radius", 0);
+
+	selection_area_fill = p_settings.get("box_selection_fill_color", Color());
+	selection_area_outline = p_settings.get("box_selection_stroke_color", Color());
+
+	draw_canvas = RS::get_singleton()->canvas_create();
+	sel_drag_ci = RS::get_singleton()->canvas_item_create();
+
 	/// 2D Selection Box Generation
 
-	sbox_2d_canvas = RS::get_singleton()->canvas_create();
 	sbox_2d_ci = RS::get_singleton()->canvas_item_create();
-	RS::get_singleton()->viewport_attach_canvas(root->get_viewport_rid(), sbox_2d_canvas);
-	RS::get_singleton()->canvas_item_set_parent(sbox_2d_ci, sbox_2d_canvas);
+	RS::get_singleton()->viewport_attach_canvas(root->get_viewport_rid(), draw_canvas);
+	RS::get_singleton()->canvas_item_set_parent(sel_drag_ci, draw_canvas);
+	RS::get_singleton()->canvas_item_set_parent(sbox_2d_ci, draw_canvas);
 
 #ifndef _3D_DISABLED
 	cursor = Cursor();
 
-	freelook_speed = p_settings.get("editors/3d/freelook/freelook_base_speed", FREELOOK_BASE_SPEED);
+	camera_fov = p_settings.get("editors/3d/default_fov", 70);
+	camera_znear = p_settings.get("editors/3d/default_z_near", 0.05);
+	camera_zfar = p_settings.get("editors/3d/default_z_far", 4'000);
+
+	invert_x_axis = p_settings.get("editors/3d/navigation/invert_x_axis", false);
+	invert_y_axis = p_settings.get("editors/3d/navigation/invert_y_axis", false);
+	warped_mouse_panning_3d = p_settings.get("editors/3d/navigation/warped_mouse_panning", true);
+
+	freelook_base_speed = p_settings.get("editors/3d/freelook/freelook_base_speed", 5);
+	freelook_sensitivity = Math::deg_to_rad((real_t)p_settings.get("editors/3d/freelook/freelook_sensitivity", 0.25));
+	orbit_sensitivity = Math::deg_to_rad((real_t)p_settings.get("editors/3d/navigation_feel/orbit_sensitivity", 0.004));
+	translation_sensitivity = p_settings.get("editors/3d/navigation_feel/translation_sensitivity", 1);
 
 	/// 3D Selection Box Generation
 	// Copied from the Node3DEditor implementation.
 
+	sbox_3d_color = p_settings.get("editors/3d/selection_box_color", Color());
+
 	// Use two AABBs to create the illusion of a slightly thicker line.
 	AABB aabb(Vector3(), Vector3(1, 1, 1));
 
@@ -1290,10 +1365,7 @@ void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
 	Ref<StandardMaterial3D> mat = memnew(StandardMaterial3D);
 	mat->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
 	mat->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
-	// In the original Node3DEditor, this value would be fetched from the "editors/3d/selection_box_color" editor property,
-	// but since this is not accessible from here, we will just use the default value.
-	const Color selection_color_3d = Color(1, 0.5, 0);
-	mat->set_albedo(selection_color_3d);
+	mat->set_albedo(sbox_3d_color);
 	mat->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
 	st->set_material(mat);
 	sbox_3d_mesh = st->commit();
@@ -1302,7 +1374,7 @@ void RuntimeNodeSelect::_setup(const Dictionary &p_settings) {
 	mat_xray->set_shading_mode(StandardMaterial3D::SHADING_MODE_UNSHADED);
 	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_FOG, true);
 	mat_xray->set_flag(StandardMaterial3D::FLAG_DISABLE_DEPTH_TEST, true);
-	mat_xray->set_albedo(selection_color_3d * Color(1, 1, 1, 0.15));
+	mat_xray->set_albedo(sbox_3d_color * Color(1, 1, 1, 0.15));
 	mat_xray->set_transparency(StandardMaterial3D::TRANSPARENCY_ALPHA);
 	st_xray->set_material(mat_xray);
 	sbox_3d_mesh_xray = st_xray->commit();
@@ -1342,7 +1414,7 @@ void RuntimeNodeSelect::_set_camera_override_enabled(bool p_enabled) {
 		_update_view_2d();
 
 		SceneTree::get_singleton()->get_root()->set_camera_3d_override_transform(_get_cursor_transform());
-		SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(CAMERA_BASE_FOV * cursor.fov_scale, CAMERA_ZNEAR, CAMERA_ZFAR);
+		SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
 	}
 #endif // _3D_DISABLED
 }
@@ -1360,12 +1432,11 @@ void RuntimeNodeSelect::_root_window_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
+	bool is_dragging_camera = false;
 	if (camera_override) {
 		if (node_select_type == NODE_TYPE_2D) {
-			if (panner->gui_input(p_event, Rect2(Vector2(), root->get_size()))) {
-				return;
-			}
-		} else if (node_select_type == NODE_TYPE_3D) {
+			is_dragging_camera = panner->gui_input(p_event, Rect2(Vector2(), root->get_visible_rect().get_size()));
+		} else if (node_select_type == NODE_TYPE_3D && selection_drag_state == SELECTION_DRAG_NONE) {
 #ifndef _3D_DISABLED
 			if (_handle_3d_input(p_event)) {
 				return;
@@ -1375,25 +1446,54 @@ void RuntimeNodeSelect::_root_window_input(const Ref<InputEvent> &p_event) {
 	}
 
 	Ref<InputEventMouseButton> b = p_event;
-	if (b.is_null() || !b->is_pressed()) {
+
+	if (selection_drag_state == SELECTION_DRAG_MOVE) {
+		Ref<InputEventMouseMotion> m = p_event;
+		if (m.is_valid()) {
+			_update_selection_drag(root->get_screen_transform().affine_inverse().xform(m->get_position()));
+			return;
+		} else if (b.is_valid()) {
+			// Account for actions like zooming.
+			_update_selection_drag(root->get_screen_transform().affine_inverse().xform(b->get_position()));
+		}
+	}
+
+	if (b.is_null()) {
 		return;
 	}
 
-	list_shortcut_pressed = node_select_mode == SELECT_MODE_SINGLE && b->get_button_index() == MouseButton::RIGHT && b->is_alt_pressed();
-	if (list_shortcut_pressed || b->get_button_index() == MouseButton::LEFT) {
-		selection_position = b->get_position();
+	// Ignore mouse wheel inputs.
+	if (b->get_button_index() != MouseButton::LEFT && b->get_button_index() != MouseButton::RIGHT) {
+		return;
+	}
+
+	if (selection_drag_state == SELECTION_DRAG_MOVE && !b->is_pressed() && b->get_button_index() == MouseButton::LEFT) {
+		selection_drag_state = SELECTION_DRAG_END;
+		selection_drag_area = selection_drag_area.abs();
+		_update_selection_drag();
+
+		// Trigger a selection in the position on release.
+		if (multi_shortcut_pressed) {
+			selection_position = root->get_screen_transform().affine_inverse().xform(b->get_position());
+		}
+	}
+
+	if (!is_dragging_camera && b->is_pressed()) {
+		multi_shortcut_pressed = b->is_shift_pressed();
+		list_shortcut_pressed = node_select_mode == SELECT_MODE_SINGLE && b->get_button_index() == MouseButton::RIGHT && b->is_alt_pressed();
+		if (list_shortcut_pressed || b->get_button_index() == MouseButton::LEFT) {
+			selection_position = root->get_screen_transform().affine_inverse().xform(b->get_position());
+		}
 	}
 }
 
 void RuntimeNodeSelect::_items_popup_index_pressed(int p_index, PopupMenu *p_popup) {
 	Object *obj = p_popup->get_item_metadata(p_index).get_validated_object();
-	if (!obj) {
-		return;
+	if (obj) {
+		Vector<Node *> node;
+		node.append(Object::cast_to<Node>(obj));
+		_send_ids(node);
 	}
-
-	Array message;
-	message.append(obj->get_instance_id());
-	EngineDebugger::get_singleton()->send_message("remote_node_clicked", message);
 }
 
 void RuntimeNodeSelect::_update_input_state() {
@@ -1445,7 +1545,7 @@ void RuntimeNodeSelect::_process_frame() {
 			direction -= up;
 		}
 
-		real_t speed = freelook_speed;
+		real_t speed = freelook_base_speed;
 		if (input->is_physical_key_pressed(Key::SHIFT)) {
 			speed *= 3.0;
 		}
@@ -1478,20 +1578,23 @@ void RuntimeNodeSelect::_process_frame() {
 }
 
 void RuntimeNodeSelect::_physics_frame() {
-	if (!Math::is_inf(selection_position.x) || !Math::is_inf(selection_position.y)) {
-		_click_point();
-		selection_position = Point2(INFINITY, INFINITY);
+	if (selection_drag_state != SELECTION_DRAG_END && (selection_drag_state == SELECTION_DRAG_MOVE || Math::is_inf(selection_position.x))) {
+		return;
 	}
-}
 
-void RuntimeNodeSelect::_click_point() {
 	Window *root = SceneTree::get_singleton()->get_root();
-	Point2 pos = root->get_screen_transform().affine_inverse().xform(selection_position);
+	bool selection_drag_valid = selection_drag_state == SELECTION_DRAG_END && selection_drag_area.get_area() > SELECTION_MIN_AREA;
 	Vector<SelectResult> items;
 
 	if (node_select_type == NODE_TYPE_2D) {
-		for (int i = 0; i < root->get_child_count(); i++) {
-			_find_canvas_items_at_pos(pos, root->get_child(i), items);
+		if (selection_drag_valid) {
+			for (int i = 0; i < root->get_child_count(); i++) {
+				_find_canvas_items_at_rect(selection_drag_area, root->get_child(i), items);
+			}
+		} else if (!Math::is_inf(selection_position.x)) {
+			for (int i = 0; i < root->get_child_count(); i++) {
+				_find_canvas_items_at_pos(selection_position, root->get_child(i), items);
+			}
 		}
 
 		// Remove possible duplicates.
@@ -1508,73 +1611,281 @@ void RuntimeNodeSelect::_click_point() {
 		}
 	} else if (node_select_type == NODE_TYPE_3D) {
 #ifndef _3D_DISABLED
-		_find_3d_items_at_pos(pos, items);
+		if (selection_drag_valid) {
+			_find_3d_items_at_rect(selection_drag_area, items);
+		} else {
+			_find_3d_items_at_pos(selection_position, items);
+		}
 #endif // _3D_DISABLED
 	}
 
-	if (items.is_empty()) {
-		return;
-	}
-
 	items.sort();
 
-	if ((!list_shortcut_pressed && node_select_mode == SELECT_MODE_SINGLE) || items.size() == 1) {
-		Array message;
-		message.append(items[0].item->get_instance_id());
-		EngineDebugger::get_singleton()->send_message("remote_node_clicked", message);
-	} else if (list_shortcut_pressed || node_select_mode == SELECT_MODE_LIST) {
-		if (!selection_list) {
-			_open_selection_list(items, pos);
-		}
-	}
-}
+	switch (selection_drag_state) {
+		case SELECTION_DRAG_END: {
+			selection_position = Point2(Math::INF, Math::INF);
+			selection_drag_state = SELECTION_DRAG_NONE;
 
-void RuntimeNodeSelect::_select_node(Node *p_node) {
-	if (p_node == selected_node) {
-		return;
-	}
+			if (selection_drag_area.get_area() > SELECTION_MIN_AREA) {
+				if (!items.is_empty()) {
+					Vector<Node *> nodes;
+					for (const SelectResult item : items) {
+						nodes.append(item.item);
+					}
+					_send_ids(nodes, false);
+				}
 
-	_clear_selection();
-
-	CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
-	if (ci) {
-		selected_node = p_node;
-	} else {
-#ifndef _3D_DISABLED
-		Node3D *node_3d = Object::cast_to<Node3D>(p_node);
-		if (node_3d) {
-			if (!node_3d->is_inside_world()) {
+				_update_selection_drag();
 				return;
 			}
 
-			selected_node = p_node;
+			_update_selection_drag();
+		} break;
 
-			if (sbox_3d_mesh.is_valid()) {
-				sbox_3d_instance = RS::get_singleton()->instance_create2(sbox_3d_mesh->get_rid(), node_3d->get_world_3d()->get_scenario());
-				sbox_3d_instance_ofs = RS::get_singleton()->instance_create2(sbox_3d_mesh->get_rid(), node_3d->get_world_3d()->get_scenario());
-				RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sbox_3d_instance, RS::SHADOW_CASTING_SETTING_OFF);
-				RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sbox_3d_instance_ofs, RS::SHADOW_CASTING_SETTING_OFF);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance_ofs, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance_ofs, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+		case SELECTION_DRAG_NONE: {
+			if (node_select_mode == SELECT_MODE_LIST) {
+				break;
 			}
 
-			if (sbox_3d_mesh_xray.is_valid()) {
-				sbox_3d_instance_xray = RS::get_singleton()->instance_create2(sbox_3d_mesh_xray->get_rid(), node_3d->get_world_3d()->get_scenario());
-				sbox_3d_instance_xray_ofs = RS::get_singleton()->instance_create2(sbox_3d_mesh_xray->get_rid(), node_3d->get_world_3d()->get_scenario());
-				RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sbox_3d_instance_xray, RS::SHADOW_CASTING_SETTING_OFF);
-				RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sbox_3d_instance_xray_ofs, RS::SHADOW_CASTING_SETTING_OFF);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance_xray, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance_xray, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance_xray_ofs, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
-				RS::get_singleton()->instance_geometry_set_flag(sbox_3d_instance_xray_ofs, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+			if (multi_shortcut_pressed) {
+				// Allow forcing box selection when an item was clicked.
+				selection_drag_state = SELECTION_DRAG_MOVE;
+			} else if (items.is_empty()) {
+#ifdef _3D_DISABLED
+				if (!selected_ci_nodes.is_empty()) {
+#else
+				if (!selected_ci_nodes.is_empty() || !selected_3d_nodes.is_empty()) {
+#endif // _3D_DISABLED
+					EngineDebugger::get_singleton()->send_message("remote_nothing_selected", Array());
+					_clear_selection();
+				}
+
+				selection_drag_state = SELECTION_DRAG_MOVE;
+			} else {
+				break;
+			}
+
+			[[fallthrough]];
+		}
+
+		case SELECTION_DRAG_MOVE: {
+			selection_drag_area.position = selection_position;
+
+			// Stop selection on click, so it can happen on release if the selection area doesn't pass the threshold.
+			if (multi_shortcut_pressed) {
+				return;
 			}
 		}
-#endif // _3D_DISABLED
 	}
 
-	has_selection = selected_node;
+	if (items.is_empty()) {
+		selection_position = Point2(Math::INF, Math::INF);
+		return;
+	}
+	if ((!list_shortcut_pressed && node_select_mode == SELECT_MODE_SINGLE) || items.size() == 1) {
+		selection_position = Point2(Math::INF, Math::INF);
+
+		Vector<Node *> node;
+		node.append(items[0].item);
+		_send_ids(node);
+
+		return;
+	}
+
+	if (!selection_list && (list_shortcut_pressed || node_select_mode == SELECT_MODE_LIST)) {
+		_open_selection_list(items, selection_position);
+	}
+
+	selection_position = Point2(Math::INF, Math::INF);
+}
+
+void RuntimeNodeSelect::_send_ids(const Vector<Node *> &p_picked_nodes, bool p_invert_new_selections) {
+	ERR_FAIL_COND(p_picked_nodes.is_empty());
+
+	Vector<Node *> picked_nodes = p_picked_nodes;
+	Array message;
+
+	if (!multi_shortcut_pressed) {
+		if (picked_nodes.size() > max_selection) {
+			picked_nodes.resize(max_selection);
+			EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
+		}
+
+		for (const Node *node : picked_nodes) {
+			SceneDebuggerObject obj(node->get_instance_id());
+			Array arr;
+			obj.serialize(arr);
+			message.append(arr);
+		}
+
+		EngineDebugger::get_singleton()->send_message("remote_objects_selected", message);
+		_set_selected_nodes(picked_nodes);
+
+		return;
+	}
+
+	int limit = max_selection - selected_ci_nodes.size();
+#ifndef _3D_DISABLED
+	limit -= selected_3d_nodes.size();
+#endif // _3D_DISABLED
+	if (limit <= 0) {
+		return;
+	}
+	if (picked_nodes.size() > limit) {
+		picked_nodes.resize(limit);
+		EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
+	}
+
+	LocalVector<Node *> nodes;
+	LocalVector<ObjectID> ids;
+	for (Node *node : picked_nodes) {
+		ObjectID id = node->get_instance_id();
+		if (CanvasItem *ci = Object::cast_to<CanvasItem>(node)) {
+			if (selected_ci_nodes.has(id)) {
+				if (p_invert_new_selections) {
+					selected_ci_nodes.erase(id);
+				}
+			} else {
+				ids.push_back(id);
+				nodes.push_back(ci);
+			}
+		} else {
+#ifndef _3D_DISABLED
+			if (Node3D *node3d = Object::cast_to<Node3D>(node)) {
+				if (selected_3d_nodes.has(id)) {
+					if (p_invert_new_selections) {
+						selected_3d_nodes.erase(id);
+					}
+				} else {
+					ids.push_back(id);
+					nodes.push_back(node3d);
+				}
+			}
+#endif // _3D_DISABLED
+		}
+	}
+
+	for (ObjectID id : selected_ci_nodes) {
+		ids.push_back(id);
+		nodes.push_back(ObjectDB::get_instance<Node>(id));
+	}
+#ifndef _3D_DISABLED
+	for (const KeyValue<ObjectID, Ref<SelectionBox3D>> &KV : selected_3d_nodes) {
+		ids.push_back(KV.key);
+		nodes.push_back(ObjectDB::get_instance<Node>(KV.key));
+	}
+#endif // _3D_DISABLED
+
+	if (ids.size() > (unsigned)max_selection) {
+		ids.resize(max_selection);
+		EngineDebugger::get_singleton()->send_message("show_selection_limit_warning", Array());
+	}
+
+	if (ids.is_empty()) {
+		EngineDebugger::get_singleton()->send_message("remote_nothing_selected", message);
+	} else {
+		for (const ObjectID &id : ids) {
+			SceneDebuggerObject obj(id);
+			Array arr;
+			obj.serialize(arr);
+			message.append(arr);
+		}
+
+		EngineDebugger::get_singleton()->send_message("remote_objects_selected", message);
+	}
+
+	_set_selected_nodes(nodes);
+}
+
+void RuntimeNodeSelect::_set_selected_nodes(const Vector<Node *> &p_nodes) {
+	if (p_nodes.is_empty()) {
+		_clear_selection();
+		return;
+	}
+
+	bool changed = false;
+	LocalVector<ObjectID> nodes_ci;
+#ifndef _3D_DISABLED
+	HashMap<ObjectID, Ref<SelectionBox3D>> nodes_3d;
+#endif // _3D_DISABLED
+
+	for (Node *node : p_nodes) {
+		ObjectID id = node->get_instance_id();
+		if (Object::cast_to<CanvasItem>(node)) {
+			if (!changed || !selected_ci_nodes.has(id)) {
+				changed = true;
+			}
+
+			nodes_ci.push_back(id);
+		} else {
+#ifndef _3D_DISABLED
+			Node3D *node_3d = Object::cast_to<Node3D>(node);
+			if (!node_3d || !node_3d->is_inside_world()) {
+				continue;
+			}
+
+			if (!changed || !selected_3d_nodes.has(id)) {
+				changed = true;
+			}
+
+			if (selected_3d_nodes.has(id)) {
+				// Assign an already available visual instance.
+				nodes_3d[id] = selected_3d_nodes.get(id);
+				continue;
+			}
+
+			if (sbox_3d_mesh.is_null() || sbox_3d_mesh_xray.is_null()) {
+				continue;
+			}
+
+			Ref<SelectionBox3D> sb;
+			sb.instantiate();
+			nodes_3d[id] = sb;
+
+			RID scenario = node_3d->get_world_3d()->get_scenario();
+
+			sb->instance = RS::get_singleton()->instance_create2(sbox_3d_mesh->get_rid(), scenario);
+			sb->instance_ofs = RS::get_singleton()->instance_create2(sbox_3d_mesh->get_rid(), scenario);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_ofs, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_ofs, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_ofs, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+
+			sb->instance_xray = RS::get_singleton()->instance_create2(sbox_3d_mesh_xray->get_rid(), scenario);
+			sb->instance_xray_ofs = RS::get_singleton()->instance_create2(sbox_3d_mesh_xray->get_rid(), scenario);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_xray, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_cast_shadows_setting(sb->instance_xray_ofs, RS::SHADOW_CASTING_SETTING_OFF);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray_ofs, RS::INSTANCE_FLAG_IGNORE_OCCLUSION_CULLING, true);
+			RS::get_singleton()->instance_geometry_set_flag(sb->instance_xray_ofs, RS::INSTANCE_FLAG_USE_BAKED_LIGHT, false);
+#endif // _3D_DISABLED
+		}
+	}
+
+#ifdef _3D_DISABLED
+	if (!changed && nodes_ci.size() == selected_ci_nodes.size()) {
+		return;
+	}
+#else
+	if (!changed && nodes_ci.size() == selected_ci_nodes.size() && nodes_3d.size() == selected_3d_nodes.size()) {
+		return;
+	}
+#endif // _3D_DISABLED
+
+	_clear_selection();
+	selected_ci_nodes = nodes_ci;
+	has_selection = !nodes_ci.is_empty();
+
+#ifndef _3D_DISABLED
+	if (!nodes_3d.is_empty()) {
+		selected_3d_nodes = nodes_3d;
+		has_selection = true;
+	}
+#endif // _3D_DISABLED
+
 	_queue_selection_update();
 }
 
@@ -1589,20 +1900,25 @@ void RuntimeNodeSelect::_queue_selection_update() {
 }
 
 void RuntimeNodeSelect::_update_selection() {
-	if (has_selection && (!selected_node || !selected_node->is_inside_tree())) {
-		_clear_selection();
-		return;
-	}
+	Window *root = SceneTree::get_singleton()->get_root();
+
+	RS::get_singleton()->canvas_item_clear(sbox_2d_ci);
+	RS::get_singleton()->canvas_item_set_visible(sbox_2d_ci, selection_visible);
+
+	for (LocalVector<ObjectID>::Iterator E = selected_ci_nodes.begin(); E != selected_ci_nodes.end(); ++E) {
+		ObjectID id = *E;
+		CanvasItem *ci = ObjectDB::get_instance<CanvasItem>(id);
+		if (!ci) {
+			selected_ci_nodes.erase(id);
+			--E;
+			continue;
+		}
 
-	CanvasItem *ci = Object::cast_to<CanvasItem>(selected_node);
-	if (ci) {
-		Window *root = SceneTree::get_singleton()->get_root();
 		Transform2D xform;
-		if (root->is_canvas_transform_override_enabled() && !ci->get_canvas_layer_node()) {
-			RS::get_singleton()->canvas_item_set_transform(sbox_2d_ci, (root->get_canvas_transform_override()));
-			xform = ci->get_global_transform();
+		// Cameras (overridden or not) don't affect `CanvasLayer`s.
+		if (root->is_canvas_transform_override_enabled() && !(ci->get_canvas_layer_node() && !ci->get_canvas_layer_node()->is_following_viewport())) {
+			xform = root->get_canvas_transform_override() * ci->get_global_transform();
 		} else {
-			RS::get_singleton()->canvas_item_set_transform(sbox_2d_ci, Transform2D());
 			xform = ci->get_global_transform_with_canvas();
 		}
 
@@ -1612,6 +1928,7 @@ void RuntimeNodeSelect::_update_selection() {
 		if (ci->_edit_use_rect()) {
 			rect = ci->_edit_get_rect();
 		} else {
+#ifndef PHYSICS_2D_DISABLED
 			CollisionShape2D *collision_shape = Object::cast_to<CollisionShape2D>(ci);
 			if (collision_shape) {
 				Ref<Shape2D> shape = collision_shape->get_shape();
@@ -1619,32 +1936,31 @@ void RuntimeNodeSelect::_update_selection() {
 					rect = shape->get_rect();
 				}
 			}
+#endif // PHYSICS_2D_DISABLED
 		}
 
-		RS::get_singleton()->canvas_item_set_visible(sbox_2d_ci, selection_visible);
-
-		if (xform == sbox_2d_xform && rect == sbox_2d_rect) {
-			return; // Nothing changed.
-		}
-		sbox_2d_xform = xform;
-		sbox_2d_rect = rect;
-
-		RS::get_singleton()->canvas_item_clear(sbox_2d_ci);
-
 		const Vector2 endpoints[4] = {
 			xform.xform(rect.position),
-			xform.xform(rect.position + Vector2(rect.size.x, 0)),
+			xform.xform(rect.position + Point2(rect.size.x, 0)),
 			xform.xform(rect.position + rect.size),
-			xform.xform(rect.position + Vector2(0, rect.size.y))
+			xform.xform(rect.position + Point2(0, rect.size.y))
 		};
 
 		const Color selection_color_2d = Color(1, 0.6, 0.4, 0.7);
 		for (int i = 0; i < 4; i++) {
-			RS::get_singleton()->canvas_item_add_line(sbox_2d_ci, endpoints[i], endpoints[(i + 1) % 4], selection_color_2d, Math::round(2.f));
+			RS::get_singleton()->canvas_item_add_line(sbox_2d_ci, endpoints[i], endpoints[(i + 1) % 4], selection_color_2d, 2);
 		}
-	} else {
+	}
+
 #ifndef _3D_DISABLED
-		Node3D *node_3d = Object::cast_to<Node3D>(selected_node);
+	for (HashMap<ObjectID, Ref<SelectionBox3D>>::ConstIterator KV = selected_3d_nodes.begin(); KV != selected_3d_nodes.end(); ++KV) {
+		ObjectID id = KV->key;
+		Node3D *node_3d = ObjectDB::get_instance<Node3D>(id);
+		if (!node_3d) {
+			selected_3d_nodes.erase(id);
+			--KV;
+			continue;
+		}
 
 		// Fallback.
 		AABB bounds(Vector3(-0.5, -0.5, -0.5), Vector3(1, 1, 1));
@@ -1653,6 +1969,7 @@ void RuntimeNodeSelect::_update_selection() {
 		if (visual_instance) {
 			bounds = visual_instance->get_aabb();
 		} else {
+#ifndef PHYSICS_2D_DISABLED
 			CollisionShape3D *collision_shape = Object::cast_to<CollisionShape3D>(node_3d);
 			if (collision_shape) {
 				Ref<Shape3D> shape = collision_shape->get_shape();
@@ -1660,22 +1977,19 @@ void RuntimeNodeSelect::_update_selection() {
 					bounds = shape->get_debug_mesh()->get_aabb();
 				}
 			}
+#endif // PHYSICS_2D_DISABLED
 		}
 
-		RS::get_singleton()->instance_set_visible(sbox_3d_instance, selection_visible);
-		RS::get_singleton()->instance_set_visible(sbox_3d_instance_ofs, selection_visible);
-		RS::get_singleton()->instance_set_visible(sbox_3d_instance_xray, selection_visible);
-		RS::get_singleton()->instance_set_visible(sbox_3d_instance_xray_ofs, selection_visible);
-
 		Transform3D xform_to_top_level_parent_space = node_3d->get_global_transform().affine_inverse() * node_3d->get_global_transform();
 		bounds = xform_to_top_level_parent_space.xform(bounds);
 		Transform3D t = node_3d->get_global_transform();
 
-		if (t == sbox_3d_xform && bounds == sbox_3d_bounds) {
-			return; // Nothing changed.
+		Ref<SelectionBox3D> sb = KV->value;
+		if (t == sb->transform && bounds == sb->bounds) {
+			continue; // Nothing changed.
 		}
-		sbox_3d_xform = t;
-		sbox_3d_bounds = bounds;
+		sb->transform = t;
+		sb->bounds = bounds;
 
 		Transform3D t_offset = t;
 
@@ -1695,30 +2009,85 @@ void RuntimeNodeSelect::_update_selection() {
 			t_offset.basis = t_offset.basis * aabb_s;
 		}
 
-		RS::get_singleton()->instance_set_transform(sbox_3d_instance, t);
-		RS::get_singleton()->instance_set_transform(sbox_3d_instance_ofs, t_offset);
-		RS::get_singleton()->instance_set_transform(sbox_3d_instance_xray, t);
-		RS::get_singleton()->instance_set_transform(sbox_3d_instance_xray_ofs, t_offset);
-#endif // _3D_DISABLED
+		RS::get_singleton()->instance_set_visible(sb->instance, selection_visible);
+		RS::get_singleton()->instance_set_visible(sb->instance_ofs, selection_visible);
+		RS::get_singleton()->instance_set_visible(sb->instance_xray, selection_visible);
+		RS::get_singleton()->instance_set_visible(sb->instance_xray_ofs, selection_visible);
+
+		RS::get_singleton()->instance_set_transform(sb->instance, t);
+		RS::get_singleton()->instance_set_transform(sb->instance_ofs, t_offset);
+		RS::get_singleton()->instance_set_transform(sb->instance_xray, t);
+		RS::get_singleton()->instance_set_transform(sb->instance_xray_ofs, t_offset);
+
+		RS::get_singleton()->instance_reset_physics_interpolation(sb->instance);
+		RS::get_singleton()->instance_reset_physics_interpolation(sb->instance_ofs);
+		RS::get_singleton()->instance_reset_physics_interpolation(sb->instance_xray);
+		RS::get_singleton()->instance_reset_physics_interpolation(sb->instance_xray_ofs);
 	}
+#endif // _3D_DISABLED
 }
 
 void RuntimeNodeSelect::_clear_selection() {
-	selected_node = nullptr;
-	has_selection = false;
-
-	if (sbox_2d_canvas.is_valid()) {
+	selected_ci_nodes.clear();
+	if (draw_canvas.is_valid()) {
 		RS::get_singleton()->canvas_item_clear(sbox_2d_ci);
 	}
 
 #ifndef _3D_DISABLED
-	if (sbox_3d_instance.is_valid()) {
-		RS::get_singleton()->free(sbox_3d_instance);
-		RS::get_singleton()->free(sbox_3d_instance_ofs);
-		RS::get_singleton()->free(sbox_3d_instance_xray);
-		RS::get_singleton()->free(sbox_3d_instance_xray_ofs);
-	}
+	selected_3d_nodes.clear();
 #endif // _3D_DISABLED
+
+	has_selection = false;
+}
+
+void RuntimeNodeSelect::_update_selection_drag(const Point2 &p_end_pos) {
+	RS::get_singleton()->canvas_item_clear(sel_drag_ci);
+
+	if (selection_drag_state != SELECTION_DRAG_MOVE) {
+		return;
+	}
+
+	selection_drag_area.size = p_end_pos - selection_drag_area.position;
+
+	if (selection_drag_state == SELECTION_DRAG_END) {
+		return;
+	}
+
+	Window *root = SceneTree::get_singleton()->get_root();
+	Rect2 selection_drawing;
+	int thickness;
+	if (root->is_canvas_transform_override_enabled()) {
+		Transform2D xform = root->get_canvas_transform_override();
+		RS::get_singleton()->canvas_item_set_transform(sel_drag_ci, xform);
+		RS::get_singleton()->canvas_item_reset_physics_interpolation(sel_drag_ci);
+
+		selection_drawing.position = xform.affine_inverse().xform(selection_drag_area.position);
+		selection_drawing.size = xform.affine_inverse().xform(p_end_pos);
+		thickness = MAX(1, Math::ceil(1 / view_2d_zoom));
+	} else {
+		RS::get_singleton()->canvas_item_set_transform(sel_drag_ci, Transform2D());
+		RS::get_singleton()->canvas_item_reset_physics_interpolation(sel_drag_ci);
+
+		selection_drawing.position = selection_drag_area.position;
+		selection_drawing.size = p_end_pos;
+		thickness = 1;
+	}
+	selection_drawing.size -= selection_drawing.position;
+	selection_drawing = selection_drawing.abs();
+
+	const Vector2 endpoints[4] = {
+		selection_drawing.position,
+		selection_drawing.position + Point2(selection_drawing.size.x, 0),
+		selection_drawing.position + selection_drawing.size,
+		selection_drawing.position + Point2(0, selection_drawing.size.y)
+	};
+
+	// Draw fill.
+	RS::get_singleton()->canvas_item_add_rect(sel_drag_ci, selection_drawing, selection_area_fill);
+	// Draw outline.
+	for (int i = 0; i < 4; i++) {
+		RS::get_singleton()->canvas_item_add_line(sel_drag_ci, endpoints[i], endpoints[(i + 1) % 4], selection_area_outline, thickness);
+	}
 }
 
 void RuntimeNodeSelect::_open_selection_list(const Vector<SelectResult> &p_items, const Point2 &p_pos) {
@@ -1738,7 +2107,7 @@ void RuntimeNodeSelect::_open_selection_list(const Vector<SelectResult> &p_items
 		selection_list->set_item_metadata(-1, I.item);
 	}
 
-	selection_list->set_position(selection_list->is_embedded() ? p_pos : selection_position + root->get_position());
+	selection_list->set_position(selection_list->is_embedded() ? p_pos : (Input::get_singleton()->get_mouse_position() + root->get_position()));
 	selection_list->reset_size();
 	selection_list->popup();
 	// FIXME: Ugly hack that stops the popup from hiding when the button is released.
@@ -1764,11 +2133,7 @@ void RuntimeNodeSelect::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_n
 		return;
 	}
 
-	// In the original CanvasItemEditor, this value would be fetched from the "editors/polygon_editor/point_grab_radius" editor property,
-	// but since this is not accessible from here, we will just use the default value.
-	const real_t grab_distance = 8;
 	CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
-
 	for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
 		if (ci) {
 			if (!ci->is_set_as_top_level()) {
@@ -1782,47 +2147,112 @@ void RuntimeNodeSelect::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_n
 		}
 	}
 
-	if (ci && ci->is_visible_in_tree()) {
-		Transform2D xform = p_canvas_xform;
-		if (!ci->is_set_as_top_level()) {
-			xform *= p_parent_xform;
-		}
+	if (!ci || !ci->is_visible_in_tree()) {
+		return;
+	}
 
-		Vector2 pos;
-		// Cameras (overridden or not) don't affect `CanvasLayer`s.
-		if (!ci->get_canvas_layer_node()) {
-			Window *root = SceneTree::get_singleton()->get_root();
-			pos = (root->is_canvas_transform_override_enabled() ? root->get_canvas_transform_override() : root->get_canvas_transform()).affine_inverse().xform(p_pos);
-		} else {
-			pos = p_pos;
-		}
+	Transform2D xform = p_canvas_xform;
+	if (!ci->is_set_as_top_level()) {
+		xform *= p_parent_xform;
+	}
 
-		xform = (xform * ci->get_transform()).affine_inverse();
-		const real_t local_grab_distance = xform.basis_xform(Vector2(grab_distance, 0)).length() / view_2d_zoom;
-		if (ci->_edit_is_selected_on_click(xform.xform(pos), local_grab_distance)) {
-			SelectResult res;
-			res.item = ci;
-			res.order = ci->get_effective_z_index() + ci->get_canvas_layer();
-			r_items.push_back(res);
+	Window *root = SceneTree::get_singleton()->get_root();
+	Point2 pos;
+	// Cameras (overridden or not) don't affect `CanvasLayer`s.
+	if (!ci->get_canvas_layer_node() || ci->get_canvas_layer_node()->is_following_viewport()) {
+		pos = (root->is_canvas_transform_override_enabled() ? root->get_canvas_transform_override() : root->get_canvas_transform()).affine_inverse().xform(p_pos);
+	} else {
+		pos = p_pos;
+	}
 
-			// If it's a shape, get the collision object it's from.
-			// FIXME: If the collision object has multiple shapes, only the topmost will be above it in the list.
-			if (Object::cast_to<CollisionShape2D>(ci) || Object::cast_to<CollisionPolygon2D>(ci)) {
-				CollisionObject2D *collision_object = Object::cast_to<CollisionObject2D>(ci->get_parent());
-				if (collision_object) {
-					SelectResult res_col;
-					res_col.item = ci->get_parent();
-					res_col.order = collision_object->get_z_index() + ci->get_canvas_layer();
-					r_items.push_back(res_col);
-				}
+	xform = (xform * ci->get_transform()).affine_inverse();
+	const real_t local_grab_distance = xform.basis_xform(Vector2(sel_2d_grab_dist, 0)).length() / view_2d_zoom;
+	if (ci->_edit_is_selected_on_click(xform.xform(pos), local_grab_distance)) {
+		SelectResult res;
+		res.item = ci;
+		res.order = ci->get_effective_z_index() + ci->get_canvas_layer();
+		r_items.push_back(res);
+
+#ifndef PHYSICS_2D_DISABLED
+		// If it's a shape, get the collision object it's from.
+		// FIXME: If the collision object has multiple shapes, only the topmost will be above it in the list.
+		if (Object::cast_to<CollisionShape2D>(ci) || Object::cast_to<CollisionPolygon2D>(ci)) {
+			CollisionObject2D *collision_object = Object::cast_to<CollisionObject2D>(ci->get_parent());
+			if (collision_object) {
+				SelectResult res_col;
+				res_col.item = ci->get_parent();
+				res_col.order = collision_object->get_z_index() + ci->get_canvas_layer();
+				r_items.push_back(res_col);
 			}
 		}
+#endif // PHYSICS_2D_DISABLED
+	}
+}
+
+// Copied and trimmed from the CanvasItemEditor implementation.
+void RuntimeNodeSelect::_find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform) {
+	if (!p_node || Object::cast_to<Viewport>(p_node)) {
+		return;
+	}
+
+	CanvasItem *ci = Object::cast_to<CanvasItem>(p_node);
+	for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
+		if (ci) {
+			if (!ci->is_set_as_top_level()) {
+				_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, p_parent_xform * ci->get_transform(), p_canvas_xform);
+			} else {
+				_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, ci->get_transform(), p_canvas_xform);
+			}
+		} else {
+			CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
+			_find_canvas_items_at_rect(p_rect, p_node->get_child(i), r_items, Transform2D(), cl ? cl->get_transform() : p_canvas_xform);
+		}
+	}
+
+	if (!ci || !ci->is_visible_in_tree()) {
+		return;
+	}
+
+	Transform2D xform = p_canvas_xform;
+	if (!ci->is_set_as_top_level()) {
+		xform *= p_parent_xform;
+	}
+
+	Window *root = SceneTree::get_singleton()->get_root();
+	Rect2 rect;
+	// Cameras (overridden or not) don't affect `CanvasLayer`s.
+	if (!ci->get_canvas_layer_node() || ci->get_canvas_layer_node()->is_following_viewport()) {
+		rect = (root->is_canvas_transform_override_enabled() ? root->get_canvas_transform_override() : root->get_canvas_transform()).affine_inverse().xform(p_rect);
+	} else {
+		rect = p_rect;
+	}
+	rect = (xform * ci->get_transform()).affine_inverse().xform(rect);
+
+	bool selected = false;
+	if (ci->_edit_use_rect()) {
+		Rect2 ci_rect = ci->_edit_get_rect();
+		if (rect.has_point(ci_rect.position) &&
+				rect.has_point(ci_rect.position + Vector2(ci_rect.size.x, 0)) &&
+				rect.has_point(ci_rect.position + Vector2(ci_rect.size.x, ci_rect.size.y)) &&
+				rect.has_point(ci_rect.position + Vector2(0, ci_rect.size.y))) {
+			selected = true;
+		}
+	} else if (rect.has_point(Point2())) {
+		selected = true;
+	}
+
+	if (selected) {
+		SelectResult res;
+		res.item = ci;
+		res.order = ci->get_effective_z_index() + ci->get_canvas_layer();
+		r_items.push_back(res);
 	}
 }
 
 void RuntimeNodeSelect::_pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event) {
-	view_2d_offset.x -= p_scroll_vec.x / view_2d_zoom;
-	view_2d_offset.y -= p_scroll_vec.y / view_2d_zoom;
+	Vector2 scroll = SceneTree::get_singleton()->get_root()->get_screen_transform().affine_inverse().xform(p_scroll_vec);
+	view_2d_offset.x -= scroll.x / view_2d_zoom;
+	view_2d_offset.y -= scroll.y / view_2d_zoom;
 
 	_update_view_2d();
 }
@@ -1870,14 +2300,14 @@ void RuntimeNodeSelect::_update_view_2d() {
 #ifndef _3D_DISABLED
 void RuntimeNodeSelect::_find_3d_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items) {
 	Window *root = SceneTree::get_singleton()->get_root();
+
 	Vector3 ray, pos, to;
-	if (root->get_viewport()->is_camera_3d_override_enabled()) {
-		Viewport *vp = root->get_viewport();
-		ray = vp->camera_3d_override_project_ray_normal(p_pos);
-		pos = vp->camera_3d_override_project_ray_origin(p_pos);
-		to = pos + ray * vp->get_camera_3d_override_properties()["z_far"];
+	if (root->is_camera_3d_override_enabled()) {
+		ray = root->camera_3d_override_project_ray_normal(p_pos);
+		pos = root->camera_3d_override_project_ray_origin(p_pos);
+		to = pos + ray * root->get_camera_3d_override_properties()["z_far"];
 	} else {
-		Camera3D *camera = root->get_viewport()->get_camera_3d();
+		Camera3D *camera = root->get_camera_3d();
 		if (!camera) {
 			return;
 		}
@@ -1887,6 +2317,7 @@ void RuntimeNodeSelect::_find_3d_items_at_pos(const Point2 &p_pos, Vector<Select
 		to = pos + ray * camera->get_far();
 	}
 
+#ifndef PHYSICS_3D_DISABLED
 	// Start with physical objects.
 	PhysicsDirectSpaceState3D *ss = root->get_world_3d()->get_direct_space_state();
 	PhysicsDirectSpaceState3D::RayResult result;
@@ -1907,7 +2338,7 @@ void RuntimeNodeSelect::_find_3d_items_at_pos(const Point2 &p_pos, Vector<Select
 			if (collision) {
 				List<uint32_t> owners;
 				collision->get_shape_owners(&owners);
-				for (const uint32_t &I : owners) {
+				for (uint32_t &I : owners) {
 					SelectResult res_shape;
 					res_shape.item = Object::cast_to<Node>(collision->shape_owner_get_owner(I));
 					res_shape.order = res.order;
@@ -1922,6 +2353,7 @@ void RuntimeNodeSelect::_find_3d_items_at_pos(const Point2 &p_pos, Vector<Select
 			break;
 		}
 	}
+#endif // PHYSICS_3D_DISABLED
 
 	// Then go for the meshes.
 	Vector<ObjectID> items = RS::get_singleton()->instances_cull_ray(pos, to, root->get_world_3d()->get_scenario());
@@ -1952,9 +2384,183 @@ void RuntimeNodeSelect::_find_3d_items_at_pos(const Point2 &p_pos, Vector<Select
 	}
 }
 
+void RuntimeNodeSelect::_find_3d_items_at_rect(const Rect2 &p_rect, Vector<SelectResult> &r_items) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	Camera3D *camera = root->get_camera_3d();
+	if (!camera) {
+		return;
+	}
+
+	bool cam_override = root->is_camera_3d_override_enabled();
+	Vector3 cam_pos;
+	Vector3 dist_pos;
+	if (cam_override) {
+		cam_pos = root->get_camera_3d_override_transform().origin;
+		dist_pos = root->camera_3d_override_project_ray_origin(p_rect.position + p_rect.size / 2);
+	} else {
+		cam_pos = camera->get_global_position();
+		dist_pos = camera->project_ray_origin(p_rect.position + p_rect.size / 2);
+	}
+
+	real_t znear, zfar = 0;
+	real_t zofs = 5.0;
+	if (cam_override) {
+		HashMap<StringName, real_t> override_props = root->get_camera_3d_override_properties();
+		znear = override_props["z_near"];
+		zfar = override_props["z_far"];
+		zofs -= znear;
+	} else {
+		znear = camera->get_near();
+		zfar = camera->get_far();
+		zofs -= znear;
+	}
+	zofs = MAX(0.0, zofs);
+
+	const Point2 pos_end = p_rect.position + p_rect.size;
+	Vector3 box[4] = {
+		Vector3(
+				MIN(p_rect.position.x, pos_end.x),
+				MIN(p_rect.position.y, pos_end.y),
+				zofs),
+		Vector3(
+				MAX(p_rect.position.x, pos_end.x),
+				MIN(p_rect.position.y, pos_end.y),
+				zofs),
+		Vector3(
+				MAX(p_rect.position.x, pos_end.x),
+				MAX(p_rect.position.y, pos_end.y),
+				zofs),
+		Vector3(
+				MIN(p_rect.position.x, pos_end.x),
+				MAX(p_rect.position.y, pos_end.y),
+				zofs)
+	};
+
+	Vector<Plane> frustum;
+	for (int i = 0; i < 4; i++) {
+		Vector3 a = _get_screen_to_space(box[i]);
+		Vector3 b = _get_screen_to_space(box[(i + 1) % 4]);
+		frustum.push_back(Plane(a, b, cam_pos));
+	}
+
+	Plane near_plane;
+	// Get the camera normal.
+	if (cam_override) {
+		near_plane = Plane(root->get_camera_3d_override_transform().basis.get_column(2), cam_pos);
+	} else {
+		near_plane = Plane(camera->get_global_transform().basis.get_column(2), cam_pos);
+	}
+	near_plane.d -= znear;
+	frustum.push_back(near_plane);
+
+	Plane far_plane = -near_plane;
+	far_plane.d += zfar;
+	frustum.push_back(far_plane);
+
+#ifndef PHYSICS_3D_DISABLED
+	Vector<Vector3> points = Geometry3D::compute_convex_mesh_points(&frustum[0], frustum.size());
+	Ref<ConvexPolygonShape3D> shape;
+	shape.instantiate();
+	shape->set_points(points);
+
+	// Start with physical objects.
+	PhysicsDirectSpaceState3D *ss = root->get_world_3d()->get_direct_space_state();
+	PhysicsDirectSpaceState3D::ShapeResult result;
+	PhysicsDirectSpaceState3D::ShapeParameters shape_params;
+	shape_params.shape_rid = shape->get_rid();
+	shape_params.collide_with_areas = true;
+	if (ss->intersect_shape(shape_params, &result, 32)) {
+		SelectResult res;
+		res.item = Object::cast_to<Node>(result.collider);
+		res.order = -dist_pos.distance_to(Object::cast_to<Node3D>(res.item)->get_global_transform().origin);
+
+		// Fetch collision shapes.
+		CollisionObject3D *collision = Object::cast_to<CollisionObject3D>(result.collider);
+		if (collision) {
+			List<uint32_t> owners;
+			collision->get_shape_owners(&owners);
+			for (uint32_t &I : owners) {
+				SelectResult res_shape;
+				res_shape.item = Object::cast_to<Node>(collision->shape_owner_get_owner(I));
+				res_shape.order = res.order;
+				r_items.push_back(res_shape);
+			}
+		}
+
+		r_items.push_back(res);
+	}
+#endif // PHYSICS_3D_DISABLED
+
+	// Then go for the meshes.
+	Vector<ObjectID> items = RS::get_singleton()->instances_cull_convex(frustum, root->get_world_3d()->get_scenario());
+	for (int i = 0; i < items.size(); i++) {
+		Object *obj = ObjectDB::get_instance(items[i]);
+		GeometryInstance3D *geo_instance = Object::cast_to<GeometryInstance3D>(obj);
+		if (geo_instance) {
+			Ref<TriangleMesh> mesh_collision = geo_instance->generate_triangle_mesh();
+
+			if (mesh_collision.is_valid()) {
+				Transform3D gt = geo_instance->get_global_transform();
+				Vector3 mesh_scale = gt.get_basis().get_scale();
+				gt.orthonormalize();
+
+				Transform3D it = gt.affine_inverse();
+
+				Vector<Plane> transformed_frustum;
+				int plane_count = frustum.size();
+				transformed_frustum.resize(plane_count);
+
+				for (int j = 0; j < plane_count; j++) {
+					transformed_frustum.write[j] = it.xform(frustum[j]);
+				}
+				Vector<Vector3> convex_points = Geometry3D::compute_convex_mesh_points(transformed_frustum.ptr(), plane_count);
+				if (mesh_collision->inside_convex_shape(transformed_frustum.ptr(), transformed_frustum.size(), convex_points.ptr(), convex_points.size(), mesh_scale)) {
+					SelectResult res;
+					res.item = Object::cast_to<Node>(obj);
+					res.order = -dist_pos.distance_to(gt.origin);
+					r_items.push_back(res);
+
+					continue;
+				}
+			}
+		}
+
+		items.remove_at(i);
+		i--;
+	}
+}
+
+Vector3 RuntimeNodeSelect::_get_screen_to_space(const Vector3 &p_vector3) {
+	Window *root = SceneTree::get_singleton()->get_root();
+	Camera3D *camera = root->get_camera_3d();
+
+	Size2 size = root->get_size();
+	real_t znear = 0;
+
+	Projection cm;
+	Transform3D camera_transform;
+	if (root->is_camera_3d_override_enabled()) {
+		HashMap<StringName, real_t> override_props = root->get_camera_3d_override_properties();
+		znear = override_props["z_near"];
+		cm.set_perspective(override_props["fov"], size.aspect(), znear + p_vector3.z, override_props["z_far"]);
+
+		camera_transform.translate_local(cursor.pos);
+		camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot);
+		camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot);
+		camera_transform.translate_local(0, 0, cursor.distance);
+	} else {
+		znear = camera->get_near();
+		cm.set_perspective(camera->get_fov(), size.aspect(), znear + p_vector3.z, camera->get_far());
+
+		camera_transform = camera->get_camera_transform();
+	}
+
+	Vector2 screen_he = cm.get_viewport_half_extents();
+	return camera_transform.xform(Vector3(((p_vector3.x / size.width) * 2.0 - 1.0) * screen_he.x, ((1.0 - (p_vector3.y / size.height)) * 2.0 - 1.0) * screen_he.y, -(znear + p_vector3.z)));
+}
+
 bool RuntimeNodeSelect::_handle_3d_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventMouseButton> b = p_event;
-
 	if (b.is_valid()) {
 		const real_t zoom_factor = 1.08 * b->get_factor();
 		switch (b->get_button_index()) {
@@ -1986,7 +2592,6 @@ bool RuntimeNodeSelect::_handle_3d_input(const Ref<InputEvent> &p_event) {
 	}
 
 	Ref<InputEventMouseMotion> m = p_event;
-
 	if (m.is_valid()) {
 		if (camera_freelook) {
 			_cursor_look(m);
@@ -2002,7 +2607,6 @@ bool RuntimeNodeSelect::_handle_3d_input(const Ref<InputEvent> &p_event) {
 	}
 
 	Ref<InputEventKey> k = p_event;
-
 	if (k.is_valid()) {
 		if (k->get_physical_keycode() == Key::ESCAPE) {
 			_set_camera_freelook_enabled(false);
@@ -2011,19 +2615,19 @@ bool RuntimeNodeSelect::_handle_3d_input(const Ref<InputEvent> &p_event) {
 			switch (k->get_physical_keycode()) {
 				case Key::EQUAL: {
 					cursor.fov_scale = CLAMP(cursor.fov_scale - 0.05, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
-					SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(CAMERA_BASE_FOV * cursor.fov_scale, CAMERA_ZNEAR, CAMERA_ZFAR);
+					SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
 
 					return true;
 				} break;
 				case Key::MINUS: {
 					cursor.fov_scale = CLAMP(cursor.fov_scale + 0.05, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
-					SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(CAMERA_BASE_FOV * cursor.fov_scale, CAMERA_ZNEAR, CAMERA_ZFAR);
+					SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
 
 					return true;
 				} break;
 				case Key::KEY_0: {
 					cursor.fov_scale = 1;
-					SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(CAMERA_BASE_FOV, CAMERA_ZNEAR, CAMERA_ZFAR);
+					SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(camera_fov, camera_znear, camera_zfar);
 
 					return true;
 				} break;
@@ -2063,33 +2667,37 @@ void RuntimeNodeSelect::_set_camera_freelook_enabled(bool p_enabled) {
 }
 
 void RuntimeNodeSelect::_cursor_scale_distance(real_t p_scale) {
-	real_t min_distance = MAX(CAMERA_ZNEAR * 4, VIEW_3D_MIN_ZOOM);
-	real_t max_distance = MIN(CAMERA_ZFAR / 4, VIEW_3D_MAX_ZOOM);
+	real_t min_distance = MAX(camera_znear * 4, VIEW_3D_MIN_ZOOM);
+	real_t max_distance = MIN(camera_zfar / 4, VIEW_3D_MAX_ZOOM);
 	cursor.distance = CLAMP(cursor.distance * p_scale, min_distance, max_distance);
 
 	SceneTree::get_singleton()->get_root()->set_camera_3d_override_transform(_get_cursor_transform());
 }
 
 void RuntimeNodeSelect::_scale_freelook_speed(real_t p_scale) {
-	real_t min_speed = MAX(CAMERA_ZNEAR * 4, VIEW_3D_MIN_ZOOM);
-	real_t max_speed = MIN(CAMERA_ZFAR / 4, VIEW_3D_MAX_ZOOM);
+	real_t min_speed = MAX(camera_znear * 4, VIEW_3D_MIN_ZOOM);
+	real_t max_speed = MIN(camera_zfar / 4, VIEW_3D_MAX_ZOOM);
 	if (unlikely(min_speed > max_speed)) {
-		freelook_speed = (min_speed + max_speed) / 2;
+		freelook_base_speed = (min_speed + max_speed) / 2;
 	} else {
-		freelook_speed = CLAMP(freelook_speed * p_scale, min_speed, max_speed);
+		freelook_base_speed = CLAMP(freelook_base_speed * p_scale, min_speed, max_speed);
 	}
 }
 
 void RuntimeNodeSelect::_cursor_look(Ref<InputEventWithModifiers> p_event) {
 	Window *root = SceneTree::get_singleton()->get_root();
-	const Vector2 relative = Input::get_singleton()->warp_mouse_motion(p_event, Rect2(Vector2(), root->get_size()));
+	const Vector2 relative = _get_warped_mouse_motion(p_event, Rect2(Vector2(), root->get_size()));
 	const Transform3D prev_camera_transform = _get_cursor_transform();
 
-	cursor.x_rot += relative.y * RADS_PER_PIXEL;
+	if (invert_y_axis) {
+		cursor.x_rot -= relative.y * freelook_sensitivity;
+	} else {
+		cursor.x_rot += relative.y * freelook_sensitivity;
+	}
 	// Clamp the Y rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
 	cursor.x_rot = CLAMP(cursor.x_rot, -1.57, 1.57);
 
-	cursor.y_rot += relative.x * RADS_PER_PIXEL;
+	cursor.y_rot += relative.x * freelook_sensitivity;
 
 	// Look is like the opposite of Orbit: the focus point rotates around the camera.
 	Transform3D camera_transform = _get_cursor_transform();
@@ -2104,8 +2712,8 @@ void RuntimeNodeSelect::_cursor_look(Ref<InputEventWithModifiers> p_event) {
 void RuntimeNodeSelect::_cursor_pan(Ref<InputEventWithModifiers> p_event) {
 	Window *root = SceneTree::get_singleton()->get_root();
 	// Reduce all sides of the area by 1, so warping works when windows are maximized/fullscreen.
-	const Vector2 relative = Input::get_singleton()->warp_mouse_motion(p_event, Rect2(Vector2(1, 1), root->get_size() - Vector2(2, 2)));
-	const real_t pan_speed = 1 / 150.0;
+	const Vector2 relative = _get_warped_mouse_motion(p_event, Rect2(Vector2(1, 1), root->get_size() - Vector2(2, 2)));
+	const real_t pan_speed = translation_sensitivity / 150.0;
 
 	Transform3D camera_transform;
 	camera_transform.translate_local(cursor.pos);
@@ -2123,17 +2731,35 @@ void RuntimeNodeSelect::_cursor_pan(Ref<InputEventWithModifiers> p_event) {
 void RuntimeNodeSelect::_cursor_orbit(Ref<InputEventWithModifiers> p_event) {
 	Window *root = SceneTree::get_singleton()->get_root();
 	// Reduce all sides of the area by 1, so warping works when windows are maximized/fullscreen.
-	const Vector2 relative = Input::get_singleton()->warp_mouse_motion(p_event, Rect2(Vector2(1, 1), root->get_size() - Vector2(2, 2)));
+	const Vector2 relative = _get_warped_mouse_motion(p_event, Rect2(Vector2(1, 1), root->get_size() - Vector2(2, 2)));
 
-	cursor.x_rot += relative.y * RADS_PER_PIXEL;
+	if (invert_y_axis) {
+		cursor.x_rot -= relative.y * orbit_sensitivity;
+	} else {
+		cursor.x_rot += relative.y * orbit_sensitivity;
+	}
 	// Clamp the Y rotation to roughly -90..90 degrees so the user can't look upside-down and end up disoriented.
 	cursor.x_rot = CLAMP(cursor.x_rot, -1.57, 1.57);
 
-	cursor.y_rot += relative.x * RADS_PER_PIXEL;
+	if (invert_x_axis) {
+		cursor.y_rot -= relative.x * orbit_sensitivity;
+	} else {
+		cursor.y_rot += relative.x * orbit_sensitivity;
+	}
 
 	SceneTree::get_singleton()->get_root()->set_camera_3d_override_transform(_get_cursor_transform());
 }
 
+Point2 RuntimeNodeSelect::_get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_event, Rect2 p_area) const {
+	ERR_FAIL_COND_V(p_event.is_null(), Point2());
+
+	if (warped_mouse_panning_3d) {
+		return Input::get_singleton()->warp_mouse_motion(p_event, p_area);
+	}
+
+	return p_event->get_relative();
+}
+
 Transform3D RuntimeNodeSelect::_get_cursor_transform() {
 	Transform3D camera_transform;
 	camera_transform.translate_local(cursor.pos);
@@ -2158,13 +2784,14 @@ void RuntimeNodeSelect::_reset_camera_3d() {
 		cursor.x_rot = -camera->get_global_rotation().x;
 		cursor.y_rot = -camera->get_global_rotation().y;
 
-		cursor.fov_scale = CLAMP(camera->get_fov() / CAMERA_BASE_FOV, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
+		cursor.fov_scale = CLAMP(camera->get_fov() / camera_fov, CAMERA_MIN_FOV_SCALE, CAMERA_MAX_FOV_SCALE);
 	} else {
 		cursor.fov_scale = 1.0;
 	}
 
 	SceneTree::get_singleton()->get_root()->set_camera_3d_override_transform(_get_cursor_transform());
-	SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(CAMERA_BASE_FOV * cursor.fov_scale, CAMERA_ZNEAR, CAMERA_ZFAR);
+	SceneTree::get_singleton()->get_root()->set_camera_3d_override_perspective(camera_fov * cursor.fov_scale, camera_znear, camera_zfar);
 }
 #endif // _3D_DISABLED
-#endif
+
+#endif // DEBUG_ENABLED
diff --git a/engine/scene/debugger/scene_debugger.h b/engine/scene/debugger/scene_debugger.h
index 5a56ea9d..f07028cb 100644
--- a/engine/scene/debugger/scene_debugger.h
+++ b/engine/scene/debugger/scene_debugger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_DEBUGGER_H
-#define SCENE_DEBUGGER_H
+#pragma once
 
 #include "core/input/shortcut.h"
 #include "core/object/ref_counted.h"
@@ -37,11 +36,16 @@
 #include "core/templates/pair.h"
 #include "core/variant/array.h"
 #include "scene/gui/view_panner.h"
+#ifndef _3D_DISABLED
 #include "scene/resources/mesh.h"
+#endif // _3D_DISABLED
 
+class CanvasItem;
 class PopupMenu;
 class Script;
-class Node;
+#ifndef _3D_DISABLED
+class Node3D;
+#endif // _3D_DISABLED
 
 class SceneDebugger {
 private:
@@ -61,8 +65,8 @@ private:
 
 	static void _save_node(ObjectID id, const String &p_path);
 	static void _set_node_owner_recursive(Node *p_node, Node *p_owner);
-	static void _set_object_property(ObjectID p_id, const String &p_property, const Variant &p_value);
-	static void _send_object_id(ObjectID p_id, int p_max_size = 1 << 20);
+	static void _set_object_property(ObjectID p_id, const String &p_property, const Variant &p_value, const String &p_field = "");
+	static void _send_object_ids(const Vector<ObjectID> &p_ids, bool p_update_selection);
 	static void _next_frame();
 
 public:
@@ -180,30 +184,49 @@ public:
 		NODE_TYPE_NONE,
 		NODE_TYPE_2D,
 		NODE_TYPE_3D,
-		NODE_TYPE_MAX
+		NODE_TYPE_MAX,
 	};
 
 	enum SelectMode {
 		SELECT_MODE_SINGLE,
 		SELECT_MODE_LIST,
-		SELECT_MODE_MAX
+		SELECT_MODE_MAX,
 	};
 
 private:
 	friend class SceneDebugger;
 
+	NodeType node_select_type = NODE_TYPE_2D;
+	SelectMode node_select_mode = SELECT_MODE_SINGLE;
+
 	struct SelectResult {
 		Node *item = nullptr;
 		real_t order = 0;
 		_FORCE_INLINE_ bool operator<(const SelectResult &p_rr) const { return p_rr.order < order; }
 	};
 
+	const int SELECTION_MIN_AREA = 8 * 8;
+	enum SelectionDragState {
+		SELECTION_DRAG_NONE,
+		SELECTION_DRAG_MOVE,
+		SELECTION_DRAG_END,
+	};
+	SelectionDragState selection_drag_state = SELECTION_DRAG_NONE;
+
 	bool has_selection = false;
-	Node *selected_node = nullptr;
+	int max_selection = 1;
+	Point2 selection_position = Point2(Math::INF, Math::INF);
+	Rect2 selection_drag_area;
 	PopupMenu *selection_list = nullptr;
+	Color selection_area_fill;
+	Color selection_area_outline;
 	bool selection_visible = true;
 	bool selection_update_queued = false;
-	bool warped_panning = false;
+
+	bool multi_shortcut_pressed = false;
+	bool list_shortcut_pressed = false;
+	RID draw_canvas;
+	RID sel_drag_ci;
 
 	bool camera_override = false;
 
@@ -214,11 +237,12 @@ private:
 	Ref<ViewPanner> panner;
 	Vector2 view_2d_offset;
 	real_t view_2d_zoom = 1.0;
+	bool warped_panning = false;
+
+	LocalVector<ObjectID> selected_ci_nodes;
+	real_t sel_2d_grab_dist = 0;
 
-	RID sbox_2d_canvas;
 	RID sbox_2d_ci;
-	Transform2D sbox_2d_xform;
-	Rect2 sbox_2d_rect;
 
 #ifndef _3D_DISABLED
 	struct Cursor {
@@ -242,38 +266,57 @@ private:
 	const double VIEW_3D_MAX_ZOOM = 1'000'000'000'000;
 #else
 	const float VIEW_3D_MAX_ZOOM = 10'000;
-#endif
-	const float CAMERA_ZNEAR = 0.05;
-	const float CAMERA_ZFAR = 4'000;
+#endif // REAL_T_IS_DOUBLE
 
-	const float CAMERA_BASE_FOV = 75;
 	const float CAMERA_MIN_FOV_SCALE = 0.1;
 	const float CAMERA_MAX_FOV_SCALE = 2.5;
 
-	const float FREELOOK_BASE_SPEED = 4;
-	const float RADS_PER_PIXEL = 0.004;
-
 	bool camera_first_override = true;
 	bool camera_freelook = false;
-	real_t freelook_speed = FREELOOK_BASE_SPEED;
+
+	real_t camera_fov = 0;
+	real_t camera_znear = 0;
+	real_t camera_zfar = 0;
+
+	bool invert_x_axis = false;
+	bool invert_y_axis = false;
+	bool warped_mouse_panning_3d = false;
+
+	real_t freelook_base_speed = 0;
+	real_t freelook_sensitivity = 0;
+	real_t orbit_sensitivity = 0;
+	real_t translation_sensitivity = 0;
 
 	Vector2 previous_mouse_position;
 
+	struct SelectionBox3D : public RefCounted {
+		RID instance;
+		RID instance_ofs;
+		RID instance_xray;
+		RID instance_xray_ofs;
+
+		Transform3D transform;
+		AABB bounds;
+
+		~SelectionBox3D() {
+			if (instance.is_valid()) {
+				RS::get_singleton()->free(instance);
+				RS::get_singleton()->free(instance_ofs);
+				RS::get_singleton()->free(instance_xray);
+				RS::get_singleton()->free(instance_xray_ofs);
+			}
+		}
+	};
+	HashMap<ObjectID, Ref<SelectionBox3D>> selected_3d_nodes;
+
+	Color sbox_3d_color;
 	Ref<ArrayMesh> sbox_3d_mesh;
 	Ref<ArrayMesh> sbox_3d_mesh_xray;
-	RID sbox_3d_instance;
-	RID sbox_3d_instance_ofs;
-	RID sbox_3d_instance_xray;
-	RID sbox_3d_instance_xray_ofs;
-	Transform3D sbox_3d_xform;
-	AABB sbox_3d_bounds;
-#endif
-
-	Point2 selection_position = Point2(INFINITY, INFINITY);
-	bool list_shortcut_pressed = false;
-
-	NodeType node_select_type = NODE_TYPE_2D;
-	SelectMode node_select_mode = SELECT_MODE_SINGLE;
+	RID sbox_3d;
+	RID sbox_3d_ofs;
+	RID sbox_3d_xray;
+	RID sbox_3d_xray_ofs;
+#endif // _3D_DISABLED
 
 	void _setup(const Dictionary &p_settings);
 
@@ -289,17 +332,19 @@ private:
 	void _process_frame();
 	void _physics_frame();
 
-	void _click_point();
-	void _select_node(Node *p_node);
+	void _send_ids(const Vector<Node *> &p_picked_nodes, bool p_invert_new_selections = true);
+	void _set_selected_nodes(const Vector<Node *> &p_nodes);
 	void _queue_selection_update();
 	void _update_selection();
 	void _clear_selection();
+	void _update_selection_drag(const Point2 &p_end_pos = Point2());
 	void _set_selection_visible(bool p_visible);
 
 	void _open_selection_list(const Vector<SelectResult> &p_items, const Point2 &p_pos);
 	void _close_selection_list();
 
 	void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
+	void _find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, Vector<SelectResult> &r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
 	void _pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event);
 	void _zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event);
 	void _reset_camera_2d();
@@ -307,6 +352,9 @@ private:
 
 #ifndef _3D_DISABLED
 	void _find_3d_items_at_pos(const Point2 &p_pos, Vector<SelectResult> &r_items);
+	void _find_3d_items_at_rect(const Rect2 &p_rect, Vector<SelectResult> &r_items);
+	Vector3 _get_screen_to_space(const Vector3 &p_vector3);
+
 	bool _handle_3d_input(const Ref<InputEvent> &p_event);
 	void _set_camera_freelook_enabled(bool p_enabled);
 	void _cursor_scale_distance(real_t p_scale);
@@ -314,9 +362,10 @@ private:
 	void _cursor_look(Ref<InputEventWithModifiers> p_event);
 	void _cursor_pan(Ref<InputEventWithModifiers> p_event);
 	void _cursor_orbit(Ref<InputEventWithModifiers> p_event);
+	Point2 _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_event, Rect2 p_border) const;
 	Transform3D _get_cursor_transform();
 	void _reset_camera_3d();
-#endif
+#endif // _3D_DISABLED
 
 	RuntimeNodeSelect() { singleton = this; }
 
@@ -327,6 +376,4 @@ public:
 
 	~RuntimeNodeSelect();
 };
-#endif
-
-#endif // SCENE_DEBUGGER_H
+#endif // DEBUG_ENABLED
diff --git a/engine/scene/gui/aspect_ratio_container.h b/engine/scene/gui/aspect_ratio_container.h
index 11192d0a..59b428d5 100644
--- a/engine/scene/gui/aspect_ratio_container.h
+++ b/engine/scene/gui/aspect_ratio_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ASPECT_RATIO_CONTAINER_H
-#define ASPECT_RATIO_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -79,5 +78,3 @@ public:
 
 VARIANT_ENUM_CAST(AspectRatioContainer::StretchMode);
 VARIANT_ENUM_CAST(AspectRatioContainer::AlignmentMode);
-
-#endif // ASPECT_RATIO_CONTAINER_H
diff --git a/engine/scene/gui/base_button.cpp b/engine/scene/gui/base_button.cpp
index 1502579a..9ec61494 100644
--- a/engine/scene/gui/base_button.cpp
+++ b/engine/scene/gui/base_button.cpp
@@ -41,6 +41,7 @@ void BaseButton::_unpress_group() {
 
 	if (toggle_mode && !button_group->is_allow_unpress()) {
 		status.pressed = true;
+		queue_accessibility_update();
 	}
 
 	for (BaseButton *E : button_group->buttons) {
@@ -83,15 +84,66 @@ void BaseButton::gui_input(const Ref<InputEvent> &p_event) {
 	}
 }
 
+void BaseButton::_accessibility_action_click(const Variant &p_data) {
+	if (toggle_mode) {
+		status.pressed = !status.pressed;
+
+		if (status.pressed) {
+			_unpress_group();
+			if (button_group.is_valid()) {
+				button_group->emit_signal(SceneStringName(pressed), this);
+			}
+		}
+
+		_toggled(status.pressed);
+		_pressed();
+	} else {
+		_pressed();
+	}
+	queue_accessibility_update();
+	queue_redraw();
+}
+
 void BaseButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &BaseButton::_accessibility_action_click));
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_DISABLED, status.disabled);
+			if (toggle_mode) {
+				DisplayServer::get_singleton()->accessibility_update_set_checked(ae, status.pressed);
+			}
+			if (button_group.is_valid()) {
+				for (const BaseButton *btn : button_group->buttons) {
+					if (btn->is_part_of_edited_scene()) {
+						continue;
+					}
+					DisplayServer::get_singleton()->accessibility_update_add_related_radio_group(ae, btn->get_accessibility_element());
+				}
+			}
+			if (shortcut_in_tooltip && shortcut.is_valid() && shortcut->has_valid_event()) {
+				String text = atr(shortcut->get_name()) + " (" + shortcut->get_as_text() + ")";
+				String tooltip = get_tooltip_text();
+				if (!tooltip.is_empty() && shortcut->get_name().nocasecmp_to(tooltip) != 0) {
+					text += "\n" + atr(tooltip);
+				}
+				DisplayServer::get_singleton()->accessibility_update_set_tooltip(ae, text);
+			}
+		} break;
+
 		case NOTIFICATION_MOUSE_ENTER: {
 			status.hovering = true;
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 
 		case NOTIFICATION_MOUSE_EXIT: {
 			status.hovering = false;
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 
@@ -175,6 +227,7 @@ void BaseButton::on_action_event(Ref<InputEvent> p_event) {
 				}
 				_toggled(status.pressed);
 				_pressed();
+				queue_accessibility_update();
 			}
 		} else {
 			if ((p_event->is_pressed() && action_mode == ACTION_MODE_BUTTON_PRESS) || (!p_event->is_pressed() && action_mode == ACTION_MODE_BUTTON_RELEASE)) {
@@ -214,6 +267,7 @@ void BaseButton::set_disabled(bool p_disabled) {
 		status.press_attempt = false;
 		status.pressing_inside = false;
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 }
@@ -247,7 +301,7 @@ void BaseButton::set_pressed_no_signal(bool p_pressed) {
 		return;
 	}
 	status.pressed = p_pressed;
-
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -303,6 +357,7 @@ void BaseButton::set_toggle_mode(bool p_on) {
 	if (!p_on) {
 		set_pressed(false);
 	}
+	queue_accessibility_update();
 
 	toggle_mode = p_on;
 	update_configuration_warnings();
@@ -313,7 +368,10 @@ bool BaseButton::is_toggle_mode() const {
 }
 
 void BaseButton::set_shortcut_in_tooltip(bool p_on) {
-	shortcut_in_tooltip = p_on;
+	if (shortcut_in_tooltip != p_on) {
+		shortcut_in_tooltip = p_on;
+		queue_accessibility_update();
+	}
 }
 
 bool BaseButton::is_shortcut_in_tooltip_enabled() const {
@@ -353,8 +411,11 @@ bool BaseButton::is_shortcut_feedback() const {
 }
 
 void BaseButton::set_shortcut(const Ref<Shortcut> &p_shortcut) {
-	shortcut = p_shortcut;
-	set_process_shortcut_input(shortcut.is_valid());
+	if (shortcut != p_shortcut) {
+		shortcut = p_shortcut;
+		set_process_shortcut_input(shortcut.is_valid());
+		queue_accessibility_update();
+	}
 }
 
 Ref<Shortcut> BaseButton::get_shortcut() const {
@@ -380,7 +441,7 @@ void BaseButton::shortcut_input(const Ref<InputEvent> &p_event) {
 
 			_toggled(status.pressed);
 			_pressed();
-
+			queue_accessibility_update();
 		} else {
 			_pressed();
 		}
@@ -440,6 +501,7 @@ void BaseButton::set_button_group(const Ref<ButtonGroup> &p_group) {
 		button_group->buttons.insert(this);
 	}
 
+	queue_accessibility_update();
 	queue_redraw(); //checkbox changes to radio if set a buttongroup
 	update_configuration_warnings();
 }
diff --git a/engine/scene/gui/base_button.h b/engine/scene/gui/base_button.h
index e1553920..60e5a8ab 100644
--- a/engine/scene/gui/base_button.h
+++ b/engine/scene/gui/base_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BASE_BUTTON_H
-#define BASE_BUTTON_H
+#pragma once
 
 #include "core/input/shortcut.h"
 #include "scene/gui/control.h"
@@ -87,6 +86,7 @@ protected:
 	void _notification(int p_what);
 
 	bool _was_pressed_by_mouse() const;
+	void _accessibility_action_click(const Variant &p_data);
 
 	GDVIRTUAL0(_pressed)
 	GDVIRTUAL1(_toggled, bool)
@@ -165,5 +165,3 @@ public:
 	bool is_allow_unpress();
 	ButtonGroup();
 };
-
-#endif // BASE_BUTTON_H
diff --git a/engine/scene/gui/box_container.h b/engine/scene/gui/box_container.h
index c8cfe110..028a0ac2 100644
--- a/engine/scene/gui/box_container.h
+++ b/engine/scene/gui/box_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BOX_CONTAINER_H
-#define BOX_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -97,5 +96,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(BoxContainer::AlignmentMode);
-
-#endif // BOX_CONTAINER_H
diff --git a/engine/scene/gui/button.cpp b/engine/scene/gui/button.cpp
index 8975b85e..4c090cb1 100644
--- a/engine/scene/gui/button.cpp
+++ b/engine/scene/gui/button.cpp
@@ -30,6 +30,8 @@
 
 #include "button.h"
 
+#include "scene/gui/dialogs.h"
+
 #include "scene/theme/theme_db.h"
 
 Size2 Button::get_minimum_size() const {
@@ -48,6 +50,10 @@ void Button::_set_internal_margin(Side p_side, float p_value) {
 void Button::_queue_update_size_cache() {
 }
 
+String Button::_get_translated_text(const String &p_text) const {
+	return atr(p_text);
+}
+
 void Button::_update_theme_item_cache() {
 	Control::_update_theme_item_cache();
 
@@ -181,15 +187,31 @@ Ref<StyleBox> Button::_get_current_stylebox() const {
 
 void Button::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			if (!xl_text.is_empty() && get_accessibility_name().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, xl_text);
+			} else if (!xl_text.is_empty() && !get_accessibility_name().is_empty() && get_accessibility_name() != xl_text) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_accessibility_name() + ": " + xl_text);
+			}
+			AcceptDialog *dlg = Object::cast_to<AcceptDialog>(get_parent());
+			if (dlg && dlg->get_ok_button() == this) {
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_DEFAULT_BUTTON);
+			}
+		} break;
+
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
 			queue_redraw();
 		} break;
 
 		case NOTIFICATION_TRANSLATION_CHANGED: {
-			xl_text = atr(text);
+			xl_text = _get_translated_text(text);
 			_shape();
 
 			update_minimum_size();
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 
@@ -566,7 +588,7 @@ void Button::_shape(Ref<TextParagraph> p_paragraph, String p_text) const {
 		case TextServer::AUTOWRAP_OFF:
 			break;
 	}
-	autowrap_flags = autowrap_flags | TextServer::BREAK_TRIM_EDGE_SPACES;
+	autowrap_flags = autowrap_flags | autowrap_flags_trim;
 	p_paragraph->set_break_flags(autowrap_flags);
 	p_paragraph->set_line_spacing(theme_cache.line_spacing);
 
@@ -598,14 +620,17 @@ TextServer::OverrunBehavior Button::get_text_overrun_behavior() const {
 }
 
 void Button::set_text(const String &p_text) {
-	if (text != p_text) {
-		text = p_text;
-		xl_text = atr(text);
-		_shape();
-
-		queue_redraw();
-		update_minimum_size();
+	const String translated_text = _get_translated_text(p_text);
+	if (text == p_text && xl_text == translated_text) {
+		return;
 	}
+	text = p_text;
+	xl_text = translated_text;
+	_shape();
+
+	queue_accessibility_update();
+	queue_redraw();
+	update_minimum_size();
 }
 
 String Button::get_text() const {
@@ -625,11 +650,25 @@ TextServer::AutowrapMode Button::get_autowrap_mode() const {
 	return autowrap_mode;
 }
 
+void Button::set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags) {
+	if (autowrap_flags_trim != (p_flags & TextServer::BREAK_TRIM_MASK)) {
+		autowrap_flags_trim = p_flags & TextServer::BREAK_TRIM_MASK;
+		_shape();
+		queue_redraw();
+		update_minimum_size();
+	}
+}
+
+BitField<TextServer::LineBreakFlag> Button::get_autowrap_trim_flags() const {
+	return autowrap_flags_trim;
+}
+
 void Button::set_text_direction(Control::TextDirection p_text_direction) {
 	ERR_FAIL_COND((int)p_text_direction < -1 || (int)p_text_direction > 3);
 	if (text_direction != p_text_direction) {
 		text_direction = p_text_direction;
 		_shape();
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -642,6 +681,7 @@ void Button::set_language(const String &p_language) {
 	if (language != p_language) {
 		language = p_language;
 		_shape();
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -719,6 +759,7 @@ bool Button::get_clip_text() const {
 void Button::set_text_alignment(HorizontalAlignment p_alignment) {
 	if (alignment != p_alignment) {
 		alignment = p_alignment;
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -766,6 +807,8 @@ void Button::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_text_overrun_behavior"), &Button::get_text_overrun_behavior);
 	ClassDB::bind_method(D_METHOD("set_autowrap_mode", "autowrap_mode"), &Button::set_autowrap_mode);
 	ClassDB::bind_method(D_METHOD("get_autowrap_mode"), &Button::get_autowrap_mode);
+	ClassDB::bind_method(D_METHOD("set_autowrap_trim_flags", "autowrap_trim_flags"), &Button::set_autowrap_trim_flags);
+	ClassDB::bind_method(D_METHOD("get_autowrap_trim_flags"), &Button::get_autowrap_trim_flags);
 	ClassDB::bind_method(D_METHOD("set_text_direction", "direction"), &Button::set_text_direction);
 	ClassDB::bind_method(D_METHOD("get_text_direction"), &Button::get_text_direction);
 	ClassDB::bind_method(D_METHOD("set_language", "language"), &Button::set_language);
@@ -791,8 +834,9 @@ void Button::_bind_methods() {
 
 	ADD_GROUP("Text Behavior", "");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "alignment", PROPERTY_HINT_ENUM, "Left,Center,Right"), "set_text_alignment", "get_text_alignment");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis (6+ Characters),Word Ellipsis (6+ Characters),Ellipsis (Always),Word Ellipsis (Always)"), "set_text_overrun_behavior", "get_text_overrun_behavior");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_mode", PROPERTY_HINT_ENUM, "Off,Arbitrary,Word,Word (Smart)"), "set_autowrap_mode", "get_autowrap_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_trim_flags", PROPERTY_HINT_FLAGS, vformat("Trim Spaces After Break:%d,Trim Spaces Before Break:%d", TextServer::BREAK_TRIM_START_EDGE_SPACES, TextServer::BREAK_TRIM_END_EDGE_SPACES)), "set_autowrap_trim_flags", "get_autowrap_trim_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "clip_text"), "set_clip_text", "get_clip_text");
 
 	ADD_GROUP("Icon Behavior", "");
@@ -846,7 +890,7 @@ void Button::_bind_methods() {
 
 Button::Button(const String &p_text) {
 	text_buf.instantiate();
-	text_buf->set_break_flags(TextServer::BREAK_MANDATORY | TextServer::BREAK_TRIM_EDGE_SPACES);
+	text_buf->set_break_flags(TextServer::BREAK_MANDATORY | autowrap_flags_trim);
 	set_mouse_filter(MOUSE_FILTER_STOP);
 
 	set_text(p_text);
diff --git a/engine/scene/gui/button.h b/engine/scene/gui/button.h
index ebbdae1e..1c2b02b4 100644
--- a/engine/scene/gui/button.h
+++ b/engine/scene/gui/button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BUTTON_H
-#define BUTTON_H
+#pragma once
 
 #include "scene/gui/base_button.h"
 #include "scene/resources/text_paragraph.h"
@@ -46,6 +45,7 @@ private:
 	String language;
 	TextDirection text_direction = TEXT_DIRECTION_AUTO;
 	TextServer::AutowrapMode autowrap_mode = TextServer::AUTOWRAP_OFF;
+	BitField<TextServer::LineBreakFlag> autowrap_flags_trim = TextServer::BREAK_TRIM_END_EDGE_SPACES;
 	TextServer::OverrunBehavior overrun_behavior = TextServer::OVERRUN_NO_TRIMMING;
 
 	Ref<Texture2D> icon;
@@ -111,6 +111,7 @@ protected:
 
 	void _set_internal_margin(Side p_side, float p_value);
 	virtual void _queue_update_size_cache();
+	virtual String _get_translated_text(const String &p_text) const;
 
 	Size2 _fit_icon_size(const Size2 &p_size) const;
 	Ref<StyleBox> _get_current_stylebox() const;
@@ -132,6 +133,9 @@ public:
 	void set_autowrap_mode(TextServer::AutowrapMode p_mode);
 	TextServer::AutowrapMode get_autowrap_mode() const;
 
+	void set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags);
+	BitField<TextServer::LineBreakFlag> get_autowrap_trim_flags() const;
+
 	void set_text_direction(TextDirection p_text_direction);
 	TextDirection get_text_direction() const;
 
@@ -161,5 +165,3 @@ public:
 	Button(const String &p_text = String());
 	~Button();
 };
-
-#endif // BUTTON_H
diff --git a/engine/scene/gui/center_container.h b/engine/scene/gui/center_container.h
index 37e23084..119ca14e 100644
--- a/engine/scene/gui/center_container.h
+++ b/engine/scene/gui/center_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CENTER_CONTAINER_H
-#define CENTER_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -53,5 +52,3 @@ public:
 
 	CenterContainer();
 };
-
-#endif // CENTER_CONTAINER_H
diff --git a/engine/scene/gui/check_box.cpp b/engine/scene/gui/check_box.cpp
index b6db8904..03dab744 100644
--- a/engine/scene/gui/check_box.cpp
+++ b/engine/scene/gui/check_box.cpp
@@ -81,6 +81,17 @@ Size2 CheckBox::get_minimum_size() const {
 
 void CheckBox::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			if (is_radio()) {
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_RADIO_BUTTON);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CHECK_BOX);
+			}
+		} break;
+
 		case NOTIFICATION_THEME_CHANGED:
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_TRANSLATION_CHANGED: {
@@ -126,15 +137,15 @@ void CheckBox::_notification(int p_what) {
 			ofs.y = int((get_size().height - get_icon_size().height) / 2) + theme_cache.check_v_offset;
 
 			if (is_pressed()) {
-				on_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(on_tex->get_size())));
+				on_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(on_tex->get_size())), false, theme_cache.checkbox_checked_color);
 			} else {
-				off_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(off_tex->get_size())));
+				off_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(off_tex->get_size())), false, theme_cache.checkbox_unchecked_color);
 			}
 		} break;
 	}
 }
 
-bool CheckBox::is_radio() {
+bool CheckBox::is_radio() const {
 	return get_button_group().is_valid();
 }
 
@@ -151,6 +162,9 @@ void CheckBox::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CheckBox, unchecked_disabled);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CheckBox, radio_checked_disabled);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CheckBox, radio_unchecked_disabled);
+
+	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CheckBox, checkbox_checked_color);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CheckBox, checkbox_unchecked_color);
 }
 
 CheckBox::CheckBox(const String &p_text) :
diff --git a/engine/scene/gui/check_box.h b/engine/scene/gui/check_box.h
index 87261816..fcbacfcb 100644
--- a/engine/scene/gui/check_box.h
+++ b/engine/scene/gui/check_box.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CHECK_BOX_H
-#define CHECK_BOX_H
+#pragma once
 
 #include "scene/gui/button.h"
 
@@ -49,6 +48,9 @@ class CheckBox : public Button {
 		Ref<Texture2D> unchecked_disabled;
 		Ref<Texture2D> radio_checked_disabled;
 		Ref<Texture2D> radio_unchecked_disabled;
+
+		Color checkbox_checked_color;
+		Color checkbox_unchecked_color;
 	} theme_cache;
 
 protected:
@@ -58,11 +60,9 @@ protected:
 	void _notification(int p_what);
 	static void _bind_methods();
 
-	bool is_radio();
+	bool is_radio() const;
 
 public:
 	CheckBox(const String &p_text = String());
 	~CheckBox();
 };
-
-#endif // CHECK_BOX_H
diff --git a/engine/scene/gui/check_button.cpp b/engine/scene/gui/check_button.cpp
index f43eced2..d90f12e4 100644
--- a/engine/scene/gui/check_button.cpp
+++ b/engine/scene/gui/check_button.cpp
@@ -85,6 +85,13 @@ Size2 CheckButton::get_minimum_size() const {
 
 void CheckButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CHECK_BUTTON);
+		} break;
+
 		case NOTIFICATION_THEME_CHANGED:
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_TRANSLATION_CHANGED: {
@@ -133,9 +140,9 @@ void CheckButton::_notification(int p_what) {
 			ofs.y = (get_size().height - tex_size.height) / 2 + theme_cache.check_v_offset;
 
 			if (is_pressed()) {
-				on_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(on_tex->get_size())));
+				on_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(on_tex->get_size())), false, theme_cache.button_checked_color);
 			} else {
-				off_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(off_tex->get_size())));
+				off_tex->draw_rect(ci, Rect2(ofs, _fit_icon_size(off_tex->get_size())), false, theme_cache.button_unchecked_color);
 			}
 		} break;
 	}
@@ -154,6 +161,9 @@ void CheckButton::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CheckButton, unchecked_mirrored);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CheckButton, checked_disabled_mirrored);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, CheckButton, unchecked_disabled_mirrored);
+
+	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CheckButton, button_checked_color);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, CheckButton, button_unchecked_color);
 }
 
 CheckButton::CheckButton(const String &p_text) :
diff --git a/engine/scene/gui/check_button.h b/engine/scene/gui/check_button.h
index 84f77b2e..74b38d49 100644
--- a/engine/scene/gui/check_button.h
+++ b/engine/scene/gui/check_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CHECK_BUTTON_H
-#define CHECK_BUTTON_H
+#pragma once
 
 #include "scene/gui/button.h"
 
@@ -49,6 +48,9 @@ class CheckButton : public Button {
 		Ref<Texture2D> unchecked_mirrored;
 		Ref<Texture2D> checked_disabled_mirrored;
 		Ref<Texture2D> unchecked_disabled_mirrored;
+
+		Color button_checked_color;
+		Color button_unchecked_color;
 	} theme_cache;
 
 protected:
@@ -62,5 +64,3 @@ public:
 	CheckButton(const String &p_text = String());
 	~CheckButton();
 };
-
-#endif // CHECK_BUTTON_H
diff --git a/engine/scene/gui/code_edit.cpp b/engine/scene/gui/code_edit.cpp
index 4418d5b0..a5d4cfc1 100644
--- a/engine/scene/gui/code_edit.cpp
+++ b/engine/scene/gui/code_edit.cpp
@@ -137,7 +137,7 @@ void CodeEdit::_notification(int p_what) {
 
 						Point2 round_ofs = hint_ofs + theme_cache.code_hint_style->get_offset() + Vector2(0, theme_cache.font->get_ascent(theme_cache.font_size) + font_height * i + yofs);
 						round_ofs = round_ofs.round();
-						draw_string(theme_cache.font, round_ofs, line.replace(String::chr(0xFFFF), ""), HORIZONTAL_ALIGNMENT_LEFT, -1, theme_cache.font_size, theme_cache.code_hint_color);
+						draw_string(theme_cache.font, round_ofs, line.remove_char(0xFFFF), HORIZONTAL_ALIGNMENT_LEFT, -1, theme_cache.font_size, theme_cache.code_hint_color);
 						if (end > 0) {
 							// Draw an underline for the currently edited function parameter.
 							const Vector2 b = hint_ofs + theme_cache.code_hint_style->get_offset() + Vector2(begin, font_height + font_height * i + yofs);
@@ -963,7 +963,7 @@ void CodeEdit::indent_lines() {
 	for (Point2i line_range : line_ranges) {
 		for (int i = line_range.x; i <= line_range.y; i++) {
 			const String line_text = get_line(i);
-			if (line_text.size() == 0) {
+			if (line_text.is_empty()) {
 				// Ignore empty lines.
 				continue;
 			}
@@ -1247,9 +1247,8 @@ void CodeEdit::add_auto_brace_completion_pair(const String &p_open_key, const St
 void CodeEdit::set_auto_brace_completion_pairs(const Dictionary &p_auto_brace_completion_pairs) {
 	auto_brace_completion_pairs.clear();
 
-	Array keys = p_auto_brace_completion_pairs.keys();
-	for (int i = 0; i < keys.size(); i++) {
-		add_auto_brace_completion_pair(keys[i], p_auto_brace_completion_pairs[keys[i]]);
+	for (const KeyValue<Variant, Variant> &kv : p_auto_brace_completion_pairs) {
+		add_auto_brace_completion_pair(kv.key, kv.value);
 	}
 }
 
@@ -1599,7 +1598,7 @@ bool CodeEdit::can_fold_line(int p_line) const {
 		return false;
 	}
 
-	if (p_line + 1 >= get_line_count() || get_line(p_line).strip_edges().size() == 0) {
+	if (p_line + 1 >= get_line_count() || get_line(p_line).strip_edges().is_empty()) {
 		return false;
 	}
 
@@ -1645,12 +1644,12 @@ bool CodeEdit::can_fold_line(int p_line) const {
 		if (delimiter_end_line == p_line) {
 			/* Check we are the start of the block. */
 			if (p_line - 1 >= 0) {
-				if ((in_string != -1 && is_in_string(p_line - 1) != -1) || (in_comment != -1 && is_in_comment(p_line - 1) != -1)) {
+				if ((in_string != -1 && is_in_string(p_line - 1) != -1) || (in_comment != -1 && is_in_comment(p_line - 1) != -1 && !is_line_code_region_start(p_line - 1) && !is_line_code_region_end(p_line - 1))) {
 					return false;
 				}
 			}
 			/* Check it continues for at least one line. */
-			return ((in_string != -1 && is_in_string(p_line + 1) != -1) || (in_comment != -1 && is_in_comment(p_line + 1) != -1));
+			return ((in_string != -1 && is_in_string(p_line + 1) != -1) || (in_comment != -1 && is_in_comment(p_line + 1) != -1 && !is_line_code_region_start(p_line + 1) && !is_line_code_region_end(p_line + 1)));
 		}
 		return ((in_string != -1 && is_in_string(delimiter_end_line) != -1) || (in_comment != -1 && is_in_comment(delimiter_end_line) != -1));
 	}
@@ -1658,7 +1657,7 @@ bool CodeEdit::can_fold_line(int p_line) const {
 	/* Otherwise check indent levels. */
 	int start_indent = get_indent_level(p_line);
 	for (int i = p_line + 1; i < get_line_count(); i++) {
-		if (is_in_string(i) != -1 || is_in_comment(i) != -1 || get_line(i).strip_edges().size() == 0) {
+		if (is_in_string(i) != -1 || is_in_comment(i) != -1 || get_line(i).strip_edges().is_empty()) {
 			continue;
 		}
 		return (get_indent_level(i) > start_indent);
@@ -1705,13 +1704,17 @@ void CodeEdit::fold_line(int p_line) {
 					if ((in_string != -1 && is_in_string(i) == -1) || (in_comment != -1 && is_in_comment(i) == -1)) {
 						break;
 					}
+					if (in_comment != -1 && (is_line_code_region_start(i) || is_line_code_region_end(i))) {
+						// A code region tag should split a comment block, ending it early.
+						break;
+					}
 					end_line = i;
 				}
 			}
 		} else {
 			int start_indent = get_indent_level(p_line);
 			for (int i = p_line + 1; i <= line_count; i++) {
-				if (get_line(i).strip_edges().size() == 0) {
+				if (get_line(i).strip_edges().is_empty()) {
 					continue;
 				}
 				if (get_indent_level(i) > start_indent) {
@@ -1872,7 +1875,8 @@ bool CodeEdit::is_line_code_region_start(int p_line) const {
 	if (is_in_string(p_line) != -1) {
 		return false;
 	}
-	return get_line(p_line).strip_edges().begins_with(code_region_start_string);
+	Vector<String> split = get_line(p_line).strip_edges().split_spaces(1);
+	return split.size() > 0 && split[0] == code_region_start_string;
 }
 
 bool CodeEdit::is_line_code_region_end(int p_line) const {
@@ -1883,7 +1887,8 @@ bool CodeEdit::is_line_code_region_end(int p_line) const {
 	if (is_in_string(p_line) != -1) {
 		return false;
 	}
-	return get_line(p_line).strip_edges().begins_with(code_region_end_string);
+	Vector<String> split = get_line(p_line).strip_edges().split_spaces(1);
+	return split.size() > 0 && split[0] == code_region_end_string;
 }
 
 /* Delimiters */
@@ -1956,7 +1961,7 @@ String CodeEdit::get_delimiter_end_key(int p_delimiter_idx) const {
 }
 
 Point2 CodeEdit::get_delimiter_start_position(int p_line, int p_column) const {
-	if (delimiters.size() == 0) {
+	if (delimiters.is_empty()) {
 		return Point2(-1, -1);
 	}
 	ERR_FAIL_INDEX_V(p_line, get_line_count(), Point2(-1, -1));
@@ -2007,7 +2012,7 @@ Point2 CodeEdit::get_delimiter_start_position(int p_line, int p_column) const {
 }
 
 Point2 CodeEdit::get_delimiter_end_position(int p_line, int p_column) const {
-	if (delimiters.size() == 0) {
+	if (delimiters.is_empty()) {
 		return Point2(-1, -1);
 	}
 	ERR_FAIL_INDEX_V(p_line, get_line_count(), Point2(-1, -1));
@@ -2112,7 +2117,7 @@ String CodeEdit::get_text_for_code_completion() const {
 			completion_text += line.substr(0, get_caret_column());
 			/* Not unicode, represents the caret. */
 			completion_text += String::chr(0xFFFF);
-			completion_text += line.substr(get_caret_column(), line.size());
+			completion_text += line.substr(get_caret_column());
 		} else {
 			completion_text += line;
 		}
@@ -2411,7 +2416,7 @@ String CodeEdit::get_text_with_cursor_char(int p_line, int p_column) const {
 			result += line_text.substr(0, p_column);
 			/* Not unicode, represents the cursor. */
 			result += String::chr(0xFFFF);
-			result += line_text.substr(p_column, line_text.size());
+			result += line_text.substr(p_column);
 		} else {
 			result += line_text;
 		}
@@ -3058,7 +3063,7 @@ void CodeEdit::_update_code_region_tags() {
 
 /* Delimiters */
 void CodeEdit::_update_delimiter_cache(int p_from_line, int p_to_line) {
-	if (delimiters.size() == 0) {
+	if (delimiters.is_empty()) {
 		return;
 	}
 
@@ -3208,7 +3213,7 @@ void CodeEdit::_update_delimiter_cache(int p_from_line, int p_to_line) {
 }
 
 int CodeEdit::_is_in_delimiter(int p_line, int p_column, DelimiterType p_type) const {
-	if (delimiters.size() == 0 || p_line >= delimiter_cache.size()) {
+	if (delimiters.is_empty() || p_line >= delimiter_cache.size()) {
 		return -1;
 	}
 	ERR_FAIL_INDEX_V(p_line, get_line_count(), 0);
@@ -3348,8 +3353,8 @@ void CodeEdit::_set_delimiters(const TypedArray<String> &p_delimiters, Delimiter
 			continue;
 		}
 
-		const String start_key = key.get_slice(" ", 0);
-		const String end_key = key.get_slice_count(" ") > 1 ? key.get_slice(" ", 1) : String();
+		const String start_key = key.get_slicec(' ', 0);
+		const String end_key = key.get_slice_count(" ") > 1 ? key.get_slicec(' ', 1) : String();
 
 		_add_delimiter(start_key, end_key, end_key.is_empty(), p_type);
 	}
@@ -3422,7 +3427,7 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
 		GDVIRTUAL_CALL(_filter_code_completion_candidates, completion_options_sources, completion_options);
 
 		/* No options to complete, cancel. */
-		if (completion_options.size() == 0) {
+		if (completion_options.is_empty()) {
 			cancel_code_completion();
 			return;
 		}
@@ -3654,7 +3659,7 @@ void CodeEdit::_filter_code_completion_candidates_impl() {
 	}
 
 	/* No options to complete, cancel. */
-	if (code_completion_options_new.size() == 0) {
+	if (code_completion_options_new.is_empty()) {
 		cancel_code_completion();
 		return;
 	}
diff --git a/engine/scene/gui/code_edit.h b/engine/scene/gui/code_edit.h
index dbba5c23..fb53bd4c 100644
--- a/engine/scene/gui/code_edit.h
+++ b/engine/scene/gui/code_edit.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CODE_EDIT_H
-#define CODE_EDIT_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "scene/gui/text_edit.h"
@@ -527,5 +526,3 @@ VARIANT_ENUM_CAST(CodeEdit::CodeCompletionLocation);
 struct CodeCompletionOptionCompare {
 	_FORCE_INLINE_ bool operator()(const ScriptLanguage::CodeCompletionOption &l, const ScriptLanguage::CodeCompletionOption &r) const;
 };
-
-#endif // CODE_EDIT_H
diff --git a/engine/scene/gui/color_mode.h b/engine/scene/gui/color_mode.h
index c035fe6f..9f228412 100644
--- a/engine/scene/gui/color_mode.h
+++ b/engine/scene/gui/color_mode.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLOR_MODE_H
-#define COLOR_MODE_H
+#pragma once
 
 #include "scene/gui/color_picker.h"
 
@@ -54,7 +53,6 @@ public:
 
 	virtual void slider_draw(int p_which) = 0;
 	virtual bool apply_theme() const { return false; }
-	virtual ColorPicker::PickerShapeType get_shape_override() const { return ColorPicker::SHAPE_MAX; }
 
 	ColorMode(ColorPicker *p_color_picker);
 	virtual ~ColorMode() {}
@@ -145,12 +143,7 @@ public:
 	virtual void _value_changed() override;
 
 	virtual void slider_draw(int p_which) override;
-	virtual ColorPicker::PickerShapeType get_shape_override() const override { return ColorPicker::SHAPE_OKHSL_CIRCLE; }
 
 	ColorModeOKHSL(ColorPicker *p_color_picker) :
 			ColorMode(p_color_picker) {}
-
-	~ColorModeOKHSL() {}
 };
-
-#endif // COLOR_MODE_H
diff --git a/engine/scene/gui/color_picker.cpp b/engine/scene/gui/color_picker.cpp
index aab7c37b..162d1409 100644
--- a/engine/scene/gui/color_picker.cpp
+++ b/engine/scene/gui/color_picker.cpp
@@ -33,6 +33,7 @@
 #include "core/io/image.h"
 #include "scene/gui/aspect_ratio_container.h"
 #include "scene/gui/color_mode.h"
+#include "scene/gui/color_picker_shape.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/grid_container.h"
 #include "scene/gui/label.h"
@@ -55,17 +56,31 @@
 
 void ColorPicker::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_COLOR_PICKER);
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, color);
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			_update_color();
 		} break;
 
 		case NOTIFICATION_READY: {
-			// FIXME: The embedding check is needed to fix a bug in single-window mode (GH-93718).
-			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) {
+			if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_COLOR_PICKER)) {
+				btn_pick->set_accessibility_name(ETR("Pick Color From Screen"));
+				btn_pick->set_tooltip_text(ETR("Pick a color from the screen."));
+				btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed_native));
+			} else if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) {
+				// FIXME: The embedding check is needed to fix a bug in single-window mode (GH-93718).
+				btn_pick->set_accessibility_name(ETR("Pick Color From Screen"));
 				btn_pick->set_tooltip_text(ETR("Pick a color from the screen."));
 				btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed));
 			} else {
 				// On unsupported platforms, use a legacy method for color picking.
+				btn_pick->set_accessibility_name(ETR("Pick Color From Window"));
 				btn_pick->set_tooltip_text(ETR("Pick a color from the application window."));
 				btn_pick->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_pick_button_pressed_legacy));
 			}
@@ -98,11 +113,20 @@ void ColorPicker::_notification(int p_what) {
 			btn_shape->set_custom_minimum_size(Size2(28 * theme_cache.base_scale, 0));
 			btn_mode->set_custom_minimum_size(Size2(28 * theme_cache.base_scale, 0));
 
-			uv_edit->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
-			w_edit->set_custom_minimum_size(Size2(theme_cache.h_width, 0));
+			{
+				int i = 0;
+				for (ColorPickerShape *shape : shapes) {
+					if (shape->is_initialized) {
+						shape->update_theme();
+					}
+					shape_popup->set_item_icon(i, shape->get_icon());
+					i++;
+				}
+			}
 
-			wheel_edit->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
-			wheel_margin->add_theme_constant_override("margin_bottom", 8 * theme_cache.base_scale);
+			if (current_shape != SHAPE_NONE) {
+				btn_shape->set_button_icon(shape_popup->get_item_icon(current_shape));
+			}
 
 			for (int i = 0; i < SLIDER_COUNT; i++) {
 				labels[i]->set_custom_minimum_size(Size2(theme_cache.label_width, 0));
@@ -119,15 +143,6 @@ void ColorPicker::_notification(int p_what) {
 				mode_btns[i]->end_bulk_theme_override();
 			}
 
-			shape_popup->set_item_icon(shape_popup->get_item_index(SHAPE_HSV_RECTANGLE), theme_cache.shape_rect);
-			shape_popup->set_item_icon(shape_popup->get_item_index(SHAPE_HSV_WHEEL), theme_cache.shape_rect_wheel);
-			shape_popup->set_item_icon(shape_popup->get_item_index(SHAPE_VHS_CIRCLE), theme_cache.shape_circle);
-			shape_popup->set_item_icon(shape_popup->get_item_index(SHAPE_OKHSL_CIRCLE), theme_cache.shape_circle);
-
-			if (current_shape != SHAPE_NONE) {
-				btn_shape->set_button_icon(shape_popup->get_item_icon(current_shape));
-			}
-
 			internal_margin->begin_bulk_theme_override();
 			internal_margin->add_theme_constant_override(SNAME("margin_bottom"), theme_cache.content_margin);
 			internal_margin->add_theme_constant_override(SNAME("margin_left"), theme_cache.content_margin);
@@ -153,8 +168,44 @@ void ColorPicker::_notification(int p_what) {
 			}
 		} break;
 
+		case NOTIFICATION_FOCUS_ENTER:
+		case NOTIFICATION_FOCUS_EXIT: {
+			if (current_shape != SHAPE_NONE) {
+				shapes[current_shape]->cursor_editing = false;
+			}
+		} break;
+
 		case NOTIFICATION_INTERNAL_PROCESS: {
 			if (!is_picking_color) {
+				Input *input = Input::get_singleton();
+				if (input->is_action_just_released("ui_left") ||
+						input->is_action_just_released("ui_right") ||
+						input->is_action_just_released("ui_up") ||
+						input->is_action_just_released("ui_down")) {
+					gamepad_event_delay_ms = DEFAULT_GAMEPAD_EVENT_DELAY_MS;
+					if (current_shape == SHAPE_NONE) {
+						shapes[current_shape]->echo_multiplier = 1;
+					}
+					accept_event();
+					set_process_internal(false);
+					return;
+				}
+
+				if (current_shape == SHAPE_NONE) {
+					return;
+				}
+
+				gamepad_event_delay_ms -= get_process_delta_time();
+				if (gamepad_event_delay_ms <= 0) {
+					gamepad_event_delay_ms = GAMEPAD_EVENT_REPEAT_RATE_MS + gamepad_event_delay_ms;
+					// Treat any input from joypad axis as -1, 0, or 1, as the value is added to Vector2i and would be lost.
+					Vector2 color_change_vector = Vector2(
+							input->is_action_pressed("ui_right") - input->is_action_pressed("ui_left"),
+							input->is_action_pressed("ui_down") - input->is_action_pressed("ui_up"));
+
+					shapes[current_shape]->update_cursor(color_change_vector, true);
+					accept_event();
+				}
 				return;
 			}
 			DisplayServer *ds = DisplayServer::get_singleton();
@@ -180,7 +231,7 @@ void ColorPicker::_notification(int p_what) {
 			}
 
 			set_pick_color(c);
-		}
+		} break;
 	}
 }
 
@@ -277,6 +328,10 @@ void ColorPicker::set_focus_on_line_edit() {
 	callable_mp((Control *)c_text, &Control::grab_focus).call_deferred();
 }
 
+void ColorPicker::set_focus_on_picker_shape() {
+	shapes[current_shape]->grab_focus();
+}
+
 void ColorPicker::_update_controls() {
 	int mode_sliders_count = modes[current_mode]->get_slider_count();
 
@@ -294,8 +349,12 @@ void ColorPicker::_update_controls() {
 
 	for (int i = 0; i < current_slider_count; i++) {
 		labels[i]->set_text(modes[current_mode]->get_slider_label(i));
+		sliders[i]->set_accessibility_name(modes[current_mode]->get_slider_label(i));
+		values[i]->set_accessibility_name(modes[current_mode]->get_slider_label(i));
 	}
 	alpha_label->set_text("A");
+	alpha_slider->set_accessibility_name(ETR("Alpha"));
+	alpha_value->set_accessibility_name(ETR("Alpha"));
 
 	slider_theme_modified = modes[current_mode]->apply_theme();
 
@@ -309,45 +368,25 @@ void ColorPicker::_update_controls() {
 		alpha_label->hide();
 	}
 
-	switch (_get_actual_shape()) {
-		case SHAPE_HSV_RECTANGLE:
-			wheel_edit->hide();
-			w_edit->show();
-			uv_edit->show();
-			btn_shape->show();
-			break;
-		case SHAPE_HSV_WHEEL:
-			wheel_edit->show();
-			w_edit->hide();
-			uv_edit->hide();
-			btn_shape->show();
-			wheel->set_material(wheel_mat);
-			break;
-		case SHAPE_VHS_CIRCLE:
-			wheel_edit->show();
-			w_edit->show();
-			uv_edit->hide();
-			btn_shape->show();
-			wheel->set_material(circle_mat);
-			circle_mat->set_shader(circle_shader);
-			break;
-		case SHAPE_OKHSL_CIRCLE:
-			wheel_edit->show();
-			w_edit->show();
-			uv_edit->hide();
-			btn_shape->show();
-			wheel->set_material(circle_mat);
-			circle_mat->set_shader(circle_ok_color_shader);
-			break;
-		case SHAPE_NONE:
-			wheel_edit->hide();
-			w_edit->hide();
-			uv_edit->hide();
-			btn_shape->hide();
-			break;
-		default: {
+	int i = 0;
+	for (ColorPickerShape *shape : shapes) {
+		bool is_active = current_shape == i;
+		i++;
+
+		if (!shape->is_initialized) {
+			if (is_active) {
+				// Controls are initialized on demand, because ColorPicker does not need them all at once.
+				shape->initialize_controls();
+			} else {
+				continue;
+			}
+		}
+
+		for (Control *control : shape->controls) {
+			control->set_visible(is_active);
 		}
 	}
+	btn_shape->set_visible(current_shape != SHAPE_NONE);
 }
 
 void ColorPicker::_set_pick_color(const Color &p_color, bool p_update_sliders) {
@@ -423,6 +462,8 @@ void ColorPicker::_slider_value_changed() {
 		ok_hsl_h = color.get_ok_hsl_h();
 		ok_hsl_s = color.get_ok_hsl_s();
 		ok_hsl_l = color.get_ok_hsl_l();
+
+		circle_keyboard_joypad_picker_cursor_position = Vector2i();
 		last_color = color;
 	} else if (current_mode == MODE_OKHSL) {
 		ok_hsl_h = sliders[0]->get_value() / 360.0;
@@ -431,6 +472,8 @@ void ColorPicker::_slider_value_changed() {
 		h = color.get_h();
 		s = color.get_s();
 		v = color.get_v();
+
+		circle_keyboard_joypad_picker_cursor_position = Vector2i();
 		last_color = color;
 	}
 
@@ -451,6 +494,10 @@ void ColorPicker::add_mode(ColorMode *p_mode) {
 	modes.push_back(p_mode);
 }
 
+void ColorPicker::add_shape(ColorPickerShape *p_shape) {
+	shapes.push_back(p_shape);
+}
+
 void ColorPicker::create_slider(GridContainer *gc, int idx) {
 	Label *lbl = memnew(Label);
 	lbl->set_v_size_flags(SIZE_SHRINK_CENTER);
@@ -562,7 +609,7 @@ void ColorPicker::_copy_color_to_hsv() {
 }
 
 void ColorPicker::_copy_hsv_to_color() {
-	if (_get_actual_shape() == SHAPE_OKHSL_CIRCLE) {
+	if (current_shape != SHAPE_NONE && shapes[current_shape]->is_ok_hsl()) {
 		color.set_ok_hsl(ok_hsl_h, ok_hsl_s, ok_hsl_l, color.a);
 	} else {
 		color.set_hsv(h, s, v, color.a);
@@ -594,10 +641,6 @@ bool ColorPicker::_select_from_recent_preset_hbc(const Color &p_color) {
 	return false;
 }
 
-ColorPicker::PickerShapeType ColorPicker::_get_actual_shape() const {
-	return modes[current_mode]->get_shape_override() != SHAPE_MAX ? modes[current_mode]->get_shape_override() : current_shape;
-}
-
 void ColorPicker::_reset_sliders_theme() {
 	Ref<StyleBoxFlat> style_box_flat(memnew(StyleBoxFlat));
 	style_box_flat->set_content_margin(SIDE_TOP, 16 * theme_cache.base_scale);
@@ -605,21 +648,21 @@ void ColorPicker::_reset_sliders_theme() {
 
 	for (int i = 0; i < SLIDER_COUNT; i++) {
 		sliders[i]->begin_bulk_theme_override();
-		sliders[i]->add_theme_icon_override("grabber", theme_cache.bar_arrow);
-		sliders[i]->add_theme_icon_override("grabber_highlight", theme_cache.bar_arrow);
-		sliders[i]->add_theme_constant_override("grabber_offset", 8 * theme_cache.base_scale);
+		sliders[i]->add_theme_icon_override(SNAME("grabber"), theme_cache.bar_arrow);
+		sliders[i]->add_theme_icon_override(SNAME("grabber_highlight"), theme_cache.bar_arrow);
+		sliders[i]->add_theme_constant_override(SNAME("grabber_offset"), 8 * theme_cache.base_scale);
 		if (!colorize_sliders) {
-			sliders[i]->add_theme_style_override("slider", style_box_flat);
+			sliders[i]->add_theme_style_override(SNAME("slider"), style_box_flat);
 		}
 		sliders[i]->end_bulk_theme_override();
 	}
 
 	alpha_slider->begin_bulk_theme_override();
-	alpha_slider->add_theme_icon_override("grabber", theme_cache.bar_arrow);
-	alpha_slider->add_theme_icon_override("grabber_highlight", theme_cache.bar_arrow);
-	alpha_slider->add_theme_constant_override("grabber_offset", 8 * theme_cache.base_scale);
+	alpha_slider->add_theme_icon_override(SNAME("grabber"), theme_cache.bar_arrow);
+	alpha_slider->add_theme_icon_override(SNAME("grabber_highlight"), theme_cache.bar_arrow);
+	alpha_slider->add_theme_constant_override(SNAME("grabber_offset"), 8 * theme_cache.base_scale);
 	if (!colorize_sliders) {
-		alpha_slider->add_theme_style_override("slider", style_box_flat);
+		alpha_slider->add_theme_style_override(SNAME("slider"), style_box_flat);
 	}
 	alpha_slider->end_bulk_theme_override();
 }
@@ -685,16 +728,20 @@ void ColorPicker::_update_color(bool p_update_sliders) {
 
 	_update_text_value();
 
+	if (current_shape != SHAPE_NONE) {
+		for (Control *control : shapes[current_shape]->controls) {
+			control->queue_redraw();
+		}
+	}
+
 	sample->queue_redraw();
-	uv_edit->queue_redraw();
-	w_edit->queue_redraw();
+
 	for (int i = 0; i < current_slider_count; i++) {
 		sliders[i]->queue_redraw();
 	}
 	alpha_slider->queue_redraw();
-	wheel->queue_redraw();
-	wheel_uv->queue_redraw();
 	updating = false;
+	queue_accessibility_update();
 }
 
 void ColorPicker::_update_presets() {
@@ -721,7 +768,7 @@ void ColorPicker::_update_presets() {
 			}
 
 			if (palette_edited) {
-				palette_name->set_text(vformat("%s*", palette_name->get_text().replace("*", "")));
+				palette_name->set_text(vformat("%s*", palette_name->get_text().remove_char('*')));
 				palette_name->set_tooltip_text(ETR("The changes to this palette have not been saved to a file."));
 			}
 		}
@@ -805,6 +852,7 @@ void ColorPicker::set_picker_shape(PickerShapeType p_shape) {
 		btn_shape->set_button_icon(shape_popup->get_item_icon(p_shape));
 	}
 
+	circle_keyboard_joypad_picker_cursor_position = Vector2i();
 	current_shape = p_shape;
 
 #ifdef TOOLS_ENABLED
@@ -830,6 +878,7 @@ inline int ColorPicker::_get_preset_size() {
 void ColorPicker::_add_preset_button(int p_size, const Color &p_color) {
 	ColorPresetButton *btn_preset_new = memnew(ColorPresetButton(p_color, p_size));
 	btn_preset_new->set_tooltip_text(vformat(atr(ETR("Color: #%s\nLMB: Apply color\nRMB: Remove preset")), p_color.to_html(p_color.a < 1)));
+	btn_preset_new->set_accessibility_name(vformat(atr(ETR("Color: #%")), p_color.to_html(p_color.a < 1)));
 	SET_DRAG_FORWARDING_GCDU(btn_preset_new, ColorPicker);
 	btn_preset_new->set_button_group(preset_group);
 	preset_container->add_child(btn_preset_new);
@@ -840,6 +889,7 @@ void ColorPicker::_add_preset_button(int p_size, const Color &p_color) {
 void ColorPicker::_add_recent_preset_button(int p_size, const Color &p_color) {
 	ColorPresetButton *btn_preset_new = memnew(ColorPresetButton(p_color, p_size));
 	btn_preset_new->set_tooltip_text(vformat(atr(ETR("Color: #%s\nLMB: Apply color")), p_color.to_html(p_color.a < 1)));
+	btn_preset_new->set_accessibility_name(vformat(atr(ETR("Color: #%s")), p_color.to_html(p_color.a < 1)));
 	btn_preset_new->set_button_group(recent_preset_group);
 	recent_preset_hbc->add_child(btn_preset_new);
 	recent_preset_hbc->move_child(btn_preset_new, 0);
@@ -887,7 +937,6 @@ void ColorPicker::_quick_open_palette_file_selected(const String &p_path) {
 	if (!file_dialog) {
 		file_dialog = memnew(FileDialog);
 		add_child(file_dialog, false, INTERNAL_MODE_FRONT);
-		file_dialog->force_parent_owned();
 		file_dialog->connect("file_selected", callable_mp(this, &ColorPicker::_palette_file_selected));
 		file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
 		file_dialog->set_current_dir(Engine::get_singleton()->is_editor_hint() ? "res://" : "user://");
@@ -978,6 +1027,7 @@ void ColorPicker::_set_mode_popup_value(ColorModeType p_mode) {
 	} else {
 		set_color_mode(p_mode);
 	}
+	circle_keyboard_joypad_picker_cursor_position = Vector2i();
 }
 
 Variant ColorPicker::_get_drag_data_fw(const Point2 &p_point, Control *p_from_control) {
@@ -1026,16 +1076,21 @@ void ColorPicker::add_preset(const Color &p_color) {
 	List<Color>::Element *e = presets.find(p_color);
 	if (e) {
 		presets.move_to_back(e);
-		preset_cache.move_to_back(preset_cache.find(p_color));
 
 		preset_container->move_child(preset_group->get_pressed_button(), preset_container->get_child_count() - 1);
 	} else {
 		presets.push_back(p_color);
-		preset_cache.push_back(p_color);
 
 		_add_preset_button(_get_preset_size(), p_color);
 	}
 
+	List<Color>::Element *cache_e = preset_cache.find(p_color);
+	if (cache_e) {
+		preset_cache.move_to_back(cache_e);
+	} else {
+		preset_cache.push_back(p_color);
+	}
+
 	if (!palette_name->get_text().is_empty()) {
 		palette_name->set_text(vformat("%s*", palette_name->get_text().trim_suffix("*")));
 		palette_name->set_tooltip_text(ETR("The changes to this palette have not been saved to a file."));
@@ -1083,11 +1138,14 @@ void ColorPicker::erase_preset(const Color &p_color) {
 			ColorPresetButton *current_btn = Object::cast_to<ColorPresetButton>(preset_container->get_child(i));
 			if (current_btn && p_color == current_btn->get_preset_color()) {
 				current_btn->queue_free();
+				// Removing focused control loose the focus totally. We focus on previous button to keep it possible to navigate with keyboard/joypad.
+				Control *focus_target = Object::cast_to<Control>(preset_container->get_child(i - 1));
+				focus_target->grab_focus();
 				break;
 			}
 		}
 
-		palette_name->set_text(vformat("%s*", palette_name->get_text().replace("*", "")));
+		palette_name->set_text(vformat("%s*", palette_name->get_text().remove_char('*')));
 		palette_name->set_tooltip_text(ETR("The changes to this palette have not been saved to a file."));
 		if (presets.is_empty()) {
 			palette_name->set_text("");
@@ -1268,21 +1326,29 @@ void ColorPicker::_sample_input(const Ref<InputEvent> &p_event) {
 		if (rect_old.has_point(mb->get_position())) {
 			// Revert to the old color when left-clicking the old color sample.
 			set_pick_color(old_color);
+
+			sample->set_focus_mode(FOCUS_NONE);
 			emit_signal(SNAME("color_changed"), color);
 		}
 	}
+
+	if (p_event->is_action_pressed(SNAME("ui_accept"), false, true)) {
+		set_pick_color(old_color);
+		emit_signal(SNAME("color_changed"), color);
+	}
 }
 
 void ColorPicker::_sample_draw() {
 	// Covers the right half of the sample if the old color is being displayed,
 	// or the whole sample if it's not being displayed.
 	Rect2 rect_new;
+	Rect2 rect_old;
 
 	if (display_old_color) {
 		rect_new = Rect2(Point2(sample->get_size().width * 0.5, 0), Size2(sample->get_size().width * 0.5, sample->get_size().height * 0.95));
 
 		// Draw both old and new colors for easier comparison (only if spawned from a ColorPickerButton).
-		const Rect2 rect_old = Rect2(Point2(), Size2(sample->get_size().width * 0.5, sample->get_size().height * 0.95));
+		rect_old = Rect2(Point2(), Size2(sample->get_size().width * 0.5, sample->get_size().height * 0.95));
 
 		if (old_color.a < 1.0) {
 			sample->draw_texture_rect(theme_cache.sample_bg, rect_old, true);
@@ -1296,6 +1362,10 @@ void ColorPicker::_sample_draw() {
 			sample->draw_texture(theme_cache.sample_revert,
 					rect_old.size * 0.5 - theme_cache.sample_revert->get_size() * 0.5,
 					Math::lerp(0.75f, old_color.get_luminance(), old_color.a) < 0.455 ? Color(1, 1, 1) : (Color(0.01, 0.01, 0.01)));
+
+			sample->set_focus_mode(FOCUS_ALL);
+		} else {
+			sample->set_focus_mode(FOCUS_NONE);
 		}
 
 		if (old_color.r > 1 || old_color.g > 1 || old_color.b > 1) {
@@ -1312,155 +1382,14 @@ void ColorPicker::_sample_draw() {
 
 	sample->draw_rect(rect_new, color);
 
+	if (display_old_color && !old_color.is_equal_approx(color) && sample->has_focus()) {
+		RID ci = sample->get_canvas_item();
+		theme_cache.sample_focus->draw(ci, rect_old);
+	}
+
 	if (color.r > 1 || color.g > 1 || color.b > 1) {
 		// Draw an indicator to denote that the new color is "overbright" and can't be displayed accurately in the preview.
-		sample->draw_texture(theme_cache.overbright_indicator, Point2(display_old_color ? sample->get_size().width * 0.5 : 0, 0));
-	}
-}
-
-void ColorPicker::_hsv_draw(int p_which, Control *c) {
-	if (!c) {
-		return;
-	}
-
-	PickerShapeType actual_shape = _get_actual_shape();
-	if (p_which == 0) {
-		Color col = color;
-		Vector2 center = c->get_size() / 2.0;
-
-		if (actual_shape == SHAPE_HSV_RECTANGLE || actual_shape == SHAPE_HSV_WHEEL) {
-			Vector<Point2> points;
-			Vector<Color> colors;
-			Vector<Color> colors2;
-			points.resize(4);
-			colors.resize(4);
-			colors2.resize(4);
-			if (actual_shape == SHAPE_HSV_RECTANGLE) {
-				points.set(0, Vector2());
-				points.set(1, Vector2(c->get_size().x, 0));
-				points.set(2, c->get_size());
-				points.set(3, Vector2(0, c->get_size().y));
-			} else {
-				real_t ring_radius_x = Math_SQRT12 * c->get_size().width * WHEEL_RADIUS;
-				real_t ring_radius_y = Math_SQRT12 * c->get_size().height * WHEEL_RADIUS;
-
-				points.set(0, center - Vector2(ring_radius_x, ring_radius_y));
-				points.set(1, center + Vector2(ring_radius_x, -ring_radius_y));
-				points.set(2, center + Vector2(ring_radius_x, ring_radius_y));
-				points.set(3, center + Vector2(-ring_radius_x, ring_radius_y));
-			}
-			colors.set(0, Color(1, 1, 1, 1));
-			colors.set(1, Color(1, 1, 1, 1));
-			colors.set(2, Color(0, 0, 0, 1));
-			colors.set(3, Color(0, 0, 0, 1));
-			c->draw_polygon(points, colors);
-
-			col.set_hsv(h, 1, 1);
-			col.a = 0;
-			colors2.set(0, col);
-			col.a = 1;
-			colors2.set(1, col);
-			col.set_hsv(h, 1, 0);
-			colors2.set(2, col);
-			col.a = 0;
-			colors2.set(3, col);
-			c->draw_polygon(points, colors2);
-		}
-
-		int x;
-		int y;
-		if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
-			Vector2 hue_offset;
-			if (actual_shape == SHAPE_OKHSL_CIRCLE) {
-				hue_offset = center * Vector2(Math::cos(ok_hsl_h * Math_TAU), Math::sin(ok_hsl_h * Math_TAU)) * ok_hsl_s;
-			} else {
-				hue_offset = center * Vector2(Math::cos(h * Math_TAU), Math::sin(h * Math_TAU)) * s;
-			}
-			x = center.x + hue_offset.x - (theme_cache.picker_cursor->get_width() / 2);
-			y = center.y + hue_offset.y - (theme_cache.picker_cursor->get_height() / 2);
-		} else {
-			real_t corner_x = (c == wheel_uv) ? center.x - Math_SQRT12 * c->get_size().width * WHEEL_RADIUS : 0;
-			real_t corner_y = (c == wheel_uv) ? center.y - Math_SQRT12 * c->get_size().height * WHEEL_RADIUS : 0;
-
-			Size2 real_size(c->get_size().x - corner_x * 2, c->get_size().y - corner_y * 2);
-			x = CLAMP(real_size.x * s, 0, real_size.x) + corner_x - (theme_cache.picker_cursor->get_width() / 2);
-			y = CLAMP(real_size.y - real_size.y * v, 0, real_size.y) + corner_y - (theme_cache.picker_cursor->get_height() / 2);
-		}
-		Color _col = color;
-		_col.a = 1.0;
-		c->draw_texture(theme_cache.picker_cursor_bg, Point2(x, y), _col);
-		c->draw_texture(theme_cache.picker_cursor, Point2(x, y));
-
-		if (actual_shape == SHAPE_HSV_WHEEL) {
-			float _radius = WHEEL_RADIUS * 2.0;
-			_radius += (1.0 - _radius) * 0.5;
-			Point2 pos = center - (theme_cache.picker_cursor->get_size() * 0.5) + Point2(center.x * Math::cos(h * Math_TAU) * _radius, center.y * Math::sin(h * Math_TAU) * _radius);
-			c->draw_texture(theme_cache.picker_cursor, pos);
-		}
-
-	} else if (p_which == 1) {
-		if (actual_shape == SHAPE_HSV_RECTANGLE) {
-			c->draw_set_transform(Point2(), -Math_PI / 2, Size2(c->get_size().x, -c->get_size().y));
-			c->draw_texture_rect(theme_cache.color_hue, Rect2(Point2(), Size2(1, 1)));
-			c->draw_set_transform(Point2(), 0, Size2(1, 1));
-			int y = c->get_size().y - c->get_size().y * (1.0 - h);
-			Color col;
-			col.set_hsv(h, 1, 1);
-			c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted());
-		} else if (actual_shape == SHAPE_OKHSL_CIRCLE) {
-			Vector<Point2> points;
-			Vector<Color> colors;
-			Color col;
-			col.set_ok_hsl(ok_hsl_h, ok_hsl_s, 1);
-			Color col2;
-			col2.set_ok_hsl(ok_hsl_h, ok_hsl_s, 0.5);
-			Color col3;
-			col3.set_ok_hsl(ok_hsl_h, ok_hsl_s, 0);
-			points.resize(6);
-			colors.resize(6);
-			points.set(0, Vector2(c->get_size().x, 0));
-			points.set(1, Vector2(c->get_size().x, c->get_size().y * 0.5));
-			points.set(2, c->get_size());
-			points.set(3, Vector2(0, c->get_size().y));
-			points.set(4, Vector2(0, c->get_size().y * 0.5));
-			points.set(5, Vector2());
-			colors.set(0, col);
-			colors.set(1, col2);
-			colors.set(2, col3);
-			colors.set(3, col3);
-			colors.set(4, col2);
-			colors.set(5, col);
-			c->draw_polygon(points, colors);
-			int y = c->get_size().y - c->get_size().y * CLAMP(ok_hsl_l, 0, 1);
-			col.set_ok_hsl(ok_hsl_h, 1, ok_hsl_l);
-			c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted());
-		} else if (actual_shape == SHAPE_VHS_CIRCLE) {
-			Vector<Point2> points;
-			Vector<Color> colors;
-			Color col;
-			col.set_hsv(h, s, 1);
-			points.resize(4);
-			colors.resize(4);
-			points.set(0, Vector2());
-			points.set(1, Vector2(c->get_size().x, 0));
-			points.set(2, c->get_size());
-			points.set(3, Vector2(0, c->get_size().y));
-			colors.set(0, col);
-			colors.set(1, col);
-			colors.set(2, Color(0, 0, 0));
-			colors.set(3, Color(0, 0, 0));
-			c->draw_polygon(points, colors);
-			int y = c->get_size().y - c->get_size().y * CLAMP(v, 0, 1);
-			col.set_hsv(h, 1, v);
-			c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted());
-		}
-	} else if (p_which == 2) {
-		c->draw_rect(Rect2(Point2(), c->get_size()), Color(1, 1, 1));
-		if (actual_shape == SHAPE_VHS_CIRCLE) {
-			circle_mat->set_shader_parameter("v", v);
-		} else if (actual_shape == SHAPE_OKHSL_CIRCLE) {
-			circle_mat->set_shader_parameter("ok_hsl_l", ok_hsl_l);
-		}
+		sample->draw_texture(theme_cache.overbright_indicator, Point2(sample->get_size().width * 0.5, 0));
 	}
 }
 
@@ -1470,171 +1399,6 @@ void ColorPicker::_slider_draw(int p_which) {
 	}
 }
 
-void ColorPicker::_uv_input(const Ref<InputEvent> &p_event, Control *c) {
-	Ref<InputEventMouseButton> bev = p_event;
-	PickerShapeType actual_shape = _get_actual_shape();
-
-	if (bev.is_valid()) {
-		if (bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
-			Vector2 center = c->get_size() / 2.0;
-			if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
-				real_t dist = center.distance_to(bev->get_position());
-				if (dist <= center.x) {
-					real_t rad = center.angle_to_point(bev->get_position());
-					h = ((rad >= 0) ? rad : (Math_TAU + rad)) / Math_TAU;
-					s = CLAMP(dist / center.x, 0, 1);
-					ok_hsl_h = h;
-					ok_hsl_s = s;
-				} else {
-					return;
-				}
-			} else {
-				real_t corner_x = (c == wheel_uv) ? center.x - Math_SQRT12 * c->get_size().width * 0.42 : 0;
-				real_t corner_y = (c == wheel_uv) ? center.y - Math_SQRT12 * c->get_size().height * 0.42 : 0;
-				Size2 real_size(c->get_size().x - corner_x * 2, c->get_size().y - corner_y * 2);
-
-				if (bev->get_position().x < corner_x || bev->get_position().x > c->get_size().x - corner_x ||
-						bev->get_position().y < corner_y || bev->get_position().y > c->get_size().y - corner_y) {
-					{
-						real_t dist = center.distance_to(bev->get_position());
-
-						if (dist >= center.x * 0.84 && dist <= center.x) {
-							real_t rad = center.angle_to_point(bev->get_position());
-							h = ((rad >= 0) ? rad : (Math_TAU + rad)) / Math_TAU;
-							spinning = true;
-						} else {
-							return;
-						}
-					}
-				}
-
-				if (!spinning) {
-					real_t x = CLAMP(bev->get_position().x - corner_x, 0, real_size.x);
-					real_t y = CLAMP(bev->get_position().y - corner_y, 0, real_size.y);
-
-					s = x / real_size.x;
-					v = 1.0 - y / real_size.y;
-				}
-			}
-
-			changing_color = true;
-
-			_copy_hsv_to_color();
-			last_color = color;
-			set_pick_color(color);
-
-			if (!deferred_mode_enabled) {
-				emit_signal(SNAME("color_changed"), color);
-			}
-		} else if (!bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
-			if (deferred_mode_enabled) {
-				emit_signal(SNAME("color_changed"), color);
-			}
-			add_recent_preset(color);
-			changing_color = false;
-			spinning = false;
-		} else {
-			changing_color = false;
-			spinning = false;
-		}
-	}
-
-	Ref<InputEventMouseMotion> mev = p_event;
-
-	if (mev.is_valid()) {
-		if (!changing_color) {
-			return;
-		}
-
-		Vector2 center = c->get_size() / 2.0;
-		if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
-			real_t dist = center.distance_to(mev->get_position());
-			real_t rad = center.angle_to_point(mev->get_position());
-			h = ((rad >= 0) ? rad : (Math_TAU + rad)) / Math_TAU;
-			s = CLAMP(dist / center.x, 0, 1);
-			ok_hsl_h = h;
-			ok_hsl_s = s;
-		} else {
-			if (spinning) {
-				real_t rad = center.angle_to_point(mev->get_position());
-				h = ((rad >= 0) ? rad : (Math_TAU + rad)) / Math_TAU;
-			} else {
-				real_t corner_x = (c == wheel_uv) ? center.x - Math_SQRT12 * c->get_size().width * 0.42 : 0;
-				real_t corner_y = (c == wheel_uv) ? center.y - Math_SQRT12 * c->get_size().height * 0.42 : 0;
-				Size2 real_size(c->get_size().x - corner_x * 2, c->get_size().y - corner_y * 2);
-
-				real_t x = CLAMP(mev->get_position().x - corner_x, 0, real_size.x);
-				real_t y = CLAMP(mev->get_position().y - corner_y, 0, real_size.y);
-
-				s = x / real_size.x;
-				v = 1.0 - y / real_size.y;
-			}
-		}
-
-		_copy_hsv_to_color();
-		last_color = color;
-		set_pick_color(color);
-
-		if (!deferred_mode_enabled) {
-			emit_signal(SNAME("color_changed"), color);
-		}
-	}
-}
-
-void ColorPicker::_w_input(const Ref<InputEvent> &p_event) {
-	Ref<InputEventMouseButton> bev = p_event;
-	PickerShapeType actual_shape = _get_actual_shape();
-
-	if (bev.is_valid()) {
-		if (bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
-			changing_color = true;
-			float y = CLAMP((float)bev->get_position().y, 0, w_edit->get_size().height);
-			if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
-				v = 1.0 - (y / w_edit->get_size().height);
-				ok_hsl_l = v;
-			} else {
-				h = y / w_edit->get_size().height;
-			}
-		} else {
-			changing_color = false;
-		}
-
-		_copy_hsv_to_color();
-		last_color = color;
-		set_pick_color(color);
-
-		if (!bev->is_pressed() && bev->get_button_index() == MouseButton::LEFT) {
-			add_recent_preset(color);
-			emit_signal(SNAME("color_changed"), color);
-		} else if (!deferred_mode_enabled) {
-			emit_signal(SNAME("color_changed"), color);
-		}
-	}
-
-	Ref<InputEventMouseMotion> mev = p_event;
-
-	if (mev.is_valid()) {
-		if (!changing_color) {
-			return;
-		}
-		float y = CLAMP((float)mev->get_position().y, 0, w_edit->get_size().height);
-		if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
-			v = 1.0 - (y / w_edit->get_size().height);
-			ok_hsl_l = v;
-		} else {
-			h = y / w_edit->get_size().height;
-		}
-
-		_copy_hsv_to_color();
-		last_color = color;
-		set_pick_color(color);
-
-		if (!deferred_mode_enabled) {
-			emit_signal(SNAME("color_changed"), color);
-		}
-	}
-}
-
 void ColorPicker::_slider_or_spin_input(const Ref<InputEvent> &p_event) {
 	if (line_edit_mouse_release) {
 		line_edit_mouse_release = false;
@@ -1666,6 +1430,15 @@ void ColorPicker::_preset_input(const Ref<InputEvent> &p_event, const Color &p_c
 			emit_signal(SNAME("preset_removed"), p_color);
 		}
 	}
+
+	if (p_event->is_action_pressed(SNAME("ui_accept"), false, true)) {
+		set_pick_color(p_color);
+		add_recent_preset(color);
+		emit_signal(SNAME("color_changed"), p_color);
+	} else if (p_event->is_action_pressed(SNAME("ui_colorpicker_delete_preset"), false, true) && can_add_swatches) {
+		erase_preset(p_color);
+		emit_signal(SNAME("preset_removed"), p_color);
+	}
 }
 
 void ColorPicker::_recent_preset_pressed(const bool p_pressed, ColorPresetButton *p_preset) {
@@ -1693,6 +1466,26 @@ void ColorPicker::_add_preset_pressed() {
 	emit_signal(SNAME("preset_added"), color);
 }
 
+void ColorPicker::_pick_button_pressed_native() {
+	if (!DisplayServer::get_singleton()->color_picker(callable_mp(this, &ColorPicker::_native_cb))) {
+		// Fallback to default/legacy picker.
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SCREEN_CAPTURE) && !get_tree()->get_root()->is_embedding_subwindows()) {
+			_pick_button_pressed();
+		} else {
+			_pick_button_pressed_legacy();
+		}
+	}
+}
+
+void ColorPicker::_native_cb(bool p_status, const Color &p_color) {
+	if (p_status) {
+		set_pick_color(p_color);
+		if (!deferred_mode_enabled) {
+			emit_signal(SNAME("color_changed"), color);
+		}
+	}
+}
+
 void ColorPicker::_pick_button_pressed() {
 	is_picking_color = true;
 	pre_picking_color = color;
@@ -1741,7 +1534,6 @@ void ColorPicker::_pick_button_pressed() {
 		picker_preview_color->add_theme_style_override(SceneStringName(panel), picker_preview_style_box_color);
 
 		add_child(picker_window, false, INTERNAL_MODE_FRONT);
-		picker_window->force_parent_owned();
 	}
 	set_process_internal(true);
 
@@ -1826,7 +1618,6 @@ void ColorPicker::_options_menu_cbk(int p_which) {
 	if (!file_dialog) {
 		file_dialog = memnew(FileDialog);
 		add_child(file_dialog, false, INTERNAL_MODE_FRONT);
-		file_dialog->force_parent_owned();
 		file_dialog->connect("file_selected", callable_mp(this, &ColorPicker::_palette_file_selected));
 		file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM);
 		file_dialog->set_current_dir(Engine::get_singleton()->is_editor_hint() ? "res://" : "user://");
@@ -1879,6 +1670,18 @@ void ColorPicker::_options_menu_cbk(int p_which) {
 	}
 }
 
+void ColorPicker::_block_input_on_popup_show() {
+	if (!get_tree()->get_root()->is_embedding_subwindows()) {
+		get_viewport()->set_disable_input(true);
+	}
+}
+
+void ColorPicker::_enable_input_on_popup_hide() {
+	if (!get_tree()->get_root()->is_embedding_subwindows()) {
+		get_viewport()->set_disable_input(false);
+	}
+}
+
 void ColorPicker::_pick_button_pressed_legacy() {
 	if (!is_inside_tree()) {
 		return;
@@ -1890,7 +1693,6 @@ void ColorPicker::_pick_button_pressed_legacy() {
 		picker_window->hide();
 		picker_window->set_transient(true);
 		add_child(picker_window, false, INTERNAL_MODE_FRONT);
-		picker_window->force_parent_owned();
 
 		picker_texture_rect = memnew(TextureRect);
 		picker_texture_rect->set_anchors_preset(Control::PRESET_FULL_RECT);
@@ -2025,6 +1827,7 @@ void ColorPicker::_html_focus_exit() {
 	} else {
 		_update_text_value();
 	}
+	circle_keyboard_joypad_picker_cursor_position = Vector2i();
 }
 
 void ColorPicker::set_can_add_swatches(bool p_enabled) {
@@ -2171,6 +1974,10 @@ void ColorPicker::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, ColorPicker, h_width);
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, ColorPicker, center_slider_grabbers);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, ColorPicker, sample_focus);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, ColorPicker, picker_focus_rectangle);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, ColorPicker, picker_focus_circle);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, ColorPicker, focused_not_editing_cursor_color);
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, ColorPicker, menu_option);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, ColorPicker, screen_picker);
@@ -2202,23 +2009,16 @@ ColorPicker::ColorPicker() {
 	VBoxContainer *real_vbox = memnew(VBoxContainer);
 	internal_margin->add_child(real_vbox);
 
-	HBoxContainer *hb_edit = memnew(HBoxContainer);
-	real_vbox->add_child(hb_edit);
-	hb_edit->set_v_size_flags(SIZE_SHRINK_BEGIN);
-
-	uv_edit = memnew(Control);
-	hb_edit->add_child(uv_edit);
-	uv_edit->connect(SceneStringName(gui_input), callable_mp(this, &ColorPicker::_uv_input).bind(uv_edit));
-	uv_edit->set_mouse_filter(MOUSE_FILTER_PASS);
-	uv_edit->set_h_size_flags(SIZE_EXPAND_FILL);
-	uv_edit->set_v_size_flags(SIZE_EXPAND_FILL);
-	uv_edit->connect(SceneStringName(draw), callable_mp(this, &ColorPicker::_hsv_draw).bind(0, uv_edit));
+	shape_container = memnew(HBoxContainer);
+	shape_container->set_v_size_flags(SIZE_SHRINK_BEGIN);
+	real_vbox->add_child(shape_container);
 
 	sample_hbc = memnew(HBoxContainer);
 	real_vbox->add_child(sample_hbc);
 
 	btn_pick = memnew(Button);
 	btn_pick->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
+	btn_pick->set_accessibility_name(ETR("Pick"));
 	sample_hbc->add_child(btn_pick);
 
 	sample = memnew(TextureRect);
@@ -2231,23 +2031,33 @@ ColorPicker::ColorPicker() {
 	btn_shape->set_flat(false);
 	sample_hbc->add_child(btn_shape);
 	btn_shape->set_toggle_mode(true);
+	btn_shape->set_accessibility_name(ETR("Picker Shape"));
 	btn_shape->set_tooltip_text(ETR("Select a picker shape."));
 	btn_shape->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
+	btn_shape->set_focus_mode(FOCUS_ALL);
 
-	current_shape = SHAPE_HSV_RECTANGLE;
+	add_shape(memnew(ColorPickerShapeRectangle(this)));
+	add_shape(memnew(ColorPickerShapeWheel(this)));
+	add_shape(memnew(ColorPickerShapeVHSCircle(this)));
+	add_shape(memnew(ColorPickerShapeOKHSLCircle(this)));
 
 	shape_popup = btn_shape->get_popup();
-	shape_popup->add_radio_check_item("HSV Rectangle", SHAPE_HSV_RECTANGLE);
-	shape_popup->add_radio_check_item("HSV Wheel", SHAPE_HSV_WHEEL);
-	shape_popup->add_radio_check_item("VHS Circle", SHAPE_VHS_CIRCLE);
-	shape_popup->add_radio_check_item("OKHSL Circle", SHAPE_OKHSL_CIRCLE);
+	{
+		int i = 0;
+		for (const ColorPickerShape *shape : shapes) {
+			shape_popup->add_radio_check_item(shape->get_name(), i);
+			i++;
+		}
+	}
 	shape_popup->set_item_checked(current_shape, true);
 	shape_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ColorPicker::set_picker_shape));
+	shape_popup->connect("about_to_popup", callable_mp(this, &ColorPicker::_block_input_on_popup_show));
+	shape_popup->connect(SNAME("popup_hide"), callable_mp(this, &ColorPicker::_enable_input_on_popup_hide));
 
-	add_mode(new ColorModeRGB(this));
-	add_mode(new ColorModeHSV(this));
-	add_mode(new ColorModeRAW(this));
-	add_mode(new ColorModeOKHSL(this));
+	add_mode(memnew(ColorModeRGB(this)));
+	add_mode(memnew(ColorModeHSV(this)));
+	add_mode(memnew(ColorModeRAW(this)));
+	add_mode(memnew(ColorModeOKHSL(this)));
 
 	mode_hbc = memnew(HBoxContainer);
 	real_vbox->add_child(mode_hbc);
@@ -2257,7 +2067,7 @@ ColorPicker::ColorPicker() {
 	for (int i = 0; i < MODE_BUTTON_COUNT; i++) {
 		mode_btns[i] = memnew(Button);
 		mode_hbc->add_child(mode_btns[i]);
-		mode_btns[i]->set_focus_mode(FOCUS_NONE);
+		mode_btns[i]->set_focus_mode(FOCUS_ALL);
 		mode_btns[i]->set_h_size_flags(SIZE_EXPAND_FILL);
 		mode_btns[i]->set_toggle_mode(true);
 		mode_btns[i]->set_text(modes[i]->get_name());
@@ -2271,19 +2081,25 @@ ColorPicker::ColorPicker() {
 	btn_mode->set_flat(false);
 	mode_hbc->add_child(btn_mode);
 	btn_mode->set_toggle_mode(true);
+	btn_mode->set_accessibility_name(ETR("Picker Mode"));
 	btn_mode->set_tooltip_text(ETR("Select a picker mode."));
-
-	current_mode = MODE_RGB;
+	btn_mode->set_focus_mode(FOCUS_ALL);
 
 	mode_popup = btn_mode->get_popup();
-	for (int i = 0; i < modes.size(); i++) {
-		mode_popup->add_radio_check_item(modes[i]->get_name(), i);
+	{
+		int i = 0;
+		for (const ColorMode *mode : modes) {
+			mode_popup->add_radio_check_item(mode->get_name(), i);
+			i++;
+		}
 	}
 	mode_popup->add_separator();
 	mode_popup->add_check_item(ETR("Colorized Sliders"), MODE_MAX);
 	mode_popup->set_item_checked(current_mode, true);
 	mode_popup->set_item_checked(MODE_MAX + 1, true);
 	mode_popup->connect(SceneStringName(id_pressed), callable_mp(this, &ColorPicker::_set_mode_popup_value));
+	mode_popup->connect("about_to_popup", callable_mp(this, &ColorPicker::_block_input_on_popup_show));
+	mode_popup->connect(SNAME("popup_hide"), callable_mp(this, &ColorPicker::_enable_input_on_popup_hide));
 
 	slider_gc = memnew(GridContainer);
 
@@ -2306,11 +2122,13 @@ ColorPicker::ColorPicker() {
 	text_type = memnew(Button);
 	hex_hbc->add_child(text_type);
 	text_type->set_text("#");
-	text_type->set_tooltip_text(RTR("Switch between hexadecimal and code values."));
+	text_type->set_accessibility_name(ETR("Hexadecimal/Code Values"));
+	text_type->set_tooltip_text(ETR("Switch between hexadecimal and code values."));
 	if (Engine::get_singleton()->is_editor_hint()) {
 		text_type->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_text_type_toggled));
 	} else {
 		text_type->set_flat(true);
+		text_type->set_focus_mode(FOCUS_NONE);
 		text_type->set_mouse_filter(MOUSE_FILTER_IGNORE);
 	}
 
@@ -2318,44 +2136,13 @@ ColorPicker::ColorPicker() {
 	hex_hbc->add_child(c_text);
 	c_text->set_h_size_flags(SIZE_EXPAND_FILL);
 	c_text->set_select_all_on_focus(true);
+	c_text->set_accessibility_name(ETR("Hex Code or Name"));
 	c_text->set_tooltip_text(ETR("Enter a hex code (\"#ff0000\") or named color (\"red\")."));
 	c_text->set_placeholder(ETR("Hex code or named color"));
 	c_text->connect(SceneStringName(text_submitted), callable_mp(this, &ColorPicker::_html_submitted));
 	c_text->connect(SceneStringName(text_changed), callable_mp(this, &ColorPicker::_text_changed));
 	c_text->connect(SceneStringName(focus_exited), callable_mp(this, &ColorPicker::_html_focus_exit));
 
-	wheel_edit = memnew(AspectRatioContainer);
-	wheel_edit->set_h_size_flags(SIZE_EXPAND_FILL);
-	wheel_edit->set_v_size_flags(SIZE_EXPAND_FILL);
-	hb_edit->add_child(wheel_edit);
-
-	wheel_mat.instantiate();
-	wheel_mat->set_shader(wheel_shader);
-	wheel_mat->set_shader_parameter("wheel_radius", WHEEL_RADIUS);
-	circle_mat.instantiate();
-	circle_mat->set_shader(circle_shader);
-
-	wheel_margin = memnew(MarginContainer);
-	wheel_margin->add_theme_constant_override("margin_bottom", 8);
-	wheel_edit->add_child(wheel_margin);
-
-	wheel = memnew(Control);
-	wheel_margin->add_child(wheel);
-	wheel->set_mouse_filter(MOUSE_FILTER_PASS);
-	wheel->connect(SceneStringName(draw), callable_mp(this, &ColorPicker::_hsv_draw).bind(2, wheel));
-
-	wheel_uv = memnew(Control);
-	wheel_margin->add_child(wheel_uv);
-	wheel_uv->connect(SceneStringName(gui_input), callable_mp(this, &ColorPicker::_uv_input).bind(wheel_uv));
-	wheel_uv->connect(SceneStringName(draw), callable_mp(this, &ColorPicker::_hsv_draw).bind(0, wheel_uv));
-
-	w_edit = memnew(Control);
-	hb_edit->add_child(w_edit);
-	w_edit->set_h_size_flags(SIZE_FILL);
-	w_edit->set_v_size_flags(SIZE_EXPAND_FILL);
-	w_edit->connect(SceneStringName(gui_input), callable_mp(this, &ColorPicker::_w_input));
-	w_edit->connect(SceneStringName(draw), callable_mp(this, &ColorPicker::_hsv_draw).bind(1, w_edit));
-
 	_update_controls();
 	updating = false;
 
@@ -2374,10 +2161,10 @@ ColorPicker::ColorPicker() {
 	swatches_vbc->add_child(palette_box);
 
 	btn_preset = memnew(Button);
-	btn_preset->set_text("Swatches");
+	btn_preset->set_text(ETR("Swatches"));
 	btn_preset->set_flat(true);
 	btn_preset->set_toggle_mode(true);
-	btn_preset->set_focus_mode(FOCUS_NONE);
+	btn_preset->set_focus_mode(FOCUS_ALL);
 	btn_preset->set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
 	btn_preset->set_h_size_flags(SIZE_EXPAND_FILL);
 	btn_preset->connect(SceneStringName(toggled), callable_mp(this, &ColorPicker::_show_hide_preset).bind(btn_preset, preset_container));
@@ -2385,12 +2172,16 @@ ColorPicker::ColorPicker() {
 
 	menu_btn = memnew(MenuButton);
 	menu_btn->set_flat(true);
+	menu_btn->set_focus_mode(FOCUS_ALL);
 	menu_btn->set_tooltip_text(ETR("Show all options available."));
+	menu_btn->set_accessibility_name(ETR("All Options"));
 	menu_btn->connect("about_to_popup", callable_mp(this, &ColorPicker::_update_menu_items));
 	palette_box->add_child(menu_btn);
 
 	options_menu = menu_btn->get_popup();
 	options_menu->connect(SceneStringName(id_pressed), callable_mp(this, &ColorPicker::_options_menu_cbk));
+	options_menu->connect("about_to_popup", callable_mp(this, &ColorPicker::_block_input_on_popup_show));
+	options_menu->connect(SNAME("popup_hide"), callable_mp(this, &ColorPicker::_enable_input_on_popup_hide));
 
 	palette_name = memnew(Label);
 	palette_name->hide();
@@ -2408,7 +2199,7 @@ ColorPicker::ColorPicker() {
 	btn_recent_preset = memnew(Button(ETR("Recent Colors")));
 	btn_recent_preset->set_flat(true);
 	btn_recent_preset->set_toggle_mode(true);
-	btn_recent_preset->set_focus_mode(FOCUS_NONE);
+	btn_recent_preset->set_focus_mode(FOCUS_ALL);
 	btn_recent_preset->set_text_alignment(HORIZONTAL_ALIGNMENT_LEFT);
 	btn_recent_preset->connect(SceneStringName(toggled), callable_mp(this, &ColorPicker::_show_hide_preset).bind(btn_recent_preset, recent_preset_hbc));
 	swatches_vbc->add_child(btn_recent_preset);
@@ -2420,13 +2211,17 @@ ColorPicker::ColorPicker() {
 	btn_add_preset = memnew(Button);
 	btn_add_preset->set_icon_alignment(HORIZONTAL_ALIGNMENT_CENTER);
 	btn_add_preset->set_tooltip_text(ETR("Add current color as a preset."));
+	btn_add_preset->set_accessibility_name(ETR("Add Preset"));
 	btn_add_preset->connect(SceneStringName(pressed), callable_mp(this, &ColorPicker::_add_preset_pressed));
 	preset_container->add_child(btn_add_preset);
 }
 
 ColorPicker::~ColorPicker() {
-	for (int i = 0; i < modes.size(); i++) {
-		delete modes[i];
+	for (ColorMode *mode : modes) {
+		memdelete(mode);
+	}
+	for (ColorPickerShape *shape : shapes) {
+		memdelete(shape);
 	}
 }
 
@@ -2442,6 +2237,9 @@ void ColorPickerPopupPanel::_input_from_window(const Ref<InputEvent> &p_event) {
 /////////////////
 
 void ColorPickerButton::_about_to_popup() {
+	if (!get_tree()->get_root()->is_embedding_subwindows()) {
+		get_viewport()->set_disable_input(true);
+	}
 	set_pressed(true);
 	if (picker) {
 		picker->set_old_color(color);
@@ -2450,6 +2248,7 @@ void ColorPickerButton::_about_to_popup() {
 
 void ColorPickerButton::_color_changed(const Color &p_color) {
 	color = p_color;
+	queue_accessibility_update();
 	queue_redraw();
 	emit_signal(SNAME("color_changed"), color);
 }
@@ -2461,6 +2260,9 @@ void ColorPickerButton::_modal_closed() {
 	}
 	emit_signal(SNAME("popup_closed"));
 	set_pressed(false);
+	if (!get_tree()->get_root()->is_embedding_subwindows()) {
+		get_viewport()->set_disable_input(false);
+	}
 }
 
 void ColorPickerButton::pressed() {
@@ -2484,13 +2286,24 @@ void ColorPickerButton::pressed() {
 	float v_offset = show_above ? -minsize.y : get_size().y;
 	popup->set_position(get_screen_position() + Vector2(h_offset, v_offset));
 	popup->popup();
-	if (DisplayServer::get_singleton()->has_hardware_keyboard()) {
+	if (!picker->is_hex_visible() && picker->get_picker_shape() != ColorPicker::SHAPE_NONE) {
+		callable_mp(picker, &ColorPicker::set_focus_on_picker_shape).call_deferred();
+	} else if (DisplayServer::get_singleton()->has_hardware_keyboard()) {
 		picker->set_focus_on_line_edit();
 	}
 }
 
 void ColorPickerButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_DIALOG);
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, color);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			const Rect2 r = Rect2(theme_cache.normal_style->get_offset(), get_size() - theme_cache.normal_style->get_minimum_size());
 			draw_texture_rect(theme_cache.background_icon, r, true);
@@ -2524,7 +2337,7 @@ void ColorPickerButton::set_pick_color(const Color &p_color) {
 	if (picker) {
 		picker->set_pick_color(p_color);
 	}
-
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2564,7 +2377,6 @@ void ColorPickerButton::_update_picker() {
 		picker->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
 		popup->add_child(picker);
 		add_child(popup, false, INTERNAL_MODE_FRONT);
-		popup->force_parent_owned();
 		picker->connect("color_changed", callable_mp(this, &ColorPickerButton::_color_changed));
 		popup->connect("about_to_popup", callable_mp(this, &ColorPickerButton::_about_to_popup));
 		popup->connect("popup_hide", callable_mp(this, &ColorPickerButton::_modal_closed));
@@ -2605,6 +2417,14 @@ ColorPickerButton::ColorPickerButton(const String &p_text) :
 
 void ColorPresetButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, preset_color);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			const Rect2 r = Rect2(Point2(0, 0), get_size());
 			Ref<StyleBox> sb_raw = theme_cache.foreground_style->duplicate();
@@ -2645,6 +2465,12 @@ void ColorPresetButton::_notification(int p_what) {
 			} else {
 				WARN_PRINT("Unsupported StyleBox used for ColorPresetButton. Use StyleBoxFlat or StyleBoxTexture instead.");
 			}
+
+			if (has_focus()) {
+				RID ci = get_canvas_item();
+				theme_cache.focus_style->draw(ci, Rect2(Point2(), get_size()));
+			}
+
 			if (preset_color.r > 1 || preset_color.g > 1 || preset_color.b > 1) {
 				// Draw an indicator to denote that the color is "overbright" and can't be displayed accurately in the preview
 				draw_texture(theme_cache.overbright_indicator, Vector2(0, 0));
@@ -2656,6 +2482,7 @@ void ColorPresetButton::_notification(int p_what) {
 
 void ColorPresetButton::set_preset_color(const Color &p_color) {
 	preset_color = p_color;
+	queue_accessibility_update();
 }
 
 Color ColorPresetButton::get_preset_color() const {
@@ -2664,6 +2491,7 @@ Color ColorPresetButton::get_preset_color() const {
 
 void ColorPresetButton::_bind_methods() {
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ColorPresetButton, foreground_style, "preset_fg");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, ColorPresetButton, focus_style, "preset_focus");
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_ICON, ColorPresetButton, background_icon, "preset_bg");
 	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, ColorPresetButton, overbright_indicator);
 }
diff --git a/engine/scene/gui/color_picker.h b/engine/scene/gui/color_picker.h
index cc2793b4..78fd5a61 100644
--- a/engine/scene/gui/color_picker.h
+++ b/engine/scene/gui/color_picker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLOR_PICKER_H
-#define COLOR_PICKER_H
+#pragma once
 
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
@@ -58,6 +57,7 @@ class ColorPresetButton : public BaseButton {
 
 	struct ThemeCache {
 		Ref<StyleBox> foreground_style;
+		Ref<StyleBox> focus_style;
 
 		Ref<Texture2D> background_icon;
 		Ref<Texture2D> overbright_indicator;
@@ -79,6 +79,13 @@ class ColorPicker : public VBoxContainer {
 	GDCLASS(ColorPicker, VBoxContainer);
 
 	// These classes poke into theme items for their internal logic.
+	friend class ColorPickerShape;
+	friend class ColorPickerShapeRectangle;
+	friend class ColorPickerShapeWheel;
+	friend class ColorPickerShapeCircle;
+	friend class ColorPickerShapeVHSCircle;
+	friend class ColorPickerShapeOKHSLCircle;
+
 	friend class ColorModeRGB;
 	friend class ColorModeHSV;
 	friend class ColorModeRAW;
@@ -126,12 +133,18 @@ private:
 #endif
 
 	int current_slider_count = SLIDER_COUNT;
-	static const int MODE_BUTTON_COUNT = 3;
-	const float WHEEL_RADIUS = 0.42;
+	Vector2i circle_keyboard_joypad_picker_cursor_position;
+
+	const float DEFAULT_GAMEPAD_EVENT_DELAY_MS = 1.0 / 2;
+	const float GAMEPAD_EVENT_REPEAT_RATE_MS = 1.0 / 30;
+	float gamepad_event_delay_ms = DEFAULT_GAMEPAD_EVENT_DELAY_MS;
+
+	static constexpr int MODE_BUTTON_COUNT = 3;
 
 	bool slider_theme_modified = true;
 
-	Vector<ColorMode *> modes;
+	LocalVector<ColorMode *> modes;
+	LocalVector<ColorPickerShape *> shapes;
 
 	Popup *picker_window = nullptr;
 	TextureRect *picker_texture_zoom = nullptr;
@@ -148,14 +161,7 @@ private:
 	PopupMenu *options_menu = nullptr;
 
 	MarginContainer *internal_margin = nullptr;
-	Control *uv_edit = nullptr;
-	Control *w_edit = nullptr;
-	AspectRatioContainer *wheel_edit = nullptr;
-	MarginContainer *wheel_margin = nullptr;
-	Ref<ShaderMaterial> wheel_mat;
-	Ref<ShaderMaterial> circle_mat;
-	Control *wheel = nullptr;
-	Control *wheel_uv = nullptr;
+	HBoxContainer *shape_container = nullptr;
 	TextureRect *sample = nullptr;
 	VBoxContainer *swatches_vbc = nullptr;
 	GridContainer *preset_container = nullptr;
@@ -179,6 +185,7 @@ private:
 	ColorPresetButton *selected_recent_preset = nullptr;
 	Ref<ButtonGroup> preset_group;
 	Ref<ButtonGroup> recent_preset_group;
+
 #ifdef TOOLS_ENABLED
 	Callable quick_open_callback;
 	Callable palette_saved_callback;
@@ -251,6 +258,9 @@ private:
 
 		bool center_slider_grabbers = true;
 
+		Ref<StyleBox> picker_focus_rectangle;
+		Ref<StyleBox> picker_focus_circle;
+		Color focused_not_editing_cursor_color;
 		Ref<Texture2D> menu_option;
 		Ref<Texture2D> screen_picker;
 		Ref<Texture2D> expanded_arrow;
@@ -264,6 +274,7 @@ private:
 		Ref<Texture2D> bar_arrow;
 		Ref<Texture2D> sample_bg;
 		Ref<Texture2D> sample_revert;
+		Ref<StyleBox> sample_focus;
 		Ref<Texture2D> overbright_indicator;
 		Ref<Texture2D> picker_cursor;
 		Ref<Texture2D> picker_cursor_bg;
@@ -278,7 +289,6 @@ private:
 	void _copy_color_to_hsv();
 	void _copy_hsv_to_color();
 
-	PickerShapeType _get_actual_shape() const;
 	void create_slider(GridContainer *gc, int idx);
 	void _reset_sliders_theme();
 	void _html_submitted(const String &p_html);
@@ -291,11 +301,8 @@ private:
 	void _text_type_toggled();
 	void _sample_input(const Ref<InputEvent> &p_event);
 	void _sample_draw();
-	void _hsv_draw(int p_which, Control *c);
 	void _slider_draw(int p_which);
 
-	void _uv_input(const Ref<InputEvent> &p_event, Control *c);
-	void _w_input(const Ref<InputEvent> &p_event);
 	void _slider_or_spin_input(const Ref<InputEvent> &p_event);
 	void _line_edit_input(const Ref<InputEvent> &p_event);
 	void _preset_input(const Ref<InputEvent> &p_event, const Color &p_color);
@@ -308,6 +315,12 @@ private:
 	void _pick_finished();
 	void _update_menu_items();
 	void _options_menu_cbk(int p_which);
+	void _block_input_on_popup_show();
+	void _enable_input_on_popup_hide();
+
+	// Native color picking.
+	void _pick_button_pressed_native();
+	void _native_cb(bool p_status, const Color &p_color);
 
 	// Legacy color picking.
 	void _pick_button_pressed_legacy();
@@ -347,6 +360,7 @@ public:
 	static void finish_shaders();
 
 	void add_mode(ColorMode *p_mode);
+	void add_shape(ColorPickerShape *p_shape);
 
 	void set_edit_alpha(bool p_show);
 	bool is_editing_alpha() const;
@@ -405,6 +419,7 @@ public:
 	bool is_hex_visible() const;
 
 	void set_focus_on_line_edit();
+	void set_focus_on_picker_shape();
 
 	ColorPicker();
 	~ColorPicker();
@@ -460,5 +475,3 @@ public:
 
 VARIANT_ENUM_CAST(ColorPicker::PickerShapeType);
 VARIANT_ENUM_CAST(ColorPicker::ColorModeType);
-
-#endif // COLOR_PICKER_H
diff --git a/engine/scene/gui/color_picker_shape.cpp b/engine/scene/gui/color_picker_shape.cpp
new file mode 100644
index 00000000..3e961474
--- /dev/null
+++ b/engine/scene/gui/color_picker_shape.cpp
@@ -0,0 +1,771 @@
+/**************************************************************************/
+/*  color_picker_shape.cpp                                                */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "color_picker_shape.h"
+
+#include "scene/gui/margin_container.h"
+
+void ColorPickerShape::_emit_color_changed() {
+	color_picker->emit_signal(SNAME("color_changed"), color_picker->color);
+}
+
+bool ColorPickerShape::can_handle(const Ref<InputEvent> &p_event, Vector2 &r_position, bool *r_is_click) {
+	Ref<InputEventMouseButton> mb = p_event;
+	if (mb.is_valid()) {
+		if (mb->get_button_index() != MouseButton::LEFT) {
+			return false;
+		}
+
+		if (r_is_click) {
+			*r_is_click = true;
+		}
+
+		if (mb->is_pressed()) {
+			is_dragging = true;
+			r_position = mb->get_position();
+			return true;
+		} else {
+			_emit_color_changed();
+			color_picker->add_recent_preset(color_picker->color);
+			is_dragging = false;
+			return false;
+		}
+	}
+
+	Ref<InputEventMouseMotion> mm = p_event;
+	if (is_dragging && mm.is_valid()) {
+		r_position = mm->get_position();
+		return true;
+	}
+	return false;
+}
+
+void ColorPickerShape::apply_color() {
+	color_picker->_copy_hsv_to_color();
+	color_picker->last_color = color_picker->color;
+	color_picker->set_pick_color(color_picker->color);
+
+	if (!color_picker->deferred_mode_enabled) {
+		_emit_color_changed();
+	}
+}
+
+void ColorPickerShape::cancel_event() {
+	is_dragging = false;
+}
+
+void ColorPickerShape::draw_focus_rect(Control *p_control, const Rect2 &p_rect) {
+	if (!p_control->has_focus()) {
+		return;
+	}
+
+	Rect2 focus_rect;
+	if (p_rect.has_area()) {
+		focus_rect = p_rect;
+	} else {
+		focus_rect = Rect2(Vector2(), p_control->get_size());
+	}
+
+	const RID ci = p_control->get_canvas_item();
+	if (!cursor_editing) {
+		RenderingServer::get_singleton()->canvas_item_add_rect(ci, focus_rect, color_picker->theme_cache.focused_not_editing_cursor_color);
+	}
+	color_picker->theme_cache.picker_focus_rectangle->draw(ci, focus_rect);
+}
+
+void ColorPickerShape::draw_focus_circle(Control *p_control) {
+	if (!p_control->has_focus()) {
+		return;
+	}
+
+	const Rect2 focus_rect(Vector2(), p_control->get_size());
+	const RID ci = p_control->get_canvas_item();
+	if (!cursor_editing) {
+		RenderingServer::get_singleton()->canvas_item_add_circle(ci, focus_rect.get_center(), focus_rect.get_size().y * 0.5, color_picker->theme_cache.focused_not_editing_cursor_color);
+	}
+	color_picker->theme_cache.picker_focus_circle->draw(ci, focus_rect);
+}
+
+void ColorPickerShape::draw_sv_square(Control *p_control, const Rect2 &p_square, bool p_draw_focus) {
+	const Vector2 end = p_square.get_end();
+	PackedVector2Array points = {
+		p_square.position,
+		Vector2(end.x, p_square.position.y),
+		end,
+		Vector2(p_square.position.x, end.y),
+	};
+
+	Color color1 = color_picker->color;
+	color1.set_hsv(color_picker->h, 1, 1);
+	Color color2 = color1;
+	color2.set_hsv(color_picker->h, 1, 0);
+
+	PackedColorArray colors = {
+		Color(1, 1, 1, 1),
+		Color(1, 1, 1, 1),
+		Color(0, 0, 0, 1),
+		Color(0, 0, 0, 1)
+	};
+	p_control->draw_polygon(points, colors);
+
+	colors = {
+		Color(color1, 0),
+		Color(color1, 1),
+		Color(color2, 1),
+		Color(color2, 0)
+	};
+	p_control->draw_polygon(points, colors);
+
+	Vector2 cursor_pos;
+	cursor_pos.x = CLAMP(p_square.position.x + p_square.size.x * color_picker->s, p_square.position.x, end.x);
+	cursor_pos.y = CLAMP(p_square.position.y + p_square.size.y * (1.0 - color_picker->v), p_square.position.y, end.y);
+
+	if (p_draw_focus) {
+		draw_focus_rect(p_control, p_square);
+	}
+	draw_cursor(p_control, cursor_pos);
+}
+
+void ColorPickerShape::draw_cursor(Control *p_control, const Vector2 &p_center, bool p_draw_bg) {
+	const Vector2 position = p_center - color_picker->theme_cache.picker_cursor->get_size() * 0.5;
+	if (p_draw_bg) {
+		p_control->draw_texture(color_picker->theme_cache.picker_cursor_bg, position, Color(color_picker->color, 1.0));
+	}
+	p_control->draw_texture(color_picker->theme_cache.picker_cursor, position);
+}
+
+void ColorPickerShape::draw_circle_cursor(Control *p_control, float p_hue) {
+	const Vector2 center = p_control->get_size() * 0.5;
+	const Vector2 cursor_pos(
+			center.x + (center.x * Math::cos(p_hue * Math::TAU) * color_picker->s),
+			center.y + (center.y * Math::sin(p_hue * Math::TAU) * color_picker->s));
+
+	draw_cursor(p_control, cursor_pos);
+}
+
+void ColorPickerShape::connect_shape_focus(Control *p_shape) {
+	p_shape->set_focus_mode(Control::FOCUS_ALL);
+	p_shape->connect(SceneStringName(focus_entered), callable_mp(this, &ColorPickerShape::shape_focus_entered));
+	p_shape->connect(SceneStringName(focus_exited), callable_mp(this, &ColorPickerShape::shape_focus_exited));
+}
+
+void ColorPickerShape::shape_focus_entered() {
+	Input *input = Input::get_singleton();
+	if (!(input->is_action_pressed("ui_up") || input->is_action_pressed("ui_down") || input->is_action_pressed("ui_left") || input->is_action_pressed("ui_right"))) {
+		cursor_editing = true;
+	}
+}
+
+void ColorPickerShape::shape_focus_exited() {
+	cursor_editing = false;
+}
+
+void ColorPickerShape::handle_cursor_editing(const Ref<InputEvent> &p_event, Control *p_control) {
+	if (p_event->is_action_pressed("ui_accept", false, true)) {
+		cursor_editing = !cursor_editing;
+		p_control->queue_redraw();
+		color_picker->accept_event();
+	}
+
+	if (cursor_editing && p_event->is_action_pressed("ui_cancel", false, true)) {
+		cursor_editing = false;
+		p_control->queue_redraw();
+		color_picker->accept_event();
+	}
+
+	if (!cursor_editing) {
+		return;
+	}
+
+	Input *input = Input::get_singleton();
+	bool is_joypad_event = Object::cast_to<InputEventJoypadMotion>(p_event.ptr()) || Object::cast_to<InputEventJoypadButton>(p_event.ptr());
+
+	if (p_event->is_action_pressed("ui_left", true) || p_event->is_action_pressed("ui_right", true) || p_event->is_action_pressed("ui_up", true) || p_event->is_action_pressed("ui_down", true)) {
+		if (is_joypad_event) {
+			if (color_picker->is_processing_internal()) {
+				color_picker->accept_event();
+				return;
+			}
+			color_picker->set_process_internal(true);
+		}
+
+		Vector2 color_change_vector = Vector2(
+				input->is_action_pressed("ui_right") - input->is_action_pressed("ui_left"),
+				input->is_action_pressed("ui_down") - input->is_action_pressed("ui_up"));
+		update_cursor(color_change_vector, p_event->is_echo());
+		color_picker->accept_event();
+	}
+}
+
+int ColorPickerShape::get_edge_h_change(const Vector2 &p_color_change_vector) {
+	int h_change = 0;
+
+	if (color_picker->h > 0 && color_picker->h < 0.5) {
+		h_change -= p_color_change_vector.x;
+	} else if (color_picker->h > 0.5 && color_picker->h < 1) {
+		h_change += p_color_change_vector.x;
+	}
+
+	if (color_picker->h > 0.25 && color_picker->h < 0.75) {
+		h_change -= p_color_change_vector.y;
+	} else if (color_picker->h < 0.25 || color_picker->h > 0.75) {
+		h_change += p_color_change_vector.y;
+	}
+	return h_change;
+}
+
+float ColorPickerShape::get_h_on_circle_edge(const Vector2 &p_color_change_vector) {
+	int h_change = get_edge_h_change(p_color_change_vector);
+
+	float target_h = Math::wrapf(color_picker->h + h_change / 360.0, 0, 1);
+	int current_quarter = color_picker->h * 4;
+	int future_quarter = target_h * 4;
+	if (p_color_change_vector.y > 0 && ((future_quarter == 0 && current_quarter == 1) || (future_quarter == 1 && current_quarter == 0))) {
+		target_h = 0.25f;
+	} else if (p_color_change_vector.y < 0 && ((future_quarter == 2 && current_quarter == 3) || (future_quarter == 3 && current_quarter == 2))) {
+		target_h = 0.75f;
+	} else if (p_color_change_vector.x < 0 && ((future_quarter == 1 && current_quarter == 2) || (future_quarter == 2 && current_quarter == 1))) {
+		target_h = 0.5f;
+	} else if (p_color_change_vector.x > 0 && ((future_quarter == 3 && current_quarter == 0) || (future_quarter == 0 && current_quarter == 3))) {
+		target_h = 0;
+	}
+	return target_h;
+}
+
+void ColorPickerShape::initialize_controls() {
+	_initialize_controls();
+	update_theme();
+	is_initialized = true;
+}
+
+void ColorPickerShape::update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) {
+	if (p_color_change_vector.is_zero_approx()) {
+		echo_multiplier = 1.0;
+	} else {
+		echo_multiplier = p_is_echo ? CLAMP(echo_multiplier * 1.1, 1, 25) : 1;
+		_update_cursor(p_color_change_vector * echo_multiplier, p_is_echo);
+		apply_color();
+	}
+}
+
+ColorPickerShape::ColorPickerShape(ColorPicker *p_color_picker) {
+	color_picker = p_color_picker;
+}
+
+void ColorPickerShapeRectangle::_sv_square_input(const Ref<InputEvent> &p_event) {
+	handle_cursor_editing(p_event, sv_square);
+
+	Vector2 event_position;
+	if (!can_handle(p_event, event_position)) {
+		return;
+	}
+	event_position = (event_position / sv_square->get_size()).clampf(0.0, 1.0);
+
+	color_picker->s = event_position.x;
+	color_picker->v = 1.0 - event_position.y;
+
+	apply_color();
+}
+
+void ColorPickerShapeRectangle::_hue_slider_input(const Ref<InputEvent> &p_event) {
+	handle_cursor_editing(p_event, hue_slider);
+
+	Vector2 event_position;
+	if (!can_handle(p_event, event_position)) {
+		return;
+	}
+	color_picker->h = CLAMP(event_position.y / hue_slider->get_size().y, 0.0, 1.0);
+	apply_color();
+}
+
+void ColorPickerShapeRectangle::_sv_square_draw() {
+	draw_sv_square(sv_square, Rect2(Vector2(), sv_square->get_size()));
+}
+
+void ColorPickerShapeRectangle::_hue_slider_draw() {
+	const Vector2 size = hue_slider->get_size();
+	hue_slider->draw_texture_rect(color_picker->theme_cache.color_hue, Rect2(0, 0, -size.y, size.x), false, Color(1, 1, 1), true);
+
+	draw_focus_rect(hue_slider);
+
+	int y = size.y * color_picker->h;
+	const Color color = Color::from_hsv(color_picker->h, 1, 1);
+	hue_slider->draw_line(Vector2(0, y), Vector2(size.x, y), color.inverted());
+}
+
+void ColorPickerShapeRectangle::_initialize_controls() {
+	sv_square = memnew(Control);
+	color_picker->shape_container->add_child(sv_square);
+	sv_square->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeRectangle::_sv_square_input));
+	sv_square->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeRectangle::_sv_square_draw));
+	connect_shape_focus(sv_square);
+
+	hue_slider = memnew(Control);
+	color_picker->shape_container->add_child(hue_slider);
+	hue_slider->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeRectangle::_hue_slider_input));
+	hue_slider->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeRectangle::_hue_slider_draw));
+	connect_shape_focus(hue_slider);
+
+	controls.append(sv_square);
+	controls.append(hue_slider);
+}
+
+void ColorPickerShapeRectangle::_update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) {
+	if (sv_square->has_focus()) {
+		color_picker->s = CLAMP(color_picker->s + p_color_change_vector.x / 100.0, 0, 1);
+		color_picker->v = CLAMP(color_picker->v - p_color_change_vector.y / 100.0, 0, 1);
+	} else if (hue_slider->has_focus()) {
+		color_picker->h = CLAMP(color_picker->h + p_color_change_vector.y * echo_multiplier / 360.0, 0, 1);
+	}
+}
+
+void ColorPickerShapeRectangle::update_theme() {
+	const ColorPicker::ThemeCache &theme_cache = color_picker->theme_cache;
+	sv_square->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
+	hue_slider->set_custom_minimum_size(Size2(theme_cache.h_width, 0));
+}
+
+void ColorPickerShapeRectangle::grab_focus() {
+	hue_slider->grab_focus();
+}
+
+float ColorPickerShapeWheel::_get_h_on_wheel(const Vector2 &p_color_change_vector) {
+	int h_change = get_edge_h_change(p_color_change_vector);
+
+	float target_h = Math::wrapf(color_picker->h + h_change / 360.0, 0, 1);
+	int current_quarter = color_picker->h * 4;
+	int future_quarter = target_h * 4;
+
+	if (p_color_change_vector.y > 0 && ((future_quarter == 0 && current_quarter == 1) || (future_quarter == 1 && current_quarter == 0))) {
+		rotate_next_echo_event = !rotate_next_echo_event;
+	} else if (p_color_change_vector.y < 0 && ((future_quarter == 2 && current_quarter == 3) || (future_quarter == 3 && current_quarter == 2))) {
+		rotate_next_echo_event = !rotate_next_echo_event;
+	} else if (p_color_change_vector.x < 0 && ((future_quarter == 1 && current_quarter == 2) || (future_quarter == 2 && current_quarter == 1))) {
+		rotate_next_echo_event = !rotate_next_echo_event;
+	} else if (p_color_change_vector.x > 0 && ((future_quarter == 3 && current_quarter == 0) || (future_quarter == 0 && current_quarter == 3))) {
+		rotate_next_echo_event = !rotate_next_echo_event;
+	}
+
+	return target_h;
+}
+
+void ColorPickerShapeWheel::_reset_wheel_focus() {
+	wheel_focused = true;
+}
+
+void ColorPickerShapeWheel::_wheel_input(const Ref<InputEvent> &p_event) {
+	handle_cursor_editing(p_event, wheel_uv);
+	if (!cursor_editing) {
+		// Wheel and inner square are the same control, so focus has to be moved manually.
+		if (!wheel_focused && p_event->is_action_pressed("ui_down", true)) {
+			wheel_focused = true;
+			wheel_uv->queue_redraw();
+			color_picker->accept_event();
+			return;
+		} else if (wheel_focused && p_event->is_action_pressed("ui_up", true)) {
+			wheel_focused = false;
+			wheel_uv->queue_redraw();
+			color_picker->accept_event();
+			return;
+		}
+	}
+
+	Vector2 event_position;
+	bool is_click = false;
+	if (!can_handle(p_event, event_position, &is_click)) {
+		if (is_click) {
+			// Released mouse button while dragging wheel.
+			spinning = false;
+		}
+		return;
+	}
+	const Vector2 uv_size = wheel_uv->get_size();
+	const Vector2 ring_radius = uv_size * Math::SQRT12 * WHEEL_RADIUS;
+	const Vector2 center = uv_size * 0.5;
+
+	if (is_click && !spinning) {
+		real_t dist = center.distance_to(event_position);
+		if (dist >= center.x * WHEEL_RADIUS * 2.0 && dist <= center.x) {
+			spinning = true;
+			if (!wheel_focused) {
+				cursor_editing = true;
+				wheel_focused = true;
+			}
+		} else if (dist > center.x) {
+			// Clicked outside the wheel.
+			cancel_event();
+			return;
+		}
+	};
+
+	if (spinning) {
+		real_t rad = center.angle_to_point(event_position);
+		color_picker->h = ((rad >= 0) ? rad : (Math::TAU + rad)) / Math::TAU;
+		apply_color();
+		return;
+	}
+
+	const Rect2 uv_rect(center - ring_radius, ring_radius * 2.0);
+	event_position -= uv_rect.position;
+	event_position /= uv_rect.size;
+
+	if (is_click && (event_position.x < 0 || event_position.x > 1 || event_position.y < 0 || event_position.y > 1)) {
+		// Clicked inside the wheel, but outside the square.
+		cancel_event();
+		return;
+	}
+
+	event_position = event_position.clampf(0.0, 1.0);
+
+	color_picker->s = event_position.x;
+	color_picker->v = 1.0 - event_position.y;
+	if (wheel_focused) {
+		cursor_editing = true;
+		wheel_focused = false;
+	}
+
+	apply_color();
+}
+
+void ColorPickerShapeWheel::_wheel_draw() {
+	wheel->draw_rect(Rect2(Point2(), wheel->get_size()), Color(1, 1, 1));
+}
+
+void ColorPickerShapeWheel::_wheel_uv_draw() {
+	const Vector2 uv_size = wheel_uv->get_size();
+	const Vector2 ring_radius = uv_size * Math::SQRT12 * WHEEL_RADIUS;
+	const Vector2 center = uv_size * 0.5;
+
+	const Rect2 uv_rect(center - ring_radius, ring_radius * 2.0);
+	draw_sv_square(wheel_uv, uv_rect, !wheel_focused);
+	if (wheel_focused) {
+		draw_focus_circle(wheel_uv);
+	}
+
+	float radius = WHEEL_RADIUS * 2.0;
+	radius += (1.0 - radius) * 0.5;
+	const Vector2 cursor_pos = center +
+			Vector2(center.x * Math::cos(color_picker->h * Math::TAU) * radius,
+					center.y * Math::sin(color_picker->h * Math::TAU) * radius);
+	draw_cursor(wheel_uv, cursor_pos, false);
+}
+
+void ColorPickerShapeWheel::_initialize_controls() {
+	wheel_margin = memnew(MarginContainer);
+	color_picker->shape_container->add_child(wheel_margin);
+
+	Ref<ShaderMaterial> material;
+	material.instantiate();
+	material->set_shader(ColorPicker::wheel_shader);
+	material->set_shader_parameter("wheel_radius", WHEEL_RADIUS);
+
+	wheel = memnew(Control);
+	wheel->set_material(material);
+	wheel_margin->add_child(wheel);
+	wheel->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeWheel::_wheel_draw));
+
+	wheel_uv = memnew(Control);
+	wheel_margin->add_child(wheel_uv);
+	wheel_uv->connect(SceneStringName(focus_entered), callable_mp(this, &ColorPickerShapeWheel::_reset_wheel_focus));
+	wheel_uv->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeWheel::_wheel_input));
+	wheel_uv->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeWheel::_wheel_uv_draw));
+	connect_shape_focus(wheel_uv);
+
+	controls.append(wheel_margin);
+	controls.append(wheel);
+	controls.append(wheel_uv);
+}
+
+void ColorPickerShapeWheel::_update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) {
+	if (wheel_focused) {
+		if (p_is_echo && rotate_next_echo_event) {
+			color_picker->h = _get_h_on_wheel(-p_color_change_vector);
+		} else {
+			rotate_next_echo_event = false;
+			color_picker->h = _get_h_on_wheel(p_color_change_vector);
+		}
+	} else {
+		color_picker->s = CLAMP(color_picker->s + p_color_change_vector.x / 100.0, 0, 1);
+		color_picker->v = CLAMP(color_picker->v - p_color_change_vector.y / 100.0, 0, 1);
+	}
+}
+
+void ColorPickerShapeWheel::update_theme() {
+	const ColorPicker::ThemeCache &theme_cache = color_picker->theme_cache;
+	wheel_margin->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
+	wheel_margin->add_theme_constant_override(SNAME("margin_bottom"), 8 * theme_cache.base_scale);
+}
+
+void ColorPickerShapeWheel::grab_focus() {
+	wheel_uv->grab_focus();
+}
+
+void ColorPickerShapeCircle::update_circle_cursor(const Vector2 &p_color_change_vector, const Vector2 &p_center, const Vector2 &p_hue_offset) {
+	if (circle_keyboard_joypad_picker_cursor_position == Vector2i()) {
+		circle_keyboard_joypad_picker_cursor_position = p_center + p_hue_offset;
+	}
+
+	Vector2i potential_cursor_position = circle_keyboard_joypad_picker_cursor_position + p_color_change_vector;
+	real_t potential_new_cursor_distance = p_center.distance_to(potential_cursor_position);
+	real_t dist_pre = p_center.distance_to(circle_keyboard_joypad_picker_cursor_position);
+	if (color_picker->s < 1 || potential_new_cursor_distance < dist_pre) {
+		circle_keyboard_joypad_picker_cursor_position += p_color_change_vector;
+		real_t dist = p_center.distance_to(circle_keyboard_joypad_picker_cursor_position);
+		real_t rad = p_center.angle_to_point(circle_keyboard_joypad_picker_cursor_position);
+		color_picker->h = ((rad >= 0) ? rad : (Math::TAU + rad)) / Math::TAU;
+		color_picker->s = CLAMP(dist / p_center.x, 0, 1);
+	} else {
+		color_picker->h = get_h_on_circle_edge(p_color_change_vector);
+		circle_keyboard_joypad_picker_cursor_position = Vector2i();
+	}
+}
+
+void ColorPickerShapeCircle::_initialize_controls() {
+	circle_margin = memnew(MarginContainer);
+	color_picker->shape_container->add_child(circle_margin);
+
+	Ref<ShaderMaterial> material;
+	material.instantiate();
+	material->set_shader(_get_shader());
+
+	circle = memnew(Control);
+	circle->set_material(material);
+	circle_margin->add_child(circle);
+	circle->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeCircle::_circle_draw));
+
+	circle_overlay = memnew(Control);
+	circle_overlay->set_anchors_and_offsets_preset(Control::PRESET_FULL_RECT);
+	circle->add_child(circle_overlay);
+	circle_overlay->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeCircle::_circle_input));
+	circle_overlay->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeCircle::_circle_overlay_draw));
+	connect_shape_focus(circle_overlay);
+
+	value_slider = memnew(Control);
+	color_picker->shape_container->add_child(value_slider);
+	value_slider->connect(SceneStringName(gui_input), callable_mp(this, &ColorPickerShapeCircle::_value_slider_input));
+	value_slider->connect(SceneStringName(draw), callable_mp(this, &ColorPickerShapeCircle::_value_slider_draw));
+	connect_shape_focus(value_slider);
+
+	controls.append(circle_margin);
+	controls.append(circle);
+	controls.append(circle_overlay);
+	controls.append(value_slider);
+}
+
+void ColorPickerShapeCircle::update_theme() {
+	const ColorPicker::ThemeCache &theme_cache = color_picker->theme_cache;
+	circle_margin->set_custom_minimum_size(Size2(theme_cache.sv_width, theme_cache.sv_height));
+	circle_margin->add_theme_constant_override(SNAME("margin_bottom"), 8 * theme_cache.base_scale);
+	value_slider->set_custom_minimum_size(Size2(theme_cache.h_width, 0));
+}
+
+void ColorPickerShapeCircle::grab_focus() {
+	circle_overlay->grab_focus();
+}
+
+void ColorPickerShapeVHSCircle::_circle_input(const Ref<InputEvent> &p_event) {
+	handle_cursor_editing(p_event, circle_overlay);
+
+	Vector2 event_position;
+	bool is_click = false;
+	if (!can_handle(p_event, event_position, &is_click)) {
+		return;
+	}
+
+	Vector2 center = circle->get_size() * 0.5;
+	real_t dist = center.distance_to(event_position);
+	if (is_click && dist > center.x) {
+		// Clicked outside the circle.
+		cancel_event();
+		return;
+	}
+
+	real_t rad = center.angle_to_point(event_position);
+	color_picker->h = ((rad >= 0) ? rad : (Math::TAU + rad)) / Math::TAU;
+	color_picker->s = CLAMP(dist / center.x, 0, 1);
+	color_picker->ok_hsl_h = color_picker->h;
+	color_picker->ok_hsl_s = color_picker->s;
+	circle_keyboard_joypad_picker_cursor_position = Vector2i();
+
+	apply_color();
+}
+
+void ColorPickerShapeVHSCircle::_value_slider_input(const Ref<InputEvent> &p_event) {
+	handle_cursor_editing(p_event, value_slider);
+
+	Vector2 event_position;
+	if (!can_handle(p_event, event_position)) {
+		return;
+	}
+	color_picker->v = 1.0 - CLAMP(event_position.y / value_slider->get_size().y, 0.0, 1.0);
+	apply_color();
+}
+
+void ColorPickerShapeVHSCircle::_circle_draw() {
+	Ref<ShaderMaterial> material = circle->get_material();
+	material->set_shader_parameter(SNAME("v"), color_picker->v);
+	circle->draw_rect(Rect2(Point2(), circle->get_size()), Color(1, 1, 1));
+}
+
+void ColorPickerShapeVHSCircle::_circle_overlay_draw() {
+	draw_focus_circle(circle_overlay);
+	draw_circle_cursor(circle_overlay, color_picker->h);
+}
+
+void ColorPickerShapeVHSCircle::_value_slider_draw() {
+	const Vector2 size = value_slider->get_size();
+	PackedVector2Array points{
+		Vector2(),
+		Vector2(size.x, 0),
+		size,
+		Vector2(0, size.y)
+	};
+
+	Color color = Color::from_hsv(color_picker->h, color_picker->s, 1);
+	PackedColorArray colors = {
+		color,
+		color,
+		Color(),
+		Color()
+	};
+
+	value_slider->draw_polygon(points, colors);
+
+	draw_focus_rect(value_slider);
+
+	int y = size.y * (1 - CLAMP(color_picker->v, 0, 1));
+	color.set_hsv(color_picker->h, 1, color_picker->v);
+	value_slider->draw_line(Vector2(0, y), Vector2(size.x, y), color.inverted());
+}
+
+void ColorPickerShapeVHSCircle::_update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) {
+	if (circle_overlay->has_focus()) {
+		const Vector2 center = circle_overlay->get_size() / 2.0;
+		const Vector2 hue_offset = center * Vector2(Math::cos(color_picker->h * Math::TAU), Math::sin(color_picker->h * Math::TAU)) * color_picker->s;
+		update_circle_cursor(p_color_change_vector, center, hue_offset);
+	} else if (value_slider->has_focus()) {
+		color_picker->v = CLAMP(color_picker->v - p_color_change_vector.y * echo_multiplier / 100.0, 0, 1);
+	}
+}
+
+void ColorPickerShapeOKHSLCircle::_circle_input(const Ref<InputEvent> &p_event) {
+	handle_cursor_editing(p_event, circle_overlay);
+
+	Vector2 event_position;
+	bool is_click = false;
+	if (!can_handle(p_event, event_position, &is_click)) {
+		return;
+	}
+
+	const Vector2 center = circle->get_size() * 0.5;
+	real_t dist = center.distance_to(event_position);
+	if (is_click && dist > center.x) {
+		// Clicked outside the circle.
+		cancel_event();
+		return;
+	}
+
+	real_t rad = center.angle_to_point(event_position);
+	color_picker->h = ((rad >= 0) ? rad : (Math::TAU + rad)) / Math::TAU;
+	color_picker->s = CLAMP(dist / center.x, 0, 1);
+	color_picker->ok_hsl_h = color_picker->h;
+	color_picker->ok_hsl_s = color_picker->s;
+	circle_keyboard_joypad_picker_cursor_position = Vector2i();
+
+	apply_color();
+}
+
+void ColorPickerShapeOKHSLCircle::_value_slider_input(const Ref<InputEvent> &p_event) {
+	handle_cursor_editing(p_event, value_slider);
+
+	Vector2 event_position;
+	if (!can_handle(p_event, event_position)) {
+		return;
+	}
+	color_picker->ok_hsl_l = 1.0 - CLAMP(event_position.y / value_slider->get_size().y, 0.0, 1.0);
+	apply_color();
+}
+
+void ColorPickerShapeOKHSLCircle::_circle_draw() {
+	Ref<ShaderMaterial> material = circle->get_material();
+	material->set_shader_parameter(SNAME("ok_hsl_l"), color_picker->ok_hsl_l);
+	circle->draw_rect(Rect2(Point2(), circle->get_size()), Color(1, 1, 1));
+}
+
+void ColorPickerShapeOKHSLCircle::_circle_overlay_draw() {
+	draw_focus_circle(circle_overlay);
+	draw_circle_cursor(circle_overlay, color_picker->ok_hsl_h);
+}
+
+void ColorPickerShapeOKHSLCircle::_value_slider_draw() {
+	const float ok_hsl_h = color_picker->ok_hsl_h;
+	const float ok_hsl_s = color_picker->ok_hsl_s;
+	const float ok_hsl_l = color_picker->ok_hsl_l;
+
+	const Vector2 size = value_slider->get_size();
+	PackedVector2Array points{
+		Vector2(size.x, 0),
+		Vector2(size.x, size.y * 0.5),
+		size,
+		Vector2(0, size.y),
+		Vector2(0, size.y * 0.5),
+		Vector2()
+	};
+
+	Color color1 = Color::from_ok_hsl(ok_hsl_h, ok_hsl_s, 1);
+	Color color2 = Color::from_ok_hsl(ok_hsl_h, ok_hsl_s, 0.5);
+	Color color3 = Color::from_ok_hsl(ok_hsl_h, ok_hsl_s, 0);
+	PackedColorArray colors = {
+		color1,
+		color2,
+		color3,
+		color3,
+		color2,
+		color1,
+	};
+	value_slider->draw_polygon(points, colors);
+
+	draw_focus_rect(value_slider);
+
+	int y = size.y * (1 - CLAMP(ok_hsl_l, 0, 1));
+	value_slider->draw_line(Vector2(0, y), Vector2(size.x, y), Color::from_hsv(ok_hsl_h, 1, ok_hsl_l).inverted());
+}
+
+void ColorPickerShapeOKHSLCircle::_update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) {
+	if (circle_overlay->has_focus()) {
+		const Vector2 center = circle_overlay->get_size() / 2.0;
+		const Vector2 hue_offset = center * Vector2(Math::cos(color_picker->ok_hsl_h * Math::TAU), Math::sin(color_picker->ok_hsl_h * Math::TAU)) * color_picker->ok_hsl_s;
+		update_circle_cursor(p_color_change_vector, center, hue_offset);
+		color_picker->ok_hsl_h = color_picker->h;
+		color_picker->ok_hsl_s = color_picker->s;
+	} else if (value_slider->has_focus()) {
+		color_picker->ok_hsl_l = CLAMP(color_picker->ok_hsl_l - p_color_change_vector.y * echo_multiplier / 100.0, 0, 1);
+	}
+}
diff --git a/engine/scene/gui/color_picker_shape.h b/engine/scene/gui/color_picker_shape.h
new file mode 100644
index 00000000..bb87a289
--- /dev/null
+++ b/engine/scene/gui/color_picker_shape.h
@@ -0,0 +1,215 @@
+/**************************************************************************/
+/*  color_picker_shape.h                                                  */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "scene/gui/color_picker.h"
+
+class ColorPickerShape : public Object {
+	GDCLASS(ColorPickerShape, Object);
+
+	void _emit_color_changed();
+
+protected:
+	ColorPicker *color_picker = nullptr;
+	bool is_dragging = false;
+
+	virtual void _initialize_controls() = 0;
+	virtual void _update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) = 0;
+
+	bool can_handle(const Ref<InputEvent> &p_event, Vector2 &r_position, bool *r_is_click = nullptr);
+	void apply_color();
+	void cancel_event();
+
+	void draw_focus_rect(Control *p_control, const Rect2 &p_rect = Rect2());
+	void draw_focus_circle(Control *p_control);
+	void draw_sv_square(Control *p_control, const Rect2 &p_square, bool p_draw_focus = true);
+	void draw_cursor(Control *p_control, const Vector2 &p_center, bool p_draw_bg = true);
+	void draw_circle_cursor(Control *p_control, float p_hue);
+
+	void connect_shape_focus(Control *p_shape);
+	void shape_focus_entered();
+	void shape_focus_exited();
+
+	void handle_cursor_editing(const Ref<InputEvent> &p_event, Control *p_control);
+	int get_edge_h_change(const Vector2 &p_color_change_vector);
+	float get_h_on_circle_edge(const Vector2 &p_color_change_vector);
+
+public:
+	Vector<Control *> controls;
+	bool is_initialized = false;
+	bool cursor_editing = false;
+	float echo_multiplier = 1;
+
+	virtual String get_name() const = 0;
+	virtual Ref<Texture2D> get_icon() const = 0;
+	virtual bool is_ok_hsl() const { return false; }
+
+	void initialize_controls();
+	virtual void update_theme() = 0;
+	void update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo);
+	virtual void grab_focus() = 0;
+
+	ColorPickerShape(ColorPicker *p_color_picker);
+};
+
+class ColorPickerShapeRectangle : public ColorPickerShape {
+	Control *sv_square = nullptr;
+	Control *hue_slider = nullptr;
+
+	void _sv_square_input(const Ref<InputEvent> &p_event);
+	void _hue_slider_input(const Ref<InputEvent> &p_event);
+
+	void _sv_square_draw();
+	void _hue_slider_draw();
+
+protected:
+	virtual void _initialize_controls() override;
+	virtual void _update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) override;
+
+public:
+	virtual String get_name() const override { return ETR("HSV Rectangle"); }
+	virtual Ref<Texture2D> get_icon() const override { return color_picker->theme_cache.shape_rect; }
+	virtual void update_theme() override;
+	virtual void grab_focus() override;
+
+	ColorPickerShapeRectangle(ColorPicker *p_color_picker) :
+			ColorPickerShape(p_color_picker) {}
+};
+
+class ColorPickerShapeWheel : public ColorPickerShape {
+	GDCLASS(ColorPickerShapeWheel, ColorPickerShape);
+
+	inline static constexpr float WHEEL_RADIUS = 0.42;
+
+	MarginContainer *wheel_margin = nullptr;
+	Control *wheel = nullptr;
+	Control *wheel_uv = nullptr;
+
+	bool wheel_focused = true;
+	bool spinning = false;
+	bool rotate_next_echo_event = false;
+
+	float _get_h_on_wheel(const Vector2 &p_color_change_vector);
+	void _reset_wheel_focus();
+
+	void _wheel_input(const Ref<InputEvent> &p_event);
+
+	void _wheel_draw();
+	void _wheel_uv_draw();
+
+protected:
+	virtual void _initialize_controls() override;
+	virtual void _update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) override;
+
+public:
+	virtual String get_name() const override { return ETR("HSV Wheel"); }
+	virtual Ref<Texture2D> get_icon() const override { return color_picker->theme_cache.shape_rect_wheel; }
+	virtual void update_theme() override;
+	virtual void grab_focus() override;
+
+	ColorPickerShapeWheel(ColorPicker *p_color_picker) :
+			ColorPickerShape(p_color_picker) {}
+};
+
+class ColorPickerShapeCircle : public ColorPickerShape {
+	GDCLASS(ColorPickerShapeCircle, ColorPickerShape);
+
+protected:
+	MarginContainer *circle_margin = nullptr;
+	Control *circle = nullptr;
+	Control *circle_overlay = nullptr;
+	Control *value_slider = nullptr;
+
+	Vector2i circle_keyboard_joypad_picker_cursor_position;
+
+	virtual void _circle_input(const Ref<InputEvent> &p_event) = 0;
+	virtual void _value_slider_input(const Ref<InputEvent> &p_event) = 0;
+
+	virtual void _circle_draw() = 0;
+	virtual void _circle_overlay_draw() = 0;
+	virtual void _value_slider_draw() = 0;
+
+	void update_circle_cursor(const Vector2 &p_color_change_vector, const Vector2 &p_center, const Vector2 &p_hue_offset);
+
+public:
+	virtual Ref<Shader> _get_shader() const = 0;
+	virtual void _initialize_controls() override;
+
+	virtual Ref<Texture2D> get_icon() const override { return color_picker->theme_cache.shape_circle; }
+	virtual void update_theme() override;
+	virtual void grab_focus() override;
+
+	ColorPickerShapeCircle(ColorPicker *p_color_picker) :
+			ColorPickerShape(p_color_picker) {}
+};
+
+class ColorPickerShapeVHSCircle : public ColorPickerShapeCircle {
+	GDCLASS(ColorPickerShapeVHSCircle, ColorPickerShapeCircle);
+
+protected:
+	virtual void _update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) override;
+	virtual Ref<Shader> _get_shader() const override { return ColorPicker::circle_shader; }
+
+	virtual void _circle_input(const Ref<InputEvent> &p_event) override;
+	virtual void _value_slider_input(const Ref<InputEvent> &p_event) override;
+
+	virtual void _circle_draw() override;
+	virtual void _circle_overlay_draw() override;
+	virtual void _value_slider_draw() override;
+
+public:
+	virtual String get_name() const override { return ETR("VHS Circle"); }
+
+	ColorPickerShapeVHSCircle(ColorPicker *p_color_picker) :
+			ColorPickerShapeCircle(p_color_picker) {}
+};
+
+class ColorPickerShapeOKHSLCircle : public ColorPickerShapeCircle {
+	GDCLASS(ColorPickerShapeOKHSLCircle, ColorPickerShapeCircle);
+
+protected:
+	virtual void _update_cursor(const Vector2 &p_color_change_vector, bool p_is_echo) override;
+	virtual Ref<Shader> _get_shader() const override { return ColorPicker::circle_ok_color_shader; }
+
+	virtual void _circle_input(const Ref<InputEvent> &p_event) override;
+	virtual void _value_slider_input(const Ref<InputEvent> &p_event) override;
+
+	virtual void _circle_draw() override;
+	virtual void _circle_overlay_draw() override;
+	virtual void _value_slider_draw() override;
+
+public:
+	virtual String get_name() const override { return ETR("OKHSL Circle"); }
+	virtual bool is_ok_hsl() const override { return true; }
+
+	ColorPickerShapeOKHSLCircle(ColorPicker *p_color_picker) :
+			ColorPickerShapeCircle(p_color_picker) {}
+};
diff --git a/engine/scene/gui/color_rect.cpp b/engine/scene/gui/color_rect.cpp
index fc334325..141581c2 100644
--- a/engine/scene/gui/color_rect.cpp
+++ b/engine/scene/gui/color_rect.cpp
@@ -35,6 +35,7 @@ void ColorRect::set_color(const Color &p_color) {
 		return;
 	}
 	color = p_color;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -44,6 +45,13 @@ Color ColorRect::get_color() const {
 
 void ColorRect::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_color_value(ae, color);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			draw_rect(Rect2(Point2(), get_size()), color);
 		} break;
diff --git a/engine/scene/gui/color_rect.h b/engine/scene/gui/color_rect.h
index c0b17dfb..69bd1d42 100644
--- a/engine/scene/gui/color_rect.h
+++ b/engine/scene/gui/color_rect.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLOR_RECT_H
-#define COLOR_RECT_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -46,5 +45,3 @@ public:
 	void set_color(const Color &p_color);
 	Color get_color() const;
 };
-
-#endif // COLOR_RECT_H
diff --git a/engine/scene/gui/container.cpp b/engine/scene/gui/container.cpp
index eb69b2df..303ceb8d 100644
--- a/engine/scene/gui/container.cpp
+++ b/engine/scene/gui/container.cpp
@@ -184,6 +184,13 @@ Vector<int> Container::get_allowed_size_flags_vertical() const {
 
 void Container::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+		} break;
+
 		case NOTIFICATION_RESIZED:
 		case NOTIFICATION_THEME_CHANGED:
 		case NOTIFICATION_ENTER_TREE: {
diff --git a/engine/scene/gui/container.h b/engine/scene/gui/container.h
index 1581898a..8502b66f 100644
--- a/engine/scene/gui/container.h
+++ b/engine/scene/gui/container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONTAINER_H
-#define CONTAINER_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -75,5 +74,3 @@ public:
 
 	Container();
 };
-
-#endif // CONTAINER_H
diff --git a/engine/scene/gui/control.cpp b/engine/scene/gui/control.cpp
index 92b5f327..cd9611d2 100644
--- a/engine/scene/gui/control.cpp
+++ b/engine/scene/gui/control.cpp
@@ -32,8 +32,12 @@
 
 #include "container.h"
 #include "core/config/project_settings.h"
+#include "core/input/input_map.h"
+#include "core/math/geometry_2d.h"
 #include "core/os/os.h"
 #include "core/string/translation_server.h"
+#include "scene/gui/label.h"
+#include "scene/gui/panel.h"
 #include "scene/gui/scroll_container.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
@@ -56,18 +60,10 @@ Dictionary Control::_edit_get_state() const {
 	s["scale"] = get_scale();
 	s["pivot"] = get_pivot_offset();
 
-	Array anchors;
-	anchors.push_back(get_anchor(SIDE_LEFT));
-	anchors.push_back(get_anchor(SIDE_TOP));
-	anchors.push_back(get_anchor(SIDE_RIGHT));
-	anchors.push_back(get_anchor(SIDE_BOTTOM));
+	Array anchors = { get_anchor(SIDE_LEFT), get_anchor(SIDE_TOP), get_anchor(SIDE_RIGHT), get_anchor(SIDE_BOTTOM) };
 	s["anchors"] = anchors;
 
-	Array offsets;
-	offsets.push_back(get_offset(SIDE_LEFT));
-	offsets.push_back(get_offset(SIDE_TOP));
-	offsets.push_back(get_offset(SIDE_RIGHT));
-	offsets.push_back(get_offset(SIDE_BOTTOM));
+	Array offsets = { get_offset(SIDE_LEFT), get_offset(SIDE_TOP), get_offset(SIDE_RIGHT), get_offset(SIDE_BOTTOM) };
 	s["offsets"] = offsets;
 
 	s["layout_mode"] = _get_layout_mode();
@@ -254,6 +250,27 @@ PackedStringArray Control::get_configuration_warnings() const {
 	return warnings;
 }
 
+PackedStringArray Control::get_accessibility_configuration_warnings() const {
+	ERR_READ_THREAD_GUARD_V(PackedStringArray());
+	PackedStringArray warnings = Node::get_accessibility_configuration_warnings();
+
+	String ac_name = get_accessibility_name().strip_edges();
+	if (ac_name.is_empty()) {
+		warnings.push_back(RTR("Accessibility Name must not be empty, or contain only spaces."));
+	}
+	if (ac_name.contains(get_class_name())) {
+		warnings.push_back(RTR("Accessibility Name must not include Node class name."));
+	}
+	for (int i = 0; i < ac_name.length(); i++) {
+		if (is_control(ac_name[i])) {
+			warnings.push_back(RTR("Accessibility Name must not include control character."));
+			break;
+		}
+	}
+
+	return warnings;
+}
+
 bool Control::is_text_field() const {
 	ERR_READ_THREAD_GUARD_V(false);
 	return false;
@@ -481,9 +498,9 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 	}
 
 	// Validate which positioning properties should be displayed depending on the parent and the layout mode.
-	Node *parent_node = get_parent_control();
-	if (!parent_node) {
-		// If there is no parent, display both anchor and container options.
+	Control *parent_control = get_parent_control();
+	if (!parent_control) {
+		// If there is no parent control, display both anchor and container options.
 
 		// Set the layout mode to be disabled with the proper value.
 		if (p_property.name == "layout_mode") {
@@ -496,7 +513,7 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 		if (!use_custom_anchors && (p_property.name.begins_with("anchor_") || p_property.name.begins_with("offset_") || p_property.name.begins_with("grow_"))) {
 			p_property.usage ^= PROPERTY_USAGE_EDITOR;
 		}
-	} else if (Object::cast_to<Container>(parent_node)) {
+	} else if (Object::cast_to<Container>(parent_control)) {
 		// If the parent is a container, display only container-related properties.
 		if (p_property.name.begins_with("anchor_") || p_property.name.begins_with("offset_") || p_property.name.begins_with("grow_") || p_property.name == "anchors_preset") {
 			p_property.usage ^= PROPERTY_USAGE_DEFAULT;
@@ -508,7 +525,7 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 			p_property.usage |= PROPERTY_USAGE_READ_ONLY;
 		} else if (p_property.name == "size_flags_horizontal" || p_property.name == "size_flags_vertical") {
 			// Filter allowed size flags based on the parent container configuration.
-			Container *parent_container = Object::cast_to<Container>(parent_node);
+			Container *parent_container = Object::cast_to<Container>(parent_control);
 			Vector<int> size_flags;
 			if (p_property.name == "size_flags_horizontal") {
 				size_flags = parent_container->get_allowed_size_flags_horizontal();
@@ -548,7 +565,7 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 			}
 		}
 	} else {
-		// If the parent is NOT a container or not a control at all, display only anchoring-related properties.
+		// If the parent is a non-container control, display only anchoring-related properties.
 		if (p_property.name.begins_with("size_flags_")) {
 			p_property.usage ^= PROPERTY_USAGE_EDITOR;
 
@@ -570,7 +587,7 @@ void Control::_validate_property(PropertyInfo &p_property) const {
 	}
 
 	// Disable the property if it's managed by the parent container.
-	if (!Object::cast_to<Container>(parent_node)) {
+	if (!Object::cast_to<Container>(parent_control)) {
 		return;
 	}
 	bool property_is_managed_by_container = false;
@@ -607,11 +624,6 @@ bool Control::_property_get_revert(const StringName &p_name, Variant &r_property
 
 // Global relations.
 
-bool Control::is_top_level_control() const {
-	ERR_READ_THREAD_GUARD_V(false);
-	return is_inside_tree() && (!data.parent_canvas_item && !data.RI && is_set_as_top_level());
-}
-
 Control *Control::get_parent_control() const {
 	ERR_READ_THREAD_GUARD_V(nullptr);
 	return data.parent_control;
@@ -631,10 +643,6 @@ Control *Control::get_root_parent_control() const {
 		const Control *c = Object::cast_to<Control>(ci);
 		if (c) {
 			root = c;
-
-			if (c->data.RI || c->is_top_level_control()) {
-				break;
-			}
 		}
 
 		ci = ci->get_parent_item();
@@ -875,6 +883,13 @@ void Control::_compute_offsets(Rect2 p_rect, const real_t p_anchors[4], real_t (
 	r_offsets[3] = p_rect.position.y + p_rect.size.y - (p_anchors[3] * parent_rect_size.y);
 }
 
+void Control::_compute_edge_positions(Rect2 p_rect, real_t (&r_edge_positions)[4]) {
+	for (int i = 0; i < 4; i++) {
+		real_t area = p_rect.size[i & 1];
+		r_edge_positions[i] = data.offset[i] + (data.anchor[i] * area);
+	}
+}
+
 /// Presets and layout modes.
 
 void Control::_set_layout_mode(LayoutMode p_mode) {
@@ -905,11 +920,11 @@ void Control::_update_layout_mode() {
 }
 
 Control::LayoutMode Control::_get_layout_mode() const {
-	Node *parent_node = get_parent_control();
+	Control *parent_control = get_parent_control();
 	// In these modes the property is read-only.
-	if (!parent_node) {
+	if (!parent_control) {
 		return LayoutMode::LAYOUT_MODE_UNCONTROLLED;
-	} else if (Object::cast_to<Container>(parent_node)) {
+	} else if (Object::cast_to<Container>(parent_control)) {
 		return LayoutMode::LAYOUT_MODE_CONTAINER;
 	}
 
@@ -918,20 +933,25 @@ Control::LayoutMode Control::_get_layout_mode() const {
 		return LayoutMode::LAYOUT_MODE_ANCHORS;
 	}
 
-	// Otherwise fallback on what's stored.
-	return data.stored_layout_mode;
+	// Only position/anchors modes are valid for non-container control parent.
+	if (data.stored_layout_mode == LayoutMode::LAYOUT_MODE_POSITION || data.stored_layout_mode == LayoutMode::LAYOUT_MODE_ANCHORS) {
+		return data.stored_layout_mode;
+	}
+
+	// Otherwise fallback to position mode.
+	return LayoutMode::LAYOUT_MODE_POSITION;
 }
 
 Control::LayoutMode Control::_get_default_layout_mode() const {
-	Node *parent_node = get_parent_control();
+	Control *parent_control = get_parent_control();
 	// In these modes the property is read-only.
-	if (!parent_node) {
+	if (!parent_control) {
 		return LayoutMode::LAYOUT_MODE_UNCONTROLLED;
-	} else if (Object::cast_to<Container>(parent_node)) {
+	} else if (Object::cast_to<Container>(parent_control)) {
 		return LayoutMode::LAYOUT_MODE_CONTAINER;
 	}
 
-	// Otherwise fallback on the position mode.
+	// Otherwise fallback to the position mode.
 	return LayoutMode::LAYOUT_MODE_POSITION;
 }
 
@@ -1400,10 +1420,13 @@ void Control::set_position(const Point2 &p_point, bool p_keep_offsets) {
 	}
 #endif // TOOLS_ENABLED
 
+	real_t edge_pos[4];
+	_compute_edge_positions(get_parent_anchorable_rect(), edge_pos);
+	Size2 offset_size(edge_pos[2] - edge_pos[0], edge_pos[3] - edge_pos[1]);
 	if (p_keep_offsets) {
-		_compute_anchors(Rect2(p_point, data.size_cache), data.offset, data.anchor);
+		_compute_anchors(Rect2(p_point, offset_size), data.offset, data.anchor);
 	} else {
-		_compute_offsets(Rect2(p_point, data.size_cache), data.anchor, data.offset);
+		_compute_offsets(Rect2(p_point, offset_size), data.anchor, data.offset);
 	}
 	_size_changed();
 }
@@ -1537,6 +1560,7 @@ void Control::set_scale(const Vector2 &p_scale) {
 	}
 	queue_redraw();
 	_notify_transform();
+	queue_accessibility_update();
 }
 
 Vector2 Control::get_scale() const {
@@ -1553,6 +1577,7 @@ void Control::set_rotation(real_t p_radians) {
 	data.rotation = p_radians;
 	queue_redraw();
 	_notify_transform();
+	queue_accessibility_update();
 }
 
 void Control::set_rotation_degrees(real_t p_degrees) {
@@ -1579,6 +1604,7 @@ void Control::set_pivot_offset(const Vector2 &p_pivot) {
 	data.pivot_offset = p_pivot;
 	queue_redraw();
 	_notify_transform();
+	queue_accessibility_update();
 }
 
 Vector2 Control::get_pivot_offset() const {
@@ -1690,14 +1716,8 @@ Size2 Control::get_combined_minimum_size() const {
 
 void Control::_size_changed() {
 	Rect2 parent_rect = get_parent_anchorable_rect();
-
 	real_t edge_pos[4];
-
-	for (int i = 0; i < 4; i++) {
-		real_t area = parent_rect.size[i & 1];
-		edge_pos[i] = data.offset[i] + (data.anchor[i] * area);
-	}
-
+	_compute_edge_positions(parent_rect, edge_pos);
 	Point2 new_pos_cache = Point2(edge_pos[0], edge_pos[1]);
 	Size2 new_size_cache = Point2(edge_pos[2], edge_pos[3]) - new_pos_cache;
 
@@ -1727,8 +1747,11 @@ void Control::_size_changed() {
 		new_size_cache.height = minimum_size.height;
 	}
 
-	bool pos_changed = !new_pos_cache.is_equal_approx(data.pos_cache);
-	bool size_changed = !new_size_cache.is_equal_approx(data.size_cache);
+	bool pos_changed = new_pos_cache != data.pos_cache;
+	bool size_changed = new_size_cache != data.size_cache;
+	// Below helps in getting rid of floating point errors for signaling resized.
+	bool approx_pos_changed = !new_pos_cache.is_equal_approx(data.pos_cache);
+	bool approx_size_changed = !new_size_cache.is_equal_approx(data.size_cache);
 
 	if (pos_changed) {
 		data.pos_cache = new_pos_cache;
@@ -1738,13 +1761,13 @@ void Control::_size_changed() {
 	}
 
 	if (is_inside_tree()) {
-		if (pos_changed || size_changed) {
+		if (approx_pos_changed || approx_size_changed) {
 			// Ensure global transform is marked as dirty before `NOTIFICATION_RESIZED` / `item_rect_changed` signal
 			// so an up to date global transform could be obtained when handling these.
 			_notify_transform();
 
-			item_rect_changed(size_changed);
-			if (size_changed) {
+			item_rect_changed(approx_size_changed);
+			if (approx_size_changed) {
 				notification(NOTIFICATION_RESIZED);
 			}
 		}
@@ -1752,6 +1775,8 @@ void Control::_size_changed() {
 		if (pos_changed && !size_changed) {
 			_update_canvas_item_transform();
 		}
+
+		queue_accessibility_update();
 	} else if (pos_changed) {
 		_notify_transform();
 	}
@@ -1866,6 +1891,46 @@ Control::MouseFilter Control::get_mouse_filter() const {
 	return data.mouse_filter;
 }
 
+Control::MouseFilter Control::get_mouse_filter_with_recursive() const {
+	ERR_READ_THREAD_GUARD_V(MOUSE_FILTER_IGNORE);
+	if (_is_parent_mouse_disabled()) {
+		return MOUSE_FILTER_IGNORE;
+	}
+	return data.mouse_filter;
+}
+
+void Control::set_mouse_recursive_behavior(RecursiveBehavior p_recursive_mouse_behavior) {
+	ERR_MAIN_THREAD_GUARD;
+	ERR_FAIL_INDEX((int)p_recursive_mouse_behavior, 4);
+	if (data.mouse_recursive_behavior == p_recursive_mouse_behavior) {
+		return;
+	}
+	_set_mouse_recursive_behavior_ignore_cache(p_recursive_mouse_behavior);
+}
+
+void Control::_set_mouse_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_mouse_behavior) {
+	data.mouse_recursive_behavior = p_recursive_mouse_behavior;
+	if (p_recursive_mouse_behavior == RECURSIVE_BEHAVIOR_INHERITED) {
+		Control *parent = get_parent_control();
+		if (parent) {
+			_propagate_mouse_behavior_recursively(parent->data.parent_mouse_recursive_behavior, false);
+		} else {
+			_propagate_mouse_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);
+		}
+	} else {
+		_propagate_mouse_behavior_recursively(p_recursive_mouse_behavior, false);
+	}
+
+	if (get_viewport()) {
+		get_viewport()->_gui_update_mouse_over();
+	}
+}
+
+Control::RecursiveBehavior Control::get_mouse_recursive_behavior() const {
+	ERR_READ_THREAD_GUARD_V(RECURSIVE_BEHAVIOR_INHERITED);
+	return data.mouse_recursive_behavior;
+}
+
 void Control::set_force_pass_scroll_events(bool p_force_pass_scroll_events) {
 	ERR_MAIN_THREAD_GUARD;
 	data.force_pass_scroll_events = p_force_pass_scroll_events;
@@ -1981,7 +2046,40 @@ void Control::force_drag(const Variant &p_data, Control *p_control) {
 	ERR_FAIL_COND(!is_inside_tree());
 	ERR_FAIL_COND(p_data.get_type() == Variant::NIL);
 
-	get_viewport()->_gui_force_drag(this, p_data, p_control);
+	Viewport *vp = get_viewport();
+
+	vp->_gui_force_drag_start();
+	vp->_gui_force_drag(this, p_data, p_control);
+}
+
+void Control::accessibility_drag() {
+	ERR_MAIN_THREAD_GUARD;
+	ERR_FAIL_COND(!is_inside_tree());
+
+	Viewport *vp = get_viewport();
+
+	vp->_gui_force_drag_start();
+	Variant dnd_data = get_drag_data(Vector2(Math::INF, Math::INF));
+	if (dnd_data.get_type() != Variant::NIL) {
+		Window *w = Window::get_from_id(get_window()->get_window_id());
+		if (w) {
+			w->accessibility_announcement(vformat(RTR("%s grabbed. Select target and use %s to drop, use %s to cancel."), vp->gui_get_drag_description(), InputMap::get_singleton()->get_action_description("ui_accessibility_drag_and_drop"), InputMap::get_singleton()->get_action_description("ui_cancel")));
+		}
+		vp->_gui_force_drag(this, dnd_data, nullptr);
+		queue_accessibility_update();
+	} else {
+		vp->_gui_force_drag_cancel();
+	}
+}
+
+void Control::accessibility_drop() {
+	ERR_MAIN_THREAD_GUARD;
+	ERR_FAIL_COND(!is_inside_tree());
+	ERR_FAIL_COND(!get_viewport()->gui_is_dragging());
+
+	get_viewport()->gui_perform_drop_at(Vector2(Math::INF, Math::INF), this);
+
+	queue_accessibility_update();
 }
 
 void Control::set_drag_preview(Control *p_control) {
@@ -2000,7 +2098,7 @@ bool Control::is_drag_successful() const {
 
 void Control::set_focus_mode(FocusMode p_focus_mode) {
 	ERR_MAIN_THREAD_GUARD;
-	ERR_FAIL_INDEX((int)p_focus_mode, 3);
+	ERR_FAIL_INDEX((int)p_focus_mode, 4);
 
 	if (is_inside_tree() && p_focus_mode == FOCUS_NONE && data.focus_mode != FOCUS_NONE && has_focus()) {
 		release_focus();
@@ -2014,6 +2112,42 @@ Control::FocusMode Control::get_focus_mode() const {
 	return data.focus_mode;
 }
 
+Control::FocusMode Control::get_focus_mode_with_recursive() const {
+	ERR_READ_THREAD_GUARD_V(FOCUS_NONE);
+	if (_is_focus_disabled_recursively()) {
+		return FOCUS_NONE;
+	}
+	return data.focus_mode;
+}
+
+void Control::set_focus_recursive_behavior(RecursiveBehavior p_recursive_focus_behavior) {
+	ERR_MAIN_THREAD_GUARD;
+	ERR_FAIL_INDEX((int)p_recursive_focus_behavior, 4);
+	if (data.focus_recursive_behavior == p_recursive_focus_behavior) {
+		return;
+	}
+	_set_focus_recursive_behavior_ignore_cache(p_recursive_focus_behavior);
+}
+
+void Control::_set_focus_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_focus_behavior) {
+	data.focus_recursive_behavior = p_recursive_focus_behavior;
+	if (p_recursive_focus_behavior == RECURSIVE_BEHAVIOR_INHERITED) {
+		Control *parent = get_parent_control();
+		if (parent) {
+			_propagate_focus_behavior_recursively(parent->data.parent_focus_recursive_behavior, false);
+		} else {
+			_propagate_focus_behavior_recursively(RECURSIVE_BEHAVIOR_ENABLED, false);
+		}
+	} else {
+		_propagate_focus_behavior_recursively(p_recursive_focus_behavior, false);
+	}
+}
+
+Control::RecursiveBehavior Control::get_focus_recursive_behavior() const {
+	ERR_READ_THREAD_GUARD_V(RECURSIVE_BEHAVIOR_INHERITED);
+	return data.focus_recursive_behavior;
+}
+
 bool Control::has_focus() const {
 	ERR_READ_THREAD_GUARD_V(false);
 	return is_inside_tree() && get_viewport()->_gui_control_has_focus(this);
@@ -2054,7 +2188,7 @@ static Control *_next_control(Control *p_from) {
 		return nullptr; // Can't go above.
 	}
 
-	Control *parent = Object::cast_to<Control>(p_from->get_parent());
+	Control *parent = p_from->get_parent_control();
 
 	if (!parent) {
 		return nullptr;
@@ -2077,21 +2211,25 @@ static Control *_next_control(Control *p_from) {
 
 Control *Control::find_next_valid_focus() const {
 	ERR_READ_THREAD_GUARD_V(nullptr);
+
+	// If the focus property is manually overwritten, attempt to use it.
+	if (!data.focus_next.is_empty()) {
+		Node *n = get_node_or_null(data.focus_next);
+		ERR_FAIL_NULL_V_MSG(n, nullptr, "Next focus node path is invalid: '" + data.focus_next + "'.");
+		Control *c = Object::cast_to<Control>(n);
+		ERR_FAIL_NULL_V_MSG(c, nullptr, "Next focus node is not a control: '" + n->get_name() + "'.");
+		if (c->is_visible_in_tree() && c->get_focus_mode_with_recursive() != FOCUS_NONE) {
+			return c;
+		}
+	}
+
 	Control *from = const_cast<Control *>(this);
+	bool ac_enabled = get_tree() && get_tree()->is_accessibility_enabled();
+
+	// Index of the current `Control` subtree within the containing `Window`.
+	int window_next = -1;
 
 	while (true) {
-		// If the focus property is manually overwritten, attempt to use it.
-
-		if (!data.focus_next.is_empty()) {
-			Node *n = get_node_or_null(data.focus_next);
-			ERR_FAIL_NULL_V_MSG(n, nullptr, "Next focus node path is invalid: '" + data.focus_next + "'.");
-			Control *c = Object::cast_to<Control>(n);
-			ERR_FAIL_NULL_V_MSG(c, nullptr, "Next focus node is not a control: '" + n->get_name() + "'.");
-			if (c->is_visible() && c->get_focus_mode() != FOCUS_NONE) {
-				return c;
-			}
-		}
-
 		// Find next child.
 
 		Control *next_child = nullptr;
@@ -2110,83 +2248,121 @@ Control *Control::find_next_valid_focus() const {
 			next_child = _next_control(from);
 			if (!next_child) { // Nothing else. Go up and find either window or subwindow.
 				next_child = const_cast<Control *>(this);
-				while (next_child && !next_child->is_set_as_top_level()) {
-					next_child = cast_to<Control>(next_child->get_parent());
+
+				while (next_child) {
+					if (next_child->is_set_as_top_level()) {
+						break;
+					}
+
+					if (next_child->data.RI) {
+						break;
+					}
+					next_child = next_child->data.parent_control;
 				}
 
-				if (!next_child) {
-					next_child = const_cast<Control *>(this);
-					while (next_child) {
-						if (next_child->data.RI) {
-							break;
+				Window *win = next_child == nullptr ? nullptr : next_child->data.parent_window;
+				if (win) { // Cycle through `Control` subtrees of the parent window
+					if (window_next == -1) {
+						window_next = next_child->get_index();
+						ERR_FAIL_INDEX_V(window_next, win->get_child_count(), nullptr);
+					}
+
+					for (int i = 1; i < win->get_child_count() + 1; i++) {
+						int next = Math::wrapi(window_next + i, 0, win->get_child_count());
+						Control *c = Object::cast_to<Control>(win->get_child(next));
+						if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
+							continue;
 						}
-						next_child = next_child->get_parent_control();
+						window_next = next;
+						next_child = c;
+						break;
 					}
 				}
 			}
 		}
 
-		if (next_child == from || next_child == this) { // No next control.
-			return (get_focus_mode() == FOCUS_ALL) ? next_child : nullptr;
-		}
-		if (next_child) {
-			if (next_child->get_focus_mode() == FOCUS_ALL) {
-				return next_child;
-			}
-			from = next_child;
-		} else {
+		if (!next_child) {
 			break;
 		}
+
+		if ((next_child->get_focus_mode_with_recursive() == FOCUS_ALL) || (ac_enabled && next_child->get_focus_mode_with_recursive() == FOCUS_ACCESSIBILITY)) {
+			return next_child;
+		}
+
+		if (next_child == from || next_child == this) {
+			return nullptr; // Stuck in a loop with no next control.
+		}
+
+		from = next_child; // Try to find the next control with focus mode FOCUS_ALL.
 	}
 
 	return nullptr;
 }
 
 static Control *_prev_control(Control *p_from) {
-	Control *child = nullptr;
 	for (int i = p_from->get_child_count() - 1; i >= 0; i--) {
 		Control *c = Object::cast_to<Control>(p_from->get_child(i));
 		if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
 			continue;
 		}
 
-		child = c;
-		break;
+		// Find the last child as prev, try the same in the last child.
+		return _prev_control(c);
 	}
 
-	if (!child) {
-		return p_from;
-	}
-
-	// No prev in parent, try the same in parent.
-	return _prev_control(child);
+	return p_from; // Not found in the children, return itself.
 }
 
 Control *Control::find_prev_valid_focus() const {
 	ERR_READ_THREAD_GUARD_V(nullptr);
+
+	// If the focus property is manually overwritten, attempt to use it.
+	if (!data.focus_prev.is_empty()) {
+		Node *n = get_node_or_null(data.focus_prev);
+		ERR_FAIL_NULL_V_MSG(n, nullptr, "Previous focus node path is invalid: '" + data.focus_prev + "'.");
+		Control *c = Object::cast_to<Control>(n);
+		ERR_FAIL_NULL_V_MSG(c, nullptr, "Previous focus node is not a control: '" + n->get_name() + "'.");
+		if (c->is_visible_in_tree() && c->get_focus_mode_with_recursive() != FOCUS_NONE) {
+			return c;
+		}
+	}
+
 	Control *from = const_cast<Control *>(this);
+	bool ac_enabled = get_tree() && get_tree()->is_accessibility_enabled();
+
+	// Index of the current `Control` subtree within the containing `Window`.
+	int window_prev = -1;
 
 	while (true) {
-		// If the focus property is manually overwritten, attempt to use it.
-
-		if (!data.focus_prev.is_empty()) {
-			Node *n = get_node_or_null(data.focus_prev);
-			ERR_FAIL_NULL_V_MSG(n, nullptr, "Previous focus node path is invalid: '" + data.focus_prev + "'.");
-			Control *c = Object::cast_to<Control>(n);
-			ERR_FAIL_NULL_V_MSG(c, nullptr, "Previous focus node is not a control: '" + n->get_name() + "'.");
-			if (c->is_visible() && c->get_focus_mode() != FOCUS_NONE) {
-				return c;
-			}
-		}
-
 		// Find prev child.
 
 		Control *prev_child = nullptr;
 
-		if (from->is_set_as_top_level() || !Object::cast_to<Control>(from->get_parent())) {
+		if (from->is_set_as_top_level() || !from->data.parent_control) {
 			// Find last of the children.
 
-			prev_child = _prev_control(from);
+			Window *win = from->data.parent_window;
+			if (win) { // Cycle through `Control` subtrees of the parent window
+				if (window_prev == -1) {
+					window_prev = from->get_index();
+					ERR_FAIL_INDEX_V(window_prev, win->get_child_count(), nullptr);
+				}
+
+				for (int i = 1; i < win->get_child_count() + 1; i++) {
+					int prev = Math::wrapi(window_prev - i, 0, win->get_child_count());
+					Control *c = Object::cast_to<Control>(win->get_child(prev));
+					if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
+						continue;
+					}
+					window_prev = prev;
+					prev_child = _prev_control(c);
+					break;
+				}
+			}
+
+			if (!prev_child) {
+				prev_child = _prev_control(from); // Wrap start here.
+			}
 
 		} else {
 			for (int i = (from->get_index() - 1); i >= 0; i--) {
@@ -2201,21 +2377,21 @@ Control *Control::find_prev_valid_focus() const {
 			}
 
 			if (!prev_child) {
-				prev_child = Object::cast_to<Control>(from->get_parent());
+				prev_child = from->data.parent_control;
 			} else {
 				prev_child = _prev_control(prev_child);
 			}
 		}
 
-		if (prev_child == from || prev_child == this) { // No prev control.
-			return (get_focus_mode() == FOCUS_ALL) ? prev_child : nullptr;
-		}
-
-		if (prev_child->get_focus_mode() == FOCUS_ALL) {
+		if ((prev_child->get_focus_mode_with_recursive() == FOCUS_ALL) || (ac_enabled && prev_child->get_focus_mode_with_recursive() == FOCUS_ACCESSIBILITY)) {
 			return prev_child;
 		}
 
-		from = prev_child;
+		if (prev_child == from || prev_child == this) {
+			return nullptr; // Stuck in a loop with no prev control.
+		}
+
+		from = prev_child; // Try to find the prev control with focus mode FOCUS_ALL.
 	}
 
 	return nullptr;
@@ -2266,14 +2442,7 @@ Control *Control::_get_focus_neighbor(Side p_side, int p_count) {
 		ERR_FAIL_NULL_V_MSG(n, nullptr, "Neighbor focus node path is invalid: '" + data.focus_neighbor[p_side] + "'.");
 		Control *c = Object::cast_to<Control>(n);
 		ERR_FAIL_NULL_V_MSG(c, nullptr, "Neighbor focus node is not a control: '" + n->get_name() + "'.");
-		bool valid = true;
-		if (!c->is_visible()) {
-			valid = false;
-		}
-		if (c->get_focus_mode() == FOCUS_NONE) {
-			valid = false;
-		}
-		if (valid) {
+		if (c->is_visible_in_tree() && c->get_focus_mode_with_recursive() != FOCUS_NONE) {
 			return c;
 		}
 
@@ -2382,6 +2551,64 @@ Control *Control::_get_focus_neighbor(Side p_side, int p_count) {
 	return result;
 }
 
+bool Control::_is_focus_disabled_recursively() const {
+	switch (data.focus_recursive_behavior) {
+		case RECURSIVE_BEHAVIOR_INHERITED:
+			return data.parent_focus_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED;
+		case RECURSIVE_BEHAVIOR_DISABLED:
+			return true;
+		case RECURSIVE_BEHAVIOR_ENABLED:
+			return false;
+	}
+	return false;
+}
+
+void Control::_propagate_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_skip_non_inherited) {
+	if (is_inside_tree() && (data.focus_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED || (data.focus_recursive_behavior == RECURSIVE_BEHAVIOR_INHERITED && p_focus_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED)) && has_focus()) {
+		release_focus();
+	}
+
+	if (p_skip_non_inherited && data.focus_recursive_behavior != RECURSIVE_BEHAVIOR_INHERITED) {
+		return;
+	}
+
+	data.parent_focus_recursive_behavior = p_focus_recursive_behavior;
+
+	for (int i = 0; i < get_child_count(); i++) {
+		Control *control = Object::cast_to<Control>(get_child(i));
+		if (control) {
+			control->_propagate_focus_behavior_recursively(p_focus_recursive_behavior, true);
+		}
+	}
+}
+
+bool Control::_is_parent_mouse_disabled() const {
+	switch (data.mouse_recursive_behavior) {
+		case RECURSIVE_BEHAVIOR_INHERITED:
+			return data.parent_mouse_recursive_behavior == RECURSIVE_BEHAVIOR_DISABLED;
+		case RECURSIVE_BEHAVIOR_DISABLED:
+			return true;
+		case RECURSIVE_BEHAVIOR_ENABLED:
+			return false;
+	}
+	return false;
+}
+
+void Control::_propagate_mouse_behavior_recursively(RecursiveBehavior p_mouse_recursive_behavior, bool p_skip_non_inherited) {
+	if (p_skip_non_inherited && data.mouse_recursive_behavior != RECURSIVE_BEHAVIOR_INHERITED) {
+		return;
+	}
+
+	data.parent_mouse_recursive_behavior = p_mouse_recursive_behavior;
+
+	for (int i = 0; i < get_child_count(); i++) {
+		Control *control = Object::cast_to<Control>(get_child(i));
+		if (control) {
+			control->_propagate_mouse_behavior_recursively(p_mouse_recursive_behavior, true);
+		}
+	}
+}
+
 Control *Control::find_valid_focus_neighbor(Side p_side) const {
 	return const_cast<Control *>(this)->_get_focus_neighbor(p_side);
 }
@@ -2391,11 +2618,13 @@ void Control::_window_find_focus_neighbor(const Vector2 &p_dir, Node *p_at, cons
 		return; // Bye.
 	}
 
+	bool ac_enabled = get_tree() && get_tree()->is_accessibility_enabled();
+
 	Control *c = Object::cast_to<Control>(p_at);
 	Container *container = Object::cast_to<Container>(p_at);
 	bool in_container = container ? container->is_ancestor_of(this) : false;
 
-	if (c && c != this && c->get_focus_mode() == FOCUS_ALL && !in_container && p_clamp.intersects(c->get_global_rect())) {
+	if (c && c != this && ((c->get_focus_mode_with_recursive() == FOCUS_ALL) || (ac_enabled && c->get_focus_mode_with_recursive() == FOCUS_ACCESSIBILITY)) && !in_container && p_clamp.intersects(c->get_global_rect())) {
 		Rect2 r_c = c->get_global_rect();
 		r_c = r_c.intersection(p_clamp);
 		real_t begin_d = p_dir.dot(r_c.get_position());
@@ -2808,6 +3037,44 @@ Variant Control::get_theme_item(Theme::DataType p_data_type, const StringName &p
 	return Variant();
 }
 
+Variant Control::get_used_theme_item(const String &p_full_name, const StringName &p_theme_type) const {
+	if (p_full_name.begins_with("theme_override_icons/")) {
+		String name = p_full_name.substr(strlen("theme_override_icons/"));
+		if (has_theme_icon(name)) { // Exclude cached and default ones.
+			return get_theme_icon(name);
+		}
+	} else if (p_full_name.begins_with("theme_override_styles/")) {
+		String name = p_full_name.substr(strlen("theme_override_styles/"));
+		if (has_theme_stylebox(name)) {
+			return get_theme_stylebox(name);
+		}
+	} else if (p_full_name.begins_with("theme_override_fonts/")) {
+		String name = p_full_name.substr(strlen("theme_override_fonts/"));
+		if (has_theme_font(name)) {
+			return get_theme_font(name);
+		}
+	} else if (p_full_name.begins_with("theme_override_font_sizes/")) {
+		String name = p_full_name.substr(strlen("theme_override_font_sizes/"));
+		if (has_theme_font_size(name)) {
+			return get_theme_font_size(name);
+		}
+	} else if (p_full_name.begins_with("theme_override_colors/")) {
+		String name = p_full_name.substr(strlen("theme_override_colors/"));
+		if (has_theme_color(name)) {
+			return get_theme_color(name);
+		}
+	} else if (p_full_name.begins_with("theme_override_constants/")) {
+		String name = p_full_name.substr(strlen("theme_override_constants/"));
+		if (has_theme_constant(name)) {
+			return get_theme_constant(name);
+		}
+	} else {
+		ERR_FAIL_V_MSG(Variant(), vformat("The property %s is not a theme item.", p_full_name));
+	}
+
+	return Variant();
+}
+
 #ifdef TOOLS_ENABLED
 Ref<Texture2D> Control::get_editor_theme_icon(const StringName &p_name) const {
 	return get_theme_icon(p_name, SNAME("EditorIcons"));
@@ -3263,6 +3530,13 @@ String Control::get_tooltip(const Point2 &p_pos) const {
 	return data.tooltip;
 }
 
+String Control::accessibility_get_contextual_info() const {
+	ERR_READ_THREAD_GUARD_V(String());
+	String ret;
+	GDVIRTUAL_CALL(_accessibility_get_contextual_info, ret);
+	return ret;
+}
+
 Control *Control::make_custom_tooltip(const String &p_text) const {
 	ERR_READ_THREAD_GUARD_V(nullptr);
 	Object *ret = nullptr;
@@ -3272,6 +3546,35 @@ Control *Control::make_custom_tooltip(const String &p_text) const {
 
 // Base object overrides.
 
+void Control::_accessibility_action_foucs(const Variant &p_data) {
+	grab_focus();
+}
+
+void Control::_accessibility_action_blur(const Variant &p_data) {
+	release_focus();
+}
+
+void Control::_accessibility_action_show_tooltip(const Variant &p_data) {
+	Viewport *vp = get_viewport();
+	if (vp) {
+		vp->show_tooltip(this);
+	}
+}
+
+void Control::_accessibility_action_hide_tooltip(const Variant &p_data) {
+	Viewport *vp = get_viewport();
+	if (vp) {
+		vp->cancel_tooltip();
+	}
+}
+
+void Control::_accessibility_action_scroll_into_view(const Variant &p_data) {
+	ScrollContainer *sc = Object::cast_to<ScrollContainer>(get_parent());
+	if (sc) {
+		sc->ensure_control_visible(this);
+	}
+}
+
 void Control::_notification(int p_notification) {
 	ERR_MAIN_THREAD_GUARD;
 	switch (p_notification) {
@@ -3283,6 +3586,31 @@ void Control::_notification(int p_notification) {
 			saving = false;
 		} break;
 #endif // TOOLS_ENABLED
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_transform(ae, get_transform());
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, Rect2(Vector2(), data.size_cache));
+			DisplayServer::get_singleton()->accessibility_update_set_tooltip(ae, data.tooltip);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_CLIPS_CHILDREN, data.clip_contents);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_TOUCH_PASSTHROUGH, data.mouse_filter == MOUSE_FILTER_PASS);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Control::_accessibility_action_foucs));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &Control::_accessibility_action_blur));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_TOOLTIP, callable_mp(this, &Control::_accessibility_action_show_tooltip));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_HIDE_TOOLTIP, callable_mp(this, &Control::_accessibility_action_hide_tooltip));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &Control::_accessibility_action_scroll_into_view));
+			if (is_inside_tree() && get_viewport()->gui_is_dragging()) {
+				if (can_drop_data(Vector2(Math::INF, Math::INF), get_viewport()->gui_get_drag_data())) {
+					DisplayServer::get_singleton()->accessibility_update_set_extra_info(ae, vformat(RTR("%s can be dropped here. Use %s to drop, use %s to cancel."), get_viewport()->gui_get_drag_description(), InputMap::get_singleton()->get_action_description("ui_accessibility_drag_and_drop"), InputMap::get_singleton()->get_action_description("ui_cancel")));
+				} else {
+					DisplayServer::get_singleton()->accessibility_update_set_extra_info(ae, vformat(RTR("%s can not be dropped here. Use %s to cancel."), get_viewport()->gui_get_drag_description(), InputMap::get_singleton()->get_action_description("ui_cancel")));
+				}
+			}
+		} break;
+
 		case NOTIFICATION_POSTINITIALIZE: {
 			data.initialized = true;
 
@@ -3298,6 +3626,9 @@ void Control::_notification(int p_notification) {
 			data.theme_owner->assign_theme_on_parented(this);
 
 			_update_layout_mode();
+
+			_set_focus_recursive_behavior_ignore_cache(data.focus_recursive_behavior);
+			_set_mouse_recursive_behavior_ignore_cache(data.mouse_recursive_behavior);
 		} break;
 
 		case NOTIFICATION_UNPARENTED: {
@@ -3518,6 +3849,9 @@ void Control::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_global_rect"), &Control::get_global_rect);
 	ClassDB::bind_method(D_METHOD("set_focus_mode", "mode"), &Control::set_focus_mode);
 	ClassDB::bind_method(D_METHOD("get_focus_mode"), &Control::get_focus_mode);
+	ClassDB::bind_method(D_METHOD("get_focus_mode_with_recursive"), &Control::get_focus_mode_with_recursive);
+	ClassDB::bind_method(D_METHOD("set_focus_recursive_behavior", "focus_recursive_behavior"), &Control::set_focus_recursive_behavior);
+	ClassDB::bind_method(D_METHOD("get_focus_recursive_behavior"), &Control::get_focus_recursive_behavior);
 	ClassDB::bind_method(D_METHOD("has_focus"), &Control::has_focus);
 	ClassDB::bind_method(D_METHOD("grab_focus"), &Control::grab_focus);
 	ClassDB::bind_method(D_METHOD("release_focus"), &Control::release_focus);
@@ -3611,8 +3945,15 @@ void Control::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("force_drag", "data", "preview"), &Control::force_drag);
 
+	ClassDB::bind_method(D_METHOD("accessibility_drag"), &Control::accessibility_drag);
+	ClassDB::bind_method(D_METHOD("accessibility_drop"), &Control::accessibility_drop);
+
 	ClassDB::bind_method(D_METHOD("set_mouse_filter", "filter"), &Control::set_mouse_filter);
 	ClassDB::bind_method(D_METHOD("get_mouse_filter"), &Control::get_mouse_filter);
+	ClassDB::bind_method(D_METHOD("get_mouse_filter_with_recursive"), &Control::get_mouse_filter_with_recursive);
+
+	ClassDB::bind_method(D_METHOD("set_mouse_recursive_behavior", "mouse_recursive_behavior"), &Control::set_mouse_recursive_behavior);
+	ClassDB::bind_method(D_METHOD("get_mouse_recursive_behavior"), &Control::get_mouse_recursive_behavior);
 
 	ClassDB::bind_method(D_METHOD("set_force_pass_scroll_events", "force_pass_scroll_events"), &Control::set_force_pass_scroll_events);
 	ClassDB::bind_method(D_METHOD("is_force_pass_scroll_events"), &Control::is_force_pass_scroll_events);
@@ -3708,10 +4049,12 @@ void Control::_bind_methods() {
 	ADD_PROPERTYI(PropertyInfo(Variant::NODE_PATH, "focus_neighbor_bottom", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Control"), "set_focus_neighbor", "get_focus_neighbor", SIDE_BOTTOM);
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "focus_next", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Control"), "set_focus_next", "get_focus_next");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "focus_previous", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Control"), "set_focus_previous", "get_focus_previous");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "focus_mode", PROPERTY_HINT_ENUM, "None,Click,All"), "set_focus_mode", "get_focus_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "focus_mode", PROPERTY_HINT_ENUM, "None,Click,All,Accessibility"), "set_focus_mode", "get_focus_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "focus_recursive_behavior", PROPERTY_HINT_ENUM, "Inherited,Disabled,Enabled"), "set_focus_recursive_behavior", "get_focus_recursive_behavior");
 
 	ADD_GROUP("Mouse", "mouse_");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mouse_filter", PROPERTY_HINT_ENUM, "Stop,Pass (Propagate Up),Ignore"), "set_mouse_filter", "get_mouse_filter");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "mouse_recursive_behavior", PROPERTY_HINT_ENUM, "Inherited,Disabled,Enabled"), "set_mouse_recursive_behavior", "get_mouse_recursive_behavior");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "mouse_force_pass_scroll_events"), "set_force_pass_scroll_events", "is_force_pass_scroll_events");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "mouse_default_cursor_shape", PROPERTY_HINT_ENUM, "Arrow,I-Beam,Pointing Hand,Cross,Wait,Busy,Drag,Can Drop,Forbidden,Vertical Resize,Horizontal Resize,Secondary Diagonal Resize,Main Diagonal Resize,Move,Vertical Split,Horizontal Split,Help"), "set_default_cursor_shape", "get_default_cursor_shape");
 
@@ -3725,6 +4068,11 @@ void Control::_bind_methods() {
 	BIND_ENUM_CONSTANT(FOCUS_NONE);
 	BIND_ENUM_CONSTANT(FOCUS_CLICK);
 	BIND_ENUM_CONSTANT(FOCUS_ALL);
+	BIND_ENUM_CONSTANT(FOCUS_ACCESSIBILITY);
+
+	BIND_ENUM_CONSTANT(RECURSIVE_BEHAVIOR_INHERITED);
+	BIND_ENUM_CONSTANT(RECURSIVE_BEHAVIOR_DISABLED);
+	BIND_ENUM_CONSTANT(RECURSIVE_BEHAVIOR_ENABLED);
 
 	BIND_CONSTANT(NOTIFICATION_RESIZED);
 	BIND_CONSTANT(NOTIFICATION_MOUSE_ENTER);
@@ -3831,6 +4179,8 @@ void Control::_bind_methods() {
 	GDVIRTUAL_BIND(_drop_data, "at_position", "data");
 	GDVIRTUAL_BIND(_make_custom_tooltip, "for_text");
 
+	GDVIRTUAL_BIND(_accessibility_get_contextual_info);
+
 	GDVIRTUAL_BIND(_gui_input, "event");
 }
 
diff --git a/engine/scene/gui/control.h b/engine/scene/gui/control.h
index 496df44a..535b1e74 100644
--- a/engine/scene/gui/control.h
+++ b/engine/scene/gui/control.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONTROL_H
-#define CONTROL_H
+#pragma once
 
 #include "core/math/transform_2d.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -65,7 +64,14 @@ public:
 	enum FocusMode {
 		FOCUS_NONE,
 		FOCUS_CLICK,
-		FOCUS_ALL
+		FOCUS_ALL,
+		FOCUS_ACCESSIBILITY,
+	};
+
+	enum RecursiveBehavior {
+		RECURSIVE_BEHAVIOR_INHERITED,
+		RECURSIVE_BEHAVIOR_DISABLED,
+		RECURSIVE_BEHAVIOR_ENABLED,
 	};
 
 	enum SizeFlags {
@@ -191,6 +197,8 @@ private:
 		real_t offset[4] = { 0.0, 0.0, 0.0, 0.0 };
 		real_t anchor[4] = { ANCHOR_BEGIN, ANCHOR_BEGIN, ANCHOR_BEGIN, ANCHOR_BEGIN };
 		FocusMode focus_mode = FOCUS_NONE;
+		RecursiveBehavior parent_focus_recursive_behavior = RECURSIVE_BEHAVIOR_INHERITED;
+		RecursiveBehavior focus_recursive_behavior = RECURSIVE_BEHAVIOR_INHERITED;
 		GrowDirection h_grow = GROW_DIRECTION_END;
 		GrowDirection v_grow = GROW_DIRECTION_END;
 
@@ -219,6 +227,8 @@ private:
 		// Input events and rendering.
 
 		MouseFilter mouse_filter = MOUSE_FILTER_STOP;
+		RecursiveBehavior parent_mouse_recursive_behavior = RECURSIVE_BEHAVIOR_INHERITED;
+		RecursiveBehavior mouse_recursive_behavior = RECURSIVE_BEHAVIOR_INHERITED;
 		bool force_pass_scroll_events = true;
 
 		bool clip_contents = false;
@@ -291,6 +301,7 @@ private:
 
 	void _compute_offsets(Rect2 p_rect, const real_t p_anchors[4], real_t (&r_offsets)[4]);
 	void _compute_anchors(Rect2 p_rect, const real_t p_offsets[4], real_t (&r_anchors)[4]);
+	void _compute_edge_positions(Rect2 p_rect, real_t (&r_edge_positions)[4]);
 
 	void _set_layout_mode(LayoutMode p_mode);
 	void _update_layout_mode();
@@ -312,10 +323,19 @@ private:
 
 	void _call_gui_input(const Ref<InputEvent> &p_event);
 
+	// Mouse Filter.
+
+	bool _is_parent_mouse_disabled() const;
+
 	// Focus.
 
 	void _window_find_focus_neighbor(const Vector2 &p_dir, Node *p_at, const Rect2 &p_rect, const Rect2 &p_clamp, real_t p_min, real_t &r_closest_dist_squared, Control **r_closest);
 	Control *_get_focus_neighbor(Side p_side, int p_count = 0);
+	bool _is_focus_disabled_recursively() const;
+	void _propagate_focus_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_force);
+	void _propagate_mouse_behavior_recursively(RecursiveBehavior p_focus_recursive_behavior, bool p_force);
+	void _set_mouse_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_mouse_behavior);
+	void _set_focus_recursive_behavior_ignore_cache(RecursiveBehavior p_recursive_mouse_behavior);
 
 	// Theming.
 
@@ -327,8 +347,6 @@ private:
 
 	static int root_layout_direction;
 
-	String get_tooltip_text() const;
-
 protected:
 	// Dynamic properties.
 
@@ -353,6 +371,12 @@ protected:
 	void _notification(int p_notification);
 	static void _bind_methods();
 
+	void _accessibility_action_foucs(const Variant &p_data);
+	void _accessibility_action_blur(const Variant &p_data);
+	void _accessibility_action_show_tooltip(const Variant &p_data);
+	void _accessibility_action_hide_tooltip(const Variant &p_data);
+	void _accessibility_action_scroll_into_view(const Variant &p_data);
+
 	// Exposed virtual methods.
 
 	GDVIRTUAL1RC(bool, _has_point, Vector2)
@@ -365,6 +389,8 @@ protected:
 	GDVIRTUAL2(_drop_data, Vector2, Variant)
 	GDVIRTUAL1RC(Object *, _make_custom_tooltip, String)
 
+	GDVIRTUAL0RC(String, _accessibility_get_contextual_info);
+
 	GDVIRTUAL1(_gui_input, Ref<InputEvent>)
 
 public:
@@ -420,6 +446,7 @@ public:
 	static void set_root_layout_direction(int p_root_dir);
 
 	PackedStringArray get_configuration_warnings() const override;
+	PackedStringArray get_accessibility_configuration_warnings() const override;
 #ifdef TOOLS_ENABLED
 	virtual void get_argument_options(const StringName &p_function, int p_idx, List<String> *r_options) const override;
 #endif //TOOLS_ENABLED
@@ -428,8 +455,6 @@ public:
 
 	// Global relations.
 
-	bool is_top_level_control() const;
-
 	Control *get_parent_control() const;
 	Window *get_parent_window() const;
 	Control *get_root_parent_control() const;
@@ -516,6 +541,10 @@ public:
 
 	void set_mouse_filter(MouseFilter p_filter);
 	MouseFilter get_mouse_filter() const;
+	MouseFilter get_mouse_filter_with_recursive() const;
+
+	void set_mouse_recursive_behavior(RecursiveBehavior p_recursive_mouse_behavior);
+	RecursiveBehavior get_mouse_recursive_behavior() const;
 
 	void set_force_pass_scroll_events(bool p_force_pass_scroll_events);
 	bool is_force_pass_scroll_events() const;
@@ -534,12 +563,17 @@ public:
 	virtual void drop_data(const Point2 &p_point, const Variant &p_data);
 	void set_drag_preview(Control *p_control);
 	void force_drag(const Variant &p_data, Control *p_control);
+	void accessibility_drag();
+	void accessibility_drop();
 	bool is_drag_successful() const;
 
 	// Focus.
 
 	void set_focus_mode(FocusMode p_focus_mode);
 	FocusMode get_focus_mode() const;
+	FocusMode get_focus_mode_with_recursive() const;
+	void set_focus_recursive_behavior(RecursiveBehavior p_recursive_mouse_behavior);
+	RecursiveBehavior get_focus_recursive_behavior() const;
 	bool has_focus() const;
 	void grab_focus();
 	void grab_click_focus();
@@ -607,6 +641,7 @@ public:
 	Color get_theme_color(const StringName &p_name, const StringName &p_theme_type = StringName()) const;
 	int get_theme_constant(const StringName &p_name, const StringName &p_theme_type = StringName()) const;
 	Variant get_theme_item(Theme::DataType p_data_type, const StringName &p_name, const StringName &p_theme_type = StringName()) const;
+	Variant get_used_theme_item(const String &p_full_name, const StringName &p_theme_type = StringName()) const;
 #ifdef TOOLS_ENABLED
 	Ref<Texture2D> get_editor_theme_icon(const StringName &p_name) const;
 #endif //TOOLS_ENABLED
@@ -648,15 +683,19 @@ public:
 
 	// Extra properties.
 
+	String get_tooltip_text() const;
 	void set_tooltip_text(const String &text);
 	virtual String get_tooltip(const Point2 &p_pos) const;
 	virtual Control *make_custom_tooltip(const String &p_text) const;
 
+	virtual String accessibility_get_contextual_info() const;
+
 	Control();
 	~Control();
 };
 
 VARIANT_ENUM_CAST(Control::FocusMode);
+VARIANT_ENUM_CAST(Control::RecursiveBehavior);
 VARIANT_BITFIELD_CAST(Control::SizeFlags);
 VARIANT_ENUM_CAST(Control::CursorShape);
 VARIANT_ENUM_CAST(Control::LayoutPreset);
@@ -673,5 +712,3 @@ VARIANT_ENUM_CAST(Control::TextDirection);
 #define SET_DRAG_FORWARDING_CDU(from, to) from->set_drag_forwarding(Callable(), callable_mp(this, &to::_can_drop_data_fw).bind(from), callable_mp(this, &to::_drop_data_fw).bind(from));
 #define SET_DRAG_FORWARDING_GCD(from, to) from->set_drag_forwarding(callable_mp(this, &to::get_drag_data_fw).bind(from), callable_mp(this, &to::can_drop_data_fw).bind(from), callable_mp(this, &to::drop_data_fw).bind(from));
 #define SET_DRAG_FORWARDING_GCDU(from, to) from->set_drag_forwarding(callable_mp(this, &to::_get_drag_data_fw).bind(from), callable_mp(this, &to::_can_drop_data_fw).bind(from), callable_mp(this, &to::_drop_data_fw).bind(from));
-
-#endif // CONTROL_H
diff --git a/engine/scene/gui/dialogs.compat.inc b/engine/scene/gui/dialogs.compat.inc
index e114675a..acfc9f0a 100644
--- a/engine/scene/gui/dialogs.compat.inc
+++ b/engine/scene/gui/dialogs.compat.inc
@@ -30,6 +30,8 @@
 
 #ifndef DISABLE_DEPRECATED
 
+#include "scene/gui/line_edit.h"
+
 void AcceptDialog::_register_text_enter_bind_compat_89419(Control *p_line_edit) {
 	register_text_enter(Object::cast_to<LineEdit>(p_line_edit));
 }
diff --git a/engine/scene/gui/dialogs.cpp b/engine/scene/gui/dialogs.cpp
index 6c21318e..d09ce9d7 100644
--- a/engine/scene/gui/dialogs.cpp
+++ b/engine/scene/gui/dialogs.cpp
@@ -51,6 +51,12 @@ void AcceptDialog::_parent_focused() {
 
 void AcceptDialog::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_DIALOG);
+		} break;
 		case NOTIFICATION_POST_ENTER_TREE: {
 			if (is_visible()) {
 				get_ok_button()->grab_focus();
@@ -197,16 +203,12 @@ bool AcceptDialog::has_autowrap() {
 }
 
 void AcceptDialog::set_ok_button_text(String p_ok_button_text) {
-	ok_button->set_text(p_ok_button_text);
-
-	child_controls_changed();
-	if (is_visible()) {
-		_update_child_rects();
-	}
+	ok_text = p_ok_button_text;
+	_update_ok_text();
 }
 
 String AcceptDialog::get_ok_button_text() const {
-	return ok_button->get_text();
+	return ok_text;
 }
 
 void AcceptDialog::register_text_enter(LineEdit *p_line_edit) {
@@ -257,6 +259,25 @@ void AcceptDialog::_update_child_rects() {
 	}
 }
 
+void AcceptDialog::_update_ok_text() {
+	String prev_text = ok_button->get_text();
+	String new_text = internal_ok_text;
+
+	if (!ok_text.is_empty()) {
+		new_text = ok_text;
+	}
+
+	if (new_text == prev_text) {
+		return;
+	}
+	ok_button->set_text(new_text);
+
+	child_controls_changed();
+	if (is_visible()) {
+		_update_child_rects();
+	}
+}
+
 Size2 AcceptDialog::_get_contents_minimum_size() const {
 	// First, we then iterate over the label and any other custom controls
 	// to try and find the size that encompasses all content.
@@ -294,6 +315,11 @@ Size2 AcceptDialog::_get_contents_minimum_size() const {
 	return content_minsize;
 }
 
+void AcceptDialog::set_internal_ok_text(const String &p_text) {
+	internal_ok_text = p_text;
+	_update_ok_text();
+}
+
 void AcceptDialog::_custom_action(const String &p_action) {
 	emit_signal(SNAME("custom_action"), p_action);
 	custom_action(p_action);
@@ -428,6 +454,9 @@ AcceptDialog::AcceptDialog() {
 	set_clamp_to_embedder(true);
 	set_keep_title_visible(true);
 
+	set_flag(FLAG_MINIMIZE_DISABLED, true);
+	set_flag(FLAG_MAXIMIZE_DISABLED, true);
+
 	bg_panel = memnew(Panel);
 	add_child(bg_panel, false, INTERNAL_MODE_FRONT);
 
@@ -442,7 +471,7 @@ AcceptDialog::AcceptDialog() {
 
 	buttons_hbox->add_spacer();
 	ok_button = memnew(Button);
-	ok_button->set_text(ETR("OK"));
+	set_internal_ok_text(ETR("OK"));
 	buttons_hbox->add_child(ok_button);
 	buttons_hbox->add_spacer();
 
diff --git a/engine/scene/gui/dialogs.h b/engine/scene/gui/dialogs.h
index 404237bf..acc97c18 100644
--- a/engine/scene/gui/dialogs.h
+++ b/engine/scene/gui/dialogs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DIALOGS_H
-#define DIALOGS_H
+#pragma once
 
 #include "box_container.h"
 #include "scene/gui/button.h"
@@ -52,6 +51,9 @@ class AcceptDialog : public Window {
 	Button *ok_button = nullptr;
 
 	bool popped_up = false;
+	String ok_text;
+	String internal_ok_text;
+
 	bool hide_on_ok = true;
 	bool close_on_escape = true;
 
@@ -65,6 +67,7 @@ class AcceptDialog : public Window {
 	void _custom_action(const String &p_action);
 	void _custom_button_visibility_changed(Button *button);
 	void _update_child_rects();
+	void _update_ok_text();
 
 	static bool swap_cancel_ok;
 
@@ -82,6 +85,8 @@ protected:
 	virtual void cancel_pressed() {}
 	virtual void custom_action(const String &) {}
 
+	void set_internal_ok_text(const String &p_text);
+
 	// Not private since used by derived classes signal.
 	void _text_submitted(const String &p_text);
 	void _ok_pressed();
@@ -139,5 +144,3 @@ public:
 
 	ConfirmationDialog();
 };
-
-#endif // DIALOGS_H
diff --git a/engine/scene/gui/file_dialog.cpp b/engine/scene/gui/file_dialog.cpp
index bd89fb19..f335d82a 100644
--- a/engine/scene/gui/file_dialog.cpp
+++ b/engine/scene/gui/file_dialog.cpp
@@ -68,10 +68,18 @@ void FileDialog::_native_popup() {
 	} else if (access == ACCESS_USERDATA) {
 		root = OS::get_singleton()->get_user_data_dir();
 	}
+
+	// Attach native file dialog to first persistent parent window.
+	Window *w = (is_transient() || is_transient_to_focused()) ? get_parent_visible_window() : nullptr;
+	while (w && w->get_flag(FLAG_POPUP) && w->get_parent_visible_window()) {
+		w = w->get_parent_visible_window();
+	}
+	DisplayServer::WindowID wid = w ? w->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
+
 	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_DIALOG_FILE_EXTRA)) {
-		DisplayServer::get_singleton()->file_dialog_with_options_show(get_translated_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), root, file->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, _get_options(), callable_mp(this, &FileDialog::_native_dialog_cb_with_options));
+		DisplayServer::get_singleton()->file_dialog_with_options_show(get_translated_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), root, file->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, _get_options(), callable_mp(this, &FileDialog::_native_dialog_cb_with_options), wid);
 	} else {
-		DisplayServer::get_singleton()->file_dialog_show(get_translated_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), file->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, callable_mp(this, &FileDialog::_native_dialog_cb));
+		DisplayServer::get_singleton()->file_dialog_show(get_translated_title(), ProjectSettings::get_singleton()->globalize_path(full_dir), file->get_text().get_file(), show_hidden_files, DisplayServer::FileDialogMode(mode), processed_filters, callable_mp(this, &FileDialog::_native_dialog_cb), wid);
 	}
 }
 
@@ -160,9 +168,9 @@ void FileDialog::_native_dialog_cb_with_options(bool p_ok, const Vector<String>
 			} else if (filters.size() > 1 && p_filter == 0) {
 				// Match all filters.
 				for (int i = 0; i < filters.size(); i++) {
-					String flt = filters[i].get_slice(";", 0);
+					String flt = filters[i].get_slicec(';', 0);
 					for (int j = 0; j < flt.get_slice_count(","); j++) {
-						String str = flt.get_slice(",", j).strip_edges();
+						String str = flt.get_slicec(',', j).strip_edges();
 						if (f.matchn(str)) {
 							valid = true;
 							break;
@@ -178,10 +186,10 @@ void FileDialog::_native_dialog_cb_with_options(bool p_ok, const Vector<String>
 					idx--;
 				}
 				if (idx >= 0 && idx < filters.size()) {
-					String flt = filters[idx].get_slice(";", 0);
+					String flt = filters[idx].get_slicec(';', 0);
 					int filter_slice_count = flt.get_slice_count(",");
 					for (int j = 0; j < filter_slice_count; j++) {
-						String str = (flt.get_slice(",", j).strip_edges());
+						String str = flt.get_slicec(',', j).strip_edges();
 						if (f.matchn(str)) {
 							valid = true;
 							break;
@@ -189,8 +197,8 @@ void FileDialog::_native_dialog_cb_with_options(bool p_ok, const Vector<String>
 					}
 
 					if (!valid && filter_slice_count > 0) {
-						String str = (flt.get_slice(",", 0).strip_edges());
-						f += str.substr(1, str.length() - 1);
+						String str = flt.get_slicec(',', 0).strip_edges();
+						f += str.substr(1);
 						file->set_text(f.get_file());
 						valid = true;
 					}
@@ -202,8 +210,8 @@ void FileDialog::_native_dialog_cb_with_options(bool p_ok, const Vector<String>
 			// Add first extension of filter if no valid extension is found.
 			if (!valid) {
 				int idx = p_filter;
-				String flt = filters[idx].get_slice(";", 0);
-				String ext = flt.get_slice(",", 0).strip_edges().get_extension();
+				String flt = filters[idx].get_slicec(';', 0);
+				String ext = flt.get_slicec(',', 0).strip_edges().get_extension();
 				f += "." + ext;
 			}
 			emit_signal(SNAME("file_selected"), f);
@@ -478,7 +486,7 @@ void FileDialog::_post_popup() {
 void FileDialog::_push_history() {
 	local_history.resize(local_history_pos + 1);
 	String new_path = dir_access->get_current_dir();
-	if (local_history.size() == 0 || new_path != local_history[local_history_pos]) {
+	if (local_history.is_empty() || new_path != local_history[local_history_pos]) {
 		local_history.push_back(new_path);
 		local_history_pos++;
 		dir_prev->set_disabled(local_history_pos == 0);
@@ -514,7 +522,7 @@ void FileDialog::_action_pressed() {
 	} else if (mode == FILE_MODE_OPEN_ANY || mode == FILE_MODE_OPEN_DIR) {
 		String path = dir_access->get_current_dir();
 
-		path = path.replace("\\", "/");
+		path = path.replace_char('\\', '/');
 		TreeItem *item = tree->get_selected();
 		if (item) {
 			Dictionary d = item->get_metadata(0);
@@ -535,9 +543,9 @@ void FileDialog::_action_pressed() {
 		} else if (filters.size() > 1 && filter->get_selected() == 0) {
 			// Match all filters.
 			for (int i = 0; i < filters.size(); i++) {
-				String flt = filters[i].get_slice(";", 0);
+				String flt = filters[i].get_slicec(';', 0);
 				for (int j = 0; j < flt.get_slice_count(","); j++) {
-					String str = flt.get_slice(",", j).strip_edges();
+					String str = flt.get_slicec(',', j).strip_edges();
 					if (f.matchn(str)) {
 						valid = true;
 						break;
@@ -553,10 +561,10 @@ void FileDialog::_action_pressed() {
 				idx--;
 			}
 			if (idx >= 0 && idx < filters.size()) {
-				String flt = filters[idx].get_slice(";", 0);
+				String flt = filters[idx].get_slicec(';', 0);
 				int filter_slice_count = flt.get_slice_count(",");
 				for (int j = 0; j < filter_slice_count; j++) {
-					String str = (flt.get_slice(",", j).strip_edges());
+					String str = (flt.get_slicec(',', j).strip_edges());
 					if (f.matchn(str)) {
 						valid = true;
 						break;
@@ -564,8 +572,8 @@ void FileDialog::_action_pressed() {
 				}
 
 				if (!valid && filter_slice_count > 0) {
-					String str = (flt.get_slice(",", 0).strip_edges());
-					f += str.substr(1, str.length() - 1);
+					String str = flt.get_slicec(',', 0).strip_edges();
+					f += str.substr(1);
 					file->set_text(f.get_file());
 					valid = true;
 				}
@@ -661,10 +669,10 @@ void FileDialog::deselect_all() {
 		switch (mode) {
 			case FILE_MODE_OPEN_FILE:
 			case FILE_MODE_OPEN_FILES:
-				set_ok_button_text(ETR("Open"));
+				set_internal_ok_text(ETR("Open"));
 				break;
 			case FILE_MODE_OPEN_DIR:
-				set_ok_button_text(ETR("Select Current Folder"));
+				set_internal_ok_text(ETR("Select Current Folder"));
 				break;
 			case FILE_MODE_OPEN_ANY:
 				set_ok_button_text(ETR("Open"));
@@ -690,14 +698,14 @@ void FileDialog::_tree_selected() {
 	if (!d["dir"]) {
 		file->set_text(d["name"]);
 		if (mode == FILE_MODE_SAVE_FILE) {
-			set_ok_button_text(ETR("Save"));
+			set_internal_ok_text(ETR("Save"));
 		} else {
-			set_ok_button_text(ETR("Open"));
+			set_internal_ok_text(ETR("Open"));
 		}
 	} else if (mode == FILE_MODE_OPEN_DIR || mode == FILE_MODE_OPEN_ANY || !dir_access->file_exists(file->get_text())) {
 		file->set_text("");
 		if (mode == FILE_MODE_OPEN_DIR || mode == FILE_MODE_OPEN_ANY) {
-			set_ok_button_text(ETR("Select This Folder"));
+			set_internal_ok_text(ETR("Select This Folder"));
 		}
 	}
 
@@ -862,9 +870,9 @@ void FileDialog::update_file_list() {
 	} else if (filters.size() > 1 && filter->get_selected() == 0) {
 		// match all filters
 		for (int i = 0; i < filters.size(); i++) {
-			String f = filters[i].get_slice(";", 0);
+			String f = filters[i].get_slicec(';', 0);
 			for (int j = 0; j < f.get_slice_count(","); j++) {
-				patterns.push_back(f.get_slice(",", j).strip_edges());
+				patterns.push_back(f.get_slicec(',', j).strip_edges());
 			}
 		}
 	} else {
@@ -874,9 +882,9 @@ void FileDialog::update_file_list() {
 		}
 
 		if (idx >= 0 && idx < filters.size()) {
-			String f = filters[idx].get_slice(";", 0);
+			String f = filters[idx].get_slicec(';', 0);
 			for (int j = 0; j < f.get_slice_count(","); j++) {
-				patterns.push_back(f.get_slice(",", j).strip_edges());
+				patterns.push_back(f.get_slicec(',', j).strip_edges());
 			}
 		}
 	}
@@ -1184,7 +1192,7 @@ void FileDialog::set_current_path(const String &p_path) {
 		set_current_file(p_path);
 	} else {
 		String path_dir = p_path.substr(0, pos);
-		String path_file = p_path.substr(pos + 1, p_path.length());
+		String path_file = p_path.substr(pos + 1);
 		set_current_dir(path_dir);
 		set_current_file(path_file);
 	}
@@ -1227,35 +1235,35 @@ void FileDialog::set_file_mode(FileMode p_mode) {
 	mode = p_mode;
 	switch (mode) {
 		case FILE_MODE_OPEN_FILE:
-			set_ok_button_text(ETR("Open"));
+			set_internal_ok_text(ETR("Open"));
 			if (mode_overrides_title) {
 				set_title(ETR("Open a File"));
 			}
 			makedir->hide();
 			break;
 		case FILE_MODE_OPEN_FILES:
-			set_ok_button_text(ETR("Open"));
+			set_internal_ok_text(ETR("Open"));
 			if (mode_overrides_title) {
 				set_title(ETR("Open File(s)"));
 			}
 			makedir->hide();
 			break;
 		case FILE_MODE_OPEN_DIR:
-			set_ok_button_text(ETR("Select Current Folder"));
+			set_internal_ok_text(ETR("Select Current Folder"));
 			if (mode_overrides_title) {
 				set_title(ETR("Open a Directory"));
 			}
 			makedir->show();
 			break;
 		case FILE_MODE_OPEN_ANY:
-			set_ok_button_text(ETR("Open"));
+			set_internal_ok_text(ETR("Open"));
 			if (mode_overrides_title) {
 				set_title(ETR("Open a File or Directory"));
 			}
 			makedir->show();
 			break;
 		case FILE_MODE_SAVE_FILE:
-			set_ok_button_text(ETR("Save"));
+			set_internal_ok_text(ETR("Save"));
 			if (mode_overrides_title) {
 				set_title(ETR("Save a File"));
 			}
@@ -1434,9 +1442,11 @@ void FileDialog::_update_option_controls() {
 	for (const FileDialog::Option &opt : options) {
 		Label *lbl = memnew(Label);
 		lbl->set_text(opt.name);
+		lbl->set_focus_mode(Control::FOCUS_NONE);
 		grid_options->add_child(lbl);
 		if (opt.values.is_empty()) {
 			CheckBox *cb = memnew(CheckBox);
+			cb->set_accessibility_name(opt.name);
 			cb->set_pressed(opt.default_idx);
 			grid_options->add_child(cb);
 			cb->connect(SceneStringName(toggled), callable_mp(this, &FileDialog::_option_changed_checkbox_toggled).bind(opt.name));
@@ -1446,6 +1456,7 @@ void FileDialog::_update_option_controls() {
 			for (const String &val : opt.values) {
 				ob->add_item(val);
 			}
+			ob->set_accessibility_name(opt.name);
 			ob->select(opt.default_idx);
 			grid_options->add_child(ob);
 			ob->connect(SceneStringName(item_selected), callable_mp(this, &FileDialog::_option_changed_item_selected).bind(opt.name));
@@ -1724,11 +1735,14 @@ FileDialog::FileDialog() {
 
 	dir_prev = memnew(Button);
 	dir_prev->set_theme_type_variation(SceneStringName(FlatButton));
+	dir_prev->set_accessibility_name(ETR("Previous"));
 	dir_prev->set_tooltip_text(ETR("Go to previous folder."));
 	dir_next = memnew(Button);
+	dir_next->set_accessibility_name(ETR("Next"));
 	dir_next->set_theme_type_variation(SceneStringName(FlatButton));
 	dir_next->set_tooltip_text(ETR("Go to next folder."));
 	dir_up = memnew(Button);
+	dir_up->set_accessibility_name(ETR("Parent Folder"));
 	dir_up->set_theme_type_variation(SceneStringName(FlatButton));
 	dir_up->set_tooltip_text(ETR("Go to parent folder."));
 	hbc->add_child(dir_prev);
@@ -1738,22 +1752,27 @@ FileDialog::FileDialog() {
 	dir_next->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::_go_forward));
 	dir_up->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::_go_up));
 
-	hbc->add_child(memnew(Label(ETR("Path:"))));
+	Label *lbl_path = memnew(Label(ETR("Path:")));
+	lbl_path->set_focus_mode(Control::FOCUS_NONE);
+	hbc->add_child(lbl_path);
 
 	drives_container = memnew(HBoxContainer);
 	hbc->add_child(drives_container);
 
 	drives = memnew(OptionButton);
 	drives->connect(SceneStringName(item_selected), callable_mp(this, &FileDialog::_select_drive));
+	drives->set_accessibility_name(ETR("Drive"));
 	hbc->add_child(drives);
 
 	dir = memnew(LineEdit);
+	dir->set_accessibility_name(ETR("Directory Path"));
 	dir->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	hbc->add_child(dir);
 	dir->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 
 	refresh = memnew(Button);
 	refresh->set_theme_type_variation(SceneStringName(FlatButton));
+	refresh->set_accessibility_name(ETR("Refresh"));
 	refresh->set_tooltip_text(ETR("Refresh files."));
 	refresh->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::update_file_list));
 	hbc->add_child(refresh);
@@ -1762,6 +1781,7 @@ FileDialog::FileDialog() {
 	show_hidden->set_theme_type_variation(SceneStringName(FlatButton));
 	show_hidden->set_toggle_mode(true);
 	show_hidden->set_pressed(is_showing_hidden_files());
+	show_hidden->set_accessibility_name(ETR("Show Hidden Files"));
 	show_hidden->set_tooltip_text(ETR("Toggle the visibility of hidden files."));
 	show_hidden->connect(SceneStringName(toggled), callable_mp(this, &FileDialog::set_show_hidden_files));
 	hbc->add_child(show_hidden);
@@ -1770,7 +1790,8 @@ FileDialog::FileDialog() {
 	show_filename_filter_button->set_theme_type_variation(SceneStringName(FlatButton));
 	show_filename_filter_button->set_toggle_mode(true);
 	show_filename_filter_button->set_pressed(false);
-	show_filename_filter_button->set_tooltip_text(RTR("Toggle the visibility of the filter for file names."));
+	show_filename_filter_button->set_accessibility_name(ETR("Filter File Names"));
+	show_filename_filter_button->set_tooltip_text(ETR("Toggle the visibility of the filter for file names."));
 	show_filename_filter_button->connect(SceneStringName(toggled), callable_mp(this, &FileDialog::set_show_filename_filter));
 	hbc->add_child(show_filename_filter_button);
 
@@ -1779,6 +1800,7 @@ FileDialog::FileDialog() {
 
 	makedir = memnew(Button);
 	makedir->set_theme_type_variation(SceneStringName(FlatButton));
+	makedir->set_accessibility_name(ETR("Create New Folder"));
 	makedir->set_tooltip_text(ETR("Create a new folder."));
 	makedir->connect(SceneStringName(pressed), callable_mp(this, &FileDialog::_make_dir));
 	hbc->add_child(makedir);
@@ -1786,6 +1808,7 @@ FileDialog::FileDialog() {
 
 	tree = memnew(Tree);
 	tree->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
+	tree->set_accessibility_name(ETR("Directories and Files"));
 	tree->set_hide_root(true);
 	vbox->add_margin_child(ETR("Directories & Files:"), tree, true);
 
@@ -1797,19 +1820,24 @@ FileDialog::FileDialog() {
 	tree->add_child(message);
 
 	filename_filter_box = memnew(HBoxContainer);
-	filename_filter_box->add_child(memnew(Label(RTR("Filter:"))));
+	filename_filter_box->add_child(memnew(Label(ETR("Filter:"))));
 	filename_filter = memnew(LineEdit);
 	filename_filter->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	filename_filter->set_stretch_ratio(4);
 	filename_filter->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 	filename_filter->set_clear_button_enabled(true);
+	filename_filter->set_accessibility_name(ETR("Filename Filter"));
 	filename_filter_box->add_child(filename_filter);
 	filename_filter_box->set_visible(false);
 	vbox->add_child(filename_filter_box);
 
 	file_box = memnew(HBoxContainer);
-	file_box->add_child(memnew(Label(ETR("File:"))));
+	Label *lbl_file = memnew(Label(ETR("File:")));
+	lbl_file->set_focus_mode(Control::FOCUS_NONE);
+	file_box->add_child(lbl_file);
+
 	file = memnew(LineEdit);
+	file->set_accessibility_name(ETR("File Name"));
 	file->set_structured_text_bidi_override(TextServer::STRUCTURED_TEXT_FILE);
 	file->set_stretch_ratio(4);
 	file->set_h_size_flags(Control::SIZE_EXPAND_FILL);
@@ -1878,6 +1906,7 @@ FileDialog::FileDialog() {
 
 	set_hide_on_ok(false);
 	set_size(Size2(640, 360));
+	set_internal_ok_text(ETR("Save")); // Default mode text.
 
 	if (register_func) {
 		register_func(this);
diff --git a/engine/scene/gui/file_dialog.h b/engine/scene/gui/file_dialog.h
index af8e8950..7f822be9 100644
--- a/engine/scene/gui/file_dialog.h
+++ b/engine/scene/gui/file_dialog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FILE_DIALOG_H
-#define FILE_DIALOG_H
+#pragma once
 
 #include "box_container.h"
 #include "core/io/dir_access.h"
@@ -298,5 +297,3 @@ public:
 
 VARIANT_ENUM_CAST(FileDialog::FileMode);
 VARIANT_ENUM_CAST(FileDialog::Access);
-
-#endif // FILE_DIALOG_H
diff --git a/engine/scene/gui/flow_container.h b/engine/scene/gui/flow_container.h
index 6a00e5b0..13d1abc3 100644
--- a/engine/scene/gui/flow_container.h
+++ b/engine/scene/gui/flow_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FLOW_CONTAINER_H
-#define FLOW_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -116,5 +115,3 @@ public:
 
 VARIANT_ENUM_CAST(FlowContainer::AlignmentMode);
 VARIANT_ENUM_CAST(FlowContainer::LastWrapAlignmentMode);
-
-#endif // FLOW_CONTAINER_H
diff --git a/engine/scene/gui/foldable_container.cpp b/engine/scene/gui/foldable_container.cpp
new file mode 100644
index 00000000..33489a35
--- /dev/null
+++ b/engine/scene/gui/foldable_container.cpp
@@ -0,0 +1,652 @@
+/**************************************************************************/
+/*  foldable_container.cpp                                                */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#include "foldable_container.h"
+
+#include "scene/resources/text_line.h"
+#include "scene/theme/theme_db.h"
+
+Size2 FoldableContainer::get_minimum_size() const {
+	_update_title_min_size();
+
+	if (folded) {
+		return title_minimum_size;
+	}
+	Size2 ms;
+
+	for (int i = 0; i < get_child_count(); i++) {
+		Control *c = as_sortable_control(get_child(i));
+		if (!c) {
+			continue;
+		}
+		ms = ms.max(c->get_combined_minimum_size());
+	}
+	ms += theme_cache.panel_style->get_minimum_size();
+
+	return Size2(MAX(ms.width, title_minimum_size.width), ms.height + title_minimum_size.height);
+}
+
+void FoldableContainer::fold() {
+	set_folded(true);
+	emit_signal(SNAME("folding_changed"), folded);
+}
+
+void FoldableContainer::expand() {
+	set_folded(false);
+	emit_signal(SNAME("folding_changed"), folded);
+}
+
+void FoldableContainer::set_folded(bool p_folded) {
+	if (folded != p_folded) {
+		if (!changing_group && foldable_group.is_valid()) {
+			if (!p_folded) {
+				_update_group();
+				foldable_group->emit_signal(SNAME("expanded"), this);
+			} else if (!foldable_group->updating_group && foldable_group->get_expanded_container() == this && !foldable_group->is_allow_folding_all()) {
+				return;
+			}
+		}
+		folded = p_folded;
+
+		update_minimum_size();
+		queue_sort();
+		queue_redraw();
+	}
+}
+
+bool FoldableContainer::is_folded() const {
+	return folded;
+}
+
+void FoldableContainer::set_foldable_group(const Ref<FoldableGroup> &p_group) {
+	if (foldable_group.is_valid()) {
+		foldable_group->containers.erase(this);
+	}
+
+	foldable_group = p_group;
+
+	if (foldable_group.is_valid()) {
+		changing_group = true;
+		if (folded && !foldable_group->get_expanded_container() && !foldable_group->is_allow_folding_all()) {
+			set_folded(false);
+		} else if (!folded && foldable_group->get_expanded_container()) {
+			set_folded(true);
+		}
+		foldable_group->containers.insert(this);
+		changing_group = false;
+	}
+
+	queue_redraw();
+}
+
+Ref<FoldableGroup> FoldableContainer::get_foldable_group() const {
+	return foldable_group;
+}
+
+void FoldableContainer::set_text(const String &p_text) {
+	if (text == p_text) {
+		return;
+	}
+	text = p_text;
+	_shape();
+	update_minimum_size();
+	queue_redraw();
+}
+
+String FoldableContainer::get_text() const {
+	return text;
+}
+
+void FoldableContainer::set_text_alignment(HorizontalAlignment p_alignment) {
+	ERR_FAIL_INDEX((int)p_alignment, 3);
+	text_alignment = p_alignment;
+
+	if (_get_actual_alignment() != text_buf->get_horizontal_alignment()) {
+		_shape();
+		queue_redraw();
+	}
+}
+
+HorizontalAlignment FoldableContainer::get_text_alignment() const {
+	return text_alignment;
+}
+
+void FoldableContainer::set_language(const String &p_language) {
+	if (language == p_language) {
+		return;
+	}
+	language = p_language;
+	_shape();
+	update_minimum_size();
+	queue_redraw();
+}
+
+String FoldableContainer::get_language() const {
+	return language;
+}
+
+void FoldableContainer::set_text_direction(TextDirection p_text_direction) {
+	ERR_FAIL_INDEX(int(p_text_direction), 4);
+	if (text_direction == p_text_direction) {
+		return;
+	}
+	text_direction = p_text_direction;
+	_shape();
+	queue_redraw();
+}
+
+Control::TextDirection FoldableContainer::get_text_direction() const {
+	return text_direction;
+}
+
+void FoldableContainer::set_text_overrun_behavior(TextServer::OverrunBehavior p_overrun_behavior) {
+	if (overrun_behavior == p_overrun_behavior) {
+		return;
+	}
+	overrun_behavior = p_overrun_behavior;
+	_shape();
+	update_minimum_size();
+	queue_redraw();
+}
+
+TextServer::OverrunBehavior FoldableContainer::get_text_overrun_behavior() const {
+	return overrun_behavior;
+}
+
+void FoldableContainer::set_title_position(TitlePosition p_title_position) {
+	ERR_FAIL_INDEX(p_title_position, POSITION_MAX);
+	if (title_position == p_title_position) {
+		return;
+	}
+	title_position = p_title_position;
+	queue_redraw();
+	queue_sort();
+}
+
+FoldableContainer::TitlePosition FoldableContainer::get_title_position() const {
+	return title_position;
+}
+
+void FoldableContainer::add_title_bar_control(Control *p_control) {
+	ERR_FAIL_NULL(p_control);
+	if (p_control->get_parent()) {
+		p_control->get_parent()->remove_child(p_control);
+		ERR_FAIL_COND_MSG(p_control->get_parent() != nullptr, "Failed to remove control from parent.");
+	}
+	add_child(p_control, false, INTERNAL_MODE_FRONT);
+	title_controls.push_back(p_control);
+}
+
+void FoldableContainer::remove_title_bar_control(Control *p_control) {
+	ERR_FAIL_NULL(p_control);
+
+	int64_t index = title_controls.find(p_control);
+	ERR_FAIL_COND_MSG(index == -1, "Can't remove control from title bar.");
+
+	title_controls.remove_at(index);
+	remove_child(p_control);
+}
+
+void FoldableContainer::gui_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+
+	Ref<InputEventMouseMotion> m = p_event;
+	if (m.is_valid()) {
+		Rect2 title_rect = Rect2(0, (title_position == POSITION_TOP) ? 0 : get_size().height - title_minimum_size.height, get_size().width, title_minimum_size.height);
+		if (title_rect.has_point(m->get_position())) {
+			if (!is_hovering) {
+				is_hovering = true;
+				queue_redraw();
+			}
+		} else if (is_hovering) {
+			is_hovering = false;
+			queue_redraw();
+		}
+		return;
+	}
+
+	if (p_event->is_action_pressed(SNAME("ui_accept"), false, true)) {
+		set_folded(!folded);
+		emit_signal(SNAME("folding_changed"), folded);
+		accept_event();
+		return;
+	}
+
+	Ref<InputEventMouseButton> b = p_event;
+	if (b.is_valid()) {
+		Rect2 title_rect = Rect2(0, (title_position == POSITION_TOP) ? 0 : get_size().height - title_minimum_size.height, get_size().width, title_minimum_size.height);
+		if (b->get_button_index() == MouseButton::LEFT && b->is_pressed() && title_rect.has_point(b->get_position())) {
+			set_folded(!folded);
+			emit_signal(SNAME("folding_changed"), folded);
+			accept_event();
+		}
+	}
+}
+
+String FoldableContainer::get_tooltip(const Point2 &p_pos) const {
+	if (Rect2(0, (title_position == POSITION_TOP) ? 0 : get_size().height - title_minimum_size.height, get_size().width, title_minimum_size.height).has_point(p_pos)) {
+		return Control::get_tooltip(p_pos);
+	}
+	return String();
+}
+
+void FoldableContainer::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_DRAW: {
+			RID ci = get_canvas_item();
+			Size2 size = get_size();
+			int h_separation = _get_h_separation();
+
+			Ref<StyleBox> title_style = _get_title_style();
+			Ref<Texture2D> icon = _get_title_icon();
+
+			real_t title_controls_width = _get_title_controls_width();
+			if (title_controls_width > 0) {
+				title_controls_width += h_separation;
+			}
+
+			Rect2 title_rect(
+					Point2(0, (title_position == POSITION_TOP) ? 0 : size.height - title_minimum_size.height),
+					Size2(size.width, title_minimum_size.height));
+			_draw_flippable_stylebox(title_style, title_rect);
+
+			Size2 title_ms = title_style->get_minimum_size();
+			int title_text_width = size.width - title_ms.width;
+
+			int title_style_ofs = (title_position == POSITION_TOP) ? title_style->get_margin(SIDE_TOP) : title_style->get_margin(SIDE_BOTTOM);
+			Point2 title_text_pos(title_style->get_margin(SIDE_LEFT), title_style_ofs);
+			title_text_pos.y += MAX((title_minimum_size.height - title_ms.height - text_buf->get_size().height) * 0.5, 0);
+
+			title_text_width -= icon->get_width() + h_separation + title_controls_width;
+			Point2 icon_pos(0, MAX((title_minimum_size.height - title_ms.height - icon->get_height()) * 0.5, 0) + title_style_ofs);
+
+			bool rtl = is_layout_rtl();
+			if (rtl) {
+				icon_pos.x = size.width - title_style->get_margin(SIDE_RIGHT) - icon->get_width();
+				title_text_pos.x += title_controls_width;
+			} else {
+				icon_pos.x = title_style->get_margin(SIDE_LEFT);
+				title_text_pos.x += icon->get_width() + h_separation;
+			}
+			icon->draw(ci, title_rect.position + icon_pos);
+
+			Color font_color = folded ? theme_cache.title_collapsed_font_color : theme_cache.title_font_color;
+			if (is_hovering) {
+				font_color = theme_cache.title_hovered_font_color;
+			}
+			text_buf->set_width(title_text_width);
+
+			if (title_text_width > 0) {
+				if (theme_cache.title_font_outline_size > 0 && theme_cache.title_font_outline_color.a > 0) {
+					text_buf->draw_outline(ci, title_rect.position + title_text_pos, theme_cache.title_font_outline_size, theme_cache.title_font_outline_color);
+				}
+				text_buf->draw(ci, title_rect.position + title_text_pos, font_color);
+			}
+
+			if (!folded) {
+				Rect2 panel_rect(
+						Point2(0, (title_position == POSITION_TOP) ? title_minimum_size.height : 0),
+						Size2(size.width, size.height - title_minimum_size.height));
+				_draw_flippable_stylebox(theme_cache.panel_style, panel_rect);
+			}
+
+			if (has_focus()) {
+				Rect2 focus_rect = folded ? title_rect : Rect2(Point2(), size);
+				_draw_flippable_stylebox(theme_cache.focus_style, focus_rect);
+			}
+		} break;
+
+		case NOTIFICATION_SORT_CHILDREN: {
+			bool rtl = is_layout_rtl();
+			const Vector2 size = get_size();
+			const Ref<StyleBox> title_style = _get_title_style();
+
+			uint32_t title_count = title_controls.size();
+			if (title_count > 0) {
+				int h_separation = MAX(theme_cache.h_separation, 0);
+				real_t offset = 0.0;
+				if (rtl) {
+					offset = title_style->get_margin(SIDE_LEFT);
+				} else {
+					offset = _get_title_controls_width();
+					offset = size.x - title_style->get_margin(SIDE_RIGHT) - offset;
+				}
+
+				real_t v_center = title_minimum_size.y * 0.5;
+				if (title_position == POSITION_BOTTOM) {
+					v_center = size.y - v_center + (title_style->get_margin(SIDE_BOTTOM) - title_style->get_margin(SIDE_TOP)) * 0.5;
+				} else {
+					v_center += (title_style->get_margin(SIDE_TOP) - title_style->get_margin(SIDE_BOTTOM)) * 0.5;
+				}
+
+				for (uint32_t i = 0; i < title_count; i++) {
+					Control *control = title_controls[rtl ? title_count - i - 1 : i];
+					if (!control->is_visible()) {
+						continue;
+					}
+					Rect2 rect(Vector2(), control->get_combined_minimum_size());
+					rect.position.x = offset;
+					rect.position.y = v_center - rect.size.y * 0.5;
+					fit_child_in_rect(control, rect);
+
+					offset += rect.size.x + h_separation;
+				}
+			}
+
+			Rect2 inner_rect;
+			inner_rect.position.x = rtl ? theme_cache.panel_style->get_margin(SIDE_RIGHT) : theme_cache.panel_style->get_margin(SIDE_LEFT);
+			inner_rect.size.x = size.x - theme_cache.panel_style->get_margin(SIDE_LEFT) - theme_cache.panel_style->get_margin(SIDE_RIGHT);
+			inner_rect.position.y = theme_cache.panel_style->get_margin(SIDE_TOP);
+
+			inner_rect.size.y = size.y - theme_cache.panel_style->get_margin(SIDE_TOP) - theme_cache.panel_style->get_margin(SIDE_BOTTOM) - title_minimum_size.y;
+			if (title_position == POSITION_TOP) {
+				inner_rect.position.y += title_minimum_size.y;
+			}
+
+			for (int i = 0; i < get_child_count(false); i++) {
+				Control *c = as_sortable_control(get_child(i, false), SortableVisibilityMode::IGNORE);
+				if (!c) {
+					continue;
+				}
+				c->set_visible(!folded);
+
+				if (!folded) {
+					fit_child_in_rect(c, inner_rect);
+				}
+			}
+		} break;
+
+		case NOTIFICATION_MOUSE_EXIT: {
+			if (is_hovering) {
+				is_hovering = false;
+				queue_redraw();
+			}
+		} break;
+
+		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
+		case NOTIFICATION_TRANSLATION_CHANGED:
+		case NOTIFICATION_THEME_CHANGED: {
+			_shape();
+			update_minimum_size();
+			queue_redraw();
+		} break;
+	}
+}
+
+real_t FoldableContainer::_get_title_controls_width() const {
+	real_t width = 0.0;
+	int visible_controls = 0;
+	for (const Control *control : title_controls) {
+		if (control->is_visible()) {
+			width += control->get_combined_minimum_size().x;
+			visible_controls++;
+		}
+	}
+	if (visible_controls > 1) {
+		width += _get_h_separation() * (visible_controls - 1);
+	}
+	return width;
+}
+
+Ref<StyleBox> FoldableContainer::_get_title_style() const {
+	if (is_hovering) {
+		return folded ? theme_cache.title_collapsed_hover_style : theme_cache.title_hover_style;
+	}
+	return folded ? theme_cache.title_collapsed_style : theme_cache.title_style;
+}
+
+Ref<Texture2D> FoldableContainer::_get_title_icon() const {
+	if (!folded) {
+		return (title_position == POSITION_TOP) ? theme_cache.expanded_arrow : theme_cache.expanded_arrow_mirrored;
+	} else if (is_layout_rtl()) {
+		return theme_cache.folded_arrow_mirrored;
+	}
+	return theme_cache.folded_arrow;
+}
+
+void FoldableContainer::_update_title_min_size() const {
+	Ref<StyleBox> title_style = folded ? theme_cache.title_collapsed_style : theme_cache.title_style;
+	Ref<Texture2D> icon = _get_title_icon();
+	Size2 title_ms = title_style->get_minimum_size();
+	int h_separation = _get_h_separation();
+
+	title_minimum_size = title_ms;
+	title_minimum_size.width += icon->get_width();
+
+	if (!text.is_empty()) {
+		title_minimum_size.width += h_separation;
+		Size2 text_size = text_buf->get_size();
+		title_minimum_size.height += MAX(text_size.height, icon->get_height());
+		if (overrun_behavior == TextServer::OverrunBehavior::OVERRUN_NO_TRIMMING) {
+			title_minimum_size.width += text_size.width;
+		}
+	} else {
+		title_minimum_size.height += icon->get_height();
+	}
+
+	if (!title_controls.is_empty()) {
+		real_t controls_height = 0;
+		int visible_controls = 0;
+
+		for (const Control *control : title_controls) {
+			if (!control->is_visible()) {
+				continue;
+			}
+			Vector2 size = control->get_combined_minimum_size();
+			title_minimum_size.width += size.width;
+			controls_height = MAX(controls_height, size.height);
+			visible_controls++;
+		}
+		if (visible_controls > 0) {
+			title_minimum_size.width += h_separation * visible_controls;
+		}
+		title_minimum_size.height = MAX(title_minimum_size.height, title_ms.height + controls_height);
+	}
+}
+
+void FoldableContainer::_shape() {
+	Ref<Font> font = theme_cache.title_font;
+	int font_size = theme_cache.title_font_size;
+	if (font.is_null() || font_size == 0) {
+		return;
+	}
+
+	text_buf->clear();
+	text_buf->set_width(-1);
+
+	if (text_direction == TEXT_DIRECTION_INHERITED) {
+		text_buf->set_direction(is_layout_rtl() ? TextServer::DIRECTION_RTL : TextServer::DIRECTION_LTR);
+	} else {
+		text_buf->set_direction((TextServer::Direction)text_direction);
+	}
+	text_buf->set_horizontal_alignment(_get_actual_alignment());
+	text_buf->set_text_overrun_behavior(overrun_behavior);
+	text_buf->add_string(atr(text), font, font_size, language);
+}
+
+HorizontalAlignment FoldableContainer::_get_actual_alignment() const {
+	if (is_layout_rtl()) {
+		if (text_alignment == HORIZONTAL_ALIGNMENT_RIGHT) {
+			return HORIZONTAL_ALIGNMENT_LEFT;
+		} else if (text_alignment == HORIZONTAL_ALIGNMENT_LEFT) {
+			return HORIZONTAL_ALIGNMENT_RIGHT;
+		}
+	}
+	return text_alignment;
+}
+
+void FoldableContainer::_update_group() {
+	foldable_group->updating_group = true;
+	for (FoldableContainer *container : foldable_group->containers) {
+		if (container != this) {
+			container->set_folded(true);
+		}
+	}
+	foldable_group->updating_group = false;
+}
+
+void FoldableContainer::_draw_flippable_stylebox(const Ref<StyleBox> p_stylebox, const Rect2 &p_rect) {
+	if (title_position == POSITION_BOTTOM) {
+		Rect2 rect(-p_rect.position, p_rect.size);
+		draw_set_transform(Point2(0.0, p_stylebox->get_draw_rect(rect).size.height), 0.0, Size2(1.0, -1.0));
+		p_stylebox->draw(get_canvas_item(), rect);
+		draw_set_transform_matrix(Transform2D());
+	} else {
+		p_stylebox->draw(get_canvas_item(), p_rect);
+	}
+}
+
+void FoldableContainer::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("fold"), &FoldableContainer::fold);
+	ClassDB::bind_method(D_METHOD("expand"), &FoldableContainer::expand);
+	ClassDB::bind_method(D_METHOD("set_folded", "folded"), &FoldableContainer::set_folded);
+	ClassDB::bind_method(D_METHOD("is_folded"), &FoldableContainer::is_folded);
+	ClassDB::bind_method(D_METHOD("set_foldable_group", "button_group"), &FoldableContainer::set_foldable_group);
+	ClassDB::bind_method(D_METHOD("get_foldable_group"), &FoldableContainer::get_foldable_group);
+	ClassDB::bind_method(D_METHOD("set_text", "text"), &FoldableContainer::set_text);
+	ClassDB::bind_method(D_METHOD("get_text"), &FoldableContainer::get_text);
+	ClassDB::bind_method(D_METHOD("set_title_alignment", "alignment"), &FoldableContainer::set_text_alignment);
+	ClassDB::bind_method(D_METHOD("get_title_alignment"), &FoldableContainer::get_text_alignment);
+	ClassDB::bind_method(D_METHOD("set_language", "language"), &FoldableContainer::set_language);
+	ClassDB::bind_method(D_METHOD("get_language"), &FoldableContainer::get_language);
+	ClassDB::bind_method(D_METHOD("set_text_direction", "text_direction"), &FoldableContainer::set_text_direction);
+	ClassDB::bind_method(D_METHOD("get_text_direction"), &FoldableContainer::get_text_direction);
+	ClassDB::bind_method(D_METHOD("set_text_overrun_behavior", "overrun_behavior"), &FoldableContainer::set_text_overrun_behavior);
+	ClassDB::bind_method(D_METHOD("get_text_overrun_behavior"), &FoldableContainer::get_text_overrun_behavior);
+	ClassDB::bind_method(D_METHOD("set_title_position", "title_position"), &FoldableContainer::set_title_position);
+	ClassDB::bind_method(D_METHOD("get_title_position"), &FoldableContainer::get_title_position);
+	ClassDB::bind_method(D_METHOD("add_title_bar_control", "control"), &FoldableContainer::add_title_bar_control);
+	ClassDB::bind_method(D_METHOD("remove_title_bar_control", "control"), &FoldableContainer::remove_title_bar_control);
+
+	ADD_SIGNAL(MethodInfo("folding_changed", PropertyInfo(Variant::BOOL, "is_folded")));
+
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "folded"), "set_folded", "is_folded");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text"), "set_text", "get_text");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "title_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right"), "set_title_alignment", "get_title_alignment");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "title_position", PROPERTY_HINT_ENUM, "Top,Bottom"), "set_title_position", "get_title_position");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "foldable_group", PROPERTY_HINT_RESOURCE_TYPE, "FoldableGroup"), "set_foldable_group", "get_foldable_group");
+
+	ADD_GROUP("BiDi", "");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_direction", PROPERTY_HINT_ENUM, "Auto,Left-to-Right,Right-to-Left,Inherited"), "set_text_direction", "get_text_direction");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "language", PROPERTY_HINT_LOCALE_ID), "set_language", "get_language");
+
+	BIND_ENUM_CONSTANT(POSITION_TOP);
+	BIND_ENUM_CONSTANT(POSITION_BOTTOM);
+
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, FoldableContainer, title_style, "title_panel");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, FoldableContainer, title_hover_style, "title_hover_panel");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, FoldableContainer, title_collapsed_style, "title_collapsed_panel");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, FoldableContainer, title_collapsed_hover_style, "title_collapsed_hover_panel");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, FoldableContainer, focus_style, "focus");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, FoldableContainer, panel_style, "panel");
+
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_FONT, FoldableContainer, title_font, "font");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_FONT_SIZE, FoldableContainer, title_font_size, "font_size");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_CONSTANT, FoldableContainer, title_font_outline_size, "outline_size");
+
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_COLOR, FoldableContainer, title_font_color, "font_color");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_COLOR, FoldableContainer, title_hovered_font_color, "hover_font_color");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_COLOR, FoldableContainer, title_collapsed_font_color, "collapsed_font_color");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_COLOR, FoldableContainer, title_font_outline_color, "font_outline_color");
+
+	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FoldableContainer, expanded_arrow);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FoldableContainer, expanded_arrow_mirrored);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FoldableContainer, folded_arrow);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_ICON, FoldableContainer, folded_arrow_mirrored);
+
+	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, FoldableContainer, h_separation);
+}
+
+FoldableContainer::FoldableContainer(const String &p_text) {
+	text_buf.instantiate();
+	set_text(p_text);
+	set_focus_mode(FOCUS_ALL);
+	set_mouse_filter(MOUSE_FILTER_STOP);
+}
+
+FoldableContainer::~FoldableContainer() {
+	if (foldable_group.is_valid()) {
+		foldable_group->containers.erase(this);
+	}
+}
+
+FoldableContainer *FoldableGroup::get_expanded_container() const {
+	for (FoldableContainer *container : containers) {
+		if (!container->is_folded()) {
+			return container;
+		}
+	}
+
+	return nullptr;
+}
+
+void FoldableGroup::set_allow_folding_all(bool p_enabled) {
+	allow_folding_all = p_enabled;
+	if (!allow_folding_all && !get_expanded_container() && containers.size() > 0) {
+		updating_group = true;
+		(*containers.begin())->set_folded(false);
+		updating_group = false;
+	}
+}
+
+bool FoldableGroup::is_allow_folding_all() const {
+	return allow_folding_all;
+}
+
+void FoldableGroup::get_containers(List<FoldableContainer *> *r_containers) const {
+	for (FoldableContainer *container : containers) {
+		r_containers->push_back(container);
+	}
+}
+
+TypedArray<FoldableContainer> FoldableGroup::_get_containers() const {
+	TypedArray<FoldableContainer> foldable_containers;
+	for (const FoldableContainer *container : containers) {
+		foldable_containers.push_back(container);
+	}
+
+	return foldable_containers;
+}
+
+void FoldableGroup::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("get_expanded_container"), &FoldableGroup::get_expanded_container);
+	ClassDB::bind_method(D_METHOD("get_containers"), &FoldableGroup::_get_containers);
+	ClassDB::bind_method(D_METHOD("set_allow_folding_all", "enabled"), &FoldableGroup::set_allow_folding_all);
+	ClassDB::bind_method(D_METHOD("is_allow_folding_all"), &FoldableGroup::is_allow_folding_all);
+
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_folding_all"), "set_allow_folding_all", "is_allow_folding_all");
+
+	ADD_SIGNAL(MethodInfo("expanded", PropertyInfo(Variant::OBJECT, "container", PROPERTY_HINT_RESOURCE_TYPE, "FoldableContainer")));
+}
+
+FoldableGroup::FoldableGroup() {
+	set_local_to_scene(true);
+}
diff --git a/engine/scene/gui/foldable_container.h b/engine/scene/gui/foldable_container.h
new file mode 100644
index 00000000..40a0b870
--- /dev/null
+++ b/engine/scene/gui/foldable_container.h
@@ -0,0 +1,171 @@
+/**************************************************************************/
+/*  foldable_container.h                                                  */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "scene/gui/container.h"
+
+class FoldableGroup;
+class TextLine;
+
+class FoldableContainer : public Container {
+	GDCLASS(FoldableContainer, Container);
+
+public:
+	enum TitlePosition {
+		POSITION_TOP,
+		POSITION_BOTTOM,
+		POSITION_MAX
+	};
+
+private:
+	bool folded = false;
+	String text;
+	Ref<FoldableGroup> foldable_group;
+	String language;
+	TextDirection text_direction = TEXT_DIRECTION_AUTO;
+	HorizontalAlignment text_alignment = HORIZONTAL_ALIGNMENT_LEFT;
+	TextServer::OverrunBehavior overrun_behavior = TextServer::OVERRUN_NO_TRIMMING;
+	TitlePosition title_position = POSITION_TOP;
+
+	Ref<TextLine> text_buf;
+	bool changing_group = false;
+	bool is_hovering = false;
+	mutable Vector2 title_minimum_size;
+
+	LocalVector<Control *> title_controls;
+
+	struct ThemeCache {
+		Ref<StyleBox> title_style;
+		Ref<StyleBox> title_hover_style;
+		Ref<StyleBox> title_collapsed_style;
+		Ref<StyleBox> title_collapsed_hover_style;
+		Ref<StyleBox> panel_style;
+		Ref<StyleBox> focus_style;
+
+		Color title_font_color;
+		Color title_hovered_font_color;
+		Color title_collapsed_font_color;
+		Color title_font_outline_color;
+
+		Ref<Font> title_font;
+		int title_font_size = 0;
+		int title_font_outline_size = 0;
+
+		Ref<Texture2D> expanded_arrow;
+		Ref<Texture2D> expanded_arrow_mirrored;
+		Ref<Texture2D> folded_arrow;
+		Ref<Texture2D> folded_arrow_mirrored;
+
+		int h_separation = 0;
+	} theme_cache;
+
+	Ref<StyleBox> _get_title_style() const;
+	Ref<Texture2D> _get_title_icon() const;
+	int _get_h_separation() const { return MAX(theme_cache.h_separation, 0); }
+	real_t _get_title_controls_width() const;
+
+	void _update_title_min_size() const;
+	void _shape();
+	HorizontalAlignment _get_actual_alignment() const;
+	void _update_group();
+	void _draw_flippable_stylebox(const Ref<StyleBox> p_stylebox, const Rect2 &p_rect);
+
+protected:
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
+	virtual String get_tooltip(const Point2 &p_pos) const override;
+	void _notification(int p_what);
+	static void _bind_methods();
+
+public:
+	void fold();
+	void expand();
+
+	void set_folded(bool p_folded);
+	bool is_folded() const;
+
+	void set_foldable_group(const Ref<FoldableGroup> &p_group);
+	Ref<FoldableGroup> get_foldable_group() const;
+
+	void set_text(const String &p_text);
+	String get_text() const;
+
+	void set_text_alignment(HorizontalAlignment p_alignment);
+	HorizontalAlignment get_text_alignment() const;
+
+	void set_text_direction(TextDirection p_text_direction);
+	TextDirection get_text_direction() const;
+
+	void set_text_overrun_behavior(TextServer::OverrunBehavior p_overrun_behavior);
+	TextServer::OverrunBehavior get_text_overrun_behavior() const;
+
+	void set_language(const String &p_language);
+	String get_language() const;
+
+	void set_title_position(TitlePosition p_title_position);
+	TitlePosition get_title_position() const;
+
+	void add_title_bar_control(Control *p_control);
+	void remove_title_bar_control(Control *p_control);
+
+	virtual Size2 get_minimum_size() const override;
+
+	virtual Vector<int> get_allowed_size_flags_horizontal() const override { return { SIZE_FILL, SIZE_SHRINK_BEGIN, SIZE_SHRINK_CENTER, SIZE_SHRINK_END }; }
+	virtual Vector<int> get_allowed_size_flags_vertical() const override { return { SIZE_FILL, SIZE_SHRINK_BEGIN, SIZE_SHRINK_CENTER, SIZE_SHRINK_END }; }
+
+	FoldableContainer(const String &p_text = String());
+	~FoldableContainer();
+};
+
+VARIANT_ENUM_CAST(FoldableContainer::TitlePosition);
+
+class FoldableGroup : public Resource {
+	GDCLASS(FoldableGroup, Resource);
+
+	friend class FoldableContainer;
+
+	HashSet<FoldableContainer *> containers;
+	bool allow_folding_all = false;
+	bool updating_group = false;
+
+protected:
+	static void _bind_methods();
+
+public:
+	FoldableContainer *get_expanded_container() const;
+
+	void get_containers(List<FoldableContainer *> *r_containers) const;
+	TypedArray<FoldableContainer> _get_containers() const;
+
+	void set_allow_folding_all(bool p_enabled);
+	bool is_allow_folding_all() const;
+
+	FoldableGroup();
+};
diff --git a/engine/scene/gui/graph_edit.cpp b/engine/scene/gui/graph_edit.cpp
index d0bf8d78..c1ab57ec 100644
--- a/engine/scene/gui/graph_edit.cpp
+++ b/engine/scene/gui/graph_edit.cpp
@@ -353,6 +353,62 @@ int GraphEdit::get_connection_count(const StringName &p_node, int p_port) {
 	return count;
 }
 
+GraphNode *GraphEdit::get_input_connection_target(const StringName &p_node, int p_port) {
+	for (const Ref<Connection> &conn : connections) {
+		if (conn->to_node == p_node && conn->to_port == p_port) {
+			GraphNode *from = Object::cast_to<GraphNode>(get_node(NodePath(conn->from_node)));
+			if (from) {
+				return from;
+			}
+		}
+	}
+	return nullptr;
+}
+
+GraphNode *GraphEdit::get_output_connection_target(const StringName &p_node, int p_port) {
+	for (const Ref<Connection> &conn : connections) {
+		if (conn->from_node == p_node && conn->from_port == p_port) {
+			GraphNode *to = Object::cast_to<GraphNode>(get_node(NodePath(conn->to_node)));
+			if (to) {
+				return to;
+			}
+		}
+	}
+	return nullptr;
+}
+
+String GraphEdit::get_connections_description(const StringName &p_node, int p_port) {
+	String out;
+	for (const Ref<Connection> &conn : connections) {
+		if (conn->from_node == p_node && conn->from_port == p_port) {
+			GraphNode *to = Object::cast_to<GraphNode>(get_node(NodePath(conn->to_node)));
+			if (to) {
+				if (!out.is_empty()) {
+					out += ", ";
+				}
+				String name = to->get_accessibility_name();
+				if (name.is_empty()) {
+					name = to->get_name();
+				}
+				out += vformat(ETR("connection to %s (%s) port %d"), name, to->get_title(), conn->to_port);
+			}
+		} else if (conn->to_node == p_node && conn->to_port == p_port) {
+			GraphNode *from = Object::cast_to<GraphNode>(get_node(NodePath(conn->from_node)));
+			if (from) {
+				if (!out.is_empty()) {
+					out += ", ";
+				}
+				String name = from->get_accessibility_name();
+				if (name.is_empty()) {
+					name = from->get_name();
+				}
+				out += vformat(ETR("connection from %s (%s) port %d"), name, from->get_title(), conn->from_port);
+			}
+		}
+	}
+	return out;
+}
+
 void GraphEdit::set_scroll_offset(const Vector2 &p_offset) {
 	setting_scroll_offset = true;
 	h_scrollbar->set_value(p_offset.x);
@@ -780,6 +836,10 @@ void GraphEdit::_notification(int p_what) {
 			// Draw background fill.
 			draw_style_box(theme_cache.panel, Rect2(Point2(), get_size()));
 
+			if (has_focus()) {
+				draw_style_box(theme_cache.panel_focus, Rect2(Point2(), get_size()));
+			}
+
 			// Draw background grid.
 			if (show_grid) {
 				_draw_grid();
@@ -958,9 +1018,172 @@ bool GraphEdit::_filter_input(const Point2 &p_point) {
 	return false;
 }
 
+void GraphEdit::start_keyboard_connecting(GraphNode *p_node, int p_in_port, int p_out_port) {
+	if (!p_node || p_in_port == p_out_port || (p_in_port != -1 && p_out_port != -1)) {
+		return;
+	}
+	connecting_valid = false;
+	keyboard_connecting = true;
+	if (p_in_port != -1) {
+		Vector2 pos = p_node->get_input_port_position(p_in_port) * zoom + p_node->get_position();
+
+		if (right_disconnects || valid_right_disconnect_types.has(p_node->get_input_port_type(p_in_port))) {
+			// Check disconnect.
+			for (const Ref<Connection> &conn : connection_map[p_node->get_name()]) {
+				if (conn->to_node == p_node->get_name() && conn->to_port == p_in_port) {
+					Node *fr = get_node(NodePath(conn->from_node));
+					if (Object::cast_to<GraphNode>(fr)) {
+						connecting_from_node = conn->from_node;
+						connecting_from_port_index = conn->from_port;
+						connecting_from_output = true;
+						connecting_type = Object::cast_to<GraphNode>(fr)->get_output_port_type(conn->from_port);
+						connecting_color = Object::cast_to<GraphNode>(fr)->get_output_port_color(conn->from_port);
+						connecting_target_valid = false;
+						connecting_to_point = pos;
+						just_disconnected = true;
+
+						if (connecting_type >= 0) {
+							emit_signal(SNAME("disconnection_request"), conn->from_node, conn->from_port, conn->to_node, conn->to_port);
+							fr = get_node(NodePath(connecting_from_node));
+							if (Object::cast_to<GraphNode>(fr)) {
+								connecting = true;
+								emit_signal(SNAME("connection_drag_started"), connecting_from_node, connecting_from_port_index, true);
+							}
+						}
+						return;
+					}
+				}
+			}
+		}
+
+		connecting_from_node = p_node->get_name();
+		connecting_from_port_index = p_in_port;
+		connecting_from_output = false;
+		connecting_type = p_node->get_input_port_type(p_in_port);
+		connecting_color = p_node->get_input_port_color(p_in_port);
+		connecting_target_valid = false;
+		connecting_to_point = pos;
+		if (connecting_type >= 0) {
+			connecting = true;
+			just_disconnected = false;
+			emit_signal(SNAME("connection_drag_started"), connecting_from_node, connecting_from_port_index, false);
+		}
+		return;
+	}
+	if (p_out_port != -1) {
+		Vector2 pos = p_node->get_output_port_position(p_out_port) * zoom + p_node->get_position();
+
+		if (valid_left_disconnect_types.has(p_node->get_output_port_type(p_out_port))) {
+			// Check disconnect.
+			for (const Ref<Connection> &conn : connection_map[p_node->get_name()]) {
+				if (conn->from_node == p_node->get_name() && conn->from_port == p_out_port) {
+					Node *to = get_node(NodePath(conn->to_node));
+					if (Object::cast_to<GraphNode>(to)) {
+						connecting_from_node = conn->to_node;
+						connecting_from_port_index = conn->to_port;
+						connecting_from_output = false;
+						connecting_type = Object::cast_to<GraphNode>(to)->get_input_port_type(conn->to_port);
+						connecting_color = Object::cast_to<GraphNode>(to)->get_input_port_color(conn->to_port);
+						connecting_target_valid = false;
+						connecting_to_point = pos;
+
+						if (connecting_type >= 0) {
+							just_disconnected = true;
+
+							emit_signal(SNAME("disconnection_request"), conn->from_node, conn->from_port, conn->to_node, conn->to_port);
+							to = get_node(NodePath(connecting_from_node)); // Maybe it was erased.
+							if (Object::cast_to<GraphNode>(to)) {
+								connecting = true;
+								emit_signal(SNAME("connection_drag_started"), connecting_from_node, connecting_from_port_index, false);
+							}
+						}
+						return;
+					}
+				}
+			}
+		}
+
+		connecting_from_node = p_node->get_name();
+		connecting_from_port_index = p_out_port;
+		connecting_from_output = true;
+		connecting_type = p_node->get_output_port_type(p_out_port);
+		connecting_color = p_node->get_output_port_color(p_out_port);
+		connecting_target_valid = false;
+		connecting_to_point = pos;
+		if (connecting_type >= 0) {
+			connecting = true;
+			just_disconnected = false;
+			emit_signal(SNAME("connection_drag_started"), connecting_from_node, connecting_from_port_index, true);
+		}
+		return;
+	}
+}
+
+void GraphEdit::end_keyboard_connecting(GraphNode *p_node, int p_in_port, int p_out_port) {
+	if (!p_node) {
+		return;
+	}
+	connecting_valid = true;
+	connecting_target_valid = false;
+	if (p_in_port != -1) {
+		Vector2 pos = p_node->get_input_port_position(p_in_port) * zoom + p_node->get_position();
+
+		int type = p_node->get_input_port_type(p_in_port);
+		if (type == connecting_type || p_node->is_ignoring_valid_connection_type() || valid_connection_types.has(ConnectionType(connecting_type, type))) {
+			connecting_target_valid = true;
+			connecting_to_point = pos;
+			connecting_target_node = p_node->get_name();
+			connecting_target_port_index = p_in_port;
+		}
+	}
+	if (p_out_port != -1) {
+		Vector2 pos = p_node->get_output_port_position(p_out_port) * zoom + p_node->get_position();
+
+		int type = p_node->get_output_port_type(p_out_port);
+		if (type == connecting_type || p_node->is_ignoring_valid_connection_type() || valid_connection_types.has(ConnectionType(type, connecting_type))) {
+			connecting_target_valid = true;
+			connecting_to_point = pos;
+			connecting_target_node = p_node->get_name();
+			connecting_target_port_index = p_out_port;
+		}
+	}
+	if (connecting_valid) {
+		if (connecting && connecting_target_valid) {
+			if (connecting_from_output) {
+				emit_signal(SNAME("connection_request"), connecting_from_node, connecting_from_port_index, connecting_target_node, connecting_target_port_index);
+			} else {
+				emit_signal(SNAME("connection_request"), connecting_target_node, connecting_target_port_index, connecting_from_node, connecting_from_port_index);
+			}
+		} else if (!just_disconnected) {
+			if (connecting_from_output) {
+				emit_signal(SNAME("connection_to_empty"), connecting_from_node, connecting_from_port_index, Vector2());
+			} else {
+				emit_signal(SNAME("connection_from_empty"), connecting_from_node, connecting_from_port_index, Vector2());
+			}
+		}
+	}
+
+	keyboard_connecting = false;
+	if (connecting) {
+		force_connection_drag_end();
+	}
+}
+
+Dictionary GraphEdit::get_type_names() const {
+	return type_names;
+}
+
+void GraphEdit::set_type_names(const Dictionary &p_names) {
+	type_names = p_names;
+}
+
 void GraphEdit::_top_connection_layer_input(const Ref<InputEvent> &p_ev) {
 	Ref<InputEventMouseButton> mb = p_ev;
 	if (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT && mb->is_pressed()) {
+		if (keyboard_connecting) {
+			force_connection_drag_end();
+			keyboard_connecting = false;
+		}
 		connecting_valid = false;
 		click_pos = mb->get_position() / zoom;
 		for (int i = get_child_count() - 1; i >= 0; i--) {
@@ -1086,7 +1309,7 @@ void GraphEdit::_top_connection_layer_input(const Ref<InputEvent> &p_ev) {
 	}
 
 	Ref<InputEventMouseMotion> mm = p_ev;
-	if (mm.is_valid() && connecting) {
+	if (mm.is_valid() && connecting && !keyboard_connecting) {
 		connecting_to_point = mm->get_position();
 		minimap->queue_redraw();
 		callable_mp(this, &GraphEdit::_update_top_connection_layer).call_deferred();
@@ -1198,7 +1421,7 @@ bool GraphEdit::_check_clickable_control(Control *p_control, const Vector2 &mpos
 	control_rect.size *= zoom;
 	control_rect.position += p_offset;
 
-	if (!control_rect.has_point(mpos) || p_control->get_mouse_filter() == MOUSE_FILTER_IGNORE) {
+	if (!control_rect.has_point(mpos) || p_control->get_mouse_filter_with_recursive() == MOUSE_FILTER_IGNORE) {
 		// Test children.
 		for (int i = 0; i < p_control->get_child_count(); i++) {
 			Control *child_rect = Object::cast_to<Control>(p_control->get_child(i));
@@ -1316,7 +1539,7 @@ Ref<GraphEdit::Connection> GraphEdit::get_closest_connection_at_point(const Vect
 
 		Vector<Vector2> points = get_connection_line(conn->_cache.from_pos * zoom, conn->_cache.to_pos * zoom);
 		for (int i = 0; i < points.size() - 1; i++) {
-			float distance = Geometry2D::get_distance_to_segment(transformed_point, &points[i]);
+			const real_t distance = Geometry2D::get_distance_to_segment(transformed_point, points[i], points[i + 1]);
 			if (distance <= lines_thickness * 0.5 + p_max_distance && distance < closest_distance) {
 				closest_connection = conn;
 				closest_distance = distance;
@@ -1663,7 +1886,7 @@ void GraphEdit::_draw_grid() {
 			for (int i = from_pos.x; i < from_pos.x + len.x; i++) {
 				Color color;
 
-				if (ABS(i) % GRID_MINOR_STEPS_PER_MAJOR_LINE == 0) {
+				if (Math::abs(i) % GRID_MINOR_STEPS_PER_MAJOR_LINE == 0) {
 					color = theme_cache.grid_major;
 				} else {
 					color = theme_cache.grid_minor;
@@ -1676,7 +1899,7 @@ void GraphEdit::_draw_grid() {
 			for (int i = from_pos.y; i < from_pos.y + len.y; i++) {
 				Color color;
 
-				if (ABS(i) % GRID_MINOR_STEPS_PER_MAJOR_LINE == 0) {
+				if (Math::abs(i) % GRID_MINOR_STEPS_PER_MAJOR_LINE == 0) {
 					color = theme_cache.grid_major;
 				} else {
 					color = theme_cache.grid_minor;
@@ -1694,7 +1917,7 @@ void GraphEdit::_draw_grid() {
 			if (transparent_grid_minor.a != 0) {
 				for (int i = from_pos.x; i < from_pos.x + len.x; i++) {
 					for (int j = from_pos.y; j < from_pos.y + len.y; j++) {
-						if (ABS(i) % GRID_MINOR_STEPS_PER_MAJOR_DOT == 0 && ABS(j) % GRID_MINOR_STEPS_PER_MAJOR_DOT == 0) {
+						if (Math::abs(i) % GRID_MINOR_STEPS_PER_MAJOR_DOT == 0 && Math::abs(j) % GRID_MINOR_STEPS_PER_MAJOR_DOT == 0) {
 							continue;
 						}
 
@@ -2142,6 +2365,7 @@ void GraphEdit::force_connection_drag_end() {
 
 	connecting = false;
 	connecting_valid = false;
+	keyboard_connecting = false;
 	minimap->queue_redraw();
 	queue_redraw();
 	connections_layer->queue_redraw();
@@ -2329,6 +2553,24 @@ TypedArray<Dictionary> GraphEdit::_get_connections_intersecting_with_rect(const
 	return arr;
 }
 
+TypedArray<Dictionary> GraphEdit::_get_connection_list_from_node(const StringName &p_node) const {
+	ERR_FAIL_COND_V(!connection_map.has(p_node), TypedArray<Dictionary>());
+
+	List<Ref<GraphEdit::Connection>> connections_from_node = connection_map.get(p_node);
+	TypedArray<Dictionary> connections_from_node_dict;
+
+	for (const Ref<Connection> &conn : connections_from_node) {
+		Dictionary d;
+		d["from_node"] = conn->from_node;
+		d["from_port"] = conn->from_port;
+		d["to_node"] = conn->to_node;
+		d["to_port"] = conn->to_port;
+		d["keep_alive"] = conn->keep_alive;
+		connections_from_node_dict.push_back(d);
+	}
+	return connections_from_node_dict;
+}
+
 void GraphEdit::_zoom_minus() {
 	set_zoom(zoom / zoom_step);
 }
@@ -2689,6 +2931,7 @@ void GraphEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_connection_list"), &GraphEdit::_get_connection_list);
 	ClassDB::bind_method(D_METHOD("get_connection_count", "from_node", "from_port"), &GraphEdit::get_connection_count);
 	ClassDB::bind_method(D_METHOD("get_closest_connection_at_point", "point", "max_distance"), &GraphEdit::_get_closest_connection_at_point, DEFVAL(4.0));
+	ClassDB::bind_method(D_METHOD("get_connection_list_from_node", "node"), &GraphEdit::_get_connection_list_from_node);
 	ClassDB::bind_method(D_METHOD("get_connections_intersecting_with_rect", "rect"), &GraphEdit::_get_connections_intersecting_with_rect);
 	ClassDB::bind_method(D_METHOD("clear_connections"), &GraphEdit::clear_connections);
 	ClassDB::bind_method(D_METHOD("force_connection_drag_end"), &GraphEdit::force_connection_drag_end);
@@ -2774,6 +3017,9 @@ void GraphEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_right_disconnects", "enable"), &GraphEdit::set_right_disconnects);
 	ClassDB::bind_method(D_METHOD("is_right_disconnects_enabled"), &GraphEdit::is_right_disconnects_enabled);
 
+	ClassDB::bind_method(D_METHOD("set_type_names", "type_names"), &GraphEdit::set_type_names);
+	ClassDB::bind_method(D_METHOD("get_type_names"), &GraphEdit::get_type_names);
+
 	GDVIRTUAL_BIND(_is_in_input_hotzone, "in_node", "in_port", "mouse_position");
 	GDVIRTUAL_BIND(_is_in_output_hotzone, "in_node", "in_port", "mouse_position");
 
@@ -2794,6 +3040,8 @@ void GraphEdit::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "panning_scheme", PROPERTY_HINT_ENUM, "Scroll Zooms,Scroll Pans"), "set_panning_scheme", "get_panning_scheme");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "right_disconnects"), "set_right_disconnects", "is_right_disconnects_enabled");
 
+	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "type_names", PROPERTY_HINT_DICTIONARY_TYPE, "int;String"), "set_type_names", "get_type_names");
+
 	ADD_GROUP("Connection Lines", "connection_lines");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "connection_lines_curvature"), "set_connection_lines_curvature", "get_connection_lines_curvature");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "connection_lines_thickness", PROPERTY_HINT_RANGE, "0,100,0.1,suffix:px"), "set_connection_lines_thickness", "get_connection_lines_thickness");
@@ -2850,6 +3098,7 @@ void GraphEdit::_bind_methods() {
 	BIND_ENUM_CONSTANT(GRID_PATTERN_DOTS);
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphEdit, panel);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphEdit, panel_focus);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, GraphEdit, grid_major);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, GraphEdit, grid_minor);
 
@@ -2958,7 +3207,8 @@ GraphEdit::GraphEdit() {
 	zoom_minus_button->set_theme_type_variation(SceneStringName(FlatButton));
 	zoom_minus_button->set_visible(show_zoom_buttons);
 	zoom_minus_button->set_tooltip_text(ETR("Zoom Out"));
-	zoom_minus_button->set_focus_mode(FOCUS_NONE);
+	zoom_minus_button->set_accessibility_name(ETR("Zoom Out"));
+	zoom_minus_button->set_focus_mode(FOCUS_ACCESSIBILITY);
 	menu_hbox->add_child(zoom_minus_button);
 	zoom_minus_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_zoom_minus));
 
@@ -2966,7 +3216,8 @@ GraphEdit::GraphEdit() {
 	zoom_reset_button->set_theme_type_variation(SceneStringName(FlatButton));
 	zoom_reset_button->set_visible(show_zoom_buttons);
 	zoom_reset_button->set_tooltip_text(ETR("Zoom Reset"));
-	zoom_reset_button->set_focus_mode(FOCUS_NONE);
+	zoom_reset_button->set_accessibility_name(ETR("Zoom Reset"));
+	zoom_reset_button->set_focus_mode(FOCUS_ACCESSIBILITY);
 	menu_hbox->add_child(zoom_reset_button);
 	zoom_reset_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_zoom_reset));
 
@@ -2974,7 +3225,8 @@ GraphEdit::GraphEdit() {
 	zoom_plus_button->set_theme_type_variation(SceneStringName(FlatButton));
 	zoom_plus_button->set_visible(show_zoom_buttons);
 	zoom_plus_button->set_tooltip_text(ETR("Zoom In"));
-	zoom_plus_button->set_focus_mode(FOCUS_NONE);
+	zoom_plus_button->set_accessibility_name(ETR("Zoom In"));
+	zoom_plus_button->set_focus_mode(FOCUS_ACCESSIBILITY);
 	menu_hbox->add_child(zoom_plus_button);
 	zoom_plus_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_zoom_plus));
 
@@ -2986,6 +3238,7 @@ GraphEdit::GraphEdit() {
 	toggle_grid_button->set_toggle_mode(true);
 	toggle_grid_button->set_pressed(true);
 	toggle_grid_button->set_tooltip_text(ETR("Toggle the visual grid."));
+	toggle_grid_button->set_accessibility_name(ETR("Grid"));
 	toggle_grid_button->set_focus_mode(FOCUS_NONE);
 	menu_hbox->add_child(toggle_grid_button);
 	toggle_grid_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::_show_grid_toggled));
@@ -2995,6 +3248,7 @@ GraphEdit::GraphEdit() {
 	toggle_snapping_button->set_visible(show_grid_buttons);
 	toggle_snapping_button->set_toggle_mode(true);
 	toggle_snapping_button->set_tooltip_text(ETR("Toggle snapping to the grid."));
+	toggle_snapping_button->set_accessibility_name(ETR("Snap to Grid"));
 	toggle_snapping_button->set_pressed(snapping_enabled);
 	toggle_snapping_button->set_focus_mode(FOCUS_NONE);
 	menu_hbox->add_child(toggle_snapping_button);
@@ -3007,6 +3261,7 @@ GraphEdit::GraphEdit() {
 	snapping_distance_spinbox->set_step(1);
 	snapping_distance_spinbox->set_value(snapping_distance);
 	snapping_distance_spinbox->set_tooltip_text(ETR("Change the snapping distance."));
+	snapping_distance_spinbox->set_accessibility_name(ETR("Snapping Distance"));
 	menu_hbox->add_child(snapping_distance_spinbox);
 	snapping_distance_spinbox->connect(SceneStringName(value_changed), callable_mp(this, &GraphEdit::_snapping_distance_changed));
 
@@ -3017,6 +3272,7 @@ GraphEdit::GraphEdit() {
 	minimap_button->set_visible(show_minimap_button);
 	minimap_button->set_toggle_mode(true);
 	minimap_button->set_tooltip_text(ETR("Toggle the graph minimap."));
+	minimap_button->set_accessibility_name(ETR("Minimap"));
 	minimap_button->set_pressed(show_grid);
 	minimap_button->set_focus_mode(FOCUS_NONE);
 	menu_hbox->add_child(minimap_button);
@@ -3025,6 +3281,7 @@ GraphEdit::GraphEdit() {
 	arrange_button = memnew(Button);
 	arrange_button->set_theme_type_variation(SceneStringName(FlatButton));
 	arrange_button->set_visible(show_arrange_button);
+	arrange_button->set_accessibility_name(ETR("Auto Arrange"));
 	arrange_button->connect(SceneStringName(pressed), callable_mp(this, &GraphEdit::arrange_nodes));
 	arrange_button->set_focus_mode(FOCUS_NONE);
 	menu_hbox->add_child(arrange_button);
diff --git a/engine/scene/gui/graph_edit.h b/engine/scene/gui/graph_edit.h
index 0b8717b7..cbc71997 100644
--- a/engine/scene/gui/graph_edit.h
+++ b/engine/scene/gui/graph_edit.h
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRAPH_EDIT_H
-#define GRAPH_EDIT_H
+#pragma once
 
+#include "core/variant/typed_dictionary.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/graph_frame.h"
 #include "scene/gui/graph_node.h"
@@ -199,6 +199,7 @@ private:
 	bool show_grid = true;
 	GridPattern grid_pattern = GRID_PATTERN_LINES;
 
+	bool keyboard_connecting = false;
 	bool connecting = false;
 	StringName connecting_from_node;
 	bool connecting_from_output = false;
@@ -270,6 +271,7 @@ private:
 		float base_scale = 1.0;
 
 		Ref<StyleBox> panel;
+		Ref<StyleBox> panel_focus;
 		Color grid_major;
 		Color grid_minor;
 
@@ -304,6 +306,8 @@ private:
 	HashMap<StringName, HashSet<StringName>> frame_attached_nodes;
 	HashMap<StringName, StringName> linked_parent_map;
 
+	Dictionary type_names;
+
 	void _pan_callback(Vector2 p_scroll_vec, Ref<InputEvent> p_event);
 	void _zoom_callback(float p_zoom_factor, Vector2 p_origin, Ref<InputEvent> p_event);
 
@@ -345,6 +349,7 @@ private:
 	TypedArray<Dictionary> _get_connection_list() const;
 	Dictionary _get_closest_connection_at_point(const Vector2 &p_point, float p_max_distance = 4.0) const;
 	TypedArray<Dictionary> _get_connections_intersecting_with_rect(const Rect2 &p_rect) const;
+	TypedArray<Dictionary> _get_connection_list_from_node(const StringName &p_node) const;
 
 	Rect2 _compute_shrinked_frame_rect(const GraphFrame *p_frame);
 	void _set_drag_frame_attached_nodes(GraphFrame *p_frame, bool p_drag);
@@ -404,6 +409,9 @@ public:
 	Error connect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port, bool keep_alive = false);
 	bool is_node_connected(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port);
 	int get_connection_count(const StringName &p_node, int p_port);
+	GraphNode *get_input_connection_target(const StringName &p_node, int p_port);
+	GraphNode *get_output_connection_target(const StringName &p_node, int p_port);
+	String get_connections_description(const StringName &p_node, int p_port);
 	void disconnect_node(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port);
 
 	void force_connection_drag_end();
@@ -413,6 +421,13 @@ public:
 	Ref<Connection> get_closest_connection_at_point(const Vector2 &p_point, float p_max_distance = 4.0) const;
 	List<Ref<Connection>> get_connections_intersecting_with_rect(const Rect2 &p_rect) const;
 
+	bool is_keyboard_connecting() const { return keyboard_connecting; }
+	void start_keyboard_connecting(GraphNode *p_node, int p_in_port, int p_out_port);
+	void end_keyboard_connecting(GraphNode *p_node, int p_in_port, int p_out_port);
+
+	Dictionary get_type_names() const;
+	void set_type_names(const Dictionary &p_names);
+
 	virtual bool is_node_hover_valid(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port);
 
 	void set_connection_activity(const StringName &p_from, int p_from_port, const StringName &p_to, int p_to_port, float p_activity);
@@ -517,5 +532,3 @@ public:
 
 VARIANT_ENUM_CAST(GraphEdit::PanningScheme);
 VARIANT_ENUM_CAST(GraphEdit::GridPattern);
-
-#endif // GRAPH_EDIT_H
diff --git a/engine/scene/gui/graph_edit_arranger.h b/engine/scene/gui/graph_edit_arranger.h
index 925b58d4..17ad9f5f 100644
--- a/engine/scene/gui/graph_edit_arranger.h
+++ b/engine/scene/gui/graph_edit_arranger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRAPH_EDIT_ARRANGER_H
-#define GRAPH_EDIT_ARRANGER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/templates/hash_map.h"
@@ -63,5 +62,3 @@ public:
 	GraphEditArranger(GraphEdit *p_graph_edit) :
 			graph_edit(p_graph_edit) {}
 };
-
-#endif // GRAPH_EDIT_ARRANGER_H
diff --git a/engine/scene/gui/graph_element.h b/engine/scene/gui/graph_element.h
index a50c2953..e9a00ae4 100644
--- a/engine/scene/gui/graph_element.h
+++ b/engine/scene/gui/graph_element.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRAPH_ELEMENT_H
-#define GRAPH_ELEMENT_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -93,5 +92,3 @@ public:
 
 	GraphElement() {}
 };
-
-#endif // GRAPH_ELEMENT_H
diff --git a/engine/scene/gui/graph_frame.h b/engine/scene/gui/graph_frame.h
index 2af09cf8..46861377 100644
--- a/engine/scene/gui/graph_frame.h
+++ b/engine/scene/gui/graph_frame.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRAPH_FRAME_H
-#define GRAPH_FRAME_H
+#pragma once
 
 #include "scene/gui/graph_element.h"
 
@@ -105,5 +104,3 @@ public:
 
 	GraphFrame();
 };
-
-#endif // GRAPH_FRAME_H
diff --git a/engine/scene/gui/graph_node.cpp b/engine/scene/gui/graph_node.cpp
index 0ca32de0..aad85476 100644
--- a/engine/scene/gui/graph_node.cpp
+++ b/engine/scene/gui/graph_node.cpp
@@ -31,6 +31,7 @@
 #include "graph_node.h"
 
 #include "scene/gui/box_container.h"
+#include "scene/gui/graph_edit.h"
 #include "scene/gui/label.h"
 #include "scene/theme/theme_db.h"
 
@@ -41,8 +42,8 @@ bool GraphNode::_set(const StringName &p_name, const Variant &p_value) {
 		return false;
 	}
 
-	int idx = str.get_slice("/", 1).to_int();
-	String slot_property_name = str.get_slice("/", 2);
+	int idx = str.get_slicec('/', 1).to_int();
+	String slot_property_name = str.get_slicec('/', 2);
 
 	Slot slot;
 	if (slot_table.has(idx)) {
@@ -93,8 +94,8 @@ bool GraphNode::_get(const StringName &p_name, Variant &r_ret) const {
 		return false;
 	}
 
-	int idx = str.get_slice("/", 1).to_int();
-	StringName slot_property_name = str.get_slice("/", 2);
+	int idx = str.get_slicec('/', 1).to_int();
+	StringName slot_property_name = str.get_slicec('/', 2);
 
 	Slot slot;
 	if (slot_table.has(idx)) {
@@ -196,6 +197,10 @@ void GraphNode::_resort() {
 
 		children_count++;
 	}
+	slot_count = children_count;
+	if (selected_slot >= slot_count) {
+		selected_slot = -1;
+	}
 
 	if (children_count == 0) {
 		return;
@@ -279,12 +284,13 @@ void GraphNode::_resort() {
 		Rect2 rect(margin, from_y_pos, final_width, height);
 		fit_child_in_rect(child, rect);
 
-		slot_y_cache.push_back(from_y_pos - sb_panel->get_margin(SIDE_TOP) + height * 0.5);
+		slot_y_cache.push_back(child->get_rect().position.y + child->get_rect().size.height * 0.5);
 
 		ofs_y = to_y_pos;
 		valid_children_idx++;
 	}
 
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 }
@@ -306,8 +312,311 @@ void GraphNode::draw_port(int p_slot_index, Point2i p_pos, bool p_left, const Co
 	port_icon->draw(get_canvas_item(), p_pos + icon_offset, p_color);
 }
 
+void GraphNode::_accessibility_action_slot(const Variant &p_data) {
+	CustomAccessibilityAction action = (CustomAccessibilityAction)p_data.operator int();
+	switch (action) {
+		case ACTION_CONNECT_INPUT: {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_left) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < left_port_cache.size(); i++) {
+							if (left_port_cache[i].slot_index == selected_slot) {
+								if (graph->is_keyboard_connecting()) {
+									graph->end_keyboard_connecting(this, i, -1);
+								} else {
+									graph->start_keyboard_connecting(this, i, -1);
+								}
+								queue_accessibility_update();
+								queue_redraw();
+								break;
+							}
+						}
+					}
+				}
+			}
+		} break;
+
+		case ACTION_CONNECT_OUTPUT: {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_right) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < right_port_cache.size(); i++) {
+							if (right_port_cache[i].slot_index == selected_slot) {
+								if (graph->is_keyboard_connecting()) {
+									graph->end_keyboard_connecting(this, -1, i);
+								} else {
+									graph->start_keyboard_connecting(this, -1, i);
+								}
+								queue_accessibility_update();
+								queue_redraw();
+								break;
+							}
+						}
+					}
+				}
+			}
+		} break;
+
+		case ACTION_FOLLOW_INPUT: {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_left) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < left_port_cache.size(); i++) {
+							if (left_port_cache[i].slot_index == selected_slot) {
+								GraphNode *target = graph->get_input_connection_target(get_name(), i);
+								if (target) {
+									target->grab_focus();
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		} break;
+
+		case ACTION_FOLLOW_OUTPUT: {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_right) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < right_port_cache.size(); i++) {
+							if (right_port_cache[i].slot_index == selected_slot) {
+								GraphNode *target = graph->get_output_connection_target(get_name(), i);
+								if (target) {
+									target->grab_focus();
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		} break;
+	}
+}
+
+void GraphNode::gui_input(const Ref<InputEvent> &p_event) {
+	ERR_FAIL_COND(p_event.is_null());
+	if (port_pos_dirty) {
+		_port_pos_update();
+	}
+
+	if (p_event->is_pressed() && slot_count > 0) {
+		if (p_event->is_action("ui_up", true)) {
+			selected_slot--;
+			if (selected_slot < 0) {
+				selected_slot = -1;
+			} else {
+				accept_event();
+			}
+		} else if (p_event->is_action("ui_down", true)) {
+			selected_slot++;
+			if (selected_slot >= slot_count) {
+				selected_slot = -1;
+			} else {
+				accept_event();
+			}
+		} else if (p_event->is_action("ui_cancel", true)) {
+			GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+			if (graph && graph->is_keyboard_connecting()) {
+				graph->force_connection_drag_end();
+				accept_event();
+			}
+		} else if (p_event->is_action("ui_graph_delete", true)) {
+			GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+			if (graph && graph->is_keyboard_connecting()) {
+				graph->end_keyboard_connecting(this, -1, -1);
+				accept_event();
+			}
+		} else if (p_event->is_action("ui_graph_follow_left", true)) {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_left) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < left_port_cache.size(); i++) {
+							if (left_port_cache[i].slot_index == selected_slot) {
+								GraphNode *target = graph->get_input_connection_target(get_name(), i);
+								if (target) {
+									target->grab_focus();
+									accept_event();
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		} else if (p_event->is_action("ui_graph_follow_right", true)) {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_right) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < right_port_cache.size(); i++) {
+							if (right_port_cache[i].slot_index == selected_slot) {
+								GraphNode *target = graph->get_output_connection_target(get_name(), i);
+								if (target) {
+									target->grab_focus();
+									accept_event();
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		} else if (p_event->is_action("ui_left", true)) {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_left) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < left_port_cache.size(); i++) {
+							if (left_port_cache[i].slot_index == selected_slot) {
+								if (graph->is_keyboard_connecting()) {
+									graph->end_keyboard_connecting(this, i, -1);
+								} else {
+									graph->start_keyboard_connecting(this, i, -1);
+								}
+								accept_event();
+								break;
+							}
+						}
+					}
+				}
+			}
+		} else if (p_event->is_action("ui_right", true)) {
+			if (slot_table.has(selected_slot)) {
+				const Slot &slot = slot_table[selected_slot];
+				if (slot.enable_right) {
+					GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+					if (graph) {
+						for (int i = 0; i < right_port_cache.size(); i++) {
+							if (right_port_cache[i].slot_index == selected_slot) {
+								if (graph->is_keyboard_connecting()) {
+									graph->end_keyboard_connecting(this, -1, i);
+								} else {
+									graph->start_keyboard_connecting(this, -1, i);
+								}
+								accept_event();
+								break;
+							}
+						}
+					}
+				}
+			}
+		} else if (p_event->is_action("ui_accept", true)) {
+			if (slot_table.has(selected_slot)) {
+				int idx = 0;
+				for (int i = 0; i < get_child_count(false); i++) {
+					Control *child = as_sortable_control(get_child(i, false), SortableVisibilityMode::IGNORE);
+					if (!child) {
+						continue;
+					}
+					if (idx == selected_slot) {
+						selected_slot = -1;
+						child->grab_focus();
+						break;
+					}
+					idx++;
+				}
+				accept_event();
+			}
+		}
+		queue_accessibility_update();
+		queue_redraw();
+	}
+
+	GraphElement::gui_input(p_event);
+}
+
 void GraphNode::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			String name = get_accessibility_name();
+			if (name.is_empty()) {
+				name = get_name();
+			}
+			name = vformat(ETR("graph node %s (%s)"), name, get_title());
+
+			if (slot_table.has(selected_slot)) {
+				GraphEdit *graph = Object::cast_to<GraphEdit>(get_parent());
+				Dictionary type_info;
+				if (graph) {
+					type_info = graph->get_type_names();
+				}
+				const Slot &slot = slot_table[selected_slot];
+				name += ", " + vformat(ETR("slot %d of %d"), selected_slot + 1, slot_count);
+				if (slot.enable_left) {
+					if (type_info.has(slot.type_left)) {
+						name += "," + vformat(ETR("input port, type: %s"), type_info[slot.type_left]);
+					} else {
+						name += "," + vformat(ETR("input port, type: %d"), slot.type_left);
+					}
+					if (graph) {
+						for (int i = 0; i < left_port_cache.size(); i++) {
+							if (left_port_cache[i].slot_index == selected_slot) {
+								String cd = graph->get_connections_description(get_name(), i);
+								if (cd.is_empty()) {
+									name += " " + ETR("no connections");
+								} else {
+									name += " " + cd;
+								}
+								break;
+							}
+						}
+					}
+				}
+				if (slot.enable_left) {
+					if (type_info.has(slot.type_right)) {
+						name += "," + vformat(ETR("output port, type: %s"), type_info[slot.type_right]);
+					} else {
+						name += "," + vformat(ETR("output port, type: %d"), slot.type_right);
+					}
+					if (graph) {
+						for (int i = 0; i < right_port_cache.size(); i++) {
+							if (right_port_cache[i].slot_index == selected_slot) {
+								String cd = graph->get_connections_description(get_name(), i);
+								if (cd.is_empty()) {
+									name += " " + ETR("no connections");
+								} else {
+									name += " " + cd;
+								}
+								break;
+							}
+						}
+					}
+				}
+				if (graph && graph->is_keyboard_connecting()) {
+					name += ", " + ETR("currently selecting target port");
+				}
+			} else {
+				name += ", " + vformat(ETR("has %d slots"), slot_count);
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST);
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, name);
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_CONNECT_INPUT, ETR("Edit Input Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_CONNECT_OUTPUT, ETR("Edit Output Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_FOLLOW_INPUT, ETR("Follow Input Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_custom_action(ae, CustomAccessibilityAction::ACTION_FOLLOW_OUTPUT, ETR("Follow Output Port Connection"));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_CUSTOM, callable_mp(this, &GraphNode::_accessibility_action_slot));
+		} break;
+		case NOTIFICATION_FOCUS_EXIT: {
+			selected_slot = -1;
+			queue_redraw();
+		} break;
 		case NOTIFICATION_DRAW: {
 			// Used for layout calculations.
 			Ref<StyleBox> sb_panel = theme_cache.panel;
@@ -317,6 +626,7 @@ void GraphNode::_notification(int p_what) {
 			Ref<StyleBox> sb_to_draw_titlebar = selected ? theme_cache.titlebar_selected : theme_cache.titlebar;
 
 			Ref<StyleBox> sb_slot = theme_cache.slot;
+			Ref<StyleBox> sb_slot_selected = theme_cache.slot_selected;
 
 			int port_h_offset = theme_cache.port_h_offset;
 
@@ -329,6 +639,10 @@ void GraphNode::_notification(int p_what) {
 			// Draw body (slots area) stylebox.
 			draw_style_box(sb_to_draw_panel, body_rect);
 
+			if (has_focus()) {
+				draw_style_box(theme_cache.panel_focus, body_rect);
+			}
+
 			// Draw title bar stylebox above.
 			draw_style_box(sb_to_draw_titlebar, titlebar_rect);
 
@@ -348,12 +662,18 @@ void GraphNode::_notification(int p_what) {
 
 					// Left port.
 					if (slot.enable_left) {
-						draw_port(slot_index, Point2i(port_h_offset, slot_y_cache[E.key] + sb_panel->get_margin(SIDE_TOP)), true, slot.color_left);
+						draw_port(slot_index, Point2i(port_h_offset, slot_y_cache[E.key]), true, slot.color_left);
 					}
 
 					// Right port.
 					if (slot.enable_right) {
-						draw_port(slot_index, Point2i(get_size().x - port_h_offset, slot_y_cache[E.key] + sb_panel->get_margin(SIDE_TOP)), false, slot.color_right);
+						draw_port(slot_index, Point2i(get_size().x - port_h_offset, slot_y_cache[E.key]), false, slot.color_right);
+					}
+
+					if (slot_index == selected_slot) {
+						Size2i port_sz = theme_cache.port->get_size();
+						draw_style_box(sb_slot_selected, Rect2i(port_h_offset - port_sz.x, slot_y_cache[E.key] + sb_panel->get_margin(SIDE_TOP) - port_sz.y, port_sz.x * 2, port_sz.y * 2));
+						draw_style_box(sb_slot_selected, Rect2i(get_size().x - port_h_offset - port_sz.x, slot_y_cache[E.key] + sb_panel->get_margin(SIDE_TOP) - port_sz.y, port_sz.x * 2, port_sz.y * 2));
 					}
 
 					// Draw slot stylebox.
@@ -400,6 +720,8 @@ void GraphNode::set_slot(int p_slot_index, bool p_enable_left, int p_type_left,
 	slot.custom_port_icon_right = p_custom_right;
 	slot.draw_stylebox = p_draw_stylebox;
 	slot_table[p_slot_index] = slot;
+
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 
@@ -408,12 +730,16 @@ void GraphNode::set_slot(int p_slot_index, bool p_enable_left, int p_type_left,
 
 void GraphNode::clear_slot(int p_slot_index) {
 	slot_table.erase(p_slot_index);
+
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 }
 
 void GraphNode::clear_all_slots() {
 	slot_table.clear();
+
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 }
@@ -433,6 +759,8 @@ void GraphNode::set_slot_enabled_left(int p_slot_index, bool p_enable) {
 	}
 
 	slot_table[p_slot_index].enable_left = p_enable;
+
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 
@@ -447,6 +775,8 @@ void GraphNode::set_slot_type_left(int p_slot_index, int p_type) {
 	}
 
 	slot_table[p_slot_index].type_left = p_type;
+
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 
@@ -517,6 +847,8 @@ void GraphNode::set_slot_enabled_right(int p_slot_index, bool p_enable) {
 	}
 
 	slot_table[p_slot_index].enable_right = p_enable;
+
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 
@@ -531,6 +863,8 @@ void GraphNode::set_slot_type_right(int p_slot_index, int p_type) {
 	}
 
 	slot_table[p_slot_index].type_right = p_type;
+
+	queue_accessibility_update();
 	queue_redraw();
 	port_pos_dirty = true;
 
@@ -646,14 +980,9 @@ Size2 GraphNode::get_minimum_size() const {
 
 void GraphNode::_port_pos_update() {
 	int edgeofs = theme_cache.port_h_offset;
-	int separation = theme_cache.separation;
-
-	Ref<StyleBox> sb_panel = theme_cache.panel;
-	Ref<StyleBox> sb_titlebar = theme_cache.titlebar;
 
 	left_port_cache.clear();
 	right_port_cache.clear();
-	int vertical_ofs = titlebar_hbox->get_size().height + sb_titlebar->get_minimum_size().height + sb_panel->get_margin(SIDE_TOP);
 	int slot_index = 0;
 
 	for (int i = 0; i < get_child_count(false); i++) {
@@ -663,11 +992,12 @@ void GraphNode::_port_pos_update() {
 		}
 
 		Size2i size = child->get_rect().size;
+		Point2 pos = child->get_position();
 
 		if (slot_table.has(slot_index)) {
 			if (slot_table[slot_index].enable_left) {
 				PortCache port_cache;
-				port_cache.pos = Point2i(edgeofs, vertical_ofs + size.height / 2);
+				port_cache.pos = Point2i(edgeofs, pos.y + size.height / 2);
 				port_cache.type = slot_table[slot_index].type_left;
 				port_cache.color = slot_table[slot_index].color_left;
 				port_cache.slot_index = slot_index;
@@ -675,7 +1005,7 @@ void GraphNode::_port_pos_update() {
 			}
 			if (slot_table[slot_index].enable_right) {
 				PortCache port_cache;
-				port_cache.pos = Point2i(get_size().width - edgeofs, vertical_ofs + size.height / 2);
+				port_cache.pos = Point2i(get_size().width - edgeofs, pos.y + size.height / 2);
 				port_cache.type = slot_table[slot_index].type_right;
 				port_cache.color = slot_table[slot_index].color_right;
 				port_cache.slot_index = slot_index;
@@ -683,10 +1013,12 @@ void GraphNode::_port_pos_update() {
 			}
 		}
 
-		vertical_ofs += separation;
-		vertical_ofs += size.height;
 		slot_index++;
 	}
+	slot_count = slot_index;
+	if (selected_slot >= slot_count) {
+		selected_slot = -1;
+	}
 
 	port_pos_dirty = false;
 }
@@ -781,6 +1113,25 @@ int GraphNode::get_output_port_slot(int p_port_idx) {
 	return right_port_cache[p_port_idx].slot_index;
 }
 
+String GraphNode::get_accessibility_container_name(const Node *p_node) const {
+	int idx = 0;
+	for (int i = 0; i < get_child_count(false); i++) {
+		Control *child = as_sortable_control(get_child(i, false), SortableVisibilityMode::IGNORE);
+		if (!child) {
+			continue;
+		}
+		if (child == p_node) {
+			String name = get_accessibility_name();
+			if (name.is_empty()) {
+				name = get_name();
+			}
+			return vformat(ETR(", in slot %d of graph node %s (%s)"), idx + 1, name, get_title());
+		}
+		idx++;
+	}
+	return String();
+}
+
 void GraphNode::set_title(const String &p_title) {
 	if (title == p_title) {
 		return;
@@ -890,9 +1241,11 @@ void GraphNode::_bind_methods() {
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphNode, panel);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphNode, panel_selected);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphNode, panel_focus);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphNode, titlebar);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphNode, titlebar_selected);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphNode, slot);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, GraphNode, slot_selected);
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, GraphNode, separation);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, GraphNode, port_h_offset);
@@ -910,7 +1263,9 @@ GraphNode::GraphNode() {
 	title_label = memnew(Label);
 	title_label->set_theme_type_variation("GraphNodeTitleLabel");
 	title_label->set_h_size_flags(SIZE_EXPAND_FILL);
+	title_label->set_focus_mode(Control::FOCUS_NONE);
 	titlebar_hbox->add_child(title_label);
 
 	set_mouse_filter(MOUSE_FILTER_STOP);
+	set_focus_mode(FOCUS_ACCESSIBILITY);
 }
diff --git a/engine/scene/gui/graph_node.h b/engine/scene/gui/graph_node.h
index 27af3192..f1831cc9 100644
--- a/engine/scene/gui/graph_node.h
+++ b/engine/scene/gui/graph_node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRAPH_NODE_H
-#define GRAPH_NODE_H
+#pragma once
 
 #include "scene/gui/graph_element.h"
 
@@ -67,6 +66,14 @@ class GraphNode : public GraphElement {
 		int final_size = 0;
 	};
 
+	enum CustomAccessibilityAction {
+		ACTION_CONNECT_INPUT,
+		ACTION_CONNECT_OUTPUT,
+		ACTION_FOLLOW_INPUT,
+		ACTION_FOLLOW_OUTPUT,
+	};
+	void _accessibility_action_slot(const Variant &p_data);
+
 	HBoxContainer *titlebar_hbox = nullptr;
 	Label *title_label = nullptr;
 
@@ -78,12 +85,17 @@ class GraphNode : public GraphElement {
 	HashMap<int, Slot> slot_table;
 	Vector<int> slot_y_cache;
 
+	int slot_count = 0;
+	int selected_slot = -1;
+
 	struct ThemeCache {
 		Ref<StyleBox> panel;
 		Ref<StyleBox> panel_selected;
+		Ref<StyleBox> panel_focus;
 		Ref<StyleBox> titlebar;
 		Ref<StyleBox> titlebar_selected;
 		Ref<StyleBox> slot;
+		Ref<StyleBox> slot_selected;
 
 		int separation = 0;
 		int port_h_offset = 0;
@@ -113,6 +125,9 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 
 public:
+	virtual String get_accessibility_container_name(const Node *p_node) const override;
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
+
 	void set_title(const String &p_title);
 	String get_title() const;
 
@@ -173,5 +188,3 @@ public:
 
 	GraphNode();
 };
-
-#endif // GRAPH_NODE_H
diff --git a/engine/scene/gui/grid_container.h b/engine/scene/gui/grid_container.h
index f6a51511..bc01f396 100644
--- a/engine/scene/gui/grid_container.h
+++ b/engine/scene/gui/grid_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRID_CONTAINER_H
-#define GRID_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -56,5 +55,3 @@ public:
 
 	GridContainer();
 };
-
-#endif // GRID_CONTAINER_H
diff --git a/engine/scene/gui/item_list.cpp b/engine/scene/gui/item_list.cpp
index 8feacd4c..7f2604b4 100644
--- a/engine/scene/gui/item_list.cpp
+++ b/engine/scene/gui/item_list.cpp
@@ -45,7 +45,7 @@ void ItemList::_shape_text(int p_idx) {
 	}
 	item.text_buf->add_string(item.xl_text, theme_cache.font, theme_cache.font_size, item.language);
 	if (icon_mode == ICON_MODE_TOP && max_text_lines > 0) {
-		item.text_buf->set_break_flags(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_GRAPHEME_BOUND | TextServer::BREAK_TRIM_EDGE_SPACES);
+		item.text_buf->set_break_flags(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_GRAPHEME_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES);
 	} else {
 		item.text_buf->set_break_flags(TextServer::BREAK_NONE);
 	}
@@ -64,6 +64,7 @@ int ItemList::add_item(const String &p_item, const Ref<Texture2D> &p_texture, bo
 	items.write[item_id].xl_text = _atr(item_id, p_item);
 	_shape_text(item_id);
 
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 	notify_property_list_changed();
@@ -77,6 +78,7 @@ int ItemList::add_icon_item(const Ref<Texture2D> &p_item, bool p_selectable) {
 	items.push_back(item);
 	int item_id = items.size() - 1;
 
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 	notify_property_list_changed();
@@ -96,6 +98,7 @@ void ItemList::set_item_text(int p_idx, const String &p_text) {
 	items.write[p_idx].text = p_text;
 	items.write[p_idx].xl_text = _atr(p_idx, p_text);
 	_shape_text(p_idx);
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 }
@@ -114,6 +117,7 @@ void ItemList::set_item_text_direction(int p_idx, Control::TextDirection p_text_
 	if (items[p_idx].text_direction != p_text_direction) {
 		items.write[p_idx].text_direction = p_text_direction;
 		_shape_text(p_idx);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -131,6 +135,7 @@ void ItemList::set_item_language(int p_idx, const String &p_language) {
 	if (items[p_idx].language != p_language) {
 		items.write[p_idx].language = p_language;
 		_shape_text(p_idx);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -149,6 +154,7 @@ void ItemList::set_item_auto_translate_mode(int p_idx, AutoTranslateMode p_mode)
 		items.write[p_idx].auto_translate_mode = p_mode;
 		items.write[p_idx].xl_text = _atr(p_idx, items[p_idx].text);
 		_shape_text(p_idx);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -163,7 +169,11 @@ void ItemList::set_item_tooltip_enabled(int p_idx, const bool p_enabled) {
 		p_idx += get_item_count();
 	}
 	ERR_FAIL_INDEX(p_idx, items.size());
-	items.write[p_idx].tooltip_enabled = p_enabled;
+	if (items[p_idx].tooltip_enabled != p_enabled) {
+		items.write[p_idx].tooltip_enabled = p_enabled;
+		items.write[p_idx].accessibility_item_dirty = true;
+		queue_accessibility_update();
+	}
 }
 
 bool ItemList::is_item_tooltip_enabled(int p_idx) const {
@@ -182,6 +192,7 @@ void ItemList::set_item_tooltip(int p_idx, const String &p_tooltip) {
 	}
 
 	items.write[p_idx].tooltip = p_tooltip;
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 }
@@ -348,6 +359,8 @@ void ItemList::set_item_selectable(int p_idx, bool p_selectable) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 
 	items.write[p_idx].selectable = p_selectable;
+	items.write[p_idx].accessibility_item_dirty = true;
+	queue_accessibility_update();
 }
 
 bool ItemList::is_item_selectable(int p_idx) const {
@@ -366,6 +379,8 @@ void ItemList::set_item_disabled(int p_idx, bool p_disabled) {
 	}
 
 	items.write[p_idx].disabled = p_disabled;
+	items.write[p_idx].accessibility_item_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -403,7 +418,10 @@ void ItemList::select(int p_idx, bool p_single) {
 		}
 
 		for (int i = 0; i < items.size(); i++) {
-			items.write[i].selected = p_idx == i;
+			if (items.write[i].selected != (p_idx == i)) {
+				items.write[i].selected = (p_idx == i);
+				items.write[i].accessibility_item_dirty = true;
+			}
 		}
 
 		current = p_idx;
@@ -411,8 +429,10 @@ void ItemList::select(int p_idx, bool p_single) {
 	} else {
 		if (items[p_idx].selectable && !items[p_idx].disabled) {
 			items.write[p_idx].selected = true;
+			items.write[p_idx].accessibility_item_dirty = true;
 		}
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -425,18 +445,24 @@ void ItemList::deselect(int p_idx) {
 	} else {
 		items.write[p_idx].selected = false;
 	}
+	items.write[p_idx].accessibility_item_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
 void ItemList::deselect_all() {
-	if (items.size() < 1) {
+	if (items.is_empty()) {
 		return;
 	}
 
 	for (int i = 0; i < items.size(); i++) {
-		items.write[i].selected = false;
+		if (items.write[i].selected) {
+			items.write[i].selected = false;
+			items.write[i].accessibility_item_dirty = true;
+		}
 	}
 	current = -1;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -457,6 +483,7 @@ void ItemList::set_current(int p_current) {
 		select(p_current, true);
 	} else {
 		current = p_current;
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -477,6 +504,7 @@ void ItemList::move_item(int p_from_idx, int p_to_idx) {
 	items.remove_at(p_from_idx);
 	items.insert(p_to_idx, item);
 
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 	notify_property_list_changed();
@@ -489,7 +517,17 @@ void ItemList::set_item_count(int p_count) {
 		return;
 	}
 
+	if (items.size() > p_count) {
+		for (int i = p_count; i < items.size(); i++) {
+			if (items[i].accessibility_item_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(items.write[i].accessibility_item_element);
+				items.write[i].accessibility_item_element = RID();
+			}
+		}
+	}
+
 	items.resize(p_count);
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 	notify_property_list_changed();
@@ -502,10 +540,15 @@ int ItemList::get_item_count() const {
 void ItemList::remove_item(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 
+	if (items[p_idx].accessibility_item_element.is_valid()) {
+		DisplayServer::get_singleton()->accessibility_free_element(items.write[p_idx].accessibility_item_element);
+		items.write[p_idx].accessibility_item_element = RID();
+	}
 	items.remove_at(p_idx);
 	if (current == p_idx) {
 		current = -1;
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 	defer_select_single = -1;
@@ -513,9 +556,16 @@ void ItemList::remove_item(int p_idx) {
 }
 
 void ItemList::clear() {
+	for (int i = 0; i < items.size(); i++) {
+		if (items[i].accessibility_item_element.is_valid()) {
+			DisplayServer::get_singleton()->accessibility_free_element(items.write[i].accessibility_item_element);
+			items.write[i].accessibility_item_element = RID();
+		}
+	}
 	items.clear();
 	current = -1;
 	ensure_selected_visible = false;
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 	defer_select_single = -1;
@@ -558,13 +608,14 @@ void ItemList::set_max_text_lines(int p_lines) {
 		max_text_lines = p_lines;
 		for (int i = 0; i < items.size(); i++) {
 			if (icon_mode == ICON_MODE_TOP && max_text_lines > 0) {
-				items.write[i].text_buf->set_break_flags(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_GRAPHEME_BOUND | TextServer::BREAK_TRIM_EDGE_SPACES);
+				items.write[i].text_buf->set_break_flags(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_GRAPHEME_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES);
 				items.write[i].text_buf->set_max_lines_visible(p_lines);
 			} else {
 				items.write[i].text_buf->set_break_flags(TextServer::BREAK_NONE);
 			}
 		}
 		shape_changed = true;
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -581,6 +632,7 @@ void ItemList::set_max_columns(int p_amount) {
 	}
 
 	max_columns = p_amount;
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 }
@@ -595,6 +647,7 @@ void ItemList::set_select_mode(SelectMode p_mode) {
 	}
 
 	select_mode = p_mode;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -608,7 +661,7 @@ void ItemList::set_icon_mode(IconMode p_mode) {
 		icon_mode = p_mode;
 		for (int i = 0; i < items.size(); i++) {
 			if (icon_mode == ICON_MODE_TOP && max_text_lines > 0) {
-				items.write[i].text_buf->set_break_flags(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_GRAPHEME_BOUND | TextServer::BREAK_TRIM_EDGE_SPACES);
+				items.write[i].text_buf->set_break_flags(TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_GRAPHEME_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES);
 			} else {
 				items.write[i].text_buf->set_break_flags(TextServer::BREAK_NONE);
 			}
@@ -694,7 +747,9 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {
 	if (mm.is_valid()) {
 		int closest = get_item_at_position(mm->get_position(), true);
 		if (closest != hovered) {
+			prev_hovered = hovered;
 			hovered = closest;
+			queue_accessibility_update();
 			queue_redraw();
 		}
 	}
@@ -834,6 +889,21 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {
 	}
 
 	if (p_event->is_pressed() && items.size() > 0) {
+		if (p_event->is_action("ui_menu", true)) {
+			if (current != -1 && allow_rmb_select) {
+				int i = current;
+
+				if (items[i].disabled) {
+					// Don't emit any signal or do any action with clicked item when disabled.
+					return;
+				}
+
+				emit_signal(SNAME("item_clicked"), i, get_item_rect(i).position, MouseButton::RIGHT);
+
+				accept_event();
+				return;
+			}
+		}
 		if (p_event->is_action("ui_up", true)) {
 			if (!search_string.is_empty()) {
 				uint64_t now = OS::get_singleton()->get_ticks_msec();
@@ -1076,8 +1146,131 @@ static Rect2 _adjust_to_max_size(Size2 p_size, Size2 p_max_size) {
 	return Rect2(ofs_x, ofs_y, tex_width, tex_height);
 }
 
+RID ItemList::get_focused_accessibility_element() const {
+	if (current == -1) {
+		return get_accessibility_element();
+	} else {
+		const Item &item = items[current];
+		return item.accessibility_item_element;
+	}
+}
+
+void ItemList::_accessibility_action_scroll_set(const Variant &p_data) {
+	const Point2 &pos = p_data;
+	scroll_bar_h->set_value(pos.x);
+	scroll_bar_v->set_value(pos.y);
+}
+
+void ItemList::_accessibility_action_scroll_up(const Variant &p_data) {
+	scroll_bar_v->set_value(scroll_bar_v->get_value() - scroll_bar_v->get_page() / 4);
+}
+
+void ItemList::_accessibility_action_scroll_down(const Variant &p_data) {
+	scroll_bar_v->set_value(scroll_bar_v->get_value() + scroll_bar_v->get_page() / 4);
+}
+
+void ItemList::_accessibility_action_scroll_left(const Variant &p_data) {
+	scroll_bar_h->set_value(scroll_bar_h->get_value() - scroll_bar_h->get_page() / 4);
+}
+
+void ItemList::_accessibility_action_scroll_right(const Variant &p_data) {
+	scroll_bar_h->set_value(scroll_bar_h->get_value() + scroll_bar_h->get_page() / 4);
+}
+
+void ItemList::_accessibility_action_scroll_into_view(const Variant &p_data, int p_index) {
+	ERR_FAIL_INDEX(p_index, items.size());
+
+	Rect2 r = items[p_index].rect_cache;
+	int from_v = scroll_bar_v->get_value();
+	int to_v = from_v + scroll_bar_v->get_page();
+	int from_h = scroll_bar_h->get_value();
+	int to_h = from_h + scroll_bar_h->get_page();
+
+	if (r.position.y < from_v) {
+		scroll_bar_v->set_value(r.position.y);
+	} else if (r.position.y + r.size.y > to_v) {
+		scroll_bar_v->set_value(r.position.y + r.size.y - (to_v - from_v));
+	}
+	if (r.position.x < from_h) {
+		scroll_bar_h->set_value(r.position.x);
+	} else if (r.position.x + r.size.x > to_h) {
+		scroll_bar_h->set_value(r.position.x + r.size.x - (to_h - from_h));
+	}
+}
+
+void ItemList::_accessibility_action_focus(const Variant &p_data, int p_index) {
+	select(p_index);
+}
+
+void ItemList::_accessibility_action_blur(const Variant &p_data, int p_index) {
+	deselect(p_index);
+}
+
 void ItemList::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_EXIT_TREE:
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			for (int i = 0; i < items.size(); i++) {
+				items.write[i].accessibility_item_element = RID();
+			}
+			accessibility_scroll_element = RID();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			force_update_list_size();
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LIST_BOX);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, items.size());
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_MULTISELECTABLE, select_mode == SELECT_MULTI);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &ItemList::_accessibility_action_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &ItemList::_accessibility_action_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &ItemList::_accessibility_action_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &ItemList::_accessibility_action_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &ItemList::_accessibility_action_scroll_set));
+
+			if (accessibility_scroll_element.is_null()) {
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+			}
+
+			Transform2D scroll_xform;
+			scroll_xform.set_origin(Vector2i(-scroll_bar_h->get_value(), -scroll_bar_v->get_value()));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, Rect2(0, 0, scroll_bar_h->get_max(), scroll_bar_v->get_max()));
+
+			for (int i = 0; i < items.size(); i++) {
+				const Item &item = items.write[i];
+
+				if (item.accessibility_item_element.is_null()) {
+					item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(accessibility_scroll_element, DisplayServer::AccessibilityRole::ROLE_LIST_BOX_OPTION);
+					item.accessibility_item_dirty = true;
+				}
+				if (item.accessibility_item_dirty || i == hovered || i == prev_hovered) {
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &ItemList::_accessibility_action_scroll_into_view).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &ItemList::_accessibility_action_focus).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &ItemList::_accessibility_action_blur).bind(i));
+
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_index(item.accessibility_item_element, i);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_level(item.accessibility_item_element, 0);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(item.accessibility_item_element, item.selected);
+					DisplayServer::get_singleton()->accessibility_update_set_name(item.accessibility_item_element, item.xl_text);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, item.disabled);
+					if (item.tooltip_enabled) {
+						DisplayServer::get_singleton()->accessibility_update_set_tooltip(item.accessibility_item_element, item.tooltip);
+					}
+
+					Rect2 r = get_item_rect(i);
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(item.accessibility_item_element, Rect2(r.position, r.size));
+
+					item.accessibility_item_dirty = false;
+				}
+			}
+			prev_hovered = -1;
+
+		} break;
+
 		case NOTIFICATION_RESIZED: {
 			shape_changed = true;
 			queue_redraw();
@@ -1089,6 +1282,7 @@ void ItemList::_notification(int p_what) {
 				_shape_text(i);
 			}
 			shape_changed = true;
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 		case NOTIFICATION_TRANSLATION_CHANGED: {
@@ -1097,6 +1291,7 @@ void ItemList::_notification(int p_what) {
 				_shape_text(i);
 			}
 			shape_changed = true;
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 
@@ -1537,6 +1732,8 @@ void ItemList::force_update_list_size() {
 
 		items.write[i].rect_cache.size = minsize;
 		items.write[i].min_rect_cache.size = minsize;
+
+		items.write[i].accessibility_item_dirty = true;
 	}
 
 	int fit_size = size.x - theme_cache.panel_style->get_minimum_size().width;
@@ -1661,7 +1858,9 @@ void ItemList::_scroll_changed(double) {
 
 void ItemList::_mouse_exited() {
 	if (hovered > -1) {
+		prev_hovered = hovered;
 		hovered = -1;
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -1763,6 +1962,7 @@ String ItemList::get_tooltip(const Point2 &p_pos) const {
 
 void ItemList::sort_items_by_text() {
 	items.sort();
+	queue_accessibility_update();
 	queue_redraw();
 	shape_changed = true;
 
@@ -1872,6 +2072,7 @@ void ItemList::set_auto_width(bool p_enable) {
 
 	auto_width = p_enable;
 	shape_changed = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -1886,6 +2087,7 @@ void ItemList::set_auto_height(bool p_enable) {
 
 	auto_height = p_enable;
 	shape_changed = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2078,7 +2280,7 @@ void ItemList::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "max_text_lines", PROPERTY_HINT_RANGE, "1,10,1,or_greater"), "set_max_text_lines", "get_max_text_lines");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_width"), "set_auto_width", "has_auto_width");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "auto_height"), "set_auto_height", "has_auto_height");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis (6+ Characters),Word Ellipsis (6+ Characters),Ellipsis (Always),Word Ellipsis (Always)"), "set_text_overrun_behavior", "get_text_overrun_behavior");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "wraparound_items"), "set_wraparound_items", "has_wraparound_items");
 	ADD_ARRAY_COUNT("Items", "item_count", "set_item_count", "get_item_count", "item_");
 	ADD_GROUP("Columns", "");
diff --git a/engine/scene/gui/item_list.h b/engine/scene/gui/item_list.h
index 72d0f242..26f21410 100644
--- a/engine/scene/gui/item_list.h
+++ b/engine/scene/gui/item_list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ITEM_LIST_H
-#define ITEM_LIST_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/gui/scroll_bar.h"
@@ -53,6 +52,9 @@ public:
 
 private:
 	struct Item {
+		mutable RID accessibility_item_element;
+		mutable bool accessibility_item_dirty = true;
+
 		Ref<Texture2D> icon;
 		bool icon_transposed = false;
 		Rect2i icon_region;
@@ -88,12 +90,14 @@ private:
 
 		Item(bool p_dummy) {}
 	};
+	RID accessibility_scroll_element;
 
 	static inline PropertyListHelper base_property_helper;
 	PropertyListHelper property_helper;
 
 	int current = -1;
 	int hovered = -1;
+	int prev_hovered = -1;
 
 	bool shape_changed = true;
 
@@ -181,7 +185,18 @@ protected:
 	bool _property_get_revert(const StringName &p_name, Variant &r_property) const { return property_helper.property_get_revert(p_name, r_property); }
 	static void _bind_methods();
 
+	void _accessibility_action_scroll_set(const Variant &p_data);
+	void _accessibility_action_scroll_up(const Variant &p_data);
+	void _accessibility_action_scroll_down(const Variant &p_data);
+	void _accessibility_action_scroll_left(const Variant &p_data);
+	void _accessibility_action_scroll_right(const Variant &p_data);
+	void _accessibility_action_scroll_into_view(const Variant &p_data, int p_index);
+	void _accessibility_action_focus(const Variant &p_data, int p_index);
+	void _accessibility_action_blur(const Variant &p_data, int p_index);
+
 public:
+	virtual RID get_focused_accessibility_element() const override;
+
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
 	int add_item(const String &p_item, const Ref<Texture2D> &p_texture = Ref<Texture2D>(), bool p_selectable = true);
@@ -325,5 +340,3 @@ public:
 
 VARIANT_ENUM_CAST(ItemList::SelectMode);
 VARIANT_ENUM_CAST(ItemList::IconMode);
-
-#endif // ITEM_LIST_H
diff --git a/engine/scene/gui/label.cpp b/engine/scene/gui/label.cpp
index 9a9d09ca..6418125f 100644
--- a/engine/scene/gui/label.cpp
+++ b/engine/scene/gui/label.cpp
@@ -55,6 +55,27 @@ TextServer::AutowrapMode Label::get_autowrap_mode() const {
 	return autowrap_mode;
 }
 
+void Label::set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags) {
+	if (autowrap_flags_trim == (p_flags & TextServer::BREAK_TRIM_MASK)) {
+		return;
+	}
+
+	autowrap_flags_trim = p_flags & TextServer::BREAK_TRIM_MASK;
+	for (Paragraph &para : paragraphs) {
+		para.lines_dirty = true;
+	}
+	queue_redraw();
+	update_configuration_warnings();
+
+	if (clip || overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) {
+		update_minimum_size();
+	}
+}
+
+BitField<TextServer::LineBreakFlag> Label::get_autowrap_trim_flags() const {
+	return autowrap_flags_trim;
+}
+
 void Label::set_justification_flags(BitField<TextServer::JustificationFlag> p_flags) {
 	if (jst_flags == p_flags) {
 		return;
@@ -79,6 +100,7 @@ void Label::set_uppercase(bool p_uppercase) {
 	uppercase = p_uppercase;
 	text_dirty = true;
 
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -196,7 +218,7 @@ void Label::_shape() const {
 				case TextServer::AUTOWRAP_OFF:
 					break;
 			}
-			autowrap_flags = autowrap_flags | TextServer::BREAK_TRIM_EDGE_SPACES;
+			autowrap_flags = autowrap_flags | autowrap_flags_trim;
 
 			PackedInt32Array line_breaks = TS->shaped_text_get_line_breaks(para.text_rid, width, 0, autowrap_flags);
 			for (int i = 0; i < line_breaks.size(); i = i + 2) {
@@ -236,6 +258,17 @@ void Label::_shape() const {
 		if (para.lines_dirty) {
 			BitField<TextServer::TextOverrunFlag> overrun_flags = TextServer::OVERRUN_NO_TRIM;
 			switch (overrun_behavior) {
+				case TextServer::OVERRUN_TRIM_WORD_ELLIPSIS_FORCE: {
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM_WORD_ONLY);
+					overrun_flags.set_flag(TextServer::OVERRUN_ADD_ELLIPSIS);
+					overrun_flags.set_flag(TextServer::OVERRUN_ENFORCE_ELLIPSIS);
+				} break;
+				case TextServer::OVERRUN_TRIM_ELLIPSIS_FORCE: {
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
+					overrun_flags.set_flag(TextServer::OVERRUN_ADD_ELLIPSIS);
+					overrun_flags.set_flag(TextServer::OVERRUN_ENFORCE_ELLIPSIS);
+				} break;
 				case TextServer::OVERRUN_TRIM_WORD_ELLIPSIS:
 					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
 					overrun_flags.set_flag(TextServer::OVERRUN_TRIM_WORD_ONLY);
@@ -392,14 +425,15 @@ inline void draw_glyph(const Glyph &p_gl, const RID &p_canvas, const Color &p_fo
 	}
 }
 
-inline void draw_glyph_shadow(const Glyph &p_gl, const RID &p_canvas, const Color &p_font_shadow_color, int p_shadow_outline_size, const Vector2 &p_ofs, const Vector2 &shadow_ofs) {
+inline void draw_glyph_shadow(const Glyph &p_gl, const RID &p_canvas, const Color &p_font_shadow_color, const Vector2 &p_ofs, const Vector2 &shadow_ofs) {
 	if (p_gl.font_rid != RID()) {
-		if (p_font_shadow_color.a > 0) {
-			TS->font_draw_glyph(p_gl.font_rid, p_canvas, p_gl.font_size, p_ofs + Vector2(p_gl.x_off, p_gl.y_off) + shadow_ofs, p_gl.index, p_font_shadow_color);
-		}
-		if (p_font_shadow_color.a > 0 && p_shadow_outline_size > 0) {
-			TS->font_draw_glyph_outline(p_gl.font_rid, p_canvas, p_gl.font_size, p_shadow_outline_size, p_ofs + Vector2(p_gl.x_off, p_gl.y_off) + shadow_ofs, p_gl.index, p_font_shadow_color);
-		}
+		TS->font_draw_glyph(p_gl.font_rid, p_canvas, p_gl.font_size, p_ofs + Vector2(p_gl.x_off, p_gl.y_off) + shadow_ofs, p_gl.index, p_font_shadow_color);
+	}
+}
+
+inline void draw_glyph_shadow_outline(const Glyph &p_gl, const RID &p_canvas, const Color &p_font_shadow_color, int p_shadow_outline_size, const Vector2 &p_ofs, const Vector2 &shadow_ofs) {
+	if (p_gl.font_rid != RID()) {
+		TS->font_draw_glyph_outline(p_gl.font_rid, p_canvas, p_gl.font_size, p_shadow_outline_size, p_ofs + Vector2(p_gl.x_off, p_gl.y_off) + shadow_ofs, p_gl.index, p_font_shadow_color);
 	}
 }
 
@@ -659,6 +693,15 @@ PackedStringArray Label::get_configuration_warnings() const {
 
 void Label::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+			DisplayServer::get_singleton()->accessibility_update_set_value(ae, xl_text);
+			DisplayServer::get_singleton()->accessibility_update_set_text_align(ae, horizontal_alignment);
+		} break;
+
 		case NOTIFICATION_TRANSLATION_CHANGED: {
 			String new_text = atr(text);
 			if (new_text == xl_text) {
@@ -670,6 +713,7 @@ void Label::_notification(int p_what) {
 			}
 			text_dirty = true;
 
+			queue_accessibility_update();
 			queue_redraw();
 			update_configuration_warnings();
 		} break;
@@ -703,7 +747,6 @@ void Label::_notification(int p_what) {
 
 			bool has_settings = settings.is_valid();
 
-			Size2 string_size;
 			Ref<StyleBox> style = theme_cache.normal_style;
 			Ref<Font> font = (settings.is_valid() && settings->get_font().is_valid()) ? settings->get_font() : theme_cache.font;
 			int font_size = settings.is_valid() ? settings->get_font_size() : theme_cache.font_size;
@@ -717,7 +760,11 @@ void Label::_notification(int p_what) {
 			int shadow_outline_size = has_settings ? settings->get_shadow_size() : theme_cache.font_shadow_outline_size;
 			bool rtl_layout = is_layout_rtl();
 
-			style->draw(ci, Rect2(Point2(0, 0), get_size()));
+			if (has_focus()) {
+				theme_cache.focus_style->draw(ci, Rect2(Point2(0, 0), get_size()));
+			} else {
+				theme_cache.normal_style->draw(ci, Rect2(Point2(0, 0), get_size()));
+			}
 
 			bool trim_chars = (visible_chars >= 0) && (visible_chars_behavior == TextServer::VC_CHARS_AFTER_SHAPING);
 			bool trim_glyphs_ltr = (visible_chars >= 0) && ((visible_chars_behavior == TextServer::VC_GLYPHS_LTR) || ((visible_chars_behavior == TextServer::VC_GLYPHS_AUTO) && !rtl_layout));
@@ -768,7 +815,10 @@ void Label::_notification(int p_what) {
 
 						// Draw shadow, outline and text. Note: Do not merge this into the single loop iteration, to prevent overlaps.
 						int processed_glyphs_step = 0;
-						for (int step = DRAW_STEP_SHADOW; step < DRAW_STEP_MAX; step++) {
+						for (int step = DRAW_STEP_SHADOW_OUTLINE; step < DRAW_STEP_MAX; step++) {
+							if (step == DRAW_STEP_SHADOW_OUTLINE && (font_shadow_color.a == 0 || shadow_outline_size <= 0)) {
+								continue;
+							}
 							if (step == DRAW_STEP_SHADOW && (font_shadow_color.a == 0)) {
 								continue;
 							}
@@ -784,8 +834,10 @@ void Label::_notification(int p_what) {
 									for (int j = 0; j < ellipsis_glyphs[gl_idx].repeat; j++) {
 										bool skip = (trim_chars && ellipsis_glyphs[gl_idx].end + para.start > visible_chars) || (trim_glyphs_ltr && (processed_glyphs_step >= visible_glyphs)) || (trim_glyphs_rtl && (processed_glyphs_step < total_glyphs - visible_glyphs));
 										if (!skip) {
-											if (step == DRAW_STEP_SHADOW) {
-												draw_glyph_shadow(ellipsis_glyphs[gl_idx], ci, font_shadow_color, shadow_outline_size, offset_step, shadow_ofs);
+											if (step == DRAW_STEP_SHADOW_OUTLINE) {
+												draw_glyph_shadow_outline(ellipsis_glyphs[gl_idx], ci, font_shadow_color, shadow_outline_size, offset_step, shadow_ofs);
+											} else if (step == DRAW_STEP_SHADOW) {
+												draw_glyph_shadow(ellipsis_glyphs[gl_idx], ci, font_shadow_color, offset_step, shadow_ofs);
 											} else if (step == DRAW_STEP_OUTLINE) {
 												draw_glyph_outline(ellipsis_glyphs[gl_idx], ci, font_outline_color, outline_size, offset_step);
 											} else if (step == DRAW_STEP_TEXT) {
@@ -814,8 +866,10 @@ void Label::_notification(int p_what) {
 								for (int k = 0; k < glyphs[j].repeat; k++) {
 									bool skip = (trim_chars && glyphs[j].end + para.start > visible_chars) || (trim_glyphs_ltr && (processed_glyphs_step >= visible_glyphs)) || (trim_glyphs_rtl && (processed_glyphs_step < total_glyphs - visible_glyphs));
 									if (!skip) {
-										if (step == DRAW_STEP_SHADOW) {
-											draw_glyph_shadow(glyphs[j], ci, font_shadow_color, shadow_outline_size, offset_step, shadow_ofs);
+										if (step == DRAW_STEP_SHADOW_OUTLINE) {
+											draw_glyph_shadow_outline(glyphs[j], ci, font_shadow_color, shadow_outline_size, offset_step, shadow_ofs);
+										} else if (step == DRAW_STEP_SHADOW) {
+											draw_glyph_shadow(glyphs[j], ci, font_shadow_color, offset_step, shadow_ofs);
 										} else if (step == DRAW_STEP_OUTLINE) {
 											draw_glyph_outline(glyphs[j], ci, font_outline_color, outline_size, offset_step);
 										} else if (step == DRAW_STEP_TEXT) {
@@ -832,8 +886,10 @@ void Label::_notification(int p_what) {
 									for (int j = 0; j < ellipsis_glyphs[gl_idx].repeat; j++) {
 										bool skip = (trim_chars && ellipsis_glyphs[gl_idx].end + para.start > visible_chars) || (trim_glyphs_ltr && (processed_glyphs_step >= visible_glyphs)) || (trim_glyphs_rtl && (processed_glyphs_step < total_glyphs - visible_glyphs));
 										if (!skip) {
-											if (step == DRAW_STEP_SHADOW) {
-												draw_glyph_shadow(ellipsis_glyphs[gl_idx], ci, font_shadow_color, shadow_outline_size, offset_step, shadow_ofs);
+											if (step == DRAW_STEP_SHADOW_OUTLINE) {
+												draw_glyph_shadow_outline(ellipsis_glyphs[gl_idx], ci, font_shadow_color, shadow_outline_size, offset_step, shadow_ofs);
+											} else if (step == DRAW_STEP_SHADOW) {
+												draw_glyph_shadow(ellipsis_glyphs[gl_idx], ci, font_shadow_color, offset_step, shadow_ofs);
 											} else if (step == DRAW_STEP_OUTLINE) {
 												draw_glyph_outline(ellipsis_glyphs[gl_idx], ci, font_outline_color, outline_size, offset_step);
 											} else if (step == DRAW_STEP_TEXT) {
@@ -940,7 +996,7 @@ Size2 Label::get_minimum_size() const {
 	const Ref<Font> &font = (settings.is_valid() && settings->get_font().is_valid()) ? settings->get_font() : theme_cache.font;
 	int font_size = settings.is_valid() ? settings->get_font_size() : theme_cache.font_size;
 
-	min_size.height = MAX(min_size.height, font->get_height(font_size) + font->get_spacing(TextServer::SPACING_TOP) + font->get_spacing(TextServer::SPACING_BOTTOM));
+	min_size.height = MAX(min_size.height, font->get_height(font_size));
 
 	Size2 min_style = theme_cache.normal_style->get_minimum_size();
 	if (autowrap_mode != TextServer::AUTOWRAP_OFF) {
@@ -1029,7 +1085,7 @@ void Label::set_horizontal_alignment(HorizontalAlignment p_alignment) {
 		}
 	}
 	horizontal_alignment = p_alignment;
-
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -1062,6 +1118,7 @@ void Label::set_text(const String &p_string) {
 	if (visible_ratio < 1) {
 		visible_chars = get_total_character_count() * visible_ratio;
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 	update_configuration_warnings();
@@ -1152,6 +1209,7 @@ void Label::set_paragraph_separator(const String &p_paragraph_separator) {
 	if (paragraph_separator != p_paragraph_separator) {
 		paragraph_separator = p_paragraph_separator;
 		text_dirty = true;
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -1244,6 +1302,7 @@ void Label::set_visible_characters(int p_amount) {
 		}
 		if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING) {
 			text_dirty = true;
+			queue_accessibility_update();
 		}
 		queue_redraw();
 	}
@@ -1268,6 +1327,7 @@ void Label::set_visible_ratio(float p_ratio) {
 
 		if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING) {
 			text_dirty = true;
+			queue_accessibility_update();
 		}
 		queue_redraw();
 	}
@@ -1285,6 +1345,7 @@ void Label::set_visible_characters_behavior(TextServer::VisibleCharactersBehavio
 	if (visible_chars_behavior != p_behavior) {
 		if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING || p_behavior == TextServer::VC_CHARS_BEFORE_SHAPING) {
 			text_dirty = true;
+			queue_accessibility_update();
 		}
 		visible_chars_behavior = p_behavior;
 		queue_redraw();
@@ -1342,6 +1403,8 @@ void Label::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_paragraph_separator"), &Label::get_paragraph_separator);
 	ClassDB::bind_method(D_METHOD("set_autowrap_mode", "autowrap_mode"), &Label::set_autowrap_mode);
 	ClassDB::bind_method(D_METHOD("get_autowrap_mode"), &Label::get_autowrap_mode);
+	ClassDB::bind_method(D_METHOD("set_autowrap_trim_flags", "autowrap_trim_flags"), &Label::set_autowrap_trim_flags);
+	ClassDB::bind_method(D_METHOD("get_autowrap_trim_flags"), &Label::get_autowrap_trim_flags);
 	ClassDB::bind_method(D_METHOD("set_justification_flags", "justification_flags"), &Label::set_justification_flags);
 	ClassDB::bind_method(D_METHOD("get_justification_flags"), &Label::get_justification_flags);
 	ClassDB::bind_method(D_METHOD("set_clip_text", "enable"), &Label::set_clip_text);
@@ -1380,11 +1443,12 @@ void Label::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "horizontal_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_horizontal_alignment", "get_horizontal_alignment");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "vertical_alignment", PROPERTY_HINT_ENUM, "Top,Center,Bottom,Fill"), "set_vertical_alignment", "get_vertical_alignment");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_mode", PROPERTY_HINT_ENUM, "Off,Arbitrary,Word,Word (Smart)"), "set_autowrap_mode", "get_autowrap_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_trim_flags", PROPERTY_HINT_FLAGS, vformat("Trim Spaces After Break:%d,Trim Spaces Before Break:%d", TextServer::BREAK_TRIM_START_EDGE_SPACES, TextServer::BREAK_TRIM_END_EDGE_SPACES)), "set_autowrap_trim_flags", "get_autowrap_trim_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "justification_flags", PROPERTY_HINT_FLAGS, "Kashida Justification:1,Word Justification:2,Justify Only After Last Tab:8,Skip Last Line:32,Skip Last Line With Visible Characters:64,Do Not Skip Single Line:128"), "set_justification_flags", "get_justification_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "paragraph_separator"), "set_paragraph_separator", "get_paragraph_separator");
 
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "clip_text"), "set_clip_text", "is_clipping_text");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis (6+ Characters),Word Ellipsis (6+ Characters),Ellipsis (Always),Word Ellipsis (Always)"), "set_text_overrun_behavior", "get_text_overrun_behavior");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "ellipsis_char"), "set_ellipsis_char", "get_ellipsis_char");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "uppercase"), "set_uppercase", "is_uppercase");
 	ADD_PROPERTY(PropertyInfo(Variant::PACKED_FLOAT32_ARRAY, "tab_stops"), "set_tab_stops", "get_tab_stops");
@@ -1404,6 +1468,7 @@ void Label::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "structured_text_bidi_override_options"), "set_structured_text_bidi_override_options", "get_structured_text_bidi_override_options");
 
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, Label, normal_style, "normal");
+	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, Label, focus_style, "focus");
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Label, line_spacing);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, Label, paragraph_spacing);
 
@@ -1419,6 +1484,7 @@ void Label::_bind_methods() {
 }
 
 Label::Label(const String &p_text) {
+	set_focus_mode(FOCUS_ACCESSIBILITY);
 	set_mouse_filter(MOUSE_FILTER_IGNORE);
 	set_text(p_text);
 	set_v_size_flags(SIZE_SHRINK_CENTER);
diff --git a/engine/scene/gui/label.h b/engine/scene/gui/label.h
index 6b224e0c..b4fa53e1 100644
--- a/engine/scene/gui/label.h
+++ b/engine/scene/gui/label.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LABEL_H
-#define LABEL_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/resources/label_settings.h"
@@ -39,6 +38,7 @@ class Label : public Control {
 
 private:
 	enum LabelDrawStep {
+		DRAW_STEP_SHADOW_OUTLINE,
 		DRAW_STEP_SHADOW,
 		DRAW_STEP_OUTLINE,
 		DRAW_STEP_TEXT,
@@ -50,6 +50,7 @@ private:
 	String text;
 	String xl_text;
 	TextServer::AutowrapMode autowrap_mode = TextServer::AUTOWRAP_OFF;
+	BitField<TextServer::LineBreakFlag> autowrap_flags_trim = TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES;
 	BitField<TextServer::JustificationFlag> jst_flags = TextServer::JUSTIFICATION_WORD_BOUND | TextServer::JUSTIFICATION_KASHIDA | TextServer::JUSTIFICATION_SKIP_LAST_LINE | TextServer::JUSTIFICATION_DO_NOT_SKIP_SINGLE_LINE;
 	bool clip = false;
 	String el_char = U"…";
@@ -89,6 +90,7 @@ private:
 
 	struct ThemeCache {
 		Ref<StyleBox> normal_style;
+		Ref<StyleBox> focus_style;
 		Ref<Font> font;
 
 		int font_size = 0;
@@ -153,6 +155,9 @@ public:
 	void set_autowrap_mode(TextServer::AutowrapMode p_mode);
 	TextServer::AutowrapMode get_autowrap_mode() const;
 
+	void set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags);
+	BitField<TextServer::LineBreakFlag> get_autowrap_trim_flags() const;
+
 	void set_justification_flags(BitField<TextServer::JustificationFlag> p_flags);
 	BitField<TextServer::JustificationFlag> get_justification_flags() const;
 
@@ -196,5 +201,3 @@ public:
 	Label(const String &p_text = String());
 	~Label();
 };
-
-#endif // LABEL_H
diff --git a/engine/scene/gui/line_edit.cpp b/engine/scene/gui/line_edit.cpp
index 969e2fd3..87148d5e 100644
--- a/engine/scene/gui/line_edit.cpp
+++ b/engine/scene/gui/line_edit.cpp
@@ -33,6 +33,7 @@
 #include "core/input/input_map.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"
+#include "core/string/translation_server.h"
 #include "scene/gui/label.h"
 #include "scene/main/window.h"
 #include "scene/theme/theme_db.h"
@@ -399,7 +400,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 
 			if (context_menu_enabled) {
 				_update_context_menu();
-				menu->set_position(get_screen_position() + get_local_mouse_position());
+				menu->set_position(get_screen_transform().xform(get_local_mouse_position()));
 				menu->reset_size();
 				menu->popup();
 			}
@@ -486,6 +487,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 						if (!pass && DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 							DisplayServer::get_singleton()->clipboard_set_primary(text);
 						}
+						queue_accessibility_update();
 					} else if (b->is_double_click()) {
 						// Double-click select word.
 						last_dblclk = OS::get_singleton()->get_ticks_msec();
@@ -500,6 +502,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 								selection.creating = true;
 								selection.start_column = caret_column;
 								set_caret_column(selection.end);
+								queue_accessibility_update();
 								break;
 							}
 						}
@@ -630,7 +633,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		if (k->is_action("ui_menu", true)) {
 			_update_context_menu();
 			Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2);
-			menu->set_position(get_screen_position() + pos);
+			menu->set_position(get_screen_transform().xform(pos));
 			menu->reset_size();
 			menu->popup();
 			menu->grab_focus();
@@ -668,13 +671,14 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
-	// Start Unicode input (hold).
+	// Start Unicode Alt input (hold).
 	if (k->is_alt_pressed() && k->get_keycode() == Key::KP_ADD && !alt_start && !alt_start_no_hold) {
 		if (selection.enabled) {
 			selection_delete();
 		}
 		alt_start = true;
 		alt_code = 0;
+		alt_mode = ALT_INPUT_UNICODE;
 		ime_text = "u";
 		ime_selection = Vector2i(0, -1);
 		_shape();
@@ -690,6 +694,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		}
 		alt_start_no_hold = true;
 		alt_code = 0;
+		alt_mode = ALT_INPUT_UNICODE;
 		ime_text = "u";
 		ime_selection = Vector2i(0, -1);
 		_shape();
@@ -698,37 +703,101 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 		return;
 	}
 
+	// Start OEM Alt input (hold).
+	if (k->is_alt_pressed() && k->get_keycode() >= Key::KP_1 && k->get_keycode() <= Key::KP_9 && !alt_start && !alt_start_no_hold) {
+		if (selection.enabled) {
+			selection_delete();
+		}
+		alt_start = true;
+		alt_code = (uint32_t)(k->get_keycode() - Key::KP_0);
+		alt_mode = ALT_INPUT_OEM;
+		ime_text = vformat("o%s", String::num_int64(alt_code, 10));
+		ime_selection = Vector2i(0, -1);
+		_shape();
+		queue_redraw();
+		accept_event();
+		return;
+	}
+
+	// Start Windows Alt input (hold).
+	if (k->is_alt_pressed() && k->get_keycode() == Key::KP_0 && !alt_start && !alt_start_no_hold) {
+		if (selection.enabled) {
+			selection_delete();
+		}
+		alt_start = true;
+		alt_mode = ALT_INPUT_WIN;
+		alt_code = 0;
+		ime_text = "w";
+		ime_selection = Vector2i(0, -1);
+		_shape();
+		queue_redraw();
+		accept_event();
+		return;
+	}
+
 	// Update Unicode input.
 	if (k->is_pressed() && ((k->is_alt_pressed() && alt_start) || alt_start_no_hold)) {
 		if (k->get_keycode() >= Key::KEY_0 && k->get_keycode() <= Key::KEY_9) {
-			alt_code = alt_code << 4;
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				alt_code = alt_code << 4;
+			} else {
+				alt_code = alt_code * 10;
+			}
 			alt_code += (uint32_t)(k->get_keycode() - Key::KEY_0);
 		} else if (k->get_keycode() >= Key::KP_0 && k->get_keycode() <= Key::KP_9) {
-			alt_code = alt_code << 4;
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				alt_code = alt_code << 4;
+			} else {
+				alt_code = alt_code * 10;
+			}
 			alt_code += (uint32_t)(k->get_keycode() - Key::KP_0);
-		} else if (k->get_keycode() >= Key::A && k->get_keycode() <= Key::F) {
+		} else if (alt_mode == ALT_INPUT_UNICODE && k->get_keycode() >= Key::A && k->get_keycode() <= Key::F) {
 			alt_code = alt_code << 4;
 			alt_code += (uint32_t)(k->get_keycode() - Key::A) + 10;
 		} else if ((Key)k->get_unicode() >= Key::KEY_0 && (Key)k->get_unicode() <= Key::KEY_9) {
-			alt_code = alt_code << 4;
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				alt_code = alt_code << 4;
+			} else {
+				alt_code = alt_code * 10;
+			}
 			alt_code += (uint32_t)((Key)k->get_unicode() - Key::KEY_0);
-		} else if ((Key)k->get_unicode() >= Key::A && (Key)k->get_unicode() <= Key::F) {
+		} else if (alt_mode == ALT_INPUT_UNICODE && (Key)k->get_unicode() >= Key::A && (Key)k->get_unicode() <= Key::F) {
 			alt_code = alt_code << 4;
 			alt_code += (uint32_t)((Key)k->get_unicode() - Key::A) + 10;
 		} else if (k->get_physical_keycode() >= Key::KEY_0 && k->get_physical_keycode() <= Key::KEY_9) {
-			alt_code = alt_code << 4;
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				alt_code = alt_code << 4;
+			} else {
+				alt_code = alt_code * 10;
+			}
 			alt_code += (uint32_t)(k->get_physical_keycode() - Key::KEY_0);
 		}
 		if (k->get_keycode() == Key::BACKSPACE) {
-			alt_code = alt_code >> 4;
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				alt_code = alt_code >> 4;
+			} else {
+				alt_code = alt_code / 10;
+			}
 		}
 		if (alt_code > 0x10ffff) {
 			alt_code = 0x10ffff;
 		}
 		if (alt_code > 0) {
-			ime_text = vformat("u%s", String::num_int64(alt_code, 16, true));
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				ime_text = vformat("u%s", String::num_int64(alt_code, 16, true));
+			} else if (alt_mode == ALT_INPUT_OEM) {
+				ime_text = vformat("o%s", String::num_int64(alt_code, 10));
+			} else if (alt_mode == ALT_INPUT_WIN) {
+				ime_text = vformat("w%s", String::num_int64(alt_code, 10));
+			}
 		} else {
-			ime_text = "u";
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				ime_text = "u";
+			} else if (alt_mode == ALT_INPUT_OEM) {
+				ime_text = "o";
+			} else if (alt_mode == ALT_INPUT_WIN) {
+				ime_text = "w";
+			}
 		}
 		ime_selection = Vector2i(0, -1);
 		_shape();
@@ -741,11 +810,32 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 	if ((!k->is_pressed() && alt_start && k->get_keycode() == Key::ALT) || (alt_start_no_hold && (k->is_action("ui_text_submit", true) || k->is_action("ui_accept", true)))) {
 		alt_start = false;
 		alt_start_no_hold = false;
-		if ((alt_code > 0x31 && alt_code < 0xd800) || (alt_code > 0xdfff && alt_code <= 0x10ffff)) {
+		if ((alt_code > 0x31 && alt_code < 0xd800) || (alt_code > 0xdfff)) {
 			ime_text = String();
 			ime_selection = Vector2i();
-			char32_t ucodestr[2] = { (char32_t)alt_code, 0 };
-			insert_text_at_caret(ucodestr);
+			if (alt_mode == ALT_INPUT_UNICODE) {
+				if ((alt_code > 0x31 && alt_code < 0xd800) || (alt_code > 0xdfff)) {
+					char32_t ucodestr[2] = { (char32_t)alt_code, 0 };
+					insert_text_at_caret(ucodestr);
+				}
+			} else if (alt_mode == ALT_INPUT_OEM) {
+				if (alt_code > 0x00 && alt_code <= 0xff) {
+					char32_t ucodestr[2] = { alt_code_oem437[alt_code], 0 };
+					insert_text_at_caret(ucodestr);
+				} else if ((alt_code > 0xff && alt_code < 0xd800) || (alt_code > 0xdfff)) {
+					char32_t ucodestr[2] = { (char32_t)alt_code, 0 };
+					insert_text_at_caret(ucodestr);
+				}
+			} else if (alt_mode == ALT_INPUT_WIN) {
+				if (alt_code > 0x00 && alt_code <= 0xff) {
+					char32_t ucodestr[2] = { alt_code_cp1252[alt_code], 0 };
+					insert_text_at_caret(ucodestr);
+				} else if ((alt_code > 0xff && alt_code < 0xd800) || (alt_code > 0xdfff)) {
+					char32_t ucodestr[2] = { (char32_t)alt_code, 0 };
+					insert_text_at_caret(ucodestr);
+				}
+			}
+			alt_mode = ALT_INPUT_NONE;
 		} else {
 			ime_text = String();
 			ime_selection = Vector2i();
@@ -760,6 +850,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
 	if (alt_start_no_hold && k->is_action("ui_cancel", true)) {
 		alt_start = false;
 		alt_start_no_hold = false;
+		alt_mode = ALT_INPUT_NONE;
 		ime_text = String();
 		ime_selection = Vector2i();
 		_shape();
@@ -973,7 +1064,9 @@ void LineEdit::drop_data(const Point2 &p_point, const Variant &p_data) {
 	if (p_data.is_string() && is_editable()) {
 		apply_ime();
 
-		set_caret_at_pixel_pos(p_point.x);
+		if (p_point != Vector2(Math::INF, Math::INF)) {
+			set_caret_at_pixel_pos(p_point.x);
+		}
 		int caret_column_tmp = caret_column;
 		bool is_inside_sel = selection.enabled && caret_column >= selection.begin && caret_column <= selection.end;
 		if (Input::get_singleton()->is_key_pressed(Key::CMD_OR_CTRL)) {
@@ -1009,6 +1102,7 @@ void LineEdit::drop_data(const Point2 &p_point, const Variant &p_data) {
 			}
 			text_changed_dirty = true;
 		}
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -1035,6 +1129,33 @@ void LineEdit::_update_theme_item_cache() {
 	theme_cache.base_scale = get_theme_default_base_scale();
 }
 
+void LineEdit::_accessibility_action_set_selection(const Variant &p_data) {
+	Dictionary new_selection = p_data;
+	int sel_start_pos = new_selection["start_char"];
+	int sel_end_pos = new_selection["end_char"];
+	select(sel_start_pos, sel_end_pos);
+}
+
+void LineEdit::_accessibility_action_replace_selected(const Variant &p_data) {
+	String new_text = p_data;
+	insert_text_at_caret(new_text);
+}
+
+void LineEdit::_accessibility_action_set_value(const Variant &p_data) {
+	String new_text = p_data;
+	set_text(new_text);
+}
+
+void LineEdit::_accessibility_action_menu(const Variant &p_data) {
+	_update_context_menu();
+
+	Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2);
+	menu->set_position(get_screen_position() + pos);
+	menu->reset_size();
+	menu->popup();
+	menu->grab_focus();
+}
+
 void LineEdit::_notification(int p_what) {
 	switch (p_what) {
 #ifdef TOOLS_ENABLED
@@ -1049,6 +1170,98 @@ void LineEdit::_notification(int p_what) {
 			}
 		} break;
 #endif
+		case NOTIFICATION_EXIT_TREE:
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			accessibility_text_root_element = RID();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_TEXT_FIELD);
+			bool using_placeholder = text.is_empty() && ime_text.is_empty();
+			if (using_placeholder && !placeholder.is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_placeholder(ae, atr(placeholder));
+			}
+			if (!placeholder.is_empty() && get_accessibility_name().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, atr(placeholder));
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_READONLY, !editable);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_TEXT_SELECTION, callable_mp(this, &LineEdit::_accessibility_action_set_selection));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT, callable_mp(this, &LineEdit::_accessibility_action_replace_selected));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &LineEdit::_accessibility_action_set_value));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &LineEdit::_accessibility_action_menu));
+			if (!language.is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_language(ae, language);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_language(ae, TranslationServer::get_singleton()->get_tool_locale());
+			}
+
+			bool rtl = is_layout_rtl();
+			Ref<StyleBox> style = theme_cache.normal;
+			Ref<Font> font = theme_cache.font;
+
+			Size2 size = get_size();
+
+			int x_ofs = 0;
+			float text_width = TS->shaped_text_get_size(text_rid).x;
+			float text_height = TS->shaped_text_get_size(text_rid).y;
+			int y_area = size.height - style->get_minimum_size().height;
+			int y_ofs = style->get_offset().y + (y_area - text_height) / 2;
+
+			switch (alignment) {
+				case HORIZONTAL_ALIGNMENT_FILL:
+				case HORIZONTAL_ALIGNMENT_LEFT: {
+					if (rtl) {
+						x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width))));
+					} else {
+						x_ofs = style->get_offset().x;
+					}
+				} break;
+				case HORIZONTAL_ALIGNMENT_CENTER: {
+					if (!Math::is_zero_approx(scroll_offset)) {
+						x_ofs = style->get_offset().x;
+					} else {
+						x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - (text_width)) / 2);
+					}
+				} break;
+				case HORIZONTAL_ALIGNMENT_RIGHT: {
+					if (rtl) {
+						x_ofs = style->get_offset().x;
+					} else {
+						x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - Math::ceil(style->get_margin(SIDE_RIGHT) + (text_width))));
+					}
+				} break;
+			}
+			bool display_clear_icon = !using_placeholder && is_editable() && clear_button_enabled;
+			if (right_icon.is_valid() || display_clear_icon) {
+				Ref<Texture2D> r_icon = display_clear_icon ? theme_cache.clear_icon : right_icon;
+				if (alignment == HORIZONTAL_ALIGNMENT_CENTER) {
+					if (Math::is_zero_approx(scroll_offset)) {
+						x_ofs = MAX(style->get_margin(SIDE_LEFT), int(size.width - text_width - r_icon->get_width() - style->get_margin(SIDE_RIGHT) * 2) / 2);
+					}
+				} else {
+					x_ofs = MAX(style->get_margin(SIDE_LEFT), x_ofs - r_icon->get_width() - style->get_margin(SIDE_RIGHT));
+				}
+			}
+
+			float text_off_x = x_ofs + scroll_offset;
+
+			if (accessibility_text_root_element.is_null()) {
+				accessibility_text_root_element = DisplayServer::get_singleton()->accessibility_create_sub_text_edit_elements(ae, using_placeholder ? RID() : text_rid, text_height);
+			}
+
+			Transform2D text_xform;
+			text_xform.set_origin(Vector2i(text_off_x, y_ofs));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_text_root_element, text_xform);
+			if (selection.enabled) {
+				DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, accessibility_text_root_element, selection.begin, accessibility_text_root_element, selection.end);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, accessibility_text_root_element, caret_column, accessibility_text_root_element, caret_column);
+			}
+		} break;
 
 		case NOTIFICATION_RESIZED: {
 			_fit_to_width();
@@ -1202,12 +1415,14 @@ void LineEdit::_notification(int p_what) {
 					if (rect.position.x < x_ofs) {
 						rect.size.x -= (x_ofs - rect.position.x);
 						rect.position.x = x_ofs;
-					} else if (rect.position.x + rect.size.x > ofs_max) {
+					}
+					if (rect.position.x + rect.size.x > ofs_max) {
 						rect.size.x = ofs_max - rect.position.x;
 					}
 					RenderingServer::get_singleton()->canvas_item_add_rect(ci, rect, selection_color);
 				}
 			}
+
 			const Glyph *glyphs = TS->shaped_text_get_glyphs(text_rid);
 			int gl_size = TS->shaped_text_get_glyph_count(text_rid);
 
@@ -1733,7 +1948,7 @@ void LineEdit::_validate_caret_can_draw() {
 		draw_caret = true;
 		caret_blink_timer = 0.0;
 	}
-	caret_can_draw = editing && (window_has_focus || (menu && menu->has_focus())) && (has_focus() || caret_force_displayed);
+	caret_can_draw = (caret_force_displayed && !is_part_of_edited_scene()) || (editing && (window_has_focus || (menu && menu->has_focus())) && has_focus());
 }
 
 void LineEdit::delete_char() {
@@ -1920,6 +2135,8 @@ void LineEdit::set_caret_column(int p_column) {
 
 	caret_column = p_column;
 
+	queue_accessibility_update();
+
 	// Fit to window.
 
 	if (!is_inside_tree()) {
@@ -1988,6 +2205,7 @@ void LineEdit::set_caret_column(int p_column) {
 
 	scroll_offset = MIN(0, scroll_offset);
 
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2016,7 +2234,7 @@ void LineEdit::insert_text_at_caret(String p_text) {
 		}
 	}
 	String pre = text.substr(0, caret_column);
-	String post = text.substr(caret_column, text.length() - caret_column);
+	String post = text.substr(caret_column);
 	text = pre + p_text + post;
 	_shape();
 	TextServer::Direction dir = TS->shaped_text_get_dominant_direction_in_range(text_rid, caret_column, caret_column + p_text.length());
@@ -2082,6 +2300,7 @@ void LineEdit::deselect() {
 	selection.enabled = false;
 	selection.creating = false;
 	selection.double_click = false;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2140,6 +2359,7 @@ void LineEdit::selection_fill_at_caret() {
 	}
 
 	selection.enabled = (selection.begin != selection.end);
+	queue_accessibility_update();
 }
 
 void LineEdit::select_all() {
@@ -2155,6 +2375,7 @@ void LineEdit::select_all() {
 	selection.begin = 0;
 	selection.end = text.length();
 	selection.enabled = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2172,6 +2393,7 @@ void LineEdit::set_editable(bool p_editable) {
 	_validate_caret_can_draw();
 
 	update_minimum_size();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2241,6 +2463,7 @@ void LineEdit::select(int p_from, int p_to) {
 	selection.end = p_to;
 	selection.creating = false;
 	selection.double_click = false;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -2611,7 +2834,7 @@ void LineEdit::_shape() {
 		t = s.repeat(text.length() + ime_text.length());
 	} else {
 		if (!ime_text.is_empty()) {
-			t = text.substr(0, caret_column) + ime_text + text.substr(caret_column, text.length());
+			t = text.substr(0, caret_column) + ime_text + text.substr(caret_column);
 		} else {
 			t = text;
 		}
@@ -2634,6 +2857,13 @@ void LineEdit::_shape() {
 	if ((expand_to_text_length && old_size.x != size.x) || (old_size.y != size.y)) {
 		update_minimum_size();
 	}
+
+	if (accessibility_text_root_element.is_valid()) {
+		DisplayServer::get_singleton()->accessibility_free_element(accessibility_text_root_element);
+		accessibility_text_root_element = RID();
+	}
+
+	queue_accessibility_update();
 }
 
 void LineEdit::_fit_to_width() {
@@ -2707,7 +2937,6 @@ Key LineEdit::_get_menu_action_accelerator(const String &p_action) {
 void LineEdit::_generate_context_menu() {
 	menu = memnew(PopupMenu);
 	add_child(menu, false, INTERNAL_MODE_FRONT);
-	menu->force_parent_owned();
 
 	menu_dir = memnew(PopupMenu);
 	menu_dir->add_radio_check_item(ETR("Same as Layout Direction"), MENU_DIR_INHERITED);
diff --git a/engine/scene/gui/line_edit.h b/engine/scene/gui/line_edit.h
index 6f6b4930..672c66cd 100644
--- a/engine/scene/gui/line_edit.h
+++ b/engine/scene/gui/line_edit.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LINE_EDIT_H
-#define LINE_EDIT_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/gui/popup_menu.h"
@@ -93,6 +92,14 @@ private:
 	bool pass = false;
 	bool text_changed_dirty = false;
 
+	enum AltInputMode {
+		ALT_INPUT_NONE,
+		ALT_INPUT_UNICODE,
+		ALT_INPUT_OEM,
+		ALT_INPUT_WIN,
+	};
+
+	AltInputMode alt_mode = ALT_INPUT_NONE;
 	bool alt_start = false;
 	bool alt_start_no_hold = false;
 	uint32_t alt_code = 0;
@@ -106,6 +113,7 @@ private:
 	Point2 ime_selection;
 
 	RID text_rid;
+	RID accessibility_text_root_element;
 	float full_width = 0.0;
 
 	bool selecting_enabled = true;
@@ -265,6 +273,11 @@ protected:
 	virtual void unhandled_key_input(const Ref<InputEvent> &p_event) override;
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
+	void _accessibility_action_set_selection(const Variant &p_data);
+	void _accessibility_action_replace_selected(const Variant &p_data);
+	void _accessibility_action_set_value(const Variant &p_data);
+	void _accessibility_action_menu(const Variant &p_data);
+
 public:
 	void edit();
 	void unedit();
@@ -419,5 +432,3 @@ public:
 
 VARIANT_ENUM_CAST(LineEdit::MenuItems);
 VARIANT_ENUM_CAST(LineEdit::VirtualKeyboardType);
-
-#endif // LINE_EDIT_H
diff --git a/engine/scene/gui/link_button.cpp b/engine/scene/gui/link_button.cpp
index 8b330555..46f364f0 100644
--- a/engine/scene/gui/link_button.cpp
+++ b/engine/scene/gui/link_button.cpp
@@ -44,6 +44,8 @@ void LinkButton::_shape() {
 	}
 	TS->shaped_text_set_bidi_override(text_buf->get_rid(), structured_text_parser(st_parser, st_args, xl_text));
 	text_buf->add_string(xl_text, font, font_size, language);
+
+	queue_accessibility_update();
 }
 
 void LinkButton::set_text(const String &p_text) {
@@ -109,7 +111,10 @@ String LinkButton::get_language() const {
 }
 
 void LinkButton::set_uri(const String &p_uri) {
-	uri = p_uri;
+	if (uri != p_uri) {
+		uri = p_uri;
+		queue_accessibility_update();
+	}
 }
 
 String LinkButton::get_uri() const {
@@ -147,6 +152,17 @@ Size2 LinkButton::get_minimum_size() const {
 
 void LinkButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_LINK);
+			if (!xl_text.is_empty() && get_accessibility_name().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, xl_text);
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_url(ae, uri);
+		} break;
+
 		case NOTIFICATION_TRANSLATION_CHANGED: {
 			xl_text = atr(text);
 			_shape();
@@ -288,7 +304,7 @@ void LinkButton::_bind_methods() {
 
 LinkButton::LinkButton(const String &p_text) {
 	text_buf.instantiate();
-	set_focus_mode(FOCUS_NONE);
+	set_focus_mode(FOCUS_ACCESSIBILITY);
 	set_default_cursor_shape(CURSOR_POINTING_HAND);
 
 	set_text(p_text);
diff --git a/engine/scene/gui/link_button.h b/engine/scene/gui/link_button.h
index 2faddf2d..4152467d 100644
--- a/engine/scene/gui/link_button.h
+++ b/engine/scene/gui/link_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LINK_BUTTON_H
-#define LINK_BUTTON_H
+#pragma once
 
 #include "scene/gui/base_button.h"
 #include "scene/resources/text_line.h"
@@ -110,5 +109,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(LinkButton::UnderlineMode);
-
-#endif // LINK_BUTTON_H
diff --git a/engine/scene/gui/margin_container.h b/engine/scene/gui/margin_container.h
index d57ab9b4..86fedee5 100644
--- a/engine/scene/gui/margin_container.h
+++ b/engine/scene/gui/margin_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MARGIN_CONTAINER_H
-#define MARGIN_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -57,5 +56,3 @@ public:
 
 	MarginContainer();
 };
-
-#endif // MARGIN_CONTAINER_H
diff --git a/engine/scene/gui/menu_bar.cpp b/engine/scene/gui/menu_bar.cpp
index 14b717d0..16a13812 100644
--- a/engine/scene/gui/menu_bar.cpp
+++ b/engine/scene/gui/menu_bar.cpp
@@ -85,6 +85,15 @@ void MenuBar::gui_input(const Ref<InputEvent> &p_event) {
 			_open_popup(selected_menu, true);
 		}
 		return;
+	} else if (p_event->is_action("ui_accept", true) && p_event->is_pressed()) {
+		if (focused_menu == -1) {
+			focused_menu = 0;
+		}
+		selected_menu = focused_menu;
+		if (active_menu >= 0) {
+			get_menu_popup(active_menu)->hide();
+		}
+		_open_popup(selected_menu, true);
 	}
 
 	Ref<InputEventMouseMotion> mm = p_event;
@@ -219,9 +228,9 @@ void MenuBar::bind_global_menu() {
 	String prev_tag;
 	if (start_index >= 0) {
 		for (int i = 0; i < count; i++) {
-			String tag = nmenu->get_item_tag(main_menu, i).operator String().get_slice("#", 1);
+			String tag = nmenu->get_item_tag(main_menu, i).operator String().get_slicec('#', 1);
 			if (!tag.is_empty() && tag != prev_tag) {
-				MenuBar *mb = Object::cast_to<MenuBar>(ObjectDB::get_instance(ObjectID(static_cast<uint64_t>(tag.to_int()))));
+				MenuBar *mb = ObjectDB::get_instance<MenuBar>(ObjectID(static_cast<uint64_t>(tag.to_int())));
 				if (mb && mb->get_start_index() >= start_index) {
 					global_start_idx = i;
 					break;
@@ -276,6 +285,12 @@ void MenuBar::unbind_global_menu() {
 
 void MenuBar::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_MENU_BAR);
+		} break;
 		case NOTIFICATION_ENTER_TREE: {
 			if (get_menu_count() > 0) {
 				_refresh_menu_names();
@@ -408,6 +423,10 @@ void MenuBar::_draw_menu_item(int p_index) {
 	bool pressed = (active_menu == p_index);
 	bool rtl = is_layout_rtl();
 
+	if (has_focus() && focused_menu == -1 && p_index == 0) {
+		hovered = true;
+	}
+
 	if (menu_cache[p_index].hidden) {
 		return;
 	}
@@ -548,7 +567,7 @@ int MenuBar::get_menu_idx_from_control(PopupMenu *p_child) const {
 }
 
 void MenuBar::_popup_changed(ObjectID p_menu) {
-	PopupMenu *pm = Object::cast_to<PopupMenu>(ObjectDB::get_instance(p_menu));
+	PopupMenu *pm = ObjectDB::get_instance<PopupMenu>(p_menu);
 	if (!pm) {
 		return;
 	}
@@ -950,6 +969,7 @@ String MenuBar::get_tooltip(const Point2 &p_pos) const {
 }
 
 MenuBar::MenuBar() {
+	set_focus_mode(FOCUS_ALL);
 	set_process_shortcut_input(true);
 }
 
diff --git a/engine/scene/gui/menu_bar.h b/engine/scene/gui/menu_bar.h
index d9ec54a0..381bfd1e 100644
--- a/engine/scene/gui/menu_bar.h
+++ b/engine/scene/gui/menu_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MENU_BAR_H
-#define MENU_BAR_H
+#pragma once
 
 #include "scene/gui/popup_menu.h"
 
@@ -195,5 +194,3 @@ public:
 	MenuBar();
 	~MenuBar();
 };
-
-#endif // MENU_BAR_H
diff --git a/engine/scene/gui/menu_button.cpp b/engine/scene/gui/menu_button.cpp
index dee54d9b..d9f35f44 100644
--- a/engine/scene/gui/menu_button.cpp
+++ b/engine/scene/gui/menu_button.cpp
@@ -126,6 +126,14 @@ int MenuButton::get_item_count() const {
 
 void MenuButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_MENU);
+		} break;
+
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
 			popup->set_layout_direction((Window::LayoutDirection)get_layout_direction());
 		} break;
@@ -218,7 +226,7 @@ MenuButton::MenuButton(const String &p_text) :
 	set_toggle_mode(true);
 	set_disable_shortcuts(false);
 	set_process_shortcut_input(true);
-	set_focus_mode(FOCUS_NONE);
+	set_focus_mode(FOCUS_ACCESSIBILITY);
 	set_action_mode(ACTION_MODE_BUTTON_PRESS);
 
 	popup = memnew(PopupMenu);
diff --git a/engine/scene/gui/menu_button.h b/engine/scene/gui/menu_button.h
index f3ccbcf8..8b20e17e 100644
--- a/engine/scene/gui/menu_button.h
+++ b/engine/scene/gui/menu_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MENU_BUTTON_H
-#define MENU_BUTTON_H
+#pragma once
 
 #include "scene/gui/button.h"
 #include "scene/gui/popup_menu.h"
@@ -78,5 +77,3 @@ public:
 	MenuButton(const String &p_text = String());
 	~MenuButton();
 };
-
-#endif // MENU_BUTTON_H
diff --git a/engine/scene/gui/nine_patch_rect.h b/engine/scene/gui/nine_patch_rect.h
index ae9fab17..b7268486 100644
--- a/engine/scene/gui/nine_patch_rect.h
+++ b/engine/scene/gui/nine_patch_rect.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NINE_PATCH_RECT_H
-#define NINE_PATCH_RECT_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -82,5 +81,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(NinePatchRect::AxisStretchMode)
-
-#endif // NINE_PATCH_RECT_H
diff --git a/engine/scene/gui/option_button.cpp b/engine/scene/gui/option_button.cpp
index 272e02d7..9d9d0442 100644
--- a/engine/scene/gui/option_button.cpp
+++ b/engine/scene/gui/option_button.cpp
@@ -73,6 +73,14 @@ Size2 OptionButton::get_minimum_size() const {
 
 void OptionButton::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_popup_type(ae, DisplayServer::AccessibilityPopupType::POPUP_LIST);
+		} break;
+
 		case NOTIFICATION_POSTINITIALIZE: {
 			_refresh_size_cache();
 			if (has_theme_icon(SNAME("arrow"))) {
@@ -165,7 +173,7 @@ bool OptionButton::_set(const StringName &p_name, const Variant &p_value) {
 			_select(index, false);
 		}
 
-		const String property = sname.get_slice("/", 2);
+		const String property = sname.get_slicec('/', 2);
 		if (property == "text" || property == "icon") {
 			_queue_update_size_cache();
 		}
@@ -240,6 +248,21 @@ void OptionButton::set_item_tooltip(int p_idx, const String &p_tooltip) {
 	popup->set_item_tooltip(p_idx, p_tooltip);
 }
 
+void OptionButton::set_item_auto_translate_mode(int p_idx, AutoTranslateMode p_mode) {
+	if (p_idx < 0) {
+		p_idx += get_item_count();
+	}
+	if (popup->get_item_auto_translate_mode(p_idx) == p_mode) {
+		return;
+	}
+	popup->set_item_auto_translate_mode(p_idx, p_mode);
+
+	if (current == p_idx) {
+		set_text(popup->get_item_text(p_idx));
+	}
+	_queue_update_size_cache();
+}
+
 void OptionButton::set_item_disabled(int p_idx, bool p_disabled) {
 	popup->set_item_disabled(p_idx, p_disabled);
 }
@@ -272,6 +295,10 @@ String OptionButton::get_item_tooltip(int p_idx) const {
 	return popup->get_item_tooltip(p_idx);
 }
 
+Node::AutoTranslateMode OptionButton::get_item_auto_translate_mode(int p_idx) const {
+	return popup->get_item_auto_translate_mode(p_idx);
+}
+
 bool OptionButton::is_item_disabled(int p_idx) const {
 	return popup->is_item_disabled(p_idx);
 }
@@ -431,6 +458,25 @@ void OptionButton::_queue_update_size_cache() {
 	callable_mp(this, &OptionButton::_refresh_size_cache).call_deferred();
 }
 
+String OptionButton::_get_translated_text(const String &p_text) const {
+	if (0 <= current && current < popup->get_item_count()) {
+		AutoTranslateMode mode = popup->get_item_auto_translate_mode(current);
+		switch (mode) {
+			case AUTO_TRANSLATE_MODE_INHERIT: {
+				return atr(p_text);
+			} break;
+			case AUTO_TRANSLATE_MODE_ALWAYS: {
+				return tr(p_text);
+			} break;
+			case AUTO_TRANSLATE_MODE_DISABLED: {
+				return p_text;
+			} break;
+		}
+		ERR_FAIL_V_MSG(atr(p_text), "Unexpected auto translate mode: " + itos(mode));
+	}
+	return atr(p_text);
+}
+
 void OptionButton::select(int p_idx) {
 	_select(p_idx, false);
 }
@@ -510,12 +556,14 @@ void OptionButton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item_id", "idx", "id"), &OptionButton::set_item_id);
 	ClassDB::bind_method(D_METHOD("set_item_metadata", "idx", "metadata"), &OptionButton::set_item_metadata);
 	ClassDB::bind_method(D_METHOD("set_item_tooltip", "idx", "tooltip"), &OptionButton::set_item_tooltip);
+	ClassDB::bind_method(D_METHOD("set_item_auto_translate_mode", "idx", "mode"), &OptionButton::set_item_auto_translate_mode);
 	ClassDB::bind_method(D_METHOD("get_item_text", "idx"), &OptionButton::get_item_text);
 	ClassDB::bind_method(D_METHOD("get_item_icon", "idx"), &OptionButton::get_item_icon);
 	ClassDB::bind_method(D_METHOD("get_item_id", "idx"), &OptionButton::get_item_id);
 	ClassDB::bind_method(D_METHOD("get_item_index", "id"), &OptionButton::get_item_index);
 	ClassDB::bind_method(D_METHOD("get_item_metadata", "idx"), &OptionButton::get_item_metadata);
 	ClassDB::bind_method(D_METHOD("get_item_tooltip", "idx"), &OptionButton::get_item_tooltip);
+	ClassDB::bind_method(D_METHOD("get_item_auto_translate_mode", "idx"), &OptionButton::get_item_auto_translate_mode);
 	ClassDB::bind_method(D_METHOD("is_item_disabled", "idx"), &OptionButton::is_item_disabled);
 	ClassDB::bind_method(D_METHOD("is_item_separator", "idx"), &OptionButton::is_item_separator);
 	ClassDB::bind_method(D_METHOD("add_separator", "text"), &OptionButton::add_separator, DEFVAL(String()));
diff --git a/engine/scene/gui/option_button.h b/engine/scene/gui/option_button.h
index f33d32fd..e35bb7fd 100644
--- a/engine/scene/gui/option_button.h
+++ b/engine/scene/gui/option_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef OPTION_BUTTON_H
-#define OPTION_BUTTON_H
+#pragma once
 
 #include "scene/gui/button.h"
 #include "scene/gui/popup_menu.h"
@@ -80,6 +79,7 @@ class OptionButton : public Button {
 protected:
 	Size2 get_minimum_size() const override;
 	virtual void _queue_update_size_cache() override;
+	virtual String _get_translated_text(const String &p_text) const override;
 
 	void _notification(int p_what);
 	bool _set(const StringName &p_name, const Variant &p_value);
@@ -106,6 +106,7 @@ public:
 	void set_item_metadata(int p_idx, const Variant &p_metadata);
 	void set_item_disabled(int p_idx, bool p_disabled);
 	void set_item_tooltip(int p_idx, const String &p_tooltip);
+	void set_item_auto_translate_mode(int p_idx, AutoTranslateMode p_mode);
 
 	String get_item_text(int p_idx) const;
 	Ref<Texture2D> get_item_icon(int p_idx) const;
@@ -115,6 +116,7 @@ public:
 	bool is_item_disabled(int p_idx) const;
 	bool is_item_separator(int p_idx) const;
 	String get_item_tooltip(int p_idx) const;
+	AutoTranslateMode get_item_auto_translate_mode(int p_idx) const;
 
 	bool has_selectable_items() const;
 	int get_selectable_item(bool p_from_last = false) const;
@@ -150,5 +152,3 @@ public:
 	OptionButton(const String &p_text = String());
 	~OptionButton();
 };
-
-#endif // OPTION_BUTTON_H
diff --git a/engine/scene/gui/panel.cpp b/engine/scene/gui/panel.cpp
index 80961919..9f175ea3 100644
--- a/engine/scene/gui/panel.cpp
+++ b/engine/scene/gui/panel.cpp
@@ -33,6 +33,13 @@
 
 void Panel::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_PANEL);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			RID ci = get_canvas_item();
 			theme_cache.panel_style->draw(ci, Rect2(Point2(), get_size()));
diff --git a/engine/scene/gui/panel.h b/engine/scene/gui/panel.h
index 6f3f8898..3342f16d 100644
--- a/engine/scene/gui/panel.h
+++ b/engine/scene/gui/panel.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PANEL_H
-#define PANEL_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -47,5 +46,3 @@ protected:
 public:
 	Panel();
 };
-
-#endif // PANEL_H
diff --git a/engine/scene/gui/panel_container.h b/engine/scene/gui/panel_container.h
index 45fdbc3a..99970daa 100644
--- a/engine/scene/gui/panel_container.h
+++ b/engine/scene/gui/panel_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PANEL_CONTAINER_H
-#define PANEL_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -52,5 +51,3 @@ public:
 
 	PanelContainer();
 };
-
-#endif // PANEL_CONTAINER_H
diff --git a/engine/scene/gui/popup.cpp b/engine/scene/gui/popup.cpp
index cbba65e0..238834fd 100644
--- a/engine/scene/gui/popup.cpp
+++ b/engine/scene/gui/popup.cpp
@@ -38,7 +38,7 @@
 #include "scene/theme/theme_db.h"
 
 void Popup::_input_from_window(const Ref<InputEvent> &p_event) {
-	if (get_flag(FLAG_POPUP) && p_event->is_action_pressed(SNAME("ui_cancel"), false, true)) {
+	if ((ac_popup || get_flag(FLAG_POPUP)) && p_event->is_action_pressed(SNAME("ui_cancel"), false, true)) {
 		hide_reason = HIDE_REASON_CANCELED; // ESC pressed, mark as canceled unconditionally.
 		_close_pressed();
 	}
@@ -115,7 +115,7 @@ void Popup::_notification(int p_what) {
 		} break;
 
 		case NOTIFICATION_APPLICATION_FOCUS_OUT: {
-			if (!is_in_edited_scene_root() && get_flag(FLAG_POPUP)) {
+			if (!is_in_edited_scene_root() && (get_flag(FLAG_POPUP) || ac_popup)) {
 				if (hide_reason == HIDE_REASON_NONE) {
 					hide_reason = HIDE_REASON_UNFOCUSED;
 				}
@@ -126,7 +126,7 @@ void Popup::_notification(int p_what) {
 }
 
 void Popup::_parent_focused() {
-	if (popped_up && get_flag(FLAG_POPUP)) {
+	if (popped_up && (get_flag(FLAG_POPUP) || ac_popup)) {
 		if (hide_reason == HIDE_REASON_NONE) {
 			hide_reason = HIDE_REASON_UNFOCUSED;
 		}
@@ -167,6 +167,11 @@ Rect2i Popup::_popup_adjust_rect() const {
 
 	Rect2i current(get_position(), get_size());
 
+	if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS)) {
+		// We're fine as is, the Display Server will take care of that for us.
+		return current;
+	}
+
 	if (current.position.x + current.size.x > parent_rect.position.x + parent_rect.size.x) {
 		current.position.x = parent_rect.position.x + parent_rect.size.x - current.size.x;
 	}
@@ -218,7 +223,10 @@ Popup::Popup() {
 	set_transient(true);
 	set_flag(FLAG_BORDERLESS, true);
 	set_flag(FLAG_RESIZE_DISABLED, true);
+	set_flag(FLAG_MINIMIZE_DISABLED, true);
+	set_flag(FLAG_MAXIMIZE_DISABLED, true);
 	set_flag(FLAG_POPUP, true);
+	set_flag(FLAG_POPUP_WM_HINT, true);
 }
 
 Popup::~Popup() {
@@ -299,7 +307,7 @@ Rect2i PopupPanel::_popup_adjust_rect() const {
 	_update_child_rects();
 
 	if (is_layout_rtl()) {
-		current.position -= Vector2(ABS(panel->get_offset(SIDE_RIGHT)), panel->get_offset(SIDE_TOP)) * get_content_scale_factor();
+		current.position -= Vector2(Math::abs(panel->get_offset(SIDE_RIGHT)), panel->get_offset(SIDE_TOP)) * get_content_scale_factor();
 	} else {
 		current.position -= Vector2(panel->get_offset(SIDE_LEFT), panel->get_offset(SIDE_TOP)) * get_content_scale_factor();
 	}
diff --git a/engine/scene/gui/popup.h b/engine/scene/gui/popup.h
index 8985f208..de03ec64 100644
--- a/engine/scene/gui/popup.h
+++ b/engine/scene/gui/popup.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POPUP_H
-#define POPUP_H
+#pragma once
 
 #include "scene/main/window.h"
 
@@ -41,6 +40,7 @@ class Popup : public Window {
 	GDCLASS(Popup, Window);
 
 	LocalVector<Window *> visible_parents;
+	bool ac_popup = false;
 	bool popped_up = false;
 
 public:
@@ -60,6 +60,7 @@ protected:
 	void _close_pressed();
 	virtual Rect2i _popup_adjust_rect() const override;
 	virtual void _input_from_window(const Ref<InputEvent> &p_event) override;
+	void set_ac_popup() { ac_popup = true; }
 
 	void _notification(int p_what);
 	void _validate_property(PropertyInfo &p_property) const;
@@ -107,5 +108,3 @@ public:
 
 	PopupPanel();
 };
-
-#endif // POPUP_H
diff --git a/engine/scene/gui/popup_menu.cpp b/engine/scene/gui/popup_menu.cpp
index b6dc7575..1a124213 100644
--- a/engine/scene/gui/popup_menu.cpp
+++ b/engine/scene/gui/popup_menu.cpp
@@ -316,32 +316,26 @@ int PopupMenu::_get_items_total_height() const {
 }
 
 int PopupMenu::_get_mouse_over(const Point2 &p_over) const {
-	// Make the item area exclude shadows and the vertical margins and scrollbar.
-	Rect2 item_clickable_area = panel->get_global_rect();
-	if (scroll_container->get_v_scroll_bar()->is_visible_in_tree()) {
-		const int scroll_width = scroll_container->get_v_scroll_bar()->get_size().width;
-		if (is_layout_rtl()) {
-			item_clickable_area.position.x += scroll_width;
-			item_clickable_area.size.width -= scroll_width;
-		}
-		item_clickable_area.size.width -= scroll_width;
-	}
-	float win_scale = get_content_scale_factor();
-	item_clickable_area.position.x += theme_cache.panel_style->get_margin(SIDE_LEFT);
-	item_clickable_area.position.y += theme_cache.panel_style->get_margin(SIDE_TOP);
-	item_clickable_area.position *= win_scale;
-	item_clickable_area.size.y -= theme_cache.panel_style->get_margin(SIDE_TOP) + theme_cache.panel_style->get_margin(SIDE_BOTTOM);
-	item_clickable_area.size *= win_scale;
+	// Transform to scroll_container local coordinates.
+	const Point2 scaled_pos = p_over / get_content_scale_factor();
+	const Point2 over_scroll_container =
+			scroll_container->get_global_transform_with_canvas().xform_inv(scaled_pos);
 
-	if (!item_clickable_area.has_point(p_over)) {
+	// Check if point is inside the item control as clipped by scroll_container.
+	const Rect2 scroll_container_rect = Rect2(Point2(), scroll_container->get_size());
+	const Rect2 bounding_rect = scroll_container_rect.intersection(control->get_rect());
+	if (!bounding_rect.has_point(over_scroll_container)) {
 		return -1;
 	}
 
-	float ofs = item_clickable_area.position.y + (float)theme_cache.v_separation * win_scale * 0.5;
+	// Perform item hit check in control node local space,
+	// so we don't need to worry about any of the container theming.
+	const float over_control_y = control->get_transform().xform_inv(over_scroll_container).y;
+	float bottom_edge = 0;
 	for (int i = 0; i < items.size(); i++) {
-		ofs += i > 0 ? (float)theme_cache.v_separation * win_scale : (float)theme_cache.v_separation * win_scale * 0.5;
-		ofs += _get_item_height(i) * win_scale;
-		if (p_over.y - control->get_position().y * win_scale < ofs) {
+		bottom_edge += theme_cache.v_separation;
+		bottom_edge += _get_item_height(i);
+		if (bottom_edge > over_control_y) {
 			return i;
 		}
 	}
@@ -499,9 +493,11 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 			bool match_found = false;
 			for (int i = search_from; i < items.size(); i++) {
 				if (!items[i].separator && !items[i].disabled) {
+					prev_mouse_over = mouse_over;
 					mouse_over = i;
 					emit_signal(SNAME("id_focused"), items[i].id);
 					scroll_to_item(i);
+					queue_accessibility_update();
 					control->queue_redraw();
 					set_input_as_handled();
 					match_found = true;
@@ -513,9 +509,11 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 				// If the last item is not selectable, try re-searching from the start.
 				for (int i = 0; i < search_from; i++) {
 					if (!items[i].separator && !items[i].disabled) {
+						prev_mouse_over = mouse_over;
 						mouse_over = i;
 						emit_signal(SNAME("id_focused"), items[i].id);
 						scroll_to_item(i);
+						queue_accessibility_update();
 						control->queue_redraw();
 						set_input_as_handled();
 						break;
@@ -537,9 +535,11 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 			bool match_found = false;
 			for (int i = search_from; i >= 0; i--) {
 				if (!items[i].separator && !items[i].disabled) {
+					prev_mouse_over = mouse_over;
 					mouse_over = i;
 					emit_signal(SNAME("id_focused"), items[i].id);
 					scroll_to_item(i);
+					queue_accessibility_update();
 					control->queue_redraw();
 					set_input_as_handled();
 					match_found = true;
@@ -551,9 +551,11 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 				// If the first item is not selectable, try re-searching from the end.
 				for (int i = items.size() - 1; i >= search_from; i--) {
 					if (!items[i].separator && !items[i].disabled) {
+						prev_mouse_over = mouse_over;
 						mouse_over = i;
 						emit_signal(SNAME("id_focused"), items[i].id);
 						scroll_to_item(i);
+						queue_accessibility_update();
 						control->queue_redraw();
 						set_input_as_handled();
 						break;
@@ -738,9 +740,11 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
 			}
 
 			if (items[i].text.findn(search_string) == 0) {
+				prev_mouse_over = mouse_over;
 				mouse_over = i;
 				emit_signal(SNAME("id_focused"), items[i].id);
 				scroll_to_item(i);
+				queue_accessibility_update();
 				control->queue_redraw();
 				set_input_as_handled();
 				break;
@@ -755,6 +759,7 @@ void PopupMenu::_mouse_over_update(const Point2 &p_over) {
 
 	if (id < 0) {
 		mouse_over = -1;
+		queue_accessibility_update();
 		control->queue_redraw();
 		return;
 	}
@@ -766,6 +771,7 @@ void PopupMenu::_mouse_over_update(const Point2 &p_over) {
 
 	if (over != mouse_over) {
 		mouse_over = over;
+		queue_accessibility_update();
 		control->queue_redraw();
 	}
 }
@@ -1060,7 +1066,7 @@ Rect2i PopupMenu::_popup_adjust_rect() const {
 	_update_shadow_offsets();
 
 	if (is_layout_rtl()) {
-		current.position -= Vector2(ABS(panel->get_offset(SIDE_RIGHT)), panel->get_offset(SIDE_TOP)) * get_content_scale_factor();
+		current.position -= Vector2(Math::abs(panel->get_offset(SIDE_RIGHT)), panel->get_offset(SIDE_TOP)) * get_content_scale_factor();
 	} else {
 		current.position -= Vector2(panel->get_offset(SIDE_LEFT), panel->get_offset(SIDE_TOP)) * get_content_scale_factor();
 	}
@@ -1104,8 +1110,105 @@ void PopupMenu::remove_child_notify(Node *p_child) {
 	_menu_changed();
 }
 
+void PopupMenu::_accessibility_action_click(const Variant &p_data, int p_idx) {
+	activate_item(p_idx);
+}
+
+RID PopupMenu::get_focused_accessibility_element() const {
+	if (mouse_over == -1) {
+		return get_accessibility_element();
+	} else {
+		const Item &item = items[mouse_over];
+		return item.accessibility_item_element;
+	}
+}
+
 void PopupMenu::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_EXIT_TREE: {
+			if (system_menu_id != NativeMenu::INVALID_MENU_ID) {
+				unbind_global_menu();
+			}
+			[[fallthrough]];
+		}
+
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			for (int i = 0; i < items.size(); i++) {
+				items.write[i].accessibility_item_element = RID();
+			}
+			accessibility_scroll_element = RID();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			if (has_meta("_menu_name")) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_meta("_menu_name", get_name()));
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_MENU);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, items.size());
+
+			if (accessibility_scroll_element.is_null()) {
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+			}
+
+			Transform2D scroll_xform;
+			scroll_xform.set_origin(Vector2i(0, -scroll_container->get_v_scroll_bar()->get_value()));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, Rect2(0, 0, get_size().x, scroll_container->get_v_scroll_bar()->get_max()));
+
+			float scroll_width = scroll_container->get_v_scroll_bar()->is_visible_in_tree() ? scroll_container->get_v_scroll_bar()->get_size().width : 0;
+			float display_width = control->get_size().width - scroll_width;
+			Point2 ofs;
+
+			for (int i = 0; i < items.size(); i++) {
+				const Item &item = items.write[i];
+
+				ofs.y += i > 0 ? theme_cache.v_separation : (float)theme_cache.v_separation / 2;
+
+				Point2 item_ofs = ofs;
+				if (item.accessibility_item_element.is_null()) {
+					item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(accessibility_scroll_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM);
+					item.accessibility_item_dirty = true;
+				}
+
+				item_ofs.x += item.indent * theme_cache.indent;
+				float h = _get_item_height(i);
+
+				if (item.accessibility_item_dirty || i == prev_mouse_over || i == mouse_over) {
+					switch (item.checkable_type) {
+						case Item::CHECKABLE_TYPE_NONE: {
+							DisplayServer::get_singleton()->accessibility_update_set_role(item.accessibility_item_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM);
+						} break;
+						case Item::CHECKABLE_TYPE_CHECK_BOX: {
+							DisplayServer::get_singleton()->accessibility_update_set_role(item.accessibility_item_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_CHECK_BOX);
+							DisplayServer::get_singleton()->accessibility_update_set_checked(item.accessibility_item_element, item.checked);
+						} break;
+						case Item::CHECKABLE_TYPE_RADIO_BUTTON: {
+							DisplayServer::get_singleton()->accessibility_update_set_role(item.accessibility_item_element, DisplayServer::AccessibilityRole::ROLE_MENU_ITEM_RADIO);
+							DisplayServer::get_singleton()->accessibility_update_set_checked(item.accessibility_item_element, item.checked);
+						} break;
+					}
+
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &PopupMenu::_accessibility_action_click).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_index(item.accessibility_item_element, i);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_level(item.accessibility_item_element, 0);
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(item.accessibility_item_element, i == mouse_over);
+					DisplayServer::get_singleton()->accessibility_update_set_name(item.accessibility_item_element, item.xl_text);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, item.disabled);
+					DisplayServer::get_singleton()->accessibility_update_set_tooltip(item.accessibility_item_element, item.tooltip);
+
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(item.accessibility_item_element, Rect2(item_ofs, Size2(display_width, h + theme_cache.v_separation)));
+
+					item.accessibility_item_dirty = false;
+				}
+				ofs.y += h;
+			}
+			prev_mouse_over = -1;
+
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			PopupMenu *pm = Object::cast_to<PopupMenu>(get_parent());
 			if (pm) {
@@ -1118,12 +1221,6 @@ void PopupMenu::_notification(int p_what) {
 			}
 		} break;
 
-		case NOTIFICATION_EXIT_TREE: {
-			if (system_menu_id != NativeMenu::INVALID_MENU_ID) {
-				unbind_global_menu();
-			}
-		} break;
-
 		case Control::NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_THEME_CHANGED: {
 			panel->add_theme_style_override(SceneStringName(panel), theme_cache.panel_style);
@@ -1146,12 +1243,14 @@ void PopupMenu::_notification(int p_what) {
 			}
 			for (int i = 0; i < items.size(); i++) {
 				Item &item = items.write[i];
-				item.xl_text = atr(item.text);
+				item.xl_text = _atr(i, item.text);
 				item.dirty = true;
 				if (is_global) {
 					nmenu->set_item_text(global_menu, i, item.xl_text);
 				}
+				item.accessibility_item_dirty = true;
 				_shape_item(i);
+				queue_accessibility_update();
 			}
 
 			child_controls_changed();
@@ -1166,6 +1265,7 @@ void PopupMenu::_notification(int p_what) {
 		case NOTIFICATION_WM_MOUSE_EXIT: {
 			if (mouse_over >= 0 && (!items[mouse_over].submenu || submenu_over != -1)) {
 				mouse_over = -1;
+				queue_accessibility_update();
 				control->queue_redraw();
 			}
 		} break;
@@ -1281,7 +1381,9 @@ void PopupMenu::_notification(int p_what) {
 		case NOTIFICATION_VISIBILITY_CHANGED: {
 			if (!is_visible()) {
 				if (mouse_over >= 0) {
+					prev_mouse_over = mouse_over;
 					mouse_over = -1;
+					queue_accessibility_update();
 					control->queue_redraw();
 				}
 
@@ -1341,6 +1443,7 @@ void PopupMenu::add_item(const String &p_label, int p_id, Key p_accel) {
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1364,6 +1467,7 @@ void PopupMenu::add_icon_item(const Ref<Texture2D> &p_icon, const String &p_labe
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1387,6 +1491,7 @@ void PopupMenu::add_check_item(const String &p_label, int p_id, Key p_accel) {
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1412,6 +1517,7 @@ void PopupMenu::add_icon_check_item(const Ref<Texture2D> &p_icon, const String &
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1435,6 +1541,7 @@ void PopupMenu::add_radio_check_item(const String &p_label, int p_id, Key p_acce
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1460,6 +1567,7 @@ void PopupMenu::add_icon_radio_check_item(const Ref<Texture2D> &p_icon, const St
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1485,6 +1593,7 @@ void PopupMenu::add_multistate_item(const String &p_label, int p_max_states, int
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1522,6 +1631,7 @@ void PopupMenu::add_shortcut(const Ref<Shortcut> &p_shortcut, int p_id, bool p_g
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1551,6 +1661,7 @@ void PopupMenu::add_icon_shortcut(const Ref<Texture2D> &p_icon, const Ref<Shortc
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1580,6 +1691,7 @@ void PopupMenu::add_check_shortcut(const Ref<Shortcut> &p_shortcut, int p_id, bo
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1611,6 +1723,7 @@ void PopupMenu::add_icon_check_shortcut(const Ref<Texture2D> &p_icon, const Ref<
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1640,6 +1753,7 @@ void PopupMenu::add_radio_check_shortcut(const Ref<Shortcut> &p_shortcut, int p_
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1671,6 +1785,7 @@ void PopupMenu::add_icon_radio_check_shortcut(const Ref<Texture2D> &p_icon, cons
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1697,6 +1812,7 @@ void PopupMenu::add_submenu_node_item(const String &p_label, PopupMenu *p_submen
 	item.text = p_label;
 	item.xl_text = atr(p_label);
 	item.id = p_id == -1 ? items.size() : p_id;
+	item.accessibility_item_dirty = true;
 	item.submenu = p_submenu;
 	item.submenu_name = p_submenu->get_name();
 	items.push_back(item);
@@ -1710,6 +1826,7 @@ void PopupMenu::add_submenu_node_item(const String &p_label, PopupMenu *p_submen
 	}
 
 	_shape_item(items.size() - 1);
+	queue_accessibility_update();
 	control->queue_redraw();
 
 	child_controls_changed();
@@ -1731,15 +1848,18 @@ void PopupMenu::set_item_text(int p_idx, const String &p_text) {
 		return;
 	}
 	items.write[p_idx].text = p_text;
-	items.write[p_idx].xl_text = atr(p_text);
+	items.write[p_idx].xl_text = _atr(p_idx, p_text);
 	items.write[p_idx].dirty = true;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_text(global_menu, p_idx, items[p_idx].xl_text);
 	}
-	_shape_item(p_idx);
 
+	_shape_item(p_idx);
+	queue_accessibility_update();
 	control->queue_redraw();
+
 	child_controls_changed();
 	_menu_changed();
 }
@@ -1750,9 +1870,14 @@ void PopupMenu::set_item_text_direction(int p_idx, Control::TextDirection p_text
 	}
 	ERR_FAIL_INDEX(p_idx, items.size());
 	ERR_FAIL_COND((int)p_text_direction < -1 || (int)p_text_direction > 3);
+
 	if (items[p_idx].text_direction != p_text_direction) {
 		items.write[p_idx].text_direction = p_text_direction;
 		items.write[p_idx].dirty = true;
+		items.write[p_idx].accessibility_item_dirty = true;
+
+		_shape_item(p_idx);
+		queue_accessibility_update();
 		control->queue_redraw();
 	}
 }
@@ -1765,10 +1890,28 @@ void PopupMenu::set_item_language(int p_idx, const String &p_language) {
 	if (items[p_idx].language != p_language) {
 		items.write[p_idx].language = p_language;
 		items.write[p_idx].dirty = true;
+		items.write[p_idx].accessibility_item_dirty = true;
+
+		_shape_item(p_idx);
+		queue_accessibility_update();
 		control->queue_redraw();
 	}
 }
 
+void PopupMenu::set_item_auto_translate_mode(int p_idx, AutoTranslateMode p_mode) {
+	if (p_idx < 0) {
+		p_idx += get_item_count();
+	}
+	ERR_FAIL_INDEX(p_idx, items.size());
+	if (items[p_idx].auto_translate_mode == p_mode) {
+		return;
+	}
+	items.write[p_idx].auto_translate_mode = p_mode;
+	items.write[p_idx].xl_text = _atr(p_idx, items[p_idx].text);
+	items.write[p_idx].dirty = true;
+	control->queue_redraw();
+}
+
 void PopupMenu::set_item_icon(int p_idx, const Ref<Texture2D> &p_icon) {
 	if (p_idx < 0) {
 		p_idx += get_item_count();
@@ -1832,11 +1975,13 @@ void PopupMenu::set_item_checked(int p_idx, bool p_checked) {
 	}
 
 	items.write[p_idx].checked = p_checked;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_checked(global_menu, p_idx, p_checked);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	child_controls_changed();
 	_menu_changed();
@@ -1875,11 +2020,13 @@ void PopupMenu::set_item_accelerator(int p_idx, Key p_accel) {
 
 	items.write[p_idx].accel = p_accel;
 	items.write[p_idx].dirty = true;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_accelerator(global_menu, p_idx, p_accel);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	child_controls_changed();
 	_menu_changed();
@@ -1911,11 +2058,13 @@ void PopupMenu::set_item_disabled(int p_idx, bool p_disabled) {
 	}
 
 	items.write[p_idx].disabled = p_disabled;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_disabled(global_menu, p_idx, p_disabled);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	child_controls_changed();
 	_menu_changed();
@@ -1979,11 +2128,13 @@ void PopupMenu::set_item_submenu_node(int p_idx, PopupMenu *p_submenu) {
 void PopupMenu::toggle_item_checked(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 	items.write[p_idx].checked = !items[p_idx].checked;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_checked(global_menu, p_idx, items[p_idx].checked);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	child_controls_changed();
 	_menu_changed();
@@ -2009,6 +2160,11 @@ String PopupMenu::get_item_language(int p_idx) const {
 	return items[p_idx].language;
 }
 
+Node::AutoTranslateMode PopupMenu::get_item_auto_translate_mode(int p_idx) const {
+	ERR_FAIL_INDEX_V(p_idx, items.size(), AUTO_TRANSLATE_MODE_INHERIT);
+	return items[p_idx].auto_translate_mode;
+}
+
 int PopupMenu::get_item_idx_from_text(const String &text) const {
 	for (int idx = 0; idx < items.size(); idx++) {
 		if (items[idx].text == text) {
@@ -2115,6 +2271,9 @@ void PopupMenu::set_item_as_separator(int p_idx, bool p_separator) {
 	}
 
 	items.write[p_idx].separator = p_separator;
+	items.write[p_idx].accessibility_item_dirty = true;
+
+	queue_accessibility_update();
 	control->queue_redraw();
 }
 
@@ -2135,11 +2294,13 @@ void PopupMenu::set_item_as_checkable(int p_idx, bool p_checkable) {
 	}
 
 	items.write[p_idx].checkable_type = p_checkable ? Item::CHECKABLE_TYPE_CHECK_BOX : Item::CHECKABLE_TYPE_NONE;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_checkable(global_menu, p_idx, p_checkable);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	_menu_changed();
 }
@@ -2156,11 +2317,13 @@ void PopupMenu::set_item_as_radio_checkable(int p_idx, bool p_radio_checkable) {
 	}
 
 	items.write[p_idx].checkable_type = p_radio_checkable ? Item::CHECKABLE_TYPE_RADIO_BUTTON : Item::CHECKABLE_TYPE_NONE;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_radio_checkable(global_menu, p_idx, p_radio_checkable);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	_menu_changed();
 }
@@ -2176,11 +2339,13 @@ void PopupMenu::set_item_tooltip(int p_idx, const String &p_tooltip) {
 	}
 
 	items.write[p_idx].tooltip = p_tooltip;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_tooltip(global_menu, p_idx, p_tooltip);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	_menu_changed();
 }
@@ -2280,11 +2445,13 @@ void PopupMenu::set_item_multistate(int p_idx, int p_state) {
 	}
 
 	items.write[p_idx].state = p_state;
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_state(global_menu, p_idx, p_state);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	_menu_changed();
 }
@@ -2329,11 +2496,13 @@ void PopupMenu::toggle_item_multistate(int p_idx) {
 	if (items.write[p_idx].max_states <= items[p_idx].state) {
 		items.write[p_idx].state = 0;
 	}
+	items.write[p_idx].accessibility_item_dirty = true;
 
 	if (global_menu.is_valid()) {
 		NativeMenu::get_singleton()->set_item_state(global_menu, p_idx, items[p_idx].state);
 	}
 
+	queue_accessibility_update();
 	control->queue_redraw();
 	_menu_changed();
 }
@@ -2367,11 +2536,12 @@ void PopupMenu::set_focused_item(int p_idx) {
 		return;
 	}
 
+	prev_mouse_over = mouse_over;
 	mouse_over = p_idx;
 	if (mouse_over != -1) {
 		scroll_to_item(mouse_over);
 	}
-
+	queue_accessibility_update();
 	control->queue_redraw();
 }
 
@@ -2393,6 +2563,10 @@ void PopupMenu::set_item_count(int p_count) {
 	if (is_global && prev_size > p_count) {
 		for (int i = prev_size - 1; i >= p_count; i--) {
 			nmenu->remove_item(global_menu, i);
+			if (items[i].accessibility_item_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(items.write[i].accessibility_item_element);
+				items.write[i].accessibility_item_element = RID();
+			}
 		}
 	}
 
@@ -2573,6 +2747,10 @@ void PopupMenu::activate_item(int p_idx) {
 void PopupMenu::remove_item(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, items.size());
 
+	if (items[p_idx].accessibility_item_element.is_valid()) {
+		DisplayServer::get_singleton()->accessibility_free_element(items.write[p_idx].accessibility_item_element);
+		items.write[p_idx].accessibility_item_element = RID();
+	}
 	if (items[p_idx].shortcut.is_valid()) {
 		_unref_shortcut(items[p_idx].shortcut);
 	}
@@ -2592,6 +2770,7 @@ void PopupMenu::add_separator(const String &p_text, int p_id) {
 	Item sep;
 	sep.separator = true;
 	sep.id = p_id;
+	sep.accessibility_item_dirty = true;
 	if (!p_text.is_empty()) {
 		sep.text = p_text;
 		sep.xl_text = atr(p_text);
@@ -2607,7 +2786,11 @@ void PopupMenu::add_separator(const String &p_text, int p_id) {
 }
 
 void PopupMenu::clear(bool p_free_submenus) {
-	for (const Item &I : items) {
+	for (Item &I : items) {
+		if (I.accessibility_item_element.is_valid()) {
+			DisplayServer::get_singleton()->accessibility_free_element(I.accessibility_item_element);
+			I.accessibility_item_element = RID();
+		}
 		if (I.shortcut.is_valid()) {
 			_unref_shortcut(I.shortcut);
 		}
@@ -2631,7 +2814,9 @@ void PopupMenu::clear(bool p_free_submenus) {
 	}
 	items.clear();
 
+	prev_mouse_over = -1;
 	mouse_over = -1;
+	queue_accessibility_update();
 	control->queue_redraw();
 	child_controls_changed();
 	notify_property_list_changed();
@@ -2818,6 +3003,7 @@ void PopupMenu::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item_text", "index", "text"), &PopupMenu::set_item_text);
 	ClassDB::bind_method(D_METHOD("set_item_text_direction", "index", "direction"), &PopupMenu::set_item_text_direction);
 	ClassDB::bind_method(D_METHOD("set_item_language", "index", "language"), &PopupMenu::set_item_language);
+	ClassDB::bind_method(D_METHOD("set_item_auto_translate_mode", "index", "mode"), &PopupMenu::set_item_auto_translate_mode);
 	ClassDB::bind_method(D_METHOD("set_item_icon", "index", "icon"), &PopupMenu::set_item_icon);
 	ClassDB::bind_method(D_METHOD("set_item_icon_max_width", "index", "width"), &PopupMenu::set_item_icon_max_width);
 	ClassDB::bind_method(D_METHOD("set_item_icon_modulate", "index", "modulate"), &PopupMenu::set_item_icon_modulate);
@@ -2844,6 +3030,7 @@ void PopupMenu::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_item_text", "index"), &PopupMenu::get_item_text);
 	ClassDB::bind_method(D_METHOD("get_item_text_direction", "index"), &PopupMenu::get_item_text_direction);
 	ClassDB::bind_method(D_METHOD("get_item_language", "index"), &PopupMenu::get_item_language);
+	ClassDB::bind_method(D_METHOD("get_item_auto_translate_mode", "index"), &PopupMenu::get_item_auto_translate_mode);
 	ClassDB::bind_method(D_METHOD("get_item_icon", "index"), &PopupMenu::get_item_icon);
 	ClassDB::bind_method(D_METHOD("get_item_icon_max_width", "index"), &PopupMenu::get_item_icon_max_width);
 	ClassDB::bind_method(D_METHOD("get_item_icon_modulate", "index"), &PopupMenu::get_item_icon_modulate);
@@ -2983,6 +3170,23 @@ void PopupMenu::_native_popup(const Rect2i &p_rect) {
 	NativeMenu::get_singleton()->popup(global_menu, popup_pos);
 }
 
+String PopupMenu::_atr(int p_idx, const String &p_text) const {
+	ERR_FAIL_INDEX_V(p_idx, items.size(), atr(p_text));
+	switch (items[p_idx].auto_translate_mode) {
+		case AUTO_TRANSLATE_MODE_INHERIT: {
+			return atr(p_text);
+		} break;
+		case AUTO_TRANSLATE_MODE_ALWAYS: {
+			return tr(p_text);
+		} break;
+		case AUTO_TRANSLATE_MODE_DISABLED: {
+			return p_text;
+		} break;
+	}
+
+	ERR_FAIL_V_MSG(atr(p_text), "Unexpected auto translate mode: " + itos(items[p_idx].auto_translate_mode));
+}
+
 void PopupMenu::popup(const Rect2i &p_bounds) {
 	bool native = global_menu.is_valid();
 #ifdef TOOLS_ENABLED
@@ -2994,18 +3198,30 @@ void PopupMenu::popup(const Rect2i &p_bounds) {
 	if (native) {
 		_native_popup(p_bounds != Rect2i() ? p_bounds : Rect2i(get_position(), Size2i()));
 	} else {
-		set_flag(FLAG_NO_FOCUS, !is_embedded());
+		if (is_inside_tree()) {
+			bool ac = get_tree()->is_accessibility_enabled();
+			// Note: Native popup menus need keyboard focus to work with screen reader.
+			set_flag(FLAG_POPUP, !ac);
+			set_flag(FLAG_NO_FOCUS, !is_embedded() && !ac);
+			if (ac) {
+				set_ac_popup();
+			}
+		}
 
 		moved = Vector2();
 		popup_time_msec = OS::get_singleton()->get_ticks_msec();
-		if (!is_embedded()) {
-			float win_scale = get_parent_visible_window()->get_content_scale_factor();
-			set_content_scale_factor(win_scale);
-			Size2 minsize = get_contents_minimum_size() * win_scale;
-			minsize.height = Math::ceil(minsize.height); // Ensures enough height at fractional content scales to prevent the v_scroll_bar from showing.
-			set_min_size(minsize); // `height` is truncated here by the cast to Size2i for Window.min_size.
-			set_size(Vector2(0, 0)); // Shrinkwraps to min size.
+
+		Size2 scale = get_parent_viewport()->get_popup_base_transform().get_scale();
+		CanvasItem *c = Object::cast_to<CanvasItem>(get_parent());
+		if (c) {
+			scale *= c->get_global_transform_with_canvas().get_scale();
 		}
+		real_t popup_scale = MIN(scale.x, scale.y);
+		set_content_scale_factor(popup_scale);
+		Size2 minsize = get_contents_minimum_size() * popup_scale;
+		minsize.height = Math::ceil(minsize.height); // Ensures enough height at fractional content scales to prevent the v_scroll_bar from showing.
+		set_min_size(minsize); // `height` is truncated here by the cast to Size2i for Window.min_size.
+		set_size(Vector2(0, 0)); // Shrinkwraps to min size.
 		Popup::popup(p_bounds);
 	}
 }
@@ -3023,7 +3239,15 @@ void PopupMenu::set_visible(bool p_visible) {
 			_native_popup(Rect2i(get_position(), get_size()));
 		}
 	} else {
-		set_flag(FLAG_NO_FOCUS, !is_embedded());
+		if (is_inside_tree()) {
+			bool ac = get_tree()->is_accessibility_enabled();
+			// Note: Native popup menus need keyboard focus to work with screen reader.
+			set_flag(FLAG_POPUP, !ac);
+			set_flag(FLAG_NO_FOCUS, !is_embedded() && !ac);
+			if (ac) {
+				set_ac_popup();
+			}
+		}
 
 		Popup::set_visible(p_visible);
 	}
diff --git a/engine/scene/gui/popup_menu.h b/engine/scene/gui/popup_menu.h
index bf84d5ef..30cff62a 100644
--- a/engine/scene/gui/popup_menu.h
+++ b/engine/scene/gui/popup_menu.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POPUP_MENU_H
-#define POPUP_MENU_H
+#pragma once
 
 #include "core/input/shortcut.h"
 #include "scene/gui/popup.h"
@@ -45,6 +44,9 @@ class PopupMenu : public Popup {
 	static HashMap<NativeMenu::SystemMenus, PopupMenu *> system_menus;
 
 	struct Item {
+		mutable RID accessibility_item_element;
+		mutable bool accessibility_item_dirty = true;
+
 		Ref<Texture2D> icon;
 		int icon_max_width = 0;
 		Color icon_modulate = Color(1, 1, 1, 1);
@@ -55,6 +57,7 @@ class PopupMenu : public Popup {
 
 		String language;
 		Control::TextDirection text_direction = Control::TEXT_DIRECTION_AUTO;
+		AutoTranslateMode auto_translate_mode = AUTO_TRANSLATE_MODE_INHERIT;
 
 		bool checked = false;
 		enum {
@@ -95,6 +98,7 @@ class PopupMenu : public Popup {
 
 		Item(bool p_dummy) {}
 	};
+	RID accessibility_scroll_element;
 
 	mutable Rect2i pre_popup_rect;
 	void _update_shadow_offsets() const;
@@ -118,10 +122,11 @@ class PopupMenu : public Popup {
 	Timer *submenu_timer = nullptr;
 	List<Rect2> autohide_areas;
 	mutable Vector<Item> items;
-	BitField<MouseButtonMask> initial_button_mask;
+	BitField<MouseButtonMask> initial_button_mask = MouseButtonMask::NONE;
 	bool during_grabbed_click = false;
 	bool is_scrolling = false;
 	int mouse_over = -1;
+	int prev_mouse_over = -1;
 	int submenu_over = -1;
 	String _get_accel_text(const Item &p_item) const;
 	int _get_mouse_over(const Point2 &p_over) const;
@@ -134,6 +139,8 @@ class PopupMenu : public Popup {
 
 	void _shape_item(int p_idx) const;
 
+	void _accessibility_action_click(const Variant &p_data, int p_idx);
+
 	void _activate_submenu(int p_over, bool p_by_keyboard = false);
 	void _submenu_timeout();
 
@@ -216,6 +223,7 @@ class PopupMenu : public Popup {
 	void _set_item_checkable_type(int p_index, int p_checkable_type);
 	int _get_item_checkable_type(int p_index) const;
 	void _native_popup(const Rect2i &p_rect);
+	String _atr(int p_idx, const String &p_text) const;
 
 protected:
 	virtual Rect2i _popup_adjust_rect() const override;
@@ -248,6 +256,8 @@ public:
 	// this value should be updated to reflect the new size.
 	static const int ITEM_PROPERTY_SIZE = 10;
 
+	virtual RID get_focused_accessibility_element() const override;
+
 	virtual void _parent_focused() override;
 
 	RID bind_global_menu();
@@ -280,6 +290,7 @@ public:
 
 	void set_item_text_direction(int p_idx, Control::TextDirection p_text_direction);
 	void set_item_language(int p_idx, const String &p_language);
+	void set_item_auto_translate_mode(int p_idx, AutoTranslateMode p_mode);
 	void set_item_icon(int p_idx, const Ref<Texture2D> &p_icon);
 	void set_item_icon_max_width(int p_idx, int p_width);
 	void set_item_icon_modulate(int p_idx, const Color &p_modulate);
@@ -307,6 +318,7 @@ public:
 	String get_item_xl_text(int p_idx) const;
 	Control::TextDirection get_item_text_direction(int p_idx) const;
 	String get_item_language(int p_idx) const;
+	AutoTranslateMode get_item_auto_translate_mode(int p_idx) const;
 	int get_item_idx_from_text(const String &text) const;
 	Ref<Texture2D> get_item_icon(int p_idx) const;
 	int get_item_icon_max_width(int p_idx) const;
@@ -385,5 +397,3 @@ public:
 	PopupMenu();
 	~PopupMenu();
 };
-
-#endif // POPUP_MENU_H
diff --git a/engine/scene/gui/progress_bar.cpp b/engine/scene/gui/progress_bar.cpp
index baf0c394..0e2e18ce 100644
--- a/engine/scene/gui/progress_bar.cpp
+++ b/engine/scene/gui/progress_bar.cpp
@@ -54,6 +54,14 @@ void ProgressBar::_notification(int p_what) {
 				queue_redraw();
 			}
 		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_PROGRESS_INDICATOR);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			draw_style_box(theme_cache.background_style, Rect2(Point2(), get_size()));
 
diff --git a/engine/scene/gui/progress_bar.h b/engine/scene/gui/progress_bar.h
index 2d191b12..761966b1 100644
--- a/engine/scene/gui/progress_bar.h
+++ b/engine/scene/gui/progress_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROGRESS_BAR_H
-#define PROGRESS_BAR_H
+#pragma once
 
 #include "scene/gui/range.h"
 
@@ -90,5 +89,3 @@ private:
 };
 
 VARIANT_ENUM_CAST(ProgressBar::FillMode);
-
-#endif // PROGRESS_BAR_H
diff --git a/engine/scene/gui/range.cpp b/engine/scene/gui/range.cpp
index d7b1a493..dfecc176 100644
--- a/engine/scene/gui/range.cpp
+++ b/engine/scene/gui/range.cpp
@@ -43,12 +43,51 @@ PackedStringArray Range::get_configuration_warnings() const {
 void Range::_value_changed(double p_value) {
 	GDVIRTUAL_CALL(_value_changed, p_value);
 }
+
 void Range::_value_changed_notify() {
 	_value_changed(shared->val);
 	emit_signal(SceneStringName(value_changed), shared->val);
+	queue_accessibility_update();
 	queue_redraw();
 }
 
+void Range::_accessibility_action_inc(const Variant &p_data) {
+	double step = ((shared->step > 0) ? shared->step : 1);
+	set_value(shared->val + step);
+}
+
+void Range::_accessibility_action_dec(const Variant &p_data) {
+	double step = ((shared->step > 0) ? shared->step : 1);
+	set_value(shared->val - step);
+}
+
+void Range::_accessibility_action_set_value(const Variant &p_data) {
+	double new_val = p_data;
+	set_value(new_val);
+}
+
+void Range::_notification(int p_what) {
+	ERR_MAIN_THREAD_GUARD;
+	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SPIN_BUTTON);
+			DisplayServer::get_singleton()->accessibility_update_set_num_value(ae, shared->val);
+			DisplayServer::get_singleton()->accessibility_update_set_num_range(ae, shared->min, shared->max);
+			if (shared->step > 0) {
+				DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, shared->step);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, 1);
+			}
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &Range::_accessibility_action_dec));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &Range::_accessibility_action_inc));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Range::_accessibility_action_set_value));
+		} break;
+	}
+}
+
 void Range::Shared::emit_value_changed() {
 	for (Range *E : owners) {
 		Range *r = E;
@@ -80,6 +119,7 @@ void Range::Shared::redraw_owners() {
 		if (!r->is_inside_tree()) {
 			continue;
 		}
+		r->queue_accessibility_update();
 		r->queue_redraw();
 	}
 }
@@ -91,6 +131,7 @@ void Range::set_value(double p_val) {
 	if (shared->val != prev_val) {
 		shared->emit_value_changed();
 	}
+	queue_accessibility_update();
 }
 
 void Range::_set_value_no_signal(double p_val) {
@@ -143,6 +184,8 @@ void Range::set_min(double p_min) {
 	shared->emit_changed("min");
 
 	update_configuration_warnings();
+
+	queue_accessibility_update();
 }
 
 void Range::set_max(double p_max) {
@@ -156,6 +199,8 @@ void Range::set_max(double p_max) {
 	set_value(shared->val);
 
 	shared->emit_changed("max");
+
+	queue_accessibility_update();
 }
 
 void Range::set_step(double p_step) {
@@ -165,6 +210,8 @@ void Range::set_step(double p_step) {
 
 	shared->step = p_step;
 	shared->emit_changed("step");
+
+	queue_accessibility_update();
 }
 
 void Range::set_page(double p_page) {
@@ -177,6 +224,8 @@ void Range::set_page(double p_page) {
 	set_value(shared->val);
 
 	shared->emit_changed("page");
+
+	queue_accessibility_update();
 }
 
 double Range::get_value() const {
@@ -264,6 +313,7 @@ void Range::unshare() {
 	nshared->allow_lesser = shared->allow_lesser;
 	_unref_shared();
 	_ref_shared(nshared);
+	queue_accessibility_update();
 }
 
 void Range::_ref_shared(Shared *p_shared) {
@@ -279,7 +329,7 @@ void Range::_ref_shared(Shared *p_shared) {
 void Range::_unref_shared() {
 	if (shared) {
 		shared->owners.erase(this);
-		if (shared->owners.size() == 0) {
+		if (shared->owners.is_empty()) {
 			memdelete(shared);
 			shared = nullptr;
 		}
diff --git a/engine/scene/gui/range.h b/engine/scene/gui/range.h
index 710fed86..165d6693 100644
--- a/engine/scene/gui/range.h
+++ b/engine/scene/gui/range.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RANGE_H
-#define RANGE_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -65,9 +64,14 @@ class Range : public Control {
 protected:
 	virtual void _value_changed(double p_value);
 	void _notify_shared_value_changed() { shared->emit_value_changed(); }
+	void _notification(int p_what);
 
 	static void _bind_methods();
 
+	void _accessibility_action_inc(const Variant &p_data);
+	void _accessibility_action_dec(const Variant &p_data);
+	void _accessibility_action_set_value(const Variant &p_data);
+
 	bool _rounded_values = false;
 
 	GDVIRTUAL1(_value_changed, double)
@@ -108,5 +112,3 @@ public:
 	Range();
 	~Range();
 };
-
-#endif // RANGE_H
diff --git a/engine/scene/gui/reference_rect.h b/engine/scene/gui/reference_rect.h
index e935ed28..1aae929b 100644
--- a/engine/scene/gui/reference_rect.h
+++ b/engine/scene/gui/reference_rect.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REFERENCE_RECT_H
-#define REFERENCE_RECT_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -54,5 +53,3 @@ public:
 	void set_editor_only(const bool &p_enabled);
 	bool get_editor_only() const;
 };
-
-#endif // REFERENCE_RECT_H
diff --git a/engine/scene/gui/rich_text_effect.h b/engine/scene/gui/rich_text_effect.h
index 94e1bd4f..8e8c45ae 100644
--- a/engine/scene/gui/rich_text_effect.h
+++ b/engine/scene/gui/rich_text_effect.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RICH_TEXT_EFFECT_H
-#define RICH_TEXT_EFFECT_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -113,5 +112,3 @@ public:
 
 	RichTextEffect();
 };
-
-#endif // RICH_TEXT_EFFECT_H
diff --git a/engine/scene/gui/rich_text_label.compat.inc b/engine/scene/gui/rich_text_label.compat.inc
index c3a6e114..41a944b8 100644
--- a/engine/scene/gui/rich_text_label.compat.inc
+++ b/engine/scene/gui/rich_text_label.compat.inc
@@ -51,7 +51,15 @@ void RichTextLabel::_push_meta_bind_compat_89024(const Variant &p_meta) {
 }
 
 void RichTextLabel::_add_image_bind_compat_80410(const Ref<Texture2D> &p_image, const int p_width, const int p_height, const Color &p_color, InlineAlignment p_alignment, const Rect2 &p_region) {
-	add_image(p_image, p_width, p_height, p_color, p_alignment, p_region, Variant(), false, String(), false);
+	add_image(p_image, p_width, p_height, p_color, p_alignment, p_region, Variant(), false, String(), false, String());
+}
+
+void RichTextLabel::_add_image_bind_compat_76829(const Ref<Texture2D> &p_image, const int p_width, const int p_height, const Color &p_color, InlineAlignment p_alignment, const Rect2 &p_region, const Variant &p_key, bool p_pad, const String &p_tooltip, bool p_size_in_percent) {
+	add_image(p_image, p_width, p_height, p_color, p_alignment, p_region, p_key, p_pad, p_tooltip, p_size_in_percent, String());
+}
+
+void RichTextLabel::_push_table_bind_compat_76829(int p_columns, InlineAlignment p_alignment, int p_align_to_row) {
+	push_table(p_columns, p_alignment, p_align_to_row, String());
 }
 
 bool RichTextLabel::_remove_paragraph_bind_compat_91098(int p_paragraph) {
@@ -65,6 +73,8 @@ void RichTextLabel::_bind_compatibility_methods() {
 	ClassDB::bind_compatibility_method(D_METHOD("push_meta", "data", "underline_mode"), &RichTextLabel::_push_meta_bind_compat_99481, DEFVAL(META_UNDERLINE_ALWAYS));
 	ClassDB::bind_compatibility_method(D_METHOD("push_meta", "data"), &RichTextLabel::_push_meta_bind_compat_89024);
 	ClassDB::bind_compatibility_method(D_METHOD("add_image", "image", "width", "height", "color", "inline_align", "region"), &RichTextLabel::_add_image_bind_compat_80410, DEFVAL(0), DEFVAL(0), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(Rect2()));
+	ClassDB::bind_compatibility_method(D_METHOD("add_image", "image", "width", "height", "color", "inline_align", "region", "key", "pad", "tooltip", "size_in_percent"), &RichTextLabel::_add_image_bind_compat_76829, DEFVAL(0), DEFVAL(0), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(Rect2()), DEFVAL(Variant()), DEFVAL(false), DEFVAL(String()), DEFVAL(false));
+	ClassDB::bind_compatibility_method(D_METHOD("push_table", "columns", "inline_align", "align_to_row"), &RichTextLabel::_push_table_bind_compat_76829, DEFVAL(INLINE_ALIGNMENT_TOP), DEFVAL(-1));
 	ClassDB::bind_compatibility_method(D_METHOD("remove_paragraph", "paragraph"), &RichTextLabel::_remove_paragraph_bind_compat_91098);
 }
 
diff --git a/engine/scene/gui/rich_text_label.cpp b/engine/scene/gui/rich_text_label.cpp
index a76a43b2..a4449368 100644
--- a/engine/scene/gui/rich_text_label.cpp
+++ b/engine/scene/gui/rich_text_label.cpp
@@ -59,6 +59,9 @@ RichTextLabel::ItemCustomFX::~ItemCustomFX() {
 }
 
 RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) const {
+	if (!p_item) {
+		return nullptr;
+	}
 	if (p_free) {
 		if (p_item->subitems.size()) {
 			return p_item->subitems.front()->get();
@@ -88,7 +91,7 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 			return p_item->E->next()->get();
 		} else {
 			// Go up until something with a next is found.
-			while (p_item->type != ITEM_FRAME && !p_item->E->next()) {
+			while (p_item->parent && p_item->type != ITEM_FRAME && !p_item->E->next()) {
 				p_item = p_item->parent;
 			}
 
@@ -102,41 +105,38 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) co
 }
 
 RichTextLabel::Item *RichTextLabel::_get_prev_item(Item *p_item, bool p_free) const {
+	if (!p_item) {
+		return nullptr;
+	}
 	if (p_free) {
-		if (p_item->subitems.size()) {
-			return p_item->subitems.back()->get();
-		} else if (!p_item->parent) {
+		if (!p_item->parent) {
 			return nullptr;
 		} else if (p_item->E->prev()) {
-			return p_item->E->prev()->get();
-		} else {
-			// Go back until something with a prev is found.
-			while (p_item->parent && !p_item->E->prev()) {
-				p_item = p_item->parent;
+			p_item = p_item->E->prev()->get();
+			while (p_item->subitems.size()) {
+				p_item = p_item->subitems.back()->get();
 			}
-
+			return p_item;
+		} else {
 			if (p_item->parent) {
-				return p_item->E->prev()->get();
+				return p_item->parent;
 			} else {
 				return nullptr;
 			}
 		}
 
 	} else {
-		if (p_item->subitems.size() && p_item->type != ITEM_TABLE) {
-			return p_item->subitems.back()->get();
-		} else if (p_item->type == ITEM_FRAME) {
+		if (p_item->type == ITEM_FRAME) {
 			return nullptr;
 		} else if (p_item->E->prev()) {
-			return p_item->E->prev()->get();
-		} else {
-			// Go back until something with a prev is found.
-			while (p_item->type != ITEM_FRAME && !p_item->E->prev()) {
-				p_item = p_item->parent;
+			p_item = p_item->E->prev()->get();
+			while (p_item->subitems.size() && p_item->type != ITEM_TABLE) {
+				p_item = p_item->subitems.back()->get();
 			}
-
-			if (p_item->type != ITEM_FRAME) {
-				return p_item->E->prev()->get();
+			return p_item;
+		} else {
+			if (p_item->parent && p_item->type != ITEM_FRAME) {
+				return p_item->parent;
 			} else {
 				return nullptr;
 			}
@@ -217,7 +217,7 @@ String RichTextLabel::_letters(int p_num, bool p_capitalize) const {
 	c[chars] = 0;
 	n = p_num;
 	do {
-		int mod = ABS(n % 24);
+		int mod = Math::abs(n % 24);
 		char a = (p_capitalize ? 'A' : 'a');
 		c[--chars] = a + mod - 1;
 
@@ -254,7 +254,7 @@ String RichTextLabel::_get_prefix(Item *p_item, const Vector<int> &p_list_index,
 		}
 		prefix = segment + prefix;
 	}
-	return prefix;
+	return prefix + " ";
 }
 
 void RichTextLabel::_update_line_font(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size) {
@@ -361,6 +361,7 @@ float RichTextLabel::_resize_line(ItemFrame *p_frame, int p_line, const Ref<Font
 	ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), p_h);
 
 	Line &l = p_frame->lines[p_line];
+
 	MutexLock lock(l.text_buf->get_mutex());
 
 	l.indent = _find_margin(l.from, p_base_font, p_base_font_size) + l.prefix_width;
@@ -430,6 +431,7 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 	ERR_FAIL_COND_V(p_line < 0 || p_line >= (int)p_frame->lines.size(), p_h);
 
 	Line &l = p_frame->lines[p_line];
+
 	MutexLock lock(l.text_buf->get_mutex());
 
 	BitField<TextServer::LineBreakFlag> autowrap_flags = TextServer::BREAK_MANDATORY;
@@ -446,9 +448,10 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 		case TextServer::AUTOWRAP_OFF:
 			break;
 	}
-	autowrap_flags = autowrap_flags | TextServer::BREAK_TRIM_EDGE_SPACES;
+	autowrap_flags = autowrap_flags | autowrap_flags_trim;
 
 	// Clear cache.
+	l.dc_item = nullptr;
 	l.text_buf->clear();
 	l.text_buf->set_break_flags(autowrap_flags);
 	l.text_buf->set_justification_flags(_find_jst_flags(l.from));
@@ -527,8 +530,9 @@ float RichTextLabel::_shape_line(ItemFrame *p_frame, int p_line, const Ref<Font>
 		switch (it->type) {
 			case ITEM_DROPCAP: {
 				// Add dropcap.
-				const ItemDropcap *dc = static_cast<ItemDropcap *>(it);
+				ItemDropcap *dc = static_cast<ItemDropcap *>(it);
 				l.text_buf->set_dropcap(dc->text, dc->font, dc->font_size, dc->dropcap_margins);
+				l.dc_item = dc;
 				l.dc_color = dc->color;
 				l.dc_ol_size = dc->ol_size;
 				l.dc_ol_color = dc->ol_color;
@@ -685,6 +689,7 @@ void RichTextLabel::_set_table_size(ItemTable *p_table, int p_available_width) {
 		} else {
 			p_table->total_width += p_table->columns[i].width;
 		}
+		p_table->columns[i].width_with_padding = p_table->columns[i].width;
 	}
 
 	// Resize to max_width if needed and distribute the remaining space.
@@ -702,6 +707,7 @@ void RichTextLabel::_set_table_size(ItemTable *p_table, int p_available_width) {
 				p_table->columns[i].width = p_table->columns[i].max_width;
 				p_table->total_width -= dif;
 				total_ratio -= p_table->columns[i].expand_ratio;
+				p_table->columns[i].width_with_padding = p_table->columns[i].width;
 			}
 		}
 		// Grow.
@@ -715,6 +721,7 @@ void RichTextLabel::_set_table_size(ItemTable *p_table, int p_available_width) {
 						int incr = MIN(dif, slice);
 						p_table->columns[i].width += incr;
 						p_table->total_width += incr;
+						p_table->columns[i].width_with_padding = p_table->columns[i].width;
 					}
 				}
 			}
@@ -725,26 +732,31 @@ void RichTextLabel::_set_table_size(ItemTable *p_table, int p_available_width) {
 	int idx = 0;
 	p_table->total_height = 0;
 	p_table->rows.clear();
+	p_table->rows_no_padding.clear();
 	p_table->rows_baseline.clear();
 
 	Vector2 offset = Vector2(theme_cache.table_h_separation * 0.5, theme_cache.table_v_separation * 0.5).floor();
 	float row_height = 0.0;
+	float row_top_padding = 0.0;
+	float row_bottom_padding = 0.0;
+	const List<Item *>::Element *prev = p_table->subitems.front();
 
-	for (const List<Item *>::Element *E = p_table->subitems.front(); E; E = E->next()) {
+	for (const List<Item *>::Element *E = prev; E; E = E->next()) {
 		ERR_CONTINUE(E->get()->type != ITEM_FRAME); // Children should all be frames.
 		ItemFrame *frame = static_cast<ItemFrame *>(E->get());
 
 		int column = idx % col_count;
 
 		offset.x += frame->padding.position.x;
-		float yofs = frame->padding.position.y;
-		float prev_h = 0;
+		float yofs = 0.0;
+		float prev_h = 0.0;
 		float row_baseline = 0.0;
 		for (int i = 0; i < (int)frame->lines.size(); i++) {
 			MutexLock sub_lock(frame->lines[i].text_buf->get_mutex());
 
 			frame->lines[i].text_buf->set_width(p_table->columns[column].width);
 			p_table->columns[column].width = MAX(p_table->columns[column].width, ceil(frame->lines[i].text_buf->get_size().x));
+			p_table->columns[column].width_with_padding = MAX(p_table->columns[column].width_with_padding, ceil(frame->lines[i].text_buf->get_size().x + frame->padding.position.x + frame->padding.size.x));
 
 			frame->lines[i].offset.y = prev_h;
 
@@ -764,22 +776,44 @@ void RichTextLabel::_set_table_size(ItemTable *p_table, int p_available_width) {
 			frame->lines[i].offset += offset;
 			row_baseline = MAX(row_baseline, frame->lines[i].text_buf->get_line_ascent(frame->lines[i].text_buf->get_line_count() - 1));
 		}
-		yofs += frame->padding.size.y;
+		row_top_padding = MAX(row_top_padding, frame->padding.position.y);
+		row_bottom_padding = MAX(row_bottom_padding, frame->padding.size.y);
 		offset.x += p_table->columns[column].width + theme_cache.table_h_separation + frame->padding.size.x;
 
 		row_height = MAX(yofs, row_height);
 		// Add row height after last column of the row or last cell of the table.
 		if (column == col_count - 1 || E->next() == nullptr) {
 			offset.x = Math::floor(theme_cache.table_h_separation * 0.5);
+			float row_contents_height = row_height;
+			row_height += row_top_padding + row_bottom_padding;
 			row_height += theme_cache.table_v_separation;
 			p_table->total_height += row_height;
 			offset.y += row_height;
 			p_table->rows.push_back(row_height);
+			p_table->rows_no_padding.push_back(row_contents_height);
 			p_table->rows_baseline.push_back(p_table->total_height - row_height + row_baseline + Math::floor(theme_cache.table_v_separation * 0.5));
-			row_height = 0;
+			for (const List<Item *>::Element *F = prev; F; F = F->next()) {
+				ItemFrame *in_frame = static_cast<ItemFrame *>(F->get());
+				for (int i = 0; i < (int)in_frame->lines.size(); i++) {
+					in_frame->lines[i].offset.y += row_top_padding;
+				}
+				if (in_frame == frame) {
+					break;
+				}
+			}
+			row_height = 0.0;
+			row_top_padding = 0.0;
+			row_bottom_padding = 0.0;
+			prev = E->next();
 		}
 		idx++;
 	}
+
+	// Recalculate total width.
+	p_table->total_width = 0;
+	for (int i = 0; i < col_count; i++) {
+		p_table->total_width += p_table->columns[i].width_with_padding + theme_cache.table_h_separation;
+	}
 }
 
 int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, float p_vsep, const Color &p_base_color, int p_outline_size, const Color &p_outline_color, const Color &p_font_shadow_color, int p_shadow_outline_size, const Point2 &p_shadow_ofs, int &r_processed_glyphs) {
@@ -983,17 +1017,17 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 										if (row % 2 == 0) {
 											Color c = frame->odd_row_bg != Color(0, 0, 0, 0) ? frame->odd_row_bg : odd_row_bg;
 											if (c.a > 0.0) {
-												draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows[row])), c, true);
+												draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows_no_padding[row] + frame->padding.position.y + frame->padding.size.y)), c, true);
 											}
 										} else {
 											Color c = frame->even_row_bg != Color(0, 0, 0, 0) ? frame->even_row_bg : even_row_bg;
 											if (c.a > 0.0) {
-												draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows[row])), c, true);
+												draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows_no_padding[row] + frame->padding.position.y + frame->padding.size.y)), c, true);
 											}
 										}
 										Color bc = frame->border != Color(0, 0, 0, 0) ? frame->border : border;
 										if (bc.a > 0.0) {
-											draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows[row])), bc, false);
+											draw_rect(Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows_no_padding[row] + frame->padding.position.y + frame->padding.size.y)), bc, false);
 										}
 									}
 
@@ -1051,17 +1085,18 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 					}
 				}
 
-				Color font_color = (step == DRAW_STEP_SHADOW || step == DRAW_STEP_OUTLINE || step == DRAW_STEP_TEXT) ? _find_color(it, p_base_color) : Color();
+				Color font_color = (step == DRAW_STEP_SHADOW_OUTLINE || step == DRAW_STEP_SHADOW || step == DRAW_STEP_OUTLINE || step == DRAW_STEP_TEXT) ? _find_color(it, p_base_color) : Color();
 				int outline_size = (step == DRAW_STEP_OUTLINE) ? _find_outline_size(it, p_outline_size) : 0;
 				Color font_outline_color = (step == DRAW_STEP_OUTLINE) ? _find_outline_color(it, p_outline_color) : Color();
 				Color font_shadow_color = p_font_shadow_color;
-				bool txt_visible = false;
-				if (step == DRAW_STEP_OUTLINE) {
-					txt_visible = (font_outline_color.a != 0 && outline_size > 0);
-				} else if (step == DRAW_STEP_SHADOW) {
-					txt_visible = (font_shadow_color.a != 0);
+				bool txt_visible = (font_color.a != 0);
+				if (step == DRAW_STEP_OUTLINE && (outline_size <= 0 || font_outline_color.a == 0)) {
+					continue;
+				} else if (step == DRAW_STEP_SHADOW_OUTLINE && (font_shadow_color.a == 0 || p_shadow_outline_size <= 0)) {
+					continue;
+				} else if (step == DRAW_STEP_SHADOW && (font_shadow_color.a == 0)) {
+					continue;
 				} else if (step == DRAW_STEP_TEXT) {
-					txt_visible = (font_color.a != 0);
 					bool has_ul = _find_underline(it);
 					if (!has_ul && underline_meta) {
 						ItemMeta *meta = nullptr;
@@ -1146,7 +1181,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 						draw_line(st_start + Vector2(0, y_off), p_ofs + Vector2(off_step.x, off_step.y + y_off), st_color, underline_width);
 					}
 				}
-				if (step == DRAW_STEP_SHADOW || step == DRAW_STEP_OUTLINE || step == DRAW_STEP_TEXT) {
+				if (step == DRAW_STEP_SHADOW_OUTLINE || step == DRAW_STEP_SHADOW || step == DRAW_STEP_OUTLINE || step == DRAW_STEP_TEXT) {
 					ItemFade *fade = nullptr;
 					Item *fade_item = it;
 					while (fade_item) {
@@ -1209,7 +1244,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 								charfx->range = Vector2i(l.char_offset + glyphs[i].start, l.char_offset + glyphs[i].end);
 								charfx->relative_index = l.char_offset + glyphs[i].start - item_fx->char_ofs;
 								charfx->visibility = txt_visible;
-								charfx->outline = (step == DRAW_STEP_SHADOW) || (step == DRAW_STEP_OUTLINE);
+								charfx->outline = (step == DRAW_STEP_SHADOW_OUTLINE) || (step == DRAW_STEP_SHADOW) || (step == DRAW_STEP_OUTLINE);
 								charfx->font = frid;
 								charfx->glyph_index = gl;
 								charfx->glyph_flags = gl_fl;
@@ -1234,8 +1269,8 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 								uint64_t char_current_rand = item_shake->offset_random(glyphs[i].start);
 								uint64_t char_previous_rand = item_shake->offset_previous_random(glyphs[i].start);
 								uint64_t max_rand = 2147483647;
-								double current_offset = Math::remap(char_current_rand % max_rand, 0, max_rand, 0.0f, 2.f * (float)Math_PI);
-								double previous_offset = Math::remap(char_previous_rand % max_rand, 0, max_rand, 0.0f, 2.f * (float)Math_PI);
+								double current_offset = Math::remap(char_current_rand % max_rand, 0, max_rand, 0.0f, 2.f * (float)Math::PI);
+								double previous_offset = Math::remap(char_previous_rand % max_rand, 0, max_rand, 0.0f, 2.f * (float)Math::PI);
 								double n_time = (double)(item_shake->elapsed_time / (0.5f / item_shake->rate));
 								n_time = (n_time > 1.0) ? 1.0 : n_time;
 								item_shake->prev_off = Point2(Math::lerp(Math::sin(previous_offset), Math::sin(current_offset), n_time), Math::lerp(Math::cos(previous_offset), Math::cos(current_offset), n_time)) * (float)item_shake->strength / 10.0f;
@@ -1261,7 +1296,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 						} else if (item_fx->type == ITEM_RAINBOW) {
 							ItemRainbow *item_rainbow = static_cast<ItemRainbow *>(item_fx);
 
-							font_color = font_color.from_hsv(MAX(item_rainbow->frequency, 0) * ABS(item_rainbow->elapsed_time * item_rainbow->speed + ((p_ofs.x + off_step.x) / 50)), item_rainbow->saturation, item_rainbow->value, font_color.a);
+							font_color = font_color.from_hsv(MAX(item_rainbow->frequency, 0) * Math::abs(item_rainbow->elapsed_time * item_rainbow->speed + ((p_ofs.x + off_step.x) / 50)), item_rainbow->saturation, item_rainbow->value, font_color.a);
 						} else if (item_fx->type == ITEM_PULSE) {
 							ItemPulse *item_pulse = static_cast<ItemPulse *>(item_fx);
 
@@ -1284,7 +1319,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 						char_reverse_xform.set_origin(-char_off);
 						Transform2D char_final_xform = char_xform * char_reverse_xform;
 						draw_set_transform_matrix(char_final_xform);
-					} else if (step == DRAW_STEP_SHADOW) {
+					} else if (step == DRAW_STEP_SHADOW_OUTLINE || step == DRAW_STEP_SHADOW) {
 						font_color = font_shadow_color * Color(1, 1, 1, font_color.a);
 
 						char_reverse_xform.set_origin(-char_off - p_shadow_ofs);
@@ -1311,12 +1346,11 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 									} else if (((glyphs[i].flags & TextServer::GRAPHEME_IS_VIRTUAL) != TextServer::GRAPHEME_IS_VIRTUAL) && ((glyphs[i].flags & TextServer::GRAPHEME_IS_EMBEDDED_OBJECT) != TextServer::GRAPHEME_IS_EMBEDDED_OBJECT)) {
 										TS->draw_hex_code_box(ci, glyphs[i].font_size, fx_offset + char_off, gl, font_color);
 									}
+								} else if (step == DRAW_STEP_SHADOW_OUTLINE && frid != RID()) {
+									TS->font_draw_glyph_outline(frid, ci, glyphs[i].font_size, p_shadow_outline_size, fx_offset + char_off + p_shadow_ofs, gl, font_color);
 								} else if (step == DRAW_STEP_SHADOW && frid != RID()) {
 									TS->font_draw_glyph(frid, ci, glyphs[i].font_size, fx_offset + char_off + p_shadow_ofs, gl, font_color);
-									if (p_shadow_outline_size > 0) {
-										TS->font_draw_glyph_outline(frid, ci, glyphs[i].font_size, p_shadow_outline_size, fx_offset + char_off + p_shadow_ofs, gl, font_color);
-									}
-								} else if (step == DRAW_STEP_OUTLINE && frid != RID() && outline_size > 0) {
+								} else if (step == DRAW_STEP_OUTLINE && frid != RID()) {
 									TS->font_draw_glyph_outline(frid, ci, glyphs[i].font_size, outline_size, fx_offset + char_off, gl, font_color);
 								}
 							}
@@ -1849,8 +1883,431 @@ void RichTextLabel::_update_theme_item_cache() {
 	use_selected_font_color = theme_cache.font_selected_color != Color(0, 0, 0, 0);
 }
 
+PackedStringArray RichTextLabel::get_accessibility_configuration_warnings() const {
+	PackedStringArray warnings = Control::get_accessibility_configuration_warnings();
+
+	Item *it = main;
+	while (it) {
+		if (it->type == ITEM_IMAGE) {
+			ItemImage *img = static_cast<ItemImage *>(it);
+			if (img && img->alt_text.strip_edges().is_empty()) {
+				warnings.push_back(RTR("Image alternative text must not be empty."));
+			}
+		}
+		it = _get_next_item(it, true);
+	}
+
+	return warnings;
+}
+
+void RichTextLabel::_accessibility_update_line(RID p_id, ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, float p_vsep) {
+	ERR_FAIL_NULL(p_frame);
+	ERR_FAIL_COND(p_line < 0 || p_line >= (int)p_frame->lines.size());
+
+	Line &l = p_frame->lines[p_line];
+
+	if (l.accessibility_line_element.is_valid()) {
+		return;
+	}
+	l.accessibility_line_element = DisplayServer::get_singleton()->accessibility_create_sub_element(p_id, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+
+	MutexLock lock(l.text_buf->get_mutex());
+
+	const RID &line_ae = l.accessibility_line_element;
+
+	Rect2 ae_rect = Rect2(p_ofs, Size2(p_width, l.text_buf->get_size().y + l.text_buf->get_line_count() * theme_cache.line_separation));
+	DisplayServer::get_singleton()->accessibility_update_set_bounds(line_ae, ae_rect);
+	ac_element_bounds_cache[line_ae] = ae_rect;
+
+	Item *it_from = l.from;
+	if (it_from == nullptr) {
+		return;
+	}
+
+	bool rtl = (l.text_buf->get_direction() == TextServer::DIRECTION_RTL);
+	bool lrtl = is_layout_rtl();
+
+	// Process dropcap.
+	int dc_lines = l.text_buf->get_dropcap_lines();
+	float h_off = l.text_buf->get_dropcap_size().x;
+
+	// Process text.
+	const RID &para_rid = l.text_buf->get_rid();
+
+	String l_text = TS->shaped_get_text(para_rid).remove_char(0xfffc).strip_edges();
+	if (l.dc_item) {
+		ItemDropcap *dc = static_cast<ItemDropcap *>(l.dc_item);
+		l_text = dc->text + l_text;
+	}
+	if (!l_text.is_empty()) {
+		Vector2 off;
+		if (rtl) {
+			off.x = p_width - l.offset.x - l.text_buf->get_width();
+			if (!lrtl && p_frame == main) { // Skip Scrollbar.
+				off.x -= scroll_w;
+			}
+		} else {
+			off.x = l.offset.x;
+			if (lrtl && p_frame == main) { // Skip Scrollbar.
+				off.x += scroll_w;
+			}
+		}
+
+		l.accessibility_text_element = DisplayServer::get_singleton()->accessibility_create_sub_element(line_ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+		DisplayServer::get_singleton()->accessibility_update_set_value(l.accessibility_text_element, l_text);
+		ae_rect = Rect2(p_ofs + off, l.text_buf->get_size());
+		DisplayServer::get_singleton()->accessibility_update_set_bounds(l.accessibility_text_element, ae_rect);
+		ac_element_bounds_cache[l.accessibility_text_element] = ae_rect;
+
+		DisplayServer::get_singleton()->accessibility_update_add_action(l.accessibility_text_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)l.from, true, true));
+		DisplayServer::get_singleton()->accessibility_update_add_action(l.accessibility_text_element, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)l.from, true, false));
+		DisplayServer::get_singleton()->accessibility_update_add_action(l.accessibility_text_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)l.from));
+	}
+
+	Vector2 off;
+	for (int line = 0; line < l.text_buf->get_line_count(); line++) {
+		if (line > 0) {
+			off.y += (theme_cache.line_separation + p_vsep);
+		}
+
+		const Size2 line_size = l.text_buf->get_line_size(line);
+
+		float width = l.text_buf->get_width();
+		float length = line_size.x;
+
+		// Process line.
+
+		if (rtl) {
+			off.x = p_width - l.offset.x - width;
+			if (!lrtl && p_frame == main) { // Skip Scrollbar.
+				off.x -= scroll_w;
+			}
+		} else {
+			off.x = l.offset.x;
+			if (lrtl && p_frame == main) { // Skip Scrollbar.
+				off.x += scroll_w;
+			}
+		}
+
+		// Process text.
+		switch (l.text_buf->get_alignment()) {
+			case HORIZONTAL_ALIGNMENT_FILL:
+			case HORIZONTAL_ALIGNMENT_LEFT: {
+				if (rtl) {
+					off.x += width - length;
+				}
+			} break;
+			case HORIZONTAL_ALIGNMENT_CENTER: {
+				off.x += Math::floor((width - length) / 2.0);
+			} break;
+			case HORIZONTAL_ALIGNMENT_RIGHT: {
+				if (!rtl) {
+					off.x += width - length;
+				}
+			} break;
+		}
+
+		if (line <= dc_lines) {
+			if (rtl) {
+				off.x -= h_off;
+			} else {
+				off.x += h_off;
+			}
+		}
+
+		const RID &rid = l.text_buf->get_line_rid(line);
+
+		Array objects = TS->shaped_text_get_objects(rid);
+		for (int i = 0; i < objects.size(); i++) {
+			Item *it = reinterpret_cast<Item *>((uint64_t)objects[i]);
+			if (it != nullptr) {
+				Rect2 rect = TS->shaped_text_get_object_rect(rid, objects[i]);
+				switch (it->type) {
+					case ITEM_IMAGE: {
+						ItemImage *img = static_cast<ItemImage *>(it);
+						RID img_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(line_ae, DisplayServer::AccessibilityRole::ROLE_IMAGE);
+
+						DisplayServer::get_singleton()->accessibility_update_set_name(img_ae, img->alt_text);
+						if (img->pad) {
+							Size2 pad_size = rect.size.min(img->image->get_size());
+							Vector2 pad_off = (rect.size - pad_size) / 2;
+							ae_rect = Rect2(p_ofs + rect.position + off + pad_off, pad_size);
+						} else {
+							ae_rect = Rect2(p_ofs + rect.position + off, rect.size);
+						}
+						DisplayServer::get_singleton()->accessibility_update_set_bounds(img_ae, ae_rect);
+						ac_element_bounds_cache[img_ae] = ae_rect;
+
+						DisplayServer::get_singleton()->accessibility_update_add_action(img_ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, true));
+						DisplayServer::get_singleton()->accessibility_update_add_action(img_ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, false));
+						DisplayServer::get_singleton()->accessibility_update_add_action(img_ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)it));
+
+						it->accessibility_item_element = img_ae;
+					} break;
+					case ITEM_TABLE: {
+						ItemTable *table = static_cast<ItemTable *>(it);
+						float h_separation = theme_cache.table_h_separation;
+						float v_separation = theme_cache.table_v_separation;
+
+						RID table_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(line_ae, DisplayServer::AccessibilityRole::ROLE_TABLE);
+
+						int col_count = table->columns.size();
+						int row_count = table->rows.size();
+
+						DisplayServer::get_singleton()->accessibility_update_set_name(table_ae, table->name);
+						DisplayServer::get_singleton()->accessibility_update_set_role(table_ae, DisplayServer::AccessibilityRole::ROLE_TABLE);
+						DisplayServer::get_singleton()->accessibility_update_set_table_column_count(table_ae, col_count);
+						DisplayServer::get_singleton()->accessibility_update_set_table_row_count(table_ae, row_count);
+						ae_rect = Rect2(p_ofs + rect.position + off + Vector2(0, TS->shaped_text_get_ascent(rid)), rect.size);
+						DisplayServer::get_singleton()->accessibility_update_set_bounds(table_ae, ae_rect);
+						ac_element_bounds_cache[table_ae] = ae_rect;
+
+						DisplayServer::get_singleton()->accessibility_update_add_action(table_ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, true));
+						DisplayServer::get_singleton()->accessibility_update_add_action(table_ae, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &RichTextLabel::_accessibility_focus_item).bind((uint64_t)it, false, false));
+						DisplayServer::get_singleton()->accessibility_update_add_action(table_ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &RichTextLabel::_accessibility_scroll_to_item).bind((uint64_t)it));
+
+						Vector<RID> row_aes;
+						Vector2 row_off = Vector2(0, TS->shaped_text_get_ascent(rid));
+						for (int j = 0; j < row_count; j++) {
+							RID row_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(table_ae, DisplayServer::AccessibilityRole::ROLE_ROW);
+
+							DisplayServer::get_singleton()->accessibility_update_set_table_row_index(row_ae, j);
+							ae_rect = Rect2(p_ofs + rect.position + off + row_off, Size2(rect.size.x, table->rows[j]));
+							DisplayServer::get_singleton()->accessibility_update_set_bounds(row_ae, ae_rect);
+							ac_element_bounds_cache[row_ae] = ae_rect;
+							row_off.y += table->rows[j];
+
+							row_aes.push_back(row_ae);
+						}
+
+						int idx = 0;
+						for (Item *E : table->subitems) {
+							ItemFrame *frame = static_cast<ItemFrame *>(E);
+
+							int col = idx % col_count;
+							int row = idx / col_count;
+
+							for (int j = 0; j < (int)frame->lines.size(); j++) {
+								RID cell_ae = DisplayServer::get_singleton()->accessibility_create_sub_element(row_aes[row], DisplayServer::AccessibilityRole::ROLE_CELL);
+
+								if (frame->lines.size() != 0 && row < row_count) {
+									Vector2 coff = frame->lines[0].offset;
+									coff.x -= frame->lines[0].indent;
+									if (rtl) {
+										coff.x = rect.size.width - table->columns[col].width - coff.x;
+									}
+									ae_rect = Rect2(p_ofs + rect.position + off + coff - frame->padding.position - Vector2(h_separation * 0.5, v_separation * 0.5).floor(), Size2(table->columns[col].width + h_separation + frame->padding.position.x + frame->padding.size.x, table->rows[row]));
+									DisplayServer::get_singleton()->accessibility_update_set_bounds(cell_ae, ae_rect);
+									ac_element_bounds_cache[cell_ae] = ae_rect;
+								}
+								DisplayServer::get_singleton()->accessibility_update_set_table_cell_position(cell_ae, row, col);
+
+								_accessibility_update_line(cell_ae, frame, j, p_ofs + rect.position + off + Vector2(0, frame->lines[j].offset.y), rect.size.x, p_vsep);
+							}
+							idx++;
+						}
+
+						it->accessibility_item_element = table_ae;
+					} break;
+					default:
+						break;
+				}
+			}
+		}
+
+		off.y += TS->shaped_text_get_descent(rid) + TS->shaped_text_get_ascent(rid);
+	}
+}
+
+void RichTextLabel::_accessibility_action_menu(const Variant &p_data) {
+	if (context_menu_enabled) {
+		_update_context_menu();
+		menu->set_position(get_screen_position());
+		menu->reset_size();
+		menu->popup();
+		menu->grab_focus();
+	}
+}
+
+void RichTextLabel::_accessibility_scroll_down(const Variant &p_data) {
+	vscroll->set_value(vscroll->get_value() + vscroll->get_page() / 4);
+}
+
+void RichTextLabel::_accessibility_scroll_up(const Variant &p_data) {
+	vscroll->set_value(vscroll->get_value() - vscroll->get_page() / 4);
+}
+
+void RichTextLabel::_accessibility_scroll_set(const Variant &p_data) {
+	const Point2 &pos = p_data;
+	vscroll->set_value(pos.y);
+}
+
+void RichTextLabel::_accessibility_focus_item(const Variant &p_data, uint64_t p_item, bool p_line, bool p_foucs) {
+	Item *it = reinterpret_cast<Item *>(p_item);
+	if (p_foucs) {
+		ItemFrame *f = nullptr;
+		_find_frame(it, &f, nullptr);
+
+		if (f && it) {
+			keyboard_focus_frame = f;
+			keyboard_focus_line = it->line;
+			keyboard_focus_item = it;
+			keyboard_focus_on_text = p_line;
+		}
+	} else {
+		keyboard_focus_frame = nullptr;
+		keyboard_focus_line = 0;
+		keyboard_focus_item = nullptr;
+		keyboard_focus_on_text = true;
+	}
+}
+
+void RichTextLabel::_accessibility_scroll_to_item(const Variant &p_data, uint64_t p_item) {
+	Item *it = reinterpret_cast<Item *>(p_item);
+	ItemFrame *f = nullptr;
+	_find_frame(it, &f, nullptr);
+
+	if (f && it) {
+		vscroll->set_value(f->lines[it->line].offset.y);
+	}
+}
+
+void RichTextLabel::_invalidate_accessibility() {
+	if (accessibility_scroll_element.is_null()) {
+		return;
+	}
+
+	Item *it = main;
+	while (it) {
+		if (it->type == ITEM_FRAME) {
+			ItemFrame *fr = static_cast<ItemFrame *>(it);
+			for (size_t i = 0; i < fr->lines.size(); i++) {
+				if (fr->lines[i].accessibility_line_element.is_valid()) {
+					DisplayServer::get_singleton()->accessibility_free_element(fr->lines[i].accessibility_line_element);
+				}
+				fr->lines[i].accessibility_line_element = RID();
+				fr->lines[i].accessibility_text_element = RID();
+			}
+		}
+		it->accessibility_item_element = RID();
+		it = _get_next_item(it, true);
+	}
+}
+
+RID RichTextLabel::get_focused_accessibility_element() const {
+	if (keyboard_focus_frame && keyboard_focus_item) {
+		if (keyboard_focus_on_text) {
+			return keyboard_focus_frame->lines[keyboard_focus_line].accessibility_text_element;
+		} else {
+			if (keyboard_focus_item->accessibility_item_element.is_valid()) {
+				return keyboard_focus_item->accessibility_item_element;
+			}
+		}
+	} else {
+		if (!main->lines.is_empty()) {
+			return main->lines[0].accessibility_text_element;
+		}
+	}
+	return get_accessibility_element();
+}
+
 void RichTextLabel::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			accessibility_scroll_element = RID();
+			Item *it = main;
+			while (it) {
+				if (it->type == ITEM_FRAME) {
+					ItemFrame *fr = static_cast<ItemFrame *>(it);
+					for (size_t i = 0; i < fr->lines.size(); i++) {
+						fr->lines[i].accessibility_line_element = RID();
+						fr->lines[i].accessibility_text_element = RID();
+					}
+				}
+				it->accessibility_item_element = RID();
+				it = _get_next_item(it, true);
+			}
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &RichTextLabel::_accessibility_action_menu));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &RichTextLabel::_accessibility_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &RichTextLabel::_accessibility_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &RichTextLabel::_accessibility_scroll_set));
+
+			if (_validate_line_caches()) {
+				DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_BUSY, false);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_BUSY, true);
+				return; // Do not update internal elements if threaded procesisng is not done.
+			}
+
+			if (accessibility_scroll_element.is_null()) {
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+			}
+			Rect2 text_rect = _get_text_rect();
+
+			Transform2D scroll_xform;
+			scroll_xform.set_origin(Vector2i(0, -vscroll->get_value()));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, text_rect);
+
+			MutexLock data_lock(data_mutex);
+
+			int to_line = main->first_invalid_line.load();
+			int from_line = 0;
+
+			int total_height = INT32_MAX;
+			if (to_line && vertical_alignment != VERTICAL_ALIGNMENT_TOP) {
+				MutexLock lock(main->lines[to_line - 1].text_buf->get_mutex());
+				if (theme_cache.line_separation < 0) {
+					// Do not apply to the last line to avoid cutting text.
+					total_height = main->lines[to_line - 1].offset.y + main->lines[to_line - 1].text_buf->get_size().y + (main->lines[to_line - 1].text_buf->get_line_count() - 1) * theme_cache.line_separation;
+				} else {
+					total_height = main->lines[to_line - 1].offset.y + main->lines[to_line - 1].text_buf->get_size().y + main->lines[to_line - 1].text_buf->get_line_count() * theme_cache.line_separation;
+				}
+			}
+			float vbegin = 0, vsep = 0;
+			if (text_rect.size.y > total_height) {
+				switch (vertical_alignment) {
+					case VERTICAL_ALIGNMENT_TOP: {
+						// Nothing.
+					} break;
+					case VERTICAL_ALIGNMENT_CENTER: {
+						vbegin = (text_rect.size.y - total_height) / 2;
+					} break;
+					case VERTICAL_ALIGNMENT_BOTTOM: {
+						vbegin = text_rect.size.y - total_height;
+					} break;
+					case VERTICAL_ALIGNMENT_FILL: {
+						int lines = 0;
+						for (int l = from_line; l < to_line; l++) {
+							MutexLock lock(main->lines[l].text_buf->get_mutex());
+							lines += main->lines[l].text_buf->get_line_count();
+						}
+						if (lines > 1) {
+							vsep = (text_rect.size.y - total_height) / (lines - 1);
+						}
+					} break;
+				}
+			}
+
+			ac_element_bounds_cache.clear();
+			Point2 ofs = text_rect.get_position() + Vector2(0, vbegin + main->lines[from_line].offset.y);
+			while (from_line < to_line) {
+				MutexLock lock(main->lines[from_line].text_buf->get_mutex());
+
+				_accessibility_update_line(accessibility_scroll_element, main, from_line, ofs, text_rect.size.x, vsep);
+				ofs.y += main->lines[from_line].text_buf->get_size().y + main->lines[from_line].text_buf->get_line_count() * (theme_cache.line_separation + vsep);
+				from_line++;
+			}
+		} break;
+
 		case NOTIFICATION_MOUSE_EXIT: {
 			if (meta_hovering) {
 				meta_hovering = nullptr;
@@ -1863,12 +2320,16 @@ void RichTextLabel::_notification(int p_what) {
 		case NOTIFICATION_RESIZED: {
 			_stop_thread();
 			main->first_resized_line.store(0); // Invalidate all lines.
+			_invalidate_accessibility();
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
 			_stop_thread();
 			main->first_invalid_font_line.store(0); // Invalidate all lines.
+			_invalidate_accessibility();
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 
@@ -1879,12 +2340,27 @@ void RichTextLabel::_notification(int p_what) {
 			}
 
 			main->first_invalid_line.store(0); // Invalidate all lines.
+			_invalidate_accessibility();
+			queue_accessibility_update();
 			queue_redraw();
 		} break;
 
 		case NOTIFICATION_PREDELETE:
 		case NOTIFICATION_EXIT_TREE: {
 			_stop_thread();
+
+			accessibility_scroll_element = RID();
+			Item *it = main;
+			while (it) {
+				if (it->type == ITEM_FRAME) {
+					ItemFrame *fr = static_cast<ItemFrame *>(it);
+					for (size_t i = 0; i < fr->lines.size(); i++) {
+						fr->lines[i].accessibility_line_element = RID();
+						fr->lines[i].accessibility_text_element = RID();
+					}
+				}
+				it = _get_next_item(it, true);
+			}
 		} break;
 
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
@@ -2000,6 +2476,25 @@ void RichTextLabel::_notification(int p_what) {
 				ofs.y += main->lines[from_line].text_buf->get_size().y + main->lines[from_line].text_buf->get_line_count() * (theme_cache.line_separation + vsep);
 				from_line++;
 			}
+			if (has_focus() && get_tree()->is_accessibility_enabled()) {
+				RID ae;
+				if (keyboard_focus_frame && keyboard_focus_item) {
+					if (keyboard_focus_on_text) {
+						ae = keyboard_focus_frame->lines[keyboard_focus_line].accessibility_text_element;
+					} else {
+						if (keyboard_focus_item->accessibility_item_element.is_valid()) {
+							ae = keyboard_focus_item->accessibility_item_element;
+						}
+					}
+				} else {
+					if (!main->lines.is_empty()) {
+						ae = main->lines[0].accessibility_text_element;
+					}
+				}
+				if (ac_element_bounds_cache.has(ae)) {
+					draw_style_box(theme_cache.focus_style, ac_element_bounds_cache[ae]);
+				}
+			}
 		} break;
 
 		case NOTIFICATION_INTERNAL_PROCESS: {
@@ -2118,6 +2613,7 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 							if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CLIPBOARD_PRIMARY)) {
 								DisplayServer::get_singleton()->clipboard_set_primary(get_selected_text());
 							}
+							queue_accessibility_update();
 							queue_redraw();
 							break;
 						}
@@ -2189,7 +2685,7 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 
 		if (b->get_button_index() == MouseButton::RIGHT && context_menu_enabled) {
 			_update_context_menu();
-			menu->set_position(get_screen_position() + b->get_position());
+			menu->set_position(get_screen_transform().xform(b->get_position()));
 			menu->reset_size();
 			menu->popup();
 			grab_focus();
@@ -2200,6 +2696,7 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 	if (pan_gesture.is_valid()) {
 		if (scroll_active) {
 			vscroll->scroll(vscroll->get_page() * pan_gesture->get_delta().y * 0.5 / 8);
+			queue_accessibility_update();
 		}
 
 		return;
@@ -2213,28 +2710,111 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 
 			if (k->is_action("ui_page_up", true) && vscroll->is_visible_in_tree()) {
 				vscroll->scroll(-vscroll->get_page());
+				queue_accessibility_update();
 				handled = true;
 			}
 			if (k->is_action("ui_page_down", true) && vscroll->is_visible_in_tree()) {
 				vscroll->scroll(vscroll->get_page());
+				queue_accessibility_update();
 				handled = true;
 			}
 			if (k->is_action("ui_up", true) && vscroll->is_visible_in_tree()) {
 				vscroll->scroll(-theme_cache.normal_font->get_height(theme_cache.normal_font_size));
+				queue_accessibility_update();
 				handled = true;
 			}
 			if (k->is_action("ui_down", true) && vscroll->is_visible_in_tree()) {
 				vscroll->scroll(theme_cache.normal_font->get_height(theme_cache.normal_font_size));
+				queue_accessibility_update();
 				handled = true;
 			}
 			if (k->is_action("ui_home", true) && vscroll->is_visible_in_tree()) {
 				vscroll->scroll_to(0);
+				queue_accessibility_update();
 				handled = true;
 			}
 			if (k->is_action("ui_end", true) && vscroll->is_visible_in_tree()) {
 				vscroll->scroll_to(vscroll->get_max());
+				queue_accessibility_update();
 				handled = true;
 			}
+			if (get_tree()->is_accessibility_enabled()) {
+				if (k->is_action("ui_left", true)) {
+					if (keyboard_focus_frame != nullptr) {
+						if (!keyboard_focus_on_text && keyboard_focus_line < (int)keyboard_focus_frame->lines.size() && keyboard_focus_frame->lines[keyboard_focus_line].from == keyboard_focus_item) {
+							keyboard_focus_on_text = true;
+						} else {
+							Item *it = keyboard_focus_item;
+							while (it) {
+								it = _get_prev_item(it, true);
+								if (it) {
+									ItemFrame *f = nullptr;
+									_find_frame(it, &f, nullptr);
+									if (it->type == ITEM_IMAGE || it->type == ITEM_TABLE) {
+										keyboard_focus_frame = f;
+										keyboard_focus_line = it->line;
+										keyboard_focus_item = it;
+										keyboard_focus_on_text = false;
+										break;
+									}
+									if (f && !f->lines.is_empty()) {
+										if (f->lines[it->line].from == it) {
+											keyboard_focus_frame = f;
+											keyboard_focus_line = it->line;
+											keyboard_focus_item = it;
+											keyboard_focus_on_text = true;
+											break;
+										}
+									}
+								}
+							}
+						}
+					}
+					queue_accessibility_update();
+					queue_redraw();
+					handled = true;
+				}
+				if (k->is_action("ui_right", true)) {
+					if (keyboard_focus_frame == nullptr) {
+						keyboard_focus_frame = main;
+						keyboard_focus_line = 0;
+						keyboard_focus_item = main->lines.is_empty() ? nullptr : main->lines[0].from;
+						keyboard_focus_on_text = true;
+					} else {
+						if (keyboard_focus_on_text && keyboard_focus_item && (keyboard_focus_item->type == ITEM_IMAGE || keyboard_focus_item->type == ITEM_TABLE)) {
+							keyboard_focus_on_text = false;
+						} else {
+							Item *it = keyboard_focus_item;
+							while (it) {
+								it = _get_next_item(it, true);
+								if (it) {
+									ItemFrame *f = nullptr;
+									_find_frame(it, &f, nullptr);
+									if (f && !f->lines.is_empty()) {
+										if (f->lines[it->line].from == it) {
+											keyboard_focus_frame = f;
+											keyboard_focus_line = it->line;
+											keyboard_focus_item = it;
+											keyboard_focus_on_text = true;
+											break;
+										}
+									}
+									if (it->type == ITEM_IMAGE || it->type == ITEM_TABLE) {
+										keyboard_focus_frame = f;
+										keyboard_focus_line = it->line;
+										keyboard_focus_item = it;
+										keyboard_focus_on_text = false;
+										break;
+									}
+								}
+							}
+						}
+					}
+					queue_accessibility_update();
+					queue_redraw();
+					handled = true;
+				}
+			}
 			if (is_shortcut_keys_enabled()) {
 				if (k->is_action("ui_text_select_all", true)) {
 					select_all();
@@ -2325,6 +2905,7 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
 			}
 
 			selection.active = true;
+			queue_accessibility_update();
 			queue_redraw();
 		}
 
@@ -2421,7 +3002,7 @@ RichTextLabel::ItemFont *RichTextLabel::_find_font(Item *p_item) {
 		if (fontitem->type == ITEM_FONT) {
 			ItemFont *fi = static_cast<ItemFont *>(fontitem);
 			switch (fi->def_font) {
-				case NORMAL_FONT: {
+				case RTL_NORMAL_FONT: {
 					if (fi->variation) {
 						Ref<FontVariation> fc = fi->font;
 						if (fc.is_valid()) {
@@ -2434,7 +3015,7 @@ RichTextLabel::ItemFont *RichTextLabel::_find_font(Item *p_item) {
 						fi->font_size = theme_cache.normal_font_size;
 					}
 				} break;
-				case BOLD_FONT: {
+				case RTL_BOLD_FONT: {
 					if (fi->variation) {
 						Ref<FontVariation> fc = fi->font;
 						if (fc.is_valid()) {
@@ -2447,7 +3028,7 @@ RichTextLabel::ItemFont *RichTextLabel::_find_font(Item *p_item) {
 						fi->font_size = theme_cache.bold_font_size;
 					}
 				} break;
-				case ITALICS_FONT: {
+				case RTL_ITALICS_FONT: {
 					if (fi->variation) {
 						Ref<FontVariation> fc = fi->font;
 						if (fc.is_valid()) {
@@ -2460,7 +3041,7 @@ RichTextLabel::ItemFont *RichTextLabel::_find_font(Item *p_item) {
 						fi->font_size = theme_cache.italics_font_size;
 					}
 				} break;
-				case BOLD_ITALICS_FONT: {
+				case RTL_BOLD_ITALICS_FONT: {
 					if (fi->variation) {
 						Ref<FontVariation> fc = fi->font;
 						if (fc.is_valid()) {
@@ -2473,7 +3054,7 @@ RichTextLabel::ItemFont *RichTextLabel::_find_font(Item *p_item) {
 						fi->font_size = theme_cache.bold_italics_font_size;
 					}
 				} break;
-				case MONO_FONT: {
+				case RTL_MONO_FONT: {
 					if (fi->variation) {
 						Ref<FontVariation> fc = fi->font;
 						if (fc.is_valid()) {
@@ -2922,6 +3503,7 @@ void RichTextLabel::_thread_end() {
 		vscroll->hide();
 	}
 	if (is_visible_in_tree()) {
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -3044,6 +3626,7 @@ bool RichTextLabel::_validate_line_caches() {
 			if (!scroll_visible) {
 				vscroll->hide();
 			}
+			queue_accessibility_update();
 			return true;
 		}
 
@@ -3066,6 +3649,7 @@ bool RichTextLabel::_validate_line_caches() {
 		if (!scroll_visible) {
 			vscroll->hide();
 		}
+		queue_accessibility_update();
 		return true;
 	}
 	validating.store(false);
@@ -3076,6 +3660,7 @@ bool RichTextLabel::_validate_line_caches() {
 		task = WorkerThreadPool::get_singleton()->add_template_task(this, &RichTextLabel::_thread_function, nullptr, true, vformat("RichTextLabelShape:%x", (int64_t)get_instance_id()));
 		set_physics_process_internal(true);
 		loading_started = OS::get_singleton()->get_ticks_msec();
+		queue_accessibility_update();
 		return false;
 	} else {
 		updating.store(true);
@@ -3083,6 +3668,7 @@ bool RichTextLabel::_validate_line_caches() {
 		if (!scroll_visible) {
 			vscroll->hide();
 		}
+		queue_accessibility_update();
 		queue_redraw();
 		return true;
 	}
@@ -3167,6 +3753,7 @@ void RichTextLabel::_process_line_caches() {
 void RichTextLabel::_invalidate_current_line(ItemFrame *p_frame) {
 	if ((int)p_frame->lines.size() - 1 <= p_frame->first_invalid_line) {
 		p_frame->first_invalid_line = (int)p_frame->lines.size() - 1;
+		queue_accessibility_update();
 	}
 }
 
@@ -3290,6 +3877,7 @@ void RichTextLabel::_add_item(Item *p_item, bool p_enter, bool p_ensure_newline)
 	if (fit_content) {
 		update_minimum_size();
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -3332,7 +3920,7 @@ Size2 RichTextLabel::_get_image_size(const Ref<Texture2D> &p_image, int p_width,
 	return ret;
 }
 
-void RichTextLabel::add_image(const Ref<Texture2D> &p_image, int p_width, int p_height, const Color &p_color, InlineAlignment p_alignment, const Rect2 &p_region, const Variant &p_key, bool p_pad, const String &p_tooltip, bool p_size_in_percent) {
+void RichTextLabel::add_image(const Ref<Texture2D> &p_image, int p_width, int p_height, const Color &p_color, InlineAlignment p_alignment, const Rect2 &p_region, const Variant &p_key, bool p_pad, const String &p_tooltip, bool p_size_in_percent, const String &p_alt_text) {
 	_stop_thread();
 	MutexLock data_lock(data_mutex);
 
@@ -3367,10 +3955,12 @@ void RichTextLabel::add_image(const Ref<Texture2D> &p_image, int p_width, int p_
 	item->pad = p_pad;
 	item->key = p_key;
 	item->tooltip = p_tooltip;
+	item->alt_text = p_alt_text;
 
 	item->image->connect_changed(callable_mp(this, &RichTextLabel::_texture_changed).bind(item->rid), CONNECT_REFERENCE_COUNTED);
 
 	_add_item(item, false);
+	update_configuration_warnings();
 }
 
 void RichTextLabel::update_image(const Variant &p_key, BitField<ImageUpdateMask> p_mask, const Ref<Texture2D> &p_image, int p_width, int p_height, const Color &p_color, InlineAlignment p_alignment, const Rect2 &p_region, bool p_pad, const String &p_tooltip, bool p_size_in_percent) {
@@ -3633,7 +4223,13 @@ bool RichTextLabel::invalidate_paragraph(int p_paragraph) {
 	main->first_invalid_line.store(MIN(main->first_invalid_line.load(), p_paragraph));
 	main->first_resized_line.store(MIN(main->first_resized_line.load(), p_paragraph));
 	main->first_invalid_font_line.store(MIN(main->first_invalid_font_line.load(), p_paragraph));
+
+	_invalidate_accessibility();
+	if (is_inside_tree()) {
+		queue_accessibility_update();
+	}
 	queue_redraw();
+	update_configuration_warnings();
 
 	return true;
 }
@@ -3706,33 +4302,33 @@ void RichTextLabel::push_font(const Ref<Font> &p_font, int p_size) {
 void RichTextLabel::push_normal() {
 	ERR_FAIL_COND(theme_cache.normal_font.is_null());
 
-	_push_def_font(NORMAL_FONT);
+	_push_def_font(RTL_NORMAL_FONT);
 }
 
 void RichTextLabel::push_bold() {
 	ERR_FAIL_COND(theme_cache.bold_font.is_null());
 
 	ItemFont *item_font = _find_font(current);
-	_push_def_font((item_font && item_font->def_font == ITALICS_FONT) ? BOLD_ITALICS_FONT : BOLD_FONT);
+	_push_def_font((item_font && item_font->def_font == RTL_ITALICS_FONT) ? RTL_BOLD_ITALICS_FONT : RTL_BOLD_FONT);
 }
 
 void RichTextLabel::push_bold_italics() {
 	ERR_FAIL_COND(theme_cache.bold_italics_font.is_null());
 
-	_push_def_font(BOLD_ITALICS_FONT);
+	_push_def_font(RTL_BOLD_ITALICS_FONT);
 }
 
 void RichTextLabel::push_italics() {
 	ERR_FAIL_COND(theme_cache.italics_font.is_null());
 
 	ItemFont *item_font = _find_font(current);
-	_push_def_font((item_font && item_font->def_font == BOLD_FONT) ? BOLD_ITALICS_FONT : ITALICS_FONT);
+	_push_def_font((item_font && item_font->def_font == RTL_BOLD_FONT) ? RTL_BOLD_ITALICS_FONT : RTL_ITALICS_FONT);
 }
 
 void RichTextLabel::push_mono() {
 	ERR_FAIL_COND(theme_cache.mono_font.is_null());
 
-	_push_def_font(MONO_FONT);
+	_push_def_font(RTL_MONO_FONT);
 }
 
 void RichTextLabel::push_font_size(int p_font_size) {
@@ -3894,7 +4490,7 @@ void RichTextLabel::push_hint(const String &p_string) {
 	_add_item(item, true);
 }
 
-void RichTextLabel::push_table(int p_columns, InlineAlignment p_alignment, int p_align_to_row) {
+void RichTextLabel::push_table(int p_columns, InlineAlignment p_alignment, int p_align_to_row, const String &p_alt_text) {
 	_stop_thread();
 	MutexLock data_lock(data_mutex);
 
@@ -3903,6 +4499,7 @@ void RichTextLabel::push_table(int p_columns, InlineAlignment p_alignment, int p
 	ItemTable *item = memnew(ItemTable);
 	item->owner = get_instance_id();
 	item->rid = items.make_rid(item);
+	item->name = p_alt_text;
 	item->columns.resize(p_columns);
 	item->total_width = 0;
 	item->inline_align = p_alignment;
@@ -4061,6 +4658,17 @@ void RichTextLabel::set_table_column_expand(int p_column, bool p_expand, int p_r
 	table->columns[p_column].expand_ratio = p_ratio;
 }
 
+void RichTextLabel::set_table_column_name(int p_column, const String &p_name) {
+	_stop_thread();
+	MutexLock data_lock(data_mutex);
+
+	ERR_FAIL_COND(current->type != ITEM_TABLE);
+
+	ItemTable *table = static_cast<ItemTable *>(current);
+	ERR_FAIL_INDEX(p_column, (int)table->columns.size());
+	table->columns[p_column].name = p_name;
+}
+
 void RichTextLabel::set_cell_row_background_color(const Color &p_odd_row_bg, const Color &p_even_row_bg) {
 	_stop_thread();
 	MutexLock data_lock(data_mutex);
@@ -4123,6 +4731,7 @@ void RichTextLabel::push_cell() {
 	item->lines.resize(1);
 	item->lines[0].from = nullptr;
 	item->first_invalid_line.store(0); // parent frame last line ???
+	queue_accessibility_update();
 }
 
 int RichTextLabel::get_current_table_column() const {
@@ -4192,6 +4801,11 @@ void RichTextLabel::clear() {
 	main->lines.clear();
 	main->lines.resize(1);
 	main->first_invalid_line.store(0);
+	_invalidate_accessibility();
+
+	keyboard_focus_frame = nullptr;
+	keyboard_focus_line = 0;
+	keyboard_focus_item = nullptr;
 
 	selection.click_frame = nullptr;
 	selection.click_item = nullptr;
@@ -4206,6 +4820,8 @@ void RichTextLabel::clear() {
 	if (fit_content) {
 		update_minimum_size();
 	}
+	queue_accessibility_update();
+	update_configuration_warnings();
 }
 
 void RichTextLabel::set_tab_size(int p_spaces) {
@@ -4217,6 +4833,8 @@ void RichTextLabel::set_tab_size(int p_spaces) {
 
 	tab_size = p_spaces;
 	main->first_resized_line.store(0);
+	_invalidate_accessibility();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4261,6 +4879,7 @@ bool RichTextLabel::is_hint_underlined() const {
 
 void RichTextLabel::set_offset(int p_pixel) {
 	vscroll->set_value(p_pixel);
+	queue_accessibility_update();
 }
 
 void RichTextLabel::set_scroll_active(bool p_active) {
@@ -4440,7 +5059,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 		}
 
 		if (tag.begins_with("/") && tag_stack.size()) {
-			bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1, tag.length());
+			bool tag_ok = tag_stack.size() && tag_stack.front()->get() == tag.substr(1);
 
 			if (tag_stack.front()->get() == "b") {
 				in_bold = false;
@@ -4510,9 +5129,9 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			//use bold font
 			in_bold = true;
 			if (in_italics) {
-				_push_def_font(BOLD_ITALICS_FONT);
+				_push_def_font(RTL_BOLD_ITALICS_FONT);
 			} else {
-				_push_def_font(BOLD_FONT);
+				_push_def_font(RTL_BOLD_FONT);
 			}
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
@@ -4520,15 +5139,15 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			//use italics font
 			in_italics = true;
 			if (in_bold) {
-				_push_def_font(BOLD_ITALICS_FONT);
+				_push_def_font(RTL_BOLD_ITALICS_FONT);
 			} else {
-				_push_def_font(ITALICS_FONT);
+				_push_def_font(RTL_ITALICS_FONT);
 			}
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag == "code") {
 			//use monospace font
-			_push_def_font(MONO_FONT);
+			_push_def_font(RTL_MONO_FONT);
 			pos = brk_end + 1;
 			tag_stack.push_front(tag);
 		} else if (tag.begins_with("table=")) {
@@ -4574,7 +5193,13 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 				row = subtag[3].to_int();
 			}
 
-			push_table(columns, (InlineAlignment)alignment, row);
+			OptionMap::Iterator alt_text_option = bbcode_options.find("name");
+			String alt_text;
+			if (alt_text_option) {
+				alt_text = alt_text_option->value;
+			}
+
+			push_table(columns, (InlineAlignment)alignment, row, alt_text);
 			pos = brk_end + 1;
 			tag_stack.push_front("table");
 		} else if (tag == "cell") {
@@ -5022,6 +5647,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 			}
 
 			String image = bbcode.substr(brk_end + 1, end - brk_end - 1);
+			String alt_text;
 
 			Ref<Texture2D> texture = ResourceLoader::load(image, "Texture2D");
 			if (texture.is_valid()) {
@@ -5043,6 +5669,11 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 					color = Color::from_string(color_option->value, color);
 				}
 
+				OptionMap::Iterator alt_text_option = bbcode_options.find("alt");
+				if (alt_text_option) {
+					alt_text = alt_text_option->value;
+				}
+
 				int width = 0;
 				int height = 0;
 				bool pad = false;
@@ -5116,7 +5747,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 					}
 				}
 
-				add_image(texture, width, height, color, (InlineAlignment)alignment, region, Variant(), pad, tooltip, size_in_percent);
+				add_image(texture, width, height, color, (InlineAlignment)alignment, region, Variant(), pad, tooltip, size_in_percent, alt_text);
 			}
 
 			pos = end;
@@ -5149,7 +5780,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 
 			if (subtag.size() > 0) {
 				Ref<Font> font = theme_cache.normal_font;
-				DefaultFont def_font = NORMAL_FONT;
+				DefaultFont def_font = RTL_NORMAL_FONT;
 
 				ItemFont *font_it = _find_font(current);
 				if (font_it) {
@@ -5176,7 +5807,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 				fc->set_base_font(font);
 				fc->set_opentype_features(features);
 
-				if (def_font != CUSTOM_FONT) {
+				if (def_font != RTL_CUSTOM_FONT) {
 					_push_def_font_var(def_font, fc);
 				} else {
 					push_font(fc);
@@ -5198,7 +5829,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 
 		} else if (tag.begins_with("font ")) {
 			Ref<Font> font = theme_cache.normal_font;
-			DefaultFont def_font = NORMAL_FONT;
+			DefaultFont def_font = RTL_NORMAL_FONT;
 			int fnt_size = -1;
 
 			ItemFont *font_it = _find_font(current);
@@ -5221,7 +5852,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 				Ref<Font> font_data = ResourceLoader::load(fnt, "Font");
 				if (font_data.is_valid()) {
 					font = font_data;
-					def_font = CUSTOM_FONT;
+					def_font = RTL_CUSTOM_FONT;
 				}
 			}
 			OptionMap::Iterator size_option = bbcode_options.find("size");
@@ -5330,7 +5961,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 
 			fc->set_base_font(font);
 
-			if (def_font != CUSTOM_FONT) {
+			if (def_font != RTL_CUSTOM_FONT) {
 				_push_def_font_var(def_font, fc, fnt_size);
 			} else {
 				push_font(fc, fnt_size);
@@ -5502,7 +6133,7 @@ void RichTextLabel::append_text(const String &p_bbcode) {
 
 		} else {
 			Vector<String> &expr = split_tag_block;
-			if (expr.size() < 1) {
+			if (expr.is_empty()) {
 				add_text("[");
 				pos = brk_pos + 1;
 			} else {
@@ -5530,6 +6161,7 @@ void RichTextLabel::scroll_to_selection() {
 	float line_offset = get_selection_line_offset();
 	if (line_offset != -1.0) {
 		vscroll->set_value(line_offset);
+		queue_accessibility_update();
 	}
 }
 
@@ -5543,6 +6175,7 @@ void RichTextLabel::scroll_to_paragraph(int p_paragraph) {
 	} else {
 		vscroll->set_value(main->lines[p_paragraph].offset.y);
 	}
+	queue_accessibility_update();
 }
 
 int RichTextLabel::get_paragraph_count() const {
@@ -5561,6 +6194,7 @@ int RichTextLabel::get_visible_paragraph_count() const {
 void RichTextLabel::scroll_to_line(int p_line) {
 	if (p_line <= 0) {
 		vscroll->set_value(0);
+		queue_accessibility_update();
 		return;
 	}
 	_validate_line_caches();
@@ -5575,11 +6209,13 @@ void RichTextLabel::scroll_to_line(int p_line) {
 				line_offset += main->lines[i].text_buf->get_line_ascent(j) + main->lines[i].text_buf->get_line_descent(j) + theme_cache.line_separation;
 			}
 			vscroll->set_value(main->lines[i].offset.y + line_offset);
+			queue_accessibility_update();
 			return;
 		}
 		line_count += main->lines[i].text_buf->get_line_count();
 	}
 	vscroll->set_value(vscroll->get_max());
+	queue_accessibility_update();
 }
 
 float RichTextLabel::get_line_offset(int p_line) {
@@ -5662,10 +6298,11 @@ void RichTextLabel::set_selection_enabled(bool p_enabled) {
 		if (selection.active) {
 			deselect();
 		}
-		set_focus_mode(FOCUS_NONE);
+		set_focus_mode(FOCUS_ACCESSIBILITY);
 	} else {
 		set_focus_mode(FOCUS_ALL);
 	}
+	queue_accessibility_update();
 }
 
 void RichTextLabel::set_deselect_on_focus_loss_enabled(const bool p_enabled) {
@@ -5780,6 +6417,7 @@ bool RichTextLabel::_search_line(ItemFrame *p_frame, int p_line, const String &p
 		selection.to_item = _get_item_at_pos(l.from, it_to, sp + p_string.length());
 		selection.to_char = sp + p_string.length();
 		selection.active = true;
+		queue_accessibility_update();
 		return true;
 	}
 
@@ -5789,8 +6427,9 @@ bool RichTextLabel::_search_line(ItemFrame *p_frame, int p_line, const String &p
 bool RichTextLabel::search(const String &p_string, bool p_from_selection, bool p_search_previous) {
 	ERR_FAIL_COND_V(!selection.enabled, false);
 
-	if (p_string.size() == 0) {
+	if (p_string.is_empty()) {
 		selection.active = false;
+		queue_accessibility_update();
 		return false;
 	}
 
@@ -5920,7 +6559,7 @@ String RichTextLabel::_get_line_text(ItemFrame *p_frame, int p_line, Selection p
 		txt = txt.substr(0, p_selection.to_char);
 	}
 	if ((l.from != nullptr) && (p_frame == p_selection.from_frame) && (p_selection.from_item != nullptr) && (p_selection.from_item->index >= l.from->index) && (p_selection.from_item->index < end_idx)) {
-		txt = txt.substr(p_selection.from_char, -1);
+		txt = txt.substr(p_selection.from_char);
 	}
 	return txt;
 }
@@ -5973,6 +6612,7 @@ String RichTextLabel::get_selected_text() const {
 
 void RichTextLabel::deselect() {
 	selection.active = false;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -6029,6 +6669,7 @@ void RichTextLabel::select_all() {
 	selection.to_char = to_frame->lines[to_line].char_count;
 	selection.to_item = to_item;
 	selection.active = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -6176,6 +6817,7 @@ void RichTextLabel::set_text_direction(Control::TextDirection p_text_direction)
 			_apply_translation();
 		} else {
 			main->first_invalid_line.store(0); // Invalidate all lines.
+			_invalidate_accessibility();
 			_validate_line_caches();
 		}
 		queue_redraw();
@@ -6268,6 +6910,7 @@ void RichTextLabel::set_structured_text_bidi_override(TextServer::StructuredText
 			_apply_translation();
 		} else {
 			main->first_invalid_line.store(0); // Invalidate all lines.
+			_invalidate_accessibility();
 			_validate_line_caches();
 		}
 		queue_redraw();
@@ -6284,6 +6927,7 @@ void RichTextLabel::set_structured_text_bidi_override_options(Array p_args) {
 
 		st_args = p_args;
 		main->first_invalid_line.store(0); // Invalidate all lines.
+		_invalidate_accessibility();
 		_validate_line_caches();
 		queue_redraw();
 	}
@@ -6302,6 +6946,7 @@ void RichTextLabel::set_language(const String &p_language) {
 			_apply_translation();
 		} else {
 			main->first_invalid_line.store(0); // Invalidate all lines.
+			_invalidate_accessibility();
 			_validate_line_caches();
 		}
 		queue_redraw();
@@ -6318,6 +6963,7 @@ void RichTextLabel::set_autowrap_mode(TextServer::AutowrapMode p_mode) {
 
 		autowrap_mode = p_mode;
 		main->first_invalid_line = 0; // Invalidate all lines.
+		_invalidate_accessibility();
 		_validate_line_caches();
 		queue_redraw();
 	}
@@ -6327,6 +6973,21 @@ TextServer::AutowrapMode RichTextLabel::get_autowrap_mode() const {
 	return autowrap_mode;
 }
 
+void RichTextLabel::set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags) {
+	if (autowrap_flags_trim != (p_flags & TextServer::BREAK_TRIM_MASK)) {
+		_stop_thread();
+
+		autowrap_flags_trim = p_flags & TextServer::BREAK_TRIM_MASK;
+		main->first_invalid_line = 0; // Invalidate all lines.
+		_validate_line_caches();
+		queue_redraw();
+	}
+}
+
+BitField<TextServer::LineBreakFlag> RichTextLabel::get_autowrap_trim_flags() const {
+	return autowrap_flags_trim;
+}
+
 void RichTextLabel::set_visible_ratio(float p_ratio) {
 	if (visible_ratio != p_ratio) {
 		_stop_thread();
@@ -6344,6 +7005,7 @@ void RichTextLabel::set_visible_ratio(float p_ratio) {
 
 		if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING) {
 			main->first_invalid_line.store(0); //  Invalidate all lines..
+			_invalidate_accessibility();
 			_validate_line_caches();
 		}
 		queue_redraw();
@@ -6356,9 +7018,7 @@ float RichTextLabel::get_visible_ratio() const {
 
 void RichTextLabel::set_effects(Array p_effects) {
 	custom_effects = p_effects;
-	if (!stack_externally_modified && use_bbcode) {
-		parse_bbcode(atr(text));
-	}
+	reload_effects();
 }
 
 Array RichTextLabel::get_effects() {
@@ -6371,8 +7031,14 @@ void RichTextLabel::install_effect(const Variant effect) {
 
 	ERR_FAIL_COND_MSG(rteffect.is_null(), "Invalid RichTextEffect resource.");
 	custom_effects.push_back(effect);
+	reload_effects();
+}
+
+void RichTextLabel::reload_effects() {
 	if (!stack_externally_modified && use_bbcode) {
+		internal_stack_editing = true;
 		parse_bbcode(atr(text));
+		internal_stack_editing = false;
 	}
 }
 
@@ -6421,7 +7087,7 @@ void RichTextLabel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_parsed_text"), &RichTextLabel::get_parsed_text);
 	ClassDB::bind_method(D_METHOD("add_text", "text"), &RichTextLabel::add_text);
 	ClassDB::bind_method(D_METHOD("set_text", "text"), &RichTextLabel::set_text);
-	ClassDB::bind_method(D_METHOD("add_image", "image", "width", "height", "color", "inline_align", "region", "key", "pad", "tooltip", "size_in_percent"), &RichTextLabel::add_image, DEFVAL(0), DEFVAL(0), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(Rect2()), DEFVAL(Variant()), DEFVAL(false), DEFVAL(String()), DEFVAL(false));
+	ClassDB::bind_method(D_METHOD("add_image", "image", "width", "height", "color", "inline_align", "region", "key", "pad", "tooltip", "size_in_percent", "alt_text"), &RichTextLabel::add_image, DEFVAL(0), DEFVAL(0), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(Rect2()), DEFVAL(Variant()), DEFVAL(false), DEFVAL(String()), DEFVAL(false), DEFVAL(String()));
 	ClassDB::bind_method(D_METHOD("update_image", "key", "mask", "image", "width", "height", "color", "inline_align", "region", "pad", "tooltip", "size_in_percent"), &RichTextLabel::update_image, DEFVAL(0), DEFVAL(0), DEFVAL(Color(1.0, 1.0, 1.0)), DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(Rect2()), DEFVAL(false), DEFVAL(String()), DEFVAL(false));
 	ClassDB::bind_method(D_METHOD("newline"), &RichTextLabel::add_newline);
 	ClassDB::bind_method(D_METHOD("remove_paragraph", "paragraph", "no_invalidate"), &RichTextLabel::remove_paragraph, DEFVAL(false));
@@ -6444,9 +7110,10 @@ void RichTextLabel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("push_language", "language"), &RichTextLabel::push_language);
 	ClassDB::bind_method(D_METHOD("push_underline"), &RichTextLabel::push_underline);
 	ClassDB::bind_method(D_METHOD("push_strikethrough"), &RichTextLabel::push_strikethrough);
-	ClassDB::bind_method(D_METHOD("push_table", "columns", "inline_align", "align_to_row"), &RichTextLabel::push_table, DEFVAL(INLINE_ALIGNMENT_TOP), DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("push_table", "columns", "inline_align", "align_to_row", "name"), &RichTextLabel::push_table, DEFVAL(INLINE_ALIGNMENT_TOP), DEFVAL(-1), DEFVAL(String()));
 	ClassDB::bind_method(D_METHOD("push_dropcap", "string", "font", "size", "dropcap_margins", "color", "outline_size", "outline_color"), &RichTextLabel::push_dropcap, DEFVAL(Rect2()), DEFVAL(Color(1, 1, 1)), DEFVAL(0), DEFVAL(Color(0, 0, 0, 0)));
 	ClassDB::bind_method(D_METHOD("set_table_column_expand", "column", "expand", "ratio", "shrink"), &RichTextLabel::set_table_column_expand, DEFVAL(1), DEFVAL(true));
+	ClassDB::bind_method(D_METHOD("set_table_column_name", "column", "name"), &RichTextLabel::set_table_column_name);
 	ClassDB::bind_method(D_METHOD("set_cell_row_background_color", "odd_row_bg", "even_row_bg"), &RichTextLabel::set_cell_row_background_color);
 	ClassDB::bind_method(D_METHOD("set_cell_border_color", "color"), &RichTextLabel::set_cell_border_color);
 	ClassDB::bind_method(D_METHOD("set_cell_size_override", "min_size", "max_size"), &RichTextLabel::set_cell_size_override);
@@ -6483,6 +7150,9 @@ void RichTextLabel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_autowrap_mode", "autowrap_mode"), &RichTextLabel::set_autowrap_mode);
 	ClassDB::bind_method(D_METHOD("get_autowrap_mode"), &RichTextLabel::get_autowrap_mode);
 
+	ClassDB::bind_method(D_METHOD("set_autowrap_trim_flags", "autowrap_trim_flags"), &RichTextLabel::set_autowrap_trim_flags);
+	ClassDB::bind_method(D_METHOD("get_autowrap_trim_flags"), &RichTextLabel::get_autowrap_trim_flags);
+
 	ClassDB::bind_method(D_METHOD("set_meta_underline", "enable"), &RichTextLabel::set_meta_underline);
 	ClassDB::bind_method(D_METHOD("is_meta_underlined"), &RichTextLabel::is_meta_underlined);
 
@@ -6580,6 +7250,7 @@ void RichTextLabel::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_effects", "effects"), &RichTextLabel::set_effects);
 	ClassDB::bind_method(D_METHOD("get_effects"), &RichTextLabel::get_effects);
 	ClassDB::bind_method(D_METHOD("install_effect", "effect"), &RichTextLabel::install_effect);
+	ClassDB::bind_method(D_METHOD("reload_effects"), &RichTextLabel::reload_effects);
 
 	ClassDB::bind_method(D_METHOD("get_menu"), &RichTextLabel::get_menu);
 	ClassDB::bind_method(D_METHOD("is_menu_visible"), &RichTextLabel::is_menu_visible);
@@ -6593,6 +7264,7 @@ void RichTextLabel::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "scroll_active"), "set_scroll_active", "is_scroll_active");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "scroll_following"), "set_scroll_follow", "is_scroll_following");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_mode", PROPERTY_HINT_ENUM, "Off,Arbitrary,Word,Word (Smart)"), "set_autowrap_mode", "get_autowrap_mode");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_trim_flags", PROPERTY_HINT_FLAGS, vformat("Trim Spaces After Break:%d,Trim Spaces Before Break:%d", TextServer::BREAK_TRIM_START_EDGE_SPACES, TextServer::BREAK_TRIM_END_EDGE_SPACES)), "set_autowrap_trim_flags", "get_autowrap_trim_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "tab_size", PROPERTY_HINT_RANGE, "0,24,1"), "set_tab_size", "get_tab_size");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "shortcut_keys_enabled"), "set_shortcut_keys_enabled", "is_shortcut_keys_enabled");
@@ -6705,6 +7377,7 @@ void RichTextLabel::set_visible_characters_behavior(TextServer::VisibleCharacter
 
 		visible_chars_behavior = p_behavior;
 		main->first_invalid_line.store(0); // Invalidate all lines.
+		_invalidate_accessibility();
 		_validate_line_caches();
 		queue_redraw();
 	}
@@ -6725,6 +7398,7 @@ void RichTextLabel::set_visible_characters(int p_visible) {
 		}
 		if (visible_chars_behavior == TextServer::VC_CHARS_BEFORE_SHAPING) {
 			main->first_invalid_line.store(0); // Invalidate all lines.
+			_invalidate_accessibility();
 			_validate_line_caches();
 		}
 		queue_redraw();
@@ -6834,7 +7508,6 @@ Size2 RichTextLabel::get_minimum_size() const {
 void RichTextLabel::_generate_context_menu() {
 	menu = memnew(PopupMenu);
 	add_child(menu, false, INTERNAL_MODE_FRONT);
-	menu->force_parent_owned();
 	menu->connect(SceneStringName(id_pressed), callable_mp(this, &RichTextLabel::menu_option));
 
 	menu->add_item(ETR("Copy"), MENU_COPY);
@@ -6931,17 +7604,17 @@ Dictionary RichTextLabel::parse_expressions_for_values(Vector<String> p_expressi
 		nodepath.compile("^\\$");
 		RegEx boolean = RegEx();
 		boolean.compile("^(true|false)$");
-		RegEx decimal = RegEx();
-		decimal.compile("^-?^.?\\d+(\\.\\d+?)?$");
 		RegEx numerical = RegEx();
-		numerical.compile("^\\d+$");
+		numerical.compile("^[-+]?\\d+$");
+		RegEx decimal = RegEx();
+		decimal.compile("^[+-]?\\d*(\\.\\d*)?([eE][+-]?\\d+)?$");
 
 		for (int j = 0; j < values.size(); j++) {
 			if (color.search(values[j]).is_valid()) {
 				a.append(Color::html(values[j]));
 			} else if (nodepath.search(values[j]).is_valid()) {
 				if (values[j].begins_with("$")) {
-					String v = values[j].substr(1, values[j].length());
+					String v = values[j].substr(1);
 					a.append(NodePath(v));
 				}
 			} else if (boolean.search(values[j]).is_valid()) {
@@ -6950,10 +7623,10 @@ Dictionary RichTextLabel::parse_expressions_for_values(Vector<String> p_expressi
 				} else if (values[j] == "false") {
 					a.append(false);
 				}
-			} else if (decimal.search(values[j]).is_valid()) {
-				a.append(values[j].to_float());
 			} else if (numerical.search(values[j]).is_valid()) {
 				a.append(values[j].to_int());
+			} else if (decimal.search(values[j]).is_valid()) {
+				a.append(values[j].to_float());
 			} else {
 				a.append(values[j]);
 			}
@@ -6993,6 +7666,7 @@ RichTextLabel::RichTextLabel(const String &p_text) {
 	vscroll->set_step(1);
 	vscroll->hide();
 
+	set_focus_mode(FOCUS_ACCESSIBILITY);
 	set_text(p_text);
 	updating.store(false);
 	validating.store(false);
diff --git a/engine/scene/gui/rich_text_label.h b/engine/scene/gui/rich_text_label.h
index 6b465260..3ff7d2b8 100644
--- a/engine/scene/gui/rich_text_label.h
+++ b/engine/scene/gui/rich_text_label.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RICH_TEXT_LABEL_H
-#define RICH_TEXT_LABEL_H
+#pragma once
 
 #include "core/object/worker_thread_pool.h"
 #include "core/templates/rid_owner.h"
@@ -45,6 +44,7 @@ class RichTextLabel : public Control {
 
 	enum RTLDrawStep {
 		DRAW_STEP_BACKGROUND,
+		DRAW_STEP_SHADOW_OUTLINE,
 		DRAW_STEP_SHADOW,
 		DRAW_STEP_OUTLINE,
 		DRAW_STEP_TEXT,
@@ -106,12 +106,12 @@ public:
 	};
 
 	enum DefaultFont {
-		NORMAL_FONT,
-		BOLD_FONT,
-		ITALICS_FONT,
-		BOLD_ITALICS_FONT,
-		MONO_FONT,
-		CUSTOM_FONT,
+		RTL_NORMAL_FONT,
+		RTL_BOLD_FONT,
+		RTL_ITALICS_FONT,
+		RTL_BOLD_ITALICS_FONT,
+		RTL_MONO_FONT,
+		RTL_CUSTOM_FONT,
 	};
 
 	enum ImageUpdateMask {
@@ -137,8 +137,11 @@ protected:
 	void _push_meta_bind_compat_99481(const Variant &p_meta, MetaUnderline p_underline_mode);
 	void _push_meta_bind_compat_89024(const Variant &p_meta);
 	void _add_image_bind_compat_80410(const Ref<Texture2D> &p_image, const int p_width, const int p_height, const Color &p_color, InlineAlignment p_alignment, const Rect2 &p_region);
+	void _add_image_bind_compat_76829(const Ref<Texture2D> &p_image, const int p_width, const int p_height, const Color &p_color, InlineAlignment p_alignment, const Rect2 &p_region, const Variant &p_key, bool p_pad, const String &p_tooltip, bool p_size_in_percent);
+	void _push_table_bind_compat_76829(int p_columns, InlineAlignment p_alignment, int p_align_to_row);
 	bool _remove_paragraph_bind_compat_91098(int p_paragraph);
 	void _set_table_column_expand_bind_compat_101482(int p_column, bool p_expand, int p_ratio);
+
 	static void _bind_compatibility_methods();
 #endif
 
@@ -151,6 +154,11 @@ private:
 		Ref<TextLine> text_prefix;
 		float prefix_width = 0;
 		Ref<TextParagraph> text_buf;
+
+		RID accessibility_line_element;
+		RID accessibility_text_element;
+
+		Item *dc_item = nullptr;
 		Color dc_color;
 		int dc_ol_size = 0;
 		Color dc_ol_color;
@@ -160,7 +168,16 @@ private:
 		int char_offset = 0;
 		int char_count = 0;
 
-		Line() { text_buf.instantiate(); }
+		Line() {
+			text_buf.instantiate();
+		}
+		~Line() {
+			if (accessibility_line_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(accessibility_line_element);
+				accessibility_line_element = RID();
+				accessibility_text_element = RID();
+			}
+		}
 
 		_FORCE_INLINE_ float get_height(float line_separation) const {
 			return offset.y + text_buf->get_size().y + text_buf->get_line_count() * line_separation;
@@ -178,8 +195,10 @@ private:
 		int line = 0;
 		RID rid;
 
+		RID accessibility_item_element;
+
 		void _clear_children() {
-			RichTextLabel *owner_rtl = Object::cast_to<RichTextLabel>(ObjectDB::get_instance(owner));
+			RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
 			while (subitems.size()) {
 				Item *subitem = subitems.front()->get();
 				if (subitem && subitem->rid.is_valid() && owner_rtl) {
@@ -237,6 +256,7 @@ private:
 
 	struct ItemImage : public Item {
 		Ref<Texture2D> image;
+		String alt_text;
 		InlineAlignment inline_align = INLINE_ALIGNMENT_CENTER;
 		bool pad = false;
 		bool size_in_percent = false;
@@ -249,7 +269,7 @@ private:
 		ItemImage() { type = ITEM_IMAGE; }
 		~ItemImage() {
 			if (image.is_valid()) {
-				RichTextLabel *owner_rtl = Object::cast_to<RichTextLabel>(ObjectDB::get_instance(owner));
+				RichTextLabel *owner_rtl = ObjectDB::get_instance<RichTextLabel>(owner);
 				if (owner_rtl) {
 					image->disconnect_changed(callable_mp(owner_rtl, &RichTextLabel::_texture_changed));
 				}
@@ -258,7 +278,7 @@ private:
 	};
 
 	struct ItemFont : public Item {
-		DefaultFont def_font = CUSTOM_FONT;
+		DefaultFont def_font = RTL_CUSTOM_FONT;
 		Ref<Font> font;
 		bool variation = false;
 		bool def_size = false;
@@ -341,17 +361,21 @@ private:
 
 	struct ItemTable : public Item {
 		struct Column {
+			String name;
 			bool expand = false;
 			bool shrink = true;
 			int expand_ratio = 0;
 			int min_width = 0;
 			int max_width = 0;
 			int width = 0;
+			int width_with_padding = 0;
 		};
 
 		LocalVector<Column> columns;
 		LocalVector<float> rows;
+		LocalVector<float> rows_no_padding;
 		LocalVector<float> rows_baseline;
+		String name;
 
 		int align_to_row = -1;
 		int total_width = 0;
@@ -472,6 +496,7 @@ private:
 	VScrollBar *vscroll = nullptr;
 
 	TextServer::AutowrapMode autowrap_mode = TextServer::AUTOWRAP_WORD_SMART;
+	BitField<TextServer::LineBreakFlag> autowrap_flags_trim = TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES;
 
 	bool scroll_visible = false;
 	bool scroll_follow = false;
@@ -500,6 +525,9 @@ private:
 
 	Array custom_effects;
 
+	HashMap<RID, Rect2> ac_element_bounds_cache;
+
+	void _invalidate_accessibility();
 	void _invalidate_current_line(ItemFrame *p_frame);
 
 	void _thread_function(void *p_userdata);
@@ -549,6 +577,11 @@ private:
 	bool deselect_on_focus_loss_enabled = true;
 	bool drag_and_drop_selection_enabled = true;
 
+	ItemFrame *keyboard_focus_frame = nullptr;
+	int keyboard_focus_line = 0;
+	Item *keyboard_focus_item = nullptr;
+	bool keyboard_focus_on_text = true;
+
 	bool context_menu_enabled = false;
 	bool shortcut_keys_enabled = true;
 
@@ -577,6 +610,7 @@ private:
 	void _update_line_font(ItemFrame *p_frame, int p_line, const Ref<Font> &p_base_font, int p_base_font_size);
 	int _draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, float p_vsep, const Color &p_base_color, int p_outline_size, const Color &p_outline_color, const Color &p_font_shadow_color, int p_shadow_outline_size, const Point2 &p_shadow_ofs, int &r_processed_glyphs);
 	float _find_click_in_line(ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, float p_vsep, const Point2i &p_click, ItemFrame **r_click_frame = nullptr, int *r_click_line = nullptr, Item **r_click_item = nullptr, int *r_click_char = nullptr, bool p_table = false, bool p_meta = false);
+	void _accessibility_update_line(RID p_id, ItemFrame *p_frame, int p_line, const Vector2 &p_ofs, int p_width, float p_vsep);
 
 	String _roman(int p_num, bool p_capitalize) const;
 	String _letters(int p_num, bool p_capitalize) const;
@@ -643,6 +677,15 @@ private:
 	bool internal_stack_editing = false;
 	bool stack_externally_modified = false;
 
+	void _accessibility_action_menu(const Variant &p_data);
+	void _accessibility_scroll_down(const Variant &p_data);
+	void _accessibility_scroll_up(const Variant &p_data);
+	void _accessibility_scroll_set(const Variant &p_data);
+	void _accessibility_focus_item(const Variant &p_data, uint64_t p_item, bool p_line, bool p_foucs);
+	void _accessibility_scroll_to_item(const Variant &p_data, uint64_t p_item);
+
+	RID accessibility_scroll_element;
+
 	bool fit_content = false;
 
 	struct ThemeCache {
@@ -689,9 +732,12 @@ private:
 	} theme_cache;
 
 public:
+	virtual RID get_focused_accessibility_element() const override;
+	PackedStringArray get_accessibility_configuration_warnings() const override;
+
 	String get_parsed_text() const;
 	void add_text(const String &p_text);
-	void add_image(const Ref<Texture2D> &p_image, int p_width = 0, int p_height = 0, const Color &p_color = Color(1.0, 1.0, 1.0), InlineAlignment p_alignment = INLINE_ALIGNMENT_CENTER, const Rect2 &p_region = Rect2(), const Variant &p_key = Variant(), bool p_pad = false, const String &p_tooltip = String(), bool p_size_in_percent = false);
+	void add_image(const Ref<Texture2D> &p_image, int p_width = 0, int p_height = 0, const Color &p_color = Color(1.0, 1.0, 1.0), InlineAlignment p_alignment = INLINE_ALIGNMENT_CENTER, const Rect2 &p_region = Rect2(), const Variant &p_key = Variant(), bool p_pad = false, const String &p_tooltip = String(), bool p_size_in_percent = false, const String &p_alt_text = String());
 	void update_image(const Variant &p_key, BitField<ImageUpdateMask> p_mask, const Ref<Texture2D> &p_image, int p_width = 0, int p_height = 0, const Color &p_color = Color(1.0, 1.0, 1.0), InlineAlignment p_alignment = INLINE_ALIGNMENT_CENTER, const Rect2 &p_region = Rect2(), bool p_pad = false, const String &p_tooltip = String(), bool p_size_in_percent = false);
 	void add_newline();
 	bool remove_paragraph(int p_paragraph, bool p_no_invalidate = false);
@@ -717,7 +763,7 @@ public:
 	void push_list(int p_level, ListType p_list, bool p_capitalize, const String &p_bullet = String::utf8("•"));
 	void push_meta(const Variant &p_meta, MetaUnderline p_underline_mode = META_UNDERLINE_ALWAYS, const String &p_tooltip = String());
 	void push_hint(const String &p_string);
-	void push_table(int p_columns, InlineAlignment p_alignment = INLINE_ALIGNMENT_TOP, int p_align_to_row = -1);
+	void push_table(int p_columns, InlineAlignment p_alignment = INLINE_ALIGNMENT_TOP, int p_align_to_row = -1, const String &p_name = String());
 	void push_fade(int p_start_index, int p_length);
 	void push_shake(int p_strength, float p_rate, bool p_connected);
 	void push_wave(float p_frequency, float p_amplitude, bool p_connected);
@@ -729,6 +775,7 @@ public:
 	void push_customfx(Ref<RichTextEffect> p_custom_effect, Dictionary p_environment);
 	void push_context();
 	void set_table_column_expand(int p_column, bool p_expand, int p_ratio = 1, bool p_shrink = true);
+	void set_table_column_name(int p_column, const String &p_name);
 	void set_cell_row_background_color(const Color &p_odd_row_bg, const Color &p_even_row_bg);
 	void set_cell_border_color(const Color &p_color);
 	void set_cell_size_override(const Size2 &p_min_size, const Size2 &p_max_size);
@@ -858,6 +905,9 @@ public:
 	void set_autowrap_mode(TextServer::AutowrapMode p_mode);
 	TextServer::AutowrapMode get_autowrap_mode() const;
 
+	void set_autowrap_trim_flags(BitField<TextServer::LineBreakFlag> p_flags);
+	BitField<TextServer::LineBreakFlag> get_autowrap_trim_flags() const;
+
 	void set_structured_text_bidi_override(TextServer::StructuredTextParser p_parser);
 	TextServer::StructuredTextParser get_structured_text_bidi_override() const;
 
@@ -881,6 +931,7 @@ public:
 	Array get_effects();
 
 	void install_effect(const Variant effect);
+	void reload_effects();
 
 	virtual Size2 get_minimum_size() const override;
 
@@ -892,5 +943,3 @@ VARIANT_ENUM_CAST(RichTextLabel::ListType);
 VARIANT_ENUM_CAST(RichTextLabel::MenuItems);
 VARIANT_ENUM_CAST(RichTextLabel::MetaUnderline);
 VARIANT_BITFIELD_CAST(RichTextLabel::ImageUpdateMask);
-
-#endif // RICH_TEXT_LABEL_H
diff --git a/engine/scene/gui/scroll_bar.cpp b/engine/scene/gui/scroll_bar.cpp
index b81927f1..39c86b76 100644
--- a/engine/scene/gui/scroll_bar.cpp
+++ b/engine/scene/gui/scroll_bar.cpp
@@ -224,6 +224,13 @@ void ScrollBar::gui_input(const Ref<InputEvent> &p_event) {
 
 void ScrollBar::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SCROLL_BAR);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			RID ci = get_canvas_item();
 
@@ -654,6 +661,8 @@ ScrollBar::ScrollBar(Orientation p_orientation) {
 
 	if (focus_by_default) {
 		set_focus_mode(FOCUS_ALL);
+	} else {
+		set_focus_mode(FOCUS_ACCESSIBILITY);
 	}
 	set_step(0);
 }
diff --git a/engine/scene/gui/scroll_bar.h b/engine/scene/gui/scroll_bar.h
index ad88d826..b2d019c3 100644
--- a/engine/scene/gui/scroll_bar.h
+++ b/engine/scene/gui/scroll_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCROLL_BAR_H
-#define SCROLL_BAR_H
+#pragma once
 
 #include "scene/gui/range.h"
 
@@ -144,5 +143,3 @@ public:
 	VScrollBar() :
 			ScrollBar(VERTICAL) { set_h_size_flags(0); }
 };
-
-#endif // SCROLL_BAR_H
diff --git a/engine/scene/gui/scroll_container.cpp b/engine/scene/gui/scroll_container.cpp
index fdb134c5..00a2e8e0 100644
--- a/engine/scene/gui/scroll_container.cpp
+++ b/engine/scene/gui/scroll_container.cpp
@@ -353,14 +353,53 @@ void ScrollContainer::_reposition_children() {
 	queue_redraw();
 }
 
+void ScrollContainer::_accessibility_action_scroll_set(const Variant &p_data) {
+	const Point2 &pos = p_data;
+	h_scroll->set_value(pos.x);
+	v_scroll->set_value(pos.y);
+}
+
+void ScrollContainer::_accessibility_action_scroll_up(const Variant &p_data) {
+	v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 8);
+}
+
+void ScrollContainer::_accessibility_action_scroll_down(const Variant &p_data) {
+	v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 8);
+}
+
+void ScrollContainer::_accessibility_action_scroll_left(const Variant &p_data) {
+	h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 8);
+}
+
+void ScrollContainer::_accessibility_action_scroll_right(const Variant &p_data) {
+	h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 8);
+}
+
 void ScrollContainer::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SCROLL_VIEW);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_set));
+		} break;
+
 		case NOTIFICATION_ENTER_TREE:
 		case NOTIFICATION_THEME_CHANGED:
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
 		case NOTIFICATION_TRANSLATION_CHANGED: {
 			_updating_scrollbars = true;
 			callable_mp(this, is_ready() ? &ScrollContainer::_reposition_children : &ScrollContainer::_update_scrollbar_position).call_deferred();
+			if (p_what == NOTIFICATION_THEME_CHANGED) {
+				scroll_border = get_theme_constant(SNAME("scroll_border"), SNAME("Tree"));
+				scroll_speed = get_theme_constant(SNAME("scroll_speed"), SNAME("Tree"));
+			}
 		} break;
 
 		case NOTIFICATION_READY: {
@@ -387,6 +426,43 @@ void ScrollContainer::_notification(int p_what) {
 			}
 		} break;
 
+		case NOTIFICATION_DRAG_BEGIN: {
+			if (scroll_on_drag_hover && is_visible_in_tree()) {
+				set_process_internal(true);
+			}
+		} break;
+
+		case NOTIFICATION_DRAG_END: {
+			set_process_internal(false);
+		} break;
+
+		case NOTIFICATION_INTERNAL_PROCESS: {
+			if (scroll_on_drag_hover && get_viewport()->gui_is_dragging()) {
+				Point2 mouse_position = get_viewport()->get_mouse_position() - get_global_position();
+				Transform2D xform = get_transform();
+				if (Rect2(Point2(), xform.get_scale() * get_size()).grow(scroll_border).has_point(mouse_position)) {
+					Point2 point;
+
+					if ((Math::abs(mouse_position.x) < Math::abs(mouse_position.x - get_size().width)) && (Math::abs(mouse_position.x) < scroll_border)) {
+						point.x = mouse_position.x - scroll_border;
+					} else if (Math::abs(mouse_position.x - get_size().width) < scroll_border) {
+						point.x = mouse_position.x - (get_size().width - scroll_border);
+					}
+
+					if ((Math::abs(mouse_position.y) < Math::abs(mouse_position.y - get_size().height)) && (Math::abs(mouse_position.y) < scroll_border)) {
+						point.y = mouse_position.y - scroll_border;
+					} else if (Math::abs(mouse_position.y - get_size().height) < scroll_border) {
+						point.y = mouse_position.y - (get_size().height - scroll_border);
+					}
+
+					point *= scroll_speed * get_process_delta_time();
+					point += Point2(get_h_scroll(), get_v_scroll());
+					h_scroll->set_value(point.x);
+					v_scroll->set_value(point.y);
+				}
+			}
+		} break;
+
 		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
 			if (drag_touching) {
 				if (drag_touching_deaccel) {
@@ -584,6 +660,10 @@ PackedStringArray ScrollContainer::get_configuration_warnings() const {
 	return warnings;
 }
 
+void ScrollContainer::set_scroll_on_drag_hover(bool p_scroll) {
+	scroll_on_drag_hover = p_scroll;
+}
+
 HScrollBar *ScrollContainer::get_h_scroll_bar() {
 	return h_scroll;
 }
diff --git a/engine/scene/gui/scroll_container.h b/engine/scene/gui/scroll_container.h
index 408f7015..7f235270 100644
--- a/engine/scene/gui/scroll_container.h
+++ b/engine/scene/gui/scroll_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCROLL_CONTAINER_H
-#define SCROLL_CONTAINER_H
+#pragma once
 
 #include "container.h"
 
@@ -63,12 +62,15 @@ private:
 	bool drag_touching = false;
 	bool drag_touching_deaccel = false;
 	bool beyond_deadzone = false;
+	bool scroll_on_drag_hover = false;
 
 	ScrollMode horizontal_scroll_mode = SCROLL_MODE_AUTO;
 	ScrollMode vertical_scroll_mode = SCROLL_MODE_AUTO;
 
 	int deadzone = 0;
 	bool follow_focus = false;
+	int scroll_border = 20;
+	int scroll_speed = 12;
 
 	struct ThemeCache {
 		Ref<StyleBox> panel_style;
@@ -82,6 +84,7 @@ private:
 
 	bool draw_focus_border = false;
 	bool focus_border_is_drawn = false;
+	bool child_has_focus();
 
 protected:
 	Size2 get_minimum_size() const override;
@@ -96,9 +99,14 @@ protected:
 	void _update_scrollbar_position();
 	void _scroll_moved(float);
 
+	void _accessibility_action_scroll_set(const Variant &p_data);
+	void _accessibility_action_scroll_up(const Variant &p_data);
+	void _accessibility_action_scroll_down(const Variant &p_data);
+	void _accessibility_action_scroll_left(const Variant &p_data);
+	void _accessibility_action_scroll_right(const Variant &p_data);
+
 public:
 	virtual void gui_input(const Ref<InputEvent> &p_gui_input) override;
-	bool child_has_focus();
 
 	void set_h_scroll(int p_pos);
 	int get_h_scroll() const;
@@ -124,6 +132,8 @@ public:
 	bool is_following_focus() const;
 	void set_follow_focus(bool p_follow);
 
+	void set_scroll_on_drag_hover(bool p_scroll);
+
 	HScrollBar *get_h_scroll_bar();
 	VScrollBar *get_v_scroll_bar();
 	void ensure_control_visible(Control *p_control);
@@ -137,5 +147,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(ScrollContainer::ScrollMode);
-
-#endif // SCROLL_CONTAINER_H
diff --git a/engine/scene/gui/separator.h b/engine/scene/gui/separator.h
index 7c973604..e041ea9b 100644
--- a/engine/scene/gui/separator.h
+++ b/engine/scene/gui/separator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SEPARATOR_H
-#define SEPARATOR_H
+#pragma once
 
 #include "scene/gui/control.h"
 class Separator : public Control {
@@ -66,5 +65,3 @@ class HSeparator : public Separator {
 public:
 	HSeparator();
 };
-
-#endif // SEPARATOR_H
diff --git a/engine/scene/gui/slider.cpp b/engine/scene/gui/slider.cpp
index 803edf5a..4d848cd6 100644
--- a/engine/scene/gui/slider.cpp
+++ b/engine/scene/gui/slider.cpp
@@ -89,12 +89,12 @@ void Slider::gui_input(const Ref<InputEvent> &p_event) {
 			}
 		} else if (scrollable) {
 			if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_UP) {
-				if (get_focus_mode() != FOCUS_NONE) {
+				if (get_focus_mode_with_recursive() != FOCUS_NONE) {
 					grab_focus();
 				}
 				set_value(get_value() + get_step());
 			} else if (mb->is_pressed() && mb->get_button_index() == MouseButton::WHEEL_DOWN) {
-				if (get_focus_mode() != FOCUS_NONE) {
+				if (get_focus_mode_with_recursive() != FOCUS_NONE) {
 					grab_focus();
 				}
 				set_value(get_value() - get_step());
@@ -237,7 +237,13 @@ void Slider::_notification(int p_what) {
 					}
 				}
 			}
+		} break;
 
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SLIDER);
 		} break;
 
 		case NOTIFICATION_THEME_CHANGED: {
diff --git a/engine/scene/gui/slider.h b/engine/scene/gui/slider.h
index 07c1d23e..c3ae874d 100644
--- a/engine/scene/gui/slider.h
+++ b/engine/scene/gui/slider.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SLIDER_H
-#define SLIDER_H
+#pragma once
 
 #include "scene/gui/range.h"
 
@@ -111,5 +110,3 @@ public:
 	VSlider() :
 			Slider(VERTICAL) { set_h_size_flags(0); }
 };
-
-#endif // SLIDER_H
diff --git a/engine/scene/gui/spin_box.cpp b/engine/scene/gui/spin_box.cpp
index e2e6f076..744b77d3 100644
--- a/engine/scene/gui/spin_box.cpp
+++ b/engine/scene/gui/spin_box.cpp
@@ -34,6 +34,50 @@
 #include "core/math/expression.h"
 #include "scene/theme/theme_db.h"
 
+void SpinBoxLineEdit::_accessibility_action_inc(const Variant &p_data) {
+	SpinBox *parent_sb = Object::cast_to<SpinBox>(get_parent());
+	if (parent_sb) {
+		double step = ((parent_sb->get_step() > 0) ? parent_sb->get_step() : 1);
+		parent_sb->set_value(parent_sb->get_value() + step);
+	}
+}
+
+void SpinBoxLineEdit::_accessibility_action_dec(const Variant &p_data) {
+	SpinBox *parent_sb = Object::cast_to<SpinBox>(get_parent());
+	if (parent_sb) {
+		double step = ((parent_sb->get_step() > 0) ? parent_sb->get_step() : 1);
+		parent_sb->set_value(parent_sb->get_value() - step);
+	}
+}
+
+void SpinBoxLineEdit::_notification(int p_what) {
+	ERR_MAIN_THREAD_GUARD;
+	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			SpinBox *parent_sb = Object::cast_to<SpinBox>(get_parent());
+			if (parent_sb) {
+				DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SPIN_BUTTON);
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, parent_sb->get_accessibility_name());
+				DisplayServer::get_singleton()->accessibility_update_set_description(ae, parent_sb->get_accessibility_description());
+				DisplayServer::get_singleton()->accessibility_update_set_live(ae, parent_sb->get_accessibility_live());
+				DisplayServer::get_singleton()->accessibility_update_set_num_value(ae, parent_sb->get_value());
+				DisplayServer::get_singleton()->accessibility_update_set_num_range(ae, parent_sb->get_min(), parent_sb->get_max());
+				if (parent_sb->get_step() > 0) {
+					DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, parent_sb->get_step());
+				} else {
+					DisplayServer::get_singleton()->accessibility_update_set_num_step(ae, 1);
+				}
+				//DisplayServer::get_singleton()->accessibility_update_set_num_jump(ae, ???);
+				DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &SpinBoxLineEdit::_accessibility_action_dec));
+				DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &SpinBoxLineEdit::_accessibility_action_inc));
+			}
+		} break;
+	}
+}
+
 Size2 SpinBox::get_minimum_size() const {
 	Size2 ms = line_edit->get_combined_minimum_size();
 	ms.width += sizing_cache.buttons_block_width;
@@ -63,21 +107,40 @@ void SpinBox::_update_text(bool p_only_update_if_value_changed) {
 			value += " " + suffix;
 		}
 	}
+
+	if (!accepted && update_on_text_changed && !line_edit->get_text().replace_char(',', '.').contains_char('.')) {
+		value = String::num(get_value(), 0);
+	}
+
 	line_edit->set_text_with_selection(value);
 }
 
 void SpinBox::_text_submitted(const String &p_string) {
 	if (p_string.is_empty()) {
-		_update_text();
 		return;
 	}
 
+	String text = p_string;
+
+	if (update_on_text_changed) {
+		// Convert commas ',' to dots '.' for French/German etc. keyboard layouts.
+		text = p_string.replace_char(',', '.');
+
+		if (!text.begins_with(".") && p_string.ends_with(".")) {
+			return;
+		}
+
+		if (text.begins_with(".")) {
+			line_edit->set_text("0.");
+			line_edit->set_caret_column(line_edit->get_text().length());
+			return;
+		}
+	}
+
 	Ref<Expression> expr;
 	expr.instantiate();
 
-	// Convert commas ',' to dots '.' for French/German etc. keyboard layouts.
-	String text = p_string.replace(",", ".");
-	text = text.replace(";", ",");
+	text = text.replace_char(';', ',');
 	text = TS->parse_number(text);
 	// Ignore the prefix and suffix in the expression.
 	text = text.trim_prefix(prefix + " ").trim_suffix(" " + suffix);
@@ -107,12 +170,17 @@ void SpinBox::_text_submitted(const String &p_string) {
 }
 
 void SpinBox::_text_changed(const String &p_string) {
+	accepted = false;
 	int cursor_pos = line_edit->get_caret_column();
 
 	_text_submitted(p_string);
 
+	String text = p_string.replace_char(',', '.');
+
 	// Line edit 'set_text' method resets the cursor position so we need to undo that.
-	line_edit->set_caret_column(cursor_pos);
+	if (update_on_text_changed && !text.begins_with(".")) {
+		line_edit->set_caret_column(cursor_pos);
+	}
 }
 
 LineEdit *SpinBox::get_line_edit() {
@@ -192,6 +260,7 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
 	if (mb.is_valid() && mb->is_pressed()) {
 		switch (mb->get_button_index()) {
 			case MouseButton::LEFT: {
+				accepted = true;
 				line_edit->grab_focus();
 
 				if (mouse_on_up_button || mouse_on_down_button) {
@@ -268,7 +337,7 @@ void SpinBox::gui_input(const Ref<InputEvent> &p_event) {
 	if (mm.is_valid() && (mm->get_button_mask().has_flag(MouseButtonMask::LEFT))) {
 		if (drag.enabled) {
 			drag.diff_y += mm->get_relative().y;
-			double diff_y = -0.01 * Math::pow(ABS(drag.diff_y), 1.8) * SIGN(drag.diff_y);
+			double diff_y = -0.01 * Math::pow(Math::abs(drag.diff_y), 1.8) * SIGN(drag.diff_y);
 			use_custom_arrow_step = false;
 			set_value(CLAMP(drag.base_val + step * diff_y, get_min(), get_max()));
 		} else if (drag.allowed && drag.capture_pos.distance_to(mm->get_position()) > 2) {
@@ -291,9 +360,12 @@ void SpinBox::_line_edit_editing_toggled(bool p_toggled_on) {
 			line_edit->select_all();
 		}
 	} else {
+		accepted = true;
+
 		if (Input::get_singleton()->is_action_pressed("ui_cancel") || line_edit->get_text().is_empty()) {
 			_update_text(); // Revert text if editing was canceled.
 		} else {
+			line_edit->set_text(line_edit->get_text().trim_suffix(".").trim_suffix(","));
 			_update_text(true); // Update text in case value was changed this frame (e.g. on `focus_exited`).
 			_text_submitted(line_edit->get_text());
 		}
@@ -622,7 +694,7 @@ void SpinBox::_bind_methods() {
 }
 
 SpinBox::SpinBox() {
-	line_edit = memnew(LineEdit);
+	line_edit = memnew(SpinBoxLineEdit);
 	line_edit->set_emoji_menu_enabled(false);
 	add_child(line_edit, false, INTERNAL_MODE_FRONT);
 
diff --git a/engine/scene/gui/spin_box.h b/engine/scene/gui/spin_box.h
index 79076d3f..977b1f50 100644
--- a/engine/scene/gui/spin_box.h
+++ b/engine/scene/gui/spin_box.h
@@ -28,18 +28,33 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPIN_BOX_H
-#define SPIN_BOX_H
+#pragma once
 
 #include "scene/gui/line_edit.h"
 #include "scene/gui/range.h"
 #include "scene/main/timer.h"
 
+class SpinBoxLineEdit : public LineEdit {
+	GDCLASS(SpinBoxLineEdit, LineEdit);
+
+protected:
+	void _notification(int p_what);
+
+	static void _bind_methods() {}
+
+	void _accessibility_action_inc(const Variant &p_data);
+	void _accessibility_action_dec(const Variant &p_data);
+
+public:
+	SpinBoxLineEdit() {}
+};
+
 class SpinBox : public Range {
 	GDCLASS(SpinBox, Range);
 
-	LineEdit *line_edit = nullptr;
+	SpinBoxLineEdit *line_edit = nullptr;
 	bool update_on_text_changed = false;
+	bool accepted = true;
 
 	struct SizingCache {
 		int buttons_block_width = 0;
@@ -173,5 +188,3 @@ public:
 
 	SpinBox();
 };
-
-#endif // SPIN_BOX_H
diff --git a/engine/scene/gui/split_container.cpp b/engine/scene/gui/split_container.cpp
index 78d7fea9..1ab37597 100644
--- a/engine/scene/gui/split_container.cpp
+++ b/engine/scene/gui/split_container.cpp
@@ -91,8 +91,59 @@ Control::CursorShape SplitContainerDragger::get_cursor_shape(const Point2 &p_pos
 	return Control::get_cursor_shape(p_pos);
 }
 
+void SplitContainerDragger::_accessibility_action_inc(const Variant &p_data) {
+	SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+
+	if (sc->collapsed || !sc->_get_sortable_child(0) || !sc->_get_sortable_child(1) || !sc->dragging_enabled) {
+		return;
+	}
+	sc->split_offset -= 10;
+	sc->_compute_split_offset(true);
+	sc->queue_sort();
+}
+
+void SplitContainerDragger::_accessibility_action_dec(const Variant &p_data) {
+	SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+
+	if (sc->collapsed || !sc->_get_sortable_child(0) || !sc->_get_sortable_child(1) || !sc->dragging_enabled) {
+		return;
+	}
+	sc->split_offset += 10;
+	sc->_compute_split_offset(true);
+	sc->queue_sort();
+}
+
+void SplitContainerDragger::_accessibility_action_set_value(const Variant &p_data) {
+	SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+
+	if (sc->collapsed || !sc->_get_sortable_child(0) || !sc->_get_sortable_child(1) || !sc->dragging_enabled) {
+		return;
+	}
+	sc->split_offset = p_data;
+	sc->_compute_split_offset(true);
+	sc->queue_sort();
+}
+
 void SplitContainerDragger::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SPLITTER);
+
+			SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
+			if (sc->collapsed || !sc->_get_sortable_child(0) || !sc->_get_sortable_child(1) || !sc->dragging_enabled) {
+				return;
+			}
+			sc->_compute_split_offset(true);
+			DisplayServer::get_singleton()->accessibility_update_set_num_value(ae, sc->split_offset);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &SplitContainerDragger::_accessibility_action_dec));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &SplitContainerDragger::_accessibility_action_inc));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &SplitContainerDragger::_accessibility_action_set_value));
+		} break;
+
 		case NOTIFICATION_MOUSE_ENTER: {
 			mouse_inside = true;
 			SplitContainer *sc = Object::cast_to<SplitContainer>(get_parent());
@@ -124,6 +175,10 @@ void SplitContainerDragger::_notification(int p_what) {
 	}
 }
 
+SplitContainerDragger::SplitContainerDragger() {
+	set_focus_mode(FOCUS_ACCESSIBILITY);
+}
+
 Control *SplitContainer::_get_sortable_child(int p_idx, SortableVisibilityMode p_visibility_mode) const {
 	int idx = 0;
 	for (int i = 0; i < get_child_count(false); i++) {
diff --git a/engine/scene/gui/split_container.h b/engine/scene/gui/split_container.h
index 27599625..13961290 100644
--- a/engine/scene/gui/split_container.h
+++ b/engine/scene/gui/split_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPLIT_CONTAINER_H
-#define SPLIT_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -42,6 +41,10 @@ protected:
 	void _notification(int p_what);
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
+	void _accessibility_action_inc(const Variant &p_data);
+	void _accessibility_action_dec(const Variant &p_data);
+	void _accessibility_action_set_value(const Variant &p_data);
+
 private:
 	bool dragging = false;
 	int drag_from = 0;
@@ -50,6 +53,8 @@ private:
 
 public:
 	virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const override;
+
+	SplitContainerDragger();
 };
 
 class SplitContainer : public Container {
@@ -157,5 +162,3 @@ public:
 	VSplitContainer() :
 			SplitContainer(true) { is_fixed = true; }
 };
-
-#endif // SPLIT_CONTAINER_H
diff --git a/engine/scene/gui/subviewport_container.h b/engine/scene/gui/subviewport_container.h
index 660f9edf..b253a943 100644
--- a/engine/scene/gui/subviewport_container.h
+++ b/engine/scene/gui/subviewport_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SUBVIEWPORT_CONTAINER_H
-#define SUBVIEWPORT_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 
@@ -77,5 +76,3 @@ public:
 
 	SubViewportContainer();
 };
-
-#endif // SUBVIEWPORT_CONTAINER_H
diff --git a/engine/scene/gui/tab_bar.cpp b/engine/scene/gui/tab_bar.cpp
index 65e3d23c..af279cee 100644
--- a/engine/scene/gui/tab_bar.cpp
+++ b/engine/scene/gui/tab_bar.cpp
@@ -98,6 +98,10 @@ Size2 TabBar::get_minimum_size() const {
 		if (ms.width - ofs > style->get_minimum_size().width) {
 			ms.width -= theme_cache.h_separation;
 		}
+
+		if (i < tabs.size() - 1) {
+			ms.width += theme_cache.tab_separation;
+		}
 	}
 
 	if (clip_tabs) {
@@ -203,6 +207,10 @@ void TabBar::gui_input(const Ref<InputEvent> &p_event) {
 			queue_redraw();
 		}
 
+		if (close_with_middle_mouse && mb->is_pressed() && mb->get_button_index() == MouseButton::MIDDLE) {
+			emit_signal(SNAME("tab_close_pressed"), hover);
+		}
+
 		if (mb->is_pressed() && (mb->get_button_index() == MouseButton::LEFT || (select_with_rmb && mb->get_button_index() == MouseButton::RIGHT))) {
 			Point2 pos = mb->get_position();
 
@@ -347,6 +355,35 @@ void TabBar::_shape(int p_tab) {
 	tabs.write[p_tab].text_buf->add_string(atr(tabs[p_tab].text), theme_cache.font, theme_cache.font_size, tabs[p_tab].language);
 }
 
+RID TabBar::get_tab_accessibility_element(int p_tab) const {
+	RID ae = get_accessibility_element();
+	ERR_FAIL_COND_V(ae.is_null(), RID());
+
+	const Tab &item = tabs[p_tab];
+	if (item.accessibility_item_element.is_null()) {
+		item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TAB);
+		item.accessibility_item_dirty = true;
+	}
+	return item.accessibility_item_element;
+}
+
+RID TabBar::get_focused_accessibility_element() const {
+	if (current == -1) {
+		return get_accessibility_element();
+	} else {
+		const Tab &item = tabs[current];
+		return item.accessibility_item_element;
+	}
+}
+
+void TabBar::_accessibility_action_scroll_into_view(const Variant &p_data, int p_index) {
+	ensure_tab_visible(p_index);
+}
+
+void TabBar::_accessibility_action_focus(const Variant &p_data, int p_index) {
+	set_current_tab(p_index);
+}
+
 void TabBar::_notification(int p_what) {
 	switch (p_what) {
 		case NOTIFICATION_ENTER_TREE: {
@@ -379,6 +416,46 @@ void TabBar::_notification(int p_what) {
 			}
 		} break;
 
+		case NOTIFICATION_EXIT_TREE:
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			for (int i = 0; i < tabs.size(); i++) {
+				tabs.write[i].accessibility_item_element = RID();
+			}
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_TAB_BAR);
+			DisplayServer::get_singleton()->accessibility_update_set_list_item_count(ae, tabs.size());
+
+			for (int i = 0; i < tabs.size(); i++) {
+				const Tab &item = tabs[i];
+
+				if (item.accessibility_item_element.is_null()) {
+					item.accessibility_item_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TAB);
+					item.accessibility_item_dirty = true;
+				}
+
+				if (item.accessibility_item_dirty) {
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &TabBar::_accessibility_action_scroll_into_view).bind(i));
+					DisplayServer::get_singleton()->accessibility_update_add_action(item.accessibility_item_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &TabBar::_accessibility_action_focus).bind(i));
+
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_index(item.accessibility_item_element, i);
+					DisplayServer::get_singleton()->accessibility_update_set_name(item.accessibility_item_element, atr(item.text));
+					DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(item.accessibility_item_element, i == current);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, item.disabled);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(item.accessibility_item_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, item.hidden);
+					DisplayServer::get_singleton()->accessibility_update_set_tooltip(item.accessibility_item_element, item.tooltip);
+
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(item.accessibility_item_element, Rect2(Point2(item.ofs_cache, 0), Size2(item.size_cache, get_size().height)));
+
+					item.accessibility_item_dirty = false;
+				}
+			}
+		} break;
+
 		case NOTIFICATION_LAYOUT_DIRECTION_CHANGED: {
 			queue_redraw();
 		} break;
@@ -389,6 +466,7 @@ void TabBar::_notification(int p_what) {
 				_shape(i);
 			}
 
+			queue_accessibility_update();
 			queue_redraw();
 			update_minimum_size();
 
@@ -430,9 +508,12 @@ void TabBar::_notification(int p_what) {
 			int limit_minus_buttons = size.width - theme_cache.increment_icon->get_width() - theme_cache.decrement_icon->get_width();
 
 			int ofs = tabs[offset].ofs_cache;
+			int tab_separation_offset = 0;
 
 			// Draw unselected tabs in the back.
 			for (int i = offset; i <= max_drawn_tab; i++) {
+				tab_separation_offset = (i - offset) * theme_cache.tab_separation;
+
 				if (tabs[i].hidden) {
 					continue;
 				}
@@ -452,7 +533,7 @@ void TabBar::_notification(int p_what) {
 						col = theme_cache.font_unselected_color;
 					}
 
-					_draw_tab(sb, col, i, rtl ? size.width - ofs - tabs[i].size_cache : ofs, false);
+					_draw_tab(sb, col, i, rtl ? (size.width - ofs - tab_separation_offset - tabs[i].size_cache) : (ofs + tab_separation_offset), false);
 				}
 
 				ofs += tabs[i].size_cache;
@@ -460,8 +541,13 @@ void TabBar::_notification(int p_what) {
 
 			// Draw selected tab in the front, but only if it's visible.
 			if (current >= offset && current <= max_drawn_tab && !tabs[current].hidden) {
+				tab_separation_offset = (current - offset) * theme_cache.tab_separation;
+				if (tab_alignment == ALIGNMENT_LEFT && (current - offset) > 1) {
+					tab_separation_offset = theme_cache.tab_separation;
+				}
+
 				Ref<StyleBox> sb = tabs[current].disabled ? theme_cache.tab_disabled_style : theme_cache.tab_selected_style;
-				float x = rtl ? size.width - tabs[current].ofs_cache - tabs[current].size_cache : tabs[current].ofs_cache;
+				float x = rtl ? (size.width - tabs[current].ofs_cache - tab_separation_offset - tabs[current].size_cache) : (tabs[current].ofs_cache + tab_separation_offset);
 
 				_draw_tab(sb, theme_cache.font_selected_color, current, x, has_focus());
 			}
@@ -499,13 +585,41 @@ void TabBar::_notification(int p_what) {
 			if (dragging_valid_tab) {
 				int x;
 
-				int tab_hover = get_hovered_tab();
-				if (tab_hover != -1) {
-					Rect2 tab_rect = get_tab_rect(tab_hover);
+				int closest_tab = get_closest_tab_idx_to_point(get_local_mouse_position());
+				if (closest_tab != -1) {
+					Rect2 tab_rect = get_tab_rect(closest_tab);
 
-					x = tab_rect.position.x;
-					if (get_local_mouse_position().x > x + tab_rect.size.width / 2) {
-						x += tab_rect.size.width;
+					// Calculate midpoint between tabs.
+					if (rtl) {
+						if (get_local_mouse_position().x > tab_rect.position.x + tab_rect.size.width / 2) {
+							if (closest_tab > 0) { // On right side of closest_tab and not first tab.
+								Rect2 next_tab_rect = get_tab_rect(closest_tab - 1);
+								x = (tab_rect.position.x + tab_rect.size.width + next_tab_rect.position.x) / 2;
+							} else { // First tab, will appear on right edge.
+								x = tab_rect.position.x + tab_rect.size.width;
+							}
+						} else {
+							if (closest_tab < max_drawn_tab) { // On left side of closest_tab and not last tab.
+								Rect2 prev_tab_rect = get_tab_rect(closest_tab + 1);
+								x = (tab_rect.position.x + prev_tab_rect.position.x + prev_tab_rect.size.width) / 2;
+							} else { // Last tab, will appear on left edge.
+								x = tab_rect.position.x;
+							}
+						}
+					} else if (get_local_mouse_position().x > tab_rect.position.x + tab_rect.size.width / 2) {
+						if (closest_tab < max_drawn_tab) { // On right side of closest_tab and not last tab.
+							Rect2 next_tab_rect = get_tab_rect(closest_tab + 1);
+							x = (tab_rect.position.x + tab_rect.size.width + next_tab_rect.position.x) / 2;
+						} else { // Last tab, will appear on right edge.
+							x = tab_rect.position.x + tab_rect.size.width;
+						}
+					} else {
+						if (closest_tab > 0) { // On left side of closest_tab and not first tab.
+							Rect2 prev_tab_rect = get_tab_rect(closest_tab - 1);
+							x = (tab_rect.position.x + prev_tab_rect.position.x + prev_tab_rect.size.width) / 2;
+						} else { // First tab, will appear on left edge.
+							x = tab_rect.position.x;
+						}
 					}
 				} else {
 					if (rtl ^ (get_local_mouse_position().x < get_tab_rect(0).position.x)) {
@@ -632,6 +746,15 @@ void TabBar::set_tab_count(int p_count) {
 	}
 
 	ERR_FAIL_COND(p_count < 0);
+
+	if (tabs.size() > p_count) {
+		for (int i = p_count; i < tabs.size(); i++) {
+			if (tabs[i].accessibility_item_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(tabs.write[i].accessibility_item_element);
+				tabs.write[i].accessibility_item_element = RID();
+			}
+		}
+	}
 	tabs.resize(p_count);
 
 	if (p_count == 0) {
@@ -662,6 +785,7 @@ void TabBar::set_tab_count(int p_count) {
 		}
 	}
 
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 	notify_property_list_changed();
@@ -697,6 +821,7 @@ void TabBar::set_current_tab(int p_current) {
 	if (scroll_to_selected) {
 		ensure_tab_visible(current);
 	}
+	queue_accessibility_update();
 	queue_redraw();
 
 	emit_signal(SNAME("tab_changed"), p_current);
@@ -745,6 +870,7 @@ void TabBar::set_tab_offset(int p_offset) {
 	ERR_FAIL_INDEX(p_offset, tabs.size());
 	offset = p_offset;
 	_update_cache();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -771,6 +897,7 @@ void TabBar::set_tab_title(int p_tab, const String &p_title) {
 	if (scroll_to_selected) {
 		ensure_tab_visible(current);
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 }
@@ -783,6 +910,7 @@ String TabBar::get_tab_title(int p_tab) const {
 void TabBar::set_tab_tooltip(int p_tab, const String &p_tooltip) {
 	ERR_FAIL_INDEX(p_tab, tabs.size());
 	tabs.write[p_tab].tooltip = p_tooltip;
+	queue_accessibility_update();
 }
 
 String TabBar::get_tab_tooltip(int p_tab) const {
@@ -796,7 +924,9 @@ void TabBar::set_tab_text_direction(int p_tab, Control::TextDirection p_text_dir
 
 	if (tabs[p_tab].text_direction != p_text_direction) {
 		tabs.write[p_tab].text_direction = p_text_direction;
+
 		_shape(p_tab);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -811,12 +941,14 @@ void TabBar::set_tab_language(int p_tab, const String &p_language) {
 
 	if (tabs[p_tab].language != p_language) {
 		tabs.write[p_tab].language = p_language;
+
 		_shape(p_tab);
 		_update_cache();
 		_ensure_no_over_offset();
 		if (scroll_to_selected) {
 			ensure_tab_visible(current);
 		}
+		queue_accessibility_update();
 		queue_redraw();
 		update_minimum_size();
 	}
@@ -887,6 +1019,7 @@ void TabBar::set_tab_disabled(int p_tab, bool p_disabled) {
 	if (scroll_to_selected) {
 		ensure_tab_visible(current);
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 }
@@ -910,6 +1043,7 @@ void TabBar::set_tab_hidden(int p_tab, bool p_hidden) {
 	if (scroll_to_selected) {
 		ensure_tab_visible(current);
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 }
@@ -1053,12 +1187,17 @@ void TabBar::_update_cache(bool p_update_hover) {
 		}
 
 		w += tabs[i].size_cache;
+		if ((i - offset) > 0) {
+			w += theme_cache.tab_separation;
+		}
 
 		// Check if all tabs would fit inside the area.
 		if (clip_tabs && i > offset && (w > limit || (offset > 0 && w > limit_minus_buttons))) {
 			tabs.write[i].ofs_cache = 0;
 
 			w -= tabs[i].size_cache;
+			w -= theme_cache.tab_separation;
+
 			max_drawn_tab = i - 1;
 
 			while (w > limit_minus_buttons && max_drawn_tab > offset) {
@@ -1066,11 +1205,14 @@ void TabBar::_update_cache(bool p_update_hover) {
 
 				if (!tabs[max_drawn_tab].hidden) {
 					w -= tabs[max_drawn_tab].size_cache;
+					w -= theme_cache.tab_separation;
 				}
 
 				max_drawn_tab--;
 			}
 		}
+
+		tabs.write[i].accessibility_item_dirty = true;
 	}
 
 	missing_right = max_drawn_tab < tabs.size() - 1;
@@ -1125,6 +1267,7 @@ void TabBar::add_tab(const String &p_str, const Ref<Texture2D> &p_icon) {
 	if (scroll_to_selected) {
 		ensure_tab_visible(current);
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 
@@ -1143,12 +1286,19 @@ void TabBar::clear_tabs() {
 		return;
 	}
 
+	for (int i = 0; i < tabs.size(); i++) {
+		if (tabs[i].accessibility_item_element.is_valid()) {
+			DisplayServer::get_singleton()->accessibility_free_element(tabs.write[i].accessibility_item_element);
+			tabs.write[i].accessibility_item_element = RID();
+		}
+	}
 	tabs.clear();
 	offset = 0;
 	max_drawn_tab = 0;
 	current = -1;
 	previous = -1;
 
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 	notify_property_list_changed();
@@ -1156,6 +1306,11 @@ void TabBar::clear_tabs() {
 
 void TabBar::remove_tab(int p_idx) {
 	ERR_FAIL_INDEX(p_idx, tabs.size());
+
+	if (tabs[p_idx].accessibility_item_element.is_valid()) {
+		DisplayServer::get_singleton()->accessibility_free_element(tabs.write[p_idx].accessibility_item_element);
+		tabs.write[p_idx].accessibility_item_element = RID();
+	}
 	tabs.remove_at(p_idx);
 
 	bool is_tab_changing = current == p_idx;
@@ -1205,6 +1360,7 @@ void TabBar::remove_tab(int p_idx) {
 		}
 	}
 
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 	notify_property_list_changed();
@@ -1238,7 +1394,7 @@ void TabBar::drop_data(const Point2 &p_point, const Variant &p_data) {
 }
 
 Variant TabBar::_handle_get_drag_data(const String &p_type, const Point2 &p_point) {
-	int tab_over = get_tab_idx_at_point(p_point);
+	int tab_over = (p_point == Vector2(Math::INF, Math::INF)) ? current : get_tab_idx_at_point(p_point);
 	if (tab_over < 0) {
 		return Variant();
 	}
@@ -1303,7 +1459,7 @@ void TabBar::_handle_drop_data(const String &p_type, const Point2 &p_point, cons
 
 	if (String(d["type"]) == p_type) {
 		int tab_from_id = d["tab_index"];
-		int hover_now = get_tab_idx_at_point(p_point);
+		int hover_now = (p_point == Vector2(Math::INF, Math::INF)) ? current : get_closest_tab_idx_to_point(p_point);
 		NodePath from_path = d["from_path"];
 		NodePath to_path = get_path();
 
@@ -1361,6 +1517,8 @@ void TabBar::_handle_drop_data(const String &p_type, const Point2 &p_point, cons
 
 void TabBar::_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index) {
 	Tab moving_tab = p_from_tabbar->tabs[p_from_index];
+	moving_tab.accessibility_item_element = RID();
+	moving_tab.accessibility_item_dirty = true;
 	p_from_tabbar->remove_tab(p_from_index);
 	tabs.insert(p_to_index, moving_tab);
 
@@ -1380,6 +1538,7 @@ void TabBar::_move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_in
 		queue_redraw();
 	}
 
+	queue_accessibility_update();
 	update_minimum_size();
 }
 
@@ -1398,6 +1557,24 @@ int TabBar::get_tab_idx_at_point(const Point2 &p_point) const {
 	return hover_now;
 }
 
+int TabBar::get_closest_tab_idx_to_point(const Point2 &p_point) const {
+	int closest_tab = get_tab_idx_at_point(p_point); // See if we're hovering over a tab first.
+
+	if (closest_tab == -1) { // Didn't find a tab, so get the closest one.
+		float closest_distance = FLT_MAX;
+		for (int i = offset; i <= max_drawn_tab; i++) {
+			Vector2 center = get_tab_rect(i).get_center();
+			float distance = center.distance_to(p_point);
+			if (distance < closest_distance) {
+				closest_distance = distance;
+				closest_tab = i;
+			}
+		}
+	}
+
+	return closest_tab;
+}
+
 void TabBar::set_tab_alignment(AlignmentMode p_alignment) {
 	ERR_FAIL_INDEX(p_alignment, ALIGNMENT_MAX);
 
@@ -1451,6 +1628,8 @@ void TabBar::move_tab(int p_from, int p_to) {
 	ERR_FAIL_INDEX(p_to, tabs.size());
 
 	Tab tab_from = tabs[p_from];
+	tab_from.accessibility_item_dirty = true;
+
 	tabs.remove_at(p_from);
 	tabs.insert(p_to, tab_from);
 
@@ -1475,6 +1654,7 @@ void TabBar::move_tab(int p_from, int p_to) {
 	if (scroll_to_selected) {
 		ensure_tab_visible(current);
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	notify_property_list_changed();
 }
@@ -1647,11 +1827,23 @@ void TabBar::ensure_tab_visible(int p_idx) {
 
 Rect2 TabBar::get_tab_rect(int p_tab) const {
 	ERR_FAIL_INDEX_V(p_tab, tabs.size(), Rect2());
-	if (is_layout_rtl()) {
-		return Rect2(get_size().width - tabs[p_tab].ofs_cache - tabs[p_tab].size_cache, 0, tabs[p_tab].size_cache, get_size().height);
-	} else {
-		return Rect2(tabs[p_tab].ofs_cache, 0, tabs[p_tab].size_cache, get_size().height);
+	int tab_separation_offset = (p_tab - offset) * theme_cache.tab_separation;
+	if (tab_alignment == ALIGNMENT_LEFT && (p_tab - offset) > 1) {
+		tab_separation_offset = theme_cache.tab_separation;
 	}
+	if (is_layout_rtl()) {
+		return Rect2(get_size().width - tabs[p_tab].ofs_cache - tab_separation_offset - tabs[p_tab].size_cache, 0, tabs[p_tab].size_cache, get_size().height);
+	} else {
+		return Rect2(tabs[p_tab].ofs_cache + tab_separation_offset, 0, tabs[p_tab].size_cache, get_size().height);
+	}
+}
+
+void TabBar::set_close_with_middle_mouse(bool p_scroll_close) {
+	close_with_middle_mouse = p_scroll_close;
+}
+
+bool TabBar::get_close_with_middle_mouse() const {
+	return close_with_middle_mouse;
 }
 
 void TabBar::set_tab_close_display_policy(CloseButtonDisplayPolicy p_policy) {
@@ -1795,6 +1987,8 @@ void TabBar::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("ensure_tab_visible", "idx"), &TabBar::ensure_tab_visible);
 	ClassDB::bind_method(D_METHOD("get_tab_rect", "tab_idx"), &TabBar::get_tab_rect);
 	ClassDB::bind_method(D_METHOD("move_tab", "from", "to"), &TabBar::move_tab);
+	ClassDB::bind_method(D_METHOD("set_close_with_middle_mouse", "enabled"), &TabBar::set_close_with_middle_mouse);
+	ClassDB::bind_method(D_METHOD("get_close_with_middle_mouse"), &TabBar::get_close_with_middle_mouse);
 	ClassDB::bind_method(D_METHOD("set_tab_close_display_policy", "policy"), &TabBar::set_tab_close_display_policy);
 	ClassDB::bind_method(D_METHOD("get_tab_close_display_policy"), &TabBar::get_tab_close_display_policy);
 	ClassDB::bind_method(D_METHOD("set_max_tab_width", "width"), &TabBar::set_max_tab_width);
@@ -1825,6 +2019,7 @@ void TabBar::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "current_tab", PROPERTY_HINT_RANGE, "-1,4096,1"), "set_current_tab", "get_current_tab");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "tab_alignment", PROPERTY_HINT_ENUM, "Left,Center,Right"), "set_tab_alignment", "get_tab_alignment");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "clip_tabs"), "set_clip_tabs", "get_clip_tabs");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "close_with_middle_mouse"), "set_close_with_middle_mouse", "get_close_with_middle_mouse");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "tab_close_display_policy", PROPERTY_HINT_ENUM, "Show Never,Show Active Only,Show Always"), "set_tab_close_display_policy", "get_tab_close_display_policy");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "max_tab_width", PROPERTY_HINT_RANGE, "0,99999,1,suffix:px"), "set_max_tab_width", "get_max_tab_width");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "scrolling_enabled"), "set_scrolling_enabled", "get_scrolling_enabled");
@@ -1847,6 +2042,7 @@ void TabBar::_bind_methods() {
 	BIND_ENUM_CONSTANT(CLOSE_BUTTON_MAX);
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, TabBar, h_separation);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, TabBar, tab_separation);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, TabBar, icon_max_width);
 
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, TabBar, tab_unselected_style, "tab_unselected");
@@ -1888,6 +2084,7 @@ void TabBar::_bind_methods() {
 }
 
 TabBar::TabBar() {
+	set_focus_mode(FOCUS_ACCESSIBILITY);
 	set_size(Size2(get_size().width, get_minimum_size().height));
 	set_focus_mode(FOCUS_ALL);
 	connect(SceneStringName(mouse_exited), callable_mp(this, &TabBar::_on_mouse_exited));
diff --git a/engine/scene/gui/tab_bar.h b/engine/scene/gui/tab_bar.h
index f5ae75de..158f2aab 100644
--- a/engine/scene/gui/tab_bar.h
+++ b/engine/scene/gui/tab_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TAB_BAR_H
-#define TAB_BAR_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/property_list_helper.h"
@@ -55,6 +54,9 @@ public:
 
 private:
 	struct Tab {
+		mutable RID accessibility_item_element;
+		mutable bool accessibility_item_dirty = true;
+
 		String text;
 		String tooltip;
 
@@ -108,6 +110,7 @@ private:
 	int cb_hover = -1;
 	bool cb_pressing = false;
 	CloseButtonDisplayPolicy cb_displaypolicy = CLOSE_BUTTON_SHOW_NEVER;
+	bool close_with_middle_mouse = true;
 
 	int hover = -1; // Hovered tab.
 	int max_width = 0;
@@ -127,6 +130,7 @@ private:
 
 	struct ThemeCache {
 		int h_separation = 0;
+		int tab_separation = 0;
 		int icon_max_width = 0;
 
 		Ref<StyleBox> tab_unselected_style;
@@ -170,6 +174,9 @@ private:
 	void _shape(int p_tab);
 	void _draw_tab(Ref<StyleBox> &p_tab_style, Color &p_font_color, int p_index, float p_x, bool p_focus);
 
+	void _accessibility_action_scroll_into_view(const Variant &p_data, int p_index);
+	void _accessibility_action_focus(const Variant &p_data, int p_index);
+
 protected:
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 	virtual String get_tooltip(const Point2 &p_pos) const override;
@@ -188,6 +195,9 @@ protected:
 	void _move_tab_from(TabBar *p_from_tabbar, int p_from_index, int p_to_index);
 
 public:
+	RID get_tab_accessibility_element(int p_tab) const;
+	virtual RID get_focused_accessibility_element() const override;
+
 	Variant _handle_get_drag_data(const String &p_type, const Point2 &p_point);
 	bool _handle_can_drop_data(const String &p_type, const Point2 &p_point, const Variant &p_data) const;
 	void _handle_drop_data(const String &p_type, const Point2 &p_point, const Variant &p_data, const Callable &p_move_tab_callback, const Callable &p_move_tab_from_other_callback);
@@ -225,6 +235,7 @@ public:
 	Ref<Texture2D> get_tab_button_icon(int p_tab) const;
 
 	int get_tab_idx_at_point(const Point2 &p_point) const;
+	int get_closest_tab_idx_to_point(const Point2 &p_point) const;
 
 	void set_tab_alignment(AlignmentMode p_alignment);
 	AlignmentMode get_tab_alignment() const;
@@ -239,6 +250,9 @@ public:
 	void set_tab_close_display_policy(CloseButtonDisplayPolicy p_policy);
 	CloseButtonDisplayPolicy get_tab_close_display_policy() const;
 
+	void set_close_with_middle_mouse(bool p_scroll_close);
+	bool get_close_with_middle_mouse() const;
+
 	void set_tab_count(int p_count);
 	int get_tab_count() const;
 
@@ -288,5 +302,3 @@ public:
 
 VARIANT_ENUM_CAST(TabBar::AlignmentMode);
 VARIANT_ENUM_CAST(TabBar::CloseButtonDisplayPolicy);
-
-#endif // TAB_BAR_H
diff --git a/engine/scene/gui/tab_container.cpp b/engine/scene/gui/tab_container.cpp
index c43d0c5d..3c8921f7 100644
--- a/engine/scene/gui/tab_container.cpp
+++ b/engine/scene/gui/tab_container.cpp
@@ -142,6 +142,45 @@ void TabContainer::gui_input(const Ref<InputEvent> &p_event) {
 
 void TabContainer::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			tab_panels.clear();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			int tab_index = 0;
+			int tab_cur = tab_bar->get_current_tab();
+			for (int i = 0; i < get_child_count(); i++) {
+				Node *child_node = get_child(i);
+				Window *child_wnd = Object::cast_to<Window>(child_node);
+				if (child_wnd && !child_wnd->is_embedded()) {
+					continue;
+				}
+				if (child_node->is_part_of_edited_scene()) {
+					continue;
+				}
+				Control *control = as_sortable_control(child_node, SortableVisibilityMode::IGNORE);
+				if (!control || control == tab_bar || children_removing.has(control)) {
+					DisplayServer::get_singleton()->accessibility_update_add_child(ae, child_node->get_accessibility_element());
+				} else {
+					if (!tab_panels.has(child_node)) {
+						tab_panels[child_node] = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TAB_PANEL);
+					}
+					RID panel = tab_panels[child_node];
+					RID tab = tab_bar->get_tab_accessibility_element(tab_index);
+
+					DisplayServer::get_singleton()->accessibility_update_add_related_controls(tab, panel);
+					DisplayServer::get_singleton()->accessibility_update_add_related_labeled_by(panel, tab);
+					DisplayServer::get_singleton()->accessibility_update_set_flag(panel, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, tab_index != tab_cur);
+					DisplayServer::get_singleton()->accessibility_update_add_child(panel, child_node->get_accessibility_element());
+
+					tab_index++;
+				}
+			}
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			// If some nodes happen to be renamed outside the tree, the tab names need to be updated manually.
 			if (get_tab_count() > 0) {
@@ -247,6 +286,7 @@ void TabContainer::_on_theme_changed() {
 	tab_bar->add_theme_font_size_override(SceneStringName(font_size), theme_cache.tab_font_size);
 
 	tab_bar->add_theme_constant_override(SNAME("h_separation"), theme_cache.icon_separation);
+	tab_bar->add_theme_constant_override(SNAME("tab_separation"), theme_cache.tab_separation);
 	tab_bar->add_theme_constant_override(SNAME("icon_max_width"), theme_cache.icon_max_width);
 	tab_bar->add_theme_constant_override(SNAME("outline_size"), theme_cache.outline_size);
 
@@ -555,6 +595,7 @@ void TabContainer::add_child_notify(Node *p_child) {
 	if (get_tab_count() == 1) {
 		queue_redraw();
 	}
+	queue_accessibility_update();
 
 	p_child->connect("renamed", callable_mp(this, &TabContainer::_refresh_tab_names));
 	p_child->connect(SceneStringName(visibility_changed), callable_mp(this, &TabContainer::_on_tab_visibility_changed).bind(c));
@@ -578,11 +619,17 @@ void TabContainer::move_child_notify(Node *p_child) {
 	}
 
 	_refresh_tab_indices();
+	queue_accessibility_update();
 }
 
 void TabContainer::remove_child_notify(Node *p_child) {
 	Container::remove_child_notify(p_child);
 
+	if (tab_panels.has(p_child)) {
+		DisplayServer::get_singleton()->accessibility_free_element(tab_panels[p_child]);
+		tab_panels.erase(p_child);
+	}
+
 	if (p_child == tab_bar) {
 		return;
 	}
@@ -606,6 +653,7 @@ void TabContainer::remove_child_notify(Node *p_child) {
 	if (get_tab_count() == 0) {
 		queue_redraw();
 	}
+	queue_accessibility_update();
 
 	p_child->remove_meta("_tab_index");
 	p_child->remove_meta("_tab_name");
@@ -725,7 +773,7 @@ void TabContainer::set_tab_focus_mode(Control::FocusMode p_focus_mode) {
 }
 
 Control::FocusMode TabContainer::get_tab_focus_mode() const {
-	return tab_bar->get_focus_mode();
+	return tab_bar->get_focus_mode_with_recursive();
 }
 
 void TabContainer::set_clip_tabs(bool p_clip_tabs) {
@@ -761,7 +809,6 @@ void TabContainer::set_all_tabs_in_front(bool p_in_front) {
 
 	remove_child(tab_bar);
 	add_child(tab_bar, false, all_tabs_in_front ? INTERNAL_MODE_FRONT : INTERNAL_MODE_BACK);
-	tab_bar->force_parent_owned();
 }
 
 bool TabContainer::is_all_tabs_in_front() const {
@@ -951,7 +998,7 @@ void TabContainer::set_popup(Node *p_popup) {
 
 Popup *TabContainer::get_popup() const {
 	if (popup_obj_id.is_valid()) {
-		Popup *popup = Object::cast_to<Popup>(ObjectDB::get_instance(popup_obj_id));
+		Popup *popup = ObjectDB::get_instance<Popup>(popup_obj_id);
 		if (popup) {
 			return popup;
 		} else {
@@ -1078,6 +1125,7 @@ void TabContainer::_bind_methods() {
 	BIND_ENUM_CONSTANT(POSITION_MAX);
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, TabContainer, side_margin);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_CONSTANT, TabContainer, tab_separation);
 
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, TabContainer, panel_style, "panel");
 	BIND_THEME_ITEM_CUSTOM(Theme::DATA_TYPE_STYLEBOX, TabContainer, tabbar_style, "tabbar_background");
diff --git a/engine/scene/gui/tab_container.h b/engine/scene/gui/tab_container.h
index e00bc780..7a392cb6 100644
--- a/engine/scene/gui/tab_container.h
+++ b/engine/scene/gui/tab_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TAB_CONTAINER_H
-#define TAB_CONTAINER_H
+#pragma once
 
 #include "scene/gui/container.h"
 #include "scene/gui/popup.h"
@@ -71,6 +70,7 @@ private:
 
 		// TabBar overrides.
 		int icon_separation = 0;
+		int tab_separation = 0;
 		int icon_max_width = 0;
 		int outline_size = 0;
 
@@ -97,6 +97,8 @@ private:
 		int tab_font_size;
 	} theme_cache;
 
+	HashMap<Node *, RID> tab_panels;
+
 	int _get_tab_height() const;
 	Vector<Control *> _get_tab_controls() const;
 	void _on_theme_changed();
@@ -129,6 +131,8 @@ protected:
 	static void _bind_methods();
 
 public:
+	virtual bool accessibility_override_tree_hierarchy() const override { return true; }
+
 	TabBar *get_tab_bar() const;
 
 	int get_tab_idx_at_point(const Point2 &p_point) const;
@@ -211,5 +215,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(TabContainer::TabPosition);
-
-#endif // TAB_CONTAINER_H
diff --git a/engine/scene/gui/text_edit.cpp b/engine/scene/gui/text_edit.cpp
index ad220231..8eb6fc5a 100644
--- a/engine/scene/gui/text_edit.cpp
+++ b/engine/scene/gui/text_edit.cpp
@@ -181,6 +181,36 @@ const Ref<TextParagraph> TextEdit::Text::get_line_data(int p_line) const {
 	return text[p_line].data_buf;
 }
 
+float TextEdit::Text::get_indent_offset(int p_line, bool p_rtl) const {
+	ERR_FAIL_INDEX_V(p_line, text.size(), 0);
+	Line &text_line = text.write[p_line];
+	if (text_line.indent_ofs < 0.0) {
+		int char_count = 0;
+		int line_length = text_line.data.size();
+		for (int i = 0; i < line_length - 1; i++) {
+			if (text_line.data[i] == '\t') {
+				char_count++;
+			} else if (text_line.data[i] == ' ') {
+				char_count++;
+			} else {
+				break;
+			}
+		}
+		RID text_rid = text_line.data_buf->get_line_rid(0);
+		float offset = (p_rtl) ? TS->shaped_text_get_size(text_rid).x : 0;
+		Vector<Vector2> sel = TS->shaped_text_get_selection(text_rid, 0, char_count);
+		for (const Vector2 v : sel) {
+			if (p_rtl) {
+				offset = MIN(v.x, MIN(v.y, offset));
+			} else {
+				offset = MAX(v.x, MAX(v.y, offset));
+			}
+		}
+		text_line.indent_ofs = (p_rtl) ? TS->shaped_text_get_size(text_rid).x - offset : offset;
+	}
+	return text_line.indent_ofs;
+}
+
 _FORCE_INLINE_ String TextEdit::Text::operator[](int p_line) const {
 	ERR_FAIL_INDEX_V(p_line, text.size(), "");
 	return text[p_line].data;
@@ -194,9 +224,35 @@ _FORCE_INLINE_ const String &TextEdit::Text::get_text_with_ime(int p_line) const
 	}
 }
 
+const Vector<RID> TextEdit::Text::get_accessibility_elements(int p_line) {
+	ERR_FAIL_INDEX_V(p_line, text.size(), Vector<RID>());
+
+	return text[p_line].accessibility_text_root_element;
+}
+
+void TextEdit::Text::update_accessibility(int p_line, RID p_root) {
+	ERR_FAIL_INDEX(p_line, text.size());
+
+	Line &l = text.write[p_line];
+	if (l.accessibility_text_root_element.is_empty()) {
+		for (int i = 0; i < l.data_buf->get_line_count(); i++) {
+			RID rid = DisplayServer::get_singleton()->accessibility_create_sub_text_edit_elements(p_root, l.data_buf->get_line_rid(i), max_line_height, p_line);
+			l.accessibility_text_root_element.push_back(rid);
+		}
+	}
+}
+
 void TextEdit::Text::invalidate_cache(int p_line, bool p_text_changed) {
 	ERR_FAIL_INDEX(p_line, text.size());
 
+	Line &l = text.write[p_line];
+	for (const RID rid : l.accessibility_text_root_element) {
+		if (rid.is_valid()) {
+			DisplayServer::get_singleton()->accessibility_free_element(rid);
+		}
+	}
+	l.accessibility_text_root_element.clear();
+
 	if (font.is_null()) {
 		return; // Not in tree?
 	}
@@ -216,6 +272,7 @@ void TextEdit::Text::invalidate_cache(int p_line, bool p_text_changed) {
 	text_line.data_buf->set_break_flags(flags);
 	text_line.data_buf->set_preserve_control(draw_control_chars);
 	text_line.data_buf->set_custom_punctuation(get_enabled_word_separators());
+	text_line.indent_ofs = -1.0;
 
 	const String &text_with_ime = (!text_line.ime_data.is_empty()) ? text_line.ime_data : text_line.data;
 	const Array &bidi_override_with_ime = (!text_line.ime_data.is_empty()) ? text_line.ime_bidi_override : text_line.bidi_override;
@@ -533,8 +590,173 @@ String TextEdit::Text::get_enabled_word_separators() const {
 ///                            TEXT EDIT                                    ///
 ///////////////////////////////////////////////////////////////////////////////
 
+void TextEdit::_accessibility_action_set_selection(const Variant &p_data) {
+	Dictionary new_selection = p_data;
+	RID sel_start = new_selection["start_element"];
+	Vector2i sel_start_line = DisplayServer::get_singleton()->accessibility_element_get_meta(sel_start);
+	int sel_start_pos = new_selection["start_char"];
+
+	RID sel_end = new_selection["end_element"];
+	Vector2i sel_end_line = DisplayServer::get_singleton()->accessibility_element_get_meta(sel_end);
+	int sel_end_pos = new_selection["end_char"];
+
+	remove_secondary_carets();
+	select(sel_start_line.x, sel_start_pos, sel_end_line.x, sel_end_pos, 0);
+}
+
+void TextEdit::_accessibility_action_replace_selected(const Variant &p_data) {
+	String new_text = p_data;
+	insert_text_at_caret(new_text);
+}
+
+void TextEdit::_accessibility_action_set_value(const Variant &p_data) {
+	String new_text = p_data;
+	set_text(new_text);
+}
+
+void TextEdit::_accessibility_action_menu(const Variant &p_data) {
+	if (context_menu_enabled) {
+		_update_context_menu();
+		adjust_viewport_to_caret();
+		menu->set_position(get_screen_position() + get_caret_draw_pos());
+		menu->reset_size();
+		menu->popup();
+		menu->grab_focus();
+	}
+}
+
+void TextEdit::_accessibility_scroll_down(const Variant &p_data) {
+	v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
+	queue_accessibility_update();
+}
+
+void TextEdit::_accessibility_scroll_left(const Variant &p_data) {
+	h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
+	queue_accessibility_update();
+}
+
+void TextEdit::_accessibility_scroll_right(const Variant &p_data) {
+	h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
+	queue_accessibility_update();
+}
+
+void TextEdit::_accessibility_scroll_up(const Variant &p_data) {
+	v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
+	queue_accessibility_update();
+}
+
+void TextEdit::_accessibility_scroll_set(const Variant &p_data) {
+	const Point2 &pos = p_data;
+	h_scroll->set_value(pos.x);
+	v_scroll->set_value(pos.y);
+	queue_accessibility_update();
+}
+
+void TextEdit::_accessibility_action_scroll_into_view(const Variant &p_data, int p_line, int p_wrap) {
+	double delta = get_scroll_pos_for_line(p_line, p_wrap) - get_v_scroll();
+	if (delta < 0) {
+		_scroll_up(-delta, false);
+	} else {
+		_scroll_down(delta, false);
+	}
+}
+
 void TextEdit::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_EXIT_TREE:
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			text.clear_accessibility();
+			accessibility_text_root_element_nl = RID();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_MULTILINE_TEXT_FIELD);
+			if (text.size() == 1 && text[0].is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_placeholder(ae, atr(placeholder_text));
+			}
+			if (!placeholder_text.is_empty() && get_accessibility_name().is_empty()) {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, atr(placeholder_text));
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_READONLY, !editable);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_TEXT_SELECTION, callable_mp(this, &TextEdit::_accessibility_action_set_selection));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_REPLACE_SELECTED_TEXT, callable_mp(this, &TextEdit::_accessibility_action_replace_selected));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &TextEdit::_accessibility_action_set_value));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SHOW_CONTEXT_MENU, callable_mp(this, &TextEdit::_accessibility_action_menu));
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &TextEdit::_accessibility_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &TextEdit::_accessibility_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &TextEdit::_accessibility_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &TextEdit::_accessibility_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &TextEdit::_accessibility_scroll_set));
+
+			int first_vis_line = get_first_visible_line();
+			int row_height = get_line_height();
+			int xmargin_beg = theme_cache.style_normal->get_margin(SIDE_LEFT) + gutters_width + gutter_padding;
+			Size2 size = get_size();
+			bool rtl = is_layout_rtl();
+			int lines_drawn = 0;
+
+			RID selection_start;
+			RID selection_end;
+
+			for (int i = 0; i < text.size(); i++) {
+				text.update_accessibility(i, ae);
+				const Ref<TextParagraph> &ac_buf = text.get_line_data(i);
+				const Vector<RID> &text_aes = text.get_accessibility_elements(i);
+				for (int j = 0; j < text_aes.size(); j++) {
+					float text_off_x = 0.0;
+					float text_off_y = 0.0;
+					if (!editable) {
+						text_off_x = theme_cache.style_readonly->get_offset().x / 2;
+						text_off_x -= theme_cache.style_normal->get_offset().x / 2;
+						text_off_y = theme_cache.style_readonly->get_offset().y / 2;
+					} else {
+						text_off_y = theme_cache.style_normal->get_offset().y / 2;
+					}
+
+					text_off_y += (lines_drawn + j) * row_height + theme_cache.line_spacing / 2;
+					text_off_y -= (first_vis_line + first_visible_line_wrap_ofs) * row_height;
+					text_off_y -= _get_v_scroll_offset() * row_height;
+
+					int char_margin = xmargin_beg - first_visible_col;
+					if (rtl) {
+						char_margin = size.width - char_margin - ac_buf->get_line_width(j);
+					}
+
+					DisplayServer::get_singleton()->accessibility_update_set_flag(text_aes[j], DisplayServer::AccessibilityFlags::FLAG_HIDDEN, _is_line_hidden(i));
+					Transform2D tr;
+					tr.set_origin(Point2(char_margin + text_off_x, text_off_y));
+					DisplayServer::get_singleton()->accessibility_update_set_transform(text_aes[j], tr);
+					DisplayServer::get_singleton()->accessibility_update_set_name(text_aes[j], vformat(RTR("Line %d"), i));
+					DisplayServer::get_singleton()->accessibility_element_set_meta(text_aes[j], Vector2i(i, j));
+					DisplayServer::get_singleton()->accessibility_update_add_action(text_aes[j], DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &TextEdit::_accessibility_action_scroll_into_view).bind(i, j));
+				}
+				lines_drawn += ac_buf->get_line_count();
+			}
+			if (accessibility_text_root_element_nl.is_null()) {
+				accessibility_text_root_element_nl = DisplayServer::get_singleton()->accessibility_create_sub_text_edit_elements(ae, RID(), get_line_height());
+			}
+
+			// Selection.
+			if (carets.size() > 0) {
+				if (carets[0].selection.active) {
+					int start_wrap = get_line_wrap_index_at_column(carets[0].selection.origin_line, carets[0].selection.origin_column);
+					RID start_rid = text.get_accessibility_elements(carets[0].selection.origin_line)[start_wrap];
+
+					int end_wrap = get_line_wrap_index_at_column(carets[0].line, carets[0].column);
+					RID end_rid = text.get_accessibility_elements(carets[0].line)[end_wrap];
+					DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, start_rid, carets[0].selection.origin_column, end_rid, carets[0].column);
+				} else {
+					int caret_wrap = get_line_wrap_index_at_column(carets[0].line, carets[0].column);
+					RID caret_rid = text.get_accessibility_elements(carets[0].line)[caret_wrap];
+					DisplayServer::get_singleton()->accessibility_update_set_text_selection(ae, caret_rid, carets[0].column, caret_rid, carets[0].column);
+				}
+			}
+		} break;
+
 		case NOTIFICATION_POSTINITIALIZE: {
 			_update_caches();
 		} break;
@@ -821,7 +1043,7 @@ void TextEdit::_notification(int p_what) {
 			}
 
 			int first_vis_line = get_first_visible_line() - 1;
-			int draw_amount = visible_rows + (smooth_scroll_enabled ? 1 : 0);
+			int draw_amount = visible_rows + 1;
 			draw_amount += draw_placeholder ? placeholder_wrapped_rows.size() - 1 : get_line_wrap_count(first_vis_line + 1);
 
 			// Draw minimap.
@@ -884,12 +1106,10 @@ void TextEdit::_notification(int p_what) {
 
 					Color line_background_color = text.get_line_background_color(minimap_line);
 
-					if (line_background_color != theme_cache.background_color) {
-						// Make non-default background colors more visible, such as error markers.
-						line_background_color.a = 1.0;
-					} else {
-						line_background_color.a *= 0.6;
-					}
+					// Make non-default background colors more visible, such as error markers.
+					// If a line background color is being applied, like in an error marker, the alpha is set to 1.0.
+					// Else, it stays zero.
+					line_background_color.a = 1.0 * (line_background_color != Color(0, 0, 0, 0));
 
 					Color current_color = editable ? theme_cache.font_color : theme_cache.font_readonly_color;
 
@@ -897,6 +1117,12 @@ void TextEdit::_notification(int p_what) {
 					int line_wrap_amount = get_line_wrap_count(minimap_line);
 					int last_wrap_column = 0;
 
+					int first_indent_line = 0;
+					float wrap_indent_line = 0.0;
+					if (text.is_indent_wrapped_lines()) {
+						wrap_indent_line = _get_wrapped_indent_level(minimap_line, first_indent_line);
+						wrap_indent_line = MIN(wrap_indent_line, (minimap_width / minimap_char_size.x) * 0.6);
+					}
 					for (int line_wrap_index = 0; line_wrap_index < line_wrap_amount + 1; line_wrap_index++) {
 						if (line_wrap_index != 0) {
 							i++;
@@ -906,7 +1132,7 @@ void TextEdit::_notification(int p_what) {
 						}
 
 						const String &str = wrap_rows[line_wrap_index];
-						int indent_px = line_wrap_index != 0 ? get_indent_level(minimap_line) : 0;
+						int indent_px = line_wrap_index > first_indent_line ? wrap_indent_line : 0.0;
 						if (indent_px >= wrap_at_column) {
 							indent_px = 0;
 						}
@@ -1054,6 +1280,11 @@ void TextEdit::_notification(int p_what) {
 				const Vector<String> wrap_rows = draw_placeholder ? placeholder_wrapped_rows : get_line_wrapped_text(line);
 				int line_wrap_amount = draw_placeholder ? placeholder_wrapped_rows.size() - 1 : get_line_wrap_count(line);
 
+				int first_indent_line = 0;
+				if (text.is_indent_wrapped_lines()) {
+					_get_wrapped_indent_level(line, first_indent_line);
+				}
+				float indent_ofs = MIN(text.get_indent_offset(line, rtl), wrap_at_column * 0.6);
 				for (int line_wrap_index = 0; line_wrap_index <= line_wrap_amount; line_wrap_index++) {
 					if (line_wrap_index != 0) {
 						i++;
@@ -1185,7 +1416,7 @@ void TextEdit::_notification(int p_what) {
 					// Draw line.
 					RID rid = ldata->get_line_rid(line_wrap_index);
 					float text_height = TS->shaped_text_get_size(rid).y;
-					float wrap_indent = (text.is_indent_wrapped_lines() && line_wrap_index > 0) ? get_indent_level(line) * theme_cache.font->get_char_size(' ', theme_cache.font_size).width : 0.0;
+					float wrap_indent = line_wrap_index > first_indent_line ? indent_ofs : 0.0;
 
 					if (rtl) {
 						char_margin = size.width - char_margin - (TS->shaped_text_get_size(rid).x + wrap_indent);
@@ -1654,6 +1885,8 @@ void TextEdit::_notification(int p_what) {
 
 				_update_ime_text();
 				adjust_viewport_to_caret(0);
+
+				queue_accessibility_update();
 				queue_redraw();
 			}
 		} break;
@@ -1714,13 +1947,14 @@ void TextEdit::unhandled_key_input(const Ref<InputEvent> &p_event) {
 bool TextEdit::alt_input(const Ref<InputEvent> &p_gui_input) {
 	Ref<InputEventKey> k = p_gui_input;
 	if (k.is_valid()) {
-		// Start Unicode input (hold).
+		// Start Unicode Alt input (hold).
 		if (k->is_alt_pressed() && k->get_keycode() == Key::KP_ADD && !alt_start && !alt_start_no_hold) {
 			if (has_selection()) {
 				delete_selection();
 			}
 			alt_start = true;
 			alt_code = 0;
+			alt_mode = ALT_INPUT_UNICODE;
 			ime_text = "u";
 			ime_selection = Vector2i(0, -1);
 			_update_ime_text();
@@ -1734,43 +1968,104 @@ bool TextEdit::alt_input(const Ref<InputEvent> &p_gui_input) {
 			}
 			alt_start_no_hold = true;
 			alt_code = 0;
+			alt_mode = ALT_INPUT_UNICODE;
 			ime_text = "u";
 			ime_selection = Vector2i(0, -1);
 			_update_ime_text();
 			return true;
 		}
 
+		// Start OEM Alt input (hold).
+		if (k->is_alt_pressed() && k->get_keycode() >= Key::KP_1 && k->get_keycode() <= Key::KP_9 && !alt_start && !alt_start_no_hold) {
+			if (has_selection()) {
+				delete_selection();
+			}
+			alt_start = true;
+			alt_code = (uint32_t)(k->get_keycode() - Key::KP_0);
+			alt_mode = ALT_INPUT_OEM;
+			ime_text = vformat("o%s", String::num_int64(alt_code, 10));
+			ime_selection = Vector2i(0, -1);
+			_update_ime_text();
+			return true;
+		}
+
+		// Start Windows Alt input (hold).
+		if (k->is_alt_pressed() && k->get_keycode() == Key::KP_0 && !alt_start && !alt_start_no_hold) {
+			if (has_selection()) {
+				delete_selection();
+			}
+			alt_start = true;
+			alt_mode = ALT_INPUT_WIN;
+			alt_code = 0;
+			ime_text = "w";
+			ime_selection = Vector2i(0, -1);
+			_update_ime_text();
+			return true;
+		}
+
 		// Update Unicode input.
 		if (k->is_pressed() && ((k->is_alt_pressed() && alt_start) || alt_start_no_hold)) {
 			if (k->get_keycode() >= Key::KEY_0 && k->get_keycode() <= Key::KEY_9) {
-				alt_code = alt_code << 4;
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					alt_code = alt_code << 4;
+				} else {
+					alt_code = alt_code * 10;
+				}
 				alt_code += (uint32_t)(k->get_keycode() - Key::KEY_0);
 			} else if (k->get_keycode() >= Key::KP_0 && k->get_keycode() <= Key::KP_9) {
-				alt_code = alt_code << 4;
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					alt_code = alt_code << 4;
+				} else {
+					alt_code = alt_code * 10;
+				}
 				alt_code += (uint32_t)(k->get_keycode() - Key::KP_0);
-			} else if (k->get_keycode() >= Key::A && k->get_keycode() <= Key::F) {
+			} else if (alt_mode == ALT_INPUT_UNICODE && k->get_keycode() >= Key::A && k->get_keycode() <= Key::F) {
 				alt_code = alt_code << 4;
 				alt_code += (uint32_t)(k->get_keycode() - Key::A) + 10;
 			} else if ((Key)k->get_unicode() >= Key::KEY_0 && (Key)k->get_unicode() <= Key::KEY_9) {
-				alt_code = alt_code << 4;
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					alt_code = alt_code << 4;
+				} else {
+					alt_code = alt_code * 10;
+				}
 				alt_code += (uint32_t)((Key)k->get_unicode() - Key::KEY_0);
-			} else if ((Key)k->get_unicode() >= Key::A && (Key)k->get_unicode() <= Key::F) {
+			} else if (alt_mode == ALT_INPUT_UNICODE && (Key)k->get_unicode() >= Key::A && (Key)k->get_unicode() <= Key::F) {
 				alt_code = alt_code << 4;
 				alt_code += (uint32_t)((Key)k->get_unicode() - Key::A) + 10;
 			} else if (k->get_physical_keycode() >= Key::KEY_0 && k->get_physical_keycode() <= Key::KEY_9) {
-				alt_code = alt_code << 4;
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					alt_code = alt_code << 4;
+				} else {
+					alt_code = alt_code * 10;
+				}
 				alt_code += (uint32_t)(k->get_physical_keycode() - Key::KEY_0);
 			}
 			if (k->get_keycode() == Key::BACKSPACE) {
-				alt_code = alt_code >> 4;
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					alt_code = alt_code >> 4;
+				} else {
+					alt_code = alt_code / 10;
+				}
 			}
 			if (alt_code > 0x10ffff) {
 				alt_code = 0x10ffff;
 			}
 			if (alt_code > 0) {
-				ime_text = vformat("u%s", String::num_int64(alt_code, 16, true));
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					ime_text = vformat("u%s", String::num_int64(alt_code, 16, true));
+				} else if (alt_mode == ALT_INPUT_OEM) {
+					ime_text = vformat("o%s", String::num_int64(alt_code, 10));
+				} else if (alt_mode == ALT_INPUT_WIN) {
+					ime_text = vformat("w%s", String::num_int64(alt_code, 10));
+				}
 			} else {
-				ime_text = "u";
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					ime_text = "u";
+				} else if (alt_mode == ALT_INPUT_OEM) {
+					ime_text = "o";
+				} else if (alt_mode == ALT_INPUT_WIN) {
+					ime_text = "w";
+				}
 			}
 			ime_selection = Vector2i(0, -1);
 			_update_ime_text();
@@ -1781,10 +2076,27 @@ bool TextEdit::alt_input(const Ref<InputEvent> &p_gui_input) {
 		if ((!k->is_pressed() && alt_start && k->get_keycode() == Key::ALT) || (alt_start_no_hold && (k->is_action("ui_text_submit", true) || k->is_action("ui_accept", true)))) {
 			alt_start = false;
 			alt_start_no_hold = false;
-			if ((alt_code > 0x31 && alt_code < 0xd800) || (alt_code > 0xdfff && alt_code <= 0x10ffff)) {
+			if ((alt_code > 0x31 && alt_code < 0xd800) || (alt_code > 0xdfff)) {
 				ime_text = String();
 				ime_selection = Vector2i();
-				handle_unicode_input(alt_code);
+				if (alt_mode == ALT_INPUT_UNICODE) {
+					if ((alt_code > 0x31 && alt_code < 0xd800) || (alt_code > 0xdfff)) {
+						handle_unicode_input(alt_code);
+					}
+				} else if (alt_mode == ALT_INPUT_OEM) {
+					if (alt_code > 0x00 && alt_code <= 0xff) {
+						handle_unicode_input(alt_code_oem437[alt_code]);
+					} else if ((alt_code > 0xff && alt_code < 0xd800) || (alt_code > 0xdfff)) {
+						handle_unicode_input(alt_code);
+					}
+				} else if (alt_mode == ALT_INPUT_WIN) {
+					if (alt_code > 0x00 && alt_code <= 0xff) {
+						handle_unicode_input(alt_code_cp1252[alt_code]);
+					} else if ((alt_code > 0xff && alt_code < 0xd800) || (alt_code > 0xdfff)) {
+						handle_unicode_input(alt_code);
+					}
+				}
+				alt_mode = ALT_INPUT_NONE;
 			} else {
 				ime_text = String();
 				ime_selection = Vector2i();
@@ -1797,6 +2109,7 @@ bool TextEdit::alt_input(const Ref<InputEvent> &p_gui_input) {
 		if (alt_start_no_hold && k->is_action("ui_cancel", true)) {
 			alt_start = false;
 			alt_start_no_hold = false;
+			alt_mode = ALT_INPUT_NONE;
 			ime_text = String();
 			ime_selection = Vector2i();
 			_update_ime_text();
@@ -1824,6 +2137,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			if (mb->get_button_index() == MouseButton::WHEEL_UP && !mb->is_command_or_control_pressed()) {
 				if (mb->is_shift_pressed()) {
 					h_scroll->set_value(h_scroll->get_value() - (100 * mb->get_factor()));
+					queue_accessibility_update();
 				} else if (mb->is_alt_pressed()) {
 					// Scroll 5 times as fast as normal (like in Visual Studio Code).
 					_scroll_up(15 * mb->get_factor(), true);
@@ -1835,6 +2149,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			if (mb->get_button_index() == MouseButton::WHEEL_DOWN && !mb->is_command_or_control_pressed()) {
 				if (mb->is_shift_pressed()) {
 					h_scroll->set_value(h_scroll->get_value() + (100 * mb->get_factor()));
+					queue_accessibility_update();
 				} else if (mb->is_alt_pressed()) {
 					// Scroll 5 times as fast as normal (like in Visual Studio Code).
 					_scroll_down(15 * mb->get_factor(), true);
@@ -1845,9 +2160,11 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			}
 			if (mb->get_button_index() == MouseButton::WHEEL_LEFT) {
 				h_scroll->set_value(h_scroll->get_value() - (100 * mb->get_factor()));
+				queue_accessibility_update();
 			}
 			if (mb->get_button_index() == MouseButton::WHEEL_RIGHT) {
 				h_scroll->set_value(h_scroll->get_value() + (100 * mb->get_factor()));
+				queue_accessibility_update();
 			}
 
 			if (mb->get_button_index() == MouseButton::LEFT) {
@@ -1921,6 +2238,8 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 							return;
 						}
 
+						queue_accessibility_update();
+
 						last_dblclk = 0;
 					} else if (!mb->is_shift_pressed()) {
 						if (drag_and_drop_selection_enabled && mouse_over_selection_caret >= 0) {
@@ -1965,6 +2284,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 					last_dblclk = OS::get_singleton()->get_ticks_msec();
 					last_dblclk_pos = mb->get_position();
 				}
+				queue_accessibility_update();
 				queue_redraw();
 			}
 
@@ -1996,7 +2316,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 
 				if (context_menu_enabled) {
 					_update_context_menu();
-					menu->set_position(get_screen_position() + mpos);
+					menu->set_position(get_screen_transform().xform(mpos));
 					menu->reset_size();
 					menu->popup();
 					grab_focus();
@@ -2046,6 +2366,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 		if (v_scroll->get_value() != prev_v_scroll || h_scroll->get_value() != prev_h_scroll) {
 			accept_event(); // Accept event if scroll changed.
 		}
+		queue_accessibility_update();
 
 		return;
 	}
@@ -2281,7 +2602,7 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			if (context_menu_enabled) {
 				_update_context_menu();
 				adjust_viewport_to_caret();
-				menu->set_position(get_screen_position() + get_caret_draw_pos());
+				menu->set_position(get_screen_transform().xform(get_caret_draw_pos()));
 				menu->reset_size();
 				menu->popup();
 				menu->grab_focus();
@@ -2377,8 +2698,15 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {
 			return;
 		}
 
+		// Toggle Tab mode.
+		if (k->is_action("ui_focus_mode", true)) {
+			tab_input_mode = !tab_input_mode;
+			accept_event();
+			return;
+		}
+
 		// Handle tab as it has no set unicode value.
-		if (k->is_action("ui_text_indent", true)) {
+		if (tab_input_mode && k->is_action("ui_text_indent", true)) {
 			if (editable) {
 				insert_text_at_caret("\t");
 			}
@@ -2956,6 +3284,7 @@ void TextEdit::_update_caches() {
 		syntax_highlighter->set_text_edit(this);
 	}
 	_clear_syntax_highlighting_cache();
+	queue_accessibility_update();
 }
 
 void TextEdit::_close_ime_window() {
@@ -2999,6 +3328,7 @@ void TextEdit::_update_ime_text() {
 		}
 	}
 	_clear_syntax_highlighting_cache();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -3071,7 +3401,9 @@ bool TextEdit::can_drop_data(const Point2 &p_point, const Variant &p_data) const
 void TextEdit::drop_data(const Point2 &p_point, const Variant &p_data) {
 	Control::drop_data(p_point, p_data);
 
-	if (p_data.is_string() && is_editable()) {
+	if (p_point == Vector2(Math::INF, Math::INF)) {
+		insert_text_at_caret(p_data);
+	} else if (p_data.is_string() && is_editable()) {
 		Point2i pos = get_line_column_at_pos(get_local_mouse_pos());
 		int drop_at_line = pos.y;
 		int drop_at_column = pos.x;
@@ -3175,6 +3507,7 @@ String TextEdit::get_tooltip(const Point2 &p_pos) const {
 
 void TextEdit::set_tooltip_request_func(const Callable &p_tooltip_callback) {
 	tooltip_callback = p_tooltip_callback;
+	queue_accessibility_update();
 }
 
 /* Text */
@@ -3221,7 +3554,7 @@ void TextEdit::set_editable(bool p_editable) {
 	}
 
 	editable = p_editable;
-
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -3252,6 +3585,7 @@ void TextEdit::set_text_direction(Control::TextDirection p_text_direction) {
 			menu_dir->set_item_checked(menu_dir->get_item_index(MENU_DIR_LTR), text_direction == TEXT_DIRECTION_LTR);
 			menu_dir->set_item_checked(menu_dir->get_item_index(MENU_DIR_RTL), text_direction == TEXT_DIRECTION_RTL);
 		}
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -3272,6 +3606,7 @@ void TextEdit::set_language(const String &p_language) {
 		text.set_direction_and_language(dir, (!language.is_empty()) ? language : TranslationServer::get_singleton()->get_tool_locale());
 		text.invalidate_all();
 		_update_placeholder();
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -3286,6 +3621,7 @@ void TextEdit::set_structured_text_bidi_override(TextServer::StructuredTextParse
 		for (int i = 0; i < text.size(); i++) {
 			text.set(i, text[i], structured_text_parser(st_parser, st_args, text[i]));
 		}
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -3303,6 +3639,7 @@ void TextEdit::set_structured_text_bidi_override_options(Array p_args) {
 	for (int i = 0; i < text.size(); i++) {
 		text.set(i, text[i], structured_text_parser(st_parser, st_args, text[i]));
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -3318,6 +3655,7 @@ void TextEdit::set_tab_size(const int p_size) {
 	text.set_tab_size(p_size);
 	text.invalidate_all_lines();
 	_update_placeholder();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -3339,6 +3677,14 @@ bool TextEdit::is_indent_wrapped_lines() const {
 	return text.is_indent_wrapped_lines();
 }
 
+void TextEdit::set_tab_input_mode(bool p_enabled) {
+	tab_input_mode = p_enabled;
+}
+
+bool TextEdit::get_tab_input_mode() const {
+	return tab_input_mode;
+}
+
 // User controls
 void TextEdit::set_overtype_mode_enabled(bool p_enabled) {
 	if (overtype_mode == p_enabled) {
@@ -3468,7 +3814,7 @@ void TextEdit::set_text(const String &p_text) {
 
 	set_caret_line(0);
 	set_caret_column(0);
-
+	queue_accessibility_update();
 	queue_redraw();
 	setting_text = false;
 	emit_signal(SNAME("text_set"));
@@ -3497,6 +3843,7 @@ void TextEdit::set_placeholder(const String &p_text) {
 
 	placeholder_text = p_text;
 	_update_placeholder();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -3567,6 +3914,32 @@ int TextEdit::get_line_height() const {
 	return MAX(text.get_line_height() + theme_cache.line_spacing, 1);
 }
 
+int TextEdit::_get_wrapped_indent_level(int p_line, int &r_first_wrap) const {
+	ERR_FAIL_INDEX_V(p_line, text.size(), 0);
+
+	const Vector<Vector2i> wr = text.get_line_wrap_ranges(p_line);
+	r_first_wrap = 0;
+
+	int tab_count = 0;
+	int whitespace_count = 0;
+	int line_length = text[p_line].size();
+	for (int i = 0; i < line_length - 1; i++) {
+		if (r_first_wrap < wr.size() && i >= wr[r_first_wrap].y) {
+			tab_count = 0;
+			whitespace_count = 0;
+			r_first_wrap++;
+		}
+		if (text[p_line][i] == '\t') {
+			tab_count++;
+		} else if (text[p_line][i] == ' ') {
+			whitespace_count++;
+		} else {
+			break;
+		}
+	}
+	return tab_count * text.get_tab_size() + whitespace_count;
+}
+
 int TextEdit::get_indent_level(int p_line) const {
 	ERR_FAIL_INDEX_V(p_line, text.size(), 0);
 
@@ -3707,6 +4080,9 @@ void TextEdit::remove_line_at(int p_line, bool p_move_carets_down) {
 	_offset_carets_after(next_line, next_column, from_line, from_column);
 	end_multicaret_edit();
 	end_complex_operation();
+
+	queue_accessibility_update();
+	queue_redraw();
 }
 
 void TextEdit::insert_text_at_caret(const String &p_text, int p_caret) {
@@ -3792,10 +4168,10 @@ int TextEdit::get_last_unhidden_line() const {
 
 int TextEdit::get_next_visible_line_offset_from(int p_line_from, int p_visible_amount) const {
 	// Returns the number of lines (hidden and unhidden) from p_line_from to (p_line_from + visible_amount of unhidden lines).
-	ERR_FAIL_INDEX_V(p_line_from, text.size(), ABS(p_visible_amount));
+	ERR_FAIL_INDEX_V(p_line_from, text.size(), Math::abs(p_visible_amount));
 
 	if (!_is_hiding_enabled()) {
-		return ABS(p_visible_amount);
+		return Math::abs(p_visible_amount);
 	}
 
 	int num_visible = 0;
@@ -3811,7 +4187,7 @@ int TextEdit::get_next_visible_line_offset_from(int p_line_from, int p_visible_a
 			}
 		}
 	} else {
-		p_visible_amount = ABS(p_visible_amount);
+		p_visible_amount = Math::abs(p_visible_amount);
 		for (int i = p_line_from; i >= 0; i--) {
 			num_total++;
 			if (!_is_line_hidden(i)) {
@@ -3829,10 +4205,10 @@ Point2i TextEdit::get_next_visible_line_index_offset_from(int p_line_from, int p
 	// Returns the number of lines (hidden and unhidden) from (p_line_from + p_wrap_index_from) row to (p_line_from + visible_amount of unhidden and wrapped rows).
 	// Wrap index is set to the wrap index of the last line.
 	int wrap_index = 0;
-	ERR_FAIL_INDEX_V(p_line_from, text.size(), Point2i(ABS(p_visible_amount), 0));
+	ERR_FAIL_INDEX_V(p_line_from, text.size(), Point2i(Math::abs(p_visible_amount), 0));
 
 	if (!_is_hiding_enabled() && get_line_wrapping_mode() == LineWrappingMode::LINE_WRAPPING_NONE) {
-		return Point2i(ABS(p_visible_amount), 0);
+		return Point2i(Math::abs(p_visible_amount), 0);
 	}
 
 	int num_visible = 0;
@@ -3865,7 +4241,7 @@ Point2i TextEdit::get_next_visible_line_index_offset_from(int p_line_from, int p
 			wrap_index = backtrack.y;
 		}
 	} else {
-		p_visible_amount = ABS(p_visible_amount);
+		p_visible_amount = Math::abs(p_visible_amount);
 		int i;
 		num_visible -= get_line_wrap_count(p_line_from) - p_wrap_index_from;
 		for (i = p_line_from; i >= 0; i--) {
@@ -4087,6 +4463,7 @@ void TextEdit::start_action(EditAction p_action) {
 void TextEdit::end_action() {
 	if (current_action != EditAction::ACTION_NONE) {
 		pending_action_end = true;
+		queue_accessibility_update();
 	}
 }
 
@@ -4106,6 +4483,8 @@ void TextEdit::begin_complex_operation() {
 void TextEdit::end_complex_operation() {
 	_push_current_op();
 
+	queue_accessibility_update();
+
 	complex_operation_count = MAX(complex_operation_count - 1, 0);
 	if (complex_operation_count > 0) {
 		return;
@@ -4198,6 +4577,7 @@ void TextEdit::undo() {
 		_selection_changed();
 	}
 	adjust_viewport_to_caret();
+	queue_accessibility_update();
 }
 
 void TextEdit::redo() {
@@ -4254,6 +4634,7 @@ void TextEdit::redo() {
 		_selection_changed();
 	}
 	adjust_viewport_to_caret();
+	queue_accessibility_update();
 }
 
 void TextEdit::clear_undo_history() {
@@ -4490,8 +4871,14 @@ Point2i TextEdit::get_line_column_at_pos(const Point2i &p_pos, bool p_clamp_line
 	}
 
 	RID text_rid = text.get_line_data(row)->get_line_rid(wrap_index);
-	float wrap_indent = (text.is_indent_wrapped_lines() && wrap_index > 0) ? get_indent_level(row) * theme_cache.font->get_char_size(' ', theme_cache.font_size).width : 0.0;
-	if (is_layout_rtl()) {
+
+	bool rtl = is_layout_rtl();
+	int first_indent_line = 0;
+	if (text.is_indent_wrapped_lines()) {
+		_get_wrapped_indent_level(row, first_indent_line);
+	}
+	float wrap_indent = wrap_index > first_indent_line ? MIN(text.get_indent_offset(row, rtl), wrap_at_column * 0.6) : 0.0;
+	if (rtl) {
 		colx = TS->shaped_text_get_size(text_rid).x - colx + wrap_indent;
 	} else {
 		colx -= wrap_indent;
@@ -4519,12 +4906,12 @@ Rect2i TextEdit::get_rect_at_line_column(int p_line, int p_column) const {
 	ERR_FAIL_COND_V(p_column < 0, Rect2i(-1, -1, 0, 0));
 	ERR_FAIL_COND_V(p_column > text[p_line].length(), Rect2i(-1, -1, 0, 0));
 
-	if (text.size() == 1 && text[0].length() == 0) {
+	if (text.size() == 1 && text[0].is_empty()) {
 		// The TextEdit is empty.
 		return Rect2i();
 	}
 
-	if (line_drawing_cache.size() == 0 || !line_drawing_cache.has(p_line)) {
+	if (line_drawing_cache.is_empty() || !line_drawing_cache.has(p_line)) {
 		// Line is not in the cache, which means it's outside of the viewing area.
 		return Rect2i(-1, -1, 0, 0);
 	}
@@ -4567,7 +4954,7 @@ int TextEdit::get_minimap_line_at_pos(const Point2i &p_pos) const {
 	int minimap_visible_lines = get_minimap_visible_lines();
 	int visible_rows = get_visible_line_count() + 1;
 	int first_vis_line = get_first_visible_line() - 1;
-	int draw_amount = visible_rows + (smooth_scroll_enabled ? 1 : 0);
+	int draw_amount = visible_rows + 1;
 	draw_amount += get_line_wrap_count(first_vis_line + 1);
 	int minimap_line_height = (minimap_char_size.y + minimap_line_spacing);
 
@@ -4769,6 +5156,7 @@ void TextEdit::remove_secondary_carets() {
 	if (drag_caret_index >= 0) {
 		drag_caret_index = -1;
 	}
+	queue_accessibility_update();
 }
 
 int TextEdit::get_caret_count() const {
@@ -5190,6 +5578,7 @@ void TextEdit::set_caret_line(int p_line, bool p_adjust_viewport, bool p_can_be_
 	if (caret_moved) {
 		_caret_changed(p_caret);
 	}
+	queue_accessibility_update();
 }
 
 int TextEdit::get_caret_line(int p_caret) const {
@@ -5224,6 +5613,7 @@ void TextEdit::set_caret_column(int p_column, bool p_adjust_viewport, int p_care
 	if (caret_moved) {
 		_caret_changed(p_caret);
 	}
+	queue_accessibility_update();
 }
 
 int TextEdit::get_caret_column(int p_caret) const {
@@ -5312,7 +5702,7 @@ void TextEdit::select_all() {
 		return;
 	}
 
-	if (text.size() == 1 && text[0].length() == 0) {
+	if (text.size() == 1 && text[0].is_empty()) {
 		return;
 	}
 
@@ -5329,7 +5719,7 @@ void TextEdit::select_word_under_caret(int p_caret) {
 		return;
 	}
 
-	if (text.size() == 1 && text[0].length() == 0) {
+	if (text.size() == 1 && text[0].is_empty()) {
 		return;
 	}
 
@@ -5374,7 +5764,7 @@ void TextEdit::add_selection_for_next_occurrence() {
 		return;
 	}
 
-	if (text.size() == 1 && text[0].length() == 0) {
+	if (text.size() == 1 && text[0].is_empty()) {
 		return;
 	}
 
@@ -5417,7 +5807,7 @@ void TextEdit::skip_selection_for_next_occurrence() {
 		return;
 	}
 
-	if (text.size() == 1 && text[0].length() == 0) {
+	if (text.size() == 1 && text[0].is_empty()) {
 		return;
 	}
 
@@ -5486,6 +5876,9 @@ void TextEdit::select(int p_origin_line, int p_origin_column, int p_caret_line,
 	if (had_selection != activate) {
 		_selection_changed(p_caret);
 	}
+
+	queue_accessibility_update();
+	queue_redraw();
 }
 
 bool TextEdit::has_selection(int p_caret) const {
@@ -5730,6 +6123,9 @@ void TextEdit::deselect(int p_caret) {
 	if (selection_changed) {
 		_selection_changed(p_caret);
 	}
+
+	queue_accessibility_update();
+	queue_redraw();
 }
 
 void TextEdit::delete_selection(int p_caret) {
@@ -5771,6 +6167,7 @@ void TextEdit::set_line_wrapping_mode(LineWrappingMode p_wrapping_mode) {
 	if (line_wrapping_mode != p_wrapping_mode) {
 		line_wrapping_mode = p_wrapping_mode;
 		_update_wrap_at_column(true);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -5787,6 +6184,7 @@ void TextEdit::set_autowrap_mode(TextServer::AutowrapMode p_mode) {
 	autowrap_mode = p_mode;
 	if (get_line_wrapping_mode() != LineWrappingMode::LINE_WRAPPING_NONE) {
 		_update_wrap_at_column(true);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -5892,6 +6290,7 @@ void TextEdit::set_v_scroll(double p_scroll) {
 	if (p_scroll >= max_v_scroll - 1.0) {
 		_scroll_moved(v_scroll->get_value());
 	}
+	queue_accessibility_update();
 }
 
 double TextEdit::get_v_scroll() const {
@@ -5903,6 +6302,7 @@ void TextEdit::set_h_scroll(int p_scroll) {
 		p_scroll = 0;
 	}
 	h_scroll->set_value(p_scroll);
+	queue_accessibility_update();
 }
 
 int TextEdit::get_h_scroll() const {
@@ -6081,7 +6481,7 @@ void TextEdit::adjust_viewport_to_caret(int p_caret) {
 		set_line_as_last_visible(cur_line, cur_wrap);
 	}
 
-	_adjust_viewport_to_caret_horizontally(p_caret);
+	_adjust_viewport_to_caret_horizontally(p_caret, false);
 }
 
 void TextEdit::center_viewport_to_caret(int p_caret) {
@@ -6478,6 +6878,7 @@ void TextEdit::set_draw_control_chars(bool p_enabled) {
 		text.set_draw_control_chars(draw_control_chars);
 		text.invalidate_font();
 		_update_placeholder();
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -6543,6 +6944,9 @@ void TextEdit::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_indent_wrapped_lines", "enabled"), &TextEdit::set_indent_wrapped_lines);
 	ClassDB::bind_method(D_METHOD("is_indent_wrapped_lines"), &TextEdit::is_indent_wrapped_lines);
 
+	ClassDB::bind_method(D_METHOD("set_tab_input_mode", "enabled"), &TextEdit::set_tab_input_mode);
+	ClassDB::bind_method(D_METHOD("get_tab_input_mode"), &TextEdit::get_tab_input_mode);
+
 	// User controls
 	ClassDB::bind_method(D_METHOD("set_overtype_mode_enabled", "enabled"), &TextEdit::set_overtype_mode_enabled);
 	ClassDB::bind_method(D_METHOD("is_overtype_mode_enabled"), &TextEdit::is_overtype_mode_enabled);
@@ -6965,6 +7369,7 @@ void TextEdit::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "wrap_mode", PROPERTY_HINT_ENUM, "None,Boundary"), "set_line_wrapping_mode", "get_line_wrapping_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "autowrap_mode", PROPERTY_HINT_ENUM, "Arbitrary:1,Word:2,Word (Smart):3"), "set_autowrap_mode", "get_autowrap_mode");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "indent_wrapped_lines"), "set_indent_wrapped_lines", "is_indent_wrapped_lines");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "tab_input_mode"), "set_tab_input_mode", "get_tab_input_mode");
 
 	ADD_GROUP("Scroll", "scroll_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "scroll_smooth"), "set_smooth_scroll_enabled", "is_smooth_scroll_enabled");
@@ -7075,6 +7480,7 @@ void TextEdit::_set_hiding_enabled(bool p_enabled) {
 		_unhide_all_lines();
 	}
 	hiding_enabled = p_enabled;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -7092,6 +7498,7 @@ void TextEdit::_unhide_all_lines() {
 		text.set_hidden(i, false);
 	}
 	_update_scrollbars();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -7109,6 +7516,7 @@ void TextEdit::_set_line_as_hidden(int p_line, bool p_hidden) {
 	if (_is_hiding_enabled() || !p_hidden) {
 		text.set_hidden(p_line, p_hidden);
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -7295,7 +7703,7 @@ void TextEdit::_paste_internal(int p_caret) {
 	}
 
 	// Paste a full line. Ignore '\r' characters that may have been added to the clipboard by the OS.
-	if (get_caret_count() == 1 && !has_selection(0) && !cut_copy_line.is_empty() && cut_copy_line == clipboard.replace("\r", "")) {
+	if (get_caret_count() == 1 && !has_selection(0) && !cut_copy_line.is_empty() && cut_copy_line == clipboard.remove_char('\r')) {
 		insert_text(clipboard, get_caret_line(), 0);
 		return;
 	}
@@ -7379,7 +7787,6 @@ Key TextEdit::_get_menu_action_accelerator(const String &p_action) {
 void TextEdit::_generate_context_menu() {
 	menu = memnew(PopupMenu);
 	add_child(menu, false, INTERNAL_MODE_FRONT);
-	menu->force_parent_owned();
 
 	menu_dir = memnew(PopupMenu);
 	menu_dir->add_radio_check_item(ETR("Same as Layout Direction"), MENU_DIR_INHERITED);
@@ -7592,7 +7999,11 @@ int TextEdit::_get_char_pos_for_line(int p_px, int p_line, int p_wrap_index) con
 	p_wrap_index = MIN(p_wrap_index, text.get_line_data(p_line)->get_line_count() - 1);
 
 	RID text_rid = text.get_line_data(p_line)->get_line_rid(p_wrap_index);
-	float wrap_indent = (text.is_indent_wrapped_lines() && p_wrap_index > 0) ? get_indent_level(p_line) * theme_cache.font->get_char_size(' ', theme_cache.font_size).width : 0.0;
+	int first_indent_line = 0;
+	if (text.is_indent_wrapped_lines()) {
+		_get_wrapped_indent_level(p_line, first_indent_line);
+	}
+	float wrap_indent = p_wrap_index > first_indent_line ? MIN(text.get_indent_offset(p_line, is_layout_rtl()), wrap_at_column * 0.6) : 0.0;
 	if (is_layout_rtl()) {
 		p_px = TS->shaped_text_get_size(text_rid).x - p_px + wrap_indent;
 	} else {
@@ -7661,12 +8072,17 @@ int TextEdit::_get_column_x_offset_for_line(int p_char, int p_line, int p_column
 	}
 
 	RID text_rid = text.get_line_data(p_line)->get_line_rid(row);
-	float wrap_indent = (text.is_indent_wrapped_lines() && row > 0) ? get_indent_level(p_line) * theme_cache.font->get_char_size(' ', theme_cache.font_size).width : 0.0;
+	bool rtl = is_layout_rtl();
+	int first_indent_line = 0;
+	if (text.is_indent_wrapped_lines()) {
+		_get_wrapped_indent_level(p_line, first_indent_line);
+	}
+	float wrap_indent = row > first_indent_line ? MIN(text.get_indent_offset(p_line, rtl), wrap_at_column * 0.6) : 0.0;
 	CaretInfo ts_caret = TS->shaped_text_get_carets(text_rid, p_column);
 	if ((ts_caret.l_caret != Rect2() && (ts_caret.l_dir == TextServer::DIRECTION_AUTO || ts_caret.l_dir == (TextServer::Direction)input_direction)) || (ts_caret.t_caret == Rect2())) {
-		return ts_caret.l_caret.position.x + (is_layout_rtl() ? -wrap_indent : wrap_indent);
+		return ts_caret.l_caret.position.x + (rtl ? -wrap_indent : wrap_indent);
 	} else {
-		return ts_caret.t_caret.position.x + (is_layout_rtl() ? -wrap_indent : wrap_indent);
+		return ts_caret.t_caret.position.x + (rtl ? -wrap_indent : wrap_indent);
 	}
 }
 
@@ -7753,6 +8169,7 @@ void TextEdit::_selection_changed(int p_caret) {
 	}
 
 	_cancel_drag_and_drop_text();
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -7955,6 +8372,7 @@ void TextEdit::_update_wrap_at_column(bool p_force) {
 		first_visible_line_wrap_ofs = 0;
 	}
 	set_line_as_first_visible(first_visible_line, first_visible_line_wrap_ofs);
+	queue_accessibility_update();
 }
 
 /* Viewport. */
@@ -7973,7 +8391,7 @@ void TextEdit::_update_scrollbars() {
 
 	int visible_rows = get_visible_line_count();
 	int total_rows = draw_placeholder ? placeholder_wrapped_rows.size() : get_total_visible_line_count();
-	if (scroll_past_end_of_file_enabled && !fit_content_height) {
+	if ((scroll_past_end_of_file_enabled && !fit_content_height) || visible_rows == 0) {
 		total_rows += visible_rows - 1;
 	}
 
@@ -7996,7 +8414,6 @@ void TextEdit::_update_scrollbars() {
 		v_scroll->set_max(total_rows + _get_visible_lines_offset());
 		v_scroll->set_page(visible_rows + _get_visible_lines_offset());
 		set_v_scroll(get_v_scroll());
-
 	} else {
 		first_visible_line = 0;
 		first_visible_line_wrap_ofs = 0;
@@ -8072,6 +8489,7 @@ void TextEdit::_scroll_moved(double p_to_val) {
 		first_visible_line = n_line;
 		first_visible_line_wrap_ofs = wi;
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -8106,6 +8524,7 @@ void TextEdit::_scroll_up(real_t p_delta, bool p_animate) {
 		}
 		if (!p_animate || Math::abs(target_v_scroll - v_scroll->get_value()) < 1.0) {
 			v_scroll->set_value(target_v_scroll);
+			queue_accessibility_update();
 		} else {
 			scrolling = true;
 			set_physics_process_internal(true);
@@ -8134,6 +8553,7 @@ void TextEdit::_scroll_down(real_t p_delta, bool p_animate) {
 		}
 		if (!p_animate || Math::abs(target_v_scroll - v_scroll->get_value()) < 1.0) {
 			v_scroll->set_value(target_v_scroll);
+			queue_accessibility_update();
 		} else {
 			scrolling = true;
 			set_physics_process_internal(true);
@@ -8186,7 +8606,7 @@ void TextEdit::_scroll_lines_down() {
 	merge_overlapping_carets();
 }
 
-void TextEdit::_adjust_viewport_to_caret_horizontally(int p_caret) {
+void TextEdit::_adjust_viewport_to_caret_horizontally(int p_caret, bool p_maximize_selection) {
 	if (get_line_wrapping_mode() != LineWrappingMode::LINE_WRAPPING_NONE) {
 		first_visible_col = 0;
 		h_scroll->set_value(first_visible_col);
@@ -8220,7 +8640,7 @@ void TextEdit::_adjust_viewport_to_caret_horizontally(int p_caret) {
 		int ime_end_column = get_caret_column(p_caret) + (ime_selection.y > 0 ? ime_selection.x + ime_selection.y : ime_text.length());
 		caret_end_pos = _get_column_x_offset_for_line(ime_end_column, get_caret_line(p_caret), ime_end_column);
 		prioritize_end = false;
-	} else if (has_selection(p_caret) && get_selection_from_line(p_caret) == get_selection_to_line(p_caret)) {
+	} else if (p_maximize_selection && has_selection(p_caret) && get_selection_from_line(p_caret) == get_selection_to_line(p_caret)) {
 		// Use selection if it is on one line.
 		caret_start_pos = _get_column_x_offset_for_line(get_selection_from_column(p_caret), get_caret_line(p_caret), get_selection_from_column(p_caret));
 		caret_end_pos = _get_column_x_offset_for_line(get_selection_to_column(p_caret), get_caret_line(p_caret), get_selection_to_column(p_caret));
@@ -8247,6 +8667,8 @@ void TextEdit::_adjust_viewport_to_caret_horizontally(int p_caret) {
 	}
 
 	h_scroll->set_value(first_visible_col);
+
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -8339,6 +8761,7 @@ void TextEdit::_update_gutter_width() {
 	if (get_viewport()) {
 		hovered_gutter = _get_hovered_gutter(get_local_mouse_position());
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -8531,7 +8954,7 @@ void TextEdit::_base_insert_text(int p_line, int p_char, const String &p_text, i
 	ERR_FAIL_COND(p_char < 0);
 
 	/* STEP 1: Remove \r from source text and separate in substrings. */
-	const String text_to_insert = p_text.replace("\r", "");
+	const String text_to_insert = p_text.remove_char('\r');
 	Vector<String> substrings = text_to_insert.split("\n");
 
 	// Is this just a new empty line?
@@ -8543,7 +8966,7 @@ void TextEdit::_base_insert_text(int p_line, int p_char, const String &p_text, i
 	}
 
 	/* STEP 3: Separate dest string in pre and post text. */
-	String postinsert_text = text[p_line].substr(p_char, text[p_line].size());
+	String postinsert_text = text[p_line].substr(p_char);
 
 	substrings.write[0] = text[p_line].substr(0, p_char) + substrings[0];
 	substrings.write[substrings.size() - 1] += postinsert_text;
@@ -8607,7 +9030,7 @@ void TextEdit::_base_remove_text(int p_from_line, int p_from_column, int p_to_li
 	ERR_FAIL_COND(p_to_line == p_from_line && p_to_column < p_from_column); // 'from > to'.
 
 	String pre_text = text[p_from_line].substr(0, p_from_column);
-	String post_text = text[p_to_line].substr(p_to_column, text[p_to_line].length());
+	String post_text = text[p_to_line].substr(p_to_column);
 
 	text.remove_range(p_from_line, p_to_line);
 	text.set(p_from_line, pre_text + post_text, structured_text_parser(st_parser, st_args, pre_text + post_text));
diff --git a/engine/scene/gui/text_edit.h b/engine/scene/gui/text_edit.h
index 21c8781e..8f6a5be6 100644
--- a/engine/scene/gui/text_edit.h
+++ b/engine/scene/gui/text_edit.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_EDIT_H
-#define TEXT_EDIT_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/gui/popup_menu.h"
@@ -145,12 +144,15 @@ private:
 			Color color = Color(1, 1, 1);
 		};
 
+		mutable int64_t next_item_id = 0;
+
 		struct Line {
 			Vector<Gutter> gutters;
 
 			String data;
 			Array bidi_override;
 			Ref<TextParagraph> data_buf;
+			Vector<RID> accessibility_text_root_element;
 
 			String ime_data;
 			Array ime_bidi_override;
@@ -160,6 +162,7 @@ private:
 			int line_count = 0;
 			int height = 0;
 			int width = 0;
+			float indent_ofs = -1.0;
 
 			Line() {
 				data_buf.instantiate();
@@ -227,8 +230,17 @@ private:
 		BitField<TextServer::LineBreakFlag> get_brk_flags() const;
 		int get_line_wrap_amount(int p_line) const;
 
+		const Vector<RID> get_accessibility_elements(int p_line);
+		void update_accessibility(int p_line, RID p_root);
+		void clear_accessibility() {
+			for (int i = 0; i < text.size(); i++) {
+				text.write[i].accessibility_text_root_element.clear();
+			}
+		}
+
 		Vector<Vector2i> get_line_wrap_ranges(int p_line) const;
 		const Ref<TextParagraph> get_line_data(int p_line) const;
+		float get_indent_offset(int p_line, bool p_rtl) const;
 
 		void set(int p_line, const String &p_text, const Array &p_bidi_override);
 		void set_ime(int p_line, const String &p_text, const Array &p_bidi_override);
@@ -274,13 +286,22 @@ private:
 
 	/* Text */
 	Text text;
-
 	bool setting_text = false;
 
+	enum AltInputMode {
+		ALT_INPUT_NONE,
+		ALT_INPUT_UNICODE,
+		ALT_INPUT_OEM,
+		ALT_INPUT_WIN,
+	};
+
+	AltInputMode alt_mode = ALT_INPUT_NONE;
 	bool alt_start = false;
 	bool alt_start_no_hold = false;
 	uint32_t alt_code = 0;
 
+	bool tab_input_mode = true;
+
 	// Text properties.
 	String ime_text = "";
 	Point2 ime_selection;
@@ -539,7 +560,7 @@ private:
 	void _scroll_lines_up();
 	void _scroll_lines_down();
 
-	void _adjust_viewport_to_caret_horizontally(int p_caret = 0);
+	void _adjust_viewport_to_caret_horizontally(int p_caret = 0, bool p_maximize_selection = true);
 
 	// Minimap.
 	bool draw_minimap = false;
@@ -627,6 +648,8 @@ private:
 	bool draw_tabs = false;
 	bool draw_spaces = false;
 
+	RID accessibility_text_root_element_nl;
+
 	/*** Super internal Core API. Everything builds on it. ***/
 	bool text_changed_dirty = false;
 	void _text_changed();
@@ -695,6 +718,8 @@ protected:
 	void _unhide_all_lines();
 	virtual void _unhide_carets();
 
+	int _get_wrapped_indent_level(int p_line, int &r_first_wrap) const;
+
 	// Symbol lookup.
 	String lookup_symbol_word;
 	void _set_symbol_lookup_word(const String &p_symbol);
@@ -715,6 +740,17 @@ protected:
 	virtual void _paste_internal(int p_caret);
 	virtual void _paste_primary_clipboard_internal(int p_caret);
 
+	void _accessibility_action_set_selection(const Variant &p_data);
+	void _accessibility_action_replace_selected(const Variant &p_data);
+	void _accessibility_action_set_value(const Variant &p_data);
+	void _accessibility_action_menu(const Variant &p_data);
+	void _accessibility_scroll_down(const Variant &p_data);
+	void _accessibility_scroll_left(const Variant &p_data);
+	void _accessibility_scroll_right(const Variant &p_data);
+	void _accessibility_scroll_up(const Variant &p_data);
+	void _accessibility_scroll_set(const Variant &p_data);
+	void _accessibility_action_scroll_into_view(const Variant &p_data, int p_line, int p_wrap);
+
 	GDVIRTUAL2(_handle_unicode_input, int, int)
 	GDVIRTUAL1(_backspace, int)
 	GDVIRTUAL1(_cut, int)
@@ -762,6 +798,9 @@ public:
 	void set_indent_wrapped_lines(bool p_enabled);
 	bool is_indent_wrapped_lines() const;
 
+	void set_tab_input_mode(bool p_enabled);
+	bool get_tab_input_mode() const;
+
 	// User controls
 	void set_overtype_mode_enabled(bool p_enabled);
 	bool is_overtype_mode_enabled() const;
@@ -1138,5 +1177,3 @@ VARIANT_ENUM_CAST(TextEdit::SelectionMode);
 VARIANT_ENUM_CAST(TextEdit::GutterType);
 VARIANT_ENUM_CAST(TextEdit::MenuItems);
 VARIANT_ENUM_CAST(TextEdit::SearchFlags);
-
-#endif // TEXT_EDIT_H
diff --git a/engine/scene/gui/texture_button.h b/engine/scene/gui/texture_button.h
index 9d393d3c..8fea583a 100644
--- a/engine/scene/gui/texture_button.h
+++ b/engine/scene/gui/texture_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_BUTTON_H
-#define TEXTURE_BUTTON_H
+#pragma once
 
 #include "scene/gui/base_button.h"
 #include "scene/resources/bit_map.h"
@@ -104,5 +103,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(TextureButton::StretchMode);
-
-#endif // TEXTURE_BUTTON_H
diff --git a/engine/scene/gui/texture_progress_bar.cpp b/engine/scene/gui/texture_progress_bar.cpp
index 3ed7bf2f..258b2ff9 100644
--- a/engine/scene/gui/texture_progress_bar.cpp
+++ b/engine/scene/gui/texture_progress_bar.cpp
@@ -193,7 +193,7 @@ Point2 TextureProgressBar::unit_val_to_uv(float val) {
 	Point2 p = get_relative_center();
 
 	// Minimal version of Liang-Barsky clipping algorithm
-	float angle = (val * Math_TAU) - Math_PI * 0.5;
+	float angle = (val * Math::TAU) - Math::PI * 0.5;
 	Point2 dir = Vector2(Math::cos(angle), Math::sin(angle));
 	float t1 = 1.0;
 	float cp = 0.0;
@@ -429,6 +429,13 @@ void TextureProgressBar::draw_nine_patch_stretched(const Ref<Texture2D> &p_textu
 
 void TextureProgressBar::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_PROGRESS_INDICATOR);
+		} break;
+
 		case NOTIFICATION_DRAW: {
 			if (under.is_valid()) {
 				if (nine_patch_stretch) {
diff --git a/engine/scene/gui/texture_progress_bar.h b/engine/scene/gui/texture_progress_bar.h
index d890ce6e..5d3a68f8 100644
--- a/engine/scene/gui/texture_progress_bar.h
+++ b/engine/scene/gui/texture_progress_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_PROGRESS_BAR_H
-#define TEXTURE_PROGRESS_BAR_H
+#pragma once
 
 #include "scene/gui/range.h"
 
@@ -122,5 +121,3 @@ private:
 };
 
 VARIANT_ENUM_CAST(TextureProgressBar::FillMode);
-
-#endif // TEXTURE_PROGRESS_BAR_H
diff --git a/engine/scene/gui/texture_rect.h b/engine/scene/gui/texture_rect.h
index 2425c609..098229a7 100644
--- a/engine/scene/gui/texture_rect.h
+++ b/engine/scene/gui/texture_rect.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_RECT_H
-#define TEXTURE_RECT_H
+#pragma once
 
 #include "scene/gui/control.h"
 
@@ -95,5 +94,3 @@ public:
 
 VARIANT_ENUM_CAST(TextureRect::ExpandMode);
 VARIANT_ENUM_CAST(TextureRect::StretchMode);
-
-#endif // TEXTURE_RECT_H
diff --git a/engine/scene/gui/tree.compat.inc b/engine/scene/gui/tree.compat.inc
new file mode 100644
index 00000000..f4355764
--- /dev/null
+++ b/engine/scene/gui/tree.compat.inc
@@ -0,0 +1,41 @@
+/**************************************************************************/
+/*  tree.compat.inc                                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+void TreeItem::_add_button_bind_compat_76829(int p_column, const Ref<Texture2D> &p_button, int p_id, bool p_disabled, const String &p_tooltip) {
+	add_button(p_column, p_button, p_id, p_disabled, p_tooltip, String());
+}
+
+void TreeItem::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_method(D_METHOD("add_button", "column", "button", "id", "disabled", "tooltip_text"), &TreeItem::_add_button_bind_compat_76829, DEFVAL(-1), DEFVAL(false), DEFVAL(""));
+}
+
+#endif // DISABLE_DEPRECATED
diff --git a/engine/scene/gui/tree.cpp b/engine/scene/gui/tree.cpp
index cd6c51de..56bef633 100644
--- a/engine/scene/gui/tree.cpp
+++ b/engine/scene/gui/tree.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "tree.h"
+#include "tree.compat.inc"
 
 #include "core/config/project_settings.h"
 #include "core/input/input.h"
@@ -102,6 +103,7 @@ void TreeItem::_change_tree(Tree *p_tree) {
 	if (p_tree == tree) {
 		return;
 	}
+	accessibility_row_dirty = true;
 
 	TreeItem *c = first_child;
 	while (c) {
@@ -144,19 +146,36 @@ void TreeItem::_change_tree(Tree *p_tree) {
 			tree->edited_item = nullptr;
 			tree->pressing_for_editor = false;
 		}
-
+		tree->queue_accessibility_update();
 		tree->queue_redraw();
 	}
 
 	tree = p_tree;
 
+	if (accessibility_row_element.is_valid()) {
+		DisplayServer::get_singleton()->accessibility_free_element(accessibility_row_element);
+		accessibility_row_element = RID();
+	}
+	for (Cell &cell : cells) {
+		if (cell.accessibility_cell_element.is_valid()) {
+			DisplayServer::get_singleton()->accessibility_free_element(cell.accessibility_cell_element);
+			cell.accessibility_cell_element = RID();
+		}
+		for (Cell::Button &btn : cell.buttons) {
+			if (btn.accessibility_button_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
+				btn.accessibility_button_element = RID();
+			}
+		}
+	}
+
 	if (tree) {
+		tree->queue_accessibility_update();
 		tree->queue_redraw();
 		cells.resize(tree->columns.size());
 	}
 }
 
-/* cell mode */
 void TreeItem::set_cell_mode(int p_column, TreeCellMode p_mode) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 
@@ -185,7 +204,6 @@ TreeItem::TreeCellMode TreeItem::get_cell_mode(int p_column) const {
 	return cells[p_column].mode;
 }
 
-/* auto translate mode */
 void TreeItem::set_auto_translate_mode(int p_column, Node::AutoTranslateMode p_mode) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 
@@ -205,7 +223,6 @@ Node::AutoTranslateMode TreeItem::get_auto_translate_mode(int p_column) const {
 	return cells[p_column].auto_translate_mode;
 }
 
-/* multiline editable */
 void TreeItem::set_edit_multiline(int p_column, bool p_multiline) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 	cells.write[p_column].edit_multiline = p_multiline;
@@ -217,7 +234,6 @@ bool TreeItem::is_edit_multiline(int p_column) const {
 	return cells[p_column].edit_multiline;
 }
 
-/* check mode */
 void TreeItem::set_checked(int p_column, bool p_checked) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 
@@ -235,7 +251,7 @@ void TreeItem::set_checked(int p_column, bool p_checked) {
 void TreeItem::set_indeterminate(int p_column, bool p_indeterminate) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 
-	// Prevent uncheck if indeterminate set to false twice
+	// Prevent uncheck if indeterminate set to false twice.
 	if (p_indeterminate == cells[p_column].indeterminate) {
 		return;
 	}
@@ -370,6 +386,9 @@ void TreeItem::set_text(int p_column, String p_text) {
 	cells.write[p_column].cached_minimum_size_dirty = true;
 
 	_changed_notify(p_column);
+	if (get_tree()) {
+		get_tree()->update_configuration_warnings();
+	}
 }
 
 String TreeItem::get_text(int p_column) const {
@@ -377,6 +396,26 @@ String TreeItem::get_text(int p_column) const {
 	return cells[p_column].text;
 }
 
+void TreeItem::set_alt_text(int p_column, String p_text) {
+	ERR_FAIL_INDEX(p_column, cells.size());
+
+	if (cells[p_column].alt_text == p_text) {
+		return;
+	}
+
+	cells.write[p_column].alt_text = p_text;
+
+	_changed_notify(p_column);
+	if (get_tree()) {
+		get_tree()->update_configuration_warnings();
+	}
+}
+
+String TreeItem::get_alt_text(int p_column) const {
+	ERR_FAIL_INDEX_V(p_column, cells.size(), "");
+	return cells[p_column].alt_text;
+}
+
 void TreeItem::set_text_direction(int p_column, Control::TextDirection p_text_direction) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 	ERR_FAIL_COND((int)p_text_direction < -1 || (int)p_text_direction > 3);
@@ -592,7 +631,6 @@ int TreeItem::get_icon_max_width(int p_column) const {
 	return cells[p_column].icon_max_w;
 }
 
-/* range works for mode number or mode combo */
 void TreeItem::set_range(int p_column, double p_value) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 	if (cells[p_column].step > 0) {
@@ -692,7 +730,7 @@ void TreeItem::set_collapsed(bool p_collapsed) {
 		while (ci && ci != this) {
 			ci = ci->parent;
 		}
-		if (ci) { // collapsing cursor/selected, move it!
+		if (ci) { // Collapsing cursor/selected, move it!
 
 			if (tree->select_mode == Tree::SELECT_MULTI) {
 				tree->selected_item = this;
@@ -701,6 +739,7 @@ void TreeItem::set_collapsed(bool p_collapsed) {
 				select(tree->selected_col);
 			}
 
+			tree->queue_accessibility_update();
 			tree->queue_redraw();
 		}
 	}
@@ -770,6 +809,7 @@ void TreeItem::set_visible(bool p_visible) {
 	}
 	visible = p_visible;
 	if (tree) {
+		tree->queue_accessibility_update();
 		tree->queue_redraw();
 		_changed_notify();
 	}
@@ -824,12 +864,11 @@ int TreeItem::get_custom_minimum_height() const {
 	return custom_min_height;
 }
 
-/* Item manipulation */
-
 TreeItem *TreeItem::create_child(int p_index) {
 	TreeItem *ti = memnew(TreeItem(tree));
 	if (tree) {
 		ti->cells.resize(tree->columns.size());
+		tree->queue_accessibility_update();
 		tree->queue_redraw();
 	}
 
@@ -935,7 +974,7 @@ TreeItem *TreeItem::get_prev() {
 	if (!parent || parent->first_child == this) {
 		return nullptr;
 	}
-	// This is an edge case
+	// This is an edge case.
 	TreeItem *l_prev = parent->first_child;
 	while (l_prev && l_prev->next != this) {
 		l_prev = l_prev->next;
@@ -1167,6 +1206,7 @@ void TreeItem::move_before(TreeItem *p_item) {
 	p_item->prev = this;
 
 	if (tree && old_tree == tree) {
+		tree->queue_accessibility_update();
 		tree->queue_redraw();
 	}
 
@@ -1212,6 +1252,7 @@ void TreeItem::move_after(TreeItem *p_item) {
 	}
 
 	if (tree && old_tree == tree) {
+		tree->queue_accessibility_update();
 		tree->queue_redraw();
 	}
 	validate_cache();
@@ -1245,6 +1286,8 @@ void TreeItem::set_as_cursor(int p_column) {
 	}
 	tree->selected_item = this;
 	tree->selected_col = p_column;
+	tree->selected_button = -1;
+	tree->queue_accessibility_update();
 	tree->queue_redraw();
 }
 
@@ -1262,6 +1305,11 @@ void TreeItem::clear_buttons() {
 	int i = 0;
 	for (Cell &cell : cells) {
 		if (!cell.buttons.is_empty()) {
+			for (Cell::Button &btn : cell.buttons) {
+				if (btn.accessibility_button_element.is_valid()) {
+					DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
+				}
+			}
 			cell.buttons.clear();
 			cell.cached_minimum_size_dirty = true;
 			_changed_notify(i);
@@ -1270,7 +1318,7 @@ void TreeItem::clear_buttons() {
 	}
 }
 
-void TreeItem::add_button(int p_column, const Ref<Texture2D> &p_button, int p_id, bool p_disabled, const String &p_tooltip) {
+void TreeItem::add_button(int p_column, const Ref<Texture2D> &p_button, int p_id, bool p_disabled, const String &p_tooltip, const String &p_alt_text) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 	ERR_FAIL_COND(p_button.is_null());
 	TreeItem::Cell::Button button;
@@ -1281,10 +1329,14 @@ void TreeItem::add_button(int p_column, const Ref<Texture2D> &p_button, int p_id
 	button.id = p_id;
 	button.disabled = p_disabled;
 	button.tooltip = p_tooltip;
+	button.alt_text = p_alt_text;
 	cells.write[p_column].buttons.push_back(button);
 	cells.write[p_column].cached_minimum_size_dirty = true;
 
 	_changed_notify(p_column);
+	if (get_tree()) {
+		get_tree()->update_configuration_warnings();
+	}
 }
 
 int TreeItem::get_button_count(int p_column) const {
@@ -1313,8 +1365,14 @@ int TreeItem::get_button_id(int p_column, int p_index) const {
 void TreeItem::erase_button(int p_column, int p_index) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 	ERR_FAIL_INDEX(p_index, cells[p_column].buttons.size());
+	if (cells[p_column].buttons[p_index].accessibility_button_element.is_valid()) {
+		DisplayServer::get_singleton()->accessibility_free_element(cells.write[p_column].buttons.write[p_index].accessibility_button_element);
+	}
 	cells.write[p_column].buttons.remove_at(p_index);
 	_changed_notify(p_column);
+	if (get_tree()) {
+		get_tree()->update_configuration_warnings();
+	}
 }
 
 int TreeItem::get_button_by_id(int p_column, int p_id) const {
@@ -1338,6 +1396,8 @@ void TreeItem::set_button_tooltip_text(int p_column, int p_index, const String &
 	ERR_FAIL_INDEX(p_column, cells.size());
 	ERR_FAIL_INDEX(p_index, cells[p_column].buttons.size());
 	cells.write[p_column].buttons.write[p_index].tooltip = p_tooltip;
+
+	_changed_notify(p_column);
 }
 
 void TreeItem::set_button(int p_column, int p_index, const Ref<Texture2D> &p_button) {
@@ -1355,6 +1415,21 @@ void TreeItem::set_button(int p_column, int p_index, const Ref<Texture2D> &p_but
 	_changed_notify(p_column);
 }
 
+void TreeItem::set_button_alt_text(int p_column, int p_index, const String &p_alt_text) {
+	ERR_FAIL_INDEX(p_column, cells.size());
+	ERR_FAIL_INDEX(p_index, cells[p_column].buttons.size());
+
+	if (cells[p_column].buttons[p_index].alt_text == p_alt_text) {
+		return;
+	}
+
+	cells.write[p_column].buttons.write[p_index].alt_text = p_alt_text;
+	_changed_notify(p_column);
+	if (get_tree()) {
+		get_tree()->update_configuration_warnings();
+	}
+}
+
 void TreeItem::set_button_color(int p_column, int p_index, const Color &p_color) {
 	ERR_FAIL_INDEX(p_column, cells.size());
 	ERR_FAIL_INDEX(p_index, cells[p_column].buttons.size());
@@ -1688,6 +1763,9 @@ void TreeItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_text", "column", "text"), &TreeItem::set_text);
 	ClassDB::bind_method(D_METHOD("get_text", "column"), &TreeItem::get_text);
 
+	ClassDB::bind_method(D_METHOD("set_alt_text", "column", "text"), &TreeItem::set_alt_text);
+	ClassDB::bind_method(D_METHOD("get_alt_text", "column"), &TreeItem::get_alt_text);
+
 	ClassDB::bind_method(D_METHOD("set_text_direction", "column", "direction"), &TreeItem::set_text_direction);
 	ClassDB::bind_method(D_METHOD("get_text_direction", "column"), &TreeItem::get_text_direction);
 
@@ -1781,7 +1859,7 @@ void TreeItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_custom_set_as_button", "column"), &TreeItem::is_custom_set_as_button);
 
 	ClassDB::bind_method(D_METHOD("clear_buttons"), &TreeItem::clear_buttons);
-	ClassDB::bind_method(D_METHOD("add_button", "column", "button", "id", "disabled", "tooltip_text"), &TreeItem::add_button, DEFVAL(-1), DEFVAL(false), DEFVAL(""));
+	ClassDB::bind_method(D_METHOD("add_button", "column", "button", "id", "disabled", "tooltip_text", "alt_text"), &TreeItem::add_button, DEFVAL(-1), DEFVAL(false), DEFVAL(""), DEFVAL(""));
 	ClassDB::bind_method(D_METHOD("get_button_count", "column"), &TreeItem::get_button_count);
 	ClassDB::bind_method(D_METHOD("get_button_tooltip_text", "column", "button_index"), &TreeItem::get_button_tooltip_text);
 	ClassDB::bind_method(D_METHOD("get_button_id", "column", "button_index"), &TreeItem::get_button_id);
@@ -1791,6 +1869,7 @@ void TreeItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_button_tooltip_text", "column", "button_index", "tooltip"), &TreeItem::set_button_tooltip_text);
 	ClassDB::bind_method(D_METHOD("set_button", "column", "button_index", "button"), &TreeItem::set_button);
 	ClassDB::bind_method(D_METHOD("erase_button", "column", "button_index"), &TreeItem::erase_button);
+	ClassDB::bind_method(D_METHOD("set_button_alt_text", "column", "button_index", "alt_text"), &TreeItem::set_button_alt_text);
 	ClassDB::bind_method(D_METHOD("set_button_disabled", "column", "button_index", "disabled"), &TreeItem::set_button_disabled);
 	ClassDB::bind_method(D_METHOD("set_button_color", "column", "button_index", "color"), &TreeItem::set_button_color);
 	ClassDB::bind_method(D_METHOD("is_button_disabled", "column", "button_index"), &TreeItem::is_button_disabled);
@@ -1864,12 +1943,7 @@ TreeItem::~TreeItem() {
 	clear_children();
 }
 
-/**********************************************/
-/**********************************************/
-/**********************************************/
-/**********************************************/
-/**********************************************/
-/**********************************************/
+/*************************** END of TreeItem ***************************/
 
 void Tree::_update_theme_item_cache() {
 	Control::_update_theme_item_cache();
@@ -1924,7 +1998,7 @@ int Tree::get_item_height(TreeItem *p_item) const {
 	int height = compute_item_height(p_item);
 	height += theme_cache.v_separation;
 
-	if (!p_item->collapsed) { /* if not collapsed, check the children */
+	if (!p_item->collapsed) { // If not collapsed, check the children.
 
 		TreeItem *c = p_item->first_child;
 
@@ -1945,54 +2019,59 @@ void Tree::draw_item_rect(TreeItem::Cell &p_cell, const Rect2i &p_rect, const Co
 	Size2 ts = p_cell.text_buf->get_size();
 	bool rtl = is_layout_rtl();
 
-	int w = 0;
-	Size2i bmsize;
+	Size2i icon_size;
 	if (p_cell.icon.is_valid()) {
-		bmsize = _get_cell_icon_size(p_cell);
-		w += bmsize.width + theme_cache.h_separation;
-		if (rect.size.width > 0 && (w + ts.width) > rect.size.width) {
-			ts.width = rect.size.width - w;
-		}
+		icon_size = _get_cell_icon_size(p_cell);
 	}
-	w += ts.width;
+
+	int displayed_width = 0;
+	if (p_cell.icon.is_valid()) {
+		displayed_width += icon_size.width + theme_cache.h_separation;
+	}
+	if (displayed_width + ts.width > rect.size.width) {
+		ts.width = rect.size.width - displayed_width;
+	}
+	displayed_width += ts.width;
+
+	int empty_width = rect.size.width - displayed_width;
 
 	switch (p_cell.text_alignment) {
 		case HORIZONTAL_ALIGNMENT_FILL:
 		case HORIZONTAL_ALIGNMENT_LEFT: {
 			if (rtl) {
-				rect.position.x += MAX(0, (rect.size.width - w));
+				rect.position.x += empty_width;
 			}
 		} break;
 		case HORIZONTAL_ALIGNMENT_CENTER:
-			rect.position.x += MAX(0, (rect.size.width - w) / 2);
+			rect.position.x += empty_width / 2;
 			break;
 		case HORIZONTAL_ALIGNMENT_RIGHT:
 			if (!rtl) {
-				rect.position.x += MAX(0, (rect.size.width - w));
+				rect.position.x += empty_width;
 			}
 			break;
 	}
 
 	RID ci = get_canvas_item();
 
-	if (rtl && rect.size.width > 0) {
-		Point2 draw_pos = rect.position;
-		draw_pos.y += Math::floor((rect.size.y - p_cell.text_buf->get_size().y) * 0.5);
-		if (p_ol_size > 0 && p_ol_color.a > 0) {
-			p_cell.text_buf->draw_outline(ci, draw_pos, p_ol_size, p_ol_color);
+	if (rtl) {
+		if (ts.width > 0) {
+			Point2 draw_pos = rect.position;
+			draw_pos.y += Math::floor((rect.size.y - p_cell.text_buf->get_size().y) * 0.5);
+			if (p_ol_size > 0 && p_ol_color.a > 0) {
+				p_cell.text_buf->draw_outline(ci, draw_pos, p_ol_size, p_ol_color);
+			}
+			p_cell.text_buf->draw(ci, draw_pos, p_color);
 		}
-		p_cell.text_buf->draw(ci, draw_pos, p_color);
 		rect.position.x += ts.width + theme_cache.h_separation;
-		rect.size.x -= ts.width + theme_cache.h_separation;
 	}
 
 	if (p_cell.icon.is_valid()) {
-		p_cell.draw_icon(ci, rect.position + Size2i(0, Math::floor((real_t)(rect.size.y - bmsize.y) / 2)), bmsize, p_icon_color);
-		rect.position.x += bmsize.x + theme_cache.h_separation;
-		rect.size.x -= bmsize.x + theme_cache.h_separation;
+		p_cell.draw_icon(ci, rect.position + Size2i(0, Math::floor((real_t)(rect.size.y - icon_size.y) / 2)), icon_size, p_icon_color);
+		rect.position.x += icon_size.x + theme_cache.h_separation;
 	}
 
-	if (!rtl && rect.size.width > 0) {
+	if (!rtl && ts.width > 0) {
 		Point2 draw_pos = rect.position;
 		draw_pos.y += Math::floor((rect.size.y - p_cell.text_buf->get_size().y) * 0.5);
 		if (p_ol_size > 0 && p_ol_color.a > 0) {
@@ -2082,7 +2161,7 @@ void Tree::update_item_cell(TreeItem *p_item, int p_col) const {
 	}
 	p_item->cells.write[p_col].text_buf->add_string(valtext, font, font_size, p_item->cells[p_col].language);
 
-	BitField<TextServer::LineBreakFlag> break_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_TRIM_EDGE_SPACES;
+	BitField<TextServer::LineBreakFlag> break_flags = TextServer::BREAK_MANDATORY | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES;
 	switch (p_item->cells.write[p_col].autowrap_mode) {
 		case TextServer::AUTOWRAP_OFF:
 			break;
@@ -2117,7 +2196,7 @@ void Tree::update_item_cache(TreeItem *p_item) const {
 
 int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 &p_draw_size, TreeItem *p_item, int &r_self_height) {
 	if (p_pos.y - theme_cache.offset.y > (p_draw_size.height)) {
-		return -1; //draw no more!
+		return -1; // Draw no more!
 	}
 
 	if (!p_item->is_visible_in_tree()) {
@@ -2131,8 +2210,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 	int label_h = 0;
 	bool rtl = cache.rtl;
 
-	/* Draw label, if height fits */
-
+	// Draw label, if height fits.
 	bool skip = (p_item == root && hide_root);
 
 	if (!skip) {
@@ -2177,14 +2255,14 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				}
 			}
 
-			if (!rtl && p_item->cells[i].buttons.size()) {
+			if (!p_item->cells[i].buttons.is_empty()) {
 				int buttons_width = 0;
 				for (int j = p_item->cells[i].buttons.size() - 1; j >= 0; j--) {
 					Ref<Texture2D> button_texture = p_item->cells[i].buttons[j].texture;
 					buttons_width += button_texture->get_size().width + theme_cache.button_pressed->get_minimum_size().width + theme_cache.button_margin;
 				}
 
-				int total_ofs = ofs - theme_cache.offset.x;
+				double total_ofs = ofs - theme_cache.offset.x;
 
 				// If part of the column is beyond the right side of the control due to scrolling, clamp the label width
 				// so that all buttons attached to the cell remain within view.
@@ -2193,7 +2271,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				}
 			}
 
-			int item_width_with_buttons = item_width; // used later for drawing buttons
+			int item_width_with_buttons = item_width; // Used later for drawing buttons.
 			int buttons_width = 0;
 			for (int j = p_item->cells[i].buttons.size() - 1; j >= 0; j--) {
 				Ref<Texture2D> button_texture = p_item->cells[i].buttons[j].texture;
@@ -2241,10 +2319,18 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 					}
 
 					if (p_item->cells[0].selected) {
-						if (has_focus()) {
-							theme_cache.selected_focus->draw(ci, row_rect);
+						if (is_row_hovered) {
+							if (has_focus()) {
+								theme_cache.hovered_selected_focus->draw(ci, row_rect);
+							} else {
+								theme_cache.hovered_selected->draw(ci, row_rect);
+							}
 						} else {
-							theme_cache.selected->draw(ci, row_rect);
+							if (has_focus()) {
+								theme_cache.selected_focus->draw(ci, row_rect);
+							} else {
+								theme_cache.selected->draw(ci, row_rect);
+							}
 						}
 					} else if (!drop_mode_flags) {
 						if (is_cell_button_hovered) {
@@ -2281,10 +2367,18 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 						r.position.x = get_size().width - r.position.x - r.size.x;
 					}
 					if (p_item->cells[i].selected) {
-						if (has_focus()) {
-							theme_cache.selected_focus->draw(ci, r);
+						if (is_cell_hovered) {
+							if (has_focus()) {
+								theme_cache.hovered_selected_focus->draw(ci, r);
+							} else {
+								theme_cache.hovered_selected->draw(ci, r);
+							}
 						} else {
-							theme_cache.selected->draw(ci, r);
+							if (has_focus()) {
+								theme_cache.selected_focus->draw(ci, r);
+							} else {
+								theme_cache.selected->draw(ci, r);
+							}
 						}
 					}
 				} else {
@@ -2334,7 +2428,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 						RenderingServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y + r.size.y, r.size.x, 1), theme_cache.drop_position_color);
 					}
 				} else if (drop_mode_over == p_item->get_parent()) {
-					if (drop_mode_section == 1 && !p_item->get_prev() /* && !drop_mode_over->is_collapsed() */) { // The drop_mode_over shouldn't ever be collapsed in here, otherwise we would be drawing a child of a collapsed item.
+					if (drop_mode_section == 1 && !p_item->get_prev()) {
 						// Line above.
 						RenderingServer::get_singleton()->canvas_item_add_rect(ci, Rect2(r.position.x, r.position.y, r.size.x, 1), theme_cache.drop_position_color);
 					}
@@ -2347,7 +2441,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 			} else {
 				bool draw_as_hover = !drop_mode_flags && (select_mode == SELECT_ROW ? is_row_hovered : is_cell_hovered);
 				bool draw_as_hover_dim = draw_as_hover && is_cell_button_hovered;
-				cell_color = p_item->cells[i].selected ? theme_cache.font_selected_color : (draw_as_hover_dim ? theme_cache.font_hovered_dimmed_color : (draw_as_hover ? theme_cache.font_hovered_color : theme_cache.font_color));
+				cell_color = p_item->cells[i].selected && draw_as_hover ? theme_cache.font_hovered_selected_color : (p_item->cells[i].selected ? theme_cache.font_selected_color : (draw_as_hover_dim ? theme_cache.font_hovered_dimmed_color : (draw_as_hover ? theme_cache.font_hovered_color : theme_cache.font_color)));
 			}
 
 			Color font_outline_color = theme_cache.font_outline_color;
@@ -2528,19 +2622,26 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				Point2i button_ofs = Point2i(ofs + item_width_with_buttons - button_size.width, p_pos.y) - theme_cache.offset + p_draw_ofs;
 
 				bool should_draw_pressed = cache.click_type == Cache::CLICK_BUTTON && cache.click_item == p_item && cache.click_column == i && cache.click_index == j && !p_item->cells[i].buttons[j].disabled;
-				bool should_draw_hovered = !should_draw_pressed && !drop_mode_flags && cache.hover_item == p_item && cache.hover_column == i && cache.hover_button_index_in_column == j && !p_item->cells[i].buttons[j].disabled;
+				bool should_draw_hovered = !drop_mode_flags && cache.hover_item == p_item && cache.hover_column == i && cache.hover_button_index_in_column == j && !p_item->cells[i].buttons[j].disabled;
 
 				if (should_draw_pressed || should_draw_hovered) {
 					Point2 od = button_ofs;
 					if (rtl) {
 						od.x = get_size().width - od.x - button_size.x;
 					}
-					if (should_draw_pressed) {
+					if (should_draw_pressed && should_draw_hovered) {
 						theme_cache.button_pressed->draw(get_canvas_item(), Rect2(od.x, od.y, button_size.width, MAX(button_size.height, label_h)));
 					} else {
 						theme_cache.button_hover->draw(get_canvas_item(), Rect2(od.x, od.y, button_size.width, MAX(button_size.height, label_h)));
 					}
 				}
+				if (selected_item == p_item && selected_col == i && selected_button == j) {
+					Point2 od = button_ofs;
+					if (rtl) {
+						od.x = get_size().width - od.x - button_size.x;
+					}
+					theme_cache.button_hover->draw(get_canvas_item(), Rect2(od.x, od.y, button_size.width, MAX(button_size.height, label_h)));
+				}
 
 				button_ofs.y += (label_h - button_size.height) / 2;
 				button_ofs += theme_cache.button_pressed->get_offset();
@@ -2571,7 +2672,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 		}
 
 		// Draw the folding arrow.
-		if (!p_item->disable_folding && !hide_folding && p_item->first_child && p_item->get_visible_child_count() != 0) { //has visible children, draw the guide box
+		if (!p_item->disable_folding && !hide_folding && p_item->first_child && p_item->get_visible_child_count() != 0) { // Has visible children, draw the guide box.
 
 			Ref<Texture2D> arrow;
 
@@ -2585,14 +2686,27 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 				arrow = theme_cache.arrow;
 			}
 
-			Point2 apos = p_pos + Point2i(0, (label_h - arrow->get_height()) / 2) - theme_cache.offset + p_draw_ofs;
-			apos.x += theme_cache.item_margin - arrow->get_width();
+			Size2 arrow_full_size = arrow->get_size();
 
-			if (rtl) {
-				apos.x = get_size().width - apos.x - arrow->get_width();
+			Point2 apos = p_pos + Point2i(0, (label_h - arrow_full_size.height) / 2) - theme_cache.offset + p_draw_ofs;
+			apos.x += theme_cache.item_margin - arrow_full_size.width;
+
+			Size2 arrow_draw_size = arrow_full_size;
+			int out_width = p_pos.x + theme_cache.item_margin - get_column_width(0);
+			if (out_width > 0) {
+				arrow_draw_size.width -= out_width;
 			}
 
-			arrow->draw(ci, apos);
+			if (arrow_draw_size.width > 0) {
+				Point2 src_pos = Point2();
+				if (rtl) {
+					apos.x = get_size().width - apos.x - arrow_draw_size.width;
+					src_pos = Point2(arrow_full_size.width - arrow_draw_size.width, 0);
+				}
+				Rect2 arrow_rect = Rect2(apos, arrow_draw_size);
+				Rect2 arrow_src_rect = Rect2(src_pos, arrow_draw_size);
+				arrow->draw_rect_region(ci, arrow_rect, arrow_src_rect);
+			}
 		}
 	}
 
@@ -2604,7 +2718,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 		children_pos.y += htotal;
 	}
 
-	if (!p_item->collapsed) { /* if not collapsed, check the children */
+	if (!p_item->collapsed) { // If not collapsed, check the children.
 		TreeItem *c = p_item->first_child;
 
 		int base_ofs = children_pos.y - theme_cache.offset.y + p_draw_ofs.y;
@@ -2621,20 +2735,22 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 
 			// Draw relationship lines.
 			if (theme_cache.draw_relationship_lines > 0 && (!hide_root || c->parent != root) && c->is_visible_in_tree()) {
-				int root_ofs = children_pos.x + ((p_item->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin);
 				int parent_ofs = p_pos.x + theme_cache.item_margin;
-				Point2i root_pos = Point2i(root_ofs, children_pos.y + child_self_height / 2) - theme_cache.offset + p_draw_ofs;
+				Point2i parent_pos = Point2i(parent_ofs - theme_cache.arrow->get_width() / 2, p_pos.y + label_h / 2 + theme_cache.arrow->get_height() / 2) - theme_cache.offset + p_draw_ofs;
 
-				if (c->get_visible_child_count() > 0) {
+				int root_ofs = children_pos.x + ((p_item->disable_folding || hide_folding) ? theme_cache.h_separation : theme_cache.item_margin);
+				Point2i root_pos = Point2i(root_ofs, children_pos.y + child_self_height / 2) - theme_cache.offset + p_draw_ofs;
+				if (!hide_folding && !p_item->disable_folding && c->get_visible_child_count() > 0) {
 					root_pos -= Point2i(theme_cache.arrow->get_width(), 0);
 				}
+				root_pos.x = MIN(root_pos.x, get_column_width(0) + p_draw_ofs.x);
+
+				bool is_no_space = root_pos.x <= parent_pos.x;
 
 				float line_width = theme_cache.relationship_line_width * Math::round(theme_cache.base_scale);
 				float parent_line_width = theme_cache.parent_hl_line_width * Math::round(theme_cache.base_scale);
 				float children_line_width = theme_cache.children_hl_line_width * Math::round(theme_cache.base_scale);
 
-				Point2i parent_pos = Point2i(parent_ofs - theme_cache.arrow->get_width() / 2, p_pos.y + label_h / 2 + theme_cache.arrow->get_height() / 2) - theme_cache.offset + p_draw_ofs;
-
 				int more_prev_ofs = 0;
 
 				if (root_pos.y + line_width >= 0) {
@@ -2646,10 +2762,12 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 					// Order of parts on this bend: the horizontal line first, then the vertical line.
 					if (_is_branch_selected(c)) {
 						// If this item or one of its children is selected, we draw the line using parent highlight style.
-						if (htotal >= 0) {
-							RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(parent_line_width / 2), root_pos.y), theme_cache.parent_hl_line_color, parent_line_width);
+						if (!is_no_space) {
+							if (htotal >= 0) {
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(parent_line_width / 2), root_pos.y), theme_cache.parent_hl_line_color, parent_line_width);
+							}
+							RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(parent_line_width / 2)), Point2i(parent_pos.x, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 						}
-						RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(parent_line_width / 2)), Point2i(parent_pos.x, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 
 						more_prev_ofs = theme_cache.parent_hl_line_margin;
 						prev_hl_ofs = root_pos.y + Math::floor(parent_line_width / 2);
@@ -2657,33 +2775,41 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2
 						// If parent item is selected (but this item is not), we draw the line using children highlight style.
 						// Siblings of the selected branch can be drawn with a slight offset and their vertical line must appear as highlighted.
 						if (_is_sibling_branch_selected(c)) {
-							if (htotal >= 0) {
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(parent_line_width / 2), root_pos.y), theme_cache.children_hl_line_color, children_line_width);
+							if (!is_no_space) {
+								if (htotal >= 0) {
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(parent_line_width / 2), root_pos.y), theme_cache.children_hl_line_color, children_line_width);
+								}
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(parent_line_width / 2)), Point2i(parent_pos.x, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 							}
-							RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(parent_line_width / 2)), Point2i(parent_pos.x, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 
 							prev_hl_ofs = root_pos.y + Math::floor(parent_line_width / 2);
 						} else {
-							if (htotal >= 0) {
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(children_line_width / 2), root_pos.y), theme_cache.children_hl_line_color, children_line_width);
+							if (!is_no_space) {
+								if (htotal >= 0) {
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(children_line_width / 2), root_pos.y), theme_cache.children_hl_line_color, children_line_width);
+								}
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(children_line_width / 2)), Point2i(parent_pos.x, prev_ofs + Math::floor(children_line_width / 2)), theme_cache.children_hl_line_color, children_line_width);
 							}
-							RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(children_line_width / 2)), Point2i(parent_pos.x, prev_ofs + Math::floor(children_line_width / 2)), theme_cache.children_hl_line_color, children_line_width);
 						}
 					} else {
 						// If nothing of the above is true, we draw the line using normal style.
 						// Siblings of the selected branch can be drawn with a slight offset and their vertical line must appear as highlighted.
 						if (_is_sibling_branch_selected(c)) {
-							if (htotal >= 0) {
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + theme_cache.parent_hl_line_margin, root_pos.y), theme_cache.relationship_line_color, line_width);
+							if (!is_no_space) {
+								if (htotal >= 0) {
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + theme_cache.parent_hl_line_margin, root_pos.y), theme_cache.relationship_line_color, line_width);
+								}
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(parent_line_width / 2)), Point2i(parent_pos.x, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 							}
-							RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(parent_line_width / 2)), Point2i(parent_pos.x, prev_hl_ofs), theme_cache.parent_hl_line_color, parent_line_width);
 
 							prev_hl_ofs = root_pos.y + Math::floor(parent_line_width / 2);
 						} else {
-							if (htotal >= 0) {
-								RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(line_width / 2), root_pos.y), theme_cache.relationship_line_color, line_width);
+							if (!is_no_space) {
+								if (htotal >= 0) {
+									RenderingServer::get_singleton()->canvas_item_add_line(ci, root_pos, Point2i(parent_pos.x + Math::floor(line_width / 2), root_pos.y), theme_cache.relationship_line_color, line_width);
+								}
+								RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(line_width / 2)), Point2i(parent_pos.x, prev_ofs + Math::floor(line_width / 2)), theme_cache.relationship_line_color, line_width);
 							}
-							RenderingServer::get_singleton()->canvas_item_add_line(ci, Point2i(parent_pos.x, root_pos.y + Math::floor(line_width / 2)), Point2i(parent_pos.x, prev_ofs + Math::floor(line_width / 2)), theme_cache.relationship_line_color, line_width);
 						}
 					}
 				}
@@ -2803,6 +2929,7 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c
 
 					selected_item = p_selected;
 					selected_col = i;
+					selected_button = -1;
 
 					emit_signal(SNAME("cell_selected"));
 					if (select_mode == SELECT_MULTI) {
@@ -2814,6 +2941,7 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c
 				} else if (select_mode == SELECT_MULTI && (selected_item != p_selected || selected_col != i)) {
 					selected_item = p_selected;
 					selected_col = i;
+					selected_button = -1;
 					emit_signal(SNAME("cell_selected"));
 				}
 			} else {
@@ -2829,7 +2957,6 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c
 					}
 					c.selected = false;
 				}
-				//p_current->deselected_signal.call(p_col);
 			}
 		}
 	}
@@ -2846,6 +2973,7 @@ void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_c
 		}
 		c = c->next;
 	}
+	queue_accessibility_update();
 }
 
 Rect2 Tree::search_item_rect(TreeItem *p_from, TreeItem *p_item) {
@@ -2876,7 +3004,7 @@ void Tree::_range_click_timeout() {
 
 		cache.rtl = is_layout_rtl();
 
-		propagate_mouse_activated = false; // done from outside, so signal handler can't clear the tree in the middle of emit (which is a common case)
+		propagate_mouse_activated = false; // Done from outside, so signal handler can't clear the tree in the middle of emit (which is a common case).
 		blocked++;
 		propagate_mouse_event(pos + theme_cache.offset, 0, 0, x_limit + theme_cache.offset.width, false, root, MouseButton::LEFT, mb);
 		blocked--;
@@ -2916,8 +3044,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 	bool skip = (p_item == root && hide_root);
 
 	if (!skip && p_pos.y < item_h) {
-		// check event!
-
+		// Check event!
 		if (range_click_timer->get_time_left() > 0 && p_item != range_item_last) {
 			return -1;
 		}
@@ -2982,10 +3109,10 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 		bool already_cursor = (p_item == selected_item) && col == selected_col;
 
 		if (p_button == MouseButton::LEFT || (p_button == MouseButton::RIGHT && allow_rmb_select)) {
-			/* process selection */
+			// Process selection.
 
-			if (p_double_click && (!c.editable || c.mode == TreeItem::CELL_MODE_CUSTOM || c.mode == TreeItem::CELL_MODE_ICON /*|| c.mode==TreeItem::CELL_MODE_CHECK*/)) { //it's confusing for check
-				// Emits the "item_activated" signal.
+			if (p_double_click && (!c.editable || c.mode == TreeItem::CELL_MODE_CUSTOM || c.mode == TreeItem::CELL_MODE_ICON)) {
+				// Emits the `item_activated` signal.
 				propagate_mouse_activated = true;
 
 				incr_search.clear();
@@ -3012,6 +3139,9 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 						int icount = _count_selected_items(root);
 
 						if (select_mode == SELECT_MULTI && icount > 1 && p_button != MouseButton::RIGHT) {
+							if (!already_selected) {
+								select_single_item(p_item, root, col);
+							}
 							single_select_defer = p_item;
 							single_select_defer_column = col;
 						} else {
@@ -3022,23 +3152,23 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 							emit_signal(SNAME("item_mouse_selected"), get_local_mouse_position(), p_button);
 						}
 					}
+					queue_accessibility_update();
 					queue_redraw();
 				}
 			}
 		}
 
 		if (!c.editable) {
-			return -1; // if cell is not editable, don't bother
+			return -1; // If cell is not editable, don't bother.
 		}
 
-		/* editing */
-
+		// Editing.
 		bool bring_up_editor = allow_reselect ? (c.selected && already_selected) : c.selected;
 		String editor_text = c.text;
 
 		switch (c.mode) {
 			case TreeItem::CELL_MODE_STRING: {
-				//nothing in particular
+				// Nothing in particular.
 
 				if (select_mode == SELECT_MULTI && (get_viewport()->get_processed_events_count() == focus_in_id || !already_cursor)) {
 					bring_up_editor = false;
@@ -3046,7 +3176,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 
 			} break;
 			case TreeItem::CELL_MODE_CHECK: {
-				bring_up_editor = false; //checkboxes are not edited with editor
+				bring_up_editor = false; // Checkboxes are not edited with editor.
 				if (force_edit_checkbox_only_on_checkbox) {
 					if (x < theme_cache.checked->get_width()) {
 						p_item->set_checked(col, !c.checked);
@@ -3057,12 +3187,10 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 					item_edited(col, p_item, p_button);
 				}
 				click_handled = true;
-				//p_item->edited_signal.call(col);
 
 			} break;
 			case TreeItem::CELL_MODE_RANGE: {
 				if (!c.text.is_empty()) {
-					//if (x >= (get_column_width(col)-item_h/2)) {
 					popup_menu->clear();
 					for (int i = 0; i < c.text.get_slice_count(","); i++) {
 						String s = c.text.get_slicec(',', i);
@@ -3074,11 +3202,10 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 					popup_menu->popup();
 					popup_edited_item = p_item;
 					popup_edited_item_col = col;
-					//}
 					bring_up_editor = false;
 				} else {
 					if (x >= (col_width - item_h / 2)) {
-						/* touching the combo */
+						// Touching the combo.
 						bool up = p_pos.y < (item_h / 2);
 
 						if (p_button == MouseButton::LEFT) {
@@ -3091,7 +3218,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 								range_click_timer->start();
 
 							} else if (up != range_up_last) {
-								return -1; // break. avoid changing direction on mouse held
+								return -1; // Break. Avoid changing direction on mouse held.
 							}
 
 							p_item->set_range(col, c.val + (up ? 1.0 : -1.0) * c.step);
@@ -3109,7 +3236,6 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 							item_edited(col, p_item, p_button);
 						}
 
-						//p_item->edited_signal.call(col);
 						bring_up_editor = false;
 
 					} else {
@@ -3156,18 +3282,17 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 		pressing_for_editor_text = editor_text;
 		pressing_for_editor = true;
 
-		return -1; //select
+		return -1; // Select.
 	} else {
 		Point2i new_pos = p_pos;
 
 		if (!skip) {
 			x_ofs += theme_cache.item_margin;
-			//new_pos.x-=theme_cache.item_margin;
 			y_ofs += item_h;
 			new_pos.y -= item_h;
 		}
 
-		if (!p_item->collapsed) { /* if not collapsed, check the children */
+		if (!p_item->collapsed) { // If not collapsed, check the children.
 
 			TreeItem *c = p_item->first_child;
 
@@ -3175,7 +3300,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 				int child_h = propagate_mouse_event(new_pos, x_ofs, y_ofs, x_limit, p_double_click, c, p_button, p_mod);
 
 				if (child_h < 0) {
-					return -1; // break, stop propagating, no need to anymore
+					return -1; // Break, stop propagating, no need to anymore.
 				}
 
 				new_pos.y -= child_h;
@@ -3189,12 +3314,12 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, int
 		}
 	}
 
-	return item_h; // nothing found
+	return item_h; // Nothing found.
 }
 
 void Tree::_text_editor_popup_modal_close() {
 	if (popup_edit_committed) {
-		return; // Already processed by LineEdit/TextEdit commit.
+		return; // Already processed by `LineEdit` / `TextEdit` commit.
 	}
 
 	if (popup_editor->get_hide_reason() == Popup::HIDE_REASON_CANCELED) {
@@ -3218,7 +3343,7 @@ void Tree::_text_editor_popup_modal_close() {
 
 void Tree::_text_editor_gui_input(const Ref<InputEvent> &p_event) {
 	if (popup_edit_committed) {
-		return; // Already processed by _text_editor_popup_modal_close
+		return; // Already processed by `_text_editor_popup_modal_close`.
 	}
 
 	if (popup_editor->get_hide_reason() == Popup::HIDE_REASON_CANCELED) {
@@ -3260,7 +3385,7 @@ void Tree::_apply_multiline_edit() {
 
 void Tree::_line_editor_submit(String p_text) {
 	if (popup_edit_committed) {
-		return; // Already processed by _text_editor_popup_modal_close
+		return; // Already processed by _text_editor_popup_modal_close.
 	}
 
 	if (popup_editor->get_hide_reason() == Popup::HIDE_REASON_CANCELED) {
@@ -3282,7 +3407,6 @@ void Tree::_line_editor_submit(String p_text) {
 	switch (c.mode) {
 		case TreeItem::CELL_MODE_STRING: {
 			c.text = p_text;
-			//popup_edited_item->edited_signal.call( popup_edited_item_col );
 		} break;
 		case TreeItem::CELL_MODE_RANGE: {
 			c.val = p_text.to_float();
@@ -3294,7 +3418,6 @@ void Tree::_line_editor_submit(String p_text) {
 			} else if (c.val > c.max) {
 				c.val = c.max;
 			}
-			//popup_edited_item->edited_signal.call( popup_edited_item_col );
 		} break;
 		default: {
 			ERR_FAIL();
@@ -3330,27 +3453,30 @@ void Tree::popup_select(int p_option) {
 	}
 
 	popup_edited_item->cells.write[popup_edited_item_col].val = p_option;
-	//popup_edited_item->edited_signal.call( popup_edited_item_col );
 	queue_redraw();
 	item_edited(popup_edited_item_col, popup_edited_item);
 }
 
 void Tree::_go_left() {
-	if (selected_col == 0) {
+	if (get_tree()->is_accessibility_enabled() && selected_button >= 0) {
+		selected_button--;
+	} else if (selected_col == 0) {
+		selected_button = -1;
 		if (selected_item->get_first_child() != nullptr && !selected_item->is_collapsed()) {
 			selected_item->set_collapsed(true);
 		} else {
-			if (columns.size() == 1) { // goto parent with one column
+			if (columns.size() == 1) { // Goto parent with one column.
 				TreeItem *parent = selected_item->get_parent();
 				if (selected_item != get_root() && parent && parent->is_selectable(selected_col) && !(hide_root && parent == get_root())) {
 					select_single_item(parent, get_root(), selected_col);
 				}
 			} else if (selected_item->get_prev_visible()) {
 				selected_col = columns.size() - 1;
-				_go_up(); // go to upper column if possible
+				_go_up(); // Go to upper column if possible.
 			}
 		}
 	} else {
+		selected_button = -1;
 		if (select_mode == SELECT_MULTI) {
 			selected_col--;
 			emit_signal(SNAME("cell_selected"));
@@ -3358,13 +3484,18 @@ void Tree::_go_left() {
 			selected_item->select(selected_col - 1);
 		}
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	accept_event();
 	ensure_cursor_is_visible();
 }
 
 void Tree::_go_right() {
-	if (selected_col == (columns.size() - 1)) {
+	int buttons = (selected_item && selected_col >= 0 && selected_col < columns.size()) ? selected_item->cells[selected_col].buttons.size() : 0;
+	if (get_tree()->is_accessibility_enabled() && selected_button < buttons - 1) {
+		selected_button++;
+	} else if (selected_col == (columns.size() - 1)) {
+		selected_button = -1;
 		if (selected_item->get_first_child() != nullptr && selected_item->is_collapsed()) {
 			selected_item->set_collapsed(false);
 		} else if (selected_item->get_next_visible()) {
@@ -3372,6 +3503,7 @@ void Tree::_go_right() {
 			_go_down();
 		}
 	} else {
+		selected_button = -1;
 		if (select_mode == SELECT_MULTI) {
 			selected_col++;
 			emit_signal(SNAME("cell_selected"));
@@ -3379,6 +3511,7 @@ void Tree::_go_right() {
 			selected_item->select(selected_col + 1);
 		}
 	}
+	queue_accessibility_update();
 	queue_redraw();
 	ensure_cursor_is_visible();
 	accept_event();
@@ -3389,6 +3522,7 @@ void Tree::_go_up() {
 	if (!selected_item) {
 		prev = get_last_item();
 		selected_col = 0;
+		selected_button = -1;
 	} else {
 		prev = selected_item->get_prev_visible();
 	}
@@ -3408,11 +3542,12 @@ void Tree::_go_up() {
 			prev = prev->get_prev_visible();
 		}
 		if (!prev) {
-			return; // do nothing..
+			return; // Do nothing.
 		}
 		prev->select(col);
 	}
 
+	queue_accessibility_update();
 	ensure_cursor_is_visible();
 	accept_event();
 }
@@ -3442,11 +3577,12 @@ void Tree::_go_down() {
 			next = next->get_next_visible();
 		}
 		if (!next) {
-			return; // do nothing..
+			return; // Do nothing.
 		}
 		next->select(col);
 	}
 
+	queue_accessibility_update();
 	ensure_cursor_is_visible();
 	accept_event();
 }
@@ -3506,7 +3642,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 	Ref<InputEventKey> k = p_event;
 
 	bool is_command = k.is_valid() && k->is_command_or_control_pressed();
-	if (p_event->is_action("ui_right") && p_event->is_pressed()) {
+	if (p_event->is_action(cache.rtl ? "ui_left" : "ui_right") && p_event->is_pressed()) {
 		if (!cursor_can_exit_tree) {
 			accept_event();
 		}
@@ -3524,7 +3660,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 		} else {
 			_go_down();
 		}
-	} else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
+	} else if (p_event->is_action(cache.rtl ? "ui_right" : "ui_left") && p_event->is_pressed()) {
 		if (!cursor_can_exit_tree) {
 			accept_event();
 		}
@@ -3555,7 +3691,12 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 		}
 
 		_go_down();
+	} else if (p_event->is_action("ui_menu") && p_event->is_pressed()) {
+		if (allow_rmb_select && selected_item) {
+			emit_signal(SNAME("item_mouse_selected"), get_item_rect(selected_item).position, MouseButton::RIGHT);
+		}
 
+		accept_event();
 	} else if (p_event->is_action("ui_page_down") && p_event->is_pressed()) {
 		if (!cursor_can_exit_tree) {
 			accept_event();
@@ -3582,13 +3723,14 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 		if (select_mode == SELECT_MULTI) {
 			selected_item = next;
 			emit_signal(SNAME("cell_selected"));
+			queue_accessibility_update();
 			queue_redraw();
 		} else {
 			while (next && !next->cells[selected_col].selectable) {
 				next = next->get_next_visible();
 			}
 			if (!next) {
-				return; // do nothing..
+				return; // Do nothing.
 			}
 			next->select(selected_col);
 		}
@@ -3620,13 +3762,14 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 		if (select_mode == SELECT_MULTI) {
 			selected_item = prev;
 			emit_signal(SNAME("cell_selected"));
+			queue_accessibility_update();
 			queue_redraw();
 		} else {
 			while (prev && !prev->cells[selected_col].selectable) {
 				prev = prev->get_prev_visible();
 			}
 			if (!prev) {
-				return; // do nothing..
+				return; // Do nothing.
 			}
 			prev->select(selected_col);
 		}
@@ -3636,19 +3779,28 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 			if (!selected_item) {
 				return;
 			}
-			if (selected_item->is_selected(selected_col)) {
+			if (selected_item && selected_col != -1 && selected_button != -1) {
+				const TreeItem::Cell &c = selected_item->cells[selected_col];
+				emit_signal("button_clicked", selected_item, selected_col, c.buttons[selected_button].id, MouseButton::LEFT);
+			} else if (selected_item->is_selected(selected_col)) {
 				selected_item->deselect(selected_col);
 				emit_signal(SNAME("multi_selected"), selected_item, selected_col, false);
 			} else if (selected_item->is_selectable(selected_col)) {
 				selected_item->select(selected_col);
 				emit_signal(SNAME("multi_selected"), selected_item, selected_col, true);
 			}
+		} else if (selected_item && selected_col != -1 && selected_button != -1) {
+			const TreeItem::Cell &c = selected_item->cells[selected_col];
+			emit_signal("button_clicked", selected_item, selected_col, c.buttons[selected_button].id, MouseButton::LEFT);
 		}
 		accept_event();
 	} else if (p_event->is_action("ui_accept") && p_event->is_pressed()) {
 		if (selected_item) {
-			//bring up editor if possible
-			if (!edit_selected()) {
+			// Bring up editor if possible.
+			if (selected_item && selected_col != -1 && selected_button != -1) {
+				const TreeItem::Cell &c = selected_item->cells[selected_col];
+				emit_signal("button_clicked", selected_item, selected_col, c.buttons[selected_button].id, MouseButton::LEFT);
+			} else if (!edit_selected()) {
 				emit_signal(SNAME("item_activated"));
 				incr_search.clear();
 			}
@@ -3656,7 +3808,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 		accept_event();
 	}
 
-	if (allow_search && k.is_valid()) { // Incremental search
+	if (allow_search && k.is_valid()) { // Incremental search.
 
 		if (!k->is_pressed()) {
 			return;
@@ -3691,7 +3843,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 
 		bool rtl = is_layout_rtl();
 		if (pressing_for_editor && popup_pressing_edited_item && !popup_pressing_edited_item->cells.is_empty() && (popup_pressing_edited_item->get_cell_mode(popup_pressing_edited_item_column) == TreeItem::CELL_MODE_RANGE)) {
-			/* This needs to happen now, because the popup can be closed when pressing another item, and must remain the popup edited item until it actually closes */
+			// This needs to happen now, because the popup can be closed when pressing another item, and must remain the popup edited item until it actually closes.
 			popup_edited_item = popup_pressing_edited_item;
 			popup_edited_item_col = popup_pressing_edited_item_column;
 
@@ -3699,7 +3851,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 			popup_pressing_edited_item_column = -1;
 
 			if (!range_drag_enabled) {
-				//range drag
+				// Range drag.
 				Vector2 cpos = mm->get_position();
 				if (rtl) {
 					cpos.x = get_size().width - cpos.x;
@@ -3713,7 +3865,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 			} else {
 				const TreeItem::Cell &c = popup_edited_item->cells[popup_edited_item_col];
 				float diff_y = -mm->get_relative().y;
-				diff_y = Math::pow(ABS(diff_y), 1.8f) * SIGN(diff_y);
+				diff_y = Math::pow(Math::abs(diff_y), 1.8f) * SIGN(diff_y);
 				diff_y *= 0.1;
 				range_drag_base = CLAMP(range_drag_base + c.step * diff_y, c.min, c.max);
 				popup_edited_item->set_range(popup_edited_item_col, range_drag_base);
@@ -3783,7 +3935,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 								icon_size_x = icon_region.size.width;
 							}
 						}
-						// Icon is treated as if it is outside of the rect so that double clicking on it will emit the item_icon_double_clicked signal.
+						// Icon is treated as if it is outside of the rect so that double clicking on it will emit the `item_icon_double_clicked` signal.
 						if (rtl) {
 							mpos.x = get_size().width - (mpos.x + icon_size_x);
 						} else {
@@ -3812,9 +3964,16 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 			}
 
 			if (cache.click_type == Cache::CLICK_BUTTON && cache.click_item != nullptr) {
-				// make sure in case of wrong reference after reconstructing whole TreeItems
+				// Make sure the reference is current in case TreeItems is reconstructed.
 				cache.click_item = get_item_at_position(cache.click_pos);
-				emit_signal("button_clicked", cache.click_item, cache.click_column, cache.click_id, mb->get_button_index());
+
+				// Only emit the event if the click is still within the button rect.
+				TreeItem *current_item;
+				int current_column, current_index, current_section;
+				_find_button_at_pos(mb->get_position(), current_item, current_column, current_index, current_section);
+				if (current_item == cache.click_item && current_column == cache.click_column && current_index == cache.click_index) {
+					emit_signal("button_clicked", cache.click_item, cache.click_column, cache.click_id, mb->get_button_index());
+				}
 			}
 
 			cache.click_type = Cache::CLICK_NONE;
@@ -3898,8 +4057,8 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
 				if (!click_handled) {
 					drag_speed = 0;
 					drag_accum = 0;
-					//last_drag_accum=0;
 					drag_from = v_scroll->get_value();
+
 					drag_touching = DisplayServer::get_singleton()->is_touchscreen_available();
 					drag_touching_deaccel = false;
 					if (drag_touching) {
@@ -4025,7 +4184,7 @@ void Tree::_determine_hovered_item() {
 
 		if (it != old_item || col != old_column) {
 			if (old_item && old_column >= old_item->cells.size()) {
-				// Columns may have changed since last redraw().
+				// Columns may have changed since last `redraw()`.
 				queue_redraw();
 			} else {
 				// Only need to update if mouse enters/exits a button.
@@ -4039,7 +4198,6 @@ void Tree::_determine_hovered_item() {
 	}
 
 	// Reduce useless redraw calls.
-
 	bool hovered_cell_button_changed = (cache.hover_button_index_in_column != old_button_index_in_column);
 	bool hovered_column_changed = (cache.hover_column != old_column);
 
@@ -4066,7 +4224,9 @@ bool Tree::edit_selected(bool p_force_edit) {
 		return false;
 	}
 
-	float popup_scale = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor();
+	Size2 scale = popup_editor->get_parent_viewport()->get_popup_base_transform().get_scale() * get_global_transform_with_canvas().get_scale();
+	real_t popup_scale = MIN(scale.x, scale.y);
+
 	Rect2 rect = _get_item_focus_rect(s);
 	rect.position *= popup_scale;
 	popup_edited_item = s;
@@ -4104,16 +4264,24 @@ bool Tree::edit_selected(bool p_force_edit) {
 		Rect2 popup_rect;
 
 		int value_editor_height = c.mode == TreeItem::CELL_MODE_RANGE ? value_editor->get_minimum_size().height : 0;
-		// "floor()" centers vertically.
+		// `floor()` centers vertically.
 		Vector2 ofs(0, Math::floor((MAX(line_editor->get_minimum_size().height, rect.size.height - value_editor_height) - rect.size.height) / 2));
 
-		popup_rect.position = get_screen_position() + rect.position - ofs;
-		popup_rect.size = rect.size;
-
 		// Account for icon.
-		Size2 icon_size = _get_cell_icon_size(c) * popup_scale;
-		popup_rect.position.x += icon_size.x;
-		popup_rect.size.x -= icon_size.x;
+		real_t icon_ofs = 0;
+		if (c.icon.is_valid()) {
+			icon_ofs = _get_cell_icon_size(c).x * popup_scale + theme_cache.h_separation;
+		}
+
+		popup_rect.size = rect.size;
+		popup_rect.size.x -= icon_ofs;
+
+		popup_rect.position = rect.position - ofs;
+		popup_rect.position.x += icon_ofs;
+		if (cache.rtl) {
+			popup_rect.position.x = get_size().width - popup_rect.position.x - popup_rect.size.x;
+		}
+		popup_rect.position += get_screen_position();
 
 		line_editor->clear();
 		line_editor->set_text(c.mode == TreeItem::CELL_MODE_STRING ? c.text : String::num(c.val, Math::range_step_decimals(c.step)));
@@ -4276,8 +4444,360 @@ int Tree::_get_title_button_height() const {
 	return h;
 }
 
+void Tree::_check_item_accessibility(TreeItem *p_item, PackedStringArray &r_warnings, int &r_row) const {
+	for (int i = 0; i < p_item->cells.size(); i++) {
+		const TreeItem::Cell &cell = p_item->cells[i];
+		if (cell.alt_text.strip_edges().is_empty() && cell.text.strip_edges().is_empty()) {
+			r_warnings.push_back(vformat(RTR("Cell %d x %d: either text or alternative text must not be empty."), r_row, i));
+		}
+		for (int j = 0; j < cell.buttons.size(); j++) {
+			if (cell.buttons[j].alt_text.strip_edges().is_empty()) {
+				r_warnings.push_back(vformat(RTR("Button %d in %d x %d: alternative text must not be empty."), j, r_row, i));
+			}
+		}
+	}
+	r_row++;
+
+	// Children.
+	if (!p_item->collapsed) {
+		TreeItem *c = p_item->first_child;
+		while (c) {
+			_check_item_accessibility(c, r_warnings, r_row);
+			c = c->next;
+		}
+	}
+}
+
+PackedStringArray Tree::get_accessibility_configuration_warnings() const {
+	PackedStringArray warnings = Control::get_accessibility_configuration_warnings();
+
+	if (root) {
+		int row = 1;
+		_check_item_accessibility(root, warnings, row);
+	}
+
+	return warnings;
+}
+
+void Tree::_accessibility_action_scroll_down(const Variant &p_data) {
+	v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 4);
+}
+
+void Tree::_accessibility_action_scroll_left(const Variant &p_data) {
+	h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 4);
+}
+
+void Tree::_accessibility_action_scroll_right(const Variant &p_data) {
+	h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 4);
+}
+
+void Tree::_accessibility_action_scroll_up(const Variant &p_data) {
+	v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 4);
+}
+
+void Tree::_accessibility_action_scroll_set(const Variant &p_data) {
+	const Point2 &pos = p_data;
+	h_scroll->set_value(pos.x);
+	v_scroll->set_value(pos.y);
+}
+
+void Tree::_accessibility_action_scroll_into_view(const Variant &p_data, TreeItem *p_item, int p_col) {
+	scroll_to_item(p_item);
+}
+
+void Tree::_accessibility_action_focus(const Variant &p_data, TreeItem *p_item, int p_col) {
+	p_item->select(p_col);
+}
+
+void Tree::_accessibility_action_blur(const Variant &p_data, TreeItem *p_item, int p_col) {
+	p_item->deselect(p_col);
+}
+
+void Tree::_accessibility_action_collapse(const Variant &p_data, TreeItem *p_item) {
+	p_item->set_collapsed(true);
+}
+
+void Tree::_accessibility_action_expand(const Variant &p_data, TreeItem *p_item) {
+	p_item->set_collapsed(false);
+}
+
+void Tree::_accessibility_action_set_text_value(const Variant &p_data, TreeItem *p_item, int p_col) {
+	p_item->set_text(p_col, p_data);
+}
+
+void Tree::_accessibility_action_set_num_value(const Variant &p_data, TreeItem *p_item, int p_col) {
+	p_item->set_range(p_col, p_data);
+}
+
+void Tree::_accessibility_action_set_bool_value(const Variant &p_data, TreeItem *p_item, int p_col) {
+	p_item->set_checked(p_col, !p_item->cells[p_col].checked);
+}
+
+void Tree::_accessibility_action_edit_custom(const Variant &p_data, TreeItem *p_item, int p_col) {
+	float popup_scale = popup_editor->is_embedded() ? 1.0 : popup_editor->get_parent_visible_window()->get_content_scale_factor();
+	Rect2 rect;
+	if (select_mode == SELECT_ROW) {
+		rect = p_item->get_meta("__focus_col_" + itos(p_col));
+	} else {
+		rect = p_item->get_meta("__focus_rect");
+	}
+	rect.position *= popup_scale;
+
+	edited_item = p_item;
+	edited_col = p_col;
+	custom_popup_rect = Rect2i(get_global_position() + rect.position, rect.size);
+	emit_signal(SNAME("custom_popup_edited"), false);
+	item_edited(p_col, p_item);
+}
+
+void Tree::_accessibility_action_set_inc(const Variant &p_data, TreeItem *p_item, int p_col) {
+	p_item->set_range(p_col, p_item->cells[p_col].val + p_item->cells[p_col].step);
+}
+
+void Tree::_accessibility_action_set_dec(const Variant &p_data, TreeItem *p_item, int p_col) {
+	p_item->set_range(p_col, p_item->cells[p_col].val - p_item->cells[p_col].step);
+}
+
+void Tree::_accessibility_action_button_press(const Variant &p_data, TreeItem *p_item, int p_col, int p_btn) {
+	emit_signal("button_clicked", p_item, p_col, p_btn, MouseButton::LEFT);
+}
+
+RID Tree::get_focused_accessibility_element() const {
+	if (selected_item) {
+		if (selected_col >= 0) {
+			if (selected_button >= 0) {
+				return selected_item->cells[selected_col].buttons[selected_button].accessibility_button_element;
+			} else {
+				return selected_item->cells[selected_col].accessibility_cell_element;
+			}
+		} else {
+			return selected_item->accessibility_row_element;
+		}
+	} else {
+		return get_accessibility_element();
+	}
+}
+
+void Tree::_accessibility_clean_info(TreeItem *p_item) {
+	p_item->accessibility_row_element = RID();
+	for (TreeItem::Cell &cell : p_item->cells) {
+		cell.accessibility_cell_element = RID();
+		for (TreeItem::Cell::Button &btn : cell.buttons) {
+			btn.accessibility_button_element = RID();
+		}
+	}
+
+	// Children.
+	TreeItem *c = p_item->first_child;
+	while (c) {
+		_accessibility_clean_info(c);
+		c = c->next;
+	}
+}
+
+void Tree::_accessibility_update_item(Point2 &r_ofs, TreeItem *p_item, int &r_row, int p_level) {
+	// Row.
+	if ((p_item != root || !hide_root) && p_item->is_visible()) {
+		if (p_item->accessibility_row_element.is_null()) {
+			p_item->accessibility_row_element = DisplayServer::get_singleton()->accessibility_create_sub_element(accessibility_scroll_element, DisplayServer::AccessibilityRole::ROLE_TREE_ITEM);
+			p_item->accessibility_row_dirty = true;
+		}
+
+		DisplayServer::get_singleton()->accessibility_update_set_table_row_index(p_item->accessibility_row_element, r_row);
+		DisplayServer::get_singleton()->accessibility_update_set_list_item_level(p_item->accessibility_row_element, p_level);
+		DisplayServer::get_singleton()->accessibility_update_set_list_item_expanded(p_item->accessibility_row_element, !p_item->collapsed);
+		DisplayServer::get_singleton()->accessibility_update_set_flag(p_item->accessibility_row_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !(p_item->visible && !p_item->parent_visible_in_tree));
+		DisplayServer::get_singleton()->accessibility_update_add_action(p_item->accessibility_row_element, DisplayServer::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &Tree::_accessibility_action_collapse).bind(p_item));
+		DisplayServer::get_singleton()->accessibility_update_add_action(p_item->accessibility_row_element, DisplayServer::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &Tree::_accessibility_action_expand).bind(p_item));
+
+		DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(p_item->accessibility_row_element, selected_item == p_item);
+		if (p_item == root && is_root_hidden()) {
+			DisplayServer::get_singleton()->accessibility_update_set_flag(p_item->accessibility_row_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, true);
+		}
+		Transform2D row_xform;
+		row_xform.set_origin(r_ofs);
+		DisplayServer::get_singleton()->accessibility_update_set_transform(p_item->accessibility_row_element, row_xform);
+
+		Size2 item_size = Size2(get_size().width, compute_item_height(p_item));
+		DisplayServer::get_singleton()->accessibility_update_set_bounds(p_item->accessibility_row_element, Rect2(Vector2(), item_size));
+
+		if (p_item->accessibility_row_dirty) {
+			// Cells.
+			int col_offset = 0;
+			for (int i = 0; i < p_item->cells.size(); i++) {
+				TreeItem::Cell &cell = p_item->cells.write[i];
+
+				if (cell.accessibility_cell_element.is_null()) {
+					cell.accessibility_cell_element = DisplayServer::get_singleton()->accessibility_create_sub_element(p_item->accessibility_row_element, DisplayServer::AccessibilityRole::ROLE_CELL);
+				}
+
+				float cw = get_column_width(i);
+
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_SCROLL_INTO_VIEW, callable_mp(this, &Tree::_accessibility_action_scroll_into_view).bind(p_item, i));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Tree::_accessibility_action_focus).bind(p_item, i));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_BLUR, callable_mp(this, &Tree::_accessibility_action_blur).bind(p_item, i));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_COLLAPSE, callable_mp(this, &Tree::_accessibility_action_collapse).bind(p_item));
+				DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_EXPAND, callable_mp(this, &Tree::_accessibility_action_expand).bind(p_item));
+
+				DisplayServer::get_singleton()->accessibility_update_set_table_cell_position(cell.accessibility_cell_element, r_row, i);
+				DisplayServer::get_singleton()->accessibility_update_set_list_item_selected(cell.accessibility_cell_element, cell.selected);
+				if (cell.alt_text.is_empty()) {
+					DisplayServer::get_singleton()->accessibility_update_set_name(cell.accessibility_cell_element, cell.xl_text);
+				} else {
+					DisplayServer::get_singleton()->accessibility_update_set_name(cell.accessibility_cell_element, cell.alt_text);
+				}
+
+				DisplayServer::get_singleton()->accessibility_update_set_text_align(cell.accessibility_cell_element, cell.text_alignment);
+				DisplayServer::get_singleton()->accessibility_update_set_flag(cell.accessibility_cell_element, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !(p_item->visible && !p_item->parent_visible_in_tree));
+				DisplayServer::get_singleton()->accessibility_update_set_flag(cell.accessibility_cell_element, DisplayServer::AccessibilityFlags::FLAG_READONLY, !cell.editable);
+				DisplayServer::get_singleton()->accessibility_update_set_tooltip(cell.accessibility_cell_element, cell.tooltip);
+				switch (cell.mode) {
+					case TreeItem::CELL_MODE_STRING: {
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Tree::_accessibility_action_set_text_value).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_set_value(cell.accessibility_cell_element, cell.xl_text);
+					} break;
+					case TreeItem::CELL_MODE_CHECK: {
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_set_bool_value).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_set_checked(cell.accessibility_cell_element, cell.checked);
+					} break;
+					case TreeItem::CELL_MODE_RANGE: {
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_DECREMENT, callable_mp(this, &Tree::_accessibility_action_set_dec).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_INCREMENT, callable_mp(this, &Tree::_accessibility_action_set_inc).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_SET_VALUE, callable_mp(this, &Tree::_accessibility_action_set_num_value).bind(p_item, i));
+						DisplayServer::get_singleton()->accessibility_update_set_num_value(cell.accessibility_cell_element, cell.val);
+						DisplayServer::get_singleton()->accessibility_update_set_num_range(cell.accessibility_cell_element, cell.min, cell.max);
+						if (cell.step > 0) {
+							DisplayServer::get_singleton()->accessibility_update_set_num_step(cell.accessibility_cell_element, cell.step);
+						} else {
+							DisplayServer::get_singleton()->accessibility_update_set_num_step(cell.accessibility_cell_element, 1);
+						}
+					} break;
+					case TreeItem::CELL_MODE_ICON: {
+						// NOP
+					} break;
+					case TreeItem::CELL_MODE_CUSTOM: {
+						DisplayServer::get_singleton()->accessibility_update_add_action(cell.accessibility_cell_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_edit_custom).bind(p_item, i));
+					} break;
+				}
+				DisplayServer::get_singleton()->accessibility_update_set_background_color(cell.accessibility_cell_element, cell.color);
+				DisplayServer::get_singleton()->accessibility_update_set_foreground_color(cell.accessibility_cell_element, cell.bg_color);
+
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(cell.accessibility_cell_element, Rect2(Point2(col_offset, 0), Size2(cw, item_size.y)));
+
+				Vector2 ofst = Vector2(col_offset + cw, 0);
+				for (int j = cell.buttons.size() - 1; j >= 0; j--) {
+					if (cell.buttons[j].accessibility_button_element.is_null()) {
+						cell.buttons[j].accessibility_button_element = DisplayServer::get_singleton()->accessibility_create_sub_element(cell.accessibility_cell_element, DisplayServer::AccessibilityRole::ROLE_BUTTON);
+					}
+
+					DisplayServer::get_singleton()->accessibility_update_add_action(cell.buttons[j].accessibility_button_element, DisplayServer::AccessibilityAction::ACTION_CLICK, callable_mp(this, &Tree::_accessibility_action_button_press).bind(p_item, i, j));
+					DisplayServer::get_singleton()->accessibility_update_set_flag(cell.buttons[j].accessibility_button_element, DisplayServer::AccessibilityFlags::FLAG_DISABLED, cell.buttons[j].disabled);
+					DisplayServer::get_singleton()->accessibility_update_set_tooltip(cell.buttons[j].accessibility_button_element, cell.buttons[j].tooltip);
+					if (cell.buttons[j].alt_text.is_empty()) {
+						DisplayServer::get_singleton()->accessibility_update_set_name(cell.buttons[j].accessibility_button_element, cell.buttons[j].tooltip);
+					} else {
+						DisplayServer::get_singleton()->accessibility_update_set_name(cell.buttons[j].accessibility_button_element, cell.buttons[j].alt_text);
+					}
+
+					Ref<Texture2D> b = cell.buttons[j].texture;
+					Size2 b_size = b->get_size() + theme_cache.button_pressed->get_minimum_size();
+					ofst.x -= b_size.x;
+
+					DisplayServer::get_singleton()->accessibility_update_set_bounds(cell.buttons[j].accessibility_button_element, Rect2(ofst, b_size));
+				}
+				col_offset += cw;
+			}
+		}
+
+		r_ofs.y += item_size.y;
+		r_ofs.y += theme_cache.v_separation;
+
+		p_item->accessibility_row_dirty = false;
+		r_row++;
+	}
+
+	// Children.
+	if (!p_item->collapsed) {
+		TreeItem *c = p_item->first_child;
+		while (c) {
+			_accessibility_update_item(r_ofs, c, r_row, p_level + 1);
+			c = c->next;
+		}
+	}
+}
+
 void Tree::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_EXIT_TREE:
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			if (root) {
+				_accessibility_clean_info(root);
+			}
+			for (ColumnInfo &col : columns) {
+				col.accessibility_col_element = RID();
+			}
+			accessibility_scroll_element = RID();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_TREE);
+
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &Tree::_accessibility_action_scroll_down));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &Tree::_accessibility_action_scroll_left));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &Tree::_accessibility_action_scroll_right));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &Tree::_accessibility_action_scroll_up));
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &Tree::_accessibility_action_scroll_set));
+
+			Ref<StyleBox> bg = theme_cache.panel_style;
+			int tbh = _get_title_button_height();
+
+			// Columns.
+			int ofs = theme_cache.panel_style->get_margin(SIDE_LEFT);
+			int cs = columns.size();
+			for (int i = 0; i < cs; i++) {
+				ColumnInfo &column = columns.write[i];
+
+				if (column.accessibility_col_element.is_null()) {
+					column.accessibility_col_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_COLUMN_HEADER);
+				}
+
+				DisplayServer::get_singleton()->accessibility_update_set_table_column_index(column.accessibility_col_element, i);
+				DisplayServer::get_singleton()->accessibility_update_set_name(column.accessibility_col_element, column.xl_title);
+				DisplayServer::get_singleton()->accessibility_update_set_text_align(column.accessibility_col_element, column.title_alignment);
+
+				Rect2 tbrect = Rect2(ofs - theme_cache.offset.x, bg->get_margin(SIDE_TOP), get_column_width(i), tbh);
+				if (cache.rtl) {
+					tbrect.position.x = get_size().width - tbrect.size.x - tbrect.position.x;
+				}
+				ofs += tbrect.size.width;
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(column.accessibility_col_element, Rect2(tbrect.position, tbrect.size));
+			}
+
+			DisplayServer::get_singleton()->accessibility_update_set_table_column_count(ae, cs);
+
+			// Scroll container.
+			if (accessibility_scroll_element.is_null()) {
+				accessibility_scroll_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
+			}
+
+			Transform2D scroll_xform;
+			scroll_xform.set_origin(Vector2i(-h_scroll->get_value(), -v_scroll->get_value()));
+			DisplayServer::get_singleton()->accessibility_update_set_transform(accessibility_scroll_element, scroll_xform);
+			DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_scroll_element, Rect2(0, 0, h_scroll->get_max(), v_scroll->get_max()));
+
+			// Rows (and cells).
+			Point2 origin = Point2(theme_cache.panel_style->get_margin(SIDE_LEFT) - theme_cache.offset.x, bg->get_margin(SIDE_TOP) + tbh);
+			int rows = 0;
+			if (root) {
+				_accessibility_update_item(origin, root, rows, 0);
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_table_row_count(ae, rows);
+
+		} break;
+
 		case NOTIFICATION_FOCUS_ENTER: {
 			if (get_viewport()) {
 				focus_in_id = get_viewport()->get_processed_events_count();
@@ -4362,15 +4882,15 @@ void Tree::_notification(int p_what) {
 			if (scrolling && get_rect().grow(theme_cache.scroll_border).has_point(mouse_position)) {
 				Point2 point;
 
-				if ((ABS(mouse_position.x) < ABS(mouse_position.x - get_size().width)) && (ABS(mouse_position.x) < theme_cache.scroll_border)) {
+				if ((Math::abs(mouse_position.x) < Math::abs(mouse_position.x - get_size().width)) && (Math::abs(mouse_position.x) < theme_cache.scroll_border)) {
 					point.x = mouse_position.x - theme_cache.scroll_border;
-				} else if (ABS(mouse_position.x - get_size().width) < theme_cache.scroll_border) {
+				} else if (Math::abs(mouse_position.x - get_size().width) < theme_cache.scroll_border) {
 					point.x = mouse_position.x - (get_size().width - theme_cache.scroll_border);
 				}
 
-				if ((ABS(mouse_position.y) < ABS(mouse_position.y - get_size().height)) && (ABS(mouse_position.y) < theme_cache.scroll_border)) {
+				if ((Math::abs(mouse_position.y) < Math::abs(mouse_position.y - get_size().height)) && (Math::abs(mouse_position.y) < theme_cache.scroll_border)) {
 					point.y = mouse_position.y - theme_cache.scroll_border;
-				} else if (ABS(mouse_position.y - get_size().height) < theme_cache.scroll_border) {
+				} else if (Math::abs(mouse_position.y - get_size().height) < theme_cache.scroll_border) {
 					point.y = mouse_position.y - (get_size().height - theme_cache.scroll_border);
 				}
 
@@ -4408,7 +4928,7 @@ void Tree::_notification(int p_what) {
 			}
 
 			if (show_column_titles) {
-				//title buttons
+				// Title buttons.
 				int ofs2 = theme_cache.panel_style->get_margin(SIDE_LEFT);
 				for (int i = 0; i < columns.size(); i++) {
 					Ref<StyleBox> sb = (cache.click_type == Cache::CLICK_TITLE && cache.click_index == i) ? theme_cache.title_button_pressed : ((cache.hover_header_row && cache.hover_header_column == i) ? theme_cache.title_button_hover : theme_cache.title_button);
@@ -4418,7 +4938,7 @@ void Tree::_notification(int p_what) {
 					}
 					sb->draw(ci, tbrect);
 					ofs2 += tbrect.size.width;
-					//text
+					// Text.
 					int clip_w = tbrect.size.width - sb->get_minimum_size().width;
 					columns.write[i].text_buf->set_width(clip_w);
 					columns.write[i].cached_minimum_width_dirty = true;
@@ -4529,6 +5049,7 @@ TreeItem *Tree::create_item(TreeItem *p_parent, int p_index) {
 
 	_determine_hovered_item();
 
+	queue_accessibility_update();
 	return ti;
 }
 
@@ -4556,6 +5077,7 @@ void Tree::item_edited(int p_column, TreeItem *p_item, MouseButton p_custom_mous
 	if (p_custom_mouse_index != MouseButton::NONE) {
 		emit_signal(SNAME("custom_item_clicked"), p_custom_mouse_index);
 	}
+	queue_accessibility_update();
 }
 
 void Tree::item_changed(int p_column, TreeItem *p_item) {
@@ -4569,7 +5091,9 @@ void Tree::item_changed(int p_column, TreeItem *p_item) {
 				columns.write[i].cached_minimum_width_dirty = true;
 			}
 		}
+		p_item->accessibility_row_dirty = true;
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4580,13 +5104,16 @@ void Tree::item_selected(int p_column, TreeItem *p_item) {
 		}
 
 		p_item->cells.write[p_column].selected = true;
-		//emit_signal(SNAME("multi_selected"),p_item,p_column,true); - NO this is for TreeItem::select
+		//emit_signal(SNAME("multi_selected"),p_item,p_column,true); - NO this is for `TreeItem::select`
 
 		selected_col = p_column;
 		selected_item = p_item;
+		selected_button = -1;
 	} else {
 		select_single_item(p_item, root, p_column);
 	}
+	p_item->accessibility_row_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4605,6 +5132,7 @@ void Tree::item_deselected(int p_column, TreeItem *p_item) {
 			}
 		}
 	}
+	selected_button = -1;
 
 	if (select_mode == SELECT_MULTI || select_mode == SELECT_SINGLE) {
 		p_item->cells.write[p_column].selected = false;
@@ -4613,6 +5141,8 @@ void Tree::item_deselected(int p_column, TreeItem *p_item) {
 			p_item->cells.write[i].selected = false;
 		}
 	}
+	p_item->accessibility_row_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4643,7 +5173,8 @@ void Tree::deselect_all() {
 
 	selected_item = nullptr;
 	selected_col = -1;
-
+	selected_button = -1;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4675,6 +5206,7 @@ void Tree::clear() {
 
 	_determine_hovered_item();
 
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4684,6 +5216,7 @@ void Tree::set_hide_root(bool p_enabled) {
 	}
 
 	hide_root = p_enabled;
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 }
@@ -4704,6 +5237,7 @@ void Tree::set_column_custom_minimum_width(int p_column, int p_min_width) {
 	}
 	columns.write[p_column].custom_min_width = p_min_width;
 	columns.write[p_column].cached_minimum_width_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4716,6 +5250,7 @@ void Tree::set_column_expand(int p_column, bool p_expand) {
 
 	columns.write[p_column].expand = p_expand;
 	columns.write[p_column].cached_minimum_width_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4728,6 +5263,7 @@ void Tree::set_column_expand_ratio(int p_column, int p_ratio) {
 
 	columns.write[p_column].expand_ratio = p_ratio;
 	columns.write[p_column].cached_minimum_width_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4740,6 +5276,7 @@ void Tree::set_column_clip_content(int p_column, bool p_fit) {
 
 	columns.write[p_column].clip_content = p_fit;
 	columns.write[p_column].cached_minimum_width_dirty = true;
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4900,6 +5437,19 @@ int Tree::get_column_width(int p_column) const {
 
 void Tree::propagate_set_columns(TreeItem *p_item) {
 	p_item->cells.resize(columns.size());
+	p_item->accessibility_row_dirty = true;
+	for (TreeItem::Cell &cell : p_item->cells) {
+		if (cell.accessibility_cell_element.is_valid()) {
+			DisplayServer::get_singleton()->accessibility_free_element(cell.accessibility_cell_element);
+			cell.accessibility_cell_element = RID();
+		}
+		for (TreeItem::Cell::Button &btn : cell.buttons) {
+			if (btn.accessibility_button_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
+				btn.accessibility_button_element = RID();
+			}
+		}
+	}
 
 	TreeItem *c = p_item->get_first_child();
 	while (c) {
@@ -4911,6 +5461,16 @@ void Tree::propagate_set_columns(TreeItem *p_item) {
 void Tree::set_columns(int p_columns) {
 	ERR_FAIL_COND(p_columns < 1);
 	ERR_FAIL_COND(blocked > 0);
+
+	if (columns.size() > p_columns) {
+		for (int i = p_columns; i < columns.size(); i++) {
+			if (columns[i].accessibility_col_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(columns[i].accessibility_col_element);
+				columns.write[i].accessibility_col_element = RID();
+			}
+		}
+	}
+
 	columns.resize(p_columns);
 
 	if (root) {
@@ -4918,7 +5478,9 @@ void Tree::set_columns(int p_columns) {
 	}
 	if (selected_col >= p_columns) {
 		selected_col = p_columns - 1;
+		selected_button = -1;
 	}
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -4980,7 +5542,7 @@ void Tree::ensure_cursor_is_visible() {
 		return; // Nothing under cursor.
 	}
 
-	// Note: Code below similar to Tree::scroll_to_item(), in case of bug fix both.
+	// Note: Code below similar to `Tree::scroll_to_item()`, in case of bug fix both.
 	const Size2 area_size = _get_content_rect().size;
 
 	int y_offset = get_item_offset(selected_item);
@@ -5000,7 +5562,7 @@ void Tree::ensure_cursor_is_visible() {
 		}
 	}
 
-	if (select_mode != SELECT_ROW) { // Cursor always at col 0 in this mode.
+	if (select_mode != SELECT_ROW) { // Cursor always at column 0 in this mode.
 		int x_offset = 0;
 		for (int i = 0; i < selected_col; i++) {
 			x_offset += get_column_width(i);
@@ -5017,6 +5579,8 @@ void Tree::ensure_cursor_is_visible() {
 			h_scroll->set_value(x_offset);
 		}
 	}
+
+	queue_accessibility_update();
 }
 
 int Tree::get_pressed_button() const {
@@ -5030,7 +5594,7 @@ Rect2 Tree::get_item_rect(TreeItem *p_item, int p_column, int p_button) const {
 		ERR_FAIL_INDEX_V(p_column, columns.size(), Rect2());
 	}
 	if (p_button != -1) {
-		ERR_FAIL_COND_V(p_column == -1, Rect2()); // pass a column if you want to pass a button
+		ERR_FAIL_COND_V(p_column == -1, Rect2()); // Pass a column if you want to pass a button.
 		ERR_FAIL_INDEX_V(p_button, p_item->cells[p_column].buttons.size(), Rect2());
 	}
 
@@ -5083,7 +5647,7 @@ Rect2 Tree::get_item_rect(TreeItem *p_item, int p_column, int p_button) const {
 					if (r.position.x + r.size.x < content_rect_end_x) {
 						return Rect2(ofst, Size2(size.x, r.size.y));
 					}
-					// Button block can be outside of content_rect
+					// Button block can be outside of `content_rect`.
 					if (content_rect_end_x - (r.position.x + theme_cache.h_separation) < buttons_width) {
 						return Rect2(r.position + Point2(theme_cache.h_separation + (buttons_width - ((r.position.x + r.size.x) - ofst.x)), 0), Size2(size.x, r.size.y));
 					}
@@ -5103,6 +5667,7 @@ void Tree::set_column_titles_visible(bool p_show) {
 	}
 
 	show_column_titles = p_show;
+	queue_accessibility_update();
 	queue_redraw();
 	update_minimum_size();
 }
@@ -5121,6 +5686,7 @@ void Tree::set_column_title(int p_column, const String &p_title) {
 	columns.write[p_column].title = p_title;
 	columns.write[p_column].xl_title = atr(p_title);
 	update_column(p_column);
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -5142,6 +5708,7 @@ void Tree::set_column_title_alignment(int p_column, HorizontalAlignment p_alignm
 
 	columns.write[p_column].title_alignment = p_alignment;
 	update_column(p_column);
+	queue_accessibility_update();
 	queue_redraw();
 }
 
@@ -5156,6 +5723,7 @@ void Tree::set_column_title_direction(int p_column, Control::TextDirection p_tex
 	if (columns[p_column].text_direction != p_text_direction) {
 		columns.write[p_column].text_direction = p_text_direction;
 		update_column(p_column);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -5170,6 +5738,7 @@ void Tree::set_column_title_language(int p_column, const String &p_language) {
 	if (columns[p_column].language != p_language) {
 		columns.write[p_column].language = p_language;
 		update_column(p_column);
+		queue_accessibility_update();
 		queue_redraw();
 	}
 }
@@ -5195,7 +5764,7 @@ void Tree::scroll_to_item(TreeItem *p_item, bool p_center_on_item) {
 
 	update_scrollbars();
 
-	// Note: Code below similar to Tree::ensure_cursor_is_visible(), in case of bug fix both.
+	// Note: Code below similar to `Tree::ensure_cursor_is_visible()`, in case of bug fix both.
 	const Size2 area_size = _get_content_rect().size;
 
 	int y_offset = get_item_offset(p_item);
@@ -5220,6 +5789,7 @@ void Tree::scroll_to_item(TreeItem *p_item, bool p_center_on_item) {
 			}
 		}
 	}
+	queue_accessibility_update();
 }
 
 void Tree::set_h_scroll_enabled(bool p_enable) {
@@ -5327,7 +5897,7 @@ TreeItem *Tree::get_item_with_metadata(const Variant &p_find, int p_column) cons
 }
 
 void Tree::_do_incr_search(const String &p_add) {
-	uint64_t time = OS::get_singleton()->get_ticks_usec() / 1000; // convert to msec
+	uint64_t time = OS::get_singleton()->get_ticks_usec() / 1000; // Convert to msec.
 	uint64_t diff = time - last_keypress;
 	if (diff > uint64_t(GLOBAL_GET("gui/timers/incremental_search_max_interval_msec"))) {
 		incr_search = p_add;
@@ -5395,7 +5965,7 @@ TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_
 	}
 
 	if (p_item->is_collapsed() || !p_item->is_visible_in_tree()) {
-		return nullptr; // do not try children, it's collapsed
+		return nullptr; // Do not try children, it's collapsed.
 	}
 
 	TreeItem *n = p_item->get_first_child();
@@ -5413,10 +5983,10 @@ TreeItem *Tree::_find_item_at_pos(TreeItem *p_item, const Point2 &p_pos, int &r_
 	return nullptr;
 }
 
-// When on a button, r_index is valid.
-// When on an item, both r_item and r_column are valid.
-// Otherwise, all output arguments are invalid.
 void Tree::_find_button_at_pos(const Point2 &p_pos, TreeItem *&r_item, int &r_column, int &r_index, int &r_section) const {
+	// When on a button, `r_index` is valid.
+	// When on an item, both `r_item` and `r_column` are valid.
+	// Otherwise, all output arguments are invalid.
 	r_item = nullptr;
 	r_column = -1;
 	r_index = -1;
@@ -5658,18 +6228,29 @@ TreeItem *Tree::get_item_at_position(const Point2 &p_pos) const {
 }
 
 int Tree::get_button_id_at_position(const Point2 &p_pos) const {
-	if (!root || !Rect2(Vector2(), get_size()).has_point(p_pos)) {
+	if (!root) {
 		return -1;
 	}
 
-	TreeItem *it;
-	int col, index, section;
-	_find_button_at_pos(p_pos, it, col, index, section);
+	if (p_pos == Vector2(Math::INF, Math::INF)) {
+		if (selected_item && selected_button >= 0) {
+			return selected_item->cells[selected_col].buttons[selected_button].id;
+		}
+	} else {
+		if (!Rect2(Vector2(), get_size()).has_point(p_pos)) {
+			return -1;
+		}
 
-	if (index == -1) {
-		return -1;
+		TreeItem *it;
+		int col, index, section;
+		_find_button_at_pos(p_pos, it, col, index, section);
+
+		if (index == -1) {
+			return -1;
+		}
+		return it->cells[col].buttons[index].id;
 	}
-	return it->cells[col].buttons[index].id;
+	return -1;
 }
 
 String Tree::get_tooltip(const Point2 &p_pos) const {
@@ -5913,6 +6494,8 @@ void Tree::_bind_methods() {
 
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, Tree, hovered);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, Tree, hovered_dimmed);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, Tree, hovered_selected);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, Tree, hovered_selected_focus);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, Tree, selected);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, Tree, selected_focus);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_STYLEBOX, Tree, cursor);
@@ -5940,6 +6523,7 @@ void Tree::_bind_methods() {
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_hovered_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_hovered_dimmed_color);
+	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_hovered_selected_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_selected_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, font_disabled_color);
 	BIND_THEME_ITEM(Theme::DATA_TYPE_COLOR, Tree, drop_position_color);
diff --git a/engine/scene/gui/tree.h b/engine/scene/gui/tree.h
index 9d3324bd..979b7ac2 100644
--- a/engine/scene/gui/tree.h
+++ b/engine/scene/gui/tree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TREE_H
-#define TREE_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/gui/line_edit.h"
@@ -46,17 +45,18 @@ class TreeItem : public Object {
 
 public:
 	enum TreeCellMode {
-		CELL_MODE_STRING, ///< just a string
-		CELL_MODE_CHECK, ///< string + check
-		CELL_MODE_RANGE, ///< Contains a range
-		CELL_MODE_ICON, ///< Contains an icon, not editable
-		CELL_MODE_CUSTOM, ///< Contains a custom value, show a string, and an edit button
+		CELL_MODE_STRING,
+		CELL_MODE_CHECK,
+		CELL_MODE_RANGE,
+		CELL_MODE_ICON,
+		CELL_MODE_CUSTOM,
 	};
 
 private:
 	friend class Tree;
 
 	struct Cell {
+		mutable RID accessibility_cell_element;
 		TreeCellMode mode = TreeItem::CELL_MODE_STRING;
 
 		Ref<Texture2D> icon;
@@ -65,6 +65,7 @@ private:
 		String text;
 		String xl_text;
 		Node::AutoTranslateMode auto_translate_mode = Node::AUTO_TRANSLATE_MODE_INHERIT;
+		String alt_text;
 		bool edit_multiline = false;
 		String suffix;
 		Ref<TextParagraph> text_buf;
@@ -105,11 +106,13 @@ private:
 		Callable custom_draw_callback;
 
 		struct Button {
+			mutable RID accessibility_button_element;
 			int id = 0;
 			bool disabled = false;
 			Ref<Texture2D> texture;
 			Color color = Color(1, 1, 1, 1);
 			String tooltip;
+			String alt_text;
 		};
 
 		Vector<Button> buttons;
@@ -126,23 +129,26 @@ private:
 		void draw_icon(const RID &p_where, const Point2 &p_pos, const Size2 &p_size = Size2(), const Color &p_color = Color()) const;
 	};
 
+	mutable RID accessibility_row_element;
+	mutable bool accessibility_row_dirty = true;
+
 	Vector<Cell> cells;
 
-	bool collapsed = false; // won't show children
+	bool collapsed = false; // Won't show children.
 	bool visible = true;
 	bool parent_visible_in_tree = true;
 	bool disable_folding = false;
 	int custom_min_height = 0;
 
-	TreeItem *parent = nullptr; // parent item
-	TreeItem *prev = nullptr; // previous in list
-	TreeItem *next = nullptr; // next in list
+	TreeItem *parent = nullptr; // Parent item.
+	TreeItem *prev = nullptr; // Previous in list.
+	TreeItem *next = nullptr; // Next in list.
 	TreeItem *first_child = nullptr;
 	TreeItem *last_child = nullptr;
 
 	Vector<TreeItem *> children_cache;
-	bool is_root = false; // for tree root
-	Tree *tree = nullptr; // tree (for reference)
+	bool is_root = false; // For tree root.
+	Tree *tree = nullptr; // Tree (for reference).
 
 	TreeItem(Tree *p_tree);
 
@@ -166,6 +172,22 @@ private:
 	}
 
 	_FORCE_INLINE_ void _unlink_from_tree() {
+		if (accessibility_row_element.is_valid()) {
+			DisplayServer::get_singleton()->accessibility_free_element(accessibility_row_element);
+			accessibility_row_element = RID();
+		}
+		for (Cell &cell : cells) {
+			if (cell.accessibility_cell_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(cell.accessibility_cell_element);
+				cell.accessibility_cell_element = RID();
+			}
+			for (Cell::Button &btn : cell.buttons) {
+				if (btn.accessibility_button_element.is_valid()) {
+					DisplayServer::get_singleton()->accessibility_free_element(btn.accessibility_button_element);
+					btn.accessibility_button_element = RID();
+				}
+			}
+		}
 		TreeItem *p = get_prev();
 		if (p) {
 			p->next = next;
@@ -191,7 +213,12 @@ private:
 protected:
 	static void _bind_methods();
 
-	// Bind helpers
+#ifndef DISABLE_DEPRECATED
+	void _add_button_bind_compat_76829(int p_column, const Ref<Texture2D> &p_button, int p_id, bool p_disabled, const String &p_tooltip);
+	static void _bind_compatibility_methods();
+#endif
+
+	// Bind helpers.
 	Dictionary _get_range_config(int p_column) {
 		Dictionary d;
 		double min = 0.0, max = 0.0, step = 0.0;
@@ -207,19 +234,19 @@ protected:
 	void _call_recursive_bind(const Variant **p_args, int p_argcount, Callable::CallError &r_error);
 
 public:
-	/* cell mode */
+	// Cell mode.
 	void set_cell_mode(int p_column, TreeCellMode p_mode);
 	TreeCellMode get_cell_mode(int p_column) const;
 
-	/* auto translate mode */
+	// Auto translate mode.
 	void set_auto_translate_mode(int p_column, Node::AutoTranslateMode p_mode);
 	Node::AutoTranslateMode get_auto_translate_mode(int p_column) const;
 
-	/* multiline editable */
+	// Multiline editable.
 	void set_edit_multiline(int p_column, bool p_multiline);
 	bool is_edit_multiline(int p_column) const;
 
-	/* check mode */
+	// Check mode.
 	void set_checked(int p_column, bool p_checked);
 	void set_indeterminate(int p_column, bool p_indeterminate);
 	bool is_checked(int p_column) const;
@@ -241,6 +268,9 @@ public:
 	void set_text(int p_column, String p_text);
 	String get_text(int p_column) const;
 
+	void set_alt_text(int p_column, String p_text);
+	String get_alt_text(int p_column) const;
+
 	void set_text_direction(int p_column, Control::TextDirection p_text_direction);
 	Control::TextDirection get_text_direction(int p_column) const;
 
@@ -278,7 +308,7 @@ public:
 	int get_icon_max_width(int p_column) const;
 
 	void clear_buttons();
-	void add_button(int p_column, const Ref<Texture2D> &p_button, int p_id = -1, bool p_disabled = false, const String &p_tooltip = "");
+	void add_button(int p_column, const Ref<Texture2D> &p_button, int p_id = -1, bool p_disabled = false, const String &p_tooltip = "", const String &p_alt_text = "");
 	int get_button_count(int p_column) const;
 	String get_button_tooltip_text(int p_column, int p_index) const;
 	Ref<Texture2D> get_button(int p_column, int p_index) const;
@@ -288,12 +318,12 @@ public:
 	Color get_button_color(int p_column, int p_index) const;
 	void set_button_tooltip_text(int p_column, int p_index, const String &p_tooltip);
 	void set_button(int p_column, int p_index, const Ref<Texture2D> &p_button);
+	void set_button_alt_text(int p_column, int p_index, const String &p_alt_text);
 	void set_button_color(int p_column, int p_index, const Color &p_color);
 	void set_button_disabled(int p_column, int p_index, bool p_disabled);
 	bool is_button_disabled(int p_column, int p_index) const;
 
-	/* range works for mode number or mode combo */
-
+	// Range works for mode number or mode combo.
 	void set_range(int p_column, double p_value);
 	double get_range(int p_column) const;
 
@@ -367,8 +397,7 @@ public:
 
 	Size2 get_minimum_size(int p_column);
 
-	/* Item manipulation */
-
+	// Item manipulation.
 	TreeItem *create_child(int p_index = -1);
 	void add_child(TreeItem *p_item);
 	void remove_child(TreeItem *p_item);
@@ -460,12 +489,10 @@ private:
 
 	bool propagate_mouse_activated = false;
 
-	//TreeItem *cursor_item;
-	//int cursor_column;
-
 	Rect2 custom_popup_rect;
 	int edited_col = -1;
 	int selected_col = -1;
+	int selected_button = -1;
 	int popup_edited_item_col = -1;
 	bool hide_root = false;
 	SelectMode select_mode = SELECT_SINGLE;
@@ -475,6 +502,7 @@ private:
 	int drop_mode_flags = 0;
 
 	struct ColumnInfo {
+		mutable RID accessibility_col_element;
 		int custom_min_width = 0;
 		int expand_ratio = 1;
 		bool expand = true;
@@ -499,6 +527,8 @@ private:
 	VBoxContainer *popup_editor_vb = nullptr;
 
 	bool popup_edit_committed = true;
+	RID accessibility_scroll_element;
+
 	Popup *popup_editor = nullptr;
 	LineEdit *line_editor = nullptr;
 	TextEdit *text_editor = nullptr;
@@ -520,7 +550,6 @@ private:
 	void update_column(int p_col);
 	void update_item_cell(TreeItem *p_item, int p_col) const;
 	void update_item_cache(TreeItem *p_item) const;
-	//void draw_item_text(String p_text,const Ref<Texture2D>& p_icon,int p_icon_max_w,bool p_tool,Rect2i p_rect,const Color& p_color);
 	void draw_item_rect(TreeItem::Cell &p_cell, const Rect2i &p_rect, const Color &p_color, const Color &p_icon_color, int p_ol_size, const Color &p_ol_color);
 	int draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 &p_draw_size, TreeItem *p_item, int &r_self_height);
 	void select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_col, TreeItem *p_prev = nullptr, bool *r_in_range = nullptr, bool p_force_deselect = false);
@@ -551,6 +580,8 @@ private:
 
 		Ref<StyleBox> hovered;
 		Ref<StyleBox> hovered_dimmed;
+		Ref<StyleBox> hovered_selected;
+		Ref<StyleBox> hovered_selected_focus;
 		Ref<StyleBox> selected;
 		Ref<StyleBox> selected_focus;
 		Ref<StyleBox> cursor;
@@ -581,6 +612,7 @@ private:
 		Color font_color;
 		Color font_hovered_color;
 		Color font_hovered_dimmed_color;
+		Color font_hovered_selected_color;
 		Color font_selected_color;
 		Color font_disabled_color;
 		Color guide_color;
@@ -628,7 +660,6 @@ private:
 			CLICK_NONE,
 			CLICK_TITLE,
 			CLICK_BUTTON,
-
 		};
 
 		ClickType click_type = Cache::CLICK_NONE;
@@ -661,7 +692,6 @@ private:
 	void update_scrollbars();
 
 	Rect2 search_item_rect(TreeItem *p_from, TreeItem *p_item);
-	//Rect2 get_item_rect(TreeItem *p_item);
 	uint64_t last_keypress = 0;
 	String incr_search;
 	bool cursor_can_exit_tree = true;
@@ -683,17 +713,9 @@ private:
 
 	FindColumnButtonResult _find_column_and_button_at_pos(int p_x, const TreeItem *p_item, int p_x_ofs, int p_x_limit) const;
 
-	/*	float drag_speed;
-	float drag_accum;
-
-	float last_drag_accum;
-	float last_drag_time;
-	float time_since_motion;*/
-
 	float drag_speed = 0.0;
 	float drag_from = 0.0;
 	float drag_accum = 0.0;
-	Vector2 last_speed;
 	bool drag_touching = false;
 	bool drag_touching_deaccel = false;
 	bool click_handled = false;
@@ -727,13 +749,39 @@ private:
 	Rect2 _get_content_rect() const; // Considering the background stylebox and scrollbars.
 	Rect2 _get_item_focus_rect(const TreeItem *p_item) const;
 
+	void _check_item_accessibility(TreeItem *p_item, PackedStringArray &r_warnings, int &r_row) const;
+
+	void _accessibility_clean_info(TreeItem *p_item);
+	void _accessibility_update_item(Point2 &r_ofs, TreeItem *p_item, int &r_row, int p_level);
+
 protected:
 	virtual void _update_theme_item_cache() override;
 
 	void _notification(int p_what);
 	static void _bind_methods();
 
+	void _accessibility_action_scroll_down(const Variant &p_data);
+	void _accessibility_action_scroll_left(const Variant &p_data);
+	void _accessibility_action_scroll_right(const Variant &p_data);
+	void _accessibility_action_scroll_up(const Variant &p_data);
+	void _accessibility_action_scroll_set(const Variant &p_data);
+	void _accessibility_action_scroll_into_view(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_focus(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_blur(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_collapse(const Variant &p_data, TreeItem *p_item);
+	void _accessibility_action_expand(const Variant &p_data, TreeItem *p_item);
+	void _accessibility_action_set_text_value(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_set_num_value(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_set_bool_value(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_set_inc(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_set_dec(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_edit_custom(const Variant &p_data, TreeItem *p_item, int p_col);
+	void _accessibility_action_button_press(const Variant &p_data, TreeItem *p_item, int p_col, int p_btn);
+
 public:
+	PackedStringArray get_accessibility_configuration_warnings() const override;
+	virtual RID get_focused_accessibility_element() const override;
+
 	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 
 	virtual String get_tooltip(const Point2 &p_pos) const override;
@@ -854,5 +902,3 @@ public:
 
 VARIANT_ENUM_CAST(Tree::SelectMode);
 VARIANT_ENUM_CAST(Tree::DropModeFlags);
-
-#endif // TREE_H
diff --git a/engine/scene/gui/video_stream_player.cpp b/engine/scene/gui/video_stream_player.cpp
index fa965179..3829836d 100644
--- a/engine/scene/gui/video_stream_player.cpp
+++ b/engine/scene/gui/video_stream_player.cpp
@@ -127,6 +127,13 @@ void VideoStreamPlayer::_mix_audio() {
 
 void VideoStreamPlayer::_notification(int p_notification) {
 	switch (p_notification) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_VIDEO);
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			AudioServer::get_singleton()->add_mix_callback(_mix_audios, this);
 
@@ -136,6 +143,7 @@ void VideoStreamPlayer::_notification(int p_notification) {
 		} break;
 
 		case NOTIFICATION_EXIT_TREE: {
+			stop();
 			AudioServer::get_singleton()->remove_mix_callback(_mix_audios, this);
 		} break;
 
@@ -175,7 +183,7 @@ void VideoStreamPlayer::_notification(int p_notification) {
 				return;
 			}
 
-			Size2 s = expand ? get_size() : texture->get_size();
+			Size2 s = expand ? get_size() : texture_size;
 			draw_texture_rect(texture, Rect2(Point2(), s), false);
 		} break;
 
@@ -211,9 +219,25 @@ void VideoStreamPlayer::_notification(int p_notification) {
 	}
 }
 
+void VideoStreamPlayer::texture_changed(const Ref<Texture2D> &p_texture) {
+	const Size2 new_texture_size = p_texture.is_valid() ? p_texture->get_size() : Size2();
+
+	if (new_texture_size == texture_size) {
+		return;
+	}
+
+	texture_size = new_texture_size;
+
+	queue_redraw();
+
+	if (!expand) {
+		update_minimum_size();
+	}
+}
+
 Size2 VideoStreamPlayer::get_minimum_size() const {
 	if (!expand && texture.is_valid()) {
-		return texture->get_size();
+		return texture_size;
 	} else {
 		return Size2();
 	}
@@ -265,10 +289,19 @@ void VideoStreamPlayer::set_stream(const Ref<VideoStream> &p_stream) {
 		stream->connect_changed(callable_mp(this, &VideoStreamPlayer::set_stream).bind(stream));
 	}
 
+	if (texture.is_valid()) {
+		texture->disconnect_changed(callable_mp(this, &VideoStreamPlayer::texture_changed));
+	}
+
 	if (playback.is_valid()) {
 		playback->set_paused(paused);
 		texture = playback->get_texture();
 
+		if (texture.is_valid()) {
+			texture_size = texture->get_size();
+			texture->connect_changed(callable_mp(this, &VideoStreamPlayer::texture_changed).bind(texture));
+		}
+
 		const int channels = playback->get_channels();
 
 		AudioServer::get_singleton()->lock();
diff --git a/engine/scene/gui/video_stream_player.h b/engine/scene/gui/video_stream_player.h
index 2cbe6cac..9a71b14f 100644
--- a/engine/scene/gui/video_stream_player.h
+++ b/engine/scene/gui/video_stream_player.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VIDEO_STREAM_PLAYER_H
-#define VIDEO_STREAM_PLAYER_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/resources/video_stream.h"
@@ -52,6 +51,8 @@ class VideoStreamPlayer : public Control {
 	RID stream_rid;
 
 	Ref<Texture2D> texture;
+	Size2 texture_size;
+	void texture_changed(const Ref<Texture2D> &p_texture);
 
 	AudioRBResampler resampler;
 	Vector<AudioFrame> mix_buffer;
@@ -126,5 +127,3 @@ public:
 	VideoStreamPlayer();
 	~VideoStreamPlayer();
 };
-
-#endif // VIDEO_STREAM_PLAYER_H
diff --git a/engine/scene/gui/view_panner.cpp b/engine/scene/gui/view_panner.cpp
index ac6aa2f2..ebc91ac0 100644
--- a/engine/scene/gui/view_panner.cpp
+++ b/engine/scene/gui/view_panner.cpp
@@ -226,9 +226,7 @@ void ViewPanner::set_force_drag(bool p_force) {
 }
 
 ViewPanner::ViewPanner() {
-	Array inputs;
-	inputs.append(InputEventKey::create_reference(Key::SPACE));
-
+	Array inputs = { InputEventKey::create_reference(Key::SPACE) };
 	pan_view_shortcut.instantiate();
 	pan_view_shortcut->set_events(inputs);
 }
diff --git a/engine/scene/gui/view_panner.h b/engine/scene/gui/view_panner.h
index 7b1ac27a..942d940d 100644
--- a/engine/scene/gui/view_panner.h
+++ b/engine/scene/gui/view_panner.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VIEW_PANNER_H
-#define VIEW_PANNER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -93,5 +92,3 @@ public:
 
 	ViewPanner();
 };
-
-#endif // VIEW_PANNER_H
diff --git a/engine/scene/main/canvas_item.cpp b/engine/scene/main/canvas_item.cpp
index e978099a..92a47153 100644
--- a/engine/scene/main/canvas_item.cpp
+++ b/engine/scene/main/canvas_item.cpp
@@ -292,6 +292,13 @@ void CanvasItem::_exit_canvas() {
 
 void CanvasItem::_notification(int p_what) {
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !visible);
+		} break;
+
 		case NOTIFICATION_ENTER_TREE: {
 			ERR_MAIN_THREAD_GUARD;
 			ERR_FAIL_COND(!is_inside_tree());
@@ -743,7 +750,7 @@ void CanvasItem::draw_arc(const Vector2 &p_center, real_t p_radius, real_t p_sta
 	Point2 *points_ptr = points.ptrw();
 
 	// Clamp angle difference to full circle so arc won't overlap itself.
-	const real_t delta_angle = CLAMP(p_end_angle - p_start_angle, -Math_TAU, Math_TAU);
+	const real_t delta_angle = CLAMP(p_end_angle - p_start_angle, -Math::TAU, Math::TAU);
 	for (int i = 0; i < p_point_count; i++) {
 		real_t theta = (i / (p_point_count - 1.0f)) * delta_angle + p_start_angle;
 		points_ptr[i] = p_center + Vector2(Math::cos(theta), Math::sin(theta)) * p_radius;
@@ -816,7 +823,7 @@ void CanvasItem::draw_circle(const Point2 &p_pos, real_t p_radius, const Color &
 		points.resize(circle_segments + 1);
 
 		Vector2 *points_ptr = points.ptrw();
-		const real_t circle_point_step = Math_TAU / circle_segments;
+		const real_t circle_point_step = Math::TAU / circle_segments;
 
 		for (int i = 0; i < circle_segments; i++) {
 			float angle = i * circle_point_step;
@@ -1245,6 +1252,38 @@ void CanvasItem::_validate_property(PropertyInfo &p_property) const {
 	}
 }
 
+PackedStringArray CanvasItem::get_configuration_warnings() const {
+	PackedStringArray warnings = Node::get_configuration_warnings();
+
+	if (clip_children_mode != CLIP_CHILDREN_DISABLED && is_inside_tree()) {
+		bool warned_about_ancestor_clipping = false;
+		bool warned_about_canvasgroup_ancestor = false;
+		Node *n = get_parent();
+		while (n) {
+			CanvasItem *as_canvas_item = Object::cast_to<CanvasItem>(n);
+			if (!warned_about_ancestor_clipping && as_canvas_item && as_canvas_item->clip_children_mode != CLIP_CHILDREN_DISABLED) {
+				warnings.push_back(vformat(RTR("Ancestor \"%s\" clips its children, so this node will not be able to clip its children."), as_canvas_item->get_name()));
+				warned_about_ancestor_clipping = true;
+			}
+
+			CanvasGroup *as_canvas_group = Object::cast_to<CanvasGroup>(n);
+			if (!warned_about_canvasgroup_ancestor && as_canvas_group) {
+				warnings.push_back(vformat(RTR("Ancestor \"%s\" is a CanvasGroup, so this node will not be able to clip its children."), as_canvas_group->get_name()));
+				warned_about_canvasgroup_ancestor = true;
+			}
+
+			// Only break out early once both warnings have been triggered, so
+			// that the user is aware of both possible reasons for clipping not working.
+			if (warned_about_ancestor_clipping && warned_about_canvasgroup_ancestor) {
+				break;
+			}
+			n = n->get_parent();
+		}
+	}
+
+	return warnings;
+}
+
 void CanvasItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_top_level_raise_self"), &CanvasItem::_top_level_raise_self);
 
@@ -1646,6 +1685,8 @@ void CanvasItem::set_clip_children_mode(ClipChildrenMode p_clip_mode) {
 	}
 	clip_children_mode = p_clip_mode;
 
+	update_configuration_warnings();
+
 	if (Object::cast_to<CanvasGroup>(this) != nullptr) {
 		//avoid accidental bugs, make this not work on CanvasGroup
 		return;
@@ -1653,6 +1694,7 @@ void CanvasItem::set_clip_children_mode(ClipChildrenMode p_clip_mode) {
 
 	RS::get_singleton()->canvas_item_set_canvas_group_mode(get_canvas_item(), RS::CanvasGroupMode(clip_children_mode));
 }
+
 CanvasItem::ClipChildrenMode CanvasItem::get_clip_children_mode() const {
 	ERR_READ_THREAD_GUARD_V(CLIP_CHILDREN_DISABLED);
 	return clip_children_mode;
diff --git a/engine/scene/main/canvas_item.h b/engine/scene/main/canvas_item.h
index ece1aa2c..b4319a6c 100644
--- a/engine/scene/main/canvas_item.h
+++ b/engine/scene/main/canvas_item.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CANVAS_ITEM_H
-#define CANVAS_ITEM_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "scene/resources/font.h"
@@ -399,6 +398,8 @@ public:
 	int get_canvas_layer() const;
 	CanvasLayer *get_canvas_layer_node() const;
 
+	virtual PackedStringArray get_configuration_warnings() const override;
+
 	CanvasItem();
 	~CanvasItem();
 };
@@ -460,5 +461,3 @@ public:
 	CanvasTexture();
 	~CanvasTexture();
 };
-
-#endif // CANVAS_ITEM_H
diff --git a/engine/scene/main/canvas_layer.h b/engine/scene/main/canvas_layer.h
index 7b43bc08..84137e23 100644
--- a/engine/scene/main/canvas_layer.h
+++ b/engine/scene/main/canvas_layer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CANVAS_LAYER_H
-#define CANVAS_LAYER_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -111,5 +110,3 @@ public:
 	CanvasLayer();
 	~CanvasLayer();
 };
-
-#endif // CANVAS_LAYER_H
diff --git a/engine/scene/main/http_request.cpp b/engine/scene/main/http_request.cpp
index 9de2d62e..ea8034ef 100644
--- a/engine/scene/main/http_request.cpp
+++ b/engine/scene/main/http_request.cpp
@@ -241,7 +241,7 @@ bool HTTPRequest::_handle_response(bool *ret_value) {
 
 		for (const String &E : rheaders) {
 			if (E.containsn("Location: ")) {
-				new_request = E.substr(9, E.length()).strip_edges();
+				new_request = E.substr(9).strip_edges();
 			}
 		}
 
diff --git a/engine/scene/main/http_request.h b/engine/scene/main/http_request.h
index 9a91171e..a2b56b06 100644
--- a/engine/scene/main/http_request.h
+++ b/engine/scene/main/http_request.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HTTP_REQUEST_H
-#define HTTP_REQUEST_H
+#pragma once
 
 #include "core/io/http_client.h"
 #include "core/io/stream_peer_gzip.h"
@@ -167,5 +166,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(HTTPRequest::Result);
-
-#endif // HTTP_REQUEST_H
diff --git a/engine/scene/main/instance_placeholder.h b/engine/scene/main/instance_placeholder.h
index ccf1e63a..a754c398 100644
--- a/engine/scene/main/instance_placeholder.h
+++ b/engine/scene/main/instance_placeholder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INSTANCE_PLACEHOLDER_H
-#define INSTANCE_PLACEHOLDER_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -67,5 +66,3 @@ public:
 
 	InstancePlaceholder();
 };
-
-#endif // INSTANCE_PLACEHOLDER_H
diff --git a/engine/scene/main/missing_node.h b/engine/scene/main/missing_node.h
index 8ec21ad3..b986655e 100644
--- a/engine/scene/main/missing_node.h
+++ b/engine/scene/main/missing_node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MISSING_NODE_H
-#define MISSING_NODE_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -62,5 +61,3 @@ public:
 
 	MissingNode();
 };
-
-#endif // MISSING_NODE_H
diff --git a/engine/scene/main/multiplayer_api.h b/engine/scene/main/multiplayer_api.h
index a578e6f2..7308c9b8 100644
--- a/engine/scene/main/multiplayer_api.h
+++ b/engine/scene/main/multiplayer_api.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIPLAYER_API_H
-#define MULTIPLAYER_API_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "scene/main/multiplayer_peer.h"
@@ -111,5 +110,3 @@ public:
 	GDVIRTUAL2R(Error, _object_configuration_add, Object *, Variant);
 	GDVIRTUAL2R(Error, _object_configuration_remove, Object *, Variant);
 };
-
-#endif // MULTIPLAYER_API_H
diff --git a/engine/scene/main/multiplayer_peer.cpp b/engine/scene/main/multiplayer_peer.cpp
index 8c9eeea0..4d4a1215 100644
--- a/engine/scene/main/multiplayer_peer.cpp
+++ b/engine/scene/main/multiplayer_peer.cpp
@@ -137,7 +137,7 @@ Error MultiplayerPeerExtension::get_packet(const uint8_t **r_buffer, int &r_buff
 			return FAILED;
 		}
 
-		if (script_buffer.size() == 0) {
+		if (script_buffer.is_empty()) {
 			return Error::ERR_UNAVAILABLE;
 		}
 
diff --git a/engine/scene/main/multiplayer_peer.h b/engine/scene/main/multiplayer_peer.h
index ed1d5683..f2dbac13 100644
--- a/engine/scene/main/multiplayer_peer.h
+++ b/engine/scene/main/multiplayer_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIPLAYER_PEER_H
-#define MULTIPLAYER_PEER_H
+#pragma once
 
 #include "core/io/packet_peer.h"
 
@@ -146,5 +145,3 @@ public:
 	EXBIND0RC(int, get_unique_id);
 	EXBIND0RC(ConnectionStatus, get_connection_status);
 };
-
-#endif // MULTIPLAYER_PEER_H
diff --git a/engine/scene/main/node.cpp b/engine/scene/main/node.cpp
index 1cd99b79..3dd1fb51 100644
--- a/engine/scene/main/node.cpp
+++ b/engine/scene/main/node.cpp
@@ -43,14 +43,87 @@
 #include "scene/resources/packed_scene.h"
 #include "viewport.h"
 
-#include <stdint.h>
-
 int Node::orphan_node_count = 0;
 
 thread_local Node *Node::current_process_thread_group = nullptr;
 
 void Node::_notification(int p_notification) {
 	switch (p_notification) {
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			if (data.accessibility_element.is_valid()) {
+				DisplayServer::get_singleton()->accessibility_free_element(data.accessibility_element);
+				data.accessibility_element = RID();
+			}
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			// Base info.
+			if (data.parent) {
+				String container_info = data.parent->get_accessibility_container_name(this);
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, container_info.is_empty() ? get_accessibility_name() : get_accessibility_name() + " " + container_info);
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_name(ae, get_accessibility_name());
+			}
+			DisplayServer::get_singleton()->accessibility_update_set_description(ae, get_accessibility_description());
+			DisplayServer::get_singleton()->accessibility_update_set_live(ae, get_accessibility_live());
+
+			// Related nodes.
+			for (int i = 0; i < data.accessibility_controls_nodes.size(); i++) {
+				const NodePath &np = data.accessibility_controls_nodes[i];
+				if (!np.is_empty()) {
+					Node *n = get_node(np);
+					if (n && !n->is_part_of_edited_scene()) {
+						DisplayServer::get_singleton()->accessibility_update_add_related_controls(ae, n->get_accessibility_element());
+					}
+				}
+			}
+			for (int i = 0; i < data.accessibility_described_by_nodes.size(); i++) {
+				const NodePath &np = data.accessibility_described_by_nodes[i];
+				if (!np.is_empty()) {
+					Node *n = get_node(np);
+					if (n && !n->is_part_of_edited_scene()) {
+						DisplayServer::get_singleton()->accessibility_update_add_related_described_by(ae, n->get_accessibility_element());
+					}
+				}
+			}
+			for (int i = 0; i < data.accessibility_labeled_by_nodes.size(); i++) {
+				const NodePath &np = data.accessibility_labeled_by_nodes[i];
+				if (!np.is_empty()) {
+					Node *n = get_node(np);
+					if (n && !n->is_part_of_edited_scene()) {
+						DisplayServer::get_singleton()->accessibility_update_add_related_labeled_by(ae, n->get_accessibility_element());
+					}
+				}
+			}
+			for (int i = 0; i < data.accessibility_flow_to_nodes.size(); i++) {
+				const NodePath &np = data.accessibility_flow_to_nodes[i];
+				if (!np.is_empty()) {
+					Node *n = get_node(np);
+					if (n && !n->is_part_of_edited_scene()) {
+						DisplayServer::get_singleton()->accessibility_update_add_related_flow_to(ae, n->get_accessibility_element());
+					}
+				}
+			}
+
+			// Node children.
+			if (!accessibility_override_tree_hierarchy()) {
+				for (int i = 0; i < get_child_count(); i++) {
+					Node *child_node = get_child(i);
+					Window *child_wnd = Object::cast_to<Window>(child_node);
+					if (child_wnd && !child_wnd->is_embedded()) {
+						continue;
+					}
+					if (child_node->is_part_of_edited_scene()) {
+						continue;
+					}
+					DisplayServer::get_singleton()->accessibility_update_add_child(ae, child_node->get_accessibility_element());
+				}
+			}
+		} break;
+
 		case NOTIFICATION_PROCESS: {
 			GDVIRTUAL_CALL(_process, get_process_delta_time());
 		} break;
@@ -63,6 +136,16 @@ void Node::_notification(int p_notification) {
 			ERR_FAIL_NULL(get_viewport());
 			ERR_FAIL_NULL(get_tree());
 
+			if (get_tree()->is_accessibility_supported() && !is_part_of_edited_scene()) {
+				get_tree()->_accessibility_force_update();
+				get_tree()->_accessibility_notify_change(this);
+				if (data.parent) {
+					get_tree()->_accessibility_notify_change(data.parent);
+				} else {
+					get_tree()->_accessibility_notify_change(get_window()); // Root node.
+				}
+			}
+
 			// Update process mode.
 			if (data.process_mode == PROCESS_MODE_INHERIT) {
 				if (data.parent) {
@@ -153,6 +236,19 @@ void Node::_notification(int p_notification) {
 			ERR_FAIL_NULL(get_viewport());
 			ERR_FAIL_NULL(get_tree());
 
+			if (get_tree()->is_accessibility_supported() && !is_part_of_edited_scene()) {
+				if (data.accessibility_element.is_valid()) {
+					DisplayServer::get_singleton()->accessibility_free_element(data.accessibility_element);
+					data.accessibility_element = RID();
+				}
+				get_tree()->_accessibility_notify_change(this, true);
+				if (data.parent) {
+					get_tree()->_accessibility_notify_change(data.parent);
+				} else {
+					get_tree()->_accessibility_notify_change(get_window()); // Root node.
+				}
+			}
+
 			get_tree()->nodes_in_tree_count--;
 			orphan_node_count++;
 
@@ -227,10 +323,6 @@ void Node::_notification(int p_notification) {
 			GDVIRTUAL_CALL(_ready);
 		} break;
 
-		case NOTIFICATION_POSTINITIALIZE: {
-			data.in_constructor = false;
-		} break;
-
 		case NOTIFICATION_PREDELETE: {
 			if (data.inside_tree && !Thread::is_main_thread()) {
 				cancel_free();
@@ -1378,7 +1470,95 @@ void Node::_propagate_translation_domain_dirty() {
 			child->_propagate_translation_domain_dirty();
 		}
 	}
-	notification(NOTIFICATION_TRANSLATION_CHANGED);
+
+	if (is_inside_tree() && data.auto_translate_mode != AUTO_TRANSLATE_MODE_DISABLED) {
+		notification(NOTIFICATION_TRANSLATION_CHANGED);
+	}
+}
+
+void Node::set_accessibility_name(const String &p_name) {
+	ERR_THREAD_GUARD
+	if (data.accessibility_name != p_name) {
+		data.accessibility_name = p_name;
+		queue_accessibility_update();
+		update_configuration_warnings();
+	}
+}
+
+String Node::get_accessibility_name() const {
+	return atr(data.accessibility_name);
+}
+
+void Node::set_accessibility_description(const String &p_description) {
+	ERR_THREAD_GUARD
+	if (data.accessibility_description != p_description) {
+		data.accessibility_description = p_description;
+		queue_accessibility_update();
+	}
+}
+
+String Node::get_accessibility_description() const {
+	return atr(data.accessibility_description);
+}
+
+void Node::set_accessibility_live(DisplayServer::AccessibilityLiveMode p_mode) {
+	ERR_THREAD_GUARD
+	if (data.accessibility_live != p_mode) {
+		data.accessibility_live = p_mode;
+		queue_accessibility_update();
+	}
+}
+
+DisplayServer::AccessibilityLiveMode Node::get_accessibility_live() const {
+	return data.accessibility_live;
+}
+
+void Node::set_accessibility_controls_nodes(const TypedArray<NodePath> &p_node_path) {
+	ERR_THREAD_GUARD
+	if (data.accessibility_controls_nodes != p_node_path) {
+		data.accessibility_controls_nodes = p_node_path;
+		queue_accessibility_update();
+	}
+}
+
+TypedArray<NodePath> Node::get_accessibility_controls_nodes() const {
+	return data.accessibility_controls_nodes;
+}
+
+void Node::set_accessibility_described_by_nodes(const TypedArray<NodePath> &p_node_path) {
+	ERR_THREAD_GUARD
+	if (data.accessibility_described_by_nodes != p_node_path) {
+		data.accessibility_described_by_nodes = p_node_path;
+		queue_accessibility_update();
+	}
+}
+
+TypedArray<NodePath> Node::get_accessibility_described_by_nodes() const {
+	return data.accessibility_described_by_nodes;
+}
+
+void Node::set_accessibility_labeled_by_nodes(const TypedArray<NodePath> &p_node_path) {
+	ERR_THREAD_GUARD
+	if (data.accessibility_labeled_by_nodes != p_node_path) {
+		data.accessibility_labeled_by_nodes = p_node_path;
+		queue_accessibility_update();
+	}
+}
+
+TypedArray<NodePath> Node::get_accessibility_labeled_by_nodes() const {
+	return data.accessibility_labeled_by_nodes;
+}
+
+void Node::set_accessibility_flow_to_nodes(const TypedArray<NodePath> &p_node_path) {
+	ERR_THREAD_GUARD
+	if (data.accessibility_flow_to_nodes != p_node_path) {
+		data.accessibility_flow_to_nodes = p_node_path;
+		queue_accessibility_update();
+	}
+}
+
+TypedArray<NodePath> Node::get_accessibility_flow_to_nodes() const {
+	return data.accessibility_flow_to_nodes;
 }
 
 StringName Node::get_name() const {
@@ -1461,6 +1641,8 @@ String Node::adjust_name_casing(const String &p_name) {
 			return p_name.to_camel_case();
 		case NAME_CASING_SNAKE_CASE:
 			return p_name.to_snake_case();
+		case NAME_CASING_KEBAB_CASE:
+			return p_name.to_kebab_case();
 	}
 	return p_name;
 }
@@ -1637,8 +1819,6 @@ void Node::_add_child_nocheck(Node *p_child, const StringName &p_name, InternalM
 	}
 
 	/* Notify */
-	//recognize children created in this node constructor
-	p_child->data.parent_owned = data.in_constructor;
 	add_child_notify(p_child);
 	notification(NOTIFICATION_CHILD_ORDER_CHANGED);
 	emit_signal(SNAME("child_order_changed"));
@@ -1698,7 +1878,6 @@ void Node::remove_child(Node *p_child) {
 
 	data.blocked++;
 	p_child->_set_tree(nullptr);
-	//}
 
 	remove_child_notify(p_child);
 	p_child->notification(NOTIFICATION_UNPARENTED);
@@ -1957,6 +2136,7 @@ void Node::reparent(Node *p_parent, bool p_keep_global_transform) {
 	ERR_THREAD_GUARD
 	ERR_FAIL_NULL(p_parent);
 	ERR_FAIL_NULL_MSG(data.parent, "Node needs a parent to be reparented.");
+	ERR_FAIL_COND_MSG(p_parent == this, vformat("Can't reparent '%s' to itself.", p_parent->get_name()));
 
 	if (p_parent == data.parent) {
 		return;
@@ -2683,11 +2863,11 @@ bool Node::is_part_of_edited_scene() const {
 
 void Node::get_storable_properties(HashSet<StringName> &r_storable_properties) const {
 	ERR_THREAD_GUARD
-	List<PropertyInfo> pi;
-	get_property_list(&pi);
-	for (List<PropertyInfo>::Element *E = pi.front(); E; E = E->next()) {
-		if ((E->get().usage & PROPERTY_USAGE_STORAGE)) {
-			r_storable_properties.insert(E->get().name);
+	List<PropertyInfo> property_list;
+	get_property_list(&property_list);
+	for (const PropertyInfo &pi : property_list) {
+		if ((pi.usage & PROPERTY_USAGE_STORAGE)) {
+			r_storable_properties.insert(pi.name);
 		}
 	}
 }
@@ -2792,12 +2972,8 @@ Node *Node::_duplicate(int p_flags, HashMap<const Node *, Node *> *r_duplimap) c
 		instance_roots.push_back(this);
 
 		for (List<const Node *>::Element *N = node_tree.front(); N; N = N->next()) {
-			for (int i = 0; i < N->get()->get_child_count(); ++i) {
-				Node *descendant = N->get()->get_child(i);
-
-				if (!descendant->get_owner()) {
-					continue; // Internal nodes or nodes added by scripts.
-				}
+			for (int i = 0; i < N->get()->get_child_count(false); ++i) {
+				Node *descendant = N->get()->get_child(i, false);
 
 				// Skip nodes not really belonging to the instantiated hierarchy; they'll be processed normally later
 				// but remember non-instantiated nodes that are hidden below instantiated ones
@@ -2841,10 +3017,7 @@ Node *Node::_duplicate(int p_flags, HashMap<const Node *, Node *> *r_duplimap) c
 		}
 	}
 
-	for (int i = 0; i < get_child_count(); i++) {
-		if (get_child(i)->data.parent_owned) {
-			continue;
-		}
+	for (int i = 0; i < get_child_count(false); i++) {
 		if (instantiated && get_child(i)->data.owner == this) {
 			continue; //part of instance
 		}
@@ -3038,10 +3211,10 @@ void Node::_duplicate_properties(const Node *p_root, const Node *p_original, Nod
 		}
 	}
 
-	for (int i = 0; i < p_original->get_child_count(); i++) {
-		Node *copy_child = p_copy->get_child(i);
+	for (int i = 0; i < p_original->get_child_count(false); i++) {
+		Node *copy_child = p_copy->get_child(i, false);
 		ERR_FAIL_NULL_MSG(copy_child, "Child node disappeared while duplicating.");
-		_duplicate_properties(p_root, p_original->get_child(i), copy_child, p_flags);
+		_duplicate_properties(p_root, p_original->get_child(i, false), copy_child, p_flags);
 	}
 }
 
@@ -3072,7 +3245,11 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
 				if (!target) {
 					continue;
 				}
+
 				NodePath ptarget = p_original->get_path_to(target);
+				if (ptarget.is_empty()) {
+					continue;
+				}
 
 				Node *copytarget = target;
 
@@ -3158,8 +3335,8 @@ void Node::replace_by(Node *p_node, bool p_keep_groups) {
 	while (get_child_count()) {
 		Node *child = get_child(0);
 		remove_child(child);
-		if (!child->is_owned_by_parent()) {
-			// add the custom children to the p_node
+		if (!child->is_internal()) {
+			// Add the custom children to the p_node.
 			Node *child_owner = child->get_owner() == this ? p_node : child->get_owner();
 			child->set_owner(nullptr);
 			p_node->add_child(child);
@@ -3413,6 +3590,18 @@ void Node::clear_internal_tree_resource_paths() {
 	}
 }
 
+PackedStringArray Node::get_accessibility_configuration_warnings() const {
+	ERR_THREAD_GUARD_V(PackedStringArray());
+	PackedStringArray ret;
+
+	Vector<String> warnings;
+	if (GDVIRTUAL_CALL(_get_accessibility_configuration_warnings, warnings)) {
+		ret.append_array(warnings);
+	}
+
+	return ret;
+}
+
 PackedStringArray Node::get_configuration_warnings() const {
 	ERR_THREAD_GUARD_V(PackedStringArray());
 	PackedStringArray ret;
@@ -3437,10 +3626,6 @@ void Node::update_configuration_warnings() {
 #endif
 }
 
-bool Node::is_owned_by_parent() const {
-	return data.parent_owned;
-}
-
 void Node::set_display_folded(bool p_folded) {
 	ERR_THREAD_GUARD
 	data.display_folded = p_folded;
@@ -3568,11 +3753,13 @@ void Node::call_deferred_thread_groupp(const StringName &p_method, const Variant
 	SceneTree::ProcessGroup *pg = (SceneTree::ProcessGroup *)data.process_group;
 	pg->call_queue.push_callp(this, p_method, p_args, p_argcount, p_show_error);
 }
+
 void Node::set_deferred_thread_group(const StringName &p_property, const Variant &p_value) {
 	ERR_FAIL_COND(!is_inside_tree());
 	SceneTree::ProcessGroup *pg = (SceneTree::ProcessGroup *)data.process_group;
 	pg->call_queue.push_set(this, p_property, p_value);
 }
+
 void Node::notify_deferred_thread_group(int p_notification) {
 	ERR_FAIL_COND(!is_inside_tree());
 	SceneTree::ProcessGroup *pg = (SceneTree::ProcessGroup *)data.process_group;
@@ -3590,6 +3777,7 @@ void Node::call_thread_safep(const StringName &p_method, const Variant **p_args,
 		call_deferred_thread_groupp(p_method, p_args, p_argcount, p_show_error);
 	}
 }
+
 void Node::set_thread_safe(const StringName &p_property, const Variant &p_value) {
 	if (is_accessible_from_caller_thread()) {
 		set(p_property, p_value);
@@ -3597,6 +3785,7 @@ void Node::set_thread_safe(const StringName &p_property, const Variant &p_value)
 		set_deferred_thread_group(p_property, p_value);
 	}
 }
+
 void Node::notify_thread_safe(int p_notification) {
 	if (is_accessible_from_caller_thread()) {
 		notification(p_notification);
@@ -3605,9 +3794,45 @@ void Node::notify_thread_safe(int p_notification) {
 	}
 }
 
+RID Node::get_focused_accessibility_element() const {
+	RID id;
+	if (GDVIRTUAL_CALL(_get_focused_accessibility_element, id)) {
+		return id;
+	} else {
+		return get_accessibility_element();
+	}
+}
+
+String Node::get_accessibility_container_name(const Node *p_node) const {
+	String ret;
+	if (GDVIRTUAL_CALL(_get_accessibility_container_name, p_node, ret)) {
+	} else if (data.parent) {
+		ret = data.parent->get_accessibility_container_name(this);
+	}
+	return ret;
+}
+
+void Node::queue_accessibility_update() {
+	if (is_inside_tree() && !is_part_of_edited_scene()) {
+		get_tree()->_accessibility_notify_change(this);
+	}
+}
+
+RID Node::get_accessibility_element() const {
+	if (is_part_of_edited_scene()) {
+		return RID();
+	}
+	if (unlikely(data.accessibility_element.is_null())) {
+		if (get_window() && get_window()->get_window_id() != DisplayServer::INVALID_WINDOW_ID) {
+			data.accessibility_element = DisplayServer::get_singleton()->accessibility_create_element(get_window()->get_window_id(), DisplayServer::ROLE_CONTAINER);
+		}
+	}
+	return data.accessibility_element;
+}
+
 void Node::_bind_methods() {
 	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/naming/node_name_num_separator", PROPERTY_HINT_ENUM, "None,Space,Underscore,Dash"), 0);
-	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/naming/node_name_casing", PROPERTY_HINT_ENUM, "PascalCase,camelCase,snake_case"), NAME_CASING_PASCAL_CASE);
+	GLOBAL_DEF(PropertyInfo(Variant::INT, "editor/naming/node_name_casing", PROPERTY_HINT_ENUM, "PascalCase,camelCase,snake_case,kebab-case"), NAME_CASING_PASCAL_CASE);
 
 	ClassDB::bind_static_method("Node", D_METHOD("print_orphan_nodes"), &Node::print_orphan_nodes);
 	ClassDB::bind_method(D_METHOD("add_sibling", "sibling", "force_readable_name"), &Node::add_sibling, DEFVAL(false));
@@ -3683,6 +3908,24 @@ void Node::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_process_thread_group_order", "order"), &Node::set_process_thread_group_order);
 	ClassDB::bind_method(D_METHOD("get_process_thread_group_order"), &Node::get_process_thread_group_order);
 
+	ClassDB::bind_method(D_METHOD("set_accessibility_name", "name"), &Node::set_accessibility_name);
+	ClassDB::bind_method(D_METHOD("get_accessibility_name"), &Node::get_accessibility_name);
+	ClassDB::bind_method(D_METHOD("set_accessibility_description", "description"), &Node::set_accessibility_description);
+	ClassDB::bind_method(D_METHOD("get_accessibility_description"), &Node::get_accessibility_description);
+	ClassDB::bind_method(D_METHOD("set_accessibility_live", "mode"), &Node::set_accessibility_live);
+	ClassDB::bind_method(D_METHOD("get_accessibility_live"), &Node::get_accessibility_live);
+	ClassDB::bind_method(D_METHOD("set_accessibility_controls_nodes", "node_path"), &Node::set_accessibility_controls_nodes);
+	ClassDB::bind_method(D_METHOD("get_accessibility_controls_nodes"), &Node::get_accessibility_controls_nodes);
+	ClassDB::bind_method(D_METHOD("set_accessibility_described_by_nodes", "node_path"), &Node::set_accessibility_described_by_nodes);
+	ClassDB::bind_method(D_METHOD("get_accessibility_described_by_nodes"), &Node::get_accessibility_described_by_nodes);
+	ClassDB::bind_method(D_METHOD("set_accessibility_labeled_by_nodes", "node_path"), &Node::set_accessibility_labeled_by_nodes);
+	ClassDB::bind_method(D_METHOD("get_accessibility_labeled_by_nodes"), &Node::get_accessibility_labeled_by_nodes);
+	ClassDB::bind_method(D_METHOD("set_accessibility_flow_to_nodes", "node_path"), &Node::set_accessibility_flow_to_nodes);
+	ClassDB::bind_method(D_METHOD("get_accessibility_flow_to_nodes"), &Node::get_accessibility_flow_to_nodes);
+
+	ClassDB::bind_method(D_METHOD("queue_accessibility_update"), &Node::queue_accessibility_update);
+	ClassDB::bind_method(D_METHOD("get_accessibility_element"), &Node::get_accessibility_element);
+
 	ClassDB::bind_method(D_METHOD("set_display_folded", "fold"), &Node::set_display_folded);
 	ClassDB::bind_method(D_METHOD("is_displayed_folded"), &Node::is_displayed_folded);
 
@@ -3756,8 +3999,13 @@ void Node::_bind_methods() {
 
 		mi.name = "rpc";
 		ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "rpc", &Node::_rpc_bind, mi);
+	}
 
-		mi.arguments.push_front(PropertyInfo(Variant::INT, "peer_id"));
+	{
+		MethodInfo mi;
+
+		mi.arguments.push_back(PropertyInfo(Variant::INT, "peer_id"));
+		mi.arguments.push_back(PropertyInfo(Variant::STRING_NAME, "method"));
 
 		mi.name = "rpc_id";
 		ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "rpc_id", &Node::_rpc_id_bind, mi);
@@ -3820,6 +4068,7 @@ void Node::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_WM_DPI_CHANGE);
 	BIND_CONSTANT(NOTIFICATION_VP_MOUSE_ENTER);
 	BIND_CONSTANT(NOTIFICATION_VP_MOUSE_EXIT);
+	BIND_CONSTANT(NOTIFICATION_WM_POSITION_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
 	BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
 	BIND_CONSTANT(NOTIFICATION_WM_ABOUT);
@@ -3831,6 +4080,9 @@ void Node::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_APPLICATION_FOCUS_OUT);
 	BIND_CONSTANT(NOTIFICATION_TEXT_SERVER_CHANGED);
 
+	BIND_CONSTANT(NOTIFICATION_ACCESSIBILITY_UPDATE);
+	BIND_CONSTANT(NOTIFICATION_ACCESSIBILITY_INVALIDATE);
+
 	BIND_ENUM_CONSTANT(PROCESS_MODE_INHERIT);
 	BIND_ENUM_CONSTANT(PROCESS_MODE_PAUSABLE);
 	BIND_ENUM_CONSTANT(PROCESS_MODE_WHEN_PAUSED);
@@ -3900,16 +4152,28 @@ void Node::_bind_methods() {
 	ADD_GROUP("Editor Description", "editor_");
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "editor_description", PROPERTY_HINT_MULTILINE_TEXT), "set_editor_description", "get_editor_description");
 
+	ADD_GROUP("Accessibility", "accessibility_");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "accessibility_name"), "set_accessibility_name", "get_accessibility_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "accessibility_description"), "set_accessibility_description", "get_accessibility_description");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "accessibility_live", PROPERTY_HINT_ENUM, "Off,Polite,Assertive"), "set_accessibility_live", "get_accessibility_live");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "accessibility_controls_nodes", PROPERTY_HINT_ARRAY_TYPE, "NodePath"), "set_accessibility_controls_nodes", "get_accessibility_controls_nodes");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "accessibility_described_by_nodes", PROPERTY_HINT_ARRAY_TYPE, "NodePath"), "set_accessibility_described_by_nodes", "get_accessibility_described_by_nodes");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "accessibility_labeled_by_nodes", PROPERTY_HINT_ARRAY_TYPE, "NodePath"), "set_accessibility_labeled_by_nodes", "get_accessibility_labeled_by_nodes");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "accessibility_flow_to_nodes", PROPERTY_HINT_ARRAY_TYPE, "NodePath"), "set_accessibility_flow_to_nodes", "get_accessibility_flow_to_nodes");
+
 	GDVIRTUAL_BIND(_process, "delta");
 	GDVIRTUAL_BIND(_physics_process, "delta");
 	GDVIRTUAL_BIND(_enter_tree);
 	GDVIRTUAL_BIND(_exit_tree);
 	GDVIRTUAL_BIND(_ready);
 	GDVIRTUAL_BIND(_get_configuration_warnings);
+	GDVIRTUAL_BIND(_get_accessibility_configuration_warnings);
 	GDVIRTUAL_BIND(_input, "event");
 	GDVIRTUAL_BIND(_shortcut_input, "event");
 	GDVIRTUAL_BIND(_unhandled_input, "event");
 	GDVIRTUAL_BIND(_unhandled_key_input, "event");
+	GDVIRTUAL_BIND(_get_focused_accessibility_element);
+	GDVIRTUAL_BIND(_get_accessibility_container_name, "node");
 }
 
 String Node::_get_name_num_separator() {
@@ -3950,8 +4214,6 @@ Node::Node() {
 	data.physics_interpolated_client_side = false;
 	data.use_identity_transform = false;
 
-	data.parent_owned = false;
-	data.in_constructor = true;
 	data.use_placeholder = false;
 
 	data.display_folded = false;
diff --git a/engine/scene/main/node.h b/engine/scene/main/node.h
index 2d6fa157..7427d4f1 100644
--- a/engine/scene/main/node.h
+++ b/engine/scene/main/node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NODE_H
-#define NODE_H
+#pragma once
 
 #include "core/string/node_path.h"
 #include "core/variant/typed_array.h"
@@ -107,7 +106,8 @@ public:
 	enum NameCasing {
 		NAME_CASING_PASCAL_CASE,
 		NAME_CASING_CAMEL_CASE,
-		NAME_CASING_SNAKE_CASE
+		NAME_CASING_SNAKE_CASE,
+		NAME_CASING_KEBAB_CASE,
 	};
 
 	enum InternalMode {
@@ -186,6 +186,16 @@ private:
 
 		Viewport *viewport = nullptr;
 
+		mutable RID accessibility_element;
+
+		String accessibility_name;
+		String accessibility_description;
+		DisplayServer::AccessibilityLiveMode accessibility_live = DisplayServer::AccessibilityLiveMode::LIVE_OFF;
+		TypedArray<NodePath> accessibility_controls_nodes;
+		TypedArray<NodePath> accessibility_described_by_nodes;
+		TypedArray<NodePath> accessibility_labeled_by_nodes;
+		TypedArray<NodePath> accessibility_flow_to_nodes;
+
 		HashMap<StringName, GroupData> grouped;
 		List<Node *>::Element *OW = nullptr; // Owned element.
 		List<Node *> owned;
@@ -194,7 +204,7 @@ private:
 		ProcessThreadGroup process_thread_group = PROCESS_THREAD_GROUP_INHERIT;
 		Node *process_thread_group_owner = nullptr;
 		int process_thread_group_order = 0;
-		BitField<ProcessThreadMessages> process_thread_messages;
+		BitField<ProcessThreadMessages> process_thread_messages = {};
 		void *process_group = nullptr; // to avoid cyclic dependency
 
 		int multiplayer_authority = 1; // Server by default.
@@ -239,8 +249,6 @@ private:
 		// RenderingServer, and specify the mesh in world space.
 		bool use_identity_transform : 1;
 
-		bool parent_owned : 1;
-		bool in_constructor : 1;
 		bool use_placeholder : 1;
 
 		bool display_folded : 1;
@@ -389,6 +397,7 @@ protected:
 	GDVIRTUAL0(_enter_tree)
 	GDVIRTUAL0(_exit_tree)
 	GDVIRTUAL0(_ready)
+	GDVIRTUAL0RC(Vector<String>, _get_accessibility_configuration_warnings)
 	GDVIRTUAL0RC(Vector<String>, _get_configuration_warnings)
 
 	GDVIRTUAL1(_input, Ref<InputEvent>)
@@ -396,6 +405,9 @@ protected:
 	GDVIRTUAL1(_unhandled_input, Ref<InputEvent>)
 	GDVIRTUAL1(_unhandled_key_input, Ref<InputEvent>)
 
+	GDVIRTUAL0RC(RID, _get_focused_accessibility_element)
+	GDVIRTUAL1RC(String, _get_accessibility_container_name, const Node *)
+
 public:
 	enum {
 		// You can make your own, but don't use the same numbers as other notifications in other nodes.
@@ -421,6 +433,10 @@ public:
 		NOTIFICATION_ENABLED = 29,
 		NOTIFICATION_RESET_PHYSICS_INTERPOLATION = 2001, // A GodotSpace Odyssey.
 		// Keep these linked to Node.
+
+		NOTIFICATION_ACCESSIBILITY_UPDATE = 3000,
+		NOTIFICATION_ACCESSIBILITY_INVALIDATE = 3001,
+
 		NOTIFICATION_WM_MOUSE_ENTER = 1002,
 		NOTIFICATION_WM_MOUSE_EXIT = 1003,
 		NOTIFICATION_WM_WINDOW_FOCUS_IN = 1004,
@@ -487,6 +503,7 @@ public:
 	}
 
 	_FORCE_INLINE_ bool is_inside_tree() const { return data.inside_tree; }
+	bool is_internal() const { return data.internal_mode != INTERNAL_MODE_DISABLED; }
 
 	bool is_ancestor_of(const Node *p_node) const;
 	bool is_greater_than(const Node *p_node) const;
@@ -647,6 +664,36 @@ public:
 	void set_process_thread_messages(BitField<ProcessThreadMessages> p_flags);
 	BitField<ProcessThreadMessages> get_process_thread_messages() const;
 
+	void set_accessibility_name(const String &p_name);
+	String get_accessibility_name() const;
+
+	void set_accessibility_description(const String &p_description);
+	String get_accessibility_description() const;
+
+	void set_accessibility_live(DisplayServer::AccessibilityLiveMode p_mode);
+	DisplayServer::AccessibilityLiveMode get_accessibility_live() const;
+
+	void set_accessibility_controls_nodes(const TypedArray<NodePath> &p_node_path);
+	TypedArray<NodePath> get_accessibility_controls_nodes() const;
+
+	void set_accessibility_described_by_nodes(const TypedArray<NodePath> &p_node_path);
+	TypedArray<NodePath> get_accessibility_described_by_nodes() const;
+
+	void set_accessibility_labeled_by_nodes(const TypedArray<NodePath> &p_node_path);
+	TypedArray<NodePath> get_accessibility_labeled_by_nodes() const;
+
+	void set_accessibility_flow_to_nodes(const TypedArray<NodePath> &p_node_path);
+	TypedArray<NodePath> get_accessibility_flow_to_nodes() const;
+
+	void queue_accessibility_update();
+
+	virtual RID get_accessibility_element() const;
+	virtual RID get_focused_accessibility_element() const;
+	virtual String get_accessibility_container_name(const Node *p_node) const;
+	virtual bool accessibility_override_tree_hierarchy() const { return false; }
+
+	virtual PackedStringArray get_accessibility_configuration_warnings() const;
+
 	Node *duplicate(int p_flags = DUPLICATE_GROUPS | DUPLICATE_SIGNALS | DUPLICATE_SCRIPTS) const;
 #ifdef TOOLS_ENABLED
 	Node *duplicate_from_editor(HashMap<const Node *, Node *> &r_duplimap) const;
@@ -706,8 +753,6 @@ public:
 	//hacks for speed
 	static void init_node_hrcr();
 
-	void force_parent_owned() { data.parent_owned = true; } //hack to avoid duplicate nodes
-
 	void set_import_path(const NodePath &p_import_path); //path used when imported, used by scene editors to keep tracking
 	NodePath get_import_path() const;
 
@@ -865,5 +910,3 @@ Error Node::rpc_id(int p_peer_id, const StringName &p_method, VarArgs... p_args)
 // Add these macro to your class's 'get_configuration_warnings' function to have warnings show up in the scene tree inspector.
 #define DEPRECATED_NODE_WARNING warnings.push_back(RTR("This node is marked as deprecated and will be removed in future versions.\nPlease check the Godot documentation for information about migration."));
 #define EXPERIMENTAL_NODE_WARNING warnings.push_back(RTR("This node is marked as experimental and may be subject to removal or major changes in future versions."));
-
-#endif // NODE_H
diff --git a/engine/scene/main/resource_preloader.cpp b/engine/scene/main/resource_preloader.cpp
index 0cc1547f..7cf24ffe 100644
--- a/engine/scene/main/resource_preloader.cpp
+++ b/engine/scene/main/resource_preloader.cpp
@@ -67,9 +67,7 @@ Array ResourcePreloader::_get_resources() const {
 		i++;
 	}
 
-	Array res;
-	res.push_back(names);
-	res.push_back(arr);
+	Array res = { names, arr };
 	return res;
 }
 
diff --git a/engine/scene/main/resource_preloader.h b/engine/scene/main/resource_preloader.h
index 3ce538c6..04528955 100644
--- a/engine/scene/main/resource_preloader.h
+++ b/engine/scene/main/resource_preloader.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_PRELOADER_H
-#define RESOURCE_PRELOADER_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -56,5 +55,3 @@ public:
 
 	ResourcePreloader();
 };
-
-#endif // RESOURCE_PRELOADER_H
diff --git a/engine/scene/main/scene_tree.cpp b/engine/scene/main/scene_tree.cpp
index 4043eb55..70757523 100644
--- a/engine/scene/main/scene_tree.cpp
+++ b/engine/scene/main/scene_tree.cpp
@@ -43,19 +43,26 @@
 #include "scene/gui/control.h"
 #include "scene/main/multiplayer_api.h"
 #include "scene/main/viewport.h"
+#include "scene/main/window.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/world_2d.h"
-#include "servers/physics_server_2d.h"
+
 #ifndef _3D_DISABLED
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/world_3d.h"
-#include "servers/physics_server_3d.h"
 #endif // _3D_DISABLED
-#include "window.h"
+
+#ifndef PHYSICS_2D_DISABLED
+#include "servers/physics_server_2d.h"
+#endif // PHYSICS_2D_DISABLED
+
+#ifndef PHYSICS_3D_DISABLED
+#include "servers/physics_server_3d.h"
+#endif // PHYSICS_3D_DISABLED
 
 void SceneTreeTimer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_time_left", "time"), &SceneTreeTimer::set_time_left);
@@ -130,7 +137,7 @@ void SceneTree::ClientPhysicsInterpolation::physics_process() {
 		}
 	}
 }
-#endif
+#endif // _3D_DISABLED
 
 void SceneTree::tree_changed() {
 	emit_signal(tree_changed_name);
@@ -202,6 +209,104 @@ void SceneTree::flush_transform_notifications() {
 	}
 }
 
+bool SceneTree::is_accessibility_enabled() const {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
+		return false;
+	}
+
+	DisplayServer::AccessibilityMode accessibility_mode = DisplayServer::accessibility_get_mode();
+	int screen_reader_acvite = DisplayServer::get_singleton()->accessibility_screen_reader_active();
+	if ((accessibility_mode == DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) || ((accessibility_mode == DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO) && (screen_reader_acvite == 0))) {
+		return false;
+	}
+	return true;
+}
+
+bool SceneTree::is_accessibility_supported() const {
+	if (!DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ACCESSIBILITY_SCREEN_READER)) {
+		return false;
+	}
+
+	DisplayServer::AccessibilityMode accessibility_mode = DisplayServer::accessibility_get_mode();
+	if (accessibility_mode == DisplayServer::AccessibilityMode::ACCESSIBILITY_DISABLED) {
+		return false;
+	}
+	return true;
+}
+
+void SceneTree::_accessibility_force_update() {
+	accessibility_force_update = true;
+}
+
+void SceneTree::_accessibility_notify_change(const Node *p_node, bool p_remove) {
+	if (p_node) {
+		if (p_remove) {
+			accessibility_change_queue.erase(p_node->get_instance_id());
+		} else {
+			accessibility_change_queue.insert(p_node->get_instance_id());
+		}
+	}
+}
+
+void SceneTree::_process_accessibility_changes(DisplayServer::WindowID p_window_id) {
+	// Process NOTIFICATION_ACCESSIBILITY_UPDATE.
+	Vector<ObjectID> processed;
+	for (const ObjectID &id : accessibility_change_queue) {
+		Node *node = Object::cast_to<Node>(ObjectDB::get_instance(id));
+		if (!node || !node->get_window()) {
+			processed.push_back(id);
+			continue; // Invalid node, remove from list and skip.
+		} else if (node->get_window()->get_window_id() != p_window_id) {
+			continue; // Another window, skip.
+		}
+		node->notification(Node::NOTIFICATION_ACCESSIBILITY_UPDATE);
+		processed.push_back(id);
+	}
+
+	// Track focus change.
+	// Note: Do not use `Window::get_focused_window()`, it returns both native and embedded windows, and we only care about focused element in the currently processed native window.
+	// Native window focus is handled in the DisplayServer, or AccessKit subclassing adapter.
+	ObjectID oid = DisplayServer::get_singleton()->window_get_attached_instance_id(p_window_id);
+	Window *w_this = (Window *)ObjectDB::get_instance(oid);
+	if (w_this) {
+		Window *w_focus = w_this->get_focused_subwindow();
+		if (w_focus && !w_focus->is_part_of_edited_scene()) {
+			w_this = w_focus;
+		}
+
+		RID new_focus_element;
+		Control *n_focus = w_this->gui_get_focus_owner();
+		if (n_focus && !n_focus->is_part_of_edited_scene()) {
+			new_focus_element = n_focus->get_focused_accessibility_element();
+		} else {
+			new_focus_element = w_this->get_focused_accessibility_element();
+		}
+
+		DisplayServer::get_singleton()->accessibility_update_set_focus(new_focus_element);
+	}
+
+	// Cleanup.
+	for (const ObjectID &id : processed) {
+		accessibility_change_queue.erase(id);
+	}
+}
+
+void SceneTree::_flush_accessibility_changes() {
+	if (is_accessibility_enabled()) {
+		uint64_t time = OS::get_singleton()->get_ticks_msec();
+		if (!accessibility_force_update) {
+			if (time - accessibility_last_update < 1000 / accessibility_upd_per_sec) {
+				return;
+			}
+		}
+		accessibility_force_update = false;
+		accessibility_last_update = time;
+
+		// Push update to the accessibility driver.
+		DisplayServer::get_singleton()->accessibility_update_if_active(callable_mp(this, &SceneTree::_process_accessibility_changes));
+	}
+}
+
 void SceneTree::_flush_ugc() {
 	ugc_locked = true;
 
@@ -526,7 +631,9 @@ bool SceneTree::physics_process(double p_time) {
 
 	emit_signal(SNAME("physics_frame"));
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	call_group(SNAME("_picking_viewports"), SNAME("_process_picking"));
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 	_process(true);
 
@@ -540,6 +647,7 @@ bool SceneTree::physics_process(double p_time) {
 
 	// This should happen last because any processing that deletes something beforehand might expect the object to be removed in the same frame.
 	_flush_delete_queue();
+
 	_call_idle_callbacks();
 
 	return _quit;
@@ -586,7 +694,7 @@ bool SceneTree::process(double p_time) {
 	MessageQueue::get_singleton()->flush(); //small little hack
 	flush_transform_notifications(); //transforms after world update, to avoid unnecessary enter/exit notifications
 
-	if (unlikely(pending_new_scene)) {
+	if (unlikely(pending_new_scene_id.is_valid())) {
 		_flush_scene_change();
 	}
 
@@ -598,6 +706,8 @@ bool SceneTree::process(double p_time) {
 	// This should happen last because any processing that deletes something beforehand might expect the object to be removed in the same frame.
 	_flush_delete_queue();
 
+	_flush_accessibility_changes();
+
 	_call_idle_callbacks();
 
 #ifdef TOOLS_ENABLED
@@ -769,9 +879,7 @@ void SceneTree::_main_window_focus_in() {
 void SceneTree::_notification(int p_notification) {
 	switch (p_notification) {
 		case NOTIFICATION_TRANSLATION_CHANGED: {
-			if (!Engine::get_singleton()->is_editor_hint()) {
-				get_root()->propagate_notification(p_notification);
-			}
+			get_root()->propagate_notification(p_notification);
 		} break;
 
 		case NOTIFICATION_OS_MEMORY_WARNING:
@@ -972,10 +1080,12 @@ void SceneTree::set_pause(bool p_enabled) {
 
 	paused = p_enabled;
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsServer3D::get_singleton()->set_active(!p_enabled);
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 	PhysicsServer2D::get_singleton()->set_active(!p_enabled);
+#endif // PHYSICS_2D_DISABLED
 	if (get_root()) {
 		get_root()->_propagate_pause_notification(p_enabled);
 	}
@@ -996,10 +1106,12 @@ void SceneTree::set_suspend(bool p_enabled) {
 
 	Engine::get_singleton()->set_freeze_time_scale(p_enabled);
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsServer3D::get_singleton()->set_active(!p_enabled && !paused);
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 	PhysicsServer2D::get_singleton()->set_active(!p_enabled && !paused);
+#endif // PHYSICS_2D_DISABLED
 	if (get_root()) {
 		get_root()->_propagate_suspend_notification(p_enabled);
 	}
@@ -1340,7 +1452,7 @@ void SceneTree::_call_input_pause(const StringName &p_group, CallInputType p_cal
 		if (p_viewport->is_input_handled()) {
 			break;
 		}
-		Node *n = Object::cast_to<Node>(ObjectDB::get_instance(id));
+		Node *n = ObjectDB::get_instance<Node>(id);
 		if (n) {
 			n->_call_shortcut_input(p_input);
 		}
@@ -1508,15 +1620,33 @@ Node *SceneTree::get_current_scene() const {
 }
 
 void SceneTree::_flush_scene_change() {
-	if (prev_scene) {
-		memdelete(prev_scene);
-		prev_scene = nullptr;
+	if (prev_scene_id.is_valid()) {
+		// Might have already been freed externally.
+		Node *prev_scene = ObjectDB::get_instance<Node>(prev_scene_id);
+		if (prev_scene) {
+			memdelete(prev_scene);
+		}
+		prev_scene_id = ObjectID();
+	}
+
+	DEV_ASSERT(pending_new_scene_id.is_valid());
+	Node *pending_new_scene = ObjectDB::get_instance<Node>(pending_new_scene_id);
+	if (pending_new_scene) {
+		// Ensure correct state before `add_child` (might enqueue subsequent scene change).
+		current_scene = pending_new_scene;
+		pending_new_scene_id = ObjectID();
+
+		root->add_child(pending_new_scene);
+		// Update display for cursor instantly.
+		root->update_mouse_cursor_state();
+
+		// Only on successful scene change.
+		emit_signal(SNAME("scene_changed"));
+	} else {
+		current_scene = nullptr;
+		pending_new_scene_id = ObjectID();
+		ERR_PRINT("Scene instance has been freed before becoming the current scene. No current scene is set.");
 	}
-	current_scene = pending_new_scene;
-	root->add_child(pending_new_scene);
-	pending_new_scene = nullptr;
-	// Update display for cursor instantly.
-	root->update_mouse_cursor_state();
 }
 
 Error SceneTree::change_scene_to_file(const String &p_path) {
@@ -1536,21 +1666,23 @@ Error SceneTree::change_scene_to_packed(const Ref<PackedScene> &p_scene) {
 	ERR_FAIL_NULL_V(new_scene, ERR_CANT_CREATE);
 
 	// If called again while a change is pending.
-	if (pending_new_scene) {
-		queue_delete(pending_new_scene);
-		pending_new_scene = nullptr;
+	if (pending_new_scene_id.is_valid()) {
+		Node *pending_new_scene = ObjectDB::get_instance<Node>(pending_new_scene_id);
+		if (pending_new_scene) {
+			queue_delete(pending_new_scene);
+		}
+		pending_new_scene_id = ObjectID();
 	}
 
-	prev_scene = current_scene;
-
 	if (current_scene) {
+		prev_scene_id = current_scene->get_instance_id();
 		// Let as many side effects as possible happen or be queued now,
 		// so they are run before the scene is actually deleted.
 		root->remove_child(current_scene);
 	}
 	DEV_ASSERT(!current_scene);
 
-	pending_new_scene = new_scene;
+	pending_new_scene_id = new_scene->get_instance_id();
 	return OK;
 }
 
@@ -1701,6 +1833,9 @@ void SceneTree::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_root"), &SceneTree::get_root);
 	ClassDB::bind_method(D_METHOD("has_group", "name"), &SceneTree::has_group);
 
+	ClassDB::bind_method(D_METHOD("is_accessibility_enabled"), &SceneTree::is_accessibility_enabled);
+	ClassDB::bind_method(D_METHOD("is_accessibility_supported"), &SceneTree::is_accessibility_supported);
+
 	ClassDB::bind_method(D_METHOD("is_auto_accept_quit"), &SceneTree::is_auto_accept_quit);
 	ClassDB::bind_method(D_METHOD("set_auto_accept_quit", "enabled"), &SceneTree::set_auto_accept_quit);
 	ClassDB::bind_method(D_METHOD("is_quit_on_go_back"), &SceneTree::is_quit_on_go_back);
@@ -1784,6 +1919,7 @@ void SceneTree::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "physics_interpolation"), "set_physics_interpolation_enabled", "is_physics_interpolation_enabled");
 
 	ADD_SIGNAL(MethodInfo("tree_changed"));
+	ADD_SIGNAL(MethodInfo("scene_changed"));
 	ADD_SIGNAL(MethodInfo("tree_process_mode_changed")); //editor only signal, but due to API hash it can't be removed in run-time
 	ADD_SIGNAL(MethodInfo("node_added", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
 	ADD_SIGNAL(MethodInfo("node_removed", PropertyInfo(Variant::OBJECT, "node", PROPERTY_HINT_RESOURCE_TYPE, "Node")));
@@ -1847,6 +1983,7 @@ SceneTree::SceneTree() {
 	debug_paths_color = GLOBAL_DEF("debug/shapes/paths/geometry_color", Color(0.1, 1.0, 0.7, 0.4));
 	debug_paths_width = GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "debug/shapes/paths/geometry_width", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), 2.0);
 	collision_debug_contacts = GLOBAL_DEF(PropertyInfo(Variant::INT, "debug/shapes/collision/max_contacts_displayed", PROPERTY_HINT_RANGE, "0,20000,1"), 10000);
+	accessibility_upd_per_sec = GLOBAL_GET(SNAME("accessibility/general/updates_per_second"));
 
 	GLOBAL_DEF("debug/shapes/collision/draw_2d_outlines", true);
 
@@ -1992,7 +2129,9 @@ SceneTree::SceneTree() {
 	}
 #endif // _3D_DISABLED
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	root->set_physics_object_picking(GLOBAL_DEF("physics/common/enable_object_picking", true));
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 	root->connect("close_requested", callable_mp(this, &SceneTree::_main_window_close));
 	root->connect("go_back_requested", callable_mp(this, &SceneTree::_main_window_go_back));
@@ -2006,13 +2145,19 @@ SceneTree::SceneTree() {
 }
 
 SceneTree::~SceneTree() {
-	if (prev_scene) {
-		memdelete(prev_scene);
-		prev_scene = nullptr;
+	if (prev_scene_id.is_valid()) {
+		Node *prev_scene = ObjectDB::get_instance<Node>(prev_scene_id);
+		if (prev_scene) {
+			memdelete(prev_scene);
+		}
+		prev_scene_id = ObjectID();
 	}
-	if (pending_new_scene) {
-		memdelete(pending_new_scene);
-		pending_new_scene = nullptr;
+	if (pending_new_scene_id.is_valid()) {
+		Node *pending_new_scene = ObjectDB::get_instance<Node>(pending_new_scene_id);
+		if (pending_new_scene) {
+			memdelete(pending_new_scene);
+		}
+		pending_new_scene_id = ObjectID();
 	}
 	if (root) {
 		root->_set_tree(nullptr);
diff --git a/engine/scene/main/scene_tree.h b/engine/scene/main/scene_tree.h
index 2cfa1885..2695c1bb 100644
--- a/engine/scene/main/scene_tree.h
+++ b/engine/scene/main/scene_tree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_TREE_H
-#define SCENE_TREE_H
+#pragma once
 
 #include "core/os/main_loop.h"
 #include "core/os/thread_safe.h"
@@ -179,6 +178,11 @@ private:
 
 	List<ObjectID> delete_queue;
 
+	uint64_t accessibility_upd_per_sec = 0;
+	bool accessibility_force_update = true;
+	HashSet<ObjectID> accessibility_change_queue;
+	uint64_t accessibility_last_update = 0;
+
 	HashMap<UGCall, Vector<Variant>, UGCall> unique_group_calls;
 	bool ugc_locked = false;
 	void _flush_ugc();
@@ -188,8 +192,8 @@ private:
 	TypedArray<Node> _get_nodes_in_group(const StringName &p_group);
 
 	Node *current_scene = nullptr;
-	Node *prev_scene = nullptr;
-	Node *pending_new_scene = nullptr;
+	ObjectID prev_scene_id;
+	ObjectID pending_new_scene_id;
 
 	Color debug_collisions_color;
 	Color debug_collision_contact_color;
@@ -321,6 +325,13 @@ public:
 
 	void flush_transform_notifications();
 
+	bool is_accessibility_enabled() const;
+	bool is_accessibility_supported() const;
+	void _accessibility_force_update();
+	void _accessibility_notify_change(const Node *p_node, bool p_remove = false);
+	void _flush_accessibility_changes();
+	void _process_accessibility_changes(DisplayServer::WindowID p_window_id);
+
 	virtual void initialize() override;
 
 	virtual void iteration_prepare() override;
@@ -448,5 +459,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(SceneTree::GroupCallFlags);
-
-#endif // SCENE_TREE_H
diff --git a/engine/scene/main/shader_globals_override.cpp b/engine/scene/main/shader_globals_override.cpp
index 4007cd58..1836a9a3 100644
--- a/engine/scene/main/shader_globals_override.cpp
+++ b/engine/scene/main/shader_globals_override.cpp
@@ -228,7 +228,7 @@ void ShaderGlobalsOverride::_activate() {
 	ERR_FAIL_NULL(get_tree());
 	List<Node *> nodes;
 	get_tree()->get_nodes_in_group(SceneStringName(shader_overrides_group_active), &nodes);
-	if (nodes.size() == 0) {
+	if (nodes.is_empty()) {
 		//good we are the only override, enable all
 		active = true;
 		add_to_group(SceneStringName(shader_overrides_group_active));
diff --git a/engine/scene/main/shader_globals_override.h b/engine/scene/main/shader_globals_override.h
index d8557ecf..835fd370 100644
--- a/engine/scene/main/shader_globals_override.h
+++ b/engine/scene/main/shader_globals_override.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_GLOBALS_OVERRIDE_H
-#define SHADER_GLOBALS_OVERRIDE_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -62,5 +61,3 @@ public:
 
 	ShaderGlobalsOverride();
 };
-
-#endif // SHADER_GLOBALS_OVERRIDE_H
diff --git a/engine/scene/main/status_indicator.h b/engine/scene/main/status_indicator.h
index cd38da6e..80975f8d 100644
--- a/engine/scene/main/status_indicator.h
+++ b/engine/scene/main/status_indicator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STATUS_INDICATOR_H
-#define STATUS_INDICATOR_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "servers/display_server.h"
@@ -64,5 +63,3 @@ public:
 
 	Rect2 get_rect() const;
 };
-
-#endif // STATUS_INDICATOR_H
diff --git a/engine/scene/main/timer.h b/engine/scene/main/timer.h
index 43e29591..f9368ca2 100644
--- a/engine/scene/main/timer.h
+++ b/engine/scene/main/timer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TIMER_H
-#define TIMER_H
+#pragma once
 
 #include "scene/main/node.h"
 
@@ -89,5 +88,3 @@ private:
 };
 
 VARIANT_ENUM_CAST(Timer::TimerProcessCallback);
-
-#endif // TIMER_H
diff --git a/engine/scene/main/viewport.cpp b/engine/scene/main/viewport.cpp
index d0054bae..1bc38e82 100644
--- a/engine/scene/main/viewport.cpp
+++ b/engine/scene/main/viewport.cpp
@@ -36,13 +36,6 @@
 #include "core/templates/sort_array.h"
 #include "scene/2d/audio_listener_2d.h"
 #include "scene/2d/camera_2d.h"
-#include "scene/2d/physics/collision_object_2d.h"
-#ifndef _3D_DISABLED
-#include "scene/3d/audio_listener_3d.h"
-#include "scene/3d/camera_3d.h"
-#include "scene/3d/physics/collision_object_3d.h"
-#include "scene/3d/world_environment.h"
-#endif // _3D_DISABLED
 #include "scene/gui/control.h"
 #include "scene/gui/label.h"
 #include "scene/gui/popup.h"
@@ -56,6 +49,20 @@
 #include "servers/audio_server.h"
 #include "servers/rendering/rendering_server_globals.h"
 
+#ifndef _3D_DISABLED
+#include "scene/3d/audio_listener_3d.h"
+#include "scene/3d/camera_3d.h"
+#include "scene/3d/world_environment.h"
+#endif // _3D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
+#include "scene/2d/physics/collision_object_2d.h"
+#endif // PHYSICS_2D_DISABLED
+
+#ifndef PHYSICS_3D_DISABLED
+#include "scene/3d/physics/collision_object_3d.h"
+#endif // PHYSICS_3D_DISABLED
+
 void ViewportTexture::setup_local_to_scene() {
 	// For the same target viewport, setup is only allowed once to prevent multiple free or multiple creations.
 	if (!vp_changed) {
@@ -287,7 +294,7 @@ void Viewport::_sub_window_register(Window *p_window) {
 		ERR_FAIL_COND(gui.sub_windows[i].window == p_window);
 	}
 
-	if (gui.sub_windows.size() == 0) {
+	if (gui.sub_windows.is_empty()) {
 		subwindow_canvas = RS::get_singleton()->canvas_create();
 		RS::get_singleton()->viewport_attach_canvas(viewport, subwindow_canvas);
 		RS::get_singleton()->viewport_set_canvas_stacking(viewport, subwindow_canvas, SUBWINDOW_CANVAS_LAYER, 0);
@@ -317,7 +324,13 @@ void Viewport::_sub_window_register(Window *p_window) {
 
 void Viewport::_sub_window_update(Window *p_window) {
 	int index = _sub_window_find(p_window);
-	ERR_FAIL_COND(index == -1);
+
+	// _sub_window_update is sometimes called deferred, and the window may have been closed since then.
+	// For example, when the user resizes the game window.
+	// In that case, _sub_window_find will not find it, which is expected.
+	if (index == -1) {
+		return;
+	}
 
 	SubWindow &sw = gui.sub_windows.write[index];
 	sw.pending_window_update = false;
@@ -452,7 +465,7 @@ void Viewport::_sub_window_remove(Window *p_window) {
 	RS::get_singleton()->free(sw.canvas_item);
 	gui.sub_windows.remove_at(index);
 
-	if (gui.sub_windows.size() == 0) {
+	if (gui.sub_windows.is_empty()) {
 		RS::get_singleton()->free(subwindow_canvas);
 		subwindow_canvas = RID();
 	}
@@ -502,18 +515,14 @@ int Viewport::_sub_window_find(Window *p_window) const {
 }
 
 void Viewport::_update_viewport_path() {
-	if (viewport_textures.is_empty()) {
+	if (!is_inside_tree()) {
 		return;
 	}
 
-	Node *scene_root = get_scene_file_path().is_empty() ? get_owner() : this;
-	if (!scene_root && is_inside_tree()) {
-		scene_root = get_tree()->get_edited_scene_root();
-	}
-	if (scene_root && (scene_root == this || scene_root->is_ancestor_of(this))) {
-		NodePath path_in_scene = scene_root->get_path_to(this);
-		for (ViewportTexture *E : viewport_textures) {
-			E->path = path_in_scene;
+	for (ViewportTexture *E : viewport_textures) {
+		Node *loc_scene = E->get_local_scene();
+		if (loc_scene) {
+			E->path = loc_scene->get_path_to(this);
 		}
 	}
 }
@@ -543,11 +552,14 @@ void Viewport::_notification(int p_what) {
 #endif // _3D_DISABLED
 
 			add_to_group("_viewports");
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 			if (get_tree()->is_debugging_collisions_hint()) {
+#ifndef PHYSICS_2D_DISABLED
 				PhysicsServer2D::get_singleton()->space_set_debug_contacts(find_world_2d()->get_space(), get_tree()->get_collision_debug_contact_count());
 				contact_2d_debug = RenderingServer::get_singleton()->canvas_item_create();
 				RenderingServer::get_singleton()->canvas_item_set_parent(contact_2d_debug, current_canvas);
-#ifndef _3D_DISABLED
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 				PhysicsServer3D::get_singleton()->space_set_debug_contacts(find_world_3d()->get_space(), get_tree()->get_collision_debug_contact_count());
 				contact_3d_debug_multimesh = RenderingServer::get_singleton()->multimesh_create();
 				RenderingServer::get_singleton()->multimesh_allocate_data(contact_3d_debug_multimesh, get_tree()->get_collision_debug_contact_count(), RS::MULTIMESH_TRANSFORM_3D, false);
@@ -557,9 +569,10 @@ void Viewport::_notification(int p_what) {
 				RenderingServer::get_singleton()->instance_set_base(contact_3d_debug_instance, contact_3d_debug_multimesh);
 				RenderingServer::get_singleton()->instance_set_scenario(contact_3d_debug_instance, find_world_3d()->get_scenario());
 				RenderingServer::get_singleton()->instance_geometry_set_flag(contact_3d_debug_instance, RS::INSTANCE_FLAG_DRAW_NEXT_FRAME_IF_VISIBLE, true);
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 				set_physics_process_internal(true);
 			}
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 		} break;
 
 		case NOTIFICATION_READY: {
@@ -598,17 +611,21 @@ void Viewport::_notification(int p_what) {
 
 			RenderingServer::get_singleton()->viewport_set_scenario(viewport, RID());
 			RenderingServer::get_singleton()->viewport_remove_canvas(viewport, current_canvas);
+#ifndef PHYSICS_2D_DISABLED
 			if (contact_2d_debug.is_valid()) {
 				RenderingServer::get_singleton()->free(contact_2d_debug);
 				contact_2d_debug = RID();
 			}
+#endif // PHYSICS_2D_DISABLED
 
+#ifndef PHYSICS_3D_DISABLED
 			if (contact_3d_debug_multimesh.is_valid()) {
 				RenderingServer::get_singleton()->free(contact_3d_debug_multimesh);
 				RenderingServer::get_singleton()->free(contact_3d_debug_instance);
 				contact_3d_debug_instance = RID();
 				contact_3d_debug_multimesh = RID();
 			}
+#endif // PHYSICS_3D_DISABLED
 
 			remove_from_group("_viewports");
 			set_physics_process_internal(false);
@@ -621,11 +638,13 @@ void Viewport::_notification(int p_what) {
 			_update_viewport_path();
 		} break;
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
 			if (!get_tree()) {
 				return;
 			}
 
+#ifndef PHYSICS_2D_DISABLED
 			if (get_tree()->is_debugging_collisions_hint() && contact_2d_debug.is_valid()) {
 				RenderingServer::get_singleton()->canvas_item_clear(contact_2d_debug);
 				RenderingServer::get_singleton()->canvas_item_set_draw_index(contact_2d_debug, 0xFFFFF); //very high index
@@ -638,7 +657,8 @@ void Viewport::_notification(int p_what) {
 					RenderingServer::get_singleton()->canvas_item_add_rect(contact_2d_debug, Rect2(points[i] - Vector2(2, 2), Vector2(5, 5)), ccol);
 				}
 			}
-#ifndef _3D_DISABLED
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 			if (get_tree()->is_debugging_collisions_hint() && contact_3d_debug_multimesh.is_valid()) {
 				Vector<Vector3> points = PhysicsServer3D::get_singleton()->space_get_contacts(find_world_3d()->get_space());
 				int point_count = PhysicsServer3D::get_singleton()->space_get_contact_count(find_world_3d()->get_space());
@@ -651,8 +671,9 @@ void Viewport::_notification(int p_what) {
 					RS::get_singleton()->multimesh_instance_set_transform(contact_3d_debug_multimesh, i, point_transform);
 				}
 			}
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 		} break;
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 		case NOTIFICATION_VP_MOUSE_ENTER: {
 			gui.mouse_in_viewport = true;
@@ -685,6 +706,7 @@ void Viewport::_notification(int p_what) {
 	}
 }
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 void Viewport::_process_picking() {
 	if (!is_inside_tree()) {
 		return;
@@ -701,7 +723,7 @@ void Viewport::_process_picking() {
 		physics_picking_events.clear();
 		return;
 	}
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	if (use_xr) {
 		if (XRServer::get_singleton() != nullptr) {
 			Ref<XRInterface> xr_interface = XRServer::get_singleton()->get_primary_interface();
@@ -712,21 +734,23 @@ void Viewport::_process_picking() {
 			}
 		}
 	}
-#endif
+#endif // XR_DISABLED
 
 	_drop_physics_mouseover(true);
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	Vector2 last_pos(1e20, 1e20);
 	CollisionObject3D *last_object = nullptr;
 	ObjectID last_id;
 	PhysicsDirectSpaceState3D::RayResult result;
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
 	PhysicsDirectSpaceState2D *ss2d = PhysicsServer2D::get_singleton()->space_get_direct_state(find_world_2d()->get_space());
+#endif // PHYSICS_2D_DISABLED
 
 	SubViewportContainer *parent_svc = Object::cast_to<SubViewportContainer>(get_parent());
-	bool parent_ignore_mouse = (parent_svc && parent_svc->get_mouse_filter() == Control::MOUSE_FILTER_IGNORE);
+	bool parent_ignore_mouse = (parent_svc && parent_svc->get_mouse_filter_with_recursive() == Control::MOUSE_FILTER_IGNORE);
 	bool create_passive_hover_event = true;
 	if (gui.mouse_over || parent_ignore_mouse) {
 		// When the mouse is over a Control node, passive hovering would cause input events for Colliders, that are behind Control nodes.
@@ -803,6 +827,7 @@ void Viewport::_process_picking() {
 			pos = st->get_position();
 		}
 
+#ifndef PHYSICS_2D_DISABLED
 		if (ss2d) {
 			// Send to 2D.
 
@@ -895,15 +920,16 @@ void Viewport::_process_picking() {
 				_cleanup_mouseover_colliders(false, false, frame);
 			}
 		}
+#endif // PHYSICS_2D_DISABLED
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 		if (physics_object_picking_first_only && is_input_handled()) {
 			continue;
 		}
 
 		CollisionObject3D *capture_object = nullptr;
 		if (physics_object_capture.is_valid()) {
-			capture_object = Object::cast_to<CollisionObject3D>(ObjectDB::get_instance(physics_object_capture));
+			capture_object = ObjectDB::get_instance<CollisionObject3D>(physics_object_capture);
 			if (!capture_object || !camera_3d || (mb.is_valid() && mb->get_button_index() == MouseButton::LEFT && !mb->is_pressed())) {
 				physics_object_capture = ObjectID();
 			} else {
@@ -952,7 +978,7 @@ void Viewport::_process_picking() {
 
 					if (is_mouse && new_collider != physics_object_over) {
 						if (physics_object_over.is_valid()) {
-							CollisionObject3D *previous_co = Object::cast_to<CollisionObject3D>(ObjectDB::get_instance(physics_object_over));
+							CollisionObject3D *previous_co = ObjectDB::get_instance<CollisionObject3D>(physics_object_over);
 							if (previous_co) {
 								previous_co->_mouse_exit();
 							}
@@ -975,9 +1001,10 @@ void Viewport::_process_picking() {
 				last_pos = pos;
 			}
 		}
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 	}
 }
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 RID Viewport::get_viewport_rid() const {
 	ERR_READ_THREAD_GUARD_V(RID());
@@ -1002,10 +1029,10 @@ void Viewport::update_canvas_items() {
 	_update_canvas_items(this);
 }
 
-bool Viewport::_set_size(const Size2i &p_size, const Size2i &p_size_2d_override, bool p_allocated) {
+bool Viewport::_set_size(const Size2i &p_size, const Size2 &p_size_2d_override, bool p_allocated) {
 	Transform2D stretch_transform_new = Transform2D();
 	if (is_size_2d_override_stretch_enabled() && p_size_2d_override.width > 0 && p_size_2d_override.height > 0) {
-		Size2 scale = Size2(p_size) / Size2(p_size_2d_override);
+		Size2 scale = Size2(p_size) / p_size_2d_override;
 		stretch_transform_new.scale(scale);
 	}
 
@@ -1058,7 +1085,7 @@ bool Viewport::_set_size(const Size2i &p_size, const Size2i &p_size_2d_override,
 }
 
 Size2i Viewport::_get_size() const {
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	if (use_xr) {
 		if (XRServer::get_singleton() != nullptr) {
 			Ref<XRInterface> xr_interface = XRServer::get_singleton()->get_primary_interface();
@@ -1069,12 +1096,12 @@ Size2i Viewport::_get_size() const {
 		}
 		return Size2i();
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 	return size;
 }
 
-Size2i Viewport::_get_size_2d_override() const {
+Size2 Viewport::_get_size_2d_override() const {
 	return size_2d_override;
 }
 
@@ -1092,7 +1119,7 @@ Rect2 Viewport::get_visible_rect() const {
 		r = Rect2(Point2(), size);
 	}
 
-	if (size_2d_override != Size2i()) {
+	if (size_2d_override != Size2()) {
 		r.size = size_2d_override;
 	}
 
@@ -1488,7 +1515,28 @@ String Viewport::_gui_get_tooltip(Control *p_control, const Vector2 &p_pos, Cont
 	return tooltip;
 }
 
+void Viewport::cancel_tooltip() {
+	_gui_cancel_tooltip();
+}
+
+void Viewport::show_tooltip(Control *p_control) {
+	if (!p_control) {
+		return;
+	}
+
+	if (gui.tooltip_timer.is_valid()) {
+		gui.tooltip_timer->release_connections();
+		gui.tooltip_timer = Ref<SceneTreeTimer>();
+	}
+	gui.tooltip_control = p_control;
+	_gui_show_tooltip_at(p_control->get_size() / 2);
+}
+
 void Viewport::_gui_show_tooltip() {
+	_gui_show_tooltip_at(gui.last_mouse_pos);
+}
+
+void Viewport::_gui_show_tooltip_at(const Point2i &p_pos) {
 	if (!gui.tooltip_control) {
 		return;
 	}
@@ -1509,6 +1557,7 @@ void Viewport::_gui_show_tooltip() {
 	// This way, the custom tooltip from `ConnectionsDockTree` can create
 	// its own tooltip without conflicting with the default one, even an empty tooltip.
 	if (base_tooltip && !base_tooltip->is_visible()) {
+		memdelete(base_tooltip);
 		return;
 	}
 
@@ -1546,6 +1595,8 @@ void Viewport::_gui_show_tooltip() {
 	panel->set_flag(Window::FLAG_POPUP, false);
 	panel->set_flag(Window::FLAG_MOUSE_PASSTHROUGH, true);
 	panel->set_wrap_controls(true);
+	panel->set_default_canvas_item_texture_filter(get_default_canvas_item_texture_filter());
+	panel->set_default_canvas_item_texture_repeat(get_default_canvas_item_texture_repeat());
 	panel->add_child(base_tooltip);
 	panel->gui_parent = this;
 
@@ -1557,20 +1608,19 @@ void Viewport::_gui_show_tooltip() {
 	if (!window) { // Not embedded.
 		window = gui.tooltip_popup->get_parent_visible_window();
 	}
-	float win_scale = window->content_scale_factor;
+	Size2 scale = get_popup_base_transform().get_scale();
+	real_t popup_scale = MIN(scale.x, scale.y);
 	Point2 tooltip_offset = GLOBAL_GET("display/mouse_cursor/tooltip_position_offset");
-	if (!gui.tooltip_popup->is_embedded()) {
-		tooltip_offset *= win_scale;
-	}
+	tooltip_offset *= popup_scale;
 	Rect2 r(gui.tooltip_pos + tooltip_offset, gui.tooltip_popup->get_contents_minimum_size());
 	Rect2i vr;
 	if (gui.tooltip_popup->is_embedded()) {
 		vr = gui.tooltip_popup->get_embedder()->get_visible_rect();
 	} else {
-		panel->content_scale_factor = win_scale;
-		r.size *= win_scale;
 		vr = window->get_usable_parent_rect();
 	}
+	panel->content_scale_factor = popup_scale;
+	r.size *= popup_scale;
 	r.size = r.size.ceil();
 	r.size = r.size.min(panel->get_max_size());
 
@@ -1822,9 +1872,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 
 #ifdef DEBUG_ENABLED
 			if (EngineDebugger::get_singleton()) {
-				Array arr;
-				arr.push_back(gui.mouse_focus->get_path());
-				arr.push_back(gui.mouse_focus->get_class());
+				Array arr = { gui.mouse_focus->get_path(), gui.mouse_focus->get_class() };
 				EngineDebugger::get_singleton()->send_message("scene:click_ctrl", arr);
 			}
 #endif
@@ -1834,7 +1882,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 				while (ci) {
 					Control *control = Object::cast_to<Control>(ci);
 					if (control) {
-						if (control->get_focus_mode() != Control::FOCUS_NONE) {
+						if (control->get_focus_mode_with_recursive() != Control::FOCUS_NONE) {
 							// Grabbing unhovered focus can cause issues when mouse is dragged
 							// with another button held down.
 							if (control != gui.key_focus && gui.mouse_over_hierarchy.has(control)) {
@@ -2085,7 +2133,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 			}
 		} else {
 			ObjectID control_id = gui.touch_focus[touch_index];
-			Control *over = control_id.is_valid() ? Object::cast_to<Control>(ObjectDB::get_instance(control_id)) : nullptr;
+			Control *over = control_id.is_valid() ? ObjectDB::get_instance<Control>(control_id) : nullptr;
 			if (over && over->can_process()) {
 				touch_event = touch_event->xformed_by(Transform2D()); // Make a copy.
 				pos = over->get_global_transform_with_canvas().affine_inverse().xform(pos);
@@ -2120,7 +2168,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 	if (drag_event.is_valid()) {
 		const int drag_event_index = drag_event->get_index();
 		ObjectID control_id = gui.touch_focus[drag_event_index];
-		Control *over = control_id.is_valid() ? Object::cast_to<Control>(ObjectDB::get_instance(control_id)) : nullptr;
+		Control *over = control_id.is_valid() ? ObjectDB::get_instance<Control>(control_id) : nullptr;
 		if (!over) {
 			over = gui_find_control(drag_event->get_position());
 		}
@@ -2178,6 +2226,17 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 		}
 
 		Control *from = gui.key_focus ? gui.key_focus : nullptr;
+		if (!from) {
+			for (int i = 0; i < get_child_count(true); i++) {
+				Control *c = Object::cast_to<Control>(get_child(i, true));
+				if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
+					continue;
+				}
+
+				from = c;
+				break;
+			}
+		}
 
 		if (from && p_event->is_pressed()) {
 			Control *next = nullptr;
@@ -2194,6 +2253,14 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 					next = from->find_prev_valid_focus();
 				}
 
+				if (p_event->is_action_pressed(SNAME("ui_accessibility_drag_and_drop")) && input->is_action_just_pressed(SNAME("ui_accessibility_drag_and_drop"))) {
+					if (gui_is_dragging()) {
+						from->accessibility_drop();
+					} else {
+						from->accessibility_drag();
+					}
+				}
+
 				if (p_event->is_action_pressed(SNAME("ui_up")) && input->is_action_just_pressed(SNAME("ui_up"))) {
 					next = from->_get_focus_neighbor(SIDE_TOP);
 				}
@@ -2218,6 +2285,14 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 					next = from->find_prev_valid_focus();
 				}
 
+				if (p_event->is_action_pressed(SNAME("ui_accessibility_drag_and_drop"), true, true)) {
+					if (gui_is_dragging()) {
+						from->accessibility_drop();
+					} else {
+						from->accessibility_drag();
+					}
+				}
+
 				if (p_event->is_action_pressed(SNAME("ui_up"), true, true)) {
 					next = from->_get_focus_neighbor(SIDE_TOP);
 				}
@@ -2243,9 +2318,13 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
 }
 
 void Viewport::_perform_drop(Control *p_control) {
+	gui_perform_drop_at(p_control ? p_control->get_local_mouse_position() : Vector2(), p_control);
+}
+
+void Viewport::gui_perform_drop_at(const Point2 &p_pos, Control *p_control) {
 	// Without any arguments, simply cancel Drag and Drop.
 	if (p_control) {
-		gui.drag_successful = _gui_drop(p_control, p_control->get_local_mouse_position(), false);
+		gui.drag_successful = _gui_drop(p_control, p_pos, false);
 	} else {
 		gui.drag_successful = false;
 	}
@@ -2259,6 +2338,7 @@ void Viewport::_perform_drop(Control *p_control) {
 	Viewport *section_root = get_section_root_viewport();
 	section_root->gui.drag_data = Variant();
 	gui.dragging = false;
+	gui.drag_description = String();
 	section_root->gui.global_dragging = false;
 	gui.drag_mouse_over = nullptr;
 	Viewport::_propagate_drag_notification(section_root, NOTIFICATION_DRAG_END);
@@ -2287,12 +2367,23 @@ void Viewport::gui_set_root_order_dirty() {
 	gui.roots_order_dirty = true;
 }
 
+void Viewport::_gui_force_drag_start() {
+	Viewport *section_root = get_section_root_viewport();
+	section_root->gui.global_dragging = true;
+}
+
+void Viewport::_gui_force_drag_cancel() {
+	Viewport *section_root = get_section_root_viewport();
+	section_root->gui.global_dragging = false;
+}
+
 void Viewport::_gui_force_drag(Control *p_base, const Variant &p_data, Control *p_control) {
 	ERR_FAIL_COND_MSG(p_data.get_type() == Variant::NIL, "Drag data must be a value.");
 
-	gui.dragging = true;
 	Viewport *section_root = get_section_root_viewport();
-	section_root->gui.global_dragging = true;
+	ERR_FAIL_COND(!section_root->gui.global_dragging);
+
+	gui.dragging = true;
 	section_root->gui.drag_data = p_data;
 	gui.mouse_focus = nullptr;
 	gui.mouse_focus_mask.clear();
@@ -2324,7 +2415,7 @@ Control *Viewport::_gui_get_drag_preview() {
 	if (gui.drag_preview_id.is_null()) {
 		return nullptr;
 	} else {
-		Control *drag_preview = Object::cast_to<Control>(ObjectDB::get_instance(gui.drag_preview_id));
+		Control *drag_preview = ObjectDB::get_instance<Control>(gui.drag_preview_id);
 		if (!drag_preview) {
 			ERR_PRINT("Don't free the control set as drag preview.");
 			gui.drag_preview_id = ObjectID();
@@ -2412,7 +2503,7 @@ void Viewport::_gui_update_mouse_over() {
 			int found = gui.mouse_over_hierarchy.find(ancestor_control);
 			if (found >= 0) {
 				// Remove the node if the propagation chain has been broken or it is now MOUSE_FILTER_IGNORE.
-				if (removing || ancestor_control->get_mouse_filter() == Control::MOUSE_FILTER_IGNORE) {
+				if (removing || ancestor_control->get_mouse_filter_with_recursive() == Control::MOUSE_FILTER_IGNORE) {
 					needs_exit.push_back(found);
 				}
 			}
@@ -2423,14 +2514,14 @@ void Viewport::_gui_update_mouse_over() {
 				}
 				reached_top = true;
 			}
-			if (!removing && ancestor_control->get_mouse_filter() != Control::MOUSE_FILTER_IGNORE) {
+			if (!removing && ancestor_control->get_mouse_filter_with_recursive() != Control::MOUSE_FILTER_IGNORE) {
 				new_mouse_over_hierarchy.push_back(ancestor_control);
 				// Add the node if it was not found and it is now not MOUSE_FILTER_IGNORE.
 				if (found < 0) {
 					needs_enter.push_back(ancestor_control);
 				}
 			}
-			if (ancestor_control->get_mouse_filter() == Control::MOUSE_FILTER_STOP) {
+			if (ancestor_control->get_mouse_filter_with_recursive() == Control::MOUSE_FILTER_STOP) {
 				// MOUSE_FILTER_STOP breaks the propagation chain.
 				if (reached_top) {
 					break;
@@ -2550,11 +2641,13 @@ void Viewport::_drop_mouse_focus() {
 }
 
 void Viewport::_drop_physics_mouseover(bool p_paused_only) {
+#ifndef PHYSICS_2D_DISABLED
 	_cleanup_mouseover_colliders(true, p_paused_only);
+#endif // PHYSICS_2D_DISABLED
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	if (physics_object_over.is_valid()) {
-		CollisionObject3D *co = Object::cast_to<CollisionObject3D>(ObjectDB::get_instance(physics_object_over));
+		CollisionObject3D *co = ObjectDB::get_instance<CollisionObject3D>(physics_object_over);
 		if (co) {
 			if (!co->is_inside_tree()) {
 				physics_object_over = ObjectID();
@@ -2566,7 +2659,7 @@ void Viewport::_drop_physics_mouseover(bool p_paused_only) {
 			}
 		}
 	}
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 }
 
 void Viewport::_gui_grab_click_focus(Control *p_control) {
@@ -2660,11 +2753,11 @@ Viewport::SubWindowResize Viewport::_sub_window_get_resize_margin(Window *p_subw
 
 	int limit = p_subwindow->theme_cache.resize_margin;
 
-	if (ABS(dist_x) > limit) {
+	if (Math::abs(dist_x) > limit) {
 		return SUB_WINDOW_RESIZE_DISABLED;
 	}
 
-	if (ABS(dist_y) > limit) {
+	if (Math::abs(dist_y) > limit) {
 		return SUB_WINDOW_RESIZE_DISABLED;
 	}
 
@@ -3089,7 +3182,7 @@ void Viewport::_update_mouse_over(Vector2 p_pos) {
 			while (ancestor) {
 				Control *ancestor_control = Object::cast_to<Control>(ancestor);
 				if (ancestor_control) {
-					if (ancestor_control->get_mouse_filter() != Control::MOUSE_FILTER_IGNORE) {
+					if (ancestor_control->get_mouse_filter_with_recursive() != Control::MOUSE_FILTER_IGNORE) {
 						int found = gui.mouse_over_hierarchy.find(ancestor_control);
 						if (found >= 0) {
 							common_ancestor = gui.mouse_over_hierarchy[found];
@@ -3097,7 +3190,7 @@ void Viewport::_update_mouse_over(Vector2 p_pos) {
 						}
 						over_ancestors.push_back(ancestor_control);
 					}
-					if (ancestor_control->get_mouse_filter() == Control::MOUSE_FILTER_STOP) {
+					if (ancestor_control->get_mouse_filter_with_recursive() == Control::MOUSE_FILTER_STOP) {
 						// MOUSE_FILTER_STOP breaks the propagation chain.
 						break;
 					}
@@ -3339,6 +3432,7 @@ void Viewport::_push_unhandled_input_internal(const Ref<InputEvent> &p_event) {
 		get_tree()->_call_input_pause(unhandled_input_group, SceneTree::CALL_INPUT_TYPE_UNHANDLED_INPUT, p_event, this);
 	}
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	if (physics_object_picking && !is_input_handled()) {
 		if (Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED &&
 				(Object::cast_to<InputEventMouse>(*p_event) ||
@@ -3350,6 +3444,7 @@ void Viewport::_push_unhandled_input_internal(const Ref<InputEvent> &p_event) {
 			set_input_as_handled();
 		}
 	}
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 }
 
 void Viewport::notify_mouse_entered() {
@@ -3368,6 +3463,7 @@ void Viewport::notify_mouse_exited() {
 	_mouse_leave_viewport();
 }
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 void Viewport::set_physics_object_picking(bool p_enable) {
 	ERR_MAIN_THREAD_GUARD;
 	physics_object_picking = p_enable;
@@ -3403,6 +3499,7 @@ void Viewport::set_physics_object_picking_first_only(bool p_enable) {
 bool Viewport::get_physics_object_picking_first_only() {
 	return physics_object_picking_first_only;
 }
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 Vector2 Viewport::get_camera_coords(const Vector2 &p_viewport_coords) const {
 	ERR_READ_THREAD_GUARD_V(Vector2());
@@ -3446,6 +3543,19 @@ void Viewport::set_disable_input_override(bool p_disable) {
 	disable_input_override = p_disable;
 }
 
+String Viewport::gui_get_drag_description() const {
+	ERR_READ_THREAD_GUARD_V(String());
+	if (get_section_root_viewport()->gui.drag_description.is_empty()) {
+		return RTR("Drag-and-drop data");
+	} else {
+		return get_section_root_viewport()->gui.drag_description;
+	}
+}
+
+void Viewport::gui_set_drag_description(const String &p_description) {
+	gui.drag_description = p_description;
+}
+
 Variant Viewport::gui_get_drag_data() const {
 	ERR_READ_THREAD_GUARD_V(Variant());
 	return get_section_root_viewport()->gui.drag_data;
@@ -4039,6 +4149,7 @@ void Viewport::_camera_2d_set(Camera2D *p_camera_2d) {
 	camera_2d = p_camera_2d;
 }
 
+#ifndef PHYSICS_2D_DISABLED
 void Viewport::_cleanup_mouseover_colliders(bool p_clean_all_frames, bool p_paused_only, uint64_t p_frame_reference) {
 	List<ObjectID> to_erase;
 	List<ObjectID> to_mouse_exit;
@@ -4108,6 +4219,7 @@ void Viewport::_cleanup_mouseover_colliders(bool p_clean_all_frames, bool p_paus
 		shapes_to_mouse_exit.pop_front();
 	}
 }
+#endif // PHYSICS_2D_DISABLED
 
 AudioListener2D *Viewport::get_audio_listener_2d() const {
 	ERR_READ_THREAD_GUARD_V(nullptr);
@@ -4235,6 +4347,7 @@ void Viewport::_audio_listener_3d_make_next_current(AudioListener3D *p_exclude)
 	}
 }
 
+#ifndef PHYSICS_3D_DISABLED
 void Viewport::_collision_object_3d_input_event(CollisionObject3D *p_object, Camera3D *p_camera, const Ref<InputEvent> &p_input_event, const Vector3 &p_pos, const Vector3 &p_normal, int p_shape) {
 	Transform3D object_transform = p_object->get_global_transform();
 	Transform3D camera_transform = p_camera->get_global_transform();
@@ -4252,6 +4365,7 @@ void Viewport::_collision_object_3d_input_event(CollisionObject3D *p_object, Cam
 	physics_last_camera_transform = camera_transform;
 	physics_last_id = id;
 }
+#endif // PHYSICS_3D_DISABLED
 
 Camera3D *Viewport::get_camera_3d() const {
 	ERR_READ_THREAD_GUARD_V(nullptr);
@@ -4802,12 +4916,14 @@ void Viewport::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_texture"), &Viewport::get_texture);
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	ClassDB::bind_method(D_METHOD("set_physics_object_picking", "enable"), &Viewport::set_physics_object_picking);
 	ClassDB::bind_method(D_METHOD("get_physics_object_picking"), &Viewport::get_physics_object_picking);
 	ClassDB::bind_method(D_METHOD("set_physics_object_picking_sort", "enable"), &Viewport::set_physics_object_picking_sort);
 	ClassDB::bind_method(D_METHOD("get_physics_object_picking_sort"), &Viewport::get_physics_object_picking_sort);
 	ClassDB::bind_method(D_METHOD("set_physics_object_picking_first_only", "enable"), &Viewport::set_physics_object_picking_first_only);
 	ClassDB::bind_method(D_METHOD("get_physics_object_picking_first_only"), &Viewport::get_physics_object_picking_first_only);
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 	ClassDB::bind_method(D_METHOD("get_viewport_rid"), &Viewport::get_viewport_rid);
 	ClassDB::bind_method(D_METHOD("push_text_input", "text"), &Viewport::push_text_input);
@@ -4824,6 +4940,8 @@ void Viewport::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("gui_cancel_drag"), &Viewport::gui_cancel_drag);
 	ClassDB::bind_method(D_METHOD("gui_get_drag_data"), &Viewport::gui_get_drag_data);
+	ClassDB::bind_method(D_METHOD("gui_get_drag_description"), &Viewport::gui_get_drag_description);
+	ClassDB::bind_method(D_METHOD("gui_set_drag_description", "description"), &Viewport::gui_set_drag_description);
 	ClassDB::bind_method(D_METHOD("gui_is_dragging"), &Viewport::gui_is_dragging);
 	ClassDB::bind_method(D_METHOD("gui_is_drag_successful"), &Viewport::gui_is_drag_successful);
 
@@ -4885,7 +5003,9 @@ void Viewport::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_mesh_lod_threshold", "pixels"), &Viewport::set_mesh_lod_threshold);
 	ClassDB::bind_method(D_METHOD("get_mesh_lod_threshold"), &Viewport::get_mesh_lod_threshold);
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	ClassDB::bind_method(D_METHOD("_process_picking"), &Viewport::_process_picking);
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 	ClassDB::bind_method(D_METHOD("set_as_audio_listener_2d", "enable"), &Viewport::set_as_audio_listener_2d);
 	ClassDB::bind_method(D_METHOD("is_audio_listener_2d"), &Viewport::is_audio_listener_2d);
@@ -4976,10 +5096,12 @@ void Viewport::_bind_methods() {
 #ifndef _3D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "audio_listener_enable_3d"), "set_as_audio_listener_3d", "is_audio_listener_3d");
 #endif // _3D_DISABLED
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	ADD_GROUP("Physics", "physics_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "physics_object_picking"), "set_physics_object_picking", "get_physics_object_picking");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "physics_object_picking_sort"), "set_physics_object_picking_sort", "get_physics_object_picking_sort");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "physics_object_picking_first_only"), "set_physics_object_picking_first_only", "get_physics_object_picking_first_only");
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	ADD_GROUP("GUI", "gui_");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gui_disable_input"), "set_disable_input", "is_input_disabled");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "gui_snap_controls_to_pixels"), "set_snap_controls_to_pixels", "is_snap_controls_to_pixels_enabled");
@@ -5223,7 +5345,10 @@ void SubViewport::set_size_2d_override(const Size2i &p_size) {
 
 Size2i SubViewport::get_size_2d_override() const {
 	ERR_READ_THREAD_GUARD_V(Size2i());
-	return _get_size_2d_override();
+	// Rounding will cause offset issues with the
+	// exact positioning of subwindows, but changing the
+	// type of size_2d_override would break compatibility.
+	return Size2i((_get_size_2d_override() + Size2(0.5, 0.5)).floor());
 }
 
 void SubViewport::set_size_2d_override_stretch(bool p_enable) {
diff --git a/engine/scene/main/viewport.h b/engine/scene/main/viewport.h
index 5260b513..cf331733 100644
--- a/engine/scene/main/viewport.h
+++ b/engine/scene/main/viewport.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VIEWPORT_H
-#define VIEWPORT_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "scene/resources/texture.h"
@@ -252,7 +251,7 @@ private:
 	Transform2D stretch_transform;
 
 	Size2i size = Size2i(512, 512);
-	Size2i size_2d_override;
+	Size2 size_2d_override;
 	bool size_allocated = false;
 
 	RID contact_2d_debug;
@@ -269,6 +268,7 @@ private:
 	bool snap_2d_transforms_to_pixel = false;
 	bool snap_2d_vertices_to_pixel = false;
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	bool physics_object_picking = false;
 	bool physics_object_picking_sort = false;
 	bool physics_object_picking_first_only = false;
@@ -278,6 +278,7 @@ private:
 	Transform3D physics_last_object_transform;
 	Transform3D physics_last_camera_transform;
 	ObjectID physics_last_id;
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 	bool handle_input_locally = true;
 	bool local_input_handled = false;
@@ -366,7 +367,7 @@ private:
 		HashMap<int, ObjectID> touch_focus;
 		Control *mouse_focus = nullptr;
 		Control *mouse_click_grabber = nullptr;
-		BitField<MouseButtonMask> mouse_focus_mask;
+		BitField<MouseButtonMask> mouse_focus_mask = MouseButtonMask::NONE;
 		Control *key_focus = nullptr;
 		Control *mouse_over = nullptr;
 		LocalVector<Control *> mouse_over_hierarchy;
@@ -384,6 +385,7 @@ private:
 		bool drag_attempted = false;
 		Variant drag_data; // Only used in root-Viewport and SubViewports, that are not children of a SubViewportContainer.
 		ObjectID drag_preview_id;
+		String drag_description;
 		Ref<SceneTreeTimer> tooltip_timer;
 		double tooltip_delay = 0.0;
 		bool roots_order_dirty = false;
@@ -438,11 +440,14 @@ private:
 	String _gui_get_tooltip(Control *p_control, const Vector2 &p_pos, Control **r_tooltip_owner = nullptr);
 	void _gui_cancel_tooltip();
 	void _gui_show_tooltip();
+	void _gui_show_tooltip_at(const Point2i &p_pos);
 
 	void _gui_remove_control(Control *p_control);
 	void _gui_hide_control(Control *p_control);
 	void _gui_update_mouse_over();
 
+	void _gui_force_drag_start();
+	void _gui_force_drag_cancel();
 	void _gui_force_drag(Control *p_base, const Variant &p_data, Control *p_control);
 	void _gui_set_drag_preview(Control *p_base, Control *p_control);
 	Control *_gui_get_drag_preview();
@@ -492,14 +497,16 @@ private:
 	void _window_start_resize(SubWindowResize p_edge, Window *p_window);
 
 protected:
-	bool _set_size(const Size2i &p_size, const Size2i &p_size_2d_override, bool p_allocated);
+	bool _set_size(const Size2i &p_size, const Size2 &p_size_2d_override, bool p_allocated);
 
 	Size2i _get_size() const;
-	Size2i _get_size_2d_override() const;
+	Size2 _get_size_2d_override() const;
 	bool _is_size_allocated() const;
 
 	void _notification(int p_what);
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	void _process_picking();
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	static void _bind_methods();
 	void _validate_property(PropertyInfo &p_property) const;
 
@@ -509,6 +516,9 @@ public:
 
 	uint64_t get_processed_events_count() const { return event_count; }
 
+	void cancel_tooltip();
+	void show_tooltip(Control *p_control);
+
 	void update_canvas_items();
 
 	Rect2 get_visible_rect() const;
@@ -609,14 +619,18 @@ public:
 	Point2 wrap_mouse_in_rect(const Vector2 &p_relative, const Rect2 &p_rect);
 	virtual void update_mouse_cursor_state();
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	void set_physics_object_picking(bool p_enable);
 	bool get_physics_object_picking();
 	void set_physics_object_picking_sort(bool p_enable);
 	bool get_physics_object_picking_sort();
 	void set_physics_object_picking_first_only(bool p_enable);
 	bool get_physics_object_picking_first_only();
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 
 	Variant gui_get_drag_data() const;
+	String gui_get_drag_description() const;
+	void gui_set_drag_description(const String &p_description);
 
 	void gui_reset_canvas_sort_index();
 	int gui_get_canvas_sort_index();
@@ -624,6 +638,7 @@ public:
 	void gui_release_focus();
 	Control *gui_get_focus_owner() const;
 	Control *gui_get_hovered_control() const;
+	Window *get_focused_subwindow() const { return gui.subwindow_focused; }
 
 	PackedStringArray get_configuration_warnings() const override;
 
@@ -650,6 +665,7 @@ public:
 	bool gui_is_dragging() const;
 	bool gui_is_drag_successful() const;
 	void gui_cancel_drag();
+	void gui_perform_drop_at(const Point2 &p_pos, Control *p_control = nullptr);
 
 	Control *gui_find_control(const Point2 &p_global);
 
@@ -719,12 +735,14 @@ private:
 	Camera2D *camera_2d = nullptr;
 	void _camera_2d_set(Camera2D *p_camera_2d);
 
+#ifndef PHYSICS_2D_DISABLED
 	// Collider to frame
 	HashMap<ObjectID, uint64_t> physics_2d_mouseover;
 	// Collider & shape to frame
 	HashMap<Pair<ObjectID, int>, uint64_t, PairHash<ObjectID, int>> physics_2d_shape_mouseover;
 	// Cleans up colliders corresponding to old frames or all of them.
 	void _cleanup_mouseover_colliders(bool p_clean_all_frames, bool p_paused_only, uint64_t p_frame_reference = 0);
+#endif // PHYSICS_2D_DISABLED
 
 public:
 	AudioListener2D *get_audio_listener_2d() const;
@@ -750,7 +768,9 @@ private:
 	void _audio_listener_3d_remove(AudioListener3D *p_listener);
 	void _audio_listener_3d_make_next_current(AudioListener3D *p_exclude);
 
+#ifndef PHYSICS_3D_DISABLED
 	void _collision_object_3d_input_event(CollisionObject3D *p_object, Camera3D *p_camera, const Ref<InputEvent> &p_input_event, const Vector3 &p_pos, const Vector3 &p_normal, int p_shape);
+#endif // PHYSICS_3D_DISABLED
 
 	struct Camera3DOverrideData {
 		Transform3D transform;
@@ -895,5 +915,3 @@ VARIANT_ENUM_CAST(Viewport::RenderInfo);
 VARIANT_ENUM_CAST(Viewport::RenderInfoType);
 VARIANT_ENUM_CAST(Viewport::DefaultCanvasItemTextureFilter);
 VARIANT_ENUM_CAST(Viewport::DefaultCanvasItemTextureRepeat);
-
-#endif // VIEWPORT_H
diff --git a/engine/scene/main/window.cpp b/engine/scene/main/window.cpp
index 1bb01313..a10f5d91 100644
--- a/engine/scene/main/window.cpp
+++ b/engine/scene/main/window.cpp
@@ -48,6 +48,8 @@ void Window::set_root_layout_direction(int p_root_dir) {
 
 // Dynamic properties.
 
+Window *Window::focused_window = nullptr;
+
 bool Window::_set(const StringName &p_name, const Variant &p_value) {
 	ERR_MAIN_THREAD_GUARD_V(false);
 	String name = p_name;
@@ -275,7 +277,7 @@ Window *Window::get_from_id(DisplayServer::WindowID p_window_id) {
 	if (p_window_id == DisplayServer::INVALID_WINDOW_ID) {
 		return nullptr;
 	}
-	return Object::cast_to<Window>(ObjectDB::get_instance(DisplayServer::get_singleton()->window_get_attached_instance_id(p_window_id)));
+	return ObjectDB::get_instance<Window>(DisplayServer::get_singleton()->window_get_attached_instance_id(p_window_id));
 }
 
 void Window::set_title(const String &p_title) {
@@ -310,11 +312,11 @@ void Window::set_title(const String &p_title) {
 
 #ifdef DEBUG_ENABLED
 	if (EngineDebugger::get_singleton() && window_id == DisplayServer::MAIN_WINDOW_ID && !Engine::get_singleton()->is_project_manager_hint()) {
-		Array arr;
-		arr.push_back(tr_title);
+		Array arr = { tr_title };
 		EngineDebugger::get_singleton()->send_message("window:title", arr);
 	}
 #endif
+	queue_accessibility_update();
 }
 
 String Window::get_title() const {
@@ -688,6 +690,11 @@ void Window::_make_window() {
 		}
 	}
 
+	if (get_tree() && get_tree()->is_accessibility_supported()) {
+		get_tree()->_accessibility_force_update();
+		_accessibility_notify_enter(this);
+	}
+
 	_update_window_callbacks();
 
 	RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_VISIBLE);
@@ -719,6 +726,10 @@ void Window::_clear_window() {
 
 	_update_from_window();
 
+	if (get_tree() && get_tree()->is_accessibility_supported()) {
+		_accessibility_notify_exit(this);
+	}
+
 	DisplayServer::get_singleton()->delete_sub_window(window_id);
 	window_id = DisplayServer::INVALID_WINDOW_ID;
 
@@ -750,6 +761,14 @@ void Window::_rect_changed_callback(const Rect2i &p_callback) {
 		size = p_callback.size;
 		_update_viewport_size();
 	}
+	if (window_id != DisplayServer::INVALID_WINDOW_ID) {
+		Vector2 sz_out = DisplayServer::get_singleton()->window_get_size_with_decorations(window_id);
+		Vector2 pos_out = DisplayServer::get_singleton()->window_get_position_with_decorations(window_id);
+		Vector2 sz_in = DisplayServer::get_singleton()->window_get_size(window_id);
+		Vector2 pos_in = DisplayServer::get_singleton()->window_get_position(window_id);
+		DisplayServer::get_singleton()->accessibility_set_window_rect(window_id, Rect2(pos_out, sz_out), Rect2(pos_in, sz_in));
+	}
+	queue_accessibility_update();
 }
 
 void Window::_propagate_window_notification(Node *p_node, int p_notification) {
@@ -808,12 +827,15 @@ void Window::_event_callback(DisplayServer::WindowEvent p_event) {
 		} break;
 		case DisplayServer::WINDOW_EVENT_FOCUS_IN: {
 			focused = true;
+			focused_window = this;
 			_propagate_window_notification(this, NOTIFICATION_WM_WINDOW_FOCUS_IN);
 			emit_signal(SceneStringName(focus_entered));
-
 		} break;
 		case DisplayServer::WINDOW_EVENT_FOCUS_OUT: {
 			focused = false;
+			if (focused_window == this) {
+				focused_window = nullptr;
+			}
 			_propagate_window_notification(this, NOTIFICATION_WM_WINDOW_FOCUS_OUT);
 			emit_signal(SceneStringName(focus_exited));
 		} break;
@@ -836,6 +858,9 @@ void Window::_event_callback(DisplayServer::WindowEvent p_event) {
 		case DisplayServer::WINDOW_EVENT_TITLEBAR_CHANGE: {
 			emit_signal(SNAME("titlebar_changed"));
 		} break;
+		case DisplayServer::WINDOW_EVENT_FORCE_CLOSE: {
+			hide();
+		} break;
 	}
 }
 
@@ -866,6 +891,36 @@ void Window::hide() {
 	set_visible(false);
 }
 
+void Window::_accessibility_notify_enter(Node *p_node) {
+	p_node->queue_accessibility_update();
+
+	if (p_node != this) {
+		const Window *window = Object::cast_to<Window>(p_node);
+		if (window && !window->is_embedded()) {
+			return;
+		}
+	}
+
+	for (int i = 0; i < p_node->get_child_count(); i++) {
+		_accessibility_notify_enter(p_node->get_child(i));
+	}
+}
+
+void Window::_accessibility_notify_exit(Node *p_node) {
+	p_node->notification(Node::NOTIFICATION_ACCESSIBILITY_INVALIDATE);
+
+	if (p_node != this) {
+		const Window *window = Object::cast_to<Window>(p_node);
+		if (window && !window->is_embedded()) {
+			return;
+		}
+	}
+
+	for (int i = 0; i < p_node->get_child_count(); i++) {
+		_accessibility_notify_exit(p_node->get_child(i));
+	}
+}
+
 void Window::set_visible(bool p_visible) {
 	ERR_MAIN_THREAD_GUARD;
 	if (visible == p_visible) {
@@ -905,9 +960,11 @@ void Window::set_visible(bool p_visible) {
 				}
 			}
 			embedder->_sub_window_register(this);
+			embedder->queue_accessibility_update();
 			RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_WHEN_PARENT_VISIBLE);
 		} else {
 			embedder->_sub_window_remove(this);
+			embedder->queue_accessibility_update();
 			embedder = nullptr;
 			RS::get_singleton()->viewport_set_update_mode(get_viewport_rid(), RS::VIEWPORT_UPDATE_DISABLED);
 		}
@@ -916,7 +973,11 @@ void Window::set_visible(bool p_visible) {
 
 	if (!visible) {
 		focused = false;
+		if (focused_window == this) {
+			focused_window = nullptr;
+		}
 	}
+
 	notification(NOTIFICATION_VISIBILITY_CHANGED);
 	emit_signal(SceneStringName(visibility_changed));
 
@@ -1133,7 +1194,7 @@ void Window::_update_viewport_size() {
 	//update the viewport part
 
 	Size2i final_size;
-	Size2i final_size_override;
+	Size2 final_size_override;
 	Rect2i attach_to_screen_rect(Point2i(), size);
 	double font_oversampling = 1.0;
 	window_transform = Transform2D();
@@ -1330,9 +1391,78 @@ Viewport *Window::get_embedder() const {
 	return nullptr;
 }
 
+RID Window::get_accessibility_element() const {
+	if (is_part_of_edited_scene()) {
+		return RID();
+	}
+	if (get_embedder()) {
+		return Node::get_accessibility_element();
+	} else if (window_id != DisplayServer::INVALID_WINDOW_ID) {
+		return DisplayServer::get_singleton()->accessibility_get_window_root(window_id);
+	} else {
+		return RID();
+	}
+}
+
+RID Window::get_focused_accessibility_element() const {
+	if (window_id == DisplayServer::MAIN_WINDOW_ID) {
+		if (get_child_count() > 0) {
+			return get_child(0)->get_focused_accessibility_element(); // Try scene tree root node.
+		}
+	}
+	return Node::get_focused_accessibility_element();
+}
+
 void Window::_notification(int p_what) {
 	ERR_MAIN_THREAD_GUARD;
 	switch (p_what) {
+		case NOTIFICATION_ACCESSIBILITY_INVALIDATE: {
+			accessibility_title_element = RID();
+			accessibility_announcement_element = RID();
+		} break;
+
+		case NOTIFICATION_ACCESSIBILITY_UPDATE: {
+			RID ae = get_accessibility_element();
+			ERR_FAIL_COND(ae.is_null());
+
+			DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_WINDOW);
+			DisplayServer::get_singleton()->accessibility_update_set_name(ae, tr_title);
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_MODAL, exclusive);
+			DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_FOCUS, callable_mp(this, &Window::_accessibility_action_grab_focus));
+			DisplayServer::get_singleton()->accessibility_update_set_flag(ae, DisplayServer::AccessibilityFlags::FLAG_HIDDEN, !visible);
+
+			if (get_embedder()) {
+				Control *parent_ctrl = Object::cast_to<Control>(get_parent());
+				Transform2D parent_tr = parent_ctrl ? parent_ctrl->get_global_transform() : Transform2D();
+				Transform2D tr;
+				tr.set_origin(position);
+				DisplayServer::get_singleton()->accessibility_update_set_transform(ae, parent_tr.affine_inverse() * tr);
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, Rect2(Point2(), size));
+
+				if (accessibility_title_element.is_null()) {
+					accessibility_title_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_TITLE_BAR);
+				}
+
+				int w = get_theme_constant(SNAME("title_height"));
+				DisplayServer::get_singleton()->accessibility_update_set_name(accessibility_title_element, tr_title);
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(accessibility_title_element, Rect2(Vector2(0, -w), Size2(size.x, w)));
+			} else {
+				DisplayServer::get_singleton()->accessibility_update_set_transform(ae, Transform2D());
+				DisplayServer::get_singleton()->accessibility_update_set_bounds(ae, Rect2(Point2(), size));
+
+				if (accessibility_announcement_element.is_null()) {
+					accessibility_announcement_element = DisplayServer::get_singleton()->accessibility_create_sub_element(ae, DisplayServer::AccessibilityRole::ROLE_STATIC_TEXT);
+				}
+
+				if (announcement.is_empty()) {
+					DisplayServer::get_singleton()->accessibility_update_set_live(accessibility_announcement_element, DisplayServer::LIVE_OFF);
+				} else {
+					DisplayServer::get_singleton()->accessibility_update_set_name(accessibility_announcement_element, announcement);
+					DisplayServer::get_singleton()->accessibility_update_set_live(accessibility_announcement_element, DisplayServer::LIVE_ASSERTIVE);
+				}
+			}
+		} break;
+
 		case NOTIFICATION_POSTINITIALIZE: {
 			initialized = true;
 
@@ -1387,6 +1517,7 @@ void Window::_notification(int p_what) {
 					// It's the root window!
 					visible = true; // Always visible.
 					window_id = DisplayServer::MAIN_WINDOW_ID;
+					focused_window = this;
 					DisplayServer::get_singleton()->window_attach_instance_id(get_instance_id(), window_id);
 					_update_from_window();
 					// Since this window already exists (created on start), we must update pos and size from it.
@@ -1465,6 +1596,7 @@ void Window::_notification(int p_what) {
 					}
 				}
 			}
+			queue_accessibility_update();
 		} break;
 
 		case NOTIFICATION_VISIBILITY_CHANGED: {
@@ -1483,6 +1615,9 @@ void Window::_notification(int p_what) {
 
 			set_theme_context(nullptr, false);
 
+			accessibility_title_element = RID();
+			accessibility_announcement_element = RID();
+
 			if (transient) {
 				_clear_transient();
 			}
@@ -1602,7 +1737,12 @@ bool Window::is_using_font_oversampling() const {
 
 DisplayServer::WindowID Window::get_window_id() const {
 	ERR_READ_THREAD_GUARD_V(DisplayServer::INVALID_WINDOW_ID);
-	if (embedder) {
+	if (get_embedder()) {
+#ifdef TOOLS_ENABLED
+		if (is_part_of_edited_scene()) {
+			return DisplayServer::MAIN_WINDOW_ID;
+		}
+#endif
 		return parent->get_window_id();
 	}
 	return window_id;
@@ -1860,12 +2000,19 @@ void Window::popup(const Rect2i &p_screen_rect) {
 	// Update window size to calculate the actual window size based on contents minimum size and minimum size.
 	_update_window_size();
 
+	bool should_fit = !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_SELF_FITTING_WINDOWS);
+
 	if (p_screen_rect != Rect2i()) {
 		set_position(p_screen_rect.position);
-		int screen_id = DisplayServer::get_singleton()->get_screen_from_rect(p_screen_rect);
-		Size2i screen_size = DisplayServer::get_singleton()->screen_get_usable_rect(screen_id).size;
-		Size2i new_size = p_screen_rect.size.min(screen_size);
-		set_size(new_size);
+
+		if (should_fit) {
+			int screen_id = DisplayServer::get_singleton()->get_screen_from_rect(p_screen_rect);
+			Size2i screen_size = DisplayServer::get_singleton()->screen_get_usable_rect(screen_id).size;
+			Size2i new_size = p_screen_rect.size.min(screen_size);
+			set_size(new_size);
+		} else {
+			set_size(p_screen_rect.size);
+		}
 	}
 
 	Rect2i adjust = _popup_adjust_rect();
@@ -1893,7 +2040,7 @@ void Window::popup(const Rect2i &p_screen_rect) {
 		int screen_id = DisplayServer::get_singleton()->window_get_current_screen(get_window_id());
 		parent_rect = DisplayServer::get_singleton()->screen_get_usable_rect(screen_id);
 	}
-	if (parent_rect != Rect2i() && !parent_rect.intersects(Rect2i(position, size))) {
+	if (should_fit && parent_rect != Rect2i() && !parent_rect.intersects(Rect2i(position, size))) {
 		ERR_PRINT(vformat("Window %d spawned at invalid position: %s.", get_window_id(), position));
 		set_position((parent_rect.size - size) / 2);
 	}
@@ -2071,6 +2218,11 @@ Rect2i Window::get_usable_parent_rect() const {
 	return parent_rect;
 }
 
+void Window::accessibility_announcement(const String &p_announcement) {
+	announcement = p_announcement;
+	queue_accessibility_update();
+}
+
 void Window::add_child_notify(Node *p_child) {
 	if (is_inside_tree() && wrap_controls) {
 		child_controls_changed();
@@ -2372,6 +2524,18 @@ Variant Window::get_theme_item(Theme::DataType p_data_type, const StringName &p_
 Ref<Texture2D> Window::get_editor_theme_icon(const StringName &p_name) const {
 	return get_theme_icon(p_name, SNAME("EditorIcons"));
 }
+
+Ref<Texture2D> Window::get_editor_theme_native_menu_icon(const StringName &p_name, bool p_global_menu, bool p_dark_mode) const {
+	if (!p_global_menu) {
+		return get_theme_icon(p_name, SNAME("EditorIcons"));
+	}
+	if (p_dark_mode && has_theme_icon(String(p_name) + "Dark", SNAME("EditorIcons"))) {
+		return get_theme_icon(String(p_name) + "Dark", SNAME("EditorIcons"));
+	} else if (!p_dark_mode && has_theme_icon(String(p_name) + "Light", SNAME("EditorIcons"))) {
+		return get_theme_icon(String(p_name) + "Light", SNAME("EditorIcons"));
+	}
+	return get_theme_icon(p_name, SNAME("EditorIcons"));
+}
 #endif
 
 bool Window::has_theme_icon(const StringName &p_name, const StringName &p_theme_type) const {
@@ -2885,8 +3049,6 @@ void Window::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_title", "title"), &Window::set_title);
 	ClassDB::bind_method(D_METHOD("get_title"), &Window::get_title);
 
-	ClassDB::bind_method(D_METHOD("get_window_id"), &Window::get_window_id);
-
 	ClassDB::bind_method(D_METHOD("set_initial_position", "initial_position"), &Window::set_initial_position);
 	ClassDB::bind_method(D_METHOD("get_initial_position"), &Window::get_initial_position);
 
@@ -3034,6 +3196,10 @@ void Window::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_theme_default_font"), &Window::get_theme_default_font);
 	ClassDB::bind_method(D_METHOD("get_theme_default_font_size"), &Window::get_theme_default_font_size);
 
+	ClassDB::bind_method(D_METHOD("get_window_id"), &Window::get_window_id);
+
+	ClassDB::bind_static_method("Window", D_METHOD("get_focused_window"), &Window::get_focused_window);
+
 	ClassDB::bind_method(D_METHOD("set_layout_direction", "direction"), &Window::set_layout_direction);
 	ClassDB::bind_method(D_METHOD("get_layout_direction"), &Window::get_layout_direction);
 	ClassDB::bind_method(D_METHOD("is_layout_rtl"), &Window::is_layout_rtl);
@@ -3084,6 +3250,9 @@ void Window::_bind_methods() {
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "mouse_passthrough"), "set_flag", "get_flag", FLAG_MOUSE_PASSTHROUGH);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "sharp_corners"), "set_flag", "get_flag", FLAG_SHARP_CORNERS);
 	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "exclude_from_capture"), "set_flag", "get_flag", FLAG_EXCLUDE_FROM_CAPTURE);
+	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "popup_wm_hint"), "set_flag", "get_flag", FLAG_POPUP_WM_HINT);
+	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "minimize_disabled"), "set_flag", "get_flag", FLAG_MINIMIZE_DISABLED);
+	ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "maximize_disabled"), "set_flag", "get_flag", FLAG_MAXIMIZE_DISABLED);
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "force_native"), "set_force_native", "get_force_native");
 
 	ADD_GROUP("Limits", "");
@@ -3140,6 +3309,9 @@ void Window::_bind_methods() {
 	BIND_ENUM_CONSTANT(FLAG_MOUSE_PASSTHROUGH);
 	BIND_ENUM_CONSTANT(FLAG_SHARP_CORNERS);
 	BIND_ENUM_CONSTANT(FLAG_EXCLUDE_FROM_CAPTURE);
+	BIND_ENUM_CONSTANT(FLAG_POPUP_WM_HINT);
+	BIND_ENUM_CONSTANT(FLAG_MINIMIZE_DISABLED);
+	BIND_ENUM_CONSTANT(FLAG_MAXIMIZE_DISABLED);
 	BIND_ENUM_CONSTANT(FLAG_MAX);
 
 	BIND_ENUM_CONSTANT(CONTENT_SCALE_MODE_DISABLED);
@@ -3204,6 +3376,9 @@ Window::Window() {
 }
 
 Window::~Window() {
+	if (focused_window == this) {
+		focused_window = nullptr;
+	}
 	memdelete(theme_owner);
 
 	// Resources need to be disconnected.
diff --git a/engine/scene/main/window.h b/engine/scene/main/window.h
index 285fd95d..6daab5af 100644
--- a/engine/scene/main/window.h
+++ b/engine/scene/main/window.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WINDOW_H
-#define WINDOW_H
+#pragma once
 
 #include "scene/main/viewport.h"
 #include "scene/resources/theme.h"
@@ -65,6 +64,9 @@ public:
 		FLAG_MOUSE_PASSTHROUGH = DisplayServer::WINDOW_FLAG_MOUSE_PASSTHROUGH,
 		FLAG_SHARP_CORNERS = DisplayServer::WINDOW_FLAG_SHARP_CORNERS,
 		FLAG_EXCLUDE_FROM_CAPTURE = DisplayServer::WINDOW_FLAG_EXCLUDE_FROM_CAPTURE,
+		FLAG_POPUP_WM_HINT = DisplayServer::WINDOW_FLAG_POPUP_WM_HINT,
+		FLAG_MINIMIZE_DISABLED = DisplayServer::WINDOW_FLAG_MINIMIZE_DISABLED,
+		FLAG_MAXIMIZE_DISABLED = DisplayServer::WINDOW_FLAG_MAXIMIZE_DISABLED,
 		FLAG_MAX = DisplayServer::WINDOW_FLAG_MAX,
 	};
 
@@ -103,7 +105,7 @@ public:
 		DEFAULT_WINDOW_SIZE = 100,
 	};
 
-	// Keep synced with enum hint for `initial_position` property.
+	// Keep synced with enum hint for `initial_position` property and `display/window/size/initial_position_type` project setting.
 	enum WindowInitialPosition {
 		WINDOW_INITIAL_POSITION_ABSOLUTE,
 		WINDOW_INITIAL_POSITION_CENTER_PRIMARY_SCREEN,
@@ -154,9 +156,15 @@ private:
 	ContentScaleStretch content_scale_stretch = CONTENT_SCALE_STRETCH_FRACTIONAL;
 	real_t content_scale_factor = 1.0;
 
+	RID accessibility_title_element;
+	RID accessibility_announcement_element;
+	String announcement;
+
 	void _make_window();
 	void _clear_window();
 	void _update_from_window();
+	void _accessibility_notify_enter(Node *p_node);
+	void _accessibility_notify_exit(Node *p_node);
 
 	bool _try_parent_dialog(Node *p_from_node);
 
@@ -180,6 +188,8 @@ private:
 	void _make_transient();
 	void _set_transient_exclusive_child(bool p_clear_invalid = false);
 
+	static Window *focused_window;
+
 	ThemeOwner *theme_owner = nullptr;
 	Ref<Theme> theme;
 	StringName theme_type_variation;
@@ -260,6 +270,10 @@ protected:
 	void _get_property_list(List<PropertyInfo> *p_list) const;
 	void _validate_property(PropertyInfo &p_property) const;
 
+	void _accessibility_action_grab_focus(const Variant &p_data) {
+		grab_focus();
+	}
+
 	virtual void add_child_notify(Node *p_child) override;
 	virtual void remove_child_notify(Node *p_child) override;
 
@@ -275,6 +289,9 @@ public:
 	static void set_root_layout_direction(int p_root_dir);
 	static Window *get_from_id(DisplayServer::WindowID p_window_id);
 
+	RID get_accessibility_element() const override;
+	virtual RID get_focused_accessibility_element() const override;
+
 	void set_title(const String &p_title);
 	String get_title() const;
 	String get_translated_title() const;
@@ -379,6 +396,7 @@ public:
 	void child_controls_changed();
 
 	Window *get_exclusive_child() const { return exclusive_child; }
+	HashSet<Window *> get_transient_children() const { return transient_children; }
 	Window *get_parent_visible_window() const;
 	Viewport *get_parent_viewport() const;
 
@@ -406,6 +424,8 @@ public:
 
 	Rect2i get_usable_parent_rect() const;
 
+	void accessibility_announcement(const String &p_announcement);
+
 	// Internationalization.
 
 	void set_layout_direction(LayoutDirection p_direction);
@@ -457,6 +477,7 @@ public:
 	Variant get_theme_item(Theme::DataType p_data_type, const StringName &p_name, const StringName &p_theme_type = StringName()) const;
 #ifdef TOOLS_ENABLED
 	Ref<Texture2D> get_editor_theme_icon(const StringName &p_name) const;
+	Ref<Texture2D> get_editor_theme_native_menu_icon(const StringName &p_name, bool p_global_menu, bool p_dark_mode) const;
 #endif
 
 	bool has_theme_icon_override(const StringName &p_name) const;
@@ -477,8 +498,6 @@ public:
 	Ref<Font> get_theme_default_font() const;
 	int get_theme_default_font_size() const;
 
-	//
-
 	virtual Transform2D get_final_transform() const override;
 	virtual Transform2D get_screen_transform_internal(bool p_absolute_position = false) const override;
 	virtual Transform2D get_popup_base_transform() const override;
@@ -487,6 +506,7 @@ public:
 
 	Rect2i get_parent_rect() const;
 	virtual DisplayServer::WindowID get_window_id() const override;
+	static Window *get_focused_window() { return focused_window; }
 
 	virtual Size2 _get_contents_minimum_size() const;
 
@@ -501,5 +521,3 @@ VARIANT_ENUM_CAST(Window::ContentScaleAspect);
 VARIANT_ENUM_CAST(Window::ContentScaleStretch);
 VARIANT_ENUM_CAST(Window::LayoutDirection);
 VARIANT_ENUM_CAST(Window::WindowInitialPosition);
-
-#endif // WINDOW_H
diff --git a/engine/scene/property_list_helper.h b/engine/scene/property_list_helper.h
index 1ab923e7..17709f99 100644
--- a/engine/scene/property_list_helper.h
+++ b/engine/scene/property_list_helper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROPERTY_LIST_HELPER_H
-#define PROPERTY_LIST_HELPER_H
+#pragma once
 
 #include "core/object/method_bind.h"
 #include "core/object/object.h"
@@ -90,5 +89,3 @@ public:
 
 	void clear();
 };
-
-#endif // PROPERTY_LIST_HELPER_H
diff --git a/engine/scene/property_utils.h b/engine/scene/property_utils.h
index 0fa53244..446ae222 100644
--- a/engine/scene/property_utils.h
+++ b/engine/scene/property_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PROPERTY_UTILS_H
-#define PROPERTY_UTILS_H
+#pragma once
 
 #include "scene/main/node.h"
 #include "scene/resources/packed_scene.h"
@@ -50,5 +49,3 @@ public:
 	static void assign_custom_type_script(Object *p_object, const Ref<Script> &p_script);
 	static Ref<Script> get_custom_type_script(const Object *p_object);
 };
-
-#endif // PROPERTY_UTILS_H
diff --git a/engine/scene/register_scene_types.cpp b/engine/scene/register_scene_types.cpp
index a665fa90..54fcb34f 100644
--- a/engine/scene/register_scene_types.cpp
+++ b/engine/scene/register_scene_types.cpp
@@ -57,6 +57,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/file_dialog.h"
 #include "scene/gui/flow_container.h"
+#include "scene/gui/foldable_container.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/graph_frame.h"
 #include "scene/gui/graph_node.h"
@@ -131,10 +132,11 @@
 #include "scene/resources/mesh_data_tool.h"
 #include "scene/resources/mesh_texture.h"
 #include "scene/resources/multimesh.h"
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 #include "scene/resources/navigation_mesh.h"
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/particle_process_material.h"
-#include "scene/resources/physics_material.h"
 #include "scene/resources/placeholder_textures.h"
 #include "scene/resources/portable_compressed_texture.h"
 #include "scene/resources/resource_format_text.h"
@@ -157,7 +159,6 @@
 #include "scene/resources/visual_shader_nodes.h"
 #include "scene/resources/visual_shader_particle_nodes.h"
 #include "scene/resources/visual_shader_sdf_nodes.h"
-#include "scene/resources/world_2d.h"
 #include "scene/theme/theme_db.h"
 
 // 2D
@@ -176,59 +177,36 @@
 #include "scene/2d/marker_2d.h"
 #include "scene/2d/mesh_instance_2d.h"
 #include "scene/2d/multimesh_instance_2d.h"
-#include "scene/2d/navigation_agent_2d.h"
-#include "scene/2d/navigation_link_2d.h"
-#include "scene/2d/navigation_obstacle_2d.h"
-#include "scene/2d/navigation_region_2d.h"
 #include "scene/2d/parallax_2d.h"
 #include "scene/2d/parallax_background.h"
 #include "scene/2d/parallax_layer.h"
 #include "scene/2d/path_2d.h"
-#include "scene/2d/physics/animatable_body_2d.h"
-#include "scene/2d/physics/area_2d.h"
-#include "scene/2d/physics/character_body_2d.h"
-#include "scene/2d/physics/collision_polygon_2d.h"
-#include "scene/2d/physics/collision_shape_2d.h"
-#include "scene/2d/physics/joints/damped_spring_joint_2d.h"
-#include "scene/2d/physics/joints/groove_joint_2d.h"
-#include "scene/2d/physics/joints/joint_2d.h"
-#include "scene/2d/physics/joints/pin_joint_2d.h"
-#include "scene/2d/physics/kinematic_collision_2d.h"
-#include "scene/2d/physics/physical_bone_2d.h"
-#include "scene/2d/physics/physics_body_2d.h"
-#include "scene/2d/physics/ray_cast_2d.h"
-#include "scene/2d/physics/rigid_body_2d.h"
-#include "scene/2d/physics/shape_cast_2d.h"
-#include "scene/2d/physics/static_body_2d.h"
 #include "scene/2d/polygon_2d.h"
 #include "scene/2d/remote_transform_2d.h"
 #include "scene/2d/skeleton_2d.h"
 #include "scene/2d/sprite_2d.h"
 #include "scene/2d/tile_map.h"
 #include "scene/2d/tile_map_layer.h"
-#include "scene/2d/touch_screen_button.h"
 #include "scene/2d/visible_on_screen_notifier_2d.h"
-#include "scene/resources/2d/capsule_shape_2d.h"
-#include "scene/resources/2d/circle_shape_2d.h"
-#include "scene/resources/2d/concave_polygon_shape_2d.h"
-#include "scene/resources/2d/convex_polygon_shape_2d.h"
-#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
-#include "scene/resources/2d/navigation_polygon.h"
 #include "scene/resources/2d/polygon_path_finder.h"
-#include "scene/resources/2d/rectangle_shape_2d.h"
-#include "scene/resources/2d/segment_shape_2d.h"
-#include "scene/resources/2d/separation_ray_shape_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h"
-#include "scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h"
-#include "scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h"
 #include "scene/resources/2d/tile_set.h"
-#include "scene/resources/2d/world_boundary_shape_2d.h"
+#include "scene/resources/world_2d.h"
+
+#ifndef NAVIGATION_2D_DISABLED
+#include "scene/2d/navigation/navigation_agent_2d.h"
+#include "scene/2d/navigation/navigation_link_2d.h"
+#include "scene/2d/navigation/navigation_obstacle_2d.h"
+#include "scene/2d/navigation/navigation_region_2d.h"
+#include "scene/resources/2d/navigation_mesh_source_geometry_data_2d.h"
+#include "scene/resources/2d/navigation_polygon.h"
+#endif // NAVIGATION_2D_DISABLED
 
 #ifndef _3D_DISABLED
 #include "scene/3d/audio_listener_3d.h"
@@ -249,14 +227,78 @@
 #include "scene/3d/marker_3d.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/multimesh_instance_3d.h"
-#include "scene/3d/navigation_agent_3d.h"
-#include "scene/3d/navigation_link_3d.h"
-#include "scene/3d/navigation_obstacle_3d.h"
-#include "scene/3d/navigation_region_3d.h"
 #include "scene/3d/node_3d.h"
 #include "scene/3d/occluder_instance_3d.h"
 #include "scene/3d/path_3d.h"
-#include "scene/3d/physical_bone_simulator_3d.h"
+#include "scene/3d/reflection_probe.h"
+#include "scene/3d/remote_transform_3d.h"
+#include "scene/3d/retarget_modifier_3d.h"
+#include "scene/3d/skeleton_3d.h"
+#include "scene/3d/skeleton_ik_3d.h"
+#include "scene/3d/skeleton_modifier_3d.h"
+#include "scene/3d/sprite_3d.h"
+#include "scene/3d/visible_on_screen_notifier_3d.h"
+#include "scene/3d/voxel_gi.h"
+#include "scene/3d/world_environment.h"
+#include "scene/animation/root_motion_view.h"
+#include "scene/resources/3d/fog_material.h"
+#include "scene/resources/3d/importer_mesh.h"
+#include "scene/resources/3d/mesh_library.h"
+#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
+#include "scene/resources/3d/primitive_meshes.h"
+#include "scene/resources/3d/sky_material.h"
+#include "scene/resources/3d/world_3d.h"
+#ifndef NAVIGATION_3D_DISABLED
+#include "scene/3d/navigation/navigation_agent_3d.h"
+#include "scene/3d/navigation/navigation_link_3d.h"
+#include "scene/3d/navigation/navigation_obstacle_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
+#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
+#endif // NAVIGATION_3D_DISABLED
+#ifndef XR_DISABLED
+#include "scene/3d/xr/xr_body_modifier_3d.h"
+#include "scene/3d/xr/xr_face_modifier_3d.h"
+#include "scene/3d/xr/xr_hand_modifier_3d.h"
+#include "scene/3d/xr/xr_nodes.h"
+#endif // XR_DISABLED
+#endif // _3D_DISABLED
+
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
+#include "scene/resources/physics_material.h"
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
+
+#ifndef PHYSICS_2D_DISABLED
+#include "scene/2d/physics/animatable_body_2d.h"
+#include "scene/2d/physics/area_2d.h"
+#include "scene/2d/physics/character_body_2d.h"
+#include "scene/2d/physics/collision_polygon_2d.h"
+#include "scene/2d/physics/collision_shape_2d.h"
+#include "scene/2d/physics/joints/damped_spring_joint_2d.h"
+#include "scene/2d/physics/joints/groove_joint_2d.h"
+#include "scene/2d/physics/joints/joint_2d.h"
+#include "scene/2d/physics/joints/pin_joint_2d.h"
+#include "scene/2d/physics/kinematic_collision_2d.h"
+#include "scene/2d/physics/physical_bone_2d.h"
+#include "scene/2d/physics/physics_body_2d.h"
+#include "scene/2d/physics/ray_cast_2d.h"
+#include "scene/2d/physics/rigid_body_2d.h"
+#include "scene/2d/physics/shape_cast_2d.h"
+#include "scene/2d/physics/static_body_2d.h"
+#include "scene/2d/physics/touch_screen_button.h"
+#include "scene/resources/2d/capsule_shape_2d.h"
+#include "scene/resources/2d/circle_shape_2d.h"
+#include "scene/resources/2d/concave_polygon_shape_2d.h"
+#include "scene/resources/2d/convex_polygon_shape_2d.h"
+#include "scene/resources/2d/rectangle_shape_2d.h"
+#include "scene/resources/2d/segment_shape_2d.h"
+#include "scene/resources/2d/separation_ray_shape_2d.h"
+#include "scene/resources/2d/shape_2d.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h"
+#include "scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h"
+#include "scene/resources/2d/world_boundary_shape_2d.h"
+#endif // PHYSICS_2D_DISABLED
+
+#ifndef PHYSICS_3D_DISABLED
 #include "scene/3d/physics/animatable_body_3d.h"
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/character_body_3d.h"
@@ -270,51 +312,30 @@
 #include "scene/3d/physics/joints/slider_joint_3d.h"
 #include "scene/3d/physics/kinematic_collision_3d.h"
 #include "scene/3d/physics/physical_bone_3d.h"
+#include "scene/3d/physics/physical_bone_simulator_3d.h"
 #include "scene/3d/physics/physics_body_3d.h"
 #include "scene/3d/physics/ray_cast_3d.h"
 #include "scene/3d/physics/rigid_body_3d.h"
 #include "scene/3d/physics/shape_cast_3d.h"
+#include "scene/3d/physics/soft_body_3d.h"
 #include "scene/3d/physics/spring_arm_3d.h"
 #include "scene/3d/physics/static_body_3d.h"
 #include "scene/3d/physics/vehicle_body_3d.h"
-#include "scene/3d/reflection_probe.h"
-#include "scene/3d/remote_transform_3d.h"
-#include "scene/3d/retarget_modifier_3d.h"
-#include "scene/3d/skeleton_3d.h"
-#include "scene/3d/skeleton_ik_3d.h"
-#include "scene/3d/skeleton_modifier_3d.h"
-#include "scene/3d/soft_body_3d.h"
 #include "scene/3d/spring_bone_collision_3d.h"
 #include "scene/3d/spring_bone_collision_capsule_3d.h"
 #include "scene/3d/spring_bone_collision_plane_3d.h"
 #include "scene/3d/spring_bone_collision_sphere_3d.h"
 #include "scene/3d/spring_bone_simulator_3d.h"
-#include "scene/3d/sprite_3d.h"
-#include "scene/3d/visible_on_screen_notifier_3d.h"
-#include "scene/3d/voxel_gi.h"
-#include "scene/3d/world_environment.h"
-#include "scene/3d/xr_body_modifier_3d.h"
-#include "scene/3d/xr_face_modifier_3d.h"
-#include "scene/3d/xr_hand_modifier_3d.h"
-#include "scene/3d/xr_nodes.h"
-#include "scene/animation/root_motion_view.h"
 #include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
 #include "scene/resources/3d/cylinder_shape_3d.h"
-#include "scene/resources/3d/fog_material.h"
 #include "scene/resources/3d/height_map_shape_3d.h"
-#include "scene/resources/3d/importer_mesh.h"
-#include "scene/resources/3d/mesh_library.h"
-#include "scene/resources/3d/navigation_mesh_source_geometry_data_3d.h"
-#include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/3d/separation_ray_shape_3d.h"
-#include "scene/resources/3d/sky_material.h"
 #include "scene/resources/3d/sphere_shape_3d.h"
-#include "scene/resources/3d/world_3d.h"
 #include "scene/resources/3d/world_boundary_shape_3d.h"
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
 static Ref<ResourceFormatSaverText> resource_saver_text;
 static Ref<ResourceFormatLoaderText> resource_loader_text;
@@ -338,14 +359,20 @@ void register_scene_types() {
 
 	Node::init_node_hrcr();
 
-	resource_loader_stream_texture.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_stream_texture);
+	if (GD_IS_CLASS_ENABLED(CompressedTexture2D)) {
+		resource_loader_stream_texture.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_stream_texture);
+	}
 
-	resource_loader_texture_layered.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_texture_layered);
+	if (GD_IS_CLASS_ENABLED(TextureLayered)) {
+		resource_loader_texture_layered.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_texture_layered);
+	}
 
-	resource_loader_texture_3d.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_texture_3d);
+	if (GD_IS_CLASS_ENABLED(Texture3D)) {
+		resource_loader_texture_3d.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_texture_3d);
+	}
 
 	resource_saver_text.instantiate();
 	ResourceSaver::add_resource_format_saver(resource_saver_text, true);
@@ -353,17 +380,21 @@ void register_scene_types() {
 	resource_loader_text.instantiate();
 	ResourceLoader::add_resource_format_loader(resource_loader_text, true);
 
-	resource_saver_shader.instantiate();
-	ResourceSaver::add_resource_format_saver(resource_saver_shader, true);
+	if (GD_IS_CLASS_ENABLED(Shader)) {
+		resource_saver_shader.instantiate();
+		ResourceSaver::add_resource_format_saver(resource_saver_shader, true);
 
-	resource_loader_shader.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_shader, true);
+		resource_loader_shader.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_shader, true);
+	}
 
-	resource_saver_shader_include.instantiate();
-	ResourceSaver::add_resource_format_saver(resource_saver_shader_include, true);
+	if (GD_IS_CLASS_ENABLED(ShaderInclude)) {
+		resource_saver_shader_include.instantiate();
+		ResourceSaver::add_resource_format_saver(resource_saver_shader_include, true);
 
-	resource_loader_shader_include.instantiate();
-	ResourceLoader::add_resource_format_loader(resource_loader_shader_include, true);
+		resource_loader_shader_include.instantiate();
+		ResourceLoader::add_resource_format_loader(resource_loader_shader_include, true);
+	}
 
 	OS::get_singleton()->yield(); // may take time to init
 
@@ -489,13 +520,16 @@ void register_scene_types() {
 	GDREGISTER_CLASS(GraphFrame);
 	GDREGISTER_CLASS(GraphEdit);
 
+	GDREGISTER_CLASS(FoldableGroup);
+	GDREGISTER_CLASS(FoldableContainer);
+
 	OS::get_singleton()->yield(); // may take time to init
 
-	bool swap_cancel_ok = false;
-	if (DisplayServer::get_singleton()) {
-		swap_cancel_ok = GLOBAL_DEF_NOVAL("gui/common/swap_cancel_ok", bool(DisplayServer::get_singleton()->get_swap_cancel_ok()));
+	int swap_cancel_ok = GLOBAL_DEF(PropertyInfo(Variant::INT, "gui/common/swap_cancel_ok", PROPERTY_HINT_ENUM, "Auto,Cancel First,OK First"), 0);
+	if (DisplayServer::get_singleton() && swap_cancel_ok == 0) {
+		swap_cancel_ok = DisplayServer::get_singleton()->get_swap_cancel_ok() ? 2 : 1;
 	}
-	AcceptDialog::set_swap_cancel_ok(swap_cancel_ok);
+	AcceptDialog::set_swap_cancel_ok(swap_cancel_ok == 2);
 #endif
 
 	int root_dir = GLOBAL_GET("internationalization/rendering/root_node_layout_direction");
@@ -555,6 +589,7 @@ void register_scene_types() {
 	GDREGISTER_VIRTUAL_CLASS(GeometryInstance3D);
 	GDREGISTER_CLASS(Camera3D);
 	GDREGISTER_CLASS(AudioListener3D);
+#ifndef XR_DISABLED
 	GDREGISTER_CLASS(XRCamera3D);
 	GDREGISTER_CLASS(XRNode3D);
 	GDREGISTER_CLASS(XRController3D);
@@ -563,6 +598,7 @@ void register_scene_types() {
 	GDREGISTER_CLASS(XRBodyModifier3D);
 	GDREGISTER_CLASS(XRHandModifier3D);
 	GDREGISTER_CLASS(XRFaceModifier3D);
+#endif // XR_DISABLED
 	GDREGISTER_CLASS(MeshInstance3D);
 	GDREGISTER_CLASS(OccluderInstance3D);
 	GDREGISTER_ABSTRACT_CLASS(Occluder3D);
@@ -602,14 +638,16 @@ void register_scene_types() {
 	GDREGISTER_CLASS(RootMotionView);
 	GDREGISTER_VIRTUAL_CLASS(SkeletonModifier3D);
 	GDREGISTER_CLASS(RetargetModifier3D);
+
+	OS::get_singleton()->yield(); // may take time to init
+
+#ifndef PHYSICS_3D_DISABLED
 	GDREGISTER_CLASS(SpringBoneSimulator3D);
 	GDREGISTER_VIRTUAL_CLASS(SpringBoneCollision3D);
 	GDREGISTER_CLASS(SpringBoneCollisionSphere3D);
 	GDREGISTER_CLASS(SpringBoneCollisionCapsule3D);
 	GDREGISTER_CLASS(SpringBoneCollisionPlane3D);
 
-	OS::get_singleton()->yield(); // may take time to init
-
 	GDREGISTER_ABSTRACT_CLASS(CollisionObject3D);
 	GDREGISTER_ABSTRACT_CLASS(PhysicsBody3D);
 	GDREGISTER_CLASS(StaticBody3D);
@@ -622,11 +660,13 @@ void register_scene_types() {
 	GDREGISTER_CLASS(PhysicalBoneSimulator3D);
 	GDREGISTER_CLASS(PhysicalBone3D);
 	GDREGISTER_CLASS(SoftBody3D);
+#endif // PHYSICS_3D_DISABLED
 
 	GDREGISTER_CLASS(SkeletonIK3D);
 	GDREGISTER_CLASS(BoneAttachment3D);
 	GDREGISTER_CLASS(LookAtModifier3D);
 
+#ifndef PHYSICS_3D_DISABLED
 	GDREGISTER_CLASS(VehicleBody3D);
 	GDREGISTER_CLASS(VehicleWheel3D);
 	GDREGISTER_CLASS(Area3D);
@@ -634,6 +674,7 @@ void register_scene_types() {
 	GDREGISTER_CLASS(CollisionPolygon3D);
 	GDREGISTER_CLASS(RayCast3D);
 	GDREGISTER_CLASS(ShapeCast3D);
+#endif // PHYSICS_3D_DISABLED
 	GDREGISTER_CLASS(MultiMeshInstance3D);
 
 	GDREGISTER_CLASS(Curve3D);
@@ -646,17 +687,22 @@ void register_scene_types() {
 	GDREGISTER_CLASS(FogMaterial);
 	GDREGISTER_CLASS(RemoteTransform3D);
 
+#ifndef PHYSICS_3D_DISABLED
 	GDREGISTER_ABSTRACT_CLASS(Joint3D);
 	GDREGISTER_CLASS(PinJoint3D);
 	GDREGISTER_CLASS(HingeJoint3D);
 	GDREGISTER_CLASS(SliderJoint3D);
 	GDREGISTER_CLASS(ConeTwistJoint3D);
 	GDREGISTER_CLASS(Generic6DOFJoint3D);
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef NAVIGATION_3D_DISABLED
+	GDREGISTER_CLASS(NavigationMeshSourceGeometryData3D);
 	GDREGISTER_CLASS(NavigationRegion3D);
 	GDREGISTER_CLASS(NavigationAgent3D);
 	GDREGISTER_CLASS(NavigationObstacle3D);
 	GDREGISTER_CLASS(NavigationLink3D);
+#endif // NAVIGATION_3D_DISABLED
 
 	OS::get_singleton()->yield(); // may take time to init
 #endif // _3D_DISABLED
@@ -804,6 +850,7 @@ void register_scene_types() {
 	GDREGISTER_CLASS(Line2D);
 	GDREGISTER_CLASS(MeshInstance2D);
 	GDREGISTER_CLASS(MultiMeshInstance2D);
+#ifndef PHYSICS_2D_DISABLED
 	GDREGISTER_ABSTRACT_CLASS(CollisionObject2D);
 	GDREGISTER_ABSTRACT_CLASS(PhysicsBody2D);
 	GDREGISTER_CLASS(StaticBody2D);
@@ -816,6 +863,7 @@ void register_scene_types() {
 	GDREGISTER_CLASS(CollisionPolygon2D);
 	GDREGISTER_CLASS(RayCast2D);
 	GDREGISTER_CLASS(ShapeCast2D);
+#endif // PHYSICS_2D_DISABLED
 	GDREGISTER_CLASS(VisibleOnScreenNotifier2D);
 	GDREGISTER_CLASS(VisibleOnScreenEnabler2D);
 	GDREGISTER_CLASS(Polygon2D);
@@ -832,10 +880,13 @@ void register_scene_types() {
 
 	GDREGISTER_CLASS(Camera2D);
 	GDREGISTER_CLASS(AudioListener2D);
+#ifndef PHYSICS_2D_DISABLED
 	GDREGISTER_ABSTRACT_CLASS(Joint2D);
 	GDREGISTER_CLASS(PinJoint2D);
 	GDREGISTER_CLASS(GrooveJoint2D);
 	GDREGISTER_CLASS(DampedSpringJoint2D);
+	GDREGISTER_CLASS(TouchScreenButton);
+#endif // PHYSICS_2D_DISABLED
 	GDREGISTER_CLASS(TileSet);
 	GDREGISTER_ABSTRACT_CLASS(TileSetSource);
 	GDREGISTER_CLASS(TileSetAtlasSource);
@@ -847,7 +898,6 @@ void register_scene_types() {
 	GDREGISTER_CLASS(Parallax2D);
 	GDREGISTER_CLASS(ParallaxBackground);
 	GDREGISTER_CLASS(ParallaxLayer);
-	GDREGISTER_CLASS(TouchScreenButton);
 	GDREGISTER_CLASS(RemoteTransform2D);
 
 	GDREGISTER_CLASS(SkeletonModificationStack2D);
@@ -855,12 +905,14 @@ void register_scene_types() {
 	GDREGISTER_CLASS(SkeletonModification2DLookAt);
 	GDREGISTER_CLASS(SkeletonModification2DCCDIK);
 	GDREGISTER_CLASS(SkeletonModification2DFABRIK);
-	GDREGISTER_CLASS(SkeletonModification2DJiggle);
 	GDREGISTER_CLASS(SkeletonModification2DTwoBoneIK);
 	GDREGISTER_CLASS(SkeletonModification2DStackHolder);
 
+#ifndef PHYSICS_2D_DISABLED
 	GDREGISTER_CLASS(PhysicalBone2D);
+	GDREGISTER_CLASS(SkeletonModification2DJiggle);
 	GDREGISTER_CLASS(SkeletonModification2DPhysicalBones);
+#endif // PHYSICS_2D_DISABLED
 
 	OS::get_singleton()->yield(); // may take time to init
 
@@ -905,10 +957,10 @@ void register_scene_types() {
 	BaseMaterial3D::init_shaders();
 
 	GDREGISTER_CLASS(MeshLibrary);
-	GDREGISTER_CLASS(NavigationMeshSourceGeometryData3D);
 
 	OS::get_singleton()->yield(); // may take time to init
 
+#ifndef PHYSICS_3D_DISABLED
 	GDREGISTER_ABSTRACT_CLASS(Shape3D);
 	GDREGISTER_CLASS(SeparationRayShape3D);
 	GDREGISTER_CLASS(SphereShape3D);
@@ -919,12 +971,15 @@ void register_scene_types() {
 	GDREGISTER_CLASS(WorldBoundaryShape3D);
 	GDREGISTER_CLASS(ConvexPolygonShape3D);
 	GDREGISTER_CLASS(ConcavePolygonShape3D);
+#endif // PHYSICS_3D_DISABLED
 	GDREGISTER_CLASS(World3D);
 
 	OS::get_singleton()->yield(); // may take time to init
 #endif // _3D_DISABLED
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	GDREGISTER_CLASS(PhysicsMaterial);
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	GDREGISTER_CLASS(Compositor);
 	GDREGISTER_CLASS(Environment);
 	GDREGISTER_VIRTUAL_CLASS(CameraAttributes);
@@ -1013,6 +1068,11 @@ void register_scene_types() {
 	OS::get_singleton()->yield(); // may take time to init
 
 	GDREGISTER_CLASS(AudioStreamPlayer2D);
+	GDREGISTER_CLASS(Curve2D);
+	GDREGISTER_CLASS(Path2D);
+	GDREGISTER_CLASS(PathFollow2D);
+
+#ifndef PHYSICS_2D_DISABLED
 	GDREGISTER_ABSTRACT_CLASS(Shape2D);
 	GDREGISTER_CLASS(WorldBoundaryShape2D);
 	GDREGISTER_CLASS(SegmentShape2D);
@@ -1022,18 +1082,20 @@ void register_scene_types() {
 	GDREGISTER_CLASS(CapsuleShape2D);
 	GDREGISTER_CLASS(ConvexPolygonShape2D);
 	GDREGISTER_CLASS(ConcavePolygonShape2D);
-	GDREGISTER_CLASS(Curve2D);
-	GDREGISTER_CLASS(Path2D);
-	GDREGISTER_CLASS(PathFollow2D);
-	GDREGISTER_CLASS(PolygonPathFinder);
+#endif // PHYSICS_2D_DISABLED
 
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 	GDREGISTER_CLASS(NavigationMesh);
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
+
+#ifndef NAVIGATION_2D_DISABLED
 	GDREGISTER_CLASS(NavigationMeshSourceGeometryData2D);
 	GDREGISTER_CLASS(NavigationPolygon);
 	GDREGISTER_CLASS(NavigationRegion2D);
 	GDREGISTER_CLASS(NavigationAgent2D);
 	GDREGISTER_CLASS(NavigationObstacle2D);
 	GDREGISTER_CLASS(NavigationLink2D);
+	GDREGISTER_CLASS(PolygonPathFinder);
 
 	OS::get_singleton()->yield(); // may take time to init
 
@@ -1044,16 +1106,24 @@ void register_scene_types() {
 	Polygon2D::navmesh_parse_init();
 	TileMap::navmesh_parse_init();
 	TileMapLayer::navmesh_parse_init();
+#ifndef PHYSICS_2D_DISABLED
 	StaticBody2D::navmesh_parse_init();
-#ifndef _3D_DISABLED
+#endif // PHYSICS_2D_DISABLED
+#endif // NAVIGATION_2D_DISABLED
+
+#ifndef NAVIGATION_3D_DISABLED
 	// 3D nodes that support navmesh baking need to server register their source geometry parsers.
 	MeshInstance3D::navmesh_parse_init();
 	MultiMeshInstance3D::navmesh_parse_init();
 	NavigationObstacle3D::navmesh_parse_init();
+#ifndef PHYSICS_3D_DISABLED
 	StaticBody3D::navmesh_parse_init();
-#endif
+#endif // PHYSICS_3D_DISABLED
+#endif // NAVIGATION_3D_DISABLED
 
+#if !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 	OS::get_singleton()->yield(); // may take time to init
+#endif // !defined(NAVIGATION_2D_DISABLED) || !defined(NAVIGATION_3D_DISABLED)
 
 	GDREGISTER_ABSTRACT_CLASS(SceneState);
 	GDREGISTER_CLASS(PackedScene);
@@ -1069,8 +1139,10 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("BitmapFont", "FontFile");
 	ClassDB::add_compatibility_class("DynamicFont", "FontFile");
 	ClassDB::add_compatibility_class("DynamicFontData", "FontFile");
+#ifndef NAVIGATION_3D_DISABLED
 	ClassDB::add_compatibility_class("Navigation3D", "Node3D");
 	ClassDB::add_compatibility_class("Navigation2D", "Node2D");
+#endif // NAVIGATION_3D_DISABLED
 	ClassDB::add_compatibility_class("OpenSimplexNoise", "FastNoiseLite");
 	ClassDB::add_compatibility_class("ProximityGroup", "Node3D");
 	ClassDB::add_compatibility_class("ToolButton", "Button");
@@ -1087,7 +1159,6 @@ void register_scene_types() {
 	// Renamed in 4.0.
 	// Keep alphabetical ordering to easily locate classes and avoid duplicates.
 	ClassDB::add_compatibility_class("AnimatedSprite", "AnimatedSprite2D");
-	ClassDB::add_compatibility_class("Area", "Area3D");
 	ClassDB::add_compatibility_class("ARVRCamera", "XRCamera3D");
 	ClassDB::add_compatibility_class("ARVRController", "XRController3D");
 	ClassDB::add_compatibility_class("ARVRAnchor", "XRAnchor3D");
@@ -1097,17 +1168,8 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("ARVRServer", "XRServer");
 	ClassDB::add_compatibility_class("AStar", "AStar3D");
 	ClassDB::add_compatibility_class("BoneAttachment", "BoneAttachment3D");
-	ClassDB::add_compatibility_class("BoxShape", "BoxShape3D");
 	ClassDB::add_compatibility_class("Camera", "Camera3D");
-	ClassDB::add_compatibility_class("CapsuleShape", "CapsuleShape3D");
 	ClassDB::add_compatibility_class("ClippedCamera", "ClippedCamera3D");
-	ClassDB::add_compatibility_class("CollisionObject", "CollisionObject3D");
-	ClassDB::add_compatibility_class("CollisionPolygon", "CollisionPolygon3D");
-	ClassDB::add_compatibility_class("CollisionShape", "CollisionShape3D");
-	ClassDB::add_compatibility_class("ConcavePolygonShape", "ConcavePolygonShape3D");
-	ClassDB::add_compatibility_class("ConeTwistJoint", "ConeTwistJoint3D");
-	ClassDB::add_compatibility_class("ConvexPolygonShape", "ConvexPolygonShape3D");
-	ClassDB::add_compatibility_class("CPUParticles", "CPUParticles3D");
 	ClassDB::add_compatibility_class("CSGBox", "CSGBox3D");
 	ClassDB::add_compatibility_class("CSGCombiner", "CSGCombiner3D");
 	ClassDB::add_compatibility_class("CSGCylinder", "CSGCylinder3D");
@@ -1118,33 +1180,26 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("CSGSphere", "CSGSphere3D");
 	ClassDB::add_compatibility_class("CSGTorus", "CSGTorus3D");
 	ClassDB::add_compatibility_class("CubeMesh", "BoxMesh");
-	ClassDB::add_compatibility_class("CylinderShape", "CylinderShape3D");
-	ClassDB::add_compatibility_class("DirectionalLight", "DirectionalLight3D");
-	ClassDB::add_compatibility_class("EditorSpatialGizmo", "EditorNode3DGizmo");
-	ClassDB::add_compatibility_class("EditorSpatialGizmoPlugin", "EditorNode3DGizmoPlugin");
-	ClassDB::add_compatibility_class("Generic6DOFJoint", "Generic6DOFJoint3D");
 	ClassDB::add_compatibility_class("GIProbe", "VoxelGI");
 	ClassDB::add_compatibility_class("GIProbeData", "VoxelGIData");
 	ClassDB::add_compatibility_class("GradientTexture", "GradientTexture1D");
-	ClassDB::add_compatibility_class("HeightMapShape", "HeightMapShape3D");
-	ClassDB::add_compatibility_class("HingeJoint", "HingeJoint3D");
-	ClassDB::add_compatibility_class("Joint", "Joint3D");
-	ClassDB::add_compatibility_class("KinematicBody", "CharacterBody3D");
-	ClassDB::add_compatibility_class("KinematicBody2D", "CharacterBody2D");
-	ClassDB::add_compatibility_class("KinematicCollision", "KinematicCollision3D");
 	ClassDB::add_compatibility_class("Light", "Light3D");
 	ClassDB::add_compatibility_class("Light2D", "PointLight2D");
 	ClassDB::add_compatibility_class("LineShape2D", "WorldBoundaryShape2D");
 	ClassDB::add_compatibility_class("Listener", "AudioListener3D");
 	ClassDB::add_compatibility_class("MeshInstance", "MeshInstance3D");
 	ClassDB::add_compatibility_class("MultiMeshInstance", "MultiMeshInstance3D");
+#ifndef NAVIGATION_3D_DISABLED
 	ClassDB::add_compatibility_class("NavigationAgent", "NavigationAgent3D");
 	ClassDB::add_compatibility_class("NavigationMeshInstance", "NavigationRegion3D");
 	ClassDB::add_compatibility_class("NavigationObstacle", "NavigationObstacle3D");
-	ClassDB::add_compatibility_class("NavigationPolygonInstance", "NavigationRegion2D");
 	ClassDB::add_compatibility_class("NavigationRegion", "NavigationRegion3D");
-	ClassDB::add_compatibility_class("Navigation2DServer", "NavigationServer2D");
 	ClassDB::add_compatibility_class("NavigationServer", "NavigationServer3D");
+#endif // NAVIGATION_3D_DISABLED
+#ifndef NAVIGATION_2D_DISABLED
+	ClassDB::add_compatibility_class("NavigationPolygonInstance", "NavigationRegion2D");
+	ClassDB::add_compatibility_class("Navigation2DServer", "NavigationServer2D");
+#endif // NAVIGATION_2D_DISABLED
 	ClassDB::add_compatibility_class("OmniLight", "OmniLight3D");
 	ClassDB::add_compatibility_class("PanoramaSky", "Sky");
 	ClassDB::add_compatibility_class("Particles", "GPUParticles3D");
@@ -1152,48 +1207,21 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("ParticlesMaterial", "ParticleProcessMaterial");
 	ClassDB::add_compatibility_class("Path", "Path3D");
 	ClassDB::add_compatibility_class("PathFollow", "PathFollow3D");
-	ClassDB::add_compatibility_class("PhysicalBone", "PhysicalBone3D");
-	ClassDB::add_compatibility_class("Physics2DDirectBodyState", "PhysicsDirectBodyState2D");
-	ClassDB::add_compatibility_class("Physics2DDirectSpaceState", "PhysicsDirectSpaceState2D");
-	ClassDB::add_compatibility_class("Physics2DServer", "PhysicsServer2D");
-	ClassDB::add_compatibility_class("Physics2DShapeQueryParameters", "PhysicsShapeQueryParameters2D");
-	ClassDB::add_compatibility_class("Physics2DTestMotionResult", "PhysicsTestMotionResult2D");
-	ClassDB::add_compatibility_class("PhysicsBody", "PhysicsBody3D");
-	ClassDB::add_compatibility_class("PhysicsDirectBodyState", "PhysicsDirectBodyState3D");
-	ClassDB::add_compatibility_class("PhysicsDirectSpaceState", "PhysicsDirectSpaceState3D");
-	ClassDB::add_compatibility_class("PhysicsServer", "PhysicsServer3D");
-	ClassDB::add_compatibility_class("PhysicsShapeQueryParameters", "PhysicsShapeQueryParameters3D");
-	ClassDB::add_compatibility_class("PinJoint", "PinJoint3D");
-	ClassDB::add_compatibility_class("PlaneShape", "WorldBoundaryShape3D");
 	ClassDB::add_compatibility_class("Position2D", "Marker2D");
 	ClassDB::add_compatibility_class("Position3D", "Marker3D");
 	ClassDB::add_compatibility_class("ProceduralSky", "Sky");
-	ClassDB::add_compatibility_class("RayCast", "RayCast3D");
-	ClassDB::add_compatibility_class("RayShape", "SeparationRayShape3D");
-	ClassDB::add_compatibility_class("RayShape2D", "SeparationRayShape2D");
 	ClassDB::add_compatibility_class("RemoteTransform", "RemoteTransform3D");
-	ClassDB::add_compatibility_class("RigidBody", "RigidBody3D");
-	ClassDB::add_compatibility_class("RigidDynamicBody2D", "RigidBody2D");
-	ClassDB::add_compatibility_class("RigidDynamicBody3D", "RigidBody3D");
-	ClassDB::add_compatibility_class("Shape", "Shape3D");
 	ClassDB::add_compatibility_class("ShortCut", "Shortcut");
 	ClassDB::add_compatibility_class("Skeleton", "Skeleton3D");
 	ClassDB::add_compatibility_class("SkeletonIK", "SkeletonIK3D");
-	ClassDB::add_compatibility_class("SliderJoint", "SliderJoint3D");
-	ClassDB::add_compatibility_class("SoftBody", "SoftBody3D");
-	ClassDB::add_compatibility_class("SoftDynamicBody3D", "SoftBody3D");
 	ClassDB::add_compatibility_class("Spatial", "Node3D");
 	ClassDB::add_compatibility_class("SpatialGizmo", "Node3DGizmo");
 	ClassDB::add_compatibility_class("SpatialMaterial", "StandardMaterial3D");
-	ClassDB::add_compatibility_class("SphereShape", "SphereShape3D");
 	ClassDB::add_compatibility_class("SpotLight", "SpotLight3D");
-	ClassDB::add_compatibility_class("SpringArm", "SpringArm3D");
 	ClassDB::add_compatibility_class("Sprite", "Sprite2D");
 	ClassDB::add_compatibility_class("StaticBody", "StaticBody3D");
 	ClassDB::add_compatibility_class("StreamTexture", "CompressedTexture2D");
 	ClassDB::add_compatibility_class("TextureProgress", "TextureProgressBar");
-	ClassDB::add_compatibility_class("VehicleBody", "VehicleBody3D");
-	ClassDB::add_compatibility_class("VehicleWheel", "VehicleWheel3D");
 	ClassDB::add_compatibility_class("VideoPlayer", "VideoStreamPlayer");
 	ClassDB::add_compatibility_class("ViewportContainer", "SubViewportContainer");
 	ClassDB::add_compatibility_class("Viewport", "SubViewport");
@@ -1203,6 +1231,58 @@ void register_scene_types() {
 	ClassDB::add_compatibility_class("VisibilityNotifier3D", "VisibleOnScreenNotifier3D");
 	ClassDB::add_compatibility_class("VisualServer", "RenderingServer");
 	ClassDB::add_compatibility_class("World", "World3D");
+#ifndef PHYSICS_2D_DISABLED
+	ClassDB::add_compatibility_class("Physics2DDirectBodyState", "PhysicsDirectBodyState2D");
+	ClassDB::add_compatibility_class("Physics2DDirectSpaceState", "PhysicsDirectSpaceState2D");
+	ClassDB::add_compatibility_class("Physics2DServer", "PhysicsServer2D");
+	ClassDB::add_compatibility_class("Physics2DShapeQueryParameters", "PhysicsShapeQueryParameters2D");
+	ClassDB::add_compatibility_class("Physics2DTestMotionResult", "PhysicsTestMotionResult2D");
+	ClassDB::add_compatibility_class("RayShape2D", "SeparationRayShape2D");
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
+	ClassDB::add_compatibility_class("Area", "Area3D");
+	ClassDB::add_compatibility_class("BoxShape", "BoxShape3D");
+	ClassDB::add_compatibility_class("CapsuleShape", "CapsuleShape3D");
+	ClassDB::add_compatibility_class("CollisionObject", "CollisionObject3D");
+	ClassDB::add_compatibility_class("CollisionPolygon", "CollisionPolygon3D");
+	ClassDB::add_compatibility_class("CollisionShape", "CollisionShape3D");
+	ClassDB::add_compatibility_class("ConcavePolygonShape", "ConcavePolygonShape3D");
+	ClassDB::add_compatibility_class("ConeTwistJoint", "ConeTwistJoint3D");
+	ClassDB::add_compatibility_class("ConvexPolygonShape", "ConvexPolygonShape3D");
+	ClassDB::add_compatibility_class("CPUParticles", "CPUParticles3D");
+	ClassDB::add_compatibility_class("CylinderShape", "CylinderShape3D");
+	ClassDB::add_compatibility_class("DirectionalLight", "DirectionalLight3D");
+	ClassDB::add_compatibility_class("EditorSpatialGizmo", "EditorNode3DGizmo");
+	ClassDB::add_compatibility_class("EditorSpatialGizmoPlugin", "EditorNode3DGizmoPlugin");
+	ClassDB::add_compatibility_class("Generic6DOFJoint", "Generic6DOFJoint3D");
+	ClassDB::add_compatibility_class("HeightMapShape", "HeightMapShape3D");
+	ClassDB::add_compatibility_class("HingeJoint", "HingeJoint3D");
+	ClassDB::add_compatibility_class("Joint", "Joint3D");
+	ClassDB::add_compatibility_class("KinematicBody", "CharacterBody3D");
+	ClassDB::add_compatibility_class("KinematicBody2D", "CharacterBody2D");
+	ClassDB::add_compatibility_class("KinematicCollision", "KinematicCollision3D");
+	ClassDB::add_compatibility_class("PhysicsBody", "PhysicsBody3D");
+	ClassDB::add_compatibility_class("PhysicalBone", "PhysicalBone3D");
+	ClassDB::add_compatibility_class("PhysicsDirectBodyState", "PhysicsDirectBodyState3D");
+	ClassDB::add_compatibility_class("PhysicsDirectSpaceState", "PhysicsDirectSpaceState3D");
+	ClassDB::add_compatibility_class("PhysicsServer", "PhysicsServer3D");
+	ClassDB::add_compatibility_class("PhysicsShapeQueryParameters", "PhysicsShapeQueryParameters3D");
+	ClassDB::add_compatibility_class("PinJoint", "PinJoint3D");
+	ClassDB::add_compatibility_class("PlaneShape", "WorldBoundaryShape3D");
+	ClassDB::add_compatibility_class("RayCast", "RayCast3D");
+	ClassDB::add_compatibility_class("RayShape", "SeparationRayShape3D");
+	ClassDB::add_compatibility_class("RigidBody", "RigidBody3D");
+	ClassDB::add_compatibility_class("RigidDynamicBody2D", "RigidBody2D");
+	ClassDB::add_compatibility_class("RigidDynamicBody3D", "RigidBody3D");
+	ClassDB::add_compatibility_class("Shape", "Shape3D");
+	ClassDB::add_compatibility_class("SliderJoint", "SliderJoint3D");
+	ClassDB::add_compatibility_class("SoftBody", "SoftBody3D");
+	ClassDB::add_compatibility_class("SoftDynamicBody3D", "SoftBody3D");
+	ClassDB::add_compatibility_class("SphereShape", "SphereShape3D");
+	ClassDB::add_compatibility_class("SpringArm", "SpringArm3D");
+	ClassDB::add_compatibility_class("VehicleBody", "VehicleBody3D");
+	ClassDB::add_compatibility_class("VehicleWheel", "VehicleWheel3D");
+#endif // PHYSICS_3D_DISABLED
 
 	// VisualShader classes.
 	ClassDB::add_compatibility_class("VisualShaderNodeScalarConstant", "VisualShaderNodeFloatConstant");
@@ -1255,9 +1335,13 @@ void register_scene_types() {
 
 	for (int i = 0; i < 32; i++) {
 		GLOBAL_DEF_BASIC(vformat("%s/layer_%d", PNAME("layer_names/2d_physics"), i + 1), "");
+#ifndef NAVIGATION_2D_DISABLED
 		GLOBAL_DEF_BASIC(vformat("%s/layer_%d", PNAME("layer_names/2d_navigation"), i + 1), "");
+#endif // NAVIGATION_2D_DISABLED
 		GLOBAL_DEF_BASIC(vformat("%s/layer_%d", PNAME("layer_names/3d_physics"), i + 1), "");
+#ifndef NAVIGATION_3D_DISABLED
 		GLOBAL_DEF_BASIC(vformat("%s/layer_%d", PNAME("layer_names/3d_navigation"), i + 1), "");
+#endif // NAVIGATION_3D_DISABLED
 	}
 
 	for (int i = 0; i < 32; i++) {
@@ -1280,14 +1364,20 @@ void unregister_scene_types() {
 
 	SceneDebugger::deinitialize();
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_texture_layered);
-	resource_loader_texture_layered.unref();
+	if (GD_IS_CLASS_ENABLED(TextureLayered)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_texture_layered);
+		resource_loader_texture_layered.unref();
+	}
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_texture_3d);
-	resource_loader_texture_3d.unref();
+	if (GD_IS_CLASS_ENABLED(Texture3D)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_texture_3d);
+		resource_loader_texture_3d.unref();
+	}
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_stream_texture);
-	resource_loader_stream_texture.unref();
+	if (GD_IS_CLASS_ENABLED(CompressedTexture2D)) {
+		ResourceLoader::remove_resource_format_loader(resource_loader_stream_texture);
+		resource_loader_stream_texture.unref();
+	}
 
 	ResourceSaver::remove_resource_format_saver(resource_saver_text);
 	resource_saver_text.unref();
@@ -1295,17 +1385,21 @@ void unregister_scene_types() {
 	ResourceLoader::remove_resource_format_loader(resource_loader_text);
 	resource_loader_text.unref();
 
-	ResourceSaver::remove_resource_format_saver(resource_saver_shader);
-	resource_saver_shader.unref();
+	if (GD_IS_CLASS_ENABLED(Shader)) {
+		ResourceSaver::remove_resource_format_saver(resource_saver_shader);
+		resource_saver_shader.unref();
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_shader);
-	resource_loader_shader.unref();
+		ResourceLoader::remove_resource_format_loader(resource_loader_shader);
+		resource_loader_shader.unref();
+	}
 
-	ResourceSaver::remove_resource_format_saver(resource_saver_shader_include);
-	resource_saver_shader_include.unref();
+	if (GD_IS_CLASS_ENABLED(ShaderInclude)) {
+		ResourceSaver::remove_resource_format_saver(resource_saver_shader_include);
+		resource_saver_shader_include.unref();
 
-	ResourceLoader::remove_resource_format_loader(resource_loader_shader_include);
-	resource_loader_shader_include.unref();
+		ResourceLoader::remove_resource_format_loader(resource_loader_shader_include);
+		resource_loader_shader_include.unref();
+	}
 
 	// StandardMaterial3D is not initialized when 3D is disabled, so it shouldn't be cleaned up either
 #ifndef _3D_DISABLED
diff --git a/engine/scene/register_scene_types.h b/engine/scene/register_scene_types.h
index 28847b49..84b30546 100644
--- a/engine/scene/register_scene_types.h
+++ b/engine/scene/register_scene_types.h
@@ -28,11 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_SCENE_TYPES_H
-#define REGISTER_SCENE_TYPES_H
+#pragma once
 
 void register_scene_types();
 void unregister_scene_types();
 void register_scene_singletons();
-
-#endif // REGISTER_SCENE_TYPES_H
diff --git a/engine/scene/resources/2d/SCsub b/engine/scene/resources/2d/SCsub
index 408aa3cf..48a5659b 100644
--- a/engine/scene/resources/2d/SCsub
+++ b/engine/scene/resources/2d/SCsub
@@ -3,5 +3,21 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.scene_sources, "*.cpp")
-env.add_source_files(env.scene_sources, "skeleton/*.cpp")
+env.add_source_files(env.scene_sources, "tile_set.cpp")
+
+if not env["disable_physics_2d"]:
+    env.add_source_files(env.scene_sources, "capsule_shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "circle_shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "concave_polygon_shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "convex_polygon_shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "rectangle_shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "segment_shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "separation_ray_shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "shape_2d.cpp")
+    env.add_source_files(env.scene_sources, "world_boundary_shape_2d.cpp")
+if not env["disable_navigation_2d"]:
+    env.add_source_files(env.scene_sources, "navigation_mesh_source_geometry_data_2d.cpp")
+    env.add_source_files(env.scene_sources, "navigation_polygon.cpp")
+    env.add_source_files(env.scene_sources, "polygon_path_finder.cpp")
+
+SConscript("skeleton/SCsub")
diff --git a/engine/scene/resources/2d/capsule_shape_2d.cpp b/engine/scene/resources/2d/capsule_shape_2d.cpp
index 002f5990..369acf71 100644
--- a/engine/scene/resources/2d/capsule_shape_2d.cpp
+++ b/engine/scene/resources/2d/capsule_shape_2d.cpp
@@ -36,7 +36,7 @@
 
 Vector<Vector2> CapsuleShape2D::_get_points() const {
 	Vector<Vector2> points;
-	const real_t turn_step = Math_TAU / 24.0;
+	const real_t turn_step = Math::TAU / 24.0;
 	for (int i = 0; i < 24; i++) {
 		Vector2 ofs = Vector2(0, (i > 6 && i <= 18) ? -height * 0.5 + radius : height * 0.5 - radius);
 
diff --git a/engine/scene/resources/2d/capsule_shape_2d.h b/engine/scene/resources/2d/capsule_shape_2d.h
index cfd3fc6b..a6f4a924 100644
--- a/engine/scene/resources/2d/capsule_shape_2d.h
+++ b/engine/scene/resources/2d/capsule_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAPSULE_SHAPE_2D_H
-#define CAPSULE_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -60,5 +59,3 @@ public:
 
 	CapsuleShape2D();
 };
-
-#endif // CAPSULE_SHAPE_2D_H
diff --git a/engine/scene/resources/2d/circle_shape_2d.cpp b/engine/scene/resources/2d/circle_shape_2d.cpp
index 56ac4f2a..7fd3d118 100644
--- a/engine/scene/resources/2d/circle_shape_2d.cpp
+++ b/engine/scene/resources/2d/circle_shape_2d.cpp
@@ -77,7 +77,7 @@ void CircleShape2D::draw(const RID &p_to_rid, const Color &p_color) {
 	Vector<Vector2> points;
 	points.resize(24);
 
-	const real_t turn_step = Math_TAU / 24.0;
+	const real_t turn_step = Math::TAU / 24.0;
 	for (int i = 0; i < 24; i++) {
 		points.write[i] = Vector2(Math::cos(i * turn_step), Math::sin(i * turn_step)) * get_radius();
 	}
diff --git a/engine/scene/resources/2d/circle_shape_2d.h b/engine/scene/resources/2d/circle_shape_2d.h
index 203a8240..c0585af6 100644
--- a/engine/scene/resources/2d/circle_shape_2d.h
+++ b/engine/scene/resources/2d/circle_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CIRCLE_SHAPE_2D_H
-#define CIRCLE_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -54,5 +53,3 @@ public:
 
 	CircleShape2D();
 };
-
-#endif // CIRCLE_SHAPE_2D_H
diff --git a/engine/scene/resources/2d/concave_polygon_shape_2d.cpp b/engine/scene/resources/2d/concave_polygon_shape_2d.cpp
index 56734a8f..c1673e79 100644
--- a/engine/scene/resources/2d/concave_polygon_shape_2d.cpp
+++ b/engine/scene/resources/2d/concave_polygon_shape_2d.cpp
@@ -43,7 +43,7 @@ bool ConcavePolygonShape2D::_edit_is_selected_on_click(const Point2 &p_point, do
 
 	const Vector2 *r = s.ptr();
 	for (int i = 0; i < len; i += 2) {
-		Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, &r[i]);
+		Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, r[i], r[i + 1]);
 		if (p_point.distance_to(closest) < p_tolerance) {
 			return true;
 		}
diff --git a/engine/scene/resources/2d/concave_polygon_shape_2d.h b/engine/scene/resources/2d/concave_polygon_shape_2d.h
index 8b0b77ac..df6e9cd6 100644
--- a/engine/scene/resources/2d/concave_polygon_shape_2d.h
+++ b/engine/scene/resources/2d/concave_polygon_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONCAVE_POLYGON_SHAPE_2D_H
-#define CONCAVE_POLYGON_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -51,5 +50,3 @@ public:
 
 	ConcavePolygonShape2D();
 };
-
-#endif // CONCAVE_POLYGON_SHAPE_2D_H
diff --git a/engine/scene/resources/2d/convex_polygon_shape_2d.h b/engine/scene/resources/2d/convex_polygon_shape_2d.h
index 2e448f11..7b4efc7f 100644
--- a/engine/scene/resources/2d/convex_polygon_shape_2d.h
+++ b/engine/scene/resources/2d/convex_polygon_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONVEX_POLYGON_SHAPE_2D_H
-#define CONVEX_POLYGON_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -55,5 +54,3 @@ public:
 
 	ConvexPolygonShape2D();
 };
-
-#endif // CONVEX_POLYGON_SHAPE_2D_H
diff --git a/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h b/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h
index 6ddc0574..10bfb5d1 100644
--- a/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h
+++ b/engine/scene/resources/2d/navigation_mesh_source_geometry_data_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_2D_H
-#define NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_2D_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/os/rw_lock.h"
@@ -112,5 +111,3 @@ public:
 	NavigationMeshSourceGeometryData2D() {}
 	~NavigationMeshSourceGeometryData2D() { clear(); }
 };
-
-#endif // NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_2D_H
diff --git a/engine/scene/resources/2d/navigation_polygon.cpp b/engine/scene/resources/2d/navigation_polygon.cpp
index 0e293b68..677a552c 100644
--- a/engine/scene/resources/2d/navigation_polygon.cpp
+++ b/engine/scene/resources/2d/navigation_polygon.cpp
@@ -396,9 +396,7 @@ void NavigationPolygon::make_polygons_from_outlines() {
 	vertices.clear();
 
 	HashMap<Vector2, int> points;
-	for (List<TPPLPoly>::Element *I = out_poly.front(); I; I = I->next()) {
-		TPPLPoly &tp = I->get();
-
+	for (const TPPLPoly &tp : out_poly) {
 		Vector<int> p;
 
 		for (int64_t i = 0; i < tp.GetNumPoints(); i++) {
diff --git a/engine/scene/resources/2d/navigation_polygon.h b/engine/scene/resources/2d/navigation_polygon.h
index 59e5eeed..e32caa6c 100644
--- a/engine/scene/resources/2d/navigation_polygon.h
+++ b/engine/scene/resources/2d/navigation_polygon.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_POLYGON_H
-#define NAVIGATION_POLYGON_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/resources/navigation_mesh.h"
@@ -176,5 +175,3 @@ public:
 VARIANT_ENUM_CAST(NavigationPolygon::SamplePartitionType);
 VARIANT_ENUM_CAST(NavigationPolygon::ParsedGeometryType);
 VARIANT_ENUM_CAST(NavigationPolygon::SourceGeometryMode);
-
-#endif // NAVIGATION_POLYGON_H
diff --git a/engine/scene/resources/2d/polygon_path_finder.cpp b/engine/scene/resources/2d/polygon_path_finder.cpp
index 3aa29243..e3da45f2 100644
--- a/engine/scene/resources/2d/polygon_path_finder.cpp
+++ b/engine/scene/resources/2d/polygon_path_finder.cpp
@@ -141,12 +141,9 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 
 		for (const Edge &E : edges) {
 			const Edge &e = E;
-			Vector2 seg[2] = {
-				points[e.points[0]].pos,
-				points[e.points[1]].pos
-			};
-
-			Vector2 closest = Geometry2D::get_closest_point_to_segment(from, seg);
+			const Vector2 segment_a = points[e.points[0]].pos;
+			const Vector2 segment_b = points[e.points[1]].pos;
+			Vector2 closest = Geometry2D::get_closest_point_to_segment(from, segment_a, segment_b);
 			float d = from.distance_squared_to(closest);
 
 			if (d < closest_dist) {
@@ -165,12 +162,9 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 
 		for (const Edge &E : edges) {
 			const Edge &e = E;
-			Vector2 seg[2] = {
-				points[e.points[0]].pos,
-				points[e.points[1]].pos
-			};
-
-			Vector2 closest = Geometry2D::get_closest_point_to_segment(to, seg);
+			const Vector2 segment_a = points[e.points[0]].pos;
+			const Vector2 segment_b = points[e.points[1]].pos;
+			Vector2 closest = Geometry2D::get_closest_point_to_segment(to, segment_a, segment_b);
 			float d = to.distance_squared_to(closest);
 
 			if (d < closest_dist) {
@@ -301,7 +295,7 @@ Vector<Vector2> PolygonPathFinder::find_path(const Vector2 &p_from, const Vector
 	bool found_route = false;
 
 	while (true) {
-		if (open_list.size() == 0) {
+		if (open_list.is_empty()) {
 			print_verbose("Open list empty.");
 			break;
 		}
@@ -493,12 +487,9 @@ Vector2 PolygonPathFinder::get_closest_point(const Vector2 &p_point) const {
 
 	for (const Edge &E : edges) {
 		const Edge &e = E;
-		Vector2 seg[2] = {
-			points[e.points[0]].pos,
-			points[e.points[1]].pos
-		};
-
-		Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, seg);
+		const Vector2 segment_a = points[e.points[0]].pos;
+		const Vector2 segment_b = points[e.points[1]].pos;
+		Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, segment_a, segment_b);
 		float d = p_point.distance_squared_to(closest);
 
 		if (d < closest_dist) {
diff --git a/engine/scene/resources/2d/polygon_path_finder.h b/engine/scene/resources/2d/polygon_path_finder.h
index a6cf6cd5..cfd609ee 100644
--- a/engine/scene/resources/2d/polygon_path_finder.h
+++ b/engine/scene/resources/2d/polygon_path_finder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef POLYGON_PATH_FINDER_H
-#define POLYGON_PATH_FINDER_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -94,5 +93,3 @@ public:
 
 	PolygonPathFinder();
 };
-
-#endif // POLYGON_PATH_FINDER_H
diff --git a/engine/scene/resources/2d/rectangle_shape_2d.h b/engine/scene/resources/2d/rectangle_shape_2d.h
index 80fbc51b..d7770115 100644
--- a/engine/scene/resources/2d/rectangle_shape_2d.h
+++ b/engine/scene/resources/2d/rectangle_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RECTANGLE_SHAPE_2D_H
-#define RECTANGLE_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -56,5 +55,3 @@ public:
 
 	RectangleShape2D();
 };
-
-#endif // RECTANGLE_SHAPE_2D_H
diff --git a/engine/scene/resources/2d/segment_shape_2d.cpp b/engine/scene/resources/2d/segment_shape_2d.cpp
index 75d62df8..9b58306d 100644
--- a/engine/scene/resources/2d/segment_shape_2d.cpp
+++ b/engine/scene/resources/2d/segment_shape_2d.cpp
@@ -35,8 +35,7 @@
 #include "servers/rendering_server.h"
 
 bool SegmentShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
-	Vector2 l[2] = { a, b };
-	Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, l);
+	Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, a, b);
 	return p_point.distance_to(closest) < p_tolerance;
 }
 
diff --git a/engine/scene/resources/2d/segment_shape_2d.h b/engine/scene/resources/2d/segment_shape_2d.h
index ad2ece88..7639742e 100644
--- a/engine/scene/resources/2d/segment_shape_2d.h
+++ b/engine/scene/resources/2d/segment_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SEGMENT_SHAPE_2D_H
-#define SEGMENT_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -59,5 +58,3 @@ public:
 
 	SegmentShape2D();
 };
-
-#endif // SEGMENT_SHAPE_2D_H
diff --git a/engine/scene/resources/2d/separation_ray_shape_2d.cpp b/engine/scene/resources/2d/separation_ray_shape_2d.cpp
index a914833c..9a0ec9db 100644
--- a/engine/scene/resources/2d/separation_ray_shape_2d.cpp
+++ b/engine/scene/resources/2d/separation_ray_shape_2d.cpp
@@ -74,7 +74,7 @@ Rect2 SeparationRayShape2D::get_rect() const {
 	Rect2 rect;
 	rect.position = Vector2();
 	rect.expand_to(Vector2(0, length));
-	rect = rect.grow(Math_SQRT12 * 4);
+	rect = rect.grow(Math::SQRT12 * 4);
 	return rect;
 }
 
diff --git a/engine/scene/resources/2d/separation_ray_shape_2d.h b/engine/scene/resources/2d/separation_ray_shape_2d.h
index 0359b41b..dd7873d3 100644
--- a/engine/scene/resources/2d/separation_ray_shape_2d.h
+++ b/engine/scene/resources/2d/separation_ray_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SEPARATION_RAY_SHAPE_2D_H
-#define SEPARATION_RAY_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -57,5 +56,3 @@ public:
 
 	SeparationRayShape2D();
 };
-
-#endif // SEPARATION_RAY_SHAPE_2D_H
diff --git a/engine/scene/resources/2d/shape_2d.h b/engine/scene/resources/2d/shape_2d.h
index b1a5b24d..eac9a0f9 100644
--- a/engine/scene/resources/2d/shape_2d.h
+++ b/engine/scene/resources/2d/shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHAPE_2D_H
-#define SHAPE_2D_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -66,5 +65,3 @@ public:
 
 	~Shape2D();
 };
-
-#endif // SHAPE_2D_H
diff --git a/engine/scene/resources/2d/skeleton/SCsub b/engine/scene/resources/2d/skeleton/SCsub
new file mode 100644
index 00000000..b85e229a
--- /dev/null
+++ b/engine/scene/resources/2d/skeleton/SCsub
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.scene_sources, "skeleton_modification_2d.cpp")
+env.add_source_files(env.scene_sources, "skeleton_modification_2d_ccdik.cpp")
+env.add_source_files(env.scene_sources, "skeleton_modification_2d_fabrik.cpp")
+env.add_source_files(env.scene_sources, "skeleton_modification_2d_lookat.cpp")
+env.add_source_files(env.scene_sources, "skeleton_modification_2d_stackholder.cpp")
+env.add_source_files(env.scene_sources, "skeleton_modification_2d_twoboneik.cpp")
+env.add_source_files(env.scene_sources, "skeleton_modification_stack_2d.cpp")
+
+if not env["disable_physics_2d"]:
+    env.add_source_files(env.scene_sources, "skeleton_modification_2d_jiggle.cpp")
+    env.add_source_files(env.scene_sources, "skeleton_modification_2d_physicalbones.cpp")
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
index 62eaf812..181eef40 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d.cpp
@@ -81,15 +81,15 @@ bool SkeletonModification2D::get_enabled() {
 float SkeletonModification2D::clamp_angle(float p_angle, float p_min_bound, float p_max_bound, bool p_invert) {
 	// Map to the 0 to 360 range (in radians though) instead of the -180 to 180 range.
 	if (p_angle < 0) {
-		p_angle = Math_TAU + p_angle;
+		p_angle = Math::TAU + p_angle;
 	}
 
 	// Make min and max in the range of 0 to 360 (in radians), and make sure they are in the right order
 	if (p_min_bound < 0) {
-		p_min_bound = Math_TAU + p_min_bound;
+		p_min_bound = Math::TAU + p_min_bound;
 	}
 	if (p_max_bound < 0) {
-		p_max_bound = Math_TAU + p_max_bound;
+		p_max_bound = Math::TAU + p_max_bound;
 	}
 	if (p_min_bound > p_max_bound) {
 		SWAP(p_min_bound, p_max_bound);
@@ -130,10 +130,10 @@ void SkeletonModification2D::editor_draw_angle_constraints(Bone2D *p_operation_b
 	float arc_angle_min = p_min_bound;
 	float arc_angle_max = p_max_bound;
 	if (arc_angle_min < 0) {
-		arc_angle_min = (Math_PI * 2) + arc_angle_min;
+		arc_angle_min = (Math::PI * 2) + arc_angle_min;
 	}
 	if (arc_angle_max < 0) {
-		arc_angle_max = (Math_PI * 2) + arc_angle_max;
+		arc_angle_max = (Math::PI * 2) + arc_angle_max;
 	}
 	if (arc_angle_min > arc_angle_max) {
 		SWAP(arc_angle_min, arc_angle_max);
@@ -159,7 +159,7 @@ void SkeletonModification2D::editor_draw_angle_constraints(Bone2D *p_operation_b
 
 		if (p_constraint_inverted) {
 			stack->skeleton->draw_arc(Vector2(0, 0), p_operation_bone->get_length(),
-					arc_angle_min + (Math_PI * 2), arc_angle_max, 32, bone_ik_color, 1.0);
+					arc_angle_min + (Math::PI * 2), arc_angle_max, 32, bone_ik_color, 1.0);
 		} else {
 			stack->skeleton->draw_arc(Vector2(0, 0), p_operation_bone->get_length(),
 					arc_angle_min, arc_angle_max, 32, bone_ik_color, 1.0);
@@ -169,7 +169,7 @@ void SkeletonModification2D::editor_draw_angle_constraints(Bone2D *p_operation_b
 
 	} else {
 		stack->skeleton->draw_set_transform(stack->skeleton->to_local(p_operation_bone->get_global_position()));
-		stack->skeleton->draw_arc(Vector2(0, 0), p_operation_bone->get_length(), 0, Math_PI * 2, 32, bone_ik_color, 1.0);
+		stack->skeleton->draw_arc(Vector2(0, 0), p_operation_bone->get_length(), 0, Math::PI * 2, 32, bone_ik_color, 1.0);
 		stack->skeleton->draw_line(Vector2(0, 0), Vector2(1, 0) * p_operation_bone->get_length(), bone_ik_color, 1.0);
 	}
 }
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d.h
index 4f96e290..4c058a82 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_H
-#define SKELETON_MODIFICATION_2D_H
+#pragma once
 
 #include "scene/resources/2d/skeleton/skeleton_modification_stack_2d.h"
 
@@ -85,5 +84,3 @@ public:
 
 	SkeletonModification2D();
 };
-
-#endif // SKELETON_MODIFICATION_2D_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
index 0d2852da..4389cc31 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.cpp
@@ -171,13 +171,13 @@ void SkeletonModification2DCCDIK::_execute(float p_delta) {
 		return;
 	}
 
-	Node2D *target = Object::cast_to<Node2D>(ObjectDB::get_instance(target_node_cache));
+	Node2D *target = ObjectDB::get_instance<Node2D>(target_node_cache);
 	if (!target || !target->is_inside_tree()) {
 		ERR_PRINT_ONCE("Target node is not in the scene tree. Cannot execute modification!");
 		return;
 	}
 
-	Node2D *tip = Object::cast_to<Node2D>(ObjectDB::get_instance(tip_node_cache));
+	Node2D *tip = ObjectDB::get_instance<Node2D>(tip_node_cache);
 	if (!tip || !tip->is_inside_tree()) {
 		ERR_PRINT_ONCE("Tip node is not in the scene tree. Cannot execute modification!");
 		return;
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h
index 34da89c3..74a1aaa7 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_ccdik.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_CCDIK_H
-#define SKELETON_MODIFICATION_2D_CCDIK_H
+#pragma once
 
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -50,7 +49,7 @@ private:
 
 		bool enable_constraint = false;
 		float constraint_angle_min = 0;
-		float constraint_angle_max = (2.0 * Math_PI);
+		float constraint_angle_max = (2.0 * Math::PI);
 		bool constraint_angle_invert = false;
 		bool constraint_in_localspace = true;
 
@@ -112,5 +111,3 @@ public:
 	SkeletonModification2DCCDIK();
 	~SkeletonModification2DCCDIK();
 };
-
-#endif // SKELETON_MODIFICATION_2D_CCDIK_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
index 77db39db..bb1b81bd 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.cpp
@@ -116,7 +116,7 @@ void SkeletonModification2DFABRIK::_execute(float p_delta) {
 		return;
 	}
 
-	Node2D *target = Object::cast_to<Node2D>(ObjectDB::get_instance(target_node_cache));
+	Node2D *target = ObjectDB::get_instance<Node2D>(target_node_cache);
 	if (!target || !target->is_inside_tree()) {
 		ERR_PRINT_ONCE("Target node is not in the scene tree. Cannot execute modification!");
 		return;
@@ -128,7 +128,7 @@ void SkeletonModification2DFABRIK::_execute(float p_delta) {
 		WARN_PRINT("Bone2D cache for origin joint is out of date. Updating...");
 	}
 
-	Bone2D *origin_bone2d_node = Object::cast_to<Bone2D>(ObjectDB::get_instance(fabrik_data_chain[0].bone2d_node_cache));
+	Bone2D *origin_bone2d_node = ObjectDB::get_instance<Bone2D>(fabrik_data_chain[0].bone2d_node_cache);
 	if (!origin_bone2d_node || !origin_bone2d_node->is_inside_tree()) {
 		ERR_PRINT_ONCE("Origin joint's Bone2D node is not in the scene tree. Cannot execute modification!");
 		return;
@@ -146,7 +146,7 @@ void SkeletonModification2DFABRIK::_execute(float p_delta) {
 			WARN_PRINT_ONCE("Bone2D cache for joint " + itos(i) + " is out of date.. Attempting to update...");
 			fabrik_joint_update_bone2d_cache(i);
 		}
-		Bone2D *joint_bone2d_node = Object::cast_to<Bone2D>(ObjectDB::get_instance(fabrik_data_chain[i].bone2d_node_cache));
+		Bone2D *joint_bone2d_node = ObjectDB::get_instance<Bone2D>(fabrik_data_chain[i].bone2d_node_cache);
 		if (!joint_bone2d_node) {
 			ERR_PRINT_ONCE("FABRIK Joint " + itos(i) + " does not have a Bone2D node set! Cannot execute modification!");
 			return;
@@ -154,7 +154,7 @@ void SkeletonModification2DFABRIK::_execute(float p_delta) {
 		fabrik_transform_chain.write[i] = joint_bone2d_node->get_global_transform();
 	}
 
-	Bone2D *final_bone2d_node = Object::cast_to<Bone2D>(ObjectDB::get_instance(fabrik_data_chain[fabrik_data_chain.size() - 1].bone2d_node_cache));
+	Bone2D *final_bone2d_node = ObjectDB::get_instance<Bone2D>(fabrik_data_chain[fabrik_data_chain.size() - 1].bone2d_node_cache);
 	float final_bone2d_angle = final_bone2d_node->get_global_rotation();
 	if (fabrik_data_chain[fabrik_data_chain.size() - 1].use_target_rotation) {
 		final_bone2d_angle = target_global_pose.get_rotation();
@@ -183,7 +183,7 @@ void SkeletonModification2DFABRIK::_execute(float p_delta) {
 
 	// Apply all of the saved transforms to the Bone2D nodes
 	for (int i = 0; i < fabrik_data_chain.size(); i++) {
-		Bone2D *joint_bone2d_node = Object::cast_to<Bone2D>(ObjectDB::get_instance(fabrik_data_chain[i].bone2d_node_cache));
+		Bone2D *joint_bone2d_node = ObjectDB::get_instance<Bone2D>(fabrik_data_chain[i].bone2d_node_cache);
 		if (!joint_bone2d_node) {
 			ERR_PRINT_ONCE("FABRIK Joint " + itos(i) + " does not have a Bone2D node set!");
 			continue;
@@ -214,7 +214,7 @@ void SkeletonModification2DFABRIK::_execute(float p_delta) {
 
 void SkeletonModification2DFABRIK::chain_backwards() {
 	int final_joint_index = fabrik_data_chain.size() - 1;
-	Bone2D *final_bone2d_node = Object::cast_to<Bone2D>(ObjectDB::get_instance(fabrik_data_chain[final_joint_index].bone2d_node_cache));
+	Bone2D *final_bone2d_node = ObjectDB::get_instance<Bone2D>(fabrik_data_chain[final_joint_index].bone2d_node_cache);
 	Transform2D final_bone2d_trans = fabrik_transform_chain[final_joint_index];
 
 	// Apply magnet position
@@ -241,7 +241,7 @@ void SkeletonModification2DFABRIK::chain_backwards() {
 	while (i >= 1) {
 		Transform2D previous_pose = fabrik_transform_chain[i];
 		i -= 1;
-		Bone2D *current_bone2d_node = Object::cast_to<Bone2D>(ObjectDB::get_instance(fabrik_data_chain[i].bone2d_node_cache));
+		Bone2D *current_bone2d_node = ObjectDB::get_instance<Bone2D>(fabrik_data_chain[i].bone2d_node_cache);
 		Transform2D current_pose = fabrik_transform_chain[i];
 
 		// Apply magnet position
@@ -266,7 +266,7 @@ void SkeletonModification2DFABRIK::chain_forwards() {
 	fabrik_transform_chain.write[0] = origin_bone2d_trans;
 
 	for (int i = 0; i < fabrik_data_chain.size() - 1; i++) {
-		Bone2D *current_bone2d_node = Object::cast_to<Bone2D>(ObjectDB::get_instance(fabrik_data_chain[i].bone2d_node_cache));
+		Bone2D *current_bone2d_node = ObjectDB::get_instance<Bone2D>(fabrik_data_chain[i].bone2d_node_cache);
 		Transform2D current_pose = fabrik_transform_chain[i];
 		Transform2D next_pose = fabrik_transform_chain[i + 1];
 
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h
index edc29ecf..caddc963 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_fabrik.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_FABRIK_H
-#define SKELETON_MODIFICATION_2D_FABRIK_H
+#pragma once
 
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -104,5 +103,3 @@ public:
 	SkeletonModification2DFABRIK();
 	~SkeletonModification2DFABRIK();
 };
-
-#endif // SKELETON_MODIFICATION_2D_FABRIK_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
index b7200b49..a08e8e05 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.cpp
@@ -143,7 +143,7 @@ void SkeletonModification2DJiggle::_execute(float p_delta) {
 		update_target_cache();
 		return;
 	}
-	Node2D *target = Object::cast_to<Node2D>(ObjectDB::get_instance(target_node_cache));
+	Node2D *target = ObjectDB::get_instance<Node2D>(target_node_cache);
 	if (!target || !target->is_inside_tree()) {
 		ERR_PRINT_ONCE("Target node is not in the scene tree. Cannot execute modification!");
 		return;
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h
index 7e985583..7b691256 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_jiggle.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_JIGGLE_H
-#define SKELETON_MODIFICATION_2D_JIGGLE_H
+#pragma once
 
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -135,5 +134,3 @@ public:
 	SkeletonModification2DJiggle();
 	~SkeletonModification2DJiggle();
 };
-
-#endif // SKELETON_MODIFICATION_2D_JIGGLE_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
index e99a1fd2..e5ce028d 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.cpp
@@ -124,7 +124,7 @@ void SkeletonModification2DLookAt::_execute(float p_delta) {
 	}
 
 	if (target_node_reference == nullptr) {
-		target_node_reference = Object::cast_to<Node2D>(ObjectDB::get_instance(target_node_cache));
+		target_node_reference = ObjectDB::get_instance<Node2D>(target_node_cache);
 	}
 	if (!target_node_reference || !target_node_reference->is_inside_tree()) {
 		ERR_PRINT_ONCE("Target node is not in the scene tree. Cannot execute modification!");
@@ -399,7 +399,7 @@ SkeletonModification2DLookAt::SkeletonModification2DLookAt() {
 	additional_rotation = 0;
 	enable_constraint = false;
 	constraint_angle_min = 0;
-	constraint_angle_max = Math_PI * 2;
+	constraint_angle_max = Math::PI * 2;
 	constraint_angle_invert = false;
 	enabled = true;
 
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h
index fbce45b8..ebfd0178 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_lookat.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_LOOKAT_H
-#define SKELETON_MODIFICATION_2D_LOOKAT_H
+#pragma once
 
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -53,7 +52,7 @@ private:
 	float additional_rotation = 0;
 	bool enable_constraint = false;
 	float constraint_angle_min = 0;
-	float constraint_angle_max = (2.0 * Math_PI);
+	float constraint_angle_max = (2.0 * Math::PI);
 	bool constraint_angle_invert = false;
 	bool constraint_in_localspace = true;
 
@@ -96,5 +95,3 @@ public:
 	SkeletonModification2DLookAt();
 	~SkeletonModification2DLookAt();
 };
-
-#endif // SKELETON_MODIFICATION_2D_LOOKAT_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
index 001000fa..0dcba66c 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.cpp
@@ -118,7 +118,7 @@ void SkeletonModification2DPhysicalBones::_execute(float p_delta) {
 			continue;
 		}
 
-		PhysicalBone2D *physical_bone = Object::cast_to<PhysicalBone2D>(ObjectDB::get_instance(bone_data.physical_bone_node_cache));
+		PhysicalBone2D *physical_bone = ObjectDB::get_instance<PhysicalBone2D>(bone_data.physical_bone_node_cache);
 		if (!physical_bone) {
 			ERR_PRINT_ONCE("PhysicalBone2D not found at index " + itos(i) + "!");
 			return;
@@ -238,7 +238,7 @@ void SkeletonModification2DPhysicalBones::_update_simulation_state() {
 	}
 	_simulation_state_dirty = false;
 
-	if (_simulation_state_dirty_names.size() <= 0) {
+	if (_simulation_state_dirty_names.is_empty()) {
 		for (int i = 0; i < physical_bone_chain.size(); i++) {
 			PhysicalBone2D *physical_bone = Object::cast_to<PhysicalBone2D>(stack->skeleton->get_node(physical_bone_chain[i].physical_bone_node));
 			if (!physical_bone) {
@@ -249,7 +249,7 @@ void SkeletonModification2DPhysicalBones::_update_simulation_state() {
 		}
 	} else {
 		for (int i = 0; i < physical_bone_chain.size(); i++) {
-			PhysicalBone2D *physical_bone = Object::cast_to<PhysicalBone2D>(ObjectDB::get_instance(physical_bone_chain[i].physical_bone_node_cache));
+			PhysicalBone2D *physical_bone = ObjectDB::get_instance<PhysicalBone2D>(physical_bone_chain[i].physical_bone_node_cache);
 			if (!physical_bone) {
 				continue;
 			}
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h
index 09bf0078..77a52e26 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_physicalbones.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_PHYSICALBONES_H
-#define SKELETON_MODIFICATION_2D_PHYSICALBONES_H
+#pragma once
 
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -78,5 +77,3 @@ public:
 	SkeletonModification2DPhysicalBones();
 	~SkeletonModification2DPhysicalBones();
 };
-
-#endif // SKELETON_MODIFICATION_2D_PHYSICALBONES_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h
index b1054f64..0a3e819a 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_stackholder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_STACKHOLDER_H
-#define SKELETON_MODIFICATION_2D_STACKHOLDER_H
+#pragma once
 
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -60,5 +59,3 @@ public:
 	SkeletonModification2DStackHolder();
 	~SkeletonModification2DStackHolder();
 };
-
-#endif // SKELETON_MODIFICATION_2D_STACKHOLDER_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
index 41e4ea82..1c3aad7f 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.cpp
@@ -124,7 +124,7 @@ void SkeletonModification2DTwoBoneIK::_execute(float p_delta) {
 		update_joint_two_bone2d_cache();
 	}
 
-	Node2D *target = Object::cast_to<Node2D>(ObjectDB::get_instance(target_node_cache));
+	Node2D *target = ObjectDB::get_instance<Node2D>(target_node_cache);
 	if (!target || !target->is_inside_tree()) {
 		ERR_PRINT_ONCE("Target node is not in the scene tree. Cannot execute modification!");
 		return;
@@ -178,7 +178,7 @@ void SkeletonModification2DTwoBoneIK::_execute(float p_delta) {
 			// We cannot solve for this angle! Do nothing to avoid setting the rotation (and scale) to NaN.
 		} else {
 			joint_one_bone->set_global_rotation(angle_atan - angle_0 - joint_one_bone->get_bone_angle());
-			joint_two_bone->set_rotation(-Math_PI - angle_1 - joint_two_bone->get_bone_angle() + joint_one_bone->get_bone_angle());
+			joint_two_bone->set_rotation(-Math::PI - angle_1 - joint_two_bone->get_bone_angle() + joint_one_bone->get_bone_angle());
 		}
 	} else {
 		joint_one_bone->set_global_rotation(angle_atan - joint_one_bone->get_bone_angle());
@@ -221,10 +221,10 @@ void SkeletonModification2DTwoBoneIK::_draw_editor_gizmo() {
 #endif // TOOLS_ENABLED
 
 	if (flip_bend_direction) {
-		float angle = -(Math_PI * 0.5) + operation_bone_one->get_bone_angle();
+		float angle = -(Math::PI * 0.5) + operation_bone_one->get_bone_angle();
 		stack->skeleton->draw_line(Vector2(0, 0), Vector2(Math::cos(angle), sin(angle)) * (operation_bone_one->get_length() * 0.5), bone_ik_color, 2.0);
 	} else {
-		float angle = (Math_PI * 0.5) + operation_bone_one->get_bone_angle();
+		float angle = (Math::PI * 0.5) + operation_bone_one->get_bone_angle();
 		stack->skeleton->draw_line(Vector2(0, 0), Vector2(Math::cos(angle), sin(angle)) * (operation_bone_one->get_length() * 0.5), bone_ik_color, 2.0);
 	}
 
@@ -235,7 +235,7 @@ void SkeletonModification2DTwoBoneIK::_draw_editor_gizmo() {
 				Vector2 target_direction = Vector2(0, 1);
 				if (target_node_cache.is_valid()) {
 					stack->skeleton->draw_set_transform(Vector2(0, 0), 0.0);
-					Node2D *target = Object::cast_to<Node2D>(ObjectDB::get_instance(target_node_cache));
+					Node2D *target = ObjectDB::get_instance<Node2D>(target_node_cache);
 					target_direction = operation_bone_one->get_global_position().direction_to(target->get_global_position());
 				}
 
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h
index d528ffa6..86e11081 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_2d_twoboneik.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_2D_TWOBONEIK_H
-#define SKELETON_MODIFICATION_2D_TWOBONEIK_H
+#pragma once
 
 #include "scene/2d/skeleton_2d.h"
 #include "scene/resources/2d/skeleton/skeleton_modification_2d.h"
@@ -103,5 +102,3 @@ public:
 	SkeletonModification2DTwoBoneIK();
 	~SkeletonModification2DTwoBoneIK();
 };
-
-#endif // SKELETON_MODIFICATION_2D_TWOBONEIK_H
diff --git a/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h b/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h
index c8616933..12d3f544 100644
--- a/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h
+++ b/engine/scene/resources/2d/skeleton/skeleton_modification_stack_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_MODIFICATION_STACK_2D_H
-#define SKELETON_MODIFICATION_STACK_2D_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -94,5 +93,3 @@ public:
 
 	SkeletonModificationStack2D();
 };
-
-#endif // SKELETON_MODIFICATION_STACK_2D_H
diff --git a/engine/scene/resources/2d/tile_set.compat.inc b/engine/scene/resources/2d/tile_set.compat.inc
index 58e33f7b..9eb03671 100644
--- a/engine/scene/resources/2d/tile_set.compat.inc
+++ b/engine/scene/resources/2d/tile_set.compat.inc
@@ -32,16 +32,20 @@
 
 #include "tile_set.h"
 
+#ifndef NAVIGATION_2D_DISABLED
 Ref<NavigationPolygon> TileData::_get_navigation_polygon_bind_compat_84660(int p_layer_id) const {
 	return get_navigation_polygon(p_layer_id, false, false, false);
 }
+#endif // NAVIGATION_2D_DISABLED
 
 Ref<OccluderPolygon2D> TileData::_get_occluder_bind_compat_84660(int p_layer_id) const {
 	return get_occluder_polygon(p_layer_id, 0, false, false, false);
 }
 
 void TileData::_bind_compatibility_methods() {
+#ifndef NAVIGATION_2D_DISABLED
 	ClassDB::bind_compatibility_method(D_METHOD("get_navigation_polygon"), &TileData::_get_navigation_polygon_bind_compat_84660);
+#endif // NAVIGATION_2D_DISABLED
 	ClassDB::bind_compatibility_method(D_METHOD("get_occluder"), &TileData::_get_occluder_bind_compat_84660);
 }
 
diff --git a/engine/scene/resources/2d/tile_set.cpp b/engine/scene/resources/2d/tile_set.cpp
index 9e6292ba..299b0250 100644
--- a/engine/scene/resources/2d/tile_set.cpp
+++ b/engine/scene/resources/2d/tile_set.cpp
@@ -37,7 +37,10 @@
 #include "core/templates/rb_set.h"
 #include "scene/gui/control.h"
 #include "scene/resources/image_texture.h"
+
+#ifndef NAVIGATION_2D_DISABLED
 #include "servers/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
 
 /////////////////////////////// TileMapPattern //////////////////////////////////////
 
@@ -305,8 +308,7 @@ void TileSet::TerrainsPattern::from_array(Array p_terrains) {
 }
 
 Array TileSet::TerrainsPattern::as_array() const {
-	Array output;
-	output.push_back(get_terrain());
+	Array output = { get_terrain() };
 	for (int i = 0; i < TileSet::CELL_NEIGHBOR_MAX; i++) {
 		if (is_valid_bit[i]) {
 			output.push_back(bits[i]);
@@ -636,6 +638,7 @@ bool TileSet::get_occlusion_layer_sdf_collision(int p_layer_index) const {
 	return occlusion_layers[p_layer_index].sdf_collision;
 }
 
+#ifndef PHYSICS_2D_DISABLED
 int TileSet::get_physics_layers_count() const {
 	return physics_layers.size();
 }
@@ -719,6 +722,7 @@ Ref<PhysicsMaterial> TileSet::get_physics_layer_physics_material(int p_layer_ind
 	ERR_FAIL_INDEX_V(p_layer_index, physics_layers.size(), Ref<PhysicsMaterial>());
 	return physics_layers[p_layer_index].physics_material;
 }
+#endif // PHYSICS_2D_DISABLED
 
 // Terrains
 int TileSet::get_terrain_sets_count() const {
@@ -964,6 +968,7 @@ bool TileSet::is_valid_terrain_peering_bit(int p_terrain_set, TileSet::CellNeigh
 	return is_valid_terrain_peering_bit_for_mode(terrain_mode, p_peering_bit);
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 // Navigation
 int TileSet::get_navigation_layers_count() const {
 	return navigation_layers.size();
@@ -1038,6 +1043,7 @@ bool TileSet::get_navigation_layer_layer_value(int p_layer_index, int p_layer_nu
 
 	return get_navigation_layer_layers(p_layer_index) & (1 << (p_layer_number - 1));
 }
+#endif // NAVIGATION_2D_DISABLED
 
 // Custom data.
 int TileSet::get_custom_data_layers_count() const {
@@ -1177,42 +1183,26 @@ void TileSet::set_coords_level_tile_proxy(int p_source_from, Vector2i p_coords_f
 	ERR_FAIL_COND(p_source_from == TileSet::INVALID_SOURCE || p_source_to == TileSet::INVALID_SOURCE);
 	ERR_FAIL_COND(p_coords_from == TileSetSource::INVALID_ATLAS_COORDS || p_coords_to == TileSetSource::INVALID_ATLAS_COORDS);
 
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-
-	Array to;
-	to.push_back(p_source_to);
-	to.push_back(p_coords_to);
-
+	Array from = { p_source_from, p_coords_from };
+	Array to = { p_source_to, p_coords_to };
 	coords_level_proxies[from] = to;
 
 	emit_changed();
 }
 
 Array TileSet::get_coords_level_tile_proxy(int p_source_from, Vector2i p_coords_from) {
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-
+	Array from = { p_source_from, p_coords_from };
 	ERR_FAIL_COND_V(!coords_level_proxies.has(from), Array());
-
 	return coords_level_proxies[from];
 }
 
 bool TileSet::has_coords_level_tile_proxy(int p_source_from, Vector2i p_coords_from) {
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-
+	Array from = { p_source_from, p_coords_from };
 	return coords_level_proxies.has(from);
 }
 
 void TileSet::remove_coords_level_tile_proxy(int p_source_from, Vector2i p_coords_from) {
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-
+	Array from = { p_source_from, p_coords_from };
 	ERR_FAIL_COND(!coords_level_proxies.has(from));
 
 	coords_level_proxies.erase(from);
@@ -1224,47 +1214,27 @@ void TileSet::set_alternative_level_tile_proxy(int p_source_from, Vector2i p_coo
 	ERR_FAIL_COND(p_source_from == TileSet::INVALID_SOURCE || p_source_to == TileSet::INVALID_SOURCE);
 	ERR_FAIL_COND(p_coords_from == TileSetSource::INVALID_ATLAS_COORDS || p_coords_to == TileSetSource::INVALID_ATLAS_COORDS);
 
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-	from.push_back(p_alternative_from);
-
-	Array to;
-	to.push_back(p_source_to);
-	to.push_back(p_coords_to);
-	to.push_back(p_alternative_to);
-
+	Array from = { p_source_from, p_coords_from, p_alternative_from };
+	Array to = { p_source_to, p_coords_to, p_alternative_to };
 	alternative_level_proxies[from] = to;
 
 	emit_changed();
 }
 
 Array TileSet::get_alternative_level_tile_proxy(int p_source_from, Vector2i p_coords_from, int p_alternative_from) {
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-	from.push_back(p_alternative_from);
-
+	Array from = { p_source_from, p_coords_from, p_alternative_from };
 	ERR_FAIL_COND_V(!alternative_level_proxies.has(from), Array());
 
 	return alternative_level_proxies[from];
 }
 
 bool TileSet::has_alternative_level_tile_proxy(int p_source_from, Vector2i p_coords_from, int p_alternative_from) {
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-	from.push_back(p_alternative_from);
-
+	Array from = { p_source_from, p_coords_from, p_alternative_from };
 	return alternative_level_proxies.has(from);
 }
 
 void TileSet::remove_alternative_level_tile_proxy(int p_source_from, Vector2i p_coords_from, int p_alternative_from) {
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-	from.push_back(p_alternative_from);
-
+	Array from = { p_source_from, p_coords_from, p_alternative_from };
 	ERR_FAIL_COND(!alternative_level_proxies.has(from));
 
 	alternative_level_proxies.erase(from);
@@ -1306,10 +1276,7 @@ Array TileSet::get_alternative_level_tile_proxies() const {
 }
 
 Array TileSet::map_tile_proxy(int p_source_from, Vector2i p_coords_from, int p_alternative_from) const {
-	Array from;
-	from.push_back(p_source_from);
-	from.push_back(p_coords_from);
-	from.push_back(p_alternative_from);
+	Array from = { p_source_from, p_coords_from, p_alternative_from };
 
 	// Check if the tile is valid, and if so, don't map the tile and return the input.
 	if (has_source(p_source_from)) {
@@ -1334,17 +1301,11 @@ Array TileSet::map_tile_proxy(int p_source_from, Vector2i p_coords_from, int p_a
 
 	// Source matches.
 	if (source_level_proxies.has(p_source_from)) {
-		Array output;
-		output.push_back(source_level_proxies[p_source_from]);
-		output.push_back(p_coords_from);
-		output.push_back(p_alternative_from);
+		Array output = { source_level_proxies[p_source_from], p_coords_from, p_alternative_from };
 		return output;
 	}
 
-	Array output;
-	output.push_back(p_source_from);
-	output.push_back(p_coords_from);
-	output.push_back(p_alternative_from);
+	Array output = { p_source_from, p_coords_from, p_alternative_from };
 	return output;
 }
 
@@ -3238,8 +3199,10 @@ void TileSet::reset_state() {
 	tile_filled_mesh.instantiate();
 	tile_meshes_dirty = true;
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics
 	physics_layers.clear();
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrains
 	terrain_sets.clear();
@@ -3423,15 +3386,8 @@ void TileSet::_compatibility_conversion() {
 					}
 
 					// Add to the mapping.
-					Array key_array;
-					key_array.push_back(flip_h);
-					key_array.push_back(flip_v);
-					key_array.push_back(transpose);
-
-					Array value_array;
-					value_array.push_back(source_id);
-					value_array.push_back(coords);
-					value_array.push_back(alternative_tile);
+					Array key_array = { flip_h, flip_v, transpose };
+					Array value_array = { source_id, coords, alternative_tile };
 
 					if (!compatibility_tilemap_mapping.has(E.key)) {
 						compatibility_tilemap_mapping[E.key] = RBMap<Array, Array>();
@@ -3462,6 +3418,7 @@ void TileSet::_compatibility_conversion() {
 						tile_data->add_occluder_polygon(0);
 						tile_data->set_occluder_polygon(0, 0, occluder);
 					}
+#ifndef NAVIGATION_2D_DISABLED
 					if (ctd->navigation.is_valid()) {
 						if (get_navigation_layers_count() < 1) {
 							add_navigation_layer();
@@ -3474,9 +3431,11 @@ void TileSet::_compatibility_conversion() {
 						navigation->set_vertices(vertices);
 						tile_data->set_navigation_polygon(0, navigation);
 					}
+#endif // NAVIGATION_2D_DISABLED
 
 					tile_data->set_z_index(ctd->z_index);
 
+#ifndef PHYSICS_2D_DISABLED
 					// Add the shapes.
 					if (ctd->shapes.size() > 0) {
 						if (get_physics_layers_count() < 1) {
@@ -3500,6 +3459,7 @@ void TileSet::_compatibility_conversion() {
 							}
 						}
 					}
+#endif // PHYSICS_2D_DISABLED
 				}
 				// Update the size count.
 				if (!compatibility_size_count.has(ctd->region.get_size())) {
@@ -3539,16 +3499,8 @@ void TileSet::_compatibility_conversion() {
 							}
 
 							// Add to the mapping.
-							Array key_array;
-							key_array.push_back(coords);
-							key_array.push_back(flip_h);
-							key_array.push_back(flip_v);
-							key_array.push_back(transpose);
-
-							Array value_array;
-							value_array.push_back(source_id);
-							value_array.push_back(coords);
-							value_array.push_back(alternative_tile);
+							Array key_array = { coords, flip_h, flip_v, transpose };
+							Array value_array = { source_id, coords, alternative_tile };
 
 							if (!compatibility_tilemap_mapping.has(E.key)) {
 								compatibility_tilemap_mapping[E.key] = RBMap<Array, Array>();
@@ -3577,6 +3529,7 @@ void TileSet::_compatibility_conversion() {
 								tile_data->add_occluder_polygon(0);
 								tile_data->set_occluder_polygon(0, 0, occluder);
 							}
+#ifndef NAVIGATION_2D_DISABLED
 							if (ctd->autotile_navpoly_map.has(coords)) {
 								if (get_navigation_layers_count() < 1) {
 									add_navigation_layer();
@@ -3589,6 +3542,7 @@ void TileSet::_compatibility_conversion() {
 								navigation->set_vertices(vertices);
 								tile_data->set_navigation_polygon(0, navigation);
 							}
+#endif // NAVIGATION_2D_DISABLED
 							if (ctd->autotile_priority_map.has(coords)) {
 								tile_data->set_probability(ctd->autotile_priority_map[coords]);
 							}
@@ -3596,6 +3550,7 @@ void TileSet::_compatibility_conversion() {
 								tile_data->set_z_index(ctd->autotile_z_index_map[coords]);
 							}
 
+#ifndef PHYSICS_2D_DISABLED
 							// Add the shapes.
 							if (ctd->shapes.size() > 0) {
 								if (get_physics_layers_count() < 1) {
@@ -3619,6 +3574,7 @@ void TileSet::_compatibility_conversion() {
 									}
 								}
 							}
+#endif // PHYSICS_2D_DISABLED
 
 							// -- TODO: handle --
 							// Those are offset for the whole atlas, they are likely useless for the atlases, but might make sense for single tiles.
@@ -3641,6 +3597,7 @@ void TileSet::_compatibility_conversion() {
 			} break;
 		}
 
+#ifndef PHYSICS_2D_DISABLED
 		// Offset all shapes
 		for (int k = 0; k < ctd->shapes.size(); k++) {
 			Ref<ConvexPolygonShape2D> convex = ctd->shapes[k].shape;
@@ -3652,6 +3609,7 @@ void TileSet::_compatibility_conversion() {
 				convex->set_points(points);
 			}
 		}
+#endif // PHYSICS_2D_DISABLED
 	}
 
 	// Update the TileSet tile_size according to the most common size found.
@@ -3673,10 +3631,11 @@ void TileSet::_compatibility_conversion() {
 }
 
 Array TileSet::compatibility_tilemap_map(int p_tile_id, Vector2i p_coords, bool p_flip_h, bool p_flip_v, bool p_transpose) {
-	Array cannot_convert_array;
-	cannot_convert_array.push_back(TileSet::INVALID_SOURCE);
-	cannot_convert_array.push_back(TileSetAtlasSource::INVALID_ATLAS_COORDS);
-	cannot_convert_array.push_back(TileSetAtlasSource::INVALID_TILE_ALTERNATIVE);
+	Array cannot_convert_array = {
+		TileSet::INVALID_SOURCE,
+		TileSetAtlasSource::INVALID_ATLAS_COORDS,
+		TileSetAtlasSource::INVALID_TILE_ALTERNATIVE
+	};
 
 	if (!compatibility_tilemap_mapping.has(p_tile_id)) {
 		return cannot_convert_array;
@@ -3685,21 +3644,14 @@ Array TileSet::compatibility_tilemap_map(int p_tile_id, Vector2i p_coords, bool
 	int tile_mode = compatibility_tilemap_mapping_tile_modes[p_tile_id];
 	switch (tile_mode) {
 		case COMPATIBILITY_TILE_MODE_SINGLE_TILE: {
-			Array a;
-			a.push_back(p_flip_h);
-			a.push_back(p_flip_v);
-			a.push_back(p_transpose);
+			Array a = { p_flip_h, p_flip_v, p_transpose };
 			return compatibility_tilemap_mapping[p_tile_id][a];
 		}
 		case COMPATIBILITY_TILE_MODE_AUTO_TILE:
 			return cannot_convert_array;
 			break;
 		case COMPATIBILITY_TILE_MODE_ATLAS_TILE: {
-			Array a;
-			a.push_back(p_coords);
-			a.push_back(p_flip_h);
-			a.push_back(p_flip_v);
-			a.push_back(p_transpose);
+			Array a = { p_coords, p_flip_h, p_flip_v, p_transpose };
 			return compatibility_tilemap_mapping[p_tile_id][a];
 		}
 		default:
@@ -3789,7 +3741,9 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
 					if (p[0].get_type() == Variant::VECTOR2) {
 						last_coord = p[0];
 					} else if (p[0].get_type() == Variant::OBJECT) {
+#ifndef NAVIGATION_2D_DISABLED
 						ctd->autotile_navpoly_map.insert(last_coord, p[0]);
+#endif // NAVIGATION_2D_DISABLED
 					}
 					p.pop_front();
 				}
@@ -3830,18 +3784,20 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
 			for (int i = 0; i < p.size(); i++) {
 				CompatibilityShapeData csd;
 				Dictionary d = p[i];
-				for (int j = 0; j < d.size(); j++) {
-					String key = d.get_key_at_index(j);
+				for (const KeyValue<Variant, Variant> &kv : d) {
+					String key = kv.key;
 					if (key == "autotile_coord") {
-						csd.autotile_coords = d[key];
+						csd.autotile_coords = kv.value;
 					} else if (key == "one_way") {
-						csd.one_way = d[key];
+						csd.one_way = kv.value;
 					} else if (key == "one_way_margin") {
-						csd.one_way_margin = d[key];
+						csd.one_way_margin = kv.value;
 					} else if (key == "shape") {
-						csd.shape = d[key];
+#ifndef PHYSICS_2D_DISABLED
+						csd.shape = kv.value;
+#endif // PHYSICS_2D_DISABLED
 					} else if (key == "shape_transform") {
-						csd.transform = d[key];
+						csd.transform = kv.value;
 					}
 				}
 				ctd->shapes.push_back(csd);
@@ -3849,7 +3805,9 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
 		} else if (what == "occluder") {
 			ctd->occluder = p_value;
 		} else if (what == "navigation") {
+#ifndef NAVIGATION_2D_DISABLED
 			ctd->navigation = p_value;
+#endif // NAVIGATION_2D_DISABLED
 
 			/*
 		// IGNORED FOR NOW, they seem duplicated data compared to the shapes array
@@ -3897,6 +3855,7 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
 				set_occlusion_layer_sdf_collision(index, p_value);
 				return true;
 			}
+#ifndef PHYSICS_2D_DISABLED
 		} else if (components.size() == 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
 			// Physics layers.
 			int index = components[0].trim_prefix("physics_layer_").to_int();
@@ -3930,6 +3889,7 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
 				set_physics_layer_physics_material(index, physics_material);
 				return true;
 			}
+#endif // PHYSICS_2D_DISABLED
 		} else if (components.size() >= 2 && components[0].begins_with("terrain_set_") && components[0].trim_prefix("terrain_set_").is_valid_int()) {
 			// Terrains.
 			int terrain_set_index = components[0].trim_prefix("terrain_set_").to_int();
@@ -3966,6 +3926,7 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
 				}
 			}
 		} else if (components.size() == 2 && components[0].begins_with("navigation_layer_") && components[0].trim_prefix("navigation_layer_").is_valid_int()) {
+#ifndef NAVIGATION_2D_DISABLED
 			// Navigation layers.
 			int index = components[0].trim_prefix("navigation_layer_").to_int();
 			ERR_FAIL_COND_V(index < 0, false);
@@ -3977,6 +3938,7 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) {
 				set_navigation_layer_layers(index, p_value);
 				return true;
 			}
+#endif // NAVIGATION_2D_DISABLED
 		} else if (components.size() == 2 && components[0].begins_with("custom_data_layer_") && components[0].trim_prefix("custom_data_layer_").is_valid_int()) {
 			// Custom data layers.
 			int index = components[0].trim_prefix("custom_data_layer_").to_int();
@@ -4061,6 +4023,7 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const {
 			r_ret = get_occlusion_layer_sdf_collision(index);
 			return true;
 		}
+#ifndef PHYSICS_2D_DISABLED
 	} else if (components.size() == 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
 		// Physics layers.
 		int index = components[0].trim_prefix("physics_layer_").to_int();
@@ -4080,6 +4043,7 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const {
 			r_ret = get_physics_layer_physics_material(index);
 			return true;
 		}
+#endif // PHYSICS_2D_DISABLED
 	} else if (components.size() >= 2 && components[0].begins_with("terrain_set_") && components[0].trim_prefix("terrain_set_").is_valid_int()) {
 		// Terrains.
 		int terrain_set_index = components[0].trim_prefix("terrain_set_").to_int();
@@ -4108,10 +4072,12 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const {
 		if (index < 0 || index >= navigation_layers.size()) {
 			return false;
 		}
+#ifndef NAVIGATION_2D_DISABLED
 		if (components[1] == "layers") {
 			r_ret = get_navigation_layer_layers(index);
 			return true;
 		}
+#endif // NAVIGATION_2D_DISABLED
 	} else if (components.size() == 2 && components[0].begins_with("custom_data_layer_") && components[0].trim_prefix("custom_data_layer_").is_valid_int()) {
 		// Custom data layers.
 		int index = components[0].trim_prefix("custom_data_layer_").to_int();
@@ -4189,6 +4155,7 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
 		p_list->push_back(property_info);
 	}
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics.
 	p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Physics", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
 	for (int i = 0; i < physics_layers.size(); i++) {
@@ -4215,6 +4182,7 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const {
 		}
 		p_list->push_back(property_info);
 	}
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrains.
 	p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Terrains", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
@@ -4310,6 +4278,7 @@ void TileSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_occlusion_layer_sdf_collision", "layer_index", "sdf_collision"), &TileSet::set_occlusion_layer_sdf_collision);
 	ClassDB::bind_method(D_METHOD("get_occlusion_layer_sdf_collision", "layer_index"), &TileSet::get_occlusion_layer_sdf_collision);
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics
 	ClassDB::bind_method(D_METHOD("get_physics_layers_count"), &TileSet::get_physics_layers_count);
 	ClassDB::bind_method(D_METHOD("add_physics_layer", "to_position"), &TileSet::add_physics_layer, DEFVAL(-1));
@@ -4323,6 +4292,7 @@ void TileSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_physics_layer_collision_priority", "layer_index"), &TileSet::get_physics_layer_collision_priority);
 	ClassDB::bind_method(D_METHOD("set_physics_layer_physics_material", "layer_index", "physics_material"), &TileSet::set_physics_layer_physics_material);
 	ClassDB::bind_method(D_METHOD("get_physics_layer_physics_material", "layer_index"), &TileSet::get_physics_layer_physics_material);
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrains
 	ClassDB::bind_method(D_METHOD("get_terrain_sets_count"), &TileSet::get_terrain_sets_count);
@@ -4341,6 +4311,7 @@ void TileSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_terrain_color", "terrain_set", "terrain_index", "color"), &TileSet::set_terrain_color);
 	ClassDB::bind_method(D_METHOD("get_terrain_color", "terrain_set", "terrain_index"), &TileSet::get_terrain_color);
 
+#ifndef NAVIGATION_2D_DISABLED
 	// Navigation
 	ClassDB::bind_method(D_METHOD("get_navigation_layers_count"), &TileSet::get_navigation_layers_count);
 	ClassDB::bind_method(D_METHOD("add_navigation_layer", "to_position"), &TileSet::add_navigation_layer, DEFVAL(-1));
@@ -4350,6 +4321,7 @@ void TileSet::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_navigation_layer_layers", "layer_index"), &TileSet::get_navigation_layer_layers);
 	ClassDB::bind_method(D_METHOD("set_navigation_layer_layer_value", "layer_index", "layer_number", "value"), &TileSet::set_navigation_layer_layer_value);
 	ClassDB::bind_method(D_METHOD("get_navigation_layer_layer_value", "layer_index", "layer_number"), &TileSet::get_navigation_layer_layer_value);
+#endif // NAVIGATION_2D_DISABLED
 
 	// Custom data
 	ClassDB::bind_method(D_METHOD("get_custom_data_layers_count"), &TileSet::get_custom_data_layers_count);
@@ -4397,7 +4369,9 @@ void TileSet::_bind_methods() {
 	ADD_GROUP("", "");
 	ADD_ARRAY("physics_layers", "physics_layer_");
 	ADD_ARRAY("terrain_sets", "terrain_set_");
+#ifndef NAVIGATION_2D_DISABLED
 	ADD_ARRAY("navigation_layers", "navigation_layer_");
+#endif // NAVIGATION_2D_DISABLED
 	ADD_ARRAY("custom_data_layers", "custom_data_layer_");
 
 	// -- Enum binding --
@@ -4531,6 +4505,7 @@ void TileSetAtlasSource::remove_occlusion_layer(int p_index) {
 	}
 }
 
+#ifndef PHYSICS_2D_DISABLED
 void TileSetAtlasSource::add_physics_layer(int p_to_pos) {
 	for (KeyValue<Vector2i, TileAlternativesData> E_tile : tiles) {
 		for (KeyValue<int, TileData *> E_alternative : E_tile.value.alternatives) {
@@ -4554,6 +4529,7 @@ void TileSetAtlasSource::remove_physics_layer(int p_index) {
 		}
 	}
 }
+#endif // PHYSICS_2D_DISABLED
 
 void TileSetAtlasSource::add_terrain_set(int p_to_pos) {
 	for (KeyValue<Vector2i, TileAlternativesData> E_tile : tiles) {
@@ -4603,6 +4579,7 @@ void TileSetAtlasSource::remove_terrain(int p_terrain_set, int p_index) {
 	}
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void TileSetAtlasSource::add_navigation_layer(int p_to_pos) {
 	for (KeyValue<Vector2i, TileAlternativesData> E_tile : tiles) {
 		for (KeyValue<int, TileData *> E_alternative : E_tile.value.alternatives) {
@@ -4626,6 +4603,7 @@ void TileSetAtlasSource::remove_navigation_layer(int p_index) {
 		}
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 void TileSetAtlasSource::add_custom_data_layer(int p_to_pos) {
 	for (KeyValue<Vector2i, TileAlternativesData> E_tile : tiles) {
@@ -5969,13 +5947,17 @@ void TileData::notify_tile_data_properties_should_change() {
 	}
 
 	occluders.resize(tile_set->get_occlusion_layers_count());
+#ifndef PHYSICS_2D_DISABLED
 	physics.resize(tile_set->get_physics_layers_count());
+#endif // PHYSICS_2D_DISABLED
 	for (int bit_index = 0; bit_index < 16; bit_index++) {
 		if (terrain_set < 0 || terrain_peering_bits[bit_index] >= tile_set->get_terrains_count(terrain_set)) {
 			terrain_peering_bits[bit_index] = -1;
 		}
 	}
+#ifndef NAVIGATION_2D_DISABLED
 	navigation.resize(tile_set->get_navigation_layers_count());
+#endif // NAVIGATION_2D_DISABLED
 
 	// Convert custom data to the new type.
 	custom_data.resize(tile_set->get_custom_data_layers_count());
@@ -6017,6 +5999,7 @@ void TileData::remove_occlusion_layer(int p_index) {
 	occluders.remove_at(p_index);
 }
 
+#ifndef PHYSICS_2D_DISABLED
 void TileData::add_physics_layer(int p_to_pos) {
 	if (p_to_pos < 0) {
 		p_to_pos = physics.size();
@@ -6036,6 +6019,7 @@ void TileData::remove_physics_layer(int p_index) {
 	ERR_FAIL_INDEX(p_index, physics.size());
 	physics.remove_at(p_index);
 }
+#endif // PHYSICS_2D_DISABLED
 
 void TileData::add_terrain_set(int p_to_pos) {
 	if (p_to_pos >= 0 && p_to_pos <= terrain_set) {
@@ -6112,6 +6096,7 @@ void TileData::remove_terrain(int p_terrain_set, int p_index) {
 	}
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 void TileData::add_navigation_layer(int p_to_pos) {
 	if (p_to_pos < 0) {
 		p_to_pos = navigation.size();
@@ -6131,6 +6116,7 @@ void TileData::remove_navigation_layer(int p_index) {
 	ERR_FAIL_INDEX(p_index, navigation.size());
 	navigation.remove_at(p_index);
 }
+#endif // NAVIGATION_2D_DISABLED
 
 void TileData::add_custom_data_layer(int p_to_pos) {
 	if (p_to_pos < 0) {
@@ -6176,13 +6162,17 @@ TileData *TileData::duplicate() {
 	output->z_index = z_index;
 	output->y_sort_origin = y_sort_origin;
 	output->occluders = occluders;
+#ifndef PHYSICS_2D_DISABLED
 	// Physics
 	output->physics = physics;
+#endif // PHYSICS_2D_DISABLED
 	// Terrain
 	output->terrain_set = -1;
 	memcpy(output->terrain_peering_bits, terrain_peering_bits, 16 * sizeof(int));
+#ifndef NAVIGATION_2D_DISABLED
 	// Navigation
 	output->navigation = navigation;
+#endif // NAVIGATION_2D_DISABLED
 	// Misc
 	output->probability = probability;
 	// Custom data
@@ -6347,6 +6337,7 @@ Ref<OccluderPolygon2D> TileData::get_occluder_polygon(int p_layer_id, int p_poly
 	}
 }
 
+#ifndef PHYSICS_2D_DISABLED
 // Physics
 void TileData::set_constant_linear_velocity(int p_layer_id, const Vector2 &p_velocity) {
 	ERR_FAIL_INDEX(p_layer_id, physics.size());
@@ -6495,6 +6486,7 @@ Ref<ConvexPolygonShape2D> TileData::get_collision_polygon_shape(int p_layer_id,
 		return I->value[shape_index];
 	}
 }
+#endif // PHYSICS_2D_DISABLED
 
 // Terrain
 void TileData::set_terrain_set(int p_terrain_set) {
@@ -6568,6 +6560,7 @@ TileSet::TerrainsPattern TileData::get_terrains_pattern() const {
 	return output;
 }
 
+#ifndef NAVIGATION_2D_DISABLED
 // Navigation
 void TileData::set_navigation_polygon(int p_layer_id, Ref<NavigationPolygon> p_navigation_polygon) {
 	ERR_FAIL_INDEX(p_layer_id, navigation.size());
@@ -6615,6 +6608,7 @@ Ref<NavigationPolygon> TileData::get_navigation_polygon(int p_layer_id, bool p_f
 		return I->value;
 	}
 }
+#endif // NAVIGATION_2D_DISABLED
 
 // Misc
 void TileData::set_probability(float p_probability) {
@@ -6743,7 +6737,9 @@ bool TileData::_set(const StringName &p_name, const Variant &p_value) {
 				return true;
 			}
 		}
-	} else if (components.size() >= 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
+	}
+#ifndef PHYSICS_2D_DISABLED
+	else if (components.size() >= 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
 		// Physics layers.
 		int layer_index = components[0].trim_prefix("physics_layer_").to_int();
 		ERR_FAIL_COND_V(layer_index < 0, false);
@@ -6798,7 +6794,10 @@ bool TileData::_set(const StringName &p_name, const Variant &p_value) {
 				return true;
 			}
 		}
-	} else if (components.size() == 2 && components[0].begins_with("navigation_layer_") && components[0].trim_prefix("navigation_layer_").is_valid_int()) {
+	}
+#endif // PHYSICS_2D_DISABLED
+#ifndef NAVIGATION_2D_DISABLED
+	else if (components.size() == 2 && components[0].begins_with("navigation_layer_") && components[0].trim_prefix("navigation_layer_").is_valid_int()) {
 		// Navigation layers.
 		int layer_index = components[0].trim_prefix("navigation_layer_").to_int();
 		ERR_FAIL_COND_V(layer_index < 0, false);
@@ -6815,7 +6814,9 @@ bool TileData::_set(const StringName &p_name, const Variant &p_value) {
 			set_navigation_polygon(layer_index, polygon);
 			return true;
 		}
-	} else if (components.size() == 2 && components[0] == "terrains_peering_bit") {
+	}
+#endif // NAVIGATION_2D_DISABLED
+	else if (components.size() == 2 && components[0] == "terrains_peering_bit") {
 		// Terrains.
 		for (int i = 0; i < TileSet::CELL_NEIGHBOR_MAX; i++) {
 			TileSet::CellNeighbor bit = TileSet::CellNeighbor(i);
@@ -6887,7 +6888,9 @@ bool TileData::_get(const StringName &p_name, Variant &r_ret) const {
 					return true;
 				}
 			}
-		} else if (components.size() >= 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
+		}
+#ifndef PHYSICS_2D_DISABLED
+		else if (components.size() >= 2 && components[0].begins_with("physics_layer_") && components[0].trim_prefix("physics_layer_").is_valid_int()) {
 			// Physics layers.
 			int layer_index = components[0].trim_prefix("physics_layer_").to_int();
 			ERR_FAIL_COND_V(layer_index < 0, false);
@@ -6923,7 +6926,9 @@ bool TileData::_get(const StringName &p_name, Variant &r_ret) const {
 					return true;
 				}
 			}
-		} else if (components.size() == 2 && components[0] == "terrains_peering_bit") {
+		}
+#endif // PHYSICS_2D_DISABLED
+		else if (components.size() == 2 && components[0] == "terrains_peering_bit") {
 			// Terrains.
 			for (int i = 0; i < TileSet::CELL_NEIGHBOR_MAX; i++) {
 				if (components[1] == TileSet::CELL_NEIGHBOR_ENUM_TO_TEXT[i]) {
@@ -6932,7 +6937,9 @@ bool TileData::_get(const StringName &p_name, Variant &r_ret) const {
 				}
 			}
 			return false;
-		} else if (components.size() == 2 && components[0].begins_with("navigation_layer_") && components[0].trim_prefix("navigation_layer_").is_valid_int()) {
+		}
+#ifndef NAVIGATION_2D_DISABLED
+		else if (components.size() == 2 && components[0].begins_with("navigation_layer_") && components[0].trim_prefix("navigation_layer_").is_valid_int()) {
 			// Occlusion layers.
 			int layer_index = components[0].trim_prefix("navigation_layer_").to_int();
 			ERR_FAIL_COND_V(layer_index < 0, false);
@@ -6943,7 +6950,9 @@ bool TileData::_get(const StringName &p_name, Variant &r_ret) const {
 				r_ret = get_navigation_polygon(layer_index);
 				return true;
 			}
-		} else if (components.size() == 1 && components[0].begins_with("custom_data_") && components[0].trim_prefix("custom_data_").is_valid_int()) {
+		}
+#endif // NAVIGATION_2D_DISABLED
+		else if (components.size() == 1 && components[0].begins_with("custom_data_") && components[0].trim_prefix("custom_data_").is_valid_int()) {
 			// Custom data layers.
 			int layer_index = components[0].trim_prefix("custom_data_").to_int();
 			ERR_FAIL_COND_V(layer_index < 0, false);
@@ -6976,6 +6985,7 @@ void TileData::_get_property_list(List<PropertyInfo> *p_list) const {
 			}
 		}
 
+#ifndef PHYSICS_2D_DISABLED
 		// Physics layers.
 		p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Physics", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
 		for (int i = 0; i < physics.size(); i++) {
@@ -7018,6 +7028,7 @@ void TileData::_get_property_list(List<PropertyInfo> *p_list) const {
 				p_list->push_back(property_info);
 			}
 		}
+#endif // PHYSICS_2D_DISABLED
 
 		// Terrain data
 		if (terrain_set >= 0) {
@@ -7034,6 +7045,7 @@ void TileData::_get_property_list(List<PropertyInfo> *p_list) const {
 			}
 		}
 
+#ifndef NAVIGATION_2D_DISABLED
 		// Navigation layers.
 		p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Navigation", ""), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_GROUP));
 		for (int i = 0; i < navigation.size(); i++) {
@@ -7043,6 +7055,7 @@ void TileData::_get_property_list(List<PropertyInfo> *p_list) const {
 			}
 			p_list->push_back(property_info);
 		}
+#endif // NAVIGATION_2D_DISABLED
 
 		// Custom data layers.
 		p_list->push_back(PropertyInfo(Variant::NIL, GNAME("Custom Data", "custom_data_"), PROPERTY_HINT_NONE, "custom_data_", PROPERTY_USAGE_GROUP));
@@ -7090,6 +7103,7 @@ void TileData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_occluder", "layer_id", "flip_h", "flip_v", "transpose"), &TileData::get_occluder, DEFVAL(false), DEFVAL(false), DEFVAL(false));
 #endif // DISABLE_DEPRECATED
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics.
 	ClassDB::bind_method(D_METHOD("set_constant_linear_velocity", "layer_id", "velocity"), &TileData::set_constant_linear_velocity);
 	ClassDB::bind_method(D_METHOD("get_constant_linear_velocity", "layer_id"), &TileData::get_constant_linear_velocity);
@@ -7105,6 +7119,7 @@ void TileData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_collision_polygon_one_way", "layer_id", "polygon_index"), &TileData::is_collision_polygon_one_way);
 	ClassDB::bind_method(D_METHOD("set_collision_polygon_one_way_margin", "layer_id", "polygon_index", "one_way_margin"), &TileData::set_collision_polygon_one_way_margin);
 	ClassDB::bind_method(D_METHOD("get_collision_polygon_one_way_margin", "layer_id", "polygon_index"), &TileData::get_collision_polygon_one_way_margin);
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrain
 	ClassDB::bind_method(D_METHOD("set_terrain_set", "terrain_set"), &TileData::set_terrain_set);
@@ -7115,9 +7130,11 @@ void TileData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_terrain_peering_bit", "peering_bit"), &TileData::get_terrain_peering_bit);
 	ClassDB::bind_method(D_METHOD("is_valid_terrain_peering_bit", "peering_bit"), &TileData::is_valid_terrain_peering_bit);
 
+#ifndef NAVIGATION_2D_DISABLED
 	// Navigation
 	ClassDB::bind_method(D_METHOD("set_navigation_polygon", "layer_id", "navigation_polygon"), &TileData::set_navigation_polygon);
 	ClassDB::bind_method(D_METHOD("get_navigation_polygon", "layer_id", "flip_h", "flip_v", "transpose"), &TileData::get_navigation_polygon, DEFVAL(false), DEFVAL(false), DEFVAL(false));
+#endif // NAVIGATION_2D_DISABLED
 
 	// Misc.
 	ClassDB::bind_method(D_METHOD("set_probability", "probability"), &TileData::set_probability);
diff --git a/engine/scene/resources/2d/tile_set.h b/engine/scene/resources/2d/tile_set.h
index 31ec28c9..f108ff39 100644
--- a/engine/scene/resources/2d/tile_set.h
+++ b/engine/scene/resources/2d/tile_set.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TILE_SET_H
-#define TILE_SET_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/object.h"
@@ -37,12 +36,18 @@
 #include "core/templates/rb_set.h"
 #include "scene/2d/light_occluder_2d.h"
 #include "scene/main/canvas_item.h"
-#include "scene/resources/2d/convex_polygon_shape_2d.h"
-#include "scene/resources/2d/navigation_polygon.h"
 #include "scene/resources/image_texture.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/physics_material.h"
 
+#ifndef PHYSICS_2D_DISABLED
+#include "scene/resources/2d/convex_polygon_shape_2d.h"
+#endif // PHYSICS_2D_DISABLED
+
+#ifndef NAVIGATION_2D_DISABLED
+#include "scene/resources/2d/navigation_polygon.h"
+#endif // NAVIGATION_2D_DISABLED
+
 #ifndef DISABLE_DEPRECATED
 #include "scene/resources/shader.h"
 #endif
@@ -52,12 +57,6 @@ class TileSetSource;
 class TileSetAtlasSource;
 class TileData;
 
-// Forward-declare the plugins.
-class TileSetPlugin;
-class TileSetPluginAtlasRendering;
-class TileSetPluginAtlasPhysics;
-class TileSetPluginAtlasNavigation;
-
 union TileMapCell {
 	struct {
 		int16_t source_id;
@@ -154,7 +153,9 @@ private:
 		Vector2i autotile_coords;
 		bool one_way;
 		float one_way_margin;
+#ifndef PHYSICS_2D_DISABLED
 		Ref<Shape2D> shape;
+#endif // PHYSICS_2D_DISABLED
 		Transform2D transform;
 	};
 
@@ -175,14 +176,18 @@ private:
 		int autotile_spacing = 0;
 		HashMap<Vector2i, int> autotile_bitmask_flags;
 		HashMap<Vector2i, Ref<OccluderPolygon2D>> autotile_occluder_map;
+#ifndef NAVIGATION_2D_DISABLED
 		HashMap<Vector2i, Ref<NavigationPolygon>> autotile_navpoly_map;
+#endif // NAVIGATION_2D_DISABLED
 		HashMap<Vector2i, int> autotile_priority_map;
 		HashMap<Vector2i, int> autotile_z_index_map;
 
 		Vector<CompatibilityShapeData> shapes;
 		Ref<OccluderPolygon2D> occluder;
 		Vector2 occluder_offset;
+#ifndef NAVIGATION_2D_DISABLED
 		Ref<NavigationPolygon> navigation;
+#endif // NAVIGATION_2D_DISABLED
 		Vector2 navigation_offset;
 		int z_index = 0;
 	};
@@ -323,6 +328,7 @@ private:
 	Ref<ArrayMesh> tile_filled_mesh;
 	mutable bool tile_meshes_dirty = true;
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics
 	struct PhysicsLayer {
 		uint32_t collision_layer = 1;
@@ -331,6 +337,7 @@ private:
 		Ref<PhysicsMaterial> physics_material;
 	};
 	Vector<PhysicsLayer> physics_layers;
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrains
 	struct Terrain {
@@ -401,9 +408,6 @@ protected:
 	static void _bind_methods();
 
 public:
-	// --- Plugins ---
-	Vector<TileSetPlugin *> get_tile_set_atlas_plugins() const;
-
 	// --- Accessors for TileSet data ---
 
 	// -- Shape and layout --
@@ -440,6 +444,7 @@ public:
 	void set_occlusion_layer_sdf_collision(int p_layer_index, bool p_sdf_collision);
 	bool get_occlusion_layer_sdf_collision(int p_layer_index) const;
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics
 	int get_physics_layers_count() const;
 	void add_physics_layer(int p_index = -1);
@@ -453,6 +458,7 @@ public:
 	real_t get_physics_layer_collision_priority(int p_layer_index) const;
 	void set_physics_layer_physics_material(int p_layer_index, Ref<PhysicsMaterial> p_physics_material);
 	Ref<PhysicsMaterial> get_physics_layer_physics_material(int p_layer_index) const;
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrain sets
 	int get_terrain_sets_count() const;
@@ -474,6 +480,7 @@ public:
 	bool is_valid_terrain_peering_bit_for_mode(TileSet::TerrainMode p_terrain_mode, TileSet::CellNeighbor p_peering_bit) const;
 	bool is_valid_terrain_peering_bit(int p_terrain_set, TileSet::CellNeighbor p_peering_bit) const;
 
+#ifndef NAVIGATION_2D_DISABLED
 	// Navigation
 	int get_navigation_layers_count() const;
 	void add_navigation_layer(int p_index = -1);
@@ -483,6 +490,7 @@ public:
 	uint32_t get_navigation_layer_layers(int p_layer_index) const;
 	void set_navigation_layer_layer_value(int p_layer_index, int p_layer_number, bool p_value);
 	bool get_navigation_layer_layer_value(int p_layer_index, int p_layer_number) const;
+#endif // NAVIGATION_2D_DISABLED
 
 	// Custom data
 	int get_custom_data_layers_count() const;
@@ -686,18 +694,22 @@ public:
 	virtual void add_occlusion_layer(int p_index) override;
 	virtual void move_occlusion_layer(int p_from_index, int p_to_pos) override;
 	virtual void remove_occlusion_layer(int p_index) override;
+#ifndef PHYSICS_2D_DISABLED
 	virtual void add_physics_layer(int p_index) override;
 	virtual void move_physics_layer(int p_from_index, int p_to_pos) override;
 	virtual void remove_physics_layer(int p_index) override;
+#endif // PHYSICS_2D_DISABLED
 	virtual void add_terrain_set(int p_index) override;
 	virtual void move_terrain_set(int p_from_index, int p_to_pos) override;
 	virtual void remove_terrain_set(int p_index) override;
 	virtual void add_terrain(int p_terrain_set, int p_index) override;
 	virtual void move_terrain(int p_terrain_set, int p_from_index, int p_to_pos) override;
 	virtual void remove_terrain(int p_terrain_set, int p_index) override;
+#ifndef NAVIGATION_2D_DISABLED
 	virtual void add_navigation_layer(int p_index) override;
 	virtual void move_navigation_layer(int p_from_index, int p_to_pos) override;
 	virtual void remove_navigation_layer(int p_index) override;
+#endif // NAVIGATION_2D_DISABLED
 	virtual void add_custom_data_layer(int p_index) override;
 	virtual void move_custom_data_layer(int p_from_index, int p_to_pos) override;
 	virtual void remove_custom_data_layer(int p_index) override;
@@ -853,6 +865,7 @@ private:
 	};
 	Vector<OcclusionLayerTileData> occluders;
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics
 	struct PhysicsLayerTileData {
 		struct PolygonShapeTileData {
@@ -868,19 +881,22 @@ private:
 		Vector<PolygonShapeTileData> polygons;
 	};
 	Vector<PhysicsLayerTileData> physics;
-	// TODO add support for areas.
+// TODO add support for areas.
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrain
 	int terrain_set = -1;
 	int terrain = -1;
 	int terrain_peering_bits[16] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
 
+#ifndef NAVIGATION_2D_DISABLED
 	// Navigation
 	struct NavigationLayerTileData {
 		Ref<NavigationPolygon> navigation_polygon;
 		mutable HashMap<int, Ref<NavigationPolygon>> transformed_navigation_polygon;
 	};
 	Vector<NavigationLayerTileData> navigation;
+#endif // NAVIGATION_2D_DISABLED
 
 	// Misc
 	double probability = 1.0;
@@ -895,7 +911,9 @@ protected:
 	static void _bind_methods();
 
 #ifndef DISABLE_DEPRECATED
+#ifndef NAVIGATION_2D_DISABLED
 	Ref<NavigationPolygon> _get_navigation_polygon_bind_compat_84660(int p_layer_id) const;
+#endif // NAVIGATION_2D_DISABLED
 	Ref<OccluderPolygon2D> _get_occluder_bind_compat_84660(int p_layer_id) const;
 
 	static void _bind_compatibility_methods();
@@ -908,9 +926,11 @@ public:
 	void add_occlusion_layer(int p_index);
 	void move_occlusion_layer(int p_from_index, int p_to_pos);
 	void remove_occlusion_layer(int p_index);
+#ifndef PHYSICS_2D_DISABLED
 	void add_physics_layer(int p_index);
 	void move_physics_layer(int p_from_index, int p_to_pos);
 	void remove_physics_layer(int p_index);
+#endif // PHYSICS_2D_DISABLED
 	void add_terrain_set(int p_index);
 	void move_terrain_set(int p_from_index, int p_to_pos);
 	void remove_terrain_set(int p_index);
@@ -960,6 +980,7 @@ public:
 	void set_occluder_polygon(int p_layer_id, int p_polygon_index, const Ref<OccluderPolygon2D> &p_occluder_polygon);
 	Ref<OccluderPolygon2D> get_occluder_polygon(int p_layer_id, int p_polygon_index, bool p_flip_h = false, bool p_flip_v = false, bool p_transpose = false) const;
 
+#ifndef PHYSICS_2D_DISABLED
 	// Physics
 	void set_constant_linear_velocity(int p_layer_id, const Vector2 &p_velocity);
 	Vector2 get_constant_linear_velocity(int p_layer_id) const;
@@ -977,6 +998,7 @@ public:
 	float get_collision_polygon_one_way_margin(int p_layer_id, int p_polygon_index) const;
 	int get_collision_polygon_shapes_count(int p_layer_id, int p_polygon_index) const;
 	Ref<ConvexPolygonShape2D> get_collision_polygon_shape(int p_layer_id, int p_polygon_index, int shape_index, bool p_flip_h = false, bool p_flip_v = false, bool p_transpose = false) const;
+#endif // PHYSICS_2D_DISABLED
 
 	// Terrain
 	void set_terrain_set(int p_terrain_id);
@@ -989,9 +1011,11 @@ public:
 
 	TileSet::TerrainsPattern get_terrains_pattern() const; // Not exposed.
 
+#ifndef NAVIGATION_2D_DISABLED
 	// Navigation
 	void set_navigation_polygon(int p_layer_id, Ref<NavigationPolygon> p_navigation_polygon);
 	Ref<NavigationPolygon> get_navigation_polygon(int p_layer_id, bool p_flip_h = false, bool p_flip_v = false, bool p_transpose = false) const;
+#endif // NAVIGATION_2D_DISABLED
 
 	// Misc
 	void set_probability(float p_probability);
@@ -1015,5 +1039,3 @@ VARIANT_ENUM_CAST(TileSet::TileLayout);
 VARIANT_ENUM_CAST(TileSet::TileOffsetAxis);
 
 VARIANT_ENUM_CAST(TileSetAtlasSource::TileAnimationMode);
-
-#endif // TILE_SET_H
diff --git a/engine/scene/resources/2d/world_boundary_shape_2d.cpp b/engine/scene/resources/2d/world_boundary_shape_2d.cpp
index 574b10c4..276935da 100644
--- a/engine/scene/resources/2d/world_boundary_shape_2d.cpp
+++ b/engine/scene/resources/2d/world_boundary_shape_2d.cpp
@@ -35,23 +35,26 @@
 #include "servers/rendering_server.h"
 
 bool WorldBoundaryShape2D::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {
-	Vector2 point = distance * normal;
-	Vector2 l[2][2] = { { point - normal.orthogonal() * 100, point + normal.orthogonal() * 100 }, { point, point + normal * 30 } };
-
-	for (int i = 0; i < 2; i++) {
-		Vector2 closest = Geometry2D::get_closest_point_to_segment(p_point, l[i]);
-		if (p_point.distance_to(closest) < p_tolerance) {
-			return true;
-		}
+	const Vector2 shape_center = distance * normal;
+	// Orthogonal part of the shape editor gizmo (the flat line).
+	const Vector2 ortho_segment_a = shape_center - normal.orthogonal() * 100;
+	const Vector2 ortho_segment_b = shape_center + normal.orthogonal() * 100;
+	const Vector2 ortho_closest = Geometry2D::get_closest_point_to_segment(p_point, ortho_segment_a, ortho_segment_b);
+	if (p_point.distance_to(ortho_closest) < p_tolerance) {
+		return true;
+	}
+	// Normal part of the shape editor gizmo (the arrow).
+	const Vector2 normal_segment_a = shape_center;
+	const Vector2 normal_segment_b = shape_center + normal * 30;
+	const Vector2 normal_closest = Geometry2D::get_closest_point_to_segment(p_point, normal_segment_a, normal_segment_b);
+	if (p_point.distance_to(normal_closest) < p_tolerance) {
+		return true;
 	}
-
 	return false;
 }
 
 void WorldBoundaryShape2D::_update_shape() {
-	Array arr;
-	arr.push_back(normal);
-	arr.push_back(distance);
+	Array arr = { normal, distance };
 	PhysicsServer2D::get_singleton()->shape_set_data(get_rid(), arr);
 	emit_changed();
 }
diff --git a/engine/scene/resources/2d/world_boundary_shape_2d.h b/engine/scene/resources/2d/world_boundary_shape_2d.h
index a7f11e39..495722a4 100644
--- a/engine/scene/resources/2d/world_boundary_shape_2d.h
+++ b/engine/scene/resources/2d/world_boundary_shape_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WORLD_BOUNDARY_SHAPE_2D_H
-#define WORLD_BOUNDARY_SHAPE_2D_H
+#pragma once
 
 #include "scene/resources/2d/shape_2d.h"
 
@@ -60,5 +59,3 @@ public:
 
 	WorldBoundaryShape2D();
 };
-
-#endif // WORLD_BOUNDARY_SHAPE_2D_H
diff --git a/engine/scene/resources/3d/SCsub b/engine/scene/resources/3d/SCsub
index 408aa3cf..e8a11591 100644
--- a/engine/scene/resources/3d/SCsub
+++ b/engine/scene/resources/3d/SCsub
@@ -3,5 +3,26 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.scene_sources, "*.cpp")
+env.add_source_files(env.scene_sources, "fog_material.cpp")
+env.add_source_files(env.scene_sources, "importer_mesh.cpp")
+env.add_source_files(env.scene_sources, "mesh_library.cpp")
+env.add_source_files(env.scene_sources, "primitive_meshes.cpp")
+env.add_source_files(env.scene_sources, "skin.cpp")
+env.add_source_files(env.scene_sources, "sky_material.cpp")
+env.add_source_files(env.scene_sources, "world_3d.cpp")
 env.add_source_files(env.scene_sources, "skeleton/*.cpp")
+
+if not env["disable_physics_3d"]:
+    env.add_source_files(env.scene_sources, "box_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "capsule_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "circle_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "concave_polygon_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "convex_polygon_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "cylinder_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "height_map_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "separation_ray_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "sphere_shape_3d.cpp")
+    env.add_source_files(env.scene_sources, "world_boundary_shape_3d.cpp")
+if not env["disable_navigation_3d"]:
+    env.add_source_files(env.scene_sources, "navigation_mesh_source_geometry_data_3d.cpp")
diff --git a/engine/scene/resources/3d/box_shape_3d.h b/engine/scene/resources/3d/box_shape_3d.h
index a9137fdc..116a6f7a 100644
--- a/engine/scene/resources/3d/box_shape_3d.h
+++ b/engine/scene/resources/3d/box_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BOX_SHAPE_3D_H
-#define BOX_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -56,5 +55,3 @@ public:
 
 	BoxShape3D();
 };
-
-#endif // BOX_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/capsule_shape_3d.h b/engine/scene/resources/3d/capsule_shape_3d.h
index 2ad7fa45..16f58bc9 100644
--- a/engine/scene/resources/3d/capsule_shape_3d.h
+++ b/engine/scene/resources/3d/capsule_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAPSULE_SHAPE_3D_H
-#define CAPSULE_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -57,5 +56,3 @@ public:
 
 	CapsuleShape3D();
 };
-
-#endif // CAPSULE_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/concave_polygon_shape_3d.h b/engine/scene/resources/3d/concave_polygon_shape_3d.h
index d5e5bc39..6a149589 100644
--- a/engine/scene/resources/3d/concave_polygon_shape_3d.h
+++ b/engine/scene/resources/3d/concave_polygon_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONCAVE_POLYGON_SHAPE_3D_H
-#define CONCAVE_POLYGON_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -79,5 +78,3 @@ public:
 
 	ConcavePolygonShape3D();
 };
-
-#endif // CONCAVE_POLYGON_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/convex_polygon_shape_3d.h b/engine/scene/resources/3d/convex_polygon_shape_3d.h
index 2dd4ce66..f951de2c 100644
--- a/engine/scene/resources/3d/convex_polygon_shape_3d.h
+++ b/engine/scene/resources/3d/convex_polygon_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CONVEX_POLYGON_SHAPE_3D_H
-#define CONVEX_POLYGON_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -54,5 +53,3 @@ public:
 
 	ConvexPolygonShape3D();
 };
-
-#endif // CONVEX_POLYGON_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/cylinder_shape_3d.h b/engine/scene/resources/3d/cylinder_shape_3d.h
index 9388cab3..b2e9f96e 100644
--- a/engine/scene/resources/3d/cylinder_shape_3d.h
+++ b/engine/scene/resources/3d/cylinder_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CYLINDER_SHAPE_3D_H
-#define CYLINDER_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -56,5 +55,3 @@ public:
 
 	CylinderShape3D();
 };
-
-#endif // CYLINDER_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/fog_material.cpp b/engine/scene/resources/3d/fog_material.cpp
index 6c6e98b5..b749ec34 100644
--- a/engine/scene/resources/3d/fog_material.cpp
+++ b/engine/scene/resources/3d/fog_material.cpp
@@ -144,7 +144,7 @@ void FogMaterial::_update_shader() {
 
 		// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
 		RS::get_singleton()->shader_set_code(shader, R"(
-// NOTE: Shader automatically converted from )" VERSION_NAME " " VERSION_FULL_CONFIG R"('s FogMaterial.
+// NOTE: Shader automatically converted from )" GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG R"('s FogMaterial.
 
 shader_type fog;
 
diff --git a/engine/scene/resources/3d/fog_material.h b/engine/scene/resources/3d/fog_material.h
index 7557fd51..f9254d46 100644
--- a/engine/scene/resources/3d/fog_material.h
+++ b/engine/scene/resources/3d/fog_material.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FOG_MATERIAL_H
-#define FOG_MATERIAL_H
+#pragma once
 
 #include "scene/resources/material.h"
 
@@ -83,5 +82,3 @@ public:
 	FogMaterial();
 	virtual ~FogMaterial();
 };
-
-#endif // FOG_MATERIAL_H
diff --git a/engine/scene/resources/3d/height_map_shape_3d.h b/engine/scene/resources/3d/height_map_shape_3d.h
index b5be5309..a64249d8 100644
--- a/engine/scene/resources/3d/height_map_shape_3d.h
+++ b/engine/scene/resources/3d/height_map_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef HEIGHT_MAP_SHAPE_3D_H
-#define HEIGHT_MAP_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -68,5 +67,3 @@ public:
 
 	HeightMapShape3D();
 };
-
-#endif // HEIGHT_MAP_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/importer_mesh.cpp b/engine/scene/resources/3d/importer_mesh.cpp
index f040f04c..ecd401c3 100644
--- a/engine/scene/resources/3d/importer_mesh.cpp
+++ b/engine/scene/resources/3d/importer_mesh.cpp
@@ -31,19 +31,15 @@
 #include "importer_mesh.h"
 
 #include "core/io/marshalls.h"
-#include "core/math/convex_hull.h"
 #include "core/math/random_pcg.h"
 #include "scene/resources/surface_tool.h"
 
-#include <cstdint>
+#ifndef PHYSICS_3D_DISABLED
+#include "core/math/convex_hull.h"
+#endif // PHYSICS_3D_DISABLED
 
 String ImporterMesh::validate_blend_shape_name(const String &p_name) {
-	String name = p_name;
-	const char *characters = ":";
-	for (const char *p = characters; *p; p++) {
-		name = name.replace(String::chr(*p), "_");
-	}
-	return name;
+	return p_name.replace_char(':', '_');
 }
 
 void ImporterMesh::add_blend_shape(const String &p_name) {
@@ -91,13 +87,11 @@ void ImporterMesh::add_surface(Mesh::PrimitiveType p_primitive, const Array &p_a
 		s.blend_shape_data.push_back(bs);
 	}
 
-	List<Variant> lods;
-	p_lods.get_key_list(&lods);
-	for (const Variant &E : lods) {
-		ERR_CONTINUE(!E.is_num());
+	for (const KeyValue<Variant, Variant> &kv : p_lods) {
+		ERR_CONTINUE(!kv.key.is_num());
 		Surface::LOD lod;
-		lod.distance = E;
-		lod.indices = p_lods[E];
+		lod.distance = kv.key;
+		lod.indices = kv.value;
 		ERR_CONTINUE(lod.indices.is_empty());
 		s.lods.push_back(lod);
 	}
@@ -787,6 +781,7 @@ Vector<Face3> ImporterMesh::get_faces() const {
 	return faces;
 }
 
+#ifndef PHYSICS_3D_DISABLED
 Vector<Ref<Shape3D>> ImporterMesh::convex_decompose(const Ref<MeshConvexDecompositionSettings> &p_settings) const {
 	ERR_FAIL_NULL_V(Mesh::convex_decomposition_function, Vector<Ref<Shape3D>>());
 
@@ -874,7 +869,7 @@ Ref<ConvexPolygonShape3D> ImporterMesh::create_convex_shape(bool p_clean, bool p
 
 Ref<ConcavePolygonShape3D> ImporterMesh::create_trimesh_shape() const {
 	Vector<Face3> faces = get_faces();
-	if (faces.size() == 0) {
+	if (faces.is_empty()) {
 		return Ref<ConcavePolygonShape3D>();
 	}
 
@@ -892,10 +887,11 @@ Ref<ConcavePolygonShape3D> ImporterMesh::create_trimesh_shape() const {
 	shape->set_faces(face_points);
 	return shape;
 }
+#endif // PHYSICS_3D_DISABLED
 
 Ref<NavigationMesh> ImporterMesh::create_navigation_mesh() {
 	Vector<Face3> faces = get_faces();
-	if (faces.size() == 0) {
+	if (faces.is_empty()) {
 		return Ref<NavigationMesh>();
 	}
 
diff --git a/engine/scene/resources/3d/importer_mesh.h b/engine/scene/resources/3d/importer_mesh.h
index 30da76a0..03cc73e6 100644
--- a/engine/scene/resources/3d/importer_mesh.h
+++ b/engine/scene/resources/3d/importer_mesh.h
@@ -28,16 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMPORTER_MESH_H
-#define IMPORTER_MESH_H
+#pragma once
 
 #include "core/io/resource.h"
-#include "scene/resources/3d/concave_polygon_shape_3d.h"
-#include "scene/resources/3d/convex_polygon_shape_3d.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
 
-#include <cstdint>
+#ifndef PHYSICS_3D_DISABLED
+#include "scene/resources/3d/concave_polygon_shape_3d.h"
+#include "scene/resources/3d/convex_polygon_shape_3d.h"
+#endif // PHYSICS_3D_DISABLED
 
 // The following classes are used by importers instead of ArrayMesh and MeshInstance3D
 // so the data is not registered (hence, quality loss), importing happens faster and
@@ -120,9 +120,11 @@ public:
 	Ref<ImporterMesh> get_shadow_mesh() const;
 
 	Vector<Face3> get_faces() const;
+#ifndef PHYSICS_3D_DISABLED
 	Vector<Ref<Shape3D>> convex_decompose(const Ref<MeshConvexDecompositionSettings> &p_settings) const;
 	Ref<ConvexPolygonShape3D> create_convex_shape(bool p_clean = true, bool p_simplify = false) const;
 	Ref<ConcavePolygonShape3D> create_trimesh_shape() const;
+#endif // PHYSICS_3D_DISABLED
 	Ref<NavigationMesh> create_navigation_mesh();
 	Error lightmap_unwrap_cached(const Transform3D &p_base_transform, float p_texel_size, const Vector<uint8_t> &p_src_cache, Vector<uint8_t> &r_dst_cache);
 
@@ -133,5 +135,3 @@ public:
 	Ref<ArrayMesh> get_mesh(const Ref<ArrayMesh> &p_base = Ref<ArrayMesh>());
 	void clear();
 };
-
-#endif // IMPORTER_MESH_H
diff --git a/engine/scene/resources/3d/mesh_library.cpp b/engine/scene/resources/3d/mesh_library.cpp
index 446abc13..3f8b6529 100644
--- a/engine/scene/resources/3d/mesh_library.cpp
+++ b/engine/scene/resources/3d/mesh_library.cpp
@@ -30,7 +30,9 @@
 
 #include "mesh_library.h"
 
+#ifndef PHYSICS_3D_DISABLED
 #include "box_shape_3d.h"
+#endif // PHYSICS_3D_DISABLED
 
 bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) {
 	String prop_name = p_name;
@@ -65,6 +67,7 @@ bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) {
 					set_item_mesh_cast_shadow(idx, RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON);
 				} break;
 			}
+#ifndef PHYSICS_3D_DISABLED
 		} else if (what == "shape") {
 			Vector<ShapeData> shapes;
 			ShapeData sd;
@@ -73,6 +76,7 @@ bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) {
 			set_item_shapes(idx, shapes);
 		} else if (what == "shapes") {
 			_set_item_shapes(idx, p_value);
+#endif // PHYSICS_3D_DISABLED
 		} else if (what == "preview") {
 			set_item_preview(idx, p_value);
 		} else if (what == "navigation_mesh") {
@@ -111,8 +115,10 @@ bool MeshLibrary::_get(const StringName &p_name, Variant &r_ret) const {
 		r_ret = get_item_mesh_transform(idx);
 	} else if (what == "mesh_cast_shadow") {
 		r_ret = (int)get_item_mesh_cast_shadow(idx);
+#ifndef PHYSICS_3D_DISABLED
 	} else if (what == "shapes") {
 		r_ret = _get_item_shapes(idx);
+#endif // PHYSICS_3D_DISABLED
 	} else if (what == "navigation_mesh") {
 		r_ret = get_item_navigation_mesh(idx);
 	} else if (what == "navigation_mesh_transform") {
@@ -181,12 +187,14 @@ void MeshLibrary::set_item_mesh_cast_shadow(int p_item, RS::ShadowCastingSetting
 	emit_changed();
 }
 
+#ifndef PHYSICS_3D_DISABLED
 void MeshLibrary::set_item_shapes(int p_item, const Vector<ShapeData> &p_shapes) {
 	ERR_FAIL_COND_MSG(!item_map.has(p_item), "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
 	item_map[p_item].shapes = p_shapes;
 	emit_changed();
 	notify_property_list_changed();
 }
+#endif // PHYSICS_3D_DISABLED
 
 void MeshLibrary::set_item_navigation_mesh(int p_item, const Ref<NavigationMesh> &p_navigation_mesh) {
 	ERR_FAIL_COND_MSG(!item_map.has(p_item), "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
@@ -232,10 +240,12 @@ RS::ShadowCastingSetting MeshLibrary::get_item_mesh_cast_shadow(int p_item) cons
 	return item_map[p_item].mesh_cast_shadow;
 }
 
+#ifndef PHYSICS_3D_DISABLED
 Vector<MeshLibrary::ShapeData> MeshLibrary::get_item_shapes(int p_item) const {
 	ERR_FAIL_COND_V_MSG(!item_map.has(p_item), Vector<ShapeData>(), "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
 	return item_map[p_item].shapes;
 }
+#endif // PHYSICS_3D_DISABLED
 
 Ref<NavigationMesh> MeshLibrary::get_item_navigation_mesh(int p_item) const {
 	ERR_FAIL_COND_V_MSG(!item_map.has(p_item), Ref<NavigationMesh>(), "Requested for nonexistent MeshLibrary item '" + itos(p_item) + "'.");
@@ -302,6 +312,7 @@ int MeshLibrary::get_last_unused_item_id() const {
 	}
 }
 
+#ifndef PHYSICS_3D_DISABLED
 void MeshLibrary::_set_item_shapes(int p_item, const Array &p_shapes) {
 	Array arr_shapes = p_shapes;
 	int size = p_shapes.size();
@@ -351,6 +362,7 @@ Array MeshLibrary::_get_item_shapes(int p_item) const {
 
 	return ret;
 }
+#endif // PHYSICS_3D_DISABLED
 
 void MeshLibrary::reset_state() {
 	clear();
@@ -364,7 +376,9 @@ void MeshLibrary::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item_navigation_mesh", "id", "navigation_mesh"), &MeshLibrary::set_item_navigation_mesh);
 	ClassDB::bind_method(D_METHOD("set_item_navigation_mesh_transform", "id", "navigation_mesh"), &MeshLibrary::set_item_navigation_mesh_transform);
 	ClassDB::bind_method(D_METHOD("set_item_navigation_layers", "id", "navigation_layers"), &MeshLibrary::set_item_navigation_layers);
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_item_shapes", "id", "shapes"), &MeshLibrary::_set_item_shapes);
+#endif // PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("set_item_preview", "id", "texture"), &MeshLibrary::set_item_preview);
 	ClassDB::bind_method(D_METHOD("get_item_name", "id"), &MeshLibrary::get_item_name);
 	ClassDB::bind_method(D_METHOD("get_item_mesh", "id"), &MeshLibrary::get_item_mesh);
@@ -373,7 +387,9 @@ void MeshLibrary::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_item_navigation_mesh", "id"), &MeshLibrary::get_item_navigation_mesh);
 	ClassDB::bind_method(D_METHOD("get_item_navigation_mesh_transform", "id"), &MeshLibrary::get_item_navigation_mesh_transform);
 	ClassDB::bind_method(D_METHOD("get_item_navigation_layers", "id"), &MeshLibrary::get_item_navigation_layers);
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_item_shapes", "id"), &MeshLibrary::_get_item_shapes);
+#endif // PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_item_preview", "id"), &MeshLibrary::get_item_preview);
 	ClassDB::bind_method(D_METHOD("remove_item", "id"), &MeshLibrary::remove_item);
 	ClassDB::bind_method(D_METHOD("find_item_by_name", "name"), &MeshLibrary::find_item_by_name);
diff --git a/engine/scene/resources/3d/mesh_library.h b/engine/scene/resources/3d/mesh_library.h
index 1d6f4806..a3c86c59 100644
--- a/engine/scene/resources/3d/mesh_library.h
+++ b/engine/scene/resources/3d/mesh_library.h
@@ -28,31 +28,37 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_LIBRARY_H
-#define MESH_LIBRARY_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/templates/rb_map.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
 #include "servers/rendering_server.h"
+
+#ifndef PHYSICS_3D_DISABLED
 #include "shape_3d.h"
+#endif // PHYSICS_3D_DISABLED
 
 class MeshLibrary : public Resource {
 	GDCLASS(MeshLibrary, Resource);
 	RES_BASE_EXTENSION("meshlib");
 
 public:
+#ifndef PHYSICS_3D_DISABLED
 	struct ShapeData {
 		Ref<Shape3D> shape;
 		Transform3D local_transform;
 	};
+#endif // PHYSICS_3D_DISABLED
 	struct Item {
 		String name;
 		Ref<Mesh> mesh;
 		Transform3D mesh_transform;
 		RS::ShadowCastingSetting mesh_cast_shadow = RS::ShadowCastingSetting::SHADOW_CASTING_SETTING_ON;
+#ifndef PHYSICS_3D_DISABLED
 		Vector<ShapeData> shapes;
+#endif // PHYSICS_3D_DISABLED
 		Ref<Texture2D> preview;
 		Ref<NavigationMesh> navigation_mesh;
 		Transform3D navigation_mesh_transform;
@@ -61,8 +67,10 @@ public:
 
 	RBMap<int, Item> item_map;
 
+#ifndef PHYSICS_3D_DISABLED
 	void _set_item_shapes(int p_item, const Array &p_shapes);
 	Array _get_item_shapes(int p_item) const;
+#endif // PHYSICS_3D_DISABLED
 
 protected:
 	bool _set(const StringName &p_name, const Variant &p_value);
@@ -81,7 +89,9 @@ public:
 	void set_item_navigation_mesh(int p_item, const Ref<NavigationMesh> &p_navigation_mesh);
 	void set_item_navigation_mesh_transform(int p_item, const Transform3D &p_transform);
 	void set_item_navigation_layers(int p_item, uint32_t p_navigation_layers);
+#ifndef PHYSICS_3D_DISABLED
 	void set_item_shapes(int p_item, const Vector<ShapeData> &p_shapes);
+#endif // PHYSICS_3D_DISABLED
 	void set_item_preview(int p_item, const Ref<Texture2D> &p_preview);
 	String get_item_name(int p_item) const;
 	Ref<Mesh> get_item_mesh(int p_item) const;
@@ -90,7 +100,9 @@ public:
 	Ref<NavigationMesh> get_item_navigation_mesh(int p_item) const;
 	Transform3D get_item_navigation_mesh_transform(int p_item) const;
 	uint32_t get_item_navigation_layers(int p_item) const;
+#ifndef PHYSICS_3D_DISABLED
 	Vector<ShapeData> get_item_shapes(int p_item) const;
+#endif // PHYSICS_3D_DISABLED
 	Ref<Texture2D> get_item_preview(int p_item) const;
 
 	void remove_item(int p_item);
@@ -106,5 +118,3 @@ public:
 	MeshLibrary();
 	~MeshLibrary();
 };
-
-#endif // MESH_LIBRARY_H
diff --git a/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.h b/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.h
index d7e3c307..dc1daf10 100644
--- a/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.h
+++ b/engine/scene/resources/3d/navigation_mesh_source_geometry_data_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_3D_H
-#define NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_3D_H
+#pragma once
 
 #include "core/os/rw_lock.h"
 #include "scene/resources/mesh.h"
@@ -109,5 +108,3 @@ public:
 	NavigationMeshSourceGeometryData3D() {}
 	~NavigationMeshSourceGeometryData3D() { clear(); }
 };
-
-#endif // NAVIGATION_MESH_SOURCE_GEOMETRY_DATA_3D_H
diff --git a/engine/scene/resources/3d/primitive_meshes.cpp b/engine/scene/resources/3d/primitive_meshes.cpp
index 5ba58b4f..5078e90e 100644
--- a/engine/scene/resources/3d/primitive_meshes.cpp
+++ b/engine/scene/resources/3d/primitive_meshes.cpp
@@ -103,7 +103,7 @@ void PrimitiveMesh::_update() const {
 		Vector<Vector2> uv = arr[RS::ARRAY_TEX_UV];
 		Vector<Vector2> uv2 = arr[RS::ARRAY_TEX_UV2];
 
-		if (uv.size() > 0 && uv2.size() == 0) {
+		if (uv.size() > 0 && uv2.is_empty()) {
 			Vector2 uv2_scale = get_uv2_scale();
 			uv2.resize(uv.size());
 
@@ -389,7 +389,7 @@ void CapsuleMesh::_update_lightmap_size() {
 		Size2i _lightmap_size_hint;
 		float padding = get_uv2_padding();
 
-		float radial_length = radius * Math_PI * 0.5; // circumference of 90 degree bend
+		float radial_length = radius * Math::PI * 0.5; // circumference of 90 degree bend
 		float vertical_length = radial_length * 2 + (height - 2.0 * radius); // total vertical length
 
 		_lightmap_size_hint.x = MAX(1.0, 4.0 * radial_length / texel_size) + padding;
@@ -413,9 +413,9 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 	float twothirds = 2.0 / 3.0;
 
 	// Only used if we calculate UV2
-	float radial_width = 2.0 * radius * Math_PI;
+	float radial_width = 2.0 * radius * Math::PI;
 	float radial_h = radial_width / (radial_width + p_uv2_padding);
-	float radial_length = radius * Math_PI * 0.5; // circumference of 90 degree bend
+	float radial_length = radius * Math::PI * 0.5; // circumference of 90 degree bend
 	float vertical_length = radial_length * 2 + (height - 2.0 * radius) + p_uv2_padding; // total vertical length
 	float radial_v = radial_length / vertical_length; // v size of top and bottom section
 	float height_v = (height - 2.0 * radius) / vertical_length; // v size of height section
@@ -447,8 +447,8 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 			w = 1.0;
 			y = 0.0;
 		} else {
-			w = Math::sin(0.5 * Math_PI * v);
-			y = Math::cos(0.5 * Math_PI * v);
+			w = Math::sin(0.5 * Math::PI * v);
+			y = Math::cos(0.5 * Math::PI * v);
 		}
 
 		for (i = 0; i <= radial_segments; i++) {
@@ -459,8 +459,8 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 				x = 0.0;
 				z = 1.0;
 			} else {
-				x = -Math::sin(u * Math_TAU);
-				z = Math::cos(u * Math_TAU);
+				x = -Math::sin(u * Math::TAU);
+				z = Math::cos(u * Math::TAU);
 			}
 
 			Vector3 p = Vector3(x * w, y, -z * w);
@@ -506,8 +506,8 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 				x = 0.0;
 				z = 1.0;
 			} else {
-				x = -Math::sin(u * Math_TAU);
-				z = Math::cos(u * Math_TAU);
+				x = -Math::sin(u * Math::TAU);
+				z = Math::cos(u * Math::TAU);
 			}
 
 			Vector3 p = Vector3(x * radius, y, -z * radius);
@@ -546,8 +546,8 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 			w = 0.0;
 			y = -1.0;
 		} else {
-			w = Math::cos(0.5 * Math_PI * v);
-			y = -Math::sin(0.5 * Math_PI * v);
+			w = Math::cos(0.5 * Math::PI * v);
+			y = -Math::sin(0.5 * Math::PI * v);
 		}
 
 		for (i = 0; i <= radial_segments; i++) {
@@ -558,8 +558,8 @@ void CapsuleMesh::create_mesh_array(Array &p_arr, const float radius, const floa
 				x = 0.0;
 				z = 1.0;
 			} else {
-				x = -Math::sin(u * Math_TAU);
-				z = Math::cos(u * Math_TAU);
+				x = -Math::sin(u * Math::TAU);
+				z = Math::cos(u * Math::TAU);
 			}
 
 			Vector3 p = Vector3(x * w, y, -z * w);
@@ -1028,8 +1028,8 @@ void CylinderMesh::_update_lightmap_size() {
 		Size2i _lightmap_size_hint;
 		float padding = get_uv2_padding();
 
-		float top_circumference = top_radius * Math_PI * 2.0;
-		float bottom_circumference = bottom_radius * Math_PI * 2.0;
+		float top_circumference = top_radius * Math::PI * 2.0;
+		float bottom_circumference = bottom_radius * Math::PI * 2.0;
 
 		float _width = MAX(top_circumference, bottom_circumference) / texel_size + padding;
 		_width = MAX(_width, (((top_radius + bottom_radius) / texel_size) + padding) * 2.0); // this is extremely unlikely to be larger, will only happen if padding is larger then our diameter.
@@ -1055,8 +1055,8 @@ void CylinderMesh::create_mesh_array(Array &p_arr, float top_radius, float botto
 	float x, y, z, u, v, radius, radius_h;
 
 	// Only used if we calculate UV2
-	float top_circumference = top_radius * Math_PI * 2.0;
-	float bottom_circumference = bottom_radius * Math_PI * 2.0;
+	float top_circumference = top_radius * Math::PI * 2.0;
+	float bottom_circumference = bottom_radius * Math::PI * 2.0;
 	float vertical_length = height + MAX(2.0 * top_radius, 2.0 * bottom_radius) + (2.0 * p_uv2_padding);
 	float height_v = height / vertical_length;
 	float padding_v = p_uv2_padding / vertical_length;
@@ -1102,8 +1102,8 @@ void CylinderMesh::create_mesh_array(Array &p_arr, float top_radius, float botto
 				x = 0.0;
 				z = 1.0;
 			} else {
-				x = Math::sin(u * Math_TAU);
-				z = Math::cos(u * Math_TAU);
+				x = Math::sin(u * Math::TAU);
+				z = Math::cos(u * Math::TAU);
 			}
 
 			Vector3 p = Vector3(x * radius, y, z * radius);
@@ -1159,8 +1159,8 @@ void CylinderMesh::create_mesh_array(Array &p_arr, float top_radius, float botto
 				x = 0.0;
 				z = 1.0;
 			} else {
-				x = Math::sin(r * Math_TAU);
-				z = Math::cos(r * Math_TAU);
+				x = Math::sin(r * Math::TAU);
+				z = Math::cos(r * Math::TAU);
 			}
 
 			u = ((x + 1.0) * 0.25);
@@ -1206,8 +1206,8 @@ void CylinderMesh::create_mesh_array(Array &p_arr, float top_radius, float botto
 				x = 0.0;
 				z = 1.0;
 			} else {
-				x = Math::sin(r * Math_TAU);
-				z = Math::cos(r * Math_TAU);
+				x = Math::sin(r * Math::TAU);
+				z = Math::cos(r * Math::TAU);
 			}
 
 			u = 0.5 + ((x + 1.0) * 0.25);
@@ -1921,9 +1921,9 @@ void SphereMesh::_update_lightmap_size() {
 		Size2i _lightmap_size_hint;
 		float padding = get_uv2_padding();
 
-		float _width = radius * Math_TAU;
+		float _width = radius * Math::TAU;
 		_lightmap_size_hint.x = MAX(1.0, (_width / texel_size) + padding);
-		float _height = (is_hemisphere ? 1.0 : 0.5) * height * Math_PI; // note, with hemisphere height is our radius, while with a full sphere it is the diameter..
+		float _height = (is_hemisphere ? 1.0 : 0.5) * height * Math::PI; // note, with hemisphere height is our radius, while with a full sphere it is the diameter..
 		_lightmap_size_hint.y = MAX(1.0, (_height / texel_size) + padding);
 
 		set_lightmap_size_hint(_lightmap_size_hint);
@@ -1944,11 +1944,11 @@ void SphereMesh::create_mesh_array(Array &p_arr, float radius, float height, int
 	float scale = height / radius * (is_hemisphere ? 1.0 : 0.5);
 
 	// Only used if we calculate UV2
-	float circumference = radius * Math_TAU;
+	float circumference = radius * Math::TAU;
 	float horizontal_length = circumference + p_uv2_padding;
 	float center_h = 0.5 * circumference / horizontal_length;
 
-	float height_v = scale * Math_PI / ((scale * Math_PI) + p_uv2_padding / radius);
+	float height_v = scale * Math::PI / ((scale * Math::PI) + p_uv2_padding / radius);
 
 	// set our bounding box
 
@@ -1977,8 +1977,8 @@ void SphereMesh::create_mesh_array(Array &p_arr, float radius, float height, int
 			w = 0.0;
 			y = -1.0;
 		} else {
-			w = Math::sin(Math_PI * v);
-			y = Math::cos(Math_PI * v);
+			w = Math::sin(Math::PI * v);
+			y = Math::cos(Math::PI * v);
 		}
 
 		for (i = 0; i <= radial_segments; i++) {
@@ -1989,8 +1989,8 @@ void SphereMesh::create_mesh_array(Array &p_arr, float radius, float height, int
 				x = 0.0;
 				z = 1.0;
 			} else {
-				x = Math::sin(u * Math_TAU);
-				z = Math::cos(u * Math_TAU);
+				x = Math::sin(u * Math::TAU);
+				z = Math::cos(u * Math::TAU);
 			}
 
 			if (is_hemisphere && y < 0.0) {
@@ -2141,9 +2141,9 @@ void TorusMesh::_update_lightmap_size() {
 
 		float radius = (max_radius - min_radius) * 0.5;
 
-		float _width = max_radius * Math_TAU;
+		float _width = max_radius * Math::TAU;
 		_lightmap_size_hint.x = MAX(1.0, (_width / texel_size) + padding);
-		float _height = radius * Math_TAU;
+		float _height = radius * Math::TAU;
 		_lightmap_size_hint.y = MAX(1.0, (_height / texel_size) + padding);
 
 		set_lightmap_size_hint(_lightmap_size_hint);
@@ -2181,23 +2181,23 @@ void TorusMesh::_create_mesh_array(Array &p_arr) const {
 	bool _add_uv2 = get_add_uv2();
 	float _uv2_padding = get_uv2_padding() * texel_size;
 
-	float horizontal_total = max_radius * Math_TAU + _uv2_padding;
-	float max_h = max_radius * Math_TAU / horizontal_total;
-	float delta_h = (max_radius - min_radius) * Math_TAU / horizontal_total;
+	float horizontal_total = max_radius * Math::TAU + _uv2_padding;
+	float max_h = max_radius * Math::TAU / horizontal_total;
+	float delta_h = (max_radius - min_radius) * Math::TAU / horizontal_total;
 
-	float height_v = radius * Math_TAU / (radius * Math_TAU + _uv2_padding);
+	float height_v = radius * Math::TAU / (radius * Math::TAU + _uv2_padding);
 
 	for (int i = 0; i <= rings; i++) {
 		int prevrow = (i - 1) * (ring_segments + 1);
 		int thisrow = i * (ring_segments + 1);
 		float inci = float(i) / rings;
-		float angi = inci * Math_TAU;
+		float angi = inci * Math::TAU;
 
 		Vector2 normali = (i == rings) ? Vector2(0.0, -1.0) : Vector2(-Math::sin(angi), -Math::cos(angi));
 
 		for (int j = 0; j <= ring_segments; j++) {
 			float incj = float(j) / ring_segments;
-			float angj = incj * Math_TAU;
+			float angj = incj * Math::TAU;
 
 			Vector2 normalj = (j == ring_segments) ? Vector2(-1.0, 0.0) : Vector2(-Math::cos(angj), Math::sin(angj));
 			Vector2 normalk = normalj * radius + Vector2(min_radius + radius, 0);
@@ -2486,8 +2486,8 @@ void TubeTrailMesh::_create_mesh_array(Array &p_arr) const {
 			float x = 0.0;
 			float z = 1.0;
 			if (i < radial_steps) {
-				x = Math::sin(u * Math_TAU);
-				z = Math::cos(u * Math_TAU);
+				x = Math::sin(u * Math::TAU);
+				z = Math::cos(u * Math::TAU);
 			}
 
 			Vector3 p = Vector3(x * r, y, z * r);
@@ -2559,8 +2559,8 @@ void TubeTrailMesh::_create_mesh_array(Array &p_arr) const {
 				float x = 0.0;
 				float z = 1.0;
 				if (i < radial_steps) {
-					x = Math::sin(r * Math_TAU);
-					z = Math::cos(r * Math_TAU);
+					x = Math::sin(r * Math::TAU);
+					z = Math::cos(r * Math::TAU);
 				}
 
 				float u = ((x + 1.0) * 0.25);
@@ -2628,8 +2628,8 @@ void TubeTrailMesh::_create_mesh_array(Array &p_arr) const {
 				float x = 0.0;
 				float z = 1.0;
 				if (i < radial_steps) {
-					x = Math::sin(r * Math_TAU);
-					z = Math::cos(r * Math_TAU);
+					x = Math::sin(r * Math::TAU);
+					z = Math::cos(r * Math::TAU);
 				}
 
 				float u = 0.5 + ((x + 1.0) * 0.25);
@@ -2972,7 +2972,7 @@ void TextMesh::_generate_glyph_mesh_data(const GlyphMeshKey &p_key, const Glyph
 	PackedInt32Array contours = d["contours"];
 	bool orientation = d["orientation"];
 
-	if (points.size() < 3 || contours.size() < 1) {
+	if (points.size() < 3 || contours.is_empty()) {
 		return; // No full contours, only glyph control points (or nothing), ignore.
 	}
 
@@ -3105,14 +3105,13 @@ void TextMesh::_generate_glyph_mesh_data(const GlyphMeshKey &p_key, const Glyph
 		ERR_FAIL_MSG("Convex decomposing failed. Make sure the font doesn't contain self-intersecting lines, as these are not supported in TextMesh.");
 	}
 	List<TPPLPoly> out_tris;
-	for (List<TPPLPoly>::Element *I = out_poly.front(); I; I = I->next()) {
-		if (tpart.Triangulate_OPT(&(I->get()), &out_tris) == 0) {
+	for (TPPLPoly &tp : out_poly) {
+		if (tpart.Triangulate_OPT(&tp, &out_tris) == 0) {
 			ERR_FAIL_MSG("Triangulation failed. Make sure the font doesn't contain self-intersecting lines, as these are not supported in TextMesh.");
 		}
 	}
 
-	for (List<TPPLPoly>::Element *I = out_tris.front(); I; I = I->next()) {
-		TPPLPoly &tp = I->get();
+	for (const TPPLPoly &tp : out_tris) {
 		ERR_FAIL_COND(tp.GetNumPoints() != 3); // Triangles only.
 
 		for (int i = 0; i < 3; i++) {
@@ -3249,8 +3248,8 @@ void TextMesh::_create_mesh_array(Array &p_arr) const {
 	Vector<Vector2> uvs;
 	Vector<int32_t> indices;
 
-	Vector2 min_p = Vector2(INFINITY, INFINITY);
-	Vector2 max_p = Vector2(-INFINITY, -INFINITY);
+	Vector2 min_p = Vector2(Math::INF, Math::INF);
+	Vector2 max_p = Vector2(-Math::INF, -Math::INF);
 
 	int32_t p_size = 0;
 	int32_t i_size = 0;
diff --git a/engine/scene/resources/3d/primitive_meshes.h b/engine/scene/resources/3d/primitive_meshes.h
index e68ac7fb..c8262a6d 100644
--- a/engine/scene/resources/3d/primitive_meshes.h
+++ b/engine/scene/resources/3d/primitive_meshes.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PRIMITIVE_MESHES_H
-#define PRIMITIVE_MESHES_H
+#pragma once
 
 #include "scene/resources/font.h"
 #include "scene/resources/mesh.h"
@@ -582,8 +581,8 @@ private:
 		Vector<Vector2> triangles;
 		Vector<Vector<ContourPoint>> contours;
 		Vector<ContourInfo> contours_info;
-		Vector2 min_p = Vector2(INFINITY, INFINITY);
-		Vector2 max_p = Vector2(-INFINITY, -INFINITY);
+		Vector2 min_p = Vector2(Math::INF, Math::INF);
+		Vector2 max_p = Vector2(-Math::INF, -Math::INF);
 	};
 	mutable HashMap<GlyphMeshKey, GlyphMeshData, GlyphMeshKeyHasher> cache;
 
@@ -691,5 +690,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(RibbonTrailMesh::Shape)
-
-#endif // PRIMITIVE_MESHES_H
diff --git a/engine/scene/resources/3d/separation_ray_shape_3d.h b/engine/scene/resources/3d/separation_ray_shape_3d.h
index c1c273c4..43ff0869 100644
--- a/engine/scene/resources/3d/separation_ray_shape_3d.h
+++ b/engine/scene/resources/3d/separation_ray_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SEPARATION_RAY_SHAPE_3D_H
-#define SEPARATION_RAY_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -57,5 +56,3 @@ public:
 
 	SeparationRayShape3D();
 };
-
-#endif // SEPARATION_RAY_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/shape_3d.h b/engine/scene/resources/3d/shape_3d.h
index 96d05e38..8bf5f8d1 100644
--- a/engine/scene/resources/3d/shape_3d.h
+++ b/engine/scene/resources/3d/shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHAPE_3D_H
-#define SHAPE_3D_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -94,5 +93,3 @@ public:
 	Shape3D();
 	~Shape3D();
 };
-
-#endif // SHAPE_3D_H
diff --git a/engine/scene/resources/3d/skin.h b/engine/scene/resources/3d/skin.h
index 5df82066..305d3616 100644
--- a/engine/scene/resources/3d/skin.h
+++ b/engine/scene/resources/3d/skin.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKIN_H
-#define SKIN_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -85,5 +84,3 @@ public:
 
 	Skin();
 };
-
-#endif // SKIN_H
diff --git a/engine/scene/resources/3d/sky_material.cpp b/engine/scene/resources/3d/sky_material.cpp
index 10ef516f..ce56ee28 100644
--- a/engine/scene/resources/3d/sky_material.cpp
+++ b/engine/scene/resources/3d/sky_material.cpp
@@ -276,7 +276,7 @@ void ProceduralSkyMaterial::_update_shader() {
 
 			// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
 			RS::get_singleton()->shader_set_code(shader_cache[i], vformat(R"(
-// NOTE: Shader automatically converted from )" VERSION_NAME " " VERSION_FULL_CONFIG R"('s ProceduralSkyMaterial.
+// NOTE: Shader automatically converted from )" GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG R"('s ProceduralSkyMaterial.
 
 shader_type sky;
 %s
@@ -470,7 +470,7 @@ void PanoramaSkyMaterial::_update_shader() {
 
 			// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
 			RS::get_singleton()->shader_set_code(shader_cache[i], vformat(R"(
-// NOTE: Shader automatically converted from )" VERSION_NAME " " VERSION_FULL_CONFIG R"('s PanoramaSkyMaterial.
+// NOTE: Shader automatically converted from )" GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG R"('s PanoramaSkyMaterial.
 
 shader_type sky;
 
@@ -698,7 +698,7 @@ void PhysicalSkyMaterial::_update_shader() {
 
 			// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
 			RS::get_singleton()->shader_set_code(shader_cache[i], vformat(R"(
-// NOTE: Shader automatically converted from )" VERSION_NAME " " VERSION_FULL_CONFIG R"('s PhysicalSkyMaterial.
+// NOTE: Shader automatically converted from )" GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG R"('s PhysicalSkyMaterial.
 
 shader_type sky;
 %s
diff --git a/engine/scene/resources/3d/sky_material.h b/engine/scene/resources/3d/sky_material.h
index 4ffb18c6..b452f3d5 100644
--- a/engine/scene/resources/3d/sky_material.h
+++ b/engine/scene/resources/3d/sky_material.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKY_MATERIAL_H
-#define SKY_MATERIAL_H
+#pragma once
 
 #include "core/templates/rid.h"
 #include "scene/resources/material.h"
@@ -231,5 +230,3 @@ public:
 	PhysicalSkyMaterial();
 	~PhysicalSkyMaterial();
 };
-
-#endif // SKY_MATERIAL_H
diff --git a/engine/scene/resources/3d/sphere_shape_3d.h b/engine/scene/resources/3d/sphere_shape_3d.h
index cb068528..c42ee35b 100644
--- a/engine/scene/resources/3d/sphere_shape_3d.h
+++ b/engine/scene/resources/3d/sphere_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPHERE_SHAPE_3D_H
-#define SPHERE_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -54,5 +53,3 @@ public:
 
 	SphereShape3D();
 };
-
-#endif // SPHERE_SHAPE_3D_H
diff --git a/engine/scene/resources/3d/world_3d.cpp b/engine/scene/resources/3d/world_3d.cpp
index 5e4c70b6..c6e21421 100644
--- a/engine/scene/resources/3d/world_3d.cpp
+++ b/engine/scene/resources/3d/world_3d.cpp
@@ -45,6 +45,7 @@ void World3D::_remove_camera(Camera3D *p_camera) {
 }
 
 RID World3D::get_space() const {
+#ifndef PHYSICS_3D_DISABLED
 	if (space.is_null()) {
 		space = PhysicsServer3D::get_singleton()->space_create();
 		PhysicsServer3D::get_singleton()->space_set_active(space, true);
@@ -53,6 +54,7 @@ RID World3D::get_space() const {
 		PhysicsServer3D::get_singleton()->area_set_param(space, PhysicsServer3D::AREA_PARAM_LINEAR_DAMP, GLOBAL_GET("physics/3d/default_linear_damp"));
 		PhysicsServer3D::get_singleton()->area_set_param(space, PhysicsServer3D::AREA_PARAM_ANGULAR_DAMP, GLOBAL_GET("physics/3d/default_angular_damp"));
 	}
+#endif // PHYSICS_3D_DISABLED
 	return space;
 }
 
@@ -139,9 +141,11 @@ Ref<Compositor> World3D::get_compositor() const {
 	return compositor;
 }
 
+#ifndef PHYSICS_3D_DISABLED
 PhysicsDirectSpaceState3D *World3D::get_direct_space_state() {
 	return PhysicsServer3D::get_singleton()->space_get_direct_state(get_space());
 }
+#endif // PHYSICS_3D_DISABLED
 
 void World3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_space"), &World3D::get_space);
@@ -153,14 +157,18 @@ void World3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_fallback_environment"), &World3D::get_fallback_environment);
 	ClassDB::bind_method(D_METHOD("set_camera_attributes", "attributes"), &World3D::set_camera_attributes);
 	ClassDB::bind_method(D_METHOD("get_camera_attributes"), &World3D::get_camera_attributes);
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("get_direct_space_state"), &World3D::get_direct_space_state);
+#endif // PHYSICS_3D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_environment", "get_environment");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "fallback_environment", PROPERTY_HINT_RESOURCE_TYPE, "Environment"), "set_fallback_environment", "get_fallback_environment");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "camera_attributes", PROPERTY_HINT_RESOURCE_TYPE, "CameraAttributesPractical,CameraAttributesPhysical"), "set_camera_attributes", "get_camera_attributes");
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_space");
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "navigation_map", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_navigation_map");
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "scenario", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_scenario");
+#ifndef PHYSICS_3D_DISABLED
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState3D", PROPERTY_USAGE_NONE), "", "get_direct_space_state");
+#endif // PHYSICS_3D_DISABLED
 }
 
 World3D::World3D() {
@@ -169,13 +177,17 @@ World3D::World3D() {
 
 World3D::~World3D() {
 	ERR_FAIL_NULL(RenderingServer::get_singleton());
+#ifndef PHYSICS_3D_DISABLED
 	ERR_FAIL_NULL(PhysicsServer3D::get_singleton());
+#endif // PHYSICS_3D_DISABLED
 	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
 
 	RenderingServer::get_singleton()->free(scenario);
+#ifndef PHYSICS_3D_DISABLED
 	if (space.is_valid()) {
 		PhysicsServer3D::get_singleton()->free(space);
 	}
+#endif // PHYSICS_3D_DISABLED
 	if (navigation_map.is_valid()) {
 		NavigationServer3D::get_singleton()->free(navigation_map);
 	}
diff --git a/engine/scene/resources/3d/world_3d.h b/engine/scene/resources/3d/world_3d.h
index 06b06aea..b9e8a4dd 100644
--- a/engine/scene/resources/3d/world_3d.h
+++ b/engine/scene/resources/3d/world_3d.h
@@ -28,14 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WORLD_3D_H
-#define WORLD_3D_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "scene/resources/compositor.h"
 #include "scene/resources/environment.h"
+#ifndef PHYSICS_3D_DISABLED
 #include "servers/physics_server_3d.h"
-#include "servers/rendering_server.h"
+#endif // PHYSICS_3D_DISABLED
 
 class CameraAttributes;
 class Camera3D;
@@ -84,10 +84,10 @@ public:
 
 	_FORCE_INLINE_ const HashSet<Camera3D *> &get_cameras() const { return cameras; }
 
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsDirectSpaceState3D *get_direct_space_state();
+#endif // PHYSICS_3D_DISABLED
 
 	World3D();
 	~World3D();
 };
-
-#endif // WORLD_3D_H
diff --git a/engine/scene/resources/3d/world_boundary_shape_3d.h b/engine/scene/resources/3d/world_boundary_shape_3d.h
index 456316df..632fe54a 100644
--- a/engine/scene/resources/3d/world_boundary_shape_3d.h
+++ b/engine/scene/resources/3d/world_boundary_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WORLD_BOUNDARY_SHAPE_3D_H
-#define WORLD_BOUNDARY_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/shape_3d.h"
 
@@ -56,5 +55,3 @@ public:
 
 	WorldBoundaryShape3D();
 };
-
-#endif // WORLD_BOUNDARY_SHAPE_3D_H
diff --git a/engine/scene/resources/animated_texture.h b/engine/scene/resources/animated_texture.h
index 32384666..29811d32 100644
--- a/engine/scene/resources/animated_texture.h
+++ b/engine/scene/resources/animated_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATED_TEXTURE_H
-#define ANIMATED_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -106,5 +105,3 @@ public:
 	AnimatedTexture();
 	~AnimatedTexture();
 };
-
-#endif // ANIMATED_TEXTURE_H
diff --git a/engine/scene/resources/animation.cpp b/engine/scene/resources/animation.cpp
index 109dceb0..0c1d2f40 100644
--- a/engine/scene/resources/animation.cpp
+++ b/engine/scene/resources/animation.cpp
@@ -464,7 +464,9 @@ bool Animation::_get(const StringName &p_name, Variant &r_ret) const {
 	String prop_name = p_name;
 
 	if (p_name == SNAME("_compression")) {
-		ERR_FAIL_COND_V(!compression.enabled, false);
+		if (!compression.enabled) {
+			return false;
+		}
 		Dictionary comp;
 		comp["fps"] = compression.fps;
 		Array bounds;
@@ -2476,7 +2478,7 @@ Variant Animation::_interpolate_angle(const Variant &p_a, const Variant &p_b, re
 	if (vformat == ((1 << Variant::INT) | (1 << Variant::FLOAT)) || vformat == (1 << Variant::FLOAT)) {
 		real_t a = p_a;
 		real_t b = p_b;
-		return Math::fposmod((float)Math::lerp_angle(a, b, p_c), (float)Math_TAU);
+		return Math::fposmod((float)Math::lerp_angle(a, b, p_c), (float)Math::TAU);
 	}
 	return _interpolate(p_a, p_b, p_c);
 }
@@ -2513,7 +2515,7 @@ Variant Animation::_cubic_interpolate_angle_in_time(const Variant &p_pre_a, cons
 		real_t b = p_b;
 		real_t pa = p_pre_a;
 		real_t pb = p_post_b;
-		return Math::fposmod((float)Math::cubic_interpolate_angle_in_time(a, b, pa, pb, p_c, p_b_t, p_pre_a_t, p_post_b_t), (float)Math_TAU);
+		return Math::fposmod((float)Math::cubic_interpolate_angle_in_time(a, b, pa, pb, p_c, p_b_t, p_pre_a_t, p_post_b_t), (float)Math::TAU);
 	}
 	return _cubic_interpolate_in_time(p_pre_a, p_a, p_b, p_post_b, p_c, p_pre_a_t, p_b_t, p_post_b_t);
 }
@@ -4207,7 +4209,7 @@ bool Animation::_quaternion_track_optimize_key(const TKey<Quaternion> t0, const
 	if (q0.get_axis().dot(q1.get_axis()) >= 1.0 - p_allowed_angular_error * 2.0) {
 		double a0 = Math::acos(t0.value.dot(t1.value));
 		double a1 = Math::acos(t1.value.dot(t2.value));
-		if (a0 + a1 >= Math_PI / 2) {
+		if (a0 + a1 >= Math::PI / 2) {
 			return false; // Rotation is more than 180 deg, keep key.
 		}
 		// Calc velocities.
@@ -4335,7 +4337,7 @@ void Animation::_value_track_optimize(int p_idx, real_t p_allowed_velocity_err,
 	ERR_FAIL_INDEX(p_idx, tracks.size());
 	ERR_FAIL_COND(tracks[p_idx]->type != TYPE_VALUE);
 	ValueTrack *vt = static_cast<ValueTrack *>(tracks[p_idx]);
-	if (vt->values.size() == 0) {
+	if (vt->values.is_empty()) {
 		return;
 	}
 	Variant::Type type = vt->values[0].value.get_type();
@@ -4357,11 +4359,11 @@ void Animation::_value_track_optimize(int p_idx, real_t p_allowed_velocity_err,
 				t1.value = vt->values[i + 1].value;
 				t2.value = vt->values[i + 2].value;
 				if (is_using_angle) {
-					float diff1 = fmod(t1.value - t0.value, Math_TAU);
-					t1.value = t0.value + fmod(2.0 * diff1, Math_TAU) - diff1;
-					float diff2 = fmod(t2.value - t1.value, Math_TAU);
-					t2.value = t1.value + fmod(2.0 * diff2, Math_TAU) - diff2;
-					if (abs(abs(diff1) + abs(diff2)) >= Math_PI) {
+					float diff1 = fmod(t1.value - t0.value, Math::TAU);
+					t1.value = t0.value + fmod(2.0 * diff1, Math::TAU) - diff1;
+					float diff2 = fmod(t2.value - t1.value, Math::TAU);
+					t2.value = t1.value + fmod(2.0 * diff2, Math::TAU) - diff2;
+					if (abs(abs(diff1) + abs(diff2)) >= Math::PI) {
 						break; // Rotation is more than 180 deg, keep key.
 					}
 				}
@@ -4421,8 +4423,8 @@ void Animation::_value_track_optimize(int p_idx, real_t p_allowed_velocity_err,
 				float val_0 = vt->values[0].value;
 				float val_1 = vt->values[1].value;
 				if (is_using_angle) {
-					float diff1 = fmod(val_1 - val_0, Math_TAU);
-					val_1 = val_0 + fmod(2.0 * diff1, Math_TAU) - diff1;
+					float diff1 = fmod(val_1 - val_0, Math::TAU);
+					val_1 = val_0 + fmod(2.0 * diff1, Math::TAU) - diff1;
 				}
 				single_key = abs(val_0 - val_1) < p_allowed_precision_error;
 			} break;
@@ -4507,7 +4509,7 @@ struct AnimationCompressionDataState {
 		if (p_delta == 0) {
 			return 0;
 		} else if (p_delta < 0) {
-			p_delta = ABS(p_delta) - 1;
+			p_delta = Math::abs(p_delta) - 1;
 			if (p_delta == 0) {
 				return 1;
 			}
@@ -4582,7 +4584,7 @@ struct AnimationCompressionDataState {
 	}
 
 	uint32_t get_temp_packet_size() const {
-		if (temp_packets.size() == 0) {
+		if (temp_packets.is_empty()) {
 			return 0;
 		} else if (temp_packets.size() == 1) {
 			return components == 1 ? 4 : 8; // 1 component packet is 16 bits and 16 bits unused. 3 component packets is 48 bits and 16 bits unused
@@ -4624,7 +4626,7 @@ struct AnimationCompressionDataState {
 	}
 
 	void commit_temp_packets() {
-		if (temp_packets.size() == 0) {
+		if (temp_packets.is_empty()) {
 			return; // Nothing to do.
 		}
 //#define DEBUG_PACKET_PUSH
@@ -4689,7 +4691,7 @@ struct AnimationCompressionDataState {
 
 				uint16_t deltau;
 				if (delta < 0) {
-					deltau = (ABS(delta) - 1) | (1 << max_shifts[j]);
+					deltau = (Math::abs(delta) - 1) | (1 << max_shifts[j]);
 				} else {
 					deltau = delta;
 				}
@@ -4754,9 +4756,9 @@ Vector3i Animation::_compress_key(uint32_t p_track, const AABB &p_bounds, int32_
 			}
 			Vector3 axis = rot.get_axis();
 			float angle = rot.get_angle();
-			angle = Math::fposmod(double(angle), double(Math_PI * 2.0));
+			angle = Math::fposmod(double(angle), double(Math::PI * 2.0));
 			Vector2 oct = axis.octahedron_encode();
-			Vector3 rot_norm(oct.x, oct.y, angle / (Math_PI * 2.0)); // high resolution rotation in 0-1 angle.
+			Vector3 rot_norm(oct.x, oct.y, angle / (Math::PI * 2.0)); // high resolution rotation in 0-1 angle.
 
 			for (int j = 0; j < 3; j++) {
 				values[j] = CLAMP(int32_t(rot_norm[j] * 65535.0), 0, 65535);
@@ -4890,7 +4892,7 @@ void Animation::compress(uint32_t p_page_size, uint32_t p_fps, float p_split_tol
 		track_bounds.push_back(bounds);
 	}
 
-	if (tracks_to_compress.size() == 0) {
+	if (tracks_to_compress.is_empty()) {
 		return; //nothing to compress
 	}
 
@@ -5045,7 +5047,7 @@ void Animation::compress(uint32_t p_page_size, uint32_t p_fps, float p_split_tol
 				uint32_t total_page_size = 0;
 
 				for (uint32_t i = 0; i < data_tracks.size(); i++) {
-					if (data_tracks[i].temp_packets.size() == 0 || (data_tracks[i].temp_packets[data_tracks[i].temp_packets.size() - 1].frame) < finalizer_local_frame) {
+					if (data_tracks[i].temp_packets.is_empty() || (data_tracks[i].temp_packets[data_tracks[i].temp_packets.size() - 1].frame) < finalizer_local_frame) {
 						// Add finalizer frame if it makes sense
 						Vector3i values = _compress_key(tracks_to_compress[i], track_bounds[i], -1, page_end_frame * frame_len);
 
@@ -5532,7 +5534,7 @@ int Animation::_get_compressed_key_count(uint32_t p_compressed_track) const {
 
 Quaternion Animation::_uncompress_quaternion(const Vector3i &p_value) const {
 	Vector3 axis = Vector3::octahedron_decode(Vector2(float(p_value.x) / 65535.0, float(p_value.y) / 65535.0));
-	float angle = (float(p_value.z) / 65535.0) * 2.0 * Math_PI;
+	float angle = (float(p_value.z) / 65535.0) * 2.0 * Math::PI;
 	return Quaternion(axis, angle);
 }
 Vector3 Animation::_uncompress_pos_scale(uint32_t p_compressed_track, const Vector3i &p_value) const {
diff --git a/engine/scene/resources/animation.h b/engine/scene/resources/animation.h
index 8d2e8c34..bc6f48bf 100644
--- a/engine/scene/resources/animation.h
+++ b/engine/scene/resources/animation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/templates/local_vector.h"
@@ -44,6 +43,7 @@ public:
 	typedef uint32_t TypeHash;
 
 	static inline String PARAMETERS_BASE_PATH = "parameters/";
+	static inline constexpr real_t DEFAULT_STEP = 1.0 / 30;
 
 	enum TrackType : uint8_t {
 		TYPE_VALUE, // Set a value in a property, can be interpolated.
@@ -281,7 +281,7 @@ private:
 	_FORCE_INLINE_ void _track_get_key_indices_in_range(const Vector<T> &p_array, double from_time, double to_time, List<int> *p_indices, bool p_is_backward) const;
 
 	double length = 1.0;
-	real_t step = 1.0 / 30;
+	real_t step = DEFAULT_STEP;
 	LoopMode loop_mode = LOOP_NONE;
 	bool capture_included = false;
 	void _check_capture_included();
@@ -335,7 +335,7 @@ private:
 	 * data for X / Blend Shape, Y and Z must be normalized first: unorm = float(data) / 65535.0
 	 * **Blend Shape**: (unorm * 2.0 - 1.0) * Compression::BLEND_SHAPE_RANGE
 	 * **Pos/Scale**: unorm_vec3 * bounds[track].size + bounds[track].position
-	 * **Rotation**: Quaternion(Vector3::octahedron_decode(unorm_vec3.xy),unorm_vec3.z * Math_PI * 2.0)
+	 * **Rotation**: Quaternion(Vector3::octahedron_decode(unorm_vec3.xy),unorm_vec3.z * Math::PI * 2.0)
 	 * **Frame**: page.time_offset + frame * (1.0/fps)
 	 */
 
@@ -586,5 +586,3 @@ VARIANT_ENUM_CAST(Animation::FindMode);
 VARIANT_ENUM_CAST(Animation::HandleMode);
 VARIANT_ENUM_CAST(Animation::HandleSetMode);
 #endif // TOOLS_ENABLED
-
-#endif // ANIMATION_H
diff --git a/engine/scene/resources/animation_library.cpp b/engine/scene/resources/animation_library.cpp
index ce350977..a4e81f50 100644
--- a/engine/scene/resources/animation_library.cpp
+++ b/engine/scene/resources/animation_library.cpp
@@ -42,10 +42,8 @@ bool AnimationLibrary::is_valid_library_name(const String &p_name) {
 
 String AnimationLibrary::validate_library_name(const String &p_name) {
 	String name = p_name;
-	const char *characters = "/:,[";
-	for (const char *p = characters; *p; p++) {
-		name = name.replace(String::chr(*p), "_");
-	}
+	static const char *characters = "/:,[";
+	name.replace_chars(characters, '_');
 	return name;
 }
 
@@ -134,10 +132,8 @@ void AnimationLibrary::_set_data(const Dictionary &p_data) {
 		K.value->disconnect_changed(callable_mp(this, &AnimationLibrary::_animation_changed));
 	}
 	animations.clear();
-	List<Variant> keys;
-	p_data.get_key_list(&keys);
-	for (const Variant &K : keys) {
-		add_animation(K, p_data[K]);
+	for (const KeyValue<Variant, Variant> &kv : p_data) {
+		add_animation(kv.key, kv.value);
 	}
 }
 
diff --git a/engine/scene/resources/animation_library.h b/engine/scene/resources/animation_library.h
index 794f1427..33629ef4 100644
--- a/engine/scene/resources/animation_library.h
+++ b/engine/scene/resources/animation_library.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ANIMATION_LIBRARY_H
-#define ANIMATION_LIBRARY_H
+#pragma once
 
 #include "core/variant/typed_array.h"
 #include "scene/resources/animation.h"
@@ -69,5 +68,3 @@ public:
 
 	AnimationLibrary();
 };
-
-#endif // ANIMATION_LIBRARY_H
diff --git a/engine/scene/resources/atlas_texture.h b/engine/scene/resources/atlas_texture.h
index 0246a247..b709b302 100644
--- a/engine/scene/resources/atlas_texture.h
+++ b/engine/scene/resources/atlas_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ATLAS_TEXTURE_H
-#define ATLAS_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -77,5 +76,3 @@ public:
 
 	AtlasTexture();
 };
-
-#endif // ATLAS_TEXTURE_H
diff --git a/engine/scene/resources/audio_stream_polyphonic.h b/engine/scene/resources/audio_stream_polyphonic.h
index 0aea2512..78ddf9e0 100644
--- a/engine/scene/resources/audio_stream_polyphonic.h
+++ b/engine/scene/resources/audio_stream_polyphonic.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_POLYPHONIC_H
-#define AUDIO_STREAM_POLYPHONIC_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/scene_string_names.h"
@@ -134,5 +133,3 @@ private:
 public:
 	AudioStreamPlaybackPolyphonic();
 };
-
-#endif // AUDIO_STREAM_POLYPHONIC_H
diff --git a/engine/scene/resources/audio_stream_wav.cpp b/engine/scene/resources/audio_stream_wav.cpp
index 29ff142f..9e262eea 100644
--- a/engine/scene/resources/audio_stream_wav.cpp
+++ b/engine/scene/resources/audio_stream_wav.cpp
@@ -56,6 +56,7 @@ void AudioStreamPlaybackWAV::start(double p_from_pos) {
 
 	sign = 1;
 	active = true;
+	begin_resample();
 }
 
 void AudioStreamPlaybackWAV::stop() {
@@ -71,7 +72,7 @@ int AudioStreamPlaybackWAV::get_loop_count() const {
 }
 
 double AudioStreamPlaybackWAV::get_playback_position() const {
-	return float(offset >> MIX_FRAC_BITS) / base->mix_rate;
+	return double(offset) / base->mix_rate;
 }
 
 void AudioStreamPlaybackWAV::seek(double p_time) {
@@ -86,20 +87,17 @@ void AudioStreamPlaybackWAV::seek(double p_time) {
 		p_time = max - 0.001;
 	}
 
-	offset = uint64_t(p_time * base->mix_rate) << MIX_FRAC_BITS;
+	offset = int64_t(p_time * base->mix_rate);
 }
 
 template <typename Depth, bool is_stereo, bool is_ima_adpcm, bool is_qoa>
-void AudioStreamPlaybackWAV::do_resample(const Depth *p_src, AudioFrame *p_dst, int64_t &p_offset, int32_t &p_increment, uint32_t p_amount, IMA_ADPCM_State *p_ima_adpcm, QOA_State *p_qoa) {
+void AudioStreamPlaybackWAV::decode_samples(const Depth *p_src, AudioFrame *p_dst, int64_t &p_offset, int8_t &p_increment, uint32_t p_amount, IMA_ADPCM_State *p_ima_adpcm, QOA_State *p_qoa) {
 	// this function will be compiled branchless by any decent compiler
 
-	int32_t final = 0, final_r = 0, next = 0, next_r = 0;
+	int32_t final = 0, final_r = 0;
 	while (p_amount) {
 		p_amount--;
-		int64_t pos = p_offset >> MIX_FRAC_BITS;
-		if (is_stereo && !is_ima_adpcm && !is_qoa) {
-			pos <<= 1;
-		}
+		int64_t pos = p_offset << (is_stereo && !is_ima_adpcm && !is_qoa ? 1 : 0);
 
 		if (is_ima_adpcm) {
 			int64_t sample_pos = pos + p_ima_adpcm[0].window_ofs;
@@ -175,82 +173,32 @@ void AudioStreamPlaybackWAV::do_resample(const Depth *p_src, AudioFrame *p_dst,
 				final_r = p_ima_adpcm[1].predictor;
 			}
 
-		} else {
-			if (is_qoa) {
-				if (pos != p_qoa->cache_pos) { // Prevents triple decoding on lower mix rates.
-					for (int i = 0; i < 2; i++) {
-						// Sign operations prevent triple decoding on backward loops, maxing prevents pop.
-						uint32_t interp_pos = MIN(pos + (i * sign) + (sign < 0), p_qoa->desc.samples - 1);
-						uint32_t new_data_ofs = 8 + interp_pos / QOA_FRAME_LEN * p_qoa->frame_len;
+		} else if (is_qoa) {
+			uint32_t new_data_ofs = 8 + pos / QOA_FRAME_LEN * p_qoa->frame_len;
 
-						if (p_qoa->data_ofs != new_data_ofs) {
-							p_qoa->data_ofs = new_data_ofs;
-							const uint8_t *ofs_src = (uint8_t *)p_src + p_qoa->data_ofs;
-							qoa_decode_frame(ofs_src, p_qoa->frame_len, &p_qoa->desc, p_qoa->dec.ptr(), &p_qoa->dec_len);
-						}
-
-						uint32_t dec_idx = (interp_pos % QOA_FRAME_LEN) * p_qoa->desc.channels;
-
-						if ((sign > 0 && i == 0) || (sign < 0 && i == 1)) {
-							final = p_qoa->dec[dec_idx];
-							p_qoa->cache[0] = final;
-							if (is_stereo) {
-								final_r = p_qoa->dec[dec_idx + 1];
-								p_qoa->cache_r[0] = final_r;
-							}
-						} else {
-							next = p_qoa->dec[dec_idx];
-							p_qoa->cache[1] = next;
-							if (is_stereo) {
-								next_r = p_qoa->dec[dec_idx + 1];
-								p_qoa->cache_r[1] = next_r;
-							}
-						}
-					}
-					p_qoa->cache_pos = pos;
-				} else {
-					final = p_qoa->cache[0];
-					if (is_stereo) {
-						final_r = p_qoa->cache_r[0];
-					}
-
-					next = p_qoa->cache[1];
-					if (is_stereo) {
-						next_r = p_qoa->cache_r[1];
-					}
-				}
-			} else {
-				final = p_src[pos];
-				if (is_stereo) {
-					final_r = p_src[pos + 1];
-				}
-
-				if constexpr (sizeof(Depth) == 1) { /* conditions will not exist anymore when compiled! */
-					final <<= 8;
-					if (is_stereo) {
-						final_r <<= 8;
-					}
-				}
-
-				if (is_stereo) {
-					next = p_src[pos + 2];
-					next_r = p_src[pos + 3];
-				} else {
-					next = p_src[pos + 1];
-				}
-
-				if constexpr (sizeof(Depth) == 1) {
-					next <<= 8;
-					if (is_stereo) {
-						next_r <<= 8;
-					}
-				}
+			if (p_qoa->data_ofs != new_data_ofs) {
+				p_qoa->data_ofs = new_data_ofs;
+				const uint8_t *ofs_src = (uint8_t *)p_src + p_qoa->data_ofs;
+				qoa_decode_frame(ofs_src, p_qoa->frame_len, &p_qoa->desc, p_qoa->dec.ptr(), &p_qoa->dec_len);
 			}
-			int32_t frac = int64_t(p_offset & MIX_FRAC_MASK);
 
-			final = final + ((next - final) * frac >> MIX_FRAC_BITS);
+			uint32_t dec_idx = pos % QOA_FRAME_LEN << (is_stereo ? 1 : 0);
+
+			final = p_qoa->dec[dec_idx];
 			if (is_stereo) {
-				final_r = final_r + ((next_r - final_r) * frac >> MIX_FRAC_BITS);
+				final_r = p_qoa->dec[dec_idx + 1];
+			}
+
+		} else {
+			final = p_src[pos];
+			if (is_stereo) {
+				final_r = p_src[pos + 1];
+			}
+			if constexpr (sizeof(Depth) == 1) { /* conditions will not exist anymore when compiled! */
+				final <<= 8;
+				if (is_stereo) {
+					final_r <<= 8;
+				}
 			}
 		}
 
@@ -266,7 +214,7 @@ void AudioStreamPlaybackWAV::do_resample(const Depth *p_src, AudioFrame *p_dst,
 	}
 }
 
-int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
+int AudioStreamPlaybackWAV::_mix_internal(AudioFrame *p_buffer, int p_frames) {
 	if (base->data.is_empty() || !active) {
 		for (int i = 0; i < p_frames; i++) {
 			p_buffer[i] = AudioFrame(0, 0);
@@ -274,7 +222,7 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 		return 0;
 	}
 
-	int len = base->data_bytes;
+	uint32_t len = base->data_bytes;
 	switch (base->format) {
 		case AudioStreamWAV::FORMAT_8_BITS:
 			len /= 1;
@@ -294,13 +242,10 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 		len /= 2;
 	}
 
-	/* some 64-bit fixed point precaches */
-
-	int64_t loop_begin_fp = ((int64_t)base->loop_begin << MIX_FRAC_BITS);
-	int64_t loop_end_fp = ((int64_t)base->loop_end << MIX_FRAC_BITS);
-	int64_t length_fp = ((int64_t)len << MIX_FRAC_BITS);
-	int64_t begin_limit = (base->loop_mode != AudioStreamWAV::LOOP_DISABLED) ? loop_begin_fp : 0;
-	int64_t end_limit = (base->loop_mode != AudioStreamWAV::LOOP_DISABLED) ? loop_end_fp : length_fp - MIX_FRAC_LEN;
+	int64_t loop_begin = base->loop_begin;
+	int64_t loop_end = base->loop_end;
+	int64_t begin_limit = (base->loop_mode != AudioStreamWAV::LOOP_DISABLED) ? loop_begin : 0;
+	int64_t end_limit = (base->loop_mode != AudioStreamWAV::LOOP_DISABLED) ? loop_end : len - 1;
 	bool is_stereo = base->stereo;
 
 	int32_t todo = p_frames;
@@ -309,13 +254,7 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 		sign = -1;
 	}
 
-	float base_rate = AudioServer::get_singleton()->get_mix_rate();
-	float srate = base->mix_rate;
-	srate *= p_rate_scale;
-	float playback_speed_scale = AudioServer::get_singleton()->get_playback_speed_scale();
-	float fincrement = (srate * playback_speed_scale) / base_rate;
-	int32_t increment = int32_t(MAX(fincrement * MIX_FRAC_LEN, 1));
-	increment *= sign;
+	int8_t increment = sign;
 
 	//looping
 
@@ -324,13 +263,13 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 
 	/* audio data */
 
-	const uint8_t *data = base->data.ptr() + AudioStreamWAV::DATA_PAD;
+	const uint8_t *data = base->data.ptr();
 	AudioFrame *dst_buff = p_buffer;
 
 	if (format == AudioStreamWAV::FORMAT_IMA_ADPCM) {
 		if (loop_format != AudioStreamWAV::LOOP_DISABLED) {
-			ima_adpcm[0].loop_pos = loop_begin_fp >> MIX_FRAC_BITS;
-			ima_adpcm[1].loop_pos = loop_begin_fp >> MIX_FRAC_BITS;
+			ima_adpcm[0].loop_pos = loop_begin;
+			ima_adpcm[1].loop_pos = loop_begin;
 			loop_format = AudioStreamWAV::LOOP_FORWARD;
 		}
 	}
@@ -344,16 +283,16 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 		if (increment < 0) {
 			/* going backwards */
 
-			if (loop_format != AudioStreamWAV::LOOP_DISABLED && offset < loop_begin_fp) {
+			if (loop_format != AudioStreamWAV::LOOP_DISABLED && offset < loop_begin) {
 				/* loopstart reached */
 				if (loop_format == AudioStreamWAV::LOOP_PINGPONG) {
 					/* bounce ping pong */
-					offset = loop_begin_fp + (loop_begin_fp - offset);
+					offset = loop_begin + (loop_begin - offset);
 					increment = -increment;
 					sign *= -1;
 				} else {
 					/* go to loop-end */
-					offset = loop_end_fp - (loop_begin_fp - offset);
+					offset = loop_end - (loop_begin - offset);
 				}
 			} else {
 				/* check for sample not reaching beginning */
@@ -364,12 +303,12 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 			}
 		} else {
 			/* going forward */
-			if (loop_format != AudioStreamWAV::LOOP_DISABLED && offset >= loop_end_fp) {
+			if (loop_format != AudioStreamWAV::LOOP_DISABLED && offset >= loop_end) {
 				/* loopend reached */
 
 				if (loop_format == AudioStreamWAV::LOOP_PINGPONG) {
 					/* bounce ping pong */
-					offset = loop_end_fp - (offset - loop_end_fp);
+					offset = loop_end - (offset - loop_end);
 					increment = -increment;
 					sign *= -1;
 				} else {
@@ -379,16 +318,16 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 						for (int i = 0; i < 2; i++) {
 							ima_adpcm[i].step_index = ima_adpcm[i].loop_step_index;
 							ima_adpcm[i].predictor = ima_adpcm[i].loop_predictor;
-							ima_adpcm[i].last_nibble = loop_begin_fp >> MIX_FRAC_BITS;
+							ima_adpcm[i].last_nibble = loop_begin;
 						}
-						offset = loop_begin_fp;
+						offset = loop_begin;
 					} else {
-						offset = loop_begin_fp + (offset - loop_end_fp);
+						offset = loop_begin + (offset - loop_end);
 					}
 				}
 			} else {
 				/* no loop, check for end of sample */
-				if (offset >= length_fp) {
+				if (offset >= len) {
 					active = false;
 					break;
 				}
@@ -415,32 +354,32 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 		switch (base->format) {
 			case AudioStreamWAV::FORMAT_8_BITS: {
 				if (is_stereo) {
-					do_resample<int8_t, true, false, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<int8_t, true, false, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				} else {
-					do_resample<int8_t, false, false, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<int8_t, false, false, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				}
 			} break;
 			case AudioStreamWAV::FORMAT_16_BITS: {
 				if (is_stereo) {
-					do_resample<int16_t, true, false, false>((int16_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<int16_t, true, false, false>((int16_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				} else {
-					do_resample<int16_t, false, false, false>((int16_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<int16_t, false, false, false>((int16_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				}
 
 			} break;
 			case AudioStreamWAV::FORMAT_IMA_ADPCM: {
 				if (is_stereo) {
-					do_resample<int8_t, true, true, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<int8_t, true, true, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				} else {
-					do_resample<int8_t, false, true, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<int8_t, false, true, false>((int8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				}
 
 			} break;
 			case AudioStreamWAV::FORMAT_QOA: {
 				if (is_stereo) {
-					do_resample<uint8_t, true, false, true>((uint8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<uint8_t, true, false, true>((uint8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				} else {
-					do_resample<uint8_t, false, false, true>((uint8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
+					decode_samples<uint8_t, false, false, true>((uint8_t *)data, dst_buff, offset, increment, target, ima_adpcm, &qoa);
 				}
 			} break;
 		}
@@ -460,6 +399,10 @@ int AudioStreamPlaybackWAV::mix(AudioFrame *p_buffer, float p_rate_scale, int p_
 	return p_frames;
 }
 
+float AudioStreamPlaybackWAV::get_stream_sampling_rate() {
+	return base->mix_rate;
+}
+
 void AudioStreamPlaybackWAV::tag_used_streams() {
 	base->tag_used(get_playback_position());
 }
@@ -552,7 +495,7 @@ double AudioStreamWAV::get_length() const {
 			break;
 		case AudioStreamWAV::FORMAT_QOA:
 			qoa_desc desc = {};
-			qoa_decode_header(data.ptr() + DATA_PAD, data_bytes, &desc);
+			qoa_decode_header(data.ptr(), data_bytes, &desc);
 			len = desc.samples * desc.channels;
 			break;
 	}
@@ -571,28 +514,14 @@ bool AudioStreamWAV::is_monophonic() const {
 void AudioStreamWAV::set_data(const Vector<uint8_t> &p_data) {
 	AudioServer::get_singleton()->lock();
 
-	int src_data_len = p_data.size();
-
-	data.clear();
-
-	int alloc_len = src_data_len + DATA_PAD * 2;
-	data.resize(alloc_len);
-	memset(data.ptr(), 0, alloc_len);
-	memcpy(data.ptr() + DATA_PAD, p_data.ptr(), src_data_len);
-	data_bytes = src_data_len;
+	data = p_data;
+	data_bytes = p_data.size();
 
 	AudioServer::get_singleton()->unlock();
 }
 
 Vector<uint8_t> AudioStreamWAV::get_data() const {
-	Vector<uint8_t> pv;
-
-	if (data_bytes) {
-		pv.resize(data_bytes);
-		memcpy(pv.ptrw(), data.ptr() + DATA_PAD, data_bytes);
-	}
-
-	return pv;
+	return data;
 }
 
 Error AudioStreamWAV::save_to_wav(const String &p_path) {
@@ -681,7 +610,7 @@ Ref<AudioStreamPlayback> AudioStreamWAV::instantiate_playback() {
 	sample->base = Ref<AudioStreamWAV>(this);
 
 	if (format == AudioStreamWAV::FORMAT_QOA) {
-		uint32_t ffp = qoa_decode_header(data.ptr() + DATA_PAD, data_bytes, &sample->qoa.desc);
+		uint32_t ffp = qoa_decode_header(data.ptr(), data_bytes, &sample->qoa.desc);
 		ERR_FAIL_COND_V(ffp != 8, Ref<AudioStreamPlaybackWAV>());
 		sample->qoa.frame_len = qoa_max_frame_size(&sample->qoa.desc);
 		int samples_len = (sample->qoa.desc.samples > QOA_FRAME_LEN ? QOA_FRAME_LEN : sample->qoa.desc.samples);
diff --git a/engine/scene/resources/audio_stream_wav.h b/engine/scene/resources/audio_stream_wav.h
index cd4e4319..41055ed9 100644
--- a/engine/scene/resources/audio_stream_wav.h
+++ b/engine/scene/resources/audio_stream_wav.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_WAV_H
-#define AUDIO_STREAM_WAV_H
+#pragma once
 
 #include "servers/audio/audio_stream.h"
 
@@ -37,13 +36,8 @@
 
 class AudioStreamWAV;
 
-class AudioStreamPlaybackWAV : public AudioStreamPlayback {
-	GDCLASS(AudioStreamPlaybackWAV, AudioStreamPlayback);
-	enum {
-		MIX_FRAC_BITS = 13,
-		MIX_FRAC_LEN = (1 << MIX_FRAC_BITS),
-		MIX_FRAC_MASK = MIX_FRAC_LEN - 1,
-	};
+class AudioStreamPlaybackWAV : public AudioStreamPlaybackResampled {
+	GDCLASS(AudioStreamPlaybackWAV, AudioStreamPlaybackResampled);
 
 	struct IMA_ADPCM_State {
 		int16_t step_index = 0;
@@ -62,23 +56,24 @@ class AudioStreamPlaybackWAV : public AudioStreamPlayback {
 		uint32_t frame_len = 0;
 		LocalVector<int16_t> dec;
 		uint32_t dec_len = 0;
-		int64_t cache_pos = -1;
-		int16_t cache[2] = { 0, 0 };
-		int16_t cache_r[2] = { 0, 0 };
 	} qoa;
 
 	int64_t offset = 0;
-	int sign = 1;
+	int8_t sign = 1;
 	bool active = false;
 	friend class AudioStreamWAV;
 	Ref<AudioStreamWAV> base;
 
 	template <typename Depth, bool is_stereo, bool is_ima_adpcm, bool is_qoa>
-	void do_resample(const Depth *p_src, AudioFrame *p_dst, int64_t &p_offset, int32_t &p_increment, uint32_t p_amount, IMA_ADPCM_State *p_ima_adpcm, QOA_State *p_qoa);
+	void decode_samples(const Depth *p_src, AudioFrame *p_dst, int64_t &p_offset, int8_t &p_increment, uint32_t p_amount, IMA_ADPCM_State *p_ima_adpcm, QOA_State *p_qoa);
 
 	bool _is_sample = false;
 	Ref<AudioSamplePlayback> sample_playback;
 
+protected:
+	virtual int _mix_internal(AudioFrame *p_buffer, int p_frames) override;
+	virtual float get_stream_sampling_rate() override;
+
 public:
 	virtual void start(double p_from_pos = 0.0) override;
 	virtual void stop() override;
@@ -89,8 +84,6 @@ public:
 	virtual double get_playback_position() const override;
 	virtual void seek(double p_time) override;
 
-	virtual int mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
-
 	virtual void tag_used_streams() override;
 
 	virtual void set_is_sample(bool p_is_sample) override;
@@ -125,10 +118,6 @@ public:
 private:
 	friend class AudioStreamPlaybackWAV;
 
-	enum {
-		DATA_PAD = 16 //padding for interpolation
-	};
-
 	Format format = FORMAT_8_BITS;
 	LoopMode loop_mode = LOOP_DISABLED;
 	bool stereo = false;
@@ -305,5 +294,3 @@ public:
 
 VARIANT_ENUM_CAST(AudioStreamWAV::Format)
 VARIANT_ENUM_CAST(AudioStreamWAV::LoopMode)
-
-#endif // AUDIO_STREAM_WAV_H
diff --git a/engine/scene/resources/bit_map.cpp b/engine/scene/resources/bit_map.cpp
index a2222f8d..29e4fcb5 100644
--- a/engine/scene/resources/bit_map.cpp
+++ b/engine/scene/resources/bit_map.cpp
@@ -523,7 +523,6 @@ static void fill_bits(const BitMap *p_src, Ref<BitMap> &p_map, const Point2i &p_
 Vector<Vector<Vector2>> BitMap::clip_opaque_to_polygons(const Rect2i &p_rect, float p_epsilon) const {
 	Rect2i r = Rect2i(0, 0, width, height).intersection(p_rect);
 
-	Point2i from;
 	Ref<BitMap> fill;
 	fill.instantiate();
 	fill->create(get_size());
diff --git a/engine/scene/resources/bit_map.h b/engine/scene/resources/bit_map.h
index 771eb327..58ea999b 100644
--- a/engine/scene/resources/bit_map.h
+++ b/engine/scene/resources/bit_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BIT_MAP_H
-#define BIT_MAP_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/io/resource.h"
@@ -80,5 +79,3 @@ public:
 
 	BitMap();
 };
-
-#endif // BIT_MAP_H
diff --git a/engine/scene/resources/bone_map.h b/engine/scene/resources/bone_map.h
index fbd2f92d..0f6ee21d 100644
--- a/engine/scene/resources/bone_map.h
+++ b/engine/scene/resources/bone_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BONE_MAP_H
-#define BONE_MAP_H
+#pragma once
 
 #include "skeleton_profile.h"
 
@@ -64,5 +63,3 @@ public:
 	BoneMap();
 	~BoneMap();
 };
-
-#endif // BONE_MAP_H
diff --git a/engine/scene/resources/camera_attributes.h b/engine/scene/resources/camera_attributes.h
index de57b0ce..1dc70f15 100644
--- a/engine/scene/resources/camera_attributes.h
+++ b/engine/scene/resources/camera_attributes.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_ATTRIBUTES_H
-#define CAMERA_ATTRIBUTES_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/templates/rid.h"
@@ -179,5 +178,3 @@ public:
 	CameraAttributesPhysical();
 	~CameraAttributesPhysical();
 };
-
-#endif // CAMERA_ATTRIBUTES_H
diff --git a/engine/scene/resources/camera_texture.cpp b/engine/scene/resources/camera_texture.cpp
index b219f89e..2e0175b2 100644
--- a/engine/scene/resources/camera_texture.cpp
+++ b/engine/scene/resources/camera_texture.cpp
@@ -45,6 +45,7 @@ void CameraTexture::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "camera_feed_id"), "set_camera_feed_id", "get_camera_feed_id");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "which_feed"), "set_which_feed", "get_which_feed");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "camera_is_active"), "set_camera_active", "get_camera_active");
+	ADD_PROPERTY_DEFAULT("camera_is_active", false);
 }
 
 void CameraTexture::_on_format_changed() {
diff --git a/engine/scene/resources/camera_texture.h b/engine/scene/resources/camera_texture.h
index dd216a72..0e91e71b 100644
--- a/engine/scene/resources/camera_texture.h
+++ b/engine/scene/resources/camera_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_TEXTURE_H
-#define CAMERA_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -65,5 +64,3 @@ public:
 	CameraTexture();
 	~CameraTexture();
 };
-
-#endif // CAMERA_TEXTURE_H
diff --git a/engine/scene/resources/canvas_item_material.cpp b/engine/scene/resources/canvas_item_material.cpp
index 91ce9704..332773ba 100644
--- a/engine/scene/resources/canvas_item_material.cpp
+++ b/engine/scene/resources/canvas_item_material.cpp
@@ -78,7 +78,7 @@ void CanvasItemMaterial::_update_shader() {
 	//must create a shader!
 
 	// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
-	String code = "// NOTE: Shader automatically converted from " VERSION_NAME " " VERSION_FULL_CONFIG "'s CanvasItemMaterial.\n\n";
+	String code = "// NOTE: Shader automatically converted from " GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG "'s CanvasItemMaterial.\n\n";
 
 	code += "shader_type canvas_item;\nrender_mode ";
 	switch (blend_mode) {
diff --git a/engine/scene/resources/canvas_item_material.h b/engine/scene/resources/canvas_item_material.h
index ef498c2f..298b4018 100644
--- a/engine/scene/resources/canvas_item_material.h
+++ b/engine/scene/resources/canvas_item_material.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CANVAS_ITEM_MATERIAL_H
-#define CANVAS_ITEM_MATERIAL_H
+#pragma once
 
 #include "scene/resources/material.h"
 
@@ -149,5 +148,3 @@ public:
 
 VARIANT_ENUM_CAST(CanvasItemMaterial::BlendMode)
 VARIANT_ENUM_CAST(CanvasItemMaterial::LightMode)
-
-#endif // CANVAS_ITEM_MATERIAL_H
diff --git a/engine/scene/resources/color_palette.h b/engine/scene/resources/color_palette.h
index 13c5e4bf..c55f9f86 100644
--- a/engine/scene/resources/color_palette.h
+++ b/engine/scene/resources/color_palette.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COLOR_PALETTE_H
-#define COLOR_PALETTE_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -46,5 +45,3 @@ public:
 	void set_colors(const PackedColorArray &p_colors);
 	PackedColorArray get_colors() const;
 };
-
-#endif // COLOR_PALETTE_H
diff --git a/engine/scene/resources/compositor.h b/engine/scene/resources/compositor.h
index e7d56878..547970c0 100644
--- a/engine/scene/resources/compositor.h
+++ b/engine/scene/resources/compositor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COMPOSITOR_H
-#define COMPOSITOR_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -123,5 +122,3 @@ public:
 	void set_compositor_effects(const TypedArray<CompositorEffect> &p_compositor_effects);
 	TypedArray<CompositorEffect> get_compositor_effects() const;
 };
-
-#endif // COMPOSITOR_H
diff --git a/engine/scene/resources/compressed_texture.h b/engine/scene/resources/compressed_texture.h
index 0c5dcd5c..2bec5630 100644
--- a/engine/scene/resources/compressed_texture.h
+++ b/engine/scene/resources/compressed_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COMPRESSED_TEXTURE_H
-#define COMPRESSED_TEXTURE_H
+#pragma once
 
 #include "core/io/resource_loader.h"
 #include "scene/resources/texture.h"
@@ -270,5 +269,3 @@ public:
 	virtual bool handles_type(const String &p_type) const override;
 	virtual String get_resource_type(const String &p_path) const override;
 };
-
-#endif // COMPRESSED_TEXTURE_H
diff --git a/engine/scene/resources/curve.cpp b/engine/scene/resources/curve.cpp
index e982e4d1..f0917d44 100644
--- a/engine/scene/resources/curve.cpp
+++ b/engine/scene/resources/curve.cpp
@@ -56,7 +56,7 @@ void Curve::set_point_count(int p_count) {
 	notify_property_list_changed();
 }
 
-int Curve::_add_point(Vector2 p_position, real_t p_left_tangent, real_t p_right_tangent, TangentMode p_left_mode, TangentMode p_right_mode) {
+int Curve::_add_point(Vector2 p_position, real_t p_left_tangent, real_t p_right_tangent, TangentMode p_left_mode, TangentMode p_right_mode, bool p_mark_dirty) {
 	// Add a point and preserve order.
 
 	// Points must remain within the given value and domain ranges.
@@ -65,7 +65,7 @@ int Curve::_add_point(Vector2 p_position, real_t p_left_tangent, real_t p_right_
 
 	int ret = -1;
 
-	if (_points.size() == 0) {
+	if (_points.is_empty()) {
 		_points.push_back(Point(p_position, p_left_tangent, p_right_tangent, p_left_mode, p_right_mode));
 		ret = 0;
 
@@ -99,7 +99,9 @@ int Curve::_add_point(Vector2 p_position, real_t p_left_tangent, real_t p_right_
 
 	update_auto_tangents(ret);
 
-	mark_dirty();
+	if (p_mark_dirty) {
+		mark_dirty();
+	}
 
 	return ret;
 }
@@ -221,10 +223,12 @@ Curve::TangentMode Curve::get_point_right_mode(int p_index) const {
 	return _points[p_index].right_mode;
 }
 
-void Curve::_remove_point(int p_index) {
+void Curve::_remove_point(int p_index, bool p_mark_dirty) {
 	ERR_FAIL_UNSIGNED_INDEX((uint32_t)p_index, _points.size());
 	_points.remove_at(p_index);
-	mark_dirty();
+	if (p_mark_dirty) {
+		mark_dirty();
+	}
 }
 
 void Curve::remove_point(int p_index) {
@@ -252,16 +256,13 @@ void Curve::set_point_value(int p_index, real_t p_position) {
 int Curve::set_point_offset(int p_index, real_t p_offset) {
 	ERR_FAIL_UNSIGNED_INDEX_V((uint32_t)p_index, _points.size(), -1);
 	Point p = _points[p_index];
-	_remove_point(p_index);
-	int i = _add_point(Vector2(p_offset, p.position.y));
-	_points[i].left_tangent = p.left_tangent;
-	_points[i].right_tangent = p.right_tangent;
-	_points[i].left_mode = p.left_mode;
-	_points[i].right_mode = p.right_mode;
+	_remove_point(p_index, false);
+	int i = _add_point(Vector2(p_offset, p.position.y), p.left_tangent, p.right_tangent, p.left_mode, p.right_mode, false);
 	if (p_index != i) {
 		update_auto_tangents(p_index);
 	}
 	update_auto_tangents(i);
+	mark_dirty();
 	return i;
 }
 
@@ -376,7 +377,7 @@ void Curve::set_max_domain(real_t p_max) {
 }
 
 real_t Curve::sample(real_t p_offset) const {
-	if (_points.size() == 0) {
+	if (_points.is_empty()) {
 		return 0;
 	}
 	if (_points.size() == 1) {
@@ -538,8 +539,8 @@ real_t Curve::sample_baked(real_t p_offset) const {
 	}
 
 	// Special cases if the cache is too small.
-	if (_baked_cache.size() == 0) {
-		if (_points.size() == 0) {
+	if (_baked_cache.is_empty()) {
+		if (_points.is_empty()) {
 			return 0;
 		}
 		return _points[0].position.y;
@@ -568,7 +569,7 @@ real_t Curve::sample_baked(real_t p_offset) const {
 }
 
 void Curve::ensure_default_setup(real_t p_min, real_t p_max) {
-	if (_points.size() == 0 && _min_value == 0 && _max_value == 1) {
+	if (_points.is_empty() && _min_value == 0 && _max_value == 1) {
 		add_point(Vector2(0, 1));
 		add_point(Vector2(1, 1));
 		set_min_value(p_min);
@@ -880,12 +881,22 @@ void Curve2D::_bake_segment2d_even_length(RBMap<real_t, Vector2> &r_bake, real_t
 
 Vector2 Curve2D::_calculate_tangent(const Vector2 &p_begin, const Vector2 &p_control_1, const Vector2 &p_control_2, const Vector2 &p_end, const real_t p_t) {
 	// Handle corner cases.
-	if (Math::is_zero_approx(p_t - 0.0f) && p_control_1.is_equal_approx(p_begin)) {
-		return (p_end - p_begin).normalized();
-	}
-
-	if (Math::is_zero_approx(p_t - 1.0f) && p_control_2.is_equal_approx(p_end)) {
-		return (p_end - p_begin).normalized();
+	if (Math::is_zero_approx(p_t - 0.0f)) {
+		if (p_control_1.is_equal_approx(p_begin)) {
+			if (p_control_1.is_equal_approx(p_control_2)) {
+				return (p_end - p_begin).normalized();
+			} else {
+				return (p_control_2 - p_begin).normalized();
+			}
+		}
+	} else if (Math::is_zero_approx(p_t - 1.0f)) {
+		if (p_control_2.is_equal_approx(p_end)) {
+			if (p_control_2.is_equal_approx(p_control_1)) {
+				return (p_end - p_begin).normalized();
+			} else {
+				return (p_end - p_control_1).normalized();
+			}
+		}
 	}
 
 	return p_begin.bezier_derivative(p_control_1, p_control_2, p_end, p_t).normalized();
@@ -899,7 +910,7 @@ void Curve2D::_bake() const {
 	baked_max_ofs = 0;
 	baked_cache_dirty = false;
 
-	if (points.size() == 0) {
+	if (points.is_empty()) {
 		baked_point_cache.clear();
 		baked_dist_cache.clear();
 		baked_forward_vector_cache.clear();
@@ -1248,7 +1259,7 @@ void Curve2D::_set_data(const Dictionary &p_data) {
 PackedVector2Array Curve2D::tessellate(int p_max_stages, real_t p_tolerance) const {
 	PackedVector2Array tess;
 
-	if (points.size() == 0) {
+	if (points.is_empty()) {
 		return tess;
 	}
 
@@ -1298,7 +1309,7 @@ PackedVector2Array Curve2D::tessellate_even_length(int p_max_stages, real_t p_le
 	PackedVector2Array tess;
 
 	Vector<RBMap<real_t, Vector2>> midpoints = _tessellate_even_length(p_max_stages, p_length);
-	if (midpoints.size() == 0) {
+	if (midpoints.is_empty()) {
 		return tess;
 	}
 
@@ -1619,12 +1630,22 @@ void Curve3D::_bake_segment3d_even_length(RBMap<real_t, Vector3> &r_bake, real_t
 
 Vector3 Curve3D::_calculate_tangent(const Vector3 &p_begin, const Vector3 &p_control_1, const Vector3 &p_control_2, const Vector3 &p_end, const real_t p_t) {
 	// Handle corner cases.
-	if (Math::is_zero_approx(p_t - 0.0f) && p_control_1.is_equal_approx(p_begin)) {
-		return (p_end - p_begin).normalized();
-	}
-
-	if (Math::is_zero_approx(p_t - 1.0f) && p_control_2.is_equal_approx(p_end)) {
-		return (p_end - p_begin).normalized();
+	if (Math::is_zero_approx(p_t - 0.0f)) {
+		if (p_control_1.is_equal_approx(p_begin)) {
+			if (p_control_1.is_equal_approx(p_control_2)) {
+				return (p_end - p_begin).normalized();
+			} else {
+				return (p_control_2 - p_begin).normalized();
+			}
+		}
+	} else if (Math::is_zero_approx(p_t - 1.0f)) {
+		if (p_control_2.is_equal_approx(p_end)) {
+			if (p_control_2.is_equal_approx(p_control_1)) {
+				return (p_end - p_begin).normalized();
+			} else {
+				return (p_end - p_control_1).normalized();
+			}
+		}
 	}
 
 	return p_begin.bezier_derivative(p_control_1, p_control_2, p_end, p_t).normalized();
@@ -1638,7 +1659,7 @@ void Curve3D::_bake() const {
 	baked_max_ofs = 0;
 	baked_cache_dirty = false;
 
-	if (points.size() == 0) {
+	if (points.is_empty()) {
 #ifdef TOOLS_ENABLED
 		points_in_cache.clear();
 #endif
@@ -2272,7 +2293,7 @@ void Curve3D::_set_data(const Dictionary &p_data) {
 PackedVector3Array Curve3D::tessellate(int p_max_stages, real_t p_tolerance) const {
 	PackedVector3Array tess;
 
-	if (points.size() == 0) {
+	if (points.is_empty()) {
 		return tess;
 	}
 	Vector<RBMap<real_t, Vector3>> midpoints;
@@ -2335,7 +2356,7 @@ PackedVector3Array Curve3D::tessellate_even_length(int p_max_stages, real_t p_le
 	PackedVector3Array tess;
 
 	Vector<RBMap<real_t, Vector3>> midpoints = _tessellate_even_length(p_max_stages, p_length);
-	if (midpoints.size() == 0) {
+	if (midpoints.is_empty()) {
 		return tess;
 	}
 
diff --git a/engine/scene/resources/curve.h b/engine/scene/resources/curve.h
index fb774e87..c4748ba9 100644
--- a/engine/scene/resources/curve.h
+++ b/engine/scene/resources/curve.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CURVE_H
-#define CURVE_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -77,15 +76,15 @@ public:
 	void set_point_count(int p_count);
 
 	int add_point(Vector2 p_position,
-			real_t left_tangent = 0,
-			real_t right_tangent = 0,
-			TangentMode left_mode = TANGENT_FREE,
-			TangentMode right_mode = TANGENT_FREE);
+			real_t p_left_tangent = 0,
+			real_t p_right_tangent = 0,
+			TangentMode p_left_mode = TANGENT_FREE,
+			TangentMode p_right_mode = TANGENT_FREE);
 	int add_point_no_update(Vector2 p_position,
-			real_t left_tangent = 0,
-			real_t right_tangent = 0,
-			TangentMode left_mode = TANGENT_FREE,
-			TangentMode right_mode = TANGENT_FREE);
+			real_t p_left_tangent = 0,
+			real_t p_right_tangent = 0,
+			TangentMode p_left_mode = TANGENT_FREE,
+			TangentMode p_right_mode = TANGENT_FREE);
 	void remove_point(int p_index);
 	void clear_points();
 
@@ -127,10 +126,10 @@ public:
 	TangentMode get_point_left_mode(int p_index) const;
 	TangentMode get_point_right_mode(int p_index) const;
 
-	void update_auto_tangents(int i);
+	void update_auto_tangents(int p_index);
 
 	Array get_data() const;
-	void set_data(Array input);
+	void set_data(Array p_input);
 
 	void bake();
 	void _bake() const;
@@ -150,11 +149,12 @@ protected:
 private:
 	void mark_dirty();
 	int _add_point(Vector2 p_position,
-			real_t left_tangent = 0,
-			real_t right_tangent = 0,
-			TangentMode left_mode = TANGENT_FREE,
-			TangentMode right_mode = TANGENT_FREE);
-	void _remove_point(int p_index);
+			real_t p_left_tangent = 0,
+			real_t p_right_tangent = 0,
+			TangentMode p_left_mode = TANGENT_FREE,
+			TangentMode p_right_mode = TANGENT_FREE,
+			bool p_mark_dirty = true);
+	void _remove_point(int p_index, bool p_mark_dirty = true);
 
 	LocalVector<Point> _points;
 	mutable bool _baked_cache_dirty = false;
@@ -363,5 +363,3 @@ public:
 
 	Curve3D();
 };
-
-#endif // CURVE_H
diff --git a/engine/scene/resources/curve_texture.h b/engine/scene/resources/curve_texture.h
index fd590aef..c8c7cb99 100644
--- a/engine/scene/resources/curve_texture.h
+++ b/engine/scene/resources/curve_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CURVE_TEXTURE_H
-#define CURVE_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -118,5 +117,3 @@ public:
 	CurveXYZTexture();
 	~CurveXYZTexture();
 };
-
-#endif // CURVE_TEXTURE_H
diff --git a/engine/scene/resources/environment.h b/engine/scene/resources/environment.h
index ab870bb8..400a7dfc 100644
--- a/engine/scene/resources/environment.h
+++ b/engine/scene/resources/environment.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENVIRONMENT_H
-#define ENVIRONMENT_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "scene/resources/sky.h"
@@ -454,5 +453,3 @@ VARIANT_ENUM_CAST(Environment::ToneMapper)
 VARIANT_ENUM_CAST(Environment::SDFGIYScale)
 VARIANT_ENUM_CAST(Environment::GlowBlendMode)
 VARIANT_ENUM_CAST(Environment::FogMode)
-
-#endif // ENVIRONMENT_H
diff --git a/engine/scene/resources/external_texture.h b/engine/scene/resources/external_texture.h
index cd60bcc0..d4290104 100644
--- a/engine/scene/resources/external_texture.h
+++ b/engine/scene/resources/external_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EXTERNAL_TEXTURE_H
-#define EXTERNAL_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -65,5 +64,3 @@ public:
 	ExternalTexture();
 	~ExternalTexture();
 };
-
-#endif // EXTERNAL_TEXTURE_H
diff --git a/engine/scene/resources/font.cpp b/engine/scene/resources/font.cpp
index 7cfd9ae7..0a544672 100644
--- a/engine/scene/resources/font.cpp
+++ b/engine/scene/resources/font.cpp
@@ -298,7 +298,7 @@ void Font::set_cache_capacity(int p_single_line, int p_multi_line) {
 
 Size2 Font::get_string_size(const String &p_text, HorizontalAlignment p_alignment, float p_width, int p_font_size, BitField<TextServer::JustificationFlag> p_jst_flags, TextServer::Direction p_direction, TextServer::Orientation p_orientation) const {
 	bool fill = (p_alignment == HORIZONTAL_ALIGNMENT_FILL);
-	ShapedTextKey key = ShapedTextKey(p_text, p_font_size, fill ? p_width : 0.0, fill ? p_jst_flags : TextServer::JUSTIFICATION_NONE, TextServer::BREAK_NONE, p_direction, p_orientation);
+	ShapedTextKey key = ShapedTextKey(p_text, p_font_size, fill ? p_width : 0.0, fill ? p_jst_flags : BitField(TextServer::JUSTIFICATION_NONE), TextServer::BREAK_NONE, p_direction, p_orientation);
 
 	Ref<TextLine> buffer;
 	if (cache.has(key)) {
@@ -347,7 +347,7 @@ Size2 Font::get_multiline_string_size(const String &p_text, HorizontalAlignment
 
 void Font::draw_string(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment, float p_width, int p_font_size, const Color &p_modulate, BitField<TextServer::JustificationFlag> p_jst_flags, TextServer::Direction p_direction, TextServer::Orientation p_orientation) const {
 	bool fill = (p_alignment == HORIZONTAL_ALIGNMENT_FILL);
-	ShapedTextKey key = ShapedTextKey(p_text, p_font_size, fill ? p_width : 0.0, fill ? p_jst_flags : TextServer::JUSTIFICATION_NONE, TextServer::BREAK_NONE, p_direction, p_orientation);
+	ShapedTextKey key = ShapedTextKey(p_text, p_font_size, fill ? p_width : 0.0, fill ? p_jst_flags : BitField(TextServer::JUSTIFICATION_NONE), TextServer::BREAK_NONE, p_direction, p_orientation);
 
 	Ref<TextLine> buffer;
 	if (cache.has(key)) {
@@ -410,7 +410,7 @@ void Font::draw_multiline_string(RID p_canvas_item, const Point2 &p_pos, const S
 
 void Font::draw_string_outline(RID p_canvas_item, const Point2 &p_pos, const String &p_text, HorizontalAlignment p_alignment, float p_width, int p_font_size, int p_size, const Color &p_modulate, BitField<TextServer::JustificationFlag> p_jst_flags, TextServer::Direction p_direction, TextServer::Orientation p_orientation) const {
 	bool fill = (p_alignment == HORIZONTAL_ALIGNMENT_FILL);
-	ShapedTextKey key = ShapedTextKey(p_text, p_font_size, fill ? p_width : 0.0, fill ? p_jst_flags : TextServer::JUSTIFICATION_NONE, TextServer::BREAK_NONE, p_direction, p_orientation);
+	ShapedTextKey key = ShapedTextKey(p_text, p_font_size, fill ? p_width : 0.0, fill ? p_jst_flags : BitField(TextServer::JUSTIFICATION_NONE), TextServer::BREAK_NONE, p_direction, p_orientation);
 
 	Ref<TextLine> buffer;
 	if (cache.has(key)) {
@@ -602,6 +602,7 @@ _FORCE_INLINE_ void FontFile::_ensure_rid(int p_cache_index, int p_make_linked_f
 			TS->font_set_fixed_size(cache[p_cache_index], fixed_size);
 			TS->font_set_fixed_size_scale_mode(cache[p_cache_index], fixed_size_scale_mode);
 			TS->font_set_force_autohinter(cache[p_cache_index], force_autohinter);
+			TS->font_set_modulate_color_glyphs(cache[p_cache_index], modulate_color_glyphs);
 			TS->font_set_allow_system_fallback(cache[p_cache_index], allow_system_fallback);
 			TS->font_set_hinting(cache[p_cache_index], hinting);
 			TS->font_set_subpixel_positioning(cache[p_cache_index], subpixel_positioning);
@@ -929,6 +930,9 @@ void FontFile::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_force_autohinter", "force_autohinter"), &FontFile::set_force_autohinter);
 	ClassDB::bind_method(D_METHOD("is_force_autohinter"), &FontFile::is_force_autohinter);
 
+	ClassDB::bind_method(D_METHOD("set_modulate_color_glyphs", "modulate"), &FontFile::set_modulate_color_glyphs);
+	ClassDB::bind_method(D_METHOD("is_modulate_color_glyphs"), &FontFile::is_modulate_color_glyphs);
+
 	ClassDB::bind_method(D_METHOD("set_hinting", "hinting"), &FontFile::set_hinting);
 	ClassDB::bind_method(D_METHOD("get_hinting"), &FontFile::get_hinting);
 
@@ -1054,6 +1058,7 @@ void FontFile::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "msdf_size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "set_msdf_size", "get_msdf_size");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_system_fallback", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "set_allow_system_fallback", "is_allow_system_fallback");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "force_autohinter", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "set_force_autohinter", "is_force_autohinter");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "modulate_color_glyphs", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "set_modulate_color_glyphs", "is_modulate_color_glyphs");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal", PROPERTY_USAGE_STORAGE), "set_hinting", "get_hinting");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "oversampling", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "set_oversampling", "get_oversampling");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "fixed_size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "set_fixed_size", "get_fixed_size");
@@ -1413,6 +1418,7 @@ void FontFile::reset_state() {
 	disable_embedded_bitmaps = true;
 	msdf = false;
 	force_autohinter = false;
+	modulate_color_glyphs = false;
 	allow_system_fallback = true;
 	hinting = TextServer::HINTING_LIGHT;
 	subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_DISABLED;
@@ -1453,6 +1459,7 @@ Error FontFile::_load_bitmap_font(const String &p_path, List<String> *r_image_fi
 	disable_embedded_bitmaps = true;
 	msdf = false;
 	force_autohinter = false;
+	modulate_color_glyphs = false;
 	allow_system_fallback = true;
 	hinting = TextServer::HINTING_NONE;
 	oversampling = 1.0f;
@@ -1488,7 +1495,7 @@ Error FontFile::_load_bitmap_font(const String &p_path, List<String> *r_image_fi
 			switch (block_type) {
 				case 1: /* info */ {
 					ERR_FAIL_COND_V_MSG(block_size < 15, ERR_CANT_CREATE, "Invalid BMFont info block size.");
-					base_size = ABS(static_cast<int16_t>(f->get_16()));
+					base_size = Math::abs(static_cast<int16_t>(f->get_16()));
 					if (base_size == 0) {
 						base_size = 16;
 					}
@@ -1782,7 +1789,7 @@ Error FontFile::_load_bitmap_font(const String &p_path, List<String> *r_image_fi
 
 			if (type == "info") {
 				if (keys.has("size")) {
-					base_size = ABS(keys["size"].to_int());
+					base_size = Math::abs(keys["size"].to_int());
 					if (base_size == 0) {
 						base_size = 16;
 					}
@@ -2271,6 +2278,21 @@ bool FontFile::is_force_autohinter() const {
 	return force_autohinter;
 }
 
+void FontFile::set_modulate_color_glyphs(bool p_modulate) {
+	if (modulate_color_glyphs != p_modulate) {
+		modulate_color_glyphs = p_modulate;
+		for (int i = 0; i < cache.size(); i++) {
+			_ensure_rid(i);
+			TS->font_set_modulate_color_glyphs(cache[i], modulate_color_glyphs);
+		}
+		emit_changed();
+	}
+}
+
+bool FontFile::is_modulate_color_glyphs() const {
+	return modulate_color_glyphs;
+}
+
 void FontFile::set_hinting(TextServer::Hinting p_hinting) {
 	if (hinting != p_hinting) {
 		hinting = p_hinting;
@@ -3100,6 +3122,9 @@ void SystemFont::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_force_autohinter", "force_autohinter"), &SystemFont::set_force_autohinter);
 	ClassDB::bind_method(D_METHOD("is_force_autohinter"), &SystemFont::is_force_autohinter);
 
+	ClassDB::bind_method(D_METHOD("set_modulate_color_glyphs", "modulate"), &SystemFont::set_modulate_color_glyphs);
+	ClassDB::bind_method(D_METHOD("is_modulate_color_glyphs"), &SystemFont::is_modulate_color_glyphs);
+
 	ClassDB::bind_method(D_METHOD("set_hinting", "hinting"), &SystemFont::set_hinting);
 	ClassDB::bind_method(D_METHOD("get_hinting"), &SystemFont::get_hinting);
 
@@ -3138,6 +3163,7 @@ void SystemFont::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disable_embedded_bitmaps"), "set_disable_embedded_bitmaps", "get_disable_embedded_bitmaps");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_system_fallback"), "set_allow_system_fallback", "is_allow_system_fallback");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "force_autohinter"), "set_force_autohinter", "is_force_autohinter");
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "modulate_color_glyphs"), "set_modulate_color_glyphs", "is_modulate_color_glyphs");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "hinting", PROPERTY_HINT_ENUM, "None,Light,Normal"), "set_hinting", "get_hinting");
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "subpixel_positioning", PROPERTY_HINT_ENUM, "Disabled,Auto,One Half of a Pixel,One Quarter of a Pixel"), "set_subpixel_positioning", "get_subpixel_positioning");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "keep_rounding_remainders"), "set_keep_rounding_remainders", "get_keep_rounding_remainders");
@@ -3243,6 +3269,7 @@ void SystemFont::_update_base_font() {
 		file->set_generate_mipmaps(mipmaps);
 		file->set_disable_embedded_bitmaps(disable_embedded_bitmaps);
 		file->set_force_autohinter(force_autohinter);
+		file->set_modulate_color_glyphs(modulate_color_glyphs);
 		file->set_allow_system_fallback(allow_system_fallback);
 		file->set_hinting(hinting);
 		file->set_subpixel_positioning(subpixel_positioning);
@@ -3287,6 +3314,7 @@ void SystemFont::reset_state() {
 	mipmaps = false;
 	disable_embedded_bitmaps = true;
 	force_autohinter = false;
+	modulate_color_glyphs = false;
 	allow_system_fallback = true;
 	hinting = TextServer::HINTING_LIGHT;
 	subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_DISABLED;
@@ -3416,6 +3444,20 @@ bool SystemFont::is_force_autohinter() const {
 	return force_autohinter;
 }
 
+void SystemFont::set_modulate_color_glyphs(bool p_modulate) {
+	if (modulate_color_glyphs != p_modulate) {
+		modulate_color_glyphs = p_modulate;
+		if (base_font.is_valid()) {
+			base_font->set_modulate_color_glyphs(modulate_color_glyphs);
+		}
+		emit_changed();
+	}
+}
+
+bool SystemFont::is_modulate_color_glyphs() const {
+	return modulate_color_glyphs;
+}
+
 void SystemFont::set_hinting(TextServer::Hinting p_hinting) {
 	if (hinting != p_hinting) {
 		hinting = p_hinting;
diff --git a/engine/scene/resources/font.h b/engine/scene/resources/font.h
index b5592473..a3afeacb 100644
--- a/engine/scene/resources/font.h
+++ b/engine/scene/resources/font.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FONT_H
-#define FONT_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/templates/lru.h"
@@ -193,6 +192,7 @@ class FontFile : public Font {
 	int fixed_size = 0;
 	TextServer::FixedSizeScaleMode fixed_size_scale_mode = TextServer::FIXED_SIZE_SCALE_DISABLE;
 	bool force_autohinter = false;
+	bool modulate_color_glyphs = false;
 	bool allow_system_fallback = true;
 	TextServer::Hinting hinting = TextServer::HINTING_LIGHT;
 	TextServer::SubpixelPositioning subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_AUTO;
@@ -274,6 +274,9 @@ public:
 	virtual void set_force_autohinter(bool p_force_autohinter);
 	virtual bool is_force_autohinter() const;
 
+	virtual void set_modulate_color_glyphs(bool p_modulate);
+	virtual bool is_modulate_color_glyphs() const;
+
 	virtual void set_hinting(TextServer::Hinting p_hinting);
 	virtual TextServer::Hinting get_hinting() const;
 
@@ -480,6 +483,7 @@ class SystemFont : public Font {
 	bool mipmaps = false;
 	bool disable_embedded_bitmaps = true;
 	bool force_autohinter = false;
+	bool modulate_color_glyphs = false;
 	bool allow_system_fallback = true;
 	TextServer::Hinting hinting = TextServer::HINTING_LIGHT;
 	TextServer::SubpixelPositioning subpixel_positioning = TextServer::SUBPIXEL_POSITIONING_AUTO;
@@ -516,6 +520,9 @@ public:
 	virtual void set_force_autohinter(bool p_force_autohinter);
 	virtual bool is_force_autohinter() const;
 
+	virtual void set_modulate_color_glyphs(bool p_modulate);
+	virtual bool is_modulate_color_glyphs() const;
+
 	virtual void set_hinting(TextServer::Hinting p_hinting);
 	virtual TextServer::Hinting get_hinting() const;
 
@@ -559,5 +566,3 @@ public:
 	SystemFont();
 	~SystemFont();
 };
-
-#endif // FONT_H
diff --git a/engine/scene/resources/gradient.h b/engine/scene/resources/gradient.h
index 9272f823..8e3461a8 100644
--- a/engine/scene/resources/gradient.h
+++ b/engine/scene/resources/gradient.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRADIENT_H
-#define GRADIENT_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -240,5 +239,3 @@ public:
 
 VARIANT_ENUM_CAST(Gradient::InterpolationMode);
 VARIANT_ENUM_CAST(Gradient::ColorSpace);
-
-#endif // GRADIENT_H
diff --git a/engine/scene/resources/gradient_texture.cpp b/engine/scene/resources/gradient_texture.cpp
index 2b0e455e..07e7de0c 100644
--- a/engine/scene/resources/gradient_texture.cpp
+++ b/engine/scene/resources/gradient_texture.cpp
@@ -292,10 +292,7 @@ float GradientTexture2D::_get_gradient_offset_at(int x, int y) const {
 		pos.y = static_cast<float>(y) / (height - 1);
 	}
 	if (fill == Fill::FILL_LINEAR) {
-		Vector2 segment[2];
-		segment[0] = fill_from;
-		segment[1] = fill_to;
-		Vector2 closest = Geometry2D::get_closest_point_to_segment_uncapped(pos, &segment[0]);
+		const Vector2 closest = Geometry2D::get_closest_point_to_segment_uncapped(pos, fill_from, fill_to);
 		ofs = (closest - fill_from).length() / (fill_to - fill_from).length();
 		if ((closest - fill_from).dot(fill_to - fill_from) < 0) {
 			ofs *= -1;
diff --git a/engine/scene/resources/gradient_texture.h b/engine/scene/resources/gradient_texture.h
index 764e5e66..f06aeb75 100644
--- a/engine/scene/resources/gradient_texture.h
+++ b/engine/scene/resources/gradient_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GRADIENT_TEXTURE_H
-#define GRADIENT_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -142,5 +141,3 @@ public:
 
 VARIANT_ENUM_CAST(GradientTexture2D::Fill);
 VARIANT_ENUM_CAST(GradientTexture2D::Repeat);
-
-#endif // GRADIENT_TEXTURE_H
diff --git a/engine/scene/resources/image_texture.h b/engine/scene/resources/image_texture.h
index 3b756fb5..920650bb 100644
--- a/engine/scene/resources/image_texture.h
+++ b/engine/scene/resources/image_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMAGE_TEXTURE_H
-#define IMAGE_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -202,5 +201,3 @@ public:
 
 	virtual Ref<Resource> create_placeholder() const;
 };
-
-#endif // IMAGE_TEXTURE_H
diff --git a/engine/scene/resources/immediate_mesh.h b/engine/scene/resources/immediate_mesh.h
index 8ff0ff3e..a5286678 100644
--- a/engine/scene/resources/immediate_mesh.h
+++ b/engine/scene/resources/immediate_mesh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef IMMEDIATE_MESH_H
-#define IMMEDIATE_MESH_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/resources/mesh.h"
@@ -114,5 +113,3 @@ public:
 	ImmediateMesh();
 	~ImmediateMesh();
 };
-
-#endif // IMMEDIATE_MESH_H
diff --git a/engine/scene/resources/label_settings.h b/engine/scene/resources/label_settings.h
index f7612217..f9998b75 100644
--- a/engine/scene/resources/label_settings.h
+++ b/engine/scene/resources/label_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LABEL_SETTINGS_H
-#define LABEL_SETTINGS_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "font.h"
@@ -89,5 +88,3 @@ public:
 	void set_shadow_offset(const Vector2 &p_offset);
 	Vector2 get_shadow_offset() const;
 };
-
-#endif // LABEL_SETTINGS_H
diff --git a/engine/scene/resources/material.cpp b/engine/scene/resources/material.cpp
index a9dd8928..d1945cfc 100644
--- a/engine/scene/resources/material.cpp
+++ b/engine/scene/resources/material.cpp
@@ -257,10 +257,10 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 		bool is_none_group_undefined = true;
 		bool is_none_group = true;
 
-		for (List<PropertyInfo>::Element *E = list.front(); E; E = E->next()) {
-			if (E->get().usage == PROPERTY_USAGE_GROUP) {
-				if (!E->get().name.is_empty()) {
-					Vector<String> vgroup = E->get().name.split("::");
+		for (const PropertyInfo &pi : list) {
+			if (pi.usage == PROPERTY_USAGE_GROUP) {
+				if (!pi.name.is_empty()) {
+					Vector<String> vgroup = pi.name.split("::");
 					last_group = vgroup[0];
 					if (vgroup.size() > 1) {
 						last_subgroup = vgroup[1];
@@ -322,23 +322,23 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 				vgroups.push_back(Pair<String, LocalVector<String>>("<None>", { "<None>" }));
 			}
 
-			const bool is_uniform_cached = param_cache.has(E->get().name);
+			const bool is_uniform_cached = param_cache.has(pi.name);
 			bool is_uniform_type_compatible = true;
 
 			if (is_uniform_cached) {
 				// Check if the uniform Variant type changed, for example vec3 to vec4.
-				const Variant &cached = param_cache.get(E->get().name);
+				const Variant &cached = param_cache.get(pi.name);
 
 				if (cached.is_array()) {
 					// Allow some array conversions for backwards compatibility.
-					is_uniform_type_compatible = Variant::can_convert(E->get().type, cached.get_type());
+					is_uniform_type_compatible = Variant::can_convert(pi.type, cached.get_type());
 				} else {
-					is_uniform_type_compatible = E->get().type == cached.get_type();
+					is_uniform_type_compatible = pi.type == cached.get_type();
 				}
 
 #ifndef DISABLE_DEPRECATED
 				// PackedFloat32Array -> PackedVector4Array conversion.
-				if (!is_uniform_type_compatible && E->get().type == Variant::PACKED_VECTOR4_ARRAY && cached.get_type() == Variant::PACKED_FLOAT32_ARRAY) {
+				if (!is_uniform_type_compatible && pi.type == Variant::PACKED_VECTOR4_ARRAY && cached.get_type() == Variant::PACKED_FLOAT32_ARRAY) {
 					PackedVector4Array varray;
 					PackedFloat32Array array = (PackedFloat32Array)cached;
 
@@ -346,28 +346,28 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 						varray.push_back(Vector4(array[i], array[i + 1], array[i + 2], array[i + 3]));
 					}
 
-					param_cache.insert(E->get().name, varray);
+					param_cache.insert(pi.name, varray);
 					is_uniform_type_compatible = true;
 				}
 #endif
 
-				if (is_uniform_type_compatible && E->get().type == Variant::OBJECT && cached.get_type() == Variant::OBJECT) {
+				if (is_uniform_type_compatible && pi.type == Variant::OBJECT && cached.get_type() == Variant::OBJECT) {
 					// Check if the Object class (hint string) changed, for example Texture2D sampler to Texture3D.
 					// Allow inheritance, Texture2D type sampler should also accept CompressedTexture2D.
 					Object *cached_obj = cached;
-					if (!cached_obj->is_class(E->get().hint_string)) {
+					if (!cached_obj->is_class(pi.hint_string)) {
 						is_uniform_type_compatible = false;
 					}
 				}
 			}
 
-			PropertyInfo info = E->get();
+			PropertyInfo info = pi;
 			info.name = "shader_parameter/" + info.name;
 			if (!is_uniform_cached || !is_uniform_type_compatible) {
 				// Property has never been edited or its type changed, retrieve with default value.
-				Variant default_value = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), E->get().name);
-				param_cache.insert(E->get().name, default_value);
-				remap_cache.insert(info.name, E->get().name);
+				Variant default_value = RenderingServer::get_singleton()->shader_get_parameter_default(shader->get_rid(), pi.name);
+				param_cache.insert(pi.name, default_value);
+				remap_cache.insert(info.name, pi.name);
 			}
 			groups[last_group][last_subgroup].push_back(info);
 		}
@@ -376,8 +376,8 @@ void ShaderMaterial::_get_property_list(List<PropertyInfo> *p_list) const {
 			String group = group_pair.first;
 			for (const String &subgroup : group_pair.second) {
 				List<PropertyInfo> &prop_infos = groups[group][subgroup];
-				for (List<PropertyInfo>::Element *item = prop_infos.front(); item; item = item->next()) {
-					p_list->push_back(item->get());
+				for (const PropertyInfo &item : prop_infos) {
+					p_list->push_back(item);
 				}
 			}
 		}
@@ -750,7 +750,7 @@ void BaseMaterial3D::_update_shader() {
 
 	// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
 	String code = vformat(
-			"// NOTE: Shader automatically converted from " VERSION_NAME " " VERSION_FULL_CONFIG "'s %s.\n\n",
+			"// NOTE: Shader automatically converted from " GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG "'s %s.\n\n",
 			orm ? "ORMMaterial3D" : "StandardMaterial3D");
 
 	// Define shader type and render mode based on property values.
diff --git a/engine/scene/resources/material.h b/engine/scene/resources/material.h
index 36d325bd..4c9044c3 100644
--- a/engine/scene/resources/material.h
+++ b/engine/scene/resources/material.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATERIAL_H
-#define MATERIAL_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/templates/self_list.h"
@@ -842,5 +841,3 @@ public:
 };
 
 //////////////////////
-
-#endif // MATERIAL_H
diff --git a/engine/scene/resources/mesh.cpp b/engine/scene/resources/mesh.cpp
index 0242672c..5c5ec5d9 100644
--- a/engine/scene/resources/mesh.cpp
+++ b/engine/scene/resources/mesh.cpp
@@ -34,10 +34,10 @@
 #include "core/templates/pair.h"
 #include "scene/resources/surface_tool.h"
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
 void MeshConvexDecompositionSettings::set_max_concavity(real_t p_max_concavity) {
 	max_concavity = CLAMP(p_max_concavity, 0.001, 1.0);
@@ -201,7 +201,9 @@ void MeshConvexDecompositionSettings::_bind_methods() {
 	BIND_ENUM_CONSTANT(CONVEX_DECOMPOSITION_MODE_TETRAHEDRON);
 }
 
+#ifndef PHYSICS_3D_DISABLED
 Mesh::ConvexDecompositionFunc Mesh::convex_decomposition_function = nullptr;
+#endif // PHYSICS_3D_DISABLED
 
 int Mesh::get_surface_count() const {
 	int ret = 0;
@@ -521,7 +523,7 @@ Vector<Face3> Mesh::get_surface_faces(int p_surface) const {
 	return Vector<Face3>();
 }
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 Ref<ConvexPolygonShape3D> Mesh::create_convex_shape(bool p_clean, bool p_simplify) const {
 	if (p_simplify) {
 		Ref<MeshConvexDecompositionSettings> settings = Ref<MeshConvexDecompositionSettings>();
@@ -563,7 +565,7 @@ Ref<ConvexPolygonShape3D> Mesh::create_convex_shape(bool p_clean, bool p_simplif
 
 Ref<ConcavePolygonShape3D> Mesh::create_trimesh_shape() const {
 	Vector<Face3> faces = get_faces();
-	if (faces.size() == 0) {
+	if (faces.is_empty()) {
 		return Ref<ConcavePolygonShape3D>();
 	}
 
@@ -581,7 +583,7 @@ Ref<ConcavePolygonShape3D> Mesh::create_trimesh_shape() const {
 	shape->set_faces(face_points);
 	return shape;
 }
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
 Ref<Mesh> Mesh::create_outline(float p_margin) const {
 	Array arrays;
@@ -615,7 +617,7 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
 						if (j == ARRAY_VERTEX) {
 							vcount = src.size();
 						}
-						if (dst.size() == 0 || src.size() == 0) {
+						if (dst.is_empty() || src.is_empty()) {
 							arrays[j] = Variant();
 							continue;
 						}
@@ -627,7 +629,7 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
 					case ARRAY_WEIGHTS: {
 						Vector<real_t> dst = arrays[j];
 						Vector<real_t> src = a[j];
-						if (dst.size() == 0 || src.size() == 0) {
+						if (dst.is_empty() || src.is_empty()) {
 							arrays[j] = Variant();
 							continue;
 						}
@@ -638,7 +640,7 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
 					case ARRAY_COLOR: {
 						Vector<Color> dst = arrays[j];
 						Vector<Color> src = a[j];
-						if (dst.size() == 0 || src.size() == 0) {
+						if (dst.is_empty() || src.is_empty()) {
 							arrays[j] = Variant();
 							continue;
 						}
@@ -650,7 +652,7 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
 					case ARRAY_TEX_UV2: {
 						Vector<Vector2> dst = arrays[j];
 						Vector<Vector2> src = a[j];
-						if (dst.size() == 0 || src.size() == 0) {
+						if (dst.is_empty() || src.is_empty()) {
 							arrays[j] = Variant();
 							continue;
 						}
@@ -661,7 +663,7 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
 					case ARRAY_INDEX: {
 						Vector<int> dst = arrays[j];
 						Vector<int> src = a[j];
-						if (dst.size() == 0 || src.size() == 0) {
+						if (dst.is_empty() || src.is_empty()) {
 							arrays[j] = Variant();
 							continue;
 						}
@@ -900,7 +902,7 @@ void Mesh::clear_cache() const {
 	debug_lines.clear();
 }
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 Vector<Ref<Shape3D>> Mesh::convex_decompose(const Ref<MeshConvexDecompositionSettings> &p_settings) const {
 	ERR_FAIL_NULL_V(convex_decomposition_function, Vector<Ref<Shape3D>>());
 
@@ -937,7 +939,7 @@ Vector<Ref<Shape3D>> Mesh::convex_decompose(const Ref<MeshConvexDecompositionSet
 
 	return ret;
 }
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
 int Mesh::get_builtin_bind_pose_count() const {
 	return 0;
@@ -2030,7 +2032,7 @@ AABB ArrayMesh::get_custom_aabb() const {
 }
 
 void ArrayMesh::regen_normal_maps() {
-	if (surfaces.size() == 0) {
+	if (surfaces.is_empty()) {
 		return;
 	}
 	Vector<Ref<SurfaceTool>> surfs;
@@ -2297,10 +2299,10 @@ void ArrayMesh::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("surface_find_by_name", "name"), &ArrayMesh::surface_find_by_name);
 	ClassDB::bind_method(D_METHOD("surface_set_name", "surf_idx", "name"), &ArrayMesh::surface_set_name);
 	ClassDB::bind_method(D_METHOD("surface_get_name", "surf_idx"), &ArrayMesh::surface_get_name);
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("create_trimesh_shape"), &ArrayMesh::create_trimesh_shape);
 	ClassDB::bind_method(D_METHOD("create_convex_shape", "clean", "simplify"), &ArrayMesh::create_convex_shape, DEFVAL(true), DEFVAL(false));
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 	ClassDB::bind_method(D_METHOD("create_outline", "margin"), &ArrayMesh::create_outline);
 	ClassDB::bind_method(D_METHOD("regen_normal_maps"), &ArrayMesh::regen_normal_maps);
 	ClassDB::set_method_flags(get_class_static(), _scs_create("regen_normal_maps"), METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR);
diff --git a/engine/scene/resources/mesh.h b/engine/scene/resources/mesh.h
index 688311d4..f0915aa0 100644
--- a/engine/scene/resources/mesh.h
+++ b/engine/scene/resources/mesh.h
@@ -28,22 +28,22 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_H
-#define MESH_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/math/face3.h"
 #include "core/math/triangle_mesh.h"
-#ifndef _3D_DISABLED
-#include "scene/resources/3d/shape_3d.h"
-#endif // _3D_DISABLED
 #include "scene/resources/material.h"
 #include "servers/rendering_server.h"
 
+#ifndef PHYSICS_3D_DISABLED
+#include "scene/resources/3d/shape_3d.h"
+
 class ConcavePolygonShape3D;
 class ConvexPolygonShape3D;
-class MeshConvexDecompositionSettings;
 class Shape3D;
+#endif // PHYSICS_3D_DISABLED
+class MeshConvexDecompositionSettings;
 
 class Mesh : public Resource {
 	GDCLASS(Mesh, Resource);
@@ -192,15 +192,15 @@ public:
 	Size2i get_lightmap_size_hint() const;
 	void clear_cache() const;
 
+#ifndef PHYSICS_3D_DISABLED
 	typedef Vector<Vector<Vector3>> (*ConvexDecompositionFunc)(const real_t *p_vertices, int p_vertex_count, const uint32_t *p_triangles, int p_triangle_count, const Ref<MeshConvexDecompositionSettings> &p_settings, Vector<Vector<uint32_t>> *r_convex_indices);
 
 	static ConvexDecompositionFunc convex_decomposition_function;
 
-#ifndef _3D_DISABLED
 	Vector<Ref<Shape3D>> convex_decompose(const Ref<MeshConvexDecompositionSettings> &p_settings) const;
 	Ref<ConvexPolygonShape3D> create_convex_shape(bool p_clean = true, bool p_simplify = false) const;
 	Ref<ConcavePolygonShape3D> create_trimesh_shape() const;
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
 	virtual int get_builtin_bind_pose_count() const;
 	virtual Transform3D get_builtin_bind_pose(int p_index) const;
@@ -439,5 +439,3 @@ public:
 	PlaceholderMesh();
 	~PlaceholderMesh();
 };
-
-#endif // MESH_H
diff --git a/engine/scene/resources/mesh_data_tool.h b/engine/scene/resources/mesh_data_tool.h
index 36311cfe..c5447e3f 100644
--- a/engine/scene/resources/mesh_data_tool.h
+++ b/engine/scene/resources/mesh_data_tool.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_DATA_TOOL_H
-#define MESH_DATA_TOOL_H
+#pragma once
 
 #include "scene/resources/mesh.h"
 
@@ -136,5 +135,3 @@ public:
 
 	MeshDataTool();
 };
-
-#endif // MESH_DATA_TOOL_H
diff --git a/engine/scene/resources/mesh_texture.h b/engine/scene/resources/mesh_texture.h
index 35ccb727..4387c472 100644
--- a/engine/scene/resources/mesh_texture.h
+++ b/engine/scene/resources/mesh_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_TEXTURE_H
-#define MESH_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -71,5 +70,3 @@ public:
 
 	MeshTexture();
 };
-
-#endif // MESH_TEXTURE_H
diff --git a/engine/scene/resources/multimesh.h b/engine/scene/resources/multimesh.h
index 03505bb4..8083390c 100644
--- a/engine/scene/resources/multimesh.h
+++ b/engine/scene/resources/multimesh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MULTIMESH_H
-#define MULTIMESH_H
+#pragma once
 
 #include "scene/resources/mesh.h"
 #include "servers/rendering_server.h"
@@ -132,5 +131,3 @@ public:
 
 VARIANT_ENUM_CAST(MultiMesh::TransformFormat);
 VARIANT_ENUM_CAST(MultiMesh::PhysicsInterpolationQuality);
-
-#endif // MULTIMESH_H
diff --git a/engine/scene/resources/navigation_mesh.cpp b/engine/scene/resources/navigation_mesh.cpp
index 034d4d69..43be579f 100644
--- a/engine/scene/resources/navigation_mesh.cpp
+++ b/engine/scene/resources/navigation_mesh.cpp
@@ -51,7 +51,7 @@ void NavigationMesh::create_from_mesh(const Ref<Mesh> &p_mesh) {
 
 		Vector<Vector3> varr = arr[Mesh::ARRAY_VERTEX];
 		Vector<int> iarr = arr[Mesh::ARRAY_INDEX];
-		if (varr.size() == 0 || iarr.size() == 0) {
+		if (varr.is_empty() || iarr.is_empty()) {
 			WARN_PRINT("A mesh surface was skipped when creating a NavigationMesh due to an empty vertex or index array.");
 			continue;
 		}
@@ -398,7 +398,7 @@ Ref<ArrayMesh> NavigationMesh::get_debug_mesh() {
 		debug_mesh->clear_surfaces();
 	}
 
-	if (vertices.size() == 0) {
+	if (vertices.is_empty()) {
 		return debug_mesh;
 	}
 
diff --git a/engine/scene/resources/navigation_mesh.h b/engine/scene/resources/navigation_mesh.h
index 1b3db5ba..e6936aab 100644
--- a/engine/scene/resources/navigation_mesh.h
+++ b/engine/scene/resources/navigation_mesh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_MESH_H
-#define NAVIGATION_MESH_H
+#pragma once
 
 #include "core/os/rw_lock.h"
 #include "scene/resources/mesh.h"
@@ -211,5 +210,3 @@ public:
 VARIANT_ENUM_CAST(NavigationMesh::SamplePartitionType);
 VARIANT_ENUM_CAST(NavigationMesh::ParsedGeometryType);
 VARIANT_ENUM_CAST(NavigationMesh::SourceGeometryMode);
-
-#endif // NAVIGATION_MESH_H
diff --git a/engine/scene/resources/packed_scene.cpp b/engine/scene/resources/packed_scene.cpp
index 7f170e00..87db5d5f 100644
--- a/engine/scene/resources/packed_scene.cpp
+++ b/engine/scene/resources/packed_scene.cpp
@@ -35,14 +35,15 @@
 #include "core/io/resource_loader.h"
 #include "core/templates/local_vector.h"
 #include "scene/2d/node_2d.h"
-#ifndef _3D_DISABLED
-#include "scene/3d/node_3d.h"
-#endif // _3D_DISABLED
 #include "scene/gui/control.h"
 #include "scene/main/instance_placeholder.h"
 #include "scene/main/missing_node.h"
 #include "scene/property_utils.h"
 
+#ifndef _3D_DISABLED
+#include "scene/3d/node_3d.h"
+#endif // _3D_DISABLED
+
 #define PACKED_SCENE_VERSION 3
 
 #ifdef TOOLS_ENABLED
@@ -127,14 +128,14 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 	// Nodes where instantiation failed (because something is missing.)
 	List<Node *> stray_instances;
 
-#define NODE_FROM_ID(p_name, p_id)                      \
-	Node *p_name;                                       \
-	if (p_id & FLAG_ID_IS_PATH) {                       \
-		NodePath np = node_paths[p_id & FLAG_MASK];     \
-		p_name = ret_nodes[0]->get_node_or_null(np);    \
-	} else {                                            \
-		ERR_FAIL_INDEX_V(p_id &FLAG_MASK, nc, nullptr); \
-		p_name = ret_nodes[p_id & FLAG_MASK];           \
+#define NODE_FROM_ID(p_name, p_id)                       \
+	Node *p_name;                                        \
+	if (p_id & FLAG_ID_IS_PATH) {                        \
+		NodePath np = node_paths[p_id & FLAG_MASK];      \
+		p_name = ret_nodes[0]->get_node_or_null(np);     \
+	} else {                                             \
+		ERR_FAIL_INDEX_V(p_id & FLAG_MASK, nc, nullptr); \
+		p_name = ret_nodes[p_id & FLAG_MASK];            \
 	}
 
 	int nc = nodes.size();
@@ -176,7 +177,7 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 #ifdef DEBUG_ENABLED
 			if (!nparent && (n.parent & FLAG_ID_IS_PATH)) {
 				WARN_PRINT(String("Parent path '" + String(node_paths[n.parent & FLAG_MASK]) + "' for node '" + String(snames[n.name]) + "' has vanished when instantiating: '" + get_path() + "'.").ascii().get_data());
-				old_parent_path = String(node_paths[n.parent & FLAG_MASK]).trim_prefix("./").replace("/", "@");
+				old_parent_path = String(node_paths[n.parent & FLAG_MASK]).trim_prefix("./").replace_char('/', '@');
 				nparent = ret_nodes[0];
 			}
 #endif
@@ -328,7 +329,7 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 
 						DeferredNodePathProperties dnp;
 						dnp.value = props[nprops[j].value];
-						dnp.base = node;
+						dnp.base = node->get_instance_id();
 						dnp.property = snames[name_idx];
 						deferred_node_paths.push_back(dnp);
 						continue;
@@ -521,45 +522,47 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
 
 	for (const DeferredNodePathProperties &dnp : deferred_node_paths) {
 		// Replace properties stored as NodePaths with actual Nodes.
+		Node *base = ObjectDB::get_instance<Node>(dnp.base);
+		ERR_CONTINUE_EDMSG(!base, vformat("Failed to set deferred property '%s' as the base node disappeared.", dnp.property));
 		if (dnp.value.get_type() == Variant::ARRAY) {
 			Array paths = dnp.value;
 
 			bool valid;
-			Array array = dnp.base->get(dnp.property, &valid);
-			ERR_CONTINUE_EDMSG(!valid, vformat("Failed to get property '%s' from node '%s'.", dnp.property, dnp.base->get_name()));
+			Array array = base->get(dnp.property, &valid);
+			ERR_CONTINUE_EDMSG(!valid, vformat("Failed to get property '%s' from node '%s'.", dnp.property, base->get_name()));
 			array = array.duplicate();
 
 			array.resize(paths.size());
 			for (int i = 0; i < array.size(); i++) {
-				array.set(i, dnp.base->get_node_or_null(paths[i]));
+				array.set(i, base->get_node_or_null(paths[i]));
 			}
-			dnp.base->set(dnp.property, array);
+			base->set(dnp.property, array);
 		} else if (dnp.value.get_type() == Variant::DICTIONARY) {
 			Dictionary paths = dnp.value;
 
 			bool valid;
-			Dictionary dict = dnp.base->get(dnp.property, &valid);
-			ERR_CONTINUE_EDMSG(!valid, vformat("Failed to get property '%s' from node '%s'.", dnp.property, dnp.base->get_name()));
+			Dictionary dict = base->get(dnp.property, &valid);
+			ERR_CONTINUE_EDMSG(!valid, vformat("Failed to get property '%s' from node '%s'.", dnp.property, base->get_name()));
 			dict = dict.duplicate();
 			bool convert_key = dict.get_typed_key_builtin() == Variant::OBJECT &&
 					ClassDB::is_parent_class(dict.get_typed_key_class_name(), "Node");
 			bool convert_value = dict.get_typed_value_builtin() == Variant::OBJECT &&
 					ClassDB::is_parent_class(dict.get_typed_value_class_name(), "Node");
 
-			for (int i = 0; i < paths.size(); i++) {
-				Variant key = paths.get_key_at_index(i);
+			for (const KeyValue<Variant, Variant> &kv : paths) {
+				Variant key = kv.key;
 				if (convert_key) {
-					key = dnp.base->get_node_or_null(key);
+					key = base->get_node_or_null(key);
 				}
-				Variant value = paths.get_value_at_index(i);
+				Variant value = kv.value;
 				if (convert_value) {
-					value = dnp.base->get_node_or_null(value);
+					value = base->get_node_or_null(value);
 				}
 				dict[key] = value;
 			}
-			dnp.base->set(dnp.property, dict);
+			base->set(dnp.property, dict);
 		} else {
-			dnp.base->set(dnp.property, dnp.base->get_node_or_null(dnp.value));
+			base->set(dnp.property, base->get_node_or_null(dnp.value));
 		}
 	}
 
@@ -827,7 +830,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 				int slash_pos = subtype_string.find_char('/');
 				PropertyHint subtype_hint = PropertyHint::PROPERTY_HINT_NONE;
 				if (slash_pos >= 0) {
-					subtype_hint = PropertyHint(subtype_string.get_slice("/", 1).to_int());
+					subtype_hint = PropertyHint(subtype_string.get_slicec('/', 1).to_int());
 					subtype_string = subtype_string.substr(0, slash_pos);
 				}
 				Variant::Type subtype = Variant::Type(subtype_string.to_int());
@@ -857,7 +860,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 				int key_slash_pos = key_subtype_string.find_char('/');
 				PropertyHint key_subtype_hint = PropertyHint::PROPERTY_HINT_NONE;
 				if (key_slash_pos >= 0) {
-					key_subtype_hint = PropertyHint(key_subtype_string.get_slice("/", 1).to_int());
+					key_subtype_hint = PropertyHint(key_subtype_string.get_slicec('/', 1).to_int());
 					key_subtype_string = key_subtype_string.substr(0, key_slash_pos);
 				}
 				Variant::Type key_subtype = Variant::Type(key_subtype_string.to_int());
@@ -868,7 +871,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 				int value_slash_pos = value_subtype_string.find_char('/');
 				PropertyHint value_subtype_hint = PropertyHint::PROPERTY_HINT_NONE;
 				if (value_slash_pos >= 0) {
-					value_subtype_hint = PropertyHint(value_subtype_string.get_slice("/", 1).to_int());
+					value_subtype_hint = PropertyHint(value_subtype_string.get_slicec('/', 1).to_int());
 					value_subtype_string = value_subtype_string.substr(0, value_slash_pos);
 				}
 				Variant::Type value_subtype = Variant::Type(value_subtype_string.to_int());
@@ -878,14 +881,14 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 					use_deferred_node_path_bit = true;
 					Dictionary dict = value;
 					Dictionary new_dict;
-					for (int i = 0; i < dict.size(); i++) {
-						Variant new_key = dict.get_key_at_index(i);
+					for (const KeyValue<Variant, Variant> &kv : dict) {
+						Variant new_key = kv.key;
 						if (convert_key && new_key.get_type() == Variant::OBJECT) {
 							if (Node *n = Object::cast_to<Node>(new_key)) {
 								new_key = p_node->get_path_to(n);
 							}
 						}
-						Variant new_value = dict.get_value_at_index(i);
+						Variant new_value = kv.value;
 						if (convert_value && new_value.get_type() == Variant::OBJECT) {
 							if (Node *n = Object::cast_to<Node>(new_value)) {
 								new_value = p_node->get_path_to(n);
@@ -2090,6 +2093,8 @@ Vector<String> SceneState::_get_node_groups(int p_idx) const {
 void SceneState::_bind_methods() {
 	//unbuild API
 
+	ClassDB::bind_method(D_METHOD("get_path"), &SceneState::get_path);
+	ClassDB::bind_method(D_METHOD("get_base_scene_state"), &SceneState::get_base_scene_state);
 	ClassDB::bind_method(D_METHOD("get_node_count"), &SceneState::get_node_count);
 	ClassDB::bind_method(D_METHOD("get_node_type", "idx"), &SceneState::get_node_type);
 	ClassDB::bind_method(D_METHOD("get_node_name", "idx"), &SceneState::get_node_name);
diff --git a/engine/scene/resources/packed_scene.h b/engine/scene/resources/packed_scene.h
index 9f808891..0ae35507 100644
--- a/engine/scene/resources/packed_scene.h
+++ b/engine/scene/resources/packed_scene.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PACKED_SCENE_H
-#define PACKED_SCENE_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "scene/main/node.h"
@@ -70,7 +69,7 @@ class SceneState : public RefCounted {
 	};
 
 	struct DeferredNodePathProperties {
-		Node *base = nullptr;
+		ObjectID base;
 		StringName property;
 		Variant value;
 	};
@@ -280,5 +279,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(PackedScene::GenEditState)
-
-#endif // PACKED_SCENE_H
diff --git a/engine/scene/resources/particle_process_material.cpp b/engine/scene/resources/particle_process_material.cpp
index 2c54564f..a8584e7f 100644
--- a/engine/scene/resources/particle_process_material.cpp
+++ b/engine/scene/resources/particle_process_material.cpp
@@ -172,7 +172,7 @@ void ParticleProcessMaterial::_update_shader() {
 	// No pre-existing shader, create one.
 
 	// Add a comment to describe the shader origin (useful when converting to ShaderMaterial).
-	String code = "// NOTE: Shader automatically converted from " VERSION_NAME " " VERSION_FULL_CONFIG "'s ParticleProcessMaterial.\n\n";
+	String code = "// NOTE: Shader automatically converted from " GODOT_VERSION_NAME " " GODOT_VERSION_FULL_CONFIG "'s ParticleProcessMaterial.\n\n";
 
 	code += "shader_type particles;\n";
 	code += "render_mode disable_velocity;\n";
@@ -1034,7 +1034,7 @@ void ParticleProcessMaterial::_update_shader() {
 			code += "	{\n";
 		}
 		code += "		float vel_mag = length(VELOCITY);\n";
-		code += "		float vel_infl = clamp(dynamic_params.turb_influence * turbulence_influence, 0.0, 1.0);\n";
+		code += "		float vel_infl = clamp(dynamic_params.turb_influence * turbulence_influence, 0.0, 1.0) * (DELTA <= 0.0 ? 0.0 : 1.0);\n";
 		code += "		VELOCITY = mix(VELOCITY, normalize(noise_direction) * vel_mag * (1.0 + (1.0 - vel_infl) * 0.2), vel_infl);\n";
 		code += "		vel_mag = length(controlled_displacement);\n";
 		code += "		controlled_displacement = mix(controlled_displacement, normalize(noise_direction) * vel_mag * (1.0 + (1.0 - vel_infl) * 0.2), vel_infl);\n";
@@ -1121,9 +1121,16 @@ void ParticleProcessMaterial::_update_shader() {
 		code += "		params.scale *= texture(scale_over_velocity_curve, vec2(0.0)).rgb;\n";
 		code += "	}\n";
 	}
-	code += "	TRANSFORM[0].xyz *= sign(params.scale.x) * max(abs(params.scale.x), 0.001);\n";
-	code += "	TRANSFORM[1].xyz *= sign(params.scale.y) * max(abs(params.scale.y), 0.001);\n";
-	code += "	TRANSFORM[2].xyz *= sign(params.scale.z) * max(abs(params.scale.z), 0.001);\n";
+	// A scale of 0 results in no emission at some emission amounts (including 3 and 6).
+	// `sign(scale)` is unsuitable, because sign(0) returns 0, nullifying the minimum value.
+	// The following evaluates to 1 when scale is 0, falling back to a positive minimum value.
+	code += "	float scale_sign_x = params.scale.x < 0.0 ? -1.0 : 1.0;\n";
+	code += "	float scale_sign_y = params.scale.y < 0.0 ? -1.0 : 1.0;\n";
+	code += "	float scale_sign_z = params.scale.z < 0.0 ? -1.0 : 1.0;\n";
+	code += "	float scale_minimum = 0.001;\n";
+	code += "	TRANSFORM[0].xyz *= scale_sign_x * max(abs(params.scale.x), scale_minimum);\n";
+	code += "	TRANSFORM[1].xyz *= scale_sign_y * max(abs(params.scale.y), scale_minimum);\n";
+	code += "	TRANSFORM[2].xyz *= scale_sign_z * max(abs(params.scale.z), scale_minimum);\n";
 	code += "\n";
 	code += "	CUSTOM.z = params.animation_offset + lifetime_percent * params.animation_speed;\n\n";
 
diff --git a/engine/scene/resources/particle_process_material.h b/engine/scene/resources/particle_process_material.h
index 30bf9fc3..51bb57ed 100644
--- a/engine/scene/resources/particle_process_material.h
+++ b/engine/scene/resources/particle_process_material.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLE_PROCESS_MATERIAL_H
-#define PARTICLE_PROCESS_MATERIAL_H
+#pragma once
 
 #include "core/templates/rid.h"
 #include "core/templates/self_list.h"
@@ -515,5 +514,3 @@ VARIANT_ENUM_CAST(ParticleProcessMaterial::ParticleFlags)
 VARIANT_ENUM_CAST(ParticleProcessMaterial::EmissionShape)
 VARIANT_ENUM_CAST(ParticleProcessMaterial::SubEmitterMode)
 VARIANT_ENUM_CAST(ParticleProcessMaterial::CollisionMode)
-
-#endif // PARTICLE_PROCESS_MATERIAL_H
diff --git a/engine/scene/resources/physics_material.cpp b/engine/scene/resources/physics_material.cpp
index 4510f639..cd762a58 100644
--- a/engine/scene/resources/physics_material.cpp
+++ b/engine/scene/resources/physics_material.cpp
@@ -30,6 +30,7 @@
 
 #include "physics_material.h"
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 void PhysicsMaterial::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_friction", "friction"), &PhysicsMaterial::set_friction);
 	ClassDB::bind_method(D_METHOD("get_friction"), &PhysicsMaterial::get_friction);
@@ -68,3 +69,4 @@ void PhysicsMaterial::set_absorbent(bool p_val) {
 	absorbent = p_val;
 	emit_changed();
 }
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
diff --git a/engine/scene/resources/physics_material.h b/engine/scene/resources/physics_material.h
index 2629044f..1383def3 100644
--- a/engine/scene/resources/physics_material.h
+++ b/engine/scene/resources/physics_material.h
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_MATERIAL_H
-#define PHYSICS_MATERIAL_H
+#pragma once
 
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 #include "core/io/resource.h"
 
 class PhysicsMaterial : public Resource {
@@ -69,5 +69,4 @@ public:
 
 	PhysicsMaterial() {}
 };
-
-#endif // PHYSICS_MATERIAL_H
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
diff --git a/engine/scene/resources/placeholder_textures.h b/engine/scene/resources/placeholder_textures.h
index 300d641c..101247fd 100644
--- a/engine/scene/resources/placeholder_textures.h
+++ b/engine/scene/resources/placeholder_textures.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PLACEHOLDER_TEXTURES_H
-#define PLACEHOLDER_TEXTURES_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -128,5 +127,3 @@ public:
 	PlaceholderCubemapArray() :
 			PlaceholderTextureLayered(LAYERED_TYPE_CUBEMAP_ARRAY) {}
 };
-
-#endif // PLACEHOLDER_TEXTURES_H
diff --git a/engine/scene/resources/portable_compressed_texture.cpp b/engine/scene/resources/portable_compressed_texture.cpp
index 99317af5..65fef3d6 100644
--- a/engine/scene/resources/portable_compressed_texture.cpp
+++ b/engine/scene/resources/portable_compressed_texture.cpp
@@ -34,8 +34,25 @@
 #include "core/io/marshalls.h"
 #include "scene/resources/bit_map.h"
 
+static const char *compression_mode_names[7] = {
+	"Lossless", "Lossy", "Basis Universal", "S3TC", "ETC2", "BPTC", "ASTC"
+};
+
+static PortableCompressedTexture2D::CompressionMode get_expected_compression_mode(Image::Format format) {
+	if ((format >= Image::FORMAT_DXT1 && format <= Image::FORMAT_RGTC_RG) || format == Image::FORMAT_DXT5_RA_AS_RG) {
+		return PortableCompressedTexture2D::COMPRESSION_MODE_S3TC;
+	} else if (format >= Image::FORMAT_ETC && format <= Image::FORMAT_ETC2_RA_AS_RG) {
+		return PortableCompressedTexture2D::COMPRESSION_MODE_ETC2;
+	} else if (format >= Image::FORMAT_BPTC_RGBA && format <= Image::FORMAT_BPTC_RGBFU) {
+		return PortableCompressedTexture2D::COMPRESSION_MODE_BPTC;
+	} else if (format >= Image::FORMAT_ASTC_4x4 && format <= Image::FORMAT_ASTC_8x8_HDR) {
+		return PortableCompressedTexture2D::COMPRESSION_MODE_ASTC;
+	}
+	ERR_FAIL_V(PortableCompressedTexture2D::COMPRESSION_MODE_LOSSLESS);
+}
+
 void PortableCompressedTexture2D::_set_data(const Vector<uint8_t> &p_data) {
-	if (p_data.size() == 0) {
+	if (p_data.is_empty()) {
 		return; //nothing to do
 	}
 
@@ -95,11 +112,12 @@ void PortableCompressedTexture2D::_set_data(const Vector<uint8_t> &p_data) {
 		case COMPRESSION_MODE_BASIS_UNIVERSAL: {
 			ERR_FAIL_NULL(Image::basis_universal_unpacker_ptr);
 			image = Image::basis_universal_unpacker_ptr(data, data_size);
-
+			format = image->get_format();
 		} break;
 		case COMPRESSION_MODE_S3TC:
 		case COMPRESSION_MODE_ETC2:
-		case COMPRESSION_MODE_BPTC: {
+		case COMPRESSION_MODE_BPTC:
+		case COMPRESSION_MODE_ASTC: {
 			image.instantiate(size.width, size.height, mipmaps, format, p_data.slice(20));
 		} break;
 	}
@@ -171,31 +189,45 @@ void PortableCompressedTexture2D::create_from_image(const Ref<Image> &p_image, C
 			}
 		} break;
 		case COMPRESSION_MODE_BASIS_UNIVERSAL: {
+#ifdef TOOLS_ENABLED
+			ERR_FAIL_COND(p_image->is_compressed());
 			encode_uint16(DATA_FORMAT_BASIS_UNIVERSAL, buffer.ptrw() + 2);
 			Image::UsedChannels uc = p_image->detect_used_channels(p_normal_map ? Image::COMPRESS_SOURCE_NORMAL : Image::COMPRESS_SOURCE_GENERIC);
 			Vector<uint8_t> budata = Image::basis_universal_packer(p_image, uc);
 			buffer.append_array(budata);
-
+#else
+			ERR_FAIL_MSG("Basis Universal compression can only run in editor build.");
+#endif
 		} break;
 		case COMPRESSION_MODE_S3TC:
 		case COMPRESSION_MODE_ETC2:
-		case COMPRESSION_MODE_BPTC: {
+		case COMPRESSION_MODE_BPTC:
+		case COMPRESSION_MODE_ASTC: {
 			encode_uint16(DATA_FORMAT_IMAGE, buffer.ptrw() + 2);
-			Ref<Image> copy = p_image->duplicate();
-			switch (p_compression_mode) {
-				case COMPRESSION_MODE_S3TC:
-					copy->compress(Image::COMPRESS_S3TC);
-					break;
-				case COMPRESSION_MODE_ETC2:
-					copy->compress(Image::COMPRESS_ETC2);
-					break;
-				case COMPRESSION_MODE_BPTC:
-					copy->compress(Image::COMPRESS_BPTC);
-					break;
-				default: {
-				};
+			Ref<Image> copy = p_image;
+			if (p_image->is_compressed()) {
+				CompressionMode expected_compression_mode = get_expected_compression_mode(p_image->get_format());
+				ERR_FAIL_COND_MSG(expected_compression_mode != p_compression_mode, vformat("Mismatched compression mode for image format %s, expected %s, got %s.", Image::get_format_name(p_image->get_format()), compression_mode_names[expected_compression_mode], compression_mode_names[p_compression_mode]));
+			} else {
+				copy = p_image->duplicate();
+				switch (p_compression_mode) {
+					case COMPRESSION_MODE_S3TC:
+						copy->compress(Image::COMPRESS_S3TC);
+						break;
+					case COMPRESSION_MODE_ETC2:
+						copy->compress(Image::COMPRESS_ETC2);
+						break;
+					case COMPRESSION_MODE_BPTC:
+						copy->compress(Image::COMPRESS_BPTC);
+						break;
+					case COMPRESSION_MODE_ASTC:
+						copy->compress(Image::COMPRESS_ASTC);
+						break;
+					default: {
+					}
+				}
 			}
-
+			encode_uint32(copy->get_format(), buffer.ptrw() + 4);
 			buffer.append_array(copy->get_data());
 
 		} break;
@@ -355,6 +387,7 @@ void PortableCompressedTexture2D::_bind_methods() {
 	BIND_ENUM_CONSTANT(COMPRESSION_MODE_S3TC);
 	BIND_ENUM_CONSTANT(COMPRESSION_MODE_ETC2);
 	BIND_ENUM_CONSTANT(COMPRESSION_MODE_BPTC);
+	BIND_ENUM_CONSTANT(COMPRESSION_MODE_ASTC);
 }
 
 PortableCompressedTexture2D::PortableCompressedTexture2D() {}
diff --git a/engine/scene/resources/portable_compressed_texture.h b/engine/scene/resources/portable_compressed_texture.h
index 3103c2da..9ddd48ad 100644
--- a/engine/scene/resources/portable_compressed_texture.h
+++ b/engine/scene/resources/portable_compressed_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PORTABLE_COMPRESSED_TEXTURE_H
-#define PORTABLE_COMPRESSED_TEXTURE_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -54,6 +53,7 @@ public:
 		COMPRESSION_MODE_S3TC,
 		COMPRESSION_MODE_ETC2,
 		COMPRESSION_MODE_BPTC,
+		COMPRESSION_MODE_ASTC,
 	};
 
 private:
@@ -114,5 +114,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(PortableCompressedTexture2D::CompressionMode)
-
-#endif // PORTABLE_COMPRESSED_TEXTURE_H
diff --git a/engine/scene/resources/resource_format_text.cpp b/engine/scene/resources/resource_format_text.cpp
index f1cfb5c5..93832144 100644
--- a/engine/scene/resources/resource_format_text.cpp
+++ b/engine/scene/resources/resource_format_text.cpp
@@ -1674,14 +1674,11 @@ void ResourceFormatSaverTextInstance::_find_resources(const Variant &p_variant,
 			Dictionary d = p_variant;
 			_find_resources(d.get_typed_key_script());
 			_find_resources(d.get_typed_value_script());
-			List<Variant> keys;
-			d.get_key_list(&keys);
-			for (const Variant &E : keys) {
+			for (const KeyValue<Variant, Variant> &kv : d) {
 				// Of course keys should also be cached, after all we can't prevent users from using resources as keys, right?
 				// See also ResourceFormatSaverBinaryInstance::_find_resources (when p_variant is of type Variant::DICTIONARY)
-				_find_resources(E);
-				Variant v = d[E];
-				_find_resources(v);
+				_find_resources(kv.key);
+				_find_resources(kv.value);
 			}
 		} break;
 		case Variant::PACKED_BYTE_ARRAY: {
@@ -1908,18 +1905,18 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path, const Ref<Reso
 
 		List<PropertyInfo> property_list;
 		res->get_property_list(&property_list);
-		for (List<PropertyInfo>::Element *PE = property_list.front(); PE; PE = PE->next()) {
-			if (skip_editor && PE->get().name.begins_with("__editor")) {
+		for (const PropertyInfo &pi : property_list) {
+			if (skip_editor && pi.name.begins_with("__editor")) {
 				continue;
 			}
-			if (PE->get().name == META_PROPERTY_MISSING_RESOURCES) {
+			if (pi.name == META_PROPERTY_MISSING_RESOURCES) {
 				continue;
 			}
 
-			if (PE->get().usage & PROPERTY_USAGE_STORAGE || missing_resource_properties.has(PE->get().name)) {
-				String name = PE->get().name;
+			if (pi.usage & PROPERTY_USAGE_STORAGE || missing_resource_properties.has(pi.name)) {
+				String name = pi.name;
 				Variant value;
-				if (PE->get().usage & PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT) {
+				if (pi.usage & PROPERTY_USAGE_RESOURCE_NOT_PERSISTENT) {
 					NonPersistentKey npk;
 					npk.base = res;
 					npk.property = name;
@@ -1930,11 +1927,11 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path, const Ref<Reso
 					value = res->get(name);
 				}
 
-				if (PE->get().type == Variant::OBJECT && missing_resource_properties.has(PE->get().name)) {
+				if (pi.type == Variant::OBJECT && missing_resource_properties.has(pi.name)) {
 					// Was this missing resource overridden? If so do not save the old value.
 					Ref<Resource> ures = value;
 					if (ures.is_null()) {
-						value = missing_resource_properties[PE->get().name];
+						value = missing_resource_properties[pi.name];
 					}
 				}
 
@@ -1944,7 +1941,7 @@ Error ResourceFormatSaverTextInstance::save(const String &p_path, const Ref<Reso
 					continue;
 				}
 
-				if (PE->get().type == Variant::OBJECT && value.is_zero() && !(PE->get().usage & PROPERTY_USAGE_STORE_IF_NULL)) {
+				if (pi.type == Variant::OBJECT && value.is_zero() && !(pi.usage & PROPERTY_USAGE_STORE_IF_NULL)) {
 					continue;
 				}
 
diff --git a/engine/scene/resources/resource_format_text.h b/engine/scene/resources/resource_format_text.h
index 4c0bf3d9..644b90b3 100644
--- a/engine/scene/resources/resource_format_text.h
+++ b/engine/scene/resources/resource_format_text.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOURCE_FORMAT_TEXT_H
-#define RESOURCE_FORMAT_TEXT_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
@@ -213,5 +212,3 @@ public:
 
 	ResourceFormatSaverText();
 };
-
-#endif // RESOURCE_FORMAT_TEXT_H
diff --git a/engine/scene/resources/shader.cpp b/engine/scene/resources/shader.cpp
index d163a42f..ce44f90e 100644
--- a/engine/scene/resources/shader.cpp
+++ b/engine/scene/resources/shader.cpp
@@ -198,8 +198,8 @@ void Shader::get_shader_uniform_list(List<PropertyInfo> *p_params, bool p_get_gr
 		}
 	}
 #ifdef TOOLS_ENABLED
-	if (EditorHelp::get_doc_data() != nullptr && Engine::get_singleton()->is_editor_hint() && !class_doc.name.is_empty() && p_params) {
-		EditorHelp::get_doc_data()->add_doc(class_doc);
+	if (Engine::get_singleton()->is_editor_hint() && !class_doc.name.is_empty() && p_params) {
+		EditorHelp::add_doc(class_doc);
 	}
 #endif
 }
@@ -312,7 +312,7 @@ Ref<Resource> ResourceFormatLoaderShader::load(const String &p_path, const Strin
 
 	String str;
 	if (buffer.size() > 0) {
-		error = str.parse_utf8((const char *)buffer.ptr(), buffer.size());
+		error = str.append_utf8((const char *)buffer.ptr(), buffer.size());
 		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader: " + p_path);
 	}
 
diff --git a/engine/scene/resources/shader.h b/engine/scene/resources/shader.h
index 7234d375..312b90da 100644
--- a/engine/scene/resources/shader.h
+++ b/engine/scene/resources/shader.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_H
-#define SHADER_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/io/resource_loader.h"
@@ -120,5 +119,3 @@ public:
 	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
 	virtual bool recognize(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // SHADER_H
diff --git a/engine/scene/resources/shader_include.cpp b/engine/scene/resources/shader_include.cpp
index 2a2cd3d9..f134ca42 100644
--- a/engine/scene/resources/shader_include.cpp
+++ b/engine/scene/resources/shader_include.cpp
@@ -94,7 +94,7 @@ Ref<Resource> ResourceFormatLoaderShaderInclude::load(const String &p_path, cons
 
 	String str;
 	if (buffer.size() > 0) {
-		error = str.parse_utf8((const char *)buffer.ptr(), buffer.size());
+		error = str.append_utf8((const char *)buffer.ptr(), buffer.size());
 		ERR_FAIL_COND_V_MSG(error, nullptr, "Cannot parse shader include: " + p_path);
 	}
 
diff --git a/engine/scene/resources/shader_include.h b/engine/scene/resources/shader_include.h
index 9fb42716..35bdb7ae 100644
--- a/engine/scene/resources/shader_include.h
+++ b/engine/scene/resources/shader_include.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_INCLUDE_H
-#define SHADER_INCLUDE_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/io/resource_loader.h"
@@ -70,5 +69,3 @@ public:
 	virtual void get_recognized_extensions(const Ref<Resource> &p_resource, List<String> *p_extensions) const override;
 	virtual bool recognize(const Ref<Resource> &p_resource) const override;
 };
-
-#endif // SHADER_INCLUDE_H
diff --git a/engine/scene/resources/skeleton_profile.h b/engine/scene/resources/skeleton_profile.h
index 9361c6a9..a5689d19 100644
--- a/engine/scene/resources/skeleton_profile.h
+++ b/engine/scene/resources/skeleton_profile.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKELETON_PROFILE_H
-#define SKELETON_PROFILE_H
+#pragma once
 
 #include "texture.h"
 
@@ -137,5 +136,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(SkeletonProfile::TailDirection);
-
-#endif // SKELETON_PROFILE_H
diff --git a/engine/scene/resources/sky.h b/engine/scene/resources/sky.h
index 3316142f..430b9640 100644
--- a/engine/scene/resources/sky.h
+++ b/engine/scene/resources/sky.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKY_H
-#define SKY_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "scene/resources/material.h"
@@ -83,5 +82,3 @@ public:
 
 VARIANT_ENUM_CAST(Sky::RadianceSize)
 VARIANT_ENUM_CAST(Sky::ProcessMode)
-
-#endif // SKY_H
diff --git a/engine/scene/resources/sprite_frames.h b/engine/scene/resources/sprite_frames.h
index 8d5b4232..ee767509 100644
--- a/engine/scene/resources/sprite_frames.h
+++ b/engine/scene/resources/sprite_frames.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPRITE_FRAMES_H
-#define SPRITE_FRAMES_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -110,5 +109,3 @@ public:
 
 	SpriteFrames();
 };
-
-#endif // SPRITE_FRAMES_H
diff --git a/engine/scene/resources/style_box.h b/engine/scene/resources/style_box.h
index e1f392de..7639d139 100644
--- a/engine/scene/resources/style_box.h
+++ b/engine/scene/resources/style_box.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STYLE_BOX_H
-#define STYLE_BOX_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -81,5 +80,3 @@ public:
 	virtual void draw(RID p_canvas_item, const Rect2 &p_rect) const override {}
 	StyleBoxEmpty() {}
 };
-
-#endif // STYLE_BOX_H
diff --git a/engine/scene/resources/style_box_flat.cpp b/engine/scene/resources/style_box_flat.cpp
index e4dd48d1..ff8cdfde 100644
--- a/engine/scene/resources/style_box_flat.cpp
+++ b/engine/scene/resources/style_box_flat.cpp
@@ -234,6 +234,79 @@ inline void set_inner_corner_radius(const Rect2 style_rect, const Rect2 inner_re
 	inner_corner_radius[3] = MAX(corner_radius[3] - MIN(border_bottom, border_left), 0); // Bottom left.
 }
 
+inline void set_corner_scale(const Rect2 &style_rect, const Rect2 &inner_rect, const real_t corner_radius[4], Point2 *inner_scale) {
+	real_t border_left = inner_rect.position.x - style_rect.position.x;
+	real_t border_top = inner_rect.position.y - style_rect.position.y;
+	real_t border_right = style_rect.size.width - inner_rect.size.width - border_left;
+	real_t border_bottom = style_rect.size.height - inner_rect.size.height - border_top;
+
+	// Amount of overflow along an edge.
+	// Ex. SIDE_LEFT edge is the overflow between top_left and bottom_left corners.
+	// MIN(0,) is to ignore underflow, and negating is to make values positive.
+	real_t edge_overflow[4] = {
+		-MIN(0, inner_rect.size.y - corner_radius[CORNER_TOP_LEFT] - corner_radius[CORNER_BOTTOM_LEFT]),
+		-MIN(0, inner_rect.size.x - corner_radius[CORNER_TOP_LEFT] - corner_radius[CORNER_TOP_RIGHT]),
+		-MIN(0, inner_rect.size.y - corner_radius[CORNER_TOP_RIGHT] - corner_radius[CORNER_BOTTOM_RIGHT]),
+		-MIN(0, inner_rect.size.x - corner_radius[CORNER_BOTTOM_LEFT] - corner_radius[CORNER_BOTTOM_RIGHT])
+	};
+
+	// Sums of borders.
+	real_t hb_sum = border_left + border_right;
+	real_t vb_sum = border_top + border_bottom;
+
+	// Ratio of each side to the sum of itself and opposite side.
+	// Since overflow only happens with opposite borders, you only need to get the ratio of each border relative to the sum of involved borders.
+	real_t ratios[4] = {
+		// Prevent divide by 0 errors.
+		hb_sum > 0 ? (border_left / hb_sum) : 0,
+		vb_sum > 0 ? (border_top / vb_sum) : 0,
+		hb_sum > 0 ? (border_right / hb_sum) : 0,
+		vb_sum > 0 ? (border_bottom / vb_sum) : 0
+	};
+
+	// Raw amount each corner should shrink.
+	Point2 corner_reduction[4] = {
+		Point2(edge_overflow[SIDE_TOP] * ratios[SIDE_LEFT], edge_overflow[SIDE_LEFT] * ratios[SIDE_TOP]),
+		Point2(edge_overflow[SIDE_TOP] * ratios[SIDE_RIGHT], edge_overflow[SIDE_RIGHT] * ratios[SIDE_TOP]),
+		Point2(edge_overflow[SIDE_BOTTOM] * ratios[SIDE_RIGHT], edge_overflow[SIDE_RIGHT] * ratios[SIDE_BOTTOM]),
+		Point2(edge_overflow[SIDE_BOTTOM] * ratios[SIDE_LEFT], edge_overflow[SIDE_LEFT] * ratios[SIDE_BOTTOM]),
+	};
+
+	// Corner Radii as Point2s.
+	Point2 pcr[4] = {
+		Point2(corner_radius[0], corner_radius[0]),
+		Point2(corner_radius[1], corner_radius[1]),
+		Point2(corner_radius[2], corner_radius[2]),
+		Point2(corner_radius[3], corner_radius[3]),
+	};
+
+	// If corner radii are too small, they won't shrink the full amount.
+	// Adjacent corners will have to shrink the leftovers if they can.
+	// Minf(0) is to ignore non-leftovers, and negating is to make values positive.
+	Point2 leftovers[4] = {
+		-((pcr[0] - corner_reduction[0]).minf(0)),
+		-((pcr[1] - corner_reduction[1]).minf(0)),
+		-((pcr[2] - corner_reduction[2]).minf(0)),
+		-((pcr[3] - corner_reduction[3]).minf(0)),
+	};
+
+	// New shrunken radii after distributing the leftovers.
+	Point2 distributed[4] = {
+		((pcr[0] - corner_reduction[0] - leftovers[3] - leftovers[1]).maxf(0)),
+		((pcr[1] - corner_reduction[1] - leftovers[0] - leftovers[2]).maxf(0)),
+		((pcr[2] - corner_reduction[2] - leftovers[1] - leftovers[3]).maxf(0)),
+		((pcr[3] - corner_reduction[3] - leftovers[2] - leftovers[0]).maxf(0)),
+	};
+
+	// How much the curve should scale to achieve the shrunken radii.
+	for (int i = 0; i < 4; i++) {
+		// Unshrinkable is how much is still left over, even after distributing leftovers.
+		// Exclude it from the final scale.
+		Point2 unshrinkable = (leftovers[(i + 1) % 4] + leftovers[(i + 4 - 1) % 4] - distributed[i]).maxf(0);
+		inner_scale[i] = distributed[i] / (pcr[i] - unshrinkable).maxf(FLT_EPSILON);
+	}
+}
+
 inline void draw_rounded_rectangle(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color> &colors, const Rect2 &style_rect, const real_t corner_radius[4],
 		const Rect2 &ring_rect, const Rect2 &inner_rect, const Color &inner_color, const Color &outer_color, const int corner_detail, const Vector2 &skew, bool is_filled = false) {
 	int vert_offset = verts.size();
@@ -244,28 +317,35 @@ inline void draw_rounded_rectangle(Vector<Vector2> &verts, Vector<int> &indices,
 	real_t ring_corner_radius[4];
 	set_inner_corner_radius(style_rect, ring_rect, corner_radius, ring_corner_radius);
 
+	Point2 ring_scale[4];
+	set_corner_scale(style_rect, ring_rect, ring_corner_radius, ring_scale);
+
 	// Corner radius center points.
 	Vector<Point2> outer_points = {
-		ring_rect.position + Vector2(ring_corner_radius[0], ring_corner_radius[0]), //tl
-		Point2(ring_rect.position.x + ring_rect.size.x - ring_corner_radius[1], ring_rect.position.y + ring_corner_radius[1]), //tr
-		ring_rect.position + ring_rect.size - Vector2(ring_corner_radius[2], ring_corner_radius[2]), //br
-		Point2(ring_rect.position.x + ring_corner_radius[3], ring_rect.position.y + ring_rect.size.y - ring_corner_radius[3]) //bl
+		ring_rect.position + Vector2(ring_corner_radius[0], ring_corner_radius[0]) * ring_scale[0], //tl
+		Point2(ring_rect.position.x + ring_rect.size.x - ring_corner_radius[1] * ring_scale[1].x, ring_rect.position.y + ring_corner_radius[1] * ring_scale[1].y), //tr
+		ring_rect.position + ring_rect.size - Vector2(ring_corner_radius[2], ring_corner_radius[2]) * ring_scale[2], //br
+		Point2(ring_rect.position.x + ring_corner_radius[3] * ring_scale[3].x, ring_rect.position.y + ring_rect.size.y - ring_corner_radius[3] * ring_scale[3].y) //bl
 	};
 
 	real_t inner_corner_radius[4];
 	set_inner_corner_radius(style_rect, inner_rect, corner_radius, inner_corner_radius);
 
+	Point2 inner_scale[4];
+	set_corner_scale(style_rect, inner_rect, inner_corner_radius, inner_scale);
+
 	Vector<Point2> inner_points = {
-		inner_rect.position + Vector2(inner_corner_radius[0], inner_corner_radius[0]), //tl
-		Point2(inner_rect.position.x + inner_rect.size.x - inner_corner_radius[1], inner_rect.position.y + inner_corner_radius[1]), //tr
-		inner_rect.position + inner_rect.size - Vector2(inner_corner_radius[2], inner_corner_radius[2]), //br
-		Point2(inner_rect.position.x + inner_corner_radius[3], inner_rect.position.y + inner_rect.size.y - inner_corner_radius[3]) //bl
+		inner_rect.position + Vector2(inner_corner_radius[0], inner_corner_radius[0]) * inner_scale[0], //tl
+		Point2(inner_rect.position.x + inner_rect.size.x - inner_corner_radius[1] * inner_scale[1].x, inner_rect.position.y + inner_corner_radius[1] * inner_scale[1].y), //tr
+		inner_rect.position + inner_rect.size - Vector2(inner_corner_radius[2], inner_corner_radius[2]) * inner_scale[2], //br
+		Point2(inner_rect.position.x + inner_corner_radius[3] * inner_scale[3].x, inner_rect.position.y + inner_rect.size.y - inner_corner_radius[3] * inner_scale[3].y) //bl
 	};
+
 	// Calculate the vertices.
 
 	// If the center is filled, we do not draw the border and directly use the inner ring as reference. Because all calls to this
 	// method either draw a ring or a filled rounded rectangle, but not both.
-	const real_t quarter_arc_rad = Math_PI / 2.0;
+	const real_t quarter_arc_rad = Math::PI / 2.0;
 	const Point2 style_rect_center = style_rect.get_center();
 
 	const int colors_size = colors.size();
@@ -284,13 +364,13 @@ inline void draw_rounded_rectangle(Vector<Vector2> &verts, Vector<int> &indices,
 				idx_ofs *= 2;
 			}
 
-			const real_t pt_angle = (corner_idx + detail / (double)adapted_corner_detail) * quarter_arc_rad + Math_PI;
+			const real_t pt_angle = (corner_idx + detail / (double)adapted_corner_detail) * quarter_arc_rad + Math::PI;
 			const real_t angle_cosine = Math::cos(pt_angle);
 			const real_t angle_sine = Math::sin(pt_angle);
 
 			{
-				const real_t x = inner_corner_radius[corner_idx] * angle_cosine + inner_points[corner_idx].x;
-				const real_t y = inner_corner_radius[corner_idx] * angle_sine + inner_points[corner_idx].y;
+				const real_t x = inner_corner_radius[corner_idx] * angle_cosine * inner_scale[corner_idx].x + inner_points[corner_idx].x;
+				const real_t y = inner_corner_radius[corner_idx] * angle_sine * inner_scale[corner_idx].y + inner_points[corner_idx].y;
 				const float x_skew = -skew.x * (y - style_rect_center.y);
 				const float y_skew = -skew.y * (x - style_rect_center.x);
 				verts_ptr[verts_size + idx_ofs] = Vector2(x + x_skew, y + y_skew);
@@ -298,8 +378,8 @@ inline void draw_rounded_rectangle(Vector<Vector2> &verts, Vector<int> &indices,
 			}
 
 			if (draw_border) {
-				const real_t x = ring_corner_radius[corner_idx] * angle_cosine + outer_points[corner_idx].x;
-				const real_t y = ring_corner_radius[corner_idx] * angle_sine + outer_points[corner_idx].y;
+				const real_t x = ring_corner_radius[corner_idx] * angle_cosine * ring_scale[corner_idx].x + outer_points[corner_idx].x;
+				const real_t y = ring_corner_radius[corner_idx] * angle_sine * ring_scale[corner_idx].y + outer_points[corner_idx].y;
 				const float x_skew = -skew.x * (y - style_rect_center.y);
 				const float y_skew = -skew.y * (x - style_rect_center.x);
 				verts_ptr[verts_size + idx_ofs + 1] = Vector2(x + x_skew, y + y_skew);
diff --git a/engine/scene/resources/style_box_flat.h b/engine/scene/resources/style_box_flat.h
index b6bb145f..65c7cc98 100644
--- a/engine/scene/resources/style_box_flat.h
+++ b/engine/scene/resources/style_box_flat.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STYLE_BOX_FLAT_H
-#define STYLE_BOX_FLAT_H
+#pragma once
 
 #include "scene/resources/style_box.h"
 
@@ -114,5 +113,3 @@ public:
 	StyleBoxFlat();
 	~StyleBoxFlat();
 };
-
-#endif // STYLE_BOX_FLAT_H
diff --git a/engine/scene/resources/style_box_line.h b/engine/scene/resources/style_box_line.h
index 18f765a1..afaaa526 100644
--- a/engine/scene/resources/style_box_line.h
+++ b/engine/scene/resources/style_box_line.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STYLE_BOX_LINE_H
-#define STYLE_BOX_LINE_H
+#pragma once
 
 #include "scene/resources/style_box.h"
 
@@ -66,5 +65,3 @@ public:
 	StyleBoxLine();
 	~StyleBoxLine();
 };
-
-#endif // STYLE_BOX_LINE_H
diff --git a/engine/scene/resources/style_box_texture.h b/engine/scene/resources/style_box_texture.h
index b1b833f4..bc15a8f0 100644
--- a/engine/scene/resources/style_box_texture.h
+++ b/engine/scene/resources/style_box_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef STYLE_BOX_TEXTURE_H
-#define STYLE_BOX_TEXTURE_H
+#pragma once
 
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
@@ -95,5 +94,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(StyleBoxTexture::AxisStretchMode)
-
-#endif // STYLE_BOX_TEXTURE_H
diff --git a/engine/scene/resources/surface_tool.cpp b/engine/scene/resources/surface_tool.cpp
index ce17cf87..226ff0cc 100644
--- a/engine/scene/resources/surface_tool.cpp
+++ b/engine/scene/resources/surface_tool.cpp
@@ -645,8 +645,7 @@ Array SurfaceTool::commit_to_arrays() {
 			case Mesh::ARRAY_BONES: {
 				int count = skin_weights == SKIN_8_WEIGHTS ? 8 : 4;
 				Vector<int> array;
-				array.resize(varr_len * count);
-				array.fill(0);
+				array.resize_zeroed(varr_len * count);
 				int *w = array.ptrw();
 
 				for (uint32_t idx = 0; idx < vertex_array.size(); idx++) {
@@ -669,8 +668,7 @@ Array SurfaceTool::commit_to_arrays() {
 				Vector<float> array;
 				int count = skin_weights == SKIN_8_WEIGHTS ? 8 : 4;
 
-				array.resize(varr_len * count);
-				array.fill(0.0f);
+				array.resize_zeroed(varr_len * count);
 				float *w = array.ptrw();
 
 				for (uint32_t idx = 0; idx < vertex_array.size(); idx++) {
@@ -774,7 +772,7 @@ void SurfaceTool::index() {
 }
 
 void SurfaceTool::deindex() {
-	if (index_array.size() == 0) {
+	if (index_array.is_empty()) {
 		return; //nothing to deindex
 	}
 
@@ -1022,7 +1020,7 @@ void SurfaceTool::create_from_blend_shape(const Ref<Mesh> &p_existing, int p_sur
 void SurfaceTool::append_from(const Ref<Mesh> &p_existing, int p_surface, const Transform3D &p_xform) {
 	ERR_FAIL_COND_MSG(p_existing.is_null(), "First argument in SurfaceTool::append_from() must be a valid object of type Mesh");
 
-	if (vertex_array.size() == 0) {
+	if (vertex_array.is_empty()) {
 		primitive = p_existing->surface_get_primitive_type(p_surface);
 		format = 0;
 	}
diff --git a/engine/scene/resources/surface_tool.h b/engine/scene/resources/surface_tool.h
index a8f7e5c7..379c58d4 100644
--- a/engine/scene/resources/surface_tool.h
+++ b/engine/scene/resources/surface_tool.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SURFACE_TOOL_H
-#define SURFACE_TOOL_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/resources/mesh.h"
@@ -246,5 +245,3 @@ public:
 
 VARIANT_ENUM_CAST(SurfaceTool::CustomFormat)
 VARIANT_ENUM_CAST(SurfaceTool::SkinWeightCount)
-
-#endif // SURFACE_TOOL_H
diff --git a/engine/scene/resources/syntax_highlighter.cpp b/engine/scene/resources/syntax_highlighter.cpp
index 5a835b64..084a160a 100644
--- a/engine/scene/resources/syntax_highlighter.cpp
+++ b/engine/scene/resources/syntax_highlighter.cpp
@@ -537,16 +537,13 @@ bool CodeHighlighter::has_color_region(const String &p_start_key) const {
 void CodeHighlighter::set_color_regions(const Dictionary &p_color_regions) {
 	color_regions.clear();
 
-	List<Variant> keys;
-	p_color_regions.get_key_list(&keys);
+	for (const KeyValue<Variant, Variant> &kv : p_color_regions) {
+		String key = kv.key;
 
-	for (const Variant &E : keys) {
-		String key = E;
+		String start_key = key.get_slicec(' ', 0);
+		String end_key = key.get_slice_count(" ") > 1 ? key.get_slicec(' ', 1) : String();
 
-		String start_key = key.get_slice(" ", 0);
-		String end_key = key.get_slice_count(" ") > 1 ? key.get_slice(" ", 1) : String();
-
-		add_color_region(start_key, end_key, p_color_regions[key], end_key.is_empty());
+		add_color_region(start_key, end_key, kv.value, end_key.is_empty());
 	}
 	clear_highlighting_cache();
 }
diff --git a/engine/scene/resources/syntax_highlighter.h b/engine/scene/resources/syntax_highlighter.h
index 02afd904..b370058d 100644
--- a/engine/scene/resources/syntax_highlighter.h
+++ b/engine/scene/resources/syntax_highlighter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SYNTAX_HIGHLIGHTER_H
-#define SYNTAX_HIGHLIGHTER_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -144,5 +143,3 @@ public:
 
 	void set_uint_suffix_enabled(bool p_enabled);
 };
-
-#endif // SYNTAX_HIGHLIGHTER_H
diff --git a/engine/scene/resources/text_file.cpp b/engine/scene/resources/text_file.cpp
index 9960e1e8..b30f0a41 100644
--- a/engine/scene/resources/text_file.cpp
+++ b/engine/scene/resources/text_file.cpp
@@ -64,7 +64,7 @@ Error TextFile::load_text(const String &p_path) {
 	w[len] = 0;
 
 	String s;
-	ERR_FAIL_COND_V_MSG(s.parse_utf8((const char *)w) != OK, ERR_INVALID_DATA, "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
+	ERR_FAIL_COND_V_MSG(s.append_utf8((const char *)w) != OK, ERR_INVALID_DATA, "Script '" + p_path + "' contains invalid unicode (UTF-8), so it was not loaded. Please ensure that scripts are saved in valid UTF-8 unicode.");
 	text = s;
 	path = p_path;
 #ifdef TOOLS_ENABLED
diff --git a/engine/scene/resources/text_file.h b/engine/scene/resources/text_file.h
index aac8eb6a..4533d3c6 100644
--- a/engine/scene/resources/text_file.h
+++ b/engine/scene/resources/text_file.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_FILE_H
-#define TEXT_FILE_H
+#pragma once
 
 #include "core/io/resource.h"
 
@@ -52,5 +51,3 @@ public:
 	void set_file_path(const String &p_path) { path = p_path; }
 	Error load_text(const String &p_path);
 };
-
-#endif // TEXT_FILE_H
diff --git a/engine/scene/resources/text_line.cpp b/engine/scene/resources/text_line.cpp
index af241e4f..c896d293 100644
--- a/engine/scene/resources/text_line.cpp
+++ b/engine/scene/resources/text_line.cpp
@@ -35,6 +35,7 @@ void TextLine::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_direction", "direction"), &TextLine::set_direction);
 	ClassDB::bind_method(D_METHOD("get_direction"), &TextLine::get_direction);
+	ClassDB::bind_method(D_METHOD("get_inferred_direction"), &TextLine::get_inferred_direction);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "direction", PROPERTY_HINT_ENUM, "Auto,Left-to-right,Right-to-left"), "set_direction", "get_direction");
 
@@ -79,7 +80,7 @@ void TextLine::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_text_overrun_behavior", "overrun_behavior"), &TextLine::set_text_overrun_behavior);
 	ClassDB::bind_method(D_METHOD("get_text_overrun_behavior"), &TextLine::get_text_overrun_behavior);
 
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis (6+ Characters),Word Ellipsis (6+ Characters),Ellipsis (Always),Word Ellipsis (Always)"), "set_text_overrun_behavior", "get_text_overrun_behavior");
 
 	ClassDB::bind_method(D_METHOD("set_ellipsis_char", "char"), &TextLine::set_ellipsis_char);
 	ClassDB::bind_method(D_METHOD("get_ellipsis_char"), &TextLine::get_ellipsis_char);
@@ -118,6 +119,17 @@ void TextLine::_shape() const {
 		BitField<TextServer::TextOverrunFlag> overrun_flags = TextServer::OVERRUN_NO_TRIM;
 		if (overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) {
 			switch (overrun_behavior) {
+				case TextServer::OVERRUN_TRIM_WORD_ELLIPSIS_FORCE: {
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM_WORD_ONLY);
+					overrun_flags.set_flag(TextServer::OVERRUN_ADD_ELLIPSIS);
+					overrun_flags.set_flag(TextServer::OVERRUN_ENFORCE_ELLIPSIS);
+				} break;
+				case TextServer::OVERRUN_TRIM_ELLIPSIS_FORCE: {
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
+					overrun_flags.set_flag(TextServer::OVERRUN_ADD_ELLIPSIS);
+					overrun_flags.set_flag(TextServer::OVERRUN_ENFORCE_ELLIPSIS);
+				} break;
 				case TextServer::OVERRUN_TRIM_WORD_ELLIPSIS:
 					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
 					overrun_flags.set_flag(TextServer::OVERRUN_TRIM_WORD_ONLY);
@@ -189,6 +201,10 @@ TextServer::Direction TextLine::get_direction() const {
 	return TS->shaped_text_get_direction(rid);
 }
 
+TextServer::Direction TextLine::get_inferred_direction() const {
+	return TS->shaped_text_get_inferred_direction(rid);
+}
+
 void TextLine::set_orientation(TextServer::Orientation p_orientation) {
 	TS->shaped_text_set_orientation(rid, p_orientation);
 	dirty = true;
diff --git a/engine/scene/resources/text_line.h b/engine/scene/resources/text_line.h
index 130488fa..41dec6f0 100644
--- a/engine/scene/resources/text_line.h
+++ b/engine/scene/resources/text_line.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_LINE_H
-#define TEXT_LINE_H
+#pragma once
 
 #include "scene/resources/font.h"
 #include "servers/text_server.h"
@@ -64,6 +63,7 @@ public:
 
 	void set_direction(TextServer::Direction p_direction);
 	TextServer::Direction get_direction() const;
+	TextServer::Direction get_inferred_direction() const;
 
 	void set_bidi_override(const Array &p_override);
 
@@ -117,5 +117,3 @@ public:
 	TextLine();
 	~TextLine();
 };
-
-#endif // TEXT_LINE_H
diff --git a/engine/scene/resources/text_paragraph.cpp b/engine/scene/resources/text_paragraph.cpp
index e3f2ebcc..a11fe229 100644
--- a/engine/scene/resources/text_paragraph.cpp
+++ b/engine/scene/resources/text_paragraph.cpp
@@ -35,6 +35,7 @@ void TextParagraph::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_direction", "direction"), &TextParagraph::set_direction);
 	ClassDB::bind_method(D_METHOD("get_direction"), &TextParagraph::get_direction);
+	ClassDB::bind_method(D_METHOD("get_inferred_direction"), &TextParagraph::get_inferred_direction);
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "direction", PROPERTY_HINT_ENUM, "Auto,Light-to-right,Right-to-left"), "set_direction", "get_direction");
 
@@ -87,7 +88,7 @@ void TextParagraph::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_text_overrun_behavior", "overrun_behavior"), &TextParagraph::set_text_overrun_behavior);
 	ClassDB::bind_method(D_METHOD("get_text_overrun_behavior"), &TextParagraph::get_text_overrun_behavior);
 
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis,Word Ellipsis"), "set_text_overrun_behavior", "get_text_overrun_behavior");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "text_overrun_behavior", PROPERTY_HINT_ENUM, "Trim Nothing,Trim Characters,Trim Words,Ellipsis (6+ Characters),Word Ellipsis (6+ Characters),Ellipsis (Always),Word Ellipsis (Always)"), "set_text_overrun_behavior", "get_text_overrun_behavior");
 
 	ClassDB::bind_method(D_METHOD("set_ellipsis_char", "char"), &TextParagraph::set_ellipsis_char);
 	ClassDB::bind_method(D_METHOD("get_ellipsis_char"), &TextParagraph::get_ellipsis_char);
@@ -105,6 +106,8 @@ void TextParagraph::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_line_rid", "line"), &TextParagraph::get_line_rid);
 	ClassDB::bind_method(D_METHOD("get_dropcap_rid"), &TextParagraph::get_dropcap_rid);
 
+	ClassDB::bind_method(D_METHOD("get_range"), &TextParagraph::get_range);
+
 	ClassDB::bind_method(D_METHOD("get_line_count"), &TextParagraph::get_line_count);
 
 	ClassDB::bind_method(D_METHOD("set_max_lines_visible", "max_lines_visible"), &TextParagraph::set_max_lines_visible);
@@ -213,6 +216,17 @@ void TextParagraph::_shape_lines() const {
 		BitField<TextServer::TextOverrunFlag> overrun_flags = TextServer::OVERRUN_NO_TRIM;
 		if (overrun_behavior != TextServer::OVERRUN_NO_TRIMMING) {
 			switch (overrun_behavior) {
+				case TextServer::OVERRUN_TRIM_WORD_ELLIPSIS_FORCE: {
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM_WORD_ONLY);
+					overrun_flags.set_flag(TextServer::OVERRUN_ADD_ELLIPSIS);
+					overrun_flags.set_flag(TextServer::OVERRUN_ENFORCE_ELLIPSIS);
+				} break;
+				case TextServer::OVERRUN_TRIM_ELLIPSIS_FORCE: {
+					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
+					overrun_flags.set_flag(TextServer::OVERRUN_ADD_ELLIPSIS);
+					overrun_flags.set_flag(TextServer::OVERRUN_ENFORCE_ELLIPSIS);
+				} break;
 				case TextServer::OVERRUN_TRIM_WORD_ELLIPSIS:
 					overrun_flags.set_flag(TextServer::OVERRUN_TRIM);
 					overrun_flags.set_flag(TextServer::OVERRUN_TRIM_WORD_ONLY);
@@ -379,6 +393,13 @@ TextServer::Direction TextParagraph::get_direction() const {
 	return TS->shaped_text_get_direction(rid);
 }
 
+TextServer::Direction TextParagraph::get_inferred_direction() const {
+	_THREAD_SAFE_METHOD_
+
+	const_cast<TextParagraph *>(this)->_shape_lines();
+	return TS->shaped_text_get_inferred_direction(rid);
+}
+
 void TextParagraph::set_custom_punctuation(const String &p_punct) {
 	_THREAD_SAFE_METHOD_
 
@@ -604,6 +625,12 @@ Size2 TextParagraph::get_size() const {
 	return size;
 }
 
+Vector2i TextParagraph::get_range() const {
+	_THREAD_SAFE_METHOD_
+
+	return TS->shaped_text_get_range(rid);
+}
+
 int TextParagraph::get_line_count() const {
 	_THREAD_SAFE_METHOD_
 
diff --git a/engine/scene/resources/text_paragraph.h b/engine/scene/resources/text_paragraph.h
index 16e52ff2..fab9963a 100644
--- a/engine/scene/resources/text_paragraph.h
+++ b/engine/scene/resources/text_paragraph.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_PARAGRAPH_H
-#define TEXT_PARAGRAPH_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "scene/resources/font.h"
@@ -78,6 +77,7 @@ public:
 
 	void set_direction(TextServer::Direction p_direction);
 	TextServer::Direction get_direction() const;
+	TextServer::Direction get_inferred_direction() const;
 
 	void set_orientation(TextServer::Orientation p_orientation);
 	TextServer::Orientation get_orientation() const;
@@ -130,6 +130,8 @@ public:
 
 	Size2 get_size() const;
 
+	Vector2i get_range() const;
+
 	int get_line_count() const;
 
 	Array get_line_objects(int p_line) const;
@@ -164,5 +166,3 @@ public:
 	TextParagraph();
 	~TextParagraph();
 };
-
-#endif // TEXT_PARAGRAPH_H
diff --git a/engine/scene/resources/texture.h b/engine/scene/resources/texture.h
index cdfacada..23ae7c31 100644
--- a/engine/scene/resources/texture.h
+++ b/engine/scene/resources/texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_H
-#define TEXTURE_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/math/rect2.h"
@@ -138,5 +137,3 @@ public:
 	virtual Vector<Ref<Image>> get_data() const;
 	virtual Ref<Resource> create_placeholder() const;
 };
-
-#endif // TEXTURE_H
diff --git a/engine/scene/resources/texture_rd.h b/engine/scene/resources/texture_rd.h
index 5dc286cd..cab1da7c 100644
--- a/engine/scene/resources/texture_rd.h
+++ b/engine/scene/resources/texture_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_RD_H
-#define TEXTURE_RD_H
+#pragma once
 
 // Note, these classes are part of the Rendering Device based renderer.
 // They are included here to ensure the correct order of registration
@@ -158,5 +157,3 @@ public:
 	Texture3DRD();
 	~Texture3DRD();
 };
-
-#endif // TEXTURE_RD_H
diff --git a/engine/scene/resources/theme.cpp b/engine/scene/resources/theme.cpp
index 8990994a..d4d489cf 100644
--- a/engine/scene/resources/theme.cpp
+++ b/engine/scene/resources/theme.cpp
@@ -164,7 +164,7 @@ void Theme::_get_property_list(List<PropertyInfo> *p_list) const {
 	String prev_type;
 	for (const PropertyInfo &E : list) {
 		// Add groups for types so that their names are left unchanged in the inspector.
-		String current_type = E.name.get_slice("/", 0);
+		String current_type = E.name.get_slicec('/', 0);
 		if (prev_type != current_type) {
 			p_list->push_back(PropertyInfo(Variant::NIL, current_type, PROPERTY_HINT_NONE, current_type + "/", PROPERTY_USAGE_GROUP));
 			prev_type = current_type;
diff --git a/engine/scene/resources/theme.h b/engine/scene/resources/theme.h
index 929fd8ad..91575d46 100644
--- a/engine/scene/resources/theme.h
+++ b/engine/scene/resources/theme.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THEME_H
-#define THEME_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "scene/resources/font.h"
@@ -228,5 +227,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(Theme::DataType);
-
-#endif // THEME_H
diff --git a/engine/scene/resources/video_stream.h b/engine/scene/resources/video_stream.h
index b3d0739e..79aff4be 100644
--- a/engine/scene/resources/video_stream.h
+++ b/engine/scene/resources/video_stream.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VIDEO_STREAM_H
-#define VIDEO_STREAM_H
+#pragma once
 
 #include "scene/resources/texture.h"
 
@@ -110,5 +109,3 @@ public:
 	VideoStream();
 	~VideoStream();
 };
-
-#endif // VIDEO_STREAM_H
diff --git a/engine/scene/resources/visual_shader.cpp b/engine/scene/resources/visual_shader.cpp
index b29577ed..e090812d 100644
--- a/engine/scene/resources/visual_shader.cpp
+++ b/engine/scene/resources/visual_shader.cpp
@@ -1584,7 +1584,7 @@ String VisualShader::validate_port_name(const String &p_port_name, VisualShaderN
 	}
 
 	while (port_name.length() && !is_ascii_alphabet_char(port_name[0])) {
-		port_name = port_name.substr(1, port_name.length() - 1);
+		port_name = port_name.substr(1);
 	}
 
 	if (!port_name.is_empty()) {
@@ -1629,7 +1629,7 @@ String VisualShader::validate_port_name(const String &p_port_name, VisualShaderN
 String VisualShader::validate_parameter_name(const String &p_name, const Ref<VisualShaderNodeParameter> &p_parameter) const {
 	String param_name = p_name; //validate name first
 	while (param_name.length() && !is_ascii_alphabet_char(param_name[0])) {
-		param_name = param_name.substr(1, param_name.length() - 1);
+		param_name = param_name.substr(1);
 	}
 	if (!param_name.is_empty()) {
 		String valid_name;
@@ -3149,6 +3149,7 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = {
 
 	// Node3D, Light
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "albedo", "ALBEDO" },
+	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "alpha", "ALPHA" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "attenuation", "ATTENUATION" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR_3D, "backlight", "BACKLIGHT" },
 	{ Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "clip_space_far", "CLIP_SPACE_FAR" },
diff --git a/engine/scene/resources/visual_shader.h b/engine/scene/resources/visual_shader.h
index 8ec52fca..c300867c 100644
--- a/engine/scene/resources/visual_shader.h
+++ b/engine/scene/resources/visual_shader.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISUAL_SHADER_H
-#define VISUAL_SHADER_H
+#pragma once
 
 #include "core/string/string_builder.h"
 #include "core/templates/safe_refcount.h"
@@ -39,6 +38,9 @@
 class VisualShaderNodeParameter;
 class VisualShaderNode;
 
+template <typename T, typename V>
+class VMap;
+
 class VisualShader : public Shader {
 	GDCLASS(VisualShader, Shader);
 
@@ -1007,5 +1009,3 @@ public:
 };
 
 extern String make_unique_id(VisualShader::Type p_type, int p_id, const String &p_name);
-
-#endif // VISUAL_SHADER_H
diff --git a/engine/scene/resources/visual_shader_nodes.h b/engine/scene/resources/visual_shader_nodes.h
index bc2e8fd1..7999c581 100644
--- a/engine/scene/resources/visual_shader_nodes.h
+++ b/engine/scene/resources/visual_shader_nodes.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISUAL_SHADER_NODES_H
-#define VISUAL_SHADER_NODES_H
+#pragma once
 
 #include "scene/resources/curve_texture.h"
 #include "scene/resources/visual_shader.h"
@@ -3178,5 +3177,3 @@ public:
 
 	VisualShaderNodeReroute();
 };
-
-#endif // VISUAL_SHADER_NODES_H
diff --git a/engine/scene/resources/visual_shader_particle_nodes.cpp b/engine/scene/resources/visual_shader_particle_nodes.cpp
index cce340fd..64c87885 100644
--- a/engine/scene/resources/visual_shader_particle_nodes.cpp
+++ b/engine/scene/resources/visual_shader_particle_nodes.cpp
@@ -461,7 +461,7 @@ void VisualShaderNodeParticleMeshEmitter::_update_texture(const Vector<Vector2>
 	Ref<Image> image;
 	image.instantiate();
 
-	if (p_array.size() == 0) {
+	if (p_array.is_empty()) {
 		image->initialize_data(1, 1, false, Image::Format::FORMAT_RGBF);
 	} else {
 		image->initialize_data(p_array.size(), 1, false, Image::Format::FORMAT_RGBF);
@@ -471,7 +471,7 @@ void VisualShaderNodeParticleMeshEmitter::_update_texture(const Vector<Vector2>
 		Vector2 v = p_array[i];
 		image->set_pixel(i, 0, Color(v.x, v.y, 0));
 	}
-	if (r_texture->get_width() != p_array.size() || p_array.size() == 0) {
+	if (r_texture->get_width() != p_array.size() || p_array.is_empty()) {
 		r_texture->set_image(image);
 	} else {
 		r_texture->update(image);
@@ -482,7 +482,7 @@ void VisualShaderNodeParticleMeshEmitter::_update_texture(const Vector<Vector3>
 	Ref<Image> image;
 	image.instantiate();
 
-	if (p_array.size() == 0) {
+	if (p_array.is_empty()) {
 		image->initialize_data(1, 1, false, Image::Format::FORMAT_RGBF);
 	} else {
 		image->initialize_data(p_array.size(), 1, false, Image::Format::FORMAT_RGBF);
@@ -492,7 +492,7 @@ void VisualShaderNodeParticleMeshEmitter::_update_texture(const Vector<Vector3>
 		Vector3 v = p_array[i];
 		image->set_pixel(i, 0, Color(v.x, v.y, v.z));
 	}
-	if (r_texture->get_width() != p_array.size() || p_array.size() == 0) {
+	if (r_texture->get_width() != p_array.size() || p_array.is_empty()) {
 		r_texture->set_image(image);
 	} else {
 		r_texture->update(image);
@@ -503,7 +503,7 @@ void VisualShaderNodeParticleMeshEmitter::_update_texture(const Vector<Color> &p
 	Ref<Image> image;
 	image.instantiate();
 
-	if (p_array.size() == 0) {
+	if (p_array.is_empty()) {
 		image->initialize_data(1, 1, false, Image::Format::FORMAT_RGBA8);
 	} else {
 		image->initialize_data(p_array.size(), 1, false, Image::Format::FORMAT_RGBA8);
@@ -512,7 +512,7 @@ void VisualShaderNodeParticleMeshEmitter::_update_texture(const Vector<Color> &p
 	for (int i = 0; i < p_array.size(); i++) {
 		image->set_pixel(i, 0, p_array[i]);
 	}
-	if (r_texture->get_width() != p_array.size() || p_array.size() == 0) {
+	if (r_texture->get_width() != p_array.size() || p_array.is_empty()) {
 		r_texture->set_image(image);
 	} else {
 		r_texture->update(image);
diff --git a/engine/scene/resources/visual_shader_particle_nodes.h b/engine/scene/resources/visual_shader_particle_nodes.h
index 31ba310c..7280a840 100644
--- a/engine/scene/resources/visual_shader_particle_nodes.h
+++ b/engine/scene/resources/visual_shader_particle_nodes.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISUAL_SHADER_PARTICLE_NODES_H
-#define VISUAL_SHADER_PARTICLE_NODES_H
+#pragma once
 
 #include "scene/resources/visual_shader.h"
 
@@ -368,5 +367,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(VisualShaderNodeParticleEmit::EmitFlags)
-
-#endif // VISUAL_SHADER_PARTICLE_NODES_H
diff --git a/engine/scene/resources/visual_shader_sdf_nodes.h b/engine/scene/resources/visual_shader_sdf_nodes.h
index d84cdb43..d4618621 100644
--- a/engine/scene/resources/visual_shader_sdf_nodes.h
+++ b/engine/scene/resources/visual_shader_sdf_nodes.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VISUAL_SHADER_SDF_NODES_H
-#define VISUAL_SHADER_SDF_NODES_H
+#pragma once
 
 #include "scene/resources/visual_shader.h"
 
@@ -138,5 +137,3 @@ public:
 
 	VisualShaderNodeSDFRaymarch();
 };
-
-#endif // VISUAL_SHADER_SDF_NODES_H
diff --git a/engine/scene/resources/world_2d.cpp b/engine/scene/resources/world_2d.cpp
index 21bfc295..1f258664 100644
--- a/engine/scene/resources/world_2d.cpp
+++ b/engine/scene/resources/world_2d.cpp
@@ -32,14 +32,31 @@
 
 #include "core/config/project_settings.h"
 #include "scene/2d/visible_on_screen_notifier_2d.h"
-#include "servers/navigation_server_2d.h"
-#include "servers/physics_server_2d.h"
 #include "servers/rendering_server.h"
 
+#ifndef NAVIGATION_2D_DISABLED
+#include "servers/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
+
 RID World2D::get_canvas() const {
 	return canvas;
 }
 
+#ifndef NAVIGATION_2D_DISABLED
+RID World2D::get_navigation_map() const {
+	if (navigation_map.is_null()) {
+		navigation_map = NavigationServer2D::get_singleton()->map_create();
+		NavigationServer2D::get_singleton()->map_set_active(navigation_map, true);
+		NavigationServer2D::get_singleton()->map_set_cell_size(navigation_map, GLOBAL_GET("navigation/2d/default_cell_size"));
+		NavigationServer2D::get_singleton()->map_set_use_edge_connections(navigation_map, GLOBAL_GET("navigation/2d/use_edge_connections"));
+		NavigationServer2D::get_singleton()->map_set_edge_connection_margin(navigation_map, GLOBAL_GET("navigation/2d/default_edge_connection_margin"));
+		NavigationServer2D::get_singleton()->map_set_link_connection_radius(navigation_map, GLOBAL_GET("navigation/2d/default_link_connection_radius"));
+	}
+	return navigation_map;
+}
+#endif // NAVIGATION_2D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
 RID World2D::get_space() const {
 	if (space.is_null()) {
 		space = PhysicsServer2D::get_singleton()->space_create();
@@ -52,33 +69,26 @@ RID World2D::get_space() const {
 	return space;
 }
 
-RID World2D::get_navigation_map() const {
-	if (navigation_map.is_null()) {
-		navigation_map = NavigationServer2D::get_singleton()->map_create();
-		NavigationServer2D::get_singleton()->map_set_active(navigation_map, true);
-		NavigationServer2D::get_singleton()->map_set_cell_size(navigation_map, GLOBAL_GET("navigation/2d/default_cell_size"));
-		NavigationServer2D::get_singleton()->map_set_use_edge_connections(navigation_map, GLOBAL_GET("navigation/2d/use_edge_connections"));
-		NavigationServer2D::get_singleton()->map_set_edge_connection_margin(navigation_map, GLOBAL_GET("navigation/2d/default_edge_connection_margin"));
-		NavigationServer2D::get_singleton()->map_set_link_connection_radius(navigation_map, GLOBAL_GET("navigation/2d/default_link_connection_radius"));
-	}
-	return navigation_map;
-}
-
 PhysicsDirectSpaceState2D *World2D::get_direct_space_state() {
 	return PhysicsServer2D::get_singleton()->space_get_direct_state(get_space());
 }
+#endif // PHYSICS_2D_DISABLED
 
 void World2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_canvas"), &World2D::get_canvas);
-	ClassDB::bind_method(D_METHOD("get_space"), &World2D::get_space);
-	ClassDB::bind_method(D_METHOD("get_navigation_map"), &World2D::get_navigation_map);
-
-	ClassDB::bind_method(D_METHOD("get_direct_space_state"), &World2D::get_direct_space_state);
-
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "canvas", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_canvas");
-	ADD_PROPERTY(PropertyInfo(Variant::RID, "space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_space");
+
+#ifndef NAVIGATION_2D_DISABLED
+	ClassDB::bind_method(D_METHOD("get_navigation_map"), &World2D::get_navigation_map);
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "navigation_map", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_navigation_map");
+#endif // NAVIGATION_2D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
+	ClassDB::bind_method(D_METHOD("get_space"), &World2D::get_space);
+	ClassDB::bind_method(D_METHOD("get_direct_space_state"), &World2D::get_direct_space_state);
+	ADD_PROPERTY(PropertyInfo(Variant::RID, "space", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NONE), "", "get_space");
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "direct_space_state", PROPERTY_HINT_RESOURCE_TYPE, "PhysicsDirectSpaceState2D", PROPERTY_USAGE_NONE), "", "get_direct_space_state");
+#endif // PHYSICS_2D_DISABLED
 }
 
 void World2D::register_viewport(Viewport *p_viewport) {
@@ -95,13 +105,19 @@ World2D::World2D() {
 
 World2D::~World2D() {
 	ERR_FAIL_NULL(RenderingServer::get_singleton());
-	ERR_FAIL_NULL(PhysicsServer2D::get_singleton());
-	ERR_FAIL_NULL(NavigationServer2D::get_singleton());
 	RenderingServer::get_singleton()->free(canvas);
-	if (space.is_valid()) {
-		PhysicsServer2D::get_singleton()->free(space);
-	}
+
+#ifndef NAVIGATION_2D_DISABLED
+	ERR_FAIL_NULL(NavigationServer2D::get_singleton());
 	if (navigation_map.is_valid()) {
 		NavigationServer2D::get_singleton()->free(navigation_map);
 	}
+#endif // NAVIGATION_2D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
+	ERR_FAIL_NULL(PhysicsServer2D::get_singleton());
+	if (space.is_valid()) {
+		PhysicsServer2D::get_singleton()->free(space);
+	}
+#endif // PHYSICS_2D_DISABLED
 }
diff --git a/engine/scene/resources/world_2d.h b/engine/scene/resources/world_2d.h
index 04a15b03..fd93c884 100644
--- a/engine/scene/resources/world_2d.h
+++ b/engine/scene/resources/world_2d.h
@@ -28,11 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WORLD_2D_H
-#define WORLD_2D_H
+#pragma once
 
 #include "core/io/resource.h"
+
+#ifndef PHYSICS_2D_DISABLED
 #include "servers/physics_server_2d.h"
+#endif // PHYSICS_2D_DISABLED
 
 class VisibleOnScreenNotifier2D;
 class Viewport;
@@ -42,8 +44,12 @@ class World2D : public Resource {
 	GDCLASS(World2D, Resource);
 
 	RID canvas;
-	mutable RID space;
+#ifndef NAVIGATION_2D_DISABLED
 	mutable RID navigation_map;
+#endif // NAVIGATION_2D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
+	mutable RID space;
+#endif // PHYSICS_2D_DISABLED
 
 	HashSet<Viewport *> viewports;
 
@@ -53,10 +59,14 @@ protected:
 
 public:
 	RID get_canvas() const;
-	RID get_space() const;
+#ifndef NAVIGATION_2D_DISABLED
 	RID get_navigation_map() const;
+#endif // NAVIGATION_2D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
+	RID get_space() const;
 	PhysicsDirectSpaceState2D *get_direct_space_state();
+#endif // PHYSICS_2D_DISABLED
 
 	void register_viewport(Viewport *p_viewport);
 	void remove_viewport(Viewport *p_viewport);
@@ -66,5 +76,3 @@ public:
 	World2D();
 	~World2D();
 };
-
-#endif // WORLD_2D_H
diff --git a/engine/scene/scene_string_names.h b/engine/scene/scene_string_names.h
index 068487e4..91593567 100644
--- a/engine/scene/scene_string_names.h
+++ b/engine/scene/scene_string_names.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_STRING_NAMES_H
-#define SCENE_STRING_NAMES_H
+#pragma once
 
 #include "core/string/node_path.h"
 #include "core/string/string_name.h"
@@ -159,5 +158,3 @@ public:
 };
 
 #define SceneStringName(m_name) SceneStringNames::get_singleton()->m_name
-
-#endif // SCENE_STRING_NAMES_H
diff --git a/engine/scene/theme/SCsub b/engine/scene/theme/SCsub
index fb0914c0..832ea075 100644
--- a/engine/scene/theme/SCsub
+++ b/engine/scene/theme/SCsub
@@ -9,7 +9,6 @@ env.add_source_files(env.scene_sources, "*.cpp")
 
 SConscript("icons/SCsub")
 
-env.Depends("#scene/theme/default_font.gen.h", "#thirdparty/fonts/OpenSans_SemiBold.woff2")
 env.CommandNoCache(
     "#scene/theme/default_font.gen.h",
     "#thirdparty/fonts/OpenSans_SemiBold.woff2",
diff --git a/engine/scene/theme/default_theme.cpp b/engine/scene/theme/default_theme.cpp
index 5ae1e9ba..f9b21faa 100644
--- a/engine/scene/theme/default_theme.cpp
+++ b/engine/scene/theme/default_theme.cpp
@@ -91,6 +91,8 @@ static Ref<ImageTexture> generate_icon(int p_index) {
 
 	Error err = ImageLoaderSVG::create_image_from_string(img, default_theme_icons_sources[p_index], scale, upsample, HashMap<Color, Color>());
 	ERR_FAIL_COND_V_MSG(err != OK, Ref<ImageTexture>(), "Failed generating icon, unsupported or invalid SVG data in default theme.");
+
+	img->fix_alpha_edges();
 #else
 	// If the SVG module is disabled, we can't really display the UI well, but at least we won't crash.
 	// 16 pixels is used as it's the most common base size for Godot icons.
@@ -326,6 +328,9 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("check_v_offset", "CheckBox", 0);
 	theme->set_constant("outline_size", "CheckBox", 0);
 
+	theme->set_color("checkbox_checked_color", "CheckBox", Color(1, 1, 1));
+	theme->set_color("checkbox_unchecked_color", "CheckBox", Color(1, 1, 1));
+
 	// CheckButton
 
 	Ref<StyleBox> cb_empty = memnew(StyleBoxEmpty);
@@ -363,6 +368,9 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("check_v_offset", "CheckButton", 0);
 	theme->set_constant("outline_size", "CheckButton", 0);
 
+	theme->set_color("button_checked_color", "CheckButton", Color(1, 1, 1));
+	theme->set_color("button_unchecked_color", "CheckButton", Color(1, 1, 1));
+
 	// Button variations
 
 	theme->set_type_variation(SceneStringName(FlatButton), "Button");
@@ -388,6 +396,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	// Label
 
 	theme->set_stylebox(CoreStringName(normal), "Label", memnew(StyleBoxEmpty));
+	theme->set_stylebox("focus", "Label", focus);
 	theme->set_font(SceneStringName(font), "Label", Ref<Font>());
 	theme->set_font_size(SceneStringName(font_size), "Label", -1);
 
@@ -785,9 +794,11 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 
 	theme->set_stylebox(SceneStringName(panel), "GraphNode", graphnode_normal);
 	theme->set_stylebox("panel_selected", "GraphNode", graphnode_selected);
+	theme->set_stylebox("panel_focus", "GraphNode", focus);
 	theme->set_stylebox("titlebar", "GraphNode", graphn_sb_titlebar);
 	theme->set_stylebox("titlebar_selected", "GraphNode", graphn_sb_titlebar_selected);
 	theme->set_stylebox("slot", "GraphNode", graphnode_slot);
+	theme->set_stylebox("slot_selected", "GraphNode", focus);
 	theme->set_icon("port", "GraphNode", icons["graph_port"]);
 	theme->set_icon("resizer", "GraphNode", icons["resizer_se"]);
 	theme->set_color("resizer_color", "GraphNode", control_font_color);
@@ -846,12 +857,15 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_stylebox("focus", "Tree", focus);
 	theme->set_stylebox("hovered", "Tree", make_flat_stylebox(Color(1, 1, 1, 0.07)));
 	theme->set_stylebox("hovered_dimmed", "Tree", make_flat_stylebox(Color(1, 1, 1, 0.03)));
+	theme->set_stylebox("hovered_selected", "Tree", make_flat_stylebox(style_hover_selected_color));
+	theme->set_stylebox("hovered_selected_focus", "Tree", make_flat_stylebox(style_hover_selected_color));
 	theme->set_stylebox("selected", "Tree", make_flat_stylebox(style_selected_color));
 	theme->set_stylebox("selected_focus", "Tree", make_flat_stylebox(style_selected_color));
 	theme->set_stylebox("cursor", "Tree", focus);
 	theme->set_stylebox("cursor_unfocused", "Tree", focus);
 	theme->set_stylebox("button_hover", "Tree", make_flat_stylebox(Color(1, 1, 1, 0.07)));
 	theme->set_stylebox("button_pressed", "Tree", button_pressed);
+	theme->set_stylebox("button_hover", "Tree", button_hover);
 	theme->set_stylebox("title_button_normal", "Tree", make_flat_stylebox(style_pressed_color, 4, 4, 4, 4));
 	theme->set_stylebox("title_button_pressed", "Tree", make_flat_stylebox(style_hover_color, 4, 4, 4, 4));
 	theme->set_stylebox("title_button_hover", "Tree", make_flat_stylebox(style_normal_color, 4, 4, 4, 4));
@@ -880,6 +894,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color(SceneStringName(font_color), "Tree", control_font_low_color);
 	theme->set_color("font_hovered_color", "Tree", control_font_hover_color);
 	theme->set_color("font_hovered_dimmed_color", "Tree", control_font_color);
+	theme->set_color("font_hovered_selected_color", "Tree", control_font_pressed_color);
 	theme->set_color("font_selected_color", "Tree", control_font_pressed_color);
 	theme->set_color("font_disabled_color", "Tree", control_font_disabled_color);
 	theme->set_color("font_outline_color", "Tree", Color(0, 0, 0));
@@ -1032,6 +1047,9 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("separation", "VSeparator", Math::round(4 * scale));
 
 	// ColorPicker
+	Ref<StyleBoxFlat> focus_circle = make_flat_stylebox(style_focus_color, default_margin, default_margin, default_margin, default_margin, default_corner_radius, false, 2);
+	focus_circle->set_corner_radius_all(Math::round(256 * scale));
+	focus_circle->set_corner_detail(Math::round(32 * scale));
 
 	theme->set_constant("margin", "ColorPicker", Math::round(4 * scale));
 	theme->set_constant("sv_width", "ColorPicker", Math::round(256 * scale));
@@ -1040,6 +1058,11 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_constant("label_width", "ColorPicker", Math::round(10 * scale));
 	theme->set_constant("center_slider_grabbers", "ColorPicker", 1);
 
+	theme->set_stylebox("sample_focus", "ColorPicker", focus);
+	theme->set_stylebox("picker_focus_rectangle", "ColorPicker", focus);
+	theme->set_stylebox("picker_focus_circle", "ColorPicker", focus_circle);
+	theme->set_color("focused_not_editing_cursor_color", "ColorPicker", Color(1, 1, 1, 0.275f));
+
 	theme->set_icon("menu_option", "ColorPicker", icons["tabs_menu_hl"]);
 	theme->set_icon("folded_arrow", "ColorPicker", icons["arrow_right"]);
 	theme->set_icon("expanded_arrow", "ColorPicker", icons["arrow_down"]);
@@ -1112,6 +1135,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	preset_sb->set_anti_aliased(false);
 
 	theme->set_stylebox("preset_fg", "ColorPresetButton", preset_sb);
+	theme->set_stylebox("preset_focus", "ColorPicker", focus);
 	theme->set_icon("preset_bg", "ColorPresetButton", icons["mini_checkerboard"]);
 	theme->set_icon("overbright_indicator", "ColorPresetButton", icons["color_picker_overbright"]);
 
@@ -1220,6 +1244,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_icon("layout", "GraphEdit", icons["grid_layout"]);
 
 	theme->set_stylebox(SceneStringName(panel), "GraphEdit", make_flat_stylebox(style_normal_color, 4, 4, 4, 5));
+	theme->set_stylebox("panel_focus", "GraphEdit", focus);
 
 	Ref<StyleBoxFlat> graph_toolbar_style = make_flat_stylebox(Color(0.24, 0.24, 0.24, 0.6), 4, 2, 4, 2);
 	theme->set_stylebox("menu_panel", "GraphEdit", graph_toolbar_style);
@@ -1234,6 +1259,40 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const
 	theme->set_color("connection_valid_target_tint_color", "GraphEdit", Color(1, 1, 1, 0.4));
 	theme->set_color("connection_rim_color", "GraphEdit", style_normal_color);
 
+	Ref<StyleBoxFlat> foldable_container_title = make_flat_stylebox(style_pressed_color);
+	foldable_container_title->set_corner_radius(CORNER_BOTTOM_LEFT, 0);
+	foldable_container_title->set_corner_radius(CORNER_BOTTOM_RIGHT, 0);
+	theme->set_stylebox("title_panel", "FoldableContainer", foldable_container_title);
+	Ref<StyleBoxFlat> foldable_container_hover = make_flat_stylebox(style_hover_color);
+	foldable_container_hover->set_corner_radius(CORNER_BOTTOM_LEFT, 0);
+	foldable_container_hover->set_corner_radius(CORNER_BOTTOM_RIGHT, 0);
+	theme->set_stylebox("title_hover_panel", "FoldableContainer", foldable_container_hover);
+	theme->set_stylebox("title_collapsed_panel", "FoldableContainer", make_flat_stylebox(style_pressed_color));
+	theme->set_stylebox("title_collapsed_hover_panel", "FoldableContainer", make_flat_stylebox(style_hover_color));
+	Ref<StyleBoxFlat> foldable_container_panel = make_flat_stylebox(style_normal_color);
+	foldable_container_panel->set_content_margin_all(default_margin);
+	foldable_container_panel->set_corner_radius(CORNER_TOP_LEFT, 0);
+	foldable_container_panel->set_corner_radius(CORNER_TOP_RIGHT, 0);
+	theme->set_stylebox(SceneStringName(panel), "FoldableContainer", foldable_container_panel);
+	Ref<StyleBoxFlat> foldable_focus_style = make_flat_stylebox(style_focus_color, default_margin, default_margin, default_margin, default_margin, default_corner_radius, false, 2);
+	theme->set_stylebox("focus", "FoldableContainer", foldable_focus_style);
+
+	theme->set_font(SceneStringName(font), "FoldableContainer", Ref<Font>());
+	theme->set_font_size(SceneStringName(font_size), "FoldableContainer", default_font_size);
+
+	theme->set_color(SceneStringName(font_color), "FoldableContainer", control_font_color);
+	theme->set_color("hover_font_color", "FoldableContainer", control_font_hover_color);
+	theme->set_color("collapsed_font_color", "FoldableContainer", control_font_pressed_color);
+	theme->set_color("font_outline_color", "FoldableContainer", Color(1, 1, 1));
+
+	theme->set_icon("expanded_arrow", "FoldableContainer", icons["arrow_down"]);
+	theme->set_icon("expanded_arrow_mirrored", "FoldableContainer", icons["arrow_up"]);
+	theme->set_icon("folded_arrow", "FoldableContainer", icons["arrow_right"]);
+	theme->set_icon("folded_arrow_mirrored", "FoldableContainer", icons["arrow_left"]);
+
+	theme->set_constant("outline_size", "FoldableContainer", 0);
+	theme->set_constant("h_separation", "FoldableContainer", Math::round(2 * scale));
+
 	// Visual Node Ports
 
 	theme->set_constant("port_hotzone_inner_extent", "GraphEdit", 22 * scale);
diff --git a/engine/scene/theme/default_theme.h b/engine/scene/theme/default_theme.h
index 55fc32a3..6b1aea53 100644
--- a/engine/scene/theme/default_theme.h
+++ b/engine/scene/theme/default_theme.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEFAULT_THEME_H
-#define DEFAULT_THEME_H
+#pragma once
 
 #include "scene/resources/theme.h"
 
 void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const Ref<Font> &bold_font, const Ref<Font> &bold_italics_font, const Ref<Font> &italics_font, Ref<Texture2D> &default_icon, Ref<StyleBox> &default_style, float p_scale);
 void make_default_theme(float p_scale, Ref<Font> p_font, TextServer::SubpixelPositioning p_font_subpixel = TextServer::SUBPIXEL_POSITIONING_AUTO, TextServer::Hinting p_font_hinting = TextServer::HINTING_LIGHT, TextServer::FontAntialiasing p_font_antialiased = TextServer::FONT_ANTIALIASING_GRAY, bool p_font_msdf = false, bool p_font_generate_mipmaps = false);
-
-#endif // DEFAULT_THEME_H
diff --git a/engine/scene/theme/default_theme_builders.py b/engine/scene/theme/default_theme_builders.py
index 31272510..fc9f3f9d 100644
--- a/engine/scene/theme/default_theme_builders.py
+++ b/engine/scene/theme/default_theme_builders.py
@@ -1,30 +1,21 @@
 """Functions used to generate source files during build time"""
 
 import os
-import os.path
+
+import methods
 
 
 def make_fonts_header(target, source, env):
-    dst = str(target[0])
+    with methods.generated_wrapper(str(target[0])) as file:
+        for src in map(str, source):
+            # Saving uncompressed, since FreeType will reference from memory pointer.
+            buffer = methods.get_buffer(src)
+            name = os.path.splitext(os.path.basename(src))[0]
 
-    with open(dst, "w", encoding="utf-8", newline="\n") as g:
-        g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
-        g.write("#ifndef _DEFAULT_FONTS_H\n")
-        g.write("#define _DEFAULT_FONTS_H\n")
+            file.write(f"""\
+inline constexpr int _font_{name}_size = {len(buffer)};
+inline constexpr unsigned char _font_{name}[] = {{
+	{methods.format_buffer(buffer, 1)}
+}};
 
-        # Saving uncompressed, since FreeType will reference from memory pointer.
-        for i in range(len(source)):
-            file = str(source[i])
-            with open(file, "rb") as f:
-                buf = f.read()
-
-            name = os.path.splitext(os.path.basename(file))[0]
-
-            g.write("static const int _font_" + name + "_size = " + str(len(buf)) + ";\n")
-            g.write("static const unsigned char _font_" + name + "[] = {\n")
-            for j in range(len(buf)):
-                g.write("\t" + str(buf[j]) + ",\n")
-
-            g.write("};\n")
-
-        g.write("#endif")
+""")
diff --git a/engine/scene/theme/icons/add.svg b/engine/scene/theme/icons/add.svg
index 2dead5ea..82fc23f1 100644
--- a/engine/scene/theme/icons/add.svg
+++ b/engine/scene/theme/icons/add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z"/></svg>
diff --git a/engine/scene/theme/icons/arrow_down.svg b/engine/scene/theme/icons/arrow_down.svg
index a3e94647..b70d7f14 100644
--- a/engine/scene/theme/icons/arrow_down.svg
+++ b/engine/scene/theme/icons/arrow_down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m5 7 3 3 3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m5 7 3 3 3-3"/></svg>
diff --git a/engine/scene/theme/icons/arrow_left.svg b/engine/scene/theme/icons/arrow_left.svg
index 96a3f605..77a65df8 100644
--- a/engine/scene/theme/icons/arrow_left.svg
+++ b/engine/scene/theme/icons/arrow_left.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m9 11-3-3 3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m9 11-3-3 3-3"/></svg>
diff --git a/engine/scene/theme/icons/arrow_right.svg b/engine/scene/theme/icons/arrow_right.svg
index 6fc06565..9aad3af5 100644
--- a/engine/scene/theme/icons/arrow_right.svg
+++ b/engine/scene/theme/icons/arrow_right.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m6 11 3-3-3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m6 11 3-3-3-3"/></svg>
diff --git a/engine/scene/theme/icons/arrow_up.svg b/engine/scene/theme/icons/arrow_up.svg
new file mode 100644
index 00000000..835f861e
--- /dev/null
+++ b/engine/scene/theme/icons/arrow_up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m11.011063 9.9776246-3.0222094-2.9776246-2.9776247 3.02221"/></svg>
diff --git a/engine/scene/theme/icons/bookmark.svg b/engine/scene/theme/icons/bookmark.svg
index c3919d38..642322cc 100644
--- a/engine/scene/theme/icons/bookmark.svg
+++ b/engine/scene/theme/icons/bookmark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fefffe" fill-opacity=".85"><path d="M14.5 1.5h-13v13L8 9.25l6.5 5.25z"/><path stroke="#fefffe" stroke-linejoin="round" stroke-opacity=".85" d="M14.5 1.5h-13v13L8 9.25l6.5 5.25z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#fefffe" fill-opacity=".85"><path d="M14.5 1.5h-13v13L8 9.25l6.5 5.25z"/><path stroke="#fefffe" stroke-linejoin="round" stroke-opacity=".85" d="M14.5 1.5h-13v13L8 9.25l6.5 5.25z"/></g></svg>
diff --git a/engine/scene/theme/icons/breakpoint.svg b/engine/scene/theme/icons/breakpoint.svg
index 075166f6..b1bb18b2 100644
--- a/engine/scene/theme/icons/breakpoint.svg
+++ b/engine/scene/theme/icons/breakpoint.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#ff5d5d" fill-opacity=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#ff5d5d" fill-opacity=".5"/></svg>
diff --git a/engine/scene/theme/icons/checked.svg b/engine/scene/theme/icons/checked.svg
index 1ab415e7..9b096259 100644
--- a/engine/scene/theme/icons/checked.svg
+++ b/engine/scene/theme/icons/checked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="2.333"/><path fill="#1a1a1a" d="m11.5 3.75-5.6 5.6-1.7-1.7-1.5 1.5 3.2 3.2 7.1-7.1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="2.333"/><path fill="#1a1a1a" d="m11.5 3.75-5.6 5.6-1.7-1.7-1.5 1.5 3.2 3.2 7.1-7.1z"/></svg>
diff --git a/engine/scene/theme/icons/checked_disabled.svg b/engine/scene/theme/icons/checked_disabled.svg
index 8319e808..a6d85eca 100644
--- a/engine/scene/theme/icons/checked_disabled.svg
+++ b/engine/scene/theme/icons/checked_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="2.333"/><path fill="#1a1a1a" fill-opacity=".5" d="m11.5 3.75-5.6 5.6-1.7-1.7-1.5 1.5 3.2 3.2 7.1-7.1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="2.333"/><path fill="#1a1a1a" fill-opacity=".5" d="m11.5 3.75-5.6 5.6-1.7-1.7-1.5 1.5 3.2 3.2 7.1-7.1z"/></svg>
diff --git a/engine/scene/theme/icons/clear.svg b/engine/scene/theme/icons/clear.svg
index d809d62e..06a3ca14 100644
--- a/engine/scene/theme/icons/clear.svg
+++ b/engine/scene/theme/icons/clear.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 1a1 1 0 0 0 -1 1v5h-2c-1.108 0-2 .892-2 2v1h10v-1c0-1.108-.892-2-2-2h-2v-5a1 1 0 0 0 -1-1zm-5 10v4l10-1v-3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m8 1a1 1 0 0 0 -1 1v5h-2c-1.108 0-2 .892-2 2v1h10v-1c0-1.108-.892-2-2-2h-2v-5a1 1 0 0 0 -1-1zm-5 10v4l10-1v-3z"/></svg>
diff --git a/engine/scene/theme/icons/close.svg b/engine/scene/theme/icons/close.svg
index 01236742..204616b0 100644
--- a/engine/scene/theme/icons/close.svg
+++ b/engine/scene/theme/icons/close.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".75" d="m1 3 2-2 5 5 5-5 2 2-5 5 5 5-2 2-5-5-5 5-2-2 5-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".75" d="m1 3 2-2 5 5 5-5 2 2-5 5 5 5-2 2-5-5-5 5-2-2 5-5z"/></svg>
diff --git a/engine/scene/theme/icons/close_hl.svg b/engine/scene/theme/icons/close_hl.svg
index 6654df80..e3efd47d 100644
--- a/engine/scene/theme/icons/close_hl.svg
+++ b/engine/scene/theme/icons/close_hl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="m1 3 2-2 5 5 5-5 2 2-5 5 5 5-2 2-5-5-5 5-2-2 5-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" d="m1 3 2-2 5 5 5-5 2 2-5 5 5 5-2 2-5-5-5 5-2-2 5-5z"/></svg>
diff --git a/engine/scene/theme/icons/color_picker_bar_arrow.svg b/engine/scene/theme/icons/color_picker_bar_arrow.svg
index 5612ecaa..5656e16c 100644
--- a/engine/scene/theme/icons/color_picker_bar_arrow.svg
+++ b/engine/scene/theme/icons/color_picker_bar_arrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 20"><path fill="#b2b2b2" stroke="#b2b2b2" stroke-linejoin="round" d="m3.564 15.218h8.872l-4.436-4.436z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 20"><path fill="#b2b2b2" stroke="#b2b2b2" stroke-linejoin="round" d="m3.564 15.218h8.872l-4.436-4.436z"/></svg>
diff --git a/engine/scene/theme/icons/color_picker_cursor.svg b/engine/scene/theme/icons/color_picker_cursor.svg
index d59b2d53..1a27dfc4 100644
--- a/engine/scene/theme/icons/color_picker_cursor.svg
+++ b/engine/scene/theme/icons/color_picker_cursor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill="none" stroke="#fff"/><circle cx="6" cy="6" r="4" fill="none" stroke="#000"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="5" fill="none" stroke="#fff"/><circle cx="6" cy="6" r="4" fill="none" stroke="#000"/></svg>
diff --git a/engine/scene/theme/icons/color_picker_cursor_bg.svg b/engine/scene/theme/icons/color_picker_cursor_bg.svg
index fa51b709..05a053fd 100644
--- a/engine/scene/theme/icons/color_picker_cursor_bg.svg
+++ b/engine/scene/theme/icons/color_picker_cursor_bg.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="4" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><circle cx="6" cy="6" r="4" fill="#fff"/></svg>
diff --git a/engine/scene/theme/icons/color_picker_overbright.svg b/engine/scene/theme/icons/color_picker_overbright.svg
index 7acdca1c..fbc7347c 100644
--- a/engine/scene/theme/icons/color_picker_overbright.svg
+++ b/engine/scene/theme/icons/color_picker_overbright.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000003" d="m.5.5v10l10-10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" stroke="#000003" d="m.5.5v10l10-10z"/></svg>
diff --git a/engine/scene/theme/icons/color_picker_pipette.svg b/engine/scene/theme/icons/color_picker_pipette.svg
index 3dae08ea..8a44a3a3 100644
--- a/engine/scene/theme/icons/color_picker_pipette.svg
+++ b/engine/scene/theme/icons/color_picker_pipette.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M10 3a1 1 0 0 0-4 0v2H5v2h1v5c0 .712.36 1.372 1 1.73V15h2v-1.27c.618-.36 1-1 1-1.73V7h1V5h-1V3zM7 7h2v5a1 1 0 0 1-2 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M10 3a1 1 0 0 0-4 0v2H5v2h1v5c0 .712.36 1.372 1 1.73V15h2v-1.27c.618-.36 1-1 1-1.73V7h1V5h-1V3zM7 7h2v5a1 1 0 0 1-2 0z"/></svg>
diff --git a/engine/scene/theme/icons/default_theme_icons_builders.py b/engine/scene/theme/icons/default_theme_icons_builders.py
index 3a673af9..8e29af7e 100644
--- a/engine/scene/theme/icons/default_theme_icons_builders.py
+++ b/engine/scene/theme/icons/default_theme_icons_builders.py
@@ -1,51 +1,35 @@
 """Functions used to generate source files during build time"""
 
 import os
-from io import StringIO
 
-from methods import to_raw_cstring
+import methods
 
 
 # See also `editor/icons/editor_icons_builders.py`.
 def make_default_theme_icons_action(target, source, env):
-    dst = str(target[0])
-    svg_icons = [str(x) for x in source]
+    icons_names = []
+    icons_raw = []
 
-    with StringIO() as icons_string, StringIO() as s:
-        for svg in svg_icons:
-            with open(svg, "r") as svgf:
-                icons_string.write("\t%s,\n" % to_raw_cstring(svgf.read()))
+    for src in map(str, source):
+        with open(src, encoding="utf-8", newline="\n") as file:
+            icons_raw.append(methods.to_raw_cstring(file.read()))
 
-        s.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n\n")
-        s.write('#include "modules/modules_enabled.gen.h"\n\n')
-        s.write("#ifndef _DEFAULT_THEME_ICONS_H\n")
-        s.write("#define _DEFAULT_THEME_ICONS_H\n")
-        s.write("static const int default_theme_icons_count = {};\n\n".format(len(svg_icons)))
-        s.write("#ifdef MODULE_SVG_ENABLED\n")
-        s.write("static const char *default_theme_icons_sources[] = {\n")
-        s.write(icons_string.getvalue())
-        s.write("};\n")
-        s.write("#endif // MODULE_SVG_ENABLED\n\n")
-        s.write("static const char *default_theme_icons_names[] = {\n")
+        name = os.path.splitext(os.path.basename(src))[0]
+        icons_names.append(f'"{name}"')
 
-        index = 0
-        for f in svg_icons:
-            fname = str(f)
+    icons_names_str = ",\n\t".join(icons_names)
+    icons_raw_str = ",\n\t".join(icons_raw)
 
-            # Trim the `.svg` extension from the string.
-            icon_name = os.path.basename(fname)[:-4]
+    with methods.generated_wrapper(str(target[0])) as file:
+        file.write(f"""\
+#include "modules/modules_enabled.gen.h"
 
-            s.write('\t"{0}"'.format(icon_name))
+inline constexpr int default_theme_icons_count = {len(icons_names)};
+inline constexpr const char *default_theme_icons_sources[] = {{
+	{icons_raw_str}
+}};
 
-            if fname != svg_icons[-1]:
-                s.write(",")
-            s.write("\n")
-
-            index += 1
-
-        s.write("};\n")
-
-        s.write("#endif\n")
-
-        with open(dst, "w", encoding="utf-8", newline="\n") as f:
-            f.write(s.getvalue())
+inline constexpr const char *default_theme_icons_names[] = {{
+	{icons_names_str}
+}};
+""")
diff --git a/engine/scene/theme/icons/error_icon.svg b/engine/scene/theme/icons/error_icon.svg
index fef3d5f8..dd4817d7 100644
--- a/engine/scene/theme/icons/error_icon.svg
+++ b/engine/scene/theme/icons/error_icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5d5d" d="M2 1v8.586l1.293-1.293a1 1 0 0 1 1.414 0L7 10.587l2.293-2.293a1 1 0 0 1 1.414 0L13 10.586l1-1V6H9V1H2zm8 0v4h4zm-6 9.414-2 2V15h12v-2.586l-.293.293a1 1 0 0 1-1.414 0L10 10.414l-2.293 2.293a1 1 0 0 1-1.414 0L4 10.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5d5d" d="M2 1v8.586l1.293-1.293a1 1 0 0 1 1.414 0L7 10.587l2.293-2.293a1 1 0 0 1 1.414 0L13 10.586l1-1V6H9V1H2zm8 0v4h4zm-6 9.414-2 2V15h12v-2.586l-.293.293a1 1 0 0 1-1.414 0L10 10.414l-2.293 2.293a1 1 0 0 1-1.414 0L4 10.414z"/></svg>
diff --git a/engine/scene/theme/icons/file.svg b/engine/scene/theme/icons/file.svg
index e8890f39..e16d0150 100644
--- a/engine/scene/theme/icons/file.svg
+++ b/engine/scene/theme/icons/file.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M2 1v14h12V6H9V1zm8 0v4h4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M2 1v14h12V6H9V1zm8 0v4h4z"/></svg>
diff --git a/engine/scene/theme/icons/folder.svg b/engine/scene/theme/icons/folder.svg
index 64dc9ab9..cd37167f 100644
--- a/engine/scene/theme/icons/folder.svg
+++ b/engine/scene/theme/icons/folder.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1z"/></svg>
diff --git a/engine/scene/theme/icons/folder_create.svg b/engine/scene/theme/icons/folder_create.svg
index 6c770d44..108a6560 100644
--- a/engine/scene/theme/icons/folder_create.svg
+++ b/engine/scene/theme/icons/folder_create.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M2 3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h8v-1H8v-4h2V8h4v2h1V7a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V4a1 1 0 0 0-1-1Z"/><path fill="#fefffe" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M2 3a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h8v-1H8v-4h2V8h4v2h1V7a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V4a1 1 0 0 0-1-1Z"/><path fill="#fefffe" d="M13 13h2v-2h-2V9h-2v2H9v2h2v2h2z"/></svg>
diff --git a/engine/scene/theme/icons/folder_up.svg b/engine/scene/theme/icons/folder_up.svg
index 7db5de87..22e3663d 100644
--- a/engine/scene/theme/icons/folder_up.svg
+++ b/engine/scene/theme/icons/folder_up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 11V4m4 4L8 4 4 8"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 11V4m4 4L8 4 4 8"/></svg>
diff --git a/engine/scene/theme/icons/graph_port.svg b/engine/scene/theme/icons/graph_port.svg
index 9d81bf1c..bfd5428f 100644
--- a/engine/scene/theme/icons/graph_port.svg
+++ b/engine/scene/theme/icons/graph_port.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="5" fill="#fff"/><circle cx="5" cy="5" r="3.667" fill="#b2b2b2" fill-opacity=".65"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"><circle cx="5" cy="5" r="5" fill="#fff"/><circle cx="5" cy="5" r="3.667" fill="#b2b2b2" fill-opacity=".65"/></svg>
diff --git a/engine/scene/theme/icons/grid_layout.svg b/engine/scene/theme/icons/grid_layout.svg
index 6015cd90..77dcd234 100644
--- a/engine/scene/theme/icons/grid_layout.svg
+++ b/engine/scene/theme/icons/grid_layout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke-width="1.3"><path stroke="#fefffe" stroke-linejoin="round" d="M1.87 6.541h2.917v2.917H1.87zm4.666 0h2.917v2.917H6.536zm4.666 0h2.917v2.917h-2.917z"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-opacity=".65" d="m5.432 1.112-1.95 1.95 1.95 1.95m-1.95-1.95h9.386m-2.137 8.05 1.95 1.95-1.95 1.95m-7.437-1.95h9.387"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="none" stroke-width="1.3"><path stroke="#fefffe" stroke-linejoin="round" d="M1.87 6.541h2.917v2.917H1.87zm4.666 0h2.917v2.917H6.536zm4.666 0h2.917v2.917h-2.917z"/><path stroke="#e0e0e0" stroke-linecap="round" stroke-opacity=".65" d="m5.432 1.112-1.95 1.95 1.95 1.95m-1.95-1.95h9.386m-2.137 8.05 1.95 1.95-1.95 1.95m-7.437-1.95h9.387"/></g></svg>
diff --git a/engine/scene/theme/icons/grid_minimap.svg b/engine/scene/theme/icons/grid_minimap.svg
index a2d7c9c9..0140efc8 100644
--- a/engine/scene/theme/icons/grid_minimap.svg
+++ b/engine/scene/theme/icons/grid_minimap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" stroke-linejoin="round" stroke-miterlimit="2"><path fill="#b2b2b2" fill-opacity=".65" d="M14 2.199v2.615l-2.625 1.313V3.512zM2 6.264l2.625 1.312v2.551L2 8.814zm12 0v2.55l-2.625 1.313V7.576zM6 7.719h4v2.64H6zm-4 2.56 2.625 1.313v2.521L2 12.801zm12 0v2.522l-2.625 1.312v-2.521zm-8 1.455h4v2.641H6zm4-8.109v2.734H5.844s-.749.647-.875.641c-.131-.007-1.51-1.456-1.51-1.456L2 4.814V2.199l.117.06s-.064-.775.424-1.216L1.279.441A.626.626 0 0 0 .375 1v12c0 .237.134.453.346.559l4 2a.626.626 0 0 0 .279.066h6a.626.626 0 0 0 .279-.066l4-2a.625.625 0 0 0 .346-.559V1a.625.625 0 0 0-.904-.559l-3.869 1.934H7.888s.084.624-.218 1.25z"/><path fill="#fefffe" d="M5 6.25c-4-3.5-2-6 0-6s4 2.5 0 6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" stroke-linejoin="round" stroke-miterlimit="2"><path fill="#b2b2b2" fill-opacity=".65" d="M14 2.199v2.615l-2.625 1.313V3.512zM2 6.264l2.625 1.312v2.551L2 8.814zm12 0v2.55l-2.625 1.313V7.576zM6 7.719h4v2.64H6zm-4 2.56 2.625 1.313v2.521L2 12.801zm12 0v2.522l-2.625 1.312v-2.521zm-8 1.455h4v2.641H6zm4-8.109v2.734H5.844s-.749.647-.875.641c-.131-.007-1.51-1.456-1.51-1.456L2 4.814V2.199l.117.06s-.064-.775.424-1.216L1.279.441A.626.626 0 0 0 .375 1v12c0 .237.134.453.346.559l4 2a.626.626 0 0 0 .279.066h6a.626.626 0 0 0 .279-.066l4-2a.625.625 0 0 0 .346-.559V1a.625.625 0 0 0-.904-.559l-3.869 1.934H7.888s.084.624-.218 1.25z"/><path fill="#fefffe" d="M5 6.25c-4-3.5-2-6 0-6s4 2.5 0 6z"/></svg>
diff --git a/engine/scene/theme/icons/grid_snap.svg b/engine/scene/theme/icons/grid_snap.svg
index beb4ee7b..e2c2b38d 100644
--- a/engine/scene/theme/icons/grid_snap.svg
+++ b/engine/scene/theme/icons/grid_snap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".65" d="M3 0v3H0v2h3v4H0v2h3v3h2V5h9V3h-3V0H9v3H5V0zm4 13v2h2v-2zm6 0v2h2v-2z"/><path fill="#fefffe" d="M7 11v2h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".65" d="M3 0v3H0v2h3v4H0v2h3v3h2V5h9V3h-3V0H9v3H5V0zm4 13v2h2v-2zm6 0v2h2v-2z"/><path fill="#fefffe" d="M7 11v2h2v-2a2 2 0 0 1 4 0v2h2v-2a4 4 0 0 0-8 0z"/></svg>
diff --git a/engine/scene/theme/icons/grid_toggle.svg b/engine/scene/theme/icons/grid_toggle.svg
index c4683aad..aa4bc613 100644
--- a/engine/scene/theme/icons/grid_toggle.svg
+++ b/engine/scene/theme/icons/grid_toggle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".65" d="M3 0v3H0v2h3v4H0v2h3v3h2V5h9V3h-3V0H9v3H5V0z"/><path fill="#e0e0e0" d="M11 6.62c-1.747 0-3.957 1.344-4.752 3.936a.683.69 0 00-.004.394C7.012 13.665 9.292 14.9 11 14.9c1.708 0 3.988-1.235 4.756-3.95a.683.69 0 000-.382C15.004 7.955 12.746 6.62 11 6.62zM11 8a2.733 2.76 0 012.733 2.76A2.733 2.76 0 0111 13.52a2.733 2.76 0 01-2.733-2.76A2.733 2.76 0 0111 8zm0 1.38a1.367 1.38 0 00-1.367 1.38A1.367 1.38 0 0011 12.14a1.367 1.38 0 001.367-1.38A1.367 1.38 0 0011 9.38z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".65" d="M3 0v3H0v2h3v4H0v2h3v3h2V5h9V3h-3V0H9v3H5V0z"/><path fill="#e0e0e0" d="M11 6.62c-1.747 0-3.957 1.344-4.752 3.936a.683.69 0 00-.004.394C7.012 13.665 9.292 14.9 11 14.9c1.708 0 3.988-1.235 4.756-3.95a.683.69 0 000-.382C15.004 7.955 12.746 6.62 11 6.62zM11 8a2.733 2.76 0 012.733 2.76A2.733 2.76 0 0111 13.52a2.733 2.76 0 01-2.733-2.76A2.733 2.76 0 0111 8zm0 1.38a1.367 1.38 0 00-1.367 1.38A1.367 1.38 0 0011 12.14a1.367 1.38 0 001.367-1.38A1.367 1.38 0 0011 9.38z"/></svg>
diff --git a/engine/scene/theme/icons/hslider_tick.svg b/engine/scene/theme/icons/hslider_tick.svg
index 6697632a..64f2aa18 100644
--- a/engine/scene/theme/icons/hslider_tick.svg
+++ b/engine/scene/theme/icons/hslider_tick.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="4" height="16"><path fill="#fff" fill-opacity=".25" d="M1 0h2v16H1z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="4" height="16"><path fill="#fff" fill-opacity=".25" d="M1 0h2v16H1z"/></svg>
diff --git a/engine/scene/theme/icons/hsplitter.svg b/engine/scene/theme/icons/hsplitter.svg
index d5955223..ea6f9631 100644
--- a/engine/scene/theme/icons/hsplitter.svg
+++ b/engine/scene/theme/icons/hsplitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="48"><path fill="gray" fill-opacity=".65" d="M3.15 4v40h1.7V4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="48"><path fill="gray" fill-opacity=".65" d="M3.15 4v40h1.7V4z"/></svg>
diff --git a/engine/scene/theme/icons/indeterminate.svg b/engine/scene/theme/icons/indeterminate.svg
index f8edca3e..24d988eb 100644
--- a/engine/scene/theme/icons/indeterminate.svg
+++ b/engine/scene/theme/icons/indeterminate.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="2.333"/><path fill="#1a1a1a" d="m3 7h10v2h-10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="2.333"/><path fill="#1a1a1a" d="m3 7h10v2h-10z"/></svg>
diff --git a/engine/scene/theme/icons/indeterminate_disabled.svg b/engine/scene/theme/icons/indeterminate_disabled.svg
index 7276625e..e3ddf5fe 100644
--- a/engine/scene/theme/icons/indeterminate_disabled.svg
+++ b/engine/scene/theme/icons/indeterminate_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="2.333"/><path fill="#1a1a1a" fill-opacity=".5" d="m3 7h10v2h-10z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="2.333"/><path fill="#1a1a1a" fill-opacity=".5" d="m3 7h10v2h-10z"/></svg>
diff --git a/engine/scene/theme/icons/line_edit_clear.svg b/engine/scene/theme/icons/line_edit_clear.svg
index 01236742..204616b0 100644
--- a/engine/scene/theme/icons/line_edit_clear.svg
+++ b/engine/scene/theme/icons/line_edit_clear.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".75" d="m1 3 2-2 5 5 5-5 2 2-5 5 5 5-2 2-5-5-5 5-2-2 5-5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#fff" fill-opacity=".75" d="m1 3 2-2 5 5 5-5 2 2-5 5 5 5-2 2-5-5-5 5-2-2 5-5z"/></svg>
diff --git a/engine/scene/theme/icons/load.svg b/engine/scene/theme/icons/load.svg
index 6f738a8a..f1ff65fc 100644
--- a/engine/scene/theme/icons/load.svg
+++ b/engine/scene/theme/icons/load.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9c1.105 0 1.818-.91 2-2l1-6a1 1 0 0 0-1-1H6c-.552 0-.909.455-1 1l-1 6c-.091.545-.448 1-1 1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1 1 1 0 0 0 1 1h5a1 1 0 0 0-1-1H7a2 2 0 0 0-2-2H3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9c1.105 0 1.818-.91 2-2l1-6a1 1 0 0 0-1-1H6c-.552 0-.909.455-1 1l-1 6c-.091.545-.448 1-1 1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1 1 1 0 0 0 1 1h5a1 1 0 0 0-1-1H7a2 2 0 0 0-2-2H3z"/></svg>
diff --git a/engine/scene/theme/icons/mini_checkerboard.svg b/engine/scene/theme/icons/mini_checkerboard.svg
index 2dd71a6a..9c0515d7 100644
--- a/engine/scene/theme/icons/mini_checkerboard.svg
+++ b/engine/scene/theme/icons/mini_checkerboard.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M0 0v8h8V0zm8 8v8h8V8z"/><path fill="#fff" d="M8 0v8h8V0zm0 8H0v8h8z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="gray" d="M0 0v8h8V0zm8 8v8h8V8z"/><path fill="#fff" d="M8 0v8h8V0zm0 8H0v8h8z"/></svg>
diff --git a/engine/scene/theme/icons/option_button_arrow.svg b/engine/scene/theme/icons/option_button_arrow.svg
index bdb27e05..c8059a42 100644
--- a/engine/scene/theme/icons/option_button_arrow.svg
+++ b/engine/scene/theme/icons/option_button_arrow.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".85" stroke-width="2" d="m2 4 4 4 4-4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".85" stroke-width="2" d="m2 4 4 4 4-4"/></svg>
diff --git a/engine/scene/theme/icons/picker_shape_circle.svg b/engine/scene/theme/icons/picker_shape_circle.svg
index de104121..a655ac1f 100644
--- a/engine/scene/theme/icons/picker_shape_circle.svg
+++ b/engine/scene/theme/icons/picker_shape_circle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M6.5 2.5a5.5 5.5 0 0 0 0 11 5.5 5.5 0 0 0 0-11m6.5 0h2v11h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M6.5 2.5a5.5 5.5 0 0 0 0 11 5.5 5.5 0 0 0 0-11m6.5 0h2v11h-2z"/></svg>
diff --git a/engine/scene/theme/icons/picker_shape_rectangle.svg b/engine/scene/theme/icons/picker_shape_rectangle.svg
index 642b9f78..47d2aef8 100644
--- a/engine/scene/theme/icons/picker_shape_rectangle.svg
+++ b/engine/scene/theme/icons/picker_shape_rectangle.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M.5 2.5h11v11H.5zm12 0h2v11h-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#eaeaea" d="M.5 2.5h11v11H.5zm12 0h2v11h-2z"/></svg>
diff --git a/engine/scene/theme/icons/picker_shape_rectangle_wheel.svg b/engine/scene/theme/icons/picker_shape_rectangle_wheel.svg
index e46cc414..ccd74907 100644
--- a/engine/scene/theme/icons/picker_shape_rectangle_wheel.svg
+++ b/engine/scene/theme/icons/picker_shape_rectangle_wheel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.25" fill="none" stroke="#eaeaea" stroke-width="1.75"/><path fill="#eaeaea" d="M4.9 4.9h6.2v6.2H4.9z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.25" fill="none" stroke="#eaeaea" stroke-width="1.75"/><path fill="#eaeaea" d="M4.9 4.9h6.2v6.2H4.9z"/></svg>
diff --git a/engine/scene/theme/icons/popup_menu_arrow_left.svg b/engine/scene/theme/icons/popup_menu_arrow_left.svg
index c5c1b32d..9c43bf5c 100644
--- a/engine/scene/theme/icons/popup_menu_arrow_left.svg
+++ b/engine/scene/theme/icons/popup_menu_arrow_left.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m5.5 11-3-3 3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m5.5 11-3-3 3-3"/></svg>
diff --git a/engine/scene/theme/icons/popup_menu_arrow_right.svg b/engine/scene/theme/icons/popup_menu_arrow_right.svg
index 8741f3a3..7eea8866 100644
--- a/engine/scene/theme/icons/popup_menu_arrow_right.svg
+++ b/engine/scene/theme/icons/popup_menu_arrow_right.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m2.5 11 3-3-3-3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="16"><path fill="none" stroke="#b2b2b2" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".45" stroke-width="2" d="m2.5 11 3-3-3-3"/></svg>
diff --git a/engine/scene/theme/icons/radio_checked.svg b/engine/scene/theme/icons/radio_checked.svg
index 85a3d0c4..30899480 100644
--- a/engine/scene/theme/icons/radio_checked.svg
+++ b/engine/scene/theme/icons/radio_checked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.5" fill="#1a1a1a" stroke="#fff" stroke-opacity=".75" stroke-width="3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="5.5" fill="#1a1a1a" stroke="#fff" stroke-opacity=".75" stroke-width="3"/></svg>
diff --git a/engine/scene/theme/icons/radio_checked_disabled.svg b/engine/scene/theme/icons/radio_checked_disabled.svg
index 30627c07..103ebf5d 100644
--- a/engine/scene/theme/icons/radio_checked_disabled.svg
+++ b/engine/scene/theme/icons/radio_checked_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fff" fill-opacity=".37"/><circle cx="8" cy="8" r="4" fill="#1a1a1a" fill-opacity=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fff" fill-opacity=".37"/><circle cx="8" cy="8" r="4" fill="#1a1a1a" fill-opacity=".5"/></svg>
diff --git a/engine/scene/theme/icons/radio_unchecked.svg b/engine/scene/theme/icons/radio_unchecked.svg
index f78b678c..b814459b 100644
--- a/engine/scene/theme/icons/radio_unchecked.svg
+++ b/engine/scene/theme/icons/radio_unchecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#1a1a1a" fill-opacity=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#1a1a1a" fill-opacity=".5"/></svg>
diff --git a/engine/scene/theme/icons/radio_unchecked_disabled.svg b/engine/scene/theme/icons/radio_unchecked_disabled.svg
index 706aa68b..991f72e6 100644
--- a/engine/scene/theme/icons/radio_unchecked_disabled.svg
+++ b/engine/scene/theme/icons/radio_unchecked_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#1a1a1a" fill-opacity=".25"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#1a1a1a" fill-opacity=".25"/></svg>
diff --git a/engine/scene/theme/icons/region_folded.svg b/engine/scene/theme/icons/region_folded.svg
index 99e20678..9cb49cf3 100644
--- a/engine/scene/theme/icons/region_folded.svg
+++ b/engine/scene/theme/icons/region_folded.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M3 2a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1zm2.75 7a1 1 0 0 1-1.414-1.414L5.922 6 4.336 4.414A1 1 0 0 1 5.75 3l2.293 2.293a1 1 0 0 1 0 1.414z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M3 2a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V3a1 1 0 0 0-1-1zm2.75 7a1 1 0 0 1-1.414-1.414L5.922 6 4.336 4.414A1 1 0 0 1 5.75 3l2.293 2.293a1 1 0 0 1 0 1.414z"/></svg>
diff --git a/engine/scene/theme/icons/region_unfolded.svg b/engine/scene/theme/icons/region_unfolded.svg
index 5186dd8a..e03cb9ae 100644
--- a/engine/scene/theme/icons/region_unfolded.svg
+++ b/engine/scene/theme/icons/region_unfolded.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M10 3a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1zM3 5.75a1 1 0 0 1 1.414-1.414L6 5.922l1.586-1.586A1 1 0 0 1 9 5.75L6.707 8.043a1 1 0 0 1-1.414 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12"><path fill="#fff" d="M10 3a1 1 0 0 0-1-1H3a1 1 0 0 0-1 1v6a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1zM3 5.75a1 1 0 0 1 1.414-1.414L6 5.922l1.586-1.586A1 1 0 0 1 9 5.75L6.707 8.043a1 1 0 0 1-1.414 0z"/></svg>
diff --git a/engine/scene/theme/icons/reload.svg b/engine/scene/theme/icons/reload.svg
index 7f4cef5d..058b71e6 100644
--- a/engine/scene/theme/icons/reload.svg
+++ b/engine/scene/theme/icons/reload.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M5 8a4 4 0 1 1 4 4v2a6 6 0 1 0-6-6H1l3 4 3-4z"/></svg>
diff --git a/engine/scene/theme/icons/resizer_nw.svg b/engine/scene/theme/icons/resizer_nw.svg
index a8457b14..fd8bc559 100644
--- a/engine/scene/theme/icons/resizer_nw.svg
+++ b/engine/scene/theme/icons/resizer_nw.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fefffe" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="M4 11V4h7"/><circle cx="7.5" cy="7.5" r="1.5" fill="#b2b2b2" fill-opacity=".65"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fefffe" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="M4 11V4h7"/><circle cx="7.5" cy="7.5" r="1.5" fill="#b2b2b2" fill-opacity=".65"/></svg>
diff --git a/engine/scene/theme/icons/resizer_se.svg b/engine/scene/theme/icons/resizer_se.svg
index c3b87463..fc352757 100644
--- a/engine/scene/theme/icons/resizer_se.svg
+++ b/engine/scene/theme/icons/resizer_se.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fefffe" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="M11 4v7H4"/><circle cx="7.5" cy="7.5" r="1.5" fill="#b2b2b2" fill-opacity=".65"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fefffe" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="M11 4v7H4"/><circle cx="7.5" cy="7.5" r="1.5" fill="#b2b2b2" fill-opacity=".65"/></svg>
diff --git a/engine/scene/theme/icons/save.svg b/engine/scene/theme/icons/save.svg
index ab8ffff8..b8b2f9a1 100644
--- a/engine/scene/theme/icons/save.svg
+++ b/engine/scene/theme/icons/save.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4l-3-3h-1v6H3zm1 0v5h3V1zm4 8a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4l-3-3h-1v6H3zm1 0v5h3V1zm4 8a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
diff --git a/engine/scene/theme/icons/scroll_button_left.svg b/engine/scene/theme/icons/scroll_button_left.svg
index 2a3c0e3a..d80aed67 100644
--- a/engine/scene/theme/icons/scroll_button_left.svg
+++ b/engine/scene/theme/icons/scroll_button_left.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe" fill-opacity=".75"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="m9 5-3 3 3 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe" fill-opacity=".75"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="m9 5-3 3 3 3"/></svg>
diff --git a/engine/scene/theme/icons/scroll_button_left_hl.svg b/engine/scene/theme/icons/scroll_button_left_hl.svg
index 659bf6b4..48f4c710 100644
--- a/engine/scene/theme/icons/scroll_button_left_hl.svg
+++ b/engine/scene/theme/icons/scroll_button_left_hl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m9 5-3 3 3 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m9 5-3 3 3 3"/></svg>
diff --git a/engine/scene/theme/icons/scroll_button_right.svg b/engine/scene/theme/icons/scroll_button_right.svg
index 7736e1ef..bc0dd1df 100644
--- a/engine/scene/theme/icons/scroll_button_right.svg
+++ b/engine/scene/theme/icons/scroll_button_right.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe" fill-opacity=".75"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="m7 5 3 3-3 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe" fill-opacity=".75"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-opacity=".65" stroke-width="2" d="m7 5 3 3-3 3"/></svg>
diff --git a/engine/scene/theme/icons/scroll_button_right_hl.svg b/engine/scene/theme/icons/scroll_button_right_hl.svg
index b29e9182..4bb35df4 100644
--- a/engine/scene/theme/icons/scroll_button_right_hl.svg
+++ b/engine/scene/theme/icons/scroll_button_right_hl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m7 5 3 3-3 3"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="6" fill="#fefffe"/><path fill="none" stroke="#1a1a1a" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m7 5 3 3-3 3"/></svg>
diff --git a/engine/scene/theme/icons/slider_grabber.svg b/engine/scene/theme/icons/slider_grabber.svg
index ef0a1fea..499c357b 100644
--- a/engine/scene/theme/icons/slider_grabber.svg
+++ b/engine/scene/theme/icons/slider_grabber.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fefefe" fill-opacity=".75"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fefefe" fill-opacity=".75"/></svg>
diff --git a/engine/scene/theme/icons/slider_grabber_disabled.svg b/engine/scene/theme/icons/slider_grabber_disabled.svg
index 48326fea..d6b377ec 100644
--- a/engine/scene/theme/icons/slider_grabber_disabled.svg
+++ b/engine/scene/theme/icons/slider_grabber_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fefefe" fill-opacity=".37"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fefefe" fill-opacity=".37"/></svg>
diff --git a/engine/scene/theme/icons/slider_grabber_hl.svg b/engine/scene/theme/icons/slider_grabber_hl.svg
index 046878c9..f15e0511 100644
--- a/engine/scene/theme/icons/slider_grabber_hl.svg
+++ b/engine/scene/theme/icons/slider_grabber_hl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fefefe"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#fefefe"/></svg>
diff --git a/engine/scene/theme/icons/tabs_drop_mark.svg b/engine/scene/theme/icons/tabs_drop_mark.svg
index 104c65b8..d9957a20 100644
--- a/engine/scene/theme/icons/tabs_drop_mark.svg
+++ b/engine/scene/theme/icons/tabs_drop_mark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="32"><path fill="#d3d3d3" d="m5 1h6v30h-6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="32"><path fill="#d3d3d3" d="m5 1h6v30h-6z"/></svg>
diff --git a/engine/scene/theme/icons/tabs_menu.svg b/engine/scene/theme/icons/tabs_menu.svg
index 9a70151d..be688bf4 100644
--- a/engine/scene/theme/icons/tabs_menu.svg
+++ b/engine/scene/theme/icons/tabs_menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".45" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".45" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/scene/theme/icons/tabs_menu_hl.svg b/engine/scene/theme/icons/tabs_menu_hl.svg
index e55c1ad9..31a94184 100644
--- a/engine/scene/theme/icons/tabs_menu_hl.svg
+++ b/engine/scene/theme/icons/tabs_menu_hl.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".65" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" fill-opacity=".65" d="M8 0a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4zm0 6a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/scene/theme/icons/text_edit_ellipsis.svg b/engine/scene/theme/icons/text_edit_ellipsis.svg
index a8e0a4e6..3c10b982 100644
--- a/engine/scene/theme/icons/text_edit_ellipsis.svg
+++ b/engine/scene/theme/icons/text_edit_ellipsis.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="8"><path fill="#fefffe" fill-opacity=".25" d="M4 0a4 4 0 0 0 0 8h6a4 4 0 0 0 0-8zM3 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="8"><path fill="#fefffe" fill-opacity=".25" d="M4 0a4 4 0 0 0 0 8h6a4 4 0 0 0 0-8zM3 3a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2zm4 0a1 1 0 0 1 0 2 1 1 0 0 1 0-2z"/></svg>
diff --git a/engine/scene/theme/icons/text_edit_space.svg b/engine/scene/theme/icons/text_edit_space.svg
index 9f6a04ac..749381f1 100644
--- a/engine/scene/theme/icons/text_edit_space.svg
+++ b/engine/scene/theme/icons/text_edit_space.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="1.5" fill="#b2b2b2" fill-opacity=".25"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><circle cx="4" cy="4" r="1.5" fill="#b2b2b2" fill-opacity=".25"/></svg>
diff --git a/engine/scene/theme/icons/text_edit_tab.svg b/engine/scene/theme/icons/text_edit_tab.svg
index e4bdf905..786f5fe8 100644
--- a/engine/scene/theme/icons/text_edit_tab.svg
+++ b/engine/scene/theme/icons/text_edit_tab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#b2b2b2" fill-opacity=".25" d="M6 0v8h2V0zM1 0a1 1 0 0 0-.693 1.705L2.6 3.998.307 6.291A1 1 0 0 0 1.72 7.705l3-3a1 1 0 0 0 0-1.414l-3-3A1 1 0 0 0 1 0z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8"><path fill="#b2b2b2" fill-opacity=".25" d="M6 0v8h2V0zM1 0a1 1 0 0 0-.693 1.705L2.6 3.998.307 6.291A1 1 0 0 0 1.72 7.705l3-3a1 1 0 0 0 0-1.414l-3-3A1 1 0 0 0 1 0z"/></svg>
diff --git a/engine/scene/theme/icons/toggle_filename_filter.svg b/engine/scene/theme/icons/toggle_filename_filter.svg
index 351cc44c..03bd8ca8 100644
--- a/engine/scene/theme/icons/toggle_filename_filter.svg
+++ b/engine/scene/theme/icons/toggle_filename_filter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="m13.297.714h-13.013a.454.454 0 0 0 -.318.779l4.615 4.507v7.086a.45.45 0 0 0 .738.354l3.511-2.812a.454.454 0 0 0 .17-.354v-4.274l4.614-4.506a.454.454 0 0 0 -.317-.779z"/><path d="m11.085832 14.18196c3.399443 1.97457 6.855925-2.441094 4.074102-5.1815164-2.781825-2.7404217-7.2642008.6646174-5.2597994 4.0134654l-1.9001346 1.871854 1.1856973 1.168051zm1.699723-4.4945981c2.236109 0 2.236109 3.3042441 0 3.3042441-2.236108 0-2.236108-3.3042441 0-3.3042441z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><path d="m13.297.714h-13.013a.454.454 0 0 0 -.318.779l4.615 4.507v7.086a.45.45 0 0 0 .738.354l3.511-2.812a.454.454 0 0 0 .17-.354v-4.274l4.614-4.506a.454.454 0 0 0 -.317-.779z"/><path d="m11.085832 14.18196c3.399443 1.97457 6.855925-2.441094 4.074102-5.1815164-2.781825-2.7404217-7.2642008.6646174-5.2597994 4.0134654l-1.9001346 1.871854 1.1856973 1.168051zm1.699723-4.4945981c2.236109 0 2.236109 3.3042441 0 3.3042441-2.236108 0-2.236108-3.3042441 0-3.3042441z"/></g></svg>
diff --git a/engine/scene/theme/icons/toggle_off.svg b/engine/scene/theme/icons/toggle_off.svg
index d58b6cdf..4330845d 100644
--- a/engine/scene/theme/icons/toggle_off.svg
+++ b/engine/scene/theme/icons/toggle_off.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".5"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="8" cy="8" r="5" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".5"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="8" cy="8" r="5" fill="#fff"/></g></svg>
diff --git a/engine/scene/theme/icons/toggle_off_disabled.svg b/engine/scene/theme/icons/toggle_off_disabled.svg
index 85b6aad0..fce8d89e 100644
--- a/engine/scene/theme/icons/toggle_off_disabled.svg
+++ b/engine/scene/theme/icons/toggle_off_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".25"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="8" cy="8" r="5" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".25"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="8" cy="8" r="5" fill="#fff"/></g></svg>
diff --git a/engine/scene/theme/icons/toggle_off_disabled_mirrored.svg b/engine/scene/theme/icons/toggle_off_disabled_mirrored.svg
index f65cbe60..6d1bd15b 100644
--- a/engine/scene/theme/icons/toggle_off_disabled_mirrored.svg
+++ b/engine/scene/theme/icons/toggle_off_disabled_mirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".25"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="24" cy="8" r="5" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".25"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="24" cy="8" r="5" fill="#fff"/></g></svg>
diff --git a/engine/scene/theme/icons/toggle_off_mirrored.svg b/engine/scene/theme/icons/toggle_off_mirrored.svg
index e24f2462..0969c620 100644
--- a/engine/scene/theme/icons/toggle_off_mirrored.svg
+++ b/engine/scene/theme/icons/toggle_off_mirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".5"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="24" cy="8" r="5" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><g fill-opacity=".5"><rect width="30" height="14" x="1" y="1" fill="#1a1a1a" rx="7"/><circle cx="24" cy="8" r="5" fill="#fff"/></g></svg>
diff --git a/engine/scene/theme/icons/toggle_on.svg b/engine/scene/theme/icons/toggle_on.svg
index 4db88f2d..cf3fe426 100644
--- a/engine/scene/theme/icons/toggle_on.svg
+++ b/engine/scene/theme/icons/toggle_on.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="7"/><circle cx="24" cy="8" r="5" fill="#1a1a1a"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="7"/><circle cx="24" cy="8" r="5" fill="#1a1a1a"/></svg>
diff --git a/engine/scene/theme/icons/toggle_on_disabled.svg b/engine/scene/theme/icons/toggle_on_disabled.svg
index 622906bb..380f7e56 100644
--- a/engine/scene/theme/icons/toggle_on_disabled.svg
+++ b/engine/scene/theme/icons/toggle_on_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="7"/><circle cx="24" cy="8" r="5" fill="#1a1a1a" fill-opacity=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="7"/><circle cx="24" cy="8" r="5" fill="#1a1a1a" fill-opacity=".5"/></svg>
diff --git a/engine/scene/theme/icons/toggle_on_disabled_mirrored.svg b/engine/scene/theme/icons/toggle_on_disabled_mirrored.svg
index 0d444de6..aa930c87 100644
--- a/engine/scene/theme/icons/toggle_on_disabled_mirrored.svg
+++ b/engine/scene/theme/icons/toggle_on_disabled_mirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="7"/><circle cx="8" cy="8" r="5" fill="#1a1a1a" fill-opacity=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".37" rx="7"/><circle cx="8" cy="8" r="5" fill="#1a1a1a" fill-opacity=".5"/></svg>
diff --git a/engine/scene/theme/icons/toggle_on_mirrored.svg b/engine/scene/theme/icons/toggle_on_mirrored.svg
index bfed6dd2..f251cb7e 100644
--- a/engine/scene/theme/icons/toggle_on_mirrored.svg
+++ b/engine/scene/theme/icons/toggle_on_mirrored.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="7"/><circle cx="8" cy="8" r="5" fill="#1a1a1a"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16"><rect width="30" height="14" x="1" y="1" fill="#fff" fill-opacity=".75" rx="7"/><circle cx="8" cy="8" r="5" fill="#1a1a1a"/></svg>
diff --git a/engine/scene/theme/icons/unchecked.svg b/engine/scene/theme/icons/unchecked.svg
index 354df8e8..93afb25e 100644
--- a/engine/scene/theme/icons/unchecked.svg
+++ b/engine/scene/theme/icons/unchecked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#1a1a1a" fill-opacity=".5" rx="2.333"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#1a1a1a" fill-opacity=".5" rx="2.333"/></svg>
diff --git a/engine/scene/theme/icons/unchecked_disabled.svg b/engine/scene/theme/icons/unchecked_disabled.svg
index 4d352d74..e33677ed 100644
--- a/engine/scene/theme/icons/unchecked_disabled.svg
+++ b/engine/scene/theme/icons/unchecked_disabled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#1a1a1a" fill-opacity=".25" rx="2.333"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#1a1a1a" fill-opacity=".25" rx="2.333"/></svg>
diff --git a/engine/scene/theme/icons/updown.svg b/engine/scene/theme/icons/updown.svg
index 4a48eb39..ff3abd07 100644
--- a/engine/scene/theme/icons/updown.svg
+++ b/engine/scene/theme/icons/updown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-opacity=".75" stroke-width="2" d="m4 6 4-3.5L12 6m0 4-4 3.5L4 10"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="none" stroke="#fff" stroke-opacity=".75" stroke-width="2" d="m4 6 4-3.5L12 6m0 4-4 3.5L4 10"/></svg>
diff --git a/engine/scene/theme/icons/value_down.svg b/engine/scene/theme/icons/value_down.svg
index 57837d03..54f05579 100644
--- a/engine/scene/theme/icons/value_down.svg
+++ b/engine/scene/theme/icons/value_down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#fff" stroke-width="2" d="m12 2-4 3.5L4 2"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#fff" stroke-width="2" d="m12 2-4 3.5L4 2"/></svg>
diff --git a/engine/scene/theme/icons/value_up.svg b/engine/scene/theme/icons/value_up.svg
index 53fb102f..badc8459 100644
--- a/engine/scene/theme/icons/value_up.svg
+++ b/engine/scene/theme/icons/value_up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#fff" stroke-width="2" d="m4 6 4-3.5L12 6"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="8"><path fill="none" stroke="#fff" stroke-width="2" d="m4 6 4-3.5L12 6"/></svg>
diff --git a/engine/scene/theme/icons/visibility_visible.svg b/engine/scene/theme/icons/visibility_visible.svg
index cd826705..6bbe814b 100644
--- a/engine/scene/theme/icons/visibility_visible.svg
+++ b/engine/scene/theme/icons/visibility_visible.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#b2b2b2" d="M8 2C5.443 2 2.209 3.948 1.045 7.705a1 1 0 0 0 0 .55C2.163 12.211 5.5 14 8 14s5.836-1.789 6.961-5.725a1 1 0 0 0 0-.55C13.861 3.935 10.554 2 8 2zm0 2a4 4 0 0 1 0 8 4 4 0 0 1 0-8zm0 2a2 2 0 0 0 0 4 2 2 0 0 0 0-4z"/></svg>
diff --git a/engine/scene/theme/icons/vslider_tick.svg b/engine/scene/theme/icons/vslider_tick.svg
index d1c5aa4d..0f6160a9 100644
--- a/engine/scene/theme/icons/vslider_tick.svg
+++ b/engine/scene/theme/icons/vslider_tick.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="4"><path fill="#fff" fill-opacity=".25" d="M0 3V1h16v2z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="4"><path fill="#fff" fill-opacity=".25" d="M0 3V1h16v2z"/></svg>
diff --git a/engine/scene/theme/icons/vsplitter.svg b/engine/scene/theme/icons/vsplitter.svg
index 65326bea..cc87ec15 100644
--- a/engine/scene/theme/icons/vsplitter.svg
+++ b/engine/scene/theme/icons/vsplitter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="48" height="8"><path fill="none" stroke="gray" stroke-opacity=".65" stroke-width="1.7" d="M4 4h40"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="8"><path fill="none" stroke="gray" stroke-opacity=".65" stroke-width="1.7" d="M4 4h40"/></svg>
diff --git a/engine/scene/theme/icons/zoom_less.svg b/engine/scene/theme/icons/zoom_less.svg
index eea325db..6ea6d7a0 100644
--- a/engine/scene/theme/icons/zoom_less.svg
+++ b/engine/scene/theme/icons/zoom_less.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill="#b2b2b2" fill-opacity=".65"/><circle cx="8" cy="8" r="7" fill="#fefffe"/><path fill="#010001" d="M4 7h8v2H4z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill="#b2b2b2" fill-opacity=".65"/><circle cx="8" cy="8" r="7" fill="#fefffe"/><path fill="#010001" d="M4 7h8v2H4z"/></svg>
diff --git a/engine/scene/theme/icons/zoom_more.svg b/engine/scene/theme/icons/zoom_more.svg
index 441620e6..0fa5bc0b 100644
--- a/engine/scene/theme/icons/zoom_more.svg
+++ b/engine/scene/theme/icons/zoom_more.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill="#b2b2b2" fill-opacity=".65"/><circle cx="8" cy="8" r="7" fill="#fefffe"/><path fill="#010001" d="M7 4h2v3h3v2H9v3H7V9H4V7h3z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill="#b2b2b2" fill-opacity=".65"/><circle cx="8" cy="8" r="7" fill="#fefffe"/><path fill="#010001" d="M7 4h2v3h3v2H9v3H7V9H4V7h3z"/></svg>
diff --git a/engine/scene/theme/icons/zoom_reset.svg b/engine/scene/theme/icons/zoom_reset.svg
index fd35fe3c..b54f1952 100644
--- a/engine/scene/theme/icons/zoom_reset.svg
+++ b/engine/scene/theme/icons/zoom_reset.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill="#b2b2b2" fill-opacity=".65"/><circle cx="8" cy="8" r="7" fill="#fefffe"/><path fill="#010001" d="M8 4.166A1 1 0 0 1 9.526 5v7h-2V6.87l-1.445.962-1-1.6z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill="#b2b2b2" fill-opacity=".65"/><circle cx="8" cy="8" r="7" fill="#fefffe"/><path fill="#010001" d="M8 4.166A1 1 0 0 1 9.526 5v7h-2V6.87l-1.445.962-1-1.6z"/></svg>
diff --git a/engine/scene/theme/theme_db.cpp b/engine/scene/theme/theme_db.cpp
index c33c3155..b768aef0 100644
--- a/engine/scene/theme/theme_db.cpp
+++ b/engine/scene/theme/theme_db.cpp
@@ -500,7 +500,7 @@ const Vector<Ref<Theme>> ThemeContext::get_themes() const {
 
 Ref<Theme> ThemeContext::get_fallback_theme() const {
 	// We expect all contexts to be valid and non-empty, but just in case...
-	if (themes.size() == 0) {
+	if (themes.is_empty()) {
 		return ThemeDB::get_singleton()->get_default_theme();
 	}
 
diff --git a/engine/scene/theme/theme_db.h b/engine/scene/theme/theme_db.h
index 474ea081..e9d7f5f8 100644
--- a/engine/scene/theme/theme_db.h
+++ b/engine/scene/theme/theme_db.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THEME_DB_H
-#define THEME_DB_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "scene/resources/theme.h"
@@ -205,5 +204,3 @@ public:
 	const Vector<Ref<Theme>> get_themes() const;
 	Ref<Theme> get_fallback_theme() const;
 };
-
-#endif // THEME_DB_H
diff --git a/engine/scene/theme/theme_owner.h b/engine/scene/theme/theme_owner.h
index 14bfa355..a3599448 100644
--- a/engine/scene/theme/theme_owner.h
+++ b/engine/scene/theme/theme_owner.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef THEME_OWNER_H
-#define THEME_OWNER_H
+#pragma once
 
 #include "core/object/object.h"
 #include "scene/resources/theme.h"
@@ -81,5 +80,3 @@ public:
 	ThemeOwner(Node *p_holder) { holder = p_holder; }
 	~ThemeOwner() {}
 };
-
-#endif // THEME_OWNER_H
diff --git a/engine/scu_builders.py b/engine/scu_builders.py
index 8e1f91d7..d14bc10c 100644
--- a/engine/scu_builders.py
+++ b/engine/scu_builders.py
@@ -315,9 +315,10 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["modules/gltf/editor"])
     process_folder(["modules/gltf/extensions"])
     process_folder(["modules/gltf/extensions/physics"])
-    process_folder(["modules/navigation"])
-    process_folder(["modules/navigation/2d"])
-    process_folder(["modules/navigation/3d"])
+    process_folder(["modules/navigation_3d"])
+    process_folder(["modules/navigation_3d/3d"])
+    process_folder(["modules/navigation_2d"])
+    process_folder(["modules/navigation_2d/2d"])
     process_folder(["modules/webrtc"])
     process_folder(["modules/websocket"])
     process_folder(["modules/gridmap"])
@@ -343,6 +344,7 @@ def generate_scu_files(max_includes_per_scu):
     process_folder(["scene/3d"])
     process_folder(["scene/3d/physics"])
     process_folder(["scene/3d/physics/joints"])
+    process_folder(["scene/3d/xr"])
     process_folder(["scene/animation"])
     process_folder(["scene/gui"])
     process_folder(["scene/main"])
diff --git a/engine/servers/SCsub b/engine/servers/SCsub
index 7abe53b9..88fddce5 100644
--- a/engine/servers/SCsub
+++ b/engine/servers/SCsub
@@ -10,8 +10,6 @@ env.add_source_files(env.servers_sources, "camera_server.cpp")
 env.add_source_files(env.servers_sources, "display_server.cpp")
 env.add_source_files(env.servers_sources, "navigation_server_2d.cpp")
 env.add_source_files(env.servers_sources, "navigation_server_3d.cpp")
-env.add_source_files(env.servers_sources, "physics_server_2d.cpp")
-env.add_source_files(env.servers_sources, "physics_server_2d_wrap_mt.cpp")
 env.add_source_files(env.servers_sources, "register_server_types.cpp")
 env.add_source_files(env.servers_sources, "rendering_server.cpp")
 env.add_source_files(env.servers_sources, "text_server.cpp")
@@ -26,11 +24,17 @@ SConscript("navigation/SCsub")
 SConscript("rendering/SCsub")
 SConscript("text/SCsub")
 
-if not env["disable_3d"]:
+if not env["disable_physics_2d"]:
+    env.add_source_files(env.servers_sources, "physics_server_2d.cpp")
+    env.add_source_files(env.servers_sources, "physics_server_2d_wrap_mt.cpp")
+
+if not env["disable_physics_3d"]:
     env.add_source_files(env.servers_sources, "physics_server_3d.cpp")
     env.add_source_files(env.servers_sources, "physics_server_3d_wrap_mt.cpp")
-    SConscript("xr/SCsub")
+
+if not env["disable_xr"]:
     env.add_source_files(env.servers_sources, "xr_server.cpp")
+    SConscript("xr/SCsub")
 
 lib = env.add_library("servers", env.servers_sources)
 
diff --git a/engine/servers/audio/audio_driver_dummy.h b/engine/servers/audio/audio_driver_dummy.h
index 96f81827..af60aa10 100644
--- a/engine/servers/audio/audio_driver_dummy.h
+++ b/engine/servers/audio/audio_driver_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_DRIVER_DUMMY_H
-#define AUDIO_DRIVER_DUMMY_H
+#pragma once
 
 #include "servers/audio_server.h"
 
@@ -85,5 +84,3 @@ public:
 	AudioDriverDummy();
 	~AudioDriverDummy() {}
 };
-
-#endif // AUDIO_DRIVER_DUMMY_H
diff --git a/engine/servers/audio/audio_effect.h b/engine/servers/audio/audio_effect.h
index cef5bfec..1ecb1e4e 100644
--- a/engine/servers/audio/audio_effect.h
+++ b/engine/servers/audio/audio_effect.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_H
-#define AUDIO_EFFECT_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/math/audio_frame.h"
@@ -60,5 +59,3 @@ public:
 	virtual Ref<AudioEffectInstance> instantiate();
 	AudioEffect();
 };
-
-#endif // AUDIO_EFFECT_H
diff --git a/engine/servers/audio/audio_filter_sw.cpp b/engine/servers/audio/audio_filter_sw.cpp
index 94bb311f..7827c74b 100644
--- a/engine/servers/audio/audio_filter_sw.cpp
+++ b/engine/servers/audio/audio_filter_sw.cpp
@@ -60,7 +60,7 @@ void AudioFilterSW::prepare_coefficients(Coeffs *p_coeffs) {
 		final_cutoff = 1; //don't allow less than this
 	}
 
-	double omega = Math_TAU * final_cutoff / sampling_rate;
+	double omega = Math::TAU * final_cutoff / sampling_rate;
 
 	double sin_v = Math::sin(omega);
 	double cos_v = Math::cos(omega);
@@ -134,7 +134,7 @@ void AudioFilterSW::prepare_coefficients(Coeffs *p_coeffs) {
 			double hicutoff = resonance;
 			double centercutoff = (cutoff + resonance) / 2.0;
 			double bandwidth = (Math::log(centercutoff) - Math::log(hicutoff)) / Math::log((double)2);
-			omega = Math_TAU * centercutoff / sampling_rate;
+			omega = Math::TAU * centercutoff / sampling_rate;
 			alpha = Math::sin(omega) * Math::sinh(Math::log((double)2) / 2 * bandwidth * omega / Math::sin(omega));
 			a0 = 1 + alpha;
 
@@ -191,7 +191,7 @@ void AudioFilterSW::set_stages(int p_stages) {
 /* Fourier transform kernel to obtain response */
 
 float AudioFilterSW::get_response(float p_freq, Coeffs *p_coeffs) {
-	float freq = p_freq / sampling_rate * Math_TAU;
+	float freq = p_freq / sampling_rate * Math::TAU;
 
 	float cx = p_coeffs->b0, cy = 0.0;
 
diff --git a/engine/servers/audio/audio_filter_sw.h b/engine/servers/audio/audio_filter_sw.h
index dfaaf914..59ac8ec0 100644
--- a/engine/servers/audio/audio_filter_sw.h
+++ b/engine/servers/audio/audio_filter_sw.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_FILTER_SW_H
-#define AUDIO_FILTER_SW_H
+#pragma once
 
 #include "core/typedefs.h"
 
@@ -122,5 +121,3 @@ void AudioFilterSW::Processor::process_one_interp(float &p_sample) {
 	coeffs.a1 += incr_coeffs.a1;
 	coeffs.a2 += incr_coeffs.a2;
 }
-
-#endif // AUDIO_FILTER_SW_H
diff --git a/engine/servers/audio/audio_rb_resampler.h b/engine/servers/audio/audio_rb_resampler.h
index cecae07d..dd396c8b 100644
--- a/engine/servers/audio/audio_rb_resampler.h
+++ b/engine/servers/audio/audio_rb_resampler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_RB_RESAMPLER_H
-#define AUDIO_RB_RESAMPLER_H
+#pragma once
 
 #include "core/math/audio_frame.h"
 #include "core/templates/safe_refcount.h"
@@ -168,5 +167,3 @@ public:
 	AudioRBResampler();
 	~AudioRBResampler();
 };
-
-#endif // AUDIO_RB_RESAMPLER_H
diff --git a/engine/servers/audio/audio_stream.h b/engine/servers/audio/audio_stream.h
index 7a7a0351..66876cb7 100644
--- a/engine/servers/audio/audio_stream.h
+++ b/engine/servers/audio/audio_stream.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_H
-#define AUDIO_STREAM_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "scene/property_list_helper.h"
@@ -373,5 +372,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AudioStreamRandomizer::PlaybackMode);
-
-#endif // AUDIO_STREAM_H
diff --git a/engine/servers/audio/effects/audio_effect_amplify.h b/engine/servers/audio/effects/audio_effect_amplify.h
index 402f4d2d..70a900ac 100644
--- a/engine/servers/audio/effects/audio_effect_amplify.h
+++ b/engine/servers/audio/effects/audio_effect_amplify.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_AMPLIFY_H
-#define AUDIO_EFFECT_AMPLIFY_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -65,5 +64,3 @@ public:
 
 	AudioEffectAmplify();
 };
-
-#endif // AUDIO_EFFECT_AMPLIFY_H
diff --git a/engine/servers/audio/effects/audio_effect_capture.h b/engine/servers/audio/effects/audio_effect_capture.h
index 8efdff79..46ec40ab 100644
--- a/engine/servers/audio/effects/audio_effect_capture.h
+++ b/engine/servers/audio/effects/audio_effect_capture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_CAPTURE_H
-#define AUDIO_EFFECT_CAPTURE_H
+#pragma once
 
 #include "core/math/audio_frame.h"
 #include "core/object/ref_counted.h"
@@ -76,5 +75,3 @@ public:
 	int get_buffer_length_frames() const;
 	int64_t get_pushed_frames() const;
 };
-
-#endif // AUDIO_EFFECT_CAPTURE_H
diff --git a/engine/servers/audio/effects/audio_effect_chorus.cpp b/engine/servers/audio/effects/audio_effect_chorus.cpp
index 16f42aea..d490cefb 100644
--- a/engine/servers/audio/effects/audio_effect_chorus.cpp
+++ b/engine/servers/audio/effects/audio_effect_chorus.cpp
@@ -84,7 +84,7 @@ void AudioEffectChorusInstance::_process_chunk(const AudioFrame *p_src_frames, A
 		if (v.cutoff == 0) {
 			continue;
 		}
-		float auxlp = expf(-Math_TAU * v.cutoff / mix_rate);
+		float auxlp = expf(-Math::TAU * v.cutoff / mix_rate);
 		float c1 = 1.0 - auxlp;
 		float c2 = auxlp;
 		AudioFrame h = filter_h[vc];
@@ -104,7 +104,7 @@ void AudioEffectChorusInstance::_process_chunk(const AudioFrame *p_src_frames, A
 
 			float phase = (float)(local_cycles & AudioEffectChorus::CYCLES_MASK) / (float)(1 << AudioEffectChorus::CYCLES_FRAC);
 
-			float wave_delay = sinf(phase * Math_TAU) * max_depth_frames;
+			float wave_delay = sinf(phase * Math::TAU) * max_depth_frames;
 
 			int wave_delay_frames = lrint(floor(wave_delay));
 			float wave_delay_frac = wave_delay - (float)wave_delay_frames;
@@ -274,7 +274,7 @@ float AudioEffectChorus::get_dry() const {
 
 void AudioEffectChorus::_validate_property(PropertyInfo &p_property) const {
 	if (p_property.name.begins_with("voice/")) {
-		int voice_idx = p_property.name.get_slice("/", 1).to_int();
+		int voice_idx = p_property.name.get_slicec('/', 1).to_int();
 		if (voice_idx > voice_count) {
 			p_property.usage = PROPERTY_USAGE_NONE;
 		}
diff --git a/engine/servers/audio/effects/audio_effect_chorus.h b/engine/servers/audio/effects/audio_effect_chorus.h
index 24e569af..e0da4c1e 100644
--- a/engine/servers/audio/effects/audio_effect_chorus.h
+++ b/engine/servers/audio/effects/audio_effect_chorus.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_CHORUS_H
-#define AUDIO_EFFECT_CHORUS_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -132,5 +131,3 @@ public:
 
 	AudioEffectChorus();
 };
-
-#endif // AUDIO_EFFECT_CHORUS_H
diff --git a/engine/servers/audio/effects/audio_effect_compressor.h b/engine/servers/audio/effects/audio_effect_compressor.h
index e1b9a685..96b6ec2d 100644
--- a/engine/servers/audio/effects/audio_effect_compressor.h
+++ b/engine/servers/audio/effects/audio_effect_compressor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_COMPRESSOR_H
-#define AUDIO_EFFECT_COMPRESSOR_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -90,5 +89,3 @@ public:
 
 	AudioEffectCompressor();
 };
-
-#endif // AUDIO_EFFECT_COMPRESSOR_H
diff --git a/engine/servers/audio/effects/audio_effect_delay.cpp b/engine/servers/audio/effects/audio_effect_delay.cpp
index 3014dc70..487c9028 100644
--- a/engine/servers/audio/effects/audio_effect_delay.cpp
+++ b/engine/servers/audio/effects/audio_effect_delay.cpp
@@ -73,7 +73,7 @@ void AudioEffectDelayInstance::_process_chunk(const AudioFrame *p_src_frames, Au
 	tap2_vol.right *= CLAMP(1.0 + base->tap_2_pan, 0, 1);
 
 	// feedback lowpass here
-	float lpf_c = expf(-Math_TAU * base->feedback_lowpass / mix_rate); // 0 .. 10khz
+	float lpf_c = expf(-Math::TAU * base->feedback_lowpass / mix_rate); // 0 .. 10khz
 	float lpf_ic = 1.0 - lpf_c;
 
 	const AudioFrame *src = p_src_frames;
diff --git a/engine/servers/audio/effects/audio_effect_delay.h b/engine/servers/audio/effects/audio_effect_delay.h
index 2dd03963..b8a79eab 100644
--- a/engine/servers/audio/effects/audio_effect_delay.h
+++ b/engine/servers/audio/effects/audio_effect_delay.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_DELAY_H
-#define AUDIO_EFFECT_DELAY_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -131,5 +130,3 @@ public:
 
 	AudioEffectDelay() {}
 };
-
-#endif // AUDIO_EFFECT_DELAY_H
diff --git a/engine/servers/audio/effects/audio_effect_distortion.cpp b/engine/servers/audio/effects/audio_effect_distortion.cpp
index bd7ac03b..39364f8e 100644
--- a/engine/servers/audio/effects/audio_effect_distortion.cpp
+++ b/engine/servers/audio/effects/audio_effect_distortion.cpp
@@ -36,8 +36,8 @@ void AudioEffectDistortionInstance::process(const AudioFrame *p_src_frames, Audi
 	const float *src = (const float *)p_src_frames;
 	float *dst = (float *)p_dst_frames;
 
-	//float lpf_c=expf(-Math_TAU*keep_hf_hz.get()/(mix_rate*(float)OVERSAMPLE));
-	float lpf_c = expf(-Math_TAU * base->keep_hf_hz / (AudioServer::get_singleton()->get_mix_rate()));
+	//float lpf_c=expf(-Math::TAU*keep_hf_hz.get()/(mix_rate*(float)OVERSAMPLE));
+	float lpf_c = expf(-Math::TAU * base->keep_hf_hz / (AudioServer::get_singleton()->get_mix_rate()));
 	float lpf_ic = 1.0 - lpf_c;
 
 	float drive_f = base->drive;
diff --git a/engine/servers/audio/effects/audio_effect_distortion.h b/engine/servers/audio/effects/audio_effect_distortion.h
index 2499092a..b0dc2b4b 100644
--- a/engine/servers/audio/effects/audio_effect_distortion.h
+++ b/engine/servers/audio/effects/audio_effect_distortion.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_DISTORTION_H
-#define AUDIO_EFFECT_DISTORTION_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -89,5 +88,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AudioEffectDistortion::Mode)
-
-#endif // AUDIO_EFFECT_DISTORTION_H
diff --git a/engine/servers/audio/effects/audio_effect_eq.h b/engine/servers/audio/effects/audio_effect_eq.h
index 392a76fd..cee7994e 100644
--- a/engine/servers/audio/effects/audio_effect_eq.h
+++ b/engine/servers/audio/effects/audio_effect_eq.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_EQ_H
-#define AUDIO_EFFECT_EQ_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 #include "servers/audio/effects/eq_filter.h"
@@ -97,5 +96,3 @@ public:
 	AudioEffectEQ21() :
 			AudioEffectEQ(EQ::PRESET_21_BANDS) {}
 };
-
-#endif // AUDIO_EFFECT_EQ_H
diff --git a/engine/servers/audio/effects/audio_effect_filter.h b/engine/servers/audio/effects/audio_effect_filter.h
index 04c64ee1..b0852a6c 100644
--- a/engine/servers/audio/effects/audio_effect_filter.h
+++ b/engine/servers/audio/effects/audio_effect_filter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_FILTER_H
-#define AUDIO_EFFECT_FILTER_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 #include "servers/audio/audio_filter_sw.h"
@@ -166,5 +165,3 @@ public:
 	AudioEffectHighShelfFilter() :
 			AudioEffectFilter(AudioFilterSW::HIGHSHELF) {}
 };
-
-#endif // AUDIO_EFFECT_FILTER_H
diff --git a/engine/servers/audio/effects/audio_effect_hard_limiter.cpp b/engine/servers/audio/effects/audio_effect_hard_limiter.cpp
index e717557a..5be496c3 100644
--- a/engine/servers/audio/effects/audio_effect_hard_limiter.cpp
+++ b/engine/servers/audio/effects/audio_effect_hard_limiter.cpp
@@ -47,7 +47,7 @@ void AudioEffectHardLimiterInstance::process(const AudioFrame *p_src_frames, Aud
 		sample_left *= pre_gain;
 		sample_right *= pre_gain;
 
-		float largest_sample = MAX(ABS(sample_left), ABS(sample_right));
+		float largest_sample = MAX(Math::abs(sample_left), Math::abs(sample_right));
 
 		release_factor = MAX(0.0, release_factor - 1.0 / sample_rate);
 		release_factor = MIN(release_factor, release);
diff --git a/engine/servers/audio/effects/audio_effect_hard_limiter.h b/engine/servers/audio/effects/audio_effect_hard_limiter.h
index 7e284807..b2f7a08f 100644
--- a/engine/servers/audio/effects/audio_effect_hard_limiter.h
+++ b/engine/servers/audio/effects/audio_effect_hard_limiter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_HARD_LIMITER_H
-#define AUDIO_EFFECT_HARD_LIMITER_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -85,5 +84,3 @@ public:
 
 	Ref<AudioEffectInstance> instantiate() override;
 };
-
-#endif // AUDIO_EFFECT_HARD_LIMITER_H
diff --git a/engine/servers/audio/effects/audio_effect_limiter.h b/engine/servers/audio/effects/audio_effect_limiter.h
index 478afa34..06410113 100644
--- a/engine/servers/audio/effects/audio_effect_limiter.h
+++ b/engine/servers/audio/effects/audio_effect_limiter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_LIMITER_H
-#define AUDIO_EFFECT_LIMITER_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -75,5 +74,3 @@ public:
 
 	AudioEffectLimiter();
 };
-
-#endif // AUDIO_EFFECT_LIMITER_H
diff --git a/engine/servers/audio/effects/audio_effect_panner.h b/engine/servers/audio/effects/audio_effect_panner.h
index 096b03af..fe76e4e2 100644
--- a/engine/servers/audio/effects/audio_effect_panner.h
+++ b/engine/servers/audio/effects/audio_effect_panner.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_PANNER_H
-#define AUDIO_EFFECT_PANNER_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -60,5 +59,3 @@ public:
 
 	AudioEffectPanner();
 };
-
-#endif // AUDIO_EFFECT_PANNER_H
diff --git a/engine/servers/audio/effects/audio_effect_phaser.cpp b/engine/servers/audio/effects/audio_effect_phaser.cpp
index 4055ecc9..a6de1215 100644
--- a/engine/servers/audio/effects/audio_effect_phaser.cpp
+++ b/engine/servers/audio/effects/audio_effect_phaser.cpp
@@ -37,13 +37,13 @@ void AudioEffectPhaserInstance::process(const AudioFrame *p_src_frames, AudioFra
 	float dmin = base->range_min / (sampling_rate / 2.0);
 	float dmax = base->range_max / (sampling_rate / 2.0);
 
-	float increment = Math_TAU * (base->rate / sampling_rate);
+	float increment = Math::TAU * (base->rate / sampling_rate);
 
 	for (int i = 0; i < p_frame_count; i++) {
 		phase += increment;
 
-		while (phase >= Math_TAU) {
-			phase -= Math_TAU;
+		while (phase >= Math::TAU) {
+			phase -= Math::TAU;
 		}
 
 		float d = dmin + (dmax - dmin) * ((sin(phase) + 1.f) / 2.f);
diff --git a/engine/servers/audio/effects/audio_effect_phaser.h b/engine/servers/audio/effects/audio_effect_phaser.h
index 96c75c35..f81142b0 100644
--- a/engine/servers/audio/effects/audio_effect_phaser.h
+++ b/engine/servers/audio/effects/audio_effect_phaser.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_PHASER_H
-#define AUDIO_EFFECT_PHASER_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -102,5 +101,3 @@ public:
 
 	AudioEffectPhaser();
 };
-
-#endif // AUDIO_EFFECT_PHASER_H
diff --git a/engine/servers/audio/effects/audio_effect_pitch_shift.cpp b/engine/servers/audio/effects/audio_effect_pitch_shift.cpp
index 89273d74..d8857c06 100644
--- a/engine/servers/audio/effects/audio_effect_pitch_shift.cpp
+++ b/engine/servers/audio/effects/audio_effect_pitch_shift.cpp
@@ -92,7 +92,7 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
 	fftFrameSize2 = fftFrameSize/2;
 	stepSize = fftFrameSize/osamp;
 	freqPerBin = sampleRate/(double)fftFrameSize;
-	expct = 2.*Math_PI*(double)stepSize/(double)fftFrameSize;
+	expct = 2.*Math::PI*(double)stepSize/(double)fftFrameSize;
 	inFifoLatency = fftFrameSize-stepSize;
 	if (gRover == 0) { gRover = inFifoLatency;
 }
@@ -112,7 +112,7 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
 
 			/* do windowing and re,im interleave */
 			for (k = 0; k < fftFrameSize;k++) {
-				window = -.5*cos(2.*Math_PI*(double)k/(double)fftFrameSize)+.5;
+				window = -.5*cos(2.*Math::PI*(double)k/(double)fftFrameSize)+.5;
 				gFFTworksp[2*k] = gInFIFO[k] * window;
 				gFFTworksp[2*k+1] = 0.;
 			}
@@ -140,14 +140,14 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
 				tmp -= (double)k*expct;
 
 				/* map delta phase into +/- Pi interval */
-				qpd = tmp/Math_PI;
+				qpd = tmp/Math::PI;
 				if (qpd >= 0) { qpd += qpd&1;
 				} else { qpd -= qpd&1;
 }
-				tmp -= Math_PI*(double)qpd;
+				tmp -= Math::PI*(double)qpd;
 
 				/* get deviation from bin frequency from the +/- Pi interval */
-				tmp = osamp*tmp/(2.*Math_PI);
+				tmp = osamp*tmp/(2.*Math::PI);
 
 				/* compute the k-th partials' true frequency */
 				tmp = (double)k*freqPerBin + tmp*freqPerBin;
@@ -184,7 +184,7 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
 				tmp /= freqPerBin;
 
 				/* take osamp into account */
-				tmp = 2.*Math_PI*tmp/osamp;
+				tmp = 2.*Math::PI*tmp/osamp;
 
 				/* add the overlap phase advance back in */
 				tmp += (double)k*expct;
@@ -207,7 +207,7 @@ void SMBPitchShift::PitchShift(float pitchShift, long numSampsToProcess, long ff
 
 			/* do windowing and add to output accumulator */
 			for(k=0; k < fftFrameSize; k++) {
-				window = -.5*cos(2.*Math_PI*(double)k/(double)fftFrameSize)+.5;
+				window = -.5*cos(2.*Math::PI*(double)k/(double)fftFrameSize)+.5;
 				gOutputAccum[k] += 2.*window*gFFTworksp[2*k]/(fftFrameSize2*osamp);
 			}
 			for (k = 0; k < stepSize; k++) { gOutFIFO[k] = gOutputAccum[k];
@@ -260,7 +260,7 @@ void SMBPitchShift::smbFft(float *fftBuffer, long fftFrameSize, long sign)
 		le2 = le>>1;
 		ur = 1.0;
 		ui = 0.0;
-		arg = Math_PI / (le2>>1);
+		arg = Math::PI / (le2>>1);
 		wr = cos(arg);
 		wi = sign*sin(arg);
 		for (j = 0; j < le2; j += 2) {
@@ -288,6 +288,9 @@ void SMBPitchShift::smbFft(float *fftBuffer, long fftFrameSize, long sign)
 void AudioEffectPitchShiftInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
 	// Avoid distortion by skipping processing if pitch_scale is 1.0.
 	if (Math::is_equal_approx(base->pitch_scale, 1.0f)) {
+		for (int i = 0; i < p_frame_count; i++) {
+			p_dst_frames[i] = p_src_frames[i];
+		}
 		return;
 	}
 
diff --git a/engine/servers/audio/effects/audio_effect_pitch_shift.h b/engine/servers/audio/effects/audio_effect_pitch_shift.h
index 381833c2..f116478c 100644
--- a/engine/servers/audio/effects/audio_effect_pitch_shift.h
+++ b/engine/servers/audio/effects/audio_effect_pitch_shift.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_PITCH_SHIFT_H
-#define AUDIO_EFFECT_PITCH_SHIFT_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -110,5 +109,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AudioEffectPitchShift::FFTSize);
-
-#endif // AUDIO_EFFECT_PITCH_SHIFT_H
diff --git a/engine/servers/audio/effects/audio_effect_record.h b/engine/servers/audio/effects/audio_effect_record.h
index 587fa197..50c105e8 100644
--- a/engine/servers/audio/effects/audio_effect_record.h
+++ b/engine/servers/audio/effects/audio_effect_record.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_RECORD_H
-#define AUDIO_EFFECT_RECORD_H
+#pragma once
 
 #include "core/os/thread.h"
 #include "scene/resources/audio_stream_wav.h"
@@ -94,5 +93,3 @@ public:
 	AudioEffectRecord();
 	~AudioEffectRecord();
 };
-
-#endif // AUDIO_EFFECT_RECORD_H
diff --git a/engine/servers/audio/effects/audio_effect_reverb.h b/engine/servers/audio/effects/audio_effect_reverb.h
index d7c967b3..cf59b61e 100644
--- a/engine/servers/audio/effects/audio_effect_reverb.h
+++ b/engine/servers/audio/effects/audio_effect_reverb.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_REVERB_H
-#define AUDIO_EFFECT_REVERB_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 #include "servers/audio/effects/reverb_filter.h"
@@ -93,5 +92,3 @@ public:
 
 	AudioEffectReverb();
 };
-
-#endif // AUDIO_EFFECT_REVERB_H
diff --git a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
index aa554dad..9ba58b0f 100644
--- a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
+++ b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.cpp
@@ -71,7 +71,7 @@ static void smbFft(float *fftBuffer, long fftFrameSize, long sign)
 		le2 = le >> 1;
 		ur = 1.0;
 		ui = 0.0;
-		arg = Math_PI / (le2 >> 1);
+		arg = Math::PI / (le2 >> 1);
 		wr = cos(arg);
 		wi = sign * sin(arg);
 		for (j = 0; j < le2; j += 2) {
@@ -110,7 +110,7 @@ void AudioEffectSpectrumAnalyzerInstance::process(const AudioFrame *p_src_frames
 	while (p_frame_count) {
 		int to_fill = fft_size * 2 - temporal_fft_pos;
 		to_fill = MIN(to_fill, p_frame_count);
-		const double to_fill_step = Math_TAU / (double)fft_size;
+		const double to_fill_step = Math::TAU / (double)fft_size;
 
 		float *fftw = temporal_fft.ptrw();
 		for (int i = 0; i < to_fill; i++) { //left and right buffers
diff --git a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h
index f3c1cf88..746f75aa 100644
--- a/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h
+++ b/engine/servers/audio/effects/audio_effect_spectrum_analyzer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_SPECTRUM_ANALYZER_H
-#define AUDIO_EFFECT_SPECTRUM_ANALYZER_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -103,5 +102,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AudioEffectSpectrumAnalyzer::FFTSize);
-
-#endif // AUDIO_EFFECT_SPECTRUM_ANALYZER_H
diff --git a/engine/servers/audio/effects/audio_effect_stereo_enhance.h b/engine/servers/audio/effects/audio_effect_stereo_enhance.h
index 503edc43..374b4183 100644
--- a/engine/servers/audio/effects/audio_effect_stereo_enhance.h
+++ b/engine/servers/audio/effects/audio_effect_stereo_enhance.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_EFFECT_STEREO_ENHANCE_H
-#define AUDIO_EFFECT_STEREO_ENHANCE_H
+#pragma once
 
 #include "servers/audio/audio_effect.h"
 
@@ -81,5 +80,3 @@ public:
 
 	AudioEffectStereoEnhance();
 };
-
-#endif // AUDIO_EFFECT_STEREO_ENHANCE_H
diff --git a/engine/servers/audio/effects/audio_stream_generator.h b/engine/servers/audio/effects/audio_stream_generator.h
index 63000de2..01d9f000 100644
--- a/engine/servers/audio/effects/audio_stream_generator.h
+++ b/engine/servers/audio/effects/audio_stream_generator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_STREAM_GENERATOR_H
-#define AUDIO_STREAM_GENERATOR_H
+#pragma once
 
 #include "core/templates/ring_buffer.h"
 #include "servers/audio/audio_stream.h"
@@ -112,5 +111,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(AudioStreamGenerator::AudioStreamGeneratorMixRate);
-
-#endif // AUDIO_STREAM_GENERATOR_H
diff --git a/engine/servers/audio/effects/eq_filter.cpp b/engine/servers/audio/effects/eq_filter.cpp
index 94ae7404..9b774833 100644
--- a/engine/servers/audio/effects/eq_filter.cpp
+++ b/engine/servers/audio/effects/eq_filter.cpp
@@ -88,9 +88,9 @@ void EQ::recalculate_band_coefficients() {
 
 		double frq_l = round(frq / pow(2.0, octave_size / 2.0));
 
-		double side_gain2 = POW2(Math_SQRT12);
-		double th = Math_TAU * frq / mix_rate;
-		double th_l = Math_TAU * frq_l / mix_rate;
+		double side_gain2 = POW2(Math::SQRT12);
+		double th = Math::TAU * frq / mix_rate;
+		double th_l = Math::TAU * frq_l / mix_rate;
 
 		double c2a = side_gain2 * POW2(cos(th)) - 2.0 * side_gain2 * cos(th_l) * cos(th) + side_gain2 - POW2(sin(th_l));
 
diff --git a/engine/servers/audio/effects/eq_filter.h b/engine/servers/audio/effects/eq_filter.h
index af52f0bf..8e820d01 100644
--- a/engine/servers/audio/effects/eq_filter.h
+++ b/engine/servers/audio/effects/eq_filter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef EQ_FILTER_H
-#define EQ_FILTER_H
+#pragma once
 
 #include "core/templates/vector.h"
 
@@ -97,5 +96,3 @@ inline void EQ::BandProcess::process_one(float &p_data) {
 	history.b3 = history.b2;
 	history.b2 = history.b1;
 }
-
-#endif // EQ_FILTER_H
diff --git a/engine/servers/audio/effects/reverb_filter.cpp b/engine/servers/audio/effects/reverb_filter.cpp
index e3a438d9..eba6c924 100644
--- a/engine/servers/audio/effects/reverb_filter.cpp
+++ b/engine/servers/audio/effects/reverb_filter.cpp
@@ -90,7 +90,7 @@ void Reverb::process(float *p_src, float *p_dst, int p_frames) {
 	}
 
 	if (params.hpf > 0) {
-		float hpaux = expf(-Math_TAU * params.hpf * 6000 / params.mix_rate);
+		float hpaux = expf(-Math::TAU * params.hpf * 6000 / params.mix_rate);
 		float hp_a1 = (1.0 + hpaux) / 2.0;
 		float hp_a2 = -(1.0 + hpaux) / 2.0;
 		float hp_b1 = hpaux;
@@ -292,7 +292,7 @@ void Reverb::update_parameters() {
 		float auxdmp = params.damp / 2.0 + 0.5; //only half the range (0.5 .. 1.0 is enough)
 		auxdmp *= auxdmp;
 
-		c.damp = expf(-Math_TAU * auxdmp * 10000 / params.mix_rate); // 0 .. 10khz
+		c.damp = expf(-Math::TAU * auxdmp * 10000 / params.mix_rate); // 0 .. 10khz
 	}
 }
 
diff --git a/engine/servers/audio/effects/reverb_filter.h b/engine/servers/audio/effects/reverb_filter.h
index 3c429daf..17300fc2 100644
--- a/engine/servers/audio/effects/reverb_filter.h
+++ b/engine/servers/audio/effects/reverb_filter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REVERB_FILTER_H
-#define REVERB_FILTER_H
+#pragma once
 
 class Reverb {
 public:
@@ -114,5 +113,3 @@ public:
 
 	~Reverb();
 };
-
-#endif // REVERB_FILTER_H
diff --git a/engine/servers/audio_server.cpp b/engine/servers/audio_server.cpp
index 98440b0c..b5df0821 100644
--- a/engine/servers/audio_server.cpp
+++ b/engine/servers/audio_server.cpp
@@ -294,19 +294,23 @@ void AudioServer::_driver_process(int p_frames, int32_t *p_buffer) {
 			// The destination start for data will be the same in all cases.
 			int32_t *dest = &p_buffer[from_buf * (cs * 2) + (k * 2)];
 
+#ifdef DEBUG_ENABLED
+			if (!debug_mute && master->channels[k].active) {
+#else
 			if (master->channels[k].active) {
+#endif // DEBUG_ENABLED
 				const AudioFrame *buf = master->channels[k].buffer.ptr();
 
 				for (int j = 0; j < to_copy; j++) {
 					float l = CLAMP(buf[from + j].left, -1.0, 1.0);
 					int32_t vl = l * ((1 << 20) - 1);
-					int32_t vl2 = (vl < 0 ? -1 : 1) * (ABS(vl) << 11);
+					int32_t vl2 = (vl < 0 ? -1 : 1) * (Math::abs(vl) << 11);
 					*dest = vl2;
 					dest++;
 
 					float r = CLAMP(buf[from + j].right, -1.0, 1.0);
 					int32_t vr = r * ((1 << 20) - 1);
-					int32_t vr2 = (vr < 0 ? -1 : 1) * (ABS(vr) << 11);
+					int32_t vr2 = (vr < 0 ? -1 : 1) * (Math::abs(vr) << 11);
 					*dest = vr2;
 					dest += stride_minus_one;
 				}
@@ -621,11 +625,11 @@ void AudioServer::_mix_step() {
 			for (uint32_t j = 0; j < buffer_size; j++) {
 				buf[j] *= volume;
 
-				float l = ABS(buf[j].left);
+				float l = Math::abs(buf[j].left);
 				if (l > peak.left) {
 					peak.left = l;
 				}
-				float r = ABS(buf[j].right);
+				float r = Math::abs(buf[j].right);
 				if (r > peak.right) {
 					peak.right = r;
 				}
@@ -765,6 +769,16 @@ int AudioServer::thread_find_bus_index(const StringName &p_name) {
 	}
 }
 
+#ifdef DEBUG_ENABLED
+void AudioServer::set_debug_mute(bool p_mute) {
+	debug_mute = p_mute;
+}
+
+bool AudioServer::get_debug_mute() const {
+	return debug_mute;
+}
+#endif // DEBUG_ENABLED
+
 void AudioServer::set_bus_count(int p_count) {
 	ERR_FAIL_COND(p_count < 1);
 	ERR_FAIL_INDEX(p_count, 256);
@@ -1230,6 +1244,7 @@ void AudioServer::start_playback_stream(Ref<AudioStreamPlayback> p_playback, con
 	int idx = 0;
 	for (KeyValue<StringName, Vector<AudioFrame>> pair : p_bus_volumes) {
 		if (pair.value.size() < channel_count || pair.value.size() != MAX_CHANNELS_PER_BUS) {
+			delete playback_node;
 			delete new_bus_details;
 			ERR_FAIL();
 		}
@@ -1322,8 +1337,10 @@ void AudioServer::set_playback_bus_volumes_linear(Ref<AudioStreamPlayback> p_pla
 		if (idx >= MAX_BUSES_PER_PLAYBACK) {
 			break;
 		}
-		ERR_FAIL_COND(pair.value.size() < channel_count);
-		ERR_FAIL_COND(pair.value.size() != MAX_CHANNELS_PER_BUS);
+		if (pair.value.size() < channel_count || pair.value.size() != MAX_CHANNELS_PER_BUS) {
+			delete new_bus_details;
+			ERR_FAIL();
+		}
 
 		new_bus_details->bus_active[idx] = true;
 		new_bus_details->bus[idx] = pair.key;
@@ -2044,14 +2061,14 @@ AudioServer::~AudioServer() {
 bool AudioBusLayout::_set(const StringName &p_name, const Variant &p_value) {
 	String s = p_name;
 	if (s.begins_with("bus/")) {
-		int index = s.get_slice("/", 1).to_int();
+		int index = s.get_slicec('/', 1).to_int();
 		if (buses.size() <= index) {
 			buses.resize(index + 1);
 		}
 
 		Bus &bus = buses.write[index];
 
-		String what = s.get_slice("/", 2);
+		String what = s.get_slicec('/', 2);
 
 		if (what == "name") {
 			bus.name = p_value;
@@ -2066,14 +2083,14 @@ bool AudioBusLayout::_set(const StringName &p_name, const Variant &p_value) {
 		} else if (what == "send") {
 			bus.send = p_value;
 		} else if (what == "effect") {
-			int which = s.get_slice("/", 3).to_int();
+			int which = s.get_slicec('/', 3).to_int();
 			if (bus.effects.size() <= which) {
 				bus.effects.resize(which + 1);
 			}
 
 			Bus::Effect &fx = bus.effects.write[which];
 
-			String fxwhat = s.get_slice("/", 4);
+			String fxwhat = s.get_slicec('/', 4);
 			if (fxwhat == "effect") {
 				fx.effect = p_value;
 			} else if (fxwhat == "enabled") {
@@ -2096,14 +2113,14 @@ bool AudioBusLayout::_set(const StringName &p_name, const Variant &p_value) {
 bool AudioBusLayout::_get(const StringName &p_name, Variant &r_ret) const {
 	String s = p_name;
 	if (s.begins_with("bus/")) {
-		int index = s.get_slice("/", 1).to_int();
+		int index = s.get_slicec('/', 1).to_int();
 		if (index < 0 || index >= buses.size()) {
 			return false;
 		}
 
 		const Bus &bus = buses[index];
 
-		String what = s.get_slice("/", 2);
+		String what = s.get_slicec('/', 2);
 
 		if (what == "name") {
 			r_ret = bus.name;
@@ -2118,14 +2135,14 @@ bool AudioBusLayout::_get(const StringName &p_name, Variant &r_ret) const {
 		} else if (what == "send") {
 			r_ret = bus.send;
 		} else if (what == "effect") {
-			int which = s.get_slice("/", 3).to_int();
+			int which = s.get_slicec('/', 3).to_int();
 			if (which < 0 || which >= bus.effects.size()) {
 				return false;
 			}
 
 			const Bus::Effect &fx = bus.effects[which];
 
-			String fxwhat = s.get_slice("/", 4);
+			String fxwhat = s.get_slicec('/', 4);
 			if (fxwhat == "effect") {
 				r_ret = fx.effect;
 			} else if (fxwhat == "enabled") {
diff --git a/engine/servers/audio_server.h b/engine/servers/audio_server.h
index 93da66fb..e429c836 100644
--- a/engine/servers/audio_server.h
+++ b/engine/servers/audio_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef AUDIO_SERVER_H
-#define AUDIO_SERVER_H
+#pragma once
 
 #include "core/math/audio_frame.h"
 #include "core/object/class_db.h"
@@ -229,6 +228,10 @@ private:
 
 	bool tag_used_audio_streams = false;
 
+#ifdef DEBUG_ENABLED
+	bool debug_mute = false;
+#endif // DEBUG_ENABLED
+
 	struct Bus {
 		StringName name;
 		bool solo = false;
@@ -367,6 +370,11 @@ public:
 	int thread_get_mix_buffer_size() const;
 	int thread_find_bus_index(const StringName &p_name);
 
+#ifdef DEBUG_ENABLED
+	void set_debug_mute(bool p_mute);
+	bool get_debug_mute() const;
+#endif // DEBUG_ENABLED
+
 	void set_bus_count(int p_count);
 	int get_bus_count() const;
 
@@ -548,5 +556,3 @@ public:
 };
 
 typedef AudioServer AS;
-
-#endif // AUDIO_SERVER_H
diff --git a/engine/servers/camera/camera_feed.h b/engine/servers/camera/camera_feed.h
index 19327029..3ed714bc 100644
--- a/engine/servers/camera/camera_feed.h
+++ b/engine/servers/camera/camera_feed.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_FEED_H
-#define CAMERA_FEED_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/math/transform_2d.h"
@@ -129,5 +128,3 @@ public:
 
 VARIANT_ENUM_CAST(CameraFeed::FeedDataType);
 VARIANT_ENUM_CAST(CameraFeed::FeedPosition);
-
-#endif // CAMERA_FEED_H
diff --git a/engine/servers/camera_server.cpp b/engine/servers/camera_server.cpp
index b78a0c44..3d01399a 100644
--- a/engine/servers/camera_server.cpp
+++ b/engine/servers/camera_server.cpp
@@ -39,6 +39,10 @@
 CameraServer::CreateFunc CameraServer::create_func = nullptr;
 
 void CameraServer::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("set_monitoring_feeds", "is_monitoring_feeds"), &CameraServer::set_monitoring_feeds);
+	ClassDB::bind_method(D_METHOD("is_monitoring_feeds"), &CameraServer::is_monitoring_feeds);
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "monitoring_feeds"), "set_monitoring_feeds", "is_monitoring_feeds");
+
 	ClassDB::bind_method(D_METHOD("get_feed", "index"), &CameraServer::get_feed);
 	ClassDB::bind_method(D_METHOD("get_feed_count"), &CameraServer::get_feed_count);
 	ClassDB::bind_method(D_METHOD("feeds"), &CameraServer::get_feeds);
@@ -61,6 +65,10 @@ CameraServer *CameraServer::get_singleton() {
 	return singleton;
 }
 
+void CameraServer::set_monitoring_feeds(bool p_monitoring_feeds) {
+	monitoring_feeds = p_monitoring_feeds;
+}
+
 int CameraServer::get_free_id() {
 	bool id_exists = true;
 	int newid = 0;
@@ -80,6 +88,8 @@ int CameraServer::get_free_id() {
 }
 
 int CameraServer::get_feed_index(int p_id) {
+	ERR_FAIL_COND_V_MSG(!monitoring_feeds, -1, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
+
 	for (int i = 0; i < feeds.size(); i++) {
 		if (feeds[i]->get_id() == p_id) {
 			return i;
@@ -90,6 +100,8 @@ int CameraServer::get_feed_index(int p_id) {
 }
 
 Ref<CameraFeed> CameraServer::get_feed_by_id(int p_id) {
+	ERR_FAIL_COND_V_MSG(!monitoring_feeds, nullptr, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
+
 	int index = get_feed_index(p_id);
 
 	if (index == -1) {
@@ -129,16 +141,19 @@ void CameraServer::remove_feed(const Ref<CameraFeed> &p_feed) {
 }
 
 Ref<CameraFeed> CameraServer::get_feed(int p_index) {
+	ERR_FAIL_COND_V_MSG(!monitoring_feeds, nullptr, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
 	ERR_FAIL_INDEX_V(p_index, feeds.size(), nullptr);
 
 	return feeds[p_index];
 }
 
 int CameraServer::get_feed_count() {
+	ERR_FAIL_COND_V_MSG(!monitoring_feeds, 0, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
 	return feeds.size();
 }
 
 TypedArray<CameraFeed> CameraServer::get_feeds() {
+	ERR_FAIL_COND_V_MSG(!monitoring_feeds, {}, "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
 	TypedArray<CameraFeed> return_feeds;
 	int cc = get_feed_count();
 	return_feeds.resize(cc);
@@ -151,6 +166,7 @@ TypedArray<CameraFeed> CameraServer::get_feeds() {
 }
 
 RID CameraServer::feed_texture(int p_id, CameraServer::FeedImage p_texture) {
+	ERR_FAIL_COND_V_MSG(!monitoring_feeds, RID(), "CameraServer is not actively monitoring feeds; call set_monitoring_feeds(true) first.");
 	int index = get_feed_index(p_id);
 	ERR_FAIL_COND_V(index == -1, RID());
 
diff --git a/engine/servers/camera_server.h b/engine/servers/camera_server.h
index 6a79b62f..bb34229d 100644
--- a/engine/servers/camera_server.h
+++ b/engine/servers/camera_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_SERVER_H
-#define CAMERA_SERVER_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
@@ -65,6 +64,7 @@ private:
 protected:
 	static CreateFunc create_func;
 
+	bool monitoring_feeds = false;
 	Vector<Ref<CameraFeed>> feeds;
 
 	static CameraServer *singleton;
@@ -89,6 +89,9 @@ public:
 		return server;
 	}
 
+	virtual void set_monitoring_feeds(bool p_monitoring_feeds);
+	_FORCE_INLINE_ bool is_monitoring_feeds() const { return monitoring_feeds; }
+
 	// Right now we identify our feed by it's ID when it's used in the background.
 	// May see if we can change this to purely relying on CameraFeed objects or by name.
 	int get_free_id();
@@ -112,5 +115,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(CameraServer::FeedImage);
-
-#endif // CAMERA_SERVER_H
diff --git a/engine/servers/debugger/servers_debugger.cpp b/engine/servers/debugger/servers_debugger.cpp
index d4c728d8..af784629 100644
--- a/engine/servers/debugger/servers_debugger.cpp
+++ b/engine/servers/debugger/servers_debugger.cpp
@@ -42,8 +42,7 @@
 Array ServersDebugger::ResourceUsage::serialize() {
 	infos.sort();
 
-	Array arr;
-	arr.push_back(infos.size() * 4);
+	Array arr = { infos.size() * 4 };
 	for (const ResourceInfo &E : infos) {
 		arr.push_back(E.path);
 		arr.push_back(E.format);
@@ -73,9 +72,7 @@ bool ServersDebugger::ResourceUsage::deserialize(const Array &p_arr) {
 }
 
 Array ServersDebugger::ScriptFunctionSignature::serialize() {
-	Array arr;
-	arr.push_back(name);
-	arr.push_back(id);
+	Array arr = { name, id };
 	return arr;
 }
 
@@ -88,13 +85,7 @@ bool ServersDebugger::ScriptFunctionSignature::deserialize(const Array &p_arr) {
 }
 
 Array ServersDebugger::ServersProfilerFrame::serialize() {
-	Array arr;
-	arr.push_back(frame_number);
-	arr.push_back(frame_time);
-	arr.push_back(process_time);
-	arr.push_back(physics_time);
-	arr.push_back(physics_frame_time);
-	arr.push_back(script_time);
+	Array arr = { frame_number, frame_time, process_time, physics_time, physics_frame_time, script_time };
 
 	arr.push_back(servers.size());
 	for (const ServerInfo &s : servers) {
@@ -163,9 +154,7 @@ bool ServersDebugger::ServersProfilerFrame::deserialize(const Array &p_arr) {
 }
 
 Array ServersDebugger::VisualProfilerFrame::serialize() {
-	Array arr;
-	arr.push_back(frame_number);
-	arr.push_back(areas.size() * 3);
+	Array arr = { frame_number, areas.size() * 3 };
 	for (int i = 0; i < areas.size(); i++) {
 		arr.push_back(areas[i].name);
 		arr.push_back(areas[i].cpu_msec);
@@ -372,9 +361,10 @@ public:
 		RS::get_singleton()->set_frame_profiling_enabled(p_enable);
 
 		// Send hardware information from the remote device so that it's accurate for remote debugging.
-		Array hardware_info;
-		hardware_info.push_back(OS::get_singleton()->get_processor_name());
-		hardware_info.push_back(RenderingServer::get_singleton()->get_video_adapter_name());
+		Array hardware_info = {
+			OS::get_singleton()->get_processor_name(),
+			RenderingServer::get_singleton()->get_video_adapter_name()
+		};
 		EngineDebugger::get_singleton()->send_message("visual:hardware_info", hardware_info);
 	}
 
diff --git a/engine/servers/debugger/servers_debugger.h b/engine/servers/debugger/servers_debugger.h
index d74d4eae..4e2aa48e 100644
--- a/engine/servers/debugger/servers_debugger.h
+++ b/engine/servers/debugger/servers_debugger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SERVERS_DEBUGGER_H
-#define SERVERS_DEBUGGER_H
+#pragma once
 
 #include "servers/rendering_server.h"
 
@@ -127,5 +126,3 @@ public:
 
 	~ServersDebugger();
 };
-
-#endif // SERVERS_DEBUGGER_H
diff --git a/engine/servers/display/native_menu.h b/engine/servers/display/native_menu.h
index cb38bad3..d696b7e9 100644
--- a/engine/servers/display/native_menu.h
+++ b/engine/servers/display/native_menu.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NATIVE_MENU_H
-#define NATIVE_MENU_H
+#pragma once
 
 #include "core/input/input.h"
 #include "core/variant/callable.h"
@@ -156,5 +155,3 @@ public:
 
 VARIANT_ENUM_CAST(NativeMenu::Feature);
 VARIANT_ENUM_CAST(NativeMenu::SystemMenus);
-
-#endif // NATIVE_MENU_H
diff --git a/engine/servers/display_server.compat.inc b/engine/servers/display_server.compat.inc
new file mode 100644
index 00000000..165dad94
--- /dev/null
+++ b/engine/servers/display_server.compat.inc
@@ -0,0 +1,46 @@
+/**************************************************************************/
+/*  display_server.compat.inc                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#ifndef DISABLE_DEPRECATED
+
+Error DisplayServer::_file_dialog_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
+	return file_dialog_show(p_title, p_current_directory, p_filename, p_show_hidden, p_mode, p_filters, p_callback, MAIN_WINDOW_ID);
+}
+
+Error DisplayServer::_file_dialog_with_options_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
+	return file_dialog_with_options_show(p_title, p_current_directory, p_root, p_filename, p_show_hidden, p_mode, p_filters, p_options, p_callback, MAIN_WINDOW_ID);
+}
+
+void DisplayServer::_bind_compatibility_methods() {
+	ClassDB::bind_compatibility_method(D_METHOD("file_dialog_show", "title", "current_directory", "filename", "show_hidden", "mode", "filters", "callback"), &DisplayServer::_file_dialog_show_bind_compat_98194);
+	ClassDB::bind_compatibility_method(D_METHOD("file_dialog_with_options_show", "title", "current_directory", "root", "filename", "show_hidden", "mode", "filters", "options", "callback"), &DisplayServer::_file_dialog_with_options_show_bind_compat_98194);
+}
+
+#endif
diff --git a/engine/servers/display_server.cpp b/engine/servers/display_server.cpp
index c9399d9c..e42d8d70 100644
--- a/engine/servers/display_server.cpp
+++ b/engine/servers/display_server.cpp
@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "display_server.h"
+#include "display_server.compat.inc"
 
 #include "core/input/input.h"
 #include "scene/resources/texture.h"
@@ -47,6 +48,8 @@
 
 DisplayServer *DisplayServer::singleton = nullptr;
 
+DisplayServer::AccessibilityMode DisplayServer::accessibility_mode = DisplayServer::AccessibilityMode::ACCESSIBILITY_AUTO;
+
 bool DisplayServer::hidpi_allowed = false;
 
 bool DisplayServer::window_early_clear_override_enabled = false;
@@ -525,7 +528,7 @@ Point2i DisplayServer::mouse_get_position() const {
 }
 
 BitField<MouseButtonMask> DisplayServer::mouse_get_button_state() const {
-	ERR_FAIL_V_MSG(0, "Mouse is not supported by this display server.");
+	ERR_FAIL_V_MSG(MouseButtonMask::NONE, "Mouse is not supported by this display server.");
 }
 
 void DisplayServer::clipboard_set(const String &p_text) {
@@ -629,6 +632,456 @@ void DisplayServer::window_set_ime_position(const Point2i &p_pos, WindowID p_win
 	WARN_PRINT("IME not supported by this display server.");
 }
 
+RID DisplayServer::accessibility_create_element(WindowID p_window, DisplayServer::AccessibilityRole p_role) {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_create_element(p_window, p_role);
+	} else {
+		return RID();
+	}
+}
+
+RID DisplayServer::accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos) {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_create_sub_element(p_parent_rid, p_role, p_insert_pos);
+	} else {
+		return RID();
+	}
+}
+
+RID DisplayServer::accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos) {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_create_sub_text_edit_elements(p_parent_rid, p_shaped_text, p_min_height, p_insert_pos);
+	} else {
+		return RID();
+	}
+}
+
+bool DisplayServer::accessibility_has_element(const RID &p_id) const {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_has_element(p_id);
+	} else {
+		return false;
+	}
+}
+
+void DisplayServer::accessibility_free_element(const RID &p_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_free_element(p_id);
+	}
+}
+
+void DisplayServer::accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_element_set_meta(p_id, p_meta);
+	}
+}
+
+Variant DisplayServer::accessibility_element_get_meta(const RID &p_id) const {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_element_get_meta(p_id);
+	} else {
+		return Variant();
+	}
+}
+
+void DisplayServer::accessibility_update_if_active(const Callable &p_callable) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_if_active(p_callable);
+	}
+}
+
+void DisplayServer::accessibility_update_set_focus(const RID &p_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_focus(p_id);
+	}
+}
+
+RID DisplayServer::accessibility_get_window_root(DisplayServer::WindowID p_window_id) const {
+	if (accessibility_driver) {
+		return accessibility_driver->accessibility_get_window_root(p_window_id);
+	} else {
+		return RID();
+	}
+}
+
+void DisplayServer::accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_set_window_rect(p_window_id, p_rect_out, p_rect_in);
+	}
+}
+
+void DisplayServer::accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_set_window_focused(p_window_id, p_focused);
+	}
+}
+
+void DisplayServer::accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_role(p_id, p_role);
+	}
+}
+
+void DisplayServer::accessibility_update_set_name(const RID &p_id, const String &p_name) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_name(p_id, p_name);
+	}
+}
+
+void DisplayServer::accessibility_update_set_description(const RID &p_id, const String &p_description) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_description(p_id, p_description);
+	}
+}
+
+void DisplayServer::accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_extra_info(p_id, p_name_extra_info);
+	}
+}
+
+void DisplayServer::accessibility_update_set_value(const RID &p_id, const String &p_value) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_value(p_id, p_value);
+	}
+}
+
+void DisplayServer::accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_tooltip(p_id, p_tooltip);
+	}
+}
+
+void DisplayServer::accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_bounds(p_id, p_rect);
+	}
+}
+
+void DisplayServer::accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_transform(p_id, p_transform);
+	}
+}
+
+void DisplayServer::accessibility_update_add_child(const RID &p_id, const RID &p_child_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_child(p_id, p_child_id);
+	}
+}
+
+void DisplayServer::accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_controls(p_id, p_related_id);
+	}
+}
+
+void DisplayServer::accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_details(p_id, p_related_id);
+	}
+}
+
+void DisplayServer::accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_described_by(p_id, p_related_id);
+	}
+}
+
+void DisplayServer::accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_flow_to(p_id, p_related_id);
+	}
+}
+
+void DisplayServer::accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_labeled_by(p_id, p_related_id);
+	}
+}
+
+void DisplayServer::accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_related_radio_group(p_id, p_related_id);
+	}
+}
+
+void DisplayServer::accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_active_descendant(p_id, p_other_id);
+	}
+}
+
+void DisplayServer::accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_next_on_line(p_id, p_other_id);
+	}
+}
+
+void DisplayServer::accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_previous_on_line(p_id, p_other_id);
+	}
+}
+
+void DisplayServer::accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_member_of(p_id, p_group_id);
+	}
+}
+
+void DisplayServer::accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_in_page_link_target(p_id, p_other_id);
+	}
+}
+
+void DisplayServer::accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_error_message(p_id, p_other_id);
+	}
+}
+
+void DisplayServer::accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_live(p_id, p_live);
+	}
+}
+
+void DisplayServer::accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_action(p_id, p_action, p_callable);
+	}
+}
+
+void DisplayServer::accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_add_custom_action(p_id, p_action_id, p_action_description);
+	}
+}
+
+void DisplayServer::accessibility_update_set_table_row_count(const RID &p_id, int p_count) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_row_count(p_id, p_count);
+	}
+}
+
+void DisplayServer::accessibility_update_set_table_column_count(const RID &p_id, int p_count) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_column_count(p_id, p_count);
+	}
+}
+
+void DisplayServer::accessibility_update_set_table_row_index(const RID &p_id, int p_index) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_row_index(p_id, p_index);
+	}
+}
+
+void DisplayServer::accessibility_update_set_table_column_index(const RID &p_id, int p_index) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_column_index(p_id, p_index);
+	}
+}
+
+void DisplayServer::accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_cell_position(p_id, p_row_index, p_column_index);
+	}
+}
+
+void DisplayServer::accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_table_cell_span(p_id, p_row_span, p_column_span);
+	}
+}
+
+void DisplayServer::accessibility_update_set_list_item_count(const RID &p_id, int p_size) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_count(p_id, p_size);
+	}
+}
+
+void DisplayServer::accessibility_update_set_list_item_index(const RID &p_id, int p_index) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_index(p_id, p_index);
+	}
+}
+
+void DisplayServer::accessibility_update_set_list_item_level(const RID &p_id, int p_level) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_level(p_id, p_level);
+	}
+}
+
+void DisplayServer::accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_selected(p_id, p_selected);
+	}
+}
+
+void DisplayServer::accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_item_expanded(p_id, p_expanded);
+	}
+}
+
+void DisplayServer::accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_popup_type(p_id, p_popup);
+	}
+}
+
+void DisplayServer::accessibility_update_set_checked(const RID &p_id, bool p_checekd) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_checked(p_id, p_checekd);
+	}
+}
+
+void DisplayServer::accessibility_update_set_num_value(const RID &p_id, double p_position) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_value(p_id, p_position);
+	}
+}
+
+void DisplayServer::accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_range(p_id, p_min, p_max);
+	}
+}
+
+void DisplayServer::accessibility_update_set_num_step(const RID &p_id, double p_step) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_step(p_id, p_step);
+	}
+}
+
+void DisplayServer::accessibility_update_set_num_jump(const RID &p_id, double p_jump) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_num_jump(p_id, p_jump);
+	}
+}
+
+void DisplayServer::accessibility_update_set_scroll_x(const RID &p_id, double p_position) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_x(p_id, p_position);
+	}
+}
+
+void DisplayServer::accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_x_range(p_id, p_min, p_max);
+	}
+}
+
+void DisplayServer::accessibility_update_set_scroll_y(const RID &p_id, double p_position) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_y(p_id, p_position);
+	}
+}
+
+void DisplayServer::accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_scroll_y_range(p_id, p_min, p_max);
+	}
+}
+
+void DisplayServer::accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_decorations(p_id, p_underline, p_strikethrough, p_overline);
+	}
+}
+
+void DisplayServer::accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_align(p_id, p_align);
+	}
+}
+
+void DisplayServer::accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_selection(p_id, p_text_start_id, p_start_char, p_text_end_id, p_end_char);
+	}
+}
+
+void DisplayServer::accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_flag(p_id, p_flag, p_value);
+	}
+}
+
+void DisplayServer::accessibility_update_set_classname(const RID &p_id, const String &p_classname) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_classname(p_id, p_classname);
+	}
+}
+
+void DisplayServer::accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_placeholder(p_id, p_placeholder);
+	}
+}
+
+void DisplayServer::accessibility_update_set_language(const RID &p_id, const String &p_language) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_language(p_id, p_language);
+	}
+}
+
+void DisplayServer::accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_text_orientation(p_id, p_vertical);
+	}
+}
+
+void DisplayServer::accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_list_orientation(p_id, p_vertical);
+	}
+}
+
+void DisplayServer::accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_shortcut(p_id, p_shortcut);
+	}
+}
+
+void DisplayServer::accessibility_update_set_url(const RID &p_id, const String &p_url) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_url(p_id, p_url);
+	}
+}
+
+void DisplayServer::accessibility_update_set_role_description(const RID &p_id, const String &p_description) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_role_description(p_id, p_description);
+	}
+}
+
+void DisplayServer::accessibility_update_set_state_description(const RID &p_id, const String &p_description) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_state_description(p_id, p_description);
+	}
+}
+
+void DisplayServer::accessibility_update_set_color_value(const RID &p_id, const Color &p_color) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_color_value(p_id, p_color);
+	}
+}
+
+void DisplayServer::accessibility_update_set_background_color(const RID &p_id, const Color &p_color) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_background_color(p_id, p_color);
+	}
+}
+
+void DisplayServer::accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) {
+	if (accessibility_driver) {
+		accessibility_driver->accessibility_update_set_foreground_color(p_id, p_color);
+	}
+}
+
 Point2i DisplayServer::ime_get_selection() const {
 	ERR_FAIL_V_MSG(Point2i(), "IME or NOTIFICATION_WM_IME_UPDATE not supported by this display server.");
 }
@@ -704,12 +1157,12 @@ Error DisplayServer::dialog_input_text(String p_title, String p_description, Str
 	return ERR_UNAVAILABLE;
 }
 
-Error DisplayServer::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) {
+Error DisplayServer::file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) {
 	WARN_PRINT("Native dialogs not supported by this display server.");
 	return ERR_UNAVAILABLE;
 }
 
-Error DisplayServer::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) {
+Error DisplayServer::file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) {
 	WARN_PRINT("Native dialogs not supported by this display server.");
 	return ERR_UNAVAILABLE;
 }
@@ -747,6 +1200,10 @@ Key DisplayServer::keyboard_get_label_from_physical(Key p_keycode) const {
 void DisplayServer::show_emoji_and_symbol_picker() const {
 }
 
+bool DisplayServer::color_picker(const Callable &p_callback) {
+	return false;
+}
+
 void DisplayServer::force_process_and_drop_events() {
 }
 
@@ -1019,6 +1476,88 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("window_start_drag", "window_id"), &DisplayServer::window_start_drag, DEFVAL(MAIN_WINDOW_ID));
 	ClassDB::bind_method(D_METHOD("window_start_resize", "edge", "window_id"), &DisplayServer::window_start_resize, DEFVAL(MAIN_WINDOW_ID));
 
+	ClassDB::bind_method(D_METHOD("accessibility_should_increase_contrast"), &DisplayServer::accessibility_should_increase_contrast);
+	ClassDB::bind_method(D_METHOD("accessibility_should_reduce_animation"), &DisplayServer::accessibility_should_reduce_animation);
+	ClassDB::bind_method(D_METHOD("accessibility_should_reduce_transparency"), &DisplayServer::accessibility_should_reduce_transparency);
+	ClassDB::bind_method(D_METHOD("accessibility_screen_reader_active"), &DisplayServer::accessibility_screen_reader_active);
+
+	ClassDB::bind_method(D_METHOD("accessibility_create_element", "window_id", "role"), &DisplayServer::accessibility_create_element);
+	ClassDB::bind_method(D_METHOD("accessibility_create_sub_element", "parent_rid", "role", "insert_pos"), &DisplayServer::accessibility_create_sub_element, DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("accessibility_create_sub_text_edit_elements", "parent_rid", "shaped_text", "min_height", "insert_pos"), &DisplayServer::accessibility_create_sub_text_edit_elements, DEFVAL(-1));
+	ClassDB::bind_method(D_METHOD("accessibility_has_element", "id"), &DisplayServer::accessibility_has_element);
+	ClassDB::bind_method(D_METHOD("accessibility_free_element", "id"), &DisplayServer::accessibility_free_element);
+	ClassDB::bind_method(D_METHOD("accessibility_element_set_meta", "id", "meta"), &DisplayServer::accessibility_element_set_meta);
+	ClassDB::bind_method(D_METHOD("accessibility_element_get_meta", "id"), &DisplayServer::accessibility_element_get_meta);
+
+	ClassDB::bind_method(D_METHOD("_accessibility_update_if_active", "callback"), &DisplayServer::accessibility_update_if_active);
+
+	ClassDB::bind_method(D_METHOD("accessibility_set_window_rect", "window_id", "rect_out", "rect_in"), &DisplayServer::accessibility_set_window_rect);
+	ClassDB::bind_method(D_METHOD("accessibility_set_window_focused", "window_id", "focused"), &DisplayServer::accessibility_set_window_focused);
+
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_focus", "id"), &DisplayServer::accessibility_update_set_focus);
+	ClassDB::bind_method(D_METHOD("accessibility_get_window_root", "window_id"), &DisplayServer::accessibility_get_window_root);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_role", "id", "role"), &DisplayServer::accessibility_update_set_role);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_name", "id", "name"), &DisplayServer::accessibility_update_set_name);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_extra_info", "id", "name"), &DisplayServer::accessibility_update_set_extra_info);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_description", "id", "description"), &DisplayServer::accessibility_update_set_description);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_value", "id", "value"), &DisplayServer::accessibility_update_set_value);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_tooltip", "id", "tooltip"), &DisplayServer::accessibility_update_set_tooltip);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_bounds", "id", "p_rect"), &DisplayServer::accessibility_update_set_bounds);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_transform", "id", "transform"), &DisplayServer::accessibility_update_set_transform);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_child", "id", "child_id"), &DisplayServer::accessibility_update_add_child);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_related_controls", "id", "related_id"), &DisplayServer::accessibility_update_add_related_controls);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_related_details", "id", "related_id"), &DisplayServer::accessibility_update_add_related_details);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_related_described_by", "id", "related_id"), &DisplayServer::accessibility_update_add_related_described_by);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_related_flow_to", "id", "related_id"), &DisplayServer::accessibility_update_add_related_flow_to);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_related_labeled_by", "id", "related_id"), &DisplayServer::accessibility_update_add_related_labeled_by);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_related_radio_group", "id", "related_id"), &DisplayServer::accessibility_update_add_related_radio_group);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_active_descendant", "id", "other_id"), &DisplayServer::accessibility_update_set_active_descendant);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_next_on_line", "id", "other_id"), &DisplayServer::accessibility_update_set_next_on_line);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_previous_on_line", "id", "other_id"), &DisplayServer::accessibility_update_set_previous_on_line);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_member_of", "id", "group_id"), &DisplayServer::accessibility_update_set_member_of);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_in_page_link_target", "id", "other_id"), &DisplayServer::accessibility_update_set_in_page_link_target);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_error_message", "id", "other_id"), &DisplayServer::accessibility_update_set_error_message);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_live", "id", "live"), &DisplayServer::accessibility_update_set_live);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_action", "id", "action", "callable"), &DisplayServer::accessibility_update_add_action);
+	ClassDB::bind_method(D_METHOD("accessibility_update_add_custom_action", "id", "action_id", "action_description"), &DisplayServer::accessibility_update_add_custom_action);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_table_row_count", "id", "count"), &DisplayServer::accessibility_update_set_table_row_count);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_table_column_count", "id", "count"), &DisplayServer::accessibility_update_set_table_column_count);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_table_row_index", "id", "index"), &DisplayServer::accessibility_update_set_table_row_index);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_table_column_index", "id", "index"), &DisplayServer::accessibility_update_set_table_column_index);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_table_cell_position", "id", "row_index", "column_index"), &DisplayServer::accessibility_update_set_table_cell_position);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_table_cell_span", "id", "row_span", "column_span"), &DisplayServer::accessibility_update_set_table_cell_span);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_list_item_count", "id", "size"), &DisplayServer::accessibility_update_set_list_item_count);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_list_item_index", "id", "index"), &DisplayServer::accessibility_update_set_list_item_index);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_list_item_level", "id", "level"), &DisplayServer::accessibility_update_set_list_item_level);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_list_item_selected", "id", "selected"), &DisplayServer::accessibility_update_set_list_item_selected);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_list_item_expanded", "id", "expanded"), &DisplayServer::accessibility_update_set_list_item_expanded);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_popup_type", "id", "popup"), &DisplayServer::accessibility_update_set_popup_type);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_checked", "id", "checekd"), &DisplayServer::accessibility_update_set_checked);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_num_value", "id", "position"), &DisplayServer::accessibility_update_set_num_value);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_num_range", "id", "min", "max"), &DisplayServer::accessibility_update_set_num_range);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_num_step", "id", "step"), &DisplayServer::accessibility_update_set_num_step);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_num_jump", "id", "jump"), &DisplayServer::accessibility_update_set_num_jump);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_scroll_x", "id", "position"), &DisplayServer::accessibility_update_set_scroll_x);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_scroll_x_range", "id", "min", "max"), &DisplayServer::accessibility_update_set_scroll_x_range);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_scroll_y", "id", "position"), &DisplayServer::accessibility_update_set_scroll_y);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_scroll_y_range", "id", "min", "max"), &DisplayServer::accessibility_update_set_scroll_y_range);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_text_decorations", "id", "underline", "strikethrough", "overline"), &DisplayServer::accessibility_update_set_text_decorations);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_text_align", "id", "align"), &DisplayServer::accessibility_update_set_text_align);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_text_selection", "id", "text_start_id", "start_char", "text_end_id", "end_char"), &DisplayServer::accessibility_update_set_text_selection);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_flag", "id", "flag", "value"), &DisplayServer::accessibility_update_set_flag);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_classname", "id", "classname"), &DisplayServer::accessibility_update_set_classname);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_placeholder", "id", "placeholder"), &DisplayServer::accessibility_update_set_placeholder);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_language", "id", "language"), &DisplayServer::accessibility_update_set_language);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_text_orientation", "id", "vertical"), &DisplayServer::accessibility_update_set_text_orientation);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_list_orientation", "id", "vertical"), &DisplayServer::accessibility_update_set_list_orientation);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_shortcut", "id", "shortcut"), &DisplayServer::accessibility_update_set_shortcut);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_url", "id", "url"), &DisplayServer::accessibility_update_set_url);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_role_description", "id", "description"), &DisplayServer::accessibility_update_set_role_description);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_state_description", "id", "description"), &DisplayServer::accessibility_update_set_state_description);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_color_value", "id", "color"), &DisplayServer::accessibility_update_set_color_value);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_background_color", "id", "color"), &DisplayServer::accessibility_update_set_background_color);
+	ClassDB::bind_method(D_METHOD("accessibility_update_set_foreground_color", "id", "color"), &DisplayServer::accessibility_update_set_foreground_color);
+
 	ClassDB::bind_method(D_METHOD("ime_get_selection"), &DisplayServer::ime_get_selection);
 	ClassDB::bind_method(D_METHOD("ime_get_text"), &DisplayServer::ime_get_text);
 
@@ -1028,6 +1567,7 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("virtual_keyboard_get_height"), &DisplayServer::virtual_keyboard_get_height);
 
 	ClassDB::bind_method(D_METHOD("has_hardware_keyboard"), &DisplayServer::has_hardware_keyboard);
+	ClassDB::bind_method(D_METHOD("set_hardware_keyboard_connection_change_callback", "callable"), &DisplayServer::set_hardware_keyboard_connection_change_callback);
 
 	ClassDB::bind_method(D_METHOD("cursor_set_shape", "shape"), &DisplayServer::cursor_set_shape);
 	ClassDB::bind_method(D_METHOD("cursor_get_shape"), &DisplayServer::cursor_get_shape);
@@ -1040,8 +1580,8 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("dialog_show", "title", "description", "buttons", "callback"), &DisplayServer::dialog_show);
 	ClassDB::bind_method(D_METHOD("dialog_input_text", "title", "description", "existing_text", "callback"), &DisplayServer::dialog_input_text);
 
-	ClassDB::bind_method(D_METHOD("file_dialog_show", "title", "current_directory", "filename", "show_hidden", "mode", "filters", "callback"), &DisplayServer::file_dialog_show);
-	ClassDB::bind_method(D_METHOD("file_dialog_with_options_show", "title", "current_directory", "root", "filename", "show_hidden", "mode", "filters", "options", "callback"), &DisplayServer::file_dialog_with_options_show);
+	ClassDB::bind_method(D_METHOD("file_dialog_show", "title", "current_directory", "filename", "show_hidden", "mode", "filters", "callback", "parent_window_id"), &DisplayServer::file_dialog_show, DEFVAL(MAIN_WINDOW_ID));
+	ClassDB::bind_method(D_METHOD("file_dialog_with_options_show", "title", "current_directory", "root", "filename", "show_hidden", "mode", "filters", "options", "callback", "parent_window_id"), &DisplayServer::file_dialog_with_options_show, DEFVAL(MAIN_WINDOW_ID));
 
 	ClassDB::bind_method(D_METHOD("beep"), &DisplayServer::beep);
 
@@ -1054,6 +1594,7 @@ void DisplayServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("keyboard_get_label_from_physical", "keycode"), &DisplayServer::keyboard_get_label_from_physical);
 
 	ClassDB::bind_method(D_METHOD("show_emoji_and_symbol_picker"), &DisplayServer::show_emoji_and_symbol_picker);
+	ClassDB::bind_method(D_METHOD("color_picker", "callback"), &DisplayServer::color_picker);
 
 	ClassDB::bind_method(D_METHOD("process_events"), &DisplayServer::process_events);
 	ClassDB::bind_method(D_METHOD("force_process_and_drop_events"), &DisplayServer::force_process_and_drop_events);
@@ -1113,6 +1654,102 @@ void DisplayServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(FEATURE_WINDOW_EMBEDDING);
 	BIND_ENUM_CONSTANT(FEATURE_NATIVE_DIALOG_FILE_MIME);
 	BIND_ENUM_CONSTANT(FEATURE_EMOJI_AND_SYMBOL_PICKER);
+	BIND_ENUM_CONSTANT(FEATURE_NATIVE_COLOR_PICKER);
+	BIND_ENUM_CONSTANT(FEATURE_SELF_FITTING_WINDOWS);
+	BIND_ENUM_CONSTANT(FEATURE_ACCESSIBILITY_SCREEN_READER);
+
+	BIND_ENUM_CONSTANT(ROLE_UNKNOWN);
+	BIND_ENUM_CONSTANT(ROLE_DEFAULT_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_AUDIO);
+	BIND_ENUM_CONSTANT(ROLE_VIDEO);
+	BIND_ENUM_CONSTANT(ROLE_STATIC_TEXT);
+	BIND_ENUM_CONSTANT(ROLE_CONTAINER);
+	BIND_ENUM_CONSTANT(ROLE_PANEL);
+	BIND_ENUM_CONSTANT(ROLE_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_LINK);
+	BIND_ENUM_CONSTANT(ROLE_CHECK_BOX);
+	BIND_ENUM_CONSTANT(ROLE_RADIO_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_CHECK_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_SCROLL_BAR);
+	BIND_ENUM_CONSTANT(ROLE_SCROLL_VIEW);
+	BIND_ENUM_CONSTANT(ROLE_SPLITTER);
+	BIND_ENUM_CONSTANT(ROLE_SLIDER);
+	BIND_ENUM_CONSTANT(ROLE_SPIN_BUTTON);
+	BIND_ENUM_CONSTANT(ROLE_PROGRESS_INDICATOR);
+	BIND_ENUM_CONSTANT(ROLE_TEXT_FIELD);
+	BIND_ENUM_CONSTANT(ROLE_MULTILINE_TEXT_FIELD);
+	BIND_ENUM_CONSTANT(ROLE_COLOR_PICKER);
+	BIND_ENUM_CONSTANT(ROLE_TABLE);
+	BIND_ENUM_CONSTANT(ROLE_CELL);
+	BIND_ENUM_CONSTANT(ROLE_ROW);
+	BIND_ENUM_CONSTANT(ROLE_ROW_GROUP);
+	BIND_ENUM_CONSTANT(ROLE_ROW_HEADER);
+	BIND_ENUM_CONSTANT(ROLE_COLUMN_HEADER);
+	BIND_ENUM_CONSTANT(ROLE_TREE);
+	BIND_ENUM_CONSTANT(ROLE_TREE_ITEM);
+	BIND_ENUM_CONSTANT(ROLE_LIST);
+	BIND_ENUM_CONSTANT(ROLE_LIST_ITEM);
+	BIND_ENUM_CONSTANT(ROLE_LIST_BOX);
+	BIND_ENUM_CONSTANT(ROLE_LIST_BOX_OPTION);
+	BIND_ENUM_CONSTANT(ROLE_TAB_BAR);
+	BIND_ENUM_CONSTANT(ROLE_TAB);
+	BIND_ENUM_CONSTANT(ROLE_TAB_PANEL);
+	BIND_ENUM_CONSTANT(ROLE_MENU_BAR);
+	BIND_ENUM_CONSTANT(ROLE_MENU);
+	BIND_ENUM_CONSTANT(ROLE_MENU_ITEM);
+	BIND_ENUM_CONSTANT(ROLE_MENU_ITEM_CHECK_BOX);
+	BIND_ENUM_CONSTANT(ROLE_MENU_ITEM_RADIO);
+	BIND_ENUM_CONSTANT(ROLE_IMAGE);
+	BIND_ENUM_CONSTANT(ROLE_WINDOW);
+	BIND_ENUM_CONSTANT(ROLE_TITLE_BAR);
+	BIND_ENUM_CONSTANT(ROLE_DIALOG);
+	BIND_ENUM_CONSTANT(ROLE_TOOLTIP);
+
+	BIND_ENUM_CONSTANT(POPUP_UNKNOWN);
+	BIND_ENUM_CONSTANT(POPUP_MENU);
+	BIND_ENUM_CONSTANT(POPUP_LIST);
+	BIND_ENUM_CONSTANT(POPUP_TREE);
+	BIND_ENUM_CONSTANT(POPUP_DIALOG);
+
+	BIND_ENUM_CONSTANT(FLAG_HIDDEN);
+	BIND_ENUM_CONSTANT(FLAG_LINKED);
+	BIND_ENUM_CONSTANT(FLAG_MULTISELECTABLE);
+	BIND_ENUM_CONSTANT(FLAG_REQUIRED);
+	BIND_ENUM_CONSTANT(FLAG_VISITED);
+	BIND_ENUM_CONSTANT(FLAG_BUSY);
+	BIND_ENUM_CONSTANT(FLAG_MODAL);
+	BIND_ENUM_CONSTANT(FLAG_TOUCH_PASSTHROUGH);
+	BIND_ENUM_CONSTANT(FLAG_READONLY);
+	BIND_ENUM_CONSTANT(FLAG_DISABLED);
+	BIND_ENUM_CONSTANT(FLAG_CLIPS_CHILDREN);
+
+	BIND_ENUM_CONSTANT(ACTION_CLICK);
+	BIND_ENUM_CONSTANT(ACTION_FOCUS);
+	BIND_ENUM_CONSTANT(ACTION_BLUR);
+	BIND_ENUM_CONSTANT(ACTION_COLLAPSE);
+	BIND_ENUM_CONSTANT(ACTION_EXPAND);
+	BIND_ENUM_CONSTANT(ACTION_DECREMENT);
+	BIND_ENUM_CONSTANT(ACTION_INCREMENT);
+	BIND_ENUM_CONSTANT(ACTION_HIDE_TOOLTIP);
+	BIND_ENUM_CONSTANT(ACTION_SHOW_TOOLTIP);
+	BIND_ENUM_CONSTANT(ACTION_SET_TEXT_SELECTION);
+	BIND_ENUM_CONSTANT(ACTION_REPLACE_SELECTED_TEXT);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_BACKWARD);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_DOWN);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_FORWARD);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_LEFT);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_RIGHT);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_UP);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_INTO_VIEW);
+	BIND_ENUM_CONSTANT(ACTION_SCROLL_TO_POINT);
+	BIND_ENUM_CONSTANT(ACTION_SET_SCROLL_OFFSET);
+	BIND_ENUM_CONSTANT(ACTION_SET_VALUE);
+	BIND_ENUM_CONSTANT(ACTION_SHOW_CONTEXT_MENU);
+	BIND_ENUM_CONSTANT(ACTION_CUSTOM);
+
+	BIND_ENUM_CONSTANT(LIVE_OFF);
+	BIND_ENUM_CONSTANT(LIVE_POLITE);
+	BIND_ENUM_CONSTANT(LIVE_ASSERTIVE);
 
 	BIND_ENUM_CONSTANT(MOUSE_MODE_VISIBLE);
 	BIND_ENUM_CONSTANT(MOUSE_MODE_HIDDEN);
@@ -1188,6 +1825,9 @@ void DisplayServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(WINDOW_FLAG_MOUSE_PASSTHROUGH);
 	BIND_ENUM_CONSTANT(WINDOW_FLAG_SHARP_CORNERS);
 	BIND_ENUM_CONSTANT(WINDOW_FLAG_EXCLUDE_FROM_CAPTURE);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_POPUP_WM_HINT);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_MINIMIZE_DISABLED);
+	BIND_ENUM_CONSTANT(WINDOW_FLAG_MAXIMIZE_DISABLED);
 	BIND_ENUM_CONSTANT(WINDOW_FLAG_MAX);
 
 	BIND_ENUM_CONSTANT(WINDOW_EVENT_MOUSE_ENTER);
@@ -1198,6 +1838,7 @@ void DisplayServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(WINDOW_EVENT_GO_BACK_REQUEST);
 	BIND_ENUM_CONSTANT(WINDOW_EVENT_DPI_CHANGE);
 	BIND_ENUM_CONSTANT(WINDOW_EVENT_TITLEBAR_CHANGE);
+	BIND_ENUM_CONSTANT(WINDOW_EVENT_FORCE_CLOSE);
 
 	BIND_ENUM_CONSTANT(WINDOW_EDGE_TOP_LEFT);
 	BIND_ENUM_CONSTANT(WINDOW_EDGE_TOP);
@@ -1331,10 +1972,14 @@ bool DisplayServer::is_rendering_device_supported() {
 
 	Error err;
 
-#ifdef WINDOWS_ENABLED
-	// On some NVIDIA drivers combining OpenGL and RenderingDevice can result in crash, offload the check to the subprocess.
+#if defined(WINDOWS_ENABLED) || defined(LINUXBSD_ENABLED)
+	// On some drivers combining OpenGL and RenderingDevice can result in crash, offload the check to the subprocess.
 	List<String> arguments;
 	arguments.push_back("--test-rd-support");
+	if (get_singleton()) {
+		arguments.push_back("--display-driver");
+		arguments.push_back(get_singleton()->get_name().to_lower());
+	}
 
 	String pipe;
 	int exitcode = 0;
@@ -1359,11 +2004,10 @@ bool DisplayServer::is_rendering_device_supported() {
 #endif
 #ifdef METAL_ENABLED
 	if (rcd == nullptr) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 		// Eliminate "RenderingContextDriverMetal is only available on iOS 14.0 or newer".
 		rcd = memnew(RenderingContextDriverMetal);
-#pragma clang diagnostic pop
+		GODOT_CLANG_WARNING_POP
 	}
 #endif
 
@@ -1442,11 +2086,10 @@ bool DisplayServer::can_create_rendering_device() {
 #endif
 #ifdef METAL_ENABLED
 	if (rcd == nullptr) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+		GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 		// Eliminate "RenderingContextDriverMetal is only available on iOS 14.0 or newer".
 		rcd = memnew(RenderingContextDriverMetal);
-#pragma clang diagnostic pop
+		GODOT_CLANG_WARNING_POP
 	}
 #endif
 
diff --git a/engine/servers/display_server.h b/engine/servers/display_server.h
index 80bba689..e40be3ff 100644
--- a/engine/servers/display_server.h
+++ b/engine/servers/display_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_H
-#define DISPLAY_SERVER_H
+#pragma once
 
 #include "core/input/input.h"
 #include "core/io/image.h"
@@ -40,6 +39,7 @@
 #include "display/native_menu.h"
 
 class Texture2D;
+class AccessibilityDriver;
 
 class DisplayServer : public Object {
 	GDCLASS(DisplayServer, Object)
@@ -109,6 +109,10 @@ private:
 protected:
 	static void _bind_methods();
 
+#ifndef DISABLE_DEPRECATED
+	static void _bind_compatibility_methods();
+#endif
+
 	static Ref<Image> _get_cursor_image_from_resource(const Ref<Resource> &p_cursor, const Vector2 &p_hotspot);
 
 	enum {
@@ -162,6 +166,9 @@ public:
 		FEATURE_WINDOW_EMBEDDING,
 		FEATURE_NATIVE_DIALOG_FILE_MIME,
 		FEATURE_EMOJI_AND_SYMBOL_PICKER,
+		FEATURE_NATIVE_COLOR_PICKER,
+		FEATURE_SELF_FITTING_WINDOWS,
+		FEATURE_ACCESSIBILITY_SCREEN_READER,
 	};
 
 	virtual bool has_feature(Feature p_feature) const = 0;
@@ -267,6 +274,7 @@ public:
 	virtual Color get_accent_color() const { return Color(0, 0, 0, 0); }
 	virtual Color get_base_color() const { return Color(0, 0, 0, 0); }
 	virtual void set_system_theme_change_callback(const Callable &p_callable) {}
+	virtual void set_hardware_keyboard_connection_change_callback(const Callable &p_callable) {}
 
 private:
 	static bool window_early_clear_override_enabled;
@@ -402,6 +410,9 @@ public:
 		WINDOW_FLAG_MOUSE_PASSTHROUGH,
 		WINDOW_FLAG_SHARP_CORNERS,
 		WINDOW_FLAG_EXCLUDE_FROM_CAPTURE,
+		WINDOW_FLAG_POPUP_WM_HINT,
+		WINDOW_FLAG_MINIMIZE_DISABLED,
+		WINDOW_FLAG_MAXIMIZE_DISABLED,
 		WINDOW_FLAG_MAX,
 	};
 
@@ -417,6 +428,9 @@ public:
 		WINDOW_FLAG_MOUSE_PASSTHROUGH_BIT = (1 << WINDOW_FLAG_MOUSE_PASSTHROUGH),
 		WINDOW_FLAG_SHARP_CORNERS_BIT = (1 << WINDOW_FLAG_SHARP_CORNERS),
 		WINDOW_FLAG_EXCLUDE_FROM_CAPTURE_BIT = (1 << WINDOW_FLAG_EXCLUDE_FROM_CAPTURE),
+		WINDOW_FLAG_POPUP_WM_HINT_BIT = (1 << WINDOW_FLAG_POPUP_WM_HINT),
+		WINDOW_FLAG_MINIMIZE_DISABLED_BIT = (1 << WINDOW_FLAG_MINIMIZE_DISABLED),
+		WINDOW_FLAG_MAXIMIZE_DISABLED_BIT = (1 << WINDOW_FLAG_MAXIMIZE_DISABLED),
 	};
 
 	virtual WindowID create_sub_window(WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Rect2i &p_rect = Rect2i(), bool p_exclusive = false, WindowID p_transient_parent = INVALID_WINDOW_ID);
@@ -445,6 +459,7 @@ public:
 		WINDOW_EVENT_GO_BACK_REQUEST,
 		WINDOW_EVENT_DPI_CHANGE,
 		WINDOW_EVENT_TITLEBAR_CHANGE,
+		WINDOW_EVENT_FORCE_CLOSE,
 	};
 	virtual void window_set_window_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) = 0;
 	virtual void window_set_input_event_callback(const Callable &p_callable, WindowID p_window = MAIN_WINDOW_ID) = 0;
@@ -523,6 +538,209 @@ public:
 
 	virtual void window_start_resize(WindowResizeEdge p_edge, WindowID p_window = MAIN_WINDOW_ID) {}
 
+	// Accessibility.
+
+	enum AccessibilityMode {
+		ACCESSIBILITY_AUTO,
+		ACCESSIBILITY_ALWAYS,
+		ACCESSIBILITY_DISABLED,
+	};
+
+protected:
+	AccessibilityDriver *accessibility_driver = nullptr;
+	static AccessibilityMode accessibility_mode;
+
+public:
+	enum AccessibilityRole {
+		ROLE_UNKNOWN,
+		ROLE_DEFAULT_BUTTON,
+		ROLE_AUDIO,
+		ROLE_VIDEO,
+		ROLE_STATIC_TEXT,
+		ROLE_CONTAINER,
+		ROLE_PANEL,
+		ROLE_BUTTON,
+		ROLE_LINK,
+		ROLE_CHECK_BOX,
+		ROLE_RADIO_BUTTON,
+		ROLE_CHECK_BUTTON,
+		ROLE_SCROLL_BAR,
+		ROLE_SCROLL_VIEW,
+		ROLE_SPLITTER,
+		ROLE_SLIDER,
+		ROLE_SPIN_BUTTON,
+		ROLE_PROGRESS_INDICATOR,
+		ROLE_TEXT_FIELD,
+		ROLE_MULTILINE_TEXT_FIELD,
+		ROLE_COLOR_PICKER,
+		ROLE_TABLE,
+		ROLE_CELL,
+		ROLE_ROW,
+		ROLE_ROW_GROUP,
+		ROLE_ROW_HEADER,
+		ROLE_COLUMN_HEADER,
+		ROLE_TREE,
+		ROLE_TREE_ITEM,
+		ROLE_LIST,
+		ROLE_LIST_ITEM,
+		ROLE_LIST_BOX,
+		ROLE_LIST_BOX_OPTION,
+		ROLE_TAB_BAR,
+		ROLE_TAB,
+		ROLE_TAB_PANEL,
+		ROLE_MENU_BAR,
+		ROLE_MENU,
+		ROLE_MENU_ITEM,
+		ROLE_MENU_ITEM_CHECK_BOX,
+		ROLE_MENU_ITEM_RADIO,
+		ROLE_IMAGE,
+		ROLE_WINDOW,
+		ROLE_TITLE_BAR,
+		ROLE_DIALOG,
+		ROLE_TOOLTIP,
+	};
+
+	enum AccessibilityPopupType {
+		POPUP_UNKNOWN,
+		POPUP_MENU,
+		POPUP_LIST,
+		POPUP_TREE,
+		POPUP_DIALOG,
+	};
+
+	enum AccessibilityFlags {
+		FLAG_HIDDEN,
+		FLAG_LINKED,
+		FLAG_MULTISELECTABLE,
+		FLAG_REQUIRED,
+		FLAG_VISITED,
+		FLAG_BUSY,
+		FLAG_MODAL,
+		FLAG_TOUCH_PASSTHROUGH,
+		FLAG_READONLY,
+		FLAG_DISABLED,
+		FLAG_CLIPS_CHILDREN,
+	};
+
+	enum AccessibilityAction {
+		ACTION_CLICK,
+		ACTION_FOCUS,
+		ACTION_BLUR,
+		ACTION_COLLAPSE,
+		ACTION_EXPAND,
+		ACTION_DECREMENT,
+		ACTION_INCREMENT,
+		ACTION_HIDE_TOOLTIP,
+		ACTION_SHOW_TOOLTIP,
+		ACTION_SET_TEXT_SELECTION,
+		ACTION_REPLACE_SELECTED_TEXT,
+		ACTION_SCROLL_BACKWARD,
+		ACTION_SCROLL_DOWN,
+		ACTION_SCROLL_FORWARD,
+		ACTION_SCROLL_LEFT,
+		ACTION_SCROLL_RIGHT,
+		ACTION_SCROLL_UP,
+		ACTION_SCROLL_INTO_VIEW,
+		ACTION_SCROLL_TO_POINT,
+		ACTION_SET_SCROLL_OFFSET,
+		ACTION_SET_VALUE,
+		ACTION_SHOW_CONTEXT_MENU,
+		ACTION_CUSTOM,
+	};
+
+	enum AccessibilityLiveMode {
+		LIVE_OFF,
+		LIVE_POLITE,
+		LIVE_ASSERTIVE,
+	};
+
+	static AccessibilityMode accessibility_get_mode() { return accessibility_mode; }
+	static void accessibility_set_mode(AccessibilityMode p_mode) { accessibility_mode = p_mode; }
+
+	virtual int accessibility_should_increase_contrast() const { return -1; }
+	virtual int accessibility_should_reduce_animation() const { return -1; }
+	virtual int accessibility_should_reduce_transparency() const { return -1; }
+	virtual int accessibility_screen_reader_active() const { return -1; }
+
+	virtual RID accessibility_create_element(WindowID p_window_id, DisplayServer::AccessibilityRole p_role);
+	virtual RID accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos = -1);
+	virtual RID accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1);
+	virtual bool accessibility_has_element(const RID &p_id) const;
+	virtual void accessibility_free_element(const RID &p_id);
+
+	virtual void accessibility_element_set_meta(const RID &p_id, const Variant &p_meta);
+	virtual Variant accessibility_element_get_meta(const RID &p_id) const;
+
+	virtual void accessibility_update_if_active(const Callable &p_callable);
+
+	virtual void accessibility_update_set_focus(const RID &p_id);
+	virtual RID accessibility_get_window_root(DisplayServer::WindowID p_window_id) const;
+
+	virtual void accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in);
+	virtual void accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused);
+
+	virtual void accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role);
+	virtual void accessibility_update_set_name(const RID &p_id, const String &p_name);
+	virtual void accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info);
+	virtual void accessibility_update_set_description(const RID &p_id, const String &p_description);
+	virtual void accessibility_update_set_value(const RID &p_id, const String &p_value);
+	virtual void accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip);
+	virtual void accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect);
+	virtual void accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform);
+	virtual void accessibility_update_add_child(const RID &p_id, const RID &p_child_id);
+	virtual void accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id);
+	virtual void accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id);
+	virtual void accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id);
+	virtual void accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id);
+	virtual void accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id);
+	virtual void accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id);
+	virtual void accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id);
+	virtual void accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id);
+	virtual void accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id);
+	virtual void accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id);
+	virtual void accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id);
+	virtual void accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id);
+	virtual void accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live);
+	virtual void accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable);
+	virtual void accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description);
+	virtual void accessibility_update_set_table_row_count(const RID &p_id, int p_count);
+	virtual void accessibility_update_set_table_column_count(const RID &p_id, int p_count);
+	virtual void accessibility_update_set_table_row_index(const RID &p_id, int p_index);
+	virtual void accessibility_update_set_table_column_index(const RID &p_id, int p_index);
+	virtual void accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index);
+	virtual void accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span);
+	virtual void accessibility_update_set_list_item_count(const RID &p_id, int p_size);
+	virtual void accessibility_update_set_list_item_index(const RID &p_id, int p_index);
+	virtual void accessibility_update_set_list_item_level(const RID &p_id, int p_level);
+	virtual void accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected);
+	virtual void accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded);
+	virtual void accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup);
+	virtual void accessibility_update_set_checked(const RID &p_id, bool p_checekd);
+	virtual void accessibility_update_set_num_value(const RID &p_id, double p_position);
+	virtual void accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max);
+	virtual void accessibility_update_set_num_step(const RID &p_id, double p_step);
+	virtual void accessibility_update_set_num_jump(const RID &p_id, double p_jump);
+	virtual void accessibility_update_set_scroll_x(const RID &p_id, double p_position);
+	virtual void accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max);
+	virtual void accessibility_update_set_scroll_y(const RID &p_id, double p_position);
+	virtual void accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max);
+	virtual void accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline);
+	virtual void accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align);
+	virtual void accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char);
+	virtual void accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value);
+	virtual void accessibility_update_set_classname(const RID &p_id, const String &p_classname);
+	virtual void accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder);
+	virtual void accessibility_update_set_language(const RID &p_id, const String &p_language);
+	virtual void accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical);
+	virtual void accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical);
+	virtual void accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut);
+	virtual void accessibility_update_set_url(const RID &p_id, const String &p_url);
+	virtual void accessibility_update_set_role_description(const RID &p_id, const String &p_description);
+	virtual void accessibility_update_set_state_description(const RID &p_id, const String &p_description);
+	virtual void accessibility_update_set_color_value(const RID &p_id, const Color &p_color);
+	virtual void accessibility_update_set_background_color(const RID &p_id, const Color &p_color);
+	virtual void accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color);
+
 	// necessary for GL focus, may be able to use one of the existing functions for this, not sure yet
 	virtual void gl_window_make_current(DisplayServer::WindowID p_window_id);
 
@@ -592,8 +810,13 @@ public:
 		FILE_DIALOG_MODE_SAVE_FILE,
 		FILE_DIALOG_MODE_SAVE_MAX
 	};
-	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback);
-	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback);
+	virtual Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id = MAIN_WINDOW_ID);
+	virtual Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id = MAIN_WINDOW_ID);
+
+#ifndef DISABLE_DEPRECATED
+	Error _file_dialog_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback);
+	Error _file_dialog_with_options_show_bind_compat_98194(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback);
+#endif
 
 	virtual void beep() const;
 
@@ -605,6 +828,7 @@ public:
 	virtual Key keyboard_get_keycode_from_physical(Key p_keycode) const;
 	virtual Key keyboard_get_label_from_physical(Key p_keycode) const;
 	virtual void show_emoji_and_symbol_picker() const;
+	virtual bool color_picker(const Callable &p_callback);
 
 	virtual int tablet_get_driver_count() const { return 1; }
 	virtual String tablet_get_driver_name(int p_driver) const { return "default"; }
@@ -661,6 +885,104 @@ public:
 	~DisplayServer();
 };
 
+/**************************************************************************/
+
+class AccessibilityDriver {
+public:
+	virtual Error init() = 0;
+
+	virtual bool window_create(DisplayServer::WindowID p_window_id, void *p_handle) = 0;
+	virtual void window_destroy(DisplayServer::WindowID p_window_id) = 0;
+
+	virtual RID accessibility_create_element(DisplayServer::WindowID p_window_id, DisplayServer::AccessibilityRole p_role) = 0;
+	virtual RID accessibility_create_sub_element(const RID &p_parent_rid, DisplayServer::AccessibilityRole p_role, int p_insert_pos = -1) = 0;
+	virtual RID accessibility_create_sub_text_edit_elements(const RID &p_parent_rid, const RID &p_shaped_text, float p_min_height, int p_insert_pos = -1) = 0;
+	virtual bool accessibility_has_element(const RID &p_id) const = 0;
+	virtual void accessibility_free_element(const RID &p_id) = 0;
+
+	virtual void accessibility_element_set_meta(const RID &p_id, const Variant &p_meta) = 0;
+	virtual Variant accessibility_element_get_meta(const RID &p_id) const = 0;
+
+	virtual void accessibility_update_if_active(const Callable &p_callable) = 0;
+
+	virtual RID accessibility_get_window_root(DisplayServer::WindowID p_window_id) const = 0;
+	virtual void accessibility_update_set_focus(const RID &p_id) = 0;
+
+	virtual void accessibility_set_window_rect(DisplayServer::WindowID p_window_id, const Rect2 &p_rect_out, const Rect2 &p_rect_in) = 0;
+	virtual void accessibility_set_window_focused(DisplayServer::WindowID p_window_id, bool p_focused) = 0;
+
+	virtual void accessibility_update_set_role(const RID &p_id, DisplayServer::AccessibilityRole p_role) = 0;
+	virtual void accessibility_update_set_name(const RID &p_id, const String &p_name) = 0;
+	virtual void accessibility_update_set_extra_info(const RID &p_id, const String &p_name_extra_info) = 0;
+	virtual void accessibility_update_set_description(const RID &p_id, const String &p_description) = 0;
+	virtual void accessibility_update_set_value(const RID &p_id, const String &p_value) = 0;
+	virtual void accessibility_update_set_tooltip(const RID &p_id, const String &p_tooltip) = 0;
+	virtual void accessibility_update_set_bounds(const RID &p_id, const Rect2 &p_rect) = 0;
+	virtual void accessibility_update_set_transform(const RID &p_id, const Transform2D &p_transform) = 0;
+	virtual void accessibility_update_add_child(const RID &p_id, const RID &p_child_id) = 0;
+	virtual void accessibility_update_add_related_controls(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_details(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_described_by(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_flow_to(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_labeled_by(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_add_related_radio_group(const RID &p_id, const RID &p_related_id) = 0;
+	virtual void accessibility_update_set_active_descendant(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_next_on_line(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_previous_on_line(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_member_of(const RID &p_id, const RID &p_group_id) = 0;
+	virtual void accessibility_update_set_in_page_link_target(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_error_message(const RID &p_id, const RID &p_other_id) = 0;
+	virtual void accessibility_update_set_live(const RID &p_id, DisplayServer::AccessibilityLiveMode p_live) = 0;
+	virtual void accessibility_update_add_action(const RID &p_id, DisplayServer::AccessibilityAction p_action, const Callable &p_callable) = 0;
+	virtual void accessibility_update_add_custom_action(const RID &p_id, int p_action_id, const String &p_action_description) = 0;
+	virtual void accessibility_update_set_table_row_count(const RID &p_id, int p_count) = 0;
+	virtual void accessibility_update_set_table_column_count(const RID &p_id, int p_count) = 0;
+	virtual void accessibility_update_set_table_row_index(const RID &p_id, int p_index) = 0;
+	virtual void accessibility_update_set_table_column_index(const RID &p_id, int p_index) = 0;
+	virtual void accessibility_update_set_table_cell_position(const RID &p_id, int p_row_index, int p_column_index) = 0;
+	virtual void accessibility_update_set_table_cell_span(const RID &p_id, int p_row_span, int p_column_span) = 0;
+	virtual void accessibility_update_set_list_item_count(const RID &p_id, int p_size) = 0;
+	virtual void accessibility_update_set_list_item_index(const RID &p_id, int p_index) = 0;
+	virtual void accessibility_update_set_list_item_level(const RID &p_id, int p_level) = 0;
+	virtual void accessibility_update_set_list_item_selected(const RID &p_id, bool p_selected) = 0;
+	virtual void accessibility_update_set_list_item_expanded(const RID &p_id, bool p_expanded) = 0;
+	virtual void accessibility_update_set_popup_type(const RID &p_id, DisplayServer::AccessibilityPopupType p_popup) = 0;
+	virtual void accessibility_update_set_checked(const RID &p_id, bool p_checekd) = 0;
+	virtual void accessibility_update_set_num_value(const RID &p_id, double p_position) = 0;
+	virtual void accessibility_update_set_num_range(const RID &p_id, double p_min, double p_max) = 0;
+	virtual void accessibility_update_set_num_step(const RID &p_id, double p_step) = 0;
+	virtual void accessibility_update_set_num_jump(const RID &p_id, double p_jump) = 0;
+	virtual void accessibility_update_set_scroll_x(const RID &p_id, double p_position) = 0;
+	virtual void accessibility_update_set_scroll_x_range(const RID &p_id, double p_min, double p_max) = 0;
+	virtual void accessibility_update_set_scroll_y(const RID &p_id, double p_position) = 0;
+	virtual void accessibility_update_set_scroll_y_range(const RID &p_id, double p_min, double p_max) = 0;
+	virtual void accessibility_update_set_text_decorations(const RID &p_id, bool p_underline, bool p_strikethrough, bool p_overline) = 0;
+	virtual void accessibility_update_set_text_align(const RID &p_id, HorizontalAlignment p_align) = 0;
+	virtual void accessibility_update_set_text_selection(const RID &p_id, const RID &p_text_start_id, int p_start_char, const RID &p_text_end_id, int p_end_char) = 0;
+	virtual void accessibility_update_set_flag(const RID &p_id, DisplayServer::AccessibilityFlags p_flag, bool p_value) = 0;
+	virtual void accessibility_update_set_classname(const RID &p_id, const String &p_classname) = 0;
+	virtual void accessibility_update_set_placeholder(const RID &p_id, const String &p_placeholder) = 0;
+	virtual void accessibility_update_set_language(const RID &p_id, const String &p_language) = 0;
+	virtual void accessibility_update_set_text_orientation(const RID &p_id, bool p_vertical) = 0;
+	virtual void accessibility_update_set_list_orientation(const RID &p_id, bool p_vertical) = 0;
+	virtual void accessibility_update_set_shortcut(const RID &p_id, const String &p_shortcut) = 0;
+	virtual void accessibility_update_set_url(const RID &p_id, const String &p_url) = 0;
+	virtual void accessibility_update_set_role_description(const RID &p_id, const String &p_description) = 0;
+	virtual void accessibility_update_set_state_description(const RID &p_id, const String &p_description) = 0;
+	virtual void accessibility_update_set_color_value(const RID &p_id, const Color &p_color) = 0;
+	virtual void accessibility_update_set_background_color(const RID &p_id, const Color &p_color) = 0;
+	virtual void accessibility_update_set_foreground_color(const RID &p_id, const Color &p_color) = 0;
+
+	AccessibilityDriver() {}
+	virtual ~AccessibilityDriver() {}
+};
+
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityAction)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityFlags)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityLiveMode)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityPopupType)
+VARIANT_ENUM_CAST(DisplayServer::AccessibilityRole)
+
 VARIANT_ENUM_CAST(DisplayServer::WindowEvent)
 VARIANT_ENUM_CAST(DisplayServer::Feature)
 VARIANT_ENUM_CAST(DisplayServer::MouseMode)
@@ -674,5 +996,3 @@ VARIANT_ENUM_CAST(DisplayServer::CursorShape)
 VARIANT_ENUM_CAST(DisplayServer::VSyncMode)
 VARIANT_ENUM_CAST(DisplayServer::TTSUtteranceEvent)
 VARIANT_ENUM_CAST(DisplayServer::FileDialogMode)
-
-#endif // DISPLAY_SERVER_H
diff --git a/engine/servers/display_server_headless.h b/engine/servers/display_server_headless.h
index 7bd8cbf0..a4216ec8 100644
--- a/engine/servers/display_server_headless.h
+++ b/engine/servers/display_server_headless.h
@@ -28,14 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_HEADLESS_H
-#define DISPLAY_SERVER_HEADLESS_H
+#pragma once
 
 #include "servers/display_server.h"
 
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 
 class DisplayServerHeadless : public DisplayServer {
+	GDSOFTCLASS(DisplayServerHeadless, DisplayServer);
+
 private:
 	friend class DisplayServer;
 
@@ -184,8 +185,8 @@ public:
 
 	Error dialog_show(String p_title, String p_description, Vector<String> p_buttons, const Callable &p_callback) override { return ERR_UNAVAILABLE; }
 	Error dialog_input_text(String p_title, String p_description, String p_partial, const Callable &p_callback) override { return ERR_UNAVAILABLE; }
-	Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback) override { return ERR_UNAVAILABLE; }
-	Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback) override { return ERR_UNAVAILABLE; }
+	Error file_dialog_show(const String &p_title, const String &p_current_directory, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const Callable &p_callback, WindowID p_window_id) override { return ERR_UNAVAILABLE; }
+	Error file_dialog_with_options_show(const String &p_title, const String &p_current_directory, const String &p_root, const String &p_filename, bool p_show_hidden, FileDialogMode p_mode, const Vector<String> &p_filters, const TypedArray<Dictionary> &p_options, const Callable &p_callback, WindowID p_window_id) override { return ERR_UNAVAILABLE; }
 
 	void release_rendering_thread() override {}
 	void swap_buffers() override {}
@@ -208,5 +209,3 @@ public:
 		}
 	}
 };
-
-#endif // DISPLAY_SERVER_HEADLESS_H
diff --git a/engine/servers/extensions/physics_server_2d_extension.h b/engine/servers/extensions/physics_server_2d_extension.h
index 77f8e9d6..6c6d69b2 100644
--- a/engine/servers/extensions/physics_server_2d_extension.h
+++ b/engine/servers/extensions/physics_server_2d_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_2D_EXTENSION_H
-#define PHYSICS_SERVER_2D_EXTENSION_H
+#pragma once
 
 #include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/gdvirtual.gen.inc"
@@ -451,5 +450,3 @@ public:
 	PhysicsServer2DExtension();
 	~PhysicsServer2DExtension();
 };
-
-#endif // PHYSICS_SERVER_2D_EXTENSION_H
diff --git a/engine/servers/extensions/physics_server_3d_extension.h b/engine/servers/extensions/physics_server_3d_extension.h
index aba124ab..4d27efac 100644
--- a/engine/servers/extensions/physics_server_3d_extension.h
+++ b/engine/servers/extensions/physics_server_3d_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_3D_EXTENSION_H
-#define PHYSICS_SERVER_3D_EXTENSION_H
+#pragma once
 
 #include "core/extension/ext_wrappers.gen.inc"
 #include "core/object/script_language.h"
@@ -539,5 +538,3 @@ public:
 	PhysicsServer3DExtension();
 	~PhysicsServer3DExtension();
 };
-
-#endif // PHYSICS_SERVER_3D_EXTENSION_H
diff --git a/engine/servers/movie_writer/movie_writer.cpp b/engine/servers/movie_writer/movie_writer.cpp
index 9f3a2804..dbbcea60 100644
--- a/engine/servers/movie_writer/movie_writer.cpp
+++ b/engine/servers/movie_writer/movie_writer.cpp
@@ -99,6 +99,18 @@ void MovieWriter::begin(const Size2i &p_movie_size, uint32_t p_fps, const String
 
 	print_line(vformat("Movie Maker mode enabled, recording movie at %d FPS...", p_fps));
 
+	// When using Display/Window/Stretch/Mode = Viewport, use the project's
+	// configured viewport size instead of the size of the window in the OS
+	Size2i actual_movie_size = p_movie_size;
+	String stretch_mode = GLOBAL_GET("display/window/stretch/mode");
+	if (stretch_mode == "viewport") {
+		actual_movie_size.width = GLOBAL_GET("display/window/size/viewport_width");
+		actual_movie_size.height = GLOBAL_GET("display/window/size/viewport_height");
+
+		print_line(vformat("Movie Maker mode using project viewport size: %dx%d",
+				actual_movie_size.width, actual_movie_size.height));
+	}
+
 	// Check for available disk space and warn the user if needed.
 	Ref<DirAccess> dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 	String path = p_base_path.get_basename();
@@ -125,7 +137,7 @@ void MovieWriter::begin(const Size2i &p_movie_size, uint32_t p_fps, const String
 	audio_channels = AudioDriverDummy::get_dummy_singleton()->get_channels();
 	audio_mix_buffer.resize(mix_rate * audio_channels / fps);
 
-	write_begin(p_movie_size, p_fps, p_base_path);
+	write_begin(actual_movie_size, p_fps, p_base_path);
 }
 
 void MovieWriter::_bind_methods() {
@@ -172,10 +184,12 @@ void MovieWriter::set_extensions_hint() {
 
 void MovieWriter::add_frame() {
 	const int movie_time_seconds = Engine::get_singleton()->get_frames_drawn() / fps;
-	const String movie_time = vformat("%s:%s:%s",
-			String::num(movie_time_seconds / 3600).pad_zeros(2),
-			String::num((movie_time_seconds % 3600) / 60).pad_zeros(2),
-			String::num(movie_time_seconds % 60).pad_zeros(2));
+	const int frame_remainder = Engine::get_singleton()->get_frames_drawn() % fps;
+	const String movie_time = vformat("%s:%s:%s:%s",
+			String::num(movie_time_seconds / 3600, 0).pad_zeros(2),
+			String::num((movie_time_seconds % 3600) / 60, 0).pad_zeros(2),
+			String::num(movie_time_seconds % 60, 0).pad_zeros(2),
+			String::num(frame_remainder, 0).pad_zeros(2));
 
 #ifdef DEBUG_ENABLED
 	DisplayServer::get_singleton()->window_set_title(vformat("MovieWriter: Frame %d (time: %s) - %s (DEBUG)", Engine::get_singleton()->get_frames_drawn(), movie_time, project_name));
@@ -204,7 +218,7 @@ void MovieWriter::end() {
 	write_end();
 
 	// Print a report with various statistics.
-	print_line("----------------");
+	print_line("--------------------------------------------------------------------------------");
 	String movie_path = Engine::get_singleton()->get_write_movie_path();
 	if (movie_path.is_relative_path()) {
 		// Print absolute path to make finding the file easier,
@@ -214,19 +228,21 @@ void MovieWriter::end() {
 	print_line(vformat("Done recording movie at path: %s", movie_path));
 
 	const int movie_time_seconds = Engine::get_singleton()->get_frames_drawn() / fps;
-	const String movie_time = vformat("%s:%s:%s",
-			String::num(movie_time_seconds / 3600).pad_zeros(2),
-			String::num((movie_time_seconds % 3600) / 60).pad_zeros(2),
-			String::num(movie_time_seconds % 60).pad_zeros(2));
+	const int frame_remainder = Engine::get_singleton()->get_frames_drawn() % fps;
+	const String movie_time = vformat("%s:%s:%s:%s",
+			String::num(movie_time_seconds / 3600, 0).pad_zeros(2),
+			String::num((movie_time_seconds % 3600) / 60, 0).pad_zeros(2),
+			String::num(movie_time_seconds % 60, 0).pad_zeros(2),
+			String::num(frame_remainder, 0).pad_zeros(2));
 
 	const int real_time_seconds = Time::get_singleton()->get_ticks_msec() / 1000;
 	const String real_time = vformat("%s:%s:%s",
-			String::num(real_time_seconds / 3600).pad_zeros(2),
-			String::num((real_time_seconds % 3600) / 60).pad_zeros(2),
-			String::num(real_time_seconds % 60).pad_zeros(2));
+			String::num(real_time_seconds / 3600, 0).pad_zeros(2),
+			String::num((real_time_seconds % 3600) / 60, 0).pad_zeros(2),
+			String::num(real_time_seconds % 60, 0).pad_zeros(2));
 
-	print_line(vformat("%d frames at %d FPS (movie length: %s), recorded in %s (%d%% of real-time speed).", Engine::get_singleton()->get_frames_drawn(), fps, movie_time, real_time, (float(movie_time_seconds) / real_time_seconds) * 100));
+	print_line(vformat("%d frames at %d FPS (movie length: %s), recorded in %s (%d%% of real-time speed).", Engine::get_singleton()->get_frames_drawn(), fps, movie_time, real_time, (float(MAX(1, movie_time_seconds)) / MAX(1, real_time_seconds)) * 100));
 	print_line(vformat("CPU time: %.2f seconds (average: %.2f ms/frame)", cpu_time / 1000, cpu_time / Engine::get_singleton()->get_frames_drawn()));
 	print_line(vformat("GPU time: %.2f seconds (average: %.2f ms/frame)", gpu_time / 1000, gpu_time / Engine::get_singleton()->get_frames_drawn()));
-	print_line("----------------");
+	print_line("--------------------------------------------------------------------------------");
 }
diff --git a/engine/servers/movie_writer/movie_writer.h b/engine/servers/movie_writer/movie_writer.h
index 448bd5d1..7259c585 100644
--- a/engine/servers/movie_writer/movie_writer.h
+++ b/engine/servers/movie_writer/movie_writer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MOVIE_WRITER_H
-#define MOVIE_WRITER_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/templates/local_vector.h"
@@ -89,5 +88,3 @@ public:
 
 	void end();
 };
-
-#endif // MOVIE_WRITER_H
diff --git a/engine/servers/movie_writer/movie_writer_mjpeg.h b/engine/servers/movie_writer/movie_writer_mjpeg.h
index 2ccbf781..03548ec9 100644
--- a/engine/servers/movie_writer/movie_writer_mjpeg.h
+++ b/engine/servers/movie_writer/movie_writer_mjpeg.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MOVIE_WRITER_MJPEG_H
-#define MOVIE_WRITER_MJPEG_H
+#pragma once
 
 #include "servers/movie_writer/movie_writer.h"
 
@@ -69,5 +68,3 @@ protected:
 public:
 	MovieWriterMJPEG();
 };
-
-#endif // MOVIE_WRITER_MJPEG_H
diff --git a/engine/servers/movie_writer/movie_writer_pngwav.h b/engine/servers/movie_writer/movie_writer_pngwav.h
index 03721900..b2744b0e 100644
--- a/engine/servers/movie_writer/movie_writer_pngwav.h
+++ b/engine/servers/movie_writer/movie_writer_pngwav.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MOVIE_WRITER_PNGWAV_H
-#define MOVIE_WRITER_PNGWAV_H
+#pragma once
 
 #include "servers/movie_writer/movie_writer.h"
 
@@ -67,5 +66,3 @@ protected:
 public:
 	MovieWriterPNGWAV();
 };
-
-#endif // MOVIE_WRITER_PNGWAV_H
diff --git a/engine/servers/navigation/SCsub b/engine/servers/navigation/SCsub
index 98f918b2..57335c92 100644
--- a/engine/servers/navigation/SCsub
+++ b/engine/servers/navigation/SCsub
@@ -3,4 +3,10 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_navigation_2d"]:
+    env.add_source_files(env.servers_sources, "navigation_path_query_parameters_2d.cpp")
+    env.add_source_files(env.servers_sources, "navigation_path_query_result_2d.cpp")
+
+if not env["disable_navigation_3d"]:
+    env.add_source_files(env.servers_sources, "navigation_path_query_parameters_3d.cpp")
+    env.add_source_files(env.servers_sources, "navigation_path_query_result_3d.cpp")
diff --git a/engine/servers/navigation/nav_heap.h b/engine/servers/navigation/nav_heap.h
new file mode 100644
index 00000000..483c7058
--- /dev/null
+++ b/engine/servers/navigation/nav_heap.h
@@ -0,0 +1,158 @@
+/**************************************************************************/
+/*  nav_heap.h                                                            */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/templates/local_vector.h"
+
+template <typename T>
+struct NoopIndexer {
+	void operator()(const T &p_value, uint32_t p_index) {}
+};
+
+/**
+ * A max-heap implementation that notifies of element index changes.
+ */
+template <typename T, typename LessThan = Comparator<T>, typename Indexer = NoopIndexer<T>>
+class Heap {
+	LocalVector<T> _buffer;
+
+	LessThan _less_than;
+	Indexer _indexer;
+
+public:
+	static constexpr uint32_t INVALID_INDEX = UINT32_MAX;
+	void reserve(uint32_t p_size) {
+		_buffer.reserve(p_size);
+	}
+
+	uint32_t size() const {
+		return _buffer.size();
+	}
+
+	bool is_empty() const {
+		return _buffer.is_empty();
+	}
+
+	void push(const T &p_element) {
+		_buffer.push_back(p_element);
+		_indexer(p_element, _buffer.size() - 1);
+		_shift_up(_buffer.size() - 1);
+	}
+
+	T pop() {
+		ERR_FAIL_COND_V_MSG(_buffer.is_empty(), T(), "Can't pop an empty heap.");
+		T value = _buffer[0];
+		_indexer(value, INVALID_INDEX);
+		if (_buffer.size() > 1) {
+			_buffer[0] = _buffer[_buffer.size() - 1];
+			_indexer(_buffer[0], 0);
+			_buffer.remove_at(_buffer.size() - 1);
+			_shift_down(0);
+		} else {
+			_buffer.remove_at(_buffer.size() - 1);
+		}
+		return value;
+	}
+
+	/**
+	 * Update the position of the element in the heap if necessary.
+	 */
+	void shift(uint32_t p_index) {
+		ERR_FAIL_UNSIGNED_INDEX_MSG(p_index, _buffer.size(), "Heap element index is out of range.");
+		if (!_shift_up(p_index)) {
+			_shift_down(p_index);
+		}
+	}
+
+	void clear() {
+		for (const T &value : _buffer) {
+			_indexer(value, INVALID_INDEX);
+		}
+		_buffer.clear();
+	}
+
+	Heap() {}
+
+	Heap(const LessThan &p_less_than) :
+			_less_than(p_less_than) {}
+
+	Heap(const Indexer &p_indexer) :
+			_indexer(p_indexer) {}
+
+	Heap(const LessThan &p_less_than, const Indexer &p_indexer) :
+			_less_than(p_less_than), _indexer(p_indexer) {}
+
+private:
+	bool _shift_up(uint32_t p_index) {
+		T value = _buffer[p_index];
+		uint32_t current_index = p_index;
+		uint32_t parent_index = (current_index - 1) / 2;
+		while (current_index > 0 && _less_than(_buffer[parent_index], value)) {
+			_buffer[current_index] = _buffer[parent_index];
+			_indexer(_buffer[current_index], current_index);
+			current_index = parent_index;
+			parent_index = (current_index - 1) / 2;
+		}
+		if (current_index != p_index) {
+			_buffer[current_index] = value;
+			_indexer(value, current_index);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	bool _shift_down(uint32_t p_index) {
+		T value = _buffer[p_index];
+		uint32_t current_index = p_index;
+		uint32_t child_index = 2 * current_index + 1;
+		while (child_index < _buffer.size()) {
+			if (child_index + 1 < _buffer.size() &&
+					_less_than(_buffer[child_index], _buffer[child_index + 1])) {
+				child_index++;
+			}
+			if (_less_than(_buffer[child_index], value)) {
+				break;
+			}
+			_buffer[current_index] = _buffer[child_index];
+			_indexer(_buffer[current_index], current_index);
+			current_index = child_index;
+			child_index = 2 * current_index + 1;
+		}
+		if (current_index != p_index) {
+			_buffer[current_index] = value;
+			_indexer(value, current_index);
+			return true;
+		} else {
+			return false;
+		}
+	}
+};
diff --git a/engine/servers/navigation/navigation_globals.h b/engine/servers/navigation/navigation_globals.h
index 44fb149a..6b7153a8 100644
--- a/engine/servers/navigation/navigation_globals.h
+++ b/engine/servers/navigation/navigation_globals.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_GLOBALS_H
-#define NAVIGATION_GLOBALS_H
+#pragma once
 
 namespace NavigationDefaults3D {
 
@@ -55,6 +54,7 @@ namespace NavigationDefaults2D {
 
 // Same as in 3D but larger since 1px is treated as 1m.
 constexpr float navmesh_cell_size{ 1.0f }; // Must match ProjectSettings default 2D cell_size.
+constexpr float navmesh_cell_size_min{ 0.01f };
 constexpr auto navmesh_cell_size_hint{ "0.001,100,0.001,or_greater" };
 
 // Map.
@@ -63,5 +63,3 @@ constexpr float edge_connection_margin{ 1.0f };
 constexpr float link_connection_radius{ 4.0f };
 
 } //namespace NavigationDefaults2D
-
-#endif // NAVIGATION_GLOBALS_H
diff --git a/engine/servers/navigation/navigation_path_query_parameters_2d.cpp b/engine/servers/navigation/navigation_path_query_parameters_2d.cpp
index 74aaf64b..2e57602d 100644
--- a/engine/servers/navigation/navigation_path_query_parameters_2d.cpp
+++ b/engine/servers/navigation/navigation_path_query_parameters_2d.cpp
@@ -102,6 +102,38 @@ real_t NavigationPathQueryParameters2D::get_simplify_epsilon() const {
 	return simplify_epsilon;
 }
 
+void NavigationPathQueryParameters2D::set_included_regions(const TypedArray<RID> &p_regions) {
+	_included_regions.resize(p_regions.size());
+	for (uint32_t i = 0; i < _included_regions.size(); i++) {
+		_included_regions[i] = p_regions[i];
+	}
+}
+
+TypedArray<RID> NavigationPathQueryParameters2D::get_included_regions() const {
+	TypedArray<RID> r_regions;
+	r_regions.resize(_included_regions.size());
+	for (uint32_t i = 0; i < _included_regions.size(); i++) {
+		r_regions[i] = _included_regions[i];
+	}
+	return r_regions;
+}
+
+void NavigationPathQueryParameters2D::set_excluded_regions(const TypedArray<RID> &p_regions) {
+	_excluded_regions.resize(p_regions.size());
+	for (uint32_t i = 0; i < _excluded_regions.size(); i++) {
+		_excluded_regions[i] = p_regions[i];
+	}
+}
+
+TypedArray<RID> NavigationPathQueryParameters2D::get_excluded_regions() const {
+	TypedArray<RID> r_regions;
+	r_regions.resize(_excluded_regions.size());
+	for (uint32_t i = 0; i < _excluded_regions.size(); i++) {
+		r_regions[i] = _excluded_regions[i];
+	}
+	return r_regions;
+}
+
 void NavigationPathQueryParameters2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_pathfinding_algorithm", "pathfinding_algorithm"), &NavigationPathQueryParameters2D::set_pathfinding_algorithm);
 	ClassDB::bind_method(D_METHOD("get_pathfinding_algorithm"), &NavigationPathQueryParameters2D::get_pathfinding_algorithm);
@@ -130,6 +162,12 @@ void NavigationPathQueryParameters2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_simplify_epsilon", "epsilon"), &NavigationPathQueryParameters2D::set_simplify_epsilon);
 	ClassDB::bind_method(D_METHOD("get_simplify_epsilon"), &NavigationPathQueryParameters2D::get_simplify_epsilon);
 
+	ClassDB::bind_method(D_METHOD("set_included_regions", "regions"), &NavigationPathQueryParameters2D::set_included_regions);
+	ClassDB::bind_method(D_METHOD("get_included_regions"), &NavigationPathQueryParameters2D::get_included_regions);
+
+	ClassDB::bind_method(D_METHOD("set_excluded_regions", "regions"), &NavigationPathQueryParameters2D::set_excluded_regions);
+	ClassDB::bind_method(D_METHOD("get_excluded_regions"), &NavigationPathQueryParameters2D::get_excluded_regions);
+
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "map"), "set_map", "get_map");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "start_position"), "set_start_position", "get_start_position");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "target_position"), "set_target_position", "get_target_position");
@@ -139,6 +177,8 @@ void NavigationPathQueryParameters2D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "metadata_flags", PROPERTY_HINT_FLAGS, "Include Types,Include RIDs,Include Owners"), "set_metadata_flags", "get_metadata_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "simplify_path"), "set_simplify_path", "get_simplify_path");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "simplify_epsilon"), "set_simplify_epsilon", "get_simplify_epsilon");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "excluded_regions", PROPERTY_HINT_ARRAY_TYPE, "RID"), "set_excluded_regions", "get_excluded_regions");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "included_regions", PROPERTY_HINT_ARRAY_TYPE, "RID"), "set_included_regions", "get_included_regions");
 
 	BIND_ENUM_CONSTANT(PATHFINDING_ALGORITHM_ASTAR);
 
diff --git a/engine/servers/navigation/navigation_path_query_parameters_2d.h b/engine/servers/navigation/navigation_path_query_parameters_2d.h
index 91031bfc..3a910e22 100644
--- a/engine/servers/navigation/navigation_path_query_parameters_2d.h
+++ b/engine/servers/navigation/navigation_path_query_parameters_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_PATH_QUERY_PARAMETERS_2D_H
-#define NAVIGATION_PATH_QUERY_PARAMETERS_2D_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "servers/navigation/navigation_utilities.h"
@@ -69,6 +68,8 @@ private:
 	BitField<PathMetadataFlags> metadata_flags = PATH_METADATA_INCLUDE_ALL;
 	bool simplify_path = false;
 	real_t simplify_epsilon = 0.0;
+	LocalVector<RID> _excluded_regions;
+	LocalVector<RID> _included_regions;
 
 public:
 	void set_pathfinding_algorithm(const PathfindingAlgorithm p_pathfinding_algorithm);
@@ -97,10 +98,14 @@ public:
 
 	void set_simplify_epsilon(real_t p_epsilon);
 	real_t get_simplify_epsilon() const;
+
+	void set_excluded_regions(const TypedArray<RID> &p_regions);
+	TypedArray<RID> get_excluded_regions() const;
+
+	void set_included_regions(const TypedArray<RID> &p_regions);
+	TypedArray<RID> get_included_regions() const;
 };
 
 VARIANT_ENUM_CAST(NavigationPathQueryParameters2D::PathfindingAlgorithm);
 VARIANT_ENUM_CAST(NavigationPathQueryParameters2D::PathPostProcessing);
 VARIANT_BITFIELD_CAST(NavigationPathQueryParameters2D::PathMetadataFlags);
-
-#endif // NAVIGATION_PATH_QUERY_PARAMETERS_2D_H
diff --git a/engine/servers/navigation/navigation_path_query_parameters_3d.cpp b/engine/servers/navigation/navigation_path_query_parameters_3d.cpp
index 99c5318b..39c41efe 100644
--- a/engine/servers/navigation/navigation_path_query_parameters_3d.cpp
+++ b/engine/servers/navigation/navigation_path_query_parameters_3d.cpp
@@ -102,6 +102,38 @@ real_t NavigationPathQueryParameters3D::get_simplify_epsilon() const {
 	return simplify_epsilon;
 }
 
+void NavigationPathQueryParameters3D::set_included_regions(const TypedArray<RID> &p_regions) {
+	_included_regions.resize(p_regions.size());
+	for (uint32_t i = 0; i < _included_regions.size(); i++) {
+		_included_regions[i] = p_regions[i];
+	}
+}
+
+TypedArray<RID> NavigationPathQueryParameters3D::get_included_regions() const {
+	TypedArray<RID> r_regions;
+	r_regions.resize(_included_regions.size());
+	for (uint32_t i = 0; i < _included_regions.size(); i++) {
+		r_regions[i] = _included_regions[i];
+	}
+	return r_regions;
+}
+
+void NavigationPathQueryParameters3D::set_excluded_regions(const TypedArray<RID> &p_regions) {
+	_excluded_regions.resize(p_regions.size());
+	for (uint32_t i = 0; i < _excluded_regions.size(); i++) {
+		_excluded_regions[i] = p_regions[i];
+	}
+}
+
+TypedArray<RID> NavigationPathQueryParameters3D::get_excluded_regions() const {
+	TypedArray<RID> r_regions;
+	r_regions.resize(_excluded_regions.size());
+	for (uint32_t i = 0; i < _excluded_regions.size(); i++) {
+		r_regions[i] = _excluded_regions[i];
+	}
+	return r_regions;
+}
+
 void NavigationPathQueryParameters3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_pathfinding_algorithm", "pathfinding_algorithm"), &NavigationPathQueryParameters3D::set_pathfinding_algorithm);
 	ClassDB::bind_method(D_METHOD("get_pathfinding_algorithm"), &NavigationPathQueryParameters3D::get_pathfinding_algorithm);
@@ -130,6 +162,12 @@ void NavigationPathQueryParameters3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_simplify_epsilon", "epsilon"), &NavigationPathQueryParameters3D::set_simplify_epsilon);
 	ClassDB::bind_method(D_METHOD("get_simplify_epsilon"), &NavigationPathQueryParameters3D::get_simplify_epsilon);
 
+	ClassDB::bind_method(D_METHOD("set_included_regions", "regions"), &NavigationPathQueryParameters3D::set_included_regions);
+	ClassDB::bind_method(D_METHOD("get_included_regions"), &NavigationPathQueryParameters3D::get_included_regions);
+
+	ClassDB::bind_method(D_METHOD("set_excluded_regions", "regions"), &NavigationPathQueryParameters3D::set_excluded_regions);
+	ClassDB::bind_method(D_METHOD("get_excluded_regions"), &NavigationPathQueryParameters3D::get_excluded_regions);
+
 	ADD_PROPERTY(PropertyInfo(Variant::RID, "map"), "set_map", "get_map");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "start_position"), "set_start_position", "get_start_position");
 	ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "target_position"), "set_target_position", "get_target_position");
@@ -139,6 +177,8 @@ void NavigationPathQueryParameters3D::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "metadata_flags", PROPERTY_HINT_FLAGS, "Include Types,Include RIDs,Include Owners"), "set_metadata_flags", "get_metadata_flags");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "simplify_path"), "set_simplify_path", "get_simplify_path");
 	ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "simplify_epsilon"), "set_simplify_epsilon", "get_simplify_epsilon");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "excluded_regions", PROPERTY_HINT_ARRAY_TYPE, "RID"), "set_excluded_regions", "get_excluded_regions");
+	ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "included_regions", PROPERTY_HINT_ARRAY_TYPE, "RID"), "set_included_regions", "get_included_regions");
 
 	BIND_ENUM_CONSTANT(PATHFINDING_ALGORITHM_ASTAR);
 
diff --git a/engine/servers/navigation/navigation_path_query_parameters_3d.h b/engine/servers/navigation/navigation_path_query_parameters_3d.h
index 66cad8dc..38b743e3 100644
--- a/engine/servers/navigation/navigation_path_query_parameters_3d.h
+++ b/engine/servers/navigation/navigation_path_query_parameters_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_PATH_QUERY_PARAMETERS_3D_H
-#define NAVIGATION_PATH_QUERY_PARAMETERS_3D_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "servers/navigation/navigation_utilities.h"
@@ -69,6 +68,8 @@ private:
 	BitField<PathMetadataFlags> metadata_flags = PATH_METADATA_INCLUDE_ALL;
 	bool simplify_path = false;
 	real_t simplify_epsilon = 0.0;
+	LocalVector<RID> _excluded_regions;
+	LocalVector<RID> _included_regions;
 
 public:
 	void set_pathfinding_algorithm(const PathfindingAlgorithm p_pathfinding_algorithm);
@@ -97,10 +98,14 @@ public:
 
 	void set_simplify_epsilon(real_t p_epsilon);
 	real_t get_simplify_epsilon() const;
+
+	void set_excluded_regions(const TypedArray<RID> &p_regions);
+	TypedArray<RID> get_excluded_regions() const;
+
+	void set_included_regions(const TypedArray<RID> &p_regions);
+	TypedArray<RID> get_included_regions() const;
 };
 
 VARIANT_ENUM_CAST(NavigationPathQueryParameters3D::PathfindingAlgorithm);
 VARIANT_ENUM_CAST(NavigationPathQueryParameters3D::PathPostProcessing);
 VARIANT_BITFIELD_CAST(NavigationPathQueryParameters3D::PathMetadataFlags);
-
-#endif // NAVIGATION_PATH_QUERY_PARAMETERS_3D_H
diff --git a/engine/servers/navigation/navigation_path_query_result_2d.cpp b/engine/servers/navigation/navigation_path_query_result_2d.cpp
index 53565611..4623f0e2 100644
--- a/engine/servers/navigation/navigation_path_query_result_2d.cpp
+++ b/engine/servers/navigation/navigation_path_query_result_2d.cpp
@@ -69,6 +69,47 @@ void NavigationPathQueryResult2D::reset() {
 	path_owner_ids.clear();
 }
 
+void NavigationPathQueryResult2D::set_data(const LocalVector<Vector2> &p_path, const LocalVector<int32_t> &p_path_types, const LocalVector<RID> &p_path_rids, const LocalVector<int64_t> &p_path_owner_ids) {
+	path.clear();
+	path_types.clear();
+	path_rids.clear();
+	path_owner_ids.clear();
+
+	{
+		path.resize(p_path.size());
+		Vector2 *w = path.ptrw();
+		const Vector2 *r = p_path.ptr();
+		for (uint32_t i = 0; i < p_path.size(); i++) {
+			w[i] = r[i];
+		}
+	}
+
+	{
+		path_types.resize(p_path_types.size());
+		int32_t *w = path_types.ptrw();
+		const int32_t *r = p_path_types.ptr();
+		for (uint32_t i = 0; i < p_path_types.size(); i++) {
+			w[i] = r[i];
+		}
+	}
+
+	{
+		path_rids.resize(p_path_rids.size());
+		for (uint32_t i = 0; i < p_path_rids.size(); i++) {
+			path_rids[i] = p_path_rids[i];
+		}
+	}
+
+	{
+		path_owner_ids.resize(p_path_owner_ids.size());
+		int64_t *w = path_owner_ids.ptrw();
+		const int64_t *r = p_path_owner_ids.ptr();
+		for (uint32_t i = 0; i < p_path_owner_ids.size(); i++) {
+			w[i] = r[i];
+		}
+	}
+}
+
 void NavigationPathQueryResult2D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_path", "path"), &NavigationPathQueryResult2D::set_path);
 	ClassDB::bind_method(D_METHOD("get_path"), &NavigationPathQueryResult2D::get_path);
diff --git a/engine/servers/navigation/navigation_path_query_result_2d.h b/engine/servers/navigation/navigation_path_query_result_2d.h
index 1320d15e..a0519eb0 100644
--- a/engine/servers/navigation/navigation_path_query_result_2d.h
+++ b/engine/servers/navigation/navigation_path_query_result_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_PATH_QUERY_RESULT_2D_H
-#define NAVIGATION_PATH_QUERY_RESULT_2D_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "servers/navigation/navigation_utilities.h"
@@ -64,8 +63,8 @@ public:
 	const Vector<int64_t> &get_path_owner_ids() const;
 
 	void reset();
+
+	void set_data(const LocalVector<Vector2> &p_path, const LocalVector<int32_t> &p_path_types, const LocalVector<RID> &p_path_rids, const LocalVector<int64_t> &p_path_owner_ids);
 };
 
 VARIANT_ENUM_CAST(NavigationPathQueryResult2D::PathSegmentType);
-
-#endif // NAVIGATION_PATH_QUERY_RESULT_2D_H
diff --git a/engine/servers/navigation/navigation_path_query_result_3d.h b/engine/servers/navigation/navigation_path_query_result_3d.h
index a2aa4ac4..88ec25cd 100644
--- a/engine/servers/navigation/navigation_path_query_result_3d.h
+++ b/engine/servers/navigation/navigation_path_query_result_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_PATH_QUERY_RESULT_3D_H
-#define NAVIGATION_PATH_QUERY_RESULT_3D_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/variant/typed_array.h"
@@ -70,5 +69,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(NavigationPathQueryResult3D::PathSegmentType);
-
-#endif // NAVIGATION_PATH_QUERY_RESULT_3D_H
diff --git a/engine/servers/navigation/navigation_utilities.h b/engine/servers/navigation/navigation_utilities.h
index 36192c14..c13dcc0f 100644
--- a/engine/servers/navigation/navigation_utilities.h
+++ b/engine/servers/navigation/navigation_utilities.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_UTILITIES_H
-#define NAVIGATION_UTILITIES_H
+#pragma once
 
 #include "core/math/vector3.h"
 #include "core/variant/typed_array.h"
@@ -60,5 +59,3 @@ enum PathMetadataFlags {
 };
 
 } //namespace NavigationUtilities
-
-#endif // NAVIGATION_UTILITIES_H
diff --git a/engine/servers/navigation_server_2d.cpp b/engine/servers/navigation_server_2d.cpp
index 748dd5fd..0541509f 100644
--- a/engine/servers/navigation_server_2d.cpp
+++ b/engine/servers/navigation_server_2d.cpp
@@ -31,8 +31,10 @@
 #include "navigation_server_2d.h"
 #include "navigation_server_2d.compat.inc"
 
+#include "core/config/project_settings.h"
+#include "scene/main/node.h"
+#include "servers/navigation/navigation_globals.h"
 #include "servers/navigation_server_2d_dummy.h"
-#include "servers/navigation_server_3d.h"
 
 NavigationServer2D *NavigationServer2D::singleton = nullptr;
 
@@ -182,12 +184,28 @@ void NavigationServer2D::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("free_rid", "rid"), &NavigationServer2D::free);
 
+	ClassDB::bind_method(D_METHOD("set_active", "active"), &NavigationServer2D::set_active);
+
 	ClassDB::bind_method(D_METHOD("set_debug_enabled", "enabled"), &NavigationServer2D::set_debug_enabled);
 	ClassDB::bind_method(D_METHOD("get_debug_enabled"), &NavigationServer2D::get_debug_enabled);
 
 	ADD_SIGNAL(MethodInfo("map_changed", PropertyInfo(Variant::RID, "map")));
 
 	ADD_SIGNAL(MethodInfo("navigation_debug_changed"));
+	ADD_SIGNAL(MethodInfo("avoidance_debug_changed"));
+
+	ClassDB::bind_method(D_METHOD("get_process_info", "process_info"), &NavigationServer2D::get_process_info);
+
+	BIND_ENUM_CONSTANT(INFO_ACTIVE_MAPS);
+	BIND_ENUM_CONSTANT(INFO_REGION_COUNT);
+	BIND_ENUM_CONSTANT(INFO_AGENT_COUNT);
+	BIND_ENUM_CONSTANT(INFO_LINK_COUNT);
+	BIND_ENUM_CONSTANT(INFO_POLYGON_COUNT);
+	BIND_ENUM_CONSTANT(INFO_EDGE_COUNT);
+	BIND_ENUM_CONSTANT(INFO_EDGE_MERGE_COUNT);
+	BIND_ENUM_CONSTANT(INFO_EDGE_CONNECTION_COUNT);
+	BIND_ENUM_CONSTANT(INFO_EDGE_FREE_COUNT);
+	BIND_ENUM_CONSTANT(INFO_OBSTACLE_COUNT);
 }
 
 NavigationServer2D *NavigationServer2D::get_singleton() {
@@ -197,19 +215,49 @@ NavigationServer2D *NavigationServer2D::get_singleton() {
 NavigationServer2D::NavigationServer2D() {
 	ERR_FAIL_COND(singleton != nullptr);
 	singleton = this;
-	ERR_FAIL_NULL_MSG(NavigationServer3D::get_singleton(), "The Navigation3D singleton should be initialized before the 2D one.");
-	NavigationServer3D::get_singleton()->connect("map_changed", callable_mp(this, &NavigationServer2D::_emit_map_changed));
+
+	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_cell_size", PROPERTY_HINT_RANGE, NavigationDefaults2D::navmesh_cell_size_hint), NavigationDefaults2D::navmesh_cell_size);
+	GLOBAL_DEF("navigation/2d/use_edge_connections", true);
+	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_edge_connection_margin", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::edge_connection_margin);
+	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_link_connection_radius", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::link_connection_radius);
 
 #ifdef DEBUG_ENABLED
-	NavigationServer3D::get_singleton()->connect(SNAME("navigation_debug_changed"), callable_mp(this, &NavigationServer2D::_emit_navigation_debug_changed_signal));
-#endif // DEBUG_ENABLED
-}
+	debug_navigation_edge_connection_color = GLOBAL_DEF("debug/shapes/navigation/2d/edge_connection_color", Color(1.0, 0.0, 1.0, 1.0));
+	debug_navigation_geometry_edge_color = GLOBAL_DEF("debug/shapes/navigation/2d/geometry_edge_color", Color(0.5, 1.0, 1.0, 1.0));
+	debug_navigation_geometry_face_color = GLOBAL_DEF("debug/shapes/navigation/2d/geometry_face_color", Color(0.5, 1.0, 1.0, 0.4));
+	debug_navigation_geometry_edge_disabled_color = GLOBAL_DEF("debug/shapes/navigation/2d/geometry_edge_disabled_color", Color(0.5, 0.5, 0.5, 1.0));
+	debug_navigation_geometry_face_disabled_color = GLOBAL_DEF("debug/shapes/navigation/2d/geometry_face_disabled_color", Color(0.5, 0.5, 0.5, 0.4));
+	debug_navigation_link_connection_color = GLOBAL_DEF("debug/shapes/navigation/2d/link_connection_color", Color(1.0, 0.5, 1.0, 1.0));
+	debug_navigation_link_connection_disabled_color = GLOBAL_DEF("debug/shapes/navigation/2d/link_connection_disabled_color", Color(0.5, 0.5, 0.5, 1.0));
+	debug_navigation_agent_path_color = GLOBAL_DEF("debug/shapes/navigation/2d/agent_path_color", Color(1.0, 0.0, 0.0, 1.0));
 
-#ifdef DEBUG_ENABLED
-void NavigationServer2D::_emit_navigation_debug_changed_signal() {
-	emit_signal(SNAME("navigation_debug_changed"));
-}
+	debug_navigation_enable_edge_connections = GLOBAL_DEF("debug/shapes/navigation/2d/enable_edge_connections", true);
+	debug_navigation_enable_edge_lines = GLOBAL_DEF("debug/shapes/navigation/2d/enable_edge_lines", true);
+	debug_navigation_enable_geometry_face_random_color = GLOBAL_DEF("debug/shapes/navigation/2d/enable_geometry_face_random_color", true);
+	debug_navigation_enable_link_connections = GLOBAL_DEF("debug/shapes/navigation/2d/enable_link_connections", true);
+
+	debug_navigation_enable_agent_paths = GLOBAL_DEF("debug/shapes/navigation/2d/enable_agent_paths", true);
+	debug_navigation_agent_path_point_size = GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "debug/shapes/navigation/2d/agent_path_point_size", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), 4.0);
+
+	debug_navigation_avoidance_agents_radius_color = GLOBAL_DEF("debug/shapes/avoidance/2d/agents_radius_color", Color(1.0, 1.0, 0.0, 0.25));
+	debug_navigation_avoidance_obstacles_radius_color = GLOBAL_DEF("debug/shapes/avoidance/2d/obstacles_radius_color", Color(1.0, 0.5, 0.0, 0.25));
+	debug_navigation_avoidance_static_obstacle_pushin_face_color = GLOBAL_DEF("debug/shapes/avoidance/2d/obstacles_static_face_pushin_color", Color(1.0, 0.0, 0.0, 0.0));
+	debug_navigation_avoidance_static_obstacle_pushin_edge_color = GLOBAL_DEF("debug/shapes/avoidance/2d/obstacles_static_edge_pushin_color", Color(1.0, 0.0, 0.0, 1.0));
+	debug_navigation_avoidance_static_obstacle_pushout_face_color = GLOBAL_DEF("debug/shapes/avoidance/2d/obstacles_static_face_pushout_color", Color(1.0, 1.0, 0.0, 0.5));
+	debug_navigation_avoidance_static_obstacle_pushout_edge_color = GLOBAL_DEF("debug/shapes/avoidance/2d/obstacles_static_edge_pushout_color", Color(1.0, 1.0, 0.0, 1.0));
+	debug_navigation_avoidance_enable_agents_radius = GLOBAL_DEF("debug/shapes/avoidance/2d/enable_agents_radius", true);
+	debug_navigation_avoidance_enable_obstacles_radius = GLOBAL_DEF("debug/shapes/avoidance/2d/enable_obstacles_radius", true);
+	debug_navigation_avoidance_enable_obstacles_static = GLOBAL_DEF("debug/shapes/avoidance/2d/enable_obstacles_static", true);
+
+	if (Engine::get_singleton()->is_editor_hint()) {
+		// enable NavigationServer3D when in Editor or else navigation mesh edge connections are invisible
+		// on runtime tests SceneTree has "Visible Navigation" set and main iteration takes care of this.
+		set_debug_enabled(true);
+		set_debug_navigation_enabled(true);
+		set_debug_avoidance_enabled(true);
+	}
 #endif // DEBUG_ENABLED
+}
 
 NavigationServer2D::~NavigationServer2D() {
 	singleton = nullptr;
@@ -256,209 +304,239 @@ void NavigationServer2D::source_geometry_parser_set_callback(RID p_parser, const
 	parser->callback = p_callback;
 }
 
-void NavigationServer2D::_emit_map_changed(RID p_map) {
-	emit_signal(SNAME("map_changed"), p_map);
-}
-
 void NavigationServer2D::set_debug_enabled(bool p_enabled) {
-	NavigationServer3D::get_singleton()->set_debug_enabled(p_enabled);
+#ifdef DEBUG_ENABLED
+	if (debug_enabled != p_enabled) {
+		debug_dirty = true;
+	}
+
+	debug_enabled = p_enabled;
+
+	if (debug_dirty) {
+		navigation_debug_dirty = true;
+		callable_mp(this, &NavigationServer2D::_emit_navigation_debug_changed_signal).call_deferred();
+
+		avoidance_debug_dirty = true;
+		callable_mp(this, &NavigationServer2D::_emit_avoidance_debug_changed_signal).call_deferred();
+	}
+#endif // DEBUG_ENABLED
 }
 
 bool NavigationServer2D::get_debug_enabled() const {
-	return NavigationServer3D::get_singleton()->get_debug_enabled();
+	return debug_enabled;
 }
 
+#ifdef DEBUG_ENABLED
+void NavigationServer2D::_emit_navigation_debug_changed_signal() {
+	if (navigation_debug_dirty) {
+		navigation_debug_dirty = false;
+		emit_signal(SNAME("navigation_debug_changed"));
+	}
+}
+
+void NavigationServer2D::_emit_avoidance_debug_changed_signal() {
+	if (avoidance_debug_dirty) {
+		avoidance_debug_dirty = false;
+		emit_signal(SNAME("avoidance_debug_changed"));
+	}
+}
+#endif // DEBUG_ENABLED
+
 #ifdef DEBUG_ENABLED
 void NavigationServer2D::set_debug_navigation_enabled(bool p_enabled) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_enabled(p_enabled);
+	debug_navigation_enabled = p_enabled;
+	navigation_debug_dirty = true;
+	callable_mp(this, &NavigationServer2D::_emit_navigation_debug_changed_signal).call_deferred();
 }
 
 bool NavigationServer2D::get_debug_navigation_enabled() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_enabled();
+	return debug_navigation_enabled;
 }
 
 void NavigationServer2D::set_debug_avoidance_enabled(bool p_enabled) {
-	NavigationServer3D::get_singleton()->set_debug_avoidance_enabled(p_enabled);
+	debug_avoidance_enabled = p_enabled;
+	avoidance_debug_dirty = true;
+	callable_mp(this, &NavigationServer2D::_emit_avoidance_debug_changed_signal).call_deferred();
 }
 
 bool NavigationServer2D::get_debug_avoidance_enabled() const {
-	return NavigationServer3D::get_singleton()->get_debug_avoidance_enabled();
+	return debug_avoidance_enabled;
 }
 
 void NavigationServer2D::set_debug_navigation_edge_connection_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_edge_connection_color(p_color);
+	debug_navigation_edge_connection_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_edge_connection_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_edge_connection_color();
+	return debug_navigation_edge_connection_color;
 }
 
 void NavigationServer2D::set_debug_navigation_geometry_face_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_face_color(p_color);
+	debug_navigation_geometry_face_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_geometry_face_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_color();
+	return debug_navigation_geometry_face_color;
 }
 
 void NavigationServer2D::set_debug_navigation_geometry_face_disabled_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_face_disabled_color(p_color);
+	debug_navigation_geometry_face_disabled_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_geometry_face_disabled_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_face_disabled_color();
+	return debug_navigation_geometry_face_disabled_color;
 }
 
 void NavigationServer2D::set_debug_navigation_link_connection_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_link_connection_color(p_color);
+	debug_navigation_link_connection_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_link_connection_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_link_connection_color();
+	return debug_navigation_link_connection_color;
 }
 
 void NavigationServer2D::set_debug_navigation_link_connection_disabled_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_link_connection_disabled_color(p_color);
+	debug_navigation_link_connection_disabled_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_link_connection_disabled_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_link_connection_disabled_color();
+	return debug_navigation_link_connection_disabled_color;
 }
 
 void NavigationServer2D::set_debug_navigation_geometry_edge_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_color(p_color);
+	debug_navigation_geometry_edge_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_geometry_edge_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_edge_color();
+	return debug_navigation_geometry_edge_color;
 }
 
 void NavigationServer2D::set_debug_navigation_geometry_edge_disabled_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_geometry_edge_disabled_color(p_color);
+	debug_navigation_geometry_edge_disabled_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_geometry_edge_disabled_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_geometry_edge_disabled_color();
+	return debug_navigation_geometry_edge_disabled_color;
 }
 
 void NavigationServer2D::set_debug_navigation_enable_edge_connections(const bool p_value) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_connections(p_value);
+	debug_navigation_enable_edge_connections = p_value;
 }
 
 bool NavigationServer2D::get_debug_navigation_enable_edge_connections() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_enable_edge_connections();
+	return debug_navigation_enable_edge_connections;
 }
 
 void NavigationServer2D::set_debug_navigation_enable_geometry_face_random_color(const bool p_value) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_geometry_face_random_color(p_value);
+	debug_navigation_enable_geometry_face_random_color = p_value;
 }
 
 bool NavigationServer2D::get_debug_navigation_enable_geometry_face_random_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_enable_geometry_face_random_color();
+	return debug_navigation_enable_geometry_face_random_color;
 }
 
 void NavigationServer2D::set_debug_navigation_enable_edge_lines(const bool p_value) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_edge_lines(p_value);
+	debug_navigation_enable_edge_lines = p_value;
 }
 
 bool NavigationServer2D::get_debug_navigation_enable_edge_lines() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_enable_edge_lines();
+	return debug_navigation_enable_edge_lines;
 }
 
 void NavigationServer2D::set_debug_navigation_agent_path_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_agent_path_color(p_color);
+	debug_navigation_agent_path_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_agent_path_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_agent_path_color();
+	return debug_navigation_agent_path_color;
 }
 
 void NavigationServer2D::set_debug_navigation_enable_agent_paths(const bool p_value) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_enable_agent_paths(p_value);
+	debug_navigation_enable_agent_paths = p_value;
 }
 
 bool NavigationServer2D::get_debug_navigation_enable_agent_paths() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_enable_agent_paths();
+	return debug_navigation_enable_agent_paths;
 }
 
 void NavigationServer2D::set_debug_navigation_agent_path_point_size(real_t p_point_size) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_agent_path_point_size(p_point_size);
+	debug_navigation_agent_path_point_size = p_point_size;
 }
 
 real_t NavigationServer2D::get_debug_navigation_agent_path_point_size() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_agent_path_point_size();
+	return debug_navigation_agent_path_point_size;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_enable_agents_radius(const bool p_value) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_enable_agents_radius(p_value);
+	debug_navigation_avoidance_enable_agents_radius = p_value;
 }
 
 bool NavigationServer2D::get_debug_navigation_avoidance_enable_agents_radius() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_enable_agents_radius();
+	return debug_navigation_avoidance_enable_agents_radius;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_enable_obstacles_radius(const bool p_value) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_enable_obstacles_radius(p_value);
+	debug_navigation_avoidance_enable_obstacles_radius = p_value;
 }
 
 bool NavigationServer2D::get_debug_navigation_avoidance_enable_obstacles_radius() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_enable_obstacles_radius();
+	return debug_navigation_avoidance_enable_obstacles_radius;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_agents_radius_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_agents_radius_color(p_color);
+	debug_navigation_avoidance_agents_radius_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_avoidance_agents_radius_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_agents_radius_color();
+	return debug_navigation_avoidance_agents_radius_color;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_obstacles_radius_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_obstacles_radius_color(p_color);
+	debug_navigation_avoidance_obstacles_radius_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_avoidance_obstacles_radius_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_obstacles_radius_color();
+	return debug_navigation_avoidance_obstacles_radius_color;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_static_obstacle_pushin_face_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_static_obstacle_pushin_face_color(p_color);
+	debug_navigation_avoidance_static_obstacle_pushin_face_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_avoidance_static_obstacle_pushin_face_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_static_obstacle_pushin_face_color();
+	return debug_navigation_avoidance_static_obstacle_pushin_face_color;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_static_obstacle_pushout_face_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_static_obstacle_pushout_face_color(p_color);
+	debug_navigation_avoidance_static_obstacle_pushout_face_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_avoidance_static_obstacle_pushout_face_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_static_obstacle_pushout_face_color();
+	return debug_navigation_avoidance_static_obstacle_pushout_face_color;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_static_obstacle_pushin_edge_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_static_obstacle_pushin_edge_color(p_color);
+	debug_navigation_avoidance_static_obstacle_pushin_edge_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_avoidance_static_obstacle_pushin_edge_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_static_obstacle_pushin_edge_color();
+	return debug_navigation_avoidance_static_obstacle_pushin_edge_color;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_static_obstacle_pushout_edge_color(const Color &p_color) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_static_obstacle_pushout_edge_color(p_color);
+	debug_navigation_avoidance_static_obstacle_pushout_edge_color = p_color;
 }
 
 Color NavigationServer2D::get_debug_navigation_avoidance_static_obstacle_pushout_edge_color() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_static_obstacle_pushout_edge_color();
+	return debug_navigation_avoidance_static_obstacle_pushout_edge_color;
 }
 
 void NavigationServer2D::set_debug_navigation_avoidance_enable_obstacles_static(const bool p_value) {
-	NavigationServer3D::get_singleton()->set_debug_navigation_avoidance_enable_obstacles_static(p_value);
+	debug_navigation_avoidance_enable_obstacles_static = p_value;
 }
 
 bool NavigationServer2D::get_debug_navigation_avoidance_enable_obstacles_static() const {
-	return NavigationServer3D::get_singleton()->get_debug_navigation_avoidance_enable_obstacles_static();
+	return debug_navigation_avoidance_enable_obstacles_static;
 }
 #endif // DEBUG_ENABLED
 
@@ -481,8 +559,6 @@ NavigationServer2D *NavigationServer2DManager::new_default_server() {
 }
 
 void NavigationServer2DManager::initialize_server() {
-	// NavigationServer3D must be initialized before NavigationServer2D.
-	ERR_FAIL_NULL(NavigationServer3D::get_singleton());
 	ERR_FAIL_COND(navigation_server_2d != nullptr);
 
 	// Init 2D Navigation Server
diff --git a/engine/servers/navigation_server_2d.h b/engine/servers/navigation_server_2d.h
index c0de4935..25796249 100644
--- a/engine/servers/navigation_server_2d.h
+++ b/engine/servers/navigation_server_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_SERVER_2D_H
-#define NAVIGATION_SERVER_2D_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/templates/rid.h"
@@ -54,8 +53,6 @@ class NavigationServer2D : public Object {
 
 	static NavigationServer2D *singleton;
 
-	void _emit_map_changed(RID p_map);
-
 protected:
 	static void _bind_methods();
 
@@ -304,6 +301,15 @@ public:
 	/// Returns a customized navigation path using a query parameters object
 	virtual void query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback = Callable()) = 0;
 
+	/// Control activation of this server.
+	virtual void set_active(bool p_active) = 0;
+
+	/// Process the collision avoidance agents.
+	/// The result of this process is needed by the physics server,
+	/// so this must be called in the main thread.
+	/// Note: This function is not thread safe.
+	virtual void process(double p_delta_time) = 0;
+	virtual void physics_process(double p_delta_time) = 0;
 	virtual void init() = 0;
 	virtual void sync() = 0;
 	virtual void finish() = 0;
@@ -330,6 +336,21 @@ public:
 	NavigationServer2D();
 	~NavigationServer2D() override;
 
+	enum ProcessInfo {
+		INFO_ACTIVE_MAPS,
+		INFO_REGION_COUNT,
+		INFO_AGENT_COUNT,
+		INFO_LINK_COUNT,
+		INFO_POLYGON_COUNT,
+		INFO_EDGE_COUNT,
+		INFO_EDGE_MERGE_COUNT,
+		INFO_EDGE_CONNECTION_COUNT,
+		INFO_EDGE_FREE_COUNT,
+		INFO_OBSTACLE_COUNT,
+	};
+
+	virtual int get_process_info(ProcessInfo p_info) const = 0;
+
 	void set_debug_enabled(bool p_enabled);
 	bool get_debug_enabled() const;
 
@@ -340,8 +361,50 @@ protected:
 	static void _bind_compatibility_methods();
 #endif
 
-public:
+private:
+	bool debug_enabled = false;
+
 #ifdef DEBUG_ENABLED
+	bool debug_dirty = true;
+
+	bool debug_navigation_enabled = false;
+	bool navigation_debug_dirty = true;
+	void _emit_navigation_debug_changed_signal();
+
+	bool debug_avoidance_enabled = false;
+	bool avoidance_debug_dirty = true;
+	void _emit_avoidance_debug_changed_signal();
+
+	Color debug_navigation_edge_connection_color = Color(1.0, 0.0, 1.0, 1.0);
+	Color debug_navigation_geometry_edge_color = Color(0.5, 1.0, 1.0, 1.0);
+	Color debug_navigation_geometry_face_color = Color(0.5, 1.0, 1.0, 0.4);
+	Color debug_navigation_geometry_edge_disabled_color = Color(0.5, 0.5, 0.5, 1.0);
+	Color debug_navigation_geometry_face_disabled_color = Color(0.5, 0.5, 0.5, 0.4);
+	Color debug_navigation_link_connection_color = Color(1.0, 0.5, 1.0, 1.0);
+	Color debug_navigation_link_connection_disabled_color = Color(0.5, 0.5, 0.5, 1.0);
+	Color debug_navigation_agent_path_color = Color(1.0, 0.0, 0.0, 1.0);
+
+	real_t debug_navigation_agent_path_point_size = 4.0;
+
+	Color debug_navigation_avoidance_agents_radius_color = Color(1.0, 1.0, 0.0, 0.25);
+	Color debug_navigation_avoidance_obstacles_radius_color = Color(1.0, 0.5, 0.0, 0.25);
+
+	Color debug_navigation_avoidance_static_obstacle_pushin_face_color = Color(1.0, 0.0, 0.0, 0.0);
+	Color debug_navigation_avoidance_static_obstacle_pushout_face_color = Color(1.0, 1.0, 0.0, 0.5);
+	Color debug_navigation_avoidance_static_obstacle_pushin_edge_color = Color(1.0, 0.0, 0.0, 1.0);
+	Color debug_navigation_avoidance_static_obstacle_pushout_edge_color = Color(1.0, 1.0, 0.0, 1.0);
+
+	bool debug_navigation_enable_edge_connections = true;
+	bool debug_navigation_enable_edge_lines = true;
+	bool debug_navigation_enable_geometry_face_random_color = true;
+	bool debug_navigation_enable_link_connections = true;
+	bool debug_navigation_enable_agent_paths = true;
+
+	bool debug_navigation_avoidance_enable_agents_radius = true;
+	bool debug_navigation_avoidance_enable_obstacles_radius = true;
+	bool debug_navigation_avoidance_enable_obstacles_static = true;
+
+public:
 	void set_debug_navigation_enabled(bool p_enabled);
 	bool get_debug_navigation_enabled() const;
 
@@ -414,11 +477,6 @@ public:
 	void set_debug_navigation_avoidance_enable_obstacles_static(const bool p_value);
 	bool get_debug_navigation_avoidance_enable_obstacles_static() const;
 #endif // DEBUG_ENABLED
-
-#ifdef DEBUG_ENABLED
-private:
-	void _emit_navigation_debug_changed_signal();
-#endif // DEBUG_ENABLED
 };
 
 typedef NavigationServer2D *(*NavigationServer2DCallback)();
@@ -435,4 +493,4 @@ public:
 	static void finalize_server();
 };
 
-#endif // NAVIGATION_SERVER_2D_H
+VARIANT_ENUM_CAST(NavigationServer2D::ProcessInfo);
diff --git a/engine/servers/navigation_server_2d_dummy.h b/engine/servers/navigation_server_2d_dummy.h
index 4e16c00e..f5401008 100644
--- a/engine/servers/navigation_server_2d_dummy.h
+++ b/engine/servers/navigation_server_2d_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_SERVER_2D_DUMMY_H
-#define NAVIGATION_SERVER_2D_DUMMY_H
+#pragma once
 
 #include "servers/navigation_server_2d.h"
 
@@ -163,10 +162,15 @@ public:
 
 	void query_path(const Ref<NavigationPathQueryParameters2D> &p_query_parameters, Ref<NavigationPathQueryResult2D> p_query_result, const Callable &p_callback = Callable()) override {}
 
+	void set_active(bool p_active) override {}
+	void process(double p_delta_time) override {}
+	void physics_process(double p_delta_time) override {}
 	void init() override {}
 	void sync() override {}
 	void finish() override {}
 
+	int get_process_info(ProcessInfo p_info) const override { return 0; }
+
 	void free(RID p_object) override {}
 
 	void parse_source_geometry_data(const Ref<NavigationPolygon> &p_navigation_mesh, const Ref<NavigationMeshSourceGeometryData2D> &p_source_geometry_data, Node *p_root_node, const Callable &p_callback = Callable()) override {}
@@ -182,5 +186,3 @@ public:
 	void set_debug_enabled(bool p_enabled) {}
 	bool get_debug_enabled() const { return false; }
 };
-
-#endif // NAVIGATION_SERVER_2D_DUMMY_H
diff --git a/engine/servers/navigation_server_3d.cpp b/engine/servers/navigation_server_3d.cpp
index 537c9795..f635121a 100644
--- a/engine/servers/navigation_server_3d.cpp
+++ b/engine/servers/navigation_server_3d.cpp
@@ -240,11 +240,6 @@ NavigationServer3D::NavigationServer3D() {
 	ERR_FAIL_COND(singleton != nullptr);
 	singleton = this;
 
-	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_cell_size", PROPERTY_HINT_RANGE, NavigationDefaults2D::navmesh_cell_size_hint), NavigationDefaults2D::navmesh_cell_size);
-	GLOBAL_DEF("navigation/2d/use_edge_connections", true);
-	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_edge_connection_margin", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::edge_connection_margin);
-	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/2d/default_link_connection_radius", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults2D::link_connection_radius);
-
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_cell_size", PROPERTY_HINT_RANGE, NavigationDefaults3D::navmesh_cell_size_hint), NavigationDefaults3D::navmesh_cell_size);
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_cell_height", PROPERTY_HINT_RANGE, "0.001,100,0.001,or_greater"), NavigationDefaults3D::navmesh_cell_height);
 	GLOBAL_DEF("navigation/3d/default_up", Vector3(0, 1, 0));
@@ -253,48 +248,90 @@ NavigationServer3D::NavigationServer3D() {
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_edge_connection_margin", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults3D::edge_connection_margin);
 	GLOBAL_DEF_BASIC(PropertyInfo(Variant::FLOAT, "navigation/3d/default_link_connection_radius", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), NavigationDefaults3D::link_connection_radius);
 
-	GLOBAL_DEF("navigation/world/map_use_async_iterations", true);
-
-	GLOBAL_DEF("navigation/avoidance/thread_model/avoidance_use_multiple_threads", true);
-	GLOBAL_DEF("navigation/avoidance/thread_model/avoidance_use_high_priority_threads", true);
-
-	GLOBAL_DEF("navigation/pathfinding/max_threads", 4);
-
-	GLOBAL_DEF("navigation/baking/use_crash_prevention_checks", true);
-	GLOBAL_DEF("navigation/baking/thread_model/baking_use_multiple_threads", true);
-	GLOBAL_DEF("navigation/baking/thread_model/baking_use_high_priority_threads", true);
-
 #ifdef DEBUG_ENABLED
-	debug_navigation_edge_connection_color = GLOBAL_DEF("debug/shapes/navigation/edge_connection_color", Color(1.0, 0.0, 1.0, 1.0));
-	debug_navigation_geometry_edge_color = GLOBAL_DEF("debug/shapes/navigation/geometry_edge_color", Color(0.5, 1.0, 1.0, 1.0));
-	debug_navigation_geometry_face_color = GLOBAL_DEF("debug/shapes/navigation/geometry_face_color", Color(0.5, 1.0, 1.0, 0.4));
-	debug_navigation_geometry_edge_disabled_color = GLOBAL_DEF("debug/shapes/navigation/geometry_edge_disabled_color", Color(0.5, 0.5, 0.5, 1.0));
-	debug_navigation_geometry_face_disabled_color = GLOBAL_DEF("debug/shapes/navigation/geometry_face_disabled_color", Color(0.5, 0.5, 0.5, 0.4));
-	debug_navigation_link_connection_color = GLOBAL_DEF("debug/shapes/navigation/link_connection_color", Color(1.0, 0.5, 1.0, 1.0));
-	debug_navigation_link_connection_disabled_color = GLOBAL_DEF("debug/shapes/navigation/link_connection_disabled_color", Color(0.5, 0.5, 0.5, 1.0));
-	debug_navigation_agent_path_color = GLOBAL_DEF("debug/shapes/navigation/agent_path_color", Color(1.0, 0.0, 0.0, 1.0));
+#ifndef DISABLE_DEPRECATED
+#define MOVE_PROJECT_SETTING_1(m_old_setting, m_new_setting)                                                                             \
+	if (!ProjectSettings::get_singleton()->has_setting(m_new_setting) && ProjectSettings::get_singleton()->has_setting(m_old_setting)) { \
+		Variant value = GLOBAL_GET(m_old_setting);                                                                                       \
+		ProjectSettings::get_singleton()->set_setting(m_new_setting, value);                                                             \
+		ProjectSettings::get_singleton()->clear(m_old_setting);                                                                          \
+	}
+#define MOVE_PROJECT_SETTING_2(m_old_setting, m_new_setting_1, m_new_setting_2)                                                                 \
+	if ((!ProjectSettings::get_singleton()->has_setting(m_new_setting_1) || !ProjectSettings::get_singleton()->has_setting(m_new_setting_2)) && \
+			ProjectSettings::get_singleton()->has_setting(m_old_setting)) {                                                                     \
+		Variant value = GLOBAL_GET(m_old_setting);                                                                                              \
+		if (!ProjectSettings::get_singleton()->has_setting(m_new_setting_1)) {                                                                  \
+			ProjectSettings::get_singleton()->set_setting(m_new_setting_1, value);                                                              \
+		}                                                                                                                                       \
+		if (!ProjectSettings::get_singleton()->has_setting(m_new_setting_2)) {                                                                  \
+			ProjectSettings::get_singleton()->set_setting(m_new_setting_2, value);                                                              \
+		}                                                                                                                                       \
+		ProjectSettings::get_singleton()->clear(m_old_setting);                                                                                 \
+	}
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/edge_connection_color", "debug/shapes/navigation/2d/edge_connection_color", "debug/shapes/navigation/3d/edge_connection_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/geometry_edge_color", "debug/shapes/navigation/2d/geometry_edge_color", "debug/shapes/navigation/3d/geometry_edge_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/geometry_face_color", "debug/shapes/navigation/2d/geometry_face_color", "debug/shapes/navigation/3d/geometry_face_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/geometry_edge_disabled_color", "debug/shapes/navigation/2d/geometry_edge_disabled_color", "debug/shapes/navigation/3d/geometry_edge_disabled_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/geometry_face_disabled_color", "debug/shapes/navigation/2d/geometry_face_disabled_color", "debug/shapes/navigation/3d/geometry_face_disabled_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/link_connection_color", "debug/shapes/navigation/2d/link_connection_color", "debug/shapes/navigation/3d/link_connection_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/link_connection_disabled_color", "debug/shapes/navigation/2d/link_connection_disabled_color", "debug/shapes/navigation/3d/link_connection_disabled_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/agent_path_color", "debug/shapes/navigation/2d/agent_path_color", "debug/shapes/navigation/3d/agent_path_color");
 
-	debug_navigation_enable_edge_connections = GLOBAL_DEF("debug/shapes/navigation/enable_edge_connections", true);
-	debug_navigation_enable_edge_connections_xray = GLOBAL_DEF("debug/shapes/navigation/enable_edge_connections_xray", true);
-	debug_navigation_enable_edge_lines = GLOBAL_DEF("debug/shapes/navigation/enable_edge_lines", true);
-	debug_navigation_enable_edge_lines_xray = GLOBAL_DEF("debug/shapes/navigation/enable_edge_lines_xray", true);
-	debug_navigation_enable_geometry_face_random_color = GLOBAL_DEF("debug/shapes/navigation/enable_geometry_face_random_color", true);
-	debug_navigation_enable_link_connections = GLOBAL_DEF("debug/shapes/navigation/enable_link_connections", true);
-	debug_navigation_enable_link_connections_xray = GLOBAL_DEF("debug/shapes/navigation/enable_link_connections_xray", true);
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/enable_edge_connections", "debug/shapes/navigation/2d/enable_edge_connections", "debug/shapes/navigation/3d/enable_edge_connections");
+	MOVE_PROJECT_SETTING_1("debug/shapes/navigation/enable_edge_connections_xray", "debug/shapes/navigation/3d/enable_edge_connections_xray");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/enable_edge_lines", "debug/shapes/navigation/2d/enable_edge_lines", "debug/shapes/navigation/3d/enable_edge_lines");
+	MOVE_PROJECT_SETTING_1("debug/shapes/navigation/enable_edge_lines_xray", "debug/shapes/navigation/3d/enable_edge_lines_xray");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/enable_geometry_face_random_color", "debug/shapes/navigation/2d/enable_geometry_face_random_color", "debug/shapes/navigation/3d/enable_geometry_face_random_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/enable_link_connections", "debug/shapes/navigation/2d/enable_link_connections", "debug/shapes/navigation/3d/enable_link_connections");
+	MOVE_PROJECT_SETTING_1("debug/shapes/navigation/enable_link_connections_xray", "debug/shapes/navigation/3d/enable_link_connections_xray");
 
-	debug_navigation_enable_agent_paths = GLOBAL_DEF("debug/shapes/navigation/enable_agent_paths", true);
-	debug_navigation_enable_agent_paths_xray = GLOBAL_DEF("debug/shapes/navigation/enable_agent_paths_xray", true);
-	debug_navigation_agent_path_point_size = GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "debug/shapes/navigation/agent_path_point_size", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), 4.0);
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/enable_agent_paths", "debug/shapes/navigation/2d/enable_agent_paths", "debug/shapes/navigation/3d/enable_agent_paths");
+	MOVE_PROJECT_SETTING_1("debug/shapes/navigation/enable_agent_paths_xray", "debug/shapes/navigation/3d/enable_agent_paths_xray");
+	MOVE_PROJECT_SETTING_2("debug/shapes/navigation/agent_path_point_size", "debug/shapes/navigation/2d/agent_path_point_size", "debug/shapes/navigation/3d/agent_path_point_size");
 
-	debug_navigation_avoidance_agents_radius_color = GLOBAL_DEF("debug/shapes/avoidance/agents_radius_color", Color(1.0, 1.0, 0.0, 0.25));
-	debug_navigation_avoidance_obstacles_radius_color = GLOBAL_DEF("debug/shapes/avoidance/obstacles_radius_color", Color(1.0, 0.5, 0.0, 0.25));
-	debug_navigation_avoidance_static_obstacle_pushin_face_color = GLOBAL_DEF("debug/shapes/avoidance/obstacles_static_face_pushin_color", Color(1.0, 0.0, 0.0, 0.0));
-	debug_navigation_avoidance_static_obstacle_pushin_edge_color = GLOBAL_DEF("debug/shapes/avoidance/obstacles_static_edge_pushin_color", Color(1.0, 0.0, 0.0, 1.0));
-	debug_navigation_avoidance_static_obstacle_pushout_face_color = GLOBAL_DEF("debug/shapes/avoidance/obstacles_static_face_pushout_color", Color(1.0, 1.0, 0.0, 0.5));
-	debug_navigation_avoidance_static_obstacle_pushout_edge_color = GLOBAL_DEF("debug/shapes/avoidance/obstacles_static_edge_pushout_color", Color(1.0, 1.0, 0.0, 1.0));
-	debug_navigation_avoidance_enable_agents_radius = GLOBAL_DEF("debug/shapes/avoidance/enable_agents_radius", true);
-	debug_navigation_avoidance_enable_obstacles_radius = GLOBAL_DEF("debug/shapes/avoidance/enable_obstacles_radius", true);
-	debug_navigation_avoidance_enable_obstacles_static = GLOBAL_DEF("debug/shapes/avoidance/enable_obstacles_static", true);
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/agents_radius_color", "debug/shapes/avoidance/2d/agents_radius_color", "debug/shapes/avoidance/3d/agents_radius_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/obstacles_radius_color", "debug/shapes/avoidance/2d/obstacles_radius_color", "debug/shapes/avoidance/3d/obstacles_radius_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/obstacles_static_face_pushin_color", "debug/shapes/avoidance/2d/obstacles_static_face_pushin_color", "debug/shapes/avoidance/3d/obstacles_static_face_pushin_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/obstacles_static_edge_pushin_color", "debug/shapes/avoidance/2d/obstacles_static_edge_pushin_color", "debug/shapes/avoidance/3d/obstacles_static_edge_pushin_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/obstacles_static_face_pushout_color", "debug/shapes/avoidance/2d/obstacles_static_face_pushout_color", "debug/shapes/avoidance/3d/obstacles_static_face_pushout_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/obstacles_static_edge_pushout_color", "debug/shapes/avoidance/2d/obstacles_static_edge_pushout_color", "debug/shapes/avoidance/3d/obstacles_static_edge_pushout_color");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/enable_agents_radius", "debug/shapes/avoidance/2d/enable_agents_radius", "debug/shapes/avoidance/3d/enable_agents_radius");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/enable_obstacles_radius", "debug/shapes/avoidance/2d/enable_obstacles_radius", "debug/shapes/avoidance/2d/enable_obstacles_static");
+	MOVE_PROJECT_SETTING_2("debug/shapes/avoidance/enable_obstacles_radius", "debug/shapes/avoidance/3d/enable_obstacles_radius", "debug/shapes/avoidance/3d/enable_obstacles_static");
+#undef MOVE_PROJECT_SETTING_1
+#undef MOVE_PROJECT_SETTING_2
+#endif // DISABLE_DEPRECATED
+
+	debug_navigation_edge_connection_color = GLOBAL_DEF("debug/shapes/navigation/3d/edge_connection_color", Color(1.0, 0.0, 1.0, 1.0));
+	debug_navigation_geometry_edge_color = GLOBAL_DEF("debug/shapes/navigation/3d/geometry_edge_color", Color(0.5, 1.0, 1.0, 1.0));
+	debug_navigation_geometry_face_color = GLOBAL_DEF("debug/shapes/navigation/3d/geometry_face_color", Color(0.5, 1.0, 1.0, 0.4));
+	debug_navigation_geometry_edge_disabled_color = GLOBAL_DEF("debug/shapes/navigation/3d/geometry_edge_disabled_color", Color(0.5, 0.5, 0.5, 1.0));
+	debug_navigation_geometry_face_disabled_color = GLOBAL_DEF("debug/shapes/navigation/3d/geometry_face_disabled_color", Color(0.5, 0.5, 0.5, 0.4));
+	debug_navigation_link_connection_color = GLOBAL_DEF("debug/shapes/navigation/3d/link_connection_color", Color(1.0, 0.5, 1.0, 1.0));
+	debug_navigation_link_connection_disabled_color = GLOBAL_DEF("debug/shapes/navigation/3d/link_connection_disabled_color", Color(0.5, 0.5, 0.5, 1.0));
+	debug_navigation_agent_path_color = GLOBAL_DEF("debug/shapes/navigation/3d/agent_path_color", Color(1.0, 0.0, 0.0, 1.0));
+
+	debug_navigation_enable_edge_connections = GLOBAL_DEF("debug/shapes/navigation/3d/enable_edge_connections", true);
+	debug_navigation_enable_edge_connections_xray = GLOBAL_DEF("debug/shapes/navigation/3d/enable_edge_connections_xray", true);
+	debug_navigation_enable_edge_lines = GLOBAL_DEF("debug/shapes/navigation/3d/enable_edge_lines", true);
+	debug_navigation_enable_edge_lines_xray = GLOBAL_DEF("debug/shapes/navigation/3d/enable_edge_lines_xray", true);
+	debug_navigation_enable_geometry_face_random_color = GLOBAL_DEF("debug/shapes/navigation/3d/enable_geometry_face_random_color", true);
+	debug_navigation_enable_link_connections = GLOBAL_DEF("debug/shapes/navigation/3d/enable_link_connections", true);
+	debug_navigation_enable_link_connections_xray = GLOBAL_DEF("debug/shapes/navigation/3d/enable_link_connections_xray", true);
+
+	debug_navigation_enable_agent_paths = GLOBAL_DEF("debug/shapes/navigation/3d/enable_agent_paths", true);
+	debug_navigation_enable_agent_paths_xray = GLOBAL_DEF("debug/shapes/navigation/3d/enable_agent_paths_xray", true);
+	debug_navigation_agent_path_point_size = GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "debug/shapes/navigation/3d/agent_path_point_size", PROPERTY_HINT_RANGE, "0.01,10,0.001,or_greater"), 4.0);
+
+	debug_navigation_avoidance_agents_radius_color = GLOBAL_DEF("debug/shapes/avoidance/3d/agents_radius_color", Color(1.0, 1.0, 0.0, 0.25));
+	debug_navigation_avoidance_obstacles_radius_color = GLOBAL_DEF("debug/shapes/avoidance/3d/obstacles_radius_color", Color(1.0, 0.5, 0.0, 0.25));
+	debug_navigation_avoidance_static_obstacle_pushin_face_color = GLOBAL_DEF("debug/shapes/avoidance/3d/obstacles_static_face_pushin_color", Color(1.0, 0.0, 0.0, 0.0));
+	debug_navigation_avoidance_static_obstacle_pushin_edge_color = GLOBAL_DEF("debug/shapes/avoidance/3d/obstacles_static_edge_pushin_color", Color(1.0, 0.0, 0.0, 1.0));
+	debug_navigation_avoidance_static_obstacle_pushout_face_color = GLOBAL_DEF("debug/shapes/avoidance/3d/obstacles_static_face_pushout_color", Color(1.0, 1.0, 0.0, 0.5));
+	debug_navigation_avoidance_static_obstacle_pushout_edge_color = GLOBAL_DEF("debug/shapes/avoidance/3d/obstacles_static_edge_pushout_color", Color(1.0, 1.0, 0.0, 1.0));
+	debug_navigation_avoidance_enable_agents_radius = GLOBAL_DEF("debug/shapes/avoidance/3d/enable_agents_radius", true);
+	debug_navigation_avoidance_enable_obstacles_radius = GLOBAL_DEF("debug/shapes/avoidance/3d/enable_obstacles_radius", true);
+	debug_navigation_avoidance_enable_obstacles_static = GLOBAL_DEF("debug/shapes/avoidance/3d/enable_obstacles_static", true);
 
 	if (Engine::get_singleton()->is_editor_hint()) {
 		// enable NavigationServer3D when in Editor or else navigation mesh edge connections are invisible
diff --git a/engine/servers/navigation_server_3d.h b/engine/servers/navigation_server_3d.h
index 56792e5b..07fc9c0f 100644
--- a/engine/servers/navigation_server_3d.h
+++ b/engine/servers/navigation_server_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_SERVER_3D_H
-#define NAVIGATION_SERVER_3D_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/templates/rid.h"
@@ -347,7 +346,8 @@ public:
 	/// The result of this process is needed by the physics server,
 	/// so this must be called in the main thread.
 	/// Note: This function is not thread safe.
-	virtual void process(real_t delta_time) = 0;
+	virtual void process(double p_delta_time) = 0;
+	virtual void physics_process(double p_delta_time) = 0;
 	virtual void init() = 0;
 	virtual void sync() = 0;
 	virtual void finish() = 0;
@@ -590,5 +590,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(NavigationServer3D::ProcessInfo);
-
-#endif // NAVIGATION_SERVER_3D_H
diff --git a/engine/servers/navigation_server_3d_dummy.h b/engine/servers/navigation_server_3d_dummy.h
index c3f1420b..43097f01 100644
--- a/engine/servers/navigation_server_3d_dummy.h
+++ b/engine/servers/navigation_server_3d_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef NAVIGATION_SERVER_3D_DUMMY_H
-#define NAVIGATION_SERVER_3D_DUMMY_H
+#pragma once
 
 #include "servers/navigation_server_3d.h"
 
@@ -197,7 +196,8 @@ public:
 
 	void free(RID p_object) override {}
 	void set_active(bool p_active) override {}
-	void process(real_t delta_time) override {}
+	void process(double p_delta_time) override {}
+	void physics_process(double p_delta_time) override {}
 	void init() override {}
 	void sync() override {}
 	void finish() override {}
@@ -207,5 +207,3 @@ public:
 	void set_debug_enabled(bool p_enabled) {}
 	bool get_debug_enabled() const { return false; }
 };
-
-#endif // NAVIGATION_SERVER_3D_DUMMY_H
diff --git a/engine/servers/physics_server_2d.h b/engine/servers/physics_server_2d.h
index 2e7839dd..9c5bb233 100644
--- a/engine/servers/physics_server_2d.h
+++ b/engine/servers/physics_server_2d.h
@@ -28,13 +28,14 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_2D_H
-#define PHYSICS_SERVER_2D_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/object/class_db.h"
 #include "core/object/ref_counted.h"
 
+constexpr int MAX_CONTACTS_REPORTED_2D_MAX = 4096;
+
 class PhysicsDirectSpaceState2D;
 template <typename T>
 class TypedArray;
@@ -845,5 +846,3 @@ VARIANT_ENUM_CAST(PhysicsServer2D::PinJointFlag);
 VARIANT_ENUM_CAST(PhysicsServer2D::DampedSpringParam);
 VARIANT_ENUM_CAST(PhysicsServer2D::AreaBodyStatus);
 VARIANT_ENUM_CAST(PhysicsServer2D::ProcessInfo);
-
-#endif // PHYSICS_SERVER_2D_H
diff --git a/engine/servers/physics_server_2d_dummy.h b/engine/servers/physics_server_2d_dummy.h
index 1f211d7c..71c55cf6 100644
--- a/engine/servers/physics_server_2d_dummy.h
+++ b/engine/servers/physics_server_2d_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_2D_DUMMY_H
-#define PHYSICS_SERVER_2D_DUMMY_H
+#pragma once
 
 #include "physics_server_2d.h"
 
@@ -346,5 +345,3 @@ public:
 
 	virtual int get_process_info(ProcessInfo p_info) override { return 0; }
 };
-
-#endif // PHYSICS_SERVER_2D_DUMMY_H
diff --git a/engine/servers/physics_server_2d_wrap_mt.h b/engine/servers/physics_server_2d_wrap_mt.h
index 5e9d4727..309bc5f4 100644
--- a/engine/servers/physics_server_2d_wrap_mt.h
+++ b/engine/servers/physics_server_2d_wrap_mt.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_2D_WRAP_MT_H
-#define PHYSICS_SERVER_2D_WRAP_MT_H
+#pragma once
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
@@ -338,5 +337,3 @@ public:
 #ifdef DEBUG_ENABLED
 #undef MAIN_THREAD_SYNC_WARN
 #endif
-
-#endif // PHYSICS_SERVER_2D_WRAP_MT_H
diff --git a/engine/servers/physics_server_3d.h b/engine/servers/physics_server_3d.h
index 61e62aed..921b590c 100644
--- a/engine/servers/physics_server_3d.h
+++ b/engine/servers/physics_server_3d.h
@@ -28,14 +28,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_3D_H
-#define PHYSICS_SERVER_3D_H
+#pragma once
 
 #ifndef _3D_DISABLED
 
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
 
+constexpr int MAX_CONTACTS_REPORTED_3D_MAX = 4096;
+
 class PhysicsDirectSpaceState3D;
 template <typename T>
 class TypedArray;
@@ -1056,5 +1057,3 @@ VARIANT_ENUM_CAST(PhysicsServer3D::AreaBodyStatus);
 VARIANT_ENUM_CAST(PhysicsServer3D::ProcessInfo);
 
 #endif // _3D_DISABLED
-
-#endif // PHYSICS_SERVER_3D_H
diff --git a/engine/servers/physics_server_3d_dummy.h b/engine/servers/physics_server_3d_dummy.h
index 209a541f..3867ed40 100644
--- a/engine/servers/physics_server_3d_dummy.h
+++ b/engine/servers/physics_server_3d_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_3D_DUMMY_H
-#define PHYSICS_SERVER_3D_DUMMY_H
+#pragma once
 
 #include "servers/physics_server_3d.h"
 
@@ -432,5 +431,3 @@ public:
 
 	virtual int get_process_info(ProcessInfo p_info) override { return 0; }
 };
-
-#endif // PHYSICS_SERVER_3D_DUMMY_H
diff --git a/engine/servers/physics_server_3d_wrap_mt.h b/engine/servers/physics_server_3d_wrap_mt.h
index 2fd39546..74653dac 100644
--- a/engine/servers/physics_server_3d_wrap_mt.h
+++ b/engine/servers/physics_server_3d_wrap_mt.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PHYSICS_SERVER_3D_WRAP_MT_H
-#define PHYSICS_SERVER_3D_WRAP_MT_H
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "core/object/worker_thread_pool.h"
@@ -414,5 +413,3 @@ public:
 #ifdef DEBUG_ENABLED
 #undef MAIN_THREAD_SYNC_WARN
 #endif
-
-#endif // PHYSICS_SERVER_3D_WRAP_MT_H
diff --git a/engine/servers/register_server_types.cpp b/engine/servers/register_server_types.cpp
index e6326f23..62ae5418 100644
--- a/engine/servers/register_server_types.cpp
+++ b/engine/servers/register_server_types.cpp
@@ -80,17 +80,25 @@
 #include "text_server.h"
 
 // 2D physics and navigation.
+#ifndef NAVIGATION_2D_DISABLED
 #include "navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 #include "physics_server_2d.h"
 #include "physics_server_2d_dummy.h"
 #include "servers/extensions/physics_server_2d_extension.h"
+#endif // PHYSICS_2D_DISABLED
 
-// 3D physics and navigation (3D navigation is needed for 2D).
+// 3D physics and navigation.
+#ifndef NAVIGATION_3D_DISABLED
 #include "navigation_server_3d.h"
-#ifndef _3D_DISABLED
+#endif // NAVIGATION_3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 #include "physics_server_3d.h"
 #include "physics_server_3d_dummy.h"
 #include "servers/extensions/physics_server_3d_extension.h"
+#endif // PHYSICS_3D_DISABLED
+#ifndef XR_DISABLED
 #include "xr/xr_body_tracker.h"
 #include "xr/xr_controller_tracker.h"
 #include "xr/xr_face_tracker.h"
@@ -99,19 +107,21 @@
 #include "xr/xr_interface_extension.h"
 #include "xr/xr_positional_tracker.h"
 #include "xr_server.h"
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 ShaderTypes *shader_types = nullptr;
 
-#ifndef _3D_DISABLED
-static PhysicsServer3D *_create_dummy_physics_server_3d() {
-	return memnew(PhysicsServer3DDummy);
-}
-#endif // _3D_DISABLED
-
+#ifndef PHYSICS_2D_DISABLED
 static PhysicsServer2D *_create_dummy_physics_server_2d() {
 	return memnew(PhysicsServer2DDummy);
 }
+#endif // PHYSICS_2D_DISABLED
+
+#ifndef PHYSICS_3D_DISABLED
+static PhysicsServer3D *_create_dummy_physics_server_3d() {
+	return memnew(PhysicsServer3DDummy);
+}
+#endif // PHYSICS_3D_DISABLED
 
 static bool has_server_feature_callback(const String &p_feature) {
 	if (RenderingServer::get_singleton()) {
@@ -248,6 +258,13 @@ void register_server_types() {
 
 	ServersDebugger::initialize();
 
+#ifndef NAVIGATION_2D_DISABLED
+	GDREGISTER_ABSTRACT_CLASS(NavigationServer2D);
+	GDREGISTER_CLASS(NavigationPathQueryParameters2D);
+	GDREGISTER_CLASS(NavigationPathQueryResult2D);
+#endif // NAVIGATION_2D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
 	// Physics 2D
 	GDREGISTER_CLASS(PhysicsServer2DManager);
 	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer2DManager", PhysicsServer2DManager::get_singleton(), "PhysicsServer2DManager"));
@@ -273,12 +290,15 @@ void register_server_types() {
 	GLOBAL_DEF(PropertyInfo(Variant::STRING, PhysicsServer2DManager::setting_property_name, PROPERTY_HINT_ENUM, "DEFAULT"), "DEFAULT");
 
 	PhysicsServer2DManager::get_singleton()->register_server("Dummy", callable_mp_static(_create_dummy_physics_server_2d));
+#endif // PHYSICS_2D_DISABLED
 
-	GDREGISTER_ABSTRACT_CLASS(NavigationServer2D);
-	GDREGISTER_CLASS(NavigationPathQueryParameters2D);
-	GDREGISTER_CLASS(NavigationPathQueryResult2D);
+#ifndef NAVIGATION_3D_DISABLED
+	GDREGISTER_ABSTRACT_CLASS(NavigationServer3D);
+	GDREGISTER_CLASS(NavigationPathQueryParameters3D);
+	GDREGISTER_CLASS(NavigationPathQueryResult3D);
+#endif // NAVIGATION_3D_DISABLED
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	// Physics 3D
 	GDREGISTER_CLASS(PhysicsServer3DManager);
 	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer3DManager", PhysicsServer3DManager::get_singleton(), "PhysicsServer3DManager"));
@@ -306,7 +326,9 @@ void register_server_types() {
 	GLOBAL_DEF(PropertyInfo(Variant::STRING, PhysicsServer3DManager::setting_property_name, PROPERTY_HINT_ENUM, "DEFAULT"), "DEFAULT");
 
 	PhysicsServer3DManager::get_singleton()->register_server("Dummy", callable_mp_static(_create_dummy_physics_server_3d));
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef XR_DISABLED
 	GDREGISTER_ABSTRACT_CLASS(XRInterface);
 	GDREGISTER_CLASS(XRVRS);
 	GDREGISTER_CLASS(XRBodyTracker);
@@ -318,11 +340,7 @@ void register_server_types() {
 	GDREGISTER_CLASS(XRPositionalTracker);
 	GDREGISTER_CLASS(XRServer);
 	GDREGISTER_ABSTRACT_CLASS(XRTracker);
-#endif // _3D_DISABLED
-
-	GDREGISTER_ABSTRACT_CLASS(NavigationServer3D);
-	GDREGISTER_CLASS(NavigationPathQueryParameters3D);
-	GDREGISTER_CLASS(NavigationPathQueryResult3D);
+#endif // XR_DISABLED
 
 	writer_mjpeg = memnew(MovieWriterMJPEG);
 	MovieWriter::add_writer(writer_mjpeg);
@@ -351,15 +369,22 @@ void register_server_singletons() {
 	Engine::get_singleton()->add_singleton(Engine::Singleton("CameraServer", CameraServer::get_singleton(), "CameraServer"));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("DisplayServer", DisplayServer::get_singleton(), "DisplayServer"));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("NativeMenu", NativeMenu::get_singleton(), "NativeMenu"));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer2D", NavigationServer2D::get_singleton(), "NavigationServer2D"));
-	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer3D", NavigationServer3D::get_singleton(), "NavigationServer3D"));
 	Engine::get_singleton()->add_singleton(Engine::Singleton("RenderingServer", RenderingServer::get_singleton(), "RenderingServer"));
-
+#ifndef NAVIGATION_2D_DISABLED
+	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer2D", NavigationServer2D::get_singleton(), "NavigationServer2D"));
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+	Engine::get_singleton()->add_singleton(Engine::Singleton("NavigationServer3D", NavigationServer3D::get_singleton(), "NavigationServer3D"));
+#endif // NAVIGATION_3D_DISABLED
+#ifndef PHYSICS_2D_DISABLED
 	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer2D", PhysicsServer2D::get_singleton(), "PhysicsServer2D"));
-#ifndef _3D_DISABLED
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	Engine::get_singleton()->add_singleton(Engine::Singleton("PhysicsServer3D", PhysicsServer3D::get_singleton(), "PhysicsServer3D"));
+#endif // PHYSICS_3D_DISABLED
+#ifndef XR_DISABLED
 	Engine::get_singleton()->add_singleton(Engine::Singleton("XRServer", XRServer::get_singleton(), "XRServer"));
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 	OS::get_singleton()->benchmark_end_measure("Servers", "Register Singletons");
 }
diff --git a/engine/servers/register_server_types.h b/engine/servers/register_server_types.h
index 9cf546ba..c78f9bf8 100644
--- a/engine/servers/register_server_types.h
+++ b/engine/servers/register_server_types.h
@@ -28,12 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef REGISTER_SERVER_TYPES_H
-#define REGISTER_SERVER_TYPES_H
+#pragma once
 
 void register_server_types();
 void unregister_server_types();
 
 void register_server_singletons();
-
-#endif // REGISTER_SERVER_TYPES_H
diff --git a/engine/servers/rendering/dummy/environment/fog.h b/engine/servers/rendering/dummy/environment/fog.h
index 10aa2420..792faf2a 100644
--- a/engine/servers/rendering/dummy/environment/fog.h
+++ b/engine/servers/rendering/dummy/environment/fog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FOG_DUMMY_H
-#define FOG_DUMMY_H
+#pragma once
 
 #include "servers/rendering/environment/renderer_fog.h"
 
@@ -51,5 +50,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // FOG_DUMMY_H
diff --git a/engine/servers/rendering/dummy/environment/gi.h b/engine/servers/rendering/dummy/environment/gi.h
index 5d0e84ae..ad549bac 100644
--- a/engine/servers/rendering/dummy/environment/gi.h
+++ b/engine/servers/rendering/dummy/environment/gi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GI_DUMMY_H
-#define GI_DUMMY_H
+#pragma once
 
 #include "servers/rendering/environment/renderer_gi.h"
 
@@ -83,5 +82,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // GI_DUMMY_H
diff --git a/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h b/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h
index 93f51782..80ec9318 100644
--- a/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h
+++ b/engine/servers/rendering/dummy/rasterizer_canvas_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RASTERIZER_CANVAS_DUMMY_H
-#define RASTERIZER_CANVAS_DUMMY_H
+#pragma once
 
 #include "servers/rendering/renderer_canvas_render.h"
 
@@ -61,5 +60,3 @@ public:
 	RasterizerCanvasDummy() {}
 	~RasterizerCanvasDummy() {}
 };
-
-#endif // RASTERIZER_CANVAS_DUMMY_H
diff --git a/engine/servers/rendering/dummy/rasterizer_dummy.h b/engine/servers/rendering/dummy/rasterizer_dummy.h
index 33b4c380..93f0b731 100644
--- a/engine/servers/rendering/dummy/rasterizer_dummy.h
+++ b/engine/servers/rendering/dummy/rasterizer_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RASTERIZER_DUMMY_H
-#define RASTERIZER_DUMMY_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "core/templates/self_list.h"
@@ -88,6 +87,7 @@ public:
 
 	void blit_render_targets_to_screen(int p_screen, const BlitToScreen *p_render_targets, int p_amount) override {}
 
+	bool is_opengl() override { return false; }
 	void gl_end_frame(bool p_swap_buffers) override {}
 
 	void end_frame(bool p_present) override {
@@ -115,5 +115,3 @@ public:
 	RasterizerDummy() {}
 	~RasterizerDummy() {}
 };
-
-#endif // RASTERIZER_DUMMY_H
diff --git a/engine/servers/rendering/dummy/rasterizer_scene_dummy.h b/engine/servers/rendering/dummy/rasterizer_scene_dummy.h
index 9cf2134d..7f42662e 100644
--- a/engine/servers/rendering/dummy/rasterizer_scene_dummy.h
+++ b/engine/servers/rendering/dummy/rasterizer_scene_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RASTERIZER_SCENE_DUMMY_H
-#define RASTERIZER_SCENE_DUMMY_H
+#pragma once
 
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/renderer_scene_render.h"
@@ -197,5 +196,3 @@ public:
 	RasterizerSceneDummy() {}
 	~RasterizerSceneDummy() {}
 };
-
-#endif // RASTERIZER_SCENE_DUMMY_H
diff --git a/engine/servers/rendering/dummy/storage/light_storage.h b/engine/servers/rendering/dummy/storage/light_storage.h
index 5f67578d..f4154024 100644
--- a/engine/servers/rendering/dummy/storage/light_storage.h
+++ b/engine/servers/rendering/dummy/storage/light_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_STORAGE_DUMMY_H
-#define LIGHT_STORAGE_DUMMY_H
+#pragma once
 
 #include "servers/rendering/storage/light_storage.h"
 
@@ -219,5 +218,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // LIGHT_STORAGE_DUMMY_H
diff --git a/engine/servers/rendering/dummy/storage/material_storage.cpp b/engine/servers/rendering/dummy/storage/material_storage.cpp
index b22971a7..e70ff0fd 100644
--- a/engine/servers/rendering/dummy/storage/material_storage.cpp
+++ b/engine/servers/rendering/dummy/storage/material_storage.cpp
@@ -85,7 +85,7 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 
 	for (const PropertyInfo &E : settings) {
 		if (E.name.begins_with("shader_globals/")) {
-			StringName name = E.name.get_slice("/", 1);
+			StringName name = E.name.get_slicec('/', 1);
 			Dictionary d = GLOBAL_GET(E.name);
 
 			ERR_CONTINUE(!d.has("type"));
diff --git a/engine/servers/rendering/dummy/storage/material_storage.h b/engine/servers/rendering/dummy/storage/material_storage.h
index ef46cf3b..33b7d770 100644
--- a/engine/servers/rendering/dummy/storage/material_storage.h
+++ b/engine/servers/rendering/dummy/storage/material_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATERIAL_STORAGE_DUMMY_H
-#define MATERIAL_STORAGE_DUMMY_H
+#pragma once
 
 #include "servers/rendering/shader_compiler.h"
 #include "servers/rendering/shader_language.h"
@@ -128,5 +127,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // MATERIAL_STORAGE_DUMMY_H
diff --git a/engine/servers/rendering/dummy/storage/mesh_storage.h b/engine/servers/rendering/dummy/storage/mesh_storage.h
index 4d43927e..461e3dd8 100644
--- a/engine/servers/rendering/dummy/storage/mesh_storage.h
+++ b/engine/servers/rendering/dummy/storage/mesh_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_STORAGE_DUMMY_H
-#define MESH_STORAGE_DUMMY_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/storage/mesh_storage.h"
@@ -203,5 +202,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // MESH_STORAGE_DUMMY_H
diff --git a/engine/servers/rendering/dummy/storage/particles_storage.h b/engine/servers/rendering/dummy/storage/particles_storage.h
index 1b55b2af..a11f25e3 100644
--- a/engine/servers/rendering/dummy/storage/particles_storage.h
+++ b/engine/servers/rendering/dummy/storage/particles_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLES_STORAGE_DUMMY_H
-#define PARTICLES_STORAGE_DUMMY_H
+#pragma once
 
 #include "servers/rendering/storage/particles_storage.h"
 
@@ -126,5 +125,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // PARTICLES_STORAGE_DUMMY_H
diff --git a/engine/servers/rendering/dummy/storage/texture_storage.h b/engine/servers/rendering/dummy/storage/texture_storage.h
index bbdb328d..973bd7a7 100644
--- a/engine/servers/rendering/dummy/storage/texture_storage.h
+++ b/engine/servers/rendering/dummy/storage/texture_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_STORAGE_DUMMY_H
-#define TEXTURE_STORAGE_DUMMY_H
+#pragma once
 
 #include "servers/rendering/storage/texture_storage.h"
 
@@ -215,5 +214,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // TEXTURE_STORAGE_DUMMY_H
diff --git a/engine/servers/rendering/dummy/storage/utilities.h b/engine/servers/rendering/dummy/storage/utilities.h
index d9c4d34d..d8862cdb 100644
--- a/engine/servers/rendering/dummy/storage/utilities.h
+++ b/engine/servers/rendering/dummy/storage/utilities.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UTILITIES_DUMMY_H
-#define UTILITIES_DUMMY_H
+#pragma once
 
 #include "servers/rendering/storage/utilities.h"
 
@@ -99,5 +98,3 @@ public:
 };
 
 } // namespace RendererDummy
-
-#endif // UTILITIES_DUMMY_H
diff --git a/engine/servers/rendering/environment/renderer_fog.h b/engine/servers/rendering/environment/renderer_fog.h
index f5c4134d..753bd615 100644
--- a/engine/servers/rendering/environment/renderer_fog.h
+++ b/engine/servers/rendering/environment/renderer_fog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_FOG_H
-#define RENDERER_FOG_H
+#pragma once
 
 #include "servers/rendering_server.h"
 
@@ -49,5 +48,3 @@ public:
 	virtual AABB fog_volume_get_aabb(RID p_fog_volume) const = 0;
 	virtual RS::FogVolumeShape fog_volume_get_shape(RID p_fog_volume) const = 0;
 };
-
-#endif // RENDERER_FOG_H
diff --git a/engine/servers/rendering/environment/renderer_gi.h b/engine/servers/rendering/environment/renderer_gi.h
index 94e2c1af..5dfef0c6 100644
--- a/engine/servers/rendering/environment/renderer_gi.h
+++ b/engine/servers/rendering/environment/renderer_gi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_GI_H
-#define RENDERER_GI_H
+#pragma once
 
 #include "servers/rendering_server.h"
 
@@ -82,5 +81,3 @@ public:
 
 	virtual void sdfgi_reset() = 0;
 };
-
-#endif // RENDERER_GI_H
diff --git a/engine/servers/rendering/instance_uniforms.h b/engine/servers/rendering/instance_uniforms.h
index 76848168..4682c311 100644
--- a/engine/servers/rendering/instance_uniforms.h
+++ b/engine/servers/rendering/instance_uniforms.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef INSTANCE_UNIFORMS_H
-#define INSTANCE_UNIFORMS_H
+#pragma once
 
 #include "core/variant/variant.h"
 #include "servers/rendering/storage/material_storage.h"
@@ -69,5 +68,3 @@ private:
 	void _init_param(Item &r_item, const RendererMaterialStorage::InstanceShaderParam &p_param) const;
 	void _invalidate_items();
 };
-
-#endif // INSTANCE_UNIFORMS_H
diff --git a/engine/servers/rendering/renderer_canvas_cull.cpp b/engine/servers/rendering/renderer_canvas_cull.cpp
index 4b02aa4e..03c347c3 100644
--- a/engine/servers/rendering/renderer_canvas_cull.cpp
+++ b/engine/servers/rendering/renderer_canvas_cull.cpp
@@ -1440,7 +1440,7 @@ void RendererCanvasCull::canvas_item_add_circle(RID p_item, const Point2 &p_pos,
 		// Store circle center in the last point.
 		points_ptr[circle_segments + 1] = p_pos;
 
-		const real_t circle_point_step = Math_TAU / circle_segments;
+		const real_t circle_point_step = Math::TAU / circle_segments;
 
 		for (int i = 0; i < circle_segments + 1; i++) {
 			float angle = i * circle_point_step;
@@ -1484,7 +1484,7 @@ void RendererCanvasCull::canvas_item_add_circle(RID p_item, const Point2 &p_pos,
 		points.resize(2 * circle_segments + 2);
 		colors.resize(2 * circle_segments + 2);
 
-		const real_t circle_point_step = Math_TAU / circle_segments;
+		const real_t circle_point_step = Math::TAU / circle_segments;
 
 		Vector2 *points_ptr = points.ptrw();
 		Color *colors_ptr = colors.ptrw();
@@ -1522,7 +1522,7 @@ void RendererCanvasCull::canvas_item_add_texture_rect(RID p_item, const Rect2 &p
 	if (p_tile) {
 		rect->flags |= RendererCanvasRender::CANVAS_RECT_TILE;
 		rect->flags |= RendererCanvasRender::CANVAS_RECT_REGION;
-		rect->source = Rect2(0, 0, ABS(p_rect.size.width), ABS(p_rect.size.height));
+		rect->source = Rect2(0, 0, Math::abs(p_rect.size.width), Math::abs(p_rect.size.height));
 	}
 
 	if (p_rect.size.x < 0) {
diff --git a/engine/servers/rendering/renderer_canvas_cull.h b/engine/servers/rendering/renderer_canvas_cull.h
index 167ae792..e2024b36 100644
--- a/engine/servers/rendering/renderer_canvas_cull.h
+++ b/engine/servers/rendering/renderer_canvas_cull.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_CANVAS_CULL_H
-#define RENDERER_CANVAS_CULL_H
+#pragma once
 
 #include "core/templates/paged_allocator.h"
 #include "renderer_compositor.h"
@@ -412,5 +411,3 @@ public:
 	RendererCanvasCull();
 	~RendererCanvasCull();
 };
-
-#endif // RENDERER_CANVAS_CULL_H
diff --git a/engine/servers/rendering/renderer_canvas_render.h b/engine/servers/rendering/renderer_canvas_render.h
index ef98af8f..cd15c6f4 100644
--- a/engine/servers/rendering/renderer_canvas_render.h
+++ b/engine/servers/rendering/renderer_canvas_render.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_CANVAS_RENDER_H
-#define RENDERER_CANVAS_RENDER_H
+#pragma once
 
 #include "servers/rendering/rendering_method.h"
 #include "servers/rendering_server.h"
@@ -557,5 +556,3 @@ public:
 		singleton = nullptr;
 	}
 };
-
-#endif // RENDERER_CANVAS_RENDER_H
diff --git a/engine/servers/rendering/renderer_compositor.cpp b/engine/servers/rendering/renderer_compositor.cpp
index 428cecea..b9922009 100644
--- a/engine/servers/rendering/renderer_compositor.cpp
+++ b/engine/servers/rendering/renderer_compositor.cpp
@@ -31,7 +31,10 @@
 #include "renderer_compositor.h"
 
 #include "core/config/project_settings.h"
+
+#ifndef XR_DISABLED
 #include "servers/xr_server.h"
+#endif // XR_DISABLED
 
 RendererCompositor *RendererCompositor::singleton = nullptr;
 
@@ -50,13 +53,13 @@ RendererCompositor::RendererCompositor() {
 	ERR_FAIL_COND_MSG(singleton != nullptr, "A RendererCompositor singleton already exists.");
 	singleton = this;
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	if (XRServer::get_xr_mode() == XRServer::XRMODE_DEFAULT) {
 		xr_enabled = GLOBAL_GET("xr/shaders/enabled");
 	} else {
 		xr_enabled = XRServer::get_xr_mode() == XRServer::XRMODE_ON;
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 }
 
 RendererCompositor::~RendererCompositor() {
diff --git a/engine/servers/rendering/renderer_compositor.h b/engine/servers/rendering/renderer_compositor.h
index ac23172a..c5819bb2 100644
--- a/engine/servers/rendering/renderer_compositor.h
+++ b/engine/servers/rendering/renderer_compositor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_COMPOSITOR_H
-#define RENDERER_COMPOSITOR_H
+#pragma once
 
 #include "servers/rendering/environment/renderer_fog.h"
 #include "servers/rendering/environment/renderer_gi.h"
@@ -95,6 +94,7 @@ public:
 
 	virtual void blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount) = 0;
 
+	virtual bool is_opengl() = 0;
 	virtual void gl_end_frame(bool p_swap_buffers) = 0;
 	virtual void end_frame(bool p_present) = 0;
 	virtual void finalize() = 0;
@@ -110,5 +110,3 @@ public:
 	RendererCompositor();
 	virtual ~RendererCompositor();
 };
-
-#endif // RENDERER_COMPOSITOR_H
diff --git a/engine/servers/rendering/renderer_geometry_instance.h b/engine/servers/rendering/renderer_geometry_instance.h
index 98238951..94b66829 100644
--- a/engine/servers/rendering/renderer_geometry_instance.h
+++ b/engine/servers/rendering/renderer_geometry_instance.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_GEOMETRY_INSTANCE_H
-#define RENDERER_GEOMETRY_INSTANCE_H
+#pragma once
 
 #include "core/math/rect2.h"
 #include "core/math/transform_3d.h"
@@ -149,5 +148,3 @@ public:
 	virtual Transform3D get_transform() override;
 	virtual AABB get_aabb() override;
 };
-
-#endif // RENDERER_GEOMETRY_INSTANCE_H
diff --git a/engine/servers/rendering/renderer_rd/cluster_builder_rd.h b/engine/servers/rendering/renderer_rd/cluster_builder_rd.h
index 0e85fcb7..3f3d1a3b 100644
--- a/engine/servers/rendering/renderer_rd/cluster_builder_rd.h
+++ b/engine/servers/rendering/renderer_rd/cluster_builder_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CLUSTER_BUILDER_RD_H
-#define CLUSTER_BUILDER_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/shaders/cluster_debug.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/cluster_render.glsl.gen.h"
@@ -392,5 +391,3 @@ public:
 	ClusterBuilderRD();
 	~ClusterBuilderRD();
 };
-
-#endif // CLUSTER_BUILDER_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/SCsub b/engine/servers/rendering/renderer_rd/effects/SCsub
index 25edf518..c6009951 100644
--- a/engine/servers/rendering/renderer_rd/effects/SCsub
+++ b/engine/servers/rendering/renderer_rd/effects/SCsub
@@ -13,7 +13,7 @@ thirdparty_dir = "#thirdparty/amd-fsr2/"
 thirdparty_sources = ["ffx_assert.cpp", "ffx_fsr2.cpp"]
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-env_effects.Prepend(CPPPATH=[thirdparty_dir])
+env_effects.Prepend(CPPEXTPATH=[thirdparty_dir])
 
 # This flag doesn't actually control anything GCC specific in FSR2. It determines
 # if symbols should be exported, which is not required for Godot.
diff --git a/engine/servers/rendering/renderer_rd/effects/bokeh_dof.h b/engine/servers/rendering/renderer_rd/effects/bokeh_dof.h
index 32122505..194b8427 100644
--- a/engine/servers/rendering/renderer_rd/effects/bokeh_dof.h
+++ b/engine/servers/rendering/renderer_rd/effects/bokeh_dof.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef BOKEH_DOF_RD_H
-#define BOKEH_DOF_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/bokeh_dof.glsl.gen.h"
@@ -118,5 +117,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // BOKEH_DOF_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/copy_effects.h b/engine/servers/rendering/renderer_rd/effects/copy_effects.h
index b6fc95d0..caf0e846 100644
--- a/engine/servers/rendering/renderer_rd/effects/copy_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/copy_effects.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COPY_EFFECTS_RD_H
-#define COPY_EFFECTS_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/blur_raster.glsl.gen.h"
@@ -358,5 +357,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // COPY_EFFECTS_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/debug_effects.h b/engine/servers/rendering/renderer_rd/effects/debug_effects.h
index b17b59da..40ebdd96 100644
--- a/engine/servers/rendering/renderer_rd/effects/debug_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/debug_effects.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DEBUG_EFFECTS_RD_H
-#define DEBUG_EFFECTS_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/motion_vectors.glsl.gen.h"
@@ -94,5 +93,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // DEBUG_EFFECTS_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/fsr.h b/engine/servers/rendering/renderer_rd/effects/fsr.h
index a6962db8..dcb4a134 100644
--- a/engine/servers/rendering/renderer_rd/effects/fsr.h
+++ b/engine/servers/rendering/renderer_rd/effects/fsr.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FSR_RD_H
-#define FSR_RD_H
+#pragma once
 
 #include "spatial_upscaler.h"
 
@@ -71,5 +70,3 @@ private:
 };
 
 } // namespace RendererRD
-
-#endif // FSR_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/fsr2.h b/engine/servers/rendering/renderer_rd/effects/fsr2.h
index 789714cc..6554588d 100644
--- a/engine/servers/rendering/renderer_rd/effects/fsr2.h
+++ b/engine/servers/rendering/renderer_rd/effects/fsr2.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FSR2_RD_H
-#define FSR2_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/shaders/effects/fsr2/fsr2_accumulate_pass.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/fsr2/fsr2_autogen_reactive_pass.glsl.gen.h"
@@ -195,5 +194,3 @@ private:
 };
 
 } // namespace RendererRD
-
-#endif // FSR2_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/luminance.cpp b/engine/servers/rendering/renderer_rd/effects/luminance.cpp
index 4727e8fd..ab3ddb67 100644
--- a/engine/servers/rendering/renderer_rd/effects/luminance.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/luminance.cpp
@@ -102,9 +102,10 @@ void Luminance::LuminanceBuffers::configure(RenderSceneBuffersRD *p_render_buffe
 			tf.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT;
 		} else {
 			tf.usage_bits = RD::TEXTURE_USAGE_STORAGE_BIT;
-			if (final) {
-				tf.usage_bits |= RD::TEXTURE_USAGE_SAMPLING_BIT;
-			}
+		}
+
+		if (final) {
+			tf.usage_bits |= RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_COPY_TO_BIT;
 		}
 
 		RID texture = RD::get_singleton()->texture_create(tf, RD::TextureView());
@@ -112,6 +113,7 @@ void Luminance::LuminanceBuffers::configure(RenderSceneBuffersRD *p_render_buffe
 
 		if (final) {
 			current = RD::get_singleton()->texture_create(tf, RD::TextureView());
+			RD::get_singleton()->texture_clear(current, Color(0.0, 0.0, 0.0), 0u, 1u, 0u, 1u);
 			break;
 		}
 	}
diff --git a/engine/servers/rendering/renderer_rd/effects/luminance.h b/engine/servers/rendering/renderer_rd/effects/luminance.h
index ad69e32d..31e1fd00 100644
--- a/engine/servers/rendering/renderer_rd/effects/luminance.h
+++ b/engine/servers/rendering/renderer_rd/effects/luminance.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LUMINANCE_RD_H
-#define LUMINANCE_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/luminance_reduce.glsl.gen.h"
@@ -113,5 +112,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // LUMINANCE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/metal_fx.h b/engine/servers/rendering/renderer_rd/effects/metal_fx.h
index 31a54850..341ecd1f 100644
--- a/engine/servers/rendering/renderer_rd/effects/metal_fx.h
+++ b/engine/servers/rendering/renderer_rd/effects/metal_fx.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef METAL_FX_RD_H
-#define METAL_FX_RD_H
+#pragma once
 
 #ifdef METAL_ENABLED
 
@@ -178,5 +177,3 @@ public:
 } //namespace RendererRD
 
 #endif // METAL_ENABLED
-
-#endif // METAL_FX_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/metal_fx.mm b/engine/servers/rendering/renderer_rd/effects/metal_fx.mm
index e2273d44..c3c81937 100644
--- a/engine/servers/rendering/renderer_rd/effects/metal_fx.mm
+++ b/engine/servers/rendering/renderer_rd/effects/metal_fx.mm
@@ -51,8 +51,7 @@ MFXSpatialEffect::~MFXSpatialEffect() {
 }
 
 void MFXSpatialEffect::callback(RDD *p_driver, RDD::CommandBufferID p_command_buffer, CallbackArgs *p_userdata) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 
 	MDCommandBuffer *obj = (MDCommandBuffer *)(p_command_buffer.id);
 	obj->end();
@@ -73,7 +72,7 @@ void MFXSpatialEffect::callback(RDD *p_driver, RDD::CommandBufferID p_command_bu
 
 	CallbackArgs::free(&p_userdata);
 
-#pragma clang diagnostic pop
+	GODOT_CLANG_WARNING_POP
 }
 
 void MFXSpatialEffect::ensure_context(Ref<RenderSceneBuffersRD> p_render_buffers) {
@@ -99,8 +98,7 @@ void MFXSpatialEffect::process(Ref<RenderSceneBuffersRD> p_render_buffers, RID p
 MFXSpatialContext *MFXSpatialEffect::create_context(CreateParams p_params) const {
 	DEV_ASSERT(RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL));
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 
 	RenderingDeviceDriverMetal *rdd = (RenderingDeviceDriverMetal *)RD::get_singleton()->get_device_driver();
 	PixelFormats &pf = rdd->get_pixel_formats();
@@ -120,7 +118,7 @@ MFXSpatialContext *MFXSpatialEffect::create_context(CreateParams p_params) const
 	MFXSpatialContext *context = memnew(MFXSpatialContext);
 	context->scaler = scaler;
 
-#pragma clang diagnostic pop
+	GODOT_CLANG_WARNING_POP
 
 	return context;
 }
@@ -135,8 +133,7 @@ MFXTemporalEffect::~MFXTemporalEffect() {}
 MFXTemporalContext *MFXTemporalEffect::create_context(CreateParams p_params) const {
 	DEV_ASSERT(RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_TEMPORAL));
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 
 	RenderingDeviceDriverMetal *rdd = (RenderingDeviceDriverMetal *)RD::get_singleton()->get_device_driver();
 	PixelFormats &pf = rdd->get_pixel_formats();
@@ -164,7 +161,7 @@ MFXTemporalContext *MFXTemporalEffect::create_context(CreateParams p_params) con
 	scaler.motionVectorScaleY = p_params.motion_vector_scale.y;
 	scaler.depthReversed = true; // Godot uses reverse Z per https://github.com/godotengine/godot/pull/88328
 
-#pragma clang diagnostic pop
+	GODOT_CLANG_WARNING_POP
 
 	return context;
 }
@@ -189,8 +186,7 @@ void MFXTemporalEffect::process(RendererRD::MFXTemporalContext *p_ctx, RendererR
 }
 
 void MFXTemporalEffect::callback(RDD *p_driver, RDD::CommandBufferID p_command_buffer, CallbackArgs *p_userdata) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
+	GODOT_CLANG_WARNING_PUSH_AND_IGNORE("-Wunguarded-availability")
 
 	MDCommandBuffer *obj = (MDCommandBuffer *)(p_command_buffer.id);
 	obj->end();
@@ -221,5 +217,5 @@ void MFXTemporalEffect::callback(RDD *p_driver, RDD::CommandBufferID p_command_b
 
 	CallbackArgs::free(&p_userdata);
 
-#pragma clang diagnostic pop
+	GODOT_CLANG_WARNING_POP
 }
diff --git a/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h b/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h
index 19b3360a..dd0075f2 100644
--- a/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h
+++ b/engine/servers/rendering/renderer_rd/effects/motion_vectors_store.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MOTION_VECTORS_STORE_RD_H
-#define MOTION_VECTORS_STORE_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/motion_vectors_store.glsl.gen.h"
@@ -58,5 +57,3 @@ public:
 			const Projection &p_previous_projection, const Transform3D &p_previous_transform);
 };
 } //namespace RendererRD
-
-#endif // MOTION_VECTORS_STORE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/resolve.h b/engine/servers/rendering/renderer_rd/effects/resolve.h
index b24fa64b..dea47fa8 100644
--- a/engine/servers/rendering/renderer_rd/effects/resolve.h
+++ b/engine/servers/rendering/renderer_rd/effects/resolve.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RESOLVE_RD_H
-#define RESOLVE_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/shaders/effects/resolve.glsl.gen.h"
 
@@ -66,5 +65,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // RESOLVE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/roughness_limiter.h b/engine/servers/rendering/renderer_rd/effects/roughness_limiter.h
index 86bbfc56..5b261c2b 100644
--- a/engine/servers/rendering/renderer_rd/effects/roughness_limiter.h
+++ b/engine/servers/rendering/renderer_rd/effects/roughness_limiter.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ROUGHNESS_LIMITER_RD_H
-#define ROUGHNESS_LIMITER_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/shaders/effects/roughness_limiter.glsl.gen.h"
 
@@ -59,5 +58,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // ROUGHNESS_LIMITER_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/sort_effects.h b/engine/servers/rendering/renderer_rd/effects/sort_effects.h
index 827f2e56..fce5e8ee 100644
--- a/engine/servers/rendering/renderer_rd/effects/sort_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/sort_effects.h
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SORT_EFFECTS_RD_H
-#define SORT_EFFECTS_RD_H
+#pragma once
 
+#include "servers/rendering/renderer_rd/shader_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/sort.glsl.gen.h"
 
 namespace RendererRD {
@@ -63,5 +63,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // SORT_EFFECTS_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/spatial_upscaler.h b/engine/servers/rendering/renderer_rd/effects/spatial_upscaler.h
index c472e63b..3bc1631e 100644
--- a/engine/servers/rendering/renderer_rd/effects/spatial_upscaler.h
+++ b/engine/servers/rendering/renderer_rd/effects/spatial_upscaler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SPATIAL_UPSCALER_RD_H
-#define SPATIAL_UPSCALER_RD_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -44,5 +43,3 @@ public:
 	SpatialUpscaler() = default;
 	virtual ~SpatialUpscaler() = default;
 };
-
-#endif // SPATIAL_UPSCALER_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp b/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp
index 8e63c5d7..63809778 100644
--- a/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/ss_effects.cpp
@@ -81,7 +81,7 @@ SSEffects::SSEffects() {
 				int b = spmap[subPass];
 
 				float ca, sa;
-				float angle0 = (float(a) + float(b) / float(sub_pass_count)) * Math_PI * 0.5f;
+				float angle0 = (float(a) + float(b) / float(sub_pass_count)) * Math::PI * 0.5f;
 
 				ca = Math::cos(angle0);
 				sa = Math::sin(angle0);
@@ -706,7 +706,7 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 			}
 		}
 		radius_near_limit /= tan_half_fov_y;
-		ssil.gather_push_constant.intensity = p_settings.intensity * Math_PI;
+		ssil.gather_push_constant.intensity = p_settings.intensity * Math::PI;
 		ssil.gather_push_constant.fade_out_mul = -1.0 / (ssil_fadeout_to - ssil_fadeout_from);
 		ssil.gather_push_constant.fade_out_add = ssil_fadeout_from / (ssil_fadeout_to - ssil_fadeout_from) + 1.0;
 		ssil.gather_push_constant.inv_radius_near_limit = 1.0f / radius_near_limit;
@@ -788,7 +788,7 @@ void SSEffects::screen_space_indirect_lighting(Ref<RenderSceneBuffersRD> p_rende
 			RD::get_singleton()->draw_command_begin_label("Generate Importance Map");
 			ssil.importance_map_push_constant.half_screen_pixel_size[0] = 1.0 / p_ssil_buffers.buffer_width;
 			ssil.importance_map_push_constant.half_screen_pixel_size[1] = 1.0 / p_ssil_buffers.buffer_height;
-			ssil.importance_map_push_constant.intensity = p_settings.intensity * Math_PI;
+			ssil.importance_map_push_constant.intensity = p_settings.intensity * Math::PI;
 
 			//base pass
 			RD::get_singleton()->compute_list_bind_compute_pipeline(compute_list, ssil.pipelines[SSIL_GATHER_BASE]);
diff --git a/engine/servers/rendering/renderer_rd/effects/ss_effects.h b/engine/servers/rendering/renderer_rd/effects/ss_effects.h
index 4611baff..9843683b 100644
--- a/engine/servers/rendering/renderer_rd/effects/ss_effects.h
+++ b/engine/servers/rendering/renderer_rd/effects/ss_effects.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SS_EFFECTS_RD_H
-#define SS_EFFECTS_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/shaders/effects/screen_space_reflection.glsl.gen.h"
 #include "servers/rendering/renderer_rd/shaders/effects/screen_space_reflection_filter.glsl.gen.h"
@@ -527,5 +526,3 @@ private:
 };
 
 } // namespace RendererRD
-
-#endif // SS_EFFECTS_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/taa.h b/engine/servers/rendering/renderer_rd/effects/taa.h
index 7c77f072..eb7203e2 100644
--- a/engine/servers/rendering/renderer_rd/effects/taa.h
+++ b/engine/servers/rendering/renderer_rd/effects/taa.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TAA_RD_H
-#define TAA_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/shaders/effects/taa_resolve.glsl.gen.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
@@ -59,5 +58,3 @@ private:
 };
 
 } // namespace RendererRD
-
-#endif // TAA_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/tone_mapper.h b/engine/servers/rendering/renderer_rd/effects/tone_mapper.h
index 92297d80..309fbd62 100644
--- a/engine/servers/rendering/renderer_rd/effects/tone_mapper.h
+++ b/engine/servers/rendering/renderer_rd/effects/tone_mapper.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TONE_MAPPER_RD_H
-#define TONE_MAPPER_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/tonemap.glsl.gen.h"
@@ -154,5 +153,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // TONE_MAPPER_RD_H
diff --git a/engine/servers/rendering/renderer_rd/effects/vrs.cpp b/engine/servers/rendering/renderer_rd/effects/vrs.cpp
index 9cc22f6f..142eebab 100644
--- a/engine/servers/rendering/renderer_rd/effects/vrs.cpp
+++ b/engine/servers/rendering/renderer_rd/effects/vrs.cpp
@@ -33,9 +33,9 @@
 #include "../storage_rd/texture_storage.h"
 #include "../uniform_set_cache_rd.h"
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 #include "servers/xr_server.h"
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 using namespace RendererRD;
 
@@ -44,6 +44,8 @@ VRS::VRS() {
 		Vector<String> vrs_modes;
 		vrs_modes.push_back("\n"); // VRS_DEFAULT
 		vrs_modes.push_back("\n#define USE_MULTIVIEW\n"); // VRS_MULTIVIEW
+		vrs_modes.push_back("\n#define SPLIT_RG\n"); // VRS_RG
+		vrs_modes.push_back("\n#define SPLIT_RG\n#define USE_MULTIVIEW\n"); // VRS_RG_MULTIVIEW
 
 		vrs_shader.shader.initialize(vrs_modes);
 
@@ -80,14 +82,16 @@ void VRS::copy_vrs(RID p_source_rd_texture, RID p_dest_framebuffer, bool p_multi
 
 	RD::Uniform u_source_rd_texture(RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE, 0, Vector<RID>({ default_sampler, p_source_rd_texture }));
 
+	int mode = 0;
 	VRSPushConstant push_constant = {};
-
-	int mode = p_multiview ? VRS_MULTIVIEW : VRS_DEFAULT;
-
-	// Set maximum texel factor based on maximum fragment size, some GPUs do not support 8x8 (fragment shading rate approach).
-	if (MIN(RD::get_singleton()->limit_get(RD::LIMIT_VRS_MAX_FRAGMENT_WIDTH), RD::get_singleton()->limit_get(RD::LIMIT_VRS_MAX_FRAGMENT_HEIGHT)) > 4) {
-		push_constant.max_texel_factor = 3.0;
+	bool uses_rg_format = RD::get_singleton()->vrs_get_format() == RD::DATA_FORMAT_R8G8_UNORM;
+	if (uses_rg_format) {
+		mode = p_multiview ? VRS_RG_MULTIVIEW : VRS_RG;
 	} else {
+		mode = p_multiview ? VRS_MULTIVIEW : VRS_DEFAULT;
+
+		// Default to 4x4 as it's not possible to query the max fragment size from RenderingDevice. This can be improved to use the largest size
+		// available if this code is moved over to RenderingDevice at some point.
 		push_constant.max_texel_factor = 2.0;
 	}
 
@@ -103,18 +107,8 @@ void VRS::copy_vrs(RID p_source_rd_texture, RID p_dest_framebuffer, bool p_multi
 }
 
 Size2i VRS::get_vrs_texture_size(const Size2i p_base_size) const {
-	int32_t texel_width = RD::get_singleton()->limit_get(RD::LIMIT_VRS_TEXEL_WIDTH);
-	int32_t texel_height = RD::get_singleton()->limit_get(RD::LIMIT_VRS_TEXEL_HEIGHT);
-
-	int width = p_base_size.x / texel_width;
-	if (p_base_size.x % texel_width != 0) {
-		width++;
-	}
-	int height = p_base_size.y / texel_height;
-	if (p_base_size.y % texel_height != 0) {
-		height++;
-	}
-	return Size2i(width, height);
+	Size2i vrs_texel_size = RD::get_singleton()->vrs_get_texel_size();
+	return Size2i((p_base_size.x + vrs_texel_size.x - 1) / vrs_texel_size.x, (p_base_size.y + vrs_texel_size.y - 1) / vrs_texel_size.y);
 }
 
 void VRS::update_vrs_texture(RID p_vrs_fb, RID p_render_target) {
@@ -135,7 +129,7 @@ void VRS::update_vrs_texture(RID p_vrs_fb, RID p_render_target) {
 					copy_vrs(rd_texture, p_vrs_fb, layers > 1);
 				}
 			}
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 		} else if (vrs_mode == RS::VIEWPORT_VRS_XR) {
 			Ref<XRInterface> interface = XRServer::get_singleton()->get_primary_interface();
 			if (interface.is_valid()) {
@@ -150,7 +144,7 @@ void VRS::update_vrs_texture(RID p_vrs_fb, RID p_render_target) {
 					}
 				}
 			}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 		}
 
 		if (vrs_update_mode == RS::VIEWPORT_VRS_UPDATE_ONCE) {
diff --git a/engine/servers/rendering/renderer_rd/effects/vrs.h b/engine/servers/rendering/renderer_rd/effects/vrs.h
index bac86898..574f1353 100644
--- a/engine/servers/rendering/renderer_rd/effects/vrs.h
+++ b/engine/servers/rendering/renderer_rd/effects/vrs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VRS_RD_H
-#define VRS_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/pipeline_cache_rd.h"
 #include "servers/rendering/renderer_rd/shaders/effects/vrs.glsl.gen.h"
@@ -41,6 +40,8 @@ private:
 	enum VRSMode {
 		VRS_DEFAULT,
 		VRS_MULTIVIEW,
+		VRS_RG,
+		VRS_RG_MULTIVIEW,
 		VRS_MAX,
 	};
 
@@ -69,5 +70,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // VRS_RD_H
diff --git a/engine/servers/rendering/renderer_rd/environment/fog.cpp b/engine/servers/rendering/renderer_rd/environment/fog.cpp
index b6a96b02..b451f67a 100644
--- a/engine/servers/rendering/renderer_rd/environment/fog.cpp
+++ b/engine/servers/rendering/renderer_rd/environment/fog.cpp
@@ -205,9 +205,9 @@ void Fog::init_fog_shader(uint32_t p_max_directional_lights, int p_roughness_lay
 		ShaderCompiler::DefaultIdentifierActions actions;
 
 		actions.renames["TIME"] = "scene_params.time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["WORLD_POSITION"] = "world.xyz";
 		actions.renames["OBJECT_POSITION"] = "params.position";
 		actions.renames["UVW"] = "uvw";
@@ -437,8 +437,7 @@ void Fog::VolumetricFog::init(const Vector3i &fog_size, RID p_sky_shader) {
 
 #if defined(MACOS_ENABLED) || defined(IOS_ENABLED)
 	Vector<uint8_t> dm;
-	dm.resize(fog_size.x * fog_size.y * fog_size.z * 4);
-	dm.fill(0);
+	dm.resize_zeroed(fog_size.x * fog_size.y * fog_size.z * 4);
 
 	density_map = RD::get_singleton()->storage_buffer_create(dm.size(), dm);
 	RD::get_singleton()->set_resource_name(density_map, "Fog density map");
diff --git a/engine/servers/rendering/renderer_rd/environment/fog.h b/engine/servers/rendering/renderer_rd/environment/fog.h
index 23de97a2..a7ddee4f 100644
--- a/engine/servers/rendering/renderer_rd/environment/fog.h
+++ b/engine/servers/rendering/renderer_rd/environment/fog.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FOG_RD_H
-#define FOG_RD_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
@@ -355,5 +354,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // FOG_RD_H
diff --git a/engine/servers/rendering/renderer_rd/environment/gi.cpp b/engine/servers/rendering/renderer_rd/environment/gi.cpp
index 14bc61ed..b6a63775 100644
--- a/engine/servers/rendering/renderer_rd/environment/gi.cpp
+++ b/engine/servers/rendering/renderer_rd/environment/gi.cpp
@@ -1214,7 +1214,7 @@ void GI::SDFGI::update(RID p_env, const Vector3 &p_world_position) {
 
 			if (cascade.dirty_regions[j] == 0) {
 				continue; // not dirty
-			} else if (uint32_t(ABS(cascade.dirty_regions[j])) >= cascade_size) {
+			} else if (uint32_t(Math::abs(cascade.dirty_regions[j])) >= cascade_size) {
 				//moved too much, just redraw everything (make all dirty)
 				cascade.dirty_regions = SDFGI::Cascade::DIRTY_ALL;
 				break;
@@ -1226,7 +1226,7 @@ void GI::SDFGI::update(RID p_env, const Vector3 &p_world_position) {
 			uint32_t total_volume = cascade_size * cascade_size * cascade_size;
 			uint32_t safe_volume = 1;
 			for (int j = 0; j < 3; j++) {
-				safe_volume *= cascade_size - ABS(cascade.dirty_regions[j]);
+				safe_volume *= cascade_size - Math::abs(cascade.dirty_regions[j]);
 			}
 			uint32_t dirty_volume = total_volume - safe_volume;
 			if (dirty_volume > (safe_volume / 2)) {
@@ -1674,7 +1674,7 @@ void GI::SDFGI::debug_probes(RID p_framebuffer, const uint32_t p_view_count, con
 	push_constant.band_power = 4;
 	push_constant.sections_in_band = ((band_points / 2) - 1);
 	push_constant.band_mask = band_points - 2;
-	push_constant.section_arc = Math_TAU / float(push_constant.sections_in_band);
+	push_constant.section_arc = Math::TAU / float(push_constant.sections_in_band);
 	push_constant.y_mult = y_mult;
 
 	uint32_t total_points = push_constant.sections_in_band * band_points;
@@ -1977,11 +1977,11 @@ void GI::SDFGI::pre_process_gi(const Transform3D &p_transform, RenderDataRD *p_r
 
 				// Convert from Luminous Power to Luminous Intensity
 				if (lights[idx].type == RS::LIGHT_OMNI) {
-					lights[idx].energy *= 1.0 / (Math_PI * 4.0);
+					lights[idx].energy *= 1.0 / (Math::PI * 4.0);
 				} else if (lights[idx].type == RS::LIGHT_SPOT) {
 					// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 					// We make this assumption to keep them easy to control.
-					lights[idx].energy *= 1.0 / Math_PI;
+					lights[idx].energy *= 1.0 / Math::PI;
 				}
 			}
 
@@ -2079,9 +2079,9 @@ void GI::SDFGI::render_region(Ref<RenderSceneBuffersRD> p_render_buffers, int p_
 
 			Vector3i dirty = cascades[cascade].dirty_regions;
 			Vector3i groups;
-			groups.x = cascade_size - ABS(dirty.x);
-			groups.y = cascade_size - ABS(dirty.y);
-			groups.z = cascade_size - ABS(dirty.z);
+			groups.x = cascade_size - Math::abs(dirty.x);
+			groups.y = cascade_size - Math::abs(dirty.y);
+			groups.z = cascade_size - Math::abs(dirty.z);
 
 			RD::get_singleton()->compute_list_set_push_constant(compute_list, &push_constant, sizeof(SDFGIShader::PreprocessPushConstant));
 			RD::get_singleton()->compute_list_dispatch_threads(compute_list, groups.x, groups.y, groups.z);
@@ -2440,11 +2440,11 @@ void GI::SDFGI::render_static_lights(RenderDataRD *p_render_data, Ref<RenderScen
 
 					// Convert from Luminous Power to Luminous Intensity
 					if (lights[idx].type == RS::LIGHT_OMNI) {
-						lights[idx].energy *= 1.0 / (Math_PI * 4.0);
+						lights[idx].energy *= 1.0 / (Math::PI * 4.0);
 					} else if (lights[idx].type == RS::LIGHT_SPOT) {
 						// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 						// We make this assumption to keep them easy to control.
-						lights[idx].energy *= 1.0 / Math_PI;
+						lights[idx].energy *= 1.0 / Math::PI;
 					}
 				}
 
@@ -2676,13 +2676,13 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 					dtf.format = RD::DATA_FORMAT_R16G16B16A16_SFLOAT;
 					dtf.usage_bits = RD::TEXTURE_USAGE_STORAGE_BIT;
 
-					if (dynamic_maps.size() == 0) {
+					if (dynamic_maps.is_empty()) {
 						dtf.usage_bits |= RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
 					}
 					dmap.texture = RD::get_singleton()->texture_create(dtf, RD::TextureView());
 					RD::get_singleton()->set_resource_name(dmap.texture, "VoxelGI Instance DMap Texture");
 
-					if (dynamic_maps.size() == 0) {
+					if (dynamic_maps.is_empty()) {
 						// Render depth for first one.
 						// Use 16-bit depth when supported to improve performance.
 						dtf.format = RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_D16_UNORM, RD::TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) ? RD::DATA_FORMAT_D16_UNORM : RD::DATA_FORMAT_X8_D24_UNORM_PACK32;
@@ -2698,7 +2698,7 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 					dmap.depth = RD::get_singleton()->texture_create(dtf, RD::TextureView());
 					RD::get_singleton()->set_resource_name(dmap.depth, "VoxelGI Instance DMap Depth");
 
-					if (dynamic_maps.size() == 0) {
+					if (dynamic_maps.is_empty()) {
 						dtf.format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
 						dtf.usage_bits = RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
 						dmap.albedo = RD::get_singleton()->texture_create(dtf, RD::TextureView());
@@ -2906,11 +2906,11 @@ void GI::VoxelGIInstance::update(bool p_update_light_instances, const Vector<RID
 
 					// Convert from Luminous Power to Luminous Intensity
 					if (l.type == RS::LIGHT_OMNI) {
-						l.energy *= 1.0 / (Math_PI * 4.0);
+						l.energy *= 1.0 / (Math::PI * 4.0);
 					} else if (l.type == RS::LIGHT_SPOT) {
 						// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 						// We make this assumption to keep them easy to control.
-						l.energy *= 1.0 / Math_PI;
+						l.energy *= 1.0 / Math::PI;
 					}
 				}
 
@@ -3279,7 +3279,7 @@ void GI::VoxelGIInstance::free_resources() {
 void GI::VoxelGIInstance::debug(RD::DrawListID p_draw_list, RID p_framebuffer, const Projection &p_camera_with_transform, bool p_lighting, bool p_emission, float p_alpha) {
 	RendererRD::MaterialStorage *material_storage = RendererRD::MaterialStorage::get_singleton();
 
-	if (mipmaps.size() == 0) {
+	if (mipmaps.is_empty()) {
 		return;
 	}
 
diff --git a/engine/servers/rendering/renderer_rd/environment/gi.h b/engine/servers/rendering/renderer_rd/environment/gi.h
index 81a06a26..0e21e85d 100644
--- a/engine/servers/rendering/renderer_rd/environment/gi.h
+++ b/engine/servers/rendering/renderer_rd/environment/gi.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef GI_RD_H
-#define GI_RD_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
@@ -829,5 +828,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // GI_RD_H
diff --git a/engine/servers/rendering/renderer_rd/environment/sky.cpp b/engine/servers/rendering/renderer_rd/environment/sky.cpp
index 1ffac1d6..4abd3085 100644
--- a/engine/servers/rendering/renderer_rd/environment/sky.cpp
+++ b/engine/servers/rendering/renderer_rd/environment/sky.cpp
@@ -722,6 +722,12 @@ SkyRD::SkyRD() {
 	roughness_layers = GLOBAL_GET("rendering/reflections/sky_reflections/roughness_layers");
 	sky_ggx_samples_quality = GLOBAL_GET("rendering/reflections/sky_reflections/ggx_samples");
 	sky_use_cubemap_array = GLOBAL_GET("rendering/reflections/sky_reflections/texture_array_reflections");
+#if defined(MACOS_ENABLED) && defined(__x86_64__)
+	if (OS::get_singleton()->get_current_rendering_driver_name() == "vulkan" && RenderingServer::get_singleton()->get_video_adapter_name().contains("Intel")) {
+		// Disable texture array reflections on macOS on Intel GPUs due to driver bugs.
+		sky_use_cubemap_array = false;
+	}
+#endif
 }
 
 void SkyRD::init() {
@@ -777,9 +783,9 @@ void SkyRD::init() {
 		actions.renames["SCREEN_UV"] = "uv";
 		actions.renames["FRAGCOORD"] = "gl_FragCoord";
 		actions.renames["TIME"] = "params.time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["HALF_RES_COLOR"] = "half_res_color";
 		actions.renames["QUARTER_RES_COLOR"] = "quarter_res_color";
 		actions.renames["RADIANCE"] = "radiance";
@@ -1093,15 +1099,7 @@ void SkyRD::setup_sky(const RenderDataRD *p_render_data, const Size2i p_screen_s
 				sky_light_data.enabled = true;
 
 				float angular_diameter = light_storage->light_get_param(base, RS::LIGHT_PARAM_SIZE);
-				if (angular_diameter > 0.0) {
-					// I know tan(0) is 0, but let's not risk it with numerical precision.
-					// Technically this will keep expanding until reaching the sun, but all we care about
-					// is expanding until we reach the radius of the near plane. There can't be more occluders than that.
-					angular_diameter = Math::tan(Math::deg_to_rad(angular_diameter));
-				} else {
-					angular_diameter = 0.0;
-				}
-				sky_light_data.size = angular_diameter;
+				sky_light_data.size = Math::deg_to_rad(angular_diameter);
 				sky_scene_state.ubo.directional_light_count++;
 				if (sky_scene_state.ubo.directional_light_count >= sky_scene_state.max_directional_lights) {
 					break;
diff --git a/engine/servers/rendering/renderer_rd/environment/sky.h b/engine/servers/rendering/renderer_rd/environment/sky.h
index ab6c5c7d..afc44925 100644
--- a/engine/servers/rendering/renderer_rd/environment/sky.h
+++ b/engine/servers/rendering/renderer_rd/environment/sky.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SKY_RD_H
-#define SKY_RD_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_compositor.h"
@@ -319,5 +318,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // SKY_RD_H
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
index 7acaeb50..7268ebea 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.cpp
@@ -167,7 +167,6 @@ RID RenderForwardClustered::RenderBufferDataForwardClustered::get_color_only_fb(
 
 	if (render_buffers->has_texture(RB_SCOPE_VRS, RB_TEXTURE)) {
 		RID vrs_texture = render_buffers->get_texture(RB_SCOPE_VRS, RB_TEXTURE);
-
 		return FramebufferCacheRD::get_singleton()->get_cache_multiview(render_buffers->get_view_count(), color, depth, vrs_texture);
 	} else {
 		return FramebufferCacheRD::get_singleton()->get_cache_multiview(render_buffers->get_view_count(), color, depth);
@@ -197,7 +196,6 @@ RID RenderForwardClustered::RenderBufferDataForwardClustered::get_color_pass_fb(
 
 	if (render_buffers->has_texture(RB_SCOPE_VRS, RB_TEXTURE)) {
 		RID vrs_texture = render_buffers->get_texture(RB_SCOPE_VRS, RB_TEXTURE);
-
 		return FramebufferCacheRD::get_singleton()->get_cache_multiview(v_count, color, specular, velocity_buffer, depth, vrs_texture);
 	} else {
 		return FramebufferCacheRD::get_singleton()->get_cache_multiview(v_count, color, specular, velocity_buffer, depth);
@@ -786,7 +784,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 	if (p_render_info) {
 		p_render_info[RS::VIEWPORT_RENDER_INFO_OBJECTS_IN_FRAME] += element_total;
 	}
-	uint64_t frame = RSG::rasterizer->get_frame_number();
+
 	uint32_t repeats = 0;
 	GeometryInstanceSurfaceDataCache *prev_surface = nullptr;
 	for (uint32_t i = 0; i < element_total; i++) {
@@ -795,12 +793,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 
 		SceneState::InstanceData &instance_data = scene_state.instance_data[p_render_list][i + p_offset];
 
-		if (inst->prev_transform_dirty && frame > inst->prev_transform_change_frame + 1 && inst->prev_transform_change_frame) {
-			inst->prev_transform = inst->transform;
-			inst->prev_transform_dirty = false;
-		}
-
-		if (inst->store_transform_cache) {
+		if (likely(inst->store_transform_cache)) {
 			RendererRD::MaterialStorage::store_transform(inst->transform, instance_data.transform);
 			RendererRD::MaterialStorage::store_transform(inst->prev_transform, instance_data.prev_transform);
 
@@ -820,10 +813,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 		instance_data.gi_offset = inst->gi_offset_cache;
 		instance_data.layer_mask = inst->layer_mask;
 		instance_data.instance_uniforms_ofs = uint32_t(inst->shader_uniforms_offset);
-		instance_data.lightmap_uv_scale[0] = inst->lightmap_uv_scale.position.x;
-		instance_data.lightmap_uv_scale[1] = inst->lightmap_uv_scale.position.y;
-		instance_data.lightmap_uv_scale[2] = inst->lightmap_uv_scale.size.x;
-		instance_data.lightmap_uv_scale[3] = inst->lightmap_uv_scale.size.y;
+		instance_data.set_lightmap_uv_scale(inst->lightmap_uv_scale);
 
 		AABB surface_aabb = AABB(Vector3(0.0, 0.0, 0.0), Vector3(1.0, 1.0, 1.0));
 		uint64_t format = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_format(surface->surface);
@@ -834,18 +824,8 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 			uv_scale = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_uv_scale(surface->surface);
 		}
 
-		instance_data.compressed_aabb_position[0] = surface_aabb.position.x;
-		instance_data.compressed_aabb_position[1] = surface_aabb.position.y;
-		instance_data.compressed_aabb_position[2] = surface_aabb.position.z;
-
-		instance_data.compressed_aabb_size[0] = surface_aabb.size.x;
-		instance_data.compressed_aabb_size[1] = surface_aabb.size.y;
-		instance_data.compressed_aabb_size[2] = surface_aabb.size.z;
-
-		instance_data.uv_scale[0] = uv_scale.x;
-		instance_data.uv_scale[1] = uv_scale.y;
-		instance_data.uv_scale[2] = uv_scale.z;
-		instance_data.uv_scale[3] = uv_scale.w;
+		instance_data.set_compressed_aabb(surface_aabb);
+		instance_data.set_uv_scale(uv_scale);
 
 		bool cant_repeat = instance_data.flags & INSTANCE_DATA_FLAG_MULTIMESH || inst->mesh_instance.is_valid();
 
@@ -866,11 +846,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 
 		RenderElementInfo &element_info = rl->element_info[p_offset + i];
 
-		element_info.lod_index = surface->sort.lod_index;
-		element_info.uses_forward_gi = surface->sort.uses_forward_gi;
-		element_info.uses_lightmap = surface->sort.uses_lightmap;
-		element_info.uses_softshadow = surface->sort.uses_softshadow;
-		element_info.uses_projector = surface->sort.uses_projector;
+		element_info.value = uint32_t(surface->sort.sort_key1 & 0xFFF);
 
 		if (cant_repeat) {
 			prev_surface = nullptr;
@@ -892,7 +868,7 @@ void RenderForwardClustered::_fill_instance_data(RenderListType p_render_list, i
 
 _FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
 	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 void RenderForwardClustered::_fill_render_list(RenderListType p_render_list, const RenderDataRD *p_render_data, PassMode p_pass_mode, bool p_using_sdfgi, bool p_using_opaque_gi, bool p_using_motion_pass, bool p_append) {
@@ -1068,6 +1044,11 @@ void RenderForwardClustered::_fill_render_list(RenderListType p_render_list, con
 			lod_distance = surface_distance.length();
 		}
 
+		if (unlikely(inst->prev_transform_dirty && frame > inst->prev_transform_change_frame + 1 && inst->prev_transform_change_frame)) {
+			inst->prev_transform = inst->transform;
+			inst->prev_transform_dirty = false;
+		}
+
 		while (surf) {
 			surf->sort.uses_forward_gi = 0;
 			surf->sort.uses_lightmap = 0;
@@ -1921,16 +1902,25 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		color_framebuffer = rb_data->get_color_pass_fb(color_pass_flags);
 	}
 
-	if (using_sss || using_separate_specular || scene_state.used_lightmap || using_voxelgi) {
+	// Ensure this is allocated so we don't get a stutter the first time an object with SSS appears on screen.
+	if (global_surface_data.sss_used) {
+		rb_data->ensure_specular();
+	}
+
+	if (global_surface_data.normal_texture_used) {
+		rb_data->ensure_normal_roughness_texture();
+	}
+
+	if (using_sss || using_separate_specular || scene_state.used_lightmap || using_voxelgi || global_surface_data.sss_used) {
 		scene_shader.enable_advanced_shader_group(p_render_data->scene_data->view_count > 1);
 	}
 
 	// Update the global pipeline requirements with all the features found to be in use in this scene.
-	if (depth_pass_mode == PASS_MODE_DEPTH_NORMAL_ROUGHNESS) {
+	if (depth_pass_mode == PASS_MODE_DEPTH_NORMAL_ROUGHNESS || global_surface_data.normal_texture_used) {
 		global_pipeline_data_required.use_normal_and_roughness = true;
 	}
 
-	if (scene_state.used_lightmap) {
+	if (scene_state.used_lightmap || scene_state.lightmaps_used > 0) {
 		global_pipeline_data_required.use_lightmaps = true;
 	}
 
@@ -1938,7 +1928,7 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		global_pipeline_data_required.use_voxelgi = true;
 	}
 
-	if (using_separate_specular) {
+	if (using_separate_specular || global_surface_data.sss_used) {
 		global_pipeline_data_required.use_separate_specular = true;
 	}
 
@@ -2309,18 +2299,26 @@ void RenderForwardClustered::_render_scene(RenderDataRD *p_render_data, const Co
 		rb->ensure_upscaled();
 	}
 
-	if (scene_state.used_screen_texture) {
+	if (scene_state.used_screen_texture || global_surface_data.screen_texture_used) {
 		RENDER_TIMESTAMP("Copy Screen Texture");
 
-		// Copy screen texture to backbuffer so we can read from it
-		_render_buffers_copy_screen_texture(p_render_data);
+		_render_buffers_ensure_screen_texture(p_render_data);
+
+		if (scene_state.used_screen_texture) {
+			// Copy screen texture to backbuffer so we can read from it
+			_render_buffers_copy_screen_texture(p_render_data);
+		}
 	}
 
-	if (scene_state.used_depth_texture) {
+	if (scene_state.used_depth_texture || global_surface_data.depth_texture_used) {
 		RENDER_TIMESTAMP("Copy Depth Texture");
 
-		// Copy depth texture to backbuffer so we can read from it
-		_render_buffers_copy_depth_texture(p_render_data);
+		_render_buffers_ensure_depth_texture(p_render_data);
+
+		if (scene_state.used_depth_texture) {
+			// Copy depth texture to backbuffer so we can read from it
+			_render_buffers_copy_depth_texture(p_render_data);
+		}
 	}
 
 	{
@@ -3310,9 +3308,8 @@ RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_rend
 		uniforms.push_back(u);
 	}
 	{
-		RD::Uniform u;
-		u.binding = 7;
-		u.uniform_type = RD::UNIFORM_TYPE_TEXTURE;
+		Vector<RID> textures;
+		textures.resize(scene_state.max_lightmaps * 2);
 
 		RID default_tex = texture_storage->texture_rd_get_default(RendererRD::TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_WHITE);
 		for (uint32_t i = 0; i < scene_state.max_lightmaps * 2; i++) {
@@ -3332,14 +3329,14 @@ RID RenderForwardClustered::_setup_render_pass_uniform_set(RenderListType p_rend
 
 				if (texture.is_valid()) {
 					RID rd_texture = texture_storage->texture_get_rd_texture(texture);
-					u.append_id(rd_texture);
+					textures.write[i] = rd_texture;
 					continue;
 				}
 			}
 
-			u.append_id(default_tex);
+			textures.write[i] = default_tex;
 		}
-
+		RD::Uniform u(RD::UNIFORM_TYPE_TEXTURE, 7, textures);
 		uniforms.push_back(u);
 	}
 	{
@@ -3955,18 +3952,22 @@ void RenderForwardClustered::_geometry_instance_add_surface_with_material(Geomet
 
 	if (p_material->shader_data->uses_sss) {
 		flags |= GeometryInstanceSurfaceDataCache::FLAG_USES_SUBSURFACE_SCATTERING;
+		global_surface_data.sss_used = true;
 	}
 
 	if (p_material->shader_data->uses_screen_texture) {
 		flags |= GeometryInstanceSurfaceDataCache::FLAG_USES_SCREEN_TEXTURE;
+		global_surface_data.screen_texture_used = true;
 	}
 
 	if (p_material->shader_data->uses_depth_texture) {
 		flags |= GeometryInstanceSurfaceDataCache::FLAG_USES_DEPTH_TEXTURE;
+		global_surface_data.depth_texture_used = true;
 	}
 
 	if (p_material->shader_data->uses_normal_texture) {
 		flags |= GeometryInstanceSurfaceDataCache::FLAG_USES_NORMAL_TEXTURE;
+		global_surface_data.normal_texture_used = true;
 	}
 
 	if (ginstance->data->cast_double_sided_shadows) {
@@ -4039,8 +4040,7 @@ void RenderForwardClustered::_geometry_instance_add_surface_with_material(Geomet
 	sdcache->sort.sort_key2 = 0;
 
 	sdcache->sort.surface_index = p_surface;
-	sdcache->sort.material_id_low = p_material_id & 0xFFFF;
-	sdcache->sort.material_id_hi = p_material_id >> 16;
+	sdcache->sort.material_id = p_material_id;
 	sdcache->sort.shader_id = p_shader_id;
 	sdcache->sort.geometry_id = p_mesh.get_local_index(); //only meshes can repeat anyway
 	sdcache->sort.uses_forward_gi = ginstance->can_sdfgi;
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h
index bfde315c..a8d0a7b2 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/render_forward_clustered.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_FORWARD_CLUSTERED_H
-#define RENDER_FORWARD_CLUSTERED_H
+#pragma once
 
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/renderer_rd/cluster_builder_rd.h"
@@ -326,8 +325,53 @@ private:
 			float compressed_aabb_position[4];
 			float compressed_aabb_size[4];
 			float uv_scale[4];
+
+			// These setters allow us to copy the data over with operation when using floats.
+			inline void set_lightmap_uv_scale(const Rect2 &p_rect) {
+#ifdef REAL_T_IS_DOUBLE
+				lightmap_uv_scale[0] = p_rect.position.x;
+				lightmap_uv_scale[1] = p_rect.position.y;
+				lightmap_uv_scale[2] = p_rect.size.x;
+				lightmap_uv_scale[3] = p_rect.size.y;
+#else
+				Rect2 *rect = reinterpret_cast<Rect2 *>(lightmap_uv_scale);
+				*rect = p_rect;
+#endif
+			}
+
+			inline void set_compressed_aabb(const AABB &p_aabb) {
+#ifdef REAL_T_IS_DOUBLE
+				compressed_aabb_position[0] = p_aabb.position.x;
+				compressed_aabb_position[1] = p_aabb.position.y;
+				compressed_aabb_position[2] = p_aabb.position.z;
+
+				compressed_aabb_size[0] = p_aabb.size.x;
+				compressed_aabb_size[1] = p_aabb.size.y;
+				compressed_aabb_size[2] = p_aabb.size.z;
+#else
+				Vector3 *compressed_aabb_position_vec3 = reinterpret_cast<Vector3 *>(compressed_aabb_position);
+				Vector3 *compressed_aabb_size_vec3 = reinterpret_cast<Vector3 *>(compressed_aabb_size);
+				*compressed_aabb_position_vec3 = p_aabb.position;
+				*compressed_aabb_size_vec3 = p_aabb.size;
+#endif
+			}
+
+			inline void set_uv_scale(const Vector4 &p_uv_scale) {
+#ifdef REAL_T_IS_DOUBLE
+				uv_scale[0] = p_uv_scale.x;
+				uv_scale[1] = p_uv_scale.y;
+				uv_scale[2] = p_uv_scale.z;
+				uv_scale[3] = p_uv_scale.w;
+#else
+				Vector4 *uv_scale_vec4 = reinterpret_cast<Vector4 *>(uv_scale);
+				*uv_scale_vec4 = p_uv_scale;
+#endif
+			}
 		};
 
+		static_assert(std::is_trivially_destructible_v<InstanceData>);
+		static_assert(std::is_trivially_constructible_v<InstanceData>);
+
 		UBO ubo;
 
 		LocalVector<RID> uniform_buffers;
@@ -384,14 +428,22 @@ private:
 
 	struct RenderElementInfo {
 		enum { MAX_REPEATS = (1 << 20) - 1 };
-		uint32_t repeat : 20;
-		uint32_t uses_projector : 1;
-		uint32_t uses_softshadow : 1;
-		uint32_t uses_lightmap : 1;
-		uint32_t uses_forward_gi : 1;
-		uint32_t lod_index : 8;
+		union {
+			struct {
+				uint32_t lod_index : 8;
+				uint32_t uses_softshadow : 1;
+				uint32_t uses_projector : 1;
+				uint32_t uses_forward_gi : 1;
+				uint32_t uses_lightmap : 1;
+			};
+			uint32_t value;
+		};
+		uint32_t repeat;
 	};
 
+	static_assert(std::is_trivially_destructible_v<RenderElementInfo>);
+	static_assert(std::is_trivially_constructible_v<RenderElementInfo>);
+
 	template <PassMode p_pass_mode, uint32_t p_color_pass_flags = 0>
 	_FORCE_INLINE_ void _render_list_template(RenderingDevice::DrawListID p_draw_list, RenderingDevice::FramebufferFormatID p_framebuffer_Format, RenderListParameters *p_params, uint32_t p_from_element, uint32_t p_to_element);
 	void _render_list(RenderingDevice::DrawListID p_draw_list, RenderingDevice::FramebufferFormatID p_framebuffer_Format, RenderListParameters *p_params, uint32_t p_from_element, uint32_t p_to_element);
@@ -434,18 +486,17 @@ private:
 			};
 			struct {
 				uint64_t lod_index : 8;
-				uint64_t surface_index : 8;
-				uint64_t geometry_id : 32;
-				uint64_t material_id_low : 16;
-
-				uint64_t material_id_hi : 16;
-				uint64_t shader_id : 32;
 				uint64_t uses_softshadow : 1;
 				uint64_t uses_projector : 1;
 				uint64_t uses_forward_gi : 1;
 				uint64_t uses_lightmap : 1;
 				uint64_t depth_layer : 4;
+				uint64_t surface_index : 8;
 				uint64_t priority : 8;
+				uint64_t geometry_id : 32;
+
+				uint64_t material_id : 32;
+				uint64_t shader_id : 32;
 			};
 		} sort;
 
@@ -578,6 +629,14 @@ private:
 	void _update_dirty_geometry_instances();
 	void _update_dirty_geometry_pipelines();
 
+	// Global data about the scene that can be used to pre-allocate resources without relying on culling.
+	struct GlobalSurfaceData {
+		bool screen_texture_used = false;
+		bool normal_texture_used = false;
+		bool depth_texture_used = false;
+		bool sss_used = false;
+	} global_surface_data;
+
 	/* Render List */
 
 	struct RenderList {
@@ -748,5 +807,3 @@ public:
 	~RenderForwardClustered();
 };
 } // namespace RendererSceneRenderImplementation
-
-#endif // RENDER_FORWARD_CLUSTERED_H
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
index 5debecb1..96d104f9 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.cpp
@@ -618,9 +618,9 @@ void SceneShaderForwardClustered::init(const String p_defines) {
 
 		actions.renames["TIME"] = "global_time";
 		actions.renames["EXPOSURE"] = "(1.0 / scene_data_block.data.emissive_exposure_normalization)";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["OUTPUT_IS_SRGB"] = "SHADER_IS_SRGB";
 		actions.renames["CLIP_SPACE_FAR"] = "SHADER_SPACE_FAR";
 		actions.renames["VIEWPORT_SIZE"] = "read_viewport_size";
diff --git a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
index 2cf701b6..cc120b13 100644
--- a/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
+++ b/engine/servers/rendering/renderer_rd/forward_clustered/scene_shader_forward_clustered.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_SHADER_FORWARD_CLUSTERED_H
-#define SCENE_SHADER_FORWARD_CLUSTERED_H
+#pragma once
 
 #include "../storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/pipeline_hash_map_rd.h"
@@ -356,5 +355,3 @@ public:
 };
 
 } // namespace RendererSceneRenderImplementation
-
-#endif // SCENE_SHADER_FORWARD_CLUSTERED_H
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
index 9289c21a..0b1fb9e3 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.cpp
@@ -35,6 +35,7 @@
 #include "servers/rendering/renderer_rd/storage_rd/mesh_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/particles_storage.h"
 #include "servers/rendering/renderer_rd/storage_rd/texture_storage.h"
+#include "servers/rendering/renderer_rd/uniform_set_cache_rd.h"
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering/rendering_server_default.h"
 
@@ -208,9 +209,6 @@ RID RenderForwardMobile::RenderBufferDataForwardMobile::get_color_fbs(Framebuffe
 			RD::FramebufferPass pass;
 			pass.color_attachments.push_back(0);
 			pass.depth_attachment = 1;
-			if (vrs_texture.is_valid()) {
-				pass.vrs_attachment = 2;
-			}
 
 			if (use_msaa) {
 				// Add resolve
@@ -231,9 +229,6 @@ RID RenderForwardMobile::RenderBufferDataForwardMobile::get_color_fbs(Framebuffe
 			RD::FramebufferPass pass;
 			pass.color_attachments.push_back(0);
 			pass.depth_attachment = 1;
-			if (vrs_texture.is_valid()) {
-				pass.vrs_attachment = 2;
-			}
 
 			if (use_msaa) {
 				// add resolve
@@ -404,7 +399,8 @@ RID RenderForwardMobile::_setup_render_pass_uniform_set(RenderListType p_render_
 	// default render buffer and scene state uniform set
 	// loaded into set 1
 
-	Vector<RD::Uniform> uniforms;
+	thread_local LocalVector<RD::Uniform> uniforms;
+	uniforms.clear();
 
 	{
 		RD::Uniform u;
@@ -481,9 +477,8 @@ RID RenderForwardMobile::_setup_render_pass_uniform_set(RenderListType p_render_
 
 	/* we have limited ability to keep textures like this so we're moving this to a set we change before drawing geometry and just pushing the needed texture in */
 	{
-		RD::Uniform u;
-		u.binding = 6;
-		u.uniform_type = RD::UNIFORM_TYPE_TEXTURE;
+		Vector<RID> textures;
+		textures.resize(scene_state.max_lightmaps * 2);
 
 		RID default_tex = texture_storage->texture_rd_get_default(RendererRD::TextureStorage::DEFAULT_RD_TEXTURE_2D_ARRAY_WHITE);
 		for (uint32_t i = 0; i < scene_state.max_lightmaps * 2; i++) {
@@ -503,14 +498,14 @@ RID RenderForwardMobile::_setup_render_pass_uniform_set(RenderListType p_render_
 
 				if (texture.is_valid()) {
 					RID rd_texture = texture_storage->texture_get_rd_texture(texture);
-					u.append_id(rd_texture);
+					textures.write[i] = rd_texture;
 					continue;
 				}
 			}
 
-			u.append_id(default_tex);
+			textures.write[i] = default_tex;
 		}
-
+		RD::Uniform u(RD::UNIFORM_TYPE_TEXTURE, 6, textures);
 		uniforms.push_back(u);
 	}
 
@@ -630,15 +625,7 @@ RID RenderForwardMobile::_setup_render_pass_uniform_set(RenderListType p_render_
 
 	p_samplers.append_uniforms(uniforms, 13);
 
-	if (p_index >= (int)render_pass_uniform_sets.size()) {
-		render_pass_uniform_sets.resize(p_index + 1);
-	}
-
-	if (render_pass_uniform_sets[p_index].is_valid() && RD::get_singleton()->uniform_set_is_valid(render_pass_uniform_sets[p_index])) {
-		RD::get_singleton()->free(render_pass_uniform_sets[p_index]);
-	}
-	render_pass_uniform_sets[p_index] = RD::get_singleton()->uniform_set_create(uniforms, scene_shader.default_shader_rd, RENDER_PASS_UNIFORM_SET, true);
-	return render_pass_uniform_sets[p_index];
+	return UniformSetCacheRD::get_singleton()->get_cache_vec(scene_shader.default_shader_rd, RENDER_PASS_UNIFORM_SET, uniforms);
 }
 
 void RenderForwardMobile::_setup_lightmaps(const RenderDataRD *p_render_data, const PagedArray<RID> &p_lightmaps, const Transform3D &p_cam_transform) {
@@ -1187,14 +1174,22 @@ void RenderForwardMobile::_render_scene(RenderDataRD *p_render_data, const Color
 				_process_compositor_effects(RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_PRE_TRANSPARENT, p_render_data);
 			}
 
-			if (scene_state.used_screen_texture) {
-				// Copy screen texture to backbuffer so we can read from it
-				_render_buffers_copy_screen_texture(p_render_data);
+			if (scene_state.used_screen_texture || global_surface_data.screen_texture_used) {
+				_render_buffers_ensure_screen_texture(p_render_data);
+
+				if (scene_state.used_screen_texture) {
+					// Copy screen texture to backbuffer so we can read from it
+					_render_buffers_copy_screen_texture(p_render_data);
+				}
 			}
 
-			if (scene_state.used_depth_texture) {
-				// Copy depth texture to backbuffer so we can read from it
-				_render_buffers_copy_depth_texture(p_render_data);
+			if (scene_state.used_depth_texture || global_surface_data.depth_texture_used) {
+				_render_buffers_ensure_depth_texture(p_render_data);
+
+				if (scene_state.used_depth_texture) {
+					// Copy depth texture to backbuffer so we can read from it
+					_render_buffers_copy_depth_texture(p_render_data);
+				}
 			}
 
 			if (render_list[RENDER_LIST_ALPHA].element_info.size() > 0) {
@@ -1426,6 +1421,7 @@ void RenderForwardMobile::_render_shadow_begin() {
 	_update_render_base_uniform_set();
 
 	render_list[RENDER_LIST_SECONDARY].clear();
+	scene_state.instance_data[RENDER_LIST_SECONDARY].clear();
 }
 
 void RenderForwardMobile::_render_shadow_append(RID p_framebuffer, const PagedArray<RenderGeometryInstance *> &p_instances, const Projection &p_projection, const Transform3D &p_transform, float p_zfar, float p_bias, float p_normal_bias, bool p_use_dp, bool p_use_dp_flip, bool p_use_pancake, float p_lod_distance_multiplier, float p_screen_mesh_lod_threshold, const Rect2i &p_rect, bool p_flip_y, bool p_clear_region, bool p_begin, bool p_end, RenderingMethod::RenderInfo *p_render_info, const Transform3D &p_main_cam_transform) {
@@ -1471,7 +1467,7 @@ void RenderForwardMobile::_render_shadow_append(RID p_framebuffer, const PagedAr
 	_fill_render_list(RENDER_LIST_SECONDARY, &render_data, pass_mode, true);
 	uint32_t render_list_size = render_list[RENDER_LIST_SECONDARY].elements.size() - render_list_from;
 	render_list[RENDER_LIST_SECONDARY].sort_by_key_range(render_list_from, render_list_size);
-	_fill_instance_data(RENDER_LIST_SECONDARY, render_list_from, render_list_size);
+	_fill_instance_data(RENDER_LIST_SECONDARY, render_list_from, render_list_size, false);
 
 	{
 		//regular forward for now
@@ -1498,6 +1494,7 @@ void RenderForwardMobile::_render_shadow_append(RID p_framebuffer, const PagedAr
 }
 
 void RenderForwardMobile::_render_shadow_process() {
+	_update_instance_data_buffer(RENDER_LIST_SECONDARY);
 	//render shadows one after the other, so this can be done un-barriered and the driver can optimize (as well as allow us to run compute at the same time)
 
 	for (uint32_t i = 0; i < scene_state.shadow_passes.size(); i++) {
@@ -1702,16 +1699,15 @@ void RenderForwardMobile::base_uniforms_changed() {
 void RenderForwardMobile::_update_render_base_uniform_set() {
 	RendererRD::LightStorage *light_storage = RendererRD::LightStorage::get_singleton();
 
-	// We must always recreate the uniform set every frame if we're using linear pools (since we requested it on creation).
-	// This pays off as long as we often get inside the if() block (i.e. the settings end up changing often).
-	if (RD::get_singleton()->uniform_sets_have_linear_pools() || render_base_uniform_set.is_null() || !RD::get_singleton()->uniform_set_is_valid(render_base_uniform_set) || (lightmap_texture_array_version != light_storage->lightmap_array_get_version())) {
+	if (render_base_uniform_set.is_null() || !RD::get_singleton()->uniform_set_is_valid(render_base_uniform_set) || (lightmap_texture_array_version != light_storage->lightmap_array_get_version())) {
 		if (render_base_uniform_set.is_valid() && RD::get_singleton()->uniform_set_is_valid(render_base_uniform_set)) {
 			RD::get_singleton()->free(render_base_uniform_set);
 		}
 
 		lightmap_texture_array_version = light_storage->lightmap_array_get_version();
 
-		Vector<RD::Uniform> uniforms;
+		thread_local LocalVector<RD::Uniform> uniforms;
+		uniforms.clear();
 
 		{
 			RD::Uniform u;
@@ -1805,7 +1801,7 @@ void RenderForwardMobile::_update_render_base_uniform_set() {
 			uniforms.push_back(u);
 		}
 
-		render_base_uniform_set = RD::get_singleton()->uniform_set_create(uniforms, scene_shader.default_shader_rd, SCENE_UNIFORM_SET, true);
+		render_base_uniform_set = UniformSetCacheRD::get_singleton()->get_cache_vec(scene_shader.default_shader_rd, SCENE_UNIFORM_SET, uniforms);
 	}
 }
 
@@ -1862,10 +1858,7 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
 		instance_data.gi_offset = inst->gi_offset_cache;
 		instance_data.layer_mask = inst->layer_mask;
 		instance_data.instance_uniforms_ofs = uint32_t(inst->shader_uniforms_offset);
-		instance_data.lightmap_uv_scale[0] = inst->lightmap_uv_scale.position.x;
-		instance_data.lightmap_uv_scale[1] = inst->lightmap_uv_scale.position.y;
-		instance_data.lightmap_uv_scale[2] = inst->lightmap_uv_scale.size.x;
-		instance_data.lightmap_uv_scale[3] = inst->lightmap_uv_scale.size.y;
+		instance_data.set_lightmap_uv_scale(inst->lightmap_uv_scale);
 
 		AABB surface_aabb = AABB(Vector3(0.0, 0.0, 0.0), Vector3(1.0, 1.0, 1.0));
 		uint64_t format = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_format(surface->surface);
@@ -1878,23 +1871,13 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
 
 		fill_push_constant_instance_indices(&instance_data, inst);
 
-		instance_data.compressed_aabb_position[0] = surface_aabb.position.x;
-		instance_data.compressed_aabb_position[1] = surface_aabb.position.y;
-		instance_data.compressed_aabb_position[2] = surface_aabb.position.z;
-
-		instance_data.compressed_aabb_size[0] = surface_aabb.size.x;
-		instance_data.compressed_aabb_size[1] = surface_aabb.size.y;
-		instance_data.compressed_aabb_size[2] = surface_aabb.size.z;
-
-		instance_data.uv_scale[0] = uv_scale.x;
-		instance_data.uv_scale[1] = uv_scale.y;
-		instance_data.uv_scale[2] = uv_scale.z;
-		instance_data.uv_scale[3] = uv_scale.w;
+		instance_data.set_compressed_aabb(surface_aabb);
+		instance_data.set_uv_scale(uv_scale);
 
 		RenderElementInfo &element_info = rl->element_info[p_offset + i];
 
-		element_info.lod_index = surface->lod_index;
-		element_info.uses_lightmap = surface->sort.uses_lightmap;
+		// Sets lod_index and uses_lightmap at once.
+		element_info.value = uint32_t(surface->sort.sort_key1 & 0x1FF);
 	}
 
 	if (p_update_buffer) {
@@ -1904,7 +1887,7 @@ void RenderForwardMobile::_fill_instance_data(RenderListType p_render_list, uint
 
 _FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
 	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 
@@ -1912,9 +1895,7 @@ void RenderForwardMobile::_fill_render_list(RenderListType p_render_list, const
 	RendererRD::MeshStorage *mesh_storage = RendererRD::MeshStorage::get_singleton();
 
 	if (p_render_list == RENDER_LIST_OPAQUE) {
-		scene_state.used_sss = false;
 		scene_state.used_screen_texture = false;
-		scene_state.used_normal_texture = false;
 		scene_state.used_depth_texture = false;
 		scene_state.used_lightmap = false;
 	}
@@ -2026,7 +2007,7 @@ void RenderForwardMobile::_fill_render_list(RenderListType p_render_list, const
 
 			if (p_render_data->scene_data->screen_mesh_lod_threshold > 0.0 && mesh_storage->mesh_surface_has_lod(surf->surface)) {
 				uint32_t indices = 0;
-				surf->lod_index = mesh_storage->mesh_surface_get_lod(surf->surface, inst->lod_model_scale * inst->lod_bias, lod_distance * p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, indices);
+				surf->sort.lod_index = mesh_storage->mesh_surface_get_lod(surf->surface, inst->lod_model_scale * inst->lod_bias, lod_distance * p_render_data->scene_data->lod_distance_multiplier, p_render_data->scene_data->screen_mesh_lod_threshold, indices);
 				if (p_render_data->render_info) {
 					indices = _indices_to_primitives(surf->primitive, indices);
 					if (p_render_list == RENDER_LIST_OPAQUE) { //opaque
@@ -2036,7 +2017,7 @@ void RenderForwardMobile::_fill_render_list(RenderListType p_render_list, const
 					}
 				}
 			} else {
-				surf->lod_index = 0;
+				surf->sort.lod_index = 0;
 				if (p_render_data->render_info) {
 					uint32_t to_draw = mesh_storage->mesh_surface_get_vertices_drawn_count(surf->surface);
 					to_draw = _indices_to_primitives(surf->primitive, to_draw);
@@ -2068,15 +2049,9 @@ void RenderForwardMobile::_fill_render_list(RenderListType p_render_list, const
 					scene_state.used_lightmap = true;
 				}
 
-				if (surf->flags & GeometryInstanceSurfaceDataCache::FLAG_USES_SUBSURFACE_SCATTERING) {
-					scene_state.used_sss = true;
-				}
 				if (surf->flags & GeometryInstanceSurfaceDataCache::FLAG_USES_SCREEN_TEXTURE) {
 					scene_state.used_screen_texture = true;
 				}
-				if (surf->flags & GeometryInstanceSurfaceDataCache::FLAG_USES_NORMAL_TEXTURE) {
-					scene_state.used_normal_texture = true;
-				}
 				if (surf->flags & GeometryInstanceSurfaceDataCache::FLAG_USES_DEPTH_TEXTURE) {
 					scene_state.used_depth_texture = true;
 				}
@@ -2312,7 +2287,6 @@ void RenderForwardMobile::_render_list_template(RenderingDevice::DrawListID p_dr
 				mesh_storage->mesh_surface_get_vertex_arrays_and_format(mesh_surface, input_mask, false, vertex_array_rd, vertex_format);
 			}
 
-			index_array_rd = mesh_storage->mesh_surface_get_index_array(mesh_surface, element_info.lod_index);
 			pipeline_key.vertex_format_id = vertex_format;
 
 			if (pipeline_key.ubershader) {
@@ -2562,10 +2536,12 @@ void RenderForwardMobile::_geometry_instance_add_surface_with_material(GeometryI
 
 	if (p_material->shader_data->uses_screen_texture) {
 		flags |= GeometryInstanceSurfaceDataCache::FLAG_USES_SCREEN_TEXTURE;
+		global_surface_data.screen_texture_used = true;
 	}
 
 	if (p_material->shader_data->uses_depth_texture) {
 		flags |= GeometryInstanceSurfaceDataCache::FLAG_USES_DEPTH_TEXTURE;
+		global_surface_data.depth_texture_used = true;
 	}
 
 	if (p_material->shader_data->uses_normal_texture) {
@@ -2640,11 +2616,9 @@ void RenderForwardMobile::_geometry_instance_add_surface_with_material(GeometryI
 	sdcache->sort.sort_key2 = 0;
 
 	sdcache->sort.surface_index = p_surface;
-	sdcache->sort.material_id_low = p_material_id & 0x0000FFFF;
-	sdcache->sort.material_id_hi = p_material_id >> 16;
+	sdcache->sort.material_id = p_material_id;
 	sdcache->sort.shader_id = p_shader_id;
 	sdcache->sort.geometry_id = p_mesh.get_local_index();
-	// sdcache->sort.uses_forward_gi = ginstance->can_sdfgi;
 	sdcache->sort.priority = p_material->priority;
 
 	uint64_t format = RendererRD::MeshStorage::get_singleton()->mesh_surface_get_format(sdcache->surface);
@@ -2904,6 +2878,7 @@ static RD::FramebufferFormatID _get_color_framebuffer_format_for_pipeline(RD::Da
 	attachments.push_back(attachment);
 
 	if (p_vrs) {
+		// VRS attachment.
 		attachment.samples = RD::TEXTURE_SAMPLES_1;
 		attachment.format = RenderSceneBuffersRD::get_vrs_format();
 		attachment.usage_flags = RenderSceneBuffersRD::get_vrs_usage_bits();
@@ -2925,10 +2900,6 @@ static RD::FramebufferFormatID _get_color_framebuffer_format_for_pipeline(RD::Da
 	pass.color_attachments.push_back(0);
 	pass.depth_attachment = 1;
 
-	if (p_vrs) {
-		pass.vrs_attachment = 2;
-	}
-
 	if (multisampling) {
 		pass.resolve_attachments.push_back(attachments.size() - 1);
 	}
@@ -2954,7 +2925,8 @@ static RD::FramebufferFormatID _get_color_framebuffer_format_for_pipeline(RD::Da
 		passes.push_back(blit_pass);
 	}
 
-	return RD::get_singleton()->framebuffer_format_create_multipass(attachments, passes, p_view_count);
+	int32_t vrs_attachment = p_vrs ? 2 : -1;
+	return RD::get_singleton()->framebuffer_format_create_multipass(attachments, passes, p_view_count, vrs_attachment);
 }
 
 static RD::FramebufferFormatID _get_reflection_probe_color_framebuffer_format_for_pipeline() {
@@ -3270,13 +3242,6 @@ RenderForwardMobile::RenderForwardMobile() {
 RenderForwardMobile::~RenderForwardMobile() {
 	RSG::light_storage->directional_shadow_atlas_set_size(0);
 
-	//clear base uniform set if still valid
-	for (uint32_t i = 0; i < render_pass_uniform_sets.size(); i++) {
-		if (render_pass_uniform_sets[i].is_valid() && RD::get_singleton()->uniform_set_is_valid(render_pass_uniform_sets[i])) {
-			RD::get_singleton()->free(render_pass_uniform_sets[i]);
-		}
-	}
-
 	{
 		for (const RID &rid : scene_state.uniform_buffers) {
 			RD::get_singleton()->free(rid);
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
index 6e4d3352..643ca455 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/render_forward_mobile.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_FORWARD_MOBILE_H
-#define RENDER_FORWARD_MOBILE_H
+#pragma once
 
 #include "core/templates/paged_allocator.h"
 #include "servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h"
@@ -174,7 +173,6 @@ private:
 	void _setup_lightmaps(const RenderDataRD *p_render_data, const PagedArray<RID> &p_lightmaps, const Transform3D &p_cam_transform);
 
 	RID render_base_uniform_set;
-	LocalVector<RID> render_pass_uniform_sets;
 
 	/* Light map */
 
@@ -211,7 +209,7 @@ private:
 			uint32_t flags;
 			uint32_t instance_uniforms_ofs; // Base offset in global buffer for instance variables.
 			uint32_t gi_offset; // GI information when using lightmapping (VCT or lightmap index).
-			uint32_t layer_mask = 1;
+			uint32_t layer_mask;
 			float lightmap_uv_scale[4]; // Doubles as uv_offset when needed.
 			uint32_t reflection_probes[2]; // Packed reflection probes.
 			uint32_t omni_lights[2]; // Packed omni lights.
@@ -220,8 +218,53 @@ private:
 			float compressed_aabb_position[4];
 			float compressed_aabb_size[4];
 			float uv_scale[4];
+
+			// These setters allow us to copy the data over with operation when using floats.
+			inline void set_lightmap_uv_scale(const Rect2 &p_rect) {
+#ifdef REAL_T_IS_DOUBLE
+				lightmap_uv_scale[0] = p_rect.position.x;
+				lightmap_uv_scale[1] = p_rect.position.y;
+				lightmap_uv_scale[2] = p_rect.size.x;
+				lightmap_uv_scale[3] = p_rect.size.y;
+#else
+				Rect2 *rect = reinterpret_cast<Rect2 *>(lightmap_uv_scale);
+				*rect = p_rect;
+#endif
+			}
+
+			inline void set_compressed_aabb(const AABB &p_aabb) {
+#ifdef REAL_T_IS_DOUBLE
+				compressed_aabb_position[0] = p_aabb.position.x;
+				compressed_aabb_position[1] = p_aabb.position.y;
+				compressed_aabb_position[2] = p_aabb.position.z;
+
+				compressed_aabb_size[0] = p_aabb.size.x;
+				compressed_aabb_size[1] = p_aabb.size.y;
+				compressed_aabb_size[2] = p_aabb.size.z;
+#else
+				Vector3 *compressed_aabb_position_vec3 = reinterpret_cast<Vector3 *>(compressed_aabb_position);
+				Vector3 *compressed_aabb_size_vec3 = reinterpret_cast<Vector3 *>(compressed_aabb_size);
+				*compressed_aabb_position_vec3 = p_aabb.position;
+				*compressed_aabb_size_vec3 = p_aabb.size;
+#endif
+			}
+
+			inline void set_uv_scale(const Vector4 &p_uv_scale) {
+#ifdef REAL_T_IS_DOUBLE
+				uv_scale[0] = p_uv_scale.x;
+				uv_scale[1] = p_uv_scale.y;
+				uv_scale[2] = p_uv_scale.z;
+				uv_scale[3] = p_uv_scale.w;
+#else
+				Vector4 *uv_scale_vec4 = reinterpret_cast<Vector4 *>(uv_scale);
+				*uv_scale_vec4 = p_uv_scale;
+#endif
+			}
 		};
 
+		static_assert(std::is_trivially_destructible_v<InstanceData>);
+		static_assert(std::is_trivially_constructible_v<InstanceData>);
+
 		RID instance_buffer[RENDER_LIST_MAX];
 		uint32_t instance_buffer_size[RENDER_LIST_MAX] = { 0, 0, 0 };
 		LocalVector<InstanceData> instance_data[RENDER_LIST_MAX];
@@ -239,9 +282,7 @@ private:
 		RID lightmap_capture_buffer;
 
 		bool used_screen_texture = false;
-		bool used_normal_texture = false;
 		bool used_depth_texture = false;
-		bool used_sss = false;
 		bool used_lightmap = false;
 
 		struct ShadowPass {
@@ -322,11 +363,19 @@ private:
 	};
 
 	struct RenderElementInfo {
-		uint32_t uses_lightmap : 1;
-		uint32_t lod_index : 8;
-		uint32_t reserved : 23;
+		union {
+			struct {
+				uint32_t lod_index : 8;
+				uint32_t uses_lightmap : 1;
+				uint32_t reserved : 23;
+			};
+			uint32_t value;
+		};
 	};
 
+	static_assert(std::is_trivially_destructible_v<RenderElementInfo>);
+	static_assert(std::is_trivially_constructible_v<RenderElementInfo>);
+
 	template <PassMode p_pass_mode>
 	_FORCE_INLINE_ void _render_list_template(RenderingDevice::DrawListID p_draw_list, RenderingDevice::FramebufferFormatID p_framebuffer_Format, RenderListParameters *p_params, uint32_t p_from_element, uint32_t p_to_element);
 	void _render_list(RenderingDevice::DrawListID p_draw_list, RenderingDevice::FramebufferFormatID p_framebuffer_Format, RenderListParameters *p_params, uint32_t p_from_element, uint32_t p_to_element);
@@ -402,27 +451,22 @@ protected:
 				uint64_t sort_key2;
 			};
 			struct {
-				// !BAS! CHECK BITS!!!
-
-				uint64_t surface_index : 10;
-				uint64_t geometry_id : 32;
-				uint64_t material_id_low : 16;
-
-				uint64_t material_id_hi : 16;
-				uint64_t shader_id : 32;
-				uint64_t uses_lightmap : 4; // sort by lightmap id here, not whether its yes/no (is 4 bits enough?)
+				uint64_t lod_index : 8;
+				uint64_t uses_lightmap : 1;
+				uint64_t pad : 3;
 				uint64_t depth_layer : 4;
+				uint64_t surface_index : 8;
 				uint64_t priority : 8;
+				uint64_t geometry_id : 32;
 
-				// uint64_t lod_index : 8; // no need to sort on LOD
-				// uint64_t uses_forward_gi : 1; // no GI here, remove
+				uint64_t material_id : 32;
+				uint64_t shader_id : 32;
 			};
 		} sort;
 
 		RS::PrimitiveType primitive = RS::PRIMITIVE_MAX;
 		uint32_t flags = 0;
 		uint32_t surface_index = 0;
-		uint32_t lod_index = 0;
 
 		void *surface = nullptr;
 		RID material_uniform_set;
@@ -613,6 +657,12 @@ public:
 	void _update_dirty_geometry_instances();
 	void _update_dirty_geometry_pipelines();
 
+	// Global data about the scene that can be used to pre-allocate resources without relying on culling.
+	struct GlobalSurfaceData {
+		bool screen_texture_used = false;
+		bool depth_texture_used = false;
+	} global_surface_data;
+
 	virtual RenderGeometryInstance *geometry_instance_create(RID p_base) override;
 	virtual void geometry_instance_free(RenderGeometryInstance *p_geometry_instance) override;
 
@@ -637,5 +687,3 @@ public:
 	~RenderForwardMobile();
 };
 } // namespace RendererSceneRenderImplementation
-
-#endif // RENDER_FORWARD_MOBILE_H
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
index 4d888d99..7ae93066 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.cpp
@@ -552,9 +552,9 @@ void SceneShaderForwardMobile::init(const String p_defines) {
 
 		actions.renames["TIME"] = "scene_data_block.data.time";
 		actions.renames["EXPOSURE"] = "(1.0 / scene_data_block.data.emissive_exposure_normalization)";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["OUTPUT_IS_SRGB"] = "SHADER_IS_SRGB";
 		actions.renames["CLIP_SPACE_FAR"] = "SHADER_SPACE_FAR";
 		actions.renames["VIEWPORT_SIZE"] = "read_viewport_size";
diff --git a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
index c2b75eb4..960c2872 100644
--- a/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
+++ b/engine/servers/rendering/renderer_rd/forward_mobile/scene_shader_forward_mobile.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SCENE_SHADER_FORWARD_MOBILE_H
-#define SCENE_SHADER_FORWARD_MOBILE_H
+#pragma once
 
 #include "../storage_rd/material_storage.h"
 #include "servers/rendering/renderer_rd/pipeline_hash_map_rd.h"
@@ -337,5 +336,3 @@ public:
 };
 
 } // namespace RendererSceneRenderImplementation
-
-#endif // SCENE_SHADER_FORWARD_MOBILE_H
diff --git a/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h b/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h
index abb2a580..df0fa6ae 100644
--- a/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h
+++ b/engine/servers/rendering/renderer_rd/framebuffer_cache_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FRAMEBUFFER_CACHE_RD_H
-#define FRAMEBUFFER_CACHE_RD_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
@@ -59,7 +58,6 @@ class FramebufferCacheRD : public Object {
 
 	static _FORCE_INLINE_ uint32_t _hash_pass(const RD::FramebufferPass &p, uint32_t h) {
 		h = hash_murmur3_one_32(p.depth_attachment, h);
-		h = hash_murmur3_one_32(p.vrs_attachment, h);
 
 		h = hash_murmur3_one_32(p.color_attachments.size(), h);
 		for (int i = 0; i < p.color_attachments.size(); i++) {
@@ -84,10 +82,6 @@ class FramebufferCacheRD : public Object {
 			return false;
 		}
 
-		if (a.vrs_attachment != b.vrs_attachment) {
-			return false;
-		}
-
 		if (a.color_attachments.size() != b.color_attachments.size()) {
 			return false;
 		}
@@ -213,7 +207,7 @@ public:
 			const Cache *c = hash_table[table_idx];
 
 			while (c) {
-				if (c->hash == h && c->passes.size() == 0 && c->textures.size() == sizeof...(Args) && c->views == 1 && _compare_args(0, c->textures, args...)) {
+				if (c->hash == h && c->passes.is_empty() && c->textures.size() == sizeof...(Args) && c->views == 1 && _compare_args(0, c->textures, args...)) {
 					return c->cache;
 				}
 				c = c->next;
@@ -241,7 +235,7 @@ public:
 			const Cache *c = hash_table[table_idx];
 
 			while (c) {
-				if (c->hash == h && c->passes.size() == 0 && c->textures.size() == sizeof...(Args) && c->views == p_views && _compare_args(0, c->textures, args...)) {
+				if (c->hash == h && c->passes.is_empty() && c->textures.size() == sizeof...(Args) && c->views == p_views && _compare_args(0, c->textures, args...)) {
 					return c->cache;
 				}
 				c = c->next;
@@ -312,5 +306,3 @@ public:
 	FramebufferCacheRD();
 	~FramebufferCacheRD();
 };
-
-#endif // FRAMEBUFFER_CACHE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/pipeline_cache_rd.h b/engine/servers/rendering/renderer_rd/pipeline_cache_rd.h
index 64e6b507..48c4f468 100644
--- a/engine/servers/rendering/renderer_rd/pipeline_cache_rd.h
+++ b/engine/servers/rendering/renderer_rd/pipeline_cache_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PIPELINE_CACHE_RD_H
-#define PIPELINE_CACHE_RD_H
+#pragma once
 
 #include "core/os/spin_lock.h"
 #include "servers/rendering/rendering_device.h"
@@ -98,5 +97,3 @@ public:
 	PipelineCacheRD();
 	~PipelineCacheRD();
 };
-
-#endif // PIPELINE_CACHE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h b/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
index e569ed13..3d71c236 100644
--- a/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
+++ b/engine/servers/rendering/renderer_rd/pipeline_hash_map_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PIPELINE_HASH_MAP_RD_H
-#define PIPELINE_HASH_MAP_RD_H
+#pragma once
 
 #include "servers/rendering/rendering_device.h"
 #include "servers/rendering_server.h"
@@ -78,9 +77,17 @@ private:
 	}
 
 	void _wait_for_all_pipelines() {
-		MutexLock local_lock(local_mutex);
-		for (KeyValue<uint32_t, WorkerThreadPool::TaskID> key_value : compilation_tasks) {
-			WorkerThreadPool::get_singleton()->wait_for_task_completion(key_value.value);
+		thread_local LocalVector<WorkerThreadPool::TaskID> tasks_to_wait;
+		tasks_to_wait.clear();
+		{
+			MutexLock local_lock(local_mutex);
+			for (KeyValue<uint32_t, WorkerThreadPool::TaskID> key_value : compilation_tasks) {
+				tasks_to_wait.push_back(key_value.value);
+			}
+		}
+
+		for (WorkerThreadPool::TaskID task_id : tasks_to_wait) {
+			WorkerThreadPool::get_singleton()->wait_for_task_completion(task_id);
 		}
 	}
 
@@ -138,17 +145,25 @@ public:
 	}
 
 	void wait_for_pipeline(uint32_t p_key_hash) {
-		MutexLock local_lock(local_mutex);
-		if (!compilation_set.has(p_key_hash)) {
-			// The pipeline was never submitted, we can't wait for it.
-			return;
+		WorkerThreadPool::TaskID task_id_to_wait = WorkerThreadPool::INVALID_TASK_ID;
+
+		{
+			MutexLock local_lock(local_mutex);
+			if (!compilation_set.has(p_key_hash)) {
+				// The pipeline was never submitted, we can't wait for it.
+				return;
+			}
+
+			HashMap<uint32_t, WorkerThreadPool::TaskID>::Iterator task_it = compilation_tasks.find(p_key_hash);
+			if (task_it != compilation_tasks.end()) {
+				// Wait for and remove the compilation task if it exists.
+				task_id_to_wait = task_it->value;
+				compilation_tasks.remove(task_it);
+			}
 		}
 
-		HashMap<uint32_t, WorkerThreadPool::TaskID>::Iterator task_it = compilation_tasks.find(p_key_hash);
-		if (task_it != compilation_tasks.end()) {
-			// Wait for and remove the compilation task if it exists.
-			WorkerThreadPool::get_singleton()->wait_for_task_completion(task_it->value);
-			compilation_tasks.remove(task_it);
+		if (task_id_to_wait != WorkerThreadPool::INVALID_TASK_ID) {
+			WorkerThreadPool::get_singleton()->wait_for_task_completion(task_id_to_wait);
 		}
 	}
 
@@ -217,5 +232,3 @@ public:
 		clear_pipelines();
 	}
 };
-
-#endif // PIPELINE_HASH_MAP_RD_H
diff --git a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
index 5cea736e..757601fa 100644
--- a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
@@ -370,7 +370,7 @@ static RD::RenderPrimitive _primitive_type_to_render_primitive(RS::PrimitiveType
 
 _FORCE_INLINE_ static uint32_t _indices_to_primitives(RS::PrimitiveType p_primitive, uint32_t p_indices) {
 	static const uint32_t divisor[RS::PRIMITIVE_MAX] = { 1, 2, 1, 3, 1 };
-	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 1 };
+	static const uint32_t subtractor[RS::PRIMITIVE_MAX] = { 0, 0, 1, 0, 2 };
 	return (p_indices - subtractor[p_primitive]) / divisor[p_primitive];
 }
 
@@ -379,7 +379,8 @@ RID RendererCanvasRenderRD::_create_base_uniform_set(RID p_to_render_target, boo
 	RendererRD::MaterialStorage *material_storage = RendererRD::MaterialStorage::get_singleton();
 
 	//re create canvas state
-	Vector<RD::Uniform> uniforms;
+	thread_local LocalVector<RD::Uniform> uniforms;
+	uniforms.clear();
 
 	{
 		RD::Uniform u;
@@ -1021,8 +1022,7 @@ void RendererCanvasRenderRD::light_update_shadow(RID p_rid, int p_shadow_index,
 
 	cl->shadow.z_far = p_far;
 	cl->shadow.y_offset = float(p_shadow_index * 2 + 1) / float(state.max_lights_per_render * 2);
-	Vector<Color> cc;
-	cc.push_back(Color(p_far, p_far, p_far, 1.0));
+	Color cc = Color(p_far, p_far, p_far, 1.0);
 
 	// First, do a culling pass and record what occluders need to be drawn for this light.
 	static thread_local LocalVector<OccluderPolygon *> occluders;
@@ -1075,7 +1075,7 @@ void RendererCanvasRenderRD::light_update_shadow(RID p_rid, int p_shadow_index,
 	}
 
 	Rect2i rect(0, p_shadow_index * 2, state.shadow_texture_size, 2);
-	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(state.shadow_fb, RD::DRAW_CLEAR_ALL, cc, 1.0f, 0, rect);
+	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(state.shadow_fb, RD::DRAW_CLEAR_ALL, VectorView(&cc, 1), 1.0f, 0, rect);
 
 	if (state.shadow_occluder_buffer.is_valid()) {
 		RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, shadow_render.render_pipelines[SHADOW_RENDER_MODE_POSITIONAL_SHADOW]);
@@ -1129,7 +1129,7 @@ void RendererCanvasRenderRD::light_update_directional_shadow(RID p_rid, int p_sh
 
 	Vector2 center = p_clip_rect.get_center();
 
-	float to_edge_distance = ABS(light_dir.dot(p_clip_rect.get_support(-light_dir)) - light_dir.dot(center));
+	float to_edge_distance = Math::abs(light_dir.dot(p_clip_rect.get_support(-light_dir)) - light_dir.dot(center));
 
 	Vector2 from_pos = center - light_dir * (to_edge_distance + p_cull_distance);
 	float distance = to_edge_distance * 2.0 + p_cull_distance;
@@ -1299,7 +1299,7 @@ void RendererCanvasRenderRD::occluder_polygon_set_shape(RID p_occluder, const Ve
 		}
 	}
 
-	if ((oc->line_point_count != lines.size() || lines.size() == 0) && oc->vertex_array.is_valid()) {
+	if ((oc->line_point_count != lines.size() || lines.is_empty()) && oc->vertex_array.is_valid()) {
 		RD::get_singleton()->free(oc->vertex_array);
 		RD::get_singleton()->free(oc->vertex_buffer);
 		RD::get_singleton()->free(oc->index_array);
@@ -1404,7 +1404,7 @@ void RendererCanvasRenderRD::occluder_polygon_set_shape(RID p_occluder, const Ve
 		}
 	}
 
-	if (((oc->sdf_index_count != sdf_indices.size() && oc->sdf_point_count != p_points.size()) || p_points.size() == 0) && oc->sdf_vertex_array.is_valid()) {
+	if (((oc->sdf_index_count != sdf_indices.size() && oc->sdf_point_count != p_points.size()) || p_points.is_empty()) && oc->sdf_vertex_array.is_valid()) {
 		RD::get_singleton()->free(oc->sdf_vertex_array);
 		RD::get_singleton()->free(oc->sdf_vertex_buffer);
 		RD::get_singleton()->free(oc->sdf_index_array);
@@ -1773,9 +1773,9 @@ RendererCanvasRenderRD::RendererCanvasRenderRD() {
 		actions.renames["CANVAS_MATRIX"] = "canvas_data.canvas_transform";
 		actions.renames["SCREEN_MATRIX"] = "canvas_data.screen_transform";
 		actions.renames["TIME"] = "canvas_data.time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["AT_LIGHT_PASS"] = "false";
 		actions.renames["INSTANCE_CUSTOM"] = "instance_custom";
 
@@ -1837,7 +1837,7 @@ RendererCanvasRenderRD::RendererCanvasRenderRD() {
 		actions.base_varying_index = 5;
 
 		actions.global_buffer_array_variable = "global_shader_uniforms.data";
-		actions.instance_uniform_index_variable = "draw_data.instance_uniforms_ofs";
+		actions.instance_uniform_index_variable = "instances.data[instance_index].instance_uniforms_ofs";
 
 		shader.compiler.initialize(actions);
 	}
@@ -2219,7 +2219,7 @@ void RendererCanvasRenderRD::_render_batch_items(RenderTarget p_to_render_target
 	RID framebuffer;
 	RID fb_uniform_set;
 	bool clear = false;
-	Vector<Color> clear_colors;
+	Color clear_color;
 
 	if (p_to_backbuffer) {
 		framebuffer = texture_storage->render_target_get_rd_backbuffer_framebuffer(p_to_render_target.render_target);
@@ -2230,7 +2230,7 @@ void RendererCanvasRenderRD::_render_batch_items(RenderTarget p_to_render_target
 
 		if (texture_storage->render_target_is_clear_requested(p_to_render_target.render_target)) {
 			clear = true;
-			clear_colors.push_back(texture_storage->render_target_get_clear_request_color(p_to_render_target.render_target));
+			clear_color = texture_storage->render_target_get_clear_request_color(p_to_render_target.render_target);
 			texture_storage->render_target_disable_clear_request(p_to_render_target.render_target);
 		}
 		// TODO: Obtain from framebuffer format eventually when this is implemented.
@@ -2243,7 +2243,7 @@ void RendererCanvasRenderRD::_render_batch_items(RenderTarget p_to_render_target
 
 	RD::FramebufferFormatID fb_format = RD::get_singleton()->framebuffer_get_format(framebuffer);
 
-	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(framebuffer, clear ? RD::DRAW_CLEAR_COLOR_0 : RD::DRAW_DEFAULT_ALL, clear_colors, 1.0f, 0, Rect2(), RDD::BreadcrumbMarker::UI_PASS);
+	RD::DrawListID draw_list = RD::get_singleton()->draw_list_begin(framebuffer, clear ? RD::DRAW_CLEAR_COLOR_0 : RD::DRAW_DEFAULT_ALL, clear_color, 1.0f, 0, Rect2(), RDD::BreadcrumbMarker::UI_PASS);
 
 	RD::get_singleton()->draw_list_bind_uniform_set(draw_list, fb_uniform_set, BASE_UNIFORM_SET);
 	RD::get_singleton()->draw_list_bind_uniform_set(draw_list, state.default_transforms_uniform_set, TRANSFORMS_UNIFORM_SET);
@@ -3200,7 +3200,7 @@ void RendererCanvasRenderRD::_render_batch(RD::DrawListID p_draw_list, CanvasSha
 }
 
 RendererCanvasRenderRD::Batch *RendererCanvasRenderRD::_new_batch(bool &r_batch_broken) {
-	if (state.canvas_instance_batches.size() == 0) {
+	if (state.canvas_instance_batches.is_empty()) {
 		Batch new_batch;
 		new_batch.instance_buffer_index = state.current_instance_buffer_index;
 		state.canvas_instance_batches.push_back(new_batch);
diff --git a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
index 0605b18b..23b29376 100644
--- a/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
+++ b/engine/servers/rendering/renderer_rd/renderer_canvas_render_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_CANVAS_RENDER_RD_H
-#define RENDERER_CANVAS_RENDER_RD_H
+#pragma once
 
 #include "core/templates/lru.h"
 #include "servers/rendering/renderer_canvas_render.h"
@@ -526,7 +525,7 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
 		uint32_t flags = 0;
 	};
 
-	HashMap<TextureState, TextureInfo, HashableHasher<TextureState>> texture_info_map;
+	HashMap<TextureState, TextureInfo, HashableHasher<TextureState>, HashMapComparatorDefault<TextureState>, PagedAllocator<HashMapElement<TextureState, TextureInfo>>> texture_info_map;
 
 	// per-frame buffers
 	struct DataBuffer {
@@ -667,5 +666,3 @@ public:
 	RendererCanvasRenderRD();
 	~RendererCanvasRenderRD();
 };
-
-#endif // RENDERER_CANVAS_RENDER_RD_H
diff --git a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
index 42780411..b84fd1ce 100644
--- a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.cpp
@@ -50,7 +50,8 @@ void RendererCompositorRD::blit_render_targets_to_screen(DisplayServer::WindowID
 		RID rd_texture = texture_storage->render_target_get_rd_texture(p_render_targets[i].render_target);
 		ERR_CONTINUE(rd_texture.is_null());
 
-		if (!render_target_descriptors.has(rd_texture) || !RD::get_singleton()->uniform_set_is_valid(render_target_descriptors[rd_texture])) {
+		HashMap<RID, RID>::Iterator it = render_target_descriptors.find(rd_texture);
+		if (it == render_target_descriptors.end() || !RD::get_singleton()->uniform_set_is_valid(it->value)) {
 			Vector<RD::Uniform> uniforms;
 			RD::Uniform u;
 			u.uniform_type = RD::UNIFORM_TYPE_SAMPLER_WITH_TEXTURE;
@@ -60,14 +61,14 @@ void RendererCompositorRD::blit_render_targets_to_screen(DisplayServer::WindowID
 			uniforms.push_back(u);
 			RID uniform_set = RD::get_singleton()->uniform_set_create(uniforms, blit.shader.version_get_shader(blit.shader_version, BLIT_MODE_NORMAL), 0);
 
-			render_target_descriptors[rd_texture] = uniform_set;
+			it = render_target_descriptors.insert(rd_texture, uniform_set);
 		}
 
 		Size2 screen_size(RD::get_singleton()->screen_get_width(p_screen), RD::get_singleton()->screen_get_height(p_screen));
 		BlitMode mode = p_render_targets[i].lens_distortion.apply ? BLIT_MODE_LENS : (p_render_targets[i].multi_view.use_layer ? BLIT_MODE_USE_LAYER : BLIT_MODE_NORMAL);
 		RD::get_singleton()->draw_list_bind_render_pipeline(draw_list, blit.pipelines[mode]);
 		RD::get_singleton()->draw_list_bind_index_array(draw_list, blit.array);
-		RD::get_singleton()->draw_list_bind_uniform_set(draw_list, render_target_descriptors[rd_texture], 0);
+		RD::get_singleton()->draw_list_bind_uniform_set(draw_list, it->value, 0);
 
 		// We need to invert the phone rotation.
 		const int screen_rotation_degrees = -RD::get_singleton()->screen_get_pre_rotation_degrees(p_screen);
diff --git a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h
index 41457e4f..782125db 100644
--- a/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h
+++ b/engine/servers/rendering/renderer_rd/renderer_compositor_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_COMPOSITOR_RD_H
-#define RENDERER_COMPOSITOR_RD_H
+#pragma once
 
 #include "core/io/image.h"
 #include "servers/rendering/renderer_compositor.h"
@@ -125,6 +124,7 @@ public:
 	void begin_frame(double frame_step);
 	void blit_render_targets_to_screen(DisplayServer::WindowID p_screen, const BlitToScreen *p_render_targets, int p_amount);
 
+	bool is_opengl() { return false; }
 	void gl_end_frame(bool p_swap_buffers) {}
 	void end_frame(bool p_present);
 	void finalize();
@@ -151,5 +151,3 @@ public:
 	RendererCompositorRD();
 	~RendererCompositorRD();
 };
-
-#endif // RENDERER_COMPOSITOR_RD_H
diff --git a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
index 4d7e8753..d53e33f3 100644
--- a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.cpp
@@ -309,16 +309,38 @@ void RendererSceneRenderRD::_process_compositor_effects(RS::CompositorEffectCall
 	Vector<RID> re_rids = comp_storage->compositor_get_compositor_effects(p_render_data->compositor, p_callback_type, true);
 
 	for (RID rid : re_rids) {
-		Array arr;
 		Callable callback = comp_storage->compositor_effect_get_callback(rid);
-
-		arr.push_back(p_callback_type);
-		arr.push_back(p_render_data);
-
+		Array arr = { p_callback_type, p_render_data };
 		callback.callv(arr);
 	}
 }
 
+void RendererSceneRenderRD::_render_buffers_ensure_screen_texture(const RenderDataRD *p_render_data) {
+	Ref<RenderSceneBuffersRD> rb = p_render_data->render_buffers;
+	ERR_FAIL_COND(rb.is_null());
+
+	if (!rb->has_internal_texture()) {
+		// We're likely rendering reflection probes where we can't use our backbuffers.
+		return;
+	}
+
+	bool can_use_storage = _render_buffers_can_be_storage();
+	Size2i size = rb->get_internal_size();
+
+	// When upscaling, the blur texture needs to be at the target size for post-processing to work. We prefer to use a
+	// dedicated backbuffer copy texture instead if the blur texture is not an option so shader effects work correctly.
+	Size2i target_size = rb->get_target_size();
+	bool internal_size_matches = (size.width == target_size.width) && (size.height == target_size.height);
+	bool reuse_blur_texture = !rb->has_upscaled_texture() || internal_size_matches;
+	if (reuse_blur_texture) {
+		rb->allocate_blur_textures();
+	} else {
+		uint32_t usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_COPY_TO_BIT;
+		usage_bits |= can_use_storage ? RD::TEXTURE_USAGE_STORAGE_BIT : RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
+		rb->create_texture(RB_SCOPE_BUFFERS, RB_TEX_BACK_COLOR, rb->get_base_data_format(), usage_bits);
+	}
+}
+
 void RendererSceneRenderRD::_render_buffers_copy_screen_texture(const RenderDataRD *p_render_data) {
 	Ref<RenderSceneBuffersRD> rb = p_render_data->render_buffers;
 	ERR_FAIL_COND(rb.is_null());
@@ -340,12 +362,8 @@ void RendererSceneRenderRD::_render_buffers_copy_screen_texture(const RenderData
 	bool internal_size_matches = (size.width == target_size.width) && (size.height == target_size.height);
 	bool reuse_blur_texture = !rb->has_upscaled_texture() || internal_size_matches;
 	if (reuse_blur_texture) {
-		rb->allocate_blur_textures();
 		texture_name = RB_TEX_BLUR_0;
 	} else {
-		uint32_t usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_COPY_TO_BIT;
-		usage_bits |= can_use_storage ? RD::TEXTURE_USAGE_STORAGE_BIT : RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT;
-		rb->create_texture(RB_SCOPE_BUFFERS, RB_TEX_BACK_COLOR, rb->get_base_data_format(), usage_bits);
 		texture_name = RB_TEX_BACK_COLOR;
 	}
 
@@ -377,6 +395,23 @@ void RendererSceneRenderRD::_render_buffers_copy_screen_texture(const RenderData
 	RD::get_singleton()->draw_command_end_label();
 }
 
+void RendererSceneRenderRD::_render_buffers_ensure_depth_texture(const RenderDataRD *p_render_data) {
+	Ref<RenderSceneBuffersRD> rb = p_render_data->render_buffers;
+	ERR_FAIL_COND(rb.is_null());
+
+	if (!rb->has_depth_texture()) {
+		// We're likely rendering reflection probes where we can't use our backbuffers.
+		return;
+	}
+
+	// Note, this only creates our back depth texture if we haven't already created it.
+	uint32_t usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT;
+	usage_bits |= RD::TEXTURE_USAGE_CAN_COPY_TO_BIT | RD::TEXTURE_USAGE_STORAGE_BIT;
+	usage_bits |= RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT; // Set this as color attachment because we're copying data into it, it's not actually used as a depth buffer
+
+	rb->create_texture(RB_SCOPE_BUFFERS, RB_TEX_BACK_DEPTH, RD::DATA_FORMAT_R32_SFLOAT, usage_bits, RD::TEXTURE_SAMPLES_1);
+}
+
 void RendererSceneRenderRD::_render_buffers_copy_depth_texture(const RenderDataRD *p_render_data) {
 	Ref<RenderSceneBuffersRD> rb = p_render_data->render_buffers;
 	ERR_FAIL_COND(rb.is_null());
@@ -388,13 +423,6 @@ void RendererSceneRenderRD::_render_buffers_copy_depth_texture(const RenderDataR
 
 	RD::get_singleton()->draw_command_begin_label("Copy depth texture");
 
-	// note, this only creates our back depth texture if we haven't already created it.
-	uint32_t usage_bits = RD::TEXTURE_USAGE_SAMPLING_BIT;
-	usage_bits |= RD::TEXTURE_USAGE_CAN_COPY_TO_BIT | RD::TEXTURE_USAGE_STORAGE_BIT;
-	usage_bits |= RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT; // set this as color attachment because we're copying data into it, it's not actually used as a depth buffer
-
-	rb->create_texture(RB_SCOPE_BUFFERS, RB_TEX_BACK_DEPTH, RD::DATA_FORMAT_R32_SFLOAT, usage_bits, RD::TEXTURE_SAMPLES_1);
-
 	bool can_use_storage = _render_buffers_can_be_storage();
 	Size2i size = rb->get_internal_size();
 	for (uint32_t v = 0; v < p_render_data->scene_data->view_count; v++) {
diff --git a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h
index ff06efa9..95e50067 100644
--- a/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h
+++ b/engine/servers/rendering/renderer_rd/renderer_scene_render_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_SCENE_RENDER_RD_H
-#define RENDERER_SCENE_RENDER_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_compositor.h"
 #include "servers/rendering/renderer_rd/effects/bokeh_dof.h"
@@ -103,7 +102,9 @@ protected:
 	bool _compositor_effects_has_flag(const RenderDataRD *p_render_data, RS::CompositorEffectFlags p_flag, RS::CompositorEffectCallbackType p_callback_type = RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY);
 	bool _has_compositor_effect(RS::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data);
 	void _process_compositor_effects(RS::CompositorEffectCallbackType p_callback_type, const RenderDataRD *p_render_data);
+	void _render_buffers_ensure_screen_texture(const RenderDataRD *p_render_data);
 	void _render_buffers_copy_screen_texture(const RenderDataRD *p_render_data);
+	void _render_buffers_ensure_depth_texture(const RenderDataRD *p_render_data);
 	void _render_buffers_copy_depth_texture(const RenderDataRD *p_render_data);
 	void _render_buffers_post_process_and_tonemap(const RenderDataRD *p_render_data);
 	void _post_process_subpass(RID p_source_texture, RID p_framebuffer, const RenderDataRD *p_render_data);
@@ -342,5 +343,3 @@ public:
 	RendererSceneRenderRD();
 	~RendererSceneRenderRD();
 };
-
-#endif // RENDERER_SCENE_RENDER_RD_H
diff --git a/engine/servers/rendering/renderer_rd/shader_rd.cpp b/engine/servers/rendering/renderer_rd/shader_rd.cpp
index cbdbe151..a8a9566f 100644
--- a/engine/servers/rendering/renderer_rd/shader_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/shader_rd.cpp
@@ -76,7 +76,7 @@ void ShaderRD::_add_stage(const char *p_code, StageType p_stage_type) {
 		} else if (l.begins_with("#CODE")) {
 			chunk.type = StageTemplate::Chunk::TYPE_CODE;
 			push_chunk = true;
-			chunk.code = l.replace_first("#CODE", String()).replace(":", "").strip_edges().to_upper();
+			chunk.code = l.replace_first("#CODE", String()).remove_char(':').strip_edges().to_upper();
 		} else if (l.begins_with("#include ")) {
 			String include_file = l.replace("#include ", "").strip_edges();
 			if (include_file[0] == '"') {
@@ -149,9 +149,9 @@ void ShaderRD::setup(const char *p_vertex_code, const char *p_fragment_code, con
 
 	StringBuilder tohash;
 	tohash.append("[GodotVersionNumber]");
-	tohash.append(VERSION_NUMBER);
+	tohash.append(GODOT_VERSION_NUMBER);
 	tohash.append("[GodotVersionHash]");
-	tohash.append(VERSION_HASH);
+	tohash.append(GODOT_VERSION_HASH);
 	tohash.append("[SpirvCacheKey]");
 	tohash.append(RenderingDevice::get_singleton()->shader_get_spirv_cache_key());
 	tohash.append("[BinaryCacheKey]");
@@ -187,8 +187,7 @@ void ShaderRD::_initialize_version(Version *p_version) {
 
 	p_version->variants.resize_zeroed(variant_defines.size());
 	p_version->variant_data.resize(variant_defines.size());
-	p_version->group_compilation_tasks.resize(group_enabled.size());
-	p_version->group_compilation_tasks.fill(0);
+	p_version->group_compilation_tasks.resize_zeroed(group_enabled.size());
 }
 
 void ShaderRD::_clear_version(Version *p_version) {
@@ -283,7 +282,7 @@ void ShaderRD::_compile_variant(uint32_t p_variant, CompileData p_data) {
 		current_source = builder.as_string();
 		RD::ShaderStageSPIRVData stage;
 		stage.spirv = RD::get_singleton()->shader_compile_spirv_from_source(RD::SHADER_STAGE_VERTEX, current_source, RD::SHADER_LANGUAGE_GLSL, &error);
-		if (stage.spirv.size() == 0) {
+		if (stage.spirv.is_empty()) {
 			build_ok = false;
 		} else {
 			stage.shader_stage = RD::SHADER_STAGE_VERTEX;
@@ -301,7 +300,7 @@ void ShaderRD::_compile_variant(uint32_t p_variant, CompileData p_data) {
 		current_source = builder.as_string();
 		RD::ShaderStageSPIRVData stage;
 		stage.spirv = RD::get_singleton()->shader_compile_spirv_from_source(RD::SHADER_STAGE_FRAGMENT, current_source, RD::SHADER_LANGUAGE_GLSL, &error);
-		if (stage.spirv.size() == 0) {
+		if (stage.spirv.is_empty()) {
 			build_ok = false;
 		} else {
 			stage.shader_stage = RD::SHADER_STAGE_FRAGMENT;
@@ -320,7 +319,7 @@ void ShaderRD::_compile_variant(uint32_t p_variant, CompileData p_data) {
 
 		RD::ShaderStageSPIRVData stage;
 		stage.spirv = RD::get_singleton()->shader_compile_spirv_from_source(RD::SHADER_STAGE_COMPUTE, current_source, RD::SHADER_LANGUAGE_GLSL, &error);
-		if (stage.spirv.size() == 0) {
+		if (stage.spirv.is_empty()) {
 			build_ok = false;
 		} else {
 			stage.shader_stage = RD::SHADER_STAGE_COMPUTE;
@@ -555,7 +554,7 @@ void ShaderRD::_compile_version_start(Version *p_version, int p_group) {
 	compile_data.version = p_version;
 	compile_data.group = p_group;
 
-	WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_singleton()->add_template_group_task(this, &ShaderRD::_compile_variant, compile_data, group_to_variant_map[p_group].size(), -1, true, SNAME("ShaderCompilation"));
+	WorkerThreadPool::GroupID group_task = WorkerThreadPool::get_named_pool(SNAME("ShaderCompilationPool"))->add_template_group_task(this, &ShaderRD::_compile_variant, compile_data, group_to_variant_map[p_group].size(), -1, true, SNAME("ShaderCompilation"));
 	p_version->group_compilation_tasks.write[p_group] = group_task;
 }
 
@@ -563,9 +562,8 @@ void ShaderRD::_compile_version_end(Version *p_version, int p_group) {
 	if (p_version->group_compilation_tasks.size() <= p_group || p_version->group_compilation_tasks[p_group] == 0) {
 		return;
 	}
-
 	WorkerThreadPool::GroupID group_task = p_version->group_compilation_tasks[p_group];
-	WorkerThreadPool::get_singleton()->wait_for_group_task_completion(group_task);
+	WorkerThreadPool::get_named_pool(SNAME("ShaderCompilationPool"))->wait_for_group_task_completion(group_task);
 	p_version->group_compilation_tasks.write[p_group] = 0;
 
 	bool all_valid = true;
diff --git a/engine/servers/rendering/renderer_rd/shader_rd.h b/engine/servers/rendering/renderer_rd/shader_rd.h
index 50b5ff21..e583ad86 100644
--- a/engine/servers/rendering/renderer_rd/shader_rd.h
+++ b/engine/servers/rendering/renderer_rd/shader_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_RD_H
-#define SHADER_RD_H
+#pragma once
 
 #include "core/os/mutex.h"
 #include "core/string/string_builder.h"
@@ -216,5 +215,3 @@ public:
 
 	virtual ~ShaderRD();
 };
-
-#endif // SHADER_RD_H
diff --git a/engine/servers/rendering/renderer_rd/shaders/canvas.glsl b/engine/servers/rendering/renderer_rd/shaders/canvas.glsl
index c1510a11..121a5955 100644
--- a/engine/servers/rendering/renderer_rd/shaders/canvas.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/canvas.glsl
@@ -25,10 +25,10 @@ layout(location = 11) in vec4 weight_attrib;
 #include "canvas_uniforms_inc.glsl"
 
 #ifndef USE_ATTRIBUTES
-
-layout(location = 4) out flat uint instance_index_interp;
-
-#endif // !USE_ATTRIBUTES
+layout(location = 4) out flat uint instance_index;
+#else
+#define instance_index params.base_instance_index
+#endif // USE_ATTRIBUTES
 
 layout(location = 0) out vec2 uv_interp;
 layout(location = 1) out vec4 color_interp;
@@ -65,11 +65,8 @@ void main() {
 	vec4 custom1 = vec4(0.0);
 #endif
 
-#ifdef USE_ATTRIBUTES
-	uint instance_index = params.base_instance_index;
-#else
-	uint instance_index = gl_InstanceIndex + params.base_instance_index;
-	instance_index_interp = instance_index;
+#ifndef USE_ATTRIBUTES
+	instance_index = gl_InstanceIndex + params.base_instance_index;
 #endif // USE_ATTRIBUTES
 	const InstanceData draw_data = instances.data[instance_index];
 
@@ -241,6 +238,8 @@ void main() {
 
 #ifndef USE_ATTRIBUTES
 layout(location = 4) in flat uint instance_index;
+#else
+#define instance_index params.base_instance_index
 #endif // USE_ATTRIBUTES
 
 layout(location = 0) in vec2 uv_interp;
@@ -302,6 +301,7 @@ vec4 light_compute(
 		vec2 screen_uv,
 		vec2 uv,
 		vec4 color, bool is_directional) {
+	const InstanceData draw_data = instances.data[instance_index];
 	vec4 light = vec4(0.0);
 	vec3 light_direction = vec3(0.0);
 
@@ -460,11 +460,7 @@ void main() {
 	vec2 uv = uv_interp;
 	vec2 vertex = vertex_interp;
 
-#ifdef USE_ATTRIBUTES
-	const InstanceData draw_data = instances.data[params.base_instance_index];
-#else
 	const InstanceData draw_data = instances.data[instance_index];
-#endif // USE_ATTRIBUTES
 
 #if !defined(USE_ATTRIBUTES) && !defined(USE_PRIMITIVE)
 
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/ssao.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/ssao.glsl
index 41a262b2..aff529ce 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/ssao.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/ssao.glsl
@@ -195,9 +195,9 @@ void SSAO_tap_inner(const int p_quality_level, inout float r_obscurance_sum, ino
 	float weight = 1.0;
 
 	if (p_quality_level >= SSAO_HALOING_REDUCTION_ENABLE_AT_QUALITY_PRESET) {
-		float reduct = max(0, -hit_delta.z);
-		reduct = clamp(reduct * params.neg_inv_radius + 2.0, 0.0, 1.0);
-		weight = SSAO_HALOING_REDUCTION_AMOUNT * reduct + (1.0 - SSAO_HALOING_REDUCTION_AMOUNT);
+		float reduce = max(0, -hit_delta.z);
+		reduce = clamp(reduce * params.neg_inv_radius + 2.0, 0.0, 1.0);
+		weight = SSAO_HALOING_REDUCTION_AMOUNT * reduce + (1.0 - SSAO_HALOING_REDUCTION_AMOUNT);
 	}
 	weight *= p_weight_mod;
 	r_obscurance_sum += obscurance * weight;
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/ssil.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/ssil.glsl
index 6dbd6c82..2265e30c 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/ssil.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/ssil.glsl
@@ -195,9 +195,9 @@ void SSIL_tap_inner(const int p_quality_level, inout vec3 r_color_sum, inout flo
 	float weight = 1.0;
 
 	if (p_quality_level >= SSIL_HALOING_REDUCTION_ENABLE_AT_QUALITY_PRESET) {
-		float reduct = max(0, -hit_delta.z);
-		reduct = clamp(reduct * params.neg_inv_radius + 2.0, 0.0, 1.0);
-		weight = SSIL_HALOING_REDUCTION_AMOUNT * reduct + (1.0 - SSIL_HALOING_REDUCTION_AMOUNT);
+		float reduce = max(0, -hit_delta.z);
+		reduce = clamp(reduce * params.neg_inv_radius + 2.0, 0.0, 1.0);
+		weight = SSIL_HALOING_REDUCTION_AMOUNT * reduce + (1.0 - SSIL_HALOING_REDUCTION_AMOUNT);
 	}
 
 	// Translate sampling_uv to last screen's coordinates
diff --git a/engine/servers/rendering/renderer_rd/shaders/effects/vrs.glsl b/engine/servers/rendering/renderer_rd/shaders/effects/vrs.glsl
index b4fcaa46..1d3463dd 100644
--- a/engine/servers/rendering/renderer_rd/shaders/effects/vrs.glsl
+++ b/engine/servers/rendering/renderer_rd/shaders/effects/vrs.glsl
@@ -59,7 +59,11 @@ layout(location = 0) in vec2 uv_interp;
 layout(set = 0, binding = 0) uniform sampler2D source_color;
 #endif /* USE_MULTIVIEW */
 
+#ifdef SPLIT_RG
+layout(location = 0) out vec2 frag_color;
+#else
 layout(location = 0) out uint frag_color;
+#endif
 
 layout(push_constant, std430) uniform Params {
 	float max_texel_factor;
@@ -79,6 +83,10 @@ void main() {
 	// Input is standardized. R for X, G for Y, 0.0 (0) = 1, 0.33 (85) = 2, 0.66 (170) = 3, 1.0 (255) = 8
 	vec4 color = textureLod(source_color, uv, 0.0);
 
+#ifdef SPLIT_RG
+	// Density map for VRS according to VK_EXT_fragment_density_map, we can use as is.
+	frag_color = max(vec2(1.0f) - color.rg, vec2(1.0f / 255.0f));
+#else
 	// Output image shading rate image for VRS according to VK_KHR_fragment_shading_rate.
 	color.r = clamp(floor(color.r * params.max_texel_factor + 0.1), 0.0, params.max_texel_factor);
 	color.g = clamp(floor(color.g * params.max_texel_factor + 0.1), 0.0, params.max_texel_factor);
@@ -94,4 +102,5 @@ void main() {
 	// Encode to frag_color;
 	frag_color = int(color.r + 0.1) << 2;
 	frag_color += int(color.g + 0.1);
+#endif
 }
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h
index f3974dc9..b9d50a12 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/forward_id_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef FORWARD_ID_STORAGE_H
-#define FORWARD_ID_STORAGE_H
+#pragma once
 
 #include <stdint.h>
 
@@ -64,5 +63,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // FORWARD_ID_STORAGE_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
index 83a3c117..f4398743 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.cpp
@@ -643,7 +643,7 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 				if (RendererSceneRenderRD::get_singleton()->is_using_physical_light_units()) {
 					light_data.energy *= light->param[RS::LIGHT_PARAM_INTENSITY];
 				} else {
-					light_data.energy *= Math_PI;
+					light_data.energy *= Math::PI;
 				}
 
 				if (p_render_data->camera_attributes.is_valid()) {
@@ -714,7 +714,9 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 						light_data.shadow_split_offsets[j] = split;
 						float bias_scale = light_instance->shadow_transform[j].bias_scale * light_data.soft_shadow_scale;
 						light_data.shadow_bias[j] = light->param[RS::LIGHT_PARAM_SHADOW_BIAS] / 100.0 * bias_scale;
-						light_data.shadow_normal_bias[j] = light->param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] * light_instance->shadow_transform[j].shadow_texel_size;
+						// Use lower shadow normal bias for distant splits, relative to the share taken by the split.
+						// This helps reduce peter-panning at a distance.
+						light_data.shadow_normal_bias[j] = light->param[RS::LIGHT_PARAM_SHADOW_NORMAL_BIAS] * light_instance->shadow_transform[j].shadow_texel_size * light_data.shadow_split_offsets[0] / split;
 						light_data.shadow_transmittance_bias[j] = light->param[RS::LIGHT_PARAM_TRANSMITTANCE_BIAS] / 100.0 * bias_scale;
 						light_data.shadow_z_range[j] = light_instance->shadow_transform[j].farplane;
 						light_data.shadow_range_begin[j] = light_instance->shadow_transform[j].range_begin;
@@ -864,14 +866,14 @@ void LightStorage::update_light_buffers(RenderDataRD *p_render_data, const Paged
 
 			// Convert from Luminous Power to Luminous Intensity
 			if (type == RS::LIGHT_OMNI) {
-				energy *= 1.0 / (Math_PI * 4.0);
+				energy *= 1.0 / (Math::PI * 4.0);
 			} else {
 				// Spot Lights are not physically accurate, Luminous Intensity should change in relation to the cone angle.
 				// We make this assumption to keep them easy to control.
-				energy *= 1.0 / Math_PI;
+				energy *= 1.0 / Math::PI;
 			}
 		} else {
-			energy *= Math_PI;
+			energy *= Math::PI;
 		}
 
 		if (p_render_data->camera_attributes.is_valid()) {
@@ -1998,7 +2000,7 @@ void LightStorage::lightmap_tap_sh_light(RID p_lightmap, const Vector3 &p_point,
 		return; //nothing could be done
 	}
 
-	node = ABS(node) - 1;
+	node = Math::abs(node) - 1;
 
 	uint32_t *tetrahedron = (uint32_t *)&lm->tetrahedra[node * 4];
 	Vector3 points[4] = { lm->points[tetrahedron[0]], lm->points[tetrahedron[1]], lm->points[tetrahedron[2]], lm->points[tetrahedron[3]] };
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h
index 73543ce6..75a9a566 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/light_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_STORAGE_RD_H
-#define LIGHT_STORAGE_RD_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_array.h"
@@ -1164,5 +1163,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // LIGHT_STORAGE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
index 34ddb287..1e4d4981 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.cpp
@@ -1137,7 +1137,7 @@ bool MaterialStorage::MaterialData::update_parameters_uniform_set(const HashMap<
 		update_textures(p_parameters, p_default_texture_params, p_texture_uniforms, texture_cache.ptrw(), p_use_linear_color, p_3d_material);
 	}
 
-	if (p_ubo_size == 0 && (p_texture_uniforms.size() == 0)) {
+	if (p_ubo_size == 0 && (p_texture_uniforms.is_empty())) {
 		// This material does not require an uniform set, so don't create it.
 		return false;
 	}
@@ -1705,7 +1705,7 @@ void MaterialStorage::global_shader_parameters_load_settings(bool p_load_texture
 
 	for (const PropertyInfo &E : settings) {
 		if (E.name.begins_with("shader_globals/")) {
-			StringName name = E.name.get_slice("/", 1);
+			StringName name = E.name.get_slicec('/', 1);
 			Dictionary d = GLOBAL_GET(E.name);
 
 			ERR_CONTINUE(!d.has("type"));
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h
index 50452448..f9031b08 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/material_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATERIAL_STORAGE_RD_H
-#define MATERIAL_STORAGE_RD_H
+#pragma once
 
 #include "texture_storage.h"
 
@@ -469,5 +468,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // MATERIAL_STORAGE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
index 5b8ed343..b2af74d5 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/mesh_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_STORAGE_RD_H
-#define MESH_STORAGE_RD_H
+#pragma once
 
 #include "../../rendering_server_globals.h"
 #include "core/templates/local_vector.h"
@@ -799,5 +798,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // MESH_STORAGE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
index d82ffed6..5765550b 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.cpp
@@ -80,9 +80,9 @@ ParticlesStorage::ParticlesStorage() {
 		}
 		actions.renames["TRANSFORM"] = "PARTICLE.xform";
 		actions.renames["TIME"] = "frame_history.data[0].time";
-		actions.renames["PI"] = _MKSTR(Math_PI);
-		actions.renames["TAU"] = _MKSTR(Math_TAU);
-		actions.renames["E"] = _MKSTR(Math_E);
+		actions.renames["PI"] = String::num(Math::PI);
+		actions.renames["TAU"] = String::num(Math::TAU);
+		actions.renames["E"] = String::num(Math::E);
 		actions.renames["LIFETIME"] = "params.lifetime";
 		actions.renames["DELTA"] = "local_delta";
 		actions.renames["NUMBER"] = "particle_number";
@@ -765,7 +765,8 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 	MaterialStorage *material_storage = MaterialStorage::get_singleton();
 
 	if (p_particles->particles_material_uniform_set.is_null() || !RD::get_singleton()->uniform_set_is_valid(p_particles->particles_material_uniform_set)) {
-		Vector<RD::Uniform> uniforms;
+		thread_local LocalVector<RD::Uniform> uniforms;
+		uniforms.clear();
 
 		{
 			RD::Uniform u;
@@ -814,7 +815,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 		p_particles->particles_material_uniform_set = RD::get_singleton()->uniform_set_create(uniforms, particles_shader.default_shader_rd, 1);
 	}
 
-	double new_phase = Math::fmod((double)p_particles->phase + (p_delta / p_particles->lifetime) * p_particles->speed_scale, 1.0);
+	double new_phase = Math::fmod((double)p_particles->phase + (p_delta / p_particles->lifetime), 1.0);
 
 	//move back history (if there is any)
 	for (uint32_t i = p_particles->frame_history.size() - 1; i > 0; i--) {
@@ -839,7 +840,7 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 	p_particles->phase = new_phase;
 
 	frame_params.time = RendererCompositorRD::get_singleton()->get_total_time();
-	frame_params.delta = p_delta * p_particles->speed_scale;
+	frame_params.delta = p_delta;
 	frame_params.random_seed = p_particles->random_seed;
 	frame_params.explosiveness = p_particles->explosiveness;
 	frame_params.randomness = p_particles->randomness;
@@ -1071,7 +1072,8 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 				RD::get_singleton()->free(p_particles->collision_textures_uniform_set);
 			}
 
-			Vector<RD::Uniform> uniforms;
+			thread_local LocalVector<RD::Uniform> uniforms;
+			uniforms.clear();
 
 			{
 				RD::Uniform u;
@@ -1158,6 +1160,10 @@ void ParticlesStorage::_particles_process(Particles *p_particles, double p_delta
 		//fill the trail params
 		for (uint32_t i = 0; i < p_particles->trail_params.size(); i++) {
 			uint32_t src_idx = i * p_particles->frame_history.size() / p_particles->trail_params.size();
+			if (p_particles->speed_scale <= 0.0) {
+				// Stop trails.
+				src_idx = 0;
+			}
 			p_particles->trail_params[i] = p_particles->frame_history[src_idx];
 		}
 	} else {
@@ -1529,7 +1535,6 @@ void ParticlesStorage::update_particles() {
 			}
 		}
 
-		bool zero_time_scale = Engine::get_singleton()->get_time_scale() <= 0.0;
 		double todo = particles->request_process_time;
 		if (particles->clear) {
 			todo += particles->pre_process_time;
@@ -1554,37 +1559,26 @@ void ParticlesStorage::update_particles() {
 			particles->speed_scale = tmp_scale;
 		}
 
+		double time_scale = MAX(particles->speed_scale, 0.0);
+
 		if (fixed_fps > 0) {
-			double frame_time;
-			double decr;
-			if (zero_time_scale) {
-				frame_time = 0.0;
-				decr = 1.0 / fixed_fps;
-			} else {
-				frame_time = 1.0 / fixed_fps;
-				decr = frame_time;
-			}
+			double frame_time = 1.0 / fixed_fps;
 			double delta = RendererCompositorRD::get_singleton()->get_frame_delta_time();
 			if (delta > 0.1) { //avoid recursive stalls if fps goes below 10
 				delta = 0.1;
 			} else if (delta <= 0.0) { //unlikely but..
 				delta = 0.001;
 			}
-			todo = particles->frame_remainder + delta;
+			todo = particles->frame_remainder + delta * time_scale;
 
 			while (todo >= frame_time || particles->clear) {
 				_particles_process(particles, frame_time);
-				todo -= decr;
+				todo -= frame_time;
 			}
 
 			particles->frame_remainder = todo;
-
 		} else {
-			if (zero_time_scale) {
-				_particles_process(particles, 0.0);
-			} else {
-				_particles_process(particles, RendererCompositorRD::get_singleton()->get_frame_delta_time());
-			}
+			_particles_process(particles, RendererCompositorRD::get_singleton()->get_frame_delta_time() * time_scale);
 		}
 
 		// Ensure that memory is initialized (the code above should ensure that _particles_process is always called at least once upon clearing).
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h
index 9c46968f..ecd0921a 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/particles_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLES_STORAGE_RD_H
-#define PARTICLES_STORAGE_RD_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "core/templates/rid_owner.h"
@@ -597,5 +596,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // PARTICLES_STORAGE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_buffer_custom_data_rd.h b/engine/servers/rendering/renderer_rd/storage_rd/render_buffer_custom_data_rd.h
index c0b3f098..bbb5c051 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_buffer_custom_data_rd.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_buffer_custom_data_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_BUFFER_CUSTOM_DATA_RD_H
-#define RENDER_BUFFER_CUSTOM_DATA_RD_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -44,5 +43,3 @@ public:
 
 private:
 };
-
-#endif // RENDER_BUFFER_CUSTOM_DATA_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h b/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h
index ddb77a5f..5f33f588 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_data_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_DATA_RD_H
-#define RENDER_DATA_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h"
 #include "servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h"
@@ -96,5 +95,3 @@ public:
 
 	uint32_t voxel_gi_count = 0;
 };
-
-#endif // RENDER_DATA_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
index 26dec52d..feadee1f 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.cpp
@@ -325,9 +325,7 @@ RID RenderSceneBuffersRD::create_texture_from_format(const StringName &p_context
 	named_texture.is_unique = p_unique;
 	named_texture.texture = RD::get_singleton()->texture_create(p_texture_format, p_view);
 
-	Array arr;
-	arr.push_back(p_context);
-	arr.push_back(p_texture_name);
+	Array arr = { p_context, p_texture_name };
 	RD::get_singleton()->set_resource_name(named_texture.texture, String("RenderBuffer {0}/{1}").format(arr));
 
 	update_sizes(named_texture);
@@ -366,9 +364,7 @@ RID RenderSceneBuffersRD::create_texture_view(const StringName &p_context, const
 
 	view_texture.texture = RD::get_singleton()->texture_create_shared(p_view, named_texture.texture);
 
-	Array arr;
-	arr.push_back(p_context);
-	arr.push_back(p_view_name);
+	Array arr = { p_context, p_view_name };
 	RD::get_singleton()->set_resource_name(view_texture.texture, String("RenderBuffer View {0}/{1}").format(arr));
 
 	update_sizes(named_texture);
@@ -446,18 +442,19 @@ RID RenderSceneBuffersRD::get_texture_slice_view(const StringName &p_context, co
 	RID &slice = named_texture.slices[slice_key];
 	slice = RD::get_singleton()->texture_create_shared_from_slice(p_view, named_texture.texture, p_layer, p_mipmap, p_mipmaps, p_layers > 1 ? RD::TEXTURE_SLICE_2D_ARRAY : RD::TEXTURE_SLICE_2D, p_layers);
 
-	Array arr;
-	arr.push_back(p_context);
-	arr.push_back(p_texture_name);
-	arr.push_back(itos(p_layer));
-	arr.push_back(itos(p_layers));
-	arr.push_back(itos(p_mipmap));
-	arr.push_back(itos(p_mipmaps));
-	arr.push_back(itos(p_view.format_override));
-	arr.push_back(itos(p_view.swizzle_r));
-	arr.push_back(itos(p_view.swizzle_g));
-	arr.push_back(itos(p_view.swizzle_b));
-	arr.push_back(itos(p_view.swizzle_a));
+	Array arr = {
+		p_context,
+		p_texture_name,
+		itos(p_layer),
+		itos(p_layers),
+		itos(p_mipmap),
+		itos(p_mipmaps),
+		itos(p_view.format_override),
+		itos(p_view.swizzle_r),
+		itos(p_view.swizzle_g),
+		itos(p_view.swizzle_b),
+		itos(p_view.swizzle_a)
+	};
 	RD::get_singleton()->set_resource_name(slice, String("RenderBuffer {0}/{1}, layer {2}/{3}, mipmap {4}/{5}, view {6}/{7}/{8}/{9}/{10}").format(arr));
 
 	// and return our slice
@@ -756,9 +753,9 @@ uint32_t RenderSceneBuffersRD::get_velocity_usage_bits(bool p_resolve, bool p_ms
 }
 
 RD::DataFormat RenderSceneBuffersRD::get_vrs_format() {
-	return RD::DATA_FORMAT_R8_UINT;
+	return RD::get_singleton()->vrs_get_format();
 }
 
 uint32_t RenderSceneBuffersRD::get_vrs_usage_bits() {
-	return RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT;
+	return RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT;
 }
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
index 74e68f7e..2df43c28 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_buffers_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_SCENE_BUFFERS_RD_H
-#define RENDER_SCENE_BUFFERS_RD_H
+#pragma once
 
 #ifdef METAL_ENABLED
 #include "../effects/metal_fx.h"
@@ -451,5 +450,3 @@ public:
 	// 2 full size, 2 half size
 	WeightBuffers weight_buffers[4]; // Only used in raster
 };
-
-#endif // RENDER_SCENE_BUFFERS_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h
index 2ea028c7..687d8c13 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/render_scene_data_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_SCENE_DATA_RD_H
-#define RENDER_SCENE_DATA_RD_H
+#pragma once
 
 #include "servers/rendering/renderer_scene_render.h"
 #include "servers/rendering/storage/render_scene_data.h"
@@ -174,5 +173,3 @@ private:
 		UBO prev_ubo;
 	};
 };
-
-#endif // RENDER_SCENE_DATA_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
index 02b28473..aae3d7de 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.cpp
@@ -482,17 +482,15 @@ TextureStorage::TextureStorage() {
 		}
 	}
 
-	{ //create default VRS
-
+	{
+		// Create default VRS texture.
+		bool vrs_supported = RD::get_singleton()->has_feature(RD::SUPPORTS_ATTACHMENT_VRS);
 		RD::TextureFormat tformat;
-		tformat.format = RD::DATA_FORMAT_R8_UINT;
+		tformat.format = vrs_supported ? RD::get_singleton()->vrs_get_format() : RD::DATA_FORMAT_R8_UINT;
 		tformat.width = 4;
 		tformat.height = 4;
-		tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT | RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT;
+		tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_STORAGE_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT | (vrs_supported ? RD::TEXTURE_USAGE_VRS_ATTACHMENT_BIT : 0);
 		tformat.texture_type = RD::TEXTURE_TYPE_2D;
-		if (!RD::get_singleton()->has_feature(RD::SUPPORTS_ATTACHMENT_VRS)) {
-			tformat.usage_bits = RD::TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT;
-		}
 
 		Vector<uint8_t> pv;
 		pv.resize(4 * 4);
@@ -1275,15 +1273,21 @@ RID TextureStorage::texture_create_from_native_handle(RS::TextureType p_type, Im
 			break;
 
 		case Image::FORMAT_ASTC_4x4:
-		case Image::FORMAT_ASTC_4x4_HDR:
 			format = RD::DATA_FORMAT_ASTC_4x4_UNORM_BLOCK;
 			break;
 
+		case Image::FORMAT_ASTC_4x4_HDR:
+			format = RD::DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK;
+			break;
+
 		case Image::FORMAT_ASTC_8x8:
-		case Image::FORMAT_ASTC_8x8_HDR:
 			format = RD::DATA_FORMAT_ASTC_8x8_UNORM_BLOCK;
 			break;
 
+		case Image::FORMAT_ASTC_8x8_HDR:
+			format = RD::DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK;
+			break;
+
 		default:
 			// Arbitrary fallback.
 			format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
@@ -1639,8 +1643,8 @@ void TextureStorage::texture_debug_usage(List<RS::TextureInfo> *r_info) {
 	List<RID> textures;
 	texture_owner.get_owned_list(&textures);
 
-	for (List<RID>::Element *E = textures.front(); E; E = E->next()) {
-		Texture *t = texture_owner.get_or_null(E->get());
+	for (const RID &rid : textures) {
+		Texture *t = texture_owner.get_or_null(rid);
 		if (!t) {
 			continue;
 		}
@@ -2197,24 +2201,16 @@ Ref<Image> TextureStorage::_validate_texture_format(const Ref<Image> &p_image, T
 			r_format.swizzle_b = RD::TEXTURE_SWIZZLE_ZERO;
 			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_ONE;
 		} break;
-		case Image::FORMAT_ASTC_4x4:
-		case Image::FORMAT_ASTC_4x4_HDR: {
+		case Image::FORMAT_ASTC_4x4: {
 			if (RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_ASTC_4x4_UNORM_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT)) {
 				r_format.format = RD::DATA_FORMAT_ASTC_4x4_UNORM_BLOCK;
-				if (p_image->get_format() == Image::FORMAT_ASTC_4x4) {
-					r_format.format_srgb = RD::DATA_FORMAT_ASTC_4x4_SRGB_BLOCK;
-				}
+				r_format.format_srgb = RD::DATA_FORMAT_ASTC_4x4_SRGB_BLOCK;
 			} else {
 				//not supported, reconvert
 				image->decompress();
-				if (p_image->get_format() == Image::FORMAT_ASTC_4x4) {
-					r_format.format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
-					r_format.format_srgb = RD::DATA_FORMAT_R8G8B8A8_SRGB;
-					image->convert(Image::FORMAT_RGBA8);
-				} else {
-					r_format.format = RD::DATA_FORMAT_R16G16B16A16_SFLOAT;
-					image->convert(Image::FORMAT_RGBAH);
-				}
+				r_format.format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
+				r_format.format_srgb = RD::DATA_FORMAT_R8G8B8A8_SRGB;
+				image->convert(Image::FORMAT_RGBA8);
 			}
 			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
 			r_format.swizzle_g = RD::TEXTURE_SWIZZLE_G;
@@ -2222,24 +2218,31 @@ Ref<Image> TextureStorage::_validate_texture_format(const Ref<Image> &p_image, T
 			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
 
 		} break; // astc 4x4
-		case Image::FORMAT_ASTC_8x8:
-		case Image::FORMAT_ASTC_8x8_HDR: {
-			if (RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_ASTC_8x8_UNORM_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT)) {
-				r_format.format = RD::DATA_FORMAT_ASTC_8x8_UNORM_BLOCK;
-				if (p_image->get_format() == Image::FORMAT_ASTC_8x8) {
-					r_format.format_srgb = RD::DATA_FORMAT_ASTC_8x8_SRGB_BLOCK;
-				}
+		case Image::FORMAT_ASTC_4x4_HDR: {
+			if (RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT)) {
+				r_format.format = RD::DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK;
 			} else {
 				//not supported, reconvert
 				image->decompress();
-				if (p_image->get_format() == Image::FORMAT_ASTC_8x8) {
-					r_format.format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
-					r_format.format_srgb = RD::DATA_FORMAT_R8G8B8A8_SRGB;
-					image->convert(Image::FORMAT_RGBA8);
-				} else {
-					r_format.format = RD::DATA_FORMAT_R16G16B16A16_SFLOAT;
-					image->convert(Image::FORMAT_RGBAH);
-				}
+				r_format.format = RD::DATA_FORMAT_R16G16B16A16_SFLOAT;
+				image->convert(Image::FORMAT_RGBAH);
+			}
+			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
+			r_format.swizzle_g = RD::TEXTURE_SWIZZLE_G;
+			r_format.swizzle_b = RD::TEXTURE_SWIZZLE_B;
+			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
+
+		} break; // astc 4x4 HDR
+		case Image::FORMAT_ASTC_8x8: {
+			if (RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_ASTC_8x8_UNORM_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT)) {
+				r_format.format = RD::DATA_FORMAT_ASTC_8x8_UNORM_BLOCK;
+				r_format.format_srgb = RD::DATA_FORMAT_ASTC_8x8_SRGB_BLOCK;
+			} else {
+				//not supported, reconvert
+				image->decompress();
+				r_format.format = RD::DATA_FORMAT_R8G8B8A8_UNORM;
+				r_format.format_srgb = RD::DATA_FORMAT_R8G8B8A8_SRGB;
+				image->convert(Image::FORMAT_RGBA8);
 			}
 			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
 			r_format.swizzle_g = RD::TEXTURE_SWIZZLE_G;
@@ -2247,6 +2250,21 @@ Ref<Image> TextureStorage::_validate_texture_format(const Ref<Image> &p_image, T
 			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
 
 		} break; // astc 8x8
+		case Image::FORMAT_ASTC_8x8_HDR: {
+			if (RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT | RD::TEXTURE_USAGE_CAN_UPDATE_BIT)) {
+				r_format.format = RD::DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK;
+			} else {
+				//not supported, reconvert
+				image->decompress();
+				r_format.format = RD::DATA_FORMAT_R16G16B16A16_SFLOAT;
+				image->convert(Image::FORMAT_RGBAH);
+			}
+			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
+			r_format.swizzle_g = RD::TEXTURE_SWIZZLE_G;
+			r_format.swizzle_b = RD::TEXTURE_SWIZZLE_B;
+			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
+
+		} break; // astc 8x8 HDR
 
 		default: {
 		}
@@ -2589,7 +2607,7 @@ void TextureStorage::_texture_format_from_rd(RD::DataFormat p_rd_format, Texture
 			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
 		} break;
 		case RD::DATA_FORMAT_ASTC_4x4_SRGB_BLOCK: {
-			r_format.image_format = Image::FORMAT_ASTC_4x4_HDR;
+			r_format.image_format = Image::FORMAT_ASTC_4x4;
 			r_format.rd_format = RD::DATA_FORMAT_ASTC_4x4_UNORM_BLOCK;
 			r_format.rd_format_srgb = RD::DATA_FORMAT_ASTC_4x4_SRGB_BLOCK;
 			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
@@ -2597,6 +2615,14 @@ void TextureStorage::_texture_format_from_rd(RD::DataFormat p_rd_format, Texture
 			r_format.swizzle_b = RD::TEXTURE_SWIZZLE_B;
 			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
 
+		} break;
+		case RD::DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK: {
+			r_format.image_format = Image::FORMAT_ASTC_4x4_HDR;
+			r_format.rd_format = RD::DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK;
+			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
+			r_format.swizzle_g = RD::TEXTURE_SWIZZLE_G;
+			r_format.swizzle_b = RD::TEXTURE_SWIZZLE_B;
+			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
 		} break; // astc 4x4
 		case RD::DATA_FORMAT_ASTC_8x8_UNORM_BLOCK: {
 			// Q: Do we do as we do below, just create the sRGB variant?
@@ -2608,14 +2634,21 @@ void TextureStorage::_texture_format_from_rd(RD::DataFormat p_rd_format, Texture
 			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
 		} break;
 		case RD::DATA_FORMAT_ASTC_8x8_SRGB_BLOCK: {
-			r_format.image_format = Image::FORMAT_ASTC_8x8_HDR;
+			r_format.image_format = Image::FORMAT_ASTC_8x8;
 			r_format.rd_format = RD::DATA_FORMAT_ASTC_8x8_UNORM_BLOCK;
 			r_format.rd_format_srgb = RD::DATA_FORMAT_ASTC_8x8_SRGB_BLOCK;
 			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
 			r_format.swizzle_g = RD::TEXTURE_SWIZZLE_G;
 			r_format.swizzle_b = RD::TEXTURE_SWIZZLE_B;
 			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
-
+		} break;
+		case RD::DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK: {
+			r_format.image_format = Image::FORMAT_ASTC_8x8_HDR;
+			r_format.rd_format = RD::DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK;
+			r_format.swizzle_r = RD::TEXTURE_SWIZZLE_R;
+			r_format.swizzle_g = RD::TEXTURE_SWIZZLE_G;
+			r_format.swizzle_b = RD::TEXTURE_SWIZZLE_B;
+			r_format.swizzle_a = RD::TEXTURE_SWIZZLE_A;
 		} break; // astc 8x8
 
 		default: {
@@ -3684,7 +3717,7 @@ RID TextureStorage::render_target_get_rd_texture_slice(RID p_render_target, uint
 		return rt->color;
 	} else {
 		ERR_FAIL_UNSIGNED_INDEX_V(p_layer, rt->view_count, RID());
-		if (rt->color_slices.size() == 0) {
+		if (rt->color_slices.is_empty()) {
 			for (uint32_t v = 0; v < rt->view_count; v++) {
 				RID slice = RD::get_singleton()->texture_create_shared_from_slice(RD::TextureView(), rt->color, v, 0);
 				rt->color_slices.push_back(slice);
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h
index 2073c34d..89690498 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/texture_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_STORAGE_RD_H
-#define TEXTURE_STORAGE_RD_H
+#pragma once
 
 #include "core/templates/paged_array.h"
 #include "core/templates/rid_owner.h"
@@ -820,5 +819,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // TEXTURE_STORAGE_RD_H
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp b/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp
index 068d82d4..9e0c9476 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp
+++ b/engine/servers/rendering/renderer_rd/storage_rd/utilities.cpp
@@ -286,6 +286,10 @@ bool Utilities::has_os_feature(const String &p_feature) const {
 		return true;
 	}
 
+	if (p_feature == "astc_hdr" && RD::get_singleton()->texture_is_format_supported_for_usage(RD::DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK, RD::TEXTURE_USAGE_SAMPLING_BIT)) {
+		return true;
+	}
+
 	return false;
 }
 
diff --git a/engine/servers/rendering/renderer_rd/storage_rd/utilities.h b/engine/servers/rendering/renderer_rd/storage_rd/utilities.h
index fbcc86b0..dc21b2f7 100644
--- a/engine/servers/rendering/renderer_rd/storage_rd/utilities.h
+++ b/engine/servers/rendering/renderer_rd/storage_rd/utilities.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UTILITIES_RD_H
-#define UTILITIES_RD_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/storage/utilities.h"
@@ -122,5 +121,3 @@ public:
 };
 
 } // namespace RendererRD
-
-#endif // UTILITIES_RD_H
diff --git a/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h b/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h
index 0860e672..12bc9e08 100644
--- a/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h
+++ b/engine/servers/rendering/renderer_rd/uniform_set_cache_rd.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef UNIFORM_SET_CACHE_RD_H
-#define UNIFORM_SET_CACHE_RD_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 #include "core/templates/paged_allocator.h"
@@ -226,5 +225,3 @@ public:
 	UniformSetCacheRD();
 	~UniformSetCacheRD();
 };
-
-#endif // UNIFORM_SET_CACHE_RD_H
diff --git a/engine/servers/rendering/renderer_scene_cull.cpp b/engine/servers/rendering/renderer_scene_cull.cpp
index 49f93cbb..b9c6c086 100644
--- a/engine/servers/rendering/renderer_scene_cull.cpp
+++ b/engine/servers/rendering/renderer_scene_cull.cpp
@@ -2121,7 +2121,7 @@ void RendererSceneCull::_update_instance_aabb(Instance *p_instance) const {
 }
 
 void RendererSceneCull::_update_instance_lightmap_captures(Instance *p_instance) const {
-	bool first_set = p_instance->lightmap_sh.size() == 0;
+	bool first_set = p_instance->lightmap_sh.is_empty();
 	p_instance->lightmap_sh.resize(9); //using SH
 	p_instance->lightmap_target_sh.resize(9); //using SH
 	Color *instance_sh = p_instance->lightmap_target_sh.ptrw();
@@ -2167,7 +2167,7 @@ void RendererSceneCull::_update_instance_lightmap_captures(Instance *p_instance)
 
 		Vector3 inner_pos = ((lm_pos - bounds.position) / bounds.size) * 2.0 - Vector3(1.0, 1.0, 1.0);
 
-		real_t blend = MAX(ABS(inner_pos.x), MAX(ABS(inner_pos.y), ABS(inner_pos.z)));
+		real_t blend = MAX(Math::abs(inner_pos.x), MAX(Math::abs(inner_pos.y), Math::abs(inner_pos.z)));
 		//make blend more rounded
 		blend = Math::lerp(inner_pos.length(), blend, blend);
 		blend *= blend;
@@ -2726,6 +2726,7 @@ void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_bu
 		}
 
 		camera_data.set_camera(transform, projection, is_orthogonal, is_frustum, vaspect, jitter, taa_frame_count, camera->visible_layers);
+#ifndef XR_DISABLED
 	} else {
 		XRServer *xr_server = XRServer::get_singleton();
 
@@ -2763,6 +2764,7 @@ void RendererSceneCull::render_camera(const Ref<RenderSceneBuffers> &p_render_bu
 		} else {
 			// this won't be called (see fail check above) but keeping this comment to indicate we may support more then 2 views in the future...
 		}
+#endif // XR_DISABLED
 	}
 
 	RID environment = _render_get_environment(p_camera, p_scenario);
@@ -3665,7 +3667,7 @@ bool RendererSceneCull::_render_reflection_probe_step(Instance *p_instance, int
 		float mesh_lod_threshold = RSG::light_storage->reflection_probe_get_mesh_lod_threshold(p_instance->base) / atlas_size;
 
 		Vector3 edge = view_normals[p_step] * probe_size / 2;
-		float distance = ABS(view_normals[p_step].dot(edge) - view_normals[p_step].dot(origin_offset)); //distance from origin offset to actual view distance limit
+		float distance = Math::abs(view_normals[p_step].dot(edge) - view_normals[p_step].dot(origin_offset)); //distance from origin offset to actual view distance limit
 
 		max_distance = MAX(max_distance, distance);
 
diff --git a/engine/servers/rendering/renderer_scene_cull.h b/engine/servers/rendering/renderer_scene_cull.h
index 24f11ec1..924279b9 100644
--- a/engine/servers/rendering/renderer_scene_cull.h
+++ b/engine/servers/rendering/renderer_scene_cull.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_SCENE_CULL_H
-#define RENDERER_SCENE_CULL_H
+#pragma once
 
 #include "core/math/dynamic_bvh.h"
 #include "core/math/transform_interpolator.h"
@@ -47,10 +46,6 @@
 #include "servers/rendering/rendering_server_globals.h"
 #include "servers/rendering/storage/utilities.h"
 
-#ifndef _3D_DISABLED
-#include "servers/xr/xr_interface.h"
-#endif // _3D_DISABLED
-
 class RenderingLightCuller;
 
 class RendererSceneCull : public RenderingMethod {
@@ -1444,5 +1439,3 @@ public:
 	RendererSceneCull();
 	virtual ~RendererSceneCull();
 };
-
-#endif // RENDERER_SCENE_CULL_H
diff --git a/engine/servers/rendering/renderer_scene_occlusion_cull.h b/engine/servers/rendering/renderer_scene_occlusion_cull.h
index 14b97918..1ab50c72 100644
--- a/engine/servers/rendering/renderer_scene_occlusion_cull.h
+++ b/engine/servers/rendering/renderer_scene_occlusion_cull.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_SCENE_OCCLUSION_CULL_H
-#define RENDERER_SCENE_OCCLUSION_CULL_H
+#pragma once
 
 #include "core/math/projection.h"
 #include "core/templates/local_vector.h"
@@ -72,7 +71,7 @@ public:
 				return false;
 			}
 
-			float min_depth = (closest_point - p_cam_position).length();
+			float min_depth = -closest_point_view.z;
 
 			Vector2 rect_min = Vector2(FLT_MAX, FLT_MAX);
 			Vector2 rect_max = Vector2(FLT_MIN, FLT_MIN);
@@ -83,12 +82,9 @@ public:
 				Vector3 corner = Vector3(p_bounds[0] * c.x + p_bounds[3] * nc.x, p_bounds[1] * c.y + p_bounds[4] * nc.y, p_bounds[2] * c.z + p_bounds[5] * nc.z);
 				Vector3 view = p_cam_inv_transform.xform(corner);
 
-				if (p_cam_projection.is_orthogonal()) {
-					min_depth = MIN(min_depth, -view.z);
-				}
-
 				Plane vp = Plane(view, 1.0);
 				Plane projected = p_cam_projection.xform4(vp);
+				min_depth = MIN(min_depth, -view.z);
 
 				float w = projected.d;
 				if (w < 1.0) {
@@ -240,5 +236,3 @@ public:
 		singleton = nullptr;
 	}
 };
-
-#endif // RENDERER_SCENE_OCCLUSION_CULL_H
diff --git a/engine/servers/rendering/renderer_scene_render.h b/engine/servers/rendering/renderer_scene_render.h
index da524365..c31c68c9 100644
--- a/engine/servers/rendering/renderer_scene_render.h
+++ b/engine/servers/rendering/renderer_scene_render.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_SCENE_RENDER_H
-#define RENDERER_SCENE_RENDER_H
+#pragma once
 
 #include "core/math/projection.h"
 #include "core/templates/paged_array.h"
@@ -347,5 +346,3 @@ public:
 	virtual void update() = 0;
 	virtual ~RendererSceneRender() {}
 };
-
-#endif // RENDERER_SCENE_RENDER_H
diff --git a/engine/servers/rendering/renderer_viewport.cpp b/engine/servers/rendering/renderer_viewport.cpp
index b816ca7a..b00916c0 100644
--- a/engine/servers/rendering/renderer_viewport.cpp
+++ b/engine/servers/rendering/renderer_viewport.cpp
@@ -38,6 +38,10 @@
 #include "rendering_server_globals.h"
 #include "storage/texture_storage.h"
 
+#ifndef XR_DISABLED
+#include "servers/xr/xr_interface.h"
+#endif // XR_DISABLED
+
 static Transform2D _canvas_get_transform(RendererViewport::Viewport *p_viewport, RendererCanvasCull::Canvas *p_canvas, RendererViewport::Viewport::CanvasData *p_canvas_data, const Vector2 &p_vp_size) {
 	Transform2D xf = p_viewport->global_transform;
 
@@ -141,12 +145,22 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_OFF;
 			}
 
-			// Verify MetalFX upscaling support.
-			if (
-					(scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_TEMPORAL)) ||
-					(scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL))) {
-				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
-				WARN_PRINT_ONCE("MetalFX upscaling is not supported in the current renderer. Falling back to bilinear 3D resolution scaling.");
+			if (scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_TEMPORAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_TEMPORAL)) {
+				if (RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL)) {
+					// Prefer MetalFX spatial if it is supported, which will be much more efficient than FSR2,
+					// as the hardware already will struggle with FSR2.
+					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL;
+					WARN_PRINT_ONCE("MetalFX temporal upscaling is not supported by the current renderer or hardware. Falling back to MetalFX Spatial scaling.");
+				} else {
+					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_FSR2;
+					WARN_PRINT_ONCE("MetalFX upscaling is not supported by the current renderer or hardware. Falling back to FSR 2 scaling.");
+				}
+				scaling_type = RS::scaling_3d_mode_type(scaling_3d_mode);
+			}
+
+			if (scaling_3d_mode == RS::VIEWPORT_SCALING_3D_MODE_METALFX_SPATIAL && !RD::get_singleton()->has_feature(RD::SUPPORTS_METALFX_SPATIAL)) {
+				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_FSR;
+				WARN_PRINT_ONCE("MetalFX spatial upscaling is not supported by the current renderer or hardware. Falling back to FSR scaling.");
 			}
 
 			RS::ViewportMSAA msaa_3d = p_viewport->msaa_3d;
@@ -156,11 +170,9 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 				double min_scale = (double)RD::get_singleton()->limit_get(RD::LIMIT_METALFX_TEMPORAL_SCALER_MIN_SCALE) / 1000'000.0;
 				double max_scale = (double)RD::get_singleton()->limit_get(RD::LIMIT_METALFX_TEMPORAL_SCALER_MAX_SCALE) / 1000'000.0;
 				if ((double)scaling_3d_scale < min_scale || (double)scaling_3d_scale > max_scale) {
-					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
-					WARN_PRINT_ONCE(vformat("MetalFX temporal upscaling scale is outside limits; scale must be between %f and %f. Falling back to bilinear 3D resolution scaling.", min_scale, max_scale));
-				}
-
-				if (msaa_3d != RS::VIEWPORT_MSAA_DISABLED) {
+					scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_FSR2;
+					WARN_PRINT_ONCE(vformat("MetalFX temporal upscaling scale is outside limits; scale must be between %f and %f. Falling back to FSR 2 3D resolution scaling.", min_scale, max_scale));
+				} else if (msaa_3d != RS::VIEWPORT_MSAA_DISABLED) {
 					WARN_PRINT_ONCE("MetalFX temporal upscaling does not support 3D MSAA. Disabling 3D MSAA internally.");
 					msaa_3d = RS::VIEWPORT_MSAA_DISABLED;
 				}
@@ -170,7 +182,7 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 			bool use_taa = p_viewport->use_taa;
 
 			if (scaling_3d_is_not_bilinear && (scaling_3d_scale >= (1.0 + EPSILON))) {
-				// FSR is not designed for downsampling.
+				// FSR and MetalFX is not designed for downsampling.
 				// Fall back to bilinear scaling.
 				WARN_PRINT_ONCE("FSR 3D resolution scaling is not designed for downsampling. Falling back to bilinear 3D resolution scaling.");
 				scaling_3d_mode = RS::VIEWPORT_SCALING_3D_MODE_BILINEAR;
@@ -184,8 +196,8 @@ void RendererViewport::_configure_3d_render_buffers(Viewport *p_viewport) {
 			}
 
 			if (use_taa && (scaling_type == RS::VIEWPORT_SCALING_3D_TYPE_TEMPORAL)) {
-				// FSR2 can't be used with TAA.
-				// Turn it off and prefer using FSR2.
+				// Temporal upscalers can't be used with TAA.
+				// Turn it off and prefer using the temporal upscaler.
 				WARN_PRINT_ONCE("FSR 2 or MetalFX Temporal is not compatible with TAA. Disabling TAA internally.");
 				use_taa = false;
 			}
@@ -272,9 +284,11 @@ void RendererViewport::_draw_3d(Viewport *p_viewport) {
 	RENDER_TIMESTAMP("> Render 3D Scene");
 
 	Ref<XRInterface> xr_interface;
+#ifndef XR_DISABLED
 	if (p_viewport->use_xr && XRServer::get_singleton() != nullptr) {
 		xr_interface = XRServer::get_singleton()->get_primary_interface();
 	}
+#endif // XR_DISABLED
 
 	if (p_viewport->use_occlusion_culling) {
 		if (p_viewport->occlusion_buffer_dirty) {
@@ -545,8 +559,8 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 				float cull_distance = light->directional_distance;
 
 				Vector2 light_dir_sign;
-				light_dir_sign.x = (ABS(light_dir.x) < CMP_EPSILON) ? 0.0 : ((light_dir.x > 0.0) ? 1.0 : -1.0);
-				light_dir_sign.y = (ABS(light_dir.y) < CMP_EPSILON) ? 0.0 : ((light_dir.y > 0.0) ? 1.0 : -1.0);
+				light_dir_sign.x = (Math::abs(light_dir.x) < CMP_EPSILON) ? 0.0 : ((light_dir.x > 0.0) ? 1.0 : -1.0);
+				light_dir_sign.y = (Math::abs(light_dir.y) < CMP_EPSILON) ? 0.0 : ((light_dir.y > 0.0) ? 1.0 : -1.0);
 
 				Vector2 points[6];
 				int point_count = 0;
@@ -713,7 +727,7 @@ void RendererViewport::_draw_viewport(Viewport *p_viewport) {
 void RendererViewport::draw_viewports(bool p_swap_buffers) {
 	timestamp_vp_map.clear();
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	// get our xr interface in case we need it
 	Ref<XRInterface> xr_interface;
 	XRServer *xr_server = XRServer::get_singleton();
@@ -724,7 +738,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 		// retrieve the interface responsible for rendering
 		xr_interface = xr_server->get_primary_interface();
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 	if (Engine::get_singleton()->is_editor_hint()) {
 		RSG::texture_storage->set_default_clear_color(GLOBAL_GET("rendering/environment/defaults/default_clear_color"));
@@ -757,7 +771,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 
 		bool visible = vp->viewport_to_screen_rect != Rect2();
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 		if (vp->use_xr) {
 			if (xr_interface.is_valid()) {
 				// Ignore update mode we have to commit frames to our XR interface
@@ -772,7 +786,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 				vp->size = Size2();
 			}
 		} else
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 		{
 			if (vp->update_mode == RS::VIEWPORT_UPDATE_ALWAYS || vp->update_mode == RS::VIEWPORT_UPDATE_ONCE) {
 				visible = true;
@@ -811,7 +825,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 		RENDER_TIMESTAMP("> Render Viewport " + itos(i));
 
 		RSG::texture_storage->render_target_set_as_unused(vp->render_target);
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 		if (vp->use_xr && xr_interface.is_valid()) {
 			// Inform XR interface we're about to render its viewport,
 			// if this returns false we don't render.
@@ -827,9 +841,9 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 				RSG::texture_storage->render_target_set_velocity_target_size(vp->render_target, xr_interface->get_velocity_target_size());
 
 				if (xr_interface->get_velocity_texture().is_valid()) {
-					viewport_set_force_motion_vectors(vp->self, true);
+					_viewport_set_force_motion_vectors(vp, true);
 				} else {
-					viewport_set_force_motion_vectors(vp->self, false);
+					_viewport_set_force_motion_vectors(vp, false);
 				}
 
 				RSG::texture_storage->render_target_set_render_region(vp->render_target, xr_interface->get_render_region());
@@ -843,7 +857,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 				// commit our eyes
 				Vector<BlitToScreen> blits = xr_interface->post_draw_viewport(vp->render_target, vp->viewport_to_screen_rect);
 				if (vp->viewport_to_screen != DisplayServer::INVALID_WINDOW_ID) {
-					if (OS::get_singleton()->get_current_rendering_driver_name().begins_with("opengl3")) {
+					if (RSG::rasterizer->is_opengl()) {
 						if (blits.size() > 0) {
 							RSG::rasterizer->blit_render_targets_to_screen(vp->viewport_to_screen, blits.ptr(), blits.size());
 							RSG::rasterizer->gl_end_frame(p_swap_buffers);
@@ -860,7 +874,7 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 				}
 			}
 		} else
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 		{
 			RSG::scene->set_debug_draw_mode(vp->debug_draw);
 
@@ -878,10 +892,8 @@ void RendererViewport::draw_viewports(bool p_swap_buffers) {
 					blit.dst_rect.size = vp->size;
 				}
 
-				if (OS::get_singleton()->get_current_rendering_driver_name().begins_with("opengl3")) {
-					Vector<BlitToScreen> blit_to_screen_vec;
-					blit_to_screen_vec.push_back(blit);
-					RSG::rasterizer->blit_render_targets_to_screen(vp->viewport_to_screen, blit_to_screen_vec.ptr(), 1);
+				if (RSG::rasterizer->is_opengl()) {
+					RSG::rasterizer->blit_render_targets_to_screen(vp->viewport_to_screen, &blit, 1);
 					RSG::rasterizer->gl_end_frame(p_swap_buffers);
 				} else {
 					Vector<BlitToScreen> *blits = blit_to_screen_list.getptr(vp->viewport_to_screen);
@@ -1394,19 +1406,23 @@ void RendererViewport::viewport_set_force_motion_vectors(RID p_viewport, bool p_
 	Viewport *viewport = viewport_owner.get_or_null(p_viewport);
 	ERR_FAIL_NULL(viewport);
 
-	if (viewport->force_motion_vectors == p_force_motion_vectors) {
+	_viewport_set_force_motion_vectors(viewport, p_force_motion_vectors);
+}
+
+void RendererViewport::_viewport_set_force_motion_vectors(RendererViewport::Viewport *p_viewport, bool p_force_motion_vectors) {
+	if (p_viewport->force_motion_vectors == p_force_motion_vectors) {
 		return;
 	}
 
-	bool motion_vectors_before = _viewport_requires_motion_vectors(viewport);
-	viewport->force_motion_vectors = p_force_motion_vectors;
+	bool motion_vectors_before = _viewport_requires_motion_vectors(p_viewport);
+	p_viewport->force_motion_vectors = p_force_motion_vectors;
 
-	bool motion_vectors_after = _viewport_requires_motion_vectors(viewport);
+	bool motion_vectors_after = _viewport_requires_motion_vectors(p_viewport);
 	if (motion_vectors_before != motion_vectors_after) {
 		num_viewports_with_motion_vectors += motion_vectors_after ? 1 : -1;
 	}
 
-	_configure_3d_render_buffers(viewport);
+	_configure_3d_render_buffers(p_viewport);
 }
 
 void RendererViewport::viewport_set_use_occlusion_culling(RID p_viewport, bool p_use_occlusion_culling) {
diff --git a/engine/servers/rendering/renderer_viewport.h b/engine/servers/rendering/renderer_viewport.h
index 2e5876cc..2aec2542 100644
--- a/engine/servers/rendering/renderer_viewport.h
+++ b/engine/servers/rendering/renderer_viewport.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_VIEWPORT_H
-#define RENDERER_VIEWPORT_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/rendering/renderer_scene_render.h"
@@ -37,10 +36,6 @@
 #include "servers/rendering_server.h"
 #include "storage/render_scene_buffers.h"
 
-#ifndef _3D_DISABLED
-#include "servers/xr/xr_interface.h"
-#endif // _3D_DISABLED
-
 class RendererViewport {
 public:
 	struct CanvasBase {
@@ -139,7 +134,7 @@ public:
 			CanvasKey(const RID &p_canvas, int p_layer, int p_sublayer) {
 				canvas = p_canvas;
 				int64_t sign = p_layer < 0 ? -1 : 1;
-				stacking = sign * (((int64_t)ABS(p_layer)) << 32) + p_sublayer;
+				stacking = sign * (((int64_t)Math::abs(p_layer)) << 32) + p_sublayer;
 			}
 			int get_layer() const { return stacking >> 32; }
 		};
@@ -208,6 +203,7 @@ private:
 	Vector<Viewport *> _sort_active_viewports();
 	void _viewport_set_size(Viewport *p_viewport, int p_width, int p_height, uint32_t p_view_count);
 	bool _viewport_requires_motion_vectors(Viewport *p_viewport);
+	void _viewport_set_force_motion_vectors(Viewport *p_viewport, bool p_force_motion_vectors);
 	void _configure_3d_render_buffers(Viewport *p_viewport);
 	void _draw_3d(Viewport *p_viewport);
 	void _draw_viewport(Viewport *p_viewport);
@@ -322,5 +318,3 @@ public:
 	RendererViewport();
 	virtual ~RendererViewport() {}
 };
-
-#endif // RENDERER_VIEWPORT_H
diff --git a/engine/servers/rendering/rendering_context_driver.h b/engine/servers/rendering/rendering_context_driver.h
index c715a4e8..95cbabc8 100644
--- a/engine/servers/rendering/rendering_context_driver.h
+++ b/engine/servers/rendering/rendering_context_driver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_CONTEXT_DRIVER_H
-#define RENDERING_CONTEXT_DRIVER_H
+#pragma once
 
 #include "servers/display_server.h"
 
@@ -120,5 +119,3 @@ public:
 	virtual uint64_t get_device_memory_by_object_type(uint32_t p_type) const;
 	virtual uint64_t get_device_allocs_by_object_type(uint32_t p_type) const;
 };
-
-#endif // RENDERING_CONTEXT_DRIVER_H
diff --git a/engine/servers/rendering/rendering_device.cpp b/engine/servers/rendering/rendering_device.cpp
index 9a3e4fd9..1e25fc87 100644
--- a/engine/servers/rendering/rendering_device.cpp
+++ b/engine/servers/rendering/rendering_device.cpp
@@ -432,9 +432,9 @@ void RenderingDevice::_staging_buffer_execute_required_action(StagingBuffers &p_
 Error RenderingDevice::buffer_copy(RID p_src_buffer, RID p_dst_buffer, uint32_t p_src_offset, uint32_t p_dst_offset, uint32_t p_size) {
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
-	ERR_FAIL_COND_V_MSG(draw_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
 			"Copying buffers is forbidden during creation of a draw list");
-	ERR_FAIL_COND_V_MSG(compute_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
 			"Copying buffers is forbidden during creation of a compute list");
 
 	Buffer *src_buffer = _get_buffer_from_owner(p_src_buffer);
@@ -474,10 +474,9 @@ Error RenderingDevice::buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
 	copy_bytes_count += p_size;
-
-	ERR_FAIL_COND_V_MSG(draw_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
 			"Updating buffers is forbidden during creation of a draw list");
-	ERR_FAIL_COND_V_MSG(compute_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
 			"Updating buffers is forbidden during creation of a compute list");
 
 	Buffer *buffer = _get_buffer_from_owner(p_buffer);
@@ -561,9 +560,9 @@ Error RenderingDevice::buffer_update(RID p_buffer, uint32_t p_offset, uint32_t p
 Error RenderingDevice::driver_callback_add(RDD::DriverCallback p_callback, void *p_userdata, VectorView<CallbackResource> p_resources) {
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
-	ERR_FAIL_COND_V_MSG(draw_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
 			"Driver callback is forbidden during creation of a draw list");
-	ERR_FAIL_COND_V_MSG(compute_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
 			"Driver callback is forbidden during creation of a compute list");
 
 	thread_local LocalVector<RDG::ResourceTracker *> trackers;
@@ -612,16 +611,17 @@ Error RenderingDevice::driver_callback_add(RDD::DriverCallback p_callback, void
 }
 
 String RenderingDevice::get_perf_report() const {
+	String perf_report_text;
+	perf_report_text += " gpu:" + String::num_int64(prev_gpu_copy_count);
+	perf_report_text += " bytes:" + String::num_int64(prev_copy_bytes_count);
+
+	perf_report_text += " lazily alloc:" + String::num_int64(driver->get_lazily_memory_used());
 	return perf_report_text;
 }
 
 void RenderingDevice::update_perf_report() {
-	perf_report_text = "";
-	perf_report_text += " gpu:" + String::num_int64(gpu_copy_count);
-	perf_report_text += " bytes:" + String::num_int64(copy_bytes_count);
-
-	perf_report_text += " lazily alloc:" + String::num_int64(driver->get_lazily_memory_used());
-
+	prev_gpu_copy_count = gpu_copy_count;
+	prev_copy_bytes_count = copy_bytes_count;
 	gpu_copy_count = 0;
 	copy_bytes_count = 0;
 }
@@ -631,9 +631,9 @@ Error RenderingDevice::buffer_clear(RID p_buffer, uint32_t p_offset, uint32_t p_
 
 	ERR_FAIL_COND_V_MSG((p_size % 4) != 0, ERR_INVALID_PARAMETER,
 			"Size must be a multiple of four");
-	ERR_FAIL_COND_V_MSG(draw_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(draw_list.active, ERR_INVALID_PARAMETER,
 			"Updating buffers in is forbidden during creation of a draw list");
-	ERR_FAIL_COND_V_MSG(compute_list, ERR_INVALID_PARAMETER,
+	ERR_FAIL_COND_V_MSG(compute_list.active, ERR_INVALID_PARAMETER,
 			"Updating buffers is forbidden during creation of a compute list");
 
 	Buffer *buffer = _get_buffer_from_owner(p_buffer);
@@ -912,6 +912,8 @@ RID RenderingDevice::texture_create(const TextureFormat &p_format, const Texture
 				"Number of layers must be equal or greater than 1 for arrays and cubemaps.");
 		ERR_FAIL_COND_V_MSG((format.texture_type == TEXTURE_TYPE_CUBE_ARRAY || format.texture_type == TEXTURE_TYPE_CUBE) && (format.array_layers % 6) != 0, RID(),
 				"Cubemap and cubemap array textures must provide a layer number that is multiple of 6");
+		ERR_FAIL_COND_V_MSG(((format.texture_type == TEXTURE_TYPE_CUBE_ARRAY || format.texture_type == TEXTURE_TYPE_CUBE)) && (format.width != format.height), RID(),
+				"Cubemap and cubemap array textures must have equal width and height.");
 		ERR_FAIL_COND_V_MSG(format.array_layers > driver->limit_get(LIMIT_MAX_TEXTURE_ARRAY_LAYERS), RID(), "Number of layers exceeds device maximum.");
 	} else {
 		format.array_layers = 1;
@@ -951,22 +953,38 @@ RID RenderingDevice::texture_create(const TextureFormat &p_format, const Texture
 	ERR_FAIL_COND_V_MSG(required_mipmaps < format.mipmaps, RID(),
 			"Too many mipmaps requested for texture format and dimensions (" + itos(format.mipmaps) + "), maximum allowed: (" + itos(required_mipmaps) + ").");
 
-	uint32_t forced_usage_bits = 0;
-	if (p_data.size()) {
-		ERR_FAIL_COND_V_MSG(p_data.size() != (int)format.array_layers, RID(),
-				"Default supplied data for image format is of invalid length (" + itos(p_data.size()) + "), should be (" + itos(format.array_layers) + ").");
+	Vector<Vector<uint8_t>> data = p_data;
+	bool immediate_flush = false;
+
+	// If this is a VRS texture, we make sure that it is created with valid initial data. This prevents a crash on Qualcomm Snapdragon XR2 Gen 1
+	// (used in Quest 2, Quest Pro, Pico 4, HTC Vive XR Elite and others) where the driver will read the texture before we've had time to finish updating it.
+	if (data.is_empty() && (p_format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT)) {
+		immediate_flush = true;
+		for (uint32_t i = 0; i < format.array_layers; i++) {
+			uint32_t required_size = get_image_format_required_size(format.format, format.width, format.height, format.depth, format.mipmaps);
+			Vector<uint8_t> layer;
+			layer.resize(required_size);
+			layer.fill(255);
+			data.push_back(layer);
+		}
+	}
+
+	uint32_t forced_usage_bits = _texture_vrs_method_to_usage_bits();
+	if (data.size()) {
+		ERR_FAIL_COND_V_MSG(data.size() != (int)format.array_layers, RID(),
+				"Default supplied data for image format is of invalid length (" + itos(data.size()) + "), should be (" + itos(format.array_layers) + ").");
 
 		for (uint32_t i = 0; i < format.array_layers; i++) {
 			uint32_t required_size = get_image_format_required_size(format.format, format.width, format.height, format.depth, format.mipmaps);
-			ERR_FAIL_COND_V_MSG((uint32_t)p_data[i].size() != required_size, RID(),
-					"Data for slice index " + itos(i) + " (mapped to layer " + itos(i) + ") differs in size (supplied: " + itos(p_data[i].size()) + ") than what is required by the format (" + itos(required_size) + ").");
+			ERR_FAIL_COND_V_MSG((uint32_t)data[i].size() != required_size, RID(),
+					"Data for slice index " + itos(i) + " (mapped to layer " + itos(i) + ") differs in size (supplied: " + itos(data[i].size()) + ") than what is required by the format (" + itos(required_size) + ").");
 		}
 
 		ERR_FAIL_COND_V_MSG(format.usage_bits & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, RID(),
 				"Textures created as depth attachments can't be initialized with data directly. Use RenderingDevice::texture_update() instead.");
 
 		if (!(format.usage_bits & TEXTURE_USAGE_CAN_UPDATE_BIT)) {
-			forced_usage_bits = TEXTURE_USAGE_CAN_UPDATE_BIT;
+			forced_usage_bits |= TEXTURE_USAGE_CAN_UPDATE_BIT;
 		}
 	}
 
@@ -993,7 +1011,7 @@ RID RenderingDevice::texture_create(const TextureFormat &p_format, const Texture
 			ERR_FAIL_V_MSG(RID(), "Format " + format_text + " does not support usage as atomic storage image.");
 		}
 		if ((format.usage_bits & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) && !supported_usage.has_flag(TEXTURE_USAGE_VRS_ATTACHMENT_BIT)) {
-			ERR_FAIL_V_MSG(RID(), "Format " + format_text + " does not support usage as VRS attachment.");
+			ERR_FAIL_V_MSG(RID(), "Format " + format_text + " does not support usage as variable shading rate attachment.");
 		}
 	}
 
@@ -1035,7 +1053,7 @@ RID RenderingDevice::texture_create(const TextureFormat &p_format, const Texture
 	texture.usage_flags = format.usage_bits & ~forced_usage_bits;
 	texture.samples = format.samples;
 	texture.allowed_shared_formats = format.shareable_formats;
-	texture.has_initial_data = !p_data.is_empty();
+	texture.has_initial_data = !data.is_empty();
 
 	if ((format.usage_bits & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) {
 		texture.read_aspect_flags.set_flag(RDD::TEXTURE_ASPECT_DEPTH_BIT);
@@ -1051,8 +1069,8 @@ RID RenderingDevice::texture_create(const TextureFormat &p_format, const Texture
 	texture.bound = false;
 
 	// Textures are only assumed to be immutable if they have initial data and none of the other bits that indicate write usage are enabled.
-	bool texture_mutable_by_default = texture.usage_flags & (TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | TEXTURE_USAGE_STORAGE_BIT | TEXTURE_USAGE_STORAGE_ATOMIC_BIT | TEXTURE_USAGE_VRS_ATTACHMENT_BIT);
-	if (p_data.is_empty() || texture_mutable_by_default) {
+	bool texture_mutable_by_default = texture.usage_flags & (TEXTURE_USAGE_COLOR_ATTACHMENT_BIT | TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | TEXTURE_USAGE_STORAGE_BIT | TEXTURE_USAGE_STORAGE_ATOMIC_BIT);
+	if (data.is_empty() || texture_mutable_by_default) {
 		_texture_make_mutable(&texture, RID());
 	}
 
@@ -1063,9 +1081,9 @@ RID RenderingDevice::texture_create(const TextureFormat &p_format, const Texture
 	set_resource_name(id, "RID:" + itos(id.get_id()));
 #endif
 
-	if (p_data.size()) {
+	if (data.size()) {
 		for (uint32_t i = 0; i < p_format.array_layers; i++) {
-			_texture_initialize(id, i, p_data[i]);
+			_texture_initialize(id, i, data[i], immediate_flush);
 		}
 
 		if (texture.draw_tracker != nullptr) {
@@ -1399,7 +1417,7 @@ uint32_t RenderingDevice::_texture_alignment(Texture *p_texture) const {
 	return STEPIFY(alignment, driver->api_trait_get(RDD::API_TRAIT_TEXTURE_TRANSFER_ALIGNMENT));
 }
 
-Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, const Vector<uint8_t> &p_data) {
+Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, const Vector<uint8_t> &p_data, bool p_immediate_flush) {
 	Texture *texture = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL_V(texture, ERR_INVALID_PARAMETER);
 
@@ -1531,6 +1549,12 @@ Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, cons
 				transfer_worker->texture_barriers.push_back(tb);
 			}
 
+			if (p_immediate_flush) {
+				_end_transfer_worker(transfer_worker);
+				_submit_transfer_worker(transfer_worker);
+				_wait_for_transfer_worker(transfer_worker);
+			}
+
 			_release_transfer_worker(transfer_worker);
 		}
 	}
@@ -1541,7 +1565,7 @@ Error RenderingDevice::_texture_initialize(RID p_texture, uint32_t p_layer, cons
 Error RenderingDevice::texture_update(RID p_texture, uint32_t p_layer, const Vector<uint8_t> &p_data) {
 	ERR_RENDER_THREAD_GUARD_V(ERR_UNAVAILABLE);
 
-	ERR_FAIL_COND_V_MSG(draw_list || compute_list, ERR_INVALID_PARAMETER, "Updating textures is forbidden during creation of a draw or compute list");
+	ERR_FAIL_COND_V_MSG(draw_list.active || compute_list.active, ERR_INVALID_PARAMETER, "Updating textures is forbidden during creation of a draw or compute list");
 
 	Texture *texture = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL_V(texture, ERR_INVALID_PARAMETER);
@@ -1863,6 +1887,17 @@ void RenderingDevice::_texture_create_reinterpret_buffer(Texture *p_texture) {
 	p_texture->shared_fallback->buffer_tracker = tracker;
 }
 
+uint32_t RenderingDevice::_texture_vrs_method_to_usage_bits() const {
+	switch (vrs_method) {
+		case VRS_METHOD_FRAGMENT_SHADING_RATE:
+			return RDD::TEXTURE_USAGE_VRS_FRAGMENT_SHADING_RATE_BIT;
+		case VRS_METHOD_FRAGMENT_DENSITY_MAP:
+			return RDD::TEXTURE_USAGE_VRS_FRAGMENT_DENSITY_MAP_BIT;
+		default:
+			return 0;
+	}
+}
+
 Vector<uint8_t> RenderingDevice::_texture_get_data(Texture *tex, uint32_t p_layer, bool p_2d) {
 	uint32_t width, height, depth;
 	uint32_t tight_mip_size = get_image_format_required_size(tex->format, tex->width, tex->height, p_2d ? 1 : tex->depth, tex->mipmaps, &width, &height, &depth);
@@ -2424,7 +2459,7 @@ bool RenderingDevice::texture_is_format_supported_for_usage(DataFormat p_format,
 /**** FRAMEBUFFER ****/
 /*********************/
 
-RDD::RenderPassID RenderingDevice::_render_pass_create(RenderingDeviceDriver *p_driver, const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, VectorView<RDD::AttachmentLoadOp> p_load_ops, VectorView<RDD::AttachmentStoreOp> p_store_ops, uint32_t p_view_count, Vector<TextureSamples> *r_samples) {
+RDD::RenderPassID RenderingDevice::_render_pass_create(RenderingDeviceDriver *p_driver, const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, VectorView<RDD::AttachmentLoadOp> p_load_ops, VectorView<RDD::AttachmentStoreOp> p_store_ops, uint32_t p_view_count, VRSMethod p_vrs_method, int32_t p_vrs_attachment, Size2i p_vrs_texel_size, Vector<TextureSamples> *r_samples) {
 	// NOTE:
 	// Before the refactor to RenderingDevice-RenderingDeviceDriver, there was commented out code to
 	// specify dependencies to external subpasses. Since it had been unused for a long timel it wasn't ported
@@ -2464,15 +2499,14 @@ RDD::RenderPassID RenderingDevice::_render_pass_create(RenderingDeviceDriver *p_
 		// We can setup a framebuffer where we write to our VRS texture to set it up.
 		// We make the assumption here that if our texture is actually used as our VRS attachment.
 		// It is used as such for each subpass. This is fairly certain seeing the restrictions on subpasses.
-		bool is_vrs = (p_attachments[i].usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) && i == p_passes[0].vrs_attachment;
-
+		bool is_vrs = (p_attachments[i].usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) && i == p_vrs_attachment;
 		if (is_vrs) {
 			description.load_op = RDD::ATTACHMENT_LOAD_OP_LOAD;
 			description.store_op = RDD::ATTACHMENT_STORE_OP_DONT_CARE;
-			description.stencil_load_op = RDD::ATTACHMENT_LOAD_OP_LOAD;
+			description.stencil_load_op = RDD::ATTACHMENT_LOAD_OP_DONT_CARE;
 			description.stencil_store_op = RDD::ATTACHMENT_STORE_OP_DONT_CARE;
-			description.initial_layout = RDD::TEXTURE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
-			description.final_layout = RDD::TEXTURE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+			description.initial_layout = _vrs_layout_from_method(p_vrs_method);
+			description.final_layout = _vrs_layout_from_method(p_vrs_method);
 		} else {
 			if (p_attachments[i].usage_flags & TEXTURE_USAGE_COLOR_ATTACHMENT_BIT) {
 				description.load_op = p_load_ops[i];
@@ -2605,14 +2639,15 @@ RDD::RenderPassID RenderingDevice::_render_pass_create(RenderingDeviceDriver *p_
 			subpass.depth_stencil_reference.layout = RDD::TEXTURE_LAYOUT_UNDEFINED;
 		}
 
-		if (pass->vrs_attachment != ATTACHMENT_UNUSED) {
-			int32_t attachment = pass->vrs_attachment;
+		if (p_vrs_method == VRS_METHOD_FRAGMENT_SHADING_RATE && p_vrs_attachment >= 0) {
+			int32_t attachment = p_vrs_attachment;
 			ERR_FAIL_INDEX_V_MSG(attachment, p_attachments.size(), RDD::RenderPassID(), "Invalid framebuffer VRS format attachment(" + itos(attachment) + "), in pass (" + itos(i) + "), VRS attachment.");
 			ERR_FAIL_COND_V_MSG(!(p_attachments[attachment].usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT), RDD::RenderPassID(), "Invalid framebuffer VRS format attachment(" + itos(attachment) + "), in pass (" + itos(i) + "), it's marked as VRS, but it's not a VRS attachment.");
 			ERR_FAIL_COND_V_MSG(attachment_last_pass[attachment] == i, RDD::RenderPassID(), "Invalid framebuffer VRS attachment(" + itos(attachment) + "), in pass (" + itos(i) + "), it already was used for something else before in this pass.");
 
-			subpass.vrs_reference.attachment = attachment_remap[attachment];
-			subpass.vrs_reference.layout = RDD::TEXTURE_LAYOUT_VRS_ATTACHMENT_OPTIMAL;
+			subpass.fragment_shading_rate_reference.attachment = attachment_remap[attachment];
+			subpass.fragment_shading_rate_reference.layout = RDD::TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL;
+			subpass.fragment_shading_rate_texel_size = p_vrs_texel_size;
 
 			attachment_last_pass[attachment] = i;
 		}
@@ -2647,7 +2682,13 @@ RDD::RenderPassID RenderingDevice::_render_pass_create(RenderingDeviceDriver *p_
 		}
 	}
 
-	RDD::RenderPassID render_pass = p_driver->render_pass_create(attachments, subpasses, subpass_dependencies, p_view_count);
+	RDD::AttachmentReference fragment_density_map_attachment_reference;
+	if (p_vrs_method == VRS_METHOD_FRAGMENT_DENSITY_MAP && p_vrs_attachment >= 0) {
+		fragment_density_map_attachment_reference.attachment = p_vrs_attachment;
+		fragment_density_map_attachment_reference.layout = RDD::TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL;
+	}
+
+	RDD::RenderPassID render_pass = p_driver->render_pass_create(attachments, subpasses, subpass_dependencies, p_view_count, fragment_density_map_attachment_reference);
 	ERR_FAIL_COND_V(!render_pass, RDD::RenderPassID());
 
 	return render_pass;
@@ -2661,10 +2702,74 @@ RDD::RenderPassID RenderingDevice::_render_pass_create_from_graph(RenderingDevic
 	// resolving the dependencies between commands. This function creates a render pass for the framebuffer accordingly.
 	Framebuffer *framebuffer = (Framebuffer *)(p_user_data);
 	const FramebufferFormatKey &key = framebuffer->rendering_device->framebuffer_formats[framebuffer->format_id].E->key();
-	return _render_pass_create(p_driver, key.attachments, key.passes, p_load_ops, p_store_ops, framebuffer->view_count);
+	return _render_pass_create(p_driver, key.attachments, key.passes, p_load_ops, p_store_ops, framebuffer->view_count, key.vrs_method, key.vrs_attachment, key.vrs_texel_size);
 }
 
-RenderingDevice::FramebufferFormatID RenderingDevice::framebuffer_format_create(const Vector<AttachmentFormat> &p_format, uint32_t p_view_count) {
+RDG::ResourceUsage RenderingDevice::_vrs_usage_from_method(VRSMethod p_method) {
+	switch (p_method) {
+		case VRS_METHOD_FRAGMENT_SHADING_RATE:
+			return RDG::RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ;
+		case VRS_METHOD_FRAGMENT_DENSITY_MAP:
+			return RDG::RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ;
+		default:
+			return RDG::RESOURCE_USAGE_NONE;
+	}
+}
+
+RDD::PipelineStageBits RenderingDevice::_vrs_stages_from_method(VRSMethod p_method) {
+	switch (p_method) {
+		case VRS_METHOD_FRAGMENT_SHADING_RATE:
+			return RDD::PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT;
+		case VRS_METHOD_FRAGMENT_DENSITY_MAP:
+			return RDD::PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT;
+		default:
+			return RDD::PipelineStageBits(0);
+	}
+}
+
+RDD::TextureLayout RenderingDevice::_vrs_layout_from_method(VRSMethod p_method) {
+	switch (p_method) {
+		case VRS_METHOD_FRAGMENT_SHADING_RATE:
+			return RDD::TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL;
+		case VRS_METHOD_FRAGMENT_DENSITY_MAP:
+			return RDD::TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL;
+		default:
+			return RDD::TEXTURE_LAYOUT_UNDEFINED;
+	}
+}
+
+void RenderingDevice::_vrs_detect_method() {
+	const RDD::FragmentShadingRateCapabilities &fsr_capabilities = driver->get_fragment_shading_rate_capabilities();
+	const RDD::FragmentDensityMapCapabilities &fdm_capabilities = driver->get_fragment_density_map_capabilities();
+	if (fsr_capabilities.attachment_supported) {
+		vrs_method = VRS_METHOD_FRAGMENT_SHADING_RATE;
+	} else if (fdm_capabilities.attachment_supported) {
+		vrs_method = VRS_METHOD_FRAGMENT_DENSITY_MAP;
+	}
+
+	switch (vrs_method) {
+		case VRS_METHOD_FRAGMENT_SHADING_RATE:
+			vrs_format = DATA_FORMAT_R8_UINT;
+			vrs_texel_size = Vector2i(16, 16).clamp(fsr_capabilities.min_texel_size, fsr_capabilities.max_texel_size);
+			break;
+		case VRS_METHOD_FRAGMENT_DENSITY_MAP:
+			vrs_format = DATA_FORMAT_R8G8_UNORM;
+			vrs_texel_size = Vector2i(32, 32).clamp(fdm_capabilities.min_texel_size, fdm_capabilities.max_texel_size);
+			break;
+		default:
+			break;
+	}
+}
+
+RD::DataFormat RenderingDevice::vrs_get_format() const {
+	return vrs_format;
+}
+
+Size2i RenderingDevice::vrs_get_texel_size() const {
+	return vrs_texel_size;
+}
+
+RenderingDevice::FramebufferFormatID RenderingDevice::framebuffer_format_create(const Vector<AttachmentFormat> &p_format, uint32_t p_view_count, int32_t p_fragment_density_map_attachment) {
 	FramebufferPass pass;
 	for (int i = 0; i < p_format.size(); i++) {
 		if (p_format[i].usage_flags & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
@@ -2676,16 +2781,19 @@ RenderingDevice::FramebufferFormatID RenderingDevice::framebuffer_format_create(
 
 	Vector<FramebufferPass> passes;
 	passes.push_back(pass);
-	return framebuffer_format_create_multipass(p_format, passes, p_view_count);
+	return framebuffer_format_create_multipass(p_format, passes, p_view_count, p_fragment_density_map_attachment);
 }
 
-RenderingDevice::FramebufferFormatID RenderingDevice::framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, uint32_t p_view_count) {
+RenderingDevice::FramebufferFormatID RenderingDevice::framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, uint32_t p_view_count, int32_t p_vrs_attachment) {
 	_THREAD_SAFE_METHOD_
 
 	FramebufferFormatKey key;
 	key.attachments = p_attachments;
 	key.passes = p_passes;
 	key.view_count = p_view_count;
+	key.vrs_method = vrs_method;
+	key.vrs_attachment = p_vrs_attachment;
+	key.vrs_texel_size = vrs_texel_size;
 
 	const RBMap<FramebufferFormatKey, FramebufferFormatID>::Element *E = framebuffer_format_cache.find(key);
 	if (E) {
@@ -2701,7 +2809,7 @@ RenderingDevice::FramebufferFormatID RenderingDevice::framebuffer_format_create_
 		store_ops.push_back(RDD::ATTACHMENT_STORE_OP_STORE);
 	}
 
-	RDD::RenderPassID render_pass = _render_pass_create(driver, p_attachments, p_passes, load_ops, store_ops, p_view_count, &samples); // Actions don't matter for this use case.
+	RDD::RenderPassID render_pass = _render_pass_create(driver, p_attachments, p_passes, load_ops, store_ops, p_view_count, vrs_method, p_vrs_attachment, vrs_texel_size, &samples); // Actions don't matter for this use case.
 	if (!render_pass) { // Was likely invalid.
 		return INVALID_ID;
 	}
@@ -2741,7 +2849,7 @@ RenderingDevice::FramebufferFormatID RenderingDevice::framebuffer_format_create_
 	LocalVector<RDD::Subpass> subpass;
 	subpass.resize(1);
 
-	RDD::RenderPassID render_pass = driver->render_pass_create({}, subpass, {}, 1);
+	RDD::RenderPassID render_pass = driver->render_pass_create({}, subpass, {}, 1, RDD::AttachmentReference());
 	ERR_FAIL_COND_V(!render_pass, FramebufferFormatID());
 
 	FramebufferFormatID id = FramebufferFormatID(framebuffer_format_cache.size()) | (FramebufferFormatID(ID_TYPE_FRAMEBUFFER_FORMAT) << FramebufferFormatID(ID_BASE_SHIFT));
@@ -2812,8 +2920,6 @@ RID RenderingDevice::framebuffer_create(const Vector<RID> &p_texture_attachments
 
 		if (texture && texture->usage_flags & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
 			pass.depth_attachment = i;
-		} else if (texture && texture->usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) {
-			pass.vrs_attachment = i;
 		} else {
 			if (texture && texture->is_resolve_buffer) {
 				pass.resolve_attachments.push_back(i);
@@ -2835,6 +2941,7 @@ RID RenderingDevice::framebuffer_create_multipass(const Vector<RID> &p_texture_a
 	Vector<AttachmentFormat> attachments;
 	LocalVector<RDD::TextureID> textures;
 	LocalVector<RDG::ResourceTracker *> trackers;
+	int32_t vrs_attachment = -1;
 	attachments.resize(p_texture_attachments.size());
 	Size2i size;
 	bool size_set = false;
@@ -2849,6 +2956,11 @@ RID RenderingDevice::framebuffer_create_multipass(const Vector<RID> &p_texture_a
 
 			_check_transfer_worker_texture(texture);
 
+			if (i != 0 && texture->usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT) {
+				// Detect if the texture is the fragment density map and it's not the first attachment.
+				vrs_attachment = i;
+			}
+
 			if (!size_set) {
 				size.width = texture->width;
 				size.height = texture->height;
@@ -2876,7 +2988,7 @@ RID RenderingDevice::framebuffer_create_multipass(const Vector<RID> &p_texture_a
 
 	ERR_FAIL_COND_V_MSG(!size_set, RID(), "All attachments unused.");
 
-	FramebufferFormatID format_id = framebuffer_format_create_multipass(attachments, p_passes, p_view_count);
+	FramebufferFormatID format_id = framebuffer_format_create_multipass(attachments, p_passes, p_view_count, vrs_attachment);
 	if (format_id == INVALID_ID) {
 		return RID();
 	}
@@ -3416,15 +3528,10 @@ void RenderingDevice::_uniform_set_update_shared(UniformSet *p_uniform_set) {
 	}
 }
 
-template RID RenderingDevice::uniform_set_create(const LocalVector<RD::Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set, bool p_linear_pool);
-
-template RID RenderingDevice::uniform_set_create(const Vector<RD::Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set, bool p_linear_pool);
-
-template <typename Collection>
-RID RenderingDevice::uniform_set_create(const Collection &p_uniforms, RID p_shader, uint32_t p_shader_set, bool p_linear_pool) {
+RID RenderingDevice::uniform_set_create(const VectorView<RD::Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set, bool p_linear_pool) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_COND_V(p_uniforms.is_empty(), RID());
+	ERR_FAIL_COND_V(p_uniforms.size() == 0, RID());
 
 	Shader *shader = shader_owner.get_or_null(p_shader);
 	ERR_FAIL_NULL_V(shader, RID());
@@ -3850,6 +3957,9 @@ RID RenderingDevice::render_pipeline_create(RID p_shader, FramebufferFormatID p_
 	ERR_FAIL_NULL_V(shader, RID());
 	ERR_FAIL_COND_V_MSG(shader->is_compute, RID(), "Compute shaders can't be used in render pipelines");
 
+	// Validate pre-raster shader. One of stages must be vertex shader or mesh shader (not implemented yet).
+	ERR_FAIL_COND_V_MSG(!shader->stage_bits.has_flag(RDD::PIPELINE_STAGE_VERTEX_SHADER_BIT), RID(), "Pre-raster shader (vertex shader) is not provided for pipeline creation.");
+
 	FramebufferFormat fb_format;
 	{
 		_THREAD_SAFE_METHOD_
@@ -4234,8 +4344,8 @@ Error RenderingDevice::screen_free(DisplayServer::WindowID p_screen) {
 RenderingDevice::DrawListID RenderingDevice::draw_list_begin_for_screen(DisplayServer::WindowID p_screen, const Color &p_clear_color) {
 	ERR_RENDER_THREAD_GUARD_V(INVALID_ID);
 
-	ERR_FAIL_COND_V_MSG(draw_list != nullptr, INVALID_ID, "Only one draw list can be active at the same time.");
-	ERR_FAIL_COND_V_MSG(compute_list != nullptr, INVALID_ID, "Only one draw/compute list can be active at the same time.");
+	ERR_FAIL_COND_V_MSG(draw_list.active, INVALID_ID, "Only one draw list can be active at the same time.");
+	ERR_FAIL_COND_V_MSG(compute_list.active, INVALID_ID, "Only one draw/compute list can be active at the same time.");
 
 	RenderingContextDriver::SurfaceID surface = context->surface_get_from_window(p_screen);
 	HashMap<DisplayServer::WindowID, RDD::SwapChainID>::ConstIterator sc_it = screen_swap_chains.find(p_screen);
@@ -4246,7 +4356,7 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin_for_screen(DisplayS
 
 	Rect2i viewport = Rect2i(0, 0, context->surface_get_width(surface), context->surface_get_height(surface));
 
-	_draw_list_allocate(viewport, 0);
+	_draw_list_start(viewport);
 #ifdef DEBUG_ENABLED
 	draw_list_framebuffer_format = screen_get_framebuffer_format(p_screen);
 #endif
@@ -4256,7 +4366,7 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin_for_screen(DisplayS
 	clear_value.color = p_clear_color;
 
 	RDD::RenderPassID render_pass = driver->swap_chain_get_render_pass(sc_it->value);
-	draw_graph.add_draw_list_begin(render_pass, fb_it->value, viewport, RDG::ATTACHMENT_OPERATION_CLEAR, clear_value, true, false, RDD::BreadcrumbMarker::BLIT_PASS, split_swapchain_into_its_own_cmd_buffer);
+	draw_graph.add_draw_list_begin(render_pass, fb_it->value, viewport, RDG::ATTACHMENT_OPERATION_CLEAR, clear_value, RDD::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, RDD::BreadcrumbMarker::BLIT_PASS, split_swapchain_into_its_own_cmd_buffer);
 
 	draw_graph.add_draw_list_set_viewport(viewport);
 	draw_graph.add_draw_list_set_scissor(viewport);
@@ -4264,14 +4374,19 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin_for_screen(DisplayS
 	return int64_t(ID_TYPE_DRAW_LIST) << ID_BASE_SHIFT;
 }
 
-RenderingDevice::DrawListID RenderingDevice::draw_list_begin(RID p_framebuffer, BitField<DrawFlags> p_draw_flags, const Vector<Color> &p_clear_color_values, float p_clear_depth_value, uint32_t p_clear_stencil_value, const Rect2 &p_region, uint32_t p_breadcrumb) {
+RenderingDevice::DrawListID RenderingDevice::_draw_list_begin_bind(RID p_framebuffer, BitField<DrawFlags> p_draw_flags, const Vector<Color> &p_clear_color_values, float p_clear_depth_value, uint32_t p_clear_stencil_value, const Rect2 &p_region, uint32_t p_breadcrumb) {
+	return draw_list_begin(p_framebuffer, p_draw_flags, p_clear_color_values, p_clear_depth_value, p_clear_stencil_value, p_region, p_breadcrumb);
+}
+
+RenderingDevice::DrawListID RenderingDevice::draw_list_begin(RID p_framebuffer, BitField<DrawFlags> p_draw_flags, VectorView<Color> p_clear_color_values, float p_clear_depth_value, uint32_t p_clear_stencil_value, const Rect2 &p_region, uint32_t p_breadcrumb) {
 	ERR_RENDER_THREAD_GUARD_V(INVALID_ID);
 
-	ERR_FAIL_COND_V_MSG(draw_list != nullptr, INVALID_ID, "Only one draw list can be active at the same time.");
+	ERR_FAIL_COND_V_MSG(draw_list.active, INVALID_ID, "Only one draw list can be active at the same time.");
 
 	Framebuffer *framebuffer = framebuffer_owner.get_or_null(p_framebuffer);
 	ERR_FAIL_NULL_V(framebuffer, INVALID_ID);
 
+	const FramebufferFormatKey &framebuffer_key = framebuffer_formats[framebuffer->format_id].E->key();
 	Point2i viewport_offset;
 	Point2i viewport_size = framebuffer->size;
 
@@ -4292,12 +4407,12 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin(RID p_framebuffer,
 	thread_local LocalVector<RDD::RenderPassClearValue> clear_values;
 	thread_local LocalVector<RDG::ResourceTracker *> resource_trackers;
 	thread_local LocalVector<RDG::ResourceUsage> resource_usages;
-	bool uses_color = false;
-	bool uses_depth = false;
+	BitField<RDD::PipelineStageBits> stages = {};
 	operations.resize(framebuffer->texture_ids.size());
 	clear_values.resize(framebuffer->texture_ids.size());
 	resource_trackers.clear();
 	resource_usages.clear();
+	stages.clear();
 
 	uint32_t color_index = 0;
 	for (int i = 0; i < framebuffer->texture_ids.size(); i++) {
@@ -4314,7 +4429,11 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin(RID p_framebuffer,
 
 		RDG::AttachmentOperation operation = RDG::ATTACHMENT_OPERATION_DEFAULT;
 		RDD::RenderPassClearValue clear_value;
-		if (texture->usage_flags & TEXTURE_USAGE_COLOR_ATTACHMENT_BIT) {
+		if (framebuffer_key.vrs_attachment == i && (texture->usage_flags & TEXTURE_USAGE_VRS_ATTACHMENT_BIT)) {
+			resource_trackers.push_back(texture->draw_tracker);
+			resource_usages.push_back(_vrs_usage_from_method(framebuffer_key.vrs_method));
+			stages.set_flag(_vrs_stages_from_method(framebuffer_key.vrs_method));
+		} else if (texture->usage_flags & TEXTURE_USAGE_COLOR_ATTACHMENT_BIT) {
 			if (p_draw_flags.has_flag(DrawFlags(DRAW_CLEAR_COLOR_0 << color_index))) {
 				ERR_FAIL_COND_V_MSG(color_index >= p_clear_color_values.size(), INVALID_ID, vformat("Color texture (%d) was specified to be cleared but no color value was provided.", color_index));
 				operation = RDG::ATTACHMENT_OPERATION_CLEAR;
@@ -4325,7 +4444,7 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin(RID p_framebuffer,
 
 			resource_trackers.push_back(texture->draw_tracker);
 			resource_usages.push_back(RDG::RESOURCE_USAGE_ATTACHMENT_COLOR_READ_WRITE);
-			uses_color = true;
+			stages.set_flag(RDD::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
 			color_index++;
 		} else if (texture->usage_flags & TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) {
 			if (p_draw_flags.has_flag(DRAW_CLEAR_DEPTH) || p_draw_flags.has_flag(DRAW_CLEAR_STENCIL)) {
@@ -4338,14 +4457,15 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin(RID p_framebuffer,
 
 			resource_trackers.push_back(texture->draw_tracker);
 			resource_usages.push_back(RDG::RESOURCE_USAGE_ATTACHMENT_DEPTH_STENCIL_READ_WRITE);
-			uses_depth = true;
+			stages.set_flag(RDD::PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);
+			stages.set_flag(RDD::PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT);
 		}
 
 		operations[i] = operation;
 		clear_values[i] = clear_value;
 	}
 
-	draw_graph.add_draw_list_begin(framebuffer->framebuffer_cache, Rect2i(viewport_offset, viewport_size), operations, clear_values, uses_color, uses_depth, p_breadcrumb);
+	draw_graph.add_draw_list_begin(framebuffer->framebuffer_cache, Rect2i(viewport_offset, viewport_size), operations, clear_values, stages, p_breadcrumb);
 	draw_graph.add_draw_list_usages(resource_trackers, resource_usages);
 
 	// Mark textures as bound.
@@ -4361,14 +4481,12 @@ RenderingDevice::DrawListID RenderingDevice::draw_list_begin(RID p_framebuffer,
 		draw_list_bound_textures.push_back(framebuffer->texture_ids[i]);
 	}
 
-	_draw_list_allocate(Rect2i(viewport_offset, viewport_size), 0);
+	_draw_list_start(Rect2i(viewport_offset, viewport_size));
 #ifdef DEBUG_ENABLED
 	draw_list_framebuffer_format = framebuffer->format_id;
 #endif
 	draw_list_current_subpass = 0;
-
-	const FramebufferFormatKey &key = framebuffer_formats[framebuffer->format_id].E->key();
-	draw_list_subpass_count = key.passes.size();
+	draw_list_subpass_count = framebuffer_key.passes.size();
 
 	Rect2i viewport_rect(viewport_offset, viewport_size);
 	draw_graph.add_draw_list_set_viewport(viewport_rect);
@@ -4383,28 +4501,10 @@ Error RenderingDevice::draw_list_begin_split(RID p_framebuffer, uint32_t p_split
 }
 #endif
 
-RenderingDevice::DrawList *RenderingDevice::_get_draw_list_ptr(DrawListID p_id) {
-	if (p_id < 0) {
-		return nullptr;
-	}
-
-	if (!draw_list) {
-		return nullptr;
-	} else if (p_id == (int64_t(ID_TYPE_DRAW_LIST) << ID_BASE_SHIFT)) {
-		return draw_list;
-	} else {
-		return nullptr;
-	}
-}
-
 void RenderingDevice::draw_list_set_blend_constants(DrawListID p_list, const Color &p_color) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 	draw_graph.add_draw_list_set_blend_constants(p_color);
 }
@@ -4412,11 +4512,7 @@ void RenderingDevice::draw_list_set_blend_constants(DrawListID p_list, const Col
 void RenderingDevice::draw_list_bind_render_pipeline(DrawListID p_list, RID p_render_pipeline) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 	const RenderPipeline *pipeline = render_pipeline_owner.get_or_null(p_render_pipeline);
 	ERR_FAIL_NULL(pipeline);
@@ -4424,25 +4520,25 @@ void RenderingDevice::draw_list_bind_render_pipeline(DrawListID p_list, RID p_re
 	ERR_FAIL_COND(pipeline->validation.framebuffer_format != draw_list_framebuffer_format && pipeline->validation.render_pass != draw_list_current_subpass);
 #endif
 
-	if (p_render_pipeline == dl->state.pipeline) {
+	if (p_render_pipeline == draw_list.state.pipeline) {
 		return; // Redundant state, return.
 	}
 
-	dl->state.pipeline = p_render_pipeline;
+	draw_list.state.pipeline = p_render_pipeline;
 
 	draw_graph.add_draw_list_bind_pipeline(pipeline->driver_id, pipeline->stage_bits);
 
-	if (dl->state.pipeline_shader != pipeline->shader) {
+	if (draw_list.state.pipeline_shader != pipeline->shader) {
 		// Shader changed, so descriptor sets may become incompatible.
 
 		uint32_t pcount = pipeline->set_formats.size(); // Formats count in this pipeline.
-		dl->state.set_count = MAX(dl->state.set_count, pcount);
+		draw_list.state.set_count = MAX(draw_list.state.set_count, pcount);
 		const uint32_t *pformats = pipeline->set_formats.ptr(); // Pipeline set formats.
 
 		uint32_t first_invalid_set = UINT32_MAX; // All valid by default.
-		if (pipeline->push_constant_size != dl->state.pipeline_push_constant_size) {
+		if (pipeline->push_constant_size != draw_list.state.pipeline_push_constant_size) {
 			// All sets must be invalidated as the pipeline layout is not compatible if the push constant range is different.
-			dl->state.pipeline_push_constant_size = pipeline->push_constant_size;
+			draw_list.state.pipeline_push_constant_size = pipeline->push_constant_size;
 			first_invalid_set = 0;
 		} else {
 			switch (driver->api_trait_get(RDD::API_TRAIT_SHADER_CHANGE_INVALIDATION)) {
@@ -4451,14 +4547,14 @@ void RenderingDevice::draw_list_bind_render_pipeline(DrawListID p_list, RID p_re
 				} break;
 				case RDD::SHADER_CHANGE_INVALIDATION_INCOMPATIBLE_SETS_PLUS_CASCADE: {
 					for (uint32_t i = 0; i < pcount; i++) {
-						if (dl->state.sets[i].pipeline_expected_format != pformats[i]) {
+						if (draw_list.state.sets[i].pipeline_expected_format != pformats[i]) {
 							first_invalid_set = i;
 							break;
 						}
 					}
 				} break;
 				case RDD::SHADER_CHANGE_INVALIDATION_ALL_OR_NONE_ACCORDING_TO_LAYOUT_HASH: {
-					if (dl->state.pipeline_shader_layout_hash != pipeline->shader_layout_hash) {
+					if (draw_list.state.pipeline_shader_layout_hash != pipeline->shader_layout_hash) {
 						first_invalid_set = 0;
 					}
 				} break;
@@ -4467,36 +4563,36 @@ void RenderingDevice::draw_list_bind_render_pipeline(DrawListID p_list, RID p_re
 
 		if (pipeline->push_constant_size) {
 #ifdef DEBUG_ENABLED
-			dl->validation.pipeline_push_constant_supplied = false;
+			draw_list.validation.pipeline_push_constant_supplied = false;
 #endif
 		}
 
 		for (uint32_t i = 0; i < pcount; i++) {
-			dl->state.sets[i].bound = dl->state.sets[i].bound && i < first_invalid_set;
-			dl->state.sets[i].pipeline_expected_format = pformats[i];
+			draw_list.state.sets[i].bound = draw_list.state.sets[i].bound && i < first_invalid_set;
+			draw_list.state.sets[i].pipeline_expected_format = pformats[i];
 		}
 
-		for (uint32_t i = pcount; i < dl->state.set_count; i++) {
+		for (uint32_t i = pcount; i < draw_list.state.set_count; i++) {
 			// Unbind the ones above (not used) if exist.
-			dl->state.sets[i].bound = false;
+			draw_list.state.sets[i].bound = false;
 		}
 
-		dl->state.set_count = pcount; // Update set count.
+		draw_list.state.set_count = pcount; // Update set count.
 
-		dl->state.pipeline_shader = pipeline->shader;
-		dl->state.pipeline_shader_driver_id = pipeline->shader_driver_id;
-		dl->state.pipeline_shader_layout_hash = pipeline->shader_layout_hash;
+		draw_list.state.pipeline_shader = pipeline->shader;
+		draw_list.state.pipeline_shader_driver_id = pipeline->shader_driver_id;
+		draw_list.state.pipeline_shader_layout_hash = pipeline->shader_layout_hash;
 	}
 
 #ifdef DEBUG_ENABLED
 	// Update render pass pipeline info.
-	dl->validation.pipeline_active = true;
-	dl->validation.pipeline_dynamic_state = pipeline->validation.dynamic_state;
-	dl->validation.pipeline_vertex_format = pipeline->validation.vertex_format;
-	dl->validation.pipeline_uses_restart_indices = pipeline->validation.uses_restart_indices;
-	dl->validation.pipeline_primitive_divisor = pipeline->validation.primitive_divisor;
-	dl->validation.pipeline_primitive_minimum = pipeline->validation.primitive_minimum;
-	dl->validation.pipeline_push_constant_size = pipeline->push_constant_size;
+	draw_list.validation.pipeline_active = true;
+	draw_list.validation.pipeline_dynamic_state = pipeline->validation.dynamic_state;
+	draw_list.validation.pipeline_vertex_format = pipeline->validation.vertex_format;
+	draw_list.validation.pipeline_uses_restart_indices = pipeline->validation.uses_restart_indices;
+	draw_list.validation.pipeline_primitive_divisor = pipeline->validation.primitive_divisor;
+	draw_list.validation.pipeline_primitive_minimum = pipeline->validation.primitive_minimum;
+	draw_list.validation.pipeline_push_constant_size = pipeline->push_constant_size;
 #endif
 }
 
@@ -4507,24 +4603,20 @@ void RenderingDevice::draw_list_bind_uniform_set(DrawListID p_list, RID p_unifor
 	ERR_FAIL_COND_MSG(p_index >= driver->limit_get(LIMIT_MAX_BOUND_UNIFORM_SETS) || p_index >= MAX_UNIFORM_SETS,
 			"Attempting to bind a descriptor set (" + itos(p_index) + ") greater than what the hardware supports (" + itos(driver->limit_get(LIMIT_MAX_BOUND_UNIFORM_SETS)) + ").");
 #endif
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
 
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 	const UniformSet *uniform_set = uniform_set_owner.get_or_null(p_uniform_set);
 	ERR_FAIL_NULL(uniform_set);
 
-	if (p_index > dl->state.set_count) {
-		dl->state.set_count = p_index;
+	if (p_index > draw_list.state.set_count) {
+		draw_list.state.set_count = p_index;
 	}
 
-	dl->state.sets[p_index].uniform_set_driver_id = uniform_set->driver_id; // Update set pointer.
-	dl->state.sets[p_index].bound = false; // Needs rebind.
-	dl->state.sets[p_index].uniform_set_format = uniform_set->format;
-	dl->state.sets[p_index].uniform_set = p_uniform_set;
+	draw_list.state.sets[p_index].uniform_set_driver_id = uniform_set->driver_id; // Update set pointer.
+	draw_list.state.sets[p_index].bound = false; // Needs rebind.
+	draw_list.state.sets[p_index].uniform_set_format = uniform_set->format;
+	draw_list.state.sets[p_index].uniform_set = p_uniform_set;
 
 #ifdef DEBUG_ENABLED
 	{ // Validate that textures bound are not attached as framebuffer bindings.
@@ -4545,28 +4637,24 @@ void RenderingDevice::draw_list_bind_uniform_set(DrawListID p_list, RID p_unifor
 void RenderingDevice::draw_list_bind_vertex_array(DrawListID p_list, RID p_vertex_array) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 	VertexArray *vertex_array = vertex_array_owner.get_or_null(p_vertex_array);
 	ERR_FAIL_NULL(vertex_array);
 
-	if (dl->state.vertex_array == p_vertex_array) {
+	if (draw_list.state.vertex_array == p_vertex_array) {
 		return; // Already set.
 	}
 
 	_check_transfer_worker_vertex_array(vertex_array);
 
-	dl->state.vertex_array = p_vertex_array;
+	draw_list.state.vertex_array = p_vertex_array;
 
 #ifdef DEBUG_ENABLED
-	dl->validation.vertex_format = vertex_array->description;
-	dl->validation.vertex_max_instances_allowed = vertex_array->max_instances_allowed;
+	draw_list.validation.vertex_format = vertex_array->description;
+	draw_list.validation.vertex_max_instances_allowed = vertex_array->max_instances_allowed;
 #endif
-	dl->validation.vertex_array_size = vertex_array->vertex_count;
+	draw_list.validation.vertex_array_size = vertex_array->vertex_count;
 
 	draw_graph.add_draw_list_bind_vertex_buffers(vertex_array->buffers, vertex_array->offsets);
 
@@ -4578,26 +4666,22 @@ void RenderingDevice::draw_list_bind_vertex_array(DrawListID p_list, RID p_verte
 void RenderingDevice::draw_list_bind_index_array(DrawListID p_list, RID p_index_array) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 	IndexArray *index_array = index_array_owner.get_or_null(p_index_array);
 	ERR_FAIL_NULL(index_array);
 
-	if (dl->state.index_array == p_index_array) {
+	if (draw_list.state.index_array == p_index_array) {
 		return; // Already set.
 	}
 
 	_check_transfer_worker_index_array(index_array);
 
-	dl->state.index_array = p_index_array;
+	draw_list.state.index_array = p_index_array;
 #ifdef DEBUG_ENABLED
-	dl->validation.index_array_max_index = index_array->max_index;
+	draw_list.validation.index_array_max_index = index_array->max_index;
 #endif
-	dl->validation.index_array_count = index_array->indices;
+	draw_list.validation.index_array_count = index_array->indices;
 
 	const uint64_t offset_bytes = index_array->offset * (index_array->format == INDEX_BUFFER_FORMAT_UINT16 ? sizeof(uint16_t) : sizeof(uint32_t));
 	draw_graph.add_draw_list_bind_index_buffer(index_array->driver_id, index_array->format, offset_bytes);
@@ -4610,11 +4694,7 @@ void RenderingDevice::draw_list_bind_index_array(DrawListID p_list, RID p_index_
 void RenderingDevice::draw_list_set_line_width(DrawListID p_list, float p_width) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 	draw_graph.add_draw_list_set_line_width(p_width);
 }
@@ -4622,137 +4702,128 @@ void RenderingDevice::draw_list_set_line_width(DrawListID p_list, float p_width)
 void RenderingDevice::draw_list_set_push_constant(DrawListID p_list, const void *p_data, uint32_t p_data_size) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
+	ERR_FAIL_COND(!draw_list.active);
 
 #ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
+	ERR_FAIL_COND_MSG(p_data_size != draw_list.validation.pipeline_push_constant_size,
+			"This render pipeline requires (" + itos(draw_list.validation.pipeline_push_constant_size) + ") bytes of push constant data, supplied: (" + itos(p_data_size) + ")");
 #endif
 
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(p_data_size != dl->validation.pipeline_push_constant_size,
-			"This render pipeline requires (" + itos(dl->validation.pipeline_push_constant_size) + ") bytes of push constant data, supplied: (" + itos(p_data_size) + ")");
-#endif
-
-	draw_graph.add_draw_list_set_push_constant(dl->state.pipeline_shader_driver_id, p_data, p_data_size);
+	draw_graph.add_draw_list_set_push_constant(draw_list.state.pipeline_shader_driver_id, p_data, p_data_size);
 
 #ifdef DEBUG_ENABLED
-	dl->validation.pipeline_push_constant_supplied = true;
+	draw_list.validation.pipeline_push_constant_supplied = true;
 #endif
 }
 
 void RenderingDevice::draw_list_draw(DrawListID p_list, bool p_use_indices, uint32_t p_instances, uint32_t p_procedural_vertices) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 #ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.pipeline_active,
+	ERR_FAIL_COND_MSG(!draw_list.validation.pipeline_active,
 			"No render pipeline was set before attempting to draw.");
-	if (dl->validation.pipeline_vertex_format != INVALID_ID) {
+	if (draw_list.validation.pipeline_vertex_format != INVALID_ID) {
 		// Pipeline uses vertices, validate format.
-		ERR_FAIL_COND_MSG(dl->validation.vertex_format == INVALID_ID,
+		ERR_FAIL_COND_MSG(draw_list.validation.vertex_format == INVALID_ID,
 				"No vertex array was bound, and render pipeline expects vertices.");
 		// Make sure format is right.
-		ERR_FAIL_COND_MSG(dl->validation.pipeline_vertex_format != dl->validation.vertex_format,
+		ERR_FAIL_COND_MSG(draw_list.validation.pipeline_vertex_format != draw_list.validation.vertex_format,
 				"The vertex format used to create the pipeline does not match the vertex format bound.");
 		// Make sure number of instances is valid.
-		ERR_FAIL_COND_MSG(p_instances > dl->validation.vertex_max_instances_allowed,
-				"Number of instances requested (" + itos(p_instances) + " is larger than the maximum number supported by the bound vertex array (" + itos(dl->validation.vertex_max_instances_allowed) + ").");
+		ERR_FAIL_COND_MSG(p_instances > draw_list.validation.vertex_max_instances_allowed,
+				"Number of instances requested (" + itos(p_instances) + " is larger than the maximum number supported by the bound vertex array (" + itos(draw_list.validation.vertex_max_instances_allowed) + ").");
 	}
 
-	if (dl->validation.pipeline_push_constant_size > 0) {
+	if (draw_list.validation.pipeline_push_constant_size > 0) {
 		// Using push constants, check that they were supplied.
-		ERR_FAIL_COND_MSG(!dl->validation.pipeline_push_constant_supplied,
+		ERR_FAIL_COND_MSG(!draw_list.validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 
 #endif
 
 #ifdef DEBUG_ENABLED
-	for (uint32_t i = 0; i < dl->state.set_count; i++) {
-		if (dl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < draw_list.state.set_count; i++) {
+		if (draw_list.state.sets[i].pipeline_expected_format == 0) {
 			// Nothing expected by this pipeline.
 			continue;
 		}
 
-		if (dl->state.sets[i].pipeline_expected_format != dl->state.sets[i].uniform_set_format) {
-			if (dl->state.sets[i].uniform_set_format == 0) {
+		if (draw_list.state.sets[i].pipeline_expected_format != draw_list.state.sets[i].uniform_set_format) {
+			if (draw_list.state.sets[i].uniform_set_format == 0) {
 				ERR_FAIL_MSG("Uniforms were never supplied for set (" + itos(i) + ") at the time of drawing, which are required by the pipeline.");
-			} else if (uniform_set_owner.owns(dl->state.sets[i].uniform_set)) {
-				UniformSet *us = uniform_set_owner.get_or_null(dl->state.sets[i].uniform_set);
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + "):\n" + _shader_uniform_debug(us->shader_id, us->shader_set) + "\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(dl->state.pipeline_shader));
+			} else if (uniform_set_owner.owns(draw_list.state.sets[i].uniform_set)) {
+				UniformSet *us = uniform_set_owner.get_or_null(draw_list.state.sets[i].uniform_set);
+				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + "):\n" + _shader_uniform_debug(us->shader_id, us->shader_set) + "\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(draw_list.state.pipeline_shader));
 			} else {
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + ", which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(dl->state.pipeline_shader));
+				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + ", which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(draw_list.state.pipeline_shader));
 			}
 		}
 	}
 #endif
 	thread_local LocalVector<RDD::UniformSetID> valid_descriptor_ids;
 	valid_descriptor_ids.clear();
-	valid_descriptor_ids.resize(dl->state.set_count);
+	valid_descriptor_ids.resize(draw_list.state.set_count);
 	uint32_t valid_set_count = 0;
 	uint32_t first_set_index = 0;
 	uint32_t last_set_index = 0;
 	bool found_first_set = false;
 
-	for (uint32_t i = 0; i < dl->state.set_count; i++) {
-		if (dl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < draw_list.state.set_count; i++) {
+		if (draw_list.state.sets[i].pipeline_expected_format == 0) {
 			continue; // Nothing expected by this pipeline.
 		}
 
-		if (!dl->state.sets[i].bound && !found_first_set) {
+		if (!draw_list.state.sets[i].bound && !found_first_set) {
 			first_set_index = i;
 			found_first_set = true;
 		}
 		// Prepare descriptor sets if the API doesn't use pipeline barriers.
 		if (!driver->api_trait_get(RDD::API_TRAIT_HONORS_PIPELINE_BARRIERS)) {
-			draw_graph.add_draw_list_uniform_set_prepare_for_use(dl->state.pipeline_shader_driver_id, dl->state.sets[i].uniform_set_driver_id, i);
+			draw_graph.add_draw_list_uniform_set_prepare_for_use(draw_list.state.pipeline_shader_driver_id, draw_list.state.sets[i].uniform_set_driver_id, i);
 		}
 	}
 
 	// Bind descriptor sets.
-	for (uint32_t i = first_set_index; i < dl->state.set_count; i++) {
-		if (dl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = first_set_index; i < draw_list.state.set_count; i++) {
+		if (draw_list.state.sets[i].pipeline_expected_format == 0) {
 			continue; // Nothing expected by this pipeline.
 		}
 
-		if (!dl->state.sets[i].bound) {
+		if (!draw_list.state.sets[i].bound) {
 			// Batch contiguous descriptor sets in a single call.
 			if (descriptor_set_batching) {
 				// All good, see if this requires re-binding.
 				if (i - last_set_index > 1) {
 					// If the descriptor sets are not contiguous, bind the previous ones and start a new batch.
-					draw_graph.add_draw_list_bind_uniform_sets(dl->state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
+					draw_graph.add_draw_list_bind_uniform_sets(draw_list.state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
 
 					first_set_index = i;
 					valid_set_count = 1;
-					valid_descriptor_ids[0] = dl->state.sets[i].uniform_set_driver_id;
+					valid_descriptor_ids[0] = draw_list.state.sets[i].uniform_set_driver_id;
 				} else {
 					// Otherwise, keep storing in the current batch.
-					valid_descriptor_ids[valid_set_count] = dl->state.sets[i].uniform_set_driver_id;
+					valid_descriptor_ids[valid_set_count] = draw_list.state.sets[i].uniform_set_driver_id;
 					valid_set_count++;
 				}
 
-				UniformSet *uniform_set = uniform_set_owner.get_or_null(dl->state.sets[i].uniform_set);
+				UniformSet *uniform_set = uniform_set_owner.get_or_null(draw_list.state.sets[i].uniform_set);
 				_uniform_set_update_shared(uniform_set);
 				draw_graph.add_draw_list_usages(uniform_set->draw_trackers, uniform_set->draw_trackers_usage);
-				dl->state.sets[i].bound = true;
+				draw_list.state.sets[i].bound = true;
 
 				last_set_index = i;
 			} else {
-				draw_graph.add_draw_list_bind_uniform_set(dl->state.pipeline_shader_driver_id, dl->state.sets[i].uniform_set_driver_id, i);
+				draw_graph.add_draw_list_bind_uniform_set(draw_list.state.pipeline_shader_driver_id, draw_list.state.sets[i].uniform_set_driver_id, i);
 			}
 		}
 	}
 
 	// Bind the remaining batch.
 	if (descriptor_set_batching && valid_set_count > 0) {
-		draw_graph.add_draw_list_bind_uniform_sets(dl->state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
+		draw_graph.add_draw_list_bind_uniform_sets(draw_list.state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
 	}
 
 	if (p_use_indices) {
@@ -4760,20 +4831,20 @@ void RenderingDevice::draw_list_draw(DrawListID p_list, bool p_use_indices, uint
 		ERR_FAIL_COND_MSG(p_procedural_vertices > 0,
 				"Procedural vertices can't be used together with indices.");
 
-		ERR_FAIL_COND_MSG(!dl->validation.index_array_count,
+		ERR_FAIL_COND_MSG(!draw_list.validation.index_array_count,
 				"Draw command requested indices, but no index buffer was set.");
 
-		ERR_FAIL_COND_MSG(dl->validation.pipeline_uses_restart_indices != dl->validation.index_buffer_uses_restart_indices,
+		ERR_FAIL_COND_MSG(draw_list.validation.pipeline_uses_restart_indices != draw_list.validation.index_buffer_uses_restart_indices,
 				"The usage of restart indices in index buffer does not match the render primitive in the pipeline.");
 #endif
-		uint32_t to_draw = dl->validation.index_array_count;
+		uint32_t to_draw = draw_list.validation.index_array_count;
 
 #ifdef DEBUG_ENABLED
-		ERR_FAIL_COND_MSG(to_draw < dl->validation.pipeline_primitive_minimum,
-				"Too few indices (" + itos(to_draw) + ") for the render primitive set in the render pipeline (" + itos(dl->validation.pipeline_primitive_minimum) + ").");
+		ERR_FAIL_COND_MSG(to_draw < draw_list.validation.pipeline_primitive_minimum,
+				"Too few indices (" + itos(to_draw) + ") for the render primitive set in the render pipeline (" + itos(draw_list.validation.pipeline_primitive_minimum) + ").");
 
-		ERR_FAIL_COND_MSG((to_draw % dl->validation.pipeline_primitive_divisor) != 0,
-				"Index amount (" + itos(to_draw) + ") must be a multiple of the amount of indices required by the render primitive (" + itos(dl->validation.pipeline_primitive_divisor) + ").");
+		ERR_FAIL_COND_MSG((to_draw % draw_list.validation.pipeline_primitive_divisor) != 0,
+				"Index amount (" + itos(to_draw) + ") must be a multiple of the amount of indices required by the render primitive (" + itos(draw_list.validation.pipeline_primitive_divisor) + ").");
 #endif
 
 		draw_graph.add_draw_list_draw_indexed(to_draw, p_instances, 0);
@@ -4782,37 +4853,36 @@ void RenderingDevice::draw_list_draw(DrawListID p_list, bool p_use_indices, uint
 
 		if (p_procedural_vertices > 0) {
 #ifdef DEBUG_ENABLED
-			ERR_FAIL_COND_MSG(dl->validation.pipeline_vertex_format != INVALID_ID,
+			ERR_FAIL_COND_MSG(draw_list.validation.pipeline_vertex_format != INVALID_ID,
 					"Procedural vertices requested, but pipeline expects a vertex array.");
 #endif
 			to_draw = p_procedural_vertices;
 		} else {
 #ifdef DEBUG_ENABLED
-			ERR_FAIL_COND_MSG(dl->validation.pipeline_vertex_format == INVALID_ID,
+			ERR_FAIL_COND_MSG(draw_list.validation.pipeline_vertex_format == INVALID_ID,
 					"Draw command lacks indices, but pipeline format does not use vertices.");
 #endif
-			to_draw = dl->validation.vertex_array_size;
+			to_draw = draw_list.validation.vertex_array_size;
 		}
 
 #ifdef DEBUG_ENABLED
-		ERR_FAIL_COND_MSG(to_draw < dl->validation.pipeline_primitive_minimum,
-				"Too few vertices (" + itos(to_draw) + ") for the render primitive set in the render pipeline (" + itos(dl->validation.pipeline_primitive_minimum) + ").");
+		ERR_FAIL_COND_MSG(to_draw < draw_list.validation.pipeline_primitive_minimum,
+				"Too few vertices (" + itos(to_draw) + ") for the render primitive set in the render pipeline (" + itos(draw_list.validation.pipeline_primitive_minimum) + ").");
 
-		ERR_FAIL_COND_MSG((to_draw % dl->validation.pipeline_primitive_divisor) != 0,
-				"Vertex amount (" + itos(to_draw) + ") must be a multiple of the amount of vertices required by the render primitive (" + itos(dl->validation.pipeline_primitive_divisor) + ").");
+		ERR_FAIL_COND_MSG((to_draw % draw_list.validation.pipeline_primitive_divisor) != 0,
+				"Vertex amount (" + itos(to_draw) + ") must be a multiple of the amount of vertices required by the render primitive (" + itos(draw_list.validation.pipeline_primitive_divisor) + ").");
 #endif
 
 		draw_graph.add_draw_list_draw(to_draw, p_instances);
 	}
 
-	dl->state.draw_count++;
+	draw_list.state.draw_count++;
 }
 
 void RenderingDevice::draw_list_draw_indirect(DrawListID p_list, bool p_use_indices, RID p_buffer, uint32_t p_offset, uint32_t p_draw_count, uint32_t p_stride) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
+	ERR_FAIL_COND(!draw_list.active);
 
 	Buffer *buffer = storage_buffer_owner.get_or_null(p_buffer);
 	ERR_FAIL_NULL(buffer);
@@ -4820,43 +4890,39 @@ void RenderingDevice::draw_list_draw_indirect(DrawListID p_list, bool p_use_indi
 	ERR_FAIL_COND_MSG(!buffer->usage.has_flag(RDD::BUFFER_USAGE_INDIRECT_BIT), "Buffer provided was not created to do indirect dispatch.");
 
 #ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
-
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.pipeline_active,
+	ERR_FAIL_COND_MSG(!draw_list.validation.pipeline_active,
 			"No render pipeline was set before attempting to draw.");
-	if (dl->validation.pipeline_vertex_format != INVALID_ID) {
+	if (draw_list.validation.pipeline_vertex_format != INVALID_ID) {
 		// Pipeline uses vertices, validate format.
-		ERR_FAIL_COND_MSG(dl->validation.vertex_format == INVALID_ID,
+		ERR_FAIL_COND_MSG(draw_list.validation.vertex_format == INVALID_ID,
 				"No vertex array was bound, and render pipeline expects vertices.");
 		// Make sure format is right.
-		ERR_FAIL_COND_MSG(dl->validation.pipeline_vertex_format != dl->validation.vertex_format,
+		ERR_FAIL_COND_MSG(draw_list.validation.pipeline_vertex_format != draw_list.validation.vertex_format,
 				"The vertex format used to create the pipeline does not match the vertex format bound.");
 	}
 
-	if (dl->validation.pipeline_push_constant_size > 0) {
+	if (draw_list.validation.pipeline_push_constant_size > 0) {
 		// Using push constants, check that they were supplied.
-		ERR_FAIL_COND_MSG(!dl->validation.pipeline_push_constant_supplied,
+		ERR_FAIL_COND_MSG(!draw_list.validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 #endif
 
 #ifdef DEBUG_ENABLED
-	for (uint32_t i = 0; i < dl->state.set_count; i++) {
-		if (dl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < draw_list.state.set_count; i++) {
+		if (draw_list.state.sets[i].pipeline_expected_format == 0) {
 			// Nothing expected by this pipeline.
 			continue;
 		}
 
-		if (dl->state.sets[i].pipeline_expected_format != dl->state.sets[i].uniform_set_format) {
-			if (dl->state.sets[i].uniform_set_format == 0) {
+		if (draw_list.state.sets[i].pipeline_expected_format != draw_list.state.sets[i].uniform_set_format) {
+			if (draw_list.state.sets[i].uniform_set_format == 0) {
 				ERR_FAIL_MSG(vformat("Uniforms were never supplied for set (%d) at the time of drawing, which are required by the pipeline.", i));
-			} else if (uniform_set_owner.owns(dl->state.sets[i].uniform_set)) {
-				UniformSet *us = uniform_set_owner.get_or_null(dl->state.sets[i].uniform_set);
-				ERR_FAIL_MSG(vformat("Uniforms supplied for set (%d):\n%s\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n%s", i, _shader_uniform_debug(us->shader_id, us->shader_set), _shader_uniform_debug(dl->state.pipeline_shader)));
+			} else if (uniform_set_owner.owns(draw_list.state.sets[i].uniform_set)) {
+				UniformSet *us = uniform_set_owner.get_or_null(draw_list.state.sets[i].uniform_set);
+				ERR_FAIL_MSG(vformat("Uniforms supplied for set (%d):\n%s\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n%s", i, _shader_uniform_debug(us->shader_id, us->shader_set), _shader_uniform_debug(draw_list.state.pipeline_shader)));
 			} else {
-				ERR_FAIL_MSG(vformat("Uniforms supplied for set (%s, which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n%s", i, _shader_uniform_debug(dl->state.pipeline_shader)));
+				ERR_FAIL_MSG(vformat("Uniforms supplied for set (%s, which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n%s", i, _shader_uniform_debug(draw_list.state.pipeline_shader)));
 			}
 		}
 	}
@@ -4864,40 +4930,40 @@ void RenderingDevice::draw_list_draw_indirect(DrawListID p_list, bool p_use_indi
 
 	// Prepare descriptor sets if the API doesn't use pipeline barriers.
 	if (!driver->api_trait_get(RDD::API_TRAIT_HONORS_PIPELINE_BARRIERS)) {
-		for (uint32_t i = 0; i < dl->state.set_count; i++) {
-			if (dl->state.sets[i].pipeline_expected_format == 0) {
+		for (uint32_t i = 0; i < draw_list.state.set_count; i++) {
+			if (draw_list.state.sets[i].pipeline_expected_format == 0) {
 				// Nothing expected by this pipeline.
 				continue;
 			}
 
-			draw_graph.add_draw_list_uniform_set_prepare_for_use(dl->state.pipeline_shader_driver_id, dl->state.sets[i].uniform_set_driver_id, i);
+			draw_graph.add_draw_list_uniform_set_prepare_for_use(draw_list.state.pipeline_shader_driver_id, draw_list.state.sets[i].uniform_set_driver_id, i);
 		}
 	}
 
 	// Bind descriptor sets.
-	for (uint32_t i = 0; i < dl->state.set_count; i++) {
-		if (dl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < draw_list.state.set_count; i++) {
+		if (draw_list.state.sets[i].pipeline_expected_format == 0) {
 			continue; // Nothing expected by this pipeline.
 		}
-		if (!dl->state.sets[i].bound) {
+		if (!draw_list.state.sets[i].bound) {
 			// All good, see if this requires re-binding.
-			draw_graph.add_draw_list_bind_uniform_set(dl->state.pipeline_shader_driver_id, dl->state.sets[i].uniform_set_driver_id, i);
+			draw_graph.add_draw_list_bind_uniform_set(draw_list.state.pipeline_shader_driver_id, draw_list.state.sets[i].uniform_set_driver_id, i);
 
-			UniformSet *uniform_set = uniform_set_owner.get_or_null(dl->state.sets[i].uniform_set);
+			UniformSet *uniform_set = uniform_set_owner.get_or_null(draw_list.state.sets[i].uniform_set);
 			_uniform_set_update_shared(uniform_set);
 
 			draw_graph.add_draw_list_usages(uniform_set->draw_trackers, uniform_set->draw_trackers_usage);
 
-			dl->state.sets[i].bound = true;
+			draw_list.state.sets[i].bound = true;
 		}
 	}
 
 	if (p_use_indices) {
 #ifdef DEBUG_ENABLED
-		ERR_FAIL_COND_MSG(!dl->validation.index_array_count,
+		ERR_FAIL_COND_MSG(!draw_list.validation.index_array_count,
 				"Draw command requested indices, but no index buffer was set.");
 
-		ERR_FAIL_COND_MSG(dl->validation.pipeline_uses_restart_indices != dl->validation.index_buffer_uses_restart_indices,
+		ERR_FAIL_COND_MSG(draw_list.validation.pipeline_uses_restart_indices != draw_list.validation.index_buffer_uses_restart_indices,
 				"The usage of restart indices in index buffer does not match the render primitive in the pipeline.");
 #endif
 
@@ -4910,7 +4976,7 @@ void RenderingDevice::draw_list_draw_indirect(DrawListID p_list, bool p_use_indi
 		draw_graph.add_draw_list_draw_indirect(buffer->driver_id, p_offset, p_draw_count, p_stride);
 	}
 
-	dl->state.draw_count++;
+	draw_list.state.draw_count++;
 
 	if (buffer->draw_tracker != nullptr) {
 		draw_graph.add_draw_list_usage(buffer->draw_tracker, RDG::RESOURCE_USAGE_INDIRECT_BUFFER_READ);
@@ -4920,34 +4986,25 @@ void RenderingDevice::draw_list_draw_indirect(DrawListID p_list, bool p_use_indi
 }
 
 void RenderingDevice::draw_list_set_viewport(DrawListID p_list, const Rect2 &p_rect) {
-	DrawList *dl = _get_draw_list_ptr(p_list);
-
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
 	if (p_rect.get_area() == 0) {
 		return;
 	}
 
-	dl->viewport = p_rect;
+	draw_list.viewport = p_rect;
 	draw_graph.add_draw_list_set_viewport(p_rect);
 }
 
 void RenderingDevice::draw_list_enable_scissor(DrawListID p_list, const Rect2 &p_rect) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
+	ERR_FAIL_COND(!draw_list.active);
 
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
 	Rect2i rect = p_rect;
-	rect.position += dl->viewport.position;
+	rect.position += draw_list.viewport.position;
 
-	rect = dl->viewport.intersection(rect);
+	rect = draw_list.viewport.intersection(rect);
 
 	if (rect.get_area() == 0) {
 		return;
@@ -4959,13 +5016,9 @@ void RenderingDevice::draw_list_enable_scissor(DrawListID p_list, const Rect2 &p
 void RenderingDevice::draw_list_disable_scissor(DrawListID p_list) {
 	ERR_RENDER_THREAD_GUARD();
 
-	DrawList *dl = _get_draw_list_ptr(p_list);
-	ERR_FAIL_NULL(dl);
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!dl->validation.active, "Submitted Draw Lists can no longer be modified.");
-#endif
+	ERR_FAIL_COND(!draw_list.active);
 
-	draw_graph.add_draw_list_set_scissor(dl->viewport);
+	draw_graph.add_draw_list_set_scissor(draw_list.viewport);
 }
 
 uint32_t RenderingDevice::draw_list_get_current_pass() {
@@ -4977,17 +5030,17 @@ uint32_t RenderingDevice::draw_list_get_current_pass() {
 RenderingDevice::DrawListID RenderingDevice::draw_list_switch_to_next_pass() {
 	ERR_RENDER_THREAD_GUARD_V(INVALID_ID);
 
-	ERR_FAIL_NULL_V(draw_list, INVALID_ID);
+	ERR_FAIL_COND_V(!draw_list.active, INVALID_FORMAT_ID);
 	ERR_FAIL_COND_V(draw_list_current_subpass >= draw_list_subpass_count - 1, INVALID_FORMAT_ID);
 
 	draw_list_current_subpass++;
 
 	Rect2i viewport;
-	_draw_list_free(&viewport);
+	_draw_list_end(&viewport);
 
 	draw_graph.add_draw_list_next_subpass(RDD::COMMAND_BUFFER_TYPE_PRIMARY);
 
-	_draw_list_allocate(viewport, draw_list_current_subpass);
+	_draw_list_start(viewport);
 
 	return int64_t(ID_TYPE_DRAW_LIST) << ID_BASE_SHIFT;
 }
@@ -4998,32 +5051,29 @@ Error RenderingDevice::draw_list_switch_to_next_pass_split(uint32_t p_splits, Dr
 }
 #endif
 
-Error RenderingDevice::_draw_list_allocate(const Rect2i &p_viewport, uint32_t p_subpass) {
-	draw_list = memnew(DrawList);
-	draw_list->viewport = p_viewport;
-
-	return OK;
+void RenderingDevice::_draw_list_start(const Rect2i &p_viewport) {
+	draw_list.viewport = p_viewport;
+	draw_list.active = true;
 }
 
-void RenderingDevice::_draw_list_free(Rect2i *r_last_viewport) {
+void RenderingDevice::_draw_list_end(Rect2i *r_last_viewport) {
 	if (r_last_viewport) {
-		*r_last_viewport = draw_list->viewport;
+		*r_last_viewport = draw_list.viewport;
 	}
-	// Just end the list.
-	memdelete(draw_list);
-	draw_list = nullptr;
+
+	draw_list = DrawList();
 }
 
 void RenderingDevice::draw_list_end() {
 	ERR_RENDER_THREAD_GUARD();
 
-	ERR_FAIL_NULL_MSG(draw_list, "Immediate draw list is already inactive.");
+	ERR_FAIL_COND_MSG(!draw_list.active, "Immediate draw list is already inactive.");
 
 	draw_graph.add_draw_list_end();
 
-	_draw_list_free();
+	_draw_list_end();
 
-	for (int i = 0; i < draw_list_bound_textures.size(); i++) {
+	for (uint32_t i = 0; i < draw_list_bound_textures.size(); i++) {
 		Texture *texture = texture_owner.get_or_null(draw_list_bound_textures[i]);
 		ERR_CONTINUE(!texture); // Wtf.
 		if (texture->usage_flags & TEXTURE_USAGE_COLOR_ATTACHMENT_BIT) {
@@ -5044,9 +5094,9 @@ void RenderingDevice::draw_list_end() {
 RenderingDevice::ComputeListID RenderingDevice::compute_list_begin() {
 	ERR_RENDER_THREAD_GUARD_V(INVALID_ID);
 
-	ERR_FAIL_COND_V_MSG(compute_list != nullptr, INVALID_ID, "Only one draw/compute list can be active at the same time.");
+	ERR_FAIL_COND_V_MSG(compute_list.active, INVALID_ID, "Only one draw/compute list can be active at the same time.");
 
-	compute_list = memnew(ComputeList);
+	compute_list.active = true;
 
 	draw_graph.add_compute_list_begin();
 
@@ -5057,26 +5107,24 @@ void RenderingDevice::compute_list_bind_compute_pipeline(ComputeListID p_list, R
 	ERR_RENDER_THREAD_GUARD();
 
 	ERR_FAIL_COND(p_list != ID_TYPE_COMPUTE_LIST);
-	ERR_FAIL_NULL(compute_list);
-
-	ComputeList *cl = compute_list;
+	ERR_FAIL_COND(!compute_list.active);
 
 	const ComputePipeline *pipeline = compute_pipeline_owner.get_or_null(p_compute_pipeline);
 	ERR_FAIL_NULL(pipeline);
 
-	if (p_compute_pipeline == cl->state.pipeline) {
+	if (p_compute_pipeline == compute_list.state.pipeline) {
 		return; // Redundant state, return.
 	}
 
-	cl->state.pipeline = p_compute_pipeline;
+	compute_list.state.pipeline = p_compute_pipeline;
 
 	draw_graph.add_compute_list_bind_pipeline(pipeline->driver_id);
 
-	if (cl->state.pipeline_shader != pipeline->shader) {
+	if (compute_list.state.pipeline_shader != pipeline->shader) {
 		// Shader changed, so descriptor sets may become incompatible.
 
 		uint32_t pcount = pipeline->set_formats.size(); // Formats count in this pipeline.
-		cl->state.set_count = MAX(cl->state.set_count, pcount);
+		compute_list.state.set_count = MAX(compute_list.state.set_count, pcount);
 		const uint32_t *pformats = pipeline->set_formats.ptr(); // Pipeline set formats.
 
 		uint32_t first_invalid_set = UINT32_MAX; // All valid by default.
@@ -5086,49 +5134,49 @@ void RenderingDevice::compute_list_bind_compute_pipeline(ComputeListID p_list, R
 			} break;
 			case RDD::SHADER_CHANGE_INVALIDATION_INCOMPATIBLE_SETS_PLUS_CASCADE: {
 				for (uint32_t i = 0; i < pcount; i++) {
-					if (cl->state.sets[i].pipeline_expected_format != pformats[i]) {
+					if (compute_list.state.sets[i].pipeline_expected_format != pformats[i]) {
 						first_invalid_set = i;
 						break;
 					}
 				}
 			} break;
 			case RDD::SHADER_CHANGE_INVALIDATION_ALL_OR_NONE_ACCORDING_TO_LAYOUT_HASH: {
-				if (cl->state.pipeline_shader_layout_hash != pipeline->shader_layout_hash) {
+				if (compute_list.state.pipeline_shader_layout_hash != pipeline->shader_layout_hash) {
 					first_invalid_set = 0;
 				}
 			} break;
 		}
 
 		for (uint32_t i = 0; i < pcount; i++) {
-			cl->state.sets[i].bound = cl->state.sets[i].bound && i < first_invalid_set;
-			cl->state.sets[i].pipeline_expected_format = pformats[i];
+			compute_list.state.sets[i].bound = compute_list.state.sets[i].bound && i < first_invalid_set;
+			compute_list.state.sets[i].pipeline_expected_format = pformats[i];
 		}
 
-		for (uint32_t i = pcount; i < cl->state.set_count; i++) {
+		for (uint32_t i = pcount; i < compute_list.state.set_count; i++) {
 			// Unbind the ones above (not used) if exist.
-			cl->state.sets[i].bound = false;
+			compute_list.state.sets[i].bound = false;
 		}
 
-		cl->state.set_count = pcount; // Update set count.
+		compute_list.state.set_count = pcount; // Update set count.
 
 		if (pipeline->push_constant_size) {
 #ifdef DEBUG_ENABLED
-			cl->validation.pipeline_push_constant_supplied = false;
+			compute_list.validation.pipeline_push_constant_supplied = false;
 #endif
 		}
 
-		cl->state.pipeline_shader = pipeline->shader;
-		cl->state.pipeline_shader_driver_id = pipeline->shader_driver_id;
-		cl->state.pipeline_shader_layout_hash = pipeline->shader_layout_hash;
-		cl->state.local_group_size[0] = pipeline->local_group_size[0];
-		cl->state.local_group_size[1] = pipeline->local_group_size[1];
-		cl->state.local_group_size[2] = pipeline->local_group_size[2];
+		compute_list.state.pipeline_shader = pipeline->shader;
+		compute_list.state.pipeline_shader_driver_id = pipeline->shader_driver_id;
+		compute_list.state.pipeline_shader_layout_hash = pipeline->shader_layout_hash;
+		compute_list.state.local_group_size[0] = pipeline->local_group_size[0];
+		compute_list.state.local_group_size[1] = pipeline->local_group_size[1];
+		compute_list.state.local_group_size[2] = pipeline->local_group_size[2];
 	}
 
 #ifdef DEBUG_ENABLED
 	// Update compute pass pipeline info.
-	cl->validation.pipeline_active = true;
-	cl->validation.pipeline_push_constant_size = pipeline->push_constant_size;
+	compute_list.validation.pipeline_active = true;
+	compute_list.validation.pipeline_push_constant_size = pipeline->push_constant_size;
 #endif
 }
 
@@ -5136,30 +5184,24 @@ void RenderingDevice::compute_list_bind_uniform_set(ComputeListID p_list, RID p_
 	ERR_RENDER_THREAD_GUARD();
 
 	ERR_FAIL_COND(p_list != ID_TYPE_COMPUTE_LIST);
-	ERR_FAIL_NULL(compute_list);
-
-	ComputeList *cl = compute_list;
+	ERR_FAIL_COND(!compute_list.active);
 
 #ifdef DEBUG_ENABLED
 	ERR_FAIL_COND_MSG(p_index >= driver->limit_get(LIMIT_MAX_BOUND_UNIFORM_SETS) || p_index >= MAX_UNIFORM_SETS,
 			"Attempting to bind a descriptor set (" + itos(p_index) + ") greater than what the hardware supports (" + itos(driver->limit_get(LIMIT_MAX_BOUND_UNIFORM_SETS)) + ").");
 #endif
 
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!cl->validation.active, "Submitted Compute Lists can no longer be modified.");
-#endif
-
 	UniformSet *uniform_set = uniform_set_owner.get_or_null(p_uniform_set);
 	ERR_FAIL_NULL(uniform_set);
 
-	if (p_index > cl->state.set_count) {
-		cl->state.set_count = p_index;
+	if (p_index > compute_list.state.set_count) {
+		compute_list.state.set_count = p_index;
 	}
 
-	cl->state.sets[p_index].uniform_set_driver_id = uniform_set->driver_id; // Update set pointer.
-	cl->state.sets[p_index].bound = false; // Needs rebind.
-	cl->state.sets[p_index].uniform_set_format = uniform_set->format;
-	cl->state.sets[p_index].uniform_set = p_uniform_set;
+	compute_list.state.sets[p_index].uniform_set_driver_id = uniform_set->driver_id; // Update set pointer.
+	compute_list.state.sets[p_index].bound = false; // Needs rebind.
+	compute_list.state.sets[p_index].uniform_set_format = uniform_set->format;
+	compute_list.state.sets[p_index].uniform_set = p_uniform_set;
 
 #if 0
 	{ // Validate that textures bound are not attached as framebuffer bindings.
@@ -5181,28 +5223,22 @@ void RenderingDevice::compute_list_set_push_constant(ComputeListID p_list, const
 	ERR_RENDER_THREAD_GUARD();
 
 	ERR_FAIL_COND(p_list != ID_TYPE_COMPUTE_LIST);
-	ERR_FAIL_NULL(compute_list);
+	ERR_FAIL_COND(!compute_list.active);
 	ERR_FAIL_COND_MSG(p_data_size > MAX_PUSH_CONSTANT_SIZE, "Push constants can't be bigger than 128 bytes to maintain compatibility.");
 
-	ComputeList *cl = compute_list;
-
 #ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!cl->validation.active, "Submitted Compute Lists can no longer be modified.");
+	ERR_FAIL_COND_MSG(p_data_size != compute_list.validation.pipeline_push_constant_size,
+			"This compute pipeline requires (" + itos(compute_list.validation.pipeline_push_constant_size) + ") bytes of push constant data, supplied: (" + itos(p_data_size) + ")");
 #endif
 
-#ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(p_data_size != cl->validation.pipeline_push_constant_size,
-			"This compute pipeline requires (" + itos(cl->validation.pipeline_push_constant_size) + ") bytes of push constant data, supplied: (" + itos(p_data_size) + ")");
-#endif
-
-	draw_graph.add_compute_list_set_push_constant(cl->state.pipeline_shader_driver_id, p_data, p_data_size);
+	draw_graph.add_compute_list_set_push_constant(compute_list.state.pipeline_shader_driver_id, p_data, p_data_size);
 
 	// Store it in the state in case we need to restart the compute list.
-	memcpy(cl->state.push_constant_data, p_data, p_data_size);
-	cl->state.push_constant_size = p_data_size;
+	memcpy(compute_list.state.push_constant_data, p_data, p_data_size);
+	compute_list.state.push_constant_size = p_data_size;
 
 #ifdef DEBUG_ENABLED
-	cl->validation.pipeline_push_constant_supplied = true;
+	compute_list.validation.pipeline_push_constant_supplied = true;
 #endif
 }
 
@@ -5210,9 +5246,7 @@ void RenderingDevice::compute_list_dispatch(ComputeListID p_list, uint32_t p_x_g
 	ERR_RENDER_THREAD_GUARD();
 
 	ERR_FAIL_COND(p_list != ID_TYPE_COMPUTE_LIST);
-	ERR_FAIL_NULL(compute_list);
-
-	ComputeList *cl = compute_list;
+	ERR_FAIL_COND(!compute_list.active);
 
 #ifdef DEBUG_ENABLED
 	ERR_FAIL_COND_MSG(p_x_groups == 0, "Dispatch amount of X compute groups (" + itos(p_x_groups) + ") is zero.");
@@ -5224,114 +5258,112 @@ void RenderingDevice::compute_list_dispatch(ComputeListID p_list, uint32_t p_x_g
 			"Dispatch amount of Y compute groups (" + itos(p_y_groups) + ") is larger than device limit (" + itos(driver->limit_get(LIMIT_MAX_COMPUTE_WORKGROUP_COUNT_Y)) + ")");
 	ERR_FAIL_COND_MSG(p_z_groups > driver->limit_get(LIMIT_MAX_COMPUTE_WORKGROUP_COUNT_Z),
 			"Dispatch amount of Z compute groups (" + itos(p_z_groups) + ") is larger than device limit (" + itos(driver->limit_get(LIMIT_MAX_COMPUTE_WORKGROUP_COUNT_Z)) + ")");
-
-	ERR_FAIL_COND_MSG(!cl->validation.active, "Submitted Compute Lists can no longer be modified.");
 #endif
 
 #ifdef DEBUG_ENABLED
 
-	ERR_FAIL_COND_MSG(!cl->validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
+	ERR_FAIL_COND_MSG(!compute_list.validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
 
-	if (cl->validation.pipeline_push_constant_size > 0) {
+	if (compute_list.validation.pipeline_push_constant_size > 0) {
 		// Using push constants, check that they were supplied.
-		ERR_FAIL_COND_MSG(!cl->validation.pipeline_push_constant_supplied,
+		ERR_FAIL_COND_MSG(!compute_list.validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 
 #endif
 
 #ifdef DEBUG_ENABLED
-	for (uint32_t i = 0; i < cl->state.set_count; i++) {
-		if (cl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < compute_list.state.set_count; i++) {
+		if (compute_list.state.sets[i].pipeline_expected_format == 0) {
 			// Nothing expected by this pipeline.
 			continue;
 		}
 
-		if (cl->state.sets[i].pipeline_expected_format != cl->state.sets[i].uniform_set_format) {
-			if (cl->state.sets[i].uniform_set_format == 0) {
+		if (compute_list.state.sets[i].pipeline_expected_format != compute_list.state.sets[i].uniform_set_format) {
+			if (compute_list.state.sets[i].uniform_set_format == 0) {
 				ERR_FAIL_MSG("Uniforms were never supplied for set (" + itos(i) + ") at the time of drawing, which are required by the pipeline.");
-			} else if (uniform_set_owner.owns(cl->state.sets[i].uniform_set)) {
-				UniformSet *us = uniform_set_owner.get_or_null(cl->state.sets[i].uniform_set);
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + "):\n" + _shader_uniform_debug(us->shader_id, us->shader_set) + "\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(cl->state.pipeline_shader));
+			} else if (uniform_set_owner.owns(compute_list.state.sets[i].uniform_set)) {
+				UniformSet *us = uniform_set_owner.get_or_null(compute_list.state.sets[i].uniform_set);
+				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + "):\n" + _shader_uniform_debug(us->shader_id, us->shader_set) + "\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(compute_list.state.pipeline_shader));
 			} else {
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + ", which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(cl->state.pipeline_shader));
+				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + ", which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(compute_list.state.pipeline_shader));
 			}
 		}
 	}
 #endif
 	thread_local LocalVector<RDD::UniformSetID> valid_descriptor_ids;
 	valid_descriptor_ids.clear();
-	valid_descriptor_ids.resize(cl->state.set_count);
+	valid_descriptor_ids.resize(compute_list.state.set_count);
 
 	uint32_t valid_set_count = 0;
 	uint32_t first_set_index = 0;
 	uint32_t last_set_index = 0;
 	bool found_first_set = false;
 
-	for (uint32_t i = 0; i < cl->state.set_count; i++) {
-		if (cl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < compute_list.state.set_count; i++) {
+		if (compute_list.state.sets[i].pipeline_expected_format == 0) {
 			// Nothing expected by this pipeline.
 			continue;
 		}
 
-		if (!cl->state.sets[i].bound && !found_first_set) {
+		if (!compute_list.state.sets[i].bound && !found_first_set) {
 			first_set_index = i;
 			found_first_set = true;
 		}
 		// Prepare descriptor sets if the API doesn't use pipeline barriers.
 		if (!driver->api_trait_get(RDD::API_TRAIT_HONORS_PIPELINE_BARRIERS)) {
-			draw_graph.add_compute_list_uniform_set_prepare_for_use(cl->state.pipeline_shader_driver_id, cl->state.sets[i].uniform_set_driver_id, i);
+			draw_graph.add_compute_list_uniform_set_prepare_for_use(compute_list.state.pipeline_shader_driver_id, compute_list.state.sets[i].uniform_set_driver_id, i);
 		}
 	}
 
 	// Bind descriptor sets.
-	for (uint32_t i = first_set_index; i < cl->state.set_count; i++) {
-		if (cl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = first_set_index; i < compute_list.state.set_count; i++) {
+		if (compute_list.state.sets[i].pipeline_expected_format == 0) {
 			continue; // Nothing expected by this pipeline.
 		}
 
-		if (!cl->state.sets[i].bound) {
+		if (!compute_list.state.sets[i].bound) {
 			// Descriptor set batching
 			if (descriptor_set_batching) {
 				// All good, see if this requires re-binding.
 				if (i - last_set_index > 1) {
 					// If the descriptor sets are not contiguous, bind the previous ones and start a new batch.
-					draw_graph.add_compute_list_bind_uniform_sets(cl->state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
+					draw_graph.add_compute_list_bind_uniform_sets(compute_list.state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
 
 					first_set_index = i;
 					valid_set_count = 1;
-					valid_descriptor_ids[0] = cl->state.sets[i].uniform_set_driver_id;
+					valid_descriptor_ids[0] = compute_list.state.sets[i].uniform_set_driver_id;
 				} else {
 					// Otherwise, keep storing in the current batch.
-					valid_descriptor_ids[valid_set_count] = cl->state.sets[i].uniform_set_driver_id;
+					valid_descriptor_ids[valid_set_count] = compute_list.state.sets[i].uniform_set_driver_id;
 					valid_set_count++;
 				}
 
 				last_set_index = i;
 			} else {
-				draw_graph.add_compute_list_bind_uniform_set(cl->state.pipeline_shader_driver_id, cl->state.sets[i].uniform_set_driver_id, i);
+				draw_graph.add_compute_list_bind_uniform_set(compute_list.state.pipeline_shader_driver_id, compute_list.state.sets[i].uniform_set_driver_id, i);
 			}
-			UniformSet *uniform_set = uniform_set_owner.get_or_null(cl->state.sets[i].uniform_set);
+			UniformSet *uniform_set = uniform_set_owner.get_or_null(compute_list.state.sets[i].uniform_set);
 			_uniform_set_update_shared(uniform_set);
 
 			draw_graph.add_compute_list_usages(uniform_set->draw_trackers, uniform_set->draw_trackers_usage);
-			cl->state.sets[i].bound = true;
+			compute_list.state.sets[i].bound = true;
 		}
 	}
 
 	// Bind the remaining batch.
 	if (valid_set_count > 0) {
-		draw_graph.add_compute_list_bind_uniform_sets(cl->state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
+		draw_graph.add_compute_list_bind_uniform_sets(compute_list.state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
 	}
 	draw_graph.add_compute_list_dispatch(p_x_groups, p_y_groups, p_z_groups);
-	cl->state.dispatch_count++;
+	compute_list.state.dispatch_count++;
 }
 
 void RenderingDevice::compute_list_dispatch_threads(ComputeListID p_list, uint32_t p_x_threads, uint32_t p_y_threads, uint32_t p_z_threads) {
 	ERR_RENDER_THREAD_GUARD();
 
 	ERR_FAIL_COND(p_list != ID_TYPE_COMPUTE_LIST);
-	ERR_FAIL_NULL(compute_list);
+	ERR_FAIL_COND(!compute_list.active);
 
 #ifdef DEBUG_ENABLED
 	ERR_FAIL_COND_MSG(p_x_threads == 0, "Dispatch amount of X compute threads (" + itos(p_x_threads) + ") is zero.");
@@ -5339,30 +5371,27 @@ void RenderingDevice::compute_list_dispatch_threads(ComputeListID p_list, uint32
 	ERR_FAIL_COND_MSG(p_z_threads == 0, "Dispatch amount of Z compute threads (" + itos(p_z_threads) + ") is zero.");
 #endif
 
-	ComputeList *cl = compute_list;
-
 #ifdef DEBUG_ENABLED
 
-	ERR_FAIL_COND_MSG(!cl->validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
+	ERR_FAIL_COND_MSG(!compute_list.validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
 
-	if (cl->validation.pipeline_push_constant_size > 0) {
+	if (compute_list.validation.pipeline_push_constant_size > 0) {
 		// Using push constants, check that they were supplied.
-		ERR_FAIL_COND_MSG(!cl->validation.pipeline_push_constant_supplied,
+		ERR_FAIL_COND_MSG(!compute_list.validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 
 #endif
 
-	compute_list_dispatch(p_list, Math::division_round_up(p_x_threads, cl->state.local_group_size[0]), Math::division_round_up(p_y_threads, cl->state.local_group_size[1]), Math::division_round_up(p_z_threads, cl->state.local_group_size[2]));
+	compute_list_dispatch(p_list, Math::division_round_up(p_x_threads, compute_list.state.local_group_size[0]), Math::division_round_up(p_y_threads, compute_list.state.local_group_size[1]), Math::division_round_up(p_z_threads, compute_list.state.local_group_size[2]));
 }
 
 void RenderingDevice::compute_list_dispatch_indirect(ComputeListID p_list, RID p_buffer, uint32_t p_offset) {
 	ERR_RENDER_THREAD_GUARD();
 
 	ERR_FAIL_COND(p_list != ID_TYPE_COMPUTE_LIST);
-	ERR_FAIL_NULL(compute_list);
+	ERR_FAIL_COND(!compute_list.active);
 
-	ComputeList *cl = compute_list;
 	Buffer *buffer = storage_buffer_owner.get_or_null(p_buffer);
 	ERR_FAIL_NULL(buffer);
 
@@ -5371,104 +5400,100 @@ void RenderingDevice::compute_list_dispatch_indirect(ComputeListID p_list, RID p
 	ERR_FAIL_COND_MSG(p_offset + 12 > buffer->size, "Offset provided (+12) is past the end of buffer.");
 
 #ifdef DEBUG_ENABLED
-	ERR_FAIL_COND_MSG(!cl->validation.active, "Submitted Compute Lists can no longer be modified.");
-#endif
 
-#ifdef DEBUG_ENABLED
+	ERR_FAIL_COND_MSG(!compute_list.validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
 
-	ERR_FAIL_COND_MSG(!cl->validation.pipeline_active, "No compute pipeline was set before attempting to draw.");
-
-	if (cl->validation.pipeline_push_constant_size > 0) {
+	if (compute_list.validation.pipeline_push_constant_size > 0) {
 		// Using push constants, check that they were supplied.
-		ERR_FAIL_COND_MSG(!cl->validation.pipeline_push_constant_supplied,
+		ERR_FAIL_COND_MSG(!compute_list.validation.pipeline_push_constant_supplied,
 				"The shader in this pipeline requires a push constant to be set before drawing, but it's not present.");
 	}
 
 #endif
 
 #ifdef DEBUG_ENABLED
-	for (uint32_t i = 0; i < cl->state.set_count; i++) {
-		if (cl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < compute_list.state.set_count; i++) {
+		if (compute_list.state.sets[i].pipeline_expected_format == 0) {
 			// Nothing expected by this pipeline.
 			continue;
 		}
 
-		if (cl->state.sets[i].pipeline_expected_format != cl->state.sets[i].uniform_set_format) {
-			if (cl->state.sets[i].uniform_set_format == 0) {
+		if (compute_list.state.sets[i].pipeline_expected_format != compute_list.state.sets[i].uniform_set_format) {
+			if (compute_list.state.sets[i].uniform_set_format == 0) {
 				ERR_FAIL_MSG("Uniforms were never supplied for set (" + itos(i) + ") at the time of drawing, which are required by the pipeline.");
-			} else if (uniform_set_owner.owns(cl->state.sets[i].uniform_set)) {
-				UniformSet *us = uniform_set_owner.get_or_null(cl->state.sets[i].uniform_set);
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + "):\n" + _shader_uniform_debug(us->shader_id, us->shader_set) + "\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(cl->state.pipeline_shader));
+			} else if (uniform_set_owner.owns(compute_list.state.sets[i].uniform_set)) {
+				UniformSet *us = uniform_set_owner.get_or_null(compute_list.state.sets[i].uniform_set);
+				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + "):\n" + _shader_uniform_debug(us->shader_id, us->shader_set) + "\nare not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(compute_list.state.pipeline_shader));
 			} else {
-				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + ", which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(cl->state.pipeline_shader));
+				ERR_FAIL_MSG("Uniforms supplied for set (" + itos(i) + ", which was just freed) are not the same format as required by the pipeline shader. Pipeline shader requires the following bindings:\n" + _shader_uniform_debug(compute_list.state.pipeline_shader));
 			}
 		}
 	}
 #endif
 	thread_local LocalVector<RDD::UniformSetID> valid_descriptor_ids;
 	valid_descriptor_ids.clear();
-	valid_descriptor_ids.resize(cl->state.set_count);
+	valid_descriptor_ids.resize(compute_list.state.set_count);
 
 	uint32_t valid_set_count = 0;
 	uint32_t first_set_index = 0;
 	uint32_t last_set_index = 0;
 	bool found_first_set = false;
 
-	for (uint32_t i = 0; i < cl->state.set_count; i++) {
-		if (cl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = 0; i < compute_list.state.set_count; i++) {
+		if (compute_list.state.sets[i].pipeline_expected_format == 0) {
 			// Nothing expected by this pipeline.
 			continue;
 		}
 
-		if (!cl->state.sets[i].bound && !found_first_set) {
+		if (!compute_list.state.sets[i].bound && !found_first_set) {
 			first_set_index = i;
 			found_first_set = true;
 		}
 
 		// Prepare descriptor sets if the API doesn't use pipeline barriers.
 		if (!driver->api_trait_get(RDD::API_TRAIT_HONORS_PIPELINE_BARRIERS)) {
-			draw_graph.add_compute_list_uniform_set_prepare_for_use(cl->state.pipeline_shader_driver_id, cl->state.sets[i].uniform_set_driver_id, i);
+			draw_graph.add_compute_list_uniform_set_prepare_for_use(compute_list.state.pipeline_shader_driver_id, compute_list.state.sets[i].uniform_set_driver_id, i);
 		}
 	}
 
 	// Bind descriptor sets.
-	for (uint32_t i = first_set_index; i < cl->state.set_count; i++) {
-		if (cl->state.sets[i].pipeline_expected_format == 0) {
+	for (uint32_t i = first_set_index; i < compute_list.state.set_count; i++) {
+		if (compute_list.state.sets[i].pipeline_expected_format == 0) {
 			continue; // Nothing expected by this pipeline.
 		}
 
-		if (!cl->state.sets[i].bound) {
+		if (!compute_list.state.sets[i].bound) {
 			// All good, see if this requires re-binding.
 			if (i - last_set_index > 1) {
 				// If the descriptor sets are not contiguous, bind the previous ones and start a new batch.
-				draw_graph.add_compute_list_bind_uniform_sets(cl->state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
+				draw_graph.add_compute_list_bind_uniform_sets(compute_list.state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
 
 				first_set_index = i;
 				valid_set_count = 1;
-				valid_descriptor_ids[0] = cl->state.sets[i].uniform_set_driver_id;
+				valid_descriptor_ids[0] = compute_list.state.sets[i].uniform_set_driver_id;
 			} else {
 				// Otherwise, keep storing in the current batch.
-				valid_descriptor_ids[valid_set_count] = cl->state.sets[i].uniform_set_driver_id;
+				valid_descriptor_ids[valid_set_count] = compute_list.state.sets[i].uniform_set_driver_id;
 				valid_set_count++;
 			}
 
 			last_set_index = i;
 
-			UniformSet *uniform_set = uniform_set_owner.get_or_null(cl->state.sets[i].uniform_set);
+			UniformSet *uniform_set = uniform_set_owner.get_or_null(compute_list.state.sets[i].uniform_set);
 			_uniform_set_update_shared(uniform_set);
 
 			draw_graph.add_compute_list_usages(uniform_set->draw_trackers, uniform_set->draw_trackers_usage);
-			cl->state.sets[i].bound = true;
+			compute_list.state.sets[i].bound = true;
 		}
 	}
 
 	// Bind the remaining batch.
 	if (valid_set_count > 0) {
-		draw_graph.add_compute_list_bind_uniform_sets(cl->state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
+		draw_graph.add_compute_list_bind_uniform_sets(compute_list.state.pipeline_shader_driver_id, valid_descriptor_ids, first_set_index, valid_set_count);
 	}
 
 	draw_graph.add_compute_list_dispatch_indirect(buffer->driver_id, p_offset);
-	cl->state.dispatch_count++;
+	compute_list.state.dispatch_count++;
 
 	if (buffer->draw_tracker != nullptr) {
 		draw_graph.add_compute_list_usage(buffer->draw_tracker, RDG::RESOURCE_USAGE_INDIRECT_BUFFER_READ);
@@ -5480,7 +5505,7 @@ void RenderingDevice::compute_list_dispatch_indirect(ComputeListID p_list, RID p
 void RenderingDevice::compute_list_add_barrier(ComputeListID p_list) {
 	ERR_RENDER_THREAD_GUARD();
 
-	compute_list_barrier_state = compute_list->state;
+	compute_list_barrier_state = compute_list.state;
 	compute_list_end();
 	compute_list_begin();
 
@@ -5502,12 +5527,11 @@ void RenderingDevice::compute_list_add_barrier(ComputeListID p_list) {
 void RenderingDevice::compute_list_end() {
 	ERR_RENDER_THREAD_GUARD();
 
-	ERR_FAIL_NULL(compute_list);
+	ERR_FAIL_COND(!compute_list.active);
 
 	draw_graph.add_compute_list_end();
 
-	memdelete(compute_list);
-	compute_list = nullptr;
+	compute_list = ComputeList();
 }
 
 #ifndef DISABLE_DEPRECATED
@@ -6398,11 +6422,11 @@ void RenderingDevice::_begin_frame(bool p_presented) {
 }
 
 void RenderingDevice::_end_frame() {
-	if (draw_list) {
+	if (draw_list.active) {
 		ERR_PRINT("Found open draw list at the end of the frame, this should never happen (further drawing will likely not work).");
 	}
 
-	if (compute_list) {
+	if (compute_list.active) {
 		ERR_PRINT("Found open compute list at the end of the frame, this should never happen (further compute will likely not work).");
 	}
 
@@ -6670,7 +6694,7 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 	// Pick the main queue family. It is worth noting we explicitly do not request the transfer bit, as apparently the specification defines
 	// that the existence of either the graphics or compute bit implies that the queue can also do transfer operations, but it is optional
 	// to indicate whether it supports them or not with the dedicated transfer bit if either is set.
-	BitField<RDD::CommandQueueFamilyBits> main_queue_bits;
+	BitField<RDD::CommandQueueFamilyBits> main_queue_bits = {};
 	main_queue_bits.set_flag(RDD::COMMAND_QUEUE_FAMILY_GRAPHICS_BIT);
 	main_queue_bits.set_flag(RDD::COMMAND_QUEUE_FAMILY_COMPUTE_BIT);
 
@@ -6807,15 +6831,15 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 		ERR_FAIL_COND_V(err, FAILED);
 	}
 
-	draw_list = nullptr;
-	compute_list = nullptr;
+	draw_list = DrawList();
+	compute_list = ComputeList();
 
 	bool project_pipeline_cache_enable = GLOBAL_GET("rendering/rendering_device/pipeline_cache/enable");
 	if (is_main_instance && project_pipeline_cache_enable) {
 		// Only the instance that is not a local device and is also the singleton is allowed to manage a pipeline cache.
 		pipeline_cache_file_path = vformat("user://vulkan/pipelines.%s.%s",
 				OS::get_singleton()->get_current_rendering_method(),
-				device.name.validate_filename().replace(" ", "_").to_lower());
+				device.name.validate_filename().replace_char(' ', '_').to_lower());
 		if (Engine::get_singleton()->is_editor_hint()) {
 			pipeline_cache_file_path += ".editor";
 		}
@@ -6829,6 +6853,9 @@ Error RenderingDevice::initialize(RenderingContextDriver *p_context, DisplayServ
 		}
 	}
 
+	// Find the best method available for VRS on the current hardware.
+	_vrs_detect_method();
+
 	return OK;
 }
 
@@ -6895,7 +6922,7 @@ void RenderingDevice::_save_pipeline_cache(void *p_data) {
 	Vector<uint8_t> cache_blob = self->driver->pipeline_cache_serialize();
 	self->_thread_safe_.unlock();
 
-	if (cache_blob.size() == 0) {
+	if (cache_blob.is_empty()) {
 		return;
 	}
 	print_verbose(vformat("Updated PSO cache (%.1f MiB)", cache_blob.size() / (1024.0f * 1024.0f)));
@@ -6930,8 +6957,8 @@ void RenderingDevice::_free_rids(T &p_owner, const char *p_type) {
 void RenderingDevice::capture_timestamp(const String &p_name) {
 	ERR_RENDER_THREAD_GUARD();
 
-	ERR_FAIL_COND_MSG(draw_list != nullptr && draw_list->state.draw_count > 0, "Capturing timestamps during draw list creation is not allowed. Offending timestamp was: " + p_name);
-	ERR_FAIL_COND_MSG(compute_list != nullptr && compute_list->state.dispatch_count > 0, "Capturing timestamps during compute list creation is not allowed. Offending timestamp was: " + p_name);
+	ERR_FAIL_COND_MSG(draw_list.active && draw_list.state.draw_count > 0, "Capturing timestamps during draw list creation is not allowed. Offending timestamp was: " + p_name);
+	ERR_FAIL_COND_MSG(compute_list.active && compute_list.state.dispatch_count > 0, "Capturing timestamps during compute list creation is not allowed. Offending timestamp was: " + p_name);
 	ERR_FAIL_COND_MSG(frames[frame].timestamp_count >= max_timestamp_query_elements, vformat("Tried capturing more timestamps than the configured maximum (%d). You can increase this limit in the project settings under 'Debug/Settings' called 'Max Timestamp Query Elements'.", max_timestamp_query_elements));
 
 	draw_graph.add_capture_timestamp(frames[frame].timestamp_pool, frames[frame].timestamp_count);
@@ -7256,7 +7283,20 @@ RenderingDevice *RenderingDevice::create_local_device() {
 }
 
 bool RenderingDevice::has_feature(const Features p_feature) const {
-	return driver->has_feature(p_feature);
+	// Some features can be deduced from the capabilities without querying the driver and looking at the capabilities.
+	switch (p_feature) {
+		case SUPPORTS_MULTIVIEW: {
+			const RDD::MultiviewCapabilities &multiview_capabilities = driver->get_multiview_capabilities();
+			return multiview_capabilities.is_supported && multiview_capabilities.max_view_count > 1;
+		}
+		case SUPPORTS_ATTACHMENT_VRS: {
+			const RDD::FragmentShadingRateCapabilities &fsr_capabilities = driver->get_fragment_shading_rate_capabilities();
+			const RDD::FragmentDensityMapCapabilities &fdm_capabilities = driver->get_fragment_density_map_capabilities();
+			return fsr_capabilities.attachment_supported || fdm_capabilities.attachment_supported;
+		}
+		default:
+			return driver->has_feature(p_feature);
+	}
 }
 
 void RenderingDevice::_bind_methods() {
@@ -7340,7 +7380,7 @@ void RenderingDevice::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("draw_list_begin_for_screen", "screen", "clear_color"), &RenderingDevice::draw_list_begin_for_screen, DEFVAL(DisplayServer::MAIN_WINDOW_ID), DEFVAL(Color()));
 
-	ClassDB::bind_method(D_METHOD("draw_list_begin", "framebuffer", "draw_flags", "clear_color_values", "clear_depth_value", "clear_stencil_value", "region", "breadcrumb"), &RenderingDevice::draw_list_begin, DEFVAL(DRAW_DEFAULT_ALL), DEFVAL(Vector<Color>()), DEFVAL(1.0), DEFVAL(0), DEFVAL(Rect2()), DEFVAL(0));
+	ClassDB::bind_method(D_METHOD("draw_list_begin", "framebuffer", "draw_flags", "clear_color_values", "clear_depth_value", "clear_stencil_value", "region", "breadcrumb"), &RenderingDevice::_draw_list_begin_bind, DEFVAL(DRAW_DEFAULT_ALL), DEFVAL(Vector<Color>()), DEFVAL(1.0), DEFVAL(0), DEFVAL(Rect2()), DEFVAL(0));
 #ifndef DISABLE_DEPRECATED
 	ClassDB::bind_method(D_METHOD("draw_list_begin_split", "framebuffer", "splits", "initial_color_action", "final_color_action", "initial_depth_action", "final_depth_action", "clear_color_values", "clear_depth", "clear_stencil", "region", "storage_textures"), &RenderingDevice::_draw_list_begin_split, DEFVAL(Vector<Color>()), DEFVAL(1.0), DEFVAL(0), DEFVAL(Rect2()), DEFVAL(TypedArray<RID>()));
 #endif
@@ -7680,6 +7720,20 @@ void RenderingDevice::_bind_methods() {
 	BIND_ENUM_CONSTANT(DATA_FORMAT_G16_B16_R16_3PLANE_422_UNORM);
 	BIND_ENUM_CONSTANT(DATA_FORMAT_G16_B16R16_2PLANE_422_UNORM);
 	BIND_ENUM_CONSTANT(DATA_FORMAT_G16_B16_R16_3PLANE_444_UNORM);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK);
+	BIND_ENUM_CONSTANT(DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK);
 	BIND_ENUM_CONSTANT(DATA_FORMAT_MAX);
 
 #ifndef DISABLE_DEPRECATED
@@ -7905,6 +7959,8 @@ void RenderingDevice::_bind_methods() {
 	BIND_ENUM_CONSTANT(PIPELINE_SPECIALIZATION_CONSTANT_TYPE_INT);
 	BIND_ENUM_CONSTANT(PIPELINE_SPECIALIZATION_CONSTANT_TYPE_FLOAT);
 
+	BIND_ENUM_CONSTANT(SUPPORTS_METALFX_SPATIAL);
+	BIND_ENUM_CONSTANT(SUPPORTS_METALFX_TEMPORAL);
 	BIND_ENUM_CONSTANT(SUPPORTS_BUFFER_DEVICE_ADDRESS);
 
 	BIND_ENUM_CONSTANT(LIMIT_MAX_BOUND_UNIFORM_SETS);
@@ -8191,12 +8247,12 @@ RID RenderingDevice::_shader_create_from_spirv(const Ref<RDShaderSPIRV> &p_spirv
 }
 
 RID RenderingDevice::_uniform_set_create(const TypedArray<RDUniform> &p_uniforms, RID p_shader, uint32_t p_shader_set) {
-	Vector<Uniform> uniforms;
+	LocalVector<Uniform> uniforms;
 	uniforms.resize(p_uniforms.size());
 	for (int i = 0; i < p_uniforms.size(); i++) {
 		Ref<RDUniform> uniform = p_uniforms[i];
 		ERR_FAIL_COND_V(uniform.is_null(), RID());
-		uniforms.write[i] = uniform->base;
+		uniforms[i] = uniform->base;
 	}
 	return uniform_set_create(uniforms, p_shader, p_shader_set);
 }
diff --git a/engine/servers/rendering/rendering_device.h b/engine/servers/rendering/rendering_device.h
index 6d480258..5eb89538 100644
--- a/engine/servers/rendering/rendering_device.h
+++ b/engine/servers/rendering/rendering_device.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_H
-#define RENDERING_DEVICE_H
+#pragma once
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/condition_variable.h"
@@ -171,7 +170,7 @@ private:
 		int current = 0;
 		uint32_t block_size = 0;
 		uint64_t max_size = 0;
-		BitField<RDD::BufferUsageBits> usage_bits;
+		BitField<RDD::BufferUsageBits> usage_bits = {};
 		bool used = false;
 	};
 
@@ -185,7 +184,7 @@ private:
 	struct Buffer {
 		RDD::BufferID driver_id;
 		uint32_t size = 0;
-		BitField<RDD::BufferUsageBits> usage;
+		BitField<RDD::BufferUsageBits> usage = {};
 		RDG::ResourceTracker *draw_tracker = nullptr;
 		int32_t transfer_worker_index = -1;
 		uint64_t transfer_worker_operation = 0;
@@ -203,7 +202,8 @@ private:
 	bool split_swapchain_into_its_own_cmd_buffer = true;
 	uint32_t gpu_copy_count = 0;
 	uint32_t copy_bytes_count = 0;
-	String perf_report_text;
+	uint32_t prev_gpu_copy_count = 0;
+	uint32_t prev_copy_bytes_count = 0;
 
 	RID_Owner<Buffer, true> uniform_buffer_owner;
 	RID_Owner<Buffer, true> storage_buffer_owner;
@@ -254,6 +254,8 @@ public:
 		CALLBACK_RESOURCE_USAGE_STORAGE_IMAGE_READ_WRITE,
 		CALLBACK_RESOURCE_USAGE_ATTACHMENT_COLOR_READ_WRITE,
 		CALLBACK_RESOURCE_USAGE_ATTACHMENT_DEPTH_STENCIL_READ_WRITE,
+		CALLBACK_RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ,
+		CALLBACK_RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ,
 		CALLBACK_RESOURCE_USAGE_MAX
 	};
 
@@ -313,8 +315,8 @@ public:
 		bool is_discardable = false;
 		bool has_initial_data = false;
 
-		BitField<RDD::TextureAspectBits> read_aspect_flags;
-		BitField<RDD::TextureAspectBits> barrier_aspect_flags;
+		BitField<RDD::TextureAspectBits> read_aspect_flags = {};
+		BitField<RDD::TextureAspectBits> barrier_aspect_flags = {};
 		bool bound = false; // Bound to framebuffer.
 		RID owner;
 
@@ -359,12 +361,13 @@ public:
 	Vector<uint8_t> _texture_get_data(Texture *tex, uint32_t p_layer, bool p_2d = false);
 	uint32_t _texture_layer_count(Texture *p_texture) const;
 	uint32_t _texture_alignment(Texture *p_texture) const;
-	Error _texture_initialize(RID p_texture, uint32_t p_layer, const Vector<uint8_t> &p_data);
+	Error _texture_initialize(RID p_texture, uint32_t p_layer, const Vector<uint8_t> &p_data, bool p_immediate_flush = false);
 	void _texture_check_shared_fallback(Texture *p_texture);
 	void _texture_update_shared_fallback(RID p_texture_rid, Texture *p_texture, bool p_for_writing);
 	void _texture_free_shared_fallback(Texture *p_texture);
 	void _texture_copy_shared(RID p_src_texture_rid, Texture *p_src_texture, RID p_dst_texture_rid, Texture *p_dst_texture);
 	void _texture_create_reinterpret_buffer(Texture *p_texture);
+	uint32_t _texture_vrs_method_to_usage_bits() const;
 
 	struct TextureGetDataRequest {
 		uint32_t frame_local_index = 0;
@@ -426,6 +429,30 @@ public:
 	void texture_set_discardable(RID p_texture, bool p_discardable);
 	bool texture_is_discardable(RID p_texture);
 
+private:
+	/*************/
+	/**** VRS ****/
+	/*************/
+
+	enum VRSMethod {
+		VRS_METHOD_NONE,
+		VRS_METHOD_FRAGMENT_SHADING_RATE,
+		VRS_METHOD_FRAGMENT_DENSITY_MAP,
+	};
+
+	VRSMethod vrs_method = VRS_METHOD_NONE;
+	DataFormat vrs_format = DATA_FORMAT_MAX;
+	Size2i vrs_texel_size;
+
+	static RDG::ResourceUsage _vrs_usage_from_method(VRSMethod p_method);
+	static RDD::PipelineStageBits _vrs_stages_from_method(VRSMethod p_method);
+	static RDD::TextureLayout _vrs_layout_from_method(VRSMethod p_method);
+	void _vrs_detect_method();
+
+public:
+	DataFormat vrs_get_format() const;
+	Size2i vrs_get_texel_size() const;
+
 	/*********************/
 	/**** FRAMEBUFFER ****/
 	/*********************/
@@ -456,7 +483,6 @@ public:
 		Vector<int32_t> resolve_attachments;
 		Vector<int32_t> preserve_attachments;
 		int32_t depth_attachment = ATTACHMENT_UNUSED;
-		int32_t vrs_attachment = ATTACHMENT_UNUSED; // density map for VRS, only used if supported
 	};
 
 	typedef int64_t FramebufferFormatID;
@@ -466,8 +492,23 @@ private:
 		Vector<AttachmentFormat> attachments;
 		Vector<FramebufferPass> passes;
 		uint32_t view_count = 1;
+		VRSMethod vrs_method = VRS_METHOD_NONE;
+		int32_t vrs_attachment = ATTACHMENT_UNUSED;
+		Size2i vrs_texel_size;
 
 		bool operator<(const FramebufferFormatKey &p_key) const {
+			if (vrs_texel_size != p_key.vrs_texel_size) {
+				return vrs_texel_size < p_key.vrs_texel_size;
+			}
+
+			if (vrs_attachment != p_key.vrs_attachment) {
+				return vrs_attachment < p_key.vrs_attachment;
+			}
+
+			if (vrs_method != p_key.vrs_method) {
+				return vrs_method < p_key.vrs_method;
+			}
+
 			if (view_count != p_key.view_count) {
 				return view_count < p_key.view_count;
 			}
@@ -572,7 +613,7 @@ private:
 		}
 	};
 
-	static RDD::RenderPassID _render_pass_create(RenderingDeviceDriver *p_driver, const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, VectorView<RDD::AttachmentLoadOp> p_load_ops, VectorView<RDD::AttachmentStoreOp> p_store_ops, uint32_t p_view_count = 1, Vector<TextureSamples> *r_samples = nullptr);
+	static RDD::RenderPassID _render_pass_create(RenderingDeviceDriver *p_driver, const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, VectorView<RDD::AttachmentLoadOp> p_load_ops, VectorView<RDD::AttachmentStoreOp> p_store_ops, uint32_t p_view_count = 1, VRSMethod p_vrs_method = VRS_METHOD_NONE, int32_t p_vrs_attachment = -1, Size2i p_vrs_texel_size = Size2i(), Vector<TextureSamples> *r_samples = nullptr);
 	static RDD::RenderPassID _render_pass_create_from_graph(RenderingDeviceDriver *p_driver, VectorView<RDD::AttachmentLoadOp> p_load_ops, VectorView<RDD::AttachmentStoreOp> p_store_ops, void *p_user_data);
 
 	// This is a cache and it's never freed, it ensures
@@ -603,8 +644,8 @@ private:
 
 public:
 	// This ID is warranted to be unique for the same formats, does not need to be freed
-	FramebufferFormatID framebuffer_format_create(const Vector<AttachmentFormat> &p_format, uint32_t p_view_count = 1);
-	FramebufferFormatID framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, uint32_t p_view_count = 1);
+	FramebufferFormatID framebuffer_format_create(const Vector<AttachmentFormat> &p_format, uint32_t p_view_count = 1, int32_t p_vrs_attachment = -1);
+	FramebufferFormatID framebuffer_format_create_multipass(const Vector<AttachmentFormat> &p_attachments, const Vector<FramebufferPass> &p_passes, uint32_t p_view_count = 1, int32_t p_vrs_attachment = -1);
 	FramebufferFormatID framebuffer_format_create_empty(TextureSamples p_samples = TEXTURE_SAMPLES_1);
 	TextureSamples framebuffer_format_get_texture_samples(FramebufferFormatID p_format, uint32_t p_pass = 0);
 
@@ -831,7 +872,7 @@ private:
 		String name; // Used for debug.
 		RDD::ShaderID driver_id;
 		uint32_t layout_hash = 0;
-		BitField<RDD::PipelineStageBits> stage_bits;
+		BitField<RDD::PipelineStageBits> stage_bits = {};
 		Vector<uint32_t> set_formats;
 	};
 
@@ -1068,8 +1109,7 @@ public:
 	 *						If you plan on keeping the return value around for more than one frame (e.g. Sets that are created once and reused forever) you MUST set it to false.
 	 * @return				Baked descriptor set.
 	 */
-	template <typename Collection>
-	RID uniform_set_create(const Collection &p_uniforms, RID p_shader, uint32_t p_shader_set, bool p_linear_pool = false);
+	RID uniform_set_create(const VectorView<Uniform> &p_uniforms, RID p_shader, uint32_t p_shader_set, bool p_linear_pool = false);
 	bool uniform_set_is_valid(RID p_uniform_set);
 	void uniform_set_set_invalidation_callback(RID p_uniform_set, InvalidationCallback p_callback, void *p_userdata);
 
@@ -1109,7 +1149,7 @@ private:
 		uint32_t shader_layout_hash = 0;
 		Vector<uint32_t> set_formats;
 		RDD::PipelineID driver_id;
-		BitField<RDD::PipelineStageBits> stage_bits;
+		BitField<RDD::PipelineStageBits> stage_bits = {};
 		uint32_t push_constant_size = 0;
 	};
 
@@ -1174,7 +1214,7 @@ private:
 
 	struct DrawList {
 		Rect2i viewport;
-		bool viewport_set = false;
+		bool active = false;
 
 		struct SetState {
 			uint32_t pipeline_expected_format = 0;
@@ -1199,7 +1239,6 @@ private:
 
 #ifdef DEBUG_ENABLED
 		struct Validation {
-			bool active = true; // Means command buffer was not closed, so you can keep adding things.
 			// Actual render pass values.
 			uint32_t dynamic_state = 0;
 			VertexFormatID vertex_format = INVALID_ID;
@@ -1230,18 +1269,17 @@ private:
 #endif
 	};
 
-	DrawList *draw_list = nullptr;
+	DrawList draw_list;
 	uint32_t draw_list_subpass_count = 0;
 #ifdef DEBUG_ENABLED
 	FramebufferFormatID draw_list_framebuffer_format = INVALID_ID;
 #endif
 	uint32_t draw_list_current_subpass = 0;
 
-	Vector<RID> draw_list_bound_textures;
+	LocalVector<RID> draw_list_bound_textures;
 
-	_FORCE_INLINE_ DrawList *_get_draw_list_ptr(DrawListID p_id);
-	Error _draw_list_allocate(const Rect2i &p_viewport, uint32_t p_subpass);
-	void _draw_list_free(Rect2i *r_last_viewport = nullptr);
+	void _draw_list_start(const Rect2i &p_viewport);
+	void _draw_list_end(Rect2i *r_last_viewport = nullptr);
 
 public:
 	enum DrawFlags {
@@ -1275,7 +1313,8 @@ public:
 	};
 
 	DrawListID draw_list_begin_for_screen(DisplayServer::WindowID p_screen = 0, const Color &p_clear_color = Color());
-	DrawListID draw_list_begin(RID p_framebuffer, BitField<DrawFlags> p_draw_flags = DRAW_DEFAULT_ALL, const Vector<Color> &p_clear_color_values = Vector<Color>(), float p_clear_depth_value = 1.0f, uint32_t p_clear_stencil_value = 0, const Rect2 &p_region = Rect2(), uint32_t p_breadcrumb = 0);
+	DrawListID draw_list_begin(RID p_framebuffer, BitField<DrawFlags> p_draw_flags = DRAW_DEFAULT_ALL, VectorView<Color> p_clear_color_values = VectorView<Color>(), float p_clear_depth_value = 1.0f, uint32_t p_clear_stencil_value = 0, const Rect2 &p_region = Rect2(), uint32_t p_breadcrumb = 0);
+	DrawListID _draw_list_begin_bind(RID p_framebuffer, BitField<DrawFlags> p_draw_flags = DRAW_DEFAULT_ALL, const Vector<Color> &p_clear_color_values = Vector<Color>(), float p_clear_depth_value = 1.0f, uint32_t p_clear_stencil_value = 0, const Rect2 &p_region = Rect2(), uint32_t p_breadcrumb = 0);
 
 	void draw_list_set_blend_constants(DrawListID p_list, const Color &p_color);
 	void draw_list_bind_render_pipeline(DrawListID p_list, RID p_render_pipeline);
@@ -1303,6 +1342,7 @@ private:
 	/***********************/
 
 	struct ComputeList {
+		bool active = false;
 		struct SetState {
 			uint32_t pipeline_expected_format = 0;
 			uint32_t uniform_set_format = 0;
@@ -1326,7 +1366,6 @@ private:
 
 #ifdef DEBUG_ENABLED
 		struct Validation {
-			bool active = true; // Means command buffer was not closed, so you can keep adding things.
 			Vector<uint32_t> set_formats;
 			Vector<bool> set_bound;
 			Vector<RID> set_rids;
@@ -1340,7 +1379,7 @@ private:
 #endif
 	};
 
-	ComputeList *compute_list = nullptr;
+	ComputeList compute_list;
 	ComputeList::State compute_list_barrier_state;
 
 public:
@@ -1713,5 +1752,3 @@ VARIANT_ENUM_CAST(RenderingDevice::FinalAction)
 #endif
 
 typedef RenderingDevice RD;
-
-#endif // RENDERING_DEVICE_H
diff --git a/engine/servers/rendering/rendering_device_binds.cpp b/engine/servers/rendering/rendering_device_binds.cpp
index ab611a92..a900bf95 100644
--- a/engine/servers/rendering/rendering_device_binds.cpp
+++ b/engine/servers/rendering/rendering_device_binds.cpp
@@ -115,7 +115,7 @@ Error RDShaderFile::parse_versions_from_text(const String &p_text, const String
 					base_error = "Missing `;` in '" + l + "'. Version syntax is `version = \"<defines with C escaping>\";`.";
 					break;
 				}
-				Vector<String> slices = l.get_slice(";", 0).split("=");
+				Vector<String> slices = l.get_slicec(';', 0).split("=");
 				String version = slices[0].strip_edges();
 				if (!version.is_valid_ascii_identifier()) {
 					base_error = "Version names must be valid identifiers, found '" + version + "' instead.";
diff --git a/engine/servers/rendering/rendering_device_binds.h b/engine/servers/rendering/rendering_device_binds.h
index b1c7ba91..15b1cf54 100644
--- a/engine/servers/rendering/rendering_device_binds.h
+++ b/engine/servers/rendering/rendering_device_binds.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_BINDS_H
-#define RENDERING_DEVICE_BINDS_H
+#pragma once
 
 #include "servers/rendering/rendering_device.h"
 
@@ -426,11 +425,9 @@ protected:
 	}
 	void _set_versions(const Dictionary &p_versions) {
 		versions.clear();
-		List<Variant> keys;
-		p_versions.get_key_list(&keys);
-		for (const Variant &E : keys) {
-			StringName vname = E;
-			Ref<RDShaderSPIRV> bc = p_versions[E];
+		for (const KeyValue<Variant, Variant> &kv : p_versions) {
+			StringName vname = kv.key;
+			Ref<RDShaderSPIRV> bc = kv.value;
 			ERR_CONTINUE(bc.is_null());
 			versions[vname] = bc;
 		}
@@ -729,5 +726,3 @@ protected:
 		ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "attachments", PROPERTY_HINT_ARRAY_TYPE, "RDPipelineColorBlendStateAttachment"), "set_attachments", "get_attachments");
 	}
 };
-
-#endif // RENDERING_DEVICE_BINDS_H
diff --git a/engine/servers/rendering/rendering_device_commons.cpp b/engine/servers/rendering/rendering_device_commons.cpp
index 03fad549..a11ffe57 100644
--- a/engine/servers/rendering/rendering_device_commons.cpp
+++ b/engine/servers/rendering/rendering_device_commons.cpp
@@ -253,6 +253,20 @@ const char *const RenderingDeviceCommons::FORMAT_NAMES[DATA_FORMAT_MAX] = {
 	"G16_B16_R16_3Plane_422_Unorm",
 	"G16_B16R16_2Plane_422_Unorm",
 	"G16_B16_R16_3Plane_444_Unorm",
+	"Astc_4X4_Sfloat_Block",
+	"Astc_5X4_Sfloat_Block",
+	"Astc_5X5_Sfloat_Block",
+	"Astc_6X5_Sfloat_Block",
+	"Astc_6X6_Sfloat_Block",
+	"Astc_8X5_Sfloat_Block",
+	"Astc_8X6_Sfloat_Block",
+	"Astc_8X8_Sfloat_Block",
+	"Astc_10X5_Sfloat_Block",
+	"Astc_10X6_Sfloat_Block",
+	"Astc_10X8_Sfloat_Block",
+	"Astc_10X10_Sfloat_Block",
+	"Astc_12X10_Sfloat_Block",
+	"Astc_12X12_Sfloat_Block",
 };
 
 /*****************/
@@ -477,6 +491,20 @@ uint32_t RenderingDeviceCommons::get_image_format_pixel_size(DataFormat p_format
 		case DATA_FORMAT_ASTC_12x10_SRGB_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK:
+		case DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK:
 			return 1;
 		case DATA_FORMAT_G8B8G8R8_422_UNORM:
 		case DATA_FORMAT_B8G8R8G8_422_UNORM:
@@ -554,42 +582,56 @@ void RenderingDeviceCommons::get_compressed_image_format_block_dimensions(DataFo
 		case DATA_FORMAT_EAC_R11G11_UNORM_BLOCK:
 		case DATA_FORMAT_EAC_R11G11_SNORM_BLOCK:
 		case DATA_FORMAT_ASTC_4x4_UNORM_BLOCK: // Again, not sure about astc.
-		case DATA_FORMAT_ASTC_4x4_SRGB_BLOCK: {
+		case DATA_FORMAT_ASTC_4x4_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK: {
 			r_w = 4;
 			r_h = 4;
 		} break;
 		case DATA_FORMAT_ASTC_5x4_UNORM_BLOCK: // Unsupported
 		case DATA_FORMAT_ASTC_5x4_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_5x5_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_5x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_6x5_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_6x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_6x6_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_6x6_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_8x5_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_8x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_8x6_UNORM_BLOCK:
-		case DATA_FORMAT_ASTC_8x6_SRGB_BLOCK: {
+		case DATA_FORMAT_ASTC_8x6_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK: {
 			r_w = 4;
 			r_h = 4;
 		} break;
 		case DATA_FORMAT_ASTC_8x8_UNORM_BLOCK:
-		case DATA_FORMAT_ASTC_8x8_SRGB_BLOCK: {
+		case DATA_FORMAT_ASTC_8x8_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK: {
 			r_w = 8;
 			r_h = 8;
 		} break;
 		case DATA_FORMAT_ASTC_10x5_UNORM_BLOCK: // Unsupported
 		case DATA_FORMAT_ASTC_10x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_10x6_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_10x6_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_10x8_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_10x8_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_10x10_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_10x10_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_12x10_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_12x10_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK:
 			r_w = 4;
 			r_h = 4;
 			return;
@@ -642,32 +684,46 @@ uint32_t RenderingDeviceCommons::get_compressed_image_format_block_byte_size(Dat
 			return 16;
 		case DATA_FORMAT_ASTC_4x4_UNORM_BLOCK: // Again, not sure about astc.
 		case DATA_FORMAT_ASTC_4x4_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_5x4_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_5x4_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_5x5_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_5x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_6x5_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_6x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_6x6_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_6x6_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_8x5_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_8x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_8x6_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_8x6_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_8x8_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_8x8_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_10x5_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_10x5_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_10x6_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_10x6_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_10x8_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_10x8_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_10x10_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_10x10_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_12x10_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_12x10_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_UNORM_BLOCK:
 		case DATA_FORMAT_ASTC_12x12_SRGB_BLOCK:
+		case DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK:
 			return 16;
 		default: {
 		}
@@ -691,7 +747,8 @@ uint32_t RenderingDeviceCommons::get_compressed_image_format_pixel_rshift(DataFo
 		case DATA_FORMAT_EAC_R11_SNORM_BLOCK:
 			return 1;
 		case DATA_FORMAT_ASTC_8x8_SRGB_BLOCK:
-		case DATA_FORMAT_ASTC_8x8_UNORM_BLOCK: {
+		case DATA_FORMAT_ASTC_8x8_UNORM_BLOCK:
+		case DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK: {
 			return 2;
 		}
 		default: {
diff --git a/engine/servers/rendering/rendering_device_commons.h b/engine/servers/rendering/rendering_device_commons.h
index aa8beed3..63f2b879 100644
--- a/engine/servers/rendering/rendering_device_commons.h
+++ b/engine/servers/rendering/rendering_device_commons.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_COMMONS_H
-#define RENDERING_DEVICE_COMMONS_H
+#pragma once
 
 #include "core/object/object.h"
 #include "core/variant/type_info.h"
@@ -270,6 +269,20 @@ public:
 		DATA_FORMAT_G16_B16_R16_3PLANE_422_UNORM,
 		DATA_FORMAT_G16_B16R16_2PLANE_422_UNORM,
 		DATA_FORMAT_G16_B16_R16_3PLANE_444_UNORM,
+		DATA_FORMAT_ASTC_4x4_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_5x4_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_5x5_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_6x5_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_6x6_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_8x5_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_8x6_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_8x8_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_10x5_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_10x6_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_10x8_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_10x10_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_12x10_SFLOAT_BLOCK, // HDR variant.
+		DATA_FORMAT_ASTC_12x12_SFLOAT_BLOCK, // HDR variant.
 		DATA_FORMAT_MAX,
 	};
 
@@ -377,6 +390,7 @@ public:
 		// Try to set this bit as much as possible. If you set it, validation doesn't complain
 		// and it works fine on mobile, then go ahead.
 		TEXTURE_USAGE_TRANSIENT_BIT = (1 << 11),
+		TEXTURE_USAGE_MAX_BIT = TEXTURE_USAGE_TRANSIENT_BIT,
 	};
 
 	struct TextureFormat {
@@ -869,11 +883,7 @@ public:
 		LIMIT_SUBGROUP_MAX_SIZE,
 		LIMIT_SUBGROUP_IN_SHADERS, // Set flags using SHADER_STAGE_VERTEX_BIT, SHADER_STAGE_FRAGMENT_BIT, etc.
 		LIMIT_SUBGROUP_OPERATIONS,
-		LIMIT_VRS_TEXEL_WIDTH,
-		LIMIT_VRS_TEXEL_HEIGHT,
-		LIMIT_VRS_MAX_FRAGMENT_WIDTH,
-		LIMIT_VRS_MAX_FRAGMENT_HEIGHT,
-		LIMIT_METALFX_TEMPORAL_SCALER_MIN_SCALE,
+		LIMIT_METALFX_TEMPORAL_SCALER_MIN_SCALE = 46,
 		LIMIT_METALFX_TEMPORAL_SCALER_MAX_SCALE,
 		LIMIT_MAX_SHADER_VARYINGS,
 	};
@@ -952,7 +962,7 @@ public:
 		UniformType type = UniformType::UNIFORM_TYPE_MAX;
 		bool writable = false;
 		uint32_t binding = 0;
-		BitField<ShaderStage> stages;
+		BitField<ShaderStage> stages = {};
 		uint32_t length = 0; // Size of arrays (in total elements), or ubos (in bytes * total elements).
 
 		bool operator!=(const ShaderUniform &p_other) const {
@@ -980,7 +990,7 @@ public:
 	};
 
 	struct ShaderSpecializationConstant : public PipelineSpecializationConstant {
-		BitField<ShaderStage> stages;
+		BitField<ShaderStage> stages = {};
 
 		bool operator<(const ShaderSpecializationConstant &p_other) const { return constant_id < p_other.constant_id; }
 	};
@@ -999,9 +1009,7 @@ public:
 
 protected:
 	struct ShaderReflection : public ShaderDescription {
-		BitField<ShaderStage> stages;
-		BitField<ShaderStage> push_constant_stages;
+		BitField<ShaderStage> stages = {};
+		BitField<ShaderStage> push_constant_stages = {};
 	};
 };
-
-#endif // RENDERING_DEVICE_COMMONS_H
diff --git a/engine/servers/rendering/rendering_device_driver.h b/engine/servers/rendering/rendering_device_driver.h
index 1f65cdca..31517ea5 100644
--- a/engine/servers/rendering/rendering_device_driver.h
+++ b/engine/servers/rendering/rendering_device_driver.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_DRIVER_H
-#define RENDERING_DEVICE_DRIVER_H
+#pragma once
 
 // ***********************************************************************************
 // RenderingDeviceDriver - Design principles
@@ -238,7 +237,8 @@ public:
 		TEXTURE_LAYOUT_COPY_DST_OPTIMAL,
 		TEXTURE_LAYOUT_RESOLVE_SRC_OPTIMAL,
 		TEXTURE_LAYOUT_RESOLVE_DST_OPTIMAL,
-		TEXTURE_LAYOUT_VRS_ATTACHMENT_OPTIMAL,
+		TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL,
+		TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL,
 		TEXTURE_LAYOUT_MAX
 	};
 
@@ -249,6 +249,11 @@ public:
 		TEXTURE_ASPECT_MAX
 	};
 
+	enum TextureUsageMethod {
+		TEXTURE_USAGE_VRS_FRAGMENT_SHADING_RATE_BIT = TEXTURE_USAGE_MAX_BIT << 1,
+		TEXTURE_USAGE_VRS_FRAGMENT_DENSITY_MAP_BIT = TEXTURE_USAGE_MAX_BIT << 2,
+	};
+
 	enum TextureAspectBits {
 		TEXTURE_ASPECT_COLOR_BIT = (1 << TEXTURE_ASPECT_COLOR),
 		TEXTURE_ASPECT_DEPTH_BIT = (1 << TEXTURE_ASPECT_DEPTH),
@@ -262,14 +267,14 @@ public:
 	};
 
 	struct TextureSubresourceLayers {
-		BitField<TextureAspectBits> aspect;
+		BitField<TextureAspectBits> aspect = {};
 		uint32_t mipmap = 0;
 		uint32_t base_layer = 0;
 		uint32_t layer_count = 0;
 	};
 
 	struct TextureSubresourceRange {
-		BitField<TextureAspectBits> aspect;
+		BitField<TextureAspectBits> aspect = {};
 		uint32_t base_mipmap = 0;
 		uint32_t mipmap_count = 0;
 		uint32_t base_layer = 0;
@@ -335,6 +340,8 @@ public:
 		PIPELINE_STAGE_ALL_GRAPHICS_BIT = (1 << 15),
 		PIPELINE_STAGE_ALL_COMMANDS_BIT = (1 << 16),
 		PIPELINE_STAGE_CLEAR_STORAGE_BIT = (1 << 17),
+		PIPELINE_STAGE_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT = (1 << 22),
+		PIPELINE_STAGE_FRAGMENT_DENSITY_PROCESS_BIT = (1 << 23),
 	};
 
 	enum BarrierAccessBits {
@@ -356,28 +363,29 @@ public:
 		BARRIER_ACCESS_MEMORY_READ_BIT = (1 << 15),
 		BARRIER_ACCESS_MEMORY_WRITE_BIT = (1 << 16),
 		BARRIER_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT = (1 << 23),
-		BARRIER_ACCESS_RESOLVE_READ_BIT = (1 << 24),
-		BARRIER_ACCESS_RESOLVE_WRITE_BIT = (1 << 25),
+		BARRIER_ACCESS_FRAGMENT_DENSITY_MAP_ATTACHMENT_READ_BIT = (1 << 24),
+		BARRIER_ACCESS_RESOLVE_READ_BIT = (1 << 25),
+		BARRIER_ACCESS_RESOLVE_WRITE_BIT = (1 << 26),
 		BARRIER_ACCESS_STORAGE_CLEAR_BIT = (1 << 27),
 	};
 
 	struct MemoryBarrier {
-		BitField<BarrierAccessBits> src_access;
-		BitField<BarrierAccessBits> dst_access;
+		BitField<BarrierAccessBits> src_access = {};
+		BitField<BarrierAccessBits> dst_access = {};
 	};
 
 	struct BufferBarrier {
 		BufferID buffer;
-		BitField<BarrierAccessBits> src_access;
-		BitField<BarrierAccessBits> dst_access;
+		BitField<BarrierAccessBits> src_access = {};
+		BitField<BarrierAccessBits> dst_access = {};
 		uint64_t offset = 0;
 		uint64_t size = 0;
 	};
 
 	struct TextureBarrier {
 		TextureID texture;
-		BitField<BarrierAccessBits> src_access;
-		BitField<BarrierAccessBits> dst_access;
+		BitField<BarrierAccessBits> src_access = {};
+		BitField<BarrierAccessBits> dst_access = {};
 		TextureLayout prev_layout = TEXTURE_LAYOUT_UNDEFINED;
 		TextureLayout next_layout = TEXTURE_LAYOUT_UNDEFINED;
 		TextureSubresourceRange subresources;
@@ -620,7 +628,7 @@ public:
 		static const uint32_t UNUSED = 0xffffffff;
 		uint32_t attachment = UNUSED;
 		TextureLayout layout = TEXTURE_LAYOUT_UNDEFINED;
-		BitField<TextureAspectBits> aspect;
+		BitField<TextureAspectBits> aspect = {};
 	};
 
 	struct Subpass {
@@ -629,19 +637,20 @@ public:
 		AttachmentReference depth_stencil_reference;
 		LocalVector<AttachmentReference> resolve_references;
 		LocalVector<uint32_t> preserve_attachments;
-		AttachmentReference vrs_reference;
+		AttachmentReference fragment_shading_rate_reference;
+		Size2i fragment_shading_rate_texel_size;
 	};
 
 	struct SubpassDependency {
 		uint32_t src_subpass = 0xffffffff;
 		uint32_t dst_subpass = 0xffffffff;
-		BitField<PipelineStageBits> src_stages;
-		BitField<PipelineStageBits> dst_stages;
-		BitField<BarrierAccessBits> src_access;
-		BitField<BarrierAccessBits> dst_access;
+		BitField<PipelineStageBits> src_stages = {};
+		BitField<PipelineStageBits> dst_stages = {};
+		BitField<BarrierAccessBits> src_access = {};
+		BitField<BarrierAccessBits> dst_access = {};
 	};
 
-	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count) = 0;
+	virtual RenderPassID render_pass_create(VectorView<Attachment> p_attachments, VectorView<Subpass> p_subpasses, VectorView<SubpassDependency> p_subpass_dependencies, uint32_t p_view_count, AttachmentReference p_fragment_density_map_attachment) = 0;
 	virtual void render_pass_free(RenderPassID p_render_pass) = 0;
 
 	// ----- COMMANDS -----
@@ -657,7 +666,7 @@ public:
 	};
 
 	struct AttachmentClear {
-		BitField<TextureAspectBits> aspect;
+		BitField<TextureAspectBits> aspect = {};
 		uint32_t color_attachment = 0xffffffff;
 		RenderPassClearValue value;
 	};
@@ -787,6 +796,26 @@ public:
 		uint32_t max_instance_count = 0;
 	};
 
+	struct FragmentShadingRateCapabilities {
+		Size2i min_texel_size;
+		Size2i max_texel_size;
+		Size2i max_fragment_size;
+		bool pipeline_supported = false;
+		bool primitive_supported = false;
+		bool attachment_supported = false;
+	};
+
+	struct FragmentDensityMapCapabilities {
+		Size2i min_texel_size;
+		Size2i max_texel_size;
+		Size2i offset_granularity;
+		bool attachment_supported = false;
+		bool dynamic_attachment_supported = false;
+		bool non_subsampled_images_supported = false;
+		bool invocations_supported = false;
+		bool offset_supported = false;
+	};
+
 	enum ApiTrait {
 		API_TRAIT_HONORS_PIPELINE_BARRIERS,
 		API_TRAIT_SHADER_CHANGE_INVALIDATION,
@@ -828,6 +857,8 @@ public:
 	virtual uint64_t api_trait_get(ApiTrait p_trait);
 	virtual bool has_feature(Features p_feature) = 0;
 	virtual const MultiviewCapabilities &get_multiview_capabilities() = 0;
+	virtual const FragmentShadingRateCapabilities &get_fragment_shading_rate_capabilities() = 0;
+	virtual const FragmentDensityMapCapabilities &get_fragment_density_map_capabilities() = 0;
 	virtual String get_api_name() const = 0;
 	virtual String get_api_version() const = 0;
 	virtual String get_pipeline_cache_uuid() const = 0;
@@ -841,5 +872,3 @@ public:
 };
 
 using RDD = RenderingDeviceDriver;
-
-#endif // RENDERING_DEVICE_DRIVER_H
diff --git a/engine/servers/rendering/rendering_device_graph.cpp b/engine/servers/rendering/rendering_device_graph.cpp
index ae91e1b3..98506828 100644
--- a/engine/servers/rendering/rendering_device_graph.cpp
+++ b/engine/servers/rendering/rendering_device_graph.cpp
@@ -98,6 +98,8 @@ bool RenderingDeviceGraph::_is_write_usage(ResourceUsage p_usage) {
 		case RESOURCE_USAGE_INDEX_BUFFER_READ:
 		case RESOURCE_USAGE_TEXTURE_SAMPLE:
 		case RESOURCE_USAGE_STORAGE_IMAGE_READ:
+		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ:
+		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ:
 			return false;
 		case RESOURCE_USAGE_COPY_TO:
 		case RESOURCE_USAGE_RESOLVE_TO:
@@ -132,6 +134,10 @@ RDD::TextureLayout RenderingDeviceGraph::_usage_to_image_layout(ResourceUsage p_
 			return RDD::TEXTURE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 		case RESOURCE_USAGE_ATTACHMENT_DEPTH_STENCIL_READ_WRITE:
 			return RDD::TEXTURE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ:
+			return RDD::TEXTURE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL;
+		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ:
+			return RDD::TEXTURE_LAYOUT_FRAGMENT_DENSITY_MAP_ATTACHMENT_OPTIMAL;
 		case RESOURCE_USAGE_NONE:
 			return RDD::TEXTURE_LAYOUT_UNDEFINED;
 		default:
@@ -176,6 +182,10 @@ RDD::BarrierAccessBits RenderingDeviceGraph::_usage_to_access_bits(ResourceUsage
 			return RDD::BarrierAccessBits(RDD::BARRIER_ACCESS_COLOR_ATTACHMENT_READ_BIT | RDD::BARRIER_ACCESS_COLOR_ATTACHMENT_WRITE_BIT);
 		case RESOURCE_USAGE_ATTACHMENT_DEPTH_STENCIL_READ_WRITE:
 			return RDD::BarrierAccessBits(RDD::BARRIER_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | RDD::BARRIER_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
+		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ:
+			return RDD::BARRIER_ACCESS_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT;
+		case RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ:
+			return RDD::BARRIER_ACCESS_FRAGMENT_DENSITY_MAP_ATTACHMENT_READ_BIT;
 		default:
 			DEV_ASSERT(false && "Invalid usage.");
 			return RDD::BarrierAccessBits(0);
@@ -918,7 +928,7 @@ void RenderingDeviceGraph::_run_draw_list_command(RDD::CommandBufferID p_command
 	}
 }
 
-void RenderingDeviceGraph::_add_draw_list_begin(FramebufferCache *p_framebuffer_cache, RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, bool p_uses_color, bool p_uses_depth, uint32_t p_breadcrumb, bool p_split_cmd_buffer) {
+void RenderingDeviceGraph::_add_draw_list_begin(FramebufferCache *p_framebuffer_cache, RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, BitField<RDD::PipelineStageBits> p_stages, uint32_t p_breadcrumb, bool p_split_cmd_buffer) {
 	DEV_ASSERT(p_attachment_operations.size() == p_attachment_clear_values.size());
 
 	draw_instruction_list.clear();
@@ -927,6 +937,7 @@ void RenderingDeviceGraph::_add_draw_list_begin(FramebufferCache *p_framebuffer_
 	draw_instruction_list.render_pass = p_render_pass;
 	draw_instruction_list.framebuffer = p_framebuffer;
 	draw_instruction_list.region = p_region;
+	draw_instruction_list.stages = p_stages;
 	draw_instruction_list.attachment_operations.resize(p_attachment_operations.size());
 	draw_instruction_list.attachment_clear_values.resize(p_attachment_clear_values.size());
 
@@ -935,15 +946,6 @@ void RenderingDeviceGraph::_add_draw_list_begin(FramebufferCache *p_framebuffer_
 		draw_instruction_list.attachment_clear_values[i] = p_attachment_clear_values[i];
 	}
 
-	if (p_uses_color) {
-		draw_instruction_list.stages.set_flag(RDD::PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT);
-	}
-
-	if (p_uses_depth) {
-		draw_instruction_list.stages.set_flag(RDD::PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);
-		draw_instruction_list.stages.set_flag(RDD::PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT);
-	}
-
 	draw_instruction_list.split_cmd_buffer = p_split_cmd_buffer;
 
 #if defined(DEBUG_ENABLED) || defined(DEV_ENABLED)
@@ -1119,7 +1121,7 @@ void RenderingDeviceGraph::_run_label_command_change(RDD::CommandBufferID p_comm
 		Color label_color;
 		if (p_new_label_index >= 0) {
 			const char *label_chars = &command_label_chars[command_label_offsets[p_new_label_index]];
-			label_name.parse_utf8(label_chars);
+			label_name.append_utf8(label_chars);
 			label_color = command_label_colors[p_new_label_index];
 		} else if (p_use_label_for_empty) {
 			label_name = "Command graph";
@@ -1789,12 +1791,12 @@ void RenderingDeviceGraph::add_compute_list_end() {
 	_add_command_to_graph(compute_instruction_list.command_trackers.ptr(), compute_instruction_list.command_tracker_usages.ptr(), compute_instruction_list.command_trackers.size(), command_index, command);
 }
 
-void RenderingDeviceGraph::add_draw_list_begin(FramebufferCache *p_framebuffer_cache, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, bool p_uses_color, bool p_uses_depth, uint32_t p_breadcrumb, bool p_split_cmd_buffer) {
-	_add_draw_list_begin(p_framebuffer_cache, RDD::RenderPassID(), RDD::FramebufferID(), p_region, p_attachment_operations, p_attachment_clear_values, p_uses_color, p_uses_depth, p_breadcrumb, p_split_cmd_buffer);
+void RenderingDeviceGraph::add_draw_list_begin(FramebufferCache *p_framebuffer_cache, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, BitField<RDD::PipelineStageBits> p_stages, uint32_t p_breadcrumb, bool p_split_cmd_buffer) {
+	_add_draw_list_begin(p_framebuffer_cache, RDD::RenderPassID(), RDD::FramebufferID(), p_region, p_attachment_operations, p_attachment_clear_values, p_stages, p_breadcrumb, p_split_cmd_buffer);
 }
 
-void RenderingDeviceGraph::add_draw_list_begin(RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, bool p_uses_color, bool p_uses_depth, uint32_t p_breadcrumb, bool p_split_cmd_buffer) {
-	_add_draw_list_begin(nullptr, p_render_pass, p_framebuffer, p_region, p_attachment_operations, p_attachment_clear_values, p_uses_color, p_uses_depth, p_breadcrumb, p_split_cmd_buffer);
+void RenderingDeviceGraph::add_draw_list_begin(RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, BitField<RDD::PipelineStageBits> p_stages, uint32_t p_breadcrumb, bool p_split_cmd_buffer) {
+	_add_draw_list_begin(nullptr, p_render_pass, p_framebuffer, p_region, p_attachment_operations, p_attachment_clear_values, p_stages, p_breadcrumb, p_split_cmd_buffer);
 }
 
 void RenderingDeviceGraph::add_draw_list_bind_index_buffer(RDD::BufferID p_buffer, RDD::IndexBufferFormat p_format, uint32_t p_offset) {
diff --git a/engine/servers/rendering/rendering_device_graph.h b/engine/servers/rendering/rendering_device_graph.h
index 567893e6..a83188ca 100644
--- a/engine/servers/rendering/rendering_device_graph.h
+++ b/engine/servers/rendering/rendering_device_graph.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_DEVICE_GRAPH_H
-#define RENDERING_DEVICE_GRAPH_H
+#pragma once
 
 #include "core/object/worker_thread_pool.h"
 #include "rendering_device_commons.h"
@@ -115,9 +114,9 @@ public:
 		int32_t buffer_barrier_count = 0;
 #endif
 		int32_t label_index = -1;
-		BitField<RDD::PipelineStageBits> previous_stages;
-		BitField<RDD::PipelineStageBits> next_stages;
-		BitField<RDD::PipelineStageBits> self_stages;
+		BitField<RDD::PipelineStageBits> previous_stages = {};
+		BitField<RDD::PipelineStageBits> next_stages = {};
+		BitField<RDD::PipelineStageBits> self_stages = {};
 	};
 
 	struct RecordedBufferCopy {
@@ -149,14 +148,16 @@ public:
 		RESOURCE_USAGE_STORAGE_IMAGE_READ_WRITE,
 		RESOURCE_USAGE_ATTACHMENT_COLOR_READ_WRITE,
 		RESOURCE_USAGE_ATTACHMENT_DEPTH_STENCIL_READ_WRITE,
+		RESOURCE_USAGE_ATTACHMENT_FRAGMENT_SHADING_RATE_READ,
+		RESOURCE_USAGE_ATTACHMENT_FRAGMENT_DENSITY_MAP_READ,
 		RESOURCE_USAGE_MAX
 	};
 
 	struct ResourceTracker {
 		uint32_t reference_count = 0;
 		int64_t command_frame = -1;
-		BitField<RDD::PipelineStageBits> previous_frame_stages;
-		BitField<RDD::PipelineStageBits> current_frame_stages;
+		BitField<RDD::PipelineStageBits> previous_frame_stages = {};
+		BitField<RDD::PipelineStageBits> current_frame_stages = {};
 		int32_t read_full_command_list_index = -1;
 		int32_t read_slice_command_list_index = -1;
 		int32_t write_command_or_list_index = -1;
@@ -165,7 +166,7 @@ public:
 		int32_t compute_list_index = -1;
 		ResourceUsage compute_list_usage = RESOURCE_USAGE_NONE;
 		ResourceUsage usage = RESOURCE_USAGE_NONE;
-		BitField<RDD::BarrierAccessBits> usage_access;
+		BitField<RDD::BarrierAccessBits> usage_access = {};
 		RDD::BufferID buffer_driver_id;
 		RDD::TextureID texture_driver_id;
 		RDD::TextureSubresourceRange texture_subresources;
@@ -240,7 +241,7 @@ private:
 		LocalVector<uint8_t> data;
 		LocalVector<ResourceTracker *> command_trackers;
 		LocalVector<ResourceUsage> command_tracker_usages;
-		BitField<RDD::PipelineStageBits> stages;
+		BitField<RDD::PipelineStageBits> stages = {};
 		int32_t index = 0;
 
 		void clear() {
@@ -659,8 +660,8 @@ private:
 	};
 
 	struct BarrierGroup {
-		BitField<RDD::PipelineStageBits> src_stages;
-		BitField<RDD::PipelineStageBits> dst_stages;
+		BitField<RDD::PipelineStageBits> src_stages = {};
+		BitField<RDD::PipelineStageBits> dst_stages = {};
 		RDD::MemoryBarrier memory_barrier;
 		LocalVector<RDD::TextureBarrier> normalization_barriers;
 		LocalVector<RDD::TextureBarrier> transition_barriers;
@@ -752,7 +753,7 @@ private:
 	void _run_compute_list_command(RDD::CommandBufferID p_command_buffer, const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
 	void _get_draw_list_render_pass_and_framebuffer(const RecordedDrawListCommand *p_draw_list_command, RDD::RenderPassID &r_render_pass, RDD::FramebufferID &r_framebuffer);
 	void _run_draw_list_command(RDD::CommandBufferID p_command_buffer, const uint8_t *p_instruction_data, uint32_t p_instruction_data_size);
-	void _add_draw_list_begin(FramebufferCache *p_framebuffer_cache, RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, bool p_uses_color, bool p_uses_depth, uint32_t p_breadcrumb, bool p_split_cmd_buffer);
+	void _add_draw_list_begin(FramebufferCache *p_framebuffer_cache, RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, BitField<RDD::PipelineStageBits> p_stages, uint32_t p_breadcrumb, bool p_split_cmd_buffer);
 	void _run_secondary_command_buffer_task(const SecondaryCommandBuffer *p_secondary);
 	void _wait_for_secondary_command_buffer_tasks();
 	void _run_render_commands(int32_t p_level, const RecordedCommandSort *p_sorted_commands, uint32_t p_sorted_commands_count, RDD::CommandBufferID &r_command_buffer, CommandBufferPool &r_command_buffer_pool, int32_t &r_current_label_index, int32_t &r_current_label_level);
@@ -785,8 +786,8 @@ public:
 	void add_compute_list_usage(ResourceTracker *p_tracker, ResourceUsage p_usage);
 	void add_compute_list_usages(VectorView<ResourceTracker *> p_trackers, VectorView<ResourceUsage> p_usages);
 	void add_compute_list_end();
-	void add_draw_list_begin(FramebufferCache *p_framebuffer_cache, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, bool p_uses_color, bool p_uses_depth, uint32_t p_breadcrumb = 0, bool p_split_cmd_buffer = false);
-	void add_draw_list_begin(RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, bool p_uses_color, bool p_uses_depth, uint32_t p_breadcrumb = 0, bool p_split_cmd_buffer = false);
+	void add_draw_list_begin(FramebufferCache *p_framebuffer_cache, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, BitField<RDD::PipelineStageBits> p_stages, uint32_t p_breadcrumb = 0, bool p_split_cmd_buffer = false);
+	void add_draw_list_begin(RDD::RenderPassID p_render_pass, RDD::FramebufferID p_framebuffer, Rect2i p_region, VectorView<AttachmentOperation> p_attachment_operations, VectorView<RDD::RenderPassClearValue> p_attachment_clear_values, BitField<RDD::PipelineStageBits> p_stages, uint32_t p_breadcrumb = 0, bool p_split_cmd_buffer = false);
 	void add_draw_list_bind_index_buffer(RDD::BufferID p_buffer, RDD::IndexBufferFormat p_format, uint32_t p_offset);
 	void add_draw_list_bind_pipeline(RDD::PipelineID p_pipeline, BitField<RDD::PipelineStageBits> p_pipeline_stage_bits);
 	void add_draw_list_bind_uniform_set(RDD::ShaderID p_shader, RDD::UniformSetID p_uniform_set, uint32_t set_index);
@@ -825,5 +826,3 @@ public:
 };
 
 using RDG = RenderingDeviceGraph;
-
-#endif // RENDERING_DEVICE_GRAPH_H
diff --git a/engine/servers/rendering/rendering_light_culler.h b/engine/servers/rendering/rendering_light_culler.h
index b0437d23..2de786e8 100644
--- a/engine/servers/rendering/rendering_light_culler.h
+++ b/engine/servers/rendering/rendering_light_culler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_LIGHT_CULLER_H
-#define RENDERING_LIGHT_CULLER_H
+#pragma once
 
 #include "core/math/plane.h"
 #include "core/math/vector3.h"
@@ -277,5 +276,3 @@ private:
 	LocalVector<uint8_t> _calculated_LUT[LUT_SIZE];
 #endif
 };
-
-#endif // RENDERING_LIGHT_CULLER_H
diff --git a/engine/servers/rendering/rendering_method.h b/engine/servers/rendering/rendering_method.h
index 34f11924..4bbc6094 100644
--- a/engine/servers/rendering/rendering_method.h
+++ b/engine/servers/rendering/rendering_method.h
@@ -28,19 +28,18 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_METHOD_H
-#define RENDERING_METHOD_H
+#pragma once
 
 #include "servers/rendering/storage/render_scene_buffers.h"
 #include "servers/rendering_server.h"
 
-#ifdef _3D_DISABLED
+#ifdef XR_DISABLED
 // RendererSceneCull::render_camera is empty when 3D is disabled, but
 // it and RenderingMethod::render_camera have a parameter for XRInterface.
 #define XRInterface RefCounted
-#else // 3D enabled
+#else
 #include "servers/xr/xr_interface.h"
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 class RenderingMethod {
 public:
@@ -372,5 +371,3 @@ public:
 	RenderingMethod();
 	virtual ~RenderingMethod();
 };
-
-#endif // RENDERING_METHOD_H
diff --git a/engine/servers/rendering/rendering_server_constants.h b/engine/servers/rendering/rendering_server_constants.h
index 6d27a3a0..74cbe311 100644
--- a/engine/servers/rendering/rendering_server_constants.h
+++ b/engine/servers/rendering/rendering_server_constants.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_SERVER_CONSTANTS_H
-#define RENDERING_SERVER_CONSTANTS_H
+#pragma once
 
 // Use for constants etc. that need not be included as often as rendering_server.h
 // to reduce dependencies and prevent slow compilation.
@@ -44,5 +43,3 @@
 //#define RENDERING_SERVER_DEBUG_PHYSICS_INTERPOLATION
 
 #endif // DEV_ENABLED
-
-#endif // RENDERING_SERVER_CONSTANTS_H
diff --git a/engine/servers/rendering/rendering_server_default.cpp b/engine/servers/rendering/rendering_server_default.cpp
index 9c2e0af3..3a381401 100644
--- a/engine/servers/rendering/rendering_server_default.cpp
+++ b/engine/servers/rendering/rendering_server_default.cpp
@@ -87,13 +87,13 @@ void RenderingServerDefault::_draw(bool p_swap_buffers, double frame_step) {
 
 	RSG::rasterizer->end_frame(p_swap_buffers);
 
-#ifndef _3D_DISABLED
+#ifndef XR_DISABLED
 	XRServer *xr_server = XRServer::get_singleton();
 	if (xr_server != nullptr) {
 		// let our XR server know we're done so we can get our frame timing
 		xr_server->end_frame();
 	}
-#endif // _3D_DISABLED
+#endif // XR_DISABLED
 
 	RSG::canvas->update_visibility_notifiers();
 	RSG::scene->update_visibility_notifiers();
diff --git a/engine/servers/rendering/rendering_server_default.h b/engine/servers/rendering/rendering_server_default.h
index ffbc5c70..748cc370 100644
--- a/engine/servers/rendering/rendering_server_default.h
+++ b/engine/servers/rendering/rendering_server_default.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_SERVER_DEFAULT_H
-#define RENDERING_SERVER_DEFAULT_H
+#pragma once
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/thread.h"
@@ -1187,5 +1186,3 @@ public:
 	RenderingServerDefault(bool p_create_thread = false);
 	~RenderingServerDefault();
 };
-
-#endif // RENDERING_SERVER_DEFAULT_H
diff --git a/engine/servers/rendering/rendering_server_globals.h b/engine/servers/rendering/rendering_server_globals.h
index f5b4941b..c571ecca 100644
--- a/engine/servers/rendering/rendering_server_globals.h
+++ b/engine/servers/rendering/rendering_server_globals.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_SERVER_GLOBALS_H
-#define RENDERING_SERVER_GLOBALS_H
+#pragma once
 
 #include "servers/rendering/environment/renderer_fog.h"
 #include "servers/rendering/environment/renderer_gi.h"
@@ -70,5 +69,3 @@ public:
 };
 
 #define RSG RenderingServerGlobals
-
-#endif // RENDERING_SERVER_GLOBALS_H
diff --git a/engine/servers/rendering/shader_compiler.cpp b/engine/servers/rendering/shader_compiler.cpp
index 501e60c8..8c7fae49 100644
--- a/engine/servers/rendering/shader_compiler.cpp
+++ b/engine/servers/rendering/shader_compiler.cpp
@@ -889,7 +889,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
 			if (p_default_actions.usage_defines.has(vnode->name) && !used_name_defines.has(vnode->name)) {
 				String define = p_default_actions.usage_defines[vnode->name];
 				if (define.begins_with("@")) {
-					define = p_default_actions.usage_defines[define.substr(1, define.length())];
+					define = p_default_actions.usage_defines[define.substr(1)];
 				}
 				r_gen_code.defines.push_back(define);
 				used_name_defines.insert(vnode->name);
@@ -1006,7 +1006,7 @@ String ShaderCompiler::_dump_node_code(const SL::Node *p_node, int p_level, Gene
 			if (p_default_actions.usage_defines.has(anode->name) && !used_name_defines.has(anode->name)) {
 				String define = p_default_actions.usage_defines[anode->name];
 				if (define.begins_with("@")) {
-					define = p_default_actions.usage_defines[define.substr(1, define.length())];
+					define = p_default_actions.usage_defines[define.substr(1)];
 				}
 				r_gen_code.defines.push_back(define);
 				used_name_defines.insert(anode->name);
diff --git a/engine/servers/rendering/shader_compiler.h b/engine/servers/rendering/shader_compiler.h
index 66106d7e..7fb873a6 100644
--- a/engine/servers/rendering/shader_compiler.h
+++ b/engine/servers/rendering/shader_compiler.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_COMPILER_H
-#define SHADER_COMPILER_H
+#pragma once
 
 #include "core/templates/pair.h"
 #include "servers/rendering/shader_language.h"
@@ -133,5 +132,3 @@ public:
 	void initialize(DefaultIdentifierActions p_actions);
 	ShaderCompiler();
 };
-
-#endif // SHADER_COMPILER_H
diff --git a/engine/servers/rendering/shader_include_db.h b/engine/servers/rendering/shader_include_db.h
index d1967a32..c73e5bf1 100644
--- a/engine/servers/rendering/shader_include_db.h
+++ b/engine/servers/rendering/shader_include_db.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_INCLUDE_DB_H
-#define SHADER_INCLUDE_DB_H
+#pragma once
 
 #include "core/object/class_db.h"
 
@@ -49,5 +48,3 @@ public:
 	static String get_built_in_include_file(const String &p_filename);
 	static String parse_include_files(const String &p_code);
 };
-
-#endif // SHADER_INCLUDE_DB_H
diff --git a/engine/servers/rendering/shader_language.cpp b/engine/servers/rendering/shader_language.cpp
index 59adb53b..fa8d5a94 100644
--- a/engine/servers/rendering/shader_language.cpp
+++ b/engine/servers/rendering/shader_language.cpp
@@ -1342,7 +1342,7 @@ void ShaderLanguage::_parse_used_identifier(const StringName &p_identifier, Iden
 			break;
 		case IdentifierType::IDENTIFIER_VARYING:
 			if (HAS_WARNING(ShaderWarning::UNUSED_VARYING_FLAG) && used_varyings.has(p_identifier)) {
-				if (shader->varyings[p_identifier].stage != ShaderNode::Varying::STAGE_VERTEX && shader->varyings[p_identifier].stage != ShaderNode::Varying::STAGE_FRAGMENT) {
+				if (shader->varyings[p_identifier].stage == ShaderNode::Varying::STAGE_UNKNOWN) {
 					used_varyings[p_identifier].used = true;
 				}
 			}
@@ -4222,7 +4222,7 @@ Variant ShaderLanguage::constant_value_to_variant(const Vector<Scalar> &p_value,
 					}
 					value = Variant(array);
 				} else {
-					value = Variant(p_value[0].boolean);
+					value = Variant(p_value[0].sint | (p_value[1].sint << 1));
 				}
 				break;
 			case ShaderLanguage::TYPE_BVEC3:
@@ -4235,7 +4235,7 @@ Variant ShaderLanguage::constant_value_to_variant(const Vector<Scalar> &p_value,
 					}
 					value = Variant(array);
 				} else {
-					value = Variant(p_value[0].boolean);
+					value = Variant(p_value[0].sint | (p_value[1].sint << 1) | (p_value[2].sint << 2));
 				}
 				break;
 			case ShaderLanguage::TYPE_BVEC4:
@@ -4248,7 +4248,7 @@ Variant ShaderLanguage::constant_value_to_variant(const Vector<Scalar> &p_value,
 					}
 					value = Variant(array);
 				} else {
-					value = Variant(p_value[0].boolean);
+					value = Variant(p_value[0].sint | (p_value[1].sint << 1) | (p_value[2].sint << 2) | (p_value[3].sint << 3));
 				}
 				break;
 			case ShaderLanguage::TYPE_INT:
@@ -5245,7 +5245,7 @@ ShaderLanguage::DataType ShaderLanguage::get_scalar_type(DataType p_type) {
 		TYPE_VOID,
 	};
 
-	static_assert(sizeof(scalar_types) / sizeof(*scalar_types) == TYPE_MAX);
+	static_assert(std::size(scalar_types) == TYPE_MAX);
 
 	return scalar_types[p_type];
 }
@@ -5287,7 +5287,7 @@ int ShaderLanguage::get_cardinality(DataType p_type) {
 		1,
 	};
 
-	static_assert(sizeof(cardinality_table) / sizeof(*cardinality_table) == TYPE_MAX);
+	static_assert(std::size(cardinality_table) == TYPE_MAX);
 
 	return cardinality_table[p_type];
 }
@@ -6510,6 +6510,27 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 						_set_error(RTR("Expected constant expression."));
 						return nullptr;
 					}
+					if (ident_type == IDENTIFIER_FUNCTION) {
+						_set_error(vformat(RTR("Can't use function as identifier: '%s'."), String(identifier)));
+						return nullptr;
+					}
+#ifdef DEBUG_ENABLED
+					if (check_warnings) {
+						StringName func_name;
+						BlockNode *b = p_block;
+
+						while (b) {
+							if (b->parent_function) {
+								func_name = b->parent_function->name;
+								break;
+							} else {
+								b = b->parent_block;
+							}
+						}
+
+						_parse_used_identifier(identifier, ident_type, func_name);
+					}
+#endif // DEBUG_ENABLED
 					if (ident_type == IDENTIFIER_VARYING) {
 						TkPos prev_pos = _get_tkpos();
 						Token next_token = _get_token();
@@ -6542,11 +6563,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 							}
 						}
 					}
-
-					if (ident_type == IDENTIFIER_FUNCTION) {
-						_set_error(vformat(RTR("Can't use function as identifier: '%s'."), String(identifier)));
-						return nullptr;
-					}
 #ifdef DEBUG_ENABLED
 					if (check_position_write && ident_type == IDENTIFIER_BUILTIN_VAR) {
 						if (String(identifier) == "POSITION") {
@@ -6564,7 +6580,7 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 							_set_tkpos(prev_pos);
 						}
 					}
-#endif
+#endif // DEBUG_ENABLED
 					if (is_const) {
 						last_type = IDENTIFIER_CONSTANT;
 					} else {
@@ -6656,23 +6672,6 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
 					varname->is_local = is_local;
 					expr = varname;
 				}
-#ifdef DEBUG_ENABLED
-				if (check_warnings) {
-					StringName func_name;
-					BlockNode *b = p_block;
-
-					while (b) {
-						if (b->parent_function) {
-							func_name = b->parent_function->name;
-							break;
-						} else {
-							b = b->parent_block;
-						}
-					}
-
-					_parse_used_identifier(identifier, ident_type, func_name);
-				}
-#endif // DEBUG_ENABLED
 			}
 		} else if (tk.type == TK_OP_ADD) {
 			continue; //this one does nothing
@@ -8460,9 +8459,11 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
 
 			pos = _get_tkpos();
 			tk = _get_token();
-			TokenType prev_type;
+			bool has_default = false;
 			if (tk.type == TK_CF_CASE || tk.type == TK_CF_DEFAULT) {
-				prev_type = tk.type;
+				if (tk.type == TK_CF_DEFAULT) {
+					has_default = true;
+				}
 				_set_tkpos(pos);
 			} else {
 				_set_expected_error("case", "default");
@@ -8476,17 +8477,15 @@ Error ShaderLanguage::_parse_block(BlockNode *p_block, const FunctionInfo &p_fun
 				}
 				pos = _get_tkpos();
 				tk = _get_token();
-				if (tk.type == TK_CF_CASE || tk.type == TK_CF_DEFAULT) {
-					if (prev_type == TK_CF_DEFAULT) {
-						if (tk.type == TK_CF_CASE) {
-							_set_error(RTR("Cases must be defined before default case."));
-							return ERR_PARSE_ERROR;
-						} else if (prev_type == TK_CF_DEFAULT) {
-							_set_error(RTR("Default case must be defined only once."));
-							return ERR_PARSE_ERROR;
-						}
+				if (tk.type == TK_CF_CASE) {
+					_set_tkpos(pos);
+					continue;
+				} else if (tk.type == TK_CF_DEFAULT) {
+					if (has_default) {
+						_set_error(RTR("Default case must be defined only once."));
+						return ERR_PARSE_ERROR;
 					}
-					prev_type = tk.type;
+					has_default = true;
 					_set_tkpos(pos);
 					continue;
 				} else {
@@ -11231,7 +11230,7 @@ Error ShaderLanguage::complete(const String &p_code, const ShaderCompileInfo &p_
 #ifdef DEBUG_ENABLED
 	// Adds context keywords.
 	if (keyword_completion_context != CF_UNSPECIFIED) {
-		int sz = sizeof(keyword_list) / sizeof(KeyWord);
+		constexpr int sz = std::size(keyword_list);
 		for (int i = 0; i < sz; i++) {
 			if (keyword_list[i].flags == CF_UNSPECIFIED) {
 				break; // Ignore hint keywords (parsed below).
diff --git a/engine/servers/rendering/shader_language.h b/engine/servers/rendering/shader_language.h
index a774f867..c3cb1d5b 100644
--- a/engine/servers/rendering/shader_language.h
+++ b/engine/servers/rendering/shader_language.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_LANGUAGE_H
-#define SHADER_LANGUAGE_H
+#pragma once
 
 #include "core/object/script_language.h"
 #include "core/string/string_name.h"
@@ -1257,5 +1256,3 @@ public:
 	ShaderLanguage();
 	~ShaderLanguage();
 };
-
-#endif // SHADER_LANGUAGE_H
diff --git a/engine/servers/rendering/shader_preprocessor.cpp b/engine/servers/rendering/shader_preprocessor.cpp
index 4a9d97fc..24866bdb 100644
--- a/engine/servers/rendering/shader_preprocessor.cpp
+++ b/engine/servers/rendering/shader_preprocessor.cpp
@@ -133,7 +133,7 @@ void ShaderPreprocessor::Tokenizer::skip_whitespace() {
 
 bool ShaderPreprocessor::Tokenizer::consume_empty_line() {
 	// Read until newline and return true if the content was all whitespace/empty.
-	return tokens_to_string(advance('\n')).strip_edges().size() == 0;
+	return tokens_to_string(advance('\n')).strip_edges().is_empty();
 }
 
 String ShaderPreprocessor::Tokenizer::get_identifier(bool *r_is_cursor, bool p_started) {
@@ -1096,7 +1096,7 @@ bool ShaderPreprocessor::expand_macros_once(const String &p_line, int p_line_num
 				int arg_index_start = 0;
 				int arg_index = 0;
 				while (find_match(body, arg_name, arg_index, arg_index_start)) {
-					body = body.substr(0, arg_index) + args[i] + body.substr(arg_index + arg_name.length(), body.length() - (arg_index + arg_name.length()));
+					body = body.substr(0, arg_index) + args[i] + body.substr(arg_index + arg_name.length());
 					// Manually reset arg_index_start to where the arg value of the define finishes.
 					// This ensures we don't skip the other args of this macro in the string.
 					arg_index_start = arg_index + args[i].length() + 1;
@@ -1105,11 +1105,11 @@ bool ShaderPreprocessor::expand_macros_once(const String &p_line, int p_line_num
 
 			concatenate_macro_body(body);
 
-			result = result.substr(0, index) + " " + body + " " + result.substr(args_end + 1, result.length());
+			result = result.substr(0, index) + " " + body + " " + result.substr(args_end + 1);
 		} else {
 			concatenate_macro_body(body);
 
-			result = result.substr(0, index) + " " + body + " " + result.substr(index + key.length(), result.length() - (index + key.length()));
+			result = result.substr(0, index) + " " + body + " " + result.substr(index + key.length());
 		}
 
 		r_expanded = result;
@@ -1176,7 +1176,7 @@ void ShaderPreprocessor::concatenate_macro_body(String &r_body) {
 			index_start--;
 		}
 
-		r_body = r_body.substr(0, index_start) + r_body.substr(index_end, r_body.length() - index_end);
+		r_body = r_body.substr(0, index_start) + r_body.substr(index_end);
 
 		index_start = r_body.find("##", index_start);
 	}
diff --git a/engine/servers/rendering/shader_preprocessor.h b/engine/servers/rendering/shader_preprocessor.h
index 782cb13f..3b386af6 100644
--- a/engine/servers/rendering/shader_preprocessor.h
+++ b/engine/servers/rendering/shader_preprocessor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_PREPROCESSOR_H
-#define SHADER_PREPROCESSOR_H
+#pragma once
 
 #include "core/string/ustring.h"
 #include "core/templates/list.h"
@@ -228,5 +227,3 @@ public:
 	ShaderPreprocessor();
 	~ShaderPreprocessor();
 };
-
-#endif // SHADER_PREPROCESSOR_H
diff --git a/engine/servers/rendering/shader_types.h b/engine/servers/rendering/shader_types.h
index eb72adcf..3d943429 100644
--- a/engine/servers/rendering/shader_types.h
+++ b/engine/servers/rendering/shader_types.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_TYPES_H
-#define SHADER_TYPES_H
+#pragma once
 
 #include "servers/rendering_server.h"
 #include "shader_language.h"
@@ -57,5 +56,3 @@ public:
 
 	ShaderTypes();
 };
-
-#endif // SHADER_TYPES_H
diff --git a/engine/servers/rendering/shader_warnings.cpp b/engine/servers/rendering/shader_warnings.cpp
index 3b99f6c2..a325000d 100644
--- a/engine/servers/rendering/shader_warnings.cpp
+++ b/engine/servers/rendering/shader_warnings.cpp
@@ -97,7 +97,7 @@ String ShaderWarning::get_name_from_code(Code p_code) {
 		"MAGIC_POSITION_WRITE",
 	};
 
-	static_assert((sizeof(names) / sizeof(*names)) == WARNING_MAX, "Amount of warning types don't match the amount of warning names.");
+	static_assert(std::size(names) == WARNING_MAX, "Amount of warning types don't match the amount of warning names.");
 
 	return names[(int)p_code];
 }
diff --git a/engine/servers/rendering/shader_warnings.h b/engine/servers/rendering/shader_warnings.h
index af10dcf4..af99de3f 100644
--- a/engine/servers/rendering/shader_warnings.h
+++ b/engine/servers/rendering/shader_warnings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SHADER_WARNINGS_H
-#define SHADER_WARNINGS_H
+#pragma once
 
 #ifdef DEBUG_ENABLED
 
@@ -89,5 +88,3 @@ public:
 };
 
 #endif // DEBUG_ENABLED
-
-#endif // SHADER_WARNINGS_H
diff --git a/engine/servers/rendering/storage/camera_attributes_storage.h b/engine/servers/rendering/storage/camera_attributes_storage.h
index afb8ad23..b8bbf18b 100644
--- a/engine/servers/rendering/storage/camera_attributes_storage.h
+++ b/engine/servers/rendering/storage/camera_attributes_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef CAMERA_ATTRIBUTES_STORAGE_H
-#define CAMERA_ATTRIBUTES_STORAGE_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/rendering_server.h"
@@ -125,5 +124,3 @@ public:
 		return dof_blur_use_jitter;
 	}
 };
-
-#endif // CAMERA_ATTRIBUTES_STORAGE_H
diff --git a/engine/servers/rendering/storage/compositor_storage.h b/engine/servers/rendering/storage/compositor_storage.h
index d749743c..c11fee97 100644
--- a/engine/servers/rendering/storage/compositor_storage.h
+++ b/engine/servers/rendering/storage/compositor_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef COMPOSITOR_STORAGE_H
-#define COMPOSITOR_STORAGE_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/rendering_server.h"
@@ -45,7 +44,7 @@ private:
 		RS::CompositorEffectCallbackType callback_type;
 		Callable callback;
 
-		BitField<RS::CompositorEffectFlags> flags;
+		BitField<RS::CompositorEffectFlags> flags = {};
 	};
 
 	mutable RID_Owner<CompositorEffect, true> compositor_effects_owner;
@@ -96,5 +95,3 @@ public:
 	void compositor_set_compositor_effects(RID p_compositor, const Vector<RID> &p_effects);
 	Vector<RID> compositor_get_compositor_effects(RID p_compositor, RS::CompositorEffectCallbackType p_callback_type = RS::COMPOSITOR_EFFECT_CALLBACK_TYPE_ANY, bool p_enabled_only = true) const;
 };
-
-#endif // COMPOSITOR_STORAGE_H
diff --git a/engine/servers/rendering/storage/environment_storage.h b/engine/servers/rendering/storage/environment_storage.h
index 6fdc047b..6060b004 100644
--- a/engine/servers/rendering/storage/environment_storage.h
+++ b/engine/servers/rendering/storage/environment_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef ENVIRONMENT_STORAGE_H
-#define ENVIRONMENT_STORAGE_H
+#pragma once
 
 #include "core/templates/rid_owner.h"
 #include "servers/rendering_server.h"
@@ -305,5 +304,3 @@ public:
 	bool environment_get_use_1d_color_correction(RID p_env) const;
 	RID environment_get_color_correction(RID p_env) const;
 };
-
-#endif // ENVIRONMENT_STORAGE_H
diff --git a/engine/servers/rendering/storage/light_storage.h b/engine/servers/rendering/storage/light_storage.h
index 2a3c4d55..f9c69267 100644
--- a/engine/servers/rendering/storage/light_storage.h
+++ b/engine/servers/rendering/storage/light_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef LIGHT_STORAGE_H
-#define LIGHT_STORAGE_H
+#pragma once
 
 #include "render_scene_buffers.h"
 #include "servers/rendering_server.h"
@@ -201,5 +200,3 @@ public:
 	virtual int get_directional_light_shadow_size(RID p_light_instance) = 0;
 	virtual void set_directional_shadow_count(int p_count) = 0;
 };
-
-#endif // LIGHT_STORAGE_H
diff --git a/engine/servers/rendering/storage/material_storage.h b/engine/servers/rendering/storage/material_storage.h
index f8b1ad0b..c9fe7c11 100644
--- a/engine/servers/rendering/storage/material_storage.h
+++ b/engine/servers/rendering/storage/material_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MATERIAL_STORAGE_H
-#define MATERIAL_STORAGE_H
+#pragma once
 
 #include "servers/rendering_server.h"
 #include "utilities.h"
@@ -99,5 +98,3 @@ public:
 
 	virtual void material_update_dependency(RID p_material, DependencyTracker *p_instance) = 0;
 };
-
-#endif // MATERIAL_STORAGE_H
diff --git a/engine/servers/rendering/storage/mesh_storage.h b/engine/servers/rendering/storage/mesh_storage.h
index 7e190c39..512b613a 100644
--- a/engine/servers/rendering/storage/mesh_storage.h
+++ b/engine/servers/rendering/storage/mesh_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef MESH_STORAGE_H
-#define MESH_STORAGE_H
+#pragma once
 
 #include "servers/rendering_server.h"
 #include "utilities.h"
@@ -227,5 +226,3 @@ public:
 	void update_interpolation_tick(bool p_process = true);
 	void update_interpolation_frame(bool p_process = true);
 };
-
-#endif // MESH_STORAGE_H
diff --git a/engine/servers/rendering/storage/particles_storage.h b/engine/servers/rendering/storage/particles_storage.h
index 6208acee..900bf479 100644
--- a/engine/servers/rendering/storage/particles_storage.h
+++ b/engine/servers/rendering/storage/particles_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef PARTICLES_STORAGE_H
-#define PARTICLES_STORAGE_H
+#pragma once
 
 #include "servers/rendering_server.h"
 
@@ -129,5 +128,3 @@ public:
 	virtual void particles_collision_instance_set_transform(RID p_collision_instance, const Transform3D &p_transform) = 0;
 	virtual void particles_collision_instance_set_active(RID p_collision_instance, bool p_active) = 0;
 };
-
-#endif // PARTICLES_STORAGE_H
diff --git a/engine/servers/rendering/storage/render_data.h b/engine/servers/rendering/storage/render_data.h
index 36aa6db7..6afe4dc0 100644
--- a/engine/servers/rendering/storage/render_data.h
+++ b/engine/servers/rendering/storage/render_data.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_DATA_H
-#define RENDER_DATA_H
+#pragma once
 
 #include "core/object/object.h"
 #include "render_scene_buffers.h"
@@ -66,5 +65,3 @@ protected:
 	GDVIRTUAL0RC(RID, _get_environment)
 	GDVIRTUAL0RC(RID, _get_camera_attributes)
 };
-
-#endif // RENDER_DATA_H
diff --git a/engine/servers/rendering/storage/render_scene_buffers.h b/engine/servers/rendering/storage/render_scene_buffers.h
index a3cfbea6..4880e23c 100644
--- a/engine/servers/rendering/storage/render_scene_buffers.h
+++ b/engine/servers/rendering/storage/render_scene_buffers.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_SCENE_BUFFERS_H
-#define RENDER_SCENE_BUFFERS_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "servers/rendering_server.h"
@@ -139,5 +138,3 @@ public:
 	virtual void set_anisotropic_filtering_level(RS::ViewportAnisotropicFiltering p_anisotropic_filtering_level) override;
 	virtual void set_use_debanding(bool p_use_debanding) override;
 };
-
-#endif // RENDER_SCENE_BUFFERS_H
diff --git a/engine/servers/rendering/storage/render_scene_data.h b/engine/servers/rendering/storage/render_scene_data.h
index 6a00cecc..a201f973 100644
--- a/engine/servers/rendering/storage/render_scene_data.h
+++ b/engine/servers/rendering/storage/render_scene_data.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDER_SCENE_DATA_H
-#define RENDER_SCENE_DATA_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/gdvirtual.gen.inc"
@@ -78,5 +77,3 @@ public:
 
 	GDVIRTUAL0RC(RID, _get_uniform_buffer)
 };
-
-#endif // RENDER_SCENE_DATA_H
diff --git a/engine/servers/rendering/storage/texture_storage.h b/engine/servers/rendering/storage/texture_storage.h
index fc470954..c600adc3 100644
--- a/engine/servers/rendering/storage/texture_storage.h
+++ b/engine/servers/rendering/storage/texture_storage.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXTURE_STORAGE_H
-#define TEXTURE_STORAGE_H
+#pragma once
 
 #include "servers/rendering_server.h"
 
@@ -194,5 +193,3 @@ public:
 	virtual void render_target_set_velocity_target_size(RID p_render_target, const Size2i &p_target_size) = 0;
 	virtual Size2i render_target_get_velocity_target_size(RID p_render_target) const = 0;
 };
-
-#endif // TEXTURE_STORAGE_H
diff --git a/engine/servers/rendering/storage/utilities.h b/engine/servers/rendering/storage/utilities.h
index b7506735..54b84fdf 100644
--- a/engine/servers/rendering/storage/utilities.h
+++ b/engine/servers/rendering/storage/utilities.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERER_UTILITIES_H
-#define RENDERER_UTILITIES_H
+#pragma once
 
 #include "servers/rendering_server.h"
 
@@ -187,5 +186,3 @@ public:
 	virtual uint32_t get_maximum_shader_varyings() const = 0;
 	virtual uint64_t get_maximum_uniform_buffer_size() const = 0;
 };
-
-#endif // RENDERER_UTILITIES_H
diff --git a/engine/servers/rendering/storage/variant_converters.h b/engine/servers/rendering/storage/variant_converters.h
index cee663e8..5ec65674 100644
--- a/engine/servers/rendering/storage/variant_converters.h
+++ b/engine/servers/rendering/storage/variant_converters.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef VARIANT_CONVERTERS_H
-#define VARIANT_CONVERTERS_H
+#pragma once
 
 #include "core/error/error_macros.h"
 #include "core/variant/array.h"
@@ -319,5 +318,3 @@ void write_array_std140(const Vector<From> &p_values, To *p_write, int p_array_s
 		}
 	}
 }
-
-#endif // VARIANT_CONVERTERS_H
diff --git a/engine/servers/rendering_server.cpp b/engine/servers/rendering_server.cpp
index 0b3c9182..ef8cc646 100644
--- a/engine/servers/rendering_server.cpp
+++ b/engine/servers/rendering_server.cpp
@@ -240,15 +240,15 @@ RID RenderingServer::_make_test_cube() {
 RID RenderingServer::make_sphere_mesh(int p_lats, int p_lons, real_t p_radius) {
 	Vector<Vector3> vertices;
 	Vector<Vector3> normals;
-	const double lat_step = Math_TAU / p_lats;
-	const double lon_step = Math_TAU / p_lons;
+	const double lat_step = Math::TAU / p_lats;
+	const double lon_step = Math::TAU / p_lons;
 
 	for (int i = 1; i <= p_lats; i++) {
-		double lat0 = lat_step * (i - 1) - Math_TAU / 4;
+		double lat0 = lat_step * (i - 1) - Math::TAU / 4;
 		double z0 = Math::sin(lat0);
 		double zr0 = Math::cos(lat0);
 
-		double lat1 = lat_step * i - Math_TAU / 4;
+		double lat1 = lat_step * i - Math::TAU / 4;
 		double z1 = Math::sin(lat1);
 		double zr1 = Math::cos(lat1);
 
@@ -327,9 +327,9 @@ void _get_axis_angle(const Vector3 &p_normal, const Vector4 &p_tangent, float &r
 	r_angle = float(angle);
 
 	if (d < 0.0) {
-		r_angle = CLAMP((1.0 - r_angle / Math_PI) * 0.5, 0.0, 0.49999);
+		r_angle = CLAMP((1.0 - r_angle / Math::PI) * 0.5, 0.0, 0.49999);
 	} else {
-		r_angle = CLAMP((r_angle / Math_PI) * 0.5 + 0.5, 0.500008, 1.0);
+		r_angle = CLAMP((r_angle / Math::PI) * 0.5 + 0.5, 0.500008, 1.0);
 	}
 }
 
@@ -337,7 +337,7 @@ void _get_axis_angle(const Vector3 &p_normal, const Vector4 &p_tangent, float &r
 // and p_angle includes the binormal direction.
 void _get_tbn_from_axis_angle(const Vector3 &p_axis, float p_angle, Vector3 &r_normal, Vector4 &r_tangent) {
 	float binormal_sign = p_angle > 0.5 ? 1.0 : -1.0;
-	float angle = Math::abs(p_angle * 2.0 - 1.0) * Math_PI;
+	float angle = Math::abs(p_angle * 2.0 - 1.0) * Math::PI;
 
 	Basis tbn = Basis(p_axis, angle);
 	Vector3 tan = tbn.rows[0];
@@ -924,7 +924,7 @@ Error RenderingServer::_surface_set_data(Array p_arrays, uint64_t p_format, uint
 		// Create AABBs for each detected bone.
 		int total_bones = max_bone + 1;
 
-		bool first = r_bone_aabb.size() == 0;
+		bool first = r_bone_aabb.is_empty();
 
 		r_bone_aabb.resize(total_bones);
 
@@ -1317,8 +1317,7 @@ Error RenderingServer::mesh_create_surface_data_from_arrays(SurfaceData *r_surfa
 	}
 	Vector<SurfaceData::LOD> lods;
 	if (index_array_len) {
-		List<Variant> keys;
-		p_lods.get_key_list(&keys);
+		LocalVector<Variant> keys = p_lods.get_key_list();
 		keys.sort(); // otherwise lod levels may get skipped
 		for (const Variant &E : keys) {
 			float distance = E;
@@ -3026,6 +3025,7 @@ void RenderingServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("environment_set_ssr", "env", "enable", "max_steps", "fade_in", "fade_out", "depth_tolerance"), &RenderingServer::environment_set_ssr);
 	ClassDB::bind_method(D_METHOD("environment_set_ssao", "env", "enable", "radius", "intensity", "power", "detail", "horizon", "sharpness", "light_affect", "ao_channel_affect"), &RenderingServer::environment_set_ssao);
 	ClassDB::bind_method(D_METHOD("environment_set_fog", "env", "enable", "light_color", "light_energy", "sun_scatter", "density", "height", "height_density", "aerial_perspective", "sky_affect", "fog_mode"), &RenderingServer::environment_set_fog, DEFVAL(RS::ENV_FOG_MODE_EXPONENTIAL));
+	ClassDB::bind_method(D_METHOD("environment_set_fog_depth", "env", "curve", "begin", "end"), &RenderingServer::environment_set_fog_depth);
 	ClassDB::bind_method(D_METHOD("environment_set_sdfgi", "env", "enable", "cascades", "min_cell_size", "y_scale", "use_occlusion", "bounce_feedback", "read_sky", "energy", "normal_bias", "probe_bias"), &RenderingServer::environment_set_sdfgi);
 	ClassDB::bind_method(D_METHOD("environment_set_volumetric_fog", "env", "enable", "density", "albedo", "emission", "emission_energy", "anisotropy", "length", "p_detail_spread", "gi_inject", "temporal_reprojection", "temporal_reprojection_amount", "ambient_inject", "sky_affect"), &RenderingServer::environment_set_volumetric_fog);
 
diff --git a/engine/servers/rendering_server.h b/engine/servers/rendering_server.h
index f889cce0..af8be9db 100644
--- a/engine/servers/rendering_server.h
+++ b/engine/servers/rendering_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef RENDERING_SERVER_H
-#define RENDERING_SERVER_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/math/geometry_3d.h"
@@ -1978,5 +1977,3 @@ VARIANT_ENUM_CAST(RenderingServer::Features);
 
 // Alias to make it easier to use.
 #define RS RenderingServer
-
-#endif // RENDERING_SERVER_H
diff --git a/engine/servers/server_wrap_mt_common.h b/engine/servers/server_wrap_mt_common.h
index f9901cbc..594ab08d 100644
--- a/engine/servers/server_wrap_mt_common.h
+++ b/engine/servers/server_wrap_mt_common.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef SERVER_WRAP_MT_COMMON_H
-#define SERVER_WRAP_MT_COMMON_H
+#pragma once
 
 #ifdef DEBUG_ENABLED
 #define MAIN_THREAD_SYNC_CHECK                                                                         \
@@ -810,5 +809,3 @@
 			server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15);                                                                                                                  \
 		}                                                                                                                                                                                                           \
 	}
-
-#endif // SERVER_WRAP_MT_COMMON_H
diff --git a/engine/servers/text/text_server_dummy.h b/engine/servers/text/text_server_dummy.h
index c7dba0f5..9086e8ba 100644
--- a/engine/servers/text/text_server_dummy.h
+++ b/engine/servers/text/text_server_dummy.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SERVER_DUMMY_H
-#define TEXT_SERVER_DUMMY_H
+#pragma once
 
 #include "servers/text/text_server_extension.h"
 
@@ -124,5 +123,3 @@ public:
 	virtual double shaped_text_get_underline_position(const RID &p_shaped) const override { return 0; }
 	virtual double shaped_text_get_underline_thickness(const RID &p_shaped) const override { return 0; }
 };
-
-#endif // TEXT_SERVER_DUMMY_H
diff --git a/engine/servers/text/text_server_extension.cpp b/engine/servers/text/text_server_extension.cpp
index b26dd4ea..c04c3fdc 100644
--- a/engine/servers/text/text_server_extension.cpp
+++ b/engine/servers/text/text_server_extension.cpp
@@ -108,6 +108,9 @@ void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_font_set_force_autohinter, "font_rid", "force_autohinter");
 	GDVIRTUAL_BIND(_font_is_force_autohinter, "font_rid");
 
+	GDVIRTUAL_BIND(_font_set_modulate_color_glyphs, "font_rid", "modulate");
+	GDVIRTUAL_BIND(_font_is_modulate_color_glyphs, "font_rid");
+
 	GDVIRTUAL_BIND(_font_set_hinting, "font_rid", "hinting");
 	GDVIRTUAL_BIND(_font_get_hinting, "font_rid");
 
@@ -265,12 +268,24 @@ void TextServerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_shaped_text_add_string, "shaped", "text", "fonts", "size", "opentype_features", "language", "meta");
 	GDVIRTUAL_BIND(_shaped_text_add_object, "shaped", "key", "size", "inline_align", "length", "baseline");
 	GDVIRTUAL_BIND(_shaped_text_resize_object, "shaped", "key", "size", "inline_align", "baseline");
+	GDVIRTUAL_BIND(_shaped_get_text, "shaped");
 
 	GDVIRTUAL_BIND(_shaped_get_span_count, "shaped");
 	GDVIRTUAL_BIND(_shaped_get_span_meta, "shaped", "index");
 	GDVIRTUAL_BIND(_shaped_get_span_embedded_object, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_span_text, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_span_object, "shaped", "index");
 	GDVIRTUAL_BIND(_shaped_set_span_update_font, "shaped", "index", "fonts", "size", "opentype_features");
 
+	GDVIRTUAL_BIND(_shaped_get_run_count, "shaped");
+	GDVIRTUAL_BIND(_shaped_get_run_text, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_run_range, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_run_font_rid, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_run_font_size, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_run_language, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_run_direction, "shaped", "index");
+	GDVIRTUAL_BIND(_shaped_get_run_object, "shaped", "index");
+
 	GDVIRTUAL_BIND(_shaped_text_substr, "shaped", "start", "length");
 	GDVIRTUAL_BIND(_shaped_text_get_parent, "shaped");
 
@@ -631,6 +646,16 @@ bool TextServerExtension::font_is_force_autohinter(const RID &p_font_rid) const
 	return ret;
 }
 
+void TextServerExtension::font_set_modulate_color_glyphs(const RID &p_font_rid, bool p_modulate) {
+	GDVIRTUAL_CALL(_font_set_modulate_color_glyphs, p_font_rid, p_modulate);
+}
+
+bool TextServerExtension::font_is_modulate_color_glyphs(const RID &p_font_rid) const {
+	bool ret = false;
+	GDVIRTUAL_CALL(_font_is_modulate_color_glyphs, p_font_rid, ret);
+	return ret;
+}
+
 void TextServerExtension::font_set_hinting(const RID &p_font_rid, TextServer::Hinting p_hinting) {
 	GDVIRTUAL_CALL(_font_set_hinting, p_font_rid, p_hinting);
 }
@@ -1181,6 +1206,12 @@ bool TextServerExtension::shaped_text_resize_object(const RID &p_shaped, const V
 	return ret;
 }
 
+String TextServerExtension::shaped_get_text(const RID &p_shaped) const {
+	String ret;
+	GDVIRTUAL_CALL(_shaped_get_text, p_shaped, ret);
+	return ret;
+}
+
 int64_t TextServerExtension::shaped_get_span_count(const RID &p_shaped) const {
 	int64_t ret = 0;
 	GDVIRTUAL_CALL(_shaped_get_span_count, p_shaped, ret);
@@ -1199,10 +1230,70 @@ Variant TextServerExtension::shaped_get_span_embedded_object(const RID &p_shaped
 	return ret;
 }
 
+String TextServerExtension::shaped_get_span_text(const RID &p_shaped, int64_t p_index) const {
+	String ret;
+	GDVIRTUAL_CALL(_shaped_get_span_text, p_shaped, p_index, ret);
+	return ret;
+}
+
+Variant TextServerExtension::shaped_get_span_object(const RID &p_shaped, int64_t p_index) const {
+	Variant ret = false;
+	GDVIRTUAL_CALL(_shaped_get_span_object, p_shaped, p_index, ret);
+	return ret;
+}
+
 void TextServerExtension::shaped_set_span_update_font(const RID &p_shaped, int64_t p_index, const TypedArray<RID> &p_fonts, int64_t p_size, const Dictionary &p_opentype_features) {
 	GDVIRTUAL_CALL(_shaped_set_span_update_font, p_shaped, p_index, p_fonts, p_size, p_opentype_features);
 }
 
+int64_t TextServerExtension::shaped_get_run_count(const RID &p_shaped) const {
+	int64_t ret = 0;
+	GDVIRTUAL_CALL(_shaped_get_run_count, p_shaped, ret);
+	return ret;
+}
+
+String TextServerExtension::shaped_get_run_text(const RID &p_shaped, int64_t p_index) const {
+	String ret;
+	GDVIRTUAL_CALL(_shaped_get_run_text, p_shaped, p_index, ret);
+	return ret;
+}
+
+Vector2i TextServerExtension::shaped_get_run_range(const RID &p_shaped, int64_t p_index) const {
+	Vector2i ret;
+	GDVIRTUAL_CALL(_shaped_get_run_range, p_shaped, p_index, ret);
+	return ret;
+}
+
+RID TextServerExtension::shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const {
+	RID ret;
+	GDVIRTUAL_CALL(_shaped_get_run_font_rid, p_shaped, p_index, ret);
+	return ret;
+}
+
+int TextServerExtension::shaped_get_run_font_size(const RID &p_shaped, int64_t p_index) const {
+	int ret = 0;
+	GDVIRTUAL_CALL(_shaped_get_run_font_size, p_shaped, p_index, ret);
+	return ret;
+}
+
+String TextServerExtension::shaped_get_run_language(const RID &p_shaped, int64_t p_index) const {
+	String ret;
+	GDVIRTUAL_CALL(_shaped_get_run_language, p_shaped, p_index, ret);
+	return ret;
+}
+
+TextServer::Direction TextServerExtension::shaped_get_run_direction(const RID &p_shaped, int64_t p_index) const {
+	TextServer::Direction ret = TextServer::DIRECTION_LTR;
+	GDVIRTUAL_CALL(_shaped_get_run_direction, p_shaped, p_index, ret);
+	return ret;
+}
+
+Variant TextServerExtension::shaped_get_run_object(const RID &p_shaped, int64_t p_index) const {
+	Variant ret;
+	GDVIRTUAL_CALL(_shaped_get_run_object, p_shaped, p_index, ret);
+	return ret;
+}
+
 RID TextServerExtension::shaped_text_substr(const RID &p_shaped, int64_t p_start, int64_t p_length) const {
 	RID ret;
 	GDVIRTUAL_CALL(_shaped_text_substr, p_shaped, p_start, p_length, ret);
diff --git a/engine/servers/text/text_server_extension.h b/engine/servers/text/text_server_extension.h
index 39e61d8a..b6b5333b 100644
--- a/engine/servers/text/text_server_extension.h
+++ b/engine/servers/text/text_server_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SERVER_EXTENSION_H
-#define TEXT_SERVER_EXTENSION_H
+#pragma once
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/os/thread_safe.h"
@@ -205,6 +204,11 @@ public:
 	GDVIRTUAL2(_font_set_force_autohinter, RID, bool);
 	GDVIRTUAL1RC(bool, _font_is_force_autohinter, RID);
 
+	virtual void font_set_modulate_color_glyphs(const RID &p_font_rid, bool p_modulate) override;
+	virtual bool font_is_modulate_color_glyphs(const RID &p_font_rid) const override;
+	GDVIRTUAL2(_font_set_modulate_color_glyphs, RID, bool);
+	GDVIRTUAL1RC(bool, _font_is_modulate_color_glyphs, RID);
+
 	virtual void font_set_hinting(const RID &p_font_rid, Hinting p_hinting) override;
 	virtual Hinting font_get_hinting(const RID &p_font_rid) const override;
 	GDVIRTUAL2(_font_set_hinting, RID, Hinting);
@@ -442,15 +446,39 @@ public:
 	GDVIRTUAL6R_REQUIRED(bool, _shaped_text_add_object, RID, const Variant &, const Size2 &, InlineAlignment, int64_t, double);
 	GDVIRTUAL5R_REQUIRED(bool, _shaped_text_resize_object, RID, const Variant &, const Size2 &, InlineAlignment, double);
 
+	virtual String shaped_get_text(const RID &p_shaped) const override;
+	GDVIRTUAL1RC_REQUIRED(String, _shaped_get_text, RID);
+
 	virtual int64_t shaped_get_span_count(const RID &p_shaped) const override;
 	virtual Variant shaped_get_span_meta(const RID &p_shaped, int64_t p_index) const override;
 	virtual Variant shaped_get_span_embedded_object(const RID &p_shaped, int64_t p_index) const override;
+	virtual String shaped_get_span_text(const RID &p_shaped, int64_t p_index) const override;
+	virtual Variant shaped_get_span_object(const RID &p_shaped, int64_t p_index) const override;
 	virtual void shaped_set_span_update_font(const RID &p_shaped, int64_t p_index, const TypedArray<RID> &p_fonts, int64_t p_size, const Dictionary &p_opentype_features = Dictionary()) override;
 	GDVIRTUAL1RC_REQUIRED(int64_t, _shaped_get_span_count, RID);
 	GDVIRTUAL2RC_REQUIRED(Variant, _shaped_get_span_meta, RID, int64_t);
 	GDVIRTUAL2RC_REQUIRED(Variant, _shaped_get_span_embedded_object, RID, int64_t);
+	GDVIRTUAL2RC_REQUIRED(String, _shaped_get_span_text, RID, int64_t);
+	GDVIRTUAL2RC_REQUIRED(Variant, _shaped_get_span_object, RID, int64_t);
 	GDVIRTUAL5_REQUIRED(_shaped_set_span_update_font, RID, int64_t, const TypedArray<RID> &, int64_t, const Dictionary &);
 
+	virtual int64_t shaped_get_run_count(const RID &p_shaped) const override;
+	virtual String shaped_get_run_text(const RID &p_shaped, int64_t p_index) const override;
+	virtual Vector2i shaped_get_run_range(const RID &p_shaped, int64_t p_index) const override;
+	virtual RID shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const override;
+	virtual int shaped_get_run_font_size(const RID &p_shaped, int64_t p_index) const override;
+	virtual String shaped_get_run_language(const RID &p_shaped, int64_t p_index) const override;
+	virtual Direction shaped_get_run_direction(const RID &p_shaped, int64_t p_index) const override;
+	virtual Variant shaped_get_run_object(const RID &p_shaped, int64_t p_index) const override;
+	GDVIRTUAL1RC(int64_t, _shaped_get_run_count, RID);
+	GDVIRTUAL2RC(String, _shaped_get_run_text, RID, int64_t);
+	GDVIRTUAL2RC(Vector2i, _shaped_get_run_range, RID, int64_t);
+	GDVIRTUAL2RC(RID, _shaped_get_run_font_rid, RID, int64_t);
+	GDVIRTUAL2RC(int, _shaped_get_run_font_size, RID, int64_t);
+	GDVIRTUAL2RC(String, _shaped_get_run_language, RID, int64_t);
+	GDVIRTUAL2RC(Direction, _shaped_get_run_direction, RID, int64_t);
+	GDVIRTUAL2RC(Variant, _shaped_get_run_object, RID, int64_t);
+
 	virtual RID shaped_text_substr(const RID &p_shaped, int64_t p_start, int64_t p_length) const override;
 	virtual RID shaped_text_get_parent(const RID &p_shaped) const override;
 	GDVIRTUAL3RC_REQUIRED(RID, _shaped_text_substr, RID, int64_t, int64_t);
@@ -598,5 +626,3 @@ public:
 	TextServerExtension();
 	~TextServerExtension();
 };
-
-#endif // TEXT_SERVER_EXTENSION_H
diff --git a/engine/servers/text_server.cpp b/engine/servers/text_server.cpp
index d6db1c70..cf2edbee 100644
--- a/engine/servers/text_server.cpp
+++ b/engine/servers/text_server.cpp
@@ -264,6 +264,9 @@ void TextServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("font_set_force_autohinter", "font_rid", "force_autohinter"), &TextServer::font_set_force_autohinter);
 	ClassDB::bind_method(D_METHOD("font_is_force_autohinter", "font_rid"), &TextServer::font_is_force_autohinter);
 
+	ClassDB::bind_method(D_METHOD("font_set_modulate_color_glyphs", "font_rid", "force_autohinter"), &TextServer::font_set_modulate_color_glyphs);
+	ClassDB::bind_method(D_METHOD("font_is_modulate_color_glyphs", "font_rid"), &TextServer::font_is_modulate_color_glyphs);
+
 	ClassDB::bind_method(D_METHOD("font_set_hinting", "font_rid", "hinting"), &TextServer::font_set_hinting);
 	ClassDB::bind_method(D_METHOD("font_get_hinting", "font_rid"), &TextServer::font_get_hinting);
 
@@ -421,12 +424,24 @@ void TextServer::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("shaped_text_add_string", "shaped", "text", "fonts", "size", "opentype_features", "language", "meta"), &TextServer::shaped_text_add_string, DEFVAL(Dictionary()), DEFVAL(""), DEFVAL(Variant()));
 	ClassDB::bind_method(D_METHOD("shaped_text_add_object", "shaped", "key", "size", "inline_align", "length", "baseline"), &TextServer::shaped_text_add_object, DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(1), DEFVAL(0.0));
 	ClassDB::bind_method(D_METHOD("shaped_text_resize_object", "shaped", "key", "size", "inline_align", "baseline"), &TextServer::shaped_text_resize_object, DEFVAL(INLINE_ALIGNMENT_CENTER), DEFVAL(0.0));
+	ClassDB::bind_method(D_METHOD("shaped_get_text", "shaped"), &TextServer::shaped_get_text);
 
 	ClassDB::bind_method(D_METHOD("shaped_get_span_count", "shaped"), &TextServer::shaped_get_span_count);
 	ClassDB::bind_method(D_METHOD("shaped_get_span_meta", "shaped", "index"), &TextServer::shaped_get_span_meta);
 	ClassDB::bind_method(D_METHOD("shaped_get_span_embedded_object", "shaped", "index"), &TextServer::shaped_get_span_embedded_object);
+	ClassDB::bind_method(D_METHOD("shaped_get_span_text", "shaped", "index"), &TextServer::shaped_get_span_text);
+	ClassDB::bind_method(D_METHOD("shaped_get_span_object", "shaped", "index"), &TextServer::shaped_get_span_object);
 	ClassDB::bind_method(D_METHOD("shaped_set_span_update_font", "shaped", "index", "fonts", "size", "opentype_features"), &TextServer::shaped_set_span_update_font, DEFVAL(Dictionary()));
 
+	ClassDB::bind_method(D_METHOD("shaped_get_run_count", "shaped"), &TextServer::shaped_get_run_count);
+	ClassDB::bind_method(D_METHOD("shaped_get_run_text", "shaped", "index"), &TextServer::shaped_get_run_text);
+	ClassDB::bind_method(D_METHOD("shaped_get_run_range", "shaped", "index"), &TextServer::shaped_get_run_range);
+	ClassDB::bind_method(D_METHOD("shaped_get_run_font_rid", "shaped", "index"), &TextServer::shaped_get_run_font_rid);
+	ClassDB::bind_method(D_METHOD("shaped_get_run_font_size", "shaped", "index"), &TextServer::shaped_get_run_font_size);
+	ClassDB::bind_method(D_METHOD("shaped_get_run_language", "shaped", "index"), &TextServer::shaped_get_run_language);
+	ClassDB::bind_method(D_METHOD("shaped_get_run_direction", "shaped", "index"), &TextServer::shaped_get_run_direction);
+	ClassDB::bind_method(D_METHOD("shaped_get_run_object", "shaped", "index"), &TextServer::shaped_get_run_object);
+
 	ClassDB::bind_method(D_METHOD("shaped_text_substr", "shaped", "start", "length"), &TextServer::shaped_text_substr);
 	ClassDB::bind_method(D_METHOD("shaped_text_get_parent", "shaped"), &TextServer::shaped_text_get_parent);
 	ClassDB::bind_method(D_METHOD("shaped_text_fit_to_width", "shaped", "width", "justification_flags"), &TextServer::shaped_text_fit_to_width, DEFVAL(JUSTIFICATION_WORD_BOUND | JUSTIFICATION_KASHIDA));
@@ -549,8 +564,12 @@ void TextServer::_bind_methods() {
 	BIND_BITFIELD_FLAG(BREAK_WORD_BOUND);
 	BIND_BITFIELD_FLAG(BREAK_GRAPHEME_BOUND);
 	BIND_BITFIELD_FLAG(BREAK_ADAPTIVE);
+#ifndef DISABLE_DEPRECATED
 	BIND_BITFIELD_FLAG(BREAK_TRIM_EDGE_SPACES);
+#endif
 	BIND_BITFIELD_FLAG(BREAK_TRIM_INDENT);
+	BIND_BITFIELD_FLAG(BREAK_TRIM_START_EDGE_SPACES);
+	BIND_BITFIELD_FLAG(BREAK_TRIM_END_EDGE_SPACES);
 
 	/* VisibleCharactersBehavior */
 	BIND_ENUM_CONSTANT(VC_CHARS_BEFORE_SHAPING);
@@ -565,6 +584,8 @@ void TextServer::_bind_methods() {
 	BIND_ENUM_CONSTANT(OVERRUN_TRIM_WORD);
 	BIND_ENUM_CONSTANT(OVERRUN_TRIM_ELLIPSIS);
 	BIND_ENUM_CONSTANT(OVERRUN_TRIM_WORD_ELLIPSIS);
+	BIND_ENUM_CONSTANT(OVERRUN_TRIM_ELLIPSIS_FORCE);
+	BIND_ENUM_CONSTANT(OVERRUN_TRIM_WORD_ELLIPSIS_FORCE);
 
 	/* TextOverrunFlag */
 	BIND_BITFIELD_FLAG(OVERRUN_NO_TRIM);
@@ -803,25 +824,42 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped
 	int last_safe_break = -1;
 	int word_count = 0;
 	int chunk = 0;
+	int prev_chunk = -1;
 	bool trim_next = false;
 
+#ifndef DISABLE_DEPRECATED
+	if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+		p_break_flags = p_break_flags | BREAK_TRIM_START_EDGE_SPACES | BREAK_TRIM_END_EDGE_SPACES;
+	}
+#endif
+
 	int l_size = shaped_text_get_glyph_count(p_shaped);
 	const Glyph *l_gl = const_cast<TextServer *>(this)->shaped_text_sort_logical(p_shaped);
 
+	int indent_end = 0;
 	double indent = 0.0;
-	if (p_break_flags.has_flag(BREAK_TRIM_INDENT)) {
-		for (int i = 0; i < l_size; i++) {
-			if ((l_gl[i].flags & GRAPHEME_IS_TAB) == GRAPHEME_IS_TAB || (l_gl[i].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE) {
-				indent += l_gl[i].advance * l_gl[i].repeat;
-			} else {
-				break;
-			}
-		}
-	}
 
 	for (int i = 0; i < l_size; i++) {
 		double l_width = p_width[chunk];
-		if (l_width > indent) {
+
+		if (p_break_flags.has_flag(BREAK_TRIM_INDENT) && chunk != prev_chunk) {
+			indent = 0.0;
+			for (int j = indent_end; j < l_size; j++) {
+				if ((l_gl[j].flags & GRAPHEME_IS_TAB) == GRAPHEME_IS_TAB || (l_gl[j].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE) {
+					if (indent + l_gl[j].advance * l_gl[j].repeat > l_width) {
+						indent = 0.0;
+					}
+					indent += l_gl[j].advance * l_gl[j].repeat;
+					indent_end = l_gl[j].end;
+				} else {
+					break;
+				}
+			}
+			indent = MIN(indent, 0.6 * l_width);
+			prev_chunk = chunk;
+		}
+
+		if (l_width > indent && i > indent_end) {
 			l_width -= indent;
 		}
 		if (l_gl[i].start < p_start) {
@@ -835,13 +873,13 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped
 			}
 			if ((l_width > 0) && (width + adv > l_width) && (last_safe_break >= 0)) {
 				int cur_safe_brk = last_safe_break;
-				if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+				if (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) || p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES)) {
 					int start_pos = prev_safe_break;
 					int end_pos = last_safe_break;
-					while (trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+					while (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) && trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 						start_pos += l_gl[start_pos].count;
 					}
-					while ((start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+					while (p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES) && (start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 						end_pos -= l_gl[end_pos].count;
 					}
 					if (last_end <= l_gl[start_pos].start) {
@@ -879,13 +917,13 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped
 			if (p_break_flags.has_flag(BREAK_MANDATORY)) {
 				if ((l_gl[i].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD) {
 					int cur_safe_brk = i;
-					if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+					if (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) || p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES)) {
 						int start_pos = prev_safe_break;
 						int end_pos = i;
-						while (trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+						while (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) && trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 							start_pos += l_gl[start_pos].count;
 						}
-						while ((start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+						while (p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES) && (start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 							end_pos -= l_gl[end_pos].count;
 						}
 						if (last_end <= l_gl[start_pos].start) {
@@ -939,8 +977,8 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks_adv(const RID &p_shaped
 	}
 
 	if (l_size > 0) {
-		if (lines.size() == 0 || (lines[lines.size() - 1] < range.y && prev_safe_break < l_size)) {
-			if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+		if (lines.is_empty() || (lines[lines.size() - 1] < range.y && prev_safe_break < l_size)) {
+			if (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES)) {
 				int start_pos = (prev_safe_break < l_size) ? prev_safe_break : l_size - 1;
 				if (last_end <= l_gl[start_pos].start) {
 					int end_pos = l_size - 1;
@@ -978,19 +1016,31 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 	int word_count = 0;
 	bool trim_next = false;
 
+#ifndef DISABLE_DEPRECATED
+	if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+		p_break_flags = p_break_flags | BREAK_TRIM_START_EDGE_SPACES | BREAK_TRIM_END_EDGE_SPACES;
+	}
+#endif
+
 	TextServer::Orientation orientation = shaped_text_get_orientation(p_shaped);
 	int l_size = shaped_text_get_glyph_count(p_shaped);
 	const Glyph *l_gl = const_cast<TextServer *>(this)->shaped_text_sort_logical(p_shaped);
 
+	int indent_end = 0;
 	double indent = 0.0;
 	if (p_break_flags.has_flag(BREAK_TRIM_INDENT)) {
 		for (int i = 0; i < l_size; i++) {
 			if ((l_gl[i].flags & GRAPHEME_IS_TAB) == GRAPHEME_IS_TAB || (l_gl[i].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE) {
+				if (indent + l_gl[i].advance * l_gl[i].repeat > p_width) {
+					indent = 0.0;
+				}
 				indent += l_gl[i].advance * l_gl[i].repeat;
+				indent_end = l_gl[i].end;
 			} else {
 				break;
 			}
 		}
+		indent = MIN(indent, 0.6 * p_width);
 	}
 
 	double l_width = p_width;
@@ -1006,19 +1056,19 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 			}
 			if ((l_width > 0) && (width + adv > l_width) && (last_safe_break >= 0)) {
 				int cur_safe_brk = last_safe_break;
-				if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+				if (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) || p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES)) {
 					int start_pos = prev_safe_break;
 					int end_pos = last_safe_break;
-					while (trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+					while (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) && trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 						start_pos += l_gl[start_pos].count;
 					}
-					while ((start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+					while (p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES) && (start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SOFT_HYPHEN) != GRAPHEME_IS_SOFT_HYPHEN) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 						end_pos -= l_gl[end_pos].count;
 					}
 					if (last_end <= l_gl[start_pos].start) {
 						lines.push_back(l_gl[start_pos].start);
 						lines.push_back(l_gl[end_pos].end);
-						if (p_width > indent) {
+						if (p_width > indent && i > indent_end) {
 							l_width = p_width - indent;
 						}
 						cur_safe_brk = last_safe_break;
@@ -1029,7 +1079,7 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 					if (last_end <= line_start) {
 						lines.push_back(line_start);
 						lines.push_back(l_gl[last_safe_break].end);
-						if (p_width > indent) {
+						if (p_width > indent && i > indent_end) {
 							l_width = p_width - indent;
 						}
 						last_end = l_gl[last_safe_break].end;
@@ -1049,20 +1099,20 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 			if (p_break_flags.has_flag(BREAK_MANDATORY)) {
 				if ((l_gl[i].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD) {
 					int cur_safe_brk = i;
-					if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+					if (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) || p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES)) {
 						int start_pos = prev_safe_break;
 						int end_pos = i;
-						while (trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+						while (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES) && trim_next && (start_pos < end_pos) && ((l_gl[start_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[start_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 							start_pos += l_gl[start_pos].count;
 						}
-						while ((start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
+						while (p_break_flags.has_flag(BREAK_TRIM_END_EDGE_SPACES) && (start_pos < end_pos) && ((l_gl[end_pos].flags & GRAPHEME_IS_SPACE) == GRAPHEME_IS_SPACE || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_HARD) == GRAPHEME_IS_BREAK_HARD || (l_gl[end_pos].flags & GRAPHEME_IS_BREAK_SOFT) == GRAPHEME_IS_BREAK_SOFT)) {
 							end_pos -= l_gl[end_pos].count;
 						}
 						trim_next = true;
 						if (last_end <= l_gl[start_pos].start) {
 							lines.push_back(l_gl[start_pos].start);
 							lines.push_back(l_gl[end_pos].end);
-							if (p_width > indent) {
+							if (p_width > indent && i > indent_end) {
 								l_width = p_width - indent;
 							}
 							last_end = l_gl[i].end;
@@ -1072,7 +1122,7 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 						if (last_end <= line_start) {
 							lines.push_back(line_start);
 							lines.push_back(l_gl[i].end);
-							if (p_width > indent) {
+							if (p_width > indent && i > indent_end) {
 								l_width = p_width - indent;
 							}
 							last_end = l_gl[i].end;
@@ -1114,8 +1164,8 @@ PackedInt32Array TextServer::shaped_text_get_line_breaks(const RID &p_shaped, do
 	}
 
 	if (l_size > 0) {
-		if (lines.size() == 0 || (lines[lines.size() - 1] < range.y && prev_safe_break < l_size)) {
-			if (p_break_flags.has_flag(BREAK_TRIM_EDGE_SPACES)) {
+		if (lines.is_empty() || (lines[lines.size() - 1] < range.y && prev_safe_break < l_size)) {
+			if (p_break_flags.has_flag(BREAK_TRIM_START_EDGE_SPACES)) {
 				int start_pos = (prev_safe_break < l_size) ? prev_safe_break : l_size - 1;
 				if (last_end <= l_gl[start_pos].start) {
 					int end_pos = l_size - 1;
diff --git a/engine/servers/text_server.h b/engine/servers/text_server.h
index 7f5211bb..191c41a7 100644
--- a/engine/servers/text_server.h
+++ b/engine/servers/text_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEXT_SERVER_H
-#define TEXT_SERVER_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/object/ref_counted.h"
@@ -109,8 +108,16 @@ public:
 		BREAK_WORD_BOUND = 1 << 1,
 		BREAK_GRAPHEME_BOUND = 1 << 2,
 		BREAK_ADAPTIVE = 1 << 3,
+#ifndef DISABLE_DEPRECATED
 		BREAK_TRIM_EDGE_SPACES = 1 << 4,
+#else
+	// RESERVED = 1 << 4,
+#endif
 		BREAK_TRIM_INDENT = 1 << 5,
+		BREAK_TRIM_START_EDGE_SPACES = 1 << 6,
+		BREAK_TRIM_END_EDGE_SPACES = 1 << 7,
+
+		BREAK_TRIM_MASK = BREAK_TRIM_INDENT | BREAK_TRIM_START_EDGE_SPACES | BREAK_TRIM_END_EDGE_SPACES,
 	};
 
 	enum OverrunBehavior {
@@ -119,6 +126,8 @@ public:
 		OVERRUN_TRIM_WORD,
 		OVERRUN_TRIM_ELLIPSIS,
 		OVERRUN_TRIM_WORD_ELLIPSIS,
+		OVERRUN_TRIM_ELLIPSIS_FORCE,
+		OVERRUN_TRIM_WORD_ELLIPSIS_FORCE,
 	};
 
 	enum TextOverrunFlag {
@@ -309,6 +318,9 @@ public:
 	virtual void font_set_force_autohinter(const RID &p_font_rid, bool p_force_autohinter) = 0;
 	virtual bool font_is_force_autohinter(const RID &p_font_rid) const = 0;
 
+	virtual void font_set_modulate_color_glyphs(const RID &p_font_rid, bool p_modulate) = 0;
+	virtual bool font_is_modulate_color_glyphs(const RID &p_font_rid) const = 0;
+
 	virtual void font_set_hinting(const RID &p_font_rid, Hinting p_hinting) = 0;
 	virtual Hinting font_get_hinting(const RID &p_font_rid) const = 0;
 
@@ -465,12 +477,24 @@ public:
 	virtual bool shaped_text_add_string(const RID &p_shaped, const String &p_text, const TypedArray<RID> &p_fonts, int64_t p_size, const Dictionary &p_opentype_features = Dictionary(), const String &p_language = "", const Variant &p_meta = Variant()) = 0;
 	virtual bool shaped_text_add_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align = INLINE_ALIGNMENT_CENTER, int64_t p_length = 1, double p_baseline = 0.0) = 0;
 	virtual bool shaped_text_resize_object(const RID &p_shaped, const Variant &p_key, const Size2 &p_size, InlineAlignment p_inline_align = INLINE_ALIGNMENT_CENTER, double p_baseline = 0.0) = 0;
+	virtual String shaped_get_text(const RID &p_shaped) const = 0;
 
 	virtual int64_t shaped_get_span_count(const RID &p_shaped) const = 0;
 	virtual Variant shaped_get_span_meta(const RID &p_shaped, int64_t p_index) const = 0;
 	virtual Variant shaped_get_span_embedded_object(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual String shaped_get_span_text(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual Variant shaped_get_span_object(const RID &p_shaped, int64_t p_index) const = 0;
 	virtual void shaped_set_span_update_font(const RID &p_shaped, int64_t p_index, const TypedArray<RID> &p_fonts, int64_t p_size, const Dictionary &p_opentype_features = Dictionary()) = 0;
 
+	virtual int64_t shaped_get_run_count(const RID &p_shaped) const = 0;
+	virtual String shaped_get_run_text(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual Vector2i shaped_get_run_range(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual RID shaped_get_run_font_rid(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual int shaped_get_run_font_size(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual String shaped_get_run_language(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual Direction shaped_get_run_direction(const RID &p_shaped, int64_t p_index) const = 0;
+	virtual Variant shaped_get_run_object(const RID &p_shaped, int64_t p_index) const = 0;
+
 	virtual RID shaped_text_substr(const RID &p_shaped, int64_t p_start, int64_t p_length) const = 0; // Copy shaped substring (e.g. line break) without reshaping, but correctly reordered, preservers range.
 	virtual RID shaped_text_get_parent(const RID &p_shaped) const = 0;
 
@@ -668,5 +692,3 @@ VARIANT_ENUM_CAST(TextServer::FixedSizeScaleMode);
 
 GDVIRTUAL_NATIVE_PTR(Glyph);
 GDVIRTUAL_NATIVE_PTR(CaretInfo);
-
-#endif // TEXT_SERVER_H
diff --git a/engine/servers/xr/xr_body_tracker.h b/engine/servers/xr/xr_body_tracker.h
index 544de8ca..dbf8b30a 100644
--- a/engine/servers/xr/xr_body_tracker.h
+++ b/engine/servers/xr/xr_body_tracker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_BODY_TRACKER_H
-#define XR_BODY_TRACKER_H
+#pragma once
 
 #include "servers/xr/xr_positional_tracker.h"
 
@@ -162,7 +161,7 @@ protected:
 
 private:
 	bool has_tracking_data = false;
-	BitField<BodyFlags> body_flags;
+	BitField<BodyFlags> body_flags = {};
 
 	BitField<JointFlags> joint_flags[JOINT_MAX];
 	Transform3D joint_transforms[JOINT_MAX];
@@ -171,5 +170,3 @@ private:
 VARIANT_BITFIELD_CAST(XRBodyTracker::BodyFlags)
 VARIANT_ENUM_CAST(XRBodyTracker::Joint)
 VARIANT_BITFIELD_CAST(XRBodyTracker::JointFlags)
-
-#endif // XR_BODY_TRACKER_H
diff --git a/engine/servers/xr/xr_controller_tracker.h b/engine/servers/xr/xr_controller_tracker.h
index a443cc1f..b4b300bf 100644
--- a/engine/servers/xr/xr_controller_tracker.h
+++ b/engine/servers/xr/xr_controller_tracker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_CONTROLLER_TRACKER_H
-#define XR_CONTROLLER_TRACKER_H
+#pragma once
 
 #include "core/os/thread_safe.h"
 #include "servers/xr/xr_positional_tracker.h"
@@ -48,5 +47,3 @@ protected:
 public:
 	XRControllerTracker();
 };
-
-#endif // XR_CONTROLLER_TRACKER_H
diff --git a/engine/servers/xr/xr_face_tracker.h b/engine/servers/xr/xr_face_tracker.h
index a753a7ab..cbb6f1f6 100644
--- a/engine/servers/xr/xr_face_tracker.h
+++ b/engine/servers/xr/xr_face_tracker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_FACE_TRACKER_H
-#define XR_FACE_TRACKER_H
+#pragma once
 
 #include "servers/xr/xr_tracker.h"
 
@@ -213,5 +212,3 @@ private:
 };
 
 VARIANT_ENUM_CAST(XRFaceTracker::BlendShapeEntry);
-
-#endif // XR_FACE_TRACKER_H
diff --git a/engine/servers/xr/xr_hand_tracker.h b/engine/servers/xr/xr_hand_tracker.h
index 7837df3e..ef38b41c 100644
--- a/engine/servers/xr/xr_hand_tracker.h
+++ b/engine/servers/xr/xr_hand_tracker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_HAND_TRACKER_H
-#define XR_HAND_TRACKER_H
+#pragma once
 
 #include "servers/xr/xr_positional_tracker.h"
 
@@ -128,5 +127,3 @@ private:
 VARIANT_ENUM_CAST(XRHandTracker::HandTrackingSource)
 VARIANT_ENUM_CAST(XRHandTracker::HandJoint)
 VARIANT_BITFIELD_CAST(XRHandTracker::HandJointFlags)
-
-#endif // XR_HAND_TRACKER_H
diff --git a/engine/servers/xr/xr_interface.cpp b/engine/servers/xr/xr_interface.cpp
index 0f792d4f..30a98286 100644
--- a/engine/servers/xr/xr_interface.cpp
+++ b/engine/servers/xr/xr_interface.cpp
@@ -103,6 +103,7 @@ void XRInterface::_bind_methods() {
 	BIND_ENUM_CONSTANT(XR_PLAY_AREA_SITTING);
 	BIND_ENUM_CONSTANT(XR_PLAY_AREA_ROOMSCALE);
 	BIND_ENUM_CONSTANT(XR_PLAY_AREA_STAGE);
+	BIND_ENUM_CONSTANT(XR_PLAY_AREA_CUSTOM);
 
 	BIND_ENUM_CONSTANT(XR_ENV_BLEND_MODE_OPAQUE);
 	BIND_ENUM_CONSTANT(XR_ENV_BLEND_MODE_ADDITIVE);
@@ -218,7 +219,6 @@ void XRInterface::trigger_haptic_pulse(const String &p_action_name, const String
 }
 
 Array XRInterface::get_supported_environment_blend_modes() {
-	Array default_blend_modes;
-	default_blend_modes.push_back(XR_ENV_BLEND_MODE_OPAQUE);
+	Array default_blend_modes = { XR_ENV_BLEND_MODE_OPAQUE };
 	return default_blend_modes;
 }
diff --git a/engine/servers/xr/xr_interface.h b/engine/servers/xr/xr_interface.h
index 38e44247..b669f6eb 100644
--- a/engine/servers/xr/xr_interface.h
+++ b/engine/servers/xr/xr_interface.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_INTERFACE_H
-#define XR_INTERFACE_H
+#pragma once
 
 #include "core/math/projection.h"
 #include "core/os/thread_safe.h"
@@ -77,6 +76,7 @@ public:
 		XR_PLAY_AREA_SITTING, /* Player is in seated position, limited positional tracking, fixed guardian around player */
 		XR_PLAY_AREA_ROOMSCALE, /* Player is free to move around, full positional tracking */
 		XR_PLAY_AREA_STAGE, /* Same as roomscale but origin point is fixed to the center of the physical space */
+		XR_PLAY_AREA_CUSTOM = 0x7FFFFFFF, /* Used to denote that a custom, possibly non-standard, play area is being used */
 	};
 
 	enum EnvironmentBlendMode {
@@ -168,5 +168,3 @@ VARIANT_ENUM_CAST(XRInterface::Capabilities);
 VARIANT_ENUM_CAST(XRInterface::TrackingStatus);
 VARIANT_ENUM_CAST(XRInterface::PlayAreaMode);
 VARIANT_ENUM_CAST(XRInterface::EnvironmentBlendMode);
-
-#endif // XR_INTERFACE_H
diff --git a/engine/servers/xr/xr_interface_extension.h b/engine/servers/xr/xr_interface_extension.h
index 5ec19a97..ebf98c8f 100644
--- a/engine/servers/xr/xr_interface_extension.h
+++ b/engine/servers/xr/xr_interface_extension.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_INTERFACE_EXTENSION_H
-#define XR_INTERFACE_EXTENSION_H
+#pragma once
 
 #include "servers/xr/xr_interface.h"
 
@@ -136,5 +135,3 @@ public:
 	RID get_render_target_texture(RID p_render_target);
 	// RID get_render_target_depth(RID p_render_target);
 };
-
-#endif // XR_INTERFACE_EXTENSION_H
diff --git a/engine/servers/xr/xr_pose.h b/engine/servers/xr/xr_pose.h
index 3575afd2..647ad1a0 100644
--- a/engine/servers/xr/xr_pose.h
+++ b/engine/servers/xr/xr_pose.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_POSE_H
-#define XR_POSE_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 
@@ -77,5 +76,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(XRPose::TrackingConfidence);
-
-#endif // XR_POSE_H
diff --git a/engine/servers/xr/xr_positional_tracker.h b/engine/servers/xr/xr_positional_tracker.h
index 8e36dfca..8a927273 100644
--- a/engine/servers/xr/xr_positional_tracker.h
+++ b/engine/servers/xr/xr_positional_tracker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_POSITIONAL_TRACKER_H
-#define XR_POSITIONAL_TRACKER_H
+#pragma once
 
 #include "core/os/thread_safe.h"
 #include "servers/xr/xr_pose.h"
@@ -80,5 +79,3 @@ public:
 };
 
 VARIANT_ENUM_CAST(XRPositionalTracker::TrackerHand);
-
-#endif // XR_POSITIONAL_TRACKER_H
diff --git a/engine/servers/xr/xr_tracker.h b/engine/servers/xr/xr_tracker.h
index 3348e164..ae7ed6d4 100644
--- a/engine/servers/xr/xr_tracker.h
+++ b/engine/servers/xr/xr_tracker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_TRACKER_H
-#define XR_TRACKER_H
+#pragma once
 
 #include "core/os/thread_safe.h"
 #include "servers/xr_server.h"
@@ -57,5 +56,3 @@ public:
 	void set_tracker_desc(const String &p_desc);
 	String get_tracker_desc() const;
 };
-
-#endif // XR_TRACKER_H
diff --git a/engine/servers/xr/xr_vrs.cpp b/engine/servers/xr/xr_vrs.cpp
index 8edefda8..ff4b09df 100644
--- a/engine/servers/xr/xr_vrs.cpp
+++ b/engine/servers/xr/xr_vrs.cpp
@@ -104,13 +104,12 @@ void XRVRS::set_vrs_render_region(const Rect2i &p_vrs_render_region) {
 RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array &p_eye_foci) {
 	ERR_FAIL_COND_V(p_eye_foci.is_empty(), RID());
 
-	int32_t texel_width = RD::get_singleton()->limit_get(RD::LIMIT_VRS_TEXEL_WIDTH);
-	int32_t texel_height = RD::get_singleton()->limit_get(RD::LIMIT_VRS_TEXEL_HEIGHT);
+	Size2i texel_size = RD::get_singleton()->vrs_get_texel_size();
 
 	// Should return sensible data or graphics API does not support VRS.
-	ERR_FAIL_COND_V(texel_width < 1 || texel_height < 1, RID());
+	ERR_FAIL_COND_V(texel_size.x < 1 || texel_size.y < 1, RID());
 
-	Size2 vrs_size = Size2(0.5 + p_target_size.x / texel_width, 0.5 + p_target_size.y / texel_height).round();
+	Size2 vrs_size = Size2(0.5 + p_target_size.x / texel_size.x, 0.5 + p_target_size.y / texel_size.y).floor();
 
 	// Make sure we have at least one pixel.
 	vrs_size = vrs_size.maxf(1.0);
@@ -150,16 +149,18 @@ RID XRVRS::make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array
 
 			Vector2i view_center;
 			view_center.x = int(vrs_size.x * (eye_foci[i].x + 1.0) * region_ratio.x * 0.5) + region_offset.x;
-			view_center.y = int(vrs_size.y * (eye_foci[i].y + 1.0) * region_ratio.y * 0.5) + region_offset.y;
+			view_center.y = int(vrs_size.y * (-eye_foci[i].y + 1.0) * region_ratio.y * 0.5) + region_offset.y;
 
 			int d = 0;
 			for (int y = 0; y < vrs_sizei.y; y++) {
 				for (int x = 0; x < vrs_sizei.x; x++) {
+					// Generate a density map that represents the distance to the view focus point. While this leaves the opportunities
+					// offered by the density map being different in each direction currently unused, it was found to give better tile
+					// distribution on hardware that supports the feature natively. This area is open to improvements in the future.
 					Vector2 offset = Vector2(x - view_center.x, y - view_center.y) / region_ratio;
-					real_t density = 255.0 * MAX(0.0, (Math::abs(offset.x) - min_radius) / outer_radius);
-					data_ptr[d++] = MIN(255, density);
-					density = 255.0 * MAX(0.0, (Math::abs(offset.y) - min_radius) / outer_radius);
-					data_ptr[d++] = MIN(255, density);
+					real_t density = MAX(offset.length() - min_radius, 0.0) / outer_radius;
+					data_ptr[d++] = CLAMP(255.0 * density, 0, 255);
+					data_ptr[d++] = CLAMP(255.0 * density, 0, 255);
 				}
 			}
 			images.push_back(Image::create_from_data(vrs_sizei.x, vrs_sizei.y, false, Image::FORMAT_RG8, data));
diff --git a/engine/servers/xr/xr_vrs.h b/engine/servers/xr/xr_vrs.h
index b3b22537..231124c1 100644
--- a/engine/servers/xr/xr_vrs.h
+++ b/engine/servers/xr/xr_vrs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_VRS_H
-#define XR_VRS_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/object.h"
@@ -66,5 +65,3 @@ public:
 
 	RID make_vrs_texture(const Size2 &p_target_size, const PackedVector2Array &p_eye_foci);
 };
-
-#endif // XR_VRS_H
diff --git a/engine/servers/xr_server.cpp b/engine/servers/xr_server.cpp
index cd28ee8b..2b741164 100644
--- a/engine/servers/xr_server.cpp
+++ b/engine/servers/xr_server.cpp
@@ -389,7 +389,7 @@ PackedStringArray XRServer::get_suggested_tracker_names() const {
 		}
 	}
 
-	if (arr.size() == 0) {
+	if (arr.is_empty()) {
 		// no suggestions from our tracker? include our defaults
 		arr.push_back(String("head"));
 		arr.push_back(String("left_hand"));
@@ -412,7 +412,7 @@ PackedStringArray XRServer::get_suggested_pose_names(const StringName &p_tracker
 		}
 	}
 
-	if (arr.size() == 0) {
+	if (arr.is_empty()) {
 		// no suggestions from our tracker? include our defaults
 		arr.push_back(String("default"));
 
diff --git a/engine/servers/xr_server.h b/engine/servers/xr_server.h
index ee36f2d9..98fc751a 100644
--- a/engine/servers/xr_server.h
+++ b/engine/servers/xr_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef XR_SERVER_H
-#define XR_SERVER_H
+#pragma once
 
 #include "core/object/ref_counted.h"
 #include "core/os/thread_safe.h"
@@ -252,5 +251,3 @@ public:
 
 VARIANT_ENUM_CAST(XRServer::TrackerType);
 VARIANT_ENUM_CAST(XRServer::RotationMode);
-
-#endif // XR_SERVER_H
diff --git a/engine/tests/core/config/test_project_settings.h b/engine/tests/core/config/test_project_settings.h
index 5a000b19..4daaf367 100644
--- a/engine/tests/core/config/test_project_settings.h
+++ b/engine/tests/core/config/test_project_settings.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PROJECT_SETTINGS_H
-#define TEST_PROJECT_SETTINGS_H
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
@@ -113,7 +112,7 @@ TEST_CASE("[ProjectSettings] localize_path") {
 	TestProjectSettingsInternalsAccessor::resource_path() = DirAccess::create(DirAccess::ACCESS_FILESYSTEM)->get_current_dir();
 	String root_path = ProjectSettings::get_singleton()->get_resource_path();
 #ifdef WINDOWS_ENABLED
-	String root_path_win = ProjectSettings::get_singleton()->get_resource_path().replace("/", "\\");
+	String root_path_win = ProjectSettings::get_singleton()->get_resource_path().replace_char('/', '\\');
 #endif
 
 	CHECK_EQ(ProjectSettings::get_singleton()->localize_path("filename"), "res://filename");
@@ -160,5 +159,3 @@ TEST_CASE("[ProjectSettings] localize_path") {
 }
 
 } // namespace TestProjectSettings
-
-#endif // TEST_PROJECT_SETTINGS_H
diff --git a/engine/tests/core/input/test_input_event.h b/engine/tests/core/input/test_input_event.h
index c6a287e4..094bb674 100644
--- a/engine/tests/core/input/test_input_event.h
+++ b/engine/tests/core/input/test_input_event.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_INPUT_EVENT_H
-#define TEST_INPUT_EVENT_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/math/rect2.h"
@@ -44,10 +43,8 @@ TEST_CASE("[InputEvent] Signal is emitted when device is changed") {
 	input_event.instantiate();
 
 	SIGNAL_WATCH(*input_event, CoreStringName(changed));
-	Array args1;
-	Array empty_args;
-	empty_args.push_back(args1);
 
+	Array empty_args = { {} };
 	input_event->set_device(1);
 
 	SIGNAL_CHECK("changed", empty_args);
@@ -111,5 +108,3 @@ TEST_CASE("[InputEvent] Test xformed_by") {
 	CHECK(iemm2->get_position().is_equal_approx(Vector2(2.0f, 3.0f)));
 }
 } // namespace TestInputEvent
-
-#endif // TEST_INPUT_EVENT_H
diff --git a/engine/tests/core/input/test_input_event_key.h b/engine/tests/core/input/test_input_event_key.h
index 80918542..51d99102 100644
--- a/engine/tests/core/input/test_input_event_key.h
+++ b/engine/tests/core/input/test_input_event_key.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_INPUT_EVENT_KEY_H
-#define TEST_INPUT_EVENT_KEY_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/os/keyboard.h"
@@ -335,5 +334,3 @@ TEST_CASE("[IsMatch] Keys are correctly matched") {
 	CHECK(key3.is_match(loc_ref, false) == true);
 }
 } // namespace TestInputEventKey
-
-#endif // TEST_INPUT_EVENT_KEY_H
diff --git a/engine/tests/core/input/test_input_event_mouse.h b/engine/tests/core/input/test_input_event_mouse.h
index 0da4f141..0fa0f8dc 100644
--- a/engine/tests/core/input/test_input_event_mouse.h
+++ b/engine/tests/core/input/test_input_event_mouse.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_INPUT_EVENT_MOUSE_H
-#define TEST_INPUT_EVENT_MOUSE_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "tests/test_macros.h"
@@ -77,5 +76,3 @@ TEST_CASE("[InputEventMouse] Setting the global mouse position works correctly")
 	CHECK(mousekey.get_global_position() != Vector2{ 1, 1 });
 }
 } // namespace TestInputEventMouse
-
-#endif // TEST_INPUT_EVENT_MOUSE_H
diff --git a/engine/tests/core/input/test_shortcut.h b/engine/tests/core/input/test_shortcut.h
index eaa4400b..7c1acfbf 100644
--- a/engine/tests/core/input/test_shortcut.h
+++ b/engine/tests/core/input/test_shortcut.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_SHORTCUT_H
-#define TEST_SHORTCUT_H
+#pragma once
 
 #include "core/input/input_event.h"
 #include "core/input/shortcut.h"
@@ -61,10 +60,7 @@ TEST_CASE("[Shortcut] Setting and getting an event should result in the same eve
 	// Cast to InputEvent so the internal code recognizes the objects.
 	Ref<InputEvent> e1 = k1;
 	Ref<InputEvent> e2 = k2;
-
-	Array input_array;
-	input_array.append(e1);
-	input_array.append(e2);
+	Array input_array = { e1, e2 };
 
 	Shortcut s;
 	s.set_events(input_array);
@@ -132,8 +128,7 @@ TEST_CASE("[Shortcut] 'matches_event' should correctly match the same event") {
 	Ref<InputEvent> e_different = different;
 	Ref<InputEvent> e_copy = copy;
 
-	Array a;
-	a.append(e_original);
+	Array a = { e_original };
 	Shortcut s;
 	s.set_events(a);
 
@@ -155,9 +150,7 @@ TEST_CASE("[Shortcut] 'get_as_text' text representation should be correct") {
 	different->set_keycode(Key::ESCAPE);
 
 	Ref<InputEvent> key_event1 = same;
-
-	Array a;
-	a.append(key_event1);
+	Array a = { key_event1 };
 	Shortcut s;
 	s.set_events(a);
 
@@ -176,17 +169,14 @@ TEST_CASE("[Shortcut] Event validity should be correctly checked.") {
 	Ref<InputEvent> valid_event = valid;
 	Ref<InputEvent> invalid_event = invalid;
 
-	Array a;
-	a.append(invalid_event);
-	a.append(valid_event);
+	Array a = { invalid_event, valid_event };
 
 	Shortcut s;
 	s.set_events(a);
 
 	CHECK(s.has_valid_event() == true);
 
-	Array b;
-	b.append(invalid_event);
+	Array b = { invalid_event };
 
 	Shortcut shortcut_with_invalid_event;
 	shortcut_with_invalid_event.set_events(b);
@@ -214,13 +204,8 @@ TEST_CASE("[Shortcut] Equal arrays should be recognized as such.") {
 	Array same_as_same;
 	same_as_same.append(key_event1);
 
-	Array different1;
-	different1.append(key_event2);
-
-	Array different2;
-	different2.append(key_event1);
-	different2.append(key_event2);
-
+	Array different1 = { key_event2 };
+	Array different2 = { key_event1, key_event2 };
 	Array different3;
 
 	Shortcut s;
@@ -231,5 +216,3 @@ TEST_CASE("[Shortcut] Equal arrays should be recognized as such.") {
 	CHECK(s.is_event_array_equal(same, different3) == false);
 }
 } // namespace TestShortcut
-
-#endif // TEST_SHORTCUT_H
diff --git a/engine/tests/core/io/test_config_file.h b/engine/tests/core/io/test_config_file.h
index a669906b..c17f9c9c 100644
--- a/engine/tests/core/io/test_config_file.h
+++ b/engine/tests/core/io/test_config_file.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CONFIG_FILE_H
-#define TEST_CONFIG_FILE_H
+#pragma once
 
 #include "core/io/config_file.h"
 #include "core/os/os.h"
@@ -160,5 +159,3 @@ antiAliasing=false
 			"The saved configuration file should match the expected format.");
 }
 } // namespace TestConfigFile
-
-#endif // TEST_CONFIG_FILE_H
diff --git a/engine/tests/core/io/test_file_access.h b/engine/tests/core/io/test_file_access.h
index e0a5f6cf..95debc19 100644
--- a/engine/tests/core/io/test_file_access.h
+++ b/engine/tests/core/io/test_file_access.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_FILE_ACCESS_H
-#define TEST_FILE_ACCESS_H
+#pragma once
 
 #include "core/io/file_access.h"
 #include "tests/test_macros.h"
@@ -197,8 +196,28 @@ TEST_CASE("[FileAccess] Get/Store floating point half precision values") {
 
 		DirAccess::remove_file_or_error(file_path_new);
 	}
+
+	SUBCASE("4096 bytes fastlz compressed") {
+		const String file_path = TestUtils::get_data_path("exactly_4096_bytes_fastlz.bin");
+
+		Ref<FileAccess> f = FileAccess::open_compressed(file_path, FileAccess::READ, FileAccess::COMPRESSION_FASTLZ);
+		const Vector<uint8_t> full_data = f->get_buffer(4096 * 2);
+		CHECK(full_data.size() == 4096);
+		CHECK(f->eof_reached());
+
+		// Data should be empty.
+		PackedByteArray reference;
+		reference.resize_zeroed(4096);
+		CHECK(reference == full_data);
+
+		f->seek(0);
+		const Vector<uint8_t> partial_data = f->get_buffer(4095);
+		CHECK(partial_data.size() == 4095);
+		CHECK(!f->eof_reached());
+
+		reference.resize_zeroed(4095);
+		CHECK(reference == partial_data);
+	}
 }
 
 } // namespace TestFileAccess
-
-#endif // TEST_FILE_ACCESS_H
diff --git a/engine/tests/core/io/test_http_client.h b/engine/tests/core/io/test_http_client.h
index 114ce3b4..db4fb79d 100644
--- a/engine/tests/core/io/test_http_client.h
+++ b/engine/tests/core/io/test_http_client.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_HTTP_CLIENT_H
-#define TEST_HTTP_CLIENT_H
+#pragma once
 
 #include "core/io/http_client.h"
 
@@ -59,10 +58,7 @@ TEST_CASE("[HTTPClient] query_string_from_dict") {
 	Dictionary dict2;
 	dict2["key1"] = "value";
 	dict2["key2"] = 123;
-	Array values;
-	values.push_back(1);
-	values.push_back(2);
-	values.push_back(3);
+	Array values = { 1, 2, 3 };
 	dict2["key3"] = values;
 	dict2["key4"] = Variant();
 	String multiple_keys = client->query_string_from_dict(dict2);
@@ -106,5 +102,3 @@ TEST_CASE("[HTTPClient] connect_to_host") {
 #endif // MODULE_MBEDTLS_ENABLED || WEB_ENABLED
 
 } // namespace TestHTTPClient
-
-#endif // TEST_HTTP_CLIENT_H
diff --git a/engine/tests/core/io/test_image.h b/engine/tests/core/io/test_image.h
index fb56d181..846c2de0 100644
--- a/engine/tests/core/io/test_image.h
+++ b/engine/tests/core/io/test_image.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_IMAGE_H
-#define TEST_IMAGE_H
+#pragma once
 
 #include "core/io/image.h"
 #include "core/os/os.h"
@@ -444,5 +443,3 @@ TEST_CASE("[Image] Convert image") {
 }
 
 } // namespace TestImage
-
-#endif // TEST_IMAGE_H
diff --git a/engine/tests/core/io/test_ip.h b/engine/tests/core/io/test_ip.h
index 7b5583fa..88fc2270 100644
--- a/engine/tests/core/io/test_ip.h
+++ b/engine/tests/core/io/test_ip.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_IP_H
-#define TEST_IP_H
+#pragma once
 
 #include "core/io/ip.h"
 
@@ -47,5 +46,3 @@ TEST_CASE("[IP] resolve_hostname") {
 }
 
 } // namespace TestIP
-
-#endif // TEST_IP_H
diff --git a/engine/tests/core/io/test_json.h b/engine/tests/core/io/test_json.h
index 17a510df..155f3787 100644
--- a/engine/tests/core/io/test_json.h
+++ b/engine/tests/core/io/test_json.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_JSON_H
-#define TEST_JSON_H
+#pragma once
 
 #include "core/io/json.h"
 
@@ -153,21 +152,13 @@ TEST_CASE("[JSON] Parsing escape sequences") {
 
 	JSON json;
 
-	TypedArray<String> valid_escapes;
-	valid_escapes.push_back("\";\"");
-	valid_escapes.push_back("\\;\\");
-	valid_escapes.push_back("/;/");
-	valid_escapes.push_back("b;\b");
-	valid_escapes.push_back("f;\f");
-	valid_escapes.push_back("n;\n");
-	valid_escapes.push_back("r;\r");
-	valid_escapes.push_back("t;\t");
+	TypedArray<String> valid_escapes = { "\";\"", "\\;\\", "/;/", "b;\b", "f;\f", "n;\n", "r;\r", "t;\t" };
 
 	SUBCASE("Basic valid escape sequences") {
 		for (int i = 0; i < valid_escapes.size(); i++) {
 			String valid_escape = valid_escapes[i];
-			String valid_escape_string = valid_escape.get_slice(";", 0);
-			String valid_escape_value = valid_escape.get_slice(";", 1);
+			String valid_escape_string = valid_escape.get_slicec(';', 0);
+			String valid_escape_value = valid_escape.get_slicec(';', 1);
 
 			String json_string = "\"\\";
 			json_string += valid_escape_string;
@@ -205,7 +196,7 @@ TEST_CASE("[JSON] Parsing escape sequences") {
 			bool skip = false;
 			for (int j = 0; j < valid_escapes.size(); j++) {
 				String valid_escape = valid_escapes[j];
-				String valid_escape_string = valid_escape.get_slice(";", 0);
+				String valid_escape_string = valid_escape.get_slicec(';', 0);
 				if (valid_escape_string[0] == i) {
 					skip = true;
 					break;
@@ -318,5 +309,3 @@ TEST_CASE("[JSON] Serialization") {
 	}
 }
 } // namespace TestJSON
-
-#endif // TEST_JSON_H
diff --git a/engine/tests/core/io/test_json_native.h b/engine/tests/core/io/test_json_native.h
index f30c5b1d..f5b6a423 100644
--- a/engine/tests/core/io/test_json_native.h
+++ b/engine/tests/core/io/test_json_native.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_JSON_NATIVE_H
-#define TEST_JSON_NATIVE_H
+#pragma once
 
 #include "core/io/json.h"
 
@@ -162,25 +161,13 @@ TEST_CASE("[JSON][Native] Conversion between native and JSON formats") {
 
 	// `Array`.
 
-	Array arr;
-	arr.push_back(true);
-	arr.push_back(1);
-	arr.push_back("abc");
-
+	Array arr = { true, 1, "abc" };
 	test(arr, R"([true,"i:1","s:abc"])");
 
-	TypedArray<int64_t> int_arr;
-	int_arr.push_back(1);
-	int_arr.push_back(2);
-	int_arr.push_back(3);
-
+	TypedArray<int64_t> int_arr = { 1, 2, 3 };
 	test(int_arr, R"({"type":"Array","elem_type":"int","args":["i:1","i:2","i:3"]})");
 
-	Array arr2;
-	arr2.push_back(1);
-	arr2.push_back(res);
-	arr2.push_back(9);
-
+	Array arr2 = { 1, res, 9 };
 	const String arr2_repr = vformat(R"(["i:1",%s,"i:9"])", res_repr);
 
 	test(arr2, arr2_repr, true);
@@ -189,9 +176,7 @@ TEST_CASE("[JSON][Native] Conversion between native and JSON formats") {
 	CHECK(decode(arr2_repr).get_construct_string() == "[1, null, 9]");
 	ERR_PRINT_ON;
 
-	TypedArray<Resource> res_arr;
-	res_arr.push_back(res);
-
+	TypedArray<Resource> res_arr = { res };
 	const String res_arr_repr = vformat(R"({"type":"Array","elem_type":"Resource","args":[%s]})", res_repr);
 
 	test(res_arr, res_arr_repr, true);
@@ -223,5 +208,3 @@ TEST_CASE("[JSON][Native] Conversion between native and JSON formats") {
 }
 
 } // namespace TestJSONNative
-
-#endif // TEST_JSON_NATIVE_H
diff --git a/engine/tests/core/io/test_logger.h b/engine/tests/core/io/test_logger.h
index b0e6e7f5..e61b66df 100644
--- a/engine/tests/core/io/test_logger.h
+++ b/engine/tests/core/io/test_logger.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_LOGGER_H
-#define TEST_LOGGER_H
+#pragma once
 
 #include "core/io/dir_access.h"
 #include "core/io/logger.h"
@@ -166,5 +165,3 @@ TEST_CASE("[Logger][CompositeLogger] Logs the same into multiple loggers") {
 }
 
 } // namespace TestLogger
-
-#endif // TEST_LOGGER_H
diff --git a/engine/tests/core/io/test_marshalls.h b/engine/tests/core/io/test_marshalls.h
index eb92c3f7..fdbea9fa 100644
--- a/engine/tests/core/io/test_marshalls.h
+++ b/engine/tests/core/io/test_marshalls.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_MARSHALLS_H
-#define TEST_MARSHALLS_H
+#pragma once
 
 #include "core/io/marshalls.h"
 
@@ -491,5 +490,3 @@ TEST_CASE("[Marshalls] Typed dictionary decoding") {
 }
 
 } // namespace TestMarshalls
-
-#endif // TEST_MARSHALLS_H
diff --git a/engine/tests/core/io/test_packet_peer.h b/engine/tests/core/io/test_packet_peer.h
index 59c8dada..3ba29e7a 100644
--- a/engine/tests/core/io/test_packet_peer.h
+++ b/engine/tests/core/io/test_packet_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PACKET_PEER_H
-#define TEST_PACKET_PEER_H
+#pragma once
 
 #include "core/io/packet_peer.h"
 #include "tests/test_macros.h"
@@ -200,5 +199,3 @@ TEST_CASE("[PacketPeer][PacketPeerStream] Put packet buffer when is empty") {
 }
 
 } // namespace TestPacketPeer
-
-#endif // TEST_PACKET_PEER_H
diff --git a/engine/tests/core/io/test_pck_packer.h b/engine/tests/core/io/test_pck_packer.h
index 7ef94519..725564a9 100644
--- a/engine/tests/core/io/test_pck_packer.h
+++ b/engine/tests/core/io/test_pck_packer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PCK_PACKER_H
-#define TEST_PCK_PACKER_H
+#pragma once
 
 #include "core/io/file_access_pack.h"
 #include "core/io/pck_packer.h"
@@ -118,5 +117,3 @@ TEST_CASE("[PCKPacker] Pack a PCK file with some files and directories") {
 			"The generated non-empty PCK file shouldn't be too large.");
 }
 } // namespace TestPCKPacker
-
-#endif // TEST_PCK_PACKER_H
diff --git a/engine/tests/core/io/test_resource.h b/engine/tests/core/io/test_resource.h
index cb1fa290..ef98a8c0 100644
--- a/engine/tests/core/io/test_resource.h
+++ b/engine/tests/core/io/test_resource.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_RESOURCE_H
-#define TEST_RESOURCE_H
+#pragma once
 
 #include "core/io/resource.h"
 #include "core/io/resource_loader.h"
@@ -167,5 +166,3 @@ TEST_CASE("[Resource] Breaking circular references on save") {
 	resource_c->remove_meta("next");
 }
 } // namespace TestResource
-
-#endif // TEST_RESOURCE_H
diff --git a/engine/tests/core/io/test_resource_uid.h b/engine/tests/core/io/test_resource_uid.h
index 662dc520..0a8f04e8 100644
--- a/engine/tests/core/io/test_resource_uid.h
+++ b/engine/tests/core/io/test_resource_uid.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_RESOURCE_UID_H
-#define TEST_RESOURCE_UID_H
+#pragma once
 
 #include "core/io/resource_uid.h"
 
@@ -67,5 +66,3 @@ TEST_CASE("[ResourceUID] Must encode and decode various UIDs correctly") {
 }
 
 } // namespace TestResourceUID
-
-#endif // TEST_RESOURCE_UID_H
diff --git a/engine/tests/core/io/test_stream_peer.h b/engine/tests/core/io/test_stream_peer.h
index 961b4ac0..0aa7302e 100644
--- a/engine/tests/core/io/test_stream_peer.h
+++ b/engine/tests/core/io/test_stream_peer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_STREAM_PEER_H
-#define TEST_STREAM_PEER_H
+#pragma once
 
 #include "core/io/stream_peer.h"
 #include "tests/test_macros.h"
@@ -307,5 +306,3 @@ TEST_CASE("[StreamPeer] Get UTF8 string when there is no string") {
 }
 
 } // namespace TestStreamPeer
-
-#endif // TEST_STREAM_PEER_H
diff --git a/engine/tests/core/io/test_stream_peer_buffer.h b/engine/tests/core/io/test_stream_peer_buffer.h
index 8ba9c0a7..766ccf41 100644
--- a/engine/tests/core/io/test_stream_peer_buffer.h
+++ b/engine/tests/core/io/test_stream_peer_buffer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_STREAM_PEER_BUFFER_H
-#define TEST_STREAM_PEER_BUFFER_H
+#pragma once
 
 #include "core/io/stream_peer.h"
 #include "tests/test_macros.h"
@@ -181,5 +180,3 @@ TEST_CASE("[StreamPeerBuffer] Get data with invalid size returns an error") {
 }
 
 } // namespace TestStreamPeerBuffer
-
-#endif // TEST_STREAM_PEER_BUFFER_H
diff --git a/engine/tests/core/io/test_stream_peer_gzip.h b/engine/tests/core/io/test_stream_peer_gzip.h
new file mode 100644
index 00000000..54935e20
--- /dev/null
+++ b/engine/tests/core/io/test_stream_peer_gzip.h
@@ -0,0 +1,195 @@
+/**************************************************************************/
+/*  test_stream_peer_gzip.h                                               */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/io/stream_peer_gzip.h"
+#include "tests/test_macros.h"
+
+namespace TestStreamPeerGZIP {
+
+const String hello = "Hello World!!!";
+
+TEST_CASE("[StreamPeerGZIP] Initialization") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+	CHECK_EQ(spgz->get_available_bytes(), 0);
+}
+
+TEST_CASE("[StreamPeerGZIP] Compress/Decompress") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+
+	bool is_deflate = false;
+
+	SUBCASE("GZIP") {
+		is_deflate = false;
+	}
+
+	SUBCASE("DEFLATE") {
+		is_deflate = true;
+	}
+
+	CHECK_EQ(spgz->start_compression(is_deflate), Error::OK);
+	CHECK_EQ(spgz->put_data(hello.to_ascii_buffer().ptr(), hello.to_ascii_buffer().size()), Error::OK);
+	CHECK_EQ(spgz->finish(), Error::OK);
+
+	Vector<uint8_t> hello_compressed;
+	int hello_compressed_size = spgz->get_available_bytes();
+	hello_compressed.resize(hello_compressed_size);
+	CHECK_EQ(spgz->get_data(hello_compressed.ptrw(), hello_compressed_size), Error::OK);
+
+	spgz->clear();
+
+	CHECK_EQ(spgz->start_decompression(is_deflate), Error::OK);
+	CHECK_EQ(spgz->put_data(hello_compressed.ptr(), hello_compressed.size()), Error::OK);
+
+	Vector<uint8_t> hello_decompressed;
+	int hello_decompressed_size = spgz->get_available_bytes();
+	hello_decompressed.resize(hello_decompressed_size);
+	CHECK_EQ(spgz->get_data(hello_decompressed.ptrw(), hello_decompressed_size), Error::OK);
+	CHECK_EQ(hello_decompressed, hello.to_ascii_buffer());
+}
+
+TEST_CASE("[StreamPeerGZIP] Compress/Decompress big chunks of data") { // GH-97201
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+	CHECK_EQ(spgz->start_compression(false), Error::OK);
+
+	Vector<uint8_t> big_data;
+	big_data.resize(2500);
+	// Filling it with random data because the issue is related to the size of the data when it's compress.
+	// Random data results in bigger compressed data size.
+	for (int i = 0; i < big_data.size(); i++) {
+		big_data.write[i] = Math::random(48, 122);
+	}
+	CHECK_EQ(spgz->put_data(big_data.ptr(), big_data.size()), Error::OK);
+	CHECK_EQ(spgz->finish(), Error::OK);
+
+	Vector<uint8_t> big_data_compressed;
+	int big_data_compressed_size = spgz->get_available_bytes();
+	big_data_compressed.resize(big_data_compressed_size);
+	CHECK_EQ(spgz->get_data(big_data_compressed.ptrw(), big_data_compressed_size), Error::OK);
+
+	spgz->clear();
+
+	CHECK_EQ(spgz->start_decompression(false), Error::OK);
+	CHECK_EQ(spgz->put_data(big_data_compressed.ptr(), big_data_compressed.size()), Error::OK);
+
+	Vector<uint8_t> big_data_decompressed;
+	int big_data_decompressed_size = spgz->get_available_bytes();
+	big_data_decompressed.resize(big_data_decompressed_size);
+	CHECK_EQ(spgz->get_data(big_data_decompressed.ptrw(), big_data_decompressed_size), Error::OK);
+	CHECK_EQ(big_data_decompressed, big_data);
+}
+
+TEST_CASE("[StreamPeerGZIP] Can't start twice") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+	CHECK_EQ(spgz->start_compression(false), Error::OK);
+
+	ERR_PRINT_OFF;
+	CHECK_EQ(spgz->start_compression(false), Error::ERR_ALREADY_IN_USE);
+	CHECK_EQ(spgz->start_decompression(false), Error::ERR_ALREADY_IN_USE);
+	ERR_PRINT_ON;
+}
+
+TEST_CASE("[StreamPeerGZIP] Can't start with a buffer size equal or less than zero") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+
+	ERR_PRINT_OFF;
+	CHECK_EQ(spgz->start_compression(false, 0), Error::ERR_INVALID_PARAMETER);
+	CHECK_EQ(spgz->start_compression(false, -1), Error::ERR_INVALID_PARAMETER);
+	CHECK_EQ(spgz->start_decompression(false, 0), Error::ERR_INVALID_PARAMETER);
+	CHECK_EQ(spgz->start_decompression(false, -1), Error::ERR_INVALID_PARAMETER);
+	ERR_PRINT_ON;
+}
+
+TEST_CASE("[StreamPeerGZIP] Can't put/get data with a buffer size less than zero") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+	CHECK_EQ(spgz->start_compression(false), Error::OK);
+
+	ERR_PRINT_OFF;
+	CHECK_EQ(spgz->put_data(hello.to_ascii_buffer().ptr(), -1), Error::ERR_INVALID_PARAMETER);
+
+	Vector<uint8_t> hello_compressed;
+	hello_compressed.resize(5);
+	CHECK_EQ(spgz->get_data(hello_compressed.ptrw(), -1), Error::ERR_INVALID_PARAMETER);
+	ERR_PRINT_ON;
+}
+
+TEST_CASE("[StreamPeerGZIP] Needs to be started before use") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+
+	ERR_PRINT_OFF;
+	CHECK_EQ(spgz->put_data(hello.to_ascii_buffer().ptr(), hello.to_ascii_buffer().size()), Error::ERR_UNCONFIGURED);
+	ERR_PRINT_ON;
+}
+
+TEST_CASE("[StreamPeerGZIP] Can't be finished after clear or if it's decompressing") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+
+	CHECK_EQ(spgz->start_compression(false), Error::OK);
+	spgz->clear();
+	ERR_PRINT_OFF;
+	CHECK_EQ(spgz->finish(), Error::ERR_UNAVAILABLE);
+	ERR_PRINT_ON;
+
+	spgz->clear();
+	CHECK_EQ(spgz->start_decompression(false), Error::OK);
+	ERR_PRINT_OFF;
+	CHECK_EQ(spgz->finish(), Error::ERR_UNAVAILABLE);
+	ERR_PRINT_ON;
+}
+
+TEST_CASE("[StreamPeerGZIP] Fails to get if nothing was compress/decompress") {
+	Ref<StreamPeerGZIP> spgz;
+	spgz.instantiate();
+
+	SUBCASE("Compression") {
+		CHECK_EQ(spgz->start_compression(false), Error::OK);
+	}
+
+	SUBCASE("Decompression") {
+		CHECK_EQ(spgz->start_decompression(false), Error::OK);
+	}
+
+	ERR_PRINT_OFF;
+	Vector<uint8_t> hello_compressed;
+	hello_compressed.resize(5);
+	CHECK_EQ(spgz->get_data(hello_compressed.ptrw(), hello_compressed.size()), Error::ERR_UNAVAILABLE);
+	ERR_PRINT_ON;
+}
+
+} // namespace TestStreamPeerGZIP
diff --git a/engine/tests/core/io/test_tcp_server.h b/engine/tests/core/io/test_tcp_server.h
index 24c27468..590567d0 100644
--- a/engine/tests/core/io/test_tcp_server.h
+++ b/engine/tests/core/io/test_tcp_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TCP_SERVER_H
-#define TEST_TCP_SERVER_H
+#pragma once
 
 #include "core/io/stream_peer_tcp.h"
 #include "core/io/tcp_server.h"
@@ -251,5 +250,3 @@ TEST_CASE("[TCPServer] Should disconnect client") {
 }
 
 } // namespace TestTCPServer
-
-#endif // TEST_TCP_SERVER_H
diff --git a/engine/tests/core/io/test_udp_server.h b/engine/tests/core/io/test_udp_server.h
index c65b8cac..9403ddc0 100644
--- a/engine/tests/core/io/test_udp_server.h
+++ b/engine/tests/core/io/test_udp_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_UDP_SERVER_H
-#define TEST_UDP_SERVER_H
+#pragma once
 
 #include "core/io/packet_peer_udp.h"
 #include "core/io/udp_server.h"
@@ -215,5 +214,3 @@ TEST_CASE("[UDPServer] Should not accept new connections after stop") {
 }
 
 } // namespace TestUDPServer
-
-#endif // TEST_UDP_SERVER_H
diff --git a/engine/tests/core/io/test_xml_parser.h b/engine/tests/core/io/test_xml_parser.h
index 40cbea2d..33020c7e 100644
--- a/engine/tests/core/io/test_xml_parser.h
+++ b/engine/tests/core/io/test_xml_parser.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_XML_PARSER_H
-#define TEST_XML_PARSER_H
+#pragma once
 
 #include "core/io/xml_parser.h"
 
@@ -231,5 +230,3 @@ TEST_CASE("[XMLParser] CDATA") {
 	CHECK_EQ(parser.get_node_name(), "a");
 }
 } // namespace TestXMLParser
-
-#endif // TEST_XML_PARSER_H
diff --git a/engine/tests/core/math/test_aabb.h b/engine/tests/core/math/test_aabb.h
index eb6977fd..6c912b5c 100644
--- a/engine/tests/core/math/test_aabb.h
+++ b/engine/tests/core/math/test_aabb.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_AABB_H
-#define TEST_AABB_H
+#pragma once
 
 #include "core/math/aabb.h"
 
@@ -38,8 +37,8 @@
 namespace TestAABB {
 
 TEST_CASE("[AABB] Constructor methods") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
-	const AABB aabb_copy = AABB(aabb);
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb_copy = AABB(aabb);
 
 	CHECK_MESSAGE(
 			aabb == aabb_copy,
@@ -53,7 +52,7 @@ TEST_CASE("[AABB] String conversion") {
 }
 
 TEST_CASE("[AABB] Basic getters") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
 			aabb.get_position().is_equal_approx(Vector3(-1.5, 2, -2.5)),
 			"get_position() should return the expected value.");
@@ -144,7 +143,7 @@ TEST_CASE("[AABB] Surface getters") {
 }
 
 TEST_CASE("[AABB] Intersection") {
-	const AABB aabb_big = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb_big = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 
 	AABB aabb_small = AABB(Vector3(-1.5, 2, -2.5), Vector3(1, 1, 1));
 	CHECK_MESSAGE(
@@ -230,7 +229,7 @@ TEST_CASE("[AABB] Intersection") {
 			"intersects_ray() should return false for being outside.");
 
 	// Finding ray intersections.
-	const AABB aabb_simple = AABB(Vector3(), Vector3(1, 1, 1));
+	constexpr AABB aabb_simple = AABB(Vector3(), Vector3(1, 1, 1));
 	bool inside = false;
 	Vector3 intersection_point;
 	Vector3 intersection_normal;
@@ -252,7 +251,7 @@ TEST_CASE("[AABB] Intersection") {
 	CHECK_MESSAGE(intersection_normal.is_equal_approx(Vector3(0, -1, 0)), "find_intersects_ray() inside intersection normal incorrect.");
 
 	// Zero sized AABB.
-	const AABB aabb_zero = AABB(Vector3(), Vector3(1, 0, 1));
+	constexpr AABB aabb_zero = AABB(Vector3(), Vector3(1, 0, 1));
 	aabb_zero.find_intersects_ray(Vector3(0.5, 0, 0.5), Vector3(0, 1, 0), inside, &intersection_point, &intersection_normal);
 	CHECK_MESSAGE(inside == false, "find_intersects_ray() should return outside on borders of zero sized AABB.");
 	CHECK_MESSAGE(intersection_point.is_equal_approx(Vector3(0.5, 0, 0.5)), "find_intersects_ray() border intersection point incorrect for zero sized AABB.");
@@ -268,7 +267,7 @@ TEST_CASE("[AABB] Intersection") {
 }
 
 TEST_CASE("[AABB] Merging") {
-	const AABB aabb_big = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb_big = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 
 	AABB aabb_small = AABB(Vector3(-1.5, 2, -2.5), Vector3(1, 1, 1));
 	CHECK_MESSAGE(
@@ -287,7 +286,7 @@ TEST_CASE("[AABB] Merging") {
 }
 
 TEST_CASE("[AABB] Encloses") {
-	const AABB aabb_big = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb_big = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 
 	CHECK_MESSAGE(
 			aabb_big.encloses(aabb_big),
@@ -315,7 +314,7 @@ TEST_CASE("[AABB] Encloses") {
 }
 
 TEST_CASE("[AABB] Get endpoints") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
 			aabb.get_endpoint(0).is_equal_approx(Vector3(-1.5, 2, -2.5)),
 			"The endpoint at index 0 should match the expected value.");
@@ -352,7 +351,7 @@ TEST_CASE("[AABB] Get endpoints") {
 }
 
 TEST_CASE("[AABB] Get longest/shortest axis") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
 			aabb.get_longest_axis() == Vector3(0, 0, 1),
 			"get_longest_axis() should return the expected value.");
@@ -375,7 +374,7 @@ TEST_CASE("[AABB] Get longest/shortest axis") {
 }
 
 TEST_CASE("[AABB] Get support") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
 			aabb.get_support(Vector3(1, 0, 0)) == Vector3(2.5, 2, -2.5),
 			"get_support() should return the expected value.");
@@ -397,7 +396,7 @@ TEST_CASE("[AABB] Get support") {
 }
 
 TEST_CASE("[AABB] Grow") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
 			aabb.grow(0.25).is_equal_approx(AABB(Vector3(-1.75, 1.75, -2.75), Vector3(4.5, 5.5, 6.5))),
 			"grow() with positive value should return the expected AABB.");
@@ -410,7 +409,7 @@ TEST_CASE("[AABB] Grow") {
 }
 
 TEST_CASE("[AABB] Has point") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
 			aabb.has_point(Vector3(-1, 3, 0)),
 			"has_point() with contained point should return the expected value.");
@@ -442,7 +441,7 @@ TEST_CASE("[AABB] Has point") {
 }
 
 TEST_CASE("[AABB] Expanding") {
-	const AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
+	constexpr AABB aabb = AABB(Vector3(-1.5, 2, -2.5), Vector3(4, 5, 6));
 	CHECK_MESSAGE(
 			aabb.expand(Vector3(-1, 3, 0)).is_equal_approx(aabb),
 			"expand() with contained point should return the expected AABB.");
@@ -461,8 +460,8 @@ TEST_CASE("[AABB] Expanding") {
 }
 
 TEST_CASE("[AABB] Finite number checks") {
-	const Vector3 x(0, 1, 2);
-	const Vector3 infinite(NAN, NAN, NAN);
+	constexpr Vector3 x(0, 1, 2);
+	constexpr Vector3 infinite(Math::NaN, Math::NaN, Math::NaN);
 
 	CHECK_MESSAGE(
 			AABB(x, x).is_finite(),
@@ -481,5 +480,3 @@ TEST_CASE("[AABB] Finite number checks") {
 }
 
 } // namespace TestAABB
-
-#endif // TEST_AABB_H
diff --git a/engine/tests/core/math/test_astar.h b/engine/tests/core/math/test_astar.h
index 3b12dcee..3f6f6510 100644
--- a/engine/tests/core/math/test_astar.h
+++ b/engine/tests/core/math/test_astar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_ASTAR_H
-#define TEST_ASTAR_H
+#pragma once
 
 #include "core/math/a_star.h"
 
@@ -215,7 +214,7 @@ TEST_CASE("[AStar3D] Add/Remove") {
 
 TEST_CASE("[Stress][AStar3D] Find paths") {
 	// Random stress tests with Floyd-Warshall.
-	const int N = 30;
+	constexpr int N = 30;
 	Math::seed(0);
 
 	for (int test = 0; test < 1000; test++) {
@@ -281,7 +280,7 @@ TEST_CASE("[Stress][AStar3D] Find paths") {
 		float d[N][N];
 		for (int u = 0; u < N; u++) {
 			for (int v = 0; v < N; v++) {
-				d[u][v] = (u == v || adj[u][v]) ? p[u].distance_to(p[v]) : INFINITY;
+				d[u][v] = (u == v || adj[u][v]) ? p[u].distance_to(p[v]) : Math::INF;
 			}
 		}
 		for (int w = 0; w < N; w++) {
@@ -358,5 +357,3 @@ TEST_CASE("[Stress][AStar3D] Find paths") {
 	}
 }
 } // namespace TestAStar
-
-#endif // TEST_ASTAR_H
diff --git a/engine/tests/core/math/test_basis.h b/engine/tests/core/math/test_basis.h
index 61669862..67f3ea44 100644
--- a/engine/tests/core/math/test_basis.h
+++ b/engine/tests/core/math/test_basis.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_BASIS_H
-#define TEST_BASIS_H
+#pragma once
 
 #include "core/math/basis.h"
 #include "core/math/random_number_generator.h"
@@ -39,11 +38,11 @@
 namespace TestBasis {
 
 Vector3 deg_to_rad(const Vector3 &p_rotation) {
-	return p_rotation / 180.0 * Math_PI;
+	return p_rotation / 180.0 * Math::PI;
 }
 
 Vector3 rad2deg(const Vector3 &p_rotation) {
-	return p_rotation / Math_PI * 180.0;
+	return p_rotation / Math::PI * 180.0;
 }
 
 String get_rot_order_name(EulerOrder ro) {
@@ -219,7 +218,7 @@ TEST_CASE("[Stress][Basis] Euler conversions") {
 TEST_CASE("[Basis] Set axis angle") {
 	Vector3 axis;
 	real_t angle;
-	real_t pi = (real_t)Math_PI;
+	real_t pi = (real_t)Math::PI;
 
 	// Testing the singularity when the angle is 0°.
 	Basis identity(1, 0, 0, 0, 1, 0, 0, 0, 1);
@@ -270,8 +269,8 @@ TEST_CASE("[Basis] Set axis angle") {
 }
 
 TEST_CASE("[Basis] Finite number checks") {
-	const Vector3 x(0, 1, 2);
-	const Vector3 infinite(NAN, NAN, NAN);
+	constexpr Vector3 x(0, 1, 2);
+	constexpr Vector3 infinite(Math::NaN, Math::NaN, Math::NaN);
 
 	CHECK_MESSAGE(
 			Basis(x, x, x).is_finite(),
@@ -328,7 +327,7 @@ TEST_CASE("[Basis] Is conformal checks") {
 			"Basis with non-uniform scale should not be conformal.");
 
 	CHECK_FALSE_MESSAGE(
-			Basis(Vector3(Math_SQRT12, Math_SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_conformal(),
+			Basis(Vector3(Math::SQRT12, Math::SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_conformal(),
 			"Basis with the X axis skewed 45 degrees should not be conformal.");
 
 	CHECK_MESSAGE(
@@ -358,7 +357,7 @@ TEST_CASE("[Basis] Is orthogonal checks") {
 			"Basis with a flip, rotation, and uniform scale should be orthogonal.");
 
 	CHECK_FALSE_MESSAGE(
-			Basis(Vector3(Math_SQRT12, Math_SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_orthogonal(),
+			Basis(Vector3(Math::SQRT12, Math::SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_orthogonal(),
 			"Basis with the X axis skewed 45 degrees should not be orthogonal.");
 
 	CHECK_MESSAGE(
@@ -388,7 +387,7 @@ TEST_CASE("[Basis] Is orthonormal checks") {
 			"Basis with a flip, rotation, and uniform scale should not be orthonormal.");
 
 	CHECK_FALSE_MESSAGE(
-			Basis(Vector3(Math_SQRT12, Math_SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_orthonormal(),
+			Basis(Vector3(Math::SQRT12, Math::SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_orthonormal(),
 			"Basis with the X axis skewed 45 degrees should not be orthonormal.");
 
 	CHECK_FALSE_MESSAGE(
@@ -418,7 +417,7 @@ TEST_CASE("[Basis] Is rotation checks") {
 			"Basis with a squeeze should not be a rotation.");
 
 	CHECK_FALSE_MESSAGE(
-			Basis(Vector3(Math_SQRT12, Math_SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_rotation(),
+			Basis(Vector3(Math::SQRT12, Math::SQRT12, 0), Vector3(0, 1, 0), Vector3(0, 0, 1)).is_rotation(),
 			"Basis with the X axis skewed 45 degrees should not be a rotation.");
 
 	CHECK_FALSE_MESSAGE(
@@ -427,5 +426,3 @@ TEST_CASE("[Basis] Is rotation checks") {
 }
 
 } // namespace TestBasis
-
-#endif // TEST_BASIS_H
diff --git a/engine/tests/core/math/test_color.h b/engine/tests/core/math/test_color.h
index f2c35813..1e4e7c54 100644
--- a/engine/tests/core/math/test_color.h
+++ b/engine/tests/core/math/test_color.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_COLOR_H
-#define TEST_COLOR_H
+#pragma once
 
 #include "core/math/color.h"
 
@@ -38,7 +37,7 @@
 namespace TestColor {
 
 TEST_CASE("[Color] Constructor methods") {
-	const Color blue_rgba = Color(0.25098, 0.376471, 1, 0.501961);
+	constexpr Color blue_rgba = Color(0.25098, 0.376471, 1, 0.501961);
 	const Color blue_html = Color::html("#4060ff80");
 	const Color blue_hex = Color::hex(0x4060ff80);
 	const Color blue_hex64 = Color::hex64(0x4040'6060'ffff'8080);
@@ -61,7 +60,7 @@ TEST_CASE("[Color] Constructor methods") {
 			html_invalid.is_equal_approx(Color()),
 			"Creation with invalid HTML notation should result in a Color with the default values.");
 
-	const Color green_rgba = Color(0, 1, 0, 0.25);
+	constexpr Color green_rgba = Color(0, 1, 0, 0.25);
 	const Color green_hsva = Color(0, 0, 0).from_hsv(120 / 360.0, 1, 1, 0.25);
 
 	CHECK_MESSAGE(
@@ -70,8 +69,8 @@ TEST_CASE("[Color] Constructor methods") {
 }
 
 TEST_CASE("[Color] Operators") {
-	const Color blue = Color(0.2, 0.2, 1);
-	const Color dark_red = Color(0.3, 0.1, 0.1);
+	constexpr Color blue = Color(0.2, 0.2, 1);
+	constexpr Color dark_red = Color(0.3, 0.1, 0.1);
 
 	// Color components may be negative. Also, the alpha component may be greater than 1.0.
 	CHECK_MESSAGE(
@@ -98,7 +97,7 @@ TEST_CASE("[Color] Operators") {
 }
 
 TEST_CASE("[Color] Reading methods") {
-	const Color dark_blue = Color(0, 0, 0.5, 0.4);
+	constexpr Color dark_blue = Color(0, 0, 0.5, 0.4);
 
 	CHECK_MESSAGE(
 			dark_blue.get_h() == doctest::Approx(240.0f / 360.0f),
@@ -112,8 +111,8 @@ TEST_CASE("[Color] Reading methods") {
 }
 
 TEST_CASE("[Color] Conversion methods") {
-	const Color cyan = Color(0, 1, 1);
-	const Color cyan_transparent = Color(0, 1, 1, 0);
+	constexpr Color cyan = Color(0, 1, 1);
+	constexpr Color cyan_transparent = Color(0, 1, 1, 0);
 
 	CHECK_MESSAGE(
 			cyan.to_html() == "00ffffff",
@@ -145,7 +144,7 @@ TEST_CASE("[Color] Conversion methods") {
 }
 
 TEST_CASE("[Color] Linear <-> sRGB conversion") {
-	const Color color = Color(0.35, 0.5, 0.6, 0.7);
+	constexpr Color color = Color(0.35, 0.5, 0.6, 0.7);
 	const Color color_linear = color.srgb_to_linear();
 	const Color color_srgb = color.linear_to_srgb();
 	CHECK_MESSAGE(
@@ -204,13 +203,13 @@ TEST_CASE("[Color] Validation methods") {
 }
 
 TEST_CASE("[Color] Manipulation methods") {
-	const Color blue = Color(0, 0, 1, 0.4);
+	constexpr Color blue = Color(0, 0, 1, 0.4);
 
 	CHECK_MESSAGE(
 			blue.inverted().is_equal_approx(Color(1, 1, 0, 0.4)),
 			"Inverted color should have its red, green and blue components inverted.");
 
-	const Color purple = Color(0.5, 0.2, 0.5, 0.25);
+	constexpr Color purple = Color(0.5, 0.2, 0.5, 0.25);
 
 	CHECK_MESSAGE(
 			purple.lightened(0.2).is_equal_approx(Color(0.6, 0.36, 0.6, 0.25)),
@@ -219,13 +218,11 @@ TEST_CASE("[Color] Manipulation methods") {
 			purple.darkened(0.2).is_equal_approx(Color(0.4, 0.16, 0.4, 0.25)),
 			"Color should be darkened by the expected amount.");
 
-	const Color red = Color(1, 0, 0, 0.2);
-	const Color yellow = Color(1, 1, 0, 0.8);
+	constexpr Color red = Color(1, 0, 0, 0.2);
+	constexpr Color yellow = Color(1, 1, 0, 0.8);
 
 	CHECK_MESSAGE(
 			red.lerp(yellow, 0.5).is_equal_approx(Color(1, 0.5, 0, 0.5)),
 			"Red interpolated with yellow should be orange (with interpolated alpha).");
 }
 } // namespace TestColor
-
-#endif // TEST_COLOR_H
diff --git a/engine/tests/core/math/test_expression.h b/engine/tests/core/math/test_expression.h
index 7f660697..26c90b65 100644
--- a/engine/tests/core/math/test_expression.h
+++ b/engine/tests/core/math/test_expression.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_EXPRESSION_H
-#define TEST_EXPRESSION_H
+#pragma once
 
 #include "core/math/expression.h"
 
@@ -322,15 +321,11 @@ TEST_CASE("[Expression] Boolean expressions") {
 TEST_CASE("[Expression] Expressions with variables") {
 	Expression expression;
 
-	PackedStringArray parameter_names;
-	parameter_names.push_back("foo");
-	parameter_names.push_back("bar");
+	PackedStringArray parameter_names = { "foo", "bar" };
 	CHECK_MESSAGE(
 			expression.parse("foo + bar + 50", parameter_names) == OK,
 			"The expression should parse successfully.");
-	Array values;
-	values.push_back(60);
-	values.push_back(20);
+	Array values = { 60, 20 };
 	CHECK_MESSAGE(
 			int(expression.execute(values)) == 130,
 			"The expression should return the expected value.");
@@ -341,9 +336,7 @@ TEST_CASE("[Expression] Expressions with variables") {
 	CHECK_MESSAGE(
 			expression.parse("foo + bar + 50", parameter_names_invalid) == OK,
 			"The expression should parse successfully.");
-	Array values_invalid;
-	values_invalid.push_back(60);
-	values_invalid.push_back(20);
+	Array values_invalid = { 60, 20 };
 	// Invalid parameters will parse successfully but print an error message when executing.
 	ERR_PRINT_OFF;
 	CHECK_MESSAGE(
@@ -352,31 +345,21 @@ TEST_CASE("[Expression] Expressions with variables") {
 	ERR_PRINT_ON;
 
 	// Mismatched argument count (more values than parameters).
-	PackedStringArray parameter_names_mismatch;
-	parameter_names_mismatch.push_back("foo");
-	parameter_names_mismatch.push_back("bar");
+	PackedStringArray parameter_names_mismatch = { "foo", "bar" };
 	CHECK_MESSAGE(
 			expression.parse("foo + bar + 50", parameter_names_mismatch) == OK,
 			"The expression should parse successfully.");
-	Array values_mismatch;
-	values_mismatch.push_back(60);
-	values_mismatch.push_back(20);
-	values_mismatch.push_back(110);
+	Array values_mismatch = { 60, 20, 110 };
 	CHECK_MESSAGE(
 			int(expression.execute(values_mismatch)) == 130,
 			"The expression should return the expected value.");
 
 	// Mismatched argument count (more parameters than values).
-	PackedStringArray parameter_names_mismatch2;
-	parameter_names_mismatch2.push_back("foo");
-	parameter_names_mismatch2.push_back("bar");
-	parameter_names_mismatch2.push_back("baz");
+	PackedStringArray parameter_names_mismatch2 = { "foo", "bar", "baz" };
 	CHECK_MESSAGE(
 			expression.parse("foo + bar + baz + 50", parameter_names_mismatch2) == OK,
 			"The expression should parse successfully.");
-	Array values_mismatch2;
-	values_mismatch2.push_back(60);
-	values_mismatch2.push_back(20);
+	Array values_mismatch2 = { 60, 20 };
 	// Having more parameters than values will parse successfully but print an
 	// error message when executing.
 	ERR_PRINT_OFF;
@@ -505,5 +488,3 @@ TEST_CASE("[Expression] Unusual expressions") {
 	//		"`(-9223372036854775807 - 1) / -1` should return the expected result.");
 }
 } // namespace TestExpression
-
-#endif // TEST_EXPRESSION_H
diff --git a/engine/tests/core/math/test_geometry_2d.h b/engine/tests/core/math/test_geometry_2d.h
index a4bb6dfc..415912fe 100644
--- a/engine/tests/core/math/test_geometry_2d.h
+++ b/engine/tests/core/math/test_geometry_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GEOMETRY_2D_H
-#define TEST_GEOMETRY_2D_H
+#pragma once
 
 #include "core/math/geometry_2d.h"
 
@@ -164,11 +163,11 @@ TEST_CASE("[Geometry2D] Segment intersection") {
 }
 
 TEST_CASE("[Geometry2D] Segment intersection with circle") {
-	real_t minus_one = -1.0;
-	real_t zero = 0.0;
-	real_t one_quarter = 0.25;
-	real_t three_quarters = 0.75;
-	real_t one = 1.0;
+	constexpr real_t minus_one = -1.0;
+	constexpr real_t zero = 0.0;
+	constexpr real_t one_quarter = 0.25;
+	constexpr real_t three_quarters = 0.75;
+	constexpr real_t one = 1.0;
 
 	CHECK_MESSAGE(
 			Geometry2D::segment_intersects_circle(Vector2(0, 0), Vector2(4, 0), Vector2(0, 0), 1.0) == doctest::Approx(one_quarter),
@@ -262,22 +261,25 @@ TEST_CASE("[Geometry2D] Segment intersection with polygon") {
 }
 
 TEST_CASE("[Geometry2D] Closest point to segment") {
-	Vector2 s[] = { Vector2(-4, -4), Vector2(4, 4) };
-	CHECK(Geometry2D::get_closest_point_to_segment(Vector2(4.1, 4.1), s).is_equal_approx(Vector2(4, 4)));
-	CHECK(Geometry2D::get_closest_point_to_segment(Vector2(-4.1, -4.1), s).is_equal_approx(Vector2(-4, -4)));
-	CHECK(Geometry2D::get_closest_point_to_segment(Vector2(-1, 1), s).is_equal_approx(Vector2(0, 0)));
+	Vector2 a = Vector2(-4, -4);
+	Vector2 b = Vector2(4, 4);
+	CHECK(Geometry2D::get_closest_point_to_segment(Vector2(4.1, 4.1), a, b).is_equal_approx(Vector2(4, 4)));
+	CHECK(Geometry2D::get_closest_point_to_segment(Vector2(-4.1, -4.1), a, b).is_equal_approx(Vector2(-4, -4)));
+	CHECK(Geometry2D::get_closest_point_to_segment(Vector2(-1, 1), a, b).is_equal_approx(Vector2(0, 0)));
 
-	Vector2 t[] = { Vector2(1, -2), Vector2(1, -2) };
+	a = Vector2(1, -2);
+	b = Vector2(1, -2);
 	CHECK_MESSAGE(
-			Geometry2D::get_closest_point_to_segment(Vector2(-3, 4), t).is_equal_approx(Vector2(1, -2)),
+			Geometry2D::get_closest_point_to_segment(Vector2(-3, 4), a, b).is_equal_approx(Vector2(1, -2)),
 			"Line segment is only a single point. This point should be the closest.");
 }
 
 TEST_CASE("[Geometry2D] Closest point to uncapped segment") {
-	Vector2 s[] = { Vector2(-4, -4), Vector2(4, 4) };
-	CHECK(Geometry2D::get_closest_point_to_segment_uncapped(Vector2(-1, 1), s).is_equal_approx(Vector2(0, 0)));
-	CHECK(Geometry2D::get_closest_point_to_segment_uncapped(Vector2(-4, -6), s).is_equal_approx(Vector2(-5, -5)));
-	CHECK(Geometry2D::get_closest_point_to_segment_uncapped(Vector2(4, 6), s).is_equal_approx(Vector2(5, 5)));
+	constexpr Vector2 a = Vector2(-4, -4);
+	constexpr Vector2 b = Vector2(4, 4);
+	CHECK(Geometry2D::get_closest_point_to_segment_uncapped(Vector2(-1, 1), a, b).is_equal_approx(Vector2(0, 0)));
+	CHECK(Geometry2D::get_closest_point_to_segment_uncapped(Vector2(-4, -6), a, b).is_equal_approx(Vector2(-5, -5)));
+	CHECK(Geometry2D::get_closest_point_to_segment_uncapped(Vector2(4, 6), a, b).is_equal_approx(Vector2(5, 5)));
 }
 
 TEST_CASE("[Geometry2D] Closest points between segments") {
@@ -888,5 +890,3 @@ TEST_CASE("[Geometry2D] Bresenham line") {
 	}
 }
 } // namespace TestGeometry2D
-
-#endif // TEST_GEOMETRY_2D_H
diff --git a/engine/tests/core/math/test_geometry_3d.h b/engine/tests/core/math/test_geometry_3d.h
index aaa02cb6..39526bb2 100644
--- a/engine/tests/core/math/test_geometry_3d.h
+++ b/engine/tests/core/math/test_geometry_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GEOMETRY_3D_H
-#define TEST_GEOMETRY_3D_H
+#pragma once
 
 #include "core/math/geometry_3d.h"
 #include "tests/test_macros.h"
@@ -47,7 +46,7 @@ TEST_CASE("[Geometry3D] Closest Distance Between Segments") {
 }
 
 TEST_CASE("[Geometry3D] Build Box Planes") {
-	const Vector3 extents = Vector3(5, 5, 20);
+	constexpr Vector3 extents = Vector3(5, 5, 20);
 	Vector<Plane> box = Geometry3D::build_box_planes(extents);
 	CHECK(box.size() == 6);
 	CHECK(extents.x == box[0].d);
@@ -130,8 +129,9 @@ TEST_CASE("[Geometry3D] Compute Convex Mesh Points") {
 }
 
 TEST_CASE("[Geometry3D] Get Closest Point To Segment") {
-	Vector3 segment[2] = { Vector3(1, 1, 1), Vector3(5, 5, 5) };
-	Vector3 output = Geometry3D::get_closest_point_to_segment(Vector3(2, 1, 4), segment);
+	constexpr Vector3 a = Vector3(1, 1, 1);
+	constexpr Vector3 b = Vector3(5, 5, 5);
+	Vector3 output = Geometry3D::get_closest_point_to_segment(Vector3(2, 1, 4), a, b);
 	CHECK(output.is_equal_approx(Vector3(2.33333, 2.33333, 2.33333)));
 }
 
@@ -183,22 +183,19 @@ TEST_CASE("[Geometry3D] Segment Intersects Triangle") {
 }
 
 TEST_CASE("[Geometry3D] Triangle and Box Overlap") {
-	Vector3 good_triangle[3] = { Vector3(3, 2, 3), Vector3(2, 2, 1), Vector3(2, 1, 1) };
+	constexpr Vector3 good_triangle[3] = { Vector3(3, 2, 3), Vector3(2, 2, 1), Vector3(2, 1, 1) };
 	CHECK(Geometry3D::triangle_box_overlap(Vector3(0, 0, 0), Vector3(5, 5, 5), good_triangle) == true);
-	Vector3 bad_triangle[3] = { Vector3(100, 100, 100), Vector3(-100, -100, -100), Vector3(10, 10, 10) };
+	constexpr Vector3 bad_triangle[3] = { Vector3(100, 100, 100), Vector3(-100, -100, -100), Vector3(10, 10, 10) };
 	CHECK(Geometry3D::triangle_box_overlap(Vector3(1000, 1000, 1000), Vector3(1, 1, 1), bad_triangle) == false);
 }
 
 TEST_CASE("[Geometry3D] Triangle and Sphere Intersect") {
-	Vector<Vector3> triangle;
-	triangle.push_back(Vector3(3, 0, 0));
-	triangle.push_back(Vector3(-3, 0, 0));
-	triangle.push_back(Vector3(0, 3, 0));
+	constexpr Vector3 triangle_a = Vector3(3, 0, 0);
+	constexpr Vector3 triangle_b = Vector3(-3, 0, 0);
+	constexpr Vector3 triangle_c = Vector3(0, 3, 0);
 	Vector3 triangle_contact, sphere_contact;
-	CHECK(Geometry3D::triangle_sphere_intersection_test(&triangle[0], Vector3(0, -1, 0), Vector3(0, 0, 0), 5, triangle_contact, sphere_contact) == true);
-	CHECK(Geometry3D::triangle_sphere_intersection_test(&triangle[0], Vector3(0, 1, 0), Vector3(0, 0, 0), 5, triangle_contact, sphere_contact) == true);
-	CHECK(Geometry3D::triangle_sphere_intersection_test(&triangle[0], Vector3(0, 1, 0), Vector3(20, 0, 0), 5, triangle_contact, sphere_contact) == false);
+	CHECK(Geometry3D::triangle_sphere_intersection_test(triangle_a, triangle_b, triangle_c, Vector3(0, -1, 0), Vector3(0, 0, 0), 5, triangle_contact, sphere_contact) == true);
+	CHECK(Geometry3D::triangle_sphere_intersection_test(triangle_a, triangle_b, triangle_c, Vector3(0, 1, 0), Vector3(0, 0, 0), 5, triangle_contact, sphere_contact) == true);
+	CHECK(Geometry3D::triangle_sphere_intersection_test(triangle_a, triangle_b, triangle_c, Vector3(0, 1, 0), Vector3(20, 0, 0), 5, triangle_contact, sphere_contact) == false);
 }
 } // namespace TestGeometry3D
-
-#endif // TEST_GEOMETRY_3D_H
diff --git a/engine/tests/core/math/test_math_funcs.h b/engine/tests/core/math/test_math_funcs.h
index 68540e4d..2785c48f 100644
--- a/engine/tests/core/math/test_math_funcs.h
+++ b/engine/tests/core/math/test_math_funcs.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_MATH_FUNCS_H
-#define TEST_MATH_FUNCS_H
+#pragma once
 
 #include "tests/test_macros.h"
 
@@ -47,15 +46,15 @@ TEST_CASE("[Math] C++ macros") {
 	// `max` is lower than `min`.
 	CHECK(CLAMP(620, 600, 50) == 50);
 
-	CHECK(ABS(-5) == 5);
-	CHECK(ABS(0) == 0);
-	CHECK(ABS(5) == 5);
+	CHECK(Math::abs(-5) == 5);
+	CHECK(Math::abs(0) == 0);
+	CHECK(Math::abs(5) == 5);
 
 	CHECK(SIGN(-5) == -1.0);
 	CHECK(SIGN(0) == 0.0);
 	CHECK(SIGN(5) == 1.0);
-	// Check that SIGN(NAN) returns 0.0.
-	CHECK(SIGN(NAN) == 0.0);
+	// Check that SIGN(Math::NaN) returns 0.0.
+	CHECK(SIGN(Math::NaN) == 0.0);
 }
 
 TEST_CASE("[Math] Power of two functions") {
@@ -190,7 +189,7 @@ TEST_CASE_TEMPLATE("[Math] asin/acos/atan", T, float, double) {
 	CHECK(Math::acos((T)0.5) == doctest::Approx((T)1.0471975512));
 	CHECK(Math::acos((T)1.0) == doctest::Approx((T)0.0));
 	CHECK(Math::acos((T)2.0) == doctest::Approx((T)0.0));
-	CHECK(Math::acos((T)-2.0) == doctest::Approx((T)Math_PI));
+	CHECK(Math::acos((T)-2.0) == doctest::Approx((T)Math::PI));
 
 	CHECK(Math::atan((T)-0.1) == doctest::Approx((T)-0.0996686525));
 	CHECK(Math::atan((T)0.1) == doctest::Approx((T)0.0996686525));
@@ -292,10 +291,10 @@ TEST_CASE_TEMPLATE("[Math] pow/log/log2/exp/sqrt", T, float, double) {
 
 TEST_CASE_TEMPLATE("[Math] is_nan/is_inf", T, float, double) {
 	CHECK(!Math::is_nan((T)0.0));
-	CHECK(Math::is_nan((T)NAN));
+	CHECK(Math::is_nan((T)Math::NaN));
 
 	CHECK(!Math::is_inf((T)0.0));
-	CHECK(Math::is_inf((T)INFINITY));
+	CHECK(Math::is_inf((T)Math::INF));
 }
 
 TEST_CASE_TEMPLATE("[Math] linear_to_db", T, float, double) {
@@ -388,15 +387,15 @@ TEST_CASE_TEMPLATE("[Math] remap", T, float, double) {
 
 TEST_CASE_TEMPLATE("[Math] angle_difference", T, float, double) {
 	// Loops around, should return 0.0.
-	CHECK(Math::angle_difference((T)0.0, (T)Math_TAU) == doctest::Approx((T)0.0));
-	CHECK(Math::angle_difference((T)Math_PI, (T)-Math_PI) == doctest::Approx((T)0.0));
-	CHECK(Math::angle_difference((T)0.0, (T)Math_TAU * (T)4.0) == doctest::Approx((T)0.0));
+	CHECK(Math::angle_difference((T)0.0, (T)Math::TAU) == doctest::Approx((T)0.0));
+	CHECK(Math::angle_difference((T)Math::PI, (T)-Math::PI) == doctest::Approx((T)0.0));
+	CHECK(Math::angle_difference((T)0.0, (T)Math::TAU * (T)4.0) == doctest::Approx((T)0.0));
 
 	// Rotation is clockwise, so it should return -PI.
-	CHECK(Math::angle_difference((T)0.0, (T)Math_PI) == doctest::Approx((T)-Math_PI));
-	CHECK(Math::angle_difference((T)0.0, (T)-Math_PI) == doctest::Approx((T)Math_PI));
-	CHECK(Math::angle_difference((T)Math_PI, (T)0.0) == doctest::Approx((T)Math_PI));
-	CHECK(Math::angle_difference((T)-Math_PI, (T)0.0) == doctest::Approx((T)-Math_PI));
+	CHECK(Math::angle_difference((T)0.0, (T)Math::PI) == doctest::Approx((T)-Math::PI));
+	CHECK(Math::angle_difference((T)0.0, (T)-Math::PI) == doctest::Approx((T)Math::PI));
+	CHECK(Math::angle_difference((T)Math::PI, (T)0.0) == doctest::Approx((T)Math::PI));
+	CHECK(Math::angle_difference((T)-Math::PI, (T)0.0) == doctest::Approx((T)-Math::PI));
 
 	CHECK(Math::angle_difference((T)0.0, (T)3.0) == doctest::Approx((T)3.0));
 	CHECK(Math::angle_difference((T)1.0, (T)-2.0) == doctest::Approx((T)-3.0));
@@ -407,23 +406,23 @@ TEST_CASE_TEMPLATE("[Math] angle_difference", T, float, double) {
 
 TEST_CASE_TEMPLATE("[Math] lerp_angle", T, float, double) {
 	// Counter-clockwise rotation.
-	CHECK(Math::lerp_angle((T)0.24 * Math_TAU, 0.75 * Math_TAU, 0.5) == doctest::Approx((T)-0.005 * Math_TAU));
+	CHECK(Math::lerp_angle((T)0.24 * Math::TAU, 0.75 * Math::TAU, 0.5) == doctest::Approx((T)-0.005 * Math::TAU));
 	// Counter-clockwise rotation.
-	CHECK(Math::lerp_angle((T)0.25 * Math_TAU, 0.75 * Math_TAU, 0.5) == doctest::Approx((T)0.0));
+	CHECK(Math::lerp_angle((T)0.25 * Math::TAU, 0.75 * Math::TAU, 0.5) == doctest::Approx((T)0.0));
 	// Clockwise rotation.
-	CHECK(Math::lerp_angle((T)0.26 * Math_TAU, 0.75 * Math_TAU, 0.5) == doctest::Approx((T)0.505 * Math_TAU));
+	CHECK(Math::lerp_angle((T)0.26 * Math::TAU, 0.75 * Math::TAU, 0.5) == doctest::Approx((T)0.505 * Math::TAU));
 
-	CHECK(Math::lerp_angle((T)-0.25 * Math_TAU, 1.25 * Math_TAU, 0.5) == doctest::Approx((T)-0.5 * Math_TAU));
-	CHECK(Math::lerp_angle((T)0.72 * Math_TAU, 1.44 * Math_TAU, 0.96) == doctest::Approx((T)0.4512 * Math_TAU));
-	CHECK(Math::lerp_angle((T)0.72 * Math_TAU, 1.44 * Math_TAU, 1.04) == doctest::Approx((T)0.4288 * Math_TAU));
+	CHECK(Math::lerp_angle((T)-0.25 * Math::TAU, 1.25 * Math::TAU, 0.5) == doctest::Approx((T)-0.5 * Math::TAU));
+	CHECK(Math::lerp_angle((T)0.72 * Math::TAU, 1.44 * Math::TAU, 0.96) == doctest::Approx((T)0.4512 * Math::TAU));
+	CHECK(Math::lerp_angle((T)0.72 * Math::TAU, 1.44 * Math::TAU, 1.04) == doctest::Approx((T)0.4288 * Math::TAU));
 
 	// Initial and final angles are effectively identical, so the value returned
 	// should always be the same regardless of the `weight` parameter.
-	CHECK(Math::lerp_angle((T)-4 * Math_TAU, 4 * Math_TAU, -1.0) == doctest::Approx((T)-4.0 * Math_TAU));
-	CHECK(Math::lerp_angle((T)-4 * Math_TAU, 4 * Math_TAU, 0.0) == doctest::Approx((T)-4.0 * Math_TAU));
-	CHECK(Math::lerp_angle((T)-4 * Math_TAU, 4 * Math_TAU, 0.5) == doctest::Approx((T)-4.0 * Math_TAU));
-	CHECK(Math::lerp_angle((T)-4 * Math_TAU, 4 * Math_TAU, 1.0) == doctest::Approx((T)-4.0 * Math_TAU));
-	CHECK(Math::lerp_angle((T)-4 * Math_TAU, 4 * Math_TAU, 500.0) == doctest::Approx((T)-4.0 * Math_TAU));
+	CHECK(Math::lerp_angle((T)-4 * Math::TAU, 4 * Math::TAU, -1.0) == doctest::Approx((T)-4.0 * Math::TAU));
+	CHECK(Math::lerp_angle((T)-4 * Math::TAU, 4 * Math::TAU, 0.0) == doctest::Approx((T)-4.0 * Math::TAU));
+	CHECK(Math::lerp_angle((T)-4 * Math::TAU, 4 * Math::TAU, 0.5) == doctest::Approx((T)-4.0 * Math::TAU));
+	CHECK(Math::lerp_angle((T)-4 * Math::TAU, 4 * Math::TAU, 1.0) == doctest::Approx((T)-4.0 * Math::TAU));
+	CHECK(Math::lerp_angle((T)-4 * Math::TAU, 4 * Math::TAU, 500.0) == doctest::Approx((T)-4.0 * Math::TAU));
 }
 
 TEST_CASE_TEMPLATE("[Math] move_toward", T, float, double) {
@@ -437,16 +436,16 @@ TEST_CASE_TEMPLATE("[Math] move_toward", T, float, double) {
 
 TEST_CASE_TEMPLATE("[Math] rotate_toward", T, float, double) {
 	// Rotate toward.
-	CHECK(Math::rotate_toward((T)0.0, (T)Math_PI * (T)0.75, (T)1.5) == doctest::Approx((T)1.5));
+	CHECK(Math::rotate_toward((T)0.0, (T)Math::PI * (T)0.75, (T)1.5) == doctest::Approx((T)1.5));
 	CHECK(Math::rotate_toward((T)-2.0, (T)1.0, (T)2.5) == doctest::Approx((T)0.5));
-	CHECK(Math::rotate_toward((T)-2.0, (T)Math_PI, (T)Math_PI) == doctest::Approx((T)-Math_PI));
-	CHECK(Math::rotate_toward((T)1.0, (T)Math_PI, (T)20.0) == doctest::Approx((T)Math_PI));
+	CHECK(Math::rotate_toward((T)-2.0, (T)Math::PI, (T)Math::PI) == doctest::Approx((T)-Math::PI));
+	CHECK(Math::rotate_toward((T)1.0, (T)Math::PI, (T)20.0) == doctest::Approx((T)Math::PI));
 
 	// Rotate away.
 	CHECK(Math::rotate_toward((T)0.0, (T)0.0, (T)-1.5) == doctest::Approx((T)-1.5));
-	CHECK(Math::rotate_toward((T)0.0, (T)0.0, (T)-Math_PI) == doctest::Approx((T)-Math_PI));
-	CHECK(Math::rotate_toward((T)3.0, (T)Math_PI, (T)-Math_PI) == doctest::Approx((T)0.0));
-	CHECK(Math::rotate_toward((T)2.0, (T)Math_PI, (T)-1.5) == doctest::Approx((T)0.5));
+	CHECK(Math::rotate_toward((T)0.0, (T)0.0, (T)-Math::PI) == doctest::Approx((T)-Math::PI));
+	CHECK(Math::rotate_toward((T)3.0, (T)Math::PI, (T)-Math::PI) == doctest::Approx((T)0.0));
+	CHECK(Math::rotate_toward((T)2.0, (T)Math::PI, (T)-1.5) == doctest::Approx((T)0.5));
 	CHECK(Math::rotate_toward((T)1.0, (T)2.0, (T)-0.5) == doctest::Approx((T)0.5));
 	CHECK(Math::rotate_toward((T)2.5, (T)2.0, (T)-0.5) == doctest::Approx((T)3.0));
 	CHECK(Math::rotate_toward((T)-1.0, (T)1.0, (T)-1.0) == doctest::Approx((T)-2.0));
@@ -586,10 +585,10 @@ TEST_CASE_TEMPLATE("[Math] pingpong", T, float, double) {
 }
 
 TEST_CASE_TEMPLATE("[Math] deg_to_rad/rad_to_deg", T, float, double) {
-	CHECK(Math::deg_to_rad((T)180.0) == doctest::Approx((T)Math_PI));
+	CHECK(Math::deg_to_rad((T)180.0) == doctest::Approx((T)Math::PI));
 	CHECK(Math::deg_to_rad((T)-27.0) == doctest::Approx((T)-0.471239));
 
-	CHECK(Math::rad_to_deg((T)Math_PI) == doctest::Approx((T)180.0));
+	CHECK(Math::rad_to_deg((T)Math::PI) == doctest::Approx((T)180.0));
 	CHECK(Math::rad_to_deg((T)-1.5) == doctest::Approx((T)-85.94366927));
 }
 
@@ -608,11 +607,11 @@ TEST_CASE_TEMPLATE("[Math] cubic_interpolate", T, float, double) {
 }
 
 TEST_CASE_TEMPLATE("[Math] cubic_interpolate_angle", T, float, double) {
-	CHECK(Math::cubic_interpolate_angle((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.0) == doctest::Approx((T)Math_PI * (1.0 / 6.0)));
-	CHECK(Math::cubic_interpolate_angle((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.25) == doctest::Approx((T)0.973566));
-	CHECK(Math::cubic_interpolate_angle((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.5) == doctest::Approx((T)Math_PI / 2.0));
-	CHECK(Math::cubic_interpolate_angle((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.75) == doctest::Approx((T)2.16803));
-	CHECK(Math::cubic_interpolate_angle((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)1.0) == doctest::Approx((T)Math_PI * (5.0 / 6.0)));
+	CHECK(Math::cubic_interpolate_angle((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.0) == doctest::Approx((T)Math::PI * (1.0 / 6.0)));
+	CHECK(Math::cubic_interpolate_angle((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.25) == doctest::Approx((T)0.973566));
+	CHECK(Math::cubic_interpolate_angle((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.5) == doctest::Approx((T)Math::PI / 2.0));
+	CHECK(Math::cubic_interpolate_angle((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.75) == doctest::Approx((T)2.16803));
+	CHECK(Math::cubic_interpolate_angle((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)1.0) == doctest::Approx((T)Math::PI * (5.0 / 6.0)));
 }
 
 TEST_CASE_TEMPLATE("[Math] cubic_interpolate_in_time", T, float, double) {
@@ -624,11 +623,11 @@ TEST_CASE_TEMPLATE("[Math] cubic_interpolate_in_time", T, float, double) {
 }
 
 TEST_CASE_TEMPLATE("[Math] cubic_interpolate_angle_in_time", T, float, double) {
-	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.0, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)0.0));
-	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.25, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)0.494964));
-	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.5, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)1.27627));
-	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)0.75, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)2.07394));
-	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math_PI * (1.0 / 6.0)), (T)(Math_PI * (5.0 / 6.0)), (T)0.0, (T)Math_PI, (T)1.0, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)Math_PI * (5.0 / 6.0)));
+	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.0, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)0.0));
+	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.25, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)0.494964));
+	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.5, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)1.27627));
+	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)0.75, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)2.07394));
+	CHECK(Math::cubic_interpolate_angle_in_time((T)(Math::PI * (1.0 / 6.0)), (T)(Math::PI * (5.0 / 6.0)), (T)0.0, (T)Math::PI, (T)1.0, (T)0.5, (T)0.0, (T)1.0) == doctest::Approx((T)Math::PI * (5.0 / 6.0)));
 }
 
 TEST_CASE_TEMPLATE("[Math] bezier_interpolate", T, float, double) {
@@ -640,5 +639,3 @@ TEST_CASE_TEMPLATE("[Math] bezier_interpolate", T, float, double) {
 }
 
 } // namespace TestMath
-
-#endif // TEST_MATH_FUNCS_H
diff --git a/engine/tests/core/math/test_plane.h b/engine/tests/core/math/test_plane.h
index e27958a7..aefd27ca 100644
--- a/engine/tests/core/math/test_plane.h
+++ b/engine/tests/core/math/test_plane.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PLANE_H
-#define TEST_PLANE_H
+#pragma once
 
 #include "core/math/plane.h"
 
@@ -40,22 +39,22 @@ namespace TestPlane {
 // Plane
 
 TEST_CASE("[Plane] Constructor methods") {
-	const Plane plane = Plane(32, 22, 16, 3);
-	const Plane plane_vector = Plane(Vector3(32, 22, 16), 3);
-	const Plane plane_copy_plane = Plane(plane);
+	constexpr Plane plane = Plane(32, 22, 16, 3);
+	constexpr Plane plane_vector = Plane(Vector3(32, 22, 16), 3);
+	constexpr Plane plane_copy_plane = Plane(plane);
 
-	CHECK_MESSAGE(
+	static_assert(
 			plane == plane_vector,
 			"Planes created with same values but different methods should be equal.");
 
-	CHECK_MESSAGE(
+	static_assert(
 			plane == plane_copy_plane,
 			"Planes created with same values but different methods should be equal.");
 }
 
 TEST_CASE("[Plane] Basic getters") {
-	const Plane plane = Plane(32, 22, 16, 3);
-	const Plane plane_normalized = Plane(32.0 / 42, 22.0 / 42, 16.0 / 42, 3.0 / 42);
+	constexpr Plane plane = Plane(32, 22, 16, 3);
+	constexpr Plane plane_normalized = Plane(32.0 / 42, 22.0 / 42, 16.0 / 42, 3.0 / 42);
 
 	CHECK_MESSAGE(
 			plane.get_normal().is_equal_approx(Vector3(32, 22, 16)),
@@ -83,8 +82,8 @@ TEST_CASE("[Plane] Basic setters") {
 }
 
 TEST_CASE("[Plane] Plane-point operations") {
-	const Plane plane = Plane(32, 22, 16, 3);
-	const Plane y_facing_plane = Plane(0, 1, 0, 4);
+	constexpr Plane plane = Plane(32, 22, 16, 3);
+	constexpr Plane y_facing_plane = Plane(0, 1, 0, 4);
 
 	CHECK_MESSAGE(
 			plane.get_center().is_equal_approx(Vector3(32 * 3, 22 * 3, 16 * 3)),
@@ -102,16 +101,16 @@ TEST_CASE("[Plane] Plane-point operations") {
 }
 
 TEST_CASE("[Plane] Has point") {
-	const Plane x_facing_plane = Plane(1, 0, 0, 0);
-	const Plane y_facing_plane = Plane(0, 1, 0, 0);
-	const Plane z_facing_plane = Plane(0, 0, 1, 0);
+	constexpr Plane x_facing_plane = Plane(1, 0, 0, 0);
+	constexpr Plane y_facing_plane = Plane(0, 1, 0, 0);
+	constexpr Plane z_facing_plane = Plane(0, 0, 1, 0);
 
-	const Vector3 x_axis_point = Vector3(10, 0, 0);
-	const Vector3 y_axis_point = Vector3(0, 10, 0);
-	const Vector3 z_axis_point = Vector3(0, 0, 10);
+	constexpr Vector3 x_axis_point = Vector3(10, 0, 0);
+	constexpr Vector3 y_axis_point = Vector3(0, 10, 0);
+	constexpr Vector3 z_axis_point = Vector3(0, 0, 10);
 
-	const Plane x_facing_plane_with_d_offset = Plane(1, 0, 0, 1);
-	const Vector3 y_axis_point_with_d_offset = Vector3(1, 10, 0);
+	constexpr Plane x_facing_plane_with_d_offset = Plane(1, 0, 0, 1);
+	constexpr Vector3 y_axis_point_with_d_offset = Vector3(1, 10, 0);
 
 	CHECK_MESSAGE(
 			x_facing_plane.has_point(y_axis_point),
@@ -140,9 +139,9 @@ TEST_CASE("[Plane] Has point") {
 }
 
 TEST_CASE("[Plane] Intersection") {
-	const Plane x_facing_plane = Plane(1, 0, 0, 1);
-	const Plane y_facing_plane = Plane(0, 1, 0, 2);
-	const Plane z_facing_plane = Plane(0, 0, 1, 3);
+	constexpr Plane x_facing_plane = Plane(1, 0, 0, 1);
+	constexpr Plane y_facing_plane = Plane(0, 1, 0, 2);
+	constexpr Plane z_facing_plane = Plane(0, 0, 1, 3);
 
 	Vector3 vec_out;
 
@@ -169,10 +168,10 @@ TEST_CASE("[Plane] Intersection") {
 }
 
 TEST_CASE("[Plane] Finite number checks") {
-	const Vector3 x(0, 1, 2);
-	const Vector3 infinite_vec(NAN, NAN, NAN);
-	const real_t y = 0;
-	const real_t infinite_y = NAN;
+	constexpr Vector3 x(0, 1, 2);
+	constexpr Vector3 infinite_vec(Math::NaN, Math::NaN, Math::NaN);
+	constexpr real_t y = 0;
+	constexpr real_t infinite_y = Math::NaN;
 
 	CHECK_MESSAGE(
 			Plane(x, y).is_finite(),
@@ -191,5 +190,3 @@ TEST_CASE("[Plane] Finite number checks") {
 }
 
 } // namespace TestPlane
-
-#endif // TEST_PLANE_H
diff --git a/engine/tests/core/math/test_projection.h b/engine/tests/core/math/test_projection.h
index 02bee245..d3bf3e2d 100644
--- a/engine/tests/core/math/test_projection.h
+++ b/engine/tests/core/math/test_projection.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PROJECTION_H
-#define TEST_PROJECTION_H
+#pragma once
 
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
@@ -183,12 +182,6 @@ TEST_CASE("[Projection] Vector transformation") {
 			Vector4(4, 7, 11, 15),
 			Vector4(4, 8, 12, 16));
 
-	Projection inverse(
-			Vector4(-4.0 / 12, 0, 1, -8.0 / 12),
-			Vector4(8.0 / 12, -1, -1, 16.0 / 12),
-			Vector4(-20.0 / 12, 2, -1, 5.0 / 12),
-			Vector4(1, -1, 1, -0.75));
-
 	Vector4 vec4(1, 2, 3, 4);
 	CHECK(proj.xform(vec4).is_equal_approx(Vector4(33, 70, 112, 152)));
 	CHECK(proj.xform_inv(vec4).is_equal_approx(Vector4(90, 107, 111, 120)));
@@ -449,6 +442,78 @@ TEST_CASE("[Projection] Perspective values extraction") {
 	CHECK(zfar == doctest::Approx(50));
 	CHECK(aspect == doctest::Approx(0.5));
 	CHECK(fov == doctest::Approx(90));
+
+	persp.set_perspective(38, 1.3, 0.2, 8, false);
+
+	znear = persp.get_z_near();
+	zfar = persp.get_z_far();
+	aspect = persp.get_aspect();
+	fov = persp.get_fov();
+
+	CHECK(znear == doctest::Approx(0.2));
+	CHECK(zfar == doctest::Approx(8));
+	CHECK(aspect == doctest::Approx(1.3));
+	CHECK(fov == doctest::Approx(Projection::get_fovy(38, 1.3)));
+
+	persp.set_perspective(47, 2.5, 0.9, 14, true);
+
+	znear = persp.get_z_near();
+	zfar = persp.get_z_far();
+	aspect = persp.get_aspect();
+	fov = persp.get_fov();
+
+	CHECK(znear == doctest::Approx(0.9));
+	CHECK(zfar == doctest::Approx(14));
+	CHECK(aspect == doctest::Approx(2.5));
+	CHECK(fov == doctest::Approx(47));
+}
+
+TEST_CASE("[Projection] Frustum values extraction") {
+	Projection frustum = Projection::create_frustum_aspect(1.0, 4.0 / 3.0, Vector2(0.5, -0.25), 0.5, 50, true);
+
+	double znear = frustum.get_z_near();
+	double zfar = frustum.get_z_far();
+	double aspect = frustum.get_aspect();
+	double fov = frustum.get_fov();
+
+	CHECK(znear == doctest::Approx(0.5));
+	CHECK(zfar == doctest::Approx(50));
+	CHECK(aspect == doctest::Approx(4.0 / 3.0));
+	CHECK(fov == doctest::Approx(Math::rad_to_deg(Math::atan(2.0))));
+
+	frustum.set_frustum(2.0, 1.5, Vector2(-0.5, 2), 2, 12, false);
+
+	znear = frustum.get_z_near();
+	zfar = frustum.get_z_far();
+	aspect = frustum.get_aspect();
+	fov = frustum.get_fov();
+
+	CHECK(znear == doctest::Approx(2));
+	CHECK(zfar == doctest::Approx(12));
+	CHECK(aspect == doctest::Approx(1.5));
+	CHECK(fov == doctest::Approx(Math::rad_to_deg(Math::atan(1.0) + Math::atan(0.5))));
+}
+
+TEST_CASE("[Projection] Orthographic values extraction") {
+	Projection ortho = Projection::create_orthogonal(-2, 3, -0.5, 1.5, 1.2, 15);
+
+	double znear = ortho.get_z_near();
+	double zfar = ortho.get_z_far();
+	double aspect = ortho.get_aspect();
+
+	CHECK(znear == doctest::Approx(1.2));
+	CHECK(zfar == doctest::Approx(15));
+	CHECK(aspect == doctest::Approx(2.5));
+
+	ortho.set_orthogonal(-7, 2, 2.5, 5.5, 0.5, 6);
+
+	znear = ortho.get_z_near();
+	zfar = ortho.get_z_far();
+	aspect = ortho.get_aspect();
+
+	CHECK(znear == doctest::Approx(0.5));
+	CHECK(zfar == doctest::Approx(6));
+	CHECK(aspect == doctest::Approx(3));
 }
 
 TEST_CASE("[Projection] Orthographic check") {
@@ -487,16 +552,48 @@ TEST_CASE("[Projection] Planes extraction") {
 	CHECK(plane_array[Projection::PLANE_BOTTOM].normalized().is_equal_approx(planes[Projection::PLANE_BOTTOM].normalized()));
 }
 
-TEST_CASE("[Projection] Half extents") {
+TEST_CASE("[Projection] Perspective Half extents") {
+	constexpr real_t sqrt3 = 1.7320508;
 	Projection persp = Projection::create_perspective(90, 1, 1, 40, false);
 	Vector2 ne = persp.get_viewport_half_extents();
 	Vector2 fe = persp.get_far_plane_half_extents();
 
 	CHECK(ne.is_equal_approx(Vector2(1, 1) * 1));
 	CHECK(fe.is_equal_approx(Vector2(1, 1) * 40));
+
+	persp.set_perspective(120, sqrt3, 0.8, 10, true);
+	ne = persp.get_viewport_half_extents();
+	fe = persp.get_far_plane_half_extents();
+
+	CHECK(ne.is_equal_approx(Vector2(sqrt3, 1.0) * 0.8));
+	CHECK(fe.is_equal_approx(Vector2(sqrt3, 1.0) * 10));
+
+	persp.set_perspective(60, 1.2, 0.5, 15, false);
+	ne = persp.get_viewport_half_extents();
+	fe = persp.get_far_plane_half_extents();
+
+	CHECK(ne.is_equal_approx(Vector2(sqrt3 / 3 * 1.2, sqrt3 / 3) * 0.5));
+	CHECK(fe.is_equal_approx(Vector2(sqrt3 / 3 * 1.2, sqrt3 / 3) * 15));
+}
+
+TEST_CASE("[Projection] Orthographic Half extents") {
+	Projection ortho = Projection::create_orthogonal(-3, 3, -1.5, 1.5, 1.2, 15);
+	Vector2 ne = ortho.get_viewport_half_extents();
+	Vector2 fe = ortho.get_far_plane_half_extents();
+
+	CHECK(ne.is_equal_approx(Vector2(3, 1.5)));
+	CHECK(fe.is_equal_approx(Vector2(3, 1.5)));
+
+	ortho.set_orthogonal(-7, 7, -2.5, 2.5, 0.5, 6);
+	ne = ortho.get_viewport_half_extents();
+	fe = ortho.get_far_plane_half_extents();
+
+	CHECK(ne.is_equal_approx(Vector2(7, 2.5)));
+	CHECK(fe.is_equal_approx(Vector2(7, 2.5)));
 }
 
 TEST_CASE("[Projection] Endpoints") {
+	constexpr real_t sqrt3 = 1.7320508;
 	Projection persp = Projection::create_perspective(90, 1, 1, 40, false);
 	Vector3 ep[8];
 	persp.get_endpoints(Transform3D(), ep);
@@ -509,8 +606,89 @@ TEST_CASE("[Projection] Endpoints") {
 	CHECK(ep[5].is_equal_approx(Vector3(-1, -1, -1) * 1));
 	CHECK(ep[6].is_equal_approx(Vector3(1, 1, -1) * 1));
 	CHECK(ep[7].is_equal_approx(Vector3(1, -1, -1) * 1));
+
+	persp.set_perspective(120, sqrt3, 0.8, 10, true);
+	persp.get_endpoints(Transform3D(), ep);
+
+	CHECK(ep[0].is_equal_approx(Vector3(-sqrt3, 1, -1) * 10));
+	CHECK(ep[1].is_equal_approx(Vector3(-sqrt3, -1, -1) * 10));
+	CHECK(ep[2].is_equal_approx(Vector3(sqrt3, 1, -1) * 10));
+	CHECK(ep[3].is_equal_approx(Vector3(sqrt3, -1, -1) * 10));
+	CHECK(ep[4].is_equal_approx(Vector3(-sqrt3, 1, -1) * 0.8));
+	CHECK(ep[5].is_equal_approx(Vector3(-sqrt3, -1, -1) * 0.8));
+	CHECK(ep[6].is_equal_approx(Vector3(sqrt3, 1, -1) * 0.8));
+	CHECK(ep[7].is_equal_approx(Vector3(sqrt3, -1, -1) * 0.8));
+
+	persp.set_perspective(60, 1.2, 0.5, 15, false);
+	persp.get_endpoints(Transform3D(), ep);
+
+	CHECK(ep[0].is_equal_approx(Vector3(-sqrt3 / 3 * 1.2, sqrt3 / 3, -1) * 15));
+	CHECK(ep[1].is_equal_approx(Vector3(-sqrt3 / 3 * 1.2, -sqrt3 / 3, -1) * 15));
+	CHECK(ep[2].is_equal_approx(Vector3(sqrt3 / 3 * 1.2, sqrt3 / 3, -1) * 15));
+	CHECK(ep[3].is_equal_approx(Vector3(sqrt3 / 3 * 1.2, -sqrt3 / 3, -1) * 15));
+	CHECK(ep[4].is_equal_approx(Vector3(-sqrt3 / 3 * 1.2, sqrt3 / 3, -1) * 0.5));
+	CHECK(ep[5].is_equal_approx(Vector3(-sqrt3 / 3 * 1.2, -sqrt3 / 3, -1) * 0.5));
+	CHECK(ep[6].is_equal_approx(Vector3(sqrt3 / 3 * 1.2, sqrt3 / 3, -1) * 0.5));
+	CHECK(ep[7].is_equal_approx(Vector3(sqrt3 / 3 * 1.2, -sqrt3 / 3, -1) * 0.5));
 }
 
-} //namespace TestProjection
+TEST_CASE("[Projection] LOD multiplier") {
+	constexpr real_t sqrt3 = 1.7320508;
+	Projection proj;
+	real_t multiplier;
 
-#endif // TEST_PROJECTION_H
+	proj.set_perspective(60, 1, 1, 40, false);
+	multiplier = proj.get_lod_multiplier();
+	CHECK(multiplier == doctest::Approx(2 * sqrt3 / 3));
+
+	proj.set_perspective(120, 1.5, 0.5, 20, false);
+	multiplier = proj.get_lod_multiplier();
+	CHECK(multiplier == doctest::Approx(3 * sqrt3));
+
+	proj.set_orthogonal(15, 20, 10, 12, 5, 15);
+	multiplier = proj.get_lod_multiplier();
+	CHECK(multiplier == doctest::Approx(5));
+
+	proj.set_orthogonal(-5, 15, -8, 10, 1.5, 10);
+	multiplier = proj.get_lod_multiplier();
+	CHECK(multiplier == doctest::Approx(20));
+
+	proj.set_frustum(1.0, 4.0 / 3.0, Vector2(0.5, -0.25), 0.5, 50, false);
+	multiplier = proj.get_lod_multiplier();
+	CHECK(multiplier == doctest::Approx(8.0 / 3.0));
+
+	proj.set_frustum(2.0, 1.2, Vector2(-0.1, 0.8), 1, 10, true);
+	multiplier = proj.get_lod_multiplier();
+	CHECK(multiplier == doctest::Approx(2));
+}
+
+TEST_CASE("[Projection] Pixels per meter") {
+	constexpr real_t sqrt3 = 1.7320508;
+	Projection proj;
+	int ppm;
+
+	proj.set_perspective(60, 1, 1, 40, false);
+	ppm = proj.get_pixels_per_meter(1024);
+	CHECK(ppm == int(1536.0f / sqrt3));
+
+	proj.set_perspective(120, 1.5, 0.5, 20, false);
+	ppm = proj.get_pixels_per_meter(1200);
+	CHECK(ppm == int(800.0f / sqrt3));
+
+	proj.set_orthogonal(15, 20, 10, 12, 5, 15);
+	ppm = proj.get_pixels_per_meter(500);
+	CHECK(ppm == 100);
+
+	proj.set_orthogonal(-5, 15, -8, 10, 1.5, 10);
+	ppm = proj.get_pixels_per_meter(640);
+	CHECK(ppm == 32);
+
+	proj.set_frustum(1.0, 4.0 / 3.0, Vector2(0.5, -0.25), 0.5, 50, false);
+	ppm = proj.get_pixels_per_meter(2048);
+	CHECK(ppm == 1536);
+
+	proj.set_frustum(2.0, 1.2, Vector2(-0.1, 0.8), 1, 10, true);
+	ppm = proj.get_pixels_per_meter(800);
+	CHECK(ppm == 400);
+}
+} //namespace TestProjection
diff --git a/engine/tests/core/math/test_quaternion.h b/engine/tests/core/math/test_quaternion.h
index 60194daa..050b8527 100644
--- a/engine/tests/core/math/test_quaternion.h
+++ b/engine/tests/core/math/test_quaternion.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_QUATERNION_H
-#define TEST_QUATERNION_H
+#pragma once
 
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
@@ -57,7 +56,7 @@ Quaternion quat_euler_yxz_deg(Vector3 angle) {
 }
 
 TEST_CASE("[Quaternion] Default Construct") {
-	Quaternion q;
+	constexpr Quaternion q;
 
 	CHECK(q[0] == 0.0);
 	CHECK(q[1] == 0.0);
@@ -67,7 +66,7 @@ TEST_CASE("[Quaternion] Default Construct") {
 
 TEST_CASE("[Quaternion] Construct x,y,z,w") {
 	// Values are taken from actual use in another project & are valid (except roundoff error).
-	Quaternion q(0.2391, 0.099, 0.3696, 0.8924);
+	constexpr Quaternion q(0.2391, 0.099, 0.3696, 0.8924);
 
 	CHECK(q[0] == doctest::Approx(0.2391));
 	CHECK(q[1] == doctest::Approx(0.099));
@@ -108,7 +107,7 @@ TEST_CASE("[Quaternion] Construct AxisAngle 3") {
 
 TEST_CASE("[Quaternion] Construct AxisAngle 4") {
 	// More complex & hard to visualize, so test w/ data from online calculator.
-	Vector3 axis(1.0, 2.0, 0.5);
+	constexpr Vector3 axis(1.0, 2.0, 0.5);
 	Quaternion q(axis.normalized(), Math::deg_to_rad(35.0));
 
 	CHECK(q[0] == doctest::Approx(0.131239));
@@ -118,7 +117,7 @@ TEST_CASE("[Quaternion] Construct AxisAngle 4") {
 }
 
 TEST_CASE("[Quaternion] Construct from Quaternion") {
-	Vector3 axis(1.0, 2.0, 0.5);
+	constexpr Vector3 axis(1.0, 2.0, 0.5);
 	Quaternion q_src(axis.normalized(), Math::deg_to_rad(35.0));
 	Quaternion q(q_src);
 
@@ -199,17 +198,17 @@ TEST_CASE("[Quaternion] Construct Basis Euler") {
 
 TEST_CASE("[Quaternion] Construct Basis Axes") {
 	// Arbitrary Euler angles.
-	Vector3 euler_yxz(Math::deg_to_rad(31.41), Math::deg_to_rad(-49.16), Math::deg_to_rad(12.34));
+	const Vector3 euler_yxz(Math::deg_to_rad(31.41), Math::deg_to_rad(-49.16), Math::deg_to_rad(12.34));
 	// Basis vectors from online calculation of rotation matrix.
-	Vector3 i_unit(0.5545787, 0.1823950, 0.8118957);
-	Vector3 j_unit(-0.5249245, 0.8337420, 0.1712555);
-	Vector3 k_unit(-0.6456754, -0.5211586, 0.5581192);
+	constexpr Vector3 i_unit(0.5545787, 0.1823950, 0.8118957);
+	constexpr Vector3 j_unit(-0.5249245, 0.8337420, 0.1712555);
+	constexpr Vector3 k_unit(-0.6456754, -0.5211586, 0.5581192);
 	// Quaternion from online calculation.
-	Quaternion q_calc(0.2016913, -0.4245716, 0.206033, 0.8582598);
+	constexpr Quaternion q_calc(0.2016913, -0.4245716, 0.206033, 0.8582598);
 	// Quaternion from local calculation.
-	Quaternion q_local = quat_euler_yxz_deg(Vector3(31.41, -49.16, 12.34));
+	const Quaternion q_local = quat_euler_yxz_deg(Vector3(31.41, -49.16, 12.34));
 	// Quaternion from Euler angles constructor.
-	Quaternion q_euler = Quaternion::from_euler(euler_yxz);
+	const Quaternion q_euler = Quaternion::from_euler(euler_yxz);
 	CHECK(q_calc.is_equal_approx(q_local));
 	CHECK(q_local.is_equal_approx(q_euler));
 
@@ -287,10 +286,10 @@ TEST_CASE("[Quaternion] Get Euler Orders") {
 
 TEST_CASE("[Quaternion] Product (book)") {
 	// Example from "Quaternions and Rotation Sequences" by Jack Kuipers, p. 108.
-	Quaternion p(1.0, -2.0, 1.0, 3.0);
-	Quaternion q(-1.0, 2.0, 3.0, 2.0);
+	constexpr Quaternion p(1.0, -2.0, 1.0, 3.0);
+	constexpr Quaternion q(-1.0, 2.0, 3.0, 2.0);
 
-	Quaternion pq = p * q;
+	constexpr Quaternion pq = p * q;
 	CHECK(pq[0] == doctest::Approx(-9.0));
 	CHECK(pq[1] == doctest::Approx(-2.0));
 	CHECK(pq[2] == doctest::Approx(11.0));
@@ -383,13 +382,13 @@ TEST_CASE("[Quaternion] xform unit vectors") {
 
 TEST_CASE("[Quaternion] xform vector") {
 	// Arbitrary quaternion rotates an arbitrary vector.
-	Vector3 euler_yzx(Math::deg_to_rad(31.41), Math::deg_to_rad(-49.16), Math::deg_to_rad(12.34));
-	Basis basis_axes = Basis::from_euler(euler_yzx);
-	Quaternion q(basis_axes);
+	const Vector3 euler_yzx(Math::deg_to_rad(31.41), Math::deg_to_rad(-49.16), Math::deg_to_rad(12.34));
+	const Basis basis_axes = Basis::from_euler(euler_yzx);
+	const Quaternion q(basis_axes);
 
-	Vector3 v_arb(3.0, 4.0, 5.0);
-	Vector3 v_rot = q.xform(v_arb);
-	Vector3 v_compare = basis_axes.xform(v_arb);
+	constexpr Vector3 v_arb(3.0, 4.0, 5.0);
+	const Vector3 v_rot = q.xform(v_arb);
+	const Vector3 v_compare = basis_axes.xform(v_arb);
 
 	CHECK(v_rot.length_squared() == doctest::Approx(v_arb.length_squared()));
 	CHECK(v_rot.is_equal_approx(v_compare));
@@ -397,11 +396,11 @@ TEST_CASE("[Quaternion] xform vector") {
 
 // Test vector xform for a single combination of Quaternion and Vector.
 void test_quat_vec_rotate(Vector3 euler_yzx, Vector3 v_in) {
-	Basis basis_axes = Basis::from_euler(euler_yzx);
-	Quaternion q(basis_axes);
+	const Basis basis_axes = Basis::from_euler(euler_yzx);
+	const Quaternion q(basis_axes);
 
-	Vector3 v_rot = q.xform(v_in);
-	Vector3 v_compare = basis_axes.xform(v_in);
+	const Vector3 v_rot = q.xform(v_in);
+	const Vector3 v_compare = basis_axes.xform(v_in);
 
 	CHECK(v_rot.length_squared() == doctest::Approx(v_in.length_squared()));
 	CHECK(v_rot.is_equal_approx(v_compare));
@@ -411,22 +410,22 @@ TEST_CASE("[Stress][Quaternion] Many vector xforms") {
 	// Many arbitrary quaternions rotate many arbitrary vectors.
 	// For each trial, check that rotation by Quaternion yields same result as
 	// rotation by Basis.
-	const int STEPS = 100; // Number of test steps in each dimension
-	const double delta = 2.0 * Math_PI / STEPS; // Angle increment per step
-	const double delta_vec = 20.0 / STEPS; // Vector increment per step
+	constexpr int STEPS = 100; // Number of test steps in each dimension
+	constexpr double delta = 2.0 * Math::PI / STEPS; // Angle increment per step
+	constexpr double delta_vec = 20.0 / STEPS; // Vector increment per step
 	Vector3 vec_arb(1.0, 1.0, 1.0);
-	double x_angle = -Math_PI;
-	double y_angle = -Math_PI;
-	double z_angle = -Math_PI;
+	double x_angle = -Math::PI;
+	double y_angle = -Math::PI;
+	double z_angle = -Math::PI;
 	for (double i = 0; i < STEPS; ++i) {
 		vec_arb[0] = -10.0 + i * delta_vec;
-		x_angle = i * delta - Math_PI;
+		x_angle = i * delta - Math::PI;
 		for (double j = 0; j < STEPS; ++j) {
 			vec_arb[1] = -10.0 + j * delta_vec;
-			y_angle = j * delta - Math_PI;
+			y_angle = j * delta - Math::PI;
 			for (double k = 0; k < STEPS; ++k) {
 				vec_arb[2] = -10.0 + k * delta_vec;
-				z_angle = k * delta - Math_PI;
+				z_angle = k * delta - Math::PI;
 				Vector3 euler_yzx(x_angle, y_angle, z_angle);
 				test_quat_vec_rotate(euler_yzx, vec_arb);
 			}
@@ -435,7 +434,7 @@ TEST_CASE("[Stress][Quaternion] Many vector xforms") {
 }
 
 TEST_CASE("[Quaternion] Finite number checks") {
-	const real_t x = NAN;
+	constexpr real_t x = Math::NaN;
 
 	CHECK_MESSAGE(
 			Quaternion(0, 1, 2, 3).is_finite(),
@@ -492,5 +491,3 @@ TEST_CASE("[Quaternion] Finite number checks") {
 }
 
 } // namespace TestQuaternion
-
-#endif // TEST_QUATERNION_H
diff --git a/engine/tests/core/math/test_random_number_generator.h b/engine/tests/core/math/test_random_number_generator.h
index d88c0f67..948fb1d7 100644
--- a/engine/tests/core/math/test_random_number_generator.h
+++ b/engine/tests/core/math/test_random_number_generator.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_RANDOM_NUMBER_GENERATOR_H
-#define TEST_RANDOM_NUMBER_GENERATOR_H
+#pragma once
 
 #include "core/math/random_number_generator.h"
 #include "tests/test_macros.h"
@@ -271,5 +270,3 @@ TEST_CASE_MAY_FAIL("[RandomNumberGenerator] randi_range bias check") {
 	}
 }
 } // namespace TestRandomNumberGenerator
-
-#endif // TEST_RANDOM_NUMBER_GENERATOR_H
diff --git a/engine/tests/core/math/test_rect2.h b/engine/tests/core/math/test_rect2.h
index a93bfeb7..69280fe6 100644
--- a/engine/tests/core/math/test_rect2.h
+++ b/engine/tests/core/math/test_rect2.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_RECT2_H
-#define TEST_RECT2_H
+#pragma once
 
 #include "core/math/rect2.h"
 #include "core/math/rect2i.h"
@@ -38,15 +37,15 @@
 
 namespace TestRect2 {
 TEST_CASE("[Rect2] Constructor methods") {
-	const Rect2 rect = Rect2(0, 100, 1280, 720);
-	const Rect2 rect_vector = Rect2(Vector2(0, 100), Vector2(1280, 720));
-	const Rect2 rect_copy_rect = Rect2(rect);
+	constexpr Rect2 rect = Rect2(0, 100, 1280, 720);
+	constexpr Rect2 rect_vector = Rect2(Vector2(0, 100), Vector2(1280, 720));
+	constexpr Rect2 rect_copy_rect = Rect2(rect);
 	const Rect2 rect_copy_recti = Rect2(Rect2i(0, 100, 1280, 720));
 
-	CHECK_MESSAGE(
+	static_assert(
 			rect == rect_vector,
 			"Rect2s created with the same dimensions but by different methods should be equal.");
-	CHECK_MESSAGE(
+	static_assert(
 			rect == rect_copy_rect,
 			"Rect2s created with the same dimensions but by different methods should be equal.");
 	CHECK_MESSAGE(
@@ -62,7 +61,7 @@ TEST_CASE("[Rect2] String conversion") {
 }
 
 TEST_CASE("[Rect2] Basic getters") {
-	const Rect2 rect = Rect2(0, 100, 1280, 720);
+	constexpr Rect2 rect = Rect2(0, 100, 1280, 720);
 	CHECK_MESSAGE(
 			rect.get_position().is_equal_approx(Vector2(0, 100)),
 			"get_position() should return the expected value.");
@@ -181,7 +180,7 @@ TEST_CASE("[Rect2] Expanding") {
 }
 
 TEST_CASE("[Rect2] Get support") {
-	const Rect2 rect = Rect2(Vector2(-1.5, 2), Vector2(4, 5));
+	constexpr Rect2 rect = Rect2(Vector2(-1.5, 2), Vector2(4, 5));
 	CHECK_MESSAGE(
 			rect.get_support(Vector2(1, 0)) == Vector2(2.5, 2),
 			"get_support() should return the expected value.");
@@ -324,8 +323,8 @@ TEST_CASE("[Rect2] Merging") {
 }
 
 TEST_CASE("[Rect2] Finite number checks") {
-	const Vector2 x(0, 1);
-	const Vector2 infinite(NAN, NAN);
+	constexpr Vector2 x(0, 1);
+	constexpr Vector2 infinite(Math::NaN, Math::NaN);
 
 	CHECK_MESSAGE(
 			Rect2(x, x).is_finite(),
@@ -344,5 +343,3 @@ TEST_CASE("[Rect2] Finite number checks") {
 }
 
 } // namespace TestRect2
-
-#endif // TEST_RECT2_H
diff --git a/engine/tests/core/math/test_rect2i.h b/engine/tests/core/math/test_rect2i.h
index 2c09348c..68495bac 100644
--- a/engine/tests/core/math/test_rect2i.h
+++ b/engine/tests/core/math/test_rect2i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_RECT2I_H
-#define TEST_RECT2I_H
+#pragma once
 
 #include "core/math/rect2.h"
 #include "core/math/rect2i.h"
@@ -38,15 +37,15 @@
 
 namespace TestRect2i {
 TEST_CASE("[Rect2i] Constructor methods") {
-	Rect2i recti = Rect2i(0, 100, 1280, 720);
-	Rect2i recti_vector = Rect2i(Vector2i(0, 100), Vector2i(1280, 720));
-	Rect2i recti_copy_recti = Rect2i(recti);
-	Rect2i recti_copy_rect = Rect2i(Rect2(0, 100, 1280, 720));
+	constexpr Rect2i recti = Rect2i(0, 100, 1280, 720);
+	constexpr Rect2i recti_vector = Rect2i(Vector2i(0, 100), Vector2i(1280, 720));
+	constexpr Rect2i recti_copy_recti = Rect2i(recti);
+	const Rect2i recti_copy_rect = Rect2i(Rect2(0, 100, 1280, 720));
 
-	CHECK_MESSAGE(
+	static_assert(
 			recti == recti_vector,
 			"Rect2is created with the same dimensions but by different methods should be equal.");
-	CHECK_MESSAGE(
+	static_assert(
 			recti == recti_copy_recti,
 			"Rect2is created with the same dimensions but by different methods should be equal.");
 	CHECK_MESSAGE(
@@ -62,7 +61,7 @@ TEST_CASE("[Rect2i] String conversion") {
 }
 
 TEST_CASE("[Rect2i] Basic getters") {
-	const Rect2i rect = Rect2i(0, 100, 1280, 720);
+	constexpr Rect2i rect = Rect2i(0, 100, 1280, 720);
 	CHECK_MESSAGE(
 			rect.get_position() == Vector2i(0, 100),
 			"get_position() should return the expected value.");
@@ -307,5 +306,3 @@ TEST_CASE("[Rect2i] Merging") {
 			"merge() with non-enclosed Rect2i should return the expected result.");
 }
 } // namespace TestRect2i
-
-#endif // TEST_RECT2I_H
diff --git a/engine/tests/core/math/test_transform_2d.h b/engine/tests/core/math/test_transform_2d.h
index 6d3c80e5..b6f18bd7 100644
--- a/engine/tests/core/math/test_transform_2d.h
+++ b/engine/tests/core/math/test_transform_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TRANSFORM_2D_H
-#define TEST_TRANSFORM_2D_H
+#pragma once
 
 #include "core/math/transform_2d.h"
 
@@ -57,8 +56,8 @@ TEST_CASE("[Transform2D] Copy constructor") {
 }
 
 TEST_CASE("[Transform2D] Constructor from angle and position") {
-	constexpr float ROTATION = Math_PI / 4;
-	const Vector2 TRANSLATION = Vector2(20, -20);
+	constexpr float ROTATION = Math::PI / 4;
+	constexpr Vector2 TRANSLATION = Vector2(20, -20);
 
 	const Transform2D test = Transform2D(ROTATION, TRANSLATION);
 	const Transform2D expected = Transform2D().rotated(ROTATION).translated(TRANSLATION);
@@ -66,10 +65,10 @@ TEST_CASE("[Transform2D] Constructor from angle and position") {
 }
 
 TEST_CASE("[Transform2D] Constructor from angle, scale, skew and position") {
-	constexpr float ROTATION = Math_PI / 2;
-	const Vector2 SCALE = Vector2(2, 0.5);
-	constexpr float SKEW = Math_PI / 4;
-	const Vector2 TRANSLATION = Vector2(30, 0);
+	constexpr float ROTATION = Math::PI / 2;
+	constexpr Vector2 SCALE = Vector2(2, 0.5);
+	constexpr float SKEW = Math::PI / 4;
+	constexpr Vector2 TRANSLATION = Vector2(30, 0);
 
 	const Transform2D test = Transform2D(ROTATION, SCALE, SKEW, TRANSLATION);
 	Transform2D expected = Transform2D().scaled(SCALE).rotated(ROTATION).translated(TRANSLATION);
@@ -79,26 +78,26 @@ TEST_CASE("[Transform2D] Constructor from angle, scale, skew and position") {
 }
 
 TEST_CASE("[Transform2D] Constructor from raw values") {
-	const Transform2D test = Transform2D(1, 2, 3, 4, 5, 6);
-	const Transform2D expected = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(5, 6));
-	CHECK(test == expected);
+	constexpr Transform2D test = Transform2D(1, 2, 3, 4, 5, 6);
+	constexpr Transform2D expected = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(5, 6));
+	static_assert(test == expected);
 }
 
 TEST_CASE("[Transform2D] xform") {
-	const Vector2 v = Vector2(2, 3);
-	const Transform2D T = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(5, 6));
-	const Vector2 expected = Vector2(1 * 2 + 3 * 3 + 5 * 1, 2 * 2 + 4 * 3 + 6 * 1);
+	constexpr Vector2 v = Vector2(2, 3);
+	constexpr Transform2D T = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(5, 6));
+	constexpr Vector2 expected = Vector2(1 * 2 + 3 * 3 + 5 * 1, 2 * 2 + 4 * 3 + 6 * 1);
 	CHECK(T.xform(v) == expected);
 }
 
 TEST_CASE("[Transform2D] Basis xform") {
-	const Vector2 v = Vector2(2, 2);
-	const Transform2D T1 = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(0, 0));
+	constexpr Vector2 v = Vector2(2, 2);
+	constexpr Transform2D T1 = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(0, 0));
 
 	// Both versions should be the same when the origin is (0,0).
 	CHECK(T1.basis_xform(v) == T1.xform(v));
 
-	const Transform2D T2 = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(5, 6));
+	constexpr Transform2D T2 = Transform2D(Vector2(1, 2), Vector2(3, 4), Vector2(5, 6));
 
 	// Each version should be different when the origin is not (0,0).
 	CHECK_FALSE(T2.basis_xform(v) == T2.xform(v));
@@ -130,7 +129,7 @@ TEST_CASE("[Transform2D] Orthonormalized") {
 }
 
 TEST_CASE("[Transform2D] translation") {
-	const Vector2 offset = Vector2(1, 2);
+	constexpr Vector2 offset = Vector2(1, 2);
 
 	// Both versions should give the same result applied to identity.
 	CHECK(identity().translated(offset) == identity().translated_local(offset));
@@ -143,7 +142,7 @@ TEST_CASE("[Transform2D] translation") {
 }
 
 TEST_CASE("[Transform2D] scaling") {
-	const Vector2 scaling = Vector2(1, 2);
+	constexpr Vector2 scaling = Vector2(1, 2);
 
 	// Both versions should give the same result applied to identity.
 	CHECK(identity().scaled(scaling) == identity().scaled_local(scaling));
@@ -182,8 +181,8 @@ TEST_CASE("[Transform2D] Interpolation") {
 }
 
 TEST_CASE("[Transform2D] Finite number checks") {
-	const Vector2 x = Vector2(0, 1);
-	const Vector2 infinite = Vector2(NAN, NAN);
+	constexpr Vector2 x = Vector2(0, 1);
+	constexpr Vector2 infinite = Vector2(Math::NaN, Math::NaN);
 
 	CHECK_MESSAGE(
 			Transform2D(x, x, x).is_finite(),
@@ -240,10 +239,8 @@ TEST_CASE("[Transform2D] Is conformal checks") {
 			"Transform2D with non-uniform scale should not be conformal.");
 
 	CHECK_FALSE_MESSAGE(
-			Transform2D(Vector2(Math_SQRT12, Math_SQRT12), Vector2(0, 1), Vector2()).is_conformal(),
+			Transform2D(Vector2(Math::SQRT12, Math::SQRT12), Vector2(0, 1), Vector2()).is_conformal(),
 			"Transform2D with the X axis skewed 45 degrees should not be conformal.");
 }
 
 } // namespace TestTransform2D
-
-#endif // TEST_TRANSFORM_2D_H
diff --git a/engine/tests/core/math/test_transform_3d.h b/engine/tests/core/math/test_transform_3d.h
index fba0fcb2..c1030d57 100644
--- a/engine/tests/core/math/test_transform_3d.h
+++ b/engine/tests/core/math/test_transform_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TRANSFORM_3D_H
-#define TEST_TRANSFORM_3D_H
+#pragma once
 
 #include "core/math/transform_3d.h"
 
@@ -46,7 +45,7 @@ Transform3D identity() {
 }
 
 TEST_CASE("[Transform3D] translation") {
-	Vector3 offset = Vector3(1, 2, 3);
+	constexpr Vector3 offset = Vector3(1, 2, 3);
 
 	// Both versions should give the same result applied to identity.
 	CHECK(identity().translated(offset) == identity().translated_local(offset));
@@ -59,7 +58,7 @@ TEST_CASE("[Transform3D] translation") {
 }
 
 TEST_CASE("[Transform3D] scaling") {
-	Vector3 scaling = Vector3(1, 2, 3);
+	constexpr Vector3 scaling = Vector3(1, 2, 3);
 
 	// Both versions should give the same result applied to identity.
 	CHECK(identity().scaled(scaling) == identity().scaled_local(scaling));
@@ -72,8 +71,8 @@ TEST_CASE("[Transform3D] scaling") {
 }
 
 TEST_CASE("[Transform3D] rotation") {
-	Vector3 axis = Vector3(1, 2, 3).normalized();
-	real_t phi = 1.0;
+	const Vector3 axis = Vector3(1, 2, 3).normalized();
+	constexpr real_t phi = 1.0;
 
 	// Both versions should give the same result applied to identity.
 	CHECK(identity().rotated(axis, phi) == identity().rotated_local(axis, phi));
@@ -86,10 +85,10 @@ TEST_CASE("[Transform3D] rotation") {
 }
 
 TEST_CASE("[Transform3D] Finite number checks") {
-	const Vector3 y(0, 1, 2);
-	const Vector3 infinite_vec(NAN, NAN, NAN);
-	const Basis x(y, y, y);
-	const Basis infinite_basis(infinite_vec, infinite_vec, infinite_vec);
+	constexpr Vector3 y(0, 1, 2);
+	constexpr Vector3 infinite_vec(Math::NaN, Math::NaN, Math::NaN);
+	constexpr Basis x(y, y, y);
+	constexpr Basis infinite_basis(infinite_vec, infinite_vec, infinite_vec);
 
 	CHECK_MESSAGE(
 			Transform3D(x, y).is_finite(),
@@ -118,7 +117,7 @@ TEST_CASE("[Transform3D] Rotate around global origin") {
 	expected.basis[0] = Vector3(-1, 0, 0);
 	expected.basis[2] = Vector3(0, 0, -1);
 
-	const Transform3D rotated_transform = transform.rotated(Vector3(0, 1, 0), Math_PI);
+	const Transform3D rotated_transform = transform.rotated(Vector3(0, 1, 0), Math::PI);
 	CHECK_MESSAGE(rotated_transform.is_equal_approx(expected), "The rotated transform should have a new orientation and basis.");
 }
 
@@ -133,9 +132,7 @@ TEST_CASE("[Transform3D] Rotate in-place (local rotation)") {
 	expected.basis[0] = Vector3(-1, 0, 0);
 	expected.basis[2] = Vector3(0, 0, -1);
 
-	const Transform3D rotated_transform = Transform3D(transform.rotated_local(Vector3(0, 1, 0), Math_PI));
+	const Transform3D rotated_transform = Transform3D(transform.rotated_local(Vector3(0, 1, 0), Math::PI));
 	CHECK_MESSAGE(rotated_transform.is_equal_approx(expected), "The rotated transform should have a new orientation but still be based on the same origin.");
 }
 } // namespace TestTransform3D
-
-#endif // TEST_TRANSFORM_3D_H
diff --git a/engine/tests/core/math/test_triangle_mesh.h b/engine/tests/core/math/test_triangle_mesh.h
new file mode 100644
index 00000000..f138b554
--- /dev/null
+++ b/engine/tests/core/math/test_triangle_mesh.h
@@ -0,0 +1,82 @@
+/**************************************************************************/
+/*  test_triangle_mesh.h                                                  */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/math/triangle_mesh.h"
+#include "scene/resources/3d/primitive_meshes.h"
+
+#include "tests/test_macros.h"
+
+namespace TestTriangleMesh {
+
+TEST_CASE("[SceneTree][TriangleMesh] BVH creation and intersection") {
+	Ref<BoxMesh> box_mesh;
+	box_mesh.instantiate();
+
+	const Vector<Face3> faces = box_mesh->get_faces();
+
+	Ref<TriangleMesh> triangle_mesh;
+	triangle_mesh.instantiate();
+	CHECK(triangle_mesh->create_from_faces(Variant(faces)));
+
+	const Vector3 begin = Vector3(0.0, 2.0, 0.0);
+	const Vector3 end = Vector3(0.0, -2.0, 0.0);
+
+	{
+		Vector3 point;
+		Vector3 normal;
+		int32_t *surf_index = nullptr;
+		int32_t face_index = -1;
+		const bool has_result = triangle_mesh->intersect_segment(begin, end, point, normal, surf_index, &face_index);
+		CHECK(has_result);
+		CHECK(point.is_equal_approx(Vector3(0.0, 0.5, 0.0)));
+		CHECK(normal.is_equal_approx(Vector3(0.0, 1.0, 0.0)));
+		CHECK(surf_index == nullptr);
+		REQUIRE(face_index != -1);
+		CHECK(face_index == 8);
+	}
+
+	{
+		Vector3 dir = begin.direction_to(end);
+		Vector3 point;
+		Vector3 normal;
+		int32_t *surf_index = nullptr;
+		int32_t face_index = -1;
+		const bool has_result = triangle_mesh->intersect_ray(begin, dir, point, normal, surf_index, &face_index);
+		CHECK(has_result);
+		CHECK(point.is_equal_approx(Vector3(0.0, 0.5, 0.0)));
+		CHECK(normal.is_equal_approx(Vector3(0.0, 1.0, 0.0)));
+		CHECK(surf_index == nullptr);
+		REQUIRE(face_index != -1);
+		CHECK(face_index == 8);
+	}
+}
+} // namespace TestTriangleMesh
diff --git a/engine/tests/core/math/test_vector2.h b/engine/tests/core/math/test_vector2.h
index 7bd494ec..683da430 100644
--- a/engine/tests/core/math/test_vector2.h
+++ b/engine/tests/core/math/test_vector2.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VECTOR2_H
-#define TEST_VECTOR2_H
+#pragma once
 
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
@@ -38,27 +37,27 @@
 namespace TestVector2 {
 
 TEST_CASE("[Vector2] Constructor methods") {
-	const Vector2 vector_empty = Vector2();
-	const Vector2 vector_zero = Vector2(0.0, 0.0);
-	CHECK_MESSAGE(
+	constexpr Vector2 vector_empty = Vector2();
+	constexpr Vector2 vector_zero = Vector2(0.0, 0.0);
+	static_assert(
 			vector_empty == vector_zero,
 			"Vector2 Constructor with no inputs should return a zero Vector2.");
 }
 
 TEST_CASE("[Vector2] Angle methods") {
-	const Vector2 vector_x = Vector2(1, 0);
-	const Vector2 vector_y = Vector2(0, 1);
+	constexpr Vector2 vector_x = Vector2(1, 0);
+	constexpr Vector2 vector_y = Vector2(0, 1);
 	CHECK_MESSAGE(
-			vector_x.angle_to(vector_y) == doctest::Approx((real_t)Math_TAU / 4),
+			vector_x.angle_to(vector_y) == doctest::Approx((real_t)Math::TAU / 4),
 			"Vector2 angle_to should work as expected.");
 	CHECK_MESSAGE(
-			vector_y.angle_to(vector_x) == doctest::Approx((real_t)-Math_TAU / 4),
+			vector_y.angle_to(vector_x) == doctest::Approx((real_t)-Math::TAU / 4),
 			"Vector2 angle_to should work as expected.");
 	CHECK_MESSAGE(
-			vector_x.angle_to_point(vector_y) == doctest::Approx((real_t)Math_TAU * 3 / 8),
+			vector_x.angle_to_point(vector_y) == doctest::Approx((real_t)Math::TAU * 3 / 8),
 			"Vector2 angle_to_point should work as expected.");
 	CHECK_MESSAGE(
-			vector_y.angle_to_point(vector_x) == doctest::Approx((real_t)-Math_TAU / 8),
+			vector_y.angle_to_point(vector_x) == doctest::Approx((real_t)-Math::TAU / 8),
 			"Vector2 angle_to_point should work as expected.");
 }
 
@@ -80,8 +79,8 @@ TEST_CASE("[Vector2] Axis methods") {
 }
 
 TEST_CASE("[Vector2] Interpolation methods") {
-	const Vector2 vector1 = Vector2(1, 2);
-	const Vector2 vector2 = Vector2(4, 5);
+	constexpr Vector2 vector1 = Vector2(1, 2);
+	constexpr Vector2 vector2 = Vector2(4, 5);
 	CHECK_MESSAGE(
 			vector1.lerp(vector2, 0.5) == Vector2(2.5, 3.5),
 			"Vector2 lerp should work as expected.");
@@ -95,7 +94,7 @@ TEST_CASE("[Vector2] Interpolation methods") {
 			vector1.normalized().slerp(vector2.normalized(), 1.0 / 3.0).is_equal_approx(Vector2(0.508990883827209473, 0.860771894454956055)),
 			"Vector2 slerp should work as expected.");
 	CHECK_MESSAGE(
-			Vector2(5, 0).slerp(Vector2(0, 5), 0.5).is_equal_approx(Vector2(5, 5) * Math_SQRT12),
+			Vector2(5, 0).slerp(Vector2(0, 5), 0.5).is_equal_approx(Vector2(5, 5) * Math::SQRT12),
 			"Vector2 slerp with non-normalized values should work as expected.");
 	CHECK_MESSAGE(
 			Vector2(1, 1).slerp(Vector2(2, 2), 0.5).is_equal_approx(Vector2(1.5, 1.5)),
@@ -130,13 +129,13 @@ TEST_CASE("[Vector2] Interpolation methods") {
 }
 
 TEST_CASE("[Vector2] Length methods") {
-	const Vector2 vector1 = Vector2(10, 10);
-	const Vector2 vector2 = Vector2(20, 30);
+	constexpr Vector2 vector1 = Vector2(10, 10);
+	constexpr Vector2 vector2 = Vector2(20, 30);
 	CHECK_MESSAGE(
 			vector1.length_squared() == 200,
 			"Vector2 length_squared should work as expected and return exact result.");
 	CHECK_MESSAGE(
-			vector1.length() == doctest::Approx(10 * (real_t)Math_SQRT2),
+			vector1.length() == doctest::Approx(10 * (real_t)Math::SQRT2),
 			"Vector2 length should work as expected.");
 	CHECK_MESSAGE(
 			vector2.length_squared() == 1300,
@@ -153,12 +152,12 @@ TEST_CASE("[Vector2] Length methods") {
 }
 
 TEST_CASE("[Vector2] Limiting methods") {
-	const Vector2 vector = Vector2(10, 10);
+	constexpr Vector2 vector = Vector2(10, 10);
 	CHECK_MESSAGE(
-			vector.limit_length().is_equal_approx(Vector2(Math_SQRT12, Math_SQRT12)),
+			vector.limit_length().is_equal_approx(Vector2(Math::SQRT12, Math::SQRT12)),
 			"Vector2 limit_length should work as expected.");
 	CHECK_MESSAGE(
-			vector.limit_length(5).is_equal_approx(5 * Vector2(Math_SQRT12, Math_SQRT12)),
+			vector.limit_length(5).is_equal_approx(5 * Vector2(Math::SQRT12, Math::SQRT12)),
 			"Vector2 limit_length should work as expected.");
 
 	CHECK_MESSAGE(
@@ -180,7 +179,7 @@ TEST_CASE("[Vector2] Normalization methods") {
 			Vector2(1, 0).normalized() == Vector2(1, 0),
 			"Vector2 normalized should return the same vector for a normalized vector.");
 	CHECK_MESSAGE(
-			Vector2(1, 1).normalized().is_equal_approx(Vector2(Math_SQRT12, Math_SQRT12)),
+			Vector2(1, 1).normalized().is_equal_approx(Vector2(Math::SQRT12, Math::SQRT12)),
 			"Vector2 normalized should work as expected.");
 
 	Vector2 vector = Vector2(3.2, -5.4);
@@ -194,70 +193,70 @@ TEST_CASE("[Vector2] Normalization methods") {
 }
 
 TEST_CASE("[Vector2] Operators") {
-	const Vector2 decimal1 = Vector2(2.3, 4.9);
-	const Vector2 decimal2 = Vector2(1.2, 3.4);
-	const Vector2 power1 = Vector2(0.75, 1.5);
-	const Vector2 power2 = Vector2(0.5, 0.125);
-	const Vector2 int1 = Vector2(4, 5);
-	const Vector2 int2 = Vector2(1, 2);
+	constexpr Vector2 decimal1 = Vector2(2.3, 4.9);
+	constexpr Vector2 decimal2 = Vector2(1.2, 3.4);
+	constexpr Vector2 power1 = Vector2(0.75, 1.5);
+	constexpr Vector2 power2 = Vector2(0.5, 0.125);
+	constexpr Vector2 int1 = Vector2(4, 5);
+	constexpr Vector2 int2 = Vector2(1, 2);
 
 	CHECK_MESSAGE(
 			(decimal1 + decimal2).is_equal_approx(Vector2(3.5, 8.3)),
 			"Vector2 addition should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 + power2) == Vector2(1.25, 1.625),
 			"Vector2 addition with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 + int2) == Vector2(5, 7),
 			"Vector2 addition with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 - decimal2).is_equal_approx(Vector2(1.1, 1.5)),
 			"Vector2 subtraction should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 - power2) == Vector2(0.25, 1.375),
 			"Vector2 subtraction with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 - int2) == Vector2(3, 3),
 			"Vector2 subtraction with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 * decimal2).is_equal_approx(Vector2(2.76, 16.66)),
 			"Vector2 multiplication should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 * power2) == Vector2(0.375, 0.1875),
 			"Vector2 multiplication with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 * int2) == Vector2(4, 10),
 			"Vector2 multiplication with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 / decimal2).is_equal_approx(Vector2(1.91666666666666666, 1.44117647058823529)),
 			"Vector2 division should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 / power2) == Vector2(1.5, 12.0),
 			"Vector2 division with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 / int2) == Vector2(4, 2.5),
 			"Vector2 division with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 * 2).is_equal_approx(Vector2(4.6, 9.8)),
 			"Vector2 multiplication should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 * 2) == Vector2(1.5, 3),
 			"Vector2 multiplication with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 * 2) == Vector2(8, 10),
 			"Vector2 multiplication with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 / 2).is_equal_approx(Vector2(1.15, 2.45)),
 			"Vector2 division should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 / 2) == Vector2(0.375, 0.75),
 			"Vector2 division with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 / 2) == Vector2(2, 2.5),
 			"Vector2 division with integers should give exact results.");
 
@@ -282,17 +281,17 @@ TEST_CASE("[Vector2] Operators") {
 			"Vector2 cast to String should work as expected.");
 #ifdef REAL_T_IS_DOUBLE
 	CHECK_MESSAGE(
-			((String)Vector2(Math_PI, Math_TAU)) == "(3.14159265358979, 6.28318530717959)",
+			((String)Vector2(Math::PI, Math::TAU)) == "(3.14159265358979, 6.28318530717959)",
 			"Vector2 cast to String should print the correct amount of digits for real_t = double.");
 #else
 	CHECK_MESSAGE(
-			((String)Vector2(Math_PI, Math_TAU)) == "(3.141593, 6.283185)",
+			((String)Vector2(Math::PI, Math::TAU)) == "(3.141593, 6.283185)",
 			"Vector2 cast to String should print the correct amount of digits for real_t = float.");
 #endif // REAL_T_IS_DOUBLE
 }
 
 TEST_CASE("[Vector2] Other methods") {
-	const Vector2 vector = Vector2(1.2, 3.4);
+	constexpr Vector2 vector = Vector2(1.2, 3.4);
 	CHECK_MESSAGE(
 			vector.aspect() == doctest::Approx((real_t)1.2 / (real_t)3.4),
 			"Vector2 aspect should work as expected.");
@@ -301,7 +300,7 @@ TEST_CASE("[Vector2] Other methods") {
 			vector.direction_to(Vector2()).is_equal_approx(-vector.normalized()),
 			"Vector2 direction_to should work as expected.");
 	CHECK_MESSAGE(
-			Vector2(1, 1).direction_to(Vector2(2, 2)).is_equal_approx(Vector2(Math_SQRT12, Math_SQRT12)),
+			Vector2(1, 1).direction_to(Vector2(2, 2)).is_equal_approx(Vector2(Math::SQRT12, Math::SQRT12)),
 			"Vector2 direction_to should work as expected.");
 
 	CHECK_MESSAGE(
@@ -318,16 +317,16 @@ TEST_CASE("[Vector2] Other methods") {
 			"Vector2 posmodv should work as expected.");
 
 	CHECK_MESSAGE(
-			vector.rotated(Math_TAU).is_equal_approx(Vector2(1.2, 3.4)),
+			vector.rotated(Math::TAU).is_equal_approx(Vector2(1.2, 3.4)),
 			"Vector2 rotated should work as expected.");
 	CHECK_MESSAGE(
-			vector.rotated(Math_TAU / 4).is_equal_approx(Vector2(-3.4, 1.2)),
+			vector.rotated(Math::TAU / 4).is_equal_approx(Vector2(-3.4, 1.2)),
 			"Vector2 rotated should work as expected.");
 	CHECK_MESSAGE(
-			vector.rotated(Math_TAU / 3).is_equal_approx(Vector2(-3.544486372867091398996, -0.660769515458673623883)),
+			vector.rotated(Math::TAU / 3).is_equal_approx(Vector2(-3.544486372867091398996, -0.660769515458673623883)),
 			"Vector2 rotated should work as expected.");
 	CHECK_MESSAGE(
-			vector.rotated(Math_TAU / 2).is_equal_approx(vector.rotated(Math_TAU / -2)),
+			vector.rotated(Math::TAU / 2).is_equal_approx(vector.rotated(Math::TAU / -2)),
 			"Vector2 rotated should work as expected.");
 
 	CHECK_MESSAGE(
@@ -350,10 +349,10 @@ TEST_CASE("[Vector2] Other methods") {
 }
 
 TEST_CASE("[Vector2] Plane methods") {
-	const Vector2 vector = Vector2(1.2, 3.4);
-	const Vector2 vector_y = Vector2(0, 1);
-	const Vector2 vector_normal = Vector2(0.95879811270838721622267, 0.2840883296913739899919);
-	const real_t p_d = 99.1;
+	constexpr Vector2 vector = Vector2(1.2, 3.4);
+	constexpr Vector2 vector_y = Vector2(0, 1);
+	constexpr Vector2 vector_normal = Vector2(0.95879811270838721622267, 0.2840883296913739899919);
+	constexpr real_t p_d = 99.1;
 	CHECK_MESSAGE(
 			vector.bounce(vector_y) == Vector2(1.2, -3.4),
 			"Vector2 bounce on a plane with normal of the Y axis should.");
@@ -383,7 +382,7 @@ TEST_CASE("[Vector2] Plane methods") {
 			"Vector2 slide with normal should return expected value.");
 	// There's probably a better way to test these ones?
 #ifdef MATH_CHECKS
-	const Vector2 vector_non_normal = Vector2(5.4, 1.6);
+	constexpr Vector2 vector_non_normal = Vector2(5.4, 1.6);
 	ERR_PRINT_OFF;
 	CHECK_MESSAGE(
 			vector.bounce(vector_non_normal).is_equal_approx(Vector2()),
@@ -399,8 +398,8 @@ TEST_CASE("[Vector2] Plane methods") {
 }
 
 TEST_CASE("[Vector2] Rounding methods") {
-	const Vector2 vector1 = Vector2(1.2, 5.6);
-	const Vector2 vector2 = Vector2(1.2, -5.6);
+	constexpr Vector2 vector1 = Vector2(1.2, 5.6);
+	constexpr Vector2 vector2 = Vector2(1.2, -5.6);
 	CHECK_MESSAGE(
 			vector1.abs() == vector1,
 			"Vector2 abs should work as expected.");
@@ -438,10 +437,10 @@ TEST_CASE("[Vector2] Rounding methods") {
 }
 
 TEST_CASE("[Vector2] Linear algebra methods") {
-	const Vector2 vector_x = Vector2(1, 0);
-	const Vector2 vector_y = Vector2(0, 1);
-	const Vector2 a = Vector2(3.5, 8.5);
-	const Vector2 b = Vector2(5.2, 4.6);
+	constexpr Vector2 vector_x = Vector2(1, 0);
+	constexpr Vector2 vector_y = Vector2(0, 1);
+	constexpr Vector2 a = Vector2(3.5, 8.5);
+	constexpr Vector2 b = Vector2(5.2, 4.6);
 	CHECK_MESSAGE(
 			vector_x.cross(vector_y) == 1,
 			"Vector2 cross product of X and Y should give 1.");
@@ -473,7 +472,7 @@ TEST_CASE("[Vector2] Linear algebra methods") {
 }
 
 TEST_CASE("[Vector2] Finite number checks") {
-	const double infinite[] = { NAN, INFINITY, -INFINITY };
+	constexpr double infinite[] = { Math::NaN, Math::INF, -Math::INF };
 
 	CHECK_MESSAGE(
 			Vector2(0, 1).is_finite(),
@@ -498,5 +497,3 @@ TEST_CASE("[Vector2] Finite number checks") {
 }
 
 } // namespace TestVector2
-
-#endif // TEST_VECTOR2_H
diff --git a/engine/tests/core/math/test_vector2i.h b/engine/tests/core/math/test_vector2i.h
index 0f33400f..edd2f7a8 100644
--- a/engine/tests/core/math/test_vector2i.h
+++ b/engine/tests/core/math/test_vector2i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VECTOR2I_H
-#define TEST_VECTOR2I_H
+#pragma once
 
 #include "core/math/vector2.h"
 #include "core/math/vector2i.h"
@@ -38,9 +37,9 @@
 namespace TestVector2i {
 
 TEST_CASE("[Vector2i] Constructor methods") {
-	const Vector2i vector_empty = Vector2i();
-	const Vector2i vector_zero = Vector2i(0, 0);
-	CHECK_MESSAGE(
+	constexpr Vector2i vector_empty = Vector2i();
+	constexpr Vector2i vector_zero = Vector2i(0, 0);
+	static_assert(
 			vector_empty == vector_zero,
 			"Vector2i Constructor with no inputs should return a zero Vector2i.");
 }
@@ -63,7 +62,7 @@ TEST_CASE("[Vector2i] Axis methods") {
 }
 
 TEST_CASE("[Vector2i] Clamp method") {
-	const Vector2i vector = Vector2i(10, 10);
+	constexpr Vector2i vector = Vector2i(10, 10);
 	CHECK_MESSAGE(
 			Vector2i(-5, 15).clamp(Vector2i(), vector) == Vector2i(0, 10),
 			"Vector2i clamp should work as expected.");
@@ -73,13 +72,13 @@ TEST_CASE("[Vector2i] Clamp method") {
 }
 
 TEST_CASE("[Vector2i] Length methods") {
-	const Vector2i vector1 = Vector2i(10, 10);
-	const Vector2i vector2 = Vector2i(20, 30);
+	constexpr Vector2i vector1 = Vector2i(10, 10);
+	constexpr Vector2i vector2 = Vector2i(20, 30);
 	CHECK_MESSAGE(
 			vector1.length_squared() == 200,
 			"Vector2i length_squared should work as expected and return exact result.");
 	CHECK_MESSAGE(
-			vector1.length() == doctest::Approx(10 * Math_SQRT2),
+			vector1.length() == doctest::Approx(10 * Math::SQRT2),
 			"Vector2i length should work as expected.");
 	CHECK_MESSAGE(
 			vector2.length_squared() == 1300,
@@ -96,26 +95,26 @@ TEST_CASE("[Vector2i] Length methods") {
 }
 
 TEST_CASE("[Vector2i] Operators") {
-	const Vector2i vector1 = Vector2i(5, 9);
-	const Vector2i vector2 = Vector2i(2, 3);
+	constexpr Vector2i vector1 = Vector2i(5, 9);
+	constexpr Vector2i vector2 = Vector2i(2, 3);
 
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 + vector2) == Vector2i(7, 12),
 			"Vector2i addition with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 - vector2) == Vector2i(3, 6),
 			"Vector2i subtraction with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 * vector2) == Vector2i(10, 27),
 			"Vector2i multiplication with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 / vector2) == Vector2i(2, 3),
 			"Vector2i division with integers should give exact results.");
 
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 * 2) == Vector2i(10, 18),
 			"Vector2i multiplication with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 / 2) == Vector2i(2, 4),
 			"Vector2i division with integers should give exact results.");
 
@@ -131,7 +130,7 @@ TEST_CASE("[Vector2i] Operators") {
 }
 
 TEST_CASE("[Vector2i] Other methods") {
-	const Vector2i vector = Vector2i(1, 3);
+	constexpr Vector2i vector = Vector2i(1, 3);
 	CHECK_MESSAGE(
 			vector.aspect() == doctest::Approx((real_t)1.0 / (real_t)3.0),
 			"Vector2i aspect should work as expected.");
@@ -150,8 +149,8 @@ TEST_CASE("[Vector2i] Other methods") {
 }
 
 TEST_CASE("[Vector2i] Abs and sign methods") {
-	const Vector2i vector1 = Vector2i(1, 3);
-	const Vector2i vector2 = Vector2i(1, -3);
+	constexpr Vector2i vector1 = Vector2i(1, 3);
+	constexpr Vector2i vector2 = Vector2i(1, -3);
 	CHECK_MESSAGE(
 			vector1.abs() == vector1,
 			"Vector2i abs should work as expected.");
@@ -167,5 +166,3 @@ TEST_CASE("[Vector2i] Abs and sign methods") {
 			"Vector2i sign should work as expected.");
 }
 } // namespace TestVector2i
-
-#endif // TEST_VECTOR2I_H
diff --git a/engine/tests/core/math/test_vector3.h b/engine/tests/core/math/test_vector3.h
index 4cab753d..c8f377dd 100644
--- a/engine/tests/core/math/test_vector3.h
+++ b/engine/tests/core/math/test_vector3.h
@@ -28,50 +28,46 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VECTOR3_H
-#define TEST_VECTOR3_H
+#pragma once
 
 #include "core/math/vector3.h"
 #include "tests/test_macros.h"
 
-#define Math_SQRT13 0.57735026918962576450914878050196
-#define Math_SQRT3 1.7320508075688772935274463415059
-
 namespace TestVector3 {
 
 TEST_CASE("[Vector3] Constructor methods") {
-	const Vector3 vector_empty = Vector3();
-	const Vector3 vector_zero = Vector3(0.0, 0.0, 0.0);
-	CHECK_MESSAGE(
+	constexpr Vector3 vector_empty = Vector3();
+	constexpr Vector3 vector_zero = Vector3(0.0, 0.0, 0.0);
+	static_assert(
 			vector_empty == vector_zero,
 			"Vector3 Constructor with no inputs should return a zero Vector3.");
 }
 
 TEST_CASE("[Vector3] Angle methods") {
-	const Vector3 vector_x = Vector3(1, 0, 0);
-	const Vector3 vector_y = Vector3(0, 1, 0);
-	const Vector3 vector_yz = Vector3(0, 1, 1);
+	constexpr Vector3 vector_x = Vector3(1, 0, 0);
+	constexpr Vector3 vector_y = Vector3(0, 1, 0);
+	constexpr Vector3 vector_yz = Vector3(0, 1, 1);
 	CHECK_MESSAGE(
-			vector_x.angle_to(vector_y) == doctest::Approx((real_t)Math_TAU / 4),
+			vector_x.angle_to(vector_y) == doctest::Approx((real_t)Math::TAU / 4),
 			"Vector3 angle_to should work as expected.");
 	CHECK_MESSAGE(
-			vector_x.angle_to(vector_yz) == doctest::Approx((real_t)Math_TAU / 4),
+			vector_x.angle_to(vector_yz) == doctest::Approx((real_t)Math::TAU / 4),
 			"Vector3 angle_to should work as expected.");
 	CHECK_MESSAGE(
-			vector_yz.angle_to(vector_x) == doctest::Approx((real_t)Math_TAU / 4),
+			vector_yz.angle_to(vector_x) == doctest::Approx((real_t)Math::TAU / 4),
 			"Vector3 angle_to should work as expected.");
 	CHECK_MESSAGE(
-			vector_y.angle_to(vector_yz) == doctest::Approx((real_t)Math_TAU / 8),
+			vector_y.angle_to(vector_yz) == doctest::Approx((real_t)Math::TAU / 8),
 			"Vector3 angle_to should work as expected.");
 
 	CHECK_MESSAGE(
-			vector_x.signed_angle_to(vector_y, vector_y) == doctest::Approx((real_t)Math_TAU / 4),
+			vector_x.signed_angle_to(vector_y, vector_y) == doctest::Approx((real_t)Math::TAU / 4),
 			"Vector3 signed_angle_to edge case should be positive.");
 	CHECK_MESSAGE(
-			vector_x.signed_angle_to(vector_yz, vector_y) == doctest::Approx((real_t)Math_TAU / -4),
+			vector_x.signed_angle_to(vector_yz, vector_y) == doctest::Approx((real_t)Math::TAU / -4),
 			"Vector3 signed_angle_to should work as expected.");
 	CHECK_MESSAGE(
-			vector_yz.signed_angle_to(vector_x, vector_y) == doctest::Approx((real_t)Math_TAU / 4),
+			vector_yz.signed_angle_to(vector_x, vector_y) == doctest::Approx((real_t)Math::TAU / 4),
 			"Vector3 signed_angle_to should work as expected.");
 }
 
@@ -97,8 +93,8 @@ TEST_CASE("[Vector3] Axis methods") {
 }
 
 TEST_CASE("[Vector3] Interpolation methods") {
-	const Vector3 vector1 = Vector3(1, 2, 3);
-	const Vector3 vector2 = Vector3(4, 5, 6);
+	constexpr Vector3 vector1 = Vector3(1, 2, 3);
+	constexpr Vector3 vector2 = Vector3(4, 5, 6);
 	CHECK_MESSAGE(
 			vector1.lerp(vector2, 0.5) == Vector3(2.5, 3.5, 4.5),
 			"Vector3 lerp should work as expected.");
@@ -147,13 +143,13 @@ TEST_CASE("[Vector3] Interpolation methods") {
 }
 
 TEST_CASE("[Vector3] Length methods") {
-	const Vector3 vector1 = Vector3(10, 10, 10);
-	const Vector3 vector2 = Vector3(20, 30, 40);
+	constexpr Vector3 vector1 = Vector3(10, 10, 10);
+	constexpr Vector3 vector2 = Vector3(20, 30, 40);
 	CHECK_MESSAGE(
 			vector1.length_squared() == 300,
 			"Vector3 length_squared should work as expected and return exact result.");
 	CHECK_MESSAGE(
-			vector1.length() == doctest::Approx(10 * (real_t)Math_SQRT3),
+			vector1.length() == doctest::Approx(10 * (real_t)Math::SQRT3),
 			"Vector3 length should work as expected.");
 	CHECK_MESSAGE(
 			vector2.length_squared() == 2900,
@@ -170,12 +166,12 @@ TEST_CASE("[Vector3] Length methods") {
 }
 
 TEST_CASE("[Vector3] Limiting methods") {
-	const Vector3 vector = Vector3(10, 10, 10);
+	constexpr Vector3 vector = Vector3(10, 10, 10);
 	CHECK_MESSAGE(
-			vector.limit_length().is_equal_approx(Vector3(Math_SQRT13, Math_SQRT13, Math_SQRT13)),
+			vector.limit_length().is_equal_approx(Vector3(Math::SQRT13, Math::SQRT13, Math::SQRT13)),
 			"Vector3 limit_length should work as expected.");
 	CHECK_MESSAGE(
-			vector.limit_length(5).is_equal_approx(5 * Vector3(Math_SQRT13, Math_SQRT13, Math_SQRT13)),
+			vector.limit_length(5).is_equal_approx(5 * Vector3(Math::SQRT13, Math::SQRT13, Math::SQRT13)),
 			"Vector3 limit_length should work as expected.");
 
 	CHECK_MESSAGE(
@@ -197,10 +193,10 @@ TEST_CASE("[Vector3] Normalization methods") {
 			Vector3(1, 0, 0).normalized() == Vector3(1, 0, 0),
 			"Vector3 normalized should return the same vector for a normalized vector.");
 	CHECK_MESSAGE(
-			Vector3(1, 1, 0).normalized().is_equal_approx(Vector3(Math_SQRT12, Math_SQRT12, 0)),
+			Vector3(1, 1, 0).normalized().is_equal_approx(Vector3(Math::SQRT12, Math::SQRT12, 0)),
 			"Vector3 normalized should work as expected.");
 	CHECK_MESSAGE(
-			Vector3(1, 1, 1).normalized().is_equal_approx(Vector3(Math_SQRT13, Math_SQRT13, Math_SQRT13)),
+			Vector3(1, 1, 1).normalized().is_equal_approx(Vector3(Math::SQRT13, Math::SQRT13, Math::SQRT13)),
 			"Vector3 normalized should work as expected.");
 
 	Vector3 vector = Vector3(3.2, -5.4, 6);
@@ -214,70 +210,70 @@ TEST_CASE("[Vector3] Normalization methods") {
 }
 
 TEST_CASE("[Vector3] Operators") {
-	const Vector3 decimal1 = Vector3(2.3, 4.9, 7.8);
-	const Vector3 decimal2 = Vector3(1.2, 3.4, 5.6);
-	const Vector3 power1 = Vector3(0.75, 1.5, 0.625);
-	const Vector3 power2 = Vector3(0.5, 0.125, 0.25);
-	const Vector3 int1 = Vector3(4, 5, 9);
-	const Vector3 int2 = Vector3(1, 2, 3);
+	constexpr Vector3 decimal1 = Vector3(2.3, 4.9, 7.8);
+	constexpr Vector3 decimal2 = Vector3(1.2, 3.4, 5.6);
+	constexpr Vector3 power1 = Vector3(0.75, 1.5, 0.625);
+	constexpr Vector3 power2 = Vector3(0.5, 0.125, 0.25);
+	constexpr Vector3 int1 = Vector3(4, 5, 9);
+	constexpr Vector3 int2 = Vector3(1, 2, 3);
 
 	CHECK_MESSAGE(
 			(decimal1 + decimal2).is_equal_approx(Vector3(3.5, 8.3, 13.4)),
 			"Vector3 addition should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 + power2) == Vector3(1.25, 1.625, 0.875),
 			"Vector3 addition with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 + int2) == Vector3(5, 7, 12),
 			"Vector3 addition with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 - decimal2).is_equal_approx(Vector3(1.1, 1.5, 2.2)),
 			"Vector3 subtraction should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 - power2) == Vector3(0.25, 1.375, 0.375),
 			"Vector3 subtraction with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 - int2) == Vector3(3, 3, 6),
 			"Vector3 subtraction with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 * decimal2).is_equal_approx(Vector3(2.76, 16.66, 43.68)),
 			"Vector3 multiplication should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 * power2) == Vector3(0.375, 0.1875, 0.15625),
 			"Vector3 multiplication with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 * int2) == Vector3(4, 10, 27),
 			"Vector3 multiplication with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 / decimal2).is_equal_approx(Vector3(1.91666666666666666, 1.44117647058823529, 1.39285714285714286)),
 			"Vector3 division should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 / power2) == Vector3(1.5, 12.0, 2.5),
 			"Vector3 division with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 / int2) == Vector3(4, 2.5, 3),
 			"Vector3 division with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 * 2).is_equal_approx(Vector3(4.6, 9.8, 15.6)),
 			"Vector3 multiplication should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 * 2) == Vector3(1.5, 3, 1.25),
 			"Vector3 multiplication with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 * 2) == Vector3(8, 10, 18),
 			"Vector3 multiplication with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 / 2).is_equal_approx(Vector3(1.15, 2.45, 3.9)),
 			"Vector3 division should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 / 2) == Vector3(0.375, 0.75, 0.3125),
 			"Vector3 division with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 / 2) == Vector3(2, 2.5, 4.5),
 			"Vector3 division with integers should give exact results.");
 
@@ -302,22 +298,22 @@ TEST_CASE("[Vector3] Operators") {
 			"Vector3 cast to String should work as expected.");
 #ifdef REAL_T_IS_DOUBLE
 	CHECK_MESSAGE(
-			((String)Vector3(Math_E, Math_SQRT2, Math_SQRT3)) == "(2.71828182845905, 1.4142135623731, 1.73205080756888)",
+			((String)Vector3(Math::E, Math::SQRT2, Math::SQRT3)) == "(2.71828182845905, 1.4142135623731, 1.73205080756888)",
 			"Vector3 cast to String should print the correct amount of digits for real_t = double.");
 #else
 	CHECK_MESSAGE(
-			((String)Vector3(Math_E, Math_SQRT2, Math_SQRT3)) == "(2.718282, 1.414214, 1.732051)",
+			((String)Vector3(Math::E, Math::SQRT2, Math::SQRT3)) == "(2.718282, 1.414214, 1.732051)",
 			"Vector3 cast to String should print the correct amount of digits for real_t = float.");
 #endif // REAL_T_IS_DOUBLE
 }
 
 TEST_CASE("[Vector3] Other methods") {
-	const Vector3 vector = Vector3(1.2, 3.4, 5.6);
+	constexpr Vector3 vector = Vector3(1.2, 3.4, 5.6);
 	CHECK_MESSAGE(
 			vector.direction_to(Vector3()).is_equal_approx(-vector.normalized()),
 			"Vector3 direction_to should work as expected.");
 	CHECK_MESSAGE(
-			Vector3(1, 1, 1).direction_to(Vector3(2, 2, 2)).is_equal_approx(Vector3(Math_SQRT13, Math_SQRT13, Math_SQRT13)),
+			Vector3(1, 1, 1).direction_to(Vector3(2, 2, 2)).is_equal_approx(Vector3(Math::SQRT13, Math::SQRT13, Math::SQRT13)),
 			"Vector3 direction_to should work as expected.");
 	CHECK_MESSAGE(
 			vector.inverse().is_equal_approx(Vector3(1 / 1.2, 1 / 3.4, 1 / 5.6)),
@@ -336,16 +332,16 @@ TEST_CASE("[Vector3] Other methods") {
 			"Vector3 posmodv should work as expected.");
 
 	CHECK_MESSAGE(
-			vector.rotated(Vector3(0, 1, 0), Math_TAU).is_equal_approx(vector),
+			vector.rotated(Vector3(0, 1, 0), Math::TAU).is_equal_approx(vector),
 			"Vector3 rotated should work as expected.");
 	CHECK_MESSAGE(
-			vector.rotated(Vector3(0, 1, 0), Math_TAU / 4).is_equal_approx(Vector3(5.6, 3.4, -1.2)),
+			vector.rotated(Vector3(0, 1, 0), Math::TAU / 4).is_equal_approx(Vector3(5.6, 3.4, -1.2)),
 			"Vector3 rotated should work as expected.");
 	CHECK_MESSAGE(
-			vector.rotated(Vector3(1, 0, 0), Math_TAU / 3).is_equal_approx(Vector3(1.2, -6.54974226119285642, 0.1444863728670914)),
+			vector.rotated(Vector3(1, 0, 0), Math::TAU / 3).is_equal_approx(Vector3(1.2, -6.54974226119285642, 0.1444863728670914)),
 			"Vector3 rotated should work as expected.");
 	CHECK_MESSAGE(
-			vector.rotated(Vector3(0, 0, 1), Math_TAU / 2).is_equal_approx(vector.rotated(Vector3(0, 0, 1), Math_TAU / -2)),
+			vector.rotated(Vector3(0, 0, 1), Math::TAU / 2).is_equal_approx(vector.rotated(Vector3(0, 0, 1), Math::TAU / -2)),
 			"Vector3 rotated should work as expected.");
 
 	CHECK_MESSAGE(
@@ -365,9 +361,9 @@ TEST_CASE("[Vector3] Other methods") {
 }
 
 TEST_CASE("[Vector3] Plane methods") {
-	const Vector3 vector = Vector3(1.2, 3.4, 5.6);
-	const Vector3 vector_y = Vector3(0, 1, 0);
-	const Vector3 vector_normal = Vector3(0.88763458893247992491, 0.26300284116517923701, 0.37806658417494515320);
+	constexpr Vector3 vector = Vector3(1.2, 3.4, 5.6);
+	constexpr Vector3 vector_y = Vector3(0, 1, 0);
+	constexpr Vector3 vector_normal = Vector3(0.88763458893247992491, 0.26300284116517923701, 0.37806658417494515320);
 	CHECK_MESSAGE(
 			vector.bounce(vector_y) == Vector3(1.2, -3.4, 5.6),
 			"Vector3 bounce on a plane with normal of the Y axis should.");
@@ -394,7 +390,7 @@ TEST_CASE("[Vector3] Plane methods") {
 			"Vector3 slide with normal should return expected value.");
 	// There's probably a better way to test these ones?
 #ifdef MATH_CHECKS
-	const Vector3 vector_non_normal = Vector3(5.4, 1.6, 2.3);
+	constexpr Vector3 vector_non_normal = Vector3(5.4, 1.6, 2.3);
 	ERR_PRINT_OFF;
 	CHECK_MESSAGE(
 			vector.bounce(vector_non_normal).is_equal_approx(Vector3()),
@@ -410,8 +406,8 @@ TEST_CASE("[Vector3] Plane methods") {
 }
 
 TEST_CASE("[Vector3] Rounding methods") {
-	const Vector3 vector1 = Vector3(1.2, 3.4, 5.6);
-	const Vector3 vector2 = Vector3(1.2, -3.4, -5.6);
+	constexpr Vector3 vector1 = Vector3(1.2, 3.4, 5.6);
+	constexpr Vector3 vector2 = Vector3(1.2, -3.4, -5.6);
 	CHECK_MESSAGE(
 			vector1.abs() == vector1,
 			"Vector3 abs should work as expected.");
@@ -449,11 +445,11 @@ TEST_CASE("[Vector3] Rounding methods") {
 }
 
 TEST_CASE("[Vector3] Linear algebra methods") {
-	const Vector3 vector_x = Vector3(1, 0, 0);
-	const Vector3 vector_y = Vector3(0, 1, 0);
-	const Vector3 vector_z = Vector3(0, 0, 1);
-	const Vector3 a = Vector3(3.5, 8.5, 2.3);
-	const Vector3 b = Vector3(5.2, 4.6, 7.8);
+	constexpr Vector3 vector_x = Vector3(1, 0, 0);
+	constexpr Vector3 vector_y = Vector3(0, 1, 0);
+	constexpr Vector3 vector_z = Vector3(0, 0, 1);
+	constexpr Vector3 a = Vector3(3.5, 8.5, 2.3);
+	constexpr Vector3 b = Vector3(5.2, 4.6, 7.8);
 	CHECK_MESSAGE(
 			vector_x.cross(vector_y) == vector_z,
 			"Vector3 cross product of X and Y should give Z.");
@@ -491,7 +487,7 @@ TEST_CASE("[Vector3] Linear algebra methods") {
 }
 
 TEST_CASE("[Vector3] Finite number checks") {
-	const double infinite[] = { NAN, INFINITY, -INFINITY };
+	constexpr double infinite[] = { Math::NaN, Math::INF, -Math::INF };
 
 	CHECK_MESSAGE(
 			Vector3(0, 1, 2).is_finite(),
@@ -535,5 +531,3 @@ TEST_CASE("[Vector3] Finite number checks") {
 }
 
 } // namespace TestVector3
-
-#endif // TEST_VECTOR3_H
diff --git a/engine/tests/core/math/test_vector3i.h b/engine/tests/core/math/test_vector3i.h
index 3914b85a..cec23525 100644
--- a/engine/tests/core/math/test_vector3i.h
+++ b/engine/tests/core/math/test_vector3i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VECTOR3I_H
-#define TEST_VECTOR3I_H
+#pragma once
 
 #include "core/math/vector3i.h"
 #include "tests/test_macros.h"
@@ -37,9 +36,9 @@
 namespace TestVector3i {
 
 TEST_CASE("[Vector3i] Constructor methods") {
-	const Vector3i vector_empty = Vector3i();
-	const Vector3i vector_zero = Vector3i(0, 0, 0);
-	CHECK_MESSAGE(
+	constexpr Vector3i vector_empty = Vector3i();
+	constexpr Vector3i vector_zero = Vector3i(0, 0, 0);
+	static_assert(
 			vector_empty == vector_zero,
 			"Vector3i Constructor with no inputs should return a zero Vector3i.");
 }
@@ -66,7 +65,7 @@ TEST_CASE("[Vector3i] Axis methods") {
 }
 
 TEST_CASE("[Vector3i] Clamp method") {
-	const Vector3i vector = Vector3i(10, 10, 10);
+	constexpr Vector3i vector = Vector3i(10, 10, 10);
 	CHECK_MESSAGE(
 			Vector3i(-5, 5, 15).clamp(Vector3i(), vector) == Vector3i(0, 5, 10),
 			"Vector3i clamp should work as expected.");
@@ -76,13 +75,13 @@ TEST_CASE("[Vector3i] Clamp method") {
 }
 
 TEST_CASE("[Vector3i] Length methods") {
-	const Vector3i vector1 = Vector3i(10, 10, 10);
-	const Vector3i vector2 = Vector3i(20, 30, 40);
+	constexpr Vector3i vector1 = Vector3i(10, 10, 10);
+	constexpr Vector3i vector2 = Vector3i(20, 30, 40);
 	CHECK_MESSAGE(
 			vector1.length_squared() == 300,
 			"Vector3i length_squared should work as expected and return exact result.");
 	CHECK_MESSAGE(
-			vector1.length() == doctest::Approx(10 * Math_SQRT3),
+			vector1.length() == doctest::Approx(10 * Math::SQRT3),
 			"Vector3i length should work as expected.");
 	CHECK_MESSAGE(
 			vector2.length_squared() == 2900,
@@ -99,26 +98,26 @@ TEST_CASE("[Vector3i] Length methods") {
 }
 
 TEST_CASE("[Vector3i] Operators") {
-	const Vector3i vector1 = Vector3i(4, 5, 9);
-	const Vector3i vector2 = Vector3i(1, 2, 3);
+	constexpr Vector3i vector1 = Vector3i(4, 5, 9);
+	constexpr Vector3i vector2 = Vector3i(1, 2, 3);
 
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 + vector2) == Vector3i(5, 7, 12),
 			"Vector3i addition with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 - vector2) == Vector3i(3, 3, 6),
 			"Vector3i subtraction with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 * vector2) == Vector3i(4, 10, 27),
 			"Vector3i multiplication with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 / vector2) == Vector3i(4, 2, 3),
 			"Vector3i division with integers should give exact results.");
 
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 * 2) == Vector3i(8, 10, 18),
 			"Vector3i multiplication with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 / 2) == Vector3i(2, 2, 4),
 			"Vector3i division with integers should give exact results.");
 
@@ -134,7 +133,7 @@ TEST_CASE("[Vector3i] Operators") {
 }
 
 TEST_CASE("[Vector3i] Other methods") {
-	const Vector3i vector = Vector3i(1, 3, -7);
+	constexpr Vector3i vector = Vector3i(1, 3, -7);
 
 	CHECK_MESSAGE(
 			vector.min(Vector3i(3, 2, 5)) == Vector3i(1, 2, -7),
@@ -149,8 +148,8 @@ TEST_CASE("[Vector3i] Other methods") {
 }
 
 TEST_CASE("[Vector3i] Abs and sign methods") {
-	const Vector3i vector1 = Vector3i(1, 3, 5);
-	const Vector3i vector2 = Vector3i(1, -3, -5);
+	constexpr Vector3i vector1 = Vector3i(1, 3, 5);
+	constexpr Vector3i vector2 = Vector3i(1, -3, -5);
 	CHECK_MESSAGE(
 			vector1.abs() == vector1,
 			"Vector3i abs should work as expected.");
@@ -166,5 +165,3 @@ TEST_CASE("[Vector3i] Abs and sign methods") {
 			"Vector3i sign should work as expected.");
 }
 } // namespace TestVector3i
-
-#endif // TEST_VECTOR3I_H
diff --git a/engine/tests/core/math/test_vector4.h b/engine/tests/core/math/test_vector4.h
index 331e0fcf..457c5327 100644
--- a/engine/tests/core/math/test_vector4.h
+++ b/engine/tests/core/math/test_vector4.h
@@ -28,20 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VECTOR4_H
-#define TEST_VECTOR4_H
+#pragma once
 
 #include "core/math/vector4.h"
 #include "tests/test_macros.h"
 
-#define Math_SQRT3 1.7320508075688772935274463415059
-
 namespace TestVector4 {
 
 TEST_CASE("[Vector4] Constructor methods") {
-	const Vector4 vector_empty = Vector4();
-	const Vector4 vector_zero = Vector4(0.0, 0.0, 0.0, 0.0);
-	CHECK_MESSAGE(
+	constexpr Vector4 vector_empty = Vector4();
+	constexpr Vector4 vector_zero = Vector4(0.0, 0.0, 0.0, 0.0);
+	static_assert(
 			vector_empty == vector_zero,
 			"Vector4 Constructor with no inputs should return a zero Vector4.");
 }
@@ -68,8 +65,8 @@ TEST_CASE("[Vector4] Axis methods") {
 }
 
 TEST_CASE("[Vector4] Interpolation methods") {
-	const Vector4 vector1 = Vector4(1, 2, 3, 4);
-	const Vector4 vector2 = Vector4(4, 5, 6, 7);
+	constexpr Vector4 vector1 = Vector4(1, 2, 3, 4);
+	constexpr Vector4 vector2 = Vector4(4, 5, 6, 7);
 	CHECK_MESSAGE(
 			vector1.lerp(vector2, 0.5) == Vector4(2.5, 3.5, 4.5, 5.5),
 			"Vector4 lerp should work as expected.");
@@ -85,8 +82,8 @@ TEST_CASE("[Vector4] Interpolation methods") {
 }
 
 TEST_CASE("[Vector4] Length methods") {
-	const Vector4 vector1 = Vector4(10, 10, 10, 10);
-	const Vector4 vector2 = Vector4(20, 30, 40, 50);
+	constexpr Vector4 vector1 = Vector4(10, 10, 10, 10);
+	constexpr Vector4 vector2 = Vector4(20, 30, 40, 50);
 	CHECK_MESSAGE(
 			vector1.length_squared() == 400,
 			"Vector4 length_squared should work as expected and return exact result.");
@@ -108,7 +105,7 @@ TEST_CASE("[Vector4] Length methods") {
 }
 
 TEST_CASE("[Vector4] Limiting methods") {
-	const Vector4 vector = Vector4(10, 10, 10, 10);
+	constexpr Vector4 vector = Vector4(10, 10, 10, 10);
 	CHECK_MESSAGE(
 			Vector4(-5, 5, 15, -15).clamp(Vector4(), vector) == Vector4(0, 5, 10, 0),
 			"Vector4 clamp should work as expected.");
@@ -128,7 +125,7 @@ TEST_CASE("[Vector4] Normalization methods") {
 			Vector4(1, 0, 0, 0).normalized() == Vector4(1, 0, 0, 0),
 			"Vector4 normalized should return the same vector for a normalized vector.");
 	CHECK_MESSAGE(
-			Vector4(1, 1, 0, 0).normalized().is_equal_approx(Vector4(Math_SQRT12, Math_SQRT12, 0, 0)),
+			Vector4(1, 1, 0, 0).normalized().is_equal_approx(Vector4(Math::SQRT12, Math::SQRT12, 0, 0)),
 			"Vector4 normalized should work as expected.");
 	CHECK_MESSAGE(
 			Vector4(1, 1, 1, 1).normalized().is_equal_approx(Vector4(0.5, 0.5, 0.5, 0.5)),
@@ -136,73 +133,73 @@ TEST_CASE("[Vector4] Normalization methods") {
 }
 
 TEST_CASE("[Vector4] Operators") {
-	const Vector4 decimal1 = Vector4(2.3, 4.9, 7.8, 3.2);
-	const Vector4 decimal2 = Vector4(1.2, 3.4, 5.6, 1.7);
-	const Vector4 power1 = Vector4(0.75, 1.5, 0.625, 0.125);
-	const Vector4 power2 = Vector4(0.5, 0.125, 0.25, 0.75);
-	const Vector4 int1 = Vector4(4, 5, 9, 2);
-	const Vector4 int2 = Vector4(1, 2, 3, 1);
+	constexpr Vector4 decimal1 = Vector4(2.3, 4.9, 7.8, 3.2);
+	constexpr Vector4 decimal2 = Vector4(1.2, 3.4, 5.6, 1.7);
+	constexpr Vector4 power1 = Vector4(0.75, 1.5, 0.625, 0.125);
+	constexpr Vector4 power2 = Vector4(0.5, 0.125, 0.25, 0.75);
+	constexpr Vector4 int1 = Vector4(4, 5, 9, 2);
+	constexpr Vector4 int2 = Vector4(1, 2, 3, 1);
 
-	CHECK_MESSAGE(
+	static_assert(
 			-decimal1 == Vector4(-2.3, -4.9, -7.8, -3.2),
 			"Vector4 change of sign should work as expected.");
 	CHECK_MESSAGE(
 			(decimal1 + decimal2).is_equal_approx(Vector4(3.5, 8.3, 13.4, 4.9)),
 			"Vector4 addition should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 + power2) == Vector4(1.25, 1.625, 0.875, 0.875),
 			"Vector4 addition with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 + int2) == Vector4(5, 7, 12, 3),
 			"Vector4 addition with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 - decimal2).is_equal_approx(Vector4(1.1, 1.5, 2.2, 1.5)),
 			"Vector4 subtraction should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 - power2) == Vector4(0.25, 1.375, 0.375, -0.625),
 			"Vector4 subtraction with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 - int2) == Vector4(3, 3, 6, 1),
 			"Vector4 subtraction with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 * decimal2).is_equal_approx(Vector4(2.76, 16.66, 43.68, 5.44)),
 			"Vector4 multiplication should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 * power2) == Vector4(0.375, 0.1875, 0.15625, 0.09375),
 			"Vector4 multiplication with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 * int2) == Vector4(4, 10, 27, 2),
 			"Vector4 multiplication with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 / decimal2).is_equal_approx(Vector4(1.91666666666666666, 1.44117647058823529, 1.39285714285714286, 1.88235294118)),
 			"Vector4 division should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 / power2) == Vector4(1.5, 12.0, 2.5, 1.0 / 6.0),
 			"Vector4 division with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 / int2) == Vector4(4, 2.5, 3, 2),
 			"Vector4 division with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 * 2).is_equal_approx(Vector4(4.6, 9.8, 15.6, 6.4)),
 			"Vector4 multiplication should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 * 2) == Vector4(1.5, 3, 1.25, 0.25),
 			"Vector4 multiplication with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 * 2) == Vector4(8, 10, 18, 4),
 			"Vector4 multiplication with integers should give exact results.");
 
 	CHECK_MESSAGE(
 			(decimal1 / 2).is_equal_approx(Vector4(1.15, 2.45, 3.9, 1.6)),
 			"Vector4 division should behave as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(power1 / 2) == Vector4(0.375, 0.75, 0.3125, 0.0625),
 			"Vector4 division with powers of two should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(int1 / 2) == Vector4(2, 2.5, 4.5, 1),
 			"Vector4 division with integers should give exact results.");
 
@@ -217,17 +214,17 @@ TEST_CASE("[Vector4] Operators") {
 			"Vector4 cast to String should work as expected.");
 #ifdef REAL_T_IS_DOUBLE
 	CHECK_MESSAGE(
-			((String)Vector4(Math_E, Math_SQRT2, Math_SQRT3, Math_SQRT3)) == "(2.71828182845905, 1.4142135623731, 1.73205080756888, 1.73205080756888)",
+			((String)Vector4(Math::E, Math::SQRT2, Math::SQRT3, Math::SQRT3)) == "(2.71828182845905, 1.4142135623731, 1.73205080756888, 1.73205080756888)",
 			"Vector4 cast to String should print the correct amount of digits for real_t = double.");
 #else
 	CHECK_MESSAGE(
-			((String)Vector4(Math_E, Math_SQRT2, Math_SQRT3, Math_SQRT3)) == "(2.718282, 1.414214, 1.732051, 1.732051)",
+			((String)Vector4(Math::E, Math::SQRT2, Math::SQRT3, Math::SQRT3)) == "(2.718282, 1.414214, 1.732051, 1.732051)",
 			"Vector4 cast to String should print the correct amount of digits for real_t = float.");
 #endif // REAL_T_IS_DOUBLE
 }
 
 TEST_CASE("[Vector4] Other methods") {
-	const Vector4 vector = Vector4(1.2, 3.4, 5.6, 1.6);
+	constexpr Vector4 vector = Vector4(1.2, 3.4, 5.6, 1.6);
 	CHECK_MESSAGE(
 			vector.direction_to(Vector4()).is_equal_approx(-vector.normalized()),
 			"Vector4 direction_to should work as expected.");
@@ -266,8 +263,8 @@ TEST_CASE("[Vector4] Other methods") {
 }
 
 TEST_CASE("[Vector4] Rounding methods") {
-	const Vector4 vector1 = Vector4(1.2, 3.4, 5.6, 1.6);
-	const Vector4 vector2 = Vector4(1.2, -3.4, -5.6, -1.6);
+	constexpr Vector4 vector1 = Vector4(1.2, 3.4, 5.6, 1.6);
+	constexpr Vector4 vector2 = Vector4(1.2, -3.4, -5.6, -1.6);
 	CHECK_MESSAGE(
 			vector1.abs() == vector1,
 			"Vector4 abs should work as expected.");
@@ -304,10 +301,10 @@ TEST_CASE("[Vector4] Rounding methods") {
 }
 
 TEST_CASE("[Vector4] Linear algebra methods") {
-	const Vector4 vector_x = Vector4(1, 0, 0, 0);
-	const Vector4 vector_y = Vector4(0, 1, 0, 0);
-	const Vector4 vector1 = Vector4(1.7, 2.3, 1, 9.1);
-	const Vector4 vector2 = Vector4(-8.2, -16, 3, 2.4);
+	constexpr Vector4 vector_x = Vector4(1, 0, 0, 0);
+	constexpr Vector4 vector_y = Vector4(0, 1, 0, 0);
+	constexpr Vector4 vector1 = Vector4(1.7, 2.3, 1, 9.1);
+	constexpr Vector4 vector2 = Vector4(-8.2, -16, 3, 2.4);
 
 	CHECK_MESSAGE(
 			vector_x.dot(vector_y) == 0.0,
@@ -324,7 +321,7 @@ TEST_CASE("[Vector4] Linear algebra methods") {
 }
 
 TEST_CASE("[Vector4] Finite number checks") {
-	const double infinite[] = { NAN, INFINITY, -INFINITY };
+	constexpr double infinite[] = { Math::NaN, Math::INF, -Math::INF };
 
 	CHECK_MESSAGE(
 			Vector4(0, 1, 2, 3).is_finite(),
@@ -401,5 +398,3 @@ TEST_CASE("[Vector4] Finite number checks") {
 }
 
 } // namespace TestVector4
-
-#endif // TEST_VECTOR4_H
diff --git a/engine/tests/core/math/test_vector4i.h b/engine/tests/core/math/test_vector4i.h
index 31f68696..661cc369 100644
--- a/engine/tests/core/math/test_vector4i.h
+++ b/engine/tests/core/math/test_vector4i.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VECTOR4I_H
-#define TEST_VECTOR4I_H
+#pragma once
 
 #include "core/math/vector4i.h"
 #include "tests/test_macros.h"
@@ -37,9 +36,9 @@
 namespace TestVector4i {
 
 TEST_CASE("[Vector4i] Constructor methods") {
-	const Vector4i vector_empty = Vector4i();
-	const Vector4i vector_zero = Vector4i(0, 0, 0, 0);
-	CHECK_MESSAGE(
+	constexpr Vector4i vector_empty = Vector4i();
+	constexpr Vector4i vector_zero = Vector4i(0, 0, 0, 0);
+	static_assert(
 			vector_empty == vector_zero,
 			"Vector4i Constructor with no inputs should return a zero Vector4i.");
 }
@@ -66,7 +65,7 @@ TEST_CASE("[Vector4i] Axis methods") {
 }
 
 TEST_CASE("[Vector4i] Clamp method") {
-	const Vector4i vector = Vector4i(10, 10, 10, 10);
+	constexpr Vector4i vector = Vector4i(10, 10, 10, 10);
 	CHECK_MESSAGE(
 			Vector4i(-5, 5, 15, INT_MAX).clamp(Vector4i(), vector) == Vector4i(0, 5, 10, 10),
 			"Vector4i clamp should work as expected.");
@@ -76,8 +75,8 @@ TEST_CASE("[Vector4i] Clamp method") {
 }
 
 TEST_CASE("[Vector4i] Length methods") {
-	const Vector4i vector1 = Vector4i(10, 10, 10, 10);
-	const Vector4i vector2 = Vector4i(20, 30, 40, 50);
+	constexpr Vector4i vector1 = Vector4i(10, 10, 10, 10);
+	constexpr Vector4i vector2 = Vector4i(20, 30, 40, 50);
 	CHECK_MESSAGE(
 			vector1.length_squared() == 400,
 			"Vector4i length_squared should work as expected and return exact result.");
@@ -99,29 +98,29 @@ TEST_CASE("[Vector4i] Length methods") {
 }
 
 TEST_CASE("[Vector4i] Operators") {
-	const Vector4i vector1 = Vector4i(4, 5, 9, 2);
-	const Vector4i vector2 = Vector4i(1, 2, 3, 4);
+	constexpr Vector4i vector1 = Vector4i(4, 5, 9, 2);
+	constexpr Vector4i vector2 = Vector4i(1, 2, 3, 4);
 
-	CHECK_MESSAGE(
+	static_assert(
 			-vector1 == Vector4i(-4, -5, -9, -2),
 			"Vector4i change of sign should work as expected.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 + vector2) == Vector4i(5, 7, 12, 6),
 			"Vector4i addition with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 - vector2) == Vector4i(3, 3, 6, -2),
 			"Vector4i subtraction with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 * vector2) == Vector4i(4, 10, 27, 8),
 			"Vector4i multiplication with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 / vector2) == Vector4i(4, 2, 3, 0),
 			"Vector4i division with integers should give exact results.");
 
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 * 2) == Vector4i(8, 10, 18, 4),
 			"Vector4i multiplication with integers should give exact results.");
-	CHECK_MESSAGE(
+	static_assert(
 			(vector1 / 2) == Vector4i(2, 2, 4, 1),
 			"Vector4i division with integers should give exact results.");
 
@@ -137,7 +136,7 @@ TEST_CASE("[Vector4i] Operators") {
 }
 
 TEST_CASE("[Vector3i] Other methods") {
-	const Vector4i vector = Vector4i(1, 3, -7, 13);
+	constexpr Vector4i vector = Vector4i(1, 3, -7, 13);
 
 	CHECK_MESSAGE(
 			vector.min(Vector4i(3, 2, 5, 8)) == Vector4i(1, 2, -7, 8),
@@ -153,8 +152,8 @@ TEST_CASE("[Vector3i] Other methods") {
 }
 
 TEST_CASE("[Vector4i] Abs and sign methods") {
-	const Vector4i vector1 = Vector4i(1, 3, 5, 7);
-	const Vector4i vector2 = Vector4i(1, -3, -5, 7);
+	constexpr Vector4i vector1 = Vector4i(1, 3, 5, 7);
+	constexpr Vector4i vector2 = Vector4i(1, -3, -5, 7);
 	CHECK_MESSAGE(
 			vector1.abs() == vector1,
 			"Vector4i abs should work as expected.");
@@ -170,5 +169,3 @@ TEST_CASE("[Vector4i] Abs and sign methods") {
 			"Vector4i sign should work as expected.");
 }
 } // namespace TestVector4i
-
-#endif // TEST_VECTOR4I_H
diff --git a/engine/tests/core/object/test_class_db.h b/engine/tests/core/object/test_class_db.h
index b38d3d3e..72c839ce 100644
--- a/engine/tests/core/object/test_class_db.h
+++ b/engine/tests/core/object/test_class_db.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CLASS_DB_H
-#define TEST_CLASS_DB_H
+#pragma once
 
 #include "core/core_bind.h"
 #include "core/core_constants.h"
@@ -415,6 +414,9 @@ void validate_argument(const Context &p_context, const ExposedClass &p_class, co
 #ifdef DEBUG_METHODS_ENABLED
 	TEST_COND((p_arg.name.is_empty() || p_arg.name.begins_with("_unnamed_arg")),
 			vformat("Unnamed argument in position %d of %s '%s.%s'.", p_arg.position, p_owner_type, p_class.name, p_owner_name));
+
+	TEST_FAIL_COND((p_arg.name != "@varargs@" && !p_arg.name.is_valid_ascii_identifier()),
+			vformat("Invalid argument name '%s' of %s '%s.%s'.", p_arg.name, p_owner_type, p_class.name, p_owner_name));
 #endif // DEBUG_METHODS_ENABLED
 
 	const ExposedClass *arg_class = p_context.find_exposed_class(p_arg.type);
@@ -658,9 +660,8 @@ void add_exposed_classes(Context &r_context) {
 				method.return_type.name = Variant::get_type_name(return_info.type);
 			}
 
-			int i = 0;
-			for (List<PropertyInfo>::ConstIterator itr = method_info.arguments.begin(); itr != method_info.arguments.end(); ++itr, ++i) {
-				const PropertyInfo &arg_info = *itr;
+			for (int64_t i = 0; i < method_info.arguments.size(); ++i) {
+				const PropertyInfo &arg_info = method_info.arguments[i];
 
 				String orig_arg_name = arg_info.name;
 
@@ -732,9 +733,8 @@ void add_exposed_classes(Context &r_context) {
 			TEST_FAIL_COND(!String(signal.name).is_valid_ascii_identifier(),
 					"Signal name is not a valid identifier: '", exposed_class.name, ".", signal.name, "'.");
 
-			int i = 0;
-			for (List<PropertyInfo>::ConstIterator itr = method_info.arguments.begin(); itr != method_info.arguments.end(); ++itr, ++i) {
-				const PropertyInfo &arg_info = *itr;
+			for (int64_t i = 0; i < method_info.arguments.size(); ++i) {
+				const PropertyInfo &arg_info = method_info.arguments[i];
 
 				String orig_arg_name = arg_info.name;
 
@@ -900,5 +900,3 @@ TEST_SUITE("[ClassDB]") {
 	}
 }
 } // namespace TestClassDB
-
-#endif // TEST_CLASS_DB_H
diff --git a/engine/tests/core/object/test_method_bind.h b/engine/tests/core/object/test_method_bind.h
index e31e4dcb..4f278f5b 100644
--- a/engine/tests/core/object/test_method_bind.h
+++ b/engine/tests/core/object/test_method_bind.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_METHOD_BIND_H
-#define TEST_METHOD_BIND_H
+#pragma once
 
 #include "core/object/class_db.h"
 
@@ -56,6 +55,8 @@ public:
 	};
 
 	class ObjectSubclass : public Object {
+		GDSOFTCLASS(ObjectSubclass, Object);
+
 	public:
 		int value = 1;
 	};
@@ -171,5 +172,3 @@ TEST_CASE("[MethodBind] check all method binds") {
 	memdelete(mbt);
 }
 } // namespace TestMethodBind
-
-#endif // TEST_METHOD_BIND_H
diff --git a/engine/tests/core/object/test_object.h b/engine/tests/core/object/test_object.h
index 55c53e2d..0ca0b17f 100644
--- a/engine/tests/core/object/test_object.h
+++ b/engine/tests/core/object/test_object.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_OBJECT_H
-#define TEST_OBJECT_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/object.h"
@@ -144,15 +143,6 @@ TEST_CASE("[Object] Core getters") {
 	CHECK_MESSAGE(
 			object.get_save_class() == "Object",
 			"The returned save class should match the expected value.");
-
-	List<String> inheritance_list;
-	object.get_inheritance_list_static(&inheritance_list);
-	CHECK_MESSAGE(
-			inheritance_list.size() == 1,
-			"The inheritance list should consist of Object only");
-	CHECK_MESSAGE(
-			inheritance_list.front()->get() == "Object",
-			"The inheritance list should consist of Object only");
 }
 
 TEST_CASE("[Object] Metadata") {
@@ -429,8 +419,7 @@ TEST_CASE("[Object] Signals") {
 	}
 
 	SUBCASE("Emitting an existing signal should call the connected method") {
-		Array empty_signal_args;
-		empty_signal_args.push_back(Array());
+		Array empty_signal_args = { {} };
 
 		SIGNAL_WATCH(&object, "my_custom_signal");
 		SIGNAL_CHECK_FALSE("my_custom_signal");
@@ -466,72 +455,75 @@ TEST_CASE("[Object] Signals") {
 	}
 }
 
-class NotificationObject1 : public Object {
-	GDCLASS(NotificationObject1, Object);
+class NotificationObjectSuperclass : public Object {
+	GDCLASS(NotificationObjectSuperclass, Object);
 
 protected:
 	void _notification(int p_what) {
-		switch (p_what) {
-			case 12345: {
-				order_internal1 = order_global++;
-			} break;
-		}
+		order_superclass = ++order_global;
 	}
 
 public:
-	static int order_global;
-	int order_internal1 = -1;
-
-	void reset_order() {
-		order_internal1 = -1;
-		order_global = 1;
-	}
+	static inline int order_global = 0;
+	int order_superclass = -1;
 };
 
-int NotificationObject1::order_global = 1;
-
-class NotificationObject2 : public NotificationObject1 {
-	GDCLASS(NotificationObject2, NotificationObject1);
+class NotificationObjectSubclass : public NotificationObjectSuperclass {
+	GDCLASS(NotificationObjectSubclass, NotificationObjectSuperclass);
 
 protected:
 	void _notification(int p_what) {
-		switch (p_what) {
-			case 12345: {
-				order_internal2 = order_global++;
-			} break;
-		}
+		order_subclass = ++order_global;
 	}
 
 public:
-	int order_internal2 = -1;
-	void reset_order() {
-		NotificationObject1::reset_order();
-		order_internal2 = -1;
+	int order_subclass = -1;
+};
+
+class NotificationScriptInstance : public _MockScriptInstance {
+	void notification(int p_notification, bool p_reversed) override {
+		order_script = ++NotificationObjectSuperclass::order_global;
 	}
+
+public:
+	int order_script = -1;
 };
 
 TEST_CASE("[Object] Notification order") { // GH-52325
-	NotificationObject2 *test_notification_object = memnew(NotificationObject2);
+	NotificationObjectSubclass *object = memnew(NotificationObjectSubclass);
+
+	NotificationScriptInstance *script = memnew(NotificationScriptInstance);
+	object->set_script_instance(script);
 
 	SUBCASE("regular order") {
-		test_notification_object->notification(12345, false);
+		NotificationObjectSubclass::order_global = 0;
+		object->order_superclass = -1;
+		object->order_subclass = -1;
+		script->order_script = -1;
+		object->notification(12345, false);
 
-		CHECK_EQ(test_notification_object->order_internal1, 1);
-		CHECK_EQ(test_notification_object->order_internal2, 2);
-
-		test_notification_object->reset_order();
+		CHECK_EQ(object->order_superclass, 1);
+		CHECK_EQ(object->order_subclass, 2);
+		// TODO If an extension is attached, it should come here.
+		CHECK_EQ(script->order_script, 3);
+		CHECK_EQ(NotificationObjectSubclass::order_global, 3);
 	}
 
 	SUBCASE("reverse order") {
-		test_notification_object->notification(12345, true);
+		NotificationObjectSubclass::order_global = 0;
+		object->order_superclass = -1;
+		object->order_subclass = -1;
+		script->order_script = -1;
+		object->notification(12345, true);
 
-		CHECK_EQ(test_notification_object->order_internal1, 2);
-		CHECK_EQ(test_notification_object->order_internal2, 1);
-
-		test_notification_object->reset_order();
+		CHECK_EQ(script->order_script, 1);
+		// TODO If an extension is attached, it should come here.
+		CHECK_EQ(object->order_subclass, 2);
+		CHECK_EQ(object->order_superclass, 3);
+		CHECK_EQ(NotificationObjectSubclass::order_global, 3);
 	}
 
-	memdelete(test_notification_object);
+	memdelete(object);
 }
 
 TEST_CASE("[Object] Destruction at the end of the call chain is safe") {
@@ -603,5 +595,3 @@ TEST_CASE("[Object] Destruction at the end of the call chain is safe") {
 }
 
 } // namespace TestObject
-
-#endif // TEST_OBJECT_H
diff --git a/engine/tests/core/object/test_undo_redo.h b/engine/tests/core/object/test_undo_redo.h
index ad3554b5..51b2b000 100644
--- a/engine/tests/core/object/test_undo_redo.h
+++ b/engine/tests/core/object/test_undo_redo.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_UNDO_REDO_H
-#define TEST_UNDO_REDO_H
+#pragma once
 
 #include "core/object/undo_redo.h"
 #include "tests/test_macros.h"
@@ -198,5 +197,3 @@ TEST_CASE("[UndoRedo] Merge Method UndoRedo") {
 }
 
 } //namespace TestUndoRedo
-
-#endif // TEST_UNDO_REDO_H
diff --git a/engine/tests/core/os/test_os.h b/engine/tests/core/os/test_os.h
index 1e2f5e22..15d3b3af 100644
--- a/engine/tests/core/os/test_os.h
+++ b/engine/tests/core/os/test_os.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_OS_H
-#define TEST_OS_H
+#pragma once
 
 #include "core/os/os.h"
 
@@ -202,5 +201,3 @@ TEST_CASE("[OS] Execute") {
 }
 
 } // namespace TestOS
-
-#endif // TEST_OS_H
diff --git a/engine/tests/core/string/test_fuzzy_search.h b/engine/tests/core/string/test_fuzzy_search.h
index d647ebdd..a7e52be1 100644
--- a/engine/tests/core/string/test_fuzzy_search.h
+++ b/engine/tests/core/string/test_fuzzy_search.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_FUZZY_SEARCH_H
-#define TEST_FUZZY_SEARCH_H
+#pragma once
 
 #include "core/string/fuzzy_search.h"
 #include "tests/test_macros.h"
@@ -79,5 +78,3 @@ TEST_CASE("[FuzzySearch] Test fuzzy search results") {
 }
 
 } //namespace TestFuzzySearch
-
-#endif // TEST_FUZZY_SEARCH_H
diff --git a/engine/tests/core/string/test_node_path.h b/engine/tests/core/string/test_node_path.h
index 3e7d4de4..a30430dc 100644
--- a/engine/tests/core/string/test_node_path.h
+++ b/engine/tests/core/string/test_node_path.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NODE_PATH_H
-#define TEST_NODE_PATH_H
+#pragma once
 
 #include "core/string/node_path.h"
 
@@ -224,5 +223,3 @@ TEST_CASE("[NodePath] Slice") {
 }
 
 } // namespace TestNodePath
-
-#endif // TEST_NODE_PATH_H
diff --git a/engine/tests/core/string/test_string.h b/engine/tests/core/string/test_string.h
index d0b1bf84..5595f2ed 100644
--- a/engine/tests/core/string/test_string.h
+++ b/engine/tests/core/string/test_string.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_STRING_H
-#define TEST_STRING_H
+#pragma once
 
 #include "core/string/ustring.h"
 
@@ -60,7 +59,7 @@ TEST_CASE("[String] Assign from Latin-1 char string (copycon)") {
 	const String &t1(s);
 	CHECK(u32scmp(t1.get_data(), U"Sheep") == 0);
 
-	String t2 = String("Sheep", 3);
+	String t2 = String::latin1(Span("Sheep", 3));
 	CHECK(u32scmp(t2.get_data(), U"She") == 0);
 }
 
@@ -88,34 +87,38 @@ TEST_CASE("[String] UTF8") {
 	/* how can i embed UTF in here? */
 	static const char32_t u32str[] = { 0x0045, 0x0020, 0x304A, 0x360F, 0x3088, 0x3046, 0x1F3A4, 0 };
 	static const uint8_t u8str[] = { 0x45, 0x20, 0xE3, 0x81, 0x8A, 0xE3, 0x98, 0x8F, 0xE3, 0x82, 0x88, 0xE3, 0x81, 0x86, 0xF0, 0x9F, 0x8E, 0xA4, 0 };
-	String s = u32str;
-	Error err = s.parse_utf8(s.utf8().get_data());
+	String expected = u32str;
+	String parsed;
+	Error err = parsed.append_utf8(expected.utf8().get_data());
 	CHECK(err == OK);
-	CHECK(s == u32str);
+	CHECK(parsed == u32str);
 
-	err = s.parse_utf8((const char *)u8str);
+	parsed.clear();
+	err = parsed.append_utf8((const char *)u8str);
 	CHECK(err == OK);
-	CHECK(s == u32str);
+	CHECK(parsed == u32str);
 
 	CharString cs = (const char *)u8str;
-	CHECK(String::utf8(cs) == s);
+	CHECK(String::utf8(cs) == parsed);
 }
 
 TEST_CASE("[String] UTF16") {
 	/* how can i embed UTF in here? */
 	static const char32_t u32str[] = { 0x0045, 0x0020, 0x304A, 0x360F, 0x3088, 0x3046, 0x1F3A4, 0 };
 	static const char16_t u16str[] = { 0x0045, 0x0020, 0x304A, 0x360F, 0x3088, 0x3046, 0xD83C, 0xDFA4, 0 };
-	String s = u32str;
-	Error err = s.parse_utf16(s.utf16().get_data());
+	String expected = u32str;
+	String parsed;
+	Error err = parsed.append_utf16(expected.utf16().get_data());
 	CHECK(err == OK);
-	CHECK(s == u32str);
+	CHECK(parsed == u32str);
 
-	err = s.parse_utf16(u16str);
+	parsed.clear();
+	err = parsed.append_utf16(u16str);
 	CHECK(err == OK);
-	CHECK(s == u32str);
+	CHECK(parsed == u32str);
 
 	Char16String cs = u16str;
-	CHECK(String::utf16(cs) == s);
+	CHECK(String::utf16(cs) == parsed);
 }
 
 TEST_CASE("[String] UTF8 with BOM") {
@@ -123,7 +126,7 @@ TEST_CASE("[String] UTF8 with BOM") {
 	static const char32_t u32str[] = { 0x0045, 0x0020, 0x304A, 0x360F, 0x3088, 0x3046, 0x1F3A4, 0 };
 	static const uint8_t u8str[] = { 0xEF, 0xBB, 0xBF, 0x45, 0x20, 0xE3, 0x81, 0x8A, 0xE3, 0x98, 0x8F, 0xE3, 0x82, 0x88, 0xE3, 0x81, 0x86, 0xF0, 0x9F, 0x8E, 0xA4, 0 };
 	String s;
-	Error err = s.parse_utf8((const char *)u8str);
+	Error err = s.append_utf8((const char *)u8str);
 	CHECK(err == OK);
 	CHECK(s == u32str);
 
@@ -137,11 +140,12 @@ TEST_CASE("[String] UTF16 with BOM") {
 	static const char16_t u16str[] = { 0xFEFF, 0x0020, 0x0045, 0x304A, 0x360F, 0x3088, 0x3046, 0xD83C, 0xDFA4, 0 };
 	static const char16_t u16str_swap[] = { 0xFFFE, 0x2000, 0x4500, 0x4A30, 0x0F36, 0x8830, 0x4630, 0x3CD8, 0xA4DF, 0 };
 	String s;
-	Error err = s.parse_utf16(u16str);
+	Error err = s.append_utf16(u16str);
 	CHECK(err == OK);
 	CHECK(s == u32str);
 
-	err = s.parse_utf16(u16str_swap);
+	s.clear();
+	err = s.append_utf16(u16str_swap);
 	CHECK(err == OK);
 	CHECK(s == u32str);
 
@@ -156,23 +160,23 @@ TEST_CASE("[String] UTF8 with CR") {
 	const String base = U"Hello darkness\r\nMy old friend\nI've come to talk\rWith you again";
 
 	String keep_cr;
-	Error err = keep_cr.parse_utf8(base.utf8().get_data());
+	Error err = keep_cr.append_utf8(base.utf8().get_data());
 	CHECK(err == OK);
 	CHECK(keep_cr == base);
 
 	String no_cr;
-	err = no_cr.parse_utf8(base.utf8().get_data(), -1, true); // Skip CR.
+	err = no_cr.append_utf8(base.utf8().get_data(), -1, true); // Skip CR.
 	CHECK(err == OK);
 	CHECK(no_cr == base.replace("\r", ""));
 }
 
-TEST_CASE("[String] Invalid UTF8 (non-standard)") {
+TEST_CASE("[String] Invalid UTF8 (non shortest form sequence)") {
 	ERR_PRINT_OFF
-	static const uint8_t u8str[] = { 0x45, 0xE3, 0x81, 0x8A, 0xE3, 0x82, 0x88, 0xE3, 0x81, 0x86, 0xF0, 0x9F, 0x8E, 0xA4, 0xF0, 0x82, 0x82, 0xAC, 0xED, 0xA0, 0x81, 0 };
-	//                               +     +2                +2                +2                +3                      overlong +3             unpaired +2
-	static const char32_t u32str[] = { 0x45, 0x304A, 0x3088, 0x3046, 0x1F3A4, 0x20AC, 0xFFFD, 0 };
+	// Examples from the unicode standard : 3.9 Unicode Encoding Forms - Table 3.8.
+	static const uint8_t u8str[] = { 0xC0, 0xAF, 0xE0, 0x80, 0xBF, 0xF0, 0x81, 0x82, 0x41, 0 };
+	static const char32_t u32str[] = { 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x41, 0 };
 	String s;
-	Error err = s.parse_utf8((const char *)u8str);
+	Error err = s.append_utf8((const char *)u8str);
 	CHECK(err == ERR_INVALID_DATA);
 	CHECK(s == u32str);
 
@@ -181,13 +185,43 @@ TEST_CASE("[String] Invalid UTF8 (non-standard)") {
 	ERR_PRINT_ON
 }
 
-TEST_CASE("[String] Invalid UTF8 (unrecoverable)") {
+TEST_CASE("[String] Invalid UTF8 (ill formed sequences for surrogates)") {
 	ERR_PRINT_OFF
-	static const uint8_t u8str[] = { 0x45, 0xE3, 0x81, 0x8A, 0x8F, 0xE3, 0xE3, 0x98, 0x8F, 0xE3, 0x82, 0x88, 0xE3, 0x81, 0x86, 0xC0, 0x80, 0xF0, 0x9F, 0x8E, 0xA4, 0xF0, 0x82, 0x82, 0xAC, 0xED, 0xA0, 0x81, 0 };
-	//                               +     +2                inv   +2    inv   inv   inv   +2                +2                ovl NUL +1  +3                      overlong +3             unpaired +2
-	static const char32_t u32str[] = { 0x45, 0x304A, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x3088, 0x3046, 0xFFFD, 0x1F3A4, 0x20AC, 0xFFFD, 0 };
+	// Examples from the unicode standard : 3.9 Unicode Encoding Forms - Table 3.9.
+	static const uint8_t u8str[] = { 0xED, 0xA0, 0x80, 0xED, 0xBF, 0xBF, 0xED, 0xAF, 0x41, 0 };
+	static const char32_t u32str[] = { 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x41, 0 };
 	String s;
-	Error err = s.parse_utf8((const char *)u8str);
+	Error err = s.append_utf8((const char *)u8str);
+	CHECK(err == ERR_INVALID_DATA);
+	CHECK(s == u32str);
+
+	CharString cs = (const char *)u8str;
+	CHECK(String::utf8(cs) == s);
+	ERR_PRINT_ON
+}
+
+TEST_CASE("[String] Invalid UTF8 (other ill formed sequences)") {
+	ERR_PRINT_OFF
+	// Examples from the unicode standard : 3.9 Unicode Encoding Forms - Table 3.10.
+	static const uint8_t u8str[] = { 0xF4, 0x91, 0x92, 0x93, 0xFF, 0x41, 0x80, 0xBF, 0x42, 0 };
+	static const char32_t u32str[] = { 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x41, 0xFFFD, 0xFFFD, 0x42, 0 };
+	String s;
+	Error err = s.append_utf8((const char *)u8str);
+	CHECK(err == ERR_INVALID_DATA);
+	CHECK(s == u32str);
+
+	CharString cs = (const char *)u8str;
+	CHECK(String::utf8(cs) == s);
+	ERR_PRINT_ON
+}
+
+TEST_CASE("[String] Invalid UTF8 (truncated sequences)") {
+	ERR_PRINT_OFF
+	// Examples from the unicode standard : 3.9 Unicode Encoding Forms - Table 3.11.
+	static const uint8_t u8str[] = { 0xE1, 0x80, 0xE2, 0xF0, 0x91, 0x92, 0xF1, 0xBF, 0x41, 0 };
+	static const char32_t u32str[] = { 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x41, 0 };
+	String s;
+	Error err = s.append_utf8((const char *)u8str);
 	CHECK(err == ERR_INVALID_DATA);
 	CHECK(s == u32str);
 
@@ -202,7 +236,7 @@ TEST_CASE("[String] Invalid UTF16 (non-standard)") {
 	//                                 +       +       +       +       unpaired
 	static const char32_t u32str[] = { 0x0045, 0x304A, 0x3088, 0x3046, 0xDFA4, 0 };
 	String s;
-	Error err = s.parse_utf16(u16str);
+	Error err = s.append_utf16(u16str);
 	CHECK(err == ERR_PARSE_ERROR);
 	CHECK(s == u32str);
 
@@ -442,6 +476,27 @@ TEST_CASE("[String] Find and replace") {
 	MULTICHECK_STRING_STRING_EQ(s, replacen, "Y", "Y", "HappY BirthdaY, Anna!");
 }
 
+TEST_CASE("[String] replace_char") {
+	String s = "Banana";
+	CHECK(s.replace_char('n', 'x') == "Baxaxa");
+	CHECK(s.replace_char('\0', 'x') == "Banana");
+	ERR_PRINT_OFF
+	CHECK(s.replace_char('n', '\0') == "Banana");
+	ERR_PRINT_ON
+}
+
+TEST_CASE("[String] replace_chars") {
+	String s = "Banana";
+	CHECK(s.replace_chars(String("Bn"), 'x') == "xaxaxa");
+	CHECK(s.replace_chars("Bn", 'x') == "xaxaxa");
+	CHECK(s.replace_chars(String(), 'x') == "Banana");
+	CHECK(s.replace_chars("", 'x') == "Banana");
+	ERR_PRINT_OFF
+	CHECK(s.replace_chars(String("Bn"), '\0') == "Banana");
+	CHECK(s.replace_chars("Bn", '\0') == "Banana");
+	ERR_PRINT_ON
+}
+
 TEST_CASE("[String] Insertion") {
 	String s = "Who is Frederic?";
 	s = s.insert(s.find("?"), " Chopin");
@@ -467,6 +522,23 @@ TEST_CASE("[String] Erasing") {
 	CHECK(s == "Josephine is such a girl!");
 }
 
+TEST_CASE("[String] remove_char") {
+	String s = "Banana";
+	CHECK(s.remove_char('a') == "Bnn");
+	CHECK(s.remove_char('\0') == "Banana");
+	CHECK(s.remove_char('x') == "Banana");
+}
+
+TEST_CASE("[String] remove_chars") {
+	String s = "Banana";
+	CHECK(s.remove_chars("Ba") == "nn");
+	CHECK(s.remove_chars(String("Ba")) == "nn");
+	CHECK(s.remove_chars("") == "Banana");
+	CHECK(s.remove_chars(String()) == "Banana");
+	CHECK(s.remove_chars("xy") == "Banana");
+	CHECK(s.remove_chars(String("xy")) == "Banana");
+}
+
 TEST_CASE("[String] Number to string") {
 	CHECK(String::num(0) == "0.0"); // The method takes double, so always add zeros.
 	CHECK(String::num(0.0) == "0.0");
@@ -507,12 +579,12 @@ TEST_CASE("[String] Number to string") {
 #ifdef REAL_T_IS_DOUBLE
 	CHECK_MESSAGE(String::num_real(real_t(123.456789)) == "123.456789", "Prints the appropriate amount of digits for real_t = double.");
 	CHECK_MESSAGE(String::num_real(real_t(-123.456789)) == "-123.456789", "Prints the appropriate amount of digits for real_t = double.");
-	CHECK_MESSAGE(String::num_real(real_t(Math_PI)) == "3.14159265358979", "Prints the appropriate amount of digits for real_t = double.");
+	CHECK_MESSAGE(String::num_real(real_t(Math::PI)) == "3.14159265358979", "Prints the appropriate amount of digits for real_t = double.");
 	CHECK_MESSAGE(String::num_real(real_t(3.1415f)) == "3.1414999961853", "Prints more digits of 32-bit float when real_t = double (ones that would be reliable for double) and no trailing zero.");
 #else
 	CHECK_MESSAGE(String::num_real(real_t(123.456789)) == "123.4568", "Prints the appropriate amount of digits for real_t = float.");
 	CHECK_MESSAGE(String::num_real(real_t(-123.456789)) == "-123.4568", "Prints the appropriate amount of digits for real_t = float.");
-	CHECK_MESSAGE(String::num_real(real_t(Math_PI)) == "3.141593", "Prints the appropriate amount of digits for real_t = float.");
+	CHECK_MESSAGE(String::num_real(real_t(Math::PI)) == "3.141593", "Prints the appropriate amount of digits for real_t = float.");
 	CHECK_MESSAGE(String::num_real(real_t(3.1415f)) == "3.1415", "Prints only reliable digits of 32-bit float when real_t = float.");
 #endif // REAL_T_IS_DOUBLE
 
@@ -603,7 +675,7 @@ TEST_CASE("[String] String to float") {
 	static const double num[12] = { -12348298412.2, 0.05, 2.0002, -0.0001, 0.0, 0.0, 123.0, 0.0, 0.0, 0.007, 234.0, 3.0 };
 
 	for (int i = 0; i < 12; i++) {
-		CHECK(!(ABS(String(nums[i]).to_float() - num[i]) > 0.00001));
+		CHECK(!(Math::abs(String(nums[i]).to_float() - num[i]) > 0.00001));
 	}
 
 	// Invalid float strings should return 0.
@@ -618,15 +690,15 @@ TEST_CASE("[String] String to float") {
 	CHECK(String("-1e308").to_float() == -1e308);
 
 	// Exponent is so high that value is INFINITY/-INFINITY.
-	CHECK(String("1e309").to_float() == INFINITY);
-	CHECK(String("1e511").to_float() == INFINITY);
-	CHECK(String("-1e309").to_float() == -INFINITY);
-	CHECK(String("-1e511").to_float() == -INFINITY);
+	CHECK(String("1e309").to_float() == Math::INF);
+	CHECK(String("1e511").to_float() == Math::INF);
+	CHECK(String("-1e309").to_float() == -Math::INF);
+	CHECK(String("-1e511").to_float() == -Math::INF);
 
 	// Exponent is so high that a warning message is printed. Value is INFINITY/-INFINITY.
 	ERR_PRINT_OFF
-	CHECK(String("1e512").to_float() == INFINITY);
-	CHECK(String("-1e512").to_float() == -INFINITY);
+	CHECK(String("1e512").to_float() == Math::INF);
+	CHECK(String("-1e512").to_float() == -Math::INF);
 	ERR_PRINT_ON
 }
 
@@ -714,6 +786,14 @@ TEST_CASE("[String] Splitting") {
 			CHECK(l[i] == slices[i]);
 		}
 	}
+	{
+		const String s = "Mars Jupiter Saturn Uranus";
+		const char *slices[2] = { "Mars", "Jupiter Saturn Uranus" };
+		Vector<String> l = s.split_spaces(1);
+		for (int i = 0; i < l.size(); i++) {
+			CHECK(l[i] == slices[i]);
+		}
+	}
 
 	{
 		const String s = "1.2;2.3 4.5";
@@ -722,14 +802,14 @@ TEST_CASE("[String] Splitting") {
 		const Vector<double> d_arr = s.split_floats(";");
 		CHECK(d_arr.size() == 2);
 		for (int i = 0; i < d_arr.size(); i++) {
-			CHECK(ABS(d_arr[i] - slices[i]) <= 0.00001);
+			CHECK(Math::abs(d_arr[i] - slices[i]) <= 0.00001);
 		}
 
 		const Vector<String> keys = { ";", " " };
 		const Vector<float> f_arr = s.split_floats_mk(keys);
 		CHECK(f_arr.size() == 3);
 		for (int i = 0; i < f_arr.size(); i++) {
-			CHECK(ABS(f_arr[i] - slices[i]) <= 0.00001);
+			CHECK(Math::abs(f_arr[i] - slices[i]) <= 0.00001);
 		}
 	}
 
@@ -740,7 +820,7 @@ TEST_CASE("[String] Splitting") {
 		const Vector<double> arr = s.split_floats(" ");
 		CHECK(arr.size() == 10);
 		for (int i = 0; i < arr.size(); i++) {
-			CHECK(ABS(arr[i] - slices[i]) <= 0.00001);
+			CHECK(Math::abs(arr[i] - slices[i]) <= 0.00001);
 		}
 
 		const Vector<String> keys = { ";", " " };
@@ -923,7 +1003,7 @@ TEST_CASE("[String] sprintf") {
 	// Real (infinity) left-padded
 	format = "fish %11f frog";
 	args.clear();
-	args.push_back(INFINITY);
+	args.push_back(Math::INF);
 	output = format.sprintf(args, &error);
 	REQUIRE(error == false);
 	CHECK(output == String("fish         inf frog"));
@@ -1047,7 +1127,7 @@ TEST_CASE("[String] sprintf") {
 	// Vector left-padded with inf/nan
 	format = "fish %11v frog";
 	args.clear();
-	args.push_back(Variant(Vector2(INFINITY, NAN)));
+	args.push_back(Variant(Vector2(Math::INF, Math::NaN)));
 	output = format.sprintf(args, &error);
 	REQUIRE(error == false);
 	CHECK(output == String("fish (        inf,         nan) frog"));
@@ -1371,6 +1451,14 @@ TEST_CASE("[String] Capitalize against many strings") {
 	output = "Snake Snake Case";
 	CHECK(input.capitalize() == output);
 
+	input = "kebab-case";
+	output = "Kebab Case";
+	CHECK(input.capitalize() == output);
+
+	input = "kebab-kebab-case";
+	output = "Kebab Kebab Case";
+	CHECK(input.capitalize() == output);
+
 	input = "sha256sum";
 	output = "Sha 256 Sum";
 	CHECK(input.capitalize() == output);
@@ -1391,6 +1479,14 @@ TEST_CASE("[String] Capitalize against many strings") {
 	output = "Snake Case Function( Snake Case Arg )";
 	CHECK(input.capitalize() == output);
 
+	input = "kebab-case-function( kebab-case-arg )";
+	output = "Kebab Case Function( Kebab Case Arg )";
+	CHECK(input.capitalize() == output);
+
+	input = "kebab_case_function( kebab_case_arg )";
+	output = "Kebab Case Function( Kebab Case Arg )";
+	CHECK(input.capitalize() == output);
+
 	input = U"словоСлово_слово слово";
 	output = U"Слово Слово Слово Слово";
 	CHECK(input.capitalize() == output);
@@ -1409,35 +1505,37 @@ struct StringCasesTestCase {
 	const char32_t *camel_case;
 	const char32_t *pascal_case;
 	const char32_t *snake_case;
+	const char32_t *kebab_case;
 };
 
 TEST_CASE("[String] Checking case conversion methods") {
 	StringCasesTestCase test_cases[] = {
 		/* clang-format off */
-		{ U"2D",                     U"2d",                   U"2d",                   U"2d"                      },
-		{ U"2d",                     U"2d",                   U"2d",                   U"2d"                      },
-		{ U"2db",                    U"2Db",                  U"2Db",                  U"2_db"                    },
-		{ U"Vector3",                U"vector3",              U"Vector3",              U"vector_3"                },
-		{ U"sha256",                 U"sha256",               U"Sha256",               U"sha_256"                 },
-		{ U"Node2D",                 U"node2d",               U"Node2d",               U"node_2d"                 },
-		{ U"RichTextLabel",          U"richTextLabel",        U"RichTextLabel",        U"rich_text_label"         },
-		{ U"HTML5",                  U"html5",                U"Html5",                U"html_5"                  },
-		{ U"Node2DPosition",         U"node2dPosition",       U"Node2dPosition",       U"node_2d_position"        },
-		{ U"Number2Digits",          U"number2Digits",        U"Number2Digits",        U"number_2_digits"         },
-		{ U"get_property_list",      U"getPropertyList",      U"GetPropertyList",      U"get_property_list"       },
-		{ U"get_camera_2d",          U"getCamera2d",          U"GetCamera2d",          U"get_camera_2d"           },
-		{ U"_physics_process",       U"physicsProcess",       U"PhysicsProcess",       U"_physics_process"        },
-		{ U"bytes2var",              U"bytes2Var",            U"Bytes2Var",            U"bytes_2_var"             },
-		{ U"linear2db",              U"linear2Db",            U"Linear2Db",            U"linear_2_db"             },
-		{ U"sha256sum",              U"sha256Sum",            U"Sha256Sum",            U"sha_256_sum"             },
-		{ U"camelCase",              U"camelCase",            U"CamelCase",            U"camel_case"              },
-		{ U"PascalCase",             U"pascalCase",           U"PascalCase",           U"pascal_case"             },
-		{ U"snake_case",             U"snakeCase",            U"SnakeCase",            U"snake_case"              },
-		{ U"Test TEST test",         U"testTestTest",         U"TestTestTest",         U"test_test_test"          },
-		{ U"словоСлово_слово слово", U"словоСловоСловоСлово", U"СловоСловоСловоСлово", U"слово_слово_слово_слово" },
-		{ U"λέξηΛέξη_λέξη λέξη",     U"λέξηΛέξηΛέξηΛέξη",     U"ΛέξηΛέξηΛέξηΛέξη",     U"λέξη_λέξη_λέξη_λέξη"     },
-		{ U"բառԲառ_բառ բառ",         U"բառԲառԲառԲառ",         U"ԲառԲառԲառԲառ",         U"բառ_բառ_բառ_բառ"         },
-		{ nullptr,                   nullptr,                 nullptr,                 nullptr                    },
+		{ U"2D",                     U"2d",                   U"2d",                   U"2d",                      U"2d"                      },
+		{ U"2d",                     U"2d",                   U"2d",                   U"2d",                      U"2d"                      },
+		{ U"2db",                    U"2Db",                  U"2Db",                  U"2_db",                    U"2-db"                    },
+		{ U"Vector3",                U"vector3",              U"Vector3",              U"vector_3",                U"vector-3"                },
+		{ U"sha256",                 U"sha256",               U"Sha256",               U"sha_256",                 U"sha-256"                 },
+		{ U"Node2D",                 U"node2d",               U"Node2d",               U"node_2d",                 U"node-2d"                 },
+		{ U"RichTextLabel",          U"richTextLabel",        U"RichTextLabel",        U"rich_text_label",         U"rich-text-label"         },
+		{ U"HTML5",                  U"html5",                U"Html5",                U"html_5",                  U"html-5"                  },
+		{ U"Node2DPosition",         U"node2dPosition",       U"Node2dPosition",       U"node_2d_position",        U"node-2d-position"        },
+		{ U"Number2Digits",          U"number2Digits",        U"Number2Digits",        U"number_2_digits",         U"number-2-digits"         },
+		{ U"get_property_list",      U"getPropertyList",      U"GetPropertyList",      U"get_property_list",       U"get-property-list"       },
+		{ U"get_camera_2d",          U"getCamera2d",          U"GetCamera2d",          U"get_camera_2d",           U"get-camera-2d"           },
+		{ U"_physics_process",       U"physicsProcess",       U"PhysicsProcess",       U"_physics_process",        U"-physics-process"        },
+		{ U"bytes2var",              U"bytes2Var",            U"Bytes2Var",            U"bytes_2_var",             U"bytes-2-var"             },
+		{ U"linear2db",              U"linear2Db",            U"Linear2Db",            U"linear_2_db",             U"linear-2-db"             },
+		{ U"sha256sum",              U"sha256Sum",            U"Sha256Sum",            U"sha_256_sum",             U"sha-256-sum"             },
+		{ U"camelCase",              U"camelCase",            U"CamelCase",            U"camel_case",              U"camel-case"              },
+		{ U"PascalCase",             U"pascalCase",           U"PascalCase",           U"pascal_case",             U"pascal-case"             },
+		{ U"snake_case",             U"snakeCase",            U"SnakeCase",            U"snake_case",              U"snake-case"              },
+		{ U"kebab-case",             U"kebabCase",            U"KebabCase",            U"kebab_case",              U"kebab-case"              },
+		{ U"Test TEST test",         U"testTestTest",         U"TestTestTest",         U"test_test_test",          U"test-test-test"          },
+		{ U"словоСлово_слово слово", U"словоСловоСловоСлово", U"СловоСловоСловоСлово", U"слово_слово_слово_слово", U"слово-слово-слово-слово" },
+		{ U"λέξηΛέξη_λέξη λέξη",     U"λέξηΛέξηΛέξηΛέξη",     U"ΛέξηΛέξηΛέξηΛέξη",     U"λέξη_λέξη_λέξη_λέξη",     U"λέξη-λέξη-λέξη-λέξη"     },
+		{ U"բառԲառ_բառ բառ",         U"բառԲառԲառԲառ",         U"ԲառԲառԲառԲառ",         U"բառ_բառ_բառ_բառ",         U"բառ-բառ-բառ-բառ"         },
+		{ nullptr,                   nullptr,                 nullptr,                 nullptr,                    nullptr                    },
 		/* clang-format on */
 	};
 
@@ -1447,6 +1545,7 @@ TEST_CASE("[String] Checking case conversion methods") {
 		CHECK(input.to_camel_case() == test_cases[idx].camel_case);
 		CHECK(input.to_pascal_case() == test_cases[idx].pascal_case);
 		CHECK(input.to_snake_case() == test_cases[idx].snake_case);
+		CHECK(input.to_kebab_case() == test_cases[idx].kebab_case);
 		idx++;
 	}
 }
@@ -1550,9 +1649,9 @@ TEST_CASE("[String] lstrip and rstrip") {
 #undef STRIP_TEST
 }
 
-TEST_CASE("[String] Ensuring empty string into parse_utf8 passes empty string") {
+TEST_CASE("[String] Ensuring empty string into extend_utf8 passes empty string") {
 	String empty;
-	CHECK(empty.parse_utf8(nullptr, -1) == ERR_INVALID_DATA);
+	CHECK(empty.append_utf8(nullptr, -1) == ERR_INVALID_DATA);
 }
 
 TEST_CASE("[String] Cyrillic to_lower()") {
@@ -1715,6 +1814,7 @@ TEST_CASE("[String] uri_encode/unescape") {
 	static const uint8_t u8str[] = { 0x54, 0xC4, 0x93, 0xC5, 0xA1, 0x74, 0x00 };
 	String x2 = String::utf8((const char *)u8str);
 	String x3 = U"Tēšt";
+	String x4 = U"file+name";
 
 	CHECK(x1.uri_decode() == x2);
 	CHECK(x1.uri_decode() == x3);
@@ -1724,6 +1824,8 @@ TEST_CASE("[String] uri_encode/unescape") {
 
 	CHECK(s.uri_encode() == t);
 	CHECK(t.uri_decode() == s);
+	CHECK(x4.uri_file_decode() == x4);
+	CHECK(x4.uri_decode() == U"file name");
 }
 
 TEST_CASE("[String] xml_escape/unescape") {
@@ -1896,7 +1998,7 @@ TEST_CASE("[String] Is_*") {
 	static bool isflt[] = { true, true, true, false, true, true, false, false, false, false, false, false, false, true, true };
 	static bool isaid[] = { false, false, false, false, false, false, false, false, true, true, false, false, false, false, false };
 	static bool isuid[] = { false, false, false, false, false, false, false, false, true, true, false, false, true, false, false };
-	for (unsigned int i = 0; i < sizeof(data) / sizeof(data[0]); i++) {
+	for (unsigned int i = 0; i < std::size(data); i++) {
 		String s = String::utf8(data[i]);
 		CHECK(s.is_numeric() == isnum[i]);
 		CHECK(s.is_valid_int() == isint[i]);
@@ -2103,5 +2205,3 @@ TEST_CASE("[Stress][String] Empty via `is_empty()`") {
 	}
 }
 } // namespace TestString
-
-#endif // TEST_STRING_H
diff --git a/engine/tests/core/string/test_translation.h b/engine/tests/core/string/test_translation.h
index 2b1069d4..d0113712 100644
--- a/engine/tests/core/string/test_translation.h
+++ b/engine/tests/core/string/test_translation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TRANSLATION_H
-#define TEST_TRANSLATION_H
+#pragma once
 
 #include "core/string/optimized_translation.h"
 #include "core/string/translation.h"
@@ -201,5 +200,3 @@ TEST_CASE("[TranslationCSV] CSV import") {
 #endif // TOOLS_ENABLED
 
 } // namespace TestTranslation
-
-#endif // TEST_TRANSLATION_H
diff --git a/engine/tests/core/string/test_translation_server.h b/engine/tests/core/string/test_translation_server.h
index 1274d881..87c9c9c0 100644
--- a/engine/tests/core/string/test_translation_server.h
+++ b/engine/tests/core/string/test_translation_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TRANSLATION_SERVER_H
-#define TEST_TRANSLATION_SERVER_H
+#pragma once
 
 #include "core/string/translation_server.h"
 
@@ -222,5 +221,3 @@ TEST_CASE("[TranslationServer] Comparing locales") {
 	CHECK(res == 10);
 }
 } // namespace TestTranslationServer
-
-#endif // TEST_TRANSLATION_SERVER_H
diff --git a/engine/tests/core/templates/test_a_hash_map.h b/engine/tests/core/templates/test_a_hash_map.h
index 4fa6d3bc..f3c412a1 100644
--- a/engine/tests/core/templates/test_a_hash_map.h
+++ b/engine/tests/core/templates/test_a_hash_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_A_HASH_MAP_H
-#define TEST_A_HASH_MAP_H
+#pragma once
 
 #include "core/templates/a_hash_map.h"
 
@@ -235,9 +234,13 @@ TEST_CASE("[AHashMap] Insert, iterate and remove many elements") {
 TEST_CASE("[AHashMap] Insert, iterate and remove many strings") {
 	const int elem_max = 432;
 	AHashMap<String, String> map;
+
+	// To not print WARNING: Excessive collision count (NN), is the right hash function being used?
+	ERR_PRINT_OFF;
 	for (int i = 0; i < elem_max; i++) {
 		map.insert(itos(i), itos(i));
 	}
+	ERR_PRINT_ON;
 
 	//insert order should have been kept
 	int idx = 0;
@@ -309,5 +312,3 @@ TEST_CASE("[AHashMap] Array methods") {
 }
 
 } // namespace TestAHashMap
-
-#endif // TEST_A_HASH_MAP_H
diff --git a/engine/tests/core/templates/test_command_queue.h b/engine/tests/core/templates/test_command_queue.h
index 441b1234..903cb389 100644
--- a/engine/tests/core/templates/test_command_queue.h
+++ b/engine/tests/core/templates/test_command_queue.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_COMMAND_QUEUE_H
-#define TEST_COMMAND_QUEUE_H
+#pragma once
 
 #include "core/config/project_settings.h"
 #include "core/math/random_number_generator.h"
@@ -562,5 +561,3 @@ TEST_CASE("[CommandQueue] Test Parameter Passing Semantics") {
 	sts.destroy_threads();
 }
 } // namespace TestCommandQueue
-
-#endif // TEST_COMMAND_QUEUE_H
diff --git a/engine/tests/core/templates/test_hash_map.h b/engine/tests/core/templates/test_hash_map.h
index 2721a8cb..2b5d381c 100644
--- a/engine/tests/core/templates/test_hash_map.h
+++ b/engine/tests/core/templates/test_hash_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_HASH_MAP_H
-#define TEST_HASH_MAP_H
+#pragma once
 
 #include "core/templates/hash_map.h"
 
@@ -147,5 +146,3 @@ TEST_CASE("[HashMap] Const iteration") {
 	}
 }
 } // namespace TestHashMap
-
-#endif // TEST_HASH_MAP_H
diff --git a/engine/tests/core/templates/test_hash_set.h b/engine/tests/core/templates/test_hash_set.h
index 9eaa56df..c949e89b 100644
--- a/engine/tests/core/templates/test_hash_set.h
+++ b/engine/tests/core/templates/test_hash_set.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_HASH_SET_H
-#define TEST_HASH_SET_H
+#pragma once
 
 #include "core/templates/hash_set.h"
 
@@ -240,5 +239,3 @@ TEST_CASE("[HashSet] Copy") {
 }
 
 } // namespace TestHashSet
-
-#endif // TEST_HASH_SET_H
diff --git a/engine/tests/core/templates/test_list.h b/engine/tests/core/templates/test_list.h
index 4e2ee93a..6f306c48 100644
--- a/engine/tests/core/templates/test_list.h
+++ b/engine/tests/core/templates/test_list.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_LIST_H
-#define TEST_LIST_H
+#pragma once
 
 #include "core/templates/list.h"
 
@@ -555,5 +554,3 @@ TEST_CASE("[Stress][List] Swap random 10 elements, 1000 iterations.") {
 	swap_random(list, n, 10, 1000);
 }
 } // namespace TestList
-
-#endif // TEST_LIST_H
diff --git a/engine/tests/core/templates/test_local_vector.h b/engine/tests/core/templates/test_local_vector.h
index c9544c62..dc56a484 100644
--- a/engine/tests/core/templates/test_local_vector.h
+++ b/engine/tests/core/templates/test_local_vector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_LOCAL_VECTOR_H
-#define TEST_LOCAL_VECTOR_H
+#pragma once
 
 #include "core/templates/local_vector.h"
 
@@ -179,6 +178,23 @@ TEST_CASE("[LocalVector] Remove Unordered.") {
 	CHECK(vector.size() == 0);
 }
 
+TEST_CASE("[LocalVector] Erase Unordered.") {
+	LocalVector<int> vector;
+	vector.push_back(1);
+	vector.push_back(3);
+	vector.push_back(0);
+	vector.push_back(2);
+	vector.push_back(4);
+
+	CHECK(vector.find(1) == 0);
+
+	vector.erase_unordered(1);
+
+	CHECK(vector.find(1) == -1);
+	CHECK(vector.size() == 4);
+	CHECK(vector[0] == 4);
+}
+
 TEST_CASE("[LocalVector] Erase.") {
 	LocalVector<int> vector;
 	vector.push_back(1);
@@ -245,5 +261,3 @@ TEST_CASE("[LocalVector] Size / Resize / Reserve.") {
 	CHECK(vector.get_capacity() >= 4);
 }
 } // namespace TestLocalVector
-
-#endif // TEST_LOCAL_VECTOR_H
diff --git a/engine/tests/core/templates/test_lru.h b/engine/tests/core/templates/test_lru.h
index 29e89b4c..44f6287e 100644
--- a/engine/tests/core/templates/test_lru.h
+++ b/engine/tests/core/templates/test_lru.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_LRU_H
-#define TEST_LRU_H
+#pragma once
 
 #include "core/templates/lru.h"
 
@@ -95,5 +94,3 @@ TEST_CASE("[LRU] Resize and clear") {
 	CHECK(!lru.has(4));
 }
 } // namespace TestLRU
-
-#endif // TEST_LRU_H
diff --git a/engine/tests/core/templates/test_oa_hash_map.h b/engine/tests/core/templates/test_oa_hash_map.h
index 5b9eab58..2bc36864 100644
--- a/engine/tests/core/templates/test_oa_hash_map.h
+++ b/engine/tests/core/templates/test_oa_hash_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_OA_HASH_MAP_H
-#define TEST_OA_HASH_MAP_H
+#pragma once
 
 #include "core/templates/oa_hash_map.h"
 #include "scene/resources/texture.h"
@@ -247,5 +246,3 @@ TEST_CASE("[OAHashMap] Non-trivial types") {
 }
 
 } // namespace TestOAHashMap
-
-#endif // TEST_OA_HASH_MAP_H
diff --git a/engine/tests/core/templates/test_paged_array.h b/engine/tests/core/templates/test_paged_array.h
index 10dc4473..e5cf3a77 100644
--- a/engine/tests/core/templates/test_paged_array.h
+++ b/engine/tests/core/templates/test_paged_array.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PAGED_ARRAY_H
-#define TEST_PAGED_ARRAY_H
+#pragma once
 
 #include "core/templates/paged_array.h"
 
@@ -200,5 +199,3 @@ TEST_CASE("[PagedArray] Extensive merge_unordered() test") {
 }
 
 } // namespace TestPagedArray
-
-#endif // TEST_PAGED_ARRAY_H
diff --git a/engine/tests/core/templates/test_rid.h b/engine/tests/core/templates/test_rid.h
index ea1b8e72..ed0f1947 100644
--- a/engine/tests/core/templates/test_rid.h
+++ b/engine/tests/core/templates/test_rid.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_RID_H
-#define TEST_RID_H
+#pragma once
 
 #include "core/os/thread.h"
 #include "core/templates/local_vector.h"
@@ -38,6 +37,7 @@
 
 #include "tests/test_macros.h"
 
+#ifdef THREADS_ENABLED
 #ifdef SANITIZERS_ENABLED
 #ifdef __has_feature
 #if __has_feature(thread_sanitizer)
@@ -46,7 +46,8 @@
 #elif defined(__SANITIZE_THREAD__)
 #define TSAN_ENABLED
 #endif
-#endif
+#endif // SANITIZERS_ENABLED
+#endif // THREADS_ENABLED
 
 #ifdef TSAN_ENABLED
 #include <sanitizer/tsan_interface.h>
@@ -114,6 +115,7 @@ TEST_CASE("[RID] 'get_local_index'") {
 	CHECK(RID::from_uint64(4'294'967'297).get_local_index() == 1);
 }
 
+#ifdef THREADS_ENABLED
 // This case would let sanitizers realize data races.
 // Additionally, on purely weakly ordered architectures, it would detect synchronization issues
 // if RID_Alloc failed to impose proper memory ordering and the test's threads are distributed
@@ -141,7 +143,7 @@ TEST_CASE("[RID_Owner] Thread safety") {
 			uint32_t target = (p_step / 2 + 1) * threads.size();
 			sync[buf_idx].fetch_add(1, std::memory_order_relaxed);
 			do {
-				std::this_thread::yield();
+				Thread::yield();
 			} while (sync[buf_idx].load(std::memory_order_relaxed) != target);
 		}
 
@@ -249,6 +251,6 @@ TEST_CASE("[RID_Owner] Thread safety") {
 		tester.test();
 	}
 }
-} // namespace TestRID
+#endif // THREADS_ENABLED
 
-#endif // TEST_RID_H
+} // namespace TestRID
diff --git a/engine/tests/core/templates/test_span.h b/engine/tests/core/templates/test_span.h
new file mode 100644
index 00000000..9fe0b030
--- /dev/null
+++ b/engine/tests/core/templates/test_span.h
@@ -0,0 +1,70 @@
+/**************************************************************************/
+/*  test_span.h                                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "core/templates/span.h"
+
+#include "tests/test_macros.h"
+
+namespace TestSpan {
+
+TEST_CASE("[Span] Constexpr Validators") {
+	constexpr Span<uint16_t> span_empty;
+	static_assert(span_empty.ptr() == nullptr);
+	static_assert(span_empty.size() == 0);
+	static_assert(span_empty.is_empty());
+
+	constexpr static uint16_t value = 5;
+	constexpr Span<uint16_t> span_value(&value, 1);
+	static_assert(span_value.ptr() == &value);
+	static_assert(span_value.size() == 1);
+	static_assert(!span_value.is_empty());
+
+	static constexpr int ints[] = { 0, 1, 2, 3, 4, 5 };
+	constexpr Span<int> span_array = ints;
+	static_assert(span_array.size() == 6);
+	static_assert(!span_array.is_empty());
+	static_assert(span_array[0] == 0);
+	static_assert(span_array[span_array.size() - 1] == 5);
+
+	constexpr Span<char32_t> span_string = U"122345";
+	static_assert(span_string.size() == 6);
+	static_assert(!span_string.is_empty());
+	static_assert(span_string[0] == U'1');
+	static_assert(span_string[span_string.size() - 1] == U'5');
+
+	int idx = 0;
+	for (const char32_t &chr : span_string) {
+		CHECK_EQ(chr, span_string[idx++]);
+	}
+}
+
+} // namespace TestSpan
diff --git a/engine/tests/core/templates/test_vector.h b/engine/tests/core/templates/test_vector.h
index fcb6e9f9..5c4bb0bc 100644
--- a/engine/tests/core/templates/test_vector.h
+++ b/engine/tests/core/templates/test_vector.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VECTOR_H
-#define TEST_VECTOR_H
+#pragma once
 
 #include "core/templates/vector.h"
 
@@ -706,5 +705,3 @@ TEST_CASE("[Vector] Cyclic Reference") {
 }
 
 } // namespace TestVector
-
-#endif // TEST_VECTOR_H
diff --git a/engine/tests/core/test_crypto.h b/engine/tests/core/test_crypto.h
index a7c2fce5..6dc5145a 100644
--- a/engine/tests/core/test_crypto.h
+++ b/engine/tests/core/test_crypto.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CRYPTO_H
-#define TEST_CRYPTO_H
+#pragma once
 
 #include "core/crypto/crypto.h"
 #include "tests/test_macros.h"
@@ -60,8 +59,8 @@ PackedByteArray raw_to_pba(const uint8_t *arr, size_t len) {
 TEST_CASE("[Crypto] PackedByteArray constant time compare") {
 	const uint8_t hm1[] = { 144, 140, 176, 38, 88, 113, 101, 45, 71, 105, 10, 91, 248, 16, 117, 244, 189, 30, 238, 29, 219, 134, 82, 130, 212, 114, 161, 166, 188, 169, 200, 106 };
 	const uint8_t hm2[] = { 80, 30, 144, 228, 108, 38, 188, 125, 150, 64, 165, 127, 221, 118, 144, 232, 45, 100, 15, 248, 193, 244, 245, 34, 116, 147, 132, 200, 110, 27, 38, 75 };
-	PackedByteArray p1 = raw_to_pba(hm1, sizeof(hm1) / sizeof(hm1[0]));
-	PackedByteArray p2 = raw_to_pba(hm2, sizeof(hm2) / sizeof(hm2[0]));
+	PackedByteArray p1 = raw_to_pba(hm1, std::size(hm1));
+	PackedByteArray p2 = raw_to_pba(hm2, std::size(hm2));
 	_MockCrypto crypto;
 	bool equal = crypto.constant_time_compare(p1, p1);
 	CHECK(equal);
@@ -69,5 +68,3 @@ TEST_CASE("[Crypto] PackedByteArray constant time compare") {
 	CHECK(!equal);
 }
 } // namespace TestCrypto
-
-#endif // TEST_CRYPTO_H
diff --git a/engine/tests/core/test_hashing_context.h b/engine/tests/core/test_hashing_context.h
index 854273f4..89136b05 100644
--- a/engine/tests/core/test_hashing_context.h
+++ b/engine/tests/core/test_hashing_context.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_HASHING_CONTEXT_H
-#define TEST_HASHING_CONTEXT_H
+#pragma once
 
 #include "core/crypto/hashing_context.h"
 
@@ -161,5 +160,3 @@ TEST_CASE("[HashingContext] Invalid use of finish") {
 	ERR_PRINT_ON;
 }
 } // namespace TestHashingContext
-
-#endif // TEST_HASHING_CONTEXT_H
diff --git a/engine/tests/core/test_time.h b/engine/tests/core/test_time.h
index 6e313243..41a6eb97 100644
--- a/engine/tests/core/test_time.h
+++ b/engine/tests/core/test_time.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TIME_H
-#define TEST_TIME_H
+#pragma once
 
 #include "core/os/time.h"
 
@@ -144,5 +143,3 @@ TEST_CASE("[Time] System time methods") {
 }
 
 } // namespace TestTime
-
-#endif // TEST_TIME_H
diff --git a/engine/tests/core/threads/test_worker_thread_pool.h b/engine/tests/core/threads/test_worker_thread_pool.h
index 0a0291d1..26f08d72 100644
--- a/engine/tests/core/threads/test_worker_thread_pool.h
+++ b/engine/tests/core/threads/test_worker_thread_pool.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_WORKER_THREAD_POOL_H
-#define TEST_WORKER_THREAD_POOL_H
+#pragma once
 
 #include "core/object/worker_thread_pool.h"
 
@@ -174,5 +173,3 @@ TEST_CASE("[WorkerThreadPool] Run a yielding daemon as the only hope for other t
 }
 
 } // namespace TestWorkerThreadPool
-
-#endif // TEST_WORKER_THREAD_POOL_H
diff --git a/engine/tests/core/variant/test_array.h b/engine/tests/core/variant/test_array.h
index 15e2cebe..a79dd46f 100644
--- a/engine/tests/core/variant/test_array.h
+++ b/engine/tests/core/variant/test_array.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_ARRAY_H
-#define TEST_ARRAY_H
+#pragma once
 
 #include "core/variant/array.h"
 #include "tests/test_macros.h"
@@ -56,6 +55,26 @@ static inline Dictionary build_dictionary(Variant key, Variant item, Targs... Fa
 	return d;
 }
 
+TEST_CASE("[Array] initializer list") {
+	Array arr = { 0, 1, "test", true, { 0.0, 1.0 } };
+	CHECK(arr.size() == 5);
+	CHECK(arr[0] == Variant(0));
+	CHECK(arr[1] == Variant(1));
+	CHECK(arr[2] == Variant("test"));
+	CHECK(arr[3] == Variant(true));
+	CHECK(arr[4] == Variant({ 0.0, 1.0 }));
+
+	arr = { "reassign" };
+	CHECK(arr.size() == 1);
+	CHECK(arr[0] == Variant("reassign"));
+
+	TypedArray<int> typed_arr = { 0, 1, 2 };
+	CHECK(typed_arr.size() == 3);
+	CHECK(typed_arr[0] == Variant(0));
+	CHECK(typed_arr[1] == Variant(1));
+	CHECK(typed_arr[2] == Variant(2));
+}
+
 TEST_CASE("[Array] size(), clear(), and is_empty()") {
 	Array arr;
 	CHECK(arr.size() == 0);
@@ -107,6 +126,12 @@ TEST_CASE("[Array] resize(), insert(), and erase()") {
 	CHECK(int(arr[0]) == 2);
 	arr.erase(2);
 	CHECK(int(arr[0]) == 1);
+
+	// Negative index on insert.
+	CHECK(arr.size() == 3);
+	arr.insert(-1, 3);
+	CHECK(int(arr[2]) == 3);
+	CHECK(arr.size() == 4);
 }
 
 TEST_CASE("[Array] front() and back()") {
@@ -120,9 +145,7 @@ TEST_CASE("[Array] front() and back()") {
 }
 
 TEST_CASE("[Array] has() and count()") {
-	Array arr;
-	arr.push_back(1);
-	arr.push_back(1);
+	Array arr = { 1, 1 };
 	CHECK(arr.has(1));
 	CHECK(!arr.has(2));
 	CHECK(arr.count(1) == 2);
@@ -130,15 +153,22 @@ TEST_CASE("[Array] has() and count()") {
 }
 
 TEST_CASE("[Array] remove_at()") {
-	Array arr;
-	arr.push_back(1);
-	arr.push_back(2);
+	Array arr = { 1, 2 };
 	arr.remove_at(0);
 	CHECK(arr.size() == 1);
 	CHECK(int(arr[0]) == 2);
 	arr.remove_at(0);
 	CHECK(arr.size() == 0);
 
+	// Negative index.
+	arr.push_back(3);
+	arr.push_back(4);
+	arr.remove_at(-1);
+	CHECK(arr.size() == 1);
+	CHECK(int(arr[0]) == 3);
+	arr.remove_at(-1);
+	CHECK(arr.size() == 0);
+
 	// The array is now empty; try to use `remove_at()` again.
 	// Normally, this prints an error message so we silence it.
 	ERR_PRINT_OFF;
@@ -149,18 +179,12 @@ TEST_CASE("[Array] remove_at()") {
 }
 
 TEST_CASE("[Array] get()") {
-	Array arr;
-	arr.push_back(1);
+	Array arr = { 1 };
 	CHECK(int(arr.get(0)) == 1);
 }
 
 TEST_CASE("[Array] sort()") {
-	Array arr;
-
-	arr.push_back(3);
-	arr.push_back(4);
-	arr.push_back(2);
-	arr.push_back(1);
+	Array arr = { 3, 4, 2, 1 };
 	arr.sort();
 	int val = 1;
 	for (int i = 0; i < arr.size(); i++) {
@@ -187,12 +211,7 @@ TEST_CASE("[Array] push_front(), pop_front(), pop_back()") {
 TEST_CASE("[Array] pop_at()") {
 	ErrorDetector ed;
 
-	Array arr;
-	arr.push_back(2);
-	arr.push_back(4);
-	arr.push_back(6);
-	arr.push_back(8);
-	arr.push_back(10);
+	Array arr = { 2, 4, 6, 8, 10 };
 
 	REQUIRE(int(arr.pop_at(2)) == 6);
 	REQUIRE(arr.size() == 4);
@@ -247,13 +266,7 @@ TEST_CASE("[Array] max() and min()") {
 }
 
 TEST_CASE("[Array] slice()") {
-	Array array;
-	array.push_back(0);
-	array.push_back(1);
-	array.push_back(2);
-	array.push_back(3);
-	array.push_back(4);
-	array.push_back(5);
+	Array array = { 0, 1, 2, 3, 4, 5 };
 
 	Array slice0 = array.slice(0, 0);
 	CHECK(slice0.size() == 0);
@@ -598,11 +611,8 @@ TEST_CASE("[Array] Iteration and modification") {
 }
 
 TEST_CASE("[Array] Typed copying") {
-	TypedArray<int> a1;
-	a1.push_back(1);
-
-	TypedArray<double> a2;
-	a2.push_back(1.0);
+	TypedArray<int> a1 = { 1 };
+	TypedArray<double> a2 = { 1.0 };
 
 	Array a3 = a1;
 	TypedArray<int> a4 = a3;
@@ -653,5 +663,3 @@ TEST_CASE("[Array] Test rfind_custom") {
 }
 
 } // namespace TestArray
-
-#endif // TEST_ARRAY_H
diff --git a/engine/tests/core/variant/test_callable.h b/engine/tests/core/variant/test_callable.h
index 34ea8fad..a046be3b 100644
--- a/engine/tests/core/variant/test_callable.h
+++ b/engine/tests/core/variant/test_callable.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CALLABLE_H
-#define TEST_CALLABLE_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "core/object/object.h"
@@ -155,11 +154,7 @@ public:
 	}
 
 	static String get_output(const Callable &p_callable) {
-		Array effective_args;
-		effective_args.push_back(7);
-		effective_args.push_back(8);
-		effective_args.push_back(9);
-
+		Array effective_args = { 7, 8, 9 };
 		effective_args.resize(3 - p_callable.get_unbound_arguments_count());
 		effective_args.append_array(p_callable.get_bound_arguments());
 
@@ -200,5 +195,3 @@ TEST_CASE("[Callable] Bound and unbound argument count") {
 }
 
 } // namespace TestCallable
-
-#endif // TEST_CALLABLE_H
diff --git a/engine/tests/core/variant/test_dictionary.h b/engine/tests/core/variant/test_dictionary.h
index 46d0bc3e..e5eee6ec 100644
--- a/engine/tests/core/variant/test_dictionary.h
+++ b/engine/tests/core/variant/test_dictionary.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_DICTIONARY_H
-#define TEST_DICTIONARY_H
+#pragma once
 
 #include "core/variant/typed_dictionary.h"
 #include "tests/test_macros.h"
@@ -116,19 +115,18 @@ TEST_CASE("[Dictionary] List init") {
 	CHECK_EQ(tdict[5.0], Variant(2.0));
 }
 
-TEST_CASE("[Dictionary] get_key_lists()") {
+TEST_CASE("[Dictionary] get_key_list()") {
 	Dictionary map;
-	List<Variant> keys;
-	List<Variant> *ptr = &keys;
-	map.get_key_list(ptr);
+	LocalVector<Variant> keys;
+	keys = map.get_key_list();
 	CHECK(keys.is_empty());
 	map[1] = 3;
-	map.get_key_list(ptr);
+	keys = map.get_key_list();
 	CHECK(keys.size() == 1);
-	CHECK(int(keys.front()->get()) == 1);
+	CHECK(int(keys[0]) == 1);
 	map[2] = 4;
-	map.get_key_list(ptr);
-	CHECK(keys.size() == 3);
+	keys = map.get_key_list();
+	CHECK(keys.size() == 2);
 }
 
 TEST_CASE("[Dictionary] get_key_at_index()") {
@@ -546,11 +544,7 @@ TEST_CASE("[Dictionary] Order and find") {
 	d[12] = "twelve";
 	d["4"] = "four";
 
-	Array keys;
-	keys.append(4);
-	keys.append(8);
-	keys.append(12);
-	keys.append("4");
+	Array keys = { 4, 8, 12, "4" };
 
 	CHECK_EQ(d.keys(), keys);
 	CHECK_EQ(d.find_key("four"), Variant(4));
@@ -594,6 +588,45 @@ TEST_CASE("[Dictionary] Typed copying") {
 	d6.clear();
 }
 
-} // namespace TestDictionary
+TEST_CASE("[Dictionary] Iteration") {
+	Dictionary a1 = build_dictionary(1, 2, 3, 4, 5, 6);
+	Dictionary a2 = build_dictionary(1, 2, 3, 4, 5, 6);
 
-#endif // TEST_DICTIONARY_H
+	int idx = 0;
+
+	for (const KeyValue<Variant, Variant> &kv : (const Dictionary &)a1) {
+		CHECK_EQ(int(a2[kv.key]), int(kv.value));
+		idx++;
+	}
+
+	CHECK_EQ(idx, a1.size());
+
+	a1.clear();
+	a2.clear();
+}
+
+TEST_CASE("[Dictionary] Object value init") {
+	Object *a = memnew(Object);
+	Object *b = memnew(Object);
+	TypedDictionary<double, Object *> tdict = {
+		{ 0.0, a },
+		{ 5.0, b },
+	};
+	CHECK_EQ(tdict[0.0], Variant(a));
+	CHECK_EQ(tdict[5.0], Variant(b));
+	memdelete(a);
+	memdelete(b);
+}
+
+TEST_CASE("[Dictionary] RefCounted value init") {
+	Ref<RefCounted> a = memnew(RefCounted);
+	Ref<RefCounted> b = memnew(RefCounted);
+	TypedDictionary<double, Ref<RefCounted>> tdict = {
+		{ 0.0, a },
+		{ 5.0, b },
+	};
+	CHECK_EQ(tdict[0.0], Variant(a));
+	CHECK_EQ(tdict[5.0], Variant(b));
+}
+
+} // namespace TestDictionary
diff --git a/engine/tests/core/variant/test_variant.h b/engine/tests/core/variant/test_variant.h
index 599a282b..384b8ceb 100644
--- a/engine/tests/core/variant/test_variant.h
+++ b/engine/tests/core/variant/test_variant.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VARIANT_H
-#define TEST_VARIANT_H
+#pragma once
 
 #include "core/variant/variant.h"
 #include "core/variant/variant_parser.h"
@@ -1737,6 +1736,24 @@ TEST_CASE("[Variant] Assignment To Color from Bool,Int,Float,String,Vec2,Vec2i,V
 	CHECK(object_v.get_type() == Variant::COLOR);
 }
 
+TEST_CASE("[Variant] array initializer list") {
+	Variant arr_v = { 0, 1, "test", true, { 0.0, 1.0 } };
+	CHECK(arr_v.get_type() == Variant::ARRAY);
+	Array arr = (Array)arr_v;
+	CHECK(arr.size() == 5);
+	CHECK(arr[0] == Variant(0));
+	CHECK(arr[1] == Variant(1));
+	CHECK(arr[2] == Variant("test"));
+	CHECK(arr[3] == Variant(true));
+	CHECK(arr[4] == Variant({ 0.0, 1.0 }));
+
+	PackedInt32Array packed_arr = { 2, 1, 0 };
+	CHECK(packed_arr.size() == 3);
+	CHECK(packed_arr[0] == 2);
+	CHECK(packed_arr[1] == 1);
+	CHECK(packed_arr[2] == 0);
+}
+
 TEST_CASE("[Variant] Writer and parser array") {
 	Array a = build_array(1, String("hello"), build_array(Variant()));
 	String a_str;
@@ -2217,5 +2234,3 @@ TEST_CASE("[Variant] Operator NOT") {
 }
 
 } // namespace TestVariant
-
-#endif // TEST_VARIANT_H
diff --git a/engine/tests/core/variant/test_variant_utility.h b/engine/tests/core/variant/test_variant_utility.h
index 34b4880d..c184b659 100644
--- a/engine/tests/core/variant/test_variant_utility.h
+++ b/engine/tests/core/variant/test_variant_utility.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VARIANT_UTILITY_H
-#define TEST_VARIANT_UTILITY_H
+#pragma once
 
 #include "core/variant/variant_utility.h"
 
@@ -93,15 +92,8 @@ TEST_CASE("[VariantUtility] Type conversion") {
 	}
 
 	{
-		Array arr;
-		arr.push_back(1.2);
-		arr.push_back(3.4);
-		arr.push_back(5.6);
-
-		PackedFloat64Array packed;
-		packed.push_back(1.2);
-		packed.push_back(3.4);
-		packed.push_back(5.6);
+		Array arr = { 1.2, 3.4, 5.6 };
+		PackedFloat64Array packed = { 1.2, 3.4, 5.6 };
 
 		converted = VariantUtilityFunctions::type_convert(arr, Variant::Type::PACKED_FLOAT64_ARRAY);
 		CHECK(converted.get_type() == Variant::Type::PACKED_FLOAT64_ARRAY);
@@ -137,5 +129,3 @@ TEST_CASE("[VariantUtility] Type conversion") {
 }
 
 } // namespace TestVariantUtility
-
-#endif // TEST_VARIANT_UTILITY_H
diff --git a/engine/tests/create_test.py b/engine/tests/create_test.py
index 9181cb3a..672d851e 100755
--- a/engine/tests/create_test.py
+++ b/engine/tests/create_test.py
@@ -78,8 +78,7 @@ def main():
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_{name_upper_snake_case}_H
-#define TEST_{name_upper_snake_case}_H
+#pragma once
 
 #include "tests/test_macros.h"
 
@@ -90,14 +89,11 @@ TEST_CASE("[{name_pascal_case}] Example test case") {{
 }}
 
 }} // namespace Test{name_pascal_case}
-
-#endif // TEST_{name_upper_snake_case}_H
 """.format(
                 name_snake_case=name_snake_case,
                 # Capitalize the first letter but keep capitalization for the rest of the string.
                 # This is done in case the user passes a camelCase string instead of PascalCase.
                 name_pascal_case=args.name[0].upper() + args.name[1:],
-                name_upper_snake_case=name_snake_case.upper(),
                 # The padding length depends on the test name length.
                 padding=" " * (61 - len(name_snake_case)),
             )
diff --git a/engine/tests/data/exactly_4096_bytes_fastlz.bin b/engine/tests/data/exactly_4096_bytes_fastlz.bin
new file mode 100644
index 00000000..0915408d
Binary files /dev/null and b/engine/tests/data/exactly_4096_bytes_fastlz.bin differ
diff --git a/engine/tests/display_server_mock.h b/engine/tests/display_server_mock.h
index 3a281cab..0cc643bd 100644
--- a/engine/tests/display_server_mock.h
+++ b/engine/tests/display_server_mock.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef DISPLAY_SERVER_MOCK_H
-#define DISPLAY_SERVER_MOCK_H
+#pragma once
 
 #include "servers/display_server_headless.h"
 
@@ -38,6 +37,8 @@
 // Specialized DisplayServer for unittests based on DisplayServerHeadless, that
 // additionally supports things like mouse enter/exit events and clipboard.
 class DisplayServerMock : public DisplayServerHeadless {
+	GDSOFTCLASS(DisplayServerMock, DisplayServerHeadless);
+
 private:
 	friend class DisplayServer;
 
@@ -146,5 +147,3 @@ public:
 		register_create_function("mock", create_func, get_rendering_drivers_func);
 	}
 };
-
-#endif // DISPLAY_SERVER_MOCK_H
diff --git a/engine/tests/python_build/conftest.py b/engine/tests/python_build/conftest.py
deleted file mode 100644
index 61723092..00000000
--- a/engine/tests/python_build/conftest.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import os
-import sys
-from pathlib import Path
-
-import pytest
-
-CWD = Path(__file__).parent
-ROOT = CWD.parent.parent
-# append directory with build files to sys.path to import them
-sys.path.append(str(ROOT))
-
-
-@pytest.fixture
-def shader_files(request):
-    shader_path = request.param
-
-    res = {
-        "path_input": str(CWD / "fixtures" / f"{shader_path}.glsl"),
-        "path_output": str(CWD / "fixtures" / f"{shader_path}.glsl.gen.h"),
-        "path_expected_full": str(CWD / "fixtures" / f"{shader_path}_expected_full.glsl"),
-        "path_expected_parts": str(CWD / "fixtures" / f"{shader_path}_expected_parts.json"),
-    }
-    yield res
-
-    if not os.getenv("PYTEST_KEEP_GENERATED_FILES"):
-        os.remove(res["path_output"])
diff --git a/engine/tests/python_build/fixtures/gles3/vertex_fragment.out b/engine/tests/python_build/fixtures/gles3/vertex_fragment.out
new file mode 100644
index 00000000..886ed7de
--- /dev/null
+++ b/engine/tests/python_build/fixtures/gles3/vertex_fragment.out
@@ -0,0 +1,64 @@
+#include "drivers/gles3/shader_gles3.h"
+
+class VertexFragmentShaderGLES3 : public ShaderGLES3 {
+public:
+	enum ShaderVariant {
+		MODE_NINEPATCH,
+	};
+
+	enum Specializations {
+		DISABLE_LIGHTING = 1,
+	};
+
+	_FORCE_INLINE_ bool version_bind_shader(RID p_version, ShaderVariant p_variant, uint64_t p_specialization = 0) {
+		return _version_bind_shader(p_version, p_variant, p_specialization);
+	}
+
+protected:
+	virtual void _init() override {
+		static const char **_uniform_strings = nullptr;
+		static const char *_variant_defines[] = {
+			"#define USE_NINEPATCH",
+		};
+		static TexUnitPair *_texunit_pairs = nullptr;
+		static UBOPair *_ubo_pairs = nullptr;
+		static Specialization _spec_pairs[] = {
+			{ "DISABLE_LIGHTING", false },
+		};
+		static const Feedback *_feedbacks = nullptr;
+		static const char _vertex_code[] = {
+R"<!>(
+precision highp float;
+precision highp int;
+
+layout(location = 0) in highp vec3 vertex;
+
+out highp vec4 position_interp;
+
+void main() {
+	position_interp = vec4(vertex.x,1,0,1);
+}
+
+)<!>"
+		};
+
+		static const char _fragment_code[] = {
+R"<!>(
+precision highp float;
+precision highp int;
+
+in highp vec4 position_interp;
+
+void main() {
+	highp float depth = ((position_interp.z / position_interp.w) + 1.0);
+	frag_color = vec4(depth);
+}
+)<!>"
+		};
+
+		_setup(_vertex_code, _fragment_code, "VertexFragmentShaderGLES3",
+				0, _uniform_strings, 0, _ubo_pairs,
+				0, _feedbacks, 0, _texunit_pairs,
+				1, _spec_pairs, 1, _variant_defines);
+	}
+};
diff --git a/engine/tests/python_build/fixtures/gles3/vertex_fragment_expected_full.glsl b/engine/tests/python_build/fixtures/gles3/vertex_fragment_expected_full.glsl
deleted file mode 100644
index db5f54e3..00000000
--- a/engine/tests/python_build/fixtures/gles3/vertex_fragment_expected_full.glsl
+++ /dev/null
@@ -1,74 +0,0 @@
-/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */
-#ifndef VERTEX_FRAGMENT_GLSL_GEN_HGLES3_GLES3
-#define VERTEX_FRAGMENT_GLSL_GEN_HGLES3_GLES3
-
-
-#include "drivers/gles3/shader_gles3.h"
-
-
-class VertexFragmentShaderGLES3 : public ShaderGLES3 {
-
-public:
-
-	enum ShaderVariant {
-		MODE_NINEPATCH,
-	};
-
-	enum Specializations {
-		DISABLE_LIGHTING=1,
-	};
-
-	_FORCE_INLINE_ bool version_bind_shader(RID p_version,ShaderVariant p_variant,uint64_t p_specialization=0) { return _version_bind_shader(p_version,p_variant,p_specialization); }
-
-protected:
-
-	virtual void _init() override {
-
-		static const char **_uniform_strings=nullptr;
-		static const char* _variant_defines[]={
-			"#define USE_NINEPATCH",
-		};
-
-		static TexUnitPair *_texunit_pairs=nullptr;
-		static UBOPair *_ubo_pairs=nullptr;
-		static Specialization _spec_pairs[]={
-			{"DISABLE_LIGHTING",false},
-		};
-
-		static const Feedback* _feedbacks=nullptr;
-		static const char _vertex_code[]={
-R"<!>(
-precision highp float;
-precision highp int;
-
-layout(location = 0) in highp vec3 vertex;
-
-out highp vec4 position_interp;
-
-void main() {
-	position_interp = vec4(vertex.x,1,0,1);
-}
-
-)<!>"
-		};
-
-		static const char _fragment_code[]={
-R"<!>(
-precision highp float;
-precision highp int;
-
-in highp vec4 position_interp;
-
-void main() {
-	highp float depth = ((position_interp.z / position_interp.w) + 1.0);
-	frag_color = vec4(depth);
-}
-)<!>"
-		};
-
-		_setup(_vertex_code,_fragment_code,"VertexFragmentShaderGLES3",0,_uniform_strings,0,_ubo_pairs,0,_feedbacks,0,_texunit_pairs,1,_spec_pairs,1,_variant_defines);
-	}
-
-};
-
-#endif
diff --git a/engine/tests/python_build/fixtures/gles3/vertex_fragment_expected_parts.json b/engine/tests/python_build/fixtures/gles3/vertex_fragment_expected_parts.json
deleted file mode 100644
index 5ac8092a..00000000
--- a/engine/tests/python_build/fixtures/gles3/vertex_fragment_expected_parts.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "vertex_lines": [
-	"",
-	"precision highp float;",
-	"precision highp int;",
-	"",
-	"layout(location = 0) in highp vec3 vertex;",
-	"",
-	"out highp vec4 position_interp;",
-	"",
-	"void main() {",
-	"\tposition_interp = vec4(vertex.x,1,0,1);",
-	"}",
-	""
-  ],
-  "fragment_lines": [
-	"",
-	"precision highp float;",
-	"precision highp int;",
-	"",
-	"in highp vec4 position_interp;",
-	"",
-	"void main() {",
-	"\thighp float depth = ((position_interp.z / position_interp.w) + 1.0);",
-	"\tfrag_color = vec4(depth);",
-	"}"
-  ],
-  "uniforms": [],
-  "fbos": [],
-  "texunits": [],
-  "texunit_names": [],
-  "ubos": [],
-  "ubo_names": [],
-  "feedbacks": [],
-  "vertex_included_files": [],
-  "fragment_included_files": [],
-  "reading": "fragment",
-  "line_offset": 33,
-  "vertex_offset": 10,
-  "fragment_offset": 23,
-  "variant_defines": [
-	"#define USE_NINEPATCH"
-  ],
-  "variant_names": [
-	"MODE_NINEPATCH"
-  ],
-  "specialization_names": [
-	"DISABLE_LIGHTING"
-  ],
-  "specialization_values": [
-	" false\n"
-  ]
-}
diff --git a/engine/tests/python_build/fixtures/glsl/compute_expected_full.glsl b/engine/tests/python_build/fixtures/glsl/compute.out
similarity index 58%
rename from engine/tests/python_build/fixtures/glsl/compute_expected_full.glsl
rename to engine/tests/python_build/fixtures/glsl/compute.out
index 386d14f1..9d8e112b 100644
--- a/engine/tests/python_build/fixtures/glsl/compute_expected_full.glsl
+++ b/engine/tests/python_build/fixtures/glsl/compute.out
@@ -1,7 +1,3 @@
-/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */
-#ifndef COMPUTE_SHADER_GLSL_RAW_H
-#define COMPUTE_SHADER_GLSL_RAW_H
-
 static const char compute_shader_glsl[] = {
 R"<!>(#[compute]
 
@@ -17,4 +13,3 @@ void main() {
 }
 )<!>"
 };
-#endif
diff --git a/engine/tests/python_build/fixtures/glsl/compute_expected_parts.json b/engine/tests/python_build/fixtures/glsl/compute_expected_parts.json
deleted file mode 100644
index 025c568a..00000000
--- a/engine/tests/python_build/fixtures/glsl/compute_expected_parts.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "code": "#[compute]\n\n#version 450\n\n#VERSION_DEFINES\n\n\n#define M_PI 3.14159265359\n\nvoid main() {\n\tvec3 static_light = vec3(0, 1, 0);\n}\n"
-}
diff --git a/engine/tests/python_build/fixtures/glsl/vertex_fragment_expected_full.glsl b/engine/tests/python_build/fixtures/glsl/vertex_fragment.out
similarity index 74%
rename from engine/tests/python_build/fixtures/glsl/vertex_fragment_expected_full.glsl
rename to engine/tests/python_build/fixtures/glsl/vertex_fragment.out
index b7329b6a..9cd7f556 100644
--- a/engine/tests/python_build/fixtures/glsl/vertex_fragment_expected_full.glsl
+++ b/engine/tests/python_build/fixtures/glsl/vertex_fragment.out
@@ -1,7 +1,3 @@
-/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */
-#ifndef VERTEX_FRAGMENT_SHADER_GLSL_RAW_H
-#define VERTEX_FRAGMENT_SHADER_GLSL_RAW_H
-
 static const char vertex_fragment_shader_glsl[] = {
 R"<!>(#[versions]
 
@@ -37,4 +33,3 @@ void main() {
 }
 )<!>"
 };
-#endif
diff --git a/engine/tests/python_build/fixtures/glsl/vertex_fragment_expected_parts.json b/engine/tests/python_build/fixtures/glsl/vertex_fragment_expected_parts.json
deleted file mode 100644
index 38312367..00000000
--- a/engine/tests/python_build/fixtures/glsl/vertex_fragment_expected_parts.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "code": "#[versions]\n\nlines = \"#define MODE_LINES\";\n\n#[vertex]\n\n#version 450\n\n#VERSION_DEFINES\n\nlayout(location = 0) out vec3 uv_interp;\n\nvoid main() {\n\n#ifdef MODE_LINES\n\tuv_interp = vec3(0,0,1);\n#endif\n}\n\n#[fragment]\n\n#version 450\n\n#VERSION_DEFINES\n\n#define M_PI 3.14159265359\n\nlayout(location = 0) out vec4 dst_color;\n\nvoid main() {\n\tdst_color = vec4(1,1,0,0);\n}\n"
-}
diff --git a/engine/tests/python_build/fixtures/rd_glsl/compute_expected_full.glsl b/engine/tests/python_build/fixtures/rd_glsl/compute.out
similarity index 62%
rename from engine/tests/python_build/fixtures/rd_glsl/compute_expected_full.glsl
rename to engine/tests/python_build/fixtures/rd_glsl/compute.out
index 11845100..c57461f7 100644
--- a/engine/tests/python_build/fixtures/rd_glsl/compute_expected_full.glsl
+++ b/engine/tests/python_build/fixtures/rd_glsl/compute.out
@@ -1,15 +1,10 @@
-/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */
-#ifndef COMPUTE_GLSL_GEN_H_RD
-#define COMPUTE_GLSL_GEN_H_RD
-
 #include "servers/rendering/renderer_rd/shader_rd.h"
 
 class ComputeShaderRD : public ShaderRD {
-
 public:
-
 	ComputeShaderRD() {
-
+		static const char *_vertex_code = nullptr;
+		static const char *_fragment_code = nullptr;
 		static const char _compute_code[] = {
 R"<!>(
 #version 450
@@ -25,8 +20,6 @@ void main() {
 }
 )<!>"
 		};
-		setup(nullptr, nullptr, _compute_code, "ComputeShaderRD");
+		setup(_vertex_code, _fragment_code, _compute_code, "ComputeShaderRD");
 	}
 };
-
-#endif
diff --git a/engine/tests/python_build/fixtures/rd_glsl/compute_expected_parts.json b/engine/tests/python_build/fixtures/rd_glsl/compute_expected_parts.json
deleted file mode 100644
index 26ba9e4f..00000000
--- a/engine/tests/python_build/fixtures/rd_glsl/compute_expected_parts.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "vertex_lines": [],
-  "fragment_lines": [],
-  "compute_lines": [
-	"",
-	"#version 450",
-	"",
-	"#VERSION_DEFINES",
-	"",
-	"#define BLOCK_SIZE 8",
-	"",
-	"#define M_PI 3.14159265359",
-	"",
-	"void main() {",
-	"\tuint t = BLOCK_SIZE + 1;",
-	"}"
-  ],
-  "vertex_included_files": [],
-  "fragment_included_files": [],
-  "compute_included_files": [
-	"tests/python_build/fixtures/rd_glsl/_included.glsl"
-  ],
-  "reading": "compute",
-  "line_offset": 13,
-  "vertex_offset": 0,
-  "fragment_offset": 0,
-  "compute_offset": 1
-}
diff --git a/engine/tests/python_build/fixtures/rd_glsl/vertex_fragment_expected_full.glsl b/engine/tests/python_build/fixtures/rd_glsl/vertex_fragment.out
similarity index 70%
rename from engine/tests/python_build/fixtures/rd_glsl/vertex_fragment_expected_full.glsl
rename to engine/tests/python_build/fixtures/rd_glsl/vertex_fragment.out
index 2f809f1b..a053b3e3 100644
--- a/engine/tests/python_build/fixtures/rd_glsl/vertex_fragment_expected_full.glsl
+++ b/engine/tests/python_build/fixtures/rd_glsl/vertex_fragment.out
@@ -1,15 +1,8 @@
-/* WARNING, THIS FILE WAS GENERATED, DO NOT EDIT */
-#ifndef VERTEX_FRAGMENT_GLSL_GEN_H_RD
-#define VERTEX_FRAGMENT_GLSL_GEN_H_RD
-
 #include "servers/rendering/renderer_rd/shader_rd.h"
 
 class VertexFragmentShaderRD : public ShaderRD {
-
 public:
-
 	VertexFragmentShaderRD() {
-
 		static const char _vertex_code[] = {
 R"<!>(
 #version 450
@@ -39,8 +32,7 @@ void main() {
 }
 )<!>"
 		};
-		setup(_vertex_code, _fragment_code, nullptr, "VertexFragmentShaderRD");
+		static const char *_compute_code = nullptr;
+		setup(_vertex_code, _fragment_code, _compute_code, "VertexFragmentShaderRD");
 	}
 };
-
-#endif
diff --git a/engine/tests/python_build/fixtures/rd_glsl/vertex_fragment_expected_parts.json b/engine/tests/python_build/fixtures/rd_glsl/vertex_fragment_expected_parts.json
deleted file mode 100644
index dbf833ed..00000000
--- a/engine/tests/python_build/fixtures/rd_glsl/vertex_fragment_expected_parts.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "vertex_lines": [
-	"",
-	"#version 450",
-	"",
-	"#VERSION_DEFINES",
-	"",
-	"#define M_PI 3.14159265359",
-	"",
-	"layout(location = 0) out vec2 uv_interp;",
-	"",
-	"void main() {",
-	"\tuv_interp = vec2(0, 1);",
-	"}",
-	""
-  ],
-  "fragment_lines": [
-	"",
-	"#version 450",
-	"",
-	"#VERSION_DEFINES",
-	"",
-	"layout(location = 0) in vec2 uv_interp;",
-	"",
-	"void main() {",
-	"\tuv_interp = vec2(1, 0);",
-	"}"
-  ],
-  "compute_lines": [],
-  "vertex_included_files": [
-	"tests/python_build/fixtures/rd_glsl/_included.glsl"
-  ],
-  "fragment_included_files": [],
-  "compute_included_files": [],
-  "reading": "fragment",
-  "line_offset": 25,
-  "vertex_offset": 1,
-  "fragment_offset": 15,
-  "compute_offset": 0
-}
diff --git a/engine/tests/python_build/test_gles3_builder.py b/engine/tests/python_build/test_gles3_builder.py
deleted file mode 100644
index b34d33bd..00000000
--- a/engine/tests/python_build/test_gles3_builder.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import json
-
-import pytest
-
-from gles3_builders import GLES3HeaderStruct, build_gles3_header
-
-
-@pytest.mark.parametrize(
-    ["shader_files", "builder", "header_struct"],
-    [
-        ("gles3/vertex_fragment", build_gles3_header, GLES3HeaderStruct),
-    ],
-    indirect=["shader_files"],
-)
-def test_gles3_builder(shader_files, builder, header_struct):
-    header = header_struct()
-
-    builder(shader_files["path_input"], "drivers/gles3/shader_gles3.h", "GLES3", header_data=header)
-
-    with open(shader_files["path_expected_parts"], "r", encoding="utf-8") as f:
-        expected_parts = json.load(f)
-        assert expected_parts == header.__dict__
-
-    with open(shader_files["path_output"], "r", encoding="utf-8") as f:
-        actual_output = f.read()
-        assert actual_output
-
-    with open(shader_files["path_expected_full"], "r", encoding="utf-8") as f:
-        expected_output = f.read()
-
-    assert actual_output == expected_output
diff --git a/engine/tests/python_build/test_glsl_builder.py b/engine/tests/python_build/test_glsl_builder.py
deleted file mode 100644
index 9f548855..00000000
--- a/engine/tests/python_build/test_glsl_builder.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import json
-
-import pytest
-
-from glsl_builders import RAWHeaderStruct, RDHeaderStruct, build_raw_header, build_rd_header
-
-
-@pytest.mark.parametrize(
-    [
-        "shader_files",
-        "builder",
-        "header_struct",
-    ],
-    [
-        ("glsl/vertex_fragment", build_raw_header, RAWHeaderStruct),
-        ("glsl/compute", build_raw_header, RAWHeaderStruct),
-        ("rd_glsl/vertex_fragment", build_rd_header, RDHeaderStruct),
-        ("rd_glsl/compute", build_rd_header, RDHeaderStruct),
-    ],
-    indirect=["shader_files"],
-)
-def test_glsl_builder(shader_files, builder, header_struct):
-    header = header_struct()
-    builder(shader_files["path_input"], header_data=header)
-
-    with open(shader_files["path_expected_parts"], "r", encoding="utf-8") as f:
-        expected_parts = json.load(f)
-        assert expected_parts == header.__dict__
-
-    with open(shader_files["path_output"], "r", encoding="utf-8") as f:
-        actual_output = f.read()
-        assert actual_output
-
-    with open(shader_files["path_expected_full"], "r", encoding="utf-8") as f:
-        expected_output = f.read()
-
-    assert actual_output == expected_output
diff --git a/engine/tests/python_build/validate_builders.py b/engine/tests/python_build/validate_builders.py
new file mode 100644
index 00000000..1375c448
--- /dev/null
+++ b/engine/tests/python_build/validate_builders.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+if __name__ != "__main__":
+    raise ImportError(f"{__name__} should not be used as a module.")
+
+import os
+import sys
+from typing import Any, Callable
+
+sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
+
+from gles3_builders import build_gles3_header
+from glsl_builders import build_raw_header, build_rd_header
+
+FUNC_PATH_KWARGS: list[tuple[Callable[..., None], str, dict[str, Any]]] = [
+    (
+        build_gles3_header,
+        "tests/python_build/fixtures/gles3/vertex_fragment.out",
+        {"shader": "tests/python_build/fixtures/gles3/vertex_fragment.glsl"},
+    ),
+    (
+        build_raw_header,
+        "tests/python_build/fixtures/glsl/compute.out",
+        {"shader": "tests/python_build/fixtures/glsl/compute.glsl"},
+    ),
+    (
+        build_raw_header,
+        "tests/python_build/fixtures/glsl/vertex_fragment.out",
+        {"shader": "tests/python_build/fixtures/glsl/vertex_fragment.glsl"},
+    ),
+    (
+        build_rd_header,
+        "tests/python_build/fixtures/rd_glsl/compute.out",
+        {"shader": "tests/python_build/fixtures/rd_glsl/compute.glsl"},
+    ),
+    (
+        build_rd_header,
+        "tests/python_build/fixtures/rd_glsl/vertex_fragment.out",
+        {"shader": "tests/python_build/fixtures/rd_glsl/vertex_fragment.glsl"},
+    ),
+]
+
+
+def main() -> int:
+    ret = 0
+
+    for func, path, kwargs in FUNC_PATH_KWARGS:
+        if os.path.exists(out_path := os.path.abspath(path)):
+            with open(out_path, "rb") as file:
+                raw = file.read()
+            func(path, **kwargs)
+            with open(out_path, "rb") as file:
+                if raw != file.read():
+                    ret += 1
+        else:
+            func(path, **kwargs)
+            ret += 1
+
+    return ret
+
+
+sys.exit(main())
diff --git a/engine/tests/scene/test_animation.h b/engine/tests/scene/test_animation.h
index 6c89592e..1fae6edb 100644
--- a/engine/tests/scene/test_animation.h
+++ b/engine/tests/scene/test_animation.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_ANIMATION_H
-#define TEST_ANIMATION_H
+#pragma once
 
 #include "scene/resources/animation.h"
 
@@ -310,5 +309,3 @@ TEST_CASE("[Animation] Create Bezier track") {
 }
 
 } // namespace TestAnimation
-
-#endif // TEST_ANIMATION_H
diff --git a/engine/tests/scene/test_arraymesh.h b/engine/tests/scene/test_arraymesh.h
index 774981c9..73cd29a6 100644
--- a/engine/tests/scene/test_arraymesh.h
+++ b/engine/tests/scene/test_arraymesh.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_ARRAYMESH_H
-#define TEST_ARRAYMESH_H
+#pragma once
 
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/mesh.h"
@@ -149,9 +148,7 @@ TEST_CASE("[SceneTree][ArrayMesh] Adding and modifying blendshapes.") {
 		blend_shape[Mesh::ARRAY_VERTEX] = cylinder_array[Mesh::ARRAY_VERTEX];
 		blend_shape[Mesh::ARRAY_NORMAL] = cylinder_array[Mesh::ARRAY_NORMAL];
 		blend_shape[Mesh::ARRAY_TANGENT] = cylinder_array[Mesh::ARRAY_TANGENT];
-		Array blend_shapes;
-		blend_shapes.push_back(blend_shape);
-		blend_shapes.push_back(blend_shape);
+		Array blend_shapes = { blend_shape, blend_shape };
 		mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, cylinder_array, blend_shapes);
 		mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, cylinder_array, blend_shapes);
 
@@ -189,9 +186,7 @@ TEST_CASE("[SceneTree][ArrayMesh] Adding and modifying blendshapes.") {
 		blend_shape[Mesh::ARRAY_VERTEX] = cylinder_array[Mesh::ARRAY_VERTEX];
 		blend_shape[Mesh::ARRAY_NORMAL] = cylinder_array[Mesh::ARRAY_NORMAL];
 		blend_shape[Mesh::ARRAY_TANGENT] = cylinder_array[Mesh::ARRAY_TANGENT];
-		Array blend_shapes;
-		blend_shapes.push_back(blend_shape);
-		blend_shapes.push_back(blend_shape);
+		Array blend_shapes = { blend_shape, blend_shape };
 		mesh->add_surface_from_arrays(Mesh::PRIMITIVE_TRIANGLES, cylinder_array, blend_shapes);
 
 		ERR_PRINT_OFF
@@ -449,5 +444,3 @@ TEST_CASE("[SceneTree][ArrayMesh] Get/Set mesh metadata and actions") {
 }
 
 } // namespace TestArrayMesh
-
-#endif // TEST_ARRAYMESH_H
diff --git a/engine/tests/scene/test_audio_stream_wav.h b/engine/tests/scene/test_audio_stream_wav.h
index 30e3f5b9..58d24f51 100644
--- a/engine/tests/scene/test_audio_stream_wav.h
+++ b/engine/tests/scene/test_audio_stream_wav.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_AUDIO_STREAM_WAV_H
-#define TEST_AUDIO_STREAM_WAV_H
+#pragma once
 
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
@@ -47,7 +46,7 @@ constexpr int WAV_COUNT = WAV_RATE;
 
 float gen_wav(float frequency, float wav_rate, int wav_number) {
 	// formula for generating a sin wave with given frequency.
-	return Math::sin((Math_TAU * frequency / wav_rate) * wav_number);
+	return Math::sin((Math::TAU * frequency / wav_rate) * wav_number);
 }
 
 /* Generates a 440Hz sin wave in channel 0 (mono channel or left stereo channel)
@@ -218,5 +217,3 @@ TEST_CASE("[Audio][AudioStreamWAV] Saving IMA ADPCM is not supported") {
 }
 
 } // namespace TestAudioStreamWAV
-
-#endif // TEST_AUDIO_STREAM_WAV_H
diff --git a/engine/tests/scene/test_bit_map.h b/engine/tests/scene/test_bit_map.h
index 3c372b2a..8c1e0195 100644
--- a/engine/tests/scene/test_bit_map.h
+++ b/engine/tests/scene/test_bit_map.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_BIT_MAP_H
-#define TEST_BIT_MAP_H
+#pragma once
 
 #include "core/os/memory.h"
 #include "scene/resources/bit_map.h"
@@ -501,5 +500,3 @@ TEST_CASE("[BitMap] Clip to polygon") {
 }
 
 } // namespace TestBitmap
-
-#endif // TEST_BIT_MAP_H
diff --git a/engine/tests/scene/test_button.h b/engine/tests/scene/test_button.h
index 55097edc..adb466f9 100644
--- a/engine/tests/scene/test_button.h
+++ b/engine/tests/scene/test_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_BUTTON_H
-#define TEST_BUTTON_H
+#pragma once
 
 #include "scene/gui/button.h"
 #include "scene/main/window.h"
@@ -63,4 +62,3 @@ TEST_CASE("[SceneTree][Button] is_hovered()") {
 }
 
 } //namespace TestButton
-#endif // TEST_BUTTON_H
diff --git a/engine/tests/scene/test_camera_2d.h b/engine/tests/scene/test_camera_2d.h
index f03a4aed..73f1aff0 100644
--- a/engine/tests/scene/test_camera_2d.h
+++ b/engine/tests/scene/test_camera_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CAMERA_2D_H
-#define TEST_CAMERA_2D_H
+#pragma once
 
 #include "scene/2d/camera_2d.h"
 #include "scene/main/viewport.h"
@@ -286,7 +285,7 @@ TEST_CASE("[SceneTree][Camera2D] Transforms") {
 	}
 
 	SUBCASE("Rotation") {
-		test_camera->set_rotation(Math_PI / 2);
+		test_camera->set_rotation(Math::PI / 2);
 		Transform2D xform = mock_viewport->get_canvas_transform();
 		Transform2D test_xform = Transform2D(Vector2(1, 0), Vector2(0, 1), Vector2(200, 100));
 		CHECK(xform.is_equal_approx(test_xform));
@@ -296,7 +295,7 @@ TEST_CASE("[SceneTree][Camera2D] Transforms") {
 		test_xform = Transform2D(Vector2(0, -1), Vector2(1, 0), Vector2(200, 100));
 		CHECK(xform.is_equal_approx(test_xform));
 
-		test_camera->set_rotation(-1 * Math_PI);
+		test_camera->set_rotation(-1 * Math::PI);
 		test_camera->force_update_scroll();
 		xform = mock_viewport->get_canvas_transform();
 		test_xform = Transform2D(Vector2(-1, 0), Vector2(0, -1), Vector2(200, 100));
@@ -314,5 +313,3 @@ TEST_CASE("[SceneTree][Camera2D] Transforms") {
 }
 
 } // namespace TestCamera2D
-
-#endif // TEST_CAMERA_2D_H
diff --git a/engine/tests/scene/test_camera_3d.h b/engine/tests/scene/test_camera_3d.h
index 360736b7..f4173a12 100644
--- a/engine/tests/scene/test_camera_3d.h
+++ b/engine/tests/scene/test_camera_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CAMERA_3D_H
-#define TEST_CAMERA_3D_H
+#pragma once
 
 #include "scene/3d/camera_3d.h"
 #include "scene/main/viewport.h"
@@ -37,9 +36,6 @@
 
 #include "tests/test_macros.h"
 
-// Constants.
-#define SQRT3 (1.7320508f)
-
 TEST_CASE("[SceneTree][Camera3D] Getters and setters") {
 	Camera3D *test_camera = memnew(Camera3D);
 
@@ -247,13 +243,13 @@ TEST_CASE("[SceneTree][Camera3D] Project/Unproject position") {
 			CHECK(test_camera->project_position(Vector2(200, 100), 100.0f).is_equal_approx(Vector3(0, 0, -100.0f)));
 			CHECK(test_camera->project_position(Vector2(200, 100), test_camera->get_far()).is_equal_approx(Vector3(0, 0, -1.0f) * test_camera->get_far()));
 			// 3/4th way to Top left.
-			CHECK(test_camera->project_position(Vector2(100, 50), 0.5f).is_equal_approx(Vector3(-SQRT3 * 0.5f, SQRT3 * 0.25f, -0.5f)));
-			CHECK(test_camera->project_position(Vector2(100, 50), 1.0f).is_equal_approx(Vector3(-SQRT3, SQRT3 * 0.5f, -1.0f)));
-			CHECK(test_camera->project_position(Vector2(100, 50), test_camera->get_near()).is_equal_approx(Vector3(-SQRT3, SQRT3 * 0.5f, -1.0f) * test_camera->get_near()));
+			CHECK(test_camera->project_position(Vector2(100, 50), 0.5f).is_equal_approx(Vector3(-Math::SQRT3 * 0.5f, Math::SQRT3 * 0.25f, -0.5f)));
+			CHECK(test_camera->project_position(Vector2(100, 50), 1.0f).is_equal_approx(Vector3(-Math::SQRT3, Math::SQRT3 * 0.5f, -1.0f)));
+			CHECK(test_camera->project_position(Vector2(100, 50), test_camera->get_near()).is_equal_approx(Vector3(-Math::SQRT3, Math::SQRT3 * 0.5f, -1.0f) * test_camera->get_near()));
 			// 3/4th way to Bottom right.
-			CHECK(test_camera->project_position(Vector2(300, 150), 0.5f).is_equal_approx(Vector3(SQRT3 * 0.5f, -SQRT3 * 0.25f, -0.5f)));
-			CHECK(test_camera->project_position(Vector2(300, 150), 1.0f).is_equal_approx(Vector3(SQRT3, -SQRT3 * 0.5f, -1.0f)));
-			CHECK(test_camera->project_position(Vector2(300, 150), test_camera->get_far()).is_equal_approx(Vector3(SQRT3, -SQRT3 * 0.5f, -1.0f) * test_camera->get_far()));
+			CHECK(test_camera->project_position(Vector2(300, 150), 0.5f).is_equal_approx(Vector3(Math::SQRT3 * 0.5f, -Math::SQRT3 * 0.25f, -0.5f)));
+			CHECK(test_camera->project_position(Vector2(300, 150), 1.0f).is_equal_approx(Vector3(Math::SQRT3, -Math::SQRT3 * 0.5f, -1.0f)));
+			CHECK(test_camera->project_position(Vector2(300, 150), test_camera->get_far()).is_equal_approx(Vector3(Math::SQRT3, -Math::SQRT3 * 0.5f, -1.0f) * test_camera->get_far()));
 		}
 	}
 
@@ -275,11 +271,11 @@ TEST_CASE("[SceneTree][Camera3D] Project/Unproject position") {
 			CHECK(test_camera->unproject_position(Vector3(0, 0, -0.5f)).is_equal_approx(Vector2(200, 100)));
 			CHECK(test_camera->unproject_position(Vector3(0, 0, -100.0f)).is_equal_approx(Vector2(200, 100)));
 			// 3/4th way to Top left.
-			WARN(test_camera->unproject_position(Vector3(-SQRT3 * 0.5f, SQRT3 * 0.25f, -0.5f)).is_equal_approx(Vector2(100, 50)));
-			WARN(test_camera->unproject_position(Vector3(-SQRT3, SQRT3 * 0.5f, -1.0f)).is_equal_approx(Vector2(100, 50)));
+			WARN(test_camera->unproject_position(Vector3(-Math::SQRT3 * 0.5f, Math::SQRT3 * 0.25f, -0.5f)).is_equal_approx(Vector2(100, 50)));
+			WARN(test_camera->unproject_position(Vector3(-Math::SQRT3, Math::SQRT3 * 0.5f, -1.0f)).is_equal_approx(Vector2(100, 50)));
 			// 3/4th way to Bottom right.
-			CHECK(test_camera->unproject_position(Vector3(SQRT3 * 0.5f, -SQRT3 * 0.25f, -0.5f)).is_equal_approx(Vector2(300, 150)));
-			CHECK(test_camera->unproject_position(Vector3(SQRT3, -SQRT3 * 0.5f, -1.0f)).is_equal_approx(Vector2(300, 150)));
+			CHECK(test_camera->unproject_position(Vector3(Math::SQRT3 * 0.5f, -Math::SQRT3 * 0.25f, -0.5f)).is_equal_approx(Vector2(300, 150)));
+			CHECK(test_camera->unproject_position(Vector3(Math::SQRT3, -Math::SQRT3 * 0.5f, -1.0f)).is_equal_approx(Vector2(300, 150)));
 		}
 	}
 
@@ -337,9 +333,9 @@ TEST_CASE("[SceneTree][Camera3D] Project ray") {
 			// Center.
 			CHECK(test_camera->project_ray_normal(Vector2(200, 100)).is_equal_approx(Vector3(0, 0, -1)));
 			// Top left.
-			CHECK(test_camera->project_ray_normal(Vector2(0, 0)).is_equal_approx(Vector3(-SQRT3, SQRT3 / 2, -0.5f).normalized()));
+			CHECK(test_camera->project_ray_normal(Vector2(0, 0)).is_equal_approx(Vector3(-Math::SQRT3, Math::SQRT3 / 2, -0.5f).normalized()));
 			// Bottom right.
-			CHECK(test_camera->project_ray_normal(Vector2(400, 200)).is_equal_approx(Vector3(SQRT3, -SQRT3 / 2, -0.5f).normalized()));
+			CHECK(test_camera->project_ray_normal(Vector2(400, 200)).is_equal_approx(Vector3(Math::SQRT3, -Math::SQRT3 / 2, -0.5f).normalized()));
 		}
 	}
 
@@ -361,16 +357,12 @@ TEST_CASE("[SceneTree][Camera3D] Project ray") {
 			// Center.
 			CHECK(test_camera->project_local_ray_normal(Vector2(200, 100)).is_equal_approx(Vector3(0, 0, -1)));
 			// Top left.
-			CHECK(test_camera->project_local_ray_normal(Vector2(0, 0)).is_equal_approx(Vector3(-SQRT3, SQRT3 / 2, -0.5f).normalized()));
+			CHECK(test_camera->project_local_ray_normal(Vector2(0, 0)).is_equal_approx(Vector3(-Math::SQRT3, Math::SQRT3 / 2, -0.5f).normalized()));
 			// Bottom right.
-			CHECK(test_camera->project_local_ray_normal(Vector2(400, 200)).is_equal_approx(Vector3(SQRT3, -SQRT3 / 2, -0.5f).normalized()));
+			CHECK(test_camera->project_local_ray_normal(Vector2(400, 200)).is_equal_approx(Vector3(Math::SQRT3, -Math::SQRT3 / 2, -0.5f).normalized()));
 		}
 	}
 
 	memdelete(test_camera);
 	memdelete(mock_viewport);
 }
-
-#undef SQRT3
-
-#endif // TEST_CAMERA_3D_H
diff --git a/engine/tests/scene/test_code_edit.h b/engine/tests/scene/test_code_edit.h
index 1c85d3e4..a7c18923 100644
--- a/engine/tests/scene/test_code_edit.h
+++ b/engine/tests/scene/test_code_edit.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CODE_EDIT_H
-#define TEST_CODE_EDIT_H
+#pragma once
 
 #include "scene/gui/code_edit.h"
 
@@ -906,8 +905,7 @@ TEST_CASE("[SceneTree][CodeEdit] delimiters") {
 			CHECK(code_edit->get_string_delimiters().size() == 2);
 
 			/* Set should override existing, and test multiline */
-			TypedArray<String> delimiters;
-			delimiters.push_back("^^ ^^");
+			TypedArray<String> delimiters = { "^^ ^^" };
 
 			code_edit->set_string_delimiters(delimiters);
 			CHECK_FALSE(code_edit->has_string_delimiter("\""));
@@ -972,8 +970,7 @@ TEST_CASE("[SceneTree][CodeEdit] delimiters") {
 			CHECK(code_edit->get_comment_delimiters().size() == 2);
 
 			/* Set should override existing, and test multiline. */
-			TypedArray<String> delimiters;
-			delimiters.push_back("^^ ^^");
+			TypedArray<String> delimiters = { "^^ ^^" };
 
 			code_edit->set_comment_delimiters(delimiters);
 			CHECK_FALSE(code_edit->has_comment_delimiter("\""));
@@ -1771,10 +1768,7 @@ TEST_CASE("[SceneTree][CodeEdit] indent") {
 		CHECK(code_edit->is_indent_using_spaces());
 
 		/* Only the first char is registered. */
-		TypedArray<String> auto_indent_prefixes;
-		auto_indent_prefixes.push_back("::");
-		auto_indent_prefixes.push_back("s");
-		auto_indent_prefixes.push_back("1");
+		TypedArray<String> auto_indent_prefixes = { "::", "s", "1" };
 		code_edit->set_auto_indent_prefixes(auto_indent_prefixes);
 
 		auto_indent_prefixes = code_edit->get_auto_indent_prefixes();
@@ -3275,6 +3269,47 @@ TEST_CASE("[SceneTree][CodeEdit] folding") {
 		CHECK(code_edit->get_next_visible_line_offset_from(1, 1) == 4);
 	}
 
+	SUBCASE("[CodeEdit] folding comments including and/or adjacent to code regions") {
+		code_edit->add_comment_delimiter("#", "", true);
+
+		// Single line comment directly above a code region tag is not foldable.
+		code_edit->set_text("#line0\n#region a\nnothing\n#line3\n#endregion");
+		CHECK_FALSE(code_edit->can_fold_line(0));
+		CHECK_FALSE(code_edit->can_fold_line(3));
+
+		// Comment blocks.
+		// Foldable even when directly below a code region start tag.
+		code_edit->set_text("#line0\n#line1\n#region a\n#line3\n#line4\nnothing\n#endregion");
+		CHECK(code_edit->can_fold_line(3));
+
+		// Doesn't fold beyond region start tag.
+		code_edit->fold_line(0);
+		CHECK(code_edit->is_line_folded(0));
+		CHECK_EQ(code_edit->get_visible_line_count_in_range(0, 1), 1);
+		CHECK_EQ(code_edit->get_visible_line_count_in_range(2, 2), 1);
+
+		// Foldable even when directly below a code region end tag.
+		code_edit->set_text("#region a\nnothing\n#line2\n#line3\n#endregion\n#line5\n#line6");
+		CHECK(code_edit->can_fold_line(5));
+
+		// Doesn't fold beyond region end tag.
+		code_edit->fold_line(2);
+		CHECK(code_edit->is_line_folded(2));
+		CHECK_EQ(code_edit->get_visible_line_count_in_range(2, 3), 1);
+		CHECK_EQ(code_edit->get_visible_line_count_in_range(4, 4), 1);
+
+		code_edit->add_comment_delimiter("/*", "*/", false);
+
+		// Multiline comments.
+		// Folds a region tag inside it.
+		code_edit->set_text("/*\nnothing\n#region a\n*/\n#endregion");
+		CHECK(code_edit->can_fold_line(0));
+		code_edit->fold_line(0);
+		CHECK(code_edit->is_line_folded(0));
+		CHECK_EQ(code_edit->get_visible_line_count_in_range(0, 3), 1);
+		CHECK_EQ(code_edit->get_visible_line_count_in_range(4, 4), 1);
+	}
+
 	SUBCASE("[CodeEdit] folding carets") {
 		// Folding a line moves all carets that would be hidden.
 		code_edit->set_text("test\n\tline1\n\t\tline 2\n");
@@ -3937,11 +3972,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
 		CHECK(code_edit->is_code_completion_enabled());
 
 		/* Set prefixes, single char only, disallow empty. */
-		TypedArray<String> completion_prefixes;
-		completion_prefixes.push_back("");
-		completion_prefixes.push_back(".");
-		completion_prefixes.push_back(".");
-		completion_prefixes.push_back(",,");
+		TypedArray<String> completion_prefixes = { "", ".", ".", ",," };
 
 		ERR_PRINT_OFF;
 		code_edit->set_code_completion_prefixes(completion_prefixes);
@@ -3959,8 +3990,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
 		SIGNAL_WATCH(code_edit, "code_completion_requested");
 		code_edit->set_code_completion_enabled(true);
 
-		Array signal_args;
-		signal_args.push_back(Array());
+		Array signal_args = { {} };
 
 		/* Force request. */
 		code_edit->request_code_completion();
@@ -3973,8 +4003,7 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
 		SIGNAL_CHECK("code_completion_requested", signal_args);
 
 		/* Insert prefix. */
-		TypedArray<String> completion_prefixes;
-		completion_prefixes.push_back(".");
+		TypedArray<String> completion_prefixes = { "." };
 		code_edit->set_code_completion_prefixes(completion_prefixes);
 
 		code_edit->insert_text_at_caret(".");
@@ -4119,10 +4148,10 @@ TEST_CASE("[SceneTree][CodeEdit] completion") {
 
 			Point2 caret_pos = code_edit->get_caret_draw_pos();
 			caret_pos.y += code_edit->get_line_height();
-			SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::WHEEL_DOWN, 0, Key::NONE);
+			SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::WHEEL_DOWN, MouseButtonMask::NONE, Key::NONE);
 			CHECK(code_edit->get_code_completion_selected_index() == 1);
 
-			SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::WHEEL_UP, 0, Key::NONE);
+			SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::WHEEL_UP, MouseButtonMask::NONE, Key::NONE);
 			CHECK(code_edit->get_code_completion_selected_index() == 0);
 
 			/* Single click selects. */
@@ -4492,7 +4521,8 @@ TEST_CASE("[SceneTree][CodeEdit] symbol lookup") {
 
 		Point2 caret_pos = code_edit->get_caret_draw_pos();
 		caret_pos.x += 60;
-		SEND_GUI_MOUSE_BUTTON_EVENT(caret_pos, MouseButton::NONE, 0, Key::NONE);
+
+		SEND_GUI_MOUSE_MOTION_EVENT(caret_pos, MouseButtonMask::NONE, Key::NONE);
 		CHECK(code_edit->get_text_for_symbol_lookup() == "this is s" + String::chr(0xFFFF) + "ome text");
 
 		SIGNAL_WATCH(code_edit, "symbol_validate");
@@ -5675,5 +5705,3 @@ func _ready():
 }
 
 } // namespace TestCodeEdit
-
-#endif // TEST_CODE_EDIT_H
diff --git a/engine/tests/scene/test_color_picker.h b/engine/tests/scene/test_color_picker.h
index 0c657a01..ba034514 100644
--- a/engine/tests/scene/test_color_picker.h
+++ b/engine/tests/scene/test_color_picker.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_COLOR_PICKER_H
-#define TEST_COLOR_PICKER_H
+#pragma once
 
 #include "scene/gui/color_picker.h"
 
@@ -57,5 +56,3 @@ TEST_CASE("[SceneTree][ColorPicker]") {
 }
 
 } // namespace TestColorPicker
-
-#endif // TEST_COLOR_PICKER_H
diff --git a/engine/tests/scene/test_control.h b/engine/tests/scene/test_control.h
index f7ba75d4..df498b94 100644
--- a/engine/tests/scene/test_control.h
+++ b/engine/tests/scene/test_control.h
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CONTROL_H
-#define TEST_CONTROL_H
+#pragma once
 
+#include "scene/2d/node_2d.h"
 #include "scene/gui/control.h"
 
 #include "tests/test_macros.h"
@@ -52,9 +52,9 @@ TEST_CASE("[SceneTree][Control] Transforms") {
 		CHECK_EQ(test_node->get_global_transform(), Transform2D(0, Size2(4, 4), 0, Vector2(2, 2)));
 		test_node->set_scale(Vector2(1, 1));
 		test_node->set_rotation_degrees(90);
-		CHECK_EQ(test_node->get_global_transform(), Transform2D(Math_PI / 2, Vector2(2, 2)));
+		CHECK_EQ(test_node->get_global_transform(), Transform2D(Math::PI / 2, Vector2(2, 2)));
 		test_node->set_pivot_offset(Vector2(1, 0));
-		CHECK_EQ(test_node->get_global_transform(), Transform2D(Math_PI / 2, Vector2(3, 1)));
+		CHECK_EQ(test_node->get_global_transform(), Transform2D(Math::PI / 2, Vector2(3, 1)));
 
 		memdelete(test_child);
 		memdelete(test_node);
@@ -66,7 +66,7 @@ TEST_CASE("[SceneTree][Control] Focus") {
 	SceneTree::get_singleton()->get_root()->add_child(ctrl);
 
 	SUBCASE("[SceneTree][Control] Default focus") {
-		CHECK_FALSE(ctrl->has_focus());
+		CHECK_UNARY_FALSE(ctrl->has_focus());
 	}
 
 	SUBCASE("[SceneTree][Control] Can't grab focus with default focus mode") {
@@ -74,44 +74,834 @@ TEST_CASE("[SceneTree][Control] Focus") {
 		ctrl->grab_focus();
 		ERR_PRINT_ON
 
-		CHECK_FALSE(ctrl->has_focus());
+		CHECK_UNARY_FALSE(ctrl->has_focus());
 	}
 
 	SUBCASE("[SceneTree][Control] Can grab focus") {
 		ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
 		ctrl->grab_focus();
 
-		CHECK(ctrl->has_focus());
+		CHECK_UNARY(ctrl->has_focus());
 	}
 
 	SUBCASE("[SceneTree][Control] Can release focus") {
 		ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
 		ctrl->grab_focus();
-		CHECK(ctrl->has_focus());
+		CHECK_UNARY(ctrl->has_focus());
 
 		ctrl->release_focus();
-		CHECK_FALSE(ctrl->has_focus());
+		CHECK_UNARY_FALSE(ctrl->has_focus());
 	}
 
 	SUBCASE("[SceneTree][Control] Only one can grab focus at the same time") {
 		ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
 		ctrl->grab_focus();
-		CHECK(ctrl->has_focus());
+		CHECK_UNARY(ctrl->has_focus());
 
 		Control *other_ctrl = memnew(Control);
 		SceneTree::get_singleton()->get_root()->add_child(other_ctrl);
 		other_ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
 		other_ctrl->grab_focus();
 
-		CHECK(other_ctrl->has_focus());
-		CHECK_FALSE(ctrl->has_focus());
+		CHECK_UNARY(other_ctrl->has_focus());
+		CHECK_UNARY_FALSE(ctrl->has_focus());
 
 		memdelete(other_ctrl);
 	}
 
+	SUBCASE("[SceneTree][Control] Hide control will cause the focus to be released") {
+		ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+		ctrl->grab_focus();
+		CHECK_UNARY(ctrl->has_focus());
+
+		ctrl->hide();
+		CHECK_UNARY_FALSE(ctrl->has_focus());
+
+		ctrl->show();
+		CHECK_UNARY_FALSE(ctrl->has_focus());
+	}
+
+	SUBCASE("[SceneTree][Control] The parent node is hidden causing the focus to be released") {
+		Control *child_ctrl = memnew(Control);
+		ctrl->add_child(child_ctrl);
+
+		child_ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+		child_ctrl->grab_focus();
+		CHECK_UNARY(child_ctrl->has_focus());
+
+		ctrl->hide();
+		CHECK_UNARY_FALSE(child_ctrl->has_focus());
+
+		ctrl->show();
+		CHECK_UNARY_FALSE(child_ctrl->has_focus());
+
+		memdelete(child_ctrl);
+	}
+
 	memdelete(ctrl);
 }
 
+TEST_CASE("[SceneTree][Control] Find next/prev valid focus") {
+	Node *intermediate = memnew(Node);
+	Control *ctrl = memnew(Control);
+	intermediate->add_child(ctrl);
+	SceneTree::get_singleton()->get_root()->add_child(intermediate);
+
+	SUBCASE("[SceneTree][Control] In FOCUS_CLICK mode") {
+		ctrl->set_focus_mode(Control::FocusMode::FOCUS_CLICK);
+		ctrl->grab_focus();
+		REQUIRE_UNARY(ctrl->has_focus());
+
+		SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+			SEND_GUI_ACTION("ui_focus_next");
+			CHECK_UNARY(ctrl->has_focus());
+		}
+
+		SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+			SEND_GUI_ACTION("ui_focus_prev");
+			CHECK_UNARY(ctrl->has_focus());
+		}
+
+		SUBCASE("[SceneTree][Control] Has a sibling control but the parent node is not a control") {
+			Control *other_ctrl = memnew(Control);
+			intermediate->add_child(other_ctrl);
+
+			SUBCASE("[SceneTree][Control] Has a sibling control with FOCUS_ALL") {
+				other_ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				REQUIRE_EQ(other_ctrl->get_focus_mode(), Control::FocusMode::FOCUS_ALL);
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus next") {
+					ctrl->set_focus_next(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Manually specified focus next is hidden") {
+						other_ctrl->hide();
+						REQUIRE_UNARY_FALSE(other_ctrl->is_visible());
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+							SEND_GUI_ACTION("ui_focus_next");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+							SEND_GUI_ACTION("ui_focus_prev");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus prev") {
+					ctrl->set_focus_previous(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Manually specified focus next is hidden") {
+						other_ctrl->hide();
+						REQUIRE_UNARY_FALSE(other_ctrl->is_visible());
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+							SEND_GUI_ACTION("ui_focus_next");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+							SEND_GUI_ACTION("ui_focus_prev");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+					}
+				}
+			}
+
+			SUBCASE("[SceneTree][Control] Has a sibling control with FOCUS_CLICK") {
+				other_ctrl->set_focus_mode(Control::FocusMode::FOCUS_CLICK);
+				REQUIRE_EQ(other_ctrl->get_focus_mode(), Control::FocusMode::FOCUS_CLICK);
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus next") {
+					ctrl->set_focus_next(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus prev") {
+					ctrl->set_focus_previous(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+				}
+			}
+
+			SUBCASE("[SceneTree][Control] Has a sibling control with FOCUS_NONE") {
+				other_ctrl->set_focus_mode(Control::FocusMode::FOCUS_NONE);
+				REQUIRE_EQ(other_ctrl->get_focus_mode(), Control::FocusMode::FOCUS_NONE);
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus next") {
+					ctrl->set_focus_next(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus prev") {
+					ctrl->set_focus_previous(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+				}
+			}
+
+			memdelete(other_ctrl);
+		}
+	}
+
+	SUBCASE("[SceneTree][Control] In FOCUS_ALL mode") {
+		ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+		REQUIRE_EQ(ctrl->get_focus_mode(), Control::FocusMode::FOCUS_ALL);
+
+		ctrl->grab_focus();
+		REQUIRE_UNARY(ctrl->has_focus());
+
+		SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+			SEND_GUI_ACTION("ui_focus_next");
+			CHECK_UNARY(ctrl->has_focus());
+		}
+
+		SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+			SEND_GUI_ACTION("ui_focus_prev");
+			CHECK_UNARY(ctrl->has_focus());
+		}
+
+		SUBCASE("[SceneTree][Control] Has a sibling control but the parent node is not a control") {
+			Control *other_ctrl = memnew(Control);
+			SceneTree::get_singleton()->get_root()->add_child(other_ctrl);
+
+			SUBCASE("[SceneTree][Control] Has a sibling control with FOCUS_ALL") {
+				other_ctrl->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				REQUIRE_EQ(other_ctrl->get_focus_mode(), Control::FocusMode::FOCUS_ALL);
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus next") {
+					ctrl->set_focus_next(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Manually specified focus next is hidden") {
+						other_ctrl->hide();
+						REQUIRE_UNARY_FALSE(other_ctrl->is_visible());
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+							SEND_GUI_ACTION("ui_focus_next");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+							SEND_GUI_ACTION("ui_focus_prev");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus prev") {
+					ctrl->set_focus_previous(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Manually specified focus next is hidden") {
+						other_ctrl->hide();
+						REQUIRE_UNARY_FALSE(other_ctrl->is_visible());
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+							SEND_GUI_ACTION("ui_focus_next");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+							SEND_GUI_ACTION("ui_focus_prev");
+							CHECK_UNARY(ctrl->has_focus());
+							CHECK_UNARY_FALSE(other_ctrl->has_focus());
+						}
+					}
+				}
+			}
+
+			SUBCASE("[SceneTree][Control] Has a sibling control with FOCUS_CLICK") {
+				other_ctrl->set_focus_mode(Control::FocusMode::FOCUS_CLICK);
+				REQUIRE_EQ(other_ctrl->get_focus_mode(), Control::FocusMode::FOCUS_CLICK);
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus next") {
+					ctrl->set_focus_next(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus prev") {
+					ctrl->set_focus_previous(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY_FALSE(ctrl->has_focus());
+						CHECK_UNARY(other_ctrl->has_focus());
+					}
+				}
+			}
+
+			SUBCASE("[SceneTree][Control] Has a sibling control with FOCUS_NONE") {
+				other_ctrl->set_focus_mode(Control::FocusMode::FOCUS_NONE);
+				REQUIRE_EQ(other_ctrl->get_focus_mode(), Control::FocusMode::FOCUS_NONE);
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl->has_focus());
+					CHECK_UNARY_FALSE(other_ctrl->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus next") {
+					ctrl->set_focus_next(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Manually specify focus prev") {
+					ctrl->set_focus_previous(ctrl->get_path_to(other_ctrl));
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+						CHECK_UNARY_FALSE(other_ctrl->has_focus());
+					}
+				}
+			}
+
+			memdelete(other_ctrl);
+		}
+
+		SUBCASE("[SceneTree][Control] Simple control tree") {
+			Control *ctrl_0 = memnew(Control);
+			Control *ctrl_1 = memnew(Control);
+			Node2D *node_2d_2 = memnew(Node2D);
+
+			ctrl->add_child(ctrl_0);
+			ctrl->add_child(ctrl_1);
+			ctrl->add_child(node_2d_2);
+
+			ctrl_0->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+			ctrl_1->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+			REQUIRE_EQ(ctrl_0->get_focus_mode(), Control::FocusMode::FOCUS_ALL);
+			REQUIRE_EQ(ctrl_1->get_focus_mode(), Control::FocusMode::FOCUS_ALL);
+
+			SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+				SEND_GUI_ACTION("ui_focus_next");
+				CHECK_UNARY(ctrl_0->has_focus());
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl_1->has_focus());
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl->has_focus());
+					}
+				}
+			}
+
+			SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+				SEND_GUI_ACTION("ui_focus_prev");
+				CHECK_UNARY(ctrl_1->has_focus());
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl_0->has_focus());
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+					}
+				}
+			}
+
+			SUBCASE("[SceneTree][Control] Skip next hidden control") {
+				ctrl_0->hide();
+				REQUIRE_UNARY_FALSE(ctrl_0->is_visible());
+				SEND_GUI_ACTION("ui_focus_next");
+				CHECK_UNARY_FALSE(ctrl_0->has_focus());
+				CHECK_UNARY(ctrl_1->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Skip next control with FOCUS_NONE") {
+				ctrl_0->set_focus_mode(Control::FocusMode::FOCUS_NONE);
+				REQUIRE_EQ(ctrl_0->get_focus_mode(), Control::FocusMode::FOCUS_NONE);
+				SEND_GUI_ACTION("ui_focus_next");
+				CHECK_UNARY_FALSE(ctrl_0->has_focus());
+				CHECK_UNARY(ctrl_1->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Skip next control with FOCUS_CLICK") {
+				ctrl_0->set_focus_mode(Control::FocusMode::FOCUS_CLICK);
+				REQUIRE_EQ(ctrl_0->get_focus_mode(), Control::FocusMode::FOCUS_CLICK);
+				SEND_GUI_ACTION("ui_focus_next");
+				CHECK_UNARY_FALSE(ctrl_0->has_focus());
+				CHECK_UNARY(ctrl_1->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Skip next top level control") {
+				ctrl_0->set_as_top_level(true);
+				REQUIRE_UNARY(ctrl_0->is_set_as_top_level());
+				SEND_GUI_ACTION("ui_focus_next");
+				CHECK_UNARY_FALSE(ctrl_0->has_focus());
+				CHECK_UNARY(ctrl_1->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Skip prev hidden control") {
+				ctrl_1->hide();
+				REQUIRE_UNARY_FALSE(ctrl_1->is_visible());
+				SEND_GUI_ACTION("ui_focus_prev");
+				CHECK_UNARY_FALSE(ctrl_1->has_focus());
+				CHECK_UNARY(ctrl_0->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Skip prev control with FOCUS_NONE") {
+				ctrl_1->set_focus_mode(Control::FocusMode::FOCUS_NONE);
+				REQUIRE_EQ(ctrl_1->get_focus_mode(), Control::FocusMode::FOCUS_NONE);
+				SEND_GUI_ACTION("ui_focus_prev");
+				CHECK_UNARY_FALSE(ctrl_1->has_focus());
+				CHECK_UNARY(ctrl_0->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Skip prev control with FOCUS_CLICK") {
+				ctrl_1->set_focus_mode(Control::FocusMode::FOCUS_CLICK);
+				REQUIRE_EQ(ctrl_1->get_focus_mode(), Control::FocusMode::FOCUS_CLICK);
+				SEND_GUI_ACTION("ui_focus_prev");
+				CHECK_UNARY_FALSE(ctrl_1->has_focus());
+				CHECK_UNARY(ctrl_0->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Skip prev top level control") {
+				ctrl_1->set_as_top_level(true);
+				REQUIRE_UNARY(ctrl_1->is_set_as_top_level());
+				SEND_GUI_ACTION("ui_focus_prev");
+				CHECK_UNARY_FALSE(ctrl_1->has_focus());
+				CHECK_UNARY(ctrl_0->has_focus());
+			}
+
+			SUBCASE("[SceneTree][Control] Add more node controls") {
+				Control *ctrl_0_0 = memnew(Control);
+				Control *ctrl_0_1 = memnew(Control);
+				Control *ctrl_0_2 = memnew(Control);
+				ctrl_0->add_child(ctrl_0_0);
+				ctrl_0->add_child(ctrl_0_1);
+				ctrl_0->add_child(ctrl_0_2);
+				ctrl_0_0->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				ctrl_0_1->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				ctrl_0_2->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+
+				Control *ctrl_1_0 = memnew(Control);
+				Control *ctrl_1_1 = memnew(Control);
+				Control *ctrl_1_2 = memnew(Control);
+				ctrl_1->add_child(ctrl_1_0);
+				ctrl_1->add_child(ctrl_1_1);
+				ctrl_1->add_child(ctrl_1_2);
+				ctrl_1_0->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				ctrl_1_1->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				ctrl_1_2->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+
+				Control *ctrl_2_0 = memnew(Control);
+				Control *ctrl_2_1 = memnew(Control);
+				Control *ctrl_2_2 = memnew(Control);
+				node_2d_2->add_child(ctrl_2_0);
+				node_2d_2->add_child(ctrl_2_1);
+				node_2d_2->add_child(ctrl_2_2);
+				ctrl_2_0->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				ctrl_2_1->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+				ctrl_2_2->set_focus_mode(Control::FocusMode::FOCUS_ALL);
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+					SEND_GUI_ACTION("ui_focus_next");
+					CHECK_UNARY(ctrl_0->has_focus());
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl_0_0->has_focus());
+					}
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+						SEND_GUI_ACTION("ui_focus_prev");
+						CHECK_UNARY(ctrl->has_focus());
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+					SEND_GUI_ACTION("ui_focus_prev");
+					CHECK_UNARY(ctrl_1_2->has_focus());
+				}
+
+				SUBCASE("[SceneTree][Control] Exist top level tree") {
+					ctrl_0->set_as_top_level(true);
+					REQUIRE_UNARY(ctrl_0->is_set_as_top_level());
+
+					SUBCASE("[SceneTree][Control] Outside top level tree") {
+						ctrl->grab_focus();
+						REQUIRE_UNARY(ctrl->has_focus());
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+							SEND_GUI_ACTION("ui_focus_next");
+							CHECK_UNARY(ctrl_1->has_focus());
+
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+								SEND_GUI_ACTION("ui_focus_prev");
+								CHECK_UNARY(ctrl->has_focus());
+							}
+						}
+					}
+
+					SUBCASE("[SceneTree][Control] Inside top level tree") {
+						ctrl_0->grab_focus();
+						REQUIRE_UNARY(ctrl_0->has_focus());
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+							SEND_GUI_ACTION("ui_focus_next");
+							CHECK_UNARY(ctrl_0_0->has_focus());
+
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+								SEND_GUI_ACTION("ui_focus_prev");
+								CHECK_UNARY(ctrl_0->has_focus());
+							}
+						}
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+							SEND_GUI_ACTION("ui_focus_prev");
+							CHECK_UNARY(ctrl_0_2->has_focus());
+
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+								SEND_GUI_ACTION("ui_focus_next");
+								CHECK_UNARY(ctrl_0->has_focus());
+							}
+						}
+					}
+
+					SUBCASE("[SceneTree][Control] Manually specified focus next") {
+						ctrl->set_focus_next(ctrl->get_path_to(ctrl_2_1));
+						ctrl_2_1->set_focus_next(ctrl_2_1->get_path_to(ctrl_1_0));
+						ctrl_1_0->set_focus_next(ctrl_1_0->get_path_to(ctrl_0));
+						ctrl_0->set_focus_next(ctrl_0->get_path_to(ctrl));
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+							SEND_GUI_ACTION("ui_focus_next");
+							CHECK_UNARY(ctrl_2_1->has_focus());
+
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+								SEND_GUI_ACTION("ui_focus_next");
+								CHECK_UNARY(ctrl_1_0->has_focus());
+
+								SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+									SEND_GUI_ACTION("ui_focus_next");
+									CHECK_UNARY(ctrl_0->has_focus());
+
+									SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+										SEND_GUI_ACTION("ui_focus_next");
+										CHECK_UNARY(ctrl->has_focus());
+									}
+
+									SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+										SEND_GUI_ACTION("ui_focus_prev");
+										CHECK_UNARY(ctrl_0_2->has_focus());
+									}
+								}
+
+								SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+									SEND_GUI_ACTION("ui_focus_prev");
+									CHECK_UNARY(ctrl_1->has_focus());
+								}
+							}
+
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+								SEND_GUI_ACTION("ui_focus_prev");
+								CHECK_UNARY(ctrl_2_1->has_focus());
+							}
+						}
+
+						SUBCASE("[SceneTree][Control] The parent node is not visible") {
+							node_2d_2->hide();
+							REQUIRE_UNARY(ctrl_2_1->is_visible());
+							REQUIRE_UNARY_FALSE(ctrl_2_1->is_visible_in_tree());
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+								SEND_GUI_ACTION("ui_focus_next");
+								CHECK_UNARY_FALSE(ctrl->has_focus());
+								CHECK_UNARY_FALSE(ctrl_2_1->has_focus());
+								CHECK_UNARY_FALSE(ctrl_0->has_focus());
+								CHECK_UNARY(ctrl_1->has_focus());
+							}
+						}
+					}
+
+					SUBCASE("[SceneTree][Control] Manually specified focus prev") {
+						ctrl->set_focus_previous(ctrl->get_path_to(ctrl_0_2));
+						ctrl_0_2->set_focus_previous(ctrl_0_2->get_path_to(ctrl_1_1));
+						ctrl_1_1->set_focus_previous(ctrl_1_1->get_path_to(ctrl_2_0));
+						ctrl_2_0->set_focus_previous(ctrl_2_0->get_path_to(ctrl));
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+							SEND_GUI_ACTION("ui_focus_prev");
+							CHECK_UNARY(ctrl_0_2->has_focus());
+
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+								SEND_GUI_ACTION("ui_focus_prev");
+								CHECK_UNARY(ctrl_1_1->has_focus());
+
+								SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+									SEND_GUI_ACTION("ui_focus_prev");
+									CHECK_UNARY(ctrl_2_0->has_focus());
+
+									SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+										SEND_GUI_ACTION("ui_focus_prev");
+										CHECK_UNARY(ctrl->has_focus());
+									}
+
+									SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+										SEND_GUI_ACTION("ui_focus_next");
+										CHECK_UNARY(ctrl_2_0->has_focus());
+									}
+								}
+
+								SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+									SEND_GUI_ACTION("ui_focus_next");
+									CHECK_UNARY(ctrl_1_2->has_focus());
+								}
+							}
+
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+								SEND_GUI_ACTION("ui_focus_next");
+								CHECK_UNARY(ctrl_0->has_focus());
+							}
+						}
+
+						SUBCASE("[SceneTree][Control] The parent node is not visible") {
+							ctrl_0->hide();
+							REQUIRE_UNARY(ctrl_0_2->is_visible());
+							REQUIRE_UNARY_FALSE(ctrl_0_2->is_visible_in_tree());
+							SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+								SEND_GUI_ACTION("ui_focus_prev");
+								CHECK_UNARY_FALSE(ctrl->has_focus());
+								CHECK_UNARY_FALSE(ctrl_0_2->has_focus());
+								CHECK_UNARY(ctrl_1_2->has_focus());
+							}
+						}
+					}
+				}
+
+				SUBCASE("[SceneTree][Control] Exist hidden control tree") {
+					ctrl_0->hide();
+					REQUIRE_UNARY_FALSE(ctrl_0->is_visible());
+
+					SUBCASE("[SceneTree][Control] Simulate ui_focus_next action") {
+						SEND_GUI_ACTION("ui_focus_next");
+						CHECK_UNARY(ctrl_1->has_focus());
+
+						SUBCASE("[SceneTree][Control] Simulate ui_focus_prev action") {
+							SEND_GUI_ACTION("ui_focus_prev");
+							CHECK_UNARY(ctrl->has_focus());
+						}
+					}
+				}
+
+				memdelete(ctrl_2_2);
+				memdelete(ctrl_2_1);
+				memdelete(ctrl_2_0);
+				memdelete(ctrl_1_2);
+				memdelete(ctrl_1_1);
+				memdelete(ctrl_1_0);
+				memdelete(ctrl_0_2);
+				memdelete(ctrl_0_1);
+				memdelete(ctrl_0_0);
+			}
+
+			memdelete(node_2d_2);
+			memdelete(ctrl_1);
+			memdelete(ctrl_0);
+		}
+	}
+
+	memdelete(ctrl);
+	memdelete(intermediate);
+}
+
 TEST_CASE("[SceneTree][Control] Anchoring") {
 	Control *test_control = memnew(Control);
 	Control *test_child = memnew(Control);
@@ -203,6 +993,38 @@ TEST_CASE("[SceneTree][Control] Anchoring") {
 	memdelete(test_control);
 }
 
+TEST_CASE("[SceneTree][Control] Set position does not cause size side-effects") {
+	Control *test_control = memnew(Control);
+	test_control->set_size(Size2(1, 1));
+	test_control->set_custom_minimum_size(Size2(2, 2));
+	Window *root = SceneTree::get_singleton()->get_root();
+	root->add_child(test_control);
+
+	SUBCASE("Shrinks after setting position and smaller custom minimum size (without keeping offsets)") {
+		test_control->set_position(Point2(10, 10), false);
+		SceneTree::get_singleton()->process(0);
+
+		test_control->set_custom_minimum_size(Size2(0, 0));
+		SceneTree::get_singleton()->process(0);
+		CHECK_MESSAGE(
+				test_control->get_size().is_equal_approx(Vector2(1, 1)),
+				"Should shrink to original size after setting a smaller custom minimum size.");
+	}
+
+	SUBCASE("Shrinks after setting position and smaller custom minimum size (while keeping offsets)") {
+		test_control->set_position(Point2(10, 10), true);
+		SceneTree::get_singleton()->process(0);
+
+		test_control->set_custom_minimum_size(Size2(0, 0));
+		SceneTree::get_singleton()->process(0);
+		CHECK_MESSAGE(
+				test_control->get_size().is_equal_approx(Vector2(1, 1)),
+				"Should shrink to original size after setting a smaller custom minimum size.");
+	}
+
+	memdelete(test_control);
+}
+
 TEST_CASE("[SceneTree][Control] Custom minimum size") {
 	Control *test_control = memnew(Control);
 	test_control->set_custom_minimum_size(Size2(4, 2));
@@ -247,8 +1069,7 @@ TEST_CASE("[SceneTree][Control] Grow direction") {
 	}
 
 	SIGNAL_WATCH(test_control, SNAME("minimum_size_changed"))
-	Array signal_args;
-	signal_args.push_back(Array());
+	Array signal_args = { {} };
 
 	SUBCASE("Horizontal grow direction begin") {
 		test_control->set_h_grow_direction(Control::GROW_DIRECTION_BEGIN);
@@ -321,5 +1142,3 @@ TEST_CASE("[SceneTree][Control] Grow direction") {
 }
 
 } // namespace TestControl
-
-#endif // TEST_CONTROL_H
diff --git a/engine/tests/scene/test_curve.h b/engine/tests/scene/test_curve.h
index 4c179cc5..8f2aacc8 100644
--- a/engine/tests/scene/test_curve.h
+++ b/engine/tests/scene/test_curve.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CURVE_H
-#define TEST_CURVE_H
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/curve.h"
@@ -431,5 +430,3 @@ TEST_CASE("[Curve3D] Linear sampling should return exact value") {
 }
 
 } // namespace TestCurve
-
-#endif // TEST_CURVE_H
diff --git a/engine/tests/scene/test_curve_2d.h b/engine/tests/scene/test_curve_2d.h
index 12486326..6936d316 100644
--- a/engine/tests/scene/test_curve_2d.h
+++ b/engine/tests/scene/test_curve_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CURVE_2D_H
-#define TEST_CURVE_2D_H
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/curve.h"
@@ -285,5 +284,3 @@ TEST_CASE("[Curve2D] Even length tessellation") {
 }
 
 } // namespace TestCurve2D
-
-#endif // TEST_CURVE_2D_H
diff --git a/engine/tests/scene/test_curve_3d.h b/engine/tests/scene/test_curve_3d.h
index 2e60a9c6..69ae94d9 100644
--- a/engine/tests/scene/test_curve_3d.h
+++ b/engine/tests/scene/test_curve_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_CURVE_3D_H
-#define TEST_CURVE_3D_H
+#pragma once
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/curve.h"
@@ -283,5 +282,3 @@ TEST_CASE("[Curve3D] Even length tessellation") {
 }
 
 } // namespace TestCurve3D
-
-#endif // TEST_CURVE_3D_H
diff --git a/engine/tests/scene/test_fontfile.h b/engine/tests/scene/test_fontfile.h
index 8c9ba6d6..27b1baf4 100644
--- a/engine/tests/scene/test_fontfile.h
+++ b/engine/tests/scene/test_fontfile.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_FONTFILE_H
-#define TEST_FONTFILE_H
+#pragma once
 
 #include "modules/modules_enabled.gen.h"
 
@@ -38,6 +37,54 @@
 
 namespace TestFontfile {
 
+TEST_CASE("[FontFile] Load Dynamic Font - getters") {
+#ifdef MODULE_FREETYPE_ENABLED
+	String test_dynamic_font = "thirdparty/fonts/NotoSansHebrew_Regular.woff2";
+	Ref<FontFile> ff;
+	ff.instantiate();
+	CHECK(ff->load_dynamic_font(test_dynamic_font) == OK);
+
+	// These properties come from the font file itself.
+	CHECK(ff->get_font_name() == "Noto Sans Hebrew");
+	CHECK(ff->get_font_style_name() == "Regular");
+	CHECK(ff->get_font_weight() == 400);
+	CHECK(ff->get_font_stretch() == 100);
+	CHECK(ff->get_opentype_features() == Dictionary());
+
+	Dictionary expected_ot_name_strings;
+	Dictionary en_dict;
+	en_dict["copyright"] = "Copyright 2022 The Noto Project Authors (https://github.com/notofonts/hebrew)";
+	en_dict["family_name"] = "Noto Sans Hebrew";
+	en_dict["subfamily_name"] = "Regular";
+	en_dict["full_name"] = "Noto Sans Hebrew Regular";
+	en_dict["unique_identifier"] = "2.003;GOOG;NotoSansHebrew-Regular";
+	en_dict["version"] = "Version 2.003";
+	en_dict["postscript_name"] = "NotoSansHebrew-Regular";
+	en_dict["trademark"] = "Noto is a trademark of Google Inc.";
+	en_dict["license"] = "This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is available with a FAQ at: https://scripts.sil.org/OFL";
+	en_dict["license_url"] = "https://scripts.sil.org/OFL";
+	en_dict["designer"] = "Monotype Design Team";
+	en_dict["designer_url"] = "http://www.monotype.com/studio";
+	en_dict["description"] = "Designed by Monotype design team.";
+	en_dict["manufacturer"] = "Monotype Imaging Inc.";
+	en_dict["vendor_url"] = "http://www.google.com/get/noto/";
+	expected_ot_name_strings["en"] = en_dict;
+	CHECK(ff->get_ot_name_strings() == expected_ot_name_strings);
+
+	// These are dependent on size and potentially other state. Act as regression tests based of arbitrary small size 10 and large size 100.
+	CHECK(ff->get_height(10) == doctest::Approx((real_t)14));
+	CHECK(ff->get_ascent(10) == doctest::Approx((real_t)11));
+	CHECK(ff->get_descent(10) == doctest::Approx((real_t)3));
+	CHECK(ff->get_underline_position(10) == doctest::Approx((real_t)1.25));
+	CHECK(ff->get_underline_thickness(10) == doctest::Approx((real_t)0.5));
+	CHECK(ff->get_height(100) == doctest::Approx((real_t)137));
+	CHECK(ff->get_ascent(100) == doctest::Approx((real_t)107));
+	CHECK(ff->get_descent(100) == doctest::Approx((real_t)30));
+	CHECK(ff->get_underline_position(100) == doctest::Approx((real_t)12.5));
+	CHECK(ff->get_underline_thickness(100) == doctest::Approx((real_t)5));
+#endif
+}
+
 TEST_CASE("[FontFile] Create font file and check data") {
 	// Create test instance.
 	Ref<FontFile> font_file;
@@ -78,5 +125,3 @@ TEST_CASE("[FontFile] Create font file and check data") {
 }
 
 } // namespace TestFontfile
-
-#endif // TEST_FONTFILE_H
diff --git a/engine/tests/scene/test_gltf_document.h b/engine/tests/scene/test_gltf_document.h
index 28d160d5..dfaf0759 100644
--- a/engine/tests/scene/test_gltf_document.h
+++ b/engine/tests/scene/test_gltf_document.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GLTF_DOCUMENT_H
-#define TEST_GLTF_DOCUMENT_H
+#pragma once
 
 #include "modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.h"
 #include "modules/gltf/gltf_document.h"
@@ -246,5 +245,3 @@ TEST_CASE("[SceneTree][GLTFDocument] Load suzanne.glb") {
 }
 
 } // namespace TestGLTFDocument
-
-#endif // TEST_GLTF_DOCUMENT_H
diff --git a/engine/tests/scene/test_gradient.h b/engine/tests/scene/test_gradient.h
index d6128732..e8a69792 100644
--- a/engine/tests/scene/test_gradient.h
+++ b/engine/tests/scene/test_gradient.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GRADIENT_H
-#define TEST_GRADIENT_H
+#pragma once
 
 #include "scene/resources/gradient.h"
 
@@ -143,5 +142,3 @@ TEST_CASE("[Gradient] Custom gradient (points specified out-of-order)") {
 			"Custom out-of-order gradient should return the expected interpolated value at offset 0.1 after removing point at index 0.");
 }
 } // namespace TestGradient
-
-#endif // TEST_GRADIENT_H
diff --git a/engine/tests/scene/test_gradient_texture.h b/engine/tests/scene/test_gradient_texture.h
index 16a92fbe..c6e52466 100644
--- a/engine/tests/scene/test_gradient_texture.h
+++ b/engine/tests/scene/test_gradient_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GRADIENT_TEXTURE_H
-#define TEST_GRADIENT_TEXTURE_H
+#pragma once
 
 #include "scene/resources/gradient_texture.h"
 
@@ -83,5 +82,3 @@ TEST_CASE("[SceneTree][GradientTexture2D] Create GradientTexture2D") {
 }
 
 } //namespace TestGradientTexture
-
-#endif // TEST_GRADIENT_TEXTURE_H
diff --git a/engine/tests/scene/test_graph_node.h b/engine/tests/scene/test_graph_node.h
index 7973ac14..ca507bb2 100644
--- a/engine/tests/scene/test_graph_node.h
+++ b/engine/tests/scene/test_graph_node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_GRAPH_NODE_H
-#define TEST_GRAPH_NODE_H
+#pragma once
 
 #include "scene/gui/graph_node.h"
 #include "scene/main/window.h"
@@ -57,5 +56,3 @@ TEST_CASE("[GraphNode][SceneTree]") {
 }
 
 } // namespace TestGraphNode
-
-#endif // TEST_GRAPH_NODE_H
diff --git a/engine/tests/scene/test_height_map_shape_3d.h b/engine/tests/scene/test_height_map_shape_3d.h
index 60a8db4e..92a63789 100644
--- a/engine/tests/scene/test_height_map_shape_3d.h
+++ b/engine/tests/scene/test_height_map_shape_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_HEIGHT_MAP_SHAPE_3D_H
-#define TEST_HEIGHT_MAP_SHAPE_3D_H
+#pragma once
 
 #include "scene/resources/3d/height_map_shape_3d.h"
 #include "scene/resources/image_texture.h"
@@ -118,5 +117,3 @@ TEST_CASE("[SceneTree][HeightMapShape3D] update_map_data_from_image") {
 }
 
 } // namespace TestHeightMapShape3D
-
-#endif // TEST_HEIGHT_MAP_SHAPE_3D_H
diff --git a/engine/tests/scene/test_image_texture.h b/engine/tests/scene/test_image_texture.h
index c9282165..c1c53b89 100644
--- a/engine/tests/scene/test_image_texture.h
+++ b/engine/tests/scene/test_image_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_IMAGE_TEXTURE_H
-#define TEST_IMAGE_TEXTURE_H
+#pragma once
 
 #include "core/io/image.h"
 #include "scene/resources/image_texture.h"
@@ -107,5 +106,3 @@ TEST_CASE("[SceneTree][ImageTexture] set_path") {
 }
 
 } //namespace TestImageTexture
-
-#endif // TEST_IMAGE_TEXTURE_H
diff --git a/engine/tests/scene/test_image_texture_3d.h b/engine/tests/scene/test_image_texture_3d.h
index f2a7abcf..2ec77dee 100644
--- a/engine/tests/scene/test_image_texture_3d.h
+++ b/engine/tests/scene/test_image_texture_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_IMAGE_TEXTURE_3D_H
-#define TEST_IMAGE_TEXTURE_3D_H
+#pragma once
 
 #include "core/io/image.h"
 #include "scene/resources/image_texture.h"
@@ -97,5 +96,3 @@ TEST_CASE("[SceneTree][ImageTexture3D] set_path") {
 }
 
 } //namespace TestImageTexture3D
-
-#endif // TEST_IMAGE_TEXTURE_3D_H
diff --git a/engine/tests/scene/test_instance_placeholder.h b/engine/tests/scene/test_instance_placeholder.h
index 17f2151d..aa29c228 100644
--- a/engine/tests/scene/test_instance_placeholder.h
+++ b/engine/tests/scene/test_instance_placeholder.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_INSTANCE_PLACEHOLDER_H
-#define TEST_INSTANCE_PLACEHOLDER_H
+#pragma once
 
 #include "scene/main/instance_placeholder.h"
 #include "scene/resources/packed_scene.h"
@@ -503,10 +502,11 @@ TEST_CASE("[SceneTree][InstancePlaceholder] Instance a PackedScene containing an
 	REQUIRE(final_node->get_reference_property().identity_compare(instanced_main_node->get_child(1, true)));
 	Array final_array = final_node->get_reference_array_property();
 	REQUIRE(final_array.size() == 3);
-	Array wanted_node_array;
-	wanted_node_array.push_back(instanced_main_node->get_child(2, true)); // ExternalArrayMember
-	wanted_node_array.push_back(final_node->get_child(1, true)); // ArrayRef1
-	wanted_node_array.push_back(final_node->get_child(2, true)); // ArrayRef2
+	Array wanted_node_array = {
+		instanced_main_node->get_child(2, true), // ExternalArrayMember
+		final_node->get_child(1, true), // ArrayRef1
+		final_node->get_child(2, true) // ArrayRef2
+	};
 
 	// Iterate over all nodes, since the ordering is not guaranteed.
 	for (int i = 0; i < wanted_node_array.size(); i++) {
@@ -530,5 +530,3 @@ TEST_CASE("[SceneTree][InstancePlaceholder] Instance a PackedScene containing an
 #endif // TOOLS_ENABLED
 
 } //namespace TestInstancePlaceholder
-
-#endif // TEST_INSTANCE_PLACEHOLDER_H
diff --git a/engine/tests/scene/test_navigation_agent_2d.h b/engine/tests/scene/test_navigation_agent_2d.h
index e20435d4..929e8127 100644
--- a/engine/tests/scene/test_navigation_agent_2d.h
+++ b/engine/tests/scene/test_navigation_agent_2d.h
@@ -28,10 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_AGENT_2D_H
-#define TEST_NAVIGATION_AGENT_2D_H
+#pragma once
 
-#include "scene/2d/navigation_agent_2d.h"
+#include "scene/2d/navigation/navigation_agent_2d.h"
 #include "scene/2d/node_2d.h"
 #include "scene/main/window.h"
 #include "scene/resources/world_2d.h"
@@ -40,7 +39,7 @@
 
 namespace TestNavigationAgent2D {
 
-TEST_SUITE("[Navigation]") {
+TEST_SUITE("[Navigation2D]") {
 	TEST_CASE("[SceneTree][NavigationAgent2D] New agent should have valid RID") {
 		NavigationAgent2D *agent_node = memnew(NavigationAgent2D);
 		CHECK(agent_node->get_rid().is_valid());
@@ -68,5 +67,3 @@ TEST_SUITE("[Navigation]") {
 }
 
 } //namespace TestNavigationAgent2D
-
-#endif // TEST_NAVIGATION_AGENT_2D_H
diff --git a/engine/tests/scene/test_navigation_agent_3d.h b/engine/tests/scene/test_navigation_agent_3d.h
index f240279b..649bf612 100644
--- a/engine/tests/scene/test_navigation_agent_3d.h
+++ b/engine/tests/scene/test_navigation_agent_3d.h
@@ -28,10 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_AGENT_3D_H
-#define TEST_NAVIGATION_AGENT_3D_H
+#pragma once
 
-#include "scene/3d/navigation_agent_3d.h"
+#include "scene/3d/navigation/navigation_agent_3d.h"
 #include "scene/3d/node_3d.h"
 #include "scene/main/window.h"
 
@@ -39,7 +38,7 @@
 
 namespace TestNavigationAgent3D {
 
-TEST_SUITE("[Navigation]") {
+TEST_SUITE("[Navigation3D]") {
 	TEST_CASE("[SceneTree][NavigationAgent3D] New agent should have valid RID") {
 		NavigationAgent3D *agent_node = memnew(NavigationAgent3D);
 		CHECK(agent_node->get_rid().is_valid());
@@ -67,5 +66,3 @@ TEST_SUITE("[Navigation]") {
 }
 
 } //namespace TestNavigationAgent3D
-
-#endif // TEST_NAVIGATION_AGENT_3D_H
diff --git a/engine/tests/scene/test_navigation_obstacle_2d.h b/engine/tests/scene/test_navigation_obstacle_2d.h
index 97d28e0a..8c17a696 100644
--- a/engine/tests/scene/test_navigation_obstacle_2d.h
+++ b/engine/tests/scene/test_navigation_obstacle_2d.h
@@ -28,17 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_OBSTACLE_2D_H
-#define TEST_NAVIGATION_OBSTACLE_2D_H
+#pragma once
 
-#include "scene/2d/navigation_obstacle_2d.h"
+#include "scene/2d/navigation/navigation_obstacle_2d.h"
 #include "scene/main/window.h"
 
 #include "tests/test_macros.h"
 
 namespace TestNavigationObstacle2D {
 
-TEST_SUITE("[Navigation]") {
+TEST_SUITE("[Navigation2D]") {
 	TEST_CASE("[SceneTree][NavigationObstacle2D] New obstacle should have valid RID") {
 		NavigationObstacle2D *obstacle_node = memnew(NavigationObstacle2D);
 		CHECK(obstacle_node->get_rid().is_valid());
@@ -65,5 +64,3 @@ TEST_SUITE("[Navigation]") {
 }
 
 } //namespace TestNavigationObstacle2D
-
-#endif // TEST_NAVIGATION_OBSTACLE_2D_H
diff --git a/engine/tests/scene/test_navigation_obstacle_3d.h b/engine/tests/scene/test_navigation_obstacle_3d.h
index 8769f4fb..c2d9c1ce 100644
--- a/engine/tests/scene/test_navigation_obstacle_3d.h
+++ b/engine/tests/scene/test_navigation_obstacle_3d.h
@@ -28,17 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_OBSTACLE_3D_H
-#define TEST_NAVIGATION_OBSTACLE_3D_H
+#pragma once
 
-#include "scene/3d/navigation_obstacle_3d.h"
+#include "scene/3d/navigation/navigation_obstacle_3d.h"
 #include "scene/main/window.h"
 
 #include "tests/test_macros.h"
 
 namespace TestNavigationObstacle3D {
 
-TEST_SUITE("[Navigation]") {
+TEST_SUITE("[Navigation3D]") {
 	TEST_CASE("[SceneTree][NavigationObstacle3D] New obstacle should have valid RID") {
 		NavigationObstacle3D *obstacle_node = memnew(NavigationObstacle3D);
 		CHECK(obstacle_node->get_rid().is_valid());
@@ -65,5 +64,3 @@ TEST_SUITE("[Navigation]") {
 }
 
 } //namespace TestNavigationObstacle3D
-
-#endif // TEST_NAVIGATION_OBSTACLE_3D_H
diff --git a/engine/tests/scene/test_navigation_region_2d.h b/engine/tests/scene/test_navigation_region_2d.h
index fcb5aeac..8a76215a 100644
--- a/engine/tests/scene/test_navigation_region_2d.h
+++ b/engine/tests/scene/test_navigation_region_2d.h
@@ -28,17 +28,16 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_REGION_2D_H
-#define TEST_NAVIGATION_REGION_2D_H
+#pragma once
 
-#include "scene/2d/navigation_region_2d.h"
+#include "scene/2d/navigation/navigation_region_2d.h"
 #include "scene/main/window.h"
 
 #include "tests/test_macros.h"
 
 namespace TestNavigationRegion2D {
 
-TEST_SUITE("[Navigation]") {
+TEST_SUITE("[Navigation2D]") {
 	TEST_CASE("[SceneTree][NavigationRegion2D] New region should have valid RID") {
 		NavigationRegion2D *region_node = memnew(NavigationRegion2D);
 		CHECK(region_node->get_rid().is_valid());
@@ -47,5 +46,3 @@ TEST_SUITE("[Navigation]") {
 }
 
 } //namespace TestNavigationRegion2D
-
-#endif // TEST_NAVIGATION_REGION_2D_H
diff --git a/engine/tests/scene/test_navigation_region_3d.h b/engine/tests/scene/test_navigation_region_3d.h
index f3d7f273..1a5777c5 100644
--- a/engine/tests/scene/test_navigation_region_3d.h
+++ b/engine/tests/scene/test_navigation_region_3d.h
@@ -28,11 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_REGION_3D_H
-#define TEST_NAVIGATION_REGION_3D_H
+#pragma once
 
 #include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/navigation_region_3d.h"
+#include "scene/3d/navigation/navigation_region_3d.h"
 #include "scene/main/window.h"
 #include "scene/resources/3d/primitive_meshes.h"
 
@@ -40,7 +39,7 @@
 
 namespace TestNavigationRegion3D {
 
-TEST_SUITE("[Navigation]") {
+TEST_SUITE("[Navigation3D]") {
 	TEST_CASE("[SceneTree][NavigationRegion3D] New region should have valid RID") {
 		NavigationRegion3D *region_node = memnew(NavigationRegion3D);
 		CHECK(region_node->get_rid().is_valid());
@@ -80,5 +79,3 @@ TEST_SUITE("[Navigation]") {
 }
 
 } //namespace TestNavigationRegion3D
-
-#endif // TEST_NAVIGATION_REGION_3D_H
diff --git a/engine/tests/scene/test_node.h b/engine/tests/scene/test_node.h
index e387c73f..85a7e1f9 100644
--- a/engine/tests/scene/test_node.h
+++ b/engine/tests/scene/test_node.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NODE_H
-#define TEST_NODE_H
+#pragma once
 
 #include "core/object/class_db.h"
 #include "scene/main/node.h"
@@ -893,5 +892,3 @@ TEST_CASE("[SceneTree][Node] Test the process priority") {
 }
 
 } // namespace TestNode
-
-#endif // TEST_NODE_H
diff --git a/engine/tests/scene/test_node_2d.h b/engine/tests/scene/test_node_2d.h
index e8e7b288..21f9ea13 100644
--- a/engine/tests/scene/test_node_2d.h
+++ b/engine/tests/scene/test_node_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NODE_2D_H
-#define TEST_NODE_2D_H
+#pragma once
 
 #include "scene/2d/node_2d.h"
 #include "scene/main/window.h"
@@ -212,5 +211,3 @@ TEST_CASE("[SceneTree][Node2D] Utility methods") {
 }
 
 } // namespace TestNode2D
-
-#endif // TEST_NODE_2D_H
diff --git a/engine/tests/scene/test_option_button.h b/engine/tests/scene/test_option_button.h
index 56c1c7d6..59966b7d 100644
--- a/engine/tests/scene/test_option_button.h
+++ b/engine/tests/scene/test_option_button.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_OPTION_BUTTON_H
-#define TEST_OPTION_BUTTON_H
+#pragma once
 
 #include "scene/gui/option_button.h"
 
@@ -83,7 +82,7 @@ TEST_CASE("[SceneTree][OptionButton] Single item") {
 	memdelete(test_opt);
 }
 
-TEST_CASE("[SceneTree][OptionButton] Complex structure") {
+TEST_CASE("[SceneTree][OptionButton] Many items") {
 	OptionButton *test_opt = memnew(OptionButton);
 
 	SUBCASE("Creating a complex structure and checking getters") {
@@ -128,9 +127,32 @@ TEST_CASE("[SceneTree][OptionButton] Complex structure") {
 		CHECK(test_opt->get_item_count() == 1);
 	}
 
+	SUBCASE("Getters and setters not related to structure") {
+		test_opt->add_item("regular", 2019);
+
+		Ref<Texture2D> test_icon = memnew(Texture2D);
+		test_opt->add_icon_item(test_icon, "icon", 3092);
+
+		// item_text.
+		test_opt->set_item_text(0, "example text");
+		CHECK(test_opt->get_item_text(0) == "example text");
+
+		// item_metadata.
+		Dictionary m;
+		m["bool"] = true;
+		m["String"] = "yes";
+		test_opt->set_item_metadata(1, m);
+		CHECK(test_opt->get_item_metadata(1) == m);
+
+		// item_tooltip.
+		test_opt->set_item_tooltip(0, "tooltip guide");
+		CHECK(test_opt->get_item_tooltip(0) == "tooltip guide");
+
+		test_opt->remove_item(1);
+		test_opt->remove_item(0);
+	}
+
 	memdelete(test_opt);
 }
 
 } // namespace TestOptionButton
-
-#endif // TEST_OPTION_BUTTON_H
diff --git a/engine/tests/scene/test_packed_scene.h b/engine/tests/scene/test_packed_scene.h
index df23c251..b3cea7b7 100644
--- a/engine/tests/scene/test_packed_scene.h
+++ b/engine/tests/scene/test_packed_scene.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PACKED_SCENE_H
-#define TEST_PACKED_SCENE_H
+#pragma once
 
 #include "scene/resources/packed_scene.h"
 
@@ -282,5 +281,3 @@ TEST_CASE("[PackedScene] Recreate State") {
 }
 
 } // namespace TestPackedScene
-
-#endif // TEST_PACKED_SCENE_H
diff --git a/engine/tests/scene/test_parallax_2d.h b/engine/tests/scene/test_parallax_2d.h
index 2fdbf09e..0396db4c 100644
--- a/engine/tests/scene/test_parallax_2d.h
+++ b/engine/tests/scene/test_parallax_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PARALLAX_2D_H
-#define TEST_PARALLAX_2D_H
+#pragma once
 
 #include "scene/2d/parallax_2d.h"
 #include "tests/test_macros.h"
@@ -127,5 +126,3 @@ TEST_CASE("[SceneTree][Parallax2D] Ignore Camera Scroll") {
 }
 
 } // namespace TestParallax2D
-
-#endif // TEST_PARALLAX_2D_H
diff --git a/engine/tests/scene/test_path_2d.h b/engine/tests/scene/test_path_2d.h
index 4703bfa3..0095d44a 100644
--- a/engine/tests/scene/test_path_2d.h
+++ b/engine/tests/scene/test_path_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PATH_2D_H
-#define TEST_PATH_2D_H
+#pragma once
 
 #include "scene/2d/path_2d.h"
 
@@ -105,5 +104,3 @@ TEST_CASE("[SceneTree][Path2D] Curve setter and getter") {
 }
 
 } // namespace TestPath2D
-
-#endif // TEST_PATH_2D_H
diff --git a/engine/tests/scene/test_path_3d.h b/engine/tests/scene/test_path_3d.h
index 70c7099d..835a2ca4 100644
--- a/engine/tests/scene/test_path_3d.h
+++ b/engine/tests/scene/test_path_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PATH_3D_H
-#define TEST_PATH_3D_H
+#pragma once
 
 #include "scene/3d/path_3d.h"
 
@@ -80,5 +79,3 @@ TEST_CASE("[Path3D] Curve setter and getter") {
 }
 
 } // namespace TestPath3D
-
-#endif // TEST_PATH_3D_H
diff --git a/engine/tests/scene/test_path_follow_2d.h b/engine/tests/scene/test_path_follow_2d.h
index 45ae0dff..56cc24a4 100644
--- a/engine/tests/scene/test_path_follow_2d.h
+++ b/engine/tests/scene/test_path_follow_2d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PATH_FOLLOW_2D_H
-#define TEST_PATH_FOLLOW_2D_H
+#pragma once
 
 #include "scene/2d/path_2d.h"
 #include "scene/main/window.h"
@@ -254,5 +253,3 @@ TEST_CASE("[SceneTree][PathFollow2D] Progress out of range") {
 	memdelete(path);
 }
 } // namespace TestPathFollow2D
-
-#endif // TEST_PATH_FOLLOW_2D_H
diff --git a/engine/tests/scene/test_path_follow_3d.h b/engine/tests/scene/test_path_follow_3d.h
index 6a384bec..8c39f936 100644
--- a/engine/tests/scene/test_path_follow_3d.h
+++ b/engine/tests/scene/test_path_follow_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PATH_FOLLOW_3D_H
-#define TEST_PATH_FOLLOW_3D_H
+#pragma once
 
 #include "scene/3d/path_3d.h"
 #include "scene/main/window.h"
@@ -46,7 +45,8 @@ bool is_equal_approx(const Vector3 &p_a, const Vector3 &p_b) {
 }
 
 TEST_CASE("[SceneTree][PathFollow3D] Sampling with progress ratio") {
-	Ref<Curve3D> curve = memnew(Curve3D);
+	Ref<Curve3D> curve;
+	curve.instantiate();
 	curve->add_point(Vector3(0, 0, 0));
 	curve->add_point(Vector3(100, 0, 0));
 	curve->add_point(Vector3(100, 100, 0));
@@ -90,7 +90,8 @@ TEST_CASE("[SceneTree][PathFollow3D] Sampling with progress ratio") {
 }
 
 TEST_CASE("[SceneTree][PathFollow3D] Sampling with progress") {
-	Ref<Curve3D> curve = memnew(Curve3D);
+	Ref<Curve3D> curve;
+	curve.instantiate();
 	curve->add_point(Vector3(0, 0, 0));
 	curve->add_point(Vector3(100, 0, 0));
 	curve->add_point(Vector3(100, 100, 0));
@@ -134,7 +135,8 @@ TEST_CASE("[SceneTree][PathFollow3D] Sampling with progress") {
 }
 
 TEST_CASE("[SceneTree][PathFollow3D] Removal of a point in curve") {
-	Ref<Curve3D> curve = memnew(Curve3D);
+	Ref<Curve3D> curve;
+	curve.instantiate();
 	curve->add_point(Vector3(0, 0, 0));
 	curve->add_point(Vector3(100, 0, 0));
 	curve->add_point(Vector3(100, 100, 0));
@@ -158,7 +160,8 @@ TEST_CASE("[SceneTree][PathFollow3D] Removal of a point in curve") {
 }
 
 TEST_CASE("[SceneTree][PathFollow3D] Progress ratio out of range") {
-	Ref<Curve3D> curve = memnew(Curve3D);
+	Ref<Curve3D> curve;
+	curve.instantiate();
 	curve->add_point(Vector3(0, 0, 0));
 	curve->add_point(Vector3(100, 0, 0));
 	Path3D *path = memnew(Path3D);
@@ -195,7 +198,8 @@ TEST_CASE("[SceneTree][PathFollow3D] Progress ratio out of range") {
 }
 
 TEST_CASE("[SceneTree][PathFollow3D] Progress out of range") {
-	Ref<Curve3D> curve = memnew(Curve3D);
+	Ref<Curve3D> curve;
+	curve.instantiate();
 	curve->add_point(Vector3(0, 0, 0));
 	curve->add_point(Vector3(100, 0, 0));
 	Path3D *path = memnew(Path3D);
@@ -233,7 +237,8 @@ TEST_CASE("[SceneTree][PathFollow3D] Progress out of range") {
 
 TEST_CASE("[SceneTree][PathFollow3D] Calculate forward vector") {
 	const real_t dist_cube_100 = 100 * Math::sqrt(3.0);
-	Ref<Curve3D> curve = memnew(Curve3D);
+	Ref<Curve3D> curve;
+	curve.instantiate();
 	curve->add_point(Vector3(0, 0, 0));
 	curve->add_point(Vector3(100, 0, 0));
 	curve->add_point(Vector3(200, 100, -100));
@@ -284,6 +289,52 @@ TEST_CASE("[SceneTree][PathFollow3D] Calculate forward vector") {
 
 	memdelete(path);
 }
-} // namespace TestPathFollow3D
 
-#endif // TEST_PATH_FOLLOW_3D_H
+TEST_CASE("[SceneTree][PathFollow3D] Calculate forward vector with degenerate curves") {
+	Ref<Curve3D> curve;
+	curve.instantiate();
+	curve->add_point(Vector3(0, 0, 1), Vector3(), Vector3(1, 0, 0));
+	curve->add_point(Vector3(1, 0, 0), Vector3(0, 0, 0), Vector3(0, 0, 0));
+	curve->add_point(Vector3(0, 0, -1), Vector3(1, 0, 0), Vector3(-1, 0, 0));
+	curve->add_point(Vector3(-1, 0, 0), Vector3(0, 0, 0), Vector3(0, 0, 0));
+	curve->add_point(Vector3(0, 0, 1), Vector3(-1, 0, 0), Vector3());
+	Path3D *path = memnew(Path3D);
+	path->set_curve(curve);
+	PathFollow3D *path_follow_3d = memnew(PathFollow3D);
+	path->add_child(path_follow_3d);
+	SceneTree::get_singleton()->get_root()->add_child(path);
+
+	path_follow_3d->set_loop(false);
+	path_follow_3d->set_rotation_mode(PathFollow3D::RotationMode::ROTATION_ORIENTED);
+
+	path_follow_3d->set_progress_ratio(0.00);
+	CHECK(is_equal_approx(Vector3(-1, 0, 0), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(0.25);
+	CHECK(is_equal_approx(Vector3(0, 0, 1), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(0.50);
+	CHECK(is_equal_approx(Vector3(1, 0, 0), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(0.75);
+	CHECK(is_equal_approx(Vector3(0, 0, -1), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(1.00);
+	CHECK(is_equal_approx(Vector3(-1, 0, 0), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(0.125);
+	CHECK(is_equal_approx(Vector3(-0.688375, 0, 0.725355), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(0.375);
+	CHECK(is_equal_approx(Vector3(0.688375, 0, 0.725355), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(0.625);
+	CHECK(is_equal_approx(Vector3(0.688375, 0, -0.725355), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	path_follow_3d->set_progress_ratio(0.875);
+	CHECK(is_equal_approx(Vector3(-0.688375, 0, -0.725355), path_follow_3d->get_transform().get_basis().get_column(2)));
+
+	memdelete(path);
+}
+
+} // namespace TestPathFollow3D
diff --git a/engine/tests/scene/test_physics_material.h b/engine/tests/scene/test_physics_material.h
index a078166f..a7a1a5c9 100644
--- a/engine/tests/scene/test_physics_material.h
+++ b/engine/tests/scene/test_physics_material.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PHYSICS_MATERIAL_H
-#define TEST_PHYSICS_MATERIAL_H
+#pragma once
 
 #include "scene/resources/physics_material.h"
 #include "tests/test_macros.h"
@@ -103,5 +102,3 @@ TEST_CASE("[Physics_material] Absorbent") {
 }
 
 } // namespace TestPhysics_material
-
-#endif // TEST_PHYSICS_MATERIAL_H
diff --git a/engine/tests/scene/test_primitives.h b/engine/tests/scene/test_primitives.h
index 7426a9ce..ecc49317 100644
--- a/engine/tests/scene/test_primitives.h
+++ b/engine/tests/scene/test_primitives.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_PRIMITIVES_H
-#define TEST_PRIMITIVES_H
+#pragma once
 
 #include "scene/resources/3d/primitive_meshes.h"
 
@@ -864,5 +863,3 @@ TEST_CASE("[SceneTree][Primitive][Text] Text Primitive") {
 }
 
 } // namespace TestPrimitives
-
-#endif // TEST_PRIMITIVES_H
diff --git a/engine/tests/scene/test_skeleton_3d.h b/engine/tests/scene/test_skeleton_3d.h
index b5cf49c4..047a9ce8 100644
--- a/engine/tests/scene/test_skeleton_3d.h
+++ b/engine/tests/scene/test_skeleton_3d.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_SKELETON_3D_H
-#define TEST_SKELETON_3D_H
+#pragma once
 
 #include "tests/test_macros.h"
 
@@ -74,5 +73,3 @@ TEST_CASE("[Skeleton3D] Test per-bone meta") {
 	memdelete(skeleton);
 }
 } // namespace TestSkeleton3D
-
-#endif // TEST_SKELETON_3D_H
diff --git a/engine/tests/scene/test_sky.h b/engine/tests/scene/test_sky.h
index dd48172b..b2965c83 100644
--- a/engine/tests/scene/test_sky.h
+++ b/engine/tests/scene/test_sky.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_SKY_H
-#define TEST_SKY_H
+#pragma once
 
 #include "scene/resources/sky.h"
 
@@ -218,5 +217,3 @@ TEST_CASE("[SceneTree][Sky] RID generation") {
 }
 
 } // namespace TestSky
-
-#endif // TEST_SKY_H
diff --git a/engine/tests/scene/test_split_container.h b/engine/tests/scene/test_split_container.h
index 183ab216..b2ab1006 100644
--- a/engine/tests/scene/test_split_container.h
+++ b/engine/tests/scene/test_split_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_SPLIT_CONTAINER_H
-#define TEST_SPLIT_CONTAINER_H
+#pragma once
 
 #include "scene/gui/split_container.h"
 #include "scene/main/window.h"
@@ -1170,9 +1169,7 @@ TEST_CASE("[SceneTree][SplitContainer] Two children") {
 	SUBCASE("[SplitContainer] Drag") {
 		SUBCASE("[SplitContainer] Vertical, no expand flags") {
 			SIGNAL_WATCH(split_container, "dragged");
-			Array signal_args;
-			signal_args.push_back(Array());
-			((Array)signal_args[0]).push_back(0);
+			Array signal_args = { { 0 } };
 
 			split_container->set_vertical(true);
 			Point2 mouse_offset = Point2(1, 1);
@@ -1476,5 +1473,3 @@ TEST_CASE("[SceneTree][SplitContainer] Two children") {
 }
 
 } // namespace TestSplitContainer
-
-#endif // TEST_SPLIT_CONTAINER_H
diff --git a/engine/tests/scene/test_sprite_frames.h b/engine/tests/scene/test_sprite_frames.h
index 55854b90..db7a44eb 100644
--- a/engine/tests/scene/test_sprite_frames.h
+++ b/engine/tests/scene/test_sprite_frames.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_SPRITE_FRAMES_H
-#define TEST_SPRITE_FRAMES_H
+#pragma once
 
 #include "scene/resources/sprite_frames.h"
 
@@ -244,5 +243,3 @@ TEST_CASE("[SpriteFrames] Frame addition, removal, and retrieval") {
 			"Clears frames.");
 }
 } // namespace TestSpriteFrames
-
-#endif // TEST_SPRITE_FRAMES_H
diff --git a/engine/tests/scene/test_style_box_texture.h b/engine/tests/scene/test_style_box_texture.h
index cc5be4b2..7dd0bcc4 100644
--- a/engine/tests/scene/test_style_box_texture.h
+++ b/engine/tests/scene/test_style_box_texture.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_STYLE_BOX_TEXTURE_H
-#define TEST_STYLE_BOX_TEXTURE_H
+#pragma once
 
 #include "scene/resources/style_box_texture.h"
 
@@ -190,5 +189,3 @@ TEST_CASE("[StyleBoxTexture] get_draw_rect") {
 }
 
 } // namespace TestStyleBoxTexture
-
-#endif // TEST_STYLE_BOX_TEXTURE_H
diff --git a/engine/tests/scene/test_tab_bar.h b/engine/tests/scene/test_tab_bar.h
index 147513bb..b4a13c4d 100644
--- a/engine/tests/scene/test_tab_bar.h
+++ b/engine/tests/scene/test_tab_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TAB_BAR_H
-#define TEST_TAB_BAR_H
+#pragma once
 
 #include "scene/gui/tab_bar.h"
 #include "scene/main/window.h"
@@ -860,5 +859,3 @@ TEST_CASE("[SceneTree][TabBar] layout and offset") {
 // FIXME: Add tests for mouse click, keyboard navigation, and drag and drop.
 
 } // namespace TestTabBar
-
-#endif // TEST_TAB_BAR_H
diff --git a/engine/tests/scene/test_tab_container.h b/engine/tests/scene/test_tab_container.h
index 2a211a2c..a56bc5bc 100644
--- a/engine/tests/scene/test_tab_container.h
+++ b/engine/tests/scene/test_tab_container.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TAB_CONTAINER_H
-#define TEST_TAB_CONTAINER_H
+#pragma once
 
 #include "scene/gui/tab_container.h"
 
@@ -667,5 +666,3 @@ TEST_CASE("[SceneTree][TabContainer] layout and offset") {
 // FIXME: Add tests for mouse click, keyboard navigation, and drag and drop.
 
 } // namespace TestTabContainer
-
-#endif // TEST_TAB_CONTAINER_H
diff --git a/engine/tests/scene/test_text_edit.h b/engine/tests/scene/test_text_edit.h
index d7192def..f6cce65b 100644
--- a/engine/tests/scene/test_text_edit.h
+++ b/engine/tests/scene/test_text_edit.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TEXT_EDIT_H
-#define TEST_TEXT_EDIT_H
+#pragma once
 
 #include "scene/gui/text_edit.h"
 
@@ -55,13 +54,14 @@ static inline Array reverse_nested(Array array) {
 }
 
 TEST_CASE("[SceneTree][TextEdit] text entry") {
+#if !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	SceneTree::get_singleton()->get_root()->set_physics_object_picking(false);
+#endif // !defined(PHYSICS_2D_DISABLED) || !defined(PHYSICS_3D_DISABLED)
 	TextEdit *text_edit = memnew(TextEdit);
 	SceneTree::get_singleton()->get_root()->add_child(text_edit);
 	text_edit->grab_focus();
 
-	Array empty_signal_args;
-	empty_signal_args.push_back(Array());
+	Array empty_signal_args = { {} };
 
 	SUBCASE("[TextEdit] text entry") {
 		SIGNAL_WATCH(text_edit, "text_set");
@@ -6446,8 +6446,7 @@ TEST_CASE("[SceneTree][TextEdit] versioning") {
 
 		CHECK(text_edit->get_caret_count() == 1);
 
-		Array caret_index;
-		caret_index.push_back(0);
+		Array caret_index = { 0 };
 
 		for (int i = 1; i < 4; i++) {
 			caret_index.push_back(text_edit->add_caret(i, 0));
@@ -6711,8 +6710,7 @@ TEST_CASE("[SceneTree][TextEdit] multicaret") {
 	SceneTree::get_singleton()->get_root()->add_child(text_edit);
 	text_edit->set_multiple_carets_enabled(true);
 
-	Array empty_signal_args;
-	empty_signal_args.push_back(Array());
+	Array empty_signal_args = { {} };
 
 	SIGNAL_WATCH(text_edit, "caret_changed");
 
@@ -7345,7 +7343,7 @@ TEST_CASE("[SceneTree][TextEdit] multicaret") {
 		CHECK(text_edit->get_caret_line(1) == 1);
 		CHECK(text_edit->get_caret_column(1) == 1);
 		CHECK(text_edit->get_caret_line(2) == 0);
-		CHECK(text_edit->get_caret_column(2) == 8);
+		CHECK(text_edit->get_caret_column(2) == 7);
 
 		// Add caret above from first line and not first line wrap.
 		text_edit->add_caret_at_carets(false);
@@ -7356,9 +7354,9 @@ TEST_CASE("[SceneTree][TextEdit] multicaret") {
 		CHECK(text_edit->get_caret_line(1) == 1);
 		CHECK(text_edit->get_caret_column(1) == 1);
 		CHECK(text_edit->get_caret_line(2) == 0);
-		CHECK(text_edit->get_caret_column(2) == 8);
+		CHECK(text_edit->get_caret_column(2) == 7);
 		CHECK(text_edit->get_caret_line(3) == 0);
-		CHECK(text_edit->get_caret_column(3) == 4);
+		CHECK(text_edit->get_caret_column(3) == 2);
 
 		// Cannot add caret above from first line first line wrap.
 		text_edit->remove_secondary_carets();
@@ -7729,28 +7727,28 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 
 	// Scroll.
 	int v_scroll = text_edit->get_v_scroll();
-	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_DOWN, 0, Key::NONE);
+	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_DOWN, MouseButtonMask::NONE, Key::NONE);
 	CHECK(text_edit->get_v_scroll() > v_scroll);
-	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_UP, 0, Key::NONE);
+	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_UP, MouseButtonMask::NONE, Key::NONE);
 	CHECK(text_edit->get_v_scroll() == v_scroll);
 
 	// smooth scroll speed.
 	text_edit->set_smooth_scroll_enabled(true);
 
 	v_scroll = text_edit->get_v_scroll();
-	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_DOWN, 0, Key::NONE);
+	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_DOWN, MouseButtonMask::NONE, Key::NONE);
 	text_edit->notification(TextEdit::NOTIFICATION_INTERNAL_PHYSICS_PROCESS);
 	CHECK(text_edit->get_v_scroll() >= v_scroll);
-	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_UP, 0, Key::NONE);
+	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_UP, MouseButtonMask::NONE, Key::NONE);
 	text_edit->notification(TextEdit::NOTIFICATION_INTERNAL_PHYSICS_PROCESS);
 	CHECK(text_edit->get_v_scroll() == v_scroll);
 
 	v_scroll = text_edit->get_v_scroll();
 	text_edit->set_v_scroll_speed(10000);
-	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_DOWN, 0, Key::NONE);
+	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_DOWN, MouseButtonMask::NONE, Key::NONE);
 	text_edit->notification(TextEdit::NOTIFICATION_INTERNAL_PHYSICS_PROCESS);
 	CHECK(text_edit->get_v_scroll() >= v_scroll);
-	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_UP, 0, Key::NONE);
+	SEND_GUI_MOUSE_BUTTON_EVENT(Point2i(10, 10), MouseButton::WHEEL_UP, MouseButtonMask::NONE, Key::NONE);
 	text_edit->notification(TextEdit::NOTIFICATION_INTERNAL_PHYSICS_PROCESS);
 	CHECK(text_edit->get_v_scroll() == v_scroll);
 
@@ -7922,6 +7920,20 @@ TEST_CASE("[SceneTree][TextEdit] viewport") {
 	memdelete(text_edit);
 }
 
+TEST_CASE("[SceneTree][TextEdit] small height value") {
+	TextEdit *text_edit = memnew(TextEdit);
+	SceneTree::get_singleton()->get_root()->add_child(text_edit);
+
+	text_edit->set_size(Size2(800, 32));
+	text_edit->set_text("0\n1\n2");
+	MessageQueue::get_singleton()->flush();
+
+	text_edit->set_v_scroll(100);
+	CHECK(text_edit->get_v_scroll() < 3);
+
+	memdelete(text_edit);
+}
+
 TEST_CASE("[SceneTree][TextEdit] setter getters") {
 	TextEdit *text_edit = memnew(TextEdit);
 	SceneTree::get_singleton()->get_root()->add_child(text_edit);
@@ -8006,14 +8018,15 @@ TEST_CASE("[SceneTree][TextEdit] gutters") {
 	TextEdit *text_edit = memnew(TextEdit);
 	SceneTree::get_singleton()->get_root()->add_child(text_edit);
 
-	Array empty_signal_args;
-	empty_signal_args.push_back(Array());
+	Array empty_signal_args = { {} };
 
 	SIGNAL_WATCH(text_edit, "gutter_clicked");
 	SIGNAL_WATCH(text_edit, "gutter_added");
 	SIGNAL_WATCH(text_edit, "gutter_removed");
 
 	SUBCASE("[TextEdit] gutter add and remove") {
+		text_edit->set_text("test1\ntest2\ntest3\ntest4");
+
 		text_edit->add_gutter();
 		CHECK(text_edit->get_gutter_count() == 1);
 		CHECK(text_edit->get_gutter_width(0) == 24);
@@ -8245,5 +8258,3 @@ TEST_CASE("[SceneTree][TextEdit] gutters") {
 }
 
 } // namespace TestTextEdit
-
-#endif // TEST_TEXT_EDIT_H
diff --git a/engine/tests/scene/test_texture_progress_bar.h b/engine/tests/scene/test_texture_progress_bar.h
index 5eb7495a..68ac88f3 100644
--- a/engine/tests/scene/test_texture_progress_bar.h
+++ b/engine/tests/scene/test_texture_progress_bar.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TEXTURE_PROGRESS_BAR_H
-#define TEST_TEXTURE_PROGRESS_BAR_H
+#pragma once
 
 #include "scene/gui/texture_progress_bar.h"
 
@@ -64,22 +63,22 @@ TEST_CASE("[SceneTree][TextureProgressBar]") {
 		texture_progress_bar->set_radial_initial_angle(30.5);
 
 		ERR_PRINT_OFF;
-		texture_progress_bar->set_radial_initial_angle(INFINITY);
+		texture_progress_bar->set_radial_initial_angle(Math::INF);
 		ERR_PRINT_ON;
 		CHECK(Math::is_equal_approx(texture_progress_bar->get_radial_initial_angle(), (float)30.5));
 
 		ERR_PRINT_OFF;
-		texture_progress_bar->set_radial_initial_angle(-INFINITY);
+		texture_progress_bar->set_radial_initial_angle(-Math::INF);
 		ERR_PRINT_ON;
 		CHECK(Math::is_equal_approx(texture_progress_bar->get_radial_initial_angle(), (float)30.5));
 
 		ERR_PRINT_OFF;
-		texture_progress_bar->set_radial_initial_angle(NAN);
+		texture_progress_bar->set_radial_initial_angle(Math::NaN);
 		ERR_PRINT_ON;
 		CHECK(Math::is_equal_approx(texture_progress_bar->get_radial_initial_angle(), (float)30.5));
 
 		ERR_PRINT_OFF;
-		texture_progress_bar->set_radial_initial_angle(-NAN);
+		texture_progress_bar->set_radial_initial_angle(-Math::NaN);
 		ERR_PRINT_ON;
 		CHECK(Math::is_equal_approx(texture_progress_bar->get_radial_initial_angle(), (float)30.5));
 	}
@@ -88,5 +87,3 @@ TEST_CASE("[SceneTree][TextureProgressBar]") {
 }
 
 } // namespace TestTextureProgressBar
-
-#endif // TEST_TEXTURE_PROGRESS_BAR_H
diff --git a/engine/tests/scene/test_theme.h b/engine/tests/scene/test_theme.h
index ad1ce1fd..3296e54e 100644
--- a/engine/tests/scene/test_theme.h
+++ b/engine/tests/scene/test_theme.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_THEME_H
-#define TEST_THEME_H
+#pragma once
 
 #include "scene/resources/image_texture.h"
 #include "scene/resources/style_box_flat.h"
@@ -269,5 +268,3 @@ TEST_CASE_FIXTURE(Fixture, "[Theme] Bad theme item names") {
 }
 
 } // namespace TestTheme
-
-#endif // TEST_THEME_H
diff --git a/engine/tests/scene/test_timer.h b/engine/tests/scene/test_timer.h
index 913ed92d..c47a1a2e 100644
--- a/engine/tests/scene/test_timer.h
+++ b/engine/tests/scene/test_timer.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TIMER_H
-#define TEST_TIMER_H
+#pragma once
 
 #include "scene/main/timer.h"
 
@@ -157,9 +156,7 @@ TEST_CASE("[SceneTree][Timer] Check Timer timeout signal") {
 
 		SceneTree::get_singleton()->process(0.2);
 
-		Array signal_args;
-		signal_args.push_back(Array());
-
+		Array signal_args = { {} };
 		SIGNAL_CHECK(SNAME("timeout"), signal_args);
 
 		SIGNAL_UNWATCH(test_timer, SNAME("timeout"));
@@ -171,9 +168,7 @@ TEST_CASE("[SceneTree][Timer] Check Timer timeout signal") {
 
 		SceneTree::get_singleton()->process(0.05);
 
-		Array signal_args;
-		signal_args.push_back(Array());
-
+		Array signal_args = { {} };
 		SIGNAL_CHECK_FALSE(SNAME("timeout"));
 
 		SIGNAL_UNWATCH(test_timer, SNAME("timeout"));
@@ -187,9 +182,7 @@ TEST_CASE("[SceneTree][Timer] Check Timer timeout signal") {
 
 		SceneTree::get_singleton()->physics_process(0.2);
 
-		Array signal_args;
-		signal_args.push_back(Array());
-
+		Array signal_args = { {} };
 		SIGNAL_CHECK(SNAME("timeout"), signal_args);
 
 		SIGNAL_UNWATCH(test_timer, SNAME("timeout"));
@@ -201,9 +194,7 @@ TEST_CASE("[SceneTree][Timer] Check Timer timeout signal") {
 
 		SceneTree::get_singleton()->physics_process(0.05);
 
-		Array signal_args;
-		signal_args.push_back(Array());
-
+		Array signal_args = { {} };
 		SIGNAL_CHECK_FALSE(SNAME("timeout"));
 
 		SIGNAL_UNWATCH(test_timer, SNAME("timeout"));
@@ -213,5 +204,3 @@ TEST_CASE("[SceneTree][Timer] Check Timer timeout signal") {
 }
 
 } // namespace TestTimer
-
-#endif // TEST_TIMER_H
diff --git a/engine/tests/scene/test_tree.h b/engine/tests/scene/test_tree.h
index a74158d3..2db6e8f4 100644
--- a/engine/tests/scene/test_tree.h
+++ b/engine/tests/scene/test_tree.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TREE_H
-#define TEST_TREE_H
+#pragma once
 
 #include "scene/gui/tree.h"
 
@@ -297,5 +296,3 @@ TEST_CASE("[SceneTree][Tree]") {
 }
 
 } // namespace TestTree
-
-#endif // TEST_TREE_H
diff --git a/engine/tests/scene/test_viewport.h b/engine/tests/scene/test_viewport.h
index dbf348ba..5094f0e7 100644
--- a/engine/tests/scene/test_viewport.h
+++ b/engine/tests/scene/test_viewport.h
@@ -28,17 +28,20 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VIEWPORT_H
-#define TEST_VIEWPORT_H
+#pragma once
 
-#include "scene/2d/physics/area_2d.h"
-#include "scene/2d/physics/collision_shape_2d.h"
+#include "scene/2d/node_2d.h"
 #include "scene/gui/control.h"
 #include "scene/gui/subviewport_container.h"
 #include "scene/main/canvas_layer.h"
 #include "scene/main/window.h"
+
+#ifndef PHYSICS_2D_DISABLED
+#include "scene/2d/physics/area_2d.h"
+#include "scene/2d/physics/collision_shape_2d.h"
 #include "scene/resources/2d/rectangle_shape_2d.h"
 #include "servers/physics_server_2d_dummy.h"
+#endif // PHYSICS_2D_DISABLED
 
 #include "tests/test_macros.h"
 
@@ -344,7 +347,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				SEND_GUI_MOUSE_BUTTON_EVENT(on_a, MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
 				CHECK(node_a->has_focus());
 
-				SEND_GUI_MOUSE_BUTTON_EVENT(on_b, MouseButton::RIGHT, (int)MouseButtonMask::LEFT | (int)MouseButtonMask::RIGHT, Key::NONE);
+				SEND_GUI_MOUSE_BUTTON_EVENT(on_b, MouseButton::RIGHT, MouseButtonMask::LEFT | MouseButtonMask::RIGHT, Key::NONE);
 				CHECK(node_a->has_focus());
 
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_b, MouseButton::RIGHT, MouseButtonMask::LEFT, Key::NONE);
@@ -359,12 +362,12 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 				SEND_GUI_MOUSE_BUTTON_EVENT(on_background, MouseButton::RIGHT, MouseButtonMask::RIGHT, Key::NONE);
 				CHECK_FALSE(root->gui_get_focus_owner());
 
-				SEND_GUI_MOUSE_BUTTON_EVENT(on_a, MouseButton::LEFT, (int)MouseButtonMask::LEFT | (int)MouseButtonMask::RIGHT, Key::NONE);
+				SEND_GUI_MOUSE_BUTTON_EVENT(on_a, MouseButton::LEFT, MouseButtonMask::LEFT | MouseButtonMask::RIGHT, Key::NONE);
 				CHECK(node_a->has_focus());
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_a, MouseButton::LEFT, MouseButtonMask::RIGHT, Key::NONE);
 				CHECK(node_a->has_focus());
 
-				SEND_GUI_MOUSE_BUTTON_EVENT(on_b, MouseButton::LEFT, (int)MouseButtonMask::LEFT | (int)MouseButtonMask::RIGHT, Key::NONE);
+				SEND_GUI_MOUSE_BUTTON_EVENT(on_b, MouseButton::LEFT, MouseButtonMask::LEFT | MouseButtonMask::RIGHT, Key::NONE);
 				CHECK(node_b->has_focus());
 
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_d, MouseButton::LEFT, MouseButtonMask::RIGHT, Key::NONE);
@@ -410,10 +413,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 
 			SUBCASE("[Viewport][GuiInputEvent] Signal 'gui_focus_changed' is only emitted if a previously unfocused Control grabs focus.") {
 				SIGNAL_WATCH(root, SNAME("gui_focus_changed"));
-				Array node_array;
-				node_array.push_back(node_a);
-				Array signal_args;
-				signal_args.push_back(node_array);
+				Array signal_args = { { node_a } };
 
 				SEND_GUI_MOUSE_BUTTON_EVENT(on_a, MouseButton::LEFT, MouseButtonMask::LEFT, Key::NONE);
 				SEND_GUI_MOUSE_BUTTON_RELEASED_EVENT(on_a, MouseButton::LEFT, MouseButtonMask::NONE, Key::NONE);
@@ -567,8 +567,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		SUBCASE("[Viewport][GuiInputEvent] Mouse Enter/Exit notification propagation when moving into child.") {
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_entered));
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_exited));
-			Array signal_args;
-			signal_args.push_back(Array());
+			Array signal_args = { {} };
 
 			node_j->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 
@@ -775,8 +774,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		SUBCASE("[Viewport][GuiInputEvent] Mouse Enter/Exit notification when changing top level.") {
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_entered));
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_exited));
-			Array signal_args;
-			signal_args.push_back(Array());
+			Array signal_args = { {} };
 
 			node_d->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 			node_i->set_mouse_filter(Control::MOUSE_FILTER_PASS);
@@ -854,8 +852,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		SUBCASE("[Viewport][GuiInputEvent] Mouse Enter/Exit notification when changing the mouse filter to stop.") {
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_entered));
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_exited));
-			Array signal_args;
-			signal_args.push_back(Array());
+			Array signal_args = { {} };
 
 			node_i->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 			node_j->set_mouse_filter(Control::MOUSE_FILTER_PASS);
@@ -907,8 +904,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		SUBCASE("[Viewport][GuiInputEvent] Mouse Enter/Exit notification when changing the mouse filter to ignore.") {
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_entered));
 			SIGNAL_WATCH(node_i, SceneStringName(mouse_exited));
-			Array signal_args;
-			signal_args.push_back(Array());
+			Array signal_args = { {} };
 
 			node_i->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 			node_j->set_mouse_filter(Control::MOUSE_FILTER_PASS);
@@ -984,8 +980,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		SUBCASE("[Viewport][GuiInputEvent] Mouse Enter/Exit notification when removing the hovered Control.") {
 			SIGNAL_WATCH(node_h, SceneStringName(mouse_entered));
 			SIGNAL_WATCH(node_h, SceneStringName(mouse_exited));
-			Array signal_args;
-			signal_args.push_back(Array());
+			Array signal_args = { {} };
 
 			node_i->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 			node_j->set_mouse_filter(Control::MOUSE_FILTER_PASS);
@@ -1038,8 +1033,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		SUBCASE("[Viewport][GuiInputEvent] Mouse Enter/Exit notification when hiding the hovered Control.") {
 			SIGNAL_WATCH(node_h, SceneStringName(mouse_entered));
 			SIGNAL_WATCH(node_h, SceneStringName(mouse_exited));
-			Array signal_args;
-			signal_args.push_back(Array());
+			Array signal_args = { {} };
 
 			node_i->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 			node_j->set_mouse_filter(Control::MOUSE_FILTER_PASS);
@@ -1092,8 +1086,7 @@ TEST_CASE("[SceneTree][Viewport] Controls and InputEvent handling") {
 		SUBCASE("[Viewport][GuiInputEvent] Window Mouse Enter/Exit signals.") {
 			SIGNAL_WATCH(root, SceneStringName(mouse_entered));
 			SIGNAL_WATCH(root, SceneStringName(mouse_exited));
-			Array signal_args;
-			signal_args.push_back(Array());
+			Array signal_args = { {} };
 
 			SEND_GUI_MOUSE_MOTION_EVENT(on_outside, MouseButtonMask::NONE, Key::NONE);
 			SIGNAL_CHECK_FALSE(SceneStringName(mouse_entered));
@@ -1521,6 +1514,7 @@ TEST_CASE("[SceneTree][Viewport] Control mouse cursor shape") {
 	}
 }
 
+#ifndef PHYSICS_2D_DISABLED
 class TestArea2D : public Area2D {
 	GDCLASS(TestArea2D, Area2D);
 
@@ -1616,15 +1610,8 @@ TEST_CASE("[SceneTree][Viewport] Physics Picking 2D") {
 	Point2i on_01 = Point2i(10, 50);
 	Point2i on_02 = Point2i(50, 10);
 
-	Array empty_signal_args_2;
-	empty_signal_args_2.push_back(Array());
-	empty_signal_args_2.push_back(Array());
-
-	Array empty_signal_args_4;
-	empty_signal_args_4.push_back(Array());
-	empty_signal_args_4.push_back(Array());
-	empty_signal_args_4.push_back(Array());
-	empty_signal_args_4.push_back(Array());
+	Array empty_signal_args_2 = { Array(), Array() };
+	Array empty_signal_args_4 = { Array(), Array(), Array(), Array() };
 
 	for (PickingCollider E : v) {
 		E.a->init_signals();
@@ -1787,7 +1774,7 @@ TEST_CASE("[SceneTree][Viewport] Physics Picking 2D") {
 
 	SUBCASE("[Viewport][Picking2D] CollisionObject in CanvasLayer") {
 		CanvasLayer *node_c = memnew(CanvasLayer);
-		node_c->set_rotation(Math_PI);
+		node_c->set_rotation(Math::PI);
 		node_c->set_offset(Point2i(100, 100));
 		root->add_child(node_c);
 
@@ -1928,6 +1915,7 @@ TEST_CASE("[SceneTree][Viewport] Physics Picking 2D") {
 		memdelete(E.a);
 	}
 }
+#endif // PHYSICS_2D_DISABLED
 
 TEST_CASE("[SceneTree][Viewport] Embedded Windows") {
 	Window *root = SceneTree::get_singleton()->get_root();
@@ -1945,5 +1933,3 @@ TEST_CASE("[SceneTree][Viewport] Embedded Windows") {
 }
 
 } // namespace TestViewport
-
-#endif // TEST_VIEWPORT_H
diff --git a/engine/tests/scene/test_visual_shader.h b/engine/tests/scene/test_visual_shader.h
index e5497176..8ec17168 100644
--- a/engine/tests/scene/test_visual_shader.h
+++ b/engine/tests/scene/test_visual_shader.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VISUAL_SHADER_H
-#define TEST_VISUAL_SHADER_H
+#pragma once
 
 #include "scene/resources/visual_shader.h"
 
@@ -147,5 +146,3 @@ TEST_CASE("[SceneTree][VisualShader] Testing Varyings") {
 }
 
 } //namespace TestVisualArray
-
-#endif // TEST_VISUAL_SHADER_H
diff --git a/engine/tests/scene/test_window.h b/engine/tests/scene/test_window.h
index 592cccfd..5eaea314 100644
--- a/engine/tests/scene/test_window.h
+++ b/engine/tests/scene/test_window.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_WINDOW_H
-#define TEST_WINDOW_H
+#pragma once
 
 #include "scene/gui/control.h"
 #include "scene/main/window.h"
@@ -92,5 +91,3 @@ TEST_CASE("[SceneTree][Window]") {
 }
 
 } // namespace TestWindow
-
-#endif // TEST_WINDOW_H
diff --git a/engine/tests/servers/rendering/test_shader_preprocessor.h b/engine/tests/servers/rendering/test_shader_preprocessor.h
index e12da8a2..f787f8b0 100644
--- a/engine/tests/servers/rendering/test_shader_preprocessor.h
+++ b/engine/tests/servers/rendering/test_shader_preprocessor.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_SHADER_PREPROCESSOR_H
-#define TEST_SHADER_PREPROCESSOR_H
+#pragma once
 
 #include "servers/rendering/shader_preprocessor.h"
 
@@ -329,5 +328,3 @@ TEST_CASE("[ShaderPreprocessor] Invalid concatenations") {
 }
 
 } // namespace TestShaderPreprocessor
-
-#endif // TEST_SHADER_PREPROCESSOR_H
diff --git a/engine/tests/servers/test_nav_heap.h b/engine/tests/servers/test_nav_heap.h
new file mode 100644
index 00000000..2e21706d
--- /dev/null
+++ b/engine/tests/servers/test_nav_heap.h
@@ -0,0 +1,196 @@
+/**************************************************************************/
+/*  test_nav_heap.h                                                       */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+#pragma once
+
+#include "servers/navigation/nav_heap.h"
+
+#include "tests/test_macros.h"
+
+namespace TestHeap {
+struct GreaterThan {
+	bool operator()(int p_a, int p_b) const { return p_a > p_b; }
+};
+
+struct CompareArrayValues {
+	const int *array;
+
+	CompareArrayValues(const int *p_array) :
+			array(p_array) {}
+
+	bool operator()(uint32_t p_index_a, uint32_t p_index_b) const {
+		return array[p_index_a] < array[p_index_b];
+	}
+};
+
+struct RegisterHeapIndexes {
+	uint32_t *indexes;
+
+	RegisterHeapIndexes(uint32_t *p_indexes) :
+			indexes(p_indexes) {}
+
+	void operator()(uint32_t p_vector_index, uint32_t p_heap_index) {
+		indexes[p_vector_index] = p_heap_index;
+	}
+};
+
+TEST_CASE("[Heap] size") {
+	Heap<int> heap;
+
+	CHECK(heap.size() == 0);
+
+	heap.push(0);
+	CHECK(heap.size() == 1);
+
+	heap.push(1);
+	CHECK(heap.size() == 2);
+
+	heap.pop();
+	CHECK(heap.size() == 1);
+
+	heap.pop();
+	CHECK(heap.size() == 0);
+}
+
+TEST_CASE("[Heap] is_empty") {
+	Heap<int> heap;
+
+	CHECK(heap.is_empty() == true);
+
+	heap.push(0);
+	CHECK(heap.is_empty() == false);
+
+	heap.pop();
+	CHECK(heap.is_empty() == true);
+}
+
+TEST_CASE("[Heap] push/pop") {
+	SUBCASE("Default comparator") {
+		Heap<int> heap;
+
+		heap.push(2);
+		heap.push(7);
+		heap.push(5);
+		heap.push(3);
+		heap.push(4);
+
+		CHECK(heap.pop() == 7);
+		CHECK(heap.pop() == 5);
+		CHECK(heap.pop() == 4);
+		CHECK(heap.pop() == 3);
+		CHECK(heap.pop() == 2);
+	}
+
+	SUBCASE("Custom comparator") {
+		GreaterThan greaterThan;
+		Heap<int, GreaterThan> heap(greaterThan);
+
+		heap.push(2);
+		heap.push(7);
+		heap.push(5);
+		heap.push(3);
+		heap.push(4);
+
+		CHECK(heap.pop() == 2);
+		CHECK(heap.pop() == 3);
+		CHECK(heap.pop() == 4);
+		CHECK(heap.pop() == 5);
+		CHECK(heap.pop() == 7);
+	}
+
+	SUBCASE("Intermediate pops") {
+		Heap<int> heap;
+
+		heap.push(0);
+		heap.push(3);
+		heap.pop();
+		heap.push(1);
+		heap.push(2);
+
+		CHECK(heap.pop() == 2);
+		CHECK(heap.pop() == 1);
+		CHECK(heap.pop() == 0);
+	}
+}
+
+TEST_CASE("[Heap] shift") {
+	int values[] = { 5, 3, 6, 7, 1 };
+	uint32_t heap_indexes[] = { 0, 0, 0, 0, 0 };
+	CompareArrayValues comparator(values);
+	RegisterHeapIndexes indexer(heap_indexes);
+	Heap<uint32_t, CompareArrayValues, RegisterHeapIndexes> heap(comparator, indexer);
+
+	heap.push(0);
+	heap.push(1);
+	heap.push(2);
+	heap.push(3);
+	heap.push(4);
+
+	// Shift down: 6 -> 2
+	values[2] = 2;
+	heap.shift(heap_indexes[2]);
+
+	// Shift up: 5 -> 8
+	values[0] = 8;
+	heap.shift(heap_indexes[0]);
+
+	CHECK(heap.pop() == 0);
+	CHECK(heap.pop() == 3);
+	CHECK(heap.pop() == 1);
+	CHECK(heap.pop() == 2);
+	CHECK(heap.pop() == 4);
+
+	CHECK(heap_indexes[0] == Heap<uint32_t, CompareArrayValues, RegisterHeapIndexes>::INVALID_INDEX);
+	CHECK(heap_indexes[1] == Heap<uint32_t, CompareArrayValues, RegisterHeapIndexes>::INVALID_INDEX);
+	CHECK(heap_indexes[2] == Heap<uint32_t, CompareArrayValues, RegisterHeapIndexes>::INVALID_INDEX);
+	CHECK(heap_indexes[3] == Heap<uint32_t, CompareArrayValues, RegisterHeapIndexes>::INVALID_INDEX);
+	CHECK(heap_indexes[4] == Heap<uint32_t, CompareArrayValues, RegisterHeapIndexes>::INVALID_INDEX);
+}
+
+TEST_CASE("[Heap] clear") {
+	uint32_t heap_indexes[] = { 0, 0, 0, 0 };
+	RegisterHeapIndexes indexer(heap_indexes);
+	Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes> heap(indexer);
+
+	heap.push(0);
+	heap.push(2);
+	heap.push(1);
+	heap.push(3);
+
+	heap.clear();
+
+	CHECK(heap.size() == 0);
+
+	CHECK(heap_indexes[0] == Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes>::INVALID_INDEX);
+	CHECK(heap_indexes[1] == Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes>::INVALID_INDEX);
+	CHECK(heap_indexes[2] == Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes>::INVALID_INDEX);
+	CHECK(heap_indexes[3] == Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes>::INVALID_INDEX);
+}
+} //namespace TestHeap
diff --git a/engine/tests/servers/test_navigation_server_2d.h b/engine/tests/servers/test_navigation_server_2d.h
index ff9bb620..e3e99690 100644
--- a/engine/tests/servers/test_navigation_server_2d.h
+++ b/engine/tests/servers/test_navigation_server_2d.h
@@ -28,20 +28,740 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_SERVER_2D_H
-#define TEST_NAVIGATION_SERVER_2D_H
+#pragma once
 
+#include "modules/navigation_2d/nav_utils_2d.h"
 #include "servers/navigation_server_2d.h"
 
+#include "scene/2d/polygon_2d.h"
+
 #include "tests/test_macros.h"
 
 namespace TestNavigationServer2D {
-TEST_SUITE("[Navigation]") {
+
+// TODO: Find a more generic way to create `Callable` mocks.
+class CallableMock : public Object {
+	GDCLASS(CallableMock, Object);
+
+public:
+	void function1(Variant arg0) {
+		function1_calls++;
+		function1_latest_arg0 = arg0;
+	}
+
+	unsigned function1_calls{ 0 };
+	Variant function1_latest_arg0;
+};
+
+static inline Array build_array() {
+	return Array();
+}
+template <typename... Targs>
+static inline Array build_array(Variant item, Targs... Fargs) {
+	Array a = build_array(Fargs...);
+	a.push_front(item);
+	return a;
+}
+
+struct GreaterThan {
+	bool operator()(int p_a, int p_b) const { return p_a > p_b; }
+};
+
+struct CompareArrayValues {
+	const int *array;
+
+	CompareArrayValues(const int *p_array) :
+			array(p_array) {}
+
+	bool operator()(uint32_t p_index_a, uint32_t p_index_b) const {
+		return array[p_index_a] < array[p_index_b];
+	}
+};
+
+struct RegisterHeapIndexes {
+	uint32_t *indexes;
+
+	RegisterHeapIndexes(uint32_t *p_indexes) :
+			indexes(p_indexes) {}
+
+	void operator()(uint32_t p_vector_index, uint32_t p_heap_index) {
+		indexes[p_vector_index] = p_heap_index;
+	}
+};
+
+TEST_SUITE("[Navigation2D]") {
 	TEST_CASE("[NavigationServer2D] Server should be empty when initialized") {
 		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
 		CHECK_EQ(navigation_server->get_maps().size(), 0);
+
+		SUBCASE("'ProcessInfo' should report all counters empty as well") {
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_REGION_COUNT), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_AGENT_COUNT), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_LINK_COUNT), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_POLYGON_COUNT), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_EDGE_COUNT), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_EDGE_MERGE_COUNT), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_EDGE_CONNECTION_COUNT), 0);
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_EDGE_FREE_COUNT), 0);
+		}
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should manage agent properly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID agent = navigation_server->agent_create();
+		CHECK(agent.is_valid());
+
+		SUBCASE("'ProcessInfo' should not report dangling agent") {
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_AGENT_COUNT), 0);
+		}
+
+		SUBCASE("Setters/getters should work") {
+			bool initial_avoidance_enabled = navigation_server->agent_get_avoidance_enabled(agent);
+			navigation_server->agent_set_avoidance_enabled(agent, !initial_avoidance_enabled);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+			CHECK_EQ(navigation_server->agent_get_avoidance_enabled(agent), !initial_avoidance_enabled);
+			// TODO: Add remaining setters/getters once the missing getters are added.
+		}
+
+		SUBCASE("'ProcessInfo' should report agent with active map") {
+			RID map = navigation_server->map_create();
+			CHECK(map.is_valid());
+			navigation_server->map_set_active(map, true);
+			navigation_server->agent_set_map(agent, map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_AGENT_COUNT), 1);
+			navigation_server->agent_set_map(agent, RID());
+			navigation_server->free(map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_AGENT_COUNT), 0);
+		}
+
+		navigation_server->free(agent);
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should manage map properly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID map;
+		CHECK_FALSE(map.is_valid());
+
+		SUBCASE("Queries against invalid map should return empty or invalid values") {
+			ERR_PRINT_OFF;
+			CHECK_EQ(navigation_server->map_get_closest_point(map, Vector2(7, 7)), Vector2());
+			CHECK_FALSE(navigation_server->map_get_closest_point_owner(map, Vector2(7, 7)).is_valid());
+			CHECK_EQ(navigation_server->map_get_path(map, Vector2(7, 7), Vector2(8, 8), true).size(), 0);
+			CHECK_EQ(navigation_server->map_get_path(map, Vector2(7, 7), Vector2(8, 8), false).size(), 0);
+
+			Ref<NavigationPathQueryParameters2D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector2(7, 7));
+			query_parameters->set_target_position(Vector2(8, 8));
+			Ref<NavigationPathQueryResult2D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_EQ(query_result->get_path().size(), 0);
+			CHECK_EQ(query_result->get_path_types().size(), 0);
+			CHECK_EQ(query_result->get_path_rids().size(), 0);
+			CHECK_EQ(query_result->get_path_owner_ids().size(), 0);
+			ERR_PRINT_ON;
+		}
+
+		map = navigation_server->map_create();
+		CHECK(map.is_valid());
+		CHECK_EQ(navigation_server->get_maps().size(), 1);
+
+		SUBCASE("'ProcessInfo' should not report inactive map") {
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS), 0);
+		}
+
+		SUBCASE("Setters/getters should work") {
+			navigation_server->map_set_cell_size(map, 0.55);
+			navigation_server->map_set_edge_connection_margin(map, 0.66);
+			navigation_server->map_set_link_connection_radius(map, 0.77);
+			bool initial_use_edge_connections = navigation_server->map_get_use_edge_connections(map);
+			navigation_server->map_set_use_edge_connections(map, !initial_use_edge_connections);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+			CHECK_EQ(navigation_server->map_get_cell_size(map), doctest::Approx(0.55));
+			CHECK_EQ(navigation_server->map_get_edge_connection_margin(map), doctest::Approx(0.66));
+			CHECK_EQ(navigation_server->map_get_link_connection_radius(map), doctest::Approx(0.77));
+			CHECK_EQ(navigation_server->map_get_use_edge_connections(map), !initial_use_edge_connections);
+		}
+
+		SUBCASE("'ProcessInfo' should report map iff active") {
+			navigation_server->map_set_active(map, true);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK(navigation_server->map_is_active(map));
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS), 1);
+			navigation_server->map_set_active(map, false);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_ACTIVE_MAPS), 0);
+		}
+
+		SUBCASE("Number of agents should be reported properly") {
+			RID agent = navigation_server->agent_create();
+			CHECK(agent.is_valid());
+			navigation_server->agent_set_map(agent, map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_agents(map).size(), 1);
+			navigation_server->free(agent);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_agents(map).size(), 0);
+		}
+
+		SUBCASE("Number of links should be reported properly") {
+			RID link = navigation_server->link_create();
+			CHECK(link.is_valid());
+			navigation_server->link_set_map(link, map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_links(map).size(), 1);
+			navigation_server->free(link);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_links(map).size(), 0);
+		}
+
+		SUBCASE("Number of obstacles should be reported properly") {
+			RID obstacle = navigation_server->obstacle_create();
+			CHECK(obstacle.is_valid());
+			navigation_server->obstacle_set_map(obstacle, map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_obstacles(map).size(), 1);
+			navigation_server->free(obstacle);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_obstacles(map).size(), 0);
+		}
+
+		SUBCASE("Number of regions should be reported properly") {
+			RID region = navigation_server->region_create();
+			CHECK(region.is_valid());
+			navigation_server->region_set_map(region, map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_regions(map).size(), 1);
+			navigation_server->free(region);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->map_get_regions(map).size(), 0);
+		}
+
+		SUBCASE("Queries against empty map should return empty or invalid values") {
+			navigation_server->map_set_active(map, true);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+			ERR_PRINT_OFF;
+			CHECK_EQ(navigation_server->map_get_closest_point(map, Vector2(7, 7)), Vector2());
+			CHECK_FALSE(navigation_server->map_get_closest_point_owner(map, Vector2(7, 7)).is_valid());
+			CHECK_EQ(navigation_server->map_get_path(map, Vector2(7, 7), Vector2(8, 8), true).size(), 0);
+			CHECK_EQ(navigation_server->map_get_path(map, Vector2(7, 7), Vector2(8, 8), false).size(), 0);
+
+			Ref<NavigationPathQueryParameters2D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector2(7, 7));
+			query_parameters->set_target_position(Vector2(8, 8));
+			Ref<NavigationPathQueryResult2D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_EQ(query_result->get_path().size(), 0);
+			CHECK_EQ(query_result->get_path_types().size(), 0);
+			CHECK_EQ(query_result->get_path_rids().size(), 0);
+			CHECK_EQ(query_result->get_path_owner_ids().size(), 0);
+			ERR_PRINT_ON;
+
+			navigation_server->map_set_active(map, false);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+		}
+
+		navigation_server->free(map);
+		navigation_server->physics_process(0.0); // Give server some cycles to actually remove map.
+		CHECK_EQ(navigation_server->get_maps().size(), 0);
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should manage link properly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID link = navigation_server->link_create();
+		CHECK(link.is_valid());
+
+		SUBCASE("'ProcessInfo' should not report dangling link") {
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_LINK_COUNT), 0);
+		}
+
+		SUBCASE("Setters/getters should work") {
+			bool initial_bidirectional = navigation_server->link_is_bidirectional(link);
+			navigation_server->link_set_bidirectional(link, !initial_bidirectional);
+			navigation_server->link_set_end_position(link, Vector2(7, 7));
+			navigation_server->link_set_enter_cost(link, 0.55);
+			navigation_server->link_set_navigation_layers(link, 6);
+			navigation_server->link_set_owner_id(link, ObjectID((int64_t)7));
+			navigation_server->link_set_start_position(link, Vector2(8, 8));
+			navigation_server->link_set_travel_cost(link, 0.66);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+			CHECK_EQ(navigation_server->link_is_bidirectional(link), !initial_bidirectional);
+			CHECK_EQ(navigation_server->link_get_end_position(link), Vector2(7, 7));
+			CHECK_EQ(navigation_server->link_get_enter_cost(link), doctest::Approx(0.55));
+			CHECK_EQ(navigation_server->link_get_navigation_layers(link), 6);
+			CHECK_EQ(navigation_server->link_get_owner_id(link), ObjectID((int64_t)7));
+			CHECK_EQ(navigation_server->link_get_start_position(link), Vector2(8, 8));
+			CHECK_EQ(navigation_server->link_get_travel_cost(link), doctest::Approx(0.66));
+		}
+
+		SUBCASE("'ProcessInfo' should report link with active map") {
+			RID map = navigation_server->map_create();
+			CHECK(map.is_valid());
+			navigation_server->map_set_active(map, true);
+			navigation_server->link_set_map(link, map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_LINK_COUNT), 1);
+			navigation_server->link_set_map(link, RID());
+			navigation_server->free(map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_LINK_COUNT), 0);
+		}
+
+		navigation_server->free(link);
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should manage obstacles properly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID obstacle = navigation_server->obstacle_create();
+		CHECK(obstacle.is_valid());
+
+		// TODO: Add tests for setters/getters once getters are added.
+
+		navigation_server->free(obstacle);
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should manage regions properly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID region = navigation_server->region_create();
+		CHECK(region.is_valid());
+
+		SUBCASE("'ProcessInfo' should not report dangling region") {
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_REGION_COUNT), 0);
+		}
+
+		SUBCASE("Setters/getters should work") {
+			bool initial_use_edge_connections = navigation_server->region_get_use_edge_connections(region);
+			navigation_server->region_set_enter_cost(region, 0.55);
+			navigation_server->region_set_navigation_layers(region, 5);
+			navigation_server->region_set_owner_id(region, ObjectID((int64_t)7));
+			navigation_server->region_set_travel_cost(region, 0.66);
+			navigation_server->region_set_use_edge_connections(region, !initial_use_edge_connections);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+			CHECK_EQ(navigation_server->region_get_enter_cost(region), doctest::Approx(0.55));
+			CHECK_EQ(navigation_server->region_get_navigation_layers(region), 5);
+			CHECK_EQ(navigation_server->region_get_owner_id(region), ObjectID((int64_t)7));
+			CHECK_EQ(navigation_server->region_get_travel_cost(region), doctest::Approx(0.66));
+			CHECK_EQ(navigation_server->region_get_use_edge_connections(region), !initial_use_edge_connections);
+		}
+
+		SUBCASE("'ProcessInfo' should report region with active map") {
+			RID map = navigation_server->map_create();
+			CHECK(map.is_valid());
+			navigation_server->map_set_active(map, true);
+			navigation_server->region_set_map(region, map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_REGION_COUNT), 1);
+			navigation_server->region_set_map(region, RID());
+			navigation_server->free(map);
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			CHECK_EQ(navigation_server->get_process_info(NavigationServer2D::INFO_REGION_COUNT), 0);
+		}
+
+		SUBCASE("Queries against empty region should return empty or invalid values") {
+			ERR_PRINT_OFF;
+			CHECK_EQ(navigation_server->region_get_connections_count(region), 0);
+			CHECK_EQ(navigation_server->region_get_connection_pathway_end(region, 55), Vector2());
+			CHECK_EQ(navigation_server->region_get_connection_pathway_start(region, 55), Vector2());
+			ERR_PRINT_ON;
+		}
+
+		navigation_server->free(region);
+	}
+
+	// This test case does not check precise values on purpose - to not be too sensitivte.
+	TEST_CASE("[NavigationServer2D] Server should move agent properly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID map = navigation_server->map_create();
+		RID agent = navigation_server->agent_create();
+
+		navigation_server->map_set_active(map, true);
+		navigation_server->agent_set_map(agent, map);
+		navigation_server->agent_set_avoidance_enabled(agent, true);
+		navigation_server->agent_set_velocity(agent, Vector2(1, 1));
+		CallableMock agent_avoidance_callback_mock;
+		navigation_server->agent_set_avoidance_callback(agent, callable_mp(&agent_avoidance_callback_mock, &CallableMock::function1));
+		CHECK_EQ(agent_avoidance_callback_mock.function1_calls, 0);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+		CHECK_EQ(agent_avoidance_callback_mock.function1_calls, 1);
+		CHECK_NE(agent_avoidance_callback_mock.function1_latest_arg0, Vector3(0, 0, 0));
+
+		navigation_server->free(agent);
+		navigation_server->free(map);
+	}
+
+	// This test case does not check precise values on purpose - to not be too sensitivte.
+	TEST_CASE("[NavigationServer2D] Server should make agents avoid each other when avoidance enabled") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID map = navigation_server->map_create();
+		RID agent_1 = navigation_server->agent_create();
+		RID agent_2 = navigation_server->agent_create();
+
+		navigation_server->map_set_active(map, true);
+
+		navigation_server->agent_set_map(agent_1, map);
+		navigation_server->agent_set_avoidance_enabled(agent_1, true);
+		navigation_server->agent_set_position(agent_1, Vector2(0, 0));
+		navigation_server->agent_set_radius(agent_1, 1);
+		navigation_server->agent_set_velocity(agent_1, Vector2(1, 0));
+		CallableMock agent_1_avoidance_callback_mock;
+		navigation_server->agent_set_avoidance_callback(agent_1, callable_mp(&agent_1_avoidance_callback_mock, &CallableMock::function1));
+
+		navigation_server->agent_set_map(agent_2, map);
+		navigation_server->agent_set_avoidance_enabled(agent_2, true);
+		navigation_server->agent_set_position(agent_2, Vector2(2.5, 0.5));
+		navigation_server->agent_set_radius(agent_2, 1);
+		navigation_server->agent_set_velocity(agent_2, Vector2(-1, 0));
+		CallableMock agent_2_avoidance_callback_mock;
+		navigation_server->agent_set_avoidance_callback(agent_2, callable_mp(&agent_2_avoidance_callback_mock, &CallableMock::function1));
+
+		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 0);
+		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 0);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 1);
+		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 1);
+		Vector3 agent_1_safe_velocity = agent_1_avoidance_callback_mock.function1_latest_arg0;
+		Vector3 agent_2_safe_velocity = agent_2_avoidance_callback_mock.function1_latest_arg0;
+		CHECK_MESSAGE(agent_1_safe_velocity.x > 0, "agent 1 should move a bit along desired velocity (+X)");
+		CHECK_MESSAGE(agent_2_safe_velocity.x < 0, "agent 2 should move a bit along desired velocity (-X)");
+		CHECK_MESSAGE(agent_1_safe_velocity.z < 0, "agent 1 should move a bit to the side so that it avoids agent 2");
+		CHECK_MESSAGE(agent_2_safe_velocity.z > 0, "agent 2 should move a bit to the side so that it avoids agent 1");
+
+		navigation_server->free(agent_2);
+		navigation_server->free(agent_1);
+		navigation_server->free(map);
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should make agents avoid dynamic obstacles when avoidance enabled") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID map = navigation_server->map_create();
+		RID agent_1 = navigation_server->agent_create();
+		RID obstacle_1 = navigation_server->obstacle_create();
+
+		navigation_server->map_set_active(map, true);
+
+		navigation_server->agent_set_map(agent_1, map);
+		navigation_server->agent_set_avoidance_enabled(agent_1, true);
+		navigation_server->agent_set_position(agent_1, Vector2(0, 0));
+		navigation_server->agent_set_radius(agent_1, 1);
+		navigation_server->agent_set_velocity(agent_1, Vector2(1, 0));
+		CallableMock agent_1_avoidance_callback_mock;
+		navigation_server->agent_set_avoidance_callback(agent_1, callable_mp(&agent_1_avoidance_callback_mock, &CallableMock::function1));
+
+		navigation_server->obstacle_set_map(obstacle_1, map);
+		navigation_server->obstacle_set_avoidance_enabled(obstacle_1, true);
+		navigation_server->obstacle_set_position(obstacle_1, Vector2(2.5, 0.5));
+		navigation_server->obstacle_set_radius(obstacle_1, 1);
+
+		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 0);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 1);
+		Vector3 agent_1_safe_velocity = agent_1_avoidance_callback_mock.function1_latest_arg0;
+		CHECK_MESSAGE(agent_1_safe_velocity.x > 0, "Agent 1 should move a bit along desired velocity (+X).");
+		CHECK_MESSAGE(agent_1_safe_velocity.z < 0, "Agent 1 should move a bit to the side so that it avoids obstacle.");
+
+		navigation_server->free(obstacle_1);
+		navigation_server->free(agent_1);
+		navigation_server->free(map);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should make agents avoid static obstacles when avoidance enabled") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		RID map = navigation_server->map_create();
+		RID agent_1 = navigation_server->agent_create();
+		RID agent_2 = navigation_server->agent_create();
+		RID obstacle_1 = navigation_server->obstacle_create();
+
+		navigation_server->map_set_active(map, true);
+
+		navigation_server->agent_set_map(agent_1, map);
+		navigation_server->agent_set_avoidance_enabled(agent_1, true);
+		navigation_server->agent_set_radius(agent_1, 1.6); // Have hit the obstacle already.
+		navigation_server->agent_set_velocity(agent_1, Vector2(1, 0));
+		CallableMock agent_1_avoidance_callback_mock;
+		navigation_server->agent_set_avoidance_callback(agent_1, callable_mp(&agent_1_avoidance_callback_mock, &CallableMock::function1));
+
+		navigation_server->agent_set_map(agent_2, map);
+		navigation_server->agent_set_avoidance_enabled(agent_2, true);
+		navigation_server->agent_set_radius(agent_2, 1.4); // Haven't hit the obstacle yet.
+		navigation_server->agent_set_velocity(agent_2, Vector2(1, 0));
+		CallableMock agent_2_avoidance_callback_mock;
+		navigation_server->agent_set_avoidance_callback(agent_2, callable_mp(&agent_2_avoidance_callback_mock, &CallableMock::function1));
+
+		navigation_server->obstacle_set_map(obstacle_1, map);
+		navigation_server->obstacle_set_avoidance_enabled(obstacle_1, true);
+		PackedVector2Array obstacle_1_vertices;
+
+		SUBCASE("Static obstacles should work on ground level") {
+			navigation_server->agent_set_position(agent_1, Vector2(0, 0));
+			navigation_server->agent_set_position(agent_2, Vector2(0, 5));
+			obstacle_1_vertices.push_back(Vector2(1.5, 0.5));
+			obstacle_1_vertices.push_back(Vector2(1.5, 4.5));
+		}
+
+		navigation_server->obstacle_set_vertices(obstacle_1, obstacle_1_vertices);
+
+		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 0);
+		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 0);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 1);
+		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 1);
+		Vector3 agent_1_safe_velocity = agent_1_avoidance_callback_mock.function1_latest_arg0;
+		Vector3 agent_2_safe_velocity = agent_2_avoidance_callback_mock.function1_latest_arg0;
+		CHECK_MESSAGE(agent_1_safe_velocity.x > 0, "Agent 1 should move a bit along desired velocity (+X).");
+		CHECK_MESSAGE(agent_1_safe_velocity.z < 0, "Agent 1 should move a bit to the side so that it avoids obstacle.");
+		CHECK_MESSAGE(agent_2_safe_velocity.x > 0, "Agent 2 should move a bit along desired velocity (+X).");
+		CHECK_MESSAGE(agent_2_safe_velocity.z == 0, "Agent 2 should not move to the side.");
+
+		navigation_server->free(obstacle_1);
+		navigation_server->free(agent_2);
+		navigation_server->free(agent_1);
+		navigation_server->free(map);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+	}
+
+	TEST_CASE("[NavigationServer2D][SceneTree] Server should be able to parse geometry") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		// Prepare scene tree with simple mesh to serve as an input geometry.
+		Node2D *node_2d = memnew(Node2D);
+		SceneTree::get_singleton()->get_root()->add_child(node_2d);
+		Polygon2D *polygon = memnew(Polygon2D);
+		polygon->set_polygon(PackedVector2Array({ Vector2(200.0, 200.0), Vector2(400.0, 200.0), Vector2(400.0, 400.0), Vector2(200.0, 400.0) }));
+		node_2d->add_child(polygon);
+
+		// TODO: Use MeshInstance2D as well?
+
+		Ref<NavigationPolygon> navigation_polygon;
+		navigation_polygon.instantiate();
+		Ref<NavigationMeshSourceGeometryData2D> source_geometry;
+		source_geometry.instantiate();
+		CHECK_EQ(source_geometry->get_traversable_outlines().size(), 0);
+		CHECK_EQ(source_geometry->get_obstruction_outlines().size(), 0);
+
+		navigation_server->parse_source_geometry_data(navigation_polygon, source_geometry, polygon);
+		CHECK_EQ(source_geometry->get_traversable_outlines().size(), 0);
+		REQUIRE_EQ(source_geometry->get_obstruction_outlines().size(), 1);
+		CHECK_EQ(((PackedVector2Array)source_geometry->get_obstruction_outlines()[0]).size(), 4);
+
+		SUBCASE("By default, parsing should remove any data that was parsed before") {
+			navigation_server->parse_source_geometry_data(navigation_polygon, source_geometry, polygon);
+			CHECK_EQ(source_geometry->get_traversable_outlines().size(), 0);
+			REQUIRE_EQ(source_geometry->get_obstruction_outlines().size(), 1);
+			CHECK_EQ(((PackedVector2Array)source_geometry->get_obstruction_outlines()[0]).size(), 4);
+		}
+
+		SUBCASE("Parsed geometry should be extendible with other geometry") {
+			source_geometry->merge(source_geometry); // Merging with itself.
+			CHECK_EQ(source_geometry->get_traversable_outlines().size(), 0);
+			REQUIRE_EQ(source_geometry->get_obstruction_outlines().size(), 2);
+			const PackedVector2Array obstruction_outline_1 = source_geometry->get_obstruction_outlines()[0];
+			const PackedVector2Array obstruction_outline_2 = source_geometry->get_obstruction_outlines()[1];
+			REQUIRE_EQ(obstruction_outline_1.size(), 4);
+			REQUIRE_EQ(obstruction_outline_2.size(), 4);
+			CHECK_EQ(obstruction_outline_1[0], obstruction_outline_2[0]);
+			CHECK_EQ(obstruction_outline_1[1], obstruction_outline_2[1]);
+			CHECK_EQ(obstruction_outline_1[2], obstruction_outline_2[2]);
+			CHECK_EQ(obstruction_outline_1[3], obstruction_outline_2[3]);
+		}
+
+		memdelete(polygon);
+		memdelete(node_2d);
+	}
+
+	// This test case uses only public APIs on purpose - other test cases use simplified baking.
+	TEST_CASE("[NavigationServer2D][SceneTree] Server should be able to bake map correctly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+
+		// Prepare scene tree with simple mesh to serve as an input geometry.
+		Node2D *node_2d = memnew(Node2D);
+		SceneTree::get_singleton()->get_root()->add_child(node_2d);
+		Polygon2D *polygon = memnew(Polygon2D);
+		polygon->set_polygon(PackedVector2Array({ Vector2(-200.0, -200.0), Vector2(200.0, -200.0), Vector2(200.0, 200.0), Vector2(-200.0, 200.0) }));
+		node_2d->add_child(polygon);
+
+		// TODO: Use MeshInstance2D as well?
+
+		// Prepare anything necessary to bake navigation polygon.
+		RID map = navigation_server->map_create();
+		RID region = navigation_server->region_create();
+		Ref<NavigationPolygon> navigation_polygon;
+		navigation_polygon.instantiate();
+		navigation_polygon->add_outline(PackedVector2Array({ Vector2(-1000.0, -1000.0), Vector2(1000.0, -1000.0), Vector2(1000.0, 1000.0), Vector2(-1000.0, 1000.0) }));
+		navigation_server->map_set_active(map, true);
+		navigation_server->map_set_use_async_iterations(map, false);
+		navigation_server->region_set_map(region, map);
+		navigation_server->region_set_navigation_polygon(region, navigation_polygon);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+		CHECK_EQ(navigation_polygon->get_polygon_count(), 0);
+		CHECK_EQ(navigation_polygon->get_vertices().size(), 0);
+		CHECK_EQ(navigation_polygon->get_outline_count(), 1);
+
+		Ref<NavigationMeshSourceGeometryData2D> source_geometry;
+		source_geometry.instantiate();
+		navigation_server->parse_source_geometry_data(navigation_polygon, source_geometry, node_2d);
+		navigation_server->bake_from_source_geometry_data(navigation_polygon, source_geometry, Callable());
+		// FIXME: The above line should trigger the update (line below) under the hood.
+		navigation_server->region_set_navigation_polygon(region, navigation_polygon); // Force update.
+		CHECK_EQ(navigation_polygon->get_polygon_count(), 4);
+		CHECK_EQ(navigation_polygon->get_vertices().size(), 8);
+		CHECK_EQ(navigation_polygon->get_outline_count(), 1);
+
+		SUBCASE("Map should emit signal and take newly baked navigation mesh into account") {
+			SIGNAL_WATCH(navigation_server, "map_changed");
+			SIGNAL_CHECK_FALSE("map_changed");
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
+			SIGNAL_CHECK("map_changed", build_array(build_array(map)));
+			SIGNAL_UNWATCH(navigation_server, "map_changed");
+			CHECK_NE(navigation_server->map_get_closest_point(map, Vector2(0, 0)), Vector2(0, 0));
+		}
+
+		navigation_server->free(region);
+		navigation_server->free(map);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+		memdelete(polygon);
+		memdelete(node_2d);
+	}
+
+	// This test case does not check precise values on purpose - to not be too sensitivte.
+	TEST_CASE("[NavigationServer2D] Server should respond to queries against valid map properly") {
+		NavigationServer2D *navigation_server = NavigationServer2D::get_singleton();
+		Ref<NavigationPolygon> navigation_polygon;
+		navigation_polygon.instantiate();
+		Ref<NavigationMeshSourceGeometryData2D> source_geometry;
+		source_geometry.instantiate();
+
+		navigation_polygon->add_outline(PackedVector2Array({ Vector2(-1000.0, -1000.0), Vector2(1000.0, -1000.0), Vector2(1000.0, 1000.0), Vector2(-1000.0, 1000.0) }));
+
+		// TODO: Other input?
+		source_geometry->add_obstruction_outline(PackedVector2Array({ Vector2(-200.0, -200.0), Vector2(200.0, -200.0), Vector2(200.0, 200.0), Vector2(-200.0, 200.0) }));
+
+		navigation_server->bake_from_source_geometry_data(navigation_polygon, source_geometry, Callable());
+		CHECK_NE(navigation_polygon->get_polygon_count(), 0);
+		CHECK_NE(navigation_polygon->get_vertices().size(), 0);
+		CHECK_NE(navigation_polygon->get_outline_count(), 0);
+
+		RID map = navigation_server->map_create();
+		RID region = navigation_server->region_create();
+		navigation_server->map_set_active(map, true);
+		navigation_server->map_set_use_async_iterations(map, false);
+		navigation_server->region_set_map(region, map);
+		navigation_server->region_set_navigation_polygon(region, navigation_polygon);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+
+		SUBCASE("Simple queries should return non-default values") {
+			CHECK_NE(navigation_server->map_get_closest_point(map, Vector2(0.0, 0.0)), Vector2(0, 0));
+			CHECK(navigation_server->map_get_closest_point_owner(map, Vector2(0.0, 0.0)).is_valid());
+			CHECK_NE(navigation_server->map_get_path(map, Vector2(0, 0), Vector2(10, 10), true).size(), 0);
+			CHECK_NE(navigation_server->map_get_path(map, Vector2(0, 0), Vector2(10, 10), false).size(), 0);
+		}
+
+		SUBCASE("Elaborate query with 'CORRIDORFUNNEL' post-processing should yield non-empty result") {
+			Ref<NavigationPathQueryParameters2D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector2(0, 0));
+			query_parameters->set_target_position(Vector2(10, 10));
+			query_parameters->set_path_postprocessing(NavigationPathQueryParameters2D::PATH_POSTPROCESSING_CORRIDORFUNNEL);
+			Ref<NavigationPathQueryResult2D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_NE(query_result->get_path().size(), 0);
+			CHECK_NE(query_result->get_path_types().size(), 0);
+			CHECK_NE(query_result->get_path_rids().size(), 0);
+			CHECK_NE(query_result->get_path_owner_ids().size(), 0);
+		}
+
+		SUBCASE("Elaborate query with 'EDGECENTERED' post-processing should yield non-empty result") {
+			Ref<NavigationPathQueryParameters2D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector2(10, 10));
+			query_parameters->set_target_position(Vector2(0, 0));
+			query_parameters->set_path_postprocessing(NavigationPathQueryParameters2D::PATH_POSTPROCESSING_EDGECENTERED);
+			Ref<NavigationPathQueryResult2D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_NE(query_result->get_path().size(), 0);
+			CHECK_NE(query_result->get_path_types().size(), 0);
+			CHECK_NE(query_result->get_path_rids().size(), 0);
+			CHECK_NE(query_result->get_path_owner_ids().size(), 0);
+		}
+
+		SUBCASE("Elaborate query with non-matching navigation layer mask should yield empty result") {
+			Ref<NavigationPathQueryParameters2D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector2(10, 10));
+			query_parameters->set_target_position(Vector2(0, 0));
+			query_parameters->set_navigation_layers(2);
+			Ref<NavigationPathQueryResult2D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_EQ(query_result->get_path().size(), 0);
+			CHECK_EQ(query_result->get_path_types().size(), 0);
+			CHECK_EQ(query_result->get_path_rids().size(), 0);
+			CHECK_EQ(query_result->get_path_owner_ids().size(), 0);
+		}
+
+		SUBCASE("Elaborate query without metadata flags should yield path only") {
+			Ref<NavigationPathQueryParameters2D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector2(10, 10));
+			query_parameters->set_target_position(Vector2(0, 0));
+			query_parameters->set_metadata_flags(0);
+			Ref<NavigationPathQueryResult2D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_NE(query_result->get_path().size(), 0);
+			CHECK_EQ(query_result->get_path_types().size(), 0);
+			CHECK_EQ(query_result->get_path_rids().size(), 0);
+			CHECK_EQ(query_result->get_path_owner_ids().size(), 0);
+		}
+
+		navigation_server->free(region);
+		navigation_server->free(map);
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
+	}
+
+	TEST_CASE("[NavigationServer2D] Server should simplify path properly") {
+		real_t simplify_epsilon = 0.2;
+		Vector<Vector2> source_path;
+		source_path.resize(7);
+		source_path.write[0] = Vector2(0.0, 0.0);
+		source_path.write[1] = Vector2(0.0, 1.0); // This point needs to go.
+		source_path.write[2] = Vector2(0.0, 2.0); // This point needs to go.
+		source_path.write[3] = Vector2(0.0, 2.0);
+		source_path.write[4] = Vector2(2.0, 3.0);
+		source_path.write[5] = Vector2(2.5, 4.0); // This point needs to go.
+		source_path.write[6] = Vector2(3.0, 5.0);
+		Vector<Vector2> simplified_path = NavigationServer2D::get_singleton()->simplify_path(source_path, simplify_epsilon);
+		CHECK_EQ(simplified_path.size(), 4);
 	}
 }
 } //namespace TestNavigationServer2D
-
-#endif // TEST_NAVIGATION_SERVER_2D_H
diff --git a/engine/tests/servers/test_navigation_server_3d.h b/engine/tests/servers/test_navigation_server_3d.h
index d45e7558..463929f6 100644
--- a/engine/tests/servers/test_navigation_server_3d.h
+++ b/engine/tests/servers/test_navigation_server_3d.h
@@ -28,15 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_NAVIGATION_SERVER_3D_H
-#define TEST_NAVIGATION_SERVER_3D_H
+#pragma once
 
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "servers/navigation_server_3d.h"
 
-#include "modules/navigation/nav_utils.h"
-
 namespace TestNavigationServer3D {
 
 // TODO: Find a more generic way to create `Callable` mocks.
@@ -63,33 +60,7 @@ static inline Array build_array(Variant item, Targs... Fargs) {
 	return a;
 }
 
-struct GreaterThan {
-	bool operator()(int p_a, int p_b) const { return p_a > p_b; }
-};
-
-struct CompareArrayValues {
-	const int *array;
-
-	CompareArrayValues(const int *p_array) :
-			array(p_array) {}
-
-	bool operator()(uint32_t p_index_a, uint32_t p_index_b) const {
-		return array[p_index_a] < array[p_index_b];
-	}
-};
-
-struct RegisterHeapIndexes {
-	uint32_t *indexes;
-
-	RegisterHeapIndexes(uint32_t *p_indexes) :
-			indexes(p_indexes) {}
-
-	void operator()(uint32_t p_vector_index, uint32_t p_heap_index) {
-		indexes[p_vector_index] = p_heap_index;
-	}
-};
-
-TEST_SUITE("[Navigation]") {
+TEST_SUITE("[Navigation3D]") {
 	TEST_CASE("[NavigationServer3D] Server should be empty when initialized") {
 		NavigationServer3D *navigation_server = NavigationServer3D::get_singleton();
 		CHECK_EQ(navigation_server->get_maps().size(), 0);
@@ -120,7 +91,7 @@ TEST_SUITE("[Navigation]") {
 		SUBCASE("Setters/getters should work") {
 			bool initial_use_3d_avoidance = navigation_server->agent_get_use_3d_avoidance(agent);
 			navigation_server->agent_set_use_3d_avoidance(agent, !initial_use_3d_avoidance);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 			CHECK_EQ(navigation_server->agent_get_use_3d_avoidance(agent), !initial_use_3d_avoidance);
 			// TODO: Add remaining setters/getters once the missing getters are added.
@@ -131,11 +102,11 @@ TEST_SUITE("[Navigation]") {
 			CHECK(map.is_valid());
 			navigation_server->map_set_active(map, true);
 			navigation_server->agent_set_map(agent, map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_AGENT_COUNT), 1);
 			navigation_server->agent_set_map(agent, RID());
 			navigation_server->free(map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_AGENT_COUNT), 0);
 		}
 
@@ -186,7 +157,7 @@ TEST_SUITE("[Navigation]") {
 			navigation_server->map_set_up(map, Vector3(1, 0, 0));
 			bool initial_use_edge_connections = navigation_server->map_get_use_edge_connections(map);
 			navigation_server->map_set_use_edge_connections(map, !initial_use_edge_connections);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 			CHECK_EQ(navigation_server->map_get_cell_size(map), doctest::Approx(0.55));
 			CHECK_EQ(navigation_server->map_get_edge_connection_margin(map), doctest::Approx(0.66));
@@ -197,11 +168,11 @@ TEST_SUITE("[Navigation]") {
 
 		SUBCASE("'ProcessInfo' should report map iff active") {
 			navigation_server->map_set_active(map, true);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK(navigation_server->map_is_active(map));
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_ACTIVE_MAPS), 1);
 			navigation_server->map_set_active(map, false);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_ACTIVE_MAPS), 0);
 		}
 
@@ -209,10 +180,10 @@ TEST_SUITE("[Navigation]") {
 			RID agent = navigation_server->agent_create();
 			CHECK(agent.is_valid());
 			navigation_server->agent_set_map(agent, map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_agents(map).size(), 1);
 			navigation_server->free(agent);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_agents(map).size(), 0);
 		}
 
@@ -220,10 +191,10 @@ TEST_SUITE("[Navigation]") {
 			RID link = navigation_server->link_create();
 			CHECK(link.is_valid());
 			navigation_server->link_set_map(link, map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_links(map).size(), 1);
 			navigation_server->free(link);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_links(map).size(), 0);
 		}
 
@@ -231,10 +202,10 @@ TEST_SUITE("[Navigation]") {
 			RID obstacle = navigation_server->obstacle_create();
 			CHECK(obstacle.is_valid());
 			navigation_server->obstacle_set_map(obstacle, map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_obstacles(map).size(), 1);
 			navigation_server->free(obstacle);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_obstacles(map).size(), 0);
 		}
 
@@ -242,16 +213,16 @@ TEST_SUITE("[Navigation]") {
 			RID region = navigation_server->region_create();
 			CHECK(region.is_valid());
 			navigation_server->region_set_map(region, map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_regions(map).size(), 1);
 			navigation_server->free(region);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->map_get_regions(map).size(), 0);
 		}
 
 		SUBCASE("Queries against empty map should return empty or invalid values") {
 			navigation_server->map_set_active(map, true);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 			ERR_PRINT_OFF;
 			CHECK_EQ(navigation_server->map_get_closest_point(map, Vector3(7, 7, 7)), Vector3());
@@ -275,11 +246,11 @@ TEST_SUITE("[Navigation]") {
 			ERR_PRINT_ON;
 
 			navigation_server->map_set_active(map, false);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 		}
 
 		navigation_server->free(map);
-		navigation_server->process(0.0); // Give server some cycles to actually remove map.
+		navigation_server->physics_process(0.0); // Give server some cycles to actually remove map.
 		CHECK_EQ(navigation_server->get_maps().size(), 0);
 	}
 
@@ -302,7 +273,7 @@ TEST_SUITE("[Navigation]") {
 			navigation_server->link_set_owner_id(link, ObjectID((int64_t)7));
 			navigation_server->link_set_start_position(link, Vector3(8, 8, 8));
 			navigation_server->link_set_travel_cost(link, 0.66);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 			CHECK_EQ(navigation_server->link_is_bidirectional(link), !initial_bidirectional);
 			CHECK_EQ(navigation_server->link_get_end_position(link), Vector3(7, 7, 7));
@@ -318,11 +289,11 @@ TEST_SUITE("[Navigation]") {
 			CHECK(map.is_valid());
 			navigation_server->map_set_active(map, true);
 			navigation_server->link_set_map(link, map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_LINK_COUNT), 1);
 			navigation_server->link_set_map(link, RID());
 			navigation_server->free(map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_LINK_COUNT), 0);
 		}
 
@@ -357,7 +328,7 @@ TEST_SUITE("[Navigation]") {
 			navigation_server->region_set_owner_id(region, ObjectID((int64_t)7));
 			navigation_server->region_set_travel_cost(region, 0.66);
 			navigation_server->region_set_use_edge_connections(region, !initial_use_edge_connections);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 			CHECK_EQ(navigation_server->region_get_enter_cost(region), doctest::Approx(0.55));
 			CHECK_EQ(navigation_server->region_get_navigation_layers(region), 5);
@@ -371,11 +342,11 @@ TEST_SUITE("[Navigation]") {
 			CHECK(map.is_valid());
 			navigation_server->map_set_active(map, true);
 			navigation_server->region_set_map(region, map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_REGION_COUNT), 1);
 			navigation_server->region_set_map(region, RID());
 			navigation_server->free(map);
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			CHECK_EQ(navigation_server->get_process_info(NavigationServer3D::INFO_REGION_COUNT), 0);
 		}
 
@@ -404,7 +375,7 @@ TEST_SUITE("[Navigation]") {
 		CallableMock agent_avoidance_callback_mock;
 		navigation_server->agent_set_avoidance_callback(agent, callable_mp(&agent_avoidance_callback_mock, &CallableMock::function1));
 		CHECK_EQ(agent_avoidance_callback_mock.function1_calls, 0);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 		CHECK_EQ(agent_avoidance_callback_mock.function1_calls, 1);
 		CHECK_NE(agent_avoidance_callback_mock.function1_latest_arg0, Vector3(0, 0, 0));
 
@@ -440,7 +411,7 @@ TEST_SUITE("[Navigation]") {
 
 		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 0);
 		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 0);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 1);
 		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 1);
 		Vector3 agent_1_safe_velocity = agent_1_avoidance_callback_mock.function1_latest_arg0;
@@ -478,7 +449,7 @@ TEST_SUITE("[Navigation]") {
 		navigation_server->obstacle_set_radius(obstacle_1, 1);
 
 		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 0);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 1);
 		Vector3 agent_1_safe_velocity = agent_1_avoidance_callback_mock.function1_latest_arg0;
 		CHECK_MESSAGE(agent_1_safe_velocity.x > 0, "Agent 1 should move a bit along desired velocity (+X).");
@@ -487,7 +458,7 @@ TEST_SUITE("[Navigation]") {
 		navigation_server->free(obstacle_1);
 		navigation_server->free(agent_1);
 		navigation_server->free(map);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 	}
 
 	TEST_CASE("[NavigationServer3D] Server should make agents avoid static obstacles when avoidance enabled") {
@@ -537,7 +508,7 @@ TEST_SUITE("[Navigation]") {
 
 		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 0);
 		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 0);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 		CHECK_EQ(agent_1_avoidance_callback_mock.function1_calls, 1);
 		CHECK_EQ(agent_2_avoidance_callback_mock.function1_calls, 1);
 		Vector3 agent_1_safe_velocity = agent_1_avoidance_callback_mock.function1_latest_arg0;
@@ -551,7 +522,7 @@ TEST_SUITE("[Navigation]") {
 		navigation_server->free(agent_2);
 		navigation_server->free(agent_1);
 		navigation_server->free(map);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 	}
 
 #ifndef DISABLE_DEPRECATED
@@ -577,7 +548,7 @@ TEST_SUITE("[Navigation]") {
 		navigation_server->map_set_active(map, true);
 		navigation_server->region_set_map(region, map);
 		navigation_server->region_set_navigation_mesh(region, navigation_mesh);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 		CHECK_EQ(navigation_mesh->get_polygon_count(), 0);
 		CHECK_EQ(navigation_mesh->get_vertices().size(), 0);
@@ -593,7 +564,7 @@ TEST_SUITE("[Navigation]") {
 		SUBCASE("Map should emit signal and take newly baked navigation mesh into account") {
 			SIGNAL_WATCH(navigation_server, "map_changed");
 			SIGNAL_CHECK_FALSE("map_changed");
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			SIGNAL_CHECK("map_changed", build_array(build_array(map)));
 			SIGNAL_UNWATCH(navigation_server, "map_changed");
 			CHECK_NE(navigation_server->map_get_closest_point(map, Vector3(0, 0, 0)), Vector3(0, 0, 0));
@@ -601,7 +572,7 @@ TEST_SUITE("[Navigation]") {
 
 		navigation_server->free(region);
 		navigation_server->free(map);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 		memdelete(mesh_instance);
 		memdelete(node_3d);
 	}
@@ -673,7 +644,7 @@ TEST_SUITE("[Navigation]") {
 		navigation_server->map_set_active(map, true);
 		navigation_server->region_set_map(region, map);
 		navigation_server->region_set_navigation_mesh(region, navigation_mesh);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 		CHECK_EQ(navigation_mesh->get_polygon_count(), 0);
 		CHECK_EQ(navigation_mesh->get_vertices().size(), 0);
@@ -689,7 +660,7 @@ TEST_SUITE("[Navigation]") {
 		SUBCASE("Map should emit signal and take newly baked navigation mesh into account") {
 			SIGNAL_WATCH(navigation_server, "map_changed");
 			SIGNAL_CHECK_FALSE("map_changed");
-			navigation_server->process(0.0); // Give server some cycles to commit.
+			navigation_server->physics_process(0.0); // Give server some cycles to commit.
 			SIGNAL_CHECK("map_changed", build_array(build_array(map)));
 			SIGNAL_UNWATCH(navigation_server, "map_changed");
 			CHECK_NE(navigation_server->map_get_closest_point(map, Vector3(0, 0, 0)), Vector3(0, 0, 0));
@@ -697,7 +668,7 @@ TEST_SUITE("[Navigation]") {
 
 		navigation_server->free(region);
 		navigation_server->free(map);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 		memdelete(mesh_instance);
 		memdelete(node_3d);
 	}
@@ -722,7 +693,7 @@ TEST_SUITE("[Navigation]") {
 		navigation_server->map_set_use_async_iterations(map, false);
 		navigation_server->region_set_map(region, map);
 		navigation_server->region_set_navigation_mesh(region, navigation_mesh);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 
 		SUBCASE("Simple queries should return non-default values") {
 			CHECK_NE(navigation_server->map_get_closest_point(map, Vector3(0, 0, 0)), Vector3(0, 0, 0));
@@ -794,9 +765,49 @@ TEST_SUITE("[Navigation]") {
 			CHECK_EQ(query_result->get_path_owner_ids().size(), 0);
 		}
 
+		SUBCASE("Elaborate query with excluded region should yield empty path") {
+			Ref<NavigationPathQueryParameters3D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector3(10, 0, 10));
+			query_parameters->set_target_position(Vector3(0, 0, 0));
+			query_parameters->set_excluded_regions({ region });
+			Ref<NavigationPathQueryResult3D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_EQ(query_result->get_path().size(), 0);
+		}
+
+		SUBCASE("Elaborate query with included region should yield path") {
+			Ref<NavigationPathQueryParameters3D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector3(10, 0, 10));
+			query_parameters->set_target_position(Vector3(0, 0, 0));
+			query_parameters->set_included_regions({ region });
+			Ref<NavigationPathQueryResult3D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_NE(query_result->get_path().size(), 0);
+		}
+
+		SUBCASE("Elaborate query with excluded and included region should yield empty path") {
+			Ref<NavigationPathQueryParameters3D> query_parameters;
+			query_parameters.instantiate();
+			query_parameters->set_map(map);
+			query_parameters->set_start_position(Vector3(10, 0, 10));
+			query_parameters->set_target_position(Vector3(0, 0, 0));
+			query_parameters->set_excluded_regions({ region });
+			query_parameters->set_included_regions({ region });
+			Ref<NavigationPathQueryResult3D> query_result;
+			query_result.instantiate();
+			navigation_server->query_path(query_parameters, query_result);
+			CHECK_EQ(query_result->get_path().size(), 0);
+		}
+
 		navigation_server->free(region);
 		navigation_server->free(map);
-		navigation_server->process(0.0); // Give server some cycles to commit.
+		navigation_server->physics_process(0.0); // Give server some cycles to commit.
 	}
 
 	// FIXME: The race condition mentioned below is actually a problem and fails on CI (GH-90613).
@@ -834,140 +845,5 @@ TEST_SUITE("[Navigation]") {
 		Vector<Vector3> simplified_path = NavigationServer3D::get_singleton()->simplify_path(source_path, simplify_epsilon);
 		CHECK_EQ(simplified_path.size(), 4);
 	}
-
-	TEST_CASE("[Heap] size") {
-		gd::Heap<int> heap;
-
-		CHECK(heap.size() == 0);
-
-		heap.push(0);
-		CHECK(heap.size() == 1);
-
-		heap.push(1);
-		CHECK(heap.size() == 2);
-
-		heap.pop();
-		CHECK(heap.size() == 1);
-
-		heap.pop();
-		CHECK(heap.size() == 0);
-	}
-
-	TEST_CASE("[Heap] is_empty") {
-		gd::Heap<int> heap;
-
-		CHECK(heap.is_empty() == true);
-
-		heap.push(0);
-		CHECK(heap.is_empty() == false);
-
-		heap.pop();
-		CHECK(heap.is_empty() == true);
-	}
-
-	TEST_CASE("[Heap] push/pop") {
-		SUBCASE("Default comparator") {
-			gd::Heap<int> heap;
-
-			heap.push(2);
-			heap.push(7);
-			heap.push(5);
-			heap.push(3);
-			heap.push(4);
-
-			CHECK(heap.pop() == 7);
-			CHECK(heap.pop() == 5);
-			CHECK(heap.pop() == 4);
-			CHECK(heap.pop() == 3);
-			CHECK(heap.pop() == 2);
-		}
-
-		SUBCASE("Custom comparator") {
-			GreaterThan greaterThan;
-			gd::Heap<int, GreaterThan> heap(greaterThan);
-
-			heap.push(2);
-			heap.push(7);
-			heap.push(5);
-			heap.push(3);
-			heap.push(4);
-
-			CHECK(heap.pop() == 2);
-			CHECK(heap.pop() == 3);
-			CHECK(heap.pop() == 4);
-			CHECK(heap.pop() == 5);
-			CHECK(heap.pop() == 7);
-		}
-
-		SUBCASE("Intermediate pops") {
-			gd::Heap<int> heap;
-
-			heap.push(0);
-			heap.push(3);
-			heap.pop();
-			heap.push(1);
-			heap.push(2);
-
-			CHECK(heap.pop() == 2);
-			CHECK(heap.pop() == 1);
-			CHECK(heap.pop() == 0);
-		}
-	}
-
-	TEST_CASE("[Heap] shift") {
-		int values[] = { 5, 3, 6, 7, 1 };
-		uint32_t heap_indexes[] = { 0, 0, 0, 0, 0 };
-		CompareArrayValues comparator(values);
-		RegisterHeapIndexes indexer(heap_indexes);
-		gd::Heap<uint32_t, CompareArrayValues, RegisterHeapIndexes> heap(comparator, indexer);
-
-		heap.push(0);
-		heap.push(1);
-		heap.push(2);
-		heap.push(3);
-		heap.push(4);
-
-		// Shift down: 6 -> 2
-		values[2] = 2;
-		heap.shift(heap_indexes[2]);
-
-		// Shift up: 5 -> 8
-		values[0] = 8;
-		heap.shift(heap_indexes[0]);
-
-		CHECK(heap.pop() == 0);
-		CHECK(heap.pop() == 3);
-		CHECK(heap.pop() == 1);
-		CHECK(heap.pop() == 2);
-		CHECK(heap.pop() == 4);
-
-		CHECK(heap_indexes[0] == UINT32_MAX);
-		CHECK(heap_indexes[1] == UINT32_MAX);
-		CHECK(heap_indexes[2] == UINT32_MAX);
-		CHECK(heap_indexes[3] == UINT32_MAX);
-		CHECK(heap_indexes[4] == UINT32_MAX);
-	}
-
-	TEST_CASE("[Heap] clear") {
-		uint32_t heap_indexes[] = { 0, 0, 0, 0 };
-		RegisterHeapIndexes indexer(heap_indexes);
-		gd::Heap<uint32_t, Comparator<uint32_t>, RegisterHeapIndexes> heap(indexer);
-
-		heap.push(0);
-		heap.push(2);
-		heap.push(1);
-		heap.push(3);
-
-		heap.clear();
-
-		CHECK(heap.size() == 0);
-
-		CHECK(heap_indexes[0] == UINT32_MAX);
-		CHECK(heap_indexes[1] == UINT32_MAX);
-		CHECK(heap_indexes[2] == UINT32_MAX);
-		CHECK(heap_indexes[3] == UINT32_MAX);
-	}
 }
 } //namespace TestNavigationServer3D
-
-#endif // TEST_NAVIGATION_SERVER_3D_H
diff --git a/engine/tests/servers/test_text_server.h b/engine/tests/servers/test_text_server.h
index 6816a397..e28c28c3 100644
--- a/engine/tests/servers/test_text_server.h
+++ b/engine/tests/servers/test_text_server.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TEXT_SERVER_H
-#define TEST_TEXT_SERVER_H
+#pragma once
 
 #ifdef TOOLS_ENABLED
 
@@ -73,10 +72,7 @@ TEST_SUITE("[TextServer]") {
 				ts->font_set_data_ptr(font2, _font_NotoSansThai_Regular, _font_NotoSansThai_Regular_size);
 				ts->font_set_allow_system_fallback(font2, false);
 
-				Array font;
-				font.push_back(font1);
-				font.push_back(font2);
-
+				Array font = { font1, font2 };
 				String test = U"คนอ้วน khon uan ראה";
 				//                 6^       17^
 
@@ -126,10 +122,7 @@ TEST_SUITE("[TextServer]") {
 				RID font2 = ts->create_font();
 				ts->font_set_data_ptr(font2, _font_Vazirmatn_Regular, _font_Vazirmatn_Regular_size);
 
-				Array font;
-				font.push_back(font1);
-				font.push_back(font2);
-
+				Array font = { font1, font2 };
 				String test = U"Arabic (اَلْعَرَبِيَّةُ, al-ʿarabiyyah)";
 				//                    7^      26^
 
@@ -183,11 +176,7 @@ TEST_SUITE("[TextServer]") {
 				ts->font_set_data_ptr(font3, _font_Vazirmatn_Regular, _font_Vazirmatn_Regular_size);
 				ts->font_set_allow_system_fallback(font3, false);
 
-				Array font;
-				font.push_back(font1);
-				font.push_back(font2);
-				font.push_back(font3);
-
+				Array font = { font1, font2, font3 };
 				{
 					RID ctx = ts->create_shaped_text();
 					CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
@@ -508,7 +497,7 @@ TEST_SUITE("[TextServer]") {
 						{ U"test\r test", { 0, 5, 5, 10 } },
 						{ U"test\r test \r test", { 0, 5, 5, 12, 12, 17 } },
 					};
-					for (size_t j = 0; j < sizeof(cases) / sizeof(TestCase); j++) {
+					for (size_t j = 0; j < std::size(cases); j++) {
 						RID ctx = ts->create_shaped_text();
 						CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 						bool ok = ts->shaped_text_add_string(ctx, cases[j].text, font, 16);
@@ -528,11 +517,17 @@ TEST_SUITE("[TextServer]") {
 					struct TestCase {
 						String text;
 						PackedInt32Array breaks;
+						BitField<TextServer::LineBreakFlag> flags = TextServer::BREAK_NONE;
 					};
 					TestCase cases[] = {
-						{ U"test \rtest", { 0, 4, 6, 10 } },
-						{ U"test\r test", { 0, 4, 6, 10 } },
-						{ U"test\r test \r test", { 0, 4, 6, 10, 13, 17 } },
+						{ U"test \rtest", { 0, 4, 6, 10 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES },
+						{ U"test \rtest", { 0, 6, 6, 10 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES },
+						{ U"test\r test", { 0, 4, 6, 10 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES },
+						{ U"test\r test", { 0, 4, 5, 10 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_END_EDGE_SPACES },
+						{ U"test\r test \r test", { 0, 4, 6, 10, 13, 17 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES },
+						{ U"test\r test \r test", { 0, 5, 6, 12, 13, 17 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_START_EDGE_SPACES },
+						{ U"test\r test \r test", { 0, 4, 5, 10, 12, 17 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_END_EDGE_SPACES },
+						{ U"test\r test \r test", { 0, 5, 5, 12, 12, 17 }, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND },
 					};
 					for (size_t j = 0; j < sizeof(cases) / sizeof(TestCase); j++) {
 						RID ctx = ts->create_shaped_text();
@@ -540,10 +535,10 @@ TEST_SUITE("[TextServer]") {
 						bool ok = ts->shaped_text_add_string(ctx, cases[j].text, font, 16);
 						CHECK_FALSE_MESSAGE(!ok, "Adding text to the buffer failed.");
 
-						PackedInt32Array breaks = ts->shaped_text_get_line_breaks(ctx, 90.0, 0, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_EDGE_SPACES);
+						PackedInt32Array breaks = ts->shaped_text_get_line_breaks(ctx, 90.0, 0, cases[j].flags);
 						CHECK_FALSE_MESSAGE(breaks != cases[j].breaks, "Invalid break points.");
 
-						breaks = ts->shaped_text_get_line_breaks_adv(ctx, { 90.0 }, 0, false, TextServer::BREAK_MANDATORY | TextServer::BREAK_WORD_BOUND | TextServer::BREAK_TRIM_EDGE_SPACES);
+						breaks = ts->shaped_text_get_line_breaks_adv(ctx, { 90.0 }, 0, false, cases[j].flags);
 						CHECK_FALSE_MESSAGE(breaks != cases[j].breaks, "Invalid break points.");
 
 						ts->free_rid(ctx);
@@ -574,10 +569,7 @@ TEST_SUITE("[TextServer]") {
 				RID font2 = ts->create_font();
 				ts->font_set_data_ptr(font2, _font_NotoSansThai_Regular, _font_NotoSansThai_Regular_size);
 
-				Array font;
-				font.push_back(font1);
-				font.push_back(font2);
-
+				Array font = { font1, font2 };
 				RID ctx = ts->create_shaped_text();
 				CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 				bool ok = ts->shaped_text_add_string(ctx, test_1, font, 16);
@@ -596,7 +588,7 @@ TEST_SUITE("[TextServer]") {
 					CHECK_FALSE_MESSAGE(brks[5] != 14, "Invalid line break position.");
 				}
 
-				brks = ts->shaped_text_get_line_breaks(ctx, 35.0, 0, TextServer::BREAK_WORD_BOUND | TextServer::BREAK_MANDATORY | TextServer::BREAK_TRIM_EDGE_SPACES);
+				brks = ts->shaped_text_get_line_breaks(ctx, 35.0, 0, TextServer::BREAK_WORD_BOUND | TextServer::BREAK_MANDATORY | TextServer::BREAK_TRIM_START_EDGE_SPACES | TextServer::BREAK_TRIM_END_EDGE_SPACES);
 				CHECK_FALSE_MESSAGE(brks.size() != 6, "Invalid line breaks number.");
 				if (brks.size() == 6) {
 					CHECK_FALSE_MESSAGE(brks[0] != 0, "Invalid line break position.");
@@ -632,10 +624,7 @@ TEST_SUITE("[TextServer]") {
 				RID font2 = ts->create_font();
 				ts->font_set_data_ptr(font2, _font_Vazirmatn_Regular, _font_Vazirmatn_Regular_size);
 
-				Array font;
-				font.push_back(font1);
-				font.push_back(font2);
-
+				Array font = { font1, font2 };
 				String test_1 = U"الحمد";
 				String test_2 = U"الحمد test";
 				String test_3 = U"test test";
@@ -944,9 +933,7 @@ TEST_SUITE("[TextServer]") {
 				RID font1 = ts->create_font();
 				ts->font_set_data_ptr(font1, _font_NotoSans_Regular, _font_NotoSans_Regular_size);
 
-				Array font;
-				font.push_back(font1);
-
+				Array font = { font1 };
 				RID ctx = ts->create_shaped_text();
 				CHECK_FALSE_MESSAGE(ctx == RID(), "Creating text buffer failed.");
 				bool ok = ts->shaped_text_add_string(ctx, "T", font, 16);
@@ -977,5 +964,3 @@ TEST_SUITE("[TextServer]") {
 }; // namespace TestTextServer
 
 #endif // TOOLS_ENABLED
-
-#endif // TEST_TEXT_SERVER_H
diff --git a/engine/tests/test_macros.h b/engine/tests/test_macros.h
index 31eafe68..5354fcb9 100644
--- a/engine/tests/test_macros.h
+++ b/engine/tests/test_macros.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_MACROS_H
-#define TEST_MACROS_H
+#pragma once
 
 #include "display_server_mock.h"
 
@@ -212,12 +211,12 @@ int register_test_command(String p_command, TestFunc p_function);
 		MessageQueue::get_singleton()->flush();                                          \
 	}
 
-#define SEND_GUI_DOUBLE_CLICK(m_screen_pos, m_modifiers)                          \
-	{                                                                             \
-		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, MouseButton::LEFT, 0, m_modifiers); \
-		event->set_double_click(true);                                            \
-		_SEND_DISPLAYSERVER_EVENT(event);                                         \
-		MessageQueue::get_singleton()->flush();                                   \
+#define SEND_GUI_DOUBLE_CLICK(m_screen_pos, m_modifiers)                                              \
+	{                                                                                                 \
+		_CREATE_GUI_MOUSE_EVENT(m_screen_pos, MouseButton::LEFT, MouseButtonMask::NONE, m_modifiers); \
+		event->set_double_click(true);                                                                \
+		_SEND_DISPLAYSERVER_EVENT(event);                                                             \
+		MessageQueue::get_singleton()->flush();                                                       \
 	}
 
 // We toggle _print_error_enabled to prevent display server not supported warnings.
@@ -277,23 +276,17 @@ private:
 	}
 
 	void _signal_callback_one(Variant p_arg1, const String &p_name) {
-		Array args;
-		args.push_back(p_arg1);
+		Array args = { p_arg1 };
 		_add_signal_entry(args, p_name);
 	}
 
 	void _signal_callback_two(Variant p_arg1, Variant p_arg2, const String &p_name) {
-		Array args;
-		args.push_back(p_arg1);
-		args.push_back(p_arg2);
+		Array args = { p_arg1, p_arg2 };
 		_add_signal_entry(args, p_name);
 	}
 
 	void _signal_callback_three(Variant p_arg1, Variant p_arg2, Variant p_arg3, const String &p_name) {
-		Array args;
-		args.push_back(p_arg1);
-		args.push_back(p_arg2);
-		args.push_back(p_arg3);
+		Array args = { p_arg1, p_arg2, p_arg3 };
 		_add_signal_entry(args, p_name);
 	}
 
@@ -478,5 +471,3 @@ public:
 			CHECK(string_list[i] == m_slices[i]);                                                \
 		}                                                                                        \
 	} while (false)
-
-#endif // TEST_MACROS_H
diff --git a/engine/tests/test_main.cpp b/engine/tests/test_main.cpp
index c12e9270..7a3efdb5 100644
--- a/engine/tests/test_main.cpp
+++ b/engine/tests/test_main.cpp
@@ -57,6 +57,7 @@
 #include "tests/core/io/test_resource_uid.h"
 #include "tests/core/io/test_stream_peer.h"
 #include "tests/core/io/test_stream_peer_buffer.h"
+#include "tests/core/io/test_stream_peer_gzip.h"
 #include "tests/core/io/test_tcp_server.h"
 #include "tests/core/io/test_udp_server.h"
 #include "tests/core/io/test_xml_parser.h"
@@ -102,6 +103,7 @@
 #include "tests/core/templates/test_oa_hash_map.h"
 #include "tests/core/templates/test_paged_array.h"
 #include "tests/core/templates/test_rid.h"
+#include "tests/core/templates/test_span.h"
 #include "tests/core/templates/test_vector.h"
 #include "tests/core/test_crypto.h"
 #include "tests/core/test_hashing_context.h"
@@ -133,7 +135,6 @@
 #include "tests/scene/test_parallax_2d.h"
 #include "tests/scene/test_path_2d.h"
 #include "tests/scene/test_path_follow_2d.h"
-#include "tests/scene/test_physics_material.h"
 #include "tests/scene/test_sprite_frames.h"
 #include "tests/scene/test_style_box_texture.h"
 #include "tests/scene/test_texture_progress_bar.h"
@@ -143,6 +144,7 @@
 #include "tests/scene/test_visual_shader.h"
 #include "tests/scene/test_window.h"
 #include "tests/servers/rendering/test_shader_preprocessor.h"
+#include "tests/servers/test_nav_heap.h"
 #include "tests/servers/test_text_server.h"
 #include "tests/test_validate_testing.h"
 
@@ -159,21 +161,10 @@
 #endif // ADVANCED_GUI_DISABLED
 
 #ifndef _3D_DISABLED
-#ifdef MODULE_NAVIGATION_ENABLED
-#include "tests/scene/test_navigation_agent_2d.h"
-#include "tests/scene/test_navigation_agent_3d.h"
-#include "tests/scene/test_navigation_obstacle_2d.h"
-#include "tests/scene/test_navigation_obstacle_3d.h"
-#include "tests/scene/test_navigation_region_2d.h"
-#include "tests/scene/test_navigation_region_3d.h"
-#include "tests/servers/test_navigation_server_2d.h"
-#include "tests/servers/test_navigation_server_3d.h"
-#endif // MODULE_NAVIGATION_ENABLED
-
+#include "tests/core/math/test_triangle_mesh.h"
 #include "tests/scene/test_arraymesh.h"
 #include "tests/scene/test_camera_3d.h"
 #include "tests/scene/test_gltf_document.h"
-#include "tests/scene/test_height_map_shape_3d.h"
 #include "tests/scene/test_path_3d.h"
 #include "tests/scene/test_path_follow_3d.h"
 #include "tests/scene/test_primitives.h"
@@ -181,22 +172,48 @@
 #include "tests/scene/test_sky.h"
 #endif // _3D_DISABLED
 
+#ifndef PHYSICS_3D_DISABLED
+#include "tests/scene/test_height_map_shape_3d.h"
+#include "tests/scene/test_physics_material.h"
+#endif // PHYSICS_3D_DISABLED
+
+#ifdef MODULE_NAVIGATION_2D_ENABLED
+#include "tests/scene/test_navigation_agent_2d.h"
+#include "tests/scene/test_navigation_obstacle_2d.h"
+#include "tests/scene/test_navigation_region_2d.h"
+#include "tests/servers/test_navigation_server_2d.h"
+#endif // MODULE_NAVIGATION_2D_ENABLED
+
+#ifdef MODULE_NAVIGATION_3D_ENABLED
+#include "tests/scene/test_navigation_agent_3d.h"
+#include "tests/scene/test_navigation_obstacle_3d.h"
+#include "tests/scene/test_navigation_region_3d.h"
+#include "tests/servers/test_navigation_server_3d.h"
+#endif // MODULE_NAVIGATION_3D_ENABLED
+
 #include "modules/modules_tests.gen.h"
 
 #include "tests/display_server_mock.h"
 #include "tests/test_macros.h"
 
 #include "scene/theme/theme_db.h"
-#ifndef _3D_DISABLED
+
+#ifndef NAVIGATION_2D_DISABLED
 #include "servers/navigation_server_2d.h"
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 #include "servers/navigation_server_3d.h"
-#endif // _3D_DISABLED
+#endif // NAVIGATION_3D_DISABLED
+
+#ifndef PHYSICS_2D_DISABLED
 #include "servers/physics_server_2d.h"
 #include "servers/physics_server_2d_dummy.h"
-#ifndef _3D_DISABLED
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 #include "servers/physics_server_3d.h"
 #include "servers/physics_server_3d_dummy.h"
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
+
 #include "servers/rendering/rendering_server_default.h"
 
 int test_main(int argc, char *argv[]) {
@@ -271,12 +288,19 @@ struct GodotTestCaseListener : public doctest::IReporter {
 
 	SignalWatcher *signal_watcher = nullptr;
 
+#ifndef PHYSICS_2D_DISABLED
 	PhysicsServer2D *physics_server_2d = nullptr;
-#ifndef _3D_DISABLED
+#endif // PHYSICS_2D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 	PhysicsServer3D *physics_server_3d = nullptr;
-	NavigationServer3D *navigation_server_3d = nullptr;
+#endif // PHYSICS_3D_DISABLED
+
+#ifndef NAVIGATION_2D_DISABLED
 	NavigationServer2D *navigation_server_2d = nullptr;
-#endif // _3D_DISABLED
+#endif // NAVIGATION_2D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
+	NavigationServer3D *navigation_server_3d = nullptr;
+#endif // NAVIGATION_3D_DISABLED
 
 	void test_case_start(const doctest::TestCaseData &p_in) override {
 		reinitialize();
@@ -306,28 +330,32 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			// So we have to do this for each test case. Also make sure there is
 			// no residual theme from something else.
 			ThemeDB::get_singleton()->finalize_theme();
-			ThemeDB::get_singleton()->initialize_theme_noproject();
+			ThemeDB::get_singleton()->initialize_theme();
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 			physics_server_3d = PhysicsServer3DManager::get_singleton()->new_default_server();
 			if (!physics_server_3d) {
 				physics_server_3d = memnew(PhysicsServer3DDummy);
 			}
 			physics_server_3d->init();
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
 			physics_server_2d = PhysicsServer2DManager::get_singleton()->new_default_server();
 			if (!physics_server_2d) {
 				physics_server_2d = memnew(PhysicsServer2DDummy);
 			}
 			physics_server_2d->init();
+#endif // PHYSICS_2D_DISABLED
 
-#ifndef _3D_DISABLED
 			ERR_PRINT_OFF;
+#ifndef NAVIGATION_3D_DISABLED
 			navigation_server_3d = NavigationServer3DManager::new_default_server();
+#endif // NAVIGATION_3D_DISABLED
+#ifndef NAVIGATION_2D_DISABLED
 			navigation_server_2d = NavigationServer2DManager::new_default_server();
+#endif // NAVIGATION_2D_DISABLED
 			ERR_PRINT_ON;
-#endif // _3D_DISABLED
 
 			memnew(InputMap);
 			InputMap::get_singleton()->load_default();
@@ -358,15 +386,23 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			return;
 		}
 
-#ifndef _3D_DISABLED
-		if (suite_name.contains("[Navigation]") && navigation_server_2d == nullptr && navigation_server_3d == nullptr) {
+#ifndef NAVIGATION_3D_DISABLED
+		if (suite_name.contains("[Navigation3D]") && navigation_server_3d == nullptr) {
 			ERR_PRINT_OFF;
 			navigation_server_3d = NavigationServer3DManager::new_default_server();
+			ERR_PRINT_ON;
+			return;
+		}
+#endif // NAVIGATION_3D_DISABLED
+
+#ifndef NAVIGATION_2D_DISABLED
+		if (suite_name.contains("[Navigation2D]") && navigation_server_2d == nullptr) {
+			ERR_PRINT_OFF;
 			navigation_server_2d = NavigationServer2DManager::new_default_server();
 			ERR_PRINT_ON;
 			return;
 		}
-#endif // _3D_DISABLED
+#endif // NAVIGATION_2D_DISABLED
 	}
 
 	void test_case_end(const doctest::CurrentTestCaseStats &) override {
@@ -396,31 +432,35 @@ struct GodotTestCaseListener : public doctest::IReporter {
 			memdelete(SceneTree::get_singleton());
 		}
 
-#ifndef _3D_DISABLED
+#ifndef NAVIGATION_3D_DISABLED
 		if (navigation_server_3d) {
 			memdelete(navigation_server_3d);
 			navigation_server_3d = nullptr;
 		}
+#endif // NAVIGATION_3D_DISABLED
 
+#ifndef NAVIGATION_2D_DISABLED
 		if (navigation_server_2d) {
 			memdelete(navigation_server_2d);
 			navigation_server_2d = nullptr;
 		}
-#endif // _3D_DISABLED
+#endif // NAVIGATION_2D_DISABLED
 
-#ifndef _3D_DISABLED
+#ifndef PHYSICS_3D_DISABLED
 		if (physics_server_3d) {
 			physics_server_3d->finish();
 			memdelete(physics_server_3d);
 			physics_server_3d = nullptr;
 		}
-#endif // _3D_DISABLED
+#endif // PHYSICS_3D_DISABLED
 
+#ifndef PHYSICS_2D_DISABLED
 		if (physics_server_2d) {
 			physics_server_2d->finish();
 			memdelete(physics_server_2d);
 			physics_server_2d = nullptr;
 		}
+#endif // PHYSICS_2D_DISABLED
 
 		if (Input::get_singleton()) {
 			memdelete(Input::get_singleton());
diff --git a/engine/tests/test_main.h b/engine/tests/test_main.h
index b5500e96..315ca36d 100644
--- a/engine/tests/test_main.h
+++ b/engine/tests/test_main.h
@@ -28,9 +28,6 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_MAIN_H
-#define TEST_MAIN_H
+#pragma once
 
 int test_main(int argc, char *argv[]);
-
-#endif // TEST_MAIN_H
diff --git a/engine/tests/test_tools.h b/engine/tests/test_tools.h
index d0626b5e..ff0191d4 100644
--- a/engine/tests/test_tools.h
+++ b/engine/tests/test_tools.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_TOOLS_H
-#define TEST_TOOLS_H
+#pragma once
 
 struct ErrorDetector {
 	ErrorDetector() {
@@ -55,5 +54,3 @@ struct ErrorDetector {
 	ErrorHandlerList eh;
 	bool has_error = false;
 };
-
-#endif // TEST_TOOLS_H
diff --git a/engine/tests/test_utils.h b/engine/tests/test_utils.h
index 876a59ee..5b3be371 100644
--- a/engine/tests/test_utils.h
+++ b/engine/tests/test_utils.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_UTILS_H
-#define TEST_UTILS_H
+#pragma once
 
 class String;
 
@@ -39,5 +38,3 @@ String get_data_path(const String &p_file);
 String get_executable_dir();
 String get_temp_path(const String &p_suffix);
 } // namespace TestUtils
-
-#endif // TEST_UTILS_H
diff --git a/engine/tests/test_validate_testing.h b/engine/tests/test_validate_testing.h
index f2e3bf3b..f5df3990 100644
--- a/engine/tests/test_validate_testing.h
+++ b/engine/tests/test_validate_testing.h
@@ -28,8 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef TEST_VALIDATE_TESTING_H
-#define TEST_VALIDATE_TESTING_H
+#pragma once
 
 #include "core/core_globals.h"
 #include "core/os/os.h"
@@ -125,9 +124,7 @@ TEST_SUITE("Validate tests") {
 		dict["color"] = color;
 		INFO(dict);
 
-		Array arr;
-		arr.push_back(string);
-		arr.push_back(color);
+		Array arr = { string, color };
 		INFO(arr);
 
 		PackedByteArray byte_arr;
@@ -203,5 +200,3 @@ TEST_SUITE("Validate tests") {
 		REQUIRE(ed.has_error);
 	}
 }
-
-#endif // TEST_VALIDATE_TESTING_H
diff --git a/engine/thirdparty/README.md b/engine/thirdparty/README.md
index 309508fc..b55df0ba 100644
--- a/engine/thirdparty/README.md
+++ b/engine/thirdparty/README.md
@@ -5,6 +5,18 @@ respective folder names. Use two empty lines to separate categories for
 readability.
 
 
+## accesskit
+
+- Upstream: https://github.com/AccessKit/accesskit-c
+- Version: 0.15.1 (0d1da94a33708041b07c61eb702c67cfa3a5f95b, 2025)
+- License: MIT
+
+Files extracted from upstream source:
+
+- `accesskit.h`
+- `LICENSE-MIT`
+
+
 ## amd-fsr
 
 - Upstream: https://github.com/GPUOpen-Effects/FidelityFX-FSR
@@ -107,7 +119,7 @@ Files extracted from upstream source:
 ## clipper2
 
 - Upstream: https://github.com/AngusJohnson/Clipper2
-- Version: 1.4.0 (736ddb0b53d97fd5f65dd3d9bbf8a0993eaf387c, 2024)
+- Version: 1.5.2 (6901921c4be75126d1de60bfd24bd86a61319fd0, 2025)
 - License: BSL 1.0
 
 Files extracted from upstream source:
@@ -118,7 +130,7 @@ Files extracted from upstream source:
 Patches:
 
 - `0001-disable-exceptions.patch` (GH-80796)
-- `0002-llvm-disable-int1280-math.patch` (GH-95964)
+- `0002-llvm-disable-int128-math.patch` (GH-95964)
 
 
 ## cvtt
@@ -326,7 +338,7 @@ for UI.
 ## freetype
 
 - Upstream: https://www.freetype.org
-- Version: 2.13.2 (920c5502cc3ddda88f6c7d85ee834ac611bb11cc, 2023)
+- Version: 2.13.3 (42608f77f20749dd6ddc9e0536788eaad70ea4b5, 2024)
 - License: FreeType License (BSD-like)
 
 Files extracted from upstream source:
@@ -406,7 +418,7 @@ Files extracted from upstream source:
 ## harfbuzz
 
 - Upstream: https://github.com/harfbuzz/harfbuzz
-- Version: 10.1.0 (9ef44a2d67ac870c1f7f671f6dc98d08a2579865, 2024)
+- Version: 10.4.0 (3ef8709829a5884517ad91a97b32b9435b2f20d1, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -420,13 +432,13 @@ Files extracted from upstream source:
 ## icu4c
 
 - Upstream: https://github.com/unicode-org/icu
-- Version: 76.1 (8eca245c7484ac6cc179e3e5f7c1ea7680810f39, 2024)
+- Version: 77.1 (457157a92aa053e632cc7fcfd0e12f8a943b2d11, 2025)
 - License: Unicode
 
 Files extracted from upstream source:
 
 - The `common` folder
-- `scriptset.*`, `ucln_in.*`, `uspoof.cpp"` and `uspoof_impl.cpp` from the `i18n` folder
+- `scriptset.*`, `ucln_in.*`, `uspoof.cpp` and `uspoof_impl.*` from the `i18n` folder
 - `uspoof.h` from the `i18n/unicode` folder
 - `LICENSE`
 
@@ -448,7 +460,7 @@ Files generated from upstream source:
 ## jolt_physics
 
 - Upstream: https://github.com/jrouwe/JoltPhysics
-- Version: 5.2.1 (f094082aa2bbfcbebc725dbe8b8f65c7d5152886, 2024)
+- Version: 5.3.0 (0373ec0dd762e4bc2f6acdb08371ee84fa23c6db, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -530,14 +542,13 @@ Files extracted from upstream source:
 ## libpng
 
 - Upstream: http://libpng.org/pub/png/libpng.html
-- Version: 1.6.45 (51f5bd68b9b806d2c92b4318164d28b49357da31, 2024)
+- Version: 1.6.47 (872555f4ba910252783af1507f9e7fe1653be252, 2025)
 - License: libpng/zlib
 
 Files extracted from upstream source:
 
-- All `.c` and `.h` files of the main directory, apart from `example.c` and
-  `pngtest.c`
-- `arm/` (minus `filter_neon.S`), `intel/`, `loongarch/`, and `powerpc/` (minus `.editorconfig`) folders
+- All `.c` and `.h` files of the main directory, apart from `example.c` and `pngtest.c`
+- `arm/`, `intel/`, `loongarch/`, and `powerpc/` folders, except `arm/filter_neon.S` and `.editorconfig` files
 - `scripts/pnglibconf.h.prebuilt` as `pnglibconf.h`
 - `LICENSE`
 
@@ -606,7 +617,7 @@ File extracted from upstream source:
 ## mbedtls
 
 - Upstream: https://github.com/Mbed-TLS/mbedtls
-- Version: 3.6.2 (107ea89daaefb9867ea9121002fbbdf926780e98, 2024)
+- Version: 3.6.3 (22098d41c6620ce07cf8a0134d37302355e1e5ef, 2025)
 - License: Apache 2.0
 
 File extracted from upstream release tarball:
@@ -617,7 +628,7 @@ File extracted from upstream release tarball:
 - From `library/` to `thirdparty/mbedtls/library/`:
   - All `.c` and `.h` files
   - Except `bignum_mod.c`, `block_cipher.c`, `ecp_curves_new.c`, `lmots.c`,
-  `lms.c`
+  `lms.c`, `bignum_core_invasive.h`
 - The `LICENSE` file (edited to keep only the Apache 2.0 variant)
 - Added 2 files `godot_core_mbedtls_platform.c` and `godot_core_mbedtls_config.h`
   providing configuration for light bundling with core
@@ -627,7 +638,6 @@ File extracted from upstream release tarball:
 Patches:
 
 - `0001-msvc-2019-psa-redeclaration.patch` (GH-90535)
-- `0002-pr-9981-defragment-incoming-tls-handshake-messages.patch` (GH-103247)
 
 
 ## meshoptimizer
@@ -854,7 +864,7 @@ Patches:
 ## pcre2
 
 - Upstream: http://www.pcre.org
-- Version: 10.43 (3864abdb713f78831dd12d898ab31bbb0fa630b6, 2024)
+- Version: 10.45 (2dce7761b1831fd3f82a9c2bd5476259d945da4d, 2025)
 - License: BSD-3-Clause
 
 Files extracted from upstream source:
@@ -864,8 +874,8 @@ Files extracted from upstream source:
 - `src/pcre2_jit_match.c`
 - `src/pcre2_jit_misc.c`
 - `src/pcre2_ucptables.c`
-- `src/sljit/`
-- `AUTHORS` and `LICENCE`
+- `deps/sljit/sljit_src`
+- `AUTHORS.md` and `LICENCE.md`
 
 
 ## recastnavigation
@@ -945,7 +955,7 @@ Patches:
 ## thorvg
 
 - Upstream: https://github.com/thorvg/thorvg
-- Version: 0.15.10 (bca94d244c67f573c6eddc27d783d9a6b1ef2f1b, 2025)
+- Version: 0.15.12 (91bd6f35b94e92abfc1a320632e66cd124943524, 2025)
 - License: MIT
 
 Files extracted from upstream source:
@@ -956,6 +966,7 @@ Files extracted from upstream source:
 Patches:
 
 - `0001-revert-tvglines-bezier-precision.patch` (GH-96658)
+- `0002-png-explicit-variable-scope.patch` (GH-105093)
 
 
 ## tinyexr
@@ -976,7 +987,7 @@ Patches:
 ## ufbx
 
 - Upstream: https://github.com/ufbx/ufbx
-- Version: 0.15.0 (24eea6f40929fe0f679b7950def378edb003afdb, 2024)
+- Version: 0.18.0 (729ab835444f5f229e5f7cff332692ce6c00415d, 2025)
 - License: MIT
 
 Files extracted from upstream source:
diff --git a/engine/thirdparty/accesskit/LICENSE-MIT b/engine/thirdparty/accesskit/LICENSE-MIT
new file mode 100644
index 00000000..31aa7938
--- /dev/null
+++ b/engine/thirdparty/accesskit/LICENSE-MIT
@@ -0,0 +1,23 @@
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/engine/thirdparty/accesskit/include/accesskit.h b/engine/thirdparty/accesskit/include/accesskit.h
new file mode 100644
index 00000000..5b2499a8
--- /dev/null
+++ b/engine/thirdparty/accesskit/include/accesskit.h
@@ -0,0 +1,2352 @@
+/**
+ * Copyright 2023 The AccessKit Authors. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (found in
+ * the LICENSE-APACHE file) or the MIT license (found in
+ * the LICENSE-MIT file), at your option.
+ */
+
+#ifndef ACCESSKIT_H
+#define ACCESSKIT_H
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+/**
+ * An action to be taken on an accessibility node.
+ */
+enum accesskit_action
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  /**
+   * Do the equivalent of a single click or tap.
+   */
+  ACCESSKIT_ACTION_CLICK,
+  ACCESSKIT_ACTION_FOCUS,
+  ACCESSKIT_ACTION_BLUR,
+  ACCESSKIT_ACTION_COLLAPSE,
+  ACCESSKIT_ACTION_EXPAND,
+  /**
+   * Requires [`ActionRequest::data`] to be set to [`ActionData::CustomAction`].
+   */
+  ACCESSKIT_ACTION_CUSTOM_ACTION,
+  /**
+   * Decrement a numeric value by one step.
+   */
+  ACCESSKIT_ACTION_DECREMENT,
+  /**
+   * Increment a numeric value by one step.
+   */
+  ACCESSKIT_ACTION_INCREMENT,
+  ACCESSKIT_ACTION_HIDE_TOOLTIP,
+  ACCESSKIT_ACTION_SHOW_TOOLTIP,
+  /**
+   * Delete any selected text in the control's text value and
+   * insert the specified value in its place, like when typing or pasting.
+   * Requires [`ActionRequest::data`] to be set to [`ActionData::Value`].
+   */
+  ACCESSKIT_ACTION_REPLACE_SELECTED_TEXT,
+  ACCESSKIT_ACTION_SCROLL_BACKWARD,
+  ACCESSKIT_ACTION_SCROLL_DOWN,
+  ACCESSKIT_ACTION_SCROLL_FORWARD,
+  ACCESSKIT_ACTION_SCROLL_LEFT,
+  ACCESSKIT_ACTION_SCROLL_RIGHT,
+  ACCESSKIT_ACTION_SCROLL_UP,
+  /**
+   * Scroll any scrollable containers to make the target object visible
+   * on the screen.  Optionally set [`ActionRequest::data`] to
+   * [`ActionData::ScrollTargetRect`].
+   */
+  ACCESSKIT_ACTION_SCROLL_INTO_VIEW,
+  /**
+   * Scroll the given object to a specified point in the tree's container
+   * (e.g. window). Requires [`ActionRequest::data`] to be set to
+   * [`ActionData::ScrollToPoint`].
+   */
+  ACCESSKIT_ACTION_SCROLL_TO_POINT,
+  /**
+   * Requires [`ActionRequest::data`] to be set to
+   * [`ActionData::SetScrollOffset`].
+   */
+  ACCESSKIT_ACTION_SET_SCROLL_OFFSET,
+  /**
+   * Requires [`ActionRequest::data`] to be set to
+   * [`ActionData::SetTextSelection`].
+   */
+  ACCESSKIT_ACTION_SET_TEXT_SELECTION,
+  /**
+   * Don't focus this node, but set it as the sequential focus navigation
+   * starting point, so that pressing Tab moves to the next element
+   * following this one, for example.
+   */
+  ACCESSKIT_ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT,
+  /**
+   * Replace the value of the control with the specified value and
+   * reset the selection, if applicable. Requires [`ActionRequest::data`]
+   * to be set to [`ActionData::Value`] or [`ActionData::NumericValue`].
+   */
+  ACCESSKIT_ACTION_SET_VALUE,
+  ACCESSKIT_ACTION_SHOW_CONTEXT_MENU,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_action;
+#endif  // __cplusplus
+
+enum accesskit_aria_current
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_ARIA_CURRENT_FALSE,
+  ACCESSKIT_ARIA_CURRENT_TRUE,
+  ACCESSKIT_ARIA_CURRENT_PAGE,
+  ACCESSKIT_ARIA_CURRENT_STEP,
+  ACCESSKIT_ARIA_CURRENT_LOCATION,
+  ACCESSKIT_ARIA_CURRENT_DATE,
+  ACCESSKIT_ARIA_CURRENT_TIME,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_aria_current;
+#endif  // __cplusplus
+
+enum accesskit_auto_complete
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_AUTO_COMPLETE_INLINE,
+  ACCESSKIT_AUTO_COMPLETE_LIST,
+  ACCESSKIT_AUTO_COMPLETE_BOTH,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_auto_complete;
+#endif  // __cplusplus
+
+enum accesskit_has_popup
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_HAS_POPUP_TRUE,
+  ACCESSKIT_HAS_POPUP_MENU,
+  ACCESSKIT_HAS_POPUP_LISTBOX,
+  ACCESSKIT_HAS_POPUP_TREE,
+  ACCESSKIT_HAS_POPUP_GRID,
+  ACCESSKIT_HAS_POPUP_DIALOG,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_has_popup;
+#endif  // __cplusplus
+
+/**
+ * Indicates if a form control has invalid input or if a web DOM element has an
+ * [`aria-invalid`] attribute.
+ *
+ * [`aria-invalid`]: https://www.w3.org/TR/wai-aria-1.1/#aria-invalid
+ */
+enum accesskit_invalid
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_INVALID_TRUE,
+  ACCESSKIT_INVALID_GRAMMAR,
+  ACCESSKIT_INVALID_SPELLING,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_invalid;
+#endif  // __cplusplus
+
+enum accesskit_list_style
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_LIST_STYLE_CIRCLE,
+  ACCESSKIT_LIST_STYLE_DISC,
+  ACCESSKIT_LIST_STYLE_IMAGE,
+  ACCESSKIT_LIST_STYLE_NUMERIC,
+  ACCESSKIT_LIST_STYLE_SQUARE,
+  /**
+   * Language specific ordering (alpha, roman, cjk-ideographic, etc...)
+   */
+  ACCESSKIT_LIST_STYLE_OTHER,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_list_style;
+#endif  // __cplusplus
+
+enum accesskit_live
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_LIVE_OFF,
+  ACCESSKIT_LIVE_POLITE,
+  ACCESSKIT_LIVE_ASSERTIVE,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_live;
+#endif  // __cplusplus
+
+enum accesskit_orientation
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  /**
+   * E.g. most toolbars and separators.
+   */
+  ACCESSKIT_ORIENTATION_HORIZONTAL,
+  /**
+   * E.g. menu or combo box.
+   */
+  ACCESSKIT_ORIENTATION_VERTICAL,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_orientation;
+#endif  // __cplusplus
+
+/**
+ * The type of an accessibility node.
+ *
+ * The majority of these roles come from the ARIA specification. Reference
+ * the latest draft for proper usage.
+ *
+ * Like the AccessKit schema as a whole, this list is largely taken
+ * from Chromium. However, unlike Chromium's alphabetized list, this list
+ * is ordered roughly by expected usage frequency (with the notable exception
+ * of [`Role::Unknown`]). This is more efficient in serialization formats
+ * where integers use a variable-length encoding.
+ */
+enum accesskit_role
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_ROLE_UNKNOWN,
+  ACCESSKIT_ROLE_TEXT_RUN,
+  ACCESSKIT_ROLE_CELL,
+  ACCESSKIT_ROLE_LABEL,
+  ACCESSKIT_ROLE_IMAGE,
+  ACCESSKIT_ROLE_LINK,
+  ACCESSKIT_ROLE_ROW,
+  ACCESSKIT_ROLE_LIST_ITEM,
+  /**
+   * Contains the bullet, number, or other marker for a list item.
+   */
+  ACCESSKIT_ROLE_LIST_MARKER,
+  ACCESSKIT_ROLE_TREE_ITEM,
+  ACCESSKIT_ROLE_LIST_BOX_OPTION,
+  ACCESSKIT_ROLE_MENU_ITEM,
+  ACCESSKIT_ROLE_MENU_LIST_OPTION,
+  ACCESSKIT_ROLE_PARAGRAPH,
+  /**
+   * A generic container that should be ignored by assistive technologies
+   * and filtered out of platform accessibility trees. Equivalent to the ARIA
+   * `none` or `presentation` role, or to an HTML `div` with no role.
+   */
+  ACCESSKIT_ROLE_GENERIC_CONTAINER,
+  ACCESSKIT_ROLE_CHECK_BOX,
+  ACCESSKIT_ROLE_RADIO_BUTTON,
+  ACCESSKIT_ROLE_TEXT_INPUT,
+  ACCESSKIT_ROLE_BUTTON,
+  ACCESSKIT_ROLE_DEFAULT_BUTTON,
+  ACCESSKIT_ROLE_PANE,
+  ACCESSKIT_ROLE_ROW_HEADER,
+  ACCESSKIT_ROLE_COLUMN_HEADER,
+  ACCESSKIT_ROLE_ROW_GROUP,
+  ACCESSKIT_ROLE_LIST,
+  ACCESSKIT_ROLE_TABLE,
+  ACCESSKIT_ROLE_LAYOUT_TABLE_CELL,
+  ACCESSKIT_ROLE_LAYOUT_TABLE_ROW,
+  ACCESSKIT_ROLE_LAYOUT_TABLE,
+  ACCESSKIT_ROLE_SWITCH,
+  ACCESSKIT_ROLE_MENU,
+  ACCESSKIT_ROLE_MULTILINE_TEXT_INPUT,
+  ACCESSKIT_ROLE_SEARCH_INPUT,
+  ACCESSKIT_ROLE_DATE_INPUT,
+  ACCESSKIT_ROLE_DATE_TIME_INPUT,
+  ACCESSKIT_ROLE_WEEK_INPUT,
+  ACCESSKIT_ROLE_MONTH_INPUT,
+  ACCESSKIT_ROLE_TIME_INPUT,
+  ACCESSKIT_ROLE_EMAIL_INPUT,
+  ACCESSKIT_ROLE_NUMBER_INPUT,
+  ACCESSKIT_ROLE_PASSWORD_INPUT,
+  ACCESSKIT_ROLE_PHONE_NUMBER_INPUT,
+  ACCESSKIT_ROLE_URL_INPUT,
+  ACCESSKIT_ROLE_ABBR,
+  ACCESSKIT_ROLE_ALERT,
+  ACCESSKIT_ROLE_ALERT_DIALOG,
+  ACCESSKIT_ROLE_APPLICATION,
+  ACCESSKIT_ROLE_ARTICLE,
+  ACCESSKIT_ROLE_AUDIO,
+  ACCESSKIT_ROLE_BANNER,
+  ACCESSKIT_ROLE_BLOCKQUOTE,
+  ACCESSKIT_ROLE_CANVAS,
+  ACCESSKIT_ROLE_CAPTION,
+  ACCESSKIT_ROLE_CARET,
+  ACCESSKIT_ROLE_CODE,
+  ACCESSKIT_ROLE_COLOR_WELL,
+  ACCESSKIT_ROLE_COMBO_BOX,
+  ACCESSKIT_ROLE_EDITABLE_COMBO_BOX,
+  ACCESSKIT_ROLE_COMPLEMENTARY,
+  ACCESSKIT_ROLE_COMMENT,
+  ACCESSKIT_ROLE_CONTENT_DELETION,
+  ACCESSKIT_ROLE_CONTENT_INSERTION,
+  ACCESSKIT_ROLE_CONTENT_INFO,
+  ACCESSKIT_ROLE_DEFINITION,
+  ACCESSKIT_ROLE_DESCRIPTION_LIST,
+  ACCESSKIT_ROLE_DESCRIPTION_LIST_DETAIL,
+  ACCESSKIT_ROLE_DESCRIPTION_LIST_TERM,
+  ACCESSKIT_ROLE_DETAILS,
+  ACCESSKIT_ROLE_DIALOG,
+  ACCESSKIT_ROLE_DIRECTORY,
+  ACCESSKIT_ROLE_DISCLOSURE_TRIANGLE,
+  ACCESSKIT_ROLE_DOCUMENT,
+  ACCESSKIT_ROLE_EMBEDDED_OBJECT,
+  ACCESSKIT_ROLE_EMPHASIS,
+  ACCESSKIT_ROLE_FEED,
+  ACCESSKIT_ROLE_FIGURE_CAPTION,
+  ACCESSKIT_ROLE_FIGURE,
+  ACCESSKIT_ROLE_FOOTER,
+  ACCESSKIT_ROLE_FOOTER_AS_NON_LANDMARK,
+  ACCESSKIT_ROLE_FORM,
+  ACCESSKIT_ROLE_GRID,
+  ACCESSKIT_ROLE_GROUP,
+  ACCESSKIT_ROLE_HEADER,
+  ACCESSKIT_ROLE_HEADER_AS_NON_LANDMARK,
+  ACCESSKIT_ROLE_HEADING,
+  ACCESSKIT_ROLE_IFRAME,
+  ACCESSKIT_ROLE_IFRAME_PRESENTATIONAL,
+  ACCESSKIT_ROLE_IME_CANDIDATE,
+  ACCESSKIT_ROLE_KEYBOARD,
+  ACCESSKIT_ROLE_LEGEND,
+  ACCESSKIT_ROLE_LINE_BREAK,
+  ACCESSKIT_ROLE_LIST_BOX,
+  ACCESSKIT_ROLE_LOG,
+  ACCESSKIT_ROLE_MAIN,
+  ACCESSKIT_ROLE_MARK,
+  ACCESSKIT_ROLE_MARQUEE,
+  ACCESSKIT_ROLE_MATH,
+  ACCESSKIT_ROLE_MENU_BAR,
+  ACCESSKIT_ROLE_MENU_ITEM_CHECK_BOX,
+  ACCESSKIT_ROLE_MENU_ITEM_RADIO,
+  ACCESSKIT_ROLE_MENU_LIST_POPUP,
+  ACCESSKIT_ROLE_METER,
+  ACCESSKIT_ROLE_NAVIGATION,
+  ACCESSKIT_ROLE_NOTE,
+  ACCESSKIT_ROLE_PLUGIN_OBJECT,
+  ACCESSKIT_ROLE_PORTAL,
+  ACCESSKIT_ROLE_PRE,
+  ACCESSKIT_ROLE_PROGRESS_INDICATOR,
+  ACCESSKIT_ROLE_RADIO_GROUP,
+  ACCESSKIT_ROLE_REGION,
+  ACCESSKIT_ROLE_ROOT_WEB_AREA,
+  ACCESSKIT_ROLE_RUBY,
+  ACCESSKIT_ROLE_RUBY_ANNOTATION,
+  ACCESSKIT_ROLE_SCROLL_BAR,
+  ACCESSKIT_ROLE_SCROLL_VIEW,
+  ACCESSKIT_ROLE_SEARCH,
+  ACCESSKIT_ROLE_SECTION,
+  ACCESSKIT_ROLE_SLIDER,
+  ACCESSKIT_ROLE_SPIN_BUTTON,
+  ACCESSKIT_ROLE_SPLITTER,
+  ACCESSKIT_ROLE_STATUS,
+  ACCESSKIT_ROLE_STRONG,
+  ACCESSKIT_ROLE_SUGGESTION,
+  ACCESSKIT_ROLE_SVG_ROOT,
+  ACCESSKIT_ROLE_TAB,
+  ACCESSKIT_ROLE_TAB_LIST,
+  ACCESSKIT_ROLE_TAB_PANEL,
+  ACCESSKIT_ROLE_TERM,
+  ACCESSKIT_ROLE_TIME,
+  ACCESSKIT_ROLE_TIMER,
+  ACCESSKIT_ROLE_TITLE_BAR,
+  ACCESSKIT_ROLE_TOOLBAR,
+  ACCESSKIT_ROLE_TOOLTIP,
+  ACCESSKIT_ROLE_TREE,
+  ACCESSKIT_ROLE_TREE_GRID,
+  ACCESSKIT_ROLE_VIDEO,
+  ACCESSKIT_ROLE_WEB_VIEW,
+  ACCESSKIT_ROLE_WINDOW,
+  ACCESSKIT_ROLE_PDF_ACTIONABLE_HIGHLIGHT,
+  ACCESSKIT_ROLE_PDF_ROOT,
+  ACCESSKIT_ROLE_GRAPHICS_DOCUMENT,
+  ACCESSKIT_ROLE_GRAPHICS_OBJECT,
+  ACCESSKIT_ROLE_GRAPHICS_SYMBOL,
+  ACCESSKIT_ROLE_DOC_ABSTRACT,
+  ACCESSKIT_ROLE_DOC_ACKNOWLEDGEMENTS,
+  ACCESSKIT_ROLE_DOC_AFTERWORD,
+  ACCESSKIT_ROLE_DOC_APPENDIX,
+  ACCESSKIT_ROLE_DOC_BACK_LINK,
+  ACCESSKIT_ROLE_DOC_BIBLIO_ENTRY,
+  ACCESSKIT_ROLE_DOC_BIBLIOGRAPHY,
+  ACCESSKIT_ROLE_DOC_BIBLIO_REF,
+  ACCESSKIT_ROLE_DOC_CHAPTER,
+  ACCESSKIT_ROLE_DOC_COLOPHON,
+  ACCESSKIT_ROLE_DOC_CONCLUSION,
+  ACCESSKIT_ROLE_DOC_COVER,
+  ACCESSKIT_ROLE_DOC_CREDIT,
+  ACCESSKIT_ROLE_DOC_CREDITS,
+  ACCESSKIT_ROLE_DOC_DEDICATION,
+  ACCESSKIT_ROLE_DOC_ENDNOTE,
+  ACCESSKIT_ROLE_DOC_ENDNOTES,
+  ACCESSKIT_ROLE_DOC_EPIGRAPH,
+  ACCESSKIT_ROLE_DOC_EPILOGUE,
+  ACCESSKIT_ROLE_DOC_ERRATA,
+  ACCESSKIT_ROLE_DOC_EXAMPLE,
+  ACCESSKIT_ROLE_DOC_FOOTNOTE,
+  ACCESSKIT_ROLE_DOC_FOREWORD,
+  ACCESSKIT_ROLE_DOC_GLOSSARY,
+  ACCESSKIT_ROLE_DOC_GLOSS_REF,
+  ACCESSKIT_ROLE_DOC_INDEX,
+  ACCESSKIT_ROLE_DOC_INTRODUCTION,
+  ACCESSKIT_ROLE_DOC_NOTE_REF,
+  ACCESSKIT_ROLE_DOC_NOTICE,
+  ACCESSKIT_ROLE_DOC_PAGE_BREAK,
+  ACCESSKIT_ROLE_DOC_PAGE_FOOTER,
+  ACCESSKIT_ROLE_DOC_PAGE_HEADER,
+  ACCESSKIT_ROLE_DOC_PAGE_LIST,
+  ACCESSKIT_ROLE_DOC_PART,
+  ACCESSKIT_ROLE_DOC_PREFACE,
+  ACCESSKIT_ROLE_DOC_PROLOGUE,
+  ACCESSKIT_ROLE_DOC_PULLQUOTE,
+  ACCESSKIT_ROLE_DOC_QNA,
+  ACCESSKIT_ROLE_DOC_SUBTITLE,
+  ACCESSKIT_ROLE_DOC_TIP,
+  ACCESSKIT_ROLE_DOC_TOC,
+  /**
+   * Behaves similar to an ARIA grid but is primarily used by Chromium's
+   * `TableView` and its subclasses, so they can be exposed correctly
+   * on certain platforms.
+   */
+  ACCESSKIT_ROLE_LIST_GRID,
+  /**
+   * This is just like a multi-line document, but signals that assistive
+   * technologies should implement behavior specific to a VT-100-style
+   * terminal.
+   */
+  ACCESSKIT_ROLE_TERMINAL,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_role;
+#endif  // __cplusplus
+
+enum accesskit_sort_direction
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_SORT_DIRECTION_ASCENDING,
+  ACCESSKIT_SORT_DIRECTION_DESCENDING,
+  ACCESSKIT_SORT_DIRECTION_OTHER,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_sort_direction;
+#endif  // __cplusplus
+
+enum accesskit_text_align
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_TEXT_ALIGN_LEFT,
+  ACCESSKIT_TEXT_ALIGN_RIGHT,
+  ACCESSKIT_TEXT_ALIGN_CENTER,
+  ACCESSKIT_TEXT_ALIGN_JUSTIFY,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_text_align;
+#endif  // __cplusplus
+
+enum accesskit_text_decoration
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_TEXT_DECORATION_SOLID,
+  ACCESSKIT_TEXT_DECORATION_DOTTED,
+  ACCESSKIT_TEXT_DECORATION_DASHED,
+  ACCESSKIT_TEXT_DECORATION_DOUBLE,
+  ACCESSKIT_TEXT_DECORATION_WAVY,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_text_decoration;
+#endif  // __cplusplus
+
+enum accesskit_text_direction
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_TEXT_DIRECTION_LEFT_TO_RIGHT,
+  ACCESSKIT_TEXT_DIRECTION_RIGHT_TO_LEFT,
+  ACCESSKIT_TEXT_DIRECTION_TOP_TO_BOTTOM,
+  ACCESSKIT_TEXT_DIRECTION_BOTTOM_TO_TOP,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_text_direction;
+#endif  // __cplusplus
+
+enum accesskit_toggled
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_TOGGLED_FALSE,
+  ACCESSKIT_TOGGLED_TRUE,
+  ACCESSKIT_TOGGLED_MIXED,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_toggled;
+#endif  // __cplusplus
+
+enum accesskit_vertical_offset
+#ifdef __cplusplus
+    : uint8_t
+#endif  // __cplusplus
+{
+  ACCESSKIT_VERTICAL_OFFSET_SUBSCRIPT,
+  ACCESSKIT_VERTICAL_OFFSET_SUPERSCRIPT,
+};
+#ifndef __cplusplus
+typedef uint8_t accesskit_vertical_offset;
+#endif  // __cplusplus
+
+#if defined(__APPLE__)
+typedef struct accesskit_macos_adapter accesskit_macos_adapter;
+#endif
+
+#if defined(__APPLE__)
+typedef struct accesskit_macos_queued_events accesskit_macos_queued_events;
+#endif
+
+#if defined(__APPLE__)
+typedef struct accesskit_macos_subclassing_adapter
+    accesskit_macos_subclassing_adapter;
+#endif
+
+typedef struct accesskit_node accesskit_node;
+
+typedef struct accesskit_tree accesskit_tree;
+
+typedef struct accesskit_tree_update accesskit_tree_update;
+
+#if (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__NetBSD__) || defined(__OpenBSD__))
+typedef struct accesskit_unix_adapter accesskit_unix_adapter;
+#endif
+
+#if defined(_WIN32)
+typedef struct accesskit_windows_adapter accesskit_windows_adapter;
+#endif
+
+#if defined(_WIN32)
+typedef struct accesskit_windows_queued_events accesskit_windows_queued_events;
+#endif
+
+#if defined(_WIN32)
+typedef struct accesskit_windows_subclassing_adapter
+    accesskit_windows_subclassing_adapter;
+#endif
+
+typedef uint64_t accesskit_node_id;
+
+typedef struct accesskit_node_ids {
+  size_t length;
+  const accesskit_node_id *values;
+} accesskit_node_ids;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_node_id {
+  bool has_value;
+  accesskit_node_id value;
+} accesskit_opt_node_id;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_double {
+  bool has_value;
+  double value;
+} accesskit_opt_double;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_index {
+  bool has_value;
+  size_t value;
+} accesskit_opt_index;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_color {
+  bool has_value;
+  uint32_t value;
+} accesskit_opt_color;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_text_decoration {
+  bool has_value;
+  accesskit_text_decoration value;
+} accesskit_opt_text_decoration;
+
+typedef struct accesskit_lengths {
+  size_t length;
+  const uint8_t *values;
+} accesskit_lengths;
+
+typedef struct accesskit_opt_coords {
+  bool has_value;
+  size_t length;
+  const float *values;
+} accesskit_opt_coords;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_bool {
+  bool has_value;
+  bool value;
+} accesskit_opt_bool;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_invalid {
+  bool has_value;
+  accesskit_invalid value;
+} accesskit_opt_invalid;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_toggled {
+  bool has_value;
+  accesskit_toggled value;
+} accesskit_opt_toggled;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_live {
+  bool has_value;
+  accesskit_live value;
+} accesskit_opt_live;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_text_direction {
+  bool has_value;
+  accesskit_text_direction value;
+} accesskit_opt_text_direction;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_orientation {
+  bool has_value;
+  accesskit_orientation value;
+} accesskit_opt_orientation;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_sort_direction {
+  bool has_value;
+  accesskit_sort_direction value;
+} accesskit_opt_sort_direction;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_aria_current {
+  bool has_value;
+  accesskit_aria_current value;
+} accesskit_opt_aria_current;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_auto_complete {
+  bool has_value;
+  accesskit_auto_complete value;
+} accesskit_opt_auto_complete;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_has_popup {
+  bool has_value;
+  accesskit_has_popup value;
+} accesskit_opt_has_popup;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_list_style {
+  bool has_value;
+  accesskit_list_style value;
+} accesskit_opt_list_style;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_text_align {
+  bool has_value;
+  accesskit_text_align value;
+} accesskit_opt_text_align;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_vertical_offset {
+  bool has_value;
+  accesskit_vertical_offset value;
+} accesskit_opt_vertical_offset;
+
+/**
+ * A 2D affine transform. Derived from
+ * [kurbo](https://github.com/linebender/kurbo).
+ */
+typedef struct accesskit_affine {
+  double _0[6];
+} accesskit_affine;
+
+/**
+ * A rectangle. Derived from [kurbo](https://github.com/linebender/kurbo).
+ */
+typedef struct accesskit_rect {
+  /**
+   * The minimum x coordinate (left edge).
+   */
+  double x0;
+  /**
+   * The minimum y coordinate (top edge in y-down spaces).
+   */
+  double y0;
+  /**
+   * The maximum x coordinate (right edge).
+   */
+  double x1;
+  /**
+   * The maximum y coordinate (bottom edge in y-down spaces).
+   */
+  double y1;
+} accesskit_rect;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_rect {
+  bool has_value;
+  struct accesskit_rect value;
+} accesskit_opt_rect;
+
+typedef struct accesskit_text_position {
+  accesskit_node_id node;
+  size_t character_index;
+} accesskit_text_position;
+
+typedef struct accesskit_text_selection {
+  struct accesskit_text_position anchor;
+  struct accesskit_text_position focus;
+} accesskit_text_selection;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_text_selection {
+  bool has_value;
+  struct accesskit_text_selection value;
+} accesskit_opt_text_selection;
+
+/**
+ * Use `accesskit_custom_action_new` to create this struct. Do not reallocate
+ * `description`.
+ *
+ * When you get this struct, you are responsible for freeing `description`.
+ */
+typedef struct accesskit_custom_action {
+  int32_t id;
+  char *description;
+} accesskit_custom_action;
+
+typedef struct accesskit_custom_actions {
+  size_t length;
+  struct accesskit_custom_action *values;
+} accesskit_custom_actions;
+
+/**
+ * A 2D point. Derived from [kurbo](https://github.com/linebender/kurbo).
+ */
+typedef struct accesskit_point {
+  /**
+   * The x coordinate.
+   */
+  double x;
+  /**
+   * The y coordinate.
+   */
+  double y;
+} accesskit_point;
+
+typedef enum accesskit_action_data_Tag {
+  ACCESSKIT_ACTION_DATA_CUSTOM_ACTION,
+  ACCESSKIT_ACTION_DATA_VALUE,
+  ACCESSKIT_ACTION_DATA_NUMERIC_VALUE,
+  ACCESSKIT_ACTION_DATA_SCROLL_TARGET_RECT,
+  ACCESSKIT_ACTION_DATA_SCROLL_TO_POINT,
+  ACCESSKIT_ACTION_DATA_SET_SCROLL_OFFSET,
+  ACCESSKIT_ACTION_DATA_SET_TEXT_SELECTION,
+} accesskit_action_data_Tag;
+
+typedef struct accesskit_action_data {
+  accesskit_action_data_Tag tag;
+  union {
+    struct {
+      int32_t custom_action;
+    };
+    struct {
+      char *value;
+    };
+    struct {
+      double numeric_value;
+    };
+    struct {
+      struct accesskit_rect scroll_target_rect;
+    };
+    struct {
+      struct accesskit_point scroll_to_point;
+    };
+    struct {
+      struct accesskit_point set_scroll_offset;
+    };
+    struct {
+      struct accesskit_text_selection set_text_selection;
+    };
+  };
+} accesskit_action_data;
+
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_action_data {
+  bool has_value;
+  struct accesskit_action_data value;
+} accesskit_opt_action_data;
+
+typedef struct accesskit_action_request {
+  accesskit_action action;
+  accesskit_node_id target;
+  struct accesskit_opt_action_data data;
+} accesskit_action_request;
+
+/**
+ * A 2D vector. Derived from [kurbo](https://github.com/linebender/kurbo).
+ *
+ * This is intended primarily for a vector in the mathematical sense,
+ * but it can be interpreted as a translation, and converted to and
+ * from a point (vector relative to the origin) and size.
+ */
+typedef struct accesskit_vec2 {
+  /**
+   * The x-coordinate.
+   */
+  double x;
+  /**
+   * The y-coordinate.
+   */
+  double y;
+} accesskit_vec2;
+
+/**
+ * A 2D size. Derived from [kurbo](https://github.com/linebender/kurbo).
+ */
+typedef struct accesskit_size {
+  /**
+   * The width.
+   */
+  double width;
+  /**
+   * The height.
+   */
+  double height;
+} accesskit_size;
+
+/**
+ * Ownership of `request` is transferred to the callback. `request` must
+ * be freed using `accesskit_action_request_free`.
+ */
+typedef void (*accesskit_action_handler_callback)(
+    struct accesskit_action_request *request, void *userdata);
+
+typedef void *accesskit_tree_update_factory_userdata;
+
+/**
+ * This function can't return a null pointer. Ownership of the returned value
+ * will be transferred to the caller.
+ */
+typedef struct accesskit_tree_update *(*accesskit_tree_update_factory)(
+    accesskit_tree_update_factory_userdata);
+
+typedef struct accesskit_tree_update *(*accesskit_activation_handler_callback)(
+    void *userdata);
+
+typedef void (*accesskit_deactivation_handler_callback)(void *userdata);
+
+#if defined(_WIN32)
+/**
+ * Represents an optional value.
+ *
+ * If `has_value` is false, do not read the `value` field.
+ */
+typedef struct accesskit_opt_lresult {
+  bool has_value;
+  LRESULT value;
+} accesskit_opt_lresult;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif  // __cplusplus
+
+accesskit_role accesskit_node_role(const struct accesskit_node *node);
+
+void accesskit_node_set_role(struct accesskit_node *node, accesskit_role value);
+
+bool accesskit_node_supports_action(const struct accesskit_node *node,
+                                    accesskit_action action);
+
+void accesskit_node_add_action(struct accesskit_node *node,
+                               accesskit_action action);
+
+void accesskit_node_remove_action(struct accesskit_node *node,
+                                  accesskit_action action);
+
+void accesskit_node_clear_actions(struct accesskit_node *node);
+
+bool accesskit_node_is_hidden(const struct accesskit_node *node);
+
+void accesskit_node_set_hidden(struct accesskit_node *node);
+
+void accesskit_node_clear_hidden(struct accesskit_node *node);
+
+bool accesskit_node_is_linked(const struct accesskit_node *node);
+
+void accesskit_node_set_linked(struct accesskit_node *node);
+
+void accesskit_node_clear_linked(struct accesskit_node *node);
+
+bool accesskit_node_is_multiselectable(const struct accesskit_node *node);
+
+void accesskit_node_set_multiselectable(struct accesskit_node *node);
+
+void accesskit_node_clear_multiselectable(struct accesskit_node *node);
+
+bool accesskit_node_is_required(const struct accesskit_node *node);
+
+void accesskit_node_set_required(struct accesskit_node *node);
+
+void accesskit_node_clear_required(struct accesskit_node *node);
+
+bool accesskit_node_is_visited(const struct accesskit_node *node);
+
+void accesskit_node_set_visited(struct accesskit_node *node);
+
+void accesskit_node_clear_visited(struct accesskit_node *node);
+
+bool accesskit_node_is_busy(const struct accesskit_node *node);
+
+void accesskit_node_set_busy(struct accesskit_node *node);
+
+void accesskit_node_clear_busy(struct accesskit_node *node);
+
+bool accesskit_node_is_live_atomic(const struct accesskit_node *node);
+
+void accesskit_node_set_live_atomic(struct accesskit_node *node);
+
+void accesskit_node_clear_live_atomic(struct accesskit_node *node);
+
+bool accesskit_node_is_modal(const struct accesskit_node *node);
+
+void accesskit_node_set_modal(struct accesskit_node *node);
+
+void accesskit_node_clear_modal(struct accesskit_node *node);
+
+bool accesskit_node_is_touch_transparent(const struct accesskit_node *node);
+
+void accesskit_node_set_touch_transparent(struct accesskit_node *node);
+
+void accesskit_node_clear_touch_transparent(struct accesskit_node *node);
+
+bool accesskit_node_is_read_only(const struct accesskit_node *node);
+
+void accesskit_node_set_read_only(struct accesskit_node *node);
+
+void accesskit_node_clear_read_only(struct accesskit_node *node);
+
+bool accesskit_node_is_disabled(const struct accesskit_node *node);
+
+void accesskit_node_set_disabled(struct accesskit_node *node);
+
+void accesskit_node_clear_disabled(struct accesskit_node *node);
+
+bool accesskit_node_is_bold(const struct accesskit_node *node);
+
+void accesskit_node_set_bold(struct accesskit_node *node);
+
+void accesskit_node_clear_bold(struct accesskit_node *node);
+
+bool accesskit_node_is_italic(const struct accesskit_node *node);
+
+void accesskit_node_set_italic(struct accesskit_node *node);
+
+void accesskit_node_clear_italic(struct accesskit_node *node);
+
+bool accesskit_node_clips_children(const struct accesskit_node *node);
+
+void accesskit_node_set_clips_children(struct accesskit_node *node);
+
+void accesskit_node_clear_clips_children(struct accesskit_node *node);
+
+bool accesskit_node_is_line_breaking_object(const struct accesskit_node *node);
+
+void accesskit_node_set_is_line_breaking_object(struct accesskit_node *node);
+
+void accesskit_node_clear_is_line_breaking_object(struct accesskit_node *node);
+
+bool accesskit_node_is_page_breaking_object(const struct accesskit_node *node);
+
+void accesskit_node_set_is_page_breaking_object(struct accesskit_node *node);
+
+void accesskit_node_clear_is_page_breaking_object(struct accesskit_node *node);
+
+bool accesskit_node_is_spelling_error(const struct accesskit_node *node);
+
+void accesskit_node_set_is_spelling_error(struct accesskit_node *node);
+
+void accesskit_node_clear_is_spelling_error(struct accesskit_node *node);
+
+bool accesskit_node_is_grammar_error(const struct accesskit_node *node);
+
+void accesskit_node_set_is_grammar_error(struct accesskit_node *node);
+
+void accesskit_node_clear_is_grammar_error(struct accesskit_node *node);
+
+bool accesskit_node_is_search_match(const struct accesskit_node *node);
+
+void accesskit_node_set_is_search_match(struct accesskit_node *node);
+
+void accesskit_node_clear_is_search_match(struct accesskit_node *node);
+
+bool accesskit_node_is_suggestion(const struct accesskit_node *node);
+
+void accesskit_node_set_is_suggestion(struct accesskit_node *node);
+
+void accesskit_node_clear_is_suggestion(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_children(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_children(struct accesskit_node *node, size_t length,
+                                 const accesskit_node_id *values);
+
+void accesskit_node_push_child(struct accesskit_node *node,
+                               accesskit_node_id item);
+
+void accesskit_node_clear_children(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_controls(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_controls(struct accesskit_node *node, size_t length,
+                                 const accesskit_node_id *values);
+
+void accesskit_node_push_controlled(struct accesskit_node *node,
+                                    accesskit_node_id item);
+
+void accesskit_node_clear_controls(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_details(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_details(struct accesskit_node *node, size_t length,
+                                const accesskit_node_id *values);
+
+void accesskit_node_push_detail(struct accesskit_node *node,
+                                accesskit_node_id item);
+
+void accesskit_node_clear_details(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_described_by(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_described_by(struct accesskit_node *node, size_t length,
+                                     const accesskit_node_id *values);
+
+void accesskit_node_push_described_by(struct accesskit_node *node,
+                                      accesskit_node_id item);
+
+void accesskit_node_clear_described_by(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_flow_to(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_flow_to(struct accesskit_node *node, size_t length,
+                                const accesskit_node_id *values);
+
+void accesskit_node_push_flow_to(struct accesskit_node *node,
+                                 accesskit_node_id item);
+
+void accesskit_node_clear_flow_to(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_labelled_by(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_labelled_by(struct accesskit_node *node, size_t length,
+                                    const accesskit_node_id *values);
+
+void accesskit_node_push_labelled_by(struct accesskit_node *node,
+                                     accesskit_node_id item);
+
+void accesskit_node_clear_labelled_by(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_owns(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_owns(struct accesskit_node *node, size_t length,
+                             const accesskit_node_id *values);
+
+void accesskit_node_push_owned(struct accesskit_node *node,
+                               accesskit_node_id item);
+
+void accesskit_node_clear_owns(struct accesskit_node *node);
+
+struct accesskit_node_ids accesskit_node_radio_group(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_radio_group(struct accesskit_node *node, size_t length,
+                                    const accesskit_node_id *values);
+
+void accesskit_node_push_to_radio_group(struct accesskit_node *node,
+                                        accesskit_node_id item);
+
+void accesskit_node_clear_radio_group(struct accesskit_node *node);
+
+struct accesskit_opt_node_id accesskit_node_active_descendant(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_active_descendant(struct accesskit_node *node,
+                                          accesskit_node_id value);
+
+void accesskit_node_clear_active_descendant(struct accesskit_node *node);
+
+struct accesskit_opt_node_id accesskit_node_error_message(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_error_message(struct accesskit_node *node,
+                                      accesskit_node_id value);
+
+void accesskit_node_clear_error_message(struct accesskit_node *node);
+
+struct accesskit_opt_node_id accesskit_node_in_page_link_target(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_in_page_link_target(struct accesskit_node *node,
+                                            accesskit_node_id value);
+
+void accesskit_node_clear_in_page_link_target(struct accesskit_node *node);
+
+struct accesskit_opt_node_id accesskit_node_member_of(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_member_of(struct accesskit_node *node,
+                                  accesskit_node_id value);
+
+void accesskit_node_clear_member_of(struct accesskit_node *node);
+
+struct accesskit_opt_node_id accesskit_node_next_on_line(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_next_on_line(struct accesskit_node *node,
+                                     accesskit_node_id value);
+
+void accesskit_node_clear_next_on_line(struct accesskit_node *node);
+
+struct accesskit_opt_node_id accesskit_node_previous_on_line(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_previous_on_line(struct accesskit_node *node,
+                                         accesskit_node_id value);
+
+void accesskit_node_clear_previous_on_line(struct accesskit_node *node);
+
+struct accesskit_opt_node_id accesskit_node_popup_for(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_popup_for(struct accesskit_node *node,
+                                  accesskit_node_id value);
+
+void accesskit_node_clear_popup_for(struct accesskit_node *node);
+
+/**
+ * Only call this function with a string that originated from AccessKit.
+ */
+void accesskit_string_free(char *string);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_label(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_label(struct accesskit_node *node, const char *value);
+
+void accesskit_node_clear_label(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_description(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_description(struct accesskit_node *node,
+                                    const char *value);
+
+void accesskit_node_clear_description(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_value(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_value(struct accesskit_node *node, const char *value);
+
+void accesskit_node_clear_value(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_access_key(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_access_key(struct accesskit_node *node,
+                                   const char *value);
+
+void accesskit_node_clear_access_key(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_author_id(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_author_id(struct accesskit_node *node,
+                                  const char *value);
+
+void accesskit_node_clear_author_id(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_class_name(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_class_name(struct accesskit_node *node,
+                                   const char *value);
+
+void accesskit_node_clear_class_name(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_font_family(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_font_family(struct accesskit_node *node,
+                                    const char *value);
+
+void accesskit_node_clear_font_family(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_html_tag(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_html_tag(struct accesskit_node *node,
+                                 const char *value);
+
+void accesskit_node_clear_html_tag(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_inner_html(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_inner_html(struct accesskit_node *node,
+                                   const char *value);
+
+void accesskit_node_clear_inner_html(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_keyboard_shortcut(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_keyboard_shortcut(struct accesskit_node *node,
+                                          const char *value);
+
+void accesskit_node_clear_keyboard_shortcut(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_language(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_language(struct accesskit_node *node,
+                                 const char *value);
+
+void accesskit_node_clear_language(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_placeholder(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_placeholder(struct accesskit_node *node,
+                                    const char *value);
+
+void accesskit_node_clear_placeholder(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_role_description(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_role_description(struct accesskit_node *node,
+                                         const char *value);
+
+void accesskit_node_clear_role_description(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_state_description(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_state_description(struct accesskit_node *node,
+                                          const char *value);
+
+void accesskit_node_clear_state_description(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_tooltip(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_tooltip(struct accesskit_node *node, const char *value);
+
+void accesskit_node_clear_tooltip(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_url(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_url(struct accesskit_node *node, const char *value);
+
+void accesskit_node_clear_url(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_row_index_text(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_row_index_text(struct accesskit_node *node,
+                                       const char *value);
+
+void accesskit_node_clear_row_index_text(struct accesskit_node *node);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_node_column_index_text(const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing the memory pointed by `value`.
+ */
+void accesskit_node_set_column_index_text(struct accesskit_node *node,
+                                          const char *value);
+
+void accesskit_node_clear_column_index_text(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_scroll_x(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_scroll_x(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_scroll_x(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_scroll_x_min(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_scroll_x_min(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_scroll_x_min(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_scroll_x_max(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_scroll_x_max(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_scroll_x_max(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_scroll_y(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_scroll_y(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_scroll_y(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_scroll_y_min(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_scroll_y_min(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_scroll_y_min(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_scroll_y_max(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_scroll_y_max(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_scroll_y_max(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_numeric_value(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_numeric_value(struct accesskit_node *node,
+                                      double value);
+
+void accesskit_node_clear_numeric_value(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_min_numeric_value(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_min_numeric_value(struct accesskit_node *node,
+                                          double value);
+
+void accesskit_node_clear_min_numeric_value(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_max_numeric_value(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_max_numeric_value(struct accesskit_node *node,
+                                          double value);
+
+void accesskit_node_clear_max_numeric_value(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_numeric_value_step(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_numeric_value_step(struct accesskit_node *node,
+                                           double value);
+
+void accesskit_node_clear_numeric_value_step(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_numeric_value_jump(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_numeric_value_jump(struct accesskit_node *node,
+                                           double value);
+
+void accesskit_node_clear_numeric_value_jump(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_font_size(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_font_size(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_font_size(struct accesskit_node *node);
+
+struct accesskit_opt_double accesskit_node_font_weight(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_font_weight(struct accesskit_node *node, double value);
+
+void accesskit_node_clear_font_weight(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_row_count(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_row_count(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_row_count(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_column_count(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_column_count(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_column_count(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_row_index(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_row_index(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_row_index(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_column_index(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_column_index(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_column_index(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_row_span(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_row_span(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_row_span(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_column_span(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_column_span(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_column_span(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_level(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_level(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_level(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_size_of_set(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_size_of_set(struct accesskit_node *node, size_t value);
+
+void accesskit_node_clear_size_of_set(struct accesskit_node *node);
+
+struct accesskit_opt_index accesskit_node_position_in_set(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_position_in_set(struct accesskit_node *node,
+                                        size_t value);
+
+void accesskit_node_clear_position_in_set(struct accesskit_node *node);
+
+struct accesskit_opt_color accesskit_node_color_value(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_color_value(struct accesskit_node *node,
+                                    uint32_t value);
+
+void accesskit_node_clear_color_value(struct accesskit_node *node);
+
+struct accesskit_opt_color accesskit_node_background_color(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_background_color(struct accesskit_node *node,
+                                         uint32_t value);
+
+void accesskit_node_clear_background_color(struct accesskit_node *node);
+
+struct accesskit_opt_color accesskit_node_foreground_color(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_foreground_color(struct accesskit_node *node,
+                                         uint32_t value);
+
+void accesskit_node_clear_foreground_color(struct accesskit_node *node);
+
+struct accesskit_opt_text_decoration accesskit_node_overline(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_overline(struct accesskit_node *node,
+                                 accesskit_text_decoration value);
+
+void accesskit_node_clear_overline(struct accesskit_node *node);
+
+struct accesskit_opt_text_decoration accesskit_node_strikethrough(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_strikethrough(struct accesskit_node *node,
+                                      accesskit_text_decoration value);
+
+void accesskit_node_clear_strikethrough(struct accesskit_node *node);
+
+struct accesskit_opt_text_decoration accesskit_node_underline(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_underline(struct accesskit_node *node,
+                                  accesskit_text_decoration value);
+
+void accesskit_node_clear_underline(struct accesskit_node *node);
+
+struct accesskit_lengths accesskit_node_character_lengths(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_character_lengths(struct accesskit_node *node,
+                                          size_t length, const uint8_t *values);
+
+void accesskit_node_clear_character_lengths(struct accesskit_node *node);
+
+struct accesskit_lengths accesskit_node_word_lengths(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_word_lengths(struct accesskit_node *node, size_t length,
+                                     const uint8_t *values);
+
+void accesskit_node_clear_word_lengths(struct accesskit_node *node);
+
+struct accesskit_opt_coords accesskit_node_character_positions(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_character_positions(struct accesskit_node *node,
+                                            size_t length, const float *values);
+
+void accesskit_node_clear_character_positions(struct accesskit_node *node);
+
+struct accesskit_opt_coords accesskit_node_character_widths(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_character_widths(struct accesskit_node *node,
+                                         size_t length, const float *values);
+
+void accesskit_node_clear_character_widths(struct accesskit_node *node);
+
+struct accesskit_opt_bool accesskit_node_is_expanded(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_expanded(struct accesskit_node *node, bool value);
+
+void accesskit_node_clear_expanded(struct accesskit_node *node);
+
+struct accesskit_opt_bool accesskit_node_is_selected(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_selected(struct accesskit_node *node, bool value);
+
+void accesskit_node_clear_selected(struct accesskit_node *node);
+
+struct accesskit_opt_invalid accesskit_node_invalid(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_invalid(struct accesskit_node *node,
+                                accesskit_invalid value);
+
+void accesskit_node_clear_invalid(struct accesskit_node *node);
+
+struct accesskit_opt_toggled accesskit_node_toggled(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_toggled(struct accesskit_node *node,
+                                accesskit_toggled value);
+
+void accesskit_node_clear_toggled(struct accesskit_node *node);
+
+struct accesskit_opt_live accesskit_node_live(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_live(struct accesskit_node *node, accesskit_live value);
+
+void accesskit_node_clear_live(struct accesskit_node *node);
+
+struct accesskit_opt_text_direction accesskit_node_text_direction(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_text_direction(struct accesskit_node *node,
+                                       accesskit_text_direction value);
+
+void accesskit_node_clear_text_direction(struct accesskit_node *node);
+
+struct accesskit_opt_orientation accesskit_node_orientation(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_orientation(struct accesskit_node *node,
+                                    accesskit_orientation value);
+
+void accesskit_node_clear_orientation(struct accesskit_node *node);
+
+struct accesskit_opt_sort_direction accesskit_node_sort_direction(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_sort_direction(struct accesskit_node *node,
+                                       accesskit_sort_direction value);
+
+void accesskit_node_clear_sort_direction(struct accesskit_node *node);
+
+struct accesskit_opt_aria_current accesskit_node_aria_current(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_aria_current(struct accesskit_node *node,
+                                     accesskit_aria_current value);
+
+void accesskit_node_clear_aria_current(struct accesskit_node *node);
+
+struct accesskit_opt_auto_complete accesskit_node_auto_complete(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_auto_complete(struct accesskit_node *node,
+                                      accesskit_auto_complete value);
+
+void accesskit_node_clear_auto_complete(struct accesskit_node *node);
+
+struct accesskit_opt_has_popup accesskit_node_has_popup(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_has_popup(struct accesskit_node *node,
+                                  accesskit_has_popup value);
+
+void accesskit_node_clear_has_popup(struct accesskit_node *node);
+
+struct accesskit_opt_list_style accesskit_node_list_style(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_list_style(struct accesskit_node *node,
+                                   accesskit_list_style value);
+
+void accesskit_node_clear_list_style(struct accesskit_node *node);
+
+struct accesskit_opt_text_align accesskit_node_text_align(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_text_align(struct accesskit_node *node,
+                                   accesskit_text_align value);
+
+void accesskit_node_clear_text_align(struct accesskit_node *node);
+
+struct accesskit_opt_vertical_offset accesskit_node_vertical_offset(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_vertical_offset(struct accesskit_node *node,
+                                        accesskit_vertical_offset value);
+
+void accesskit_node_clear_vertical_offset(struct accesskit_node *node);
+
+const struct accesskit_affine *accesskit_node_transform(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_transform(struct accesskit_node *node,
+                                  struct accesskit_affine value);
+
+void accesskit_node_clear_transform(struct accesskit_node *node);
+
+struct accesskit_opt_rect accesskit_node_bounds(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_bounds(struct accesskit_node *node,
+                               struct accesskit_rect value);
+
+void accesskit_node_clear_bounds(struct accesskit_node *node);
+
+struct accesskit_opt_text_selection accesskit_node_text_selection(
+    const struct accesskit_node *node);
+
+void accesskit_node_set_text_selection(struct accesskit_node *node,
+                                       struct accesskit_text_selection value);
+
+void accesskit_node_clear_text_selection(struct accesskit_node *node);
+
+struct accesskit_custom_action accesskit_custom_action_new(
+    int32_t id, const char *description);
+
+void accesskit_custom_actions_free(struct accesskit_custom_actions *value);
+
+/**
+ * Caller is responsible for freeing the returned value.
+ */
+const struct accesskit_custom_actions *accesskit_node_custom_actions(
+    const struct accesskit_node *node);
+
+/**
+ * Caller is responsible for freeing `values`.
+ */
+void accesskit_node_set_custom_actions(
+    struct accesskit_node *node, size_t length,
+    const struct accesskit_custom_action *values);
+
+void accesskit_node_push_custom_action(struct accesskit_node *node,
+                                       struct accesskit_custom_action item);
+
+void accesskit_node_clear_custom_actions(struct accesskit_node *node);
+
+struct accesskit_node *accesskit_node_new(accesskit_role role);
+
+void accesskit_node_free(struct accesskit_node *node);
+
+struct accesskit_tree *accesskit_tree_new(accesskit_node_id root);
+
+void accesskit_tree_free(struct accesskit_tree *tree);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_tree_get_toolkit_name(const struct accesskit_tree *tree);
+
+void accesskit_tree_set_toolkit_name(struct accesskit_tree *tree,
+                                     const char *toolkit_name);
+
+void accesskit_tree_clear_toolkit_name(struct accesskit_tree *tree);
+
+/**
+ * Caller must call `accesskit_string_free` with the return value.
+ */
+char *accesskit_tree_get_toolkit_version(const struct accesskit_tree *tree);
+
+void accesskit_tree_set_toolkit_version(struct accesskit_tree *tree,
+                                        const char *toolkit_version);
+
+void accesskit_tree_clear_toolkit_version(struct accesskit_tree *tree);
+
+struct accesskit_tree_update *accesskit_tree_update_with_focus(
+    accesskit_node_id focus);
+
+struct accesskit_tree_update *accesskit_tree_update_with_capacity_and_focus(
+    size_t capacity, accesskit_node_id focus);
+
+void accesskit_tree_update_free(struct accesskit_tree_update *update);
+
+/**
+ * Appends the provided node to the tree update's list of nodes.
+ * Takes ownership of `node`.
+ */
+void accesskit_tree_update_push_node(struct accesskit_tree_update *update,
+                                     accesskit_node_id id,
+                                     struct accesskit_node *node);
+
+void accesskit_tree_update_set_tree(struct accesskit_tree_update *update,
+                                    struct accesskit_tree *tree);
+
+void accesskit_tree_update_clear_tree(struct accesskit_tree_update *update);
+
+void accesskit_tree_update_set_focus(struct accesskit_tree_update *update,
+                                     accesskit_node_id focus);
+
+void accesskit_action_request_free(struct accesskit_action_request *request);
+
+struct accesskit_affine accesskit_affine_identity(void);
+
+struct accesskit_affine accesskit_affine_flip_y(void);
+
+struct accesskit_affine accesskit_affine_flip_x(void);
+
+struct accesskit_affine accesskit_affine_scale(double s);
+
+struct accesskit_affine accesskit_affine_scale_non_uniform(double s_x,
+                                                           double s_y);
+
+struct accesskit_affine accesskit_affine_translate(struct accesskit_vec2 p);
+
+struct accesskit_affine accesskit_affine_map_unit_square(
+    struct accesskit_rect rect);
+
+double accesskit_affine_determinant(struct accesskit_affine affine);
+
+struct accesskit_affine accesskit_affine_inverse(
+    struct accesskit_affine affine);
+
+struct accesskit_rect accesskit_affine_transform_rect_bbox(
+    struct accesskit_affine affine, struct accesskit_rect rect);
+
+bool accesskit_affine_is_finite(const struct accesskit_affine *affine);
+
+bool accesskit_affine_is_nan(const struct accesskit_affine *affine);
+
+struct accesskit_vec2 accesskit_point_to_vec2(struct accesskit_point point);
+
+struct accesskit_rect accesskit_rect_from_points(struct accesskit_point p0,
+                                                 struct accesskit_point p1);
+
+struct accesskit_rect accesskit_rect_from_origin_size(
+    struct accesskit_point origin, struct accesskit_size size);
+
+struct accesskit_rect accesskit_rect_with_origin(struct accesskit_rect rect,
+                                                 struct accesskit_point origin);
+
+struct accesskit_rect accesskit_rect_with_size(struct accesskit_rect rect,
+                                               struct accesskit_size size);
+
+double accesskit_rect_width(const struct accesskit_rect *rect);
+
+double accesskit_rect_height(const struct accesskit_rect *rect);
+
+double accesskit_rect_min_x(const struct accesskit_rect *rect);
+
+double accesskit_rect_max_x(const struct accesskit_rect *rect);
+
+double accesskit_rect_min_y(const struct accesskit_rect *rect);
+
+double accesskit_rect_max_y(const struct accesskit_rect *rect);
+
+struct accesskit_point accesskit_rect_origin(const struct accesskit_rect *rect);
+
+struct accesskit_size accesskit_rect_size(const struct accesskit_rect *rect);
+
+struct accesskit_rect accesskit_rect_abs(const struct accesskit_rect *rect);
+
+double accesskit_rect_area(const struct accesskit_rect *rect);
+
+bool accesskit_rect_is_empty(const struct accesskit_rect *rect);
+
+bool accesskit_rect_contains(const struct accesskit_rect *rect,
+                             struct accesskit_point point);
+
+struct accesskit_rect accesskit_rect_union(const struct accesskit_rect *rect,
+                                           struct accesskit_rect other);
+
+struct accesskit_rect accesskit_rect_union_pt(const struct accesskit_rect *rect,
+                                              struct accesskit_point pt);
+
+struct accesskit_rect accesskit_rect_intersect(
+    const struct accesskit_rect *rect, struct accesskit_rect other);
+
+struct accesskit_vec2 accesskit_size_to_vec2(struct accesskit_size size);
+
+struct accesskit_point accesskit_vec2_to_point(struct accesskit_vec2 vec2);
+
+struct accesskit_size accesskit_vec2_to_size(struct accesskit_vec2 vec2);
+
+#if defined(__APPLE__)
+/**
+ * Memory is also freed when calling this function.
+ */
+void accesskit_macos_queued_events_raise(
+    struct accesskit_macos_queued_events *events);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * # Safety
+ *
+ * `view` must be a valid, unreleased pointer to an `NSView`.
+ */
+struct accesskit_macos_adapter *accesskit_macos_adapter_new(
+    void *view, bool is_view_focused,
+    accesskit_action_handler_callback action_handler,
+    void *action_handler_userdata);
+#endif
+
+#if defined(__APPLE__)
+void accesskit_macos_adapter_free(struct accesskit_macos_adapter *adapter);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * You must call `accesskit_macos_queued_events_raise` on the returned pointer.
+ * It can be null if the adapter is not active.
+ */
+struct accesskit_macos_queued_events *accesskit_macos_adapter_update_if_active(
+    struct accesskit_macos_adapter *adapter,
+    accesskit_tree_update_factory update_factory,
+    void *update_factory_userdata);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * Update the tree state based on whether the window is focused.
+ *
+ * You must call `accesskit_macos_queued_events_raise` on the returned pointer.
+ * It can be null if the adapter is not active.
+ */
+struct accesskit_macos_queued_events *
+accesskit_macos_adapter_update_view_focus_state(
+    struct accesskit_macos_adapter *adapter, bool is_focused);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * Returns a pointer to an `NSArray`. Ownership of the pointer is not
+ * transferred.
+ */
+void *accesskit_macos_adapter_view_children(
+    struct accesskit_macos_adapter *adapter,
+    accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * Returns a pointer to an `NSObject`. Ownership of the pointer is not
+ * transferred.
+ */
+void *accesskit_macos_adapter_focus(
+    struct accesskit_macos_adapter *adapter,
+    accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * Returns a pointer to an `NSObject`. Ownership of the pointer is not
+ * transferred.
+ */
+void *accesskit_macos_adapter_hit_test(
+    struct accesskit_macos_adapter *adapter, double x, double y,
+    accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * # Safety
+ *
+ * `view` must be a valid, unreleased pointer to an `NSView`.
+ */
+struct accesskit_macos_subclassing_adapter *
+accesskit_macos_subclassing_adapter_new(
+    void *view, accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata,
+    accesskit_action_handler_callback action_handler,
+    void *action_handler_userdata);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * # Safety
+ *
+ * `window` must be a valid, unreleased pointer to an `NSWindow`.
+ *
+ * # Panics
+ *
+ * This function panics if the specified window doesn't currently have
+ * a content view.
+ */
+struct accesskit_macos_subclassing_adapter *
+accesskit_macos_subclassing_adapter_for_window(
+    void *window, accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata,
+    accesskit_action_handler_callback action_handler,
+    void *action_handler_userdata);
+#endif
+
+#if defined(__APPLE__)
+void accesskit_macos_subclassing_adapter_free(
+    struct accesskit_macos_subclassing_adapter *adapter);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * You must call `accesskit_macos_queued_events_raise` on the returned pointer.
+ * It can be null if the adapter is not active.
+ */
+struct accesskit_macos_queued_events *
+accesskit_macos_subclassing_adapter_update_if_active(
+    struct accesskit_macos_subclassing_adapter *adapter,
+    accesskit_tree_update_factory update_factory,
+    void *update_factory_userdata);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * Update the tree state based on whether the window is focused.
+ *
+ * You must call `accesskit_macos_queued_events_raise` on the returned pointer.
+ * It can be null if the adapter is not active.
+ */
+struct accesskit_macos_queued_events *
+accesskit_macos_subclassing_adapter_update_view_focus_state(
+    struct accesskit_macos_subclassing_adapter *adapter, bool is_focused);
+#endif
+
+#if defined(__APPLE__)
+/**
+ * Modifies the specified class, which must be a subclass of `NSWindow`,
+ * to include an `accessibilityFocusedUIElement` method that calls
+ * the corresponding method on the window's content view. This is needed
+ * for windowing libraries such as SDL that place the keyboard focus
+ * directly on the window rather than the content view.
+ *
+ * # Safety
+ *
+ * This function is declared unsafe because the caller must ensure that the
+ * code for this library is never unloaded from the application process,
+ * since it's not possible to reverse this operation. It's safest
+ * if this library is statically linked into the application's main executable.
+ * Also, this function assumes that the specified class is a subclass
+ * of `NSWindow`.
+ */
+void accesskit_macos_add_focus_forwarder_to_window_class(
+    const char *class_name);
+#endif
+
+#if (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__NetBSD__) || defined(__OpenBSD__))
+/**
+ * All of the handlers will always be called from another thread.
+ */
+struct accesskit_unix_adapter *accesskit_unix_adapter_new(
+    accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata,
+    accesskit_action_handler_callback action_handler,
+    void *action_handler_userdata,
+    accesskit_deactivation_handler_callback deactivation_handler,
+    void *deactivation_handler_userdata);
+#endif
+
+#if (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__NetBSD__) || defined(__OpenBSD__))
+void accesskit_unix_adapter_free(struct accesskit_unix_adapter *adapter);
+#endif
+
+#if (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__NetBSD__) || defined(__OpenBSD__))
+void accesskit_unix_adapter_set_root_window_bounds(
+    struct accesskit_unix_adapter *adapter, struct accesskit_rect outer,
+    struct accesskit_rect inner);
+#endif
+
+#if (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__NetBSD__) || defined(__OpenBSD__))
+void accesskit_unix_adapter_update_if_active(
+    struct accesskit_unix_adapter *adapter,
+    accesskit_tree_update_factory update_factory,
+    void *update_factory_userdata);
+#endif
+
+#if (defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
+     defined(__NetBSD__) || defined(__OpenBSD__))
+/**
+ * Update the tree state based on whether the window is focused.
+ */
+void accesskit_unix_adapter_update_window_focus_state(
+    struct accesskit_unix_adapter *adapter, bool is_focused);
+#endif
+
+#if defined(_WIN32)
+/**
+ * Memory is also freed when calling this function.
+ */
+void accesskit_windows_queued_events_raise(
+    struct accesskit_windows_queued_events *events);
+#endif
+
+#if defined(_WIN32)
+struct accesskit_windows_adapter *accesskit_windows_adapter_new(
+    HWND hwnd, bool is_window_focused,
+    accesskit_action_handler_callback action_handler,
+    void *action_handler_userdata);
+#endif
+
+#if defined(_WIN32)
+void accesskit_windows_adapter_free(struct accesskit_windows_adapter *adapter);
+#endif
+
+#if defined(_WIN32)
+/**
+ * You must call `accesskit_windows_queued_events_raise` on the returned
+ * pointer. It can be null if the adapter is not active.
+ */
+struct accesskit_windows_queued_events *
+accesskit_windows_adapter_update_if_active(
+    struct accesskit_windows_adapter *adapter,
+    accesskit_tree_update_factory update_factory,
+    void *update_factory_userdata);
+#endif
+
+#if defined(_WIN32)
+/**
+ * Update the tree state based on whether the window is focused.
+ *
+ * You must call `accesskit_windows_queued_events_raise` on the returned
+ * pointer.
+ */
+struct accesskit_windows_queued_events *
+accesskit_windows_adapter_update_window_focus_state(
+    struct accesskit_windows_adapter *adapter, bool is_focused);
+#endif
+
+#if defined(_WIN32)
+struct accesskit_opt_lresult accesskit_windows_adapter_handle_wm_getobject(
+    struct accesskit_windows_adapter *adapter, WPARAM wparam, LPARAM lparam,
+    accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata);
+#endif
+
+#if defined(_WIN32)
+/**
+ * Creates a new Windows platform adapter using window subclassing.
+ * This must be done before the window is shown or focused
+ * for the first time.
+ *
+ * This must be called on the thread that owns the window. The activation
+ * handler will always be called on that thread. The action handler
+ * may or may not be called on that thread.
+ *
+ * # Panics
+ *
+ * Panics if the window is already visible.
+ */
+struct accesskit_windows_subclassing_adapter *
+accesskit_windows_subclassing_adapter_new(
+    HWND hwnd, accesskit_activation_handler_callback activation_handler,
+    void *activation_handler_userdata,
+    accesskit_action_handler_callback action_handler,
+    void *action_handler_userdata);
+#endif
+
+#if defined(_WIN32)
+void accesskit_windows_subclassing_adapter_free(
+    struct accesskit_windows_subclassing_adapter *adapter);
+#endif
+
+#if defined(_WIN32)
+/**
+ * You must call `accesskit_windows_queued_events_raise` on the returned
+ * pointer. It can be null if the adapter is not active.
+ */
+struct accesskit_windows_queued_events *
+accesskit_windows_subclassing_adapter_update_if_active(
+    struct accesskit_windows_subclassing_adapter *adapter,
+    accesskit_tree_update_factory update_factory,
+    void *update_factory_userdata);
+#endif
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
+
+#endif /* ACCESSKIT_H */
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.core.h b/engine/thirdparty/clipper2/include/clipper2/clipper.core.h
index dd1b873d..aa003bf0 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.core.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.core.h
@@ -1,26 +1,23 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
 * Date      :  12 May 2024                                                     *
-* Website   :  http://www.angusj.com                                           *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  Core Clipper Library structures and functions                   *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
 #ifndef CLIPPER_CORE_H
 #define CLIPPER_CORE_H
 
+#include "clipper2/clipper.version.h"
 #include <cstdint>
-#include <cstdlib>
-#include <cmath>
 #include <vector>
 #include <string>
 #include <iostream>
 #include <algorithm>
-#include <climits>
 #include <numeric>
-#include <optional>
-#include "clipper2/clipper.version.h"
+#include <cmath>
 
 #define CLIPPER2_THROW(exception) std::abort()
 
@@ -33,7 +30,7 @@ namespace Clipper2Lib
   public:
     explicit Clipper2Exception(const char* description) :
       m_descr(description) {}
-    virtual const char* what() const throw() override { return m_descr.c_str(); }
+    virtual const char* what() const noexcept override { return m_descr.c_str(); }
   private:
     std::string m_descr;
   };
@@ -90,6 +87,9 @@ namespace Clipper2Lib
       CLIPPER2_THROW(Clipper2Exception(undefined_error));
     case range_error_i:
       CLIPPER2_THROW(Clipper2Exception(range_error));
+    // Should never happen, but adding this to stop a compiler warning
+    default:
+      CLIPPER2_THROW(Clipper2Exception("Unknown error"));
     }
 #else
     if(error_code) {}; // only to stop compiler 'parameter not used' warning
@@ -109,6 +109,10 @@ namespace Clipper2Lib
   //https://en.wikipedia.org/wiki/Nonzero-rule
   enum class FillRule { EvenOdd, NonZero, Positive, Negative };
 
+#ifdef USINGZ
+  using z_type = int64_t;
+#endif
+
   // Point ------------------------------------------------------------------------
 
   template <typename T>
@@ -116,10 +120,10 @@ namespace Clipper2Lib
     T x;
     T y;
 #ifdef USINGZ
-    int64_t z;
+     z_type z;
 
     template <typename T2>
-    inline void Init(const T2 x_ = 0, const T2 y_ = 0, const int64_t z_ = 0)
+    inline void Init(const T2 x_ = 0, const T2 y_ = 0, const z_type z_ = 0)
     {
       if constexpr (std::is_integral_v<T> &&
         is_round_invocable<T2>::value && !std::is_integral_v<T2>)
@@ -139,7 +143,7 @@ namespace Clipper2Lib
     explicit Point() : x(0), y(0), z(0) {};
 
     template <typename T2>
-    Point(const T2 x_, const T2 y_, const int64_t z_ = 0)
+    Point(const T2 x_, const T2 y_, const z_type z_ = 0)
     {
       Init(x_, y_);
       z = z_;
@@ -152,7 +156,7 @@ namespace Clipper2Lib
     }
 
     template <typename T2>
-    explicit Point(const Point<T2>& p, int64_t z_)
+    explicit Point(const Point<T2>& p, z_type z_)
     {
       Init(p.x, p.y, z_);
     }
@@ -162,7 +166,7 @@ namespace Clipper2Lib
       return Point(x * scale, y * scale, z);
     }
 
-    void SetZ(const int64_t z_value) { z = z_value; }
+    void SetZ(const z_type z_value) { z = z_value; }
 
     friend std::ostream& operator<<(std::ostream& os, const Point& point)
     {
@@ -326,10 +330,10 @@ namespace Clipper2Lib
     {
       Path<T> result;
       result.reserve(4);
-      result.push_back(Point<T>(left, top));
-      result.push_back(Point<T>(right, top));
-      result.push_back(Point<T>(right, bottom));
-      result.push_back(Point<T>(left, bottom));
+      result.emplace_back(left, top);
+      result.emplace_back(right, top);
+      result.emplace_back(right, bottom);
+      result.emplace_back(left, bottom);
       return result;
     }
 
@@ -364,6 +368,22 @@ namespace Clipper2Lib
         top == other.top && bottom == other.bottom;
     }
 
+    Rect<T>& operator+=(const Rect<T>& other)
+    {
+      left = (std::min)(left, other.left);
+      top = (std::min)(top, other.top);
+      right = (std::max)(right, other.right);
+      bottom = (std::max)(bottom, other.bottom);
+      return *this;
+    }
+
+    Rect<T> operator+(const Rect<T>& other) const
+    {
+      Rect<T> result = *this;
+      result += other;
+      return result;
+    }
+
     friend std::ostream& operator<<(std::ostream& os, const Rect<T>& rect) {
       os << "(" << rect.left << "," << rect.top << "," << rect.right << "," << rect.bottom << ") ";
       return os;
@@ -597,13 +617,13 @@ namespace Clipper2Lib
     result.reserve(path.size());
     typename Path<T>::const_iterator path_iter = path.cbegin();
     Point<T> first_pt = *path_iter++, last_pt = first_pt;
-    result.push_back(first_pt);
+    result.emplace_back(first_pt);
     for (; path_iter != path.cend(); ++path_iter)
     {
       if (!NearEqual(*path_iter, last_pt, max_dist_sqrd))
       {
         last_pt = *path_iter;
-        result.push_back(last_pt);
+        result.emplace_back(last_pt);
       }
     }
     if (!is_closed_path) return result;
@@ -621,7 +641,7 @@ namespace Clipper2Lib
     for (typename Paths<T>::const_iterator paths_citer = paths.cbegin();
       paths_citer != paths.cend(); ++paths_citer)
     {
-      result.push_back(StripNearEqual(*paths_citer, max_dist_sqrd, is_closed_path));
+      result.emplace_back(std::move(StripNearEqual(*paths_citer, max_dist_sqrd, is_closed_path)));
     }
     return result;
   }
@@ -697,11 +717,11 @@ namespace Clipper2Lib
   {
 // Work around LLVM issue: https://github.com/llvm/llvm-project/issues/16778
 // Details: https://github.com/godotengine/godot/pull/95964#issuecomment-2306581804
-//#if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX
-//    const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b);
-//    const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d);
-//    return ab == cd;
-//#else
+// #if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX
+//     const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b);
+//     const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d);
+//     return ab == cd;
+// #else
     // nb: unsigned values needed for calculating overflow carry
     const auto abs_a = static_cast<uint64_t>(std::abs(a));
     const auto abs_b = static_cast<uint64_t>(std::abs(b));
@@ -768,7 +788,7 @@ namespace Clipper2Lib
     const Point<T>& line1, const Point<T>& line2)
   {
     //perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²)
-    //see http://en.wikipedia.org/wiki/Perpendicular_distance
+    //see https://en.wikipedia.org/wiki/Perpendicular_distance
     double a = static_cast<double>(pt.x - line1.x);
     double b = static_cast<double>(pt.y - line1.y);
     double c = static_cast<double>(line2.x - line1.x);
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.engine.h b/engine/thirdparty/clipper2/include/clipper2/clipper.engine.h
index f6108832..f4e1e183 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.engine.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.engine.h
@@ -1,25 +1,19 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  5 July 2024                                                     *
-* Website   :  http://www.angusj.com                                           *
+* Date      :  17 September 2024                                               *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  This is the main polygon clipping module                        *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
 #ifndef CLIPPER_ENGINE_H
 #define CLIPPER_ENGINE_H
 
-#include <cstdlib>
-#include <stdint.h> //#541
-#include <iostream>
-#include <queue>
-#include <vector>
-#include <functional>
-#include <numeric>
-#include <memory>
-
 #include "clipper2/clipper.core.h"
+#include <queue>
+#include <functional>
+#include <memory>
 
 namespace Clipper2Lib {
 
@@ -32,13 +26,13 @@ namespace Clipper2Lib {
 	struct HorzSegment;
 
 	//Note: all clipping operations except for Difference are commutative.
-	enum class ClipType { None, Intersection, Union, Difference, Xor };
+	enum class ClipType { NoClip, Intersection, Union, Difference, Xor };
 
 	enum class PathType { Subject, Clip };
-	enum class JoinWith { None, Left, Right };
+	enum class JoinWith { NoJoin, Left, Right };
 
 	enum class VertexFlags : uint32_t {
-		None = 0, OpenStart = 1, OpenEnd = 2, LocalMax = 4, LocalMin = 8
+		Empty = 0, OpenStart = 1, OpenEnd = 2, LocalMax = 4, LocalMin = 8
 	};
 
 	constexpr enum VertexFlags operator &(enum VertexFlags a, enum VertexFlags b)
@@ -55,7 +49,7 @@ namespace Clipper2Lib {
 		Point64 pt;
 		Vertex* next = nullptr;
 		Vertex* prev = nullptr;
-		VertexFlags flags = VertexFlags::None;
+		VertexFlags flags = VertexFlags::Empty;
 	};
 
 	struct OutPt {
@@ -131,7 +125,7 @@ namespace Clipper2Lib {
 		Vertex* vertex_top = nullptr;
 		LocalMinima* local_min = nullptr;  // the bottom of an edge 'bound' (also Vatti)
 		bool is_left_bound = false;
-		JoinWith join_with = JoinWith::None;
+		JoinWith join_with = JoinWith::NoJoin;
 	};
 
 	struct LocalMinima {
@@ -167,7 +161,7 @@ namespace Clipper2Lib {
 	};
 
 #ifdef USINGZ
-		typedef std::function<void(const Point64& e1bot, const Point64& e1top,
+	typedef std::function<void(const Point64& e1bot, const Point64& e1top,
 		const Point64& e2bot, const Point64& e2top, Point64& pt)> ZCallback64;
 
 	typedef std::function<void(const PointD& e1bot, const PointD& e1top,
@@ -197,7 +191,7 @@ namespace Clipper2Lib {
 
 	class ClipperBase {
 	private:
-		ClipType cliptype_ = ClipType::None;
+		ClipType cliptype_ = ClipType::NoClip;
 		FillRule fillrule_ = FillRule::EvenOdd;
 		FillRule fillpos = FillRule::Positive;
 		int64_t bot_y_ = 0;
@@ -210,7 +204,7 @@ namespace Clipper2Lib {
 		std::vector<Vertex*> vertex_lists_;
 		std::priority_queue<int64_t> scanline_list_;
 		IntersectNodeList intersect_nodes_;
-    HorzSegmentList horz_seg_list_;
+        HorzSegmentList horz_seg_list_;
 		std::vector<HorzJoin> horz_join_list_;
 		void Reset();
 		inline void InsertScanline(int64_t y);
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.export.h b/engine/thirdparty/clipper2/include/clipper2/clipper.export.h
index 53a44536..79856e2e 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.export.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.export.h
@@ -1,16 +1,16 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  14 May 2024                                                     *
-* Website   :  http://www.angusj.com                                           *
-* Copyright :  Angus Johnson 2010-2024                                         *
+* Date      :  24 January 2025                                                 *
+* Website   :  https://www.angusj.com                                          *
+* Copyright :  Angus Johnson 2010-2025                                         *
 * Purpose   :  This module exports the Clipper2 Library (ie DLL/so)            *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
 
 /*
  Boolean clipping:
- cliptype: None=0, Intersection=1, Union=2, Difference=3, Xor=4
+ cliptype: NoClip=0, Intersection=1, Union=2, Difference=3, Xor=4
  fillrule: EvenOdd=0, NonZero=1, Positive=2, Negative=3
 
  Polygon offsetting (inflate/deflate):
@@ -19,73 +19,104 @@
 
 The path structures used extensively in other parts of this library are all
 based on std::vector classes. Since C++ classes can't be accessed by other
-languages, these paths are converted into very simple array data structures 
-(of either int64_t for CPath64 or double for CPathD) that can be parsed by 
-just about any programming language.
+languages, these paths are exported here as very simple array structures 
+(either of int64_t or double) that can be parsed by just about any 
+programming language.
+
+These 2D paths are defined by series of x and y coordinates together with an
+optional user-defined 'z' value (see Z-values below). Hence, a vertex refers
+to a single x and y coordinate (+/- a user-defined value). Data structures 
+have names with suffixes that indicate the array type (either int64_t or 
+double). For example, the data structure CPath64 contains an array of int64_t 
+values, whereas the data structure CPathD contains an array of double. 
+Where documentation omits the type suffix (eg CPath), it is referring to an 
+array whose data type could be either int64_t or double.
+
+For conciseness, the following letters are used in the diagrams below:
+N: Number of vertices in a given path
+C: Count (ie number) of paths (or PolyPaths) in the structure
+A: Number of elements in an array
+
 
 CPath64 and CPathD:
-These are arrays of consecutive x and y path coordinates preceeded by
-a pair of values containing the path's length (N) and a 0 value.
-__________________________________
-|counter|coord1|coord2|...|coordN|
-|N, 0   |x1, y1|x2, y2|...|xN, yN|
-__________________________________
+These are arrays of either int64_t or double values. Apart from 
+the first two elements, these arrays are a series of vertices 
+that together define a path. The very first element contains the 
+number of vertices (N) in the path, while second element should 
+contain a 0 value.
+_______________________________________________________________
+| counters | vertex1      | vertex2      | ... | vertexN      |
+| N, 0     | x1, y1, (z1) | x2, y2, (z2) | ... | xN, yN, (zN) |
+---------------------------------------------------------------
+
 
 CPaths64 and CPathsD:
-These are also arrays containing any number of consecutive CPath64 or
-CPathD  structures. But preceeding these consecutive paths, there is pair of
-values that contain the total length of the array structure (A) and the 
-number of CPath64 or CPathD it contains (C). The space these structures will
-occupy in memory = A * sizeof(int64_t) or  A * sizeof(double) respectively. 
-_______________________________
-|counter|path1|path2|...|pathC|
-|A  , C |                     |
-_______________________________
+These are also arrays of either int64_t or double values that
+contain any number of consecutive CPath structures. However, 
+preceding the first path is a pair of values. The first value
+contains the length of the entire array structure (A), and the 
+second contains the number (ie count) of contained paths (C).
+  Memory allocation for CPaths64 = A * sizeof(int64_t)
+  Memory allocation for CPathsD  = A * sizeof(double)
+__________________________________________
+| counters | path1 | path2 | ... | pathC |
+| A, C     |       |       | ... |       |
+------------------------------------------
+
 
 CPolytree64 and CPolytreeD:
-These are also arrays consisting of CPolyPath structures that represent
-individual paths in a tree structure. However, the very first (ie top)
-CPolyPath is just the tree container that doesn't have a path. And because
-of that, its structure will be very slightly different from the remaining
-CPolyPath. This difference will be discussed below.
+The entire polytree structure is an array of int64_t or double. The 
+first element in the array indicates the array's total length (A). 
+The second element indicates the number (C) of CPolyPath structures 
+that are the TOP LEVEL CPolyPath in the polytree, and these top
+level CPolyPath immediately follow these first two array elements. 
+These top level CPolyPath structures may, in turn, contain nested 
+CPolyPath children, and these collectively make a tree structure.
+_________________________________________________________
+| counters | CPolyPath1 | CPolyPath2 | ... | CPolyPathC |
+| A, C     |            |            | ... |            |
+---------------------------------------------------------
+
 
 CPolyPath64 and CPolyPathD:
-These are simple arrays consisting of a series of path coordinates followed
-by any number of child (ie nested) CPolyPath. Preceeding these are two values
-indicating the length of the path (N) and the number of child CPolyPath (C).
-____________________________________________________________
-|counter|coord1|coord2|...|coordN| child1|child2|...|childC|
-|N  , C |x1, y1|x2, y2|...|xN, yN|                         |
-____________________________________________________________
+These array structures consist of a pair of counter values followed by a
+series of polygon vertices and a series of nested CPolyPath children.
+The first counter values indicates the number of vertices in the
+polygon (N), and the second counter indicates the CPolyPath child count (C).
+_____________________________________________________________________________
+|cntrs |vertex1     |vertex2      |...|vertexN     |child1|child2|...|childC|
+|N, C  |x1, y1, (z1)| x2, y2, (z2)|...|xN, yN, (zN)|      |      |...|      |
+-----------------------------------------------------------------------------
 
-As mentioned above, the very first CPolyPath structure is just a container
-that owns (both directly and indirectly) every other CPolyPath in the tree.
-Since this first CPolyPath has no path, instead of a path length, its very
-first value will contain the total length of the CPolytree array (not its
-total bytes length).
 
-Again, all theses exported structures (CPaths64, CPathsD, CPolyTree64 & 
-CPolyTreeD) are arrays of either type int64_t or double, and the first 
-value in these arrays will always be the length of that array.
+DisposeArray64 & DisposeArrayD:
+All array structures are allocated in heap memory which will eventually
+need to be released. However, since applications linking to these DLL
+functions may use different memory managers, the only safe way to release
+this memory is to use the exported DisposeArray functions.
+
+
+(Optional) Z-Values:
+Structures will only contain user-defined z-values when the USINGZ
+pre-processor identifier is used. The library does not assign z-values
+because this field is intended for users to assign custom values to vertices.
+Z-values in input paths (subject and clip) will be copied to solution paths.
+New vertices at path intersections will generate a callback event that allows
+users to assign z-values at these new vertices. The user's callback function
+must conform with the DLLZCallback definition and be registered with the
+DLL via SetZCallback. To assist the user in assigning z-values, the library
+passes in the callback function the new intersection point together with
+the four vertices that define the two segments that are intersecting.
 
-These array structures are allocated in heap memory which will eventually
-need to be released. However, since applications dynamically linking to 
-these functions may use different memory managers, the only safe way to 
-free up this memory is to use the exported DisposeArray64 and 
-DisposeArrayD functions (see below).
 */
-
-
 #ifndef CLIPPER2_EXPORT_H
 #define CLIPPER2_EXPORT_H
 
-#include <cstdlib>
-#include <vector>
-
 #include "clipper2/clipper.core.h"
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.offset.h"
 #include "clipper2/clipper.rectclip.h"
+#include <cstdlib>
 
 namespace Clipper2Lib {
 
@@ -127,6 +158,12 @@ inline Rect<T> CRectToRect(const CRect<T>& rect)
   return result;
 }
 
+template <typename T1, typename T2>
+inline T1 Reinterpret(T2 value) {
+  return *reinterpret_cast<T1*>(&value);
+}
+
+
 #ifdef _WIN32
   #define EXTERN_DLL_EXPORT extern "C" __declspec(dllexport)
 #else
@@ -178,11 +215,22 @@ EXTERN_DLL_EXPORT CPaths64 InflatePaths64(const CPaths64 paths,
   double delta, uint8_t jointype, uint8_t endtype,
   double miter_limit = 2.0, double arc_tolerance = 0.0,
   bool reverse_solution = false);
+
 EXTERN_DLL_EXPORT CPathsD InflatePathsD(const CPathsD paths,
   double delta, uint8_t jointype, uint8_t endtype,
   int precision = 2, double miter_limit = 2.0,
   double arc_tolerance = 0.0, bool reverse_solution = false);
 
+EXTERN_DLL_EXPORT CPaths64 InflatePath64(const CPath64 path,
+    double delta, uint8_t jointype, uint8_t endtype,
+    double miter_limit = 2.0, double arc_tolerance = 0.0,
+    bool reverse_solution = false);
+
+EXTERN_DLL_EXPORT CPathsD InflatePathD(const CPathD path,
+    double delta, uint8_t jointype, uint8_t endtype,
+    int precision = 2, double miter_limit = 2.0,
+    double arc_tolerance = 0.0, bool reverse_solution = false);
+
 // RectClip & RectClipLines:
 EXTERN_DLL_EXPORT CPaths64 RectClip64(const CRect64& rect,
   const CPaths64 paths);
@@ -197,6 +245,15 @@ EXTERN_DLL_EXPORT CPathsD RectClipLinesD(const CRectD& rect,
 // INTERNAL FUNCTIONS
 //////////////////////////////////////////////////////
 
+#ifdef USINGZ
+ZCallback64 dllCallback64 = nullptr;
+ZCallbackD  dllCallbackD  = nullptr;
+
+constexpr int EXPORT_VERTEX_DIMENSIONALITY = 3;
+#else    
+constexpr int EXPORT_VERTEX_DIMENSIONALITY  = 2;
+#endif 
+
 template <typename T>
 static void GetPathCountAndCPathsArrayLen(const Paths<T>& paths,
   size_t& cnt, size_t& array_len)
@@ -206,30 +263,47 @@ static void GetPathCountAndCPathsArrayLen(const Paths<T>& paths,
   for (const Path<T>& path : paths)
     if (path.size())
     {
-      array_len += path.size() * 2 + 2;
+      array_len += path.size() * EXPORT_VERTEX_DIMENSIONALITY + 2;
       ++cnt;
     }
 }
 
-static size_t GetPolyPath64ArrayLen(const PolyPath64& pp)
+static size_t GetPolyPathArrayLen64(const PolyPath64& pp)
 {
   size_t result = 2; // poly_length + child_count
-  result += pp.Polygon().size() * 2;
+  result += pp.Polygon().size() * EXPORT_VERTEX_DIMENSIONALITY;
   //plus nested children :)
   for (size_t i = 0; i < pp.Count(); ++i)
-    result += GetPolyPath64ArrayLen(*pp[i]);
+    result += GetPolyPathArrayLen64(*pp[i]);
   return result;
 }
 
-static void GetPolytreeCountAndCStorageSize(const PolyTree64& tree,
+static size_t GetPolyPathArrayLenD(const PolyPathD& pp)
+{
+  size_t result = 2; // poly_length + child_count
+  result += pp.Polygon().size() * EXPORT_VERTEX_DIMENSIONALITY;
+  //plus nested children :)
+  for (size_t i = 0; i < pp.Count(); ++i)
+    result += GetPolyPathArrayLenD(*pp[i]);
+  return result;
+}
+
+static void GetPolytreeCountAndCStorageSize64(const PolyTree64& tree,
   size_t& cnt, size_t& array_len)
 {
   cnt = tree.Count(); // nb: top level count only
-  array_len = GetPolyPath64ArrayLen(tree);
+  array_len = GetPolyPathArrayLen64(tree);
+}
+
+static void GetPolytreeCountAndCStorageSizeD(const PolyTreeD& tree,
+  size_t& cnt, size_t& array_len)
+{
+  cnt = tree.Count(); // nb: top level count only
+  array_len = GetPolyPathArrayLenD(tree);
 }
 
 template <typename T>
-static T* CreateCPaths(const Paths<T>& paths)
+static T* CreateCPathsFromPathsT(const Paths<T>& paths)
 {
   size_t cnt = 0, array_len = 0;
   GetPathCountAndCPathsArrayLen(paths, cnt, array_len);
@@ -245,11 +319,38 @@ static T* CreateCPaths(const Paths<T>& paths)
     {
       *v++ = pt.x;
       *v++ = pt.y;
+#ifdef USINGZ
+      *v++ = Reinterpret<T>(pt.z);
+#endif
     }
   }
   return result;
 }
 
+CPathsD CreateCPathsDFromPathsD(const PathsD& paths)
+{
+  if (!paths.size()) return nullptr;
+  size_t cnt, array_len;
+  GetPathCountAndCPathsArrayLen(paths, cnt, array_len);
+  CPathsD result = new double[array_len], v = result;
+  *v++ = (double)array_len;
+  *v++ = (double)cnt;
+  for (const PathD& path : paths)
+  {
+    if (!path.size()) continue;
+    *v = (double)path.size();
+    ++v; *v++ = 0;
+    for (const PointD& pt : path)
+    {
+      *v++ = pt.x;
+      *v++ = pt.y;
+#ifdef USINGZ
+      * v++ = Reinterpret<double>(pt.z);
+#endif
+    }
+  }
+  return result;
+}
 
 CPathsD CreateCPathsDFromPaths64(const Paths64& paths, double scale)
 {
@@ -268,13 +369,16 @@ CPathsD CreateCPathsDFromPaths64(const Paths64& paths, double scale)
     {
       *v++ = pt.x * scale;
       *v++ = pt.y * scale;
+#ifdef USINGZ
+      *v++ = Reinterpret<double>(pt.z);
+#endif
     }
   }
   return result;
 }
 
 template <typename T>
-static Path<T> ConvertCPath(T* path)
+static Path<T> ConvertCPathToPathT(T* path)
 {
   Path<T> result;
   if (!path) return result;
@@ -284,14 +388,19 @@ static Path<T> ConvertCPath(T* path)
   result.reserve(cnt);
   for (size_t j = 0; j < cnt; ++j)
   {
-    T x = *v++, y = *v++;
-    result.push_back(Point<T>(x, y));
+      T x = *v++, y = *v++;
+#ifdef USINGZ
+      z_type z = Reinterpret<z_type>(*v++);
+      result.emplace_back(x, y, z);
+#else  
+      result.emplace_back(x, y);
+#endif
   }
   return result;
 }
 
 template <typename T>
-static Paths<T> ConvertCPaths(T* paths)
+static Paths<T> ConvertCPathsToPathsT(T* paths)
 {
   Paths<T> result;
   if (!paths) return result;
@@ -301,19 +410,45 @@ static Paths<T> ConvertCPaths(T* paths)
   for (size_t i = 0; i < cnt; ++i)
   {
     size_t cnt2 = static_cast<size_t>(*v);
-    v += 2;
+    v += 2; 
     Path<T> path;
     path.reserve(cnt2);
     for (size_t j = 0; j < cnt2; ++j)
     {
       T x = *v++, y = *v++;
-      path.push_back(Point<T>(x, y));
+#ifdef USINGZ
+      z_type z = Reinterpret<z_type>(*v++);
+      path.emplace_back(x, y, z);
+#else
+      path.emplace_back(x, y);
+#endif
     }
-    result.push_back(path);
+    result.emplace_back(std::move(path));
   }
   return result;
 }
 
+static Path64 ConvertCPathDToPath64WithScale(const CPathD path, double scale)
+{
+    Path64 result;
+    if (!path) return result;
+    double* v = path;
+    size_t cnt = static_cast<size_t>(*v);
+    v += 2; // skip 0 value
+    result.reserve(cnt);
+    for (size_t j = 0; j < cnt; ++j)
+    {
+        double x = *v++ * scale;
+        double y = *v++ * scale;
+#ifdef USINGZ
+        z_type z = Reinterpret<z_type>(*v++);
+        result.emplace_back(x, y, z);
+#else  
+        result.emplace_back(x, y);
+#endif
+    }
+    return result;
+}
 
 static Paths64 ConvertCPathsDToPaths64(const CPathsD paths, double scale)
 {
@@ -333,42 +468,78 @@ static Paths64 ConvertCPathsDToPaths64(const CPathsD paths, double scale)
     {
       double x = *v++ * scale;
       double y = *v++ * scale;
-      path.push_back(Point64(x, y));
+#ifdef USINGZ
+      z_type z = Reinterpret<z_type>(*v++);
+      path.emplace_back(x, y, z);
+#else
+      path.emplace_back(x, y);
+#endif
     }
-    result.push_back(path);
+    result.emplace_back(std::move(path));
   }
   return result;
 }
 
-template <typename T>
-static void CreateCPolyPath(const PolyPath64* pp, T*& v, T scale)
+static void CreateCPolyPath64(const PolyPath64* pp, int64_t*& v)
 {
-  *v++ = static_cast<T>(pp->Polygon().size());
-  *v++ = static_cast<T>(pp->Count());
+  *v++ = static_cast<int64_t>(pp->Polygon().size());
+  *v++ = static_cast<int64_t>(pp->Count());
   for (const Point64& pt : pp->Polygon())
   {
-    *v++ = static_cast<T>(pt.x * scale);
-    *v++ = static_cast<T>(pt.y * scale);
+    *v++ = pt.x;
+    *v++ = pt.y;
+#ifdef USINGZ   
+    * v++ = Reinterpret<int64_t>(pt.z); // raw memory copy
+#endif
   }
   for (size_t i = 0; i < pp->Count(); ++i)
-    CreateCPolyPath(pp->Child(i), v, scale);
+    CreateCPolyPath64(pp->Child(i), v);
 }
 
-template <typename T>
-static T* CreateCPolyTree(const PolyTree64& tree, T scale)
+static void CreateCPolyPathD(const PolyPathD* pp, double*& v)
+{
+  *v++ = static_cast<double>(pp->Polygon().size());
+  *v++ = static_cast<double>(pp->Count());
+  for (const PointD& pt : pp->Polygon())
+  {
+    *v++ = pt.x;
+    *v++ = pt.y;
+#ifdef USINGZ   
+    * v++ = Reinterpret<double>(pt.z); // raw memory copy
+#endif
+  }
+  for (size_t i = 0; i < pp->Count(); ++i)
+    CreateCPolyPathD(pp->Child(i), v);
+}
+
+static int64_t* CreateCPolyTree64(const PolyTree64& tree)
 {
-  if (scale == 0) scale = 1;
   size_t cnt, array_len;
-  GetPolytreeCountAndCStorageSize(tree, cnt, array_len);
+  GetPolytreeCountAndCStorageSize64(tree, cnt, array_len);
   if (!cnt) return nullptr;
   // allocate storage
-  T* result = new T[array_len];
-  T* v = result;
-
-  *v++ = static_cast<T>(array_len);
-  *v++ = static_cast<T>(tree.Count());
+  int64_t* result = new int64_t[array_len];
+  int64_t* v = result;
+  *v++ = static_cast<int64_t>(array_len);
+  *v++ = static_cast<int64_t>(tree.Count());
   for (size_t i = 0; i < tree.Count(); ++i)
-    CreateCPolyPath(tree.Child(i), v, scale);
+    CreateCPolyPath64(tree.Child(i), v);
+  return result;
+}
+
+static double* CreateCPolyTreeD(const PolyTreeD& tree)
+{
+  double scale = std::log10(tree.Scale());
+  size_t cnt, array_len;
+  GetPolytreeCountAndCStorageSizeD(tree, cnt, array_len);
+  if (!cnt) return nullptr;
+  // allocate storage
+  double* result = new double[array_len];
+  double* v = result;
+  *v++ = static_cast<double>(array_len);
+  *v++ = static_cast<double>(tree.Count());
+  for (size_t i = 0; i < tree.Count(); ++i)
+    CreateCPolyPathD(tree.Child(i), v);
   return result;
 }
 
@@ -391,20 +562,24 @@ EXTERN_DLL_EXPORT int BooleanOp64(uint8_t cliptype,
   if (fillrule > static_cast<uint8_t>(FillRule::Negative)) return -3;
 
   Paths64 sub, sub_open, clp, sol, sol_open;
-  sub       = ConvertCPaths(subjects);
-  sub_open  = ConvertCPaths(subjects_open);
-  clp       = ConvertCPaths(clips);
+  sub       = ConvertCPathsToPathsT(subjects);
+  sub_open  = ConvertCPathsToPathsT(subjects_open);
+  clp       = ConvertCPathsToPathsT(clips);
 
   Clipper64 clipper;
   clipper.PreserveCollinear(preserve_collinear);
   clipper.ReverseSolution(reverse_solution);
+#ifdef USINGZ
+  if (dllCallback64)
+    clipper.SetZCallback(dllCallback64);
+#endif
   if (sub.size() > 0) clipper.AddSubject(sub);
   if (sub_open.size() > 0) clipper.AddOpenSubject(sub_open);
   if (clp.size() > 0) clipper.AddClip(clp);
   if (!clipper.Execute(ClipType(cliptype), FillRule(fillrule), sol, sol_open))
     return -1; // clipping bug - should never happen :)
-  solution = CreateCPaths(sol);
-  solution_open = CreateCPaths(sol_open);
+  solution = CreateCPathsFromPathsT(sol);
+  solution_open = CreateCPathsFromPathsT(sol_open);
   return 0; //success !!
 }
 
@@ -417,22 +592,26 @@ EXTERN_DLL_EXPORT int BooleanOp_PolyTree64(uint8_t cliptype,
   if (cliptype > static_cast<uint8_t>(ClipType::Xor)) return -4;
   if (fillrule > static_cast<uint8_t>(FillRule::Negative)) return -3;
   Paths64 sub, sub_open, clp, sol_open;
-  sub = ConvertCPaths(subjects);
-  sub_open = ConvertCPaths(subjects_open);
-  clp = ConvertCPaths(clips);
+  sub = ConvertCPathsToPathsT(subjects);
+  sub_open = ConvertCPathsToPathsT(subjects_open);
+  clp = ConvertCPathsToPathsT(clips);
 
   PolyTree64 tree;
   Clipper64 clipper;
   clipper.PreserveCollinear(preserve_collinear);
   clipper.ReverseSolution(reverse_solution);
+#ifdef USINGZ
+  if (dllCallback64)
+    clipper.SetZCallback(dllCallback64);
+#endif
   if (sub.size() > 0) clipper.AddSubject(sub);
   if (sub_open.size() > 0) clipper.AddOpenSubject(sub_open);
   if (clp.size() > 0) clipper.AddClip(clp);
   if (!clipper.Execute(ClipType(cliptype), FillRule(fillrule), tree, sol_open))
     return -1; // clipping bug - should never happen :)
 
-  sol_tree = CreateCPolyTree(tree, (int64_t)1);
-  solution_open = CreateCPaths(sol_open);
+  sol_tree = CreateCPolyTree64(tree);
+  solution_open = CreateCPathsFromPathsT(sol_open);
   return 0; //success !!
 }
 
@@ -445,23 +624,27 @@ EXTERN_DLL_EXPORT int BooleanOpD(uint8_t cliptype,
   if (precision < -8 || precision > 8) return -5;
   if (cliptype > static_cast<uint8_t>(ClipType::Xor)) return -4;
   if (fillrule > static_cast<uint8_t>(FillRule::Negative)) return -3;
-  const double scale = std::pow(10, precision);
+  //const double scale = std::pow(10, precision);
 
-  Paths64 sub, sub_open, clp, sol, sol_open;
-  sub       = ConvertCPathsDToPaths64(subjects, scale);
-  sub_open  = ConvertCPathsDToPaths64(subjects_open, scale);
-  clp       = ConvertCPathsDToPaths64(clips, scale);
+  PathsD sub, sub_open, clp, sol, sol_open;
+  sub       = ConvertCPathsToPathsT(subjects);
+  sub_open  = ConvertCPathsToPathsT(subjects_open);
+  clp       = ConvertCPathsToPathsT(clips);
 
-  Clipper64 clipper;
+  ClipperD clipper(precision);
   clipper.PreserveCollinear(preserve_collinear);
   clipper.ReverseSolution(reverse_solution);
+#ifdef USINGZ
+  if (dllCallbackD)
+    clipper.SetZCallback(dllCallbackD);
+#endif
   if (sub.size() > 0) clipper.AddSubject(sub);
   if (sub_open.size() > 0) clipper.AddOpenSubject(sub_open);
   if (clp.size() > 0) clipper.AddClip(clp);
   if (!clipper.Execute(ClipType(cliptype),
     FillRule(fillrule), sol, sol_open)) return -1;
-  solution = CreateCPathsDFromPaths64(sol, 1 / scale);
-  solution_open = CreateCPathsDFromPaths64(sol_open, 1 / scale);
+  solution = CreateCPathsDFromPathsD(sol);
+  solution_open = CreateCPathsDFromPathsD(sol_open);
   return 0;
 }
 
@@ -474,27 +657,30 @@ EXTERN_DLL_EXPORT int BooleanOp_PolyTreeD(uint8_t cliptype,
   if (precision < -8 || precision > 8) return -5;
   if (cliptype > static_cast<uint8_t>(ClipType::Xor)) return -4;
   if (fillrule > static_cast<uint8_t>(FillRule::Negative)) return -3;
-
-  double scale = std::pow(10, precision);
+  //double scale = std::pow(10, precision);
 
   int err = 0;
-  Paths64 sub, sub_open, clp, sol_open;
-  sub = ConvertCPathsDToPaths64(subjects, scale);
-  sub_open = ConvertCPathsDToPaths64(subjects_open, scale);
-  clp = ConvertCPathsDToPaths64(clips, scale);
+  PathsD sub, sub_open, clp, sol_open;
+  sub       = ConvertCPathsToPathsT(subjects);
+  sub_open  = ConvertCPathsToPathsT(subjects_open);
+  clp       = ConvertCPathsToPathsT(clips);
 
-  PolyTree64 tree;
-  Clipper64 clipper;
+  PolyTreeD tree;
+  ClipperD clipper(precision);
   clipper.PreserveCollinear(preserve_collinear);
   clipper.ReverseSolution(reverse_solution);
+#ifdef USINGZ
+  if (dllCallbackD)
+    clipper.SetZCallback(dllCallbackD);
+#endif
   if (sub.size() > 0) clipper.AddSubject(sub);
   if (sub_open.size() > 0) clipper.AddOpenSubject(sub_open);
   if (clp.size() > 0) clipper.AddClip(clp);
   if (!clipper.Execute(ClipType(cliptype), FillRule(fillrule), tree, sol_open))
     return -1; // clipping bug - should never happen :)
 
-  solution = CreateCPolyTree(tree, 1/scale);
-  solution_open = CreateCPathsDFromPaths64(sol_open, 1 / scale);
+  solution = CreateCPolyTreeD(tree);
+  solution_open = CreateCPathsDFromPathsD(sol_open);
   return 0; //success !!
 }
 
@@ -503,13 +689,13 @@ EXTERN_DLL_EXPORT CPaths64 InflatePaths64(const CPaths64 paths,
   double arc_tolerance, bool reverse_solution)
 {
   Paths64 pp;
-  pp = ConvertCPaths(paths);
+  pp = ConvertCPathsToPathsT(paths);
   ClipperOffset clip_offset( miter_limit,
     arc_tolerance, reverse_solution);
   clip_offset.AddPaths(pp, JoinType(jointype), EndType(endtype));
   Paths64 result;
   clip_offset.Execute(delta, result);
-  return CreateCPaths(result);
+  return CreateCPathsFromPathsT(result);
 }
 
 EXTERN_DLL_EXPORT CPathsD InflatePathsD(const CPathsD paths,
@@ -525,18 +711,49 @@ EXTERN_DLL_EXPORT CPathsD InflatePathsD(const CPathsD paths,
   clip_offset.AddPaths(pp, JoinType(jointype), EndType(endtype));
   Paths64 result;
   clip_offset.Execute(delta * scale, result);
-
   return CreateCPathsDFromPaths64(result, 1 / scale);
 }
 
+
+EXTERN_DLL_EXPORT CPaths64 InflatePath64(const CPath64 path,
+    double delta, uint8_t jointype, uint8_t endtype, double miter_limit,
+    double arc_tolerance, bool reverse_solution)
+{
+    Path64 pp;
+    pp = ConvertCPathToPathT(path);
+    ClipperOffset clip_offset(miter_limit,
+        arc_tolerance, reverse_solution);
+    clip_offset.AddPath(pp, JoinType(jointype), EndType(endtype));
+    Paths64 result;
+    clip_offset.Execute(delta, result);
+    return CreateCPathsFromPathsT(result);
+}
+
+EXTERN_DLL_EXPORT CPathsD InflatePathD(const CPathD path,
+    double delta, uint8_t jointype, uint8_t endtype,
+    int precision, double miter_limit,
+    double arc_tolerance, bool reverse_solution)
+{
+    if (precision < -8 || precision > 8 || !path) return nullptr;
+
+    const double scale = std::pow(10, precision);
+    ClipperOffset clip_offset(miter_limit, arc_tolerance, reverse_solution);
+    Path64 pp = ConvertCPathDToPath64WithScale(path, scale);
+    clip_offset.AddPath(pp, JoinType(jointype), EndType(endtype));
+    Paths64 result;
+    clip_offset.Execute(delta * scale, result);
+
+    return CreateCPathsDFromPaths64(result, 1 / scale);
+}
+
 EXTERN_DLL_EXPORT CPaths64 RectClip64(const CRect64& rect, const CPaths64 paths)
 {
   if (CRectIsEmpty(rect) || !paths) return nullptr;
   Rect64 r64 = CRectToRect(rect);
   class RectClip64 rc(r64);
-  Paths64 pp = ConvertCPaths(paths);
+  Paths64 pp = ConvertCPathsToPathsT(paths);
   Paths64 result = rc.Execute(pp);
-  return CreateCPaths(result);
+  return CreateCPathsFromPathsT(result);
 }
 
 EXTERN_DLL_EXPORT CPathsD RectClipD(const CRectD& rect, const CPathsD paths, int precision)
@@ -560,9 +777,9 @@ EXTERN_DLL_EXPORT CPaths64 RectClipLines64(const CRect64& rect,
   if (CRectIsEmpty(rect) || !paths) return nullptr;
   Rect64 r = CRectToRect(rect);
   class RectClipLines64 rcl (r);
-  Paths64 pp = ConvertCPaths(paths);
+  Paths64 pp = ConvertCPathsToPathsT(paths);
   Paths64 result = rcl.Execute(pp);
-  return CreateCPaths(result);
+  return CreateCPathsFromPathsT(result);
 }
 
 EXTERN_DLL_EXPORT CPathsD RectClipLinesD(const CRectD& rect,
@@ -581,20 +798,35 @@ EXTERN_DLL_EXPORT CPathsD RectClipLinesD(const CRectD& rect,
 
 EXTERN_DLL_EXPORT CPaths64 MinkowskiSum64(const CPath64& cpattern, const CPath64& cpath, bool is_closed)
 {
-  Path64 path = ConvertCPath(cpath);
-  Path64 pattern = ConvertCPath(cpattern);
+  Path64 path = ConvertCPathToPathT(cpath);
+  Path64 pattern = ConvertCPathToPathT(cpattern);
   Paths64 solution = MinkowskiSum(pattern, path, is_closed);
-  return CreateCPaths(solution);
+  return CreateCPathsFromPathsT(solution);
 }
 
 EXTERN_DLL_EXPORT CPaths64 MinkowskiDiff64(const CPath64& cpattern, const CPath64& cpath, bool is_closed)
 {
-  Path64 path = ConvertCPath(cpath);
-  Path64 pattern = ConvertCPath(cpattern);
+  Path64 path = ConvertCPathToPathT(cpath);
+  Path64 pattern = ConvertCPathToPathT(cpattern);
   Paths64 solution = MinkowskiDiff(pattern, path, is_closed);
-  return CreateCPaths(solution);
+  return CreateCPathsFromPathsT(solution);
 }
 
-}  // end Clipper2Lib namespace
+#ifdef USINGZ
+typedef void (*DLLZCallback64)(const Point64& e1bot, const Point64& e1top, const Point64& e2bot, const Point64& e2top, Point64& pt);
+typedef void (*DLLZCallbackD)(const PointD& e1bot, const PointD& e1top, const PointD& e2bot, const PointD& e2top, PointD& pt);
 
+EXTERN_DLL_EXPORT void SetZCallback64(DLLZCallback64 callback)
+{
+  dllCallback64 = callback;
+}
+
+EXTERN_DLL_EXPORT void SetZCallbackD(DLLZCallbackD callback)
+{
+  dllCallbackD = callback;
+}
+
+#endif
+
+}
 #endif  // CLIPPER2_EXPORT_H
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.h b/engine/thirdparty/clipper2/include/clipper2/clipper.h
index a2fe5c3c..b75bbd35 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.h
@@ -1,24 +1,21 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
 * Date      :  27 April 2024                                                   *
-* Website   :  http://www.angusj.com                                           *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  This module provides a simple interface to the Clipper Library  *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
 #ifndef CLIPPER_H
 #define CLIPPER_H
 
-#include <cstdlib>
-#include <type_traits>
-#include <vector>
-
 #include "clipper2/clipper.core.h"
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.offset.h"
 #include "clipper2/clipper.minkowski.h"
 #include "clipper2/clipper.rectclip.h"
+#include <type_traits>
 
 namespace Clipper2Lib {
 
@@ -272,14 +269,14 @@ namespace Clipper2Lib {
 
     inline void PolyPathToPaths64(const PolyPath64& polypath, Paths64& paths)
     {
-      paths.push_back(polypath.Polygon());
+      paths.emplace_back(polypath.Polygon());
       for (const auto& child : polypath)
         PolyPathToPaths64(*child, paths);
     }
 
     inline void PolyPathToPathsD(const PolyPathD& polypath, PathsD& paths)
     {
-      paths.push_back(polypath.Polygon());
+      paths.emplace_back(polypath.Polygon());
       for (const auto& child : polypath)
         PolyPathToPathsD(*child, paths);
     }
@@ -348,9 +345,9 @@ namespace Clipper2Lib {
       result.reserve(array_size / 2);
       for (size_t i = 0; i < array_size; i +=2)
 #ifdef USINGZ
-        result.push_back( U{ an_array[i], an_array[i + 1], 0} );
+        result.emplace_back( an_array[i], an_array[i + 1], 0 );
 #else
-        result.push_back( U{ an_array[i], an_array[i + 1]} );
+        result.emplace_back( an_array[i], an_array[i + 1] );
 #endif
     }
 
@@ -518,20 +515,20 @@ namespace Clipper2Lib {
     }
 
     prevIt = srcIt++;
-    dst.push_back(*prevIt);
+    dst.emplace_back(*prevIt);
     for (; srcIt != stop; ++srcIt)
     {
       if (!IsCollinear(*prevIt, *srcIt, *(srcIt + 1)))
       {
         prevIt = srcIt;
-        dst.push_back(*prevIt);
+        dst.emplace_back(*prevIt);
       }
     }
 
     if (is_open_path)
-      dst.push_back(*srcIt);
+      dst.emplace_back(*srcIt);
     else if (!IsCollinear(*prevIt, *stop, dst[0]))
-      dst.push_back(*stop);
+      dst.emplace_back(*stop);
     else
     {
       while (dst.size() > 2 &&
@@ -603,10 +600,10 @@ namespace Clipper2Lib {
     double dx = co, dy = si;
     Path<T> result;
     result.reserve(steps);
-    result.push_back(Point<T>(center.x + radiusX, static_cast<double>(center.y)));
+    result.emplace_back(center.x + radiusX, static_cast<double>(center.y));
     for (size_t i = 1; i < steps; ++i)
     {
-      result.push_back(Point<T>(center.x + radiusX * dx, center.y + radiusY * dy));
+      result.emplace_back(center.x + radiusX * dx, center.y + radiusY * dy);
       double x = dx * co - dy * si;
       dy = dy * co + dx * si;
       dx = x;
@@ -700,7 +697,7 @@ namespace Clipper2Lib {
     Path<T> result;
     result.reserve(len);
     for (typename Path<T>::size_type i = 0; i < len; ++i)
-      if (!flags[i]) result.push_back(path[i]);
+      if (!flags[i]) result.emplace_back(path[i]);
     return result;
   }
 
@@ -711,7 +708,7 @@ namespace Clipper2Lib {
     Paths<T> result;
     result.reserve(paths.size());
     for (const auto& path : paths)
-      result.push_back(SimplifyPath(path, epsilon, isClosedPath));
+      result.emplace_back(std::move(SimplifyPath(path, epsilon, isClosedPath)));
     return result;
   }
 
@@ -749,7 +746,7 @@ namespace Clipper2Lib {
     result.reserve(len);
     for (typename Path<T>::size_type i = 0; i < len; ++i)
       if (flags[i])
-        result.push_back(path[i]);
+        result.emplace_back(path[i]);
     return result;
   }
 
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.minkowski.h b/engine/thirdparty/clipper2/include/clipper2/clipper.minkowski.h
index a3ddcf86..3a85ba5d 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.minkowski.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.minkowski.h
@@ -1,18 +1,15 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
 * Date      :  1 November 2023                                                 *
-* Website   :  http://www.angusj.com                                           *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2023                                         *
 * Purpose   :  Minkowski Sum and Difference                                    *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
 #ifndef CLIPPER_MINKOWSKI_H
 #define CLIPPER_MINKOWSKI_H
 
-#include <cstdlib>
-#include <vector>
-#include <string>
 #include "clipper2/clipper.core.h"
 
 namespace Clipper2Lib
@@ -35,7 +32,7 @@ namespace Clipper2Lib
           Path64 path2(pattern.size());
           std::transform(pattern.cbegin(), pattern.cend(),
             path2.begin(), [p](const Point64& pt2) {return p + pt2; });
-          tmp.push_back(path2);
+          tmp.emplace_back(std::move(path2));
         }
       }
       else
@@ -45,7 +42,7 @@ namespace Clipper2Lib
           Path64 path2(pattern.size());
           std::transform(pattern.cbegin(), pattern.cend(),
             path2.begin(), [p](const Point64& pt2) {return p - pt2; });
-          tmp.push_back(path2);
+          tmp.emplace_back(std::move(path2));
         }
       }
 
@@ -59,14 +56,14 @@ namespace Clipper2Lib
           Path64 quad;
           quad.reserve(4);
           {
-            quad.push_back(tmp[g][h]);
-            quad.push_back(tmp[i][h]);
-            quad.push_back(tmp[i][j]);
-            quad.push_back(tmp[g][j]);
+            quad.emplace_back(tmp[g][h]);
+            quad.emplace_back(tmp[i][h]);
+            quad.emplace_back(tmp[i][j]);
+            quad.emplace_back(tmp[g][j]);
           };
           if (!IsPositive(quad))
             std::reverse(quad.begin(), quad.end());
-          result.push_back(quad);
+          result.emplace_back(std::move(quad));
           h = j;
         }
         g = i;
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.offset.h b/engine/thirdparty/clipper2/include/clipper2/clipper.offset.h
index bb075a6d..90ccd5ec 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.offset.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.offset.h
@@ -1,10 +1,10 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  24 March 2024                                                   *
-* Website   :  http://www.angusj.com                                           *
-* Copyright :  Angus Johnson 2010-2024                                         *
+* Date      :  22 January 2025                                                 *
+* Website   :  https://www.angusj.com                                          *
+* Copyright :  Angus Johnson 2010-2025                                         *
 * Purpose   :  Path Offset (Inflate/Shrink)                                    *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
 #ifndef CLIPPER_OFFSET_H_
@@ -12,6 +12,7 @@
 
 #include "clipper.core.h"
 #include "clipper.engine.h"
+#include <optional>
 
 namespace Clipper2Lib {
 
@@ -96,7 +97,7 @@ public:
 	void AddPaths(const Paths64& paths, JoinType jt_, EndType et_);
 	void Clear() { groups_.clear(); norms.clear(); };
 	
-	void Execute(double delta, Paths64& paths);
+	void Execute(double delta, Paths64& sols_64);
 	void Execute(double delta, PolyTree64& polytree);
 	void Execute(DeltaCallback64 delta_cb, Paths64& paths);
 
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.rectclip.h b/engine/thirdparty/clipper2/include/clipper2/clipper.rectclip.h
index bfcfacf2..e7cf2f45 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.rectclip.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.rectclip.h
@@ -1,19 +1,17 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
 * Date      :  5 July 2024                                                     *
-* Website   :  http://www.angusj.com                                           *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  FAST rectangular clipping                                       *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
 #ifndef CLIPPER_RECTCLIP_H
 #define CLIPPER_RECTCLIP_H
 
-#include <cstdlib>
-#include <vector>
-#include <queue>
 #include "clipper2/clipper.core.h"
+#include <queue>
 
 namespace Clipper2Lib
 {
diff --git a/engine/thirdparty/clipper2/include/clipper2/clipper.version.h b/engine/thirdparty/clipper2/include/clipper2/clipper.version.h
index 61464095..661b0f1c 100644
--- a/engine/thirdparty/clipper2/include/clipper2/clipper.version.h
+++ b/engine/thirdparty/clipper2/include/clipper2/clipper.version.h
@@ -1,6 +1,6 @@
 #ifndef CLIPPER_VERSION_H
 #define CLIPPER_VERSION_H
 
-constexpr auto CLIPPER2_VERSION = "1.4.0";
+constexpr auto CLIPPER2_VERSION = "1.5.2";
 
 #endif  // CLIPPER_VERSION_H
diff --git a/engine/thirdparty/clipper2/patches/0001-disable-exceptions.patch b/engine/thirdparty/clipper2/patches/0001-disable-exceptions.patch
index 89be96f1..a014dbb3 100644
--- a/engine/thirdparty/clipper2/patches/0001-disable-exceptions.patch
+++ b/engine/thirdparty/clipper2/patches/0001-disable-exceptions.patch
@@ -1,17 +1,17 @@
 diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h
-index 925c04685e..67dd731af6 100644
+index ab71aeb072..110bee4c10 100644
 --- a/thirdparty/clipper2/include/clipper2/clipper.core.h
 +++ b/thirdparty/clipper2/include/clipper2/clipper.core.h
-@@ -22,6 +22,8 @@
- #include <optional>
- #include "clipper2/clipper.version.h"
+@@ -19,6 +19,8 @@
+ #include <numeric>
+ #include <cmath>
  
 +#define CLIPPER2_THROW(exception) std::abort()
 +
  namespace Clipper2Lib
  {
  
-@@ -79,18 +81,18 @@ namespace Clipper2Lib
+@@ -76,21 +78,21 @@ namespace Clipper2Lib
      switch (error_code)
      {
      case precision_error_i:
@@ -29,6 +29,10 @@ index 925c04685e..67dd731af6 100644
      case range_error_i:
 -      throw Clipper2Exception(range_error);
 +      CLIPPER2_THROW(Clipper2Exception(range_error));
+     // Should never happen, but adding this to stop a compiler warning
+     default:
+-      throw Clipper2Exception("Unknown error");
++      CLIPPER2_THROW(Clipper2Exception("Unknown error"));
      }
  #else
 -    ++error_code; // only to stop compiler warning
diff --git a/engine/thirdparty/clipper2/patches/0002-llvm-disable-int1280-math.patch b/engine/thirdparty/clipper2/patches/0002-llvm-disable-int128-math.patch
similarity index 74%
rename from engine/thirdparty/clipper2/patches/0002-llvm-disable-int1280-math.patch
rename to engine/thirdparty/clipper2/patches/0002-llvm-disable-int128-math.patch
index ffa06e72..c69ec8e4 100644
--- a/engine/thirdparty/clipper2/patches/0002-llvm-disable-int1280-math.patch
+++ b/engine/thirdparty/clipper2/patches/0002-llvm-disable-int128-math.patch
@@ -1,8 +1,8 @@
 diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h
-index 67dd731af6..dd1b873d5d 100644
+index 110bee4c10..aa003bf032 100644
 --- a/thirdparty/clipper2/include/clipper2/clipper.core.h
 +++ b/thirdparty/clipper2/include/clipper2/clipper.core.h
-@@ -695,11 +695,13 @@ namespace Clipper2Lib
+@@ -715,11 +715,13 @@ namespace Clipper2Lib
    // returns true if (and only if) a * b == c * d
    inline bool ProductsAreEqual(int64_t a, int64_t b, int64_t c, int64_t d)
    {
@@ -13,15 +13,15 @@ index 67dd731af6..dd1b873d5d 100644
 -#else
 +// Work around LLVM issue: https://github.com/llvm/llvm-project/issues/16778
 +// Details: https://github.com/godotengine/godot/pull/95964#issuecomment-2306581804
-+//#if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX
-+//    const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b);
-+//    const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d);
-+//    return ab == cd;
-+//#else
++// #if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX
++//     const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b);
++//     const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d);
++//     return ab == cd;
++// #else
      // nb: unsigned values needed for calculating overflow carry
      const auto abs_a = static_cast<uint64_t>(std::abs(a));
      const auto abs_b = static_cast<uint64_t>(std::abs(b));
-@@ -714,7 +716,7 @@ namespace Clipper2Lib
+@@ -734,7 +736,7 @@ namespace Clipper2Lib
      const auto sign_cd = TriSign(c) * TriSign(d);
  
      return abs_ab == abs_cd && sign_ab == sign_cd;
diff --git a/engine/thirdparty/clipper2/src/clipper.engine.cpp b/engine/thirdparty/clipper2/src/clipper.engine.cpp
index 8f120267..927e7a75 100644
--- a/engine/thirdparty/clipper2/src/clipper.engine.cpp
+++ b/engine/thirdparty/clipper2/src/clipper.engine.cpp
@@ -1,21 +1,15 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  27 April 2024                                                   *
-* Website   :  http://www.angusj.com                                           *
+* Date      :  17 September 2024                                               *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  This is the main polygon clipping module                        *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
-#include <cstdlib>
-#include <cmath>
-#include <stdexcept>
-#include <vector>
-#include <numeric>
-#include <algorithm>
-
 #include "clipper2/clipper.engine.h"
 #include "clipper2/clipper.h"
+#include <stdexcept>
 
 // https://github.com/AngusJohnson/Clipper2/discussions/334
 // #discussioncomment-4248602
@@ -85,7 +79,7 @@ namespace Clipper2Lib {
   inline bool IsOpenEnd(const Vertex& v)
   {
     return (v.flags & (VertexFlags::OpenStart | VertexFlags::OpenEnd)) !=
-      VertexFlags::None;
+      VertexFlags::Empty;
   }
 
 
@@ -220,7 +214,7 @@ namespace Clipper2Lib {
 
   inline bool IsMaxima(const Vertex& v)
   {
-    return ((v.flags & VertexFlags::LocalMax) != VertexFlags::None);
+    return ((v.flags & VertexFlags::LocalMax) != VertexFlags::Empty);
   }
 
 
@@ -235,12 +229,12 @@ namespace Clipper2Lib {
     if (e.wind_dx > 0)
       while ((result->next->pt.y == result->pt.y) &&
         ((result->flags & (VertexFlags::OpenEnd |
-          VertexFlags::LocalMax)) == VertexFlags::None))
+          VertexFlags::LocalMax)) == VertexFlags::Empty))
             result = result->next;
     else
       while (result->prev->pt.y == result->pt.y &&
         ((result->flags & (VertexFlags::OpenEnd |
-          VertexFlags::LocalMax)) == VertexFlags::None))
+          VertexFlags::LocalMax)) == VertexFlags::Empty))
           result = result->prev;
     if (!IsMaxima(*result)) result = nullptr; // not a maxima
     return result;
@@ -478,7 +472,7 @@ namespace Clipper2Lib {
 
   inline bool IsJoined(const Active& e)
   {
-    return e.join_with != JoinWith::None;
+    return e.join_with != JoinWith::NoJoin;
   }
 
   inline void SetOwner(OutRec* outrec, OutRec* new_owner)
@@ -517,7 +511,7 @@ namespace Clipper2Lib {
         while (op2 != op && op2->pt.y > pt.y) op2 = op2->next;
       if (op2 == op) break;
 
-      // must have touched or crossed the pt.Y horizonal
+      // must have touched or crossed the pt.Y horizontal
       // and this must happen an even number of times
 
       if (op2->pt.y == pt.y) // touching the horizontal
@@ -564,7 +558,7 @@ namespace Clipper2Lib {
     while (op2->next != op &&
       ((op2->pt.x == op2->next->pt.x && op2->pt.x == op2->prev->pt.x) ||
         (op2->pt.y == op2->next->pt.y && op2->pt.y == op2->prev->pt.y))) op2 = op2->next;
-    result.push_back(op2->pt);
+    result.emplace_back(op2->pt);
     OutPt* prevOp = op2;
     op2 = op2->next;
     while (op2 != op)
@@ -572,7 +566,7 @@ namespace Clipper2Lib {
       if ((op2->pt.x != op2->next->pt.x || op2->pt.x != prevOp->pt.x) &&
         (op2->pt.y != op2->next->pt.y || op2->pt.y != prevOp->pt.y))
       {
-        result.push_back(op2->pt);
+        result.emplace_back(op2->pt);
         prevOp = op2;
       }
       op2 = op2->next;
@@ -608,10 +602,10 @@ namespace Clipper2Lib {
     Vertex& vert, PathType polytype, bool is_open)
   {
     //make sure the vertex is added only once ...
-    if ((VertexFlags::LocalMin & vert.flags) != VertexFlags::None) return;
+    if ((VertexFlags::LocalMin & vert.flags) != VertexFlags::Empty) return;
 
     vert.flags = (vert.flags | VertexFlags::LocalMin);
-    list.push_back(std::make_unique <LocalMinima>(&vert, polytype, is_open));
+    list.emplace_back(std::make_unique <LocalMinima>(&vert, polytype, is_open));
   }
 
   void AddPaths_(const Paths64& paths, PathType polytype, bool is_open,
@@ -643,7 +637,7 @@ namespace Clipper2Lib {
         }
         curr_v->prev = prev_v;
         curr_v->pt = pt;
-        curr_v->flags = VertexFlags::None;
+        curr_v->flags = VertexFlags::Empty;
         prev_v = curr_v++;
         cnt++;
       }
@@ -725,10 +719,10 @@ namespace Clipper2Lib {
   void ReuseableDataContainer64::AddLocMin(Vertex& vert, PathType polytype, bool is_open)
   {
     //make sure the vertex is added only once ...
-    if ((VertexFlags::LocalMin & vert.flags) != VertexFlags::None) return;
+    if ((VertexFlags::LocalMin & vert.flags) != VertexFlags::Empty) return;
 
     vert.flags = (vert.flags | VertexFlags::LocalMin);
-    minima_list_.push_back(std::make_unique <LocalMinima>(&vert, polytype, is_open));
+    minima_list_.emplace_back(std::make_unique <LocalMinima>(&vert, polytype, is_open));
   }
 
   void ReuseableDataContainer64::AddPaths(const Paths64& paths,
@@ -836,9 +830,7 @@ namespace Clipper2Lib {
 
   void ClipperBase::AddPath(const Path64& path, PathType polytype, bool is_open)
   {
-    Paths64 tmp;
-    tmp.push_back(path);
-    AddPaths(tmp, polytype, is_open);
+    AddPaths(Paths64(1, path), polytype, is_open);
   }
 
   void ClipperBase::AddPaths(const Paths64& paths, PathType polytype, bool is_open)
@@ -857,7 +849,7 @@ namespace Clipper2Lib {
     LocalMinimaList::const_iterator i;
     for (i = reuseable_data.minima_list_.cbegin(); i != reuseable_data.minima_list_.cend(); ++i)
     {
-      minima_list_.push_back(std::make_unique <LocalMinima>((*i)->vertex, (*i)->polytype, (*i)->is_open));
+      minima_list_.emplace_back(std::make_unique <LocalMinima>((*i)->vertex, (*i)->polytype, (*i)->is_open));
       if ((*i)->is_open) has_open_paths_ = true;
     }
   }
@@ -907,10 +899,10 @@ namespace Clipper2Lib {
   void ClipperBase::AddLocMin(Vertex& vert, PathType polytype, bool is_open)
   {
     //make sure the vertex is added only once ...
-    if ((VertexFlags::LocalMin & vert.flags) != VertexFlags::None) return;
+    if ((VertexFlags::LocalMin & vert.flags) != VertexFlags::Empty) return;
 
     vert.flags = (vert.flags | VertexFlags::LocalMin);
-    minima_list_.push_back(std::make_unique <LocalMinima>(&vert, polytype, is_open));
+    minima_list_.emplace_back(std::make_unique <LocalMinima>(&vert, polytype, is_open));
   }
 
   bool ClipperBase::IsContributingClosed(const Active& e) const
@@ -928,11 +920,14 @@ namespace Clipper2Lib {
     case FillRule::Negative:
       if (e.wind_cnt != -1) return false;
       break;
+    // Should never happen, but adding this to stop a compiler warning
+    default:
+      break;
     }
 
     switch (cliptype_)
     {
-    case ClipType::None:
+    case ClipType::NoClip:
       return false;
     case ClipType::Intersection:
       switch (fillrule_)
@@ -978,6 +973,9 @@ namespace Clipper2Lib {
       break;
 
     case ClipType::Xor: return true;  break;
+    // Should never happen, but adding this to stop a compiler warning
+    default:
+      break;
     }
     return false;  // we should never get here
   }
@@ -1208,7 +1206,7 @@ namespace Clipper2Lib {
 
     while (PopLocalMinima(bot_y, local_minima))
     {
-      if ((local_minima->vertex->flags & VertexFlags::OpenStart) != VertexFlags::None)
+      if ((local_minima->vertex->flags & VertexFlags::OpenStart) != VertexFlags::Empty)
       {
         left_bound = nullptr;
       }
@@ -1224,7 +1222,7 @@ namespace Clipper2Lib {
         SetDx(*left_bound);
       }
 
-      if ((local_minima->vertex->flags & VertexFlags::OpenEnd) != VertexFlags::None)
+      if ((local_minima->vertex->flags & VertexFlags::OpenEnd) != VertexFlags::Empty)
       {
         right_bound = nullptr;
       }
@@ -1488,7 +1486,7 @@ namespace Clipper2Lib {
   {
     OutRec* result = new OutRec();
     result->idx = outrec_list_.size();
-    outrec_list_.push_back(result);
+    outrec_list_.emplace_back(result);
     result->pts = nullptr;
     result->owner = nullptr;
     result->polypath = nullptr;
@@ -1631,12 +1629,12 @@ namespace Clipper2Lib {
         if (Path1InsidePath2(prevOp, newOp))
         {
           newOr->splits = new OutRecList();
-          newOr->splits->push_back(outrec);
+          newOr->splits->emplace_back(outrec);
         }
         else
         {
           if (!outrec->splits) outrec->splits = new OutRecList();
-          outrec->splits->push_back(newOr);
+          outrec->splits->emplace_back(newOr);
         }
       }
     }
@@ -1955,7 +1953,7 @@ namespace Clipper2Lib {
       else if (IsFront(e1) || (e1.outrec == e2.outrec))
       {
         //this 'else if' condition isn't strictly needed but
-        //it's sensible to split polygons that ony touch at
+        //it's sensible to split polygons that only touch at
         //a common vertex (not at common edges).
 
 #ifdef USINGZ
@@ -2125,7 +2123,7 @@ namespace Clipper2Lib {
     using_polytree_ = use_polytrees;
     Reset();
     int64_t y;
-    if (ct == ClipType::None || !PopScanline(y)) return true;
+    if (ct == ClipType::NoClip || !PopScanline(y)) return true;
 
     while (succeeded_)
     {
@@ -2239,7 +2237,7 @@ namespace Clipper2Lib {
           HorzJoin join = HorzJoin(
             DuplicateOp(hs1->left_op, true),
             DuplicateOp(hs2->left_op, false));
-          horz_join_list_.push_back(join);
+          horz_join_list_.emplace_back(join);
         }
         else
         {
@@ -2252,7 +2250,7 @@ namespace Clipper2Lib {
           HorzJoin join = HorzJoin(
             DuplicateOp(hs2->left_op, true),
             DuplicateOp(hs1->left_op, false));
-          horz_join_list_.push_back(join);
+          horz_join_list_.emplace_back(join);
         }
       }
     }
@@ -2264,7 +2262,7 @@ namespace Clipper2Lib {
     if (!toOr->splits) toOr->splits = new OutRecList();
     OutRecList::iterator orIter = fromOr->splits->begin();
     for (; orIter != fromOr->splits->end(); ++orIter)
-      toOr->splits->push_back(*orIter);
+      toOr->splits->emplace_back(*orIter);
     fromOr->splits->clear();
   }
 
@@ -2317,7 +2315,7 @@ namespace Clipper2Lib {
             or2->owner = or1->owner;
 
           if (!or1->splits) or1->splits = new OutRecList();
-          or1->splits->push_back(or2);
+          or1->splits->emplace_back(or2);
         }
         else
           or2->owner = or1;
@@ -2376,7 +2374,7 @@ namespace Clipper2Lib {
         else ip.x = TopX(e2, ip.y);
       }
     }
-    intersect_nodes_.push_back(IntersectNode(&e1, &e2, ip));
+    intersect_nodes_.emplace_back(&e1, &e2, ip);
   }
 
   bool ClipperBase::BuildIntersectList(const int64_t top_y)
@@ -2497,7 +2495,7 @@ namespace Clipper2Lib {
   void ClipperBase::AddTrialHorzJoin(OutPt* op)
   {
     if (op->outrec->is_open) return;
-    horz_seg_list_.push_back(HorzSegment(op));
+    horz_seg_list_.emplace_back(op);
   }
 
   bool ClipperBase::ResetHorzDirection(const Active& horz,
@@ -2655,7 +2653,7 @@ namespace Clipper2Lib {
 
         if (horz.outrec)
         {
-          //nb: The outrec containining the op returned by IntersectEdges
+          //nb: The outrec containing the op returned by IntersectEdges
           //above may no longer be associated with horzEdge.
           AddTrialHorzJoin(GetLastOp(horz));
         }
@@ -2789,14 +2787,14 @@ namespace Clipper2Lib {
   {
     if (e.join_with == JoinWith::Right)
     {
-      e.join_with = JoinWith::None;
-      e.next_in_ael->join_with = JoinWith::None;
+      e.join_with = JoinWith::NoJoin;
+      e.next_in_ael->join_with = JoinWith::NoJoin;
       AddLocalMinPoly(e, *e.next_in_ael, pt, true);
     }
     else
     {
-      e.join_with = JoinWith::None;
-      e.prev_in_ael->join_with = JoinWith::None;
+      e.join_with = JoinWith::NoJoin;
+      e.prev_in_ael->join_with = JoinWith::NoJoin;
       AddLocalMinPoly(*e.prev_in_ael, e, pt, true);
     }
   }
@@ -2899,14 +2897,14 @@ namespace Clipper2Lib {
       lastPt = op->pt;
       op2 = op->next;
     }
-    path.push_back(lastPt);
+    path.emplace_back(lastPt);
 
     while (op2 != op)
     {
       if (op2->pt != lastPt)
       {
         lastPt = op2->pt;
-        path.push_back(lastPt);
+        path.emplace_back(lastPt);
       }
       if (reverse)
         op2 = op2->prev;
@@ -3031,7 +3029,7 @@ namespace Clipper2Lib {
       {
         Path64 path;
         if (BuildPath64(outrec->pts, reverse_solution_, true, path))
-          open_paths.push_back(path);
+          open_paths.emplace_back(std::move(path));
         continue;
       }
 
@@ -3060,9 +3058,9 @@ namespace Clipper2Lib {
       op2 = op->next;
     }
 #ifdef USINGZ
-    path.push_back(PointD(lastPt.x * inv_scale, lastPt.y * inv_scale, lastPt.z));
+    path.emplace_back(lastPt.x * inv_scale, lastPt.y * inv_scale, lastPt.z);
 #else
-    path.push_back(PointD(lastPt.x * inv_scale, lastPt.y * inv_scale));
+    path.emplace_back(lastPt.x * inv_scale, lastPt.y * inv_scale);
 #endif
 
     while (op2 != op)
@@ -3071,9 +3069,9 @@ namespace Clipper2Lib {
       {
         lastPt = op2->pt;
 #ifdef USINGZ
-        path.push_back(PointD(lastPt.x * inv_scale, lastPt.y * inv_scale, lastPt.z));
+        path.emplace_back(lastPt.x * inv_scale, lastPt.y * inv_scale, lastPt.z);
 #else
-        path.push_back(PointD(lastPt.x * inv_scale, lastPt.y * inv_scale));
+        path.emplace_back(lastPt.x * inv_scale, lastPt.y * inv_scale);
 #endif
 
       }
@@ -3137,7 +3135,7 @@ namespace Clipper2Lib {
       {
         PathD path;
         if (BuildPathD(outrec->pts, reverse_solution_, true, path, invScale_))
-          open_paths.push_back(path);
+          open_paths.emplace_back(std::move(path));
         continue;
       }
 
diff --git a/engine/thirdparty/clipper2/src/clipper.offset.cpp b/engine/thirdparty/clipper2/src/clipper.offset.cpp
index 508a7f08..23e405ed 100644
--- a/engine/thirdparty/clipper2/src/clipper.offset.cpp
+++ b/engine/thirdparty/clipper2/src/clipper.offset.cpp
@@ -1,21 +1,34 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
-* Date      :  17 April 2024                                                   *
-* Website   :  http://www.angusj.com                                           *
-* Copyright :  Angus Johnson 2010-2024                                         *
+* Date      :  22 January 2025                                                 *
+* Website   :  https://www.angusj.com                                          *
+* Copyright :  Angus Johnson 2010-2025                                         *
 * Purpose   :  Path Offset (Inflate/Shrink)                                    *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
-#include <cmath>
 #include "clipper2/clipper.h"
 #include "clipper2/clipper.offset.h"
 
 namespace Clipper2Lib {
 
-const double default_arc_tolerance = 0.25;
 const double floating_point_tolerance = 1e-12;
 
+// Clipper2 approximates arcs by using series of relatively short straight
+//line segments. And logically, shorter line segments will produce better arc
+// approximations. But very short segments can degrade performance, usually
+// with little or no discernable improvement in curve quality. Very short
+// segments can even detract from curve quality, due to the effects of integer
+// rounding. Since there isn't an optimal number of line segments for any given
+// arc radius (that perfectly balances curve approximation with performance),
+// arc tolerance is user defined. Nevertheless, when the user doesn't define
+// an arc tolerance (ie leaves alone the 0 default value), the calculated
+// default arc tolerance (offset_radius / 500) generally produces good (smooth)
+// arc approximations without producing excessively small segment lengths.
+// See also: https://www.angusj.com/clipper2/Docs/Trigonometry.htm
+const double arc_const = 0.002; // <-- 1/500
+
+
 //------------------------------------------------------------------------------
 // Miscellaneous methods
 //------------------------------------------------------------------------------
@@ -38,13 +51,22 @@ std::optional<size_t> GetLowestClosedPathIdx(const Paths64& paths)
 	return result;
 }
 
-PointD GetUnitNormal(const Point64& pt1, const Point64& pt2)
+inline double Hypot(double x, double y)
+{
+	// given that this is an internal function, and given the x and y parameters
+	// will always be coordinate values (or the difference between coordinate values),
+	// x and y should always be within INT64_MIN to INT64_MAX. Consequently, 
+	// there should be no risk that the following computation will overflow
+	// see https://stackoverflow.com/a/32436148/359538
+	return std::sqrt(x * x + y * y);
+}
+
+static PointD GetUnitNormal(const Point64& pt1, const Point64& pt2)
 {
-	double dx, dy, inverse_hypot;
 	if (pt1 == pt2) return PointD(0.0, 0.0);
-	dx = static_cast<double>(pt2.x - pt1.x);
-	dy = static_cast<double>(pt2.y - pt1.y);
-	inverse_hypot = 1.0 / hypot(dx, dy);
+	double dx = static_cast<double>(pt2.x - pt1.x);
+	double dy = static_cast<double>(pt2.y - pt1.y);
+	double inverse_hypot = 1.0 / Hypot(dx, dy);
 	dx *= inverse_hypot;
 	dy *= inverse_hypot;
 	return PointD(dy, -dx);
@@ -55,12 +77,6 @@ inline bool AlmostZero(double value, double epsilon = 0.001)
 	return std::fabs(value) < epsilon;
 }
 
-inline double Hypot(double x, double y)
-{
-	//see https://stackoverflow.com/a/32436148/359538
-	return std::sqrt(x * x + y * y);
-}
-
 inline PointD NormalizeVector(const PointD& vec)
 {
 	double h = Hypot(vec.x, vec.y);
@@ -79,7 +95,7 @@ inline bool IsClosedPath(EndType et)
 	return et == EndType::Polygon || et == EndType::Joined;
 }
 
-inline Point64 GetPerpendic(const Point64& pt, const PointD& norm, double delta)
+static inline Point64 GetPerpendic(const Point64& pt, const PointD& norm, double delta)
 {
 #ifdef USINGZ
 	return Point64(pt.x + norm.x * delta, pt.y + norm.y * delta, pt.z);
@@ -129,11 +145,11 @@ ClipperOffset::Group::Group(const Paths64& _paths, JoinType _join_type, EndType
 		// the lowermost path must be an outer path, so if its orientation is negative,
 		// then flag the whole group is 'reversed' (will negate delta etc.)
 		// as this is much more efficient than reversing every path.
-        is_reversed = (lowest_path_idx.has_value()) && Area(paths_in[lowest_path_idx.value()]) < 0;
+    is_reversed = (lowest_path_idx.has_value()) && Area(paths_in[lowest_path_idx.value()]) < 0;
 	}
 	else
 	{
-        lowest_path_idx = std::nullopt;
+    lowest_path_idx = std::nullopt;
 		is_reversed = false;
 	}
 }
@@ -144,15 +160,13 @@ ClipperOffset::Group::Group(const Paths64& _paths, JoinType _join_type, EndType
 
 void ClipperOffset::AddPath(const Path64& path, JoinType jt_, EndType et_)
 {
-	Paths64 paths;
-	paths.push_back(path);
-	AddPaths(paths, jt_, et_);
+    groups_.emplace_back(Paths64(1, path), jt_, et_);
 }
 
 void ClipperOffset::AddPaths(const Paths64 &paths, JoinType jt_, EndType et_)
 {
 	if (paths.size() == 0) return;
-	groups_.push_back(Group(paths, jt_, et_));
+    groups_.emplace_back(paths, jt_, et_);
 }
 
 void ClipperOffset::BuildNormals(const Path64& path)
@@ -162,8 +176,8 @@ void ClipperOffset::BuildNormals(const Path64& path)
 	if (path.size() == 0) return;
 	Path64::const_iterator path_iter, path_stop_iter = --path.cend();
 	for (path_iter = path.cbegin(); path_iter != path_stop_iter; ++path_iter)
-		norms.push_back(GetUnitNormal(*path_iter,*(path_iter +1)));
-	norms.push_back(GetUnitNormal(*path_stop_iter, *(path.cbegin())));
+        norms.emplace_back(GetUnitNormal(*path_iter,*(path_iter +1)));
+    norms.emplace_back(GetUnitNormal(*path_stop_iter, *(path.cbegin())));
 }
 
 void ClipperOffset::DoBevel(const Path64& path, size_t j, size_t k)
@@ -190,8 +204,8 @@ void ClipperOffset::DoBevel(const Path64& path, size_t j, size_t k)
 		pt2 = PointD(path[j].x + group_delta_ * norms[j].x, path[j].y + group_delta_ * norms[j].y);
 #endif
 	}
-	path_out.push_back(Point64(pt1));
-	path_out.push_back(Point64(pt2));
+    path_out.emplace_back(pt1);
+    path_out.emplace_back(pt2);
 }
 
 void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k)
@@ -220,17 +234,17 @@ void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k)
 		PointD pt = ptQ;
 		GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt);
 		//get the second intersect point through reflecion
-		path_out.push_back(Point64(ReflectPoint(pt, ptQ)));
-		path_out.push_back(Point64(pt));
+        path_out.emplace_back(ReflectPoint(pt, ptQ));
+        path_out.emplace_back(pt);
 	}
 	else
 	{
 		PointD pt4 = GetPerpendicD(path[j], norms[k], group_delta_);
 		PointD pt = ptQ;
 		GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt);
-		path_out.push_back(Point64(pt));
+        path_out.emplace_back(pt);
 		//get the second intersect point through reflecion
-		path_out.push_back(Point64(ReflectPoint(pt, ptQ)));
+        path_out.emplace_back(ReflectPoint(pt, ptQ));
 	}
 }
 
@@ -238,14 +252,14 @@ void ClipperOffset::DoMiter(const Path64& path, size_t j, size_t k, double cos_a
 {
 	double q = group_delta_ / (cos_a + 1);
 #ifdef USINGZ
-	path_out.push_back(Point64(
+    path_out.emplace_back(
 		path[j].x + (norms[k].x + norms[j].x) * q,
 		path[j].y + (norms[k].y + norms[j].y) * q,
-		path[j].z));
+        path[j].z);
 #else
-	path_out.push_back(Point64(
+    path_out.emplace_back(
 		path[j].x + (norms[k].x + norms[j].x) * q,
-		path[j].y + (norms[k].y + norms[j].y) * q));
+        path[j].y + (norms[k].y + norms[j].y) * q);
 #endif
 }
 
@@ -256,8 +270,7 @@ void ClipperOffset::DoRound(const Path64& path, size_t j, size_t k, double angle
 		// so we'll need to do the following calculations for *every* vertex.
 		double abs_delta = std::fabs(group_delta_);
 		double arcTol = (arc_tolerance_ > floating_point_tolerance ?
-			std::min(abs_delta, arc_tolerance_) :
-			std::log10(2 + abs_delta) * default_arc_tolerance);
+			std::min(abs_delta, arc_tolerance_) : abs_delta * arc_const);
 		double steps_per_360 = std::min(PI / std::acos(1 - arcTol / abs_delta), abs_delta * PI);
 		step_sin_ = std::sin(2 * PI / steps_per_360);
 		step_cos_ = std::cos(2 * PI / steps_per_360);
@@ -270,9 +283,9 @@ void ClipperOffset::DoRound(const Path64& path, size_t j, size_t k, double angle
 
 	if (j == k) offsetVec.Negate();
 #ifdef USINGZ
-	path_out.push_back(Point64(pt.x + offsetVec.x, pt.y + offsetVec.y, pt.z));
+    path_out.emplace_back(pt.x + offsetVec.x, pt.y + offsetVec.y, pt.z);
 #else
-	path_out.push_back(Point64(pt.x + offsetVec.x, pt.y + offsetVec.y));
+    path_out.emplace_back(pt.x + offsetVec.x, pt.y + offsetVec.y);
 #endif
 	int steps = static_cast<int>(std::ceil(steps_per_rad_ * std::abs(angle))); // #448, #456
 	for (int i = 1; i < steps; ++i) // ie 1 less than steps
@@ -280,12 +293,12 @@ void ClipperOffset::DoRound(const Path64& path, size_t j, size_t k, double angle
 		offsetVec = PointD(offsetVec.x * step_cos_ - step_sin_ * offsetVec.y,
 			offsetVec.x * step_sin_ + offsetVec.y * step_cos_);
 #ifdef USINGZ
-		path_out.push_back(Point64(pt.x + offsetVec.x, pt.y + offsetVec.y, pt.z));
+        path_out.emplace_back(pt.x + offsetVec.x, pt.y + offsetVec.y, pt.z);
 #else
-		path_out.push_back(Point64(pt.x + offsetVec.x, pt.y + offsetVec.y));
+        path_out.emplace_back(pt.x + offsetVec.x, pt.y + offsetVec.y);
 #endif
 	}
-	path_out.push_back(GetPerpendic(path[j], norms[j], group_delta_));
+    path_out.emplace_back(GetPerpendic(path[j], norms[j], group_delta_));
 }
 
 void ClipperOffset::OffsetPoint(Group& group, const Path64& path, size_t j, size_t k)
@@ -309,28 +322,25 @@ void ClipperOffset::OffsetPoint(Group& group, const Path64& path, size_t j, size
 	}
 	if (std::fabs(group_delta_) <= floating_point_tolerance)
 	{
-		path_out.push_back(path[j]);
+        path_out.emplace_back(path[j]);
 		return;
 	}
 
 	if (cos_a > -0.999 && (sin_a * group_delta_ < 0)) // test for concavity first (#593)
 	{
-		// is concave (so insert 3 points that will create a negative region)
+		// is concave
+		// by far the simplest way to construct concave joins, especially those joining very 
+		// short segments, is to insert 3 points that produce negative regions. These regions 
+		// will be removed later by the finishing union operation. This is also the best way 
+		// to ensure that path reversals (ie over-shrunk paths) are removed.
 #ifdef USINGZ
-		path_out.push_back(Point64(GetPerpendic(path[j], norms[k], group_delta_), path[j].z));
+        path_out.emplace_back(GetPerpendic(path[j], norms[k], group_delta_), path[j].z);
+        path_out.emplace_back(path[j]); // (#405, #873, #916)
+        path_out.emplace_back(GetPerpendic(path[j], norms[j], group_delta_), path[j].z);
 #else
-		path_out.push_back(GetPerpendic(path[j], norms[k], group_delta_));
-#endif
-		
-		// this extra point is the only simple way to ensure that path reversals
-		// (ie over-shrunk paths) are fully cleaned out with the trailing union op.
-		// However it's probably safe to skip this whenever an angle is almost flat.
-		if (cos_a < 0.99) path_out.push_back(path[j]); // (#405)
-
-#ifdef USINGZ
-		path_out.push_back(Point64(GetPerpendic(path[j], norms[j], group_delta_), path[j].z));
-#else
-		path_out.push_back(GetPerpendic(path[j], norms[j], group_delta_));
+        path_out.emplace_back(GetPerpendic(path[j], norms[k], group_delta_));
+        path_out.emplace_back(path[j]); // (#405, #873, #916)
+        path_out.emplace_back(GetPerpendic(path[j], norms[j], group_delta_));
 #endif
 	}
 	else if (cos_a > 0.999 && join_type_ != JoinType::Round)
@@ -357,7 +367,7 @@ void ClipperOffset::OffsetPolygon(Group& group, const Path64& path)
 	path_out.clear();
 	for (Path64::size_type j = 0, k = path.size() - 1; j < path.size(); k = j, ++j)
 		OffsetPoint(group, path, j, k);	
-	solution->push_back(path_out);
+    solution->emplace_back(path_out);
 }
 
 void ClipperOffset::OffsetOpenJoined(Group& group, const Path64& path)
@@ -368,7 +378,7 @@ void ClipperOffset::OffsetOpenJoined(Group& group, const Path64& path)
 
 	//rebuild normals 
 	std::reverse(norms.begin(), norms.end());
-	norms.push_back(norms[0]);
+    norms.emplace_back(norms[0]);
 	norms.erase(norms.begin());
 	NegatePath(norms);
 
@@ -381,7 +391,7 @@ void ClipperOffset::OffsetOpenPath(Group& group, const Path64& path)
 	if (deltaCallback64_) group_delta_ = deltaCallback64_(path, norms, 0, 0);
 
 	if (std::fabs(group_delta_) <= floating_point_tolerance)
-		path_out.push_back(path[0]);
+        path_out.emplace_back(path[0]);
 	else
 	{
 		switch (end_type_)
@@ -413,7 +423,7 @@ void ClipperOffset::OffsetOpenPath(Group& group, const Path64& path)
 		group_delta_ = deltaCallback64_(path, norms, highI, highI);
 
 	if (std::fabs(group_delta_) <= floating_point_tolerance)
-		path_out.push_back(path[highI]);
+        path_out.emplace_back(path[highI]);
 	else
 	{
 		switch (end_type_)
@@ -432,7 +442,7 @@ void ClipperOffset::OffsetOpenPath(Group& group, const Path64& path)
 
 	for (size_t j = highI -1, k = highI; j > 0; k = j, --j)
 		OffsetPoint(group, path, j, k);
-	solution->push_back(path_out);
+    solution->emplace_back(path_out);
 }
 
 void ClipperOffset::DoGroupOffset(Group& group)
@@ -454,13 +464,12 @@ void ClipperOffset::DoGroupOffset(Group& group)
 	if (group.join_type == JoinType::Round || group.end_type == EndType::Round)
 	{
 		// calculate the number of steps required to approximate a circle
-		// (see http://www.angusj.com/clipper2/Docs/Trigonometry.htm)
+		// (see https://www.angusj.com/clipper2/Docs/Trigonometry.htm)
 		// arcTol - when arc_tolerance_ is undefined (0) then curve imprecision
 		// will be relative to the size of the offset (delta). Obviously very
 		//large offsets will almost always require much less precision.
-		double arcTol = (arc_tolerance_ > floating_point_tolerance ?
-			std::min(abs_delta, arc_tolerance_) :
-			std::log10(2 + abs_delta) * default_arc_tolerance);
+		double arcTol = (arc_tolerance_ > floating_point_tolerance) ?
+			std::min(abs_delta, arc_tolerance_) : abs_delta * arc_const;
 
 		double steps_per_360 = std::min(PI / std::acos(1 - arcTol / abs_delta), abs_delta * PI);
 		step_sin_ = std::sin(2 * PI / steps_per_360);
@@ -507,7 +516,7 @@ void ClipperOffset::DoGroupOffset(Group& group)
 #endif
 			}
 
-			solution->push_back(path_out);
+            solution->emplace_back(path_out);
 			continue;
 		} // end of offsetting a single point
 
@@ -588,7 +597,7 @@ void ClipperOffset::ExecuteInternal(double delta)
 
 	if (!solution->size()) return;
 
-	bool paths_reversed = CheckReverseOrientation();
+		bool paths_reversed = CheckReverseOrientation();
 	//clean up self-intersections ...
 	Clipper64 c;
 	c.PreserveCollinear(false);
@@ -617,10 +626,10 @@ void ClipperOffset::ExecuteInternal(double delta)
 	}
 }
 
-void ClipperOffset::Execute(double delta, Paths64& paths)
+void ClipperOffset::Execute(double delta, Paths64& paths64)
 {
-	paths.clear();
-	solution = &paths;
+	paths64.clear();
+	solution = &paths64;
 	solution_tree = nullptr;
 	ExecuteInternal(delta);
 }
diff --git a/engine/thirdparty/clipper2/src/clipper.rectclip.cpp b/engine/thirdparty/clipper2/src/clipper.rectclip.cpp
index 23809b5e..a5d66df4 100644
--- a/engine/thirdparty/clipper2/src/clipper.rectclip.cpp
+++ b/engine/thirdparty/clipper2/src/clipper.rectclip.cpp
@@ -1,13 +1,12 @@
 /*******************************************************************************
 * Author    :  Angus Johnson                                                   *
 * Date      :  5 July 2024                                                     *
-* Website   :  http://www.angusj.com                                           *
+* Website   :  https://www.angusj.com                                          *
 * Copyright :  Angus Johnson 2010-2024                                         *
 * Purpose   :  FAST rectangular clipping                                       *
-* License   :  http://www.boost.org/LICENSE_1_0.txt                            *
+* License   :  https://www.boost.org/LICENSE_1_0.txt                           *
 *******************************************************************************/
 
-#include <cmath>
 #include "clipper2/clipper.h"
 #include "clipper2/clipper.rectclip.h"
 
@@ -282,7 +281,7 @@ namespace Clipper2Lib {
   {
     if (op->edge) return;
     op->edge = &edge;
-    edge.push_back(op);
+    edge.emplace_back(op);
   }
 
   inline void UncoupleEdge(OutPt2* op)
@@ -328,7 +327,7 @@ namespace Clipper2Lib {
       result->pt = pt;
       result->next = result;
       result->prev = result;
-      results_.push_back(result);
+      results_.emplace_back(result);
     }
     else
     {
@@ -489,7 +488,7 @@ namespace Clipper2Lib {
         {
           bool isClockw = IsClockwise(prev, loc, prev_pt, path[i], rect_mp_);
           do {
-            start_locs_.push_back(prev);
+            start_locs_.emplace_back(prev);
             prev = GetAdjacentLocation(prev, isClockw);
           } while (prev != loc);
           crossing_loc = crossing_prev; // still not crossed
@@ -514,7 +513,7 @@ namespace Clipper2Lib {
         if (first_cross_ == Location::Inside)
         {
           first_cross_ = crossing_loc;
-          start_locs_.push_back(prev);
+          start_locs_.emplace_back(prev);
         }
         else if (prev != crossing_loc)
         {
@@ -536,7 +535,7 @@ namespace Clipper2Lib {
         if (first_cross_ == Location::Inside)
         {
           first_cross_ = loc;
-          start_locs_.push_back(prev);
+          start_locs_.emplace_back(prev);
         }
 
         loc = crossing_loc;
@@ -750,7 +749,7 @@ namespace Clipper2Lib {
       if (!isRejoining)
       {
         size_t new_idx = results_.size();
-        results_.push_back(p1a);
+        results_.emplace_back(p1a);
         SetNewOwner(p1a, new_idx);
       }
 
@@ -861,11 +860,11 @@ namespace Clipper2Lib {
     if (!op2) return Path64();
 
     Path64 result;
-    result.push_back(op->pt);
+    result.emplace_back(op->pt);
     op2 = op->next;
     while (op2 != op)
     {
-      result.push_back(op2->pt);
+      result.emplace_back(op2->pt);
       op2 = op2->next;
     }
     return result;
@@ -885,7 +884,7 @@ namespace Clipper2Lib {
       else if (rect_.Contains(path_bounds_))
       {
         // the path must be completely inside rect_
-        result.push_back(path);
+        result.emplace_back(path);
         continue;
       }
 
@@ -898,7 +897,7 @@ namespace Clipper2Lib {
       {
         Path64 tmp = GetPath(op);
         if (!tmp.empty())
-          result.emplace_back(tmp);
+          result.emplace_back(std::move(tmp));
       }
 
       //clean up after every loop
@@ -930,7 +929,7 @@ namespace Clipper2Lib {
       {
         Path64 tmp = GetPath(op);
         if (!tmp.empty())
-          result.emplace_back(tmp);
+          result.emplace_back(std::move(tmp));
       }
       results_.clear();
 
@@ -1015,11 +1014,11 @@ namespace Clipper2Lib {
     Path64 result;
     if (!op || op == op->next) return result;
     op = op->next; // starting at path beginning
-    result.push_back(op->pt);
+    result.emplace_back(op->pt);
     OutPt2 *op2 = op->next;
     while (op2 != op)
     {
-      result.push_back(op2->pt);
+      result.emplace_back(op2->pt);
       op2 = op2->next;
     }
     return result;
diff --git a/engine/thirdparty/freetype/include/freetype/config/ftconfig.h b/engine/thirdparty/freetype/include/freetype/config/ftconfig.h
index a8515169..0667493f 100644
--- a/engine/thirdparty/freetype/include/freetype/config/ftconfig.h
+++ b/engine/thirdparty/freetype/include/freetype/config/ftconfig.h
@@ -4,7 +4,7 @@
  *
  *   ANSI-specific configuration file (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/config/ftheader.h b/engine/thirdparty/freetype/include/freetype/config/ftheader.h
index e607bce1..f6ef2618 100644
--- a/engine/thirdparty/freetype/include/freetype/config/ftheader.h
+++ b/engine/thirdparty/freetype/include/freetype/config/ftheader.h
@@ -4,7 +4,7 @@
  *
  *   Build macros of the FreeType 2 library.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/config/ftoption.h b/engine/thirdparty/freetype/include/freetype/config/ftoption.h
index 1976b33a..eb4e32d8 100644
--- a/engine/thirdparty/freetype/include/freetype/config/ftoption.h
+++ b/engine/thirdparty/freetype/include/freetype/config/ftoption.h
@@ -4,7 +4,7 @@
  *
  *   User-selectable configuration macros (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -757,6 +757,22 @@ FT_BEGIN_HEADER
 #endif
 
 
+  /**************************************************************************
+   *
+   * Option `TT_CONFIG_OPTION_GPOS_KERNING` enables a basic GPOS kerning
+   * implementation (for TrueType fonts only).  With this defined, FreeType
+   * is able to get kerning pair data from the GPOS 'kern' feature as well as
+   * legacy 'kern' tables; without this defined, FreeType will only be able
+   * to use legacy 'kern' tables.
+   *
+   * Note that FreeType does not support more advanced GPOS layout features;
+   * even the 'kern' feature implemented here doesn't handle more
+   * sophisticated kerning variants.  Use a higher-level library like
+   * HarfBuzz instead for that.
+   */
+/* #define TT_CONFIG_OPTION_GPOS_KERNING */
+
+
   /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
diff --git a/engine/thirdparty/freetype/include/freetype/config/ftstdlib.h b/engine/thirdparty/freetype/include/freetype/config/ftstdlib.h
index f65148a9..e17aa7b8 100644
--- a/engine/thirdparty/freetype/include/freetype/config/ftstdlib.h
+++ b/engine/thirdparty/freetype/include/freetype/config/ftstdlib.h
@@ -5,7 +5,7 @@
  *   ANSI-specific library and header configuration file (specification
  *   only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/config/integer-types.h b/engine/thirdparty/freetype/include/freetype/config/integer-types.h
index 7258b508..c27505ff 100644
--- a/engine/thirdparty/freetype/include/freetype/config/integer-types.h
+++ b/engine/thirdparty/freetype/include/freetype/config/integer-types.h
@@ -4,7 +4,7 @@
  *
  *   FreeType integer types definitions.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/config/mac-support.h b/engine/thirdparty/freetype/include/freetype/config/mac-support.h
index b77b96d5..07b6f915 100644
--- a/engine/thirdparty/freetype/include/freetype/config/mac-support.h
+++ b/engine/thirdparty/freetype/include/freetype/config/mac-support.h
@@ -4,7 +4,7 @@
  *
  *   Mac/OS X support configuration header.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/config/public-macros.h b/engine/thirdparty/freetype/include/freetype/config/public-macros.h
index 23d0fa6a..f56581a6 100644
--- a/engine/thirdparty/freetype/include/freetype/config/public-macros.h
+++ b/engine/thirdparty/freetype/include/freetype/config/public-macros.h
@@ -4,7 +4,7 @@
  *
  *   Define a set of compiler macros used in public FreeType headers.
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/freetype.h b/engine/thirdparty/freetype/include/freetype/freetype.h
index 92acf379..58fc33df 100644
--- a/engine/thirdparty/freetype/include/freetype/freetype.h
+++ b/engine/thirdparty/freetype/include/freetype/freetype.h
@@ -4,7 +4,7 @@
  *
  *   FreeType high-level API and common types (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -1322,9 +1322,13 @@ FT_BEGIN_HEADER
    *   FT_FACE_FLAG_KERNING ::
    *     The face contains kerning information.  If set, the kerning distance
    *     can be retrieved using the function @FT_Get_Kerning.  Otherwise the
-   *     function always returns the vector (0,0).  Note that FreeType
-   *     doesn't handle kerning data from the SFNT 'GPOS' table (as present
-   *     in many OpenType fonts).
+   *     function always returns the vector (0,0).
+   *
+   *     Note that for TrueType fonts only, FreeType supports both the 'kern'
+   *     table and the basic, pair-wise kerning feature from the 'GPOS' table
+   *     (with `TT_CONFIG_OPTION_GPOS_KERNING` enabled), though FreeType does
+   *     not support the more advanced GPOS layout features; use a library
+   *     like HarfBuzz for those instead.
    *
    *   FT_FACE_FLAG_FAST_GLYPHS ::
    *     THIS FLAG IS DEPRECATED.  DO NOT USE OR TEST IT.
@@ -3767,87 +3771,18 @@ FT_BEGIN_HEADER
    *     pixels and use the @FT_PIXEL_MODE_LCD_V mode.
    *
    *   FT_RENDER_MODE_SDF ::
-   *     This mode corresponds to 8-bit, single-channel signed distance field
-   *     (SDF) bitmaps.  Each pixel in the SDF grid is the value from the
-   *     pixel's position to the nearest glyph's outline.  The distances are
-   *     calculated from the center of the pixel and are positive if they are
-   *     filled by the outline (i.e., inside the outline) and negative
-   *     otherwise.  Check the note below on how to convert the output values
-   *     to usable data.
+   *     The positive (unsigned) 8-bit bitmap values can be converted to the
+   *     single-channel signed distance field (SDF) by subtracting 128, with
+   *     the positive and negative results corresponding to the inside and
+   *     the outside of a glyph contour, respectively.  The distance units are
+   *     arbitrarily determined by an adjustable @spread property.
    *
    * @note:
-   *   The selected render mode only affects vector glyphs of a font.
+   *   The selected render mode only affects scalable vector glyphs of a font.
    *   Embedded bitmaps often have a different pixel mode like
    *   @FT_PIXEL_MODE_MONO.  You can use @FT_Bitmap_Convert to transform them
    *   into 8-bit pixmaps.
    *
-   *   For @FT_RENDER_MODE_SDF the output bitmap buffer contains normalized
-   *   distances that are packed into unsigned 8-bit values.  To get pixel
-   *   values in floating point representation use the following pseudo-C
-   *   code for the conversion.
-   *
-   *   ```
-   *   // Load glyph and render using FT_RENDER_MODE_SDF,
-   *   // then use the output buffer as follows.
-   *
-   *   ...
-   *   FT_Byte  buffer = glyph->bitmap->buffer;
-   *
-   *
-   *   for pixel in buffer
-   *   {
-   *     // `sd` is the signed distance and `spread` is the current spread;
-   *     // the default spread is 2 and can be changed.
-   *
-   *     float  sd = (float)pixel - 128.0f;
-   *
-   *
-   *     // Convert to pixel values.
-   *     sd = ( sd / 128.0f ) * spread;
-   *
-   *     // Store `sd` in a buffer or use as required.
-   *   }
-   *
-   *   ```
-   *
-   *   FreeType has two rasterizers for generating SDF, namely:
-   *
-   *   1. `sdf` for generating SDF directly from glyph's outline, and
-   *
-   *   2. `bsdf` for generating SDF from rasterized bitmaps.
-   *
-   *   Depending on the glyph type (i.e., outline or bitmap), one of the two
-   *   rasterizers is chosen at runtime and used for generating SDFs.  To
-   *   force the use of `bsdf` you should render the glyph with any of the
-   *   FreeType's other rendering modes (e.g., `FT_RENDER_MODE_NORMAL`) and
-   *   then re-render with `FT_RENDER_MODE_SDF`.
-   *
-   *   There are some issues with stability and possible failures of the SDF
-   *   renderers (specifically `sdf`).
-   *
-   *   1. The `sdf` rasterizer is sensitive to really small features (e.g.,
-   *      sharp turns that are less than 1~pixel) and imperfections in the
-   *      glyph's outline, causing artifacts in the final output.
-   *
-   *   2. The `sdf` rasterizer has limited support for handling intersecting
-   *      contours and *cannot* handle self-intersecting contours whatsoever.
-   *      Self-intersection happens when a single connected contour
-   *      intersects itself at some point; having these in your font
-   *      definitely poses a problem to the rasterizer and cause artifacts,
-   *      too.
-   *
-   *   3. Generating SDF for really small glyphs may result in undesirable
-   *      output; the pixel grid (which stores distance information) becomes
-   *      too coarse.
-   *
-   *   4. Since the output buffer is normalized, precision at smaller spreads
-   *      is greater than precision at larger spread values because the
-   *      output range of [0..255] gets mapped to a smaller SDF range.  A
-   *      spread of~2 should be sufficient in most cases.
-   *
-   *   Points (1) and (2) can be avoided by using the `bsdf` rasterizer,
-   *   which is more stable than the `sdf` rasterizer in general.
-   *
    */
   typedef enum  FT_Render_Mode_
   {
@@ -4058,9 +3993,26 @@ FT_BEGIN_HEADER
    *   out of the scope of this API function -- they can be implemented
    *   through format-specific interfaces.
    *
-   *   Kerning for OpenType fonts implemented in a 'GPOS' table is not
-   *   supported; use @FT_HAS_KERNING to find out whether a font has data
-   *   that can be extracted with `FT_Get_Kerning`.
+   *   Note that, for TrueType fonts only, this can extract data from both
+   *   the 'kern' table and the basic, pair-wise kerning feature from the
+   *   GPOS table (with `TT_CONFIG_OPTION_GPOS_KERNING` enabled), though
+   *   FreeType does not support the more advanced GPOS layout features; use
+   *   a library like HarfBuzz for those instead.  If a font has both a
+   *   'kern' table and kern features of a GPOS table, the 'kern' table will
+   *   be used.
+   *
+   *   Also note for right-to-left scripts, the functionality may differ for
+   *   fonts with GPOS tables vs. 'kern' tables.  For GPOS, right-to-left
+   *   fonts typically use both a placement offset and an advance for pair
+   *   positioning, which this API does not support, so it would output
+   *   kerning values of zero; though if the right-to-left font used only
+   *   advances in GPOS pair positioning, then this API could output kerning
+   *   values for it, but it would use `left_glyph` to mean the first glyph
+   *   for that case.  Whereas 'kern' tables are always advance-only and
+   *   always store the left glyph first.
+   *
+   *   Use @FT_HAS_KERNING to find out whether a font has data that can be
+   *   extracted with `FT_Get_Kerning`.
    */
   FT_EXPORT( FT_Error )
   FT_Get_Kerning( FT_Face     face,
@@ -5222,7 +5174,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  13
-#define FREETYPE_PATCH  2
+#define FREETYPE_PATCH  3
 
 
   /**************************************************************************
diff --git a/engine/thirdparty/freetype/include/freetype/ftadvanc.h b/engine/thirdparty/freetype/include/freetype/ftadvanc.h
index 4560ded6..85b8ba25 100644
--- a/engine/thirdparty/freetype/include/freetype/ftadvanc.h
+++ b/engine/thirdparty/freetype/include/freetype/ftadvanc.h
@@ -4,7 +4,7 @@
  *
  *   Quick computation of advance widths (specification only).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftbbox.h b/engine/thirdparty/freetype/include/freetype/ftbbox.h
index fc21740f..12bbfa63 100644
--- a/engine/thirdparty/freetype/include/freetype/ftbbox.h
+++ b/engine/thirdparty/freetype/include/freetype/ftbbox.h
@@ -4,7 +4,7 @@
  *
  *   FreeType exact bbox computation (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftbdf.h b/engine/thirdparty/freetype/include/freetype/ftbdf.h
index e8ce6431..6f63b0b1 100644
--- a/engine/thirdparty/freetype/include/freetype/ftbdf.h
+++ b/engine/thirdparty/freetype/include/freetype/ftbdf.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing BDF-specific strings (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftbitmap.h b/engine/thirdparty/freetype/include/freetype/ftbitmap.h
index eb6b4b1e..df9d4626 100644
--- a/engine/thirdparty/freetype/include/freetype/ftbitmap.h
+++ b/engine/thirdparty/freetype/include/freetype/ftbitmap.h
@@ -4,7 +4,7 @@
  *
  *   FreeType utility functions for bitmaps (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftbzip2.h b/engine/thirdparty/freetype/include/freetype/ftbzip2.h
index 7d29f468..c5baea85 100644
--- a/engine/thirdparty/freetype/include/freetype/ftbzip2.h
+++ b/engine/thirdparty/freetype/include/freetype/ftbzip2.h
@@ -4,7 +4,7 @@
  *
  *   Bzip2-compressed stream support.
  *
- * Copyright (C) 2010-2023 by
+ * Copyright (C) 2010-2024 by
  * Joel Klinghed.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftcache.h b/engine/thirdparty/freetype/include/freetype/ftcache.h
index a2072e26..140df4c9 100644
--- a/engine/thirdparty/freetype/include/freetype/ftcache.h
+++ b/engine/thirdparty/freetype/include/freetype/ftcache.h
@@ -4,7 +4,7 @@
  *
  *   FreeType Cache subsystem (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftcid.h b/engine/thirdparty/freetype/include/freetype/ftcid.h
index ef229390..96b2a90f 100644
--- a/engine/thirdparty/freetype/include/freetype/ftcid.h
+++ b/engine/thirdparty/freetype/include/freetype/ftcid.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing CID font information (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Dereg Clegg and Michael Toftdal.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftcolor.h b/engine/thirdparty/freetype/include/freetype/ftcolor.h
index eae200fd..420720dd 100644
--- a/engine/thirdparty/freetype/include/freetype/ftcolor.h
+++ b/engine/thirdparty/freetype/include/freetype/ftcolor.h
@@ -4,7 +4,7 @@
  *
  *   FreeType's glyph color management (specification).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftdriver.h b/engine/thirdparty/freetype/include/freetype/ftdriver.h
index 7af7465b..1b7f539f 100644
--- a/engine/thirdparty/freetype/include/freetype/ftdriver.h
+++ b/engine/thirdparty/freetype/include/freetype/ftdriver.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for controlling driver modules (specification only).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -817,6 +817,80 @@ FT_BEGIN_HEADER
    *   2.5
    */
 
+
+  /**************************************************************************
+   *
+   * @property:
+   *   spread
+   *
+   * @description:
+   *   This property of the 'sdf' and 'bsdf' renderers defines how the signed
+   *   distance field (SDF) is represented in the output bitmap.  The output
+   *   values are calculated as follows, '128 * ( SDF / spread + 1 )', with
+   *   the result clamped to the 8-bit range [0..255].  Therefore, 'spread'
+   *   is also the maximum euclidean distance from the edge after which the
+   *   values are clamped.  The spread is specified in pixels with the
+   *   default value of 8.  For accurate SDF texture mapping (interpolation),
+   *   the spread should be large enough to accommodate the target grid unit.
+   *
+   * @example:
+   *   The following example code demonstrates how to set the SDF spread
+   *   (omitting the error handling).
+   *
+   *   ```
+   *     FT_Library  library;
+   *     FT_Int      spread = 2;
+   *
+   *
+   *     FT_Init_FreeType( &library );
+   *
+   *     FT_Property_Set( library, "sdf", "spread", &spread );
+   *   ```
+   *
+   * @note:
+   *   FreeType has two rasterizers for generating SDF, namely:
+   *
+   *   1. `sdf` for generating SDF directly from glyph's outline, and
+   *
+   *   2. `bsdf` for generating SDF from rasterized bitmaps.
+   *
+   *   Depending on the glyph type (i.e., outline or bitmap), one of the two
+   *   rasterizers is chosen at runtime and used for generating SDFs.  To
+   *   force the use of `bsdf` you should render the glyph with any of the
+   *   FreeType's other rendering modes (e.g., `FT_RENDER_MODE_NORMAL`) and
+   *   then re-render with `FT_RENDER_MODE_SDF`.
+   *
+   *   There are some issues with stability and possible failures of the SDF
+   *   renderers (specifically `sdf`).
+   *
+   *   1. The `sdf` rasterizer is sensitive to really small features (e.g.,
+   *      sharp turns that are less than 1~pixel) and imperfections in the
+   *      glyph's outline, causing artifacts in the final output.
+   *
+   *   2. The `sdf` rasterizer has limited support for handling intersecting
+   *      contours and *cannot* handle self-intersecting contours whatsoever.
+   *      Self-intersection happens when a single connected contour
+   *      intersects itself at some point; having these in your font
+   *      definitely poses a problem to the rasterizer and cause artifacts,
+   *      too.
+   *
+   *   3. Generating SDF for really small glyphs may result in undesirable
+   *      output; the pixel grid (which stores distance information) becomes
+   *      too coarse.
+   *
+   *   4. Since the output buffer is normalized, precision at smaller spreads
+   *      is greater than precision at larger spread values because the
+   *      output range of [0..255] gets mapped to a smaller SDF range.  A
+   *      spread of~2 should be sufficient in most cases.
+   *
+   *   Points (1) and (2) can be avoided by using the `bsdf` rasterizer,
+   *   which is more stable than the `sdf` rasterizer in general.
+   *
+   * @since:
+   *   2.11
+   */
+
+
   /**************************************************************************
    *
    * @property:
diff --git a/engine/thirdparty/freetype/include/freetype/fterrdef.h b/engine/thirdparty/freetype/include/freetype/fterrdef.h
index d59b3cc2..710ca91b 100644
--- a/engine/thirdparty/freetype/include/freetype/fterrdef.h
+++ b/engine/thirdparty/freetype/include/freetype/fterrdef.h
@@ -4,7 +4,7 @@
  *
  *   FreeType error codes (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/fterrors.h b/engine/thirdparty/freetype/include/freetype/fterrors.h
index 15ef3f76..27c0ece5 100644
--- a/engine/thirdparty/freetype/include/freetype/fterrors.h
+++ b/engine/thirdparty/freetype/include/freetype/fterrors.h
@@ -4,7 +4,7 @@
  *
  *   FreeType error code handling (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftfntfmt.h b/engine/thirdparty/freetype/include/freetype/ftfntfmt.h
index c0018fc8..7c8b0874 100644
--- a/engine/thirdparty/freetype/include/freetype/ftfntfmt.h
+++ b/engine/thirdparty/freetype/include/freetype/ftfntfmt.h
@@ -4,7 +4,7 @@
  *
  *   Support functions for font formats.
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftgasp.h b/engine/thirdparty/freetype/include/freetype/ftgasp.h
index d5f19add..30e5a9bf 100644
--- a/engine/thirdparty/freetype/include/freetype/ftgasp.h
+++ b/engine/thirdparty/freetype/include/freetype/ftgasp.h
@@ -4,7 +4,7 @@
  *
  *   Access of TrueType's 'gasp' table (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftglyph.h b/engine/thirdparty/freetype/include/freetype/ftglyph.h
index 4658895f..dc1eb887 100644
--- a/engine/thirdparty/freetype/include/freetype/ftglyph.h
+++ b/engine/thirdparty/freetype/include/freetype/ftglyph.h
@@ -4,7 +4,7 @@
  *
  *   FreeType convenience functions to handle glyphs (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftgxval.h b/engine/thirdparty/freetype/include/freetype/ftgxval.h
index e8de9a6e..065cd53c 100644
--- a/engine/thirdparty/freetype/include/freetype/ftgxval.h
+++ b/engine/thirdparty/freetype/include/freetype/ftgxval.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for validating TrueTypeGX/AAT tables (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO, Redhat K.K,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/include/freetype/ftgzip.h b/engine/thirdparty/freetype/include/freetype/ftgzip.h
index 443ec29d..9516dc03 100644
--- a/engine/thirdparty/freetype/include/freetype/ftgzip.h
+++ b/engine/thirdparty/freetype/include/freetype/ftgzip.h
@@ -4,7 +4,7 @@
  *
  *   Gzip-compressed stream support.
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftimage.h b/engine/thirdparty/freetype/include/freetype/ftimage.h
index 6baa8125..2b4b4ac6 100644
--- a/engine/thirdparty/freetype/include/freetype/ftimage.h
+++ b/engine/thirdparty/freetype/include/freetype/ftimage.h
@@ -5,7 +5,7 @@
  *   FreeType glyph image formats and default raster interface
  *   (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -21,6 +21,11 @@
    * Note: A 'raster' is simply a scan-line converter, used to render
    *       `FT_Outline`s into `FT_Bitmap`s.
    *
+   * Note: This file can be used for `STANDALONE_` compilation of raster
+   *       (B/W) and smooth (anti-aliased) renderers.  Therefore, it must
+   *       rely on standard variable types only instead of aliases in
+   *       `fttypes.h`.
+   *
    */
 
 
@@ -318,7 +323,7 @@ FT_BEGIN_HEADER
    *
    *     If bit~2 is set, bits 5-7 contain the drop-out mode (as defined in
    *     the OpenType specification; the value is the same as the argument to
-   *     the 'SCANMODE' instruction).
+   *     the 'SCANTYPE' instruction).
    *
    *     Bits 3 and~4 are reserved for internal purposes.
    *
@@ -341,14 +346,14 @@ FT_BEGIN_HEADER
    */
   typedef struct  FT_Outline_
   {
-    short       n_contours;      /* number of contours in glyph        */
-    short       n_points;        /* number of points in the glyph      */
+    unsigned short   n_contours;  /* number of contours in glyph        */
+    unsigned short   n_points;    /* number of points in the glyph      */
 
-    FT_Vector*  points;          /* the outline's points               */
-    char*       tags;            /* the points flags                   */
-    short*      contours;        /* the contour end points             */
+    FT_Vector*       points;      /* the outline's points               */
+    unsigned char*   tags;        /* the points flags                   */
+    unsigned short*  contours;    /* the contour end points             */
 
-    int         flags;           /* outline masks                      */
+    int              flags;       /* outline masks                      */
 
   } FT_Outline;
 
@@ -356,8 +361,8 @@ FT_BEGIN_HEADER
 
   /* Following limits must be consistent with */
   /* FT_Outline.{n_contours,n_points}         */
-#define FT_OUTLINE_CONTOURS_MAX  SHRT_MAX
-#define FT_OUTLINE_POINTS_MAX    SHRT_MAX
+#define FT_OUTLINE_CONTOURS_MAX  USHRT_MAX
+#define FT_OUTLINE_POINTS_MAX    USHRT_MAX
 
 
   /**************************************************************************
@@ -434,8 +439,8 @@ FT_BEGIN_HEADER
    *   rasterizer; see the `tags` field in @FT_Outline.
    *
    *   Please refer to the description of the 'SCANTYPE' instruction in the
-   *   OpenType specification (in file `ttinst1.doc`) how simple drop-outs,
-   *   smart drop-outs, and stubs are defined.
+   *   [OpenType specification](https://learn.microsoft.com/en-us/typography/opentype/spec/tt_instructions#scantype)
+   *   how simple drop-outs, smart drop-outs, and stubs are defined.
    */
 #define FT_OUTLINE_NONE             0x0
 #define FT_OUTLINE_OWNER            0x1
diff --git a/engine/thirdparty/freetype/include/freetype/ftincrem.h b/engine/thirdparty/freetype/include/freetype/ftincrem.h
index 2d4f5def..816581b7 100644
--- a/engine/thirdparty/freetype/include/freetype/ftincrem.h
+++ b/engine/thirdparty/freetype/include/freetype/ftincrem.h
@@ -4,7 +4,7 @@
  *
  *   FreeType incremental loading (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftlcdfil.h b/engine/thirdparty/freetype/include/freetype/ftlcdfil.h
index d3723e16..25274dc4 100644
--- a/engine/thirdparty/freetype/include/freetype/ftlcdfil.h
+++ b/engine/thirdparty/freetype/include/freetype/ftlcdfil.h
@@ -5,7 +5,7 @@
  *   FreeType API for color filtering of subpixel bitmap glyphs
  *   (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftlist.h b/engine/thirdparty/freetype/include/freetype/ftlist.h
index b5531313..972fbfa2 100644
--- a/engine/thirdparty/freetype/include/freetype/ftlist.h
+++ b/engine/thirdparty/freetype/include/freetype/ftlist.h
@@ -4,7 +4,7 @@
  *
  *   Generic list support for FreeType (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftlogging.h b/engine/thirdparty/freetype/include/freetype/ftlogging.h
index 53b8b896..1813cfc2 100644
--- a/engine/thirdparty/freetype/include/freetype/ftlogging.h
+++ b/engine/thirdparty/freetype/include/freetype/ftlogging.h
@@ -4,7 +4,7 @@
  *
  *   Additional debugging APIs.
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftlzw.h b/engine/thirdparty/freetype/include/freetype/ftlzw.h
index adfd1724..bcf59ba7 100644
--- a/engine/thirdparty/freetype/include/freetype/ftlzw.h
+++ b/engine/thirdparty/freetype/include/freetype/ftlzw.h
@@ -4,7 +4,7 @@
  *
  *   LZW-compressed stream support.
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftmac.h b/engine/thirdparty/freetype/include/freetype/ftmac.h
index a91e38f9..e4efde33 100644
--- a/engine/thirdparty/freetype/include/freetype/ftmac.h
+++ b/engine/thirdparty/freetype/include/freetype/ftmac.h
@@ -4,7 +4,7 @@
  *
  *   Additional Mac-specific API.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftmm.h b/engine/thirdparty/freetype/include/freetype/ftmm.h
index d145128a..35ed039c 100644
--- a/engine/thirdparty/freetype/include/freetype/ftmm.h
+++ b/engine/thirdparty/freetype/include/freetype/ftmm.h
@@ -4,7 +4,7 @@
  *
  *   FreeType Multiple Master font interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -19,8 +19,13 @@
 #ifndef FTMM_H_
 #define FTMM_H_
 
+#include <freetype/freetype.h>
 
-#include <freetype/t1tables.h>
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
 
 
 FT_BEGIN_HEADER
@@ -53,6 +58,30 @@ FT_BEGIN_HEADER
    */
 
 
+  /**************************************************************************
+   *
+   * @enum:
+   *   T1_MAX_MM_XXX
+   *
+   * @description:
+   *   Multiple Masters limits as defined in their specifications.
+   *
+   * @values:
+   *   T1_MAX_MM_AXIS ::
+   *     The maximum number of Multiple Masters axes.
+   *
+   *   T1_MAX_MM_DESIGNS ::
+   *     The maximum number of Multiple Masters designs.
+   *
+   *   T1_MAX_MM_MAP_POINTS ::
+   *     The maximum number of elements in a design map.
+   *
+   */
+#define T1_MAX_MM_AXIS         4
+#define T1_MAX_MM_DESIGNS     16
+#define T1_MAX_MM_MAP_POINTS  20
+
+
   /**************************************************************************
    *
    * @struct:
diff --git a/engine/thirdparty/freetype/include/freetype/ftmodapi.h b/engine/thirdparty/freetype/include/freetype/ftmodapi.h
index c8f0c2c2..0ee71589 100644
--- a/engine/thirdparty/freetype/include/freetype/ftmodapi.h
+++ b/engine/thirdparty/freetype/include/freetype/ftmodapi.h
@@ -4,7 +4,7 @@
  *
  *   FreeType modules public interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftmoderr.h b/engine/thirdparty/freetype/include/freetype/ftmoderr.h
index c8c892dc..6722fbf8 100644
--- a/engine/thirdparty/freetype/include/freetype/ftmoderr.h
+++ b/engine/thirdparty/freetype/include/freetype/ftmoderr.h
@@ -4,7 +4,7 @@
  *
  *   FreeType module error offsets (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftotval.h b/engine/thirdparty/freetype/include/freetype/ftotval.h
index 011bdfc8..810200b3 100644
--- a/engine/thirdparty/freetype/include/freetype/ftotval.h
+++ b/engine/thirdparty/freetype/include/freetype/ftotval.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for validating OpenType tables (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftoutln.h b/engine/thirdparty/freetype/include/freetype/ftoutln.h
index f9329ca4..44e94b4f 100644
--- a/engine/thirdparty/freetype/include/freetype/ftoutln.h
+++ b/engine/thirdparty/freetype/include/freetype/ftoutln.h
@@ -5,7 +5,7 @@
  *   Support for the FT_Outline type used to store glyph shapes of
  *   most scalable font formats (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -112,7 +112,7 @@ FT_BEGIN_HEADER
    *   Degenerate contours, segments, and Bezier arcs may be reported.  In
    *   most cases, it is best to filter these out before using the outline
    *   for stroking or other path modification purposes (which may cause
-   *   degenerate segments to become non-degenrate and visible, like when
+   *   degenerate segments to become non-degenerate and visible, like when
    *   stroke caps are used or the path is otherwise outset).  Some glyph
    *   outlines may contain deliberate degenerate single points for mark
    *   attachement.
diff --git a/engine/thirdparty/freetype/include/freetype/ftparams.h b/engine/thirdparty/freetype/include/freetype/ftparams.h
index 6a9f243b..43bf69c2 100644
--- a/engine/thirdparty/freetype/include/freetype/ftparams.h
+++ b/engine/thirdparty/freetype/include/freetype/ftparams.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for possible FT_Parameter tags (specification only).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftpfr.h b/engine/thirdparty/freetype/include/freetype/ftpfr.h
index 7111d40a..1a712b95 100644
--- a/engine/thirdparty/freetype/include/freetype/ftpfr.h
+++ b/engine/thirdparty/freetype/include/freetype/ftpfr.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing PFR-specific data (specification only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftrender.h b/engine/thirdparty/freetype/include/freetype/ftrender.h
index 0b6fad32..dc5018a1 100644
--- a/engine/thirdparty/freetype/include/freetype/ftrender.h
+++ b/engine/thirdparty/freetype/include/freetype/ftrender.h
@@ -4,7 +4,7 @@
  *
  *   FreeType renderer modules public interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftsizes.h b/engine/thirdparty/freetype/include/freetype/ftsizes.h
index 7bfb1aed..4ef5c795 100644
--- a/engine/thirdparty/freetype/include/freetype/ftsizes.h
+++ b/engine/thirdparty/freetype/include/freetype/ftsizes.h
@@ -4,7 +4,7 @@
  *
  *   FreeType size objects management (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftsnames.h b/engine/thirdparty/freetype/include/freetype/ftsnames.h
index 9d5d22bb..d5d5cd93 100644
--- a/engine/thirdparty/freetype/include/freetype/ftsnames.h
+++ b/engine/thirdparty/freetype/include/freetype/ftsnames.h
@@ -7,7 +7,7 @@
  *
  *   This is _not_ used to retrieve glyph names!
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftstroke.h b/engine/thirdparty/freetype/include/freetype/ftstroke.h
index b3d90802..41626dc9 100644
--- a/engine/thirdparty/freetype/include/freetype/ftstroke.h
+++ b/engine/thirdparty/freetype/include/freetype/ftstroke.h
@@ -4,7 +4,7 @@
  *
  *   FreeType path stroker (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftsynth.h b/engine/thirdparty/freetype/include/freetype/ftsynth.h
index af90967d..43081b6c 100644
--- a/engine/thirdparty/freetype/include/freetype/ftsynth.h
+++ b/engine/thirdparty/freetype/include/freetype/ftsynth.h
@@ -5,7 +5,7 @@
  *   FreeType synthesizing code for emboldening and slanting
  *   (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftsystem.h b/engine/thirdparty/freetype/include/freetype/ftsystem.h
index 3a08f491..1eacb3af 100644
--- a/engine/thirdparty/freetype/include/freetype/ftsystem.h
+++ b/engine/thirdparty/freetype/include/freetype/ftsystem.h
@@ -4,7 +4,7 @@
  *
  *   FreeType low-level system interface definition (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/fttrigon.h b/engine/thirdparty/freetype/include/freetype/fttrigon.h
index 294981a6..a5299e93 100644
--- a/engine/thirdparty/freetype/include/freetype/fttrigon.h
+++ b/engine/thirdparty/freetype/include/freetype/fttrigon.h
@@ -4,7 +4,7 @@
  *
  *   FreeType trigonometric functions (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/fttypes.h b/engine/thirdparty/freetype/include/freetype/fttypes.h
index 5b109f0c..27815143 100644
--- a/engine/thirdparty/freetype/include/freetype/fttypes.h
+++ b/engine/thirdparty/freetype/include/freetype/fttypes.h
@@ -4,7 +4,7 @@
  *
  *   FreeType simple types definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/ftwinfnt.h b/engine/thirdparty/freetype/include/freetype/ftwinfnt.h
index 7b701ea5..2591e588 100644
--- a/engine/thirdparty/freetype/include/freetype/ftwinfnt.h
+++ b/engine/thirdparty/freetype/include/freetype/ftwinfnt.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing Windows fnt-specific data.
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/autohint.h b/engine/thirdparty/freetype/include/freetype/internal/autohint.h
index bf9c8b7c..8865d53b 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/autohint.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/autohint.h
@@ -4,7 +4,7 @@
  *
  *   High-level 'autohint' module-specific interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/cffotypes.h b/engine/thirdparty/freetype/include/freetype/internal/cffotypes.h
index 50d53538..36b0390a 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/cffotypes.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/cffotypes.h
@@ -4,7 +4,7 @@
  *
  *   Basic OpenType/CFF object type definitions (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/cfftypes.h b/engine/thirdparty/freetype/include/freetype/internal/cfftypes.h
index c2521764..ef2e8e75 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/cfftypes.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/cfftypes.h
@@ -5,7 +5,7 @@
  *   Basic OpenType/CFF type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -248,10 +248,10 @@ FT_BEGIN_HEADER
     FT_Byte   num_family_blues;
     FT_Byte   num_family_other_blues;
 
-    FT_Pos    blue_values[14];
-    FT_Pos    other_blues[10];
-    FT_Pos    family_blues[14];
-    FT_Pos    family_other_blues[10];
+    FT_Fixed  blue_values[14];
+    FT_Fixed  other_blues[10];
+    FT_Fixed  family_blues[14];
+    FT_Fixed  family_other_blues[10];
 
     FT_Fixed  blue_scale;
     FT_Pos    blue_shift;
diff --git a/engine/thirdparty/freetype/include/freetype/internal/compiler-macros.h b/engine/thirdparty/freetype/include/freetype/internal/compiler-macros.h
index 6f676509..876f66e2 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/compiler-macros.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/compiler-macros.h
@@ -4,7 +4,7 @@
  *
  *   Compiler-specific macro definitions used internally by FreeType.
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftcalc.h b/engine/thirdparty/freetype/include/freetype/internal/ftcalc.h
index d9aea236..71128a2d 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftcalc.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftcalc.h
@@ -4,7 +4,7 @@
  *
  *   Arithmetic computations (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -415,7 +415,7 @@ FT_BEGIN_HEADER
 
 #define FT_MSB( x )  ( 31 - _CountLeadingZeros( x ) )
 
-#elif defined( _M_ARM64 ) || defined( _M_ARM )
+#elif defined( _M_ARM64 ) || defined( _M_ARM ) || defined( _M_ARM64EC )
 
 #include <intrin.h>
 #pragma intrinsic( _CountLeadingZeros )
@@ -455,6 +455,12 @@ FT_BEGIN_HEADER
 
 #define FT_MSB( x )  FT_MSB_i386( x )
 
+#elif defined( __SunOS_5_11 )
+
+#include <string.h>
+
+#define FT_MSB( x )  ( fls( x ) - 1 )
+
 #elif defined( __DECC ) || defined( __DECCXX )
 
 #include <builtins.h>
@@ -489,8 +495,6 @@ FT_BEGIN_HEADER
             FT_Fixed  y );
 
 
-#if 0
-
   /**************************************************************************
    *
    * @function:
@@ -507,12 +511,11 @@ FT_BEGIN_HEADER
    *   The result of 'sqrt(x)'.
    *
    * @note:
-   *   This function is not very fast.
+   *   This function is slow and should be avoided.  Consider @FT_Hypot or
+   *   @FT_Vector_NormLen instead.
    */
-  FT_BASE( FT_Int32 )
-  FT_SqrtFixed( FT_Int32  x );
-
-#endif /* 0 */
+  FT_BASE( FT_UInt32 )
+  FT_SqrtFixed( FT_UInt32  x );
 
 
 #define INT_TO_F26DOT6( x )    ( (FT_Long)(x) * 64  )    /* << 6  */
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftdebug.h b/engine/thirdparty/freetype/include/freetype/internal/ftdebug.h
index 4e013ba1..d7fa8dc9 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftdebug.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftdebug.h
@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftdrv.h b/engine/thirdparty/freetype/include/freetype/internal/ftdrv.h
index 9001c07a..5609b3ef 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftdrv.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftdrv.h
@@ -4,7 +4,7 @@
  *
  *   FreeType internal font driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftgloadr.h b/engine/thirdparty/freetype/include/freetype/internal/ftgloadr.h
index 36e5509f..f1c155b1 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftgloadr.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftgloadr.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph loader (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftmemory.h b/engine/thirdparty/freetype/include/freetype/internal/ftmemory.h
index 5eb1d21f..4e05a29f 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftmemory.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftmemory.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType memory management macros (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg
  *
  * This file is part of the FreeType project, and may only be used,
@@ -371,8 +371,11 @@ extern "C++"
 #define FT_STRDUP( dst, str )                           \
           FT_MEM_SET_ERROR( FT_MEM_STRDUP( dst, str ) )
 
-#define FT_MEM_DUP( dst, address, size )                                    \
-          (dst) = ft_mem_dup( memory, (address), (FT_ULong)(size), &error )
+#define FT_MEM_DUP( dst, address, size )                       \
+          FT_ASSIGNP_INNER( dst, ft_mem_dup( memory,           \
+                                             (address),        \
+                                             (FT_ULong)(size), \
+                                             &error ) )
 
 #define FT_DUP( dst, address, size )                           \
           FT_MEM_SET_ERROR( FT_MEM_DUP( dst, address, size ) )
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftmmtypes.h b/engine/thirdparty/freetype/include/freetype/internal/ftmmtypes.h
index c4b21d61..8449e7a0 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftmmtypes.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftmmtypes.h
@@ -5,7 +5,7 @@
  *   OpenType Variations type definitions for internal use
  *   with the multi-masters service (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, George Williams, and
  * Dominik Röttsches.
  *
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftobjs.h b/engine/thirdparty/freetype/include/freetype/internal/ftobjs.h
index 28bc9b65..a1e93298 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftobjs.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftobjs.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType private base classes (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -604,12 +604,6 @@ FT_BEGIN_HEADER
 #define FT_FACE_MEMORY( x )   FT_FACE( x )->memory
 #define FT_FACE_STREAM( x )   FT_FACE( x )->stream
 
-#define FT_SIZE_FACE( x )     FT_SIZE( x )->face
-#define FT_SLOT_FACE( x )     FT_SLOT( x )->face
-
-#define FT_FACE_SLOT( x )     FT_FACE( x )->glyph
-#define FT_FACE_SIZE( x )     FT_FACE( x )->size
-
 
   /**************************************************************************
    *
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftpsprop.h b/engine/thirdparty/freetype/include/freetype/internal/ftpsprop.h
index 1d5b287a..4f11aa16 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftpsprop.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftpsprop.h
@@ -4,7 +4,7 @@
  *
  *   Get and set properties of PostScript drivers (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftrfork.h b/engine/thirdparty/freetype/include/freetype/internal/ftrfork.h
index e9645992..05c1d6c4 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftrfork.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftrfork.h
@@ -4,7 +4,7 @@
  *
  *   Embedded resource forks accessor (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO and Redhat K.K.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftserv.h b/engine/thirdparty/freetype/include/freetype/internal/ftserv.h
index 1e85d6d3..8c35dbd7 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftserv.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftserv.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType services (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftstream.h b/engine/thirdparty/freetype/include/freetype/internal/ftstream.h
index 88e19287..fd52f767 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftstream.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftstream.h
@@ -4,7 +4,7 @@
  *
  *   Stream handling (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/fttrace.h b/engine/thirdparty/freetype/include/freetype/internal/fttrace.h
index 319fe56f..42595a29 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/fttrace.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/fttrace.h
@@ -4,7 +4,7 @@
  *
  *   Tracing handling (specification only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -64,6 +64,7 @@ FT_TRACE_DEF( ttbdf )     /* TrueType embedded BDF   (ttbdf.c)    */
 FT_TRACE_DEF( ttcmap )    /* charmap handler         (ttcmap.c)   */
 FT_TRACE_DEF( ttcolr )    /* glyph layer table       (ttcolr.c)   */
 FT_TRACE_DEF( ttcpal )    /* color palette table     (ttcpal.c)   */
+FT_TRACE_DEF( ttgpos )    /* GPOS handler            (ttgpos.c)   */
 FT_TRACE_DEF( ttsvg )     /* OpenType SVG table      (ttsvg.c)    */
 FT_TRACE_DEF( ttkern )    /* kerning handler         (ttkern.c)   */
 FT_TRACE_DEF( ttload )    /* basic TrueType tables   (ttload.c)   */
diff --git a/engine/thirdparty/freetype/include/freetype/internal/ftvalid.h b/engine/thirdparty/freetype/include/freetype/internal/ftvalid.h
index e98ee4e4..a1312f2a 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/ftvalid.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/ftvalid.h
@@ -4,7 +4,7 @@
  *
  *   FreeType validation support (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/psaux.h b/engine/thirdparty/freetype/include/freetype/internal/psaux.h
index dfb1987f..745d2cb5 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/psaux.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/psaux.h
@@ -5,7 +5,7 @@
  *   Auxiliary functions and data structures related to PostScript fonts
  *   (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -225,6 +225,7 @@ FT_BEGIN_HEADER
 
   typedef enum  T1_FieldLocation_
   {
+    T1_FIELD_LOCATION_NONE = 0,
     T1_FIELD_LOCATION_CID_INFO,
     T1_FIELD_LOCATION_FONT_DICT,
     T1_FIELD_LOCATION_FONT_EXTRA,
@@ -249,6 +250,7 @@ FT_BEGIN_HEADER
   /* structure type used to model object fields */
   typedef struct  T1_FieldRec_
   {
+    FT_UInt             len;          /* field identifier length        */
     const char*         ident;        /* field identifier               */
     T1_FieldLocation    location;
     T1_FieldType        type;         /* type of field                  */
@@ -273,8 +275,9 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_SIMPLE_FIELD( _ident, _type, _fname, _dict ) \
           {                                                 \
+            sizeof ( _ident ) - 1,                          \
             _ident, T1CODE, _type,                          \
-            0,                                              \
+            NULL,                                           \
             FT_FIELD_OFFSET( _fname ),                      \
             FT_FIELD_SIZE( _fname ),                        \
             0, 0,                                           \
@@ -283,6 +286,7 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_CALLBACK_FIELD( _ident, _reader, _dict ) \
           {                                             \
+            sizeof ( _ident ) - 1,                      \
             _ident, T1CODE, T1_FIELD_TYPE_CALLBACK,     \
             (T1_Field_ParseFunc)_reader,                \
             0, 0,                                       \
@@ -292,8 +296,9 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_TABLE_FIELD( _ident, _type, _fname, _max, _dict ) \
           {                                                      \
+            sizeof ( _ident ) - 1,                               \
             _ident, T1CODE, _type,                               \
-            0,                                                   \
+            NULL,                                                \
             FT_FIELD_OFFSET( _fname ),                           \
             FT_FIELD_SIZE_DELTA( _fname ),                       \
             _max,                                                \
@@ -303,8 +308,9 @@ FT_BEGIN_HEADER
 
 #define T1_NEW_TABLE_FIELD2( _ident, _type, _fname, _max, _dict ) \
           {                                                       \
+            sizeof ( _ident ) - 1,                                \
             _ident, T1CODE, _type,                                \
-            0,                                                    \
+            NULL,                                                 \
             FT_FIELD_OFFSET( _fname ),                            \
             FT_FIELD_SIZE_DELTA( _fname ),                        \
             _max, 0,                                              \
@@ -354,6 +360,13 @@ FT_BEGIN_HEADER
 #define T1_FIELD_CALLBACK( _ident, _name, _dict )       \
           T1_NEW_CALLBACK_FIELD( _ident, _name, _dict )
 
+#define T1_FIELD_ZERO                                         \
+          {                                                   \
+            0,                                                \
+            NULL, T1_FIELD_LOCATION_NONE, T1_FIELD_TYPE_NONE, \
+            NULL, 0, 0, 0, 0, 0                               \
+          }
+
 
   /*************************************************************************/
   /*************************************************************************/
diff --git a/engine/thirdparty/freetype/include/freetype/internal/pshints.h b/engine/thirdparty/freetype/include/freetype/internal/pshints.h
index ededc4c7..dba6c730 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/pshints.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/pshints.h
@@ -6,7 +6,7 @@
  *   recorders (specification only).  These are used to support native
  *   T1/T2 hints in the 'type1', 'cid', and 'cff' font drivers.
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svbdf.h b/engine/thirdparty/freetype/include/freetype/internal/services/svbdf.h
index bf0c1dcc..89e9c2e5 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svbdf.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svbdf.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType BDF services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svcfftl.h b/engine/thirdparty/freetype/include/freetype/internal/services/svcfftl.h
index 4a20498e..3cb483c3 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svcfftl.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svcfftl.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType CFF tables loader service (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svcid.h b/engine/thirdparty/freetype/include/freetype/internal/services/svcid.h
index 06d0cb8f..8362cb87 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svcid.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svcid.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType CID font services (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Derek Clegg and Michael Toftdal.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svfntfmt.h b/engine/thirdparty/freetype/include/freetype/internal/services/svfntfmt.h
index bc45e805..6b837e79 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svfntfmt.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svfntfmt.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType font format service (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svgldict.h b/engine/thirdparty/freetype/include/freetype/internal/services/svgldict.h
index 6437abfb..6126ec9a 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svgldict.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svgldict.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph dictionary services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svgxval.h b/engine/thirdparty/freetype/include/freetype/internal/services/svgxval.h
index 31016afe..29cf5528 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svgxval.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svgxval.h
@@ -4,7 +4,7 @@
  *
  *   FreeType API for validating TrueTypeGX/AAT tables (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svkern.h b/engine/thirdparty/freetype/include/freetype/internal/services/svkern.h
index bcabbc3e..ac1bc30c 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svkern.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svkern.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType Kerning service (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svmetric.h b/engine/thirdparty/freetype/include/freetype/internal/services/svmetric.h
index 167617eb..8b3563b2 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svmetric.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svmetric.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType services for metrics variations (specification).
  *
- * Copyright (C) 2016-2023 by
+ * Copyright (C) 2016-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svmm.h b/engine/thirdparty/freetype/include/freetype/internal/services/svmm.h
index 7e76ab83..5288fadf 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svmm.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svmm.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType Multiple Masters and GX var services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svotval.h b/engine/thirdparty/freetype/include/freetype/internal/services/svotval.h
index a4683cd5..7aea7ec1 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svotval.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svotval.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType OpenType validation service (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svpfr.h b/engine/thirdparty/freetype/include/freetype/internal/services/svpfr.h
index fd189c7d..b2fac6d0 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svpfr.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svpfr.h
@@ -4,7 +4,7 @@
  *
  *   Internal PFR service functions (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svpostnm.h b/engine/thirdparty/freetype/include/freetype/internal/services/svpostnm.h
index 2b8f6dfe..d19f3adc 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svpostnm.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svpostnm.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType PostScript name services (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svprop.h b/engine/thirdparty/freetype/include/freetype/internal/services/svprop.h
index 932ce32e..ba39c0dd 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svprop.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svprop.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType property service (specification).
  *
- * Copyright (C) 2012-2023 by
+ * Copyright (C) 2012-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svpscmap.h b/engine/thirdparty/freetype/include/freetype/internal/services/svpscmap.h
index 6e599f3a..d4908ee4 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svpscmap.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svpscmap.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType PostScript charmap service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svpsinfo.h b/engine/thirdparty/freetype/include/freetype/internal/services/svpsinfo.h
index 09c4cdcc..2aadcdd0 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svpsinfo.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svpsinfo.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType PostScript info service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svsfnt.h b/engine/thirdparty/freetype/include/freetype/internal/services/svsfnt.h
index f98df2ef..9e0f4ff2 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svsfnt.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svsfnt.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType SFNT table loading service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svttcmap.h b/engine/thirdparty/freetype/include/freetype/internal/services/svttcmap.h
index 5f9eb02d..250886bc 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svttcmap.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svttcmap.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType TrueType/sfnt cmap extra information service.
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * Masatake YAMATO, Redhat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svtteng.h b/engine/thirdparty/freetype/include/freetype/internal/services/svtteng.h
index ad577cb2..14967529 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svtteng.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svtteng.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType TrueType engine query service (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svttglyf.h b/engine/thirdparty/freetype/include/freetype/internal/services/svttglyf.h
index ca6fff74..f190b398 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svttglyf.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svttglyf.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType TrueType glyph service.
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/services/svwinfnt.h b/engine/thirdparty/freetype/include/freetype/internal/services/svwinfnt.h
index 002923f8..49f3fb7f 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/services/svwinfnt.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/services/svwinfnt.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType Windows FNT/FONT service (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/sfnt.h b/engine/thirdparty/freetype/include/freetype/internal/sfnt.h
index a2d4e15b..35e4e73a 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/sfnt.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/sfnt.h
@@ -4,7 +4,7 @@
  *
  *   High-level 'sfnt' driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -924,6 +924,7 @@ FT_BEGIN_HEADER
     /* this field was called `load_kerning' up to version 2.1.10 */
     TT_Load_Table_Func  load_kern;
 
+    TT_Load_Table_Func  load_gpos;
     TT_Load_Table_Func  load_gasp;
     TT_Load_Table_Func  load_pclt;
 
@@ -944,6 +945,8 @@ FT_BEGIN_HEADER
 
     /* new elements introduced after version 2.1.10 */
 
+    TT_Face_GetKerningFunc  get_gpos_kerning;
+
     /* load the font directory, i.e., the offset table and */
     /* the table directory                                 */
     TT_Load_Table_Func    load_font_dir;
@@ -1002,6 +1005,7 @@ FT_BEGIN_HEADER
           load_name_,                    \
           free_name_,                    \
           load_kern_,                    \
+          load_gpos_,                    \
           load_gasp_,                    \
           load_pclt_,                    \
           load_bhed_,                    \
@@ -1009,6 +1013,7 @@ FT_BEGIN_HEADER
           get_psname_,                   \
           free_psnames_,                 \
           get_kerning_,                  \
+          get_gpos_kerning_,             \
           load_font_dir_,                \
           load_hmtx_,                    \
           load_eblc_,                    \
@@ -1050,6 +1055,7 @@ FT_BEGIN_HEADER
     load_name_,                          \
     free_name_,                          \
     load_kern_,                          \
+    load_gpos_,                          \
     load_gasp_,                          \
     load_pclt_,                          \
     load_bhed_,                          \
@@ -1057,6 +1063,7 @@ FT_BEGIN_HEADER
     get_psname_,                         \
     free_psnames_,                       \
     get_kerning_,                        \
+    get_gpos_kerning_,                   \
     load_font_dir_,                      \
     load_hmtx_,                          \
     load_eblc_,                          \
diff --git a/engine/thirdparty/freetype/include/freetype/internal/svginterface.h b/engine/thirdparty/freetype/include/freetype/internal/svginterface.h
index f464b2c0..68c99efb 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/svginterface.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/svginterface.h
@@ -4,7 +4,7 @@
  *
  *   Interface of ot-svg module (specification only).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/internal/t1types.h b/engine/thirdparty/freetype/include/freetype/internal/t1types.h
index b9c94398..1821ae5c 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/t1types.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/t1types.h
@@ -5,7 +5,7 @@
  *   Basic Type1/Type2 type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -21,7 +21,7 @@
 #define T1TYPES_H_
 
 
-#include <freetype/t1tables.h>
+#include <freetype/ftmm.h>
 #include <freetype/internal/pshints.h>
 #include <freetype/internal/ftserv.h>
 #include <freetype/internal/fthash.h>
@@ -137,6 +137,54 @@ FT_BEGIN_HEADER
   } CID_SubrsRec, *CID_Subrs;
 
 
+  /* this structure is used to store the BlendDesignMap entry for an axis */
+  typedef struct  PS_DesignMap_
+  {
+    FT_Byte    num_points;
+    FT_Long*   design_points;
+    FT_Fixed*  blend_points;
+
+  } PS_DesignMapRec, *PS_DesignMap;
+
+  /* backward compatible definition */
+  typedef PS_DesignMapRec  T1_DesignMap;
+
+
+  typedef struct  PS_BlendRec_
+  {
+    FT_UInt          num_designs;
+    FT_UInt          num_axis;
+
+    FT_String*       axis_names[T1_MAX_MM_AXIS];
+    FT_Fixed*        design_pos[T1_MAX_MM_DESIGNS];
+    PS_DesignMapRec  design_map[T1_MAX_MM_AXIS];
+
+    FT_Fixed*        weight_vector;
+    FT_Fixed*        default_weight_vector;
+
+    PS_FontInfo      font_infos[T1_MAX_MM_DESIGNS + 1];
+    PS_Private       privates  [T1_MAX_MM_DESIGNS + 1];
+
+    FT_ULong         blend_bitflags;
+
+    FT_BBox*         bboxes    [T1_MAX_MM_DESIGNS + 1];
+
+    /* since 2.3.0 */
+
+    /* undocumented, optional: the default design instance;   */
+    /* corresponds to default_weight_vector --                */
+    /* num_default_design_vector == 0 means it is not present */
+    /* in the font and associated metrics files               */
+    FT_UInt          default_design_vector[T1_MAX_MM_DESIGNS];
+    FT_UInt          num_default_design_vector;
+
+  } PS_BlendRec, *PS_Blend;
+
+
+  /* backward compatible definition */
+  typedef PS_BlendRec  T1_Blend;
+
+
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
diff --git a/engine/thirdparty/freetype/include/freetype/internal/tttypes.h b/engine/thirdparty/freetype/include/freetype/internal/tttypes.h
index b9788c78..7053e656 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/tttypes.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/tttypes.h
@@ -5,7 +5,7 @@
  *   Basic SFNT/TrueType type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -24,6 +24,7 @@
 #include <freetype/tttables.h>
 #include <freetype/internal/ftobjs.h>
 #include <freetype/ftcolor.h>
+#include "freetype/fttypes.h"
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
 #include <freetype/ftmm.h>
@@ -1581,6 +1582,11 @@ FT_BEGIN_HEADER
     FT_UInt32             kern_avail_bits;
     FT_UInt32             kern_order_bits;
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+    FT_Byte*              gpos_table;
+    FT_Bool               gpos_kerning_available;
+#endif
+
 #ifdef TT_CONFIG_OPTION_BDF
     TT_BDFRec             bdf;
 #endif /* TT_CONFIG_OPTION_BDF */
@@ -1649,9 +1655,9 @@ FT_BEGIN_HEADER
   {
     FT_Memory   memory;
     FT_UShort   max_points;
-    FT_Short    max_contours;
+    FT_UShort   max_contours;
     FT_UShort   n_points;    /* number of points in zone    */
-    FT_Short    n_contours;  /* number of contours          */
+    FT_UShort   n_contours;  /* number of contours          */
 
     FT_Vector*  org;         /* original point coordinates  */
     FT_Vector*  cur;         /* current point coordinates   */
diff --git a/engine/thirdparty/freetype/include/freetype/internal/wofftypes.h b/engine/thirdparty/freetype/include/freetype/internal/wofftypes.h
index 0c1d8eea..4a169d12 100644
--- a/engine/thirdparty/freetype/include/freetype/internal/wofftypes.h
+++ b/engine/thirdparty/freetype/include/freetype/internal/wofftypes.h
@@ -5,7 +5,7 @@
  *   Basic WOFF/WOFF2 type definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/otsvg.h b/engine/thirdparty/freetype/include/freetype/otsvg.h
index bfe9a6ab..9d356938 100644
--- a/engine/thirdparty/freetype/include/freetype/otsvg.h
+++ b/engine/thirdparty/freetype/include/freetype/otsvg.h
@@ -4,7 +4,7 @@
  *
  *   Interface for OT-SVG support related things (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/t1tables.h b/engine/thirdparty/freetype/include/freetype/t1tables.h
index 1aecfbbd..fbd558aa 100644
--- a/engine/thirdparty/freetype/include/freetype/t1tables.h
+++ b/engine/thirdparty/freetype/include/freetype/t1tables.h
@@ -5,7 +5,7 @@
  *   Basic Type 1/Type 2 tables definitions and interface (specification
  *   only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -269,64 +269,6 @@ FT_BEGIN_HEADER
   /* */
 
 
-  /* maximum number of Multiple Masters designs, as defined in the spec */
-#define T1_MAX_MM_DESIGNS     16
-
-  /* maximum number of Multiple Masters axes, as defined in the spec */
-#define T1_MAX_MM_AXIS        4
-
-  /* maximum number of elements in a design map */
-#define T1_MAX_MM_MAP_POINTS  20
-
-
-  /* this structure is used to store the BlendDesignMap entry for an axis */
-  typedef struct  PS_DesignMap_
-  {
-    FT_Byte    num_points;
-    FT_Long*   design_points;
-    FT_Fixed*  blend_points;
-
-  } PS_DesignMapRec, *PS_DesignMap;
-
-  /* backward compatible definition */
-  typedef PS_DesignMapRec  T1_DesignMap;
-
-
-  typedef struct  PS_BlendRec_
-  {
-    FT_UInt          num_designs;
-    FT_UInt          num_axis;
-
-    FT_String*       axis_names[T1_MAX_MM_AXIS];
-    FT_Fixed*        design_pos[T1_MAX_MM_DESIGNS];
-    PS_DesignMapRec  design_map[T1_MAX_MM_AXIS];
-
-    FT_Fixed*        weight_vector;
-    FT_Fixed*        default_weight_vector;
-
-    PS_FontInfo      font_infos[T1_MAX_MM_DESIGNS + 1];
-    PS_Private       privates  [T1_MAX_MM_DESIGNS + 1];
-
-    FT_ULong         blend_bitflags;
-
-    FT_BBox*         bboxes    [T1_MAX_MM_DESIGNS + 1];
-
-    /* since 2.3.0 */
-
-    /* undocumented, optional: the default design instance;   */
-    /* corresponds to default_weight_vector --                */
-    /* num_default_design_vector == 0 means it is not present */
-    /* in the font and associated metrics files               */
-    FT_UInt          default_design_vector[T1_MAX_MM_DESIGNS];
-    FT_UInt          num_default_design_vector;
-
-  } PS_BlendRec, *PS_Blend;
-
-
-  /* backward compatible definition */
-  typedef PS_BlendRec  T1_Blend;
-
-
   /**************************************************************************
    *
    * @struct:
diff --git a/engine/thirdparty/freetype/include/freetype/ttnameid.h b/engine/thirdparty/freetype/include/freetype/ttnameid.h
index e31c68b9..d5d470e3 100644
--- a/engine/thirdparty/freetype/include/freetype/ttnameid.h
+++ b/engine/thirdparty/freetype/include/freetype/ttnameid.h
@@ -4,7 +4,7 @@
  *
  *   TrueType name ID definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/freetype/tttables.h b/engine/thirdparty/freetype/include/freetype/tttables.h
index a9f60e76..2cf0ff1b 100644
--- a/engine/thirdparty/freetype/include/freetype/tttables.h
+++ b/engine/thirdparty/freetype/include/freetype/tttables.h
@@ -5,7 +5,7 @@
  *   Basic SFNT/TrueType tables definitions and interface
  *   (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -838,8 +838,9 @@ FT_BEGIN_HEADER
    *     The target charmap.
    *
    * @return:
-   *   The format of `charmap`.  If `charmap` doesn't belong to an SFNT face,
-   *   return -1.
+   *   The format of `charmap`.  If `charmap` doesn't belong to an SFNT face
+   *   (including the synthetic Unicode charmap sometimes created by
+   *   FreeType), return -1.
    */
   FT_EXPORT( FT_Long )
   FT_Get_CMap_Format( FT_CharMap  charmap );
diff --git a/engine/thirdparty/freetype/include/freetype/tttags.h b/engine/thirdparty/freetype/include/freetype/tttags.h
index 9bf4fca2..da0af5d3 100644
--- a/engine/thirdparty/freetype/include/freetype/tttags.h
+++ b/engine/thirdparty/freetype/include/freetype/tttags.h
@@ -4,7 +4,7 @@
  *
  *   Tags for TrueType and OpenType tables (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/include/ft2build.h b/engine/thirdparty/freetype/include/ft2build.h
index 58491cee..d3d76850 100644
--- a/engine/thirdparty/freetype/include/ft2build.h
+++ b/engine/thirdparty/freetype/include/ft2build.h
@@ -4,7 +4,7 @@
  *
  *   FreeType 2 build and setup macros.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afblue.c b/engine/thirdparty/freetype/src/autofit/afblue.c
index d7655b9b..ea83969c 100644
--- a/engine/thirdparty/freetype/src/autofit/afblue.c
+++ b/engine/thirdparty/freetype/src/autofit/afblue.c
@@ -7,7 +7,7 @@
  *
  *   Auto-fitter data for blue strings (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afblue.cin b/engine/thirdparty/freetype/src/autofit/afblue.cin
index d561c509..d2270fac 100644
--- a/engine/thirdparty/freetype/src/autofit/afblue.cin
+++ b/engine/thirdparty/freetype/src/autofit/afblue.cin
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter data for blue strings (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afblue.h b/engine/thirdparty/freetype/src/autofit/afblue.h
index 76f2f47c..2aa9d098 100644
--- a/engine/thirdparty/freetype/src/autofit/afblue.h
+++ b/engine/thirdparty/freetype/src/autofit/afblue.h
@@ -7,7 +7,7 @@
  *
  *   Auto-fitter data for blue strings (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afblue.hin b/engine/thirdparty/freetype/src/autofit/afblue.hin
index 6a31298e..38031505 100644
--- a/engine/thirdparty/freetype/src/autofit/afblue.hin
+++ b/engine/thirdparty/freetype/src/autofit/afblue.hin
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter data for blue strings (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afcjk.c b/engine/thirdparty/freetype/src/autofit/afcjk.c
index f414289a..869b6048 100644
--- a/engine/thirdparty/freetype/src/autofit/afcjk.c
+++ b/engine/thirdparty/freetype/src/autofit/afcjk.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for CJK writing system (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afcjk.h b/engine/thirdparty/freetype/src/autofit/afcjk.h
index f380ef6e..bc5aaf12 100644
--- a/engine/thirdparty/freetype/src/autofit/afcjk.h
+++ b/engine/thirdparty/freetype/src/autofit/afcjk.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for CJK writing system (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -84,7 +84,7 @@ FT_BEGIN_HEADER
     /* used for horizontal metrics too for CJK */
     FT_Bool        control_overshoot;
     FT_UInt        blue_count;
-    AF_CJKBlueRec  blues[AF_BLUE_STRINGSET_MAX];
+    AF_CJKBlueRec  blues[AF_BLUE_STRINGSET_MAX_LEN];
 
     FT_Fixed       org_scale;
     FT_Pos         org_delta;
diff --git a/engine/thirdparty/freetype/src/autofit/afcover.h b/engine/thirdparty/freetype/src/autofit/afcover.h
index 102ed427..7980cf2e 100644
--- a/engine/thirdparty/freetype/src/autofit/afcover.h
+++ b/engine/thirdparty/freetype/src/autofit/afcover.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter coverages (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afdummy.c b/engine/thirdparty/freetype/src/autofit/afdummy.c
index a4629b52..ad667d2e 100644
--- a/engine/thirdparty/freetype/src/autofit/afdummy.c
+++ b/engine/thirdparty/freetype/src/autofit/afdummy.c
@@ -5,7 +5,7 @@
  *   Auto-fitter dummy routines to be used if no hinting should be
  *   performed (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afdummy.h b/engine/thirdparty/freetype/src/autofit/afdummy.h
index a7af3f62..613c2f88 100644
--- a/engine/thirdparty/freetype/src/autofit/afdummy.h
+++ b/engine/thirdparty/freetype/src/autofit/afdummy.h
@@ -5,7 +5,7 @@
  *   Auto-fitter dummy routines to be used if no hinting should be
  *   performed (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/aferrors.h b/engine/thirdparty/freetype/src/autofit/aferrors.h
index 88faf05c..ae584ff0 100644
--- a/engine/thirdparty/freetype/src/autofit/aferrors.h
+++ b/engine/thirdparty/freetype/src/autofit/aferrors.h
@@ -4,7 +4,7 @@
  *
  *   Autofitter error codes (specification only).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afglobal.c b/engine/thirdparty/freetype/src/autofit/afglobal.c
index b1957570..b7403fa6 100644
--- a/engine/thirdparty/freetype/src/autofit/afglobal.c
+++ b/engine/thirdparty/freetype/src/autofit/afglobal.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter routines to compute global hinting values (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afglobal.h b/engine/thirdparty/freetype/src/autofit/afglobal.h
index 66170e41..ddb54c89 100644
--- a/engine/thirdparty/freetype/src/autofit/afglobal.h
+++ b/engine/thirdparty/freetype/src/autofit/afglobal.h
@@ -5,7 +5,7 @@
  *   Auto-fitter routines to compute global hinting values
  *   (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afhints.c b/engine/thirdparty/freetype/src/autofit/afhints.c
index e4a378fb..96ffe343 100644
--- a/engine/thirdparty/freetype/src/autofit/afhints.c
+++ b/engine/thirdparty/freetype/src/autofit/afhints.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -979,8 +979,8 @@
       /* compute coordinates & Bezier flags, next and prev */
       {
         FT_Vector*  vec           = outline->points;
-        char*       tag           = outline->tags;
-        FT_Short    endpoint      = outline->contours[0];
+        FT_Byte*    tag           = outline->tags;
+        FT_UShort   endpoint      = outline->contours[0];
         AF_Point    end           = points + endpoint;
         AF_Point    prev          = end;
         FT_Int      contour_index = 0;
@@ -1046,16 +1046,16 @@
 
       /* set up the contours array */
       {
-        AF_Point*  contour       = hints->contours;
-        AF_Point*  contour_limit = contour + hints->num_contours;
-        short*     end           = outline->contours;
-        short      idx           = 0;
+        AF_Point*   contour       = hints->contours;
+        AF_Point*   contour_limit = contour + hints->num_contours;
+        FT_UShort*  end           = outline->contours;
+        FT_Int      idx           = 0;
 
 
         for ( ; contour < contour_limit; contour++, end++ )
         {
           contour[0] = points + idx;
-          idx        = (short)( end[0] + 1 );
+          idx        = *end + 1;
         }
       }
 
@@ -1292,7 +1292,7 @@
     AF_Point    point = hints->points;
     AF_Point    limit = point + hints->num_points;
     FT_Vector*  vec   = outline->points;
-    char*       tag   = outline->tags;
+    FT_Byte*    tag   = outline->tags;
 
 
     for ( ; point < limit; point++, vec++, tag++ )
diff --git a/engine/thirdparty/freetype/src/autofit/afhints.h b/engine/thirdparty/freetype/src/autofit/afhints.h
index d1cf9529..76fe8300 100644
--- a/engine/thirdparty/freetype/src/autofit/afhints.h
+++ b/engine/thirdparty/freetype/src/autofit/afhints.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afindic.c b/engine/thirdparty/freetype/src/autofit/afindic.c
index 7fb12c63..c6d23efd 100644
--- a/engine/thirdparty/freetype/src/autofit/afindic.c
+++ b/engine/thirdparty/freetype/src/autofit/afindic.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for Indic writing system (body).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afindic.h b/engine/thirdparty/freetype/src/autofit/afindic.h
index 3eb67f63..a7f73f25 100644
--- a/engine/thirdparty/freetype/src/autofit/afindic.h
+++ b/engine/thirdparty/freetype/src/autofit/afindic.h
@@ -5,7 +5,7 @@
  *   Auto-fitter hinting routines for Indic writing system
  *   (specification).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/aflatin.c b/engine/thirdparty/freetype/src/autofit/aflatin.c
index b86367aa..89287f7e 100644
--- a/engine/thirdparty/freetype/src/autofit/aflatin.c
+++ b/engine/thirdparty/freetype/src/autofit/aflatin.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter hinting routines for latin writing system (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -981,7 +981,7 @@
       /* `ref' and `shoot' values of two blue zones must not overlap */
 
       FT_UInt       i;
-      AF_LatinBlue  blue_sorted[AF_BLUE_STRINGSET_MAX_LEN + 2];
+      AF_LatinBlue  blue_sorted[AF_BLUE_STRINGSET_MAX_LEN];
 
 
       for ( i = 0; i < axis->blue_count; i++ )
@@ -1263,10 +1263,9 @@
               max_height = FT_MAX( max_height, -Axis->blues[nn].descender );
             }
 
-            dist  = FT_ABS( FT_MulFix( max_height, new_scale - scale ) );
-            dist &= ~127;
+            dist  = FT_MulFix( max_height, new_scale - scale );
 
-            if ( dist == 0 )
+            if ( -128 < dist && dist < 128 )
             {
               FT_TRACE5(( "af_latin_metrics_scale_dim:"
                           " x height alignment (style `%s'):\n",
diff --git a/engine/thirdparty/freetype/src/autofit/aflatin.h b/engine/thirdparty/freetype/src/autofit/aflatin.h
index 31aa91d3..54e50615 100644
--- a/engine/thirdparty/freetype/src/autofit/aflatin.h
+++ b/engine/thirdparty/freetype/src/autofit/aflatin.h
@@ -5,7 +5,7 @@
  *   Auto-fitter hinting routines for latin writing system
  *   (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -98,7 +98,7 @@ FT_BEGIN_HEADER
 
     /* ignored for horizontal metrics */
     FT_UInt          blue_count;
-    AF_LatinBlueRec  blues[AF_BLUE_STRINGSET_MAX];
+    AF_LatinBlueRec  blues[AF_BLUE_STRINGSET_MAX_LEN];
 
     FT_Fixed         org_scale;
     FT_Pos           org_delta;
diff --git a/engine/thirdparty/freetype/src/autofit/afloader.c b/engine/thirdparty/freetype/src/autofit/afloader.c
index 7c47d562..af1d59a6 100644
--- a/engine/thirdparty/freetype/src/autofit/afloader.c
+++ b/engine/thirdparty/freetype/src/autofit/afloader.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter glyph loading routines (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afloader.h b/engine/thirdparty/freetype/src/autofit/afloader.h
index e4e197e3..99f0e15f 100644
--- a/engine/thirdparty/freetype/src/autofit/afloader.h
+++ b/engine/thirdparty/freetype/src/autofit/afloader.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter glyph loading routines (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afmodule.c b/engine/thirdparty/freetype/src/autofit/afmodule.c
index 20a6b96b..726f6ca2 100644
--- a/engine/thirdparty/freetype/src/autofit/afmodule.c
+++ b/engine/thirdparty/freetype/src/autofit/afmodule.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter module implementation (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -438,7 +438,7 @@
     AF_Module  module = (AF_Module)module_;
 
     FT_Error   error  = FT_Err_Ok;
-    FT_Memory  memory = module->root.library->memory;
+    FT_Memory  memory = module->root.memory;
 
 #ifdef FT_DEBUG_AUTOFIT
 
diff --git a/engine/thirdparty/freetype/src/autofit/afmodule.h b/engine/thirdparty/freetype/src/autofit/afmodule.h
index 4b8b4562..91a1abfe 100644
--- a/engine/thirdparty/freetype/src/autofit/afmodule.h
+++ b/engine/thirdparty/freetype/src/autofit/afmodule.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter module implementation (specification).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afranges.c b/engine/thirdparty/freetype/src/autofit/afranges.c
index cfcaf340..007b4328 100644
--- a/engine/thirdparty/freetype/src/autofit/afranges.c
+++ b/engine/thirdparty/freetype/src/autofit/afranges.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter Unicode script ranges (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afranges.h b/engine/thirdparty/freetype/src/autofit/afranges.h
index 5775738b..813b3ee7 100644
--- a/engine/thirdparty/freetype/src/autofit/afranges.h
+++ b/engine/thirdparty/freetype/src/autofit/afranges.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter Unicode script ranges (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afscript.h b/engine/thirdparty/freetype/src/autofit/afscript.h
index 3a101937..0a83d771 100644
--- a/engine/thirdparty/freetype/src/autofit/afscript.h
+++ b/engine/thirdparty/freetype/src/autofit/afscript.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter scripts (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afshaper.c b/engine/thirdparty/freetype/src/autofit/afshaper.c
index abc6f1d2..df0f46ad 100644
--- a/engine/thirdparty/freetype/src/autofit/afshaper.c
+++ b/engine/thirdparty/freetype/src/autofit/afshaper.c
@@ -4,7 +4,7 @@
  *
  *   HarfBuzz interface for accessing OpenType features (body).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afshaper.h b/engine/thirdparty/freetype/src/autofit/afshaper.h
index 054a18ff..2eb03bb5 100644
--- a/engine/thirdparty/freetype/src/autofit/afshaper.h
+++ b/engine/thirdparty/freetype/src/autofit/afshaper.h
@@ -4,7 +4,7 @@
  *
  *   HarfBuzz interface for accessing OpenType features (specification).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afstyles.h b/engine/thirdparty/freetype/src/autofit/afstyles.h
index 73ebef01..7a33f37a 100644
--- a/engine/thirdparty/freetype/src/autofit/afstyles.h
+++ b/engine/thirdparty/freetype/src/autofit/afstyles.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter styles (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/aftypes.h b/engine/thirdparty/freetype/src/autofit/aftypes.h
index 66151944..27e4185e 100644
--- a/engine/thirdparty/freetype/src/autofit/aftypes.h
+++ b/engine/thirdparty/freetype/src/autofit/aftypes.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter types (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afws-decl.h b/engine/thirdparty/freetype/src/autofit/afws-decl.h
index 48c888af..b78745af 100644
--- a/engine/thirdparty/freetype/src/autofit/afws-decl.h
+++ b/engine/thirdparty/freetype/src/autofit/afws-decl.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter writing system declarations (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/afws-iter.h b/engine/thirdparty/freetype/src/autofit/afws-iter.h
index a0a686f8..c86d609a 100644
--- a/engine/thirdparty/freetype/src/autofit/afws-iter.h
+++ b/engine/thirdparty/freetype/src/autofit/afws-iter.h
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter writing systems iterator (specification only).
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/autofit/autofit.c b/engine/thirdparty/freetype/src/autofit/autofit.c
index 8bd609b5..de5ec7c7 100644
--- a/engine/thirdparty/freetype/src/autofit/autofit.c
+++ b/engine/thirdparty/freetype/src/autofit/autofit.c
@@ -4,7 +4,7 @@
  *
  *   Auto-fitter module (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftadvanc.c b/engine/thirdparty/freetype/src/base/ftadvanc.c
index de25476f..717f7d08 100644
--- a/engine/thirdparty/freetype/src/base/ftadvanc.c
+++ b/engine/thirdparty/freetype/src/base/ftadvanc.c
@@ -4,7 +4,7 @@
  *
  *   Quick computation of advance widths (body).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftbase.c b/engine/thirdparty/freetype/src/base/ftbase.c
index 156510f0..50805cce 100644
--- a/engine/thirdparty/freetype/src/base/ftbase.c
+++ b/engine/thirdparty/freetype/src/base/ftbase.c
@@ -4,7 +4,7 @@
  *
  *   Single object library component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftbase.h b/engine/thirdparty/freetype/src/base/ftbase.h
index 00790d3b..1d98b26d 100644
--- a/engine/thirdparty/freetype/src/base/ftbase.h
+++ b/engine/thirdparty/freetype/src/base/ftbase.h
@@ -4,7 +4,7 @@
  *
  *   Private functions used in the `base' module (specification).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftbbox.c b/engine/thirdparty/freetype/src/base/ftbbox.c
index 385fea40..d6aa5d56 100644
--- a/engine/thirdparty/freetype/src/base/ftbbox.c
+++ b/engine/thirdparty/freetype/src/base/ftbbox.c
@@ -4,7 +4,7 @@
  *
  *   FreeType bbox computation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
@@ -489,7 +489,7 @@
       return FT_THROW( Invalid_Outline );
 
     /* if outline is empty, return (0,0,0,0) */
-    if ( outline->n_points == 0 || outline->n_contours <= 0 )
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
     {
       abbox->xMin = abbox->xMax = 0;
       abbox->yMin = abbox->yMax = 0;
diff --git a/engine/thirdparty/freetype/src/base/ftbdf.c b/engine/thirdparty/freetype/src/base/ftbdf.c
index f697c00f..d8e9fd7e 100644
--- a/engine/thirdparty/freetype/src/base/ftbdf.c
+++ b/engine/thirdparty/freetype/src/base/ftbdf.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing BDF-specific strings (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftbitmap.c b/engine/thirdparty/freetype/src/base/ftbitmap.c
index 1c93648d..4be14567 100644
--- a/engine/thirdparty/freetype/src/base/ftbitmap.c
+++ b/engine/thirdparty/freetype/src/base/ftbitmap.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility functions for bitmaps (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftcalc.c b/engine/thirdparty/freetype/src/base/ftcalc.c
index c5bc7e3b..92de09ed 100644
--- a/engine/thirdparty/freetype/src/base/ftcalc.c
+++ b/engine/thirdparty/freetype/src/base/ftcalc.c
@@ -4,7 +4,7 @@
  *
  *   Arithmetic computations (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -69,13 +69,15 @@
 
   /* transfer sign, leaving a positive number;                        */
   /* we need an unsigned value to safely negate INT_MIN (or LONG_MIN) */
-#define FT_MOVE_SIGN( x, x_unsigned, s ) \
-  FT_BEGIN_STMNT                         \
-    if ( x < 0 )                         \
-    {                                    \
-      x_unsigned = 0U - (x_unsigned);    \
-      s          = -s;                   \
-    }                                    \
+#define FT_MOVE_SIGN( utype, x, x_unsigned, s ) \
+  FT_BEGIN_STMNT                                \
+    if ( x < 0 )                                \
+    {                                           \
+      x_unsigned = 0U - (utype)x;               \
+      s          = -s;                          \
+    }                                           \
+    else                                        \
+      x_unsigned = (utype)x;                    \
   FT_END_STMNT
 
   /* The following three functions are available regardless of whether */
@@ -179,13 +181,9 @@
     FT_Long    d_;
 
 
-    a = (FT_UInt64)a_;
-    b = (FT_UInt64)b_;
-    c = (FT_UInt64)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt64, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt64, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt64, c_, c, s );
 
     d = c > 0 ? ( a * b + ( c >> 1 ) ) / c
               : 0x7FFFFFFFUL;
@@ -208,13 +206,9 @@
     FT_Long    d_;
 
 
-    a = (FT_UInt64)a_;
-    b = (FT_UInt64)b_;
-    c = (FT_UInt64)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt64, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt64, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt64, c_, c, s );
 
     d = c > 0 ? a * b / c
               : 0x7FFFFFFFUL;
@@ -257,11 +251,8 @@
     FT_Long    q_;
 
 
-    a = (FT_UInt64)a_;
-    b = (FT_UInt64)b_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
+    FT_MOVE_SIGN( FT_UInt64, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt64, b_, b, s );
 
     q = b > 0 ? ( ( a << 16 ) + ( b >> 1 ) ) / b
               : 0x7FFFFFFFUL;
@@ -422,13 +413,9 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-    c = (FT_UInt32)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, c_, c, s );
 
     if ( c == 0 )
       a = 0x7FFFFFFFUL;
@@ -470,13 +457,9 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-    c = (FT_UInt32)c_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
-    FT_MOVE_SIGN( c_, c, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, c_, c, s );
 
     if ( c == 0 )
       a = 0x7FFFFFFFUL;
@@ -575,11 +558,8 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
 
     if ( a + ( b >> 8 ) <= 8190UL )
       a = ( a * b + 0x8000UL ) >> 16;
@@ -614,11 +594,8 @@
 
     /* XXX: this function does not allow 64-bit arguments */
 
-    a = (FT_UInt32)a_;
-    b = (FT_UInt32)b_;
-
-    FT_MOVE_SIGN( a_, a, s );
-    FT_MOVE_SIGN( b_, b, s );
+    FT_MOVE_SIGN( FT_UInt32, a_, a, s );
+    FT_MOVE_SIGN( FT_UInt32, b_, b, s );
 
     if ( b == 0 )
     {
@@ -829,11 +806,8 @@
     FT_Int     sx = 1, sy = 1, shift;
 
 
-    x = (FT_UInt32)x_;
-    y = (FT_UInt32)y_;
-
-    FT_MOVE_SIGN( x_, x, sx );
-    FT_MOVE_SIGN( y_, y, sy );
+    FT_MOVE_SIGN( FT_UInt32, x_, x, sx );
+    FT_MOVE_SIGN( FT_UInt32, y_, y, sy );
 
     /* trivial cases */
     if ( x == 0 )
@@ -913,44 +887,72 @@
   }
 
 
-#if 0
-
   /* documentation is in ftcalc.h */
 
-  FT_BASE_DEF( FT_Int32 )
-  FT_SqrtFixed( FT_Int32  x )
+  FT_BASE_DEF( FT_UInt32 )
+  FT_SqrtFixed( FT_UInt32  v )
   {
-    FT_UInt32  root, rem_hi, rem_lo, test_div;
-    FT_Int     count;
+    if ( v == 0 )
+      return 0;
 
+#ifndef FT_INT64
 
-    root = 0;
-
-    if ( x > 0 )
+    /* Algorithm by Christophe Meessen (1993) with overflow fixed and     */
+    /* rounding added.  Any unsigned fixed 16.16 argument is acceptable.  */
+    /* However, this algorithm is slower than the Babylonian method with  */
+    /* a good initial guess.  We only use it for large 32-bit values when */
+    /* 64-bit computations are not desirable.                             */
+    else if ( v > 0x10000U )
     {
-      rem_hi = 0;
-      rem_lo = (FT_UInt32)x;
-      count  = 24;
+      FT_UInt32  r = v >> 1;
+      FT_UInt32  q = ( v & 1 ) << 15;
+      FT_UInt32  b = 0x20000000;
+      FT_UInt32  t;
+
+
       do
       {
-        rem_hi   = ( rem_hi << 2 ) | ( rem_lo >> 30 );
-        rem_lo <<= 2;
-        root   <<= 1;
-        test_div = ( root << 1 ) + 1;
-
-        if ( rem_hi >= test_div )
+        t = q + b;
+        if ( r >= t )
         {
-          rem_hi -= test_div;
-          root   += 1;
+          r -= t;
+          q  = t + b;  /* equivalent to q += 2*b */
         }
-      } while ( --count );
+        r <<= 1;
+        b >>= 1;
+
+      } while ( b > 0x10 );  /* exactly 25 cycles */
+
+      return ( q + 0x40 ) >> 7;
     }
+    else
+    {
+      FT_UInt32  r = ( v << 16 ) - 1;
 
-    return (FT_Int32)root;
+#else /* FT_INT64 */
+
+    else
+    {
+      FT_UInt64  r = ( (FT_UInt64)v << 16 ) - 1;
+
+#endif /* FT_INT64 */
+
+      FT_UInt32  q = 1 << ( ( 17 + FT_MSB( v ) ) >> 1 );
+      FT_UInt32  t;
+
+
+      /* Babylonian method with rounded-up division */
+      do
+      {
+        t = q;
+        q = ( t + (FT_UInt32)( r / t ) + 1 ) >> 1;
+
+      } while ( q != t );  /* less than 6 cycles */
+
+      return q;
+    }
   }
 
-#endif /* 0 */
-
 
   /* documentation is in ftcalc.h */
 
@@ -1094,11 +1096,8 @@
       FT_UInt32  factor;
 
 
-      scalar = (FT_UInt32)s[i];
-      factor = (FT_UInt32)f[i];
-
-      FT_MOVE_SIGN( s[i], scalar, sign );
-      FT_MOVE_SIGN( f[i], factor, sign );
+      FT_MOVE_SIGN( FT_UInt32, s[i], scalar, sign );
+      FT_MOVE_SIGN( FT_UInt32, f[i], factor, sign );
 
       ft_multo64( scalar, factor, &multResult );
 
diff --git a/engine/thirdparty/freetype/src/base/ftcid.c b/engine/thirdparty/freetype/src/base/ftcid.c
index 866cd23e..4f2deb19 100644
--- a/engine/thirdparty/freetype/src/base/ftcid.c
+++ b/engine/thirdparty/freetype/src/base/ftcid.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing CID font information.
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * Derek Clegg and Michael Toftdal.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftcolor.c b/engine/thirdparty/freetype/src/base/ftcolor.c
index bcd6e893..c6bf2a3c 100644
--- a/engine/thirdparty/freetype/src/base/ftcolor.c
+++ b/engine/thirdparty/freetype/src/base/ftcolor.c
@@ -4,7 +4,7 @@
  *
  *   FreeType's glyph color management (body).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftdbgmem.c b/engine/thirdparty/freetype/src/base/ftdbgmem.c
index 8fab50dd..902a5dc8 100644
--- a/engine/thirdparty/freetype/src/base/ftdbgmem.c
+++ b/engine/thirdparty/freetype/src/base/ftdbgmem.c
@@ -4,7 +4,7 @@
  *
  *   Memory debugger (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftdebug.c b/engine/thirdparty/freetype/src/base/ftdebug.c
index 61c4563b..11307eaa 100644
--- a/engine/thirdparty/freetype/src/base/ftdebug.c
+++ b/engine/thirdparty/freetype/src/base/ftdebug.c
@@ -4,7 +4,7 @@
  *
  *   Debugging and logging component (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/fterrors.c b/engine/thirdparty/freetype/src/base/fterrors.c
index 5ad9709c..61041a37 100644
--- a/engine/thirdparty/freetype/src/base/fterrors.c
+++ b/engine/thirdparty/freetype/src/base/fterrors.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for error code handling.
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * Armin Hasitzka, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftfntfmt.c b/engine/thirdparty/freetype/src/base/ftfntfmt.c
index 0b41f7cc..77b4089e 100644
--- a/engine/thirdparty/freetype/src/base/ftfntfmt.c
+++ b/engine/thirdparty/freetype/src/base/ftfntfmt.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file for font formats (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftfstype.c b/engine/thirdparty/freetype/src/base/ftfstype.c
index ea24e64c..1565c3b7 100644
--- a/engine/thirdparty/freetype/src/base/ftfstype.c
+++ b/engine/thirdparty/freetype/src/base/ftfstype.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file to access FSType data (body).
  *
- * Copyright (C) 2008-2023 by
+ * Copyright (C) 2008-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftgasp.c b/engine/thirdparty/freetype/src/base/ftgasp.c
index 29b7b08b..c63d30e9 100644
--- a/engine/thirdparty/freetype/src/base/ftgasp.c
+++ b/engine/thirdparty/freetype/src/base/ftgasp.c
@@ -4,7 +4,7 @@
  *
  *   Access of TrueType's `gasp' table (body).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftgloadr.c b/engine/thirdparty/freetype/src/base/ftgloadr.c
index 9823d09e..484d98f1 100644
--- a/engine/thirdparty/freetype/src/base/ftgloadr.c
+++ b/engine/thirdparty/freetype/src/base/ftgloadr.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph loader (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg
  *
  * This file is part of the FreeType project, and may only be used,
@@ -355,34 +355,25 @@
   FT_BASE_DEF( void )
   FT_GlyphLoader_Add( FT_GlyphLoader  loader )
   {
-    FT_GlyphLoad  base;
-    FT_GlyphLoad  current;
-
-    FT_Int        n_curr_contours;
-    FT_Int        n_base_points;
-    FT_Int        n;
+    FT_Outline*  base;
+    FT_Outline*  current;
+    FT_Int       n;
 
 
     if ( !loader )
       return;
 
-    base    = &loader->base;
-    current = &loader->current;
-
-    n_curr_contours = current->outline.n_contours;
-    n_base_points   = base->outline.n_points;
-
-    base->outline.n_points =
-      (short)( base->outline.n_points + current->outline.n_points );
-    base->outline.n_contours =
-      (short)( base->outline.n_contours + current->outline.n_contours );
-
-    base->num_subglyphs += current->num_subglyphs;
+    base    = &loader->base.outline;
+    current = &loader->current.outline;
 
     /* adjust contours count in newest outline */
-    for ( n = 0; n < n_curr_contours; n++ )
-      current->outline.contours[n] =
-        (short)( current->outline.contours[n] + n_base_points );
+    for ( n = 0; n < current->n_contours; n++ )
+      current->contours[n] += base->n_points;
+
+    base->n_points   += current->n_points;
+    base->n_contours += current->n_contours;
+
+    loader->base.num_subglyphs += loader->current.num_subglyphs;
 
     /* prepare for another new glyph image */
     FT_GlyphLoader_Prepare( loader );
diff --git a/engine/thirdparty/freetype/src/base/ftglyph.c b/engine/thirdparty/freetype/src/base/ftglyph.c
index 393d4949..1b5849f9 100644
--- a/engine/thirdparty/freetype/src/base/ftglyph.c
+++ b/engine/thirdparty/freetype/src/base/ftglyph.c
@@ -4,7 +4,7 @@
  *
  *   FreeType convenience functions to handle glyphs (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftgxval.c b/engine/thirdparty/freetype/src/base/ftgxval.c
index 6b3c5d24..6e38cb5b 100644
--- a/engine/thirdparty/freetype/src/base/ftgxval.c
+++ b/engine/thirdparty/freetype/src/base/ftgxval.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for validating TrueTypeGX/AAT tables (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO, Redhat K.K,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/base/ftinit.c b/engine/thirdparty/freetype/src/base/ftinit.c
index c9c71d24..9a6c00e1 100644
--- a/engine/thirdparty/freetype/src/base/ftinit.c
+++ b/engine/thirdparty/freetype/src/base/ftinit.c
@@ -4,7 +4,7 @@
  *
  *   FreeType initialization layer (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftlcdfil.c b/engine/thirdparty/freetype/src/base/ftlcdfil.c
index 6c3fd66e..1e69d4da 100644
--- a/engine/thirdparty/freetype/src/base/ftlcdfil.c
+++ b/engine/thirdparty/freetype/src/base/ftlcdfil.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for color filtering of subpixel bitmap glyphs (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftmac.c b/engine/thirdparty/freetype/src/base/ftmac.c
index 492d0553..e8e35627 100644
--- a/engine/thirdparty/freetype/src/base/ftmac.c
+++ b/engine/thirdparty/freetype/src/base/ftmac.c
@@ -8,7 +8,7 @@
  * This file is for Mac OS X only; see builds/mac/ftoldmac.c for
  * classic platforms built by MPW.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -812,6 +812,7 @@
     ResourceIndex  res_index;
     Handle         fond;
     short          num_faces_in_res;
+    FT_Long        count;
 
 
     if ( noErr != FT_FSPathMakeRes( pathname, &res_ref ) )
@@ -821,8 +822,10 @@
     if ( ResError() )
       return FT_THROW( Cannot_Open_Resource );
 
+    res_index        = 1;
     num_faces_in_res = 0;
-    for ( res_index = 1; ; res_index++ )
+    count            = face_index;
+    while ( count >= 0 )
     {
       short  num_faces_in_fond;
 
@@ -834,15 +837,21 @@
       num_faces_in_fond  = count_faces( fond, pathname );
       num_faces_in_res  += num_faces_in_fond;
 
-      if ( 0 <= face_index && face_index < num_faces_in_fond && error )
-        error = FT_New_Face_From_FOND( library, fond, face_index, aface );
+      if ( count < num_faces_in_fond )
+        error = FT_New_Face_From_FOND( library, fond, count, aface );
 
-      face_index -= num_faces_in_fond;
+      res_index++;
+      count -= num_faces_in_fond;
     }
 
     CloseResFile( res_ref );
+
     if ( !error && aface && *aface )
-      (*aface)->num_faces = num_faces_in_res;
+    {
+      (*aface)->num_faces  = num_faces_in_res;
+      (*aface)->face_index = face_index;
+    }
+
     return error;
   }
 
diff --git a/engine/thirdparty/freetype/src/base/ftmm.c b/engine/thirdparty/freetype/src/base/ftmm.c
index 9e2dd7ee..cc4ca22f 100644
--- a/engine/thirdparty/freetype/src/base/ftmm.c
+++ b/engine/thirdparty/freetype/src/base/ftmm.c
@@ -4,7 +4,7 @@
  *
  *   Multiple Master font support (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftobjs.c b/engine/thirdparty/freetype/src/base/ftobjs.c
index 89a25bc7..9b97820c 100644
--- a/engine/thirdparty/freetype/src/base/ftobjs.c
+++ b/engine/thirdparty/freetype/src/base/ftobjs.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType private base classes (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -2302,7 +2302,10 @@
                                       face_index_internal, aface );
       FT_FREE( data_offsets );
       if ( !error )
-        (*aface)->num_faces = count;
+      {
+        (*aface)->num_faces  = count;
+        (*aface)->face_index = face_index_internal;
+      }
     }
 
     return error;
@@ -5791,7 +5794,7 @@
     ttface = (TT_Face)face;
     sfnt   = (SFNT_Service)ttface->sfnt;
 
-    if ( sfnt->get_colr_layer )
+    if ( sfnt->get_colr_glyph_paint )
       return sfnt->get_colr_glyph_paint( ttface,
                                          base_glyph,
                                          root_transform,
diff --git a/engine/thirdparty/freetype/src/base/ftotval.c b/engine/thirdparty/freetype/src/base/ftotval.c
index 192e12a7..aed9eef3 100644
--- a/engine/thirdparty/freetype/src/base/ftotval.c
+++ b/engine/thirdparty/freetype/src/base/ftotval.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for validating OpenType tables (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftoutln.c b/engine/thirdparty/freetype/src/base/ftoutln.c
index 134f39d2..ef699b3c 100644
--- a/engine/thirdparty/freetype/src/base/ftoutln.c
+++ b/engine/thirdparty/freetype/src/base/ftoutln.c
@@ -4,7 +4,7 @@
  *
  *   FreeType outline management (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -53,7 +53,7 @@
 
     FT_Vector*  point;
     FT_Vector*  limit;
-    char*       tags;
+    FT_Byte*    tags;
 
     FT_Error    error;
 
@@ -332,8 +332,8 @@
          FT_NEW_ARRAY( anoutline->contours, numContours ) )
       goto Fail;
 
-    anoutline->n_points    = (FT_Short)numPoints;
-    anoutline->n_contours  = (FT_Short)numContours;
+    anoutline->n_points    = (FT_UShort)numPoints;
+    anoutline->n_contours  = (FT_UShort)numContours;
     anoutline->flags      |= FT_OUTLINE_OWNER;
 
     return FT_Err_Ok;
@@ -359,12 +359,14 @@
       FT_Int  n;
 
 
+      FT_TRACE5(( "FT_Outline_Check: contours = %d, points = %d\n",
+                  n_contours, n_points ));
       /* empty glyph? */
       if ( n_points == 0 && n_contours == 0 )
         return FT_Err_Ok;
 
       /* check point and contour counts */
-      if ( n_points <= 0 || n_contours <= 0 )
+      if ( n_points == 0 || n_contours == 0 )
         goto Bad;
 
       end0 = -1;
@@ -576,13 +578,13 @@
 
       /* reverse tags table */
       {
-        char*  p = outline->tags + first;
-        char*  q = outline->tags + last;
+        FT_Byte*  p = outline->tags + first;
+        FT_Byte*  q = outline->tags + last;
 
 
         while ( p < q )
         {
-          char  swap;
+          FT_Byte  swap;
 
 
           swap = *p;
diff --git a/engine/thirdparty/freetype/src/base/ftpatent.c b/engine/thirdparty/freetype/src/base/ftpatent.c
index cb5efadf..2055757e 100644
--- a/engine/thirdparty/freetype/src/base/ftpatent.c
+++ b/engine/thirdparty/freetype/src/base/ftpatent.c
@@ -5,7 +5,7 @@
  *   FreeType API for checking patented TrueType bytecode instructions
  *   (body).  Obsolete, retained for backward compatibility.
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftpfr.c b/engine/thirdparty/freetype/src/base/ftpfr.c
index 378385a5..0caa9d1d 100644
--- a/engine/thirdparty/freetype/src/base/ftpfr.c
+++ b/engine/thirdparty/freetype/src/base/ftpfr.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing PFR-specific data (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftpsprop.c b/engine/thirdparty/freetype/src/base/ftpsprop.c
index cefdf489..37a6cee6 100644
--- a/engine/thirdparty/freetype/src/base/ftpsprop.c
+++ b/engine/thirdparty/freetype/src/base/ftpsprop.c
@@ -5,7 +5,7 @@
  *   Get and set properties of PostScript drivers (body).
  *   See `ftdriver.h' for available properties.
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftrfork.c b/engine/thirdparty/freetype/src/base/ftrfork.c
index 2ab43019..dc9b043d 100644
--- a/engine/thirdparty/freetype/src/base/ftrfork.c
+++ b/engine/thirdparty/freetype/src/base/ftrfork.c
@@ -4,7 +4,7 @@
  *
  *   Embedded resource forks accessor (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO and Redhat K.K.
  *
  * FT_Raccess_Get_HeaderInfo() and raccess_guess_darwin_hfsplus() are
diff --git a/engine/thirdparty/freetype/src/base/ftsnames.c b/engine/thirdparty/freetype/src/base/ftsnames.c
index 1917a3f1..f7231fd6 100644
--- a/engine/thirdparty/freetype/src/base/ftsnames.c
+++ b/engine/thirdparty/freetype/src/base/ftsnames.c
@@ -7,7 +7,7 @@
  *
  *   This is _not_ used to retrieve glyph names!
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftstream.c b/engine/thirdparty/freetype/src/base/ftstream.c
index 64826ace..66722246 100644
--- a/engine/thirdparty/freetype/src/base/ftstream.c
+++ b/engine/thirdparty/freetype/src/base/ftstream.c
@@ -4,7 +4,7 @@
  *
  *   I/O stream support (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -763,10 +763,10 @@
       case ft_frame_bytes:  /* read a byte sequence */
       case ft_frame_skip:   /* skip some bytes      */
         {
-          FT_UInt  len = fields->size;
+          FT_Offset  len = fields->size;
 
 
-          if ( cursor + len > stream->limit )
+          if ( len > (FT_Offset)( stream->limit - cursor ) )
           {
             error = FT_THROW( Invalid_Stream_Operation );
             goto Exit;
@@ -830,7 +830,7 @@
         goto Exit;
       }
 
-      /* now, compute the signed value is necessary */
+      /* now, compute the signed value if necessary */
       if ( fields->value & FT_FRAME_OP_SIGNED )
         value = (FT_ULong)( (FT_Int32)( value << sign_shift ) >> sign_shift );
 
diff --git a/engine/thirdparty/freetype/src/base/ftstroke.c b/engine/thirdparty/freetype/src/base/ftstroke.c
index 92f1e430..64f46ce4 100644
--- a/engine/thirdparty/freetype/src/base/ftstroke.c
+++ b/engine/thirdparty/freetype/src/base/ftstroke.c
@@ -4,7 +4,7 @@
  *
  *   FreeType path stroker (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -711,7 +711,7 @@
     {
       FT_UInt   count = border->num_points;
       FT_Byte*  read  = border->tags;
-      FT_Byte*  write = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*  write = outline->tags + outline->n_points;
 
 
       for ( ; count > 0; count--, read++, write++ )
@@ -727,10 +727,10 @@
 
     /* copy contours */
     {
-      FT_UInt    count = border->num_points;
-      FT_Byte*   tags  = border->tags;
-      FT_Short*  write = outline->contours + outline->n_contours;
-      FT_Short   idx   = (FT_Short)outline->n_points;
+      FT_UInt     count = border->num_points;
+      FT_Byte*    tags  = border->tags;
+      FT_UShort*  write = outline->contours + outline->n_contours;
+      FT_UShort   idx   = outline->n_points;
 
 
       for ( ; count > 0; count--, tags++, idx++ )
@@ -743,7 +743,7 @@
       }
     }
 
-    outline->n_points += (short)border->num_points;
+    outline->n_points += (FT_UShort)border->num_points;
 
     FT_ASSERT( FT_Outline_Check( outline ) == 0 );
   }
@@ -2050,7 +2050,7 @@
 
     FT_Vector*  point;
     FT_Vector*  limit;
-    char*       tags;
+    FT_Byte*    tags;
 
     FT_Error    error;
 
diff --git a/engine/thirdparty/freetype/src/base/ftsynth.c b/engine/thirdparty/freetype/src/base/ftsynth.c
index f32edd33..ec05bce3 100644
--- a/engine/thirdparty/freetype/src/base/ftsynth.c
+++ b/engine/thirdparty/freetype/src/base/ftsynth.c
@@ -4,7 +4,7 @@
  *
  *   FreeType synthesizing code for emboldening and slanting (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftsystem.c b/engine/thirdparty/freetype/src/base/ftsystem.c
index 61c99e36..eee36423 100644
--- a/engine/thirdparty/freetype/src/base/ftsystem.c
+++ b/engine/thirdparty/freetype/src/base/ftsystem.c
@@ -4,7 +4,7 @@
  *
  *   ANSI-specific FreeType low-level system interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/fttrigon.c b/engine/thirdparty/freetype/src/base/fttrigon.c
index 2dd2c345..4b1aced1 100644
--- a/engine/thirdparty/freetype/src/base/fttrigon.c
+++ b/engine/thirdparty/freetype/src/base/fttrigon.c
@@ -4,7 +4,7 @@
  *
  *   FreeType trigonometric functions (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/fttype1.c b/engine/thirdparty/freetype/src/base/fttype1.c
index 637c5cf7..cedf7c40 100644
--- a/engine/thirdparty/freetype/src/base/fttype1.c
+++ b/engine/thirdparty/freetype/src/base/fttype1.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file for PS names support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftutil.c b/engine/thirdparty/freetype/src/base/ftutil.c
index 6120846d..b13512f8 100644
--- a/engine/thirdparty/freetype/src/base/ftutil.c
+++ b/engine/thirdparty/freetype/src/base/ftutil.c
@@ -4,7 +4,7 @@
  *
  *   FreeType utility file for memory and list management (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/base/ftwinfnt.c b/engine/thirdparty/freetype/src/base/ftwinfnt.c
index 03b023e0..e849a15f 100644
--- a/engine/thirdparty/freetype/src/base/ftwinfnt.c
+++ b/engine/thirdparty/freetype/src/base/ftwinfnt.c
@@ -4,7 +4,7 @@
  *
  *   FreeType API for accessing Windows FNT specific info (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/bdf/bdfdrivr.c b/engine/thirdparty/freetype/src/bdf/bdfdrivr.c
index e02a1609..4b9d6347 100644
--- a/engine/thirdparty/freetype/src/bdf/bdfdrivr.c
+++ b/engine/thirdparty/freetype/src/bdf/bdfdrivr.c
@@ -780,8 +780,8 @@ THE SOFTWARE.
                   FT_UInt       glyph_index,
                   FT_Int32      load_flags )
   {
-    BDF_Face     bdf    = (BDF_Face)FT_SIZE_FACE( size );
-    FT_Face      face   = FT_FACE( bdf );
+    FT_Face      face   = size->face;
+    BDF_Face     bdf    = (BDF_Face)face;
     FT_Error     error  = FT_Err_Ok;
     FT_Bitmap*   bitmap = &slot->bitmap;
     bdf_glyph_t  glyph;
diff --git a/engine/thirdparty/freetype/src/bdf/bdflib.c b/engine/thirdparty/freetype/src/bdf/bdflib.c
index 0fa7e0a8..813a4d83 100644
--- a/engine/thirdparty/freetype/src/bdf/bdflib.c
+++ b/engine/thirdparty/freetype/src/bdf/bdflib.c
@@ -864,15 +864,9 @@
 
     p = font->user_props + font->nuser_props;
 
-    n = ft_strlen( name ) + 1;
-    if ( n > FT_LONG_MAX )
-      return FT_THROW( Invalid_Argument );
-
-    if ( FT_QALLOC( p->name, n ) )
+    if ( FT_STRDUP( p->name, name ) )
       goto Exit;
 
-    FT_MEM_COPY( (char *)p->name, name, n );
-
     p->format     = format;
     p->builtin    = 0;
     p->value.atom = NULL;  /* nothing is ever stored here */
@@ -1442,11 +1436,9 @@
         goto Exit;
       }
 
-      if ( FT_QALLOC( p->glyph_name, slen + 1 ) )
+      if ( FT_DUP( p->glyph_name, s, slen + 1 ) )
         goto Exit;
 
-      FT_MEM_COPY( p->glyph_name, s, slen + 1 );
-
       p->flags |= BDF_GLYPH_;
 
       FT_TRACE4(( DBGMSG1, lineno, s ));
@@ -2051,9 +2043,8 @@
       /* Allowing multiple `FONT' lines (which is invalid) doesn't hurt... */
       FT_FREE( p->font->name );
 
-      if ( FT_QALLOC( p->font->name, slen + 1 ) )
+      if ( FT_DUP( p->font->name, s, slen + 1 ) )
         goto Exit;
-      FT_MEM_COPY( p->font->name, s, slen + 1 );
 
       /* If the font name is an XLFD name, set the spacing to the one in  */
       /* the font name.  If there is no spacing fall back on the default. */
diff --git a/engine/thirdparty/freetype/src/bzip2/ftbzip2.c b/engine/thirdparty/freetype/src/bzip2/ftbzip2.c
index ad342bd0..a0249eb8 100644
--- a/engine/thirdparty/freetype/src/bzip2/ftbzip2.c
+++ b/engine/thirdparty/freetype/src/bzip2/ftbzip2.c
@@ -8,7 +8,7 @@
  * parse compressed PCF fonts, as found with many X11 server
  * distributions.
  *
- * Copyright (C) 2010-2023 by
+ * Copyright (C) 2010-2024 by
  * Joel Klinghed.
  *
  * based on `src/gzip/ftgzip.c'
diff --git a/engine/thirdparty/freetype/src/cache/ftcache.c b/engine/thirdparty/freetype/src/cache/ftcache.c
index 1af2e677..81e0347a 100644
--- a/engine/thirdparty/freetype/src/cache/ftcache.c
+++ b/engine/thirdparty/freetype/src/cache/ftcache.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType Caching sub-system (body only).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cache/ftcbasic.c b/engine/thirdparty/freetype/src/cache/ftcbasic.c
index 24a56c8d..7102d3d2 100644
--- a/engine/thirdparty/freetype/src/cache/ftcbasic.c
+++ b/engine/thirdparty/freetype/src/cache/ftcbasic.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType basic cache interface (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -37,7 +37,7 @@
   typedef struct  FTC_BasicAttrRec_
   {
     FTC_ScalerRec  scaler;
-    FT_UInt        load_flags;
+    FT_Int32       load_flags;
 
   } FTC_BasicAttrRec, *FTC_BasicAttrs;
 
@@ -45,8 +45,9 @@
           FT_BOOL( FTC_SCALER_COMPARE( &(a)->scaler, &(b)->scaler ) && \
                    (a)->load_flags == (b)->load_flags               )
 
-#define FTC_BASIC_ATTR_HASH( a )                                     \
-          ( FTC_SCALER_HASH( &(a)->scaler ) + 31 * (a)->load_flags )
+#define FTC_BASIC_ATTR_HASH( a )                  \
+          ( FTC_SCALER_HASH( &(a)->scaler ) +     \
+            (FT_Offset)( 31 * (a)->load_flags ) )
 
 
   typedef struct  FTC_BasicQueryRec_
@@ -143,10 +144,9 @@
       FT_Face  face = size->face;
 
 
-      error = FT_Load_Glyph(
-                face,
-                gindex,
-                (FT_Int)family->attrs.load_flags | FT_LOAD_RENDER );
+      error = FT_Load_Glyph( face,
+                             gindex,
+                             family->attrs.load_flags | FT_LOAD_RENDER );
       if ( !error )
         *aface = face;
     }
@@ -176,9 +176,7 @@
     {
       face = size->face;
 
-      error = FT_Load_Glyph( face,
-                             gindex,
-                             (FT_Int)family->attrs.load_flags );
+      error = FT_Load_Glyph( face, gindex, family->attrs.load_flags );
       if ( !error )
       {
         if ( face->glyph->format == FT_GLYPH_FORMAT_BITMAP  ||
@@ -246,7 +244,6 @@
 
       ftc_basic_family_compare, /* FTC_MruNode_CompareFunc  node_compare */
       ftc_basic_family_init,    /* FTC_MruNode_InitFunc     node_init    */
-      NULL,                     /* FTC_MruNode_ResetFunc    node_reset   */
       NULL                      /* FTC_MruNode_DoneFunc     node_done    */
     },
 
@@ -293,40 +290,24 @@
                          FT_Glyph       *aglyph,
                          FTC_Node       *anode )
   {
-    FTC_BasicQueryRec  query;
-    FTC_Node           node = 0; /* make compiler happy */
     FT_Error           error;
+    FTC_BasicQueryRec  query;
+    FTC_Node           node = NULL;  /* make compiler happy */
     FT_Offset          hash;
 
 
-    /* some argument checks are delayed to `FTC_Cache_Lookup' */
+    /* other argument checks delayed to `FTC_Cache_Lookup' */
     if ( !aglyph )
-    {
-      error = FT_THROW( Invalid_Argument );
-      goto Exit;
-    }
+      return FT_THROW( Invalid_Argument );
 
     *aglyph = NULL;
     if ( anode )
-      *anode  = NULL;
-
-    /*
-     * Internal `FTC_BasicAttr->load_flags' is of type `FT_UInt',
-     * but public `FT_ImageType->flags' is of type `FT_Int32'.
-     *
-     * On 16bit systems, higher bits of type->flags cannot be handled.
-     */
-#if 0xFFFFFFFFUL > FT_UINT_MAX
-    if ( (type->flags & (FT_ULong)FT_UINT_MAX) )
-      FT_TRACE1(( "FTC_ImageCache_Lookup:"
-                  " higher bits in load_flags 0x%lx are dropped\n",
-                  (FT_ULong)type->flags & ~((FT_ULong)FT_UINT_MAX) ));
-#endif
+      *anode = NULL;
 
     query.attrs.scaler.face_id = type->face_id;
     query.attrs.scaler.width   = type->width;
     query.attrs.scaler.height  = type->height;
-    query.attrs.load_flags     = (FT_UInt)type->flags;
+    query.attrs.load_flags     = type->flags;
 
     query.attrs.scaler.pixel = 1;
     query.attrs.scaler.x_res = 0;  /* make compilers happy */
@@ -334,7 +315,7 @@
 
     hash = FTC_BASIC_ATTR_HASH( &query.attrs ) + gindex;
 
-#if 1  /* inlining is about 50% faster! */
+#ifdef FTC_INLINE  /* inlining is about 50% faster! */
     FTC_GCACHE_LOOKUP_CMP( cache,
                            ftc_basic_family_compare,
                            ftc_gnode_compare,
@@ -359,7 +340,6 @@
       }
     }
 
-  Exit:
     return error;
   }
 
@@ -374,38 +354,35 @@
                                FT_Glyph       *aglyph,
                                FTC_Node       *anode )
   {
-    FTC_BasicQueryRec  query;
-    FTC_Node           node = 0; /* make compiler happy */
     FT_Error           error;
+    FTC_BasicQueryRec  query;
+    FTC_Node           node = NULL;  /* make compiler happy */
     FT_Offset          hash;
 
 
-    /* some argument checks are delayed to `FTC_Cache_Lookup' */
+    /* other argument checks delayed to `FTC_Cache_Lookup' */
     if ( !aglyph || !scaler )
-    {
-      error = FT_THROW( Invalid_Argument );
-      goto Exit;
-    }
+      return FT_THROW( Invalid_Argument );
 
     *aglyph = NULL;
     if ( anode )
-      *anode  = NULL;
+      *anode = NULL;
 
     /*
-     * Internal `FTC_BasicAttr->load_flags' is of type `FT_UInt',
+     * Internal `FTC_BasicAttr->load_flags' is of type `FT_Int32',
      * but public `FT_Face->face_flags' is of type `FT_Long'.
      *
      * On long > int systems, higher bits of load_flags cannot be handled.
      */
-#if FT_ULONG_MAX > FT_UINT_MAX
-    if ( load_flags > FT_UINT_MAX )
+#if FT_ULONG_MAX > 0xFFFFFFFFUL
+    if ( load_flags > 0xFFFFFFFFUL )
       FT_TRACE1(( "FTC_ImageCache_LookupScaler:"
                   " higher bits in load_flags 0x%lx are dropped\n",
-                  load_flags & ~((FT_ULong)FT_UINT_MAX) ));
+                  load_flags & ~0xFFFFFFFFUL ));
 #endif
 
     query.attrs.scaler     = scaler[0];
-    query.attrs.load_flags = (FT_UInt)load_flags;
+    query.attrs.load_flags = (FT_Int32)load_flags;
 
     hash = FTC_BASIC_ATTR_HASH( &query.attrs ) + gindex;
 
@@ -427,7 +404,6 @@
       }
     }
 
-  Exit:
     return error;
   }
 
@@ -445,7 +421,6 @@
       sizeof ( FTC_BasicFamilyRec ),
       ftc_basic_family_compare,     /* FTC_MruNode_CompareFunc  node_compare */
       ftc_basic_family_init,        /* FTC_MruNode_InitFunc     node_init    */
-      NULL,                         /* FTC_MruNode_ResetFunc    node_reset   */
       NULL                          /* FTC_MruNode_DoneFunc     node_done    */
     },
 
@@ -495,36 +470,22 @@
   {
     FT_Error           error;
     FTC_BasicQueryRec  query;
-    FTC_Node           node = 0; /* make compiler happy */
+    FTC_Node           node = NULL;  /* make compiler happy */
     FT_Offset          hash;
 
 
-    if ( anode )
-      *anode = NULL;
-
     /* other argument checks delayed to `FTC_Cache_Lookup' */
     if ( !ansbit )
       return FT_THROW( Invalid_Argument );
 
     *ansbit = NULL;
-
-    /*
-     * Internal `FTC_BasicAttr->load_flags' is of type `FT_UInt',
-     * but public `FT_ImageType->flags' is of type `FT_Int32'.
-     *
-     * On 16bit systems, higher bits of type->flags cannot be handled.
-     */
-#if 0xFFFFFFFFUL > FT_UINT_MAX
-    if ( (type->flags & (FT_ULong)FT_UINT_MAX) )
-      FT_TRACE1(( "FTC_ImageCache_Lookup:"
-                  " higher bits in load_flags 0x%lx are dropped\n",
-                  (FT_ULong)type->flags & ~((FT_ULong)FT_UINT_MAX) ));
-#endif
+    if ( anode )
+      *anode = NULL;
 
     query.attrs.scaler.face_id = type->face_id;
     query.attrs.scaler.width   = type->width;
     query.attrs.scaler.height  = type->height;
-    query.attrs.load_flags     = (FT_UInt)type->flags;
+    query.attrs.load_flags     = type->flags;
 
     query.attrs.scaler.pixel = 1;
     query.attrs.scaler.x_res = 0;  /* make compilers happy */
@@ -534,7 +495,7 @@
     hash = FTC_BASIC_ATTR_HASH( &query.attrs ) +
            gindex / FTC_SBIT_ITEMS_PER_NODE;
 
-#if 1  /* inlining is about 50% faster! */
+#ifdef FTC_INLINE  /* inlining is about 50% faster! */
     FTC_GCACHE_LOOKUP_CMP( cache,
                            ftc_basic_family_compare,
                            ftc_snode_compare,
@@ -578,34 +539,33 @@
   {
     FT_Error           error;
     FTC_BasicQueryRec  query;
-    FTC_Node           node = 0; /* make compiler happy */
+    FTC_Node           node = NULL;  /* make compiler happy */
     FT_Offset          hash;
 
 
-    if ( anode )
-        *anode = NULL;
-
     /* other argument checks delayed to `FTC_Cache_Lookup' */
     if ( !ansbit || !scaler )
-        return FT_THROW( Invalid_Argument );
+      return FT_THROW( Invalid_Argument );
 
     *ansbit = NULL;
+    if ( anode )
+      *anode = NULL;
 
     /*
-     * Internal `FTC_BasicAttr->load_flags' is of type `FT_UInt',
+     * Internal `FTC_BasicAttr->load_flags' is of type `FT_Int32',
      * but public `FT_Face->face_flags' is of type `FT_Long'.
      *
      * On long > int systems, higher bits of load_flags cannot be handled.
      */
-#if FT_ULONG_MAX > FT_UINT_MAX
-    if ( load_flags > FT_UINT_MAX )
+#if FT_ULONG_MAX > 0xFFFFFFFFUL
+    if ( load_flags > 0xFFFFFFFFUL )
       FT_TRACE1(( "FTC_ImageCache_LookupScaler:"
                   " higher bits in load_flags 0x%lx are dropped\n",
-                  load_flags & ~((FT_ULong)FT_UINT_MAX) ));
+                  load_flags & ~0xFFFFFFFFUL ));
 #endif
 
     query.attrs.scaler     = scaler[0];
-    query.attrs.load_flags = (FT_UInt)load_flags;
+    query.attrs.load_flags = (FT_Int32)load_flags;
 
     /* beware, the hash must be the same for all glyph ranges! */
     hash = FTC_BASIC_ATTR_HASH( &query.attrs ) +
diff --git a/engine/thirdparty/freetype/src/cache/ftccache.c b/engine/thirdparty/freetype/src/cache/ftccache.c
index e0698557..8a3d887f 100644
--- a/engine/thirdparty/freetype/src/cache/ftccache.c
+++ b/engine/thirdparty/freetype/src/cache/ftccache.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType internal cache interface (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -544,7 +544,6 @@
                           FTC_FaceID  face_id )
   {
     FTC_Manager  manager = cache->manager;
-    FTC_Node     frees   = NULL;
     FT_UFast     count   = cache->p;
     FT_UFast     i;
 
@@ -557,41 +556,27 @@
       for (;;)
       {
         FTC_Node  node = *pnode;
-        FT_Bool   list_changed = FALSE;
 
 
         if ( !node )
           break;
 
-        if ( cache->clazz.node_remove_faceid( node, face_id,
-                                              cache, &list_changed ) )
+        if ( cache->clazz.node_remove_faceid( node, face_id, cache, NULL ) )
         {
-          *pnode     = node->link;
-          node->link = frees;
-          frees      = node;
+          *pnode = node->link;
+
+          manager->cur_weight -= cache->clazz.node_weight( node, cache );
+          ftc_node_mru_unlink( node, manager );
+
+          cache->clazz.node_free( node, cache );
+
+          cache->slack++;
         }
         else
           pnode = &node->link;
       }
     }
 
-    /* remove all nodes in the free list */
-    while ( frees )
-    {
-      FTC_Node  node;
-
-
-      node  = frees;
-      frees = node->link;
-
-      manager->cur_weight -= cache->clazz.node_weight( node, cache );
-      ftc_node_mru_unlink( node, manager );
-
-      cache->clazz.node_free( node, cache );
-
-      cache->slack++;
-    }
-
     ftc_cache_resize( cache );
   }
 
diff --git a/engine/thirdparty/freetype/src/cache/ftccache.h b/engine/thirdparty/freetype/src/cache/ftccache.h
index 850d2554..85d321c1 100644
--- a/engine/thirdparty/freetype/src/cache/ftccache.h
+++ b/engine/thirdparty/freetype/src/cache/ftccache.h
@@ -4,7 +4,7 @@
  *
  *   FreeType internal cache interface (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -87,6 +87,10 @@ FT_BEGIN_HEADER
         ftc_get_top_node_for_hash( ( cache ), ( hash ) )
 #endif
 
+  FT_LOCAL( void )
+  ftc_node_destroy( FTC_Node     node,
+                    FTC_Manager  manager );
+
 
   /*************************************************************************/
   /*************************************************************************/
diff --git a/engine/thirdparty/freetype/src/cache/ftccback.h b/engine/thirdparty/freetype/src/cache/ftccback.h
index 5f9db213..a1d76baa 100644
--- a/engine/thirdparty/freetype/src/cache/ftccback.h
+++ b/engine/thirdparty/freetype/src/cache/ftccback.h
@@ -4,7 +4,7 @@
  *
  *   Callback functions of the caching sub-system (specification only).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -19,11 +19,7 @@
 #define FTCCBACK_H_
 
 #include <freetype/ftcache.h>
-#include "ftcmru.h"
-#include "ftcimage.h"
-#include "ftcmanag.h"
-#include "ftcglyph.h"
-#include "ftcsbits.h"
+#include "ftccache.h"
 
 FT_BEGIN_HEADER
 
@@ -81,10 +77,6 @@ FT_BEGIN_HEADER
   FT_LOCAL( void )
   ftc_cache_done( FTC_Cache  cache );
 
-  FT_LOCAL( void )
-  ftc_node_destroy( FTC_Node     node,
-                    FTC_Manager  manager );
-
 FT_END_HEADER
 
 #endif /* FTCCBACK_H_ */
diff --git a/engine/thirdparty/freetype/src/cache/ftccmap.c b/engine/thirdparty/freetype/src/cache/ftccmap.c
index 84f22a66..b5c61e81 100644
--- a/engine/thirdparty/freetype/src/cache/ftccmap.c
+++ b/engine/thirdparty/freetype/src/cache/ftccmap.c
@@ -4,7 +4,7 @@
  *
  *   FreeType CharMap cache (body)
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -264,7 +264,7 @@
 
     hash = FTC_CMAP_HASH( face_id, (FT_UInt)cmap_index, char_code );
 
-#if 1
+#ifdef FTC_INLINE
     FTC_CACHE_LOOKUP_CMP( cache, ftc_cmap_node_compare, hash, &query,
                           node, error );
 #else
diff --git a/engine/thirdparty/freetype/src/cache/ftcerror.h b/engine/thirdparty/freetype/src/cache/ftcerror.h
index dc1a6201..daabcc61 100644
--- a/engine/thirdparty/freetype/src/cache/ftcerror.h
+++ b/engine/thirdparty/freetype/src/cache/ftcerror.h
@@ -4,7 +4,7 @@
  *
  *   Caching sub-system error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cache/ftcglyph.c b/engine/thirdparty/freetype/src/cache/ftcglyph.c
index d344733f..5e785637 100644
--- a/engine/thirdparty/freetype/src/cache/ftcglyph.c
+++ b/engine/thirdparty/freetype/src/cache/ftcglyph.c
@@ -4,7 +4,7 @@
  *
  *   FreeType Glyph Image (FT_Glyph) cache (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -180,7 +180,7 @@
 
     query->gindex = gindex;
 
-    FTC_MRULIST_LOOKUP( &cache->families, query, query->family, error );
+    FTC_MRULIST_LOOKUP( &gcache->families, query, query->family, error );
     if ( !error )
     {
       FTC_Family  family = query->family;
@@ -193,7 +193,7 @@
       error = FTC_Cache_Lookup( FTC_CACHE( gcache ), hash, query, anode );
 
       if ( --family->num_nodes == 0 )
-        FTC_FAMILY_FREE( family, cache );
+        FTC_FAMILY_FREE( family, FTC_CACHE( gcache ) );
     }
     return error;
   }
diff --git a/engine/thirdparty/freetype/src/cache/ftcglyph.h b/engine/thirdparty/freetype/src/cache/ftcglyph.h
index 0181e981..b1a96da8 100644
--- a/engine/thirdparty/freetype/src/cache/ftcglyph.h
+++ b/engine/thirdparty/freetype/src/cache/ftcglyph.h
@@ -4,7 +4,7 @@
  *
  *   FreeType abstract glyph cache (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -65,7 +65,6 @@
    * - FTC_Family sub-class, e.g. MyFamily, with relevant methods:
    *     my_family_compare
    *     my_family_init
-   *     my_family_reset (optional)
    *     my_family_done
    *
    * - FTC_GQuery sub-class, e.g. MyQuery, to hold cache-specific query
diff --git a/engine/thirdparty/freetype/src/cache/ftcimage.c b/engine/thirdparty/freetype/src/cache/ftcimage.c
index 428e5e1a..14630640 100644
--- a/engine/thirdparty/freetype/src/cache/ftcimage.c
+++ b/engine/thirdparty/freetype/src/cache/ftcimage.c
@@ -4,7 +4,7 @@
  *
  *   FreeType Image cache (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -34,11 +34,7 @@
     FT_Memory  memory = cache->memory;
 
 
-    if ( inode->glyph )
-    {
-      FT_Done_Glyph( inode->glyph );
-      inode->glyph = NULL;
-    }
+    FT_Done_Glyph( inode->glyph );
 
     FTC_GNode_Done( FTC_GNODE( inode ), cache );
     FT_FREE( inode );
@@ -119,10 +115,9 @@
     {
     case FT_GLYPH_FORMAT_BITMAP:
       {
-        FT_BitmapGlyph  bitg;
+        FT_BitmapGlyph  bitg = (FT_BitmapGlyph)glyph;
 
 
-        bitg = (FT_BitmapGlyph)glyph;
         size = bitg->bitmap.rows * (FT_Offset)FT_ABS( bitg->bitmap.pitch ) +
                sizeof ( *bitg );
       }
@@ -130,10 +125,9 @@
 
     case FT_GLYPH_FORMAT_OUTLINE:
       {
-        FT_OutlineGlyph  outg;
+        FT_OutlineGlyph  outg = (FT_OutlineGlyph)glyph;
 
 
-        outg = (FT_OutlineGlyph)glyph;
         size = (FT_Offset)outg->outline.n_points *
                  ( sizeof ( FT_Vector ) + sizeof ( FT_Byte ) ) +
                (FT_Offset)outg->outline.n_contours * sizeof ( FT_Short ) +
diff --git a/engine/thirdparty/freetype/src/cache/ftcimage.h b/engine/thirdparty/freetype/src/cache/ftcimage.h
index d2a807f1..a0c4a972 100644
--- a/engine/thirdparty/freetype/src/cache/ftcimage.h
+++ b/engine/thirdparty/freetype/src/cache/ftcimage.h
@@ -4,7 +4,7 @@
  *
  *   FreeType Generic Image cache (specification)
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cache/ftcmanag.c b/engine/thirdparty/freetype/src/cache/ftcmanag.c
index 94f8469c..c0a48a53 100644
--- a/engine/thirdparty/freetype/src/cache/ftcmanag.c
+++ b/engine/thirdparty/freetype/src/cache/ftcmanag.c
@@ -4,7 +4,7 @@
  *
  *   FreeType Cache Manager (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -22,7 +22,6 @@
 #include <freetype/internal/ftdebug.h>
 #include <freetype/ftsizes.h>
 
-#include "ftccback.h"
 #include "ftcerror.h"
 
 
@@ -86,12 +85,10 @@
                       FT_Pointer   data )
   {
     FTC_SizeNode  node = (FTC_SizeNode)ftcnode;
-    FT_Size       size = node->size;
     FT_UNUSED( data );
 
 
-    if ( size )
-      FT_Done_Size( size );
+    FT_Done_Size( node->size );
   }
 
 
@@ -118,32 +115,21 @@
                       FT_Pointer   ftcscaler,
                       FT_Pointer   ftcmanager )
   {
+    FT_Error      error;
+    FT_Size       size;
     FTC_SizeNode  node    = (FTC_SizeNode)ftcnode;
     FTC_Scaler    scaler  = (FTC_Scaler)ftcscaler;
     FTC_Manager   manager = (FTC_Manager)ftcmanager;
 
 
-    node->scaler = scaler[0];
+    error = ftc_scaler_lookup_size( manager, scaler, &size );
+    if ( !error )
+    {
+      node->size   = size;
+      node->scaler = scaler[0];
+    }
 
-    return ftc_scaler_lookup_size( manager, scaler, &node->size );
-  }
-
-
-  FT_CALLBACK_DEF( FT_Error )
-  ftc_size_node_reset( FTC_MruNode  ftcnode,
-                       FT_Pointer   ftcscaler,
-                       FT_Pointer   ftcmanager )
-  {
-    FTC_SizeNode  node    = (FTC_SizeNode)ftcnode;
-    FTC_Scaler    scaler  = (FTC_Scaler)ftcscaler;
-    FTC_Manager   manager = (FTC_Manager)ftcmanager;
-
-
-    FT_Done_Size( node->size );
-
-    node->scaler = scaler[0];
-
-    return ftc_scaler_lookup_size( manager, scaler, &node->size );
+    return error;
   }
 
 
@@ -154,7 +140,6 @@
 
     ftc_size_node_compare,  /* FTC_MruNode_CompareFunc  node_compare */
     ftc_size_node_init,     /* FTC_MruNode_InitFunc     node_init    */
-    ftc_size_node_reset,    /* FTC_MruNode_ResetFunc    node_reset   */
     ftc_size_node_done      /* FTC_MruNode_DoneFunc     node_done    */
   };
 
@@ -231,23 +216,25 @@
                       FT_Pointer   ftcface_id,
                       FT_Pointer   ftcmanager )
   {
+    FT_Error      error;
+    FT_Face       face;
     FTC_FaceNode  node    = (FTC_FaceNode)ftcnode;
     FTC_FaceID    face_id = (FTC_FaceID)ftcface_id;
     FTC_Manager   manager = (FTC_Manager)ftcmanager;
-    FT_Error      error;
 
 
-    node->face_id = face_id;
-
     error = manager->request_face( face_id,
                                    manager->library,
                                    manager->request_data,
-                                   &node->face );
+                                   &face );
     if ( !error )
     {
       /* destroy initial size object; it will be re-created later */
-      if ( node->face->size )
-        FT_Done_Size( node->face->size );
+      if ( face->size )
+        FT_Done_Size( face->size );
+
+      node->face    = face;
+      node->face_id = face_id;
     }
 
     return error;
@@ -294,7 +281,6 @@
 
     ftc_face_node_compare,  /* FTC_MruNode_CompareFunc  node_compare */
     ftc_face_node_init,     /* FTC_MruNode_InitFunc     node_init    */
-    NULL,                   /* FTC_MruNode_ResetFunc    node_reset   */
     ftc_face_node_done      /* FTC_MruNode_DoneFunc     node_done    */
   };
 
@@ -435,18 +421,13 @@
       {
         cache->clazz.cache_done( cache );
         FT_FREE( cache );
-        manager->caches[idx] = NULL;
       }
     }
-    manager->num_caches = 0;
 
     /* discard faces and sizes */
     FTC_MruList_Done( &manager->sizes );
     FTC_MruList_Done( &manager->faces );
 
-    manager->library = NULL;
-    manager->memory  = NULL;
-
     FT_FREE( manager );
   }
 
diff --git a/engine/thirdparty/freetype/src/cache/ftcmanag.h b/engine/thirdparty/freetype/src/cache/ftcmanag.h
index 5b30929c..bd158f5f 100644
--- a/engine/thirdparty/freetype/src/cache/ftcmanag.h
+++ b/engine/thirdparty/freetype/src/cache/ftcmanag.h
@@ -4,7 +4,7 @@
  *
  *   FreeType Cache Manager (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cache/ftcmru.c b/engine/thirdparty/freetype/src/cache/ftcmru.c
index ad10a06b..f908eb25 100644
--- a/engine/thirdparty/freetype/src/cache/ftcmru.c
+++ b/engine/thirdparty/freetype/src/cache/ftcmru.c
@@ -4,7 +4,7 @@
  *
  *   FreeType MRU support (body).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -238,52 +238,43 @@
   {
     FT_Error     error;
     FTC_MruNode  node   = NULL;
+    FTC_MruNode  prev   = NULL;
     FT_Memory    memory = list->memory;
 
 
-    if ( list->num_nodes >= list->max_nodes && list->max_nodes > 0 )
-    {
-      node = list->nodes->prev;
-
-      FT_ASSERT( node );
-
-      if ( list->clazz.node_reset )
-      {
-        FTC_MruNode_Up( &list->nodes, node );
-
-        error = list->clazz.node_reset( node, key, list->data );
-        if ( !error )
-          goto Exit;
-      }
-
-      FTC_MruNode_Remove( &list->nodes, node );
-      list->num_nodes--;
-
-      if ( list->clazz.node_done )
-        list->clazz.node_done( node, list->data );
-    }
-
     /* zero new node in case of node_init failure */
-    else if ( FT_ALLOC( node, list->clazz.node_size ) )
+    if ( FT_ALLOC( node, list->clazz.node_size ) )
       goto Exit;
 
     error = list->clazz.node_init( node, key, list->data );
     if ( error )
-      goto Fail;
+    {
+      prev = node;
+      node = NULL;
+
+      goto Clean;
+    }
+    else if ( list->max_nodes > 0 && list->num_nodes >= list->max_nodes )
+      prev = list->nodes->prev;
 
     FTC_MruNode_Prepend( &list->nodes, node );
     list->num_nodes++;
 
+    if ( !prev )
+      goto Exit;
+
+    FTC_MruNode_Remove( &list->nodes, prev );
+    list->num_nodes--;
+
+  Clean:
+    if ( list->clazz.node_done )
+      list->clazz.node_done( prev, list->data );
+
+    FT_FREE( prev );
+
   Exit:
     *anode = node;
     return error;
-
-  Fail:
-    if ( list->clazz.node_done )
-      list->clazz.node_done( node, list->data );
-
-    FT_FREE( node );
-    goto Exit;
   }
 
 
@@ -309,18 +300,16 @@
   FTC_MruList_Remove( FTC_MruList  list,
                       FTC_MruNode  node )
   {
+    FT_Memory  memory = list->memory;
+
+
     FTC_MruNode_Remove( &list->nodes, node );
     list->num_nodes--;
 
-    {
-      FT_Memory  memory = list->memory;
+    if ( list->clazz.node_done )
+      list->clazz.node_done( node, list->data );
 
-
-      if ( list->clazz.node_done )
-        list->clazz.node_done( node, list->data );
-
-      FT_FREE( node );
-    }
+    FT_FREE( node );
   }
 
 
diff --git a/engine/thirdparty/freetype/src/cache/ftcmru.h b/engine/thirdparty/freetype/src/cache/ftcmru.h
index 45e5249c..68faab98 100644
--- a/engine/thirdparty/freetype/src/cache/ftcmru.h
+++ b/engine/thirdparty/freetype/src/cache/ftcmru.h
@@ -4,7 +4,7 @@
  *
  *   Simple MRU list-cache (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -95,11 +95,6 @@ FT_BEGIN_HEADER
                            FT_Pointer   key,
                            FT_Pointer   data );
 
-  typedef FT_Error
-  (*FTC_MruNode_ResetFunc)( FTC_MruNode  node,
-                            FT_Pointer   key,
-                            FT_Pointer   data );
-
   typedef void
   (*FTC_MruNode_DoneFunc)( FTC_MruNode  node,
                            FT_Pointer   data );
@@ -111,7 +106,6 @@ FT_BEGIN_HEADER
 
     FTC_MruNode_CompareFunc  node_compare;
     FTC_MruNode_InitFunc     node_init;
-    FTC_MruNode_ResetFunc    node_reset;
     FTC_MruNode_DoneFunc     node_done;
 
   } FTC_MruListClassRec;
diff --git a/engine/thirdparty/freetype/src/cache/ftcsbits.c b/engine/thirdparty/freetype/src/cache/ftcsbits.c
index 9929a0bc..19f3ef04 100644
--- a/engine/thirdparty/freetype/src/cache/ftcsbits.c
+++ b/engine/thirdparty/freetype/src/cache/ftcsbits.c
@@ -4,7 +4,7 @@
  *
  *   FreeType sbits manager (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -53,8 +53,7 @@
 
     size = (FT_ULong)pitch * bitmap->rows;
 
-    if ( !FT_QALLOC( sbit->buffer, size ) )
-      FT_MEM_COPY( sbit->buffer, bitmap->buffer, size );
+    FT_MEM_DUP( sbit->buffer, bitmap->buffer, size );
 
     return error;
   }
diff --git a/engine/thirdparty/freetype/src/cache/ftcsbits.h b/engine/thirdparty/freetype/src/cache/ftcsbits.h
index e833cb5c..d7c4a364 100644
--- a/engine/thirdparty/freetype/src/cache/ftcsbits.h
+++ b/engine/thirdparty/freetype/src/cache/ftcsbits.h
@@ -4,7 +4,7 @@
  *
  *   A small-bitmap cache (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cff.c b/engine/thirdparty/freetype/src/cff/cff.c
index b486c389..e3e00969 100644
--- a/engine/thirdparty/freetype/src/cff/cff.c
+++ b/engine/thirdparty/freetype/src/cff/cff.c
@@ -4,7 +4,7 @@
  *
  *   FreeType OpenType driver component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffcmap.c b/engine/thirdparty/freetype/src/cff/cffcmap.c
index 10d287bc..ea5f8ed2 100644
--- a/engine/thirdparty/freetype/src/cff/cffcmap.c
+++ b/engine/thirdparty/freetype/src/cff/cffcmap.c
@@ -4,7 +4,7 @@
  *
  *   CFF character mapping table (cmap) support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffcmap.h b/engine/thirdparty/freetype/src/cff/cffcmap.h
index b2afc2fa..1dd8700c 100644
--- a/engine/thirdparty/freetype/src/cff/cffcmap.h
+++ b/engine/thirdparty/freetype/src/cff/cffcmap.h
@@ -4,7 +4,7 @@
  *
  *   CFF character mapping table (cmap) support (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffdrivr.c b/engine/thirdparty/freetype/src/cff/cffdrivr.c
index 9898d625..f6ebdb38 100644
--- a/engine/thirdparty/freetype/src/cff/cffdrivr.c
+++ b/engine/thirdparty/freetype/src/cff/cffdrivr.c
@@ -4,7 +4,7 @@
  *
  *   OpenType font driver implementation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Dominik Röttsches.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffdrivr.h b/engine/thirdparty/freetype/src/cff/cffdrivr.h
index ab1f147b..fd5bc37e 100644
--- a/engine/thirdparty/freetype/src/cff/cffdrivr.h
+++ b/engine/thirdparty/freetype/src/cff/cffdrivr.h
@@ -4,7 +4,7 @@
  *
  *   High-level OpenType driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cfferrs.h b/engine/thirdparty/freetype/src/cff/cfferrs.h
index bc9a3043..128adc3b 100644
--- a/engine/thirdparty/freetype/src/cff/cfferrs.h
+++ b/engine/thirdparty/freetype/src/cff/cfferrs.h
@@ -4,7 +4,7 @@
  *
  *   CFF error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffgload.c b/engine/thirdparty/freetype/src/cff/cffgload.c
index c483d1d1..cbb071ab 100644
--- a/engine/thirdparty/freetype/src/cff/cffgload.c
+++ b/engine/thirdparty/freetype/src/cff/cffgload.c
@@ -4,7 +4,7 @@
  *
  *   OpenType Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffgload.h b/engine/thirdparty/freetype/src/cff/cffgload.h
index 3b8cf236..346d4b11 100644
--- a/engine/thirdparty/freetype/src/cff/cffgload.h
+++ b/engine/thirdparty/freetype/src/cff/cffgload.h
@@ -4,7 +4,7 @@
  *
  *   OpenType Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffload.c b/engine/thirdparty/freetype/src/cff/cffload.c
index af79082e..979fd45f 100644
--- a/engine/thirdparty/freetype/src/cff/cffload.c
+++ b/engine/thirdparty/freetype/src/cff/cffload.c
@@ -4,7 +4,7 @@
  *
  *   OpenType and CFF data/program tables loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -1202,17 +1202,21 @@
         {
           CFF_AxisCoords*  axis = &region->axisList[j];
 
-          FT_Int16  start14, peak14, end14;
+          FT_Int  start, peak, end;
 
 
-          if ( FT_READ_SHORT( start14 ) ||
-               FT_READ_SHORT( peak14 )  ||
-               FT_READ_SHORT( end14 )   )
+          if ( FT_READ_SHORT( start ) ||
+               FT_READ_SHORT( peak )  ||
+               FT_READ_SHORT( end )   )
             goto Exit;
 
-          axis->startCoord = FT_fdot14ToFixed( start14 );
-          axis->peakCoord  = FT_fdot14ToFixed( peak14 );
-          axis->endCoord   = FT_fdot14ToFixed( end14 );
+          /* immediately tag invalid ranges with special peak = 0 */
+          if ( ( start < 0 && end > 0 ) || start > peak || peak > end )
+            peak = 0;
+
+          axis->startCoord = FT_fdot14ToFixed( start );
+          axis->peakCoord  = FT_fdot14ToFixed( peak );
+          axis->endCoord   = FT_fdot14ToFixed( end );
         }
       }
 
@@ -1379,10 +1383,10 @@
       /* opcode in both CFF and CFF2 DICTs.  See `cff_parse_num' for    */
       /* decode of this, which rounds to an integer.                    */
       *subFont->blend_top++ = 255;
-      *subFont->blend_top++ = (FT_Byte)( sum >> 24 );
-      *subFont->blend_top++ = (FT_Byte)( sum >> 16 );
-      *subFont->blend_top++ = (FT_Byte)( sum >>  8 );
-      *subFont->blend_top++ = (FT_Byte)sum;
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum >> 24 );
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum >> 16 );
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum >>  8 );
+      *subFont->blend_top++ = (FT_Byte)( (FT_UInt32)sum );
     }
 
     /* leave only numBlends results on parser stack */
@@ -1495,44 +1499,31 @@
       for ( j = 0; j < lenNDV; j++ )
       {
         CFF_AxisCoords*  axis = &varRegion->axisList[j];
-        FT_Fixed         axisScalar;
 
 
-        /* compute the scalar contribution of this axis; */
-        /* ignore invalid ranges                         */
-        if ( axis->startCoord > axis->peakCoord ||
-             axis->peakCoord > axis->endCoord   )
-          axisScalar = FT_FIXED_ONE;
-
-        else if ( axis->startCoord < 0 &&
-                  axis->endCoord > 0   &&
-                  axis->peakCoord != 0 )
-          axisScalar = FT_FIXED_ONE;
-
-        /* peak of 0 means ignore this axis */
-        else if ( axis->peakCoord == 0 )
-          axisScalar = FT_FIXED_ONE;
+        /* compute the scalar contribution of this axis */
+        /* with peak of 0 used for invalid axes         */
+        if ( axis->peakCoord == NDV[j] ||
+             axis->peakCoord == 0      )
+          continue;
 
         /* ignore this region if coords are out of range */
-        else if ( NDV[j] < axis->startCoord ||
-                  NDV[j] > axis->endCoord   )
-          axisScalar = 0;
-
-        /* calculate a proportional factor */
-        else
+        else if ( NDV[j] <= axis->startCoord ||
+                  NDV[j] >= axis->endCoord   )
         {
-          if ( NDV[j] == axis->peakCoord )
-            axisScalar = FT_FIXED_ONE;
-          else if ( NDV[j] < axis->peakCoord )
-            axisScalar = FT_DivFix( NDV[j] - axis->startCoord,
-                                    axis->peakCoord - axis->startCoord );
-          else
-            axisScalar = FT_DivFix( axis->endCoord - NDV[j],
-                                    axis->endCoord - axis->peakCoord );
+          blend->BV[master] = 0;
+          break;
         }
 
-        /* take product of all the axis scalars */
-        blend->BV[master] = FT_MulFix( blend->BV[master], axisScalar );
+        /* adjust proportionally */
+        else if ( NDV[j] < axis->peakCoord )
+          blend->BV[master] = FT_MulDiv( blend->BV[master],
+                                         NDV[j] - axis->startCoord,
+                                         axis->peakCoord - axis->startCoord );
+        else   /* NDV[j] > axis->peakCoord ) */
+          blend->BV[master] = FT_MulDiv( blend->BV[master],
+                                         axis->endCoord - NDV[j],
+                                         axis->endCoord - axis->peakCoord );
       }
 
       FT_TRACE4(( ", %f ",
diff --git a/engine/thirdparty/freetype/src/cff/cffload.h b/engine/thirdparty/freetype/src/cff/cffload.h
index b5286b0c..02209245 100644
--- a/engine/thirdparty/freetype/src/cff/cffload.h
+++ b/engine/thirdparty/freetype/src/cff/cffload.h
@@ -4,7 +4,7 @@
  *
  *   OpenType & CFF data/program tables loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffobjs.c b/engine/thirdparty/freetype/src/cff/cffobjs.c
index 6d08620c..7c671373 100644
--- a/engine/thirdparty/freetype/src/cff/cffobjs.c
+++ b/engine/thirdparty/freetype/src/cff/cffobjs.c
@@ -4,7 +4,7 @@
  *
  *   OpenType objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -42,6 +42,8 @@
 #include <freetype/internal/psaux.h>
 #include <freetype/internal/services/svcfftl.h>
 
+#define CFF_fixedToInt( x )                          \
+          ( (FT_Short)( ( (x) + 0x8000U ) >> 16 ) )
 
   /**************************************************************************
    *
@@ -124,19 +126,20 @@
 
     count = priv->num_blue_values = cpriv->num_blue_values;
     for ( n = 0; n < count; n++ )
-      priv->blue_values[n] = (FT_Short)cpriv->blue_values[n];
+      priv->blue_values[n] = CFF_fixedToInt( cpriv->blue_values[n] );
 
     count = priv->num_other_blues = cpriv->num_other_blues;
     for ( n = 0; n < count; n++ )
-      priv->other_blues[n] = (FT_Short)cpriv->other_blues[n];
+      priv->other_blues[n] = CFF_fixedToInt( cpriv->other_blues[n] );
 
     count = priv->num_family_blues = cpriv->num_family_blues;
     for ( n = 0; n < count; n++ )
-      priv->family_blues[n] = (FT_Short)cpriv->family_blues[n];
+      priv->family_blues[n] = CFF_fixedToInt( cpriv->family_blues[n] );
 
     count = priv->num_family_other_blues = cpriv->num_family_other_blues;
     for ( n = 0; n < count; n++ )
-      priv->family_other_blues[n] = (FT_Short)cpriv->family_other_blues[n];
+      priv->family_other_blues[n] =
+        CFF_fixedToInt( cpriv->family_other_blues[n] );
 
     priv->blue_scale = cpriv->blue_scale;
     priv->blue_shift = (FT_Int)cpriv->blue_shift;
@@ -421,32 +424,23 @@
   static void
   remove_subset_prefix( FT_String*  name )
   {
-    FT_Int32  idx             = 0;
-    FT_Int32  length          = (FT_Int32)ft_strlen( name ) + 1;
-    FT_Bool   continue_search = 1;
+    FT_UInt32  i = 0, idx = 0;
 
 
-    while ( continue_search )
+    /* six ASCII uppercase letters followed by a plus sign */
+    while ( 'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+            'A' <= name[i] && name[i++] <= 'Z' &&
+                              name[i++] == '+' )
     {
-      if ( length >= 7 && name[6] == '+' )
-      {
-        for ( idx = 0; idx < 6; idx++ )
-        {
-          /* ASCII uppercase letters */
-          if ( !( 'A' <= name[idx] && name[idx] <= 'Z' ) )
-            continue_search = 0;
-        }
-
-        if ( continue_search )
-        {
-          for ( idx = 7; idx < length; idx++ )
-            name[idx - 7] = name[idx];
-          length -= 7;
-        }
-      }
-      else
-        continue_search = 0;
+      idx = i;
     }
+
+    if ( idx )
+      FT_MEM_MOVE( name, name + idx, ft_strlen( name + idx ) + 1 );
   }
 
 
@@ -456,42 +450,20 @@
   remove_style( FT_String*        family_name,
                 const FT_String*  style_name )
   {
-    FT_Int32  family_name_length, style_name_length;
+    FT_String*        f = family_name + ft_strlen( family_name );
+    const FT_String*  s =  style_name + ft_strlen(  style_name );
 
 
-    family_name_length = (FT_Int32)ft_strlen( family_name );
-    style_name_length  = (FT_Int32)ft_strlen( style_name );
+    /* compare strings moving backwards */
+    while ( s > style_name )
+      if ( f == family_name || *--s != *--f )
+        return;
 
-    if ( family_name_length > style_name_length )
-    {
-      FT_Int  idx;
-
-
-      for ( idx = 1; idx <= style_name_length; idx++ )
-      {
-        if ( family_name[family_name_length - idx] !=
-             style_name[style_name_length - idx] )
-          break;
-      }
-
-      if ( idx > style_name_length )
-      {
-        /* family_name ends with style_name; remove it */
-        idx = family_name_length - style_name_length - 1;
-
-        /* also remove special characters     */
-        /* between real family name and style */
-        while ( idx > 0                     &&
-                ( family_name[idx] == '-' ||
-                  family_name[idx] == ' ' ||
-                  family_name[idx] == '_' ||
-                  family_name[idx] == '+' ) )
-          idx--;
-
-        if ( idx > 0 )
-          family_name[idx + 1] = '\0';
-      }
-    }
+    /* terminate and remove special characters */
+    do
+      *f = '\0';
+    while ( f-- > family_name                                    &&
+            ( *f == '-' || *f == ' ' || *f == '_' || *f == '+' ) );
   }
 
 
@@ -722,8 +694,7 @@
         FT_UInt  instance_index = (FT_UInt)face_index >> 16;
 
 
-        if ( FT_HAS_MULTIPLE_MASTERS( cffface ) &&
-             instance_index > 0                 )
+        if ( FT_HAS_MULTIPLE_MASTERS( cffface ) )
         {
           error = FT_Set_Named_Instance( cffface, instance_index );
           if ( error )
diff --git a/engine/thirdparty/freetype/src/cff/cffobjs.h b/engine/thirdparty/freetype/src/cff/cffobjs.h
index 8f05f613..91ad83b1 100644
--- a/engine/thirdparty/freetype/src/cff/cffobjs.h
+++ b/engine/thirdparty/freetype/src/cff/cffobjs.h
@@ -4,7 +4,7 @@
  *
  *   OpenType objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cff/cffparse.c b/engine/thirdparty/freetype/src/cff/cffparse.c
index 3b076704..92a69c3b 100644
--- a/engine/thirdparty/freetype/src/cff/cffparse.c
+++ b/engine/thirdparty/freetype/src/cff/cffparse.c
@@ -4,7 +4,7 @@
  *
  *   CFF token stream parser (body)
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -501,10 +501,10 @@
       return cff_parse_real( *d, parser->limit, scaling, NULL );
     else if ( **d == 255 )
     {
-      FT_Fixed val = ( ( ( (FT_UInt32)*( d[0] + 1 ) << 24 ) |
-                         ( (FT_UInt32)*( d[0] + 2 ) << 16 ) |
-                         ( (FT_UInt32)*( d[0] + 3 ) <<  8 ) |
-                           (FT_UInt32)*( d[0] + 4 )         ) );
+      FT_Fixed val = (FT_Int32)( ( ( (FT_UInt32)*( d[0] + 1 ) << 24 ) |
+                                   ( (FT_UInt32)*( d[0] + 2 ) << 16 ) |
+                                   ( (FT_UInt32)*( d[0] + 3 ) <<  8 ) |
+                                     (FT_UInt32)*( d[0] + 4 )         ) );
 
       if ( scaling )
       {
@@ -1031,10 +1031,14 @@
           CFF_FIELD( code, name, id, cff_kind_string )
 #define CFF_FIELD_BOOL( code, name, id )             \
           CFF_FIELD( code, name, id, cff_kind_bool )
+#define CFF_FIELD_DELTA( code, name, max, id )                        \
+          CFF_FIELD_DELTA_KIND( code, name, max, id, cff_kind_delta )
+#define CFF_FIELD_DELTA_FIXED( code, name, max, id )                        \
+          CFF_FIELD_DELTA_KIND( code, name, max, id, cff_kind_delta_fixed )
 
 
 #undef  CFF_FIELD
-#undef  CFF_FIELD_DELTA
+#undef  CFF_FIELD_DELTA_KIND
 
 
 #ifndef FT_DEBUG_LEVEL_TRACE
@@ -1064,18 +1068,18 @@
             code | CFFCODE,               \
             FT_FIELD_OFFSET( name ),      \
             FT_FIELD_SIZE( name ),        \
-            0, 0, 0                       \
+            NULL, 0, 0                    \
           },
 
-#define CFF_FIELD_DELTA( code, name, max, id ) \
-          {                                    \
-            cff_kind_delta,                    \
-            code | CFFCODE,                    \
-            FT_FIELD_OFFSET( name ),           \
-            FT_FIELD_SIZE_DELTA( name ),       \
-            0,                                 \
-            max,                               \
-            FT_FIELD_OFFSET( num_ ## name )    \
+#define CFF_FIELD_DELTA_KIND( code, name, max, id, kind ) \
+          {                                               \
+            kind,                                         \
+            code | CFFCODE,                               \
+            FT_FIELD_OFFSET( name ),                      \
+            FT_FIELD_SIZE_DELTA( name ),                  \
+            NULL,                                         \
+            max,                                          \
+            FT_FIELD_OFFSET( num_ ## name )               \
           },
 
   static const CFF_Field_Handler  cff_field_handlers[] =
@@ -1083,7 +1087,7 @@
 
 #include "cfftoken.h"
 
-    { 0, 0, 0, 0, 0, 0, 0 }
+    { 0, 0, 0, 0, NULL, 0, 0 }
   };
 
 
@@ -1117,20 +1121,20 @@
             code | CFFCODE,               \
             FT_FIELD_OFFSET( name ),      \
             FT_FIELD_SIZE( name ),        \
-            0, 0, 0,                      \
+            NULL, 0, 0,                   \
             id                            \
           },
 
-#define CFF_FIELD_DELTA( code, name, max, id ) \
-          {                                    \
-            cff_kind_delta,                    \
-            code | CFFCODE,                    \
-            FT_FIELD_OFFSET( name ),           \
-            FT_FIELD_SIZE_DELTA( name ),       \
-            0,                                 \
-            max,                               \
-            FT_FIELD_OFFSET( num_ ## name ),   \
-            id                                 \
+#define CFF_FIELD_DELTA_KIND( code, name, max, id, kind ) \
+          {                                               \
+            kind,                                         \
+            code | CFFCODE,                               \
+            FT_FIELD_OFFSET( name ),                      \
+            FT_FIELD_SIZE_DELTA( name ),                  \
+            NULL,                                         \
+            max,                                          \
+            FT_FIELD_OFFSET( num_ ## name ),              \
+            id                                            \
           },
 
   static const CFF_Field_Handler  cff_field_handlers[] =
@@ -1138,7 +1142,7 @@
 
 #include "cfftoken.h"
 
-    { 0, 0, 0, 0, 0, 0, 0, 0 }
+    { 0, 0, 0, 0, NULL, 0, 0, NULL }
   };
 
 
@@ -1356,7 +1360,8 @@
 
             /* check that we have enough arguments -- except for */
             /* delta encoded arrays, which can be empty          */
-            if ( field->kind != cff_kind_delta && num_args < 1 )
+            if ( field->kind != cff_kind_delta                       &&
+                 field->kind != cff_kind_delta_fixed && num_args < 1 )
               goto Stack_Underflow;
 
             switch ( field->kind )
@@ -1471,6 +1476,38 @@
               }
               break;
 
+            case cff_kind_delta_fixed:
+              {
+                FT_Byte*   qcount = (FT_Byte*)parser->object +
+                                      field->count_offset;
+
+                FT_Byte**  data = parser->stack;
+
+
+                if ( num_args > field->array_max )
+                  num_args = field->array_max;
+
+                FT_TRACE4(( " [" ));
+
+                /* store count */
+                *qcount = (FT_Byte)num_args;
+
+                val = 0;
+                while ( num_args > 0 )
+                {
+                  val = ADD_LONG( val, cff_parse_fixed( parser, data++ ) );
+                  *(FT_Long*)q = val;
+
+                  FT_TRACE4(( " %f\n", (double)val / 65536 ));
+
+                  q += field->size;
+                  num_args--;
+                }
+
+                FT_TRACE4(( "]\n" ));
+              }
+              break;
+
             default:  /* callback or blend */
               error = field->reader( parser );
               if ( error )
diff --git a/engine/thirdparty/freetype/src/cff/cffparse.h b/engine/thirdparty/freetype/src/cff/cffparse.h
index 418caacc..ca6b18af 100644
--- a/engine/thirdparty/freetype/src/cff/cffparse.h
+++ b/engine/thirdparty/freetype/src/cff/cffparse.h
@@ -4,7 +4,7 @@
  *
  *   CFF token stream parser (specification)
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -107,6 +107,7 @@ FT_BEGIN_HEADER
     cff_kind_string,
     cff_kind_bool,
     cff_kind_delta,
+    cff_kind_delta_fixed,
     cff_kind_callback,
     cff_kind_blend,
 
diff --git a/engine/thirdparty/freetype/src/cff/cfftoken.h b/engine/thirdparty/freetype/src/cff/cfftoken.h
index b61cb0e6..da45faa7 100644
--- a/engine/thirdparty/freetype/src/cff/cfftoken.h
+++ b/engine/thirdparty/freetype/src/cff/cfftoken.h
@@ -4,7 +4,7 @@
  *
  *   CFF token definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -80,26 +80,26 @@
 #undef  CFFCODE
 #define CFFCODE       CFF_CODE_PRIVATE
 
-  CFF_FIELD_DELTA     ( 6,     blue_values, 14,        "BlueValues" )
-  CFF_FIELD_DELTA     ( 7,     other_blues, 10,        "OtherBlues" )
-  CFF_FIELD_DELTA     ( 8,     family_blues, 14,       "FamilyBlues" )
-  CFF_FIELD_DELTA     ( 9,     family_other_blues, 10, "FamilyOtherBlues" )
-  CFF_FIELD_FIXED_1000( 0x109, blue_scale,             "BlueScale" )
-  CFF_FIELD_NUM       ( 0x10A, blue_shift,             "BlueShift" )
-  CFF_FIELD_NUM       ( 0x10B, blue_fuzz,              "BlueFuzz" )
-  CFF_FIELD_NUM       ( 10,    standard_width,         "StdHW" )
-  CFF_FIELD_NUM       ( 11,    standard_height,        "StdVW" )
-  CFF_FIELD_DELTA     ( 0x10C, snap_widths, 13,        "StemSnapH" )
-  CFF_FIELD_DELTA     ( 0x10D, snap_heights, 13,       "StemSnapV" )
-  CFF_FIELD_BOOL      ( 0x10E, force_bold,             "ForceBold" )
-  CFF_FIELD_FIXED     ( 0x10F, force_bold_threshold,   "ForceBoldThreshold" )
-  CFF_FIELD_NUM       ( 0x110, lenIV,                  "lenIV" )
-  CFF_FIELD_NUM       ( 0x111, language_group,         "LanguageGroup" )
-  CFF_FIELD_FIXED     ( 0x112, expansion_factor,       "ExpansionFactor" )
-  CFF_FIELD_NUM       ( 0x113, initial_random_seed,    "initialRandomSeed" )
-  CFF_FIELD_NUM       ( 19,    local_subrs_offset,     "Subrs" )
-  CFF_FIELD_NUM       ( 20,    default_width,          "defaultWidthX" )
-  CFF_FIELD_NUM       ( 21,    nominal_width,          "nominalWidthX" )
+  CFF_FIELD_DELTA_FIXED( 6,     blue_values, 14,        "BlueValues" )
+  CFF_FIELD_DELTA_FIXED( 7,     other_blues, 10,        "OtherBlues" )
+  CFF_FIELD_DELTA_FIXED( 8,     family_blues, 14,       "FamilyBlues" )
+  CFF_FIELD_DELTA_FIXED( 9,     family_other_blues, 10, "FamilyOtherBlues" )
+  CFF_FIELD_FIXED_1000 ( 0x109, blue_scale,             "BlueScale" )
+  CFF_FIELD_NUM        ( 0x10A, blue_shift,             "BlueShift" )
+  CFF_FIELD_NUM        ( 0x10B, blue_fuzz,              "BlueFuzz" )
+  CFF_FIELD_NUM        ( 10,    standard_width,         "StdHW" )
+  CFF_FIELD_NUM        ( 11,    standard_height,        "StdVW" )
+  CFF_FIELD_DELTA      ( 0x10C, snap_widths, 13,        "StemSnapH" )
+  CFF_FIELD_DELTA      ( 0x10D, snap_heights, 13,       "StemSnapV" )
+  CFF_FIELD_BOOL       ( 0x10E, force_bold,             "ForceBold" )
+  CFF_FIELD_FIXED      ( 0x10F, force_bold_threshold,   "ForceBoldThreshold" )
+  CFF_FIELD_NUM        ( 0x110, lenIV,                  "lenIV" )
+  CFF_FIELD_NUM        ( 0x111, language_group,         "LanguageGroup" )
+  CFF_FIELD_FIXED      ( 0x112, expansion_factor,       "ExpansionFactor" )
+  CFF_FIELD_NUM        ( 0x113, initial_random_seed,    "initialRandomSeed" )
+  CFF_FIELD_NUM        ( 19,    local_subrs_offset,     "Subrs" )
+  CFF_FIELD_NUM        ( 20,    default_width,          "defaultWidthX" )
+  CFF_FIELD_NUM        ( 21,    nominal_width,          "nominalWidthX" )
 
 
 #undef  FT_STRUCTURE
@@ -129,22 +129,22 @@
 #undef  CFFCODE
 #define CFFCODE       CFF2_CODE_PRIVATE
 
-  CFF_FIELD_DELTA     ( 6,     blue_values, 14,        "BlueValues" )
-  CFF_FIELD_DELTA     ( 7,     other_blues, 10,        "OtherBlues" )
-  CFF_FIELD_DELTA     ( 8,     family_blues, 14,       "FamilyBlues" )
-  CFF_FIELD_DELTA     ( 9,     family_other_blues, 10, "FamilyOtherBlues" )
-  CFF_FIELD_FIXED_1000( 0x109, blue_scale,             "BlueScale" )
-  CFF_FIELD_NUM       ( 0x10A, blue_shift,             "BlueShift" )
-  CFF_FIELD_NUM       ( 0x10B, blue_fuzz,              "BlueFuzz" )
-  CFF_FIELD_NUM       ( 10,    standard_width,         "StdHW" )
-  CFF_FIELD_NUM       ( 11,    standard_height,        "StdVW" )
-  CFF_FIELD_DELTA     ( 0x10C, snap_widths, 13,        "StemSnapH" )
-  CFF_FIELD_DELTA     ( 0x10D, snap_heights, 13,       "StemSnapV" )
-  CFF_FIELD_NUM       ( 0x111, language_group,         "LanguageGroup" )
-  CFF_FIELD_FIXED     ( 0x112, expansion_factor,       "ExpansionFactor" )
-  CFF_FIELD_CALLBACK  ( 22,    vsindex,                "vsindex" )
-  CFF_FIELD_BLEND     ( 23,                            "blend" )
-  CFF_FIELD_NUM       ( 19,    local_subrs_offset,     "Subrs" )
+  CFF_FIELD_DELTA_FIXED( 6,     blue_values, 14,        "BlueValues" )
+  CFF_FIELD_DELTA_FIXED( 7,     other_blues, 10,        "OtherBlues" )
+  CFF_FIELD_DELTA_FIXED( 8,     family_blues, 14,       "FamilyBlues" )
+  CFF_FIELD_DELTA_FIXED( 9,     family_other_blues, 10, "FamilyOtherBlues" )
+  CFF_FIELD_FIXED_1000 ( 0x109, blue_scale,             "BlueScale" )
+  CFF_FIELD_NUM        ( 0x10A, blue_shift,             "BlueShift" )
+  CFF_FIELD_NUM        ( 0x10B, blue_fuzz,              "BlueFuzz" )
+  CFF_FIELD_NUM        ( 10,    standard_width,         "StdHW" )
+  CFF_FIELD_NUM        ( 11,    standard_height,        "StdVW" )
+  CFF_FIELD_DELTA      ( 0x10C, snap_widths, 13,        "StemSnapH" )
+  CFF_FIELD_DELTA      ( 0x10D, snap_heights, 13,       "StemSnapV" )
+  CFF_FIELD_NUM        ( 0x111, language_group,         "LanguageGroup" )
+  CFF_FIELD_FIXED      ( 0x112, expansion_factor,       "ExpansionFactor" )
+  CFF_FIELD_CALLBACK   ( 22,    vsindex,                "vsindex" )
+  CFF_FIELD_BLEND      ( 23,                            "blend" )
+  CFF_FIELD_NUM        ( 19,    local_subrs_offset,     "Subrs" )
 
 
 /* END */
diff --git a/engine/thirdparty/freetype/src/cid/ciderrs.h b/engine/thirdparty/freetype/src/cid/ciderrs.h
index 40a1097d..c439a8c4 100644
--- a/engine/thirdparty/freetype/src/cid/ciderrs.h
+++ b/engine/thirdparty/freetype/src/cid/ciderrs.h
@@ -4,7 +4,7 @@
  *
  *   CID error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidgload.c b/engine/thirdparty/freetype/src/cid/cidgload.c
index eaca765a..7b571322 100644
--- a/engine/thirdparty/freetype/src/cid/cidgload.c
+++ b/engine/thirdparty/freetype/src/cid/cidgload.c
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidgload.h b/engine/thirdparty/freetype/src/cid/cidgload.h
index edd62292..9fdc9db5 100644
--- a/engine/thirdparty/freetype/src/cid/cidgload.h
+++ b/engine/thirdparty/freetype/src/cid/cidgload.h
@@ -4,7 +4,7 @@
  *
  *   OpenType Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidload.c b/engine/thirdparty/freetype/src/cid/cidload.c
index a7da8ea3..722f5a34 100644
--- a/engine/thirdparty/freetype/src/cid/cidload.c
+++ b/engine/thirdparty/freetype/src/cid/cidload.c
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 font loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -388,7 +388,7 @@
     T1_FIELD_CALLBACK( "ExpansionFactor", parse_expansion_factor, 0 )
     T1_FIELD_CALLBACK( "FontName",        parse_font_name, 0 )
 
-    { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 }
+    T1_FIELD_ZERO
   };
 
 
@@ -469,36 +469,23 @@
             T1_Field  keyword = (T1_Field)cid_field_records;
 
 
-            for (;;)
+            while ( keyword->len )
             {
-              FT_Byte*  name;
+              FT_Byte*  name = (FT_Byte*)keyword->ident;
 
 
-              name = (FT_Byte*)keyword->ident;
-              if ( !name )
-                break;
-
-              if ( cur[0] == name[0]                     &&
-                   len == ft_strlen( (const char*)name ) )
+              if ( keyword->len == len              &&
+                   ft_memcmp( cur, name, len ) == 0 )
               {
-                FT_UInt  n;
-
-
-                for ( n = 1; n < len; n++ )
-                  if ( cur[n] != name[n] )
-                    break;
-
-                if ( n >= len )
-                {
-                  /* we found it - run the parsing callback */
-                  parser->root.error = cid_load_keyword( face,
-                                                         loader,
-                                                         keyword );
-                  if ( parser->root.error )
-                    return parser->root.error;
-                  break;
-                }
+                /* we found it - run the parsing callback */
+                parser->root.error = cid_load_keyword( face,
+                                                       loader,
+                                                       keyword );
+                if ( parser->root.error )
+                  return parser->root.error;
+                break;
               }
+
               keyword++;
             }
           }
diff --git a/engine/thirdparty/freetype/src/cid/cidload.h b/engine/thirdparty/freetype/src/cid/cidload.h
index d12d2962..7f030b32 100644
--- a/engine/thirdparty/freetype/src/cid/cidload.h
+++ b/engine/thirdparty/freetype/src/cid/cidload.h
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 font loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidobjs.c b/engine/thirdparty/freetype/src/cid/cidobjs.c
index f698a419..8d337c41 100644
--- a/engine/thirdparty/freetype/src/cid/cidobjs.c
+++ b/engine/thirdparty/freetype/src/cid/cidobjs.c
@@ -4,7 +4,7 @@
  *
  *   CID objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidobjs.h b/engine/thirdparty/freetype/src/cid/cidobjs.h
index 83c0c61c..d371cbe9 100644
--- a/engine/thirdparty/freetype/src/cid/cidobjs.h
+++ b/engine/thirdparty/freetype/src/cid/cidobjs.h
@@ -4,7 +4,7 @@
  *
  *   CID objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidparse.c b/engine/thirdparty/freetype/src/cid/cidparse.c
index 171a8862..73a3ade8 100644
--- a/engine/thirdparty/freetype/src/cid/cidparse.c
+++ b/engine/thirdparty/freetype/src/cid/cidparse.c
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 parser (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -90,10 +90,15 @@
     if ( error )
       goto Exit;
 
-  Again:
-    /* now, read the rest of the file until we find */
-    /* `StartData' or `/sfnts'                      */
+    if ( !stream->read ) {
+      /* just parse memory-based streams */
+      offset = stream->size;
+    }
+    else
     {
+      /* Find the last `StartData` or `/sfnts`.  The parser requires */
+      /* contiguous memory; attempt to pin as little as necessary.   */
+
       /*
        * The algorithm is as follows (omitting the case with less than 256
        * bytes to fill for simplicity).
@@ -119,7 +124,8 @@
       FT_Byte*  p           = buffer;
 
 
-      for ( offset = FT_STREAM_POS(); ; offset += 256 )
+      offset = 0;
+      while ( 1 )
       {
         FT_ULong  stream_len;
 
@@ -127,7 +133,7 @@
         stream_len = stream->size - FT_STREAM_POS();
 
         read_len = FT_MIN( read_len, stream_len );
-        if ( FT_STREAM_READ( p, read_len ) )
+        if ( read_len && FT_STREAM_READ( p, read_len ) )
           goto Exit;
 
         /* ensure that we do not compare with data beyond the buffer */
@@ -141,20 +147,23 @@
                ft_strncmp( (char*)p, STARTDATA, STARTDATA_LEN ) == 0 )
           {
             /* save offset of binary data after `StartData' */
-            offset += (FT_ULong)( p - buffer ) + STARTDATA_LEN + 1;
-            goto Found;
+            offset = FT_STREAM_POS() - read_len - read_offset
+                     + (FT_ULong)( p - buffer ) + STARTDATA_LEN + 1;
           }
           else if ( p[1] == 's'                                   &&
                     ft_strncmp( (char*)p, SFNTS, SFNTS_LEN ) == 0 )
           {
-            offset += (FT_ULong)( p - buffer ) + SFNTS_LEN + 1;
-            goto Found;
+            offset = FT_STREAM_POS() - read_len - read_offset
+                     + (FT_ULong)( p - buffer ) + SFNTS_LEN + 1;
           }
         }
 
-        if ( read_offset + read_len < STARTDATA_LEN )
+        if ( read_offset + read_len <= STARTDATA_LEN )
         {
-          FT_TRACE2(( "cid_parser_new: no `StartData' keyword found\n" ));
+          if ( offset )
+            goto Found;
+
+          FT_TRACE2(( "cid_parser_new: no `StartData` keyword found\n" ));
           error = FT_THROW( Invalid_File_Format );
           goto Exit;
         }
@@ -171,9 +180,9 @@
     }
 
   Found:
-    /* We have found the start of the binary data or the `/sfnts' token. */
-    /* Now rewind and extract the frame corresponding to this PostScript */
-    /* section.                                                          */
+    /* We have found an efficient range to look for the binary data or    */
+    /* `/sfnts' token.  Now rewind and extract the frame corresponding to */
+    /* this PostScript section.                                           */
 
     ps_len = offset - base_offset;
     if ( FT_STREAM_SEEK( base_offset )                  ||
@@ -187,8 +196,8 @@
     parser->root.limit     = parser->root.cursor + ps_len;
     parser->num_dict       = FT_UINT_MAX;
 
-    /* Finally, we check whether `StartData' or `/sfnts' was real --  */
-    /* it could be in a comment or string.  We also get the arguments */
+    /* Find the first real `StartData' or `/sfnts' -- the last one    */
+    /* could be in a comment or string.  We also get the arguments    */
     /* of `StartData' to find out whether the data is represented in  */
     /* binary or hex format.                                          */
 
@@ -216,6 +225,7 @@
       {
         T1_TokenRec  type_token;
         FT_Long      binary_length;
+        FT_ULong     found_offset;
 
 
         parser->root.cursor = arg1;
@@ -234,6 +244,24 @@
             parser->binary_length = (FT_ULong)binary_length;
         }
 
+        /* set the real values for the parser, if different */
+        found_offset = (FT_ULong)( cur - parser->postscript )
+                       + STARTDATA_LEN + 1;
+        if ( found_offset != offset )
+        {
+          FT_FRAME_RELEASE( parser->postscript );
+
+          ps_len = found_offset - base_offset;
+          if ( FT_STREAM_SEEK( base_offset )                  ||
+               FT_FRAME_EXTRACT( ps_len, parser->postscript ) )
+            goto Exit;
+
+          parser->data_offset    = found_offset;
+          parser->postscript_len = ps_len;
+          parser->root.base      = parser->postscript;
+          parser->root.cursor    = parser->postscript;
+          parser->root.limit     = parser->root.cursor + ps_len;
+        }
         goto Exit;
       }
       else if ( cur[1] == 's'                                   &&
@@ -251,11 +279,8 @@
       cur  = parser->root.cursor;
     }
 
-    /* we haven't found the correct `StartData'; go back and continue */
-    /* searching                                                      */
-    FT_FRAME_RELEASE( parser->postscript );
-    if ( !FT_STREAM_SEEK( offset ) )
-      goto Again;
+    FT_TRACE2(( "cid_parser_new: no `StartData` token found\n" ));
+    error = FT_THROW( Invalid_File_Format );
 
   Exit:
     return error;
diff --git a/engine/thirdparty/freetype/src/cid/cidparse.h b/engine/thirdparty/freetype/src/cid/cidparse.h
index 2fd4e7a9..0f5baddc 100644
--- a/engine/thirdparty/freetype/src/cid/cidparse.h
+++ b/engine/thirdparty/freetype/src/cid/cidparse.h
@@ -4,7 +4,7 @@
  *
  *   CID-keyed Type1 parser (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidriver.c b/engine/thirdparty/freetype/src/cid/cidriver.c
index 99e7b118..4be8a5c0 100644
--- a/engine/thirdparty/freetype/src/cid/cidriver.c
+++ b/engine/thirdparty/freetype/src/cid/cidriver.c
@@ -4,7 +4,7 @@
  *
  *   CID driver interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidriver.h b/engine/thirdparty/freetype/src/cid/cidriver.h
index a6249385..7ddce431 100644
--- a/engine/thirdparty/freetype/src/cid/cidriver.h
+++ b/engine/thirdparty/freetype/src/cid/cidriver.h
@@ -4,7 +4,7 @@
  *
  *   High-level CID driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/cidtoken.h b/engine/thirdparty/freetype/src/cid/cidtoken.h
index 925951ac..160897d1 100644
--- a/engine/thirdparty/freetype/src/cid/cidtoken.h
+++ b/engine/thirdparty/freetype/src/cid/cidtoken.h
@@ -4,7 +4,7 @@
  *
  *   CID token definitions (specification only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/cid/type1cid.c b/engine/thirdparty/freetype/src/cid/type1cid.c
index 905c896a..890a3ac5 100644
--- a/engine/thirdparty/freetype/src/cid/type1cid.c
+++ b/engine/thirdparty/freetype/src/cid/type1cid.c
@@ -4,7 +4,7 @@
  *
  *   FreeType OpenType driver component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvalid.c b/engine/thirdparty/freetype/src/gxvalid/gxvalid.c
index e0359f4d..6694c342 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvalid.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvalid.c
@@ -4,7 +4,7 @@
  *
  *   FreeType validator for TrueTypeGX/AAT tables (body only).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvalid.h b/engine/thirdparty/freetype/src/gxvalid/gxvalid.h
index a83408b4..4ddb625e 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvalid.h
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvalid.h
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT table validation (specification only).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvbsln.c b/engine/thirdparty/freetype/src/gxvalid/gxvbsln.c
index 030a64ee..e3a922ae 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvbsln.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvbsln.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT bsln table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvcommn.c b/engine/thirdparty/freetype/src/gxvalid/gxvcommn.c
index 7f908742..5f8fa115 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvcommn.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvcommn.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT common tables validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvcommn.h b/engine/thirdparty/freetype/src/gxvalid/gxvcommn.h
index f88d23a4..4dbac1db 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvcommn.h
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvcommn.h
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT common tables validation (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
@@ -516,9 +516,6 @@ FT_BEGIN_HEADER
               FT_INVALID_TOO_SHORT;                         \
           FT_END_STMNT
 
-#define GXV_USHORT_TO_SHORT( _us )                                    \
-          ( ( 0x8000U < ( _us ) ) ? ( ( _us ) - 0x8000U ) : ( _us ) )
-
 #define GXV_STATETABLE_HEADER_SIZE  ( 2 + 2 + 2 + 2 )
 #define GXV_STATEHEADER_SIZE        GXV_STATETABLE_HEADER_SIZE
 
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxverror.h b/engine/thirdparty/freetype/src/gxvalid/gxverror.h
index 09311ed3..750f22fc 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxverror.h
+++ b/engine/thirdparty/freetype/src/gxvalid/gxverror.h
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT validation module error codes (specification only).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvfeat.c b/engine/thirdparty/freetype/src/gxvalid/gxvfeat.c
index 6cf18212..57b38923 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvfeat.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvfeat.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT feat table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvfeat.h b/engine/thirdparty/freetype/src/gxvalid/gxvfeat.h
index b33c1bc6..dd8f1bfe 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvfeat.h
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvfeat.h
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT feat table validation (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvfgen.c b/engine/thirdparty/freetype/src/gxvalid/gxvfgen.c
index cf98bb36..27a4ed9a 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvfgen.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvfgen.c
@@ -5,7 +5,7 @@
  *   Generate feature registry data for gxv `feat' validator.
  *   This program is derived from gxfeatreg.c in gxlayout.
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Masatake YAMATO and Redhat K.K.
  *
  * This file may only be used,
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvjust.c b/engine/thirdparty/freetype/src/gxvalid/gxvjust.c
index 5cca94d8..1cf9e84a 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvjust.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvjust.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT just table validation (body).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvkern.c b/engine/thirdparty/freetype/src/gxvalid/gxvkern.c
index 21fc2459..cf8c51fb 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvkern.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvkern.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT kern table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvlcar.c b/engine/thirdparty/freetype/src/gxvalid/gxvlcar.c
index 5f3bf890..0b310f42 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvlcar.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvlcar.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT lcar table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmod.c b/engine/thirdparty/freetype/src/gxvalid/gxvmod.c
index 0b4115bb..ce1e441e 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmod.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmod.c
@@ -4,7 +4,7 @@
  *
  *   FreeType's TrueTypeGX/AAT validation module implementation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmod.h b/engine/thirdparty/freetype/src/gxvalid/gxvmod.h
index db3d1d9f..6def5c54 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmod.h
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmod.h
@@ -5,7 +5,7 @@
  *   FreeType's TrueTypeGX/AAT validation module implementation
  *   (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmort.c b/engine/thirdparty/freetype/src/gxvalid/gxvmort.c
index 7032d634..5ad9d81c 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmort.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmort.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT mort table validation (body).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmort.h b/engine/thirdparty/freetype/src/gxvalid/gxvmort.h
index 5c819bdb..a3970e78 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmort.h
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmort.h
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT common definition for mort table (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmort0.c b/engine/thirdparty/freetype/src/gxvalid/gxvmort0.c
index 24e70a0d..1a05a6d4 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmort0.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmort0.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT mort table validation
  *   body for type0 (Indic Script Rearrangement) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmort1.c b/engine/thirdparty/freetype/src/gxvalid/gxvmort1.c
index ea5591f9..f99a8a49 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmort1.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmort1.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT mort table validation
  *   body for type1 (Contextual Substitution) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmort2.c b/engine/thirdparty/freetype/src/gxvalid/gxvmort2.c
index 50644f06..18c9be67 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmort2.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmort2.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT mort table validation
  *   body for type2 (Ligature Substitution) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmort4.c b/engine/thirdparty/freetype/src/gxvalid/gxvmort4.c
index 0641b113..bc190fad 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmort4.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmort4.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT mort table validation
  *   body for type4 (Non-Contextual Glyph Substitution) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmort5.c b/engine/thirdparty/freetype/src/gxvalid/gxvmort5.c
index 9225bb0c..8211a294 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmort5.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmort5.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT mort table validation
  *   body for type5 (Contextual Glyph Insertion) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmorx.c b/engine/thirdparty/freetype/src/gxvalid/gxvmorx.c
index 931bf006..4e7a0d40 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmorx.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmorx.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT morx table validation (body).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmorx.h b/engine/thirdparty/freetype/src/gxvalid/gxvmorx.h
index 27572553..7e20b5f9 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmorx.h
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmorx.h
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT common definition for morx table (specification).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmorx0.c b/engine/thirdparty/freetype/src/gxvalid/gxvmorx0.c
index 73523f36..bff850ba 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmorx0.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmorx0.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT morx table validation
  *   body for type0 (Indic Script Rearrangement) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmorx1.c b/engine/thirdparty/freetype/src/gxvalid/gxvmorx1.c
index 71a20188..d8ded3bc 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmorx1.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmorx1.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT morx table validation
  *   body for type1 (Contextual Substitution) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmorx2.c b/engine/thirdparty/freetype/src/gxvalid/gxvmorx2.c
index 858c8114..faa09e90 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmorx2.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmorx2.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT morx table validation
  *   body for type2 (Ligature Substitution) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmorx4.c b/engine/thirdparty/freetype/src/gxvalid/gxvmorx4.c
index c9ad1990..40468b84 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmorx4.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmorx4.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT morx table validation
  *   body for "morx" type4 (Non-Contextual Glyph Substitution) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvmorx5.c b/engine/thirdparty/freetype/src/gxvalid/gxvmorx5.c
index 95fa4e28..a3dbdd43 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvmorx5.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvmorx5.c
@@ -5,7 +5,7 @@
  *   TrueTypeGX/AAT morx table validation
  *   body for type5 (Contextual Glyph Insertion) subtable.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvopbd.c b/engine/thirdparty/freetype/src/gxvalid/gxvopbd.c
index 5e9a9665..98b5bb87 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvopbd.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvopbd.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT opbd table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvprop.c b/engine/thirdparty/freetype/src/gxvalid/gxvprop.c
index 63a052a8..e485fa66 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvprop.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvprop.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT prop table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gxvalid/gxvtrak.c b/engine/thirdparty/freetype/src/gxvalid/gxvtrak.c
index f3fb51c8..a402823a 100644
--- a/engine/thirdparty/freetype/src/gxvalid/gxvtrak.c
+++ b/engine/thirdparty/freetype/src/gxvalid/gxvtrak.c
@@ -4,7 +4,7 @@
  *
  *   TrueTypeGX/AAT trak table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * suzuki toshiya, Masatake YAMATO, Red Hat K.K.,
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
diff --git a/engine/thirdparty/freetype/src/gzip/ftgzip.c b/engine/thirdparty/freetype/src/gzip/ftgzip.c
index ca6a2aab..f77377ef 100644
--- a/engine/thirdparty/freetype/src/gzip/ftgzip.c
+++ b/engine/thirdparty/freetype/src/gzip/ftgzip.c
@@ -8,7 +8,7 @@
  * parse compressed PCF fonts, as found with many X11 server
  * distributions.
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/lzw/ftlzw.c b/engine/thirdparty/freetype/src/lzw/ftlzw.c
index 88383792..e1acf22e 100644
--- a/engine/thirdparty/freetype/src/lzw/ftlzw.c
+++ b/engine/thirdparty/freetype/src/lzw/ftlzw.c
@@ -8,7 +8,7 @@
  * be used to parse compressed PCF fonts, as found with many X11 server
  * distributions.
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * Albert Chin-A-Young.
  *
  * based on code in `src/gzip/ftgzip.c'
diff --git a/engine/thirdparty/freetype/src/lzw/ftzopen.c b/engine/thirdparty/freetype/src/lzw/ftzopen.c
index e680c4de..e4233246 100644
--- a/engine/thirdparty/freetype/src/lzw/ftzopen.c
+++ b/engine/thirdparty/freetype/src/lzw/ftzopen.c
@@ -8,7 +8,7 @@
  * be used to parse compressed PCF fonts, as found with many X11 server
  * distributions.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/lzw/ftzopen.h b/engine/thirdparty/freetype/src/lzw/ftzopen.h
index 6c756364..69152182 100644
--- a/engine/thirdparty/freetype/src/lzw/ftzopen.h
+++ b/engine/thirdparty/freetype/src/lzw/ftzopen.h
@@ -8,7 +8,7 @@
  * be used to parse compressed PCF fonts, as found with many X11 server
  * distributions.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvalid.c b/engine/thirdparty/freetype/src/otvalid/otvalid.c
index 3b1e23a6..c96967ce 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvalid.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvalid.c
@@ -4,7 +4,7 @@
  *
  *   FreeType validator for OpenType tables (body only).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvalid.h b/engine/thirdparty/freetype/src/otvalid/otvalid.h
index 7edadb77..0f46a7a1 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvalid.h
+++ b/engine/thirdparty/freetype/src/otvalid/otvalid.h
@@ -4,7 +4,7 @@
  *
  *   OpenType table validation (specification only).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvbase.c b/engine/thirdparty/freetype/src/otvalid/otvbase.c
index f449795f..61012624 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvbase.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvbase.c
@@ -4,7 +4,7 @@
  *
  *   OpenType BASE table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvcommn.c b/engine/thirdparty/freetype/src/otvalid/otvcommn.c
index b94d8a06..f06354b7 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvcommn.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvcommn.c
@@ -4,7 +4,7 @@
  *
  *   OpenType common tables validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvcommn.h b/engine/thirdparty/freetype/src/otvalid/otvcommn.h
index 6702c000..7db1a575 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvcommn.h
+++ b/engine/thirdparty/freetype/src/otvalid/otvcommn.h
@@ -4,7 +4,7 @@
  *
  *   OpenType common tables validation (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otverror.h b/engine/thirdparty/freetype/src/otvalid/otverror.h
index 4c4049ca..7f4dd6eb 100644
--- a/engine/thirdparty/freetype/src/otvalid/otverror.h
+++ b/engine/thirdparty/freetype/src/otvalid/otverror.h
@@ -4,7 +4,7 @@
  *
  *   OpenType validation module error codes (specification only).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvgdef.c b/engine/thirdparty/freetype/src/otvalid/otvgdef.c
index d62e8187..e36cda75 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvgdef.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvgdef.c
@@ -4,7 +4,7 @@
  *
  *   OpenType GDEF table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvgpos.c b/engine/thirdparty/freetype/src/otvalid/otvgpos.c
index f6102afb..d7547a33 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvgpos.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvgpos.c
@@ -4,7 +4,7 @@
  *
  *   OpenType GPOS table validation (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvgpos.h b/engine/thirdparty/freetype/src/otvalid/otvgpos.h
index b5d0f548..48a9ed0f 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvgpos.h
+++ b/engine/thirdparty/freetype/src/otvalid/otvgpos.h
@@ -4,7 +4,7 @@
  *
  *   OpenType GPOS table validator (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvgsub.c b/engine/thirdparty/freetype/src/otvalid/otvgsub.c
index 5d40d924..a479101b 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvgsub.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvgsub.c
@@ -4,7 +4,7 @@
  *
  *   OpenType GSUB table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvjstf.c b/engine/thirdparty/freetype/src/otvalid/otvjstf.c
index 712039c6..1309f6d9 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvjstf.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvjstf.c
@@ -4,7 +4,7 @@
  *
  *   OpenType JSTF table validation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvmath.c b/engine/thirdparty/freetype/src/otvalid/otvmath.c
index 01fd863c..b84845a7 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvmath.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvmath.c
@@ -4,7 +4,7 @@
  *
  *   OpenType MATH table validation (body).
  *
- * Copyright (C) 2007-2023 by
+ * Copyright (C) 2007-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by George Williams.
diff --git a/engine/thirdparty/freetype/src/otvalid/otvmod.c b/engine/thirdparty/freetype/src/otvalid/otvmod.c
index d6057c5a..74e50c78 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvmod.c
+++ b/engine/thirdparty/freetype/src/otvalid/otvmod.c
@@ -4,7 +4,7 @@
  *
  *   FreeType's OpenType validation module implementation (body).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/otvalid/otvmod.h b/engine/thirdparty/freetype/src/otvalid/otvmod.h
index f0e68dbc..245c7802 100644
--- a/engine/thirdparty/freetype/src/otvalid/otvmod.h
+++ b/engine/thirdparty/freetype/src/otvalid/otvmod.h
@@ -5,7 +5,7 @@
  *   FreeType's OpenType validation module implementation
  *   (specification).
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pcf/pcfdrivr.c b/engine/thirdparty/freetype/src/pcf/pcfdrivr.c
index f1dba024..93632f17 100644
--- a/engine/thirdparty/freetype/src/pcf/pcfdrivr.c
+++ b/engine/thirdparty/freetype/src/pcf/pcfdrivr.c
@@ -453,7 +453,7 @@ THE SOFTWARE.
                   FT_UInt       glyph_index,
                   FT_Int32      load_flags )
   {
-    PCF_Face    face   = (PCF_Face)FT_SIZE_FACE( size );
+    PCF_Face    face   = (PCF_Face)size->face;
     FT_Stream   stream;
     FT_Error    error  = FT_Err_Ok;
     FT_Bitmap*  bitmap = &slot->bitmap;
diff --git a/engine/thirdparty/freetype/src/pcf/pcfutil.c b/engine/thirdparty/freetype/src/pcf/pcfutil.c
index 95757269..cd26c77c 100644
--- a/engine/thirdparty/freetype/src/pcf/pcfutil.c
+++ b/engine/thirdparty/freetype/src/pcf/pcfutil.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
   }
 
 
-#if defined( __clang__ )                                            || \
+#if ( defined( __clang_major__ ) && __clang_major__ >= 5 )          || \
     ( defined( __GNUC__ )                                          &&  \
       ( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 8 ) ) )
 
diff --git a/engine/thirdparty/freetype/src/pfr/pfr.c b/engine/thirdparty/freetype/src/pfr/pfr.c
index d3738152..71b57930 100644
--- a/engine/thirdparty/freetype/src/pfr/pfr.c
+++ b/engine/thirdparty/freetype/src/pfr/pfr.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR driver component.
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrcmap.c b/engine/thirdparty/freetype/src/pfr/pfrcmap.c
index 08fe41d5..cd701661 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrcmap.c
+++ b/engine/thirdparty/freetype/src/pfr/pfrcmap.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR cmap handling (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrcmap.h b/engine/thirdparty/freetype/src/pfr/pfrcmap.h
index 8110f175..ab791357 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrcmap.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrcmap.h
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR cmap handling (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrdrivr.c b/engine/thirdparty/freetype/src/pfr/pfrdrivr.c
index 0048f524..ffd82227 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrdrivr.c
+++ b/engine/thirdparty/freetype/src/pfr/pfrdrivr.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR driver interface (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrdrivr.h b/engine/thirdparty/freetype/src/pfr/pfrdrivr.h
index da14468d..58954a9a 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrdrivr.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrdrivr.h
@@ -4,7 +4,7 @@
  *
  *   High-level Type PFR driver interface (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrerror.h b/engine/thirdparty/freetype/src/pfr/pfrerror.h
index 5dfb254d..af0ddaf1 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrerror.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrerror.h
@@ -4,7 +4,7 @@
  *
  *   PFR error codes (specification only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrgload.c b/engine/thirdparty/freetype/src/pfr/pfrgload.c
index 48cf27ec..e8500755 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrgload.c
+++ b/engine/thirdparty/freetype/src/pfr/pfrgload.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR glyph loader (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -108,7 +108,7 @@
 
     /* don't add empty contours */
     if ( last >= first )
-      outline->contours[outline->n_contours++] = (short)last;
+      outline->contours[outline->n_contours++] = (FT_UShort)last;
 
     glyph->path_begun = 0;
   }
@@ -178,8 +178,8 @@
     error = FT_GLYPHLOADER_CHECK_POINTS( loader, 3, 0 );
     if ( !error )
     {
-      FT_Vector*  vec = outline->points         + outline->n_points;
-      FT_Byte*    tag = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Vector*  vec = outline->points + outline->n_points;
+      FT_Byte*    tag = outline->tags   + outline->n_points;
 
 
       vec[0] = *control1;
@@ -189,7 +189,7 @@
       tag[1] = FT_CURVE_TAG_CUBIC;
       tag[2] = FT_CURVE_TAG_ON;
 
-      outline->n_points = (FT_Short)( outline->n_points + 3 );
+      outline->n_points += 3;
     }
 
   Exit:
diff --git a/engine/thirdparty/freetype/src/pfr/pfrgload.h b/engine/thirdparty/freetype/src/pfr/pfrgload.h
index 92a59bc5..d86549fb 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrgload.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrgload.h
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR glyph loader (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrload.c b/engine/thirdparty/freetype/src/pfr/pfrload.c
index 856a5942..358af5c7 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrload.c
+++ b/engine/thirdparty/freetype/src/pfr/pfrload.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR loader (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrload.h b/engine/thirdparty/freetype/src/pfr/pfrload.h
index d7b20a45..7390296d 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrload.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrload.h
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR loader (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrobjs.c b/engine/thirdparty/freetype/src/pfr/pfrobjs.c
index 8ef17c66..084d2ef5 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrobjs.c
+++ b/engine/thirdparty/freetype/src/pfr/pfrobjs.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR object methods (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrobjs.h b/engine/thirdparty/freetype/src/pfr/pfrobjs.h
index fcf8c381..1b548a1b 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrobjs.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrobjs.h
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR object methods (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrsbit.c b/engine/thirdparty/freetype/src/pfr/pfrsbit.c
index 46a988e8..96cc7fec 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrsbit.c
+++ b/engine/thirdparty/freetype/src/pfr/pfrsbit.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR bitmap loader (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrsbit.h b/engine/thirdparty/freetype/src/pfr/pfrsbit.h
index 3e1dba9a..105a2991 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrsbit.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrsbit.h
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR bitmap loader (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pfr/pfrtypes.h b/engine/thirdparty/freetype/src/pfr/pfrtypes.h
index 2f8909f0..435a77c8 100644
--- a/engine/thirdparty/freetype/src/pfr/pfrtypes.h
+++ b/engine/thirdparty/freetype/src/pfr/pfrtypes.h
@@ -4,7 +4,7 @@
  *
  *   FreeType PFR data structures (specification only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/afmparse.c b/engine/thirdparty/freetype/src/psaux/afmparse.c
index db08941d..e2f6a8e5 100644
--- a/engine/thirdparty/freetype/src/psaux/afmparse.c
+++ b/engine/thirdparty/freetype/src/psaux/afmparse.c
@@ -4,7 +4,7 @@
  *
  *   AFM parser (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/afmparse.h b/engine/thirdparty/freetype/src/psaux/afmparse.h
index 2d3b6e6e..b7766372 100644
--- a/engine/thirdparty/freetype/src/psaux/afmparse.h
+++ b/engine/thirdparty/freetype/src/psaux/afmparse.h
@@ -4,7 +4,7 @@
  *
  *   AFM parser (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/cffdecode.c b/engine/thirdparty/freetype/src/psaux/cffdecode.c
index 562d17d2..9556e11a 100644
--- a/engine/thirdparty/freetype/src/psaux/cffdecode.c
+++ b/engine/thirdparty/freetype/src/psaux/cffdecode.c
@@ -4,7 +4,7 @@
  *
  *   PostScript CFF (Type 2) decoding routines (body).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -17,6 +17,7 @@
 
 
 #include <freetype/freetype.h>
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftserv.h>
 #include <freetype/internal/services/svcfftl.h>
@@ -1752,22 +1753,9 @@
 
           /* without upper limit the loop below might not finish */
           if ( args[0] > 0x7FFFFFFFL )
-            args[0] = 46341;
+            args[0] = 0xB504F4L;    /* sqrt( 32768.0044 ) */
           else if ( args[0] > 0 )
-          {
-            FT_Fixed  root = args[0];
-            FT_Fixed  new_root;
-
-
-            for (;;)
-            {
-              new_root = ( root + FT_DivFix( args[0], root ) + 1 ) >> 1;
-              if ( new_root == root )
-                break;
-              root = new_root;
-            }
-            args[0] = new_root;
-          }
+            args[0] = (FT_Fixed)FT_SqrtFixed( args[0] );
           else
             args[0] = 0;
           args++;
diff --git a/engine/thirdparty/freetype/src/psaux/cffdecode.h b/engine/thirdparty/freetype/src/psaux/cffdecode.h
index e8bb4001..038f7235 100644
--- a/engine/thirdparty/freetype/src/psaux/cffdecode.h
+++ b/engine/thirdparty/freetype/src/psaux/cffdecode.h
@@ -4,7 +4,7 @@
  *
  *   PostScript CFF (Type 2) decoding routines (specification).
  *
- * Copyright (C) 2017-2023 by
+ * Copyright (C) 2017-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/psaux.c b/engine/thirdparty/freetype/src/psaux/psaux.c
index 5879ed16..ffe89cd6 100644
--- a/engine/thirdparty/freetype/src/psaux/psaux.c
+++ b/engine/thirdparty/freetype/src/psaux/psaux.c
@@ -4,7 +4,7 @@
  *
  *   FreeType auxiliary PostScript driver component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/psauxerr.h b/engine/thirdparty/freetype/src/psaux/psauxerr.h
index 895ffa48..18428c40 100644
--- a/engine/thirdparty/freetype/src/psaux/psauxerr.h
+++ b/engine/thirdparty/freetype/src/psaux/psauxerr.h
@@ -4,7 +4,7 @@
  *
  *   PS auxiliary module error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/psauxmod.c b/engine/thirdparty/freetype/src/psaux/psauxmod.c
index 45e35aa5..6826f9d8 100644
--- a/engine/thirdparty/freetype/src/psaux/psauxmod.c
+++ b/engine/thirdparty/freetype/src/psaux/psauxmod.c
@@ -4,7 +4,7 @@
  *
  *   FreeType auxiliary PostScript module implementation (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/psauxmod.h b/engine/thirdparty/freetype/src/psaux/psauxmod.h
index 94dbf488..82d7e348 100644
--- a/engine/thirdparty/freetype/src/psaux/psauxmod.h
+++ b/engine/thirdparty/freetype/src/psaux/psauxmod.h
@@ -4,7 +4,7 @@
  *
  *   FreeType auxiliary PostScript module implementation (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/psblues.c b/engine/thirdparty/freetype/src/psaux/psblues.c
index f9c864fe..213b943b 100644
--- a/engine/thirdparty/freetype/src/psaux/psblues.c
+++ b/engine/thirdparty/freetype/src/psaux/psblues.c
@@ -54,14 +54,6 @@
 #define FT_COMPONENT  cf2blues
 
 
-  /*
-   * For blue values, the FreeType parser produces an array of integers,
-   * while the Adobe CFF engine produces an array of fixed.
-   * Define a macro to convert FreeType to fixed.
-   */
-#define cf2_blueToFixed( x )  cf2_intToFixed( x )
-
-
   FT_LOCAL_DEF( void )
   cf2_blues_init( CF2_Blues  blues,
                   CF2_Font   font )
@@ -78,10 +70,10 @@
     size_t  numFamilyBlues;
     size_t  numFamilyOtherBlues;
 
-    FT_Pos*  blueValues;
-    FT_Pos*  otherBlues;
-    FT_Pos*  familyBlues;
-    FT_Pos*  familyOtherBlues;
+    FT_Fixed*  blueValues;
+    FT_Fixed*  otherBlues;
+    FT_Fixed*  familyBlues;
+    FT_Fixed*  familyOtherBlues;
 
     size_t     i;
     CF2_Fixed  emBoxBottom, emBoxTop;
@@ -138,13 +130,13 @@
       emBoxTop    = CF2_ICF_Top;
     }
 
-    if ( cf2_getLanguageGroup( decoder ) == 1                   &&
-         ( numBlueValues == 0                                 ||
-           ( numBlueValues == 4                             &&
-             cf2_blueToFixed( blueValues[0] ) < emBoxBottom &&
-             cf2_blueToFixed( blueValues[1] ) < emBoxBottom &&
-             cf2_blueToFixed( blueValues[2] ) > emBoxTop    &&
-             cf2_blueToFixed( blueValues[3] ) > emBoxTop    ) ) )
+    if ( cf2_getLanguageGroup( decoder ) == 1     &&
+         ( numBlueValues == 0                   ||
+           ( numBlueValues == 4               &&
+             blueValues[0] < emBoxBottom      &&
+             blueValues[1] < emBoxBottom      &&
+             blueValues[2] > emBoxTop         &&
+             blueValues[3] > emBoxTop         ) ) )
     {
       /*
        * Construct hint edges suitable for synthetic ghost hints at top
@@ -189,10 +181,8 @@
     /* bottom zones                                                      */
     for ( i = 0; i < numBlueValues; i += 2 )
     {
-      blues->zone[blues->count].csBottomEdge =
-        cf2_blueToFixed( blueValues[i] );
-      blues->zone[blues->count].csTopEdge =
-        cf2_blueToFixed( blueValues[i + 1] );
+      blues->zone[blues->count].csBottomEdge = blueValues[i];
+      blues->zone[blues->count].csTopEdge    = blueValues[i + 1];
 
       zoneHeight = SUB_INT32( blues->zone[blues->count].csTopEdge,
                               blues->zone[blues->count].csBottomEdge );
@@ -238,10 +228,8 @@
 
     for ( i = 0; i < numOtherBlues; i += 2 )
     {
-      blues->zone[blues->count].csBottomEdge =
-        cf2_blueToFixed( otherBlues[i] );
-      blues->zone[blues->count].csTopEdge =
-        cf2_blueToFixed( otherBlues[i + 1] );
+      blues->zone[blues->count].csBottomEdge = otherBlues[i];
+      blues->zone[blues->count].csTopEdge    = otherBlues[i + 1];
 
       zoneHeight = SUB_INT32( blues->zone[blues->count].csTopEdge,
                               blues->zone[blues->count].csBottomEdge );
@@ -299,7 +287,7 @@
         for ( j = 0; j < numFamilyOtherBlues; j += 2 )
         {
           /* top edge */
-          flatFamilyEdge = cf2_blueToFixed( familyOtherBlues[j + 1] );
+          flatFamilyEdge = familyOtherBlues[j + 1];
 
           diff = cf2_fixedAbs( SUB_INT32( flatEdge, flatFamilyEdge ) );
 
@@ -317,7 +305,7 @@
         if ( numFamilyBlues >= 2 )
         {
           /* top edge */
-          flatFamilyEdge = cf2_blueToFixed( familyBlues[1] );
+          flatFamilyEdge = familyBlues[1];
 
           diff = cf2_fixedAbs( SUB_INT32( flatEdge, flatFamilyEdge ) );
 
@@ -337,7 +325,7 @@
         for ( j = 2; j < numFamilyBlues; j += 2 )
         {
           /* bottom edge */
-          flatFamilyEdge = cf2_blueToFixed( familyBlues[j] );
+          flatFamilyEdge = familyBlues[j];
 
           /* adjust edges of top zone upward by twice darkening amount */
           flatFamilyEdge += 2 * font->darkenY;      /* bottom edge */
diff --git a/engine/thirdparty/freetype/src/psaux/psconv.c b/engine/thirdparty/freetype/src/psaux/psconv.c
index b9c7138d..56c0ecd1 100644
--- a/engine/thirdparty/freetype/src/psaux/psconv.c
+++ b/engine/thirdparty/freetype/src/psaux/psconv.c
@@ -4,7 +4,7 @@
  *
  *   Some convenience conversions (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/psconv.h b/engine/thirdparty/freetype/src/psaux/psconv.h
index b7c3ee00..91fcd15a 100644
--- a/engine/thirdparty/freetype/src/psaux/psconv.h
+++ b/engine/thirdparty/freetype/src/psaux/psconv.h
@@ -4,7 +4,7 @@
  *
  *   Some convenience conversions (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/psft.c b/engine/thirdparty/freetype/src/psaux/psft.c
index 618864e6..fd0abe17 100644
--- a/engine/thirdparty/freetype/src/psaux/psft.c
+++ b/engine/thirdparty/freetype/src/psaux/psft.c
@@ -566,12 +566,12 @@
   FT_LOCAL_DEF( void )
   cf2_getBlueValues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data )
+                     FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_blue_values;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.blue_values;
   }
 
@@ -579,12 +579,12 @@
   FT_LOCAL_DEF( void )
   cf2_getOtherBlues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data )
+                     FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_other_blues;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.other_blues;
   }
 
@@ -592,12 +592,12 @@
   FT_LOCAL_DEF( void )
   cf2_getFamilyBlues( PS_Decoder*  decoder,
                       size_t*      count,
-                      FT_Pos*     *data )
+                      FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_family_blues;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.family_blues;
   }
 
@@ -605,12 +605,12 @@
   FT_LOCAL_DEF( void )
   cf2_getFamilyOtherBlues( PS_Decoder*  decoder,
                            size_t*      count,
-                           FT_Pos*     *data )
+                           FT_Fixed*   *data )
   {
     FT_ASSERT( decoder && decoder->current_subfont );
 
     *count = decoder->current_subfont->private_dict.num_family_other_blues;
-    *data  = (FT_Pos*)
+    *data  = (FT_Fixed*)
                &decoder->current_subfont->private_dict.family_other_blues;
   }
 
diff --git a/engine/thirdparty/freetype/src/psaux/psft.h b/engine/thirdparty/freetype/src/psaux/psft.h
index 3da454e6..d9082f3a 100644
--- a/engine/thirdparty/freetype/src/psaux/psft.h
+++ b/engine/thirdparty/freetype/src/psaux/psft.h
@@ -92,19 +92,19 @@ FT_BEGIN_HEADER
   FT_LOCAL( void )
   cf2_getBlueValues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data );
+                     FT_Fixed*   *data );
   FT_LOCAL( void )
   cf2_getOtherBlues( PS_Decoder*  decoder,
                      size_t*      count,
-                     FT_Pos*     *data );
+                     FT_Fixed*   *data );
   FT_LOCAL( void )
   cf2_getFamilyBlues( PS_Decoder*  decoder,
                       size_t*      count,
-                      FT_Pos*     *data );
+                      FT_Fixed*   *data );
   FT_LOCAL( void )
   cf2_getFamilyOtherBlues( PS_Decoder*  decoder,
                            size_t*      count,
-                           FT_Pos*     *data );
+                           FT_Fixed*   *data );
 
   FT_LOCAL( CF2_Int )
   cf2_getLanguageGroup( PS_Decoder*  decoder );
diff --git a/engine/thirdparty/freetype/src/psaux/psintrp.c b/engine/thirdparty/freetype/src/psaux/psintrp.c
index 6c640eeb..7572e225 100644
--- a/engine/thirdparty/freetype/src/psaux/psintrp.c
+++ b/engine/thirdparty/freetype/src/psaux/psintrp.c
@@ -37,6 +37,7 @@
 
 
 #include "psft.h"
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/services/svcfftl.h>
 
@@ -428,6 +429,8 @@
     base  = cf2_stack_count( opStack ) - numOperands;
     delta = base + numBlends;
 
+    FT_TRACE6(( " (" ));
+
     for ( i = 0; i < numBlends; i++ )
     {
       const CF2_Fixed*  weight = &blend->BV[1];
@@ -442,10 +445,14 @@
                                     cf2_stack_getReal( opStack,
                                                        delta++ ) ) );
 
+      FT_TRACE6(( "%f ", (double)sum / 65536 ));
+
       /* store blended result  */
       cf2_stack_setReal( opStack, i + base, sum );
     }
 
+    FT_TRACE6(( "blended)\n" ));
+
     /* leave only `numBlends' results on stack */
     cf2_stack_pop( opStack, numOperands - numBlends );
   }
@@ -734,7 +741,7 @@
           FT_UInt  numBlends;
 
 
-          FT_TRACE4(( " blend\n" ));
+          FT_TRACE4(( " blend" ));
 
           if ( !font->isCFF2 )
             break;    /* clear stack & ignore */
@@ -2275,23 +2282,7 @@
 
                     arg = cf2_stack_popFixed( opStack );
                     if ( arg > 0 )
-                    {
-                      /* use a start value that doesn't make */
-                      /* the algorithm's addition overflow   */
-                      FT_Fixed  root = arg < 10 ? arg : arg >> 1;
-                      FT_Fixed  new_root;
-
-
-                      /* Babylonian method */
-                      for (;;)
-                      {
-                        new_root = ( root + FT_DivFix( arg, root ) + 1 ) >> 1;
-                        if ( new_root == root )
-                          break;
-                        root = new_root;
-                      }
-                      arg = new_root;
-                    }
+                      arg = (CF2_F16Dot16)FT_SqrtFixed( (FT_UInt32)arg );
                     else
                       arg = 0;
 
diff --git a/engine/thirdparty/freetype/src/psaux/psobjs.c b/engine/thirdparty/freetype/src/psaux/psobjs.c
index 8da755d0..eca465f0 100644
--- a/engine/thirdparty/freetype/src/psaux/psobjs.c
+++ b/engine/thirdparty/freetype/src/psaux/psobjs.c
@@ -4,7 +4,7 @@
  *
  *   Auxiliary functions for PostScript fonts (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -23,6 +23,7 @@
 
 #include "psobjs.h"
 #include "psconv.h"
+#include "psft.h"
 
 #include "psauxerr.h"
 #include "psauxmod.h"
@@ -200,7 +201,9 @@
     /* add the object to the base block and adjust offset */
     table->elements[idx] = FT_OFFSET( table->block, table->cursor );
     table->lengths [idx] = length;
-    FT_MEM_COPY( table->block + table->cursor, object, length );
+    /* length == 0 also implies a NULL destination, so skip the copy call */
+    if ( length > 0 )
+      FT_MEM_COPY( table->block + table->cursor, object, length );
 
     table->cursor += length;
     return FT_Err_Ok;
@@ -1624,7 +1627,7 @@
     if ( builder->load_points )
     {
       FT_Vector*  point   = outline->points + outline->n_points;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*    control = outline->tags   + outline->n_points;
 
 
       point->x = FIXED_TO_INT( x );
@@ -1677,8 +1680,7 @@
     if ( !error )
     {
       if ( outline->n_contours > 0 )
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
 
       outline->n_contours++;
     }
@@ -1740,7 +1742,7 @@
     {
       FT_Vector*  p1      = outline->points + first;
       FT_Vector*  p2      = outline->points + outline->n_points - 1;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points - 1;
+      FT_Byte*    control = outline->tags   + outline->n_points - 1;
 
 
       /* `delete' last point only if it coincides with the first */
@@ -1760,8 +1762,7 @@
         outline->n_points--;
       }
       else
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
     }
   }
 
@@ -1899,7 +1900,7 @@
     if ( builder->load_points )
     {
       FT_Vector*  point   = outline->points + outline->n_points;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*    control = outline->tags   + outline->n_points;
 
 #ifdef CFF_CONFIG_OPTION_OLD_ENGINE
       PS_Driver  driver   = (PS_Driver)FT_FACE_DRIVER( builder->face );
@@ -1959,8 +1960,7 @@
     if ( !error )
     {
       if ( outline->n_contours > 0 )
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
 
       outline->n_contours++;
     }
@@ -2019,7 +2019,7 @@
     {
       FT_Vector*  p1      = outline->points + first;
       FT_Vector*  p2      = outline->points + outline->n_points - 1;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points - 1;
+      FT_Byte*    control = outline->tags   + outline->n_points - 1;
 
 
       /* `delete' last point only if it coincides with the first    */
@@ -2039,8 +2039,7 @@
         outline->n_points--;
       }
       else
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
     }
   }
 
@@ -2188,7 +2187,7 @@
     if ( builder->load_points )
     {
       FT_Vector*  point   = outline->points + outline->n_points;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points;
+      FT_Byte*    control = outline->tags   + outline->n_points;
 
 #ifdef CFF_CONFIG_OPTION_OLD_ENGINE
       PS_Driver  driver   = (PS_Driver)FT_FACE_DRIVER( builder->face );
@@ -2267,8 +2266,7 @@
     if ( !error )
     {
       if ( outline->n_contours > 0 )
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
 
       outline->n_contours++;
     }
@@ -2327,7 +2325,7 @@
     {
       FT_Vector*  p1      = outline->points + first;
       FT_Vector*  p2      = outline->points + outline->n_points - 1;
-      FT_Byte*    control = (FT_Byte*)outline->tags + outline->n_points - 1;
+      FT_Byte*    control = outline->tags   + outline->n_points - 1;
 
 
       /* `delete' last point only if it coincides with the first */
@@ -2347,8 +2345,7 @@
         outline->n_points--;
       }
       else
-        outline->contours[outline->n_contours - 1] =
-          (short)( outline->n_points - 1 );
+        outline->contours[outline->n_contours - 1] = outline->n_points - 1;
     }
   }
 
@@ -2463,19 +2460,20 @@
 
     count = cpriv->num_blue_values = priv->num_blue_values;
     for ( n = 0; n < count; n++ )
-      cpriv->blue_values[n] = (FT_Pos)priv->blue_values[n];
+      cpriv->blue_values[n] = cf2_intToFixed( priv->blue_values[n] );
 
     count = cpriv->num_other_blues = priv->num_other_blues;
     for ( n = 0; n < count; n++ )
-      cpriv->other_blues[n] = (FT_Pos)priv->other_blues[n];
+      cpriv->other_blues[n] = cf2_intToFixed( priv->other_blues[n] );
 
     count = cpriv->num_family_blues = priv->num_family_blues;
     for ( n = 0; n < count; n++ )
-      cpriv->family_blues[n] = (FT_Pos)priv->family_blues[n];
+      cpriv->family_blues[n] = cf2_intToFixed( priv->family_blues[n] );
 
     count = cpriv->num_family_other_blues = priv->num_family_other_blues;
     for ( n = 0; n < count; n++ )
-      cpriv->family_other_blues[n] = (FT_Pos)priv->family_other_blues[n];
+      cpriv->family_other_blues[n] =
+        cf2_intToFixed( priv->family_other_blues[n] );
 
     cpriv->blue_scale = priv->blue_scale;
     cpriv->blue_shift = (FT_Pos)priv->blue_shift;
diff --git a/engine/thirdparty/freetype/src/psaux/psobjs.h b/engine/thirdparty/freetype/src/psaux/psobjs.h
index d5bce541..345fc8a7 100644
--- a/engine/thirdparty/freetype/src/psaux/psobjs.h
+++ b/engine/thirdparty/freetype/src/psaux/psobjs.h
@@ -4,7 +4,7 @@
  *
  *   Auxiliary functions for PostScript fonts (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/t1cmap.c b/engine/thirdparty/freetype/src/psaux/t1cmap.c
index c4bcf599..5681c3bd 100644
--- a/engine/thirdparty/freetype/src/psaux/t1cmap.c
+++ b/engine/thirdparty/freetype/src/psaux/t1cmap.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 character map support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/t1cmap.h b/engine/thirdparty/freetype/src/psaux/t1cmap.h
index b3702498..445e6a27 100644
--- a/engine/thirdparty/freetype/src/psaux/t1cmap.h
+++ b/engine/thirdparty/freetype/src/psaux/t1cmap.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 character map support (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/t1decode.c b/engine/thirdparty/freetype/src/psaux/t1decode.c
index 4b6b969b..c74baa80 100644
--- a/engine/thirdparty/freetype/src/psaux/t1decode.c
+++ b/engine/thirdparty/freetype/src/psaux/t1decode.c
@@ -4,7 +4,7 @@
  *
  *   PostScript Type 1 decoding routines (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psaux/t1decode.h b/engine/thirdparty/freetype/src/psaux/t1decode.h
index 0970def9..16203b8f 100644
--- a/engine/thirdparty/freetype/src/psaux/t1decode.h
+++ b/engine/thirdparty/freetype/src/psaux/t1decode.h
@@ -4,7 +4,7 @@
  *
  *   PostScript Type 1 decoding routines (specification).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pshinter/pshalgo.c b/engine/thirdparty/freetype/src/pshinter/pshalgo.c
index 4f622e1e..967767b3 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshalgo.c
+++ b/engine/thirdparty/freetype/src/pshinter/pshalgo.c
@@ -4,7 +4,7 @@
  *
  *   PostScript hinting algorithm (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
@@ -1118,7 +1118,7 @@
     FT_UInt     n;
     PSH_Point   point = glyph->points;
     FT_Vector*  vec   = glyph->outline->points;
-    char*       tags  = glyph->outline->tags;
+    FT_Byte*    tags  = glyph->outline->tags;
 
 
     for ( n = 0; n < glyph->num_points; n++ )
@@ -1171,8 +1171,8 @@
          FT_QNEW_ARRAY( glyph->contours, outline->n_contours ) )
       goto Exit;
 
-    glyph->num_points   = (FT_UInt)outline->n_points;
-    glyph->num_contours = (FT_UInt)outline->n_contours;
+    glyph->num_points   = outline->n_points;
+    glyph->num_contours = outline->n_contours;
 
     {
       FT_UInt      first = 0, next, n;
@@ -1186,7 +1186,7 @@
         PSH_Point  point;
 
 
-        next  = (FT_UInt)outline->contours[n] + 1;
+        next  = outline->contours[n] + 1;
         count = next - first;
 
         contour->start = points + first;
diff --git a/engine/thirdparty/freetype/src/pshinter/pshalgo.h b/engine/thirdparty/freetype/src/pshinter/pshalgo.h
index 3f0ba28a..fb362f06 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshalgo.h
+++ b/engine/thirdparty/freetype/src/pshinter/pshalgo.h
@@ -4,7 +4,7 @@
  *
  *   PostScript hinting algorithm (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pshinter/pshglob.c b/engine/thirdparty/freetype/src/pshinter/pshglob.c
index d4c5eb32..435f4583 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshglob.c
+++ b/engine/thirdparty/freetype/src/pshinter/pshglob.c
@@ -5,7 +5,7 @@
  *   PostScript hinter global hinting management (body).
  *   Inspired by the new auto-hinter module.
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
diff --git a/engine/thirdparty/freetype/src/pshinter/pshglob.h b/engine/thirdparty/freetype/src/pshinter/pshglob.h
index 579eb214..c5a5c913 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshglob.h
+++ b/engine/thirdparty/freetype/src/pshinter/pshglob.h
@@ -4,7 +4,7 @@
  *
  *   PostScript hinter global hinting management.
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pshinter/pshinter.c b/engine/thirdparty/freetype/src/pshinter/pshinter.c
index 54ed4109..ae2b53fe 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshinter.c
+++ b/engine/thirdparty/freetype/src/pshinter/pshinter.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PostScript Hinting module
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pshinter/pshmod.c b/engine/thirdparty/freetype/src/pshinter/pshmod.c
index 974a99e0..9965d5b1 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshmod.c
+++ b/engine/thirdparty/freetype/src/pshinter/pshmod.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PostScript hinter module implementation (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pshinter/pshmod.h b/engine/thirdparty/freetype/src/pshinter/pshmod.h
index 4bd781a3..62ac0a60 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshmod.h
+++ b/engine/thirdparty/freetype/src/pshinter/pshmod.h
@@ -4,7 +4,7 @@
  *
  *   PostScript hinter module interface (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pshinter/pshnterr.h b/engine/thirdparty/freetype/src/pshinter/pshnterr.h
index 97624952..e9641340 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshnterr.h
+++ b/engine/thirdparty/freetype/src/pshinter/pshnterr.h
@@ -4,7 +4,7 @@
  *
  *   PS Hinter error codes (specification only).
  *
- * Copyright (C) 2003-2023 by
+ * Copyright (C) 2003-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/pshinter/pshrec.c b/engine/thirdparty/freetype/src/pshinter/pshrec.c
index 680e6d01..0b2b549f 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshrec.c
+++ b/engine/thirdparty/freetype/src/pshinter/pshrec.c
@@ -4,7 +4,7 @@
  *
  *   FreeType PostScript hints recorder (body).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -806,7 +806,7 @@
   ps_hints_stem( PS_Hints  hints,
                  FT_UInt   dimension,
                  FT_Int    count,
-                 FT_Long*  stems )
+                 FT_Pos*   stems )
   {
     PS_Dimension  dim;
 
diff --git a/engine/thirdparty/freetype/src/pshinter/pshrec.h b/engine/thirdparty/freetype/src/pshinter/pshrec.h
index 0b2484af..7e375af7 100644
--- a/engine/thirdparty/freetype/src/pshinter/pshrec.h
+++ b/engine/thirdparty/freetype/src/pshinter/pshrec.h
@@ -4,7 +4,7 @@
  *
  *   Postscript (Type1/Type2) hints recorder (specification).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psnames/psmodule.c b/engine/thirdparty/freetype/src/psnames/psmodule.c
index 8203a046..35d054d1 100644
--- a/engine/thirdparty/freetype/src/psnames/psmodule.c
+++ b/engine/thirdparty/freetype/src/psnames/psmodule.c
@@ -4,7 +4,7 @@
  *
  *   psnames module implementation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psnames/psmodule.h b/engine/thirdparty/freetype/src/psnames/psmodule.h
index 0904700b..77045831 100644
--- a/engine/thirdparty/freetype/src/psnames/psmodule.h
+++ b/engine/thirdparty/freetype/src/psnames/psmodule.h
@@ -4,7 +4,7 @@
  *
  *   High-level psnames module interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psnames/psnamerr.h b/engine/thirdparty/freetype/src/psnames/psnamerr.h
index 0073f822..e123eb65 100644
--- a/engine/thirdparty/freetype/src/psnames/psnamerr.h
+++ b/engine/thirdparty/freetype/src/psnames/psnamerr.h
@@ -4,7 +4,7 @@
  *
  *   PS names module error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psnames/psnames.c b/engine/thirdparty/freetype/src/psnames/psnames.c
index 93ed9332..2933af1b 100644
--- a/engine/thirdparty/freetype/src/psnames/psnames.c
+++ b/engine/thirdparty/freetype/src/psnames/psnames.c
@@ -4,7 +4,7 @@
  *
  *   FreeType psnames module component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/psnames/pstables.h b/engine/thirdparty/freetype/src/psnames/pstables.h
index 7f92cce6..2a941b04 100644
--- a/engine/thirdparty/freetype/src/psnames/pstables.h
+++ b/engine/thirdparty/freetype/src/psnames/pstables.h
@@ -4,7 +4,7 @@
  *
  *   PostScript glyph names.
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/raster/ftmisc.h b/engine/thirdparty/freetype/src/raster/ftmisc.h
index 33dbfd63..943f2aa0 100644
--- a/engine/thirdparty/freetype/src/raster/ftmisc.h
+++ b/engine/thirdparty/freetype/src/raster/ftmisc.h
@@ -5,7 +5,7 @@
  *   Miscellaneous macros for stand-alone rasterizer (specification
  *   only).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
@@ -92,27 +92,6 @@
 #endif
 
 
-  static FT_Long
-  FT_MulDiv( FT_Long  a,
-             FT_Long  b,
-             FT_Long  c )
-  {
-    FT_Int   s;
-    FT_Long  d;
-
-
-    s = 1;
-    if ( a < 0 ) { a = -a; s = -1; }
-    if ( b < 0 ) { b = -b; s = -s; }
-    if ( c < 0 ) { c = -c; s = -s; }
-
-    d = (FT_Long)( c > 0 ? ( (FT_Int64)a * b + ( c >> 1 ) ) / c
-                         : 0x7FFFFFFFL );
-
-    return ( s > 0 ) ? d : -d;
-  }
-
-
   static FT_Long
   FT_MulDiv_No_Round( FT_Long  a,
                       FT_Long  b,
diff --git a/engine/thirdparty/freetype/src/raster/ftraster.c b/engine/thirdparty/freetype/src/raster/ftraster.c
index 192ca070..e4b7b937 100644
--- a/engine/thirdparty/freetype/src/raster/ftraster.c
+++ b/engine/thirdparty/freetype/src/raster/ftraster.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -63,8 +63,7 @@
 #else /* !STANDALONE_ */
 
 #include "ftraster.h"
-#include <freetype/internal/ftcalc.h> /* for FT_MulDiv and FT_MulDiv_No_Round */
-#include <freetype/ftoutln.h>         /* for FT_Outline_Get_CBox              */
+#include <freetype/internal/ftcalc.h> /* for FT_MulDiv_No_Round */
 
 #endif /* !STANDALONE_ */
 
@@ -115,12 +114,12 @@
    *   a change of direction is detected in the outline, a new profile is
    *   generated until the end of the outline.
    *
-   *   Note that when all profiles have been generated, the function
-   *   Finalize_Profile_Table() is used to record, for each profile, its
-   *   bottom-most scanline as well as the scanline above its upmost
-   *   boundary.  These positions are called `y-turns' because they (sort
-   *   of) correspond to local extrema.  They are stored in a sorted list
-   *   built from the top of the render pool as a downwards stack:
+   *   Note that, for all generated profiles, the function End_Profile()
+   *   is used to record all their bottom-most scanlines as well as the
+   *   scanline above their upmost boundary.  These positions are called
+   *   `y-turns' because they (sort of) correspond to local extrema.
+   *   They are stored in a sorted list built from the top of the render
+   *   pool as a downwards stack:
    *
    *     _ _ _______________________________________
    *                           |                    |
@@ -136,7 +135,7 @@
    *   optimize performance (see technical note on the sweep below).
    *
    *   Of course, the raster detects whether the two stacks collide and
-   *   handles the situation properly.
+   *   handles the situation by bisecting the job and restarting.
    *
    */
 
@@ -252,7 +251,6 @@
   /* On the other hand, SMulDiv means `Slow MulDiv', and is used typically */
   /* for clipping computations.  It simply uses the FT_MulDiv() function   */
   /* defined in `ftcalc.h'.                                                */
-#define SMulDiv           FT_MulDiv
 #define SMulDiv_No_Round  FT_MulDiv_No_Round
 
   /* The rasterizer is a very general purpose component; please leave */
@@ -305,16 +303,6 @@
   typedef unsigned char   Byte, *PByte;
   typedef char            Bool;
 
-
-  typedef union  Alignment_
-  {
-    Long    l;
-    void*   p;
-    void  (*f)(void);
-
-  } Alignment, *PAlignment;
-
-
   typedef struct  TPoint_
   {
     Long  x;
@@ -327,6 +315,7 @@
 #define Flow_Up           0x08U
 #define Overshoot_Top     0x10U
 #define Overshoot_Bottom  0x20U
+#define Dropout           0x40U
 
 
   /* States of each line, arc, and profile */
@@ -345,31 +334,28 @@
 
   struct  TProfile_
   {
-    FT_F26Dot6  X;           /* current coordinate during sweep          */
     PProfile    link;        /* link to next profile (various purposes)  */
-    PLong       offset;      /* start of profile's data in render pool   */
+    PProfile    next;        /* next profile in same contour, used       */
+                             /* during drop-out control                  */
+    Int         offset;      /* bottom or currently scanned array index  */
+    Int         height;      /* profile's height in scanlines            */
+    Int         start;       /* profile's starting scanline, also use    */
+                             /* as activation counter                    */
     UShort      flags;       /* Bit 0-2: drop-out mode                   */
                              /* Bit 3: profile orientation (up/down)     */
                              /* Bit 4: is top profile?                   */
                              /* Bit 5: is bottom profile?                */
-    Long        height;      /* profile's height in scanlines            */
-    Long        start;       /* profile's starting scanline              */
+                             /* Bit 6: dropout detected                  */
 
-    Int         countL;      /* number of lines to step before this      */
-                             /* profile becomes drawable                 */
-
-    PProfile    next;        /* next profile in same contour, used       */
-                             /* during drop-out control                  */
+    FT_F26Dot6  X;           /* current coordinate during sweep          */
+    Long        x[1];        /* actually variable array of scanline      */
+                             /* intersections with `height` elements     */
   };
 
   typedef PProfile   TProfileList;
   typedef PProfile*  PProfileList;
 
 
-#define AlignProfileSize \
-  ( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( Long ) )
-
-
 #undef RAS_ARG
 #undef RAS_ARGS
 #undef RAS_VAR
@@ -407,15 +393,13 @@
 
   /* prototypes used for sweep function dispatch */
   typedef void
-  Function_Sweep_Init( RAS_ARGS Short  min,
-                                Short  max );
+  Function_Sweep_Init( RAS_ARGS Int  min,
+                                Int  max );
 
   typedef void
-  Function_Sweep_Span( RAS_ARGS Short       y,
+  Function_Sweep_Span( RAS_ARGS Int         y,
                                 FT_F26Dot6  x1,
-                                FT_F26Dot6  x2,
-                                PProfile    left,
-                                PProfile    right );
+                                FT_F26Dot6  x2 );
 
   typedef void
   Function_Sweep_Step( RAS_ARG );
@@ -441,8 +425,7 @@
           (Bool)( x - FLOOR( x ) >= ras.precision_half )
 
   /* Smart dropout rounding to find which pixel is closer to span ends. */
-  /* To mimick Windows, symmetric cases break down indepenently of the  */
-  /* precision.                                                         */
+  /* To mimic Windows, symmetric cases do not depend on the precision.  */
 #define SMART( p, q )  FLOOR( ( (p) + (q) + ras.precision * 63 / 64 ) >> 1 )
 
 #if FT_RENDER_POOL_SIZE > 2048
@@ -462,7 +445,6 @@
     Int         precision_half;
     Int         precision_scale;
     Int         precision_step;
-    Int         precision_jitter;
 
     PLong       buff;               /* The profiles buffer                 */
     PLong       sizeBuff;           /* Render pool size                    */
@@ -471,24 +453,14 @@
 
     FT_Error    error;
 
-    Int         numTurns;           /* number of Y-turns in outline        */
-
     Byte        dropOutControl;     /* current drop_out control method     */
 
-    UShort      bWidth;             /* target bitmap width                 */
-    PByte       bOrigin;            /* target bitmap bottom-left origin    */
-    PByte       bLine;              /* target bitmap current line          */
-
     Long        lastX, lastY;
     Long        minY, maxY;
 
     UShort      num_Profs;          /* current number of profiles          */
+    Int         numTurns;           /* number of Y-turns in outline        */
 
-    Bool        fresh;              /* signals a fresh new profile which   */
-                                    /* `start' field must be completed     */
-    Bool        joint;              /* signals that the last arc ended     */
-                                    /* exactly on a scanline.  Allows      */
-                                    /* removal of doublets                 */
     PProfile    cProfile;           /* current profile                     */
     PProfile    fProfile;           /* head of linked list of profiles     */
     PProfile    gProfile;           /* contour's first profile in case     */
@@ -496,9 +468,14 @@
 
     TStates     state;              /* rendering state                     */
 
-    FT_Bitmap   target;             /* description of target bit/pixmap    */
     FT_Outline  outline;
 
+    Int         bTop;               /* target bitmap max line  index       */
+    Int         bRight;             /* target bitmap rightmost index       */
+    Int         bPitch;             /* target bitmap pitch                 */
+    PByte       bOrigin;            /* target bitmap bottom-left origin    */
+    PByte       bLine;              /* target bitmap current line          */
+
     /* dispatch variables */
 
     Function_Sweep_Init*  Proc_Sweep_Init;
@@ -563,187 +540,25 @@
      *
      *   256 / (1 << 12) = 0.0625 pixels.
      *
-     * `precision_jitter' is an epsilon threshold used in
-     * `Vertical_Sweep_Span' to deal with small imperfections in the Bezier
-     * decomposition (after all, we are working with approximations only);
-     * it avoids switching on additional pixels which would cause artifacts
-     * otherwise.
-     *
-     * The value of `precision_jitter' has been determined heuristically.
-     *
      */
 
     if ( High )
     {
       ras.precision_bits   = 12;
       ras.precision_step   = 256;
-      ras.precision_jitter = 30;
     }
     else
     {
       ras.precision_bits   = 6;
       ras.precision_step   = 32;
-      ras.precision_jitter = 2;
     }
 
-    FT_TRACE6(( "Set_High_Precision(%s)\n", High ? "true" : "false" ));
-
     ras.precision       = 1 << ras.precision_bits;
     ras.precision_half  = ras.precision >> 1;
     ras.precision_scale = ras.precision >> Pixel_Bits;
   }
 
 
-  /**************************************************************************
-   *
-   * @Function:
-   *   New_Profile
-   *
-   * @Description:
-   *   Create a new profile in the render pool.
-   *
-   * @Input:
-   *   aState ::
-   *     The state/orientation of the new profile.
-   *
-   *   overshoot ::
-   *     Whether the profile's unrounded start position
-   *     differs by at least a half pixel.
-   *
-   * @Return:
-   *  SUCCESS on success.  FAILURE in case of overflow or of incoherent
-   *  profile.
-   */
-  static Bool
-  New_Profile( RAS_ARGS TStates  aState,
-                        Bool     overshoot )
-  {
-    if ( !ras.fProfile )
-    {
-      ras.cProfile  = (PProfile)ras.top;
-      ras.fProfile  = ras.cProfile;
-      ras.top      += AlignProfileSize;
-    }
-
-    if ( ras.top >= ras.maxBuff )
-    {
-      ras.error = FT_THROW( Raster_Overflow );
-      return FAILURE;
-    }
-
-    ras.cProfile->start  = 0;
-    ras.cProfile->height = 0;
-    ras.cProfile->offset = ras.top;
-    ras.cProfile->link   = (PProfile)0;
-    ras.cProfile->next   = (PProfile)0;
-    ras.cProfile->flags  = ras.dropOutControl;
-
-    switch ( aState )
-    {
-    case Ascending_State:
-      ras.cProfile->flags |= Flow_Up;
-      if ( overshoot )
-        ras.cProfile->flags |= Overshoot_Bottom;
-
-      FT_TRACE6(( "  new ascending profile = %p\n", (void *)ras.cProfile ));
-      break;
-
-    case Descending_State:
-      if ( overshoot )
-        ras.cProfile->flags |= Overshoot_Top;
-      FT_TRACE6(( "  new descending profile = %p\n", (void *)ras.cProfile ));
-      break;
-
-    default:
-      FT_ERROR(( "New_Profile: invalid profile direction\n" ));
-      ras.error = FT_THROW( Invalid_Outline );
-      return FAILURE;
-    }
-
-    if ( !ras.gProfile )
-      ras.gProfile = ras.cProfile;
-
-    ras.state = aState;
-    ras.fresh = TRUE;
-    ras.joint = FALSE;
-
-    return SUCCESS;
-  }
-
-
-  /**************************************************************************
-   *
-   * @Function:
-   *   End_Profile
-   *
-   * @Description:
-   *   Finalize the current profile.
-   *
-   * @Input:
-   *   overshoot ::
-   *     Whether the profile's unrounded end position differs
-   *     by at least a half pixel.
-   *
-   * @Return:
-   *   SUCCESS on success.  FAILURE in case of overflow or incoherency.
-   */
-  static Bool
-  End_Profile( RAS_ARGS Bool  overshoot )
-  {
-    Long  h;
-
-
-    h = (Long)( ras.top - ras.cProfile->offset );
-
-    if ( h < 0 )
-    {
-      FT_ERROR(( "End_Profile: negative height encountered\n" ));
-      ras.error = FT_THROW( Raster_Negative_Height );
-      return FAILURE;
-    }
-
-    if ( h > 0 )
-    {
-      PProfile  oldProfile;
-
-
-      FT_TRACE6(( "  ending profile %p, start = %ld, height = %ld\n",
-                  (void *)ras.cProfile, ras.cProfile->start, h ));
-
-      ras.cProfile->height = h;
-      if ( overshoot )
-      {
-        if ( ras.cProfile->flags & Flow_Up )
-          ras.cProfile->flags |= Overshoot_Top;
-        else
-          ras.cProfile->flags |= Overshoot_Bottom;
-      }
-
-      oldProfile   = ras.cProfile;
-      ras.cProfile = (PProfile)ras.top;
-
-      ras.top += AlignProfileSize;
-
-      ras.cProfile->height = 0;
-      ras.cProfile->offset = ras.top;
-
-      oldProfile->next = ras.cProfile;
-      ras.num_Profs++;
-    }
-
-    if ( ras.top >= ras.maxBuff )
-    {
-      FT_TRACE1(( "overflow in End_Profile\n" ));
-      ras.error = FT_THROW( Raster_Overflow );
-      return FAILURE;
-    }
-
-    ras.joint = FALSE;
-
-    return SUCCESS;
-  }
-
-
   /**************************************************************************
    *
    * @Function:
@@ -760,31 +575,23 @@
    *   SUCCESS on success.  FAILURE in case of overflow.
    */
   static Bool
-  Insert_Y_Turn( RAS_ARGS Int  y )
+  Insert_Y_Turns( RAS_ARGS Int  y,
+                           Int  top )
   {
-    PLong  y_turns;
-    Int    n;
+    Int    n       = ras.numTurns;
+    PLong  y_turns = ras.maxBuff;
 
 
-    n       = ras.numTurns - 1;
-    y_turns = ras.sizeBuff - ras.numTurns;
+    /* update top value */
+    if ( n == 0 || top > y_turns[n] )
+      y_turns[n] = top;
 
     /* look for first y value that is <= */
-    while ( n >= 0 && y < y_turns[n] )
-      n--;
+    while ( n-- && y < y_turns[n] )
+      ;
 
     /* if it is <, simply insert it, ignore if == */
-    if ( n >= 0 && y > y_turns[n] )
-      do
-      {
-        Int  y2 = (Int)y_turns[n];
-
-
-        y_turns[n] = y;
-        y = y2;
-      } while ( --n >= 0 );
-
-    if ( n < 0 )
+    if ( n < 0 || y > y_turns[n] )
     {
       ras.maxBuff--;
       if ( ras.maxBuff <= ras.top )
@@ -792,8 +599,170 @@
         ras.error = FT_THROW( Raster_Overflow );
         return FAILURE;
       }
+
+      do
+      {
+        Int  y2 = (Int)y_turns[n];
+
+
+        y_turns[n] = y;
+        y = y2;
+      } while ( n-- >= 0 );
+
       ras.numTurns++;
-      ras.sizeBuff[-ras.numTurns] = y;
+    }
+
+    return SUCCESS;
+  }
+
+
+  /**************************************************************************
+   *
+   * @Function:
+   *   New_Profile
+   *
+   * @Description:
+   *   Create a new profile in the render pool.
+   *
+   * @Input:
+   *   aState ::
+   *     The state/orientation of the new profile.
+   *
+   * @Return:
+   *  SUCCESS on success.  FAILURE in case of overflow or of incoherent
+   *  profile.
+   */
+  static Bool
+  New_Profile( RAS_ARGS TStates  aState )
+  {
+    Long  e;
+
+
+    if ( !ras.cProfile || ras.cProfile->height )
+    {
+      ras.cProfile  = (PProfile)ras.top;
+      ras.top       = ras.cProfile->x;
+
+      if ( ras.top >= ras.maxBuff )
+      {
+        FT_TRACE1(( "overflow in New_Profile\n" ));
+        ras.error = FT_THROW( Raster_Overflow );
+        return FAILURE;
+      }
+
+      ras.cProfile->height = 0;
+    }
+
+    ras.cProfile->flags  = ras.dropOutControl;
+
+    switch ( aState )
+    {
+    case Ascending_State:
+      ras.cProfile->flags |= Flow_Up;
+      if ( IS_BOTTOM_OVERSHOOT( ras.lastY ) )
+        ras.cProfile->flags |= Overshoot_Bottom;
+
+      e = CEILING( ras.lastY );
+      break;
+
+    case Descending_State:
+      if ( IS_TOP_OVERSHOOT( ras.lastY ) )
+        ras.cProfile->flags |= Overshoot_Top;
+
+      e = FLOOR( ras.lastY );
+      break;
+
+    default:
+      FT_ERROR(( "New_Profile: invalid profile direction\n" ));
+      ras.error = FT_THROW( Invalid_Outline );
+      return FAILURE;
+    }
+
+    if ( e > ras.maxY )
+      e = ras.maxY;
+    if ( e < ras.minY )
+      e = ras.minY;
+    ras.cProfile->start = (Int)TRUNC( e );
+
+    FT_TRACE7(( "  new %s profile = %p, start = %d\n",
+                aState == Ascending_State ? "ascending" : "descending",
+                (void *)ras.cProfile, ras.cProfile->start ));
+
+    if ( ras.lastY == e )
+      *ras.top++ = ras.lastX;
+
+    ras.state = aState;
+
+    return SUCCESS;
+  }
+
+
+  /**************************************************************************
+   *
+   * @Function:
+   *   End_Profile
+   *
+   * @Description:
+   *   Finalize the current profile and record y-turns.
+   *
+   * @Return:
+   *   SUCCESS on success.  FAILURE in case of overflow or incoherency.
+   */
+  static Bool
+  End_Profile( RAS_ARG )
+  {
+    PProfile  p = ras.cProfile;
+    Int       h = (Int)( ras.top - p->x );
+    Int       bottom, top;
+
+
+    if ( h < 0 )
+    {
+      FT_ERROR(( "End_Profile: negative height encountered\n" ));
+      ras.error = FT_THROW( Raster_Negative_Height );
+      return FAILURE;
+    }
+
+    if ( h > 0 )
+    {
+      FT_TRACE7(( "  ending profile %p, start = %2d, height = %+3d\n",
+                  (void *)p, p->start, p->flags & Flow_Up ? h : -h ));
+
+      p->height = h;
+
+      if ( p->flags & Flow_Up )
+      {
+        if ( IS_TOP_OVERSHOOT( ras.lastY ) )
+          p->flags |= Overshoot_Top;
+
+        bottom    = p->start;
+        top       = bottom + h;
+        p->offset = 0;
+        p->X      = p->x[0];
+      }
+      else
+      {
+        if ( IS_BOTTOM_OVERSHOOT( ras.lastY ) )
+          p->flags |= Overshoot_Bottom;
+
+        top       = p->start + 1;
+        bottom    = top - h;
+        p->start  = bottom;
+        p->offset = h - 1;
+        p->X      = p->x[h - 1];
+      }
+
+      if ( Insert_Y_Turns( RAS_VARS bottom, top ) )
+        return FAILURE;
+
+      if ( !ras.gProfile )
+        ras.gProfile = p;
+
+      /* preliminary values to be finalized */
+      p->next = ras.gProfile;
+      p->link = (PProfile)ras.top;
+
+      ras.num_Profs++;
     }
 
     return SUCCESS;
@@ -807,56 +776,29 @@
    *
    * @Description:
    *   Adjust all links in the profiles list.
-   *
-   * @Return:
-   *   SUCCESS on success.  FAILURE in case of overflow.
    */
-  static Bool
+  static void
   Finalize_Profile_Table( RAS_ARG )
   {
-    UShort    n;
-    PProfile  p;
+    UShort    n = ras.num_Profs;
+    PProfile  p = ras.fProfile;
+    PProfile  q;
 
 
-    n = ras.num_Profs;
-    p = ras.fProfile;
-
-    if ( n > 1 && p )
+    /* there should be at least two profiles, up and down */
+    while ( --n )
     {
-      do
-      {
-        Int  bottom, top;
+      q = p->link;
 
+      /* fix the contour loop */
+      if ( q->next == p->next )
+        p->next = q;
 
-        if ( n > 1 )
-          p->link = (PProfile)( p->offset + p->height );
-        else
-          p->link = NULL;
-
-        if ( p->flags & Flow_Up )
-        {
-          bottom = (Int)p->start;
-          top    = (Int)( p->start + p->height - 1 );
-        }
-        else
-        {
-          bottom     = (Int)( p->start - p->height + 1 );
-          top        = (Int)p->start;
-          p->start   = bottom;
-          p->offset += p->height - 1;
-        }
-
-        if ( Insert_Y_Turn( RAS_VARS bottom )  ||
-             Insert_Y_Turn( RAS_VARS top + 1 ) )
-          return FAILURE;
-
-        p = p->link;
-      } while ( --n );
+      p = q;
     }
-    else
-      ras.fProfile = NULL;
 
-    return SUCCESS;
+    /* null-terminate */
+    p->link = NULL;
   }
 
 
@@ -986,107 +928,78 @@
                     Long  miny,
                     Long  maxy )
   {
-    Long   Dx, Dy;
-    Int    e1, e2, f1, f2, size;     /* XXX: is `Short' sufficient? */
-    Long   Ix, Rx, Ax;
+    Long  e, e2, Dx, Dy;
+    Long  Ix, Rx, Ax;
+    Int   size;
 
     PLong  top;
 
 
-    Dx = x2 - x1;
-    Dy = y2 - y1;
-
-    if ( Dy <= 0 || y2 < miny || y1 > maxy )
+    if ( y2 < miny || y1 > maxy )
       return SUCCESS;
 
-    if ( y1 < miny )
-    {
-      /* Take care: miny-y1 can be a very large value; we use     */
-      /*            a slow MulDiv function to avoid clipping bugs */
-      x1 += SMulDiv( Dx, miny - y1, Dy );
-      e1  = (Int)TRUNC( miny );
-      f1  = 0;
-    }
-    else
-    {
-      e1 = (Int)TRUNC( y1 );
-      f1 = (Int)FRAC( y1 );
-    }
+    e2 = y2 > maxy ? maxy : FLOOR( y2 );
+    e  = y1 < miny ? miny : CEILING( y1 );
 
-    if ( y2 > maxy )
-    {
-      /* x2 += FMulDiv( Dx, maxy - y2, Dy );  UNNECESSARY */
-      e2  = (Int)TRUNC( maxy );
-      f2  = 0;
-    }
-    else
-    {
-      e2 = (Int)TRUNC( y2 );
-      f2 = (Int)FRAC( y2 );
-    }
+    if ( y1 == e )
+      e += ras.precision;
 
-    if ( f1 > 0 )
-    {
-      if ( e1 == e2 )
-        return SUCCESS;
-      else
-      {
-        x1 += SMulDiv( Dx, ras.precision - f1, Dy );
-        e1 += 1;
-      }
-    }
-    else
-      if ( ras.joint )
-      {
-        ras.top--;
-        ras.joint = FALSE;
-      }
+    if ( e2 < e )  /* nothing to do */
+      return SUCCESS;
 
-    ras.joint = (char)( f2 == 0 );
+    size = (Int)TRUNC( e2 - e ) + 1;
+    top  = ras.top;
 
-    if ( ras.fresh )
-    {
-      ras.cProfile->start = e1;
-      ras.fresh           = FALSE;
-    }
-
-    size = e2 - e1 + 1;
-    if ( ras.top + size >= ras.maxBuff )
+    if ( top + size >= ras.maxBuff )
     {
       ras.error = FT_THROW( Raster_Overflow );
       return FAILURE;
     }
 
-    if ( Dx > 0 )
+    Dx = x2 - x1;
+    Dy = y2 - y1;
+
+    if ( Dx == 0 )  /* very easy */
     {
-      Ix = SMulDiv_No_Round( ras.precision, Dx, Dy );
-      Rx = ( ras.precision * Dx ) % Dy;
+      do
+        *top++ = x1;
+      while ( --size );
+      goto Fin;
+    }
+
+    Ix     = SMulDiv_No_Round( e - y1, Dx, Dy );
+    x1    += Ix;
+    *top++ = x1;
+
+    if ( --size )
+    {
+      Ax = Dx * ( e - y1 )    - Dy * Ix;  /* remainder */
+      Ix = FMulDiv( ras.precision, Dx, Dy );
+      Rx = Dx * ras.precision - Dy * Ix;  /* remainder */
       Dx = 1;
-    }
-    else
-    {
-      Ix = -SMulDiv_No_Round( ras.precision, -Dx, Dy );
-      Rx = ( ras.precision * -Dx ) % Dy;
-      Dx = -1;
-    }
 
-    Ax  = -Dy;
-    top = ras.top;
-
-    while ( size > 0 )
-    {
-      *top++ = x1;
-
-      x1 += Ix;
-      Ax += Rx;
-      if ( Ax >= 0 )
+      if ( x2 < x1 )
       {
-        Ax -= Dy;
-        x1 += Dx;
+        Ax = -Ax;
+        Rx = -Rx;
+        Dx = -Dx;
       }
-      size--;
+
+      do
+      {
+        x1 += Ix;
+        Ax += Rx;
+        if ( Ax >= Dy )
+        {
+          Ax -= Dy;
+          x1 += Dx;
+        }
+        *top++ = x1;
+      }
+      while ( --size );
     }
 
+  Fin:
     ras.top = top;
     return SUCCESS;
   }
@@ -1131,17 +1044,7 @@
                       Long  miny,
                       Long  maxy )
   {
-    Bool  result, fresh;
-
-
-    fresh  = ras.fresh;
-
-    result = Line_Up( RAS_VARS x1, -y1, x2, -y2, -maxy, -miny );
-
-    if ( fresh && !ras.fresh )
-      ras.cProfile->start = -ras.cProfile->start;
-
-    return result;
+    return Line_Up( RAS_VARS x1, -y1, x2, -y2, -maxy, -miny );
   }
 
 
@@ -1181,105 +1084,73 @@
                       Long       miny,
                       Long       maxy )
   {
-    Long   y1, y2, e, e2, e0;
-    Short  f1;
+    Long  y1, y2, e, e2, dy;
+    Long  dx, x2;
 
-    TPoint*  start_arc;
-
-    PLong top;
+    PLong  top;
 
 
     y1  = arc[degree].y;
     y2  = arc[0].y;
-    top = ras.top;
 
     if ( y2 < miny || y1 > maxy )
-      goto Fin;
+      return SUCCESS;
 
-    e2 = FLOOR( y2 );
+    e2 = y2 > maxy ? maxy : FLOOR( y2 );
+    e  = y1 < miny ? miny : CEILING( y1 );
 
-    if ( e2 > maxy )
-      e2 = maxy;
+    if ( y1 == e )
+      e += ras.precision;
 
-    e0 = miny;
+    if ( e2 < e )  /* nothing to do */
+      return SUCCESS;
 
-    if ( y1 < miny )
-      e = miny;
-    else
-    {
-      e  = CEILING( y1 );
-      f1 = (Short)( FRAC( y1 ) );
-      e0 = e;
-
-      if ( f1 == 0 )
-      {
-        if ( ras.joint )
-        {
-          top--;
-          ras.joint = FALSE;
-        }
-
-        *top++ = arc[degree].x;
-
-        e += ras.precision;
-      }
-    }
-
-    if ( ras.fresh )
-    {
-      ras.cProfile->start = TRUNC( e0 );
-      ras.fresh = FALSE;
-    }
-
-    if ( e2 < e )
-      goto Fin;
+    top = ras.top;
 
     if ( ( top + TRUNC( e2 - e ) + 1 ) >= ras.maxBuff )
     {
-      ras.top   = top;
       ras.error = FT_THROW( Raster_Overflow );
       return FAILURE;
     }
 
-    start_arc = arc;
-
     do
     {
-      ras.joint = FALSE;
-
       y2 = arc[0].y;
+      x2 = arc[0].x;
 
       if ( y2 > e )
       {
-        y1 = arc[degree].y;
-        if ( y2 - y1 >= ras.precision_step )
+        dy = y2 - arc[degree].y;
+        dx = x2 - arc[degree].x;
+
+        /* split condition should be invariant of direction */
+        if (  dy > ras.precision_step ||
+              dx > ras.precision_step ||
+             -dx > ras.precision_step )
         {
           splitter( arc );
           arc += degree;
         }
         else
         {
-          *top++ = arc[degree].x + FMulDiv( arc[0].x - arc[degree].x,
-                                            e - y1, y2 - y1 );
+          *top++ = x2 - FMulDiv( y2 - e, dx, dy );
+          e     += ras.precision;
           arc -= degree;
-          e   += ras.precision;
         }
       }
       else
       {
         if ( y2 == e )
         {
-          ras.joint  = TRUE;
-          *top++     = arc[0].x;
-
-          e += ras.precision;
+          *top++ = x2;
+          e     += ras.precision;
         }
-        arc -= degree;
+        arc   -= degree;
       }
-    } while ( arc >= start_arc && e <= e2 );
+    }
+    while ( e <= e2 );
 
-  Fin:
-    ras.top  = top;
+    ras.top = top;
     return SUCCESS;
   }
 
@@ -1316,7 +1187,7 @@
                         Long       miny,
                         Long       maxy )
   {
-    Bool     result, fresh;
+    Bool  result;
 
 
     arc[0].y = -arc[0].y;
@@ -1325,13 +1196,8 @@
     if ( degree > 2 )
       arc[3].y = -arc[3].y;
 
-    fresh = ras.fresh;
-
     result = Bezier_Up( RAS_VARS degree, arc, splitter, -maxy, -miny );
 
-    if ( fresh && !ras.fresh )
-      ras.cProfile->start = -ras.cProfile->start;
-
     arc[0].y = -arc[0].y;
     return result;
   }
@@ -1362,74 +1228,50 @@
   Line_To( RAS_ARGS Long  x,
                     Long  y )
   {
+    TStates  state;
+
+
+    if ( y == ras.lastY )
+      goto Fin;
+
     /* First, detect a change of direction */
 
-    switch ( ras.state )
+    state = ras.lastY < y ? Ascending_State : Descending_State;
+
+    if ( ras.state != state )
     {
-    case Unknown_State:
-      if ( y > ras.lastY )
-      {
-        if ( New_Profile( RAS_VARS Ascending_State,
-                                   IS_BOTTOM_OVERSHOOT( ras.lastY ) ) )
-          return FAILURE;
-      }
-      else
-      {
-        if ( y < ras.lastY )
-          if ( New_Profile( RAS_VARS Descending_State,
-                                     IS_TOP_OVERSHOOT( ras.lastY ) ) )
-            return FAILURE;
-      }
-      break;
+      /* finalize current profile if any */
+      if ( ras.state != Unknown_State &&
+           End_Profile( RAS_VAR )     )
+        goto Fail;
 
-    case Ascending_State:
-      if ( y < ras.lastY )
-      {
-        if ( End_Profile( RAS_VARS IS_TOP_OVERSHOOT( ras.lastY ) ) ||
-             New_Profile( RAS_VARS Descending_State,
-                                   IS_TOP_OVERSHOOT( ras.lastY ) ) )
-          return FAILURE;
-      }
-      break;
-
-    case Descending_State:
-      if ( y > ras.lastY )
-      {
-        if ( End_Profile( RAS_VARS IS_BOTTOM_OVERSHOOT( ras.lastY ) ) ||
-             New_Profile( RAS_VARS Ascending_State,
-                                   IS_BOTTOM_OVERSHOOT( ras.lastY ) ) )
-          return FAILURE;
-      }
-      break;
-
-    default:
-      ;
+      /* create a new profile */
+      if ( New_Profile( RAS_VARS state ) )
+        goto Fail;
     }
 
     /* Then compute the lines */
 
-    switch ( ras.state )
+    if ( state == Ascending_State )
     {
-    case Ascending_State:
       if ( Line_Up( RAS_VARS ras.lastX, ras.lastY,
                              x, y, ras.minY, ras.maxY ) )
-        return FAILURE;
-      break;
-
-    case Descending_State:
+        goto Fail;
+    }
+    else
+    {
       if ( Line_Down( RAS_VARS ras.lastX, ras.lastY,
                                x, y, ras.minY, ras.maxY ) )
-        return FAILURE;
-      break;
-
-    default:
-      ;
+        goto Fail;
     }
 
+  Fin:
     ras.lastX = x;
     ras.lastY = y;
-
     return SUCCESS;
+
+  Fail:
+    return FAILURE;
   }
 
 
@@ -1500,7 +1342,7 @@
         ymax = y1;
       }
 
-      if ( y2 < ymin || y2 > ymax )
+      if ( y2 < FLOOR( ymin ) || y2 > CEILING( ymax ) )
       {
         /* this arc has no given direction, split it! */
         Split_Conic( arc );
@@ -1508,8 +1350,12 @@
       }
       else if ( y1 == y3 )
       {
-        /* this arc is flat, ignore it and pop it from the Bezier stack */
+        /* this arc is flat, advance position */
+        /* and pop it from the Bezier stack   */
         arc -= 2;
+
+        ras.lastX = x3;
+        ras.lastY = y3;
       }
       else
       {
@@ -1518,18 +1364,13 @@
         state_bez = y1 < y3 ? Ascending_State : Descending_State;
         if ( ras.state != state_bez )
         {
-          Bool  o = ( state_bez == Ascending_State )
-                      ? IS_BOTTOM_OVERSHOOT( y1 )
-                      : IS_TOP_OVERSHOOT( y1 );
-
-
           /* finalize current profile if any */
           if ( ras.state != Unknown_State &&
-               End_Profile( RAS_VARS o )  )
+               End_Profile( RAS_VAR )     )
             goto Fail;
 
           /* create a new profile */
-          if ( New_Profile( RAS_VARS state_bez, o ) )
+          if ( New_Profile( RAS_VARS state_bez ) )
             goto Fail;
         }
 
@@ -1545,13 +1386,13 @@
                                      ras.minY, ras.maxY ) )
             goto Fail;
         arc -= 2;
+
+        ras.lastX = x3;
+        ras.lastY = y3;
       }
 
     } while ( arc >= arcs );
 
-    ras.lastX = x3;
-    ras.lastY = y3;
-
     return SUCCESS;
 
   Fail:
@@ -1648,7 +1489,7 @@
         ymax2 = y2;
       }
 
-      if ( ymin2 < ymin1 || ymax2 > ymax1 )
+      if ( ymin2 < FLOOR( ymin1 ) || ymax2 > CEILING( ymax1 ) )
       {
         /* this arc has no given direction, split it! */
         Split_Cubic( arc );
@@ -1656,27 +1497,26 @@
       }
       else if ( y1 == y4 )
       {
-        /* this arc is flat, ignore it and pop it from the Bezier stack */
+        /* this arc is flat, advance position */
+        /* and pop it from the Bezier stack   */
         arc -= 3;
+
+        ras.lastX = x4;
+        ras.lastY = y4;
       }
       else
       {
-        state_bez = ( y1 <= y4 ) ? Ascending_State : Descending_State;
+        state_bez = y1 < y4 ? Ascending_State : Descending_State;
 
         /* detect a change of direction */
         if ( ras.state != state_bez )
         {
-          Bool  o = ( state_bez == Ascending_State )
-                      ? IS_BOTTOM_OVERSHOOT( y1 )
-                      : IS_TOP_OVERSHOOT( y1 );
-
-
           /* finalize current profile if any */
           if ( ras.state != Unknown_State &&
-               End_Profile( RAS_VARS o )  )
+               End_Profile( RAS_VAR )     )
             goto Fail;
 
-          if ( New_Profile( RAS_VARS state_bez, o ) )
+          if ( New_Profile( RAS_VARS state_bez ) )
             goto Fail;
         }
 
@@ -1692,13 +1532,13 @@
                                      ras.minY, ras.maxY ) )
             goto Fail;
         arc -= 3;
+
+        ras.lastX = x4;
+        ras.lastY = y4;
       }
 
     } while ( arc >= arcs );
 
-    ras.lastX = x4;
-    ras.lastY = y4;
-
     return SUCCESS;
 
   Fail:
@@ -1740,6 +1580,11 @@
    *
    * @Return:
    *   SUCCESS on success, FAILURE on error.
+   *
+   * @Note:
+   *   Unlike FT_Outline_Decompose(), this function handles the scanmode
+   *   dropout tags in the individual contours.  Therefore, it cannot be
+   *   replaced.
    */
   static Bool
   Decompose_Curve( RAS_ARGS Int  first,
@@ -1753,7 +1598,7 @@
     FT_Vector*  points;
     FT_Vector*  point;
     FT_Vector*  limit;
-    char*       tags;
+    FT_Byte*    tags;
 
     UInt        tag;       /* current point's state           */
 
@@ -1974,24 +1819,17 @@
 
 
     ras.fProfile = NULL;
-    ras.joint    = FALSE;
-    ras.fresh    = FALSE;
+    ras.cProfile = NULL;
 
-    ras.maxBuff  = ras.sizeBuff - AlignProfileSize;
+    ras.top      = ras.buff;
+    ras.maxBuff  = ras.sizeBuff - 1;  /* top reserve */
 
-    ras.numTurns = 0;
-
-    ras.cProfile         = (PProfile)ras.top;
-    ras.cProfile->offset = ras.top;
-    ras.num_Profs        = 0;
+    ras.numTurns  = 0;
+    ras.num_Profs = 0;
 
     last = -1;
     for ( i = 0; i < ras.outline.n_contours; i++ )
     {
-      PProfile  lastProfile;
-      Bool      o;
-
-
       ras.state    = Unknown_State;
       ras.gProfile = NULL;
 
@@ -2001,35 +1839,30 @@
       if ( Decompose_Curve( RAS_VARS first, last, flipped ) )
         return FAILURE;
 
+      /* Note that ras.gProfile can stay nil if the contour was */
+      /* too small to be drawn or degenerate.                   */
+      if ( !ras.gProfile )
+        continue;
+
       /* we must now check whether the extreme arcs join or not */
       if ( FRAC( ras.lastY ) == 0 &&
            ras.lastY >= ras.minY  &&
            ras.lastY <= ras.maxY  )
-        if ( ras.gProfile                        &&
-             ( ras.gProfile->flags & Flow_Up ) ==
+        if ( ( ras.gProfile->flags & Flow_Up ) ==
                ( ras.cProfile->flags & Flow_Up ) )
           ras.top--;
-        /* Note that ras.gProfile can be nil if the contour was too small */
-        /* to be drawn.                                                   */
 
-      lastProfile = ras.cProfile;
-      if ( ras.top != ras.cProfile->offset &&
-           ( ras.cProfile->flags & Flow_Up ) )
-        o = IS_TOP_OVERSHOOT( ras.lastY );
-      else
-        o = IS_BOTTOM_OVERSHOOT( ras.lastY );
-      if ( End_Profile( RAS_VARS o ) )
+      if ( End_Profile( RAS_VAR ) )
         return FAILURE;
 
-      /* close the `next profile in contour' linked list */
-      if ( ras.gProfile )
-        lastProfile->next = ras.gProfile;
+      if ( !ras.fProfile )
+        ras.fProfile = ras.gProfile;
     }
 
-    if ( Finalize_Profile_Table( RAS_VAR ) )
-      return FAILURE;
+    if ( ras.fProfile )
+      Finalize_Profile_Table( RAS_VAR );
 
-    return (Bool)( ras.top < ras.maxBuff ? SUCCESS : FAILURE );
+    return SUCCESS;
   }
 
 
@@ -2042,24 +1875,11 @@
   /*************************************************************************/
 
 
-  /**************************************************************************
-   *
-   * Init_Linked
-   *
-   *   Initializes an empty linked list.
-   */
-  static void
-  Init_Linked( TProfileList*  l )
-  {
-    *l = NULL;
-  }
-
-
   /**************************************************************************
    *
    * InsNew
    *
-   *   Inserts a new profile in a linked list.
+   *   Inserts a new profile in a linked list, sorted by coordinate.
    */
   static void
   InsNew( PProfileList  list,
@@ -2073,10 +1893,8 @@
     current = *old;
     x       = profile->X;
 
-    while ( current )
+    while ( current && current->X < x )
     {
-      if ( x < current->X )
-        break;
       old     = &current->link;
       current = *old;
     }
@@ -2088,79 +1906,51 @@
 
   /**************************************************************************
    *
-   * DelOld
+   * Increment
    *
-   *   Removes an old profile from a linked list.
+   *   Advances all profile in the list to the next scanline.  It also
+   *   sorts the trace list in the unlikely case of profile crossing.
+   *   The profiles are inserted in sorted order.  We might need a single
+   *   swap to fix it when profiles (contours) cross.
+   *   Bubble sort with immediate restart is good enough and simple.
    */
   static void
-  DelOld( PProfileList    list,
-          const PProfile  profile )
-  {
-    PProfile  *old, current;
-
-
-    old     = list;
-    current = *old;
-
-    while ( current )
-    {
-      if ( current == profile )
-      {
-        *old = current->link;
-        return;
-      }
-
-      old     = &current->link;
-      current = *old;
-    }
-
-    /* we should never get there, unless the profile was not part of */
-    /* the list.                                                     */
-  }
-
-
-  /**************************************************************************
-   *
-   * Sort
-   *
-   *   Sorts a trace list.  In 95%, the list is already sorted.  We need
-   *   an algorithm which is fast in this case.  Bubble sort is enough
-   *   and simple.
-   */
-  static void
-  Sort( PProfileList  list )
+  Increment( PProfileList  list,
+             Int           flow )
   {
     PProfile  *old, current, next;
 
 
-    /* First, set the new X coordinate of each profile */
-    current = *list;
-    while ( current )
+    /* First, set the new X coordinates and remove exhausted profiles */
+    old = list;
+    while ( *old )
     {
-      current->X       = *current->offset;
-      current->offset += ( current->flags & Flow_Up ) ? 1 : -1;
-      current->height--;
-      current = current->link;
+      current = *old;
+      if ( --current->height )
+      {
+        current->offset += flow;
+        current->X       = current->x[current->offset];
+        old = &current->link;
+      }
+      else
+        *old = current->link;  /* remove */
     }
 
-    /* Then sort them */
+    /* Then make sure the list remains sorted */
     old     = list;
     current = *old;
 
     if ( !current )
       return;
 
-    next = current->link;
-
-    while ( next )
+    while ( current->link )
     {
+      next = current->link;
+
       if ( current->X <= next->X )
       {
         old     = &current->link;
-        current = *old;
-
-        if ( !current )
-          return;
+        current = next;
       }
       else
       {
@@ -2168,11 +1958,10 @@
         current->link = next->link;
         next->link    = current;
 
+        /* this is likely the only necessary swap -- restart */
         old     = list;
         current = *old;
       }
-
-      next = current->link;
     }
   }
 
@@ -2187,74 +1976,51 @@
    */
 
   static void
-  Vertical_Sweep_Init( RAS_ARGS Short  min,
-                                Short  max )
+  Vertical_Sweep_Init( RAS_ARGS Int  min,
+                                Int  max )
   {
     FT_UNUSED( max );
 
 
-    ras.bLine = ras.bOrigin - min * ras.target.pitch;
+    ras.bLine = ras.bOrigin - min * ras.bPitch;
   }
 
 
   static void
-  Vertical_Sweep_Span( RAS_ARGS Short       y,
+  Vertical_Sweep_Span( RAS_ARGS Int         y,
                                 FT_F26Dot6  x1,
-                                FT_F26Dot6  x2,
-                                PProfile    left,
-                                PProfile    right )
+                                FT_F26Dot6  x2 )
   {
-    Long  e1, e2;
-
-    Int  dropOutControl = left->flags & 7;
+    Int  e1 = (Int)TRUNC( CEILING( x1 ) );
+    Int  e2 = (Int)TRUNC(   FLOOR( x2 ) );
 
     FT_UNUSED( y );
-    FT_UNUSED( left );
-    FT_UNUSED( right );
 
 
-    /* in high-precision mode, we need 12 digits after the comma to */
-    /* represent multiples of 1/(1<<12) = 1/4096                    */
-    FT_TRACE7(( "  y=%d x=[% .12f;% .12f]",
+    FT_TRACE7(( "  y=%d x=[% .*f;% .*f]",
                 y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+                ras.precision_bits, (double)x1 / (double)ras.precision,
+                ras.precision_bits, (double)x2 / (double)ras.precision ));
 
-    /* Drop-out control */
-
-    e1 = CEILING( x1 );
-    e2 = FLOOR( x2 );
-
-    /* take care of the special case where both the left */
-    /* and right contour lie exactly on pixel centers    */
-    if ( dropOutControl != 2                             &&
-         x2 - x1 - ras.precision <= ras.precision_jitter &&
-         e1 != x1 && e2 != x2                            )
-      e2 = e1;
-
-    e1 = TRUNC( e1 );
-    e2 = TRUNC( e2 );
-
-    if ( e2 >= 0 && e1 < ras.bWidth )
+    if ( e2 >= 0 && e1 <= ras.bRight )
     {
-      Byte*  target;
+      PByte  target;
 
-      Int   c1, c2;
-      Byte  f1, f2;
+      Int   c1, f1, c2, f2;
 
 
       if ( e1 < 0 )
         e1 = 0;
-      if ( e2 >= ras.bWidth )
-        e2 = ras.bWidth - 1;
+      if ( e2 > ras.bRight )
+        e2 = ras.bRight;
 
-      FT_TRACE7(( " -> x=[%ld;%ld]", e1, e2 ));
+      FT_TRACE7(( " -> x=[%d;%d]", e1, e2 ));
 
-      c1 = (Short)( e1 >> 3 );
-      c2 = (Short)( e2 >> 3 );
+      c1 = e1 >> 3;
+      c2 = e2 >> 3;
 
-      f1 = (Byte)  ( 0xFF >> ( e1 & 7 ) );
-      f2 = (Byte) ~( 0x7F >> ( e2 & 7 ) );
+      f1 =  0xFF >> ( e1 & 7 );
+      f2 = ~0x7F >> ( e2 & 7 );
 
       target = ras.bLine + c1;
       c2 -= c1;
@@ -2280,163 +2046,50 @@
 
 
   static void
-  Vertical_Sweep_Drop( RAS_ARGS Short       y,
+  Vertical_Sweep_Drop( RAS_ARGS Int         y,
                                 FT_F26Dot6  x1,
-                                FT_F26Dot6  x2,
-                                PProfile    left,
-                                PProfile    right )
+                                FT_F26Dot6  x2 )
   {
-    Long   e1, e2, pxl;
-    Short  c1, f1;
+    Int  e1 = (Int)TRUNC( x1 );
+    Int  e2 = (Int)TRUNC( x2 );
+    Int  c1, f1;
+
+    FT_UNUSED( y );
 
 
-    FT_TRACE7(( "  y=%d x=[% .12f;% .12f]",
-                y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+    /* undocumented but confirmed: If the drop-out would result in a  */
+    /* pixel outside of the bounding box, use the pixel inside of the */
+    /* bounding box instead                                           */
+    if ( e1 < 0 || e1 > ras.bRight )
+      e1 = e2;
 
-    /* Drop-out control */
-
-    /*   e2            x2                    x1           e1   */
-    /*                                                         */
-    /*                 ^                     |                 */
-    /*                 |                     |                 */
-    /*   +-------------+---------------------+------------+    */
-    /*                 |                     |                 */
-    /*                 |                     v                 */
-    /*                                                         */
-    /* pixel         contour              contour       pixel  */
-    /* center                                           center */
-
-    /* drop-out mode    scan conversion rules (as defined in OpenType) */
-    /* --------------------------------------------------------------- */
-    /*  0                1, 2, 3                                       */
-    /*  1                1, 2, 4                                       */
-    /*  2                1, 2                                          */
-    /*  3                same as mode 2                                */
-    /*  4                1, 2, 5                                       */
-    /*  5                1, 2, 6                                       */
-    /*  6, 7             same as mode 2                                */
-
-    e1  = CEILING( x1 );
-    e2  = FLOOR  ( x2 );
-    pxl = e1;
-
-    if ( e1 > e2 )
+    /* otherwise check that the other pixel isn't set */
+    else if ( e2 >=0 && e2 <= ras.bRight )
     {
-      Int  dropOutControl = left->flags & 7;
+      c1 = e2 >> 3;
+      f1 = 0x80 >> ( e2 & 7 );
 
-
-      if ( e1 == e2 + ras.precision )
-      {
-        switch ( dropOutControl )
-        {
-        case 0: /* simple drop-outs including stubs */
-          pxl = e2;
-          break;
-
-        case 4: /* smart drop-outs including stubs */
-          pxl = SMART( x1, x2 );
-          break;
-
-        case 1: /* simple drop-outs excluding stubs */
-        case 5: /* smart drop-outs excluding stubs  */
-
-          /* Drop-out Control Rules #4 and #6 */
-
-          /* The specification neither provides an exact definition */
-          /* of a `stub' nor gives exact rules to exclude them.     */
-          /*                                                        */
-          /* Here the constraints we use to recognize a stub.       */
-          /*                                                        */
-          /*  upper stub:                                           */
-          /*                                                        */
-          /*   - P_Left and P_Right are in the same contour         */
-          /*   - P_Right is the successor of P_Left in that contour */
-          /*   - y is the top of P_Left and P_Right                 */
-          /*                                                        */
-          /*  lower stub:                                           */
-          /*                                                        */
-          /*   - P_Left and P_Right are in the same contour         */
-          /*   - P_Left is the successor of P_Right in that contour */
-          /*   - y is the bottom of P_Left                          */
-          /*                                                        */
-          /* We draw a stub if the following constraints are met.   */
-          /*                                                        */
-          /*   - for an upper or lower stub, there is top or bottom */
-          /*     overshoot, respectively                            */
-          /*   - the covered interval is greater or equal to a half */
-          /*     pixel                                              */
-
-          /* upper stub test */
-          if ( left->next == right                &&
-               left->height <= 0                  &&
-               !( left->flags & Overshoot_Top   &&
-                  x2 - x1 >= ras.precision_half ) )
-            goto Exit;
-
-          /* lower stub test */
-          if ( right->next == left                 &&
-               left->start == y                    &&
-               !( left->flags & Overshoot_Bottom &&
-                  x2 - x1 >= ras.precision_half  ) )
-            goto Exit;
-
-          if ( dropOutControl == 1 )
-            pxl = e2;
-          else
-            pxl = SMART( x1, x2 );
-          break;
-
-        default: /* modes 2, 3, 6, 7 */
-          goto Exit;  /* no drop-out control */
-        }
-
-        /* undocumented but confirmed: If the drop-out would result in a  */
-        /* pixel outside of the bounding box, use the pixel inside of the */
-        /* bounding box instead                                           */
-        if ( pxl < 0 )
-          pxl = e1;
-        else if ( TRUNC( pxl ) >= ras.bWidth )
-          pxl = e2;
-
-        /* check that the other pixel isn't set */
-        e1 = ( pxl == e1 ) ? e2 : e1;
-
-        e1 = TRUNC( e1 );
-
-        c1 = (Short)( e1 >> 3 );
-        f1 = (Short)( e1 &  7 );
-
-        if ( e1 >= 0 && e1 < ras.bWidth     &&
-             ras.bLine[c1] & ( 0x80 >> f1 ) )
-          goto Exit;
-      }
-      else
-        goto Exit;
+      if ( ras.bLine[c1] & f1 )
+        return;
     }
 
-    e1 = TRUNC( pxl );
-
-    if ( e1 >= 0 && e1 < ras.bWidth )
+    if ( e1 >= 0 && e1 <= ras.bRight )
     {
-      FT_TRACE7(( " -> x=%ld", e1 ));
+      c1 = e1 >> 3;
+      f1 = 0x80 >> ( e1 & 7 );
 
-      c1 = (Short)( e1 >> 3 );
-      f1 = (Short)( e1 & 7 );
+      FT_TRACE7(( "  y=%d x=%d%s\n", y, e1,
+                  ras.bLine[c1] & f1 ? " redundant" : "" ));
 
-      ras.bLine[c1] |= (char)( 0x80 >> f1 );
+      ras.bLine[c1] |= f1;
     }
-
-  Exit:
-    FT_TRACE7(( " dropout=%d\n", left->flags & 7 ));
   }
 
 
   static void
   Vertical_Sweep_Step( RAS_ARG )
   {
-    ras.bLine -= ras.target.pitch;
+    ras.bLine -= ras.bPitch;
   }
 
 
@@ -2450,8 +2103,8 @@
    */
 
   static void
-  Horizontal_Sweep_Init( RAS_ARGS Short  min,
-                                  Short  max )
+  Horizontal_Sweep_Init( RAS_ARGS Int  min,
+                                  Int  max )
   {
     /* nothing, really */
     FT_UNUSED_RASTER;
@@ -2461,22 +2114,18 @@
 
 
   static void
-  Horizontal_Sweep_Span( RAS_ARGS Short       y,
+  Horizontal_Sweep_Span( RAS_ARGS Int         y,
                                   FT_F26Dot6  x1,
-                                  FT_F26Dot6  x2,
-                                  PProfile    left,
-                                  PProfile    right )
+                                  FT_F26Dot6  x2 )
   {
-    Long  e1, e2;
-
-    FT_UNUSED( left );
-    FT_UNUSED( right );
+    Long  e1 = CEILING( x1 );
+    Long  e2 =   FLOOR( x2 );
 
 
-    FT_TRACE7(( "  x=%d y=[% .12f;% .12f]",
+    FT_TRACE7(( "  x=%d y=[% .*f;% .*f]",
                 y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+                ras.precision_bits, (double)x1 / (double)ras.precision,
+                ras.precision_bits, (double)x2 / (double)ras.precision ));
 
     /* We should not need this procedure but the vertical sweep   */
     /* mishandles horizontal lines through pixel centers.  So we  */
@@ -2484,20 +2133,18 @@
     /*                                                            */
     /* XXX: Can we handle horizontal lines better and drop this?  */
 
-    e1 = CEILING( x1 );
-
     if ( x1 == e1 )
     {
       e1 = TRUNC( e1 );
 
-      if ( e1 >= 0 && (ULong)e1 < ras.target.rows )
+      if ( e1 >= 0 && e1 <= ras.bTop )
       {
-        Byte   f1;
+        Int    f1;
         PByte  bits;
 
 
-        bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
-        f1   = (Byte)( 0x80 >> ( y & 7 ) );
+        bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.bPitch;
+        f1   = 0x80 >> ( y & 7 );
 
         FT_TRACE7(( bits[0] & f1 ? " redundant"
                                  : " -> y=%ld edge", e1 ));
@@ -2506,20 +2153,18 @@
       }
     }
 
-    e2 = FLOOR  ( x2 );
-
     if ( x2 == e2 )
     {
       e2 = TRUNC( e2 );
 
-      if ( e2 >= 0 && (ULong)e2 < ras.target.rows )
+      if ( e2 >= 0 && e2 <= ras.bTop )
       {
-        Byte   f1;
+        Int    f1;
         PByte  bits;
 
 
-        bits = ras.bOrigin + ( y >> 3 ) - e2 * ras.target.pitch;
-        f1   = (Byte)( 0x80 >> ( y & 7 ) );
+        bits = ras.bOrigin + ( y >> 3 ) - e2 * ras.bPitch;
+        f1   = 0x80 >> ( y & 7 );
 
         FT_TRACE7(( bits[0] & f1 ? " redundant"
                                  : " -> y=%ld edge", e2 ));
@@ -2533,122 +2178,42 @@
 
 
   static void
-  Horizontal_Sweep_Drop( RAS_ARGS Short       y,
+  Horizontal_Sweep_Drop( RAS_ARGS Int         y,
                                   FT_F26Dot6  x1,
-                                  FT_F26Dot6  x2,
-                                  PProfile    left,
-                                  PProfile    right )
+                                  FT_F26Dot6  x2 )
   {
-    Long   e1, e2, pxl;
+    Int    e1 = (Int)TRUNC( x1 );
+    Int    e2 = (Int)TRUNC( x2 );
     PByte  bits;
-    Byte   f1;
+    Int    f1;
 
 
-    FT_TRACE7(( "  x=%d y=[% .12f;% .12f]",
-                y,
-                (double)x1 / (double)ras.precision,
-                (double)x2 / (double)ras.precision ));
+    /* undocumented but confirmed: If the drop-out would result in a  */
+    /* pixel outside of the bounding box, use the pixel inside of the */
+    /* bounding box instead                                           */
+    if ( e1 < 0 || e1 > ras.bTop )
+      e1 = e2;
 
-    /* During the horizontal sweep, we only take care of drop-outs */
-
-    /* e1     +       <-- pixel center */
-    /*        |                        */
-    /* x1  ---+-->    <-- contour      */
-    /*        |                        */
-    /*        |                        */
-    /* x2  <--+---    <-- contour      */
-    /*        |                        */
-    /*        |                        */
-    /* e2     +       <-- pixel center */
-
-    e1  = CEILING( x1 );
-    e2  = FLOOR  ( x2 );
-    pxl = e1;
-
-    if ( e1 > e2 )
+    /* otherwise check that the other pixel isn't set */
+    else if ( e2 >=0 && e2 <= ras.bTop )
     {
-      Int  dropOutControl = left->flags & 7;
+      bits = ras.bOrigin + ( y >> 3 ) - e2 * ras.bPitch;
+      f1   = 0x80 >> ( y & 7 );
 
-
-      if ( e1 == e2 + ras.precision )
-      {
-        switch ( dropOutControl )
-        {
-        case 0: /* simple drop-outs including stubs */
-          pxl = e2;
-          break;
-
-        case 4: /* smart drop-outs including stubs */
-          pxl = SMART( x1, x2 );
-          break;
-
-        case 1: /* simple drop-outs excluding stubs */
-        case 5: /* smart drop-outs excluding stubs  */
-          /* see Vertical_Sweep_Drop for details */
-
-          /* rightmost stub test */
-          if ( left->next == right                &&
-               left->height <= 0                  &&
-               !( left->flags & Overshoot_Top   &&
-                  x2 - x1 >= ras.precision_half ) )
-            goto Exit;
-
-          /* leftmost stub test */
-          if ( right->next == left                 &&
-               left->start == y                    &&
-               !( left->flags & Overshoot_Bottom &&
-                  x2 - x1 >= ras.precision_half  ) )
-            goto Exit;
-
-          if ( dropOutControl == 1 )
-            pxl = e2;
-          else
-            pxl = SMART( x1, x2 );
-          break;
-
-        default: /* modes 2, 3, 6, 7 */
-          goto Exit;  /* no drop-out control */
-        }
-
-        /* undocumented but confirmed: If the drop-out would result in a  */
-        /* pixel outside of the bounding box, use the pixel inside of the */
-        /* bounding box instead                                           */
-        if ( pxl < 0 )
-          pxl = e1;
-        else if ( (ULong)( TRUNC( pxl ) ) >= ras.target.rows )
-          pxl = e2;
-
-        /* check that the other pixel isn't set */
-        e1 = ( pxl == e1 ) ? e2 : e1;
-
-        e1 = TRUNC( e1 );
-
-        bits = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
-        f1   = (Byte)( 0x80 >> ( y & 7 ) );
-
-        if ( e1 >= 0                     &&
-             (ULong)e1 < ras.target.rows &&
-             *bits & f1                  )
-          goto Exit;
-      }
-      else
-        goto Exit;
+      if ( *bits & f1 )
+        return;
     }
 
-    e1 = TRUNC( pxl );
-
-    if ( e1 >= 0 && (ULong)e1 < ras.target.rows )
+    if ( e1 >= 0 && e1 <= ras.bTop )
     {
-      FT_TRACE7(( " -> y=%ld", e1 ));
+      bits  = ras.bOrigin + ( y >> 3 ) - e1 * ras.bPitch;
+      f1    = 0x80 >> ( y & 7 );
 
-      bits  = ras.bOrigin + ( y >> 3 ) - e1 * ras.target.pitch;
-      f1    = (Byte)( 0x80 >> ( y & 7 ) );
+      FT_TRACE7(( "  x=%d y=%d%s\n", y, e1,
+                  *bits & f1 ? " redundant" : "" ));
 
-      bits[0] |= f1;
+      *bits |= f1;
     }
-
-  Exit:
-    FT_TRACE7(( " dropout=%d\n", left->flags & 7 ));
   }
 
 
@@ -2664,116 +2229,61 @@
    *
    * Generic Sweep Drawing routine
    *
+   * Note that this routine is executed with the pool containing at least
+   * two valid profiles (up and down) and two y-turns (top and bottom).
+   *
    */
 
-  static Bool
+  static void
   Draw_Sweep( RAS_ARG )
   {
-    Short         y, y_change, y_height;
+    Int           min_Y, max_Y, dropouts;
+    Int           y, y_turn;
 
-    PProfile      P, Q, P_Left, P_Right;
+    PProfile      *Q, P, P_Left, P_Right;
 
-    Short         min_Y, max_Y, top, bottom, dropouts;
-
-    Long          x1, x2, xs, e1, e2;
-
-    TProfileList  waiting;
-    TProfileList  draw_left, draw_right;
+    TProfileList  waiting    = ras.fProfile;
+    TProfileList  draw_left  = NULL;
+    TProfileList  draw_right = NULL;
 
 
-    /* initialize empty linked lists */
+    /* use y_turns to set the drawing range */
 
-    Init_Linked( &waiting );
-
-    Init_Linked( &draw_left  );
-    Init_Linked( &draw_right );
-
-    /* first, compute min and max Y */
-
-    P     = ras.fProfile;
-    max_Y = (Short)TRUNC( ras.minY );
-    min_Y = (Short)TRUNC( ras.maxY );
-
-    while ( P )
-    {
-      Q = P->link;
-
-      bottom = (Short)P->start;
-      top    = (Short)( P->start + P->height - 1 );
-
-      if ( min_Y > bottom )
-        min_Y = bottom;
-      if ( max_Y < top )
-        max_Y = top;
-
-      P->X = 0;
-      InsNew( &waiting, P );
-
-      P = Q;
-    }
-
-    /* check the Y-turns */
-    if ( ras.numTurns == 0 )
-    {
-      ras.error = FT_THROW( Invalid_Outline );
-      return FAILURE;
-    }
+    min_Y = (Int)ras.maxBuff[0];
+    max_Y = (Int)ras.maxBuff[ras.numTurns] - 1;
 
     /* now initialize the sweep */
 
     ras.Proc_Sweep_Init( RAS_VARS min_Y, max_Y );
 
-    /* then compute the distance of each profile from min_Y */
-
-    P = waiting;
-
-    while ( P )
-    {
-      P->countL = P->start - min_Y;
-      P = P->link;
-    }
-
     /* let's go */
 
-    y        = min_Y;
-    y_height = 0;
-
-    if ( ras.numTurns > 0                     &&
-         ras.sizeBuff[-ras.numTurns] == min_Y )
-      ras.numTurns--;
-
-    while ( ras.numTurns > 0 )
+    for ( y = min_Y; y <= max_Y; )
     {
-      /* check waiting list for new activations */
+      /* check waiting list for new profile activations */
 
-      P = waiting;
-
-      while ( P )
+      Q = &waiting;
+      while ( *Q )
       {
-        Q = P->link;
-        P->countL -= y_height;
-        if ( P->countL == 0 )
+        P = *Q;
+        if ( P->start == y )
         {
-          DelOld( &waiting, P );
+          *Q = P->link;  /* remove */
 
+          /* each active list contains profiles with the same flow */
+          /* left and right are arbitrary, correspond to TrueType  */
           if ( P->flags & Flow_Up )
             InsNew( &draw_left,  P );
           else
             InsNew( &draw_right, P );
         }
-
-        P = Q;
+        else
+          Q = &P->link;
       }
 
-      /* sort the drawing lists */
+      y_turn = (Int)*++ras.maxBuff;
 
-      Sort( &draw_left );
-      Sort( &draw_right );
-
-      y_change = (Short)ras.sizeBuff[-ras.numTurns--];
-      y_height = (Short)( y_change - y );
-
-      while ( y < y_change )
+      do
       {
         /* let's trace */
 
@@ -2784,9 +2294,13 @@
 
         while ( P_Left && P_Right )
         {
-          x1 = P_Left ->X;
-          x2 = P_Right->X;
+          Long  x1 = P_Left ->X;
+          Long  x2 = P_Right->X;
+          Long  xs;
 
+
+          /* TrueType should have x2 > x1, but can be opposite */
+          /* by mistake or in CFF/Type1, fix it then           */
           if ( x1 > x2 )
           {
             xs = x1;
@@ -2794,205 +2308,130 @@
             x2 = xs;
           }
 
-          e1 = FLOOR( x1 );
-          e2 = CEILING( x2 );
+          if ( CEILING( x1 ) <= FLOOR( x2 ) )
+            ras.Proc_Sweep_Span( RAS_VARS y, x1, x2 );
 
-          if ( x2 - x1 <= ras.precision &&
-               e1 != x1 && e2 != x2     )
+          /* otherwise, bottom ceiling > top floor, it is a drop-out */
+          else
           {
-            if ( e1 > e2 || e2 == e1 + ras.precision )
+            Int  dropOutControl = P_Left->flags & 7;
+
+
+            /* Drop-out control */
+
+            /*   e2            x2                    x1           e1   */
+            /*                                                         */
+            /*                 ^                     |                 */
+            /*                 |                     |                 */
+            /*   +-------------+---------------------+------------+    */
+            /*                 |                     |                 */
+            /*                 |                     v                 */
+            /*                                                         */
+            /* pixel         contour              contour       pixel  */
+            /* center                                           center */
+
+            /* drop-out mode   scan conversion rules (OpenType specs)  */
+            /* ------------------------------------------------------- */
+            /*  bit 0          exclude stubs if set                    */
+            /*  bit 1          ignore drop-outs if set                 */
+            /*  bit 2          smart rounding if set                   */
+
+            if ( dropOutControl & 2 )
+              goto Next_Pair;
+
+            /* The specification neither provides an exact definition */
+            /* of a `stub' nor gives exact rules to exclude them.     */
+            /*                                                        */
+            /* Here the constraints we use to recognize a stub.       */
+            /*                                                        */
+            /*  upper stub:                                           */
+            /*                                                        */
+            /*   - P_Left and P_Right are in the same contour         */
+            /*   - P_Right is the successor of P_Left in that contour */
+            /*   - y is the top of P_Left and P_Right                 */
+            /*                                                        */
+            /*  lower stub:                                           */
+            /*                                                        */
+            /*   - P_Left and P_Right are in the same contour         */
+            /*   - P_Left is the successor of P_Right in that contour */
+            /*   - y is the bottom of P_Left                          */
+            /*                                                        */
+            /* We draw a stub if the following constraints are met.   */
+            /*                                                        */
+            /*   - for an upper or lower stub, there is top or bottom */
+            /*     overshoot, respectively                            */
+            /*   - the covered interval is greater or equal to a half */
+            /*     pixel                                              */
+
+            if ( dropOutControl & 1 )
             {
-              Int  dropOutControl = P_Left->flags & 7;
+              /* upper stub test */
+              if ( P_Left->height == 1                &&
+                   P_Left->next == P_Right            &&
+                   !( P_Left->flags & Overshoot_Top   &&
+                      x2 - x1 >= ras.precision_half   ) )
+                goto Next_Pair;
 
-
-              if ( dropOutControl != 2 )
-              {
-                /* a drop-out was detected */
-
-                P_Left ->X = x1;
-                P_Right->X = x2;
-
-                /* mark profile for drop-out processing */
-                P_Left->countL = 1;
-                dropouts++;
-              }
-
-              goto Skip_To_Next;
+              /* lower stub test */
+              if ( P_Left->offset == 0                 &&
+                   P_Right->next == P_Left             &&
+                   !( P_Left->flags & Overshoot_Bottom &&
+                      x2 - x1 >= ras.precision_half    ) )
+                goto Next_Pair;
             }
+
+            /* select the pixel to set and the other pixel */
+            if ( dropOutControl & 4 )
+            {
+              x2 = SMART( x1, x2 );
+              x1 = x1 > x2 ? x2 + ras.precision : x2 - ras.precision;
+            }
+            else
+            {
+              x2 = FLOOR  ( x2 );
+              x1 = CEILING( x1 );
+            }
+
+            P_Left ->X = x2;
+            P_Right->X = x1;
+
+            /* mark profile for drop-out processing */
+            P_Left->flags |= Dropout;
+            dropouts++;
           }
 
-          ras.Proc_Sweep_Span( RAS_VARS y, x1, x2, P_Left, P_Right );
+        Next_Pair:
+          P_Left  = P_Left->link;
+          P_Right = P_Right->link;
+        }
 
-        Skip_To_Next:
+        /* handle drop-outs _after_ the span drawing */
+        P_Left  = draw_left;
+        P_Right = draw_right;
+
+        while ( dropouts )
+        {
+          if ( P_Left->flags & Dropout )
+          {
+            ras.Proc_Sweep_Drop( RAS_VARS y, P_Left->X, P_Right->X );
+
+            P_Left->flags &= ~Dropout;
+            dropouts--;
+          }
 
           P_Left  = P_Left->link;
           P_Right = P_Right->link;
         }
 
-        /* handle drop-outs _after_ the span drawing --       */
-        /* drop-out processing has been moved out of the loop */
-        /* for performance tuning                             */
-        if ( dropouts > 0 )
-          goto Scan_DropOuts;
-
-      Next_Line:
-
         ras.Proc_Sweep_Step( RAS_VAR );
 
-        y++;
-
-        if ( y < y_change )
-        {
-          Sort( &draw_left  );
-          Sort( &draw_right );
-        }
+        Increment( &draw_left,   1 );
+        Increment( &draw_right, -1 );
       }
-
-      /* now finalize the profiles that need it */
-
-      P = draw_left;
-      while ( P )
-      {
-        Q = P->link;
-        if ( P->height == 0 )
-          DelOld( &draw_left, P );
-        P = Q;
-      }
-
-      P = draw_right;
-      while ( P )
-      {
-        Q = P->link;
-        if ( P->height == 0 )
-          DelOld( &draw_right, P );
-        P = Q;
-      }
-    }
-
-    /* for gray-scaling, flush the bitmap scanline cache */
-    while ( y <= max_Y )
-    {
-      ras.Proc_Sweep_Step( RAS_VAR );
-      y++;
-    }
-
-    return SUCCESS;
-
-  Scan_DropOuts:
-
-    P_Left  = draw_left;
-    P_Right = draw_right;
-
-    while ( P_Left && P_Right )
-    {
-      if ( P_Left->countL )
-      {
-        P_Left->countL = 0;
-#if 0
-        dropouts--;  /* -- this is useful when debugging only */
-#endif
-        ras.Proc_Sweep_Drop( RAS_VARS y,
-                                      P_Left->X,
-                                      P_Right->X,
-                                      P_Left,
-                                      P_Right );
-      }
-
-      P_Left  = P_Left->link;
-      P_Right = P_Right->link;
-    }
-
-    goto Next_Line;
-  }
-
-
-#ifdef STANDALONE_
-
-  /**************************************************************************
-   *
-   * The following functions should only compile in stand-alone mode,
-   * i.e., when building this component without the rest of FreeType.
-   *
-   */
-
-  /**************************************************************************
-   *
-   * @Function:
-   *   FT_Outline_Get_CBox
-   *
-   * @Description:
-   *   Return an outline's `control box'.  The control box encloses all
-   *   the outline's points, including Bézier control points.  Though it
-   *   coincides with the exact bounding box for most glyphs, it can be
-   *   slightly larger in some situations (like when rotating an outline
-   *   that contains Bézier outside arcs).
-   *
-   *   Computing the control box is very fast, while getting the bounding
-   *   box can take much more time as it needs to walk over all segments
-   *   and arcs in the outline.  To get the latter, you can use the
-   *   `ftbbox' component, which is dedicated to this single task.
-   *
-   * @Input:
-   *   outline ::
-   *     A pointer to the source outline descriptor.
-   *
-   * @Output:
-   *   acbox ::
-   *     The outline's control box.
-   *
-   * @Note:
-   *   See @FT_Glyph_Get_CBox for a discussion of tricky fonts.
-   */
-
-  static void
-  FT_Outline_Get_CBox( const FT_Outline*  outline,
-                       FT_BBox           *acbox )
-  {
-    if ( outline && acbox )
-    {
-      Long  xMin, yMin, xMax, yMax;
-
-
-      if ( outline->n_points == 0 )
-      {
-        xMin = 0;
-        yMin = 0;
-        xMax = 0;
-        yMax = 0;
-      }
-      else
-      {
-        FT_Vector*  vec   = outline->points;
-        FT_Vector*  limit = vec + outline->n_points;
-
-
-        xMin = xMax = vec->x;
-        yMin = yMax = vec->y;
-        vec++;
-
-        for ( ; vec < limit; vec++ )
-        {
-          Long  x, y;
-
-
-          x = vec->x;
-          if ( x < xMin ) xMin = x;
-          if ( x > xMax ) xMax = x;
-
-          y = vec->y;
-          if ( y < yMin ) yMin = y;
-          if ( y > yMax ) yMax = y;
-        }
-      }
-      acbox->xMin = xMin;
-      acbox->xMax = xMax;
-      acbox->yMin = yMin;
-      acbox->yMax = yMax;
+      while ( ++y < y_turn );
     }
   }
 
-#endif /* STANDALONE_ */
-
 
   /**************************************************************************
    *
@@ -3019,13 +2458,15 @@
     Int  band_stack[32];  /* enough to bisect 32-bit int bands */
 
 
+    FT_TRACE6(( "%s pass [%d..%d]\n",
+                flipped ? "Horizontal" : "Vertical",
+                y_min, y_max ));
+
     while ( 1 )
     {
       ras.minY = (Long)y_min * ras.precision;
       ras.maxY = (Long)y_max * ras.precision;
 
-      ras.top = ras.buff;
-
       ras.error = Raster_Err_Ok;
 
       if ( Convert_Glyph( RAS_VARS flipped ) )
@@ -3038,6 +2479,9 @@
         if ( y_min == y_max )
           return ras.error;  /* still Raster_Overflow */
 
+        FT_TRACE6(( "band [%d..%d]: to be bisected\n",
+                    y_min, y_max ));
+
         y_mid = ( y_min + y_max ) >> 1;
 
         band_stack[band_top++] = y_min;
@@ -3045,9 +2489,12 @@
       }
       else
       {
+        FT_TRACE6(( "band [%d..%d]: %hd profiles; %td bytes remaining\n",
+                    y_min, y_max, ras.num_Profs,
+                    (char*)ras.maxBuff - (char*)ras.top ));
+
         if ( ras.fProfile )
-          if ( Draw_Sweep( RAS_VAR ) )
-             return ras.error;
+          Draw_Sweep( RAS_VAR );
 
         if ( --band_top < 0 )
           break;
@@ -3076,53 +2523,48 @@
   Render_Glyph( RAS_ARG )
   {
     FT_Error  error;
+    Long      buffer[FT_MAX_BLACK_POOL];
 
 
+    ras.buff     = buffer;
+    ras.sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
+
     Set_High_Precision( RAS_VARS ras.outline.flags &
                                  FT_OUTLINE_HIGH_PRECISION );
 
-    if ( ras.outline.flags & FT_OUTLINE_IGNORE_DROPOUTS )
-      ras.dropOutControl = 2;
-    else
-    {
-      if ( ras.outline.flags & FT_OUTLINE_SMART_DROPOUTS )
-        ras.dropOutControl = 4;
-      else
-        ras.dropOutControl = 0;
+    ras.dropOutControl = 0;
 
-      if ( !( ras.outline.flags & FT_OUTLINE_INCLUDE_STUBS ) )
-        ras.dropOutControl += 1;
-    }
+    if ( ras.outline.flags & FT_OUTLINE_IGNORE_DROPOUTS )
+      ras.dropOutControl |= 2;
+
+    if ( ras.outline.flags & FT_OUTLINE_SMART_DROPOUTS )
+      ras.dropOutControl |= 4;
+
+    if ( !( ras.outline.flags & FT_OUTLINE_INCLUDE_STUBS ) )
+      ras.dropOutControl |= 1;
+
+    FT_TRACE6(( "BW Raster: precision 1/%d, dropout mode %d\n",
+                ras.precision, ras.dropOutControl ));
 
     /* Vertical Sweep */
-    FT_TRACE7(( "Vertical pass (ftraster)\n" ));
-
     ras.Proc_Sweep_Init = Vertical_Sweep_Init;
     ras.Proc_Sweep_Span = Vertical_Sweep_Span;
     ras.Proc_Sweep_Drop = Vertical_Sweep_Drop;
     ras.Proc_Sweep_Step = Vertical_Sweep_Step;
 
-    ras.bWidth  = (UShort)ras.target.width;
-    ras.bOrigin = (Byte*)ras.target.buffer;
-
-    if ( ras.target.pitch > 0 )
-      ras.bOrigin += (Long)( ras.target.rows - 1 ) * ras.target.pitch;
-
-    error = Render_Single_Pass( RAS_VARS 0, 0, (Int)ras.target.rows - 1 );
+    error = Render_Single_Pass( RAS_VARS 0, 0, ras.bTop );
     if ( error )
       return error;
 
     /* Horizontal Sweep */
     if ( !( ras.outline.flags & FT_OUTLINE_SINGLE_PASS ) )
     {
-      FT_TRACE7(( "Horizontal pass (ftraster)\n" ));
-
       ras.Proc_Sweep_Init = Horizontal_Sweep_Init;
       ras.Proc_Sweep_Span = Horizontal_Sweep_Span;
       ras.Proc_Sweep_Drop = Horizontal_Sweep_Drop;
       ras.Proc_Sweep_Step = Horizontal_Sweep_Step;
 
-      error = Render_Single_Pass( RAS_VARS 1, 0, (Int)ras.target.width - 1 );
+      error = Render_Single_Pass( RAS_VARS 1, 0, ras.bRight );
       if ( error )
         return error;
     }
@@ -3233,8 +2675,6 @@
     black_TWorker  worker[1];
 #endif
 
-    Long  buffer[FT_MAX_BLACK_POOL];
-
 
     if ( !raster )
       return FT_THROW( Raster_Uninitialized );
@@ -3243,7 +2683,7 @@
       return FT_THROW( Invalid_Outline );
 
     /* return immediately if the outline is empty */
-    if ( outline->n_points == 0 || outline->n_contours <= 0 )
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
       return Raster_Err_Ok;
 
     if ( !outline->contours || !outline->points )
@@ -3269,10 +2709,14 @@
       return FT_THROW( Invalid_Argument );
 
     ras.outline = *outline;
-    ras.target  = *target_map;
 
-    ras.buff     = buffer;
-    ras.sizeBuff = (&buffer)[1]; /* Points to right after buffer. */
+    ras.bTop    =   (Int)target_map->rows - 1;
+    ras.bRight  =   (Int)target_map->width - 1;
+    ras.bPitch  =   (Int)target_map->pitch;
+    ras.bOrigin = (PByte)target_map->buffer;
+
+    if ( ras.bPitch > 0 )
+      ras.bOrigin += ras.bTop * ras.bPitch;
 
     return Render_Glyph( RAS_VAR );
   }
diff --git a/engine/thirdparty/freetype/src/raster/ftraster.h b/engine/thirdparty/freetype/src/raster/ftraster.h
index b511b3a9..ad9cb1b9 100644
--- a/engine/thirdparty/freetype/src/raster/ftraster.h
+++ b/engine/thirdparty/freetype/src/raster/ftraster.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used
diff --git a/engine/thirdparty/freetype/src/raster/ftrend1.c b/engine/thirdparty/freetype/src/raster/ftrend1.c
index 6d442b1f..fd9f174f 100644
--- a/engine/thirdparty/freetype/src/raster/ftrend1.c
+++ b/engine/thirdparty/freetype/src/raster/ftrend1.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/raster/ftrend1.h b/engine/thirdparty/freetype/src/raster/ftrend1.h
index cec35c85..cf3e73c0 100644
--- a/engine/thirdparty/freetype/src/raster/ftrend1.h
+++ b/engine/thirdparty/freetype/src/raster/ftrend1.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType glyph rasterizer interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/raster/raster.c b/engine/thirdparty/freetype/src/raster/raster.c
index 82f47454..fe33af24 100644
--- a/engine/thirdparty/freetype/src/raster/raster.c
+++ b/engine/thirdparty/freetype/src/raster/raster.c
@@ -4,7 +4,7 @@
  *
  *   FreeType monochrome rasterer module component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/raster/rasterrs.h b/engine/thirdparty/freetype/src/raster/rasterrs.h
index 989d8b44..326d42e0 100644
--- a/engine/thirdparty/freetype/src/raster/rasterrs.h
+++ b/engine/thirdparty/freetype/src/raster/rasterrs.h
@@ -4,7 +4,7 @@
  *
  *   monochrome renderer error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sdf/ftbsdf.c b/engine/thirdparty/freetype/src/sdf/ftbsdf.c
index e4727383..adde05ba 100644
--- a/engine/thirdparty/freetype/src/sdf/ftbsdf.c
+++ b/engine/thirdparty/freetype/src/sdf/ftbsdf.c
@@ -4,7 +4,7 @@
  *
  *   Signed Distance Field support for bitmap fonts (body only).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
diff --git a/engine/thirdparty/freetype/src/sdf/ftsdf.c b/engine/thirdparty/freetype/src/sdf/ftsdf.c
index bc4625d9..dc55d426 100644
--- a/engine/thirdparty/freetype/src/sdf/ftsdf.c
+++ b/engine/thirdparty/freetype/src/sdf/ftsdf.c
@@ -4,7 +4,7 @@
  *
  *   Signed Distance Field support for outline fonts (body).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
@@ -3837,7 +3837,7 @@
     }
 
     /* if the outline is empty, return */
-    if ( outline->n_points <= 0 || outline->n_contours <= 0 )
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
       goto Exit;
 
     /* check whether the outline has valid fields */
diff --git a/engine/thirdparty/freetype/src/sdf/ftsdf.h b/engine/thirdparty/freetype/src/sdf/ftsdf.h
index 234c075b..25a0a13b 100644
--- a/engine/thirdparty/freetype/src/sdf/ftsdf.h
+++ b/engine/thirdparty/freetype/src/sdf/ftsdf.h
@@ -4,7 +4,7 @@
  *
  *   Signed Distance Field support (specification).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
diff --git a/engine/thirdparty/freetype/src/sdf/ftsdfcommon.c b/engine/thirdparty/freetype/src/sdf/ftsdfcommon.c
index 5052201e..6b2cf7df 100644
--- a/engine/thirdparty/freetype/src/sdf/ftsdfcommon.c
+++ b/engine/thirdparty/freetype/src/sdf/ftsdfcommon.c
@@ -4,7 +4,7 @@
  *
  *   Auxiliary data for Signed Distance Field support (body).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
@@ -22,49 +22,6 @@
 #include "ftsdfcommon.h"
 
 
-  /**************************************************************************
-   *
-   * common functions
-   *
-   */
-
-  /*
-   * Original algorithm:
-   *
-   *   https://github.com/chmike/fpsqrt
-   *
-   * Use this to compute the square root of a 16.16 fixed-point number.
-   */
-  FT_LOCAL_DEF( FT_16D16 )
-  square_root( FT_16D16  val )
-  {
-    FT_ULong  t, q, b, r;
-
-
-    r = (FT_ULong)val;
-    b = 0x40000000L;
-    q = 0;
-
-    while ( b > 0x40L )
-    {
-      t = q + b;
-
-      if ( r >= t )
-      {
-        r -= t;
-        q  = t + b;
-      }
-
-      r <<= 1;
-      b >>= 1;
-    }
-
-    q >>= 8;
-
-    return (FT_16D16)q;
-  }
-
-
   /**************************************************************************
    *
    * format and sign manipulating functions
diff --git a/engine/thirdparty/freetype/src/sdf/ftsdfcommon.h b/engine/thirdparty/freetype/src/sdf/ftsdfcommon.h
index 60ca9773..d0f623f9 100644
--- a/engine/thirdparty/freetype/src/sdf/ftsdfcommon.h
+++ b/engine/thirdparty/freetype/src/sdf/ftsdfcommon.h
@@ -4,7 +4,7 @@
  *
  *   Auxiliary data for Signed Distance Field support (specification).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
@@ -122,8 +122,7 @@ FT_BEGIN_HEADER
   typedef FT_BBox   FT_CBox;       /* control box of a curve            */
 
 
-  FT_LOCAL( FT_16D16 )
-  square_root( FT_16D16  val );
+#define square_root( x )  (FT_16D16)FT_SqrtFixed( (FT_UInt32)( x ) )
 
   FT_LOCAL( FT_SDFFormat )
   map_fixed_to_sdf( FT_16D16  dist,
diff --git a/engine/thirdparty/freetype/src/sdf/ftsdferrs.h b/engine/thirdparty/freetype/src/sdf/ftsdferrs.h
index 519db0fc..5af873fa 100644
--- a/engine/thirdparty/freetype/src/sdf/ftsdferrs.h
+++ b/engine/thirdparty/freetype/src/sdf/ftsdferrs.h
@@ -4,7 +4,7 @@
  *
  *   Signed Distance Field error codes (specification only).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
diff --git a/engine/thirdparty/freetype/src/sdf/ftsdfrend.c b/engine/thirdparty/freetype/src/sdf/ftsdfrend.c
index 5610c119..d3324678 100644
--- a/engine/thirdparty/freetype/src/sdf/ftsdfrend.c
+++ b/engine/thirdparty/freetype/src/sdf/ftsdfrend.c
@@ -4,7 +4,7 @@
  *
  *   Signed Distance Field renderer interface (body).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
diff --git a/engine/thirdparty/freetype/src/sdf/ftsdfrend.h b/engine/thirdparty/freetype/src/sdf/ftsdfrend.h
index 571ac833..2ea6f868 100644
--- a/engine/thirdparty/freetype/src/sdf/ftsdfrend.h
+++ b/engine/thirdparty/freetype/src/sdf/ftsdfrend.h
@@ -4,7 +4,7 @@
  *
  *   Signed Distance Field renderer interface (specification).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
diff --git a/engine/thirdparty/freetype/src/sdf/sdf.c b/engine/thirdparty/freetype/src/sdf/sdf.c
index c159b081..6045b833 100644
--- a/engine/thirdparty/freetype/src/sdf/sdf.c
+++ b/engine/thirdparty/freetype/src/sdf/sdf.c
@@ -4,7 +4,7 @@
  *
  *   FreeType Signed Distance Field renderer module component (body only).
  *
- * Copyright (C) 2020-2023 by
+ * Copyright (C) 2020-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Written by Anuj Verma.
diff --git a/engine/thirdparty/freetype/src/sfnt/pngshim.c b/engine/thirdparty/freetype/src/sfnt/pngshim.c
index 33712162..76181568 100644
--- a/engine/thirdparty/freetype/src/sfnt/pngshim.c
+++ b/engine/thirdparty/freetype/src/sfnt/pngshim.c
@@ -4,7 +4,7 @@
  *
  *   PNG Bitmap glyph support.
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * Google, Inc.
  * Written by Stuart Gill and Behdad Esfahbod.
  *
diff --git a/engine/thirdparty/freetype/src/sfnt/pngshim.h b/engine/thirdparty/freetype/src/sfnt/pngshim.h
index 903bd2bc..6e7a5c08 100644
--- a/engine/thirdparty/freetype/src/sfnt/pngshim.h
+++ b/engine/thirdparty/freetype/src/sfnt/pngshim.h
@@ -4,7 +4,7 @@
  *
  *   PNG Bitmap glyph support.
  *
- * Copyright (C) 2013-2023 by
+ * Copyright (C) 2013-2024 by
  * Google, Inc.
  * Written by Stuart Gill and Behdad Esfahbod.
  *
diff --git a/engine/thirdparty/freetype/src/sfnt/sfdriver.c b/engine/thirdparty/freetype/src/sfnt/sfdriver.c
index 0925940b..81072207 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfdriver.c
+++ b/engine/thirdparty/freetype/src/sfnt/sfdriver.c
@@ -4,7 +4,7 @@
  *
  *   High-level SFNT driver interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -49,6 +49,10 @@
 #include <freetype/internal/services/svbdf.h>
 #endif
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+#include "ttgpos.h"
+#endif
+
 #include "ttcmap.h"
 #include "ttkern.h"
 #include "ttmtx.h"
@@ -1249,6 +1253,12 @@
 #define PUT_PS_NAMES( a )  a
 #else
 #define PUT_PS_NAMES( a )  NULL
+#endif
+
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+#define PUT_GPOS_KERNING( a )  a
+#else
+#define PUT_GPOS_KERNING( a )  NULL
 #endif
 
   FT_DEFINE_SFNT_INTERFACE(
@@ -1274,6 +1284,8 @@
     tt_face_free_name,      /* TT_Free_Table_Func      free_name       */
 
     tt_face_load_kern,      /* TT_Load_Table_Func      load_kern       */
+    PUT_GPOS_KERNING( tt_face_load_gpos ),
+                            /* TT_Load_Table_Func      load_gpos       */
     tt_face_load_gasp,      /* TT_Load_Table_Func      load_gasp       */
     tt_face_load_pclt,      /* TT_Load_Table_Func      load_init       */
 
@@ -1292,6 +1304,9 @@
     /* since version 2.1.8 */
     tt_face_get_kerning,    /* TT_Face_GetKerningFunc  get_kerning     */
 
+    PUT_GPOS_KERNING( tt_face_get_gpos_kerning ),
+                           /* TT_Face_GetKerningFunc  get_gpos_kerning */
+
     /* since version 2.2 */
     tt_face_load_font_dir,  /* TT_Load_Table_Func      load_font_dir   */
     tt_face_load_hmtx,      /* TT_Load_Metrics_Func    load_hmtx       */
diff --git a/engine/thirdparty/freetype/src/sfnt/sfdriver.h b/engine/thirdparty/freetype/src/sfnt/sfdriver.h
index 2445958b..6f71489f 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfdriver.h
+++ b/engine/thirdparty/freetype/src/sfnt/sfdriver.h
@@ -4,7 +4,7 @@
  *
  *   High-level SFNT driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/sferrors.h b/engine/thirdparty/freetype/src/sfnt/sferrors.h
index e7a8eb04..d3ca1d9a 100644
--- a/engine/thirdparty/freetype/src/sfnt/sferrors.h
+++ b/engine/thirdparty/freetype/src/sfnt/sferrors.h
@@ -4,7 +4,7 @@
  *
  *   SFNT error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/sfnt.c b/engine/thirdparty/freetype/src/sfnt/sfnt.c
index 8e4f08a9..52411feb 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfnt.c
+++ b/engine/thirdparty/freetype/src/sfnt/sfnt.c
@@ -4,7 +4,7 @@
  *
  *   Single object library component.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -29,6 +29,7 @@
 #include "ttcpal.c"
 #include "ttsvg.c"
 
+#include "ttgpos.c"
 #include "ttkern.c"
 #include "ttload.c"
 #include "ttmtx.c"
diff --git a/engine/thirdparty/freetype/src/sfnt/sfobjs.c b/engine/thirdparty/freetype/src/sfnt/sfobjs.c
index f5d66ef8..6ee4e5e9 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfobjs.c
+++ b/engine/thirdparty/freetype/src/sfnt/sfobjs.c
@@ -4,7 +4,7 @@
  *
  *   SFNT object management (base).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -40,6 +40,10 @@
 #include "ttbdf.h"
 #endif
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+#include "ttgpos.h"
+#endif
+
 
   /**************************************************************************
    *
@@ -1026,6 +1030,10 @@
     LOAD_( gasp );
     LOAD_( kern );
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+    LOAD_( gpos );
+#endif
+
     face->root.num_glyphs = face->max_profile.numGlyphs;
 
     /* Bit 8 of the `fsSelection' field in the `OS/2' table denotes  */
@@ -1119,7 +1127,11 @@
         flags |= FT_FACE_FLAG_VERTICAL;
 
       /* kerning available ? */
-      if ( TT_FACE_HAS_KERNING( face ) )
+      if ( TT_FACE_HAS_KERNING( face )
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+           || face->gpos_kerning_available
+#endif
+         )
         flags |= FT_FACE_FLAG_KERNING;
 
 #ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
@@ -1470,6 +1482,11 @@
     /* freeing the kerning table */
     tt_face_done_kern( face );
 
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+    /* freeing the GPOS table */
+    tt_face_done_gpos( face );
+#endif
+
     /* freeing the collection table */
     FT_FREE( face->ttc_header.offsets );
     face->ttc_header.count = 0;
diff --git a/engine/thirdparty/freetype/src/sfnt/sfobjs.h b/engine/thirdparty/freetype/src/sfnt/sfobjs.h
index 906aebbf..90847d95 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfobjs.h
+++ b/engine/thirdparty/freetype/src/sfnt/sfobjs.h
@@ -4,7 +4,7 @@
  *
  *   SFNT object management (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/sfwoff.c b/engine/thirdparty/freetype/src/sfnt/sfwoff.c
index 7c0ce220..14514bf9 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfwoff.c
+++ b/engine/thirdparty/freetype/src/sfnt/sfwoff.c
@@ -4,7 +4,7 @@
  *
  *   WOFF format management (base).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -18,6 +18,7 @@
 
 #include "sfwoff.h"
 #include <freetype/tttags.h>
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 #include <freetype/ftgzip.h>
@@ -149,6 +150,7 @@
     /* Miscellaneous checks. */
     if ( woff.length != stream->size                              ||
          woff.num_tables == 0                                     ||
+         woff.num_tables >  0xFFFU                                ||
          44 + woff.num_tables * 20UL >= woff.length               ||
          12 + woff.num_tables * 16UL >= woff.totalSfntSize        ||
          ( woff.totalSfntSize & 3 ) != 0                          ||
@@ -169,21 +171,11 @@
 
     /* Write sfnt header. */
     {
-      FT_UInt  searchRange, entrySelector, rangeShift, x;
+      FT_Int  entrySelector = FT_MSB( woff.num_tables );
+      FT_Int  searchRange   = ( 1 << entrySelector ) * 16;
+      FT_Int  rangeShift    = woff.num_tables * 16 - searchRange;
 
 
-      x             = woff.num_tables;
-      entrySelector = 0;
-      while ( x )
-      {
-        x            >>= 1;
-        entrySelector += 1;
-      }
-      entrySelector--;
-
-      searchRange = ( 1 << entrySelector ) * 16;
-      rangeShift  = woff.num_tables * 16 - searchRange;
-
       WRITE_ULONG ( sfnt_header, woff.flavor );
       WRITE_USHORT( sfnt_header, woff.num_tables );
       WRITE_USHORT( sfnt_header, searchRange );
diff --git a/engine/thirdparty/freetype/src/sfnt/sfwoff.h b/engine/thirdparty/freetype/src/sfnt/sfwoff.h
index d4384227..a04735ff 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfwoff.h
+++ b/engine/thirdparty/freetype/src/sfnt/sfwoff.h
@@ -4,7 +4,7 @@
  *
  *   WOFFF format management (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/sfwoff2.c b/engine/thirdparty/freetype/src/sfnt/sfwoff2.c
index 2be44a34..589b3e0c 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfwoff2.c
+++ b/engine/thirdparty/freetype/src/sfnt/sfwoff2.c
@@ -4,7 +4,7 @@
  *
  *   WOFF2 format management (base).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -18,6 +18,7 @@
 #include "sfwoff2.h"
 #include "woff2tags.h"
 #include <freetype/tttags.h>
+#include <freetype/internal/ftcalc.h>
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/ftstream.h>
 
@@ -289,23 +290,15 @@
     FT_ULong  checksum     = 0;
     FT_ULong  aligned_size = size & ~3UL;
     FT_ULong  i;
-    FT_ULong  v;
+    FT_Int    shift;
 
 
     for ( i = 0; i < aligned_size; i += 4 )
-      checksum += ( (FT_ULong)buf[i    ] << 24 ) |
-                  ( (FT_ULong)buf[i + 1] << 16 ) |
-                  ( (FT_ULong)buf[i + 2] <<  8 ) |
-                  ( (FT_ULong)buf[i + 3] <<  0 );
+      checksum += FT_NEXT_ULONG( buf );
 
-    /* If size is not aligned to 4, treat as if it is padded with 0s. */
-    if ( size != aligned_size )
-    {
-      v = 0;
-      for ( i = aligned_size ; i < size; ++i )
-        v |= (FT_ULong)buf[i] << ( 24 - 8 * ( i & 3 ) );
-      checksum += v;
-    }
+    /* remaining bytes can be shifted and added one at a time */
+    for ( shift = 24; i < size; i++, shift -= 8 )
+      checksum += (FT_UInt32)FT_NEXT_BYTE( buf ) << shift;
 
     return checksum;
   }
@@ -1799,7 +1792,6 @@
 
     FT_Byte*   sfnt        = NULL;
     FT_Stream  sfnt_stream = NULL;
-    FT_Byte*   sfnt_header;
     FT_ULong   sfnt_size;
 
     FT_Byte*  uncompressed_buf = NULL;
@@ -1853,6 +1845,7 @@
     /* Miscellaneous checks. */
     if ( woff2.length != stream->size                               ||
          woff2.num_tables == 0                                      ||
+         woff2.num_tables >  0xFFFU                                 ||
          48 + woff2.num_tables * 20UL >= woff2.length               ||
          ( woff2.metaOffset == 0 && ( woff2.metaLength != 0     ||
                                       woff2.metaOrigLength != 0 ) ) ||
@@ -2143,6 +2136,13 @@
       WOFF2_TtcFont  ttc_font = woff2.ttc_fonts + face_index;
 
 
+      if ( ttc_font->num_tables == 0 || ttc_font->num_tables > 0xFFFU )
+      {
+        FT_ERROR(( "woff2_open_font: invalid WOFF2 CollectionFontEntry\n" ));
+        error = FT_THROW( Invalid_Table );
+        goto Exit;
+      }
+
       /* Create a temporary array. */
       if ( FT_QNEW_ARRAY( temp_indices,
                           ttc_font->num_tables ) )
@@ -2198,27 +2198,15 @@
          FT_NEW( sfnt_stream )        )
       goto Exit;
 
-    sfnt_header = sfnt;
-
-    WRITE_ULONG( sfnt_header, woff2.flavor );
-
-    if ( woff2.num_tables )
     {
-      FT_UInt  searchRange, entrySelector, rangeShift, x;
+      FT_Byte*  sfnt_header = sfnt;
+
+      FT_Int  entrySelector = FT_MSB( woff2.num_tables );
+      FT_Int  searchRange   = ( 1 << entrySelector ) * 16;
+      FT_Int  rangeShift    = woff2.num_tables * 16 - searchRange;
 
 
-      x             = woff2.num_tables;
-      entrySelector = 0;
-      while ( x )
-      {
-        x            >>= 1;
-        entrySelector += 1;
-      }
-      entrySelector--;
-
-      searchRange = ( 1 << entrySelector ) * 16;
-      rangeShift  = ( woff2.num_tables * 16 ) - searchRange;
-
+      WRITE_ULONG ( sfnt_header, woff2.flavor );
       WRITE_USHORT( sfnt_header, woff2.num_tables );
       WRITE_USHORT( sfnt_header, searchRange );
       WRITE_USHORT( sfnt_header, entrySelector );
diff --git a/engine/thirdparty/freetype/src/sfnt/sfwoff2.h b/engine/thirdparty/freetype/src/sfnt/sfwoff2.h
index 4901286e..f4114064 100644
--- a/engine/thirdparty/freetype/src/sfnt/sfwoff2.h
+++ b/engine/thirdparty/freetype/src/sfnt/sfwoff2.h
@@ -4,7 +4,7 @@
  *
  *   WOFFF2 format management (specification).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttbdf.c b/engine/thirdparty/freetype/src/sfnt/ttbdf.c
index 536fa746..d9765f48 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttbdf.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttbdf.c
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType embedded BDF properties (body).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -142,7 +142,7 @@
   {
     TT_Face    ttface = (TT_Face)face;
     TT_BDF     bdf    = &ttface->bdf;
-    FT_Size    size   = FT_FACE_SIZE( face );
+    FT_Size    size   = face->size;
     FT_Error   error  = FT_Err_Ok;
     FT_Byte*   p;
     FT_UInt    count;
diff --git a/engine/thirdparty/freetype/src/sfnt/ttbdf.h b/engine/thirdparty/freetype/src/sfnt/ttbdf.h
index 0d7a0ace..d8d722b9 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttbdf.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttbdf.h
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType embedded BDF properties (specification).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttcmap.c b/engine/thirdparty/freetype/src/sfnt/ttcmap.c
index 9ba25dcb..28f4d117 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttcmap.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttcmap.c
@@ -4,7 +4,7 @@
  *
  *   TrueType character mapping table (cmap) support (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttcmap.h b/engine/thirdparty/freetype/src/sfnt/ttcmap.h
index ff52917e..e2c5e72b 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttcmap.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttcmap.h
@@ -4,7 +4,7 @@
  *
  *   TrueType character mapping table (cmap) support (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttcmapc.h b/engine/thirdparty/freetype/src/sfnt/ttcmapc.h
index 0af48c24..37089836 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttcmapc.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttcmapc.h
@@ -4,7 +4,7 @@
  *
  *   TT CMAP classes definitions (specification only).
  *
- * Copyright (C) 2009-2023 by
+ * Copyright (C) 2009-2024 by
  * Oran Agra and Mickey Gabel.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttcolr.c b/engine/thirdparty/freetype/src/sfnt/ttcolr.c
index 281e7135..b37658dd 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttcolr.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttcolr.c
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType colored glyph layer support (body).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, Dominik Röttsches, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
@@ -208,18 +208,19 @@
     colr->num_base_glyphs = FT_NEXT_USHORT( p );
     base_glyph_offset     = FT_NEXT_ULONG( p );
 
-    if ( base_glyph_offset >= table_size )
+    if ( table_size <= base_glyph_offset )
       goto InvalidTable;
-    if ( colr->num_base_glyphs * BASE_GLYPH_SIZE >
-           table_size - base_glyph_offset )
+    if ( ( table_size - base_glyph_offset ) / BASE_GLYPH_SIZE
+             < colr->num_base_glyphs )
       goto InvalidTable;
 
     layer_offset     = FT_NEXT_ULONG( p );
     colr->num_layers = FT_NEXT_USHORT( p );
 
-    if ( layer_offset >= table_size )
+    if ( table_size <= layer_offset )
       goto InvalidTable;
-    if ( colr->num_layers * LAYER_SIZE > table_size - layer_offset )
+    if ( ( table_size - layer_offset ) / LAYER_SIZE
+             < colr->num_layers )
       goto InvalidTable;
 
     if ( colr->version == 1 )
@@ -229,14 +230,14 @@
 
       base_glyphs_offset_v1 = FT_NEXT_ULONG( p );
 
-      if ( base_glyphs_offset_v1 >= table_size - 4 )
+      if ( table_size - 4 <= base_glyphs_offset_v1 )
         goto InvalidTable;
 
       p1                 = (FT_Byte*)( table + base_glyphs_offset_v1 );
       num_base_glyphs_v1 = FT_PEEK_ULONG( p1 );
 
-      if ( num_base_glyphs_v1 * BASE_GLYPH_PAINT_RECORD_SIZE >
-             table_size - base_glyphs_offset_v1 )
+      if ( ( table_size - base_glyphs_offset_v1 ) / BASE_GLYPH_PAINT_RECORD_SIZE
+               < num_base_glyphs_v1 )
         goto InvalidTable;
 
       colr->num_base_glyphs_v1 = num_base_glyphs_v1;
@@ -244,19 +245,19 @@
 
       layer_offset_v1 = FT_NEXT_ULONG( p );
 
-      if ( layer_offset_v1 >= table_size )
+      if ( table_size <= layer_offset_v1 )
         goto InvalidTable;
 
       if ( layer_offset_v1 )
       {
-        if ( layer_offset_v1 >= table_size - 4 )
+        if ( table_size - 4 <= layer_offset_v1 )
           goto InvalidTable;
 
         p1            = (FT_Byte*)( table + layer_offset_v1 );
         num_layers_v1 = FT_PEEK_ULONG( p1 );
 
-        if ( num_layers_v1 * LAYER_V1_LIST_PAINT_OFFSET_SIZE >
-               table_size - layer_offset_v1 )
+        if ( ( table_size - layer_offset_v1 ) / LAYER_V1_LIST_PAINT_OFFSET_SIZE
+                < num_layers_v1 )
           goto InvalidTable;
 
         colr->num_layers_v1 = num_layers_v1;
@@ -279,7 +280,7 @@
 
       clip_list_offset = FT_NEXT_ULONG( p );
 
-      if ( clip_list_offset >= table_size )
+      if ( table_size <= clip_list_offset )
         goto InvalidTable;
 
       if ( clip_list_offset )
@@ -311,7 +312,7 @@
           goto InvalidTable;
 
         var_store_offset = FT_NEXT_ULONG( p );
-        if ( var_store_offset >= table_size )
+        if ( table_size <= var_store_offset )
           goto InvalidTable;
 
         if ( var_store_offset )
@@ -661,6 +662,7 @@
       FT_UInt32  first_layer_index;
 
 
+      ENSURE_READ_BYTES( 5 );
       num_layers = FT_NEXT_BYTE( p );
       if ( num_layers > colr->num_layers_v1 )
         return 0;
@@ -1278,7 +1280,8 @@
 
     while ( min < max )
     {
-      FT_UInt  mid = min + ( max - min ) / 2;
+      FT_UInt    mid = min + ( max - min ) / 2;
+      FT_UShort  gid;
 
       /*
        * `base_glyph_begin` is the beginning of `BaseGlyphV1List`;
@@ -1287,8 +1290,7 @@
        */
       FT_Byte  *p = base_glyph_begin + 4 + mid * BASE_GLYPH_PAINT_RECORD_SIZE;
 
-      FT_UShort  gid = FT_NEXT_USHORT( p );
-
+      gid = FT_NEXT_USHORT( p );
 
       if ( gid < glyph_id )
         min = mid + 1;
diff --git a/engine/thirdparty/freetype/src/sfnt/ttcolr.h b/engine/thirdparty/freetype/src/sfnt/ttcolr.h
index 20c85f03..30031464 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttcolr.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttcolr.h
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType colored glyph layer support (specification).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
diff --git a/engine/thirdparty/freetype/src/sfnt/ttcpal.c b/engine/thirdparty/freetype/src/sfnt/ttcpal.c
index 46ae0859..997eb869 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttcpal.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttcpal.c
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType color palette support (body).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
diff --git a/engine/thirdparty/freetype/src/sfnt/ttcpal.h b/engine/thirdparty/freetype/src/sfnt/ttcpal.h
index 8e9913f0..bb301ae8 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttcpal.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttcpal.h
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType color palette support (specification).
  *
- * Copyright (C) 2018-2023 by
+ * Copyright (C) 2018-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Originally written by Shao Yu Zhang <shaozhang@fb.com>.
diff --git a/engine/thirdparty/freetype/src/sfnt/ttgpos.c b/engine/thirdparty/freetype/src/sfnt/ttgpos.c
new file mode 100644
index 00000000..b6cd8bf8
--- /dev/null
+++ b/engine/thirdparty/freetype/src/sfnt/ttgpos.c
@@ -0,0 +1,598 @@
+/****************************************************************************
+ *
+ * ttgpos.c
+ *
+ *   Load the TrueType GPOS table.  The only GPOS layout feature this
+ *   currently supports is kerning, from x advances in the pair adjustment
+ *   layout feature.
+ *
+ *   Parts of the implementation were adapted from:
+ *   https://github.com/nothings/stb/blob/master/stb_truetype.h
+ *
+ *   GPOS spec reference available at:
+ *   https://learn.microsoft.com/en-us/typography/opentype/spec/gpos
+ *
+ * Copyright (C) 2024 by
+ * David Saltzman
+ *
+ * This file is part of the FreeType project, and may only be used,
+ * modified, and distributed under the terms of the FreeType project
+ * license, LICENSE.TXT.  By continuing to use, modify, or distribute
+ * this file you indicate that you have read the license and
+ * understand and accept it fully.
+ */
+
+#include <freetype/internal/ftdebug.h>
+#include <freetype/internal/ftstream.h>
+#include <freetype/tttags.h>
+#include "freetype/fttypes.h"
+#include "freetype/internal/ftobjs.h"
+#include "ttgpos.h"
+
+
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+
+  /**************************************************************************
+   *
+   * The macro FT_COMPONENT is used in trace mode.  It is an implicit
+   * parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log
+   * messages during execution.
+   */
+#undef  FT_COMPONENT
+#define FT_COMPONENT  ttgpos
+
+
+  typedef enum  coverage_table_format_type_
+  {
+    COVERAGE_TABLE_FORMAT_LIST  = 1,
+    COVERAGE_TABLE_FORMAT_RANGE = 2
+
+  } coverage_table_format_type;
+
+  typedef enum  class_def_table_format_type_
+  {
+    CLASS_DEF_TABLE_FORMAT_ARRAY        = 1,
+    CLASS_DEF_TABLE_FORMAT_RANGE_GROUPS = 2
+
+  } class_def_table_format_type;
+
+  typedef enum  gpos_lookup_type_
+  {
+    GPOS_LOOKUP_TYPE_NONE                        = 0,
+    GPOS_LOOKUP_TYPE_SINGLE_ADJUSTMENT           = 1,
+    GPOS_LOOKUP_TYPE_PAIR_ADJUSTMENT             = 2,
+    GPOS_LOOKUP_TYPE_CURSIVE_ATTACHMENT          = 3,
+    GPOS_LOOKUP_TYPE_MARK_TO_BASE_ATTACHMENT     = 4,
+    GPOS_LOOKUP_TYPE_MARK_TO_LIGATURE_ATTACHMENT = 5,
+    GPOS_LOOKUP_TYPE_MARK_TO_MARK_ATTACHMENT     = 6,
+    GPOS_LOOKUP_TYPE_CONTEXT_POSITIONING         = 7,
+    GPOS_LOOKUP_TYPE_CHAINED_CONTEXT_POSITIONING = 8,
+    GPOS_LOOKUP_TYPE_EXTENSION_POSITIONING       = 9
+
+  } gpos_lookup_type;
+
+  typedef enum  gpos_pair_adjustment_format_
+  {
+    GPOS_PAIR_ADJUSTMENT_FORMAT_GLYPH_PAIR = 1,
+    GPOS_PAIR_ADJUSTMENT_FORMAT_CLASS_PAIR = 2
+
+  } gpos_pair_adjustment_format;
+
+  typedef enum  gpos_value_format_bitmask_
+  {
+    GPOS_VALUE_FORMAT_NONE               = 0x0000,
+    GPOS_VALUE_FORMAT_X_PLACEMENT        = 0x0001,
+    GPOS_VALUE_FORMAT_Y_PLACEMENT        = 0x0002,
+    GPOS_VALUE_FORMAT_X_ADVANCE          = 0x0004,
+    GPOS_VALUE_FORMAT_Y_ADVANCE          = 0x0008,
+    GPOS_VALUE_FORMAT_X_PLACEMENT_DEVICE = 0x0010,
+    GPOS_VALUE_FORMAT_Y_PLACEMENT_DEVICE = 0x0020,
+    GPOS_VALUE_FORMAT_X_ADVANCE_DEVICE   = 0x0040,
+    GPOS_VALUE_FORMAT_Y_ADVANCE_DEVICE   = 0x0080
+
+  } gpos_value_format_bitmask;
+
+
+  typedef struct TT_GPOS_Subtable_Iterator_Context_
+  {
+    /* Iteration state. */
+    FT_Byte*          current_lookup_table;
+    gpos_lookup_type  current_lookup_type;
+    FT_UShort         subtable_count;
+    FT_Byte*          subtable_offsets;
+    FT_UInt           subtable_idx;
+
+    /* Element for the current iteration. */
+    FT_Byte*          subtable;
+    gpos_lookup_type  subtable_type;
+
+  } TT_GPOS_Subtable_Iterator_Context;
+
+
+  /* Initialize a subtable iterator for a given lookup list index. */
+  static void
+  tt_gpos_subtable_iterator_init(
+    TT_GPOS_Subtable_Iterator_Context*  context,
+    FT_Byte*                            gpos_table,
+    FT_ULong                            lookup_list_idx )
+  {
+    FT_Byte*   lookup_list  = gpos_table + FT_PEEK_USHORT( gpos_table + 8 );
+    FT_UInt16  lookup_count = FT_PEEK_USHORT( lookup_list );
+
+
+    if ( lookup_list_idx < lookup_count )
+    {
+      context->current_lookup_table =
+        lookup_list + FT_PEEK_USHORT( lookup_list + 2 + 2 * lookup_list_idx );
+      context->current_lookup_type =
+        (gpos_lookup_type)FT_PEEK_USHORT( context->current_lookup_table );
+      context->subtable_count =
+        FT_PEEK_USHORT( context->current_lookup_table + 4 );
+      context->subtable_offsets = context->current_lookup_table + 6;
+    }
+    else
+    {
+      context->current_lookup_table = NULL;
+      context->current_lookup_type  = GPOS_LOOKUP_TYPE_NONE;
+      context->subtable_count       = 0;
+      context->subtable_offsets     = NULL;
+    }
+
+    context->subtable_idx  = 0;
+    context->subtable      = NULL;
+    context->subtable_type = GPOS_LOOKUP_TYPE_NONE;
+  }
+
+
+  /* Get the next subtable.  Return whether there was a next one. */
+  static FT_Bool
+  tt_gpos_subtable_iterator_next(
+    TT_GPOS_Subtable_Iterator_Context*  context )
+  {
+    if ( context->subtable_idx < context->subtable_count )
+    {
+      FT_UShort  subtable_offset =
+        FT_PEEK_USHORT( context->subtable_offsets +
+                        2 * context->subtable_idx );
+
+
+      context->subtable = context->current_lookup_table + subtable_offset;
+
+      if ( context->current_lookup_type ==
+           GPOS_LOOKUP_TYPE_EXTENSION_POSITIONING )
+      {
+        /* Update type and subtable based on extension positioning header. */
+        context->subtable_type =
+          (gpos_lookup_type)FT_PEEK_USHORT( context->subtable + 2 );
+        context->subtable += FT_PEEK_ULONG( context->subtable + 4 );
+      }
+      else
+        context->subtable_type = context->current_lookup_type;
+
+      context->subtable_idx++;
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+
+
+  static FT_Int
+  tt_gpos_get_coverage_index( FT_Byte  *coverage_table,
+                              FT_UInt   glyph )
+  {
+    coverage_table_format_type  coverage_format =
+      (coverage_table_format_type)FT_PEEK_USHORT( coverage_table );
+
+
+    switch ( coverage_format )
+    {
+    case COVERAGE_TABLE_FORMAT_LIST:
+      {
+        FT_UShort  glyph_count = FT_PEEK_USHORT( coverage_table + 2 );
+
+        FT_Int  l = 0;
+        FT_Int  r = glyph_count - 1;
+        FT_Int  m;
+
+        FT_Int  straw;
+        FT_Int  needle = (FT_Int)glyph;
+
+
+        /* Binary search. */
+        while ( l <= r )
+        {
+          FT_Byte   *glyph_array = coverage_table + 4;
+          FT_UShort  glyph_id;
+
+
+          m        = ( l + r ) >> 1;
+          glyph_id = FT_PEEK_USHORT( glyph_array + 2 * m );
+          straw    = glyph_id;
+
+          if ( needle < straw )
+            r = m - 1;
+          else if ( needle > straw )
+            l = m + 1;
+          else
+            return m;
+        }
+        break;
+      }
+
+    case COVERAGE_TABLE_FORMAT_RANGE:
+      {
+        FT_UShort  range_count = FT_PEEK_USHORT( coverage_table + 2 );
+        FT_Byte   *range_array = coverage_table + 4;
+
+        FT_Int  l = 0;
+        FT_Int  r = range_count - 1;
+        FT_Int  m;
+
+        FT_Int  straw_start;
+        FT_Int  straw_end;
+        FT_Int  needle = (FT_Int)glyph;
+
+
+        /* Binary search. */
+        while ( l <= r )
+        {
+          FT_Byte  *range_record;
+
+
+          m            = ( l + r ) >> 1;
+          range_record = range_array + 6 * m;
+          straw_start  = FT_PEEK_USHORT( range_record );
+          straw_end    = FT_PEEK_USHORT( range_record + 2 );
+
+          if ( needle < straw_start )
+            r = m - 1;
+          else if ( needle > straw_end )
+            l = m + 1;
+          else
+          {
+            FT_UShort start_coverage_index =
+                        FT_PEEK_USHORT( range_record + 4 );
+
+
+            return (FT_Int)start_coverage_index + (FT_Int)glyph - straw_start;
+          }
+        }
+        break;
+      }
+    }
+
+    return -1;
+  }
+
+
+  static FT_Int
+  tt_gpos_get_glyph_class( FT_Byte  *class_def_table,
+                           FT_UInt   glyph )
+  {
+    class_def_table_format_type  class_def_format =
+      (class_def_table_format_type)FT_PEEK_USHORT( class_def_table );
+
+
+    switch ( class_def_format )
+    {
+    case CLASS_DEF_TABLE_FORMAT_ARRAY:
+      {
+        FT_UInt  start_glyph_id    = FT_PEEK_USHORT( class_def_table + 2 );
+        FT_UInt  glyph_count       = FT_PEEK_USHORT( class_def_table + 4 );
+        FT_Byte  *class_value_array = class_def_table + 6;
+
+
+        if ( glyph >= start_glyph_id              &&
+             glyph < start_glyph_id + glyph_count )
+          return (FT_Int)FT_PEEK_USHORT( class_value_array +
+                                         2 * ( glyph - start_glyph_id ) );
+        break;
+      }
+
+    case CLASS_DEF_TABLE_FORMAT_RANGE_GROUPS:
+      {
+        FT_UShort  class_range_count   = FT_PEEK_USHORT( class_def_table + 2 );
+        FT_Byte   *class_range_records = class_def_table + 4;
+
+        FT_Int  l = 0;
+        FT_Int  r = class_range_count - 1;
+        FT_Int  m;
+
+        FT_Int  straw_start;
+        FT_Int  straw_end;
+        FT_Int  needle = (FT_Int)glyph;
+
+
+        while ( l <= r )
+        {
+          FT_Byte *class_range_record;
+
+
+          m                  = ( l + r ) >> 1;
+          class_range_record = class_range_records + 6 * m;
+          straw_start        = FT_PEEK_USHORT( class_range_record );
+          straw_end          = FT_PEEK_USHORT( class_range_record + 2 );
+
+          if ( needle < straw_start )
+            r = m - 1;
+          else if ( needle > straw_end )
+            l = m + 1;
+          else
+            return (FT_Int)FT_PEEK_USHORT( class_range_record + 4 );
+        }
+        break;
+      }
+    }
+
+    /* "All glyphs not assigned to a class fall into class 0." */
+    /* (OpenType spec)                                         */
+    return 0;
+  }
+
+
+  FT_LOCAL_DEF( FT_Error )
+  tt_face_load_gpos( TT_Face    face,
+                     FT_Stream  stream )
+  {
+    FT_Error  error;
+    FT_ULong  table_size;
+
+
+    /* The GPOS table is optional; exit silently if it is missing. */
+    error = face->goto_table( face, TTAG_GPOS, stream, &table_size );
+    if ( error )
+      goto Exit;
+
+    if ( table_size < 4 )  /* the case of a malformed table */
+    {
+      FT_ERROR(( "tt_face_load_gpos:"
+                 " GPOS table is too small - ignored\n" ));
+      error = FT_THROW( Table_Missing );
+      goto Exit;
+    }
+
+    if ( FT_FRAME_EXTRACT( table_size, face->gpos_table ) )
+    {
+      FT_ERROR(( "tt_face_load_gpos:"
+                 " could not extract GPOS table\n" ));
+      goto Exit;
+    }
+
+    face->gpos_kerning_available = FALSE;
+
+    if ( face->gpos_table )
+    {
+      FT_Byte*   feature_list    = face->gpos_table +
+                                   FT_PEEK_USHORT( face->gpos_table + 6 );
+      FT_UInt16  feature_count   = FT_PEEK_USHORT( feature_list );
+      FT_Byte*   feature_records = feature_list + 2;
+
+      FT_UInt  idx;
+
+
+      for ( idx = 0; idx < feature_count; idx++, feature_records += 6 )
+      {
+        FT_ULong  feature_tag = FT_PEEK_ULONG( feature_records );
+
+
+        if ( feature_tag == TTAG_kern )
+        {
+          face->gpos_kerning_available = TRUE;
+          break;
+        }
+      }
+    }
+
+  Exit:
+    return error;
+  }
+
+
+  FT_LOCAL_DEF( void )
+  tt_face_done_gpos( TT_Face  face )
+  {
+    FT_Stream  stream = face->root.stream;
+
+
+    FT_FRAME_RELEASE( face->gpos_table );
+  }
+
+
+  FT_LOCAL_DEF( FT_Int )
+  tt_face_get_gpos_kerning( TT_Face  face,
+                            FT_UInt  left_glyph,
+                            FT_UInt  right_glyph )
+  {
+    FT_Byte*   feature_list;
+    FT_UInt16  feature_count;
+    FT_Byte*   feature_records;
+    FT_UInt    feature_idx;
+
+
+    if ( !face->gpos_kerning_available )
+      return 0;
+
+    feature_list    = face->gpos_table +
+                      FT_PEEK_USHORT( face->gpos_table + 6 );
+    feature_count   = FT_PEEK_USHORT( feature_list );
+    feature_records = feature_list + 2;
+
+    for ( feature_idx = 0;
+          feature_idx < feature_count;
+          feature_idx++, feature_records += 6 )
+    {
+      FT_ULong   feature_tag = FT_PEEK_ULONG( feature_records );
+      FT_Byte*   feature_table;
+      FT_UInt16  lookup_idx_count;
+      FT_UInt16  lookup_idx;
+
+
+      if ( feature_tag != TTAG_kern )
+        continue;
+
+      feature_table    = feature_list + FT_PEEK_USHORT( feature_records + 4 );
+      lookup_idx_count = FT_PEEK_USHORT( feature_table + 2 );
+
+      for ( lookup_idx = 0; lookup_idx < lookup_idx_count; lookup_idx++ )
+      {
+        FT_UInt16 lookup_list_idx =
+          FT_PEEK_USHORT( feature_table + 4 + 2 * lookup_idx );
+        TT_GPOS_Subtable_Iterator_Context  subtable_iter;
+
+
+        tt_gpos_subtable_iterator_init( &subtable_iter,
+                                        face->gpos_table,
+                                        lookup_list_idx );
+
+        while ( tt_gpos_subtable_iterator_next( &subtable_iter ) )
+        {
+          FT_Byte*  subtable;
+
+          gpos_value_format_bitmask    value_format_1;
+          gpos_value_format_bitmask    value_format_2;
+          gpos_pair_adjustment_format  format;
+
+          FT_UShort  coverage_offset;
+          FT_Int     coverage_index;
+
+
+          if ( subtable_iter.subtable_type !=
+               GPOS_LOOKUP_TYPE_PAIR_ADJUSTMENT )
+            continue;
+
+          subtable = subtable_iter.subtable;
+
+          value_format_1 =
+            (gpos_value_format_bitmask)FT_PEEK_USHORT( subtable + 4 );
+          value_format_2 =
+            (gpos_value_format_bitmask)FT_PEEK_USHORT( subtable + 6 );
+
+          if ( !( value_format_1 == GPOS_VALUE_FORMAT_X_ADVANCE &&
+                  value_format_2 == GPOS_VALUE_FORMAT_NONE      ) )
+            continue;
+
+          format = (gpos_pair_adjustment_format)FT_PEEK_USHORT( subtable );
+
+          coverage_offset = FT_PEEK_USHORT( subtable + 2 );
+          coverage_index  =
+            tt_gpos_get_coverage_index( subtable + coverage_offset,
+                                        left_glyph );
+
+          if ( coverage_index == -1 )
+            continue;
+
+          switch ( format )
+          {
+          case GPOS_PAIR_ADJUSTMENT_FORMAT_GLYPH_PAIR:
+            {
+              FT_Int  l, r, m;
+              FT_Int  straw, needle;
+
+              FT_Int  value_record_pair_size_in_bytes = 2;
+
+              FT_UShort  pair_set_count = FT_PEEK_USHORT( subtable + 8 );
+              FT_UShort  pair_pos_offset;
+
+              FT_Byte*   pair_value_table;
+              FT_UShort  pair_value_count;
+              FT_Byte*   pair_value_array;
+
+
+              if ( coverage_index >= pair_set_count )
+                return 0;
+
+              pair_pos_offset =
+                FT_PEEK_USHORT( subtable + 10 + 2 * coverage_index );
+
+              pair_value_table = subtable + pair_pos_offset;
+              pair_value_count = FT_PEEK_USHORT( pair_value_table );
+              pair_value_array = pair_value_table + 2;
+
+              needle = (FT_Int)right_glyph;
+              r      = pair_value_count - 1;
+              l      = 0;
+
+              /* Binary search. */
+              while ( l <= r )
+              {
+                FT_UShort  second_glyph;
+                FT_Byte*   pair_value;
+
+
+                m            = ( l + r ) >> 1;
+                pair_value   = pair_value_array +
+                               ( 2 + value_record_pair_size_in_bytes ) * m;
+                second_glyph = FT_PEEK_USHORT( pair_value );
+                straw        = second_glyph;
+
+                if ( needle < straw )
+                  r = m - 1;
+                else if ( needle > straw )
+                  l = m + 1;
+                else
+                {
+                  FT_Short  x_advance = FT_PEEK_SHORT( pair_value + 2 );
+
+
+                  return x_advance;
+                }
+              }
+              break;
+            }
+
+          case GPOS_PAIR_ADJUSTMENT_FORMAT_CLASS_PAIR:
+            {
+              FT_UShort  class_def1_offset = FT_PEEK_USHORT( subtable + 8 );
+              FT_UShort  class_def2_offset = FT_PEEK_USHORT( subtable + 10 );
+
+              FT_Int  left_glyph_class =
+                tt_gpos_get_glyph_class( subtable + class_def1_offset,
+                                         left_glyph );
+              FT_Int  right_glyph_class =
+                tt_gpos_get_glyph_class( subtable + class_def2_offset,
+                                         right_glyph );
+
+              FT_UShort class1_count = FT_PEEK_USHORT( subtable + 12 );
+              FT_UShort class2_count = FT_PEEK_USHORT( subtable + 14 );
+
+              FT_Byte *class1_records, *class2_records;
+              FT_Short x_advance;
+
+
+              if ( left_glyph_class < 0             ||
+                   left_glyph_class >= class1_count )
+                return 0;  /* malformed */
+              if ( right_glyph_class < 0             ||
+                   right_glyph_class >= class2_count )
+                return 0;  /* malformed */
+
+              if ( right_glyph_class == 0 )
+                continue; /* right glyph not found in this table */
+
+              class1_records = subtable + 16;
+              class2_records =
+                class1_records + 2 * ( left_glyph_class * class2_count );
+
+              x_advance =
+                FT_PEEK_SHORT( class2_records + 2 * right_glyph_class );
+
+              return x_advance;
+            }
+          }
+        }
+      }
+    }
+
+    return 0;
+  }
+
+#else /* !TT_CONFIG_OPTION_GPOS_KERNING */
+
+  /* ANSI C doesn't like empty source files */
+  typedef int  tt_gpos_dummy_;
+
+#endif /* !TT_CONFIG_OPTION_GPOS_KERNING */
+
+
+/* END */
diff --git a/engine/thirdparty/freetype/src/sfnt/ttgpos.h b/engine/thirdparty/freetype/src/sfnt/ttgpos.h
new file mode 100644
index 00000000..570e9e3d
--- /dev/null
+++ b/engine/thirdparty/freetype/src/sfnt/ttgpos.h
@@ -0,0 +1,53 @@
+/****************************************************************************
+ *
+ * ttgpos.c
+ *
+ *   Load the TrueType GPOS table.  The only GPOS layout feature this
+ *   currently supports is kerning, from x advances in the pair adjustment
+ *   layout feature.
+ *
+ * Copyright (C) 2024 by
+ * David Saltzman
+ *
+ * This file is part of the FreeType project, and may only be used,
+ * modified, and distributed under the terms of the FreeType project
+ * license, LICENSE.TXT.  By continuing to use, modify, or distribute
+ * this file you indicate that you have read the license and
+ * understand and accept it fully.
+ */
+
+
+#ifndef TTGPOS_H_
+#define TTGPOS_H_
+
+
+#include <freetype/internal/ftstream.h>
+#include <freetype/internal/tttypes.h>
+
+
+FT_BEGIN_HEADER
+
+
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+
+  FT_LOCAL( FT_Error  )
+  tt_face_load_gpos( TT_Face    face,
+                     FT_Stream  stream );
+
+  FT_LOCAL( void )
+  tt_face_done_gpos( TT_Face  face );
+
+  FT_LOCAL( FT_Int )
+  tt_face_get_gpos_kerning( TT_Face  face,
+                            FT_UInt  left_glyph,
+                            FT_UInt  right_glyph );
+
+#endif /* TT_CONFIG_OPTION_GPOS_KERNING */
+
+
+FT_END_HEADER
+
+#endif /* TTGPOS_H_ */
+
+
+/* END */
diff --git a/engine/thirdparty/freetype/src/sfnt/ttkern.c b/engine/thirdparty/freetype/src/sfnt/ttkern.c
index a47d08bd..f0411366 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttkern.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttkern.c
@@ -5,7 +5,7 @@
  *   Load the basic TrueType kerning table.  This doesn't handle
  *   kerning data within the GPOS table at the moment.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttkern.h b/engine/thirdparty/freetype/src/sfnt/ttkern.h
index 960c7da4..a54e51df 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttkern.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttkern.h
@@ -5,7 +5,7 @@
  *   Load the basic TrueType kerning table.  This doesn't handle
  *   kerning data within the GPOS table at the moment.
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttload.c b/engine/thirdparty/freetype/src/sfnt/ttload.c
index 7b44e9cd..c3a5fae2 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttload.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttload.c
@@ -5,7 +5,7 @@
  *   Load the basic TrueType tables, i.e., tables that can be either in
  *   TTF or OTF fonts (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -1046,7 +1046,7 @@
   FT_LOCAL_DEF( void )
   tt_face_free_name( TT_Face  face )
   {
-    FT_Memory     memory = face->root.driver->root.memory;
+    FT_Memory     memory = face->root.memory;
     TT_NameTable  table  = &face->name_table;
 
 
diff --git a/engine/thirdparty/freetype/src/sfnt/ttload.h b/engine/thirdparty/freetype/src/sfnt/ttload.h
index 1499dd57..2b1d62d9 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttload.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttload.h
@@ -5,7 +5,7 @@
  *   Load the basic TrueType tables, i.e., tables that can be either in
  *   TTF or OTF fonts (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttmtx.c b/engine/thirdparty/freetype/src/sfnt/ttmtx.c
index 38ee9ae7..27884118 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttmtx.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttmtx.c
@@ -4,7 +4,7 @@
  *
  *   Load the metrics tables common to TTF and OTF fonts (body).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttmtx.h b/engine/thirdparty/freetype/src/sfnt/ttmtx.h
index 56d2b627..34b3c0e1 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttmtx.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttmtx.h
@@ -4,7 +4,7 @@
  *
  *   Load the metrics tables common to TTF and OTF fonts (specification).
  *
- * Copyright (C) 2006-2023 by
+ * Copyright (C) 2006-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttpost.c b/engine/thirdparty/freetype/src/sfnt/ttpost.c
index 1dfad429..5698a62c 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttpost.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttpost.c
@@ -5,7 +5,7 @@
  *   PostScript name table processing for TrueType and OpenType fonts
  *   (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -204,8 +204,8 @@
     /* now load the name strings */
     if ( num_names )
     {
-      FT_ULong   p;
-      FT_Byte*   strings;
+      FT_Byte*   p;
+      FT_Byte*   p_end;
 
 
       post_len -= (FT_ULong)num_glyphs * 2;
@@ -214,36 +214,36 @@
                                     post_len + 1 ) )
         goto Fail;
 
-      strings = (FT_Byte*)( name_strings + num_names );
-      if ( FT_STREAM_READ( strings, post_len ) )
+      p = (FT_Byte*)( name_strings + num_names );
+      if ( FT_STREAM_READ( p, post_len ) )
         goto Fail;
 
+      p_end = p + post_len;
+
       /* convert from Pascal- to C-strings and set pointers */
-      for ( p = 0, n = 0; p < post_len && n < num_names; n++ )
+      for ( n = 0; p < p_end && n < num_names; n++ )
       {
-        FT_UInt  len = strings[p];
+        FT_UInt  len = *p;
 
 
-        if ( len > 63U )
-        {
-          error = FT_THROW( Invalid_File_Format );
-          goto Fail;
-        }
+        /* names in the Adobe Glyph List are shorter than 40 characters */
+        if ( len >= 40U )
+          FT_TRACE4(( "load_format_20: unusual %u-char name found\n", len ));
 
-        strings[p]      = 0;
-        name_strings[n] = strings + p + 1;
-        p              += len + 1;
+        *p++            = 0;
+        name_strings[n] = p;
+        p              += len;
       }
-      strings[post_len] = 0;
+      *p_end = 0;
 
       /* deal with missing or insufficient string data */
       if ( n < num_names )
       {
         FT_TRACE4(( "load_format_20: %hu PostScript names are truncated\n",
-                    num_names - n ));
+                    (FT_UShort)( num_names - n ) ));
 
         for ( ; n < num_names; n++ )
-          name_strings[n] = strings + post_len;
+          name_strings[n] = p_end;
       }
     }
 
@@ -436,13 +436,8 @@
 
     format = face->postscript.FormatType;
 
-    if ( format == 0x00010000L )
-    {
-      if ( idx < 258 )                    /* paranoid checking */
-        *PSname = MAC_NAME( idx );
-    }
-    else if ( format == 0x00020000L ||
-              format == 0x00025000L )
+    if ( format == 0x00020000L ||
+         format == 0x00025000L )
     {
       TT_Post_Names  names = &face->postscript_names;
 
@@ -466,6 +461,11 @@
       }
     }
 
+    /* version 1.0 is only valid with 258 glyphs */
+    else if ( format == 0x00010000L              &&
+              face->max_profile.numGlyphs == 258 )
+      *PSname = MAC_NAME( idx );
+
     /* nothing to do for format == 0x00030000L */
 
   End:
diff --git a/engine/thirdparty/freetype/src/sfnt/ttpost.h b/engine/thirdparty/freetype/src/sfnt/ttpost.h
index 528f1c5f..150db6c3 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttpost.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttpost.h
@@ -5,7 +5,7 @@
  *   PostScript name table processing for TrueType and OpenType fonts
  *   (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttsbit.c b/engine/thirdparty/freetype/src/sfnt/ttsbit.c
index 03f90a62..cb3a8abf 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttsbit.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttsbit.c
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType embedded bitmap support (body).
  *
- * Copyright (C) 2005-2023 by
+ * Copyright (C) 2005-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * Copyright 2013 by Google, Inc.
diff --git a/engine/thirdparty/freetype/src/sfnt/ttsbit.h b/engine/thirdparty/freetype/src/sfnt/ttsbit.h
index 07e2db46..96f80a58 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttsbit.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttsbit.h
@@ -4,7 +4,7 @@
  *
  *   TrueType and OpenType embedded bitmap support (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttsvg.c b/engine/thirdparty/freetype/src/sfnt/ttsvg.c
index 4461d483..298afd8b 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttsvg.c
+++ b/engine/thirdparty/freetype/src/sfnt/ttsvg.c
@@ -4,7 +4,7 @@
  *
  *   OpenType SVG Color (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/ttsvg.h b/engine/thirdparty/freetype/src/sfnt/ttsvg.h
index 3f32321d..20f9e47c 100644
--- a/engine/thirdparty/freetype/src/sfnt/ttsvg.h
+++ b/engine/thirdparty/freetype/src/sfnt/ttsvg.h
@@ -4,7 +4,7 @@
  *
  *   OpenType SVG Color (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/woff2tags.c b/engine/thirdparty/freetype/src/sfnt/woff2tags.c
index eeedd990..532ccfa1 100644
--- a/engine/thirdparty/freetype/src/sfnt/woff2tags.c
+++ b/engine/thirdparty/freetype/src/sfnt/woff2tags.c
@@ -4,7 +4,7 @@
  *
  *   WOFF2 Font table tags (base).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/sfnt/woff2tags.h b/engine/thirdparty/freetype/src/sfnt/woff2tags.h
index 1201848e..d03b4b41 100644
--- a/engine/thirdparty/freetype/src/sfnt/woff2tags.h
+++ b/engine/thirdparty/freetype/src/sfnt/woff2tags.h
@@ -4,7 +4,7 @@
  *
  *   WOFF2 Font table tags (specification).
  *
- * Copyright (C) 2019-2023 by
+ * Copyright (C) 2019-2024 by
  * Nikhil Ramakrishnan, David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/smooth/ftgrays.c b/engine/thirdparty/freetype/src/smooth/ftgrays.c
index 0918272f..b7c0632a 100644
--- a/engine/thirdparty/freetype/src/smooth/ftgrays.c
+++ b/engine/thirdparty/freetype/src/smooth/ftgrays.c
@@ -4,7 +4,7 @@
  *
  *   A new `perfect' anti-aliasing renderer (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -489,7 +489,7 @@ typedef ptrdiff_t  FT_PtrDist;
 
   typedef struct  gray_TWorker_
   {
-    ft_jmp_buf  jump_buffer;
+    FT_BBox     cbox;
 
     TCoord  min_ex, max_ex;  /* min and max integer pixel coordinates */
     TCoord  min_ey, max_ey;
@@ -510,6 +510,8 @@ typedef ptrdiff_t  FT_PtrDist;
     FT_Raster_Span_Func  render_span;
     void*                render_span_data;
 
+    ft_jmp_buf  jump_buffer;
+
   } gray_TWorker, *gray_PWorker;
 
 #if defined( _MSC_VER )
@@ -997,49 +999,12 @@ typedef ptrdiff_t  FT_PtrDist;
 #endif
 
   /*
-   * Benchmarking shows that using DDA to flatten the quadratic Bézier arcs
-   * is slightly faster in the following cases:
-   *
-   *   - When the host CPU is 64-bit.
-   *   - When SSE2 SIMD registers and instructions are available (even on
-   *     x86).
-   *
-   * For other cases, using binary splits is actually slightly faster.
+   * For now, the code that uses DDA to render conic curves requires
+   * `FT_Int64` to be defined.  See for example
+   *    https://gitlab.freedesktop.org/freetype/freetype/-/issues/1071.
    */
-#if ( defined( __SSE2__ )                          ||   \
-      defined( __x86_64__ )                        ||   \
-      defined( _M_AMD64 )                          ||   \
-      ( defined( _M_IX86_FP ) && _M_IX86_FP >= 2 ) ) && \
-    !defined( __VMS )
-#  define FT_SSE2 1
-#else
-#  define FT_SSE2 0
-#endif
 
-#if FT_SSE2                || \
-    defined( __aarch64__ ) || \
-    defined( _M_ARM64 )
-#  define BEZIER_USE_DDA  1
-#else
-#  define BEZIER_USE_DDA  0
-#endif
-
-  /*
-   * For now, the code that depends on `BEZIER_USE_DDA` requires `FT_Int64`
-   * to be defined.  If `FT_INT64` is not defined, meaning there is no
-   * 64-bit type available, disable it to avoid compilation errors.  See for
-   * example https://gitlab.freedesktop.org/freetype/freetype/-/issues/1071.
-   */
-#if !defined( FT_INT64 )
-#  undef BEZIER_USE_DDA
-#  define BEZIER_USE_DDA  0
-#endif
-
-#if BEZIER_USE_DDA
-
-#if FT_SSE2
-#  include <emmintrin.h>
-#endif
+#ifdef FT_INT64
 
 #define LEFT_SHIFT( a, b )  (FT_Int64)( (FT_UInt64)(a) << (b) )
 
@@ -1095,16 +1060,17 @@ typedef ptrdiff_t  FT_PtrDist;
       return;
     }
 
-    /* We can calculate the number of necessary bisections because  */
+    /* We can calculate the number of necessary segments because    */
     /* each bisection predictably reduces deviation exactly 4-fold. */
     /* Even 32-bit deviation would vanish after 16 bisections.      */
-    shift = 0;
+    shift = 16;
     do
     {
-      dx   >>= 2;
-      shift += 1;
+      dx >>= 2;
+      shift--;
 
     } while ( dx > ONE_PIXEL / 4 );
+    count = 0x10000U >> shift;
 
     /*
      * The (P0,P1,P2) arc equation, for t in [0,1] range:
@@ -1150,75 +1116,19 @@ typedef ptrdiff_t  FT_PtrDist;
      *             = (B << (33 - N)) + (A << (32 - 2*N))
      */
 
-#if FT_SSE2
-    /* Experience shows that for small shift values, */
-    /* SSE2 is actually slower.                      */
-    if ( shift > 2 )
-    {
-      union
-      {
-        struct { FT_Int64  ax, ay, bx, by; }  i;
-        struct { __m128i  a, b; }  vec;
+    rx = LEFT_SHIFT( ax, shift + shift );
+    ry = LEFT_SHIFT( ay, shift + shift );
 
-      } u;
+    qx = LEFT_SHIFT( bx, shift + 17 ) + rx;
+    qy = LEFT_SHIFT( by, shift + 17 ) + ry;
 
-      union
-      {
-        struct { FT_Int32  px_lo, px_hi, py_lo, py_hi; }  i;
-        __m128i  vec;
-
-      } v;
-
-      __m128i  a, b;
-      __m128i  r, q, q2;
-      __m128i  p;
-
-
-      u.i.ax = ax;
-      u.i.ay = ay;
-      u.i.bx = bx;
-      u.i.by = by;
-
-      a = _mm_load_si128( &u.vec.a );
-      b = _mm_load_si128( &u.vec.b );
-
-      r  = _mm_slli_epi64( a, 33 - 2 * shift );
-      q  = _mm_slli_epi64( b, 33 - shift );
-      q2 = _mm_slli_epi64( a, 32 - 2 * shift );
-
-      q = _mm_add_epi64( q2, q );
-
-      v.i.px_lo = 0;
-      v.i.px_hi = p0.x;
-      v.i.py_lo = 0;
-      v.i.py_hi = p0.y;
-
-      p = _mm_load_si128( &v.vec );
-
-      for ( count = 1U << shift; count > 0; count-- )
-      {
-        p = _mm_add_epi64( p, q );
-        q = _mm_add_epi64( q, r );
-
-        _mm_store_si128( &v.vec, p );
-
-        gray_render_line( RAS_VAR_ v.i.px_hi, v.i.py_hi );
-      }
-
-      return;
-    }
-#endif  /* FT_SSE2 */
-
-    rx = LEFT_SHIFT( ax, 33 - 2 * shift );
-    ry = LEFT_SHIFT( ay, 33 - 2 * shift );
-
-    qx = LEFT_SHIFT( bx, 33 - shift ) + LEFT_SHIFT( ax, 32 - 2 * shift );
-    qy = LEFT_SHIFT( by, 33 - shift ) + LEFT_SHIFT( ay, 32 - 2 * shift );
+    rx *= 2;
+    ry *= 2;
 
     px = LEFT_SHIFT( p0.x, 32 );
     py = LEFT_SHIFT( p0.y, 32 );
 
-    for ( count = 1U << shift; count > 0; count-- )
+    do
     {
       px += qx;
       py += qy;
@@ -1227,10 +1137,10 @@ typedef ptrdiff_t  FT_PtrDist;
 
       gray_render_line( RAS_VAR_ (FT_Pos)( px >> 32 ),
                                  (FT_Pos)( py >> 32 ) );
-    }
+    } while ( --count );
   }
 
-#else  /* !BEZIER_USE_DDA */
+#else  /* !FT_INT64 */
 
   /*
    * Note that multiple attempts to speed up the function below
@@ -1324,7 +1234,7 @@ typedef ptrdiff_t  FT_PtrDist;
     } while ( --draw );
   }
 
-#endif  /* !BEZIER_USE_DDA */
+#endif  /* !FT_INT64 */
 
 
   /*
@@ -1486,139 +1396,6 @@ typedef ptrdiff_t  FT_PtrDist;
   }
 
 
-  static void
-  gray_sweep( RAS_ARG )
-  {
-    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
-                                                                 : INT_MIN;
-    int  coverage;
-    int  y;
-
-
-    for ( y = ras.min_ey; y < ras.max_ey; y++ )
-    {
-      PCell   cell  = ras.ycells[y - ras.min_ey];
-      TCoord  x     = ras.min_ex;
-      TArea   cover = 0;
-
-      unsigned char*  line = ras.target.origin - ras.target.pitch * y;
-
-
-      for ( ; cell != ras.cell_null; cell = cell->next )
-      {
-        TArea  area;
-
-
-        if ( cover != 0 && cell->x > x )
-        {
-          FT_FILL_RULE( coverage, cover, fill );
-          FT_GRAY_SET( line + x, coverage, cell->x - x );
-        }
-
-        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
-        area   = cover - cell->area;
-
-        if ( area != 0 && cell->x >= ras.min_ex )
-        {
-          FT_FILL_RULE( coverage, area, fill );
-          line[cell->x] = (unsigned char)coverage;
-        }
-
-        x = cell->x + 1;
-      }
-
-      if ( cover != 0 )  /* only if cropped */
-      {
-        FT_FILL_RULE( coverage, cover, fill );
-        FT_GRAY_SET( line + x, coverage, ras.max_ex - x );
-      }
-    }
-  }
-
-
-  static void
-  gray_sweep_direct( RAS_ARG )
-  {
-    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
-                                                                 : INT_MIN;
-    int  coverage;
-    int  y;
-
-    FT_Span  span[FT_MAX_GRAY_SPANS];
-    int      n = 0;
-
-
-    for ( y = ras.min_ey; y < ras.max_ey; y++ )
-    {
-      PCell   cell  = ras.ycells[y - ras.min_ey];
-      TCoord  x     = ras.min_ex;
-      TArea   cover = 0;
-
-
-      for ( ; cell != ras.cell_null; cell = cell->next )
-      {
-        TArea  area;
-
-
-        if ( cover != 0 && cell->x > x )
-        {
-          FT_FILL_RULE( coverage, cover, fill );
-
-          span[n].coverage = (unsigned char)coverage;
-          span[n].x        = (short)x;
-          span[n].len      = (unsigned short)( cell->x - x );
-
-          if ( ++n == FT_MAX_GRAY_SPANS )
-          {
-            /* flush the span buffer and reset the count */
-            ras.render_span( y, n, span, ras.render_span_data );
-            n = 0;
-          }
-        }
-
-        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
-        area   = cover - cell->area;
-
-        if ( area != 0 && cell->x >= ras.min_ex )
-        {
-          FT_FILL_RULE( coverage, area, fill );
-
-          span[n].coverage = (unsigned char)coverage;
-          span[n].x        = (short)cell->x;
-          span[n].len      = 1;
-
-          if ( ++n == FT_MAX_GRAY_SPANS )
-          {
-            /* flush the span buffer and reset the count */
-            ras.render_span( y, n, span, ras.render_span_data );
-            n = 0;
-          }
-        }
-
-        x = cell->x + 1;
-      }
-
-      if ( cover != 0 )  /* only if cropped */
-      {
-        FT_FILL_RULE( coverage, cover, fill );
-
-        span[n].coverage = (unsigned char)coverage;
-        span[n].x        = (short)x;
-        span[n].len      = (unsigned short)( ras.max_ex - x );
-
-        ++n;
-      }
-
-      if ( n )
-      {
-        /* flush the span buffer and reset the count */
-        ras.render_span( y, n, span, ras.render_span_data );
-        n = 0;
-      }
-    }
-  }
-
-
 #ifdef STANDALONE_
 
   /**************************************************************************
@@ -1934,7 +1711,7 @@ typedef ptrdiff_t  FT_PtrDist;
       if ( continued )
         FT_Trace_Enable();
 
-      FT_TRACE7(( "band [%d..%d]: %td cell%s remaining/\n",
+      FT_TRACE7(( "band [%d..%d]: %td cell%s remaining\n",
                   ras.min_ey,
                   ras.max_ey,
                   ras.cell_null - ras.cell_free,
@@ -1952,14 +1729,144 @@ typedef ptrdiff_t  FT_PtrDist;
   }
 
 
+  static void
+  gray_sweep( RAS_ARG )
+  {
+    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
+                                                                 : INT_MIN;
+    int  coverage;
+    int  y;
+
+
+    for ( y = ras.min_ey; y < ras.max_ey; y++ )
+    {
+      PCell   cell  = ras.ycells[y - ras.min_ey];
+      TCoord  x     = ras.min_ex;
+      TArea   cover = 0;
+
+      unsigned char*  line = ras.target.origin - ras.target.pitch * y;
+
+
+      for ( ; cell != ras.cell_null; cell = cell->next )
+      {
+        TArea  area;
+
+
+        if ( cover != 0 && cell->x > x )
+        {
+          FT_FILL_RULE( coverage, cover, fill );
+          FT_GRAY_SET( line + x, coverage, cell->x - x );
+        }
+
+        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
+        area   = cover - cell->area;
+
+        if ( area != 0 && cell->x >= ras.min_ex )
+        {
+          FT_FILL_RULE( coverage, area, fill );
+          line[cell->x] = (unsigned char)coverage;
+        }
+
+        x = cell->x + 1;
+      }
+
+      if ( cover != 0 )  /* only if cropped */
+      {
+        FT_FILL_RULE( coverage, cover, fill );
+        FT_GRAY_SET( line + x, coverage, ras.max_ex - x );
+      }
+    }
+  }
+
+
+  static void
+  gray_sweep_direct( RAS_ARG )
+  {
+    int  fill = ( ras.outline.flags & FT_OUTLINE_EVEN_ODD_FILL ) ? 0x100
+                                                                 : INT_MIN;
+    int  coverage;
+    int  y;
+
+    FT_Span  span[FT_MAX_GRAY_SPANS];
+    int      n = 0;
+
+
+    for ( y = ras.min_ey; y < ras.max_ey; y++ )
+    {
+      PCell   cell  = ras.ycells[y - ras.min_ey];
+      TCoord  x     = ras.min_ex;
+      TArea   cover = 0;
+
+
+      for ( ; cell != ras.cell_null; cell = cell->next )
+      {
+        TArea  area;
+
+
+        if ( cover != 0 && cell->x > x )
+        {
+          FT_FILL_RULE( coverage, cover, fill );
+
+          span[n].coverage = (unsigned char)coverage;
+          span[n].x        = (short)x;
+          span[n].len      = (unsigned short)( cell->x - x );
+
+          if ( ++n == FT_MAX_GRAY_SPANS )
+          {
+            /* flush the span buffer and reset the count */
+            ras.render_span( y, n, span, ras.render_span_data );
+            n = 0;
+          }
+        }
+
+        cover += (TArea)cell->cover * ( ONE_PIXEL * 2 );
+        area   = cover - cell->area;
+
+        if ( area != 0 && cell->x >= ras.min_ex )
+        {
+          FT_FILL_RULE( coverage, area, fill );
+
+          span[n].coverage = (unsigned char)coverage;
+          span[n].x        = (short)cell->x;
+          span[n].len      = 1;
+
+          if ( ++n == FT_MAX_GRAY_SPANS )
+          {
+            /* flush the span buffer and reset the count */
+            ras.render_span( y, n, span, ras.render_span_data );
+            n = 0;
+          }
+        }
+
+        x = cell->x + 1;
+      }
+
+      if ( cover != 0 )  /* only if cropped */
+      {
+        FT_FILL_RULE( coverage, cover, fill );
+
+        span[n].coverage = (unsigned char)coverage;
+        span[n].x        = (short)x;
+        span[n].len      = (unsigned short)( ras.max_ex - x );
+
+        ++n;
+      }
+
+      if ( n )
+      {
+        /* flush the span buffer and reset the count */
+        ras.render_span( y, n, span, ras.render_span_data );
+        n = 0;
+      }
+    }
+  }
+
+
   static int
   gray_convert_glyph( RAS_ARG )
   {
-    const TCoord  yMin = ras.min_ey;
-    const TCoord  yMax = ras.max_ey;
-
     TCell    buffer[FT_MAX_GRAY_POOL];
-    size_t   height = (size_t)( yMax - yMin );
+    size_t   height = (size_t)( ras.cbox.yMax - ras.cbox.yMin );
     size_t   n = FT_MAX_GRAY_POOL / 8;
     TCoord   y;
     TCoord   bands[32];  /* enough to accommodate bisections */
@@ -1985,35 +1892,36 @@ typedef ptrdiff_t  FT_PtrDist;
       height  = ( height + n - 1 ) / n;
     }
 
-    for ( y = yMin; y < yMax; )
+    for ( y = ras.cbox.yMin; y < ras.cbox.yMax; )
     {
       ras.min_ey = y;
       y         += height;
-      ras.max_ey = FT_MIN( y, yMax );
+      ras.max_ey = FT_MIN( y, ras.cbox.yMax );
+
+      ras.count_ey = ras.max_ey - ras.min_ey;
 
       band    = bands;
-      band[1] = ras.min_ey;
-      band[0] = ras.max_ey;
+      band[1] = ras.cbox.xMin;
+      band[0] = ras.cbox.xMax;
 
       do
       {
-        TCoord  width = band[0] - band[1];
-        TCoord  w;
+        TCoord  i;
         int     error;
 
 
-        for ( w = 0; w < width; ++w )
-          ras.ycells[w] = ras.cell_null;
+        ras.min_ex = band[1];
+        ras.max_ex = band[0];
 
-        /* memory management: skip ycells */
-        n = ( (size_t)width * sizeof ( PCell ) + sizeof ( TCell ) - 1 ) /
-              sizeof ( TCell );
+        /* memory management: zero out and skip ycells */
+        for ( i = 0; i < ras.count_ey; ++i )
+          ras.ycells[i] = ras.cell_null;
+
+        n = ( (size_t)ras.count_ey * sizeof ( PCell ) + sizeof ( TCell ) - 1 )
+              / sizeof ( TCell );
 
         ras.cell_free = buffer + n;
         ras.cell      = ras.cell_null;
-        ras.min_ey    = band[1];
-        ras.max_ey    = band[0];
-        ras.count_ey  = width;
 
         error     = gray_convert_glyph_inner( RAS_VAR_ continued );
         continued = 1;
@@ -2031,10 +1939,10 @@ typedef ptrdiff_t  FT_PtrDist;
           return error;
 
         /* render pool overflow; we will reduce the render band by half */
-        width >>= 1;
+        i = ( band[0] - band[1] ) >> 1;
 
         /* this should never happen even with tiny rendering pool */
-        if ( width == 0 )
+        if ( i == 0 )
         {
           FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
           return FT_THROW( Raster_Overflow );
@@ -2042,7 +1950,7 @@ typedef ptrdiff_t  FT_PtrDist;
 
         band++;
         band[1]  = band[0];
-        band[0] += width;
+        band[0] += i;
       } while ( band >= bands );
     }
 
@@ -2073,7 +1981,7 @@ typedef ptrdiff_t  FT_PtrDist;
       return FT_THROW( Invalid_Outline );
 
     /* return immediately if the outline is empty */
-    if ( outline->n_points == 0 || outline->n_contours <= 0 )
+    if ( outline->n_points == 0 || outline->n_contours == 0 )
       return Smooth_Err_Ok;
 
     if ( !outline->contours || !outline->points )
@@ -2093,10 +2001,7 @@ typedef ptrdiff_t  FT_PtrDist;
       ras.render_span      = (FT_Raster_Span_Func)params->gray_spans;
       ras.render_span_data = params->user;
 
-      ras.min_ex = params->clip_box.xMin;
-      ras.min_ey = params->clip_box.yMin;
-      ras.max_ex = params->clip_box.xMax;
-      ras.max_ey = params->clip_box.yMax;
+      ras.cbox = params->clip_box;
     }
     else
     {
@@ -2122,14 +2027,14 @@ typedef ptrdiff_t  FT_PtrDist;
       ras.render_span      = (FT_Raster_Span_Func)NULL;
       ras.render_span_data = NULL;
 
-      ras.min_ex = 0;
-      ras.min_ey = 0;
-      ras.max_ex = (FT_Pos)target_map->width;
-      ras.max_ey = (FT_Pos)target_map->rows;
+      ras.cbox.xMin = 0;
+      ras.cbox.yMin = 0;
+      ras.cbox.xMax = (FT_Pos)target_map->width;
+      ras.cbox.yMax = (FT_Pos)target_map->rows;
     }
 
     /* exit if nothing to do */
-    if ( ras.max_ex <= ras.min_ex || ras.max_ey <= ras.min_ey )
+    if ( ras.cbox.xMin >= ras.cbox.xMax || ras.cbox.yMin >= ras.cbox.yMax )
       return Smooth_Err_Ok;
 
     return gray_convert_glyph( RAS_VAR );
diff --git a/engine/thirdparty/freetype/src/smooth/ftgrays.h b/engine/thirdparty/freetype/src/smooth/ftgrays.h
index a5001bf4..940fbe8c 100644
--- a/engine/thirdparty/freetype/src/smooth/ftgrays.h
+++ b/engine/thirdparty/freetype/src/smooth/ftgrays.h
@@ -4,7 +4,7 @@
  *
  *   FreeType smooth renderer declaration
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/smooth/ftsmerrs.h b/engine/thirdparty/freetype/src/smooth/ftsmerrs.h
index f4ac93dc..6d41fb8e 100644
--- a/engine/thirdparty/freetype/src/smooth/ftsmerrs.h
+++ b/engine/thirdparty/freetype/src/smooth/ftsmerrs.h
@@ -4,7 +4,7 @@
  *
  *   smooth renderer error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/smooth/ftsmooth.c b/engine/thirdparty/freetype/src/smooth/ftsmooth.c
index 9b0e8886..f0acc1ea 100644
--- a/engine/thirdparty/freetype/src/smooth/ftsmooth.c
+++ b/engine/thirdparty/freetype/src/smooth/ftsmooth.c
@@ -4,7 +4,7 @@
  *
  *   Anti-aliasing renderer interface (body).
  *
- * Copyright (C) 2000-2023 by
+ * Copyright (C) 2000-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/smooth/ftsmooth.h b/engine/thirdparty/freetype/src/smooth/ftsmooth.h
index f8bdc993..d7b61a9e 100644
--- a/engine/thirdparty/freetype/src/smooth/ftsmooth.h
+++ b/engine/thirdparty/freetype/src/smooth/ftsmooth.h
@@ -4,7 +4,7 @@
  *
  *   Anti-aliasing renderer interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/smooth/smooth.c b/engine/thirdparty/freetype/src/smooth/smooth.c
index 9a0b824c..8c506818 100644
--- a/engine/thirdparty/freetype/src/smooth/smooth.c
+++ b/engine/thirdparty/freetype/src/smooth/smooth.c
@@ -4,7 +4,7 @@
  *
  *   FreeType anti-aliasing rasterer module component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/svg/ftsvg.c b/engine/thirdparty/freetype/src/svg/ftsvg.c
index ba237f63..35788a2d 100644
--- a/engine/thirdparty/freetype/src/svg/ftsvg.c
+++ b/engine/thirdparty/freetype/src/svg/ftsvg.c
@@ -4,7 +4,7 @@
  *
  *   The FreeType SVG renderer interface (body).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/svg/ftsvg.h b/engine/thirdparty/freetype/src/svg/ftsvg.h
index 9c496caa..623c091d 100644
--- a/engine/thirdparty/freetype/src/svg/ftsvg.h
+++ b/engine/thirdparty/freetype/src/svg/ftsvg.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType SVG renderer interface (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/svg/svg.c b/engine/thirdparty/freetype/src/svg/svg.c
index 373c28ed..1f1c04b2 100644
--- a/engine/thirdparty/freetype/src/svg/svg.c
+++ b/engine/thirdparty/freetype/src/svg/svg.c
@@ -4,7 +4,7 @@
  *
  *   FreeType SVG renderer module component (body only).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/svg/svgtypes.h b/engine/thirdparty/freetype/src/svg/svgtypes.h
index 1d608032..f1d6d73c 100644
--- a/engine/thirdparty/freetype/src/svg/svgtypes.h
+++ b/engine/thirdparty/freetype/src/svg/svgtypes.h
@@ -4,7 +4,7 @@
  *
  *   The FreeType SVG renderer internal types (specification).
  *
- * Copyright (C) 2022-2023 by
+ * Copyright (C) 2022-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and Moazin Khatti.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/truetype.c b/engine/thirdparty/freetype/src/truetype/truetype.c
index fcc0ea33..fe9cb924 100644
--- a/engine/thirdparty/freetype/src/truetype/truetype.c
+++ b/engine/thirdparty/freetype/src/truetype/truetype.c
@@ -4,7 +4,7 @@
  *
  *   FreeType TrueType driver component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/ttdriver.c b/engine/thirdparty/freetype/src/truetype/ttdriver.c
index d1496fec..4ab68eb9 100644
--- a/engine/thirdparty/freetype/src/truetype/ttdriver.c
+++ b/engine/thirdparty/freetype/src/truetype/ttdriver.c
@@ -4,7 +4,7 @@
  *
  *   TrueType font driver implementation (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -217,7 +217,20 @@
     kerning->y = 0;
 
     if ( sfnt )
-      kerning->x = sfnt->get_kerning( ttface, left_glyph, right_glyph );
+    {
+      /* Use 'kern' table if available since that can be faster; otherwise */
+      /* use GPOS kerning pairs if available.                              */
+      if ( ttface->kern_avail_bits != 0 )
+        kerning->x = sfnt->get_kerning( ttface,
+                                        left_glyph,
+                                        right_glyph );
+#ifdef TT_CONFIG_OPTION_GPOS_KERNING
+      else if ( ttface->gpos_kerning_available )
+        kerning->x = sfnt->get_gpos_kerning( ttface,
+                                             left_glyph,
+                                             right_glyph );
+#endif
+    }
 
     return 0;
   }
diff --git a/engine/thirdparty/freetype/src/truetype/ttdriver.h b/engine/thirdparty/freetype/src/truetype/ttdriver.h
index 757a66f4..3e1cf234 100644
--- a/engine/thirdparty/freetype/src/truetype/ttdriver.h
+++ b/engine/thirdparty/freetype/src/truetype/ttdriver.h
@@ -4,7 +4,7 @@
  *
  *   High-level TrueType driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/tterrors.h b/engine/thirdparty/freetype/src/truetype/tterrors.h
index 008ee998..7ad937bd 100644
--- a/engine/thirdparty/freetype/src/truetype/tterrors.h
+++ b/engine/thirdparty/freetype/src/truetype/tterrors.h
@@ -4,7 +4,7 @@
  *
  *   TrueType error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/ttgload.c b/engine/thirdparty/freetype/src/truetype/ttgload.c
index dc427e8a..b656ccf0 100644
--- a/engine/thirdparty/freetype/src/truetype/ttgload.c
+++ b/engine/thirdparty/freetype/src/truetype/ttgload.c
@@ -4,7 +4,7 @@
  *
  *   TrueType Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -353,7 +353,8 @@
     FT_Byte         c, count;
     FT_Vector       *vec, *vec_limit;
     FT_Pos          x, y;
-    FT_Short        *cont, *cont_limit, last;
+    FT_UShort       *cont, *cont_limit;
+    FT_Int          last;
 
 
     /* check that we can add the contours to the glyph */
@@ -372,7 +373,7 @@
     last = -1;
     for ( ; cont < cont_limit; cont++ )
     {
-      *cont = FT_NEXT_SHORT( p );
+      *cont = FT_NEXT_USHORT( p );
 
       if ( *cont <= last )
         goto Invalid_Outline;
@@ -418,11 +419,9 @@
       /* and thus allocate the bytecode array size by ourselves     */
       if ( n_ins )
       {
-        if ( FT_QNEW_ARRAY( exec->glyphIns, n_ins ) )
+        if ( FT_DUP( exec->glyphIns, p, n_ins ) )
           return error;
 
-        FT_MEM_COPY( exec->glyphIns, p, (FT_Long)n_ins );
-
         exec->glyphSize  = n_ins;
       }
     }
@@ -432,7 +431,7 @@
     p += n_ins;
 
     /* reading the point tags */
-    flag       = (FT_Byte*)outline->tags;
+    flag       = outline->tags;
     flag_limit = flag + n_points;
 
     FT_ASSERT( flag );
@@ -465,7 +464,7 @@
 
     vec       = outline->points;
     vec_limit = vec + n_points;
-    flag      = (FT_Byte*)outline->tags;
+    flag      = outline->tags;
     x         = 0;
 
     for ( ; vec < vec_limit; vec++, flag++ )
@@ -499,7 +498,7 @@
 
     vec       = outline->points;
     vec_limit = vec + n_points;
-    flag      = (FT_Byte*)outline->tags;
+    flag      = outline->tags;
     y         = 0;
 
     for ( ; vec < vec_limit; vec++, flag++ )
@@ -532,8 +531,8 @@
       *flag  = (FT_Byte)( f & ON_CURVE_POINT );
     }
 
-    outline->n_points   = (FT_Short)n_points;
-    outline->n_contours = (FT_Short)n_contours;
+    outline->n_points   = (FT_UShort)n_points;
+    outline->n_contours = (FT_UShort)n_contours;
 
     load->cursor = p;
 
@@ -754,15 +753,13 @@
                    FT_UInt       start_point,
                    FT_UInt       start_contour )
   {
-    zone->n_points    = (FT_UShort)load->outline.n_points + 4 -
-                          (FT_UShort)start_point;
-    zone->n_contours  = load->outline.n_contours -
-                          (FT_Short)start_contour;
+    zone->n_points    = load->outline.n_points + 4 - (FT_UShort)start_point;
+    zone->n_contours  = load->outline.n_contours - (FT_UShort)start_contour;
     zone->org         = load->extra_points + start_point;
     zone->cur         = load->outline.points + start_point;
     zone->orus        = load->extra_points2 + start_point;
-    zone->tags        = (FT_Byte*)load->outline.tags + start_point;
-    zone->contours    = (FT_UShort*)load->outline.contours + start_contour;
+    zone->tags        = load->outline.tags + start_point;
+    zone->contours    = load->outline.contours + start_contour;
     zone->first_point = (FT_UShort)start_point;
   }
 
@@ -1046,7 +1043,7 @@
     current.points   = gloader->base.outline.points +
                          num_base_points;
     current.n_points = gloader->base.outline.n_points -
-                         (short)num_base_points;
+                         (FT_UShort)num_base_points;
 
     have_scale = FT_BOOL( subglyph->flags & ( WE_HAVE_A_SCALE     |
                                               WE_HAVE_AN_XY_SCALE |
@@ -1059,7 +1056,7 @@
     /* get offset */
     if ( !( subglyph->flags & ARGS_ARE_XY_VALUES ) )
     {
-      FT_UInt     num_points = (FT_UInt)gloader->base.outline.n_points;
+      FT_UInt     num_points = gloader->base.outline.n_points;
       FT_UInt     k = (FT_UInt)subglyph->arg1;
       FT_UInt     l = (FT_UInt)subglyph->arg2;
       FT_Vector*  p1;
@@ -1721,8 +1718,8 @@
         FT_List_Add( &loader->composites, node );
       }
 
-      start_point   = (FT_UInt)gloader->base.outline.n_points;
-      start_contour = (FT_UInt)gloader->base.outline.n_contours;
+      start_point   = gloader->base.outline.n_points;
+      start_contour = gloader->base.outline.n_contours;
 
       /* for each subglyph, read composite header */
       error = face->read_composite_glyph( loader );
@@ -1741,14 +1738,14 @@
       if ( FT_IS_NAMED_INSTANCE( FT_FACE( face ) ) ||
            FT_IS_VARIATION( FT_FACE( face ) )      )
       {
-        short        i, limit;
+        FT_UShort    i, limit;
         FT_SubGlyph  subglyph;
 
         FT_Outline  outline = { 0, 0, NULL, NULL, NULL, 0 };
         FT_Vector*  unrounded = NULL;
 
 
-        limit = (short)gloader->current.num_subglyphs;
+        limit = (FT_UShort)gloader->current.num_subglyphs;
 
         /* construct an outline structure for              */
         /* communication with `TT_Vary_Apply_Glyph_Deltas' */
@@ -1874,7 +1871,7 @@
           linear_hadvance = loader->linear;
           linear_vadvance = loader->vadvance;
 
-          num_base_points = (FT_UInt)gloader->base.outline.n_points;
+          num_base_points = gloader->base.outline.n_points;
 
           error = load_truetype_glyph( loader,
                                        (FT_UInt)subglyph->index,
@@ -1898,7 +1895,7 @@
             loader->vadvance = linear_vadvance;
           }
 
-          num_points = (FT_UInt)gloader->base.outline.n_points;
+          num_points = gloader->base.outline.n_points;
 
           if ( num_points == num_base_points )
             continue;
@@ -2313,7 +2310,7 @@
        *
        * 1) we have a `tricky' font that heavily relies on the interpreter to
        *    render glyphs correctly, for example DFKai-SB, or
-       * 2) FT_RENDER_MODE_MONO (i.e, monochome rendering) is requested.
+       * 2) FT_RENDER_MODE_MONO (i.e, monochrome rendering) is requested.
        *
        * In those cases, backward compatibility needs to be turned off to get
        * correct rendering.  The rendering is then completely up to the
@@ -2719,7 +2716,7 @@
          size->metrics->y_ppem < 24         )
       glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
 
-    FT_TRACE1(( "  subglyphs = %u, contours = %hd, points = %hd,"
+    FT_TRACE1(( "  subglyphs = %u, contours = %hu, points = %hu,"
                 " flags = 0x%.3x\n",
                 loader.gloader->base.num_subglyphs,
                 glyph->outline.n_contours,
diff --git a/engine/thirdparty/freetype/src/truetype/ttgload.h b/engine/thirdparty/freetype/src/truetype/ttgload.h
index f18637dc..22ea967f 100644
--- a/engine/thirdparty/freetype/src/truetype/ttgload.h
+++ b/engine/thirdparty/freetype/src/truetype/ttgload.h
@@ -4,7 +4,7 @@
  *
  *   TrueType Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/ttgxvar.c b/engine/thirdparty/freetype/src/truetype/ttgxvar.c
index ad4f266b..4f0083c9 100644
--- a/engine/thirdparty/freetype/src/truetype/ttgxvar.c
+++ b/engine/thirdparty/freetype/src/truetype/ttgxvar.c
@@ -4,7 +4,7 @@
  *
  *   TrueType GX Font Variation loader
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg, and George Williams.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -129,9 +129,6 @@
    *   stream ::
    *     The data stream.
    *
-   *   size ::
-   *     The size of the table holding the data.
-   *
    * @Output:
    *   point_cnt ::
    *     The number of points read.  A zero value means that
@@ -144,14 +141,14 @@
    */
   static FT_UShort*
   ft_var_readpackedpoints( FT_Stream  stream,
-                           FT_ULong   size,
                            FT_UInt   *point_cnt )
   {
     FT_UShort *points = NULL;
     FT_UInt    n;
-    FT_UInt    runcnt;
+    FT_UInt    runcnt, cnt;
     FT_UInt    i, j;
     FT_UShort  first;
+    FT_Byte*   p;
     FT_Memory  memory = stream->memory;
     FT_Error   error;
 
@@ -169,56 +166,60 @@
       n  |= FT_GET_BYTE();
     }
 
-    if ( n > size )
-    {
-      FT_TRACE1(( "ft_var_readpackedpoints: number of points too large\n" ));
-      return NULL;
-    }
-
-    /* in the nested loops below we increase `i' twice; */
-    /* it is faster to simply allocate one more slot    */
-    /* than to add another test within the loop         */
-    if ( FT_QNEW_ARRAY( points, n + 1 ) )
+    if ( FT_QNEW_ARRAY( points, n ) )
       return NULL;
 
-    *point_cnt = n;
-
+    p     = stream->cursor;
     first = 0;
     i     = 0;
     while ( i < n )
     {
-      runcnt = FT_GET_BYTE();
+      if ( p >= stream->limit )
+        goto Fail;
+
+      runcnt = FT_NEXT_BYTE( p );
+      cnt    = runcnt & GX_PT_POINT_RUN_COUNT_MASK;
+
+      /* first point not included in run count */
+      cnt++;
+      if ( cnt > n - i )
+        cnt = n - i;
+
       if ( runcnt & GX_PT_POINTS_ARE_WORDS )
       {
-        runcnt     &= GX_PT_POINT_RUN_COUNT_MASK;
-        first      += FT_GET_USHORT();
-        points[i++] = first;
+        if ( 2 * cnt > (FT_UInt)( stream->limit - p ) )
+          goto Fail;
 
-        /* first point not included in run count */
-        for ( j = 0; j < runcnt; j++ )
+        for ( j = 0; j < cnt; j++ )
         {
-          first      += FT_GET_USHORT();
+          first      += FT_NEXT_USHORT( p );
           points[i++] = first;
-          if ( i >= n )
-            break;
         }
       }
       else
       {
-        first      += FT_GET_BYTE();
-        points[i++] = first;
+        if ( cnt > (FT_UInt)( stream->limit - p ) )
+          goto Fail;
 
-        for ( j = 0; j < runcnt; j++ )
+        for ( j = 0; j < cnt; j++ )
         {
-          first      += FT_GET_BYTE();
+          first      += FT_NEXT_BYTE( p );
           points[i++] = first;
-          if ( i >= n )
-            break;
         }
       }
     }
 
+    stream->cursor = p;
+
+    *point_cnt = n;
+
     return points;
+
+  Fail:
+    FT_TRACE1(( "ft_var_readpackedpoints: invalid table\n" ));
+
+    FT_FREE( points );
+    return NULL;
   }
 
 
@@ -240,9 +241,6 @@
    *   stream ::
    *     The data stream.
    *
-   *   size ::
-   *     The size of the table holding the data.
-   *
    *   delta_cnt ::
    *     The number of deltas to be read.
    *
@@ -258,13 +256,12 @@
    */
   static FT_Fixed*
   ft_var_readpackeddeltas( FT_Stream  stream,
-                           FT_ULong   size,
                            FT_UInt    delta_cnt )
   {
     FT_Fixed  *deltas = NULL;
     FT_UInt    runcnt, cnt;
     FT_UInt    i, j;
-    FT_UInt    bytes_used;
+    FT_Byte*   p;
     FT_Memory  memory = stream->memory;
     FT_Error   error;
 
@@ -272,68 +269,51 @@
     if ( FT_QNEW_ARRAY( deltas, delta_cnt ) )
       return NULL;
 
-    i          = 0;
-    bytes_used = 0;
-
-    while ( i < delta_cnt && bytes_used < size )
+    p = stream->cursor;
+    i = 0;
+    while ( i < delta_cnt )
     {
-      runcnt = FT_GET_BYTE();
+      if ( p >= stream->limit )
+        goto Fail;
+
+      runcnt = FT_NEXT_BYTE( p );
       cnt    = runcnt & GX_DT_DELTA_RUN_COUNT_MASK;
 
-      bytes_used++;
+      /* first point not included in run count */
+      cnt++;
+      if ( cnt > delta_cnt - i )
+        cnt = delta_cnt - i;
 
       if ( runcnt & GX_DT_DELTAS_ARE_ZERO )
       {
-        /* `cnt` + 1 zeroes get added */
-        for ( j = 0; j <= cnt && i < delta_cnt; j++ )
+        for ( j = 0; j < cnt; j++ )
           deltas[i++] = 0;
       }
       else if ( runcnt & GX_DT_DELTAS_ARE_WORDS )
       {
-        /* `cnt` + 1 shorts from the stack */
-        bytes_used += 2 * ( cnt + 1 );
-        if ( bytes_used > size )
-        {
-          FT_TRACE1(( "ft_var_readpackeddeltas:"
-                      " number of short deltas too large\n" ));
+        if ( 2 * cnt > (FT_UInt)( stream->limit - p ) )
           goto Fail;
-        }
 
-        for ( j = 0; j <= cnt && i < delta_cnt; j++ )
-          deltas[i++] = FT_intToFixed( FT_GET_SHORT() );
+        for ( j = 0; j < cnt; j++ )
+          deltas[i++] = FT_intToFixed( FT_NEXT_SHORT( p ) );
       }
       else
       {
-        /* `cnt` + 1 signed bytes from the stack */
-        bytes_used += cnt + 1;
-        if ( bytes_used > size )
-        {
-          FT_TRACE1(( "ft_var_readpackeddeltas:"
-                      " number of byte deltas too large\n" ));
+        if ( cnt > (FT_UInt)( stream->limit - p ) )
           goto Fail;
-        }
 
-        for ( j = 0; j <= cnt && i < delta_cnt; j++ )
-          deltas[i++] = FT_intToFixed( FT_GET_CHAR() );
-      }
-
-      if ( j <= cnt )
-      {
-        FT_TRACE1(( "ft_var_readpackeddeltas:"
-                    " number of deltas too large\n" ));
-        goto Fail;
+        for ( j = 0; j < cnt; j++ )
+          deltas[i++] = FT_intToFixed( FT_NEXT_CHAR( p ) );
       }
     }
 
-    if ( i < delta_cnt )
-    {
-      FT_TRACE1(( "ft_var_readpackeddeltas: not enough deltas\n" ));
-      goto Fail;
-    }
+    stream->cursor = p;
 
     return deltas;
 
   Fail:
+    FT_TRACE1(( "ft_var_readpackeddeltas: invalid table\n" ));
+
     FT_FREE( deltas );
     return NULL;
   }
@@ -596,7 +576,7 @@
 
       for ( j = 0; j < itemStore->axisCount; j++ )
       {
-        FT_Short  start, peak, end;
+        FT_Int  start, peak, end;
 
 
         if ( FT_READ_SHORT( start ) ||
@@ -604,6 +584,10 @@
              FT_READ_SHORT( end )   )
           goto Exit;
 
+        /* immediately tag invalid ranges with special peak = 0 */
+        if ( ( start < 0 && end > 0 ) || start > peak || peak > end )
+          peak = 0;
+
         axisCoords[j].startCoord = FT_fdot14ToFixed( start );
         axisCoords[j].peakCoord  = FT_fdot14ToFixed( peak );
         axisCoords[j].endCoord   = FT_fdot14ToFixed( end );
@@ -1024,6 +1008,9 @@
     if ( innerIndex >= varData->itemCount )
       return 0; /* Out of range. */
 
+    if ( varData->regionIdxCount == 0 )
+      return 0; /* Avoid "applying zero offset to null pointer". */
+
     if ( varData->regionIdxCount < 16 )
     {
       deltaSet = deltaSetStack;
@@ -1074,43 +1061,32 @@
       /* inner loop steps through axes in this region */
       for ( j = 0; j < itemStore->axisCount; j++, axis++ )
       {
-        /* compute the scalar contribution of this axis; */
-        /* ignore invalid ranges                         */
-        if ( axis->startCoord > axis->peakCoord ||
-             axis->peakCoord > axis->endCoord   )
-          continue;
+        FT_Fixed  ncv = ttface->blend->normalizedcoords[j];
 
-        else if ( axis->startCoord < 0 &&
-                  axis->endCoord > 0   &&
-                  axis->peakCoord != 0 )
-          continue;
 
-        /* peak of 0 means ignore this axis */
-        else if ( axis->peakCoord == 0 )
-          continue;
-
-        else if ( ttface->blend->normalizedcoords[j] == axis->peakCoord )
+        /* compute the scalar contribution of this axis */
+        /* with peak of 0 used for invalid axes         */
+        if ( axis->peakCoord == ncv ||
+             axis->peakCoord == 0   )
           continue;
 
         /* ignore this region if coords are out of range */
-        else if ( ttface->blend->normalizedcoords[j] <= axis->startCoord ||
-                  ttface->blend->normalizedcoords[j] >= axis->endCoord   )
+        else if ( ncv <= axis->startCoord ||
+                  ncv >= axis->endCoord   )
         {
           scalar = 0;
           break;
         }
 
         /* cumulative product of all the axis scalars */
-        else if ( ttface->blend->normalizedcoords[j] < axis->peakCoord )
-          scalar =
-            FT_MulDiv( scalar,
-                       ttface->blend->normalizedcoords[j] - axis->startCoord,
-                       axis->peakCoord - axis->startCoord );
-        else
-          scalar =
-            FT_MulDiv( scalar,
-                       axis->endCoord - ttface->blend->normalizedcoords[j],
-                       axis->endCoord - axis->peakCoord );
+        else if ( ncv < axis->peakCoord )
+          scalar = FT_MulDiv( scalar,
+                              ncv - axis->startCoord,
+                              axis->peakCoord - axis->startCoord );
+        else   /* ncv > axis->peakCoord */
+          scalar = FT_MulDiv( scalar,
+                              axis->endCoord - ncv,
+                              axis->endCoord - axis->peakCoord );
 
       } /* per-axis loop */
 
@@ -1920,28 +1896,17 @@
 
     for ( i = 0; i < blend->num_axis; i++ )
     {
-      FT_TRACE6(( "    axis %d coordinate %.5f:\n",
-                  i, (double)blend->normalizedcoords[i] / 65536 ));
+      FT_Fixed  ncv = blend->normalizedcoords[i];
+
+
+      FT_TRACE6(( "    axis %d coordinate %.5f:\n", i, (double)ncv / 65536 ));
 
       /* It's not clear why (for intermediate tuples) we don't need     */
       /* to check against start/end -- the documentation says we don't. */
       /* Similarly, it's unclear why we don't need to scale along the   */
       /* axis.                                                          */
 
-      if ( tuple_coords[i] == 0 )
-      {
-        FT_TRACE6(( "      tuple coordinate is zero, ignore\n" ));
-        continue;
-      }
-
-      if ( blend->normalizedcoords[i] == 0 )
-      {
-        FT_TRACE6(( "      axis coordinate is zero, stop\n" ));
-        apply = 0;
-        break;
-      }
-
-      if ( blend->normalizedcoords[i] == tuple_coords[i] )
+      if ( tuple_coords[i] == ncv )
       {
         FT_TRACE6(( "      tuple coordinate %.5f fits perfectly\n",
                     (double)tuple_coords[i] / 65536 ));
@@ -1949,31 +1914,37 @@
         continue;
       }
 
+      if ( tuple_coords[i] == 0 )
+      {
+        FT_TRACE6(( "      tuple coordinate is zero, ignore\n" ));
+        continue;
+      }
+
       if ( !( tupleIndex & GX_TI_INTERMEDIATE_TUPLE ) )
       {
         /* not an intermediate tuple */
 
-        if ( blend->normalizedcoords[i] < FT_MIN( 0, tuple_coords[i] ) ||
-             blend->normalizedcoords[i] > FT_MAX( 0, tuple_coords[i] ) )
+        if ( ( tuple_coords[i] > ncv && ncv > 0 ) ||
+             ( tuple_coords[i] < ncv && ncv < 0 ) )
+        {
+          FT_TRACE6(( "      tuple coordinate %.5f fits\n",
+                      (double)tuple_coords[i] / 65536 ));
+          apply = FT_MulDiv( apply, ncv, tuple_coords[i] );
+        }
+        else
         {
           FT_TRACE6(( "      tuple coordinate %.5f is exceeded, stop\n",
                       (double)tuple_coords[i] / 65536 ));
           apply = 0;
           break;
         }
-
-        FT_TRACE6(( "      tuple coordinate %.5f fits\n",
-                    (double)tuple_coords[i] / 65536 ));
-        apply = FT_MulDiv( apply,
-                           blend->normalizedcoords[i],
-                           tuple_coords[i] );
       }
       else
       {
         /* intermediate tuple */
 
-        if ( blend->normalizedcoords[i] <= im_start_coords[i] ||
-             blend->normalizedcoords[i] >= im_end_coords[i]   )
+        if ( ncv <= im_start_coords[i] ||
+             ncv >= im_end_coords[i]   )
         {
           FT_TRACE6(( "      intermediate tuple range ]%.5f;%.5f[ is exceeded,"
                       " stop\n",
@@ -1986,13 +1957,13 @@
         FT_TRACE6(( "      intermediate tuple range ]%.5f;%.5f[ fits\n",
                     (double)im_start_coords[i] / 65536,
                     (double)im_end_coords[i] / 65536 ));
-        if ( blend->normalizedcoords[i] < tuple_coords[i] )
+        if ( ncv < tuple_coords[i] )
           apply = FT_MulDiv( apply,
-                             blend->normalizedcoords[i] - im_start_coords[i],
+                             ncv - im_start_coords[i],
                              tuple_coords[i] - im_start_coords[i] );
-        else
+        else /* ncv > tuple_coords[i] */
           apply = FT_MulDiv( apply,
-                             im_end_coords[i] - blend->normalizedcoords[i],
+                             im_end_coords[i] - ncv,
                              im_end_coords[i] - tuple_coords[i] );
       }
     }
@@ -2141,11 +2112,12 @@
                                          outerIndex,
                                          innerIndex );
 
-	  v += delta << 2;
+          /* Convert delta in F2DOT14 to 16.16 before adding. */
+          v += MUL_INT( delta, 4 );
 
-	  /* Clamp value range. */
-	  v = v >=  0x10000L ?  0x10000 : v;
-	  v = v <= -0x10000L ? -0x10000 : v;
+          /* Clamp value to range [-1, 1]. */
+          v = v >=  0x10000L ?  0x10000 : v;
+          v = v <= -0x10000L ? -0x10000 : v;
 
           new_normalized[i] = v;
         }
@@ -2721,9 +2693,8 @@
       FT_UInt  n;
 
 
-      if ( FT_ALLOC( mmvar, ttface->blend->mmvar_len ) )
+      if ( FT_DUP( mmvar, ttface->blend->mmvar, ttface->blend->mmvar_len ) )
         goto Exit;
-      FT_MEM_COPY( mmvar, ttface->blend->mmvar, ttface->blend->mmvar_len );
 
       axis_flags =
         (FT_UShort*)( (char*)mmvar + mmvar_size );
@@ -3533,9 +3504,10 @@
     FT_ULong  here;
     FT_UInt   i, j;
 
-    FT_Fixed*  tuple_coords    = NULL;
-    FT_Fixed*  im_start_coords = NULL;
-    FT_Fixed*  im_end_coords   = NULL;
+    FT_Fixed*  peak_coords = NULL;
+    FT_Fixed*  tuple_coords;
+    FT_Fixed*  im_start_coords;
+    FT_Fixed*  im_end_coords;
 
     GX_Blend  blend = face->blend;
 
@@ -3556,16 +3528,16 @@
     {
       FT_TRACE2(( "\n" ));
       FT_TRACE2(( "tt_face_vary_cvt: no blend specified\n" ));
-      error = FT_Err_Ok;
-      goto Exit;
+
+      return FT_Err_Ok;
     }
 
     if ( !face->cvt )
     {
       FT_TRACE2(( "\n" ));
       FT_TRACE2(( "tt_face_vary_cvt: no `cvt ' table\n" ));
-      error = FT_Err_Ok;
-      goto Exit;
+
+      return FT_Err_Ok;
     }
 
     error = face->goto_table( face, TTAG_cvar, stream, &table_len );
@@ -3573,15 +3545,11 @@
     {
       FT_TRACE2(( "is missing\n" ));
 
-      error = FT_Err_Ok;
-      goto Exit;
+      return FT_Err_Ok;
     }
 
     if ( FT_FRAME_ENTER( table_len ) )
-    {
-      error = FT_Err_Ok;
-      goto Exit;
-    }
+      return FT_Err_Ok;
 
     table_start = FT_Stream_FTell( stream );
     if ( FT_GET_LONG() != 0x00010000L )
@@ -3594,11 +3562,6 @@
 
     FT_TRACE2(( "loaded\n" ));
 
-    if ( FT_NEW_ARRAY( tuple_coords, blend->num_axis )    ||
-         FT_NEW_ARRAY( im_start_coords, blend->num_axis ) ||
-         FT_NEW_ARRAY( im_end_coords, blend->num_axis )   )
-      goto FExit;
-
     tupleCount   = FT_GET_USHORT();
     offsetToData = FT_GET_USHORT();
 
@@ -3621,9 +3584,8 @@
 
       FT_Stream_SeekSet( stream, offsetToData );
 
-      sharedpoints = ft_var_readpackedpoints( stream,
-                                              table_len,
-                                              &spoint_count );
+      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
+
       offsetToData = FT_Stream_FTell( stream );
 
       FT_Stream_SeekSet( stream, here );
@@ -3634,8 +3596,12 @@
                 tupleCount & GX_TC_TUPLE_COUNT_MASK,
                 ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
 
-    if ( FT_NEW_ARRAY( cvt_deltas, face->cvt_size ) )
-      goto FExit;
+    if ( FT_QNEW_ARRAY( peak_coords, 3 * blend->num_axis ) ||
+         FT_NEW_ARRAY( cvt_deltas, face->cvt_size )        )
+      goto Exit;
+
+    im_start_coords = peak_coords + blend->num_axis;
+    im_end_coords = im_start_coords + blend->num_axis;
 
     for ( i = 0; i < ( tupleCount & GX_TC_TUPLE_COUNT_MASK ); i++ )
     {
@@ -3652,32 +3618,19 @@
       if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
       {
         for ( j = 0; j < blend->num_axis; j++ )
-          tuple_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+          peak_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+        tuple_coords = peak_coords;
       }
-      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) >= blend->tuplecount )
+      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) < blend->tuplecount )
+        tuple_coords = blend->tuplecoords +
+            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis;
+      else
       {
         FT_TRACE2(( "tt_face_vary_cvt:"
                     " invalid tuple index\n" ));
 
         error = FT_THROW( Invalid_Table );
-        goto FExit;
-      }
-      else
-      {
-        if ( !blend->tuplecoords )
-        {
-          FT_TRACE2(( "tt_face_vary_cvt:"
-                      " no valid tuple coordinates available\n" ));
-
-          error = FT_THROW( Invalid_Table );
-          goto FExit;
-        }
-
-        FT_MEM_COPY(
-          tuple_coords,
-          blend->tuplecoords +
-            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis,
-          blend->num_axis * sizeof ( FT_Fixed ) );
+        goto Exit;
       }
 
       if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
@@ -3706,9 +3659,7 @@
 
       if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
       {
-        localpoints = ft_var_readpackedpoints( stream,
-                                               table_len,
-                                               &point_count );
+        localpoints = ft_var_readpackedpoints( stream, &point_count );
         points      = localpoints;
       }
       else
@@ -3719,7 +3670,6 @@
       }
 
       deltas = ft_var_readpackeddeltas( stream,
-                                        table_len,
                                         point_count == 0 ? face->cvt_size
                                                          : point_count );
 
@@ -3820,22 +3770,20 @@
     for ( i = 0; i < face->cvt_size; i++ )
       face->cvt[i] += FT_fixedToFdot6( cvt_deltas[i] );
 
-  FExit:
-    FT_FRAME_EXIT();
+    /* Iterate over all `FT_Size` objects and set `cvt_ready` to -1 */
+    /* to trigger rescaling of all CVT values.                      */
+    FT_List_Iterate( &root->sizes_list,
+                     tt_cvt_ready_iterator,
+                     NULL );
 
   Exit:
     if ( sharedpoints != ALL_POINTS )
       FT_FREE( sharedpoints );
-    FT_FREE( tuple_coords );
-    FT_FREE( im_start_coords );
-    FT_FREE( im_end_coords );
     FT_FREE( cvt_deltas );
+    FT_FREE( peak_coords );
 
-    /* iterate over all FT_Size objects and set `cvt_ready' to -1 */
-    /* to trigger rescaling of all CVT values                     */
-    FT_List_Iterate( &root->sizes_list,
-                     tt_cvt_ready_iterator,
-                     NULL );
+  FExit:
+    FT_FRAME_EXIT();
 
     return error;
 
@@ -4099,9 +4047,10 @@
     FT_ULong  here;
     FT_UInt   i, j;
 
-    FT_Fixed*  tuple_coords    = NULL;
-    FT_Fixed*  im_start_coords = NULL;
-    FT_Fixed*  im_end_coords   = NULL;
+    FT_Fixed*  peak_coords = NULL;
+    FT_Fixed*  tuple_coords;
+    FT_Fixed*  im_start_coords;
+    FT_Fixed*  im_end_coords;
 
     GX_Blend  blend = face->blend;
 
@@ -4136,27 +4085,17 @@
       return FT_Err_Ok;
     }
 
-    if ( FT_NEW_ARRAY( points_org, n_points ) ||
-         FT_NEW_ARRAY( points_out, n_points ) ||
-         FT_NEW_ARRAY( has_delta, n_points )  )
-      goto Fail1;
-
     dataSize = blend->glyphoffsets[glyph_index + 1] -
                  blend->glyphoffsets[glyph_index];
 
     if ( FT_STREAM_SEEK( blend->glyphoffsets[glyph_index] ) ||
          FT_FRAME_ENTER( dataSize )                         )
-      goto Fail1;
+      return error;
 
     glyph_start = FT_Stream_FTell( stream );
 
     /* each set of glyph variation data is formatted similarly to `cvar' */
 
-    if ( FT_NEW_ARRAY( tuple_coords, blend->num_axis )    ||
-         FT_NEW_ARRAY( im_start_coords, blend->num_axis ) ||
-         FT_NEW_ARRAY( im_end_coords, blend->num_axis )   )
-      goto Fail2;
-
     tupleCount   = FT_GET_USHORT();
     offsetToData = FT_GET_USHORT();
 
@@ -4168,7 +4107,7 @@
                   " invalid glyph variation array header\n" ));
 
       error = FT_THROW( Invalid_Table );
-      goto Fail2;
+      goto FExit;
     }
 
     offsetToData += glyph_start;
@@ -4179,9 +4118,8 @@
 
       FT_Stream_SeekSet( stream, offsetToData );
 
-      sharedpoints = ft_var_readpackedpoints( stream,
-                                              blend->gvar_size,
-                                              &spoint_count );
+      sharedpoints = ft_var_readpackedpoints( stream, &spoint_count );
+
       offsetToData = FT_Stream_FTell( stream );
 
       FT_Stream_SeekSet( stream, here );
@@ -4192,9 +4130,16 @@
                 tupleCount & GX_TC_TUPLE_COUNT_MASK,
                 ( tupleCount & GX_TC_TUPLE_COUNT_MASK ) == 1 ? "" : "s" ));
 
-    if ( FT_NEW_ARRAY( point_deltas_x, n_points ) ||
-         FT_NEW_ARRAY( point_deltas_y, n_points ) )
-      goto Fail3;
+    if ( FT_QNEW_ARRAY( peak_coords, 3 * blend->num_axis ) ||
+         FT_NEW_ARRAY( point_deltas_x, 2 * n_points )      ||
+         FT_QNEW_ARRAY( points_org, n_points )             ||
+         FT_QNEW_ARRAY( points_out, n_points )             ||
+         FT_QNEW_ARRAY( has_delta, n_points )              )
+      goto Exit;
+
+    im_start_coords = peak_coords + blend->num_axis;
+    im_end_coords   = im_start_coords + blend->num_axis;
+    point_deltas_y  = point_deltas_x + n_points;
 
     for ( j = 0; j < n_points; j++ )
     {
@@ -4217,22 +4162,20 @@
       if ( tupleIndex & GX_TI_EMBEDDED_TUPLE_COORD )
       {
         for ( j = 0; j < blend->num_axis; j++ )
-          tuple_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+          peak_coords[j] = FT_fdot14ToFixed( FT_GET_SHORT() );
+        tuple_coords = peak_coords;
       }
-      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) >= blend->tuplecount )
+      else if ( ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) < blend->tuplecount )
+        tuple_coords = blend->tuplecoords +
+            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis;
+      else
       {
         FT_TRACE2(( "TT_Vary_Apply_Glyph_Deltas:"
                     " invalid tuple index\n" ));
 
         error = FT_THROW( Invalid_Table );
-        goto Fail3;
+        goto Exit;
       }
-      else
-        FT_MEM_COPY(
-          tuple_coords,
-          blend->tuplecoords +
-            ( tupleIndex & GX_TI_TUPLE_INDEX_MASK ) * blend->num_axis,
-          blend->num_axis * sizeof ( FT_Fixed ) );
 
       if ( tupleIndex & GX_TI_INTERMEDIATE_TUPLE )
       {
@@ -4260,9 +4203,7 @@
 
       if ( tupleIndex & GX_TI_PRIVATE_POINT_NUMBERS )
       {
-        localpoints = ft_var_readpackedpoints( stream,
-                                               blend->gvar_size,
-                                               &point_count );
+        localpoints = ft_var_readpackedpoints( stream, &point_count );
         points      = localpoints;
       }
       else
@@ -4272,11 +4213,9 @@
       }
 
       deltas_x = ft_var_readpackeddeltas( stream,
-                                          blend->gvar_size,
                                           point_count == 0 ? n_points
                                                            : point_count );
       deltas_y = ft_var_readpackeddeltas( stream,
-                                          blend->gvar_size,
                                           point_count == 0 ? n_points
                                                            : point_count );
 
@@ -4460,23 +4399,17 @@
                                        unrounded[n_points - 2].y ) / 64;
     }
 
-  Fail3:
-    FT_FREE( point_deltas_x );
-    FT_FREE( point_deltas_y );
-
-  Fail2:
+  Exit:
     if ( sharedpoints != ALL_POINTS )
       FT_FREE( sharedpoints );
-    FT_FREE( tuple_coords );
-    FT_FREE( im_start_coords );
-    FT_FREE( im_end_coords );
-
-    FT_FRAME_EXIT();
-
-  Fail1:
     FT_FREE( points_org );
     FT_FREE( points_out );
     FT_FREE( has_delta );
+    FT_FREE( peak_coords );
+    FT_FREE( point_deltas_x );
+
+  FExit:
+    FT_FRAME_EXIT();
 
     return error;
   }
diff --git a/engine/thirdparty/freetype/src/truetype/ttgxvar.h b/engine/thirdparty/freetype/src/truetype/ttgxvar.h
index e3da6d17..9326011e 100644
--- a/engine/thirdparty/freetype/src/truetype/ttgxvar.h
+++ b/engine/thirdparty/freetype/src/truetype/ttgxvar.h
@@ -4,7 +4,7 @@
  *
  *   TrueType GX Font Variation loader (specification)
  *
- * Copyright (C) 2004-2023 by
+ * Copyright (C) 2004-2024 by
  * David Turner, Robert Wilhelm, Werner Lemberg and George Williams.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/ttinterp.c b/engine/thirdparty/freetype/src/truetype/ttinterp.c
index 79df4555..951891db 100644
--- a/engine/thirdparty/freetype/src/truetype/ttinterp.c
+++ b/engine/thirdparty/freetype/src/truetype/ttinterp.c
@@ -4,7 +4,7 @@
  *
  *   TrueType bytecode interpreter (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -5270,11 +5270,11 @@
     FT_UShort        refp;
     FT_F26Dot6       dx, dy;
 
-    FT_Short         contour, bounds;
+    FT_UShort        contour, bounds;
     FT_UShort        start, limit, i;
 
 
-    contour = (FT_Short)args[0];
+    contour = (FT_UShort)args[0];
     bounds  = ( exc->GS.gep2 == 0 ) ? 1 : exc->zp2.n_contours;
 
     if ( BOUNDS( contour, bounds ) )
@@ -5290,15 +5290,13 @@
     if ( contour == 0 )
       start = 0;
     else
-      start = (FT_UShort)( exc->zp2.contours[contour - 1] + 1 -
-                           exc->zp2.first_point );
+      start = exc->zp2.contours[contour - 1] + 1 - exc->zp2.first_point;
 
     /* we use the number of points if in the twilight zone */
     if ( exc->GS.gep2 == 0 )
       limit = exc->zp2.n_points;
     else
-      limit = (FT_UShort)( exc->zp2.contours[contour] -
-                           exc->zp2.first_point + 1 );
+      limit = exc->zp2.contours[contour] + 1 - exc->zp2.first_point;
 
     for ( i = start; i < limit; i++ )
     {
@@ -5341,9 +5339,9 @@
     /*      Normal zone's `n_points' includes phantoms, so must    */
     /*      use end of last contour.                               */
     if ( exc->GS.gep2 == 0 )
-      limit = (FT_UShort)exc->zp2.n_points;
+      limit = exc->zp2.n_points;
     else if ( exc->GS.gep2 == 1 && exc->zp2.n_contours > 0 )
-      limit = (FT_UShort)( exc->zp2.contours[exc->zp2.n_contours - 1] + 1 );
+      limit = exc->zp2.contours[exc->zp2.n_contours - 1] + 1;
     else
       limit = 0;
 
diff --git a/engine/thirdparty/freetype/src/truetype/ttinterp.h b/engine/thirdparty/freetype/src/truetype/ttinterp.h
index e98e258f..4f1a9bbc 100644
--- a/engine/thirdparty/freetype/src/truetype/ttinterp.h
+++ b/engine/thirdparty/freetype/src/truetype/ttinterp.h
@@ -4,7 +4,7 @@
  *
  *   TrueType bytecode interpreter (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/ttobjs.c b/engine/thirdparty/freetype/src/truetype/ttobjs.c
index 5b56af71..d0ac3181 100644
--- a/engine/thirdparty/freetype/src/truetype/ttobjs.c
+++ b/engine/thirdparty/freetype/src/truetype/ttobjs.c
@@ -4,7 +4,7 @@
  *
  *   Objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -115,7 +115,7 @@
   FT_LOCAL_DEF( FT_Error )
   tt_glyphzone_new( FT_Memory     memory,
                     FT_UShort     maxPoints,
-                    FT_Short      maxContours,
+                    FT_UShort     maxContours,
                     TT_GlyphZone  zone )
   {
     FT_Error  error;
@@ -152,18 +152,20 @@
   static const FT_String*
   tt_skip_pdffont_random_tag( const FT_String*  name )
   {
-    unsigned int  i;
+    if ( ft_isupper( name[0] ) &&
+         ft_isupper( name[1] ) &&
+         ft_isupper( name[2] ) &&
+         ft_isupper( name[3] ) &&
+         ft_isupper( name[4] ) &&
+         ft_isupper( name[5] ) &&
+              '+' == name[6]   &&
+                     name[7]   )
+    {
+      FT_TRACE7(( "name without randomization tag: %s\n", name + 7 ));
+      return name + 7;
+    }
 
-
-    if ( ft_strlen( name ) < 8 || name[6] != '+' )
-      return name;
-
-    for ( i = 0; i < 6; i++ )
-      if ( !ft_isupper( name[i] ) )
-        return name;
-
-    FT_TRACE7(( "name without randomization tag: %s\n", name + 7 ));
-    return name + 7;
+    return name;
   }
 
 
@@ -254,17 +256,20 @@
   {
     FT_Error   error;
     FT_UInt32  checksum = 0;
-    FT_UInt    i;
+    FT_Byte*   p;
+    FT_Int     shift;
 
 
     if ( FT_FRAME_ENTER( length ) )
       return 0;
 
-    for ( ; length > 3; length -= 4 )
-      checksum += (FT_UInt32)FT_GET_ULONG();
+    p = (FT_Byte*)stream->cursor;
 
-    for ( i = 3; length > 0; length--, i-- )
-      checksum += (FT_UInt32)FT_GET_BYTE() << ( i * 8 );
+    for ( ; length > 3; length -= 4 )
+      checksum += FT_NEXT_ULONG( p );
+
+    for ( shift = 24; length > 0; length--, shift -=8 )
+      checksum += (FT_UInt32)FT_NEXT_BYTE( p ) << shift;
 
     FT_FRAME_EXIT();
 
@@ -782,8 +787,7 @@
       FT_UInt  instance_index = (FT_UInt)face_index >> 16;
 
 
-      if ( FT_HAS_MULTIPLE_MASTERS( ttface ) &&
-           instance_index > 0                )
+      if ( FT_HAS_MULTIPLE_MASTERS( ttface ) )
       {
         error = FT_Set_Named_Instance( ttface, instance_index );
         if ( error )
@@ -990,16 +994,16 @@
     FT_Error        error;
     FT_UInt         i;
 
-    /* unscaled CVT values are already stored in 26.6 format */
-    FT_Fixed  scale = size->ttmetrics.scale >> 6;
-
 
     /* Scale the cvt values to the new ppem.            */
     /* By default, we use the y ppem value for scaling. */
     FT_TRACE6(( "CVT values:\n" ));
     for ( i = 0; i < size->cvt_size; i++ )
     {
-      size->cvt[i] = FT_MulFix( face->cvt[i], scale );
+      /* Unscaled CVT values are already stored in 26.6 format.            */
+      /* Note that this scaling operation is very sensitive to rounding;   */
+      /* the integer division by 64 must be applied to the first argument. */
+      size->cvt[i] = FT_MulFix( face->cvt[i] / 64, size->ttmetrics.scale );
       FT_TRACE6(( "  %3d: %f (%f)\n",
                   i, (double)face->cvt[i] / 64, (double)size->cvt[i] / 64 ));
     }
diff --git a/engine/thirdparty/freetype/src/truetype/ttobjs.h b/engine/thirdparty/freetype/src/truetype/ttobjs.h
index 40eb37b4..9c36ca78 100644
--- a/engine/thirdparty/freetype/src/truetype/ttobjs.h
+++ b/engine/thirdparty/freetype/src/truetype/ttobjs.h
@@ -4,7 +4,7 @@
  *
  *   Objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -105,7 +105,7 @@ FT_BEGIN_HEADER
   FT_LOCAL( FT_Error )
   tt_glyphzone_new( FT_Memory     memory,
                     FT_UShort     maxPoints,
-                    FT_Short      maxContours,
+                    FT_UShort     maxContours,
                     TT_GlyphZone  zone );
 
 #endif /* TT_USE_BYTECODE_INTERPRETER */
diff --git a/engine/thirdparty/freetype/src/truetype/ttpload.c b/engine/thirdparty/freetype/src/truetype/ttpload.c
index 54a64c7b..9505b5f1 100644
--- a/engine/thirdparty/freetype/src/truetype/ttpload.c
+++ b/engine/thirdparty/freetype/src/truetype/ttpload.c
@@ -4,7 +4,7 @@
  *
  *   TrueType-specific tables loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/truetype/ttpload.h b/engine/thirdparty/freetype/src/truetype/ttpload.h
index ed229fa4..bc32b580 100644
--- a/engine/thirdparty/freetype/src/truetype/ttpload.h
+++ b/engine/thirdparty/freetype/src/truetype/ttpload.h
@@ -4,7 +4,7 @@
  *
  *   TrueType-specific tables loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1afm.c b/engine/thirdparty/freetype/src/type1/t1afm.c
index d9b9398b..a63cd4dc 100644
--- a/engine/thirdparty/freetype/src/type1/t1afm.c
+++ b/engine/thirdparty/freetype/src/type1/t1afm.c
@@ -4,7 +4,7 @@
  *
  *   AFM support for Type 1 fonts (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1afm.h b/engine/thirdparty/freetype/src/type1/t1afm.h
index e0d5aa5a..7f5cdda1 100644
--- a/engine/thirdparty/freetype/src/type1/t1afm.h
+++ b/engine/thirdparty/freetype/src/type1/t1afm.h
@@ -4,7 +4,7 @@
  *
  *   AFM support for Type 1 fonts (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1driver.c b/engine/thirdparty/freetype/src/type1/t1driver.c
index a4cdf372..8ed01914 100644
--- a/engine/thirdparty/freetype/src/type1/t1driver.c
+++ b/engine/thirdparty/freetype/src/type1/t1driver.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 driver interface (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -312,10 +312,7 @@
       {
         retval = ft_strlen( type1->glyph_names[idx] ) + 1;
         if ( value && value_len >= retval )
-        {
           ft_memcpy( value, (void *)( type1->glyph_names[idx] ), retval );
-          ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
-        }
       }
       break;
 
@@ -344,11 +341,8 @@
       {
         retval = ft_strlen( type1->encoding.char_name[idx] ) + 1;
         if ( value && value_len >= retval )
-        {
           ft_memcpy( value, (void *)( type1->encoding.char_name[idx] ),
-                     retval - 1 );
-          ((FT_Char *)value)[retval - 1] = (FT_Char)'\0';
-        }
+                     retval );
       }
       break;
 
diff --git a/engine/thirdparty/freetype/src/type1/t1driver.h b/engine/thirdparty/freetype/src/type1/t1driver.h
index ee7fcf43..5ff52b55 100644
--- a/engine/thirdparty/freetype/src/type1/t1driver.h
+++ b/engine/thirdparty/freetype/src/type1/t1driver.h
@@ -4,7 +4,7 @@
  *
  *   High-level Type 1 driver interface (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1errors.h b/engine/thirdparty/freetype/src/type1/t1errors.h
index 2fbd1e51..8aeb24ae 100644
--- a/engine/thirdparty/freetype/src/type1/t1errors.h
+++ b/engine/thirdparty/freetype/src/type1/t1errors.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1gload.c b/engine/thirdparty/freetype/src/type1/t1gload.c
index a32a4649..c29e6825 100644
--- a/engine/thirdparty/freetype/src/type1/t1gload.c
+++ b/engine/thirdparty/freetype/src/type1/t1gload.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 Glyph Loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1gload.h b/engine/thirdparty/freetype/src/type1/t1gload.h
index c0648475..17a6a594 100644
--- a/engine/thirdparty/freetype/src/type1/t1gload.h
+++ b/engine/thirdparty/freetype/src/type1/t1gload.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 Glyph Loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1load.c b/engine/thirdparty/freetype/src/type1/t1load.c
index be7cd0fd..ee7fb42a 100644
--- a/engine/thirdparty/freetype/src/type1/t1load.c
+++ b/engine/thirdparty/freetype/src/type1/t1load.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 font loader (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -751,6 +751,7 @@
         PS_DesignMap  dmap = blend->design_map + n;
 
 
+        FT_FREE( dmap->blend_points );
         FT_FREE( dmap->design_points );
         dmap->num_points = 0;
       }
@@ -1043,9 +1044,9 @@
       }
 
       /* allocate design map data */
-      if ( FT_QNEW_ARRAY( map->design_points, num_points * 2 ) )
+      if ( FT_QNEW_ARRAY( map->design_points, num_points ) ||
+           FT_QNEW_ARRAY( map->blend_points,  num_points ) )
         goto Exit;
-      map->blend_points = map->design_points + num_points;
       map->num_points   = (FT_Byte)num_points;
 
       for ( p = 0; p < num_points; p++ )
@@ -1876,9 +1877,8 @@
         }
 
         /* t1_decrypt() shouldn't write to base -- make temporary copy */
-        if ( FT_QALLOC( temp, size ) )
+        if ( FT_DUP( temp, base, size ) )
           goto Fail;
-        FT_MEM_COPY( temp, base, size );
         psaux->t1_decrypt( temp, size, 4330 );
         size -= (FT_ULong)t1face->type1.private_dict.lenIV;
         error = T1_Add_Table( table,
@@ -2090,9 +2090,8 @@
           }
 
           /* t1_decrypt() shouldn't write to base -- make temporary copy */
-          if ( FT_QALLOC( temp, size ) )
+          if ( FT_DUP( temp, base, size ) )
             goto Fail;
-          FT_MEM_COPY( temp, base, size );
           psaux->t1_decrypt( temp, size, 4330 );
           size -= (FT_ULong)t1face->type1.private_dict.lenIV;
           error = T1_Add_Table( code_table,
@@ -2284,7 +2283,7 @@
                        T1_FIELD_DICT_PRIVATE )
 #endif
 
-    { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 }
+    T1_FIELD_ZERO
   };
 
 
@@ -2392,18 +2391,13 @@
           T1_Field  keyword = (T1_Field)t1_keywords;
 
 
-          for (;;)
+          while ( keyword->len )
           {
-            FT_Byte*  name;
+            FT_Byte*  name = (FT_Byte*)keyword->ident;
 
 
-            name = (FT_Byte*)keyword->ident;
-            if ( !name )
-              break;
-
-            if ( cur[0] == name[0]                      &&
-                 len == ft_strlen( (const char *)name ) &&
-                 ft_memcmp( cur, name, len ) == 0       )
+            if ( keyword->len == len              &&
+                 ft_memcmp( cur, name, len ) == 0 )
             {
               /* We found it -- run the parsing callback!     */
               /* We record every instance of every field      */
diff --git a/engine/thirdparty/freetype/src/type1/t1load.h b/engine/thirdparty/freetype/src/type1/t1load.h
index d8c9d2d8..a45efa7c 100644
--- a/engine/thirdparty/freetype/src/type1/t1load.h
+++ b/engine/thirdparty/freetype/src/type1/t1load.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 font loader (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1objs.c b/engine/thirdparty/freetype/src/type1/t1objs.c
index 69e4fd50..b1b27c31 100644
--- a/engine/thirdparty/freetype/src/type1/t1objs.c
+++ b/engine/thirdparty/freetype/src/type1/t1objs.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 objects manager (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1objs.h b/engine/thirdparty/freetype/src/type1/t1objs.h
index 03847b27..3809370c 100644
--- a/engine/thirdparty/freetype/src/type1/t1objs.h
+++ b/engine/thirdparty/freetype/src/type1/t1objs.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 objects manager (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1parse.c b/engine/thirdparty/freetype/src/type1/t1parse.c
index 6dec6c16..3717ea7c 100644
--- a/engine/thirdparty/freetype/src/type1/t1parse.c
+++ b/engine/thirdparty/freetype/src/type1/t1parse.c
@@ -4,7 +4,7 @@
  *
  *   Type 1 parser (body).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1parse.h b/engine/thirdparty/freetype/src/type1/t1parse.h
index 0d9a2865..a0a2134d 100644
--- a/engine/thirdparty/freetype/src/type1/t1parse.h
+++ b/engine/thirdparty/freetype/src/type1/t1parse.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 parser (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/t1tokens.h b/engine/thirdparty/freetype/src/type1/t1tokens.h
index 40f36092..5a3d2f1e 100644
--- a/engine/thirdparty/freetype/src/type1/t1tokens.h
+++ b/engine/thirdparty/freetype/src/type1/t1tokens.h
@@ -4,7 +4,7 @@
  *
  *   Type 1 tokenizer (specification).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type1/type1.c b/engine/thirdparty/freetype/src/type1/type1.c
index d9bd8cad..d7ff53c7 100644
--- a/engine/thirdparty/freetype/src/type1/type1.c
+++ b/engine/thirdparty/freetype/src/type1/type1.c
@@ -4,7 +4,7 @@
  *
  *   FreeType Type 1 driver component (body only).
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/t42drivr.c b/engine/thirdparty/freetype/src/type42/t42drivr.c
index ee5fd44a..25f507f1 100644
--- a/engine/thirdparty/freetype/src/type42/t42drivr.c
+++ b/engine/thirdparty/freetype/src/type42/t42drivr.c
@@ -4,7 +4,7 @@
  *
  *   High-level Type 42 driver interface (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * Roberto Alameda.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/t42drivr.h b/engine/thirdparty/freetype/src/type42/t42drivr.h
index ec7da18c..5b3852b8 100644
--- a/engine/thirdparty/freetype/src/type42/t42drivr.h
+++ b/engine/thirdparty/freetype/src/type42/t42drivr.h
@@ -4,7 +4,7 @@
  *
  *   High-level Type 42 driver interface (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * Roberto Alameda.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/t42error.h b/engine/thirdparty/freetype/src/type42/t42error.h
index dcea9c4f..f52205e2 100644
--- a/engine/thirdparty/freetype/src/type42/t42error.h
+++ b/engine/thirdparty/freetype/src/type42/t42error.h
@@ -4,7 +4,7 @@
  *
  *   Type 42 error codes (specification only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/t42objs.c b/engine/thirdparty/freetype/src/type42/t42objs.c
index bf4028e7..7010ba86 100644
--- a/engine/thirdparty/freetype/src/type42/t42objs.c
+++ b/engine/thirdparty/freetype/src/type42/t42objs.c
@@ -4,7 +4,7 @@
  *
  *   Type 42 objects manager (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * Roberto Alameda.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/t42objs.h b/engine/thirdparty/freetype/src/type42/t42objs.h
index 33e6215e..3ca83bc5 100644
--- a/engine/thirdparty/freetype/src/type42/t42objs.h
+++ b/engine/thirdparty/freetype/src/type42/t42objs.h
@@ -4,7 +4,7 @@
  *
  *   Type 42 objects manager (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * Roberto Alameda.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/t42parse.c b/engine/thirdparty/freetype/src/type42/t42parse.c
index f96a43b1..e53d3528 100644
--- a/engine/thirdparty/freetype/src/type42/t42parse.c
+++ b/engine/thirdparty/freetype/src/type42/t42parse.c
@@ -4,7 +4,7 @@
  *
  *   Type 42 font parser (body).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * Roberto Alameda.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -99,7 +99,7 @@
     T1_FIELD_CALLBACK( "CharStrings", t42_parse_charstrings, 0 )
     T1_FIELD_CALLBACK( "sfnts",       t42_parse_sfnts,       0 )
 
-    { 0, T1_FIELD_LOCATION_CID_INFO, T1_FIELD_TYPE_NONE, 0, 0, 0, 0, 0, 0 }
+    T1_FIELD_ZERO
   };
 
 
@@ -1195,8 +1195,6 @@
   {
     T42_Parser  parser     = &loader->parser;
     FT_Byte*    limit;
-    FT_Int      n_keywords = (FT_Int)( sizeof ( t42_keywords ) /
-                                         sizeof ( t42_keywords[0] ) );
 
 
     parser->root.cursor = base;
@@ -1273,24 +1271,20 @@
 
         if ( len > 0 && len < 22 && parser->root.cursor < limit )
         {
-          int  i;
+          T1_Field  keyword = (T1_Field)t42_keywords;
 
 
           /* now compare the immediate name to the keyword table */
-
-          /* loop through all known keywords */
-          for ( i = 0; i < n_keywords; i++ )
+          while ( keyword->len )
           {
-            T1_Field  keyword = (T1_Field)&t42_keywords[i];
-            FT_Byte   *name   = (FT_Byte*)keyword->ident;
+            FT_Byte*  name = (FT_Byte*)keyword->ident;
 
 
             if ( !name )
               continue;
 
-            if ( cur[0] == name[0]                      &&
-                 len == ft_strlen( (const char *)name ) &&
-                 ft_memcmp( cur, name, len ) == 0       )
+            if ( keyword->len == len              &&
+                 ft_memcmp( cur, name, len ) == 0 )
             {
               /* we found it -- run the parsing callback! */
               parser->root.error = t42_load_keyword( face,
@@ -1300,6 +1294,8 @@
                 return parser->root.error;
               break;
             }
+
+            keyword++;
           }
         }
       }
diff --git a/engine/thirdparty/freetype/src/type42/t42parse.h b/engine/thirdparty/freetype/src/type42/t42parse.h
index 5741c541..e9778616 100644
--- a/engine/thirdparty/freetype/src/type42/t42parse.h
+++ b/engine/thirdparty/freetype/src/type42/t42parse.h
@@ -4,7 +4,7 @@
  *
  *   Type 42 font parser (specification).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * Roberto Alameda.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/t42types.h b/engine/thirdparty/freetype/src/type42/t42types.h
index 0bfe14ee..550cc07c 100644
--- a/engine/thirdparty/freetype/src/type42/t42types.h
+++ b/engine/thirdparty/freetype/src/type42/t42types.h
@@ -4,7 +4,7 @@
  *
  *   Type 42 font data types (specification only).
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * Roberto Alameda.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/type42/type42.c b/engine/thirdparty/freetype/src/type42/type42.c
index 8d2302c8..a9444f0f 100644
--- a/engine/thirdparty/freetype/src/type42/type42.c
+++ b/engine/thirdparty/freetype/src/type42/type42.c
@@ -4,7 +4,7 @@
  *
  *   FreeType Type 42 driver component.
  *
- * Copyright (C) 2002-2023 by
+ * Copyright (C) 2002-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/winfonts/fnterrs.h b/engine/thirdparty/freetype/src/winfonts/fnterrs.h
index dafdb07b..7ca65923 100644
--- a/engine/thirdparty/freetype/src/winfonts/fnterrs.h
+++ b/engine/thirdparty/freetype/src/winfonts/fnterrs.h
@@ -4,7 +4,7 @@
  *
  *   Win FNT/FON error codes (specification only).
  *
- * Copyright (C) 2001-2023 by
+ * Copyright (C) 2001-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
diff --git a/engine/thirdparty/freetype/src/winfonts/winfnt.c b/engine/thirdparty/freetype/src/winfonts/winfnt.c
index 1160e4ef..74a06416 100644
--- a/engine/thirdparty/freetype/src/winfonts/winfnt.c
+++ b/engine/thirdparty/freetype/src/winfonts/winfnt.c
@@ -4,7 +4,7 @@
  *
  *   FreeType font driver for Windows FNT/FON files
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  * Copyright 2003 Huw D M Davies for Codeweavers
  * Copyright 2007 Dmitry Timoshkov for Codeweavers
@@ -359,8 +359,8 @@
           if ( type_id == 0x8008U )
           {
             font_count  = count;
-            font_offset = FT_STREAM_POS() + 4 +
-                          (FT_ULong)( stream->cursor - stream->limit );
+            font_offset = FT_STREAM_POS() + 4 -
+                          (FT_ULong)( stream->limit - stream->cursor );
             break;
           }
 
@@ -1006,7 +1006,7 @@
                   FT_UInt       glyph_index,
                   FT_Int32      load_flags )
   {
-    FNT_Face    face   = (FNT_Face)FT_SIZE_FACE( size );
+    FNT_Face    face   = (FNT_Face)size->face;
     FNT_Font    font;
     FT_Error    error  = FT_Err_Ok;
     FT_Byte*    p;
diff --git a/engine/thirdparty/freetype/src/winfonts/winfnt.h b/engine/thirdparty/freetype/src/winfonts/winfnt.h
index 2f75b9e8..78137496 100644
--- a/engine/thirdparty/freetype/src/winfonts/winfnt.h
+++ b/engine/thirdparty/freetype/src/winfonts/winfnt.h
@@ -4,7 +4,7 @@
  *
  *   FreeType font driver for Windows FNT/FON files
  *
- * Copyright (C) 1996-2023 by
+ * Copyright (C) 1996-2024 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  * Copyright 2007 Dmitry Timoshkov for Codeweavers
  *
diff --git a/engine/thirdparty/harfbuzz/src/OT/Color/CBDT/CBDT.hh b/engine/thirdparty/harfbuzz/src/OT/Color/CBDT/CBDT.hh
index bcf1848f..50550e81 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Color/CBDT/CBDT.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Color/CBDT/CBDT.hh
@@ -941,10 +941,12 @@ struct CBDT
       }
     }
 
-    bool has_data () const { return cbdt.get_length (); }
+    bool has_data () const { return cbdt->version.major; }
 
     bool paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data) const
     {
+      if (!has_data ()) return false;
+
       hb_glyph_extents_t extents;
       hb_glyph_extents_t pixel_extents;
       hb_blob_t *blob = reference_png (font, glyph);
diff --git a/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh b/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh
index 36b509d7..cf10e894 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Color/COLR/COLR.hh
@@ -29,11 +29,14 @@
 #define OT_COLOR_COLR_COLR_HH
 
 #include "../../../hb.hh"
+#include "../../../hb-decycler.hh"
 #include "../../../hb-open-type.hh"
 #include "../../../hb-ot-var-common.hh"
 #include "../../../hb-paint.hh"
 #include "../../../hb-paint-extents.hh"
 
+#include "../CPAL/CPAL.hh"
+
 /*
  * COLR -- Color
  * https://docs.microsoft.com/en-us/typography/opentype/spec/colr
@@ -66,11 +69,11 @@ public:
   hb_paint_funcs_t *funcs;
   void *data;
   hb_font_t *font;
-  unsigned int palette_index;
+  hb_array_t<const BGRAColor> palette;
   hb_color_t foreground;
   ItemVarStoreInstancer &instancer;
-  hb_map_t current_glyphs;
-  hb_map_t current_layers;
+  hb_decycler_t glyphs_decycler;
+  hb_decycler_t layers_decycler;
   int depth_left = HB_MAX_NESTING_LEVEL;
   int edge_count = HB_MAX_GRAPH_EDGE_COUNT;
 
@@ -85,7 +88,11 @@ public:
     funcs (funcs_),
     data (data_),
     font (font_),
-    palette_index (palette_),
+    palette (
+#ifndef HB_NO_COLOR
+	     font->face->table.CPAL->get_palette_colors (palette_)
+#endif
+    ),
     foreground (foreground_),
     instancer (instancer_)
   { }
@@ -99,12 +106,7 @@ public:
     if (color_index != 0xffff)
     {
       if (!funcs->custom_palette_color (data, color_index, &color))
-      {
-	unsigned int clen = 1;
-	hb_face_t *face = hb_font_get_face (font);
-
-	hb_ot_color_palette_get_colors (face, palette_index, color_index, &clen, &color);
-      }
+        color = palette[color_index];
 
       *is_foreground = false;
     }
@@ -1003,7 +1005,7 @@ struct PaintTransform
   void paint_glyph (hb_paint_context_t *c) const
   {
     TRACE_PAINT (this);
-    (this+transform).paint_glyph (c);
+    (this+transform).paint_glyph (c); // This does a push_transform()
     c->recurse (this+src);
     c->funcs->pop_transform (c->data);
   }
@@ -2134,12 +2136,16 @@ struct COLR
 
     const ItemVariationStore &get_var_store () const
     { return colr->get_var_store (); }
+    const ItemVariationStore *get_var_store_ptr () const
+    { return colr->get_var_store_ptr (); }
 
     bool has_delta_set_index_map () const
     { return colr->has_delta_set_index_map (); }
 
     const DeltaSetIndexMap &get_delta_set_index_map () const
     { return colr->get_delta_set_index_map (); }
+    const DeltaSetIndexMap *get_delta_set_index_map_ptr () const
+    { return colr->get_delta_set_index_map_ptr (); }
 
     private:
     hb_blob_ptr_t<COLR> colr;
@@ -2232,9 +2238,13 @@ struct COLR
 
   const DeltaSetIndexMap &get_delta_set_index_map () const
   { return has_delta_set_index_map () && hb_barrier () ? this+varIdxMap : Null (DeltaSetIndexMap); }
+  const DeltaSetIndexMap *get_delta_set_index_map_ptr () const
+  { return has_delta_set_index_map () && hb_barrier () ? &(this+varIdxMap) : nullptr; }
 
   const ItemVariationStore &get_var_store () const
   { return has_var_store () && hb_barrier () ? this+varStore : Null (ItemVariationStore); }
+  const ItemVariationStore *get_var_store_ptr () const
+  { return has_var_store () && hb_barrier () ? &(this+varStore) : nullptr; }
 
   const ClipList &get_clip_list () const
   { return has_clip_list () && hb_barrier () ? this+clipList : Null (ClipList); }
@@ -2482,9 +2492,9 @@ struct COLR
      * after instancing */
     if (!subset_varstore (c, colr_prime)) return_trace (false);
 
-    ItemVarStoreInstancer instancer (&(get_var_store ()),
-	                         &(get_delta_set_index_map ()),
-	                         c->plan->normalized_coords.as_array ());
+    ItemVarStoreInstancer instancer (get_var_store_ptr (),
+				     get_delta_set_index_map_ptr (),
+				     c->plan->normalized_coords.as_array ());
 
     if (!colr_prime->baseGlyphList.serialize_subset (c, baseGlyphList, this, instancer))
       return_trace (false);
@@ -2513,8 +2523,8 @@ struct COLR
   get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const
   {
 
-    ItemVarStoreInstancer instancer (&(get_var_store ()),
-                                     &(get_delta_set_index_map ()),
+    ItemVarStoreInstancer instancer (get_var_store_ptr (),
+                                     get_delta_set_index_map_ptr (),
                                      hb_array (font->coords, font->num_coords));
 
     if (get_clip (glyph, extents, instancer))
@@ -2575,11 +2585,13 @@ struct COLR
   bool
   paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, unsigned int palette_index, hb_color_t foreground, bool clip = true) const
   {
-    ItemVarStoreInstancer instancer (&(get_var_store ()),
-	                         &(get_delta_set_index_map ()),
-	                         hb_array (font->coords, font->num_coords));
+    ItemVarStoreInstancer instancer (get_var_store_ptr (),
+				     get_delta_set_index_map_ptr (),
+				     hb_array (font->coords, font->num_coords));
     hb_paint_context_t c (this, funcs, data, font, palette_index, foreground, instancer);
-    c.current_glyphs.add (glyph);
+
+    hb_decycler_node_t node (c.glyphs_decycler);
+    node.visit (glyph);
 
     if (version >= 1)
     {
@@ -2695,19 +2707,16 @@ void PaintColrLayers::paint_glyph (hb_paint_context_t *c) const
 {
   TRACE_PAINT (this);
   const LayerList &paint_offset_lists = c->get_colr_table ()->get_layerList ();
+  hb_decycler_node_t node (c->layers_decycler);
   for (unsigned i = firstLayerIndex; i < firstLayerIndex + numLayers; i++)
   {
-    if (unlikely (c->current_layers.has (i)))
-      continue;
-
-    c->current_layers.add (i);
+    if (unlikely (!node.visit (i)))
+      return;
 
     const Paint &paint = paint_offset_lists.get_paint (i);
     c->funcs->push_group (c->data);
     c->recurse (paint);
     c->funcs->pop_group (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER);
-
-    c->current_layers.del (i);
   }
 }
 
@@ -2715,16 +2724,14 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
 {
   TRACE_PAINT (this);
 
-  if (unlikely (c->current_glyphs.has (gid)))
+  hb_decycler_node_t node (c->glyphs_decycler);
+  if (unlikely (!node.visit (gid)))
     return;
 
-  c->current_glyphs.add (gid);
-
   c->funcs->push_inverse_root_transform (c->data, c->font);
   if (c->funcs->color_glyph (c->data, gid, c->font))
   {
     c->funcs->pop_transform (c->data);
-    c->current_glyphs.del (gid);
     return;
   }
   c->funcs->pop_transform (c->data);
@@ -2747,8 +2754,6 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
 
   if (has_clip_box)
     c->funcs->pop_clip (c->data);
-
-  c->current_glyphs.del (gid);
 }
 
 } /* namespace OT */
diff --git a/engine/thirdparty/harfbuzz/src/OT/Color/CPAL/CPAL.hh b/engine/thirdparty/harfbuzz/src/OT/Color/CPAL/CPAL.hh
index 2821334d..940126a8 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Color/CPAL/CPAL.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Color/CPAL/CPAL.hh
@@ -187,6 +187,14 @@ struct CPAL
   hb_ot_name_id_t get_color_name_id (unsigned int color_index) const
   { return v1 ().get_color_name_id (this, color_index, numColors); }
 
+  hb_array_t<const BGRAColor> get_palette_colors (unsigned int palette_index) const
+  {
+    if (unlikely (palette_index >= numPalettes))
+      return hb_array_t<const BGRAColor> ();
+    unsigned int start_index = colorRecordIndicesZ[palette_index];
+    hb_array_t<const BGRAColor> all_colors ((this+colorRecordsZ).arrayZ, numColorRecords);
+    return all_colors.sub_array (start_index, numColors);
+  }
   unsigned int get_palette_colors (unsigned int  palette_index,
 				   unsigned int  start_offset,
 				   unsigned int *color_count, /* IN/OUT.  May be NULL. */
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh
index 344e87af..daa19795 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/Coverage.hh
@@ -96,6 +96,15 @@ struct Coverage
     default:return NOT_COVERED;
     }
   }
+  unsigned int get_coverage (hb_codepoint_t glyph_id,
+			     hb_ot_lookup_cache_t *cache) const
+  {
+    unsigned coverage;
+    if (cache && cache->get (glyph_id, &coverage)) return coverage;
+    coverage = get_coverage (glyph_id);
+    if (cache) cache->set (glyph_id, coverage);
+    return coverage;
+  }
 
   unsigned get_population () const
   {
@@ -201,6 +210,19 @@ struct Coverage
     }
   }
 
+  unsigned cost () const
+  {
+    switch (u.format) {
+    case 1: hb_barrier (); return u.format1.cost ();
+    case 2: hb_barrier (); return u.format2.cost ();
+#ifndef HB_NO_BEYOND_64K
+    case 3: hb_barrier (); return u.format3.cost ();
+    case 4: hb_barrier (); return u.format4.cost ();
+#endif
+    default:return 0u;
+    }
+  }
+
   /* Might return false if array looks unsorted.
    * Used for faster rejection of corrupt data. */
   template <typename set_t>
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat1.hh
index 3f598d40..cdba7a50 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat1.hh
@@ -103,6 +103,8 @@ struct CoverageFormat1_3
         intersect_glyphs << glyphArray[i];
   }
 
+  unsigned cost () const { return hb_bit_storage ((unsigned) glyphArray.len); /* bsearch cost */ }
+
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   { return glyphs->add_sorted_array (glyphArray.as_array ()); }
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat2.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat2.hh
index 9c875423..dd577fd9 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat2.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/Common/CoverageFormat2.hh
@@ -157,6 +157,8 @@ struct CoverageFormat2_4
     }
   }
 
+  unsigned cost () const { return hb_bit_storage ((unsigned) rangeRecord.len); /* bsearch cost */ }
+
   template <typename set_t>
   bool collect_coverage (set_t *glyphs) const
   {
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat1.hh
index ac2774a7..de67548c 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat1.hh
@@ -103,12 +103,50 @@ struct PairPosFormat1_3
 
   const Coverage &get_coverage () const { return this+coverage; }
 
-  bool apply (hb_ot_apply_context_t *c) const
+  unsigned cache_cost () const
+  {
+    return (this+coverage).cost ();
+  }
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  {
+    switch (op)
+    {
+      case hb_ot_lookup_cache_op_t::CREATE:
+      {
+	hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) hb_malloc (sizeof (hb_ot_lookup_cache_t));
+	if (likely (cache))
+	  cache->clear ();
+	return cache;
+      }
+      case hb_ot_lookup_cache_op_t::ENTER:
+	return (void *) true;
+      case hb_ot_lookup_cache_op_t::LEAVE:
+	return nullptr;
+      case hb_ot_lookup_cache_op_t::DESTROY:
+      {
+	hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) p;
+	hb_free (cache);
+	return nullptr;
+      }
+    }
+    return nullptr;
+  }
+
+  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
+
     hb_buffer_t *buffer = c->buffer;
+
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr;
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache);
+#else
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+#endif
+    if (index == NOT_COVERED) return_trace (false);
 
     hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
@@ -156,7 +194,7 @@ struct PairPosFormat1_3
         strip = true;
       newFormats = compute_effective_value_formats (glyphset, strip, true);
     }
-    
+
     out->valueFormat[0] = newFormats.first;
     out->valueFormat[1] = newFormats.second;
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh
index 5ffeb5d0..f30148ab 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/PairPosFormat2.hh
@@ -123,12 +123,61 @@ struct PairPosFormat2_4 : ValueBase
 
   const Coverage &get_coverage () const { return this+coverage; }
 
-  bool apply (hb_ot_apply_context_t *c) const
+  struct pair_pos_cache_t
+  {
+    hb_ot_lookup_cache_t coverage;
+    hb_ot_lookup_cache_t first;
+    hb_ot_lookup_cache_t second;
+  };
+
+  unsigned cache_cost () const
+  {
+    return (this+coverage).cost () + (this+classDef1).cost () + (this+classDef2).cost ();
+  }
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  {
+    switch (op)
+    {
+      case hb_ot_lookup_cache_op_t::CREATE:
+      {
+	pair_pos_cache_t *cache = (pair_pos_cache_t *) hb_malloc (sizeof (pair_pos_cache_t));
+	if (likely (cache))
+	{
+	  cache->coverage.clear ();
+	  cache->first.clear ();
+	  cache->second.clear ();
+	}
+	return cache;
+      }
+      case hb_ot_lookup_cache_op_t::ENTER:
+	return (void *) true;
+      case hb_ot_lookup_cache_op_t::LEAVE:
+	return nullptr;
+      case hb_ot_lookup_cache_op_t::DESTROY:
+	{
+	  pair_pos_cache_t *cache = (pair_pos_cache_t *) p;
+	  hb_free (cache);
+	  return nullptr;
+	}
+    }
+    return nullptr;
+  }
+
+  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
+
     hb_buffer_t *buffer = c->buffer;
+
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    pair_pos_cache_t *cache = cached ? (pair_pos_cache_t *) c->lookup_accel->cache : nullptr;
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache ? &cache->coverage : nullptr);
+#else
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+#endif
+    if (index == NOT_COVERED) return_trace (false);
 
     hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_input;
     skippy_iter.reset_fast (buffer->idx);
@@ -139,8 +188,13 @@ struct PairPosFormat2_4 : ValueBase
       return_trace (false);
     }
 
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint, cache ? &cache->first : nullptr);
+    unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint, cache ? &cache->second : nullptr);
+#else
     unsigned int klass1 = (this+classDef1).get_class (buffer->cur().codepoint);
     unsigned int klass2 = (this+classDef2).get_class (buffer->info[skippy_iter.idx].codepoint);
+#endif
     if (unlikely (klass1 >= class1Count || klass2 >= class2Count))
     {
       buffer->unsafe_to_concat (buffer->idx, skippy_iter.idx + 1);
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
index b2d151d4..e9fe3923 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat1.hh
@@ -67,7 +67,7 @@ struct SinglePosFormat1 : ValueBase
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     if (HB_BUFFER_MESSAGE_MORE && c->buffer->messaging ())
     {
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
index ae4a5ed7..2fb71058 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GPOS/SinglePosFormat2.hh
@@ -66,7 +66,7 @@ struct SinglePosFormat2 : ValueBase
     TRACE_APPLY (this);
     hb_buffer_t *buffer = c->buffer;
     unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     if (unlikely (index >= valueCount)) return_trace (false);
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubstFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubstFormat1.hh
index adec65d5..421a6e06 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubstFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/AlternateSubstFormat1.hh
@@ -74,7 +74,7 @@ struct AlternateSubstFormat1_2
     TRACE_APPLY (this);
 
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     return_trace ((this+alternateSet[index]).apply (c));
   }
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
index 5c7df97d..2ef46145 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/LigatureSubstFormat1.hh
@@ -78,12 +78,49 @@ struct LigatureSubstFormat1_2
     return lig_set.would_apply (c);
   }
 
-  bool apply (hb_ot_apply_context_t *c) const
+  unsigned cache_cost () const
+  {
+    return (this+coverage).cost ();
+  }
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
+  {
+    switch (op)
+    {
+      case hb_ot_lookup_cache_op_t::CREATE:
+      {
+	hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) hb_malloc (sizeof (hb_ot_lookup_cache_t));
+	if (likely (cache))
+	  cache->clear ();
+	return cache;
+      }
+      case hb_ot_lookup_cache_op_t::ENTER:
+	return (void *) true;
+      case hb_ot_lookup_cache_op_t::LEAVE:
+	return nullptr;
+      case hb_ot_lookup_cache_op_t::DESTROY:
+      {
+	hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) p;
+	hb_free (cache);
+	return nullptr;
+      }
+    }
+    return nullptr;
+  }
+
+  bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
+  bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); }
+  bool _apply (hb_ot_apply_context_t *c, bool cached) const
   {
     TRACE_APPLY (this);
+    hb_buffer_t *buffer = c->buffer;
 
-    unsigned int index = (this+coverage).get_coverage (c->buffer->cur ().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr;
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint, cache);
+#else
+    unsigned int index = (this+coverage).get_coverage  (buffer->cur().codepoint);
+#endif
+    if (index == NOT_COVERED) return_trace (false);
 
     const auto &lig_set = this+ligatureSet[index];
     return_trace (lig_set.apply (c));
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubstFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubstFormat1.hh
index 3b4bd116..441d4dee 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubstFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/MultipleSubstFormat1.hh
@@ -66,7 +66,7 @@ struct MultipleSubstFormat1_2
     TRACE_APPLY (this);
 
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     return_trace ((this+sequence[index]).apply (c));
   }
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
index ec374f2f..1f598cc4 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/ReverseChainSingleSubstFormat1.hh
@@ -112,7 +112,7 @@ struct ReverseChainSingleSubstFormat1
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur ().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     if (unlikely (c->nesting_level_left != HB_MAX_NESTING_LEVEL))
       return_trace (false); /* No chaining to this type */
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh
index 850be86c..550d8f04 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat1.hh
@@ -128,7 +128,7 @@ struct SingleSubstFormat1_3
     TRACE_APPLY (this);
     hb_codepoint_t glyph_id = c->buffer->cur().codepoint;
     unsigned int index = (this+coverage).get_coverage (glyph_id);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     hb_codepoint_t d = deltaGlyphID;
     hb_codepoint_t mask = get_mask ();
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
index 9c651abe..dce28b67 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/GSUB/SingleSubstFormat2.hh
@@ -104,7 +104,7 @@ struct SingleSubstFormat2_4
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     if (unlikely (index >= substitute.len)) return_trace (false);
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh b/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh
index 3840db05..527f6411 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Layout/types.hh
@@ -29,6 +29,9 @@
 #ifndef OT_LAYOUT_TYPES_HH
 #define OT_LAYOUT_TYPES_HH
 
+using hb_ot_lookup_cache_t = hb_cache_t<15, 8, 7>;
+static_assert (sizeof (hb_ot_lookup_cache_t) == 256, "");
+
 namespace OT {
 namespace Layout {
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc
index 1afb5711..3b9eec4f 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc
+++ b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.cc
@@ -3,7 +3,6 @@
 #ifndef HB_NO_VAR_COMPOSITES
 
 #include "../../../hb-draw.hh"
-#include "../../../hb-geometry.hh"
 #include "../../../hb-ot-layout-common.hh"
 #include "../../../hb-ot-layout-gdef-table.hh"
 
@@ -133,18 +132,19 @@ VarComponent::get_path_at (hb_font_t *font,
 			   hb_codepoint_t parent_gid,
 			   hb_draw_session_t &draw_session,
 			   hb_array_t<const int> coords,
+			   hb_transform_t total_transform,
 			   hb_ubytes_t total_record,
-			   hb_set_t *visited,
+			   hb_decycler_t *decycler,
 			   signed *edges_left,
 			   signed depth_left,
+			   hb_glyf_scratch_t &scratch,
 			   VarRegionList::cache_t *cache) const
 {
   const unsigned char *end = total_record.arrayZ + total_record.length;
   const unsigned char *record = total_record.arrayZ;
 
-  auto &VARC = *font->face->table.VARC;
+  auto &VARC = *font->face->table.VARC->table;
   auto &varStore = &VARC+VARC.varStore;
-  auto instancer = MultiItemVarStoreInstancer(&varStore, nullptr, coords, cache);
 
 #define READ_UINT32VAR(name) \
   HB_STMT_START { \
@@ -187,22 +187,25 @@ VarComponent::get_path_at (hb_font_t *font,
     unsigned conditionIndex;
     READ_UINT32VAR (conditionIndex);
     const auto &condition = (&VARC+VARC.conditionList)[conditionIndex];
+    auto instancer = MultiItemVarStoreInstancer(&varStore, nullptr, coords, cache);
     show = condition.evaluate (coords.arrayZ, coords.length, &instancer);
   }
 
   // Axis values
 
-  hb_vector_t<unsigned> axisIndices;
-  hb_vector_t<float> axisValues;
+  auto &axisIndices = scratch.axisIndices;
+  axisIndices.clear ();
+  auto &axisValues = scratch.axisValues;
+  axisValues.clear ();
   if (flags & (unsigned) flags_t::HAVE_AXES)
   {
     unsigned axisIndicesIndex;
     READ_UINT32VAR (axisIndicesIndex);
-    axisIndices = (&VARC+VARC.axisIndicesList)[axisIndicesIndex];
+    axisIndices.extend ((&VARC+VARC.axisIndicesList)[axisIndicesIndex]);
     axisValues.resize (axisIndices.length);
     const HBUINT8 *p = (const HBUINT8 *) record;
     TupleValues::decompile (p, axisValues, (const HBUINT8 *) end);
-    record += (const unsigned char *) p - record;
+    record = (const unsigned char *) p;
   }
 
   // Apply variations if any
@@ -312,26 +315,15 @@ VarComponent::get_path_at (hb_font_t *font,
     if (!(flags & (unsigned) flags_t::HAVE_SCALE_Y))
       transform.scaleY = transform.scaleX;
 
-    // Scale the transform by the font's scale
-    float x_scale = font->x_multf;
-    float y_scale = font->y_multf;
-    transform.translateX *= x_scale;
-    transform.translateY *= y_scale;
-    transform.tCenterX *= x_scale;
-    transform.tCenterY *= y_scale;
-
-    // Build a transforming pen to apply the transform.
-    hb_draw_funcs_t *transformer_funcs = hb_transforming_pen_get_funcs ();
-    hb_transforming_pen_context_t context {transform.to_transform (),
-					   draw_session.funcs,
-					   draw_session.draw_data,
-					   &draw_session.st};
-    hb_draw_session_t transformer_session {transformer_funcs, &context};
+    total_transform.transform (transform.to_transform ());
+    total_transform.scale (font->x_mult ? 1.f / font->x_multf : 0.f,
+			   font->y_mult ? 1.f / font->y_multf : 0.f);
 
     VARC.get_path_at (font, gid,
-		      transformer_session, component_coords,
+		      draw_session, component_coords, total_transform,
 		      parent_gid,
-		      visited, edges_left, depth_left - 1);
+		      decycler, edges_left, depth_left - 1,
+		      scratch);
   }
 
 #undef PROCESS_TRANSFORM_COMPONENTS
@@ -340,6 +332,72 @@ VarComponent::get_path_at (hb_font_t *font,
   return hb_ubytes_t (record, end - record);
 }
 
+bool
+VARC::get_path_at (hb_font_t *font,
+		   hb_codepoint_t glyph,
+		   hb_draw_session_t &draw_session,
+		   hb_array_t<const int> coords,
+		   hb_transform_t transform,
+		   hb_codepoint_t parent_glyph,
+		   hb_decycler_t *decycler,
+		   signed *edges_left,
+		   signed depth_left,
+		   hb_glyf_scratch_t &scratch) const
+{
+  // Don't recurse on the same glyph.
+  unsigned idx = glyph == parent_glyph ?
+		 NOT_COVERED :
+		 (this+coverage).get_coverage (glyph);
+  if (idx == NOT_COVERED)
+  {
+    // Build a transforming pen to apply the transform.
+    hb_draw_funcs_t *transformer_funcs = hb_transforming_pen_get_funcs ();
+    hb_transforming_pen_context_t context {transform,
+					   draw_session.funcs,
+					   draw_session.draw_data,
+					   &draw_session.st};
+    hb_draw_session_t transformer_session {transformer_funcs, &context};
+    hb_draw_session_t &shape_draw_session = transform.is_identity () ? draw_session : transformer_session;
+
+    if (!font->face->table.glyf->get_path_at (font, glyph, shape_draw_session, coords, scratch))
+#ifndef HB_NO_CFF
+    if (!font->face->table.cff2->get_path_at (font, glyph, shape_draw_session, coords))
+    if (!font->face->table.cff1->get_path (font, glyph, shape_draw_session)) // Doesn't have variations
+#endif
+      return false;
+    return true;
+  }
+
+  if (depth_left <= 0)
+    return true;
+
+  if (*edges_left <= 0)
+    return true;
+  (*edges_left)--;
+
+  hb_decycler_node_t node (*decycler);
+  if (unlikely (!node.visit (glyph)))
+    return true;
+
+  hb_ubytes_t record = (this+glyphRecords)[idx];
+
+  float static_cache[sizeof (void *) * 16];
+  VarRegionList::cache_t *cache = (this+varStore).create_cache (hb_array (static_cache));
+
+  transform.scale (font->x_multf, font->y_multf);
+
+  VarCompositeGlyph::get_path_at (font, glyph,
+				  draw_session, coords, transform,
+				  record,
+				  decycler, edges_left, depth_left,
+				  scratch,
+				  cache);
+
+  (this+varStore).destroy_cache (cache, hb_array (static_cache));
+
+  return true;
+}
+
 //} // namespace Var
 } // namespace OT
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.hh b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.hh
index d60f7b0c..30e54b6b 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/VARC.hh
@@ -1,6 +1,8 @@
 #ifndef OT_VAR_VARC_VARC_HH
 #define OT_VAR_VARC_VARC_HH
 
+#include "../../../hb-decycler.hh"
+#include "../../../hb-geometry.hh"
 #include "../../../hb-ot-layout-common.hh"
 #include "../../../hb-ot-glyf-table.hh"
 #include "../../../hb-ot-cff2-table.hh"
@@ -46,10 +48,12 @@ struct VarComponent
 	       hb_codepoint_t parent_gid,
 	       hb_draw_session_t &draw_session,
 	       hb_array_t<const int> coords,
+	       hb_transform_t transform,
 	       hb_ubytes_t record,
-	       hb_set_t *visited,
+	       hb_decycler_t *decycler,
 	       signed *edges_left,
 	       signed depth_left,
+	       hb_glyf_scratch_t &scratch,
 	       VarRegionList::cache_t *cache = nullptr) const;
 };
 
@@ -60,19 +64,21 @@ struct VarCompositeGlyph
 	       hb_codepoint_t glyph,
 	       hb_draw_session_t &draw_session,
 	       hb_array_t<const int> coords,
+	       hb_transform_t transform,
 	       hb_ubytes_t record,
-	       hb_set_t *visited,
+	       hb_decycler_t *decycler,
 	       signed *edges_left,
 	       signed depth_left,
+	       hb_glyf_scratch_t &scratch,
 	       VarRegionList::cache_t *cache = nullptr)
   {
     while (record)
     {
       const VarComponent &comp = * (const VarComponent *) (record.arrayZ);
       record = comp.get_path_at (font, glyph,
-				 draw_session, coords,
+				 draw_session, coords, transform,
 				 record,
-				 visited, edges_left, depth_left, cache);
+				 decycler, edges_left, depth_left, scratch, cache);
     }
   }
 };
@@ -85,79 +91,37 @@ struct VARC
 
   static constexpr hb_tag_t tableTag = HB_TAG ('V', 'A', 'R', 'C');
 
-  bool
+  HB_INTERNAL bool
   get_path_at (hb_font_t *font,
 	       hb_codepoint_t glyph,
 	       hb_draw_session_t &draw_session,
 	       hb_array_t<const int> coords,
-	       hb_codepoint_t parent_glyph = HB_CODEPOINT_INVALID,
-	       hb_set_t *visited = nullptr,
-	       signed *edges_left = nullptr,
-	       signed depth_left = HB_MAX_NESTING_LEVEL) const
-  {
-    hb_set_t stack_set;
-    if (visited == nullptr)
-      visited = &stack_set;
-    signed stack_edges = HB_MAX_GRAPH_EDGE_COUNT;
-    if (edges_left == nullptr)
-      edges_left = &stack_edges;
-
-    // Don't recurse on the same glyph.
-    unsigned idx = glyph == parent_glyph ?
-		   NOT_COVERED :
-		   (this+coverage).get_coverage (glyph);
-    if (idx == NOT_COVERED)
-    {
-      if (!font->face->table.glyf->get_path_at (font, glyph, draw_session, coords))
-#ifndef HB_NO_CFF
-      if (!font->face->table.cff2->get_path_at (font, glyph, draw_session, coords))
-      if (!font->face->table.cff1->get_path (font, glyph, draw_session)) // Doesn't have variations
-#endif
-	return false;
-      return true;
-    }
-
-    if (depth_left <= 0)
-      return true;
-
-    if (*edges_left <= 0)
-      return true;
-    (*edges_left)--;
-
-    if (visited->has (glyph) || visited->in_error ())
-      return true;
-    visited->add (glyph);
-
-    hb_ubytes_t record = (this+glyphRecords)[idx];
-
-    VarRegionList::cache_t *cache = record.length >= 64 ? // Heuristic
-				   (this+varStore).create_cache ()
-				   : nullptr;
-
-    VarCompositeGlyph::get_path_at (font, glyph,
-				    draw_session, coords,
-				    record,
-				    visited, edges_left, depth_left,
-				    cache);
-
-    (this+varStore).destroy_cache (cache);
-
-    visited->del (glyph);
-
-    return true;
-  }
+	       hb_transform_t transform,
+	       hb_codepoint_t parent_glyph,
+	       hb_decycler_t *decycler,
+	       signed *edges_left,
+	       signed depth_left,
+	       hb_glyf_scratch_t &scratch) const;
 
   bool
-  get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const
-  { return get_path_at (font, gid, draw_session, hb_array (font->coords, font->num_coords)); }
-
-  bool paint_glyph (hb_font_t *font, hb_codepoint_t gid, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const
+  get_path (hb_font_t *font,
+	    hb_codepoint_t gid,
+	    hb_draw_session_t &draw_session,
+	    hb_glyf_scratch_t &scratch) const
   {
-    funcs->push_clip_glyph (data, gid, font);
-    funcs->color (data, true, foreground);
-    funcs->pop_clip (data);
+    hb_decycler_t decycler;
+    signed edges = HB_MAX_GRAPH_EDGE_COUNT;
 
-    return true;
+    return get_path_at (font,
+			gid,
+			draw_session,
+			hb_array (font->coords, font->num_coords),
+			HB_TRANSFORM_IDENTITY,
+			HB_CODEPOINT_INVALID,
+			&decycler,
+			&edges,
+			HB_MAX_NESTING_LEVEL,
+			scratch);
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
@@ -173,6 +137,63 @@ struct VARC
 		  glyphRecords.sanitize (c, this));
   }
 
+  struct accelerator_t
+  {
+    friend struct VarComponent;
+
+    accelerator_t (hb_face_t *face)
+    {
+      table = hb_sanitize_context_t ().reference_table<VARC> (face);
+    }
+    ~accelerator_t ()
+    {
+      auto *scratch = cached_scratch.get_relaxed ();
+      if (scratch)
+      {
+	scratch->~hb_glyf_scratch_t ();
+	hb_free (scratch);
+      }
+
+      table.destroy ();
+    }
+
+    bool
+    get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const
+    {
+      if (!table->has_data ()) return false;
+
+      hb_glyf_scratch_t *scratch;
+
+      // Borrow the cached strach buffer.
+      {
+	scratch = cached_scratch.get_acquire ();
+	if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
+	{
+	  scratch = (hb_glyf_scratch_t *) hb_calloc (1, sizeof (hb_glyf_scratch_t));
+	  if (unlikely (!scratch))
+	    return true;
+	}
+      }
+
+      bool ret = table->get_path (font, gid, draw_session, *scratch);
+
+      // Put it back.
+      if (!cached_scratch.cmpexch (nullptr, scratch))
+      {
+        scratch->~hb_glyf_scratch_t ();
+	hb_free (scratch);
+      }
+
+      return ret;
+    }
+
+    private:
+    hb_blob_ptr_t<VARC> table;
+    hb_atomic_ptr_t<hb_glyf_scratch_t> cached_scratch;
+  };
+
+  bool has_data () const { return version.major != 0; }
+
   protected:
   FixedVersion<> version; /* Version identifier */
   Offset32To<Coverage> coverage;
@@ -184,6 +205,10 @@ struct VARC
   DEFINE_SIZE_STATIC (24);
 };
 
+struct VARC_accelerator_t : VARC::accelerator_t {
+  VARC_accelerator_t (hb_face_t *face) : VARC::accelerator_t (face) {}
+};
+
 #endif
 
 //}
diff --git a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/coord-setter.hh b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/coord-setter.hh
index a2b483ce..0df524ed 100644
--- a/engine/thirdparty/harfbuzz/src/OT/Var/VARC/coord-setter.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/Var/VARC/coord-setter.hh
@@ -11,22 +11,48 @@ namespace OT {
 
 struct coord_setter_t
 {
-  coord_setter_t (hb_array_t<const int> coords) :
-    coords (coords) {}
+  coord_setter_t (hb_array_t<const int> coords_)
+  {
+    length = coords_.length;
+    if (length <= ARRAY_LENGTH (static_coords))
+      hb_memcpy (static_coords, coords_.arrayZ, length * sizeof (int));
+    else
+      dynamic_coords.extend (coords_);
+  }
 
   int& operator [] (unsigned idx)
   {
     if (unlikely (idx >= HB_VAR_COMPOSITE_MAX_AXES))
       return Crap(int);
-    if (coords.length < idx + 1)
-      coords.resize (idx + 1);
-    return coords[idx];
+
+    if (length <= ARRAY_LENGTH (static_coords))
+    {
+      if (idx < ARRAY_LENGTH (static_coords))
+      {
+        while (length <= idx)
+	  static_coords[length++] = 0;
+	return static_coords[idx];
+      }
+      else
+        dynamic_coords.extend (hb_array (static_coords, length));
+    }
+
+    if (dynamic_coords.length <= idx)
+    {
+      if (unlikely (!dynamic_coords.resize (idx + 1)))
+	return Crap(int);
+      length = idx + 1;
+    }
+    return dynamic_coords.arrayZ[idx];
   }
 
   hb_array_t<int> get_coords ()
-  { return coords.as_array (); }
+  { return length <= ARRAY_LENGTH (static_coords) ? hb_array (static_coords, length) : dynamic_coords.as_array (); }
 
-  hb_vector_t<int> coords;
+  private:
+  hb_vector_t<int> dynamic_coords;
+  unsigned length;
+  int static_coords[sizeof (void *) * 8];
 };
 
 
diff --git a/engine/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh b/engine/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh
index 5c0ecd51..e2ec4a80 100644
--- a/engine/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/glyf/CompositeGlyph.hh
@@ -143,7 +143,7 @@ struct CompositeGlyphRecord
     float matrix[4];
     contour_point_t trans;
     get_transformation (matrix, trans);
-    if (unlikely (!points.alloc (points.length + 4))) return false; // For phantom points
+    if (unlikely (!points.alloc (points.length + 1 + 4))) return false; // For phantom points
     points.push (trans);
     return true;
   }
diff --git a/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh b/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh
index 7772597e..2c289d51 100644
--- a/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/glyf/Glyph.hh
@@ -251,7 +251,8 @@ struct Glyph
       composite_contours_p = nullptr;
     }
 
-    if (!get_points (font, glyf, all_points, &points_with_deltas, head_maxp_info_p, composite_contours_p, false, false))
+    hb_glyf_scratch_t scratch;
+    if (!get_points (font, glyf, all_points, scratch, &points_with_deltas, head_maxp_info_p, composite_contours_p, false, false))
       return false;
 
     // .notdef, set type to empty so we only update metrics and don't compile bytes for
@@ -305,6 +306,7 @@ struct Glyph
   template <typename accelerator_t>
   bool get_points (hb_font_t *font, const accelerator_t &glyf_accelerator,
 		   contour_point_vector_t &all_points /* OUT */,
+		   hb_glyf_scratch_t &scratch,
 		   contour_point_vector_t *points_with_deltas = nullptr, /* OUT */
 		   head_maxp_info_t * head_maxp_info = nullptr, /* OUT */
 		   unsigned *composite_contours = nullptr, /* OUT */
@@ -312,7 +314,6 @@ struct Glyph
 		   bool use_my_metrics = true,
 		   bool phantom_only = false,
 		   hb_array_t<const int> coords = hb_array_t<const int> (),
-		   hb_map_t *current_glyphs = nullptr,
 		   unsigned int depth = 0,
 		   unsigned *edge_count = nullptr) const
   {
@@ -322,10 +323,6 @@ struct Glyph
     if (unlikely (*edge_count > HB_MAX_GRAPH_EDGE_COUNT)) return false;
     (*edge_count)++;
 
-    hb_map_t current_glyphs_stack;
-    if (current_glyphs == nullptr)
-      current_glyphs = &current_glyphs_stack;
-
     if (head_maxp_info)
     {
       head_maxp_info->maxComponentDepth = hb_max (head_maxp_info->maxComponentDepth, depth);
@@ -334,8 +331,7 @@ struct Glyph
     if (!coords)
       coords = hb_array (font->coords, font->num_coords);
 
-    contour_point_vector_t stack_points;
-    contour_point_vector_t &points = type == SIMPLE ? all_points : stack_points;
+    contour_point_vector_t &points = type == SIMPLE ? all_points : scratch.comp_points;
     unsigned old_length = points.length;
 
     switch (type) {
@@ -388,36 +384,53 @@ struct Glyph
 
 #ifndef HB_NO_VAR
     if (coords)
-      glyf_accelerator.gvar->apply_deltas_to_points (gid,
-						     coords,
-						     points.as_array ().sub_array (old_length),
-						     phantom_only && type == SIMPLE);
+    {
+#ifndef HB_NO_BEYOND_64K
+      if (glyf_accelerator.GVAR->has_data ())
+	glyf_accelerator.GVAR->apply_deltas_to_points (gid,
+						       coords,
+						       points.as_array ().sub_array (old_length),
+						       scratch,
+						       phantom_only && type == SIMPLE);
+      else
+#endif
+	glyf_accelerator.gvar->apply_deltas_to_points (gid,
+						       coords,
+						       points.as_array ().sub_array (old_length),
+						       scratch,
+						       phantom_only && type == SIMPLE);
+    }
 #endif
 
     // mainly used by CompositeGlyph calculating new X/Y offset value so no need to extend it
     // with child glyphs' points
     if (points_with_deltas != nullptr && depth == 0 && type == COMPOSITE)
     {
-      if (unlikely (!points_with_deltas->resize (points.length))) return false;
+      assert (old_length == 0);
       *points_with_deltas = points;
     }
 
+    float shift = 0;
     switch (type) {
     case SIMPLE:
       if (depth == 0 && head_maxp_info)
         head_maxp_info->maxPoints = hb_max (head_maxp_info->maxPoints, all_points.length - old_length - 4);
+      shift = phantoms[PHANTOM_LEFT].x;
       break;
     case COMPOSITE:
     {
+      hb_decycler_node_t decycler_node (scratch.decycler);
+
       unsigned int comp_index = 0;
       for (auto &item : get_composite_iterator ())
       {
 	hb_codepoint_t item_gid = item.get_gid ();
 
-        if (unlikely (current_glyphs->has (item_gid)))
+        if (unlikely (!decycler_node.visit (item_gid)))
+	{
+	  comp_index++;
 	  continue;
-
-	current_glyphs->add (item_gid);
+	}
 
 	unsigned old_count = all_points.length;
 
@@ -426,6 +439,7 @@ struct Glyph
 				       .get_points (font,
 						    glyf_accelerator,
 						    all_points,
+						    scratch,
 						    points_with_deltas,
 						    head_maxp_info,
 						    composite_contours,
@@ -433,14 +447,16 @@ struct Glyph
 						    use_my_metrics,
 						    phantom_only,
 						    coords,
-						    current_glyphs,
 						    depth + 1,
 						    edge_count)))
 	{
-	  current_glyphs->del (item_gid);
+	  points.resize (old_length);
 	  return false;
 	}
 
+	// points might have been reallocated. Relocate phantoms.
+	phantoms = points.as_array ().sub_array (points.length - PHANTOM_COUNT, PHANTOM_COUNT);
+
 	auto comp_points = all_points.as_array ().sub_array (old_count);
 
 	/* Copy phantom points from component if USE_MY_METRICS flag set */
@@ -455,7 +471,7 @@ struct Glyph
 	  item.get_transformation (matrix, default_trans);
 
 	  /* Apply component transformation & translation (with deltas applied) */
-	  item.transform_points (comp_points, matrix, points[comp_index]);
+	  item.transform_points (comp_points, matrix, points[old_length + comp_index]);
 	}
 
 	if (item.is_anchored () && !phantom_only)
@@ -476,12 +492,11 @@ struct Glyph
 
 	if (all_points.length > HB_GLYF_MAX_POINTS)
 	{
-	  current_glyphs->del (item_gid);
+	  points.resize (old_length);
 	  return false;
 	}
 
 	comp_index++;
-        current_glyphs->del (item_gid);
       }
 
       if (head_maxp_info && depth == 0)
@@ -492,9 +507,13 @@ struct Glyph
         head_maxp_info->maxComponentElements = hb_max (head_maxp_info->maxComponentElements, comp_index);
       }
       all_points.extend (phantoms);
+      shift = phantoms[PHANTOM_LEFT].x;
+      points.resize (old_length);
     } break;
     case EMPTY:
       all_points.extend (phantoms);
+      shift = phantoms[PHANTOM_LEFT].x;
+      points.resize (old_length);
       break;
     }
 
@@ -503,10 +522,9 @@ struct Glyph
       /* Undocumented rasterizer behavior:
        * Shift points horizontally by the updated left side bearing
        */
-      float v = -phantoms[PHANTOM_LEFT].x;
-      if (v)
+      if (shift)
         for (auto &point : all_points)
-	  point.x += v;
+	  point.x -= shift;
     }
 
     return !all_points.in_error ();
diff --git a/engine/thirdparty/harfbuzz/src/OT/glyf/SimpleGlyph.hh b/engine/thirdparty/harfbuzz/src/OT/glyf/SimpleGlyph.hh
index 1d42cc29..c0f01405 100644
--- a/engine/thirdparty/harfbuzz/src/OT/glyf/SimpleGlyph.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/glyf/SimpleGlyph.hh
@@ -127,19 +127,20 @@ struct SimpleGlyph
 			  hb_array_t<contour_point_t> points_ /* IN/OUT */,
 			  const HBUINT8 *end)
   {
+    auto *points = points_.arrayZ;
     unsigned count = points_.length;
     for (unsigned int i = 0; i < count;)
     {
       if (unlikely (p + 1 > end)) return false;
       uint8_t flag = *p++;
-      points_.arrayZ[i++].flag = flag;
+      points[i++].flag = flag;
       if (flag & FLAG_REPEAT)
       {
 	if (unlikely (p + 1 > end)) return false;
 	unsigned int repeat_count = *p++;
 	unsigned stop = hb_min (i + repeat_count, count);
 	for (; i < stop; i++)
-	  points_.arrayZ[i].flag = flag;
+	  points[i].flag = flag;
       }
     }
     return true;
@@ -160,10 +161,7 @@ struct SimpleGlyph
       if (flag & short_flag)
       {
 	if (unlikely (p + 1 > end)) return false;
-	if (flag & same_flag)
-	  v += *p++;
-	else
-	  v -= *p++;
+	v += (bool(flag & same_flag) * 2 - 1) * *p++;
       }
       else
       {
@@ -190,7 +188,7 @@ struct SimpleGlyph
     unsigned int num_points = endPtsOfContours[num_contours - 1] + 1;
 
     unsigned old_length = points.length;
-    points.alloc (points.length + num_points + 4, true); // Allocate for phantom points, to avoid a possible copy
+    points.alloc (points.length + num_points + 4); // Allocate for phantom points, to avoid a possible copy
     if (unlikely (!points.resize (points.length + num_points, false))) return false;
     auto points_ = points.as_array ().sub_array (old_length);
     if (!phantom_only)
@@ -281,9 +279,9 @@ struct SimpleGlyph
     unsigned num_points = all_points.length - 4;
 
     hb_vector_t<uint8_t> flags, x_coords, y_coords;
-    if (unlikely (!flags.alloc (num_points, true))) return false;
-    if (unlikely (!x_coords.alloc (2*num_points, true))) return false;
-    if (unlikely (!y_coords.alloc (2*num_points, true))) return false;
+    if (unlikely (!flags.alloc_exact (num_points))) return false;
+    if (unlikely (!x_coords.alloc_exact (2*num_points))) return false;
+    if (unlikely (!y_coords.alloc_exact (2*num_points))) return false;
 
     unsigned lastflag = 255, repeat = 0;
     int prev_x = 0, prev_y = 0;
diff --git a/engine/thirdparty/harfbuzz/src/OT/glyf/glyf.hh b/engine/thirdparty/harfbuzz/src/OT/glyf/glyf.hh
index f346ae05..fe4ae7b8 100644
--- a/engine/thirdparty/harfbuzz/src/OT/glyf/glyf.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/glyf/glyf.hh
@@ -94,7 +94,7 @@ struct glyf
     }
 
     hb_vector_t<unsigned> padded_offsets;
-    if (unlikely (!padded_offsets.alloc (c->plan->new_to_old_gid_list.length, true)))
+    if (unlikely (!padded_offsets.alloc_exact (c->plan->new_to_old_gid_list.length)))
       return_trace (false);
 
     hb_vector_t<glyf_impl::SubsetGlyph> glyphs;
@@ -172,6 +172,9 @@ struct glyf_accelerator_t
     glyf_table = nullptr;
 #ifndef HB_NO_VAR
     gvar = nullptr;
+#ifndef HB_NO_BEYOND_64K
+    GVAR = nullptr;
+#endif
 #endif
     hmtx = nullptr;
 #ifndef HB_NO_VERTICAL
@@ -187,6 +190,9 @@ struct glyf_accelerator_t
     glyf_table = hb_sanitize_context_t ().reference_table<glyf> (face);
 #ifndef HB_NO_VAR
     gvar = face->table.gvar;
+#ifndef HB_NO_BEYOND_64K
+    GVAR = face->table.GVAR;
+#endif
 #endif
     hmtx = face->table.hmtx;
 #ifndef HB_NO_VERTICAL
@@ -198,6 +204,13 @@ struct glyf_accelerator_t
   }
   ~glyf_accelerator_t ()
   {
+    auto *scratch = cached_scratch.get_relaxed ();
+    if (scratch)
+    {
+      scratch->~hb_glyf_scratch_t ();
+      hb_free (scratch);
+    }
+
     glyf_table.destroy ();
   }
 
@@ -206,21 +219,16 @@ struct glyf_accelerator_t
   protected:
   template<typename T>
   bool get_points (hb_font_t *font, hb_codepoint_t gid, T consumer,
-		   hb_array_t<const int> coords = hb_array_t<const int> ()) const
+		   hb_array_t<const int> coords,
+		   hb_glyf_scratch_t &scratch) const
   {
-    if (!coords)
-      coords = hb_array (font->coords, font->num_coords);
-
     if (gid >= num_glyphs) return false;
 
-    /* Making this allocfree is not that easy
-       https://github.com/harfbuzz/harfbuzz/issues/2095
-       mostly because of gvar handling in VF fonts,
-       perhaps a separate path for non-VF fonts can be considered */
-    contour_point_vector_t all_points;
+    auto &all_points = scratch.all_points;
+    all_points.resize (0);
 
     bool phantom_only = !consumer.is_consuming_contour_points ();
-    if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, nullptr, nullptr, nullptr, true, true, phantom_only, coords)))
+    if (unlikely (!glyph_for_gid (gid).get_points (font, *this, all_points, scratch, nullptr, nullptr, nullptr, true, true, phantom_only, coords)))
       return false;
 
     unsigned count = all_points.length;
@@ -229,8 +237,61 @@ struct glyf_accelerator_t
 
     if (consumer.is_consuming_contour_points ())
     {
-      for (auto &point : all_points.as_array ().sub_array (0, count))
-	consumer.consume_point (point);
+      auto *points = all_points.arrayZ;
+
+      if (false)
+      {
+	/* Our path-builder was designed to work with this simple loop.
+	 * But FreeType and CoreText do it differently, so we match those
+	 * with the other, more complicated, code branch below. */
+	for (unsigned i = 0; i < count; i++)
+	{
+	  consumer.consume_point (points[i]);
+	  if (points[i].is_end_point)
+	    consumer.contour_end ();
+	}
+      }
+      else
+      {
+	for (unsigned i = 0; i < count; i++)
+	{
+	  // Start of a contour.
+	  if (points[i].flag & glyf_impl::SimpleGlyph::FLAG_ON_CURVE)
+	  {
+	    // First point is on-curve. Draw the contour.
+	    for (; i < count; i++)
+	    {
+	      consumer.consume_point (points[i]);
+	      if (points[i].is_end_point)
+	      {
+		consumer.contour_end ();
+		break;
+	      }
+	    }
+	  }
+	  else
+	  {
+	    unsigned start = i;
+
+	    // Find end of the contour.
+	    for (; i < count; i++)
+	      if (points[i].is_end_point)
+		break;
+
+	    unsigned end = i;
+
+	    // Enough to start from the end. Our path-builder takes care of the rest.
+	    if (likely (end < count)) // Can only fail in case of alloc failure *maybe*.
+	      consumer.consume_point (points[end]);
+
+	    for (i = start; i < end; i++)
+	      consumer.consume_point (points[i]);
+
+	    consumer.contour_end ();
+	  }
+	}
+      }
+
       consumer.points_end ();
     }
 
@@ -303,6 +364,7 @@ struct glyf_accelerator_t
 
     HB_ALWAYS_INLINE
     void consume_point (const contour_point_t &point) { bounds.add (point); }
+    void contour_end () {}
     void points_end () { bounds.get_extents (font, extents, scaled); }
 
     bool is_consuming_contour_points () { return extents; }
@@ -318,7 +380,12 @@ struct glyf_accelerator_t
 
     contour_point_t phantoms[glyf_impl::PHANTOM_COUNT];
     if (font->num_coords)
-      success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms, false));
+    {
+      hb_glyf_scratch_t scratch;
+      success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms, false),
+			    hb_array (font->coords, font->num_coords),
+			    scratch);
+    }
 
     if (unlikely (!success))
       return
@@ -338,9 +405,11 @@ struct glyf_accelerator_t
     if (unlikely (gid >= num_glyphs)) return false;
 
     hb_glyph_extents_t extents;
-
+    hb_glyf_scratch_t scratch;
     contour_point_t phantoms[glyf_impl::PHANTOM_COUNT];
-    if (unlikely (!get_points (font, gid, points_aggregator_t (font, &extents, phantoms, false))))
+    if (unlikely (!get_points (font, gid, points_aggregator_t (font, &extents, phantoms, false),
+			       hb_array (font->coords, font->num_coords),
+			       scratch)))
       return false;
 
     *lsb = is_vertical
@@ -366,20 +435,16 @@ struct glyf_accelerator_t
 
 #ifndef HB_NO_VAR
     if (font->num_coords)
-      return get_points (font, gid, points_aggregator_t (font, extents, nullptr, true));
+    {
+      hb_glyf_scratch_t scratch;
+      return get_points (font, gid, points_aggregator_t (font, extents, nullptr, true),
+			 hb_array (font->coords, font->num_coords),
+			 scratch);
+    }
 #endif
     return glyph_for_gid (gid).get_extents_without_var_scaled (font, *this, extents);
   }
 
-  bool paint_glyph (hb_font_t *font, hb_codepoint_t gid, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const
-  {
-    funcs->push_clip_glyph (data, gid, font);
-    funcs->color (data, true, foreground);
-    funcs->pop_clip (data);
-
-    return true;
-  }
-
   const glyf_impl::Glyph
   glyph_for_gid (hb_codepoint_t gid, bool needs_padding_removal = false) const
   {
@@ -410,15 +475,52 @@ struct glyf_accelerator_t
 
   bool
   get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const
-  { return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session)); }
+  {
+    if (!has_data ()) return false;
+
+    hb_glyf_scratch_t *scratch;
+
+    // Borrow the cached strach buffer.
+    {
+      scratch = cached_scratch.get_acquire ();
+      if (!scratch || unlikely (!cached_scratch.cmpexch (scratch, nullptr)))
+      {
+	scratch = (hb_glyf_scratch_t *) hb_calloc (1, sizeof (hb_glyf_scratch_t));
+	if (unlikely (!scratch))
+	  return true;
+      }
+    }
+
+    bool ret = get_points (font, gid, glyf_impl::path_builder_t (font, draw_session),
+			   hb_array (font->coords, font->num_coords),
+			   *scratch);
+
+    // Put it back.
+    if (!cached_scratch.cmpexch (nullptr, scratch))
+    {
+      scratch->~hb_glyf_scratch_t ();
+      hb_free (scratch);
+    }
+
+    return ret;
+  }
 
   bool
   get_path_at (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session,
-	       hb_array_t<const int> coords) const
-  { return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session), coords); }
+	       hb_array_t<const int> coords,
+	       hb_glyf_scratch_t &scratch) const
+  {
+    if (!has_data ()) return false;
+    return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session),
+		       coords,
+		       scratch);
+  }
 
 #ifndef HB_NO_VAR
   const gvar_accelerator_t *gvar;
+#ifndef HB_NO_BEYOND_64K
+  const GVAR_accelerator_t *GVAR;
+#endif
 #endif
   const hmtx_accelerator_t *hmtx;
 #ifndef HB_NO_VERTICAL
@@ -430,6 +532,7 @@ struct glyf_accelerator_t
   unsigned int num_glyphs;
   hb_blob_ptr_t<loca> loca_table;
   hb_blob_ptr_t<glyf> glyf_table;
+  hb_atomic_ptr_t<hb_glyf_scratch_t> cached_scratch;
 };
 
 
@@ -439,7 +542,7 @@ glyf::_populate_subset_glyphs (const hb_subset_plan_t   *plan,
 			       hb_vector_t<glyf_impl::SubsetGlyph>& glyphs /* OUT */) const
 {
   OT::glyf_accelerator_t glyf (plan->source);
-  if (!glyphs.alloc (plan->new_to_old_gid_list.length, true)) return false;
+  if (!glyphs.alloc_exact (plan->new_to_old_gid_list.length)) return false;
 
   for (const auto &pair : plan->new_to_old_gid_list)
   {
diff --git a/engine/thirdparty/harfbuzz/src/OT/glyf/path-builder.hh b/engine/thirdparty/harfbuzz/src/OT/glyf/path-builder.hh
index f5505245..859cd577 100644
--- a/engine/thirdparty/harfbuzz/src/OT/glyf/path-builder.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/glyf/path-builder.hh
@@ -42,7 +42,7 @@ struct path_builder_t
   {
     bool is_on_curve = point.flag & glyf_impl::SimpleGlyph::FLAG_ON_CURVE;
 #ifdef HB_NO_CUBIC_GLYF
-    bool is_cubic = false;
+    constexpr bool is_cubic = false;
 #else
     bool is_cubic = !is_on_curve && (point.flag & glyf_impl::SimpleGlyph::FLAG_CUBIC);
 #endif
@@ -124,58 +124,60 @@ struct path_builder_t
       }
     }
 
-    if (unlikely (point.is_end_point))
-    {
-      if (first_offcurve && last_offcurve)
-      {
-	optional_point_t mid = last_offcurve.mid (first_offcurve2 ?
-						  first_offcurve2 :
-						  first_offcurve);
-	if (last_offcurve2)
-	  draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
-				  last_offcurve.x, last_offcurve.y,
-				  mid.x, mid.y);
-	else
-	  draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
-				     mid.x, mid.y);
-	last_offcurve = optional_point_t ();
-      }
-      /* now check the rest */
-
-      if (first_offcurve && first_oncurve)
-      {
-        if (first_offcurve2)
-	  draw_session->cubic_to (first_offcurve2.x, first_offcurve2.y,
-				  first_offcurve.x, first_offcurve.y,
-				  first_oncurve.x, first_oncurve.y);
-	else
-	  draw_session->quadratic_to (first_offcurve.x, first_offcurve.y,
-				     first_oncurve.x, first_oncurve.y);
-      }
-      else if (last_offcurve && first_oncurve)
-      {
-	if (last_offcurve2)
-	  draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
-				  last_offcurve.x, last_offcurve.y,
-				  first_oncurve.x, first_oncurve.y);
-	else
-	  draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
-				     first_oncurve.x, first_oncurve.y);
-      }
-      else if (first_oncurve)
-	draw_session->line_to (first_oncurve.x, first_oncurve.y);
-      else if (first_offcurve)
-      {
-	float x = first_offcurve.x, y = first_offcurve.y;
-	draw_session->move_to (x, y);
-	draw_session->quadratic_to (x, y, x, y);
-      }
-
-      /* Getting ready for the next contour */
-      first_oncurve = first_offcurve = last_offcurve = last_offcurve2 = optional_point_t ();
-      draw_session->close_path ();
-    }
   }
+
+  void contour_end ()
+  {
+    if (first_offcurve && last_offcurve)
+    {
+      optional_point_t mid = last_offcurve.mid (first_offcurve2 ?
+						first_offcurve2 :
+						first_offcurve);
+      if (last_offcurve2)
+	draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
+				last_offcurve.x, last_offcurve.y,
+				mid.x, mid.y);
+      else
+	draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
+				   mid.x, mid.y);
+      last_offcurve = optional_point_t ();
+    }
+    /* now check the rest */
+
+    if (first_offcurve && first_oncurve)
+    {
+      if (first_offcurve2)
+	draw_session->cubic_to (first_offcurve2.x, first_offcurve2.y,
+				first_offcurve.x, first_offcurve.y,
+				first_oncurve.x, first_oncurve.y);
+      else
+	draw_session->quadratic_to (first_offcurve.x, first_offcurve.y,
+				   first_oncurve.x, first_oncurve.y);
+    }
+    else if (last_offcurve && first_oncurve)
+    {
+      if (last_offcurve2)
+	draw_session->cubic_to (last_offcurve2.x, last_offcurve2.y,
+				last_offcurve.x, last_offcurve.y,
+				first_oncurve.x, first_oncurve.y);
+      else
+	draw_session->quadratic_to (last_offcurve.x, last_offcurve.y,
+				   first_oncurve.x, first_oncurve.y);
+    }
+    else if (first_oncurve)
+      draw_session->line_to (first_oncurve.x, first_oncurve.y);
+    else if (first_offcurve)
+    {
+      float x = first_offcurve.x, y = first_offcurve.y;
+      draw_session->move_to (x, y);
+      draw_session->quadratic_to (x, y, x, y);
+    }
+
+    /* Getting ready for the next contour */
+    first_oncurve = first_offcurve = last_offcurve = last_offcurve2 = optional_point_t ();
+    draw_session->close_path ();
+  }
+
   void points_end () {}
 
   bool is_consuming_contour_points () { return true; }
diff --git a/engine/thirdparty/harfbuzz/src/OT/name/name.hh b/engine/thirdparty/harfbuzz/src/OT/name/name.hh
index e2a25d4a..33de82d3 100644
--- a/engine/thirdparty/harfbuzz/src/OT/name/name.hh
+++ b/engine/thirdparty/harfbuzz/src/OT/name/name.hh
@@ -163,7 +163,7 @@ struct NameRecord
       if (platformID != 1)
       {
         unsigned text_size = hb_ot_name_convert_utf<hb_utf8_t, hb_utf16_be_t> (*name_bytes, nullptr, nullptr);
-  
+
         text_size++; // needs to consider NULL terminator for use in hb_ot_name_convert_utf()
         unsigned byte_len = text_size * hb_utf16_be_t::codepoint_t::static_size;
         name_str_utf16_be = (char *) hb_calloc (byte_len, 1);
@@ -174,14 +174,14 @@ struct NameRecord
         }
         hb_ot_name_convert_utf<hb_utf8_t, hb_utf16_be_t> (*name_bytes, &text_size,
                                                           (hb_utf16_be_t::codepoint_t *) name_str_utf16_be);
-  
+
         unsigned encoded_byte_len = text_size * hb_utf16_be_t::codepoint_t::static_size;
         if (!encoded_byte_len || !c->check_assign (out->length, encoded_byte_len, HB_SERIALIZE_ERROR_INT_OVERFLOW)) {
           c->revert (snap);
           hb_free (name_str_utf16_be);
           return_trace (nullptr);
         }
-  
+
         encoded_bytes = hb_bytes_t (name_str_utf16_be, encoded_byte_len);
       }
       else
@@ -392,7 +392,7 @@ struct name
     const hb_hashmap_t<hb_ot_name_record_ids_t, hb_bytes_t> *name_table_overrides =
         &c->plan->name_table_overrides;
 #endif
-    
+
     auto it =
     + nameRecordZ.as_array (count)
     | hb_filter (c->plan->name_ids, &NameRecord::nameID)
@@ -485,7 +485,7 @@ struct name
       const hb_array_t<const NameRecord> all_names (this->table->nameRecordZ.arrayZ,
 						    this->table->count);
 
-      this->names.alloc (all_names.length, true);
+      this->names.alloc_exact (all_names.length);
 
       for (unsigned int i = 0; i < all_names.length; i++)
       {
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh b/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh
index 2ea86a2a..d2626b45 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout-common.hh
@@ -30,6 +30,10 @@
 #include "hb-aat-layout.hh"
 #include "hb-aat-map.hh"
 #include "hb-open-type.hh"
+#include "hb-cache.hh"
+#include "hb-bit-set.hh"
+#include "hb-bit-page.hh"
+
 
 namespace OT {
 struct GDEF;
@@ -39,10 +43,11 @@ namespace AAT {
 
 using namespace OT;
 
-#define HB_AAT_BUFFER_DIGEST_THRESHOLD 32
-
 struct ankr;
 
+using hb_aat_class_cache_t = hb_cache_t<15, 8, 7>;
+static_assert (sizeof (hb_aat_class_cache_t) == 256, "");
+
 struct hb_aat_apply_context_t :
        hb_dispatch_context_t<hb_aat_apply_context_t, bool, HB_DEBUG_APPLY>
 {
@@ -61,10 +66,12 @@ struct hb_aat_apply_context_t :
   const ankr *ankr_table;
   const OT::GDEF *gdef_table;
   const hb_sorted_vector_t<hb_aat_map_t::range_flags_t> *range_flags = nullptr;
-  hb_set_digest_t buffer_digest = hb_set_digest_t::full ();
-  hb_set_digest_t machine_glyph_set = hb_set_digest_t::full ();
-  hb_set_digest_t left_set = hb_set_digest_t::full ();
-  hb_set_digest_t right_set = hb_set_digest_t::full ();
+  bool using_buffer_glyph_set = false;
+  hb_bit_set_t buffer_glyph_set;
+  const hb_bit_set_t *left_set = nullptr;
+  const hb_bit_set_t *right_set = nullptr;
+  const hb_bit_set_t *machine_glyph_set = nullptr;
+  hb_aat_class_cache_t *machine_class_cache = nullptr;
   hb_mask_t subtable_flags = 0;
 
   /* Unused. For debug tracing only. */
@@ -80,6 +87,25 @@ struct hb_aat_apply_context_t :
   HB_INTERNAL void set_ankr_table (const AAT::ankr *ankr_table_);
 
   void set_lookup_index (unsigned int i) { lookup_index = i; }
+
+  void setup_buffer_glyph_set ()
+  {
+    using_buffer_glyph_set = buffer->len >= 4;
+
+    if (using_buffer_glyph_set)
+      buffer->collect_codepoints (buffer_glyph_set);
+  }
+  bool buffer_intersects_machine () const
+  {
+    if (using_buffer_glyph_set)
+      return buffer_glyph_set.intersects (*machine_glyph_set);
+
+    // Faster for shorter buffers.
+    for (unsigned i = 0; i < buffer->len; i++)
+      if (machine_glyph_set->has (buffer->info[i].codepoint))
+	return true;
+    return false;
+  }
 };
 
 
@@ -108,6 +134,13 @@ struct LookupFormat0
   {
     glyphs.add_range (0, num_glyphs - 1);
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
+  {
+    for (unsigned i = 0; i < num_glyphs; i++)
+      if (filter (arrayZ[i]))
+	glyphs.add (i);
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -140,8 +173,13 @@ struct LookupSegmentSingle
   template <typename set_t>
   void collect_glyphs (set_t &glyphs) const
   {
-    if (first == DELETED_GLYPH)
-      return;
+    if (first == DELETED_GLYPH) return;
+    glyphs.add_range (first, last);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    if (!filter (value)) return;
     glyphs.add_range (first, last);
   }
 
@@ -182,6 +220,13 @@ struct LookupFormat2
     for (unsigned int i = 0; i < count; i++)
       segments[i].collect_glyphs (glyphs);
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    unsigned count = segments.get_length ();
+    for (unsigned int i = 0; i < count; i++)
+      segments[i].collect_glyphs_filtered (glyphs, filter);
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -217,10 +262,17 @@ struct LookupSegmentArray
   template <typename set_t>
   void collect_glyphs (set_t &glyphs) const
   {
-    if (first == DELETED_GLYPH)
-      return;
+    if (first == DELETED_GLYPH) return;
     glyphs.add_range (first, last);
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const void *base, const filter_t &filter) const
+  {
+    const auto &values = base+valuesZ;
+    for (hb_codepoint_t i = first; i <= last; i++)
+      if (filter (values[i - first]))
+	glyphs.add (i);
+  }
 
   int cmp (hb_codepoint_t g) const
   { return g < first ? -1 : g <= last ? 0 : +1; }
@@ -271,6 +323,13 @@ struct LookupFormat4
     for (unsigned i = 0; i < count; i++)
       segments[i].collect_glyphs (glyphs);
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    unsigned count = segments.get_length ();
+    for (unsigned i = 0; i < count; i++)
+      segments[i].collect_glyphs_filtered (glyphs, this, filter);
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -303,8 +362,13 @@ struct LookupSingle
   template <typename set_t>
   void collect_glyphs (set_t &glyphs) const
   {
-    if (glyph == DELETED_GLYPH)
-      return;
+    if (glyph == DELETED_GLYPH) return;
+    glyphs.add (glyph);
+  }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    if (!filter (value)) return;
     glyphs.add (glyph);
   }
 
@@ -344,6 +408,13 @@ struct LookupFormat6
     for (unsigned i = 0; i < count; i++)
       entries[i].collect_glyphs (glyphs);
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    unsigned count = entries.get_length ();
+    for (unsigned i = 0; i < count; i++)
+      entries[i].collect_glyphs_filtered (glyphs, filter);
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -379,12 +450,20 @@ struct LookupFormat8
   template <typename set_t>
   void collect_glyphs (set_t &glyphs) const
   {
-    if (unlikely (!glyphCount))
-      return;
-    if (firstGlyph == DELETED_GLYPH)
-      return;
+    if (unlikely (!glyphCount)) return;
+    if (firstGlyph == DELETED_GLYPH) return;
     glyphs.add_range (firstGlyph, firstGlyph + glyphCount - 1);
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, const filter_t &filter) const
+  {
+    if (unlikely (!glyphCount)) return;
+    if (firstGlyph == DELETED_GLYPH) return;
+    const T *p = valueArrayZ.arrayZ;
+    for (unsigned i = 0; i < glyphCount; i++)
+      if (filter (p[i]))
+	glyphs.add (firstGlyph + i);
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -433,10 +512,8 @@ struct LookupFormat10
   template <typename set_t>
   void collect_glyphs (set_t &glyphs) const
   {
-    if (unlikely (!glyphCount))
-      return;
-    if (firstGlyph == DELETED_GLYPH)
-      return;
+    if (unlikely (!glyphCount)) return;
+    if (firstGlyph == DELETED_GLYPH) return;
     glyphs.add_range (firstGlyph, firstGlyph + glyphCount - 1);
   }
 
@@ -501,6 +578,18 @@ struct Lookup
     default:return;
     }
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
+  {
+    switch (u.format) {
+    case 0: hb_barrier (); u.format0.collect_glyphs_filtered (glyphs, num_glyphs, filter); return;
+    case 2: hb_barrier (); u.format2.collect_glyphs_filtered (glyphs, filter); return;
+    case 4: hb_barrier (); u.format4.collect_glyphs_filtered (glyphs, filter); return;
+    case 6: hb_barrier (); u.format6.collect_glyphs_filtered (glyphs, filter); return;
+    case 8: hb_barrier (); u.format8.collect_glyphs_filtered (glyphs, filter); return;
+    default:return;
+    }
+  }
 
   typename T::type get_class (hb_codepoint_t glyph_id,
 			      unsigned int num_glyphs,
@@ -563,7 +652,7 @@ DECLARE_NULL_NAMESPACE_BYTES_TEMPLATE1 (AAT, Lookup, 2);
 template <typename T>
 struct Entry
 {
-  // This does seem like it's ever called.
+  // This doesn't seem like it's ever called.
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -632,18 +721,47 @@ struct StateTable
   {
     (this+classTable).collect_glyphs (glyphs, num_glyphs);
   }
+  template <typename set_t, typename table_t>
+  void collect_initial_glyphs (set_t &glyphs, unsigned num_glyphs, const table_t &table) const
+  {
+    unsigned num_classes = nClasses;
+
+    if (unlikely (num_classes > hb_bit_page_t::BITS))
+    {
+      (this+classTable).collect_glyphs (glyphs, num_glyphs);
+      return;
+    }
+
+    // Collect all classes going out from the start state.
+    hb_bit_page_t filter;
+
+    for (unsigned i = 0; i < num_classes; i++)
+    {
+      const auto &entry = get_entry (STATE_START_OF_TEXT, i);
+      if (new_state (entry.newState) == STATE_START_OF_TEXT &&
+	  !table.is_action_initiable (entry) && !table.is_actionable (entry))
+	continue;
+
+      filter.add (i);
+    }
+
+    // And glyphs in those classes.
+    (this+classTable).collect_glyphs_filtered (glyphs, num_glyphs, filter);
+  }
 
   int new_state (unsigned int newState) const
   { return Types::extended ? newState : ((int) newState - (int) stateArrayTable) / (int) nClasses; }
 
-  template <typename set_t>
   unsigned int get_class (hb_codepoint_t glyph_id,
 			  unsigned int num_glyphs,
-			  const set_t &glyphs) const
+			  hb_aat_class_cache_t *cache = nullptr) const
   {
+    unsigned klass;
+    if (cache && cache->get (glyph_id, &klass)) return klass;
     if (unlikely (glyph_id == DELETED_GLYPH)) return CLASS_DELETED_GLYPH;
-    if (!glyphs[glyph_id]) return CLASS_OUT_OF_BOUNDS;
-    return (this+classTable).get_class (glyph_id, num_glyphs, CLASS_OUT_OF_BOUNDS);
+    klass = (this+classTable).get_class (glyph_id, num_glyphs, CLASS_OUT_OF_BOUNDS);
+    if (cache) cache->set (glyph_id, klass);
+    return klass;
   }
 
   const Entry<Extra> *get_entries () const
@@ -651,13 +769,14 @@ struct StateTable
 
   const Entry<Extra> &get_entry (int state, unsigned int klass) const
   {
-    if (unlikely (klass >= nClasses))
+    unsigned n_classes = nClasses;
+    if (unlikely (klass >= n_classes))
       klass = CLASS_OUT_OF_BOUNDS;
 
     const HBUSHORT *states = (this+stateArrayTable).arrayZ;
     const Entry<Extra> *entries = (this+entryTable).arrayZ;
 
-    unsigned int entry = states[state * nClasses + klass];
+    unsigned int entry = states[state * n_classes + klass];
     DEBUG_MSG (APPLY, nullptr, "e%u", entry);
 
     return entries[entry];
@@ -803,6 +922,13 @@ struct ClassTable
       if (classArray.arrayZ[i] != CLASS_OUT_OF_BOUNDS)
 	glyphs.add (firstGlyph + i);
   }
+  template <typename set_t, typename filter_t>
+  void collect_glyphs_filtered (set_t &glyphs, unsigned num_glyphs, const filter_t &filter) const
+  {
+    for (unsigned i = 0; i < classArray.len; i++)
+      if (filter (classArray.arrayZ[i]))
+	glyphs.add (firstGlyph + i);
+  }
 
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -918,7 +1044,7 @@ struct ExtendedTypes
   }
 };
 
-template <typename Types, typename EntryData>
+template <typename Types, typename EntryData, typename Flags>
 struct StateTableDriver
 {
   using StateTableT = StateTable<Types, EntryData>;
@@ -929,14 +1055,6 @@ struct StateTableDriver
 	      machine (machine_),
 	      num_glyphs (face_->get_num_glyphs ()) {}
 
-  template <typename context_t>
-  bool is_idempotent_on_all_out_of_bounds (context_t *c, hb_aat_apply_context_t *ac)
-  {
-    const auto entry = machine.get_entry (StateTableT::STATE_START_OF_TEXT, CLASS_OUT_OF_BOUNDS);
-    return !c->is_actionable (ac->buffer, this, entry) &&
-	    machine.new_state (entry.newState) == StateTableT::STATE_START_OF_TEXT;
-  }
-
   template <typename context_t>
   void drive (context_t *c, hb_aat_apply_context_t *ac)
   {
@@ -977,7 +1095,7 @@ struct StateTableDriver
       }
 
       unsigned int klass = likely (buffer->idx < buffer->len) ?
-			   machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_glyph_set) :
+			   machine.get_class (buffer->cur().codepoint, num_glyphs, ac->machine_class_cache) :
 			   (unsigned) CLASS_END_OF_TEXT;
       DEBUG_MSG (APPLY, nullptr, "c%u at %u", klass, buffer->idx);
       const EntryT &entry = machine.get_entry (state, klass);
@@ -1011,41 +1129,36 @@ struct StateTableDriver
        *
        *   https://github.com/harfbuzz/harfbuzz/issues/2860
        */
-
-      const auto is_safe_to_break_extra = [&]()
-      {
-          /* 2c. */
-          const auto &wouldbe_entry = machine.get_entry(StateTableT::STATE_START_OF_TEXT, klass);
-
-          /* 2c'. */
-          if (c->is_actionable (buffer, this, wouldbe_entry))
-	    return false;
-
-          /* 2c". */
-          return next_state == machine.new_state(wouldbe_entry.newState)
-              && (entry.flags & context_t::DontAdvance) == (wouldbe_entry.flags & context_t::DontAdvance);
-      };
-
-      const auto is_safe_to_break = [&]()
-      {
+      const EntryT *wouldbe_entry;
+      bool is_safe_to_break =
+      (
           /* 1. */
-          if (c->is_actionable (buffer, this, entry))
-              return false;
+          !c->table->is_actionable (entry) &&
 
           /* 2. */
           // This one is meh, I know...
-          const auto ok =
+	  (
                  state == StateTableT::STATE_START_OF_TEXT
-              || ((entry.flags & context_t::DontAdvance) && next_state == StateTableT::STATE_START_OF_TEXT)
-              || is_safe_to_break_extra();
-          if (!ok)
-              return false;
+              || ((entry.flags & Flags::DontAdvance) && next_state == StateTableT::STATE_START_OF_TEXT)
+              || (
+		    /* 2c. */
+		    wouldbe_entry = &machine.get_entry(StateTableT::STATE_START_OF_TEXT, klass)
+		    ,
+		    /* 2c'. */
+		    !c->table->is_actionable (*wouldbe_entry) &&
+		    /* 2c". */
+		    (
+		      next_state == machine.new_state(wouldbe_entry->newState) &&
+		      (entry.flags & Flags::DontAdvance) == (wouldbe_entry->flags & Flags::DontAdvance)
+		    )
+		 )
+	  ) &&
 
           /* 3. */
-          return !c->is_actionable (buffer, this, machine.get_entry (state, CLASS_END_OF_TEXT));
-      };
+          !c->table->is_actionable (machine.get_entry (state, CLASS_END_OF_TEXT))
+      );
 
-      if (!is_safe_to_break () && buffer->backtrack_len () && buffer->idx < buffer->len)
+      if (!is_safe_to_break && buffer->backtrack_len () && buffer->idx < buffer->len)
 	buffer->unsafe_to_break_from_outbuffer (buffer->backtrack_len () - 1, buffer->idx + 1);
 
       c->transition (buffer, this, entry);
@@ -1056,7 +1169,7 @@ struct StateTableDriver
       if (buffer->idx == buffer->len || unlikely (!buffer->successful))
 	break;
 
-      if (!(entry.flags & context_t::DontAdvance) || buffer->max_ops-- <= 0)
+      if (!(entry.flags & Flags::DontAdvance) || buffer->max_ops-- <= 0)
 	(void) buffer->next_glyph ();
     }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout-kerx-table.hh b/engine/thirdparty/harfbuzz/src/hb-aat-layout-kerx-table.hh
index c01c31d7..4b980ca8 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout-kerx-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout-kerx-table.hh
@@ -112,10 +112,6 @@ struct KerxSubTableFormat0
     if (header.coverage & header.Backwards)
       return_trace (false);
 
-    if (!(c->buffer_digest.may_have (c->left_set) &&
-	  c->buffer_digest.may_have (c->right_set)))
-      return_trace (false);
-
     accelerator_t accel (*this, c);
     hb_kern_machine_t<accelerator_t> machine (accel, header.coverage & header.CrossStream);
     machine.kern (c->font, c->buffer, c->plan->kern_mask);
@@ -144,7 +140,7 @@ struct KerxSubTableFormat0
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     {
-      if (!c->left_set[left] || !c->right_set[right]) return 0;
+      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
       return table.get_kerning (left, right, c);
     }
   };
@@ -211,6 +207,9 @@ struct Format1Entry<false>
 
   typedef void EntryData;
 
+  static bool initiateAction (const Entry<EntryData> &entry)
+  { return entry.flags & Push; }
+
   static bool performAction (const Entry<EntryData> &entry)
   { return entry.flags & Offset; }
 
@@ -227,13 +226,23 @@ struct KerxSubTableFormat1
   typedef Format1Entry<Types::extended> Format1EntryT;
   typedef typename Format1EntryT::EntryData EntryData;
 
+  enum Flags
+  {
+    DontAdvance	= Format1EntryT::DontAdvance,
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return Format1EntryT::initiateAction (entry);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return Format1EntryT::performAction (entry);
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = true;
-    enum
-    {
-      DontAdvance	= Format1EntryT::DontAdvance,
-    };
 
     driver_context_t (const KerxSubTableFormat1 *table_,
 		      hb_aat_apply_context_t *c_) :
@@ -246,12 +255,8 @@ struct KerxSubTableFormat1
 	depth (0),
 	crossStream (table->header.coverage & table->header.CrossStream) {}
 
-    bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
-			StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-			const Entry<EntryData> &entry)
-    { return Format1EntryT::performAction (entry); }
     void transition (hb_buffer_t *buffer,
-		     StateTableDriver<Types, EntryData> *driver,
+		     StateTableDriver<Types, EntryData, Flags> *driver,
 		     const Entry<EntryData> &entry)
     {
       unsigned int flags = entry.flags;
@@ -351,9 +356,10 @@ struct KerxSubTableFormat1
       }
     }
 
-    private:
+    public:
     hb_aat_apply_context_t *c;
     const KerxSubTableFormat1 *table;
+    private:
     const UnsizedArrayOf<FWORD> &kernAction;
     unsigned int stack[8];
     unsigned int depth;
@@ -370,12 +376,7 @@ struct KerxSubTableFormat1
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->font->face);
-
-    if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) &&
-	!(c->buffer_digest.may_have (c->left_set) &&
-	  c->buffer_digest.may_have (c->right_set)))
-      return_trace (false);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->font->face);
 
     driver.drive (&dc, c);
 
@@ -440,10 +441,6 @@ struct KerxSubTableFormat2
     if (header.coverage & header.Backwards)
       return_trace (false);
 
-    if (!(c->buffer_digest.may_have (c->left_set) &&
-	  c->buffer_digest.may_have (c->right_set)))
-      return_trace (false);
-
     accelerator_t accel (*this, c);
     hb_kern_machine_t<accelerator_t> machine (accel, header.coverage & header.CrossStream);
     machine.kern (c->font, c->buffer, c->plan->kern_mask);
@@ -469,7 +466,7 @@ struct KerxSubTableFormat2
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     {
-      if (!c->left_set[left] || !c->right_set[right]) return 0;
+      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
       return table.get_kerning (left, right, c);
     }
   };
@@ -513,17 +510,26 @@ struct KerxSubTableFormat4
     DEFINE_SIZE_STATIC (2);
   };
 
+  enum Flags
+  {
+    Mark		= 0x8000,	/* If set, remember this glyph as the marked glyph. */
+    DontAdvance		= 0x4000,	/* If set, don't advance to the next glyph before
+					 * going to the new state. */
+    Reserved		= 0x3FFF,	/* Not used; set to 0. */
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & Mark);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return entry.data.ankrActionIndex != 0xFFFF;
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = true;
-    enum Flags
-    {
-      Mark		= 0x8000,	/* If set, remember this glyph as the marked glyph. */
-      DontAdvance	= 0x4000,	/* If set, don't advance to the next glyph before
-					 * going to the new state. */
-      Reserved		= 0x3FFF,	/* Not used; set to 0. */
-    };
-
     enum SubTableFlags
     {
       ActionType	= 0xC0000000,	/* A two-bit field containing the action type. */
@@ -533,20 +539,17 @@ struct KerxSubTableFormat4
 					 * point table. */
     };
 
-    driver_context_t (const KerxSubTableFormat4 *table,
+    driver_context_t (const KerxSubTableFormat4 *table_,
 		      hb_aat_apply_context_t *c_) :
 	c (c_),
+	table (table_),
 	action_type ((table->flags & ActionType) >> 30),
 	ankrData ((HBUINT16 *) ((const char *) &table->machine + (table->flags & Offset))),
 	mark_set (false),
 	mark (0) {}
 
-    bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
-			StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-			const Entry<EntryData> &entry)
-    { return entry.data.ankrActionIndex != 0xFFFF; }
     void transition (hb_buffer_t *buffer,
-		     StateTableDriver<Types, EntryData> *driver,
+		     StateTableDriver<Types, EntryData, Flags> *driver,
 		     const Entry<EntryData> &entry)
     {
       if (mark_set && entry.data.ankrActionIndex != 0xFFFF && buffer->idx < buffer->len)
@@ -634,8 +637,10 @@ struct KerxSubTableFormat4
       }
     }
 
-    private:
+    public:
     hb_aat_apply_context_t *c;
+    const KerxSubTableFormat4 *table;
+    private:
     unsigned int action_type;
     const HBUINT16 *ankrData;
     bool mark_set;
@@ -648,12 +653,7 @@ struct KerxSubTableFormat4
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->font->face);
-
-    if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) &&
-	!(c->buffer_digest.may_have (c->left_set) &&
-	  c->buffer_digest.may_have (c->right_set)))
-      return_trace (false);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->font->face);
 
     driver.drive (&dc, c);
 
@@ -735,10 +735,6 @@ struct KerxSubTableFormat6
     if (header.coverage & header.Backwards)
       return_trace (false);
 
-    if (!(c->buffer_digest.may_have (c->left_set) &&
-	  c->buffer_digest.may_have (c->right_set)))
-      return_trace (false);
-
     accelerator_t accel (*this, c);
     hb_kern_machine_t<accelerator_t> machine (accel, header.coverage & header.CrossStream);
     machine.kern (c->font, c->buffer, c->plan->kern_mask);
@@ -793,7 +789,7 @@ struct KerxSubTableFormat6
 
     int get_kerning (hb_codepoint_t left, hb_codepoint_t right) const
     {
-      if (!c->left_set[left] || !c->right_set[right]) return 0;
+      if (!(*c->left_set)[left] || !(*c->right_set)[right]) return 0;
       return table.get_kerning (left, right, c);
     }
   };
@@ -925,7 +921,7 @@ struct KerxSubTable
  * The 'kerx' Table
  */
 
-using kern_accelerator_data_t = hb_vector_t<hb_pair_t<hb_set_digest_t, hb_set_digest_t>>;
+using kern_accelerator_data_t = hb_vector_t<hb_pair_t<hb_bit_set_t, hb_bit_set_t>>;
 
 template <typename T>
 struct KerxTable
@@ -985,15 +981,10 @@ struct KerxTable
   }
 
   bool apply (AAT::hb_aat_apply_context_t *c,
-	      const kern_accelerator_data_t *accel_data = nullptr) const
+	      const kern_accelerator_data_t &accel_data) const
   {
     c->buffer->unsafe_to_concat ();
 
-    if (c->buffer->len < HB_AAT_BUFFER_DIGEST_THRESHOLD)
-      c->buffer_digest = c->buffer->digest ();
-    else
-      c->buffer_digest = hb_set_digest_t::full ();
-
     typedef typename T::SubTable SubTable;
 
     bool ret = false;
@@ -1037,15 +1028,8 @@ struct KerxTable
       if (reverse)
 	c->buffer->reverse ();
 
-      if (accel_data)
-      {
-	c->left_set = (*accel_data)[i].first;
-	c->right_set = (*accel_data)[i].second;
-      }
-      else
-      {
-        c->left_set = c->right_set = hb_set_digest_t::full ();
-      }
+      c->left_set = &accel_data[i].first;
+      c->right_set = &accel_data[i].second;
 
       {
 	/* See comment in sanitize() for conditional here. */
@@ -1122,7 +1106,7 @@ struct KerxTable
     unsigned int count = thiz()->tableCount;
     for (unsigned int i = 0; i < count; i++)
     {
-      hb_set_digest_t left_set, right_set;
+      hb_bit_set_t left_set, right_set;
       st->collect_glyphs (left_set, right_set, num_glyphs);
       accel_data.push (hb_pair (left_set, right_set));
       st = &StructAfter<SubTable> (*st);
@@ -1148,7 +1132,7 @@ struct KerxTable
 
     bool apply (AAT::hb_aat_apply_context_t *c) const
     {
-      return table->apply (c, &accel_data);
+      return table->apply (c, accel_data);
     }
 
     hb_blob_ptr_t<T> table;
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh b/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh
index d3183440..617a239f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout-morx-table.hh
@@ -29,6 +29,7 @@
 
 #include "hb-open-type.hh"
 #include "hb-aat-layout-common.hh"
+#include "hb-ot-layout.hh"
 #include "hb-ot-layout-common.hh"
 #include "hb-ot-layout-gdef-table.hh"
 #include "hb-aat-map.hh"
@@ -53,35 +54,40 @@ struct RearrangementSubtable
 
   typedef void EntryData;
 
-  struct driver_context_t
+  enum Flags
   {
-    static constexpr bool in_place = true;
-    enum Flags
-    {
-      MarkFirst		= 0x8000,	/* If set, make the current glyph the first
+    MarkFirst		= 0x8000,	/* If set, make the current glyph the first
 					 * glyph to be rearranged. */
-      DontAdvance	= 0x4000,	/* If set, don't advance to the next glyph
+    DontAdvance		= 0x4000,	/* If set, don't advance to the next glyph
 					 * before going to the new state. This means
 					 * that the glyph index doesn't change, even
 					 * if the glyph at that index has changed. */
-      MarkLast		= 0x2000,	/* If set, make the current glyph the last
+    MarkLast		= 0x2000,	/* If set, make the current glyph the last
 					 * glyph to be rearranged. */
-      Reserved		= 0x1FF0,	/* These bits are reserved and should be set to 0. */
-      Verb		= 0x000F,	/* The type of rearrangement specified. */
-    };
+    Reserved		= 0x1FF0,	/* These bits are reserved and should be set to 0. */
+    Verb		= 0x000F,	/* The type of rearrangement specified. */
+  };
 
-    driver_context_t (const RearrangementSubtable *table HB_UNUSED) :
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & MarkFirst);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & Verb);
+  }
+
+  struct driver_context_t
+  {
+    static constexpr bool in_place = true;
+
+    driver_context_t (const RearrangementSubtable *table_) :
 	ret (false),
+	table (table_),
 	start (0), end (0) {}
 
-    bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
-			StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-			const Entry<EntryData> &entry) const
-    {
-      return (entry.flags & Verb) && start < end;
-    }
     void transition (hb_buffer_t *buffer,
-		     StateTableDriver<Types, EntryData> *driver,
+		     StateTableDriver<Types, EntryData, Flags> *driver,
 		     const Entry<EntryData> &entry)
     {
       unsigned int flags = entry.flags;
@@ -158,6 +164,7 @@ struct RearrangementSubtable
 
     public:
     bool ret;
+    const RearrangementSubtable *table;
     private:
     unsigned int start;
     unsigned int end;
@@ -169,11 +176,13 @@ struct RearrangementSubtable
 
     driver_context_t dc (this);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
 
-    if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) &&
-	!c->buffer_digest.may_have (c->machine_glyph_set))
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
       return_trace (false);
+    }
 
     driver.drive (&dc, c);
 
@@ -207,39 +216,40 @@ struct ContextualSubtable
     DEFINE_SIZE_STATIC (4);
   };
 
+  enum Flags
+  {
+    SetMark		= 0x8000,	/* If set, make the current glyph the marked glyph. */
+    DontAdvance		= 0x4000,	/* If set, don't advance to the next glyph before
+					 * going to the new state. */
+    Reserved		= 0x3FFF,	/* These bits are reserved and should be set to 0. */
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & SetMark);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF;
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = true;
-    enum Flags
-    {
-      SetMark		= 0x8000,	/* If set, make the current glyph the marked glyph. */
-      DontAdvance	= 0x4000,	/* If set, don't advance to the next glyph before
-					 * going to the new state. */
-      Reserved		= 0x3FFF,	/* These bits are reserved and should be set to 0. */
-    };
 
     driver_context_t (const ContextualSubtable *table_,
 			     hb_aat_apply_context_t *c_) :
 	ret (false),
 	c (c_),
+	table (table_),
 	gdef (*c->gdef_table),
 	mark_set (false),
 	has_glyph_classes (gdef.has_glyph_classes ()),
 	mark (0),
-	table (table_),
 	subs (table+table->substitutionTables) {}
 
-    bool is_actionable (hb_buffer_t *buffer,
-			StateTableDriver<Types, EntryData> *driver,
-			const Entry<EntryData> &entry) const
-    {
-      if (buffer->idx == buffer->len && !mark_set)
-	return false;
-
-      return entry.data.markIndex != 0xFFFF || entry.data.currentIndex != 0xFFFF;
-    }
     void transition (hb_buffer_t *buffer,
-		     StateTableDriver<Types, EntryData> *driver,
+		     StateTableDriver<Types, EntryData, Flags> *driver,
 		     const Entry<EntryData> &entry)
     {
       /* Looks like CoreText applies neither mark nor current substitution for
@@ -271,8 +281,9 @@ struct ContextualSubtable
       if (replacement)
       {
 	buffer->unsafe_to_break (mark, hb_min (buffer->idx + 1, buffer->len));
-	buffer->info[mark].codepoint = *replacement;
-	c->buffer_digest.add (*replacement);
+	hb_codepoint_t glyph = *replacement;
+	buffer->info[mark].codepoint = glyph;
+	c->buffer_glyph_set.add (glyph);
 	if (has_glyph_classes)
 	  _hb_glyph_info_set_glyph_props (&buffer->info[mark],
 					  gdef.get_glyph_props (*replacement));
@@ -301,8 +312,9 @@ struct ContextualSubtable
       }
       if (replacement)
       {
-	buffer->info[idx].codepoint = *replacement;
-	c->buffer_digest.add (*replacement);
+	hb_codepoint_t glyph = *replacement;
+	buffer->info[idx].codepoint = glyph;
+	c->buffer_glyph_set.add (glyph);
 	if (has_glyph_classes)
 	  _hb_glyph_info_set_glyph_props (&buffer->info[idx],
 					  gdef.get_glyph_props (*replacement));
@@ -318,13 +330,13 @@ struct ContextualSubtable
 
     public:
     bool ret;
-    private:
     hb_aat_apply_context_t *c;
+    const ContextualSubtable *table;
+    private:
     const OT::GDEF &gdef;
     bool mark_set;
     bool has_glyph_classes;
     unsigned int mark;
-    const ContextualSubtable *table;
     const UnsizedListOfOffset16To<Lookup<HBGlyphID16>, HBUINT, void, false> &subs;
   };
 
@@ -334,11 +346,13 @@ struct ContextualSubtable
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
 
-    if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) &&
-	!c->buffer_digest.may_have (c->machine_glyph_set))
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
       return_trace (false);
+    }
 
     driver.drive (&dc, c);
 
@@ -389,6 +403,16 @@ struct LigatureEntry;
 template <>
 struct LigatureEntry<true>
 {
+
+  struct EntryData
+  {
+    HBUINT16	ligActionIndex;	/* Index to the first ligActionTable entry
+				 * for processing this group, if indicated
+				 * by the flags. */
+    public:
+    DEFINE_SIZE_STATIC (2);
+  };
+
   enum Flags
   {
     SetComponent	= 0x8000,	/* Push this glyph onto the component stack for
@@ -400,14 +424,8 @@ struct LigatureEntry<true>
     Reserved		= 0x1FFF,	/* These bits are reserved and should be set to 0. */
   };
 
-  struct EntryData
-  {
-    HBUINT16	ligActionIndex;	/* Index to the first ligActionTable entry
-				 * for processing this group, if indicated
-				 * by the flags. */
-    public:
-    DEFINE_SIZE_STATIC (2);
-  };
+  static bool initiateAction (const Entry<EntryData> &entry)
+  { return entry.flags & SetComponent; }
 
   static bool performAction (const Entry<EntryData> &entry)
   { return entry.flags & PerformAction; }
@@ -418,6 +436,8 @@ struct LigatureEntry<true>
 template <>
 struct LigatureEntry<false>
 {
+  typedef void EntryData;
+
   enum Flags
   {
     SetComponent	= 0x8000,	/* Push this glyph onto the component stack for
@@ -429,7 +449,8 @@ struct LigatureEntry<false>
 					 * multiple of 4. */
   };
 
-  typedef void EntryData;
+  static bool initiateAction (const Entry<EntryData> &entry)
+  { return entry.flags & SetComponent; }
 
   static bool performAction (const Entry<EntryData> &entry)
   { return entry.flags & Offset; }
@@ -447,13 +468,23 @@ struct LigatureSubtable
   typedef LigatureEntry<Types::extended> LigatureEntryT;
   typedef typename LigatureEntryT::EntryData EntryData;
 
+  enum Flags
+  {
+    DontAdvance	= LigatureEntryT::DontAdvance,
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return LigatureEntryT::initiateAction (entry);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return LigatureEntryT::performAction (entry);
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = false;
-    enum
-    {
-      DontAdvance	= LigatureEntryT::DontAdvance,
-    };
     enum LigActionFlags
     {
       LigActionLast	= 0x80000000,	/* This is the last action in the list. This also
@@ -476,14 +507,8 @@ struct LigatureSubtable
 	ligature (table+table->ligature),
 	match_length (0) {}
 
-    bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
-			StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-			const Entry<EntryData> &entry) const
-    {
-      return LigatureEntryT::performAction (entry);
-    }
     void transition (hb_buffer_t *buffer,
-		     StateTableDriver<Types, EntryData> *driver,
+		     StateTableDriver<Types, EntryData, Flags> *driver,
 		     const Entry<EntryData> &entry)
     {
       DEBUG_MSG (APPLY, nullptr, "Ligature transition at %u", buffer->idx);
@@ -564,7 +589,7 @@ struct LigatureSubtable
 	    {
 	      DEBUG_MSG (APPLY, nullptr, "Skipping ligature component");
 	      if (unlikely (!buffer->move_to (match_positions[--match_length % ARRAY_LENGTH (match_positions)]))) return;
-	      buffer->cur().unicode_props() |= UPROPS_MASK_IGNORABLE;
+	      _hb_glyph_info_set_default_ignorable (&buffer->cur());
 	      if (unlikely (!buffer->replace_glyph (DELETED_GLYPH))) return;
 	    }
 
@@ -581,9 +606,9 @@ struct LigatureSubtable
 
     public:
     bool ret;
-    private:
     hb_aat_apply_context_t *c;
     const LigatureSubtable *table;
+    private:
     const UnsizedArrayOf<HBUINT32> &ligAction;
     const UnsizedArrayOf<HBUINT16> &component;
     const UnsizedArrayOf<HBGlyphID16> &ligature;
@@ -597,11 +622,13 @@ struct LigatureSubtable
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
 
-    if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) &&
-	!c->buffer_digest.may_have (c->machine_glyph_set))
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
       return_trace (false);
+    }
 
     driver.drive (&dc, c);
 
@@ -638,6 +665,12 @@ struct NoncontextualSubtable
   {
     TRACE_APPLY (this);
 
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
+      return_trace (false);
+    }
+
     const OT::GDEF &gdef (*c->gdef_table);
     bool has_glyph_classes = gdef.has_glyph_classes ();
 
@@ -670,8 +703,9 @@ struct NoncontextualSubtable
       const HBGlyphID16 *replacement = substitute.get_value (info[i].codepoint, num_glyphs);
       if (replacement)
       {
-	info[i].codepoint = *replacement;
-	c->buffer_digest.add (*replacement);
+	hb_codepoint_t glyph = *replacement;
+	info[i].codepoint = glyph;
+	c->buffer_glyph_set.add (glyph);
 	if (has_glyph_classes)
 	  _hb_glyph_info_set_glyph_props (&info[i],
 					  gdef.get_glyph_props (*replacement));
@@ -682,6 +716,12 @@ struct NoncontextualSubtable
     return_trace (ret);
   }
 
+  template <typename set_t>
+  void collect_initial_glyphs (set_t &glyphs, unsigned num_glyphs) const
+  {
+    substitute.collect_glyphs (glyphs, num_glyphs);
+  }
+
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
@@ -715,73 +755,78 @@ struct InsertionSubtable
     DEFINE_SIZE_STATIC (4);
   };
 
+  enum Flags
+  {
+    SetMark		= 0x8000,     /* If set, mark the current glyph. */
+    DontAdvance		= 0x4000,     /* If set, don't advance to the next glyph before
+				       * going to the new state.  This does not mean
+				       * that the glyph pointed to is the same one as
+				       * before. If you've made insertions immediately
+				       * downstream of the current glyph, the next glyph
+				       * processed would in fact be the first one
+				       * inserted. */
+    CurrentIsKashidaLike= 0x2000,     /* If set, and the currentInsertList is nonzero,
+				       * then the specified glyph list will be inserted
+				       * as a kashida-like insertion, either before or
+				       * after the current glyph (depending on the state
+				       * of the currentInsertBefore flag). If clear, and
+				       * the currentInsertList is nonzero, then the
+				       * specified glyph list will be inserted as a
+				       * split-vowel-like insertion, either before or
+				       * after the current glyph (depending on the state
+				       * of the currentInsertBefore flag). */
+    MarkedIsKashidaLike= 0x1000,      /* If set, and the markedInsertList is nonzero,
+				       * then the specified glyph list will be inserted
+				       * as a kashida-like insertion, either before or
+				       * after the marked glyph (depending on the state
+				       * of the markedInsertBefore flag). If clear, and
+				       * the markedInsertList is nonzero, then the
+				       * specified glyph list will be inserted as a
+				       * split-vowel-like insertion, either before or
+				       * after the marked glyph (depending on the state
+				       * of the markedInsertBefore flag). */
+    CurrentInsertBefore= 0x0800,      /* If set, specifies that insertions are to be made
+				       * to the left of the current glyph. If clear,
+				       * they're made to the right of the current glyph. */
+    MarkedInsertBefore= 0x0400,	      /* If set, specifies that insertions are to be
+				       * made to the left of the marked glyph. If clear,
+				       * they're made to the right of the marked glyph. */
+    CurrentInsertCount= 0x3E0,	      /* This 5-bit field is treated as a count of the
+				       * number of glyphs to insert at the current
+				       * position. Since zero means no insertions, the
+				       * largest number of insertions at any given
+				       * current location is 31 glyphs. */
+    MarkedInsertCount= 0x001F,	      /* This 5-bit field is treated as a count of the
+				       * number of glyphs to insert at the marked
+				       * position. Since zero means no insertions, the
+				       * largest number of insertions at any given
+				       * marked location is 31 glyphs. */
+  };
+
+  bool is_action_initiable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & SetMark);
+  }
+  bool is_actionable (const Entry<EntryData> &entry) const
+  {
+    return (entry.flags & (CurrentInsertCount | MarkedInsertCount)) &&
+	   (entry.data.currentInsertIndex != 0xFFFF ||entry.data.markedInsertIndex != 0xFFFF);
+  }
+
   struct driver_context_t
   {
     static constexpr bool in_place = false;
-    enum Flags
-    {
-      SetMark		= 0x8000,	/* If set, mark the current glyph. */
-      DontAdvance	= 0x4000,	/* If set, don't advance to the next glyph before
-					 * going to the new state.  This does not mean
-					 * that the glyph pointed to is the same one as
-					 * before. If you've made insertions immediately
-					 * downstream of the current glyph, the next glyph
-					 * processed would in fact be the first one
-					 * inserted. */
-      CurrentIsKashidaLike= 0x2000,	/* If set, and the currentInsertList is nonzero,
-					 * then the specified glyph list will be inserted
-					 * as a kashida-like insertion, either before or
-					 * after the current glyph (depending on the state
-					 * of the currentInsertBefore flag). If clear, and
-					 * the currentInsertList is nonzero, then the
-					 * specified glyph list will be inserted as a
-					 * split-vowel-like insertion, either before or
-					 * after the current glyph (depending on the state
-					 * of the currentInsertBefore flag). */
-      MarkedIsKashidaLike= 0x1000,	/* If set, and the markedInsertList is nonzero,
-					 * then the specified glyph list will be inserted
-					 * as a kashida-like insertion, either before or
-					 * after the marked glyph (depending on the state
-					 * of the markedInsertBefore flag). If clear, and
-					 * the markedInsertList is nonzero, then the
-					 * specified glyph list will be inserted as a
-					 * split-vowel-like insertion, either before or
-					 * after the marked glyph (depending on the state
-					 * of the markedInsertBefore flag). */
-      CurrentInsertBefore= 0x0800,	/* If set, specifies that insertions are to be made
-					 * to the left of the current glyph. If clear,
-					 * they're made to the right of the current glyph. */
-      MarkedInsertBefore= 0x0400,	/* If set, specifies that insertions are to be
-					 * made to the left of the marked glyph. If clear,
-					 * they're made to the right of the marked glyph. */
-      CurrentInsertCount= 0x3E0,	/* This 5-bit field is treated as a count of the
-					 * number of glyphs to insert at the current
-					 * position. Since zero means no insertions, the
-					 * largest number of insertions at any given
-					 * current location is 31 glyphs. */
-      MarkedInsertCount= 0x001F,	/* This 5-bit field is treated as a count of the
-					 * number of glyphs to insert at the marked
-					 * position. Since zero means no insertions, the
-					 * largest number of insertions at any given
-					 * marked location is 31 glyphs. */
-    };
 
-    driver_context_t (const InsertionSubtable *table,
+    driver_context_t (const InsertionSubtable *table_,
 		      hb_aat_apply_context_t *c_) :
 	ret (false),
 	c (c_),
+	table (table_),
 	mark (0),
 	insertionAction (table+table->insertionAction) {}
 
-    bool is_actionable (hb_buffer_t *buffer HB_UNUSED,
-			StateTableDriver<Types, EntryData> *driver HB_UNUSED,
-			const Entry<EntryData> &entry) const
-    {
-      return (entry.flags & (CurrentInsertCount | MarkedInsertCount)) &&
-	     (entry.data.currentInsertIndex != 0xFFFF ||entry.data.markedInsertIndex != 0xFFFF);
-    }
     void transition (hb_buffer_t *buffer,
-		     StateTableDriver<Types, EntryData> *driver,
+		     StateTableDriver<Types, EntryData, Flags> *driver,
 		     const Entry<EntryData> &entry)
     {
       unsigned int flags = entry.flags;
@@ -807,7 +852,7 @@ struct InsertionSubtable
 	/* TODO We ignore KashidaLike setting. */
 	if (unlikely (!buffer->replace_glyphs (0, count, glyphs))) return;
 	for (unsigned int i = 0; i < count; i++)
-	  c->buffer_digest.add (glyphs[i]);
+	  c->buffer_glyph_set.add (glyphs[i]);
 	ret = true;
 	if (buffer->idx < buffer->len && !before)
 	  buffer->skip_glyph ();
@@ -861,8 +906,9 @@ struct InsertionSubtable
 
     public:
     bool ret;
-    private:
     hb_aat_apply_context_t *c;
+    const InsertionSubtable *table;
+    private:
     unsigned int mark;
     const UnsizedArrayOf<HBGlyphID16> &insertionAction;
   };
@@ -873,11 +919,13 @@ struct InsertionSubtable
 
     driver_context_t dc (this, c);
 
-    StateTableDriver<Types, EntryData> driver (machine, c->face);
+    StateTableDriver<Types, EntryData, Flags> driver (machine, c->face);
 
-    if (driver.is_idempotent_on_all_out_of_bounds (&dc, c) &&
-	!c->buffer_digest.may_have (c->machine_glyph_set))
+    if (!c->buffer_intersects_machine ())
+    {
+      (void) c->buffer->message (c->font, "skipped chainsubtable because no glyph matches");
       return_trace (false);
+    }
 
     driver.drive (&dc, c);
 
@@ -935,24 +983,33 @@ struct hb_accelerate_subtables_context_t :
     friend struct hb_aat_layout_lookup_accelerator_t;
 
     public:
-    hb_set_digest_t digest;
+    hb_bit_set_t glyph_set;
+    mutable hb_aat_class_cache_t class_cache;
 
     template <typename T>
     auto init_ (const T &obj_, unsigned num_glyphs, hb_priority<1>) HB_AUTO_RETURN
     (
-      obj_.machine.collect_glyphs (this->digest, num_glyphs)
+      obj_.machine.collect_initial_glyphs (glyph_set, num_glyphs, obj_)
     )
 
     template <typename T>
     void init_ (const T &obj_, unsigned num_glyphs, hb_priority<0>)
     {
-      digest = digest.full ();
+      obj_.collect_initial_glyphs (glyph_set, num_glyphs);
     }
 
     template <typename T>
     void init (const T &obj_, unsigned num_glyphs)
     {
+      glyph_set.init ();
       init_ (obj_, num_glyphs, hb_prioritize);
+      class_cache.clear ();
+    }
+
+    void
+    fini ()
+    {
+      glyph_set.fini ();
     }
   };
 
@@ -999,12 +1056,21 @@ struct hb_aat_layout_chain_accelerator_t
     if (unlikely (!thiz))
       return nullptr;
 
+    thiz->count = count;
+
     hb_accelerate_subtables_context_t c_accelerate_subtables (thiz->subtables, num_glyphs);
     chain.dispatch (&c_accelerate_subtables);
 
     return thiz;
   }
 
+  void destroy ()
+  {
+    for (unsigned i = 0; i < count; i++)
+      subtables[i].fini ();
+  }
+
+  unsigned count;
   hb_accelerate_subtables_context_t::hb_applicable_t subtables[HB_VAR_ARRAY];
 };
 
@@ -1152,15 +1218,19 @@ struct Chain
     {
       bool reverse;
 
-      if (hb_none (hb_iter (c->range_flags) |
-		   hb_map ([&subtable] (const hb_aat_map_t::range_flags_t _) -> bool { return subtable->subFeatureFlags & (_.flags); })))
-	goto skip;
-      c->subtable_flags = subtable->subFeatureFlags;
-      c->machine_glyph_set = accel ? accel->subtables[i].digest : hb_set_digest_t::full ();
+      auto coverage = subtable->get_coverage ();
 
-      if (!(subtable->get_coverage() & ChainSubtable<Types>::AllDirections) &&
+      hb_mask_t subtable_flags = subtable->subFeatureFlags;
+      if (hb_none (hb_iter (c->range_flags) |
+		   hb_map ([subtable_flags] (const hb_aat_map_t::range_flags_t _) -> bool { return subtable_flags & (_.flags); })))
+	goto skip;
+      c->subtable_flags = subtable_flags;
+      c->machine_glyph_set = accel ? &accel->subtables[i].glyph_set : &Null(hb_bit_set_t);
+      c->machine_class_cache = accel ? &accel->subtables[i].class_cache : nullptr;
+
+      if (!(coverage & ChainSubtable<Types>::AllDirections) &&
 	  HB_DIRECTION_IS_VERTICAL (c->buffer->props.direction) !=
-	  bool (subtable->get_coverage() & ChainSubtable<Types>::Vertical))
+	  bool (coverage & ChainSubtable<Types>::Vertical))
 	goto skip;
 
       /* Buffer contents is always in logical direction.  Determine if
@@ -1190,9 +1260,9 @@ struct Chain
 				(the order opposite that of the characters, which
 				may be right-to-left or left-to-right).
        */
-      reverse = subtable->get_coverage () & ChainSubtable<Types>::Logical ?
-		bool (subtable->get_coverage () & ChainSubtable<Types>::Backwards) :
-		bool (subtable->get_coverage () & ChainSubtable<Types>::Backwards) !=
+      reverse = coverage & ChainSubtable<Types>::Logical ?
+		bool (coverage & ChainSubtable<Types>::Backwards) :
+		bool (coverage & ChainSubtable<Types>::Backwards) !=
 		HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction);
 
       if (!c->buffer->message (c->font, "start chainsubtable %u", c->lookup_index))
@@ -1298,6 +1368,12 @@ struct mortmorx
       hb_sanitize_context_t sc;
       this->table = sc.reference_table<T> (face);
 
+      if (unlikely (this->table->is_blocklisted (this->table.get_blob (), face)))
+      {
+        hb_blob_destroy (this->table.get_blob ());
+        this->table = hb_blob_get_empty ();
+      }
+
       this->chain_count = table->get_chain_count ();
 
       this->accels = (hb_atomic_ptr_t<hb_aat_layout_chain_accelerator_t> *) hb_calloc (this->chain_count, sizeof (*accels));
@@ -1311,7 +1387,11 @@ struct mortmorx
     ~accelerator_t ()
     {
       for (unsigned int i = 0; i < this->chain_count; i++)
+      {
+	if (this->accels[i])
+	  this->accels[i]->destroy ();
 	hb_free (this->accels[i]);
+      }
       hb_free (this->accels);
       this->table.destroy ();
     }
@@ -1365,9 +1445,8 @@ struct mortmorx
 
   unsigned get_chain_count () const
   {
-	  return chainCount;
+    return chainCount;
   }
-
   void apply (hb_aat_apply_context_t *c,
 	      const hb_aat_map_t &map,
 	      const accelerator_t &accel) const
@@ -1376,10 +1455,7 @@ struct mortmorx
 
     c->buffer->unsafe_to_concat ();
 
-    if (c->buffer->len < HB_AAT_BUFFER_DIGEST_THRESHOLD)
-      c->buffer_digest = c->buffer->digest ();
-    else
-      c->buffer_digest = hb_set_digest_t::full ();
+    c->setup_buffer_glyph_set ();
 
     c->set_lookup_index (0);
     const Chain<Types> *chain = &firstChain;
@@ -1428,8 +1504,17 @@ struct mortmorx
   DEFINE_SIZE_MIN (8);
 };
 
-struct morx : mortmorx<morx, ExtendedTypes, HB_AAT_TAG_morx> {};
-struct mort : mortmorx<mort, ObsoleteTypes, HB_AAT_TAG_mort> {};
+struct morx : mortmorx<morx, ExtendedTypes, HB_AAT_TAG_morx>
+{
+  HB_INTERNAL bool is_blocklisted (hb_blob_t *blob,
+                                   hb_face_t *face) const;
+};
+
+struct mort : mortmorx<mort, ObsoleteTypes, HB_AAT_TAG_mort>
+{
+  HB_INTERNAL bool is_blocklisted (hb_blob_t *blob,
+                                   hb_face_t *face) const;
+};
 
 struct morx_accelerator_t : morx::accelerator_t {
   morx_accelerator_t (hb_face_t *face) : morx::accelerator_t (face) {}
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout-trak-table.hh b/engine/thirdparty/harfbuzz/src/hb-aat-layout-trak-table.hh
index 345a236e..50860603 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout-trak-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout-trak-table.hh
@@ -48,17 +48,69 @@ struct TrackTableEntry
 
   float get_track_value () const { return track.to_float (); }
 
-  int get_value (const void *base, unsigned int index,
-		 unsigned int table_size) const
-  { return (base+valuesZ).as_array (table_size)[index]; }
+  float interpolate_at (unsigned int idx,
+			float ptem,
+			const void *base,
+			hb_array_t<const F16DOT16> size_table) const
+  {
+    const FWORD *values = (base+valuesZ).arrayZ;
+
+    float s0 = size_table[idx].to_float ();
+    float s1 = size_table[idx + 1].to_float ();
+    int v0 = values[idx];
+    int v1 = values[idx + 1];
+
+    // Deal with font bugs.
+    if (unlikely (s1 < s0))
+    { hb_swap (s0, s1); hb_swap (v0, v1); }
+    if (unlikely (ptem < s0)) return v0;
+    if (unlikely (ptem > s1)) return v1;
+    if (unlikely (s0 == s1)) return (v0 + v1) * 0.5f;
+
+    float t = (ptem - s0) / (s1 - s0);
+    return v0 + t * (v1 - v0);
+  }
+
+  float get_value (float ptem,
+		   const void *base,
+		   hb_array_t<const F16DOT16> size_table) const
+  {
+    const FWORD *values = (base+valuesZ).arrayZ;
+
+    unsigned int n_sizes = size_table.length;
+
+    /*
+     * Choose size.
+     */
+    if (!n_sizes) return 0.f;
+    if (n_sizes == 1) return values[0];
+
+    // At least two entries.
+
+    unsigned i;
+    for (i = 0; i < n_sizes; i++)
+      if (size_table[i].to_float () >= ptem)
+	break;
+
+    // Boundary conditions.
+    if (i == 0)       return values[0];
+    if (i == n_sizes) return values[n_sizes - 1];
+
+    // Exact match.
+    if (size_table[i].to_float () == ptem) return values[i];
+
+    // Interpolate.
+    return interpolate_at (i - 1, ptem, base, size_table);
+  }
 
   public:
-  bool sanitize (hb_sanitize_context_t *c, const void *base,
-		 unsigned int table_size) const
+  bool sanitize (hb_sanitize_context_t *c,
+		 const void *base,
+		 unsigned int n_sizes) const
   {
     TRACE_SANITIZE (this);
     return_trace (likely (c->check_struct (this) &&
-			  (valuesZ.sanitize (c, base, table_size))));
+			  (valuesZ.sanitize (c, base, n_sizes))));
   }
 
   protected:
@@ -76,58 +128,38 @@ struct TrackTableEntry
 
 struct TrackData
 {
-  float interpolate_at (unsigned int idx,
-			float target_size,
-			const TrackTableEntry &trackTableEntry,
-			const void *base) const
+  float get_tracking (const void *base, float ptem, float track = 0.f) const
   {
-    unsigned int sizes = nSizes;
-    hb_array_t<const F16DOT16> size_table ((base+sizeTable).arrayZ, sizes);
+    unsigned count = nTracks;
+    hb_array_t<const F16DOT16> size_table = (base+sizeTable).as_array (nSizes);
 
-    float s0 = size_table[idx].to_float ();
-    float s1 = size_table[idx + 1].to_float ();
-    float t = unlikely (s0 == s1) ? 0.f : (target_size - s0) / (s1 - s0);
-    return t * trackTableEntry.get_value (base, idx + 1, sizes) +
-	   (1.f - t) * trackTableEntry.get_value (base, idx, sizes);
-  }
+    if (!count) return 0.f;
+    if (count == 1) return trackTable[0].get_value (ptem, base, size_table);
 
-  int get_tracking (const void *base, float ptem) const
-  {
-    /*
-     * Choose track.
-     */
-    const TrackTableEntry *trackTableEntry = nullptr;
-    unsigned int count = nTracks;
-    for (unsigned int i = 0; i < count; i++)
-    {
-      /* Note: Seems like the track entries are sorted by values.  But the
-       * spec doesn't explicitly say that.  It just mentions it in the example. */
+    // At least two entries.
 
-      /* For now we only seek for track entries with zero tracking value */
+    unsigned i = 0;
+    unsigned j = count - 1;
 
-      if (trackTable[i].get_track_value () == 0.f)
-      {
-	trackTableEntry = &trackTable[i];
-	break;
-      }
-    }
-    if (!trackTableEntry) return 0;
+    // Find the two entries that track is between.
+    while (i + 1 < count && trackTable[i + 1].get_track_value () < track)
+      i++;
+    while (j > 0 && trackTable[j - 1].get_track_value () > track)
+      j--;
 
-    /*
-     * Choose size.
-     */
-    unsigned int sizes = nSizes;
-    if (!sizes) return 0;
-    if (sizes == 1) return trackTableEntry->get_value (base, 0, sizes);
+    // Exact match.
+    if (i == j) return trackTable[i].get_value (ptem, base, size_table);
 
-    hb_array_t<const F16DOT16> size_table ((base+sizeTable).arrayZ, sizes);
-    unsigned int size_index;
-    for (size_index = 0; size_index < sizes - 1; size_index++)
-      if (size_table[size_index].to_float () >= ptem)
-	break;
+    // Interpolate.
 
-    return roundf (interpolate_at (size_index ? size_index - 1 : 0, ptem,
-				   *trackTableEntry, base));
+    float t0 = trackTable[i].get_track_value ();
+    float t1 = trackTable[j].get_track_value ();
+
+    float t = (track - t0) / (t1 - t0);
+
+    float a = trackTable[i].get_value (ptem, base, size_table);
+    float b = trackTable[j].get_value (ptem, base, size_table);
+    return a + t * (b - a);
   }
 
   bool sanitize (hb_sanitize_context_t *c, const void *base) const
@@ -158,45 +190,15 @@ struct trak
 
   bool has_data () const { return version.to_int (); }
 
-  bool apply (hb_aat_apply_context_t *c) const
+  hb_position_t get_h_tracking (hb_font_t *font, float track = 0.f) const
   {
-    TRACE_APPLY (this);
-
-    hb_mask_t trak_mask = c->plan->trak_mask;
-
-    const float ptem = c->font->ptem;
-    if (unlikely (ptem <= 0.f))
-      return_trace (false);
-
-    hb_buffer_t *buffer = c->buffer;
-    if (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction))
-    {
-      const TrackData &trackData = this+horizData;
-      int tracking = trackData.get_tracking (this, ptem);
-      hb_position_t offset_to_add = c->font->em_scalef_x (tracking / 2);
-      hb_position_t advance_to_add = c->font->em_scalef_x (tracking);
-      foreach_grapheme (buffer, start, end)
-      {
-	if (!(buffer->info[start].mask & trak_mask)) continue;
-	buffer->pos[start].x_advance += advance_to_add;
-	buffer->pos[start].x_offset += offset_to_add;
-      }
-    }
-    else
-    {
-      const TrackData &trackData = this+vertData;
-      int tracking = trackData.get_tracking (this, ptem);
-      hb_position_t offset_to_add = c->font->em_scalef_y (tracking / 2);
-      hb_position_t advance_to_add = c->font->em_scalef_y (tracking);
-      foreach_grapheme (buffer, start, end)
-      {
-	if (!(buffer->info[start].mask & trak_mask)) continue;
-	buffer->pos[start].y_advance += advance_to_add;
-	buffer->pos[start].y_offset += offset_to_add;
-      }
-    }
-
-    return_trace (true);
+    float ptem = font->ptem > 0.f ? font->ptem : HB_CORETEXT_DEFAULT_FONT_SIZE;
+    return font->em_scalef_x ((this+horizData).get_tracking (this, ptem, track));
+  }
+  hb_position_t get_v_tracking (hb_font_t *font, float track = 0.f) const
+  {
+    float ptem = font->ptem > 0.f ? font->ptem : HB_CORETEXT_DEFAULT_FONT_SIZE;
+    return font->em_scalef_y ((this+vertData).get_tracking (this, ptem, track));
   }
 
   bool sanitize (hb_sanitize_context_t *c) const
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout.cc b/engine/thirdparty/harfbuzz/src/hb-aat-layout.cc
index 9da29e51..9fe77a57 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout.cc
@@ -34,9 +34,12 @@
 #include "hb-aat-layout-just-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-aat-layout-kerx-table.hh"
 #include "hb-aat-layout-morx-table.hh"
-#include "hb-aat-layout-trak-table.hh"
+#include "hb-aat-layout-trak-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-aat-ltag-table.hh"
 
+#include "hb-ot-layout-gsub-table.hh"
+#include "hb-ot-layout-gdef-table.hh"
+
 
 /*
  * hb_aat_apply_context_t
@@ -207,6 +210,36 @@ hb_aat_layout_find_feature_mapping (hb_tag_t tag)
  */
 
 
+bool
+AAT::morx::is_blocklisted (hb_blob_t *blob,
+                           hb_face_t *face) const
+{
+#ifdef HB_NO_AAT_LAYOUT_BLOCKLIST
+  return false;
+#endif
+
+  switch HB_CODEPOINT_ENCODE3 (blob->length,
+                               face->table.GSUB->table.get_length (),
+                               face->table.GDEF->table.get_length ())
+  {
+    /* https://github.com/harfbuzz/harfbuzz/issues/4108
+       sha1sum:a71ca6813b7e56a772cffff7c24a5166b087197c  AALMAGHRIBI.ttf */
+    case HB_CODEPOINT_ENCODE3 (19892, 2794, 340):
+      return true;
+  }
+  return false;
+}
+
+bool
+AAT::mort::is_blocklisted (hb_blob_t *blob,
+                           hb_face_t *face) const
+{
+#ifdef HB_NO_AAT_LAYOUT_BLOCKLIST
+  return false;
+#endif
+  return false;
+}
+
 void
 hb_aat_layout_compile_map (const hb_aat_map_builder_t *mapper,
 			   hb_aat_map_t *map)
@@ -361,17 +394,6 @@ hb_aat_layout_has_tracking (hb_face_t *face)
   return face->table.trak->has_data ();
 }
 
-void
-hb_aat_layout_track (const hb_ot_shape_plan_t *plan,
-		     hb_font_t *font,
-		     hb_buffer_t *buffer)
-{
-  const AAT::trak& trak = *font->face->table.trak;
-
-  AAT::hb_aat_apply_context_t c (plan, font, buffer);
-  trak.apply (&c);
-}
-
 /**
  * hb_aat_layout_get_feature_types:
  * @face: #hb_face_t to work upon
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-layout.hh b/engine/thirdparty/harfbuzz/src/hb-aat-layout.hh
index 15c382aa..c5d6ecb1 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-layout.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-layout.hh
@@ -32,6 +32,9 @@
 #include "hb-ot-shape.hh"
 #include "hb-aat-ltag-table.hh"
 
+/* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */
+#define HB_CORETEXT_DEFAULT_FONT_SIZE 12.f
+
 struct hb_aat_feature_mapping_t
 {
   hb_tag_t otFeatureTag;
@@ -68,10 +71,5 @@ hb_aat_layout_position (const hb_ot_shape_plan_t *plan,
 			hb_font_t *font,
 			hb_buffer_t *buffer);
 
-HB_INTERNAL void
-hb_aat_layout_track (const hb_ot_shape_plan_t *plan,
-		     hb_font_t *font,
-		     hb_buffer_t *buffer);
-
 
 #endif /* HB_AAT_LAYOUT_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-aat-map.cc b/engine/thirdparty/harfbuzz/src/hb-aat-map.cc
index 5bdb8004..1a0dee02 100644
--- a/engine/thirdparty/harfbuzz/src/hb-aat-map.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-aat-map.cc
@@ -88,22 +88,23 @@ hb_aat_map_builder_t::compile (hb_aat_map_t  &m)
 
   /* Sort features by start/end events. */
   hb_vector_t<feature_event_t> feature_events;
+  feature_events.alloc_exact (features.length * 2 + 1);
   for (unsigned int i = 0; i < features.length; i++)
   {
-    auto &feature = features[i];
+    auto &feature = features.arrayZ[i];
 
-    if (features[i].start == features[i].end)
+    if (feature.start == feature.end)
       continue;
 
     feature_event_t *event;
 
     event = feature_events.push ();
-    event->index = features[i].start;
+    event->index = feature.start;
     event->start = true;
     event->feature = feature.info;
 
     event = feature_events.push ();
-    event->index = features[i].end;
+    event->index = feature.end;
     event->start = false;
     event->feature = feature.info;
   }
@@ -139,12 +140,12 @@ hb_aat_map_builder_t::compile (hb_aat_map_t  &m)
 	current_features.qsort ();
 	unsigned int j = 0;
 	for (unsigned int i = 1; i < current_features.length; i++)
-	  if (current_features[i].type != current_features[j].type ||
+	  if (current_features.arrayZ[i].type != current_features.arrayZ[j].type ||
 	      /* Nonexclusive feature selectors come in even/odd pairs to turn a setting on/off
 	       * respectively, so we mask out the low-order bit when checking for "duplicates"
 	       * (selectors referring to the same feature setting) here. */
-	      (!current_features[i].is_exclusive && ((current_features[i].setting & ~1) != (current_features[j].setting & ~1))))
-	    current_features[++j] = current_features[i];
+	      (!current_features.arrayZ[i].is_exclusive && ((current_features.arrayZ[i].setting & ~1) != (current_features.arrayZ[j].setting & ~1))))
+	    current_features.arrayZ[++j] = current_features.arrayZ[i];
 	current_features.shrink (j + 1);
       }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-algs.hh b/engine/thirdparty/harfbuzz/src/hb-algs.hh
index b02793a0..0252fa7d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-algs.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-algs.hh
@@ -286,7 +286,7 @@ HB_FUNCOBJ (hb_bool);
 
 // Compression function for Merkle-Damgard construction.
 // This function is generated using the framework provided.
-#define mix(h) (					\
+#define fasthash_mix(h) (					\
 			(void) ((h) ^= (h) >> 23),		\
 			(void) ((h) *= 0x2127599bf4325c37ULL),	\
 			(h) ^= (h) >> 47)
@@ -310,7 +310,7 @@ static inline uint64_t fasthash64(const void *buf, size_t len, uint64_t seed)
 #pragma GCC diagnostic ignored "-Wcast-align"
 	    v  = * (const uint64_t *) (pos++);
 #pragma GCC diagnostic pop
-	    h ^= mix(v);
+	    h ^= fasthash_mix(v);
 	    h *= m;
 	  }
 	}
@@ -320,7 +320,7 @@ static inline uint64_t fasthash64(const void *buf, size_t len, uint64_t seed)
 	  while (pos != end)
 	  {
 	    v  = pos++->v;
-	    h ^= mix(v);
+	    h ^= fasthash_mix(v);
 	    h *= m;
 	  }
 	}
@@ -336,11 +336,11 @@ static inline uint64_t fasthash64(const void *buf, size_t len, uint64_t seed)
 	case 3: v ^= (uint64_t)pos2[2] << 16; HB_FALLTHROUGH;
 	case 2: v ^= (uint64_t)pos2[1] <<  8; HB_FALLTHROUGH;
 	case 1: v ^= (uint64_t)pos2[0];
-		h ^= mix(v);
+		h ^= fasthash_mix(v);
 		h *= m;
 	}
 
-	return mix(h);
+	return fasthash_mix(h);
 }
 
 static inline uint32_t fasthash32(const void *buf, size_t len, uint32_t seed)
diff --git a/engine/thirdparty/harfbuzz/src/hb-array.hh b/engine/thirdparty/harfbuzz/src/hb-array.hh
index 9037179b..6e458ffd 100644
--- a/engine/thirdparty/harfbuzz/src/hb-array.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-array.hh
@@ -251,7 +251,8 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
     if (end < start + 2)
       return;
 
-    for (unsigned lhs = start, rhs = end - 1; lhs < rhs; lhs++, rhs--)
+    unsigned stop = start + (end - start) / 2;
+    for (unsigned lhs = start, rhs = end - 1; lhs < stop; lhs++, rhs--)
       hb_swap (arrayZ[rhs], arrayZ[lhs]);
   }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-atomic.hh b/engine/thirdparty/harfbuzz/src/hb-atomic.hh
index 366fb32b..121c463a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-atomic.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-atomic.hh
@@ -212,6 +212,7 @@ struct hb_atomic_ptr_t
   T *get_acquire () const { return (T *) hb_atomic_ptr_impl_get ((void **) &v); }
   bool cmpexch (const T *old, T *new_) const { return hb_atomic_ptr_impl_cmpexch ((void **) &v, (void *) old, (void *) new_); }
 
+  operator bool () const { return get_acquire () != nullptr; }
   T * operator -> () const                    { return get_acquire (); }
   template <typename C> operator C * () const { return get_acquire (); }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-bit-page.hh b/engine/thirdparty/harfbuzz/src/hb-bit-page.hh
index 869c6789..1941009f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-bit-page.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-bit-page.hh
@@ -78,6 +78,28 @@ struct hb_vector_size_t
   hb_vector_size_t operator ~ () const
   { return process (hb_bitwise_neg); }
 
+  operator bool () const
+  {
+    for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++)
+      if (v[i])
+	return true;
+    return false;
+  }
+  operator unsigned int () const
+  {
+    unsigned int r = 0;
+    for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++)
+      r += hb_popcount (v[i]);
+    return r;
+  }
+  bool operator == (const hb_vector_size_t &o) const
+  {
+    for (unsigned int i = 0; i < ARRAY_LENGTH (v); i++)
+      if (v[i] != o.v[i])
+	return false;
+    return true;
+  }
+
   hb_array_t<const elt_t> iter () const
   { return hb_array (v); }
 
@@ -89,6 +111,8 @@ struct hb_vector_size_t
 
 struct hb_bit_page_t
 {
+  hb_bit_page_t () { init0 (); }
+
   void init0 () { v.init0 (); population = 0; }
   void init1 () { v.init1 (); population = PAGE_BITS; }
 
@@ -101,10 +125,9 @@ struct hb_bit_page_t
   bool is_empty () const
   {
     if (has_population ()) return !population;
-    return
-    + hb_iter (v)
-    | hb_none
-    ;
+    bool empty = !v;
+    if (empty) population = 0;
+    return empty;
   }
   uint32_t hash () const
   {
@@ -115,6 +138,10 @@ struct hb_bit_page_t
   void del (hb_codepoint_t g) { elt (g) &= ~mask (g); dirty (); }
   void set (hb_codepoint_t g, bool value) { if (value) add (g); else del (g); }
   bool get (hb_codepoint_t g) const { return elt (g) & mask (g); }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
+
+  bool operator [] (hb_codepoint_t g) const { return get (g); }
+  bool operator () (hb_codepoint_t g) const { return get (g); }
 
   void add_range (hb_codepoint_t a, hb_codepoint_t b)
   {
@@ -220,13 +247,17 @@ struct hb_bit_page_t
   }
 
   bool operator == (const hb_bit_page_t &other) const { return is_equal (other); }
-  bool is_equal (const hb_bit_page_t &other) const
+  bool is_equal (const hb_bit_page_t &other) const { return v == other.v; }
+  bool intersects (const hb_bit_page_t &other) const
   {
     for (unsigned i = 0; i < len (); i++)
-      if (v[i] != other.v[i])
-	return false;
-    return true;
+      if (v[i] & other.v[i])
+	return true;
+    return false;
   }
+  bool may_intersect (const hb_bit_page_t &other) const
+  { return intersects (other); }
+
   bool operator <= (const hb_bit_page_t &larger_page) const { return is_subset (larger_page); }
   bool is_subset (const hb_bit_page_t &larger_page) const
   {
@@ -241,14 +272,10 @@ struct hb_bit_page_t
   }
 
   bool has_population () const { return population != UINT_MAX; }
-  unsigned int get_population () const
+  unsigned get_population () const
   {
     if (has_population ()) return population;
-    population =
-    + hb_iter (v)
-    | hb_reduce ([] (unsigned pop, const elt_t &_) { return pop + hb_popcount (_); }, 0u)
-    ;
-    return population;
+    return population = v;
   }
 
   bool next (hb_codepoint_t *codepoint) const
diff --git a/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh b/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh
index d5d1326d..03477234 100644
--- a/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-bit-set-invertible.hh
@@ -126,6 +126,7 @@ struct hb_bit_set_invertible_t
   { unlikely (inverted) ? (void) s.add_range (a, b) : s.del_range (a, b); }
 
   bool get (hb_codepoint_t g) const { return s.get (g) ^ inverted; }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
 
   /* Has interface. */
   bool operator [] (hb_codepoint_t k) const { return get (k); }
@@ -139,6 +140,9 @@ struct hb_bit_set_invertible_t
   hb_bit_set_invertible_t& operator << (const hb_codepoint_pair_t& range)
   { add_range (range.first, range.second); return *this; }
 
+  bool may_intersect (const hb_bit_set_invertible_t &other) const
+  { return inverted || other.inverted || s.intersects (other.s); }
+
   bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
   {
     hb_codepoint_t c = first - 1;
diff --git a/engine/thirdparty/harfbuzz/src/hb-bit-set.hh b/engine/thirdparty/harfbuzz/src/hb-bit-set.hh
index 5f4c6f0a..4607b884 100644
--- a/engine/thirdparty/harfbuzz/src/hb-bit-set.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-bit-set.hh
@@ -88,10 +88,11 @@ struct hb_bit_set_t
   {
     if (unlikely (!successful)) return false;
 
-    if (pages.length == 0 && count == 1)
+    if (pages.length < count && count <= 2)
       exact_size = true; // Most sets are small and local
 
-    if (unlikely (!pages.resize (count, clear, exact_size) || !page_map.resize (count, clear, exact_size)))
+    if (unlikely (!pages.resize (count, clear, exact_size) ||
+	!page_map.resize (count, clear)))
     {
       pages.resize (page_map.length, clear, exact_size);
       successful = false;
@@ -297,9 +298,9 @@ struct hb_bit_set_t
       unsigned int write_index = 0;
       for (unsigned int i = 0; i < page_map.length; i++)
       {
-	int m = (int) page_map[i].major;
+	int m = (int) page_map.arrayZ[i].major;
 	if (m < ds || de < m)
-	  page_map[write_index++] = page_map[i];
+	  page_map.arrayZ[write_index++] = page_map.arrayZ[i];
       }
       compact (compact_workspace, write_index);
       resize (write_index);
@@ -345,6 +346,7 @@ struct hb_bit_set_t
       return false;
     return page->get (g);
   }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
 
   /* Has interface. */
   bool operator [] (hb_codepoint_t k) const { return get (k); }
@@ -358,6 +360,31 @@ struct hb_bit_set_t
   hb_bit_set_t& operator << (const hb_codepoint_pair_t& range)
   { add_range (range.first, range.second); return *this; }
 
+  bool intersects (const hb_bit_set_t &other) const
+  {
+    unsigned int na = pages.length;
+    unsigned int nb = other.pages.length;
+
+    unsigned int a = 0, b = 0;
+    for (; a < na && b < nb; )
+    {
+      if (page_map.arrayZ[a].major == other.page_map.arrayZ[b].major)
+      {
+	if (page_at (a).intersects (other.page_at (b)))
+	  return true;
+	a++;
+	b++;
+      }
+      else if (page_map.arrayZ[a].major < other.page_map.arrayZ[b].major)
+	a++;
+      else
+	b++;
+    }
+    return false;
+  }
+  bool may_intersect (const hb_bit_set_t &other) const
+  { return intersects (other); }
+
   bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
   {
     hb_codepoint_t c = first - 1;
@@ -389,7 +416,7 @@ struct hb_bit_set_t
     {
       if (page_at (a).is_empty ()) { a++; continue; }
       if (other.page_at (b).is_empty ()) { b++; continue; }
-      if (page_map[a].major != other.page_map[b].major ||
+      if (page_map.arrayZ[a].major != other.page_map.arrayZ[b].major ||
 	  !page_at (a).is_equal (other.page_at (b)))
 	return false;
       a++;
@@ -412,8 +439,8 @@ struct hb_bit_set_t
     uint32_t spi = 0;
     for (uint32_t lpi = 0; spi < page_map.length && lpi < larger_set.page_map.length; lpi++)
     {
-      uint32_t spm = page_map[spi].major;
-      uint32_t lpm = larger_set.page_map[lpi].major;
+      uint32_t spm = page_map.arrayZ[spi].major;
+      uint32_t lpm = larger_set.page_map.arrayZ[lpi].major;
       auto sp = page_at (spi);
 
       if (spm < lpm && !sp.is_empty ())
@@ -503,7 +530,7 @@ struct hb_bit_set_t
 
     for (; a < na && b < nb; )
     {
-      if (page_map[a].major == other.page_map[b].major)
+      if (page_map.arrayZ[a].major == other.page_map.arrayZ[b].major)
       {
 	if (!passthru_left)
 	{
@@ -512,7 +539,7 @@ struct hb_bit_set_t
 	  // passthru_left is set since no left side pages will be removed
 	  // in that case.
 	  if (write_index < a)
-	    page_map[write_index] = page_map[a];
+	    page_map.arrayZ[write_index] = page_map.arrayZ[a];
 	  write_index++;
 	}
 
@@ -520,7 +547,7 @@ struct hb_bit_set_t
 	a++;
 	b++;
       }
-      else if (page_map[a].major < other.page_map[b].major)
+      else if (page_map.arrayZ[a].major < other.page_map.arrayZ[b].major)
       {
 	if (passthru_left)
 	  count++;
@@ -765,8 +792,8 @@ struct hb_bit_set_t
     unsigned int initial_size = size;
     for (unsigned int i = start_page; i < page_map.length && size; i++)
     {
-      uint32_t base = major_start (page_map[i].major);
-      unsigned int n = pages[page_map[i].index].write (base, start_page_value, out, size);
+      uint32_t base = major_start (page_map.arrayZ[i].major);
+      unsigned int n = pages[page_map.arrayZ[i].index].write (base, start_page_value, out, size);
       out += n;
       size -= n;
       start_page_value = 0;
@@ -814,8 +841,8 @@ struct hb_bit_set_t
     hb_codepoint_t next_value = codepoint + 1;
     for (unsigned int i=start_page; i<page_map.length && size; i++)
     {
-      uint32_t base = major_start (page_map[i].major);
-      unsigned int n = pages[page_map[i].index].write_inverted (base, start_page_value, out, size, &next_value);
+      uint32_t base = major_start (page_map.arrayZ[i].major);
+      unsigned int n = pages[page_map.arrayZ[i].index].write_inverted (base, start_page_value, out, size, &next_value);
       out += n;
       size -= n;
       start_page_value = 0;
@@ -846,8 +873,8 @@ struct hb_bit_set_t
     unsigned count = pages.length;
     for (unsigned i = 0; i < count; i++)
     {
-      const auto& map = page_map[i];
-      const auto& page = pages[map.index];
+      const auto& map = page_map.arrayZ[i];
+      const auto& page = pages.arrayZ[map.index];
 
       if (!page.is_empty ())
 	return map.major * page_t::PAGE_BITS + page.get_min ();
@@ -859,8 +886,8 @@ struct hb_bit_set_t
     unsigned count = pages.length;
     for (signed i = count - 1; i >= 0; i--)
     {
-      const auto& map = page_map[(unsigned) i];
-      const auto& page = pages[map.index];
+      const auto& map = page_map.arrayZ[(unsigned) i];
+      const auto& page = pages.arrayZ[map.index];
 
       if (!page.is_empty ())
 	return map.major * page_t::PAGE_BITS + page.get_max ();
@@ -961,7 +988,7 @@ struct hb_bit_set_t
       return nullptr;
 
     last_page_lookup = i;
-    return &pages.arrayZ[page_map[i].index];
+    return &pages.arrayZ[page_map.arrayZ[i].index];
   }
   page_t &page_at (unsigned int i)
   {
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh
index 1deaaafd..471bbb93 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer-deserialize-json.hh
@@ -34,36 +34,36 @@
 
 #line 36 "hb-buffer-deserialize-json.hh"
 static const unsigned char _deserialize_json_trans_keys[] = {
-	0u, 0u, 9u, 123u, 9u, 34u, 97u, 117u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 
-	48u, 57u, 9u, 125u, 9u, 125u, 9u, 93u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 
+	0u, 0u, 9u, 123u, 9u, 123u, 9u, 34u, 97u, 117u, 120u, 121u, 34u, 34u, 9u, 58u, 
+	9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 
 	48u, 57u, 9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 
 	9u, 125u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 
 	34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 
 	9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 34u, 92u, 
 	9u, 125u, 34u, 92u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 
-	9u, 123u, 0u, 0u, 0
+	9u, 93u, 9u, 123u, 0u, 0u, 0
 };
 
 static const char _deserialize_json_key_spans[] = {
-	0, 115, 26, 21, 2, 1, 50, 49, 
-	10, 117, 117, 85, 117, 1, 50, 49, 
+	0, 115, 115, 26, 21, 2, 1, 50, 
+	49, 10, 117, 117, 117, 1, 50, 49, 
 	10, 117, 117, 1, 1, 50, 49, 117, 
 	117, 2, 1, 50, 49, 10, 117, 117, 
 	1, 50, 49, 10, 117, 117, 1, 1, 
 	50, 49, 117, 117, 1, 50, 49, 59, 
 	117, 59, 117, 117, 1, 50, 49, 117, 
-	115, 0
+	85, 115, 0
 };
 
 static const short _deserialize_json_index_offsets[] = {
-	0, 0, 116, 143, 165, 168, 170, 221, 
-	271, 282, 400, 518, 604, 722, 724, 775, 
-	825, 836, 954, 1072, 1074, 1076, 1127, 1177, 
-	1295, 1413, 1416, 1418, 1469, 1519, 1530, 1648, 
-	1766, 1768, 1819, 1869, 1880, 1998, 2116, 2118, 
-	2120, 2171, 2221, 2339, 2457, 2459, 2510, 2560, 
-	2620, 2738, 2798, 2916, 3034, 3036, 3087, 3137, 
-	3255, 3371
+	0, 0, 116, 232, 259, 281, 284, 286, 
+	337, 387, 398, 516, 634, 752, 754, 805, 
+	855, 866, 984, 1102, 1104, 1106, 1157, 1207, 
+	1325, 1443, 1446, 1448, 1499, 1549, 1560, 1678, 
+	1796, 1798, 1849, 1899, 1910, 2028, 2146, 2148, 
+	2150, 2201, 2251, 2369, 2487, 2489, 2540, 2590, 
+	2650, 2768, 2828, 2946, 3064, 3066, 3117, 3167, 
+	3285, 3371, 3487
 };
 
 static const char _deserialize_json_indicies[] = {
@@ -77,51 +77,51 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 2, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 3, 1, 2, 2, 2, 
+	2, 2, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 2, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 2, 1, 3, 3, 3, 
-	3, 3, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 3, 1, 4, 1, 
-	5, 1, 6, 7, 1, 8, 9, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 10, 1, 11, 12, 
-	1, 13, 1, 13, 13, 13, 13, 13, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 13, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 14, 1, 14, 14, 
-	14, 14, 14, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 14, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 15, 1, 1, 16, 17, 17, 
-	17, 17, 17, 17, 17, 17, 17, 1, 
-	18, 19, 19, 19, 19, 19, 19, 19, 
-	19, 19, 1, 20, 20, 20, 20, 20, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 20, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 3, 
+	1, 4, 4, 4, 4, 4, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	4, 1, 5, 1, 6, 1, 7, 8, 
+	1, 9, 10, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	11, 1, 12, 13, 1, 14, 1, 14, 
+	14, 14, 14, 14, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 14, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	15, 1, 15, 15, 15, 15, 15, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 15, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 16, 1, 
+	1, 17, 18, 18, 18, 18, 18, 18, 
+	18, 18, 18, 1, 19, 20, 20, 20, 
+	20, 20, 20, 20, 20, 20, 1, 21, 
+	21, 21, 21, 21, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 21, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 22, 
-	1, 23, 23, 23, 23, 23, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	23, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 3, 1, 1, 1, 
+	1, 1, 22, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -131,24 +131,55 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 24, 1, 25, 
-	25, 25, 25, 25, 1, 1, 1, 1, 
+	1, 1, 1, 23, 1, 24, 24, 24, 
+	24, 24, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 24, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	4, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 25, 1, 21, 21, 21, 21, 21, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 21, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 22, 1, 
+	1, 1, 20, 20, 20, 20, 20, 20, 
+	20, 20, 20, 20, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 23, 
+	1, 26, 1, 26, 26, 26, 26, 26, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 25, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 26, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 27, 1, 27, 27, 
+	27, 27, 27, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 27, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 28, 1, 1, 29, 30, 30, 
+	30, 30, 30, 30, 30, 30, 30, 1, 
+	31, 32, 32, 32, 32, 32, 32, 32, 
+	32, 32, 1, 33, 33, 33, 33, 33, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 27, 1, 20, 20, 20, 
-	20, 20, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 20, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	21, 1, 1, 1, 19, 19, 19, 19, 
-	19, 19, 19, 19, 19, 19, 1, 1, 
+	1, 1, 33, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 34, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -157,26 +188,15 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 22, 1, 28, 1, 28, 28, 28, 
-	28, 28, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 28, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 35, 
+	1, 33, 33, 33, 33, 33, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 29, 1, 
-	29, 29, 29, 29, 29, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 29, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 30, 1, 1, 31, 
+	33, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 34, 1, 1, 1, 
 	32, 32, 32, 32, 32, 32, 32, 32, 
-	32, 1, 33, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 1, 35, 35, 35, 
-	35, 35, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 35, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	36, 1, 1, 1, 1, 1, 1, 1, 
+	32, 32, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -184,41 +204,25 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 35, 1, 36, 
+	1, 37, 1, 37, 37, 37, 37, 37, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 37, 1, 35, 35, 35, 35, 35, 
+	1, 1, 37, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 35, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 36, 1, 
-	1, 1, 34, 34, 34, 34, 34, 34, 
-	34, 34, 34, 34, 1, 1, 1, 1, 
+	1, 1, 1, 1, 38, 1, 38, 38, 
+	38, 38, 38, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 38, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 37, 
-	1, 38, 1, 39, 1, 39, 39, 39, 
-	39, 39, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 39, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 40, 1, 
-	40, 40, 40, 40, 40, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 40, 
+	1, 1, 1, 1, 1, 39, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 1, 
+	41, 41, 41, 41, 41, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 41, 
-	42, 42, 42, 42, 42, 42, 42, 42, 
-	42, 1, 43, 43, 43, 43, 43, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 43, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 44, 1, 1, 
+	1, 1, 1, 42, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -228,14 +232,13 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 45, 1, 
-	43, 43, 43, 43, 43, 1, 1, 1, 
+	1, 1, 1, 1, 43, 1, 41, 41, 
+	41, 41, 41, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 43, 
+	1, 1, 1, 1, 1, 41, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 44, 1, 1, 1, 46, 
-	46, 46, 46, 46, 46, 46, 46, 46, 
-	46, 1, 1, 1, 1, 1, 1, 1, 
+	1, 42, 1, 1, 1, 44, 44, 44, 
+	44, 44, 44, 44, 44, 44, 44, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -243,86 +246,116 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 45, 1, 47, 48, 
-	1, 49, 1, 49, 49, 49, 49, 49, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 43, 1, 45, 46, 1, 47, 
+	1, 47, 47, 47, 47, 47, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 49, 1, 1, 1, 1, 1, 
+	47, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 50, 1, 50, 50, 
-	50, 50, 50, 1, 1, 1, 1, 1, 
+	1, 1, 48, 1, 48, 48, 48, 48, 
+	48, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 50, 1, 1, 
+	1, 1, 1, 48, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 51, 1, 1, 52, 53, 53, 
-	53, 53, 53, 53, 53, 53, 53, 1, 
-	54, 55, 55, 55, 55, 55, 55, 55, 
-	55, 55, 1, 56, 56, 56, 56, 56, 
+	49, 1, 1, 50, 51, 51, 51, 51, 
+	51, 51, 51, 51, 51, 1, 52, 53, 
+	53, 53, 53, 53, 53, 53, 53, 53, 
+	1, 54, 54, 54, 54, 54, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 56, 1, 1, 1, 1, 1, 
+	54, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 55, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 56, 1, 54, 
+	54, 54, 54, 54, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 54, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 55, 1, 1, 1, 53, 53, 
+	53, 53, 53, 53, 53, 53, 53, 53, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 56, 1, 57, 1, 57, 
+	57, 57, 57, 57, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 57, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	58, 1, 58, 58, 58, 58, 58, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 58, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 59, 1, 
+	1, 60, 61, 61, 61, 61, 61, 61, 
+	61, 61, 61, 1, 62, 63, 63, 63, 
+	63, 63, 63, 63, 63, 63, 1, 64, 
+	64, 64, 64, 64, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 64, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 65, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 58, 
-	1, 56, 56, 56, 56, 56, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	56, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 57, 1, 1, 1, 
-	55, 55, 55, 55, 55, 55, 55, 55, 
-	55, 55, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 66, 1, 64, 64, 64, 
+	64, 64, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 64, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 58, 1, 59, 
-	1, 59, 59, 59, 59, 59, 1, 1, 
+	65, 1, 1, 1, 63, 63, 63, 63, 
+	63, 63, 63, 63, 63, 63, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	59, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 60, 1, 60, 60, 60, 60, 
-	60, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 60, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	61, 1, 1, 62, 63, 63, 63, 63, 
-	63, 63, 63, 63, 63, 1, 64, 65, 
-	65, 65, 65, 65, 65, 65, 65, 65, 
-	1, 66, 66, 66, 66, 66, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	66, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 67, 1, 1, 1, 
+	1, 66, 1, 67, 1, 68, 1, 68, 
+	68, 68, 68, 68, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 68, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	69, 1, 69, 69, 69, 69, 69, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 69, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 70, 71, 71, 71, 71, 71, 71, 
+	71, 71, 71, 1, 72, 72, 72, 72, 
+	72, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 72, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 73, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 68, 1, 66, 
-	66, 66, 66, 66, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 66, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 67, 1, 1, 1, 65, 65, 
-	65, 65, 65, 65, 65, 65, 65, 65, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -330,42 +363,48 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	74, 1, 72, 72, 72, 72, 72, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 68, 1, 69, 1, 70, 
-	1, 70, 70, 70, 70, 70, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 72, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 73, 1, 1, 
+	1, 75, 75, 75, 75, 75, 75, 75, 
+	75, 75, 75, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	70, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 71, 1, 71, 71, 71, 71, 
-	71, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 71, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 72, 73, 73, 73, 73, 
-	73, 73, 73, 73, 73, 1, 74, 74, 
-	74, 74, 74, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 74, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 75, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 74, 1, 
+	76, 1, 76, 76, 76, 76, 76, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 76, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 77, 1, 77, 77, 77, 
+	77, 77, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 77, 1, 78, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 79, 80, 80, 80, 
+	80, 80, 80, 80, 80, 80, 1, 82, 
+	81, 81, 81, 81, 81, 81, 81, 81, 
+	81, 81, 81, 81, 81, 81, 81, 81, 
+	81, 81, 81, 81, 81, 81, 81, 81, 
+	81, 81, 81, 81, 81, 81, 81, 81, 
+	81, 81, 81, 81, 81, 81, 81, 81, 
+	81, 81, 81, 81, 81, 81, 81, 81, 
+	81, 81, 81, 81, 81, 81, 81, 81, 
+	81, 83, 81, 84, 84, 84, 84, 84, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 84, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 85, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 76, 1, 74, 74, 74, 74, 
-	74, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 74, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 75, 
-	1, 1, 1, 77, 77, 77, 77, 77, 
-	77, 77, 77, 77, 77, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -373,34 +412,20 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 86, 
+	1, 81, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	76, 1, 78, 1, 78, 78, 78, 78, 
-	78, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 78, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 79, 1, 79, 
-	79, 79, 79, 79, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 79, 1, 
-	80, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 81, 82, 
-	82, 82, 82, 82, 82, 82, 82, 82, 
-	1, 84, 83, 83, 83, 83, 83, 83, 
-	83, 83, 83, 83, 83, 83, 83, 83, 
-	83, 83, 83, 83, 83, 83, 83, 83, 
-	83, 83, 83, 83, 83, 83, 83, 83, 
-	83, 83, 83, 83, 83, 83, 83, 83, 
-	83, 83, 83, 83, 83, 83, 83, 83, 
-	83, 83, 83, 83, 83, 83, 83, 83, 
-	83, 83, 83, 85, 83, 86, 86, 86, 
-	86, 86, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 86, 1, 1, 1, 
+	1, 1, 1, 81, 1, 87, 87, 87, 
+	87, 87, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	87, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 87, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	88, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -409,63 +434,65 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 88, 1, 83, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 89, 1, 87, 87, 87, 87, 87, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 87, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 88, 1, 
+	1, 1, 90, 90, 90, 90, 90, 90, 
+	90, 90, 90, 90, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 83, 1, 89, 
-	89, 89, 89, 89, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 89, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 90, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 89, 
+	1, 91, 1, 91, 91, 91, 91, 91, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 91, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 92, 1, 92, 92, 
+	92, 92, 92, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 92, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 93, 94, 94, 
+	94, 94, 94, 94, 94, 94, 94, 1, 
+	87, 87, 87, 87, 87, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 91, 1, 89, 89, 89, 
-	89, 89, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 87, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 89, 1, 1, 1, 
+	1, 1, 1, 88, 1, 1, 1, 95, 
+	95, 95, 95, 95, 95, 95, 95, 95, 
+	95, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	90, 1, 1, 1, 92, 92, 92, 92, 
-	92, 92, 92, 92, 92, 92, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 89, 1, 96, 96, 
+	96, 96, 96, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 96, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 91, 1, 93, 1, 93, 93, 93, 
-	93, 93, 1, 1, 1, 1, 1, 1, 
+	1, 97, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 93, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 94, 1, 
-	94, 94, 94, 94, 94, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 94, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 95, 
-	96, 96, 96, 96, 96, 96, 96, 96, 
-	96, 1, 89, 89, 89, 89, 89, 1, 
+	1, 1, 98, 1, 2, 2, 2, 2, 
+	2, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 2, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 89, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 90, 1, 1, 
-	1, 97, 97, 97, 97, 97, 97, 97, 
-	97, 97, 97, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
@@ -473,54 +500,42 @@ static const char _deserialize_json_indicies[] = {
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 91, 1, 
-	0, 0, 0, 0, 0, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 0, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 2, 1, 1, 0
+	1, 1, 1, 1, 1, 1, 3, 1, 
+	1, 0
 };
 
 static const char _deserialize_json_trans_targs[] = {
-	1, 0, 2, 2, 3, 4, 19, 25, 
-	38, 44, 52, 5, 13, 6, 7, 8, 
-	9, 12, 9, 12, 10, 2, 11, 10, 
-	11, 11, 56, 57, 14, 15, 16, 17, 
-	18, 17, 18, 10, 2, 11, 20, 21, 
-	22, 23, 24, 10, 2, 11, 24, 26, 
-	32, 27, 28, 29, 30, 31, 30, 31, 
-	10, 2, 11, 33, 34, 35, 36, 37, 
-	36, 37, 10, 2, 11, 39, 40, 41, 
-	42, 43, 10, 2, 11, 43, 45, 46, 
-	47, 50, 51, 47, 48, 49, 10, 2, 
-	11, 10, 2, 11, 51, 53, 54, 50, 
-	55, 55
+	1, 0, 2, 3, 3, 4, 5, 19, 
+	25, 38, 44, 52, 6, 13, 7, 8, 
+	9, 10, 12, 10, 12, 11, 3, 56, 
+	11, 56, 14, 15, 16, 17, 18, 17, 
+	18, 11, 3, 56, 20, 21, 22, 23, 
+	24, 11, 3, 56, 24, 26, 32, 27, 
+	28, 29, 30, 31, 30, 31, 11, 3, 
+	56, 33, 34, 35, 36, 37, 36, 37, 
+	11, 3, 56, 39, 40, 41, 42, 43, 
+	11, 3, 56, 43, 45, 46, 47, 50, 
+	51, 47, 48, 49, 11, 3, 56, 11, 
+	3, 56, 51, 53, 54, 50, 55, 55, 
+	56, 57, 58
 };
 
 static const char _deserialize_json_trans_actions[] = {
-	0, 0, 1, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 2, 
-	2, 2, 0, 0, 3, 3, 4, 0, 
-	5, 0, 0, 0, 0, 0, 2, 2, 
-	2, 0, 0, 6, 6, 7, 0, 0, 
-	0, 2, 2, 8, 8, 9, 0, 0, 
-	0, 0, 0, 2, 2, 2, 0, 0, 
-	10, 10, 11, 0, 0, 2, 2, 2, 
-	0, 0, 12, 12, 13, 0, 0, 0, 
-	2, 2, 14, 14, 15, 0, 0, 0, 
-	2, 16, 16, 0, 17, 0, 18, 18, 
-	19, 20, 20, 21, 17, 0, 0, 22, 
-	22, 23
+	0, 0, 0, 1, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	2, 2, 2, 0, 0, 3, 3, 4, 
+	0, 5, 0, 0, 2, 2, 2, 0, 
+	0, 6, 6, 7, 0, 0, 0, 2, 
+	2, 8, 8, 9, 0, 0, 0, 0, 
+	0, 2, 2, 2, 0, 0, 10, 10, 
+	11, 0, 0, 2, 2, 2, 0, 0, 
+	12, 12, 13, 0, 0, 0, 2, 2, 
+	14, 14, 15, 0, 0, 0, 2, 16, 
+	16, 0, 17, 0, 18, 18, 19, 20, 
+	20, 21, 17, 0, 0, 22, 22, 23, 
+	0, 0, 0
 };
 
 static const int deserialize_json_start = 1;
@@ -545,22 +560,17 @@ _hb_buffer_deserialize_json (hb_buffer_t *buffer,
   /* Ensure we have positions. */
   (void) hb_buffer_get_glyph_positions (buffer, nullptr);
 
-  while (p < pe && ISSPACE (*p))
-    p++;
-  if (p < pe && *p == (buffer->len ? ',' : '['))
-    *end_ptr = ++p;
-
   const char *tok = nullptr;
   int cs;
   hb_glyph_info_t info = {0};
   hb_glyph_position_t pos = {0};
   
-#line 559 "hb-buffer-deserialize-json.hh"
+#line 569 "hb-buffer-deserialize-json.hh"
 	{
 	cs = deserialize_json_start;
 	}
 
-#line 564 "hb-buffer-deserialize-json.hh"
+#line 574 "hb-buffer-deserialize-json.hh"
 	{
 	int _slen;
 	int _trans;
@@ -772,7 +782,7 @@ _resume:
 	*end_ptr = p;
 }
 	break;
-#line 776 "hb-buffer-deserialize-json.hh"
+#line 786 "hb-buffer-deserialize-json.hh"
 	}
 
 _again:
@@ -784,7 +794,7 @@ _again:
 	_out: {}
 	}
 
-#line 137 "hb-buffer-deserialize-json.rl"
+#line 132 "hb-buffer-deserialize-json.rl"
 
 
   *end_ptr = p;
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer.cc b/engine/thirdparty/harfbuzz/src/hb-buffer.cc
index 3fc86988..d0c40664 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer.cc
@@ -860,7 +860,7 @@ hb_buffer_destroy (hb_buffer_t *buffer)
  * @destroy: (nullable): A callback to call when @data is not needed anymore
  * @replace: Whether to replace an existing data with the same key
  *
- * Attaches a user-data key/data pair to the specified buffer. 
+ * Attaches a user-data key/data pair to the specified buffer.
  *
  * Return value: `true` if success, `false` otherwise
  *
@@ -1209,7 +1209,7 @@ hb_buffer_get_flags (const hb_buffer_t *buffer)
  * @cluster_level: The cluster level to set on the buffer
  *
  * Sets the cluster level of a buffer. The #hb_buffer_cluster_level_t
- * dictates one aspect of how HarfBuzz will treat non-base characters 
+ * dictates one aspect of how HarfBuzz will treat non-base characters
  * during shaping.
  *
  * Since: 0.9.42
@@ -1229,7 +1229,7 @@ hb_buffer_set_cluster_level (hb_buffer_t               *buffer,
  * @buffer: An #hb_buffer_t
  *
  * Fetches the cluster level of a buffer. The #hb_buffer_cluster_level_t
- * dictates one aspect of how HarfBuzz will treat non-base characters 
+ * dictates one aspect of how HarfBuzz will treat non-base characters
  * during shaping.
  *
  * Return value: The cluster level of @buffer
@@ -1983,7 +1983,7 @@ hb_buffer_add_codepoints (hb_buffer_t          *buffer,
  * @buffer: An #hb_buffer_t
  * @source: source #hb_buffer_t
  * @start: start index into source buffer to copy.  Use 0 to copy from start of buffer.
- * @end: end index into source buffer to copy.  Use @HB_FEATURE_GLOBAL_END to copy to end of buffer.
+ * @end: end index into source buffer to copy.  Use @UINT_MAX (or ((unsigned int) -1)) to copy to end of buffer.
  *
  * Append (part of) contents of another buffer to this buffer.
  *
diff --git a/engine/thirdparty/harfbuzz/src/hb-buffer.hh b/engine/thirdparty/harfbuzz/src/hb-buffer.hh
index 2a6ad612..b353b06c 100644
--- a/engine/thirdparty/harfbuzz/src/hb-buffer.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-buffer.hh
@@ -32,7 +32,6 @@
 
 #include "hb.hh"
 #include "hb-unicode.hh"
-#include "hb-set-digest.hh"
 
 
 static_assert ((sizeof (hb_glyph_info_t) == 20), "");
@@ -182,22 +181,24 @@ struct hb_buffer_t
     allocated_var_bits = 0;
   }
 
+  HB_ALWAYS_INLINE
   hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; }
+  HB_ALWAYS_INLINE
   hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; }
 
+  HB_ALWAYS_INLINE
   hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; }
+  HB_ALWAYS_INLINE
   hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; }
 
+  HB_ALWAYS_INLINE
   hb_glyph_info_t &prev ()      { return out_info[out_len ? out_len - 1 : 0]; }
+  HB_ALWAYS_INLINE
   hb_glyph_info_t prev () const { return out_info[out_len ? out_len - 1 : 0]; }
 
-  hb_set_digest_t digest () const
-  {
-    hb_set_digest_t d;
-    d.init ();
-    d.add_array (&info[0].codepoint, len, sizeof (info[0]));
-    return d;
-  }
+  template <typename set_t>
+  void collect_codepoints (set_t &d) const
+  { d.clear (); d.add_array (&info[0].codepoint, len, sizeof (info[0])); }
 
   HB_INTERNAL void similar (const hb_buffer_t &src);
   HB_INTERNAL void reset ();
diff --git a/engine/thirdparty/harfbuzz/src/hb-cairo.cc b/engine/thirdparty/harfbuzz/src/hb-cairo.cc
index d8b582c4..89332d71 100644
--- a/engine/thirdparty/harfbuzz/src/hb-cairo.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-cairo.cc
@@ -180,7 +180,7 @@ hb_cairo_paint_color_glyph (hb_paint_funcs_t *pfuncs HB_UNUSED,
 
   hb_position_t x_scale, y_scale;
   hb_font_get_scale (font, &x_scale, &y_scale);
-  cairo_scale (cr, x_scale, y_scale);
+  cairo_scale (cr, x_scale, -y_scale);
 
   cairo_glyph_t cairo_glyph = { glyph, 0, 0 };
   cairo_set_scaled_font (cr, c->scaled_font);
@@ -597,7 +597,9 @@ hb_cairo_render_glyph (cairo_scaled_font_t  *scaled_font,
 
   hb_position_t x_scale, y_scale;
   hb_font_get_scale (font, &x_scale, &y_scale);
-  cairo_scale (cr, +1./x_scale, -1./y_scale);
+  cairo_scale (cr,
+	       +1. / (x_scale ? x_scale : 1),
+	       -1. / (y_scale ? y_scale : 1));
 
   hb_font_draw_glyph (font, glyph, hb_cairo_draw_get_funcs (), cr);
 
@@ -628,7 +630,9 @@ hb_cairo_render_color_glyph (cairo_scaled_font_t  *scaled_font,
   hb_color_t color = HB_COLOR (0, 0, 0, 255);
   hb_position_t x_scale, y_scale;
   hb_font_get_scale (font, &x_scale, &y_scale);
-  cairo_scale (cr, +1./x_scale, -1./y_scale);
+  cairo_scale (cr,
+	       +1. / (x_scale ? x_scale : 1),
+	       -1. / (y_scale ? y_scale : 1));
 
   hb_cairo_context_t c;
   c.scaled_font = scaled_font;
@@ -1000,6 +1004,7 @@ hb_cairo_glyphs_from_buffer (hb_buffer_t *buffer,
 	    end = start + hb_glyph[i].cluster - hb_glyph[i+1].cluster;
 	  else
 	    end = (const char *) hb_utf_offset_to_pointer<hb_utf8_t> ((const uint8_t *) start,
+								      (const uint8_t *) utf8, utf8_len,
 								      (signed) (hb_glyph[i].cluster - hb_glyph[i+1].cluster));
 	  (*clusters)[cluster].num_bytes = end - start;
 	  start = end;
@@ -1020,6 +1025,7 @@ hb_cairo_glyphs_from_buffer (hb_buffer_t *buffer,
 	    end = start + hb_glyph[i].cluster - hb_glyph[i-1].cluster;
 	  else
 	    end = (const char *) hb_utf_offset_to_pointer<hb_utf8_t> ((const uint8_t *) start,
+								      (const uint8_t *) utf8, utf8_len,
 								      (signed) (hb_glyph[i].cluster - hb_glyph[i-1].cluster));
 	  (*clusters)[cluster].num_bytes = end - start;
 	  start = end;
diff --git a/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh b/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh
index 6ca7500a..b0491385 100644
--- a/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-cff-interp-common.hh
@@ -522,7 +522,7 @@ struct parsed_values_t
 
   void alloc (unsigned n)
   {
-    values.alloc (n, true);
+    values.alloc_exact (n);
   }
 
   void add_op (op_code_t op, const byte_str_ref_t& str_ref = byte_str_ref_t (), const VAL &v = VAL ())
diff --git a/engine/thirdparty/harfbuzz/src/hb-common.cc b/engine/thirdparty/harfbuzz/src/hb-common.cc
index 4b8bae44..5d77433b 100644
--- a/engine/thirdparty/harfbuzz/src/hb-common.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-common.cc
@@ -625,6 +625,9 @@ hb_script_get_horizontal_direction (hb_script_t script)
     /* Unicode-14.0 additions */
     case HB_SCRIPT_OLD_UYGHUR:
 
+    /* Unicode-16.0 additions */
+    case HB_SCRIPT_GARAY:
+
       return HB_DIRECTION_RTL;
 
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-config.hh b/engine/thirdparty/harfbuzz/src/hb-config.hh
index 14105846..40cc2403 100644
--- a/engine/thirdparty/harfbuzz/src/hb-config.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-config.hh
@@ -68,8 +68,6 @@
 #define HB_NO_FACE_COLLECT_UNICODES
 #define HB_NO_GETENV
 #define HB_NO_HINTING
-#define HB_NO_LANGUAGE_LONG
-#define HB_NO_LANGUAGE_PRIVATE_SUBTAG
 #define HB_NO_LAYOUT_FEATURE_PARAMS
 #define HB_NO_LAYOUT_COLLECT_GLYPHS
 #define HB_NO_LAYOUT_RARELY_USED
@@ -159,6 +157,7 @@
 #define HB_NO_FALLBACK_SHAPE
 #define HB_NO_OT_KERN
 #define HB_NO_OT_LAYOUT_BLOCKLIST
+#define HB_NO_AAT_LAYOUT_BLOCKLIST
 #define HB_NO_OT_SHAPE_FALLBACK
 #endif
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-coretext-font.cc b/engine/thirdparty/harfbuzz/src/hb-coretext-font.cc
index e6a02cce..b9726373 100644
--- a/engine/thirdparty/harfbuzz/src/hb-coretext-font.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-coretext-font.cc
@@ -34,8 +34,12 @@
 #include "hb-font.hh"
 #include "hb-machinery.hh"
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+#if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1080) \
+    || (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 60000) \
+    || (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 90000)
 #  define kCTFontOrientationDefault kCTFontDefaultOrientation
+#  define kCTFontOrientationHorizontal kCTFontHorizontalOrientation
+#  define kCTFontOrientationVertical kCTFontVerticalOrientation
 #endif
 
 #define MAX_GLYPHS 64u
@@ -56,11 +60,25 @@ hb_coretext_get_nominal_glyph (hb_font_t *font HB_UNUSED,
 			       void *user_data HB_UNUSED)
 {
   CTFontRef ct_font = (CTFontRef) font_data;
-  UniChar ch = unicode;
-  CGGlyph cg_glyph;
-  if (CTFontGetGlyphsForCharacters (ct_font, &ch, &cg_glyph, 1))
+  UniChar ch[2];
+  CGGlyph cg_glyph[2];
+  unsigned count = 0;
+
+  if (unicode <= 0xFFFF)
   {
-    *glyph = cg_glyph;
+    ch[count++] = unicode;
+  }
+  else if (unicode <= 0x10FFFF)
+  {
+    ch[count++] = (unicode >> 10) + 0xD7C0;
+    ch[count++] = (unicode & 0x3FF) + 0xDC00;
+  }
+  else
+    ch[count++] = 0xFFFD;
+
+  if (CTFontGetGlyphsForCharacters (ct_font, ch, cg_glyph, count))
+  {
+    *glyph = cg_glyph[0];
     return true;
   }
   return false;
@@ -76,6 +94,31 @@ hb_coretext_get_nominal_glyphs (hb_font_t *font HB_UNUSED,
 				unsigned int glyph_stride,
 				void *user_data HB_UNUSED)
 {
+  // If any non-BMP codepoint is requested, use the slow path.
+  bool slow_path = false;
+  auto *unicode = first_unicode;
+  for (unsigned i = 0; i < count; i++)
+  {
+    if (*unicode > 0xFFFF)
+    {
+      slow_path = true;
+      break;
+    }
+    unicode = &StructAtOffset<const hb_codepoint_t> (unicode, unicode_stride);
+  }
+
+  if (unlikely (slow_path))
+  {
+    for (unsigned i = 0; i < count; i++)
+    {
+      if (!hb_coretext_get_nominal_glyph (font, font_data, *first_unicode, first_glyph, nullptr))
+	return i;
+      first_unicode = &StructAtOffset<const hb_codepoint_t> (first_unicode, unicode_stride);
+      first_glyph = &StructAtOffset<hb_codepoint_t> (first_glyph, glyph_stride);
+    }
+    return count;
+  }
+
   CTFontRef ct_font = (CTFontRef) font_data;
 
   UniChar ch[MAX_GLYPHS];
@@ -88,7 +131,16 @@ hb_coretext_get_nominal_glyphs (hb_font_t *font HB_UNUSED,
       ch[j] = *first_unicode;
       first_unicode = &StructAtOffset<const hb_codepoint_t> (first_unicode, unicode_stride);
     }
-    CTFontGetGlyphsForCharacters (ct_font, ch, cg_glyph, c);
+    if (unlikely (!CTFontGetGlyphsForCharacters (ct_font, ch, cg_glyph, c)))
+    {
+      // Use slow path partially and return at first failure.
+      for (unsigned j = 0; j < c; j++)
+      {
+	if (!hb_coretext_get_nominal_glyph (font, font_data, ch[j], first_glyph, nullptr))
+	  return i + j;
+	first_glyph = &StructAtOffset<hb_codepoint_t> (first_glyph, glyph_stride);
+      }
+    }
     for (unsigned j = 0; j < c; j++)
     {
       *first_glyph = cg_glyph[j];
@@ -109,13 +161,38 @@ hb_coretext_get_variation_glyph (hb_font_t *font HB_UNUSED,
 {
   CTFontRef ct_font = (CTFontRef) font_data;
 
-  UniChar ch[2] = { unicode, variation_selector };
-  CGGlyph cg_glyph[2];
+  UniChar ch[4];
+  CGGlyph cg_glyph[4];
+  unsigned count = 0;
 
-  CTFontGetGlyphsForCharacters (ct_font, ch, cg_glyph, 2);
+  // Add Unicode, then variation selector. Ugly, but works.
+  //
+  if (unicode <= 0xFFFF)
+    ch[count++] = unicode;
+  else if (unicode <= 0x10FFFF)
+  {
+    ch[count++] = (unicode >> 10) + 0xD7C0;
+    ch[count++] = (unicode & 0x3FF) + 0xDC00;
+  }
+  else
+    ch[count++] = 0xFFFD;
 
-  if (cg_glyph[1])
-    return false;
+  if (variation_selector <= 0xFFFF)
+    ch[count++] = variation_selector;
+  else if (variation_selector <= 0x10FFFF)
+  {
+    ch[count++] = (variation_selector >> 10) + 0xD7C0;
+    ch[count++] = (variation_selector & 0x3FF) + 0xDC00;
+  }
+  else
+    ch[count++] = 0xFFFD;
+
+  CTFontGetGlyphsForCharacters (ct_font, ch, cg_glyph, count);
+
+  // All except for first should be zero if we succeeded
+  for (unsigned i = 1; i < count; i++)
+    if (cg_glyph[i])
+      return false;
 
   *glyph = cg_glyph[0];
   return true;
@@ -434,10 +511,6 @@ _hb_coretext_get_font_funcs ()
  * created with hb_face_create(), and therefore was not
  * initially configured to use CoreText font functions.
  *
- * An #hb_font_t object created with hb_coretext_font_create()
- * is preconfigured for CoreText font functions and does not
- * require this function to be used.
- *
  * <note>Note: Internally, this function creates a CTFont.
 * </note>
  *
@@ -448,7 +521,12 @@ hb_coretext_font_set_funcs (hb_font_t *font)
 {
   CTFontRef ct_font = hb_coretext_font_get_ct_font (font);
   if (unlikely (!ct_font))
+  {
+    hb_font_set_funcs (font,
+		       hb_font_funcs_get_empty (),
+		       nullptr, nullptr);
     return;
+  }
 
   hb_font_set_funcs (font,
 		     _hb_coretext_get_font_funcs (),
diff --git a/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc b/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc
index 73443796..0bb235f6 100644
--- a/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-coretext-shape.cc
@@ -45,9 +45,6 @@
  * Functions for using HarfBuzz with the CoreText fonts.
  **/
 
-/* https://developer.apple.com/documentation/coretext/1508745-ctfontcreatewithgraphicsfont */
-#define HB_CORETEXT_DEFAULT_FONT_SIZE 12.f
-
 static CTFontRef create_ct_font (CGFontRef cg_font, CGFloat font_size);
 
 static void
@@ -384,9 +381,9 @@ hb_coretext_face_create_from_file_or_fail (const char   *file_name,
 		      (CTFontDescriptorRef) CFArrayGetValueAtIndex (ct_font_desc_array, index) : nullptr;
   if (unlikely (!ct_font_desc))
   {
-	  CFRelease (ct_font_desc_array);
-	  CFRelease (url);
-	  return nullptr;
+    CFRelease (ct_font_desc_array);
+    CFRelease (url);
+    return nullptr;
   }
   CFRelease (url);
   auto ct_font = ct_font_desc ? CTFontCreateWithFontDescriptor (ct_font_desc, 0, nullptr) : nullptr;
@@ -400,6 +397,7 @@ hb_coretext_face_create_from_file_or_fail (const char   *file_name,
     return nullptr;
 
   hb_face_t *face = hb_coretext_face_create (cg_font);
+  CFRelease (cg_font);
   if (unlikely (hb_face_is_immutable (face)))
     return nullptr;
 
@@ -432,7 +430,7 @@ _hb_coretext_shaper_font_data_create (hb_font_t *font)
   if (unlikely (!face_data)) return nullptr;
   CGFontRef cg_font = (CGFontRef) (const void *) face->data.coretext;
 
-  CGFloat font_size = (CGFloat) (font->ptem <= 0.f ? HB_CORETEXT_DEFAULT_FONT_SIZE : font->ptem);
+  CGFloat font_size = (CGFloat) (font->ptem > 0.f ? font->ptem : HB_CORETEXT_DEFAULT_FONT_SIZE);
   CTFontRef ct_font = create_ct_font (cg_font, font_size);
 
   if (unlikely (!ct_font))
@@ -451,11 +449,11 @@ _hb_coretext_shaper_font_data_create (hb_font_t *font)
 
     for (unsigned i = 0; i < font->num_coords; i++)
     {
-      if (font->coords[i] == 0.) continue;
-
       hb_ot_var_axis_info_t info;
       unsigned int c = 1;
       hb_ot_var_get_axis_infos (font->face, i, &c, &info);
+      if (font->design_coords[i] == info.default_value)
+	continue;
       float v = hb_clamp (font->design_coords[i], info.min_value, info.max_value);
 
       CFNumberRef tag_number = CFNumberCreate (kCFAllocatorDefault, kCFNumberIntType, &info.tag);
@@ -499,7 +497,7 @@ _hb_coretext_shaper_font_data_destroy (hb_coretext_font_data_t *data)
  * CTFontRef.
  *
  * The created font uses the default font functions implemented
- * navitely by HarfBuzz. If you want to use the CoreText font functions
+ * natively by HarfBuzz. If you want to use the CoreText font functions
  * instead (rarely needed), you can do so by calling
  * by hb_coretext_font_set_funcs().
  *
@@ -521,6 +519,36 @@ hb_coretext_font_create (CTFontRef ct_font)
 
   hb_font_set_ptem (font, CTFontGetSize (ct_font));
 
+  /* Copy font variations */
+  CFDictionaryRef variations = CTFontCopyVariation (ct_font);
+  if (variations)
+  {
+    hb_vector_t<hb_variation_t> vars;
+    hb_vector_t<CFTypeRef> keys;
+    hb_vector_t<CFTypeRef> values;
+
+    CFIndex count = CFDictionaryGetCount (variations);
+    if (unlikely (!vars.alloc_exact (count) || !keys.resize_exact (count) || !values.resize_exact (count)))
+      goto done;
+
+    // Fetch them one by one and collect in a vector of our own.
+    CFDictionaryGetKeysAndValues (variations, keys.arrayZ, values.arrayZ);
+    for (CFIndex i = 0; i < count; i++)
+    {
+      int tag;
+      float value;
+      CFNumberGetValue ((CFNumberRef) keys.arrayZ[i], kCFNumberIntType, &tag);
+      CFNumberGetValue ((CFNumberRef) values.arrayZ[i], kCFNumberFloatType, &value);
+
+      hb_variation_t var = {tag, value};
+      vars.push (var);
+    }
+    hb_font_set_variations (font, vars.arrayZ, vars.length);
+
+done:
+    CFRelease (variations);
+  }
+
   /* Let there be dragons here... */
   font->data.coretext.cmpexch (nullptr, (hb_coretext_font_data_t *) CFRetain (ct_font));
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-decycler.hh b/engine/thirdparty/harfbuzz/src/hb-decycler.hh
new file mode 100644
index 00000000..95b96102
--- /dev/null
+++ b/engine/thirdparty/harfbuzz/src/hb-decycler.hh
@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2025 Behdad Esfahbod
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Author(s): Behdad Esfahbod
+ */
+
+#ifndef HB_DECYCLER_HH
+#define HB_DECYCLER_HH
+
+#include "hb.hh"
+
+/*
+ * hb_decycler_t is an efficient cycle detector for graph traversal.
+ * It's a simple tortoise-and-hare algorithm with a twist: it's
+ * designed to detect cycles while traversing a graph in a DFS manner,
+ * instead of just a linked list.
+ *
+ * For Floyd's tortoise and hare algorithm, see:
+ * https://en.wikipedia.org/wiki/Cycle_detection#Floyd's_tortoise_and_hare
+ *
+ * hb_decycler_t is O(n) in the number of nodes in the DFS traversal
+ * if there are no cycles. Unlike Floyd's algorithm, hb_decycler_t
+ * can be used in a DFS traversal, where the graph is not a simple
+ * linked list, but a tree with possible cycles.  Like Floyd's algorithm,
+ * it is constant-memory (~three  pointers).
+ *
+ * The decycler works by creating an implicit linked-list on the stack,
+ * of the path from the root to the current node, and apply Floyd's
+ * algorithm on that list as it goes.
+ *
+ * The decycler is malloc-free, and as such, much faster to use than a
+ * hb_set_t or hb_map_t equivalent.
+ *
+ * The decycler detects cycles in the graph *eventually*, not *immediately*.
+ * That is, it may not detect a cycle until the cycle is fully traversed,
+ * even multiple times. See Floyd's algorithm analysis for details.
+ *
+ * The implementation saves a pointer storage on the stack by combining
+ * this->u.decycler and this->u.next into a union.  This is possible because
+ * at any point we only need one of those values. The invariant is that
+ * after construction, and before destruction, of a node, the u.decycler
+ * field is always valid. The u.next field is only valid when the node is
+ * in the traversal path, parent to another node.
+ *
+ * There are three method's:
+ *
+ *   - hb_decycler_node_t() constructor: Creates a new node in the traversal.
+ *     The constructor takes a reference to the decycler object and inserts
+ *     itself as the latest node in the traversal path, by advancing the hare
+ *     pointer, and for every other descent, advancing the tortoise pointer.
+ *
+ *   - ~hb_decycler_node_t() destructor: Restores the decycler object to its
+ *      previous state by removing the node from the traversal path.
+ *
+ *   - bool visit(uintptr_t value): Called on every node in the graph.  Returns
+ *     true if the node is not part of a cycle, and false if it is.  The value
+ *     parameter is used to detect cycles.  It's the caller's responsibility
+ *     to ensure that the value is unique for each node in the graph.
+ *     The cycle detection is as simple as comparing the value to the value
+ *     held by the tortoise pointer, which is the Floyd's algorithm.
+ *
+ * For usage examples see test-decycler.cc.
+ */
+
+struct hb_decycler_node_t;
+
+struct hb_decycler_t
+{
+  friend struct hb_decycler_node_t;
+
+  private:
+  bool tortoise_awake = false;
+  hb_decycler_node_t *tortoise = nullptr;
+  hb_decycler_node_t *hare = nullptr;
+};
+
+struct hb_decycler_node_t
+{
+  hb_decycler_node_t (hb_decycler_t &decycler)
+  {
+    u.decycler = &decycler;
+
+    decycler.tortoise_awake = !decycler.tortoise_awake;
+
+    if (!decycler.tortoise)
+    {
+      // First node.
+      assert (decycler.tortoise_awake);
+      assert (!decycler.hare);
+      decycler.tortoise = decycler.hare = this;
+      return;
+    }
+
+    if (decycler.tortoise_awake)
+      decycler.tortoise = decycler.tortoise->u.next; // Time to move.
+
+    this->prev = decycler.hare;
+    decycler.hare->u.next = this;
+    decycler.hare = this;
+  }
+
+  ~hb_decycler_node_t ()
+  {
+    hb_decycler_t &decycler = *u.decycler;
+
+    // Inverse of the constructor.
+
+    assert (decycler.hare == this);
+    decycler.hare = prev;
+    if (prev)
+      prev->u.decycler = &decycler;
+
+    assert (decycler.tortoise);
+    if (decycler.tortoise_awake)
+      decycler.tortoise = decycler.tortoise->prev;
+
+    decycler.tortoise_awake = !decycler.tortoise_awake;
+  }
+
+  bool visit (uintptr_t value_)
+  {
+    value = value_;
+
+    hb_decycler_t &decycler = *u.decycler;
+
+    if (decycler.tortoise == this)
+      return true; // First node; not a cycle.
+
+    if (decycler.tortoise->value == value)
+      return false; // Cycle detected.
+
+    return true;
+  }
+
+  private:
+  union {
+    hb_decycler_t *decycler;
+    hb_decycler_node_t *next;
+  } u = {nullptr};
+  hb_decycler_node_t *prev = nullptr;
+  uintptr_t value = 0;
+};
+
+#endif /* HB_DECYCLER_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-directwrite.cc b/engine/thirdparty/harfbuzz/src/hb-directwrite.cc
index 6c90265d..5b191262 100644
--- a/engine/thirdparty/harfbuzz/src/hb-directwrite.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-directwrite.cc
@@ -29,6 +29,7 @@
 #include "hb-shaper-impl.hh"
 
 #include <dwrite_1.h>
+#include <dwrite_3.h>
 
 #include "hb-directwrite.h"
 
@@ -275,6 +276,8 @@ _hb_directwrite_shaper_font_data_create (hb_font_t *font)
 void
 _hb_directwrite_shaper_font_data_destroy (hb_directwrite_font_data_t *data)
 {
+  if (data != HB_SHAPER_DATA_SUCCEEDED)
+    ((IDWriteFont *) (const void *) data)->Release();
 }
 
 
@@ -839,7 +842,7 @@ _hb_directwrite_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *
 }
 
 static void
-_hb_directwrite_font_release (void *data)
+_hb_directwrite_face_release (void *data)
 {
   if (data)
     ((IDWriteFontFace *) data)->Release ();
@@ -847,7 +850,7 @@ _hb_directwrite_font_release (void *data)
 
 /**
  * hb_directwrite_face_create:
- * @font_face: a DirectWrite IDWriteFontFace object.
+ * @dw_face: a DirectWrite IDWriteFontFace object.
  *
  * Constructs a new face object from the specified DirectWrite IDWriteFontFace.
  *
@@ -856,14 +859,32 @@ _hb_directwrite_font_release (void *data)
  * Since: 2.4.0
  **/
 hb_face_t *
-hb_directwrite_face_create (IDWriteFontFace *font_face)
+hb_directwrite_face_create (IDWriteFontFace *dw_face)
 {
-  if (font_face)
-    font_face->AddRef ();
-  return hb_face_create_for_tables (_hb_directwrite_reference_table, font_face,
-				    _hb_directwrite_font_release);
+  if (dw_face)
+    dw_face->AddRef ();
+  return hb_face_create_for_tables (_hb_directwrite_reference_table, dw_face,
+				    _hb_directwrite_face_release);
 }
 
+/**
+* hb_directwrite_face_get_dw_font_face:
+* @face: a #hb_face_t object
+*
+* Gets the DirectWrite IDWriteFontFace associated with @face.
+*
+* Return value: DirectWrite IDWriteFontFace object corresponding to the given input
+*
+* Since: 10.4.0
+**/
+IDWriteFontFace *
+hb_directwrite_face_get_dw_font_face (hb_face_t *face)
+{
+  return face->data.directwrite->fontFace;
+}
+
+#ifndef HB_DISABLE_DEPRECATED
+
 /**
 * hb_directwrite_face_get_font_face:
 * @face: a #hb_face_t object
@@ -873,12 +894,90 @@ hb_directwrite_face_create (IDWriteFontFace *font_face)
 * Return value: DirectWrite IDWriteFontFace object corresponding to the given input
 *
 * Since: 2.5.0
+* Deprecated: 10.4.0: Use hb_directwrite_face_get_dw_font_face() instead
 **/
 IDWriteFontFace *
 hb_directwrite_face_get_font_face (hb_face_t *face)
 {
-  return face->data.directwrite->fontFace;
+  return hb_directwrite_face_get_dw_font_face (face);
 }
 
+#endif
+
+/**
+ * hb_directwrite_font_create:
+ * @dw_font: a DirectWrite IDWriteFont object.
+ *
+ * Constructs a new font object from the specified DirectWrite IDWriteFont.
+ *
+ * Return value: #hb_font_t object corresponding to the given input
+ *
+ * Since: 10.3.0
+ **/
+hb_font_t *
+hb_directwrite_font_create (IDWriteFont *dw_font)
+{
+  IDWriteFontFace *dw_face = nullptr;
+  IDWriteFontFace5 *dw_face5 = nullptr;
+
+  if (FAILED (dw_font->CreateFontFace (&dw_face)))
+    return hb_font_get_empty ();
+
+  hb_face_t *face = hb_directwrite_face_create (dw_face);
+  hb_font_t *font = hb_font_create (face);
+  hb_face_destroy (face);
+
+  if (unlikely (hb_object_is_immutable (font)))
+    goto done;
+
+  /* Copy font variations */
+  if (SUCCEEDED (dw_face->QueryInterface (__uuidof (IDWriteFontFace5), (void**) &dw_face5)))
+  {
+    if (dw_face5->HasVariations ())
+    {
+      hb_vector_t<DWRITE_FONT_AXIS_VALUE> values;
+      uint32_t count = dw_face5->GetFontAxisValueCount ();
+      if (likely (values.resize_exact (count)) &&
+	  SUCCEEDED (dw_face5->GetFontAxisValues (values.arrayZ, count)))
+      {
+	hb_vector_t<hb_variation_t> vars;
+	if (likely (vars.resize_exact (count)))
+	{
+	  for (uint32_t i = 0; i < count; ++i)
+	  {
+	    hb_tag_t tag = values[i].axisTag;
+	    float value = values[i].value;
+	    vars[i] = {tag, value};
+	  }
+	  hb_font_set_variations (font, vars.arrayZ, vars.length);
+	}
+      }
+    }
+    dw_face5->Release ();
+  }
+
+  dw_font->AddRef ();
+  font->data.directwrite.cmpexch (nullptr, (hb_directwrite_font_data_t *) dw_font);
+
+done:
+  dw_face->Release ();
+  return font;
+}
+
+/**
+* hb_directwrite_font_get_dw_font:
+* @font: a #hb_font_t object
+*
+* Gets the DirectWrite IDWriteFont associated with @font.
+*
+* Return value: DirectWrite IDWriteFont object corresponding to the given input
+*
+* Since: 10.3.0
+**/
+IDWriteFont *
+hb_directwrite_font_get_dw_font (hb_font_t *font)
+{
+  return (IDWriteFont *) (const void *) font->data.directwrite;
+}
 
 #endif
diff --git a/engine/thirdparty/harfbuzz/src/hb-directwrite.h b/engine/thirdparty/harfbuzz/src/hb-directwrite.h
index f837627a..121569c1 100644
--- a/engine/thirdparty/harfbuzz/src/hb-directwrite.h
+++ b/engine/thirdparty/harfbuzz/src/hb-directwrite.h
@@ -30,11 +30,25 @@
 HB_BEGIN_DECLS
 
 HB_EXTERN hb_face_t *
-hb_directwrite_face_create (IDWriteFontFace *font_face);
+hb_directwrite_face_create (IDWriteFontFace *dw_face);
 
+HB_EXTERN IDWriteFontFace *
+hb_directwrite_face_get_dw_font_face (hb_face_t *face);
+
+HB_EXTERN hb_font_t *
+hb_directwrite_font_create (IDWriteFont *dw_font);
+
+HB_EXTERN IDWriteFont *
+hb_directwrite_font_get_dw_font (hb_font_t *font);
+
+#ifndef HB_DISABLE_DEPRECATED
+
+HB_DEPRECATED_FOR (hb_directwrite_face_get_dw_font_face)
 HB_EXTERN IDWriteFontFace *
 hb_directwrite_face_get_font_face (hb_face_t *face);
 
+#endif
+
 HB_END_DECLS
 
 #endif /* HB_DIRECTWRITE_H */
diff --git a/engine/thirdparty/harfbuzz/src/hb-face.cc b/engine/thirdparty/harfbuzz/src/hb-face.cc
index bc0f6d90..002bb37d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-face.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-face.cc
@@ -291,6 +291,7 @@ hb_face_create_or_fail (hb_blob_t    *blob,
   return face;
 }
 
+#ifndef HB_NO_OPEN
 /**
  * hb_face_create_from_file_or_fail:
  * @file_name: A font filename
@@ -317,6 +318,7 @@ hb_face_create_from_file_or_fail (const char   *file_name,
 
   return face;
 }
+#endif
 
 /**
  * hb_face_get_empty:
@@ -470,7 +472,8 @@ hb_face_is_immutable (const hb_face_t *face)
  * @tag: The #hb_tag_t of the table to query
  *
  * Fetches a reference to the specified table within
- * the specified face.
+ * the specified face. Returns an empty blob if referencing table data is not
+ * possible.
  *
  * Return value: (transfer full): A pointer to the @tag table within @face
  *
@@ -490,9 +493,10 @@ hb_face_reference_table (const hb_face_t *face,
  * hb_face_reference_blob:
  * @face: A face object
  *
- * Fetches a pointer to the binary blob that contains the
- * specified face. Returns an empty blob if referencing face data is not
- * possible.
+ * Fetches a pointer to the binary blob that contains the specified face.
+ * If referencing the face data is not possible, this function creates a blob
+ * out of individual table blobs if hb_face_get_table_tags() works with this
+ * face, otherwise it returns an empty blob.
  *
  * Return value: (transfer full): A pointer to the blob for @face
  *
@@ -501,7 +505,41 @@ hb_face_reference_table (const hb_face_t *face,
 hb_blob_t *
 hb_face_reference_blob (hb_face_t *face)
 {
-  return face->reference_table (HB_TAG_NONE);
+  hb_blob_t *blob = face->reference_table (HB_TAG_NONE);
+
+  if (blob == hb_blob_get_empty ())
+  {
+    // If referencing the face blob is not possible (e.g. not implemented by the
+    // font functions), use face builder to create a blob out of individual
+    // table blobs.
+    unsigned total_count = hb_face_get_table_tags (face, 0, nullptr, nullptr);
+    if (total_count)
+    {
+      hb_tag_t tags[64];
+      unsigned count = ARRAY_LENGTH (tags);
+      hb_face_t* builder = hb_face_builder_create ();
+
+      for (unsigned offset = 0; offset < total_count; offset += count)
+      {
+        hb_face_get_table_tags (face, offset, &count, tags);
+	if (unlikely (!count))
+	  break; // Allocation error
+        for (unsigned i = 0; i < count; i++)
+        {
+	  if (unlikely (!tags[i]))
+	    continue;
+	  hb_blob_t *table = hb_face_reference_table (face, tags[i]);
+	  hb_face_builder_add_table (builder, tags[i], table);
+	  hb_blob_destroy (table);
+        }
+      }
+
+      blob = hb_face_reference_blob (builder);
+      hb_face_destroy (builder);
+    }
+  }
+
+  return blob;
 }
 
 /**
@@ -643,6 +681,7 @@ hb_face_set_get_table_tags_func (hb_face_t *face,
   {
     if (destroy)
       destroy (user_data);
+    return;
   }
 
   if (face->get_table_tags_destroy)
diff --git a/engine/thirdparty/harfbuzz/src/hb-face.h b/engine/thirdparty/harfbuzz/src/hb-face.h
index 8aec681c..afc19854 100644
--- a/engine/thirdparty/harfbuzz/src/hb-face.h
+++ b/engine/thirdparty/harfbuzz/src/hb-face.h
@@ -73,9 +73,14 @@ hb_face_create_from_file_or_fail (const char   *file_name,
  * @tag: the tag of the table to reference
  * @user_data: User data pointer passed by the caller
  *
- * Callback function for hb_face_create_for_tables().
+ * Callback function for hb_face_create_for_tables(). The @tag is the tag of the
+ * table to reference, and the special tag #HB_TAG_NONE is used to reference the
+ * blob of the face itself. If referencing the face blob is not possible, it is
+ * recommended to set hb_get_table_tags_func_t on the @face to allow
+ * hb_face_reference_blob() to create a face blob out of individual table blobs.
  *
- * Return value: (transfer full): A pointer to the @tag table within @face
+ * Return value: (transfer full): A pointer to the @tag table within @face or
+ * `NULL` if the table is not found or cannot be referenced.
  *
  * Since: 0.9.2
  */
diff --git a/engine/thirdparty/harfbuzz/src/hb-ft-colr.hh b/engine/thirdparty/harfbuzz/src/hb-ft-colr.hh
index 8766a2a2..c9669836 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ft-colr.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ft-colr.hh
@@ -27,6 +27,7 @@
 
 #include "hb.hh"
 
+#include "hb-decycler.hh"
 #include "hb-paint-extents.hh"
 
 #include FT_COLOR_H
@@ -105,8 +106,8 @@ struct hb_ft_paint_context_t
   FT_Color *palette;
   unsigned palette_index;
   hb_color_t foreground;
-  hb_map_t current_glyphs;
-  hb_map_t current_layers;
+  hb_decycler_t glyphs_decycler;
+  hb_decycler_t layers_decycler;
   int depth_left = HB_MAX_NESTING_LEVEL;
   int edge_count = HB_MAX_GRAPH_EDGE_COUNT;
 };
@@ -218,22 +219,19 @@ _hb_ft_paint (hb_ft_paint_context_t *c,
     case FT_COLR_PAINTFORMAT_COLR_LAYERS:
     {
       FT_OpaquePaint other_paint = {0};
+      hb_decycler_node_t node (c->layers_decycler);
       while (FT_Get_Paint_Layers (ft_face,
 				  &paint.u.colr_layers.layer_iterator,
 				  &other_paint))
       {
-        unsigned i = paint.u.colr_layers.layer_iterator.layer;
-
-	if (unlikely (c->current_layers.has (i)))
+	// FreeType doesn't provide a way to get the layer index, so we use the pointer
+	// for cycle detection.
+	if (unlikely (!node.visit ((uintptr_t) other_paint.p)))
 	  continue;
 
-	c->current_layers.add (i);
-
 	c->funcs->push_group (c->data);
 	c->recurse (other_paint);
 	c->funcs->pop_group (c->data, HB_PAINT_COMPOSITE_MODE_SRC_OVER);
-
-	c->current_layers.del (i);
       }
     }
     break;
@@ -333,18 +331,16 @@ _hb_ft_paint (hb_ft_paint_context_t *c,
     {
       hb_codepoint_t gid = paint.u.colr_glyph.glyphID;
 
-      if (unlikely (c->current_glyphs.has (gid)))
+      hb_decycler_node_t node (c->glyphs_decycler);
+      if (unlikely (!node.visit (gid)))
 	return;
 
-      c->current_glyphs.add (gid);
-
       c->funcs->push_inverse_root_transform (c->data, c->font);
       c->ft_font->lock.unlock ();
       if (c->funcs->color_glyph (c->data, gid, c->font))
       {
 	c->ft_font->lock.lock ();
 	c->funcs->pop_transform (c->data);
-	c->current_glyphs.del (gid);
 	return;
       }
       c->ft_font->lock.lock ();
@@ -380,8 +376,6 @@ _hb_ft_paint (hb_ft_paint_context_t *c,
 
         if (has_clip_box)
           c->funcs->pop_clip (c->data);
-
-	c->current_glyphs.del (gid);
       }
     }
     break;
@@ -506,7 +500,8 @@ hb_ft_paint_glyph_colr (hb_font_t *font,
     hb_ft_paint_context_t c (ft_font, font,
 			     paint_funcs, paint_data,
 			     palette, palette_index, foreground);
-    c.current_glyphs.add (gid);
+    hb_decycler_node_t node (c.glyphs_decycler);
+    node.visit (gid);
 
     bool is_bounded = true;
     FT_ClipBox clip_box;
@@ -530,7 +525,8 @@ hb_ft_paint_glyph_colr (hb_font_t *font,
       hb_ft_paint_context_t ce (ft_font, font,
 			        extents_funcs, &extents_data,
 			        palette, palette_index, foreground);
-      ce.current_glyphs.add (gid);
+      hb_decycler_node_t node2 (ce.glyphs_decycler);
+      node2.visit (gid);
       ce.funcs->push_root_transform (ce.data, font);
       ce.recurse (paint);
       ce.funcs->pop_transform (ce.data);
@@ -547,7 +543,9 @@ hb_ft_paint_glyph_colr (hb_font_t *font,
     c.funcs->push_root_transform (c.data, font);
 
     if (is_bounded)
+     {
       c.recurse (paint);
+     }
 
     c.funcs->pop_transform (c.data);
     c.funcs->pop_clip (c.data);
diff --git a/engine/thirdparty/harfbuzz/src/hb-ft.cc b/engine/thirdparty/harfbuzz/src/hb-ft.cc
index c305df19..efb4b7d2 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ft.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ft.cc
@@ -37,7 +37,11 @@
 #include "hb-draw.hh"
 #include "hb-font.hh"
 #include "hb-machinery.hh"
+#ifndef HB_NO_AAT
+#include "hb-aat-layout-trak-table.hh"
+#endif
 #include "hb-ot-os2-table.hh"
+#include "hb-ot-stat-table.hh"
 #include "hb-ot-shaper-arabic-pua.hh"
 #include "hb-paint.hh"
 
@@ -274,6 +278,33 @@ hb_ft_font_get_load_flags (hb_font_t *font)
   return ft_font->load_flags;
 }
 
+/**
+ * hb_ft_font_get_ft_face: (skip)
+ * @font: #hb_font_t to work upon
+ *
+ * Fetches the FT_Face associated with the specified #hb_font_t
+ * font object.
+ *
+ * This function works with #hb_font_t objects created by
+ * hb_ft_font_create() or hb_ft_font_create_referenced().
+ *
+ * Return value: (nullable): the FT_Face found or `NULL`
+ *
+ * Since: 10.4.0
+ **/
+FT_Face
+hb_ft_font_get_ft_face (hb_font_t *font)
+{
+  if (unlikely (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy))
+    return nullptr;
+
+  const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data;
+
+  return ft_font->ft_face;
+}
+
+#ifndef HB_DISABLE_DEPRECATED
+
 /**
  * hb_ft_font_get_face: (skip)
  * @font: #hb_font_t to work upon
@@ -287,18 +318,16 @@ hb_ft_font_get_load_flags (hb_font_t *font)
  * Return value: (nullable): the FT_Face found or `NULL`
  *
  * Since: 0.9.2
+ * Deprecated: 10.4.0: Use hb_ft_font_get_ft_face() instead.
  **/
 FT_Face
 hb_ft_font_get_face (hb_font_t *font)
 {
-  if (unlikely (font->destroy != (hb_destroy_func_t) _hb_ft_font_destroy))
-    return nullptr;
-
-  const hb_ft_font_t *ft_font = (const hb_ft_font_t *) font->user_data;
-
-  return ft_font->ft_face;
+  return hb_ft_font_get_ft_face (font);
 }
 
+#endif
+
 /**
  * hb_ft_font_lock_face: (skip)
  * @font: #hb_font_t to work upon
@@ -502,6 +531,26 @@ hb_ft_get_glyph_h_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
   }
+
+#ifndef HB_NO_AAT
+  /* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
+#ifndef HB_NO_STYLE
+  bool apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
+#else
+  bool apply_trak = false;
+#endif
+  if (apply_trak)
+  {
+    hb_position_t tracking = font->face->table.trak->get_h_tracking (font);
+    first_advance = orig_first_advance;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance += tracking;
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+  }
+#endif
 }
 
 #ifndef HB_NO_VERTICAL
@@ -538,7 +587,20 @@ hb_ft_get_glyph_v_advance (hb_font_t *font,
    * have a Y growing upward.  Hence the extra negation. */
 
   hb_position_t y_strength = font->y_scale >= 0 ? font->y_strength : -font->y_strength;
-  return ((-v + (1<<9)) >> 10) + (font->embolden_in_place ? 0 : y_strength);
+  v = ((-v + (1<<9)) >> 10) + (font->embolden_in_place ? 0 : y_strength);
+
+#ifndef HB_NO_AAT
+  /* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
+#ifndef HB_NO_STYLE
+  bool apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
+#else
+  bool apply_trak = false;
+#endif
+  if (apply_trak)
+    v += font->face->table.trak->get_v_tracking (font);
+#endif
+
+  return v;
 }
 #endif
 
@@ -931,11 +993,15 @@ hb_ft_paint_glyph (hb_font_t *font,
   hb_lock_t lock (ft_font->lock);
   FT_Face ft_face = ft_font->ft_face;
 
+  FT_Long load_flags = ft_font->load_flags | FT_LOAD_NO_BITMAP | FT_LOAD_COLOR;
+#if (FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) >= 21301
+  load_flags |= FT_LOAD_NO_SVG;
+#endif
+
   /* We release the lock before calling into glyph callbacks, such that
    * eg. draw API can call back into the face.*/
 
-  if (unlikely (FT_Load_Glyph (ft_face, gid,
-			       ft_font->load_flags | FT_LOAD_COLOR)))
+  if (unlikely (FT_Load_Glyph (ft_face, gid, load_flags)))
     return;
 
   if (ft_face->glyph->format == FT_GLYPH_FORMAT_OUTLINE)
@@ -1286,7 +1352,7 @@ hb_ft_face_create_cached (FT_Face ft_face)
  *
  * If you know you have valid reasons not to use hb_ft_font_create_referenced(),
  * then it is the client program's responsibility to destroy @ft_face
- * after the #hb_font_t font object has been destroyed.
+ * only after the #hb_font_t font object has been destroyed.
  *
  * HarfBuzz will use the @destroy callback on the #hb_font_t font object
  * if it is supplied when you use this function. However, even if @destroy
@@ -1594,6 +1660,11 @@ _release_blob (void *arg)
 void
 hb_ft_font_set_funcs (hb_font_t *font)
 {
+  // In case of failure...
+  hb_font_set_funcs (font,
+		     hb_font_funcs_get_empty (),
+		     nullptr, nullptr);
+
   hb_blob_t *blob = hb_face_reference_blob (font->face);
   unsigned int blob_length;
   const char *blob_data = hb_blob_get_data (blob, &blob_length);
diff --git a/engine/thirdparty/harfbuzz/src/hb-ft.h b/engine/thirdparty/harfbuzz/src/hb-ft.h
index 8cf14dc3..42bfb4f4 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ft.h
+++ b/engine/thirdparty/harfbuzz/src/hb-ft.h
@@ -111,7 +111,7 @@ HB_EXTERN hb_font_t *
 hb_ft_font_create_referenced (FT_Face ft_face);
 
 HB_EXTERN FT_Face
-hb_ft_font_get_face (hb_font_t *font);
+hb_ft_font_get_ft_face (hb_font_t *font);
 
 HB_EXTERN FT_Face
 hb_ft_font_lock_face (hb_font_t *font);
@@ -142,6 +142,13 @@ hb_ft_hb_font_changed (hb_font_t *font);
 HB_EXTERN void
 hb_ft_font_set_funcs (hb_font_t *font);
 
+#ifndef HB_DISABLE_DEPRECATED
+
+HB_DEPRECATED_FOR (hb_ft_font_get_ft_face)
+HB_EXTERN FT_Face
+hb_ft_font_get_face (hb_font_t *font);
+
+#endif
 
 HB_END_DECLS
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-geometry.hh b/engine/thirdparty/harfbuzz/src/hb-geometry.hh
index 7777ff9a..2f7fcb32 100644
--- a/engine/thirdparty/harfbuzz/src/hb-geometry.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-geometry.hh
@@ -83,6 +83,13 @@ struct hb_transform_t
 		  float x0, float y0) :
     xx (xx), yx (yx), xy (xy), yy (yy), x0 (x0), y0 (y0) {}
 
+  bool is_identity () const
+  {
+    return xx == 1.f && yx == 0.f &&
+	   xy == 0.f && yy == 1.f &&
+	   x0 == 0.f && y0 == 0.f;
+  }
+
   void multiply (const hb_transform_t &o)
   {
     /* Copied from cairo, with "o" being "a" there and "this" being "b" there. */
@@ -201,6 +208,8 @@ struct hb_transform_t
   float y0 = 0.f;
 };
 
+#define HB_TRANSFORM_IDENTITY hb_transform_t{1.f, 0.f, 0.f, 1.f, 0.f, 0.f}
+
 struct hb_bounds_t
 {
   enum status_t {
diff --git a/engine/thirdparty/harfbuzz/src/hb-null.hh b/engine/thirdparty/harfbuzz/src/hb-null.hh
index 854485d3..3588f6ab 100644
--- a/engine/thirdparty/harfbuzz/src/hb-null.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-null.hh
@@ -176,7 +176,7 @@ template <typename Type>
 static inline Type& Crap () {
   static_assert (hb_null_size (Type) <= HB_NULL_POOL_SIZE, "Increase HB_NULL_POOL_SIZE.");
   Type *obj = reinterpret_cast<Type *> (_hb_CrapPool);
-  memcpy (obj, std::addressof (Null (Type)), sizeof (*obj));
+  memcpy (reinterpret_cast<void*>(obj), std::addressof (Null (Type)), sizeof (*obj));
   return *obj;
 }
 template <typename QType>
diff --git a/engine/thirdparty/harfbuzz/src/hb-open-type.hh b/engine/thirdparty/harfbuzz/src/hb-open-type.hh
index 6655259b..7437fddf 100644
--- a/engine/thirdparty/harfbuzz/src/hb-open-type.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-open-type.hh
@@ -86,21 +86,12 @@ struct IntType
 
     return pb->cmp (*pa);
   }
-  template <typename Type2,
-	    hb_enable_if (std::is_integral<Type2>::value &&
-			  sizeof (Type2) < sizeof (int) &&
-			  sizeof (Type) < sizeof (int))>
-  int cmp (Type2 a) const
-  {
-    Type b = v;
-    return (int) a - (int) b;
-  }
   template <typename Type2,
 	    hb_enable_if (hb_is_convertible (Type2, Type))>
   int cmp (Type2 a) const
   {
     Type b = v;
-    return a < b ? -1 : a == b ? 0 : +1;
+    return (a > b) - (a < b);
   }
   bool sanitize (hb_sanitize_context_t *c) const
   {
@@ -299,11 +290,6 @@ typedef Index NameID;
 struct VarIdx : HBUINT32 {
   static constexpr unsigned NO_VARIATION = 0xFFFFFFFFu;
   static_assert (NO_VARIATION == HB_OT_LAYOUT_NO_VARIATIONS_INDEX, "");
-  static uint32_t add (uint32_t i, unsigned short v)
-  {
-    if (i == NO_VARIATION) return i;
-    return i + v;
-  }
   VarIdx& operator = (uint32_t i) { HBUINT32::operator= (i); return *this; }
 };
 DECLARE_NULL_NAMESPACE_BYTES (OT, VarIdx);
@@ -1747,6 +1733,19 @@ struct TupleValues
       else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_WORDS)
       {
         if (unlikely (p + run_count * HBINT16::static_size > end)) return false;
+#ifndef HB_OPTIMIZE_SIZE
+        for (; i + 3 < stop; i += 4)
+	{
+	  values.arrayZ[i] = * (const HBINT16 *) p;
+	  p += HBINT16::static_size;
+	  values.arrayZ[i + 1] = * (const HBINT16 *) p;
+	  p += HBINT16::static_size;
+	  values.arrayZ[i + 2] = * (const HBINT16 *) p;
+	  p += HBINT16::static_size;
+	  values.arrayZ[i + 3] = * (const HBINT16 *) p;
+	  p += HBINT16::static_size;
+	}
+#endif
         for (; i < stop; i++)
         {
           values.arrayZ[i] = * (const HBINT16 *) p;
@@ -1765,10 +1764,17 @@ struct TupleValues
       else if ((control & VALUES_SIZE_MASK) ==  VALUES_ARE_BYTES)
       {
         if (unlikely (p + run_count > end)) return false;
+#ifndef HB_OPTIMIZE_SIZE
+	for (; i + 3 < stop; i += 4)
+	{
+	  values.arrayZ[i] = * (const HBINT8 *) p++;
+	  values.arrayZ[i + 1] = * (const HBINT8 *) p++;
+	  values.arrayZ[i + 2] = * (const HBINT8 *) p++;
+	  values.arrayZ[i + 3] = * (const HBINT8 *) p++;
+	}
+#endif
         for (; i < stop; i++)
-        {
           values.arrayZ[i] = * (const HBINT8 *) p++;
-        }
       }
     }
     return true;
@@ -1777,12 +1783,12 @@ struct TupleValues
   struct iter_t : hb_iter_with_fallback_t<iter_t, int>
   {
     iter_t (const unsigned char *p_, unsigned len_)
-	    : p (p_), end (p_ + len_)
+	    : p (p_), endp (p_ + len_)
     { if (ensure_run ()) read_value (); }
 
     private:
     const unsigned char *p;
-    const unsigned char * const end;
+    const unsigned char * const endp;
     int current_value = 0;
     signed run_count = 0;
     unsigned width = 0;
@@ -1791,7 +1797,7 @@ struct TupleValues
     {
       if (likely (run_count > 0)) return true;
 
-      if (unlikely (p >= end))
+      if (unlikely (p >= endp))
       {
         run_count = 0;
         current_value = 0;
@@ -1810,7 +1816,7 @@ struct TupleValues
 	default: assert (false);
       }
 
-      if (unlikely (p + run_count * width > end))
+      if (unlikely (p + run_count * width > endp))
       {
 	run_count = 0;
 	current_value = 0;
@@ -1837,7 +1843,7 @@ struct TupleValues
     __item_t__ __item__ () const
     { return current_value; }
 
-    bool __more__ () const { return run_count || p < end; }
+    bool __more__ () const { return run_count || p < endp; }
     void __next__ ()
     {
       run_count--;
@@ -1864,10 +1870,146 @@ struct TupleValues
     { return p != o.p || run_count != o.run_count; }
     iter_t __end__ () const
     {
-      iter_t it (end, 0);
+      iter_t it (endp, 0);
       return it;
     }
   };
+
+  struct fetcher_t
+  {
+    fetcher_t (const unsigned char *p_, unsigned len_)
+	      : p (p_), end (p_ + len_) {}
+
+    private:
+    const unsigned char *p;
+    const unsigned char * const end;
+    signed run_count = 0;
+    unsigned width = 0;
+
+    bool ensure_run ()
+    {
+      if (likely (run_count > 0)) return true;
+
+      if (unlikely (p >= end))
+      {
+        run_count = 0;
+	return false;
+      }
+
+      unsigned control = *p++;
+      run_count = (control & VALUE_RUN_COUNT_MASK) + 1;
+      width = control & VALUES_SIZE_MASK;
+      switch (width)
+      {
+        case VALUES_ARE_ZEROS: width = 0; break;
+	case VALUES_ARE_BYTES: width = HBINT8::static_size;  break;
+	case VALUES_ARE_WORDS: width = HBINT16::static_size; break;
+	case VALUES_ARE_LONGS: width = HBINT32::static_size; break;
+	default: assert (false);
+      }
+
+      if (unlikely (p + run_count * width > end))
+      {
+	run_count = 0;
+	return false;
+      }
+
+      return true;
+    }
+
+    void skip (unsigned n)
+    {
+      while (n)
+      {
+	if (unlikely (!ensure_run ()))
+	  return;
+	unsigned i = hb_min (n, (unsigned) run_count);
+	run_count -= i;
+	n -= i;
+	p += i * width;
+      }
+    }
+
+    template <bool scaled>
+    void _add_to (hb_array_t<float> out, float scale = 1.0f)
+    {
+      unsigned n = out.length;
+      float *arrayZ = out.arrayZ;
+
+      for (unsigned i = 0; i < n;)
+      {
+	if (unlikely (!ensure_run ()))
+	  break;
+	unsigned count = hb_min (n - i, (unsigned) run_count);
+	switch (width)
+	{
+	  case 1:
+	  {
+	    const auto *pp = (const HBINT8 *) p;
+	    unsigned j = 0;
+#ifndef HB_OPTIMIZE_SIZE
+	    for (; j + 3 < count; j += 4)
+	    {
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	    }
+#endif
+	    for (; j < count; j++)
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	  }
+	  break;
+	  case 2:
+	  {
+	    const auto *pp = (const HBINT16 *) p;
+	    unsigned j = 0;
+#ifndef HB_OPTIMIZE_SIZE
+	    for (; j + 3 < count; j += 4)
+	    {
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	    }
+#endif
+	    for (; j < count; j++)
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	  }
+	  break;
+	  case 4:
+	  {
+	    const auto *pp = (const HBINT32 *) p;
+	    for (unsigned j = 0; j < count; j++)
+	      *arrayZ++ += scaled ? *pp++ * scale : *pp++;
+	  }
+	  break;
+	}
+	p += count * width;
+	run_count -= count;
+	i += count;
+      }
+    }
+
+    public:
+    void add_to (hb_array_t<float> out, float scale = 1.0f)
+    {
+      unsigned n = out.length;
+
+      if (scale == 0.0f)
+      {
+        skip (n);
+	return;
+      }
+
+#ifndef HB_OPTIMIZE_SIZE
+      if (scale == 1.0f)
+        _add_to<false> (out);
+      else
+#endif
+        _add_to<true> (out, scale);
+    }
+  };
 };
 
 struct TupleList : CFF2Index
@@ -1877,6 +2019,12 @@ struct TupleList : CFF2Index
     auto bytes = CFF2Index::operator [] (i);
     return TupleValues::iter_t (bytes.arrayZ, bytes.length);
   }
+
+  TupleValues::fetcher_t fetcher (unsigned i) const
+  {
+    auto bytes = CFF2Index::operator [] (i);
+    return TupleValues::fetcher_t (bytes.arrayZ, bytes.length);
+  }
 };
 
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.cc b/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.cc
index 66df28aa..8b666a3d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.cc
@@ -553,15 +553,6 @@ bool _get_path (const OT::cff1::accelerator_t *cff, hb_font_t *font, hb_codepoin
   return true;
 }
 
-bool OT::cff1::accelerator_t::paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const
-{
-  funcs->push_clip_glyph (data, glyph, font);
-  funcs->color (data, true, foreground);
-  funcs->pop_clip (data);
-
-  return true;
-}
-
 bool OT::cff1::accelerator_t::get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const
 {
 #ifdef HB_NO_OT_FONT_CFF
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.hh
index b84d896e..666efeb9 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-cff1-table.hh
@@ -1462,7 +1462,6 @@ struct cff1
     }
 
     HB_INTERNAL bool get_extents (hb_font_t *font, hb_codepoint_t glyph, hb_glyph_extents_t *extents) const;
-    HB_INTERNAL bool paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const;
     HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const;
 
     private:
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.cc b/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.cc
index e42217b4..57023cb9 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.cc
@@ -143,15 +143,6 @@ bool OT::cff2::accelerator_t::get_extents (hb_font_t *font,
   return true;
 }
 
-bool OT::cff2::accelerator_t::paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const
-{
-  funcs->push_clip_glyph (data, glyph, font);
-  funcs->color (data, true, foreground);
-  funcs->pop_clip (data);
-
-  return true;
-}
-
 struct cff2_path_param_t
 {
   cff2_path_param_t (hb_font_t *font_, hb_draw_session_t &draw_session_)
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.hh
index c52c0511..0074d5bd 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-cff2-table.hh
@@ -518,7 +518,6 @@ struct cff2
     HB_INTERNAL bool get_extents (hb_font_t *font,
 				  hb_codepoint_t glyph,
 				  hb_glyph_extents_t *extents) const;
-    HB_INTERNAL bool paint_glyph (hb_font_t *font, hb_codepoint_t glyph, hb_paint_funcs_t *funcs, void *data, hb_color_t foreground) const;
     HB_INTERNAL bool get_path (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session) const;
     HB_INTERNAL bool get_path_at (hb_font_t *font, hb_codepoint_t glyph, hb_draw_session_t &draw_session, hb_array_t<const int> coords) const;
   };
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh
index 0f1edce0..7a7a77ad 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-cmap-table.hh
@@ -1397,6 +1397,9 @@ struct CmapSubtableFormat14
     hb_vector_t<hb_pair_t<unsigned, unsigned>> obj_indices;
     for (int i = src_tbl->record.len - 1; i >= 0; i--)
     {
+      if (!unicodes->has(src_tbl->record[i].varSelector))
+        continue;
+
       hb_pair_t<unsigned, unsigned> result = src_tbl->record[i].copy (c, unicodes, glyphs_requested, glyph_map, base);
       if (result.first || result.second)
 	obj_indices.push (result);
@@ -1453,6 +1456,7 @@ struct CmapSubtableFormat14
   {
     + hb_iter (record)
     | hb_filter (hb_bool, &VariationSelectorRecord::nonDefaultUVS)
+    | hb_filter (unicodes, &VariationSelectorRecord::varSelector)
     | hb_map (&VariationSelectorRecord::nonDefaultUVS)
     | hb_map (hb_add (this))
     | hb_apply ([=] (const NonDefaultUVS& _) { _.closure_glyphs (unicodes, glyphset); })
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh b/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh
index dd4befff..97825f4d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-face-table-list.hh
@@ -95,9 +95,12 @@ HB_OT_CORE_TABLE (OT, fvar)
 HB_OT_CORE_TABLE (OT, avar)
 HB_OT_CORE_TABLE (OT, cvar)
 HB_OT_ACCELERATOR (OT, gvar)
+#ifndef HB_NO_BEYOND_64K
+HB_OT_ACCELERATOR (OT, GVAR)
+#endif
 HB_OT_CORE_TABLE (OT, MVAR)
 #ifndef HB_NO_VAR_COMPOSITES
-HB_OT_CORE_TABLE (OT, VARC)
+HB_OT_ACCELERATOR (OT, VARC)
 #endif
 #endif
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-face.cc b/engine/thirdparty/harfbuzz/src/hb-ot-face.cc
index b0c92797..1cf14f3e 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-face.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-face.cc
@@ -41,6 +41,7 @@
 #include "hb-ot-layout-gdef-table.hh"
 #include "hb-ot-layout-gsub-table.hh"
 #include "hb-ot-layout-gpos-table.hh"
+#include "hb-ot-var-varc-table.hh"
 #include "hb-aat-layout-kerx-table.hh"
 #include "hb-aat-layout-morx-table.hh"
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-font.cc b/engine/thirdparty/harfbuzz/src/hb-ot-font.cc
index 7b472471..edfece17 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-font.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-font.cc
@@ -36,13 +36,16 @@
 #include "hb-ot-face.hh"
 #include "hb-outline.hh"
 
+#ifndef HB_NO_AAT
+#include "hb-aat-layout-trak-table.hh"
+#endif
 #include "hb-ot-cmap-table.hh"
 #include "hb-ot-glyf-table.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-ot-cff1-table.hh"
 #include "hb-ot-hmtx-table.hh"
 #include "hb-ot-post-table.hh"
-#include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise.
+#include "hb-ot-stat-table.hh"
 #include "hb-ot-var-varc-table.hh"
 #include "hb-ot-vorg-table.hh"
 #include "OT/Color/CBDT/CBDT.hh"
@@ -73,6 +76,10 @@ struct hb_ot_font_t
 {
   const hb_ot_face_t *ot_face;
 
+#ifndef HB_NO_AAT
+  bool apply_trak;
+#endif
+
 #ifndef HB_NO_OT_FONT_CMAP_CACHE
   hb_ot_font_cmap_cache_t *cmap_cache;
 #endif
@@ -91,6 +98,15 @@ _hb_ot_font_create (hb_font_t *font)
 
   ot_font->ot_face = &font->face->table;
 
+#ifndef HB_NO_AAT
+  /* According to Ned, trak is applied by default for "modern fonts", as detected by presence of STAT table. */
+#ifndef HB_NO_STYLE
+  ot_font->apply_trak = font->face->table.STAT->has_data () && font->face->table.trak->has_data ();
+#else
+  ot_font->apply_trak = false;
+#endif
+#endif
+
 #ifndef HB_NO_OT_FONT_CMAP_CACHE
   // retry:
   auto *cmap_cache  = (hb_ot_font_cmap_cache_t *) hb_face_get_user_data (font->face,
@@ -200,7 +216,6 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
 			    unsigned advance_stride,
 			    void *user_data HB_UNUSED)
 {
-
   const hb_ot_font_t *ot_font = (const hb_ot_font_t *) font_data;
   const hb_ot_face_t *ot_face = ot_font->ot_face;
   const OT::hmtx_accelerator_t &hmtx = *ot_face->hmtx;
@@ -292,6 +307,20 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
   }
+
+#ifndef HB_NO_AAT
+  if (ot_font->apply_trak)
+  {
+    hb_position_t tracking = font->face->table.trak->get_h_tracking (font);
+    first_advance = orig_first_advance;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance += tracking;
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+  }
+#endif
 }
 
 #ifndef HB_NO_VERTICAL
@@ -356,6 +385,20 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data,
       first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
     }
   }
+
+#ifndef HB_NO_AAT
+  if (ot_font->apply_trak)
+  {
+    hb_position_t tracking = font->face->table.trak->get_v_tracking (font);
+    first_advance = orig_first_advance;
+    for (unsigned int i = 0; i < count; i++)
+    {
+      *first_advance += tracking;
+      first_glyph = &StructAtOffsetUnaligned<hb_codepoint_t> (first_glyph, glyph_stride);
+      first_advance = &StructAtOffsetUnaligned<hb_position_t> (first_advance, advance_stride);
+    }
+  }
+#endif
 }
 #endif
 
@@ -568,14 +611,11 @@ hb_ot_paint_glyph (hb_font_t *font,
   if (font->face->table.sbix->paint_glyph (font, glyph, paint_funcs, paint_data)) return;
 #endif
 #endif
-#ifndef HB_NO_VAR_COMPOSITES
-  if (font->face->table.VARC->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;
-#endif
-  if (font->face->table.glyf->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;
-#ifndef HB_NO_CFF
-  if (font->face->table.cff2->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;
-  if (font->face->table.cff1->paint_glyph (font, glyph, paint_funcs, paint_data, foreground)) return;
-#endif
+
+  // Outline glyph
+  paint_funcs->push_clip_glyph (paint_data, glyph, font);
+  paint_funcs->color (paint_data, true, foreground);
+  paint_funcs->pop_clip (paint_data);
 }
 #endif
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-hdmx-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-hdmx-table.hh
index 8582dbe2..5c187ebb 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-hdmx-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-hdmx-table.hh
@@ -95,7 +95,7 @@ struct hdmx
   bool serialize (hb_serialize_context_t *c,
 		  unsigned version,
 		  Iterator it,
-		  const hb_vector_t<hb_codepoint_pair_t> &new_to_old_gid_list,
+		  hb_array_t<const hb_codepoint_pair_t> new_to_old_gid_list,
 		  unsigned num_glyphs)
   {
     TRACE_SERIALIZE (this);
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-hmtx-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-hmtx-table.hh
index 493bc6e7..8e44f143 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-hmtx-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-hmtx-table.hh
@@ -182,7 +182,7 @@ struct hmtxvmtx
 	   hb_requires (hb_is_iterator (Iterator))>
   void serialize (hb_serialize_context_t *c,
 		  Iterator it,
-		  const hb_vector_t<hb_codepoint_pair_t> new_to_old_gid_list,
+		  hb_array_t<const hb_codepoint_pair_t> new_to_old_gid_list,
 		  unsigned num_long_metrics,
                   unsigned total_num_metrics)
   {
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh
index 2abda78a..d11a913c 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-kern-table.hh
@@ -342,7 +342,7 @@ struct kern
   }
 
   bool apply (AAT::hb_aat_apply_context_t *c,
-	      const AAT::kern_accelerator_data_t *accel_data = nullptr) const
+	      const AAT::kern_accelerator_data_t &accel_data) const
   { return dispatch (c, accel_data); }
 
   template <typename context_t, typename ...Ts>
@@ -395,7 +395,7 @@ struct kern
 
     bool apply (AAT::hb_aat_apply_context_t *c) const
     {
-      return table->apply (c, &accel_data);
+      return table->apply (c, accel_data);
     }
 
     hb_blob_ptr_t<kern> table;
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh
index 68a4e7cb..d98ad601 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout-base-table.hh
@@ -460,7 +460,7 @@ struct BaseScript
   { return (this+baseValues).get_base_coord (baseline_tag_index); }
 
   bool has_values () const { return baseValues; }
-  bool has_min_max () const { return defaultMinMax; /* TODO What if only per-language is present? */ }
+  bool has_min_max () const { return defaultMinMax || baseLangSysRecords; }
 
   void collect_variation_indices (const hb_subset_plan_t* plan,
                                   hb_set_t& varidx_set /* OUT */) const
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh b/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
index 757b0503..f9a5c1b9 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout-common.hh
@@ -34,6 +34,7 @@
 #include "hb-open-type.hh"
 #include "hb-set.hh"
 #include "hb-bimap.hh"
+#include "hb-cache.hh"
 
 #include "OT/Layout/Common/Coverage.hh"
 #include "OT/Layout/types.hh"
@@ -2076,6 +2077,15 @@ struct ClassDef
     default:return 0;
     }
   }
+  unsigned int get_class (hb_codepoint_t glyph_id,
+			  hb_ot_lookup_cache_t *cache) const
+  {
+    unsigned klass;
+    if (cache && cache->get (glyph_id, &klass)) return klass;
+    klass = get_class (glyph_id);
+    if (cache) cache->set (glyph_id, klass);
+    return klass;
+  }
 
   unsigned get_population () const
   {
@@ -3137,23 +3147,14 @@ struct MultiVarData
   {
     auto &deltaSets = StructAfter<decltype (deltaSetsX)> (regionIndices);
 
-    auto values_iter = deltaSets[inner];
-
+    auto values_iter = deltaSets.fetcher (inner);
     unsigned regionCount = regionIndices.len;
-    unsigned count = out.length;
     for (unsigned regionIndex = 0; regionIndex < regionCount; regionIndex++)
     {
       float scalar = regions.evaluate (regionIndices.arrayZ[regionIndex],
 				       coords, coord_count,
 				       cache);
-      if (scalar == 1.f)
-	for (unsigned i = 0; i < count; i++)
-	  out.arrayZ[i] += *values_iter++;
-      else if (scalar)
-	for (unsigned i = 0; i < count; i++)
-	  out.arrayZ[i] += *values_iter++ * scalar;
-      else
-        values_iter += count;
+      values_iter.add_to (out, scalar);
     }
   }
 
@@ -3439,7 +3440,7 @@ struct MultiItemVariationStore
 {
   using cache_t = SparseVarRegionList::cache_t;
 
-  cache_t *create_cache () const
+  cache_t *create_cache (hb_array_t<float> static_cache = hb_array_t<float> ()) const
   {
 #ifdef HB_NO_VAR
     return nullptr;
@@ -3447,8 +3448,14 @@ struct MultiItemVariationStore
     auto &r = this+regions;
     unsigned count = r.regions.len;
 
-    float *cache = (float *) hb_malloc (sizeof (float) * count);
-    if (unlikely (!cache)) return nullptr;
+    float *cache;
+    if (count <= static_cache.length)
+      cache = static_cache.arrayZ;
+    else
+    {
+      cache = (float *) hb_malloc (sizeof (float) * count);
+      if (unlikely (!cache)) return nullptr;
+    }
 
     for (unsigned i = 0; i < count; i++)
       cache[i] = REGION_CACHE_ITEM_CACHE_INVALID;
@@ -3456,7 +3463,12 @@ struct MultiItemVariationStore
     return cache;
   }
 
-  static void destroy_cache (cache_t *cache) { hb_free (cache); }
+  static void destroy_cache (cache_t *cache,
+			     hb_array_t<float> static_cache = hb_array_t<float> ())
+  {
+    if (cache != static_cache.arrayZ)
+      hb_free (cache);
+  }
 
   private:
   void get_delta (unsigned int outer, unsigned int inner,
@@ -3731,11 +3743,13 @@ struct ItemVarStoreInstancer
 
   float operator() (uint32_t varIdx, unsigned short offset = 0) const
   {
+   if (!coords || varIdx == VarIdx::NO_VARIATION)
+     return 0.f;
+
+    varIdx += offset;
     if (varIdxMap)
-      varIdx = varIdxMap->map (VarIdx::add (varIdx, offset));
-    else
-      varIdx += offset;
-    return coords ? varStore->get_delta (varIdx, coords, cache) : 0.f;
+      varIdx = varIdxMap->map (varIdx);
+    return varStore->get_delta (varIdx, coords, cache);
   }
 
   const ItemVariationStore *varStore;
@@ -3767,12 +3781,11 @@ struct MultiItemVarStoreInstancer
 
   void operator() (hb_array_t<float> out, uint32_t varIdx, unsigned short offset = 0) const
   {
-    if (coords)
+    if (coords && varIdx != VarIdx::NO_VARIATION)
     {
+      varIdx += offset;
       if (varIdxMap)
-	varIdx = varIdxMap->map (VarIdx::add (varIdx, offset));
-      else
-	varIdx += offset;
+	varIdx = varIdxMap->map (varIdx);
       varStore->get_delta (varIdx, coords, out, cache);
     }
     else
@@ -3890,8 +3903,8 @@ struct ConditionAxisRange
     {
       // add axisIndex->value into the hashmap so we can check if the record is
       // unique with variations
-      int16_t int_filter_max_val = filterRangeMaxValue.to_int ();
-      int16_t int_filter_min_val = filterRangeMinValue.to_int ();
+      uint16_t int_filter_max_val = (uint16_t) filterRangeMaxValue.to_int ();
+      uint16_t int_filter_min_val = (uint16_t) filterRangeMinValue.to_int ();
       hb_codepoint_t val = (int_filter_max_val << 16) + int_filter_min_val;
 
       condition_map->set (axisIndex, val);
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh b/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
index 2c9056c7..183e08cc 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout-gsubgpos.hh
@@ -713,6 +713,7 @@ struct hb_ot_apply_context_t :
   recurse_func_t recurse_func = nullptr;
   const GDEF &gdef;
   const GDEF::accelerator_t &gdef_accel;
+  const hb_ot_layout_lookup_accelerator_t *lookup_accel = nullptr;
   const ItemVariationStore &var_store;
   ItemVariationStore::cache_t *var_store_cache;
   hb_set_digest_t digest;
@@ -762,10 +763,12 @@ struct hb_ot_apply_context_t :
 					 nullptr
 #endif
 					),
-			digest (buffer_->digest ()),
 			direction (buffer_->props.direction),
 			has_glyph_classes (gdef.has_glyph_classes ())
-  { init_iters (); }
+  {
+    init_iters ();
+    buffer->collect_codepoints (digest);
+  }
 
   ~hb_ot_apply_context_t ()
   {
@@ -899,6 +902,13 @@ struct hb_ot_apply_context_t :
   }
 };
 
+enum class hb_ot_lookup_cache_op_t
+{
+  CREATE,
+  ENTER,
+  LEAVE,
+  DESTROY,
+};
 
 struct hb_accelerate_subtables_context_t :
        hb_dispatch_context_t<hb_accelerate_subtables_context_t>
@@ -923,19 +933,23 @@ struct hb_accelerate_subtables_context_t :
   }
 
   template <typename T>
-  static inline auto cache_func_ (const T *obj, hb_ot_apply_context_t *c, bool enter, hb_priority<1>) HB_RETURN (bool, obj->cache_func (c, enter) )
-  template <typename T>
-  static inline bool cache_func_ (const T *obj, hb_ot_apply_context_t *c, bool enter, hb_priority<0>) { return false; }
+  static inline auto cache_func_ (void *p,
+				  hb_ot_lookup_cache_op_t op,
+				  hb_priority<1>) HB_RETURN (void *, T::cache_func (p, op) )
+  template <typename T=void>
+  static inline void * cache_func_ (void *p,
+				    hb_ot_lookup_cache_op_t op HB_UNUSED,
+				    hb_priority<0>) { return (void *) false; }
   template <typename Type>
-  static inline bool cache_func_to (const void *obj, hb_ot_apply_context_t *c, bool enter)
+  static inline void * cache_func_to (void *p,
+				      hb_ot_lookup_cache_op_t op)
   {
-    const Type *typed_obj = (const Type *) obj;
-    return cache_func_ (typed_obj, c, enter, hb_prioritize);
+    return cache_func_<Type> (p, op, hb_prioritize);
   }
 #endif
 
   typedef bool (*hb_apply_func_t) (const void *obj, hb_ot_apply_context_t *c);
-  typedef bool (*hb_cache_func_t) (const void *obj, hb_ot_apply_context_t *c, bool enter);
+  typedef void * (*hb_cache_func_t) (void *p, hb_ot_lookup_cache_op_t op);
 
   struct hb_applicable_t
   {
@@ -972,11 +986,11 @@ struct hb_accelerate_subtables_context_t :
     }
     bool cache_enter (hb_ot_apply_context_t *c) const
     {
-      return cache_func (obj, c, true);
+      return (bool) cache_func (c, hb_ot_lookup_cache_op_t::ENTER);
     }
     void cache_leave (hb_ot_apply_context_t *c) const
     {
-      cache_func (obj, c, false);
+      cache_func (c, hb_ot_lookup_cache_op_t::LEAVE);
     }
 #endif
 
@@ -1462,6 +1476,7 @@ static inline bool ligate_input (hb_ot_apply_context_t *c,
 	unsigned int this_comp = _hb_glyph_info_get_lig_comp (&buffer->cur());
 	if (this_comp == 0)
 	  this_comp = last_num_components;
+	assert (components_so_far >= last_num_components);
 	unsigned int new_lig_comp = components_so_far - last_num_components +
 				    hb_min (this_comp, last_num_components);
 	  _hb_glyph_info_set_lig_props_for_mark (&buffer->cur(), lig_id, new_lig_comp);
@@ -1487,6 +1502,7 @@ static inline bool ligate_input (hb_ot_apply_context_t *c,
       unsigned this_comp = _hb_glyph_info_get_lig_comp (&buffer->info[i]);
       if (!this_comp) break;
 
+      assert (components_so_far >= last_num_components);
       unsigned new_lig_comp = components_so_far - last_num_components +
 			      hb_min (this_comp, last_num_components);
       _hb_glyph_info_set_lig_props_for_mark (&buffer->info[i], lig_id, new_lig_comp);
@@ -1542,6 +1558,7 @@ static bool match_lookahead (hb_ot_apply_context_t *c,
   TRACE_APPLY (nullptr);
 
   hb_ot_apply_context_t::skipping_iterator_t &skippy_iter = c->iter_context;
+  assert (start_index >= 1);
   skippy_iter.reset (start_index - 1);
   skippy_iter.set_match_func (match_func, match_data);
   skippy_iter.set_glyph_data (lookahead);
@@ -1852,6 +1869,7 @@ static inline void apply_lookup (hb_ot_apply_context_t *c,
   if (match_positions != match_positions_input)
     hb_free (match_positions);
 
+  assert (end >= 0);
   (void) buffer->move_to (end);
 }
 
@@ -2619,25 +2637,35 @@ struct ContextFormat2_5
     unsigned c = (this+classDef).cost () * ruleSet.len;
     return c >= 4 ? c : 0;
   }
-  bool cache_func (hb_ot_apply_context_t *c, bool enter) const
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
   {
-    if (enter)
+    switch (op)
     {
-      if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
-	return false;
-      auto &info = c->buffer->info;
-      unsigned count = c->buffer->len;
-      for (unsigned i = 0; i < count; i++)
-	info[i].syllable() = 255;
-      c->new_syllables = 255;
-      return true;
-    }
-    else
-    {
-      c->new_syllables = (unsigned) -1;
-      HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
-      return true;
+      case hb_ot_lookup_cache_op_t::CREATE:
+	return (void *) true;
+      case hb_ot_lookup_cache_op_t::ENTER:
+      {
+	hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+	if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
+	  return (void *) false;
+	auto &info = c->buffer->info;
+	unsigned count = c->buffer->len;
+	for (unsigned i = 0; i < count; i++)
+	  info[i].syllable() = 255;
+	c->new_syllables = 255;
+	return (void *) true;
+      }
+      case hb_ot_lookup_cache_op_t::LEAVE:
+      {
+	hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+	c->new_syllables = (unsigned) -1;
+	HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
+	return nullptr;
+      }
+      case hb_ot_lookup_cache_op_t::DESTROY:
+        return nullptr;
     }
+    return nullptr;
   }
 
   bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
@@ -2646,7 +2674,7 @@ struct ContextFormat2_5
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &class_def = this+classDef;
 
@@ -2832,7 +2860,7 @@ struct ContextFormat3
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverageZ[0]).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const LookupRecord *lookupRecord = &StructAfter<LookupRecord> (coverageZ.as_array (glyphCount));
     struct ContextApplyLookupContext lookup_context = {
@@ -3646,7 +3674,7 @@ struct ChainContextFormat1_4
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const ChainRuleSet &rule_set = this+ruleSet[index];
     struct ChainContextApplyLookupContext lookup_context = {
@@ -3857,28 +3885,37 @@ struct ChainContextFormat2_5
 
   unsigned cache_cost () const
   {
-    unsigned c = (this+lookaheadClassDef).cost () * ruleSet.len;
-    return c >= 4 ? c : 0;
+    return (this+lookaheadClassDef).cost () * ruleSet.len;
   }
-  bool cache_func (hb_ot_apply_context_t *c, bool enter) const
+  static void * cache_func (void *p, hb_ot_lookup_cache_op_t op)
   {
-    if (enter)
+    switch (op)
     {
-      if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
-	return false;
-      auto &info = c->buffer->info;
-      unsigned count = c->buffer->len;
-      for (unsigned i = 0; i < count; i++)
-	info[i].syllable() = 255;
-      c->new_syllables = 255;
-      return true;
-    }
-    else
-    {
-      c->new_syllables = (unsigned) -1;
-      HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
-      return true;
+      case hb_ot_lookup_cache_op_t::CREATE:
+	return (void *) true;
+      case hb_ot_lookup_cache_op_t::ENTER:
+      {
+	hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+	if (!HB_BUFFER_TRY_ALLOCATE_VAR (c->buffer, syllable))
+	  return (void *) false;
+	auto &info = c->buffer->info;
+	unsigned count = c->buffer->len;
+	for (unsigned i = 0; i < count; i++)
+	  info[i].syllable() = 255;
+	c->new_syllables = 255;
+	return (void *) true;
+      }
+      case hb_ot_lookup_cache_op_t::LEAVE:
+      {
+	hb_ot_apply_context_t *c = (hb_ot_apply_context_t *) p;
+	c->new_syllables = (unsigned) -1;
+	HB_BUFFER_DEALLOCATE_VAR (c->buffer, syllable);
+	return nullptr;
+      }
+      case hb_ot_lookup_cache_op_t::DESTROY:
+        return nullptr;
     }
+    return nullptr;
   }
 
   bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); }
@@ -3887,7 +3924,7 @@ struct ChainContextFormat2_5
   {
     TRACE_APPLY (this);
     unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const ClassDef &backtrack_class_def = this+backtrackClassDef;
     const ClassDef &input_class_def = this+inputClassDef;
@@ -4133,7 +4170,7 @@ struct ChainContextFormat3
     const auto &input = StructAfter<decltype (inputX)> (backtrack);
 
     unsigned int index = (this+input[0]).get_coverage (c->buffer->cur().codepoint);
-    if (likely (index == NOT_COVERED)) return_trace (false);
+    if (index == NOT_COVERED) return_trace (false);
 
     const auto &lookahead = StructAfter<decltype (lookaheadX)> (input);
     const auto &lookup = StructAfter<decltype (lookupX)> (lookahead);
@@ -4404,7 +4441,18 @@ struct hb_ot_layout_lookup_accelerator_t
       thiz->digest.union_ (subtable.digest);
 
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    if (c_accelerate_subtables.cache_user_cost < 4)
+      c_accelerate_subtables.cache_user_idx = (unsigned) -1;
+
     thiz->cache_user_idx = c_accelerate_subtables.cache_user_idx;
+
+    if (thiz->cache_user_idx != (unsigned) -1)
+    {
+      thiz->cache = thiz->subtables[thiz->cache_user_idx].cache_func (nullptr, hb_ot_lookup_cache_op_t::CREATE);
+      if (!thiz->cache)
+	thiz->cache_user_idx = (unsigned) -1;
+    }
+
     for (unsigned i = 0; i < count; i++)
       if (i != thiz->cache_user_idx)
 	thiz->subtables[i].apply_cached_func = thiz->subtables[i].apply_func;
@@ -4413,6 +4461,17 @@ struct hb_ot_layout_lookup_accelerator_t
     return thiz;
   }
 
+  void fini ()
+  {
+#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+    if (cache)
+    {
+      assert (cache_user_idx != (unsigned) -1);
+      subtables[cache_user_idx].cache_func (cache, hb_ot_lookup_cache_op_t::DESTROY);
+    }
+#endif
+  }
+
   bool may_have (hb_codepoint_t g) const
   { return digest.may_have (g); }
 
@@ -4421,6 +4480,7 @@ struct hb_ot_layout_lookup_accelerator_t
 #endif
   bool apply (hb_ot_apply_context_t *c, unsigned subtables_count, bool use_cache) const
   {
+    c->lookup_accel = this;
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
     if (use_cache)
     {
@@ -4460,10 +4520,13 @@ struct hb_ot_layout_lookup_accelerator_t
 
 
   hb_set_digest_t digest;
-  private:
 #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE
+  public:
+  void *cache = nullptr;
+  private:
   unsigned cache_user_idx = (unsigned) -1;
 #endif
+  private:
   hb_accelerate_subtables_context_t::hb_applicable_t subtables[HB_VAR_ARRAY];
 };
 
@@ -4848,7 +4911,12 @@ struct GSUBGPOS
     ~accelerator_t ()
     {
       for (unsigned int i = 0; i < this->lookup_count; i++)
-	hb_free (this->accels[i]);
+      {
+	auto *accel = this->accels[i].get_relaxed ();
+	if (accel)
+	  accel->fini ();
+	hb_free (accel);
+      }
       hb_free (this->accels);
       this->table.destroy ();
     }
@@ -4869,6 +4937,7 @@ struct GSUBGPOS
 
 	if (unlikely (!accels[lookup_index].cmpexch (nullptr, accel)))
 	{
+	  accel->fini ();
 	  hb_free (accel);
 	  goto retry;
 	}
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout.cc b/engine/thirdparty/harfbuzz/src/hb-ot-layout.cc
index 66c2eb4d..f7ad72fd 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout.cc
@@ -246,6 +246,18 @@ OT::GDEF::is_blocklisted (hb_blob_t *blob,
     /* sha1sum: c26e41d567ed821bed997e937bc0c41435689e85  Padauk.ttf
      *  "Padauk Regular" "Version 2.5", see https://crbug.com/681813 */
     case HB_CODEPOINT_ENCODE3 (1004, 59092, 14836):
+    /* 88d2006ca084f04af2df1954ed714a8c71e8400f  Courier New.ttf from macOS 15 */
+    case HB_CODEPOINT_ENCODE3 (588, 5078, 14418):
+    /* 608e3ebb6dd1aee521cff08eb07d500a2c59df68  Courier New Bold.ttf from macOS 15 */
+    case HB_CODEPOINT_ENCODE3 (588, 5078, 14238):
+    /* d13221044ff054efd78f1cd8631b853c3ce85676  cour.ttf from Windows 10 */
+    case HB_CODEPOINT_ENCODE3 (894, 17162, 33960):
+    /* 68ed4a22d8067fcf1622ac6f6e2f4d3a2e3ec394  courbd.ttf from Windows 10 */
+    case HB_CODEPOINT_ENCODE3 (894, 17154, 34472):
+    /* 4cdb0259c96b7fd7c103821bb8f08f7cc6b211d7  cour.ttf from Windows 8.1 */
+    case HB_CODEPOINT_ENCODE3 (816, 7868, 17052):
+    /* 920483d8a8ed37f7f0afdabbe7f679aece7c75d8  courbd.ttf from Windows 8.1 */
+    case HB_CODEPOINT_ENCODE3 (816, 7868, 17138):
       return true;
   }
   return false;
@@ -1911,9 +1923,10 @@ apply_forward (OT::hb_ot_apply_context_t *c,
   while (buffer->idx < buffer->len && buffer->successful)
   {
     bool applied = false;
-    if (accel.digest.may_have (buffer->cur().codepoint) &&
-	(buffer->cur().mask & c->lookup_mask) &&
-	c->check_glyph_property (&buffer->cur(), c->lookup_props))
+    auto &cur = buffer->cur();
+    if (accel.digest.may_have (cur.codepoint) &&
+	(cur.mask & c->lookup_mask) &&
+	c->check_glyph_property (&cur, c->lookup_props))
      {
        applied = accel.apply (c, subtable_count, use_cache);
      }
@@ -1939,9 +1952,10 @@ apply_backward (OT::hb_ot_apply_context_t *c,
   hb_buffer_t *buffer = c->buffer;
   do
   {
-    if (accel.digest.may_have (buffer->cur().codepoint) &&
-	(buffer->cur().mask & c->lookup_mask) &&
-	c->check_glyph_property (&buffer->cur(), c->lookup_props))
+    auto &cur = buffer->cur();
+    if (accel.digest.may_have (cur.codepoint) &&
+	(cur.mask & c->lookup_mask) &&
+	c->check_glyph_property (&cur, c->lookup_props))
       ret |= accel.apply (c, subtable_count, false);
 
     /* The reverse lookup doesn't "advance" cursor (for good reason). */
@@ -2021,7 +2035,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
        * (plus some past glyphs).
        *
        * Only try applying the lookup if there is any overlap. */
-      if (accel->digest.may_have (c.digest))
+      if (accel->digest.may_intersect (c.digest))
       {
 	c.set_lookup_index (lookup_index);
 	c.set_lookup_mask (lookup.mask, false);
@@ -2047,7 +2061,7 @@ inline void hb_ot_map_t::apply (const Proxy &proxy,
       if (stage->pause_func (plan, font, buffer))
       {
 	/* Refresh working buffer digest since buffer changed. */
-	c.digest = buffer->digest ();
+	buffer->collect_codepoints (c.digest);
       }
     }
   }
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-layout.hh b/engine/thirdparty/harfbuzz/src/hb-ot-layout.hh
index f26bf51a..52dafbba 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-layout.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-layout.hh
@@ -339,6 +339,11 @@ _hb_glyph_info_is_default_ignorable (const hb_glyph_info_t *info)
 	 !_hb_glyph_info_substituted (info);
 }
 static inline void
+_hb_glyph_info_set_default_ignorable (hb_glyph_info_t *info)
+{
+  info->unicode_props() |= UPROPS_MASK_IGNORABLE;
+}
+static inline void
 _hb_glyph_info_clear_default_ignorable (hb_glyph_info_t *info)
 {
   info->unicode_props() &= ~ UPROPS_MASK_IGNORABLE;
@@ -360,7 +365,7 @@ _hb_glyph_info_set_continuation (hb_glyph_info_t *info)
   info->unicode_props() |= UPROPS_MASK_CONTINUATION;
 }
 static inline void
-_hb_glyph_info_reset_continuation (hb_glyph_info_t *info)
+_hb_glyph_info_clear_continuation (hb_glyph_info_t *info)
 {
   info->unicode_props() &= ~ UPROPS_MASK_CONTINUATION;
 }
@@ -633,8 +638,7 @@ _hb_buffer_assert_gsubgpos_vars (hb_buffer_t *buffer)
 }
 
 /* Make sure no one directly touches our props... */
-#undef unicode_props0
-#undef unicode_props1
+#undef unicode_props
 #undef lig_props
 #undef glyph_props
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-map.cc b/engine/thirdparty/harfbuzz/src/hb-ot-map.cc
index fac73eb3..952ab3eb 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-map.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-map.cc
@@ -390,5 +390,19 @@ hb_ot_map_builder_t::compile (hb_ot_map_t                  &m,
   }
 }
 
+unsigned int hb_ot_map_t::get_feature_tags (unsigned int start_offset, unsigned int *tag_count, hb_tag_t *tags) const
+{
+  if (tag_count)
+  {
+    auto sub_features = features.as_array ().sub_array (start_offset, tag_count);
+    if (tags)
+    {
+      for (unsigned int i = 0; i < sub_features.length; i++)
+        tags[i] = sub_features[i].tag;
+    }
+  }
+
+  return features.length;
+}
 
 #endif
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-map.hh b/engine/thirdparty/harfbuzz/src/hb-ot-map.hh
index 8af8129c..185d133d 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-map.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-map.hh
@@ -166,6 +166,9 @@ struct hb_ot_map_t
 			  const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
   HB_INTERNAL void substitute (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
   HB_INTERNAL void position (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const;
+  HB_INTERNAL unsigned int get_feature_tags (unsigned int  start_offset,
+					     unsigned int *tag_count, /* IN/OUT */
+					     hb_tag_t     *tags /* OUT */) const;
 
   public:
   hb_tag_t chosen_script[2];
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-os2-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-os2-table.hh
index 6c914022..c00d22b2 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-os2-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-os2-table.hh
@@ -284,8 +284,8 @@ struct OS2
         os2_prime->usWidthClass = width_class;
     }
 
-    os2_prime->usFirstCharIndex = hb_min (0xFFFFu, c->plan->unicodes.get_min ());
-    os2_prime->usLastCharIndex  = hb_min (0xFFFFu, c->plan->unicodes.get_max ());
+    os2_prime->usFirstCharIndex = hb_min (0xFFFFu, c->plan->os2_info.min_cmap_codepoint);
+    os2_prime->usLastCharIndex  = hb_min (0xFFFFu, c->plan->os2_info.max_cmap_codepoint);
 
     if (c->plan->flags & HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES)
       return_trace (true);
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc
index 59b97a79..c9defc49 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shape.cc
@@ -46,6 +46,8 @@
 #include "hb-set.hh"
 
 #include "hb-aat-layout.hh"
+#include "hb-ot-stat-table.hh"
+
 
 static inline bool
 _hb_codepoint_is_regional_indicator (hb_codepoint_t u)
@@ -121,10 +123,6 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
   plan.kern_mask = plan.map.get_mask (kern_tag);
   plan.requested_kerning = !!plan.kern_mask;
 #endif
-#ifndef HB_NO_AAT_SHAPE
-  plan.trak_mask = plan.map.get_mask (HB_TAG ('t','r','a','k'));
-  plan.requested_tracking = !!plan.trak_mask;
-#endif
 
   bool has_gpos_kern = plan.map.get_feature_index (1, kern_tag) != HB_OT_LAYOUT_NO_FEATURE_INDEX;
   bool disable_gpos = plan.shaper->gpos_tag &&
@@ -207,9 +205,6 @@ hb_ot_shape_planner_t::compile (hb_ot_shape_plan_t           &plan,
      https://github.com/harfbuzz/harfbuzz/issues/2967. */
   if (plan.apply_morx)
     plan.adjust_mark_positioning_when_zeroing = false;
-
-  /* Currently we always apply trak. */
-  plan.apply_trak = plan.requested_tracking && hb_aat_layout_has_tracking (face);
 #endif
 }
 
@@ -274,11 +269,6 @@ hb_ot_shape_plan_t::position (hb_font_t   *font,
 #endif
   else if (this->apply_fallback_kern)
     _hb_ot_shape_fallback_kern (this, font, buffer);
-
-#ifndef HB_NO_AAT_SHAPE
-  if (this->apply_trak)
-    hb_aat_layout_track (this, font, buffer);
-#endif
 }
 
 
@@ -346,13 +336,6 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner,
   /* Random! */
   map->enable_feature (HB_TAG ('r','a','n','d'), F_RANDOM, HB_OT_MAP_MAX_VALUE);
 
-#ifndef HB_NO_AAT_SHAPE
-  /* Tracking.  We enable dummy feature here just to allow disabling
-   * AAT 'trak' table using features.
-   * https://github.com/harfbuzz/harfbuzz/issues/1303 */
-  map->enable_feature (HB_TAG ('t','r','a','k'), F_HAS_FALLBACK);
-#endif
-
   map->enable_feature (HB_TAG ('H','a','r','f')); /* Considered required. */
   map->enable_feature (HB_TAG ('H','A','R','F')); /* Considered discretionary. */
 
@@ -1277,6 +1260,36 @@ hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
 }
 
 
+/**
+ * hb_ot_shape_plan_get_feature_tags:
+ * @shape_plan: A shaping plan
+ * @start_offset: The index of first feature to retrieve
+ * @tag_count: (inout): Input = the maximum number of features to return;
+ *                      Output = the actual number of features returned (may be zero)
+ * @tags: (out) (array length=tag_count): The array of enabled feature
+ *
+ * Fetches the list of OpenType feature tags enabled for a shaping plan, if possible.
+ *
+ * Return value: Total number of feature tagss.
+ *
+ * Since: 10.3.0
+ */
+unsigned int
+hb_ot_shape_plan_get_feature_tags (hb_shape_plan_t *shape_plan,
+				   unsigned int     start_offset,
+				   unsigned int    *tag_count, /* IN/OUT */
+				   hb_tag_t        *tags /* OUT */)
+{
+#ifndef HB_NO_OT_SHAPE
+  return shape_plan->ot.map.get_feature_tags (start_offset, tag_count, tags);
+#else
+  if (tag_count)
+	*tag_count = 0;
+  return 0;
+#endif
+}
+
+
 /* TODO Move this to hb-ot-shape-normalize, make it do decompose, and make it public. */
 static void
 add_char (hb_font_t          *font,
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shape.h b/engine/thirdparty/harfbuzz/src/hb-ot-shape.h
index afdff728..80063f77 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shape.h
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shape.h
@@ -48,6 +48,12 @@ hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan,
 				  hb_tag_t         table_tag,
 				  hb_set_t        *lookup_indexes /* OUT */);
 
+HB_EXTERN unsigned int
+hb_ot_shape_plan_get_feature_tags (hb_shape_plan_t *shape_plan,
+				   unsigned int     start_offset,
+				   unsigned int    *tag_count, /* IN/OUT */
+				   hb_tag_t        *tags /* OUT */);
+
 HB_END_DECLS
 
 #endif /* HB_OT_SHAPE_H */
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shape.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shape.hh
index f84aa5c4..791bc689 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shape.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shape.hh
@@ -51,7 +51,8 @@ struct hb_ot_shape_plan_key_t
 
   bool equal (const hb_ot_shape_plan_key_t *other)
   {
-    return 0 == hb_memcmp (this, other, sizeof (*this));
+    return variations_index[0] == other->variations_index[0] &&
+	   variations_index[1] == other->variations_index[1];
   }
 };
 
@@ -79,22 +80,12 @@ struct hb_ot_shape_plan_t
 #else
   static constexpr hb_mask_t kern_mask = 0;
 #endif
-#ifndef HB_NO_AAT_SHAPE
-  hb_mask_t trak_mask;
-#else
-  static constexpr hb_mask_t trak_mask = 0;
-#endif
 
 #ifndef HB_NO_OT_KERN
   bool requested_kerning : 1;
 #else
   static constexpr bool requested_kerning = false;
 #endif
-#ifndef HB_NO_AAT_SHAPE
-  bool requested_tracking : 1;
-#else
-  static constexpr bool requested_tracking = false;
-#endif
 #ifndef HB_NO_OT_SHAPE_FRACTIONS
   bool has_frac : 1;
 #else
@@ -117,11 +108,9 @@ struct hb_ot_shape_plan_t
 #ifndef HB_NO_AAT_SHAPE
   bool apply_kerx : 1;
   bool apply_morx : 1;
-  bool apply_trak : 1;
 #else
   static constexpr bool apply_kerx = false;
   static constexpr bool apply_morx = false;
-  static constexpr bool apply_trak = false;
 #endif
 
   void collect_lookups (hb_tag_t table_tag, hb_set_t *lookups) const
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-fallback.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-fallback.hh
index 66a8bfbd..b82de35a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-fallback.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-arabic-fallback.hh
@@ -355,6 +355,8 @@ arabic_fallback_plan_destroy (arabic_fallback_plan_t *fallback_plan)
   for (unsigned int i = 0; i < fallback_plan->num_lookups; i++)
     if (fallback_plan->lookup_array[i])
     {
+      if (fallback_plan->accel_array[i])
+	fallback_plan->accel_array[i]->fini ();
       hb_free (fallback_plan->accel_array[i]);
       if (fallback_plan->free_lookups)
 	hb_free (fallback_plan->lookup_array[i]);
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh
index 353e32d3..6ff65c30 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-machine.hh
@@ -68,6 +68,7 @@ enum indic_syllable_type_t {
 #define indic_syllable_machine_ex_Ra 15u
 #define indic_syllable_machine_ex_Repha 14u
 #define indic_syllable_machine_ex_SM 8u
+#define indic_syllable_machine_ex_SMPst 57u
 #define indic_syllable_machine_ex_Symbol 17u
 #define indic_syllable_machine_ex_V 2u
 #define indic_syllable_machine_ex_VD 9u
@@ -76,251 +77,916 @@ enum indic_syllable_type_t {
 #define indic_syllable_machine_ex_ZWNJ 5u
 
 
-#line 80 "hb-ot-shaper-indic-machine.hh"
+#line 81 "hb-ot-shaper-indic-machine.hh"
 static const unsigned char _indic_syllable_machine_trans_keys[] = {
-	8u, 8u, 4u, 13u, 5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 4u, 13u, 
-	8u, 8u, 5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 4u, 13u, 4u, 13u, 
-	8u, 8u, 5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 4u, 13u, 8u, 8u, 
-	5u, 13u, 5u, 13u, 13u, 13u, 4u, 13u, 4u, 13u, 5u, 13u, 8u, 8u, 1u, 18u, 
-	3u, 16u, 3u, 16u, 4u, 16u, 1u, 15u, 5u, 9u, 5u, 9u, 9u, 9u, 5u, 9u, 
-	1u, 15u, 1u, 15u, 1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 4u, 13u, 
-	5u, 9u, 3u, 9u, 5u, 9u, 3u, 16u, 3u, 16u, 3u, 16u, 3u, 16u, 4u, 16u, 
-	1u, 15u, 3u, 16u, 3u, 16u, 4u, 16u, 1u, 15u, 5u, 9u, 9u, 9u, 5u, 9u, 
-	1u, 15u, 1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 4u, 13u, 5u, 9u, 
-	5u, 9u, 3u, 9u, 5u, 9u, 3u, 16u, 3u, 16u, 4u, 13u, 3u, 16u, 3u, 16u, 
-	4u, 16u, 1u, 15u, 3u, 16u, 1u, 15u, 5u, 9u, 9u, 9u, 5u, 9u, 1u, 15u, 
-	1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 3u, 16u, 4u, 13u, 5u, 9u, 
-	5u, 9u, 3u, 9u, 5u, 9u, 3u, 16u, 4u, 13u, 4u, 13u, 3u, 16u, 3u, 16u, 
-	4u, 16u, 1u, 15u, 3u, 16u, 1u, 15u, 5u, 9u, 9u, 9u, 5u, 9u, 1u, 15u, 
-	1u, 15u, 3u, 13u, 4u, 13u, 5u, 13u, 5u, 13u, 3u, 16u, 4u, 13u, 5u, 9u, 
-	5u, 9u, 3u, 9u, 5u, 9u, 1u, 16u, 3u, 16u, 1u, 16u, 4u, 13u, 5u, 13u, 
-	5u, 13u, 9u, 9u, 5u, 9u, 1u, 15u, 3u, 9u, 5u, 9u, 5u, 9u, 9u, 9u, 
+	8u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 
+	8u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 4u, 57u, 
+	8u, 57u, 5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 4u, 57u, 8u, 57u, 
+	5u, 57u, 5u, 57u, 13u, 13u, 4u, 57u, 4u, 57u, 5u, 57u, 8u, 57u, 1u, 57u, 
+	3u, 57u, 3u, 57u, 4u, 57u, 1u, 57u, 5u, 57u, 5u, 57u, 9u, 9u, 5u, 9u, 
+	1u, 57u, 1u, 57u, 1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 4u, 57u, 
+	5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 4u, 57u, 
+	1u, 57u, 3u, 57u, 3u, 57u, 4u, 57u, 1u, 57u, 5u, 57u, 9u, 9u, 5u, 9u, 
+	1u, 57u, 1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 4u, 57u, 5u, 57u, 
+	5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 4u, 57u, 3u, 57u, 3u, 57u, 
+	4u, 57u, 1u, 57u, 3u, 57u, 1u, 57u, 5u, 57u, 9u, 9u, 5u, 9u, 1u, 57u, 
+	1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 
+	5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 4u, 57u, 4u, 57u, 3u, 57u, 3u, 57u, 
+	4u, 57u, 1u, 57u, 3u, 57u, 1u, 57u, 5u, 57u, 9u, 9u, 5u, 9u, 1u, 57u, 
+	1u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 4u, 57u, 5u, 57u, 
+	5u, 57u, 3u, 57u, 5u, 57u, 1u, 57u, 3u, 57u, 1u, 57u, 4u, 57u, 5u, 57u, 
+	5u, 57u, 9u, 9u, 5u, 9u, 1u, 57u, 3u, 57u, 5u, 57u, 5u, 57u, 9u, 9u, 
 	5u, 9u, 1u, 15u, 0
 };
 
 static const char _indic_syllable_machine_key_spans[] = {
-	1, 10, 9, 9, 1, 10, 10, 10, 
-	1, 9, 9, 1, 10, 10, 10, 10, 
-	1, 9, 9, 1, 10, 10, 10, 1, 
-	9, 9, 1, 10, 10, 9, 1, 18, 
-	14, 14, 13, 15, 5, 5, 1, 5, 
-	15, 15, 15, 11, 10, 9, 9, 10, 
-	5, 7, 5, 14, 14, 14, 14, 13, 
-	15, 14, 14, 13, 15, 5, 1, 5, 
-	15, 15, 11, 10, 9, 9, 10, 5, 
-	5, 7, 5, 14, 14, 10, 14, 14, 
-	13, 15, 14, 15, 5, 1, 5, 15, 
-	15, 11, 10, 9, 9, 14, 10, 5, 
-	5, 7, 5, 14, 10, 10, 14, 14, 
-	13, 15, 14, 15, 5, 1, 5, 15, 
-	15, 11, 10, 9, 9, 14, 10, 5, 
-	5, 7, 5, 16, 14, 16, 10, 9, 
-	9, 1, 5, 15, 7, 5, 5, 1, 
+	50, 54, 53, 53, 1, 54, 54, 54, 
+	50, 53, 53, 1, 54, 54, 54, 54, 
+	50, 53, 53, 1, 54, 54, 54, 50, 
+	53, 53, 1, 54, 54, 53, 50, 57, 
+	55, 55, 54, 57, 53, 53, 1, 5, 
+	57, 57, 57, 55, 54, 53, 53, 54, 
+	53, 55, 53, 55, 55, 55, 55, 54, 
+	57, 55, 55, 54, 57, 53, 1, 5, 
+	57, 57, 55, 54, 53, 53, 54, 53, 
+	53, 55, 53, 55, 55, 54, 55, 55, 
+	54, 57, 55, 57, 53, 1, 5, 57, 
+	57, 55, 54, 53, 53, 55, 54, 53, 
+	53, 55, 53, 55, 54, 54, 55, 55, 
+	54, 57, 55, 57, 53, 1, 5, 57, 
+	57, 55, 54, 53, 53, 55, 54, 53, 
+	53, 55, 53, 57, 55, 57, 54, 53, 
+	53, 1, 5, 57, 55, 53, 53, 1, 
 	5, 15
 };
 
 static const short _indic_syllable_machine_index_offsets[] = {
-	0, 2, 13, 23, 33, 35, 46, 57, 
-	68, 70, 80, 90, 92, 103, 114, 125, 
-	136, 138, 148, 158, 160, 171, 182, 193, 
-	195, 205, 215, 217, 228, 239, 249, 251, 
-	270, 285, 300, 314, 330, 336, 342, 344, 
-	350, 366, 382, 398, 410, 421, 431, 441, 
-	452, 458, 466, 472, 487, 502, 517, 532, 
-	546, 562, 577, 592, 606, 622, 628, 630, 
-	636, 652, 668, 680, 691, 701, 711, 722, 
-	728, 734, 742, 748, 763, 778, 789, 804, 
-	819, 833, 849, 864, 880, 886, 888, 894, 
-	910, 926, 938, 949, 959, 969, 984, 995, 
-	1001, 1007, 1015, 1021, 1036, 1047, 1058, 1073, 
-	1088, 1102, 1118, 1133, 1149, 1155, 1157, 1163, 
-	1179, 1195, 1207, 1218, 1228, 1238, 1253, 1264, 
-	1270, 1276, 1284, 1290, 1307, 1322, 1339, 1350, 
-	1360, 1370, 1372, 1378, 1394, 1402, 1408, 1414, 
-	1416, 1422
+	0, 51, 106, 160, 214, 216, 271, 326, 
+	381, 432, 486, 540, 542, 597, 652, 707, 
+	762, 813, 867, 921, 923, 978, 1033, 1088, 
+	1139, 1193, 1247, 1249, 1304, 1359, 1413, 1464, 
+	1522, 1578, 1634, 1689, 1747, 1801, 1855, 1857, 
+	1863, 1921, 1979, 2037, 2093, 2148, 2202, 2256, 
+	2311, 2365, 2421, 2475, 2531, 2587, 2643, 2699, 
+	2754, 2812, 2868, 2924, 2979, 3037, 3091, 3093, 
+	3099, 3157, 3215, 3271, 3326, 3380, 3434, 3489, 
+	3543, 3597, 3653, 3707, 3763, 3819, 3874, 3930, 
+	3986, 4041, 4099, 4155, 4213, 4267, 4269, 4275, 
+	4333, 4391, 4447, 4502, 4556, 4610, 4666, 4721, 
+	4775, 4829, 4885, 4939, 4995, 5050, 5105, 5161, 
+	5217, 5272, 5330, 5386, 5444, 5498, 5500, 5506, 
+	5564, 5622, 5678, 5733, 5787, 5841, 5897, 5952, 
+	6006, 6060, 6116, 6170, 6228, 6284, 6342, 6397, 
+	6451, 6505, 6507, 6513, 6571, 6627, 6681, 6735, 
+	6737, 6743
 };
 
 static const unsigned char _indic_syllable_machine_indicies[] = {
-	1, 0, 2, 3, 3, 4, 5, 0, 
-	0, 0, 0, 4, 0, 3, 3, 4, 
-	6, 0, 0, 0, 0, 4, 0, 3, 
-	3, 4, 5, 0, 0, 0, 0, 4, 
-	0, 4, 0, 7, 3, 3, 4, 5, 
-	0, 0, 0, 0, 4, 0, 2, 3, 
-	3, 4, 5, 0, 0, 0, 8, 4, 
-	0, 10, 11, 11, 12, 13, 9, 9, 
-	9, 9, 12, 9, 14, 9, 11, 11, 
-	12, 15, 9, 9, 9, 9, 12, 9, 
-	11, 11, 12, 13, 9, 9, 9, 9, 
-	12, 9, 12, 9, 16, 11, 11, 12, 
-	13, 9, 9, 9, 9, 12, 9, 10, 
-	11, 11, 12, 13, 9, 9, 9, 17, 
-	12, 9, 10, 11, 11, 12, 13, 9, 
-	9, 9, 18, 12, 9, 20, 21, 21, 
-	22, 23, 19, 19, 19, 24, 22, 19, 
-	25, 19, 21, 21, 22, 27, 26, 26, 
-	26, 26, 22, 26, 21, 21, 22, 23, 
-	19, 19, 19, 19, 22, 19, 22, 26, 
-	20, 21, 21, 22, 23, 19, 19, 19, 
-	19, 22, 19, 28, 21, 21, 22, 23, 
-	19, 19, 19, 19, 22, 19, 30, 31, 
-	31, 32, 33, 29, 29, 29, 34, 32, 
+	1, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 1, 0, 2, 3, 3, 4, 5, 
+	0, 0, 0, 0, 4, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	5, 0, 3, 3, 4, 6, 0, 0, 
+	0, 0, 4, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 6, 0, 
+	3, 3, 4, 5, 0, 0, 0, 0, 
+	4, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 5, 0, 4, 0, 
+	7, 3, 3, 4, 5, 0, 0, 0, 
+	0, 4, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 5, 0, 2, 
+	3, 3, 4, 5, 0, 0, 0, 8, 
+	4, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 5, 0, 10, 11, 
+	11, 12, 13, 9, 9, 9, 9, 12, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 13, 9, 14, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 14, 9, 
+	11, 11, 12, 15, 9, 9, 9, 9, 
+	12, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 15, 9, 11, 11, 
+	12, 13, 9, 9, 9, 9, 12, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 13, 9, 12, 9, 16, 11, 
+	11, 12, 13, 9, 9, 9, 9, 12, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 13, 9, 10, 11, 11, 
+	12, 13, 9, 9, 9, 17, 12, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 13, 9, 10, 11, 11, 12, 
+	13, 9, 9, 9, 18, 12, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 9, 9, 9, 9, 9, 9, 9, 
+	9, 13, 9, 20, 21, 21, 22, 23, 
+	19, 19, 19, 24, 22, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	23, 19, 25, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 25, 19, 21, 21, 22, 
+	27, 26, 26, 26, 26, 22, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 27, 26, 21, 21, 22, 23, 19, 
+	19, 19, 19, 22, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 23, 
+	19, 22, 26, 20, 21, 21, 22, 23, 
+	19, 19, 19, 19, 22, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	23, 19, 28, 21, 21, 22, 23, 19, 
+	19, 19, 19, 22, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 19, 
+	19, 19, 19, 19, 19, 19, 19, 23, 
+	19, 30, 31, 31, 32, 33, 29, 29, 
+	29, 34, 32, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 33, 29, 
+	35, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
 	29, 35, 29, 31, 31, 32, 36, 29, 
-	29, 29, 29, 32, 29, 31, 31, 32, 
-	33, 29, 29, 29, 29, 32, 29, 32, 
+	29, 29, 29, 32, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 36, 
+	29, 31, 31, 32, 33, 29, 29, 29, 
+	29, 32, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 33, 29, 32, 
 	29, 30, 31, 31, 32, 33, 29, 29, 
-	29, 29, 32, 29, 37, 31, 31, 32, 
-	33, 29, 29, 29, 29, 32, 29, 21, 
+	29, 29, 32, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 33, 29, 
+	37, 31, 31, 32, 33, 29, 29, 29, 
+	29, 32, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 29, 29, 29, 
+	29, 29, 29, 29, 29, 33, 29, 21, 
 	21, 22, 38, 0, 0, 0, 0, 22, 
-	0, 40, 39, 42, 43, 44, 45, 46, 
-	47, 22, 23, 48, 49, 49, 24, 22, 
-	50, 51, 52, 53, 54, 41, 56, 57, 
-	58, 59, 4, 5, 60, 55, 55, 8, 
-	4, 55, 55, 61, 55, 62, 57, 63, 
-	63, 4, 5, 60, 55, 55, 55, 4, 
-	55, 55, 61, 55, 57, 63, 63, 4, 
-	5, 60, 55, 55, 55, 4, 55, 55, 
-	61, 55, 42, 55, 55, 55, 64, 65, 
-	55, 1, 60, 55, 55, 55, 55, 55, 
-	42, 55, 66, 66, 55, 1, 60, 55, 
-	60, 55, 55, 67, 60, 55, 60, 55, 
-	60, 55, 55, 55, 60, 55, 42, 55, 
-	68, 55, 66, 66, 55, 1, 60, 55, 
-	55, 55, 55, 55, 42, 55, 42, 55, 
-	55, 55, 66, 66, 55, 1, 60, 55, 
-	55, 55, 55, 55, 42, 55, 42, 55, 
-	55, 55, 66, 65, 55, 1, 60, 55, 
-	55, 55, 55, 55, 42, 55, 69, 70, 
-	71, 71, 4, 5, 60, 55, 55, 55, 
-	4, 55, 70, 71, 71, 4, 5, 60, 
-	55, 55, 55, 4, 55, 71, 71, 4, 
-	5, 60, 55, 55, 55, 4, 55, 60, 
-	55, 55, 67, 60, 55, 55, 55, 4, 
-	55, 72, 73, 73, 4, 5, 60, 55, 
-	55, 55, 4, 55, 64, 74, 55, 1, 
-	60, 55, 64, 55, 66, 66, 55, 1, 
-	60, 55, 66, 74, 55, 1, 60, 55, 
-	56, 57, 63, 63, 4, 5, 60, 55, 
-	55, 55, 4, 55, 55, 61, 55, 56, 
-	57, 58, 63, 4, 5, 60, 55, 55, 
-	8, 4, 55, 55, 61, 55, 76, 77, 
-	78, 79, 12, 13, 80, 75, 75, 18, 
-	12, 75, 75, 81, 75, 82, 77, 83, 
-	79, 12, 13, 80, 75, 75, 75, 12, 
-	75, 75, 81, 75, 77, 83, 79, 12, 
-	13, 80, 75, 75, 75, 12, 75, 75, 
-	81, 75, 84, 75, 75, 75, 85, 86, 
-	75, 14, 80, 75, 75, 75, 75, 75, 
-	84, 75, 87, 77, 88, 89, 12, 13, 
-	80, 75, 75, 17, 12, 75, 75, 81, 
-	75, 90, 77, 83, 83, 12, 13, 80, 
-	75, 75, 75, 12, 75, 75, 81, 75, 
-	77, 83, 83, 12, 13, 80, 75, 75, 
-	75, 12, 75, 75, 81, 75, 84, 75, 
-	75, 75, 91, 86, 75, 14, 80, 75, 
-	75, 75, 75, 75, 84, 75, 80, 75, 
-	75, 92, 80, 75, 80, 75, 80, 75, 
-	75, 75, 80, 75, 84, 75, 93, 75, 
-	91, 91, 75, 14, 80, 75, 75, 75, 
-	75, 75, 84, 75, 84, 75, 75, 75, 
-	91, 91, 75, 14, 80, 75, 75, 75, 
-	75, 75, 84, 75, 94, 95, 96, 96, 
-	12, 13, 80, 75, 75, 75, 12, 75, 
-	95, 96, 96, 12, 13, 80, 75, 75, 
-	75, 12, 75, 96, 96, 12, 13, 80, 
-	75, 75, 75, 12, 75, 80, 75, 75, 
-	92, 80, 75, 75, 75, 12, 75, 97, 
-	98, 98, 12, 13, 80, 75, 75, 75, 
-	12, 75, 85, 99, 75, 14, 80, 75, 
-	91, 91, 75, 14, 80, 75, 85, 75, 
-	91, 91, 75, 14, 80, 75, 91, 99, 
-	75, 14, 80, 75, 87, 77, 83, 83, 
-	12, 13, 80, 75, 75, 75, 12, 75, 
-	75, 81, 75, 87, 77, 88, 83, 12, 
-	13, 80, 75, 75, 17, 12, 75, 75, 
-	81, 75, 10, 11, 11, 12, 13, 75, 
-	75, 75, 75, 12, 75, 76, 77, 83, 
-	79, 12, 13, 80, 75, 75, 75, 12, 
-	75, 75, 81, 75, 101, 45, 102, 102, 
-	22, 23, 48, 100, 100, 100, 22, 100, 
-	100, 52, 100, 45, 102, 102, 22, 23, 
-	48, 100, 100, 100, 22, 100, 100, 52, 
-	100, 103, 100, 100, 100, 104, 105, 100, 
-	25, 48, 100, 100, 100, 100, 100, 103, 
-	100, 44, 45, 106, 107, 22, 23, 48, 
-	100, 100, 24, 22, 100, 100, 52, 100, 
-	103, 100, 100, 100, 108, 105, 100, 25, 
-	48, 100, 100, 100, 100, 100, 103, 100, 
-	48, 100, 100, 109, 48, 100, 48, 100, 
-	48, 100, 100, 100, 48, 100, 103, 100, 
-	110, 100, 108, 108, 100, 25, 48, 100, 
-	100, 100, 100, 100, 103, 100, 103, 100, 
-	100, 100, 108, 108, 100, 25, 48, 100, 
-	100, 100, 100, 100, 103, 100, 111, 112, 
-	113, 113, 22, 23, 48, 100, 100, 100, 
-	22, 100, 112, 113, 113, 22, 23, 48, 
-	100, 100, 100, 22, 100, 113, 113, 22, 
-	23, 48, 100, 100, 100, 22, 100, 48, 
-	100, 100, 109, 48, 100, 100, 100, 22, 
-	100, 44, 45, 102, 102, 22, 23, 48, 
-	100, 100, 100, 22, 100, 100, 52, 100, 
-	114, 115, 115, 22, 23, 48, 100, 100, 
-	100, 22, 100, 104, 116, 100, 25, 48, 
-	100, 108, 108, 100, 25, 48, 100, 104, 
-	100, 108, 108, 100, 25, 48, 100, 108, 
-	116, 100, 25, 48, 100, 44, 45, 106, 
-	102, 22, 23, 48, 100, 100, 24, 22, 
-	100, 100, 52, 100, 20, 21, 21, 22, 
-	23, 117, 117, 117, 24, 22, 117, 20, 
-	21, 21, 22, 23, 117, 117, 117, 117, 
-	22, 117, 119, 120, 121, 122, 32, 33, 
-	123, 118, 118, 34, 32, 118, 118, 124, 
-	118, 125, 120, 122, 122, 32, 33, 123, 
-	118, 118, 118, 32, 118, 118, 124, 118, 
-	120, 122, 122, 32, 33, 123, 118, 118, 
-	118, 32, 118, 118, 124, 118, 126, 118, 
-	118, 118, 127, 128, 118, 35, 123, 118, 
-	118, 118, 118, 118, 126, 118, 119, 120, 
-	121, 49, 32, 33, 123, 118, 118, 34, 
-	32, 118, 118, 124, 118, 126, 118, 118, 
-	118, 129, 128, 118, 35, 123, 118, 118, 
-	118, 118, 118, 126, 118, 123, 118, 118, 
-	130, 123, 118, 123, 118, 123, 118, 118, 
-	118, 123, 118, 126, 118, 131, 118, 129, 
-	129, 118, 35, 123, 118, 118, 118, 118, 
-	118, 126, 118, 126, 118, 118, 118, 129, 
-	129, 118, 35, 123, 118, 118, 118, 118, 
-	118, 126, 118, 132, 133, 134, 134, 32, 
-	33, 123, 118, 118, 118, 32, 118, 133, 
-	134, 134, 32, 33, 123, 118, 118, 118, 
-	32, 118, 134, 134, 32, 33, 123, 118, 
-	118, 118, 32, 118, 123, 118, 118, 130, 
-	123, 118, 118, 118, 32, 118, 119, 120, 
-	122, 122, 32, 33, 123, 118, 118, 118, 
-	32, 118, 118, 124, 118, 135, 136, 136, 
-	32, 33, 123, 118, 118, 118, 32, 118, 
-	127, 137, 118, 35, 123, 118, 129, 129, 
-	118, 35, 123, 118, 127, 118, 129, 129, 
-	118, 35, 123, 118, 129, 137, 118, 35, 
-	123, 118, 42, 43, 44, 45, 106, 102, 
-	22, 23, 48, 49, 49, 24, 22, 100, 
-	42, 52, 100, 56, 138, 58, 59, 4, 
-	5, 60, 55, 55, 8, 4, 55, 55, 
-	61, 55, 42, 43, 44, 45, 139, 140, 
-	22, 141, 142, 55, 49, 24, 22, 55, 
-	42, 52, 55, 20, 143, 143, 22, 141, 
-	60, 55, 55, 24, 22, 55, 60, 55, 
-	55, 67, 60, 55, 55, 55, 22, 55, 
-	142, 55, 55, 144, 142, 55, 55, 55, 
-	22, 55, 142, 55, 142, 55, 55, 55, 
-	142, 55, 42, 55, 68, 20, 143, 143, 
-	22, 141, 60, 55, 55, 55, 22, 55, 
-	42, 55, 146, 145, 147, 147, 145, 40, 
-	148, 145, 147, 147, 145, 40, 148, 145, 
-	148, 145, 145, 149, 148, 145, 148, 145, 
-	148, 145, 145, 145, 148, 145, 42, 117, 
-	117, 117, 117, 117, 117, 117, 117, 49, 
-	117, 117, 117, 117, 42, 117, 0
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 38, 0, 40, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 40, 39, 
+	42, 43, 44, 45, 46, 47, 22, 23, 
+	48, 49, 49, 24, 22, 50, 51, 52, 
+	53, 54, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	41, 41, 41, 41, 41, 41, 41, 41, 
+	55, 41, 57, 58, 59, 60, 4, 5, 
+	61, 56, 56, 8, 4, 56, 56, 62, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	5, 56, 63, 58, 64, 64, 4, 5, 
+	61, 56, 56, 56, 4, 56, 56, 62, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	5, 56, 58, 64, 64, 4, 5, 61, 
+	56, 56, 56, 4, 56, 56, 62, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 5, 
+	56, 42, 56, 56, 56, 65, 66, 56, 
+	1, 61, 56, 56, 56, 56, 56, 42, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 1, 56, 67, 67, 56, 1, 61, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 1, 
+	56, 61, 56, 56, 68, 61, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 68, 56, 61, 
+	56, 61, 56, 56, 56, 61, 56, 42, 
+	56, 69, 56, 67, 67, 56, 1, 61, 
+	56, 56, 56, 56, 56, 42, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 1, 
+	56, 42, 56, 56, 56, 67, 67, 56, 
+	1, 61, 56, 56, 56, 56, 56, 42, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 1, 56, 42, 56, 56, 56, 67, 
+	66, 56, 1, 61, 56, 56, 56, 56, 
+	56, 42, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 1, 56, 70, 71, 72, 
+	72, 4, 5, 61, 56, 56, 56, 4, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 5, 56, 71, 72, 72, 
+	4, 5, 61, 56, 56, 56, 4, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 5, 56, 72, 72, 4, 5, 
+	61, 56, 56, 56, 4, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	5, 56, 61, 56, 56, 68, 61, 56, 
+	56, 56, 4, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 68, 56, 
+	73, 74, 74, 4, 5, 61, 56, 56, 
+	56, 4, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 5, 56, 65, 
+	75, 56, 1, 61, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 1, 56, 65, 56, 67, 
+	67, 56, 1, 61, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 1, 56, 67, 75, 56, 
+	1, 61, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 1, 56, 57, 58, 64, 64, 4, 
+	5, 61, 56, 56, 56, 4, 56, 56, 
+	62, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 5, 56, 57, 58, 59, 64, 4, 
+	5, 61, 56, 56, 8, 4, 56, 56, 
+	62, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 5, 56, 77, 78, 79, 80, 12, 
+	13, 81, 76, 76, 18, 12, 76, 76, 
+	82, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 13, 76, 83, 78, 84, 80, 12, 
+	13, 81, 76, 76, 76, 12, 76, 76, 
+	82, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 13, 76, 78, 84, 80, 12, 13, 
+	81, 76, 76, 76, 12, 76, 76, 82, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	13, 76, 85, 76, 76, 76, 86, 87, 
+	76, 14, 81, 76, 76, 76, 76, 76, 
+	85, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 14, 76, 88, 78, 89, 90, 
+	12, 13, 81, 76, 76, 17, 12, 76, 
+	76, 82, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 13, 76, 91, 78, 84, 84, 
+	12, 13, 81, 76, 76, 76, 12, 76, 
+	76, 82, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 13, 76, 78, 84, 84, 12, 
+	13, 81, 76, 76, 76, 12, 76, 76, 
+	82, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 13, 76, 85, 76, 76, 76, 92, 
+	87, 76, 14, 81, 76, 76, 76, 76, 
+	76, 85, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 14, 76, 81, 76, 76, 
+	93, 81, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 93, 76, 81, 76, 81, 76, 76, 
+	76, 81, 76, 85, 76, 94, 76, 92, 
+	92, 76, 14, 81, 76, 76, 76, 76, 
+	76, 85, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 14, 76, 85, 76, 76, 
+	76, 92, 92, 76, 14, 81, 76, 76, 
+	76, 76, 76, 85, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 14, 76, 95, 
+	96, 97, 97, 12, 13, 81, 76, 76, 
+	76, 12, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 13, 76, 96, 
+	97, 97, 12, 13, 81, 76, 76, 76, 
+	12, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 13, 76, 97, 97, 
+	12, 13, 81, 76, 76, 76, 12, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 13, 76, 81, 76, 76, 93, 
+	81, 76, 76, 76, 12, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	93, 76, 98, 99, 99, 12, 13, 81, 
+	76, 76, 76, 12, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 13, 
+	76, 86, 100, 76, 14, 81, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 14, 76, 92, 
+	92, 76, 14, 81, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 14, 76, 86, 76, 92, 
+	92, 76, 14, 81, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 14, 76, 92, 100, 76, 
+	14, 81, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 14, 76, 88, 78, 84, 84, 12, 
+	13, 81, 76, 76, 76, 12, 76, 76, 
+	82, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 13, 76, 88, 78, 89, 84, 12, 
+	13, 81, 76, 76, 17, 12, 76, 76, 
+	82, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 13, 76, 10, 11, 11, 12, 13, 
+	76, 76, 76, 76, 12, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	13, 76, 77, 78, 84, 80, 12, 13, 
+	81, 76, 76, 76, 12, 76, 76, 82, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	76, 76, 76, 76, 76, 76, 76, 76, 
+	13, 76, 102, 45, 103, 103, 22, 23, 
+	48, 101, 101, 101, 22, 101, 101, 52, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	23, 101, 45, 103, 103, 22, 23, 48, 
+	101, 101, 101, 22, 101, 101, 52, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 23, 
+	101, 104, 101, 101, 101, 105, 106, 101, 
+	25, 48, 101, 101, 101, 101, 101, 104, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 25, 101, 44, 45, 107, 108, 22, 
+	23, 48, 101, 101, 24, 22, 101, 101, 
+	52, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 23, 101, 104, 101, 101, 101, 109, 
+	106, 101, 25, 48, 101, 101, 101, 101, 
+	101, 104, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 25, 101, 48, 101, 101, 
+	110, 48, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 110, 101, 48, 101, 48, 101, 101, 
+	101, 48, 101, 104, 101, 111, 101, 109, 
+	109, 101, 25, 48, 101, 101, 101, 101, 
+	101, 104, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 25, 101, 104, 101, 101, 
+	101, 109, 109, 101, 25, 48, 101, 101, 
+	101, 101, 101, 104, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 25, 101, 112, 
+	113, 114, 114, 22, 23, 48, 101, 101, 
+	101, 22, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 23, 101, 113, 
+	114, 114, 22, 23, 48, 101, 101, 101, 
+	22, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 23, 101, 114, 114, 
+	22, 23, 48, 101, 101, 101, 22, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 23, 101, 48, 26, 26, 110, 
+	48, 26, 26, 26, 22, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	26, 26, 26, 26, 26, 26, 26, 26, 
+	110, 26, 44, 45, 103, 103, 22, 23, 
+	48, 101, 101, 101, 22, 101, 101, 52, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	23, 101, 115, 116, 116, 22, 23, 48, 
+	101, 101, 101, 22, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 23, 
+	101, 105, 117, 101, 25, 48, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 25, 101, 109, 
+	109, 101, 25, 48, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 25, 101, 105, 101, 109, 
+	109, 101, 25, 48, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 25, 101, 109, 117, 101, 
+	25, 48, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 25, 101, 44, 45, 107, 103, 22, 
+	23, 48, 101, 101, 24, 22, 101, 101, 
+	52, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 23, 101, 20, 21, 21, 22, 23, 
+	118, 118, 118, 24, 22, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	23, 118, 20, 21, 21, 22, 23, 118, 
+	118, 118, 118, 22, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	118, 118, 118, 118, 118, 118, 118, 23, 
+	118, 120, 121, 122, 123, 32, 33, 124, 
+	119, 119, 34, 32, 119, 119, 125, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 33, 
+	119, 126, 121, 123, 123, 32, 33, 124, 
+	119, 119, 119, 32, 119, 119, 125, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 33, 
+	119, 121, 123, 123, 32, 33, 124, 119, 
+	119, 119, 32, 119, 119, 125, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 33, 119, 
+	127, 119, 119, 119, 128, 129, 119, 35, 
+	124, 119, 119, 119, 119, 119, 127, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	35, 119, 120, 121, 122, 49, 32, 33, 
+	124, 119, 119, 34, 32, 119, 119, 125, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	33, 119, 127, 119, 119, 119, 130, 129, 
+	119, 35, 124, 119, 119, 119, 119, 119, 
+	127, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 35, 119, 124, 119, 119, 131, 
+	124, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	131, 119, 124, 119, 124, 119, 119, 119, 
+	124, 119, 127, 119, 132, 119, 130, 130, 
+	119, 35, 124, 119, 119, 119, 119, 119, 
+	127, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 35, 119, 127, 119, 119, 119, 
+	130, 130, 119, 35, 124, 119, 119, 119, 
+	119, 119, 127, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 35, 119, 133, 134, 
+	135, 135, 32, 33, 124, 119, 119, 119, 
+	32, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 33, 119, 134, 135, 
+	135, 32, 33, 124, 119, 119, 119, 32, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 33, 119, 135, 135, 32, 
+	33, 124, 119, 119, 119, 32, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 33, 119, 124, 119, 119, 131, 124, 
+	119, 119, 119, 32, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 131, 
+	119, 120, 121, 123, 123, 32, 33, 124, 
+	119, 119, 119, 32, 119, 119, 125, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 33, 
+	119, 136, 137, 137, 32, 33, 124, 119, 
+	119, 119, 32, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 33, 119, 
+	128, 138, 119, 35, 124, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 35, 119, 130, 130, 
+	119, 35, 124, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 35, 119, 128, 119, 130, 130, 
+	119, 35, 124, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 35, 119, 130, 138, 119, 35, 
+	124, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	119, 119, 119, 119, 119, 119, 119, 119, 
+	35, 119, 42, 43, 44, 45, 107, 103, 
+	22, 23, 48, 49, 49, 24, 22, 101, 
+	42, 52, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 101, 101, 101, 101, 101, 101, 
+	101, 101, 23, 101, 57, 139, 59, 60, 
+	4, 5, 61, 56, 56, 8, 4, 56, 
+	56, 62, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 5, 56, 42, 43, 44, 45, 
+	140, 141, 22, 142, 143, 56, 49, 24, 
+	22, 56, 42, 52, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 142, 56, 20, 144, 
+	144, 22, 142, 61, 56, 56, 24, 22, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 142, 56, 61, 56, 56, 
+	68, 61, 56, 56, 56, 22, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 68, 56, 143, 56, 56, 145, 143, 
+	56, 56, 56, 22, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 145, 
+	56, 143, 56, 143, 56, 56, 56, 143, 
+	56, 42, 56, 69, 20, 144, 144, 22, 
+	142, 61, 56, 56, 56, 22, 56, 42, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 56, 56, 56, 56, 56, 56, 56, 
+	56, 142, 56, 147, 146, 148, 148, 146, 
+	40, 149, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 40, 146, 148, 148, 146, 40, 149, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 40, 
+	146, 149, 146, 146, 150, 149, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 146, 146, 146, 
+	146, 146, 146, 146, 146, 150, 146, 149, 
+	146, 149, 146, 146, 146, 149, 146, 42, 
+	118, 118, 118, 118, 118, 118, 118, 118, 
+	49, 118, 118, 118, 118, 42, 118, 0
 };
 
 static const unsigned char _indic_syllable_machine_trans_targs[] = {
@@ -330,41 +996,41 @@ static const unsigned char _indic_syllable_machine_trans_targs[] = {
 	93, 84, 31, 19, 98, 31, 107, 24, 
 	113, 116, 117, 108, 26, 122, 127, 31, 
 	134, 31, 32, 53, 79, 81, 100, 101, 
-	85, 102, 123, 124, 94, 132, 137, 31, 
-	33, 35, 6, 52, 38, 47, 34, 1, 
-	36, 40, 0, 39, 41, 44, 45, 3, 
-	48, 5, 49, 31, 54, 56, 14, 77, 
-	62, 70, 55, 7, 57, 72, 64, 58, 
-	13, 76, 59, 8, 63, 65, 67, 68, 
-	10, 71, 12, 73, 31, 80, 20, 82, 
-	96, 87, 15, 99, 16, 86, 88, 90, 
-	91, 18, 95, 21, 97, 31, 31, 103, 
-	105, 22, 27, 109, 118, 104, 106, 120, 
-	111, 23, 110, 112, 114, 115, 25, 119, 
-	28, 121, 125, 126, 131, 128, 129, 29, 
-	130, 31, 133, 30, 135, 136
+	85, 102, 123, 124, 94, 132, 137, 92, 
+	31, 33, 35, 6, 52, 38, 47, 34, 
+	1, 36, 40, 0, 39, 41, 44, 45, 
+	3, 48, 5, 49, 31, 54, 56, 14, 
+	77, 62, 70, 55, 7, 57, 72, 64, 
+	58, 13, 76, 59, 8, 63, 65, 67, 
+	68, 10, 71, 12, 73, 31, 80, 20, 
+	82, 96, 87, 15, 99, 16, 86, 88, 
+	90, 91, 18, 95, 21, 97, 31, 31, 
+	103, 105, 22, 27, 109, 118, 104, 106, 
+	120, 111, 23, 110, 112, 114, 115, 25, 
+	119, 28, 121, 125, 126, 131, 128, 129, 
+	29, 130, 31, 133, 30, 135, 136
 };
 
 static const char _indic_syllable_machine_trans_actions[] = {
 	1, 0, 2, 0, 2, 0, 0, 2, 
 	2, 3, 2, 0, 2, 0, 0, 0, 
-	2, 2, 2, 4, 2, 0, 5, 0, 
+	2, 2, 2, 4, 2, 0, 5, 5, 
 	5, 0, 6, 0, 2, 7, 2, 0, 
 	2, 0, 2, 0, 0, 2, 0, 8, 
 	0, 11, 2, 2, 5, 0, 12, 12, 
 	0, 2, 5, 2, 5, 2, 0, 13, 
-	2, 0, 0, 2, 0, 2, 2, 0, 
-	2, 2, 0, 0, 2, 2, 2, 0, 
-	0, 0, 2, 14, 2, 0, 0, 2, 
-	0, 2, 2, 0, 2, 2, 2, 2, 
+	14, 2, 0, 0, 2, 0, 2, 2, 
 	0, 2, 2, 0, 0, 2, 2, 2, 
-	0, 0, 0, 2, 15, 5, 0, 5, 
-	2, 2, 0, 5, 0, 0, 2, 5, 
-	5, 0, 0, 0, 2, 16, 17, 2, 
-	0, 0, 0, 0, 2, 2, 2, 2, 
-	2, 0, 0, 2, 2, 2, 0, 0, 
-	0, 2, 0, 18, 18, 0, 0, 0, 
-	0, 19, 2, 0, 0, 0
+	0, 0, 0, 2, 15, 2, 0, 0, 
+	2, 0, 2, 2, 0, 2, 2, 2, 
+	2, 0, 2, 2, 0, 0, 2, 2, 
+	2, 0, 0, 0, 2, 16, 5, 0, 
+	5, 2, 2, 0, 5, 0, 0, 2, 
+	5, 5, 0, 0, 0, 2, 17, 18, 
+	2, 0, 0, 0, 0, 2, 2, 2, 
+	2, 2, 0, 0, 2, 2, 2, 0, 
+	0, 0, 2, 0, 19, 19, 0, 0, 
+	0, 0, 20, 2, 0, 0, 0
 };
 
 static const char _indic_syllable_machine_to_state_actions[] = {
@@ -414,20 +1080,20 @@ static const short _indic_syllable_machine_eof_trans[] = {
 	10, 10, 10, 10, 10, 10, 10, 20, 
 	20, 27, 20, 27, 20, 20, 30, 30, 
 	30, 30, 30, 30, 30, 1, 40, 0, 
-	56, 56, 56, 56, 56, 56, 56, 56, 
-	56, 56, 56, 56, 56, 56, 56, 56, 
-	56, 56, 56, 56, 56, 76, 76, 76, 
-	76, 76, 76, 76, 76, 76, 76, 76, 
-	76, 76, 76, 76, 76, 76, 76, 76, 
-	76, 76, 76, 76, 76, 76, 76, 101, 
-	101, 101, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 101, 101, 101, 101, 
-	101, 101, 101, 101, 118, 118, 119, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 119, 119, 119, 119, 119, 119, 119, 
-	119, 119, 119, 101, 56, 56, 56, 56, 
-	56, 56, 56, 56, 146, 146, 146, 146, 
-	146, 118
+	57, 57, 57, 57, 57, 57, 57, 57, 
+	57, 57, 57, 57, 57, 57, 57, 57, 
+	57, 57, 57, 57, 57, 77, 77, 77, 
+	77, 77, 77, 77, 77, 77, 77, 77, 
+	77, 77, 77, 77, 77, 77, 77, 77, 
+	77, 77, 77, 77, 77, 77, 77, 102, 
+	102, 102, 102, 102, 102, 102, 102, 102, 
+	102, 102, 102, 102, 27, 102, 102, 102, 
+	102, 102, 102, 102, 119, 119, 120, 120, 
+	120, 120, 120, 120, 120, 120, 120, 120, 
+	120, 120, 120, 120, 120, 120, 120, 120, 
+	120, 120, 120, 102, 57, 57, 57, 57, 
+	57, 57, 57, 57, 147, 147, 147, 147, 
+	147, 119
 };
 
 static const int indic_syllable_machine_start = 31;
@@ -441,7 +1107,7 @@ static const int indic_syllable_machine_en_main = 31;
 
 
 
-#line 118 "hb-ot-shaper-indic-machine.rl"
+#line 121 "hb-ot-shaper-indic-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -460,7 +1126,7 @@ find_syllables_indic (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 464 "hb-ot-shaper-indic-machine.hh"
+#line 1130 "hb-ot-shaper-indic-machine.hh"
 	{
 	cs = indic_syllable_machine_start;
 	ts = 0;
@@ -468,7 +1134,7 @@ find_syllables_indic (hb_buffer_t *buffer)
 	act = 0;
 	}
 
-#line 138 "hb-ot-shaper-indic-machine.rl"
+#line 141 "hb-ot-shaper-indic-machine.rl"
 
 
   p = 0;
@@ -476,7 +1142,7 @@ find_syllables_indic (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
   
-#line 480 "hb-ot-shaper-indic-machine.hh"
+#line 1146 "hb-ot-shaper-indic-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -490,7 +1156,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 494 "hb-ot-shaper-indic-machine.hh"
+#line 1160 "hb-ot-shaper-indic-machine.hh"
 	}
 
 	_keys = _indic_syllable_machine_trans_keys + (cs<<1);
@@ -513,51 +1179,51 @@ _eof_trans:
 	{te = p+1;}
 	break;
 	case 11:
-#line 114 "hb-ot-shaper-indic-machine.rl"
+#line 117 "hb-ot-shaper-indic-machine.rl"
 	{te = p+1;{ found_syllable (indic_non_indic_cluster); }}
 	break;
-	case 13:
-#line 109 "hb-ot-shaper-indic-machine.rl"
+	case 14:
+#line 111 "hb-ot-shaper-indic-machine.rl"
 	{te = p;p--;{ found_syllable (indic_consonant_syllable); }}
 	break;
-	case 14:
-#line 110 "hb-ot-shaper-indic-machine.rl"
+	case 15:
+#line 112 "hb-ot-shaper-indic-machine.rl"
 	{te = p;p--;{ found_syllable (indic_vowel_syllable); }}
 	break;
-	case 17:
-#line 111 "hb-ot-shaper-indic-machine.rl"
+	case 18:
+#line 113 "hb-ot-shaper-indic-machine.rl"
 	{te = p;p--;{ found_syllable (indic_standalone_cluster); }}
 	break;
-	case 19:
-#line 112 "hb-ot-shaper-indic-machine.rl"
+	case 20:
+#line 114 "hb-ot-shaper-indic-machine.rl"
 	{te = p;p--;{ found_syllable (indic_symbol_cluster); }}
 	break;
-	case 15:
-#line 113 "hb-ot-shaper-indic-machine.rl"
+	case 16:
+#line 116 "hb-ot-shaper-indic-machine.rl"
 	{te = p;p--;{ found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
 	break;
-	case 16:
-#line 114 "hb-ot-shaper-indic-machine.rl"
+	case 17:
+#line 117 "hb-ot-shaper-indic-machine.rl"
 	{te = p;p--;{ found_syllable (indic_non_indic_cluster); }}
 	break;
 	case 1:
-#line 109 "hb-ot-shaper-indic-machine.rl"
+#line 111 "hb-ot-shaper-indic-machine.rl"
 	{{p = ((te))-1;}{ found_syllable (indic_consonant_syllable); }}
 	break;
 	case 3:
-#line 110 "hb-ot-shaper-indic-machine.rl"
+#line 112 "hb-ot-shaper-indic-machine.rl"
 	{{p = ((te))-1;}{ found_syllable (indic_vowel_syllable); }}
 	break;
 	case 7:
-#line 111 "hb-ot-shaper-indic-machine.rl"
+#line 113 "hb-ot-shaper-indic-machine.rl"
 	{{p = ((te))-1;}{ found_syllable (indic_standalone_cluster); }}
 	break;
 	case 8:
-#line 112 "hb-ot-shaper-indic-machine.rl"
+#line 114 "hb-ot-shaper-indic-machine.rl"
 	{{p = ((te))-1;}{ found_syllable (indic_symbol_cluster); }}
 	break;
 	case 4:
-#line 113 "hb-ot-shaper-indic-machine.rl"
+#line 116 "hb-ot-shaper-indic-machine.rl"
 	{{p = ((te))-1;}{ found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
 	break;
 	case 6:
@@ -567,33 +1233,42 @@ _eof_trans:
 	{{p = ((te))-1;} found_syllable (indic_consonant_syllable); }
 	break;
 	case 5:
-	{{p = ((te))-1;} found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+	{{p = ((te))-1;} found_syllable (indic_non_indic_cluster); }
 	break;
 	case 6:
+	{{p = ((te))-1;} found_syllable (indic_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+	break;
+	case 7:
 	{{p = ((te))-1;} found_syllable (indic_non_indic_cluster); }
 	break;
 	}
 	}
 	break;
-	case 18:
+	case 19:
 #line 1 "NONE"
 	{te = p+1;}
-#line 109 "hb-ot-shaper-indic-machine.rl"
+#line 111 "hb-ot-shaper-indic-machine.rl"
 	{act = 1;}
 	break;
+	case 13:
+#line 1 "NONE"
+	{te = p+1;}
+#line 115 "hb-ot-shaper-indic-machine.rl"
+	{act = 5;}
+	break;
 	case 5:
 #line 1 "NONE"
 	{te = p+1;}
-#line 113 "hb-ot-shaper-indic-machine.rl"
-	{act = 5;}
+#line 116 "hb-ot-shaper-indic-machine.rl"
+	{act = 6;}
 	break;
 	case 12:
 #line 1 "NONE"
 	{te = p+1;}
-#line 114 "hb-ot-shaper-indic-machine.rl"
-	{act = 6;}
+#line 117 "hb-ot-shaper-indic-machine.rl"
+	{act = 7;}
 	break;
-#line 597 "hb-ot-shaper-indic-machine.hh"
+#line 1272 "hb-ot-shaper-indic-machine.hh"
 	}
 
 _again:
@@ -602,7 +1277,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 606 "hb-ot-shaper-indic-machine.hh"
+#line 1281 "hb-ot-shaper-indic-machine.hh"
 	}
 
 	if ( ++p != pe )
@@ -618,7 +1293,7 @@ _again:
 
 	}
 
-#line 146 "hb-ot-shaper-indic-machine.rl"
+#line 149 "hb-ot-shaper-indic-machine.rl"
 
 }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc
index adea32ef..b87c5308 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-indic-table.cc
@@ -48,6 +48,7 @@
 #define OT_CM I_Cat(CM)
 #define OT_Symbol I_Cat(Symbol)
 #define OT_CS I_Cat(CS)
+#define OT_SMPst I_Cat(SMPst)
 /* khmer */
 #define OT_VAbv K_Cat(VAbv)
 #define OT_VBlw K_Cat(VBlw)
@@ -94,7 +95,8 @@ static_assert (OT_VPst == M_Cat(VPst), "");
 #define _OT_R    OT_Ra           /*  14 chars; Ra */
 #define _OT_Rf   OT_Repha        /*   1 chars; Repha */
 #define _OT_Rt   OT_Robatic      /*   3 chars; Robatic */
-#define _OT_SM   OT_SM           /*  56 chars; SM */
+#define _OT_SM   OT_SM           /*  50 chars; SM */
+#define _OT_SP   OT_SMPst        /*   6 chars; SMPst */
 #define _OT_S    OT_Symbol       /*  22 chars; Symbol */
 #define _OT_V    OT_V            /* 172 chars; V */
 #define _OT_VA   OT_VAbv         /*  18 chars; VAbv */
@@ -145,7 +147,7 @@ static const uint16_t indic_table[] = {
 
   /* Latin-1 Supplement */
 
-  /* 00B0 */  _(X,X),  _(X,X),_(SM,SM),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
+  /* 00B0 */  _(X,X),  _(X,X),_(SP,SM),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
   /* 00B8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
   /* 00C0 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
   /* 00C8 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
@@ -398,9 +400,9 @@ static const uint16_t indic_table[] = {
 
   /* Superscripts and Subscripts */
 
-  /* 2070 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),
+  /* 2070 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),
   /* 2078 */  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),  _(X,X),
-  /* 2080 */  _(X,X),  _(X,X),_(SM,SM),_(SM,SM),_(SM,SM),  _(X,X),  _(X,X),  _(X,X),
+  /* 2080 */  _(X,X),  _(X,X),_(SP,SM),_(SP,SM),_(SP,SM),  _(X,X),  _(X,X),  _(X,X),
 
 #define indic_offset_0x25f8u 1592
 
@@ -540,6 +542,7 @@ hb_indic_get_categories (hb_codepoint_t u)
 #undef _OT_Rf
 #undef _OT_Rt
 #undef _OT_SM
+#undef _OT_SP
 #undef _OT_S
 #undef _OT_V
 #undef _OT_VA
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
index f7b456b1..4b8da586 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-myanmar-machine.hh
@@ -68,6 +68,7 @@ enum myanmar_syllable_type_t {
 #define myanmar_syllable_machine_ex_PT 39u
 #define myanmar_syllable_machine_ex_Ra 15u
 #define myanmar_syllable_machine_ex_SM 8u
+#define myanmar_syllable_machine_ex_SMPst 57u
 #define myanmar_syllable_machine_ex_VAbv 20u
 #define myanmar_syllable_machine_ex_VBlw 21u
 #define myanmar_syllable_machine_ex_VPre 22u
@@ -77,35 +78,35 @@ enum myanmar_syllable_type_t {
 #define myanmar_syllable_machine_ex_ZWNJ 5u
 
 
-#line 81 "hb-ot-shaper-myanmar-machine.hh"
+#line 82 "hb-ot-shaper-myanmar-machine.hh"
 static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
-	1u, 41u, 3u, 41u, 5u, 39u, 5u, 8u, 3u, 41u, 3u, 39u, 3u, 39u, 5u, 39u, 
-	5u, 39u, 3u, 39u, 3u, 39u, 3u, 41u, 5u, 39u, 1u, 15u, 3u, 39u, 3u, 39u, 
-	3u, 40u, 3u, 39u, 3u, 41u, 3u, 41u, 3u, 39u, 3u, 41u, 3u, 41u, 3u, 41u, 
-	3u, 41u, 3u, 41u, 5u, 39u, 5u, 8u, 3u, 41u, 3u, 39u, 3u, 39u, 5u, 39u, 
-	5u, 39u, 3u, 39u, 3u, 39u, 3u, 41u, 5u, 39u, 1u, 15u, 3u, 41u, 3u, 39u, 
-	3u, 39u, 3u, 40u, 3u, 39u, 3u, 41u, 3u, 41u, 3u, 39u, 3u, 41u, 3u, 41u, 
-	3u, 41u, 3u, 41u, 3u, 41u, 3u, 41u, 3u, 41u, 1u, 41u, 1u, 15u, 0
+	1u, 57u, 3u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 
+	3u, 57u, 3u, 57u, 3u, 57u, 5u, 57u, 1u, 15u, 3u, 57u, 3u, 57u, 3u, 57u, 
+	3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 
+	3u, 57u, 5u, 57u, 5u, 57u, 3u, 57u, 5u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 
+	3u, 57u, 3u, 57u, 5u, 57u, 1u, 15u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 
+	3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 3u, 57u, 
+	3u, 57u, 3u, 57u, 3u, 57u, 1u, 57u, 1u, 15u, 0
 };
 
 static const char _myanmar_syllable_machine_key_spans[] = {
-	41, 39, 35, 4, 39, 37, 37, 35, 
-	35, 37, 37, 39, 35, 15, 37, 37, 
-	38, 37, 39, 39, 37, 39, 39, 39, 
-	39, 39, 35, 4, 39, 37, 37, 35, 
-	35, 37, 37, 39, 35, 15, 39, 37, 
-	37, 38, 37, 39, 39, 37, 39, 39, 
-	39, 39, 39, 39, 39, 41, 15
+	57, 55, 53, 53, 55, 53, 55, 55, 
+	55, 55, 55, 53, 15, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 53, 53, 55, 53, 55, 55, 55, 
+	55, 55, 53, 15, 55, 55, 55, 55, 
+	55, 55, 55, 55, 55, 55, 55, 55, 
+	55, 55, 55, 57, 15
 };
 
 static const short _myanmar_syllable_machine_index_offsets[] = {
-	0, 42, 82, 118, 123, 163, 201, 239, 
-	275, 311, 349, 387, 427, 463, 479, 517, 
-	555, 594, 632, 672, 712, 750, 790, 830, 
-	870, 910, 950, 986, 991, 1031, 1069, 1107, 
-	1143, 1179, 1217, 1255, 1295, 1331, 1347, 1387, 
-	1425, 1463, 1502, 1540, 1580, 1620, 1658, 1698, 
-	1738, 1778, 1818, 1858, 1898, 1938, 1980
+	0, 58, 114, 168, 222, 278, 332, 388, 
+	444, 500, 556, 612, 666, 682, 738, 794, 
+	850, 906, 962, 1018, 1074, 1130, 1186, 1242, 
+	1298, 1354, 1408, 1462, 1518, 1572, 1628, 1684, 
+	1740, 1796, 1852, 1906, 1922, 1978, 2034, 2090, 
+	2146, 2202, 2258, 2314, 2370, 2426, 2482, 2538, 
+	2594, 2650, 2706, 2762, 2820
 };
 
 static const char _myanmar_syllable_machine_indicies[] = {
@@ -114,273 +115,378 @@ static const char _myanmar_syllable_machine_indicies[] = {
 	0, 8, 0, 9, 10, 11, 12, 0, 
 	0, 0, 0, 0, 0, 0, 0, 13, 
 	0, 0, 14, 15, 16, 17, 18, 19, 
-	20, 0, 22, 23, 24, 24, 21, 25, 
-	26, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 27, 28, 29, 30, 21, 
-	21, 21, 21, 21, 21, 21, 21, 31, 
-	21, 21, 32, 33, 34, 35, 36, 37, 
-	38, 21, 24, 24, 21, 25, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 30, 21, 21, 21, 
-	21, 21, 21, 21, 21, 39, 21, 21, 
-	21, 21, 21, 21, 36, 21, 24, 24, 
-	21, 25, 21, 22, 21, 24, 24, 21, 
-	25, 26, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 40, 21, 21, 30, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	41, 21, 21, 42, 21, 21, 21, 36, 
-	21, 41, 21, 22, 21, 24, 24, 21, 
-	25, 26, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 30, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 36, 
-	21, 43, 21, 24, 24, 21, 25, 36, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 44, 21, 
-	21, 21, 21, 21, 21, 36, 21, 24, 
-	24, 21, 25, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 44, 21, 21, 21, 21, 21, 
-	21, 36, 21, 24, 24, 21, 25, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 36, 21, 22, 
-	21, 24, 24, 21, 25, 26, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	40, 21, 21, 30, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 36, 21, 22, 21, 24, 
-	24, 21, 25, 26, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 40, 21, 
-	21, 30, 21, 21, 21, 21, 21, 21, 
-	21, 21, 41, 21, 21, 21, 21, 21, 
-	21, 36, 21, 22, 21, 24, 24, 21, 
-	25, 26, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 40, 21, 21, 30, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	41, 21, 21, 21, 21, 21, 21, 36, 
-	21, 41, 21, 24, 24, 21, 25, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 30, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 36, 21, 1, 
-	1, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 1, 21, 22, 
-	21, 24, 24, 21, 25, 26, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	27, 28, 21, 30, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 36, 21, 22, 21, 24, 
-	24, 21, 25, 26, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 28, 
-	21, 30, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 36, 21, 22, 21, 24, 24, 21, 
-	25, 26, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 27, 28, 29, 30, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 36, 
-	45, 21, 22, 21, 24, 24, 21, 25, 
-	26, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 27, 28, 29, 30, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 36, 21, 
-	22, 21, 24, 24, 21, 25, 26, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 27, 28, 29, 30, 21, 21, 21, 
-	21, 21, 21, 21, 21, 31, 21, 21, 
-	32, 33, 34, 35, 36, 21, 38, 21, 
-	22, 21, 24, 24, 21, 25, 26, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 27, 28, 29, 30, 21, 21, 21, 
-	21, 21, 21, 21, 21, 45, 21, 21, 
-	21, 21, 21, 21, 36, 21, 38, 21, 
-	22, 21, 24, 24, 21, 25, 26, 21, 
-	21, 21, 21, 21, 21, 21, 21, 21, 
-	21, 27, 28, 29, 30, 21, 21, 21, 
-	21, 21, 21, 21, 21, 45, 21, 21, 
-	21, 21, 21, 21, 36, 21, 22, 21, 
-	24, 24, 21, 25, 26, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 27, 
-	28, 29, 30, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 32, 21, 
-	34, 21, 36, 21, 38, 21, 22, 21, 
-	24, 24, 21, 25, 26, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 27, 
-	28, 29, 30, 21, 21, 21, 21, 21, 
-	21, 21, 21, 45, 21, 21, 32, 21, 
-	21, 21, 36, 21, 38, 21, 22, 21, 
-	24, 24, 21, 25, 26, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 27, 
-	28, 29, 30, 21, 21, 21, 21, 21, 
-	21, 21, 21, 46, 21, 21, 32, 33, 
-	34, 21, 36, 21, 38, 21, 22, 21, 
-	24, 24, 21, 25, 26, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 27, 
-	28, 29, 30, 21, 21, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 32, 33, 
-	34, 21, 36, 21, 38, 21, 22, 23, 
-	24, 24, 21, 25, 26, 21, 21, 21, 
-	21, 21, 21, 21, 21, 21, 21, 27, 
-	28, 29, 30, 21, 21, 21, 21, 21, 
-	21, 21, 21, 31, 21, 21, 32, 33, 
-	34, 35, 36, 21, 38, 21, 48, 48, 
+	20, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	21, 0, 23, 24, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 32, 
+	22, 22, 33, 34, 35, 36, 37, 38, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 25, 25, 22, 26, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 31, 22, 22, 22, 
+	22, 22, 22, 22, 22, 40, 22, 22, 
+	22, 22, 22, 22, 37, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 26, 22, 
+	25, 25, 22, 26, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 37, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 26, 22, 41, 22, 
+	25, 25, 22, 26, 37, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 26, 22, 22, 22, 22, 
+	22, 22, 37, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 26, 22, 25, 25, 
+	22, 26, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 26, 22, 22, 22, 22, 22, 22, 
+	37, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 26, 22, 23, 22, 25, 25, 
+	22, 26, 27, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 42, 22, 22, 
+	31, 22, 22, 22, 22, 22, 22, 22, 
+	22, 43, 22, 22, 44, 22, 22, 22, 
+	37, 22, 43, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 26, 22, 23, 22, 25, 25, 
+	22, 26, 27, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	31, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	37, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 26, 22, 23, 22, 25, 25, 
+	22, 26, 27, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 42, 22, 22, 
+	31, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	37, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 26, 22, 23, 22, 25, 25, 
+	22, 26, 27, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 42, 22, 22, 
+	31, 22, 22, 22, 22, 22, 22, 22, 
+	22, 43, 22, 22, 22, 22, 22, 22, 
+	37, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 26, 22, 23, 22, 25, 25, 
+	22, 26, 27, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 42, 22, 22, 
+	31, 22, 22, 22, 22, 22, 22, 22, 
+	22, 43, 22, 22, 22, 22, 22, 22, 
+	37, 22, 43, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 26, 22, 25, 25, 22, 26, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 37, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 1, 1, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	1, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 22, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 37, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 29, 22, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 37, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 37, 45, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 37, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 32, 
+	22, 22, 33, 34, 35, 36, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 45, 
+	22, 22, 22, 22, 22, 22, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 45, 
+	22, 22, 22, 22, 22, 22, 37, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 33, 22, 35, 22, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 45, 
+	22, 22, 33, 22, 22, 22, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 46, 
+	22, 22, 33, 34, 35, 22, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 22, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 33, 34, 35, 22, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 24, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 32, 
+	22, 22, 33, 34, 35, 36, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 48, 48, 47, 5, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 12, 47, 47, 47, 
+	47, 47, 47, 47, 47, 49, 47, 47, 
+	47, 47, 47, 47, 18, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 5, 47, 
+	48, 48, 50, 5, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 18, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 50, 50, 50, 50, 
+	50, 50, 50, 50, 5, 50, 51, 47, 
+	48, 48, 47, 5, 18, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 5, 47, 47, 47, 47, 
+	47, 47, 18, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 5, 47, 48, 48, 
 	47, 5, 47, 47, 47, 47, 47, 47, 
 	47, 47, 47, 47, 47, 47, 47, 47, 
-	12, 47, 47, 47, 47, 47, 47, 47, 
-	47, 49, 47, 47, 47, 47, 47, 47, 
-	18, 47, 48, 48, 47, 5, 47, 2, 
-	47, 48, 48, 47, 5, 6, 47, 47, 
 	47, 47, 47, 47, 47, 47, 47, 47, 
-	50, 47, 47, 12, 47, 47, 47, 47, 
-	47, 47, 47, 47, 51, 47, 47, 52, 
-	47, 47, 47, 18, 47, 51, 47, 2, 
-	47, 48, 48, 47, 5, 6, 47, 47, 
+	47, 5, 47, 47, 47, 47, 47, 47, 
+	18, 47, 47, 47, 47, 47, 47, 47, 
 	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 12, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 18, 47, 53, 47, 48, 
-	48, 47, 5, 18, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 54, 47, 47, 47, 47, 47, 
-	47, 18, 47, 48, 48, 47, 5, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 54, 47, 
-	47, 47, 47, 47, 47, 18, 47, 48, 
-	48, 47, 5, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 18, 47, 2, 47, 48, 48, 47, 
-	5, 6, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 50, 47, 47, 12, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 18, 
-	47, 2, 47, 48, 48, 47, 5, 6, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 50, 47, 47, 12, 47, 47, 
-	47, 47, 47, 47, 47, 47, 51, 47, 
-	47, 47, 47, 47, 47, 18, 47, 2, 
-	47, 48, 48, 47, 5, 6, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	50, 47, 47, 12, 47, 47, 47, 47, 
-	47, 47, 47, 47, 51, 47, 47, 47, 
-	47, 47, 47, 18, 47, 51, 47, 48, 
-	48, 47, 5, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 12, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 18, 47, 55, 55, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 55, 47, 2, 3, 48, 48, 47, 
-	5, 6, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 9, 10, 11, 12, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	13, 47, 47, 14, 15, 16, 17, 18, 
-	19, 20, 47, 2, 47, 48, 48, 47, 
-	5, 6, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 9, 10, 47, 12, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 18, 
-	47, 2, 47, 48, 48, 47, 5, 6, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 10, 47, 12, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 18, 47, 2, 
-	47, 48, 48, 47, 5, 6, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	9, 10, 11, 12, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 18, 56, 47, 2, 47, 
-	48, 48, 47, 5, 6, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 9, 
-	10, 11, 12, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 18, 47, 2, 47, 48, 48, 
+	47, 47, 5, 47, 2, 47, 48, 48, 
 	47, 5, 6, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 9, 10, 11, 
+	47, 47, 47, 47, 47, 52, 47, 47, 
 	12, 47, 47, 47, 47, 47, 47, 47, 
-	47, 13, 47, 47, 14, 15, 16, 17, 
-	18, 47, 20, 47, 2, 47, 48, 48, 
+	47, 53, 47, 47, 54, 47, 47, 47, 
+	18, 47, 53, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 5, 47, 2, 47, 48, 48, 
 	47, 5, 6, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 9, 10, 11, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
 	12, 47, 47, 47, 47, 47, 47, 47, 
-	47, 56, 47, 47, 47, 47, 47, 47, 
-	18, 47, 20, 47, 2, 47, 48, 48, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	18, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 5, 47, 2, 47, 48, 48, 
 	47, 5, 6, 47, 47, 47, 47, 47, 
-	47, 47, 47, 47, 47, 9, 10, 11, 
+	47, 47, 47, 47, 47, 52, 47, 47, 
 	12, 47, 47, 47, 47, 47, 47, 47, 
-	47, 56, 47, 47, 47, 47, 47, 47, 
-	18, 47, 2, 47, 48, 48, 47, 5, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	18, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 5, 47, 2, 47, 48, 48, 
+	47, 5, 6, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 52, 47, 47, 
+	12, 47, 47, 47, 47, 47, 47, 47, 
+	47, 53, 47, 47, 47, 47, 47, 47, 
+	18, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 5, 47, 2, 47, 48, 48, 
+	47, 5, 6, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 52, 47, 47, 
+	12, 47, 47, 47, 47, 47, 47, 47, 
+	47, 53, 47, 47, 47, 47, 47, 47, 
+	18, 47, 53, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 5, 47, 48, 48, 47, 5, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 18, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 55, 55, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	55, 47, 2, 3, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 13, 
+	47, 47, 14, 15, 16, 17, 18, 19, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 47, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 18, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 10, 47, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 18, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
 	6, 47, 47, 47, 47, 47, 47, 47, 
 	47, 47, 47, 9, 10, 11, 12, 47, 
 	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 14, 47, 16, 47, 18, 47, 
-	20, 47, 2, 47, 48, 48, 47, 5, 
-	6, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 9, 10, 11, 12, 47, 
-	47, 47, 47, 47, 47, 47, 47, 56, 
-	47, 47, 14, 47, 47, 47, 18, 47, 
-	20, 47, 2, 47, 48, 48, 47, 5, 
-	6, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 47, 9, 10, 11, 12, 47, 
-	47, 47, 47, 47, 47, 47, 47, 57, 
-	47, 47, 14, 15, 16, 47, 18, 47, 
-	20, 47, 2, 47, 48, 48, 47, 5, 
+	47, 47, 47, 47, 47, 47, 18, 56, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
 	6, 47, 47, 47, 47, 47, 47, 47, 
 	47, 47, 47, 9, 10, 11, 12, 47, 
 	47, 47, 47, 47, 47, 47, 47, 47, 
-	47, 47, 14, 15, 16, 47, 18, 47, 
-	20, 47, 2, 3, 48, 48, 47, 5, 
+	47, 47, 47, 47, 47, 47, 18, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
 	6, 47, 47, 47, 47, 47, 47, 47, 
 	47, 47, 47, 9, 10, 11, 12, 47, 
 	47, 47, 47, 47, 47, 47, 47, 13, 
 	47, 47, 14, 15, 16, 17, 18, 47, 
-	20, 47, 22, 23, 24, 24, 21, 25, 
-	26, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 27, 28, 29, 30, 21, 
-	21, 21, 21, 21, 21, 21, 21, 58, 
-	21, 21, 32, 33, 34, 35, 36, 37, 
-	38, 21, 22, 59, 24, 24, 21, 25, 
-	26, 21, 21, 21, 21, 21, 21, 21, 
-	21, 21, 21, 27, 28, 29, 30, 21, 
-	21, 21, 21, 21, 21, 21, 21, 31, 
-	21, 21, 32, 33, 34, 35, 36, 21, 
-	38, 21, 1, 1, 2, 3, 48, 48, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 56, 
+	47, 47, 47, 47, 47, 47, 18, 47, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 56, 
+	47, 47, 47, 47, 47, 47, 18, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 14, 47, 16, 47, 18, 47, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 56, 
+	47, 47, 14, 47, 47, 47, 18, 47, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 57, 
+	47, 47, 14, 15, 16, 47, 18, 47, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 47, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 14, 15, 16, 47, 18, 47, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 2, 3, 48, 48, 47, 5, 
+	6, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 9, 10, 11, 12, 47, 
+	47, 47, 47, 47, 47, 47, 47, 13, 
+	47, 47, 14, 15, 16, 17, 18, 47, 
+	20, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	5, 47, 23, 24, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 58, 
+	22, 22, 33, 34, 35, 36, 37, 38, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 23, 59, 25, 25, 22, 26, 
+	27, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 28, 29, 30, 31, 22, 
+	22, 22, 22, 22, 22, 22, 22, 32, 
+	22, 22, 33, 34, 35, 36, 37, 22, 
+	39, 22, 22, 22, 22, 22, 22, 22, 
+	22, 22, 22, 22, 22, 22, 22, 22, 
+	26, 22, 1, 1, 2, 3, 48, 48, 
 	47, 5, 6, 1, 1, 47, 47, 47, 
 	1, 47, 47, 47, 47, 9, 10, 11, 
 	12, 47, 47, 47, 47, 47, 47, 47, 
 	47, 13, 47, 47, 14, 15, 16, 17, 
-	18, 19, 20, 47, 1, 1, 60, 60, 
+	18, 19, 20, 47, 47, 47, 47, 47, 
+	47, 47, 47, 47, 47, 47, 47, 47, 
+	47, 47, 5, 47, 1, 1, 60, 60, 
 	60, 60, 60, 60, 60, 1, 1, 60, 
 	60, 60, 1, 60, 0
 };
 
 static const char _myanmar_syllable_machine_trans_targs[] = {
-	0, 1, 26, 37, 0, 27, 29, 51, 
-	54, 39, 40, 41, 28, 43, 44, 46, 
-	47, 48, 30, 50, 45, 0, 2, 13, 
-	0, 3, 5, 14, 15, 16, 4, 18, 
-	19, 21, 22, 23, 6, 25, 20, 12, 
-	9, 10, 11, 7, 8, 17, 24, 0, 
-	0, 36, 33, 34, 35, 31, 32, 38, 
-	42, 49, 52, 53, 0
+	0, 1, 25, 35, 0, 26, 30, 49, 
+	52, 37, 38, 39, 29, 41, 42, 44, 
+	45, 46, 27, 48, 43, 26, 0, 2, 
+	12, 0, 3, 7, 13, 14, 15, 6, 
+	17, 18, 20, 21, 22, 4, 24, 19, 
+	11, 5, 8, 9, 10, 16, 23, 0, 
+	0, 34, 0, 28, 31, 32, 33, 36, 
+	40, 47, 50, 51, 0
 };
 
 static const char _myanmar_syllable_machine_trans_actions[] = {
-	3, 0, 0, 0, 4, 0, 0, 0, 
+	3, 0, 0, 0, 4, 5, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 5, 0, 0, 
-	6, 0, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 6, 7, 0, 
+	0, 8, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 7, 
-	8, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 9
+	0, 0, 0, 0, 0, 0, 0, 9, 
+	10, 0, 11, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 12
 };
 
 static const char _myanmar_syllable_machine_to_state_actions[] = {
@@ -390,7 +496,7 @@ static const char _myanmar_syllable_machine_to_state_actions[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0
 };
 
 static const char _myanmar_syllable_machine_from_state_actions[] = {
@@ -400,17 +506,17 @@ static const char _myanmar_syllable_machine_from_state_actions[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0
+	0, 0, 0, 0, 0
 };
 
 static const short _myanmar_syllable_machine_eof_trans[] = {
-	0, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 22, 22, 22, 22, 22, 22, 
-	22, 22, 48, 48, 48, 48, 48, 48, 
+	0, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 23, 23, 23, 23, 23, 23, 23, 
+	23, 48, 51, 48, 48, 48, 48, 48, 
 	48, 48, 48, 48, 48, 48, 48, 48, 
 	48, 48, 48, 48, 48, 48, 48, 48, 
-	48, 48, 48, 22, 22, 48, 61
+	48, 23, 23, 48, 61
 };
 
 static const int myanmar_syllable_machine_start = 0;
@@ -424,7 +530,7 @@ static const int myanmar_syllable_machine_en_main = 0;
 
 
 
-#line 117 "hb-ot-shaper-myanmar-machine.rl"
+#line 118 "hb-ot-shaper-myanmar-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -443,7 +549,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
   int cs;
   hb_glyph_info_t *info = buffer->info;
   
-#line 447 "hb-ot-shaper-myanmar-machine.hh"
+#line 553 "hb-ot-shaper-myanmar-machine.hh"
 	{
 	cs = myanmar_syllable_machine_start;
 	ts = 0;
@@ -451,7 +557,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
 	act = 0;
 	}
 
-#line 137 "hb-ot-shaper-myanmar-machine.rl"
+#line 138 "hb-ot-shaper-myanmar-machine.rl"
 
 
   p = 0;
@@ -459,7 +565,7 @@ find_syllables_myanmar (hb_buffer_t *buffer)
 
   unsigned int syllable_serial = 1;
   
-#line 463 "hb-ot-shaper-myanmar-machine.hh"
+#line 569 "hb-ot-shaper-myanmar-machine.hh"
 	{
 	int _slen;
 	int _trans;
@@ -473,7 +579,7 @@ _resume:
 #line 1 "NONE"
 	{ts = p;}
 	break;
-#line 477 "hb-ot-shaper-myanmar-machine.hh"
+#line 583 "hb-ot-shaper-myanmar-machine.hh"
 	}
 
 	_keys = _myanmar_syllable_machine_trans_keys + (cs<<1);
@@ -491,35 +597,59 @@ _eof_trans:
 		goto _again;
 
 	switch ( _myanmar_syllable_machine_trans_actions[_trans] ) {
-	case 6:
-#line 110 "hb-ot-shaper-myanmar-machine.rl"
+	case 8:
+#line 111 "hb-ot-shaper-myanmar-machine.rl"
 	{te = p+1;{ found_syllable (myanmar_consonant_syllable); }}
 	break;
 	case 4:
-#line 111 "hb-ot-shaper-myanmar-machine.rl"
+#line 112 "hb-ot-shaper-myanmar-machine.rl"
 	{te = p+1;{ found_syllable (myanmar_non_myanmar_cluster); }}
 	break;
-	case 8:
-#line 112 "hb-ot-shaper-myanmar-machine.rl"
+	case 10:
+#line 113 "hb-ot-shaper-myanmar-machine.rl"
 	{te = p+1;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
 	break;
 	case 3:
-#line 113 "hb-ot-shaper-myanmar-machine.rl"
+#line 114 "hb-ot-shaper-myanmar-machine.rl"
 	{te = p+1;{ found_syllable (myanmar_non_myanmar_cluster); }}
 	break;
-	case 5:
-#line 110 "hb-ot-shaper-myanmar-machine.rl"
-	{te = p;p--;{ found_syllable (myanmar_consonant_syllable); }}
-	break;
 	case 7:
-#line 112 "hb-ot-shaper-myanmar-machine.rl"
-	{te = p;p--;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
+#line 111 "hb-ot-shaper-myanmar-machine.rl"
+	{te = p;p--;{ found_syllable (myanmar_consonant_syllable); }}
 	break;
 	case 9:
 #line 113 "hb-ot-shaper-myanmar-machine.rl"
+	{te = p;p--;{ found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
+	break;
+	case 12:
+#line 114 "hb-ot-shaper-myanmar-machine.rl"
 	{te = p;p--;{ found_syllable (myanmar_non_myanmar_cluster); }}
 	break;
-#line 523 "hb-ot-shaper-myanmar-machine.hh"
+	case 11:
+#line 1 "NONE"
+	{	switch( act ) {
+	case 2:
+	{{p = ((te))-1;} found_syllable (myanmar_non_myanmar_cluster); }
+	break;
+	case 3:
+	{{p = ((te))-1;} found_syllable (myanmar_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+	break;
+	}
+	}
+	break;
+	case 6:
+#line 1 "NONE"
+	{te = p+1;}
+#line 112 "hb-ot-shaper-myanmar-machine.rl"
+	{act = 2;}
+	break;
+	case 5:
+#line 1 "NONE"
+	{te = p+1;}
+#line 113 "hb-ot-shaper-myanmar-machine.rl"
+	{act = 3;}
+	break;
+#line 653 "hb-ot-shaper-myanmar-machine.hh"
 	}
 
 _again:
@@ -528,7 +658,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 532 "hb-ot-shaper-myanmar-machine.hh"
+#line 662 "hb-ot-shaper-myanmar-machine.hh"
 	}
 
 	if ( ++p != pe )
@@ -544,7 +674,7 @@ _again:
 
 	}
 
-#line 145 "hb-ot-shaper-myanmar-machine.rl"
+#line 146 "hb-ot-shaper-myanmar-machine.rl"
 
 }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh
index e9da28d4..65b6adc3 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-use-machine.hh
@@ -166,556 +166,556 @@ static const unsigned char _use_syllable_machine_indicies[] = {
 	19, 20, 21, 8, 22, 23, 24, 25, 
 	5, 26, 27, 28, 5, 29, 30, 31, 
 	32, 33, 34, 35, 32, 1, 5, 36, 
-	5, 37, 5, 5, 35, 5, 39, 40, 
-	38, 41, 38, 38, 38, 38, 38, 38, 
-	38, 42, 43, 44, 45, 46, 47, 48, 
-	49, 50, 39, 51, 52, 53, 54, 38, 
-	55, 56, 57, 38, 58, 59, 38, 60, 
-	61, 62, 63, 60, 38, 38, 38, 38, 
-	64, 38, 38, 63, 38, 39, 40, 38, 
-	41, 38, 38, 38, 38, 38, 38, 38, 
-	42, 43, 44, 45, 46, 47, 48, 49, 
-	50, 39, 51, 52, 53, 54, 38, 55, 
-	56, 57, 38, 38, 38, 38, 60, 61, 
-	62, 63, 60, 38, 38, 38, 38, 64, 
-	38, 38, 63, 38, 39, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 41, 38, 38, 38, 38, 38, 38, 
-	38, 38, 43, 44, 45, 46, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	55, 56, 57, 38, 38, 38, 38, 38, 
-	61, 62, 63, 65, 38, 38, 38, 38, 
-	43, 38, 41, 38, 38, 38, 38, 38, 
-	38, 38, 38, 43, 44, 45, 46, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 55, 56, 57, 38, 38, 38, 38, 
-	38, 61, 62, 63, 65, 38, 41, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	44, 45, 46, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 61, 62, 63, 
-	38, 41, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 45, 46, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	61, 62, 63, 38, 41, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	46, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 61, 62, 63, 38, 41, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 61, 62, 
-	38, 41, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 62, 38, 41, 38, 41, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 44, 
-	45, 46, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 55, 56, 57, 38, 
-	38, 38, 38, 38, 61, 62, 63, 65, 
-	38, 41, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 44, 45, 46, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 56, 57, 38, 38, 38, 38, 38, 
-	61, 62, 63, 65, 38, 41, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 44, 
-	45, 46, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 57, 38, 
-	38, 38, 38, 38, 61, 62, 63, 65, 
-	38, 66, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 41, 38, 
-	41, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 44, 45, 46, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 61, 
-	62, 63, 65, 38, 41, 38, 38, 38, 
-	38, 38, 38, 38, 42, 43, 44, 45, 
-	46, 38, 38, 38, 38, 38, 38, 52, 
-	53, 54, 38, 55, 56, 57, 38, 38, 
-	38, 38, 38, 61, 62, 63, 65, 38, 
-	38, 38, 38, 43, 38, 41, 38, 38, 
-	38, 38, 38, 38, 38, 38, 43, 44, 
-	45, 46, 38, 38, 38, 38, 38, 38, 
-	52, 53, 54, 38, 55, 56, 57, 38, 
-	38, 38, 38, 38, 61, 62, 63, 65, 
-	38, 38, 38, 38, 43, 38, 41, 38, 
-	38, 38, 38, 38, 38, 38, 38, 43, 
-	44, 45, 46, 38, 38, 38, 38, 38, 
-	38, 38, 53, 54, 38, 55, 56, 57, 
-	38, 38, 38, 38, 38, 61, 62, 63, 
-	65, 38, 38, 38, 38, 43, 38, 41, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	43, 44, 45, 46, 38, 38, 38, 38, 
-	38, 38, 38, 38, 54, 38, 55, 56, 
-	57, 38, 38, 38, 38, 38, 61, 62, 
-	63, 65, 38, 38, 38, 38, 43, 38, 
-	67, 38, 41, 38, 38, 38, 38, 38, 
-	38, 38, 42, 43, 44, 45, 46, 38, 
-	48, 49, 38, 38, 38, 52, 53, 54, 
-	38, 55, 56, 57, 38, 38, 38, 38, 
-	38, 61, 62, 63, 65, 38, 38, 38, 
-	38, 43, 38, 41, 38, 38, 38, 38, 
-	38, 38, 38, 38, 43, 44, 45, 46, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 55, 56, 57, 38, 38, 38, 
-	38, 38, 61, 62, 63, 65, 38, 38, 
-	38, 38, 43, 38, 67, 38, 41, 38, 
-	38, 38, 38, 38, 38, 38, 42, 43, 
-	44, 45, 46, 38, 38, 49, 38, 38, 
-	38, 52, 53, 54, 38, 55, 56, 57, 
-	38, 38, 38, 38, 38, 61, 62, 63, 
-	65, 38, 38, 38, 38, 43, 38, 67, 
-	38, 41, 38, 38, 38, 38, 38, 38, 
-	38, 42, 43, 44, 45, 46, 38, 38, 
-	38, 38, 38, 38, 52, 53, 54, 38, 
-	55, 56, 57, 38, 38, 38, 38, 38, 
-	61, 62, 63, 65, 38, 38, 38, 38, 
-	43, 38, 67, 38, 41, 38, 38, 38, 
-	38, 38, 38, 38, 42, 43, 44, 45, 
-	46, 47, 48, 49, 38, 38, 38, 52, 
-	53, 54, 38, 55, 56, 57, 38, 38, 
-	38, 38, 38, 61, 62, 63, 65, 38, 
-	38, 38, 38, 43, 38, 39, 40, 38, 
-	41, 38, 38, 38, 38, 38, 38, 38, 
-	42, 43, 44, 45, 46, 47, 48, 49, 
-	50, 38, 51, 52, 53, 54, 38, 55, 
-	56, 57, 38, 38, 38, 38, 60, 61, 
-	62, 63, 60, 38, 38, 38, 38, 64, 
-	38, 38, 63, 38, 39, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 41, 38, 39, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	41, 38, 38, 38, 38, 38, 38, 38, 
-	38, 43, 44, 45, 46, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 55, 
-	56, 57, 38, 38, 38, 38, 38, 61, 
-	62, 63, 65, 38, 41, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 58, 
-	59, 38, 41, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 38, 38, 
-	38, 38, 38, 38, 38, 38, 59, 38, 
-	4, 69, 68, 70, 68, 68, 68, 68, 
-	68, 68, 68, 71, 72, 73, 74, 75, 
-	76, 77, 78, 79, 4, 80, 81, 82, 
-	83, 68, 84, 85, 86, 68, 68, 68, 
-	68, 87, 88, 89, 90, 91, 68, 68, 
-	68, 68, 92, 68, 68, 93, 68, 4, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 70, 68, 68, 68, 
-	68, 68, 68, 68, 68, 72, 73, 74, 
-	75, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 84, 85, 86, 68, 68, 
-	68, 68, 68, 88, 89, 90, 94, 68, 
-	68, 68, 68, 72, 68, 70, 68, 68, 
-	68, 68, 68, 68, 68, 68, 72, 73, 
-	74, 75, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 84, 85, 86, 68, 
-	68, 68, 68, 68, 88, 89, 90, 94, 
-	68, 70, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 73, 74, 75, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	88, 89, 90, 68, 70, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 74, 
-	75, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 88, 89, 90, 68, 70, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 75, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 88, 89, 
-	90, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 88, 89, 68, 70, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 89, 68, 70, 68, 
-	70, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 73, 74, 75, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 84, 
-	85, 86, 68, 68, 68, 68, 68, 88, 
-	89, 90, 94, 68, 70, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 73, 74, 
-	75, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 85, 86, 68, 68, 
-	68, 68, 68, 88, 89, 90, 94, 68, 
-	70, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 73, 74, 75, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 86, 68, 68, 68, 68, 68, 88, 
-	89, 90, 94, 68, 96, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 95, 95, 
-	95, 97, 95, 70, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 73, 74, 75, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 88, 89, 90, 94, 68, 70, 
-	68, 68, 68, 68, 68, 68, 68, 71, 
-	72, 73, 74, 75, 68, 68, 68, 68, 
-	68, 68, 81, 82, 83, 68, 84, 85, 
-	86, 68, 68, 68, 68, 68, 88, 89, 
-	90, 94, 68, 68, 68, 68, 72, 68, 
-	70, 68, 68, 68, 68, 68, 68, 68, 
-	68, 72, 73, 74, 75, 68, 68, 68, 
-	68, 68, 68, 81, 82, 83, 68, 84, 
-	85, 86, 68, 68, 68, 68, 68, 88, 
-	89, 90, 94, 68, 68, 68, 68, 72, 
-	68, 70, 68, 68, 68, 68, 68, 68, 
-	68, 68, 72, 73, 74, 75, 68, 68, 
-	68, 68, 68, 68, 68, 82, 83, 68, 
-	84, 85, 86, 68, 68, 68, 68, 68, 
-	88, 89, 90, 94, 68, 68, 68, 68, 
-	72, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 68, 72, 73, 74, 75, 68, 
-	68, 68, 68, 68, 68, 68, 68, 83, 
-	68, 84, 85, 86, 68, 68, 68, 68, 
-	68, 88, 89, 90, 94, 68, 68, 68, 
-	68, 72, 68, 98, 68, 70, 68, 68, 
-	68, 68, 68, 68, 68, 71, 72, 73, 
-	74, 75, 68, 77, 78, 68, 68, 68, 
-	81, 82, 83, 68, 84, 85, 86, 68, 
-	68, 68, 68, 68, 88, 89, 90, 94, 
-	68, 68, 68, 68, 72, 68, 70, 68, 
-	68, 68, 68, 68, 68, 68, 68, 72, 
-	73, 74, 75, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 84, 85, 86, 
-	68, 68, 68, 68, 68, 88, 89, 90, 
-	94, 68, 68, 68, 68, 72, 68, 98, 
-	68, 70, 68, 68, 68, 68, 68, 68, 
-	68, 71, 72, 73, 74, 75, 68, 68, 
-	78, 68, 68, 68, 81, 82, 83, 68, 
-	84, 85, 86, 68, 68, 68, 68, 68, 
-	88, 89, 90, 94, 68, 68, 68, 68, 
-	72, 68, 98, 68, 70, 68, 68, 68, 
-	68, 68, 68, 68, 71, 72, 73, 74, 
-	75, 68, 68, 68, 68, 68, 68, 81, 
-	82, 83, 68, 84, 85, 86, 68, 68, 
-	68, 68, 68, 88, 89, 90, 94, 68, 
-	68, 68, 68, 72, 68, 98, 68, 70, 
-	68, 68, 68, 68, 68, 68, 68, 71, 
-	72, 73, 74, 75, 76, 77, 78, 68, 
-	68, 68, 81, 82, 83, 68, 84, 85, 
-	86, 68, 68, 68, 68, 68, 88, 89, 
-	90, 94, 68, 68, 68, 68, 72, 68, 
-	4, 69, 68, 70, 68, 68, 68, 68, 
-	68, 68, 68, 71, 72, 73, 74, 75, 
-	76, 77, 78, 79, 68, 80, 81, 82, 
-	83, 68, 84, 85, 86, 68, 68, 68, 
-	68, 87, 88, 89, 90, 91, 68, 68, 
-	68, 68, 92, 68, 68, 93, 68, 4, 
-	99, 99, 99, 99, 99, 99, 99, 99, 
-	99, 99, 99, 99, 100, 99, 4, 95, 
-	95, 95, 95, 95, 95, 95, 95, 95, 
-	95, 95, 95, 97, 95, 4, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 68, 72, 73, 74, 75, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 84, 85, 86, 68, 68, 68, 68, 
-	68, 88, 89, 90, 94, 68, 100, 99, 
-	102, 103, 101, 6, 104, 104, 104, 104, 
-	104, 104, 104, 104, 104, 105, 104, 106, 
-	107, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 108, 109, 110, 111, 112, 113, 
-	114, 115, 116, 106, 117, 118, 119, 120, 
-	68, 121, 122, 123, 68, 58, 59, 68, 
-	124, 125, 126, 127, 128, 68, 68, 68, 
-	68, 129, 68, 68, 130, 68, 106, 107, 
-	68, 70, 68, 68, 68, 68, 68, 68, 
-	68, 108, 109, 110, 111, 112, 113, 114, 
-	115, 116, 106, 117, 118, 119, 120, 68, 
-	121, 122, 123, 68, 68, 68, 68, 124, 
-	125, 126, 127, 128, 68, 68, 68, 68, 
-	129, 68, 68, 130, 68, 106, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 68, 109, 110, 111, 112, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 121, 122, 123, 68, 68, 68, 68, 
-	68, 125, 126, 127, 131, 68, 68, 68, 
-	68, 109, 68, 70, 68, 68, 68, 68, 
-	68, 68, 68, 68, 109, 110, 111, 112, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 121, 122, 123, 68, 68, 68, 
-	68, 68, 125, 126, 127, 131, 68, 70, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 110, 111, 112, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 125, 126, 
-	127, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 111, 112, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 125, 126, 127, 68, 70, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 112, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 125, 126, 127, 68, 
-	70, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 125, 
-	126, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 126, 68, 70, 68, 70, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	110, 111, 112, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 121, 122, 123, 
-	68, 68, 68, 68, 68, 125, 126, 127, 
-	131, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 110, 111, 112, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 122, 123, 68, 68, 68, 68, 
-	68, 125, 126, 127, 131, 68, 70, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	110, 111, 112, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 123, 
-	68, 68, 68, 68, 68, 125, 126, 127, 
-	131, 68, 132, 95, 95, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 95, 97, 
-	95, 70, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 110, 111, 112, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	125, 126, 127, 131, 68, 70, 68, 68, 
-	68, 68, 68, 68, 68, 108, 109, 110, 
-	111, 112, 68, 68, 68, 68, 68, 68, 
-	118, 119, 120, 68, 121, 122, 123, 68, 
-	68, 68, 68, 68, 125, 126, 127, 131, 
-	68, 68, 68, 68, 109, 68, 70, 68, 
-	68, 68, 68, 68, 68, 68, 68, 109, 
-	110, 111, 112, 68, 68, 68, 68, 68, 
-	68, 118, 119, 120, 68, 121, 122, 123, 
-	68, 68, 68, 68, 68, 125, 126, 127, 
-	131, 68, 68, 68, 68, 109, 68, 70, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	109, 110, 111, 112, 68, 68, 68, 68, 
-	68, 68, 68, 119, 120, 68, 121, 122, 
-	123, 68, 68, 68, 68, 68, 125, 126, 
-	127, 131, 68, 68, 68, 68, 109, 68, 
-	70, 68, 68, 68, 68, 68, 68, 68, 
-	68, 109, 110, 111, 112, 68, 68, 68, 
-	68, 68, 68, 68, 68, 120, 68, 121, 
-	122, 123, 68, 68, 68, 68, 68, 125, 
-	126, 127, 131, 68, 68, 68, 68, 109, 
-	68, 133, 68, 70, 68, 68, 68, 68, 
-	68, 68, 68, 108, 109, 110, 111, 112, 
-	68, 114, 115, 68, 68, 68, 118, 119, 
-	120, 68, 121, 122, 123, 68, 68, 68, 
-	68, 68, 125, 126, 127, 131, 68, 68, 
-	68, 68, 109, 68, 70, 68, 68, 68, 
-	68, 68, 68, 68, 68, 109, 110, 111, 
-	112, 68, 68, 68, 68, 68, 68, 68, 
-	68, 68, 68, 121, 122, 123, 68, 68, 
-	68, 68, 68, 125, 126, 127, 131, 68, 
-	68, 68, 68, 109, 68, 133, 68, 70, 
-	68, 68, 68, 68, 68, 68, 68, 108, 
-	109, 110, 111, 112, 68, 68, 115, 68, 
-	68, 68, 118, 119, 120, 68, 121, 122, 
-	123, 68, 68, 68, 68, 68, 125, 126, 
-	127, 131, 68, 68, 68, 68, 109, 68, 
-	133, 68, 70, 68, 68, 68, 68, 68, 
-	68, 68, 108, 109, 110, 111, 112, 68, 
-	68, 68, 68, 68, 68, 118, 119, 120, 
-	68, 121, 122, 123, 68, 68, 68, 68, 
-	68, 125, 126, 127, 131, 68, 68, 68, 
-	68, 109, 68, 133, 68, 70, 68, 68, 
-	68, 68, 68, 68, 68, 108, 109, 110, 
-	111, 112, 113, 114, 115, 68, 68, 68, 
-	118, 119, 120, 68, 121, 122, 123, 68, 
-	68, 68, 68, 68, 125, 126, 127, 131, 
-	68, 68, 68, 68, 109, 68, 106, 107, 
-	68, 70, 68, 68, 68, 68, 68, 68, 
-	68, 108, 109, 110, 111, 112, 113, 114, 
-	115, 116, 68, 117, 118, 119, 120, 68, 
-	121, 122, 123, 68, 68, 68, 68, 124, 
-	125, 126, 127, 128, 68, 68, 68, 68, 
-	129, 68, 68, 130, 68, 106, 99, 99, 
-	99, 99, 99, 99, 99, 99, 99, 99, 
-	99, 99, 100, 99, 106, 95, 95, 95, 
-	95, 95, 95, 95, 95, 95, 95, 95, 
-	95, 97, 95, 106, 68, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 68, 
-	70, 68, 68, 68, 68, 68, 68, 68, 
-	68, 109, 110, 111, 112, 68, 68, 68, 
-	68, 68, 68, 68, 68, 68, 68, 121, 
-	122, 123, 68, 68, 68, 68, 68, 125, 
-	126, 127, 131, 68, 100, 99, 8, 9, 
-	134, 11, 134, 134, 134, 134, 134, 134, 
-	134, 13, 14, 15, 16, 17, 18, 19, 
-	20, 21, 8, 22, 23, 24, 25, 134, 
-	26, 27, 28, 134, 134, 134, 134, 32, 
-	33, 34, 35, 32, 134, 134, 134, 134, 
-	37, 134, 134, 35, 134, 8, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 11, 134, 134, 134, 134, 134, 
-	134, 134, 134, 14, 15, 16, 17, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 26, 27, 28, 134, 134, 134, 134, 
-	134, 33, 34, 35, 135, 134, 134, 134, 
-	134, 14, 134, 11, 134, 134, 134, 134, 
-	134, 134, 134, 134, 14, 15, 16, 17, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 26, 27, 28, 134, 134, 134, 
-	134, 134, 33, 34, 35, 135, 134, 11, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 15, 16, 17, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 33, 34, 
-	35, 134, 11, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 16, 17, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 33, 34, 35, 134, 11, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 17, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 33, 34, 35, 134, 
-	11, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 33, 
-	34, 134, 11, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 34, 134, 11, 134, 11, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	15, 16, 17, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 26, 27, 28, 
-	134, 134, 134, 134, 134, 33, 34, 35, 
-	135, 134, 11, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 15, 16, 17, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 27, 28, 134, 134, 134, 134, 
-	134, 33, 34, 35, 135, 134, 11, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	15, 16, 17, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 28, 
-	134, 134, 134, 134, 134, 33, 34, 35, 
-	135, 134, 136, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 11, 
-	134, 11, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 15, 16, 17, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	33, 34, 35, 135, 134, 11, 134, 134, 
-	134, 134, 134, 134, 134, 13, 14, 15, 
-	16, 17, 134, 134, 134, 134, 134, 134, 
-	23, 24, 25, 134, 26, 27, 28, 134, 
-	134, 134, 134, 134, 33, 34, 35, 135, 
-	134, 134, 134, 134, 14, 134, 11, 134, 
-	134, 134, 134, 134, 134, 134, 134, 14, 
-	15, 16, 17, 134, 134, 134, 134, 134, 
-	134, 23, 24, 25, 134, 26, 27, 28, 
-	134, 134, 134, 134, 134, 33, 34, 35, 
-	135, 134, 134, 134, 134, 14, 134, 11, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	14, 15, 16, 17, 134, 134, 134, 134, 
-	134, 134, 134, 24, 25, 134, 26, 27, 
-	28, 134, 134, 134, 134, 134, 33, 34, 
-	35, 135, 134, 134, 134, 134, 14, 134, 
-	11, 134, 134, 134, 134, 134, 134, 134, 
-	134, 14, 15, 16, 17, 134, 134, 134, 
-	134, 134, 134, 134, 134, 25, 134, 26, 
-	27, 28, 134, 134, 134, 134, 134, 33, 
-	34, 35, 135, 134, 134, 134, 134, 14, 
-	134, 137, 134, 11, 134, 134, 134, 134, 
-	134, 134, 134, 13, 14, 15, 16, 17, 
-	134, 19, 20, 134, 134, 134, 23, 24, 
-	25, 134, 26, 27, 28, 134, 134, 134, 
-	134, 134, 33, 34, 35, 135, 134, 134, 
-	134, 134, 14, 134, 11, 134, 134, 134, 
-	134, 134, 134, 134, 134, 14, 15, 16, 
-	17, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 26, 27, 28, 134, 134, 
-	134, 134, 134, 33, 34, 35, 135, 134, 
-	134, 134, 134, 14, 134, 137, 134, 11, 
-	134, 134, 134, 134, 134, 134, 134, 13, 
-	14, 15, 16, 17, 134, 134, 20, 134, 
-	134, 134, 23, 24, 25, 134, 26, 27, 
-	28, 134, 134, 134, 134, 134, 33, 34, 
-	35, 135, 134, 134, 134, 134, 14, 134, 
-	137, 134, 11, 134, 134, 134, 134, 134, 
-	134, 134, 13, 14, 15, 16, 17, 134, 
-	134, 134, 134, 134, 134, 23, 24, 25, 
-	134, 26, 27, 28, 134, 134, 134, 134, 
-	134, 33, 34, 35, 135, 134, 134, 134, 
-	134, 14, 134, 137, 134, 11, 134, 134, 
-	134, 134, 134, 134, 134, 13, 14, 15, 
-	16, 17, 18, 19, 20, 134, 134, 134, 
-	23, 24, 25, 134, 26, 27, 28, 134, 
-	134, 134, 134, 134, 33, 34, 35, 135, 
-	134, 134, 134, 134, 14, 134, 8, 9, 
-	134, 11, 134, 134, 134, 134, 134, 134, 
-	134, 13, 14, 15, 16, 17, 18, 19, 
-	20, 21, 134, 22, 23, 24, 25, 134, 
-	26, 27, 28, 134, 134, 134, 134, 32, 
-	33, 34, 35, 32, 134, 134, 134, 134, 
-	37, 134, 134, 35, 134, 8, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 11, 134, 8, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 11, 134, 134, 134, 134, 134, 134, 
-	134, 134, 14, 15, 16, 17, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	26, 27, 28, 134, 134, 134, 134, 134, 
-	33, 34, 35, 135, 134, 138, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 11, 
-	134, 10, 11, 134, 4, 134, 134, 134, 
-	4, 134, 134, 134, 134, 134, 8, 9, 
-	10, 11, 134, 134, 134, 134, 134, 134, 
-	134, 13, 14, 15, 16, 17, 18, 19, 
-	20, 21, 8, 22, 23, 24, 25, 134, 
-	26, 27, 28, 134, 29, 30, 134, 32, 
-	33, 34, 35, 32, 134, 134, 134, 134, 
-	37, 134, 134, 35, 134, 11, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	29, 30, 134, 11, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 134, 
-	134, 134, 134, 134, 134, 134, 134, 30, 
-	134, 4, 139, 139, 139, 4, 139, 141, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 142, 140, 143, 140, 143, 
-	144, 140, 141, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 1, 142, 142, 
-	140, 141, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 142, 140, 143, 
-	140, 141, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 140, 140, 140, 
-	140, 140, 140, 140, 140, 142, 140, 143, 
-	140, 143, 140, 39, 40, 38, 41, 38, 
-	38, 38, 38, 38, 38, 38, 42, 43, 
-	44, 45, 46, 47, 48, 49, 50, 39, 
-	51, 52, 53, 54, 38, 55, 56, 57, 
-	38, 58, 59, 38, 60, 61, 62, 63, 
-	60, 1, 38, 2, 38, 64, 38, 38, 
-	63, 38, 0
+	5, 37, 5, 5, 38, 5, 40, 41, 
+	39, 42, 39, 39, 39, 39, 39, 39, 
+	39, 43, 44, 45, 46, 47, 48, 49, 
+	50, 51, 40, 52, 53, 54, 55, 39, 
+	56, 57, 58, 39, 59, 60, 39, 61, 
+	62, 63, 64, 61, 39, 39, 39, 39, 
+	65, 39, 39, 64, 39, 40, 41, 39, 
+	42, 39, 39, 39, 39, 39, 39, 39, 
+	43, 44, 45, 46, 47, 48, 49, 50, 
+	51, 40, 52, 53, 54, 55, 39, 56, 
+	57, 58, 39, 39, 39, 39, 61, 62, 
+	63, 64, 61, 39, 39, 39, 39, 65, 
+	39, 39, 64, 39, 40, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 42, 39, 39, 39, 39, 39, 39, 
+	39, 39, 44, 45, 46, 47, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	56, 57, 58, 39, 39, 39, 39, 39, 
+	62, 63, 64, 66, 39, 39, 39, 39, 
+	44, 39, 42, 39, 39, 39, 39, 39, 
+	39, 39, 39, 44, 45, 46, 47, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 56, 57, 58, 39, 39, 39, 39, 
+	39, 62, 63, 64, 66, 39, 42, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	45, 46, 47, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 62, 63, 64, 
+	39, 42, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 46, 47, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	62, 63, 64, 39, 42, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	47, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 62, 63, 64, 39, 42, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 62, 63, 
+	39, 42, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 63, 39, 42, 39, 42, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 45, 
+	46, 47, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 56, 57, 58, 39, 
+	39, 39, 39, 39, 62, 63, 64, 66, 
+	39, 42, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 45, 46, 47, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 57, 58, 39, 39, 39, 39, 39, 
+	62, 63, 64, 66, 39, 42, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 45, 
+	46, 47, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 58, 39, 
+	39, 39, 39, 39, 62, 63, 64, 66, 
+	39, 67, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 42, 39, 
+	42, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 45, 46, 47, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 62, 
+	63, 64, 66, 39, 42, 39, 39, 39, 
+	39, 39, 39, 39, 43, 44, 45, 46, 
+	47, 39, 39, 39, 39, 39, 39, 53, 
+	54, 55, 39, 56, 57, 58, 39, 39, 
+	39, 39, 39, 62, 63, 64, 66, 39, 
+	39, 39, 39, 44, 39, 42, 39, 39, 
+	39, 39, 39, 39, 39, 39, 44, 45, 
+	46, 47, 39, 39, 39, 39, 39, 39, 
+	53, 54, 55, 39, 56, 57, 58, 39, 
+	39, 39, 39, 39, 62, 63, 64, 66, 
+	39, 39, 39, 39, 44, 39, 42, 39, 
+	39, 39, 39, 39, 39, 39, 39, 44, 
+	45, 46, 47, 39, 39, 39, 39, 39, 
+	39, 39, 54, 55, 39, 56, 57, 58, 
+	39, 39, 39, 39, 39, 62, 63, 64, 
+	66, 39, 39, 39, 39, 44, 39, 42, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	44, 45, 46, 47, 39, 39, 39, 39, 
+	39, 39, 39, 39, 55, 39, 56, 57, 
+	58, 39, 39, 39, 39, 39, 62, 63, 
+	64, 66, 39, 39, 39, 39, 44, 39, 
+	68, 39, 42, 39, 39, 39, 39, 39, 
+	39, 39, 43, 44, 45, 46, 47, 39, 
+	49, 50, 39, 39, 39, 53, 54, 55, 
+	39, 56, 57, 58, 39, 39, 39, 39, 
+	39, 62, 63, 64, 66, 39, 39, 39, 
+	39, 44, 39, 42, 39, 39, 39, 39, 
+	39, 39, 39, 39, 44, 45, 46, 47, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 56, 57, 58, 39, 39, 39, 
+	39, 39, 62, 63, 64, 66, 39, 39, 
+	39, 39, 44, 39, 68, 39, 42, 39, 
+	39, 39, 39, 39, 39, 39, 43, 44, 
+	45, 46, 47, 39, 39, 50, 39, 39, 
+	39, 53, 54, 55, 39, 56, 57, 58, 
+	39, 39, 39, 39, 39, 62, 63, 64, 
+	66, 39, 39, 39, 39, 44, 39, 68, 
+	39, 42, 39, 39, 39, 39, 39, 39, 
+	39, 43, 44, 45, 46, 47, 39, 39, 
+	39, 39, 39, 39, 53, 54, 55, 39, 
+	56, 57, 58, 39, 39, 39, 39, 39, 
+	62, 63, 64, 66, 39, 39, 39, 39, 
+	44, 39, 68, 39, 42, 39, 39, 39, 
+	39, 39, 39, 39, 43, 44, 45, 46, 
+	47, 48, 49, 50, 39, 39, 39, 53, 
+	54, 55, 39, 56, 57, 58, 39, 39, 
+	39, 39, 39, 62, 63, 64, 66, 39, 
+	39, 39, 39, 44, 39, 40, 41, 39, 
+	42, 39, 39, 39, 39, 39, 39, 39, 
+	43, 44, 45, 46, 47, 48, 49, 50, 
+	51, 39, 52, 53, 54, 55, 39, 56, 
+	57, 58, 39, 39, 39, 39, 61, 62, 
+	63, 64, 61, 39, 39, 39, 39, 65, 
+	39, 39, 64, 39, 40, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 42, 39, 40, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	42, 39, 39, 39, 39, 39, 39, 39, 
+	39, 44, 45, 46, 47, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 56, 
+	57, 58, 39, 39, 39, 39, 39, 62, 
+	63, 64, 66, 39, 42, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 59, 
+	60, 39, 42, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 39, 39, 
+	39, 39, 39, 39, 39, 39, 60, 39, 
+	4, 70, 69, 71, 69, 69, 69, 69, 
+	69, 69, 69, 72, 73, 74, 75, 76, 
+	77, 78, 79, 80, 4, 81, 82, 83, 
+	84, 69, 85, 86, 87, 69, 69, 69, 
+	69, 88, 89, 90, 91, 92, 69, 69, 
+	69, 69, 93, 69, 69, 94, 69, 4, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 71, 69, 69, 69, 
+	69, 69, 69, 69, 69, 73, 74, 75, 
+	76, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 85, 86, 87, 69, 69, 
+	69, 69, 69, 89, 90, 91, 95, 69, 
+	69, 69, 69, 73, 69, 71, 69, 69, 
+	69, 69, 69, 69, 69, 69, 73, 74, 
+	75, 76, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 85, 86, 87, 69, 
+	69, 69, 69, 69, 89, 90, 91, 95, 
+	69, 71, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 74, 75, 76, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	89, 90, 91, 69, 71, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 75, 
+	76, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 89, 90, 91, 69, 71, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 76, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 89, 90, 
+	91, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 89, 90, 69, 71, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 90, 69, 71, 69, 
+	71, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 74, 75, 76, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 85, 
+	86, 87, 69, 69, 69, 69, 69, 89, 
+	90, 91, 95, 69, 71, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 74, 75, 
+	76, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 86, 87, 69, 69, 
+	69, 69, 69, 89, 90, 91, 95, 69, 
+	71, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 74, 75, 76, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 87, 69, 69, 69, 69, 69, 89, 
+	90, 91, 95, 69, 97, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 98, 96, 71, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 74, 75, 76, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 89, 90, 91, 95, 69, 71, 
+	69, 69, 69, 69, 69, 69, 69, 72, 
+	73, 74, 75, 76, 69, 69, 69, 69, 
+	69, 69, 82, 83, 84, 69, 85, 86, 
+	87, 69, 69, 69, 69, 69, 89, 90, 
+	91, 95, 69, 69, 69, 69, 73, 69, 
+	71, 69, 69, 69, 69, 69, 69, 69, 
+	69, 73, 74, 75, 76, 69, 69, 69, 
+	69, 69, 69, 82, 83, 84, 69, 85, 
+	86, 87, 69, 69, 69, 69, 69, 89, 
+	90, 91, 95, 69, 69, 69, 69, 73, 
+	69, 71, 69, 69, 69, 69, 69, 69, 
+	69, 69, 73, 74, 75, 76, 69, 69, 
+	69, 69, 69, 69, 69, 83, 84, 69, 
+	85, 86, 87, 69, 69, 69, 69, 69, 
+	89, 90, 91, 95, 69, 69, 69, 69, 
+	73, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 69, 73, 74, 75, 76, 69, 
+	69, 69, 69, 69, 69, 69, 69, 84, 
+	69, 85, 86, 87, 69, 69, 69, 69, 
+	69, 89, 90, 91, 95, 69, 69, 69, 
+	69, 73, 69, 99, 69, 71, 69, 69, 
+	69, 69, 69, 69, 69, 72, 73, 74, 
+	75, 76, 69, 78, 79, 69, 69, 69, 
+	82, 83, 84, 69, 85, 86, 87, 69, 
+	69, 69, 69, 69, 89, 90, 91, 95, 
+	69, 69, 69, 69, 73, 69, 71, 69, 
+	69, 69, 69, 69, 69, 69, 69, 73, 
+	74, 75, 76, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 85, 86, 87, 
+	69, 69, 69, 69, 69, 89, 90, 91, 
+	95, 69, 69, 69, 69, 73, 69, 99, 
+	69, 71, 69, 69, 69, 69, 69, 69, 
+	69, 72, 73, 74, 75, 76, 69, 69, 
+	79, 69, 69, 69, 82, 83, 84, 69, 
+	85, 86, 87, 69, 69, 69, 69, 69, 
+	89, 90, 91, 95, 69, 69, 69, 69, 
+	73, 69, 99, 69, 71, 69, 69, 69, 
+	69, 69, 69, 69, 72, 73, 74, 75, 
+	76, 69, 69, 69, 69, 69, 69, 82, 
+	83, 84, 69, 85, 86, 87, 69, 69, 
+	69, 69, 69, 89, 90, 91, 95, 69, 
+	69, 69, 69, 73, 69, 99, 69, 71, 
+	69, 69, 69, 69, 69, 69, 69, 72, 
+	73, 74, 75, 76, 77, 78, 79, 69, 
+	69, 69, 82, 83, 84, 69, 85, 86, 
+	87, 69, 69, 69, 69, 69, 89, 90, 
+	91, 95, 69, 69, 69, 69, 73, 69, 
+	4, 70, 69, 71, 69, 69, 69, 69, 
+	69, 69, 69, 72, 73, 74, 75, 76, 
+	77, 78, 79, 80, 69, 81, 82, 83, 
+	84, 69, 85, 86, 87, 69, 69, 69, 
+	69, 88, 89, 90, 91, 92, 69, 69, 
+	69, 69, 93, 69, 69, 94, 69, 4, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 100, 100, 101, 100, 4, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 96, 96, 98, 96, 4, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 69, 73, 74, 75, 76, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 85, 86, 87, 69, 69, 69, 69, 
+	69, 89, 90, 91, 95, 69, 101, 100, 
+	103, 104, 102, 6, 105, 105, 105, 105, 
+	105, 105, 105, 105, 105, 106, 105, 107, 
+	108, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 109, 110, 111, 112, 113, 114, 
+	115, 116, 117, 107, 118, 119, 120, 121, 
+	69, 122, 123, 124, 69, 59, 60, 69, 
+	125, 126, 127, 128, 129, 69, 69, 69, 
+	69, 130, 69, 69, 131, 69, 107, 108, 
+	69, 71, 69, 69, 69, 69, 69, 69, 
+	69, 109, 110, 111, 112, 113, 114, 115, 
+	116, 117, 107, 118, 119, 120, 121, 69, 
+	122, 123, 124, 69, 69, 69, 69, 125, 
+	126, 127, 128, 129, 69, 69, 69, 69, 
+	130, 69, 69, 131, 69, 107, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 69, 110, 111, 112, 113, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 122, 123, 124, 69, 69, 69, 69, 
+	69, 126, 127, 128, 132, 69, 69, 69, 
+	69, 110, 69, 71, 69, 69, 69, 69, 
+	69, 69, 69, 69, 110, 111, 112, 113, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 122, 123, 124, 69, 69, 69, 
+	69, 69, 126, 127, 128, 132, 69, 71, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 111, 112, 113, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 126, 127, 
+	128, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 112, 113, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 126, 127, 128, 69, 71, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 113, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 126, 127, 128, 69, 
+	71, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 126, 
+	127, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 127, 69, 71, 69, 71, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	111, 112, 113, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 122, 123, 124, 
+	69, 69, 69, 69, 69, 126, 127, 128, 
+	132, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 111, 112, 113, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 123, 124, 69, 69, 69, 69, 
+	69, 126, 127, 128, 132, 69, 71, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	111, 112, 113, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 124, 
+	69, 69, 69, 69, 69, 126, 127, 128, 
+	132, 69, 133, 96, 96, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 98, 
+	96, 71, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 111, 112, 113, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	126, 127, 128, 132, 69, 71, 69, 69, 
+	69, 69, 69, 69, 69, 109, 110, 111, 
+	112, 113, 69, 69, 69, 69, 69, 69, 
+	119, 120, 121, 69, 122, 123, 124, 69, 
+	69, 69, 69, 69, 126, 127, 128, 132, 
+	69, 69, 69, 69, 110, 69, 71, 69, 
+	69, 69, 69, 69, 69, 69, 69, 110, 
+	111, 112, 113, 69, 69, 69, 69, 69, 
+	69, 119, 120, 121, 69, 122, 123, 124, 
+	69, 69, 69, 69, 69, 126, 127, 128, 
+	132, 69, 69, 69, 69, 110, 69, 71, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	110, 111, 112, 113, 69, 69, 69, 69, 
+	69, 69, 69, 120, 121, 69, 122, 123, 
+	124, 69, 69, 69, 69, 69, 126, 127, 
+	128, 132, 69, 69, 69, 69, 110, 69, 
+	71, 69, 69, 69, 69, 69, 69, 69, 
+	69, 110, 111, 112, 113, 69, 69, 69, 
+	69, 69, 69, 69, 69, 121, 69, 122, 
+	123, 124, 69, 69, 69, 69, 69, 126, 
+	127, 128, 132, 69, 69, 69, 69, 110, 
+	69, 134, 69, 71, 69, 69, 69, 69, 
+	69, 69, 69, 109, 110, 111, 112, 113, 
+	69, 115, 116, 69, 69, 69, 119, 120, 
+	121, 69, 122, 123, 124, 69, 69, 69, 
+	69, 69, 126, 127, 128, 132, 69, 69, 
+	69, 69, 110, 69, 71, 69, 69, 69, 
+	69, 69, 69, 69, 69, 110, 111, 112, 
+	113, 69, 69, 69, 69, 69, 69, 69, 
+	69, 69, 69, 122, 123, 124, 69, 69, 
+	69, 69, 69, 126, 127, 128, 132, 69, 
+	69, 69, 69, 110, 69, 134, 69, 71, 
+	69, 69, 69, 69, 69, 69, 69, 109, 
+	110, 111, 112, 113, 69, 69, 116, 69, 
+	69, 69, 119, 120, 121, 69, 122, 123, 
+	124, 69, 69, 69, 69, 69, 126, 127, 
+	128, 132, 69, 69, 69, 69, 110, 69, 
+	134, 69, 71, 69, 69, 69, 69, 69, 
+	69, 69, 109, 110, 111, 112, 113, 69, 
+	69, 69, 69, 69, 69, 119, 120, 121, 
+	69, 122, 123, 124, 69, 69, 69, 69, 
+	69, 126, 127, 128, 132, 69, 69, 69, 
+	69, 110, 69, 134, 69, 71, 69, 69, 
+	69, 69, 69, 69, 69, 109, 110, 111, 
+	112, 113, 114, 115, 116, 69, 69, 69, 
+	119, 120, 121, 69, 122, 123, 124, 69, 
+	69, 69, 69, 69, 126, 127, 128, 132, 
+	69, 69, 69, 69, 110, 69, 107, 108, 
+	69, 71, 69, 69, 69, 69, 69, 69, 
+	69, 109, 110, 111, 112, 113, 114, 115, 
+	116, 117, 69, 118, 119, 120, 121, 69, 
+	122, 123, 124, 69, 69, 69, 69, 125, 
+	126, 127, 128, 129, 69, 69, 69, 69, 
+	130, 69, 69, 131, 69, 107, 100, 100, 
+	100, 100, 100, 100, 100, 100, 100, 100, 
+	100, 100, 101, 100, 107, 96, 96, 96, 
+	96, 96, 96, 96, 96, 96, 96, 96, 
+	96, 98, 96, 107, 69, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 69, 
+	71, 69, 69, 69, 69, 69, 69, 69, 
+	69, 110, 111, 112, 113, 69, 69, 69, 
+	69, 69, 69, 69, 69, 69, 69, 122, 
+	123, 124, 69, 69, 69, 69, 69, 126, 
+	127, 128, 132, 69, 101, 100, 8, 9, 
+	135, 11, 135, 135, 135, 135, 135, 135, 
+	135, 13, 14, 15, 16, 17, 18, 19, 
+	20, 21, 8, 22, 23, 24, 25, 135, 
+	26, 27, 28, 135, 135, 135, 135, 32, 
+	33, 34, 38, 32, 135, 135, 135, 135, 
+	37, 135, 135, 38, 135, 8, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 11, 135, 135, 135, 135, 135, 
+	135, 135, 135, 14, 15, 16, 17, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 26, 27, 28, 135, 135, 135, 135, 
+	135, 33, 34, 38, 136, 135, 135, 135, 
+	135, 14, 135, 11, 135, 135, 135, 135, 
+	135, 135, 135, 135, 14, 15, 16, 17, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 26, 27, 28, 135, 135, 135, 
+	135, 135, 33, 34, 38, 136, 135, 11, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 15, 16, 17, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 33, 34, 
+	38, 135, 11, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 16, 17, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 33, 34, 38, 135, 11, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 17, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 33, 34, 38, 135, 
+	11, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 33, 
+	34, 135, 11, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 34, 135, 11, 137, 11, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	15, 16, 17, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 26, 27, 28, 
+	135, 135, 135, 135, 135, 33, 34, 38, 
+	136, 135, 11, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 15, 16, 17, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 27, 28, 135, 135, 135, 135, 
+	135, 33, 34, 38, 136, 135, 11, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	15, 16, 17, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 28, 
+	135, 135, 135, 135, 135, 33, 34, 38, 
+	136, 135, 138, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 11, 
+	135, 11, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 15, 16, 17, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	33, 34, 38, 136, 135, 11, 135, 135, 
+	135, 135, 135, 135, 135, 13, 14, 15, 
+	16, 17, 135, 135, 135, 135, 135, 135, 
+	23, 24, 25, 135, 26, 27, 28, 135, 
+	135, 135, 135, 135, 33, 34, 38, 136, 
+	135, 135, 135, 135, 14, 135, 11, 135, 
+	135, 135, 135, 135, 135, 135, 135, 14, 
+	15, 16, 17, 135, 135, 135, 135, 135, 
+	135, 23, 24, 25, 135, 26, 27, 28, 
+	135, 135, 135, 135, 135, 33, 34, 38, 
+	136, 135, 135, 135, 135, 14, 135, 11, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	14, 15, 16, 17, 135, 135, 135, 135, 
+	135, 135, 135, 24, 25, 135, 26, 27, 
+	28, 135, 135, 135, 135, 135, 33, 34, 
+	38, 136, 135, 135, 135, 135, 14, 135, 
+	11, 135, 135, 135, 135, 135, 135, 135, 
+	135, 14, 15, 16, 17, 135, 135, 135, 
+	135, 135, 135, 135, 135, 25, 135, 26, 
+	27, 28, 135, 135, 135, 135, 135, 33, 
+	34, 38, 136, 135, 135, 135, 135, 14, 
+	135, 139, 135, 11, 135, 135, 135, 135, 
+	135, 135, 135, 13, 14, 15, 16, 17, 
+	135, 19, 20, 135, 135, 135, 23, 24, 
+	25, 135, 26, 27, 28, 135, 135, 135, 
+	135, 135, 33, 34, 38, 136, 135, 135, 
+	135, 135, 14, 135, 11, 135, 135, 135, 
+	135, 135, 135, 135, 135, 14, 15, 16, 
+	17, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 26, 27, 28, 135, 135, 
+	135, 135, 135, 33, 34, 38, 136, 135, 
+	135, 135, 135, 14, 135, 139, 135, 11, 
+	135, 135, 135, 135, 135, 135, 135, 13, 
+	14, 15, 16, 17, 135, 135, 20, 135, 
+	135, 135, 23, 24, 25, 135, 26, 27, 
+	28, 135, 135, 135, 135, 135, 33, 34, 
+	38, 136, 135, 135, 135, 135, 14, 135, 
+	139, 135, 11, 135, 135, 135, 135, 135, 
+	135, 135, 13, 14, 15, 16, 17, 135, 
+	135, 135, 135, 135, 135, 23, 24, 25, 
+	135, 26, 27, 28, 135, 135, 135, 135, 
+	135, 33, 34, 38, 136, 135, 135, 135, 
+	135, 14, 135, 139, 135, 11, 135, 135, 
+	135, 135, 135, 135, 135, 13, 14, 15, 
+	16, 17, 18, 19, 20, 135, 135, 135, 
+	23, 24, 25, 135, 26, 27, 28, 135, 
+	135, 135, 135, 135, 33, 34, 38, 136, 
+	135, 135, 135, 135, 14, 135, 8, 9, 
+	135, 11, 135, 135, 135, 135, 135, 135, 
+	135, 13, 14, 15, 16, 17, 18, 19, 
+	20, 21, 135, 22, 23, 24, 25, 135, 
+	26, 27, 28, 135, 135, 135, 135, 32, 
+	33, 34, 38, 32, 135, 135, 135, 135, 
+	37, 135, 135, 38, 135, 8, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 11, 135, 8, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 11, 135, 135, 135, 135, 135, 135, 
+	135, 135, 14, 15, 16, 17, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	26, 27, 28, 135, 135, 135, 135, 135, 
+	33, 34, 38, 136, 135, 140, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 11, 
+	135, 10, 11, 135, 4, 135, 135, 135, 
+	4, 135, 135, 135, 135, 135, 8, 9, 
+	10, 11, 135, 135, 135, 135, 135, 135, 
+	135, 13, 14, 15, 16, 17, 18, 19, 
+	20, 21, 8, 22, 23, 24, 25, 135, 
+	26, 27, 28, 135, 29, 30, 135, 32, 
+	33, 34, 38, 32, 135, 135, 135, 135, 
+	37, 135, 135, 38, 135, 11, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	29, 30, 135, 11, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 135, 
+	135, 135, 135, 135, 135, 135, 135, 30, 
+	135, 4, 141, 141, 141, 4, 141, 143, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 144, 142, 145, 142, 145, 
+	146, 142, 143, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 1, 144, 144, 
+	142, 143, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 144, 142, 145, 
+	142, 143, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 142, 142, 142, 
+	142, 142, 142, 142, 142, 144, 142, 145, 
+	142, 145, 142, 40, 41, 39, 42, 39, 
+	39, 39, 39, 39, 39, 39, 43, 44, 
+	45, 46, 47, 48, 49, 50, 51, 40, 
+	52, 53, 54, 55, 39, 56, 57, 58, 
+	39, 59, 60, 39, 61, 62, 63, 64, 
+	61, 1, 39, 2, 39, 65, 39, 39, 
+	64, 39, 0
 };
 
 static const char _use_syllable_machine_trans_targs[] = {
@@ -723,21 +723,21 @@ static const char _use_syllable_machine_trans_targs[] = {
 	90, 91, 116, 1, 118, 104, 92, 93, 
 	94, 95, 108, 110, 111, 112, 113, 105, 
 	106, 107, 99, 100, 101, 119, 120, 121, 
-	114, 96, 97, 98, 126, 115, 1, 3, 
-	4, 1, 17, 5, 6, 7, 8, 21, 
-	23, 24, 25, 26, 18, 19, 20, 12, 
-	13, 14, 29, 30, 27, 9, 10, 11, 
-	28, 15, 16, 22, 1, 32, 1, 45, 
-	33, 34, 35, 36, 49, 51, 52, 53, 
-	54, 46, 47, 48, 40, 41, 42, 55, 
-	37, 38, 39, 56, 57, 58, 43, 1, 
-	44, 1, 50, 1, 1, 1, 60, 1, 
-	1, 1, 62, 63, 76, 64, 65, 66, 
-	67, 80, 82, 83, 84, 85, 77, 78, 
-	79, 71, 72, 73, 86, 68, 69, 70, 
-	87, 88, 89, 74, 75, 81, 1, 102, 
-	103, 109, 117, 1, 1, 1, 123, 124, 
-	125
+	114, 96, 97, 98, 126, 115, 98, 1, 
+	3, 4, 1, 17, 5, 6, 7, 8, 
+	21, 23, 24, 25, 26, 18, 19, 20, 
+	12, 13, 14, 29, 30, 27, 9, 10, 
+	11, 28, 15, 16, 22, 1, 32, 1, 
+	45, 33, 34, 35, 36, 49, 51, 52, 
+	53, 54, 46, 47, 48, 40, 41, 42, 
+	55, 37, 38, 39, 56, 57, 58, 43, 
+	1, 44, 1, 50, 1, 1, 1, 60, 
+	1, 1, 1, 62, 63, 76, 64, 65, 
+	66, 67, 80, 82, 83, 84, 85, 77, 
+	78, 79, 71, 72, 73, 86, 68, 69, 
+	70, 87, 88, 89, 74, 75, 81, 1, 
+	102, 1, 103, 109, 117, 1, 1, 1, 
+	123, 124, 125
 };
 
 static const char _use_syllable_machine_trans_actions[] = {
@@ -745,21 +745,21 @@ static const char _use_syllable_machine_trans_actions[] = {
 	0, 0, 0, 5, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 6, 0, 7, 0, 
-	0, 8, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 6, 7, 0, 8, 9, 
+	0, 0, 10, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 9, 0, 10, 0, 
+	0, 0, 0, 0, 0, 11, 0, 12, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 11, 
-	0, 12, 0, 13, 14, 15, 0, 16, 
-	17, 18, 0, 0, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 0, 0, 
+	13, 0, 14, 0, 15, 16, 17, 0, 
+	18, 19, 20, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
 	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 19, 0, 
-	0, 0, 0, 20, 21, 22, 0, 0, 
-	0
+	0, 0, 0, 0, 0, 0, 0, 21, 
+	0, 22, 0, 0, 0, 23, 24, 25, 
+	0, 0, 0
 };
 
 static const char _use_syllable_machine_to_state_actions[] = {
@@ -801,22 +801,22 @@ static const char _use_syllable_machine_from_state_actions[] = {
 };
 
 static const short _use_syllable_machine_eof_trans[] = {
-	1, 0, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 39, 
-	39, 39, 39, 39, 39, 39, 39, 69, 
-	69, 69, 69, 69, 69, 69, 69, 69, 
-	69, 69, 69, 96, 69, 69, 69, 69, 
-	69, 69, 69, 69, 69, 69, 69, 100, 
-	96, 69, 100, 102, 105, 69, 69, 69, 
-	69, 69, 69, 69, 69, 69, 69, 69, 
-	69, 69, 96, 69, 69, 69, 69, 69, 
-	69, 69, 69, 69, 69, 69, 100, 96, 
-	69, 100, 135, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 135, 135, 135, 135, 135, 135, 135, 
-	135, 140, 141, 141, 141, 141, 39
+	1, 0, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 40, 
+	40, 40, 40, 40, 40, 40, 40, 70, 
+	70, 70, 70, 70, 70, 70, 70, 70, 
+	70, 70, 70, 97, 70, 70, 70, 70, 
+	70, 70, 70, 70, 70, 70, 70, 101, 
+	97, 70, 101, 103, 106, 70, 70, 70, 
+	70, 70, 70, 70, 70, 70, 70, 70, 
+	70, 70, 97, 70, 70, 70, 70, 70, 
+	70, 70, 70, 70, 70, 70, 101, 97, 
+	70, 101, 136, 136, 136, 136, 136, 136, 
+	136, 136, 138, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 136, 136, 136, 136, 136, 136, 136, 
+	136, 142, 143, 143, 143, 143, 40
 };
 
 static const int use_syllable_machine_start = 1;
@@ -830,7 +830,7 @@ static const int use_syllable_machine_en_main = 1;
 
 
 
-#line 185 "hb-ot-shaper-use-machine.rl"
+#line 186 "hb-ot-shaper-use-machine.rl"
 
 
 #define found_syllable(syllable_type) \
@@ -937,7 +937,7 @@ find_syllables_use (hb_buffer_t *buffer)
 	act = 0;
 	}
 
-#line 285 "hb-ot-shaper-use-machine.rl"
+#line 286 "hb-ot-shaper-use-machine.rl"
 
 
   unsigned int syllable_serial = 1;
@@ -974,87 +974,111 @@ _eof_trans:
 		goto _again;
 
 	switch ( _use_syllable_machine_trans_actions[_trans] ) {
-	case 6:
+	case 7:
 #line 1 "NONE"
 	{te = p+1;}
 	break;
-	case 14:
+	case 16:
 #line 173 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_virama_terminated_cluster); }}
 	break;
-	case 12:
+	case 14:
 #line 174 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_sakot_terminated_cluster); }}
 	break;
-	case 10:
+	case 12:
 #line 175 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_standard_cluster); }}
 	break;
-	case 18:
+	case 20:
 #line 176 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_number_joiner_terminated_cluster); }}
 	break;
-	case 16:
+	case 18:
 #line 177 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_numeral_cluster); }}
 	break;
-	case 8:
+	case 10:
 #line 178 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_symbol_cluster); }}
 	break;
-	case 22:
+	case 25:
 #line 179 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_hieroglyph_cluster); }}
 	break;
 	case 5:
-#line 180 "hb-ot-shaper-use-machine.rl"
+#line 181 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
 	break;
 	case 4:
-#line 181 "hb-ot-shaper-use-machine.rl"
+#line 182 "hb-ot-shaper-use-machine.rl"
 	{te = p+1;{ found_syllable (use_non_cluster); }}
 	break;
-	case 13:
+	case 15:
 #line 173 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_virama_terminated_cluster); }}
 	break;
-	case 11:
+	case 13:
 #line 174 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_sakot_terminated_cluster); }}
 	break;
-	case 9:
+	case 11:
 #line 175 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_standard_cluster); }}
 	break;
-	case 17:
+	case 19:
 #line 176 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_number_joiner_terminated_cluster); }}
 	break;
-	case 15:
+	case 17:
 #line 177 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_numeral_cluster); }}
 	break;
-	case 7:
+	case 9:
 #line 178 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_symbol_cluster); }}
 	break;
-	case 21:
+	case 24:
 #line 179 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_hieroglyph_cluster); }}
 	break;
-	case 19:
-#line 180 "hb-ot-shaper-use-machine.rl"
+	case 21:
+#line 181 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }}
 	break;
-	case 20:
-#line 181 "hb-ot-shaper-use-machine.rl"
+	case 23:
+#line 182 "hb-ot-shaper-use-machine.rl"
 	{te = p;p--;{ found_syllable (use_non_cluster); }}
 	break;
 	case 1:
 #line 178 "hb-ot-shaper-use-machine.rl"
 	{{p = ((te))-1;}{ found_syllable (use_symbol_cluster); }}
 	break;
-#line 1058 "hb-ot-shaper-use-machine.hh"
+	case 22:
+#line 1 "NONE"
+	{	switch( act ) {
+	case 8:
+	{{p = ((te))-1;} found_syllable (use_non_cluster); }
+	break;
+	case 9:
+	{{p = ((te))-1;} found_syllable (use_broken_cluster); buffer->scratch_flags |= HB_BUFFER_SCRATCH_FLAG_HAS_BROKEN_SYLLABLE; }
+	break;
+	}
+	}
+	break;
+	case 6:
+#line 1 "NONE"
+	{te = p+1;}
+#line 180 "hb-ot-shaper-use-machine.rl"
+	{act = 8;}
+	break;
+	case 8:
+#line 1 "NONE"
+	{te = p+1;}
+#line 181 "hb-ot-shaper-use-machine.rl"
+	{act = 9;}
+	break;
+#line 1082 "hb-ot-shaper-use-machine.hh"
 	}
 
 _again:
@@ -1063,7 +1087,7 @@ _again:
 #line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 1067 "hb-ot-shaper-use-machine.hh"
+#line 1091 "hb-ot-shaper-use-machine.hh"
 	}
 
 	if ( ++p != pe )
@@ -1079,7 +1103,7 @@ _again:
 
 	}
 
-#line 290 "hb-ot-shaper-use-machine.rl"
+#line 291 "hb-ot-shaper-use-machine.rl"
 
 }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc
index dbe781e5..a48b9b9a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-shaper-vowel-constraints.cc
@@ -24,7 +24,7 @@ static void
 _output_dotted_circle (hb_buffer_t *buffer)
 {
   (void) buffer->output_glyph (0x25CCu);
-  _hb_glyph_info_reset_continuation (&buffer->prev());
+  _hb_glyph_info_clear_continuation (&buffer->prev());
 }
 
 static void
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh
index 66ba9f1b..3d4ebddd 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-tag-table.hh
@@ -6,8 +6,8 @@
  *
  * on files with these headers:
  *
- * <meta name="updated_at" content="2024-07-07 12:57 AM" />
- * File-Date: 2024-06-14
+ * <meta name="updated_at" content="2024-12-06 06:35 AM" />
+ * File-Date: 2025-01-21
  */
 
 #ifndef HB_OT_TAG_TABLE_HH
@@ -745,6 +745,7 @@ static const LangTag ot_languages3[] = {
 /*{HB_TAG('h','n','d',' '),	HB_TAG('H','N','D',' ')},*/	/* Southern Hindko -> Hindko */
   {HB_TAG('h','n','e',' '),	HB_TAG('C','H','H',' ')},	/* Chhattisgarhi -> Chattisgarhi */
   {HB_TAG('h','n','j',' '),	HB_TAG('H','M','N',' ')},	/* Hmong Njua -> Hmong */
+  {HB_TAG('h','n','m',' '),	HB_TAG('Z','H','S',' ')},	/* Hainanese -> Chinese, Simplified */
   {HB_TAG('h','n','o',' '),	HB_TAG('H','N','D',' ')},	/* Northern Hindko -> Hindko */
   {HB_TAG('h','o','c',' '),	HB_TAG('H','O',' ',' ')},	/* Ho */
   {HB_TAG('h','o','i',' '),	HB_TAG('A','T','H',' ')},	/* Holikachuk -> Athapaskan */
@@ -830,6 +831,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','f','x',' '),	HB_TAG('K','U','L',' ')},	/* Kullu Pahari -> Kulvi */
   {HB_TAG('k','f','y',' '),	HB_TAG('K','M','N',' ')},	/* Kumaoni */
   {HB_TAG('k','g','e',' '),	HB_TAG_NONE	       },	/* Komering != Khutsuri Georgian */
+/*{HB_TAG('k','g','f',' '),	HB_TAG('K','G','F',' ')},*/	/* Kube */
   {HB_TAG('k','h','a',' '),	HB_TAG('K','S','I',' ')},	/* Khasi */
   {HB_TAG('k','h','b',' '),	HB_TAG('X','B','D',' ')},	/* Lü */
   {HB_TAG('k','h','k',' '),	HB_TAG('M','N','G',' ')},	/* Halh Mongolian -> Mongolian */
@@ -855,6 +857,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','l','m',' '),	HB_TAG_NONE	       },	/* Migum != Kalmyk */
   {HB_TAG('k','l','n',' '),	HB_TAG('K','A','L',' ')},	/* Kalenjin [macrolanguage] */
   {HB_TAG('k','m','b',' '),	HB_TAG('M','B','N',' ')},	/* Kimbundu -> Mbundu */
+/*{HB_TAG('k','m','g',' '),	HB_TAG('K','M','G',' ')},*/	/* Kâte */
   {HB_TAG('k','m','n',' '),	HB_TAG_NONE	       },	/* Awtuw != Kumaoni */
   {HB_TAG('k','m','o',' '),	HB_TAG_NONE	       },	/* Kwoma != Komo */
   {HB_TAG('k','m','r',' '),	HB_TAG('K','U','R',' ')},	/* Northern Kurdish -> Kurdish */
@@ -898,6 +901,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','s','i',' '),	HB_TAG_NONE	       },	/* Krisa != Khasi */
   {HB_TAG('k','s','m',' '),	HB_TAG_NONE	       },	/* Kumba != Kildin Sami */
   {HB_TAG('k','s','s',' '),	HB_TAG('K','I','S',' ')},	/* Southern Kisi -> Kisii */
+/*{HB_TAG('k','s','u',' '),	HB_TAG('K','S','U',' ')},*/	/* Khamyang */
   {HB_TAG('k','s','w',' '),	HB_TAG('K','S','W',' ')},	/* S’gaw Karen */
   {HB_TAG('k','s','w',' '),	HB_TAG('K','R','N',' ')},	/* S'gaw Karen -> Karen */
   {HB_TAG('k','t','b',' '),	HB_TAG('K','E','B',' ')},	/* Kambaata -> Kebena */
@@ -911,6 +915,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('k','u','y',' '),	HB_TAG_NONE	       },	/* Kuuku-Ya'u != Kuy */
   {HB_TAG('k','v','b',' '),	HB_TAG('M','L','Y',' ')},	/* Kubu -> Malay */
   {HB_TAG('k','v','l',' '),	HB_TAG('K','R','N',' ')},	/* Kayaw -> Karen */
+  {HB_TAG('k','v','q',' '),	HB_TAG('K','V','Q',' ')},	/* Geba Karen */
   {HB_TAG('k','v','q',' '),	HB_TAG('K','R','N',' ')},	/* Geba Karen -> Karen */
   {HB_TAG('k','v','r',' '),	HB_TAG('M','L','Y',' ')},	/* Kerinci -> Malay */
   {HB_TAG('k','v','t',' '),	HB_TAG('K','R','N',' ')},	/* Lahta Karen -> Karen */
@@ -977,9 +982,11 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('l','t','o',' '),	HB_TAG('L','U','H',' ')},	/* Tsotso -> Luyia */
   {HB_TAG('l','t','s',' '),	HB_TAG('L','U','H',' ')},	/* Tachoni -> Luyia */
 /*{HB_TAG('l','u','a',' '),	HB_TAG('L','U','A',' ')},*/	/* Luba-Lulua */
+  {HB_TAG('l','u','h',' '),	HB_TAG('Z','H','S',' ')},	/* Leizhou Chinese -> Chinese, Simplified */
 /*{HB_TAG('l','u','o',' '),	HB_TAG('L','U','O',' ')},*/	/* Luo (Kenya and Tanzania) */
   {HB_TAG('l','u','s',' '),	HB_TAG('M','I','Z',' ')},	/* Lushai -> Mizo */
   {HB_TAG('l','u','s',' '),	HB_TAG('Q','I','N',' ')},	/* Lushai -> Chin */
+/*{HB_TAG('l','u','t',' '),	HB_TAG('L','U','T',' ')},*/	/* Lushootseed */
   {HB_TAG('l','u','y',' '),	HB_TAG('L','U','H',' ')},	/* Luyia [macrolanguage] */
   {HB_TAG('l','u','z',' '),	HB_TAG('L','R','C',' ')},	/* Southern Luri -> Luri */
   {HB_TAG('l','v','i',' '),	HB_TAG_NONE	       },	/* Lavi != Latvian */
@@ -1146,6 +1153,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('n','o','d',' '),	HB_TAG('N','T','A',' ')},	/* Northern Thai -> Northern Tai */
 /*{HB_TAG('n','o','e',' '),	HB_TAG('N','O','E',' ')},*/	/* Nimadi */
 /*{HB_TAG('n','o','g',' '),	HB_TAG('N','O','G',' ')},*/	/* Nogai */
+/*{HB_TAG('n','o','p',' '),	HB_TAG('N','O','P',' ')},*/	/* Numanggang */
 /*{HB_TAG('n','o','v',' '),	HB_TAG('N','O','V',' ')},*/	/* Novial */
   {HB_TAG('n','p','i',' '),	HB_TAG('N','E','P',' ')},	/* Nepali */
   {HB_TAG('n','p','l',' '),	HB_TAG('N','A','H',' ')},	/* Southeastern Puebla Nahuatl -> Nahuatl */
@@ -1156,6 +1164,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('n','s','u',' '),	HB_TAG('N','A','H',' ')},	/* Sierra Negra Nahuatl -> Nahuatl */
   {HB_TAG('n','t','o',' '),	HB_TAG_NONE	       },	/* Ntomba != Esperanto */
   {HB_TAG('n','u','e',' '),	HB_TAG('B','A','D','0')},	/* Ngundu -> Banda */
+/*{HB_TAG('n','u','k',' '),	HB_TAG('N','U','K',' ')},*/	/* Nuu-chah-nulth */
   {HB_TAG('n','u','u',' '),	HB_TAG('B','A','D','0')},	/* Ngbundu -> Banda */
   {HB_TAG('n','u','z',' '),	HB_TAG('N','A','H',' ')},	/* Tlamacazapa Nahuatl -> Nahuatl */
   {HB_TAG('n','w','e',' '),	HB_TAG('B','M','L',' ')},	/* Ngwe -> Bamileke */
@@ -1398,9 +1407,12 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('s','i','g',' '),	HB_TAG_NONE	       },	/* Paasaal != Silte Gurage */
   {HB_TAG('s','i','z',' '),	HB_TAG('B','B','R',' ')},	/* Siwi -> Berber */
 /*{HB_TAG('s','j','a',' '),	HB_TAG('S','J','A',' ')},*/	/* Epena */
+  {HB_TAG('s','j','c',' '),	HB_TAG('Z','H','S',' ')},	/* Shaojiang Chinese -> Chinese, Simplified */
   {HB_TAG('s','j','d',' '),	HB_TAG('K','S','M',' ')},	/* Kildin Sami */
+/*{HB_TAG('s','j','e',' '),	HB_TAG('S','J','E',' ')},*/	/* Pite Sami */
   {HB_TAG('s','j','o',' '),	HB_TAG('S','I','B',' ')},	/* Xibe -> Sibe */
   {HB_TAG('s','j','s',' '),	HB_TAG('B','B','R',' ')},	/* Senhaja De Srair -> Berber */
+/*{HB_TAG('s','j','u',' '),	HB_TAG('S','J','U',' ')},*/	/* Ume Sami */
   {HB_TAG('s','k','g',' '),	HB_TAG('M','L','G',' ')},	/* Sakalava Malagasy -> Malagasy */
   {HB_TAG('s','k','r',' '),	HB_TAG('S','R','K',' ')},	/* Saraiki */
   {HB_TAG('s','k','s',' '),	HB_TAG_NONE	       },	/* Maia != Skolt Sami */
@@ -1461,6 +1473,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('t','a','q',' '),	HB_TAG('B','B','R',' ')},	/* Tamasheq -> Berber */
   {HB_TAG('t','a','s',' '),	HB_TAG('C','P','P',' ')},	/* Tay Boi -> Creoles */
   {HB_TAG('t','a','u',' '),	HB_TAG('A','T','H',' ')},	/* Upper Tanana -> Athapaskan */
+/*{HB_TAG('t','b','v',' '),	HB_TAG('T','B','V',' ')},*/	/* Tobo */
   {HB_TAG('t','c','b',' '),	HB_TAG('A','T','H',' ')},	/* Tanacross -> Athapaskan */
   {HB_TAG('t','c','e',' '),	HB_TAG('A','T','H',' ')},	/* Southern Tutchone -> Athapaskan */
   {HB_TAG('t','c','h',' '),	HB_TAG('C','P','P',' ')},	/* Turks And Caicos Creole English -> Creoles */
@@ -1623,7 +1636,7 @@ static const LangTag ot_languages3[] = {
   {HB_TAG('y','b','a',' '),	HB_TAG_NONE	       },	/* Yala != Yoruba */
   {HB_TAG('y','b','b',' '),	HB_TAG('B','M','L',' ')},	/* Yemba -> Bamileke */
   {HB_TAG('y','b','d',' '),	HB_TAG('A','R','K',' ')},	/* Yangbye (retired code) -> Rakhine */
-  {HB_TAG('y','c','r',' '),	HB_TAG_NONE	       },	/* Yilan Creole != Y-Cree */
+  {HB_TAG('y','c','r',' '),	HB_TAG('C','P','P',' ')},	/* Yilan Creole -> Creoles */
   {HB_TAG('y','d','d',' '),	HB_TAG('J','I','I',' ')},	/* Eastern Yiddish -> Yiddish */
 /*{HB_TAG('y','g','p',' '),	HB_TAG('Y','G','P',' ')},*/	/* Gepo */
   {HB_TAG('y','i','h',' '),	HB_TAG('J','I','I',' ')},	/* Western Yiddish -> Yiddish */
@@ -2377,6 +2390,26 @@ out:
       *count = i;
       return true;
     }
+    if (lang_matches (&lang_str[1], limit, "nm-hant-hk", 10))
+    {
+      /* Hainanese; Han (Traditional variant); Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "nm-hant-mo", 10))
+    {
+      /* Hainanese; Han (Traditional variant); Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+	HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+	HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+	tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
     if (lang_matches (&lang_str[1], limit, "sn-hant-hk", 10))
     {
       /* Xiang Chinese; Han (Traditional variant); Hong Kong */
@@ -2411,6 +2444,20 @@ out:
       *count = 1;
       return true;
     }
+    if (lang_matches (&lang_str[1], limit, "nm-hans", 7))
+    {
+      /* Hainanese; Han (Simplified variant) */
+      tags[0] = HB_TAG('Z','H','S',' ');  /* Chinese, Simplified */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "nm-hant", 7))
+    {
+      /* Hainanese; Han (Traditional variant) */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     if (lang_matches (&lang_str[1], limit, "sn-hans", 7))
     {
       /* Xiang Chinese; Han (Simplified variant) */
@@ -2455,6 +2502,36 @@ out:
       *count = 1;
       return true;
     }
+    if (0 == strncmp (&lang_str[1], "nm-", 3)
+	&& subtag_matches (lang_str, limit, "-hk", 3))
+    {
+      /* Hainanese; Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "nm-", 3)
+	&& subtag_matches (lang_str, limit, "-mo", 3))
+    {
+      /* Hainanese; Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+	HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+	HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+	tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "nm-", 3)
+	&& subtag_matches (lang_str, limit, "-tw", 3))
+    {
+      /* Hainanese; Taiwan, Province of China */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     if (0 == strncmp (&lang_str[1], "sn-", 3)
 	&& subtag_matches (lang_str, limit, "-hk", 3))
     {
@@ -2516,6 +2593,40 @@ out:
     }
     break;
   case 'l':
+    if (lang_matches (&lang_str[1], limit, "uh-hant-hk", 10))
+    {
+      /* Leizhou Chinese; Han (Traditional variant); Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "uh-hant-mo", 10))
+    {
+      /* Leizhou Chinese; Han (Traditional variant); Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+	HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+	HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+	tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "uh-hans", 7))
+    {
+      /* Leizhou Chinese; Han (Simplified variant) */
+      tags[0] = HB_TAG('Z','H','S',' ');  /* Chinese, Simplified */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "uh-hant", 7))
+    {
+      /* Leizhou Chinese; Han (Traditional variant) */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     if (lang_matches (&lang_str[1], limit, "zh-hans", 7))
     {
       /* Literary Chinese; Han (Simplified variant) */
@@ -2523,6 +2634,36 @@ out:
       *count = 1;
       return true;
     }
+    if (0 == strncmp (&lang_str[1], "uh-", 3)
+	&& subtag_matches (lang_str, limit, "-hk", 3))
+    {
+      /* Leizhou Chinese; Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "uh-", 3)
+	&& subtag_matches (lang_str, limit, "-mo", 3))
+    {
+      /* Leizhou Chinese; Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+	HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+	HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+	tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "uh-", 3)
+	&& subtag_matches (lang_str, limit, "-tw", 3))
+    {
+      /* Leizhou Chinese; Taiwan, Province of China */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
     break;
   case 'm':
     if (lang_matches (&lang_str[1], limit, "np-hant-hk", 10))
@@ -2694,6 +2835,72 @@ out:
       return true;
     }
     break;
+  case 's':
+    if (lang_matches (&lang_str[1], limit, "jc-hant-hk", 10))
+    {
+      /* Shaojiang Chinese; Han (Traditional variant); Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "jc-hant-mo", 10))
+    {
+      /* Shaojiang Chinese; Han (Traditional variant); Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+	HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+	HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+	tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "jc-hans", 7))
+    {
+      /* Shaojiang Chinese; Han (Simplified variant) */
+      tags[0] = HB_TAG('Z','H','S',' ');  /* Chinese, Simplified */
+      *count = 1;
+      return true;
+    }
+    if (lang_matches (&lang_str[1], limit, "jc-hant", 7))
+    {
+      /* Shaojiang Chinese; Han (Traditional variant) */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "jc-", 3)
+	&& subtag_matches (lang_str, limit, "-hk", 3))
+    {
+      /* Shaojiang Chinese; Hong Kong */
+      tags[0] = HB_TAG('Z','H','H',' ');  /* Chinese, Traditional, Hong Kong SAR */
+      *count = 1;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "jc-", 3)
+	&& subtag_matches (lang_str, limit, "-mo", 3))
+    {
+      /* Shaojiang Chinese; Macao */
+      unsigned int i;
+      hb_tag_t possible_tags[] = {
+	HB_TAG('Z','H','T','M'),  /* Chinese, Traditional, Macao SAR */
+	HB_TAG('Z','H','H',' '),  /* Chinese, Traditional, Hong Kong SAR */
+      };
+      for (i = 0; i < 2 && i < *count; i++)
+	tags[i] = possible_tags[i];
+      *count = i;
+      return true;
+    }
+    if (0 == strncmp (&lang_str[1], "jc-", 3)
+	&& subtag_matches (lang_str, limit, "-tw", 3))
+    {
+      /* Shaojiang Chinese; Taiwan, Province of China */
+      tags[0] = HB_TAG('Z','H','T',' ');  /* Chinese, Traditional */
+      *count = 1;
+      return true;
+    }
+    break;
   case 'w':
     if (lang_matches (&lang_str[1], limit, "uu-hant-hk", 10))
     {
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh b/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh
index efbbfb25..8eec5195 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-var-common.hh
@@ -231,9 +231,9 @@ struct tuple_delta_t
   /* indices_length = point_count, indice[i] = 1 means point i is referenced */
   hb_vector_t<bool> indices;
 
-  hb_vector_t<double> deltas_x;
+  hb_vector_t<float> deltas_x;
   /* empty for cvar tuples */
-  hb_vector_t<double> deltas_y;
+  hb_vector_t<float> deltas_y;
 
   /* compiled data: header and deltas
    * compiled point data is saved in a hashmap within tuple_variations_t cause
@@ -299,9 +299,9 @@ struct tuple_delta_t
     return *this;
   }
 
-  tuple_delta_t& operator *= (double scalar)
+  tuple_delta_t& operator *= (float scalar)
   {
-    if (scalar == 1.0)
+    if (scalar == 1.0f)
       return *this;
 
     unsigned num = indices.length;
@@ -514,9 +514,9 @@ struct tuple_delta_t
   bool compile_deltas ()
   { return compile_deltas (indices, deltas_x, deltas_y, compiled_deltas); }
 
-  static bool compile_deltas (const hb_vector_t<bool> &point_indices,
-			      const hb_vector_t<double> &x_deltas,
-			      const hb_vector_t<double> &y_deltas,
+  static bool compile_deltas (hb_array_t<const bool> point_indices,
+			      hb_array_t<const float> x_deltas,
+			      hb_array_t<const float> y_deltas,
 			      hb_vector_t<unsigned char> &compiled_deltas /* OUT */)
   {
     hb_vector_t<int> rounded_deltas;
@@ -629,11 +629,11 @@ struct tuple_delta_t
           deltas_x.arrayZ[i] = infer_delta ((double) orig_points.arrayZ[i].x,
                                             (double) orig_points.arrayZ[prev].x,
                                             (double) orig_points.arrayZ[next].x,
-                                            deltas_x.arrayZ[prev], deltas_x.arrayZ[next]);
+                                            (double) deltas_x.arrayZ[prev], (double) deltas_x.arrayZ[next]);
           deltas_y.arrayZ[i] = infer_delta ((double) orig_points.arrayZ[i].y,
                                             (double) orig_points.arrayZ[prev].y,
                                             (double) orig_points.arrayZ[next].y,
-                                            deltas_y.arrayZ[prev], deltas_y.arrayZ[next]);
+                                            (double) deltas_y.arrayZ[prev], (double) deltas_y.arrayZ[next]);
           inferred_idxes.add (i);
           if (--unref_count == 0) goto no_more_gaps;
         }
@@ -692,7 +692,7 @@ struct tuple_delta_t
 
     if (ref_count == count) return true;
 
-    hb_vector_t<double> opt_deltas_x, opt_deltas_y;
+    hb_vector_t<float> opt_deltas_x, opt_deltas_y;
     bool is_comp_glyph_wo_deltas = (is_composite && ref_count == 0);
     if (is_comp_glyph_wo_deltas)
     {
@@ -841,6 +841,7 @@ struct tuple_delta_t
   { return (i >= end) ? start : (i + 1); }
 };
 
+template <typename OffType = HBUINT16>
 struct TupleVariationData
 {
   bool sanitize (hb_sanitize_context_t *c) const
@@ -875,7 +876,7 @@ struct TupleVariationData
 
     private:
     /* referenced point set->compiled point data map */
-    hb_hashmap_t<const hb_vector_t<bool>*, hb_vector_t<char>> point_data_map;
+    hb_hashmap_t<const hb_vector_t<bool>*, hb_vector_t<unsigned char>> point_data_map;
     /* referenced point set-> count map, used in finding shared points */
     hb_hashmap_t<const hb_vector_t<bool>*, unsigned> point_set_count_map;
 
@@ -883,11 +884,11 @@ struct TupleVariationData
      * shared_points_bytes is a pointer to some value in the point_data_map,
      * which will be freed during map destruction. Save it for serialization, so
      * no need to do find_shared_points () again */
-    hb_vector_t<char> *shared_points_bytes = nullptr;
+    hb_vector_t<unsigned char> *shared_points_bytes = nullptr;
 
-    /* total compiled byte size as TupleVariationData format, initialized to its
-     * min_size: 4 */
-    unsigned compiled_byte_size = 4;
+    /* total compiled byte size as TupleVariationData format, initialized to 0 */
+    unsigned compiled_byte_size = 0;
+    bool needs_padding = false;
 
     /* for gvar iup delta optimization: whether this is a composite glyph */
     bool is_composite = false;
@@ -1219,12 +1220,21 @@ struct TupleVariationData
     bool compile_bytes (const hb_map_t& axes_index_map,
                         const hb_map_t& axes_old_index_tag_map,
                         bool use_shared_points,
+                        bool is_gvar = false,
                         const hb_hashmap_t<const hb_vector_t<char>*, unsigned>* shared_tuples_idx_map = nullptr)
     {
+      // return true for empty glyph
+      if (!tuple_vars)
+        return true;
+
       // compile points set and store data in hashmap
       if (!compile_all_point_sets ())
         return false;
 
+      /* total compiled byte size as TupleVariationData format, initialized to its
+       * min_size: 4 */
+      compiled_byte_size += 4;
+
       if (use_shared_points)
       {
         find_shared_points ();
@@ -1235,7 +1245,7 @@ struct TupleVariationData
       for (auto& tuple: tuple_vars)
       {
         const hb_vector_t<bool>* points_set = &(tuple.indices);
-        hb_vector_t<char> *points_data;
+        hb_vector_t<unsigned char> *points_data;
         if (unlikely (!point_data_map.has (points_set, &points_data)))
           return false;
 
@@ -1253,6 +1263,13 @@ struct TupleVariationData
           return false;
         compiled_byte_size += tuple.compiled_tuple_header.length + points_data_length + tuple.compiled_deltas.length;
       }
+
+      if (is_gvar && (compiled_byte_size % 2))
+      {
+        needs_padding = true;
+        compiled_byte_size += 1;
+      }
+
       return true;
     }
 
@@ -1273,20 +1290,20 @@ struct TupleVariationData
       TRACE_SERIALIZE (this);
       if (is_gvar && shared_points_bytes)
       {
-        hb_bytes_t s (shared_points_bytes->arrayZ, shared_points_bytes->length);
+        hb_ubytes_t s (shared_points_bytes->arrayZ, shared_points_bytes->length);
         s.copy (c);
       }
 
       for (const auto& tuple: tuple_vars)
       {
         const hb_vector_t<bool>* points_set = &(tuple.indices);
-        hb_vector_t<char> *point_data;
+        hb_vector_t<unsigned char> *point_data;
         if (!point_data_map.has (points_set, &point_data))
           return_trace (false);
 
         if (!is_gvar || point_data != shared_points_bytes)
         {
-          hb_bytes_t s (point_data->arrayZ, point_data->length);
+          hb_ubytes_t s (point_data->arrayZ, point_data->length);
           s.copy (c);
         }
 
@@ -1295,7 +1312,7 @@ struct TupleVariationData
       }
 
       /* padding for gvar */
-      if (is_gvar && (compiled_byte_size % 2))
+      if (is_gvar && needs_padding)
       {
         HBUINT8 pad;
         pad = 0;
@@ -1505,15 +1522,16 @@ struct TupleVariationData
                                  * low 12 bits are the number of tuple variation tables
                                  * for this glyph. The number of tuple variation tables
                                  * can be any number between 1 and 4095. */
-  Offset16To<HBUINT8>
+  OffsetTo<HBUINT8, OffType>
                 data;           /* Offset from the start of the base table
                                  * to the serialized data. */
   /* TupleVariationHeader tupleVariationHeaders[] *//* Array of tuple variation headers. */
   public:
-  DEFINE_SIZE_MIN (4);
+  DEFINE_SIZE_MIN (2 + OffType::static_size);
 };
 
-using tuple_variations_t = TupleVariationData::tuple_variations_t;
+// TODO: Move tuple_variations_t to outside of TupleVariationData
+using tuple_variations_t = TupleVariationData<HBUINT16>::tuple_variations_t;
 struct item_variations_t
 {
   using region_t = const hb_hashmap_t<hb_tag_t, Triple>*;
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh
index 3931382f..f8ae0c80 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-var-cvar-table.hh
@@ -50,7 +50,7 @@ struct cvar
 		  tupleVariationData.sanitize (c));
   }
 
-  const TupleVariationData* get_tuple_var_data (void) const
+  const TupleVariationData<>* get_tuple_var_data (void) const
   { return &tupleVariationData; }
 
   bool decompile_tuple_variations (unsigned axis_count,
@@ -58,12 +58,12 @@ struct cvar
                                    hb_blob_t *blob,
                                    bool is_gvar,
                                    const hb_map_t *axes_old_index_tag_map,
-                                   TupleVariationData::tuple_variations_t& tuple_variations /* OUT */) const
+                                   TupleVariationData<>::tuple_variations_t& tuple_variations /* OUT */) const
   {
     hb_vector_t<unsigned> shared_indices;
-    TupleVariationData::tuple_iterator_t iterator;
+    TupleVariationData<>::tuple_iterator_t iterator;
     hb_bytes_t var_data_bytes = blob->as_bytes ().sub_array (4);
-    if (!TupleVariationData::get_tuple_iterator (var_data_bytes, axis_count, this,
+    if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, this,
                                                  shared_indices, &iterator))
       return false;
     
@@ -77,16 +77,16 @@ struct cvar
   static bool calculate_cvt_deltas (unsigned axis_count,
                                     hb_array_t<int> coords,
                                     unsigned num_cvt_item,
-                                    const TupleVariationData *tuple_var_data,
+                                    const TupleVariationData<> *tuple_var_data,
                                     const void *base,
                                     hb_vector_t<float>& cvt_deltas /* OUT */)
   {
     if (!coords) return true;
     hb_vector_t<unsigned> shared_indices;
-    TupleVariationData::tuple_iterator_t iterator;
+    TupleVariationData<>::tuple_iterator_t iterator;
     unsigned var_data_length = tuple_var_data->get_size (axis_count);
     hb_bytes_t var_data_bytes = hb_bytes_t (reinterpret_cast<const char*> (tuple_var_data), var_data_length);
-    if (!TupleVariationData::get_tuple_iterator (var_data_bytes, axis_count, base,
+    if (!TupleVariationData<>::get_tuple_iterator (var_data_bytes, axis_count, base,
                                                  shared_indices, &iterator))
       return true; /* isn't applied at all */
 
@@ -107,14 +107,14 @@ struct cvar
 
       bool has_private_points = iterator.current_tuple->has_private_points ();
       if (has_private_points &&
-          !TupleVariationData::decompile_points (p, private_indices, end))
+          !TupleVariationData<>::decompile_points (p, private_indices, end))
         return false;
       const hb_vector_t<unsigned int> &indices = has_private_points ? private_indices : shared_indices;
 
       bool apply_to_all = (indices.length == 0);
       unsigned num_deltas = apply_to_all ? num_cvt_item : indices.length;
       if (unlikely (!unpacked_deltas.resize (num_deltas, false))) return false;
-      if (unlikely (!TupleVariationData::decompile_deltas (p, unpacked_deltas, end))) return false;
+      if (unlikely (!TupleVariationData<>::decompile_deltas (p, unpacked_deltas, end))) return false;
 
       for (unsigned int i = 0; i < num_deltas; i++)
       {
@@ -129,7 +129,7 @@ struct cvar
   }
   
   bool serialize (hb_serialize_context_t *c,
-                  TupleVariationData::tuple_variations_t& tuple_variations) const
+                  TupleVariationData<>::tuple_variations_t& tuple_variations) const
   {
     TRACE_SERIALIZE (this);
     if (!tuple_variations) return_trace (false);
@@ -144,7 +144,7 @@ struct cvar
     if (c->plan->all_axes_pinned)
       return_trace (false);
 
-    OT::TupleVariationData::tuple_variations_t tuple_variations;
+    OT::TupleVariationData<>::tuple_variations_t tuple_variations;
     unsigned axis_count = c->plan->axes_old_index_tag_map.get_population ();
 
     const hb_tag_t cvt = HB_TAG('c','v','t',' ');
@@ -169,7 +169,7 @@ struct cvar
   }
 
   static bool add_cvt_and_apply_deltas (hb_subset_plan_t *plan,
-                                        const TupleVariationData *tuple_var_data,
+                                        const TupleVariationData<> *tuple_var_data,
                                         const void *base)
   {
     const hb_tag_t cvt = HB_TAG('c','v','t',' ');
@@ -209,7 +209,7 @@ struct cvar
   protected:
   FixedVersion<>version;		/* Version of the CVT variation table
 					 * initially set to 0x00010000u */
-  TupleVariationData tupleVariationData; /* TupleVariationDate for cvar table */
+  TupleVariationData<> tupleVariationData; /* TupleVariationDate for cvar table */
   public:
   DEFINE_SIZE_MIN (8);
 };
diff --git a/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh b/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh
index b021a00f..b388c714 100644
--- a/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-ot-var-gvar-table.hh
@@ -28,6 +28,7 @@
 #ifndef HB_OT_VAR_GVAR_TABLE_HH
 #define HB_OT_VAR_GVAR_TABLE_HH
 
+#include "hb-decycler.hh"
 #include "hb-open-type.hh"
 #include "hb-ot-var-common.hh"
 
@@ -36,15 +37,37 @@
  * https://docs.microsoft.com/en-us/typography/opentype/spec/gvar
  */
 #define HB_OT_TAG_gvar HB_TAG('g','v','a','r')
+#define HB_OT_TAG_GVAR HB_TAG('G','V','A','R')
+
+struct hb_glyf_scratch_t
+{
+  // glyf
+  contour_point_vector_t all_points;
+  contour_point_vector_t comp_points;
+  hb_decycler_t decycler;
+
+  // gvar
+  contour_point_vector_t orig_points;
+  hb_vector_t<int> x_deltas;
+  hb_vector_t<int> y_deltas;
+  contour_point_vector_t deltas;
+  hb_vector_t<unsigned int> shared_indices;
+  hb_vector_t<unsigned int> private_indices;
+
+  // VARC
+  hb_vector_t<unsigned> axisIndices;
+  hb_vector_t<float> axisValues;
+};
 
 namespace OT {
 
-struct GlyphVariationData : TupleVariationData
-{};
-
+template <typename OffsetType>
 struct glyph_variations_t
 {
-  using tuple_variations_t = TupleVariationData::tuple_variations_t;
+  // TODO: Move tuple_variations_t to outside of TupleVariationData
+  using tuple_variations_t = typename TupleVariationData<OffsetType>::tuple_variations_t;
+  using GlyphVariationData = TupleVariationData<OffsetType>;
+
   hb_vector_t<tuple_variations_t> glyph_variations;
 
   hb_vector_t<char> compiled_shared_tuples;
@@ -72,7 +95,7 @@ struct glyph_variations_t
                                     const hb_subset_plan_t *plan,
                                     const hb_hashmap_t<hb_codepoint_t, hb_bytes_t>& new_gid_var_data_map)
   {
-    if (unlikely (!glyph_variations.alloc (plan->new_to_old_gid_list.length, true)))
+    if (unlikely (!glyph_variations.alloc_exact (plan->new_to_old_gid_list.length)))
       return false;
 
     auto it = hb_iter (plan->new_to_old_gid_list);
@@ -86,10 +109,11 @@ struct glyph_variations_t
       hb_bytes_t var_data = new_gid_var_data_map.get (new_gid);
 
       const GlyphVariationData* p = reinterpret_cast<const GlyphVariationData*> (var_data.arrayZ);
-      hb_vector_t<unsigned> shared_indices;
-      GlyphVariationData::tuple_iterator_t iterator;
+      typename GlyphVariationData::tuple_iterator_t iterator;
       tuple_variations_t tuple_vars;
 
+      hb_vector_t<unsigned> shared_indices;
+
       /* in case variation data is empty, push an empty struct into the vector,
        * keep the vector in sync with the new_to_old_gid_list */
       if (!var_data || ! p->has_data () || !all_contour_points->length ||
@@ -140,6 +164,7 @@ struct glyph_variations_t
     for (tuple_variations_t& vars: glyph_variations)
       if (!vars.compile_bytes (axes_index_map, axes_old_index_tag_map,
                                true, /* use shared points*/
+                               true,
                                &shared_tuples_idx_map))
         return false;
 
@@ -258,7 +283,7 @@ struct glyph_variations_t
     hb_codepoint_t last_gid = 0;
     unsigned idx = 0;
 
-    TupleVariationData* cur_glyph = c->start_embed<TupleVariationData> ();
+    GlyphVariationData* cur_glyph = c->start_embed<GlyphVariationData> ();
     if (!cur_glyph) return_trace (false);
     for (auto &_ : it)
     {
@@ -272,7 +297,7 @@ struct glyph_variations_t
 
       if (idx >= glyph_variations.length) return_trace (false);
       if (!cur_glyph->serialize (c, true, glyph_variations[idx])) return_trace (false);
-      TupleVariationData* next_glyph = c->start_embed<TupleVariationData> ();
+      GlyphVariationData* next_glyph = c->start_embed<GlyphVariationData> ();
       glyph_offset += (char *) next_glyph - (char *) cur_glyph;
 
       if (long_offset)
@@ -295,9 +320,14 @@ struct glyph_variations_t
   }
 };
 
-struct gvar
+template <typename GidOffsetType, unsigned TableTag>
+struct gvar_GVAR
 {
-  static constexpr hb_tag_t tableTag = HB_OT_TAG_gvar;
+  static constexpr hb_tag_t tableTag = TableTag;
+
+  using GlyphVariationData = TupleVariationData<GidOffsetType>;
+
+  bool has_data () const { return version.to_int () != 0; }
 
   bool sanitize_shallow (hb_sanitize_context_t *c) const
   {
@@ -316,7 +346,7 @@ struct gvar
   { return sanitize_shallow (c); }
 
   bool decompile_glyph_variations (hb_subset_context_t *c,
-                                   glyph_variations_t& glyph_vars /* OUT */) const
+                                   glyph_variations_t<GidOffsetType>& glyph_vars /* OUT */) const
   {
     hb_hashmap_t<hb_codepoint_t, hb_bytes_t> new_gid_var_data_map;
     auto it = hb_iter (c->plan->new_to_old_gid_list);
@@ -343,14 +373,14 @@ struct gvar
   template<typename Iterator,
            hb_requires (hb_is_iterator (Iterator))>
   bool serialize (hb_serialize_context_t *c,
-                  const glyph_variations_t& glyph_vars,
+                  const glyph_variations_t<GidOffsetType>& glyph_vars,
                   Iterator it,
                   unsigned axis_count,
                   unsigned num_glyphs,
                   bool force_long_offsets) const
   {
     TRACE_SERIALIZE (this);
-    gvar *out = c->allocate_min<gvar> ();
+    gvar_GVAR *out = c->allocate_min<gvar_GVAR> ();
     if (unlikely (!out)) return_trace (false);
 
     out->version.major = 1;
@@ -392,7 +422,7 @@ struct gvar
   bool instantiate (hb_subset_context_t *c) const
   {
     TRACE_SUBSET (this);
-    glyph_variations_t glyph_vars;
+    glyph_variations_t<GidOffsetType> glyph_vars;
     if (!decompile_glyph_variations (c, glyph_vars))
       return_trace (false);
 
@@ -422,7 +452,7 @@ struct gvar
 
     unsigned glyph_count = version.to_int () ? c->plan->source->get_num_glyphs () : 0;
 
-    gvar *out = c->serializer->allocate_min<gvar> ();
+    gvar_GVAR *out = c->serializer->allocate_min<gvar_GVAR> ();
     if (unlikely (!out)) return_trace (false);
 
     out->version.major = 1;
@@ -556,9 +586,11 @@ struct gvar
   public:
   struct accelerator_t
   {
+    bool has_data () const { return table->has_data (); }
+
     accelerator_t (hb_face_t *face)
     {
-      table = hb_sanitize_context_t ().reference_table<gvar> (face);
+      table = hb_sanitize_context_t ().reference_table<gvar_GVAR> (face);
       /* If sanitize failed, set glyphCount to 0. */
       glyphCount = table->version.to_int () ? face->get_num_glyphs () : 0;
 
@@ -626,35 +658,40 @@ struct gvar
     bool apply_deltas_to_points (hb_codepoint_t glyph,
 				 hb_array_t<const int> coords,
 				 const hb_array_t<contour_point_t> points,
+				 hb_glyf_scratch_t &scratch,
 				 bool phantom_only = false) const
     {
       if (unlikely (glyph >= glyphCount)) return true;
 
       hb_bytes_t var_data_bytes = table->get_glyph_var_data_bytes (table.get_blob (), glyphCount, glyph);
       if (!var_data_bytes.as<GlyphVariationData> ()->has_data ()) return true;
-      hb_vector_t<unsigned int> shared_indices;
-      GlyphVariationData::tuple_iterator_t iterator;
+
+      auto &shared_indices = scratch.shared_indices;
+      shared_indices.clear ();
+
+      typename GlyphVariationData::tuple_iterator_t iterator;
       if (!GlyphVariationData::get_tuple_iterator (var_data_bytes, table->axisCount,
 						   var_data_bytes.arrayZ,
 						   shared_indices, &iterator))
 	return true; /* so isn't applied at all */
 
       /* Save original points for inferred delta calculation */
-      contour_point_vector_t orig_points_vec; // Populated lazily
+      auto &orig_points_vec = scratch.orig_points;
+      orig_points_vec.clear (); // Populated lazily
       auto orig_points = orig_points_vec.as_array ();
 
       /* flag is used to indicate referenced point */
-      contour_point_vector_t deltas_vec; // Populated lazily
+      auto &deltas_vec = scratch.deltas;
+      deltas_vec.clear (); // Populated lazily
       auto deltas = deltas_vec.as_array ();
 
-      hb_vector_t<unsigned> end_points; // Populated lazily
-
       unsigned num_coords = table->axisCount;
       hb_array_t<const F2DOT14> shared_tuples = (table+table->sharedTuples).as_array (table->sharedTupleCount * num_coords);
 
-      hb_vector_t<unsigned int> private_indices;
-      hb_vector_t<int> x_deltas;
-      hb_vector_t<int> y_deltas;
+      auto &private_indices = scratch.private_indices;
+      auto &x_deltas = scratch.x_deltas;
+      auto &y_deltas = scratch.y_deltas;
+
       unsigned count = points.length;
       bool flush = false;
       do
@@ -725,8 +762,8 @@ struct gvar
 	    if (phantom_only && pt_index < count - 4) continue;
 	    auto &delta = deltas.arrayZ[pt_index];
 	    delta.flag = 1;	/* this point is referenced, i.e., explicit deltas specified */
-	    delta.x += x_deltas.arrayZ[i] * scalar;
-	    delta.y += y_deltas.arrayZ[i] * scalar;
+	    delta.add_delta (x_deltas.arrayZ[i] * scalar,
+			     y_deltas.arrayZ[i] * scalar);
 	  }
 	}
 	else
@@ -737,10 +774,9 @@ struct gvar
 	    if (apply_to_all)
 	      for (unsigned int i = phantom_only ? count - 4 : 0; i < count; i++)
 	      {
-		unsigned int pt_index = i;
-		auto &delta = deltas.arrayZ[pt_index];
-		delta.x += x_deltas.arrayZ[i] * scalar;
-		delta.y += y_deltas.arrayZ[i] * scalar;
+		auto &delta = deltas.arrayZ[i];
+		delta.add_delta (x_deltas.arrayZ[i] * scalar,
+				 y_deltas.arrayZ[i] * scalar);
 	      }
 	    else
 	      for (unsigned int i = 0; i < num_deltas; i++)
@@ -750,8 +786,8 @@ struct gvar
 		if (phantom_only && pt_index < count - 4) continue;
 		auto &delta = deltas.arrayZ[pt_index];
 		delta.flag = 1;	/* this point is referenced, i.e., explicit deltas specified */
-		delta.x += x_deltas.arrayZ[i] * scalar;
-		delta.y += y_deltas.arrayZ[i] * scalar;
+		delta.add_delta (x_deltas.arrayZ[i] * scalar,
+				 y_deltas.arrayZ[i] * scalar);
 	      }
 	  }
 	  else
@@ -759,10 +795,9 @@ struct gvar
 	    if (apply_to_all)
 	      for (unsigned int i = phantom_only ? count - 4 : 0; i < count; i++)
 	      {
-		unsigned int pt_index = i;
-		auto &delta = deltas.arrayZ[pt_index];
-		delta.x += x_deltas.arrayZ[i];
-		delta.y += y_deltas.arrayZ[i];
+		auto &delta = deltas.arrayZ[i];
+		delta.add_delta (x_deltas.arrayZ[i],
+				 y_deltas.arrayZ[i]);
 	      }
 	    else
 	      for (unsigned int i = 0; i < num_deltas; i++)
@@ -772,8 +807,8 @@ struct gvar
 		if (phantom_only && pt_index < count - 4) continue;
 		auto &delta = deltas.arrayZ[pt_index];
 		delta.flag = 1;	/* this point is referenced, i.e., explicit deltas specified */
-		delta.x += x_deltas.arrayZ[i];
-		delta.y += y_deltas.arrayZ[i];
+		delta.add_delta (x_deltas.arrayZ[i],
+				 y_deltas.arrayZ[i]);
 	      }
 	  }
 	}
@@ -781,17 +816,14 @@ struct gvar
 	/* infer deltas for unreferenced points */
 	if (!apply_to_all && !phantom_only)
 	{
-	  if (!end_points)
-	  {
-	    for (unsigned i = 0; i < count; ++i)
-	      if (points.arrayZ[i].is_end_point)
-		end_points.push (i);
-	    if (unlikely (end_points.in_error ())) return false;
-	  }
-
 	  unsigned start_point = 0;
-	  for (unsigned end_point : end_points)
+	  unsigned end_point = 0;
+	  while (true)
 	  {
+	    while (end_point < count && !points.arrayZ[end_point].is_end_point)
+	      end_point++;
+	    if (unlikely (end_point == count)) break;
+
 	    /* Check the number of unreferenced points in a contour. If no unref points or no ref points, nothing to do. */
 	    unsigned unref_count = 0;
 	    for (unsigned i = start_point; i < end_point + 1; i++)
@@ -834,7 +866,7 @@ struct gvar
 	      }
 	    }
 	  no_more_gaps:
-	    start_point = end_point + 1;
+	    start_point = end_point = end_point + 1;
 	  }
 	}
 
@@ -854,7 +886,7 @@ struct gvar
     unsigned int get_axis_count () const { return table->axisCount; }
 
     private:
-    hb_blob_ptr_t<gvar> table;
+    hb_blob_ptr_t<gvar_GVAR> table;
     unsigned glyphCount;
     hb_vector_t<hb_pair_t<int, int>> shared_tuple_active_idx;
   };
@@ -872,7 +904,7 @@ struct gvar
   NNOffset32To<UnsizedArrayOf<F2DOT14>>
 		sharedTuples;	/* Offset from the start of this table to the shared tuple records.
 				 * Array of tuple records shared across all glyph variation data tables. */
-  HBUINT16	glyphCountX;	/* The number of glyphs in this font. This must match the number of
+  GidOffsetType	glyphCountX;	/* The number of glyphs in this font. This must match the number of
 				 * glyphs stored elsewhere in the font. */
   HBUINT16	flags;		/* Bit-field that gives the format of the offset array that follows.
 				 * If bit 0 is clear, the offsets are uint16; if bit 0 is set, the
@@ -887,9 +919,15 @@ struct gvar
   DEFINE_SIZE_ARRAY (20, offsetZ);
 };
 
+using gvar = gvar_GVAR<HBUINT16, HB_OT_TAG_gvar>;
+using GVAR = gvar_GVAR<HBUINT24, HB_OT_TAG_GVAR>;
+
 struct gvar_accelerator_t : gvar::accelerator_t {
   gvar_accelerator_t (hb_face_t *face) : gvar::accelerator_t (face) {}
 };
+struct GVAR_accelerator_t : GVAR::accelerator_t {
+  GVAR_accelerator_t (hb_face_t *face) : GVAR::accelerator_t (face) {}
+};
 
 } /* namespace OT */
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-paint.h b/engine/thirdparty/harfbuzz/src/hb-paint.h
index b0cd384e..d8896a52 100644
--- a/engine/thirdparty/harfbuzz/src/hb-paint.h
+++ b/engine/thirdparty/harfbuzz/src/hb-paint.h
@@ -146,7 +146,7 @@ typedef void (*hb_paint_pop_transform_func_t) (hb_paint_funcs_t *funcs,
  *
  * A virtual method for the #hb_paint_funcs_t to render a color glyph by glyph index.
  *
- * Return value: %true if the glyph was painted, %false otherwise.
+ * Return value: `true` if the glyph was painted, `false` otherwise.
  *
  * Since: 8.2.0
  */
diff --git a/engine/thirdparty/harfbuzz/src/hb-sanitize.hh b/engine/thirdparty/harfbuzz/src/hb-sanitize.hh
index 408649c7..199165a1 100644
--- a/engine/thirdparty/harfbuzz/src/hb-sanitize.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-sanitize.hh
@@ -72,8 +72,8 @@
  *
  * === The sanitize() contract ===
  *
- * The sanitize() method of each object type shall return true if it's safe to
- * call other methods of the object, and %false otherwise.
+ * The sanitize() method of each object type shall return `true` if it's safe to
+ * call other methods of the object, and `false` otherwise.
  *
  * Note that what sanitize() checks for might align with what the specification
  * describes as valid table data, but does not have to be.  In particular, we
diff --git a/engine/thirdparty/harfbuzz/src/hb-serialize.hh b/engine/thirdparty/harfbuzz/src/hb-serialize.hh
index e988451e..63ab1858 100644
--- a/engine/thirdparty/harfbuzz/src/hb-serialize.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-serialize.hh
@@ -36,9 +36,7 @@
 #include "hb-map.hh"
 #include "hb-pool.hh"
 
-#ifdef HB_EXPERIMENTAL_API
-#include "hb-subset-repacker.h"
-#endif
+#include "hb-subset-serialize.h"
 
 /*
  * Serialize
@@ -75,21 +73,19 @@ struct hb_serialize_context_t
 
     object_t () = default;
 
-#ifdef HB_EXPERIMENTAL_API
-    object_t (const hb_object_t &o)
+    object_t (const hb_subset_serialize_object_t &o)
     {
       head = o.head;
       tail = o.tail;
       next = nullptr;
-      real_links.alloc (o.num_real_links, true);
+      real_links.alloc_exact (o.num_real_links);
       for (unsigned i = 0 ; i < o.num_real_links; i++)
         real_links.push (o.real_links[i]);
 
-      virtual_links.alloc (o.num_virtual_links, true);
+      virtual_links.alloc_exact (o.num_virtual_links);
       for (unsigned i = 0; i < o.num_virtual_links; i++)
         virtual_links.push (o.virtual_links[i]);
     }
-#endif
 
     bool add_virtual_link (objidx_t objidx)
     {
@@ -148,8 +144,7 @@ struct hb_serialize_context_t
 
       link_t () = default;
 
-#ifdef HB_EXPERIMENTAL_API
-      link_t (const hb_link_t &o)
+      link_t (const hb_subset_serialize_link_t &o)
       {
         width = o.width;
         is_signed = 0;
@@ -158,7 +153,6 @@ struct hb_serialize_context_t
         bias = 0;
         objidx = o.objidx;
       }
-#endif
 
       HB_INTERNAL static int cmp (const void* a, const void* b)
       {
@@ -178,7 +172,7 @@ struct hb_serialize_context_t
     auto all_links () const HB_AUTO_RETURN
         (( hb_concat (real_links, virtual_links) ));
     auto all_links_writer () HB_AUTO_RETURN
-        (( hb_concat (real_links.writer (), virtual_links.writer ()) ));           
+        (( hb_concat (real_links.writer (), virtual_links.writer ()) ));
   };
 
   struct snapshot_t
@@ -400,6 +394,7 @@ struct hb_serialize_context_t
       {
         merge_virtual_links (obj, objidx);
 	obj->fini ();
+        object_pool.release (obj);
 	return objidx;
       }
     }
@@ -463,9 +458,11 @@ struct hb_serialize_context_t
     while (packed.length > 1 &&
 	   packed.tail ()->head < tail)
     {
-      packed_map.del (packed.tail ());
-      assert (!packed.tail ()->next);
-      packed.tail ()->fini ();
+      object_t *obj = packed.tail ();
+      packed_map.del (obj);
+      assert (!obj->next);
+      obj->fini ();
+      object_pool.release (obj);
       packed.pop ();
     }
     if (packed.length > 1)
diff --git a/engine/thirdparty/harfbuzz/src/hb-set-digest.hh b/engine/thirdparty/harfbuzz/src/hb-set-digest.hh
index b718b94e..0d05e72c 100644
--- a/engine/thirdparty/harfbuzz/src/hb-set-digest.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-set-digest.hh
@@ -56,7 +56,7 @@
  *   - For each glyph, if it doesn't match the subtable digest,
  *     skip it.
  *
- * The main filter we use is a combination of three bits-pattern
+ * The main filter we use is a combination of four bits-pattern
  * filters. A bits-pattern filter checks a number of bits (5 or 6)
  * of the input number (glyph-id in this case) and checks whether
  * its pattern is amongst the patterns of any of the accepted values.
@@ -64,45 +64,60 @@
  * check is done using four bitwise operations only.
  */
 
-template <typename mask_t, unsigned int shift>
-struct hb_set_digest_bits_pattern_t
+static constexpr unsigned hb_set_digest_shifts[] = {4, 0, 6};
+
+struct hb_set_digest_t
 {
+  // No science in these. Intuition and testing only.
+  using mask_t = uint64_t;
+
+  static constexpr unsigned n = ARRAY_LENGTH_CONST (hb_set_digest_shifts);
   static constexpr unsigned mask_bytes = sizeof (mask_t);
   static constexpr unsigned mask_bits = sizeof (mask_t) * 8;
-  static constexpr unsigned num_bits = 0
-				     + (mask_bytes >= 1 ? 3 : 0)
-				     + (mask_bytes >= 2 ? 1 : 0)
-				     + (mask_bytes >= 4 ? 1 : 0)
-				     + (mask_bytes >= 8 ? 1 : 0)
-				     + (mask_bytes >= 16? 1 : 0)
-				     + 0;
+  static constexpr hb_codepoint_t mb1 = mask_bits - 1;
+  static constexpr mask_t one = 1;
+  static constexpr mask_t all = (mask_t) -1;
 
-  static_assert ((shift < sizeof (hb_codepoint_t) * 8), "");
-  static_assert ((shift + num_bits <= sizeof (hb_codepoint_t) * 8), "");
+  void init ()
+  { for (unsigned i = 0; i < n; i++) masks[i] = 0; }
 
-  void init () { mask = 0; }
+  void clear () { init (); }
 
-  static hb_set_digest_bits_pattern_t full () { hb_set_digest_bits_pattern_t d; d.mask = (mask_t) -1; return d; }
+  static hb_set_digest_t full ()
+  {
+    hb_set_digest_t d;
+    for (unsigned i = 0; i < n; i++) d.masks[i] = all;
+    return d;
+  }
 
-  void union_ (const hb_set_digest_bits_pattern_t &o) { mask |= o.mask; }
-
-  void add (hb_codepoint_t g) { mask |= mask_for (g); }
+  void union_ (const hb_set_digest_t &o)
+  { for (unsigned i = 0; i < n; i++) masks[i] |= o.masks[i]; }
 
   bool add_range (hb_codepoint_t a, hb_codepoint_t b)
   {
-    if (mask == (mask_t) -1) return false;
-    if ((b >> shift) - (a >> shift) >= mask_bits - 1)
+    bool ret;
+
+    ret = false;
+    for (unsigned i = 0; i < n; i++)
+      if (masks[i] != all)
+	ret = true;
+    if (!ret) return false;
+
+    ret = false;
+    for (unsigned i = 0; i < n; i++)
     {
-      mask = (mask_t) -1;
-      return false;
-    }
-    else
-    {
-      mask_t ma = mask_for (a);
-      mask_t mb = mask_for (b);
-      mask |= mb + (mb - ma) - (mb < ma);
-      return true;
+      mask_t shift = hb_set_digest_shifts[i];
+      if ((b >> shift) - (a >> shift) >= mb1)
+	masks[i] = all;
+      else
+      {
+	mask_t ma = one << ((a >> shift) & mb1);
+	mask_t mb = one << ((b >> shift) & mb1);
+	masks[i] |= mb + (mb - ma) - (mb < ma);
+	ret = true;
+      }
     }
+    return ret;
   }
 
   template <typename T>
@@ -125,103 +140,37 @@ struct hb_set_digest_bits_pattern_t
   template <typename T>
   bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
 
-  bool may_have (const hb_set_digest_bits_pattern_t &o) const
-  { return mask & o.mask; }
-
-  bool may_have (hb_codepoint_t g) const
-  { return mask & mask_for (g); }
-
   bool operator [] (hb_codepoint_t g) const
   { return may_have (g); }
 
-  private:
-
-  static mask_t mask_for (hb_codepoint_t g)
-  { return ((mask_t) 1) << ((g >> shift) & (mask_bits - 1)); }
-  mask_t mask = 0;
-};
-
-template <typename head_t, typename tail_t>
-struct hb_set_digest_combiner_t
-{
-  void init ()
-  {
-    head.init ();
-    tail.init ();
-  }
-
-  static hb_set_digest_combiner_t full () { hb_set_digest_combiner_t d; d.head = head_t::full(); d.tail = tail_t::full (); return d; }
-
-  void union_ (const hb_set_digest_combiner_t &o)
-  {
-    head.union_ (o.head);
-    tail.union_(o.tail);
-  }
 
   void add (hb_codepoint_t g)
   {
-    head.add (g);
-    tail.add (g);
-  }
-
-  bool add_range (hb_codepoint_t a, hb_codepoint_t b)
-  {
-    return (int) head.add_range (a, b) | (int) tail.add_range (a, b);
-  }
-  template <typename T>
-  void add_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
-  {
-    head.add_array (array, count, stride);
-    tail.add_array (array, count, stride);
-  }
-  template <typename T>
-  void add_array (const hb_array_t<const T>& arr) { add_array (&arr, arr.len ()); }
-  template <typename T>
-  bool add_sorted_array (const T *array, unsigned int count, unsigned int stride=sizeof(T))
-  {
-    return head.add_sorted_array (array, count, stride) &&
-	   tail.add_sorted_array (array, count, stride);
-  }
-  template <typename T>
-  bool add_sorted_array (const hb_sorted_array_t<const T>& arr) { return add_sorted_array (&arr, arr.len ()); }
-
-  bool may_have (const hb_set_digest_combiner_t &o) const
-  {
-    return head.may_have (o.head) && tail.may_have (o.tail);
+    for (unsigned i = 0; i < n; i++)
+      masks[i] |= one << ((g >> hb_set_digest_shifts[i]) & mb1);
   }
 
+  HB_ALWAYS_INLINE
   bool may_have (hb_codepoint_t g) const
   {
-    return head.may_have (g) && tail.may_have (g);
+    for (unsigned i = 0; i < n; i++)
+      if (!(masks[i] & (one << ((g >> hb_set_digest_shifts[i]) & mb1))))
+	return false;
+    return true;
   }
 
-  bool operator [] (hb_codepoint_t g) const
-  { return may_have (g); }
+  bool may_intersect (const hb_set_digest_t &o) const
+  {
+    for (unsigned i = 0; i < n; i++)
+      if (!(masks[i] & o.masks[i]))
+	return false;
+    return true;
+  }
 
   private:
-  head_t head;
-  tail_t tail;
+
+  mask_t masks[n] = {};
 };
 
 
-/*
- * hb_set_digest_t
- *
- * This is a combination of digests that performs "best".
- * There is not much science to this: it's a result of intuition
- * and testing.
- */
-using hb_set_digest_t =
-  hb_set_digest_combiner_t
-  <
-    hb_set_digest_bits_pattern_t<unsigned long, 4>,
-    hb_set_digest_combiner_t
-    <
-      hb_set_digest_bits_pattern_t<unsigned long, 0>,
-      hb_set_digest_bits_pattern_t<unsigned long, 9>
-    >
-  >
-;
-
-
 #endif /* HB_SET_DIGEST_HH */
diff --git a/engine/thirdparty/harfbuzz/src/hb-set.hh b/engine/thirdparty/harfbuzz/src/hb-set.hh
index f6013a41..f098bd4c 100644
--- a/engine/thirdparty/harfbuzz/src/hb-set.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-set.hh
@@ -106,6 +106,7 @@ struct hb_sparseset_t
   void del_range (hb_codepoint_t a, hb_codepoint_t b) { s.del_range (a, b); }
 
   bool get (hb_codepoint_t g) const { return s.get (g); }
+  bool may_have (hb_codepoint_t g) const { return get (g); }
 
   /* Has interface. */
   bool operator [] (hb_codepoint_t k) const { return get (k); }
@@ -120,6 +121,9 @@ struct hb_sparseset_t
   hb_sparseset_t& operator << (const hb_codepoint_pair_t& range)
   { add_range (range.first, range.second); return *this; }
 
+  bool may_intersect (const hb_sparseset_t &other) const
+  { return s.may_intersect (other.s); }
+
   bool intersects (hb_codepoint_t first, hb_codepoint_t last) const
   { return s.intersects (first, last); }
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-shape-plan.cc b/engine/thirdparty/harfbuzz/src/hb-shape-plan.cc
index 312eeb65..47eb690a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-shape-plan.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-shape-plan.cc
@@ -209,7 +209,7 @@ hb_shape_plan_create (hb_face_t                     *face,
  * @num_coords: The number of variation-space coordinates
  * @shaper_list: (array zero-terminated=1): List of shapers to try
  *
- * The variable-font version of #hb_shape_plan_create. 
+ * The variable-font version of #hb_shape_plan_create.
  * Constructs a shaping plan for a combination of @face, @user_features, @props,
  * and @shaper_list, plus the variation-space coordinates @coords.
  *
@@ -233,7 +233,7 @@ hb_shape_plan_create2 (hb_face_t                     *face,
 		  num_coords,
 		  shaper_list);
 
-  if (unlikely (props->direction == HB_DIRECTION_INVALID))
+  if (unlikely (!HB_DIRECTION_IS_VALID (props->direction)))
     return hb_shape_plan_get_empty ();
 
   hb_shape_plan_t *shape_plan;
@@ -331,7 +331,7 @@ hb_shape_plan_destroy (hb_shape_plan_t *shape_plan)
  * @destroy: (nullable): A callback to call when @data is not needed anymore
  * @replace: Whether to replace an existing data with the same key
  *
- * Attaches a user-data key/data pair to the given shaping plan. 
+ * Attaches a user-data key/data pair to the given shaping plan.
  *
  * Return value: `true` if success, `false` otherwise.
  *
@@ -352,7 +352,7 @@ hb_shape_plan_set_user_data (hb_shape_plan_t    *shape_plan,
  * @shape_plan: A shaping plan
  * @key: The user-data key to query
  *
- * Fetches the user data associated with the specified key, 
+ * Fetches the user data associated with the specified key,
  * attached to the specified shaping plan.
  *
  * Return value: (transfer none): A pointer to the user data
@@ -501,7 +501,7 @@ hb_shape_plan_create_cached (hb_face_t                     *face,
  * @num_coords: The number of variation-space coordinates
  * @shaper_list: (array zero-terminated=1): List of shapers to try
  *
- * The variable-font version of #hb_shape_plan_create_cached. 
+ * The variable-font version of #hb_shape_plan_create_cached.
  * Creates a cached shaping plan suitable for reuse, for a combination
  * of @face, @user_features, @props, and @shaper_list, plus the
  * variation-space coordinates @coords.
diff --git a/engine/thirdparty/harfbuzz/src/hb-shape.h b/engine/thirdparty/harfbuzz/src/hb-shape.h
index d4d4fdfd..b09bf058 100644
--- a/engine/thirdparty/harfbuzz/src/hb-shape.h
+++ b/engine/thirdparty/harfbuzz/src/hb-shape.h
@@ -53,6 +53,7 @@ hb_shape_full (hb_font_t          *font,
 	       unsigned int        num_features,
 	       const char * const *shaper_list);
 
+#ifdef HB_EXPERIMENTAL_API
 HB_EXTERN hb_bool_t
 hb_shape_justify (hb_font_t          *font,
 		  hb_buffer_t        *buffer,
@@ -64,6 +65,7 @@ hb_shape_justify (hb_font_t          *font,
 		  float              *advance, /* IN/OUT */
 		  hb_tag_t           *var_tag, /* OUT */
 		  float              *var_value /* OUT */);
+#endif
 
 HB_EXTERN const char **
 hb_shape_list_shapers (void);
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh b/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh
index 4039f9c9..c3f7b40c 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-cff-common.hh
@@ -1128,7 +1128,7 @@ struct subr_subsetter_t
       if (opstr.op == OpCode_callsubr || opstr.op == OpCode_callgsubr)
         size += 3;
     }
-    if (!buff.alloc (buff.length + size, true))
+    if (!buff.alloc_exact (buff.length + size))
       return false;
 
     for (auto &opstr : str.values)
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-cff1.cc b/engine/thirdparty/harfbuzz/src/hb-subset-cff1.cc
index e9dd5d64..d080e0a2 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-cff1.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-cff1.cc
@@ -45,7 +45,7 @@ struct remap_sid_t
   void alloc (unsigned size)
   {
     map.alloc (size);
-    vector.alloc (size, true);
+    vector.alloc_exact (size);
   }
 
   bool in_error () const
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-input.cc b/engine/thirdparty/harfbuzz/src/hb-subset-input.cc
index b874949d..2f0b54f4 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-input.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-input.cc
@@ -534,7 +534,6 @@ hb_subset_input_pin_axis_location (hb_subset_input_t  *input,
  *
  * Note: input min value can not be bigger than input max value. If the input
  * default value is not within the new min/max range, it'll be clamped.
- * Note: currently it supports gvar and cvar tables only.
  *
  * Return value: `true` if success, `false` otherwise
  *
@@ -597,6 +596,144 @@ hb_subset_input_get_axis_range (hb_subset_input_t  *input,
   *axis_max_value = triple->maximum;
   return true;
 }
+
+/**
+ * hb_subset_axis_range_from_string:
+ * @str: a string to parse
+ * @len: length of @str, or -1 if str is NULL terminated
+ * @axis_min_value: (out): the axis min value to initialize with the parsed value
+ * @axis_max_value: (out): the axis max value to initialize with the parsed value
+ * @axis_def_value: (out): the axis default value to initialize with the parse
+ * value
+ *
+ * Parses a string into a subset axis range(min, def, max).
+ * Axis positions string is in the format of min:def:max or min:max
+ * When parsing axis positions, empty values as meaning the existing value for that part
+ * E.g: :300:500
+ * Specifies min = existing, def = 300, max = 500
+ * In the output axis_range, if a value should be set to it's default value,
+ * then it will be set to NaN
+ *
+ * Return value:
+ * `true` if @str is successfully parsed, `false` otherwise
+ *
+ * Since: 10.2.0
+ */
+HB_EXTERN hb_bool_t
+hb_subset_axis_range_from_string (const char *str, int len,
+                                  float *axis_min_value,
+                                  float *axis_max_value,
+                                  float *axis_def_value)
+{
+  if (len < 0)
+    len = strlen (str);
+
+  const char *end = str + len;
+  const char* part = strpbrk (str, ":");
+  if (!part)
+  {
+    // Single value.
+    if (strcmp (str, "drop") == 0)
+    {
+      *axis_min_value = NAN;
+      *axis_def_value = NAN;
+      *axis_max_value = NAN;
+      return true;
+    }
+
+    double v;
+    if (!hb_parse_double (&str, end, &v)) return false;
+
+    *axis_min_value = v;
+    *axis_def_value = v;
+    *axis_max_value = v;
+    return true;
+  }
+
+  float values[3];
+  int count = 0;
+  for (int i = 0; i < 3; i++) {
+    count++;
+    if (!*str || part == str)
+    {
+      values[i] = NAN;
+
+      if (part == NULL) break;
+      str = part + 1;
+      part = strpbrk (str, ":");
+      continue;
+    }
+
+    double v;
+    if (!hb_parse_double (&str, part, &v)) return false;
+    values[i] = v;
+
+    if (part == NULL) break;
+    str = part + 1;
+    part = strpbrk (str, ":");
+  }
+
+  if (count == 2)
+  {
+    *axis_min_value = values[0];
+    *axis_def_value = NAN;
+    *axis_max_value = values[1];
+    return true;
+  }
+  else if (count == 3)
+  {
+    *axis_min_value = values[0];
+    *axis_def_value = values[1];
+    *axis_max_value = values[2];
+    return true;
+  }
+  return false;
+}
+
+/**
+ * hb_subset_axis_range_to_string:
+ * @input: a #hb_subset_input_t object.
+ * @axis_tag: an axis to convert
+ * @buf: (array length=size) (out caller-allocates): output string
+ * @size: the allocated size of @buf
+ *
+ * Converts an axis range into a `NULL`-terminated string in the format
+ * understood by hb_subset_axis_range_from_string(). The client in responsible for
+ * allocating big enough size for @buf, 128 bytes is more than enough.
+ *
+ * Since: 10.2.0
+ */
+HB_EXTERN void
+hb_subset_axis_range_to_string (hb_subset_input_t *input,
+                                hb_tag_t axis_tag,
+                                char *buf, unsigned size)
+{
+  if (unlikely (!size)) return;
+  Triple* triple;
+  if (!input->axes_location.has(axis_tag, &triple)) {
+    return;
+  }
+
+  char s[128];
+  unsigned len = 0;
+
+  hb_locale_t clocale HB_UNUSED;
+  hb_locale_t oldlocale HB_UNUSED;
+  oldlocale = hb_uselocale (clocale = newlocale (LC_ALL_MASK, "C", NULL));
+  len += hb_max (0, snprintf (s, ARRAY_LENGTH (s) - len, "%g", (double) triple->minimum));
+  s[len++] = ':';
+
+  len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%g", (double) triple->middle));
+  s[len++] = ':';
+
+  len += hb_max (0, snprintf (s + len, ARRAY_LENGTH (s) - len, "%g", (double) triple->maximum));
+  (void) hb_uselocale (((void) freelocale (clocale), oldlocale));
+
+  assert (len < ARRAY_LENGTH (s));
+  len = hb_min (len, size - 1);
+  hb_memcpy (buf, s, len);
+  buf[len] = '\0';
+}
 #endif
 
 /**
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc b/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc
index 59020dbe..c88fd75a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-plan.cc
@@ -678,7 +678,8 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
                               hb_subset_plan_t *plan)
 {
   OT::cmap::accelerator_t cmap (plan->source);
-  unsigned size_threshold = plan->source->get_num_glyphs ();
+  unsigned size_threshold = plan->source->get_num_glyphs ();  
+
   if (glyphs->is_empty () && unicodes->get_population () < size_threshold)
   {
 
@@ -797,6 +798,21 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
     plan->unicodes.add_sorted_array (&arr.arrayZ->first, arr.length, sizeof (*arr.arrayZ));
     plan->_glyphset_gsub.add_array (&arr.arrayZ->second, arr.length, sizeof (*arr.arrayZ));
   }
+
+  // Variation selectors don't have glyphs associated with them in the cmap so they will have been filtered out above
+  // but should still be retained. Add them back here.
+
+  // However, the min and max codepoints for OS/2 should be calculated without considering variation selectors,
+  // so record those first.
+  plan->os2_info.min_cmap_codepoint = plan->unicodes.get_min();
+  plan->os2_info.max_cmap_codepoint = plan->unicodes.get_max();
+  
+  hb_set_t variation_selectors_to_retain;
+  cmap.collect_variation_selectors(&variation_selectors_to_retain);
+  + variation_selectors_to_retain.iter()
+  | hb_filter(unicodes)
+  | hb_sink(&plan->unicodes)
+  ;
 }
 
 static unsigned
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh b/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh
index 19a9fa69..214ea934 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-plan.hh
@@ -41,6 +41,13 @@ namespace OT {
 struct Feature;
 }
 
+struct os2_info_t {
+  hb_codepoint_t min_cmap_codepoint;
+  hb_codepoint_t max_cmap_codepoint;
+};
+
+typedef struct os2_info_t os2_info_t;
+
 struct head_maxp_info_t
 {
   head_maxp_info_t ()
@@ -88,7 +95,6 @@ struct contour_point_t
   HB_ALWAYS_INLINE
   void translate (const contour_point_t &p) { x += p.x; y += p.y; }
 
-
   float x;
   float y;
   uint8_t flag;
@@ -97,19 +103,9 @@ struct contour_point_t
 
 struct contour_point_vector_t : hb_vector_t<contour_point_t>
 {
-  void extend (const hb_array_t<contour_point_t> &a)
-  {
-    unsigned int old_len = length;
-    if (unlikely (!resize (old_len + a.length, false)))
-      return;
-    auto arrayZ = this->arrayZ + old_len;
-    unsigned count = a.length;
-    hb_memcpy (arrayZ, a.arrayZ, count * sizeof (arrayZ[0]));
-  }
-
-  bool add_deltas (const hb_vector_t<float> deltas_x,
-                   const hb_vector_t<float> deltas_y,
-                   const hb_vector_t<bool> indices)
+  bool add_deltas (hb_array_t<const float> deltas_x,
+                   hb_array_t<const float> deltas_y,
+                   hb_array_t<const bool> indices)
   {
     if (indices.length != deltas_x.length ||
         indices.length != deltas_y.length)
@@ -180,6 +176,8 @@ struct hb_subset_plan_t
   //recalculated head/maxp table info after instancing
   mutable head_maxp_info_t head_maxp_info;
 
+  os2_info_t os2_info;
+
   const hb_subset_accelerator_t* accelerator;
   hb_subset_accelerator_t* inprogress_accelerator;
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-repacker.h b/engine/thirdparty/harfbuzz/src/hb-subset-repacker.h
deleted file mode 100644
index 245cf607..00000000
--- a/engine/thirdparty/harfbuzz/src/hb-subset-repacker.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright © 2022  Google, Inc.
- *
- *  This is part of HarfBuzz, a text shaping library.
- *
- * Permission is hereby granted, without written agreement and without
- * license or royalty fees, to use, copy, modify, and distribute this
- * software and its documentation for any purpose, provided that the
- * above copyright notice and the following two paragraphs appear in
- * all copies of this software.
- *
- * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
- * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
- * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
- * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
- *
- */
-
-#ifndef HB_SUBSET_REPACKER_H
-#define HB_SUBSET_REPACKER_H
-
-#include "hb.h"
-
-HB_BEGIN_DECLS
-
-#ifdef HB_EXPERIMENTAL_API
-/*
- * struct hb_link_t
- * width:    offsetSize in bytes
- * position: position of the offset field in bytes
- * from beginning of subtable
- * objidx:   index of subtable
- */
-struct hb_link_t
-{
-  unsigned width;
-  unsigned position;
-  unsigned objidx;
-};
-
-typedef struct hb_link_t hb_link_t;
-
-/*
- * struct hb_object_t
- * head:    start of object data
- * tail:    end of object data
- * num_real_links:    num of offset field in the object
- * real_links:        pointer to array of offset info
- * num_virtual_links: num of objects that must be packed
- * after current object in the final serialized order
- * virtual_links:     array of virtual link info
- */
-struct hb_object_t
-{
-  char *head;
-  char *tail;
-  unsigned num_real_links;
-  hb_link_t *real_links;
-  unsigned num_virtual_links;
-  hb_link_t *virtual_links;
-};
-
-typedef struct hb_object_t hb_object_t;
-
-HB_EXTERN hb_blob_t*
-hb_subset_repack_or_fail (hb_tag_t table_tag,
-                          hb_object_t* hb_objects,
-                          unsigned num_hb_objs);
-
-#endif
-
-HB_END_DECLS
-
-#endif /* HB_SUBSET_REPACKER_H */
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-repacker.cc b/engine/thirdparty/harfbuzz/src/hb-subset-serialize.cc
similarity index 68%
rename from engine/thirdparty/harfbuzz/src/hb-subset-repacker.cc
rename to engine/thirdparty/harfbuzz/src/hb-subset-serialize.cc
index 6a29b35b..dc761365 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset-repacker.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-serialize.cc
@@ -22,37 +22,36 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  */
+
+#include "hb.hh"
+
+#include "hb-subset-serialize.h"
 #include "hb-repacker.hh"
 
-#ifdef HB_EXPERIMENTAL_API
-
 /**
- * hb_subset_repack_or_fail:
+ * hb_subset_serialize_or_fail:
  * @table_tag: tag of the table being packed, needed to allow table specific optimizations.
- * @hb_objects: raw array of struct hb_object_t, which provides
+ * @hb_objects: raw array of struct hb_subset_serialize_object_t, which provides
  * object graph info
- * @num_hb_objs: number of hb_object_t in the hb_objects array.
+ * @num_hb_objs: number of hb_subset_serialize_object_t in the hb_objects array.
  *
- * Given the input object graph info, repack a table to eliminate
- * offset overflows. A nullptr is returned if the repacking attempt fails.
+ * Given the input object graph info, repack a table to eliminate offset overflows and
+ * serialize it into a continuous array of bytes. A nullptr is returned if the serializing attempt fails.
  * Table specific optimizations (eg. extension promotion in GSUB/GPOS) may be performed.
  * Passing HB_TAG_NONE will disable table specific optimizations.
  *
- * XSince: EXPERIMENTAL
+ * Since: 10.2.0
  **/
-hb_blob_t* hb_subset_repack_or_fail (hb_tag_t table_tag,
-                                     hb_object_t* hb_objects,
-                                     unsigned num_hb_objs)
+HB_EXTERN hb_blob_t *
+hb_subset_serialize_or_fail (hb_tag_t                      table_tag,
+                             hb_subset_serialize_object_t *hb_objects,
+                             unsigned                      num_hb_objs)
 {
-  hb_vector_t<const hb_object_t *> packed;
+  hb_vector_t<const hb_subset_serialize_object_t *> packed;
   packed.alloc (num_hb_objs + 1);
   packed.push (nullptr);
   for (unsigned i = 0 ; i < num_hb_objs ; i++)
     packed.push (&(hb_objects[i]));
 
-  return hb_resolve_overflows (packed,
-                               table_tag,
-                               20,
-                               true);
+  return hb_resolve_overflows (packed, table_tag, 20, true);
 }
-#endif
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset-serialize.h b/engine/thirdparty/harfbuzz/src/hb-subset-serialize.h
new file mode 100644
index 00000000..9035d4ce
--- /dev/null
+++ b/engine/thirdparty/harfbuzz/src/hb-subset-serialize.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2022  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ */
+
+#ifndef HB_SUBSET_SERIALIZE_H
+#define HB_SUBSET_SERIALIZE_H
+
+#include "hb.h"
+
+HB_BEGIN_DECLS
+
+/**
+ * hb_subset_serialize_link_t:
+ * @width: offsetSize in bytes
+ * @position: position of the offset field in bytes from
+ *            beginning of subtable
+ * @objidx: index of subtable
+ *
+ * Represents a link between two objects in the object graph
+ * to be serialized.
+ *
+ * Since: 10.2.0
+ */
+typedef struct hb_subset_serialize_link_t {
+  unsigned int width;
+  unsigned int position;
+  unsigned int objidx;
+} hb_subset_serialize_link_t;
+
+/**
+ * hb_subset_serialize_object_t:
+ * @head: start of object data
+ * @tail: end of object data
+ * @num_real_links: number of offset field in the object
+ * @real_links: array of offset info
+ * @num_virtual_links: number of objects that must be packed
+ *                     after current object in the final
+ *                     serialized order
+ * @virtual_links: array of virtual link info
+ *
+ * Represents an object in the object graph to be serialized.
+ *
+ * Since: 10.2.0
+ */
+typedef struct hb_subset_serialize_object_t {
+  char *head;
+  char *tail;
+  unsigned int num_real_links;
+  hb_subset_serialize_link_t *real_links;
+  unsigned int num_virtual_links;
+  hb_subset_serialize_link_t *virtual_links;
+} hb_subset_serialize_object_t;
+
+HB_EXTERN hb_blob_t *
+hb_subset_serialize_or_fail (hb_tag_t                      table_tag,
+                             hb_subset_serialize_object_t *hb_objects,
+                             unsigned                      num_hb_objs);
+
+
+HB_END_DECLS
+
+#endif /* HB_SUBSET_SERIALIZE_H */
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset.cc b/engine/thirdparty/harfbuzz/src/hb-subset.cc
index 7cea9f18..fbdf1b4f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset.cc
+++ b/engine/thirdparty/harfbuzz/src/hb-subset.cc
@@ -295,8 +295,8 @@ _try_subset (const TableType *table,
   DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c ran out of room; reallocating to %u bytes.",
              HB_UNTAG (c->table_tag), buf_size);
 
-  if (unlikely (buf_size > c->source_blob->length * 16 ||
-		!buf->alloc (buf_size, true)))
+  if (unlikely (buf_size > c->source_blob->length * 256 ||
+		!buf->alloc_exact (buf_size)))
   {
     DEBUG_MSG (SUBSET, nullptr, "OT::%c%c%c%c failed to reallocate %u bytes.",
                HB_UNTAG (c->table_tag), buf_size);
diff --git a/engine/thirdparty/harfbuzz/src/hb-subset.h b/engine/thirdparty/harfbuzz/src/hb-subset.h
index 365c21a6..71276c7a 100644
--- a/engine/thirdparty/harfbuzz/src/hb-subset.h
+++ b/engine/thirdparty/harfbuzz/src/hb-subset.h
@@ -203,6 +203,18 @@ hb_subset_input_set_axis_range (hb_subset_input_t  *input,
 				float               axis_max_value,
 				float               axis_def_value);
 
+HB_EXTERN hb_bool_t
+hb_subset_axis_range_from_string (const char *str, int len,
+				  float *axis_min_value,
+				  float *axis_max_value,
+				  float *axis_def_value);
+
+HB_EXTERN void
+hb_subset_axis_range_to_string (hb_subset_input_t *input,
+				hb_tag_t axis_tag,
+				char *buf,
+				unsigned size);
+
 #ifdef HB_EXPERIMENTAL_API
 HB_EXTERN hb_bool_t
 hb_subset_input_override_name_table (hb_subset_input_t  *input,
diff --git a/engine/thirdparty/harfbuzz/src/hb-utf.hh b/engine/thirdparty/harfbuzz/src/hb-utf.hh
index 1120bd1c..6db9bf2f 100644
--- a/engine/thirdparty/harfbuzz/src/hb-utf.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-utf.hh
@@ -458,19 +458,21 @@ struct hb_ascii_t
 template <typename utf_t>
 static inline const typename utf_t::codepoint_t *
 hb_utf_offset_to_pointer (const typename utf_t::codepoint_t *start,
+			  const typename utf_t::codepoint_t *text,
+			  unsigned text_len,
 			  signed offset)
 {
   hb_codepoint_t unicode;
 
   while (offset-- > 0)
     start = utf_t::next (start,
-			 start + utf_t::max_len,
+			 text + text_len,
 			 &unicode,
 			 HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT);
 
   while (offset++ < 0)
     start = utf_t::prev (start,
-			 start - utf_t::max_len,
+			 text,
 			 &unicode,
 			 HB_BUFFER_REPLACEMENT_CODEPOINT_DEFAULT);
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-vector.hh b/engine/thirdparty/harfbuzz/src/hb-vector.hh
index c0cc7063..0e01d010 100644
--- a/engine/thirdparty/harfbuzz/src/hb-vector.hh
+++ b/engine/thirdparty/harfbuzz/src/hb-vector.hh
@@ -53,28 +53,25 @@ struct hb_vector_t
   }
   template <typename Iterable,
 	    hb_requires (hb_is_iterable (Iterable))>
-  hb_vector_t (const Iterable &o) : hb_vector_t ()
+  explicit hb_vector_t (const Iterable &o) : hb_vector_t ()
   {
-    auto iter = hb_iter (o);
-    if (iter.is_random_access_iterator || iter.has_fast_len)
-      alloc (hb_len (iter), true);
-    hb_copy (iter, *this);
+    extend (o);
   }
   hb_vector_t (const hb_vector_t &o) : hb_vector_t ()
   {
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o.as_array ());
   }
   hb_vector_t (array_t o) : hb_vector_t ()
   {
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
   hb_vector_t (c_array_t o) : hb_vector_t ()
   {
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return;
     copy_array (o);
   }
@@ -87,6 +84,35 @@ struct hb_vector_t
   }
   ~hb_vector_t () { fini (); }
 
+  template <typename Iterable,
+	    hb_requires (hb_is_iterable (Iterable))>
+  void extend (const Iterable &o)
+  {
+    auto iter = hb_iter (o);
+    if (iter.is_random_access_iterator || iter.has_fast_len)
+      alloc (hb_len (iter), true);
+    while (iter)
+    {
+      if (unlikely (!alloc (length + 1)))
+        return;
+      unsigned room = allocated - length;
+      for (unsigned i = 0; i < room && iter; i++)
+	push_has_room (*iter++);
+    }
+  }
+  void extend (array_t o)
+  {
+    alloc (length + o.length);
+    if (unlikely (in_error ())) return;
+    copy_array (o);
+  }
+  void extend (c_array_t o)
+  {
+    alloc (length + o.length);
+    if (unlikely (in_error ())) return;
+    copy_array (o);
+  }
+
   public:
   int allocated = 0; /* < 0 means allocation failed. */
   unsigned int length = 0;
@@ -132,9 +158,10 @@ struct hb_vector_t
   hb_vector_t& operator = (const hb_vector_t &o)
   {
     reset ();
-    alloc (o.length, true);
+    alloc_exact (o.length);
     if (unlikely (in_error ())) return *this;
 
+    length = 0;
     copy_array (o.as_array ());
 
     return *this;
@@ -218,6 +245,10 @@ struct hb_vector_t
       // reference to it.
       return std::addressof (Crap (Type));
 
+    return push_has_room (std::forward<Args> (args)...);
+  }
+  template <typename... Args> Type *push_has_room (Args&&... args)
+  {
     /* Emplace. */
     Type *p = std::addressof (arrayZ[length++]);
     return new (p) Type (std::forward<Args> (args)...);
@@ -311,18 +342,23 @@ struct hb_vector_t
     length = size;
   }
 
+  template <typename T = Type,
+	    hb_enable_if (hb_is_trivially_copyable (T))>
+  void
+  copy_array (hb_array_t<Type> other)
+  {
+    assert ((int) (length + other.length) <= allocated);
+    hb_memcpy ((void *) (arrayZ + length), (const void *) other.arrayZ, other.length * item_size);
+    length += other.length;
+  }
   template <typename T = Type,
 	    hb_enable_if (hb_is_trivially_copyable (T))>
   void
   copy_array (hb_array_t<const Type> other)
   {
-    length = other.length;
-    if (!HB_OPTIMIZE_SIZE_VAL && sizeof (T) >= sizeof (long long))
-      /* This runs faster because of alignment. */
-      for (unsigned i = 0; i < length; i++)
-	arrayZ[i] = other.arrayZ[i];
-    else
-       hb_memcpy ((void *) arrayZ, (const void *) other.arrayZ, length * item_size);
+    assert ((int) (length + other.length) <= allocated);
+    hb_memcpy ((void *) (arrayZ + length), (const void *) other.arrayZ, other.length * item_size);
+    length += other.length;
   }
   template <typename T = Type,
 	    hb_enable_if (!hb_is_trivially_copyable (T) &&
@@ -330,12 +366,10 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<const Type> other)
   {
-    length = 0;
-    while (length < other.length)
-    {
-      length++;
-      new (std::addressof (arrayZ[length - 1])) Type (other.arrayZ[length - 1]);
-    }
+    assert ((int) (length + other.length) <= allocated);
+    for (unsigned i = 0; i < other.length; i++)
+      new (std::addressof (arrayZ[length + i])) Type (other.arrayZ[i]);
+    length += other.length;
   }
   template <typename T = Type,
 	    hb_enable_if (!hb_is_trivially_copyable (T) &&
@@ -345,13 +379,13 @@ struct hb_vector_t
   void
   copy_array (hb_array_t<const Type> other)
   {
-    length = 0;
-    while (length < other.length)
+    assert ((int) (length + other.length) <= allocated);
+    for (unsigned i = 0; i < other.length; i++)
     {
-      length++;
-      new (std::addressof (arrayZ[length - 1])) Type ();
-      arrayZ[length - 1] = other.arrayZ[length - 1];
+      new (std::addressof (arrayZ[length + i])) Type ();
+      arrayZ[length + i] = other.arrayZ[i];
     }
+    length += other.length;
   }
 
   void
@@ -432,6 +466,15 @@ struct hb_vector_t
 
     return true;
   }
+  bool alloc_exact (unsigned int size)
+  {
+    return alloc (size, true);
+  }
+
+  void clear ()
+  {
+    resize (0);
+  }
 
   bool resize (int size_, bool initialize = true, bool exact = false)
   {
@@ -497,7 +540,7 @@ struct hb_vector_t
     shrink_vector (size);
 
     if (shrink_memory)
-      alloc (size, true); /* To force shrinking memory if needed. */
+      alloc_exact (size); /* To force shrinking memory if needed. */
   }
 
 
diff --git a/engine/thirdparty/harfbuzz/src/hb-version.h b/engine/thirdparty/harfbuzz/src/hb-version.h
index 1083bc9c..2ffbf990 100644
--- a/engine/thirdparty/harfbuzz/src/hb-version.h
+++ b/engine/thirdparty/harfbuzz/src/hb-version.h
@@ -47,7 +47,7 @@ HB_BEGIN_DECLS
  *
  * The minor component of the library version available at compile-time.
  */
-#define HB_VERSION_MINOR 1
+#define HB_VERSION_MINOR 4
 /**
  * HB_VERSION_MICRO:
  *
@@ -60,7 +60,7 @@ HB_BEGIN_DECLS
  *
  * A string literal containing the library version available at compile-time.
  */
-#define HB_VERSION_STRING "10.1.0"
+#define HB_VERSION_STRING "10.4.0"
 
 /**
  * HB_VERSION_ATLEAST:
diff --git a/engine/thirdparty/harfbuzz/src/hb.hh b/engine/thirdparty/harfbuzz/src/hb.hh
index fe466fe1..7c265483 100644
--- a/engine/thirdparty/harfbuzz/src/hb.hh
+++ b/engine/thirdparty/harfbuzz/src/hb.hh
@@ -131,6 +131,7 @@
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
 #pragma GCC diagnostic ignored "-Wcast-function-type-strict" // https://github.com/harfbuzz/harfbuzz/pull/3859#issuecomment-1295409126
 #pragma GCC diagnostic ignored "-Wdangling-reference" // https://github.com/harfbuzz/harfbuzz/issues/4043
+#pragma GCC diagnostic ignored "-Wdangling-pointer" // Trigerred by hb_decycler_node_t().
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 #pragma GCC diagnostic ignored "-Wformat-zero-length"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -281,7 +282,9 @@ extern "C" void  hb_free_impl(void *ptr);
 #define __attribute__(x)
 #endif
 
-#if defined(__GNUC__) && (__GNUC__ >= 3)
+#if defined(__MINGW32__) && (__GNUC__ >= 3)
+#define HB_PRINTF_FUNC(format_idx, arg_idx) __attribute__((__format__ (gnu_printf, format_idx, arg_idx)))
+#elif defined(__GNUC__) && (__GNUC__ >= 3)
 #define HB_PRINTF_FUNC(format_idx, arg_idx) __attribute__((__format__ (__printf__, format_idx, arg_idx)))
 #else
 #define HB_PRINTF_FUNC(format_idx, arg_idx)
diff --git a/engine/thirdparty/icu4c/LICENSE b/engine/thirdparty/icu4c/LICENSE
index 180db98f..0b9efcd9 100644
--- a/engine/thirdparty/icu4c/LICENSE
+++ b/engine/thirdparty/icu4c/LICENSE
@@ -2,7 +2,7 @@ UNICODE LICENSE V3
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 2016-2024 Unicode, Inc.
+Copyright © 2016-2025 Unicode, Inc.
 
 NOTICE TO USER: Carefully read the following legal agreement. BY
 DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
diff --git a/engine/thirdparty/icu4c/common/brkiter.cpp b/engine/thirdparty/icu4c/common/brkiter.cpp
index 4d945cc1..44a13ee6 100644
--- a/engine/thirdparty/icu4c/common/brkiter.cpp
+++ b/engine/thirdparty/icu4c/common/brkiter.cpp
@@ -59,7 +59,7 @@ BreakIterator::buildInstance(const Locale& loc, const char *type, UErrorCode &st
 {
     char fnbuff[256];
     char ext[4]={'\0'};
-    CharString actualLocale;
+    CharString actual;
     int32_t size;
     const char16_t* brkfname = nullptr;
     UResourceBundle brkRulesStack;
@@ -94,7 +94,7 @@ BreakIterator::buildInstance(const Locale& loc, const char *type, UErrorCode &st
 
         // Use the string if we found it
         if (U_SUCCESS(status) && brkfname) {
-            actualLocale.append(ures_getLocaleInternal(brkName, &status), -1, status);
+            actual.append(ures_getLocaleInternal(brkName, &status), -1, status);
 
             char16_t* extStart=u_strchr(brkfname, 0x002e);
             int len = 0;
@@ -123,10 +123,9 @@ BreakIterator::buildInstance(const Locale& loc, const char *type, UErrorCode &st
     if (U_SUCCESS(status) && result != nullptr) {
         U_LOCALE_BASED(locBased, *(BreakIterator*)result);
 
-        locBased.setLocaleIDs(ures_getLocaleByType(b, ULOC_VALID_LOCALE, &status), 
-                              actualLocale.data());
-        uprv_strncpy(result->requestLocale, loc.getName(), ULOC_FULLNAME_CAPACITY);
-        result->requestLocale[ULOC_FULLNAME_CAPACITY-1] = 0; // always terminate
+        locBased.setLocaleIDs(ures_getLocaleByType(b, ULOC_VALID_LOCALE, &status),
+                              actual.data(), status);
+        LocaleBased::setLocaleID(loc.getName(), result->requestLocale, status);
     }
 
     ures_close(b);
@@ -206,26 +205,32 @@ BreakIterator::getAvailableLocales(int32_t& count)
 
 BreakIterator::BreakIterator()
 {
-    *validLocale = *actualLocale = *requestLocale = 0;
 }
 
 BreakIterator::BreakIterator(const BreakIterator &other) : UObject(other) {
-    uprv_strncpy(actualLocale, other.actualLocale, sizeof(actualLocale));
-    uprv_strncpy(validLocale, other.validLocale, sizeof(validLocale));
-    uprv_strncpy(requestLocale, other.requestLocale, sizeof(requestLocale));
+    UErrorCode status = U_ZERO_ERROR;
+    U_LOCALE_BASED(locBased, *this);
+    locBased.setLocaleIDs(other.validLocale, other.actualLocale, status);
+    LocaleBased::setLocaleID(other.requestLocale, requestLocale, status);
+    U_ASSERT(U_SUCCESS(status));
 }
 
 BreakIterator &BreakIterator::operator =(const BreakIterator &other) {
     if (this != &other) {
-        uprv_strncpy(actualLocale, other.actualLocale, sizeof(actualLocale));
-        uprv_strncpy(validLocale, other.validLocale, sizeof(validLocale));
-        uprv_strncpy(requestLocale, other.requestLocale, sizeof(requestLocale));
+        UErrorCode status = U_ZERO_ERROR;
+        U_LOCALE_BASED(locBased, *this);
+        locBased.setLocaleIDs(other.validLocale, other.actualLocale, status);
+        LocaleBased::setLocaleID(other.requestLocale, requestLocale, status);
+        U_ASSERT(U_SUCCESS(status));
     }
     return *this;
 }
 
 BreakIterator::~BreakIterator()
 {
+    delete validLocale;
+    delete actualLocale;
+    delete requestLocale;
 }
 
 // ------------------------------------------
@@ -394,7 +399,7 @@ BreakIterator::createInstance(const Locale& loc, int32_t kind, UErrorCode& statu
         // revisit this in ICU 3.0 and clean it up/fix it/remove it.
         if (U_SUCCESS(status) && (result != nullptr) && *actualLoc.getName() != 0) {
             U_LOCALE_BASED(locBased, *result);
-            locBased.setLocaleIDs(actualLoc.getName(), actualLoc.getName());
+            locBased.setLocaleIDs(actualLoc.getName(), actualLoc.getName(), status);
         }
         return result;
     }
@@ -488,6 +493,7 @@ BreakIterator::makeInstance(const Locale& loc, int32_t kind, UErrorCode& status)
     }
 
     if (U_FAILURE(status)) {
+        delete result;
         return nullptr;
     }
 
@@ -496,20 +502,25 @@ BreakIterator::makeInstance(const Locale& loc, int32_t kind, UErrorCode& status)
 
 Locale
 BreakIterator::getLocale(ULocDataLocaleType type, UErrorCode& status) const {
-    if (type == ULOC_REQUESTED_LOCALE) {
-        return {requestLocale};
+    if (U_FAILURE(status)) {
+        return Locale::getRoot();
     }
-    U_LOCALE_BASED(locBased, *this);
-    return locBased.getLocale(type, status);
+    if (type == ULOC_REQUESTED_LOCALE) {
+        return requestLocale == nullptr ?
+            Locale::getRoot() : Locale(requestLocale->data());
+    }
+    return LocaleBased::getLocale(validLocale, actualLocale, type, status);
 }
 
 const char *
 BreakIterator::getLocaleID(ULocDataLocaleType type, UErrorCode& status) const {
-    if (type == ULOC_REQUESTED_LOCALE) {
-        return requestLocale;
+    if (U_FAILURE(status)) {
+        return nullptr;
     }
-    U_LOCALE_BASED(locBased, *this);
-    return locBased.getLocaleID(type, status);
+    if (type == ULOC_REQUESTED_LOCALE) {
+        return requestLocale == nullptr ?  "" : requestLocale->data();
+    }
+    return LocaleBased::getLocaleID(validLocale, actualLocale, type, status);
 }
 
 
@@ -536,8 +547,10 @@ int32_t BreakIterator::getRuleStatusVec(int32_t *fillInVec, int32_t capacity, UE
 }
 
 BreakIterator::BreakIterator (const Locale& valid, const Locale& actual) {
+  UErrorCode status = U_ZERO_ERROR;
   U_LOCALE_BASED(locBased, (*this));
-  locBased.setLocaleIDs(valid, actual);
+  locBased.setLocaleIDs(valid.getName(), actual.getName(), status);
+  U_ASSERT(U_SUCCESS(status));
 }
 
 U_NAMESPACE_END
diff --git a/engine/thirdparty/icu4c/common/charstr.cpp b/engine/thirdparty/icu4c/common/charstr.cpp
index f76cc8a4..dadc829b 100644
--- a/engine/thirdparty/icu4c/common/charstr.cpp
+++ b/engine/thirdparty/icu4c/common/charstr.cpp
@@ -70,6 +70,15 @@ CharString &CharString::copyFrom(const CharString &s, UErrorCode &errorCode) {
     return *this;
 }
 
+CharString &CharString::copyFrom(StringPiece s, UErrorCode &errorCode) {
+    if (U_FAILURE(errorCode)) {
+        return *this;
+    }
+    len = 0;
+    append(s, errorCode);
+    return *this;
+}
+
 int32_t CharString::lastIndexOf(char c) const {
     for(int32_t i=len; i>0;) {
         if(buffer[--i]==c) {
@@ -143,7 +152,7 @@ CharString &CharString::append(const char *s, int32_t sLength, UErrorCode &error
     return *this;
 }
 
-CharString &CharString::appendNumber(int32_t number, UErrorCode &status) {
+CharString &CharString::appendNumber(int64_t number, UErrorCode &status) {
     if (number < 0) {
         this->append('-', status);
         if (U_FAILURE(status)) {
diff --git a/engine/thirdparty/icu4c/common/charstr.h b/engine/thirdparty/icu4c/common/charstr.h
index 08283ca4..ea54ede7 100644
--- a/engine/thirdparty/icu4c/common/charstr.h
+++ b/engine/thirdparty/icu4c/common/charstr.h
@@ -74,6 +74,7 @@ public:
      * use a UErrorCode where memory allocations might be needed.
      */
     CharString &copyFrom(const CharString &other, UErrorCode &errorCode);
+    CharString &copyFrom(StringPiece s, UErrorCode &errorCode);
 
     UBool isEmpty() const { return len==0; }
     int32_t length() const { return len; }
@@ -135,7 +136,7 @@ public:
     }
     CharString &append(const char *s, int32_t sLength, UErrorCode &status);
 
-    CharString &appendNumber(int32_t number, UErrorCode &status);
+    CharString &appendNumber(int64_t number, UErrorCode &status);
 
     /**
      * Returns a writable buffer for appending and writes the buffer's capacity to
diff --git a/engine/thirdparty/icu4c/common/localefallback_data.h b/engine/thirdparty/icu4c/common/localefallback_data.h
index 0accf032..3b8ad8a3 100644
--- a/engine/thirdparty/icu4c/common/localefallback_data.h
+++ b/engine/thirdparty/icu4c/common/localefallback_data.h
@@ -11,11 +11,11 @@
 //======================================================================
 // Default script table
 const char scriptCodeChars[] =
-    "Aghb\0Ahom\0Arab\0Armi\0Armn\0Avst\0Bamu\0Bass\0Batk\0Beng\0Bopo\0"
-    "Brah\0Cakm\0Cans\0Cari\0Cham\0Cher\0Chrs\0Copt\0Cprt\0Cyrl\0Deva\0"
-    "Egyp\0Elym\0Ethi\0Geor\0Gong\0Gonm\0Goth\0Gran\0Grek\0Gujr\0Guru\0"
-    "Hang\0Hani\0Hans\0Hant\0Hebr\0Hluw\0Hmnp\0Ital\0Java\0Jpan\0Kali\0"
-    "Kana\0Kawi\0Khar\0Khmr\0Kits\0Knda\0Kore\0Lana\0Laoo\0Latf\0Latg\0"
+    "Aghb\0Ahom\0Arab\0Armi\0Armn\0Avst\0Bali\0Bamu\0Bass\0Batk\0Beng\0"
+    "Bopo\0Brah\0Cakm\0Cans\0Cari\0Cham\0Cher\0Chrs\0Copt\0Cprt\0Cyrl\0"
+    "Deva\0Egyp\0Elym\0Ethi\0Geor\0Gong\0Gonm\0Goth\0Gran\0Grek\0Gujr\0"
+    "Guru\0Hang\0Hani\0Hans\0Hant\0Hebr\0Hluw\0Hmnp\0Ital\0Java\0Jpan\0"
+    "Kali\0Kana\0Khar\0Khmr\0Kits\0Knda\0Kore\0Lana\0Laoo\0Latf\0Latg\0"
     "Lepc\0Lina\0Linb\0Lisu\0Lyci\0Lydi\0Mand\0Mani\0Marc\0Medf\0Merc\0"
     "Mlym\0Modi\0Mong\0Mroo\0Mtei\0Mymr\0Narb\0Newa\0Nkoo\0Nshu\0Ogam\0"
     "Olck\0Orkh\0Orya\0Osge\0Ougr\0Pauc\0Phli\0Phnx\0Plrd\0Prti\0Rjng\0"
@@ -48,70 +48,71 @@ const char dsLocaleIDChars[] =
     "gbz\0gdb\0gdo\0gdx\0gez\0ggg\0gha\0ghe\0gho\0ghr\0ght\0gig\0gin\0"
     "gjk\0gju\0gld\0glh\0glk\0gml\0gmv\0gmy\0goe\0gof\0goj\0gok\0gon\0"
     "got\0gra\0grc\0grt\0gru\0gu\0gvr\0gwc\0gwf\0gwt\0gyo\0gzi\0ha_CM\0"
-    "ha_SD\0hac\0hak\0har\0haz\0hbo\0hdy\0he\0hi\0hif\0hii\0hit\0hkh\0"
-    "hlb\0hlu\0hmd\0hmj\0hmq\0hnd\0hne\0hnj\0hno\0hoc\0hoh\0hoj\0how\0"
-    "hoy\0hpo\0hrt\0hrz\0hsn\0hss\0htx\0hut\0huy\0huz\0hy\0hyw\0ii\0"
-    "imy\0inh\0int\0ior\0iru\0isk\0itk\0itl\0iu\0iw\0ja\0jad\0jat\0"
-    "jbe\0jbn\0jct\0jda\0jdg\0jdt\0jee\0jge\0ji\0jje\0jkm\0jml\0jna\0"
-    "jnd\0jnl\0jns\0jog\0jpa\0jpr\0jrb\0jul\0jun\0juy\0jya\0jye\0ka\0"
-    "kaa\0kap\0kaw\0kbd\0kbg\0kbu\0kby\0kca\0kcy\0kdq\0kdt\0ket\0kev\0"
-    "kex\0key\0kfa\0kfb\0kfc\0kfd\0kfe\0kfg\0kfh\0kfi\0kfk\0kfm\0kfp\0"
-    "kfq\0kfr\0kfs\0kfu\0kfx\0kfy\0kgj\0kgy\0khb\0khf\0khg\0khn\0kho\0"
-    "kht\0khv\0khw\0kif\0kim\0kip\0kjg\0kjh\0kjl\0kjo\0kjp\0kjt\0kjz\0"
-    "kk\0kk_AF\0kk_CN\0kk_IR\0kk_MN\0kkf\0kkh\0kkt\0kle\0klj\0klr\0"
-    "km\0kmj\0kmz\0kn\0knn\0ko\0koi\0kok\0kpt\0kpy\0kqd\0kqy\0kra\0"
-    "krc\0krk\0krr\0kru\0krv\0ks\0ksu\0ksw\0ksz\0ktb\0kte\0ktl\0ktp\0"
-    "ku_LB\0kuf\0kum\0kv\0kva\0kvq\0kvt\0kvx\0kvy\0kxf\0kxk\0kxm\0"
-    "kxp\0ky\0ky_CN\0kyu\0kyv\0kyw\0lab\0lad\0lae\0lah\0lbe\0lbf\0"
-    "lbj\0lbm\0lbo\0lbr\0lcp\0lep\0lez\0lhm\0lhs\0lif\0lis\0lkh\0lki\0"
-    "lmh\0lmn\0lo\0loy\0lpo\0lrc\0lrk\0lrl\0lsa\0lsd\0lss\0ltc\0luk\0"
-    "luu\0luv\0luz\0lwl\0lwm\0lya\0lzh\0mag\0mai\0man_GN\0mby\0mde\0"
-    "mdf\0mdx\0mdy\0mfa\0mfi\0mga\0mgp\0mhj\0mid\0mjl\0mjq\0mjr\0mjt\0"
-    "mju\0mjv\0mjz\0mk\0mkb\0mke\0mki\0mkm\0ml\0mlf\0mn\0mn_CN\0mnc\0"
-    "mni\0mnj\0mns\0mnw\0mpz\0mr\0mra\0mrd\0mrj\0mro\0mrr\0ms_CC\0"
-    "mtm\0mtr\0mud\0muk\0mut\0muv\0muz\0mve\0mvf\0mvy\0mvz\0mwr\0mwt\0"
-    "mww\0my\0mym\0myv\0myz\0mzn\0nan\0nao\0ncd\0ncq\0ndf\0ne\0neg\0"
-    "neh\0nei\0new\0ngt\0nio\0nit\0niv\0nli\0nlm\0nlx\0nmm\0nnp\0nod\0"
-    "noe\0nog\0noi\0non\0nos\0npb\0nqo\0nrn\0nsd\0nsf\0nsk\0nst\0nsv\0"
-    "nty\0ntz\0nwc\0nwx\0nyl\0nyq\0nyw\0oaa\0oac\0oar\0oav\0obm\0obr\0"
-    "odk\0oht\0oj\0ojs\0okm\0oko\0okz\0ola\0ole\0omk\0omp\0omr\0omx\0"
-    "oon\0or\0ort\0oru\0orv\0os\0osa\0osc\0osi\0ota\0otb\0otk\0oty\0"
-    "oui\0pa\0pa_PK\0pal\0paq\0pbt\0pcb\0pce\0pcf\0pcg\0pch\0pci\0"
-    "pcj\0peg\0peo\0pgd\0pgg\0pgl\0pgn\0phd\0phk\0phl\0phn\0pho\0phr\0"
-    "pht\0phu\0phv\0phw\0pi\0pka\0pkr\0plk\0pll\0pmh\0pnt\0pra\0prc\0"
-    "prd\0prt\0prx\0ps\0psh\0psi\0pst\0psu\0pum\0pwo\0pwr\0pww\0pyx\0"
-    "qxq\0raa\0rab\0raf\0rah\0raj\0rav\0rbb\0rdb\0rei\0rhg\0rji\0rjs\0"
-    "rka\0rki\0rkt\0rmi\0rmt\0rmz\0rsk\0rtw\0ru\0rue\0rut\0rwr\0ryu\0"
-    "sa\0sah\0sam\0sat\0saz\0sbn\0sbu\0sck\0scl\0scp\0sct\0scu\0scx\0"
-    "sd\0sd_IN\0sdb\0sdf\0sdg\0sdh\0sdr\0sds\0sel\0sfm\0sga\0sgh\0"
-    "sgj\0sgr\0sgt\0sgw\0sgy\0shd\0shi\0shm\0shn\0shu\0shv\0si\0sia\0"
-    "sip\0siy\0siz\0sjd\0sjp\0sjt\0skb\0skj\0skr\0smh\0smp\0smu\0smy\0"
-    "soa\0sog\0soi\0sou\0spt\0spv\0sqo\0sqq\0sqt\0sr\0srb\0srh\0srx\0"
-    "srz\0ssh\0sss\0sts\0stv\0sty\0suz\0sva\0swb\0swi\0swv\0sxu\0syc\0"
-    "syl\0syn\0syr\0syw\0ta\0tab\0taj\0tbk\0tcn\0tco\0tcx\0tcy\0tda\0"
-    "tdb\0tdd\0tdg\0tdh\0te\0tes\0tg\0tg_PK\0tge\0tgf\0th\0the\0thf\0"
-    "thi\0thl\0thm\0thq\0thr\0ths\0ti\0tig\0tij\0tin\0tjl\0tjo\0tkb\0"
-    "tks\0tkt\0tmr\0tnv\0tov\0tpu\0tra\0trg\0trm\0trw\0tsd\0tsj\0tt\0"
-    "tth\0tto\0tts\0ttz\0tvn\0twm\0txg\0txo\0tyr\0tyv\0ude\0udg\0udi\0"
-    "udm\0ug\0ug_KZ\0ug_MN\0uga\0ugh\0ugo\0uk\0uki\0ulc\0unr\0unr_NP\0"
-    "unx\0ur\0urk\0ush\0uum\0uz_AF\0uz_CN\0uzs\0vaa\0vaf\0vah\0vai\0"
-    "vas\0vav\0vay\0vgr\0vjk\0vmd\0vmh\0wal\0wbk\0wbq\0wbr\0wle\0wlo\0"
-    "wme\0wne\0wni\0wsg\0wsv\0wtm\0wuu\0xag\0xal\0xan\0xas\0xco\0xcr\0"
-    "xdq\0xhe\0xhm\0xis\0xka\0xkc\0xkf\0xkj\0xkp\0xlc\0xld\0xly\0xmf\0"
-    "xmn\0xmr\0xna\0xnr\0xpg\0xpi\0xpm\0xpr\0xrm\0xrn\0xsa\0xsr\0xtq\0"
-    "xub\0xuj\0xve\0xvi\0xwo\0xzh\0yai\0ybh\0ybi\0ydg\0yea\0yej\0yeu\0"
-    "ygp\0yhd\0yi\0yig\0yih\0yiv\0ykg\0ykh\0yna\0ynk\0yoi\0yoy\0yrk\0"
-    "ysd\0ysn\0ysp\0ysr\0ysy\0yud\0yue\0yue_CN\0yug\0yux\0ywq\0ywu\0"
-    "zau\0zba\0zch\0zdj\0zeh\0zen\0zgb\0zgh\0zgm\0zgn\0zh\0zh_AU\0"
-    "zh_BN\0zh_GB\0zh_GF\0zh_HK\0zh_ID\0zh_MO\0zh_PA\0zh_PF\0zh_PH\0"
-    "zh_SR\0zh_TH\0zh_TW\0zh_US\0zh_VN\0zhd\0zhx\0zko\0zkt\0zkz\0zlj\0"
-    "zln\0zlq\0zqe\0zrg\0zrp\0zum\0zwa\0zyg\0zyn\0zzj\0";
+    "ha_SD\0hac\0hak\0hak_TW\0har\0haz\0hbo\0hdy\0he\0hi\0hif\0hii\0"
+    "hit\0hkh\0hlb\0hlu\0hmd\0hmj\0hmq\0hnd\0hne\0hnj\0hno\0hoc\0hoh\0"
+    "hoj\0how\0hoy\0hpo\0hrt\0hrz\0hsn\0hss\0htx\0hut\0huy\0huz\0hy\0"
+    "hyw\0ii\0imy\0inh\0int\0ior\0iru\0isk\0itk\0itl\0iu\0iw\0ja\0"
+    "jad\0jat\0jbe\0jbn\0jct\0jda\0jdg\0jdt\0jee\0jge\0ji\0jje\0jkm\0"
+    "jml\0jna\0jnd\0jnl\0jns\0jog\0jpa\0jpr\0jrb\0jul\0jun\0juy\0jya\0"
+    "jye\0ka\0kaa\0kap\0kaw\0kbd\0kbg\0kbu\0kby\0kca\0kcy\0kdq\0kdt\0"
+    "ket\0kev\0kex\0key\0kfa\0kfb\0kfc\0kfd\0kfe\0kfg\0kfh\0kfi\0kfk\0"
+    "kfm\0kfp\0kfq\0kfr\0kfs\0kfu\0kfx\0kfy\0kgj\0kgy\0khb\0khf\0khg\0"
+    "khn\0kho\0kht\0khv\0khw\0kif\0kim\0kip\0kjg\0kjh\0kjl\0kjo\0kjp\0"
+    "kjt\0kjz\0kk\0kk_AF\0kk_CN\0kk_IR\0kk_MN\0kkf\0kkh\0kkt\0kle\0"
+    "klj\0klr\0km\0kmj\0kmz\0kn\0knn\0ko\0koi\0kok\0kpt\0kpy\0kqd\0"
+    "kqy\0kra\0krc\0krk\0krr\0kru\0krv\0ks\0ksu\0ksw\0ksz\0ktb\0kte\0"
+    "ktl\0ktp\0ku_LB\0kuf\0kum\0kv\0kva\0kvq\0kvt\0kvx\0kvy\0kxf\0"
+    "kxk\0kxm\0kxp\0ky\0ky_CN\0kyu\0kyv\0kyw\0lab\0lad\0lae\0lah\0"
+    "lbe\0lbf\0lbj\0lbm\0lbo\0lbr\0lcp\0lep\0lez\0lhm\0lhs\0lif\0lis\0"
+    "lkh\0lki\0lmh\0lmn\0lo\0loy\0lpo\0lrc\0lrk\0lrl\0lsa\0lsd\0lss\0"
+    "ltc\0luk\0luu\0luv\0luz\0lwl\0lwm\0lya\0lzh\0lzz_GE\0mag\0mai\0"
+    "mby\0mde\0mdf\0mdx\0mdy\0mfa\0mfi\0mga\0mgp\0mhj\0mid\0mjl\0mjq\0"
+    "mjr\0mjt\0mju\0mjv\0mjz\0mk\0mkb\0mke\0mki\0mkm\0ml\0mlf\0mn\0"
+    "mn_CN\0mnc\0mni\0mnj\0mns\0mnw\0mpz\0mr\0mra\0mrd\0mrj\0mro\0"
+    "mrr\0ms_CC\0mtm\0mtr\0mud\0muk\0mut\0muv\0muz\0mve\0mvf\0mvy\0"
+    "mvz\0mwr\0mwt\0mww\0my\0mym\0myv\0myz\0mzn\0nan\0nan_TW\0nao\0"
+    "ncd\0ncq\0ndf\0ne\0neg\0neh\0nei\0new\0ngt\0nio\0nit\0niv\0nli\0"
+    "nlm\0nlx\0nmm\0nnp\0nod\0noe\0nog\0noi\0non\0nos\0npb\0nqo\0nrn\0"
+    "nsd\0nsf\0nsk\0nst\0nsv\0nty\0ntz\0nwc\0nwx\0nyl\0nyq\0nyw\0oaa\0"
+    "oac\0oar\0oav\0obm\0obr\0odk\0oht\0oj\0ojs\0okm\0oko\0okz\0ola\0"
+    "ole\0omk\0omp\0omr\0omx\0oon\0or\0ort\0oru\0orv\0os\0osa\0osc\0"
+    "osi\0ota\0otb\0otk\0oty\0oui\0pa\0pa_PK\0pal\0paq\0pbt\0pcb\0"
+    "pce\0pcf\0pcg\0pch\0pci\0pcj\0peg\0peo\0pgd\0pgg\0pgl\0pgn\0phd\0"
+    "phk\0phl\0phn\0pho\0phr\0pht\0phu\0phv\0phw\0pi\0pka\0pkr\0plk\0"
+    "pll\0pmh\0pnt\0pnt_RU\0pra\0prc\0prd\0prt\0prx\0ps\0psh\0psi\0"
+    "pst\0psu\0pum\0pwo\0pwr\0pww\0pyx\0qxq\0raa\0rab\0raf\0rah\0raj\0"
+    "rav\0rbb\0rdb\0rei\0rhg\0rji\0rjs\0rka\0rki\0rkt\0rmi\0rmt\0rmz\0"
+    "rsk\0rtw\0ru\0rue\0rut\0rwr\0ryu\0sa\0sah\0sam\0sat\0saz\0sbn\0"
+    "sbu\0sck\0scl\0scp\0sct\0scu\0scx\0sd\0sd_IN\0sdb\0sdf\0sdg\0"
+    "sdh\0sdr\0sds\0sel\0sfm\0sgh\0sgj\0sgr\0sgt\0sgw\0sgy\0shd\0shi\0"
+    "shm\0shn\0shu\0shv\0si\0sia\0sip\0siy\0siz\0sjd\0sjp\0sjt\0skb\0"
+    "skj\0skr\0smh\0smp\0smu\0smy\0soa\0sog\0soi\0sou\0spt\0spv\0sqo\0"
+    "sqq\0sqt\0sr\0srb\0srh\0srx\0srz\0ssh\0sss\0sts\0stv\0sty\0suz\0"
+    "sva\0swb\0swi\0swv\0sxu\0syc\0syl\0syn\0syr\0syw\0ta\0tab\0taj\0"
+    "tbk\0tcn\0tco\0tcx\0tcy\0tda\0tdb\0tdd\0tdg\0tdh\0te\0tes\0tg\0"
+    "tg_PK\0tge\0tgf\0th\0the\0thf\0thi\0thl\0thm\0thq\0thr\0ths\0"
+    "ti\0tig\0tij\0tin\0tjl\0tjo\0tkb\0tks\0tkt\0tmr\0tnv\0tov\0tpu\0"
+    "tra\0trg\0trm\0trw\0tsd\0tsj\0tt\0tth\0tto\0tts\0ttz\0tvn\0twm\0"
+    "txg\0txo\0tyr\0tyv\0ude\0udg\0udi\0udm\0ug\0ug_KZ\0ug_MN\0uga\0"
+    "ugh\0ugo\0uk\0uki\0ulc\0unr\0unr_NP\0unx\0ur\0urk\0ush\0uum\0"
+    "uz_AF\0uz_CN\0uzs\0vaa\0vaf\0vah\0vai\0vas\0vav\0vay\0vgr\0vjk\0"
+    "vmd\0vmh\0wal\0wbk\0wbq\0wbr\0wle\0wlo\0wme\0wne\0wni\0wsg\0wsv\0"
+    "wtm\0wuu\0xag\0xal\0xan\0xas\0xco\0xcr\0xdq\0xhe\0xhm\0xis\0xka\0"
+    "xkc\0xkf\0xkj\0xkp\0xlc\0xld\0xly\0xmf\0xmn\0xmr\0xna\0xnr\0xpg\0"
+    "xpi\0xpm\0xpr\0xrm\0xrn\0xsa\0xsr\0xtq\0xub\0xuj\0xve\0xvi\0xwo\0"
+    "xzh\0yai\0ybh\0ybi\0ydg\0yea\0yej\0yeu\0ygp\0yhd\0yi\0yig\0yih\0"
+    "yiv\0ykg\0ykh\0yna\0ynk\0yoi\0yoy\0yrk\0ysd\0ysn\0ysp\0ysr\0ysy\0"
+    "yud\0yue\0yue_CN\0yug\0yux\0ywq\0ywu\0zau\0zba\0zch\0zdj\0zeh\0"
+    "zen\0zgb\0zgh\0zgm\0zgn\0zh\0zh_AU\0zh_BN\0zh_GB\0zh_GF\0zh_HK\0"
+    "zh_ID\0zh_MO\0zh_PA\0zh_PF\0zh_PH\0zh_SR\0zh_TH\0zh_TW\0zh_US\0"
+    "zh_VN\0zhd\0zhx\0zko\0zkt\0zkz\0zlj\0zln\0zlq\0zqe\0zrg\0zrp\0"
+    "zum\0zwa\0zyg\0zyn\0zzj\0";
 
 const int32_t defaultScriptTable[] = {
     0, 330,  // aaf -> Mlym
     4, 10,  // aao -> Arab
-    8, 150,  // aat -> Grek
-    12, 100,  // ab -> Cyrl
+    8, 155,  // aat -> Grek
+    12, 105,  // ab -> Cyrl
     15, 10,  // abh -> Arab
     19, 435,  // abl -> Rjng
     23, 10,  // abv -> Arab
@@ -121,64 +122,64 @@ const int32_t defaultScriptTable[] = {
     39, 10,  // acx -> Arab
     43, 10,  // adf -> Arab
     47, 555,  // adx -> Tibt
-    51, 100,  // ady -> Cyrl
+    51, 105,  // ady -> Cyrl
     55, 25,  // ae -> Avst
     58, 10,  // aeb -> Arab
     62, 10,  // aec -> Arab
     66, 10,  // aee -> Arab
     70, 10,  // aeq -> Arab
     74, 10,  // afb -> Arab
-    78, 105,  // agi -> Deva
-    82, 120,  // agj -> Ethi
-    86, 100,  // agx -> Cyrl
-    90, 120,  // ahg -> Ethi
+    78, 110,  // agi -> Deva
+    82, 125,  // agj -> Ethi
+    86, 105,  // agx -> Cyrl
+    90, 125,  // ahg -> Ethi
     94, 5,  // aho -> Ahom
-    98, 105,  // ahr -> Deva
+    98, 110,  // ahr -> Deva
     102, 10,  // aib -> Arab
     106, 495,  // aii -> Syrc
-    110, 185,  // aij -> Hebr
-    114, 220,  // ain -> Kana
+    110, 190,  // aij -> Hebr
+    114, 225,  // ain -> Kana
     118, 355,  // aio -> Mymr
     122, 10,  // aiq -> Arab
     126, 590,  // akk -> Xsux
-    130, 100,  // akv -> Cyrl
+    130, 105,  // akv -> Cyrl
     134, 260,  // alk -> Laoo
     138, 330,  // all -> Mlym
-    142, 100,  // alr -> Cyrl
-    146, 100,  // alt -> Cyrl
-    150, 120,  // alw -> Ethi
-    154, 120,  // am -> Ethi
-    157, 210,  // ams -> Jpan
+    142, 105,  // alr -> Cyrl
+    146, 105,  // alt -> Cyrl
+    150, 125,  // alw -> Ethi
+    154, 125,  // am -> Ethi
+    157, 215,  // ams -> Jpan
     161, 495,  // amw -> Syrc
-    165, 100,  // ani -> Cyrl
-    169, 105,  // anp -> Deva
-    173, 105,  // anq -> Deva
-    177, 105,  // anr -> Deva
-    181, 120,  // anu -> Ethi
-    185, 45,  // aot -> Beng
+    165, 105,  // ani -> Cyrl
+    169, 110,  // anp -> Deva
+    173, 110,  // anq -> Deva
+    177, 110,  // anr -> Deva
+    181, 125,  // anu -> Ethi
+    185, 50,  // aot -> Beng
     189, 10,  // apc -> Arab
     193, 10,  // apd -> Arab
-    197, 105,  // aph -> Deva
-    201, 100,  // aqc -> Cyrl
+    197, 110,  // aph -> Deva
+    201, 105,  // aqc -> Cyrl
     205, 10,  // ar -> Arab
     208, 15,  // arc -> Armi
     212, 10,  // arq -> Arab
     216, 10,  // ars -> Arab
     220, 10,  // ary -> Arab
     224, 10,  // arz -> Arab
-    228, 45,  // as -> Beng
+    228, 50,  // as -> Beng
     231, 465,  // ase -> Sgnw
     235, 10,  // ask -> Arab
-    239, 105,  // asr -> Deva
+    239, 110,  // asr -> Deva
     243, 10,  // atn -> Arab
-    247, 100,  // atv -> Cyrl
+    247, 105,  // atv -> Cyrl
     251, 10,  // auj -> Arab
     255, 10,  // auz -> Arab
-    259, 100,  // av -> Cyrl
+    259, 105,  // av -> Cyrl
     262, 10,  // avd -> Arab
     266, 10,  // avl -> Arab
-    270, 105,  // awa -> Deva
-    274, 120,  // awn -> Ethi
+    270, 110,  // awa -> Deva
+    274, 125,  // awn -> Ethi
     278, 20,  // axm -> Armn
     282, 10,  // ayh -> Arab
     286, 10,  // ayl -> Arab
@@ -186,971 +187,973 @@ const int32_t defaultScriptTable[] = {
     294, 10,  // ayp -> Arab
     298, 10,  // az_IQ -> Arab
     304, 10,  // az_IR -> Arab
-    310, 100,  // az_RU -> Cyrl
+    310, 105,  // az_RU -> Cyrl
     316, 10,  // azb -> Arab
-    320, 100,  // ba -> Cyrl
+    320, 105,  // ba -> Cyrl
     323, 10,  // bal -> Arab
-    327, 105,  // bap -> Deva
-    331, 30,  // bax -> Bamu
-    335, 125,  // bbl -> Geor
-    339, 120,  // bcq -> Ethi
+    327, 110,  // bap -> Deva
+    331, 35,  // bax -> Bamu
+    335, 130,  // bbl -> Geor
+    339, 125,  // bcq -> Ethi
     343, 395,  // bdv -> Orya
     347, 10,  // bdz -> Arab
-    351, 100,  // be -> Cyrl
-    354, 105,  // bee -> Deva
+    351, 105,  // be -> Cyrl
+    354, 110,  // bee -> Deva
     358, 10,  // bej -> Arab
-    362, 105,  // bfb -> Deva
+    362, 110,  // bfb -> Deva
     366, 520,  // bfq -> Taml
     370, 10,  // bft -> Arab
     374, 555,  // bfu -> Tibt
     378, 395,  // bfw -> Orya
-    382, 105,  // bfy -> Deva
-    386, 105,  // bfz -> Deva
-    390, 100,  // bg -> Cyrl
-    393, 105,  // bgc -> Deva
-    397, 105,  // bgd -> Deva
+    382, 110,  // bfy -> Deva
+    386, 110,  // bfz -> Deva
+    390, 105,  // bg -> Cyrl
+    393, 110,  // bgc -> Deva
+    397, 110,  // bgd -> Deva
     401, 10,  // bgn -> Arab
     405, 10,  // bgp -> Arab
-    409, 105,  // bgq -> Deva
-    413, 105,  // bgw -> Deva
-    417, 150,  // bgx -> Grek
-    421, 105,  // bha -> Deva
-    425, 105,  // bhb -> Deva
-    429, 105,  // bhd -> Deva
+    409, 110,  // bgq -> Deva
+    413, 110,  // bgw -> Deva
+    417, 155,  // bgx -> Grek
+    421, 110,  // bha -> Deva
+    425, 110,  // bhb -> Deva
+    429, 110,  // bhd -> Deva
     433, 10,  // bhe -> Arab
-    437, 100,  // bhh -> Cyrl
-    441, 105,  // bhi -> Deva
-    445, 105,  // bhj -> Deva
+    437, 105,  // bhh -> Cyrl
+    441, 110,  // bhi -> Deva
+    445, 110,  // bhj -> Deva
     449, 10,  // bhm -> Arab
     453, 495,  // bhn -> Syrc
-    457, 105,  // bho -> Deva
-    461, 105,  // bht -> Deva
-    465, 105,  // bhu -> Deva
-    469, 105,  // biy -> Deva
+    457, 110,  // bho -> Deva
+    461, 110,  // bht -> Deva
+    465, 110,  // bhu -> Deva
+    469, 110,  // biy -> Deva
     473, 495,  // bjf -> Syrc
-    477, 105,  // bjj -> Deva
+    477, 110,  // bjj -> Deva
     481, 10,  // bjm -> Arab
     485, 555,  // bkk -> Tibt
     489, 355,  // blk -> Mymr
     493, 530,  // blt -> Tavt
-    497, 105,  // bmj -> Deva
-    501, 45,  // bn -> Beng
-    504, 105,  // bns -> Deva
+    497, 110,  // bmj -> Deva
+    501, 50,  // bn -> Beng
+    504, 110,  // bns -> Deva
     508, 555,  // bo -> Tibt
-    511, 100,  // bph -> Cyrl
-    515, 105,  // bpx -> Deva
-    519, 45,  // bpy -> Beng
+    511, 105,  // bph -> Cyrl
+    515, 110,  // bpx -> Deva
+    519, 50,  // bpy -> Beng
     523, 10,  // bqi -> Arab
-    527, 105,  // bra -> Deva
+    527, 110,  // bra -> Deva
     531, 235,  // brb -> Khmr
-    535, 105,  // brd -> Deva
+    535, 110,  // brd -> Deva
     539, 10,  // brh -> Arab
     543, 10,  // brk -> Arab
     547, 555,  // bro -> Tibt
     551, 260,  // brv -> Laoo
     555, 245,  // brw -> Knda
-    559, 105,  // brx -> Deva
+    559, 110,  // brx -> Deva
     563, 10,  // bsh -> Arab
     567, 10,  // bsk -> Arab
-    571, 35,  // bsq -> Bass
-    575, 120,  // bst -> Ethi
-    579, 40,  // btd -> Batk
-    583, 40,  // btm -> Batk
-    587, 105,  // btv -> Deva
-    591, 100,  // bua -> Cyrl
+    571, 40,  // bsq -> Bass
+    575, 125,  // bst -> Ethi
+    579, 45,  // btd -> Batk
+    583, 45,  // btm -> Batk
+    587, 110,  // btv -> Deva
+    591, 105,  // bua -> Cyrl
     595, 355,  // bwe -> Mymr
-    599, 100,  // bxm -> Cyrl
+    599, 105,  // bxm -> Cyrl
     603, 340,  // bxu -> Mong
-    607, 105,  // byh -> Deva
-    611, 120,  // byn -> Ethi
-    615, 105,  // byw -> Deva
+    607, 110,  // byh -> Deva
+    611, 125,  // byn -> Ethi
+    615, 110,  // byw -> Deva
     619, 550,  // bzi -> Thai
     623, 550,  // cbn -> Thai
-    627, 60,  // ccp -> Cakm
+    627, 65,  // ccp -> Cakm
     631, 535,  // cde -> Telu
-    635, 105,  // cdh -> Deva
-    639, 155,  // cdi -> Gujr
-    643, 105,  // cdj -> Deva
-    647, 105,  // cdm -> Deva
-    651, 175,  // cdo -> Hans
-    655, 45,  // cdz -> Beng
-    659, 100,  // ce -> Cyrl
+    635, 110,  // cdh -> Deva
+    639, 160,  // cdi -> Gujr
+    643, 110,  // cdj -> Deva
+    647, 110,  // cdm -> Deva
+    651, 180,  // cdo -> Hans
+    655, 50,  // cdz -> Beng
+    659, 105,  // ce -> Cyrl
     662, 555,  // cgk -> Tibt
     666, 10,  // chg -> Arab
-    670, 100,  // chm -> Cyrl
-    674, 80,  // chr -> Cher
-    678, 105,  // chx -> Deva
-    682, 105,  // cih -> Deva
+    670, 105,  // chm -> Cyrl
+    674, 85,  // chr -> Cher
+    678, 110,  // chx -> Deva
+    682, 110,  // cih -> Deva
     686, 10,  // cja -> Arab
-    690, 100,  // cji -> Cyrl
-    694, 75,  // cjm -> Cham
-    698, 175,  // cjy -> Hans
+    690, 105,  // cji -> Cyrl
+    694, 80,  // cjm -> Cham
+    698, 180,  // cjy -> Hans
     702, 10,  // ckb -> Arab
-    706, 100,  // ckt -> Cyrl
+    706, 105,  // ckt -> Cyrl
     710, 10,  // clh -> Arab
-    714, 100,  // clw -> Cyrl
+    714, 105,  // clw -> Cyrl
     718, 485,  // cmg -> Soyo
     722, 555,  // cna -> Tibt
-    726, 175,  // cnp -> Hans
+    726, 180,  // cnp -> Hans
     730, 550,  // cog -> Thai
-    734, 90,  // cop -> Copt
-    738, 150,  // cpg -> Grek
-    742, 65,  // cr -> Cans
-    745, 100,  // crh -> Cyrl
-    749, 65,  // crj -> Cans
-    753, 65,  // crk -> Cans
-    757, 65,  // crl -> Cans
-    761, 65,  // crm -> Cans
+    734, 95,  // cop -> Copt
+    738, 155,  // cpg -> Grek
+    742, 70,  // cr -> Cans
+    745, 105,  // crh -> Cyrl
+    749, 70,  // crj -> Cans
+    753, 70,  // crk -> Cans
+    757, 70,  // crl -> Cans
+    761, 70,  // crm -> Cans
     765, 355,  // csh -> Mymr
-    769, 175,  // csp -> Hans
-    773, 65,  // csw -> Cans
+    769, 180,  // csp -> Hans
+    773, 70,  // csw -> Cans
     777, 410,  // ctd -> Pauc
-    781, 45,  // ctg -> Beng
-    785, 105,  // ctn -> Deva
+    781, 50,  // ctg -> Beng
+    785, 110,  // ctn -> Deva
     789, 520,  // ctt -> Taml
     793, 520,  // cty -> Taml
-    797, 100,  // cu -> Cyrl
+    797, 105,  // cu -> Cyrl
     800, 255,  // cuu -> Lana
-    804, 100,  // cv -> Cyrl
-    807, 175,  // czh -> Hans
-    811, 185,  // czk -> Hebr
-    815, 105,  // daq -> Deva
-    819, 100,  // dar -> Cyrl
+    804, 105,  // cv -> Cyrl
+    807, 180,  // czh -> Hans
+    811, 190,  // czk -> Hebr
+    815, 110,  // daq -> Deva
+    819, 105,  // dar -> Cyrl
     823, 10,  // dcc -> Arab
-    827, 100,  // ddo -> Cyrl
+    827, 105,  // ddo -> Cyrl
     831, 10,  // def -> Arab
     835, 10,  // deh -> Arab
-    839, 45,  // der -> Beng
+    839, 50,  // der -> Beng
     843, 10,  // dgl -> Arab
-    847, 105,  // dhi -> Deva
-    851, 155,  // dhn -> Gujr
-    855, 105,  // dho -> Deva
-    859, 105,  // dhw -> Deva
+    847, 110,  // dhi -> Deva
+    851, 160,  // dhn -> Gujr
+    855, 110,  // dho -> Deva
+    859, 110,  // dhw -> Deva
     863, 555,  // dka -> Tibt
-    867, 100,  // dlg -> Cyrl
+    867, 105,  // dlg -> Cyrl
     871, 320,  // dmf -> Medf
     875, 10,  // dmk -> Arab
     879, 10,  // dml -> Arab
-    883, 100,  // dng -> Cyrl
+    883, 105,  // dng -> Cyrl
     887, 355,  // dnu -> Mymr
     891, 355,  // dnv -> Mymr
-    895, 105,  // doi -> Deva
-    899, 120,  // dox -> Ethi
+    895, 110,  // doi -> Deva
+    899, 125,  // dox -> Ethi
     903, 555,  // dre -> Tibt
-    907, 105,  // drq -> Deva
-    911, 120,  // drs -> Ethi
-    915, 105,  // dry -> Deva
+    907, 110,  // drq -> Deva
+    911, 125,  // drs -> Ethi
+    915, 110,  // dry -> Deva
     919, 395,  // dso -> Orya
-    923, 105,  // dty -> Deva
-    927, 155,  // dub -> Gujr
-    931, 105,  // duh -> Deva
-    935, 105,  // dus -> Deva
+    923, 110,  // dty -> Deva
+    927, 160,  // dub -> Gujr
+    931, 110,  // duh -> Deva
+    935, 110,  // dus -> Deva
     939, 545,  // dv -> Thaa
     942, 395,  // dwk -> Orya
-    946, 105,  // dwz -> Deva
+    946, 110,  // dwz -> Deva
     950, 555,  // dz -> Tibt
     953, 555,  // dzl -> Tibt
-    957, 150,  // ecr -> Grek
-    961, 95,  // ecy -> Cprt
-    965, 110,  // egy -> Egyp
-    969, 215,  // eky -> Kali
-    973, 150,  // el -> Grek
-    976, 105,  // emg -> Deva
-    980, 105,  // emu -> Deva
-    984, 100,  // enf -> Cyrl
-    988, 100,  // enh -> Cyrl
+    957, 155,  // ecr -> Grek
+    961, 100,  // ecy -> Cprt
+    965, 115,  // egy -> Egyp
+    969, 220,  // eky -> Kali
+    973, 155,  // el -> Grek
+    976, 110,  // emg -> Deva
+    980, 110,  // emu -> Deva
+    984, 105,  // enf -> Cyrl
+    988, 105,  // enh -> Cyrl
     992, 520,  // era -> Taml
-    996, 135,  // esg -> Gonm
+    996, 140,  // esg -> Gonm
     1000, 10,  // esh -> Arab
-    1004, 200,  // ett -> Ital
-    1008, 100,  // eve -> Cyrl
-    1012, 100,  // evn -> Cyrl
+    1004, 205,  // ett -> Ital
+    1008, 105,  // eve -> Cyrl
+    1012, 105,  // evn -> Cyrl
     1016, 10,  // fa -> Arab
     1019, 10,  // fay -> Arab
     1023, 10,  // faz -> Arab
     1027, 10,  // fia -> Arab
-    1031, 105,  // fmu -> Deva
+    1031, 110,  // fmu -> Deva
     1035, 10,  // fub -> Arab
-    1039, 175,  // gan -> Hans
+    1039, 180,  // gan -> Hans
     1043, 395,  // gaq -> Orya
-    1047, 155,  // gas -> Gujr
+    1047, 160,  // gas -> Gujr
     1051, 535,  // gau -> Telu
     1055, 395,  // gbj -> Orya
-    1059, 105,  // gbk -> Deva
-    1063, 155,  // gbl -> Gujr
-    1067, 105,  // gbm -> Deva
+    1059, 110,  // gbk -> Deva
+    1063, 160,  // gbl -> Gujr
+    1067, 110,  // gbm -> Deva
     1071, 10,  // gbz -> Arab
     1075, 395,  // gdb -> Orya
-    1079, 100,  // gdo -> Cyrl
-    1083, 105,  // gdx -> Deva
-    1087, 120,  // gez -> Ethi
+    1079, 105,  // gdo -> Cyrl
+    1083, 110,  // gdx -> Deva
+    1087, 125,  // gez -> Ethi
     1091, 10,  // ggg -> Arab
     1095, 10,  // gha -> Arab
-    1099, 105,  // ghe -> Deva
+    1099, 110,  // ghe -> Deva
     1103, 540,  // gho -> Tfng
     1107, 10,  // ghr -> Arab
     1111, 555,  // ght -> Tibt
     1115, 10,  // gig -> Arab
-    1119, 100,  // gin -> Cyrl
+    1119, 105,  // gin -> Cyrl
     1123, 10,  // gjk -> Arab
     1127, 10,  // gju -> Arab
-    1131, 100,  // gld -> Cyrl
+    1131, 105,  // gld -> Cyrl
     1135, 10,  // glh -> Arab
     1139, 10,  // glk -> Arab
     1143, 265,  // gml -> Latf
-    1147, 120,  // gmv -> Ethi
+    1147, 125,  // gmv -> Ethi
     1151, 285,  // gmy -> Linb
     1155, 555,  // goe -> Tibt
-    1159, 120,  // gof -> Ethi
-    1163, 105,  // goj -> Deva
-    1167, 105,  // gok -> Deva
-    1171, 105,  // gon -> Deva
-    1175, 140,  // got -> Goth
-    1179, 105,  // gra -> Deva
-    1183, 95,  // grc -> Cprt
-    1187, 45,  // grt -> Beng
-    1191, 120,  // gru -> Ethi
-    1195, 155,  // gu -> Gujr
-    1198, 105,  // gvr -> Deva
+    1159, 125,  // gof -> Ethi
+    1163, 110,  // goj -> Deva
+    1167, 110,  // gok -> Deva
+    1171, 110,  // gon -> Deva
+    1175, 145,  // got -> Goth
+    1179, 110,  // gra -> Deva
+    1183, 155,  // grc -> Grek
+    1187, 50,  // grt -> Beng
+    1191, 125,  // gru -> Ethi
+    1195, 160,  // gu -> Gujr
+    1198, 110,  // gvr -> Deva
     1202, 10,  // gwc -> Arab
     1206, 10,  // gwf -> Arab
     1210, 10,  // gwt -> Arab
-    1214, 105,  // gyo -> Deva
+    1214, 110,  // gyo -> Deva
     1218, 10,  // gzi -> Arab
     1222, 10,  // ha_CM -> Arab
     1228, 10,  // ha_SD -> Arab
     1234, 10,  // hac -> Arab
-    1238, 175,  // hak -> Hans
-    1242, 120,  // har -> Ethi
-    1246, 10,  // haz -> Arab
-    1250, 185,  // hbo -> Hebr
-    1254, 120,  // hdy -> Ethi
-    1258, 185,  // he -> Hebr
-    1261, 105,  // hi -> Deva
-    1264, 105,  // hif -> Deva
-    1268, 505,  // hii -> Takr
-    1272, 590,  // hit -> Xsux
-    1276, 10,  // hkh -> Arab
-    1280, 105,  // hlb -> Deva
-    1284, 190,  // hlu -> Hluw
-    1288, 425,  // hmd -> Plrd
-    1292, 50,  // hmj -> Bopo
-    1296, 50,  // hmq -> Bopo
-    1300, 10,  // hnd -> Arab
-    1304, 105,  // hne -> Deva
-    1308, 195,  // hnj -> Hmnp
-    1312, 10,  // hno -> Arab
-    1316, 105,  // hoc -> Deva
-    1320, 10,  // hoh -> Arab
-    1324, 105,  // hoj -> Deva
-    1328, 170,  // how -> Hani
-    1332, 105,  // hoy -> Deva
-    1336, 355,  // hpo -> Mymr
-    1340, 495,  // hrt -> Syrc
-    1344, 10,  // hrz -> Arab
-    1348, 175,  // hsn -> Hans
-    1352, 10,  // hss -> Arab
-    1356, 590,  // htx -> Xsux
-    1360, 105,  // hut -> Deva
-    1364, 185,  // huy -> Hebr
-    1368, 100,  // huz -> Cyrl
-    1372, 20,  // hy -> Armn
-    1375, 20,  // hyw -> Armn
-    1379, 595,  // ii -> Yiii
-    1382, 295,  // imy -> Lyci
-    1386, 100,  // inh -> Cyrl
-    1390, 355,  // int -> Mymr
-    1394, 120,  // ior -> Ethi
-    1398, 520,  // iru -> Taml
-    1402, 10,  // isk -> Arab
-    1406, 185,  // itk -> Hebr
-    1410, 100,  // itl -> Cyrl
-    1414, 65,  // iu -> Cans
-    1417, 185,  // iw -> Hebr
-    1420, 210,  // ja -> Jpan
-    1423, 10,  // jad -> Arab
-    1427, 10,  // jat -> Arab
-    1431, 185,  // jbe -> Hebr
-    1435, 10,  // jbn -> Arab
-    1439, 100,  // jct -> Cyrl
-    1443, 555,  // jda -> Tibt
-    1447, 10,  // jdg -> Arab
-    1451, 100,  // jdt -> Cyrl
-    1455, 105,  // jee -> Deva
-    1459, 125,  // jge -> Geor
-    1463, 185,  // ji -> Hebr
-    1466, 165,  // jje -> Hang
-    1470, 355,  // jkm -> Mymr
-    1474, 105,  // jml -> Deva
-    1478, 505,  // jna -> Takr
-    1482, 10,  // jnd -> Arab
-    1486, 105,  // jnl -> Deva
-    1490, 105,  // jns -> Deva
-    1494, 10,  // jog -> Arab
-    1498, 185,  // jpa -> Hebr
-    1502, 185,  // jpr -> Hebr
-    1506, 185,  // jrb -> Hebr
-    1510, 105,  // jul -> Deva
-    1514, 395,  // jun -> Orya
-    1518, 395,  // juy -> Orya
-    1522, 555,  // jya -> Tibt
-    1526, 185,  // jye -> Hebr
-    1530, 125,  // ka -> Geor
-    1533, 100,  // kaa -> Cyrl
-    1537, 100,  // kap -> Cyrl
-    1541, 225,  // kaw -> Kawi
-    1545, 100,  // kbd -> Cyrl
-    1549, 555,  // kbg -> Tibt
-    1553, 10,  // kbu -> Arab
-    1557, 10,  // kby -> Arab
-    1561, 100,  // kca -> Cyrl
-    1565, 10,  // kcy -> Arab
-    1569, 45,  // kdq -> Beng
-    1573, 550,  // kdt -> Thai
-    1577, 100,  // ket -> Cyrl
-    1581, 330,  // kev -> Mlym
-    1585, 105,  // kex -> Deva
-    1589, 535,  // key -> Telu
-    1593, 245,  // kfa -> Knda
-    1597, 105,  // kfb -> Deva
-    1601, 535,  // kfc -> Telu
-    1605, 245,  // kfd -> Knda
-    1609, 520,  // kfe -> Taml
-    1613, 245,  // kfg -> Knda
-    1617, 330,  // kfh -> Mlym
-    1621, 520,  // kfi -> Taml
-    1625, 105,  // kfk -> Deva
-    1629, 10,  // kfm -> Arab
-    1633, 105,  // kfp -> Deva
-    1637, 105,  // kfq -> Deva
-    1641, 105,  // kfr -> Deva
-    1645, 105,  // kfs -> Deva
-    1649, 105,  // kfu -> Deva
-    1653, 105,  // kfx -> Deva
-    1657, 105,  // kfy -> Deva
-    1661, 105,  // kgj -> Deva
-    1665, 105,  // kgy -> Deva
-    1669, 515,  // khb -> Talu
-    1673, 550,  // khf -> Thai
-    1677, 555,  // khg -> Tibt
-    1681, 105,  // khn -> Deva
-    1685, 55,  // kho -> Brah
-    1689, 355,  // kht -> Mymr
-    1693, 100,  // khv -> Cyrl
-    1697, 10,  // khw -> Arab
-    1701, 105,  // kif -> Deva
-    1705, 100,  // kim -> Cyrl
-    1709, 105,  // kip -> Deva
-    1713, 260,  // kjg -> Laoo
-    1717, 100,  // kjh -> Cyrl
-    1721, 105,  // kjl -> Deva
-    1725, 105,  // kjo -> Deva
-    1729, 355,  // kjp -> Mymr
-    1733, 550,  // kjt -> Thai
-    1737, 555,  // kjz -> Tibt
-    1741, 100,  // kk -> Cyrl
-    1744, 10,  // kk_AF -> Arab
-    1750, 10,  // kk_CN -> Arab
-    1756, 10,  // kk_IR -> Arab
-    1762, 10,  // kk_MN -> Arab
-    1768, 555,  // kkf -> Tibt
-    1772, 255,  // kkh -> Lana
-    1776, 105,  // kkt -> Deva
-    1780, 105,  // kle -> Deva
-    1784, 10,  // klj -> Arab
-    1788, 105,  // klr -> Deva
-    1792, 235,  // km -> Khmr
-    1795, 105,  // kmj -> Deva
-    1799, 10,  // kmz -> Arab
-    1803, 245,  // kn -> Knda
-    1806, 105,  // knn -> Deva
-    1810, 250,  // ko -> Kore
-    1813, 100,  // koi -> Cyrl
-    1817, 105,  // kok -> Deva
-    1821, 100,  // kpt -> Cyrl
-    1825, 100,  // kpy -> Cyrl
-    1829, 495,  // kqd -> Syrc
-    1833, 120,  // kqy -> Ethi
-    1837, 105,  // kra -> Deva
-    1841, 100,  // krc -> Cyrl
-    1845, 100,  // krk -> Cyrl
-    1849, 235,  // krr -> Khmr
-    1853, 105,  // kru -> Deva
-    1857, 235,  // krv -> Khmr
-    1861, 10,  // ks -> Arab
-    1864, 355,  // ksu -> Mymr
-    1868, 355,  // ksw -> Mymr
-    1872, 105,  // ksz -> Deva
-    1876, 120,  // ktb -> Ethi
-    1880, 105,  // kte -> Deva
-    1884, 10,  // ktl -> Arab
-    1888, 425,  // ktp -> Plrd
-    1892, 10,  // ku_LB -> Arab
-    1898, 260,  // kuf -> Laoo
-    1902, 100,  // kum -> Cyrl
-    1906, 100,  // kv -> Cyrl
-    1909, 100,  // kva -> Cyrl
-    1913, 355,  // kvq -> Mymr
-    1917, 355,  // kvt -> Mymr
-    1921, 10,  // kvx -> Arab
-    1925, 215,  // kvy -> Kali
-    1929, 355,  // kxf -> Mymr
-    1933, 355,  // kxk -> Mymr
-    1937, 550,  // kxm -> Thai
-    1941, 10,  // kxp -> Arab
-    1945, 100,  // ky -> Cyrl
-    1948, 10,  // ky_CN -> Arab
-    1954, 215,  // kyu -> Kali
-    1958, 105,  // kyv -> Deva
-    1962, 105,  // kyw -> Deva
-    1966, 280,  // lab -> Lina
-    1970, 185,  // lad -> Hebr
-    1974, 105,  // lae -> Deva
-    1978, 10,  // lah -> Arab
-    1982, 100,  // lbe -> Cyrl
-    1986, 105,  // lbf -> Deva
-    1990, 555,  // lbj -> Tibt
-    1994, 105,  // lbm -> Deva
-    1998, 260,  // lbo -> Laoo
-    2002, 105,  // lbr -> Deva
-    2006, 550,  // lcp -> Thai
-    2010, 275,  // lep -> Lepc
-    2014, 100,  // lez -> Cyrl
-    2018, 105,  // lhm -> Deva
-    2022, 495,  // lhs -> Syrc
-    2026, 105,  // lif -> Deva
-    2030, 290,  // lis -> Lisu
-    2034, 555,  // lkh -> Tibt
-    2038, 10,  // lki -> Arab
-    2042, 105,  // lmh -> Deva
-    2046, 535,  // lmn -> Telu
-    2050, 260,  // lo -> Laoo
-    2053, 105,  // loy -> Deva
-    2057, 425,  // lpo -> Plrd
-    2061, 10,  // lrc -> Arab
-    2065, 10,  // lrk -> Arab
-    2069, 10,  // lrl -> Arab
-    2073, 10,  // lsa -> Arab
-    2077, 185,  // lsd -> Hebr
-    2081, 10,  // lss -> Arab
-    2085, 180,  // ltc -> Hant
-    2089, 555,  // luk -> Tibt
-    2093, 105,  // luu -> Deva
-    2097, 10,  // luv -> Arab
-    2101, 10,  // luz -> Arab
-    2105, 550,  // lwl -> Thai
-    2109, 550,  // lwm -> Thai
-    2113, 555,  // lya -> Tibt
-    2117, 175,  // lzh -> Hans
-    2121, 105,  // mag -> Deva
-    2125, 105,  // mai -> Deva
-    2129, 370,  // man_GN -> Nkoo
-    2136, 10,  // mby -> Arab
-    2140, 10,  // mde -> Arab
-    2144, 100,  // mdf -> Cyrl
-    2148, 120,  // mdx -> Ethi
-    2152, 120,  // mdy -> Ethi
-    2156, 10,  // mfa -> Arab
-    2160, 10,  // mfi -> Arab
-    2164, 270,  // mga -> Latg
-    2168, 105,  // mgp -> Deva
-    2172, 10,  // mhj -> Arab
-    2176, 305,  // mid -> Mand
-    2180, 105,  // mjl -> Deva
-    2184, 330,  // mjq -> Mlym
-    2188, 330,  // mjr -> Mlym
-    2192, 105,  // mjt -> Deva
-    2196, 535,  // mju -> Telu
-    2200, 330,  // mjv -> Mlym
-    2204, 105,  // mjz -> Deva
-    2208, 100,  // mk -> Cyrl
-    2211, 105,  // mkb -> Deva
-    2215, 105,  // mke -> Deva
-    2219, 10,  // mki -> Arab
-    2223, 550,  // mkm -> Thai
-    2227, 330,  // ml -> Mlym
-    2230, 550,  // mlf -> Thai
-    2234, 100,  // mn -> Cyrl
-    2237, 340,  // mn_CN -> Mong
-    2243, 340,  // mnc -> Mong
-    2247, 45,  // mni -> Beng
-    2251, 10,  // mnj -> Arab
-    2255, 100,  // mns -> Cyrl
-    2259, 355,  // mnw -> Mymr
-    2263, 550,  // mpz -> Thai
-    2267, 105,  // mr -> Deva
-    2270, 550,  // mra -> Thai
-    2274, 105,  // mrd -> Deva
-    2278, 100,  // mrj -> Cyrl
-    2282, 345,  // mro -> Mroo
-    2286, 105,  // mrr -> Deva
-    2290, 10,  // ms_CC -> Arab
-    2296, 100,  // mtm -> Cyrl
-    2300, 105,  // mtr -> Deva
-    2304, 100,  // mud -> Cyrl
-    2308, 555,  // muk -> Tibt
-    2312, 105,  // mut -> Deva
-    2316, 520,  // muv -> Taml
-    2320, 120,  // muz -> Ethi
-    2324, 10,  // mve -> Arab
-    2328, 340,  // mvf -> Mong
-    2332, 10,  // mvy -> Arab
-    2336, 120,  // mvz -> Ethi
-    2340, 105,  // mwr -> Deva
-    2344, 355,  // mwt -> Mymr
-    2348, 195,  // mww -> Hmnp
-    2352, 355,  // my -> Mymr
-    2355, 120,  // mym -> Ethi
-    2359, 100,  // myv -> Cyrl
-    2363, 305,  // myz -> Mand
-    2367, 10,  // mzn -> Arab
-    2371, 175,  // nan -> Hans
-    2375, 105,  // nao -> Deva
-    2379, 105,  // ncd -> Deva
-    2383, 260,  // ncq -> Laoo
-    2387, 100,  // ndf -> Cyrl
-    2391, 105,  // ne -> Deva
-    2394, 100,  // neg -> Cyrl
-    2398, 555,  // neh -> Tibt
-    2402, 590,  // nei -> Xsux
-    2406, 105,  // new -> Deva
-    2410, 260,  // ngt -> Laoo
-    2414, 100,  // nio -> Cyrl
-    2418, 535,  // nit -> Telu
-    2422, 100,  // niv -> Cyrl
-    2426, 10,  // nli -> Arab
-    2430, 10,  // nlm -> Arab
-    2434, 105,  // nlx -> Deva
-    2438, 105,  // nmm -> Deva
-    2442, 580,  // nnp -> Wcho
-    2446, 255,  // nod -> Lana
-    2450, 105,  // noe -> Deva
-    2454, 100,  // nog -> Cyrl
-    2458, 105,  // noi -> Deva
-    2462, 445,  // non -> Runr
-    2466, 595,  // nos -> Yiii
-    2470, 555,  // npb -> Tibt
-    2474, 370,  // nqo -> Nkoo
-    2478, 445,  // nrn -> Runr
-    2482, 595,  // nsd -> Yiii
-    2486, 595,  // nsf -> Yiii
-    2490, 65,  // nsk -> Cans
-    2494, 560,  // nst -> Tnsa
-    2498, 595,  // nsv -> Yiii
-    2502, 595,  // nty -> Yiii
-    2506, 10,  // ntz -> Arab
-    2510, 365,  // nwc -> Newa
-    2514, 105,  // nwx -> Deva
-    2518, 550,  // nyl -> Thai
-    2522, 10,  // nyq -> Arab
-    2526, 550,  // nyw -> Thai
-    2530, 100,  // oaa -> Cyrl
-    2534, 100,  // oac -> Cyrl
-    2538, 495,  // oar -> Syrc
-    2542, 125,  // oav -> Geor
-    2546, 420,  // obm -> Phnx
-    2550, 355,  // obr -> Mymr
-    2554, 10,  // odk -> Arab
-    2558, 590,  // oht -> Xsux
-    2562, 65,  // oj -> Cans
-    2565, 65,  // ojs -> Cans
-    2569, 165,  // okm -> Hang
-    2573, 170,  // oko -> Hani
-    2577, 235,  // okz -> Khmr
-    2581, 105,  // ola -> Deva
-    2585, 555,  // ole -> Tibt
-    2589, 100,  // omk -> Cyrl
-    2593, 350,  // omp -> Mtei
-    2597, 335,  // omr -> Modi
-    2601, 355,  // omx -> Mymr
-    2605, 105,  // oon -> Deva
-    2609, 395,  // or -> Orya
-    2612, 535,  // ort -> Telu
-    2616, 10,  // oru -> Arab
-    2620, 100,  // orv -> Cyrl
-    2624, 100,  // os -> Cyrl
-    2627, 400,  // osa -> Osge
-    2631, 200,  // osc -> Ital
-    2635, 205,  // osi -> Java
-    2639, 10,  // ota -> Arab
-    2643, 555,  // otb -> Tibt
-    2647, 390,  // otk -> Orkh
-    2651, 145,  // oty -> Gran
-    2655, 405,  // oui -> Ougr
-    2659, 160,  // pa -> Guru
-    2662, 10,  // pa_PK -> Arab
-    2668, 415,  // pal -> Phli
-    2672, 100,  // paq -> Cyrl
-    2676, 10,  // pbt -> Arab
-    2680, 235,  // pcb -> Khmr
-    2684, 355,  // pce -> Mymr
-    2688, 330,  // pcf -> Mlym
-    2692, 330,  // pcg -> Mlym
-    2696, 105,  // pch -> Deva
-    2700, 105,  // pci -> Deva
-    2704, 535,  // pcj -> Telu
-    2708, 395,  // peg -> Orya
-    2712, 585,  // peo -> Xpeo
-    2716, 230,  // pgd -> Khar
-    2720, 105,  // pgg -> Deva
-    2724, 380,  // pgl -> Ogam
-    2728, 200,  // pgn -> Ital
-    2732, 105,  // phd -> Deva
-    2736, 355,  // phk -> Mymr
-    2740, 10,  // phl -> Arab
-    2744, 420,  // phn -> Phnx
-    2748, 260,  // pho -> Laoo
-    2752, 10,  // phr -> Arab
-    2756, 550,  // pht -> Thai
-    2760, 550,  // phu -> Thai
-    2764, 10,  // phv -> Arab
-    2768, 105,  // phw -> Deva
-    2772, 470,  // pi -> Sinh
-    2775, 55,  // pka -> Brah
-    2779, 330,  // pkr -> Mlym
-    2783, 10,  // plk -> Arab
-    2787, 355,  // pll -> Mymr
-    2791, 55,  // pmh -> Brah
-    2795, 150,  // pnt -> Grek
-    2799, 230,  // pra -> Khar
-    2803, 10,  // prc -> Arab
-    2807, 10,  // prd -> Arab
-    2811, 550,  // prt -> Thai
-    2815, 10,  // prx -> Arab
-    2819, 10,  // ps -> Arab
-    2822, 10,  // psh -> Arab
-    2826, 10,  // psi -> Arab
-    2830, 10,  // pst -> Arab
-    2834, 55,  // psu -> Brah
-    2838, 105,  // pum -> Deva
-    2842, 355,  // pwo -> Mymr
-    2846, 105,  // pwr -> Deva
-    2850, 550,  // pww -> Thai
-    2854, 355,  // pyx -> Mymr
-    2858, 10,  // qxq -> Arab
-    2862, 105,  // raa -> Deva
-    2866, 105,  // rab -> Deva
-    2870, 105,  // raf -> Deva
-    2874, 45,  // rah -> Beng
-    2878, 105,  // raj -> Deva
-    2882, 105,  // rav -> Deva
-    2886, 355,  // rbb -> Mymr
-    2890, 10,  // rdb -> Arab
-    2894, 395,  // rei -> Orya
-    2898, 440,  // rhg -> Rohg
-    2902, 105,  // rji -> Deva
-    2906, 105,  // rjs -> Deva
-    2910, 235,  // rka -> Khmr
-    2914, 355,  // rki -> Mymr
-    2918, 45,  // rkt -> Beng
-    2922, 20,  // rmi -> Armn
-    2926, 10,  // rmt -> Arab
-    2930, 355,  // rmz -> Mymr
-    2934, 100,  // rsk -> Cyrl
-    2938, 105,  // rtw -> Deva
-    2942, 100,  // ru -> Cyrl
-    2945, 100,  // rue -> Cyrl
-    2949, 100,  // rut -> Cyrl
-    2953, 105,  // rwr -> Deva
-    2957, 220,  // ryu -> Kana
-    2961, 105,  // sa -> Deva
-    2964, 100,  // sah -> Cyrl
-    2968, 450,  // sam -> Samr
-    2972, 385,  // sat -> Olck
-    2976, 460,  // saz -> Saur
-    2980, 10,  // sbn -> Arab
-    2984, 555,  // sbu -> Tibt
-    2988, 105,  // sck -> Deva
-    2992, 10,  // scl -> Arab
-    2996, 105,  // scp -> Deva
-    3000, 260,  // sct -> Laoo
-    3004, 505,  // scu -> Takr
-    3008, 150,  // scx -> Grek
-    3012, 10,  // sd -> Arab
-    3015, 105,  // sd_IN -> Deva
-    3021, 10,  // sdb -> Arab
-    3025, 10,  // sdf -> Arab
-    3029, 10,  // sdg -> Arab
-    3033, 10,  // sdh -> Arab
-    3037, 45,  // sdr -> Beng
-    3041, 10,  // sds -> Arab
-    3045, 100,  // sel -> Cyrl
-    3049, 425,  // sfm -> Plrd
-    3053, 380,  // sga -> Ogam
-    3057, 100,  // sgh -> Cyrl
-    3061, 105,  // sgj -> Deva
-    3065, 10,  // sgr -> Arab
-    3069, 555,  // sgt -> Tibt
-    3073, 120,  // sgw -> Ethi
-    3077, 10,  // sgy -> Arab
-    3081, 10,  // shd -> Arab
-    3085, 540,  // shi -> Tfng
-    3089, 10,  // shm -> Arab
-    3093, 355,  // shn -> Mymr
-    3097, 10,  // shu -> Arab
-    3101, 10,  // shv -> Arab
-    3105, 470,  // si -> Sinh
-    3108, 100,  // sia -> Cyrl
-    3112, 555,  // sip -> Tibt
-    3116, 10,  // siy -> Arab
-    3120, 10,  // siz -> Arab
-    3124, 100,  // sjd -> Cyrl
-    3128, 105,  // sjp -> Deva
-    3132, 100,  // sjt -> Cyrl
-    3136, 550,  // skb -> Thai
-    3140, 105,  // skj -> Deva
-    3144, 10,  // skr -> Arab
-    3148, 595,  // smh -> Yiii
-    3152, 450,  // smp -> Samr
-    3156, 235,  // smu -> Khmr
-    3160, 10,  // smy -> Arab
-    3164, 530,  // soa -> Tavt
-    3168, 475,  // sog -> Sogd
-    3172, 105,  // soi -> Deva
-    3176, 550,  // sou -> Thai
-    3180, 555,  // spt -> Tibt
-    3184, 395,  // spv -> Orya
-    3188, 10,  // sqo -> Arab
-    3192, 260,  // sqq -> Laoo
-    3196, 10,  // sqt -> Arab
-    3200, 100,  // sr -> Cyrl
-    3203, 480,  // srb -> Sora
-    3207, 10,  // srh -> Arab
-    3211, 105,  // srx -> Deva
-    3215, 10,  // srz -> Arab
-    3219, 10,  // ssh -> Arab
-    3223, 260,  // sss -> Laoo
-    3227, 10,  // sts -> Arab
-    3231, 120,  // stv -> Ethi
-    3235, 100,  // sty -> Cyrl
-    3239, 490,  // suz -> Sunu
-    3243, 125,  // sva -> Geor
-    3247, 10,  // swb -> Arab
-    3251, 170,  // swi -> Hani
-    3255, 105,  // swv -> Deva
-    3259, 445,  // sxu -> Runr
-    3263, 495,  // syc -> Syrc
-    3267, 45,  // syl -> Beng
-    3271, 495,  // syn -> Syrc
-    3275, 495,  // syr -> Syrc
-    3279, 105,  // syw -> Deva
-    3283, 520,  // ta -> Taml
-    3286, 100,  // tab -> Cyrl
-    3290, 105,  // taj -> Deva
-    3294, 500,  // tbk -> Tagb
-    3298, 555,  // tcn -> Tibt
-    3302, 355,  // tco -> Mymr
-    3306, 520,  // tcx -> Taml
-    3310, 245,  // tcy -> Knda
-    3314, 540,  // tda -> Tfng
-    3318, 105,  // tdb -> Deva
-    3322, 510,  // tdd -> Tale
-    3326, 105,  // tdg -> Deva
-    3330, 105,  // tdh -> Deva
-    3334, 535,  // te -> Telu
-    3337, 205,  // tes -> Java
-    3341, 100,  // tg -> Cyrl
-    3344, 10,  // tg_PK -> Arab
-    3350, 105,  // tge -> Deva
-    3354, 555,  // tgf -> Tibt
-    3358, 550,  // th -> Thai
-    3361, 105,  // the -> Deva
-    3365, 105,  // thf -> Deva
-    3369, 510,  // thi -> Tale
-    3373, 105,  // thl -> Deva
-    3377, 550,  // thm -> Thai
-    3381, 105,  // thq -> Deva
-    3385, 105,  // thr -> Deva
-    3389, 105,  // ths -> Deva
-    3393, 120,  // ti -> Ethi
-    3396, 120,  // tig -> Ethi
-    3400, 105,  // tij -> Deva
-    3404, 100,  // tin -> Cyrl
-    3408, 355,  // tjl -> Mymr
-    3412, 10,  // tjo -> Arab
-    3416, 105,  // tkb -> Deva
-    3420, 10,  // tks -> Arab
-    3424, 105,  // tkt -> Deva
-    3428, 495,  // tmr -> Syrc
-    3432, 60,  // tnv -> Cakm
-    3436, 10,  // tov -> Arab
-    3440, 235,  // tpu -> Khmr
-    3444, 10,  // tra -> Arab
-    3448, 185,  // trg -> Hebr
-    3452, 10,  // trm -> Arab
-    3456, 10,  // trw -> Arab
-    3460, 150,  // tsd -> Grek
-    3464, 555,  // tsj -> Tibt
-    3468, 100,  // tt -> Cyrl
-    3471, 260,  // tth -> Laoo
-    3475, 260,  // tto -> Laoo
-    3479, 550,  // tts -> Thai
-    3483, 105,  // ttz -> Deva
-    3487, 355,  // tvn -> Mymr
-    3491, 105,  // twm -> Deva
-    3495, 525,  // txg -> Tang
-    3499, 565,  // txo -> Toto
-    3503, 530,  // tyr -> Tavt
-    3507, 100,  // tyv -> Cyrl
-    3511, 100,  // ude -> Cyrl
-    3515, 330,  // udg -> Mlym
-    3519, 100,  // udi -> Cyrl
-    3523, 100,  // udm -> Cyrl
-    3527, 10,  // ug -> Arab
-    3530, 100,  // ug_KZ -> Cyrl
-    3536, 100,  // ug_MN -> Cyrl
-    3542, 570,  // uga -> Ugar
-    3546, 100,  // ugh -> Cyrl
-    3550, 550,  // ugo -> Thai
-    3554, 100,  // uk -> Cyrl
-    3557, 395,  // uki -> Orya
-    3561, 100,  // ulc -> Cyrl
-    3565, 45,  // unr -> Beng
-    3569, 105,  // unr_NP -> Deva
-    3576, 45,  // unx -> Beng
-    3580, 10,  // ur -> Arab
-    3583, 550,  // urk -> Thai
-    3587, 10,  // ush -> Arab
-    3591, 150,  // uum -> Grek
-    3595, 10,  // uz_AF -> Arab
-    3601, 100,  // uz_CN -> Cyrl
-    3607, 10,  // uzs -> Arab
-    3611, 520,  // vaa -> Taml
-    3615, 10,  // vaf -> Arab
-    3619, 105,  // vah -> Deva
-    3623, 575,  // vai -> Vaii
-    3627, 105,  // vas -> Deva
-    3631, 105,  // vav -> Deva
-    3635, 105,  // vay -> Deva
-    3639, 10,  // vgr -> Arab
-    3643, 105,  // vjk -> Deva
-    3647, 245,  // vmd -> Knda
-    3651, 10,  // vmh -> Arab
-    3655, 120,  // wal -> Ethi
-    3659, 10,  // wbk -> Arab
-    3663, 535,  // wbq -> Telu
-    3667, 105,  // wbr -> Deva
-    3671, 120,  // wle -> Ethi
-    3675, 10,  // wlo -> Arab
-    3679, 105,  // wme -> Deva
-    3683, 10,  // wne -> Arab
-    3687, 10,  // wni -> Arab
-    3691, 130,  // wsg -> Gong
-    3695, 10,  // wsv -> Arab
-    3699, 105,  // wtm -> Deva
-    3703, 175,  // wuu -> Hans
-    3707, 0,  // xag -> Aghb
-    3711, 100,  // xal -> Cyrl
-    3715, 120,  // xan -> Ethi
-    3719, 100,  // xas -> Cyrl
-    3723, 85,  // xco -> Chrs
-    3727, 70,  // xcr -> Cari
-    3731, 100,  // xdq -> Cyrl
-    3735, 10,  // xhe -> Arab
-    3739, 235,  // xhm -> Khmr
-    3743, 395,  // xis -> Orya
-    3747, 10,  // xka -> Arab
-    3751, 10,  // xkc -> Arab
-    3755, 555,  // xkf -> Tibt
-    3759, 10,  // xkj -> Arab
-    3763, 10,  // xkp -> Arab
-    3767, 295,  // xlc -> Lyci
-    3771, 300,  // xld -> Lydi
-    3775, 115,  // xly -> Elym
-    3779, 125,  // xmf -> Geor
-    3783, 310,  // xmn -> Mani
-    3787, 325,  // xmr -> Merc
-    3791, 360,  // xna -> Narb
-    3795, 105,  // xnr -> Deva
-    3799, 150,  // xpg -> Grek
-    3803, 380,  // xpi -> Ogam
-    3807, 100,  // xpm -> Cyrl
-    3811, 430,  // xpr -> Prti
-    3815, 100,  // xrm -> Cyrl
-    3819, 100,  // xrn -> Cyrl
-    3823, 455,  // xsa -> Sarb
-    3827, 105,  // xsr -> Deva
-    3831, 55,  // xtq -> Brah
-    3835, 520,  // xub -> Taml
-    3839, 520,  // xuj -> Taml
-    3843, 200,  // xve -> Ital
-    3847, 10,  // xvi -> Arab
-    3851, 100,  // xwo -> Cyrl
-    3855, 315,  // xzh -> Marc
-    3859, 100,  // yai -> Cyrl
-    3863, 105,  // ybh -> Deva
-    3867, 105,  // ybi -> Deva
-    3871, 10,  // ydg -> Arab
-    3875, 330,  // yea -> Mlym
-    3879, 150,  // yej -> Grek
-    3883, 535,  // yeu -> Telu
-    3887, 425,  // ygp -> Plrd
-    3891, 185,  // yhd -> Hebr
-    3895, 185,  // yi -> Hebr
-    3898, 595,  // yig -> Yiii
-    3902, 185,  // yih -> Hebr
-    3906, 595,  // yiv -> Yiii
-    3910, 100,  // ykg -> Cyrl
-    3914, 100,  // ykh -> Cyrl
-    3918, 425,  // yna -> Plrd
-    3922, 100,  // ynk -> Cyrl
-    3926, 210,  // yoi -> Jpan
-    3930, 550,  // yoy -> Thai
-    3934, 100,  // yrk -> Cyrl
-    3938, 595,  // ysd -> Yiii
-    3942, 595,  // ysn -> Yiii
-    3946, 595,  // ysp -> Yiii
-    3950, 100,  // ysr -> Cyrl
-    3954, 425,  // ysy -> Plrd
-    3958, 185,  // yud -> Hebr
-    3962, 180,  // yue -> Hant
-    3966, 175,  // yue_CN -> Hans
-    3973, 100,  // yug -> Cyrl
-    3977, 100,  // yux -> Cyrl
-    3981, 425,  // ywq -> Plrd
-    3985, 425,  // ywu -> Plrd
-    3989, 555,  // zau -> Tibt
-    3993, 10,  // zba -> Arab
-    3997, 170,  // zch -> Hani
-    4001, 10,  // zdj -> Arab
-    4005, 170,  // zeh -> Hani
-    4009, 540,  // zen -> Tfng
-    4013, 170,  // zgb -> Hani
-    4017, 540,  // zgh -> Tfng
-    4021, 170,  // zgm -> Hani
-    4025, 170,  // zgn -> Hani
-    4029, 175,  // zh -> Hans
-    4032, 180,  // zh_AU -> Hant
-    4038, 180,  // zh_BN -> Hant
-    4044, 180,  // zh_GB -> Hant
-    4050, 180,  // zh_GF -> Hant
-    4056, 180,  // zh_HK -> Hant
-    4062, 180,  // zh_ID -> Hant
-    4068, 180,  // zh_MO -> Hant
-    4074, 180,  // zh_PA -> Hant
-    4080, 180,  // zh_PF -> Hant
-    4086, 180,  // zh_PH -> Hant
-    4092, 180,  // zh_SR -> Hant
-    4098, 180,  // zh_TH -> Hant
-    4104, 180,  // zh_TW -> Hant
-    4110, 180,  // zh_US -> Hant
-    4116, 180,  // zh_VN -> Hant
-    4122, 170,  // zhd -> Hani
-    4126, 375,  // zhx -> Nshu
-    4130, 100,  // zko -> Cyrl
-    4134, 240,  // zkt -> Kits
-    4138, 100,  // zkz -> Cyrl
-    4142, 170,  // zlj -> Hani
-    4146, 170,  // zln -> Hani
-    4150, 170,  // zlq -> Hani
-    4154, 170,  // zqe -> Hani
-    4158, 395,  // zrg -> Orya
-    4162, 185,  // zrp -> Hebr
-    4166, 10,  // zum -> Arab
-    4170, 120,  // zwa -> Ethi
-    4174, 170,  // zyg -> Hani
-    4178, 170,  // zyn -> Hani
-    4182, 170,  // zzj -> Hani
+    1238, 180,  // hak -> Hans
+    1242, 185,  // hak_TW -> Hant
+    1249, 125,  // har -> Ethi
+    1253, 10,  // haz -> Arab
+    1257, 190,  // hbo -> Hebr
+    1261, 125,  // hdy -> Ethi
+    1265, 190,  // he -> Hebr
+    1268, 110,  // hi -> Deva
+    1271, 110,  // hif -> Deva
+    1275, 505,  // hii -> Takr
+    1279, 590,  // hit -> Xsux
+    1283, 10,  // hkh -> Arab
+    1287, 110,  // hlb -> Deva
+    1291, 195,  // hlu -> Hluw
+    1295, 425,  // hmd -> Plrd
+    1299, 55,  // hmj -> Bopo
+    1303, 55,  // hmq -> Bopo
+    1307, 10,  // hnd -> Arab
+    1311, 110,  // hne -> Deva
+    1315, 200,  // hnj -> Hmnp
+    1319, 10,  // hno -> Arab
+    1323, 110,  // hoc -> Deva
+    1327, 10,  // hoh -> Arab
+    1331, 110,  // hoj -> Deva
+    1335, 175,  // how -> Hani
+    1339, 110,  // hoy -> Deva
+    1343, 355,  // hpo -> Mymr
+    1347, 495,  // hrt -> Syrc
+    1351, 10,  // hrz -> Arab
+    1355, 180,  // hsn -> Hans
+    1359, 10,  // hss -> Arab
+    1363, 590,  // htx -> Xsux
+    1367, 110,  // hut -> Deva
+    1371, 190,  // huy -> Hebr
+    1375, 105,  // huz -> Cyrl
+    1379, 20,  // hy -> Armn
+    1382, 20,  // hyw -> Armn
+    1386, 595,  // ii -> Yiii
+    1389, 295,  // imy -> Lyci
+    1393, 105,  // inh -> Cyrl
+    1397, 355,  // int -> Mymr
+    1401, 125,  // ior -> Ethi
+    1405, 520,  // iru -> Taml
+    1409, 10,  // isk -> Arab
+    1413, 190,  // itk -> Hebr
+    1417, 105,  // itl -> Cyrl
+    1421, 70,  // iu -> Cans
+    1424, 190,  // iw -> Hebr
+    1427, 215,  // ja -> Jpan
+    1430, 10,  // jad -> Arab
+    1434, 10,  // jat -> Arab
+    1438, 190,  // jbe -> Hebr
+    1442, 10,  // jbn -> Arab
+    1446, 105,  // jct -> Cyrl
+    1450, 555,  // jda -> Tibt
+    1454, 10,  // jdg -> Arab
+    1458, 105,  // jdt -> Cyrl
+    1462, 110,  // jee -> Deva
+    1466, 130,  // jge -> Geor
+    1470, 190,  // ji -> Hebr
+    1473, 170,  // jje -> Hang
+    1477, 355,  // jkm -> Mymr
+    1481, 110,  // jml -> Deva
+    1485, 505,  // jna -> Takr
+    1489, 10,  // jnd -> Arab
+    1493, 110,  // jnl -> Deva
+    1497, 110,  // jns -> Deva
+    1501, 10,  // jog -> Arab
+    1505, 190,  // jpa -> Hebr
+    1509, 190,  // jpr -> Hebr
+    1513, 190,  // jrb -> Hebr
+    1517, 110,  // jul -> Deva
+    1521, 395,  // jun -> Orya
+    1525, 395,  // juy -> Orya
+    1529, 555,  // jya -> Tibt
+    1533, 190,  // jye -> Hebr
+    1537, 130,  // ka -> Geor
+    1540, 105,  // kaa -> Cyrl
+    1544, 105,  // kap -> Cyrl
+    1548, 30,  // kaw -> Bali
+    1552, 105,  // kbd -> Cyrl
+    1556, 555,  // kbg -> Tibt
+    1560, 10,  // kbu -> Arab
+    1564, 10,  // kby -> Arab
+    1568, 105,  // kca -> Cyrl
+    1572, 10,  // kcy -> Arab
+    1576, 50,  // kdq -> Beng
+    1580, 550,  // kdt -> Thai
+    1584, 105,  // ket -> Cyrl
+    1588, 330,  // kev -> Mlym
+    1592, 110,  // kex -> Deva
+    1596, 535,  // key -> Telu
+    1600, 245,  // kfa -> Knda
+    1604, 110,  // kfb -> Deva
+    1608, 535,  // kfc -> Telu
+    1612, 245,  // kfd -> Knda
+    1616, 520,  // kfe -> Taml
+    1620, 245,  // kfg -> Knda
+    1624, 330,  // kfh -> Mlym
+    1628, 520,  // kfi -> Taml
+    1632, 110,  // kfk -> Deva
+    1636, 10,  // kfm -> Arab
+    1640, 110,  // kfp -> Deva
+    1644, 110,  // kfq -> Deva
+    1648, 110,  // kfr -> Deva
+    1652, 110,  // kfs -> Deva
+    1656, 110,  // kfu -> Deva
+    1660, 110,  // kfx -> Deva
+    1664, 110,  // kfy -> Deva
+    1668, 110,  // kgj -> Deva
+    1672, 110,  // kgy -> Deva
+    1676, 515,  // khb -> Talu
+    1680, 550,  // khf -> Thai
+    1684, 555,  // khg -> Tibt
+    1688, 110,  // khn -> Deva
+    1692, 60,  // kho -> Brah
+    1696, 355,  // kht -> Mymr
+    1700, 105,  // khv -> Cyrl
+    1704, 10,  // khw -> Arab
+    1708, 110,  // kif -> Deva
+    1712, 105,  // kim -> Cyrl
+    1716, 110,  // kip -> Deva
+    1720, 260,  // kjg -> Laoo
+    1724, 105,  // kjh -> Cyrl
+    1728, 110,  // kjl -> Deva
+    1732, 110,  // kjo -> Deva
+    1736, 355,  // kjp -> Mymr
+    1740, 550,  // kjt -> Thai
+    1744, 555,  // kjz -> Tibt
+    1748, 105,  // kk -> Cyrl
+    1751, 10,  // kk_AF -> Arab
+    1757, 10,  // kk_CN -> Arab
+    1763, 10,  // kk_IR -> Arab
+    1769, 10,  // kk_MN -> Arab
+    1775, 555,  // kkf -> Tibt
+    1779, 255,  // kkh -> Lana
+    1783, 110,  // kkt -> Deva
+    1787, 110,  // kle -> Deva
+    1791, 10,  // klj -> Arab
+    1795, 110,  // klr -> Deva
+    1799, 235,  // km -> Khmr
+    1802, 110,  // kmj -> Deva
+    1806, 10,  // kmz -> Arab
+    1810, 245,  // kn -> Knda
+    1813, 110,  // knn -> Deva
+    1817, 250,  // ko -> Kore
+    1820, 105,  // koi -> Cyrl
+    1824, 110,  // kok -> Deva
+    1828, 105,  // kpt -> Cyrl
+    1832, 105,  // kpy -> Cyrl
+    1836, 495,  // kqd -> Syrc
+    1840, 125,  // kqy -> Ethi
+    1844, 110,  // kra -> Deva
+    1848, 105,  // krc -> Cyrl
+    1852, 105,  // krk -> Cyrl
+    1856, 235,  // krr -> Khmr
+    1860, 110,  // kru -> Deva
+    1864, 235,  // krv -> Khmr
+    1868, 10,  // ks -> Arab
+    1871, 355,  // ksu -> Mymr
+    1875, 355,  // ksw -> Mymr
+    1879, 110,  // ksz -> Deva
+    1883, 125,  // ktb -> Ethi
+    1887, 110,  // kte -> Deva
+    1891, 10,  // ktl -> Arab
+    1895, 425,  // ktp -> Plrd
+    1899, 10,  // ku_LB -> Arab
+    1905, 260,  // kuf -> Laoo
+    1909, 105,  // kum -> Cyrl
+    1913, 105,  // kv -> Cyrl
+    1916, 105,  // kva -> Cyrl
+    1920, 355,  // kvq -> Mymr
+    1924, 355,  // kvt -> Mymr
+    1928, 10,  // kvx -> Arab
+    1932, 220,  // kvy -> Kali
+    1936, 355,  // kxf -> Mymr
+    1940, 355,  // kxk -> Mymr
+    1944, 550,  // kxm -> Thai
+    1948, 10,  // kxp -> Arab
+    1952, 105,  // ky -> Cyrl
+    1955, 10,  // ky_CN -> Arab
+    1961, 220,  // kyu -> Kali
+    1965, 110,  // kyv -> Deva
+    1969, 110,  // kyw -> Deva
+    1973, 280,  // lab -> Lina
+    1977, 190,  // lad -> Hebr
+    1981, 110,  // lae -> Deva
+    1985, 10,  // lah -> Arab
+    1989, 105,  // lbe -> Cyrl
+    1993, 110,  // lbf -> Deva
+    1997, 555,  // lbj -> Tibt
+    2001, 110,  // lbm -> Deva
+    2005, 260,  // lbo -> Laoo
+    2009, 110,  // lbr -> Deva
+    2013, 550,  // lcp -> Thai
+    2017, 275,  // lep -> Lepc
+    2021, 105,  // lez -> Cyrl
+    2025, 110,  // lhm -> Deva
+    2029, 495,  // lhs -> Syrc
+    2033, 110,  // lif -> Deva
+    2037, 290,  // lis -> Lisu
+    2041, 555,  // lkh -> Tibt
+    2045, 10,  // lki -> Arab
+    2049, 110,  // lmh -> Deva
+    2053, 535,  // lmn -> Telu
+    2057, 260,  // lo -> Laoo
+    2060, 110,  // loy -> Deva
+    2064, 425,  // lpo -> Plrd
+    2068, 10,  // lrc -> Arab
+    2072, 10,  // lrk -> Arab
+    2076, 10,  // lrl -> Arab
+    2080, 10,  // lsa -> Arab
+    2084, 190,  // lsd -> Hebr
+    2088, 10,  // lss -> Arab
+    2092, 185,  // ltc -> Hant
+    2096, 555,  // luk -> Tibt
+    2100, 110,  // luu -> Deva
+    2104, 10,  // luv -> Arab
+    2108, 10,  // luz -> Arab
+    2112, 550,  // lwl -> Thai
+    2116, 550,  // lwm -> Thai
+    2120, 555,  // lya -> Tibt
+    2124, 180,  // lzh -> Hans
+    2128, 130,  // lzz_GE -> Geor
+    2135, 110,  // mag -> Deva
+    2139, 110,  // mai -> Deva
+    2143, 10,  // mby -> Arab
+    2147, 10,  // mde -> Arab
+    2151, 105,  // mdf -> Cyrl
+    2155, 125,  // mdx -> Ethi
+    2159, 125,  // mdy -> Ethi
+    2163, 10,  // mfa -> Arab
+    2167, 10,  // mfi -> Arab
+    2171, 270,  // mga -> Latg
+    2175, 110,  // mgp -> Deva
+    2179, 10,  // mhj -> Arab
+    2183, 305,  // mid -> Mand
+    2187, 110,  // mjl -> Deva
+    2191, 330,  // mjq -> Mlym
+    2195, 330,  // mjr -> Mlym
+    2199, 110,  // mjt -> Deva
+    2203, 535,  // mju -> Telu
+    2207, 330,  // mjv -> Mlym
+    2211, 110,  // mjz -> Deva
+    2215, 105,  // mk -> Cyrl
+    2218, 110,  // mkb -> Deva
+    2222, 110,  // mke -> Deva
+    2226, 10,  // mki -> Arab
+    2230, 550,  // mkm -> Thai
+    2234, 330,  // ml -> Mlym
+    2237, 550,  // mlf -> Thai
+    2241, 105,  // mn -> Cyrl
+    2244, 340,  // mn_CN -> Mong
+    2250, 340,  // mnc -> Mong
+    2254, 50,  // mni -> Beng
+    2258, 10,  // mnj -> Arab
+    2262, 105,  // mns -> Cyrl
+    2266, 355,  // mnw -> Mymr
+    2270, 550,  // mpz -> Thai
+    2274, 110,  // mr -> Deva
+    2277, 550,  // mra -> Thai
+    2281, 110,  // mrd -> Deva
+    2285, 105,  // mrj -> Cyrl
+    2289, 345,  // mro -> Mroo
+    2293, 110,  // mrr -> Deva
+    2297, 10,  // ms_CC -> Arab
+    2303, 105,  // mtm -> Cyrl
+    2307, 110,  // mtr -> Deva
+    2311, 105,  // mud -> Cyrl
+    2315, 555,  // muk -> Tibt
+    2319, 110,  // mut -> Deva
+    2323, 520,  // muv -> Taml
+    2327, 125,  // muz -> Ethi
+    2331, 10,  // mve -> Arab
+    2335, 340,  // mvf -> Mong
+    2339, 10,  // mvy -> Arab
+    2343, 125,  // mvz -> Ethi
+    2347, 110,  // mwr -> Deva
+    2351, 355,  // mwt -> Mymr
+    2355, 200,  // mww -> Hmnp
+    2359, 355,  // my -> Mymr
+    2362, 125,  // mym -> Ethi
+    2366, 105,  // myv -> Cyrl
+    2370, 305,  // myz -> Mand
+    2374, 10,  // mzn -> Arab
+    2378, 180,  // nan -> Hans
+    2382, 185,  // nan_TW -> Hant
+    2389, 110,  // nao -> Deva
+    2393, 110,  // ncd -> Deva
+    2397, 260,  // ncq -> Laoo
+    2401, 105,  // ndf -> Cyrl
+    2405, 110,  // ne -> Deva
+    2408, 105,  // neg -> Cyrl
+    2412, 555,  // neh -> Tibt
+    2416, 590,  // nei -> Xsux
+    2420, 110,  // new -> Deva
+    2424, 260,  // ngt -> Laoo
+    2428, 105,  // nio -> Cyrl
+    2432, 535,  // nit -> Telu
+    2436, 105,  // niv -> Cyrl
+    2440, 10,  // nli -> Arab
+    2444, 10,  // nlm -> Arab
+    2448, 110,  // nlx -> Deva
+    2452, 110,  // nmm -> Deva
+    2456, 580,  // nnp -> Wcho
+    2460, 255,  // nod -> Lana
+    2464, 110,  // noe -> Deva
+    2468, 105,  // nog -> Cyrl
+    2472, 110,  // noi -> Deva
+    2476, 445,  // non -> Runr
+    2480, 595,  // nos -> Yiii
+    2484, 555,  // npb -> Tibt
+    2488, 370,  // nqo -> Nkoo
+    2492, 445,  // nrn -> Runr
+    2496, 595,  // nsd -> Yiii
+    2500, 595,  // nsf -> Yiii
+    2504, 70,  // nsk -> Cans
+    2508, 560,  // nst -> Tnsa
+    2512, 595,  // nsv -> Yiii
+    2516, 595,  // nty -> Yiii
+    2520, 10,  // ntz -> Arab
+    2524, 365,  // nwc -> Newa
+    2528, 110,  // nwx -> Deva
+    2532, 550,  // nyl -> Thai
+    2536, 10,  // nyq -> Arab
+    2540, 550,  // nyw -> Thai
+    2544, 105,  // oaa -> Cyrl
+    2548, 105,  // oac -> Cyrl
+    2552, 495,  // oar -> Syrc
+    2556, 130,  // oav -> Geor
+    2560, 420,  // obm -> Phnx
+    2564, 355,  // obr -> Mymr
+    2568, 10,  // odk -> Arab
+    2572, 590,  // oht -> Xsux
+    2576, 70,  // oj -> Cans
+    2579, 70,  // ojs -> Cans
+    2583, 170,  // okm -> Hang
+    2587, 175,  // oko -> Hani
+    2591, 235,  // okz -> Khmr
+    2595, 110,  // ola -> Deva
+    2599, 555,  // ole -> Tibt
+    2603, 105,  // omk -> Cyrl
+    2607, 350,  // omp -> Mtei
+    2611, 335,  // omr -> Modi
+    2615, 355,  // omx -> Mymr
+    2619, 110,  // oon -> Deva
+    2623, 395,  // or -> Orya
+    2626, 535,  // ort -> Telu
+    2630, 10,  // oru -> Arab
+    2634, 105,  // orv -> Cyrl
+    2638, 105,  // os -> Cyrl
+    2641, 400,  // osa -> Osge
+    2645, 205,  // osc -> Ital
+    2649, 210,  // osi -> Java
+    2653, 10,  // ota -> Arab
+    2657, 555,  // otb -> Tibt
+    2661, 390,  // otk -> Orkh
+    2665, 150,  // oty -> Gran
+    2669, 405,  // oui -> Ougr
+    2673, 165,  // pa -> Guru
+    2676, 10,  // pa_PK -> Arab
+    2682, 415,  // pal -> Phli
+    2686, 105,  // paq -> Cyrl
+    2690, 10,  // pbt -> Arab
+    2694, 235,  // pcb -> Khmr
+    2698, 355,  // pce -> Mymr
+    2702, 330,  // pcf -> Mlym
+    2706, 330,  // pcg -> Mlym
+    2710, 110,  // pch -> Deva
+    2714, 110,  // pci -> Deva
+    2718, 535,  // pcj -> Telu
+    2722, 395,  // peg -> Orya
+    2726, 585,  // peo -> Xpeo
+    2730, 230,  // pgd -> Khar
+    2734, 110,  // pgg -> Deva
+    2738, 380,  // pgl -> Ogam
+    2742, 205,  // pgn -> Ital
+    2746, 110,  // phd -> Deva
+    2750, 355,  // phk -> Mymr
+    2754, 10,  // phl -> Arab
+    2758, 420,  // phn -> Phnx
+    2762, 260,  // pho -> Laoo
+    2766, 10,  // phr -> Arab
+    2770, 550,  // pht -> Thai
+    2774, 550,  // phu -> Thai
+    2778, 10,  // phv -> Arab
+    2782, 110,  // phw -> Deva
+    2786, 470,  // pi -> Sinh
+    2789, 60,  // pka -> Brah
+    2793, 330,  // pkr -> Mlym
+    2797, 10,  // plk -> Arab
+    2801, 355,  // pll -> Mymr
+    2805, 60,  // pmh -> Brah
+    2809, 155,  // pnt -> Grek
+    2813, 105,  // pnt_RU -> Cyrl
+    2820, 230,  // pra -> Khar
+    2824, 10,  // prc -> Arab
+    2828, 10,  // prd -> Arab
+    2832, 550,  // prt -> Thai
+    2836, 10,  // prx -> Arab
+    2840, 10,  // ps -> Arab
+    2843, 10,  // psh -> Arab
+    2847, 10,  // psi -> Arab
+    2851, 10,  // pst -> Arab
+    2855, 60,  // psu -> Brah
+    2859, 110,  // pum -> Deva
+    2863, 355,  // pwo -> Mymr
+    2867, 110,  // pwr -> Deva
+    2871, 550,  // pww -> Thai
+    2875, 355,  // pyx -> Mymr
+    2879, 10,  // qxq -> Arab
+    2883, 110,  // raa -> Deva
+    2887, 110,  // rab -> Deva
+    2891, 110,  // raf -> Deva
+    2895, 50,  // rah -> Beng
+    2899, 110,  // raj -> Deva
+    2903, 110,  // rav -> Deva
+    2907, 355,  // rbb -> Mymr
+    2911, 10,  // rdb -> Arab
+    2915, 395,  // rei -> Orya
+    2919, 440,  // rhg -> Rohg
+    2923, 110,  // rji -> Deva
+    2927, 110,  // rjs -> Deva
+    2931, 235,  // rka -> Khmr
+    2935, 355,  // rki -> Mymr
+    2939, 50,  // rkt -> Beng
+    2943, 20,  // rmi -> Armn
+    2947, 10,  // rmt -> Arab
+    2951, 355,  // rmz -> Mymr
+    2955, 105,  // rsk -> Cyrl
+    2959, 110,  // rtw -> Deva
+    2963, 105,  // ru -> Cyrl
+    2966, 105,  // rue -> Cyrl
+    2970, 105,  // rut -> Cyrl
+    2974, 110,  // rwr -> Deva
+    2978, 225,  // ryu -> Kana
+    2982, 110,  // sa -> Deva
+    2985, 105,  // sah -> Cyrl
+    2989, 450,  // sam -> Samr
+    2993, 385,  // sat -> Olck
+    2997, 460,  // saz -> Saur
+    3001, 10,  // sbn -> Arab
+    3005, 555,  // sbu -> Tibt
+    3009, 110,  // sck -> Deva
+    3013, 10,  // scl -> Arab
+    3017, 110,  // scp -> Deva
+    3021, 260,  // sct -> Laoo
+    3025, 505,  // scu -> Takr
+    3029, 155,  // scx -> Grek
+    3033, 10,  // sd -> Arab
+    3036, 110,  // sd_IN -> Deva
+    3042, 10,  // sdb -> Arab
+    3046, 10,  // sdf -> Arab
+    3050, 10,  // sdg -> Arab
+    3054, 10,  // sdh -> Arab
+    3058, 50,  // sdr -> Beng
+    3062, 10,  // sds -> Arab
+    3066, 105,  // sel -> Cyrl
+    3070, 425,  // sfm -> Plrd
+    3074, 105,  // sgh -> Cyrl
+    3078, 110,  // sgj -> Deva
+    3082, 10,  // sgr -> Arab
+    3086, 555,  // sgt -> Tibt
+    3090, 125,  // sgw -> Ethi
+    3094, 10,  // sgy -> Arab
+    3098, 10,  // shd -> Arab
+    3102, 540,  // shi -> Tfng
+    3106, 10,  // shm -> Arab
+    3110, 355,  // shn -> Mymr
+    3114, 10,  // shu -> Arab
+    3118, 10,  // shv -> Arab
+    3122, 470,  // si -> Sinh
+    3125, 105,  // sia -> Cyrl
+    3129, 555,  // sip -> Tibt
+    3133, 10,  // siy -> Arab
+    3137, 10,  // siz -> Arab
+    3141, 105,  // sjd -> Cyrl
+    3145, 110,  // sjp -> Deva
+    3149, 105,  // sjt -> Cyrl
+    3153, 550,  // skb -> Thai
+    3157, 110,  // skj -> Deva
+    3161, 10,  // skr -> Arab
+    3165, 595,  // smh -> Yiii
+    3169, 450,  // smp -> Samr
+    3173, 235,  // smu -> Khmr
+    3177, 10,  // smy -> Arab
+    3181, 530,  // soa -> Tavt
+    3185, 475,  // sog -> Sogd
+    3189, 110,  // soi -> Deva
+    3193, 550,  // sou -> Thai
+    3197, 555,  // spt -> Tibt
+    3201, 395,  // spv -> Orya
+    3205, 10,  // sqo -> Arab
+    3209, 260,  // sqq -> Laoo
+    3213, 10,  // sqt -> Arab
+    3217, 105,  // sr -> Cyrl
+    3220, 480,  // srb -> Sora
+    3224, 10,  // srh -> Arab
+    3228, 110,  // srx -> Deva
+    3232, 10,  // srz -> Arab
+    3236, 10,  // ssh -> Arab
+    3240, 260,  // sss -> Laoo
+    3244, 10,  // sts -> Arab
+    3248, 125,  // stv -> Ethi
+    3252, 105,  // sty -> Cyrl
+    3256, 490,  // suz -> Sunu
+    3260, 130,  // sva -> Geor
+    3264, 10,  // swb -> Arab
+    3268, 175,  // swi -> Hani
+    3272, 110,  // swv -> Deva
+    3276, 445,  // sxu -> Runr
+    3280, 495,  // syc -> Syrc
+    3284, 50,  // syl -> Beng
+    3288, 495,  // syn -> Syrc
+    3292, 495,  // syr -> Syrc
+    3296, 110,  // syw -> Deva
+    3300, 520,  // ta -> Taml
+    3303, 105,  // tab -> Cyrl
+    3307, 110,  // taj -> Deva
+    3311, 500,  // tbk -> Tagb
+    3315, 555,  // tcn -> Tibt
+    3319, 355,  // tco -> Mymr
+    3323, 520,  // tcx -> Taml
+    3327, 245,  // tcy -> Knda
+    3331, 540,  // tda -> Tfng
+    3335, 110,  // tdb -> Deva
+    3339, 510,  // tdd -> Tale
+    3343, 110,  // tdg -> Deva
+    3347, 110,  // tdh -> Deva
+    3351, 535,  // te -> Telu
+    3354, 210,  // tes -> Java
+    3358, 105,  // tg -> Cyrl
+    3361, 10,  // tg_PK -> Arab
+    3367, 110,  // tge -> Deva
+    3371, 555,  // tgf -> Tibt
+    3375, 550,  // th -> Thai
+    3378, 110,  // the -> Deva
+    3382, 110,  // thf -> Deva
+    3386, 510,  // thi -> Tale
+    3390, 110,  // thl -> Deva
+    3394, 550,  // thm -> Thai
+    3398, 110,  // thq -> Deva
+    3402, 110,  // thr -> Deva
+    3406, 110,  // ths -> Deva
+    3410, 125,  // ti -> Ethi
+    3413, 125,  // tig -> Ethi
+    3417, 110,  // tij -> Deva
+    3421, 105,  // tin -> Cyrl
+    3425, 355,  // tjl -> Mymr
+    3429, 10,  // tjo -> Arab
+    3433, 110,  // tkb -> Deva
+    3437, 10,  // tks -> Arab
+    3441, 110,  // tkt -> Deva
+    3445, 495,  // tmr -> Syrc
+    3449, 65,  // tnv -> Cakm
+    3453, 10,  // tov -> Arab
+    3457, 235,  // tpu -> Khmr
+    3461, 10,  // tra -> Arab
+    3465, 190,  // trg -> Hebr
+    3469, 10,  // trm -> Arab
+    3473, 10,  // trw -> Arab
+    3477, 155,  // tsd -> Grek
+    3481, 555,  // tsj -> Tibt
+    3485, 105,  // tt -> Cyrl
+    3488, 260,  // tth -> Laoo
+    3492, 260,  // tto -> Laoo
+    3496, 550,  // tts -> Thai
+    3500, 110,  // ttz -> Deva
+    3504, 355,  // tvn -> Mymr
+    3508, 110,  // twm -> Deva
+    3512, 525,  // txg -> Tang
+    3516, 565,  // txo -> Toto
+    3520, 530,  // tyr -> Tavt
+    3524, 105,  // tyv -> Cyrl
+    3528, 105,  // ude -> Cyrl
+    3532, 330,  // udg -> Mlym
+    3536, 105,  // udi -> Cyrl
+    3540, 105,  // udm -> Cyrl
+    3544, 10,  // ug -> Arab
+    3547, 105,  // ug_KZ -> Cyrl
+    3553, 105,  // ug_MN -> Cyrl
+    3559, 570,  // uga -> Ugar
+    3563, 105,  // ugh -> Cyrl
+    3567, 550,  // ugo -> Thai
+    3571, 105,  // uk -> Cyrl
+    3574, 395,  // uki -> Orya
+    3578, 105,  // ulc -> Cyrl
+    3582, 50,  // unr -> Beng
+    3586, 110,  // unr_NP -> Deva
+    3593, 50,  // unx -> Beng
+    3597, 10,  // ur -> Arab
+    3600, 550,  // urk -> Thai
+    3604, 10,  // ush -> Arab
+    3608, 155,  // uum -> Grek
+    3612, 10,  // uz_AF -> Arab
+    3618, 105,  // uz_CN -> Cyrl
+    3624, 10,  // uzs -> Arab
+    3628, 520,  // vaa -> Taml
+    3632, 10,  // vaf -> Arab
+    3636, 110,  // vah -> Deva
+    3640, 575,  // vai -> Vaii
+    3644, 110,  // vas -> Deva
+    3648, 110,  // vav -> Deva
+    3652, 110,  // vay -> Deva
+    3656, 10,  // vgr -> Arab
+    3660, 110,  // vjk -> Deva
+    3664, 245,  // vmd -> Knda
+    3668, 10,  // vmh -> Arab
+    3672, 125,  // wal -> Ethi
+    3676, 10,  // wbk -> Arab
+    3680, 535,  // wbq -> Telu
+    3684, 110,  // wbr -> Deva
+    3688, 125,  // wle -> Ethi
+    3692, 10,  // wlo -> Arab
+    3696, 110,  // wme -> Deva
+    3700, 10,  // wne -> Arab
+    3704, 10,  // wni -> Arab
+    3708, 135,  // wsg -> Gong
+    3712, 10,  // wsv -> Arab
+    3716, 110,  // wtm -> Deva
+    3720, 180,  // wuu -> Hans
+    3724, 0,  // xag -> Aghb
+    3728, 105,  // xal -> Cyrl
+    3732, 125,  // xan -> Ethi
+    3736, 105,  // xas -> Cyrl
+    3740, 90,  // xco -> Chrs
+    3744, 75,  // xcr -> Cari
+    3748, 105,  // xdq -> Cyrl
+    3752, 10,  // xhe -> Arab
+    3756, 235,  // xhm -> Khmr
+    3760, 395,  // xis -> Orya
+    3764, 10,  // xka -> Arab
+    3768, 10,  // xkc -> Arab
+    3772, 555,  // xkf -> Tibt
+    3776, 10,  // xkj -> Arab
+    3780, 10,  // xkp -> Arab
+    3784, 295,  // xlc -> Lyci
+    3788, 300,  // xld -> Lydi
+    3792, 120,  // xly -> Elym
+    3796, 130,  // xmf -> Geor
+    3800, 310,  // xmn -> Mani
+    3804, 325,  // xmr -> Merc
+    3808, 360,  // xna -> Narb
+    3812, 110,  // xnr -> Deva
+    3816, 155,  // xpg -> Grek
+    3820, 380,  // xpi -> Ogam
+    3824, 105,  // xpm -> Cyrl
+    3828, 430,  // xpr -> Prti
+    3832, 105,  // xrm -> Cyrl
+    3836, 105,  // xrn -> Cyrl
+    3840, 455,  // xsa -> Sarb
+    3844, 110,  // xsr -> Deva
+    3848, 60,  // xtq -> Brah
+    3852, 520,  // xub -> Taml
+    3856, 520,  // xuj -> Taml
+    3860, 205,  // xve -> Ital
+    3864, 10,  // xvi -> Arab
+    3868, 105,  // xwo -> Cyrl
+    3872, 315,  // xzh -> Marc
+    3876, 105,  // yai -> Cyrl
+    3880, 110,  // ybh -> Deva
+    3884, 110,  // ybi -> Deva
+    3888, 10,  // ydg -> Arab
+    3892, 330,  // yea -> Mlym
+    3896, 155,  // yej -> Grek
+    3900, 535,  // yeu -> Telu
+    3904, 425,  // ygp -> Plrd
+    3908, 190,  // yhd -> Hebr
+    3912, 190,  // yi -> Hebr
+    3915, 595,  // yig -> Yiii
+    3919, 190,  // yih -> Hebr
+    3923, 595,  // yiv -> Yiii
+    3927, 105,  // ykg -> Cyrl
+    3931, 105,  // ykh -> Cyrl
+    3935, 425,  // yna -> Plrd
+    3939, 105,  // ynk -> Cyrl
+    3943, 215,  // yoi -> Jpan
+    3947, 550,  // yoy -> Thai
+    3951, 105,  // yrk -> Cyrl
+    3955, 595,  // ysd -> Yiii
+    3959, 595,  // ysn -> Yiii
+    3963, 595,  // ysp -> Yiii
+    3967, 105,  // ysr -> Cyrl
+    3971, 425,  // ysy -> Plrd
+    3975, 190,  // yud -> Hebr
+    3979, 185,  // yue -> Hant
+    3983, 180,  // yue_CN -> Hans
+    3990, 105,  // yug -> Cyrl
+    3994, 105,  // yux -> Cyrl
+    3998, 425,  // ywq -> Plrd
+    4002, 425,  // ywu -> Plrd
+    4006, 555,  // zau -> Tibt
+    4010, 10,  // zba -> Arab
+    4014, 175,  // zch -> Hani
+    4018, 10,  // zdj -> Arab
+    4022, 175,  // zeh -> Hani
+    4026, 540,  // zen -> Tfng
+    4030, 175,  // zgb -> Hani
+    4034, 540,  // zgh -> Tfng
+    4038, 175,  // zgm -> Hani
+    4042, 175,  // zgn -> Hani
+    4046, 180,  // zh -> Hans
+    4049, 185,  // zh_AU -> Hant
+    4055, 185,  // zh_BN -> Hant
+    4061, 185,  // zh_GB -> Hant
+    4067, 185,  // zh_GF -> Hant
+    4073, 185,  // zh_HK -> Hant
+    4079, 185,  // zh_ID -> Hant
+    4085, 185,  // zh_MO -> Hant
+    4091, 185,  // zh_PA -> Hant
+    4097, 185,  // zh_PF -> Hant
+    4103, 185,  // zh_PH -> Hant
+    4109, 185,  // zh_SR -> Hant
+    4115, 185,  // zh_TH -> Hant
+    4121, 185,  // zh_TW -> Hant
+    4127, 185,  // zh_US -> Hant
+    4133, 185,  // zh_VN -> Hant
+    4139, 175,  // zhd -> Hani
+    4143, 375,  // zhx -> Nshu
+    4147, 105,  // zko -> Cyrl
+    4151, 240,  // zkt -> Kits
+    4155, 105,  // zkz -> Cyrl
+    4159, 175,  // zlj -> Hani
+    4163, 175,  // zln -> Hani
+    4167, 175,  // zlq -> Hani
+    4171, 175,  // zqe -> Hani
+    4175, 395,  // zrg -> Orya
+    4179, 190,  // zrp -> Hebr
+    4183, 10,  // zum -> Arab
+    4187, 125,  // zwa -> Ethi
+    4191, 175,  // zyg -> Hani
+    4195, 175,  // zyn -> Hani
+    4199, 175,  // zzj -> Hani
 };
 
 //======================================================================
@@ -1159,38 +1162,39 @@ const char parentLocaleChars[] =
     "az_Arab\0az_Cyrl\0bal_Latn\0blt_Latn\0bm_Nkoo\0bs_Cyrl\0byn_Latn\0"
     "cu_Glag\0dje_Arab\0dyo_Arab\0en_001\0en_150\0en_AG\0en_AI\0en_AT\0"
     "en_AU\0en_BB\0en_BE\0en_BM\0en_BS\0en_BW\0en_BZ\0en_CC\0en_CH\0"
-    "en_CK\0en_CM\0en_CX\0en_CY\0en_DE\0en_DG\0en_DK\0en_DM\0en_Dsrt\0"
-    "en_ER\0en_FI\0en_FJ\0en_FK\0en_FM\0en_GB\0en_GD\0en_GG\0en_GH\0"
-    "en_GI\0en_GM\0en_GY\0en_HK\0en_ID\0en_IE\0en_IL\0en_IM\0en_IN\0"
-    "en_IO\0en_JE\0en_JM\0en_KE\0en_KI\0en_KN\0en_KY\0en_LC\0en_LR\0"
-    "en_LS\0en_MG\0en_MO\0en_MS\0en_MT\0en_MU\0en_MV\0en_MW\0en_MY\0"
-    "en_NA\0en_NF\0en_NG\0en_NL\0en_NR\0en_NU\0en_NZ\0en_PG\0en_PK\0"
-    "en_PN\0en_PW\0en_RW\0en_SB\0en_SC\0en_SD\0en_SE\0en_SG\0en_SH\0"
-    "en_SI\0en_SL\0en_SS\0en_SX\0en_SZ\0en_Shaw\0en_TC\0en_TK\0en_TO\0"
-    "en_TT\0en_TV\0en_TZ\0en_UG\0en_VC\0en_VG\0en_VU\0en_WS\0en_ZA\0"
-    "en_ZM\0en_ZW\0es_419\0es_AR\0es_BO\0es_BR\0es_BZ\0es_CL\0es_CO\0"
-    "es_CR\0es_CU\0es_DO\0es_EC\0es_GT\0es_HN\0es_JP\0es_MX\0es_NI\0"
-    "es_PA\0es_PE\0es_PR\0es_PY\0es_SV\0es_US\0es_UY\0es_VE\0ff_Adlm\0"
-    "ff_Arab\0fr_HT\0ha_Arab\0hi_Latn\0ht\0iu_Latn\0kaa_Latn\0kk_Arab\0"
-    "kok_Latn\0ks_Deva\0ku_Arab\0kxv_Deva\0kxv_Orya\0kxv_Telu\0ky_Arab\0"
-    "ky_Latn\0ml_Arab\0mn_Mong\0mni_Mtei\0ms_Arab\0nb\0nn\0no\0no_NO\0"
-    "pa_Arab\0pt_AO\0pt_CH\0pt_CV\0pt_FR\0pt_GQ\0pt_GW\0pt_LU\0pt_MO\0"
-    "pt_MZ\0pt_PT\0pt_ST\0pt_TL\0root\0sat_Deva\0sd_Deva\0sd_Khoj\0"
-    "sd_Sind\0shi_Latn\0so_Arab\0sr_Latn\0sw_Arab\0tg_Arab\0ug_Cyrl\0"
-    "uz_Arab\0uz_Cyrl\0vai_Latn\0wo_Arab\0yo_Arab\0yue_Hans\0zh_Hant\0"
-    "zh_Hant_HK\0zh_Hant_MO\0";
+    "en_CK\0en_CM\0en_CX\0en_CY\0en_CZ\0en_DE\0en_DG\0en_DK\0en_DM\0"
+    "en_Dsrt\0en_ER\0en_ES\0en_FI\0en_FJ\0en_FK\0en_FM\0en_FR\0en_GB\0"
+    "en_GD\0en_GG\0en_GH\0en_GI\0en_GM\0en_GS\0en_GY\0en_HK\0en_HU\0"
+    "en_ID\0en_IE\0en_IL\0en_IM\0en_IN\0en_IO\0en_IT\0en_JE\0en_JM\0"
+    "en_KE\0en_KI\0en_KN\0en_KY\0en_LC\0en_LR\0en_LS\0en_MG\0en_MO\0"
+    "en_MS\0en_MT\0en_MU\0en_MV\0en_MW\0en_MY\0en_NA\0en_NF\0en_NG\0"
+    "en_NL\0en_NO\0en_NR\0en_NU\0en_NZ\0en_PG\0en_PK\0en_PL\0en_PN\0"
+    "en_PT\0en_PW\0en_RO\0en_RW\0en_SB\0en_SC\0en_SD\0en_SE\0en_SG\0"
+    "en_SH\0en_SI\0en_SK\0en_SL\0en_SS\0en_SX\0en_SZ\0en_Shaw\0en_TC\0"
+    "en_TK\0en_TO\0en_TT\0en_TV\0en_TZ\0en_UG\0en_VC\0en_VG\0en_VU\0"
+    "en_WS\0en_ZA\0en_ZM\0en_ZW\0es_419\0es_AR\0es_BO\0es_BR\0es_BZ\0"
+    "es_CL\0es_CO\0es_CR\0es_CU\0es_DO\0es_EC\0es_GT\0es_HN\0es_JP\0"
+    "es_MX\0es_NI\0es_PA\0es_PE\0es_PR\0es_PY\0es_SV\0es_US\0es_UY\0"
+    "es_VE\0ff_Adlm\0ff_Arab\0fr_HT\0ha_Arab\0hi_Latn\0ht\0iu_Latn\0"
+    "kaa_Latn\0kk_Arab\0kok_Latn\0ks_Deva\0ku_Arab\0kxv_Deva\0kxv_Orya\0"
+    "kxv_Telu\0ky_Arab\0ky_Latn\0ml_Arab\0mn_Mong\0mni_Mtei\0ms_Arab\0"
+    "nb\0nn\0no\0no_NO\0pa_Arab\0pt_AO\0pt_CH\0pt_CV\0pt_FR\0pt_GQ\0"
+    "pt_GW\0pt_LU\0pt_MO\0pt_MZ\0pt_PT\0pt_ST\0pt_TL\0root\0sat_Deva\0"
+    "sd_Deva\0sd_Khoj\0sd_Sind\0shi_Latn\0so_Arab\0sr_Latn\0sw_Arab\0"
+    "tg_Arab\0ug_Cyrl\0uz_Arab\0uz_Cyrl\0vai_Latn\0wo_Arab\0yo_Arab\0"
+    "yue_Hans\0zh_Hant\0zh_Hant_HK\0zh_Hant_MO\0";
 
 const int32_t parentLocaleTable[] = {
-    0, 1080,  // az_Arab -> root
-    8, 1080,  // az_Cyrl -> root
-    16, 1080,  // bal_Latn -> root
-    25, 1080,  // blt_Latn -> root
-    34, 1080,  // bm_Nkoo -> root
-    42, 1080,  // bs_Cyrl -> root
-    50, 1080,  // byn_Latn -> root
-    59, 1080,  // cu_Glag -> root
-    67, 1080,  // dje_Arab -> root
-    76, 1080,  // dyo_Arab -> root
+    0, 1146,  // az_Arab -> root
+    8, 1146,  // az_Cyrl -> root
+    16, 1146,  // bal_Latn -> root
+    25, 1146,  // blt_Latn -> root
+    34, 1146,  // bm_Nkoo -> root
+    42, 1146,  // bs_Cyrl -> root
+    50, 1146,  // byn_Latn -> root
+    59, 1146,  // cu_Glag -> root
+    67, 1146,  // dje_Arab -> root
+    76, 1146,  // dyo_Arab -> root
     92, 85,  // en_150 -> en_001
     99, 85,  // en_AG -> en_001
     105, 85,  // en_AI -> en_001
@@ -1208,161 +1212,172 @@ const int32_t parentLocaleTable[] = {
     177, 85,  // en_CM -> en_001
     183, 85,  // en_CX -> en_001
     189, 85,  // en_CY -> en_001
-    195, 92,  // en_DE -> en_150
-    201, 85,  // en_DG -> en_001
-    207, 92,  // en_DK -> en_150
-    213, 85,  // en_DM -> en_001
-    219, 1080,  // en_Dsrt -> root
-    227, 85,  // en_ER -> en_001
-    233, 92,  // en_FI -> en_150
-    239, 85,  // en_FJ -> en_001
-    245, 85,  // en_FK -> en_001
-    251, 85,  // en_FM -> en_001
-    257, 85,  // en_GB -> en_001
-    263, 85,  // en_GD -> en_001
-    269, 85,  // en_GG -> en_001
-    275, 85,  // en_GH -> en_001
-    281, 85,  // en_GI -> en_001
-    287, 85,  // en_GM -> en_001
-    293, 85,  // en_GY -> en_001
-    299, 85,  // en_HK -> en_001
-    305, 85,  // en_ID -> en_001
-    311, 85,  // en_IE -> en_001
-    317, 85,  // en_IL -> en_001
-    323, 85,  // en_IM -> en_001
-    329, 85,  // en_IN -> en_001
-    335, 85,  // en_IO -> en_001
-    341, 85,  // en_JE -> en_001
-    347, 85,  // en_JM -> en_001
-    353, 85,  // en_KE -> en_001
-    359, 85,  // en_KI -> en_001
-    365, 85,  // en_KN -> en_001
-    371, 85,  // en_KY -> en_001
-    377, 85,  // en_LC -> en_001
-    383, 85,  // en_LR -> en_001
-    389, 85,  // en_LS -> en_001
-    395, 85,  // en_MG -> en_001
-    401, 85,  // en_MO -> en_001
-    407, 85,  // en_MS -> en_001
-    413, 85,  // en_MT -> en_001
-    419, 85,  // en_MU -> en_001
-    425, 85,  // en_MV -> en_001
-    431, 85,  // en_MW -> en_001
-    437, 85,  // en_MY -> en_001
-    443, 85,  // en_NA -> en_001
-    449, 85,  // en_NF -> en_001
-    455, 85,  // en_NG -> en_001
-    461, 92,  // en_NL -> en_150
-    467, 85,  // en_NR -> en_001
-    473, 85,  // en_NU -> en_001
-    479, 85,  // en_NZ -> en_001
-    485, 85,  // en_PG -> en_001
-    491, 85,  // en_PK -> en_001
-    497, 85,  // en_PN -> en_001
-    503, 85,  // en_PW -> en_001
-    509, 85,  // en_RW -> en_001
-    515, 85,  // en_SB -> en_001
-    521, 85,  // en_SC -> en_001
-    527, 85,  // en_SD -> en_001
-    533, 92,  // en_SE -> en_150
-    539, 85,  // en_SG -> en_001
-    545, 85,  // en_SH -> en_001
-    551, 92,  // en_SI -> en_150
-    557, 85,  // en_SL -> en_001
-    563, 85,  // en_SS -> en_001
-    569, 85,  // en_SX -> en_001
-    575, 85,  // en_SZ -> en_001
-    581, 1080,  // en_Shaw -> root
-    589, 85,  // en_TC -> en_001
-    595, 85,  // en_TK -> en_001
-    601, 85,  // en_TO -> en_001
-    607, 85,  // en_TT -> en_001
-    613, 85,  // en_TV -> en_001
-    619, 85,  // en_TZ -> en_001
-    625, 85,  // en_UG -> en_001
-    631, 85,  // en_VC -> en_001
-    637, 85,  // en_VG -> en_001
-    643, 85,  // en_VU -> en_001
-    649, 85,  // en_WS -> en_001
-    655, 85,  // en_ZA -> en_001
-    661, 85,  // en_ZM -> en_001
-    667, 85,  // en_ZW -> en_001
-    680, 673,  // es_AR -> es_419
-    686, 673,  // es_BO -> es_419
-    692, 673,  // es_BR -> es_419
-    698, 673,  // es_BZ -> es_419
-    704, 673,  // es_CL -> es_419
-    710, 673,  // es_CO -> es_419
-    716, 673,  // es_CR -> es_419
-    722, 673,  // es_CU -> es_419
-    728, 673,  // es_DO -> es_419
-    734, 673,  // es_EC -> es_419
-    740, 673,  // es_GT -> es_419
-    746, 673,  // es_HN -> es_419
-    752, 673,  // es_JP -> es_419
-    758, 673,  // es_MX -> es_419
-    764, 673,  // es_NI -> es_419
-    770, 673,  // es_PA -> es_419
-    776, 673,  // es_PE -> es_419
-    782, 673,  // es_PR -> es_419
-    788, 673,  // es_PY -> es_419
-    794, 673,  // es_SV -> es_419
-    800, 673,  // es_US -> es_419
-    806, 673,  // es_UY -> es_419
-    812, 673,  // es_VE -> es_419
-    818, 1080,  // ff_Adlm -> root
-    826, 1080,  // ff_Arab -> root
-    840, 1080,  // ha_Arab -> root
-    848, 329,  // hi_Latn -> en_IN
-    856, 834,  // ht -> fr_HT
-    859, 1080,  // iu_Latn -> root
-    867, 1080,  // kaa_Latn -> root
-    876, 1080,  // kk_Arab -> root
-    884, 1080,  // kok_Latn -> root
-    893, 1080,  // ks_Deva -> root
-    901, 1080,  // ku_Arab -> root
-    909, 1080,  // kxv_Deva -> root
-    918, 1080,  // kxv_Orya -> root
-    927, 1080,  // kxv_Telu -> root
-    936, 1080,  // ky_Arab -> root
-    944, 1080,  // ky_Latn -> root
-    952, 1080,  // ml_Arab -> root
-    960, 1080,  // mn_Mong -> root
-    968, 1080,  // mni_Mtei -> root
-    977, 1080,  // ms_Arab -> root
-    985, 991,  // nb -> no
-    988, 991,  // nn -> no
-    994, 991,  // no_NO -> no
-    1000, 1080,  // pa_Arab -> root
-    1008, 1062,  // pt_AO -> pt_PT
-    1014, 1062,  // pt_CH -> pt_PT
-    1020, 1062,  // pt_CV -> pt_PT
-    1026, 1062,  // pt_FR -> pt_PT
-    1032, 1062,  // pt_GQ -> pt_PT
-    1038, 1062,  // pt_GW -> pt_PT
-    1044, 1062,  // pt_LU -> pt_PT
-    1050, 1062,  // pt_MO -> pt_PT
-    1056, 1062,  // pt_MZ -> pt_PT
-    1068, 1062,  // pt_ST -> pt_PT
-    1074, 1062,  // pt_TL -> pt_PT
-    1085, 1080,  // sat_Deva -> root
-    1094, 1080,  // sd_Deva -> root
-    1102, 1080,  // sd_Khoj -> root
-    1110, 1080,  // sd_Sind -> root
-    1118, 1080,  // shi_Latn -> root
-    1127, 1080,  // so_Arab -> root
-    1135, 1080,  // sr_Latn -> root
-    1143, 1080,  // sw_Arab -> root
-    1151, 1080,  // tg_Arab -> root
-    1159, 1080,  // ug_Cyrl -> root
-    1167, 1080,  // uz_Arab -> root
-    1175, 1080,  // uz_Cyrl -> root
-    1183, 1080,  // vai_Latn -> root
-    1192, 1080,  // wo_Arab -> root
-    1200, 1080,  // yo_Arab -> root
-    1208, 1080,  // yue_Hans -> root
-    1217, 1080,  // zh_Hant -> root
-    1236, 1225,  // zh_Hant_MO -> zh_Hant_HK
+    195, 92,  // en_CZ -> en_150
+    201, 92,  // en_DE -> en_150
+    207, 85,  // en_DG -> en_001
+    213, 92,  // en_DK -> en_150
+    219, 85,  // en_DM -> en_001
+    225, 1146,  // en_Dsrt -> root
+    233, 85,  // en_ER -> en_001
+    239, 92,  // en_ES -> en_150
+    245, 92,  // en_FI -> en_150
+    251, 85,  // en_FJ -> en_001
+    257, 85,  // en_FK -> en_001
+    263, 85,  // en_FM -> en_001
+    269, 92,  // en_FR -> en_150
+    275, 85,  // en_GB -> en_001
+    281, 85,  // en_GD -> en_001
+    287, 85,  // en_GG -> en_001
+    293, 85,  // en_GH -> en_001
+    299, 85,  // en_GI -> en_001
+    305, 85,  // en_GM -> en_001
+    311, 85,  // en_GS -> en_001
+    317, 85,  // en_GY -> en_001
+    323, 85,  // en_HK -> en_001
+    329, 92,  // en_HU -> en_150
+    335, 85,  // en_ID -> en_001
+    341, 85,  // en_IE -> en_001
+    347, 85,  // en_IL -> en_001
+    353, 85,  // en_IM -> en_001
+    359, 85,  // en_IN -> en_001
+    365, 85,  // en_IO -> en_001
+    371, 92,  // en_IT -> en_150
+    377, 85,  // en_JE -> en_001
+    383, 85,  // en_JM -> en_001
+    389, 85,  // en_KE -> en_001
+    395, 85,  // en_KI -> en_001
+    401, 85,  // en_KN -> en_001
+    407, 85,  // en_KY -> en_001
+    413, 85,  // en_LC -> en_001
+    419, 85,  // en_LR -> en_001
+    425, 85,  // en_LS -> en_001
+    431, 85,  // en_MG -> en_001
+    437, 85,  // en_MO -> en_001
+    443, 85,  // en_MS -> en_001
+    449, 85,  // en_MT -> en_001
+    455, 85,  // en_MU -> en_001
+    461, 85,  // en_MV -> en_001
+    467, 85,  // en_MW -> en_001
+    473, 85,  // en_MY -> en_001
+    479, 85,  // en_NA -> en_001
+    485, 85,  // en_NF -> en_001
+    491, 85,  // en_NG -> en_001
+    497, 92,  // en_NL -> en_150
+    503, 92,  // en_NO -> en_150
+    509, 85,  // en_NR -> en_001
+    515, 85,  // en_NU -> en_001
+    521, 85,  // en_NZ -> en_001
+    527, 85,  // en_PG -> en_001
+    533, 85,  // en_PK -> en_001
+    539, 92,  // en_PL -> en_150
+    545, 85,  // en_PN -> en_001
+    551, 92,  // en_PT -> en_150
+    557, 85,  // en_PW -> en_001
+    563, 92,  // en_RO -> en_150
+    569, 85,  // en_RW -> en_001
+    575, 85,  // en_SB -> en_001
+    581, 85,  // en_SC -> en_001
+    587, 85,  // en_SD -> en_001
+    593, 92,  // en_SE -> en_150
+    599, 85,  // en_SG -> en_001
+    605, 85,  // en_SH -> en_001
+    611, 92,  // en_SI -> en_150
+    617, 92,  // en_SK -> en_150
+    623, 85,  // en_SL -> en_001
+    629, 85,  // en_SS -> en_001
+    635, 85,  // en_SX -> en_001
+    641, 85,  // en_SZ -> en_001
+    647, 1146,  // en_Shaw -> root
+    655, 85,  // en_TC -> en_001
+    661, 85,  // en_TK -> en_001
+    667, 85,  // en_TO -> en_001
+    673, 85,  // en_TT -> en_001
+    679, 85,  // en_TV -> en_001
+    685, 85,  // en_TZ -> en_001
+    691, 85,  // en_UG -> en_001
+    697, 85,  // en_VC -> en_001
+    703, 85,  // en_VG -> en_001
+    709, 85,  // en_VU -> en_001
+    715, 85,  // en_WS -> en_001
+    721, 85,  // en_ZA -> en_001
+    727, 85,  // en_ZM -> en_001
+    733, 85,  // en_ZW -> en_001
+    746, 739,  // es_AR -> es_419
+    752, 739,  // es_BO -> es_419
+    758, 739,  // es_BR -> es_419
+    764, 739,  // es_BZ -> es_419
+    770, 739,  // es_CL -> es_419
+    776, 739,  // es_CO -> es_419
+    782, 739,  // es_CR -> es_419
+    788, 739,  // es_CU -> es_419
+    794, 739,  // es_DO -> es_419
+    800, 739,  // es_EC -> es_419
+    806, 739,  // es_GT -> es_419
+    812, 739,  // es_HN -> es_419
+    818, 739,  // es_JP -> es_419
+    824, 739,  // es_MX -> es_419
+    830, 739,  // es_NI -> es_419
+    836, 739,  // es_PA -> es_419
+    842, 739,  // es_PE -> es_419
+    848, 739,  // es_PR -> es_419
+    854, 739,  // es_PY -> es_419
+    860, 739,  // es_SV -> es_419
+    866, 739,  // es_US -> es_419
+    872, 739,  // es_UY -> es_419
+    878, 739,  // es_VE -> es_419
+    884, 1146,  // ff_Adlm -> root
+    892, 1146,  // ff_Arab -> root
+    906, 1146,  // ha_Arab -> root
+    914, 359,  // hi_Latn -> en_IN
+    922, 900,  // ht -> fr_HT
+    925, 1146,  // iu_Latn -> root
+    933, 1146,  // kaa_Latn -> root
+    942, 1146,  // kk_Arab -> root
+    950, 1146,  // kok_Latn -> root
+    959, 1146,  // ks_Deva -> root
+    967, 1146,  // ku_Arab -> root
+    975, 1146,  // kxv_Deva -> root
+    984, 1146,  // kxv_Orya -> root
+    993, 1146,  // kxv_Telu -> root
+    1002, 1146,  // ky_Arab -> root
+    1010, 1146,  // ky_Latn -> root
+    1018, 1146,  // ml_Arab -> root
+    1026, 1146,  // mn_Mong -> root
+    1034, 1146,  // mni_Mtei -> root
+    1043, 1146,  // ms_Arab -> root
+    1051, 1057,  // nb -> no
+    1054, 1057,  // nn -> no
+    1060, 1057,  // no_NO -> no
+    1066, 1146,  // pa_Arab -> root
+    1074, 1128,  // pt_AO -> pt_PT
+    1080, 1128,  // pt_CH -> pt_PT
+    1086, 1128,  // pt_CV -> pt_PT
+    1092, 1128,  // pt_FR -> pt_PT
+    1098, 1128,  // pt_GQ -> pt_PT
+    1104, 1128,  // pt_GW -> pt_PT
+    1110, 1128,  // pt_LU -> pt_PT
+    1116, 1128,  // pt_MO -> pt_PT
+    1122, 1128,  // pt_MZ -> pt_PT
+    1134, 1128,  // pt_ST -> pt_PT
+    1140, 1128,  // pt_TL -> pt_PT
+    1151, 1146,  // sat_Deva -> root
+    1160, 1146,  // sd_Deva -> root
+    1168, 1146,  // sd_Khoj -> root
+    1176, 1146,  // sd_Sind -> root
+    1184, 1146,  // shi_Latn -> root
+    1193, 1146,  // so_Arab -> root
+    1201, 1146,  // sr_Latn -> root
+    1209, 1146,  // sw_Arab -> root
+    1217, 1146,  // tg_Arab -> root
+    1225, 1146,  // ug_Cyrl -> root
+    1233, 1146,  // uz_Arab -> root
+    1241, 1146,  // uz_Cyrl -> root
+    1249, 1146,  // vai_Latn -> root
+    1258, 1146,  // wo_Arab -> root
+    1266, 1146,  // yo_Arab -> root
+    1274, 1146,  // yue_Hans -> root
+    1283, 1146,  // zh_Hant -> root
+    1302, 1291,  // zh_Hant_MO -> zh_Hant_HK
 };
 
 
diff --git a/engine/thirdparty/icu4c/common/locbased.cpp b/engine/thirdparty/icu4c/common/locbased.cpp
index 832bc3e8..6f35e722 100644
--- a/engine/thirdparty/icu4c/common/locbased.cpp
+++ b/engine/thirdparty/icu4c/common/locbased.cpp
@@ -12,44 +12,84 @@
 */
 #include "locbased.h"
 #include "cstring.h"
+#include "charstr.h"
 
 U_NAMESPACE_BEGIN
 
-Locale LocaleBased::getLocale(ULocDataLocaleType type, UErrorCode& status) const {
-    const char* id = getLocaleID(type, status);
+Locale LocaleBased::getLocale(const CharString* valid, const CharString* actual,
+                              ULocDataLocaleType type, UErrorCode& status) {
+    const char* id = getLocaleID(valid, actual, type, status);
     return Locale(id != nullptr ? id : "");
 }
 
-const char* LocaleBased::getLocaleID(ULocDataLocaleType type, UErrorCode& status) const {
+const char* LocaleBased::getLocaleID(const CharString* valid, const CharString* actual,
+                                     ULocDataLocaleType type, UErrorCode& status) {
     if (U_FAILURE(status)) {
         return nullptr;
     }
 
     switch(type) {
     case ULOC_VALID_LOCALE:
-        return valid;
+        return valid == nullptr ? "" : valid->data();
     case ULOC_ACTUAL_LOCALE:
-        return actual;
+        return actual == nullptr ? "" : actual->data();
     default:
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return nullptr;
     }
 }
 
-void LocaleBased::setLocaleIDs(const char* validID, const char* actualID) {
-    if (validID != nullptr) {
-      uprv_strncpy(valid, validID, ULOC_FULLNAME_CAPACITY);
-      valid[ULOC_FULLNAME_CAPACITY-1] = 0; // always terminate
-    }
-    if (actualID != nullptr) {
-      uprv_strncpy(actual, actualID, ULOC_FULLNAME_CAPACITY);
-      actual[ULOC_FULLNAME_CAPACITY-1] = 0; // always terminate
+void LocaleBased::setLocaleIDs(const CharString* validID, const CharString* actualID, UErrorCode& status) {
+    setValidLocaleID(validID, status);
+    setActualLocaleID(actualID,status);
+}
+void LocaleBased::setLocaleIDs(const char* validID, const char* actualID, UErrorCode& status) {
+    setValidLocaleID(validID, status);
+    setActualLocaleID(actualID,status);
+}
+
+void LocaleBased::setLocaleID(const char* id, CharString*& dest, UErrorCode& status) {
+    if (U_FAILURE(status)) { return; }
+    if (id == nullptr || *id == 0) {
+        delete dest;
+        dest = nullptr;
+    } else {
+        if (dest == nullptr) {
+            dest = new CharString(id, status);
+            if (dest == nullptr) {
+                status = U_MEMORY_ALLOCATION_ERROR;
+                return;
+            }
+        } else {
+            dest->copyFrom(id, status);
+        }
     }
 }
 
-void LocaleBased::setLocaleIDs(const Locale& validID, const Locale& actualID) {
-  uprv_strcpy(valid, validID.getName());
-  uprv_strcpy(actual, actualID.getName());
+void LocaleBased::setLocaleID(const CharString* id, CharString*& dest, UErrorCode& status) {
+    if (U_FAILURE(status)) { return; }
+    if (id == nullptr || id->isEmpty()) {
+        delete dest;
+        dest = nullptr;
+    } else {
+        if (dest == nullptr) {
+            dest = new CharString(*id, status);
+            if (dest == nullptr) {
+                status = U_MEMORY_ALLOCATION_ERROR;
+                return;
+            }
+        } else {
+            dest->copyFrom(*id, status);
+        }
+    }
+}
+
+bool LocaleBased::equalIDs(const CharString* left, const CharString* right) {
+    // true if both are nullptr
+    if (left == nullptr && right == nullptr) return true;
+    // false if only one is nullptr
+    if (left == nullptr || right == nullptr) return false;
+    return *left == *right;
 }
 
 U_NAMESPACE_END
diff --git a/engine/thirdparty/icu4c/common/locbased.h b/engine/thirdparty/icu4c/common/locbased.h
index 2d260b52..9441eb82 100644
--- a/engine/thirdparty/icu4c/common/locbased.h
+++ b/engine/thirdparty/icu4c/common/locbased.h
@@ -19,13 +19,14 @@
 /**
  * Macro to declare a locale LocaleBased wrapper object for the given
  * object, which must have two members named `validLocale' and
- * `actualLocale' of size ULOC_FULLNAME_CAPACITY
+ * `actualLocale' of which are pointers to the internal icu::CharString.
  */
 #define U_LOCALE_BASED(varname, objname) \
   LocaleBased varname((objname).validLocale, (objname).actualLocale)
 
 U_NAMESPACE_BEGIN
 
+class CharString;
 /**
  * A utility class that unifies the implementation of getLocale() by
  * various ICU services.  This class is likely to be removed in the
@@ -41,33 +42,35 @@ class U_COMMON_API LocaleBased : public UMemory {
      * Construct a LocaleBased wrapper around the two pointers.  These
      * will be aliased for the lifetime of this object.
      */
-    inline LocaleBased(char* validAlias, char* actualAlias);
-
-    /**
-     * Construct a LocaleBased wrapper around the two const pointers.
-     * These will be aliased for the lifetime of this object.
-     */
-    inline LocaleBased(const char* validAlias, const char* actualAlias);
+    inline LocaleBased(CharString*& validAlias, CharString*& actualAlias);
 
     /**
      * Return locale meta-data for the service object wrapped by this
      * object.  Either the valid or the actual locale may be
      * retrieved.
+     * @param valid The valid locale.
+     * @param actual The actual locale.
      * @param type either ULOC_VALID_LOCALE or ULOC_ACTUAL_LOCALE
      * @param status input-output error code
      * @return the indicated locale
      */
-    Locale getLocale(ULocDataLocaleType type, UErrorCode& status) const;
+    static Locale getLocale(
+        const CharString* valid, const CharString* actual,
+        ULocDataLocaleType type, UErrorCode& status);
 
     /**
      * Return the locale ID for the service object wrapped by this
      * object.  Either the valid or the actual locale may be
      * retrieved.
+     * @param valid The valid locale.
+     * @param actual The actual locale.
      * @param type either ULOC_VALID_LOCALE or ULOC_ACTUAL_LOCALE
      * @param status input-output error code
      * @return the indicated locale ID
      */
-    const char* getLocaleID(ULocDataLocaleType type, UErrorCode& status) const;
+    static const char* getLocaleID(
+        const CharString* valid, const CharString* actual,
+        ULocDataLocaleType type, UErrorCode& status);
 
     /**
      * Set the locale meta-data for the service object wrapped by this
@@ -75,31 +78,40 @@ class U_COMMON_API LocaleBased : public UMemory {
      * @param valid the ID of the valid locale
      * @param actual the ID of the actual locale
      */
-    void setLocaleIDs(const char* valid, const char* actual);
+    void setLocaleIDs(const char* valid, const char* actual, UErrorCode& status);
+    void setLocaleIDs(const CharString* valid, const CharString* actual, UErrorCode& status);
 
-    /**
-     * Set the locale meta-data for the service object wrapped by this
-     * object.
-     * @param valid the ID of the valid locale
-     * @param actual the ID of the actual locale
-     */
-    void setLocaleIDs(const Locale& valid, const Locale& actual);
+    static void setLocaleID(const char* id, CharString*& dest, UErrorCode& status);
+    static void setLocaleID(const CharString* id, CharString*& dest, UErrorCode& status);
+
+    static bool equalIDs(const CharString* left, const CharString* right);
 
  private:
 
-    char* valid;
-    
-    char* actual;
+    void setValidLocaleID(const CharString* id, UErrorCode& status);
+    void setActualLocaleID(const CharString* id, UErrorCode& status);
+    void setValidLocaleID(const char* id, UErrorCode& status);
+    void setActualLocaleID(const char* id, UErrorCode& status);
+
+    CharString*& valid;
+    CharString*& actual;
 };
 
-inline LocaleBased::LocaleBased(char* validAlias, char* actualAlias) :
+inline LocaleBased::LocaleBased(CharString*& validAlias, CharString*& actualAlias) :
     valid(validAlias), actual(actualAlias) {
 }
 
-inline LocaleBased::LocaleBased(const char* validAlias,
-                                const char* actualAlias) :
-    // ugh: cast away const
-    valid(const_cast<char*>(validAlias)), actual(const_cast<char*>(actualAlias)) {
+inline void LocaleBased::setValidLocaleID(const CharString* id, UErrorCode& status) {
+    setLocaleID(id, valid, status);
+}
+inline void LocaleBased::setActualLocaleID(const CharString* id, UErrorCode& status) {
+    setLocaleID(id, actual, status);
+}
+inline void LocaleBased::setValidLocaleID(const char* id, UErrorCode& status) {
+    setLocaleID(id, valid, status);
+}
+inline void LocaleBased::setActualLocaleID(const char* id, UErrorCode& status) {
+    setLocaleID(id, actual, status);
 }
 
 U_NAMESPACE_END
diff --git a/engine/thirdparty/icu4c/common/locdispnames.cpp b/engine/thirdparty/icu4c/common/locdispnames.cpp
index ddf7687a..d3521e87 100644
--- a/engine/thirdparty/icu4c/common/locdispnames.cpp
+++ b/engine/thirdparty/icu4c/common/locdispnames.cpp
@@ -19,6 +19,8 @@
 *   that then do not depend on resource bundle code and display name data.
 */
 
+#include <string_view>
+
 #include "unicode/utypes.h"
 #include "unicode/brkiter.h"
 #include "unicode/locid.h"
@@ -359,7 +361,7 @@ _getStringOrCopyKey(const char *path, const char *locale,
     return u_terminateUChars(dest, destCapacity, length, &errorCode);
 }
 
-using UDisplayNameGetter = icu::CharString(const char*, UErrorCode&);
+using UDisplayNameGetter = icu::CharString(std::string_view, UErrorCode&);
 
 int32_t
 _getDisplayNameForComponent(const char *locale,
@@ -377,6 +379,10 @@ _getDisplayNameForComponent(const char *locale,
         return 0;
     }
 
+    if (locale == nullptr) {
+        locale = uloc_getDefault();
+    }
+
     localStatus = U_ZERO_ERROR;
     icu::CharString localeBuffer = (*getter)(locale, localStatus);
     if (U_FAILURE(localStatus)) {
diff --git a/engine/thirdparty/icu4c/common/locid.cpp b/engine/thirdparty/icu4c/common/locid.cpp
index 4a73f559..e7e86079 100644
--- a/engine/thirdparty/icu4c/common/locid.cpp
+++ b/engine/thirdparty/icu4c/common/locid.cpp
@@ -1828,8 +1828,13 @@ ulocimp_isCanonicalizedLocaleForTest(const char* localeName)
 
 U_NAMESPACE_BEGIN
 
-/*This function initializes a Locale from a C locale ID*/
 Locale& Locale::init(const char* localeID, UBool canonicalize)
+{
+    return localeID == nullptr ? *this = getDefault() : init(StringPiece{localeID}, canonicalize);
+}
+
+/*This function initializes a Locale from a C locale ID*/
+Locale& Locale::init(StringPiece localeID, UBool canonicalize)
 {
     fIsBogus = false;
     /* Free our current storage */
@@ -1854,19 +1859,28 @@ Locale& Locale::init(const char* localeID, UBool canonicalize)
         int32_t length;
         UErrorCode err;
 
-        if(localeID == nullptr) {
-            // not an error, just set the default locale
-            return *this = getDefault();
-        }
-
         /* preset all fields to empty */
         language[0] = script[0] = country[0] = 0;
 
+        const auto parse = [canonicalize](std::string_view localeID,
+                                          char* name,
+                                          int32_t nameCapacity,
+                                          UErrorCode& status) {
+            return ByteSinkUtil::viaByteSinkToTerminatedChars(
+                name, nameCapacity,
+                [&](ByteSink& sink, UErrorCode& status) {
+                    if (canonicalize) {
+                        ulocimp_canonicalize(localeID, sink, status);
+                    } else {
+                        ulocimp_getName(localeID, sink, status);
+                    }
+                },
+                status);
+        };
+
         // "canonicalize" the locale ID to ICU/Java format
         err = U_ZERO_ERROR;
-        length = canonicalize ?
-            uloc_canonicalize(localeID, fullName, sizeof(fullNameBuffer), &err) :
-            uloc_getName(localeID, fullName, sizeof(fullNameBuffer), &err);
+        length = parse(localeID, fullName, sizeof fullNameBuffer, err);
 
         if (err == U_BUFFER_OVERFLOW_ERROR || length >= static_cast<int32_t>(sizeof(fullNameBuffer))) {
             U_ASSERT(baseName == nullptr);
@@ -1877,9 +1891,7 @@ Locale& Locale::init(const char* localeID, UBool canonicalize)
             }
             fullName = newFullName;
             err = U_ZERO_ERROR;
-            length = canonicalize ?
-                uloc_canonicalize(localeID, fullName, length+1, &err) :
-                uloc_getName(localeID, fullName, length+1, &err);
+            length = parse(localeID, fullName, length + 1, err);
         }
         if(U_FAILURE(err) || err == U_STRING_NOT_TERMINATED_WARNING) {
             /* should never occur */
@@ -2200,6 +2212,13 @@ Locale::createFromName (const char *name)
     }
 }
 
+Locale U_EXPORT2
+Locale::createFromName(StringPiece name) {
+    Locale loc("");
+    loc.init(name, false);
+    return loc;
+}
+
 Locale U_EXPORT2
 Locale::createCanonical(const char* name) {
     Locale loc("");
diff --git a/engine/thirdparty/icu4c/common/loclikely.cpp b/engine/thirdparty/icu4c/common/loclikely.cpp
index ccbcbfa7..f87fd8dd 100644
--- a/engine/thirdparty/icu4c/common/loclikely.cpp
+++ b/engine/thirdparty/icu4c/common/loclikely.cpp
@@ -300,6 +300,9 @@ ulocimp_addLikelySubtags(const char* localeID,
                          icu::ByteSink& sink,
                          UErrorCode& status) {
     if (U_FAILURE(status)) { return; }
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
     icu::CharString localeBuffer = ulocimp_canonicalize(localeID, status);
     _uloc_addLikelySubtags(localeBuffer.data(), sink, status);
 }
@@ -334,6 +337,9 @@ ulocimp_minimizeSubtags(const char* localeID,
                         bool favorScript,
                         UErrorCode& status) {
     if (U_FAILURE(status)) { return; }
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
     icu::CharString localeBuffer = ulocimp_canonicalize(localeID, status);
     _uloc_minimizeSubtags(localeBuffer.data(), sink, favorScript, status);
 }
@@ -349,7 +355,9 @@ uloc_isRightToLeft(const char *locale) {
     UErrorCode errorCode = U_ZERO_ERROR;
     icu::CharString lang;
     icu::CharString script;
-    ulocimp_getSubtags(locale, &lang, &script, nullptr, nullptr, nullptr, errorCode);
+    ulocimp_getSubtags(
+        locale == nullptr ? uloc_getDefault() : locale,
+        &lang, &script, nullptr, nullptr, nullptr, errorCode);
     if (U_FAILURE(errorCode) || script.isEmpty()) {
         // Fastpath: We know the likely scripts and their writing direction
         // for some common languages.
@@ -369,7 +377,7 @@ uloc_isRightToLeft(const char *locale) {
         if (U_FAILURE(errorCode)) {
             return false;
         }
-        ulocimp_getSubtags(likely.data(), nullptr, &script, nullptr, nullptr, nullptr, errorCode);
+        ulocimp_getSubtags(likely.toStringPiece(), nullptr, &script, nullptr, nullptr, nullptr, errorCode);
         if (U_FAILURE(errorCode) || script.isEmpty()) {
             return false;
         }
@@ -430,7 +438,7 @@ ulocimp_getRegionForSupplementalData(const char *localeID, bool inferRegion,
     icu::CharString rgBuf = GetRegionFromKey(localeID, "rg", status);
     if (U_SUCCESS(status) && rgBuf.isEmpty()) {
         // No valid rg keyword value, try for unicode_region_subtag
-        rgBuf = ulocimp_getRegion(localeID, status);
+        rgBuf = ulocimp_getRegion(localeID == nullptr ? uloc_getDefault() : localeID, status);
         if (U_SUCCESS(status) && rgBuf.isEmpty() && inferRegion) {
             // Second check for sd keyword value
             rgBuf = GetRegionFromKey(localeID, "sd", status);
@@ -439,7 +447,7 @@ ulocimp_getRegionForSupplementalData(const char *localeID, bool inferRegion,
                 UErrorCode rgStatus = U_ZERO_ERROR;
                 icu::CharString locBuf = ulocimp_addLikelySubtags(localeID, rgStatus);
                 if (U_SUCCESS(rgStatus)) {
-                    rgBuf = ulocimp_getRegion(locBuf.data(), status);
+                    rgBuf = ulocimp_getRegion(locBuf.toStringPiece(), status);
                 }
             }
         }
diff --git a/engine/thirdparty/icu4c/common/loclikelysubtags.cpp b/engine/thirdparty/icu4c/common/loclikelysubtags.cpp
index 7c613119..7245a779 100644
--- a/engine/thirdparty/icu4c/common/loclikelysubtags.cpp
+++ b/engine/thirdparty/icu4c/common/loclikelysubtags.cpp
@@ -527,7 +527,7 @@ LSR LikelySubtags::makeMaximizedLsrFrom(const Locale &locale,
         return {};
     }
     const char *name = locale.getName();
-    if (uprv_isAtSign(name[0]) && name[1] == 'x' && name[2] == '=') {  // name.startsWith("@x=")
+    if (!returnInputIfUnmatch && uprv_isAtSign(name[0]) && name[1] == 'x' && name[2] == '=') {  // name.startsWith("@x=")
         // Private use language tag x-subtag-subtag... which CLDR changes to
         // und-x-subtag-subtag...
         return LSR(name, "", "", LSR::EXPLICIT_LSR);
diff --git a/engine/thirdparty/icu4c/common/locresdata.cpp b/engine/thirdparty/icu4c/common/locresdata.cpp
index 725e6609..ba7163fa 100644
--- a/engine/thirdparty/icu4c/common/locresdata.cpp
+++ b/engine/thirdparty/icu4c/common/locresdata.cpp
@@ -161,6 +161,9 @@ _uloc_getOrientationHelper(const char* localeId,
 
     if (U_FAILURE(status)) { return result; }
 
+    if (localeId == nullptr) {
+        localeId = uloc_getDefault();
+    }
     icu::CharString localeBuffer = ulocimp_canonicalize(localeId, status);
 
     if (U_FAILURE(status)) { return result; }
diff --git a/engine/thirdparty/icu4c/common/punycode.cpp b/engine/thirdparty/icu4c/common/punycode.cpp
index aa02298c..1868a07a 100644
--- a/engine/thirdparty/icu4c/common/punycode.cpp
+++ b/engine/thirdparty/icu4c/common/punycode.cpp
@@ -193,7 +193,7 @@ u_strToPunycode(const char16_t *src, int32_t srcLength,
         return 0;
     }
 
-    if(src==nullptr || srcLength<-1 || (dest==nullptr && destCapacity!=0)) {
+    if(src==nullptr || srcLength<-1 || destCapacity<0 || (dest==nullptr && destCapacity!=0)) {
         *pErrorCode=U_ILLEGAL_ARGUMENT_ERROR;
         return 0;
     }
diff --git a/engine/thirdparty/icu4c/common/putil.cpp b/engine/thirdparty/icu4c/common/putil.cpp
index 4cf07797..ea15fdff 100644
--- a/engine/thirdparty/icu4c/common/putil.cpp
+++ b/engine/thirdparty/icu4c/common/putil.cpp
@@ -76,7 +76,7 @@
 #include <float.h>
 
 #ifndef U_COMMON_IMPLEMENTATION
-#error U_COMMON_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see https://unicode-org.github.io/icu/userguide/howtouseicu
+#error U_COMMON_IMPLEMENTATION not set - must be set for all ICU source files in common/ - see https://unicode-org.github.io/icu/userguide/icu/howtouseicu.html
 #endif
 
 
diff --git a/engine/thirdparty/icu4c/common/rbbinode.cpp b/engine/thirdparty/icu4c/common/rbbinode.cpp
index 71407b9e..849ee718 100644
--- a/engine/thirdparty/icu4c/common/rbbinode.cpp
+++ b/engine/thirdparty/icu4c/common/rbbinode.cpp
@@ -47,7 +47,10 @@ static int  gLastSerial = 0;
 //    Constructor.   Just set the fields to reasonable default values.
 //
 //-------------------------------------------------------------------------
-RBBINode::RBBINode(NodeType t) : UMemory() {
+RBBINode::RBBINode(NodeType t, UErrorCode& status) : UMemory() {
+    if (U_FAILURE(status)) {
+        return;
+    }
 #ifdef RBBI_DEBUG
     fSerialNum    = ++gLastSerial;
 #endif
@@ -65,10 +68,13 @@ RBBINode::RBBINode(NodeType t) : UMemory() {
     fVal          = 0;
     fPrecedence   = precZero;
 
-    UErrorCode     status = U_ZERO_ERROR;
-    fFirstPosSet  = new UVector(status);  // TODO - get a real status from somewhere
+    fFirstPosSet  = new UVector(status);
     fLastPosSet   = new UVector(status);
     fFollowPos    = new UVector(status);
+    if (U_SUCCESS(status) &&
+        (fFirstPosSet == nullptr || fLastPosSet == nullptr || fFollowPos == nullptr)) {
+        status =  U_MEMORY_ALLOCATION_ERROR;
+    }
     if      (t==opCat)    {fPrecedence = precOpCat;}
     else if (t==opOr)     {fPrecedence = precOpOr;}
     else if (t==opStart)  {fPrecedence = precStart;}
@@ -77,7 +83,10 @@ RBBINode::RBBINode(NodeType t) : UMemory() {
 }
 
 
-RBBINode::RBBINode(const RBBINode &other) : UMemory(other) {
+RBBINode::RBBINode(const RBBINode &other, UErrorCode& status) : UMemory(other) {
+    if (U_FAILURE(status)) {
+        return;
+    }
 #ifdef RBBI_DEBUG
     fSerialNum   = ++gLastSerial;
 #endif
@@ -94,10 +103,13 @@ RBBINode::RBBINode(const RBBINode &other) : UMemory(other) {
     fVal         = other.fVal;
     fRuleRoot    = false;
     fChainIn     = other.fChainIn;
-    UErrorCode     status = U_ZERO_ERROR;
     fFirstPosSet = new UVector(status);   // TODO - get a real status from somewhere
     fLastPosSet  = new UVector(status);
     fFollowPos   = new UVector(status);
+    if (U_SUCCESS(status) &&
+        (fFirstPosSet == nullptr || fLastPosSet == nullptr || fFollowPos == nullptr)) {
+        status =  U_MEMORY_ALLOCATION_ERROR;
+    }
 }
 
 
@@ -193,27 +205,54 @@ void RBBINode::NRDeleteNode(RBBINode *node) {
 //                  references in preparation for generating the DFA tables.
 //
 //-------------------------------------------------------------------------
-RBBINode *RBBINode::cloneTree() {
+constexpr int kRecursiveDepthLimit = 3500;
+RBBINode *RBBINode::cloneTree(UErrorCode &status, int depth) {
+    if (U_FAILURE(status)) {
+        return nullptr;
+    }
+    // If the depth of the stack is too deep, we return U_INPUT_TOO_LONG_ERROR
+    // to avoid stack overflow crash.
+    if (depth > kRecursiveDepthLimit) {
+        status = U_INPUT_TOO_LONG_ERROR;
+        return nullptr;
+    }
     RBBINode    *n;
 
     if (fType == RBBINode::varRef) {
         // If the current node is a variable reference, skip over it
         //   and clone the definition of the variable instead.
-        n = fLeftChild->cloneTree();
+        n = fLeftChild->cloneTree(status, depth+1);
+        if (U_FAILURE(status)) {
+            return nullptr;
+        }
     } else if (fType == RBBINode::uset) {
         n = this;
     } else {
-        n = new RBBINode(*this);
+        n = new RBBINode(*this, status);
+        if (U_FAILURE(status)) {
+            delete n;
+            return nullptr;
+        }
         // Check for null pointer.
-        if (n != nullptr) {
-            if (fLeftChild != nullptr) {
-                n->fLeftChild          = fLeftChild->cloneTree();
-                n->fLeftChild->fParent = n;
+        if (n == nullptr) {
+            status =  U_MEMORY_ALLOCATION_ERROR;
+            return nullptr;
+        }
+        if (fLeftChild != nullptr) {
+            n->fLeftChild          = fLeftChild->cloneTree(status, depth+1);
+            if (U_FAILURE(status)) {
+                delete n;
+                return nullptr;
             }
-            if (fRightChild != nullptr) {
-                n->fRightChild          = fRightChild->cloneTree();
-                n->fRightChild->fParent = n;
+            n->fLeftChild->fParent = n;
+        }
+        if (fRightChild != nullptr) {
+            n->fRightChild          = fRightChild->cloneTree(status, depth+1);
+            if (U_FAILURE(status)) {
+                delete n;
+                return nullptr;
             }
+            n->fRightChild->fParent = n;
         }
     }
     return n;
@@ -239,7 +278,6 @@ RBBINode *RBBINode::cloneTree() {
 //                      nested references are handled by cloneTree(), not here.
 //
 //-------------------------------------------------------------------------
-constexpr int kRecursiveDepthLimit = 3500;
 RBBINode *RBBINode::flattenVariables(UErrorCode& status, int depth) {
     if (U_FAILURE(status)) {
         return this;
@@ -251,21 +289,34 @@ RBBINode *RBBINode::flattenVariables(UErrorCode& status, int depth) {
         return this;
     }
     if (fType == varRef) {
-        RBBINode *retNode  = fLeftChild->cloneTree();
-        if (retNode != nullptr) {
-            retNode->fRuleRoot = this->fRuleRoot;
-            retNode->fChainIn  = this->fChainIn;
+        RBBINode *retNode  = fLeftChild->cloneTree(status, depth+1);
+        if (U_FAILURE(status)) {
+            return this;
         }
+        retNode->fRuleRoot = this->fRuleRoot;
+        retNode->fChainIn  = this->fChainIn;
         delete this;   // TODO: undefined behavior. Fix.
         return retNode;
     }
 
     if (fLeftChild != nullptr) {
         fLeftChild = fLeftChild->flattenVariables(status, depth+1);
+        if (fLeftChild == nullptr) {
+            status = U_MEMORY_ALLOCATION_ERROR;
+        }
+        if (U_FAILURE(status)) {
+            return this;
+        }
         fLeftChild->fParent  = this;
     }
     if (fRightChild != nullptr) {
         fRightChild = fRightChild->flattenVariables(status, depth+1);
+        if (fRightChild == nullptr) {
+            status = U_MEMORY_ALLOCATION_ERROR;
+        }
+        if (U_FAILURE(status)) {
+            return this;
+        }
         fRightChild->fParent = this;
     }
     return this;
@@ -280,7 +331,16 @@ RBBINode *RBBINode::flattenVariables(UErrorCode& status, int depth) {
 //                 the left child of the uset node.
 //
 //-------------------------------------------------------------------------
-void RBBINode::flattenSets() {
+void RBBINode::flattenSets(UErrorCode &status, int depth) {
+    if (U_FAILURE(status)) {
+        return;
+    }
+    // If the depth of the stack is too deep, we return U_INPUT_TOO_LONG_ERROR
+    // to avoid stack overflow crash.
+    if (depth > kRecursiveDepthLimit) {
+        status = U_INPUT_TOO_LONG_ERROR;
+        return;
+    }
     U_ASSERT(fType != setRef);
 
     if (fLeftChild != nullptr) {
@@ -288,11 +348,15 @@ void RBBINode::flattenSets() {
             RBBINode *setRefNode = fLeftChild;
             RBBINode *usetNode   = setRefNode->fLeftChild;
             RBBINode *replTree   = usetNode->fLeftChild;
-            fLeftChild           = replTree->cloneTree();
+            fLeftChild           = replTree->cloneTree(status, depth+1);
+            if (U_FAILURE(status)) {
+                delete setRefNode;
+                return;
+            }
             fLeftChild->fParent  = this;
             delete setRefNode;
         } else {
-            fLeftChild->flattenSets();
+            fLeftChild->flattenSets(status, depth+1);
         }
     }
 
@@ -301,11 +365,15 @@ void RBBINode::flattenSets() {
             RBBINode *setRefNode = fRightChild;
             RBBINode *usetNode   = setRefNode->fLeftChild;
             RBBINode *replTree   = usetNode->fLeftChild;
-            fRightChild           = replTree->cloneTree();
+            fRightChild           = replTree->cloneTree(status, depth+1);
+            if (U_FAILURE(status)) {
+                delete setRefNode;
+                return;
+            }
             fRightChild->fParent  = this;
             delete setRefNode;
         } else {
-            fRightChild->flattenSets();
+            fRightChild->flattenSets(status, depth+1);
         }
     }
 }
diff --git a/engine/thirdparty/icu4c/common/rbbinode.h b/engine/thirdparty/icu4c/common/rbbinode.h
index 497a31b8..8fbc9d1b 100644
--- a/engine/thirdparty/icu4c/common/rbbinode.h
+++ b/engine/thirdparty/icu4c/common/rbbinode.h
@@ -91,14 +91,14 @@ class RBBINode : public UMemory {
         UVector       *fFollowPos;
 
 
-        RBBINode(NodeType t);
-        RBBINode(const RBBINode &other);
+        RBBINode(NodeType t, UErrorCode& status);
+        RBBINode(const RBBINode &other, UErrorCode& status);
         ~RBBINode();
         static void  NRDeleteNode(RBBINode *node);
         
-        RBBINode    *cloneTree();
+        RBBINode    *cloneTree(UErrorCode &status, int depth=0);
         RBBINode    *flattenVariables(UErrorCode &status, int depth=0);
-        void         flattenSets();
+        void         flattenSets(UErrorCode &status, int depth=0);
         void         findNodes(UVector *dest, RBBINode::NodeType kind, UErrorCode &status);
 
 #ifdef RBBI_DEBUG
diff --git a/engine/thirdparty/icu4c/common/rbbiscan.cpp b/engine/thirdparty/icu4c/common/rbbiscan.cpp
index cf2d63cd..77fc3bcd 100644
--- a/engine/thirdparty/icu4c/common/rbbiscan.cpp
+++ b/engine/thirdparty/icu4c/common/rbbiscan.cpp
@@ -767,15 +767,24 @@ void RBBIRuleScanner::findSetFor(const UnicodeString &s, RBBINode *node, Unicode
             c = s.char32At(0);
             setToAdopt = new UnicodeSet(c, c);
         }
+        if (setToAdopt == nullptr) {
+            error(U_MEMORY_ALLOCATION_ERROR);
+            return;
+        }
     }
 
     //
     // Make a new uset node to refer to this UnicodeSet
     // This new uset node becomes the child of the caller's setReference node.
     //
-    RBBINode *usetNode    = new RBBINode(RBBINode::uset);
+    UErrorCode localStatus = U_ZERO_ERROR;
+    RBBINode *usetNode    = new RBBINode(RBBINode::uset, localStatus);
     if (usetNode == nullptr) {
-        error(U_MEMORY_ALLOCATION_ERROR);
+        localStatus = U_MEMORY_ALLOCATION_ERROR;
+    }
+    if (U_FAILURE(localStatus)) {
+        delete usetNode;
+        error(localStatus);
         delete setToAdopt;
         return;
     }
@@ -1191,7 +1200,7 @@ RBBINode  *RBBIRuleScanner::pushNewNode(RBBINode::NodeType  t) {
         return nullptr;
     }
     fNodeStackPtr++;
-    fNodeStack[fNodeStackPtr] = new RBBINode(t);
+    fNodeStack[fNodeStackPtr] = new RBBINode(t, *fRB->fStatus);
     if (fNodeStack[fNodeStackPtr] == nullptr) {
         *fRB->fStatus = U_MEMORY_ALLOCATION_ERROR;
     }
diff --git a/engine/thirdparty/icu4c/common/rbbisetb.cpp b/engine/thirdparty/icu4c/common/rbbisetb.cpp
index 6c22cf47..df94fc8b 100644
--- a/engine/thirdparty/icu4c/common/rbbisetb.cpp
+++ b/engine/thirdparty/icu4c/common/rbbisetb.cpp
@@ -375,7 +375,11 @@ void  RBBISetBuilder::addValToSets(UVector *sets, uint32_t val) {
 }
 
 void  RBBISetBuilder::addValToSet(RBBINode *usetNode, uint32_t val) {
-    RBBINode *leafNode = new RBBINode(RBBINode::leafChar);
+    RBBINode *leafNode = new RBBINode(RBBINode::leafChar, *fStatus);
+    if (U_FAILURE(*fStatus)) {
+        delete leafNode;
+        return;
+    }
     if (leafNode == nullptr) {
         *fStatus = U_MEMORY_ALLOCATION_ERROR;
         return;
@@ -388,9 +392,13 @@ void  RBBISetBuilder::addValToSet(RBBINode *usetNode, uint32_t val) {
         // There are already input symbols present for this set.
         // Set up an OR node, with the previous stuff as the left child
         //   and the new value as the right child.
-        RBBINode *orNode = new RBBINode(RBBINode::opOr);
+        RBBINode *orNode = new RBBINode(RBBINode::opOr, *fStatus);
         if (orNode == nullptr) {
             *fStatus = U_MEMORY_ALLOCATION_ERROR;
+        }
+        if (U_FAILURE(*fStatus)) {
+            delete orNode;
+            delete leafNode;
             return;
         }
         orNode->fLeftChild  = usetNode->fLeftChild;
diff --git a/engine/thirdparty/icu4c/common/rbbitblb.cpp b/engine/thirdparty/icu4c/common/rbbitblb.cpp
index 4d951376..b8990980 100644
--- a/engine/thirdparty/icu4c/common/rbbitblb.cpp
+++ b/engine/thirdparty/icu4c/common/rbbitblb.cpp
@@ -99,13 +99,22 @@ void  RBBITableBuilder::buildForwardTable() {
     //   {bof} fake character.
     // 
     if (fRB->fSetBuilder->sawBOF()) {
-        RBBINode *bofTop    = new RBBINode(RBBINode::opCat);
-        RBBINode *bofLeaf   = new RBBINode(RBBINode::leafChar);
-        // Delete and exit if memory allocation failed.
-        if (bofTop == nullptr || bofLeaf == nullptr) {
+        RBBINode *bofTop    = new RBBINode(RBBINode::opCat, *fStatus);
+        if (bofTop == nullptr) {
             *fStatus = U_MEMORY_ALLOCATION_ERROR;
+        }
+        if (U_FAILURE(*fStatus)) {
             delete bofTop;
+            return;
+        }
+        RBBINode *bofLeaf   = new RBBINode(RBBINode::leafChar, *fStatus);
+        // Delete and exit if memory allocation failed.
+        if (bofLeaf == nullptr) {
+            *fStatus = U_MEMORY_ALLOCATION_ERROR;
+        }
+        if (U_FAILURE(*fStatus)) {
             delete bofLeaf;
+            delete bofTop;
             return;
         }
         bofTop->fLeftChild  = bofLeaf;
@@ -120,18 +129,23 @@ void  RBBITableBuilder::buildForwardTable() {
     //   Appears as a cat-node, left child being the original tree,
     //   right child being the end marker.
     //
-    RBBINode *cn = new RBBINode(RBBINode::opCat);
+    RBBINode *cn = new RBBINode(RBBINode::opCat, *fStatus);
     // Exit if memory allocation failed.
     if (cn == nullptr) {
         *fStatus = U_MEMORY_ALLOCATION_ERROR;
+    }
+    if (U_FAILURE(*fStatus)) {
+        delete cn;
         return;
     }
     cn->fLeftChild = fTree;
     fTree->fParent = cn;
-    RBBINode *endMarkerNode = cn->fRightChild = new RBBINode(RBBINode::endMark);
+    RBBINode *endMarkerNode = cn->fRightChild = new RBBINode(RBBINode::endMark, *fStatus);
     // Delete and exit if memory allocation failed.
     if (cn->fRightChild == nullptr) {
         *fStatus = U_MEMORY_ALLOCATION_ERROR;
+    }
+    if (U_FAILURE(*fStatus)) {
         delete cn;
         return;
     }
@@ -142,7 +156,7 @@ void  RBBITableBuilder::buildForwardTable() {
     //  Replace all references to UnicodeSets with the tree for the equivalent
     //      expression.
     //
-    fTree->flattenSets();
+    fTree->flattenSets(*fStatus, 0);
 #ifdef RBBI_DEBUG
     if (fRB->fDebugEnv && uprv_strstr(fRB->fDebugEnv, "stree")) {
         RBBIDebugPuts("\nParse tree after flattening Unicode Set references.");
diff --git a/engine/thirdparty/icu4c/common/resbund.cpp b/engine/thirdparty/icu4c/common/resbund.cpp
index 41337cdc..4c14dae1 100644
--- a/engine/thirdparty/icu4c/common/resbund.cpp
+++ b/engine/thirdparty/icu4c/common/resbund.cpp
@@ -388,7 +388,7 @@ const Locale &ResourceBundle::getLocale() const {
     return ncThis->fLocale != nullptr ? *ncThis->fLocale : Locale::getDefault();
 }
 
-const Locale ResourceBundle::getLocale(ULocDataLocaleType type, UErrorCode &status) const
+Locale ResourceBundle::getLocale(ULocDataLocaleType type, UErrorCode &status) const
 {
   return ures_getLocaleByType(fResource, type, &status);
 }
diff --git a/engine/thirdparty/icu4c/common/ucnvmbcs.cpp b/engine/thirdparty/icu4c/common/ucnvmbcs.cpp
index f5507043..d65c2847 100644
--- a/engine/thirdparty/icu4c/common/ucnvmbcs.cpp
+++ b/engine/thirdparty/icu4c/common/ucnvmbcs.cpp
@@ -3146,11 +3146,8 @@ ucnv_MBCSGetNextUChar(UConverterToUnicodeArgs *pArgs,
     if(c<0) {
         if(U_SUCCESS(*pErrorCode) && source==sourceLimit && lastSource<source) {
             /* incomplete character byte sequence */
-            uint8_t *bytes=cnv->toUBytes;
             cnv->toULength = static_cast<int8_t>(source - lastSource);
-            do {
-                *bytes++=*lastSource++;
-            } while(lastSource<source);
+            uprv_memcpy(cnv->toUBytes, lastSource, cnv->toULength);
             *pErrorCode=U_TRUNCATED_CHAR_FOUND;
         } else if(U_FAILURE(*pErrorCode)) {
             /* callback(illegal) */
diff --git a/engine/thirdparty/icu4c/common/ucurr.cpp b/engine/thirdparty/icu4c/common/ucurr.cpp
index b74a80a6..cccf1130 100644
--- a/engine/thirdparty/icu4c/common/ucurr.cpp
+++ b/engine/thirdparty/icu4c/common/ucurr.cpp
@@ -372,12 +372,8 @@ struct CReg : public icu::UMemory {
     CReg(const char16_t* _iso, const char* _id)
         : next(nullptr)
     {
-        int32_t len = static_cast<int32_t>(uprv_strlen(_id));
-        if (len > static_cast<int32_t>(sizeof(id) - 1)) {
-            len = (sizeof(id)-1);
-        }
-        uprv_strncpy(id, _id, len);
-        id[len] = 0;
+        uprv_strncpy(id, _id, sizeof(id)-1);
+        id[sizeof(id)-1] = 0;
         u_memcpy(iso, _iso, ISO_CURRENCY_CODE_LENGTH);
         iso[ISO_CURRENCY_CODE_LENGTH] = 0;
     }
@@ -682,6 +678,9 @@ ucurr_getName(const char16_t* currency,
     // this function.
     UErrorCode ec2 = U_ZERO_ERROR;
 
+    if (locale == nullptr) {
+        locale = uloc_getDefault();
+    }
     CharString loc = ulocimp_getName(locale, ec2);
     if (U_FAILURE(ec2)) {
         *ec = U_ILLEGAL_ARGUMENT_ERROR;
@@ -780,6 +779,9 @@ ucurr_getPluralName(const char16_t* currency,
     // this function.
     UErrorCode ec2 = U_ZERO_ERROR;
 
+    if (locale == nullptr) {
+        locale = uloc_getDefault();
+    }
     CharString loc = ulocimp_getName(locale, ec2);
     if (U_FAILURE(ec2)) {
         *ec = U_ILLEGAL_ARGUMENT_ERROR;
@@ -973,6 +975,9 @@ collectCurrencyNames(const char* locale,
     // Look up the Currencies resource for the given locale.
     UErrorCode ec2 = U_ZERO_ERROR;
 
+    if (locale == nullptr) {
+        locale = uloc_getDefault();
+    }
     CharString loc = ulocimp_getName(locale, ec2);
     if (U_FAILURE(ec2)) {
         ec = U_ILLEGAL_ARGUMENT_ERROR;
diff --git a/engine/thirdparty/icu4c/common/uloc.cpp b/engine/thirdparty/icu4c/common/uloc.cpp
index 51887c97..bea4827a 100644
--- a/engine/thirdparty/icu4c/common/uloc.cpp
+++ b/engine/thirdparty/icu4c/common/uloc.cpp
@@ -482,8 +482,8 @@ constexpr CanonicalizationMap CANONICALIZE_MAP[] = {
 
 /* ### BCP47 Conversion *******************************************/
 /* Gets the size of the shortest subtag in the given localeID. */
-int32_t getShortestSubtagLength(const char *localeID) {
-    int32_t localeIDLength = static_cast<int32_t>(uprv_strlen(localeID));
+int32_t getShortestSubtagLength(std::string_view localeID) {
+    int32_t localeIDLength = static_cast<int32_t>(localeID.length());
     int32_t length = localeIDLength;
     int32_t tmpLength = 0;
     int32_t i;
@@ -507,8 +507,8 @@ int32_t getShortestSubtagLength(const char *localeID) {
     return length;
 }
 /* Test if the locale id has BCP47 u extension and does not have '@' */
-inline bool _hasBCP47Extension(const char *id) {
-    return id != nullptr && uprv_strstr(id, "@") == nullptr && getShortestSubtagLength(id) == 1;
+inline bool _hasBCP47Extension(std::string_view id) {
+    return id.find('@') == std::string_view::npos && getShortestSubtagLength(id) == 1;
 }
 
 /* ### Keywords **************************************************/
@@ -523,10 +523,9 @@ inline bool UPRV_OK_VALUE_PUNCTUATION(char c) { return c == '_' || c == '-' || c
 #define ULOC_MAX_NO_KEYWORDS 25
 
 U_CAPI const char * U_EXPORT2
-locale_getKeywordsStart(const char *localeID) {
-    const char *result = nullptr;
-    if((result = uprv_strchr(localeID, '@')) != nullptr) {
-        return result;
+locale_getKeywordsStart(std::string_view localeID) {
+    if (size_t pos = localeID.find('@'); pos != std::string_view::npos) {
+        return localeID.data() + pos;
     }
 #if (U_CHARSET_FAMILY == U_EBCDIC_FAMILY)
     else {
@@ -536,8 +535,8 @@ locale_getKeywordsStart(const char *localeID) {
         static const uint8_t ebcdicSigns[] = { 0x7C, 0x44, 0x66, 0x80, 0xAC, 0xAE, 0xAF, 0xB5, 0xEC, 0xEF, 0x00 };
         const uint8_t *charToFind = ebcdicSigns;
         while(*charToFind) {
-            if((result = uprv_strchr(localeID, *charToFind)) != nullptr) {
-                return result;
+            if (size_t pos = localeID.find(*charToFind); pos != std::string_view::npos) {
+                return localeID.data() + pos;
             }
             charToFind++;
         }
@@ -590,7 +589,7 @@ compareKeywordStructs(const void * /*context*/, const void *left, const void *ri
 }  // namespace
 
 U_EXPORT CharString
-ulocimp_getKeywords(const char* localeID,
+ulocimp_getKeywords(std::string_view localeID,
                     char prev,
                     bool valuesToo,
                     UErrorCode& status)
@@ -607,7 +606,7 @@ ulocimp_getKeywords(const char* localeID,
 }
 
 U_EXPORT void
-ulocimp_getKeywords(const char* localeID,
+ulocimp_getKeywords(std::string_view localeID,
                     char prev,
                     ByteSink& sink,
                     bool valuesToo,
@@ -619,9 +618,8 @@ ulocimp_getKeywords(const char* localeID,
 
     int32_t maxKeywords = ULOC_MAX_NO_KEYWORDS;
     int32_t numKeywords = 0;
-    const char* pos = localeID;
-    const char* equalSign = nullptr;
-    const char* semicolon = nullptr;
+    size_t equalSign = std::string_view::npos;
+    size_t semicolon = std::string_view::npos;
     int32_t i = 0, j, n;
 
     if(prev == '@') { /* start of keyword definition */
@@ -629,74 +627,72 @@ ulocimp_getKeywords(const char* localeID,
         do {
             bool duplicate = false;
             /* skip leading spaces */
-            while(*pos == ' ') {
-                pos++;
+            while (localeID.front() == ' ') {
+                localeID.remove_prefix(1);
             }
-            if (!*pos) { /* handle trailing "; " */
+            if (localeID.empty()) { /* handle trailing "; " */
                 break;
             }
             if(numKeywords == maxKeywords) {
                 status = U_INTERNAL_PROGRAM_ERROR;
                 return;
             }
-            equalSign = uprv_strchr(pos, '=');
-            semicolon = uprv_strchr(pos, ';');
+            equalSign = localeID.find('=');
+            semicolon = localeID.find(';');
             /* lack of '=' [foo@currency] is illegal */
             /* ';' before '=' [foo@currency;collation=pinyin] is illegal */
-            if(!equalSign || (semicolon && semicolon<equalSign)) {
+            if (equalSign == std::string_view::npos ||
+                (semicolon != std::string_view::npos && semicolon < equalSign)) {
+                status = U_INVALID_FORMAT_ERROR;
+                return;
+            }
+            /* zero-length keyword is an error. */
+            if (equalSign == 0) {
                 status = U_INVALID_FORMAT_ERROR;
                 return;
             }
             /* need to normalize both keyword and keyword name */
-            if(equalSign - pos >= ULOC_KEYWORD_BUFFER_LEN) {
+            if (equalSign >= ULOC_KEYWORD_BUFFER_LEN) {
                 /* keyword name too long for internal buffer */
                 status = U_INTERNAL_PROGRAM_ERROR;
                 return;
             }
-            for(i = 0, n = 0; i < equalSign - pos; ++i) {
-                if (pos[i] != ' ') {
-                    keywordList[numKeywords].keyword[n++] = uprv_tolower(pos[i]);
+            for (i = 0, n = 0; static_cast<size_t>(i) < equalSign; ++i) {
+                if (localeID[i] != ' ') {
+                    keywordList[numKeywords].keyword[n++] = uprv_tolower(localeID[i]);
                 }
             }
 
-            /* zero-length keyword is an error. */
-            if (n == 0) {
-                status = U_INVALID_FORMAT_ERROR;
-                return;
-            }
-
             keywordList[numKeywords].keyword[n] = 0;
             keywordList[numKeywords].keywordLen = n;
             /* now grab the value part. First we skip the '=' */
             equalSign++;
             /* then we leading spaces */
-            while(*equalSign == ' ') {
+            while (equalSign < localeID.length() && localeID[equalSign] == ' ') {
                 equalSign++;
             }
 
             /* Premature end or zero-length value */
-            if (!*equalSign || equalSign == semicolon) {
+            if (equalSign == localeID.length() || equalSign == semicolon) {
                 status = U_INVALID_FORMAT_ERROR;
                 return;
             }
 
-            keywordList[numKeywords].valueStart = equalSign;
+            keywordList[numKeywords].valueStart = localeID.data() + equalSign;
 
-            pos = semicolon;
-            i = 0;
-            if(pos) {
-                while(*(pos - i - 1) == ' ') {
-                    i++;
-                }
-                keywordList[numKeywords].valueLen = static_cast<int32_t>(pos - equalSign - i);
-                pos++;
+            std::string_view value = localeID;
+            if (semicolon != std::string_view::npos) {
+                value.remove_suffix(value.length() - semicolon);
+                localeID.remove_prefix(semicolon + 1);
             } else {
-                i = static_cast<int32_t>(uprv_strlen(equalSign));
-                while(i && equalSign[i-1] == ' ') {
-                    i--;
-                }
-                keywordList[numKeywords].valueLen = i;
+                localeID = {};
             }
+            value.remove_prefix(equalSign);
+            if (size_t last = value.find_last_not_of(' '); last != std::string_view::npos) {
+                value.remove_suffix(value.length() - last - 1);
+            }
+            keywordList[numKeywords].valueLen = static_cast<int32_t>(value.length());
+
             /* If this is a duplicate keyword, then ignore it */
             for (j=0; j<numKeywords; ++j) {
                 if (uprv_strcmp(keywordList[j].keyword, keywordList[numKeywords].keyword) == 0) {
@@ -707,7 +703,7 @@ ulocimp_getKeywords(const char* localeID,
             if (!duplicate) {
                 ++numKeywords;
             }
-        } while(pos);
+        } while (!localeID.empty());
 
         /* now we have a list of keywords */
         /* we need to sort it */
@@ -784,7 +780,7 @@ ulocimp_getKeywordValue(const char* localeID,
       return;
     }
 
-    if (_hasBCP47Extension(localeID)) {
+    if (localeID != nullptr && _hasBCP47Extension(localeID)) {
         tempBuffer = ulocimp_forLanguageTag(localeID, -1, nullptr, status);
         tmpLocaleID = U_SUCCESS(status) && !tempBuffer.isEmpty() ? tempBuffer.data() : localeID;
     } else {
@@ -889,7 +885,8 @@ uloc_setKeywordValue(const char* keywordName,
         return 0;
     }
 
-    char* keywords = const_cast<char*>(locale_getKeywordsStart(buffer));
+    char* keywords = const_cast<char*>(
+        locale_getKeywordsStart({buffer, static_cast<std::string_view::size_type>(bufLen)}));
     int32_t baseLen = keywords == nullptr ? bufLen : keywords - buffer;
     // Remove -1 from the capacity so that this function can guarantee NUL termination.
     CheckedArrayByteSink sink(keywords == nullptr ? buffer + bufLen : keywords,
@@ -921,7 +918,7 @@ ulocimp_setKeywordValue(std::string_view keywordName,
 {
     if (U_FAILURE(status)) { return; }
     std::string_view keywords;
-    if (const char* start = locale_getKeywordsStart(localeID.data()); start != nullptr) {
+    if (const char* start = locale_getKeywordsStart(localeID.toStringPiece()); start != nullptr) {
         // This is safe because CharString::truncate() doesn't actually erase any
         // data, but simply sets the position for where new data will be written.
         int32_t size = start - localeID.data();
@@ -1138,15 +1135,18 @@ inline bool _isPrefixLetter(char a) { return a == 'x' || a == 'X' || a == 'i' ||
 
 /*returns true if one of the special prefixes is here (s=string)
   'x-' or 'i-' */
-inline bool _isIDPrefix(const char *s) { return _isPrefixLetter(s[0]) && _isIDSeparator(s[1]); }
+inline bool _isIDPrefix(std::string_view s) {
+    return s.size() >= 2 && _isPrefixLetter(s[0]) && _isIDSeparator(s[1]);
+}
 
 /* Dot terminates it because of POSIX form  where dot precedes the codepage
  * except for variant
  */
-inline bool _isTerminator(char a) { return a == 0 || a == '.' || a == '@'; }
+inline bool _isTerminator(char a) { return a == '.' || a == '@'; }
 
-inline bool _isBCP47Extension(const char* p) {
-    return p[0] == '-' &&
+inline bool _isBCP47Extension(std::string_view p) {
+    return p.size() >= 3 &&
+           p[0] == '-' &&
            (p[1] == 't' || p[1] == 'T' ||
             p[1] == 'u' || p[1] == 'U' ||
             p[1] == 'x' || p[1] == 'X') &&
@@ -1202,49 +1202,44 @@ namespace {
  * TODO try to use this in Locale
  */
 
-void
-_getLanguage(const char* localeID,
-             ByteSink* sink,
-             const char** pEnd,
-             UErrorCode& status) {
-    U_ASSERT(pEnd != nullptr);
-    *pEnd = localeID;
-
-    if (uprv_stricmp(localeID, "root") == 0) {
-        localeID += 4;
-    } else if (uprv_strnicmp(localeID, "und", 3) == 0 &&
-               (localeID[3] == '\0' ||
+size_t _getLanguage(std::string_view localeID, ByteSink* sink, UErrorCode& status) {
+    size_t skip = 0;
+    if (localeID.size() == 4 && uprv_strnicmp(localeID.data(), "root", 4) == 0) {
+        skip = 4;
+        localeID.remove_prefix(skip);
+    } else if (localeID.size() >= 3 && uprv_strnicmp(localeID.data(), "und", 3) == 0 &&
+               (localeID.size() == 3 ||
                 localeID[3] == '-' ||
                 localeID[3] == '_' ||
                 localeID[3] == '@')) {
-        localeID += 3;
+        skip = 3;
+        localeID.remove_prefix(skip);
     }
 
     constexpr int32_t MAXLEN = ULOC_LANG_CAPACITY - 1;  // Minus NUL.
 
     /* if it starts with i- or x- then copy that prefix */
-    int32_t len = _isIDPrefix(localeID) ? 2 : 0;
-    while (!_isTerminator(localeID[len]) && !_isIDSeparator(localeID[len])) {
+    size_t len = _isIDPrefix(localeID) ? 2 : 0;
+    while (len < localeID.size() && !_isTerminator(localeID[len]) && !_isIDSeparator(localeID[len])) {
         if (len == MAXLEN) {
             status = U_ILLEGAL_ARGUMENT_ERROR;
-            return;
+            return 0;
         }
         len++;
     }
 
-    *pEnd = localeID + len;
-    if (sink == nullptr || len == 0) { return; }
+    if (sink == nullptr || len == 0) { return skip + len; }
 
-    int32_t minCapacity = uprv_max(len, 4);  // Minimum 3 letters plus NUL.
+    int32_t minCapacity = uprv_max(static_cast<int32_t>(len), 4);  // Minimum 3 letters plus NUL.
     char scratch[MAXLEN];
     int32_t capacity = 0;
     char* buffer = sink->GetAppendBuffer(
             minCapacity, minCapacity, scratch, UPRV_LENGTHOF(scratch), &capacity);
 
-    for (int32_t i = 0; i < len; ++i) {
+    for (size_t i = 0; i < len; ++i) {
         buffer[i] = uprv_tolower(localeID[i]);
     }
-    if (_isIDSeparator(localeID[1])) {
+    if (localeID.size() >= 2 && _isIDSeparator(localeID[1])) {
         buffer[1] = '-';
     }
 
@@ -1256,32 +1251,26 @@ _getLanguage(const char* localeID,
         if (offset.has_value()) {
             const char* const alias = LANGUAGES[*offset];
             sink->Append(alias, static_cast<int32_t>(uprv_strlen(alias)));
-            return;
+            return skip + len;
         }
     }
 
-    sink->Append(buffer, len);
+    sink->Append(buffer, static_cast<int32_t>(len));
+    return skip + len;
 }
 
-void
-_getScript(const char* localeID,
-           ByteSink* sink,
-           const char** pEnd) {
-    U_ASSERT(pEnd != nullptr);
-    *pEnd = localeID;
-
+size_t _getScript(std::string_view localeID, ByteSink* sink) {
     constexpr int32_t LENGTH = 4;
 
-    int32_t len = 0;
-    while (!_isTerminator(localeID[len]) && !_isIDSeparator(localeID[len]) &&
+    size_t len = 0;
+    while (len < localeID.size() && !_isTerminator(localeID[len]) && !_isIDSeparator(localeID[len]) &&
             uprv_isASCIILetter(localeID[len])) {
-        if (len == LENGTH) { return; }
+        if (len == LENGTH) { return 0; }
         len++;
     }
-    if (len != LENGTH) { return; }
+    if (len != LENGTH) { return 0; }
 
-    *pEnd = localeID + LENGTH;
-    if (sink == nullptr) { return; }
+    if (sink == nullptr) { return len; }
 
     char scratch[LENGTH];
     int32_t capacity = 0;
@@ -1294,27 +1283,21 @@ _getScript(const char* localeID,
     }
 
     sink->Append(buffer, LENGTH);
+    return len;
 }
 
-void
-_getRegion(const char* localeID,
-           ByteSink* sink,
-           const char** pEnd) {
-    U_ASSERT(pEnd != nullptr);
-    *pEnd = localeID;
-
+size_t _getRegion(std::string_view localeID, ByteSink* sink) {
     constexpr int32_t MINLEN = 2;
     constexpr int32_t MAXLEN = ULOC_COUNTRY_CAPACITY - 1;  // Minus NUL.
 
-    int32_t len = 0;
-    while (!_isTerminator(localeID[len]) && !_isIDSeparator(localeID[len])) {
-        if (len == MAXLEN) { return; }
+    size_t len = 0;
+    while (len < localeID.size() && !_isTerminator(localeID[len]) && !_isIDSeparator(localeID[len])) {
+        if (len == MAXLEN) { return 0; }
         len++;
     }
-    if (len < MINLEN) { return; }
+    if (len < MINLEN) { return 0; }
 
-    *pEnd = localeID + len;
-    if (sink == nullptr) { return; }
+    if (sink == nullptr) { return len; }
 
     char scratch[ULOC_COUNTRY_CAPACITY];
     int32_t capacity = 0;
@@ -1325,7 +1308,7 @@ _getRegion(const char* localeID,
             UPRV_LENGTHOF(scratch),
             &capacity);
 
-    for (int32_t i = 0; i < len; ++i) {
+    for (size_t i = 0; i < len; ++i) {
         buffer[i] = uprv_toupper(localeID[i]);
     }
 
@@ -1337,26 +1320,25 @@ _getRegion(const char* localeID,
         if (offset.has_value()) {
             const char* const alias = COUNTRIES[*offset];
             sink->Append(alias, static_cast<int32_t>(uprv_strlen(alias)));
-            return;
+            return len;
         }
     }
 
-    sink->Append(buffer, len);
+    sink->Append(buffer, static_cast<int32_t>(len));
+    return len;
 }
 
 /**
  * @param needSeparator if true, then add leading '_' if any variants
  * are added to 'variant'
  */
-void
-_getVariant(const char* localeID,
+size_t
+_getVariant(std::string_view localeID,
             char prev,
             ByteSink* sink,
-            const char** pEnd,
             bool needSeparator,
             UErrorCode& status) {
-    if (U_FAILURE(status)) return;
-    if (pEnd != nullptr) { *pEnd = localeID; }
+    if (U_FAILURE(status) || localeID.empty()) return 0;
 
     // Reasonable upper limit for variants
     // There are no strict limitation of the syntax of variant in the legacy
@@ -1369,63 +1351,82 @@ _getVariant(const char* localeID,
     constexpr int32_t MAX_VARIANTS_LENGTH = 179;
 
     /* get one or more variant tags and separate them with '_' */
-    int32_t index = 0;
+    size_t index = 0;
     if (_isIDSeparator(prev)) {
         /* get a variant string after a '-' or '_' */
-        for (index=0; !_isTerminator(localeID[index]); index++) {
-            if (index >= MAX_VARIANTS_LENGTH) { // same as length > MAX_VARIANTS_LENGTH
+        for (std::string_view sub = localeID;;) {
+            size_t next = sub.find_first_of(".@_-");
+            // For historical reasons, a trailing separator is included in the variant.
+            bool finished = next == std::string_view::npos || next + 1 == sub.length();
+            size_t limit = finished ? sub.length() : next;
+            index += limit;
+            if (index > MAX_VARIANTS_LENGTH) {
                 status = U_ILLEGAL_ARGUMENT_ERROR;
-                return;
-            }
-            if (needSeparator) {
-                if (sink != nullptr) {
-                    sink->Append("_", 1);
-                }
-                needSeparator = false;
+                return 0;
             }
+
             if (sink != nullptr) {
-                char c = uprv_toupper(localeID[index]);
-                if (c == '-') c = '_';
-                sink->Append(&c, 1);
+                if (needSeparator) {
+                    sink->Append("_", 1);
+                } else {
+                    needSeparator = true;
+                }
+
+                int32_t length = static_cast<int32_t>(limit);
+                int32_t minCapacity = uprv_min(length, MAX_VARIANTS_LENGTH);
+                char scratch[MAX_VARIANTS_LENGTH];
+                int32_t capacity = 0;
+                char* buffer = sink->GetAppendBuffer(
+                        minCapacity, minCapacity, scratch, UPRV_LENGTHOF(scratch), &capacity);
+
+                for (size_t i = 0; i < limit; ++i) {
+                    buffer[i] = uprv_toupper(sub[i]);
+                }
+                sink->Append(buffer, length);
             }
+
+            if (finished) { return index; }
+            sub.remove_prefix(next);
+            if (_isTerminator(sub.front()) || _isBCP47Extension(sub)) { return index; }
+            sub.remove_prefix(1);
+            index++;
         }
-        if (pEnd != nullptr) { *pEnd = localeID+index; }
     }
 
+    size_t skip = 0;
     /* if there is no variant tag after a '-' or '_' then look for '@' */
-    if (index == 0) {
-        if (prev=='@') {
-            /* keep localeID */
-        } else if((localeID=locale_getKeywordsStart(localeID))!=nullptr) {
-            ++localeID; /* point after the '@' */
-        } else {
-            return;
-        }
-        for(; !_isTerminator(localeID[index]); index++) {
-            if (index >= MAX_VARIANTS_LENGTH) { // same as length > MAX_VARIANTS_LENGTH
-                status = U_ILLEGAL_ARGUMENT_ERROR;
-                return;
-            }
-            if (needSeparator) {
-                if (sink != nullptr) {
-                    sink->Append("_", 1);
-                }
-                needSeparator = false;
-            }
-            if (sink != nullptr) {
-                char c = uprv_toupper(localeID[index]);
-                if (c == '-' || c == ',') c = '_';
-                sink->Append(&c, 1);
-            }
-        }
-        if (pEnd != nullptr) { *pEnd = localeID + index; }
+    if (prev == '@') {
+        /* keep localeID */
+    } else if (const char* p = locale_getKeywordsStart(localeID); p != nullptr) {
+        skip = 1 + p - localeID.data(); /* point after the '@' */
+        localeID.remove_prefix(skip);
+    } else {
+        return 0;
     }
+    for (; index < localeID.size() && !_isTerminator(localeID[index]); index++) {
+        if (index >= MAX_VARIANTS_LENGTH) { // same as length > MAX_VARIANTS_LENGTH
+            status = U_ILLEGAL_ARGUMENT_ERROR;
+            return 0;
+        }
+        if (needSeparator) {
+            if (sink != nullptr) {
+                sink->Append("_", 1);
+            }
+            needSeparator = false;
+        }
+        if (sink != nullptr) {
+            char c = uprv_toupper(localeID[index]);
+            if (c == '-' || c == ',') c = '_';
+            sink->Append(&c, 1);
+        }
+    }
+    return skip + index;
 }
 
 }  // namespace
 
 U_EXPORT CharString
-ulocimp_getLanguage(const char* localeID, UErrorCode& status) {
+ulocimp_getLanguage(std::string_view localeID, UErrorCode& status) {
     return ByteSinkUtil::viaByteSinkToCharString(
         [&](ByteSink& sink, UErrorCode& status) {
             ulocimp_getSubtags(
@@ -1441,7 +1442,7 @@ ulocimp_getLanguage(const char* localeID, UErrorCode& status) {
 }
 
 U_EXPORT CharString
-ulocimp_getScript(const char* localeID, UErrorCode& status) {
+ulocimp_getScript(std::string_view localeID, UErrorCode& status) {
     return ByteSinkUtil::viaByteSinkToCharString(
         [&](ByteSink& sink, UErrorCode& status) {
             ulocimp_getSubtags(
@@ -1457,7 +1458,7 @@ ulocimp_getScript(const char* localeID, UErrorCode& status) {
 }
 
 U_EXPORT CharString
-ulocimp_getRegion(const char* localeID, UErrorCode& status) {
+ulocimp_getRegion(std::string_view localeID, UErrorCode& status) {
     return ByteSinkUtil::viaByteSinkToCharString(
         [&](ByteSink& sink, UErrorCode& status) {
             ulocimp_getSubtags(
@@ -1473,7 +1474,7 @@ ulocimp_getRegion(const char* localeID, UErrorCode& status) {
 }
 
 U_EXPORT CharString
-ulocimp_getVariant(const char* localeID, UErrorCode& status) {
+ulocimp_getVariant(std::string_view localeID, UErrorCode& status) {
     return ByteSinkUtil::viaByteSinkToCharString(
         [&](ByteSink& sink, UErrorCode& status) {
             ulocimp_getSubtags(
@@ -1490,7 +1491,7 @@ ulocimp_getVariant(const char* localeID, UErrorCode& status) {
 
 U_EXPORT void
 ulocimp_getSubtags(
-        const char* localeID,
+        std::string_view localeID,
         CharString* language,
         CharString* script,
         CharString* region,
@@ -1521,7 +1522,7 @@ ulocimp_getSubtags(
 
 U_EXPORT void
 ulocimp_getSubtags(
-        const char* localeID,
+        std::string_view localeID,
         ByteSink* language,
         ByteSink* script,
         ByteSink* region,
@@ -1531,7 +1532,7 @@ ulocimp_getSubtags(
     if (U_FAILURE(status)) { return; }
 
     if (pEnd != nullptr) {
-        *pEnd = localeID;
+        *pEnd = localeID.data();
     } else if (language == nullptr &&
                script == nullptr &&
                region == nullptr &&
@@ -1539,62 +1540,94 @@ ulocimp_getSubtags(
         return;
     }
 
+    if (localeID.empty()) { return; }
+
     bool hasRegion = false;
 
-    if (localeID == nullptr) {
-        localeID = uloc_getDefault();
+    {
+        size_t len = _getLanguage(localeID, language, status);
+        if (U_FAILURE(status)) { return; }
+        if (len > 0) {
+            localeID.remove_prefix(len);
+        }
     }
 
-    _getLanguage(localeID, language, &localeID, status);
-    if (U_FAILURE(status)) { return; }
-    U_ASSERT(localeID != nullptr);
-
     if (pEnd != nullptr) {
-        *pEnd = localeID;
+        *pEnd = localeID.data();
     } else if (script == nullptr &&
                region == nullptr &&
                variant == nullptr) {
         return;
     }
 
-    if (_isIDSeparator(*localeID)) {
-        const char* begin = localeID + 1;
-        const char* end = nullptr;
-        _getScript(begin, script, &end);
-        U_ASSERT(end != nullptr);
-        if (end != begin) {
-            localeID = end;
-            if (pEnd != nullptr) { *pEnd = localeID; }
+    if (localeID.empty()) { return; }
+
+    if (_isIDSeparator(localeID.front())) {
+        std::string_view sub = localeID;
+        sub.remove_prefix(1);
+        size_t len = _getScript(sub, script);
+        if (len > 0) {
+            localeID.remove_prefix(len + 1);
+            if (pEnd != nullptr) { *pEnd = localeID.data(); }
         }
     }
 
-    if (region == nullptr && variant == nullptr && pEnd == nullptr) { return; }
+    if ((region == nullptr && variant == nullptr && pEnd == nullptr) || localeID.empty()) { return; }
 
-    if (_isIDSeparator(*localeID)) {
-        const char* begin = localeID + 1;
-        const char* end = nullptr;
-        _getRegion(begin, region, &end);
-        U_ASSERT(end != nullptr);
-        if (end != begin) {
+    if (_isIDSeparator(localeID.front())) {
+        std::string_view sub = localeID;
+        sub.remove_prefix(1);
+        size_t len = _getRegion(sub, region);
+        if (len > 0) {
             hasRegion = true;
-            localeID = end;
-            if (pEnd != nullptr) { *pEnd = localeID; }
+            localeID.remove_prefix(len + 1);
+            if (pEnd != nullptr) { *pEnd = localeID.data(); }
         }
     }
 
-    if (variant == nullptr && pEnd == nullptr) { return; }
+    if ((variant == nullptr && pEnd == nullptr) || localeID.empty()) { return; }
 
-    if (_isIDSeparator(*localeID) && !_isBCP47Extension(localeID)) {
+    bool hasVariant = false;
+
+    if (_isIDSeparator(localeID.front()) && !_isBCP47Extension(localeID)) {
+        std::string_view sub = localeID;
         /* If there was no country ID, skip a possible extra IDSeparator */
-        if (!hasRegion && _isIDSeparator(localeID[1])) {
-            localeID++;
-        }
-        const char* begin = localeID + 1;
-        const char* end = nullptr;
-        _getVariant(begin, *localeID, variant, &end, false, status);
+        size_t skip = !hasRegion && localeID.size() > 1 && _isIDSeparator(localeID[1]) ? 2 : 1;
+        sub.remove_prefix(skip);
+        size_t len = _getVariant(sub, localeID[0], variant, false, status);
         if (U_FAILURE(status)) { return; }
-        U_ASSERT(end != nullptr);
-        if (end != begin && pEnd != nullptr) { *pEnd = end; }
+        if (len > 0) {
+            hasVariant = true;
+            localeID.remove_prefix(skip + len);
+            if (pEnd != nullptr) { *pEnd = localeID.data(); }
+        }
+    }
+
+    if ((variant == nullptr && pEnd == nullptr) || localeID.empty()) { return; }
+
+    if (_isBCP47Extension(localeID)) {
+        localeID.remove_prefix(2);
+        constexpr char vaposix[] = "-va-posix";
+        constexpr size_t length = sizeof vaposix - 1;
+        for (size_t next;; localeID.remove_prefix(next)) {
+            next = localeID.find('-', 1);
+            if (next == std::string_view::npos) { break; }
+            next = localeID.find('-', next + 1);
+            bool finished = next == std::string_view::npos;
+            std::string_view sub = localeID;
+            if (!finished) { sub.remove_suffix(sub.length() - next); }
+
+            if (sub.length() == length && uprv_strnicmp(sub.data(), vaposix, length) == 0) {
+                if (variant != nullptr) {
+                    if (hasVariant) { variant->Append("_", 1); }
+                    constexpr char posix[] = "POSIX";
+                    variant->Append(posix, sizeof posix - 1);
+                }
+                if (pEnd != nullptr) { *pEnd = localeID.data() + length; }
+            }
+
+            if (finished) { break; }
+        }
     }
 }
 
@@ -1700,7 +1733,7 @@ uloc_openKeywords(const char* localeID,
     CharString tempBuffer;
     const char* tmpLocaleID;
 
-    if (_hasBCP47Extension(localeID)) {
+    if (localeID != nullptr && _hasBCP47Extension(localeID)) {
         tempBuffer = ulocimp_forLanguageTag(localeID, -1, nullptr, *status);
         tmpLocaleID = U_SUCCESS(*status) && !tempBuffer.isEmpty() ? tempBuffer.data() : localeID;
     } else {
@@ -1753,7 +1786,7 @@ constexpr int32_t I_DEFAULT_LENGTH = UPRV_LENGTHOF(i_default);
  * This is the code underlying uloc_getName and uloc_canonicalize.
  */
 void
-_canonicalize(const char* localeID,
+_canonicalize(std::string_view localeID,
               ByteSink& sink,
               uint32_t options,
               UErrorCode& err) {
@@ -1764,33 +1797,30 @@ _canonicalize(const char* localeID,
     int32_t j, fieldCount=0;
     CharString tempBuffer;  // if localeID has a BCP47 extension, tmpLocaleID points to this
     CharString localeIDWithHyphens;  // if localeID has a BPC47 extension and have _, tmpLocaleID points to this
-    const char* origLocaleID;
-    const char* tmpLocaleID;
-    const char* keywordAssign = nullptr;
-    const char* separatorIndicator = nullptr;
+    std::string_view origLocaleID;
+    std::string_view tmpLocaleID;
+    size_t keywordAssign = std::string_view::npos;
+    size_t separatorIndicator = std::string_view::npos;
 
     if (_hasBCP47Extension(localeID)) {
-        const char* localeIDPtr = localeID;
+        std::string_view localeIDPtr = localeID;
 
         // convert all underbars to hyphens, unless the "BCP47 extension" comes at the beginning of the string
-        if (uprv_strchr(localeID, '_') != nullptr && localeID[1] != '-' && localeID[1] != '_') {
-            localeIDWithHyphens.append(localeID, -1, err);
+        if (localeID.size() >= 2 && localeID.find('_') != std::string_view::npos && localeID[1] != '-' && localeID[1] != '_') {
+            localeIDWithHyphens.append(localeID, err);
             if (U_SUCCESS(err)) {
                 for (char* p = localeIDWithHyphens.data(); *p != '\0'; ++p) {
                     if (*p == '_') {
                         *p = '-';
                     }
                 }
-                localeIDPtr = localeIDWithHyphens.data();
+                localeIDPtr = localeIDWithHyphens.toStringPiece();
             }
         }
 
-        tempBuffer = ulocimp_forLanguageTag(localeIDPtr, -1, nullptr, err);
-        tmpLocaleID = U_SUCCESS(err) && !tempBuffer.isEmpty() ? tempBuffer.data() : localeIDPtr;
+        tempBuffer = ulocimp_forLanguageTag(localeIDPtr.data(), static_cast<int32_t>(localeIDPtr.size()), nullptr, err);
+        tmpLocaleID = U_SUCCESS(err) && !tempBuffer.isEmpty() ? static_cast<std::string_view>(tempBuffer.toStringPiece()) : localeIDPtr;
     } else {
-        if (localeID==nullptr) {
-           localeID=uloc_getDefault();
-        }
         tmpLocaleID=localeID;
     }
 
@@ -1801,20 +1831,25 @@ _canonicalize(const char* localeID,
     CharString script;
     CharString country;
     CharString variant;
+    const char* end = nullptr;
     ulocimp_getSubtags(
             tmpLocaleID,
             &tag,
             &script,
             &country,
             &variant,
-            &tmpLocaleID,
+            &end,
             err);
     if (U_FAILURE(err)) {
         return;
     }
+    U_ASSERT(end != nullptr);
+    if (end > tmpLocaleID.data()) {
+        tmpLocaleID.remove_prefix(end - tmpLocaleID.data());
+    }
 
-    if (tag.length() == I_DEFAULT_LENGTH &&
-            uprv_strncmp(origLocaleID, i_default, I_DEFAULT_LENGTH) == 0) {
+    if (tag.length() == I_DEFAULT_LENGTH && origLocaleID.length() >= I_DEFAULT_LENGTH &&
+            uprv_strncmp(origLocaleID.data(), i_default, I_DEFAULT_LENGTH) == 0) {
         tag.clear();
         tag.append(uloc_getDefault(), err);
     } else {
@@ -1839,15 +1874,14 @@ _canonicalize(const char* localeID,
     }
 
     /* Copy POSIX-style charset specifier, if any [mr.utf8] */
-    if (!OPTION_SET(options, _ULOC_CANONICALIZE) && *tmpLocaleID == '.') {
+    if (!OPTION_SET(options, _ULOC_CANONICALIZE) && !tmpLocaleID.empty() && tmpLocaleID.front() == '.') {
         tag.append('.', err);
-        ++tmpLocaleID;
-        const char *atPos = nullptr;
+        tmpLocaleID.remove_prefix(1);
         size_t length;
-        if((atPos = uprv_strchr(tmpLocaleID, '@')) != nullptr) {
-            length = atPos - tmpLocaleID;
+        if (size_t atPos = tmpLocaleID.find('@'); atPos != std::string_view::npos) {
+            length = atPos;
         } else {
-            length = uprv_strlen(tmpLocaleID);
+            length = tmpLocaleID.length();
         }
         // The longest charset name we found in IANA charset registry
         // https://www.iana.org/assignments/character-sets/ is
@@ -1859,33 +1893,34 @@ _canonicalize(const char* localeID,
            err = U_ILLEGAL_ARGUMENT_ERROR; /* malformed keyword name */
            return;
         }
-        tag.append(tmpLocaleID, static_cast<int32_t>(length), err);
-        tmpLocaleID += length;
+        if (length > 0) {
+            tag.append(tmpLocaleID.data(), static_cast<int32_t>(length), err);
+            tmpLocaleID.remove_prefix(length);
+        }
     }
 
     /* Scan ahead to next '@' and determine if it is followed by '=' and/or ';'
-       After this, tmpLocaleID either points to '@' or is nullptr */
-    if ((tmpLocaleID=locale_getKeywordsStart(tmpLocaleID))!=nullptr) {
-        keywordAssign = uprv_strchr(tmpLocaleID, '=');
-        separatorIndicator = uprv_strchr(tmpLocaleID, ';');
+       After this, tmpLocaleID either starts at '@' or is empty. */
+    if (const char* start = locale_getKeywordsStart(tmpLocaleID); start != nullptr) {
+        if (start > tmpLocaleID.data()) {
+            tmpLocaleID.remove_prefix(start - tmpLocaleID.data());
+        }
+        keywordAssign = tmpLocaleID.find('=');
+        separatorIndicator = tmpLocaleID.find(';');
+    } else {
+        tmpLocaleID = {};
     }
 
     /* Copy POSIX-style variant, if any [mr@FOO] */
     if (!OPTION_SET(options, _ULOC_CANONICALIZE) &&
-        tmpLocaleID != nullptr && keywordAssign == nullptr) {
-        for (;;) {
-            char c = *tmpLocaleID;
-            if (c == 0) {
-                break;
-            }
-            tag.append(c, err);
-            ++tmpLocaleID;
-        }
+        !tmpLocaleID.empty() && keywordAssign == std::string_view::npos) {
+        tag.append(tmpLocaleID, err);
+        tmpLocaleID = {};
     }
 
     if (OPTION_SET(options, _ULOC_CANONICALIZE)) {
         /* Handle @FOO variant if @ is present and not followed by = */
-        if (tmpLocaleID!=nullptr && keywordAssign==nullptr) {
+        if (!tmpLocaleID.empty() && keywordAssign == std::string_view::npos) {
             /* Add missing '_' if needed */
             if (fieldCount < 2 || (fieldCount < 3 && !script.isEmpty())) {
                 do {
@@ -1895,7 +1930,9 @@ _canonicalize(const char* localeID,
             }
 
             CharStringByteSink s(&tag);
-            _getVariant(tmpLocaleID+1, '@', &s, nullptr, !variant.isEmpty(), err);
+            std::string_view sub = tmpLocaleID;
+            sub.remove_prefix(1);
+            _getVariant(sub, '@', &s, !variant.isEmpty(), err);
             if (U_FAILURE(err)) { return; }
         }
 
@@ -1903,7 +1940,7 @@ _canonicalize(const char* localeID,
         for (j=0; j<UPRV_LENGTHOF(CANONICALIZE_MAP); j++) {
             StringPiece id(CANONICALIZE_MAP[j].id);
             if (tag == id) {
-                if (id.empty() && tmpLocaleID != nullptr) {
+                if (id.empty() && !tmpLocaleID.empty()) {
                     break; /* Don't remap "" if keywords present */
                 }
                 tag.clear();
@@ -1916,11 +1953,12 @@ _canonicalize(const char* localeID,
     sink.Append(tag.data(), tag.length());
 
     if (!OPTION_SET(options, _ULOC_STRIP_KEYWORDS)) {
-        if (tmpLocaleID!=nullptr && keywordAssign!=nullptr &&
-            (!separatorIndicator || separatorIndicator > keywordAssign)) {
+        if (!tmpLocaleID.empty() && keywordAssign != std::string_view::npos &&
+            (separatorIndicator == std::string_view::npos || separatorIndicator > keywordAssign)) {
             sink.Append("@", 1);
             ++fieldCount;
-            ulocimp_getKeywords(tmpLocaleID+1, '@', sink, true, err);
+            tmpLocaleID.remove_prefix(1);
+            ulocimp_getKeywords(tmpLocaleID, '@', sink, true, err);
         }
     }
 }
@@ -1989,6 +2027,10 @@ uloc_getLanguage(const char*    localeID,
          int32_t languageCapacity,
          UErrorCode* err)
 {
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
+
     /* uloc_getLanguage will return a 2 character iso-639 code if one exists. *CWB*/
     return ByteSinkUtil::viaByteSinkToTerminatedChars(
         language, languageCapacity,
@@ -2011,6 +2053,10 @@ uloc_getScript(const char*    localeID,
          int32_t scriptCapacity,
          UErrorCode* err)
 {
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
+
     return ByteSinkUtil::viaByteSinkToTerminatedChars(
         script, scriptCapacity,
         [&](ByteSink& sink, UErrorCode& status) {
@@ -2032,6 +2078,10 @@ uloc_getCountry(const char* localeID,
             int32_t countryCapacity,
             UErrorCode* err)
 {
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
+
     return ByteSinkUtil::viaByteSinkToTerminatedChars(
         country, countryCapacity,
         [&](ByteSink& sink, UErrorCode& status) {
@@ -2053,6 +2103,10 @@ uloc_getVariant(const char* localeID,
                 int32_t variantCapacity,
                 UErrorCode* err)
 {
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
+
     return ByteSinkUtil::viaByteSinkToTerminatedChars(
         variant, variantCapacity,
         [&](ByteSink& sink, UErrorCode& status) {
@@ -2074,6 +2128,9 @@ uloc_getName(const char* localeID,
              int32_t nameCapacity,
              UErrorCode* err)
 {
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
     return ByteSinkUtil::viaByteSinkToTerminatedChars(
         name, nameCapacity,
         [&](ByteSink& sink, UErrorCode& status) {
@@ -2083,7 +2140,7 @@ uloc_getName(const char* localeID,
 }
 
 U_EXPORT CharString
-ulocimp_getName(const char* localeID,
+ulocimp_getName(std::string_view localeID,
                 UErrorCode& err)
 {
     return ByteSinkUtil::viaByteSinkToCharString(
@@ -2094,7 +2151,7 @@ ulocimp_getName(const char* localeID,
 }
 
 U_EXPORT void
-ulocimp_getName(const char* localeID,
+ulocimp_getName(std::string_view localeID,
                 ByteSink& sink,
                 UErrorCode& err)
 {
@@ -2107,6 +2164,9 @@ uloc_getBaseName(const char* localeID,
                  int32_t nameCapacity,
                  UErrorCode* err)
 {
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
     return ByteSinkUtil::viaByteSinkToTerminatedChars(
         name, nameCapacity,
         [&](ByteSink& sink, UErrorCode& status) {
@@ -2116,7 +2176,7 @@ uloc_getBaseName(const char* localeID,
 }
 
 U_EXPORT CharString
-ulocimp_getBaseName(const char* localeID,
+ulocimp_getBaseName(std::string_view localeID,
                     UErrorCode& err)
 {
     return ByteSinkUtil::viaByteSinkToCharString(
@@ -2127,7 +2187,7 @@ ulocimp_getBaseName(const char* localeID,
 }
 
 U_EXPORT void
-ulocimp_getBaseName(const char* localeID,
+ulocimp_getBaseName(std::string_view localeID,
                     ByteSink& sink,
                     UErrorCode& err)
 {
@@ -2140,6 +2200,9 @@ uloc_canonicalize(const char* localeID,
                   int32_t nameCapacity,
                   UErrorCode* err)
 {
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
     return ByteSinkUtil::viaByteSinkToTerminatedChars(
         name, nameCapacity,
         [&](ByteSink& sink, UErrorCode& status) {
@@ -2149,7 +2212,7 @@ uloc_canonicalize(const char* localeID,
 }
 
 U_EXPORT CharString
-ulocimp_canonicalize(const char* localeID,
+ulocimp_canonicalize(std::string_view localeID,
                      UErrorCode& err)
 {
     return ByteSinkUtil::viaByteSinkToCharString(
@@ -2160,7 +2223,7 @@ ulocimp_canonicalize(const char* localeID,
 }
 
 U_EXPORT void
-ulocimp_canonicalize(const char* localeID,
+ulocimp_canonicalize(std::string_view localeID,
                      ByteSink& sink,
                      UErrorCode& err)
 {
diff --git a/engine/thirdparty/icu4c/common/uloc_tag.cpp b/engine/thirdparty/icu4c/common/uloc_tag.cpp
index 7b3b1e73..b2e9946f 100644
--- a/engine/thirdparty/icu4c/common/uloc_tag.cpp
+++ b/engine/thirdparty/icu4c/common/uloc_tag.cpp
@@ -1043,7 +1043,7 @@ _initializeULanguageTag(ULanguageTag* langtag) {
 }
 
 void
-_appendLanguageToLanguageTag(const char* localeID, icu::ByteSink& sink, bool strict, UErrorCode& status) {
+_appendLanguageToLanguageTag(std::string_view localeID, icu::ByteSink& sink, bool strict, UErrorCode& status) {
     UErrorCode tmpStatus = U_ZERO_ERROR;
 
     if (U_FAILURE(status)) {
@@ -1088,7 +1088,7 @@ _appendLanguageToLanguageTag(const char* localeID, icu::ByteSink& sink, bool str
 }
 
 void
-_appendScriptToLanguageTag(const char* localeID, icu::ByteSink& sink, bool strict, UErrorCode& status) {
+_appendScriptToLanguageTag(std::string_view localeID, icu::ByteSink& sink, bool strict, UErrorCode& status) {
     UErrorCode tmpStatus = U_ZERO_ERROR;
 
     if (U_FAILURE(status)) {
@@ -1118,7 +1118,7 @@ _appendScriptToLanguageTag(const char* localeID, icu::ByteSink& sink, bool stric
 }
 
 void
-_appendRegionToLanguageTag(const char* localeID, icu::ByteSink& sink, bool strict, UErrorCode& status) {
+_appendRegionToLanguageTag(std::string_view localeID, icu::ByteSink& sink, bool strict, UErrorCode& status) {
     UErrorCode tmpStatus = U_ZERO_ERROR;
 
     if (U_FAILURE(status)) {
@@ -1169,7 +1169,7 @@ void _sortVariants(VariantListEntry* first) {
 }
 
 void
-_appendVariantsToLanguageTag(const char* localeID, icu::ByteSink& sink, bool strict, bool& hadPosix, UErrorCode& status) {
+_appendVariantsToLanguageTag(std::string_view localeID, icu::ByteSink& sink, bool strict, bool& hadPosix, UErrorCode& status) {
     if (U_FAILURE(status)) { return; }
 
     UErrorCode tmpStatus = U_ZERO_ERROR;
@@ -1872,7 +1872,7 @@ _appendKeywords(ULanguageTag* langtag, icu::ByteSink& sink, UErrorCode& status)
 }
 
 void
-_appendPrivateuseToLanguageTag(const char* localeID, icu::ByteSink& sink, bool strict, bool /*hadPosix*/, UErrorCode& status) {
+_appendPrivateuseToLanguageTag(std::string_view localeID, icu::ByteSink& sink, bool strict, bool /*hadPosix*/, UErrorCode& status) {
     if (U_FAILURE(status)) { return; }
 
     UErrorCode tmpStatus = U_ZERO_ERROR;
@@ -2596,6 +2596,9 @@ ulocimp_toLanguageTag(const char* localeID,
     bool hadPosix = false;
     const char* pKeywordStart;
 
+    if (localeID == nullptr) {
+        localeID = uloc_getDefault();
+    }
     /* Note: uloc_canonicalize returns "en_US_POSIX" for input locale ID "".  See #6835 */
     icu::CharString canonical = ulocimp_canonicalize(localeID, tmpStatus);
     if (U_FAILURE(tmpStatus)) {
@@ -2604,7 +2607,7 @@ ulocimp_toLanguageTag(const char* localeID,
     }
 
     /* For handling special case - private use only tag */
-    pKeywordStart = locale_getKeywordsStart(canonical.data());
+    pKeywordStart = locale_getKeywordsStart(canonical.toStringPiece());
     if (pKeywordStart == canonical.data()) {
         int kwdCnt = 0;
         bool done = false;
@@ -2642,12 +2645,12 @@ ulocimp_toLanguageTag(const char* localeID,
         }
     }
 
-    _appendLanguageToLanguageTag(canonical.data(), sink, strict, status);
-    _appendScriptToLanguageTag(canonical.data(), sink, strict, status);
-    _appendRegionToLanguageTag(canonical.data(), sink, strict, status);
-    _appendVariantsToLanguageTag(canonical.data(), sink, strict, hadPosix, status);
+    _appendLanguageToLanguageTag(canonical.toStringPiece(), sink, strict, status);
+    _appendScriptToLanguageTag(canonical.toStringPiece(), sink, strict, status);
+    _appendRegionToLanguageTag(canonical.toStringPiece(), sink, strict, status);
+    _appendVariantsToLanguageTag(canonical.toStringPiece(), sink, strict, hadPosix, status);
     _appendKeywordsToLanguageTag(canonical.data(), sink, strict, hadPosix, status);
-    _appendPrivateuseToLanguageTag(canonical.data(), sink, strict, hadPosix, status);
+    _appendPrivateuseToLanguageTag(canonical.toStringPiece(), sink, strict, hadPosix, status);
 }
 
 
diff --git a/engine/thirdparty/icu4c/common/ulocale.cpp b/engine/thirdparty/icu4c/common/ulocale.cpp
index f2f81bc9..33814713 100644
--- a/engine/thirdparty/icu4c/common/ulocale.cpp
+++ b/engine/thirdparty/icu4c/common/ulocale.cpp
@@ -10,7 +10,6 @@
 #include "unicode/locid.h"
 
 #include "bytesinkutil.h"
-#include "charstr.h"
 #include "cmemory.h"
 
 U_NAMESPACE_USE
@@ -24,9 +23,7 @@ ulocale_openForLocaleID(const char* localeID, int32_t length, UErrorCode* err) {
     if (length < 0) {
         return EXTERNAL(icu::Locale::createFromName(localeID).clone());
     }
-    CharString str(localeID, length, *err);  // Make a NUL terminated copy.
-    if (U_FAILURE(*err)) { return nullptr; }
-    return EXTERNAL(icu::Locale::createFromName(str.data()).clone());
+    return EXTERNAL(icu::Locale::createFromName(StringPiece{localeID, length}).clone());
 }
 
 ULocale*
diff --git a/engine/thirdparty/icu4c/common/ulocimp.h b/engine/thirdparty/icu4c/common/ulocimp.h
index 1887e2a8..7f09748c 100644
--- a/engine/thirdparty/icu4c/common/ulocimp.h
+++ b/engine/thirdparty/icu4c/common/ulocimp.h
@@ -68,42 +68,42 @@ U_EXPORT std::optional<std::string_view>
 ulocimp_toLegacyTypeWithFallback(std::string_view keyword, std::string_view value);
 
 U_EXPORT icu::CharString
-ulocimp_getKeywords(const char* localeID,
+ulocimp_getKeywords(std::string_view localeID,
                     char prev,
                     bool valuesToo,
                     UErrorCode& status);
 
 U_EXPORT void
-ulocimp_getKeywords(const char* localeID,
+ulocimp_getKeywords(std::string_view localeID,
                     char prev,
                     icu::ByteSink& sink,
                     bool valuesToo,
                     UErrorCode& status);
 
 U_EXPORT icu::CharString
-ulocimp_getName(const char* localeID,
+ulocimp_getName(std::string_view localeID,
                 UErrorCode& err);
 
 U_EXPORT void
-ulocimp_getName(const char* localeID,
+ulocimp_getName(std::string_view localeID,
                 icu::ByteSink& sink,
                 UErrorCode& err);
 
 U_EXPORT icu::CharString
-ulocimp_getBaseName(const char* localeID,
+ulocimp_getBaseName(std::string_view localeID,
                     UErrorCode& err);
 
 U_EXPORT void
-ulocimp_getBaseName(const char* localeID,
+ulocimp_getBaseName(std::string_view localeID,
                     icu::ByteSink& sink,
                     UErrorCode& err);
 
 U_EXPORT icu::CharString
-ulocimp_canonicalize(const char* localeID,
+ulocimp_canonicalize(std::string_view localeID,
                      UErrorCode& err);
 
 U_EXPORT void
-ulocimp_canonicalize(const char* localeID,
+ulocimp_canonicalize(std::string_view localeID,
                      icu::ByteSink& sink,
                      UErrorCode& err);
 
@@ -119,16 +119,16 @@ ulocimp_getKeywordValue(const char* localeID,
                         UErrorCode& status);
 
 U_EXPORT icu::CharString
-ulocimp_getLanguage(const char* localeID, UErrorCode& status);
+ulocimp_getLanguage(std::string_view localeID, UErrorCode& status);
 
 U_EXPORT icu::CharString
-ulocimp_getScript(const char* localeID, UErrorCode& status);
+ulocimp_getScript(std::string_view localeID, UErrorCode& status);
 
 U_EXPORT icu::CharString
-ulocimp_getRegion(const char* localeID, UErrorCode& status);
+ulocimp_getRegion(std::string_view localeID, UErrorCode& status);
 
 U_EXPORT icu::CharString
-ulocimp_getVariant(const char* localeID, UErrorCode& status);
+ulocimp_getVariant(std::string_view localeID, UErrorCode& status);
 
 U_EXPORT void
 ulocimp_setKeywordValue(std::string_view keywordName,
@@ -145,7 +145,7 @@ ulocimp_setKeywordValue(std::string_view keywords,
 
 U_EXPORT void
 ulocimp_getSubtags(
-        const char* localeID,
+        std::string_view localeID,
         icu::CharString* language,
         icu::CharString* script,
         icu::CharString* region,
@@ -155,7 +155,7 @@ ulocimp_getSubtags(
 
 U_EXPORT void
 ulocimp_getSubtags(
-        const char* localeID,
+        std::string_view localeID,
         icu::ByteSink* language,
         icu::ByteSink* script,
         icu::ByteSink* region,
@@ -165,7 +165,7 @@ ulocimp_getSubtags(
 
 inline void
 ulocimp_getSubtags(
-        const char* localeID,
+        std::string_view localeID,
         std::nullptr_t,
         std::nullptr_t,
         std::nullptr_t,
@@ -364,7 +364,7 @@ ulocimp_minimizeSubtags(const char* localeID,
                         UErrorCode& err);
 
 U_CAPI const char * U_EXPORT2
-locale_getKeywordsStart(const char *localeID);
+locale_getKeywordsStart(std::string_view localeID);
 
 bool
 ultag_isExtensionSubtags(const char* s, int32_t len);
diff --git a/engine/thirdparty/icu4c/common/umapfile.cpp b/engine/thirdparty/icu4c/common/umapfile.cpp
index b58ac37f..3ba0251d 100644
--- a/engine/thirdparty/icu4c/common/umapfile.cpp
+++ b/engine/thirdparty/icu4c/common/umapfile.cpp
@@ -237,8 +237,13 @@ typedef HANDLE MemoryMap;
         pData->map = (char *)data + length;
         pData->pHeader=(const DataHeader *)data;
         pData->mapAddr = data;
-#if U_PLATFORM == U_PF_IPHONE
+#if U_PLATFORM == U_PF_IPHONE || U_PLATFORM == U_PF_ANDROID
+    // Apparently supported from Android 23 and higher:
+    //   https://github.com/ggml-org/llama.cpp/pull/3631
+    // Checking for the flag itself is safer than checking for __ANDROID_API__.
+#   ifdef POSIX_MADV_RANDOM
         posix_madvise(data, length, POSIX_MADV_RANDOM);
+#   endif
 #endif
         return true;
     }
diff --git a/engine/thirdparty/icu4c/common/unicode/brkiter.h b/engine/thirdparty/icu4c/common/unicode/brkiter.h
index 30c59c4a..d953925b 100644
--- a/engine/thirdparty/icu4c/common/unicode/brkiter.h
+++ b/engine/thirdparty/icu4c/common/unicode/brkiter.h
@@ -58,6 +58,8 @@ U_NAMESPACE_END
 
 U_NAMESPACE_BEGIN
 
+class CharString;
+
 /**
  * The BreakIterator class implements methods for finding the location
  * of boundaries in text. BreakIterator is an abstract base class.
@@ -646,9 +648,9 @@ protected:
 private:
 
     /** @internal (private) */
-    char actualLocale[ULOC_FULLNAME_CAPACITY];
-    char validLocale[ULOC_FULLNAME_CAPACITY];
-    char requestLocale[ULOC_FULLNAME_CAPACITY];
+    CharString* actualLocale = nullptr;
+    CharString* validLocale = nullptr;
+    CharString* requestLocale = nullptr;
 };
 
 #ifndef U_HIDE_DEPRECATED_API
diff --git a/engine/thirdparty/icu4c/common/unicode/char16ptr.h b/engine/thirdparty/icu4c/common/unicode/char16ptr.h
index daf35cd4..049de9ef 100644
--- a/engine/thirdparty/icu4c/common/unicode/char16ptr.h
+++ b/engine/thirdparty/icu4c/common/unicode/char16ptr.h
@@ -9,10 +9,13 @@
 
 #include "unicode/utypes.h"
 
-#if U_SHOW_CPLUSPLUS_API
+#if U_SHOW_CPLUSPLUS_API || U_SHOW_CPLUSPLUS_HEADER_API
 
 #include <cstddef>
 #include <string_view>
+#include <type_traits>
+
+#endif
 
 /**
  * \file
@@ -21,8 +24,6 @@
  *        Also conversion functions from char16_t * to UChar * and OldUChar *.
  */
 
-U_NAMESPACE_BEGIN
-
 /**
  * \def U_ALIASING_BARRIER
  * Barrier for pointer anti-aliasing optimizations even across function boundaries.
@@ -36,6 +37,11 @@ U_NAMESPACE_BEGIN
 #   define U_ALIASING_BARRIER(ptr)
 #endif
 
+// ICU DLL-exported
+#if U_SHOW_CPLUSPLUS_API
+
+U_NAMESPACE_BEGIN
+
 /**
  * char16_t * wrapper with implicit conversion from distinct but bit-compatible pointer types.
  * @stable ICU 59
@@ -251,6 +257,60 @@ const char16_t *ConstChar16Ptr::get() const { return u_.cp; }
 #endif
 /// \endcond
 
+U_NAMESPACE_END
+
+#endif  // U_SHOW_CPLUSPLUS_API
+
+// Usable in header-only definitions
+#if U_SHOW_CPLUSPLUS_API || U_SHOW_CPLUSPLUS_HEADER_API
+
+namespace U_ICU_NAMESPACE_OR_INTERNAL {
+
+#ifndef U_FORCE_HIDE_INTERNAL_API
+/** @internal */
+template<typename T, typename = std::enable_if_t<std::is_same_v<T, UChar>>>
+inline const char16_t *uprv_char16PtrFromUChar(const T *p) {
+    if constexpr (std::is_same_v<UChar, char16_t>) {
+        return p;
+    } else {
+#if U_SHOW_CPLUSPLUS_API
+        return ConstChar16Ptr(p).get();
+#else
+#ifdef U_ALIASING_BARRIER
+        U_ALIASING_BARRIER(p);
+#endif
+        return reinterpret_cast<const char16_t *>(p);
+#endif
+    }
+}
+#if !U_CHAR16_IS_TYPEDEF && (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 180000)
+/** @internal */
+inline const char16_t *uprv_char16PtrFromUint16(const uint16_t *p) {
+#if U_SHOW_CPLUSPLUS_API
+    return ConstChar16Ptr(p).get();
+#else
+#ifdef U_ALIASING_BARRIER
+    U_ALIASING_BARRIER(p);
+#endif
+    return reinterpret_cast<const char16_t *>(p);
+#endif
+}
+#endif
+#if U_SIZEOF_WCHAR_T==2
+/** @internal */
+inline const char16_t *uprv_char16PtrFromWchar(const wchar_t *p) {
+#if U_SHOW_CPLUSPLUS_API
+    return ConstChar16Ptr(p).get();
+#else
+#ifdef U_ALIASING_BARRIER
+    U_ALIASING_BARRIER(p);
+#endif
+    return reinterpret_cast<const char16_t *>(p);
+#endif
+}
+#endif
+#endif
+
 /**
  * Converts from const char16_t * to const UChar *.
  * Includes an aliasing barrier if available.
@@ -307,6 +367,15 @@ inline OldUChar *toOldUCharPtr(char16_t *p) {
     return reinterpret_cast<OldUChar *>(p);
 }
 
+}  // U_ICU_NAMESPACE_OR_INTERNAL
+
+#endif  // U_SHOW_CPLUSPLUS_API || U_SHOW_CPLUSPLUS_HEADER_API
+
+// ICU DLL-exported
+#if U_SHOW_CPLUSPLUS_API
+
+U_NAMESPACE_BEGIN
+
 #ifndef U_FORCE_HIDE_INTERNAL_API
 /**
  * Is T convertible to a std::u16string_view or some other 16-bit string view?
@@ -379,6 +448,6 @@ inline std::u16string_view toU16StringViewNullable(const T& text) {
 
 U_NAMESPACE_END
 
-#endif /* U_SHOW_CPLUSPLUS_API */
+#endif  // U_SHOW_CPLUSPLUS_API
 
 #endif  // __CHAR16PTR_H__
diff --git a/engine/thirdparty/icu4c/common/unicode/locid.h b/engine/thirdparty/icu4c/common/unicode/locid.h
index e1afd598..a394cd93 100644
--- a/engine/thirdparty/icu4c/common/unicode/locid.h
+++ b/engine/thirdparty/icu4c/common/unicode/locid.h
@@ -449,6 +449,11 @@ public:
      */
     static Locale U_EXPORT2 createFromName(const char *name);
 
+#ifndef U_HIDE_INTERNAL_API
+    /** @internal */
+    static Locale U_EXPORT2 createFromName(StringPiece name);
+#endif  /* U_HIDE_INTERNAL_API */
+
     /**
      * Creates a locale from the given string after canonicalizing
      * the string according to CLDR by calling uloc_canonicalize().
@@ -1133,7 +1138,9 @@ private:
      * @param cLocaleID The new locale name.
      * @param canonicalize whether to call uloc_canonicalize on cLocaleID
      */
-    Locale& init(const char* cLocaleID, UBool canonicalize);
+    Locale& init(const char* localeID, UBool canonicalize);
+    /** @internal */
+    Locale& init(StringPiece localeID, UBool canonicalize);
 
     /*
      * Internal constructor to allow construction of a locale object with
diff --git a/engine/thirdparty/icu4c/common/unicode/resbund.h b/engine/thirdparty/icu4c/common/unicode/resbund.h
index 39653717..03ff6fae 100644
--- a/engine/thirdparty/icu4c/common/unicode/resbund.h
+++ b/engine/thirdparty/icu4c/common/unicode/resbund.h
@@ -450,7 +450,7 @@ public:
      * @return a Locale object
      * @stable ICU 2.8
      */
-    const Locale
+    Locale
       getLocale(ULocDataLocaleType type, UErrorCode &status) const;
 #ifndef U_HIDE_INTERNAL_API
     /**
diff --git a/engine/thirdparty/icu4c/common/unicode/uchar.h b/engine/thirdparty/icu4c/common/unicode/uchar.h
index 0daa7dd2..82ec63ab 100644
--- a/engine/thirdparty/icu4c/common/unicode/uchar.h
+++ b/engine/thirdparty/icu4c/common/unicode/uchar.h
@@ -675,14 +675,14 @@ typedef enum UProperty {
      * @stable ICU 63
      */
     UCHAR_VERTICAL_ORIENTATION=0x1018,
-#ifndef U_HIDE_DRAFT_API
     /**
      * Enumerated property Identifier_Status.
      * Used for UTS #39 General Security Profile for Identifiers
      * (https://www.unicode.org/reports/tr39/#General_Security_Profile).
-     * @draft ICU 75
+     * @stable ICU 75
      */
     UCHAR_IDENTIFIER_STATUS=0x1019,
+#ifndef U_HIDE_DRAFT_API
     /**
      * Enumerated property Indic_Conjunct_Break.
      * Used in the grapheme cluster break algorithm in UAX #29.
@@ -796,7 +796,6 @@ typedef enum UProperty {
     UCHAR_SCRIPT_EXTENSIONS=0x7000,
     /** First constant for Unicode properties with unusual value types. @stable ICU 4.6 */
     UCHAR_OTHER_PROPERTY_START=UCHAR_SCRIPT_EXTENSIONS,
-#ifndef U_HIDE_DRAFT_API
     /**
      * Miscellaneous property Identifier_Type.
      * Used for UTS #39 General Security Profile for Identifiers
@@ -808,10 +807,9 @@ typedef enum UProperty {
      *
      * @see u_hasIDType
      * @see u_getIDTypes
-     * @draft ICU 75
+     * @stable ICU 75
      */
     UCHAR_IDENTIFIER_TYPE=0x7001,
-#endif  // U_HIDE_DRAFT_API
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the last constant for Unicode properties with unusual value types.
@@ -2791,13 +2789,12 @@ typedef enum UVerticalOrientation {
     U_VO_UPRIGHT,
 } UVerticalOrientation;
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * Identifier Status constants.
  * See https://www.unicode.org/reports/tr39/#Identifier_Status_and_Type.
  *
  * @see UCHAR_IDENTIFIER_STATUS
- * @draft ICU 75
+ * @stable ICU 75
  */
 typedef enum UIdentifierStatus {
     /*
@@ -2806,9 +2803,9 @@ typedef enum UIdentifierStatus {
      *     U_ID_STATUS_<Unicode Identifier_Status value name>
      */
 
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_STATUS_RESTRICTED,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_STATUS_ALLOWED,
 } UIdentifierStatus;
 
@@ -2817,7 +2814,7 @@ typedef enum UIdentifierStatus {
  * See https://www.unicode.org/reports/tr39/#Identifier_Status_and_Type.
  *
  * @see UCHAR_IDENTIFIER_TYPE
- * @draft ICU 75
+ * @stable ICU 75
  */
 typedef enum UIdentifierType {
     /*
@@ -2826,32 +2823,31 @@ typedef enum UIdentifierType {
      *     U_ID_TYPE_<Unicode Identifier_Type value name>
      */
 
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_NOT_CHARACTER,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_DEPRECATED,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_DEFAULT_IGNORABLE,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_NOT_NFKC,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_NOT_XID,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_EXCLUSION,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_OBSOLETE,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_TECHNICAL,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_UNCOMMON_USE,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_LIMITED_USE,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_INCLUSION,
-    /** @draft ICU 75 */
+    /** @stable ICU 75 */
     U_ID_TYPE_RECOMMENDED,
 } UIdentifierType;
-#endif  // U_HIDE_DRAFT_API
 
 /**
  * Check a binary Unicode property for a code point.
@@ -4057,7 +4053,6 @@ u_isIDStart(UChar32 c);
 U_CAPI UBool U_EXPORT2
 u_isIDPart(UChar32 c);
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * Does the set of Identifier_Type values code point c contain the given type?
  *
@@ -4069,7 +4064,7 @@ u_isIDPart(UChar32 c);
  * @param c code point
  * @param type Identifier_Type to check
  * @return true if type is in Identifier_Type(c)
- * @draft ICU 75
+ * @stable ICU 75
  */
 U_CAPI bool U_EXPORT2
 u_hasIDType(UChar32 c, UIdentifierType type);
@@ -4104,11 +4099,10 @@ u_hasIDType(UChar32 c, UIdentifierType type);
  *                   function chaining. (See User Guide for details.)
  * @return number of values in c's Identifier_Type,
  *         written to types unless U_BUFFER_OVERFLOW_ERROR indicates insufficient capacity
- * @draft ICU 75
+ * @stable ICU 75
  */
 U_CAPI int32_t U_EXPORT2
 u_getIDTypes(UChar32 c, UIdentifierType *types, int32_t capacity, UErrorCode *pErrorCode);
-#endif  // U_HIDE_DRAFT_API
 
 /**
  * Determines if the specified character should be regarded
diff --git a/engine/thirdparty/icu4c/common/unicode/uniset.h b/engine/thirdparty/icu4c/common/unicode/uniset.h
index d070fd63..6b1ac9ba 100644
--- a/engine/thirdparty/icu4c/common/unicode/uniset.h
+++ b/engine/thirdparty/icu4c/common/unicode/uniset.h
@@ -1173,10 +1173,12 @@ public:
     inline U_HEADER_NESTED_NAMESPACE::USetStrings strings() const {
         return U_HEADER_NESTED_NAMESPACE::USetStrings(toUSet());
     }
+#endif  // U_HIDE_DRAFT_API
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Returns a C++ iterator for iterating over all of the elements of this set.
-     * Convenient all-in one iteration, but creates a UnicodeString for each
+     * Convenient all-in one iteration, but creates a std::u16string for each
      * code point or string.
      * (Similar to how Java UnicodeSet *is an* Iterable&lt;String&gt;.)
      *
@@ -1185,13 +1187,14 @@ public:
      * \code
      * UnicodeSet set(u"[abcçカ🚴{}{abc}{de}]", errorCode);
      * for (auto el : set) {
+     *     UnicodeString us(el);
      *     std::string u8;
-     *     printf("set.string length %ld \"%s\"\n", (long)el.length(), el.toUTF8String(u8).c_str());
+     *     printf("set.element length %ld \"%s\"\n", (long)us.length(), us.toUTF8String(u8).c_str());
      * }
      * \endcode
      *
      * @return an all-elements iterator.
-     * @draft ICU 76
+     * @draft ICU 77
      * @see end
      * @see codePoints
      * @see ranges
@@ -1203,7 +1206,7 @@ public:
 
     /**
      * @return an exclusive-end sentinel for iterating over all of the elements of this set.
-     * @draft ICU 76
+     * @draft ICU 77
      * @see begin
      * @see codePoints
      * @see ranges
diff --git a/engine/thirdparty/icu4c/common/unicode/uset.h b/engine/thirdparty/icu4c/common/unicode/uset.h
index c8f9b559..c5e7f239 100644
--- a/engine/thirdparty/icu4c/common/unicode/uset.h
+++ b/engine/thirdparty/icu4c/common/unicode/uset.h
@@ -32,12 +32,13 @@
 #include "unicode/utypes.h"
 #include "unicode/uchar.h"
 
-#if U_SHOW_CPLUSPLUS_API
+#if U_SHOW_CPLUSPLUS_API || U_SHOW_CPLUSPLUS_HEADER_API
+#include <string>
 #include <string_view>
 #include "unicode/char16ptr.h"
 #include "unicode/localpointer.h"
-#include "unicode/unistr.h"
-#endif   // U_SHOW_CPLUSPLUS_API
+#include "unicode/utf16.h"
+#endif
 
 #ifndef USET_DEFINED
 
@@ -1392,8 +1393,8 @@ public:
 private:
     friend class USetCodePoints;
 
-    USetCodePointIterator(const USet *uset, int32_t rangeIndex, int32_t rangeCount)
-            : uset(uset), rangeIndex(rangeIndex), rangeCount(rangeCount),
+    USetCodePointIterator(const USet *pUset, int32_t nRangeIndex, int32_t nRangeCount)
+            : uset(pUset), rangeIndex(nRangeIndex), rangeCount(nRangeCount),
                 c(U_SENTINEL), end(U_SENTINEL) {
         // Fetch the first range.
         operator++();
@@ -1429,7 +1430,7 @@ public:
      * Constructs a C++ "range" object over the code points of the USet.
      * @draft ICU 76
      */
-    USetCodePoints(const USet *uset) : uset(uset), rangeCount(uset_getRangeCount(uset)) {}
+    USetCodePoints(const USet *pUset) : uset(pUset), rangeCount(uset_getRangeCount(pUset)) {}
 
     /** @draft ICU 76 */
     USetCodePoints(const USetCodePoints &other) = default;
@@ -1460,7 +1461,7 @@ struct CodePointRange {
     /** @draft ICU 76 */
     struct iterator {
         /** @draft ICU 76 */
-        iterator(UChar32 c) : c(c) {}
+        iterator(UChar32 aC) : c(aC) {}
 
         /** @draft ICU 76 */
         bool operator==(const iterator &other) const { return c == other.c; }
@@ -1573,8 +1574,8 @@ public:
 private:
     friend class USetRanges;
 
-    USetRangeIterator(const USet *uset, int32_t rangeIndex, int32_t rangeCount)
-            : uset(uset), rangeIndex(rangeIndex), rangeCount(rangeCount) {}
+    USetRangeIterator(const USet *pUset, int32_t nRangeIndex, int32_t nRangeCount)
+            : uset(pUset), rangeIndex(nRangeIndex), rangeCount(nRangeCount) {}
 
     const USet *uset;
     int32_t rangeIndex;
@@ -1610,7 +1611,7 @@ public:
      * Constructs a C++ "range" object over the code point ranges of the USet.
      * @draft ICU 76
      */
-    USetRanges(const USet *uset) : uset(uset), rangeCount(uset_getRangeCount(uset)) {}
+    USetRanges(const USet *pUset) : uset(pUset), rangeCount(uset_getRangeCount(pUset)) {}
 
     /** @draft ICU 76 */
     USetRanges(const USetRanges &other) = default;
@@ -1657,7 +1658,7 @@ public:
             int32_t length;
             const UChar *uchars = uset_getString(uset, index, &length);
             // assert uchars != nullptr;
-            return {ConstChar16Ptr(uchars), static_cast<uint32_t>(length)};
+            return {uprv_char16PtrFromUChar(uchars), static_cast<size_t>(length)};
         }
         return {};
     }
@@ -1684,8 +1685,8 @@ public:
 private:
     friend class USetStrings;
 
-    USetStringIterator(const USet *uset, int32_t index, int32_t count)
-            : uset(uset), index(index), count(count) {}
+    USetStringIterator(const USet *pUset, int32_t nIndex, int32_t nCount)
+            : uset(pUset), index(nIndex), count(nCount) {}
 
     const USet *uset;
     int32_t index;
@@ -1699,9 +1700,11 @@ private:
  * using U_HEADER_NESTED_NAMESPACE::USetStrings;
  * LocalUSetPointer uset(uset_openPattern(u"[abcçカ🚴{}{abc}{de}]", -1, &errorCode));
  * for (auto s : USetStrings(uset.getAlias())) {
- *     UnicodeString us(s);
- *     std::string u8;
- *     printf("uset.string length %ld \"%s\"\n", (long)s.length(), us.toUTF8String(u8).c_str());
+ *     int32_t len32 = s.length();
+ *     char utf8[200];
+ *     u_strToUTF8WithSub(utf8, int32_t{sizeof(utf8) - 1}, nullptr,
+ *                        s.data(), len32, 0xFFFD, nullptr, errorCode);
+ *     printf("uset.string length %ld \"%s\"\n", long{len32}, utf8);
  * }
  * \endcode
  *
@@ -1718,7 +1721,7 @@ public:
      * Constructs a C++ "range" object over the strings of the USet.
      * @draft ICU 76
      */
-    USetStrings(const USet *uset) : uset(uset), count(uset_getStringCount(uset)) {}
+    USetStrings(const USet *pUset) : uset(pUset), count(uset_getStringCount(pUset)) {}
 
     /** @draft ICU 76 */
     USetStrings(const USetStrings &other) = default;
@@ -1737,17 +1740,19 @@ private:
     const USet *uset;
     int32_t count;
 };
+#endif  // U_HIDE_DRAFT_API
 
+#ifndef U_HIDE_DRAFT_API
 /**
  * Iterator returned by USetElements.
- * @draft ICU 76
+ * @draft ICU 77
  */
 class USetElementIterator {
 public:
-    /** @draft ICU 76 */
+    /** @draft ICU 77 */
     USetElementIterator(const USetElementIterator &other) = default;
 
-    /** @draft ICU 76 */
+    /** @draft ICU 77 */
     bool operator==(const USetElementIterator &other) const {
         // No need to compare rangeCount & end given private constructor
         // and assuming we don't compare iterators across the set being modified.
@@ -1756,26 +1761,28 @@ public:
         return uset == other.uset && c == other.c && index == other.index;
     }
 
-    /** @draft ICU 76 */
+    /** @draft ICU 77 */
     bool operator!=(const USetElementIterator &other) const { return !operator==(other); }
 
-    /** @draft ICU 76 */
-    UnicodeString operator*() const {
+    /** @draft ICU 77 */
+    std::u16string operator*() const {
         if (c >= 0) {
-            return UnicodeString(c);
+            return c <= 0xffff ?
+                std::u16string({static_cast<char16_t>(c)}) :
+                std::u16string({U16_LEAD(c), U16_TRAIL(c)});
         } else if (index < totalCount) {
             int32_t length;
             const UChar *uchars = uset_getString(uset, index - rangeCount, &length);
             // assert uchars != nullptr;
-            return UnicodeString(uchars, length);
+            return {uprv_char16PtrFromUChar(uchars), static_cast<size_t>(length)};
         } else {
-            return UnicodeString();
+            return {};
         }
     }
 
     /**
      * Pre-increment.
-     * @draft ICU 76
+     * @draft ICU 77
      */
     USetElementIterator &operator++() {
         if (c < end) {
@@ -1800,7 +1807,7 @@ public:
 
     /**
      * Post-increment.
-     * @draft ICU 76
+     * @draft ICU 77
      */
     USetElementIterator operator++(int) {
         USetElementIterator result(*this);
@@ -1811,8 +1818,8 @@ public:
 private:
     friend class USetElements;
 
-    USetElementIterator(const USet *uset, int32_t index, int32_t rangeCount, int32_t totalCount)
-            : uset(uset), index(index), rangeCount(rangeCount), totalCount(totalCount),
+    USetElementIterator(const USet *pUset, int32_t nIndex, int32_t nRangeCount, int32_t nTotalCount)
+            : uset(pUset), index(nIndex), rangeCount(nRangeCount), totalCount(nTotalCount),
                 c(U_SENTINEL), end(U_SENTINEL) {
         if (index < rangeCount) {
             // Fetch the first range.
@@ -1840,7 +1847,7 @@ private:
 
 /**
  * A C++ "range" for iterating over all of the elements of a USet.
- * Convenient all-in one iteration, but creates a UnicodeString for each
+ * Convenient all-in one iteration, but creates a std::u16string for each
  * code point or string.
  *
  * Code points are returned first, then empty and multi-character strings.
@@ -1849,15 +1856,18 @@ private:
  * using U_HEADER_NESTED_NAMESPACE::USetElements;
  * LocalUSetPointer uset(uset_openPattern(u"[abcçカ🚴{}{abc}{de}]", -1, &errorCode));
  * for (auto el : USetElements(uset.getAlias())) {
- *     std::string u8;
- *     printf("uset.string length %ld \"%s\"\n", (long)el.length(), el.toUTF8String(u8).c_str());
+ *     int32_t len32 = el.length();
+ *     char utf8[200];
+ *     u_strToUTF8WithSub(utf8, int32_t{sizeof(utf8) - 1}, nullptr,
+ *                        el.data(), len32, 0xFFFD, nullptr, errorCode);
+ *     printf("uset.element length %ld \"%s\"\n", long{len32}, utf8);
  * }
  * \endcode
  *
  * C++ UnicodeSet has member functions for iteration, including begin() and end().
  *
  * @return an all-elements iterator.
- * @draft ICU 76
+ * @draft ICU 77
  * @see USetCodePoints
  * @see USetRanges
  * @see USetStrings
@@ -1866,21 +1876,21 @@ class USetElements {
 public:
     /**
      * Constructs a C++ "range" object over all of the elements of the USet.
-     * @draft ICU 76
+     * @draft ICU 77
      */
-    USetElements(const USet *uset)
-        : uset(uset), rangeCount(uset_getRangeCount(uset)),
-            stringCount(uset_getStringCount(uset)) {}
+    USetElements(const USet *pUset)
+        : uset(pUset), rangeCount(uset_getRangeCount(pUset)),
+            stringCount(uset_getStringCount(pUset)) {}
 
-    /** @draft ICU 76 */
+    /** @draft ICU 77 */
     USetElements(const USetElements &other) = default;
 
-    /** @draft ICU 76 */
+    /** @draft ICU 77 */
     USetElementIterator begin() const {
         return USetElementIterator(uset, 0, rangeCount, rangeCount + stringCount);
     }
 
-    /** @draft ICU 76 */
+    /** @draft ICU 77 */
     USetElementIterator end() const {
         return USetElementIterator(uset, rangeCount + stringCount, rangeCount, rangeCount + stringCount);
     }
diff --git a/engine/thirdparty/icu4c/common/unicode/utf8.h b/engine/thirdparty/icu4c/common/unicode/utf8.h
index 5a07435f..96ad4616 100644
--- a/engine/thirdparty/icu4c/common/unicode/utf8.h
+++ b/engine/thirdparty/icu4c/common/unicode/utf8.h
@@ -124,7 +124,7 @@
  * @internal
  */
 U_CAPI UChar32 U_EXPORT2
-utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict);
+utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, int8_t strict);
 
 /**
  * Function for handling "append code point" with error-checking.
@@ -148,7 +148,7 @@ utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool
  * @internal
  */
 U_CAPI UChar32 U_EXPORT2
-utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict);
+utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, int8_t strict);
 
 /**
  * Function for handling "skip backward one code point" with error-checking.
diff --git a/engine/thirdparty/icu4c/common/unicode/utypes.h b/engine/thirdparty/icu4c/common/unicode/utypes.h
index 0151ebd4..ecdee516 100644
--- a/engine/thirdparty/icu4c/common/unicode/utypes.h
+++ b/engine/thirdparty/icu4c/common/unicode/utypes.h
@@ -598,12 +598,13 @@ typedef enum UErrorCode {
     U_MF_DUPLICATE_DECLARATION_ERROR, /**< The same variable is declared in more than one .local or .input declaration. @internal ICU 75 technology preview @deprecated This API is for technology preview only. */
     U_MF_OPERAND_MISMATCH_ERROR,     /**< An operand provided to a function does not have the required form for that function @internal ICU 75 technology preview @deprecated This API is for technology preview only. */
     U_MF_DUPLICATE_VARIANT_ERROR, /**< A message includes a variant with the same key list as another variant. @internal ICU 76 technology preview @deprecated This API is for technology preview only. */
+    U_MF_BAD_OPTION,             /**< An option value provided to a function does not have the required form for that option. @internal ICU 77 technology preview @deprecated This API is for technology preview only. */
 #ifndef U_HIDE_DEPRECATED_API
     /**
      * One more than the highest normal formatting API error code.
      * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
      */
-    U_FMT_PARSE_ERROR_LIMIT = 0x10120,
+    U_FMT_PARSE_ERROR_LIMIT = 0x10121,
 #endif  // U_HIDE_DEPRECATED_API
 
     /*
diff --git a/engine/thirdparty/icu4c/common/unicode/uvernum.h b/engine/thirdparty/icu4c/common/unicode/uvernum.h
index a3cb8826..847c49f4 100644
--- a/engine/thirdparty/icu4c/common/unicode/uvernum.h
+++ b/engine/thirdparty/icu4c/common/unicode/uvernum.h
@@ -53,7 +53,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION_MAJOR_NUM 76
+#define U_ICU_VERSION_MAJOR_NUM 77
 
 /** The current ICU minor version as an integer.
  *  This value will change in the subsequent releases of ICU
@@ -79,7 +79,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_SUFFIX _76
+#define U_ICU_VERSION_SUFFIX _77
 
 /**
  * \def U_DEF2_ICU_ENTRY_POINT_RENAME
@@ -132,7 +132,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION "76.1"
+#define U_ICU_VERSION "77.1"
 
 /**
  * The current ICU library major version number as a string, for library name suffixes.
@@ -145,13 +145,13 @@
  *
  * @stable ICU 2.6
  */
-#define U_ICU_VERSION_SHORT "76"
+#define U_ICU_VERSION_SHORT "77"
 
 #ifndef U_HIDE_INTERNAL_API
 /** Data version in ICU4C.
  * @internal ICU 4.4 Internal Use Only
  **/
-#define U_ICU_DATA_VERSION "76.1"
+#define U_ICU_DATA_VERSION "77.1"
 #endif  /* U_HIDE_INTERNAL_API */
 
 /*===========================================================================
diff --git a/engine/thirdparty/icu4c/common/unicode/uversion.h b/engine/thirdparty/icu4c/common/unicode/uversion.h
index 25d73a3a..a29bf21e 100644
--- a/engine/thirdparty/icu4c/common/unicode/uversion.h
+++ b/engine/thirdparty/icu4c/common/unicode/uversion.h
@@ -125,7 +125,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
         U_NAMESPACE_USE
 #   endif
 
-#ifndef U_HIDE_DRAFT_API
+#ifndef U_FORCE_HIDE_DRAFT_API
 /**
  * \def U_HEADER_NESTED_NAMESPACE
  * Nested namespace used inside U_ICU_NAMESPACE for header-only APIs.
@@ -150,22 +150,37 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
  * @draft ICU 76
  */
 
+/**
+ * \def U_ICU_NAMESPACE_OR_INTERNAL
+ * Namespace used for header-only APIs that used to be regular C++ APIs.
+ * Different when used inside ICU to prevent public use of internal instantiations.
+ * Similar to U_HEADER_ONLY_NAMESPACE, but the public definition is the same as U_ICU_NAMESPACE.
+ * "U_ICU_NAMESPACE" or "U_ICU_NAMESPACE::internal".
+ *
+ * @draft ICU 77
+ */
+
 // The first test is the same as for defining U_EXPORT for Windows.
 #if defined(_MSC_VER) || (UPRV_HAS_DECLSPEC_ATTRIBUTE(__dllexport__) && \
                           UPRV_HAS_DECLSPEC_ATTRIBUTE(__dllimport__))
 #   define U_HEADER_NESTED_NAMESPACE header
+#   define U_ICU_NAMESPACE_OR_INTERNAL U_ICU_NAMESPACE
 #elif defined(U_COMBINED_IMPLEMENTATION) || defined(U_COMMON_IMPLEMENTATION) || \
         defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || \
         defined(U_LAYOUTEX_IMPLEMENTATION) || defined(U_TOOLUTIL_IMPLEMENTATION)
 #   define U_HEADER_NESTED_NAMESPACE internal
+#   define U_ICU_NAMESPACE_OR_INTERNAL U_ICU_NAMESPACE::internal
+    namespace U_ICU_NAMESPACE_OR_INTERNAL {}
+    using namespace U_ICU_NAMESPACE_OR_INTERNAL;
 #else
 #   define U_HEADER_NESTED_NAMESPACE header
+#   define U_ICU_NAMESPACE_OR_INTERNAL U_ICU_NAMESPACE
 #endif
 
 #define U_HEADER_ONLY_NAMESPACE U_ICU_NAMESPACE::U_HEADER_NESTED_NAMESPACE
 
 namespace U_HEADER_ONLY_NAMESPACE {}
-#endif  // U_HIDE_DRAFT_API
+#endif  // U_FORCE_HIDE_DRAFT_API
 
 #endif /* __cplusplus */
 
diff --git a/engine/thirdparty/icu4c/common/unistr.cpp b/engine/thirdparty/icu4c/common/unistr.cpp
index a7202457..4e29bad1 100644
--- a/engine/thirdparty/icu4c/common/unistr.cpp
+++ b/engine/thirdparty/icu4c/common/unistr.cpp
@@ -1945,6 +1945,13 @@ UnicodeString::cloneArrayIfNeeded(int32_t newCapacity,
       growCapacity = newCapacity;
     } else if(newCapacity <= US_STACKBUF_SIZE && growCapacity > US_STACKBUF_SIZE) {
       growCapacity = US_STACKBUF_SIZE;
+    } else if(newCapacity > growCapacity) {
+      setToBogus();
+      return false;  // bad inputs
+    }
+    if(growCapacity > kMaxCapacity) {
+      setToBogus();
+      return false;
     }
 
     // save old values
diff --git a/engine/thirdparty/icu4c/common/uresbund.cpp b/engine/thirdparty/icu4c/common/uresbund.cpp
index 3a09cbf3..afda2770 100644
--- a/engine/thirdparty/icu4c/common/uresbund.cpp
+++ b/engine/thirdparty/icu4c/common/uresbund.cpp
@@ -2716,6 +2716,9 @@ ures_openWithType(UResourceBundle *r, const char* path, const char* localeID,
 
     UResourceDataEntry *entry;
     if(openType != URES_OPEN_DIRECT) {
+        if (localeID == nullptr) {
+            localeID = uloc_getDefault();
+        }
         /* first "canonicalize" the locale ID */
         CharString canonLocaleID = ulocimp_getBaseName(localeID, *status);
         if(U_FAILURE(*status)) {
@@ -3080,6 +3083,9 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
             kwVal.clear();
         }
     }
+    if (locid == nullptr) {
+        locid = uloc_getDefault();
+    }
     CharString base = ulocimp_getBaseName(locid, subStatus);
 #if defined(URES_TREE_DEBUG)
     fprintf(stderr, "getFunctionalEquivalent: \"%s\" [%s=%s] in %s - %s\n", 
@@ -3244,7 +3250,7 @@ ures_getFunctionalEquivalent(char *result, int32_t resultCapacity,
             const char *validLoc = ures_getLocaleByType(res, ULOC_VALID_LOCALE, &subStatus);
             if (U_SUCCESS(subStatus) && validLoc != nullptr && validLoc[0] != 0 && uprv_strcmp(validLoc, "root") != 0) {
                 CharString validLang = ulocimp_getLanguage(validLoc, subStatus);
-                CharString parentLang = ulocimp_getLanguage(parent.data(), subStatus);
+                CharString parentLang = ulocimp_getLanguage(parent.toStringPiece(), subStatus);
                 if (U_SUCCESS(subStatus) && validLang != parentLang) {
                     // validLoc is not root and has a different language than parent, use it instead
                     found.clear().append(validLoc, subStatus);
diff --git a/engine/thirdparty/icu4c/common/uscript.cpp b/engine/thirdparty/icu4c/common/uscript.cpp
index c48a28fd..ce40d354 100644
--- a/engine/thirdparty/icu4c/common/uscript.cpp
+++ b/engine/thirdparty/icu4c/common/uscript.cpp
@@ -59,6 +59,9 @@ getCodesFromLocale(const char *locale,
     if (U_FAILURE(*err)) { return 0; }
     icu::CharString lang;
     icu::CharString script;
+    if (locale == nullptr) {
+        locale = uloc_getDefault();
+    }
     ulocimp_getSubtags(locale, &lang, &script, nullptr, nullptr, nullptr, *err);
     if (U_FAILURE(*err)) { return 0; }
     // Multi-script languages, equivalent to the LocaleScript data
diff --git a/engine/thirdparty/icu4c/common/ushape.cpp b/engine/thirdparty/icu4c/common/ushape.cpp
index 00125635..b7946dc3 100644
--- a/engine/thirdparty/icu4c/common/ushape.cpp
+++ b/engine/thirdparty/icu4c/common/ushape.cpp
@@ -28,6 +28,7 @@
 #include "ubidi_props.h"
 #include "uassert.h"
 
+#include <limits>
 /*
  * This implementation is designed for 16-bit Unicode strings.
  * The main assumption is that the Arabic characters and their
@@ -747,6 +748,10 @@ handleGeneratedSpaces(char16_t *dest, int32_t sourceLength,
         }
     }
 
+    if (static_cast<size_t>(sourceLength) + 1 > std::numeric_limits<size_t>::max() / U_SIZEOF_UCHAR) {
+        *pErrorCode = U_INDEX_OUTOFBOUNDS_ERROR;
+        return 0;
+    }
     tempbuffer = static_cast<char16_t*>(uprv_malloc((sourceLength + 1) * U_SIZEOF_UCHAR));
     /* Test for nullptr */
     if(tempbuffer == nullptr) {
diff --git a/engine/thirdparty/icu4c/common/usprep.cpp b/engine/thirdparty/icu4c/common/usprep.cpp
index 477b8f23..048b4236 100644
--- a/engine/thirdparty/icu4c/common/usprep.cpp
+++ b/engine/thirdparty/icu4c/common/usprep.cpp
@@ -126,7 +126,7 @@ compareEntries(const UHashTok p1, const UHashTok p2) {
     name2.pointer = b2->name;
     path1.pointer = b1->path;
     path2.pointer = b2->path;
-    return uhash_compareChars(name1, name2) & uhash_compareChars(path1, path2);
+    return uhash_compareChars(name1, name2) && uhash_compareChars(path1, path2);
 }
 
 static void 
diff --git a/engine/thirdparty/icu4c/common/utf_impl.cpp b/engine/thirdparty/icu4c/common/utf_impl.cpp
index 827a82da..7da10c9b 100644
--- a/engine/thirdparty/icu4c/common/utf_impl.cpp
+++ b/engine/thirdparty/icu4c/common/utf_impl.cpp
@@ -124,11 +124,9 @@ errorValue(int32_t count, int8_t strict) {
  * >0  Obsolete "strict" behavior of UTF8_NEXT_CHAR_SAFE(..., true):
  *     Same as the obsolete "safe" behavior, but non-characters are also treated
  *     like illegal sequences.
- *
- * Note that a UBool is the same as an int8_t.
  */
 U_CAPI UChar32 U_EXPORT2
-utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, UBool strict) {
+utf8_nextCharSafeBody(const uint8_t *s, int32_t *pi, int32_t length, UChar32 c, int8_t strict) {
     // *pi is one after byte c.
     int32_t i=*pi;
     // length can be negative for NUL-terminated strings: Read and validate one byte at a time.
@@ -233,7 +231,7 @@ utf8_appendCharSafeBody(uint8_t *s, int32_t i, int32_t length, UChar32 c, UBool
 }
 
 U_CAPI UChar32 U_EXPORT2
-utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, UBool strict) {
+utf8_prevCharSafeBody(const uint8_t *s, int32_t start, int32_t *pi, UChar32 c, int8_t strict) {
     // *pi is the index of byte c.
     int32_t i=*pi;
     if(U8_IS_TRAIL(c) && i>start) {
diff --git a/engine/thirdparty/icu4c/common/utypes.cpp b/engine/thirdparty/icu4c/common/utypes.cpp
index 46023141..4d4c1f81 100644
--- a/engine/thirdparty/icu4c/common/utypes.cpp
+++ b/engine/thirdparty/icu4c/common/utypes.cpp
@@ -140,7 +140,8 @@ _uFmtErrorName[U_FMT_PARSE_ERROR_LIMIT - U_FMT_PARSE_ERROR_START] = {
     "U_MF_MISSING_SELECTOR_ANNOTATION_ERROR",
     "U_MF_DUPLICATE_DECLARATION_ERROR",
     "U_MF_OPERAND_MISMATCH_ERROR",
-    "U_MF_DUPLICATE_VARIANT_ERROR"
+    "U_MF_DUPLICATE_VARIANT_ERROR",
+    "U_MF_BAD_OPTION"
 };
 
 static const char * const
diff --git a/engine/thirdparty/icu4c/i18n/scriptset.cpp b/engine/thirdparty/icu4c/i18n/scriptset.cpp
index eec1eeb3..576917e8 100644
--- a/engine/thirdparty/icu4c/i18n/scriptset.cpp
+++ b/engine/thirdparty/icu4c/i18n/scriptset.cpp
@@ -285,19 +285,19 @@ uhash_equalsScriptSet(const UElement key1, const UElement key2) {
     return (*s1 == *s2);
 }
 
-U_CAPI int8_t U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 uhash_compareScriptSet(UElement key0, UElement key1) {
     icu::ScriptSet *s0 = static_cast<icu::ScriptSet *>(key0.pointer);
     icu::ScriptSet *s1 = static_cast<icu::ScriptSet *>(key1.pointer);
     int32_t diff = s0->countMembers() - s1->countMembers();
-    if (diff != 0) return static_cast<UBool>(diff);
+    if (diff != 0) return diff;
     int32_t i0 = s0->nextSetBit(0);
     int32_t i1 = s1->nextSetBit(0);
     while ((diff = i0-i1) == 0 && i0 > 0) {
         i0 = s0->nextSetBit(i0+1);
         i1 = s1->nextSetBit(i1+1);
     }
-    return (int8_t)diff;
+    return diff;
 }
 
 U_CAPI int32_t U_EXPORT2
diff --git a/engine/thirdparty/icu4c/i18n/scriptset.h b/engine/thirdparty/icu4c/i18n/scriptset.h
index df5cfdc7..d21d0db8 100644
--- a/engine/thirdparty/icu4c/i18n/scriptset.h
+++ b/engine/thirdparty/icu4c/i18n/scriptset.h
@@ -74,7 +74,7 @@ class U_I18N_API ScriptSet: public UMemory {
 
 U_NAMESPACE_END
 
-U_CAPI UBool U_EXPORT2
+U_CAPI int32_t U_EXPORT2
 uhash_compareScriptSet(const UElement key1, const UElement key2);
 
 U_CAPI int32_t U_EXPORT2
diff --git a/engine/thirdparty/icu4c/i18n/ucln_in.h b/engine/thirdparty/icu4c/i18n/ucln_in.h
index 765cdd55..74868891 100644
--- a/engine/thirdparty/icu4c/i18n/ucln_in.h
+++ b/engine/thirdparty/icu4c/i18n/ucln_in.h
@@ -39,6 +39,7 @@ typedef enum ECleanupI18NType {
     UCLN_I18N_HEBREW_CALENDAR,
     UCLN_I18N_ASTRO_CALENDAR,
     UCLN_I18N_DANGI_CALENDAR,
+    UCLN_I18N_PERSIAN_CALENDAR,
     UCLN_I18N_CALENDAR,
     UCLN_I18N_TIMEZONEFORMAT,
     UCLN_I18N_TZDBTIMEZONENAMES,
@@ -62,6 +63,7 @@ typedef enum ECleanupI18NType {
     UCLN_I18N_REGION,
     UCLN_I18N_LIST_FORMATTER,
     UCLN_I18N_NUMSYS,
+    UCLN_I18N_MF2_UNISETS,
     UCLN_I18N_COUNT /* This must be last */
 } ECleanupI18NType;
 
diff --git a/engine/thirdparty/icu4c/icudt_godot.dat b/engine/thirdparty/icu4c/icudt_godot.dat
index 58bead42..c6b96c47 100644
Binary files a/engine/thirdparty/icu4c/icudt_godot.dat and b/engine/thirdparty/icu4c/icudt_godot.dat differ
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Array.h b/engine/thirdparty/jolt_physics/Jolt/Core/Array.h
index a273f4eb..b8dbce59 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Array.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Array.h
@@ -47,6 +47,83 @@ public:
 	using const_iterator = const T *;
 	using iterator = T *;
 
+	/// An iterator that traverses the array in reverse order
+	class rev_it
+	{
+	public:
+		/// Constructor
+							rev_it() = default;
+		explicit			rev_it(T *inValue)				: mValue(inValue) { }
+
+		/// Copying
+							rev_it(const rev_it &) = default;
+		rev_it &			operator = (const rev_it &) = default;
+
+		/// Comparison
+		bool				operator == (const rev_it &inRHS) const { return mValue == inRHS.mValue; }
+		bool				operator != (const rev_it &inRHS) const { return mValue != inRHS.mValue; }
+
+		/// Arithmetics
+		rev_it &			operator ++ ()					{ --mValue; return *this; }
+		rev_it				operator ++ (int)				{ return rev_it(mValue--); }
+		rev_it &			operator -- ()					{ ++mValue; return *this; }
+		rev_it				operator -- (int)				{ return rev_it(mValue++); }
+
+		rev_it				operator + (int inValue)		{ return rev_it(mValue - inValue); }
+		rev_it				operator - (int inValue)		{ return rev_it(mValue + inValue); }
+
+		rev_it &			operator += (int inValue)		{ mValue -= inValue; return *this; }
+		rev_it &			operator -= (int inValue)		{ mValue += inValue; return *this; }
+
+		/// Access
+		T &					operator * () const				{ return *mValue; }
+		T &					operator -> () const			{ return *mValue; }
+
+	private:
+		T *					mValue;
+	};
+
+	/// A const iterator that traverses the array in reverse order
+	class crev_it
+	{
+	public:
+		/// Constructor
+							crev_it() = default;
+		explicit			crev_it(const T *inValue)		: mValue(inValue) { }
+
+		/// Copying
+							crev_it(const crev_it &) = default;
+		explicit			crev_it(const rev_it &inValue)	: mValue(inValue.mValue) { }
+		crev_it &			operator = (const crev_it &) = default;
+		crev_it &			operator = (const rev_it &inRHS) { mValue = inRHS.mValue; return *this; }
+
+		/// Comparison
+		bool				operator == (const crev_it &inRHS) const { return mValue == inRHS.mValue; }
+		bool				operator != (const crev_it &inRHS) const { return mValue != inRHS.mValue; }
+
+		/// Arithmetics
+		crev_it &			operator ++ ()					{ --mValue; return *this; }
+		crev_it				operator ++ (int)				{ return crev_it(mValue--); }
+		crev_it &			operator -- ()					{ ++mValue; return *this; }
+		crev_it				operator -- (int)				{ return crev_it(mValue++); }
+
+		crev_it				operator + (int inValue)		{ return crev_it(mValue - inValue); }
+		crev_it				operator - (int inValue)		{ return crev_it(mValue + inValue); }
+
+		crev_it &			operator += (int inValue)		{ mValue -= inValue; return *this; }
+		crev_it &			operator -= (int inValue)		{ mValue += inValue; return *this; }
+
+		/// Access
+		const T &			operator * () const				{ return *mValue; }
+		const T &			operator -> () const			{ return *mValue; }
+
+	private:
+		const T *			mValue;
+	};
+
+	using reverse_iterator = rev_it;
+	using const_reverse_iterator = crev_it;
+
 private:
 	/// Move elements from one location to another
 	inline void				move(pointer inDestination, pointer inSource, size_type inCount)
@@ -388,7 +465,7 @@ public:
 	}
 
 	/// Remove one element from the array
-	void					erase(const_iterator inIter)
+	iterator				erase(const_iterator inIter)
 	{
 		size_type p = size_type(inIter - begin());
 		JPH_ASSERT(p < mSize);
@@ -396,10 +473,11 @@ public:
 		if (p + 1 < mSize)
 			move(mElements + p, mElements + p + 1, mSize - p - 1);
 		--mSize;
+		return const_cast<iterator>(inIter);
 	}
 
 	/// Remove multiple element from the array
-	void					erase(const_iterator inBegin, const_iterator inEnd)
+	iterator				erase(const_iterator inBegin, const_iterator inEnd)
 	{
 		size_type p = size_type(inBegin - begin());
 		size_type n = size_type(inEnd - inBegin);
@@ -408,6 +486,7 @@ public:
 		if (p + n < mSize)
 			move(mElements + p, mElements + p + n, mSize - p - n);
 		mSize -= n;
+		return const_cast<iterator>(inBegin);
 	}
 
 	/// Iterators
@@ -421,14 +500,34 @@ public:
 		return mElements + mSize;
 	}
 
+	inline crev_it			rbegin() const
+	{
+		return crev_it(mElements + mSize - 1);
+	}
+
+	inline crev_it			rend() const
+	{
+		return crev_it(mElements - 1);
+	}
+
 	inline const_iterator	cbegin() const
 	{
-		return mElements;
+		return begin();
 	}
 
 	inline const_iterator	cend() const
 	{
-		return mElements + mSize;
+		return end();
+	}
+
+	inline crev_it			crbegin() const
+	{
+		return rbegin();
+	}
+
+	inline crev_it			crend() const
+	{
+		return rend();
 	}
 
 	inline iterator			begin()
@@ -441,6 +540,16 @@ public:
 		return mElements + mSize;
 	}
 
+	inline rev_it			rbegin()
+	{
+		return rev_it(mElements + mSize - 1);
+	}
+
+	inline rev_it			rend()
+	{
+		return rev_it(mElements - 1);
+	}
+
 	inline const T *		data() const
 	{
 		return mElements;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Color.h b/engine/thirdparty/jolt_physics/Jolt/Core/Color.h
index d07390de..7706ca85 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Color.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Color.h
@@ -12,7 +12,7 @@ class Color;
 using ColorArg = Color;
 
 /// Class that holds an RGBA color with 8-bits per component
-class [[nodiscard]] JPH_EXPORT_GCC_BUG_WORKAROUND Color
+class JPH_EXPORT_GCC_BUG_WORKAROUND [[nodiscard]] Color
 {
 public:
 	/// Constructors
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Core.h b/engine/thirdparty/jolt_physics/Jolt/Core/Core.h
index 01b6afbf..dfd2a04d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Core.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Core.h
@@ -6,8 +6,8 @@
 
 // Jolt library version
 #define JPH_VERSION_MAJOR 5
-#define JPH_VERSION_MINOR 2
-#define JPH_VERSION_PATCH 1
+#define JPH_VERSION_MINOR 3
+#define JPH_VERSION_PATCH 0
 
 // Determine which features the library was compiled with
 #ifdef JPH_DOUBLE_PRECISION
@@ -83,8 +83,8 @@
 	#define JPH_PLATFORM_ANDROID
 #elif defined(__linux__)
 	#define JPH_PLATFORM_LINUX
-#elif defined(__FreeBSD__)
-	#define JPH_PLATFORM_FREEBSD
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+	#define JPH_PLATFORM_BSD
 #elif defined(__APPLE__)
 	#include <TargetConditionals.h>
 	#if defined(TARGET_OS_IPHONE) && !TARGET_OS_IPHONE
@@ -195,7 +195,11 @@
 #elif defined(JPH_PLATFORM_WASM)
 	// WebAssembly CPU architecture
 	#define JPH_CPU_WASM
-	#define JPH_CPU_ADDRESS_BITS 32
+	#if defined(__wasm64__)
+		#define JPH_CPU_ADDRESS_BITS 64
+	#else
+		#define JPH_CPU_ADDRESS_BITS 32
+	#endif
 	#define JPH_VECTOR_ALIGNMENT 16
 	#define JPH_DVECTOR_ALIGNMENT 32
 	#ifdef __wasm_simd128__
@@ -360,6 +364,7 @@
 	JPH_MSVC_SUPPRESS_WARNING(4514) /* 'X' : unreferenced inline function has been removed */	\
 	JPH_MSVC_SUPPRESS_WARNING(4710) /* 'X' : function not inlined */							\
 	JPH_MSVC_SUPPRESS_WARNING(4711) /* function 'X' selected for automatic inline expansion */	\
+	JPH_MSVC_SUPPRESS_WARNING(4714) /* function 'X' marked as __forceinline not inlined */		\
 	JPH_MSVC_SUPPRESS_WARNING(4820) /* 'X': 'Y' bytes padding added after data member 'Z' */	\
 	JPH_MSVC_SUPPRESS_WARNING(4100) /* 'X' : unreferenced formal parameter */					\
 	JPH_MSVC_SUPPRESS_WARNING(4626) /* 'X' : assignment operator was implicitly defined as deleted because a base class assignment operator is inaccessible or deleted */ \
@@ -388,9 +393,9 @@
 	// Configuration for a popular game console.
 	// This file is not distributed because it would violate an NDA.
 	// Creating one should only be a couple of minutes of work if you have the documentation for the platform
-	// (you only need to define JPH_BREAKPOINT, JPH_PLATFORM_BLUE_GET_TICKS, JPH_PLATFORM_BLUE_MUTEX*, JPH_PLATFORM_BLUE_RWLOCK* and include the right header).
+	// (you only need to define JPH_BREAKPOINT, JPH_PLATFORM_BLUE_GET_TICKS, JPH_PLATFORM_BLUE_MUTEX*, JPH_PLATFORM_BLUE_RWLOCK*, JPH_PLATFORM_BLUE_SEMAPHORE* and include the right header).
 	#include <Jolt/Core/PlatformBlue.h>
-#elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS) || defined(JPH_PLATFORM_FREEBSD)
+#elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS) || defined(JPH_PLATFORM_BSD)
 	#if defined(JPH_CPU_X86)
 		#define JPH_BREAKPOINT	__asm volatile ("int $0x3")
 	#elif defined(JPH_CPU_ARM) || defined(JPH_CPU_RISCV) || defined(JPH_CPU_E2K) || defined(JPH_CPU_PPC) || defined(JPH_CPU_LOONGARCH)
@@ -426,7 +431,8 @@
 	JPH_MSVC_SUPPRESS_WARNING(4514)																\
 	JPH_MSVC_SUPPRESS_WARNING(5262)																\
 	JPH_MSVC_SUPPRESS_WARNING(5264)																\
-	JPH_MSVC_SUPPRESS_WARNING(4738)
+	JPH_MSVC_SUPPRESS_WARNING(4738)																\
+	JPH_MSVC_SUPPRESS_WARNING(5045)
 
 #define JPH_SUPPRESS_WARNINGS_STD_END															\
 	JPH_SUPPRESS_WARNING_POP
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/FPException.h b/engine/thirdparty/jolt_physics/Jolt/Core/FPException.h
index ef757802..9e22f542 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/FPException.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/FPException.h
@@ -16,11 +16,12 @@ JPH_NAMESPACE_BEGIN
 class FPExceptionsEnable { };
 class FPExceptionDisableInvalid { };
 class FPExceptionDisableDivByZero { };
+class FPExceptionDisableOverflow { };
 
 #elif defined(JPH_USE_SSE)
 
-/// Enable floating point divide by zero exception and exceptions on invalid numbers
-class FPExceptionsEnable : public FPControlWord<0, _MM_MASK_DIV_ZERO | _MM_MASK_INVALID> { };
+/// Enable floating point divide by zero exception, overflow exceptions and exceptions on invalid numbers
+class FPExceptionsEnable : public FPControlWord<0, _MM_MASK_DIV_ZERO | _MM_MASK_INVALID | _MM_MASK_OVERFLOW> { };
 
 /// Disable invalid floating point value exceptions
 class FPExceptionDisableInvalid : public FPControlWord<_MM_MASK_INVALID, _MM_MASK_INVALID> { };
@@ -28,10 +29,13 @@ class FPExceptionDisableInvalid : public FPControlWord<_MM_MASK_INVALID, _MM_MAS
 /// Disable division by zero floating point exceptions
 class FPExceptionDisableDivByZero : public FPControlWord<_MM_MASK_DIV_ZERO, _MM_MASK_DIV_ZERO> { };
 
+/// Disable floating point overflow exceptions
+class FPExceptionDisableOverflow : public FPControlWord<_MM_MASK_OVERFLOW, _MM_MASK_OVERFLOW> { };
+
 #elif defined(JPH_CPU_ARM) && defined(JPH_COMPILER_MSVC)
 
-/// Enable floating point divide by zero exception and exceptions on invalid numbers
-class FPExceptionsEnable : public FPControlWord<0, _EM_INVALID | _EM_ZERODIVIDE> { };
+/// Enable floating point divide by zero exception, overflow exceptions and exceptions on invalid numbers
+class FPExceptionsEnable : public FPControlWord<0, _EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW> { };
 
 /// Disable invalid floating point value exceptions
 class FPExceptionDisableInvalid : public FPControlWord<_EM_INVALID, _EM_INVALID> { };
@@ -39,6 +43,9 @@ class FPExceptionDisableInvalid : public FPControlWord<_EM_INVALID, _EM_INVALID>
 /// Disable division by zero floating point exceptions
 class FPExceptionDisableDivByZero : public FPControlWord<_EM_ZERODIVIDE, _EM_ZERODIVIDE> { };
 
+/// Disable floating point overflow exceptions
+class FPExceptionDisableOverflow : public FPControlWord<_EM_OVERFLOW, _EM_OVERFLOW> { };
+
 #elif defined(JPH_CPU_ARM)
 
 /// Invalid operation exception bit
@@ -47,8 +54,11 @@ static constexpr uint64 FP_IOE = 1 << 8;
 /// Enable divide by zero exception bit
 static constexpr uint64 FP_DZE = 1 << 9;
 
-/// Enable floating point divide by zero exception and exceptions on invalid numbers
-class FPExceptionsEnable : public FPControlWord<FP_IOE | FP_DZE, FP_IOE | FP_DZE> { };
+/// Enable floating point overflow bit
+static constexpr uint64 FP_OFE = 1 << 10;
+
+/// Enable floating point divide by zero exception, overflow exceptions and exceptions on invalid numbers
+class FPExceptionsEnable : public FPControlWord<FP_IOE | FP_DZE | FP_OFE, FP_IOE | FP_DZE | FP_OFE> { };
 
 /// Disable invalid floating point value exceptions
 class FPExceptionDisableInvalid : public FPControlWord<0, FP_IOE> { };
@@ -56,6 +66,9 @@ class FPExceptionDisableInvalid : public FPControlWord<0, FP_IOE> { };
 /// Disable division by zero floating point exceptions
 class FPExceptionDisableDivByZero : public FPControlWord<0, FP_DZE> { };
 
+/// Disable floating point overflow exceptions
+class FPExceptionDisableOverflow : public FPControlWord<0, FP_OFE> { };
+
 #elif defined(JPH_CPU_RISCV)
 
 #error "RISC-V only implements manually checking if exceptions occurred by reading the fcsr register. It doesn't generate exceptions. JPH_FLOATING_POINT_EXCEPTIONS_ENABLED must be disabled."
@@ -76,6 +89,7 @@ class FPExceptionDisableDivByZero : public FPControlWord<0, FP_DZE> { };
 class FPExceptionsEnable { };
 class FPExceptionDisableInvalid { };
 class FPExceptionDisableDivByZero { };
+class FPExceptionDisableOverflow { };
 
 #endif
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h b/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h
index 9b69f9d0..d2d766fe 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/HashTable.h
@@ -26,10 +26,10 @@ private:
 	class IteratorBase
 	{
 	public:
-        /// Properties
+		/// Properties
 		using difference_type = typename Table::difference_type;
-        using value_type = typename Table::value_type;
-        using iterator_category = std::forward_iterator_tag;
+		using value_type = typename Table::value_type;
+		using iterator_category = std::forward_iterator_tag;
 
 		/// Copy constructor
 							IteratorBase(const IteratorBase &inRHS) = default;
@@ -179,17 +179,9 @@ private:
 		mSize = inRHS.mSize;
 	}
 
-	/// Grow the table to the next power of 2
-	void					GrowTable()
+	/// Grow the table to a new size
+	void					GrowTable(size_type inNewMaxSize)
 	{
-		// Calculate new size
-		size_type new_max_size = max<size_type>(mMaxSize << 1, 16);
-		if (new_max_size < mMaxSize)
-		{
-			JPH_ASSERT(false, "Overflow in hash table size, can't grow!");
-			return;
-		}
-
 		// Move the old table to a temporary structure
 		size_type old_max_size = mMaxSize;
 		KeyValue *old_data = mData;
@@ -201,7 +193,7 @@ private:
 		mLoadLeft = 0;
 
 		// Allocate new table
-		AllocateTable(new_max_size);
+		AllocateTable(inNewMaxSize);
 
 		// Reset all control bytes
 		memset(mControl, cBucketEmpty, mMaxSize + 15);
@@ -252,7 +244,16 @@ protected:
 			if (num_deleted * cMaxDeletedElementsDenominator > mMaxSize * cMaxDeletedElementsNumerator)
 				rehash(0);
 			else
-				GrowTable();
+			{
+				// Grow by a power of 2
+				size_type new_max_size = max<size_type>(mMaxSize << 1, 16);
+				if (new_max_size < mMaxSize)
+				{
+					JPH_ASSERT(false, "Overflow in hash table size, can't grow!");
+					return false;
+				}
+				GrowTable(new_max_size);
+			}
 		}
 
 		// Split hash into index and control value
@@ -363,9 +364,9 @@ public:
 		using Base = IteratorBase<HashTable, iterator>;
 
 	public:
-        /// Properties
-        using reference = typename Base::value_type &;
-        using pointer = typename Base::value_type *;
+		/// Properties
+		using reference = typename Base::value_type &;
+		using pointer = typename Base::value_type *;
 
 		/// Constructors
 		explicit			iterator(HashTable *inTable) : Base(inTable) { }
@@ -400,9 +401,9 @@ public:
 		using Base = IteratorBase<const HashTable, const_iterator>;
 
 	public:
-        /// Properties
-        using reference = const typename Base::value_type &;
-        using pointer = const typename Base::value_type *;
+		/// Properties
+		using reference = const typename Base::value_type &;
+		using pointer = const typename Base::value_type *;
 
 		/// Constructors
 		explicit			const_iterator(const HashTable *inTable) : Base(inTable) { }
@@ -489,11 +490,7 @@ public:
 		if (max_size <= mMaxSize)
 			return;
 
-		// Allocate buffers
-		AllocateTable(max_size);
-
-		// Reset all control bytes
-		memset(mControl, cBucketEmpty, mMaxSize + 15);
+		GrowTable(max_size);
 	}
 
 	/// Destroy the entire hash table
@@ -523,6 +520,27 @@ public:
 		}
 	}
 
+	/// Destroy the entire hash table but keeps the memory allocated
+	void					ClearAndKeepMemory()
+	{
+		// Destruct elements
+		if constexpr (!std::is_trivially_destructible<KeyValue>())
+			if (!empty())
+				for (size_type i = 0; i < mMaxSize; ++i)
+					if (mControl[i] & cBucketUsed)
+						mData[i].~KeyValue();
+		mSize = 0;
+
+		// If there are elements that are not marked cBucketEmpty, we reset them
+		size_type max_load = sGetMaxLoad(mMaxSize);
+		if (mLoadLeft != max_load)
+		{
+			// Reset all control bytes
+			memset(mControl, cBucketEmpty, mMaxSize + 15);
+			mLoadLeft = max_load;
+		}
+	}
+
 	/// Iterator to first element
 	iterator				begin()
 	{
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.cpp b/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.cpp
index 39152b10..6536607d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Profiler.cpp
@@ -222,8 +222,331 @@ void Profiler::DumpChart(const char *inTag, const Threads &inThreads, const KeyT
 <html>
 	<head>
 		<title>Profile Chart</title>
-		<link rel="stylesheet" href="WebIncludes/profile_chart.css">
-		<script type="text/javascript" src="WebIncludes/profile_chart.js"></script>
+		<style>
+			html, body {
+				padding: 0px;
+				border: 0px;
+				margin: 0px;
+				width: 100%;
+				height: 100%;
+				overflow: hidden;
+			}
+
+			canvas {
+				position: absolute;
+				top: 10px;
+				left: 10px;
+				padding: 0px;
+				border: 0px;
+				margin: 0px;
+			}
+
+			#tooltip {
+				font: Courier New;
+				position: absolute;
+				background-color: white;
+				border: 1px;
+				border-style: solid;
+				border-color: black;
+				pointer-events: none;
+				padding: 5px;
+				font: 14px Arial;
+				visibility: hidden;
+				height: auto;
+			}
+
+			.stat {
+				color: blue;
+				text-align: right;
+			}
+		</style>
+		<script type="text/javascript">
+			var canvas;
+			var ctx;
+			var tooltip;
+			var min_scale;
+			var scale;
+			var offset_x = 0;
+			var offset_y = 0;
+			var size_y;
+			var dragging = false;
+			var previous_x = 0;
+			var previous_y = 0;
+			var bar_height = 15;
+			var line_height = bar_height + 2;
+			var thread_separation = 6;
+			var thread_font_size = 12;
+			var thread_font = thread_font_size + "px Arial";
+			var bar_font_size = 10;
+			var bar_font = bar_font_size + "px Arial";
+			var end_cycle = 0;
+
+			function drawChart()
+			{
+				ctx.clearRect(0, 0, canvas.width, canvas.height);
+
+				ctx.lineWidth = 1;
+
+				var y = offset_y;
+
+				for (var t = 0; t < threads.length; t++)
+				{
+					// Check if thread has samples
+					var thread = threads[t];
+					if (thread.start.length == 0)
+						continue;
+
+					// Draw thread name
+					y += thread_font_size;
+					ctx.font = thread_font;
+					ctx.fillStyle = "#000000";
+					ctx.fillText(thread.thread_name, 0, y);
+					y += thread_separation;
+
+					// Draw outlines for each bar of samples
+					ctx.fillStyle = "#c0c0c0";
+					for (var d = 0; d <= thread.max_depth; d++)
+						ctx.fillRect(0, y + d * line_height, canvas.width, bar_height);
+
+					// Draw samples
+					ctx.font = bar_font;
+					for (var s = 0; s < thread.start.length; s++)
+					{
+						// Cull bar
+						var rx = scale * (offset_x + thread.start[s]);
+						if (rx > canvas.width) // right of canvas
+							break;
+						var rw = scale * thread.cycles[s];
+						if (rw < 0.5) // less than half pixel, skip
+							continue;
+						if (rx + rw < 0) // left of canvas
+							continue;
+
+						// Draw bar
+						var ry = y + line_height * thread.depth[s];
+						ctx.fillStyle = thread.color[s];
+						ctx.fillRect(rx, ry, rw, bar_height);
+						ctx.strokeStyle = thread.darkened_color[s];
+						ctx.strokeRect(rx, ry, rw, bar_height);
+
+						// Get index in aggregated list
+						var a = thread.aggregator[s];
+
+						// Draw text
+						if (rw > aggregated.name_width[a])
+						{
+							ctx.fillStyle = "#000000";
+							ctx.fillText(aggregated.name[a], rx + (rw - aggregated.name_width[a]) / 2, ry + bar_height - 4);
+						}
+					}
+
+					// Next line
+					y += line_height * (1 + thread.max_depth) + thread_separation;
+				}
+
+				// Update size
+				size_y = y - offset_y;
+			}
+
+			function drawTooltip(mouse_x, mouse_y)
+			{
+				var y = offset_y;
+
+				for (var t = 0; t < threads.length; t++)
+				{
+					// Check if thread has samples
+					var thread = threads[t];
+					if (thread.start.length == 0)
+						continue;
+
+					// Thead name
+					y += thread_font_size + thread_separation;
+
+					// Draw samples
+					for (var s = 0; s < thread.start.length; s++)
+					{
+						// Cull bar
+						var rx = scale * (offset_x + thread.start[s]);
+						if (rx > mouse_x)
+							break;
+						var rw = scale * thread.cycles[s];
+						if (rx + rw < mouse_x)
+							continue;
+
+						var ry = y + line_height * thread.depth[s];
+						if (mouse_y >= ry && mouse_y < ry + bar_height)
+						{
+							// Get index into aggregated list
+							var a = thread.aggregator[s];
+
+							// Found bar, fill in tooltip
+							tooltip.style.left = (canvas.offsetLeft + mouse_x) + "px";
+							tooltip.style.top = (canvas.offsetTop + mouse_y) + "px";
+							tooltip.style.visibility = "visible";
+							tooltip.innerHTML = aggregated.name[a] + "<br>"
+								+ "<table>"
+								+ "<tr><td>Time:</td><td class=\"stat\">" + (1000000 * thread.cycles[s] / cycles_per_second).toFixed(2) + " &micro;s</td></tr>"
+								+ "<tr><td>Start:</td><td class=\"stat\">" + (1000000 * thread.start[s] / cycles_per_second).toFixed(2) + " &micro;s</td></tr>"
+								+ "<tr><td>End:</td><td class=\"stat\">" + (1000000 * (thread.start[s] + thread.cycles[s]) / cycles_per_second).toFixed(2) + " &micro;s</td></tr>"
+								+ "<tr><td>Avg. Time:</td><td class=\"stat\">" + (1000000 * aggregated.cycles_per_frame[a] / cycles_per_second / aggregated.calls[a]).toFixed(2) + " &micro;s</td></tr>"
+								+ "<tr><td>Min Time:</td><td class=\"stat\">" + (1000000 * aggregated.min_cycles[a] / cycles_per_second).toFixed(2) + " &micro;s</td></tr>"
+								+ "<tr><td>Max Time:</td><td class=\"stat\">" + (1000000 * aggregated.max_cycles[a] / cycles_per_second).toFixed(2) + " &micro;s</td></tr>"
+								+ "<tr><td>Time / Frame:</td><td class=\"stat\">" + (1000000 * aggregated.cycles_per_frame[a] / cycles_per_second).toFixed(2) + " &micro;s</td></tr>"
+								+ "<tr><td>Calls:</td><td class=\"stat\">" + aggregated.calls[a] + "</td></tr>"
+								+ "</table>";
+							return;
+						}
+					}
+
+					// Next line
+					y += line_height * (1 + thread.max_depth) + thread_separation;
+				}
+
+				// No bar found, hide tooltip
+				tooltip.style.visibility = "hidden";
+			}
+
+			function onMouseDown(evt)
+			{
+				dragging = true;
+				previous_x = evt.clientX, previous_y = evt.clientY;
+				tooltip.style.visibility = "hidden";
+			}
+
+			function onMouseUp(evt)
+			{
+				dragging = false;
+			}
+
+			function clampMotion()
+			{
+				// Clamp horizontally
+				var min_offset_x = canvas.width / scale - end_cycle;
+				if (offset_x < min_offset_x)
+					offset_x = min_offset_x;
+				if (offset_x > 0)
+					offset_x = 0;
+
+				// Clamp vertically
+				var min_offset_y = canvas.height - size_y;
+				if (offset_y < min_offset_y)
+					offset_y = min_offset_y;
+				if (offset_y > 0)
+					offset_y = 0;
+
+				// Clamp scale
+				if (scale < min_scale)
+					scale = min_scale;
+				var max_scale = 1000 * min_scale;
+				if (scale > max_scale)
+					scale = max_scale;
+			}
+
+			function onMouseMove(evt)
+			{
+				if (dragging)
+				{
+					// Calculate new offset
+					offset_x += (evt.clientX - previous_x) / scale;
+					offset_y += evt.clientY - previous_y;
+
+					clampMotion();
+
+					drawChart();
+				}
+				else
+					drawTooltip(evt.clientX - canvas.offsetLeft, evt.clientY - canvas.offsetTop);
+
+				previous_x = evt.clientX, previous_y = evt.clientY;
+			}
+
+			function onScroll(evt)
+			{
+				tooltip.style.visibility = "hidden";
+
+				var old_scale = scale;
+				if (evt.deltaY > 0)
+					scale /= 1.1;
+				else
+					scale *= 1.1;
+
+				clampMotion();
+
+				// Ensure that event under mouse stays under mouse
+				var x = previous_x - canvas.offsetLeft;
+				offset_x += x / scale - x / old_scale;
+
+				clampMotion();
+
+				drawChart();
+			}
+
+			function darkenColor(color)
+			{
+				var i = parseInt(color.slice(1), 16);
+
+				var r = i >> 16;
+				var g = (i >> 8) & 0xff;
+				var b = i & 0xff;
+
+				r = Math.round(0.8 * r);
+				g = Math.round(0.8 * g);
+				b = Math.round(0.8 * b);
+
+				i = (r << 16) + (g << 8) + b;
+
+				return "#" + i.toString(16);
+			}
+
+			function startChart()
+			{
+				// Fetch elements
+				canvas = document.getElementById('canvas');
+				ctx = canvas.getContext("2d");
+				tooltip = document.getElementById('tooltip');
+
+				// Resize canvas to fill screen
+				canvas.width = document.body.offsetWidth - 20;
+				canvas.height = document.body.offsetHeight - 20;
+
+				// Register mouse handlers
+				canvas.onmousedown = onMouseDown;
+				canvas.onmouseup = onMouseUp;
+				canvas.onmouseout = onMouseUp;
+				canvas.onmousemove = onMouseMove;
+				canvas.onwheel	= onScroll;
+
+				for (var t = 0; t < threads.length; t++)
+				{
+					var thread = threads[t];
+
+					// Calculate darkened colors
+					thread.darkened_color = new Array(thread.color.length);
+					for (var s = 0; s < thread.color.length; s++)
+						thread.darkened_color[s] = darkenColor(thread.color[s]);
+
+					// Calculate max depth and end cycle
+					thread.max_depth = 0;
+					for (var s = 0; s < thread.start.length; s++)
+					{
+						thread.max_depth = Math.max(thread.max_depth, thread.depth[s]);
+						end_cycle = Math.max(end_cycle, thread.start[s] + thread.cycles[s]);
+					}
+				}
+
+				// Calculate width of name strings
+				ctx.font = bar_font;
+				aggregated.name_width = new Array(aggregated.name.length);
+				for (var a = 0; a < aggregated.name.length; a++)
+					aggregated.name_width[a] = ctx.measureText(aggregated.name[a]).width;
+
+				// Store scale properties
+				min_scale = canvas.width / end_cycle;
+				scale = min_scale;
+
+				drawChart();
+			}
+		</script>
 	</head>
 	<body onload="startChart();">
 	<script type="text/javascript">
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/STLLocalAllocator.h b/engine/thirdparty/jolt_physics/Jolt/Core/STLLocalAllocator.h
index 92e16ef7..1da26159 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/STLLocalAllocator.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/STLLocalAllocator.h
@@ -43,7 +43,8 @@ public:
 	/// Constructor used when rebinding to another type. This expects the allocator to use the original memory pool from the first allocator,
 	/// but in our case we cannot use the local buffer of the original allocator as it has different size and alignment rules.
 	/// To solve this we make this allocator fall back to the heap immediately.
-	template <class T2>		STLLocalAllocator(const STLLocalAllocator<T2, N> &) : mNumElementsUsed(N) { }
+	template <class T2>
+	explicit				STLLocalAllocator(const STLLocalAllocator<T2, N> &) : mNumElementsUsed(N) { }
 
 	/// Check if inPointer is in the local buffer
 	inline bool				is_local(const_pointer inPointer) const
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp b/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp
index 27bb591b..43a054c6 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.cpp
@@ -17,7 +17,6 @@
 #else
 	#include <windows.h>
 #endif
-
 	JPH_SUPPRESS_WARNING_POP
 #endif
 
@@ -27,6 +26,31 @@ Semaphore::Semaphore()
 {
 #ifdef JPH_PLATFORM_WINDOWS
 	mSemaphore = CreateSemaphore(nullptr, 0, INT_MAX, nullptr);
+	if (mSemaphore == nullptr)
+	{
+		Trace("Failed to create semaphore");
+		std::abort();
+	}
+#elif defined(JPH_USE_PTHREADS)
+	int ret = sem_init(&mSemaphore, 0, 0);
+	if (ret == -1)
+	{
+		Trace("Failed to create semaphore");
+		std::abort();
+	}
+#elif defined(JPH_USE_GRAND_CENTRAL_DISPATCH)
+	mSemaphore = dispatch_semaphore_create(0);
+	if (mSemaphore == nullptr)
+	{
+		Trace("Failed to create semaphore");
+		std::abort();
+	}
+#elif defined(JPH_PLATFORM_BLUE)
+	if (!JPH_PLATFORM_BLUE_SEMAPHORE_INIT(mSemaphore))
+	{
+		Trace("Failed to create semaphore");
+		std::abort();
+	}
 #endif
 }
 
@@ -34,6 +58,12 @@ Semaphore::~Semaphore()
 {
 #ifdef JPH_PLATFORM_WINDOWS
 	CloseHandle(mSemaphore);
+#elif defined(JPH_USE_PTHREADS)
+	sem_destroy(&mSemaphore);
+#elif defined(JPH_USE_GRAND_CENTRAL_DISPATCH)
+	dispatch_release(mSemaphore);
+#elif defined(JPH_PLATFORM_BLUE)
+	JPH_PLATFORM_BLUE_SEMAPHORE_DESTROY(mSemaphore);
 #endif
 }
 
@@ -41,13 +71,23 @@ void Semaphore::Release(uint inNumber)
 {
 	JPH_ASSERT(inNumber > 0);
 
-#ifdef JPH_PLATFORM_WINDOWS
-	int old_value = mCount.fetch_add(inNumber);
+#if defined(JPH_PLATFORM_WINDOWS) || defined(JPH_USE_PTHREADS) || defined(JPH_USE_GRAND_CENTRAL_DISPATCH) || defined(JPH_PLATFORM_BLUE)
+	int old_value = mCount.fetch_add(inNumber, std::memory_order_release);
 	if (old_value < 0)
 	{
 		int new_value = old_value + (int)inNumber;
 		int num_to_release = min(new_value, 0) - old_value;
+	#ifdef JPH_PLATFORM_WINDOWS
 		::ReleaseSemaphore(mSemaphore, num_to_release, nullptr);
+	#elif defined(JPH_USE_PTHREADS)
+		for (int i = 0; i < num_to_release; ++i)
+			sem_post(&mSemaphore);
+	#elif defined(JPH_USE_GRAND_CENTRAL_DISPATCH)
+		for (int i = 0; i < num_to_release; ++i)
+			dispatch_semaphore_signal(mSemaphore);
+	#elif defined(JPH_PLATFORM_BLUE)
+		JPH_PLATFORM_BLUE_SEMAPHORE_SIGNAL(mSemaphore, num_to_release);
+	#endif
 	}
 #else
 	std::lock_guard lock(mLock);
@@ -63,19 +103,31 @@ void Semaphore::Acquire(uint inNumber)
 {
 	JPH_ASSERT(inNumber > 0);
 
-#ifdef JPH_PLATFORM_WINDOWS
-	int old_value = mCount.fetch_sub(inNumber);
+#if defined(JPH_PLATFORM_WINDOWS) || defined(JPH_USE_PTHREADS) || defined(JPH_USE_GRAND_CENTRAL_DISPATCH) || defined(JPH_PLATFORM_BLUE)
+	int old_value = mCount.fetch_sub(inNumber, std::memory_order_acquire);
 	int new_value = old_value - (int)inNumber;
 	if (new_value < 0)
 	{
 		int num_to_acquire = min(old_value, 0) - new_value;
+	#ifdef JPH_PLATFORM_WINDOWS
 		for (int i = 0; i < num_to_acquire; ++i)
 			WaitForSingleObject(mSemaphore, INFINITE);
+	#elif defined(JPH_USE_PTHREADS)
+		for (int i = 0; i < num_to_acquire; ++i)
+			sem_wait(&mSemaphore);
+	#elif defined(JPH_USE_GRAND_CENTRAL_DISPATCH)
+		for (int i = 0; i < num_to_acquire; ++i)
+			dispatch_semaphore_wait(mSemaphore, DISPATCH_TIME_FOREVER);
+	#elif defined(JPH_PLATFORM_BLUE)
+		JPH_PLATFORM_BLUE_SEMAPHORE_WAIT(mSemaphore, num_to_acquire);
+	#endif
 	}
 #else
 	std::unique_lock lock(mLock);
+	mWaitVariable.wait(lock, [this, inNumber]() {
+		return mCount.load(std::memory_order_relaxed) >= int(inNumber);
+	});
 	mCount.fetch_sub(inNumber, std::memory_order_relaxed);
-	mWaitVariable.wait(lock, [this]() { return mCount >= 0; });
 #endif
 }
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.h b/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.h
index 091d7d5b..492f8b24 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/Semaphore.h
@@ -4,47 +4,64 @@
 
 #pragma once
 
+#include <Jolt/Core/Atomics.h>
+
+// Determine which platform specific construct we'll use
 JPH_SUPPRESS_WARNINGS_STD_BEGIN
-#include <atomic>
-#include <mutex>
-#include <condition_variable>
+#ifdef JPH_PLATFORM_WINDOWS
+	// We include windows.h in the cpp file, the semaphore itself is a void pointer
+#elif defined(JPH_PLATFORM_LINUX) || defined(JPH_PLATFORM_ANDROID) || defined(JPH_PLATFORM_BSD) || defined(JPH_PLATFORM_WASM)
+	#include <semaphore.h>
+	#define JPH_USE_PTHREADS
+#elif defined(JPH_PLATFORM_MACOS) || defined(JPH_PLATFORM_IOS)
+	#include <dispatch/dispatch.h>
+	#define JPH_USE_GRAND_CENTRAL_DISPATCH
+#elif defined(JPH_PLATFORM_BLUE)
+	// Jolt/Core/PlatformBlue.h should have defined everything that is needed below
+#else
+	#include <mutex>
+	#include <condition_variable>
+#endif
 JPH_SUPPRESS_WARNINGS_STD_END
 
 JPH_NAMESPACE_BEGIN
 
-// Things we're using from STL
-using std::atomic;
-using std::mutex;
-using std::condition_variable;
-
 /// Implements a semaphore
 /// When we switch to C++20 we can use counting_semaphore to unify this
 class JPH_EXPORT Semaphore
 {
 public:
 	/// Constructor
-						Semaphore();
-						~Semaphore();
+							Semaphore();
+							~Semaphore();
 
 	/// Release the semaphore, signaling the thread waiting on the barrier that there may be work
-	void				Release(uint inNumber = 1);
+	void					Release(uint inNumber = 1);
 
 	/// Acquire the semaphore inNumber times
-	void				Acquire(uint inNumber = 1);
+	void					Acquire(uint inNumber = 1);
 
 	/// Get the current value of the semaphore
-	inline int			GetValue() const								{ return mCount.load(std::memory_order_relaxed); }
+	inline int				GetValue() const								{ return mCount.load(std::memory_order_relaxed); }
 
 private:
+#if defined(JPH_PLATFORM_WINDOWS) || defined(JPH_USE_PTHREADS) || defined(JPH_USE_GRAND_CENTRAL_DISPATCH) || defined(JPH_PLATFORM_BLUE)
 #ifdef JPH_PLATFORM_WINDOWS
-	// On windows we use a semaphore object since it is more efficient than a lock and a condition variable
-	alignas(JPH_CACHE_LINE_SIZE) atomic<int> mCount { 0 };				///< We increment mCount for every release, to acquire we decrement the count. If the count is negative we know that we are waiting on the actual semaphore.
-	void *				mSemaphore;										///< The semaphore is an expensive construct so we only acquire/release it if we know that we need to wait/have waiting threads
+	using SemaphoreType = void *;
+#elif defined(JPH_USE_PTHREADS)
+	using SemaphoreType = sem_t;
+#elif defined(JPH_USE_GRAND_CENTRAL_DISPATCH)
+	using SemaphoreType = dispatch_semaphore_t;
+#elif defined(JPH_PLATFORM_BLUE)
+	using SemaphoreType = JPH_PLATFORM_BLUE_SEMAPHORE;
+#endif
+	alignas(JPH_CACHE_LINE_SIZE) atomic<int> mCount { 0 };					///< We increment mCount for every release, to acquire we decrement the count. If the count is negative we know that we are waiting on the actual semaphore.
+	SemaphoreType			mSemaphore { };									///< The semaphore is an expensive construct so we only acquire/release it if we know that we need to wait/have waiting threads
 #else
 	// Other platforms: Emulate a semaphore using a mutex, condition variable and count
-	mutex				mLock;
-	condition_variable	mWaitVariable;
-	atomic<int>			mCount { 0 };
+	std::mutex				mLock;
+	std::condition_variable	mWaitVariable;
+	atomic<int>				mCount { 0 };
 #endif
 };
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/StreamIn.h b/engine/thirdparty/jolt_physics/Jolt/Core/StreamIn.h
index 4de299e6..accb5aaa 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/StreamIn.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/StreamIn.h
@@ -18,7 +18,8 @@ public:
 	/// Read a string of bytes from the binary stream
 	virtual void		ReadBytes(void *outData, size_t inNumBytes) = 0;
 
-	/// Returns true when an attempt has been made to read past the end of the file
+	/// Returns true when an attempt has been made to read past the end of the file.
+	/// Note that this follows the convention of std::basic_ios::eof which only returns true when an attempt is made to read past the end, not when the read pointer is at the end.
 	virtual bool		IsEOF() const = 0;
 
 	/// Returns true if there was an IO failure
diff --git a/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h b/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h
index 99586bde..b3d5496c 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Core/TempAllocator.h
@@ -34,7 +34,7 @@ public:
 	JPH_OVERRIDE_NEW_DELETE
 
 	/// Constructs the allocator with a maximum allocatable size of inSize
-	explicit						TempAllocatorImpl(uint inSize) :
+	explicit						TempAllocatorImpl(size_t inSize) :
 		mBase(static_cast<uint8 *>(AlignedAllocate(inSize, JPH_RVECTOR_ALIGNMENT))),
 		mSize(inSize)
 	{
@@ -56,10 +56,10 @@ public:
 		}
 		else
 		{
-			uint new_top = mTop + AlignUp(inSize, JPH_RVECTOR_ALIGNMENT);
+			size_t new_top = mTop + AlignUp(inSize, JPH_RVECTOR_ALIGNMENT);
 			if (new_top > mSize)
 			{
-				Trace("TempAllocator: Out of memory");
+				Trace("TempAllocator: Out of memory trying to allocate %u bytes", inSize);
 				std::abort();
 			}
 			void *address = mBase + mTop;
@@ -93,13 +93,13 @@ public:
 	}
 
 	/// Get the total size of the fixed buffer
-	uint							GetSize() const
+	size_t							GetSize() const
 	{
 		return mSize;
 	}
 
 	/// Get current usage in bytes of the buffer
-	uint							GetUsage() const
+	size_t							GetUsage() const
 	{
 		return mTop;
 	}
@@ -118,8 +118,8 @@ public:
 
 private:
 	uint8 *							mBase;							///< Base address of the memory block
-	uint							mSize;							///< Size of the memory block
-	uint							mTop = 0;						///< End of currently allocated area
+	size_t							mSize;							///< Size of the memory block
+	size_t							mTop = 0;						///< End of currently allocated area
 };
 
 /// Implementation of the TempAllocator that just falls back to malloc/free
diff --git a/engine/thirdparty/jolt_physics/Jolt/Geometry/AABox.h b/engine/thirdparty/jolt_physics/Jolt/Geometry/AABox.h
index 65e353af..bf730d24 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Geometry/AABox.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Geometry/AABox.h
@@ -34,10 +34,11 @@ public:
 		return box;
 	}
 
-	/// Get bounding box of size 2 * FLT_MAX
+	/// Get bounding box of size FLT_MAX
 	static AABox	sBiggest()
 	{
-		return AABox(Vec3::sReplicate(-FLT_MAX), Vec3::sReplicate(FLT_MAX));
+		/// Max half extent of AABox is 0.5 * FLT_MAX so that GetSize() remains finite
+		return AABox(Vec3::sReplicate(-0.5f * FLT_MAX), Vec3::sReplicate(0.5f * FLT_MAX));
 	}
 
 	/// Comparison operators
diff --git a/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h b/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h
index ffa0c391..49897019 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Geometry/EPAPenetrationDepth.h
@@ -540,9 +540,9 @@ public:
 				|| contact_normal_invalid))
 		{
 			// If we're initially intersecting, we need to run the EPA algorithm in order to find the deepest contact point
-			AddConvexRadius<A> add_convex_a(inA, inConvexRadiusA);
-			AddConvexRadius<B> add_convex_b(inB, inConvexRadiusB);
-			TransformedConvexObject<AddConvexRadius<A>> transformed_a(inStart, add_convex_a);
+			AddConvexRadius add_convex_a(inA, inConvexRadiusA);
+			AddConvexRadius add_convex_b(inB, inConvexRadiusB);
+			TransformedConvexObject transformed_a(inStart, add_convex_a);
 			if (!GetPenetrationDepthStepEPA(transformed_a, add_convex_b, inPenetrationTolerance, outContactNormal, outPointA, outPointB))
 				return false;
 		}
diff --git a/engine/thirdparty/jolt_physics/Jolt/Geometry/GJKClosestPoint.h b/engine/thirdparty/jolt_physics/Jolt/Geometry/GJKClosestPoint.h
index e5f49b65..b375e167 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Geometry/GJKClosestPoint.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Geometry/GJKClosestPoint.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <Jolt/Core/NonCopyable.h>
-#include <Jolt/Core/FPException.h>
 #include <Jolt/Geometry/ClosestPoint.h>
 #include <Jolt/Geometry/ConvexSupport.h>
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Geometry/OrientedBox.h b/engine/thirdparty/jolt_physics/Jolt/Geometry/OrientedBox.h
index c5c2a0e1..e1512666 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Geometry/OrientedBox.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Geometry/OrientedBox.h
@@ -14,7 +14,7 @@ JPH_NAMESPACE_BEGIN
 class AABox;
 
 /// Oriented box
-class [[nodiscard]] JPH_EXPORT_GCC_BUG_WORKAROUND OrientedBox
+class JPH_EXPORT_GCC_BUG_WORKAROUND [[nodiscard]] OrientedBox
 {
 public:
 	JPH_OVERRIDE_NEW_DELETE
diff --git a/engine/thirdparty/jolt_physics/Jolt/Geometry/RayAABox.h b/engine/thirdparty/jolt_physics/Jolt/Geometry/RayAABox.h
index 31970e7c..90a08f61 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Geometry/RayAABox.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Geometry/RayAABox.h
@@ -21,7 +21,7 @@ public:
 		mIsParallel = Vec3::sLessOrEqual(inDirection.Abs(), Vec3::sReplicate(1.0e-20f));
 
 		// Calculate 1 / direction while avoiding division by zero
-		mInvDirection = Vec3::sSelect(inDirection, Vec3::sReplicate(1.0f), mIsParallel).Reciprocal();
+		mInvDirection = Vec3::sSelect(inDirection, Vec3::sOne(), mIsParallel).Reciprocal();
 	}
 
 	Vec3			mInvDirection;					///< 1 / ray direction
diff --git a/engine/thirdparty/jolt_physics/Jolt/Geometry/RayTriangle.h b/engine/thirdparty/jolt_physics/Jolt/Geometry/RayTriangle.h
index dabd0275..42dc921d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Geometry/RayTriangle.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Geometry/RayTriangle.h
@@ -15,7 +15,7 @@ JPH_INLINE float RayTriangle(Vec3Arg inOrigin, Vec3Arg inDirection, Vec3Arg inV0
 
 	// Zero & one
 	Vec3 zero = Vec3::sZero();
-	Vec3 one = Vec3::sReplicate(1.0f);
+	Vec3 one = Vec3::sOne();
 
 	// Find vectors for two edges sharing inV0
 	Vec3 e1 = inV1 - inV0;
@@ -31,7 +31,7 @@ JPH_INLINE float RayTriangle(Vec3Arg inOrigin, Vec3Arg inDirection, Vec3Arg inV0
 	UVec4 det_near_zero = Vec3::sLess(det.Abs(), epsilon);
 
 	// When the determinant is near zero, set it to one to avoid dividing by zero
-	det = Vec3::sSelect(det, Vec3::sReplicate(1.0f), det_near_zero);
+	det = Vec3::sSelect(det, Vec3::sOne(), det_near_zero);
 
 	// Calculate distance from inV0 to ray origin
 	Vec3 s = inOrigin - inV0;
@@ -110,7 +110,7 @@ JPH_INLINE Vec4 RayTriangle4(Vec3Arg inOrigin, Vec3Arg inDirection, Vec4Arg inV0
 	UVec4 det_near_zero = Vec4::sLess(det, epsilon);
 
 	// Set components of the determinant to 1 that are near zero to avoid dividing by zero
-	det = Vec4::sSelect(det, Vec4::sReplicate(1.0f), det_near_zero);
+	det = Vec4::sSelect(det, Vec4::sOne(), det_near_zero);
 
 	// Calculate distance from inV0 to ray origin
 	Vec4 sx = inOrigin.SplatX() - inV0X;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Jolt.natvis b/engine/thirdparty/jolt_physics/Jolt/Jolt.natvis
index bebafa1a..d183d95b 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Jolt.natvis
+++ b/engine/thirdparty/jolt_physics/Jolt/Jolt.natvis
@@ -68,7 +68,7 @@
 		<DisplayString>min=({mMin}), max=({mMax})</DisplayString>
 	</Type>
 	<Type Name="JPH::BodyID">
-		<DisplayString>{mID}</DisplayString>
+		<DisplayString>idx={mID &amp; 0x007fffff}, seq={(mID >> 23) &amp; 0xff}, in_bp={mID >> 24,d}</DisplayString>
 	</Type>
 	<Type Name="JPH::Body">
 		<DisplayString>{mDebugName}: p=({mPosition.mF32[0],g}, {mPosition.mF32[1],g}, {mPosition.mF32[2],g}), r=({mRotation.mValue.mF32[0],g}, {mRotation.mValue.mF32[1],g}, {mRotation.mValue.mF32[2],g}, {mRotation.mValue.mF32[3],g}), v=({mLinearVelocity.mF32[0],g}, {mLinearVelocity.mF32[1],g}, {mLinearVelocity.mF32[2],g}), w=({mAngularVelocity.mF32[0],g}, {mAngularVelocity.mF32[1],g}, {mAngularVelocity.mF32[2],g})</DisplayString>
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.h b/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.h
index 74d209b2..b2f90199 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.h
@@ -50,6 +50,9 @@ public:
 	/// Vector with all zeros
 	static JPH_INLINE DVec3		sZero();
 
+	/// Vector with all ones
+	static JPH_INLINE DVec3		sOne();
+
 	/// Vectors with the principal axis
 	static JPH_INLINE DVec3		sAxisX()										{ return DVec3(1, 0, 0); }
 	static JPH_INLINE DVec3		sAxisY()										{ return DVec3(0, 1, 0); }
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.inl b/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.inl
index eb0bcf43..fd18db40 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.inl
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/DVec3.inl
@@ -147,6 +147,11 @@ DVec3 DVec3::sReplicate(double inV)
 #endif
 }
 
+DVec3 DVec3::sOne()
+{
+	return sReplicate(1.0);
+}
+
 DVec3 DVec3::sNaN()
 {
 	return sReplicate(numeric_limits<double>::quiet_NaN());
@@ -727,7 +732,7 @@ DVec3 DVec3::Abs() const
 
 DVec3 DVec3::Reciprocal() const
 {
-	return sReplicate(1.0) / mValue;
+	return sOne() / mValue;
 }
 
 DVec3 DVec3::Cross(DVec3Arg inV2) const
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/EigenValueSymmetric.h b/engine/thirdparty/jolt_physics/Jolt/Math/EigenValueSymmetric.h
index dab0e690..ce4a3087 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/EigenValueSymmetric.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/EigenValueSymmetric.h
@@ -30,7 +30,7 @@ bool EigenValueSymmetric(const Matrix &inMatrix, Matrix &outEigVec, Vector &outE
 {
 	// This algorithm can generate infinite values, see comment below
 	FPExceptionDisableInvalid disable_invalid;
-	(void)disable_invalid;
+	JPH_UNUSED(disable_invalid);
 
 	// Maximum number of sweeps to make
 	const int cMaxSweeps = 50;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/HalfFloat.h b/engine/thirdparty/jolt_physics/Jolt/Math/HalfFloat.h
index 5b36cb09..7148235d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/HalfFloat.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/HalfFloat.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <Jolt/Math/Vec4.h>
+#include <Jolt/Core/FPException.h>
 
 JPH_NAMESPACE_BEGIN
 
@@ -132,6 +133,9 @@ template <int RoundingMode>
 JPH_INLINE HalfFloat FromFloat(float inV)
 {
 #ifdef JPH_USE_F16C
+	FPExceptionDisableOverflow disable_overflow;
+	JPH_UNUSED(disable_overflow);
+
 	union
 	{
 		__m128i		u128;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/Math.h b/engine/thirdparty/jolt_physics/Jolt/Math/Math.h
index 221176ee..02083684 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/Math.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/Math.h
@@ -9,6 +9,9 @@ JPH_NAMESPACE_BEGIN
 /// The constant \f$\pi\f$
 static constexpr float JPH_PI = 3.14159265358979323846f;
 
+/// A large floating point value which, when squared, is still much smaller than FLT_MAX
+static constexpr float cLargeFloat = 1.0e15f;
+
 /// Convert a value from degrees to radians
 JPH_INLINE constexpr float DegreesToRadians(float inV)
 {
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.h b/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.h
index 18264db7..76d42fb4 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.h
@@ -46,6 +46,9 @@ public:
 	/// Vector with all zeros
 	static JPH_INLINE Vec3		sZero();
 
+	/// Vector with all ones
+	static JPH_INLINE Vec3		sOne();
+
 	/// Vector with all NaN's
 	static JPH_INLINE Vec3		sNaN();
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl b/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl
index dba99360..cea60f4d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/Vec3.inl
@@ -122,6 +122,11 @@ Vec3 Vec3::sReplicate(float inV)
 #endif
 }
 
+Vec3 Vec3::sOne()
+{
+	return sReplicate(1.0f);
+}
+
 Vec3 Vec3::sNaN()
 {
 	return sReplicate(numeric_limits<float>::quiet_NaN());
@@ -584,7 +589,7 @@ Vec3 Vec3::Abs() const
 
 Vec3 Vec3::Reciprocal() const
 {
-	return sReplicate(1.0f) / mValue;
+	return sOne() / mValue;
 }
 
 Vec3 Vec3::Cross(Vec3Arg inV2) const
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.h b/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.h
index eb924a0f..4098626a 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.h
@@ -38,6 +38,9 @@ public:
 	/// Vector with all zeros
 	static JPH_INLINE Vec4		sZero();
 
+	/// Vector with all ones
+	static JPH_INLINE Vec4		sOne();
+
 	/// Vector with all NaN's
 	static JPH_INLINE Vec4		sNaN();
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl b/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl
index 43676361..bcbd2fb3 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl
+++ b/engine/thirdparty/jolt_physics/Jolt/Math/Vec4.inl
@@ -82,6 +82,11 @@ Vec4 Vec4::sReplicate(float inV)
 #endif
 }
 
+Vec4 Vec4::sOne()
+{
+	return sReplicate(1.0f);
+}
+
 Vec4 Vec4::sNaN()
 {
 	return sReplicate(numeric_limits<float>::quiet_NaN());
@@ -614,7 +619,7 @@ Vec4 Vec4::Abs() const
 
 Vec4 Vec4::Reciprocal() const
 {
-	return sReplicate(1.0f) / mValue;
+	return sOne() / mValue;
 }
 
 Vec4 Vec4::DotV(Vec4Arg inV2) const
@@ -805,7 +810,7 @@ void Vec4::SinCos(Vec4 &outSin, Vec4 &outCos) const
 
 	// Taylor expansion:
 	// Cos(x) = 1 - x^2/2! + x^4/4! - x^6/6! + x^8/8! + ... = (((x2/8!- 1/6!) * x2 + 1/4!) * x2 - 1/2!) * x2 + 1
-	Vec4 taylor_cos = ((2.443315711809948e-5f * x2 - Vec4::sReplicate(1.388731625493765e-3f)) * x2 + Vec4::sReplicate(4.166664568298827e-2f)) * x2 * x2 - 0.5f * x2 + Vec4::sReplicate(1.0f);
+	Vec4 taylor_cos = ((2.443315711809948e-5f * x2 - Vec4::sReplicate(1.388731625493765e-3f)) * x2 + Vec4::sReplicate(4.166664568298827e-2f)) * x2 * x2 - 0.5f * x2 + Vec4::sOne();
 	// Sin(x) = x - x^3/3! + x^5/5! - x^7/7! + ... = ((-x2/7! + 1/5!) * x2 - 1/3!) * x2 * x + x
 	Vec4 taylor_sin = ((-1.9515295891e-4f * x2 + Vec4::sReplicate(8.3321608736e-3f)) * x2 - Vec4::sReplicate(1.6666654611e-1f)) * x2 * x + x;
 
@@ -880,14 +885,14 @@ Vec4 Vec4::ASin() const
 	Vec4 a = Vec4::sXor(*this, asin_sign.ReinterpretAsFloat());
 
 	// ASin is not defined outside the range [-1, 1] but it often happens that a value is slightly above 1 so we just clamp here
-	a = Vec4::sMin(a, Vec4::sReplicate(1.0f));
+	a = Vec4::sMin(a, Vec4::sOne());
 
 	// When |x| <= 0.5 we use the asin approximation as is
 	Vec4 z1 = a * a;
 	Vec4 x1 = a;
 
 	// When |x| > 0.5 we use the identity asin(x) = PI / 2 - 2 * asin(sqrt((1 - x) / 2))
-	Vec4 z2 = 0.5f * (Vec4::sReplicate(1.0f) - a);
+	Vec4 z2 = 0.5f * (Vec4::sOne() - a);
 	Vec4 x2 = z2.Sqrt();
 
 	// Select which of the two situations we have
@@ -923,7 +928,7 @@ Vec4 Vec4::ATan() const
 
 	// If x > Tan(PI / 8)
 	UVec4 greater1 = Vec4::sGreater(x, Vec4::sReplicate(0.4142135623730950f));
-	Vec4 x1 = (x - Vec4::sReplicate(1.0f)) / (x + Vec4::sReplicate(1.0f));
+	Vec4 x1 = (x - Vec4::sOne()) / (x + Vec4::sOne());
 
 	// If x > Tan(3 * PI / 8)
 	UVec4 greater2 = Vec4::sGreater(x, Vec4::sReplicate(2.414213562373095f));
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.cpp
index 4386ec2d..5fdb9220 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.cpp
@@ -39,7 +39,7 @@ void Body::SetMotionType(EMotionType inMotionType)
 	if (mMotionType == inMotionType)
 		return;
 
-	JPH_ASSERT(inMotionType == EMotionType::Static || mMotionProperties != nullptr, "Body needs to be created with mAllowDynamicOrKinematic set tot true");
+	JPH_ASSERT(inMotionType == EMotionType::Static || mMotionProperties != nullptr, "Body needs to be created with mAllowDynamicOrKinematic set to true");
 	JPH_ASSERT(inMotionType != EMotionType::Static || !IsActive(), "Deactivate body first");
 	JPH_ASSERT(inMotionType == EMotionType::Dynamic || !IsSoftBody(), "Soft bodies can only be dynamic, you can make individual vertices kinematic by setting their inverse mass to 0");
 
@@ -96,7 +96,7 @@ void Body::MoveKinematic(RVec3Arg inTargetPosition, QuatArg inTargetRotation, fl
 
 void Body::CalculateWorldSpaceBoundsInternal()
 {
-	mBounds = mShape->GetWorldSpaceBounds(GetCenterOfMassTransform(), Vec3::sReplicate(1.0f));
+	mBounds = mShape->GetWorldSpaceBounds(GetCenterOfMassTransform(), Vec3::sOne());
 }
 
 void Body::SetPositionAndRotationInternal(RVec3Arg inPosition, QuatArg inRotation, bool inResetSleepTimer)
@@ -190,7 +190,7 @@ void Body::GetSubmergedVolume(RVec3Arg inSurfacePosition, Vec3Arg inSurfaceNorma
 	Plane surface_relative_to_body = Plane::sFromPointAndNormal(inSurfacePosition - mPosition, inSurfaceNormal);
 
 	// Calculate amount of volume that is submerged and what the center of buoyancy is
-	mShape->GetSubmergedVolume(rotation, Vec3::sReplicate(1.0f), surface_relative_to_body, outTotalVolume, outSubmergedVolume, outRelativeCenterOfBuoyancy JPH_IF_DEBUG_RENDERER(, mPosition));
+	mShape->GetSubmergedVolume(rotation, Vec3::sOne(), surface_relative_to_body, outTotalVolume, outSubmergedVolume, outRelativeCenterOfBuoyancy JPH_IF_DEBUG_RENDERER(, mPosition));
 }
 
 bool Body::ApplyBuoyancyImpulse(float inTotalVolume, float inSubmergedVolume, Vec3Arg inRelativeCenterOfBuoyancy, float inBuoyancy, float inLinearDrag, float inAngularDrag, Vec3Arg inFluidVelocity, Vec3Arg inGravity, float inDeltaTime)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h
index 63034f90..84918710 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/Body.h
@@ -31,7 +31,11 @@ class SoftBodyCreationSettings;
 /// The functions that get/set the position of the body all indicate if they are relative to the center of mass or to the original position in which the shape was created.
 ///
 /// The linear velocity is also velocity of the center of mass, to correct for this: \f$VelocityCOM = Velocity - AngularVelocity \times ShapeCOM\f$.
-class alignas(JPH_RVECTOR_ALIGNMENT) JPH_EXPORT_GCC_BUG_WORKAROUND Body : public NonCopyable
+class
+#ifndef JPH_PLATFORM_DOXYGEN // Doxygen gets confused here
+	JPH_EXPORT_GCC_BUG_WORKAROUND alignas(JPH_RVECTOR_ALIGNMENT)
+#endif
+	Body : public NonCopyable
 {
 public:
 	JPH_OVERRIDE_NEW_DELETE
@@ -281,6 +285,25 @@ public:
 	/// Get world space bounding box
 	inline const AABox &	GetWorldSpaceBounds() const										{ return mBounds; }
 
+#ifdef JPH_ENABLE_ASSERTS
+	/// Validate that the cached bounding box of the body matches the actual bounding box of the body.
+	/// If this check fails then there are a number of possible causes:
+	/// 1. Shape is being modified without notifying the system of the change. E.g. if you modify a MutableCompoundShape
+	/// without calling BodyInterface::NotifyShapeChanged then there will be a mismatch between the cached bounding box
+	/// in the broad phase and the bounding box of the Shape.
+	/// 2. You are calling functions postfixed with 'Internal' which are not meant to be called by the application.
+	/// 3. If the actual bounds and cached bounds are very close, it could mean that you have a mismatch in floating
+	/// point unit state between threads. E.g. one thread has flush to zero (FTZ) or denormals are zero (DAZ) set and
+	/// the other thread does not. Or if the rounding mode differs between threads. This can cause small differences
+	/// in floating point calculations. If you are using JobSystemThreadPool you can use JobSystemThreadPool::SetThreadInitFunction
+	/// to initialize the floating point unit state.
+	inline void				ValidateCachedBounds() const
+	{
+		AABox actual_body_bounds = mShape->GetWorldSpaceBounds(GetCenterOfMassTransform(), Vec3::sOne());
+		JPH_ASSERT(actual_body_bounds == mBounds, "Mismatch between cached bounding box and actual bounding box");
+	}
+#endif // JPH_ENABLE_ASSERTS
+
 	/// Access to the motion properties
 	const MotionProperties *GetMotionProperties() const										{ JPH_ASSERT(!IsStatic()); return mMotionProperties; }
 	MotionProperties *		GetMotionProperties()											{ JPH_ASSERT(!IsStatic()); return mMotionProperties; }
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyID.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyID.h
index d2bbaccf..8f9ca3a5 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyID.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyID.h
@@ -15,9 +15,10 @@ public:
 	JPH_OVERRIDE_NEW_DELETE
 
 	static constexpr uint32	cInvalidBodyID = 0xffffffff;	///< The value for an invalid body ID
-	static constexpr uint32	cBroadPhaseBit = 0x00800000;	///< This bit is used by the broadphase
+	static constexpr uint32	cBroadPhaseBit = 0x80000000;	///< This bit is used by the broadphase
 	static constexpr uint32	cMaxBodyIndex = 0x7fffff;		///< Maximum value for body index (also the maximum amount of bodies supported - 1)
 	static constexpr uint8	cMaxSequenceNumber = 0xff;		///< Maximum value for the sequence number
+	static constexpr uint	cSequenceNumberShift = 23;		///< Number of bits to shift to get the sequence number
 
 	/// Construct invalid body ID
 							BodyID() :
@@ -34,9 +35,9 @@ public:
 
 	/// Construct from index and sequence number
 	explicit				BodyID(uint32 inID, uint8 inSequenceNumber) :
-		mID((uint32(inSequenceNumber) << 24) | inID)
+		mID((uint32(inSequenceNumber) << cSequenceNumberShift) | inID)
 	{
-		JPH_ASSERT(inID < cMaxBodyIndex); // Should not use bit pattern for invalid ID and should not use the broadphase bit
+		JPH_ASSERT(inID <= cMaxBodyIndex); // Should not overlap with broadphase bit or sequence number
 	}
 
 	/// Get index in body array
@@ -51,7 +52,7 @@ public:
 	/// Functions querying the broadphase can (after acquiring a body lock) detect that the body has been removed (we assume that this won't happen more than 128 times in a row).
 	inline uint8			GetSequenceNumber() const
 	{
-		return uint8(mID >> 24);
+		return uint8(mID >> cSequenceNumberShift);
 	}
 
 	/// Returns the index and sequence number combined in an uint32
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp
index cc5f27de..988094c8 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.cpp
@@ -316,11 +316,11 @@ void BodyInterface::SetShape(const BodyID &inBodyID, const Shape *inShape, bool
 			{
 				BodyID id = body.GetID();
 				mBroadPhase->NotifyBodiesAABBChanged(&id, 1);
-			}
 
-			// Optionally activate body
-			if (inActivationMode == EActivation::Activate && !body.IsStatic())
-				ActivateBodyInternal(body);
+				// Optionally activate body
+				if (inActivationMode == EActivation::Activate && !body.IsStatic())
+					ActivateBodyInternal(body);
+			}
 		}
 	}
 }
@@ -346,11 +346,11 @@ void BodyInterface::NotifyShapeChanged(const BodyID &inBodyID, Vec3Arg inPreviou
 		{
 			BodyID id = body.GetID();
 			mBroadPhase->NotifyBodiesAABBChanged(&id, 1);
-		}
 
-		// Optionally activate body
-		if (inActivationMode == EActivation::Activate && !body.IsStatic())
-			ActivateBodyInternal(body);
+			// Optionally activate body
+			if (inActivationMode == EActivation::Activate && !body.IsStatic())
+				ActivateBodyInternal(body);
+		}
 	}
 }
 
@@ -401,11 +401,11 @@ void BodyInterface::SetPositionAndRotation(const BodyID &inBodyID, RVec3Arg inPo
 		{
 			BodyID id = body.GetID();
 			mBroadPhase->NotifyBodiesAABBChanged(&id, 1);
-		}
 
-		// Optionally activate body
-		if (inActivationMode == EActivation::Activate && !body.IsStatic())
-			ActivateBodyInternal(body);
+			// Optionally activate body
+			if (inActivationMode == EActivation::Activate && !body.IsStatic())
+				ActivateBodyInternal(body);
+		}
 	}
 }
 
@@ -428,11 +428,11 @@ void BodyInterface::SetPositionAndRotationWhenChanged(const BodyID &inBodyID, RV
 			{
 				BodyID id = body.GetID();
 				mBroadPhase->NotifyBodiesAABBChanged(&id, 1);
-			}
 
-			// Optionally activate body
-			if (inActivationMode == EActivation::Activate && !body.IsStatic())
-				ActivateBodyInternal(body);
+				// Optionally activate body
+				if (inActivationMode == EActivation::Activate && !body.IsStatic())
+					ActivateBodyInternal(body);
+			}
 		}
 	}
 }
@@ -468,11 +468,11 @@ void BodyInterface::SetPosition(const BodyID &inBodyID, RVec3Arg inPosition, EAc
 		{
 			BodyID id = body.GetID();
 			mBroadPhase->NotifyBodiesAABBChanged(&id, 1);
-		}
 
-		// Optionally activate body
-		if (inActivationMode == EActivation::Activate && !body.IsStatic())
-			ActivateBodyInternal(body);
+			// Optionally activate body
+			if (inActivationMode == EActivation::Activate && !body.IsStatic())
+				ActivateBodyInternal(body);
+		}
 	}
 }
 
@@ -509,11 +509,11 @@ void BodyInterface::SetRotation(const BodyID &inBodyID, QuatArg inRotation, EAct
 		{
 			BodyID id = body.GetID();
 			mBroadPhase->NotifyBodiesAABBChanged(&id, 1);
-		}
 
-		// Optionally activate body
-		if (inActivationMode == EActivation::Activate && !body.IsStatic())
-			ActivateBodyInternal(body);
+			// Optionally activate body
+			if (inActivationMode == EActivation::Activate && !body.IsStatic())
+				ActivateBodyInternal(body);
+		}
 	}
 }
 
@@ -990,6 +990,22 @@ bool BodyInterface::GetUseManifoldReduction(const BodyID &inBodyID) const
 		return true;
 }
 
+void BodyInterface::SetCollisionGroup(const BodyID &inBodyID, const CollisionGroup &inCollisionGroup)
+{
+	BodyLockWrite lock(*mBodyLockInterface, inBodyID);
+	if (lock.Succeeded())
+		lock.GetBody().SetCollisionGroup(inCollisionGroup);
+}
+
+const CollisionGroup &BodyInterface::GetCollisionGroup(const BodyID &inBodyID) const
+{
+	BodyLockRead lock(*mBodyLockInterface, inBodyID);
+	if (lock.Succeeded())
+		return lock.GetBody().GetCollisionGroup();
+	else
+		return CollisionGroup::sInvalid;
+}
+
 TransformedShape BodyInterface::GetTransformedShape(const BodyID &inBodyID) const
 {
 	BodyLockRead lock(*mBodyLockInterface, inBodyID);
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h
index 477b3564..cc92e937 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyInterface.h
@@ -28,6 +28,7 @@ class TwoBodyConstraintSettings;
 class TwoBodyConstraint;
 class BroadPhaseLayerFilter;
 class AABox;
+class CollisionGroup;
 
 /// Class that provides operations on bodies using a body ID. Note that if you need to do multiple operations on a single body, it is more efficient to lock the body once and combine the operations.
 /// All quantities are in world space unless otherwise specified.
@@ -273,6 +274,12 @@ public:
 	bool						GetUseManifoldReduction(const BodyID &inBodyID) const;
 	///@}
 
+	///@name Collision group
+	///@{
+	void						SetCollisionGroup(const BodyID &inBodyID, const CollisionGroup &inCollisionGroup);
+	const CollisionGroup &		GetCollisionGroup(const BodyID &inBodyID) const;
+	///@}
+
 	/// Get transform and shape for this body, used to perform collision detection
 	TransformedShape			GetTransformedShape(const BodyID &inBodyID) const;
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp
index a48e4b0f..e64a446f 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/BodyManager.cpp
@@ -1014,15 +1014,15 @@ void BodyManager::Draw(const DrawSettings &inDrawSettings, const PhysicsSettings
 
 			// Draw the results of GetSupportFunction
 			if (inDrawSettings.mDrawGetSupportFunction)
-				body->mShape->DrawGetSupportFunction(inRenderer, body->GetCenterOfMassTransform(), Vec3::sReplicate(1.0f), color, inDrawSettings.mDrawSupportDirection);
+				body->mShape->DrawGetSupportFunction(inRenderer, body->GetCenterOfMassTransform(), Vec3::sOne(), color, inDrawSettings.mDrawSupportDirection);
 
 			// Draw the results of GetSupportingFace
 			if (inDrawSettings.mDrawGetSupportingFace)
-				body->mShape->DrawGetSupportingFace(inRenderer, body->GetCenterOfMassTransform(), Vec3::sReplicate(1.0f));
+				body->mShape->DrawGetSupportingFace(inRenderer, body->GetCenterOfMassTransform(), Vec3::sOne());
 
 			// Draw the shape
 			if (inDrawSettings.mDrawShape)
-				body->mShape->Draw(inRenderer, body->GetCenterOfMassTransform(), Vec3::sReplicate(1.0f), color, inDrawSettings.mDrawShapeColor == EShapeColor::MaterialColor, inDrawSettings.mDrawShapeWireframe || is_sensor);
+				body->mShape->Draw(inRenderer, body->GetCenterOfMassTransform(), Vec3::sOne(), color, inDrawSettings.mDrawShapeColor == EShapeColor::MaterialColor, inDrawSettings.mDrawShapeWireframe || is_sensor);
 
 			// Draw bounding box
 			if (inDrawSettings.mDrawBoundingBox)
@@ -1146,9 +1146,7 @@ void BodyManager::ValidateActiveBodyBounds()
 		for (BodyID *id = mActiveBodies[type], *id_end = mActiveBodies[type] + mNumActiveBodies[type].load(memory_order_relaxed); id < id_end; ++id)
 		{
 			const Body *body = mBodies[id->GetIndex()];
-			AABox cached = body->GetWorldSpaceBounds();
-			AABox calculated = body->GetShape()->GetWorldSpaceBounds(body->GetCenterOfMassTransform(), Vec3::sReplicate(1.0f));
-			JPH_ASSERT(cached == calculated);
+			body->ValidateCachedBounds();
 		}
 }
 #endif // JPH_DEBUG
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.inl b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.inl
index e9521f74..200ab680 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.inl
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Body/MotionProperties.inl
@@ -107,8 +107,8 @@ void MotionProperties::ApplyGyroscopicForceInternal(QuatArg inBodyRotation, floa
 
 	// Calculate local space inertia tensor (a diagonal in local space)
 	UVec4 is_zero = Vec3::sEquals(mInvInertiaDiagonal, Vec3::sZero());
-	Vec3 denominator = Vec3::sSelect(mInvInertiaDiagonal, Vec3::sReplicate(1.0f), is_zero);
-	Vec3 nominator = Vec3::sSelect(Vec3::sReplicate(1.0f), Vec3::sZero(), is_zero);
+	Vec3 denominator = Vec3::sSelect(mInvInertiaDiagonal, Vec3::sOne(), is_zero);
+	Vec3 nominator = Vec3::sSelect(Vec3::sOne(), Vec3::sZero(), is_zero);
 	Vec3 local_inertia = nominator / denominator; // Avoid dividing by zero, inertia in this axis will be zero
 
 	// Calculate local space angular momentum
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.cpp
index 14b23128..5f0ccd35 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.cpp
@@ -34,7 +34,7 @@ Character::Character(const CharacterSettings *inSettings, RVec3Arg inPosition, Q
 {
 	// Construct rigid body
 	BodyCreationSettings settings(mShape, inPosition, inRotation, EMotionType::Dynamic, mLayer);
-	settings.mAllowedDOFs = EAllowedDOFs::TranslationX | EAllowedDOFs::TranslationY | EAllowedDOFs::TranslationZ;
+	settings.mAllowedDOFs = inSettings->mAllowedDOFs;
 	settings.mEnhancedInternalEdgeRemoval = inSettings->mEnhancedInternalEdgeRemoval;
 	settings.mOverrideMassProperties = EOverrideMassProperties::MassAndInertiaProvided;
 	settings.mMassPropertiesOverride.mMass = inSettings->mMass;
@@ -75,8 +75,18 @@ void Character::CheckCollision(RMat44Arg inCenterOfMassTransform, Vec3Arg inMove
 	// Create query object layer filter
 	DefaultObjectLayerFilter object_layer_filter = mSystem->GetDefaultLayerFilter(mLayer);
 
-	// Ignore my own body
-	IgnoreSingleBodyFilter body_filter(mBodyID);
+	// Ignore sensors and my own body
+	class CharacterBodyFilter : public IgnoreSingleBodyFilter
+	{
+	public:
+		using			IgnoreSingleBodyFilter::IgnoreSingleBodyFilter;
+
+		virtual bool	ShouldCollideLocked(const Body &inBody) const override
+		{
+			return !inBody.IsSensor();
+		}
+	};
+	CharacterBodyFilter body_filter(mBodyID);
 
 	// Settings for collide shape
 	CollideShapeSettings settings;
@@ -85,7 +95,7 @@ void Character::CheckCollision(RMat44Arg inCenterOfMassTransform, Vec3Arg inMove
 	settings.mActiveEdgeMovementDirection = inMovementDirection;
 	settings.mBackFaceMode = EBackFaceMode::IgnoreBackFaces;
 
-	sGetNarrowPhaseQuery(mSystem, inLockBodies).CollideShape(inShape, Vec3::sReplicate(1.0f), inCenterOfMassTransform, settings, inBaseOffset, ioCollector, broadphase_layer_filter, object_layer_filter, body_filter);
+	sGetNarrowPhaseQuery(mSystem, inLockBodies).CollideShape(inShape, Vec3::sOne(), inCenterOfMassTransform, settings, inBaseOffset, ioCollector, broadphase_layer_filter, object_layer_filter, body_filter);
 }
 
 void Character::CheckCollision(RVec3Arg inPosition, QuatArg inRotation, Vec3Arg inMovementDirection, float inMaxSeparationDistance, const Shape *inShape, RVec3Arg inBaseOffset, CollideShapeCollector &ioCollector, bool inLockBodies) const
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.h
index cbf5d88d..0f37f33b 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/Character.h
@@ -8,6 +8,7 @@
 #include <Jolt/Physics/Collision/ObjectLayer.h>
 #include <Jolt/Physics/Collision/TransformedShape.h>
 #include <Jolt/Physics/EActivation.h>
+#include <Jolt/Physics/Body/AllowedDOFs.h>
 
 JPH_NAMESPACE_BEGIN
 
@@ -28,6 +29,9 @@ public:
 
 	/// Value to multiply gravity with for this character
 	float								mGravityFactor = 1.0f;
+
+	/// Allowed degrees of freedom for this character
+	EAllowedDOFs						mAllowedDOFs = EAllowedDOFs::TranslationX | EAllowedDOFs::TranslationY | EAllowedDOFs::TranslationZ;
 };
 
 /// Runtime character object.
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterID.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterID.h
new file mode 100644
index 00000000..0aa2d6fe
--- /dev/null
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterID.h
@@ -0,0 +1,98 @@
+// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
+// SPDX-FileCopyrightText: 2025 Jorrit Rouwe
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <Jolt/Core/HashCombine.h>
+
+JPH_NAMESPACE_BEGIN
+
+/// ID of a character. Used primarily to identify deleted characters and to sort deterministically.
+class JPH_EXPORT CharacterID
+{
+public:
+	JPH_OVERRIDE_NEW_DELETE
+
+	static constexpr uint32	cInvalidCharacterID = 0xffffffff;	///< The value for an invalid character ID
+
+	/// Construct invalid character ID
+							CharacterID() :
+		mID(cInvalidCharacterID)
+	{
+	}
+
+	/// Construct with specific value, make sure you don't use the same value twice!
+	explicit				CharacterID(uint32 inID) :
+		mID(inID)
+	{
+	}
+
+	/// Get the numeric value of the ID
+	inline uint32			GetValue() const
+	{
+		return mID;
+	}
+
+	/// Check if the ID is valid
+	inline bool				IsInvalid() const
+	{
+		return mID == cInvalidCharacterID;
+	}
+
+	/// Equals check
+	inline bool				operator == (const CharacterID &inRHS) const
+	{
+		return mID == inRHS.mID;
+	}
+
+	/// Not equals check
+	inline bool				operator != (const CharacterID &inRHS) const
+	{
+		return mID != inRHS.mID;
+	}
+
+	/// Smaller than operator, can be used for sorting characters
+	inline bool				operator < (const CharacterID &inRHS) const
+	{
+		return mID < inRHS.mID;
+	}
+
+	/// Greater than operator, can be used for sorting characters
+	inline bool				operator > (const CharacterID &inRHS) const
+	{
+		return mID > inRHS.mID;
+	}
+
+	/// Get the hash for this character ID
+	inline uint64			GetHash() const
+	{
+		return Hash<uint32>{} (mID);
+	}
+
+	/// Generate the next available character ID
+	static CharacterID		sNextCharacterID()
+	{
+		for (;;)
+		{
+			uint32 next = sNextID.fetch_add(1, std::memory_order_relaxed);
+			if (next != cInvalidCharacterID)
+				return CharacterID(next);
+		}
+	}
+
+	/// Set the next available character ID, can be used after destroying all character to prepare for a second deterministic run
+	static void				sSetNextCharacterID(uint32 inNextValue = 1)
+	{
+		sNextID.store(inNextValue, std::memory_order_relaxed);
+	}
+
+private:
+	/// Next character ID to be assigned
+	inline static atomic<uint32> sNextID = 1;
+
+	/// ID value
+	uint32					mID;
+};
+
+JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.cpp
index 6c16dc83..58614d40 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.cpp
@@ -14,8 +14,10 @@
 #include <Jolt/Physics/Collision/Shape/ScaledShape.h>
 #include <Jolt/Physics/Collision/CollisionDispatch.h>
 #include <Jolt/Core/QuickSort.h>
+#include <Jolt/Core/ScopeExit.h>
 #include <Jolt/Geometry/ConvexSupport.h>
 #include <Jolt/Geometry/GJKClosestPoint.h>
+#include <Jolt/Geometry/RayAABox.h>
 #ifdef JPH_DEBUG_RENDERER
 	#include <Jolt/Renderer/DebugRenderer.h>
 #endif // JPH_DEBUG_RENDERER
@@ -34,25 +36,35 @@ void CharacterVsCharacterCollisionSimple::CollideCharacter(const CharacterVirtua
 	// Make shape 1 relative to inBaseOffset
 	Mat44 transform1 = inCenterOfMassTransform.PostTranslated(-inBaseOffset).ToMat44();
 
-	const Shape *shape = inCharacter->GetShape();
+	const Shape *shape1 = inCharacter->GetShape();
 	CollideShapeSettings settings = inCollideShapeSettings;
 
+	// Get bounds for character
+	AABox bounds1 = shape1->GetWorldSpaceBounds(transform1, Vec3::sOne());
+
 	// Iterate over all characters
 	for (const CharacterVirtual *c : mCharacters)
 		if (c != inCharacter
 			&& !ioCollector.ShouldEarlyOut())
 		{
-			// Collector needs to know which character we're colliding with
-			ioCollector.SetUserData(reinterpret_cast<uint64>(c));
-
 			// Make shape 2 relative to inBaseOffset
 			Mat44 transform2 = c->GetCenterOfMassTransform().PostTranslated(-inBaseOffset).ToMat44();
 
 			// We need to add the padding of character 2 so that we will detect collision with its outer shell
 			settings.mMaxSeparationDistance = inCollideShapeSettings.mMaxSeparationDistance + c->GetCharacterPadding();
 
+			// Check if the bounding boxes of the characters overlap
+			const Shape *shape2 = c->GetShape();
+			AABox bounds2 = shape2->GetWorldSpaceBounds(transform2, Vec3::sOne());
+			bounds2.ExpandBy(Vec3::sReplicate(settings.mMaxSeparationDistance));
+			if (!bounds1.Overlaps(bounds2))
+				continue;
+
+			// Collector needs to know which character we're colliding with
+			ioCollector.SetUserData(reinterpret_cast<uint64>(c));
+
 			// Note that this collides against the character's shape without padding, this will be corrected for in CharacterVirtual::GetContactsAtPosition
-			CollisionDispatch::sCollideShapeVsShape(shape, c->GetShape(), Vec3::sReplicate(1.0f), Vec3::sReplicate(1.0f), transform1, transform2, SubShapeIDCreator(), SubShapeIDCreator(), settings, ioCollector);
+			CollisionDispatch::sCollideShapeVsShape(shape1, shape2, Vec3::sOne(), Vec3::sOne(), transform1, transform2, SubShapeIDCreator(), SubShapeIDCreator(), settings, ioCollector);
 		}
 
 	// Reset the user data
@@ -63,21 +75,32 @@ void CharacterVsCharacterCollisionSimple::CastCharacter(const CharacterVirtual *
 {
 	// Convert shape cast relative to inBaseOffset
 	Mat44 transform1 = inCenterOfMassTransform.PostTranslated(-inBaseOffset).ToMat44();
-	ShapeCast shape_cast(inCharacter->GetShape(), Vec3::sReplicate(1.0f), transform1, inDirection);
+	ShapeCast shape_cast(inCharacter->GetShape(), Vec3::sOne(), transform1, inDirection);
+
+	// Get world space bounds of the character in the form of center and extent
+	Vec3 origin = shape_cast.mShapeWorldBounds.GetCenter();
+	Vec3 extents = shape_cast.mShapeWorldBounds.GetExtent();
 
 	// Iterate over all characters
 	for (const CharacterVirtual *c : mCharacters)
 		if (c != inCharacter
 			&& !ioCollector.ShouldEarlyOut())
 		{
-			// Collector needs to know which character we're colliding with
-			ioCollector.SetUserData(reinterpret_cast<uint64>(c));
-
 			// Make shape 2 relative to inBaseOffset
 			Mat44 transform2 = c->GetCenterOfMassTransform().PostTranslated(-inBaseOffset).ToMat44();
 
+			// Sweep bounding box of the character against the bounding box of the other character to see if they can collide
+			const Shape *shape2 = c->GetShape();
+			AABox bounds2 = shape2->GetWorldSpaceBounds(transform2, Vec3::sOne());
+			bounds2.ExpandBy(extents);
+			if (!RayAABoxHits(origin, inDirection, bounds2.mMin, bounds2.mMax))
+				continue;
+
+			// Collector needs to know which character we're colliding with
+			ioCollector.SetUserData(reinterpret_cast<uint64>(c));
+
 			// Note that this collides against the character's shape without padding, this will be corrected for in CharacterVirtual::GetFirstContactForSweep
-			CollisionDispatch::sCastShapeVsShapeWorldSpace(shape_cast, inShapeCastSettings, c->GetShape(), Vec3::sReplicate(1.0f), { }, transform2, SubShapeIDCreator(), SubShapeIDCreator(), ioCollector);
+			CollisionDispatch::sCastShapeVsShapeWorldSpace(shape_cast, inShapeCastSettings, shape2, Vec3::sOne(), { }, transform2, SubShapeIDCreator(), SubShapeIDCreator(), ioCollector);
 		}
 
 	// Reset the user data
@@ -86,6 +109,7 @@ void CharacterVsCharacterCollisionSimple::CastCharacter(const CharacterVirtual *
 
 CharacterVirtual::CharacterVirtual(const CharacterVirtualSettings *inSettings, RVec3Arg inPosition, QuatArg inRotation, uint64 inUserData, PhysicsSystem *inSystem) :
 	CharacterBase(inSettings, inSystem),
+	mID(inSettings->mID),
 	mBackFaceMode(inSettings->mBackFaceMode),
 	mPredictiveContactDistance(inSettings->mPredictiveContactDistance),
 	mMaxCollisionIterations(inSettings->mMaxCollisionIterations),
@@ -102,6 +126,8 @@ CharacterVirtual::CharacterVirtual(const CharacterVirtualSettings *inSettings, R
 	mRotation(inRotation),
 	mUserData(inUserData)
 {
+	JPH_ASSERT(!mID.IsInvalid());
+
 	// Copy settings
 	SetMaxStrength(inSettings->mMaxStrength);
 	SetMass(inSettings->mMass);
@@ -112,7 +138,18 @@ CharacterVirtual::CharacterVirtual(const CharacterVirtualSettings *inSettings, R
 		BodyCreationSettings settings(inSettings->mInnerBodyShape, GetInnerBodyPosition(), mRotation, EMotionType::Kinematic, inSettings->mInnerBodyLayer);
 		settings.mAllowSleeping = false; // Disable sleeping so that we will receive sensor callbacks
 		settings.mUserData = inUserData;
-		mInnerBodyID = inSystem->GetBodyInterface().CreateAndAddBody(settings, EActivation::Activate);
+
+		const Body *inner_body;
+		BodyInterface &bi = inSystem->GetBodyInterface();
+		if (inSettings->mInnerBodyIDOverride.IsInvalid())
+			inner_body = bi.CreateBody(settings);
+		else
+			inner_body = bi.CreateBodyWithID(inSettings->mInnerBodyIDOverride, settings);
+		if (inner_body != nullptr)
+		{
+			mInnerBodyID = inner_body->GetID();
+			bi.AddBody(mInnerBodyID, EActivation::Activate);
+		}
 	}
 }
 
@@ -192,12 +229,13 @@ void CharacterVirtual::sFillContactProperties(const CharacterVirtual *inCharacte
 	outContact.mMaterial = inCollector.GetContext()->GetMaterial(inResult.mSubShapeID2);
 }
 
-void CharacterVirtual::sFillCharacterContactProperties(Contact &outContact, CharacterVirtual *inOtherCharacter, RVec3Arg inBaseOffset, const CollideShapeResult &inResult)
+void CharacterVirtual::sFillCharacterContactProperties(Contact &outContact, const CharacterVirtual *inOtherCharacter, RVec3Arg inBaseOffset, const CollideShapeResult &inResult)
 {
 	outContact.mPosition = inBaseOffset + inResult.mContactPointOn2;
 	outContact.mLinearVelocity = inOtherCharacter->GetLinearVelocity();
 	outContact.mSurfaceNormal = outContact.mContactNormal = -inResult.mPenetrationAxis.NormalizedOr(Vec3::sZero());
 	outContact.mDistance = -inResult.mPenetrationDepth;
+	outContact.mCharacterIDB = inOtherCharacter->GetID();
 	outContact.mCharacterB = inOtherCharacter;
 	outContact.mSubShapeIDB = inResult.mSubShapeID2;
 	outContact.mMotionTypeB = EMotionType::Kinematic; // Other character is kinematic, we can't directly move it
@@ -294,8 +332,8 @@ void CharacterVirtual::ContactCastCollector::AddHit(const ShapeCastResult &inRes
 		&& inResult.mPenetrationAxis.Dot(mDisplacement) > 0.0f) // Ignore penetrations that we're moving away from
 	{
 		// Test if this contact should be ignored
-		for (const IgnoredContact &c : mIgnoredContacts)
-			if (c.mBodyID == inResult.mBodyID2 && c.mSubShapeID == inResult.mSubShapeID2)
+		for (const ContactKey &c : mIgnoredContacts)
+			if (c.mBodyB == inResult.mBodyID2 && c.mSubShapeIDB == inResult.mSubShapeID2)
 				return;
 
 		Contact contact;
@@ -355,7 +393,7 @@ void CharacterVirtual::CheckCollision(RVec3Arg inPosition, QuatArg inRotation, V
 	auto collide_shape_function = mEnhancedInternalEdgeRemoval? &NarrowPhaseQuery::CollideShapeWithInternalEdgeRemoval : &NarrowPhaseQuery::CollideShape;
 
 	// Collide shape
-	(mSystem->GetNarrowPhaseQuery().*collide_shape_function)(inShape, Vec3::sReplicate(1.0f), transform, settings, inBaseOffset, ioCollector, inBroadPhaseLayerFilter, inObjectLayerFilter, body_filter, inShapeFilter);
+	(mSystem->GetNarrowPhaseQuery().*collide_shape_function)(inShape, Vec3::sOne(), transform, settings, inBaseOffset, ioCollector, inBroadPhaseLayerFilter, inObjectLayerFilter, body_filter, inShapeFilter);
 
 	// Also collide with other characters
 	if (mCharacterVsCharacterCollision != nullptr)
@@ -417,14 +455,14 @@ void CharacterVirtual::RemoveConflictingContacts(TempContactList &ioContacts, Ig
 					if (contact1.mDistance < contact2.mDistance)
 					{
 						// Discard the 2nd contact
-						outIgnoredContacts.emplace_back(contact2.mBodyB, contact2.mSubShapeIDB);
+						outIgnoredContacts.emplace_back(contact2);
 						ioContacts.erase(ioContacts.begin() + c2);
 						c2--;
 					}
 					else
 					{
 						// Discard the first contact
-						outIgnoredContacts.emplace_back(contact1.mBodyB, contact1.mSubShapeIDB);
+						outIgnoredContacts.emplace_back(contact1);
 						ioContacts.erase(ioContacts.begin() + c1);
 						c1--;
 						break;
@@ -445,14 +483,38 @@ bool CharacterVirtual::ValidateContact(const Contact &inContact) const
 		return mListener->OnContactValidate(this, inContact.mBodyB, inContact.mSubShapeIDB);
 }
 
-void CharacterVirtual::ContactAdded(const Contact &inContact, CharacterContactSettings &ioSettings) const
+void CharacterVirtual::ContactAdded(const Contact &inContact, CharacterContactSettings &ioSettings)
 {
 	if (mListener != nullptr)
 	{
-		if (inContact.mCharacterB != nullptr)
-			mListener->OnCharacterContactAdded(this, inContact.mCharacterB, inContact.mSubShapeIDB, inContact.mPosition, -inContact.mContactNormal, ioSettings);
+		// Check if we already know this contact
+		ListenerContacts::iterator it = mListenerContacts.find(inContact);
+		if (it != mListenerContacts.end())
+		{
+			// Max 1 contact persisted callback
+			if (++it->second.mCount == 1)
+			{
+				if (inContact.mCharacterB != nullptr)
+					mListener->OnCharacterContactPersisted(this, inContact.mCharacterB, inContact.mSubShapeIDB, inContact.mPosition, -inContact.mContactNormal, ioSettings);
+				else
+					mListener->OnContactPersisted(this, inContact.mBodyB, inContact.mSubShapeIDB, inContact.mPosition, -inContact.mContactNormal, ioSettings);
+				it->second.mSettings = ioSettings;
+			}
+			else
+			{
+				// Reuse the settings from the last call
+				ioSettings = it->second.mSettings;
+			}
+		}
 		else
-			mListener->OnContactAdded(this, inContact.mBodyB, inContact.mSubShapeIDB, inContact.mPosition, -inContact.mContactNormal, ioSettings);
+		{
+			// New contact
+			if (inContact.mCharacterB != nullptr)
+				mListener->OnCharacterContactAdded(this, inContact.mCharacterB, inContact.mSubShapeIDB, inContact.mPosition, -inContact.mContactNormal, ioSettings);
+			else
+				mListener->OnContactAdded(this, inContact.mBodyB, inContact.mSubShapeIDB, inContact.mPosition, -inContact.mContactNormal, ioSettings);
+			mListenerContacts.insert(ListenerContacts::value_type(inContact, ioSettings));
+		}
 	}
 }
 
@@ -517,7 +579,7 @@ bool CharacterVirtual::GetFirstContactForSweep(RVec3Arg inPosition, Vec3Arg inDi
 	RVec3 base_offset = start.GetTranslation();
 	ContactCastCollector collector(mSystem, this, inDisplacement, mUp, inIgnoredContacts, base_offset, contact);
 	collector.ResetEarlyOutFraction(contact.mFraction);
-	RShapeCast shape_cast(mShape, Vec3::sReplicate(1.0f), start, inDisplacement);
+	RShapeCast shape_cast(mShape, Vec3::sOne(), start, inDisplacement);
 	mSystem->GetNarrowPhaseQuery().CastShape(shape_cast, settings, base_offset, collector, inBroadPhaseLayerFilter, inObjectLayerFilter, body_filter, inShapeFilter);
 
 	// Also collide with other characters
@@ -527,7 +589,7 @@ bool CharacterVirtual::GetFirstContactForSweep(RVec3Arg inPosition, Vec3Arg inDi
 		mCharacterVsCharacterCollision->CastCharacter(this, start, inDisplacement, settings, base_offset, collector);
 	}
 
-	if (contact.mBodyB.IsInvalid() && contact.mCharacterB == nullptr)
+	if (contact.mBodyB.IsInvalid() && contact.mCharacterIDB.IsInvalid())
 		return false;
 
 	// Store contact
@@ -562,7 +624,7 @@ bool CharacterVirtual::GetFirstContactForSweep(RVec3Arg inPosition, Vec3Arg inDi
 		AddConvexRadius add_cvx(polygon, character_padding);
 
 		// Correct fraction to hit this inflated face instead of the inner shape
-		corrected = sCorrectFractionForCharacterPadding(mShape, start.GetRotation(), inDisplacement, Vec3::sReplicate(1.0f), add_cvx, outContact.mFraction);
+		corrected = sCorrectFractionForCharacterPadding(mShape, start.GetRotation(), inDisplacement, Vec3::sOne(), add_cvx, outContact.mFraction);
 	}
 	if (!corrected)
 	{
@@ -619,7 +681,7 @@ void CharacterVirtual::DetermineConstraints(TempContactList &inContacts, float i
 	}
 }
 
-bool CharacterVirtual::HandleContact(Vec3Arg inVelocity, Constraint &ioConstraint, float inDeltaTime) const
+bool CharacterVirtual::HandleContact(Vec3Arg inVelocity, Constraint &ioConstraint, float inDeltaTime)
 {
 	Contact &contact = *ioConstraint.mContact;
 
@@ -627,6 +689,9 @@ bool CharacterVirtual::HandleContact(Vec3Arg inVelocity, Constraint &ioConstrain
 	if (!ValidateContact(contact))
 		return false;
 
+	// We collided
+	contact.mHadCollision = true;
+
 	// Send contact added event
 	CharacterContactSettings settings;
 	ContactAdded(contact, settings);
@@ -691,7 +756,7 @@ void CharacterVirtual::SolveConstraints(Vec3Arg inVelocity, float inDeltaTime, f
 #ifdef JPH_DEBUG_RENDERER
 	, bool inDrawConstraints
 #endif // JPH_DEBUG_RENDERER
-	) const
+	)
 {
 	// If there are no constraints we can immediately move to our target
 	if (ioConstraints.empty())
@@ -784,21 +849,16 @@ void CharacterVirtual::SolveConstraints(Vec3Arg inVelocity, float inDeltaTime, f
 			if (c->mContact->mWasDiscarded)
 				continue;
 
-			// Check if we made contact with this before
-			if (!c->mContact->mHadCollision)
+			// Handle the contact
+			if (!c->mContact->mHadCollision
+				&& !HandleContact(velocity, *c, inDeltaTime))
 			{
-				// Handle the contact
-				if (!HandleContact(velocity, *c, inDeltaTime))
-				{
-					// Constraint should be ignored, remove it from the list
-					c->mContact->mWasDiscarded = true;
+				// Constraint should be ignored, remove it from the list
+				c->mContact->mWasDiscarded = true;
 
-					// Mark it as ignored for GetFirstContactForSweep
-					ioIgnoredContacts.emplace_back(c->mContact->mBodyB, c->mContact->mSubShapeIDB);
-					continue;
-				}
-
-				c->mContact->mHadCollision = true;
+				// Mark it as ignored for GetFirstContactForSweep
+				ioIgnoredContacts.emplace_back(*c->mContact);
+				continue;
 			}
 
 			// Cancel velocity of constraint if it cannot push the character
@@ -959,8 +1019,12 @@ void CharacterVirtual::UpdateSupportingContact(bool inSkipContactVelocityCheck,
 			&& c.mDistance < mCollisionTolerance
 			&& (inSkipContactVelocityCheck || c.mSurfaceNormal.Dot(mLinearVelocity - c.mLinearVelocity) <= 1.0e-4f))
 		{
-			if (ValidateContact(c) && !c.mIsSensorB)
+			if (ValidateContact(c))
+			{
+				CharacterContactSettings dummy;
+				ContactAdded(c, dummy);
 				c.mHadCollision = true;
+			}
 			else
 				c.mWasDiscarded = true;
 		}
@@ -979,7 +1043,7 @@ void CharacterVirtual::UpdateSupportingContact(bool inSkipContactVelocityCheck,
 	const Contact *deepest_contact = nullptr;
 	float smallest_distance = FLT_MAX;
 	for (const Contact &c : mActiveContacts)
-		if (c.mHadCollision)
+		if (c.mHadCollision && !c.mWasDiscarded)
 		{
 			// Calculate the angle between the plane normal and the up direction
 			float cos_angle = c.mSurfaceNormal.Dot(mUp);
@@ -1127,16 +1191,20 @@ void CharacterVirtual::UpdateSupportingContact(bool inSkipContactVelocityCheck,
 
 void CharacterVirtual::StoreActiveContacts(const TempContactList &inContacts, TempAllocator &inAllocator)
 {
+	StartTrackingContactChanges();
+
 	mActiveContacts.assign(inContacts.begin(), inContacts.end());
 
 	UpdateSupportingContact(true, inAllocator);
+
+	FinishTrackingContactChanges();
 }
 
 void CharacterVirtual::MoveShape(RVec3 &ioPosition, Vec3Arg inVelocity, float inDeltaTime, ContactList *outActiveContacts, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter, TempAllocator &inAllocator
 #ifdef JPH_DEBUG_RENDERER
 	, bool inDrawConstraints
 #endif // JPH_DEBUG_RENDERER
-	) const
+	)
 {
 	JPH_DET_LOG("CharacterVirtual::MoveShape: pos: " << ioPosition << " vel: " << inVelocity << " dt: " << inDeltaTime);
 
@@ -1237,6 +1305,7 @@ Vec3 CharacterVirtual::CancelVelocityTowardsSteepSlopes(Vec3Arg inDesiredVelocit
 	Vec3 desired_velocity = inDesiredVelocity;
 	for (const Contact &c : mActiveContacts)
 		if (c.mHadCollision
+			&& !c.mWasDiscarded
 			&& IsSlopeTooSteep(c.mSurfaceNormal))
 		{
 			// Note that we use the contact normal to allow for better sliding as the surface normal may be in the opposite direction of movement.
@@ -1253,12 +1322,72 @@ Vec3 CharacterVirtual::CancelVelocityTowardsSteepSlopes(Vec3Arg inDesiredVelocit
 	return desired_velocity;
 }
 
+void CharacterVirtual::StartTrackingContactChanges()
+{
+	// Check if we're starting for the first time
+	if (++mTrackingContactChanges > 1)
+		return;
+
+	// No need to track anything if we don't have a listener
+	JPH_ASSERT(mListenerContacts.empty());
+	if (mListener == nullptr)
+		return;
+
+	// Mark all current contacts as not seen
+	mListenerContacts.reserve(ListenerContacts::size_type(mActiveContacts.size()));
+	for (const Contact &c : mActiveContacts)
+		if (c.mHadCollision)
+			mListenerContacts.insert(ListenerContacts::value_type(c, ListenerContactValue()));
+}
+
+void CharacterVirtual::FinishTrackingContactChanges()
+{
+	// Check if we have to do anything
+	int count = --mTrackingContactChanges;
+	JPH_ASSERT(count >= 0, "Called FinishTrackingContactChanges more times than StartTrackingContactChanges");
+	if (count > 0)
+		return;
+
+	// No need to track anything if we don't have a listener
+	if (mListener == nullptr)
+		return;
+
+	// Since we can do multiple operations (e.g. Update followed by WalkStairs)
+	// we can end up with contacts that were marked as active to the listener but that are
+	// no longer in the active contact list. We go over all contacts and mark them again
+	// to ensure that these lists are in sync.
+	for (ListenerContacts::value_type &c : mListenerContacts)
+		c.second.mCount = 0;
+	for (const Contact &c : mActiveContacts)
+		if (c.mHadCollision)
+		{
+			ListenerContacts::iterator it = mListenerContacts.find(c);
+			JPH_ASSERT(it != mListenerContacts.end());
+			it->second.mCount = 1;
+		}
+
+	// Call contact removal callbacks
+	for (ListenerContacts::iterator it = mListenerContacts.begin(); it != mListenerContacts.end(); ++it)
+		if (it->second.mCount == 0)
+		{
+			const ContactKey &c = it->first;
+			if (!c.mCharacterIDB.IsInvalid())
+				mListener->OnCharacterContactRemoved(this, c.mCharacterIDB, c.mSubShapeIDB);
+			else
+				mListener->OnContactRemoved(this, c.mBodyB, c.mSubShapeIDB);
+		}
+	mListenerContacts.ClearAndKeepMemory();
+}
+
 void CharacterVirtual::Update(float inDeltaTime, Vec3Arg inGravity, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter, TempAllocator &inAllocator)
 {
 	// If there's no delta time, we don't need to do anything
 	if (inDeltaTime <= 0.0f)
 		return;
 
+	StartTrackingContactChanges();
+	JPH_SCOPE_EXIT([this]() { FinishTrackingContactChanges(); });
+
 	// Remember delta time for checking if we're supported by the ground
 	mLastDeltaTime = inDeltaTime;
 
@@ -1405,6 +1534,7 @@ bool CharacterVirtual::CanWalkStairs(Vec3Arg inLinearVelocity) const
 	// Check contacts for steep slopes
 	for (const Contact &c : mActiveContacts)
 		if (c.mHadCollision
+			&& !c.mWasDiscarded
 			&& c.mSurfaceNormal.Dot(horizontal_velocity - c.mLinearVelocity) < 0.0f // Pushing into the contact
 			&& IsSlopeTooSteep(c.mSurfaceNormal)) // Slope too steep
 			return true;
@@ -1414,6 +1544,9 @@ bool CharacterVirtual::CanWalkStairs(Vec3Arg inLinearVelocity) const
 
 bool CharacterVirtual::WalkStairs(float inDeltaTime, Vec3Arg inStepUp, Vec3Arg inStepForward, Vec3Arg inStepForwardTest, Vec3Arg inStepDownExtra, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter, TempAllocator &inAllocator)
 {
+	StartTrackingContactChanges();
+	JPH_SCOPE_EXIT([this]() { FinishTrackingContactChanges(); });
+
 	// Move up
 	Vec3 up = inStepUp;
 	Contact contact;
@@ -1442,6 +1575,7 @@ bool CharacterVirtual::WalkStairs(float inDeltaTime, Vec3Arg inStepUp, Vec3Arg i
 	steep_slope_normals.reserve(mActiveContacts.size());
 	for (const Contact &c : mActiveContacts)
 		if (c.mHadCollision
+			&& !c.mWasDiscarded
 			&& c.mSurfaceNormal.Dot(horizontal_velocity - c.mLinearVelocity) < 0.0f // Pushing into the contact
 			&& IsSlopeTooSteep(c.mSurfaceNormal)) // Slope too steep
 			steep_slope_normals.push_back(c.mSurfaceNormal);
@@ -1490,7 +1624,7 @@ bool CharacterVirtual::WalkStairs(float inDeltaTime, Vec3Arg inStepUp, Vec3Arg i
 		RVec3 debug_pos = new_position + contact.mFraction * down;
 		DebugRenderer::sInstance->DrawArrow(new_position, debug_pos, Color::sWhite, 0.01f);
 		DebugRenderer::sInstance->DrawArrow(contact.mPosition, contact.mPosition + contact.mSurfaceNormal, Color::sWhite, 0.01f);
-		mShape->Draw(DebugRenderer::sInstance, GetCenterOfMassTransform(debug_pos, mRotation, mShape), Vec3::sReplicate(1.0f), Color::sWhite, false, true);
+		mShape->Draw(DebugRenderer::sInstance, GetCenterOfMassTransform(debug_pos, mRotation, mShape), Vec3::sOne(), Color::sWhite, false, true);
 	}
 #endif // JPH_DEBUG_RENDERER
 
@@ -1528,7 +1662,7 @@ bool CharacterVirtual::WalkStairs(float inDeltaTime, Vec3Arg inStepUp, Vec3Arg i
 			RVec3 debug_pos = test_position + test_contact.mFraction * down;
 			DebugRenderer::sInstance->DrawArrow(test_position, debug_pos, Color::sCyan, 0.01f);
 			DebugRenderer::sInstance->DrawArrow(test_contact.mPosition, test_contact.mPosition + test_contact.mSurfaceNormal, Color::sCyan, 0.01f);
-			mShape->Draw(DebugRenderer::sInstance, GetCenterOfMassTransform(debug_pos, mRotation, mShape), Vec3::sReplicate(1.0f), Color::sCyan, false, true);
+			mShape->Draw(DebugRenderer::sInstance, GetCenterOfMassTransform(debug_pos, mRotation, mShape), Vec3::sOne(), Color::sCyan, false, true);
 		}
 	#endif // JPH_DEBUG_RENDERER
 
@@ -1551,6 +1685,9 @@ bool CharacterVirtual::WalkStairs(float inDeltaTime, Vec3Arg inStepUp, Vec3Arg i
 
 bool CharacterVirtual::StickToFloor(Vec3Arg inStepDown, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter, TempAllocator &inAllocator)
 {
+	StartTrackingContactChanges();
+	JPH_SCOPE_EXIT([this]() { FinishTrackingContactChanges(); });
+
 	// Try to find the floor
 	Contact contact;
 	IgnoredContactList dummy_ignored_contacts(inAllocator);
@@ -1565,7 +1702,7 @@ bool CharacterVirtual::StickToFloor(Vec3Arg inStepDown, const BroadPhaseLayerFil
 	if (sDrawStickToFloor)
 	{
 		DebugRenderer::sInstance->DrawArrow(mPosition, new_position, Color::sOrange, 0.01f);
-		mShape->Draw(DebugRenderer::sInstance, GetCenterOfMassTransform(new_position, mRotation, mShape), Vec3::sReplicate(1.0f), Color::sOrange, false, true);
+		mShape->Draw(DebugRenderer::sInstance, GetCenterOfMassTransform(new_position, mRotation, mShape), Vec3::sOne(), Color::sOrange, false, true);
 	}
 #endif // JPH_DEBUG_RENDERER
 
@@ -1576,6 +1713,9 @@ bool CharacterVirtual::StickToFloor(Vec3Arg inStepDown, const BroadPhaseLayerFil
 
 void CharacterVirtual::ExtendedUpdate(float inDeltaTime, Vec3Arg inGravity, const ExtendedUpdateSettings &inSettings, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter, TempAllocator &inAllocator)
 {
+	StartTrackingContactChanges();
+	JPH_SCOPE_EXIT([this]() { FinishTrackingContactChanges(); });
+
 	// Update the velocity
 	Vec3 desired_velocity = mLinearVelocity;
 	mLinearVelocity = CancelVelocityTowardsSteepSlopes(desired_velocity);
@@ -1652,37 +1792,54 @@ void CharacterVirtual::ExtendedUpdate(float inDeltaTime, Vec3Arg inGravity, cons
 	}
 }
 
+void CharacterVirtual::ContactKey::SaveState(StateRecorder &inStream) const
+{
+	inStream.Write(mBodyB);
+	inStream.Write(mCharacterIDB);
+	inStream.Write(mSubShapeIDB);
+}
+
+void CharacterVirtual::ContactKey::RestoreState(StateRecorder &inStream)
+{
+	inStream.Read(mBodyB);
+	inStream.Read(mCharacterIDB);
+	inStream.Read(mSubShapeIDB);
+}
+
 void CharacterVirtual::Contact::SaveState(StateRecorder &inStream) const
 {
+	ContactKey::SaveState(inStream);
+
 	inStream.Write(mPosition);
 	inStream.Write(mLinearVelocity);
 	inStream.Write(mContactNormal);
 	inStream.Write(mSurfaceNormal);
 	inStream.Write(mDistance);
 	inStream.Write(mFraction);
-	inStream.Write(mBodyB);
-	inStream.Write(mSubShapeIDB);
 	inStream.Write(mMotionTypeB);
+	inStream.Write(mIsSensorB);
 	inStream.Write(mHadCollision);
 	inStream.Write(mWasDiscarded);
 	inStream.Write(mCanPushCharacter);
-	// Cannot store user data (may be a pointer) and material
+	// Cannot store pointers to character B, user data and material
 }
 
 void CharacterVirtual::Contact::RestoreState(StateRecorder &inStream)
 {
+	ContactKey::RestoreState(inStream);
+
 	inStream.Read(mPosition);
 	inStream.Read(mLinearVelocity);
 	inStream.Read(mContactNormal);
 	inStream.Read(mSurfaceNormal);
 	inStream.Read(mDistance);
 	inStream.Read(mFraction);
-	inStream.Read(mBodyB);
-	inStream.Read(mSubShapeIDB);
 	inStream.Read(mMotionTypeB);
+	inStream.Read(mIsSensorB);
 	inStream.Read(mHadCollision);
 	inStream.Read(mWasDiscarded);
 	inStream.Read(mCanPushCharacter);
+	mCharacterB = nullptr; // Cannot restore character B
 	mUserData = 0; // Cannot restore user data
 	mMaterial = PhysicsMaterial::sDefault; // Cannot restore material
 }
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h
index 65b8f89d..e7a5b749 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Character/CharacterVirtual.h
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <Jolt/Physics/Character/CharacterBase.h>
+#include <Jolt/Physics/Character/CharacterID.h>
 #include <Jolt/Physics/Body/MotionType.h>
 #include <Jolt/Physics/Body/BodyFilter.h>
 #include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
@@ -23,6 +24,9 @@ class JPH_EXPORT CharacterVirtualSettings : public CharacterBaseSettings
 public:
 	JPH_OVERRIDE_NEW_DELETE
 
+	/// ID to give to this character. This is used for deterministically sorting and as an identifier to represent the character in the contact removal callback.
+	CharacterID							mID = CharacterID::sNextCharacterID();
+
 	/// Character mass (kg). Used to push down objects with gravity when the character is standing on top.
 	float								mMass = 70.0f;
 
@@ -50,6 +54,10 @@ public:
 	/// - Fast moving objects of motion quality LinearCast will not be able to pass through the CharacterVirtual in 1 time step
 	RefConst<Shape>						mInnerBodyShape;
 
+	/// For a deterministic simulation, it is important to have a deterministic body ID. When set and when mInnerBodyShape is specified,
+	/// the inner body will be created with this specified ID instead of a generated ID.
+	BodyID								mInnerBodyIDOverride;
+
 	/// Layer that the inner rigid body will be added to
 	ObjectLayer							mInnerBodyLayer = 0;
 };
@@ -84,7 +92,7 @@ public:
 	/// Same as OnContactValidate but when colliding with a CharacterVirtual
 	virtual bool						OnCharacterContactValidate(const CharacterVirtual *inCharacter, const CharacterVirtual *inOtherCharacter, const SubShapeID &inSubShapeID2) { return true; }
 
-	/// Called whenever the character collides with a body.
+	/// Called whenever the character collides with a body for the first time.
 	/// @param inCharacter Character that is being solved
 	/// @param inBodyID2 Body ID of body that is being hit
 	/// @param inSubShapeID2 Sub shape ID of shape that is being hit
@@ -93,9 +101,32 @@ public:
 	/// @param ioSettings Settings returned by the contact callback to indicate how the character should behave
 	virtual void						OnContactAdded(const CharacterVirtual *inCharacter, const BodyID &inBodyID2, const SubShapeID &inSubShapeID2, RVec3Arg inContactPosition, Vec3Arg inContactNormal, CharacterContactSettings &ioSettings) { /* Default do nothing */ }
 
+	/// Called whenever the character persists colliding with a body.
+	/// @param inCharacter Character that is being solved
+	/// @param inBodyID2 Body ID of body that is being hit
+	/// @param inSubShapeID2 Sub shape ID of shape that is being hit
+	/// @param inContactPosition World space contact position
+	/// @param inContactNormal World space contact normal
+	/// @param ioSettings Settings returned by the contact callback to indicate how the character should behave
+	virtual void						OnContactPersisted(const CharacterVirtual *inCharacter, const BodyID &inBodyID2, const SubShapeID &inSubShapeID2, RVec3Arg inContactPosition, Vec3Arg inContactNormal, CharacterContactSettings &ioSettings) { /* Default do nothing */ }
+
+	/// Called whenever the character loses contact with a body.
+	/// Note that there is no guarantee that the body or its sub shape still exists at this point. The body may have been deleted since the last update.
+	/// @param inCharacter Character that is being solved
+	/// @param inBodyID2 Body ID of body that is being hit
+	/// @param inSubShapeID2 Sub shape ID of shape that is being hit
+	virtual void						OnContactRemoved(const CharacterVirtual *inCharacter, const BodyID &inBodyID2, const SubShapeID &inSubShapeID2) { /* Default do nothing */ }
+
 	/// Same as OnContactAdded but when colliding with a CharacterVirtual
 	virtual void						OnCharacterContactAdded(const CharacterVirtual *inCharacter, const CharacterVirtual *inOtherCharacter, const SubShapeID &inSubShapeID2, RVec3Arg inContactPosition, Vec3Arg inContactNormal, CharacterContactSettings &ioSettings) { /* Default do nothing */ }
 
+	/// Same as OnContactPersisted but when colliding with a CharacterVirtual
+	virtual void						OnCharacterContactPersisted(const CharacterVirtual *inCharacter, const CharacterVirtual *inOtherCharacter, const SubShapeID &inSubShapeID2, RVec3Arg inContactPosition, Vec3Arg inContactNormal, CharacterContactSettings &ioSettings) { /* Default do nothing */ }
+
+	/// Same as OnContactRemoved but when colliding with a CharacterVirtual
+	/// Note that inOtherCharacterID can be the ID of a character that has been deleted. This happens if the character was in contact with this character during the last update, but has been deleted since.
+	virtual void						OnCharacterContactRemoved(const CharacterVirtual *inCharacter, const CharacterID &inOtherCharacterID, const SubShapeID &inSubShapeID2) { /* Default do nothing */ }
+
 	/// Called whenever a contact is being used by the solver. Allows the listener to override the resulting character velocity (e.g. by preventing sliding along certain surfaces).
 	/// @param inCharacter Character that is being solved
 	/// @param inBodyID2 Body ID of body that is being hit
@@ -139,6 +170,8 @@ public:
 };
 
 /// Simple collision checker that loops over all registered characters.
+/// This is a brute force checking algorithm. If you have a lot of characters you may want to store your characters
+/// in a hierarchical structure to make this more efficient.
 /// Note that this is not thread safe, so make sure that only one CharacterVirtual is checking collision at a time.
 class JPH_EXPORT CharacterVsCharacterCollisionSimple : public CharacterVsCharacterCollision
 {
@@ -159,8 +192,9 @@ public:
 /// Runtime character object.
 /// This object usually represents the player. Contrary to the Character class it doesn't use a rigid body but moves doing collision checks only (hence the name virtual).
 /// The advantage of this is that you can determine when the character moves in the frame (usually this has to happen at a very particular point in the frame)
-/// but the downside is that other objects don't see this virtual character. In order to make this work it is recommended to pair a CharacterVirtual with a Character that
-/// moves along. This Character should be keyframed (or at least have no gravity) and move along with the CharacterVirtual so that other rigid bodies can collide with it.
+/// but the downside is that other objects don't see this virtual character. To make a CharacterVirtual visible to the simulation, you can optionally create an inner
+/// rigid body through CharacterVirtualSettings::mInnerBodyShape. A CharacterVirtual is not tracked by the PhysicsSystem so you need to update it yourself. This also means
+/// that a call to PhysicsSystem::SaveState will not save its state, you need to call CharacterVirtual::SaveState yourself.
 class JPH_EXPORT CharacterVirtual : public CharacterBase
 {
 public:
@@ -180,6 +214,9 @@ public:
 	/// Destructor
 	virtual								~CharacterVirtual() override;
 
+	/// The ID of this character
+	inline const CharacterID &			GetID() const											{ return mID; }
+
 	/// Set the contact listener
 	void								SetListener(CharacterContactListener *inListener)		{ mListener = inListener; }
 
@@ -266,6 +303,15 @@ public:
 	/// @return A new velocity vector that won't make the character move up steep slopes
 	Vec3								CancelVelocityTowardsSteepSlopes(Vec3Arg inDesiredVelocity) const;
 
+	/// This function is internally called by Update, WalkStairs, StickToFloor and ExtendedUpdate and is responsible for tracking if contacts are added, persisted or removed.
+	/// If you want to do multiple operations on a character (e.g. first Update then WalkStairs), you can surround the code with a StartTrackingContactChanges and FinishTrackingContactChanges pair
+	/// to only receive a single callback per contact on the CharacterContactListener. If you don't do this then you could for example receive a contact added callback during the Update and a
+	/// contact persisted callback during WalkStairs.
+	void								StartTrackingContactChanges();
+
+	/// This call triggers contact removal callbacks and is used in conjunction with StartTrackingContactChanges.
+	void								FinishTrackingContactChanges();
+
 	/// This is the main update function. It moves the character according to its current velocity (the character is similar to a kinematic body in the sense
 	/// that you set the velocity and the character will follow unless collision is blocking the way). Note it's your own responsibility to apply gravity to the character velocity!
 	/// Different surface materials (like ice) can be emulated by getting the ground material and adjusting the velocity and/or the max slope angle accordingly every frame.
@@ -383,15 +429,53 @@ public:
 	static inline bool					sDrawStickToFloor = false;								///< Draw the state of the stick to floor algorithm
 #endif
 
-	// Encapsulates a collision contact
-	struct Contact
+	/// Uniquely identifies a contact between a character and another body or character
+	class ContactKey
 	{
+	public:
+		/// Constructor
+										ContactKey() = default;
+										ContactKey(const ContactKey &inContact) = default;
+										ContactKey(const BodyID &inBodyB, const SubShapeID &inSubShapeID) : mBodyB(inBodyB), mSubShapeIDB(inSubShapeID) { }
+										ContactKey(const CharacterID &inCharacterIDB, const SubShapeID &inSubShapeID) : mCharacterIDB(inCharacterIDB), mSubShapeIDB(inSubShapeID) { }
+		ContactKey &					operator = (const ContactKey &inContact) = default;
+
+		/// Checks if two contacts refer to the same body (or virtual character)
+		inline bool						IsSameBody(const ContactKey &inOther) const				{ return mBodyB == inOther.mBodyB && mCharacterIDB == inOther.mCharacterIDB; }
+
+		/// Equality operator
+		bool							operator == (const ContactKey &inRHS) const
+		{
+			return mBodyB == inRHS.mBodyB && mCharacterIDB == inRHS.mCharacterIDB && mSubShapeIDB == inRHS.mSubShapeIDB;
+		}
+
+		bool							operator != (const ContactKey &inRHS) const
+		{
+			return !(*this == inRHS);
+		}
+
+		/// Hash of this structure
+		uint64							GetHash() const
+		{
+			static_assert(sizeof(BodyID) + sizeof(CharacterID) + sizeof(SubShapeID) == sizeof(ContactKey), "No padding expected");
+			return HashBytes(this, sizeof(ContactKey));
+		}
+
 		// Saving / restoring state for replay
 		void							SaveState(StateRecorder &inStream) const;
 		void							RestoreState(StateRecorder &inStream);
 
-		// Checks if two contacts refer to the same body (or virtual character)
-		inline bool						IsSameBody(const Contact &inOther) const				{ return mBodyB == inOther.mBodyB && mCharacterB == inOther.mCharacterB; }
+		BodyID							mBodyB;													///< ID of body we're colliding with (if not invalid)
+		CharacterID						mCharacterIDB;											///< Character we're colliding with (if not invalid)
+		SubShapeID						mSubShapeIDB;											///< Sub shape ID of body or character we're colliding with
+	};
+
+	/// Encapsulates a collision contact
+	struct Contact : public ContactKey
+	{
+		// Saving / restoring state for replay
+		void							SaveState(StateRecorder &inStream) const;
+		void							RestoreState(StateRecorder &inStream);
 
 		RVec3							mPosition;												///< Position where the character makes contact
 		Vec3							mLinearVelocity;										///< Velocity of the contact point
@@ -399,15 +483,13 @@ public:
 		Vec3							mSurfaceNormal;											///< Surface normal of the contact
 		float							mDistance;												///< Distance to the contact <= 0 means that it is an actual contact, > 0 means predictive
 		float							mFraction;												///< Fraction along the path where this contact takes place
-		BodyID							mBodyB;													///< ID of body we're colliding with (if not invalid)
-		CharacterVirtual *				mCharacterB = nullptr;									///< Character we're colliding with (if not null)
-		SubShapeID						mSubShapeIDB;											///< Sub shape ID of body we're colliding with
 		EMotionType						mMotionTypeB;											///< Motion type of B, used to determine the priority of the contact
 		bool							mIsSensorB;												///< If B is a sensor
+		const CharacterVirtual *		mCharacterB = nullptr;									///< Character we're colliding with (if not nullptr). Note that this may be a dangling pointer when accessed through GetActiveContacts(), use mCharacterIDB instead.
 		uint64							mUserData;												///< User data of B
 		const PhysicsMaterial *			mMaterial;												///< Material of B
 		bool							mHadCollision = false;									///< If the character actually collided with the contact (can be false if a predictive contact never becomes a real one)
-		bool							mWasDiscarded = false;									///< If the contact validate callback chose to discard this contact
+		bool							mWasDiscarded = false;									///< If the contact validate callback chose to discard this contact or when the body is a sensor
 		bool							mCanPushCharacter = true;								///< When true, the velocity of the contact point can push the character
 	};
 
@@ -415,9 +497,10 @@ public:
 	using ContactList = Array<Contact>;
 
 	/// Access to the internal list of contacts that the character has found.
+	/// Note that only contacts that have their mHadCollision flag set are actual contacts.
 	const ContactList &					GetActiveContacts() const								{ return mActiveContacts; }
 
-	/// Check if the character is currently in contact with or has collided with another body in the last time step
+	/// Check if the character is currently in contact with or has collided with another body in the last operation (e.g. Update or WalkStairs)
 	bool								HasCollidedWith(const BodyID &inBody) const
 	{
 		for (const CharacterVirtual::Contact &c : mActiveContacts)
@@ -426,15 +509,21 @@ public:
 		return false;
 	}
 
-	/// Check if the character is currently in contact with or has collided with another character in the last time step
-	bool								HasCollidedWith(const CharacterVirtual *inCharacter) const
+	/// Check if the character is currently in contact with or has collided with another character in the last time step (e.g. Update or WalkStairs)
+	bool								HasCollidedWith(const CharacterID &inCharacterID) const
 	{
 		for (const CharacterVirtual::Contact &c : mActiveContacts)
-			if (c.mHadCollision && c.mCharacterB == inCharacter)
+			if (c.mHadCollision && c.mCharacterIDB == inCharacterID)
 				return true;
 		return false;
 	}
 
+	/// Check if the character is currently in contact with or has collided with another character in the last time step (e.g. Update or WalkStairs)
+	bool								HasCollidedWith(const CharacterVirtual *inCharacter) const
+	{
+		return HasCollidedWith(inCharacter->GetID());
+	}
+
 private:
 	// Sorting predicate for making contact order deterministic
 	struct ContactOrderingPredicate
@@ -444,21 +533,14 @@ private:
 			if (inLHS.mBodyB != inRHS.mBodyB)
 				return inLHS.mBodyB < inRHS.mBodyB;
 
+			if (inLHS.mCharacterIDB != inRHS.mCharacterIDB)
+				return inLHS.mCharacterIDB < inRHS.mCharacterIDB;
+
 			return inLHS.mSubShapeIDB.GetValue() < inRHS.mSubShapeIDB.GetValue();
 		}
 	};
 
-	// A contact that needs to be ignored
-	struct IgnoredContact
-	{
-										IgnoredContact() = default;
-										IgnoredContact(const BodyID &inBodyID, const SubShapeID &inSubShapeID) : mBodyID(inBodyID), mSubShapeID(inSubShapeID) { }
-
-		BodyID							mBodyID;												///< ID of body we're colliding with
-		SubShapeID						mSubShapeID;											///< Sub shape of body we're colliding with
-	};
-
-	using IgnoredContactList = Array<IgnoredContact, STLTempAllocator<IgnoredContact>>;
+	using IgnoredContactList = Array<ContactKey, STLTempAllocator<ContactKey>>;
 
 	// A constraint that limits the movement of the character
 	struct Constraint
@@ -517,20 +599,20 @@ private:
 	// Helper function to convert a Jolt collision result into a contact
 	template <class taCollector>
 	inline static void					sFillContactProperties(const CharacterVirtual *inCharacter, Contact &outContact, const Body &inBody, Vec3Arg inUp, RVec3Arg inBaseOffset, const taCollector &inCollector, const CollideShapeResult &inResult);
-	inline static void					sFillCharacterContactProperties(Contact &outContact, CharacterVirtual *inOtherCharacter, RVec3Arg inBaseOffset, const CollideShapeResult &inResult);
+	inline static void					sFillCharacterContactProperties(Contact &outContact, const CharacterVirtual *inOtherCharacter, RVec3Arg inBaseOffset, const CollideShapeResult &inResult);
 
 	// Move the shape from ioPosition and try to displace it by inVelocity * inDeltaTime, this will try to slide the shape along the world geometry
 	void								MoveShape(RVec3 &ioPosition, Vec3Arg inVelocity, float inDeltaTime, ContactList *outActiveContacts, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter, TempAllocator &inAllocator
 	#ifdef JPH_DEBUG_RENDERER
 		, bool inDrawConstraints = false
 	#endif // JPH_DEBUG_RENDERER
-		) const;
+		);
 
 	// Ask the callback if inContact is a valid contact point
 	bool								ValidateContact(const Contact &inContact) const;
 
 	// Trigger the contact callback for inContact and get the contact settings
-	void								ContactAdded(const Contact &inContact, CharacterContactSettings &ioSettings) const;
+	void								ContactAdded(const Contact &inContact, CharacterContactSettings &ioSettings);
 
 	// Tests the shape for collision around inPosition
 	void								GetContactsAtPosition(RVec3Arg inPosition, Vec3Arg inMovementDirection, const Shape *inShape, TempContactList &outContacts, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter) const;
@@ -546,7 +628,7 @@ private:
 	#ifdef JPH_DEBUG_RENDERER
 		, bool inDrawConstraints = false
 	#endif // JPH_DEBUG_RENDERER
-		) const;
+		);
 
 	// Get the velocity of a body adjusted by the contact listener
 	void								GetAdjustedBodyVelocity(const Body& inBody, Vec3 &outLinearVelocity, Vec3 &outAngularVelocity) const;
@@ -557,7 +639,7 @@ private:
 	Vec3								CalculateCharacterGroundVelocity(RVec3Arg inCenterOfMass, Vec3Arg inLinearVelocity, Vec3Arg inAngularVelocity, float inDeltaTime) const;
 
 	// Handle contact with physics object that we're colliding against
-	bool								HandleContact(Vec3Arg inVelocity, Constraint &ioConstraint, float inDeltaTime) const;
+	bool								HandleContact(Vec3Arg inVelocity, Constraint &ioConstraint, float inDeltaTime);
 
 	// Does a swept test of the shape from inPosition with displacement inDisplacement, returns true if there was a collision
 	bool								GetFirstContactForSweep(RVec3Arg inPosition, Vec3Arg inDisplacement, Contact &outContact, const IgnoredContactList &inIgnoredContacts, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter) const;
@@ -586,6 +668,9 @@ private:
 	// Move the inner rigid body to the current position
 	void								UpdateInnerBodyTransform();
 
+	// ID
+	CharacterID							mID;
+
 	// Our main listener for contacts
 	CharacterContactListener *			mListener = nullptr;
 
@@ -626,6 +711,22 @@ private:
 	// List of contacts that were active in the last frame
 	ContactList							mActiveContacts;
 
+	// Remembers how often we called StartTrackingContactChanges
+	int									mTrackingContactChanges = 0;
+
+	// View from a contact listener perspective on which contacts have been added/removed
+	struct ListenerContactValue
+	{
+										ListenerContactValue() = default;
+		explicit						ListenerContactValue(const CharacterContactSettings &inSettings) : mSettings(inSettings) { }
+
+		CharacterContactSettings		mSettings;
+		int								mCount = 0;
+	};
+
+	using ListenerContacts = UnorderedMap<ContactKey, ListenerContactValue>;
+	ListenerContacts					mListenerContacts;
+
 	// Remembers the delta time of the last update
 	float								mLastDeltaTime = 1.0f / 60.0f;
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuadTree.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuadTree.cpp
index 3e11a90c..bd26a2cf 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuadTree.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/BroadPhaseQuadTree.cpp
@@ -155,7 +155,8 @@ BroadPhase::AddState BroadPhaseQuadTree::AddBodiesPrepare(BodyID *ioBodies, int
 {
 	JPH_PROFILE_FUNCTION();
 
-	JPH_ASSERT(inNumber > 0);
+	if (inNumber <= 0)
+		return nullptr;
 
 	const BodyVector &bodies = mBodyManager->GetBodies();
 	JPH_ASSERT(mMaxBodies == mBodyManager->GetMaxBodies());
@@ -208,6 +209,12 @@ void BroadPhaseQuadTree::AddBodiesFinalize(BodyID *ioBodies, int inNumber, AddSt
 {
 	JPH_PROFILE_FUNCTION();
 
+	if (inNumber <= 0)
+	{
+		JPH_ASSERT(inAddState == nullptr);
+		return;
+	}
+
 	// This cannot run concurrently with UpdatePrepare()/UpdateFinalize()
 	SharedLock lock(mUpdateMutex JPH_IF_ENABLE_ASSERTS(, mLockContext, EPhysicsLockTypes::BroadPhaseUpdate));
 
@@ -244,6 +251,12 @@ void BroadPhaseQuadTree::AddBodiesAbort(BodyID *ioBodies, int inNumber, AddState
 {
 	JPH_PROFILE_FUNCTION();
 
+	if (inNumber <= 0)
+	{
+		JPH_ASSERT(inAddState == nullptr);
+		return;
+	}
+
 	JPH_IF_ENABLE_ASSERTS(const BodyVector &bodies = mBodyManager->GetBodies();)
 	JPH_ASSERT(mMaxBodies == mBodyManager->GetMaxBodies());
 
@@ -278,11 +291,12 @@ void BroadPhaseQuadTree::RemoveBodies(BodyID *ioBodies, int inNumber)
 {
 	JPH_PROFILE_FUNCTION();
 
+	if (inNumber <= 0)
+		return;
+
 	// This cannot run concurrently with UpdatePrepare()/UpdateFinalize()
 	SharedLock lock(mUpdateMutex JPH_IF_ENABLE_ASSERTS(, mLockContext, EPhysicsLockTypes::BroadPhaseUpdate));
 
-	JPH_ASSERT(inNumber > 0);
-
 	BodyVector &bodies = mBodyManager->GetBodies();
 	JPH_ASSERT(mMaxBodies == mBodyManager->GetMaxBodies());
 
@@ -325,7 +339,8 @@ void BroadPhaseQuadTree::NotifyBodiesAABBChanged(BodyID *ioBodies, int inNumber,
 {
 	JPH_PROFILE_FUNCTION();
 
-	JPH_ASSERT(inNumber > 0);
+	if (inNumber <= 0)
+		return;
 
 	// This cannot run concurrently with UpdatePrepare()/UpdateFinalize()
 	if (inTakeLock)
@@ -365,7 +380,8 @@ void BroadPhaseQuadTree::NotifyBodiesLayerChanged(BodyID *ioBodies, int inNumber
 {
 	JPH_PROFILE_FUNCTION();
 
-	JPH_ASSERT(inNumber > 0);
+	if (inNumber <= 0)
+		return;
 
 	// First sort the bodies that actually changed layer to beginning of the array
 	const BodyVector &bodies = mBodyManager->GetBodies();
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp
index bec02560..b78b8da1 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.cpp
@@ -15,6 +15,7 @@
 #include <Jolt/Geometry/AABox4.h>
 #include <Jolt/Geometry/RayAABox.h>
 #include <Jolt/Geometry/OrientedBox.h>
+#include <Jolt/Core/STLLocalAllocator.h>
 
 #ifdef JPH_DUMP_BROADPHASE_TREE
 JPH_SUPPRESS_WARNINGS_STD_BEGIN
@@ -57,6 +58,15 @@ void QuadTree::Node::GetChildBounds(int inChildIndex, AABox &outBounds) const
 
 void QuadTree::Node::SetChildBounds(int inChildIndex, const AABox &inBounds)
 {
+	// Bounding boxes provided to the quad tree should never be larger than cLargeFloat because this may trigger overflow exceptions
+	// e.g. when squaring the value while testing sphere overlaps
+	JPH_ASSERT(inBounds.mMin.GetX() >= -cLargeFloat && inBounds.mMin.GetX() <= cLargeFloat
+			   && inBounds.mMin.GetY() >= -cLargeFloat && inBounds.mMin.GetY() <= cLargeFloat
+			   && inBounds.mMin.GetZ() >= -cLargeFloat && inBounds.mMin.GetZ() <= cLargeFloat
+			   && inBounds.mMax.GetX() >= -cLargeFloat && inBounds.mMax.GetX() <= cLargeFloat
+			   && inBounds.mMax.GetY() >= -cLargeFloat && inBounds.mMax.GetY() <= cLargeFloat
+			   && inBounds.mMax.GetZ() >= -cLargeFloat && inBounds.mMax.GetZ() <= cLargeFloat);
+
 	// Set max first (this keeps the bounding box invalid for reading threads)
 	mBoundsMaxZ[inChildIndex] = inBounds.mMax.GetZ();
 	mBoundsMaxY[inChildIndex] = inBounds.mMax.GetY();
@@ -110,7 +120,6 @@ bool QuadTree::Node::EncapsulateChildBounds(int inChildIndex, const AABox &inBou
 // QuadTree
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const float QuadTree::cLargeFloat = 1.0e30f;
 const AABox QuadTree::cInvalidBounds(Vec3::sReplicate(cLargeFloat), Vec3::sReplicate(-cLargeFloat));
 
 void QuadTree::GetBodyLocation(const TrackingVector &inTracking, BodyID inBodyID, uint32 &outNodeIdx, uint32 &outChildIdx) const
@@ -152,16 +161,17 @@ QuadTree::~QuadTree()
 
 	// Collect all bodies
 	Allocator::Batch free_batch;
-	NodeID node_stack[cStackSize];
-	node_stack[0] = root_node.GetNodeID();
-	JPH_ASSERT(node_stack[0].IsValid());
-	if (node_stack[0].IsNode())
+	Array<NodeID, STLLocalAllocator<NodeID, cStackSize>> node_stack;
+	node_stack.reserve(cStackSize);
+	node_stack.push_back(root_node.GetNodeID());
+	JPH_ASSERT(node_stack.front().IsValid());
+	if (node_stack.front().IsNode())
 	{
-		int top = 0;
 		do
 		{
 			// Process node
-			NodeID node_id = node_stack[top];
+			NodeID node_id = node_stack.back();
+			node_stack.pop_back();
 			JPH_ASSERT(!node_id.IsBody());
 			uint32 node_idx = node_id.GetNodeIndex();
 			const Node &node = mAllocator->Get(node_idx);
@@ -169,17 +179,12 @@ QuadTree::~QuadTree()
 			// Recurse and get all child nodes
 			for (NodeID child_node_id : node.mChildNodeID)
 				if (child_node_id.IsValid() && child_node_id.IsNode())
-				{
-					JPH_ASSERT(top < cStackSize);
-					node_stack[top] = child_node_id;
-					top++;
-				}
+					node_stack.push_back(child_node_id);
 
 			// Mark node to be freed
 			mAllocator->AddObjectToBatch(free_batch, node_idx);
-			--top;
 		}
-		while (top >= 0);
+		while (!node_stack.empty());
 	}
 
 	// Now free all nodes
@@ -191,6 +196,30 @@ uint32 QuadTree::AllocateNode(bool inIsChanged)
 	uint32 index = mAllocator->ConstructObject(inIsChanged);
 	if (index == Allocator::cInvalidObjectIndex)
 	{
+		// If you're running out of nodes, you're most likely adding too many individual bodies to the tree.
+		// Because of the lock free nature of this tree, any individual body is added to the root of the tree.
+		// This means that if you add a lot of bodies individually, you will end up with a very deep tree and you'll be
+		// using a lot more nodes than you would if you added them in batches.
+		// Please look at BodyInterface::AddBodiesPrepare/AddBodiesFinalize.
+		//
+		// If you have created a wrapper around Jolt then a possible solution is to activate a mode during loading
+		// that queues up any bodies that need to be added. When loading is done, insert all of them as a single batch.
+		// This could be implemented as a 'start batching' / 'end batching' call to switch in and out of that mode.
+		// The rest of the code can then just use the regular 'add single body' call on your wrapper and doesn't need to know
+		// if this mode is active or not.
+		//
+		// Calling PhysicsSystem::Update or PhysicsSystem::OptimizeBroadPhase will perform maintenance
+		// on the tree and will make it efficient again. If you're not calling these functions and are adding a lot of bodies
+		// you could still be running out of nodes because the tree is not being maintained. If your application is paused,
+		// consider still calling PhysicsSystem::Update with a delta time of 0 to keep the tree in good shape.
+		//
+		// The system keeps track of a previous and a current tree, this allows for queries to continue using the old tree
+		// while the new tree is being built. If you completely clean the PhysicsSystem and rebuild it from scratch, you may
+		// want to call PhysicsSystem::OptimizeBroadPhase two times after clearing to completely get rid of any lingering nodes.
+		//
+		// The number of nodes that is allocated is related to the max number of bodies that is passed in PhysicsSystem::Init.
+		// For normal situations there are plenty of nodes available. If all else fails, you can increase the number of nodes
+		// by increasing the maximum number of bodies.
 		Trace("QuadTree: Out of nodes!");
 		std::abort();
 	}
@@ -1472,22 +1501,28 @@ void QuadTree::ValidateTree(const BodyVector &inBodies, const TrackingVector &in
 	JPH_ASSERT(inNodeIndex != cInvalidNodeIndex);
 
 	// To avoid call overhead, create a stack in place
+	JPH_SUPPRESS_WARNING_PUSH
+	JPH_CLANG_SUPPRESS_WARNING("-Wunused-member-function") // The default constructor of StackEntry is unused when using Jolt's Array class but not when using std::vector
 	struct StackEntry
 	{
+						StackEntry() = default;
+		inline			StackEntry(uint32 inNodeIndex, uint32 inParentNodeIndex) : mNodeIndex(inNodeIndex), mParentNodeIndex(inParentNodeIndex) { }
+
 		uint32			mNodeIndex;
 		uint32			mParentNodeIndex;
 	};
-	StackEntry stack[cStackSize];
-	stack[0].mNodeIndex = inNodeIndex;
-	stack[0].mParentNodeIndex = cInvalidNodeIndex;
-	int top = 0;
+	JPH_SUPPRESS_WARNING_POP
+	Array<StackEntry, STLLocalAllocator<StackEntry, cStackSize>> stack;
+	stack.reserve(cStackSize);
+	stack.emplace_back(inNodeIndex, cInvalidNodeIndex);
 
 	uint32 num_bodies = 0;
 
 	do
 	{
 		// Copy entry from the stack
-		StackEntry cur_stack = stack[top];
+		StackEntry cur_stack = stack.back();
+		stack.pop_back();
 
 		// Validate parent
 		const Node &node = mAllocator->Get(cur_stack.mNodeIndex);
@@ -1506,10 +1541,7 @@ void QuadTree::ValidateTree(const BodyVector &inBodies, const TrackingVector &in
 				{
 					// Child is a node, recurse
 					uint32 child_idx = child_node_id.GetNodeIndex();
-					JPH_ASSERT(top < cStackSize);
-					StackEntry &new_entry = stack[top++];
-					new_entry.mNodeIndex = child_idx;
-					new_entry.mParentNodeIndex = cur_stack.mNodeIndex;
+					stack.emplace_back(child_idx, cur_stack.mNodeIndex);
 
 					// Validate that the bounding box is bigger or equal to the bounds in the tree
 					// Bounding box could also be invalid if all children of our child were removed
@@ -1530,20 +1562,19 @@ void QuadTree::ValidateTree(const BodyVector &inBodies, const TrackingVector &in
 					JPH_ASSERT(node_idx == cur_stack.mNodeIndex);
 					JPH_ASSERT(child_idx == i);
 
-					// Validate that the body bounds are bigger or equal to the bounds in the tree
+					// Validate that the body cached bounds still match the actual bounds
+					const Body *body = inBodies[child_node_id.GetBodyID().GetIndex()];
+					body->ValidateCachedBounds();
+
+					// Validate that the node bounds are bigger or equal to the body bounds
 					AABox body_bounds;
 					node.GetChildBounds(i, body_bounds);
-					const Body *body = inBodies[child_node_id.GetBodyID().GetIndex()];
-					AABox cached_body_bounds = body->GetWorldSpaceBounds();
-					AABox real_body_bounds = body->GetShape()->GetWorldSpaceBounds(body->GetCenterOfMassTransform(), Vec3::sReplicate(1.0f));
-					JPH_ASSERT(cached_body_bounds == real_body_bounds); // Check that cached body bounds are up to date
-					JPH_ASSERT(body_bounds.Contains(real_body_bounds));
+					JPH_ASSERT(body_bounds.Contains(body->GetWorldSpaceBounds()));
 				}
 			}
 		}
-		--top;
 	}
-	while (top >= 0);
+	while (!stack.empty());
 
 	// Check that the amount of bodies in the tree matches our counter
 	JPH_ASSERT(num_bodies == inNumExpectedBodies);
@@ -1565,14 +1596,14 @@ void QuadTree::DumpTree(const NodeID &inRoot, const char *inFileNamePrefix) cons
 	f << "digraph {\n";
 
 	// Iterate the entire tree
-	NodeID node_stack[cStackSize];
-	node_stack[0] = inRoot;
-	JPH_ASSERT(node_stack[0].IsValid());
-	int top = 0;
+	Array<NodeID, STLLocalAllocator<NodeID, cStackSize>> node_stack;
+	node_stack.push_back(inRoot);
+	JPH_ASSERT(inRoot.IsValid());
 	do
 	{
 		// Check if node is a body
-		NodeID node_id = node_stack[top];
+		NodeID node_id = node_stack.back();
+		node_stack.pop_back();
 		if (node_id.IsBody())
 		{
 			// Output body
@@ -1597,9 +1628,7 @@ void QuadTree::DumpTree(const NodeID &inRoot, const char *inFileNamePrefix) cons
 			for (NodeID child_node_id : node.mChildNodeID)
 				if (child_node_id.IsValid())
 				{
-					JPH_ASSERT(top < cStackSize);
-					node_stack[top] = child_node_id;
-					top++;
+					node_stack.push_back(child_node_id);
 
 					// Output link
 					f << "node" << node_str << " -> ";
@@ -1610,9 +1639,8 @@ void QuadTree::DumpTree(const NodeID &inRoot, const char *inFileNamePrefix) cons
 					f << "\n";
 				}
 		}
-		--top;
 	}
-	while (top >= 0);
+	while (!node_stack.empty());
 
 	// Finish DOT file
 	f << "}\n";
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.h
index d698beb5..05140396 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/BroadPhase/QuadTree.h
@@ -38,7 +38,7 @@ private:
 		/// Construct a node ID
 		static inline NodeID	sInvalid()							{ return NodeID(cInvalidNodeIndex); }
 		static inline NodeID	sFromBodyID(BodyID inID)			{ NodeID node_id(inID.GetIndexAndSequenceNumber()); JPH_ASSERT(node_id.IsBody()); return node_id; }
-		static inline NodeID	sFromNodeIndex(uint32 inIdx)		{ NodeID node_id(inIdx | cIsNode); JPH_ASSERT(node_id.IsNode()); return node_id; }
+		static inline NodeID	sFromNodeIndex(uint32 inIdx)		{ JPH_ASSERT((inIdx & cIsNode) == 0); return NodeID(inIdx | cIsNode); }
 
 		/// Check what type of ID it is
 		inline bool				IsValid() const						{ return mID != cInvalidNodeIndex; }
@@ -261,8 +261,7 @@ public:
 
 private:
 	/// Constants
-	static const uint32			cInvalidNodeIndex = 0xffffffff;		///< Value used to indicate node index is invalid
-	static const float			cLargeFloat;						///< A large floating point number that is small enough to not cause any overflows
+	static constexpr uint32		cInvalidNodeIndex = 0xffffffff;		///< Value used to indicate node index is invalid
 	static const AABox			cInvalidBounds;						///< Invalid bounding box using cLargeFloat
 
 	/// We alternate between two trees in order to let collision queries complete in parallel to adding/removing objects to the tree
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideConvexVsTriangles.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideConvexVsTriangles.cpp
index f00b0023..c57e750b 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideConvexVsTriangles.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideConvexVsTriangles.cpp
@@ -79,7 +79,8 @@ void CollideConvexVsTriangles::Collide(Vec3Arg inV0, Vec3Arg inV1, Vec3Arg inV2,
 		mShape1ExCvxRadius = mShape1->GetSupportFunction(ConvexShape::ESupportMode::ExcludeConvexRadius, mBufferExCvxRadius, mScale1);
 
 	// Perform GJK step
-	status = pen_depth.GetPenetrationDepthStepGJK(*mShape1ExCvxRadius, mShape1ExCvxRadius->GetConvexRadius() + mCollideShapeSettings.mMaxSeparationDistance, triangle, 0.0f, mCollideShapeSettings.mCollisionTolerance, penetration_axis, point1, point2);
+	float max_separation_distance = mCollideShapeSettings.mMaxSeparationDistance;
+	status = pen_depth.GetPenetrationDepthStepGJK(*mShape1ExCvxRadius, mShape1ExCvxRadius->GetConvexRadius() + max_separation_distance, triangle, 0.0f, mCollideShapeSettings.mCollisionTolerance, penetration_axis, point1, point2);
 
 	// Check result of collision detection
 	if (status == EPAPenetrationDepth::EStatus::NotColliding)
@@ -88,12 +89,18 @@ void CollideConvexVsTriangles::Collide(Vec3Arg inV0, Vec3Arg inV1, Vec3Arg inV2,
 	{
 		// Need to run expensive EPA algorithm
 
+		// We know we're overlapping at this point, so we can set the max separation distance to 0.
+		// Numerically it is possible that GJK finds that the shapes are overlapping but EPA finds that they're separated.
+		// In order to avoid this, we clamp the max separation distance to 1 so that we don't excessively inflate the shape,
+		// but we still inflate it enough to avoid the case where EPA misses the collision.
+		max_separation_distance = min(max_separation_distance, 1.0f);
+
 		// Get the support function
 		if (mShape1IncCvxRadius == nullptr)
 			mShape1IncCvxRadius = mShape1->GetSupportFunction(ConvexShape::ESupportMode::IncludeConvexRadius, mBufferIncCvxRadius, mScale1);
 
 		// Add convex radius
-		AddConvexRadius<ConvexShape::Support> shape1_add_max_separation_distance(*mShape1IncCvxRadius, mCollideShapeSettings.mMaxSeparationDistance);
+		AddConvexRadius shape1_add_max_separation_distance(*mShape1IncCvxRadius, max_separation_distance);
 
 		// Perform EPA step
 		if (!pen_depth.GetPenetrationDepthStepEPA(shape1_add_max_separation_distance, triangle, mCollideShapeSettings.mPenetrationTolerance, penetration_axis, point1, point2))
@@ -101,14 +108,14 @@ void CollideConvexVsTriangles::Collide(Vec3Arg inV0, Vec3Arg inV1, Vec3Arg inV2,
 	}
 
 	// Check if the penetration is bigger than the early out fraction
-	float penetration_depth = (point2 - point1).Length() - mCollideShapeSettings.mMaxSeparationDistance;
+	float penetration_depth = (point2 - point1).Length() - max_separation_distance;
 	if (-penetration_depth >= mCollector.GetEarlyOutFraction())
 		return;
 
 	// Correct point1 for the added separation distance
 	float penetration_axis_len = penetration_axis.Length();
 	if (penetration_axis_len > 0.0f)
-		point1 -= penetration_axis * (mCollideShapeSettings.mMaxSeparationDistance / penetration_axis_len);
+		point1 -= penetration_axis * (max_separation_distance / penetration_axis_len);
 
 	// Check if we have enabled active edge detection
 	if (mCollideShapeSettings.mActiveEdgeMode == EActiveEdgeMode::CollideOnlyWithActive && inActiveEdges != 0b111)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h
new file mode 100644
index 00000000..a4f7c957
--- /dev/null
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollideShapeVsShapePerLeaf.h
@@ -0,0 +1,93 @@
+// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
+// SPDX-FileCopyrightText: 2025 Jorrit Rouwe
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <Jolt/Physics/Collision/CollideShape.h>
+#include <Jolt/Physics/Collision/CollisionDispatch.h>
+#include <Jolt/Core/STLLocalAllocator.h>
+
+JPH_NAMESPACE_BEGIN
+
+/// Collide 2 shapes and returns at most 1 hit per leaf shape pairs that overlapping. This can be used when not all contacts between the shapes are needed.
+/// E.g. when testing a compound with 2 MeshShapes A and B against a compound with 2 SphereShapes C and D, then at most you'll get 4 collisions: AC, AD, BC, BD.
+/// The default CollisionDispatch::sCollideShapeVsShape function would return all intersecting triangles in A against C, all in B against C etc.
+/// @param inShape1 The first shape
+/// @param inShape2 The second shape
+/// @param inScale1 Local space scale of shape 1 (scales relative to its center of mass)
+/// @param inScale2 Local space scale of shape 2 (scales relative to its center of mass)
+/// @param inCenterOfMassTransform1 Transform to transform center of mass of shape 1 into world space
+/// @param inCenterOfMassTransform2 Transform to transform center of mass of shape 2 into world space
+/// @param inSubShapeIDCreator1 Class that tracks the current sub shape ID for shape 1
+/// @param inSubShapeIDCreator2 Class that tracks the current sub shape ID for shape 2
+/// @param inCollideShapeSettings Options for the CollideShape test
+/// @param ioCollector The collector that receives the results.
+/// @param inShapeFilter allows selectively disabling collisions between pairs of (sub) shapes.
+/// @tparam LeafCollector The type of the collector that will be used to collect hits between leaf pairs. Must be either AnyHitCollisionCollector<CollideShapeCollector> to get any hit (cheapest) or ClosestHitCollisionCollector<CollideShapeCollector> to get the deepest hit (more expensive).
+template <class LeafCollector>
+void CollideShapeVsShapePerLeaf(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter = { })
+{
+	// Tracks information we need about a leaf shape
+	struct LeafShape
+	{
+							LeafShape() = default;
+
+							LeafShape(const AABox &inBounds, Mat44Arg inCenterOfMassTransform, Vec3Arg inScale, const Shape *inShape, const SubShapeIDCreator &inSubShapeIDCreator) :
+			mBounds(inBounds),
+			mCenterOfMassTransform(inCenterOfMassTransform),
+			mScale(inScale),
+			mShape(inShape),
+			mSubShapeIDCreator(inSubShapeIDCreator)
+		{
+		}
+
+		AABox				mBounds;
+		Mat44				mCenterOfMassTransform;
+		Vec3				mScale;
+		const Shape *		mShape;
+		SubShapeIDCreator	mSubShapeIDCreator;
+	};
+
+	constexpr uint cMaxLocalLeafShapes = 32;
+
+	// A collector that stores the information we need from a leaf shape in an array that is usually on the stack but can fall back to the heap if needed
+	class MyCollector : public TransformedShapeCollector
+	{
+	public:
+							MyCollector()
+		{
+			mHits.reserve(cMaxLocalLeafShapes);
+		}
+
+		void				AddHit(const TransformedShape &inShape) override
+		{
+			mHits.emplace_back(inShape.GetWorldSpaceBounds(), inShape.GetCenterOfMassTransform().ToMat44(), inShape.GetShapeScale(), inShape.mShape, inShape.mSubShapeIDCreator);
+		}
+
+		Array<LeafShape, STLLocalAllocator<LeafShape, cMaxLocalLeafShapes>> mHits;
+	};
+
+	// Get bounds of both shapes
+	AABox bounds1 = inShape1->GetWorldSpaceBounds(inCenterOfMassTransform1, inScale1);
+	AABox bounds2 = inShape2->GetWorldSpaceBounds(inCenterOfMassTransform2, inScale2);
+
+	// Get leaf shapes that overlap with the bounds of the other shape
+	MyCollector leaf_shapes1, leaf_shapes2;
+	inShape1->CollectTransformedShapes(bounds2, inCenterOfMassTransform1.GetTranslation(), inCenterOfMassTransform1.GetQuaternion(), inScale1, inSubShapeIDCreator1, leaf_shapes1, inShapeFilter);
+	inShape2->CollectTransformedShapes(bounds1, inCenterOfMassTransform2.GetTranslation(), inCenterOfMassTransform2.GetQuaternion(), inScale2, inSubShapeIDCreator2, leaf_shapes2, inShapeFilter);
+
+	// Now test each leaf shape against each other leaf
+	for (const LeafShape &leaf1 : leaf_shapes1.mHits)
+		for (const LeafShape &leaf2 : leaf_shapes2.mHits)
+			if (leaf1.mBounds.Overlaps(leaf2.mBounds))
+			{
+				// Use the leaf collector to collect max 1 hit for this pair and pass it on to ioCollector
+				LeafCollector collector;
+				CollisionDispatch::sCollideShapeVsShape(leaf1.mShape, leaf2.mShape, leaf1.mScale, leaf2.mScale, leaf1.mCenterOfMassTransform, leaf2.mCenterOfMassTransform, leaf1.mSubShapeIDCreator, leaf2.mSubShapeIDCreator, inCollideShapeSettings, collector, inShapeFilter);
+				if (collector.HadHit())
+					ioCollector.AddHit(collector.mHit);
+			}
+}
+
+JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollector.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollector.h
index ec608502..603eac2f 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollector.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollector.h
@@ -66,7 +66,11 @@ public:
 	/// before AddHit is called (e.g. the user data pointer or the velocity of the body).
 	virtual void			OnBody([[maybe_unused]] const Body &inBody)		{ /* Collects nothing by default */ }
 
-	/// Set by the collision detection functions to the current TransformedShape that we're colliding against before calling the AddHit function
+	/// When running a query through the NarrowPhaseQuery class, this will be called after all AddHit calls have been made for a particular body.
+	virtual void			OnBodyEnd()										{ /* Does nothing by default */ }
+
+	/// Set by the collision detection functions to the current TransformedShape that we're colliding against before calling the AddHit function.
+	/// Note: Only valid during AddHit! For performance reasons, the pointer is not reset after leaving AddHit so the context may point to freed memory.
 	void					SetContext(const TransformedShape *inContext)	{ mContext = inContext; }
 	const TransformedShape *GetContext() const								{ return mContext; }
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollectorImpl.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollectorImpl.h
index 7bdd5da2..8077d0be 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollectorImpl.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionCollectorImpl.h
@@ -89,6 +89,91 @@ private:
 	bool				mHadHit = false;
 };
 
+/// Implementation that collects the closest / deepest hit for each body and optionally sorts them on distance
+template <class CollectorType>
+class ClosestHitPerBodyCollisionCollector : public CollectorType
+{
+public:
+	/// Redeclare ResultType
+	using ResultType = typename CollectorType::ResultType;
+
+	// See: CollectorType::Reset
+	virtual void		Reset() override
+	{
+		CollectorType::Reset();
+
+		mHits.clear();
+		mHadHit = false;
+	}
+
+	// See: CollectorType::OnBody
+	virtual void		OnBody(const Body &inBody) override
+	{
+		// Store the early out fraction so we can restore it after we've collected all hits for this body
+		mPreviousEarlyOutFraction = CollectorType::GetEarlyOutFraction();
+	}
+
+	// See: CollectorType::AddHit
+	virtual void		AddHit(const ResultType &inResult) override
+	{
+		float early_out = inResult.GetEarlyOutFraction();
+		if (!mHadHit || early_out < CollectorType::GetEarlyOutFraction())
+		{
+			// Update early out fraction to avoid spending work on collecting further hits for this body
+			CollectorType::UpdateEarlyOutFraction(early_out);
+
+			if (!mHadHit)
+			{
+				// First time we have a hit we append it to the array
+				mHits.push_back(inResult);
+				mHadHit = true;
+			}
+			else
+			{
+				// Closer hits will override the previous one
+				mHits.back() = inResult;
+			}
+		}
+	}
+
+	// See: CollectorType::OnBodyEnd
+	virtual void		OnBodyEnd() override
+	{
+		if (mHadHit)
+		{
+			// Reset the early out fraction to the configured value so that we will continue
+			// to collect hits at any distance for other bodies
+			JPH_ASSERT(mPreviousEarlyOutFraction != -FLT_MAX); // Check that we got a call to OnBody
+			CollectorType::ResetEarlyOutFraction(mPreviousEarlyOutFraction);
+			mHadHit = false;
+		}
+
+		// For asserting purposes we reset the stored early out fraction so we can detect that OnBody was called
+		JPH_IF_ENABLE_ASSERTS(mPreviousEarlyOutFraction = -FLT_MAX;)
+	}
+
+	/// Order hits on closest first
+	void				Sort()
+	{
+		QuickSort(mHits.begin(), mHits.end(), [](const ResultType &inLHS, const ResultType &inRHS) { return inLHS.GetEarlyOutFraction() < inRHS.GetEarlyOutFraction(); });
+	}
+
+	/// Check if any hits were collected
+	inline bool			HadHit() const
+	{
+		return !mHits.empty();
+	}
+
+	Array<ResultType>	mHits;
+
+private:
+	// Store early out fraction that was initially configured for the collector
+	float				mPreviousEarlyOutFraction = -FLT_MAX;
+
+	// Flag to indicate if we have a hit for the current body
+	bool				mHadHit = false;
+};
+
 /// Simple implementation that collects any hit
 template <class CollectorType>
 class AnyHitCollisionCollector : public CollectorType
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.cpp
index a8c98b6d..48828826 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.cpp
@@ -18,6 +18,8 @@ JPH_IMPLEMENT_SERIALIZABLE_NON_VIRTUAL(CollisionGroup)
 	JPH_ADD_ATTRIBUTE(CollisionGroup, mSubGroupID)
 }
 
+const CollisionGroup CollisionGroup::sInvalid;
+
 void CollisionGroup::SaveBinaryState(StreamOut &inStream) const
 {
 	inStream.Write(mGroupID);
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.h
index 5e8c6cf1..938e686f 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/CollisionGroup.h
@@ -85,6 +85,9 @@ public:
 	/// Restore the state of this object from inStream. Does not save group filter.
 	void					RestoreBinaryState(StreamIn &inStream);
 
+	/// An invalid collision group
+	static const CollisionGroup	sInvalid;
+
 private:
 	RefConst<GroupFilter>	mGroupFilter;
 	GroupID					mGroupID = cInvalidGroup;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
index 7cbbb226..b5e593b6 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/InternalEdgeRemovingCollector.h
@@ -77,8 +77,12 @@ class InternalEdgeRemovingCollector : public CollideShapeCollector
 public:
 	/// Constructor, configures a collector to be called with all the results that do not hit internal edges
 	explicit				InternalEdgeRemovingCollector(CollideShapeCollector &inChainedCollector) :
+		CollideShapeCollector(inChainedCollector),
 		mChainedCollector(inChainedCollector)
 	{
+		// Initialize arrays to full capacity to avoid needless reallocation calls
+		mVoidedFeatures.reserve(cMaxLocalVoidedFeatures);
+		mDelayedResults.reserve(cMaxLocalDelayedResults);
 	}
 
 	// See: CollideShapeCollector::Reset
@@ -221,6 +225,13 @@ public:
 		mDelayedResults.clear();
 	}
 
+	// See: CollideShapeCollector::OnBodyEnd
+	virtual void			OnBodyEnd() override
+	{
+		Flush();
+		mChainedCollector.OnBodyEnd();
+	}
+
 	/// Version of CollisionDispatch::sCollideShapeVsShape that removes internal edges
 	static void				sCollideShapeVsShape(const Shape *inShape1, const Shape *inShape2, Vec3Arg inScale1, Vec3Arg inScale2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, const SubShapeIDCreator &inSubShapeIDCreator1, const SubShapeIDCreator &inSubShapeIDCreator2, const CollideShapeSettings &inCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter = { })
 	{
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.cpp
index 3331f5d7..53a5d53b 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.cpp
@@ -134,8 +134,10 @@ void PruneContactPoints(Vec3Arg inPenetrationAxis, ContactPoints &ioContactPoint
 	ioContactPointsOn2 = points_to_keep_on_2;
 }
 
-void ManifoldBetweenTwoFaces(Vec3Arg inContactPoint1, Vec3Arg inContactPoint2, Vec3Arg inPenetrationAxis, float inMaxContactDistanceSq	, const ConvexShape::SupportingFace &inShape1Face, const ConvexShape::SupportingFace &inShape2Face, ContactPoints &outContactPoints1, ContactPoints &outContactPoints2 JPH_IF_DEBUG_RENDERER(, RVec3Arg inCenterOfMass))
+void ManifoldBetweenTwoFaces(Vec3Arg inContactPoint1, Vec3Arg inContactPoint2, Vec3Arg inPenetrationAxis, float inMaxContactDistance, const ConvexShape::SupportingFace &inShape1Face, const ConvexShape::SupportingFace &inShape2Face, ContactPoints &outContactPoints1, ContactPoints &outContactPoints2 JPH_IF_DEBUG_RENDERER(, RVec3Arg inCenterOfMass))
 {
+	JPH_ASSERT(inMaxContactDistance > 0.0f);
+
 #ifdef JPH_DEBUG_RENDERER
 	if (ContactConstraintManager::sDrawContactPoint)
 	{
@@ -165,7 +167,7 @@ void ManifoldBetweenTwoFaces(Vec3Arg inContactPoint1, Vec3Arg inContactPoint2, V
 		else if (inShape1Face.size() == 2)
 			ClipPolyVsEdge(inShape2Face, inShape1Face[0], inShape1Face[1], inPenetrationAxis, clipped_face);
 
-		// Project the points back onto the plane of shape 1 face and only keep those that are behind the plane
+		// Determine plane origin and normal for shape 1
 		Vec3 plane_origin = inShape1Face[0];
 		Vec3 plane_normal;
 		Vec3 first_edge = inShape1Face[1] - plane_origin;
@@ -180,20 +182,25 @@ void ManifoldBetweenTwoFaces(Vec3Arg inContactPoint1, Vec3Arg inContactPoint2, V
 			plane_normal = first_edge.Cross(inPenetrationAxis).Cross(first_edge);
 		}
 
-		// Check if the plane normal has any length, if not the clipped shape is so small that we'll just use the contact points
-		float plane_normal_len_sq = plane_normal.LengthSq();
-		if (plane_normal_len_sq > 0.0f)
+		// If penetration axis and plane normal are perpendicular, fall back to the contact points
+		float penetration_axis_dot_plane_normal = inPenetrationAxis.Dot(plane_normal);
+		if (penetration_axis_dot_plane_normal != 0.0f)
 		{
-			// Discard points of faces that are too far away to collide
+			float penetration_axis_len = inPenetrationAxis.Length();
+
 			for (Vec3 p2 : clipped_face)
 			{
-				float distance = (p2 - plane_origin).Dot(plane_normal); // Note should divide by length of plane_normal (unnormalized here)
-				if (distance <= 0.0f || Square(distance) < inMaxContactDistanceSq * plane_normal_len_sq) // Must be close enough to plane, note we correct for not dividing by plane normal length here
-				{
-					// Project point back on shape 1 using the normal, note we correct for not dividing by plane normal length here:
-					// p1 = p2 - (distance / sqrt(plane_normal_len_sq)) * (plane_normal / sqrt(plane_normal_len_sq));
-					Vec3 p1 = p2 - (distance / plane_normal_len_sq) * plane_normal;
+				// Project clipped face back onto the plane of face 1, we do this by solving:
+				// p1 = p2 + distance * penetration_axis / |penetration_axis|
+				// (p1 - plane_origin) . plane_normal = 0
+				// This gives us:
+				// distance = -|penetration_axis| * (p2 - plane_origin) . plane_normal / penetration_axis . plane_normal
+				float distance = (p2 - plane_origin).Dot(plane_normal) / penetration_axis_dot_plane_normal; // note left out -|penetration_axis| term
 
+				// If the point is less than inMaxContactDistance in front of the plane of face 2, add it as a contact point
+				if (distance * penetration_axis_len < inMaxContactDistance)
+				{
+					Vec3 p1 = p2 - distance * inPenetrationAxis;
 					outContactPoints1.push_back(p1);
 					outContactPoints2.push_back(p2);
 				}
@@ -213,15 +220,19 @@ void ManifoldBetweenTwoFaces(Vec3Arg inContactPoint1, Vec3Arg inContactPoint2, V
 			DebugRenderer::sInstance->DrawWirePolygon(com, inShape2Face, Color::sGreen, 0.05f);
 
 			// Draw normal
-			if (plane_normal_len_sq > 0.0f)
+			float plane_normal_len = plane_normal.Length();
+			if (plane_normal_len > 0.0f)
 			{
 				RVec3 plane_origin_ws = inCenterOfMass + plane_origin;
-				DebugRenderer::sInstance->DrawArrow(plane_origin_ws, plane_origin_ws + plane_normal / sqrt(plane_normal_len_sq), Color::sYellow, 0.05f);
+				DebugRenderer::sInstance->DrawArrow(plane_origin_ws, plane_origin_ws + plane_normal / plane_normal_len, Color::sYellow, 0.05f);
 			}
 
 			// Draw contact points that remain after distance check
 			for (ContactPoints::size_type p = old_size; p < outContactPoints1.size(); ++p)
+			{
 				DebugRenderer::sInstance->DrawMarker(inCenterOfMass + outContactPoints1[p], Color::sYellow, 0.1f);
+				DebugRenderer::sInstance->DrawMarker(inCenterOfMass + outContactPoints2[p], Color::sOrange, 0.1f);
+			}
 		}
 	#endif // JPH_DEBUG_RENDERER
 	}
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.h
index 72a5b8f0..3ead7236 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/ManifoldBetweenTwoFaces.h
@@ -27,7 +27,7 @@ JPH_EXPORT void PruneContactPoints(Vec3Arg inPenetrationAxis, ContactPoints &ioC
 /// @param inContactPoint1 The contact point on shape 1 relative to inCenterOfMass
 /// @param inContactPoint2 The contact point on shape 2 relative to inCenterOfMass
 /// @param inPenetrationAxis The local space penetration axis in world space
-/// @param inMaxContactDistanceSq After face 2 is clipped against face 1, each remaining point on face 2 is tested against the plane of face 1. If the distance^2 on the positive side of the plane is larger than this distance, the point will be discarded as a contact point.
+/// @param inMaxContactDistance After face 2 is clipped against face 1, each remaining point on face 2 is tested against the plane of face 1. If the distance on the positive side of the plane is larger than this distance, the point will be discarded as a contact point.
 /// @param inShape1Face The supporting faces on shape 1 relative to inCenterOfMass
 /// @param inShape2Face The supporting faces on shape 2 relative to inCenterOfMass
 /// @param outContactPoints1 Returns the contact points between the two shapes for shape 1 relative to inCenterOfMass (any existing points in the output array are left as is)
@@ -35,7 +35,7 @@ JPH_EXPORT void PruneContactPoints(Vec3Arg inPenetrationAxis, ContactPoints &ioC
 #ifdef JPH_DEBUG_RENDERER
 /// @param inCenterOfMass Center of mass position of body 1
 #endif
-JPH_EXPORT void ManifoldBetweenTwoFaces(Vec3Arg inContactPoint1, Vec3Arg inContactPoint2, Vec3Arg inPenetrationAxis, float inMaxContactDistanceSq, const ConvexShape::SupportingFace &inShape1Face, const ConvexShape::SupportingFace &inShape2Face, ContactPoints &outContactPoints1, ContactPoints &outContactPoints2
+JPH_EXPORT void ManifoldBetweenTwoFaces(Vec3Arg inContactPoint1, Vec3Arg inContactPoint2, Vec3Arg inPenetrationAxis, float inMaxContactDistance, const ConvexShape::SupportingFace &inShape1Face, const ConvexShape::SupportingFace &inShape2Face, ContactPoints &outContactPoints1, ContactPoints &outContactPoints2
 #ifdef JPH_DEBUG_RENDERER
 	, RVec3Arg inCenterOfMass
 #endif
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
index 4431a104..5ac90ab9 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/NarrowPhaseQuery.cpp
@@ -29,7 +29,7 @@ bool NarrowPhaseQuery::CastRay(const RRayCast &inRay, RayCastResult &ioHit, cons
 			mBodyLockInterface(inBodyLockInterface),
 			mBodyFilter(inBodyFilter)
 		{
-			UpdateEarlyOutFraction(ioHit.mFraction);
+			ResetEarlyOutFraction(ioHit.mFraction);
 		}
 
 		virtual void		AddHit(const ResultType &inResult) override
@@ -126,6 +126,10 @@ void NarrowPhaseQuery::CastRay(const RRayCast &inRay, const RayCastSettings &inR
 						// Do narrow phase collision check
 						ts.CastRay(mRay, mRayCastSettings, mCollector, mShapeFilter);
 
+						// Notify collector of the end of this body
+						// We do this before updating the early out fraction so that the collector can still modify it
+						mCollector.OnBodyEnd();
+
 						// Update early out fraction based on narrow phase collector
 						UpdateEarlyOutFraction(mCollector.GetEarlyOutFraction());
 					}
@@ -189,6 +193,10 @@ void NarrowPhaseQuery::CollidePoint(RVec3Arg inPoint, CollidePointCollector &ioC
 						// Do narrow phase collision check
 						ts.CollidePoint(mPoint, mCollector, mShapeFilter);
 
+						// Notify collector of the end of this body
+						// We do this before updating the early out fraction so that the collector can still modify it
+						mCollector.OnBodyEnd();
+
 						// Update early out fraction based on narrow phase collector
 						UpdateEarlyOutFraction(mCollector.GetEarlyOutFraction());
 					}
@@ -255,6 +263,10 @@ void NarrowPhaseQuery::CollideShape(const Shape *inShape, Vec3Arg inShapeScale,
 						// Do narrow phase collision check
 						ts.CollideShape(mShape, mShapeScale, mCenterOfMassTransform, mCollideShapeSettings, mBaseOffset, mCollector, mShapeFilter);
 
+						// Notify collector of the end of this body
+						// We do this before updating the early out fraction so that the collector can still modify it
+						mCollector.OnBodyEnd();
+
 						// Update early out fraction based on narrow phase collector
 						UpdateEarlyOutFraction(mCollector.GetEarlyOutFraction());
 					}
@@ -284,82 +296,13 @@ void NarrowPhaseQuery::CollideShape(const Shape *inShape, Vec3Arg inShapeScale,
 
 void NarrowPhaseQuery::CollideShapeWithInternalEdgeRemoval(const Shape *inShape, Vec3Arg inShapeScale, RMat44Arg inCenterOfMassTransform, const CollideShapeSettings &inCollideShapeSettings, RVec3Arg inBaseOffset, CollideShapeCollector &ioCollector, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter) const
 {
-	JPH_PROFILE_FUNCTION();
+	// We require these settings for internal edge removal to work
+	CollideShapeSettings settings = inCollideShapeSettings;
+	settings.mActiveEdgeMode = EActiveEdgeMode::CollideWithAll;
+	settings.mCollectFacesMode = ECollectFacesMode::CollectFaces;
 
-	class MyCollector : public CollideShapeBodyCollector
-	{
-	public:
-							MyCollector(const Shape *inShape, Vec3Arg inShapeScale, RMat44Arg inCenterOfMassTransform, const CollideShapeSettings &inCollideShapeSettings, RVec3Arg inBaseOffset, CollideShapeCollector &ioCollector, const BodyLockInterface &inBodyLockInterface, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter) :
-			CollideShapeBodyCollector(ioCollector),
-			mShape(inShape),
-			mShapeScale(inShapeScale),
-			mCenterOfMassTransform(inCenterOfMassTransform),
-			mBaseOffset(inBaseOffset),
-			mBodyLockInterface(inBodyLockInterface),
-			mBodyFilter(inBodyFilter),
-			mShapeFilter(inShapeFilter),
-			mCollideShapeSettings(inCollideShapeSettings),
-			mCollector(ioCollector)
-		{
-			// We require these settings for internal edge removal to work
-			mCollideShapeSettings.mActiveEdgeMode = EActiveEdgeMode::CollideWithAll;
-			mCollideShapeSettings.mCollectFacesMode = ECollectFacesMode::CollectFaces;
-		}
-
-		virtual void		AddHit(const ResultType &inResult) override
-		{
-			// Only test shape if it passes the body filter
-			if (mBodyFilter.ShouldCollide(inResult))
-			{
-				// Lock the body
-				BodyLockRead lock(mBodyLockInterface, inResult);
-				if (lock.SucceededAndIsInBroadPhase()) // Race condition: body could have been removed since it has been found in the broadphase, ensures body is in the broadphase while we call the callbacks
-				{
-					const Body &body = lock.GetBody();
-
-					// Check body filter again now that we've locked the body
-					if (mBodyFilter.ShouldCollideLocked(body))
-					{
-						// Collect the transformed shape
-						TransformedShape ts = body.GetTransformedShape();
-
-						// Notify collector of new body
-						mCollector.OnBody(body);
-
-						// Release the lock now, we have all the info we need in the transformed shape
-						lock.ReleaseLock();
-
-						// Do narrow phase collision check
-						ts.CollideShape(mShape, mShapeScale, mCenterOfMassTransform, mCollideShapeSettings, mBaseOffset, mCollector, mShapeFilter);
-
-						// After each body, we need to flush the InternalEdgeRemovingCollector because it uses 'ts' as context and it will go out of scope at the end of this block
-						mCollector.Flush();
-
-						// Update early out fraction based on narrow phase collector
-						UpdateEarlyOutFraction(mCollector.GetEarlyOutFraction());
-					}
-				}
-			}
-		}
-
-		const Shape *					mShape;
-		Vec3							mShapeScale;
-		RMat44							mCenterOfMassTransform;
-		RVec3							mBaseOffset;
-		const BodyLockInterface &		mBodyLockInterface;
-		const BodyFilter &				mBodyFilter;
-		const ShapeFilter &				mShapeFilter;
-		CollideShapeSettings			mCollideShapeSettings;
-		InternalEdgeRemovingCollector	mCollector;
-	};
-
-	// Calculate bounds for shape and expand by max separation distance
-	AABox bounds = inShape->GetWorldSpaceBounds(inCenterOfMassTransform, inShapeScale);
-	bounds.ExpandBy(Vec3::sReplicate(inCollideShapeSettings.mMaxSeparationDistance));
-
-	// Do broadphase test
-	MyCollector collector(inShape, inShapeScale, inCenterOfMassTransform, inCollideShapeSettings, inBaseOffset, ioCollector, *mBodyLockInterface, inBodyFilter, inShapeFilter);
-	mBroadPhaseQuery->CollideAABox(bounds, collector, inBroadPhaseLayerFilter, inObjectLayerFilter);
+	InternalEdgeRemovingCollector wrapper(ioCollector);
+	CollideShape(inShape, inShapeScale, inCenterOfMassTransform, settings, inBaseOffset, wrapper, inBroadPhaseLayerFilter, inObjectLayerFilter, inBodyFilter, inShapeFilter);
 }
 
 void NarrowPhaseQuery::CastShape(const RShapeCast &inShapeCast, const ShapeCastSettings &inShapeCastSettings, RVec3Arg inBaseOffset, CastShapeCollector &ioCollector, const BroadPhaseLayerFilter &inBroadPhaseLayerFilter, const ObjectLayerFilter &inObjectLayerFilter, const BodyFilter &inBodyFilter, const ShapeFilter &inShapeFilter) const
@@ -409,6 +352,10 @@ void NarrowPhaseQuery::CastShape(const RShapeCast &inShapeCast, const ShapeCastS
 						// Do narrow phase collision check
 						ts.CastShape(mShapeCast, mShapeCastSettings, mBaseOffset, mCollector, mShapeFilter);
 
+						// Notify collector of the end of this body
+						// We do this before updating the early out fraction so that the collector can still modify it
+						mCollector.OnBodyEnd();
+
 						// Update early out fraction based on narrow phase collector
 						UpdateEarlyOutFraction(mCollector.GetEarlyOutFraction());
 					}
@@ -471,6 +418,10 @@ void NarrowPhaseQuery::CollectTransformedShapes(const AABox &inBox, TransformedS
 						// Do narrow phase collision check
 						ts.CollectTransformedShapes(mBox, mCollector, mShapeFilter);
 
+						// Notify collector of the end of this body
+						// We do this before updating the early out fraction so that the collector can still modify it
+						mCollector.OnBodyEnd();
+
 						// Update early out fraction based on narrow phase collector
 						UpdateEarlyOutFraction(mCollector.GetEarlyOutFraction());
 					}
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.cpp
index f5fe04ec..5f273096 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.cpp
@@ -92,7 +92,12 @@ MassProperties CompoundShape::GetMassProperties() const
 
 AABox CompoundShape::GetWorldSpaceBounds(Mat44Arg inCenterOfMassTransform, Vec3Arg inScale) const
 {
-	if (mSubShapes.size() <= 10)
+	if (mSubShapes.empty())
+	{
+		// If there are no sub-shapes, we must return an empty box to avoid overflows in the broadphase
+		return AABox(inCenterOfMassTransform.GetTranslation(), inCenterOfMassTransform.GetTranslation());
+	}
+	else if (mSubShapes.size() <= 10)
 	{
 		AABox bounds;
 		for (const SubShape &shape : mSubShapes)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h
index 0bbd7c4d..033c3c5c 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CompoundShape.h
@@ -36,7 +36,11 @@ public:
 		RefConst<Shape>				mShapePtr;												///< Sub shape (either this or mShape needs to be filled up)
 		Vec3						mPosition;												///< Position of the sub shape
 		Quat						mRotation;												///< Rotation of the sub shape
-		uint32						mUserData = 0;											///< User data value (can be used by the application for any purpose)
+
+		/// User data value (can be used by the application for any purpose).
+		/// Note this value can be retrieved through GetSubShape(...).mUserData, not through GetSubShapeUserData(...) as that returns Shape::GetUserData() of the leaf shape.
+		/// Use GetSubShapeIndexFromID get a shape index from a SubShapeID to pass to GetSubShape.
+		uint32						mUserData = 0;
 	};
 
 	using SubShapes = Array<SubShapeSettings>;
@@ -338,7 +342,7 @@ protected:
 	}
 
 	Vec3							mCenterOfMass { Vec3::sZero() };						///< Center of mass of the compound
-	AABox							mLocalBounds;
+	AABox							mLocalBounds { Vec3::sZero(), Vec3::sZero() };
 	SubShapes						mSubShapes;
 	float							mInnerRadius = FLT_MAX;									///< Smallest radius of GetInnerRadius() of child shapes
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h
index 4068791f..c6b18600 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexHullShape.h
@@ -30,7 +30,7 @@ public:
 	// See: ShapeSettings
 	virtual ShapeResult		Create() const override;
 
-	Array<Vec3>				mPoints;															///< Points to create the hull from
+	Array<Vec3>				mPoints;															///< Points to create the hull from. Note that these points don't need to be the vertices of the convex hull, they can contain interior points or points on faces/edges.
 	float					mMaxConvexRadius = 0.0f;											///< Convex radius as supplied by the constructor. Note that during hull creation the convex radius can be made smaller if the value is too big for the hull.
 	float					mMaxErrorConvexRadius = 0.05f;										///< Maximum distance between the shrunk hull + convex radius and the actual hull.
 	float					mHullTolerance = 1.0e-3f;											///< Points are allowed this far outside of the hull (increasing this yields a hull with less vertices). Note that the actual used value can be larger if the points of the hull are far apart.
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexShape.cpp
index 35e23ee0..ede12d31 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ConvexShape.cpp
@@ -57,8 +57,9 @@ void ConvexShape::sCollideConvexVsConvex(const Shape *inShape1, const Shape *inS
 	Mat44 transform_2_to_1 = inverse_transform1 * inCenterOfMassTransform2;
 
 	// Get bounding boxes
+	float max_separation_distance = inCollideShapeSettings.mMaxSeparationDistance;
 	AABox shape1_bbox = shape1->GetLocalBounds().Scaled(inScale1);
-	shape1_bbox.ExpandBy(Vec3::sReplicate(inCollideShapeSettings.mMaxSeparationDistance));
+	shape1_bbox.ExpandBy(Vec3::sReplicate(max_separation_distance));
 	AABox shape2_bbox = shape2->GetLocalBounds().Scaled(inScale2);
 
 	// Check if they overlap
@@ -86,10 +87,10 @@ void ConvexShape::sCollideConvexVsConvex(const Shape *inShape1, const Shape *inS
 		const Support *shape2_excl_cvx_radius = shape2->GetSupportFunction(ConvexShape::ESupportMode::ExcludeConvexRadius, buffer2_excl_cvx_radius, inScale2);
 
 		// Transform shape 2 in the space of shape 1
-		TransformedConvexObject<Support> transformed2_excl_cvx_radius(transform_2_to_1, *shape2_excl_cvx_radius);
+		TransformedConvexObject transformed2_excl_cvx_radius(transform_2_to_1, *shape2_excl_cvx_radius);
 
 		// Perform GJK step
-		status = pen_depth.GetPenetrationDepthStepGJK(*shape1_excl_cvx_radius, shape1_excl_cvx_radius->GetConvexRadius() + inCollideShapeSettings.mMaxSeparationDistance, transformed2_excl_cvx_radius, shape2_excl_cvx_radius->GetConvexRadius(), inCollideShapeSettings.mCollisionTolerance, penetration_axis, point1, point2);
+		status = pen_depth.GetPenetrationDepthStepGJK(*shape1_excl_cvx_radius, shape1_excl_cvx_radius->GetConvexRadius() + max_separation_distance, transformed2_excl_cvx_radius, shape2_excl_cvx_radius->GetConvexRadius(), inCollideShapeSettings.mCollisionTolerance, penetration_axis, point1, point2);
 	}
 
 	// Check result of collision detection
@@ -105,16 +106,22 @@ void ConvexShape::sCollideConvexVsConvex(const Shape *inShape1, const Shape *inS
 		{
 			// Need to run expensive EPA algorithm
 
+			// We know we're overlapping at this point, so we can set the max separation distance to 0.
+			// Numerically it is possible that GJK finds that the shapes are overlapping but EPA finds that they're separated.
+			// In order to avoid this, we clamp the max separation distance to 1 so that we don't excessively inflate the shape,
+			// but we still inflate it enough to avoid the case where EPA misses the collision.
+			max_separation_distance = min(max_separation_distance, 1.0f);
+
 			// Create support function
 			SupportBuffer buffer1_incl_cvx_radius, buffer2_incl_cvx_radius;
 			const Support *shape1_incl_cvx_radius = shape1->GetSupportFunction(ConvexShape::ESupportMode::IncludeConvexRadius, buffer1_incl_cvx_radius, inScale1);
 			const Support *shape2_incl_cvx_radius = shape2->GetSupportFunction(ConvexShape::ESupportMode::IncludeConvexRadius, buffer2_incl_cvx_radius, inScale2);
 
 			// Add separation distance
-			AddConvexRadius<Support> shape1_add_max_separation_distance(*shape1_incl_cvx_radius, inCollideShapeSettings.mMaxSeparationDistance);
+			AddConvexRadius shape1_add_max_separation_distance(*shape1_incl_cvx_radius, max_separation_distance);
 
 			// Transform shape 2 in the space of shape 1
-			TransformedConvexObject<Support> transformed2_incl_cvx_radius(transform_2_to_1, *shape2_incl_cvx_radius);
+			TransformedConvexObject transformed2_incl_cvx_radius(transform_2_to_1, *shape2_incl_cvx_radius);
 
 			// Perform EPA step
 			if (!pen_depth.GetPenetrationDepthStepEPA(shape1_add_max_separation_distance, transformed2_incl_cvx_radius, inCollideShapeSettings.mPenetrationTolerance, penetration_axis, point1, point2))
@@ -124,14 +131,14 @@ void ConvexShape::sCollideConvexVsConvex(const Shape *inShape1, const Shape *inS
 	}
 
 	// Check if the penetration is bigger than the early out fraction
-	float penetration_depth = (point2 - point1).Length() - inCollideShapeSettings.mMaxSeparationDistance;
+	float penetration_depth = (point2 - point1).Length() - max_separation_distance;
 	if (-penetration_depth >= ioCollector.GetEarlyOutFraction())
 		return;
 
 	// Correct point1 for the added separation distance
 	float penetration_axis_len = penetration_axis.Length();
 	if (penetration_axis_len > 0.0f)
-		point1 -= penetration_axis * (inCollideShapeSettings.mMaxSeparationDistance / penetration_axis_len);
+		point1 -= penetration_axis * (max_separation_distance / penetration_axis_len);
 
 	// Convert to world space
 	point1 = inCenterOfMassTransform1 * point1;
@@ -164,7 +171,7 @@ bool ConvexShape::CastRay(const RayCast &inRay, const SubShapeIDCreator &inSubSh
 
 	// Create support function
 	SupportBuffer buffer;
-	const Support *support = GetSupportFunction(ConvexShape::ESupportMode::IncludeConvexRadius, buffer, Vec3::sReplicate(1.0f));
+	const Support *support = GetSupportFunction(ConvexShape::ESupportMode::IncludeConvexRadius, buffer, Vec3::sOne());
 
 	// Cast ray
 	GJKClosestPoint gjk;
@@ -234,7 +241,7 @@ void ConvexShape::CollidePoint(Vec3Arg inPoint, const SubShapeIDCreator &inSubSh
 	{
 		// Create support function
 		SupportBuffer buffer;
-		const Support *support = GetSupportFunction(ConvexShape::ESupportMode::IncludeConvexRadius, buffer, Vec3::sReplicate(1.0f));
+		const Support *support = GetSupportFunction(ConvexShape::ESupportMode::IncludeConvexRadius, buffer, Vec3::sOne());
 
 		// Create support function for point
 		PointConvexSupport point { inPoint };
@@ -312,7 +319,7 @@ public:
 		mLocalToWorld(Mat44::sRotationTranslation(inRotation, inPositionCOM) * Mat44::sScale(inScale)),
 		mIsInsideOut(ScaleHelpers::IsInsideOut(inScale))
 	{
-		mSupport = inShape->GetSupportFunction(ESupportMode::IncludeConvexRadius, mSupportBuffer, Vec3::sReplicate(1.0f));
+		mSupport = inShape->GetSupportFunction(ESupportMode::IncludeConvexRadius, mSupportBuffer, Vec3::sOne());
 	}
 
 	SupportBuffer		mSupportBuffer;
@@ -446,7 +453,7 @@ void ConvexShape::DrawGetSupportFunction(DebugRenderer *inRenderer, RMat44Arg in
 	// Get the support function with convex radius
 	SupportBuffer buffer;
 	const Support *support = GetSupportFunction(ESupportMode::ExcludeConvexRadius, buffer, inScale);
-	AddConvexRadius<Support> add_convex(*support, support->GetConvexRadius());
+	AddConvexRadius add_convex(*support, support->GetConvexRadius());
 
 	// Draw the shape
 	DebugRenderer::GeometryRef geometry = inRenderer->CreateTriangleGeometryForConvex([&add_convex](Vec3Arg inDirection) { return add_convex.GetSupport(inDirection); });
@@ -498,7 +505,7 @@ void ConvexShape::DrawGetSupportingFace(DebugRenderer *inRenderer, RMat44Arg inC
 		SupportingFace face = ftd.first;
 
 		// Displace the face a little bit forward so it is easier to see
-		Vec3 normal = face.size() >= 3? (face[2] - face[1]).Cross(face[0] - face[1]).Normalized() : Vec3::sZero();
+		Vec3 normal = face.size() >= 3? (face[2] - face[1]).Cross(face[0] - face[1]).NormalizedOr(Vec3::sZero()) : Vec3::sZero();
 		Vec3 displacement = 0.001f * normal;
 
 		// Transform face to world space and calculate center of mass
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp
index 06fc5ec7..cb8d4ac9 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/CylinderShape.cpp
@@ -200,13 +200,14 @@ void CylinderShape::GetSupportingFace(const SubShapeID &inSubShapeID, Vec3Arg in
 	float scaled_radius = scale_xz * mRadius;
 
 	float x = inDirection.GetX(), y = inDirection.GetY(), z = inDirection.GetZ();
-	float o = sqrt(Square(x) + Square(z));
+	float xz_sq = Square(x) + Square(z);
+	float y_sq = Square(y);
 
-	// If o / |y| > scaled_radius / scaled_half_height, we're hitting the side
-	if (o * scaled_half_height > scaled_radius * abs(y))
+	// Check which component is bigger
+	if (xz_sq > y_sq)
 	{
 		// Hitting side
-		float f = -scaled_radius / o;
+		float f = -scaled_radius / sqrt(xz_sq);
 		float vx = x * f;
 		float vz = z * f;
 		outVertices.push_back(inCenterOfMassTransform * Vec3(vx, scaled_half_height, vz));
@@ -215,8 +216,21 @@ void CylinderShape::GetSupportingFace(const SubShapeID &inSubShapeID, Vec3Arg in
 	else
 	{
 		// Hitting top or bottom
+
+		// When the inDirection is more than 5 degrees from vertical, align the vertices so that 1 of the vertices
+		// points towards inDirection in the XZ plane. This ensures that we always have a vertex towards max penetration depth.
+		Mat44 transform = inCenterOfMassTransform;
+		if (xz_sq > 0.00765427f * y_sq)
+		{
+			Vec4 base_x = Vec4(x, 0, z, 0) / sqrt(xz_sq);
+			Vec4 base_z = base_x.Swizzle<SWIZZLE_Z, SWIZZLE_Y, SWIZZLE_X, SWIZZLE_W>() * Vec4(-1, 0, 1, 0);
+			transform = transform * Mat44(base_x, Vec4(0, 1, 0, 0), base_z, Vec4(0, 0, 0, 1));
+		}
+
+		// Adjust for scale and height
 		Vec3 multiplier = y < 0.0f? Vec3(scaled_radius, scaled_half_height, scaled_radius) : Vec3(-scaled_radius, -scaled_half_height, scaled_radius);
-		Mat44 transform = inCenterOfMassTransform.PreScaled(multiplier);
+		transform = transform.PreScaled(multiplier);
+
 		for (const Vec3 &v : cCylinderTopFace)
 			outVertices.push_back(transform * v);
 	}
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
index fcecdaf9..1d910635 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.cpp
@@ -201,119 +201,155 @@ uint32 HeightFieldShapeSettings::CalculateBitsPerSampleForError(float inMaxError
 
 void HeightFieldShape::CalculateActiveEdges(uint inX, uint inY, uint inSizeX, uint inSizeY, const float *inHeights, uint inHeightsStartX, uint inHeightsStartY, intptr_t inHeightsStride, float inHeightsScale, float inActiveEdgeCosThresholdAngle, TempAllocator &inAllocator)
 {
+	// Limit the block size so we don't allocate more than 64K memory from the temp allocator
+	uint block_size_x = min(inSizeX, 44u);
+	uint block_size_y = min(inSizeY, 44u);
+
 	// Allocate temporary buffer for normals
-	uint normals_size = 2 * inSizeX * inSizeY * sizeof(Vec3);
+	uint normals_size = 2 * (block_size_x + 1) * (block_size_y + 1) * sizeof(Vec3);
 	Vec3 *normals = (Vec3 *)inAllocator.Allocate(normals_size);
 	JPH_SCOPE_EXIT([&inAllocator, normals, normals_size]{ inAllocator.Free(normals, normals_size); });
 
-	// Calculate triangle normals and make normals zero for triangles that are missing
-	Vec3 *out_normal = normals;
-	for (uint y = 0; y < inSizeY; ++y)
-		for (uint x = 0; x < inSizeX; ++x)
+	// Update the edges in blocks
+	for (uint block_y = 0; block_y < inSizeY; block_y += block_size_y)
+		for (uint block_x = 0; block_x < inSizeX; block_x += block_size_x)
 		{
-			// Get height on diagonal
-			const float *height_samples = inHeights + (inY - inHeightsStartY + y) * inHeightsStride + (inX - inHeightsStartX + x);
-			float x1y1_h = height_samples[0];
-			float x2y2_h = height_samples[inHeightsStride + 1];
-			if (x1y1_h != cNoCollisionValue && x2y2_h != cNoCollisionValue)
-			{
-				// Calculate normal for lower left triangle (e.g. T1A)
-				float x1y2_h = height_samples[inHeightsStride];
-				if (x1y2_h != cNoCollisionValue)
-				{
-					Vec3 x2y2_minus_x1y2(mScale.GetX(), inHeightsScale * (x2y2_h - x1y2_h), 0);
-					Vec3 x1y1_minus_x1y2(0, inHeightsScale * (x1y1_h - x1y2_h), -mScale.GetZ());
-					out_normal[0] = x2y2_minus_x1y2.Cross(x1y1_minus_x1y2).Normalized();
-				}
-				else
-					out_normal[0] = Vec3::sZero();
+			// Calculate the bottom right corner of the block
+			uint block_x_end = min(block_x + block_size_x, inSizeX);
+			uint block_y_end = min(block_y + block_size_y, inSizeY);
 
-				// Calculate normal for upper right triangle (e.g. T1B)
-				float x2y1_h = height_samples[1];
-				if (x2y1_h != cNoCollisionValue)
-				{
-					Vec3 x1y1_minus_x2y1(-mScale.GetX(), inHeightsScale * (x1y1_h - x2y1_h), 0);
-					Vec3 x2y2_minus_x2y1(0, inHeightsScale * (x2y2_h - x2y1_h), mScale.GetZ());
-					out_normal[1] = x1y1_minus_x2y1.Cross(x2y2_minus_x2y1).Normalized();
-				}
-				else
-					out_normal[1] = Vec3::sZero();
+			// If we're not at the first block in x, we need one extra column of normals to the left
+			uint normals_x_start, normals_x_skip;
+			if (block_x > 0)
+			{
+				normals_x_start = block_x - 1;
+				normals_x_skip = 2; // We need to skip over that extra column
 			}
 			else
 			{
-				out_normal[0] = Vec3::sZero();
-				out_normal[1] = Vec3::sZero();
+				normals_x_start = 0;
+				normals_x_skip = 0;
 			}
 
-			out_normal += 2;
+			// If we're not at the last block in y, we need one extra row of normals at the bottom
+			uint normals_y_end = block_y_end < inSizeY? block_y_end + 1 : inSizeY;
+
+			// Calculate triangle normals and make normals zero for triangles that are missing
+			Vec3 *out_normal = normals;
+			for (uint y = block_y; y < normals_y_end; ++y)
+			{
+				for (uint x = normals_x_start; x < block_x_end; ++x)
+				{
+					// Get height on diagonal
+					const float *height_samples = inHeights + (inY - inHeightsStartY + y) * inHeightsStride + (inX - inHeightsStartX + x);
+					float x1y1_h = height_samples[0];
+					float x2y2_h = height_samples[inHeightsStride + 1];
+					if (x1y1_h != cNoCollisionValue && x2y2_h != cNoCollisionValue)
+					{
+						// Calculate normal for lower left triangle (e.g. T1A)
+						float x1y2_h = height_samples[inHeightsStride];
+						if (x1y2_h != cNoCollisionValue)
+						{
+							Vec3 x2y2_minus_x1y2(mScale.GetX(), inHeightsScale * (x2y2_h - x1y2_h), 0);
+							Vec3 x1y1_minus_x1y2(0, inHeightsScale * (x1y1_h - x1y2_h), -mScale.GetZ());
+							out_normal[0] = x2y2_minus_x1y2.Cross(x1y1_minus_x1y2).Normalized();
+						}
+						else
+							out_normal[0] = Vec3::sZero();
+
+						// Calculate normal for upper right triangle (e.g. T1B)
+						float x2y1_h = height_samples[1];
+						if (x2y1_h != cNoCollisionValue)
+						{
+							Vec3 x1y1_minus_x2y1(-mScale.GetX(), inHeightsScale * (x1y1_h - x2y1_h), 0);
+							Vec3 x2y2_minus_x2y1(0, inHeightsScale * (x2y2_h - x2y1_h), mScale.GetZ());
+							out_normal[1] = x1y1_minus_x2y1.Cross(x2y2_minus_x2y1).Normalized();
+						}
+						else
+							out_normal[1] = Vec3::sZero();
+					}
+					else
+					{
+						out_normal[0] = Vec3::sZero();
+						out_normal[1] = Vec3::sZero();
+					}
+
+					out_normal += 2;
+				}
+			}
+
+			// Number of vectors to skip to get to the next row of normals
+			uint normals_pitch = 2 * (block_x_end - normals_x_start);
+
+			// Calculate active edges
+			const Vec3 *in_normal = normals;
+			uint global_bit_pos = 3 * ((inY + block_y) * (mSampleCount - 1) + (inX + block_x));
+			for (uint y = block_y; y < block_y_end; ++y)
+			{
+				in_normal += normals_x_skip; // If we have an extra column to the left, skip it here, we'll read it with in_normal[-1] below
+
+				for (uint x = block_x; x < block_x_end; ++x)
+				{
+					// Get vertex heights
+					const float *height_samples = inHeights + (inY - inHeightsStartY + y) * inHeightsStride + (inX - inHeightsStartX + x);
+					float x1y1_h = height_samples[0];
+					float x1y2_h = height_samples[inHeightsStride];
+					float x2y2_h = height_samples[inHeightsStride + 1];
+					bool x1y1_valid = x1y1_h != cNoCollisionValue;
+					bool x1y2_valid = x1y2_h != cNoCollisionValue;
+					bool x2y2_valid = x2y2_h != cNoCollisionValue;
+
+					// Calculate the edge flags (3 bits)
+					// See diagram in the next function for the edge numbering
+					uint16 edge_mask = 0b111;
+					uint16 edge_flags = 0;
+
+					// Edge 0
+					if (x == 0)
+						edge_mask &= 0b110; // We need normal x - 1 which we didn't calculate, don't update this edge
+					else if (x1y1_valid && x1y2_valid)
+					{
+						Vec3 edge0_direction(0, inHeightsScale * (x1y2_h - x1y1_h), mScale.GetZ());
+						if (ActiveEdges::IsEdgeActive(in_normal[0], in_normal[-1], edge0_direction, inActiveEdgeCosThresholdAngle))
+							edge_flags |= 0b001;
+					}
+
+					// Edge 1
+					if (y == inSizeY - 1)
+						edge_mask &= 0b101; // We need normal y + 1 which we didn't calculate, don't update this edge
+					else if (x1y2_valid && x2y2_valid)
+					{
+						Vec3 edge1_direction(mScale.GetX(), inHeightsScale * (x2y2_h - x1y2_h), 0);
+						if (ActiveEdges::IsEdgeActive(in_normal[0], in_normal[normals_pitch + 1], edge1_direction, inActiveEdgeCosThresholdAngle))
+							edge_flags |= 0b010;
+					}
+
+					// Edge 2
+					if (x1y1_valid && x2y2_valid)
+					{
+						Vec3 edge2_direction(-mScale.GetX(), inHeightsScale * (x1y1_h - x2y2_h), -mScale.GetZ());
+						if (ActiveEdges::IsEdgeActive(in_normal[0], in_normal[1], edge2_direction, inActiveEdgeCosThresholdAngle))
+							edge_flags |= 0b100;
+					}
+
+					// Store the edge flags in the array
+					uint byte_pos = global_bit_pos >> 3;
+					uint bit_pos = global_bit_pos & 0b111;
+					JPH_ASSERT(byte_pos < mActiveEdgesSize);
+					uint8 *edge_flags_ptr = &mActiveEdges[byte_pos];
+					uint16 combined_edge_flags = uint16(edge_flags_ptr[0]) | uint16(uint16(edge_flags_ptr[1]) << 8);
+					combined_edge_flags &= ~(edge_mask << bit_pos);
+					combined_edge_flags |= edge_flags << bit_pos;
+					edge_flags_ptr[0] = uint8(combined_edge_flags);
+					edge_flags_ptr[1] = uint8(combined_edge_flags >> 8);
+
+					in_normal += 2;
+					global_bit_pos += 3;
+				}
+
+				global_bit_pos += 3 * (mSampleCount - 1 - (block_x_end - block_x));
+			}
 		}
-
-	// Calculate active edges
-	const Vec3 *in_normal = normals;
-	uint global_bit_pos = 3 * (inY * (mSampleCount - 1) + inX);
-	for (uint y = 0; y < inSizeY; ++y)
-	{
-		for (uint x = 0; x < inSizeX; ++x)
-		{
-			// Get vertex heights
-			const float *height_samples = inHeights + (inY - inHeightsStartY + y) * inHeightsStride + (inX - inHeightsStartX + x);
-			float x1y1_h = height_samples[0];
-			float x1y2_h = height_samples[inHeightsStride];
-			float x2y2_h = height_samples[inHeightsStride + 1];
-			bool x1y1_valid = x1y1_h != cNoCollisionValue;
-			bool x1y2_valid = x1y2_h != cNoCollisionValue;
-			bool x2y2_valid = x2y2_h != cNoCollisionValue;
-
-			// Calculate the edge flags (3 bits)
-			// See diagram in the next function for the edge numbering
-			uint16 edge_mask = 0b111;
-			uint16 edge_flags = 0;
-
-			// Edge 0
-			if (x == 0)
-				edge_mask &= 0b110; // We need normal x - 1 which we didn't calculate, don't update this edge
-			else if (x1y1_valid && x1y2_valid)
-			{
-				Vec3 edge0_direction(0, inHeightsScale * (x1y2_h - x1y1_h), mScale.GetZ());
-				if (ActiveEdges::IsEdgeActive(in_normal[0], in_normal[-1], edge0_direction, inActiveEdgeCosThresholdAngle))
-					edge_flags |= 0b001;
-			}
-
-			// Edge 1
-			if (y == inSizeY - 1)
-				edge_mask &= 0b101; // We need normal y + 1 which we didn't calculate, don't update this edge
-			else if (x1y2_valid && x2y2_valid)
-			{
-				Vec3 edge1_direction(mScale.GetX(), inHeightsScale * (x2y2_h - x1y2_h), 0);
-				if (ActiveEdges::IsEdgeActive(in_normal[0], in_normal[2 * inSizeX + 1], edge1_direction, inActiveEdgeCosThresholdAngle))
-					edge_flags |= 0b010;
-			}
-
-			// Edge 2
-			if (x1y1_valid && x2y2_valid)
-			{
-				Vec3 edge2_direction(-mScale.GetX(), inHeightsScale * (x1y1_h - x2y2_h), -mScale.GetZ());
-				if (ActiveEdges::IsEdgeActive(in_normal[0], in_normal[1], edge2_direction, inActiveEdgeCosThresholdAngle))
-					edge_flags |= 0b100;
-			}
-
-			// Store the edge flags in the array
-			uint byte_pos = global_bit_pos >> 3;
-			uint bit_pos = global_bit_pos & 0b111;
-			JPH_ASSERT(byte_pos < mActiveEdgesSize);
-			uint8 *edge_flags_ptr = &mActiveEdges[byte_pos];
-			uint16 combined_edge_flags = uint16(edge_flags_ptr[0]) | uint16(uint16(edge_flags_ptr[1]) << 8);
-			combined_edge_flags &= ~(edge_mask << bit_pos);
-			combined_edge_flags |= edge_flags << bit_pos;
-			edge_flags_ptr[0] = uint8(combined_edge_flags);
-			edge_flags_ptr[1] = uint8(combined_edge_flags >> 8);
-
-			in_normal += 2;
-			global_bit_pos += 3;
-		}
-
-		global_bit_pos += 3 * (mSampleCount - 1 - inSizeX);
-	}
 }
 
 void HeightFieldShape::CalculateActiveEdges(const HeightFieldShapeSettings &inSettings)
@@ -1710,7 +1746,7 @@ public:
 	JPH_INLINE explicit			DecodingContext(const HeightFieldShape *inShape) :
 		mShape(inShape)
 	{
-		static_assert(sizeof(sGridOffsets) / sizeof(uint) == cNumBitsXY + 1, "Offsets array is not long enough");
+		static_assert(std::size(sGridOffsets) == cNumBitsXY + 1, "Offsets array is not long enough");
 
 		// Construct root stack entry
 		mPropertiesStack[0] = 0; // level: 0, x: 0, y: 0
@@ -1869,8 +1905,8 @@ public:
 					uint32 stride = block_size_plus_1 - size_x_plus_1;
 
 					// Start range with a very large inside-out box
-					Vec3 value_min = Vec3::sReplicate(1.0e30f);
-					Vec3 value_max = Vec3::sReplicate(-1.0e30f);
+					Vec3 value_min = Vec3::sReplicate(cLargeFloat);
+					Vec3 value_max = Vec3::sReplicate(-cLargeFloat);
 
 					// Loop over the samples to determine the min and max of this block
 					for (uint32 block_y = 0; block_y < size_y_plus_1; ++block_y)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
index 16cbb763..5aa6de88 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/HeightFieldShape.h
@@ -69,14 +69,14 @@ public:
 	/// The height field is a surface defined by: mOffset + mScale * (x, mHeightSamples[y * mSampleCount + x], y).
 	/// where x and y are integers in the range x and y e [0, mSampleCount - 1].
 	Vec3							mOffset = Vec3::sZero();
-	Vec3							mScale = Vec3::sReplicate(1.0f);
+	Vec3							mScale = Vec3::sOne();
 	uint32							mSampleCount = 0;
 
 	/// Artificial minimal value of mHeightSamples, used for compression and can be used to update the terrain after creating with lower height values. If there are any lower values in mHeightSamples, this value will be ignored.
-	float							mMinHeightValue = FLT_MAX;
+	float							mMinHeightValue = cLargeFloat;
 
 	/// Artificial maximum value of mHeightSamples, used for compression and can be used to update the terrain after creating with higher height values. If there are any higher values in mHeightSamples, this value will be ignored.
-	float							mMaxHeightValue = -FLT_MAX;
+	float							mMaxHeightValue = -cLargeFloat;
 
 	/// When bigger than mMaterials.size() the internal material list will be preallocated to support this number of materials.
 	/// This avoids reallocations when calling HeightFieldShape::SetMaterials with new materials later.
@@ -349,7 +349,7 @@ private:
 	/// The height field is a surface defined by: mOffset + mScale * (x, mHeightSamples[y * mSampleCount + x], y).
 	/// where x and y are integers in the range x and y e [0, mSampleCount - 1].
 	Vec3							mOffset = Vec3::sZero();
-	Vec3							mScale = Vec3::sReplicate(1.0f);
+	Vec3							mScale = Vec3::sOne();
 
 	/// Height data
 	uint32							mSampleCount = 0;							///< See HeightFieldShapeSettings::mSampleCount
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp
index 852021a0..497f14e1 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.cpp
@@ -32,6 +32,7 @@
 #include <Jolt/Geometry/Plane.h>
 #include <Jolt/Geometry/OrientedBox.h>
 #include <Jolt/TriangleSplitter/TriangleSplitterBinning.h>
+#include <Jolt/TriangleSplitter/TriangleSplitterMean.h>
 #include <Jolt/AABBTree/AABBTreeBuilder.h>
 #include <Jolt/AABBTree/AABBTreeToBuffer.h>
 #include <Jolt/AABBTree/TriangleCodec/TriangleCodecIndexed8BitPackSOA4Flags.h>
@@ -55,6 +56,7 @@ JPH_IMPLEMENT_SERIALIZABLE_VIRTUAL(MeshShapeSettings)
 	JPH_ADD_ATTRIBUTE(MeshShapeSettings, mMaxTrianglesPerLeaf)
 	JPH_ADD_ATTRIBUTE(MeshShapeSettings, mActiveEdgeCosThresholdAngle)
 	JPH_ADD_ATTRIBUTE(MeshShapeSettings, mPerTriangleUserData)
+	JPH_ADD_ENUM_ATTRIBUTE(MeshShapeSettings, mBuildQuality)
 }
 
 // Codecs this mesh shape is using
@@ -190,12 +192,36 @@ MeshShape::MeshShape(const MeshShapeSettings &inSettings, ShapeResult &outResult
 	sFindActiveEdges(inSettings, indexed_triangles);
 
 	// Create triangle splitter
-	TriangleSplitterBinning splitter(inSettings.mTriangleVertices, indexed_triangles);
+	union Storage
+	{
+									Storage() { }
+									~Storage() { }
+
+		TriangleSplitterBinning		mBinning;
+		TriangleSplitterMean		mMean;
+	};
+	Storage storage;
+	TriangleSplitter *splitter = nullptr;
+	switch (inSettings.mBuildQuality)
+	{
+	case MeshShapeSettings::EBuildQuality::FavorRuntimePerformance:
+		splitter = new (&storage.mBinning) TriangleSplitterBinning(inSettings.mTriangleVertices, indexed_triangles);
+		break;
+
+	case MeshShapeSettings::EBuildQuality::FavorBuildSpeed:
+		splitter = new (&storage.mMean) TriangleSplitterMean(inSettings.mTriangleVertices, indexed_triangles);
+		break;
+
+	default:
+		JPH_ASSERT(false);
+		break;
+	}
 
 	// Build tree
-	AABBTreeBuilder builder(splitter, inSettings.mMaxTrianglesPerLeaf);
+	AABBTreeBuilder builder(*splitter, inSettings.mMaxTrianglesPerLeaf);
 	AABBTreeBuilderStats builder_stats;
 	const AABBTreeBuilder::Node *root = builder.Build(builder_stats);
+	splitter->~TriangleSplitter();
 
 	// Convert to buffer
 	AABBTreeToBuffer<TriangleCodec, NodeCodec> buffer;
@@ -221,6 +247,14 @@ MeshShape::MeshShape(const MeshShapeSettings &inSettings, ShapeResult &outResult
 
 void MeshShape::sFindActiveEdges(const MeshShapeSettings &inSettings, IndexedTriangleList &ioIndices)
 {
+	// Check if we're requested to make all edges active
+	if (inSettings.mActiveEdgeCosThresholdAngle < 0.0f)
+	{
+		for (IndexedTriangle &triangle : ioIndices)
+			triangle.mMaterialIndex |= 0b111 << FLAGS_ACTIVE_EGDE_SHIFT;
+		return;
+	}
+
 	// A struct to hold the two vertex indices of an edge
 	struct Edge
 	{
@@ -349,7 +383,7 @@ MassProperties MeshShape::GetMassProperties() const
 	// creating a Body:
 	//
 	// BodyCreationSettings::mOverrideMassProperties = EOverrideMassProperties::MassAndInertiaProvided;
-	// BodyCreationSettings::mMassPropertiesOverride.SetMassAndInertiaOfSolidBox(Vec3::sReplicate(1.0f), 1000.0f);
+	// BodyCreationSettings::mMassPropertiesOverride.SetMassAndInertiaOfSolidBox(Vec3::sOne(), 1000.0f);
 	//
 	// Note that for a mesh shape to simulate properly, it is best if the mesh is manifold
 	// (i.e. closed, all edges shared by only two triangles, consistent winding order).
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h
index a211b7a0..b5a637ed 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MeshShape.h
@@ -58,6 +58,8 @@ public:
 	/// Cosine of the threshold angle (if the angle between the two triangles is bigger than this, the edge is active, note that a concave edge is always inactive).
 	/// Setting this value too small can cause ghost collisions with edges, setting it too big can cause depenetration artifacts (objects not depenetrating quickly).
 	/// Valid ranges are between cos(0 degrees) and cos(90 degrees). The default value is cos(5 degrees).
+	/// Negative values will make all edges active and causes EActiveEdgeMode::CollideOnlyWithActive to behave as EActiveEdgeMode::CollideWithAll.
+	/// This speeds up the build process but will require all bodies that can interact with the mesh to use BodyCreationSettings::mEnhancedInternalEdgeRemoval = true.
 	float							mActiveEdgeCosThresholdAngle = 0.996195f;					// cos(5 degrees)
 
 	/// When true, we store the user data coming from Triangle::mUserData or IndexedTriangle::mUserData in the mesh shape.
@@ -65,6 +67,15 @@ public:
 	/// Can be retrieved using MeshShape::GetTriangleUserData.
 	/// Turning this on increases the memory used by the MeshShape by roughly 25%.
 	bool							mPerTriangleUserData = false;
+
+	enum class EBuildQuality
+	{
+		FavorRuntimePerformance,																///< Favor runtime performance, takes more time to build the MeshShape but performs better
+		FavorBuildSpeed,																		///< Favor build speed, build the tree faster but the MeshShape will be slower
+	};
+
+	/// Determines the quality of the tree building process.
+	EBuildQuality					mBuildQuality = EBuildQuality::FavorRuntimePerformance;
 };
 
 /// A mesh shape, consisting of triangles. Mesh shapes are mostly used for static geometry.
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp
index fdedc9a3..16155bb2 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.cpp
@@ -142,8 +142,8 @@ void MutableCompoundShape::CalculateLocalBounds()
 	}
 	else
 	{
-		// There are no subshapes, set the bounding box to invalid
-		mLocalBounds.SetEmpty();
+		// There are no subshapes, make the bounding box empty
+		mLocalBounds.mMin = mLocalBounds.mMax = Vec3::sZero();
 	}
 
 	// Cache the inner radius as it can take a while to recursively iterate over all sub shapes
@@ -181,7 +181,7 @@ void MutableCompoundShape::CalculateSubShapeBounds(uint inStartIdx, uint inNumbe
 				Mat44 transform = Mat44::sRotationTranslation(sub_shape.GetRotation(), sub_shape.GetPositionCOM());
 
 				// Get the bounding box
-				sub_shape_bounds = sub_shape.mShape->GetWorldSpaceBounds(transform, Vec3::sReplicate(1.0f));
+				sub_shape_bounds = sub_shape.mShape->GetWorldSpaceBounds(transform, Vec3::sOne());
 			}
 
 			// Put the bounds as columns in a matrix
@@ -206,29 +206,37 @@ void MutableCompoundShape::CalculateSubShapeBounds(uint inStartIdx, uint inNumbe
 	CalculateLocalBounds();
 }
 
-uint MutableCompoundShape::AddShape(Vec3Arg inPosition, QuatArg inRotation, const Shape *inShape, uint32 inUserData)
+uint MutableCompoundShape::AddShape(Vec3Arg inPosition, QuatArg inRotation, const Shape *inShape, uint32 inUserData, uint inIndex)
 {
 	SubShape sub_shape;
 	sub_shape.mShape = inShape;
 	sub_shape.mUserData = inUserData;
 	sub_shape.SetTransform(inPosition, inRotation, mCenterOfMass);
-	mSubShapes.push_back(sub_shape);
-	uint shape_idx = (uint)mSubShapes.size() - 1;
 
-	CalculateSubShapeBounds(shape_idx, 1);
-
-	return shape_idx;
+	if (inIndex >= mSubShapes.size())
+	{
+		uint shape_idx = uint(mSubShapes.size());
+		mSubShapes.push_back(sub_shape);
+		CalculateSubShapeBounds(shape_idx, 1);
+		return shape_idx;
+	}
+	else
+	{
+		mSubShapes.insert(mSubShapes.begin() + inIndex, sub_shape);
+		CalculateSubShapeBounds(inIndex, uint(mSubShapes.size()) - inIndex);
+		return inIndex;
+	}
 }
 
 void MutableCompoundShape::RemoveShape(uint inIndex)
 {
 	mSubShapes.erase(mSubShapes.begin() + inIndex);
 
+	// We always need to recalculate the bounds of the sub shapes as we test blocks
+	// of 4 sub shapes at a time and removed shapes get their bounds updated
+	// to repeat the bounds of the previous sub shape
 	uint num_bounds = (uint)mSubShapes.size() - inIndex;
-	if (num_bounds > 0)
-		CalculateSubShapeBounds(inIndex, num_bounds);
-	else
-		CalculateLocalBounds();
+	CalculateSubShapeBounds(inIndex, num_bounds);
 }
 
 void MutableCompoundShape::ModifyShape(uint inIndex, Vec3Arg inPosition, QuatArg inRotation)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.h
index c3f6ff29..0953b662 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/MutableCompoundShape.h
@@ -27,6 +27,8 @@ public:
 /// Note: If you're using MutableCompoundShape and are querying data while modifying the shape you'll have a race condition.
 /// In this case it is best to create a new MutableCompoundShape using the Clone function. You replace the shape on a body using BodyInterface::SetShape.
 /// If a query is still working on the old shape, it will have taken a reference and keep the old shape alive until the query finishes.
+///
+/// When you modify a MutableCompoundShape, beware that the SubShapeIDs of all other shapes can change. So be careful when storing SubShapeIDs.
 class JPH_EXPORT MutableCompoundShape final : public CompoundShape
 {
 public:
@@ -66,8 +68,13 @@ public:
 
 	/// Adding a new shape.
 	/// Beware this can create a race condition if you're running collision queries in parallel. See class documentation for more information.
+	/// @param inPosition The position of the new shape
+	/// @param inRotation The orientation of the new shape
+	/// @param inShape The shape to add
+	/// @param inUserData User data that will be stored with the shape and can be retrieved using GetCompoundUserData
+	/// @param inIndex Index where to insert the shape, UINT_MAX to add to the end
 	/// @return The index of the newly added shape
-	uint							AddShape(Vec3Arg inPosition, QuatArg inRotation, const Shape *inShape, uint32 inUserData = 0);
+	uint							AddShape(Vec3Arg inPosition, QuatArg inRotation, const Shape *inShape, uint32 inUserData = 0, uint inIndex = UINT_MAX);
 
 	/// Remove a shape by index.
 	/// Beware this can create a race condition if you're running collision queries in parallel. See class documentation for more information.
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h
index c9a7810b..d34054b6 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/PlaneShape.h
@@ -71,7 +71,7 @@ public:
 	virtual MassProperties			GetMassProperties() const override;
 
 	// See Shape::GetMaterial
-	virtual const PhysicsMaterial *	GetMaterial(const SubShapeID &inSubShapeID) const override	{ JPH_ASSERT(inSubShapeID.IsEmpty(), "Invalid subshape ID"); return mMaterial != nullptr? mMaterial : PhysicsMaterial::sDefault; }
+	virtual const PhysicsMaterial *	GetMaterial(const SubShapeID &inSubShapeID) const override	{ JPH_ASSERT(inSubShapeID.IsEmpty(), "Invalid subshape ID"); return GetMaterial(); }
 
 	// See Shape::GetSurfaceNormal
 	virtual Vec3					GetSurfaceNormal(const SubShapeID &inSubShapeID, Vec3Arg inLocalSurfacePosition) const override { JPH_ASSERT(inSubShapeID.IsEmpty(), "Invalid subshape ID"); return mPlane.GetNormal(); }
@@ -114,6 +114,10 @@ public:
 	// See Shape::GetVolume
 	virtual float					GetVolume() const override									{ return 0; }
 
+	/// Material of the shape
+	void							SetMaterial(const PhysicsMaterial *inMaterial)				{ mMaterial = inMaterial; }
+	const PhysicsMaterial *			GetMaterial() const											{ return mMaterial != nullptr? mMaterial : PhysicsMaterial::sDefault; }
+
 	// Register shape functions with the registry
 	static void						sRegister();
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ScaleHelpers.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ScaleHelpers.h
index 4035dd77..f1c9f6fa 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ScaleHelpers.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/ScaleHelpers.h
@@ -18,7 +18,7 @@ namespace ScaleHelpers
 	static constexpr float	cScaleToleranceSq = 1.0e-8f;
 
 	/// Test if a scale is identity
-	inline bool				IsNotScaled(Vec3Arg inScale)									{ return inScale.IsClose(Vec3::sReplicate(1.0f), cScaleToleranceSq); }
+	inline bool				IsNotScaled(Vec3Arg inScale)									{ return inScale.IsClose(Vec3::sOne(), cScaleToleranceSq); }
 
 	/// Test if a scale is uniform
 	inline bool				IsUniformScale(Vec3Arg inScale)									{ return inScale.Swizzle<SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_X>().IsClose(inScale, cScaleToleranceSq); }
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/Shape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/Shape.cpp
index a3c37c0d..e5af580b 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/Shape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/Shape.cpp
@@ -233,7 +233,7 @@ Vec3 Shape::MakeScaleValid(Vec3Arg inScale) const
 
 Shape::ShapeResult Shape::ScaleShape(Vec3Arg inScale) const
 {
-	const Vec3 unit_scale = Vec3::sReplicate(1.0f);
+	const Vec3 unit_scale = Vec3::sOne();
 
 	if (inScale.IsNearZero())
 	{
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.cpp
index b44dd77a..00bf4ee3 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/SphereShape.cpp
@@ -303,7 +303,7 @@ void SphereShape::CollideSoftBodyVertices(Mat44Arg inCenterOfMassTransform, Vec3
 void SphereShape::GetTrianglesStart(GetTrianglesContext &ioContext, const AABox &inBox, Vec3Arg inPositionCOM, QuatArg inRotation, Vec3Arg inScale) const
 {
 	float scaled_radius = GetScaledRadius(inScale);
-	new (&ioContext) GetTrianglesContextVertexList(inPositionCOM, inRotation, Vec3::sReplicate(1.0f), Mat44::sScale(scaled_radius), sUnitSphereTriangles.data(), sUnitSphereTriangles.size(), GetMaterial());
+	new (&ioContext) GetTrianglesContextVertexList(inPositionCOM, inRotation, Vec3::sOne(), Mat44::sScale(scaled_radius), sUnitSphereTriangles.data(), sUnitSphereTriangles.size(), GetMaterial());
 }
 
 int SphereShape::GetTrianglesNext(GetTrianglesContext &ioContext, int inMaxTrianglesRequested, Float3 *outTriangleVertices, const PhysicsMaterial **outMaterials) const
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/StaticCompoundShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/StaticCompoundShape.cpp
index eb9ec06b..88db1689 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/StaticCompoundShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/StaticCompoundShape.cpp
@@ -234,7 +234,7 @@ StaticCompoundShape::StaticCompoundShape(const StaticCompoundShapeSettings &inSe
 
 		// Transform the shape's bounds into our local space
 		Mat44 transform = Mat44::sRotationTranslation(shape.GetRotation(), shape.GetPositionCOM());
-		AABox shape_bounds = shape.mShape->GetWorldSpaceBounds(transform, Vec3::sReplicate(1.0f));
+		AABox shape_bounds = shape.mShape->GetWorldSpaceBounds(transform, Vec3::sOne());
 
 		// Store bounds and body index for tree construction
 		bounds[i] = shape_bounds;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCapsuleShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCapsuleShape.cpp
index a3a9e020..3f9a3ebf 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCapsuleShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCapsuleShape.cpp
@@ -376,7 +376,7 @@ void TaperedCapsuleShape::Draw(DebugRenderer *inRenderer, RMat44Arg inCenterOfMa
 	if (mGeometry == nullptr)
 	{
 		SupportBuffer buffer;
-		const Support *support = GetSupportFunction(ESupportMode::IncludeConvexRadius, buffer, Vec3::sReplicate(1.0f));
+		const Support *support = GetSupportFunction(ESupportMode::IncludeConvexRadius, buffer, Vec3::sOne());
 		mGeometry = inRenderer->CreateTriangleGeometryForConvex([support](Vec3Arg inDirection) { return support->GetSupport(inDirection); });
 	}
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp
index 1bb9c585..daeba918 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TaperedCylinderShape.cpp
@@ -265,24 +265,40 @@ void TaperedCylinderShape::GetSupportingFace(const SubShapeID &inSubShapeID, Vec
 		outVertices.push_back(inCenterOfMassTransform * (normal_xz * top_radius + Vec3(0, top, 0)));
 		outVertices.push_back(inCenterOfMassTransform * (normal_xz * bottom_radius + Vec3(0, bottom, 0)));
 	}
-	else if (inDirection.GetY() < 0.0f)
-	{
-		// Top of the cylinder
-		if (top_radius > cMinRadius)
-		{
-			Vec3 top_3d(0, top, 0);
-			for (Vec3 v : cTaperedCylinderFace)
-				outVertices.push_back(inCenterOfMassTransform * (top_radius * v + top_3d));
-		}
-	}
 	else
 	{
-		// Bottom of the cylinder
-		if (bottom_radius > cMinRadius)
+		// When the inDirection is more than 5 degrees from vertical, align the vertices so that 1 of the vertices
+		// points towards inDirection in the XZ plane. This ensures that we always have a vertex towards max penetration depth.
+		Mat44 transform = inCenterOfMassTransform;
+		Vec4 base_x = Vec4(inDirection.GetX(), 0, inDirection.GetZ(), 0);
+		float xz_sq = base_x.LengthSq();
+		float y_sq = Square(inDirection.GetY());
+		if (xz_sq > 0.00765427f * y_sq)
 		{
-			Vec3 bottom_3d(0, bottom, 0);
-			for (const Vec3 *v = cTaperedCylinderFace + std::size(cTaperedCylinderFace) - 1; v >= cTaperedCylinderFace; --v)
-				outVertices.push_back(inCenterOfMassTransform * (bottom_radius * *v + bottom_3d));
+			base_x /= sqrt(xz_sq);
+			Vec4 base_z = base_x.Swizzle<SWIZZLE_Z, SWIZZLE_Y, SWIZZLE_X, SWIZZLE_W>() * Vec4(-1, 0, 1, 0);
+			transform = transform * Mat44(base_x, Vec4(0, 1, 0, 0), base_z, Vec4(0, 0, 0, 1));
+		}
+
+		if (inDirection.GetY() < 0.0f)
+		{
+			// Top of the cylinder
+			if (top_radius > cMinRadius)
+			{
+				Vec3 top_3d(0, top, 0);
+				for (Vec3 v : cTaperedCylinderFace)
+					outVertices.push_back(transform * (top_radius * v + top_3d));
+			}
+		}
+		else
+		{
+			// Bottom of the cylinder
+			if (bottom_radius > cMinRadius)
+			{
+				Vec3 bottom_3d(0, bottom, 0);
+				for (const Vec3 *v = cTaperedCylinderFace + std::size(cTaperedCylinderFace) - 1; v >= cTaperedCylinderFace; --v)
+					outVertices.push_back(transform * (bottom_radius * *v + bottom_3d));
+			}
 		}
 	}
 }
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TriangleShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TriangleShape.cpp
index 5bfa05b9..ee22c7ce 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TriangleShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Collision/Shape/TriangleShape.cpp
@@ -188,7 +188,7 @@ MassProperties TriangleShape::GetMassProperties() const
 	// creating a Body:
 	//
 	// BodyCreationSettings::mOverrideMassProperties = EOverrideMassProperties::MassAndInertiaProvided;
-	// BodyCreationSettings::mMassPropertiesOverride.SetMassAndInertiaOfSolidBox(Vec3::sReplicate(1.0f), 1000.0f);
+	// BodyCreationSettings::mMassPropertiesOverride.SetMassAndInertiaOfSolidBox(Vec3::sOne(), 1000.0f);
 	//
 	// Note that this makes the triangle shape behave the same as a mesh shape with a single triangle.
 	// In practice there is very little use for a dynamic triangle shape as back side collisions will be ignored
@@ -413,6 +413,9 @@ void TriangleShape::sRegister()
 	{
 		CollisionDispatch::sRegisterCollideShape(s, EShapeSubType::Triangle, sCollideConvexVsTriangle);
 		CollisionDispatch::sRegisterCastShape(s, EShapeSubType::Triangle, sCastConvexVsTriangle);
+
+		CollisionDispatch::sRegisterCollideShape(EShapeSubType::Triangle, s, CollisionDispatch::sReversedCollideShape);
+		CollisionDispatch::sRegisterCastShape(EShapeSubType::Triangle, s, CollisionDispatch::sReversedCastShape);
 	}
 
 	// Specialized collision functions
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
index bae886ca..687ab895 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.cpp
@@ -249,9 +249,14 @@ void ContactConstraintManager::CachedBodyPair::RestoreState(StateRecorder &inStr
 
 void ContactConstraintManager::ManifoldCache::Init(uint inMaxBodyPairs, uint inMaxContactConstraints, uint inCachedManifoldsSize)
 {
-	mAllocator.Init(inMaxBodyPairs * sizeof(BodyPairMap::KeyValue) + inCachedManifoldsSize);
+	uint max_body_pairs = min(inMaxBodyPairs, cMaxBodyPairsLimit);
+	JPH_ASSERT(max_body_pairs == inMaxBodyPairs, "Cannot support this many body pairs!");
+	JPH_ASSERT(inMaxContactConstraints <= cMaxContactConstraintsLimit); // Should have been enforced by caller
+
+	mAllocator.Init(uint(min(uint64(max_body_pairs) * sizeof(BodyPairMap::KeyValue) + inCachedManifoldsSize, uint64(~uint(0)))));
+
 	mCachedManifolds.Init(GetNextPowerOf2(inMaxContactConstraints));
-	mCachedBodyPairs.Init(GetNextPowerOf2(inMaxBodyPairs));
+	mCachedBodyPairs.Init(GetNextPowerOf2(max_body_pairs));
 }
 
 void ContactConstraintManager::ManifoldCache::Clear()
@@ -676,14 +681,18 @@ ContactConstraintManager::~ContactConstraintManager()
 
 void ContactConstraintManager::Init(uint inMaxBodyPairs, uint inMaxContactConstraints)
 {
-	mMaxConstraints = inMaxContactConstraints;
+	// Limit the number of constraints so that the allocation size fits in an unsigned integer
+	mMaxConstraints = min(inMaxContactConstraints, cMaxContactConstraintsLimit);
+	JPH_ASSERT(mMaxConstraints == inMaxContactConstraints, "Cannot support this many contact constraints!");
 
 	// Calculate worst case cache usage
-	uint cached_manifolds_size = inMaxContactConstraints * (sizeof(CachedManifold) + (MaxContactPoints - 1) * sizeof(CachedContactPoint));
+	constexpr uint cMaxManifoldSizePerConstraint = sizeof(CachedManifold) + (MaxContactPoints - 1) * sizeof(CachedContactPoint);
+	static_assert(cMaxManifoldSizePerConstraint < sizeof(ContactConstraint)); // If not true, then the next line can overflow
+	uint cached_manifolds_size = mMaxConstraints * cMaxManifoldSizePerConstraint;
 
 	// Init the caches
-	mCache[0].Init(inMaxBodyPairs, inMaxContactConstraints, cached_manifolds_size);
-	mCache[1].Init(inMaxBodyPairs, inMaxContactConstraints, cached_manifolds_size);
+	mCache[0].Init(inMaxBodyPairs, mMaxConstraints, cached_manifolds_size);
+	mCache[1].Init(inMaxBodyPairs, mMaxConstraints, cached_manifolds_size);
 }
 
 void ContactConstraintManager::PrepareConstraintBuffer(PhysicsUpdateContext *inContext)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
index 3cb848cb..635ce435 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/ContactConstraintManager.h
@@ -472,6 +472,14 @@ private:
 		WorldContactPoints		mContactPoints;
 	};
 
+public:
+	/// The maximum value that can be passed to Init for inMaxContactConstraints. Note you should really use a lower value, using this value will cost a lot of memory!
+	static constexpr uint		cMaxContactConstraintsLimit = ~uint(0) / sizeof(ContactConstraint);
+
+	/// The maximum value that can be passed to Init for inMaxBodyPairs. Note you should really use a lower value, using this value will cost a lot of memory!
+	static constexpr uint		cMaxBodyPairsLimit = ~uint(0) / sizeof(BodyPairMap::KeyValue);
+
+private:
 	/// Internal helper function to calculate the friction and non-penetration constraint properties. Templated to the motion type to reduce the amount of branches and calculations.
 	template <EMotionType Type1, EMotionType Type2>
 	JPH_INLINE void				TemplatedCalculateFrictionAndNonPenetrationConstraintProperties(ContactConstraint &ioConstraint, const ContactSettings &inSettings, float inDeltaTime, Vec3Arg inGravityDeltaTime, RMat44Arg inTransformBody1, RMat44Arg inTransformBody2, const Body &inBody1, const Body &inBody2);
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/HingeConstraint.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/HingeConstraint.cpp
index 82465736..118e18ad 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/HingeConstraint.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Constraints/HingeConstraint.cpp
@@ -140,7 +140,7 @@ void HingeConstraint::SetLimits(float inLimitsMin, float inLimitsMax)
 	JPH_ASSERT(inLimitsMax >= 0.0f && inLimitsMax <= JPH_PI);
 	mLimitsMin = inLimitsMin;
 	mLimitsMax = inLimitsMax;
-	mHasLimits = mLimitsMin > -JPH_PI && mLimitsMax < JPH_PI;
+	mHasLimits = mLimitsMin > -JPH_PI || mLimitsMax < JPH_PI;
 }
 
 void HingeConstraint::CalculateA1AndTheta()
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsScene.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsScene.cpp
index 1e9c60d2..e1c4145f 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsScene.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsScene.cpp
@@ -42,7 +42,7 @@ void PhysicsScene::AddSoftBody(const SoftBodyCreationSettings &inSoftBody)
 
 bool PhysicsScene::FixInvalidScales()
 {
-	const Vec3 unit_scale = Vec3::sReplicate(1.0f);
+	const Vec3 unit_scale = Vec3::sOne();
 
 	bool success = true;
 	for (BodyCreationSettings &b : mBodies)
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
index 0f2ed58f..1109e253 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSettings.h
@@ -55,8 +55,8 @@ struct PhysicsSettings
 	/// Fraction of its inner radius a body may penetrate another body for the LinearCast motion quality
 	float		mLinearCastMaxPenetration = 0.25f;
 
-	/// Max squared distance to use to determine if two points are on the same plane for determining the contact manifold between two shape faces (unit: meter^2)
-	float		mManifoldToleranceSq = 1.0e-6f;
+	/// Max distance to use to determine if two points are on the same plane for determining the contact manifold between two shape faces (unit: meter)
+	float		mManifoldTolerance = 1.0e-3f;
 
 	/// Maximum distance to correct in a single iteration when solving position constraints (unit: meters)
 	float		mMaxPenetrationDistance = 0.2f;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
index 21569376..507ed4c1 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.cpp
@@ -77,13 +77,15 @@ PhysicsSystem::~PhysicsSystem()
 
 void PhysicsSystem::Init(uint inMaxBodies, uint inNumBodyMutexes, uint inMaxBodyPairs, uint inMaxContactConstraints, const BroadPhaseLayerInterface &inBroadPhaseLayerInterface, const ObjectVsBroadPhaseLayerFilter &inObjectVsBroadPhaseLayerFilter, const ObjectLayerPairFilter &inObjectLayerPairFilter)
 {
-	JPH_ASSERT(inMaxBodies <= BodyID::cMaxBodyIndex, "Cannot support this many bodies");
+	// Clamp max bodies
+	uint max_bodies = min(inMaxBodies, cMaxBodiesLimit);
+	JPH_ASSERT(max_bodies == inMaxBodies, "Cannot support this many bodies!");
 
 	mObjectVsBroadPhaseLayerFilter = &inObjectVsBroadPhaseLayerFilter;
 	mObjectLayerPairFilter = &inObjectLayerPairFilter;
 
 	// Initialize body manager
-	mBodyManager.Init(inMaxBodies, inNumBodyMutexes, inBroadPhaseLayerInterface);
+	mBodyManager.Init(max_bodies, inNumBodyMutexes, inBroadPhaseLayerInterface);
 
 	// Create broadphase
 	mBroadPhase = new BROAD_PHASE();
@@ -93,7 +95,7 @@ void PhysicsSystem::Init(uint inMaxBodies, uint inNumBodyMutexes, uint inMaxBody
 	mContactManager.Init(inMaxBodyPairs, inMaxContactConstraints);
 
 	// Init islands builder
-	mIslandBuilder.Init(inMaxBodies);
+	mIslandBuilder.Init(max_bodies);
 
 	// Initialize body interface
 	mBodyInterfaceLocking.Init(mBodyLockInterfaceLocking, mBodyManager, *mBroadPhase);
@@ -139,10 +141,10 @@ EPhysicsUpdateError PhysicsSystem::Update(float inDeltaTime, int inCollisionStep
 	// Sync point for the broadphase. This will allow it to do clean up operations without having any mutexes locked yet.
 	mBroadPhase->FrameSync();
 
-	// If there are no active bodies or there's no time delta
+	// If there are no active bodies (and no step listener to wake them up) or there's no time delta
 	uint32 num_active_rigid_bodies = mBodyManager.GetNumActiveBodies(EBodyType::RigidBody);
 	uint32 num_active_soft_bodies = mBodyManager.GetNumActiveBodies(EBodyType::SoftBody);
-	if ((num_active_rigid_bodies == 0 && num_active_soft_bodies == 0) || inDeltaTime <= 0.0f)
+	if ((num_active_rigid_bodies == 0 && num_active_soft_bodies == 0 && mStepListeners.empty()) || inDeltaTime <= 0.0f)
 	{
 		mBodyManager.LockAllBodies();
 
@@ -152,8 +154,9 @@ EPhysicsUpdateError PhysicsSystem::Update(float inDeltaTime, int inCollisionStep
 		mBroadPhase->UpdateFinalize(update_state);
 		mBroadPhase->UnlockModifications();
 
-		// Call contact removal callbacks from contacts that existed in the previous update
-		mContactManager.FinalizeContactCacheAndCallContactPointRemovedCallbacks(0, 0);
+		// If time has passed, call contact removal callbacks from contacts that existed in the previous update
+		if (inDeltaTime > 0.0f)
+			mContactManager.FinalizeContactCacheAndCallContactPointRemovedCallbacks(0, 0);
 
 		mBodyManager.UnlockAllBodies();
 		return EPhysicsUpdateError::None;
@@ -844,6 +847,9 @@ void PhysicsSystem::JobFindCollisions(PhysicsUpdateContext::Step *ioStep, int in
 	// (always start looking at results from the next job)
 	int read_queue_idx = (inJobIndex + 1) % ioStep->mBodyPairQueues.size();
 
+	// Allocate space to temporarily store a batch of active bodies
+	BodyID *active_bodies = (BodyID *)JPH_STACK_ALLOC(cActiveBodiesBatchSize * sizeof(BodyID));
+
 	for (;;)
 	{
 		// Check if there are active bodies to be processed
@@ -895,7 +901,6 @@ void PhysicsSystem::JobFindCollisions(PhysicsUpdateContext::Step *ioStep, int in
 
 				// Copy active bodies to temporary array, broadphase will reorder them
 				uint32 batch_size = active_bodies_read_idx_end - active_bodies_read_idx;
-				BodyID *active_bodies = (BodyID *)JPH_STACK_ALLOC(batch_size * sizeof(BodyID));
 				memcpy(active_bodies, mBodyManager.GetActiveBodiesUnsafe(EBodyType::RigidBody) + active_bodies_read_idx, batch_size * sizeof(BodyID));
 
 				// Find pairs in the broadphase
@@ -960,6 +965,23 @@ void PhysicsSystem::JobFindCollisions(PhysicsUpdateContext::Step *ioStep, int in
 	}
 }
 
+void PhysicsSystem::sDefaultSimCollideBodyVsBody(const Body &inBody1, const Body &inBody2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, CollideShapeSettings &ioCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter)
+{
+	SubShapeIDCreator part1, part2;
+
+	if (inBody1.GetEnhancedInternalEdgeRemovalWithBody(inBody2))
+	{
+		// Collide with enhanced internal edge removal
+		ioCollideShapeSettings.mActiveEdgeMode = EActiveEdgeMode::CollideWithAll;
+		InternalEdgeRemovingCollector::sCollideShapeVsShape(inBody1.GetShape(), inBody2.GetShape(), Vec3::sOne(), Vec3::sOne(), inCenterOfMassTransform1, inCenterOfMassTransform2, part1, part2, ioCollideShapeSettings, ioCollector, inShapeFilter);
+	}
+	else
+	{
+		// Regular collide
+		CollisionDispatch::sCollideShapeVsShape(inBody1.GetShape(), inBody2.GetShape(), Vec3::sOne(), Vec3::sOne(), inCenterOfMassTransform1, inCenterOfMassTransform2, part1, part2, ioCollideShapeSettings, ioCollector, inShapeFilter);
+	}
+}
+
 void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const BodyPair &inBodyPair)
 {
 	JPH_PROFILE_FUNCTION();
@@ -1003,13 +1025,10 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 		if (body_pair_handle == nullptr)
 			return; // Out of cache space
 
-		// If we want enhanced active edge detection for this body pair
-		bool enhanced_active_edges = body1->GetEnhancedInternalEdgeRemovalWithBody(*body2);
-
 		// Create the query settings
 		CollideShapeSettings settings;
 		settings.mCollectFacesMode = ECollectFacesMode::CollectFaces;
-		settings.mActiveEdgeMode = mPhysicsSettings.mCheckActiveEdges && !enhanced_active_edges? EActiveEdgeMode::CollideOnlyWithActive : EActiveEdgeMode::CollideWithAll;
+		settings.mActiveEdgeMode = mPhysicsSettings.mCheckActiveEdges? EActiveEdgeMode::CollideOnlyWithActive : EActiveEdgeMode::CollideWithAll;
 		settings.mMaxSeparationDistance = body1->IsSensor() || body2->IsSensor()? 0.0f : mPhysicsSettings.mSpeculativeContactDistance;
 		settings.mActiveEdgeMovementDirection = body1->GetLinearVelocity() - body2->GetLinearVelocity();
 
@@ -1121,7 +1140,7 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 
 					// Determine contact points
 					const PhysicsSettings &settings = mSystem->mPhysicsSettings;
-					ManifoldBetweenTwoFaces(inResult.mContactPointOn1, inResult.mContactPointOn2, inResult.mPenetrationAxis, Square(settings.mSpeculativeContactDistance) + settings.mManifoldToleranceSq, inResult.mShape1Face, inResult.mShape2Face, manifold->mRelativeContactPointsOn1, manifold->mRelativeContactPointsOn2 JPH_IF_DEBUG_RENDERER(, mBody1->GetCenterOfMassPosition()));
+					ManifoldBetweenTwoFaces(inResult.mContactPointOn1, inResult.mContactPointOn2, inResult.mPenetrationAxis, settings.mSpeculativeContactDistance + settings.mManifoldTolerance, inResult.mShape1Face, inResult.mShape2Face, manifold->mRelativeContactPointsOn1, manifold->mRelativeContactPointsOn2 JPH_IF_DEBUG_RENDERER(, mBody1->GetCenterOfMassPosition()));
 
 					// Prune if we have more than 32 points (this means we could run out of space in the next iteration)
 					if (manifold->mRelativeContactPointsOn1.size() > 32)
@@ -1137,9 +1156,7 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 			ReductionCollideShapeCollector collector(this, body1, body2);
 
 			// Perform collision detection between the two shapes
-			SubShapeIDCreator part1, part2;
-			auto f = enhanced_active_edges? InternalEdgeRemovingCollector::sCollideShapeVsShape : CollisionDispatch::sCollideShapeVsShape;
-			f(body1->GetShape(), body2->GetShape(), Vec3::sReplicate(1.0f), Vec3::sReplicate(1.0f), transform1, transform2, part1, part2, settings, collector, shape_filter);
+			mSimCollideBodyVsBody(*body1, *body2, transform1, transform2, settings, collector, shape_filter);
 
 			// Add the contacts
 			for (ContactManifold &manifold : collector.mManifolds)
@@ -1207,7 +1224,7 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 					ContactManifold manifold;
 					manifold.mBaseOffset = mBody1->GetCenterOfMassPosition();
 					const PhysicsSettings &settings = mSystem->mPhysicsSettings;
-					ManifoldBetweenTwoFaces(inResult.mContactPointOn1, inResult.mContactPointOn2, inResult.mPenetrationAxis, Square(settings.mSpeculativeContactDistance) + settings.mManifoldToleranceSq, inResult.mShape1Face, inResult.mShape2Face, manifold.mRelativeContactPointsOn1, manifold.mRelativeContactPointsOn2 JPH_IF_DEBUG_RENDERER(, manifold.mBaseOffset));
+					ManifoldBetweenTwoFaces(inResult.mContactPointOn1, inResult.mContactPointOn2, inResult.mPenetrationAxis, settings.mSpeculativeContactDistance + settings.mManifoldTolerance, inResult.mShape1Face, inResult.mShape2Face, manifold.mRelativeContactPointsOn1, manifold.mRelativeContactPointsOn2 JPH_IF_DEBUG_RENDERER(, manifold.mBaseOffset));
 
 					// Calculate normal
 					manifold.mWorldSpaceNormal = inResult.mPenetrationAxis.Normalized();
@@ -1238,9 +1255,7 @@ void PhysicsSystem::ProcessBodyPair(ContactAllocator &ioContactAllocator, const
 			NonReductionCollideShapeCollector collector(this, ioContactAllocator, body1, body2, body_pair_handle);
 
 			// Perform collision detection between the two shapes
-			SubShapeIDCreator part1, part2;
-			auto f = enhanced_active_edges? InternalEdgeRemovingCollector::sCollideShapeVsShape : CollisionDispatch::sCollideShapeVsShape;
-			f(body1->GetShape(), body2->GetShape(), Vec3::sReplicate(1.0f), Vec3::sReplicate(1.0f), transform1, transform2, part1, part2, settings, collector, shape_filter);
+			mSimCollideBodyVsBody(*body1, *body2, transform1, transform2, settings, collector, shape_filter);
 
 			constraint_created = collector.mConstraintCreated;
 		}
@@ -1709,9 +1724,9 @@ void PhysicsSystem::JobFindCCDContacts(const PhysicsUpdateContext *ioContext, Ph
 		if (sDrawMotionQualityLinearCast)
 		{
 			RMat44 com = body.GetCenterOfMassTransform();
-			body.GetShape()->Draw(DebugRenderer::sInstance, com, Vec3::sReplicate(1.0f), Color::sGreen, false, true);
+			body.GetShape()->Draw(DebugRenderer::sInstance, com, Vec3::sOne(), Color::sGreen, false, true);
 			DebugRenderer::sInstance->DrawArrow(com.GetTranslation(), com.GetTranslation() + ccd_body.mDeltaPosition, Color::sGreen, 0.1f);
-			body.GetShape()->Draw(DebugRenderer::sInstance, com.PostTranslated(ccd_body.mDeltaPosition), Vec3::sReplicate(1.0f), Color::sRed, false, true);
+			body.GetShape()->Draw(DebugRenderer::sInstance, com.PostTranslated(ccd_body.mDeltaPosition), Vec3::sOne(), Color::sRed, false, true);
 		}
 	#endif // JPH_DEBUG_RENDERER
 
@@ -1917,7 +1932,7 @@ void PhysicsSystem::JobFindCCDContacts(const PhysicsUpdateContext *ioContext, Ph
 		SimShapeFilterWrapper &shape_filter = shape_filter_union.GetSimShapeFilterWrapper();
 
 		// Check if we collide with any other body. Note that we use the non-locking interface as we know the broadphase cannot be modified at this point.
-		RShapeCast shape_cast(body.GetShape(), Vec3::sReplicate(1.0f), body.GetCenterOfMassTransform(), ccd_body.mDeltaPosition);
+		RShapeCast shape_cast(body.GetShape(), Vec3::sOne(), body.GetCenterOfMassTransform(), ccd_body.mDeltaPosition);
 		CCDBroadPhaseCollector bp_collector(ccd_body, body, shape_cast, settings, shape_filter, np_collector, mBodyManager, ioStep, ioContext->mStepDeltaTime);
 		mBroadPhase->CastAABoxNoLock({ shape_cast.mShapeWorldBounds, shape_cast.mDirection }, bp_collector, broadphase_layer_filter, object_layer_filter);
 
@@ -1929,7 +1944,7 @@ void PhysicsSystem::JobFindCCDContacts(const PhysicsUpdateContext *ioContext, Ph
 			// Determine contact manifold
 			ContactManifold manifold;
 			manifold.mBaseOffset = shape_cast.mCenterOfMassStart.GetTranslation();
-			ManifoldBetweenTwoFaces(cast_shape_result.mContactPointOn1, cast_shape_result.mContactPointOn2, cast_shape_result.mPenetrationAxis, mPhysicsSettings.mManifoldToleranceSq, cast_shape_result.mShape1Face, cast_shape_result.mShape2Face, manifold.mRelativeContactPointsOn1, manifold.mRelativeContactPointsOn2 JPH_IF_DEBUG_RENDERER(, manifold.mBaseOffset));
+			ManifoldBetweenTwoFaces(cast_shape_result.mContactPointOn1, cast_shape_result.mContactPointOn2, cast_shape_result.mPenetrationAxis, mPhysicsSettings.mManifoldTolerance, cast_shape_result.mShape1Face, cast_shape_result.mShape2Face, manifold.mRelativeContactPointsOn1, manifold.mRelativeContactPointsOn2 JPH_IF_DEBUG_RENDERER(, manifold.mBaseOffset));
 			manifold.mSubShapeID1 = cast_shape_result.mSubShapeID1;
 			manifold.mSubShapeID2 = cast_shape_result.mSubShapeID2;
 			manifold.mPenetrationDepth = cast_shape_result.mPenetrationDepth;
@@ -2184,11 +2199,11 @@ void PhysicsSystem::JobResolveCCDContacts(PhysicsUpdateContext *ioContext, Physi
 					{
 						// Draw the collision location
 						RMat44 collision_transform = body1.GetCenterOfMassTransform().PostTranslated(ccd_body->mFraction * ccd_body->mDeltaPosition);
-						body1.GetShape()->Draw(DebugRenderer::sInstance, collision_transform, Vec3::sReplicate(1.0f), Color::sYellow, false, true);
+						body1.GetShape()->Draw(DebugRenderer::sInstance, collision_transform, Vec3::sOne(), Color::sYellow, false, true);
 
 						// Draw the collision location + slop
 						RMat44 collision_transform_plus_slop = body1.GetCenterOfMassTransform().PostTranslated(ccd_body->mFractionPlusSlop * ccd_body->mDeltaPosition);
-						body1.GetShape()->Draw(DebugRenderer::sInstance, collision_transform_plus_slop, Vec3::sReplicate(1.0f), Color::sOrange, false, true);
+						body1.GetShape()->Draw(DebugRenderer::sInstance, collision_transform_plus_slop, Vec3::sOne(), Color::sOrange, false, true);
 
 						// Draw contact normal
 						DebugRenderer::sInstance->DrawArrow(ccd_body->mContactPointOn2, ccd_body->mContactPointOn2 - ccd_body->mContactNormal, Color::sYellow, 0.1f);
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h
index b43d1e41..d29cedab 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/PhysicsSystem.h
@@ -35,6 +35,19 @@ public:
 								PhysicsSystem()												: mContactManager(mPhysicsSettings) JPH_IF_ENABLE_ASSERTS(, mConstraintManager(&mBodyManager)) { }
 								~PhysicsSystem();
 
+	/// The maximum value that can be passed to Init for inMaxBodies.
+	static constexpr uint		cMaxBodiesLimit = BodyID::cMaxBodyIndex + 1;
+
+	/// The maximum value that can be passed to Init for inMaxBodyPairs.
+	/// Note you should really use a lower value, using this value will cost a lot of memory!
+	/// On a 32 bit platform, you'll run out of memory way before you reach this limit.
+	static constexpr uint		cMaxBodyPairsLimit = ContactConstraintManager::cMaxBodyPairsLimit;
+
+	/// The maximum value that can be passed to Init for inMaxContactConstraints.
+	/// Note you should really use a lower value, using this value will cost a lot of memory!
+	/// On a 32 bit platform, you'll run out of memory way before you reach this limit.
+	static constexpr uint		cMaxContactConstraintsLimit = ContactConstraintManager::cMaxContactConstraintsLimit;
+
 	/// Initialize the system.
 	/// @param inMaxBodies Maximum number of bodies to support.
 	/// @param inNumBodyMutexes Number of body mutexes to use. Should be a power of 2 in the range [1, 64], use 0 to auto detect.
@@ -76,6 +89,24 @@ public:
 	void						SetSimShapeFilter(const SimShapeFilter *inShapeFilter)		{ mSimShapeFilter = inShapeFilter; }
 	const SimShapeFilter *		GetSimShapeFilter() const									{ return mSimShapeFilter; }
 
+	/// Advanced use only: This function is similar to CollisionDispatch::sCollideShapeVsShape but only used to collide bodies during simulation.
+	/// inBody1 The first body to collide.
+	/// inBody2 The second body to collide.
+	/// inCenterOfMassTransform1 The center of mass transform of the first body (note this will not be the actual world space position of the body, it will be made relative to some position so we can drop down to single precision).
+	/// inCenterOfMassTransform2 The center of mass transform of the second body.
+	/// ioCollideShapeSettings Settings that control the collision detection. Note that the implementation can freely overwrite the shape settings if needed, the caller provides a temporary that will not be used after the function returns.
+	/// ioCollector The collector that will receive the contact points.
+	/// inShapeFilter The shape filter that can be used to exclude shapes from colliding with each other.
+	using SimCollideBodyVsBody = std::function<void(const Body &inBody1, const Body &inBody2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, CollideShapeSettings &ioCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter)>;
+
+	/// Advanced use only: Set the function that will be used to collide two bodies during simulation.
+	/// This function is expected to eventually call CollideShapeCollector::AddHit all contact points between the shapes of body 1 and 2 in their given transforms.
+	void						SetSimCollideBodyVsBody(const SimCollideBodyVsBody &inBodyVsBody) { mSimCollideBodyVsBody = inBodyVsBody; }
+	const SimCollideBodyVsBody &GetSimCollideBodyVsBody() const								{ return mSimCollideBodyVsBody; }
+
+	/// Advanced use only: Default function that is used to collide two bodies during simulation.
+	static void					sDefaultSimCollideBodyVsBody(const Body &inBody1, const Body &inBody2, Mat44Arg inCenterOfMassTransform1, Mat44Arg inCenterOfMassTransform2, CollideShapeSettings &ioCollideShapeSettings, CollideShapeCollector &ioCollector, const ShapeFilter &inShapeFilter);
+
 	/// Control the main constants of the physics simulation
 	void						SetPhysicsSettings(const PhysicsSettings &inSettings)		{ mPhysicsSettings = inSettings; }
 	const PhysicsSettings &		GetPhysicsSettings() const									{ return mPhysicsSettings; }
@@ -308,6 +339,9 @@ private:
 	/// The shape filter that is used to filter out sub shapes during simulation
 	const SimShapeFilter *		mSimShapeFilter = nullptr;
 
+	/// The collision function that is used to collide two shapes during simulation
+	SimCollideBodyVsBody		mSimCollideBodyVsBody = &sDefaultSimCollideBodyVsBody;
+
 	/// Simulation settings
 	PhysicsSettings				mPhysicsSettings;
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.cpp
index 78eacd48..1982ffcb 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.cpp
@@ -106,7 +106,7 @@ void SoftBodyMotionProperties::DetermineCollidingShapes(const SoftBodyUpdateCont
 	JPH_PROFILE_FUNCTION();
 
 	// Reset flag prior to collision detection
-	mNeedContactCallback = false;
+	mNeedContactCallback.store(false, memory_order_relaxed);
 
 	struct Collector : public CollideShapeBodyCollector
 	{
@@ -170,7 +170,7 @@ void SoftBodyMotionProperties::DetermineCollidingShapes(const SoftBodyUpdateCont
 						Array<LeafShape>	mHits;
 					};
 					LeafShapeCollector collector;
-					body.GetShape()->CollectTransformedShapes(mLocalBounds, com.GetTranslation(), com.GetQuaternion(), Vec3::sReplicate(1.0f), SubShapeIDCreator(), collector, mShapeFilter);
+					body.GetShape()->CollectTransformedShapes(mLocalBounds, com.GetTranslation(), com.GetQuaternion(), Vec3::sOne(), SubShapeIDCreator(), collector, mShapeFilter);
 					if (collector.mHits.empty())
 						return;
 
@@ -236,6 +236,7 @@ void SoftBodyMotionProperties::DetermineCollidingShapes(const SoftBodyUpdateCont
 	DefaultBroadPhaseLayerFilter broadphase_layer_filter = inSystem.GetDefaultBroadPhaseLayerFilter(layer);
 	DefaultObjectLayerFilter object_layer_filter = inSystem.GetDefaultLayerFilter(layer);
 	inSystem.GetBroadPhaseQuery().CollideAABox(world_bounds, collector, broadphase_layer_filter, object_layer_filter);
+	mNumSensors = uint(mCollidingSensors.size()); // Workaround for TSAN false positive: store mCollidingSensors.size() in a separate variable.
 }
 
 void SoftBodyMotionProperties::DetermineCollisionPlanes(uint inVertexStart, uint inNumVertices)
@@ -269,7 +270,7 @@ void SoftBodyMotionProperties::DetermineSensorCollisions(CollidingSensor &ioSens
 
 	// We need a contact callback if one of the sensors collided
 	if (ioSensor.mHasContact)
-		mNeedContactCallback = true;
+		mNeedContactCallback.store(true, memory_order_relaxed);
 }
 
 void SoftBodyMotionProperties::ApplyPressure(const SoftBodyUpdateContext &inContext)
@@ -315,7 +316,7 @@ void SoftBodyMotionProperties::IntegratePositions(const SoftBodyUpdateContext &i
 
 	// Integrate
 	Vec3 sub_step_gravity = inContext.mGravity * dt;
-	Vec3 sub_step_impulse = GetAccumulatedForce() * dt;
+	Vec3 sub_step_impulse = GetAccumulatedForce() * dt / max(float(mVertices.size()), 1.0f);
 	for (Vertex &v : mVertices)
 		if (v.mInvMass > 0.0f)
 		{
@@ -621,7 +622,7 @@ void SoftBodyMotionProperties::ApplyCollisionConstraintsAndUpdateVelocities(cons
 					v.mHasContact = true;
 
 					// We need a contact callback if one of the vertices collided
-					mNeedContactCallback = true;
+					mNeedContactCallback.store(true, memory_order_relaxed);
 
 					// Note that we already calculated the velocity, so this does not affect the velocity (next iteration starts by setting previous position to current position)
 					CollidingShape &cs = mCollidingShapes[v.mCollidingShapeIndex];
@@ -720,7 +721,7 @@ void SoftBodyMotionProperties::UpdateSoftBodyState(SoftBodyUpdateContext &ioCont
 	JPH_PROFILE_FUNCTION();
 
 	// Contact callback
-	if (mNeedContactCallback && ioContext.mContactListener != nullptr)
+	if (mNeedContactCallback.load(memory_order_relaxed) && ioContext.mContactListener != nullptr)
 	{
 		// Remove non-colliding sensors from the list
 		for (int i = int(mCollidingSensors.size()) - 1; i >= 0; --i)
@@ -765,7 +766,7 @@ void SoftBodyMotionProperties::UpdateSoftBodyState(SoftBodyUpdateContext &ioCont
 
 	// Calculate linear/angular velocity of the body by averaging all vertices and bringing the value to world space
 	float num_vertices_divider = float(max(int(mVertices.size()), 1));
-	SetLinearVelocity(ioContext.mCenterOfMassTransform.Multiply3x3(linear_velocity / num_vertices_divider));
+	SetLinearVelocityClamped(ioContext.mCenterOfMassTransform.Multiply3x3(linear_velocity / num_vertices_divider));
 	SetAngularVelocity(ioContext.mCenterOfMassTransform.Multiply3x3(angular_velocity / num_vertices_divider));
 
 	if (mUpdatePosition)
@@ -877,7 +878,7 @@ SoftBodyMotionProperties::EStatus SoftBodyMotionProperties::ParallelDetermineCol
 			// Process collision planes
 			uint num_vertices_to_process = min(SoftBodyUpdateContext::cVertexCollisionBatch, num_vertices - next_vertex);
 			DetermineCollisionPlanes(next_vertex, num_vertices_to_process);
-			uint vertices_processed = ioContext.mNumCollisionVerticesProcessed.fetch_add(SoftBodyUpdateContext::cVertexCollisionBatch, memory_order_release) + num_vertices_to_process;
+			uint vertices_processed = ioContext.mNumCollisionVerticesProcessed.fetch_add(SoftBodyUpdateContext::cVertexCollisionBatch, memory_order_acq_rel) + num_vertices_to_process;
 			if (vertices_processed >= num_vertices)
 			{
 				// Determine next state
@@ -896,19 +897,18 @@ SoftBodyMotionProperties::EStatus SoftBodyMotionProperties::ParallelDetermineCol
 SoftBodyMotionProperties::EStatus SoftBodyMotionProperties::ParallelDetermineSensorCollisions(SoftBodyUpdateContext &ioContext)
 {
 	// Do a relaxed read to see if there are more sensors to process
-	uint num_sensors = (uint)mCollidingSensors.size();
-	if (ioContext.mNextSensorIndex.load(memory_order_relaxed) < num_sensors)
+	if (ioContext.mNextSensorIndex.load(memory_order_relaxed) < mNumSensors)
 	{
 		// Fetch next sensor to process
 		uint sensor_index = ioContext.mNextSensorIndex.fetch_add(1, memory_order_acquire);
-		if (sensor_index < num_sensors)
+		if (sensor_index < mNumSensors)
 		{
 			// Process this sensor
 			DetermineSensorCollisions(mCollidingSensors[sensor_index]);
 
 			// Determine next state
-			uint sensors_processed = ioContext.mNumSensorsProcessed.fetch_add(1, memory_order_release) + 1;
-			if (sensors_processed >= num_sensors)
+			uint sensors_processed = ioContext.mNumSensorsProcessed.fetch_add(1, memory_order_acq_rel) + 1;
+			if (sensors_processed >= mNumSensors)
 				StartFirstIteration(ioContext);
 			return EStatus::DidWork;
 		}
@@ -961,7 +961,7 @@ SoftBodyMotionProperties::EStatus SoftBodyMotionProperties::ParallelApplyConstra
 				ProcessGroup(ioContext, next_group);
 
 				// Increment total number of groups processed
-				num_groups_processed = ioContext.mNumConstraintGroupsProcessed.fetch_add(1, memory_order_relaxed) + 1;
+				num_groups_processed = ioContext.mNumConstraintGroupsProcessed.fetch_add(1, memory_order_acq_rel) + 1;
 			}
 
 			if (num_groups_processed >= num_groups)
@@ -981,7 +981,7 @@ SoftBodyMotionProperties::EStatus SoftBodyMotionProperties::ParallelApplyConstra
 					StartNextIteration(ioContext);
 
 					// Reset group logic
-					ioContext.mNumConstraintGroupsProcessed.store(0, memory_order_relaxed);
+					ioContext.mNumConstraintGroupsProcessed.store(0, memory_order_release);
 					ioContext.mNextConstraintGroup.store(0, memory_order_release);
 				}
 				else
@@ -1002,7 +1002,7 @@ SoftBodyMotionProperties::EStatus SoftBodyMotionProperties::ParallelApplyConstra
 
 SoftBodyMotionProperties::EStatus SoftBodyMotionProperties::ParallelUpdate(SoftBodyUpdateContext &ioContext, const PhysicsSettings &inPhysicsSettings)
 {
-	switch (ioContext.mState.load(memory_order_relaxed))
+	switch (ioContext.mState.load(memory_order_acquire))
 	{
 	case SoftBodyUpdateContext::EState::DetermineCollisionPlanes:
 		return ParallelDetermineCollisionPlanes(ioContext);
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.h b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.h
index 8f53ced0..7ecf7cfc 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyMotionProperties.h
@@ -286,10 +286,11 @@ private:
 	AABox								mLocalBounds;								///< Bounding box of all vertices
 	AABox								mLocalPredictedBounds;						///< Predicted bounding box for all vertices using extrapolation of velocity by last step delta time
 	uint32								mNumIterations;								///< Number of solver iterations
+	uint								mNumSensors;								///< Workaround for TSAN false positive: store mCollidingSensors.size() in a separate variable.
 	float								mPressure;									///< n * R * T, amount of substance * ideal gas constant * absolute temperature, see https://en.wikipedia.org/wiki/Pressure
 	float								mSkinnedMaxDistanceMultiplier = 1.0f;		///< Multiplier applied to Skinned::mMaxDistance to allow tightening or loosening of the skin constraints
 	bool								mUpdatePosition;							///< Update the position of the body while simulating (set to false for something that is attached to the static world)
-	bool								mNeedContactCallback = false;						///< True if the soft body has collided with anything in the last update
+	atomic<bool>						mNeedContactCallback = false;				///< True if the soft body has collided with anything in the last update
 	bool								mEnableSkinConstraints = true;				///< If skin constraints are enabled
 	bool								mSkinStatePreviousPositionValid = false;	///< True if the skinning was updated in the last update so that the previous position of the skin state is valid
 };
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyShape.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyShape.cpp
index 6692b223..890a0baa 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyShape.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodyShape.cpp
@@ -328,6 +328,9 @@ void SoftBodyShape::sRegister()
 	{
 		CollisionDispatch::sRegisterCollideShape(s, EShapeSubType::SoftBody, sCollideConvexVsSoftBody);
 		CollisionDispatch::sRegisterCastShape(s, EShapeSubType::SoftBody, sCastConvexVsSoftBody);
+
+		CollisionDispatch::sRegisterCollideShape(EShapeSubType::SoftBody, s, CollisionDispatch::sReversedCollideShape);
+		CollisionDispatch::sRegisterCastShape(EShapeSubType::SoftBody, s, CollisionDispatch::sReversedCastShape);
 	}
 
 	// Specialized collision functions
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.cpp
index 7eb8dd55..59f8a2bc 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.cpp
@@ -541,6 +541,10 @@ void SoftBodySharedSettings::Optimize(OptimizationResults &outResults)
 			if (group_idx[i] == -1)
 				bounds.Encapsulate(Vec3(mVertices[i].mPosition));
 
+		// If the bounds are invalid, it means that there were no ungrouped vertices
+		if (!bounds.IsValid())
+			break;
+
 		// Determine longest and shortest axis
 		Vec3 bounds_size = bounds.GetSize();
 		uint max_axis = bounds_size.GetHighestComponentIndex();
@@ -1029,4 +1033,147 @@ SoftBodySharedSettings::SettingsResult SoftBodySharedSettings::sRestoreWithMater
 	return result;
 }
 
+Ref<SoftBodySharedSettings> SoftBodySharedSettings::sCreateCube(uint inGridSize, float inGridSpacing)
+{
+	const Vec3 cOffset = Vec3::sReplicate(-0.5f * inGridSpacing * (inGridSize - 1));
+
+	// Create settings
+	SoftBodySharedSettings *settings = new SoftBodySharedSettings;
+	for (uint z = 0; z < inGridSize; ++z)
+		for (uint y = 0; y < inGridSize; ++y)
+			for (uint x = 0; x < inGridSize; ++x)
+			{
+				SoftBodySharedSettings::Vertex v;
+				(cOffset + Vec3::sReplicate(inGridSpacing) * Vec3(float(x), float(y), float(z))).StoreFloat3(&v.mPosition);
+				settings->mVertices.push_back(v);
+			}
+
+	// Function to get the vertex index of a point on the cube
+	auto vertex_index = [inGridSize](uint inX, uint inY, uint inZ)
+	{
+		return inX + inY * inGridSize + inZ * inGridSize * inGridSize;
+	};
+
+	// Create edges
+	for (uint z = 0; z < inGridSize; ++z)
+		for (uint y = 0; y < inGridSize; ++y)
+			for (uint x = 0; x < inGridSize; ++x)
+			{
+				SoftBodySharedSettings::Edge e;
+				e.mVertex[0] = vertex_index(x, y, z);
+				if (x < inGridSize - 1)
+				{
+					e.mVertex[1] = vertex_index(x + 1, y, z);
+					settings->mEdgeConstraints.push_back(e);
+				}
+				if (y < inGridSize - 1)
+				{
+					e.mVertex[1] = vertex_index(x, y + 1, z);
+					settings->mEdgeConstraints.push_back(e);
+				}
+				if (z < inGridSize - 1)
+				{
+					e.mVertex[1] = vertex_index(x, y, z + 1);
+					settings->mEdgeConstraints.push_back(e);
+				}
+			}
+	settings->CalculateEdgeLengths();
+
+	// Tetrahedrons to fill a cube
+	const int tetra_indices[6][4][3] = {
+		{ {0, 0, 0}, {0, 1, 1}, {0, 0, 1}, {1, 1, 1} },
+		{ {0, 0, 0}, {0, 1, 0}, {0, 1, 1}, {1, 1, 1} },
+		{ {0, 0, 0}, {0, 0, 1}, {1, 0, 1}, {1, 1, 1} },
+		{ {0, 0, 0}, {1, 0, 1}, {1, 0, 0}, {1, 1, 1} },
+		{ {0, 0, 0}, {1, 1, 0}, {0, 1, 0}, {1, 1, 1} },
+		{ {0, 0, 0}, {1, 0, 0}, {1, 1, 0}, {1, 1, 1} }
+	};
+
+	// Create volume constraints
+	for (uint z = 0; z < inGridSize - 1; ++z)
+		for (uint y = 0; y < inGridSize - 1; ++y)
+			for (uint x = 0; x < inGridSize - 1; ++x)
+				for (uint t = 0; t < 6; ++t)
+				{
+					SoftBodySharedSettings::Volume v;
+					for (uint i = 0; i < 4; ++i)
+						v.mVertex[i] = vertex_index(x + tetra_indices[t][i][0], y + tetra_indices[t][i][1], z + tetra_indices[t][i][2]);
+					settings->mVolumeConstraints.push_back(v);
+				}
+
+	settings->CalculateVolumeConstraintVolumes();
+
+	// Create faces
+	for (uint y = 0; y < inGridSize - 1; ++y)
+		for (uint x = 0; x < inGridSize - 1; ++x)
+		{
+			SoftBodySharedSettings::Face f;
+
+			// Face 1
+			f.mVertex[0] = vertex_index(x, y, 0);
+			f.mVertex[1] = vertex_index(x, y + 1, 0);
+			f.mVertex[2] = vertex_index(x + 1, y + 1, 0);
+			settings->AddFace(f);
+
+			f.mVertex[1] = vertex_index(x + 1, y + 1, 0);
+			f.mVertex[2] = vertex_index(x + 1, y, 0);
+			settings->AddFace(f);
+
+			// Face 2
+			f.mVertex[0] = vertex_index(x, y, inGridSize - 1);
+			f.mVertex[1] = vertex_index(x + 1, y + 1, inGridSize - 1);
+			f.mVertex[2] = vertex_index(x, y + 1, inGridSize - 1);
+			settings->AddFace(f);
+
+			f.mVertex[1] = vertex_index(x + 1, y, inGridSize - 1);
+			f.mVertex[2] = vertex_index(x + 1, y + 1, inGridSize - 1);
+			settings->AddFace(f);
+
+			// Face 3
+			f.mVertex[0] = vertex_index(x, 0, y);
+			f.mVertex[1] = vertex_index(x + 1, 0, y + 1);
+			f.mVertex[2] = vertex_index(x, 0, y + 1);
+			settings->AddFace(f);
+
+			f.mVertex[1] = vertex_index(x + 1, 0, y);
+			f.mVertex[2] = vertex_index(x + 1, 0, y + 1);
+			settings->AddFace(f);
+
+			// Face 4
+			f.mVertex[0] = vertex_index(x, inGridSize - 1, y);
+			f.mVertex[1] = vertex_index(x, inGridSize - 1, y + 1);
+			f.mVertex[2] = vertex_index(x + 1, inGridSize - 1, y + 1);
+			settings->AddFace(f);
+
+			f.mVertex[1] = vertex_index(x + 1, inGridSize - 1, y + 1);
+			f.mVertex[2] = vertex_index(x + 1, inGridSize - 1, y);
+			settings->AddFace(f);
+
+			// Face 5
+			f.mVertex[0] = vertex_index(0, x, y);
+			f.mVertex[1] = vertex_index(0, x, y + 1);
+			f.mVertex[2] = vertex_index(0, x + 1, y + 1);
+			settings->AddFace(f);
+
+			f.mVertex[1] = vertex_index(0, x + 1, y + 1);
+			f.mVertex[2] = vertex_index(0, x + 1, y);
+			settings->AddFace(f);
+
+			// Face 6
+			f.mVertex[0] = vertex_index(inGridSize - 1, x, y);
+			f.mVertex[1] = vertex_index(inGridSize - 1, x + 1, y + 1);
+			f.mVertex[2] = vertex_index(inGridSize - 1, x, y + 1);
+			settings->AddFace(f);
+
+			f.mVertex[1] = vertex_index(inGridSize - 1, x + 1, y);
+			f.mVertex[2] = vertex_index(inGridSize - 1, x + 1, y + 1);
+			settings->AddFace(f);
+		}
+
+	// Optimize the settings
+	settings->Optimize();
+
+	return settings;
+}
+
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h
index 4d7729bc..3fc7342d 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/SoftBody/SoftBodySharedSettings.h
@@ -111,6 +111,12 @@ public:
 	/// Restore a shape and materials. Pass in an empty map in ioSettingsMap / ioMaterialMap or reuse the same map while reading multiple settings objects from the same stream in order to restore duplicates.
 	static SettingsResult sRestoreWithMaterials(StreamIn &inStream, IDToSharedSettingsMap &ioSettingsMap, IDToMaterialMap &ioMaterialMap);
 
+	/// Create a cube. This can be used to create a simple soft body for testing purposes.
+	/// It will contain edge constraints, volume constraints and faces.
+	/// @param inGridSize Number of points along each axis
+	/// @param inGridSpacing Distance between points
+	static Ref<SoftBodySharedSettings> sCreateCube(uint inGridSize, float inGridSpacing);
+
 	/// A vertex is a particle, the data in this structure is only used during creation of the soft body and not during simulation
 	struct JPH_EXPORT Vertex
 	{
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleAntiRollBar.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleAntiRollBar.h
index 4a9c6707..b56eefeb 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleAntiRollBar.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleAntiRollBar.h
@@ -28,4 +28,6 @@ public:
 	float					mStiffness = 1000.0f;						///< Stiffness (spring constant in N/m) of anti rollbar, can be 0 to disable the anti-rollbar
 };
 
+using VehicleAntiRollBars = Array<VehicleAntiRollBar>;
+
 JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.cpp
index 56246835..11756e29 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleCollisionTester.cpp
@@ -139,7 +139,7 @@ bool VehicleCollisionTesterCastSphere::Collide(PhysicsSystem &inPhysicsSystem, c
 	const WheelSettings *wheel_settings = inVehicleConstraint.GetWheel(inWheelIndex)->GetSettings();
 	float wheel_radius = wheel_settings->mRadius;
 	float shape_cast_length = wheel_settings->mSuspensionMaxLength + wheel_radius - mRadius;
-	RShapeCast shape_cast(&sphere, Vec3::sReplicate(1.0f), RMat44::sTranslation(inOrigin), inDirection * shape_cast_length);
+	RShapeCast shape_cast(&sphere, Vec3::sOne(), RMat44::sTranslation(inOrigin), inDirection * shape_cast_length);
 
 	ShapeCastSettings settings;
 	settings.mUseShrunkenShapeAndConvexRadius = true;
@@ -261,7 +261,7 @@ bool VehicleCollisionTesterCastCylinder::Collide(PhysicsSystem &inPhysicsSystem,
 	CylinderShape cylinder(wheel_half_width, wheel_settings->mRadius, min(wheel_half_width, wheel_settings->mRadius) * mConvexRadiusFraction);
 	cylinder.SetEmbedded();
 
-	RShapeCast shape_cast(&cylinder, Vec3::sReplicate(1.0f), shape_cast_start, inDirection * max_suspension_length);
+	RShapeCast shape_cast(&cylinder, Vec3::sOne(), shape_cast_start, inDirection * max_suspension_length);
 
 	ShapeCastSettings settings;
 	settings.mUseShrunkenShapeAndConvexRadius = true;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.cpp b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.cpp
index fb76aa67..e3ec5011 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.cpp
@@ -80,7 +80,8 @@ VehicleConstraint::VehicleConstraint(Body &inVehicleBody, const VehicleConstrain
 	mBody(&inVehicleBody),
 	mForward(inSettings.mForward),
 	mUp(inSettings.mUp),
-	mWorldUp(inSettings.mUp)
+	mWorldUp(inSettings.mUp),
+	mAntiRollBars(inSettings.mAntiRollBars)
 {
 	// Check sanity of incoming settings
 	JPH_ASSERT(inSettings.mUp.IsNormalized());
@@ -90,15 +91,6 @@ VehicleConstraint::VehicleConstraint(Body &inVehicleBody, const VehicleConstrain
 	// Store max pitch/roll angle
 	SetMaxPitchRollAngle(inSettings.mMaxPitchRollAngle);
 
-	// Copy anti-rollbar settings
-	mAntiRollBars.resize(inSettings.mAntiRollBars.size());
-	for (uint i = 0; i < mAntiRollBars.size(); ++i)
-	{
-		const VehicleAntiRollBar &r = inSettings.mAntiRollBars[i];
-		mAntiRollBars[i] = r;
-		JPH_ASSERT(r.mStiffness >= 0.0f);
-	}
-
 	// Construct our controller class
 	mController = inSettings.mController->ConstructController(*this);
 
@@ -283,6 +275,8 @@ void VehicleConstraint::OnStep(const PhysicsStepListenerContext &inContext)
 	// Calculate anti-rollbar impulses
 	for (const VehicleAntiRollBar &r : mAntiRollBars)
 	{
+		JPH_ASSERT(r.mStiffness >= 0.0f);
+
 		Wheel *lw = mWheels[r.mLeftWheel];
 		Wheel *rw = mWheels[r.mRightWheel];
 
@@ -309,16 +303,19 @@ void VehicleConstraint::OnStep(const PhysicsStepListenerContext &inContext)
 		mPostStepCallback(*this, inContext);
 
 	// If the wheels are rotating, we don't want to go to sleep yet
-	bool allow_sleep = mController->AllowSleep();
-	if (allow_sleep)
-		for (const Wheel *w : mWheels)
-			if (abs(w->mAngularVelocity) > DegreesToRadians(10.0f))
-			{
-				allow_sleep = false;
-				break;
-			}
-	if (mBody->GetAllowSleeping() != allow_sleep)
-		mBody->SetAllowSleeping(allow_sleep);
+	if (mBody->GetAllowSleeping())
+	{
+		bool allow_sleep = mController->AllowSleep();
+		if (allow_sleep)
+			for (const Wheel *w : mWheels)
+				if (abs(w->mAngularVelocity) > DegreesToRadians(10.0f))
+				{
+					allow_sleep = false;
+					break;
+				}
+		if (!allow_sleep)
+			mBody->ResetSleepTimer();
+	}
 
 	// Increment step counter
 	++mCurrentStep;
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.h
index 9459f8e4..6489b2bf 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleConstraint.h
@@ -32,7 +32,7 @@ public:
 	Vec3						mForward { 0, 0, 1 };						///< Vector indicating forward direction of the vehicle (in local space to the body)
 	float						mMaxPitchRollAngle = JPH_PI;				///< Defines the maximum pitch/roll angle (rad), can be used to avoid the car from getting upside down. The vehicle up direction will stay within a cone centered around the up axis with half top angle mMaxPitchRollAngle, set to pi to turn off.
 	Array<Ref<WheelSettings>>	mWheels;									///< List of wheels and their properties
-	Array<VehicleAntiRollBar>	mAntiRollBars;								///< List of anti rollbars and their properties
+	VehicleAntiRollBars			mAntiRollBars;								///< List of anti rollbars and their properties
 	Ref<VehicleControllerSettings> mController;								///< Defines how the vehicle can accelerate / decelerate
 
 protected:
@@ -161,6 +161,10 @@ public:
 	/// @param inWheelUp Unit vector that indicates up in model space of the wheel
 	RMat44						GetWheelWorldTransform(uint inWheelIndex, Vec3Arg inWheelRight, Vec3Arg inWheelUp) const;
 
+	/// Access to the vehicle's anti roll bars
+	const VehicleAntiRollBars &	GetAntiRollBars() const						{ return mAntiRollBars; }
+	VehicleAntiRollBars &		GetAntiRollBars()							{ return mAntiRollBars; }
+
 	/// Number of simulation steps between wheel collision tests when the vehicle is active. Default is 1. 0 = never, 1 = every step, 2 = every other step, etc.
 	/// Note that if a vehicle has multiple wheels and the number of steps > 1, the wheels will be tested in a round robin fashion.
 	/// If there are multiple vehicles, the tests will be spread out based on the BodyID of the vehicle.
@@ -214,7 +218,7 @@ private:
 	Vec3						mUp;										///< Local space up vector for the vehicle
 	Vec3						mWorldUp;									///< Vector indicating the world space up direction (used to limit vehicle pitch/roll)
 	Wheels						mWheels;									///< Wheel states of the vehicle
-	Array<VehicleAntiRollBar>	mAntiRollBars;								///< Anti rollbars of the vehicle
+	VehicleAntiRollBars			mAntiRollBars;								///< Anti rollbars of the vehicle
 	VehicleController *			mController;								///< Controls the acceleration / deceleration of the vehicle
 	bool						mIsActive = false;							///< If this constraint is active
 	uint						mNumStepsBetweenCollisionTestActive = 1;	///< Number of simulation steps between wheel collision tests when the vehicle is active
diff --git a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleController.h b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleController.h
index 0d9095b1..a07f4fd9 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleController.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Physics/Vehicle/VehicleController.h
@@ -37,7 +37,7 @@ public:
 };
 
 /// Runtime data for interface that controls acceleration / deceleration of the vehicle
-class JPH_EXPORT VehicleController : public RefTarget<VehicleController>, public NonCopyable
+class JPH_EXPORT VehicleController : public NonCopyable
 {
 public:
 	JPH_OVERRIDE_NEW_DELETE
diff --git a/engine/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp b/engine/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp
index 5b61a916..ccfcc1bb 100644
--- a/engine/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/RegisterTypes.cpp
@@ -45,6 +45,10 @@ JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, PathConstraintPath)
 JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, PathConstraintPathHermite)
 JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, VehicleConstraintSettings)
 JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, WheeledVehicleControllerSettings)
+JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, WheelSettingsWV)
+JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, TrackedVehicleControllerSettings)
+JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, WheelSettingsTV)
+JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, MotorcycleControllerSettings)
 JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, RackAndPinionConstraintSettings)
 JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, GearConstraintSettings)
 JPH_DECLARE_RTTI_WITH_NAMESPACE_FOR_FACTORY(JPH_EXPORT, JPH, PulleyConstraintSettings)
@@ -156,6 +160,10 @@ void RegisterTypesInternal(uint64 inVersionID)
 		JPH_RTTI(PathConstraintSettings),
 		JPH_RTTI(VehicleConstraintSettings),
 		JPH_RTTI(WheeledVehicleControllerSettings),
+		JPH_RTTI(WheelSettingsWV),
+		JPH_RTTI(TrackedVehicleControllerSettings),
+		JPH_RTTI(WheelSettingsTV),
+		JPH_RTTI(MotorcycleControllerSettings),
 		JPH_RTTI(PathConstraintPath),
 		JPH_RTTI(PathConstraintPathHermite),
 		JPH_RTTI(RackAndPinionConstraintSettings),
diff --git a/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.cpp b/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.cpp
index 636c1e2f..e95eff80 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.cpp
@@ -18,7 +18,7 @@ DebugRenderer *DebugRenderer::sInstance = nullptr;
 static const int sMaxLevel = 4;
 
 // Distance for each LOD level, these are tweaked for an object of approx. size 1. Use the lod scale to scale these distances.
-static const float sLODDistanceForLevel[] = { 5.0f, 10.0f, 40.0f, FLT_MAX };
+static const float sLODDistanceForLevel[] = { 5.0f, 10.0f, 40.0f, cLargeFloat };
 
 DebugRenderer::Triangle::Triangle(Vec3Arg inV1, Vec3Arg inV2, Vec3Arg inV3, ColorArg inColor)
 {
diff --git a/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.h b/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.h
index 7e06ed49..a311d1a5 100644
--- a/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.h
+++ b/engine/thirdparty/jolt_physics/Jolt/Renderer/DebugRenderer.h
@@ -218,7 +218,7 @@ public:
 
 		/// Constructor
 							Geometry(const AABox &inBounds) : mBounds(inBounds) { }
-							Geometry(const Batch &inBatch, const AABox &inBounds) : mBounds(inBounds) { mLODs.push_back({ inBatch, FLT_MAX }); }
+							Geometry(const Batch &inBatch, const AABox &inBounds) : mBounds(inBounds) { mLODs.push_back({ inBatch, cLargeFloat }); }
 
 		/// Determine which LOD to render
 		/// @param inCameraPosition Current position of the camera
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouper.h b/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouper.h
deleted file mode 100644
index 9d75691f..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouper.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/Geometry/IndexedTriangle.h>
-#include <Jolt/Core/NonCopyable.h>
-
-JPH_NAMESPACE_BEGIN
-
-/// A class that groups triangles in batches of N (according to closeness)
-class JPH_EXPORT TriangleGrouper : public NonCopyable
-{
-public:
-	/// Virtual destructor
-	virtual					~TriangleGrouper() = default;
-
-	/// Group a batch of indexed triangles
-	/// @param inVertices The list of vertices
-	/// @param inTriangles The list of indexed triangles (indexes into inVertices)
-	/// @param inGroupSize How big each group should be
-	/// @param outGroupedTriangleIndices An ordered list of indices (indexing into inTriangles), contains groups of inGroupSize large worth of indices to triangles that are grouped together. If the triangle count is not an exact multiple of inGroupSize the last batch will be smaller.
-	virtual void			Group(const VertexList &inVertices, const IndexedTriangleList &inTriangles, int inGroupSize, Array<uint> &outGroupedTriangleIndices) = 0;
-};
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.cpp
deleted file mode 100644
index 80016081..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#include <Jolt/Jolt.h>
-
-#include <Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.h>
-#include <Jolt/Geometry/MortonCode.h>
-#include <Jolt/Core/QuickSort.h>
-
-JPH_NAMESPACE_BEGIN
-
-void TriangleGrouperClosestCentroid::Group(const VertexList &inVertices, const IndexedTriangleList &inTriangles, int inGroupSize, Array<uint> &outGroupedTriangleIndices)
-{
-	const uint triangle_count = (uint)inTriangles.size();
-	const uint num_batches = (triangle_count + inGroupSize - 1) / inGroupSize;
-
-	Array<Vec3> centroids;
-	centroids.resize(triangle_count);
-
-	outGroupedTriangleIndices.resize(triangle_count);
-
-	for (uint t = 0; t < triangle_count; ++t)
-	{
-		// Store centroid
-		centroids[t] = inTriangles[t].GetCentroid(inVertices);
-
-		// Initialize sort table
-		outGroupedTriangleIndices[t] = t;
-	}
-
-	Array<uint>::const_iterator triangles_end = outGroupedTriangleIndices.end();
-
-	// Sort per batch
-	for (uint b = 0; b < num_batches - 1; ++b)
-	{
-		// Get iterators
-		Array<uint>::iterator batch_begin = outGroupedTriangleIndices.begin() + b * inGroupSize;
-		Array<uint>::iterator batch_end = batch_begin + inGroupSize;
-		Array<uint>::iterator batch_begin_plus_1 = batch_begin + 1;
-		Array<uint>::iterator batch_end_minus_1 = batch_end - 1;
-
-		// Find triangle with centroid with lowest X coordinate
-		Array<uint>::iterator lowest_iter = batch_begin;
-		float lowest_val = centroids[*lowest_iter].GetX();
-		for (Array<uint>::iterator other = batch_begin; other != triangles_end; ++other)
-		{
-			float val = centroids[*other].GetX();
-			if (val < lowest_val)
-			{
-				lowest_iter = other;
-				lowest_val = val;
-			}
-		}
-
-		// Make this triangle the first in a new batch
-		std::swap(*batch_begin, *lowest_iter);
-		Vec3 first_centroid = centroids[*batch_begin];
-
-		// Sort remaining triangles in batch on distance to first triangle
-		QuickSort(batch_begin_plus_1, batch_end,
-			[&first_centroid, &centroids](uint inLHS, uint inRHS)
-			{
-				return (centroids[inLHS] - first_centroid).LengthSq() < (centroids[inRHS] - first_centroid).LengthSq();
-			});
-
-		// Loop over remaining triangles
-		float furthest_dist = (centroids[*batch_end_minus_1] - first_centroid).LengthSq();
-		for (Array<uint>::iterator other = batch_end; other != triangles_end; ++other)
-		{
-			// Check if this triangle is closer than the furthest triangle in the batch
-			float dist = (centroids[*other] - first_centroid).LengthSq();
-			if (dist < furthest_dist)
-			{
-				// Replace furthest triangle
-				uint other_val = *other;
-				*other = *batch_end_minus_1;
-
-				// Find first element that is bigger than this one and insert the current item before it
-				Array<uint>::iterator upper = std::upper_bound(batch_begin_plus_1, batch_end, dist,
-					[&first_centroid, &centroids](float inLHS, uint inRHS)
-					{
-						return inLHS < (centroids[inRHS] - first_centroid).LengthSq();
-					});
-				std::copy_backward(upper, batch_end_minus_1, batch_end);
-				*upper = other_val;
-
-				// Calculate new furthest distance
-				furthest_dist = (centroids[*batch_end_minus_1] - first_centroid).LengthSq();
-			}
-		}
-	}
-}
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.h b/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.h
deleted file mode 100644
index 58322741..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/TriangleGrouper/TriangleGrouper.h>
-
-JPH_NAMESPACE_BEGIN
-
-/// A class that groups triangles in batches of N.
-/// Starts with centroid with lowest X coordinate and finds N closest centroids, this repeats until all groups have been found.
-/// Time complexity: O(N^2)
-class JPH_EXPORT TriangleGrouperClosestCentroid : public TriangleGrouper
-{
-public:
-	// See: TriangleGrouper::Group
-	virtual void			Group(const VertexList &inVertices, const IndexedTriangleList &inTriangles, int inGroupSize, Array<uint> &outGroupedTriangleIndices) override;
-};
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperMorton.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperMorton.cpp
deleted file mode 100644
index a6e5a564..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperMorton.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#include <Jolt/Jolt.h>
-
-#include <Jolt/TriangleGrouper/TriangleGrouperMorton.h>
-#include <Jolt/Geometry/MortonCode.h>
-#include <Jolt/Core/QuickSort.h>
-
-JPH_NAMESPACE_BEGIN
-
-void TriangleGrouperMorton::Group(const VertexList &inVertices, const IndexedTriangleList &inTriangles, int inGroupSize, Array<uint> &outGroupedTriangleIndices)
-{
-	const uint triangle_count = (uint)inTriangles.size();
-
-	Array<Vec3> centroids;
-	centroids.resize(triangle_count);
-
-	outGroupedTriangleIndices.resize(triangle_count);
-
-	for (uint t = 0; t < triangle_count; ++t)
-	{
-		// Store centroid
-		centroids[t] = inTriangles[t].GetCentroid(inVertices);
-
-		// Initialize sort table
-		outGroupedTriangleIndices[t] = t;
-	}
-
-	// Get bounding box of all centroids
-	AABox centroid_bounds;
-	for (uint t = 0; t < triangle_count; ++t)
-		centroid_bounds.Encapsulate(centroids[t]);
-
-	// Make sure box is not degenerate
-	centroid_bounds.EnsureMinimalEdgeLength(1.0e-5f);
-
-	// Calculate morton code for each centroid
-	Array<uint32> morton_codes;
-	morton_codes.resize(triangle_count);
-	for (uint t = 0; t < triangle_count; ++t)
-		morton_codes[t] = MortonCode::sGetMortonCode(centroids[t], centroid_bounds);
-
-	// Sort triangles based on morton code
-	QuickSort(outGroupedTriangleIndices.begin(), outGroupedTriangleIndices.end(), [&morton_codes](uint inLHS, uint inRHS) { return morton_codes[inLHS] < morton_codes[inRHS]; });
-}
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperMorton.h b/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperMorton.h
deleted file mode 100644
index a35f9af0..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleGrouper/TriangleGrouperMorton.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/TriangleGrouper/TriangleGrouper.h>
-
-JPH_NAMESPACE_BEGIN
-
-/// A class that groups triangles in batches of N according to morton code of centroid.
-/// Time complexity: O(N log(N))
-class JPH_EXPORT TriangleGrouperMorton : public TriangleGrouper
-{
-public:
-	// See: TriangleGrouper::Group
-	virtual void			Group(const VertexList &inVertices, const IndexedTriangleList &inTriangles, int inGroupSize, Array<uint> &outGroupedTriangleIndices) override;
-};
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitter.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitter.cpp
index 50d15117..2d42626a 100644
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitter.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitter.cpp
@@ -13,7 +13,7 @@ TriangleSplitter::TriangleSplitter(const VertexList &inVertices, const IndexedTr
 	mTriangles(inTriangles)
 {
 	mSortedTriangleIdx.resize(inTriangles.size());
-	mCentroids.resize(inTriangles.size());
+	mCentroids.resize(inTriangles.size() + 1); // Add 1 so we can load with Vec3::sLoadFloat3Unsafe
 
 	for (uint t = 0; t < inTriangles.size(); ++t)
 	{
@@ -23,44 +23,50 @@ TriangleSplitter::TriangleSplitter(const VertexList &inVertices, const IndexedTr
 		// Calculate centroid
 		inTriangles[t].GetCentroid(inVertices).StoreFloat3(&mCentroids[t]);
 	}
+
+	// Make sure Vec3::sLoatFloat3Unsafe doesn't read uninitialized data
+	mCentroids.back() = Float3(0, 0, 0);
 }
 
 bool TriangleSplitter::SplitInternal(const Range &inTriangles, uint inDimension, float inSplit, Range &outLeft, Range &outRight)
 {
 	// Divide triangles
-	uint start = inTriangles.mBegin, end = inTriangles.mEnd;
+	uint *start = mSortedTriangleIdx.data() + inTriangles.mBegin;
+	uint *end = mSortedTriangleIdx.data() + inTriangles.mEnd;
 	while (start < end)
 	{
 		// Search for first element that is on the right hand side of the split plane
-		while (start < end && mCentroids[mSortedTriangleIdx[start]][inDimension] < inSplit)
+		while (start < end && mCentroids[*start][inDimension] < inSplit)
 			++start;
 
 		// Search for the first element that is on the left hand side of the split plane
-		while (start < end && mCentroids[mSortedTriangleIdx[end - 1]][inDimension] >= inSplit)
+		while (start < end && mCentroids[*(end - 1)][inDimension] >= inSplit)
 			--end;
 
 		if (start < end)
 		{
 			// Swap the two elements
-			std::swap(mSortedTriangleIdx[start], mSortedTriangleIdx[end - 1]);
-			++start;
 			--end;
+			std::swap(*start, *end);
+			++start;
 		}
 	}
 	JPH_ASSERT(start == end);
 
+	uint start_idx = uint(start - mSortedTriangleIdx.data());
+
 #ifdef JPH_ENABLE_ASSERTS
 	// Validate division algorithm
-	JPH_ASSERT(inTriangles.mBegin <= start);
-	JPH_ASSERT(start <= inTriangles.mEnd);
-	for (uint i = inTriangles.mBegin; i < start; ++i)
+	JPH_ASSERT(inTriangles.mBegin <= start_idx);
+	JPH_ASSERT(start_idx <= inTriangles.mEnd);
+	for (uint i = inTriangles.mBegin; i < start_idx; ++i)
 		JPH_ASSERT(mCentroids[mSortedTriangleIdx[i]][inDimension] < inSplit);
-	for (uint i = start; i < inTriangles.mEnd; ++i)
+	for (uint i = start_idx; i < inTriangles.mEnd; ++i)
 		JPH_ASSERT(mCentroids[mSortedTriangleIdx[i]][inDimension] >= inSplit);
 #endif
 
-	outLeft = Range(inTriangles.mBegin, start);
-	outRight = Range(start, inTriangles.mEnd);
+	outLeft = Range(inTriangles.mBegin, start_idx);
+	outRight = Range(start_idx, inTriangles.mEnd);
 	return outLeft.Count() > 0 && outRight.Count() > 0;
 }
 
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterBinning.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterBinning.cpp
index cdeb79bf..3d182069 100644
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterBinning.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterBinning.cpp
@@ -19,10 +19,13 @@ TriangleSplitterBinning::TriangleSplitterBinning(const VertexList &inVertices, c
 
 bool TriangleSplitterBinning::Split(const Range &inTriangles, Range &outLeft, Range &outRight)
 {
+	const uint *begin = mSortedTriangleIdx.data() + inTriangles.mBegin;
+	const uint *end = mSortedTriangleIdx.data() + inTriangles.mEnd;
+
 	// Calculate bounds for this range
 	AABox centroid_bounds;
-	for (uint t = inTriangles.mBegin; t < inTriangles.mEnd; ++t)
-		centroid_bounds.Encapsulate(Vec3(mCentroids[mSortedTriangleIdx[t]]));
+	for (const uint *t = begin; t < end; ++t)
+		centroid_bounds.Encapsulate(Vec3::sLoadFloat3Unsafe(mCentroids[*t]));
 
 	// Convert bounds to min coordinate and size
 	// Prevent division by zero if one of the dimensions is zero
@@ -57,11 +60,11 @@ bool TriangleSplitterBinning::Split(const Range &inTriangles, Range &outLeft, Ra
 	}
 
 	// Bin all triangles in all dimensions at once
-	for (uint t = inTriangles.mBegin; t < inTriangles.mEnd; ++t)
+	for (const uint *t = begin; t < end; ++t)
 	{
-		Vec3 centroid_pos(mCentroids[mSortedTriangleIdx[t]]);
+		Vec3 centroid_pos = Vec3::sLoadFloat3Unsafe(mCentroids[*t]);
 
-		AABox triangle_bounds = AABox::sFromTriangle(mVertices, GetTriangle(t));
+		AABox triangle_bounds = AABox::sFromTriangle(mVertices, mTriangles[*t]);
 
 		Vec3 bin_no_f = (centroid_pos - bounds_min) / bounds_size * float(num_bins);
 		UVec4 bin_no = UVec4::sMin(bin_no_f.ToInt(), UVec4::sReplicate(num_bins - 1));
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.cpp
deleted file mode 100644
index 333def98..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#include <Jolt/Jolt.h>
-
-#include <Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.h>
-#include <Jolt/TriangleGrouper/TriangleGrouperClosestCentroid.h>
-
-JPH_NAMESPACE_BEGIN
-
-TriangleSplitterFixedLeafSize::TriangleSplitterFixedLeafSize(const VertexList &inVertices, const IndexedTriangleList &inTriangles, uint inLeafSize, uint inMinNumBins, uint inMaxNumBins, uint inNumTrianglesPerBin) :
-	TriangleSplitter(inVertices, inTriangles),
-	mLeafSize(inLeafSize),
-	mMinNumBins(inMinNumBins),
-	mMaxNumBins(inMaxNumBins),
-	mNumTrianglesPerBin(inNumTrianglesPerBin)
-{
-	// Group the triangles
-	TriangleGrouperClosestCentroid grouper;
-	grouper.Group(inVertices, inTriangles, mLeafSize, mSortedTriangleIdx);
-
-	// Pad triangles so that we have a multiple of mLeafSize
-	const uint num_triangles = (uint)inTriangles.size();
-	const uint num_groups = (num_triangles + mLeafSize - 1) / mLeafSize;
-	const uint last_triangle_idx = mSortedTriangleIdx.back();
-	for (uint t = num_triangles, t_end = num_groups * mLeafSize; t < t_end; ++t)
-		mSortedTriangleIdx.push_back(last_triangle_idx);
-}
-
-Vec3 TriangleSplitterFixedLeafSize::GetCentroidForGroup(uint inFirstTriangleInGroup)
-{
-	JPH_ASSERT(inFirstTriangleInGroup % mLeafSize == 0);
-	AABox box;
-	for (uint g = 0; g < mLeafSize; ++g)
-		box.Encapsulate(mVertices, GetTriangle(inFirstTriangleInGroup + g));
-	return box.GetCenter();
-}
-
-bool TriangleSplitterFixedLeafSize::Split(const Range &inTriangles, Range &outLeft, Range &outRight)
-{
-	// Cannot split anything smaller than leaf size
-	JPH_ASSERT(inTriangles.Count() > mLeafSize);
-	JPH_ASSERT(inTriangles.Count() % mLeafSize == 0);
-
-	// Calculate bounds for this range
-	AABox centroid_bounds;
-	for (uint t = inTriangles.mBegin; t < inTriangles.mEnd; t += mLeafSize)
-		centroid_bounds.Encapsulate(GetCentroidForGroup(t));
-
-	float best_cp = FLT_MAX;
-	uint best_dim = 0xffffffff;
-	float best_split = 0;
-
-	// Bin in all dimensions
-	uint num_bins = Clamp(inTriangles.Count() / mNumTrianglesPerBin, mMinNumBins, mMaxNumBins);
-	Array<Bin> bins(num_bins);
-	for (uint dim = 0; dim < 3; ++dim)
-	{
-		float bounds_min = centroid_bounds.mMin[dim];
-		float bounds_size = centroid_bounds.mMax[dim] - bounds_min;
-
-		// Skip axis if too small
-		if (bounds_size < 1.0e-5f)
-			continue;
-
-		// Initialize bins
-		for (uint b = 0; b < num_bins; ++b)
-		{
-			Bin &bin = bins[b];
-			bin.mBounds.SetEmpty();
-			bin.mMinCentroid = bounds_min + bounds_size * (b + 1) / num_bins;
-			bin.mNumTriangles = 0;
-		}
-
-		// Bin all triangles
-		for (uint t = inTriangles.mBegin; t < inTriangles.mEnd; t += mLeafSize)
-		{
-			// Calculate average centroid for group
-			float centroid_pos = GetCentroidForGroup(t)[dim];
-
-			// Select bin
-			uint bin_no = min(uint((centroid_pos - bounds_min) / bounds_size * num_bins), num_bins - 1);
-			Bin &bin = bins[bin_no];
-
-			// Put all triangles of group in same bin
-			for (uint g = 0; g < mLeafSize; ++g)
-				bin.mBounds.Encapsulate(mVertices, GetTriangle(t + g));
-			bin.mMinCentroid = min(bin.mMinCentroid, centroid_pos);
-			bin.mNumTriangles += mLeafSize;
-		}
-
-		// Calculate totals left to right
-		AABox prev_bounds;
-		int prev_triangles = 0;
-		for (uint b = 0; b < num_bins; ++b)
-		{
-			Bin &bin = bins[b];
-			bin.mBoundsAccumulatedLeft = prev_bounds; // Don't include this node as we'll take a split on the left side of the bin
-			bin.mNumTrianglesAccumulatedLeft = prev_triangles;
-			prev_bounds.Encapsulate(bin.mBounds);
-			prev_triangles += bin.mNumTriangles;
-		}
-
-		// Calculate totals right to left
-		prev_bounds.SetEmpty();
-		prev_triangles = 0;
-		for (int b = num_bins - 1; b >= 0; --b)
-		{
-			Bin &bin = bins[b];
-			prev_bounds.Encapsulate(bin.mBounds);
-			prev_triangles += bin.mNumTriangles;
-			bin.mBoundsAccumulatedRight = prev_bounds;
-			bin.mNumTrianglesAccumulatedRight = prev_triangles;
-		}
-
-		// Get best splitting plane
-		for (uint b = 1; b < num_bins; ++b) // Start at 1 since selecting bin 0 would result in everything ending up on the right side
-		{
-			// Calculate surface area heuristic and see if it is better than the current best
-			const Bin &bin = bins[b];
-			float cp = bin.mBoundsAccumulatedLeft.GetSurfaceArea() * bin.mNumTrianglesAccumulatedLeft + bin.mBoundsAccumulatedRight.GetSurfaceArea() * bin.mNumTrianglesAccumulatedRight;
-			if (cp < best_cp)
-			{
-				best_cp = cp;
-				best_dim = dim;
-				best_split = bin.mMinCentroid;
-			}
-		}
-	}
-
-	// No split found?
-	if (best_dim == 0xffffffff)
-		return false;
-
-	// Divide triangles
-	uint start = inTriangles.mBegin, end = inTriangles.mEnd;
-	while (start < end)
-	{
-		// Search for first element that is on the right hand side of the split plane
-		while (start < end && GetCentroidForGroup(start)[best_dim] < best_split)
-			start += mLeafSize;
-
-		// Search for the first element that is on the left hand side of the split plane
-		while (start < end && GetCentroidForGroup(end - mLeafSize)[best_dim] >= best_split)
-			end -= mLeafSize;
-
-		if (start < end)
-		{
-			// Swap the two elements
-			for (uint g = 0; g < mLeafSize; ++g)
-				std::swap(mSortedTriangleIdx[start + g], mSortedTriangleIdx[end - mLeafSize + g]);
-			start += mLeafSize;
-			end -= mLeafSize;
-		}
-	}
-	JPH_ASSERT(start == end);
-
-	// No suitable split found, doing random split in half
-	if (start == inTriangles.mBegin || start == inTriangles.mEnd)
-		start = inTriangles.mBegin + (inTriangles.Count() / mLeafSize + 1) / 2 * mLeafSize;
-
-	outLeft = Range(inTriangles.mBegin, start);
-	outRight = Range(start, inTriangles.mEnd);
-	JPH_ASSERT(outLeft.mEnd > outLeft.mBegin && outRight.mEnd > outRight.mBegin);
-	JPH_ASSERT(outLeft.Count() % mLeafSize == 0 && outRight.Count() % mLeafSize == 0);
-	return true;
-}
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.h b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.h
deleted file mode 100644
index 029121da..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/TriangleSplitter/TriangleSplitter.h>
-#include <Jolt/Geometry/AABox.h>
-
-JPH_NAMESPACE_BEGIN
-
-/// Same as TriangleSplitterBinning, but ensuring that leaves have a fixed amount of triangles
-/// The resulting tree should be suitable for processing on GPU where we want all threads to process an equal amount of triangles
-class JPH_EXPORT TriangleSplitterFixedLeafSize : public TriangleSplitter
-{
-public:
-	/// Constructor
-							TriangleSplitterFixedLeafSize(const VertexList &inVertices, const IndexedTriangleList &inTriangles, uint inLeafSize, uint inMinNumBins = 8, uint inMaxNumBins = 128, uint inNumTrianglesPerBin = 6);
-
-	// See TriangleSplitter::GetStats
-	virtual void			GetStats(Stats &outStats) const override
-	{
-		outStats.mSplitterName = "TriangleSplitterFixedLeafSize";
-		outStats.mLeafSize = mLeafSize;
-	}
-
-	// See TriangleSplitter::Split
-	virtual bool			Split(const Range &inTriangles, Range &outLeft, Range &outRight) override;
-
-private:
-	/// Get centroid for group
-	Vec3					GetCentroidForGroup(uint inFirstTriangleInGroup);
-
-	// Configuration
-	const uint				mLeafSize;
-	const uint				mMinNumBins;
-	const uint				mMaxNumBins;
-	const uint				mNumTrianglesPerBin;
-
-	struct Bin
-	{
-		// Properties of this bin
-		AABox				mBounds;
-		float				mMinCentroid;
-		uint				mNumTriangles;
-
-		// Accumulated data from left most / right most bin to current (including this bin)
-		AABox				mBoundsAccumulatedLeft;
-		AABox				mBoundsAccumulatedRight;
-		uint				mNumTrianglesAccumulatedLeft;
-		uint				mNumTrianglesAccumulatedRight;
-	};
-};
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterLongestAxis.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterLongestAxis.cpp
deleted file mode 100644
index f8115ab8..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterLongestAxis.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#include <Jolt/Jolt.h>
-
-#include <Jolt/TriangleSplitter/TriangleSplitterLongestAxis.h>
-#include <Jolt/Geometry/AABox.h>
-
-JPH_NAMESPACE_BEGIN
-
-TriangleSplitterLongestAxis::TriangleSplitterLongestAxis(const VertexList &inVertices, const IndexedTriangleList &inTriangles) :
-	TriangleSplitter(inVertices, inTriangles)
-{
-}
-
-bool TriangleSplitterLongestAxis::Split(const Range &inTriangles, Range &outLeft, Range &outRight)
-{
-	// Calculate bounding box for triangles
-	AABox bounds;
-	for (uint t = inTriangles.mBegin; t < inTriangles.mEnd; ++t)
-		bounds.Encapsulate(mVertices, GetTriangle(t));
-
-	// Calculate split plane
-	uint dimension = bounds.GetExtent().GetHighestComponentIndex();
-	float split = bounds.GetCenter()[dimension];
-
-	return SplitInternal(inTriangles, dimension, split, outLeft, outRight);
-}
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterLongestAxis.h b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterLongestAxis.h
deleted file mode 100644
index daf0d437..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterLongestAxis.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/TriangleSplitter/TriangleSplitter.h>
-
-JPH_NAMESPACE_BEGIN
-
-/// Splitter using center of bounding box with longest axis
-class JPH_EXPORT TriangleSplitterLongestAxis : public TriangleSplitter
-{
-public:
-	/// Constructor
-							TriangleSplitterLongestAxis(const VertexList &inVertices, const IndexedTriangleList &inTriangles);
-
-	// See TriangleSplitter::GetStats
-	virtual void			GetStats(Stats &outStats) const override
-	{
-		outStats.mSplitterName = "TriangleSplitterLongestAxis";
-	}
-
-	// See TriangleSplitter::Split
-	virtual bool			Split(const Range &inTriangles, Range &outLeft, Range &outRight) override;
-};
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMean.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMean.cpp
index e884246f..2385f4d5 100644
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMean.cpp
+++ b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMean.cpp
@@ -15,17 +15,20 @@ TriangleSplitterMean::TriangleSplitterMean(const VertexList &inVertices, const I
 
 bool TriangleSplitterMean::Split(const Range &inTriangles, Range &outLeft, Range &outRight)
 {
+	const uint *begin = mSortedTriangleIdx.data() + inTriangles.mBegin;
+	const uint *end = mSortedTriangleIdx.data() + inTriangles.mEnd;
+
 	// Calculate mean value for these triangles
 	Vec3 mean = Vec3::sZero();
-	for (uint t = inTriangles.mBegin; t < inTriangles.mEnd; ++t)
-		mean += Vec3(mCentroids[mSortedTriangleIdx[t]]);
+	for (const uint *t = begin; t < end; ++t)
+		mean += Vec3::sLoadFloat3Unsafe(mCentroids[*t]);
 	mean *= 1.0f / inTriangles.Count();
 
 	// Calculate deviation
 	Vec3 deviation = Vec3::sZero();
-	for (uint t = inTriangles.mBegin; t < inTriangles.mEnd; ++t)
+	for (const uint *t = begin; t < end; ++t)
 	{
-		Vec3 delta = Vec3(mCentroids[mSortedTriangleIdx[t]]) - mean;
+		Vec3 delta = Vec3::sLoadFloat3Unsafe(mCentroids[*t]) - mean;
 		deviation += delta * delta;
 	}
 	deviation *= 1.0f / inTriangles.Count();
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMorton.cpp b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMorton.cpp
deleted file mode 100644
index 35b0f421..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMorton.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#include <Jolt/Jolt.h>
-
-#include <Jolt/TriangleSplitter/TriangleSplitterMorton.h>
-#include <Jolt/Geometry/MortonCode.h>
-#include <Jolt/Core/QuickSort.h>
-
-JPH_NAMESPACE_BEGIN
-
-TriangleSplitterMorton::TriangleSplitterMorton(const VertexList &inVertices, const IndexedTriangleList &inTriangles) :
-	TriangleSplitter(inVertices, inTriangles)
-{
-	// Calculate bounds of centroids
-	AABox bounds;
-	for (uint t = 0; t < inTriangles.size(); ++t)
-		bounds.Encapsulate(Vec3(mCentroids[t]));
-
-	// Make sure box is not degenerate
-	bounds.EnsureMinimalEdgeLength(1.0e-5f);
-
-	// Calculate morton codes
-	mMortonCodes.resize(inTriangles.size());
-	for (uint t = 0; t < inTriangles.size(); ++t)
-		mMortonCodes[t] = MortonCode::sGetMortonCode(Vec3(mCentroids[t]), bounds);
-
-	// Sort triangles on morton code
-	const Array<uint32> &morton_codes = mMortonCodes;
-	QuickSort(mSortedTriangleIdx.begin(), mSortedTriangleIdx.end(), [&morton_codes](uint inLHS, uint inRHS) { return morton_codes[inLHS] < morton_codes[inRHS]; });
-}
-
-bool TriangleSplitterMorton::Split(const Range &inTriangles, Range &outLeft, Range &outRight)
-{
-	uint32 first_code = mMortonCodes[mSortedTriangleIdx[inTriangles.mBegin]];
-	uint32 last_code = mMortonCodes[mSortedTriangleIdx[inTriangles.mEnd - 1]];
-
-	uint common_prefix = CountLeadingZeros(first_code ^ last_code);
-
-	// Use binary search to find where the next bit differs
-	uint split = inTriangles.mBegin; // Initial guess
-	uint step = inTriangles.Count();
-	do
-	{
-		step = (step + 1) >> 1; // Exponential decrease
-		uint new_split = split + step; // Proposed new position
-		if (new_split < inTriangles.mEnd)
-		{
-			uint32 split_code = mMortonCodes[mSortedTriangleIdx[new_split]];
-			uint split_prefix = CountLeadingZeros(first_code ^ split_code);
-			if (split_prefix > common_prefix)
-				split = new_split; // Accept proposal
-		}
-	}
-	while (step > 1);
-
-	outLeft = Range(inTriangles.mBegin, split + 1);
-	outRight = Range(split + 1, inTriangles.mEnd);
-	return outLeft.Count() > 0 && outRight.Count() > 0;
-}
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMorton.h b/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMorton.h
deleted file mode 100644
index 2f48c0ea..00000000
--- a/engine/thirdparty/jolt_physics/Jolt/TriangleSplitter/TriangleSplitterMorton.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Jolt Physics Library (https://github.com/jrouwe/JoltPhysics)
-// SPDX-FileCopyrightText: 2021 Jorrit Rouwe
-// SPDX-License-Identifier: MIT
-
-#pragma once
-
-#include <Jolt/TriangleSplitter/TriangleSplitter.h>
-
-JPH_NAMESPACE_BEGIN
-
-/// Splitter using Morton codes, see: http://devblogs.nvidia.com/parallelforall/thinking-parallel-part-iii-tree-construction-gpu/
-class JPH_EXPORT TriangleSplitterMorton : public TriangleSplitter
-{
-public:
-	/// Constructor
-							TriangleSplitterMorton(const VertexList &inVertices, const IndexedTriangleList &inTriangles);
-
-	// See TriangleSplitter::GetStats
-	virtual void			GetStats(Stats &outStats) const override
-	{
-		outStats.mSplitterName = "TriangleSplitterMorton";
-	}
-
-	// See TriangleSplitter::Split
-	virtual bool			Split(const Range &inTriangles, Range &outLeft, Range &outRight) override;
-
-private:
-	// Precalculated Morton codes
-	Array<uint32>			mMortonCodes;
-};
-
-JPH_NAMESPACE_END
diff --git a/engine/thirdparty/libpng/png.c b/engine/thirdparty/libpng/png.c
index 466af7d9..6d533ec4 100644
--- a/engine/thirdparty/libpng/png.c
+++ b/engine/thirdparty/libpng/png.c
@@ -13,7 +13,34 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_45 Your_png_h_is_not_version_1_6_45;
+typedef png_libpng_version_1_6_47 Your_png_h_is_not_version_1_6_47;
+
+/* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
+ * corresponding macro definitions.  This causes a compile time failure if
+ * something is wrong but generates no code.
+ *
+ * (1) The first check is that the PNG_CHUNK(cHNK, index) 'index' values must
+ * increment from 0 to the last value.
+ */
+#define PNG_CHUNK(cHNK, index) != (index) || ((index)+1)
+
+#if 0 PNG_KNOWN_CHUNKS < 0
+#  error PNG_KNOWN_CHUNKS chunk definitions are not in order
+#endif
+
+#undef PNG_CHUNK
+
+/* (2) The chunk name macros, png_cHNK, must all be valid and defined.  Since
+ * this is a preprocessor test undefined pp-tokens come out as zero and will
+ * fail this test.
+ */
+#define PNG_CHUNK(cHNK, index) !PNG_CHUNK_NAME_VALID(png_ ## cHNK) ||
+
+#if PNG_KNOWN_CHUNKS 0
+#  error png_cHNK not defined for some known cHNK
+#endif
+
+#undef PNG_CHUNK
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -241,21 +268,23 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
     */
    memset(&create_struct, 0, (sizeof create_struct));
 
-   /* Added at libpng-1.2.6 */
 #  ifdef PNG_USER_LIMITS_SUPPORTED
       create_struct.user_width_max = PNG_USER_WIDTH_MAX;
       create_struct.user_height_max = PNG_USER_HEIGHT_MAX;
 
 #     ifdef PNG_USER_CHUNK_CACHE_MAX
-      /* Added at libpng-1.2.43 and 1.4.0 */
       create_struct.user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
 #     endif
 
-#     ifdef PNG_USER_CHUNK_MALLOC_MAX
-      /* Added at libpng-1.2.43 and 1.4.1, required only for read but exists
-       * in png_struct regardless.
-       */
+#     if PNG_USER_CHUNK_MALLOC_MAX > 0 /* default to compile-time limit */
       create_struct.user_chunk_malloc_max = PNG_USER_CHUNK_MALLOC_MAX;
+
+      /* No compile-time limit, so initialize to the system limit: */
+#     elif defined PNG_MAX_MALLOC_64K /* legacy system limit */
+      create_struct.user_chunk_malloc_max = 65536U;
+
+#     else /* modern system limit SIZE_MAX (C99) */
+      create_struct.user_chunk_malloc_max = PNG_SIZE_MAX;
 #     endif
 #  endif
 
@@ -597,13 +626,6 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
    /* Free any eXIf entry */
    if (((mask & PNG_FREE_EXIF) & info_ptr->free_me) != 0)
    {
-# ifdef PNG_READ_eXIf_SUPPORTED
-      if (info_ptr->eXIf_buf)
-      {
-         png_free(png_ptr, info_ptr->eXIf_buf);
-         info_ptr->eXIf_buf = NULL;
-      }
-# endif
       if (info_ptr->exif)
       {
          png_free(png_ptr, info_ptr->exif);
@@ -793,7 +815,7 @@ png_get_copyright(png_const_structrp png_ptr)
    return PNG_STRING_COPYRIGHT
 #else
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.45" PNG_STRING_NEWLINE \
+      "libpng version 1.6.47" PNG_STRING_NEWLINE \
       "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
@@ -1038,169 +1060,6 @@ png_zstream_error(png_structrp png_ptr, int ret)
    }
 }
 
-/* png_convert_size: a PNGAPI but no longer in png.h, so deleted
- * at libpng 1.5.5!
- */
-
-/* Added at libpng version 1.2.34 and 1.4.0 (moved from pngset.c) */
-#ifdef PNG_GAMMA_SUPPORTED /* always set if COLORSPACE */
-static int
-png_colorspace_check_gamma(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA, int from)
-   /* This is called to check a new gamma value against an existing one.  The
-    * routine returns false if the new gamma value should not be written.
-    *
-    * 'from' says where the new gamma value comes from:
-    *
-    *    0: the new gamma value is the libpng estimate for an ICC profile
-    *    1: the new gamma value comes from a gAMA chunk
-    *    2: the new gamma value comes from an sRGB chunk
-    */
-{
-   png_fixed_point gtest;
-
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-       (png_muldiv(&gtest, colorspace->gamma, PNG_FP_1, gAMA) == 0  ||
-      png_gamma_significant(gtest) != 0))
-   {
-      /* Either this is an sRGB image, in which case the calculated gamma
-       * approximation should match, or this is an image with a profile and the
-       * value libpng calculates for the gamma of the profile does not match the
-       * value recorded in the file.  The former, sRGB, case is an error, the
-       * latter is just a warning.
-       */
-      if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0 || from == 2)
-      {
-         png_chunk_report(png_ptr, "gamma value does not match sRGB",
-             PNG_CHUNK_ERROR);
-         /* Do not overwrite an sRGB value */
-         return from == 2;
-      }
-
-      else /* sRGB tag not involved */
-      {
-         png_chunk_report(png_ptr, "gamma value does not match libpng estimate",
-             PNG_CHUNK_WARNING);
-         return from == 1;
-      }
-   }
-
-   return 1;
-}
-
-void /* PRIVATE */
-png_colorspace_set_gamma(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA)
-{
-   /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't
-    * occur.  Since the fixed point representation is asymmetrical it is
-    * possible for 1/gamma to overflow the limit of 21474 and this means the
-    * gamma value must be at least 5/100000 and hence at most 20000.0.  For
-    * safety the limits here are a little narrower.  The values are 0.00016 to
-    * 6250.0, which are truly ridiculous gamma values (and will produce
-    * displays that are all black or all white.)
-    *
-    * In 1.6.0 this test replaces the ones in pngrutil.c, in the gAMA chunk
-    * handling code, which only required the value to be >0.
-    */
-   png_const_charp errmsg;
-
-   if (gAMA < 16 || gAMA > 625000000)
-      errmsg = "gamma value out of range";
-
-#  ifdef PNG_READ_gAMA_SUPPORTED
-   /* Allow the application to set the gamma value more than once */
-   else if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
-      (colorspace->flags & PNG_COLORSPACE_FROM_gAMA) != 0)
-      errmsg = "duplicate";
-#  endif
-
-   /* Do nothing if the colorspace is already invalid */
-   else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
-
-   else
-   {
-      if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,
-          1/*from gAMA*/) != 0)
-      {
-         /* Store this gamma value. */
-         colorspace->gamma = gAMA;
-         colorspace->flags |=
-            (PNG_COLORSPACE_HAVE_GAMMA | PNG_COLORSPACE_FROM_gAMA);
-      }
-
-      /* At present if the check_gamma test fails the gamma of the colorspace is
-       * not updated however the colorspace is not invalidated.  This
-       * corresponds to the case where the existing gamma comes from an sRGB
-       * chunk or profile.  An error message has already been output.
-       */
-      return;
-   }
-
-   /* Error exit - errmsg has been set. */
-   colorspace->flags |= PNG_COLORSPACE_INVALID;
-   png_chunk_report(png_ptr, errmsg, PNG_CHUNK_WRITE_ERROR);
-}
-
-void /* PRIVATE */
-png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
-{
-   if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-   {
-      /* Everything is invalid */
-      info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|
-         PNG_INFO_iCCP);
-
-#     ifdef PNG_COLORSPACE_SUPPORTED
-      /* Clean up the iCCP profile now if it won't be used. */
-      png_free_data(png_ptr, info_ptr, PNG_FREE_ICCP, -1/*not used*/);
-#     else
-      PNG_UNUSED(png_ptr)
-#     endif
-   }
-
-   else
-   {
-#     ifdef PNG_COLORSPACE_SUPPORTED
-      /* Leave the INFO_iCCP flag set if the pngset.c code has already set
-       * it; this allows a PNG to contain a profile which matches sRGB and
-       * yet still have that profile retrievable by the application.
-       */
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)
-         info_ptr->valid |= PNG_INFO_sRGB;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_sRGB;
-
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-         info_ptr->valid |= PNG_INFO_cHRM;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_cHRM;
-#     endif
-
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)
-         info_ptr->valid |= PNG_INFO_gAMA;
-
-      else
-         info_ptr->valid &= ~PNG_INFO_gAMA;
-   }
-}
-
-#ifdef PNG_READ_SUPPORTED
-void /* PRIVATE */
-png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr)
-{
-   if (info_ptr == NULL) /* reduce code size; check here not in the caller */
-      return;
-
-   info_ptr->colorspace = png_ptr->colorspace;
-   png_colorspace_sync_info(png_ptr, info_ptr);
-}
-#endif
-#endif /* GAMMA */
-
 #ifdef PNG_COLORSPACE_SUPPORTED
 static png_int_32
 png_fp_add(png_int_32 addend0, png_int_32 addend1, int *error)
@@ -1269,9 +1128,10 @@ png_safe_add(png_int_32 *addend0_and_result, png_int_32 addend1,
  * non-zero on a parameter error.  The X, Y and Z values are required to be
  * positive and less than 1.0.
  */
-static int
+int /* PRIVATE */
 png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
 {
+   /* NOTE: returns 0 on success, 1 means error. */
    png_int_32 d, dred, dgreen, dblue, dwhite, whiteX, whiteY;
 
    /* 'd' in each of the blocks below is just X+Y+Z for each component,
@@ -1334,9 +1194,10 @@ png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
    return 0;
 }
 
-static int
+int /* PRIVATE */
 png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
 {
+   /* NOTE: returns 0 on success, 1 means error. */
    png_fixed_point red_inverse, green_inverse, blue_scale;
    png_fixed_point left, right, denominator;
 
@@ -1544,56 +1405,59 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
     *  Adobe Wide Gamut RGB
     *    0.258728243040113 0.724682314948566 0.016589442011321
     */
-   int error = 0;
+   {
+      int error = 0;
 
-   /* By the argument above overflow should be impossible here, however the
-    * code now simply returns a failure code.  The xy subtracts in the arguments
-    * to png_muldiv are *not* checked for overflow because the checks at the
-    * start guarantee they are in the range 0..110000 and png_fixed_point is a
-    * 32-bit signed number.
-    */
-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 8) == 0)
-      return 1;
-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 8) == 0)
-      return 1;
-   denominator = png_fp_sub(left, right, &error);
-   if (error) return 1;
+      /* By the argument above overflow should be impossible here, however the
+       * code now simply returns a failure code.  The xy subtracts in the
+       * arguments to png_muldiv are *not* checked for overflow because the
+       * checks at the start guarantee they are in the range 0..110000 and
+       * png_fixed_point is a 32-bit signed number.
+       */
+      if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 8) == 0)
+         return 1;
+      if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 8) ==
+            0)
+         return 1;
+      denominator = png_fp_sub(left, right, &error);
+      if (error) return 1;
 
-   /* Now find the red numerator. */
-   if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
-      return 1;
-   if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 8) == 0)
-      return 1;
+      /* Now find the red numerator. */
+      if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
+         return 1;
+      if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 8) ==
+            0)
+         return 1;
 
-   /* Overflow is possible here and it indicates an extreme set of PNG cHRM
-    * chunk values.  This calculation actually returns the reciprocal of the
-    * scale value because this allows us to delay the multiplication of white-y
-    * into the denominator, which tends to produce a small number.
-    */
-   if (png_muldiv(&red_inverse, xy->whitey, denominator,
-                  png_fp_sub(left, right, &error)) == 0 || error ||
-       red_inverse <= xy->whitey /* r+g+b scales = white scale */)
-      return 1;
+      /* Overflow is possible here and it indicates an extreme set of PNG cHRM
+       * chunk values.  This calculation actually returns the reciprocal of the
+       * scale value because this allows us to delay the multiplication of
+       * white-y into the denominator, which tends to produce a small number.
+       */
+      if (png_muldiv(&red_inverse, xy->whitey, denominator,
+                     png_fp_sub(left, right, &error)) == 0 || error ||
+          red_inverse <= xy->whitey /* r+g+b scales = white scale */)
+         return 1;
 
-   /* Similarly for green_inverse: */
-   if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 8) == 0)
-      return 1;
-   if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
-      return 1;
-   if (png_muldiv(&green_inverse, xy->whitey, denominator,
-                  png_fp_sub(left, right, &error)) == 0 || error ||
-       green_inverse <= xy->whitey)
-      return 1;
-
-   /* And the blue scale, the checks above guarantee this can't overflow but it
-    * can still produce 0 for extreme cHRM values.
-    */
-   blue_scale = png_fp_sub(png_fp_sub(png_reciprocal(xy->whitey),
-                                      png_reciprocal(red_inverse), &error),
-                           png_reciprocal(green_inverse), &error);
-   if (error || blue_scale <= 0)
-      return 1;
+      /* Similarly for green_inverse: */
+      if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 8) == 0)
+         return 1;
+      if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 8) == 0)
+         return 1;
+      if (png_muldiv(&green_inverse, xy->whitey, denominator,
+                     png_fp_sub(left, right, &error)) == 0 || error ||
+          green_inverse <= xy->whitey)
+         return 1;
 
+      /* And the blue scale, the checks above guarantee this can't overflow but
+       * it can still produce 0 for extreme cHRM values.
+       */
+      blue_scale = png_fp_sub(png_fp_sub(png_reciprocal(xy->whitey),
+                                         png_reciprocal(red_inverse), &error),
+                              png_reciprocal(green_inverse), &error);
+      if (error || blue_scale <= 0)
+         return 1;
+   }
 
    /* And fill in the png_XYZ.  Again the subtracts are safe because of the
     * checks on the xy values at the start (the subtracts just calculate the
@@ -1625,239 +1489,9 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
 
    return 0; /*success*/
 }
+#endif /* COLORSPACE */
 
-static int
-png_XYZ_normalize(png_XYZ *XYZ)
-{
-   png_int_32 Y, Ytemp;
-
-   /* Normalize by scaling so the sum of the end-point Y values is PNG_FP_1. */
-   Ytemp = XYZ->red_Y;
-   if (png_safe_add(&Ytemp, XYZ->green_Y, XYZ->blue_Y))
-      return 1;
-
-   Y = Ytemp;
-
-   if (Y != PNG_FP_1)
-   {
-      if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)
-         return 1;
-
-      if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)
-         return 1;
-
-      if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)
-         return 1;
-      if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)
-         return 1;
-   }
-
-   return 0;
-}
-
-static int
-png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)
-{
-   /* Allow an error of +/-0.01 (absolute value) on each chromaticity */
-   if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
-       PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
-       PNG_OUT_OF_RANGE(xy1->redx,   xy2->redx,  delta) ||
-       PNG_OUT_OF_RANGE(xy1->redy,   xy2->redy,  delta) ||
-       PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
-       PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
-       PNG_OUT_OF_RANGE(xy1->bluex,  xy2->bluex, delta) ||
-       PNG_OUT_OF_RANGE(xy1->bluey,  xy2->bluey, delta))
-      return 0;
-   return 1;
-}
-
-/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM
- * chunk chromaticities.  Earlier checks used to simply look for the overflow
- * condition (where the determinant of the matrix to solve for XYZ ends up zero
- * because the chromaticity values are not all distinct.)  Despite this it is
- * theoretically possible to produce chromaticities that are apparently valid
- * but that rapidly degrade to invalid, potentially crashing, sets because of
- * arithmetic inaccuracies when calculations are performed on them.  The new
- * check is to round-trip xy -> XYZ -> xy and then check that the result is
- * within a small percentage of the original.
- */
-static int
-png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)
-{
-   int result;
-   png_xy xy_test;
-
-   /* As a side-effect this routine also returns the XYZ endpoints. */
-   result = png_XYZ_from_xy(XYZ, xy);
-   if (result != 0)
-      return result;
-
-   result = png_xy_from_XYZ(&xy_test, XYZ);
-   if (result != 0)
-      return result;
-
-   if (png_colorspace_endpoints_match(xy, &xy_test,
-       5/*actually, the math is pretty accurate*/) != 0)
-      return 0;
-
-   /* Too much slip */
-   return 1;
-}
-
-/* This is the check going the other way.  The XYZ is modified to normalize it
- * (another side-effect) and the xy chromaticities are returned.
- */
-static int
-png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)
-{
-   int result;
-   png_XYZ XYZtemp;
-
-   result = png_XYZ_normalize(XYZ);
-   if (result != 0)
-      return result;
-
-   result = png_xy_from_XYZ(xy, XYZ);
-   if (result != 0)
-      return result;
-
-   XYZtemp = *XYZ;
-   return png_colorspace_check_xy(&XYZtemp, xy);
-}
-
-/* Used to check for an endpoint match against sRGB */
-static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
-{
-   /* color      x       y */
-   /* red   */ 64000, 33000,
-   /* green */ 30000, 60000,
-   /* blue  */ 15000,  6000,
-   /* white */ 31270, 32900
-};
-
-static int
-png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
-    int preferred)
-{
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   /* The consistency check is performed on the chromaticities; this factors out
-    * variations because of the normalization (or not) of the end point Y
-    * values.
-    */
-   if (preferred < 2 &&
-       (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
-   {
-      /* The end points must be reasonably close to any we already have.  The
-       * following allows an error of up to +/-.001
-       */
-      if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,
-          100) == 0)
-      {
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "inconsistent chromaticities");
-         return 0; /* failed */
-      }
-
-      /* Only overwrite with preferred values */
-      if (preferred == 0)
-         return 1; /* ok, but no change */
-   }
-
-   colorspace->end_points_xy = *xy;
-   colorspace->end_points_XYZ = *XYZ;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_ENDPOINTS;
-
-   /* The end points are normally quoted to two decimal digits, so allow +/-0.01
-    * on this test.
-    */
-   if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)
-      colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;
-
-   else
-      colorspace->flags &= PNG_COLORSPACE_CANCEL(
-         PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-
-   return 2; /* ok and changed */
-}
-
-int /* PRIVATE */
-png_colorspace_set_chromaticities(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_xy *xy, int preferred)
-{
-   /* We must check the end points to ensure they are reasonable - in the past
-    * color management systems have crashed as a result of getting bogus
-    * colorant values, while this isn't the fault of libpng it is the
-    * responsibility of libpng because PNG carries the bomb and libpng is in a
-    * position to protect against it.
-    */
-   png_XYZ XYZ;
-
-   switch (png_colorspace_check_xy(&XYZ, xy))
-   {
-      case 0: /* success */
-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, xy, &XYZ,
-             preferred);
-
-      case 1:
-         /* We can't invert the chromaticities so we can't produce value XYZ
-          * values.  Likely as not a color management system will fail too.
-          */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "invalid chromaticities");
-         break;
-
-      default:
-         /* libpng is broken; this should be a warning but if it happens we
-          * want error reports so for the moment it is an error.
-          */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_error(png_ptr, "internal error checking chromaticities");
-   }
-
-   return 0; /* failed */
-}
-
-int /* PRIVATE */
-png_colorspace_set_endpoints(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, const png_XYZ *XYZ_in, int preferred)
-{
-   png_XYZ XYZ = *XYZ_in;
-   png_xy xy;
-
-   switch (png_colorspace_check_XYZ(&xy, &XYZ))
-   {
-      case 0:
-         return png_colorspace_set_xy_and_XYZ(png_ptr, colorspace, &xy, &XYZ,
-             preferred);
-
-      case 1:
-         /* End points are invalid. */
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_benign_error(png_ptr, "invalid end points");
-         break;
-
-      default:
-         colorspace->flags |= PNG_COLORSPACE_INVALID;
-         png_error(png_ptr, "internal error checking chromaticities");
-   }
-
-   return 0; /* failed */
-}
-
-#if defined(PNG_sRGB_SUPPORTED) || defined(PNG_iCCP_SUPPORTED)
+#ifdef PNG_iCCP_SUPPORTED
 /* Error message generation */
 static char
 png_icc_tag_char(png_uint_32 byte)
@@ -1897,15 +1531,12 @@ is_ICC_signature(png_alloc_size_t it)
 }
 
 static int
-png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_alloc_size_t value, png_const_charp reason)
+png_icc_profile_error(png_const_structrp png_ptr, png_const_charp name,
+   png_alloc_size_t value, png_const_charp reason)
 {
    size_t pos;
    char message[196]; /* see below for calculation */
 
-   if (colorspace != NULL)
-      colorspace->flags |= PNG_COLORSPACE_INVALID;
-
    pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
    pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
    pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */
@@ -1932,109 +1563,13 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
    pos = png_safecat(message, (sizeof message), pos, reason);
    PNG_UNUSED(pos)
 
-   /* This is recoverable, but make it unconditionally an app_error on write to
-    * avoid writing invalid ICC profiles into PNG files (i.e., we handle them
-    * on read, with a warning, but on write unless the app turns off
-    * application errors the PNG won't be written.)
-    */
-   png_chunk_report(png_ptr, message,
-       (colorspace != NULL) ? PNG_CHUNK_ERROR : PNG_CHUNK_WRITE_ERROR);
+   png_chunk_benign_error(png_ptr, message);
 
    return 0;
 }
-#endif /* sRGB || iCCP */
+#endif /* iCCP */
 
-#ifdef PNG_sRGB_SUPPORTED
-int /* PRIVATE */
-png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    int intent)
-{
-   /* sRGB sets known gamma, end points and (from the chunk) intent. */
-   /* IMPORTANT: these are not necessarily the values found in an ICC profile
-    * because ICC profiles store values adapted to a D50 environment; it is
-    * expected that the ICC profile mediaWhitePointTag will be D50; see the
-    * checks and code elsewhere to understand this better.
-    *
-    * These XYZ values, which are accurate to 5dp, produce rgb to gray
-    * coefficients of (6968,23435,2366), which are reduced (because they add up
-    * to 32769 not 32768) to (6968,23434,2366).  These are the values that
-    * libpng has traditionally used (and are the best values given the 15bit
-    * algorithm used by the rgb to gray code.)
-    */
-   static const png_XYZ sRGB_XYZ = /* D65 XYZ (*not* the D50 adapted values!) */
-   {
-      /* color      X      Y      Z */
-      /* red   */ 41239, 21264,  1933,
-      /* green */ 35758, 71517, 11919,
-      /* blue  */ 18048,  7219, 95053
-   };
-
-   /* Do nothing if the colorspace is already invalidated. */
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   /* Check the intent, then check for existing settings.  It is valid for the
-    * PNG file to have cHRM or gAMA chunks along with sRGB, but the values must
-    * be consistent with the correct values.  If, however, this function is
-    * called below because an iCCP chunk matches sRGB then it is quite
-    * conceivable that an older app recorded incorrect gAMA and cHRM because of
-    * an incorrect calculation based on the values in the profile - this does
-    * *not* invalidate the profile (though it still produces an error, which can
-    * be ignored.)
-    */
-   if (intent < 0 || intent >= PNG_sRGB_INTENT_LAST)
-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-          (png_alloc_size_t)intent, "invalid sRGB rendering intent");
-
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_INTENT) != 0 &&
-       colorspace->rendering_intent != intent)
-      return png_icc_profile_error(png_ptr, colorspace, "sRGB",
-         (png_alloc_size_t)intent, "inconsistent rendering intents");
-
-   if ((colorspace->flags & PNG_COLORSPACE_FROM_sRGB) != 0)
-   {
-      png_benign_error(png_ptr, "duplicate sRGB information ignored");
-      return 0;
-   }
-
-   /* If the standard sRGB cHRM chunk does not match the one from the PNG file
-    * warn but overwrite the value with the correct one.
-    */
-   if ((colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0 &&
-       !png_colorspace_endpoints_match(&sRGB_xy, &colorspace->end_points_xy,
-       100))
-      png_chunk_report(png_ptr, "cHRM chunk does not match sRGB",
-         PNG_CHUNK_ERROR);
-
-   /* This check is just done for the error reporting - the routine always
-    * returns true when the 'from' argument corresponds to sRGB (2).
-    */
-   (void)png_colorspace_check_gamma(png_ptr, colorspace, PNG_GAMMA_sRGB_INVERSE,
-       2/*from sRGB*/);
-
-   /* intent: bugs in GCC force 'int' to be used as the parameter type. */
-   colorspace->rendering_intent = (png_uint_16)intent;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_INTENT;
-
-   /* endpoints */
-   colorspace->end_points_xy = sRGB_xy;
-   colorspace->end_points_XYZ = sRGB_XYZ;
-   colorspace->flags |=
-      (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB);
-
-   /* gamma */
-   colorspace->gamma = PNG_GAMMA_sRGB_INVERSE;
-   colorspace->flags |= PNG_COLORSPACE_HAVE_GAMMA;
-
-   /* Finally record that we have an sRGB profile */
-   colorspace->flags |=
-      (PNG_COLORSPACE_MATCHES_sRGB|PNG_COLORSPACE_FROM_sRGB);
-
-   return 1; /* set */
-}
-#endif /* sRGB */
-
-#ifdef PNG_iCCP_SUPPORTED
+#ifdef PNG_READ_iCCP_SUPPORTED
 /* Encoded value of D50 as an ICC XYZNumber.  From the ICC 2010 spec the value
  * is XYZ(0.9642,1.0,0.8249), which scales to:
  *
@@ -2044,21 +1579,19 @@ static const png_byte D50_nCIEXYZ[12] =
    { 0x00, 0x00, 0xf6, 0xd6, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d };
 
 static int /* bool */
-icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length)
+icc_check_length(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length)
 {
    if (profile_length < 132)
-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-          "too short");
+      return png_icc_profile_error(png_ptr, name, profile_length, "too short");
    return 1;
 }
 
-#ifdef PNG_READ_iCCP_SUPPORTED
 int /* PRIVATE */
-png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length)
+png_icc_check_length(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length)
 {
-   if (!icc_check_length(png_ptr, colorspace, name, profile_length))
+   if (!icc_check_length(png_ptr, name, profile_length))
       return 0;
 
    /* This needs to be here because the 'normal' check is in
@@ -2067,30 +1600,17 @@ png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
     * the caller supplies the profile buffer so libpng doesn't allocate it.  See
     * the call to icc_check_length below (the write case).
     */
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-      else if (png_ptr->user_chunk_malloc_max > 0 &&
-               png_ptr->user_chunk_malloc_max < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds application limits");
-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
-      else if (PNG_USER_CHUNK_MALLOC_MAX < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds libpng limits");
-#  else /* !SET_USER_LIMITS */
-      /* This will get compiled out on all 32-bit and better systems. */
-      else if (PNG_SIZE_MAX < profile_length)
-         return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
-             "exceeds system limits");
-#  endif /* !SET_USER_LIMITS */
+   if (profile_length > png_chunk_max(png_ptr))
+      return png_icc_profile_error(png_ptr, name, profile_length,
+            "profile too long");
 
    return 1;
 }
-#endif /* READ_iCCP */
 
 int /* PRIVATE */
-png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length,
-    png_const_bytep profile/* first 132 bytes only */, int color_type)
+png_icc_check_header(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length,
+   png_const_bytep profile/* first 132 bytes only */, int color_type)
 {
    png_uint_32 temp;
 
@@ -2101,18 +1621,18 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     */
    temp = png_get_uint_32(profile);
    if (temp != profile_length)
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "length does not match profile");
 
    temp = (png_uint_32) (*(profile+8));
    if (temp > 3 && (profile_length & 3))
-      return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
+      return png_icc_profile_error(png_ptr, name, profile_length,
           "invalid length");
 
    temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */
    if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */
       profile_length < 132+12*temp) /* truncated tag table */
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "tag count too large");
 
    /* The 'intent' must be valid or we can't store it, ICC limits the intent to
@@ -2120,14 +1640,14 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     */
    temp = png_get_uint_32(profile+64);
    if (temp >= 0xffff) /* The ICC limit */
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "invalid rendering intent");
 
    /* This is just a warning because the profile may be valid in future
     * versions.
     */
    if (temp >= PNG_sRGB_INTENT_LAST)
-      (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+      (void)png_icc_profile_error(png_ptr, name, temp,
           "intent outside defined range");
 
    /* At this point the tag table can't be checked because it hasn't necessarily
@@ -2144,7 +1664,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     */
    temp = png_get_uint_32(profile+36); /* signature 'ascp' */
    if (temp != 0x61637370)
-      return png_icc_profile_error(png_ptr, colorspace, name, temp,
+      return png_icc_profile_error(png_ptr, name, temp,
           "invalid signature");
 
    /* Currently the PCS illuminant/adopted white point (the computational
@@ -2155,7 +1675,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
     * following is just a warning.
     */
    if (memcmp(profile+68, D50_nCIEXYZ, 12) != 0)
-      (void)png_icc_profile_error(png_ptr, NULL, name, 0/*no tag value*/,
+      (void)png_icc_profile_error(png_ptr, name, 0/*no tag value*/,
           "PCS illuminant is not D50");
 
    /* The PNG spec requires this:
@@ -2183,18 +1703,18 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
    {
       case 0x52474220: /* 'RGB ' */
          if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
-            return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            return png_icc_profile_error(png_ptr, name, temp,
                 "RGB color space not permitted on grayscale PNG");
          break;
 
       case 0x47524159: /* 'GRAY' */
          if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
-            return png_icc_profile_error(png_ptr, colorspace, name, temp,
+            return png_icc_profile_error(png_ptr, name, temp,
                 "Gray color space not permitted on RGB PNG");
          break;
 
       default:
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "invalid ICC profile color space");
    }
 
@@ -2219,7 +1739,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
 
       case 0x61627374: /* 'abst' */
          /* May not be embedded in an image */
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "invalid embedded Abstract ICC profile");
 
       case 0x6c696e6b: /* 'link' */
@@ -2229,7 +1749,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * therefore a DeviceLink profile should not be found embedded in a
           * PNG.
           */
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "unexpected DeviceLink ICC profile class");
 
       case 0x6e6d636c: /* 'nmcl' */
@@ -2237,7 +1757,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * contain an AToB0 tag that is open to misinterpretation.  Almost
           * certainly it will fail the tests below.
           */
-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+         (void)png_icc_profile_error(png_ptr, name, temp,
              "unexpected NamedColor ICC profile class");
          break;
 
@@ -2247,7 +1767,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * tag content to ensure they are backward compatible with one of the
           * understood profiles.
           */
-         (void)png_icc_profile_error(png_ptr, NULL, name, temp,
+         (void)png_icc_profile_error(png_ptr, name, temp,
              "unrecognized ICC profile class");
          break;
    }
@@ -2263,7 +1783,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
          break;
 
       default:
-         return png_icc_profile_error(png_ptr, colorspace, name, temp,
+         return png_icc_profile_error(png_ptr, name, temp,
              "unexpected ICC PCS encoding");
    }
 
@@ -2271,9 +1791,9 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
 }
 
 int /* PRIVATE */
-png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length,
-    png_const_bytep profile /* header plus whole tag table */)
+png_icc_check_tag_table(png_const_structrp png_ptr, png_const_charp name,
+   png_uint_32 profile_length,
+   png_const_bytep profile /* header plus whole tag table */)
 {
    png_uint_32 tag_count = png_get_uint_32(profile+128);
    png_uint_32 itag;
@@ -2299,7 +1819,7 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
        * profile.
        */
       if (tag_start > profile_length || tag_length > profile_length - tag_start)
-         return png_icc_profile_error(png_ptr, colorspace, name, tag_id,
+         return png_icc_profile_error(png_ptr, name, tag_id,
              "ICC profile tag outside profile");
 
       if ((tag_start & 3) != 0)
@@ -2308,307 +1828,132 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
           * only a warning here because libpng does not care about the
           * alignment.
           */
-         (void)png_icc_profile_error(png_ptr, NULL, name, tag_id,
+         (void)png_icc_profile_error(png_ptr, name, tag_id,
              "ICC profile tag start not a multiple of 4");
       }
    }
 
    return 1; /* success, maybe with warnings */
 }
-
-#ifdef PNG_sRGB_SUPPORTED
-#if PNG_sRGB_PROFILE_CHECKS >= 0
-/* Information about the known ICC sRGB profiles */
-static const struct
-{
-   png_uint_32 adler, crc, length;
-   png_uint_32 md5[4];
-   png_byte    have_md5;
-   png_byte    is_broken;
-   png_uint_16 intent;
-
-#  define PNG_MD5(a,b,c,d) { a, b, c, d }, (a!=0)||(b!=0)||(c!=0)||(d!=0)
-#  define PNG_ICC_CHECKSUM(adler, crc, md5, intent, broke, date, length, fname)\
-      { adler, crc, length, md5, broke, intent },
-
-} png_sRGB_checks[] =
-{
-   /* This data comes from contrib/tools/checksum-icc run on downloads of
-    * all four ICC sRGB profiles from www.color.org.
-    */
-   /* adler32, crc32, MD5[4], intent, date, length, file-name */
-   PNG_ICC_CHECKSUM(0x0a3fd9f6, 0x3b8772b9,
-       PNG_MD5(0x29f83dde, 0xaff255ae, 0x7842fae4, 0xca83390d), 0, 0,
-       "2009/03/27 21:36:31", 3048, "sRGB_IEC61966-2-1_black_scaled.icc")
-
-   /* ICC sRGB v2 perceptual no black-compensation: */
-   PNG_ICC_CHECKSUM(0x4909e5e1, 0x427ebb21,
-       PNG_MD5(0xc95bd637, 0xe95d8a3b, 0x0df38f99, 0xc1320389), 1, 0,
-       "2009/03/27 21:37:45", 3052, "sRGB_IEC61966-2-1_no_black_scaling.icc")
-
-   PNG_ICC_CHECKSUM(0xfd2144a1, 0x306fd8ae,
-       PNG_MD5(0xfc663378, 0x37e2886b, 0xfd72e983, 0x8228f1b8), 0, 0,
-       "2009/08/10 17:28:01", 60988, "sRGB_v4_ICC_preference_displayclass.icc")
-
-   /* ICC sRGB v4 perceptual */
-   PNG_ICC_CHECKSUM(0x209c35d2, 0xbbef7812,
-       PNG_MD5(0x34562abf, 0x994ccd06, 0x6d2c5721, 0xd0d68c5d), 0, 0,
-       "2007/07/25 00:05:37", 60960, "sRGB_v4_ICC_preference.icc")
-
-   /* The following profiles have no known MD5 checksum. If there is a match
-    * on the (empty) MD5 the other fields are used to attempt a match and
-    * a warning is produced.  The first two of these profiles have a 'cprt' tag
-    * which suggests that they were also made by Hewlett Packard.
-    */
-   PNG_ICC_CHECKSUM(0xa054d762, 0x5d5129ce,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 0,
-       "2004/07/21 18:57:42", 3024, "sRGB_IEC61966-2-1_noBPC.icc")
-
-   /* This is a 'mntr' (display) profile with a mediaWhitePointTag that does not
-    * match the D50 PCS illuminant in the header (it is in fact the D65 values,
-    * so the white point is recorded as the un-adapted value.)  The profiles
-    * below only differ in one byte - the intent - and are basically the same as
-    * the previous profile except for the mediaWhitePointTag error and a missing
-    * chromaticAdaptationTag.
-    */
-   PNG_ICC_CHECKSUM(0xf784f3fb, 0x182ea552,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 0, 1/*broken*/,
-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 perceptual")
-
-   PNG_ICC_CHECKSUM(0x0398f3fc, 0xf29e526d,
-       PNG_MD5(0x00000000, 0x00000000, 0x00000000, 0x00000000), 1, 1/*broken*/,
-       "1998/02/09 06:49:00", 3144, "HP-Microsoft sRGB v2 media-relative")
-};
-
-static int
-png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
-    png_const_bytep profile, uLong adler)
-{
-   /* The quick check is to verify just the MD5 signature and trust the
-    * rest of the data.  Because the profile has already been verified for
-    * correctness this is safe.  png_colorspace_set_sRGB will check the 'intent'
-    * field too, so if the profile has been edited with an intent not defined
-    * by sRGB (but maybe defined by a later ICC specification) the read of
-    * the profile will fail at that point.
-    */
-
-   png_uint_32 length = 0;
-   png_uint_32 intent = 0x10000; /* invalid */
-#if PNG_sRGB_PROFILE_CHECKS > 1
-   uLong crc = 0; /* the value for 0 length data */
-#endif
-   unsigned int i;
-
-#ifdef PNG_SET_OPTION_SUPPORTED
-   /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */
-   if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) ==
-               PNG_OPTION_ON)
-      return 0;
-#endif
-
-   for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i)
-   {
-      if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] &&
-         png_get_uint_32(profile+88) == png_sRGB_checks[i].md5[1] &&
-         png_get_uint_32(profile+92) == png_sRGB_checks[i].md5[2] &&
-         png_get_uint_32(profile+96) == png_sRGB_checks[i].md5[3])
-      {
-         /* This may be one of the old HP profiles without an MD5, in that
-          * case we can only use the length and Adler32 (note that these
-          * are not used by default if there is an MD5!)
-          */
-#        if PNG_sRGB_PROFILE_CHECKS == 0
-            if (png_sRGB_checks[i].have_md5 != 0)
-               return 1+png_sRGB_checks[i].is_broken;
-#        endif
-
-         /* Profile is unsigned or more checks have been configured in. */
-         if (length == 0)
-         {
-            length = png_get_uint_32(profile);
-            intent = png_get_uint_32(profile+64);
-         }
-
-         /* Length *and* intent must match */
-         if (length == (png_uint_32) png_sRGB_checks[i].length &&
-            intent == (png_uint_32) png_sRGB_checks[i].intent)
-         {
-            /* Now calculate the adler32 if not done already. */
-            if (adler == 0)
-            {
-               adler = adler32(0, NULL, 0);
-               adler = adler32(adler, profile, length);
-            }
-
-            if (adler == png_sRGB_checks[i].adler)
-            {
-               /* These basic checks suggest that the data has not been
-                * modified, but if the check level is more than 1 perform
-                * our own crc32 checksum on the data.
-                */
-#              if PNG_sRGB_PROFILE_CHECKS > 1
-                  if (crc == 0)
-                  {
-                     crc = crc32(0, NULL, 0);
-                     crc = crc32(crc, profile, length);
-                  }
-
-                  /* So this check must pass for the 'return' below to happen.
-                   */
-                  if (crc == png_sRGB_checks[i].crc)
-#              endif
-               {
-                  if (png_sRGB_checks[i].is_broken != 0)
-                  {
-                     /* These profiles are known to have bad data that may cause
-                      * problems if they are used, therefore attempt to
-                      * discourage their use, skip the 'have_md5' warning below,
-                      * which is made irrelevant by this error.
-                      */
-                     png_chunk_report(png_ptr, "known incorrect sRGB profile",
-                         PNG_CHUNK_ERROR);
-                  }
-
-                  /* Warn that this being done; this isn't even an error since
-                   * the profile is perfectly valid, but it would be nice if
-                   * people used the up-to-date ones.
-                   */
-                  else if (png_sRGB_checks[i].have_md5 == 0)
-                  {
-                     png_chunk_report(png_ptr,
-                         "out-of-date sRGB profile with no signature",
-                         PNG_CHUNK_WARNING);
-                  }
-
-                  return 1+png_sRGB_checks[i].is_broken;
-               }
-            }
-
-# if PNG_sRGB_PROFILE_CHECKS > 0
-         /* The signature matched, but the profile had been changed in some
-          * way.  This probably indicates a data error or uninformed hacking.
-          * Fall through to "no match".
-          */
-         png_chunk_report(png_ptr,
-             "Not recognizing known sRGB profile that has been edited",
-             PNG_CHUNK_WARNING);
-         break;
-# endif
-         }
-      }
-   }
-
-   return 0; /* no match */
-}
-
-void /* PRIVATE */
-png_icc_set_sRGB(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_const_bytep profile, uLong adler)
-{
-   /* Is this profile one of the known ICC sRGB profiles?  If it is, just set
-    * the sRGB information.
-    */
-   if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
-      (void)png_colorspace_set_sRGB(png_ptr, colorspace,
-         (int)/*already checked*/png_get_uint_32(profile+64));
-}
-#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */
-#endif /* sRGB */
-
-int /* PRIVATE */
-png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
-    png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
-    int color_type)
-{
-   if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
-      return 0;
-
-   if (icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
-       png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
-           color_type) != 0 &&
-       png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
-           profile) != 0)
-   {
-#     if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
-         /* If no sRGB support, don't try storing sRGB information */
-         png_icc_set_sRGB(png_ptr, colorspace, profile, 0);
-#     endif
-      return 1;
-   }
-
-   /* Failure case */
-   return 0;
-}
-#endif /* iCCP */
+#endif /* READ_iCCP */
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-void /* PRIVATE */
-png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
+#if (defined PNG_READ_mDCV_SUPPORTED) || (defined PNG_READ_cHRM_SUPPORTED)
+static int
+have_chromaticities(png_const_structrp png_ptr)
 {
-   /* Set the rgb_to_gray coefficients from the colorspace. */
-   if (png_ptr->rgb_to_gray_coefficients_set == 0 &&
-      (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+   /* Handle new PNGv3 chunks and the precedence rules to determine whether
+    * png_struct::chromaticities must be processed.  Only required for RGB to
+    * gray.
+    *
+    * mDCV: this is the mastering colour space and it is independent of the
+    *       encoding so it needs to be used regardless of the encoded space.
+    *
+    * cICP: first in priority but not yet implemented - the chromaticities come
+    *       from the 'primaries'.
+    *
+    * iCCP: not supported by libpng (so ignored)
+    *
+    * sRGB: the defaults match sRGB
+    *
+    * cHRM: calculate the coefficients
+    */
+#  ifdef PNG_READ_mDCV_SUPPORTED
+      if (png_has_chunk(png_ptr, mDCV))
+         return 1;
+#     define check_chromaticities 1
+#  endif /*mDCV*/
+
+#  ifdef PNG_READ_sRGB_SUPPORTED
+      if (png_has_chunk(png_ptr, sRGB))
+         return 0;
+#  endif /*sRGB*/
+
+#  ifdef PNG_READ_cHRM_SUPPORTED
+      if (png_has_chunk(png_ptr, cHRM))
+         return 1;
+#     define check_chromaticities 1
+#  endif /*cHRM*/
+
+   return 0; /* sRGB defaults */
+}
+#endif /* READ_mDCV || READ_cHRM */
+
+void /* PRIVATE */
+png_set_rgb_coefficients(png_structrp png_ptr)
+{
+   /* Set the rgb_to_gray coefficients from the colorspace if available.  Note
+    * that '_set' means that png_rgb_to_gray was called **and** it successfully
+    * set up the coefficients.
+    */
+   if (png_ptr->rgb_to_gray_coefficients_set == 0)
    {
-      /* png_set_background has not been called, get the coefficients from the Y
-       * values of the colorspace colorants.
-       */
-      png_fixed_point r = png_ptr->colorspace.end_points_XYZ.red_Y;
-      png_fixed_point g = png_ptr->colorspace.end_points_XYZ.green_Y;
-      png_fixed_point b = png_ptr->colorspace.end_points_XYZ.blue_Y;
-      png_fixed_point total = r+g+b;
+#  if check_chromaticities
+      png_XYZ xyz;
 
-      if (total > 0 &&
-         r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
-         g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
-         b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
-         r+g+b <= 32769)
+      if (have_chromaticities(png_ptr) &&
+          png_XYZ_from_xy(&xyz, &png_ptr->chromaticities) == 0)
       {
-         /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
-          * all of the coefficients were rounded up.  Handle this by
-          * reducing the *largest* coefficient by 1; this matches the
-          * approach used for the default coefficients in pngrtran.c
+         /* png_set_rgb_to_gray has not set the coefficients, get them from the
+          * Y * values of the colorspace colorants.
           */
-         int add = 0;
+         png_fixed_point r = xyz.red_Y;
+         png_fixed_point g = xyz.green_Y;
+         png_fixed_point b = xyz.blue_Y;
+         png_fixed_point total = r+g+b;
 
-         if (r+g+b > 32768)
-            add = -1;
-         else if (r+g+b < 32768)
-            add = 1;
-
-         if (add != 0)
+         if (total > 0 &&
+            r >= 0 && png_muldiv(&r, r, 32768, total) && r >= 0 && r <= 32768 &&
+            g >= 0 && png_muldiv(&g, g, 32768, total) && g >= 0 && g <= 32768 &&
+            b >= 0 && png_muldiv(&b, b, 32768, total) && b >= 0 && b <= 32768 &&
+            r+g+b <= 32769)
          {
-            if (g >= r && g >= b)
-               g += add;
-            else if (r >= g && r >= b)
-               r += add;
+            /* We allow 0 coefficients here.  r+g+b may be 32769 if two or
+             * all of the coefficients were rounded up.  Handle this by
+             * reducing the *largest* coefficient by 1; this matches the
+             * approach used for the default coefficients in pngrtran.c
+             */
+            int add = 0;
+
+            if (r+g+b > 32768)
+               add = -1;
+            else if (r+g+b < 32768)
+               add = 1;
+
+            if (add != 0)
+            {
+               if (g >= r && g >= b)
+                  g += add;
+               else if (r >= g && r >= b)
+                  r += add;
+               else
+                  b += add;
+            }
+
+            /* Check for an internal error. */
+            if (r+g+b != 32768)
+               png_error(png_ptr,
+                   "internal error handling cHRM coefficients");
+
             else
-               b += add;
-         }
-
-         /* Check for an internal error. */
-         if (r+g+b != 32768)
-            png_error(png_ptr,
-                "internal error handling cHRM coefficients");
-
-         else
-         {
-            png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
-            png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
+            {
+               png_ptr->rgb_to_gray_red_coeff   = (png_uint_16)r;
+               png_ptr->rgb_to_gray_green_coeff = (png_uint_16)g;
+            }
          }
       }
-
-      /* This is a png_error at present even though it could be ignored -
-       * it should never happen, but it is important that if it does, the
-       * bug is fixed.
-       */
       else
-         png_error(png_ptr, "internal error handling cHRM->XYZ");
+#  endif /* check_chromaticities */
+      {
+         /* Use the historical REC 709 (etc) values: */
+         png_ptr->rgb_to_gray_red_coeff   = 6968;
+         png_ptr->rgb_to_gray_green_coeff = 23434;
+         /* png_ptr->rgb_to_gray_blue_coeff  = 2366; */
+      }
    }
 }
 #endif /* READ_RGB_TO_GRAY */
 
-#endif /* COLORSPACE */
-
 void /* PRIVATE */
 png_check_IHDR(png_const_structrp png_ptr,
     png_uint_32 width, png_uint_32 height, int bit_depth,
@@ -3390,7 +2735,27 @@ png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
 }
 #endif
 
-#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
+   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
+   (defined(PNG_cLLI_SUPPORTED) || defined(PNG_mDCV_SUPPORTED))
+png_uint_32
+png_fixed_ITU(png_const_structrp png_ptr, double fp, png_const_charp text)
+{
+   double r = floor(10000 * fp + .5);
+
+   if (r > 2147483647. || r < 0)
+      png_fixed_error(png_ptr, text);
+
+#  ifndef PNG_ERROR_TEXT_SUPPORTED
+   PNG_UNUSED(text)
+#  endif
+
+   return (png_uint_32)r;
+}
+#endif
+
+
+#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\
     defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
 /* muldiv functions */
 /* This API takes signed arguments and rounds the result to the nearest
@@ -3398,7 +2763,7 @@ png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text)
  * the nearest .00001).  Overflow and divide by zero are signalled in
  * the result, a boolean - true on success, false on overflow.
  */
-int
+int /* PRIVATE */
 png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
     png_int_32 divisor)
 {
@@ -3512,27 +2877,7 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
 
    return 0;
 }
-#endif /* READ_GAMMA || INCH_CONVERSIONS */
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* The following is for when the caller doesn't much care about the
- * result.
- */
-png_fixed_point
-png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,
-    png_int_32 divisor)
-{
-   png_fixed_point result;
-
-   if (png_muldiv(&result, a, times, divisor) != 0)
-      return result;
-
-   png_warning(png_ptr, "fixed point overflow ignored");
-   return 0;
-}
-#endif
-
-#ifdef PNG_GAMMA_SUPPORTED /* more fixed point functions for gamma */
 /* Calculate a reciprocal, return 0 on div-by-zero or overflow. */
 png_fixed_point
 png_reciprocal(png_fixed_point a)
@@ -3551,26 +2896,38 @@ png_reciprocal(png_fixed_point a)
 
    return 0; /* error/overflow */
 }
+#endif /* READ_GAMMA || COLORSPACE || INCH_CONVERSIONS || READ_pHYS */
 
+#ifdef PNG_READ_GAMMA_SUPPORTED
 /* This is the shared test on whether a gamma value is 'significant' - whether
  * it is worth doing gamma correction.
  */
 int /* PRIVATE */
 png_gamma_significant(png_fixed_point gamma_val)
 {
+   /* sRGB:       1/2.2 == 0.4545(45)
+    * AdobeRGB:   1/(2+51/256) ~= 0.45471 5dp
+    *
+    * So the correction from AdobeRGB to sRGB (output) is:
+    *
+    *    2.2/(2+51/256) == 1.00035524
+    *
+    * I.e. vanishly small (<4E-4) but still detectable in 16-bit linear (+/-
+    * 23).  Note that the Adobe choice seems to be something intended to give an
+    * exact number with 8 binary fractional digits - it is the closest to 2.2
+    * that is possible a base 2 .8p representation.
+    */
    return gamma_val < PNG_FP_1 - PNG_GAMMA_THRESHOLD_FIXED ||
        gamma_val > PNG_FP_1 + PNG_GAMMA_THRESHOLD_FIXED;
 }
-#endif
 
-#ifdef PNG_READ_GAMMA_SUPPORTED
-#ifdef PNG_16BIT_SUPPORTED
+#ifndef PNG_FLOATING_ARITHMETIC_SUPPORTED
 /* A local convenience routine. */
 static png_fixed_point
 png_product2(png_fixed_point a, png_fixed_point b)
 {
-   /* The required result is 1/a * 1/b; the following preserves accuracy. */
-#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
+   /* The required result is a * b; the following preserves accuracy. */
+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED /* Should now be unused */
    double r = a * 1E-5;
    r *= b;
    r = floor(r+.5);
@@ -3586,9 +2943,8 @@ png_product2(png_fixed_point a, png_fixed_point b)
 
    return 0; /* overflow */
 }
-#endif /* 16BIT */
+#endif /* FLOATING_ARITHMETIC */
 
-/* The inverse of the above. */
 png_fixed_point
 png_reciprocal2(png_fixed_point a, png_fixed_point b)
 {
@@ -4241,10 +3597,27 @@ png_destroy_gamma_table(png_structrp png_ptr)
  * tables, we don't make a full table if we are reducing to 8-bit in
  * the future.  Note also how the gamma_16 tables are segmented so that
  * we don't need to allocate > 64K chunks for a full 16-bit table.
+ *
+ * TODO: move this to pngrtran.c and make it static.  Better yet create
+ * pngcolor.c and put all the PNG_COLORSPACE stuff in there.
  */
+#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
+   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#  define GAMMA_TRANSFORMS 1 /* #ifdef CSE */
+#else
+#  define GAMMA_TRANSFORMS 0
+#endif
+
 void /* PRIVATE */
 png_build_gamma_table(png_structrp png_ptr, int bit_depth)
 {
+   png_fixed_point file_gamma, screen_gamma;
+   png_fixed_point correction;
+#  if GAMMA_TRANSFORMS
+      png_fixed_point file_to_linear, linear_to_screen;
+#  endif
+
    png_debug(1, "in png_build_gamma_table");
 
    /* Remove any existing table; this copes with multiple calls to
@@ -4259,27 +3632,44 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
       png_destroy_gamma_table(png_ptr);
    }
 
+   /* The following fields are set, finally, in png_init_read_transformations.
+    * If file_gamma is 0 (unset) nothing can be done otherwise if screen_gamma
+    * is 0 (unset) there is no gamma correction but to/from linear is possible.
+    */
+   file_gamma = png_ptr->file_gamma;
+   screen_gamma = png_ptr->screen_gamma;
+#  if GAMMA_TRANSFORMS
+      file_to_linear = png_reciprocal(file_gamma);
+#  endif
+
+   if (screen_gamma > 0)
+   {
+#     if GAMMA_TRANSFORMS
+         linear_to_screen = png_reciprocal(screen_gamma);
+#     endif
+      correction = png_reciprocal2(screen_gamma, file_gamma);
+   }
+   else /* screen gamma unknown */
+   {
+#     if GAMMA_TRANSFORMS
+         linear_to_screen = file_gamma;
+#     endif
+      correction = PNG_FP_1;
+   }
+
    if (bit_depth <= 8)
    {
-      png_build_8bit_table(png_ptr, &png_ptr->gamma_table,
-          png_ptr->screen_gamma > 0 ?
-          png_reciprocal2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
+      png_build_8bit_table(png_ptr, &png_ptr->gamma_table, correction);
 
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#if GAMMA_TRANSFORMS
       if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
       {
-         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
-             png_reciprocal(png_ptr->colorspace.gamma));
+         png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1, file_to_linear);
 
          png_build_8bit_table(png_ptr, &png_ptr->gamma_from_1,
-             png_ptr->screen_gamma > 0 ?
-             png_reciprocal(png_ptr->screen_gamma) :
-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
+            linear_to_screen);
       }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
+#endif /* GAMMA_TRANSFORMS */
    }
 #ifdef PNG_16BIT_SUPPORTED
    else
@@ -4345,32 +3735,26 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
        * reduced to 8 bits.
        */
       if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
-          png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
-          png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
-
+         png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
+            png_reciprocal(correction));
       else
-          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
-          png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma,
-          png_ptr->screen_gamma) : PNG_FP_1);
+         png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift,
+            correction);
 
-#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
-   defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
-   defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+#  if GAMMA_TRANSFORMS
       if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
       {
          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
-             png_reciprocal(png_ptr->colorspace.gamma));
+            file_to_linear);
 
          /* Notice that the '16 from 1' table should be full precision, however
           * the lookup on this table still uses gamma_shift, so it can't be.
           * TODO: fix this.
           */
          png_build_16bit_table(png_ptr, &png_ptr->gamma_16_from_1, shift,
-             png_ptr->screen_gamma > 0 ? png_reciprocal(png_ptr->screen_gamma) :
-             png_ptr->colorspace.gamma/* Probably doing rgb_to_gray */);
+            linear_to_screen);
       }
-#endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
+#endif /* GAMMA_TRANSFORMS */
    }
 #endif /* 16BIT */
 }
diff --git a/engine/thirdparty/libpng/png.h b/engine/thirdparty/libpng/png.h
index d25fbe9e..9b069e4e 100644
--- a/engine/thirdparty/libpng/png.h
+++ b/engine/thirdparty/libpng/png.h
@@ -1,6 +1,6 @@
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.45
+ * libpng version 1.6.47
  *
  * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -14,7 +14,7 @@
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
  *   libpng versions 0.97, January 1998, through 1.6.35, July 2018:
  *     Glenn Randers-Pehrson
- *   libpng versions 1.6.36, December 2018, through 1.6.45, January 2025:
+ *   libpng versions 1.6.36, December 2018, through 1.6.47, February 2025:
  *     Cosmin Truta
  *   See also "Contributing Authors", below.
  */
@@ -238,7 +238,7 @@
  *    ...
  *    1.5.30                  15    10530  15.so.15.30[.0]
  *    ...
- *    1.6.45                  16    10645  16.so.16.45[.0]
+ *    1.6.47                  16    10647  16.so.16.47[.0]
  *
  *    Henceforth the source version will match the shared-library major and
  *    minor numbers; the shared-library major version number will be used for
@@ -274,7 +274,7 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.45"
+#define PNG_LIBPNG_VER_STRING "1.6.47"
 #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
 
 /* The versions of shared library builds should stay in sync, going forward */
@@ -285,7 +285,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 45
+#define PNG_LIBPNG_VER_RELEASE 47
 
 /* This should be zero for a public release, or non-zero for a
  * development version.
@@ -316,7 +316,7 @@
  * From version 1.0.1 it is:
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
  */
-#define PNG_LIBPNG_VER 10645 /* 1.6.45 */
+#define PNG_LIBPNG_VER 10647 /* 1.6.47 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -426,7 +426,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_45;
+typedef char* png_libpng_version_1_6_47;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -744,7 +744,21 @@ typedef png_unknown_chunk * * png_unknown_chunkpp;
 #define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */
 #define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
 #define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
-#define PNG_INFO_cICP 0x20000U
+#define PNG_INFO_cICP 0x20000U /* PNGv3: 1.6.45 */
+#define PNG_INFO_cLLI 0x40000U /* PNGv3: 1.6.45 */
+#define PNG_INFO_mDCV 0x80000U /* PNGv3: 1.6.45 */
+/* APNG: these chunks are stored as unknown, these flags are never set
+ * however they are provided as a convenience for implementors of APNG and
+ * avoids any merge conflicts.
+ *
+ * Private chunks: these chunk names violate the chunk name recommendations
+ * because the chunk definitions have no signature and because the private
+ * chunks with these names have been reserved.  Private definitions should
+ * avoid them.
+ */
+#define PNG_INFO_acTL 0x100000U /* PNGv3: 1.6.45: unknown */
+#define PNG_INFO_fcTL 0x200000U /* PNGv3: 1.6.45: unknown */
+#define PNG_INFO_fdAT 0x400000U /* PNGv3: 1.6.45: unknown */
 
 /* This is used for the transformation routines, as some of them
  * change these values for the row.  It also should enable using
@@ -1976,15 +1990,44 @@ PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr,
 
 #ifdef PNG_cICP_SUPPORTED
 PNG_EXPORT(250, png_uint_32, png_get_cICP, (png_const_structrp png_ptr,
-    png_inforp info_ptr, png_bytep colour_primaries,
+    png_const_inforp info_ptr, png_bytep colour_primaries,
     png_bytep transfer_function, png_bytep matrix_coefficients,
     png_bytep video_full_range_flag));
+#endif
+
+#ifdef PNG_cICP_SUPPORTED
 PNG_EXPORT(251, void, png_set_cICP, (png_const_structrp png_ptr,
     png_inforp info_ptr, png_byte colour_primaries,
     png_byte transfer_function, png_byte matrix_coefficients,
     png_byte video_full_range_flag));
 #endif
 
+#ifdef PNG_cLLI_SUPPORTED
+PNG_FP_EXPORT(252, png_uint_32, png_get_cLLI, (png_const_structrp png_ptr,
+         png_const_inforp info_ptr, double *maximum_content_light_level,
+         double *maximum_frame_average_light_level))
+PNG_FIXED_EXPORT(253, png_uint_32, png_get_cLLI_fixed,
+    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
+     * 100,000 as in the case of png_fixed_point.
+     */
+    png_uint_32p maximum_content_light_level_scaled_by_10000,
+    png_uint_32p maximum_frame_average_light_level_scaled_by_10000))
+#endif
+
+#ifdef PNG_cLLI_SUPPORTED
+PNG_FP_EXPORT(254, void, png_set_cLLI, (png_const_structrp png_ptr,
+         png_inforp info_ptr, double maximum_content_light_level,
+         double maximum_frame_average_light_level))
+PNG_FIXED_EXPORT(255, void, png_set_cLLI_fixed, (png_const_structrp png_ptr,
+    png_inforp info_ptr,
+    /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
+     * 100,000 as in the case of png_fixed_point.
+     */
+    png_uint_32 maximum_content_light_level_scaled_by_10000,
+    png_uint_32 maximum_frame_average_light_level_scaled_by_10000))
+#endif
+
 #ifdef PNG_eXIf_SUPPORTED
 PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,
     png_inforp info_ptr, png_bytep *exif));
@@ -2029,6 +2072,60 @@ PNG_EXPORT(144, void, png_set_IHDR, (png_const_structrp png_ptr,
     int color_type, int interlace_method, int compression_method,
     int filter_method));
 
+#ifdef PNG_mDCV_SUPPORTED
+PNG_FP_EXPORT(256, png_uint_32, png_get_mDCV, (png_const_structrp png_ptr,
+    png_const_inforp info_ptr,
+    /* The chromaticities of the mastering display.  As cHRM, but independent of
+     * the encoding endpoints in cHRM, or cICP, or iCCP.  These values will
+     * always be in the range 0 to 1.3107.
+     */
+    double *white_x, double *white_y, double *red_x, double *red_y,
+    double *green_x, double *green_y, double *blue_x, double *blue_y,
+    /* Mastering display luminance in cd/m2 (nits). */
+    double *mastering_display_maximum_luminance,
+    double *mastering_display_minimum_luminance))
+
+PNG_FIXED_EXPORT(257, png_uint_32, png_get_mDCV_fixed,
+    (png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_fixed_point *int_white_x, png_fixed_point *int_white_y,
+    png_fixed_point *int_red_x, png_fixed_point *int_red_y,
+    png_fixed_point *int_green_x, png_fixed_point *int_green_y,
+    png_fixed_point *int_blue_x, png_fixed_point *int_blue_y,
+    /* Mastering display luminance in cd/m2 (nits) multiplied (scaled) by
+     * 10,000.
+     */
+    png_uint_32p mastering_display_maximum_luminance_scaled_by_10000,
+    png_uint_32p mastering_display_minimum_luminance_scaled_by_10000))
+#endif
+
+#ifdef PNG_mDCV_SUPPORTED
+PNG_FP_EXPORT(258, void, png_set_mDCV, (png_const_structrp png_ptr,
+    png_inforp info_ptr,
+    /* The chromaticities of the mastering display.  As cHRM, but independent of
+     * the encoding endpoints in cHRM, or cICP, or iCCP.
+     */
+    double white_x, double white_y, double red_x, double red_y, double green_x,
+    double green_y, double blue_x, double blue_y,
+    /* Mastering display luminance in cd/m2 (nits). */
+    double mastering_display_maximum_luminance,
+    double mastering_display_minimum_luminance))
+
+PNG_FIXED_EXPORT(259, void, png_set_mDCV_fixed, (png_const_structrp png_ptr,
+    png_inforp info_ptr,
+    /* The admissible range of these values is not the full range of a PNG
+     * fixed point value.  Negative values cannot be encoded and the maximum
+     * value is about 1.3 */
+    png_fixed_point int_white_x, png_fixed_point int_white_y,
+    png_fixed_point int_red_x, png_fixed_point int_red_y,
+    png_fixed_point int_green_x, png_fixed_point int_green_y,
+    png_fixed_point int_blue_x, png_fixed_point int_blue_y,
+    /* These are PNG unsigned 4 byte values: 31-bit unsigned values.  The MSB
+     * must be zero.
+     */
+    png_uint_32 mastering_display_maximum_luminance_scaled_by_10000,
+    png_uint_32 mastering_display_minimum_luminance_scaled_by_10000))
+#endif
+
 #ifdef PNG_oFFs_SUPPORTED
 PNG_EXPORT(145, png_uint_32, png_get_oFFs, (png_const_structrp png_ptr,
    png_const_inforp info_ptr, png_int_32 *offset_x, png_int_32 *offset_y,
@@ -3249,7 +3346,7 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
  * one to use is one more than this.)
  */
 #ifdef PNG_EXPORT_LAST_ORDINAL
-  PNG_EXPORT_LAST_ORDINAL(251);
+  PNG_EXPORT_LAST_ORDINAL(259);
 #endif
 
 #ifdef __cplusplus
diff --git a/engine/thirdparty/libpng/pngconf.h b/engine/thirdparty/libpng/pngconf.h
index 11a40b8d..42fa973c 100644
--- a/engine/thirdparty/libpng/pngconf.h
+++ b/engine/thirdparty/libpng/pngconf.h
@@ -1,6 +1,6 @@
 /* pngconf.h - machine-configurable file for libpng
  *
- * libpng version 1.6.45
+ * libpng version 1.6.47
  *
  * Copyright (c) 2018-2025 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
diff --git a/engine/thirdparty/libpng/pngerror.c b/engine/thirdparty/libpng/pngerror.c
index aa0ae58e..275b188d 100644
--- a/engine/thirdparty/libpng/pngerror.c
+++ b/engine/thirdparty/libpng/pngerror.c
@@ -935,23 +935,37 @@ png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
 int /* PRIVATE */
 png_safe_execute(png_imagep image, int (*function)(png_voidp), png_voidp arg)
 {
-   png_voidp saved_error_buf = image->opaque->error_buf;
+   const png_voidp saved_error_buf = image->opaque->error_buf;
    jmp_buf safe_jmpbuf;
-   int result;
 
    /* Safely execute function(arg), with png_error returning back here. */
    if (setjmp(safe_jmpbuf) == 0)
    {
+      int result;
+
       image->opaque->error_buf = safe_jmpbuf;
       result = function(arg);
       image->opaque->error_buf = saved_error_buf;
-      return result;
+
+      if (result)
+         return 1; /* success */
    }
 
-   /* On png_error, return via longjmp, pop the jmpbuf, and free the image. */
+   /* The function failed either because of a caught png_error and a regular
+    * return of false above or because of an uncaught png_error from the
+    * function itself.  Ensure that the error_buf is always set back to the
+    * value saved above:
+    */
    image->opaque->error_buf = saved_error_buf;
-   png_image_free(image);
-   return 0;
+
+   /* On the final false return, when about to return control to the caller, the
+    * image is freed (png_image_free does this check but it is duplicated here
+    * for clarity:
+    */
+   if (saved_error_buf == NULL)
+      png_image_free(image);
+
+   return 0; /* failure */
 }
 #endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
 #endif /* READ || WRITE */
diff --git a/engine/thirdparty/libpng/pngget.c b/engine/thirdparty/libpng/pngget.c
index 9be88143..3623c5c7 100644
--- a/engine/thirdparty/libpng/pngget.c
+++ b/engine/thirdparty/libpng/pngget.c
@@ -380,7 +380,13 @@ png_fixed_inches_from_microns(png_const_structrp png_ptr, png_int_32 microns)
     * Notice that this can overflow - a warning is output and 0 is
     * returned.
     */
-   return png_muldiv_warn(png_ptr, microns, 500, 127);
+   png_fixed_point result;
+
+   if (png_muldiv(&result, microns, 500, 127) != 0)
+      return result;
+
+   png_warning(png_ptr, "fixed point overflow ignored");
+   return 0;
 }
 
 png_fixed_point PNGAPI
@@ -390,7 +396,7 @@ png_get_x_offset_inches_fixed(png_const_structrp png_ptr,
    return png_fixed_inches_from_microns(png_ptr,
        png_get_x_offset_microns(png_ptr, info_ptr));
 }
-#endif
+#endif /* FIXED_POINT */
 
 #ifdef PNG_FIXED_POINT_SUPPORTED
 png_fixed_point PNGAPI
@@ -518,44 +524,31 @@ png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
 png_uint_32 PNGAPI
 png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    double *white_x, double *white_y, double *red_x, double *red_y,
-    double *green_x, double *green_y, double *blue_x, double *blue_y)
+    double *whitex, double *whitey, double *redx, double *redy,
+    double *greenx, double *greeny, double *bluex, double *bluey)
 {
    png_debug1(1, "in %s retrieval function", "cHRM");
 
-   /* Quiet API change: this code used to only return the end points if a cHRM
-    * chunk was present, but the end points can also come from iCCP or sRGB
-    * chunks, so in 1.6.0 the png_get_ APIs return the end points regardless and
-    * the png_set_ APIs merely check that set end points are mutually
-    * consistent.
-    */
+   /* PNGv3: this just returns the values store from the cHRM, if any. */
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0)
    {
-      if (white_x != NULL)
-         *white_x = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.whitex, "cHRM white X");
-      if (white_y != NULL)
-         *white_y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.whitey, "cHRM white Y");
-      if (red_x != NULL)
-         *red_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redx,
-             "cHRM red X");
-      if (red_y != NULL)
-         *red_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.redy,
-             "cHRM red Y");
-      if (green_x != NULL)
-         *green_x = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.greenx, "cHRM green X");
-      if (green_y != NULL)
-         *green_y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_xy.greeny, "cHRM green Y");
-      if (blue_x != NULL)
-         *blue_x = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluex,
-             "cHRM blue X");
-      if (blue_y != NULL)
-         *blue_y = png_float(png_ptr, info_ptr->colorspace.end_points_xy.bluey,
-             "cHRM blue Y");
+      if (whitex != NULL)
+         *whitex = png_float(png_ptr, info_ptr->cHRM.whitex, "cHRM wx");
+      if (whitey != NULL)
+         *whitey = png_float(png_ptr, info_ptr->cHRM.whitey, "cHRM wy");
+      if (redx   != NULL)
+         *redx   = png_float(png_ptr, info_ptr->cHRM.redx,   "cHRM rx");
+      if (redy   != NULL)
+         *redy   = png_float(png_ptr, info_ptr->cHRM.redy,   "cHRM ry");
+      if (greenx != NULL)
+         *greenx = png_float(png_ptr, info_ptr->cHRM.greenx, "cHRM gx");
+      if (greeny != NULL)
+         *greeny = png_float(png_ptr, info_ptr->cHRM.greeny, "cHRM gy");
+      if (bluex  != NULL)
+         *bluex  = png_float(png_ptr, info_ptr->cHRM.bluex,  "cHRM bx");
+      if (bluey  != NULL)
+         *bluey  = png_float(png_ptr, info_ptr->cHRM.bluey,  "cHRM by");
       return PNG_INFO_cHRM;
    }
 
@@ -568,38 +561,31 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
     double *green_Y, double *green_Z, double *blue_X, double *blue_Y,
     double *blue_Z)
 {
+   png_XYZ XYZ;
    png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
 
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0 &&
+       png_XYZ_from_xy(&XYZ, &info_ptr->cHRM) == 0)
    {
       if (red_X != NULL)
-         *red_X = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_X,
-             "cHRM red X");
+         *red_X = png_float(png_ptr, XYZ.red_X, "cHRM red X");
       if (red_Y != NULL)
-         *red_Y = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Y,
-             "cHRM red Y");
+         *red_Y = png_float(png_ptr, XYZ.red_Y, "cHRM red Y");
       if (red_Z != NULL)
-         *red_Z = png_float(png_ptr, info_ptr->colorspace.end_points_XYZ.red_Z,
-             "cHRM red Z");
+         *red_Z = png_float(png_ptr, XYZ.red_Z, "cHRM red Z");
       if (green_X != NULL)
-         *green_X = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_X, "cHRM green X");
+         *green_X = png_float(png_ptr, XYZ.green_X, "cHRM green X");
       if (green_Y != NULL)
-         *green_Y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_Y, "cHRM green Y");
+         *green_Y = png_float(png_ptr, XYZ.green_Y, "cHRM green Y");
       if (green_Z != NULL)
-         *green_Z = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.green_Z, "cHRM green Z");
+         *green_Z = png_float(png_ptr, XYZ.green_Z, "cHRM green Z");
       if (blue_X != NULL)
-         *blue_X = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_X, "cHRM blue X");
+         *blue_X = png_float(png_ptr, XYZ.blue_X, "cHRM blue X");
       if (blue_Y != NULL)
-         *blue_Y = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_Y, "cHRM blue Y");
+         *blue_Y = png_float(png_ptr, XYZ.blue_Y, "cHRM blue Y");
       if (blue_Z != NULL)
-         *blue_Z = png_float(png_ptr,
-             info_ptr->colorspace.end_points_XYZ.blue_Z, "cHRM blue Z");
+         *blue_Z = png_float(png_ptr, XYZ.blue_Z, "cHRM blue Z");
       return PNG_INFO_cHRM;
    }
 
@@ -616,29 +602,22 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
     png_fixed_point *int_blue_X, png_fixed_point *int_blue_Y,
     png_fixed_point *int_blue_Z)
 {
+   png_XYZ XYZ;
    png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
 
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0U &&
+       png_XYZ_from_xy(&XYZ, &info_ptr->cHRM) == 0)
    {
-      if (int_red_X != NULL)
-         *int_red_X = info_ptr->colorspace.end_points_XYZ.red_X;
-      if (int_red_Y != NULL)
-         *int_red_Y = info_ptr->colorspace.end_points_XYZ.red_Y;
-      if (int_red_Z != NULL)
-         *int_red_Z = info_ptr->colorspace.end_points_XYZ.red_Z;
-      if (int_green_X != NULL)
-         *int_green_X = info_ptr->colorspace.end_points_XYZ.green_X;
-      if (int_green_Y != NULL)
-         *int_green_Y = info_ptr->colorspace.end_points_XYZ.green_Y;
-      if (int_green_Z != NULL)
-         *int_green_Z = info_ptr->colorspace.end_points_XYZ.green_Z;
-      if (int_blue_X != NULL)
-         *int_blue_X = info_ptr->colorspace.end_points_XYZ.blue_X;
-      if (int_blue_Y != NULL)
-         *int_blue_Y = info_ptr->colorspace.end_points_XYZ.blue_Y;
-      if (int_blue_Z != NULL)
-         *int_blue_Z = info_ptr->colorspace.end_points_XYZ.blue_Z;
+      if (int_red_X != NULL) *int_red_X = XYZ.red_X;
+      if (int_red_Y != NULL) *int_red_Y = XYZ.red_Y;
+      if (int_red_Z != NULL) *int_red_Z = XYZ.red_Z;
+      if (int_green_X != NULL) *int_green_X = XYZ.green_X;
+      if (int_green_Y != NULL) *int_green_Y = XYZ.green_Y;
+      if (int_green_Z != NULL) *int_green_Z = XYZ.green_Z;
+      if (int_blue_X != NULL) *int_blue_X = XYZ.blue_X;
+      if (int_blue_Y != NULL) *int_blue_Y = XYZ.blue_Y;
+      if (int_blue_Z != NULL) *int_blue_Z = XYZ.blue_Z;
       return PNG_INFO_cHRM;
    }
 
@@ -647,31 +626,24 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
 
 png_uint_32 PNGAPI
 png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
-    png_fixed_point *white_x, png_fixed_point *white_y, png_fixed_point *red_x,
-    png_fixed_point *red_y, png_fixed_point *green_x, png_fixed_point *green_y,
-    png_fixed_point *blue_x, png_fixed_point *blue_y)
+    png_fixed_point *whitex, png_fixed_point *whitey, png_fixed_point *redx,
+    png_fixed_point *redy, png_fixed_point *greenx, png_fixed_point *greeny,
+    png_fixed_point *bluex, png_fixed_point *bluey)
 {
    png_debug1(1, "in %s retrieval function", "cHRM");
 
+   /* PNGv3: this just returns the values store from the cHRM, if any. */
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
+       (info_ptr->valid & PNG_INFO_cHRM) != 0)
    {
-      if (white_x != NULL)
-         *white_x = info_ptr->colorspace.end_points_xy.whitex;
-      if (white_y != NULL)
-         *white_y = info_ptr->colorspace.end_points_xy.whitey;
-      if (red_x != NULL)
-         *red_x = info_ptr->colorspace.end_points_xy.redx;
-      if (red_y != NULL)
-         *red_y = info_ptr->colorspace.end_points_xy.redy;
-      if (green_x != NULL)
-         *green_x = info_ptr->colorspace.end_points_xy.greenx;
-      if (green_y != NULL)
-         *green_y = info_ptr->colorspace.end_points_xy.greeny;
-      if (blue_x != NULL)
-         *blue_x = info_ptr->colorspace.end_points_xy.bluex;
-      if (blue_y != NULL)
-         *blue_y = info_ptr->colorspace.end_points_xy.bluey;
+      if (whitex != NULL) *whitex = info_ptr->cHRM.whitex;
+      if (whitey != NULL) *whitey = info_ptr->cHRM.whitey;
+      if (redx   != NULL) *redx   = info_ptr->cHRM.redx;
+      if (redy   != NULL) *redy   = info_ptr->cHRM.redy;
+      if (greenx != NULL) *greenx = info_ptr->cHRM.greenx;
+      if (greeny != NULL) *greeny = info_ptr->cHRM.greeny;
+      if (bluex  != NULL) *bluex  = info_ptr->cHRM.bluex;
+      if (bluey  != NULL) *bluey  = info_ptr->cHRM.bluey;
       return PNG_INFO_cHRM;
    }
 
@@ -688,11 +660,11 @@ png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {
    png_debug1(1, "in %s retrieval function", "gAMA");
 
+   /* PNGv3 compatibility: only report gAMA if it is really present. */
    if (png_ptr != NULL && info_ptr != NULL &&
-       (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-       file_gamma != NULL)
+       (info_ptr->valid & PNG_INFO_gAMA) != 0)
    {
-      *file_gamma = info_ptr->colorspace.gamma;
+      if (file_gamma != NULL) *file_gamma = info_ptr->gamma;
       return PNG_INFO_gAMA;
    }
 
@@ -707,12 +679,13 @@ png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
 {
    png_debug1(1, "in %s retrieval function", "gAMA(float)");
 
+   /* PNGv3 compatibility: only report gAMA if it is really present. */
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
-      file_gamma != NULL)
+       (info_ptr->valid & PNG_INFO_gAMA) != 0)
    {
-      *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
-          "png_get_gAMA");
+      if (file_gamma != NULL)
+         *file_gamma = png_float(png_ptr, info_ptr->gamma, "gAMA");
+
       return PNG_INFO_gAMA;
    }
 
@@ -729,9 +702,10 @@ png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
    png_debug1(1, "in %s retrieval function", "sRGB");
 
    if (png_ptr != NULL && info_ptr != NULL &&
-      (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
+      (info_ptr->valid & PNG_INFO_sRGB) != 0)
    {
-      *file_srgb_intent = info_ptr->colorspace.rendering_intent;
+      if (file_srgb_intent != NULL)
+         *file_srgb_intent = info_ptr->rendering_intent;
       return PNG_INFO_sRGB;
    }
 
@@ -787,7 +761,7 @@ png_get_sPLT(png_const_structrp png_ptr, png_inforp info_ptr,
 #ifdef PNG_cICP_SUPPORTED
 png_uint_32 PNGAPI
 png_get_cICP(png_const_structrp png_ptr,
-             png_inforp info_ptr, png_bytep colour_primaries,
+             png_const_inforp info_ptr, png_bytep colour_primaries,
              png_bytep transfer_function, png_bytep matrix_coefficients,
              png_bytep video_full_range_flag)
 {
@@ -805,10 +779,115 @@ png_get_cICP(png_const_structrp png_ptr,
         return (PNG_INFO_cICP);
     }
 
-    return (0);
+    return 0;
 }
 #endif
 
+#ifdef PNG_cLLI_SUPPORTED
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cLLI_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_uint_32p maxCLL,
+    png_uint_32p maxFALL)
+{
+   png_debug1(1, "in %s retrieval function", "cLLI");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_cLLI) != 0)
+   {
+      if (maxCLL != NULL) *maxCLL = info_ptr->maxCLL;
+      if (maxFALL != NULL) *maxFALL = info_ptr->maxFALL;
+      return PNG_INFO_cLLI;
+   }
+
+   return 0;
+}
+#  endif
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_cLLI(png_const_structrp png_ptr, png_const_inforp info_ptr,
+      double *maxCLL, double *maxFALL)
+{
+   png_debug1(1, "in %s retrieval function", "cLLI(float)");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_cLLI) != 0)
+   {
+      if (maxCLL != NULL) *maxCLL = info_ptr->maxCLL * .0001;
+      if (maxFALL != NULL) *maxFALL = info_ptr->maxFALL * .0001;
+      return PNG_INFO_cLLI;
+   }
+
+   return 0;
+}
+#  endif
+#endif /* cLLI */
+
+#ifdef PNG_mDCV_SUPPORTED
+#  ifdef PNG_FIXED_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_mDCV_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
+    png_fixed_point *white_x, png_fixed_point *white_y,
+    png_fixed_point *red_x, png_fixed_point *red_y,
+    png_fixed_point *green_x, png_fixed_point *green_y,
+    png_fixed_point *blue_x, png_fixed_point *blue_y,
+    png_uint_32p mastering_maxDL, png_uint_32p mastering_minDL)
+{
+   png_debug1(1, "in %s retrieval function", "mDCV");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_mDCV) != 0)
+   {
+      if (white_x != NULL) *white_x = info_ptr->mastering_white_x * 2;
+      if (white_y != NULL) *white_y = info_ptr->mastering_white_y * 2;
+      if (red_x != NULL) *red_x = info_ptr->mastering_red_x * 2;
+      if (red_y != NULL) *red_y = info_ptr->mastering_red_y * 2;
+      if (green_x != NULL) *green_x = info_ptr->mastering_green_x * 2;
+      if (green_y != NULL) *green_y = info_ptr->mastering_green_y * 2;
+      if (blue_x != NULL) *blue_x = info_ptr->mastering_blue_x * 2;
+      if (blue_y != NULL) *blue_y = info_ptr->mastering_blue_y * 2;
+      if (mastering_maxDL != NULL) *mastering_maxDL = info_ptr->mastering_maxDL;
+      if (mastering_minDL != NULL) *mastering_minDL = info_ptr->mastering_minDL;
+      return PNG_INFO_mDCV;
+   }
+
+   return 0;
+}
+#  endif
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+png_uint_32 PNGAPI
+png_get_mDCV(png_const_structrp png_ptr, png_const_inforp info_ptr,
+    double *white_x, double *white_y, double *red_x, double *red_y,
+    double *green_x, double *green_y, double *blue_x, double *blue_y,
+    double *mastering_maxDL, double *mastering_minDL)
+{
+   png_debug1(1, "in %s retrieval function", "mDCV(float)");
+
+   if (png_ptr != NULL && info_ptr != NULL &&
+       (info_ptr->valid & PNG_INFO_mDCV) != 0)
+   {
+      if (white_x != NULL) *white_x = info_ptr->mastering_white_x * .00002;
+      if (white_y != NULL) *white_y = info_ptr->mastering_white_y * .00002;
+      if (red_x != NULL) *red_x = info_ptr->mastering_red_x * .00002;
+      if (red_y != NULL) *red_y = info_ptr->mastering_red_y * .00002;
+      if (green_x != NULL) *green_x = info_ptr->mastering_green_x * .00002;
+      if (green_y != NULL) *green_y = info_ptr->mastering_green_y * .00002;
+      if (blue_x != NULL) *blue_x = info_ptr->mastering_blue_x * .00002;
+      if (blue_y != NULL) *blue_y = info_ptr->mastering_blue_y * .00002;
+      if (mastering_maxDL != NULL)
+         *mastering_maxDL = info_ptr->mastering_maxDL * .0001;
+      if (mastering_minDL != NULL)
+         *mastering_minDL = info_ptr->mastering_minDL * .0001;
+      return PNG_INFO_mDCV;
+   }
+
+   return 0;
+}
+#  endif /* FLOATING_POINT */
+#endif /* mDCV */
+
 #ifdef PNG_eXIf_SUPPORTED
 png_uint_32 PNGAPI
 png_get_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
diff --git a/engine/thirdparty/libpng/pnginfo.h b/engine/thirdparty/libpng/pnginfo.h
index e85420c1..c2a907bc 100644
--- a/engine/thirdparty/libpng/pnginfo.h
+++ b/engine/thirdparty/libpng/pnginfo.h
@@ -86,20 +86,6 @@ struct png_info_def
     * and initialize the appropriate fields below.
     */
 
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-   /* png_colorspace only contains 'flags' if neither GAMMA or COLORSPACE are
-    * defined.  When COLORSPACE is switched on all the colorspace-defining
-    * chunks should be enabled, when GAMMA is switched on all the gamma-defining
-    * chunks should be enabled.  If this is not done it becomes possible to read
-    * inconsistent PNG files and assign a probably incorrect interpretation to
-    * the information.  (In other words, by carefully choosing which chunks to
-    * recognize the system configuration can select an interpretation for PNG
-    * files containing ambiguous data and this will result in inconsistent
-    * behavior between different libpng builds!)
-    */
-   png_colorspace colorspace;
-#endif
-
 #ifdef PNG_cICP_SUPPORTED
    /* cICP chunk data */
    png_byte cicp_colour_primaries;
@@ -115,6 +101,24 @@ struct png_info_def
    png_uint_32 iccp_proflen;  /* ICC profile data length */
 #endif
 
+#ifdef PNG_cLLI_SUPPORTED
+   png_uint_32 maxCLL;  /* cd/m2 (nits) * 10,000 */
+   png_uint_32 maxFALL;
+#endif
+
+#ifdef PNG_mDCV_SUPPORTED
+   png_uint_16 mastering_red_x;  /* CIE (xy) x * 50,000 */
+   png_uint_16 mastering_red_y;
+   png_uint_16 mastering_green_x;
+   png_uint_16 mastering_green_y;
+   png_uint_16 mastering_blue_x;
+   png_uint_16 mastering_blue_y;
+   png_uint_16 mastering_white_x;
+   png_uint_16 mastering_white_y;
+   png_uint_32 mastering_maxDL; /* cd/m2 (nits) * 10,000 */
+   png_uint_32 mastering_minDL;
+#endif
+
 #ifdef PNG_TEXT_SUPPORTED
    /* The tEXt, and zTXt chunks contain human-readable textual data in
     * uncompressed, compressed, and optionally compressed forms, respectively.
@@ -193,11 +197,8 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
 #endif
 
 #ifdef PNG_eXIf_SUPPORTED
-   int num_exif;  /* Added at libpng-1.6.31 */
+   png_uint_32 num_exif;  /* Added at libpng-1.6.31 */
    png_bytep exif;
-# ifdef PNG_READ_eXIf_SUPPORTED
-   png_bytep eXIf_buf;  /* Added at libpng-1.6.32 */
-# endif
 #endif
 
 #ifdef PNG_hIST_SUPPORTED
@@ -270,5 +271,16 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
    png_bytepp row_pointers;        /* the image bits */
 #endif
 
+#ifdef PNG_cHRM_SUPPORTED
+   png_xy cHRM;
+#endif
+
+#ifdef PNG_gAMA_SUPPORTED
+   png_fixed_point gamma;
+#endif
+
+#ifdef PNG_sRGB_SUPPORTED
+   int rendering_intent;
+#endif
 };
 #endif /* PNGINFO_H */
diff --git a/engine/thirdparty/libpng/pnglibconf.h b/engine/thirdparty/libpng/pnglibconf.h
index 695aae6f..748220bf 100644
--- a/engine/thirdparty/libpng/pnglibconf.h
+++ b/engine/thirdparty/libpng/pnglibconf.h
@@ -1,6 +1,6 @@
 /* pnglibconf.h - library build configuration */
 
-/* libpng version 1.6.45 */
+/* libpng version 1.6.47 */
 
 /* Copyright (c) 2018-2025 Cosmin Truta */
 /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
@@ -89,11 +89,13 @@
 #define PNG_READ_bKGD_SUPPORTED
 #define PNG_READ_cHRM_SUPPORTED
 #define PNG_READ_cICP_SUPPORTED
+#define PNG_READ_cLLI_SUPPORTED
 #define PNG_READ_eXIf_SUPPORTED
 #define PNG_READ_gAMA_SUPPORTED
 #define PNG_READ_hIST_SUPPORTED
 #define PNG_READ_iCCP_SUPPORTED
 #define PNG_READ_iTXt_SUPPORTED
+#define PNG_READ_mDCV_SUPPORTED
 #define PNG_READ_oFFs_SUPPORTED
 #define PNG_READ_pCAL_SUPPORTED
 #define PNG_READ_pHYs_SUPPORTED
@@ -160,11 +162,13 @@
 #define PNG_WRITE_bKGD_SUPPORTED
 #define PNG_WRITE_cHRM_SUPPORTED
 #define PNG_WRITE_cICP_SUPPORTED
+#define PNG_WRITE_cLLI_SUPPORTED
 #define PNG_WRITE_eXIf_SUPPORTED
 #define PNG_WRITE_gAMA_SUPPORTED
 #define PNG_WRITE_hIST_SUPPORTED
 #define PNG_WRITE_iCCP_SUPPORTED
 #define PNG_WRITE_iTXt_SUPPORTED
+#define PNG_WRITE_mDCV_SUPPORTED
 #define PNG_WRITE_oFFs_SUPPORTED
 #define PNG_WRITE_pCAL_SUPPORTED
 #define PNG_WRITE_pHYs_SUPPORTED
@@ -179,11 +183,13 @@
 #define PNG_bKGD_SUPPORTED
 #define PNG_cHRM_SUPPORTED
 #define PNG_cICP_SUPPORTED
+#define PNG_cLLI_SUPPORTED
 #define PNG_eXIf_SUPPORTED
 #define PNG_gAMA_SUPPORTED
 #define PNG_hIST_SUPPORTED
 #define PNG_iCCP_SUPPORTED
 #define PNG_iTXt_SUPPORTED
+#define PNG_mDCV_SUPPORTED
 #define PNG_oFFs_SUPPORTED
 #define PNG_pCAL_SUPPORTED
 #define PNG_pHYs_SUPPORTED
diff --git a/engine/thirdparty/libpng/pngmem.c b/engine/thirdparty/libpng/pngmem.c
index d391c13f..90c13b10 100644
--- a/engine/thirdparty/libpng/pngmem.c
+++ b/engine/thirdparty/libpng/pngmem.c
@@ -72,30 +72,29 @@ png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size),
     * to implement a user memory handler.  This checks to be sure it isn't
     * called with big numbers.
     */
-#ifndef PNG_USER_MEM_SUPPORTED
-   PNG_UNUSED(png_ptr)
-#endif
+#  ifdef PNG_MAX_MALLOC_64K
+      /* This is support for legacy systems which had segmented addressing
+       * limiting the maximum allocation size to 65536.  It takes precedence
+       * over PNG_SIZE_MAX which is set to 65535 on true 16-bit systems.
+       *
+       * TODO: libpng-1.8: finally remove both cases.
+       */
+      if (size > 65536U) return NULL;
+#  endif
 
-   /* Some compilers complain that this is always true.  However, it
-    * can be false when integer overflow happens.
+   /* This is checked too because the system malloc call below takes a (size_t).
     */
-   if (size > 0 && size <= PNG_SIZE_MAX
-#     ifdef PNG_MAX_MALLOC_64K
-         && size <= 65536U
-#     endif
-      )
-   {
-#ifdef PNG_USER_MEM_SUPPORTED
+   if (size > PNG_SIZE_MAX) return NULL;
+
+#  ifdef PNG_USER_MEM_SUPPORTED
       if (png_ptr != NULL && png_ptr->malloc_fn != NULL)
          return png_ptr->malloc_fn(png_constcast(png_structrp,png_ptr), size);
+#  else
+      PNG_UNUSED(png_ptr)
+#  endif
 
-      else
-#endif
-         return malloc((size_t)size); /* checked for truncation above */
-   }
-
-   else
-      return NULL;
+   /* Use the system malloc */
+   return malloc((size_t)/*SAFE*/size); /* checked for truncation above */
 }
 
 #if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\
diff --git a/engine/thirdparty/libpng/pngpread.c b/engine/thirdparty/libpng/pngpread.c
index 1bf880ea..60d81069 100644
--- a/engine/thirdparty/libpng/pngpread.c
+++ b/engine/thirdparty/libpng/pngpread.c
@@ -193,17 +193,8 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
     */
    if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
    {
-      png_byte chunk_length[4];
-      png_byte chunk_tag[4];
-
       PNG_PUSH_SAVE_BUFFER_IF_LT(8)
-      png_push_fill_buffer(png_ptr, chunk_length, 4);
-      png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
-      png_reset_crc(png_ptr);
-      png_crc_read(png_ptr, chunk_tag, 4);
-      png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
-      png_check_chunk_name(png_ptr, png_ptr->chunk_name);
-      png_check_chunk_length(png_ptr, png_ptr->push_length);
+      png_ptr->push_length = png_read_chunk_header(png_ptr);
       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
    }
 
@@ -244,13 +235,13 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
          png_error(png_ptr, "Invalid IHDR length");
 
       PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length);
+      png_handle_chunk(png_ptr, info_ptr, png_ptr->push_length);
    }
 
    else if (chunk_name == png_IEND)
    {
       PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length);
+      png_handle_chunk(png_ptr, info_ptr, png_ptr->push_length);
 
       png_ptr->process_mode = PNG_READ_DONE_MODE;
       png_push_have_end(png_ptr, info_ptr);
@@ -267,12 +258,6 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
    }
 #endif
 
-   else if (chunk_name == png_PLTE)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
    else if (chunk_name == png_IDAT)
    {
       png_ptr->idat_size = png_ptr->push_length;
@@ -285,163 +270,10 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
       return;
    }
 
-#ifdef PNG_READ_gAMA_SUPPORTED
-   else if (png_ptr->chunk_name == png_gAMA)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sBIT_SUPPORTED
-   else if (png_ptr->chunk_name == png_sBIT)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_cHRM_SUPPORTED
-   else if (png_ptr->chunk_name == png_cHRM)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_cICP_SUPPORTED
-   else if (png_ptr->chunk_name == png_cICP)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_cICP(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_eXIf_SUPPORTED
-   else if (png_ptr->chunk_name == png_eXIf)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_eXIf(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sRGB_SUPPORTED
-   else if (chunk_name == png_sRGB)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iCCP_SUPPORTED
-   else if (png_ptr->chunk_name == png_iCCP)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sPLT_SUPPORTED
-   else if (chunk_name == png_sPLT)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tRNS_SUPPORTED
-   else if (chunk_name == png_tRNS)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_bKGD_SUPPORTED
-   else if (chunk_name == png_bKGD)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_hIST_SUPPORTED
-   else if (chunk_name == png_hIST)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_pHYs_SUPPORTED
-   else if (chunk_name == png_pHYs)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_oFFs_SUPPORTED
-   else if (chunk_name == png_oFFs)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-   else if (chunk_name == png_pCAL)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_sCAL_SUPPORTED
-   else if (chunk_name == png_sCAL)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tIME_SUPPORTED
-   else if (chunk_name == png_tIME)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_tEXt_SUPPORTED
-   else if (chunk_name == png_tEXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_zTXt_SUPPORTED
-   else if (chunk_name == png_zTXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-
-#endif
-#ifdef PNG_READ_iTXt_SUPPORTED
-   else if (chunk_name == png_iTXt)
-   {
-      PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
-   }
-#endif
-
    else
    {
       PNG_PUSH_SAVE_BUFFER_IF_FULL
-      png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length,
-          PNG_HANDLE_CHUNK_AS_DEFAULT);
+      png_handle_chunk(png_ptr, info_ptr, png_ptr->push_length);
    }
 
    png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
diff --git a/engine/thirdparty/libpng/pngpriv.h b/engine/thirdparty/libpng/pngpriv.h
index 84f77c35..d514dff5 100644
--- a/engine/thirdparty/libpng/pngpriv.h
+++ b/engine/thirdparty/libpng/pngpriv.h
@@ -671,7 +671,7 @@
 #define PNG_FLAG_CRC_ANCILLARY_NOWARN     0x0200U
 #define PNG_FLAG_CRC_CRITICAL_USE         0x0400U
 #define PNG_FLAG_CRC_CRITICAL_IGNORE      0x0800U
-#define PNG_FLAG_ASSUME_sRGB              0x1000U /* Added to libpng-1.5.4 */
+/*      PNG_FLAG_ASSUME_sRGB unused       0x1000U  * Added to libpng-1.5.4 */
 #define PNG_FLAG_OPTIMIZE_ALPHA           0x2000U /* Added to libpng-1.5.4 */
 #define PNG_FLAG_DETECT_UNINITIALIZED     0x4000U /* Added to libpng-1.5.4 */
 /* #define PNG_FLAG_KEEP_UNKNOWN_CHUNKS      0x8000U */
@@ -782,6 +782,8 @@
 #ifdef PNG_FIXED_POINT_MACRO_SUPPORTED
 #define png_fixed(png_ptr, fp, s) ((fp) <= 21474 && (fp) >= -21474 ?\
     ((png_fixed_point)(100000 * (fp))) : (png_fixed_error(png_ptr, s),0))
+#define png_fixed_ITU(png_ptr, fp, s) ((fp) <= 214748 && (fp) >= 0 ?\
+    ((png_uint_32)(10000 * (fp))) : (png_fixed_error(png_ptr, s),0))
 #endif
 /* else the corresponding function is defined below, inside the scope of the
  * cplusplus test.
@@ -800,11 +802,31 @@
  *
  * PNG_32b correctly produces a value shifted by up to 24 bits, even on
  * architectures where (int) is only 16 bits.
+ *
+ * 1.6.47: PNG_32b was made into a preprocessor evaluable macro by replacing the
+ * static_cast with a promoting binary operation using a guaranteed 32-bit
+ * (minimum) unsigned value.
  */
-#define PNG_32b(b,s) ((png_uint_32)(b) << (s))
+#define PNG_32b(b,s) (((0xFFFFFFFFU)&(b)) << (s))
 #define PNG_U32(b1,b2,b3,b4) \
    (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0))
 
+/* Chunk name validation.  When using these macros all the arguments should be
+ * constants, otherwise code bloat may well occur.  The macros are provided
+ * primarily for use in #if checks.
+ *
+ * PNG_32to8 produces a byte value with the right shift; used to extract the
+ * byte value from a chunk name.
+ */
+#define PNG_32to8(cn,s) (((cn) >> (s)) & 0xffU)
+#define PNG_CN_VALID_UPPER(b) ((b) >= 65 && (b) <= 90) /* upper-case ASCII */
+#define PNG_CN_VALID_ASCII(b) PNG_CN_VALID_UPPER((b) & ~32U)
+#define PNG_CHUNK_NAME_VALID(cn) (\
+   PNG_CN_VALID_ASCII(PNG_32to8(cn,24)) && /* critical, !ancillary */\
+   PNG_CN_VALID_ASCII(PNG_32to8(cn,16)) && /* public, !privately defined */\
+   PNG_CN_VALID_UPPER(PNG_32to8(cn, 8)) && /* VALID, !reserved */\
+   PNG_CN_VALID_ASCII(PNG_32to8(cn, 0))   /* data-dependent, !copy ok */)
+
 /* Constants for known chunk types.
  *
  * MAINTAINERS: If you need to add a chunk, define the name here.
@@ -832,10 +854,14 @@
 #define png_IEND PNG_U32( 73,  69,  78,  68)
 #define png_IHDR PNG_U32( 73,  72,  68,  82)
 #define png_PLTE PNG_U32( 80,  76,  84,  69)
+#define png_acTL PNG_U32( 97,  99,  84,  76) /* PNGv3: APNG */
 #define png_bKGD PNG_U32( 98,  75,  71,  68)
 #define png_cHRM PNG_U32( 99,  72,  82,  77)
-#define png_cICP PNG_U32( 99,  73,  67,  80)
+#define png_cICP PNG_U32( 99,  73,  67,  80) /* PNGv3 */
+#define png_cLLI PNG_U32( 99,  76,  76,  73) /* PNGv3 */
 #define png_eXIf PNG_U32(101,  88,  73, 102) /* registered July 2017 */
+#define png_fcTL PNG_U32(102,  99,  84,  76) /* PNGv3: APNG */
+#define png_fdAT PNG_U32(102, 100,  65,  84) /* PNGv3: APNG */
 #define png_fRAc PNG_U32(102,  82,  65,  99) /* registered, not defined */
 #define png_gAMA PNG_U32(103,  65,  77,  65)
 #define png_gIFg PNG_U32(103,  73,  70, 103)
@@ -844,6 +870,7 @@
 #define png_hIST PNG_U32(104,  73,  83,  84)
 #define png_iCCP PNG_U32(105,  67,  67,  80)
 #define png_iTXt PNG_U32(105,  84,  88, 116)
+#define png_mDCV PNG_U32(109,  68,  67,  86) /* PNGv3 */
 #define png_oFFs PNG_U32(111,  70,  70, 115)
 #define png_pCAL PNG_U32(112,  67,  65,  76)
 #define png_pHYs PNG_U32(112,  72,  89, 115)
@@ -884,11 +911,74 @@
 #define PNG_CHUNK_RESERVED(c)     (1 & ((c) >> 13))
 #define PNG_CHUNK_SAFE_TO_COPY(c) (1 & ((c) >>  5))
 
+/* Known chunks.  All supported chunks must be listed here.  The macro PNG_CHUNK
+ * contains the four character ASCII name by which the chunk is identified.  The
+ * macro is implemented as required to build tables or switch statements which
+ * require entries for every known chunk.  The macro also contains an index
+ * value which should be in order (this is checked in png.c).
+ *
+ * Notice that "known" does not require "SUPPORTED"; tables should be built in
+ * such a way that chunks unsupported in a build require no more than the table
+ * entry (which should be small.)  In particular function pointers for
+ * unsupported chunks should be NULL.
+ *
+ * At present these index values are not exported (not part of the public API)
+ * so can be changed at will.  For convenience the names are in lexical sort
+ * order but with the critical chunks at the start in the order of occurence in
+ * a PNG.
+ *
+ * PNG_INFO_ values do not exist for every one of these chunk handles; for
+ * example PNG_INFO_{IDAT,IEND,tEXt,iTXt,zTXt} and possibly other chunks in the
+ * future.
+ */
+#define PNG_KNOWN_CHUNKS\
+   PNG_CHUNK(IHDR,  0)\
+   PNG_CHUNK(PLTE,  1)\
+   PNG_CHUNK(IDAT,  2)\
+   PNG_CHUNK(IEND,  3)\
+   PNG_CHUNK(acTL,  4)\
+   PNG_CHUNK(bKGD,  5)\
+   PNG_CHUNK(cHRM,  6)\
+   PNG_CHUNK(cICP,  7)\
+   PNG_CHUNK(cLLI,  8)\
+   PNG_CHUNK(eXIf,  9)\
+   PNG_CHUNK(fcTL, 10)\
+   PNG_CHUNK(fdAT, 11)\
+   PNG_CHUNK(gAMA, 12)\
+   PNG_CHUNK(hIST, 13)\
+   PNG_CHUNK(iCCP, 14)\
+   PNG_CHUNK(iTXt, 15)\
+   PNG_CHUNK(mDCV, 16)\
+   PNG_CHUNK(oFFs, 17)\
+   PNG_CHUNK(pCAL, 18)\
+   PNG_CHUNK(pHYs, 19)\
+   PNG_CHUNK(sBIT, 20)\
+   PNG_CHUNK(sCAL, 21)\
+   PNG_CHUNK(sPLT, 22)\
+   PNG_CHUNK(sRGB, 23)\
+   PNG_CHUNK(tEXt, 24)\
+   PNG_CHUNK(tIME, 25)\
+   PNG_CHUNK(tRNS, 26)\
+   PNG_CHUNK(zTXt, 27)
+
 /* Gamma values (new at libpng-1.5.4): */
 #define PNG_GAMMA_MAC_OLD 151724  /* Assume '1.8' is really 2.2/1.45! */
 #define PNG_GAMMA_MAC_INVERSE 65909
 #define PNG_GAMMA_sRGB_INVERSE 45455
 
+/* gamma sanity check.  libpng cannot implement gamma transforms outside a
+ * certain limit because of its use of 16-bit fixed point intermediate values.
+ * Gamma values that are too large or too small will zap the 16-bit values all
+ * to 0 or 65535 resulting in an obvious 'bad' image.
+ *
+ * In libpng 1.6.0 the limits were changed from 0.07..3 to 0.01..100 to
+ * accommodate the optimal 16-bit gamma of 36 and its reciprocal.
+ *
+ * These are png_fixed_point integral values:
+ */
+#define PNG_LIB_GAMMA_MIN 1000
+#define PNG_LIB_GAMMA_MAX 10000000
+
 /* Almost everything below is C specific; the #defines above can be used in
  * non-C code (so long as it is C-preprocessed) the rest of this stuff cannot.
  */
@@ -952,7 +1042,6 @@ extern "C" {
  *
  * All of these functions must be declared with PNG_INTERNAL_FUNCTION.
  */
-
 /* Zlib support */
 #define PNG_UNEXPECTED_ZLIB_RETURN (-7)
 PNG_INTERNAL_FUNCTION(void, png_zstream_error,(png_structrp png_ptr, int ret),
@@ -971,6 +1060,7 @@ PNG_INTERNAL_FUNCTION(void,png_free_buffer_list,(png_structrp png_ptr,
    !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
    (defined(PNG_gAMA_SUPPORTED) || defined(PNG_cHRM_SUPPORTED) || \
    defined(PNG_sCAL_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) || \
+   defined(PNG_mDCV_SUPPORTED) || \
    defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)) || \
    (defined(PNG_sCAL_SUPPORTED) && \
    defined(PNG_FLOATING_ARITHMETIC_SUPPORTED))
@@ -978,12 +1068,38 @@ PNG_INTERNAL_FUNCTION(png_fixed_point,png_fixed,(png_const_structrp png_ptr,
    double fp, png_const_charp text),PNG_EMPTY);
 #endif
 
+#if defined(PNG_FLOATING_POINT_SUPPORTED) && \
+   !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \
+   (defined(PNG_cLLI_SUPPORTED) || defined(PNG_mDCV_SUPPORTED))
+PNG_INTERNAL_FUNCTION(png_uint_32,png_fixed_ITU,(png_const_structrp png_ptr,
+   double fp, png_const_charp text),PNG_EMPTY);
+#endif
+
 /* Check the user version string for compatibility, returns false if the version
  * numbers aren't compatible.
  */
 PNG_INTERNAL_FUNCTION(int,png_user_version_check,(png_structrp png_ptr,
    png_const_charp user_png_ver),PNG_EMPTY);
 
+#ifdef PNG_READ_SUPPORTED /* should only be used on read */
+/* Security: read limits on the largest allocations while reading a PNG.  This
+ * avoids very large allocations caused by PNG files with damaged or altered
+ * chunk 'length' fields.
+ */
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED /* run-time limit */
+#  define png_chunk_max(png_ptr) ((png_ptr)->user_chunk_malloc_max)
+
+#elif PNG_USER_CHUNK_MALLOC_MAX > 0 /* compile-time limit */
+#  define png_chunk_max(png_ptr) ((void)png_ptr, PNG_USER_CHUNK_MALLOC_MAX)
+
+#elif (defined PNG_MAX_MALLOC_64K)  /* legacy system limit */
+#  define png_chunk_max(png_ptr) ((void)png_ptr, 65536U)
+
+#else                               /* modern system limit SIZE_MAX (C99) */
+#  define png_chunk_max(png_ptr) ((void)png_ptr, PNG_SIZE_MAX)
+#endif
+#endif /* READ */
+
 /* Internal base allocator - no messages, NULL on failure to allocate.  This
  * does, however, call the application provided allocator and that could call
  * png_error (although that would be a bug in the application implementation.)
@@ -1083,9 +1199,6 @@ PNG_INTERNAL_FUNCTION(void,png_crc_read,(png_structrp png_ptr, png_bytep buf,
 PNG_INTERNAL_FUNCTION(int,png_crc_finish,(png_structrp png_ptr,
    png_uint_32 skip),PNG_EMPTY);
 
-/* Read the CRC from the file and compare it to the libpng calculated CRC */
-PNG_INTERNAL_FUNCTION(int,png_crc_error,(png_structrp png_ptr),PNG_EMPTY);
-
 /* Calculate the CRC over a section of data.  Note that we are only
  * passing a maximum of 64K on systems that have this as a memory limit,
  * since this is the maximum buffer size we can specify.
@@ -1137,6 +1250,20 @@ PNG_INTERNAL_FUNCTION(void,png_write_cICP,(png_structrp png_ptr,
     png_byte matrix_coefficients, png_byte video_full_range_flag), PNG_EMPTY);
 #endif
 
+#ifdef PNG_WRITE_cLLI_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_write_cLLI_fixed,(png_structrp png_ptr,
+   png_uint_32 maxCLL, png_uint_32 maxFALL), PNG_EMPTY);
+#endif
+
+#ifdef PNG_WRITE_mDCV_SUPPORTED
+PNG_INTERNAL_FUNCTION(void,png_write_mDCV_fixed,(png_structrp png_ptr,
+   png_uint_16 red_x, png_uint_16 red_y,
+   png_uint_16 green_x, png_uint_16 green_y,
+   png_uint_16 blue_x, png_uint_16 blue_y,
+   png_uint_16 white_x, png_uint_16 white_y,
+   png_uint_32 maxDL, png_uint_32 minDL), PNG_EMPTY);
+#endif
+
 #ifdef PNG_WRITE_sRGB_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_write_sRGB,(png_structrp png_ptr,
     int intent),PNG_EMPTY);
@@ -1149,10 +1276,10 @@ PNG_INTERNAL_FUNCTION(void,png_write_eXIf,(png_structrp png_ptr,
 
 #ifdef PNG_WRITE_iCCP_SUPPORTED
 PNG_INTERNAL_FUNCTION(void,png_write_iCCP,(png_structrp png_ptr,
-   png_const_charp name, png_const_bytep profile), PNG_EMPTY);
-   /* The profile must have been previously validated for correctness, the
-    * length comes from the first four bytes.  Only the base, deflate,
-    * compression is supported.
+   png_const_charp name, png_const_bytep profile, png_uint_32 proflen),
+   PNG_EMPTY);
+   /* Writes a previously 'set' profile.  The profile argument is **not**
+    * compressed.
     */
 #endif
 
@@ -1461,124 +1588,36 @@ PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info,
 /* The following decodes the appropriate chunks, and does error correction,
  * then calls the appropriate callback for the chunk if it is valid.
  */
+typedef enum
+{
+   /* Result of a call to png_handle_chunk made to handle the current chunk
+    * png_struct::chunk_name on read.  Always informational, either the stream
+    * is read for the next chunk or the routine will call png_error.
+    *
+    * NOTE: order is important internally.  handled_saved and above are regarded
+    * as handling the chunk.
+    */
+   handled_error = 0,  /* bad crc or known and bad format or too long */
+   handled_discarded,  /* not saved in the unknown chunk list */
+   handled_saved,      /* saved in the unknown chunk list */
+   handled_ok          /* known, supported and handled without error */
+} png_handle_result_code;
 
-/* Decode the IHDR chunk */
-PNG_INTERNAL_FUNCTION(void,png_handle_IHDR,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_handle_PLTE,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_handle_IEND,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_bKGD,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_cHRM,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_cICP_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_cICP,(png_structrp png_ptr,
-        png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_eXIf,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_gAMA,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* READ_iCCP */
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_oFFs,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_pCAL,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_pHYs,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sBIT,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* READ_sPLT */
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tIME,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_tRNS,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif
-
-PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr,
-    png_uint_32 chunk_name),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,
-    png_uint_32 chunk_length),PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_unknown,
+    (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length, int keep),
+    PNG_EMPTY);
    /* This is the function that gets called for unknown chunks.  The 'keep'
     * argument is either non-zero for a known chunk that has been set to be
     * handled as unknown or zero for an unknown chunk.  By default the function
     * just skips the chunk or errors out if it is critical.
     */
 
+PNG_INTERNAL_FUNCTION(png_handle_result_code,png_handle_chunk,
+    (png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
+   /* This handles the current chunk png_ptr->chunk_name with unread
+    * data[length] and returns one of the above result codes.
+    */
+
 #if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\
     defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
 PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling,
@@ -1618,8 +1657,6 @@ PNG_INTERNAL_FUNCTION(void,png_process_IDAT_data,(png_structrp png_ptr,
     png_bytep buffer, size_t buffer_length),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_process_row,(png_structrp png_ptr),
     PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_handle_unknown,(png_structrp png_ptr,
-   png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_have_info,(png_structrp png_ptr,
    png_inforp info_ptr),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_push_have_end,(png_structrp png_ptr,
@@ -1632,109 +1669,28 @@ PNG_INTERNAL_FUNCTION(void,png_process_some_data,(png_structrp png_ptr,
     png_inforp info_ptr),PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_read_push_finish_row,(png_structrp png_ptr),
     PNG_EMPTY);
-#  ifdef PNG_READ_tEXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_tEXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-#  ifdef PNG_READ_zTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_zTXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-#  ifdef PNG_READ_iTXt_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_push_handle_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,
-    png_inforp info_ptr),PNG_EMPTY);
-#  endif
-
 #endif /* PROGRESSIVE_READ */
 
-/* Added at libpng version 1.6.0 */
-#ifdef PNG_GAMMA_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr,
-    png_colorspacerp colorspace, png_fixed_point gAMA), PNG_EMPTY);
-   /* Set the colorspace gamma with a value provided by the application or by
-    * the gAMA chunk on read.  The value will override anything set by an ICC
-    * profile.
-    */
-
-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync_info,(png_const_structrp png_ptr,
-    png_inforp info_ptr), PNG_EMPTY);
-   /* Synchronize the info 'valid' flags with the colorspace */
-
-PNG_INTERNAL_FUNCTION(void,png_colorspace_sync,(png_const_structrp png_ptr,
-    png_inforp info_ptr), PNG_EMPTY);
-   /* Copy the png_struct colorspace to the info_struct and call the above to
-    * synchronize the flags.  Checks for NULL info_ptr and does nothing.
-    */
-#endif
-
-/* Added at libpng version 1.4.0 */
-#ifdef PNG_COLORSPACE_SUPPORTED
-/* These internal functions are for maintaining the colorspace structure within
- * a png_info or png_struct (or, indeed, both).
- */
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_chromaticities,
-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_xy *xy,
-    int preferred), PNG_EMPTY);
-
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_endpoints,
-   (png_const_structrp png_ptr, png_colorspacerp colorspace, const png_XYZ *XYZ,
-    int preferred), PNG_EMPTY);
-
-#ifdef PNG_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_sRGB,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, int intent), PNG_EMPTY);
-   /* This does set the colorspace gAMA and cHRM values too, but doesn't set the
-    * flags to write them, if it returns false there was a problem and an error
-    * message has already been output (but the colorspace may still need to be
-    * synced to record the invalid flag).
-    */
-#endif /* sRGB */
-
 #ifdef PNG_iCCP_SUPPORTED
-PNG_INTERNAL_FUNCTION(int,png_colorspace_set_ICC,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length, png_const_bytep profile, int color_type),
-   PNG_EMPTY);
-   /* The 'name' is used for information only */
-
 /* Routines for checking parts of an ICC profile. */
 #ifdef PNG_READ_iCCP_SUPPORTED
 PNG_INTERNAL_FUNCTION(int,png_icc_check_length,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length), PNG_EMPTY);
+   png_const_charp name, png_uint_32 profile_length), PNG_EMPTY);
 #endif /* READ_iCCP */
 PNG_INTERNAL_FUNCTION(int,png_icc_check_header,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length,
+   png_const_charp name, png_uint_32 profile_length,
    png_const_bytep profile /* first 132 bytes only */, int color_type),
    PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(int,png_icc_check_tag_table,(png_const_structrp png_ptr,
-   png_colorspacerp colorspace, png_const_charp name,
-   png_uint_32 profile_length,
+   png_const_charp name, png_uint_32 profile_length,
    png_const_bytep profile /* header plus whole tag table */), PNG_EMPTY);
-#ifdef PNG_sRGB_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_icc_set_sRGB,(
-   png_const_structrp png_ptr, png_colorspacerp colorspace,
-   png_const_bytep profile, uLong adler), PNG_EMPTY);
-   /* 'adler' is the Adler32 checksum of the uncompressed profile data. It may
-    * be zero to indicate that it is not available.  It is used, if provided,
-    * as a fast check on the profile when checking to see if it is sRGB.
-    */
-#endif
 #endif /* iCCP */
 
 #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
-PNG_INTERNAL_FUNCTION(void,png_colorspace_set_rgb_coefficients,
-   (png_structrp png_ptr), PNG_EMPTY);
-   /* Set the rgb_to_gray coefficients from the colorspace Y values */
+PNG_INTERNAL_FUNCTION(void,png_set_rgb_coefficients, (png_structrp png_ptr),
+   PNG_EMPTY);
+   /* Set the rgb_to_gray coefficients from the cHRM Y values (if unset) */
 #endif /* READ_RGB_TO_GRAY */
-#endif /* COLORSPACE */
 
 /* Added at libpng version 1.4.0 */
 PNG_INTERNAL_FUNCTION(void,png_check_IHDR,(png_const_structrp png_ptr,
@@ -1996,8 +1952,10 @@ PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
    size_t size),PNG_EMPTY);
 #endif /* pCAL || sCAL */
 
-#if defined(PNG_GAMMA_SUPPORTED) ||\
-    defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED)
+#if defined(PNG_READ_GAMMA_SUPPORTED) ||\
+    defined(PNG_COLORSPACE_SUPPORTED) ||\
+    defined(PNG_INCH_CONVERSIONS_SUPPORTED) ||\
+    defined(PNG_READ_pHYs_SUPPORTED)
 /* Added at libpng version 1.5.0 */
 /* This is a utility to provide a*times/div (rounded) and indicate
  * if there is an overflow.  The result is a boolean - false (0)
@@ -2006,22 +1964,14 @@ PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string,
  */
 PNG_INTERNAL_FUNCTION(int,png_muldiv,(png_fixed_point_p res, png_fixed_point a,
    png_int_32 multiplied_by, png_int_32 divided_by),PNG_EMPTY);
-#endif
 
-#if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_INCH_CONVERSIONS_SUPPORTED)
-/* Same deal, but issue a warning on overflow and return 0. */
-PNG_INTERNAL_FUNCTION(png_fixed_point,png_muldiv_warn,
-   (png_const_structrp png_ptr, png_fixed_point a, png_int_32 multiplied_by,
-   png_int_32 divided_by),PNG_EMPTY);
-#endif
-
-#ifdef PNG_GAMMA_SUPPORTED
 /* Calculate a reciprocal - used for gamma values.  This returns
  * 0 if the argument is 0 in order to maintain an undefined value;
  * there are no warnings.
  */
 PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
    PNG_EMPTY);
+#endif
 
 #ifdef PNG_READ_GAMMA_SUPPORTED
 /* The same but gives a reciprocal of the product of two fixed point
@@ -2030,14 +1980,22 @@ PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal,(png_fixed_point a),
  */
 PNG_INTERNAL_FUNCTION(png_fixed_point,png_reciprocal2,(png_fixed_point a,
    png_fixed_point b),PNG_EMPTY);
-#endif
 
 /* Return true if the gamma value is significantly different from 1.0 */
 PNG_INTERNAL_FUNCTION(int,png_gamma_significant,(png_fixed_point gamma_value),
    PNG_EMPTY);
-#endif
 
-#ifdef PNG_READ_GAMMA_SUPPORTED
+/* PNGv3: 'resolve' the file gamma according to the new PNGv3 rules for colour
+ * space information.
+ *
+ * NOTE: this uses precisely those chunks that libpng supports.  For example it
+ * doesn't use iCCP and it can only use cICP for known and manageable
+ * transforms.  For this reason a gamma specified by png_set_gamma always takes
+ * precedence.
+ */
+PNG_INTERNAL_FUNCTION(png_fixed_point,png_resolve_file_gamma,
+   (png_const_structrp png_ptr),PNG_EMPTY);
+
 /* Internal fixed point gamma correction.  These APIs are called as
  * required to convert single values - they don't need to be fast,
  * they are not used when processing image pixel values.
@@ -2055,6 +2013,22 @@ PNG_INTERNAL_FUNCTION(void,png_destroy_gamma_table,(png_structrp png_ptr),
    PNG_EMPTY);
 PNG_INTERNAL_FUNCTION(void,png_build_gamma_table,(png_structrp png_ptr,
    int bit_depth),PNG_EMPTY);
+#endif /* READ_GAMMA */
+
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+/* Set the RGB coefficients if not already set by png_set_rgb_to_gray */
+PNG_INTERNAL_FUNCTION(void,png_set_rgb_coefficients,(png_structrp png_ptr),
+   PNG_EMPTY);
+#endif
+
+#if defined(PNG_cHRM_SUPPORTED) || defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+PNG_INTERNAL_FUNCTION(int,png_XYZ_from_xy,(png_XYZ *XYZ, const png_xy *xy),
+   PNG_EMPTY);
+#endif /* cHRM || READ_RGB_TO_GRAY */
+
+#ifdef PNG_COLORSPACE_SUPPORTED
+PNG_INTERNAL_FUNCTION(int,png_xy_from_XYZ,(png_xy *xy, const png_XYZ *XYZ),
+   PNG_EMPTY);
 #endif
 
 /* SIMPLIFIED READ/WRITE SUPPORT */
diff --git a/engine/thirdparty/libpng/pngread.c b/engine/thirdparty/libpng/pngread.c
index 49e19a49..0fd36482 100644
--- a/engine/thirdparty/libpng/pngread.c
+++ b/engine/thirdparty/libpng/pngread.c
@@ -131,14 +131,11 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
          png_ptr->mode |= PNG_AFTER_IDAT;
       }
 
-      /* This should be a binary subdivision search or a hash for
-       * matching the chunk name rather than a linear search.
-       */
       if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
       else if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
 #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
       else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0)
@@ -155,8 +152,6 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
          }
       }
 #endif
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
 
       else if (chunk_name == png_IDAT)
       {
@@ -164,104 +159,8 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
          break;
       }
 
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cICP_SUPPORTED
-      else if (chunk_name == png_cICP)
-         png_handle_cICP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-      else if (chunk_name == png_eXIf)
-         png_handle_eXIf(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
-
       else
-         png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
+         png_handle_chunk(png_ptr, info_ptr, length);
    }
 }
 #endif /* SEQUENTIAL_READ */
@@ -806,10 +705,10 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
          png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
 
       if (chunk_name == png_IEND)
-         png_handle_IEND(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
       else if (chunk_name == png_IHDR)
-         png_handle_IHDR(png_ptr, info_ptr, length);
+         png_handle_chunk(png_ptr, info_ptr, length);
 
       else if (info_ptr == NULL)
          png_crc_finish(png_ptr, length);
@@ -843,107 +742,9 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
 
          png_crc_finish(png_ptr, length);
       }
-      else if (chunk_name == png_PLTE)
-         png_handle_PLTE(png_ptr, info_ptr, length);
-
-#ifdef PNG_READ_bKGD_SUPPORTED
-      else if (chunk_name == png_bKGD)
-         png_handle_bKGD(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cHRM_SUPPORTED
-      else if (chunk_name == png_cHRM)
-         png_handle_cHRM(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_cICP_SUPPORTED
-      else if (chunk_name == png_cICP)
-         png_handle_cICP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_eXIf_SUPPORTED
-      else if (chunk_name == png_eXIf)
-         png_handle_eXIf(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_gAMA_SUPPORTED
-      else if (chunk_name == png_gAMA)
-         png_handle_gAMA(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_hIST_SUPPORTED
-      else if (chunk_name == png_hIST)
-         png_handle_hIST(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_oFFs_SUPPORTED
-      else if (chunk_name == png_oFFs)
-         png_handle_oFFs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pCAL_SUPPORTED
-      else if (chunk_name == png_pCAL)
-         png_handle_pCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sCAL_SUPPORTED
-      else if (chunk_name == png_sCAL)
-         png_handle_sCAL(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_pHYs_SUPPORTED
-      else if (chunk_name == png_pHYs)
-         png_handle_pHYs(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sBIT_SUPPORTED
-      else if (chunk_name == png_sBIT)
-         png_handle_sBIT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sRGB_SUPPORTED
-      else if (chunk_name == png_sRGB)
-         png_handle_sRGB(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iCCP_SUPPORTED
-      else if (chunk_name == png_iCCP)
-         png_handle_iCCP(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_sPLT_SUPPORTED
-      else if (chunk_name == png_sPLT)
-         png_handle_sPLT(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tEXt_SUPPORTED
-      else if (chunk_name == png_tEXt)
-         png_handle_tEXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tIME_SUPPORTED
-      else if (chunk_name == png_tIME)
-         png_handle_tIME(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_tRNS_SUPPORTED
-      else if (chunk_name == png_tRNS)
-         png_handle_tRNS(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_zTXt_SUPPORTED
-      else if (chunk_name == png_zTXt)
-         png_handle_zTXt(png_ptr, info_ptr, length);
-#endif
-
-#ifdef PNG_READ_iTXt_SUPPORTED
-      else if (chunk_name == png_iTXt)
-         png_handle_iTXt(png_ptr, info_ptr, length);
-#endif
 
       else
-         png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
+         png_handle_chunk(png_ptr, info_ptr, length);
    } while ((png_ptr->mode & PNG_HAVE_IEND) == 0);
 }
 #endif /* SEQUENTIAL_READ */
@@ -1394,6 +1195,31 @@ png_image_format(png_structrp png_ptr)
    return format;
 }
 
+static int
+chromaticities_match_sRGB(const png_xy *xy)
+{
+#  define sRGB_TOLERANCE 1000
+   static const png_xy sRGB_xy = /* From ITU-R BT.709-3 */
+   {
+      /* color      x       y */
+      /* red   */ 64000, 33000,
+      /* green */ 30000, 60000,
+      /* blue  */ 15000,  6000,
+      /* white */ 31270, 32900
+   };
+
+   if (PNG_OUT_OF_RANGE(xy->whitex, sRGB_xy.whitex,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->whitey, sRGB_xy.whitey,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->redx,   sRGB_xy.redx,  sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->redy,   sRGB_xy.redy,  sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->greenx, sRGB_xy.greenx,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->greeny, sRGB_xy.greeny,sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->bluex,  sRGB_xy.bluex, sRGB_TOLERANCE) ||
+       PNG_OUT_OF_RANGE(xy->bluey,  sRGB_xy.bluey, sRGB_TOLERANCE))
+      return 0;
+   return 1;
+}
+
 /* Is the given gamma significantly different from sRGB?  The test is the same
  * one used in pngrtran.c when deciding whether to do gamma correction.  The
  * arithmetic optimizes the division by using the fact that the inverse of the
@@ -1402,22 +1228,44 @@ png_image_format(png_structrp png_ptr)
 static int
 png_gamma_not_sRGB(png_fixed_point g)
 {
-   if (g < PNG_FP_1)
-   {
-      /* An uninitialized gamma is assumed to be sRGB for the simplified API. */
-      if (g == 0)
-         return 0;
+   /* 1.6.47: use the same sanity checks as used in pngrtran.c */
+   if (g < PNG_LIB_GAMMA_MIN || g > PNG_LIB_GAMMA_MAX)
+      return 0; /* Includes the uninitialized value 0 */
 
-      return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);
-   }
-
-   return 1;
+   return png_gamma_significant((g * 11 + 2)/5 /* i.e. *2.2, rounded */);
 }
 
 /* Do the main body of a 'png_image_begin_read' function; read the PNG file
  * header and fill in all the information.  This is executed in a safe context,
  * unlike the init routine above.
  */
+static int
+png_image_is_not_sRGB(png_const_structrp png_ptr)
+{
+   /* Does the colorspace **not** match sRGB?  The flag is only set if the
+    * answer can be determined reliably.
+    *
+    * png_struct::chromaticities always exists since the simplified API
+    * requires rgb-to-gray.  The mDCV, cICP and cHRM chunks may all set it to
+    * a non-sRGB value, so it needs to be checked but **only** if one of
+    * those chunks occured in the file.
+    */
+   /* Highest priority: check to be safe. */
+   if (png_has_chunk(png_ptr, cICP) || png_has_chunk(png_ptr, mDCV))
+      return !chromaticities_match_sRGB(&png_ptr->chromaticities);
+
+   /* If the image is marked as sRGB then it is... */
+   if (png_has_chunk(png_ptr, sRGB))
+      return 0;
+
+   /* Last stop: cHRM, must check: */
+   if (png_has_chunk(png_ptr, cHRM))
+      return !chromaticities_match_sRGB(&png_ptr->chromaticities);
+
+   /* Else default to sRGB */
+   return 0;
+}
+
 static int
 png_image_read_header(png_voidp argument)
 {
@@ -1439,17 +1287,13 @@ png_image_read_header(png_voidp argument)
 
       image->format = format;
 
-#ifdef PNG_COLORSPACE_SUPPORTED
-      /* Does the colorspace match sRGB?  If there is no color endpoint
-       * (colorant) information assume yes, otherwise require the
-       * 'ENDPOINTS_MATCHP_sRGB' colorspace flag to have been set.  If the
-       * colorspace has been determined to be invalid ignore it.
+      /* Greyscale images don't (typically) have colour space information and
+       * using it is pretty much impossible, so use sRGB for grayscale (it
+       * doesn't matter r==g==b so the transform is irrelevant.)
        */
-      if ((format & PNG_FORMAT_FLAG_COLOR) != 0 && ((png_ptr->colorspace.flags
-         & (PNG_COLORSPACE_HAVE_ENDPOINTS|PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB|
-            PNG_COLORSPACE_INVALID)) == PNG_COLORSPACE_HAVE_ENDPOINTS))
+      if ((format & PNG_FORMAT_FLAG_COLOR) != 0 &&
+          png_image_is_not_sRGB(png_ptr))
          image->flags |= PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB;
-#endif
    }
 
    /* We need the maximum number of entries regardless of the format the
@@ -1637,21 +1481,18 @@ png_image_skip_unused_chunks(png_structrp png_ptr)
     * potential vulnerability to security problems in the unused chunks.
     *
     * At present the iCCP chunk data isn't used, so iCCP chunk can be ignored
-    * too.  This allows the simplified API to be compiled without iCCP support,
-    * however if the support is there the chunk is still checked to detect
-    * errors (which are unfortunately quite common.)
+    * too.  This allows the simplified API to be compiled without iCCP support.
     */
    {
          static const png_byte chunks_to_process[] = {
             98,  75,  71,  68, '\0',  /* bKGD */
             99,  72,  82,  77, '\0',  /* cHRM */
+            99,  73,  67,  80, '\0',  /* cICP */
            103,  65,  77,  65, '\0',  /* gAMA */
-#        ifdef PNG_READ_iCCP_SUPPORTED
-           105,  67,  67,  80, '\0',  /* iCCP */
-#        endif
+           109,  68,  67,  86, '\0',  /* mDCV */
            115,  66,  73,  84, '\0',  /* sBIT */
            115,  82,  71,  66, '\0',  /* sRGB */
-           };
+         };
 
        /* Ignore unknown chunks and all other chunks except for the
         * IHDR, PLTE, tRNS, IDAT, and IEND chunks.
@@ -1680,7 +1521,15 @@ png_image_skip_unused_chunks(png_structrp png_ptr)
 static void
 set_file_encoding(png_image_read_control *display)
 {
-   png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma;
+   png_structrp png_ptr = display->image->opaque->png_ptr;
+   png_fixed_point g = png_resolve_file_gamma(png_ptr);
+
+   /* PNGv3: the result may be 0 however the 'default_gamma' should have been
+    * set before this is called so zero is an error:
+    */
+   if (g == 0)
+      png_error(png_ptr, "internal: default gamma not set");
+
    if (png_gamma_significant(g) != 0)
    {
       if (png_gamma_not_sRGB(g) != 0)
@@ -2168,24 +2017,18 @@ png_image_read_colormap(png_voidp argument)
    /* Default the input file gamma if required - this is necessary because
     * libpng assumes that if no gamma information is present the data is in the
     * output format, but the simplified API deduces the gamma from the input
-    * format.
+    * format.  The 'default' gamma value is also set by png_set_alpha_mode, but
+    * this is happening before any such call, so:
+    *
+    * TODO: should be an internal API and all this code should be copied into a
+    * single common gamma+colorspace file.
     */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) == 0)
-   {
-      /* Do this directly, not using the png_colorspace functions, to ensure
-       * that it happens even if the colorspace is invalid (though probably if
-       * it is the setting will be ignored)  Note that the same thing can be
-       * achieved at the application interface with png_set_gAMA.
-       */
-      if (png_ptr->bit_depth == 16 &&
-         (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
-         png_ptr->colorspace.gamma = PNG_GAMMA_LINEAR;
+   if (png_ptr->bit_depth == 16 &&
+      (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
+      png_ptr->default_gamma = PNG_GAMMA_LINEAR;
 
-      else
-         png_ptr->colorspace.gamma = PNG_GAMMA_sRGB_INVERSE;
-
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-   }
+   else
+      png_ptr->default_gamma = PNG_GAMMA_sRGB_INVERSE;
 
    /* Decide what to do based on the PNG color type of the input data.  The
     * utility function png_create_colormap_entry deals with most aspects of the
@@ -2563,6 +2406,8 @@ png_image_read_colormap(png_voidp argument)
 
             else
             {
+               const png_fixed_point gamma = png_resolve_file_gamma(png_ptr);
+
                /* Either the input or the output has no alpha channel, so there
                 * will be no non-opaque pixels in the color-map; it will just be
                 * grayscale.
@@ -2577,10 +2422,13 @@ png_image_read_colormap(png_voidp argument)
                 * this case and doing it in the palette; this will result in
                 * duplicate palette entries, but that's better than the
                 * alternative of double gamma correction.
+                *
+                * NOTE: PNGv3: check the resolved result of all the potentially
+                * different colour space chunks.
                 */
                if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
                   png_ptr->num_trans > 0) &&
-                  png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)
+                  png_gamma_not_sRGB(gamma) != 0)
                {
                   cmap_entries = (unsigned int)make_gray_file_colormap(display);
                   data_encoding = P_FILE;
@@ -2612,8 +2460,8 @@ png_image_read_colormap(png_voidp argument)
                      if (output_encoding == P_sRGB)
                         gray = png_sRGB_table[gray]; /* now P_LINEAR */
 
-                     gray = PNG_DIV257(png_gamma_16bit_correct(gray,
-                         png_ptr->colorspace.gamma)); /* now P_FILE */
+                     gray = PNG_DIV257(png_gamma_16bit_correct(gray, gamma));
+                        /* now P_FILE */
 
                      /* And make sure the corresponding palette entry contains
                       * exactly the required sRGB value.
@@ -3744,6 +3592,12 @@ png_image_read_direct(png_voidp argument)
       /* Set the gamma appropriately, linear for 16-bit input, sRGB otherwise.
        */
       {
+         /* This is safe but should no longer be necessary as
+          * png_ptr->default_gamma should have been set after the
+          * info-before-IDAT was read in png_image_read_header.
+          *
+          * TODO: 1.8: remove this and see what happens.
+          */
          png_fixed_point input_gamma_default;
 
          if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 &&
@@ -3799,8 +3653,9 @@ png_image_read_direct(png_voidp argument)
           * yet; it's set below.  png_struct::gamma, however, is set to the
           * final value.
           */
-         if (png_muldiv(&gtest, output_gamma, png_ptr->colorspace.gamma,
-             PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
+         if (png_muldiv(&gtest, output_gamma,
+                  png_resolve_file_gamma(png_ptr), PNG_FP_1) != 0 &&
+             png_gamma_significant(gtest) == 0)
             do_local_background = 0;
 
          else if (mode == PNG_ALPHA_STANDARD)
diff --git a/engine/thirdparty/libpng/pngrtran.c b/engine/thirdparty/libpng/pngrtran.c
index 12490663..a6ce30a5 100644
--- a/engine/thirdparty/libpng/pngrtran.c
+++ b/engine/thirdparty/libpng/pngrtran.c
@@ -218,9 +218,59 @@ png_set_strip_alpha(png_structrp png_ptr)
 #endif
 
 #if defined(PNG_READ_ALPHA_MODE_SUPPORTED) || defined(PNG_READ_GAMMA_SUPPORTED)
+/* PNGv3 conformance: this private API exists to resolve the now mandatory error
+ * resolution when multiple conflicting sources of gamma or colour space
+ * information are available.
+ *
+ * Terminology (assuming power law, "gamma", encodings):
+ *    "screen" gamma: a power law imposed by the output device when digital
+ *    samples are converted to visible light output.  The EOTF - volage to
+ *    luminance on output.
+ *
+ *    "file" gamma: a power law used to encode luminance levels from the input
+ *    data (the scene or the mastering display system) into digital voltages.
+ *    The OETF - luminance to voltage on input.
+ *
+ *    gamma "correction": a power law matching the **inverse** of the overall
+ *    transfer function from input luminance levels to output levels.  The
+ *    **inverse** of the OOTF; the correction "corrects" for the OOTF by aiming
+ *    to make the overall OOTF (including the correction) linear.
+ *
+ * It is important to understand this terminology because the defined terms are
+ * scattered throughout the libpng code and it is very easy to end up with the
+ * inverse of the power law required.
+ *
+ * Variable and struct::member names:
+ *    file_gamma        OETF  how the PNG data was encoded
+ *
+ *    screen_gamma      EOTF  how the screen will decode digital levels
+ *
+ *    -- not used --    OOTF  the net effect OETF x EOTF
+ *    gamma_correction        the inverse of OOTF to make the result linear
+ *
+ * All versions of libpng require a call to "png_set_gamma" to establish the
+ * "screen" gamma, the power law representing the EOTF.  png_set_gamma may also
+ * set or default the "file" gamma; the OETF.  gamma_correction is calculated
+ * internally.
+ *
+ * The earliest libpng versions required file_gamma to be supplied to set_gamma.
+ * Later versions started allowing png_set_gamma and, later, png_set_alpha_mode,
+ * to cause defaulting from the file data.
+ *
+ * PNGv3 mandated a particular form for this defaulting, one that is compatible
+ * with what libpng did except that if libpng detected inconsistencies it marked
+ * all the chunks as "invalid".  PNGv3 effectively invalidates this prior code.
+ *
+ * Behaviour implemented below:
+ *    translate_gamma_flags(gamma, is_screen)
+ *       The libpng-1.6 API for the gamma parameters to libpng APIs
+ *       (png_set_gamma and png_set_alpha_mode at present).  This allows the
+ *       'gamma' value to be passed as a png_fixed_point number or as one of a
+ *       set of integral values for specific "well known" examples of transfer
+ *       functions.  This is compatible with PNGv3.
+ */
 static png_fixed_point
-translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
-    int is_screen)
+translate_gamma_flags(png_fixed_point output_gamma, int is_screen)
 {
    /* Check for flag values.  The main reason for having the old Mac value as a
     * flag is that it is pretty near impossible to work out what the correct
@@ -230,14 +280,6 @@ translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma,
    if (output_gamma == PNG_DEFAULT_sRGB ||
       output_gamma == PNG_FP_1 / PNG_DEFAULT_sRGB)
    {
-      /* If there is no sRGB support this just sets the gamma to the standard
-       * sRGB value.  (This is a side effect of using this function!)
-       */
-#     ifdef PNG_READ_sRGB_SUPPORTED
-         png_ptr->flags |= PNG_FLAG_ASSUME_sRGB;
-#     else
-         PNG_UNUSED(png_ptr)
-#     endif
       if (is_screen != 0)
          output_gamma = PNG_GAMMA_sRGB;
       else
@@ -279,6 +321,33 @@ convert_gamma_value(png_structrp png_ptr, double output_gamma)
    return (png_fixed_point)output_gamma;
 }
 #  endif
+
+static int
+unsupported_gamma(png_structrp png_ptr, png_fixed_point gamma, int warn)
+{
+   /* Validate a gamma value to ensure it is in a reasonable range.  The value
+    * is expected to be 1 or greater, but this range test allows for some
+    * viewing correction values.  The intent is to weed out the API users
+    * who might use the inverse of the gamma value accidentally!
+    *
+    * 1.6.47: apply the test in png_set_gamma as well but only warn and return
+    * false if it fires.
+    *
+    * TODO: 1.8: make this an app_error in png_set_gamma as well.
+    */
+   if (gamma < PNG_LIB_GAMMA_MIN || gamma > PNG_LIB_GAMMA_MAX)
+   {
+#     define msg "gamma out of supported range"
+      if (warn)
+         png_app_warning(png_ptr, msg);
+      else
+         png_app_error(png_ptr, msg);
+      return 1;
+#     undef msg
+   }
+
+   return 0;
+}
 #endif /* READ_ALPHA_MODE || READ_GAMMA */
 
 #ifdef PNG_READ_ALPHA_MODE_SUPPORTED
@@ -286,31 +355,29 @@ void PNGFAPI
 png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
     png_fixed_point output_gamma)
 {
-   int compose = 0;
    png_fixed_point file_gamma;
+   int compose = 0;
 
    png_debug(1, "in png_set_alpha_mode_fixed");
 
    if (png_rtran_ok(png_ptr, 0) == 0)
       return;
 
-   output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
-
-   /* Validate the value to ensure it is in a reasonable range.  The value
-    * is expected to be 1 or greater, but this range test allows for some
-    * viewing correction values.  The intent is to weed out the API users
-    * who might use the inverse of the gamma value accidentally!
-    *
-    * In libpng 1.6.0, we changed from 0.07..3 to 0.01..100, to accommodate
-    * the optimal 16-bit gamma of 36 and its reciprocal.
-    */
-   if (output_gamma < 1000 || output_gamma > 10000000)
-      png_error(png_ptr, "output gamma out of expected range");
+   output_gamma = translate_gamma_flags(output_gamma, 1/*screen*/);
+   if (unsupported_gamma(png_ptr, output_gamma, 0/*error*/))
+      return;
 
    /* The default file gamma is the inverse of the output gamma; the output
-    * gamma may be changed below so get the file value first:
+    * gamma may be changed below so get the file value first.  The default_gamma
+    * is set here and from the simplified API (which uses a different algorithm)
+    * so don't overwrite a set value:
     */
-   file_gamma = png_reciprocal(output_gamma);
+   file_gamma = png_ptr->default_gamma;
+   if (file_gamma == 0)
+   {
+      file_gamma = png_reciprocal(output_gamma);
+      png_ptr->default_gamma = file_gamma;
+   }
 
    /* There are really 8 possibilities here, composed of any combination
     * of:
@@ -361,17 +428,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
          png_error(png_ptr, "invalid alpha mode");
    }
 
-   /* Only set the default gamma if the file gamma has not been set (this has
-    * the side effect that the gamma in a second call to png_set_alpha_mode will
-    * be ignored.)
-    */
-   if (png_ptr->colorspace.gamma == 0)
-   {
-      png_ptr->colorspace.gamma = file_gamma;
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-   }
-
-   /* But always set the output gamma: */
+   /* Set the screen gamma values: */
    png_ptr->screen_gamma = output_gamma;
 
    /* Finally, if pre-multiplying, set the background fields to achieve the
@@ -381,7 +438,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
    {
       /* And obtain alpha pre-multiplication by composing on black: */
       memset(&png_ptr->background, 0, (sizeof png_ptr->background));
-      png_ptr->background_gamma = png_ptr->colorspace.gamma; /* just in case */
+      png_ptr->background_gamma = file_gamma; /* just in case */
       png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;
       png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
 
@@ -819,8 +876,8 @@ png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
       return;
 
    /* New in libpng-1.5.4 - reserve particular negative values as flags. */
-   scrn_gamma = translate_gamma_flags(png_ptr, scrn_gamma, 1/*screen*/);
-   file_gamma = translate_gamma_flags(png_ptr, file_gamma, 0/*file*/);
+   scrn_gamma = translate_gamma_flags(scrn_gamma, 1/*screen*/);
+   file_gamma = translate_gamma_flags(file_gamma, 0/*file*/);
 
    /* Checking the gamma values for being >0 was added in 1.5.4 along with the
     * premultiplied alpha support; this actually hides an undocumented feature
@@ -834,17 +891,19 @@ png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
     * libpng-1.6.0.
     */
    if (file_gamma <= 0)
-      png_error(png_ptr, "invalid file gamma in png_set_gamma");
-
+      png_app_error(png_ptr, "invalid file gamma in png_set_gamma");
    if (scrn_gamma <= 0)
-      png_error(png_ptr, "invalid screen gamma in png_set_gamma");
+      png_app_error(png_ptr, "invalid screen gamma in png_set_gamma");
 
-   /* Set the gamma values unconditionally - this overrides the value in the PNG
-    * file if a gAMA chunk was present.  png_set_alpha_mode provides a
-    * different, easier, way to default the file gamma.
+   if (unsupported_gamma(png_ptr, file_gamma, 1/*warn*/) ||
+       unsupported_gamma(png_ptr, scrn_gamma, 1/*warn*/))
+      return;
+
+   /* 1.6.47: png_struct::file_gamma and png_struct::screen_gamma are now only
+    * written by this API.  This removes dependencies on the order of API calls
+    * and allows the complex gamma checks to be delayed until needed.
     */
-   png_ptr->colorspace.gamma = file_gamma;
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
+   png_ptr->file_gamma = file_gamma;
    png_ptr->screen_gamma = scrn_gamma;
 }
 
@@ -1022,26 +1081,9 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
          png_ptr->rgb_to_gray_coefficients_set = 1;
       }
 
-      else
-      {
-         if (red >= 0 && green >= 0)
-            png_app_warning(png_ptr,
-                "ignoring out of range rgb_to_gray coefficients");
-
-         /* Use the defaults, from the cHRM chunk if set, else the historical
-          * values which are close to the sRGB/HDTV/ITU-Rec 709 values.  See
-          * png_do_rgb_to_gray for more discussion of the values.  In this case
-          * the coefficients are not marked as 'set' and are not overwritten if
-          * something has already provided a default.
-          */
-         if (png_ptr->rgb_to_gray_red_coeff == 0 &&
-             png_ptr->rgb_to_gray_green_coeff == 0)
-         {
-            png_ptr->rgb_to_gray_red_coeff   = 6968;
-            png_ptr->rgb_to_gray_green_coeff = 23434;
-            /* png_ptr->rgb_to_gray_blue_coeff  = 2366; */
-         }
-      }
+      else if (red >= 0 && green >= 0)
+         png_app_warning(png_ptr,
+               "ignoring out of range rgb_to_gray coefficients");
    }
 }
 
@@ -1282,6 +1324,80 @@ png_init_rgb_transformations(png_structrp png_ptr)
 #endif /* READ_EXPAND && READ_BACKGROUND */
 }
 
+#ifdef PNG_READ_GAMMA_SUPPORTED
+png_fixed_point /* PRIVATE */
+png_resolve_file_gamma(png_const_structrp png_ptr)
+{
+   png_fixed_point file_gamma;
+
+   /* The file gamma is determined by these precedence rules, in this order
+    * (i.e. use the first value found):
+    *
+    *    png_set_gamma; png_struct::file_gammma if not zero, then:
+    *    png_struct::chunk_gamma if not 0 (determined the PNGv3 rules), then:
+    *    png_set_gamma; 1/png_struct::screen_gamma if not zero
+    *
+    *    0 (i.e. do no gamma handling)
+    */
+   file_gamma = png_ptr->file_gamma;
+   if (file_gamma != 0)
+      return file_gamma;
+
+   file_gamma = png_ptr->chunk_gamma;
+   if (file_gamma != 0)
+      return file_gamma;
+
+   file_gamma = png_ptr->default_gamma;
+   if (file_gamma != 0)
+      return file_gamma;
+
+   /* If png_reciprocal oveflows it returns 0 which indicates to the caller that
+    * there is no usable file gamma.  (The checks added to png_set_gamma and
+    * png_set_alpha_mode should prevent a screen_gamma which would overflow.)
+    */
+   if (png_ptr->screen_gamma != 0)
+      file_gamma = png_reciprocal(png_ptr->screen_gamma);
+
+   return file_gamma;
+}
+
+static int
+png_init_gamma_values(png_structrp png_ptr)
+{
+   /* The following temporary indicates if overall gamma correction is
+    * required.
+    */
+   int gamma_correction = 0;
+   png_fixed_point file_gamma, screen_gamma;
+
+   /* Resolve the file_gamma.  See above: if png_ptr::screen_gamma is set
+    * file_gamma will always be set here:
+    */
+   file_gamma = png_resolve_file_gamma(png_ptr);
+   screen_gamma = png_ptr->screen_gamma;
+
+   if (file_gamma > 0) /* file has been set */
+   {
+      if (screen_gamma > 0) /* screen set too */
+         gamma_correction = png_gamma_threshold(file_gamma, screen_gamma);
+
+      else
+         /* Assume the output matches the input; a long time default behavior
+          * of libpng, although the standard has nothing to say about this.
+          */
+         screen_gamma = png_reciprocal(file_gamma);
+   }
+
+   else /* both unset, prevent corrections: */
+      file_gamma = screen_gamma = PNG_FP_1;
+
+   png_ptr->file_gamma = file_gamma;
+   png_ptr->screen_gamma = screen_gamma;
+   return gamma_correction;
+
+}
+#endif /* READ_GAMMA */
+
 void /* PRIVATE */
 png_init_read_transformations(png_structrp png_ptr)
 {
@@ -1301,59 +1417,22 @@ png_init_read_transformations(png_structrp png_ptr)
     * the test needs to be performed later - here.  In addition prior to 1.5.4
     * the tests were repeated for the PALETTE color type here - this is no
     * longer necessary (and doesn't seem to have been necessary before.)
+    *
+    * PNGv3: the new mandatory precedence/priority rules for colour space chunks
+    * are handled here (by calling the above function).
+    *
+    * Turn the gamma transformation on or off as appropriate.  Notice that
+    * PNG_GAMMA just refers to the file->screen correction.  Alpha composition
+    * may independently cause gamma correction because it needs linear data
+    * (e.g. if the file has a gAMA chunk but the screen gamma hasn't been
+    * specified.)  In any case this flag may get turned off in the code
+    * immediately below if the transform can be handled outside the row loop.
     */
-   {
-      /* The following temporary indicates if overall gamma correction is
-       * required.
-       */
-      int gamma_correction = 0;
+   if (png_init_gamma_values(png_ptr) != 0)
+      png_ptr->transformations |= PNG_GAMMA;
 
-      if (png_ptr->colorspace.gamma != 0) /* has been set */
-      {
-         if (png_ptr->screen_gamma != 0) /* screen set too */
-            gamma_correction = png_gamma_threshold(png_ptr->colorspace.gamma,
-                png_ptr->screen_gamma);
-
-         else
-            /* Assume the output matches the input; a long time default behavior
-             * of libpng, although the standard has nothing to say about this.
-             */
-            png_ptr->screen_gamma = png_reciprocal(png_ptr->colorspace.gamma);
-      }
-
-      else if (png_ptr->screen_gamma != 0)
-         /* The converse - assume the file matches the screen, note that this
-          * perhaps undesirable default can (from 1.5.4) be changed by calling
-          * png_set_alpha_mode (even if the alpha handling mode isn't required
-          * or isn't changed from the default.)
-          */
-         png_ptr->colorspace.gamma = png_reciprocal(png_ptr->screen_gamma);
-
-      else /* neither are set */
-         /* Just in case the following prevents any processing - file and screen
-          * are both assumed to be linear and there is no way to introduce a
-          * third gamma value other than png_set_background with 'UNIQUE', and,
-          * prior to 1.5.4
-          */
-         png_ptr->screen_gamma = png_ptr->colorspace.gamma = PNG_FP_1;
-
-      /* We have a gamma value now. */
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_HAVE_GAMMA;
-
-      /* Now turn the gamma transformation on or off as appropriate.  Notice
-       * that PNG_GAMMA just refers to the file->screen correction.  Alpha
-       * composition may independently cause gamma correction because it needs
-       * linear data (e.g. if the file has a gAMA chunk but the screen gamma
-       * hasn't been specified.)  In any case this flag may get turned off in
-       * the code immediately below if the transform can be handled outside the
-       * row loop.
-       */
-      if (gamma_correction != 0)
-         png_ptr->transformations |= PNG_GAMMA;
-
-      else
-         png_ptr->transformations &= ~PNG_GAMMA;
-   }
+   else
+      png_ptr->transformations &= ~PNG_GAMMA;
 #endif
 
    /* Certain transformations have the effect of preventing other
@@ -1425,7 +1504,7 @@ png_init_read_transformations(png_structrp png_ptr)
     * appropriately.
     */
    if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
-      png_colorspace_set_rgb_coefficients(png_ptr);
+      png_set_rgb_coefficients(png_ptr);
 #endif
 
 #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
@@ -1568,10 +1647,10 @@ png_init_read_transformations(png_structrp png_ptr)
     */
    if ((png_ptr->transformations & PNG_GAMMA) != 0 ||
        ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 &&
-        (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+        (png_gamma_significant(png_ptr->file_gamma) != 0 ||
          png_gamma_significant(png_ptr->screen_gamma) != 0)) ||
         ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
-         (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+         (png_gamma_significant(png_ptr->file_gamma) != 0 ||
           png_gamma_significant(png_ptr->screen_gamma) != 0
 #  ifdef PNG_READ_BACKGROUND_SUPPORTED
          || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE &&
@@ -1627,8 +1706,8 @@ png_init_read_transformations(png_structrp png_ptr)
                      break;
 
                   case PNG_BACKGROUND_GAMMA_FILE:
-                     g = png_reciprocal(png_ptr->colorspace.gamma);
-                     gs = png_reciprocal2(png_ptr->colorspace.gamma,
+                     g = png_reciprocal(png_ptr->file_gamma);
+                     gs = png_reciprocal2(png_ptr->file_gamma,
                          png_ptr->screen_gamma);
                      break;
 
@@ -1736,8 +1815,8 @@ png_init_read_transformations(png_structrp png_ptr)
                   break;
 
                case PNG_BACKGROUND_GAMMA_FILE:
-                  g = png_reciprocal(png_ptr->colorspace.gamma);
-                  gs = png_reciprocal2(png_ptr->colorspace.gamma,
+                  g = png_reciprocal(png_ptr->file_gamma);
+                  gs = png_reciprocal2(png_ptr->file_gamma,
                       png_ptr->screen_gamma);
                   break;
 
@@ -1987,11 +2066,11 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
     * been called before this from png_read_update_info->png_read_start_row
     * sometimes does the gamma transform and cancels the flag.
     *
-    * TODO: this looks wrong; the info_ptr should end up with a gamma equal to
-    * the screen_gamma value.  The following probably results in weirdness if
-    * the info_ptr is used by the app after the rows have been read.
+    * TODO: this is confusing.  It only changes the result of png_get_gAMA and,
+    * yes, it does return the value that the transformed data effectively has
+    * but does any app really understand this?
     */
-   info_ptr->colorspace.gamma = png_ptr->colorspace.gamma;
+   info_ptr->gamma = png_ptr->file_gamma;
 #endif
 
    if (info_ptr->bit_depth == 16)
diff --git a/engine/thirdparty/libpng/pngrutil.c b/engine/thirdparty/libpng/pngrutil.c
index 7c609b4b..d0f3ed35 100644
--- a/engine/thirdparty/libpng/pngrutil.c
+++ b/engine/thirdparty/libpng/pngrutil.c
@@ -17,6 +17,11 @@
 
 #ifdef PNG_READ_SUPPORTED
 
+/* The minimum 'zlib' stream is assumed to be just the 2 byte header, 5 bytes
+ * minimum 'deflate' stream, and the 4 byte checksum.
+ */
+#define LZ77Min  (2U+5U+4U)
+
 #ifdef PNG_READ_INTERLACING_SUPPORTED
 /* Arrays to facilitate interlacing - use pass (0 - 6) as index. */
 
@@ -43,30 +48,6 @@ png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)
    return uval;
 }
 
-#if defined(PNG_READ_gAMA_SUPPORTED) || defined(PNG_READ_cHRM_SUPPORTED)
-/* The following is a variation on the above for use with the fixed
- * point values used for gAMA and cHRM.  Instead of png_error it
- * issues a warning and returns (-1) - an invalid value because both
- * gAMA and cHRM use *unsigned* integers for fixed point values.
- */
-#define PNG_FIXED_ERROR (-1)
-
-static png_fixed_point /* PRIVATE */
-png_get_fixed_point(png_structrp png_ptr, png_const_bytep buf)
-{
-   png_uint_32 uval = png_get_uint_32(buf);
-
-   if (uval <= PNG_UINT_31_MAX)
-      return (png_fixed_point)uval; /* known to be in range */
-
-   /* The caller can turn off the warning by passing NULL. */
-   if (png_ptr != NULL)
-      png_warning(png_ptr, "PNG fixed point integer out of range");
-
-   return PNG_FIXED_ERROR;
-}
-#endif
-
 #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
 /* NOTE: the read macros will obscure these definitions, so that if
  * PNG_USE_READ_MACROS is set the library will not use them internally,
@@ -163,6 +144,38 @@ png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
       png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
 }
 
+/* This function is called to verify that a chunk name is valid.
+ * Do this using the bit-whacking approach from contrib/tools/pngfix.c
+ *
+ * Copied from libpng 1.7.
+ */
+static int
+check_chunk_name(png_uint_32 name)
+{
+   png_uint_32 t;
+
+   /* Remove bit 5 from all but the reserved byte; this means
+    * every 8-bit unit must be in the range 65-90 to be valid.
+    * So bit 5 must be zero, bit 6 must be set and bit 7 zero.
+    */
+   name &= ~PNG_U32(32,32,0,32);
+   t = (name & ~0x1f1f1f1fU) ^ 0x40404040U;
+
+   /* Subtract 65 for each 8-bit quantity, this must not
+    * overflow and each byte must then be in the range 0-25.
+    */
+   name -= PNG_U32(65,65,65,65);
+   t |= name;
+
+   /* Subtract 26, handling the overflow which should set the
+    * top three bits of each byte.
+    */
+   name -= PNG_U32(25,25,25,26);
+   t |= ~name;
+
+   return (t & 0xe0e0e0e0U) == 0U;
+}
+
 /* Read the chunk header (length + type name).
  * Put the type name into png_ptr->chunk_name, and return the length.
  */
@@ -170,33 +183,36 @@ png_uint_32 /* PRIVATE */
 png_read_chunk_header(png_structrp png_ptr)
 {
    png_byte buf[8];
-   png_uint_32 length;
+   png_uint_32 chunk_name, length;
 
 #ifdef PNG_IO_STATE_SUPPORTED
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_HDR;
 #endif
 
-   /* Read the length and the chunk name.
-    * This must be performed in a single I/O call.
+   /* Read the length and the chunk name.  png_struct::chunk_name is immediately
+    * updated even if they are detectably wrong.  This aids error message
+    * handling by allowing png_chunk_error to be used.
     */
    png_read_data(png_ptr, buf, 8);
    length = png_get_uint_31(png_ptr, buf);
-
-   /* Put the chunk name into png_ptr->chunk_name. */
-   png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
-
-   png_debug2(0, "Reading chunk typeid = 0x%lx, length = %lu",
-       (unsigned long)png_ptr->chunk_name, (unsigned long)length);
+   png_ptr->chunk_name = chunk_name = PNG_CHUNK_FROM_STRING(buf+4);
 
    /* Reset the crc and run it over the chunk name. */
    png_reset_crc(png_ptr);
    png_calculate_crc(png_ptr, buf + 4, 4);
 
-   /* Check to see if chunk name is valid. */
-   png_check_chunk_name(png_ptr, png_ptr->chunk_name);
+   png_debug2(0, "Reading chunk typeid = 0x%lx, length = %lu",
+       (unsigned long)png_ptr->chunk_name, (unsigned long)length);
 
-   /* Check for too-large chunk length */
-   png_check_chunk_length(png_ptr, length);
+   /* Sanity check the length (first by <= 0x80) and the chunk name.  An error
+    * here indicates a broken stream and libpng has no recovery from this.
+    */
+   if (buf[0] >= 0x80U)
+      png_chunk_error(png_ptr, "bad header (invalid length)");
+
+   /* Check to see if chunk name is valid. */
+   if (!check_chunk_name(chunk_name))
+      png_chunk_error(png_ptr, "bad header (invalid type)");
 
 #ifdef PNG_IO_STATE_SUPPORTED
    png_ptr->io_state = PNG_IO_READING | PNG_IO_CHUNK_DATA;
@@ -216,59 +232,43 @@ png_crc_read(png_structrp png_ptr, png_bytep buf, png_uint_32 length)
    png_calculate_crc(png_ptr, buf, length);
 }
 
-/* Optionally skip data and then check the CRC.  Depending on whether we
- * are reading an ancillary or critical chunk, and how the program has set
- * things up, we may calculate the CRC on the data and print a message.
- * Returns '1' if there was a CRC error, '0' otherwise.
- */
-int /* PRIVATE */
-png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
-{
-   /* The size of the local buffer for inflate is a good guess as to a
-    * reasonable size to use for buffering reads from the application.
-    */
-   while (skip > 0)
-   {
-      png_uint_32 len;
-      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
-
-      len = (sizeof tmpbuf);
-      if (len > skip)
-         len = skip;
-      skip -= len;
-
-      png_crc_read(png_ptr, tmpbuf, len);
-   }
-
-   if (png_crc_error(png_ptr) != 0)
-   {
-      if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
-          (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
-          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
-      {
-         png_chunk_warning(png_ptr, "CRC error");
-      }
-
-      else
-         png_chunk_error(png_ptr, "CRC error");
-
-      return 1;
-   }
-
-   return 0;
-}
-
 /* Compare the CRC stored in the PNG file with that calculated by libpng from
  * the data it has read thus far.
  */
-int /* PRIVATE */
-png_crc_error(png_structrp png_ptr)
+static int
+png_crc_error(png_structrp png_ptr, int handle_as_ancillary)
 {
    png_byte crc_bytes[4];
    png_uint_32 crc;
    int need_crc = 1;
 
-   if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
+   /* There are four flags two for ancillary and two for critical chunks.  The
+    * default setting of these flags is all zero.
+    *
+    * PNG_FLAG_CRC_ANCILLARY_USE
+    * PNG_FLAG_CRC_ANCILLARY_NOWARN
+    *  USE+NOWARN: no CRC calculation (implemented here), else;
+    *  NOWARN:     png_chunk_error on error (implemented in png_crc_finish)
+    *  else:       png_chunk_warning on error (implemented in png_crc_finish)
+    *              This is the default.
+    *
+    *    I.e. NOWARN without USE produces png_chunk_error.  The default setting
+    *    where neither are set does the same thing.
+    *
+    * PNG_FLAG_CRC_CRITICAL_USE
+    * PNG_FLAG_CRC_CRITICAL_IGNORE
+    *  IGNORE: no CRC calculation (implemented here), else;
+    *  USE:    png_chunk_warning on error (implemented in png_crc_finish)
+    *  else:   png_chunk_error on error (implemented in png_crc_finish)
+    *          This is the default.
+    *
+    * This arose because of original mis-implementation and has persisted for
+    * compatibility reasons.
+    *
+    * TODO: the flag names are internal so maybe this can be changed to
+    * something comprehensible.
+    */
+   if (handle_as_ancillary || PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
    {
       if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
           (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
@@ -298,21 +298,87 @@ png_crc_error(png_structrp png_ptr)
       return 0;
 }
 
+/* Optionally skip data and then check the CRC.  Depending on whether we
+ * are reading an ancillary or critical chunk, and how the program has set
+ * things up, we may calculate the CRC on the data and print a message.
+ * Returns '1' if there was a CRC error, '0' otherwise.
+ *
+ * There is one public version which is used in most places and another which
+ * takes the value for the 'critical' flag to check.  This allows PLTE and IEND
+ * handling code to ignore the CRC error and removes some confusing code
+ * duplication.
+ */
+static int
+png_crc_finish_critical(png_structrp png_ptr, png_uint_32 skip,
+      int handle_as_ancillary)
+{
+   /* The size of the local buffer for inflate is a good guess as to a
+    * reasonable size to use for buffering reads from the application.
+    */
+   while (skip > 0)
+   {
+      png_uint_32 len;
+      png_byte tmpbuf[PNG_INFLATE_BUF_SIZE];
+
+      len = (sizeof tmpbuf);
+      if (len > skip)
+         len = skip;
+      skip -= len;
+
+      png_crc_read(png_ptr, tmpbuf, len);
+   }
+
+   /* If 'handle_as_ancillary' has been requested and this is a critical chunk
+    * but PNG_FLAG_CRC_CRITICAL_IGNORE was set then png_read_crc did not, in
+    * fact, calculate the CRC so the ANCILLARY settings should not be used
+    * instead.
+    */
+   if (handle_as_ancillary &&
+       (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
+      handle_as_ancillary = 0;
+
+   /* TODO: this might be more comprehensible if png_crc_error was inlined here.
+    */
+   if (png_crc_error(png_ptr, handle_as_ancillary) != 0)
+   {
+      /* See above for the explanation of how the flags work. */
+      if (handle_as_ancillary || PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
+          (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
+          (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
+         png_chunk_warning(png_ptr, "CRC error");
+
+      else
+         png_chunk_error(png_ptr, "CRC error");
+
+      return 1;
+   }
+
+   return 0;
+}
+
+int /* PRIVATE */
+png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
+{
+   return png_crc_finish_critical(png_ptr, skip, 0/*critical handling*/);
+}
+
 #if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\
     defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\
     defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\
-    defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED)
+    defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_READ_eXIf_SUPPORTED) ||\
+    defined(PNG_SEQUENTIAL_READ_SUPPORTED)
 /* Manage the read buffer; this simply reallocates the buffer if it is not small
  * enough (or if it is not allocated).  The routine returns a pointer to the
  * buffer; if an error occurs and 'warn' is set the routine returns NULL, else
- * it will call png_error (via png_malloc) on failure.  (warn == 2 means
- * 'silent').
+ * it will call png_error on failure.
  */
 static png_bytep
-png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
+png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size)
 {
    png_bytep buffer = png_ptr->read_buffer;
 
+   if (new_size > png_chunk_max(png_ptr)) return NULL;
+
    if (buffer != NULL && new_size > png_ptr->read_buffer_size)
    {
       png_ptr->read_buffer = NULL;
@@ -327,24 +393,17 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
 
       if (buffer != NULL)
       {
-         memset(buffer, 0, new_size); /* just in case */
+#        ifndef PNG_NO_MEMZERO /* for detecting UIM bugs **only** */
+            memset(buffer, 0, new_size); /* just in case */
+#        endif
          png_ptr->read_buffer = buffer;
          png_ptr->read_buffer_size = new_size;
       }
-
-      else if (warn < 2) /* else silent */
-      {
-         if (warn != 0)
-             png_chunk_warning(png_ptr, "insufficient memory to read chunk");
-
-         else
-             png_chunk_error(png_ptr, "insufficient memory to read chunk");
-      }
    }
 
    return buffer;
 }
-#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
+#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|eXIf|SEQUENTIAL_READ */
 
 /* png_inflate_claim: claim the zstream for some nefarious purpose that involves
  * decompression.  Returns Z_OK on success, else a zlib error code.  It checks
@@ -631,16 +690,7 @@ png_decompress_chunk(png_structrp png_ptr,
     * maybe a '\0' terminator too.  We have to assume that 'prefix_size' is
     * limited only by the maximum chunk size.
     */
-   png_alloc_size_t limit = PNG_SIZE_MAX;
-
-# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-# endif
+   png_alloc_size_t limit = png_chunk_max(png_ptr);
 
    if (limit >= prefix_size + (terminate != 0))
    {
@@ -845,9 +895,9 @@ png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,
 }
 #endif /* READ_iCCP */
 
+/* CHUNK HANDLING */
 /* Read and check the IDHR chunk */
-
-void /* PRIVATE */
+static png_handle_result_code
 png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[13];
@@ -857,12 +907,7 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_IHDR");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) != 0)
-      png_chunk_error(png_ptr, "out of place");
-
-   /* Check the length */
-   if (length != 13)
-      png_chunk_error(png_ptr, "invalid");
+   /* Length and position are checked by the caller. */
 
    png_ptr->mode |= PNG_HAVE_IHDR;
 
@@ -916,257 +961,196 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);
    png_debug1(3, "channels = %d", png_ptr->channels);
    png_debug1(3, "rowbytes = %lu", (unsigned long)png_ptr->rowbytes);
+
+   /* Rely on png_set_IHDR to completely validate the data and call png_error if
+    * it's wrong.
+    */
    png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
        color_type, interlace_type, compression_type, filter_type);
+
+   return handled_ok;
+   PNG_UNUSED(length)
 }
 
 /* Read and check the palette */
-void /* PRIVATE */
+/* TODO: there are several obvious errors in this code when handling
+ * out-of-place chunks and there is much over-complexity caused by trying to
+ * patch up the problems.
+ */
+static png_handle_result_code
 png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_color palette[PNG_MAX_PALETTE_LENGTH];
-   int max_palette_length, num, i;
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   png_colorp pal_ptr;
-#endif
+   png_const_charp errmsg = NULL;
 
    png_debug(1, "in png_handle_PLTE");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   /* Moved to before the 'after IDAT' check below because otherwise duplicate
-    * PLTE chunks are potentially ignored (the spec says there shall not be more
-    * than one PLTE, the error is not treated as benign, so this check trumps
-    * the requirement that PLTE appears before IDAT.)
+   /* 1.6.47: consistency.  This used to be especially treated as a critical
+    * error even in an image which is not colour mapped, there isn't a good
+    * justification for treating some errors here one way and others another so
+    * everything uses the same logic.
     */
-   else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
-      png_chunk_error(png_ptr, "duplicate");
+   if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
+      errmsg = "duplicate";
 
    else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      /* This is benign because the non-benign error happened before, when an
-       * IDAT was encountered in a color-mapped image with no PLTE.
-       */
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
+      errmsg = "out of place";
 
-   png_ptr->mode |= PNG_HAVE_PLTE;
+   else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
+      errmsg = "ignored in grayscale PNG";
 
-   if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "ignored in grayscale PNG");
-      return;
-   }
+   else if (length > 3*PNG_MAX_PALETTE_LENGTH || (length % 3) != 0)
+      errmsg = "invalid";
 
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-#endif
-
-   if (length > 3*PNG_MAX_PALETTE_LENGTH || length % 3)
-   {
-      png_crc_finish(png_ptr, length);
-
-      if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
-         png_chunk_benign_error(png_ptr, "invalid");
-
-      else
-         png_chunk_error(png_ptr, "invalid");
-
-      return;
-   }
-
-   /* The cast is safe because 'length' is less than 3*PNG_MAX_PALETTE_LENGTH */
-   num = (int)length / 3;
-
-   /* If the palette has 256 or fewer entries but is too large for the bit
-    * depth, we don't issue an error, to preserve the behavior of previous
-    * libpng versions. We silently truncate the unused extra palette entries
-    * here.
+   /* This drops PLTE in favour of tRNS or bKGD because both of those chunks
+    * can have an effect on the rendering of the image whereas PLTE only matters
+    * in the case of an 8-bit display with a decoder which controls the palette.
+    *
+    * The alternative here is to ignore the error and store the palette anyway;
+    * destroying the tRNS will definately cause problems.
+    *
+    * NOTE: the case of PNG_COLOR_TYPE_PALETTE need not be considered because
+    * the png_handle_ routines for the three 'after PLTE' chunks tRNS, bKGD and
+    * hIST all check for a preceding PLTE in these cases.
     */
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-      max_palette_length = (1 << png_ptr->bit_depth);
+   else if (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE &&
+            (png_has_chunk(png_ptr, tRNS) || png_has_chunk(png_ptr, bKGD)))
+      errmsg = "out of place";
+
    else
-      max_palette_length = PNG_MAX_PALETTE_LENGTH;
-
-   if (num > max_palette_length)
-      num = max_palette_length;
-
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
-   for (i = 0, pal_ptr = palette; i < num; i++, pal_ptr++)
    {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      pal_ptr->red = buf[0];
-      pal_ptr->green = buf[1];
-      pal_ptr->blue = buf[2];
-   }
-#else
-   for (i = 0; i < num; i++)
-   {
-      png_byte buf[3];
-
-      png_crc_read(png_ptr, buf, 3);
-      /* Don't depend upon png_color being any order */
-      palette[i].red = buf[0];
-      palette[i].green = buf[1];
-      palette[i].blue = buf[2];
-   }
-#endif
-
-   /* If we actually need the PLTE chunk (ie for a paletted image), we do
-    * whatever the normal CRC configuration tells us.  However, if we
-    * have an RGB image, the PLTE can be considered ancillary, so
-    * we will act as though it is.
-    */
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-#endif
-   {
-      png_crc_finish(png_ptr, (png_uint_32) (length - (unsigned int)num * 3));
-   }
-
-#ifndef PNG_READ_OPT_PLTE_SUPPORTED
-   else if (png_crc_error(png_ptr) != 0)  /* Only if we have a CRC error */
-   {
-      /* If we don't want to use the data from an ancillary chunk,
-       * we have two options: an error abort, or a warning and we
-       * ignore the data in this chunk (which should be OK, since
-       * it's considered ancillary for a RGB or RGBA image).
-       *
-       * IMPLEMENTATION NOTE: this is only here because png_crc_finish uses the
-       * chunk type to determine whether to check the ancillary or the critical
-       * flags.
+      /* If the palette has 256 or fewer entries but is too large for the bit
+       * depth we don't issue an error to preserve the behavior of previous
+       * libpng versions. We silently truncate the unused extra palette entries
+       * here.
        */
-      if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0)
-      {
-         if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0)
-            return;
+      const unsigned max_palette_length =
+         (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ?
+            1U << png_ptr->bit_depth : PNG_MAX_PALETTE_LENGTH;
 
-         else
-            png_chunk_error(png_ptr, "CRC error");
+      /* The cast is safe because 'length' is less than
+       * 3*PNG_MAX_PALETTE_LENGTH
+       */
+      const unsigned num = (length > 3U*max_palette_length) ?
+         max_palette_length : (unsigned)length / 3U;
+
+      unsigned i, j;
+      png_byte buf[3*PNG_MAX_PALETTE_LENGTH];
+      png_color palette[PNG_MAX_PALETTE_LENGTH];
+
+      /* Read the chunk into the buffer then read to the end of the chunk. */
+      png_crc_read(png_ptr, buf, num*3U);
+      png_crc_finish_critical(png_ptr, length - 3U*num,
+            /* Handle as ancillary if PLTE is optional: */
+            png_ptr->color_type != PNG_COLOR_TYPE_PALETTE);
+
+      for (i = 0U, j = 0U; i < num; i++)
+      {
+         palette[i].red = buf[j++];
+         palette[i].green = buf[j++];
+         palette[i].blue = buf[j++];
       }
 
-      /* Otherwise, we (optionally) emit a warning and use the chunk. */
-      else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0)
-         png_chunk_warning(png_ptr, "CRC error");
-   }
-#endif
+      /* A valid PLTE chunk has been read */
+      png_ptr->mode |= PNG_HAVE_PLTE;
 
-   /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to its
-    * own copy of the palette.  This has the side effect that when png_start_row
-    * is called (this happens after any call to png_read_update_info) the
-    * info_ptr palette gets changed.  This is extremely unexpected and
-    * confusing.
-    *
-    * Fix this by not sharing the palette in this way.
-    */
-   png_set_PLTE(png_ptr, info_ptr, palette, num);
-
-   /* The three chunks, bKGD, hIST and tRNS *must* appear after PLTE and before
-    * IDAT.  Prior to 1.6.0 this was not checked; instead the code merely
-    * checked the apparent validity of a tRNS chunk inserted before PLTE on a
-    * palette PNG.  1.6.0 attempts to rigorously follow the standard and
-    * therefore does a benign error if the erroneous condition is detected *and*
-    * cancels the tRNS if the benign error returns.  The alternative is to
-    * amend the standard since it would be rather hypocritical of the standards
-    * maintainers to ignore it.
-    */
-#ifdef PNG_READ_tRNS_SUPPORTED
-   if (png_ptr->num_trans > 0 ||
-       (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0))
-   {
-      /* Cancel this because otherwise it would be used if the transforms
-       * require it.  Don't cancel the 'valid' flag because this would prevent
-       * detection of duplicate chunks.
+      /* TODO: png_set_PLTE has the side effect of setting png_ptr->palette to
+       * its own copy of the palette.  This has the side effect that when
+       * png_start_row is called (this happens after any call to
+       * png_read_update_info) the info_ptr palette gets changed.  This is
+       * extremely unexpected and confusing.
+       *
+       * REVIEW: there have been consistent bugs in the past about gamma and
+       * similar transforms to colour mapped images being useless because the
+       * modified palette cannot be accessed because of the above.
+       *
+       * CONSIDER: Fix this by not sharing the palette in this way.  But does
+       * this completely fix the problem?
        */
-      png_ptr->num_trans = 0;
-
-      if (info_ptr != NULL)
-         info_ptr->num_trans = 0;
-
-      png_chunk_benign_error(png_ptr, "tRNS must be after");
+      png_set_PLTE(png_ptr, info_ptr, palette, num);
+      return handled_ok;
    }
-#endif
 
-#ifdef PNG_READ_hIST_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
-      png_chunk_benign_error(png_ptr, "hIST must be after");
-#endif
+   /* Here on error: errmsg is non NULL. */
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      png_crc_finish(png_ptr, length);
+      png_chunk_error(png_ptr, errmsg);
+   }
 
-#ifdef PNG_READ_bKGD_SUPPORTED
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
-      png_chunk_benign_error(png_ptr, "bKGD must be after");
-#endif
+   else /* not critical to this image */
+   {
+      png_crc_finish_critical(png_ptr, length, 1/*handle as ancillary*/);
+      png_chunk_benign_error(png_ptr, errmsg);
+   }
+
+   /* Because PNG_UNUSED(errmsg) does not work if all the uses are compiled out
+    * (this does happen).
+    */
+   return errmsg != NULL ? handled_error : handled_error;
 }
 
-void /* PRIVATE */
+/* On read the IDAT chunk is always handled specially, even if marked for
+ * unknown handling (this is allowed), so:
+ */
+#define png_handle_IDAT NULL
+
+static png_handle_result_code
 png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_debug(1, "in png_handle_IEND");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 ||
-       (png_ptr->mode & PNG_HAVE_IDAT) == 0)
-      png_chunk_error(png_ptr, "out of place");
-
    png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
 
-   png_crc_finish(png_ptr, length);
-
    if (length != 0)
       png_chunk_benign_error(png_ptr, "invalid");
 
+   png_crc_finish_critical(png_ptr, length, 1/*handle as ancillary*/);
+
+   return handled_ok;
    PNG_UNUSED(info_ptr)
 }
 
 #ifdef PNG_READ_gAMA_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code
 png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_fixed_point igamma;
+   png_uint_32 ugamma;
    png_byte buf[4];
 
    png_debug(1, "in png_handle_gAMA");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 4)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 4);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
-   igamma = png_get_fixed_point(NULL, buf);
+   ugamma = png_get_uint_32(buf);
 
-   png_colorspace_set_gamma(png_ptr, &png_ptr->colorspace, igamma);
-   png_colorspace_sync(png_ptr, info_ptr);
+   if (ugamma > PNG_UINT_31_MAX)
+   {
+      png_chunk_benign_error(png_ptr, "invalid");
+      return handled_error;
+   }
+
+   png_set_gAMA_fixed(png_ptr, info_ptr, (png_fixed_point)/*SAFE*/ugamma);
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+      /* PNGv3: chunk precedence for gamma is cICP, [iCCP], sRGB, gAMA.  gAMA is
+       * at the end of the chain so simply check for an unset value.
+       */
+      if (png_ptr->chunk_gamma == 0)
+         png_ptr->chunk_gamma = (png_fixed_point)/*SAFE*/ugamma;
+#endif /*READ_GAMMA*/
+
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_gAMA NULL
 #endif
 
 #ifdef PNG_READ_sBIT_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    unsigned int truelen, i;
@@ -1175,23 +1159,6 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_sBIT");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
    {
       truelen = 3;
@@ -1204,25 +1171,25 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       sample_depth = png_ptr->bit_depth;
    }
 
-   if (length != truelen || length > 4)
+   if (length != truelen)
    {
-      png_chunk_benign_error(png_ptr, "invalid");
       png_crc_finish(png_ptr, length);
-      return;
+      png_chunk_benign_error(png_ptr, "bad length");
+      return handled_error;
    }
 
    buf[0] = buf[1] = buf[2] = buf[3] = sample_depth;
    png_crc_read(png_ptr, buf, truelen);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    for (i=0; i<truelen; ++i)
    {
       if (buf[i] == 0 || buf[i] > sample_depth)
       {
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
    }
 
@@ -1234,7 +1201,7 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       png_ptr->sig_bit.alpha = buf[3];
    }
 
-   else
+   else /* grayscale */
    {
       png_ptr->sig_bit.gray = buf[0];
       png_ptr->sig_bit.red = buf[0];
@@ -1244,133 +1211,132 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 
    png_set_sBIT(png_ptr, info_ptr, &(png_ptr->sig_bit));
+   return handled_ok;
 }
+#else
+#  define png_handle_sBIT NULL
 #endif
 
 #ifdef PNG_READ_cHRM_SUPPORTED
-void /* PRIVATE */
+static png_int_32
+png_get_int_32_checked(png_const_bytep buf, int *error)
+{
+   png_uint_32 uval = png_get_uint_32(buf);
+   if ((uval & 0x80000000) == 0) /* non-negative */
+      return (png_int_32)uval;
+
+   uval = (uval ^ 0xffffffff) + 1;  /* 2's complement: -x = ~x+1 */
+   if ((uval & 0x80000000) == 0) /* no overflow */
+      return -(png_int_32)uval;
+
+   /* This version of png_get_int_32 has a way of returning the error to the
+    * caller, so:
+    */
+   *error = 1;
+   return 0; /* Safe */
+}
+
+static png_handle_result_code /* PRIVATE */
 png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_byte buf[32];
+   int error = 0;
    png_xy xy;
+   png_byte buf[32];
 
    png_debug(1, "in png_handle_cHRM");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 32)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 32);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
-   xy.whitex = png_get_fixed_point(NULL, buf);
-   xy.whitey = png_get_fixed_point(NULL, buf + 4);
-   xy.redx   = png_get_fixed_point(NULL, buf + 8);
-   xy.redy   = png_get_fixed_point(NULL, buf + 12);
-   xy.greenx = png_get_fixed_point(NULL, buf + 16);
-   xy.greeny = png_get_fixed_point(NULL, buf + 20);
-   xy.bluex  = png_get_fixed_point(NULL, buf + 24);
-   xy.bluey  = png_get_fixed_point(NULL, buf + 28);
+   xy.whitex = png_get_int_32_checked(buf +  0, &error);
+   xy.whitey = png_get_int_32_checked(buf +  4, &error);
+   xy.redx   = png_get_int_32_checked(buf +  8, &error);
+   xy.redy   = png_get_int_32_checked(buf + 12, &error);
+   xy.greenx = png_get_int_32_checked(buf + 16, &error);
+   xy.greeny = png_get_int_32_checked(buf + 20, &error);
+   xy.bluex  = png_get_int_32_checked(buf + 24, &error);
+   xy.bluey  = png_get_int_32_checked(buf + 28, &error);
 
-   if (xy.whitex == PNG_FIXED_ERROR ||
-       xy.whitey == PNG_FIXED_ERROR ||
-       xy.redx   == PNG_FIXED_ERROR ||
-       xy.redy   == PNG_FIXED_ERROR ||
-       xy.greenx == PNG_FIXED_ERROR ||
-       xy.greeny == PNG_FIXED_ERROR ||
-       xy.bluex  == PNG_FIXED_ERROR ||
-       xy.bluey  == PNG_FIXED_ERROR)
+   if (error)
    {
-      png_chunk_benign_error(png_ptr, "invalid values");
-      return;
+      png_chunk_benign_error(png_ptr, "invalid");
+      return handled_error;
    }
 
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
+   /* png_set_cHRM may complain about some of the values but this doesn't matter
+    * because it was a cHRM and it did have vaguely (if, perhaps, ridiculous)
+    * values.  Ridiculousity will be checked if the values are used later.
+    */
+   png_set_cHRM_fixed(png_ptr, info_ptr, xy.whitex, xy.whitey, xy.redx, xy.redy,
+         xy.greenx, xy.greeny, xy.bluex, xy.bluey);
 
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0)
-   {
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-      png_colorspace_sync(png_ptr, info_ptr);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
+   /* We only use 'chromaticities' for RGB to gray */
+#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+      /* There is no need to check sRGB here, cICP is NYI and iCCP is not
+       * supported so just check mDCV.
+       */
+      if (!png_has_chunk(png_ptr, mDCV))
+      {
+         png_ptr->chromaticities = xy;
+      }
+#  endif /* READ_RGB_TO_GRAY */
 
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-   (void)png_colorspace_set_chromaticities(png_ptr, &png_ptr->colorspace, &xy,
-       1/*prefer cHRM values*/);
-   png_colorspace_sync(png_ptr, info_ptr);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_cHRM NULL
 #endif
 
 #ifdef PNG_READ_sRGB_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte intent;
 
    png_debug(1, "in png_handle_sRGB");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   if (length != 1)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, &intent, 1);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-      return;
-
-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-    * this.
+   /* This checks the range of the "rendering intent" because it is specified in
+    * the PNG spec itself; the "reserved" values will result in the chunk not
+    * being accepted, just as they do with the various "reserved" values in
+    * IHDR.
     */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0)
+   if (intent > 3/*PNGv3 spec*/)
    {
-      png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-      png_colorspace_sync(png_ptr, info_ptr);
-      png_chunk_benign_error(png_ptr, "too many profiles");
-      return;
+      png_chunk_benign_error(png_ptr, "invalid");
+      return handled_error;
    }
 
-   (void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent);
-   png_colorspace_sync(png_ptr, info_ptr);
+   png_set_sRGB(png_ptr, info_ptr, intent);
+   /* NOTE: png_struct::chromaticities is not set here because the RGB to gray
+    * coefficients are known without a need for the chromaticities.
+    */
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+      /* PNGv3: chunk precedence for gamma is cICP, [iCCP], sRGB, gAMA.  iCCP is
+       * not supported by libpng so the only requirement is to check for cICP
+       * setting the gamma (this is NYI, but this check is safe.)
+       */
+      if (!png_has_chunk(png_ptr, cICP) || png_ptr->chunk_gamma == 0)
+         png_ptr->chunk_gamma = PNG_GAMMA_sRGB_INVERSE;
+#endif /*READ_GAMMA*/
+
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_sRGB NULL
 #endif /* READ_sRGB */
 
 #ifdef PNG_READ_iCCP_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 /* Note: this does not properly handle profiles that are > 64K under DOS */
 {
@@ -1379,44 +1345,10 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_iCCP");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   /* Consistent with all the above colorspace handling an obviously *invalid*
-    * chunk is just ignored, so does not invalidate the color space.  An
-    * alternative is to set the 'invalid' flags at the start of this routine
-    * and only clear them in they were not set before and all the tests pass.
+   /* PNGv3: allow PNG files with both sRGB and iCCP because the PNG spec only
+    * ever said that there "should" be only one, not "shall" and the PNGv3
+    * colour chunk precedence rules give a handling for this case anyway.
     */
-
-   /* The keyword must be at least one character and there is a
-    * terminator (0) byte and the compression method byte, and the
-    * 'zlib' datastream is at least 11 bytes.
-    */
-   if (length < 14)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too short");
-      return;
-   }
-
-   /* If a colorspace error has already been output skip this chunk */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      return;
-   }
-
-   /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
-    * this.
-    */
-   if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) == 0)
    {
       uInt read_length, keyword_length;
       char keyword[81];
@@ -1426,19 +1358,16 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
        */
       read_length = 81; /* maximum */
       if (read_length > length)
-         read_length = (uInt)length;
+         read_length = (uInt)/*SAFE*/length;
 
       png_crc_read(png_ptr, (png_bytep)keyword, read_length);
       length -= read_length;
 
-      /* The minimum 'zlib' stream is assumed to be just the 2 byte header,
-       * 5 bytes minimum 'deflate' stream, and the 4 byte checksum.
-       */
-      if (length < 11)
+      if (length < LZ77Min)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "too short");
-         return;
+         return handled_error;
       }
 
       keyword_length = 0;
@@ -1475,15 +1404,14 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                    */
                   png_uint_32 profile_length = png_get_uint_32(profile_header);
 
-                  if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
-                      keyword, profile_length) != 0)
+                  if (png_icc_check_length(png_ptr, keyword, profile_length) !=
+                      0)
                   {
                      /* The length is apparently ok, so we can check the 132
                       * byte header.
                       */
-                     if (png_icc_check_header(png_ptr, &png_ptr->colorspace,
-                         keyword, profile_length, profile_header,
-                         png_ptr->color_type) != 0)
+                     if (png_icc_check_header(png_ptr, keyword, profile_length,
+                              profile_header, png_ptr->color_type) != 0)
                      {
                         /* Now read the tag table; a variable size buffer is
                          * needed at this point, allocate one for the whole
@@ -1493,7 +1421,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                         png_uint_32 tag_count =
                            png_get_uint_32(profile_header + 128);
                         png_bytep profile = png_read_buffer(png_ptr,
-                            profile_length, 2/*silent*/);
+                              profile_length);
 
                         if (profile != NULL)
                         {
@@ -1512,8 +1440,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                            if (size == 0)
                            {
                               if (png_icc_check_tag_table(png_ptr,
-                                  &png_ptr->colorspace, keyword, profile_length,
-                                  profile) != 0)
+                                       keyword, profile_length, profile) != 0)
                               {
                                  /* The profile has been validated for basic
                                   * security issues, so read the whole thing in.
@@ -1545,13 +1472,6 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                     png_crc_finish(png_ptr, length);
                                     finished = 1;
 
-# if defined(PNG_sRGB_SUPPORTED) && PNG_sRGB_PROFILE_CHECKS >= 0
-                                    /* Check for a match against sRGB */
-                                    png_icc_set_sRGB(png_ptr,
-                                        &png_ptr->colorspace, profile,
-                                        png_ptr->zstream.adler);
-# endif
-
                                     /* Steal the profile for info_ptr. */
                                     if (info_ptr != NULL)
                                     {
@@ -1574,11 +1494,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                        }
 
                                        else
-                                       {
-                                          png_ptr->colorspace.flags |=
-                                             PNG_COLORSPACE_INVALID;
                                           errmsg = "out of memory";
-                                       }
                                     }
 
                                     /* else the profile remains in the read
@@ -1586,13 +1502,10 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
                                      * chunks.
                                      */
 
-                                    if (info_ptr != NULL)
-                                       png_colorspace_sync(png_ptr, info_ptr);
-
                                     if (errmsg == NULL)
                                     {
                                        png_ptr->zowner = 0;
-                                       return;
+                                       return handled_ok;
                                     }
                                  }
                                  if (errmsg == NULL)
@@ -1633,22 +1546,21 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          errmsg = "bad keyword";
    }
 
-   else
-      errmsg = "too many profiles";
-
    /* Failure: the reason is in 'errmsg' */
    if (finished == 0)
       png_crc_finish(png_ptr, length);
 
-   png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
-   png_colorspace_sync(png_ptr, info_ptr);
    if (errmsg != NULL) /* else already output */
       png_chunk_benign_error(png_ptr, errmsg);
+
+   return handled_error;
 }
+#else
+#  define png_handle_iCCP NULL
 #endif /* READ_iCCP */
 
 #ifdef PNG_READ_sPLT_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 /* Note: this does not properly handle chunks that are > 64K under DOS */
 {
@@ -1669,43 +1581,24 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_warning(png_ptr, "No space in chunk cache for sPLT");
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > 65535U)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too large to fit in memory");
-      return;
-   }
-#endif
-
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length+1);
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
 
@@ -1716,7 +1609,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, skip) != 0)
-      return;
+      return handled_error;
 
    buffer[length] = 0;
 
@@ -1729,7 +1622,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (length < 2U || entry_start > buffer + (length - 2U))
    {
       png_warning(png_ptr, "malformed sPLT chunk");
-      return;
+      return handled_error;
    }
 
    new_palette.depth = *entry_start++;
@@ -1743,7 +1636,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if ((data_length % (unsigned int)entry_size) != 0)
    {
       png_warning(png_ptr, "sPLT chunk has bad length");
-      return;
+      return handled_error;
    }
 
    dl = (png_uint_32)(data_length / (unsigned int)entry_size);
@@ -1752,7 +1645,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (dl > max_dl)
    {
       png_warning(png_ptr, "sPLT chunk too long");
-      return;
+      return handled_error;
    }
 
    new_palette.nentries = (png_int_32)(data_length / (unsigned int)entry_size);
@@ -1763,10 +1656,9 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (new_palette.entries == NULL)
    {
       png_warning(png_ptr, "sPLT chunk requires too much memory");
-      return;
+      return handled_error;
    }
 
-#ifdef PNG_POINTER_INDEXING_SUPPORTED
    for (i = 0; i < new_palette.nentries; i++)
    {
       pp = new_palette.entries + i;
@@ -1789,31 +1681,6 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
       pp->frequency = png_get_uint_16(entry_start); entry_start += 2;
    }
-#else
-   pp = new_palette.entries;
-
-   for (i = 0; i < new_palette.nentries; i++)
-   {
-
-      if (new_palette.depth == 8)
-      {
-         pp[i].red   = *entry_start++;
-         pp[i].green = *entry_start++;
-         pp[i].blue  = *entry_start++;
-         pp[i].alpha = *entry_start++;
-      }
-
-      else
-      {
-         pp[i].red   = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].green = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].blue  = png_get_uint_16(entry_start); entry_start += 2;
-         pp[i].alpha = png_get_uint_16(entry_start); entry_start += 2;
-      }
-
-      pp[i].frequency = png_get_uint_16(entry_start); entry_start += 2;
-   }
-#endif
 
    /* Discard all chunk data except the name and stash that */
    new_palette.name = (png_charp)buffer;
@@ -1821,34 +1688,20 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    png_set_sPLT(png_ptr, info_ptr, &new_palette, 1);
 
    png_free(png_ptr, new_palette.entries);
+   return handled_ok;
 }
+#else
+#  define png_handle_sPLT NULL
 #endif /* READ_sPLT */
 
 #ifdef PNG_READ_tRNS_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte readbuf[PNG_MAX_PALETTE_LENGTH];
 
    png_debug(1, "in png_handle_tRNS");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
    {
       png_byte buf[2];
@@ -1857,7 +1710,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
 
       png_crc_read(png_ptr, buf, 2);
@@ -1873,7 +1726,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
 
       png_crc_read(png_ptr, buf, length);
@@ -1887,10 +1740,9 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
       {
-         /* TODO: is this actually an error in the ISO spec? */
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "out of place");
-         return;
+         return handled_error;
       }
 
       if (length > (unsigned int) png_ptr->num_palette ||
@@ -1899,7 +1751,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "invalid");
-         return;
+         return handled_error;
       }
 
       png_crc_read(png_ptr, readbuf, length);
@@ -1910,13 +1762,13 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "invalid with alpha channel");
-      return;
+      return handled_error;
    }
 
    if (png_crc_finish(png_ptr, 0) != 0)
    {
       png_ptr->num_trans = 0;
-      return;
+      return handled_error;
    }
 
    /* TODO: this is a horrible side effect in the palette case because the
@@ -1925,11 +1777,14 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
     */
    png_set_tRNS(png_ptr, info_ptr, readbuf, png_ptr->num_trans,
        &(png_ptr->trans_color));
+   return handled_ok;
 }
+#else
+#  define png_handle_tRNS NULL
 #endif
 
 #ifdef PNG_READ_bKGD_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    unsigned int truelen;
@@ -1938,27 +1793,17 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_bKGD");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-       (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
-       (png_ptr->mode & PNG_HAVE_PLTE) == 0))
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+      if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
+      {
+         png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, "out of place");
+         return handled_error;
+      }
+
       truelen = 1;
+   }
 
    else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
       truelen = 6;
@@ -1970,13 +1815,13 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "invalid");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buf, truelen);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* We convert the index value into RGB components so that we can allow
     * arbitrary RGB values for background when we have transparency, and
@@ -1992,7 +1837,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          if (buf[0] >= info_ptr->num_palette)
          {
             png_chunk_benign_error(png_ptr, "invalid index");
-            return;
+            return handled_error;
          }
 
          background.red = (png_uint_16)png_ptr->palette[buf[0]].red;
@@ -2013,7 +1858,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          if (buf[0] != 0 || buf[1] >= (unsigned int)(1 << png_ptr->bit_depth))
          {
             png_chunk_benign_error(png_ptr, "invalid gray level");
-            return;
+            return handled_error;
          }
       }
 
@@ -2031,7 +1876,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          if (buf[0] != 0 || buf[2] != 0 || buf[4] != 0)
          {
             png_chunk_benign_error(png_ptr, "invalid color");
-            return;
+            return handled_error;
          }
       }
 
@@ -2043,116 +1888,174 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 
    png_set_bKGD(png_ptr, info_ptr, &background);
+   return handled_ok;
 }
+#else
+#  define png_handle_bKGD NULL
 #endif
 
 #ifdef PNG_READ_cICP_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_cICP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[4];
 
    png_debug(1, "in png_handle_cICP");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cICP) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   else if (length != 4)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 4);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    png_set_cICP(png_ptr, info_ptr, buf[0], buf[1],  buf[2], buf[3]);
+
+   /* We only use 'chromaticities' for RGB to gray */
+#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+      if (!png_has_chunk(png_ptr, mDCV))
+      {
+         /* TODO: png_ptr->chromaticities = chromaticities; */
+      }
+#  endif /* READ_RGB_TO_GRAY */
+
+#ifdef PNG_READ_GAMMA_SUPPORTED
+      /* PNGv3: chunk precedence for gamma is cICP, [iCCP], sRGB, gAMA.  cICP is
+       * at the head so simply set the gamma if it can be determined.  If not
+       * chunk_gamma remains unchanged; sRGB and gAMA handling check it for
+       * being zero.
+       */
+      /* TODO: set png_struct::chunk_gamma when possible */
+#endif /*READ_GAMMA*/
+
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_cICP NULL
+#endif
+
+#ifdef PNG_READ_cLLI_SUPPORTED
+static png_handle_result_code /* PRIVATE */
+png_handle_cLLI(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
+{
+   png_byte buf[8];
+
+   png_debug(1, "in png_handle_cLLI");
+
+   png_crc_read(png_ptr, buf, 8);
+
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return handled_error;
+
+   /* The error checking happens here, this puts it in just one place: */
+   png_set_cLLI_fixed(png_ptr, info_ptr, png_get_uint_32(buf),
+         png_get_uint_32(buf+4));
+   return handled_ok;
+   PNG_UNUSED(length)
+}
+#else
+#  define png_handle_cLLI NULL
+#endif
+
+#ifdef PNG_READ_mDCV_SUPPORTED
+static png_handle_result_code /* PRIVATE */
+png_handle_mDCV(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
+{
+   png_xy chromaticities;
+   png_byte buf[24];
+
+   png_debug(1, "in png_handle_mDCV");
+
+   png_crc_read(png_ptr, buf, 24);
+
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return handled_error;
+
+   /* The error checking happens here, this puts it in just one place.  The
+    * odd /50000 scaling factor makes it more difficult but the (x.y) values are
+    * only two bytes so a <<1 is safe.
+    *
+    * WARNING: the PNG specification defines the cHRM chunk to **start** with
+    * the white point (x,y).  The W3C PNG v3 specification puts the white point
+    * **after* R,G,B.  The x,y values in mDCV are also scaled by 50,000 and
+    * stored in just two bytes, whereas those in cHRM are scaled by 100,000 and
+    * stored in four bytes.  This is very, very confusing.  These APIs remove
+    * the confusion by copying the existing, well established, API.
+    */
+   chromaticities.redx   = png_get_uint_16(buf+ 0U) << 1; /* red x */
+   chromaticities.redy   = png_get_uint_16(buf+ 2U) << 1; /* red y */
+   chromaticities.greenx = png_get_uint_16(buf+ 4U) << 1; /* green x */
+   chromaticities.greeny = png_get_uint_16(buf+ 6U) << 1; /* green y */
+   chromaticities.bluex  = png_get_uint_16(buf+ 8U) << 1; /* blue x */
+   chromaticities.bluey  = png_get_uint_16(buf+10U) << 1; /* blue y */
+   chromaticities.whitex = png_get_uint_16(buf+12U) << 1; /* white x */
+   chromaticities.whitey = png_get_uint_16(buf+14U) << 1; /* white y */
+
+   png_set_mDCV_fixed(png_ptr, info_ptr,
+         chromaticities.whitex, chromaticities.whitey,
+         chromaticities.redx, chromaticities.redy,
+         chromaticities.greenx, chromaticities.greeny,
+         chromaticities.bluex, chromaticities.bluey,
+         png_get_uint_32(buf+16U), /* peak luminance */
+         png_get_uint_32(buf+20U));/* minimum perceivable luminance */
+
+   /* We only use 'chromaticities' for RGB to gray */
+#  ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+      png_ptr->chromaticities = chromaticities;
+#  endif /* READ_RGB_TO_GRAY */
+
+   return handled_ok;
+   PNG_UNUSED(length)
+}
+#else
+#  define png_handle_mDCV NULL
 #endif
 
 #ifdef PNG_READ_eXIf_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_eXIf(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   unsigned int i;
+   png_bytep buffer = NULL;
 
    png_debug(1, "in png_handle_eXIf");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
+   buffer = png_read_buffer(png_ptr, length);
 
-   if (length < 2)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too short");
-      return;
-   }
-
-   else if (info_ptr == NULL || (info_ptr->valid & PNG_INFO_eXIf) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   info_ptr->free_me |= PNG_FREE_EXIF;
-
-   info_ptr->eXIf_buf = png_voidcast(png_bytep,
-             png_malloc_warn(png_ptr, length));
-
-   if (info_ptr->eXIf_buf == NULL)
+   if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
-   for (i = 0; i < length; i++)
+   png_crc_read(png_ptr, buffer, length);
+
+   if (png_crc_finish(png_ptr, 0) != 0)
+      return handled_error;
+
+   /* PNGv3: the code used to check the byte order mark at the start for MM or
+    * II, however PNGv3 states that the the first 4 bytes should be checked.
+    * The caller ensures that there are four bytes available.
+    */
    {
-      png_byte buf[1];
-      png_crc_read(png_ptr, buf, 1);
-      info_ptr->eXIf_buf[i] = buf[0];
-      if (i == 1)
+      png_uint_32 header = png_get_uint_32(buffer);
+
+      /* These numbers are copied from the PNGv3 spec: */
+      if (header != 0x49492A00 && header != 0x4D4D002A)
       {
-         if ((buf[0] != 'M' && buf[0] != 'I') ||
-             (info_ptr->eXIf_buf[0] != buf[0]))
-         {
-            png_crc_finish(png_ptr, length - 2);
-            png_chunk_benign_error(png_ptr, "incorrect byte-order specifier");
-            png_free(png_ptr, info_ptr->eXIf_buf);
-            info_ptr->eXIf_buf = NULL;
-            return;
-         }
+         png_chunk_benign_error(png_ptr, "invalid");
+         return handled_error;
       }
    }
 
-   if (png_crc_finish(png_ptr, 0) == 0)
-      png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf);
-
-   png_free(png_ptr, info_ptr->eXIf_buf);
-   info_ptr->eXIf_buf = NULL;
+   png_set_eXIf_1(png_ptr, info_ptr, length, buffer);
+   return handled_ok;
 }
+#else
+#  define png_handle_eXIf NULL
 #endif
 
 #ifdef PNG_READ_hIST_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    unsigned int num, i;
@@ -2160,25 +2063,13 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_hIST");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
-       (png_ptr->mode & PNG_HAVE_PLTE) == 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   num = length / 2 ;
+   /* This cast is safe because the chunk definition limits the length to a
+    * maximum of 1024 bytes.
+    *
+    * TODO: maybe use png_uint_32 anyway, not unsigned int, to reduce the
+    * casts.
+    */
+   num = (unsigned int)length / 2 ;
 
    if (length != num * 2 ||
        num != (unsigned int)png_ptr->num_palette ||
@@ -2186,7 +2077,7 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "invalid");
-      return;
+      return handled_error;
    }
 
    for (i = 0; i < num; i++)
@@ -2198,14 +2089,17 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    png_set_hIST(png_ptr, info_ptr, readbuf);
+   return handled_ok;
 }
+#else
+#  define png_handle_hIST NULL
 #endif
 
 #ifdef PNG_READ_pHYs_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[9];
@@ -2214,44 +2108,24 @@ png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_pHYs");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 9);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    res_x = png_get_uint_32(buf);
    res_y = png_get_uint_32(buf + 4);
    unit_type = buf[8];
    png_set_pHYs(png_ptr, info_ptr, res_x, res_y, unit_type);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_pHYs NULL
 #endif
 
 #ifdef PNG_READ_oFFs_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[9];
@@ -2260,45 +2134,25 @@ png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_oFFs");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   if (length != 9)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 9);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    offset_x = png_get_int_32(buf);
    offset_y = png_get_int_32(buf + 4);
    unit_type = buf[8];
    png_set_oFFs(png_ptr, info_ptr, offset_x, offset_y, unit_type);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_oFFs NULL
 #endif
 
 #ifdef PNG_READ_pCAL_SUPPORTED
 /* Read the pCAL chunk (described in the PNG Extensions document) */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_int_32 X0, X1;
@@ -2308,40 +2162,22 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    int i;
 
    png_debug(1, "in png_handle_pCAL");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
    png_debug1(2, "Allocating and reading pCAL chunk data (%u bytes)",
        length + 1);
 
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    buffer[length] = 0; /* Null terminate the last string */
 
@@ -2357,7 +2193,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (endptr - buf <= 12)
    {
       png_chunk_benign_error(png_ptr, "invalid");
-      return;
+      return handled_error;
    }
 
    png_debug(3, "Reading pCAL X0, X1, type, nparams, and units");
@@ -2377,7 +2213,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
        (type == PNG_EQUATION_HYPERBOLIC && nparams != 4))
    {
       png_chunk_benign_error(png_ptr, "invalid parameter count");
-      return;
+      return handled_error;
    }
 
    else if (type >= PNG_EQUATION_LAST)
@@ -2396,7 +2232,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    if (params == NULL)
    {
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    /* Get pointers to the start of each parameter string. */
@@ -2414,20 +2250,29 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       {
          png_free(png_ptr, params);
          png_chunk_benign_error(png_ptr, "invalid data");
-         return;
+         return handled_error;
       }
    }
 
    png_set_pCAL(png_ptr, info_ptr, (png_charp)buffer, X0, X1, type, nparams,
        (png_charp)units, params);
 
+   /* TODO: BUG: png_set_pCAL calls png_chunk_report which, in this case, calls
+    * png_benign_error and that can error out.
+    *
+    * png_read_buffer needs to be allocated with space for both nparams and the
+    * parameter strings.  Not hard to do.
+    */
    png_free(png_ptr, params);
+   return handled_ok;
 }
+#else
+#  define png_handle_pCAL NULL
 #endif
 
 #ifdef PNG_READ_sCAL_SUPPORTED
 /* Read the sCAL chunk */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_bytep buffer;
@@ -2435,55 +2280,29 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    int state;
 
    png_debug(1, "in png_handle_sCAL");
-
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "out of place");
-      return;
-   }
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
-   /* Need unit type, width, \0, height: minimum 4 bytes */
-   else if (length < 4)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_debug1(2, "Allocating and reading sCAL chunk data (%u bytes)",
        length + 1);
 
-   buffer = png_read_buffer(png_ptr, length+1, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
-      png_chunk_benign_error(png_ptr, "out of memory");
       png_crc_finish(png_ptr, length);
-      return;
+      png_chunk_benign_error(png_ptr, "out of memory");
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
    buffer[length] = 0; /* Null terminate the last string */
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* Validate the unit. */
    if (buffer[0] != 1 && buffer[0] != 2)
    {
       png_chunk_benign_error(png_ptr, "invalid unit");
-      return;
+      return handled_error;
    }
 
    /* Validate the ASCII numbers, need two ASCII numbers separated by
@@ -2512,15 +2331,22 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          png_chunk_benign_error(png_ptr, "non-positive height");
 
       else
+      {
          /* This is the (only) success case. */
          png_set_sCAL_s(png_ptr, info_ptr, buffer[0],
              (png_charp)buffer+1, (png_charp)buffer+heighti);
+         return handled_ok;
+      }
    }
+
+   return handled_error;
 }
+#else
+#  define png_handle_sCAL NULL
 #endif
 
 #ifdef PNG_READ_tIME_SUPPORTED
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_byte buf[7];
@@ -2528,30 +2354,17 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    png_debug(1, "in png_handle_tIME");
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
-   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "duplicate");
-      return;
-   }
-
+   /* TODO: what is this doing here?  It should be happened in pngread.c and
+    * pngpread.c, although it could be moved to png_handle_chunk below and
+    * thereby avoid some code duplication.
+    */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-   if (length != 7)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "invalid");
-      return;
-   }
-
    png_crc_read(png_ptr, buf, 7);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    mod_time.second = buf[6];
    mod_time.minute = buf[5];
@@ -2561,12 +2374,16 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    mod_time.year = png_get_uint_16(buf);
 
    png_set_tIME(png_ptr, info_ptr, &mod_time);
+   return handled_ok;
+   PNG_UNUSED(length)
 }
+#else
+#  define png_handle_tIME NULL
 #endif
 
 #ifdef PNG_READ_tEXt_SUPPORTED
 /* Note: this does not properly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_text  text_info;
@@ -2583,45 +2400,35 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
+   /* TODO: this doesn't work and shouldn't be necessary. */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-#ifdef PNG_MAX_MALLOC_64K
-   if (length > 65535U)
-   {
-      png_crc_finish(png_ptr, length);
-      png_chunk_benign_error(png_ptr, "too large to fit in memory");
-      return;
-   }
-#endif
-
-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
+      png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, skip) != 0)
-      return;
+      return handled_error;
 
    key = (png_charp)buffer;
    key[length] = 0;
@@ -2640,14 +2447,19 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    text_info.text = text;
    text_info.text_length = strlen(text);
 
-   if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0)
-      png_warning(png_ptr, "Insufficient memory to process text chunk");
+   if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) == 0)
+      return handled_ok;
+
+   png_chunk_benign_error(png_ptr, "out of memory");
+   return handled_error;
 }
+#else
+#  define png_handle_tEXt NULL
 #endif
 
 #ifdef PNG_READ_zTXt_SUPPORTED
 /* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_const_charp errmsg = NULL;
@@ -2662,40 +2474,39 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
+   /* TODO: should not be necessary. */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
    /* Note, "length" is sufficient here; we won't be adding
-    * a null terminator later.
+    * a null terminator later.  The limit check in png_handle_chunk should be
+    * sufficient.
     */
-   buffer = png_read_buffer(png_ptr, length, 2/*silent*/);
+   buffer = png_read_buffer(png_ptr, length);
 
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* TODO: also check that the keyword contents match the spec! */
    for (keyword_length = 0;
@@ -2748,8 +2559,10 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
             text.lang = NULL;
             text.lang_key = NULL;
 
-            if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-               errmsg = "insufficient memory";
+            if (png_set_text_2(png_ptr, info_ptr, &text, 1) == 0)
+               return handled_ok;
+
+            errmsg = "out of memory";
          }
       }
 
@@ -2757,14 +2570,16 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          errmsg = png_ptr->zstream.msg;
    }
 
-   if (errmsg != NULL)
-      png_chunk_benign_error(png_ptr, errmsg);
+   png_chunk_benign_error(png_ptr, errmsg);
+   return handled_error;
 }
+#else
+#  define png_handle_zTXt NULL
 #endif
 
 #ifdef PNG_READ_iTXt_SUPPORTED
 /* Note: this does not correctly handle chunks that are > 64K under DOS */
-void /* PRIVATE */
+static png_handle_result_code /* PRIVATE */
 png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
    png_const_charp errmsg = NULL;
@@ -2779,37 +2594,35 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
       if (png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
-         return;
+         return handled_error;
       }
 
       if (--png_ptr->user_chunk_cache_max == 1)
       {
          png_crc_finish(png_ptr, length);
          png_chunk_benign_error(png_ptr, "no space in chunk cache");
-         return;
+         return handled_error;
       }
    }
 #endif
 
-   if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
-      png_chunk_error(png_ptr, "missing IHDR");
-
+   /* TODO: should not be necessary. */
    if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
       png_ptr->mode |= PNG_AFTER_IDAT;
 
-   buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
+   buffer = png_read_buffer(png_ptr, length+1);
 
    if (buffer == NULL)
    {
       png_crc_finish(png_ptr, length);
       png_chunk_benign_error(png_ptr, "out of memory");
-      return;
+      return handled_error;
    }
 
    png_crc_read(png_ptr, buffer, length);
 
    if (png_crc_finish(png_ptr, 0) != 0)
-      return;
+      return handled_error;
 
    /* First the keyword. */
    for (prefix_length=0;
@@ -2899,8 +2712,10 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
          text.text_length = 0;
          text.itxt_length = uncompressed_length;
 
-         if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
-            errmsg = "insufficient memory";
+         if (png_set_text_2(png_ptr, info_ptr, &text, 1) == 0)
+            return handled_ok;
+
+         errmsg = "out of memory";
       }
    }
 
@@ -2909,7 +2724,10 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 
    if (errmsg != NULL)
       png_chunk_benign_error(png_ptr, errmsg);
+   return handled_error;
 }
+#else
+#  define png_handle_iTXt NULL
 #endif
 
 #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
@@ -2917,7 +2735,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 static int
 png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
 {
-   png_alloc_size_t limit = PNG_SIZE_MAX;
+   const png_alloc_size_t limit = png_chunk_max(png_ptr);
 
    if (png_ptr->unknown_chunk.data != NULL)
    {
@@ -2925,16 +2743,6 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
       png_ptr->unknown_chunk.data = NULL;
    }
 
-#  ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-
-#  elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-#  endif
-
    if (length <= limit)
    {
       PNG_CSTRING_FROM_CHUNK(png_ptr->unknown_chunk.name, png_ptr->chunk_name);
@@ -2973,11 +2781,11 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
 #endif /* READ_UNKNOWN_CHUNKS */
 
 /* Handle an unknown, or known but disabled, chunk */
-void /* PRIVATE */
+png_handle_result_code /*PRIVATE*/
 png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
     png_uint_32 length, int keep)
 {
-   int handled = 0; /* the chunk was handled */
+   png_handle_result_code handled = handled_discarded; /* the default */
 
    png_debug(1, "in png_handle_unknown");
 
@@ -3024,7 +2832,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
           *           error at this point unless it is to be saved.
           * positive: The chunk was handled, libpng will ignore/discard it.
           */
-         if (ret < 0)
+         if (ret < 0) /* handled_error */
             png_chunk_error(png_ptr, "error in user chunk");
 
          else if (ret == 0)
@@ -3058,7 +2866,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
 
          else /* chunk was handled */
          {
-            handled = 1;
+            handled = handled_ok;
             /* Critical chunks can be safely discarded at this point. */
             keep = PNG_HANDLE_CHUNK_NEVER;
          }
@@ -3143,7 +2951,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
              */
             png_set_unknown_chunks(png_ptr, info_ptr,
                 &png_ptr->unknown_chunk, 1);
-            handled = 1;
+            handled = handled_saved;
 #  ifdef PNG_USER_LIMITS_SUPPORTED
             break;
       }
@@ -3169,79 +2977,267 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
 #endif /* !READ_UNKNOWN_CHUNKS */
 
    /* Check for unhandled critical chunks */
-   if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
+   if (handled < handled_saved && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
       png_chunk_error(png_ptr, "unhandled critical chunk");
+
+   return handled;
 }
 
-/* This function is called to verify that a chunk name is valid.
- * This function can't have the "critical chunk check" incorporated
- * into it, since in the future we will need to be able to call user
- * functions to handle unknown critical chunks after we check that
- * the chunk name itself is valid.
- */
-
-/* Bit hacking: the test for an invalid byte in the 4 byte chunk name is:
+/* APNG handling: the minimal implementation of APNG handling in libpng 1.6
+ * requires that those significant applications which already handle APNG not
+ * get hosed.  To do this ensure the code here will have to ensure than APNG
+ * data by default (at least in 1.6) gets stored in the unknown chunk list.
+ * Maybe this can be relaxed in a few years but at present it's just the only
+ * safe way.
  *
- * ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+ * ATM just cause unknown handling for all three chunks:
  */
+#define png_handle_acTL NULL
+#define png_handle_fcTL NULL
+#define png_handle_fdAT NULL
 
-void /* PRIVATE */
-png_check_chunk_name(png_const_structrp png_ptr, png_uint_32 chunk_name)
+/*
+ * 1.6.47: This is the new table driven interface to all the chunk handling.
+ *
+ * The table describes the PNG standard rules for **reading** known chunks -
+ * every chunk which has an entry in PNG_KNOWN_CHUNKS.  The table contains an
+ * entry for each PNG_INDEX_cHNK describing the rules.
+ *
+ * In this initial version the only information in the entry is the
+ * png_handle_cHNK function for the chunk in question.  When chunk support is
+ * compiled out the entry will be NULL.
+ */
+static const struct
 {
-   int i;
-   png_uint_32 cn=chunk_name;
+   png_handle_result_code (*handler)(
+         png_structrp, png_inforp, png_uint_32 length);
+      /* A chunk-specific 'handler', NULL if the chunk is not supported in this
+       * build.
+       */
 
-   png_debug(1, "in png_check_chunk_name");
+   /* Crushing these values helps on modern 32-bit architectures because the
+    * pointer and the following bit fields both end up requiring 32 bits.
+    * Typically this will halve the table size.  On 64-bit architectures the
+    * table entries will typically be 8 bytes.
+    */
+   png_uint_32 max_length :12; /* Length min, max in bytes */
+   png_uint_32 min_length :8;
+      /* Length errors on critical chunks have special handling to preserve the
+       * existing behaviour in libpng 1.6.  Anciallary chunks are checked below
+       * and produce a 'benign' error.
+       */
+   png_uint_32 pos_before :4; /* PNG_HAVE_ values chunk must precede */
+   png_uint_32 pos_after  :4; /* PNG_HAVE_ values chunk must follow */
+      /* NOTE: PLTE, tRNS and bKGD require special handling which depends on
+       * the colour type of the base image.
+       */
+   png_uint_32 multiple   :1; /* Multiple occurences permitted */
+      /* This is enabled for PLTE because PLTE may, in practice, be optional */
+}
+read_chunks[PNG_INDEX_unknown] =
+{
+   /* Definitions as above but done indirectly by #define so that
+    * PNG_KNOWN_CHUNKS can be used safely to build the table in order.
+    *
+    * Each CDcHNK definition lists the values for the parameters **after**
+    * the first, 'handler', function.  'handler' is NULL when the chunk has no
+    * compiled in support.
+    */
+#  define NoCheck 0x801U      /* Do not check the maximum length */
+#  define Limit   0x802U      /* Limit to png_chunk_max bytes */
+#  define LKMin   3U+LZ77Min  /* Minimum length of keyword+LZ77 */
 
-   for (i=1; i<=4; ++i)
+#define hIHDR PNG_HAVE_IHDR
+#define hPLTE PNG_HAVE_PLTE
+#define hIDAT PNG_HAVE_IDAT
+   /* For the two chunks, tRNS and bKGD which can occur in PNGs without a PLTE
+    * but must occur after the PLTE use this and put the check in the handler
+    * routine for colour mapped images were PLTE is required.  Also put a check
+    * in PLTE for other image types to drop the PLTE if tRNS or bKGD have been
+    * seen.
+    */
+#define hCOL  (PNG_HAVE_PLTE|PNG_HAVE_IDAT)
+   /* Used for the decoding chunks which must be before PLTE. */
+#define aIDAT PNG_AFTER_IDAT
+
+   /* Chunks from W3C PNG v3: */
+   /*       cHNK  max_len,   min, before, after, multiple */
+#  define CDIHDR      13U,   13U,  hIHDR,     0,        0
+#  define CDPLTE  NoCheck,    0U,      0, hIHDR,        1
+      /* PLTE errors are only critical for colour-map images, consequently the
+       * hander does all the checks.
+       */
+#  define CDIDAT  NoCheck,    0U,  aIDAT, hIHDR,        1
+#  define CDIEND  NoCheck,    0U,      0, aIDAT,        0
+      /* Historically data was allowed in IEND */
+#  define CDtRNS     256U,    0U,  hIDAT, hIHDR,        0
+#  define CDcHRM      32U,   32U,   hCOL, hIHDR,        0
+#  define CDgAMA       4U,    4U,   hCOL, hIHDR,        0
+#  define CDiCCP  NoCheck, LKMin,   hCOL, hIHDR,        0
+#  define CDsBIT       4U,    1U,   hCOL, hIHDR,        0
+#  define CDsRGB       1U,    1U,   hCOL, hIHDR,        0
+#  define CDcICP       4U,    4U,   hCOL, hIHDR,        0
+#  define CDmDCV      24U,   24U,   hCOL, hIHDR,        0
+#  define CDeXIf    Limit,    4U,      0, hIHDR,        0
+#  define CDcLLI       8U,    8U,   hCOL, hIHDR,        0
+#  define CDtEXt  NoCheck,    2U,      0, hIHDR,        1
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDzTXt    Limit, LKMin,      0, hIHDR,        1
+#  define CDiTXt  NoCheck,    6U,      0, hIHDR,        1
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDbKGD       6U,    1U,  hIDAT, hIHDR,        0
+#  define CDhIST    1024U,    0U,  hPLTE, hIHDR,        0
+#  define CDpHYs       9U,    9U,  hIDAT, hIHDR,        0
+#  define CDsPLT  NoCheck,    3U,  hIDAT, hIHDR,        1
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDtIME       7U,    7U,      0, hIHDR,        0
+#  define CDacTL       8U,    8U,  hIDAT, hIHDR,        0
+#  define CDfcTL      25U,   26U,      0, hIHDR,        1
+#  define CDfdAT    Limit,    4U,  hIDAT, hIHDR,        1
+   /* Supported chunks from PNG extensions 1.5.0, NYI so limit */
+#  define CDoFFs       9U,    9U,  hIDAT, hIHDR,        0
+#  define CDpCAL  NoCheck,   14U,  hIDAT, hIHDR,        0
+      /* Allocates 'length+1'; checked in the handler */
+#  define CDsCAL    Limit,    4U,  hIDAT, hIHDR,        0
+      /* Allocates 'length+1'; checked in the handler */
+
+#  define PNG_CHUNK(cHNK, index) { png_handle_ ## cHNK, CD ## cHNK },
+   PNG_KNOWN_CHUNKS
+#  undef PNG_CHUNK
+};
+
+
+static png_index
+png_chunk_index_from_name(png_uint_32 chunk_name)
+{
+   /* For chunk png_cHNK return PNG_INDEX_cHNK.  Return PNG_INDEX_unknown if
+    * chunk_name is not known.  Notice that in a particular build "known" does
+    * not necessarily mean "supported", although the inverse applies.
+    */
+   switch (chunk_name)
    {
-      int c = cn & 0xff;
+#     define PNG_CHUNK(cHNK, index)\
+         case png_ ## cHNK: return PNG_INDEX_ ## cHNK; /* == index */
 
-      if (c < 65 || c > 122 || (c > 90 && c < 97))
-         png_chunk_error(png_ptr, "invalid chunk type");
+      PNG_KNOWN_CHUNKS
 
-      cn >>= 8;
+#     undef PNG_CHUNK
+
+      default: return PNG_INDEX_unknown;
    }
 }
 
-void /* PRIVATE */
-png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length)
+png_handle_result_code /*PRIVATE*/
+png_handle_chunk(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
 {
-   png_alloc_size_t limit = PNG_UINT_31_MAX;
+   /* CSE: these things don't change, these autos are just to save typing and
+    * make the code more clear.
+    */
+   const png_uint_32 chunk_name = png_ptr->chunk_name;
+   const png_index chunk_index = png_chunk_index_from_name(chunk_name);
 
-# ifdef PNG_SET_USER_LIMITS_SUPPORTED
-   if (png_ptr->user_chunk_malloc_max > 0 &&
-       png_ptr->user_chunk_malloc_max < limit)
-      limit = png_ptr->user_chunk_malloc_max;
-# elif PNG_USER_CHUNK_MALLOC_MAX > 0
-   if (PNG_USER_CHUNK_MALLOC_MAX < limit)
-      limit = PNG_USER_CHUNK_MALLOC_MAX;
-# endif
-   if (png_ptr->chunk_name == png_IDAT)
+   png_handle_result_code handled = handled_error;
+   png_const_charp errmsg = NULL;
+
+   /* Is this a known chunk?  If not there are no checks performed here;
+    * png_handle_unknown does the correct checks.  This means that the values
+    * for known but unsupported chunks in the above table are not used here
+    * however the chunks_seen fields in png_struct are still set.
+    */
+   if (chunk_index == PNG_INDEX_unknown ||
+       read_chunks[chunk_index].handler == NULL)
    {
-      png_alloc_size_t idat_limit = PNG_UINT_31_MAX;
-      size_t row_factor =
-         (size_t)png_ptr->width
-         * (size_t)png_ptr->channels
-         * (png_ptr->bit_depth > 8? 2: 1)
-         + 1
-         + (png_ptr->interlaced? 6: 0);
-      if (png_ptr->height > PNG_UINT_32_MAX/row_factor)
-         idat_limit = PNG_UINT_31_MAX;
-      else
-         idat_limit = png_ptr->height * row_factor;
-      row_factor = row_factor > 32566? 32566 : row_factor;
-      idat_limit += 6 + 5*(idat_limit/row_factor+1); /* zlib+deflate overhead */
-      idat_limit=idat_limit < PNG_UINT_31_MAX? idat_limit : PNG_UINT_31_MAX;
-      limit = limit < idat_limit? idat_limit : limit;
+      handled = png_handle_unknown(
+            png_ptr, info_ptr, length, PNG_HANDLE_CHUNK_AS_DEFAULT);
    }
 
-   if (length > limit)
+   /* First check the position.   The first check is historical; the stream must
+    * start with IHDR and anything else causes libpng to give up immediately.
+    */
+   else if (chunk_index != PNG_INDEX_IHDR &&
+            (png_ptr->mode & PNG_HAVE_IHDR) == 0)
+      png_chunk_error(png_ptr, "missing IHDR"); /* NORETURN */
+
+   /* Before all the pos_before chunks, after all the pos_after chunks. */
+   else if (((png_ptr->mode & read_chunks[chunk_index].pos_before) != 0) ||
+            ((png_ptr->mode & read_chunks[chunk_index].pos_after) !=
+             read_chunks[chunk_index].pos_after))
    {
-      png_debug2(0," length = %lu, limit = %lu",
-         (unsigned long)length,(unsigned long)limit);
-      png_benign_error(png_ptr, "chunk data is too large");
+      errmsg = "out of place";
    }
+
+   /* Now check for duplicates: duplicated critical chunks also produce a
+    * full error.
+    */
+   else if (read_chunks[chunk_index].multiple == 0 &&
+            png_file_has_chunk(png_ptr, chunk_index))
+   {
+      errmsg = "duplicate";
+   }
+
+   else if (length < read_chunks[chunk_index].min_length)
+      errmsg = "too short";
+   else
+   {
+      /* NOTE: apart from IHDR the critical chunks (PLTE, IDAT and IEND) are set
+       * up above not to do any length checks.
+       *
+       * The png_chunk_max check ensures that the variable length chunks are
+       * always checked at this point for being within the system allocation
+       * limits.
+       */
+      unsigned max_length = read_chunks[chunk_index].max_length;
+
+      switch (max_length)
+      {
+         case Limit:
+            /* png_read_chunk_header has already png_error'ed chunks with a
+             * length exceeding the 31-bit PNG limit, so just check the memory
+             * limit:
+             */
+            if (length <= png_chunk_max(png_ptr))
+               goto MeetsLimit;
+
+            errmsg = "length exceeds libpng limit";
+            break;
+
+         default:
+            if (length <= max_length)
+               goto MeetsLimit;
+
+            errmsg = "too long";
+            break;
+
+         case NoCheck:
+         MeetsLimit:
+            handled = read_chunks[chunk_index].handler(
+                  png_ptr, info_ptr, length);
+            break;
+      }
+   }
+
+   /* If there was an error or the chunk was simply skipped it is not counted as
+    * 'seen'.
+    */
+   if (errmsg != NULL)
+   {
+      if (PNG_CHUNK_CRITICAL(chunk_name)) /* stop immediately */
+         png_chunk_error(png_ptr, errmsg);
+      else /* ancillary chunk */
+      {
+         /* The chunk data is skipped: */
+         png_crc_finish(png_ptr, length);
+         png_chunk_benign_error(png_ptr, errmsg);
+      }
+   }
+
+   else if (handled >= handled_saved)
+   {
+      if (chunk_index != PNG_INDEX_unknown)
+         png_file_add_chunk(png_ptr, chunk_index);
+   }
+
+   return handled;
 }
 
 /* Combines the row recently read in with the existing pixels in the row.  This
@@ -4231,6 +4227,9 @@ png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
 
          avail_in = png_ptr->IDAT_read_size;
 
+         if (avail_in > png_chunk_max(png_ptr))
+            avail_in = (uInt)/*SAFE*/png_chunk_max(png_ptr);
+
          if (avail_in > png_ptr->idat_size)
             avail_in = (uInt)png_ptr->idat_size;
 
@@ -4238,8 +4237,13 @@ png_read_IDAT_data(png_structrp png_ptr, png_bytep output,
           * to minimize memory usage by causing lots of re-allocs, but
           * realistically doing IDAT_read_size re-allocs is not likely to be a
           * big problem.
+          *
+          * An error here corresponds to the system being out of memory.
           */
-         buffer = png_read_buffer(png_ptr, avail_in, 0/*error*/);
+         buffer = png_read_buffer(png_ptr, avail_in);
+
+         if (buffer == NULL)
+            png_chunk_error(png_ptr, "out of memory");
 
          png_crc_read(png_ptr, buffer, avail_in);
          png_ptr->idat_size -= avail_in;
diff --git a/engine/thirdparty/libpng/pngset.c b/engine/thirdparty/libpng/pngset.c
index 462b50cf..d7f3393c 100644
--- a/engine/thirdparty/libpng/pngset.c
+++ b/engine/thirdparty/libpng/pngset.c
@@ -41,27 +41,21 @@ png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
     png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y,
     png_fixed_point blue_x, png_fixed_point blue_y)
 {
-   png_xy xy;
-
    png_debug1(1, "in %s storage function", "cHRM fixed");
 
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   xy.redx = red_x;
-   xy.redy = red_y;
-   xy.greenx = green_x;
-   xy.greeny = green_y;
-   xy.bluex = blue_x;
-   xy.bluey = blue_y;
-   xy.whitex = white_x;
-   xy.whitey = white_y;
+   info_ptr->cHRM.redx = red_x;
+   info_ptr->cHRM.redy = red_y;
+   info_ptr->cHRM.greenx = green_x;
+   info_ptr->cHRM.greeny = green_y;
+   info_ptr->cHRM.bluex = blue_x;
+   info_ptr->cHRM.bluey = blue_y;
+   info_ptr->cHRM.whitex = white_x;
+   info_ptr->cHRM.whitey = white_y;
 
-   if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,
-       2/* override with app values*/) != 0)
-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
-
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   info_ptr->valid |= PNG_INFO_cHRM;
 }
 
 void PNGFAPI
@@ -73,6 +67,7 @@ png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
     png_fixed_point int_blue_Z)
 {
    png_XYZ XYZ;
+   png_xy xy;
 
    png_debug1(1, "in %s storage function", "cHRM XYZ fixed");
 
@@ -89,11 +84,14 @@ png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
    XYZ.blue_Y = int_blue_Y;
    XYZ.blue_Z = int_blue_Z;
 
-   if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,
-       &XYZ, 2) != 0)
-      info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
+   if (png_xy_from_XYZ(&xy, &XYZ) == 0)
+   {
+      info_ptr->cHRM = xy;
+      info_ptr->valid |= PNG_INFO_cHRM;
+   }
 
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   else
+      png_app_error(png_ptr, "invalid cHRM XYZ");
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -159,6 +157,166 @@ png_set_cICP(png_const_structrp png_ptr, png_inforp info_ptr,
 }
 #endif /* cICP */
 
+#ifdef PNG_cLLI_SUPPORTED
+void PNGFAPI
+png_set_cLLI_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
+    /* The values below are in cd/m2 (nits) and are scaled by 10,000; not
+     * 100,000 as in the case of png_fixed_point.
+     */
+    png_uint_32 maxCLL, png_uint_32 maxFALL)
+{
+   png_debug1(1, "in %s storage function", "cLLI");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check the light level range: */
+   if (maxCLL > 0x7FFFFFFFU || maxFALL > 0x7FFFFFFFU)
+   {
+      /* The limit is 200kcd/m2; somewhat bright but not inconceivable because
+       * human vision is said to run up to 100Mcd/m2.  The sun is about 2Gcd/m2.
+       *
+       * The reference sRGB monitor is 80cd/m2 and the limit of PQ encoding is
+       * 2kcd/m2.
+       */
+      png_chunk_report(png_ptr, "cLLI light level exceeds PNG limit",
+            PNG_CHUNK_WRITE_ERROR);
+      return;
+   }
+
+   info_ptr->maxCLL = maxCLL;
+   info_ptr->maxFALL = maxFALL;
+   info_ptr->valid |= PNG_INFO_cLLI;
+}
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_cLLI(png_const_structrp png_ptr, png_inforp info_ptr,
+   double maxCLL, double maxFALL)
+{
+   png_set_cLLI_fixed(png_ptr, info_ptr,
+       png_fixed_ITU(png_ptr, maxCLL, "png_set_cLLI(maxCLL)"),
+       png_fixed_ITU(png_ptr, maxFALL, "png_set_cLLI(maxFALL)"));
+}
+#  endif /* FLOATING_POINT */
+#endif /* cLLI */
+
+#ifdef PNG_mDCV_SUPPORTED
+static png_uint_16
+png_ITU_fixed_16(int *error, png_fixed_point v)
+{
+   /* Return a safe uint16_t value scaled according to the ITU H273 rules for
+    * 16-bit display chromaticities.  Functions like the corresponding
+    * png_fixed() internal function with regard to errors: it's an error on
+    * write, a chunk_benign_error on read: See the definition of
+    * png_chunk_report in pngpriv.h.
+    */
+   v /= 2; /* rounds to 0 in C: avoids insignificant arithmetic errors */
+   if (v > 65535 || v < 0)
+   {
+      *error = 1;
+      return 0;
+   }
+
+   return (png_uint_16)/*SAFE*/v;
+}
+
+void PNGAPI
+png_set_mDCV_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
+    png_fixed_point white_x, png_fixed_point white_y,
+    png_fixed_point red_x, png_fixed_point red_y,
+    png_fixed_point green_x, png_fixed_point green_y,
+    png_fixed_point blue_x, png_fixed_point blue_y,
+    png_uint_32 maxDL,
+    png_uint_32 minDL)
+{
+   png_uint_16 rx, ry, gx, gy, bx, by, wx, wy;
+   int error;
+
+   png_debug1(1, "in %s storage function", "mDCV");
+
+   if (png_ptr == NULL || info_ptr == NULL)
+      return;
+
+   /* Check the input values to ensure they are in the expected range: */
+   error = 0;
+   rx = png_ITU_fixed_16(&error, red_x);
+   ry = png_ITU_fixed_16(&error, red_y);
+   gx = png_ITU_fixed_16(&error, green_x);
+   gy = png_ITU_fixed_16(&error, green_y);
+   bx = png_ITU_fixed_16(&error, blue_x);
+   by = png_ITU_fixed_16(&error, blue_y);
+   wx = png_ITU_fixed_16(&error, white_x);
+   wy = png_ITU_fixed_16(&error, white_y);
+
+   if (error)
+   {
+      png_chunk_report(png_ptr,
+         "mDCV chromaticities outside representable range",
+         PNG_CHUNK_WRITE_ERROR);
+      return;
+   }
+
+   /* Check the light level range: */
+   if (maxDL > 0x7FFFFFFFU || minDL > 0x7FFFFFFFU)
+   {
+      /* The limit is 200kcd/m2; somewhat bright but not inconceivable because
+       * human vision is said to run up to 100Mcd/m2.  The sun is about 2Gcd/m2.
+       *
+       * The reference sRGB monitor is 80cd/m2 and the limit of PQ encoding is
+       * 2kcd/m2.
+       */
+      png_chunk_report(png_ptr, "mDCV display light level exceeds PNG limit",
+            PNG_CHUNK_WRITE_ERROR);
+      return;
+   }
+
+   /* All values are safe, the settings are accepted.
+    *
+    * IMPLEMENTATION NOTE: in practice the values can be checked and assigned
+    * but the result is confusing if a writing app calls png_set_mDCV more than
+    * once, the second time with an invalid value.  This approach is more
+    * obviously correct at the cost of typing and a very slight machine
+    * overhead.
+    */
+   info_ptr->mastering_red_x = rx;
+   info_ptr->mastering_red_y = ry;
+   info_ptr->mastering_green_x = gx;
+   info_ptr->mastering_green_y = gy;
+   info_ptr->mastering_blue_x = bx;
+   info_ptr->mastering_blue_y = by;
+   info_ptr->mastering_white_x = wx;
+   info_ptr->mastering_white_y = wy;
+   info_ptr->mastering_maxDL = maxDL;
+   info_ptr->mastering_minDL = minDL;
+   info_ptr->valid |= PNG_INFO_mDCV;
+}
+
+#  ifdef PNG_FLOATING_POINT_SUPPORTED
+void PNGAPI
+png_set_mDCV(png_const_structrp png_ptr, png_inforp info_ptr,
+    double white_x, double white_y, double red_x, double red_y, double green_x,
+    double green_y, double blue_x, double blue_y,
+    double maxDL, double minDL)
+{
+   png_set_mDCV_fixed(png_ptr, info_ptr,
+      /* The ITU approach is to scale by 50,000, not 100,000 so just divide
+       * the input values by 2 and use png_fixed:
+       */
+      png_fixed(png_ptr, white_x / 2, "png_set_mDCV(white(x))"),
+      png_fixed(png_ptr, white_y / 2, "png_set_mDCV(white(y))"),
+      png_fixed(png_ptr, red_x / 2, "png_set_mDCV(red(x))"),
+      png_fixed(png_ptr, red_y / 2, "png_set_mDCV(red(y))"),
+      png_fixed(png_ptr, green_x / 2, "png_set_mDCV(green(x))"),
+      png_fixed(png_ptr, green_y / 2, "png_set_mDCV(green(y))"),
+      png_fixed(png_ptr, blue_x / 2, "png_set_mDCV(blue(x))"),
+      png_fixed(png_ptr, blue_y / 2, "png_set_mDCV(blue(y))"),
+      png_fixed_ITU(png_ptr, maxDL, "png_set_mDCV(maxDL)"),
+      png_fixed_ITU(png_ptr, minDL, "png_set_mDCV(minDL)"));
+}
+#  endif /* FLOATING_POINT */
+#endif /* mDCV */
+
 #ifdef PNG_eXIf_SUPPORTED
 void PNGAPI
 png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
@@ -210,8 +368,8 @@ png_set_gAMA_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   png_colorspace_set_gamma(png_ptr, &info_ptr->colorspace, file_gamma);
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   info_ptr->gamma = file_gamma;
+   info_ptr->valid |= PNG_INFO_gAMA;
 }
 
 #  ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -670,8 +828,8 @@ png_set_sRGB(png_const_structrp png_ptr, png_inforp info_ptr, int srgb_intent)
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   (void)png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent);
-   png_colorspace_sync_info(png_ptr, info_ptr);
+   info_ptr->rendering_intent = srgb_intent;
+   info_ptr->valid |= PNG_INFO_sRGB;
 }
 
 void PNGAPI
@@ -683,15 +841,20 @@ png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
    if (png_ptr == NULL || info_ptr == NULL)
       return;
 
-   if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace,
-       srgb_intent) != 0)
-   {
-      /* This causes the gAMA and cHRM to be written too */
-      info_ptr->colorspace.flags |=
-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-   }
+   png_set_sRGB(png_ptr, info_ptr, srgb_intent);
 
-   png_colorspace_sync_info(png_ptr, info_ptr);
+#  ifdef PNG_gAMA_SUPPORTED
+      png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_sRGB_INVERSE);
+#  endif /* gAMA */
+
+#  ifdef PNG_cHRM_SUPPORTED
+      png_set_cHRM_fixed(png_ptr, info_ptr,
+         /* color      x       y */
+         /* white */ 31270, 32900,
+         /* red   */ 64000, 33000,
+         /* green */ 30000, 60000,
+         /* blue  */ 15000,  6000);
+#  endif /* cHRM */
 }
 #endif /* sRGB */
 
@@ -714,27 +877,6 @@ png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
    if (compression_type != PNG_COMPRESSION_TYPE_BASE)
       png_app_error(png_ptr, "Invalid iCCP compression method");
 
-   /* Set the colorspace first because this validates the profile; do not
-    * override previously set app cHRM or gAMA here (because likely as not the
-    * application knows better than libpng what the correct values are.)  Pass
-    * the info_ptr color_type field to png_colorspace_set_ICC because in the
-    * write case it has not yet been stored in png_ptr.
-    */
-   {
-      int result = png_colorspace_set_ICC(png_ptr, &info_ptr->colorspace, name,
-          proflen, profile, info_ptr->color_type);
-
-      png_colorspace_sync_info(png_ptr, info_ptr);
-
-      /* Don't do any of the copying if the profile was bad, or inconsistent. */
-      if (result == 0)
-         return;
-
-      /* But do write the gAMA and cHRM chunks from the profile. */
-      info_ptr->colorspace.flags |=
-         PNG_COLORSPACE_FROM_gAMA|PNG_COLORSPACE_FROM_cHRM;
-   }
-
    length = strlen(name)+1;
    new_iccp_name = png_voidcast(png_charp, png_malloc_warn(png_ptr, length));
 
@@ -1421,11 +1563,13 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
          98,  75,  71,  68, '\0',  /* bKGD */
          99,  72,  82,  77, '\0',  /* cHRM */
          99,  73,  67,  80, '\0',  /* cICP */
+         99,  76,  76,  73, '\0',  /* cLLI */
         101,  88,  73, 102, '\0',  /* eXIf */
         103,  65,  77,  65, '\0',  /* gAMA */
         104,  73,  83,  84, '\0',  /* hIST */
         105,  67,  67,  80, '\0',  /* iCCP */
         105,  84,  88, 116, '\0',  /* iTXt */
+        109,  68,  67,  86, '\0',  /* mDCV */
         111,  70,  70, 115, '\0',  /* oFFs */
         112,  67,  65,  76, '\0',  /* pCAL */
         112,  72,  89, 115, '\0',  /* pHYs */
@@ -1687,8 +1831,24 @@ png_set_chunk_malloc_max(png_structrp png_ptr,
 {
    png_debug(1, "in png_set_chunk_malloc_max");
 
+   /* pngstruct::user_chunk_malloc_max is initialized to a non-zero value in
+    * png.c.  This API supports '0' for unlimited, make sure the correct
+    * (unlimited) value is set here to avoid a need to check for 0 everywhere
+    * the parameter is used.
+    */
    if (png_ptr != NULL)
-      png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
+   {
+      if (user_chunk_malloc_max == 0U) /* unlimited */
+      {
+#        ifdef PNG_MAX_MALLOC_64K
+            png_ptr->user_chunk_malloc_max = 65536U;
+#        else
+            png_ptr->user_chunk_malloc_max = PNG_SIZE_MAX;
+#        endif
+      }
+      else
+         png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
+   }
 }
 #endif /* ?SET_USER_LIMITS */
 
diff --git a/engine/thirdparty/libpng/pngstruct.h b/engine/thirdparty/libpng/pngstruct.h
index 7e919d0a..32442449 100644
--- a/engine/thirdparty/libpng/pngstruct.h
+++ b/engine/thirdparty/libpng/pngstruct.h
@@ -69,13 +69,7 @@ typedef struct png_compression_buffer
 
 /* Colorspace support; structures used in png_struct, png_info and in internal
  * functions to hold and communicate information about the color space.
- *
- * PNG_COLORSPACE_SUPPORTED is only required if the application will perform
- * colorspace corrections, otherwise all the colorspace information can be
- * skipped and the size of libpng can be reduced (significantly) by compiling
- * out the colorspace support.
  */
-#ifdef PNG_COLORSPACE_SUPPORTED
 /* The chromaticities of the red, green and blue colorants and the chromaticity
  * of the corresponding white point (i.e. of rgb(1.0,1.0,1.0)).
  */
@@ -96,48 +90,36 @@ typedef struct png_XYZ
    png_fixed_point green_X, green_Y, green_Z;
    png_fixed_point blue_X, blue_Y, blue_Z;
 } png_XYZ;
-#endif /* COLORSPACE */
 
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-/* A colorspace is all the above plus, potentially, profile information;
- * however at present libpng does not use the profile internally so it is only
- * stored in the png_info struct (if iCCP is supported.)  The rendering intent
- * is retained here and is checked.
- *
- * The file gamma encoding information is also stored here and gamma correction
- * is done by libpng, whereas color correction must currently be done by the
- * application.
+/* Chunk index values as an enum, PNG_INDEX_unknown is also a count of the
+ * number of chunks.
  */
-typedef struct png_colorspace
+#define PNG_CHUNK(cHNK, i) PNG_INDEX_ ## cHNK = (i),
+typedef enum
 {
-#ifdef PNG_GAMMA_SUPPORTED
-   png_fixed_point gamma;        /* File gamma */
-#endif
+   PNG_KNOWN_CHUNKS
+   PNG_INDEX_unknown
+} png_index;
+#undef PNG_CHUNK
 
-#ifdef PNG_COLORSPACE_SUPPORTED
-   png_xy      end_points_xy;    /* End points as chromaticities */
-   png_XYZ     end_points_XYZ;   /* End points as CIE XYZ colorant values */
-   png_uint_16 rendering_intent; /* Rendering intent of a profile */
-#endif
+/* Chunk flag values.  These are (png_uint_32 values) with exactly one bit set
+ * and can be combined into a flag set with bitwise 'or'.
+ *
+ * TODO: C23: convert these macros to C23 inlines (which are static).
+ */
+#define png_chunk_flag_from_index(i) (0x80000000U >> (31 - (i)))
+   /* The flag coresponding to the given png_index enum value.  This is defined
+    * for png_unknown as well (until it reaches the value 32) but this should
+    * not be relied on.
+    */
 
-   /* Flags are always defined to simplify the code. */
-   png_uint_16 flags;            /* As defined below */
-} png_colorspace, * PNG_RESTRICT png_colorspacerp;
+#define png_file_has_chunk(png_ptr, i)\
+   (((png_ptr)->chunks & png_chunk_flag_from_index(i)) != 0)
+   /* The chunk has been recorded in png_struct */
 
-typedef const png_colorspace * PNG_RESTRICT png_const_colorspacerp;
-
-/* General flags for the 'flags' field */
-#define PNG_COLORSPACE_HAVE_GAMMA           0x0001
-#define PNG_COLORSPACE_HAVE_ENDPOINTS       0x0002
-#define PNG_COLORSPACE_HAVE_INTENT          0x0004
-#define PNG_COLORSPACE_FROM_gAMA            0x0008
-#define PNG_COLORSPACE_FROM_cHRM            0x0010
-#define PNG_COLORSPACE_FROM_sRGB            0x0020
-#define PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB 0x0040
-#define PNG_COLORSPACE_MATCHES_sRGB         0x0080 /* exact match on profile */
-#define PNG_COLORSPACE_INVALID              0x8000
-#define PNG_COLORSPACE_CANCEL(flags)        (0xffff ^ (flags))
-#endif /* COLORSPACE || GAMMA */
+#define png_file_add_chunk(pnt_ptr, i)\
+   ((void)((png_ptr)->chunks |= png_chunk_flag_from_index(i)))
+   /* Record the chunk in the png_struct */
 
 struct png_struct_def
 {
@@ -209,6 +191,11 @@ struct png_struct_def
    int zlib_set_strategy;
 #endif
 
+   png_uint_32 chunks; /* PNG_CF_ for every chunk read or (NYI) written */
+#  define png_has_chunk(png_ptr, cHNK)\
+      png_file_has_chunk(png_ptr, PNG_INDEX_ ## cHNK)
+      /* Convenience accessor - use this to check for a known chunk by name */
+
    png_uint_32 width;         /* width of image in pixels */
    png_uint_32 height;        /* height of image in pixels */
    png_uint_32 num_rows;      /* number of rows in current pass */
@@ -285,9 +272,16 @@ struct png_struct_def
    png_uint_32 flush_rows;    /* number of rows written since last flush */
 #endif
 
+#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
+   png_xy          chromaticities; /* From mDVC, cICP, [iCCP], sRGB or cHRM */
+#endif
+
 #ifdef PNG_READ_GAMMA_SUPPORTED
    int gamma_shift;      /* number of "insignificant" bits in 16-bit gamma */
-   png_fixed_point screen_gamma; /* screen gamma value (display_exponent) */
+   png_fixed_point screen_gamma; /* screen gamma value (display exponent) */
+   png_fixed_point file_gamma;   /* file gamma value (encoding exponent) */
+   png_fixed_point chunk_gamma;  /* from cICP, iCCP, sRGB or gAMA */
+   png_fixed_point default_gamma;/* from png_set_alpha_mode */
 
    png_bytep gamma_table;     /* gamma table for 8-bit depth files */
    png_uint_16pp gamma_16_table; /* gamma table for 16-bit depth files */
@@ -299,7 +293,7 @@ struct png_struct_def
    png_uint_16pp gamma_16_from_1; /* converts from 1.0 to screen */
    png_uint_16pp gamma_16_to_1; /* converts from file to 1.0 */
 #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */
-#endif
+#endif /* READ_GAMMA */
 
 #if defined(PNG_READ_GAMMA_SUPPORTED) || defined(PNG_sBIT_SUPPORTED)
    png_color_8 sig_bit;       /* significant bits in each available channel */
@@ -349,8 +343,8 @@ struct png_struct_def
 /* To do: remove this from libpng-1.7 */
 #ifdef PNG_TIME_RFC1123_SUPPORTED
    char time_buffer[29]; /* String to hold RFC 1123 time text */
-#endif
-#endif
+#endif /* TIME_RFC1123 */
+#endif /* LIBPNG_VER < 10700 */
 
 /* New members added in libpng-1.0.6 */
 
@@ -360,8 +354,8 @@ struct png_struct_def
    png_voidp user_chunk_ptr;
 #ifdef PNG_READ_USER_CHUNKS_SUPPORTED
    png_user_chunk_ptr read_user_chunk_fn; /* user read chunk handler */
-#endif
-#endif
+#endif /* READ_USER_CHUNKS */
+#endif /* USER_CHUNKS */
 
 #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
    int          unknown_default; /* As PNG_HANDLE_* */
@@ -468,11 +462,5 @@ struct png_struct_def
 /* New member added in libpng-1.5.7 */
    void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
       png_bytep row, png_const_bytep prev_row);
-
-#ifdef PNG_READ_SUPPORTED
-#if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED)
-   png_colorspace   colorspace;
-#endif
-#endif
 };
 #endif /* PNGSTRUCT_H */
diff --git a/engine/thirdparty/libpng/pngwrite.c b/engine/thirdparty/libpng/pngwrite.c
index 8b1b06c2..b7aeff4c 100644
--- a/engine/thirdparty/libpng/pngwrite.c
+++ b/engine/thirdparty/libpng/pngwrite.c
@@ -157,8 +157,30 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
     * space priority.  As above it therefore behooves libpng to write the colour
     * space chunks in the priority order so that a streaming app need not buffer
     * them.
+    *
+    * PNG v3: Chunks mDCV and cLLI provide ancillary information for the
+    * interpretation of the colourspace chunkgs but do not require support for
+    * those chunks so are outside the "COLORSPACE" check but before the write of
+    * the colourspace chunks themselves.
     */
-#ifdef PNG_COLORSPACE_SUPPORTED
+#ifdef PNG_WRITE_cLLI_SUPPORTED
+   if ((info_ptr->valid & PNG_INFO_cLLI) != 0)
+   {
+      png_write_cLLI_fixed(png_ptr, info_ptr->maxCLL, info_ptr->maxFALL);
+   }
+#endif
+#ifdef PNG_WRITE_mDCV_SUPPORTED
+   if ((info_ptr->valid & PNG_INFO_mDCV) != 0)
+   {
+      png_write_mDCV_fixed(png_ptr,
+         info_ptr->mastering_red_x, info_ptr->mastering_red_y,
+         info_ptr->mastering_green_x, info_ptr->mastering_green_y,
+         info_ptr->mastering_blue_x, info_ptr->mastering_blue_y,
+         info_ptr->mastering_white_x, info_ptr->mastering_white_y,
+         info_ptr->mastering_maxDL, info_ptr->mastering_minDL);
+   }
+#endif
+
 #  ifdef PNG_WRITE_cICP_SUPPORTED /* Priority 4 */
    if ((info_ptr->valid & PNG_INFO_cICP) != 0)
       {
@@ -170,50 +192,28 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
       }
 #  endif
 
-      /* PNG v3 change: it is now permitted to write both sRGB and ICC profiles,
-       * however because the libpng code auto-generates an sRGB for the
-       * corresponding ICC profiles and because PNG v2 disallowed this we need
-       * to only write one.
-       *
-       * Remove the PNG v2 warning about writing an sRGB ICC profile as well
-       * because it's invalid with PNG v3.
-       */
 #  ifdef PNG_WRITE_iCCP_SUPPORTED /* Priority 3 */
-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-             (info_ptr->valid & PNG_INFO_iCCP) != 0)
+         if ((info_ptr->valid & PNG_INFO_iCCP) != 0)
          {
             png_write_iCCP(png_ptr, info_ptr->iccp_name,
-                info_ptr->iccp_profile);
+                info_ptr->iccp_profile, info_ptr->iccp_proflen);
          }
-#     ifdef PNG_WRITE_sRGB_SUPPORTED
-         else
-#     endif
 #  endif
 
 #  ifdef PNG_WRITE_sRGB_SUPPORTED /* Priority 2 */
-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-             (info_ptr->valid & PNG_INFO_sRGB) != 0)
-            png_write_sRGB(png_ptr, info_ptr->colorspace.rendering_intent);
+         if ((info_ptr->valid & PNG_INFO_sRGB) != 0)
+            png_write_sRGB(png_ptr, info_ptr->rendering_intent);
 #  endif /* WRITE_sRGB */
-#endif /* COLORSPACE */
 
-#ifdef PNG_GAMMA_SUPPORTED
 #  ifdef PNG_WRITE_gAMA_SUPPORTED /* Priority 1 */
-      if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-          (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&
-          (info_ptr->valid & PNG_INFO_gAMA) != 0)
-         png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);
+      if ((info_ptr->valid & PNG_INFO_gAMA) != 0)
+         png_write_gAMA_fixed(png_ptr, info_ptr->gamma);
 #  endif
-#endif
 
-#ifdef PNG_COLORSPACE_SUPPORTED
 #  ifdef PNG_WRITE_cHRM_SUPPORTED /* Also priority 1 */
-         if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-             (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 &&
-             (info_ptr->valid & PNG_INFO_cHRM) != 0)
-            png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy);
+         if ((info_ptr->valid & PNG_INFO_cHRM) != 0)
+            png_write_cHRM_fixed(png_ptr, &info_ptr->cHRM);
 #  endif
-#endif
 
       png_ptr->mode |= PNG_WROTE_INFO_BEFORE_PLTE;
    }
diff --git a/engine/thirdparty/libpng/pngwutil.c b/engine/thirdparty/libpng/pngwutil.c
index 8b2bf4e6..be706afe 100644
--- a/engine/thirdparty/libpng/pngwutil.c
+++ b/engine/thirdparty/libpng/pngwutil.c
@@ -1132,10 +1132,9 @@ png_write_sRGB(png_structrp png_ptr, int srgb_intent)
 /* Write an iCCP chunk */
 void /* PRIVATE */
 png_write_iCCP(png_structrp png_ptr, png_const_charp name,
-    png_const_bytep profile)
+    png_const_bytep profile, png_uint_32 profile_len)
 {
    png_uint_32 name_len;
-   png_uint_32 profile_len;
    png_byte new_name[81]; /* 1 byte for the compression byte */
    compression_state comp;
    png_uint_32 temp;
@@ -1148,11 +1147,12 @@ png_write_iCCP(png_structrp png_ptr, png_const_charp name,
    if (profile == NULL)
       png_error(png_ptr, "No profile for iCCP chunk"); /* internal error */
 
-   profile_len = png_get_uint_32(profile);
-
    if (profile_len < 132)
       png_error(png_ptr, "ICC profile too short");
 
+   if (png_get_uint_32(profile) != profile_len)
+      png_error(png_ptr, "Incorrect data in iCCP");
+
    temp = (png_uint_32) (*(profile+8));
    if (temp > 3 && (profile_len & 0x03))
       png_error(png_ptr, "ICC profile length invalid (not a multiple of 4)");
@@ -1511,6 +1511,50 @@ png_write_cICP(png_structrp png_ptr,
 }
 #endif
 
+#ifdef PNG_WRITE_cLLI_SUPPORTED
+void /* PRIVATE */
+png_write_cLLI_fixed(png_structrp png_ptr, png_uint_32 maxCLL,
+   png_uint_32 maxFALL)
+{
+   png_byte buf[8];
+
+   png_debug(1, "in png_write_cLLI_fixed");
+
+   png_save_uint_32(buf, maxCLL);
+   png_save_uint_32(buf + 4, maxFALL);
+
+   png_write_complete_chunk(png_ptr, png_cLLI, buf, 8);
+}
+#endif
+
+#ifdef PNG_WRITE_mDCV_SUPPORTED
+void /* PRIVATE */
+png_write_mDCV_fixed(png_structrp png_ptr,
+   png_uint_16 red_x, png_uint_16 red_y,
+   png_uint_16 green_x, png_uint_16 green_y,
+   png_uint_16 blue_x, png_uint_16 blue_y,
+   png_uint_16 white_x, png_uint_16 white_y,
+   png_uint_32 maxDL, png_uint_32 minDL)
+{
+   png_byte buf[24];
+
+   png_debug(1, "in png_write_mDCV_fixed");
+
+   png_save_uint_16(buf +  0, red_x);
+   png_save_uint_16(buf +  2, red_y);
+   png_save_uint_16(buf +  4, green_x);
+   png_save_uint_16(buf +  6, green_y);
+   png_save_uint_16(buf +  8, blue_x);
+   png_save_uint_16(buf + 10, blue_y);
+   png_save_uint_16(buf + 12, white_x);
+   png_save_uint_16(buf + 14, white_y);
+   png_save_uint_32(buf + 16, maxDL);
+   png_save_uint_32(buf + 20, minDL);
+
+   png_write_complete_chunk(png_ptr, png_mDCV, buf, 24);
+}
+#endif
+
 #ifdef PNG_WRITE_eXIf_SUPPORTED
 /* Write the Exif data */
 void /* PRIVATE */
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/build_info.h b/engine/thirdparty/mbedtls/include/mbedtls/build_info.h
index d91d2964..e70c4d7c 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/build_info.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/build_info.h
@@ -26,16 +26,16 @@
  */
 #define MBEDTLS_VERSION_MAJOR  3
 #define MBEDTLS_VERSION_MINOR  6
-#define MBEDTLS_VERSION_PATCH  2
+#define MBEDTLS_VERSION_PATCH  3
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define MBEDTLS_VERSION_NUMBER         0x03060200
-#define MBEDTLS_VERSION_STRING         "3.6.2"
-#define MBEDTLS_VERSION_STRING_FULL    "Mbed TLS 3.6.2"
+#define MBEDTLS_VERSION_NUMBER         0x03060300
+#define MBEDTLS_VERSION_STRING         "3.6.3"
+#define MBEDTLS_VERSION_STRING_FULL    "Mbed TLS 3.6.3"
 
 /* Macros for build-time platform detection */
 
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/check_config.h b/engine/thirdparty/mbedtls/include/mbedtls/check_config.h
index 67a05f83..aec5050b 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/check_config.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/check_config.h
@@ -247,6 +247,9 @@
 #if defined(MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN) &&  !defined(MBEDTLS_HAS_MEMSAN)
 #error "MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN requires building with MemorySanitizer"
 #endif
+#if defined(MBEDTLS_HAS_MEMSAN) && defined(MBEDTLS_HAVE_ASM)
+#error "MemorySanitizer does not support assembly implementation"
+#endif
 #undef MBEDTLS_HAS_MEMSAN // temporary macro defined above
 
 #if defined(MBEDTLS_CCM_C) && \
@@ -738,6 +741,11 @@
 #error "MBEDTLS_PSA_INJECT_ENTROPY is not compatible with MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG"
 #endif
 
+#if defined(MBEDTLS_PSA_KEY_STORE_DYNAMIC) &&           \
+    defined(MBEDTLS_PSA_STATIC_KEY_SLOTS)
+#error "MBEDTLS_PSA_KEY_STORE_DYNAMIC and MBEDTLS_PSA_STATIC_KEY_SLOTS cannot be defined simultaneously"
+#endif
+
 #if defined(MBEDTLS_PSA_ITS_FILE_C) && \
     !defined(MBEDTLS_FS_IO)
 #error "MBEDTLS_PSA_ITS_FILE_C defined, but not all prerequisites"
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_crypto.h b/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_crypto.h
index 3ba987eb..331ac9b2 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_crypto.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_crypto.h
@@ -48,6 +48,13 @@
 #endif
 #endif /* _MINGW32__ || (_MSC_VER && (_MSC_VER <= 1900)) */
 
+/* If MBEDTLS_PSA_CRYPTO_C is defined, make sure MBEDTLS_PSA_CRYPTO_CLIENT
+ * is defined as well to include all PSA code.
+ */
+#if defined(MBEDTLS_PSA_CRYPTO_C)
+#define MBEDTLS_PSA_CRYPTO_CLIENT
+#endif /* MBEDTLS_PSA_CRYPTO_C */
+
 /* Auto-enable CIPHER_C when any of the unauthenticated ciphers is builtin
  * in PSA. */
 #if defined(MBEDTLS_PSA_CRYPTO_C) && \
@@ -158,7 +165,66 @@
 #define MBEDTLS_MD_SHA3_512_VIA_PSA
 #define MBEDTLS_MD_SOME_PSA
 #endif
-#endif /* MBEDTLS_PSA_CRYPTO_C */
+
+#elif defined(MBEDTLS_PSA_CRYPTO_CLIENT)
+
+#if defined(PSA_WANT_ALG_MD5)
+#define MBEDTLS_MD_CAN_MD5
+#define MBEDTLS_MD_MD5_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA_1)
+#define MBEDTLS_MD_CAN_SHA1
+#define MBEDTLS_MD_SHA1_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA_224)
+#define MBEDTLS_MD_CAN_SHA224
+#define MBEDTLS_MD_SHA224_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA_256)
+#define MBEDTLS_MD_CAN_SHA256
+#define MBEDTLS_MD_SHA256_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA_384)
+#define MBEDTLS_MD_CAN_SHA384
+#define MBEDTLS_MD_SHA384_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA_512)
+#define MBEDTLS_MD_CAN_SHA512
+#define MBEDTLS_MD_SHA512_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_RIPEMD160)
+#define MBEDTLS_MD_CAN_RIPEMD160
+#define MBEDTLS_MD_RIPEMD160_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA3_224)
+#define MBEDTLS_MD_CAN_SHA3_224
+#define MBEDTLS_MD_SHA3_224_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA3_256)
+#define MBEDTLS_MD_CAN_SHA3_256
+#define MBEDTLS_MD_SHA3_256_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA3_384)
+#define MBEDTLS_MD_CAN_SHA3_384
+#define MBEDTLS_MD_SHA3_384_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+#if defined(PSA_WANT_ALG_SHA3_512)
+#define MBEDTLS_MD_CAN_SHA3_512
+#define MBEDTLS_MD_SHA3_512_VIA_PSA
+#define MBEDTLS_MD_SOME_PSA
+#endif
+
+#endif /* !MBEDTLS_PSA_CRYPTO_CLIENT && !MBEDTLS_PSA_CRYPTO_C */
 
 /* Built-in implementations */
 #if defined(MBEDTLS_MD5_C)
@@ -352,13 +418,6 @@
 #define MBEDTLS_PK_CAN_ECDSA_SOME
 #endif
 
-/* If MBEDTLS_PSA_CRYPTO_C is defined, make sure MBEDTLS_PSA_CRYPTO_CLIENT
- * is defined as well to include all PSA code.
- */
-#if defined(MBEDTLS_PSA_CRYPTO_C)
-#define MBEDTLS_PSA_CRYPTO_CLIENT
-#endif /* MBEDTLS_PSA_CRYPTO_C */
-
 /* Helpers to state that each key is supported either on the builtin or PSA side. */
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED) || defined(PSA_WANT_ECC_SECP_R1_521)
 #define MBEDTLS_ECP_HAVE_SECP521R1
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_from_psa.h b/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_from_psa.h
index 04bdae61..48f1bab1 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_from_psa.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_legacy_from_psa.h
@@ -69,7 +69,6 @@
     (defined(PSA_WANT_ECC_SECP_R1_384) && !defined(MBEDTLS_PSA_ACCEL_ECC_SECP_R1_384)) || \
     (defined(PSA_WANT_ECC_SECP_R1_521) && !defined(MBEDTLS_PSA_ACCEL_ECC_SECP_R1_521)) || \
     (defined(PSA_WANT_ECC_SECP_K1_192) && !defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_192)) || \
-    (defined(PSA_WANT_ECC_SECP_K1_224) && !defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_224)) || \
     (defined(PSA_WANT_ECC_SECP_K1_256) && !defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_256))
 #define MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_CURVES
 #define MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_WEIERSTRASS_CURVES
@@ -225,17 +224,6 @@
 #endif /* missing accel */
 #endif /* PSA_WANT_ECC_SECP_K1_192 */
 
-#if defined(PSA_WANT_ECC_SECP_K1_224)
-#if !defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_224) || \
-    defined(MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_KEY_TYPES) || \
-    defined(MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_ALGS)
-#define MBEDTLS_PSA_BUILTIN_ECC_SECP_K1_224 1
-#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
-/* https://github.com/Mbed-TLS/mbedtls/issues/3541 */
-#error "SECP224K1 is buggy via the PSA API in Mbed TLS."
-#endif /* missing accel */
-#endif /* PSA_WANT_ECC_SECP_K1_224 */
-
 #if defined(PSA_WANT_ECC_SECP_K1_256)
 #if !defined(MBEDTLS_PSA_ACCEL_ECC_SECP_K1_256) || \
     defined(MBEDTLS_PSA_ECC_ACCEL_INCOMPLETE_KEY_TYPES) || \
@@ -782,13 +770,6 @@
 #define PSA_HAVE_SOFT_BLOCK_CIPHER 1
 #endif
 
-#if defined(PSA_WANT_ALG_CBC_MAC)
-#if !defined(MBEDTLS_PSA_ACCEL_ALG_CBC_MAC)
-#error "CBC-MAC is not yet supported via the PSA API in Mbed TLS."
-#define MBEDTLS_PSA_BUILTIN_ALG_CBC_MAC 1
-#endif /* !MBEDTLS_PSA_ACCEL_ALG_CBC_MAC */
-#endif /* PSA_WANT_ALG_CBC_MAC */
-
 #if defined(PSA_WANT_ALG_CMAC)
 #if !defined(MBEDTLS_PSA_ACCEL_ALG_CMAC) || \
     defined(PSA_HAVE_SOFT_BLOCK_CIPHER)
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_psa_superset_legacy.h b/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_psa_superset_legacy.h
index ef65cce0..1a232cbb 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_psa_superset_legacy.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/config_adjust_psa_superset_legacy.h
@@ -136,13 +136,6 @@
 #endif /* PSA_WANT_ECC_SECP_K1_192 */
 #endif /* MBEDTLS_ECP_DP_SECP192K1_ENABLED */
 
-/* SECP224K1 is buggy via the PSA API (https://github.com/Mbed-TLS/mbedtls/issues/3541) */
-#if 0 && defined(MBEDTLS_ECP_DP_SECP224K1_ENABLED)
-#if !defined(PSA_WANT_ECC_SECP_K1_224)
-#define PSA_WANT_ECC_SECP_K1_224 1
-#endif /* PSA_WANT_ECC_SECP_K1_224 */
-#endif /* MBEDTLS_ECP_DP_SECP224K1_ENABLED */
-
 #if defined(MBEDTLS_ECP_DP_SECP256K1_ENABLED)
 #if !defined(PSA_WANT_ECC_SECP_K1_256)
 #define PSA_WANT_ECC_SECP_K1_256 1
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/debug.h b/engine/thirdparty/mbedtls/include/mbedtls/debug.h
index 424ed4b3..e6f5dadb 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/debug.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/debug.h
@@ -108,16 +108,16 @@
  *
  * This module provides debugging functions.
  */
-#if (defined(__MINGW32__) && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800)
+#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900)
    #include <inttypes.h>
    #define MBEDTLS_PRINTF_SIZET     PRIuPTR
    #define MBEDTLS_PRINTF_LONGLONG  "I64d"
 #else \
-    /* (defined(__MINGW32__)  && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800) */
+    /* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900) */
    #define MBEDTLS_PRINTF_SIZET     "zu"
    #define MBEDTLS_PRINTF_LONGLONG  "lld"
 #endif \
-    /* (defined(__MINGW32__)  && __USE_MINGW_ANSI_STDIO == 0) || (defined(_MSC_VER) && _MSC_VER < 1800) */
+    /* defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER < 1900) */
 
 #if !defined(MBEDTLS_PRINTF_MS_TIME)
 #include <inttypes.h>
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/entropy.h b/engine/thirdparty/mbedtls/include/mbedtls/entropy.h
index 20fd6872..6c64e3e4 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/entropy.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/entropy.h
@@ -17,12 +17,13 @@
 
 #include "md.h"
 
-#if defined(MBEDTLS_MD_CAN_SHA512) && !defined(MBEDTLS_ENTROPY_FORCE_SHA256)
+#if (defined(MBEDTLS_MD_CAN_SHA512) || defined(PSA_WANT_ALG_SHA_512)) && \
+    !defined(MBEDTLS_ENTROPY_FORCE_SHA256)
 #define MBEDTLS_ENTROPY_SHA512_ACCUMULATOR
 #define MBEDTLS_ENTROPY_MD  MBEDTLS_MD_SHA512
 #define MBEDTLS_ENTROPY_BLOCK_SIZE      64      /**< Block size of entropy accumulator (SHA-512) */
 #else
-#if defined(MBEDTLS_MD_CAN_SHA256)
+#if (defined(MBEDTLS_MD_CAN_SHA256) || defined(PSA_WANT_ALG_SHA_256))
 #define MBEDTLS_ENTROPY_SHA256_ACCUMULATOR
 #define MBEDTLS_ENTROPY_MD  MBEDTLS_MD_SHA256
 #define MBEDTLS_ENTROPY_BLOCK_SIZE      32      /**< Block size of entropy accumulator (SHA-256) */
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/error.h b/engine/thirdparty/mbedtls/include/mbedtls/error.h
index 186589ac..635f7cd8 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/error.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/error.h
@@ -81,7 +81,7 @@
  * MD        5   5
  * HKDF      5   1 (Started from top)
  * PKCS7     5   12 (Started from 0x5300)
- * SSL       5   2 (Started from 0x5F00)
+ * SSL       5   3 (Started from 0x5F00)
  * CIPHER    6   8 (Started from 0x6080)
  * SSL       6   22 (Started from top, plus 0x6000)
  * SSL       7   20 (Started from 0x7000, gaps at
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/gcm.h b/engine/thirdparty/mbedtls/include/mbedtls/gcm.h
index 98faa436..390ed4c6 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/gcm.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/gcm.h
@@ -115,10 +115,9 @@ int mbedtls_gcm_setkey(mbedtls_gcm_context *ctx,
 /**
  * \brief           This function performs GCM encryption or decryption of a buffer.
  *
- * \note            For encryption, the output buffer can be the same as the
- *                  input buffer. For decryption, the output buffer cannot be
- *                  the same as input buffer. If the buffers overlap, the output
- *                  buffer must trail at least 8 Bytes behind the input buffer.
+ * \note            The output buffer \p output can be the same as the input
+ *                  buffer \p input. If \p output is greater than \p input, they
+ *                  cannot overlap.
  *
  * \warning         When this function performs a decryption, it outputs the
  *                  authentication tag and does not verify that the data is
@@ -179,9 +178,11 @@ int mbedtls_gcm_crypt_and_tag(mbedtls_gcm_context *ctx,
  * \brief           This function performs a GCM authenticated decryption of a
  *                  buffer.
  *
- * \note            For decryption, the output buffer cannot be the same as
- *                  input buffer. If the buffers overlap, the output buffer
- *                  must trail at least 8 Bytes behind the input buffer.
+ * \note            The output buffer \p output can be the same as the input
+ *                  buffer \p input. If \p output is greater than \p input, they
+ *                  cannot overlap. Implementations which require
+ *                  MBEDTLS_GCM_ALT to be enabled may not provide support for
+ *                  overlapping buffers.
  *
  * \param ctx       The GCM context. This must be initialized.
  * \param length    The length of the ciphertext to decrypt, which is also
@@ -287,9 +288,11 @@ int mbedtls_gcm_update_ad(mbedtls_gcm_context *ctx,
  *                    to this function during an operation, then it is
  *                    correct to use \p output_size = \p input_length.
  *
- * \note            For decryption, the output buffer cannot be the same as
- *                  input buffer. If the buffers overlap, the output buffer
- *                  must trail at least 8 Bytes behind the input buffer.
+ * \note            The output buffer \p output can be the same as the input
+ *                  buffer \p input. If \p output is greater than \p input, they
+ *                  cannot overlap. Implementations which require
+ *                  MBEDTLS_GCM_ALT to be enabled may not provide support for
+ *                  overlapping buffers.
  *
  * \param ctx           The GCM context. This must be initialized.
  * \param input         The buffer holding the input data. If \p input_length
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/mbedtls_config.h b/engine/thirdparty/mbedtls/include/mbedtls/mbedtls_config.h
index bd3f71d5..45feb5ec 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/mbedtls_config.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/mbedtls_config.h
@@ -1622,6 +1622,46 @@
  */
 //#define MBEDTLS_SSL_ASYNC_PRIVATE
 
+/** \def MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+ *
+ * In TLS clients, when a client authenticates a server through its
+ * certificate, the client normally checks three things:
+ * - the certificate chain must be valid;
+ * - the chain must start from a trusted CA;
+ * - the certificate must cover the server name that is expected by the client.
+ *
+ * Omitting any of these checks is generally insecure, and can allow a
+ * malicious server to impersonate a legitimate server.
+ *
+ * The third check may be safely skipped in some unusual scenarios,
+ * such as networks where eavesdropping is a risk but not active attacks,
+ * or a private PKI where the client equally trusts all servers that are
+ * accredited by the root CA.
+ *
+ * You should call mbedtls_ssl_set_hostname() with the expected server name
+ * before starting a TLS handshake on a client (unless the client is
+ * set up to only use PSK-based authentication, which does not rely on the
+ * host name). This configuration option controls what happens if a TLS client
+ * is configured with the authentication mode #MBEDTLS_SSL_VERIFY_REQUIRED
+ * (default), certificate authentication is enabled and the client does not
+ * call mbedtls_ssl_set_hostname():
+ *
+ * - If this option is unset (default), the connection attempt is aborted
+ *   with the error #MBEDTLS_ERR_SSL_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME.
+ * - If this option is set, the TLS library does not check the server name
+ *   that the certificate is valid for. This is the historical behavior
+ *   of Mbed TLS, but may be insecure as explained above.
+ *
+ * Enable this option for strict backward compatibility if you have
+ * determined that it is secure in the scenario where you are using
+ * Mbed TLS.
+ *
+ * \deprecated This option exists only for backward compatibility and will
+ *             be removed in the next major version of Mbed TLS.
+ *
+ */
+//#define MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+
 /**
  * \def MBEDTLS_SSL_CONTEXT_SERIALIZATION
  *
@@ -1807,6 +1847,11 @@
  *       running handshake hash) only use PSA crypto if
  *       #MBEDTLS_USE_PSA_CRYPTO is enabled.
  *
+ * \note In multithreaded applications, you must also enable
+ *       #MBEDTLS_THREADING_C, even if individual TLS contexts are not
+ *       shared between threads, unless only one thread ever calls
+ *       TLS functions.
+ *
  * Uncomment this macro to enable the support for TLS 1.3.
  */
 #define MBEDTLS_SSL_PROTO_TLS1_3
@@ -2125,6 +2170,10 @@
  * before calling any function from the SSL/TLS, X.509 or PK modules, except
  * for the various mbedtls_xxx_init() functions which can be called at any time.
  *
+ * \warning In multithreaded applications, you must also enable
+ * #MBEDTLS_THREADING_C, unless only one thread ever calls PSA functions
+ * (`psa_xxx()`), including indirect calls through SSL/TLS, X.509 or PK.
+ *
  * \note An important and desirable effect of this option is that it allows
  * PK, X.509 and TLS to take advantage of PSA drivers. For example, enabling
  * this option is what allows use of drivers for ECDSA, ECDH and EC J-PAKE in
@@ -3211,7 +3260,18 @@
 /**
  * \def MBEDTLS_PSA_CRYPTO_C
  *
- * Enable the Platform Security Architecture cryptography API.
+ * Enable the Platform Security Architecture (PSA) cryptography API.
+ *
+ * \note In multithreaded applications, you must enable #MBEDTLS_THREADING_C,
+ *       unless only one thread ever calls `psa_xxx()` functions.
+ *       That includes indirect calls, such as:
+ *       - performing a TLS handshake if support for TLS 1.3 is enabled;
+ *       - using a TLS 1.3 connection;
+ *       - indirect calls from PK, X.509 or SSL functions when
+ *         #MBEDTLS_USE_PSA_CRYPTO is enabled;
+ *       - indirect calls to calculate a hash when #MBEDTLS_MD_C is disabled;
+ *       - any other call to a function that requires calling psa_crypto_init()
+ *         beforehand.
  *
  * Module:  library/psa_crypto.c
  *
@@ -3268,6 +3328,26 @@
  */
 #define MBEDTLS_PSA_ITS_FILE_C
 
+/**
+ * \def MBEDTLS_PSA_STATIC_KEY_SLOTS
+ *
+ * Statically preallocate memory to store keys' material in PSA instead
+ * of allocating it dynamically when required. This allows builds without a
+ * heap, if none of the enabled cryptographic implementations or other features
+ * require it.
+ * This feature affects both volatile and persistent keys which means that
+ * it's not possible to persistently store a key which is larger than
+ * #MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE.
+ *
+ * \note This feature comes with a (potentially) higher RAM usage since:
+ *       - All the key slots are allocated no matter if they are used or not.
+ *       - Each key buffer's length is #MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE bytes.
+ *
+ * Requires: MBEDTLS_PSA_CRYPTO_C
+ *
+ */
+//#define MBEDTLS_PSA_STATIC_KEY_SLOTS
+
 /**
  * \def MBEDTLS_RIPEMD160_C
  *
@@ -3611,10 +3691,38 @@
  * \def MBEDTLS_THREADING_C
  *
  * Enable the threading abstraction layer.
- * By default Mbed TLS assumes it is used in a non-threaded environment or that
- * contexts are not shared between threads. If you do intend to use contexts
+ *
+ * Traditionally, Mbed TLS assumes it is used in a non-threaded environment or
+ * that contexts are not shared between threads. If you do intend to use contexts
  * between threads, you will need to enable this layer to prevent race
- * conditions. See also our Knowledge Base article about threading:
+ * conditions.
+ *
+ * The PSA subsystem has an implicit shared context. Therefore, you must
+ * enable this option if more than one thread may use any part of
+ * Mbed TLS that is implemented on top of the PSA subsystem.
+ *
+ * You must enable this option in multithreaded applications where more than
+ * one thread performs any of the following operations:
+ *
+ * - Any call to a PSA function (`psa_xxx()`).
+ * - Any call to a TLS, X.509 or PK function (`mbedtls_ssl_xxx()`,
+ *   `mbedtls_x509_xxx()`, `mbedtls_pkcs7_xxx()`, `mbedtls_pk_xxx()`)
+ *   if `MBEDTLS_USE_PSA_CRYPTO` is enabled (regardless of whether individual
+ *   TLS, X.509 or PK contexts are shared between threads).
+ * - A TLS 1.3 connection, regardless of the compile-time configuration.
+ * - Any library feature that calculates a hash, if `MBEDTLS_MD_C` is disabled.
+ *   As an exception, algorithm-specific low-level modules do not require
+ *   threading protection unless the contexts are shared between threads.
+ * - Any library feature that performs symmetric encryption or decryption,
+ *   if `MBEDTLS_CIPHER_C` is disabled.
+ *   As an exception, algorithm-specific low-level modules do not require
+ *   threading protection unless the contexts are shared between threads.
+ * - Any use of a cryptographic context if the same context is used in
+ *   multiple threads.
+ * - Any call to a function where the documentation specifies that
+ *   psa_crypto_init() must be called prior to that function.
+ *
+ * See also our Knowledge Base article about threading:
  * https://mbed-tls.readthedocs.io/en/latest/kb/development/thread-safety-and-multi-threading
  *
  * Module:  library/threading.c
@@ -4069,6 +4177,19 @@
  */
 //#define MBEDTLS_PSA_KEY_SLOT_COUNT 32
 
+/**
+ * \def MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE
+ *
+ * Define the size (in bytes) of each static key buffer when
+ * #MBEDTLS_PSA_STATIC_KEY_SLOTS is set. If not
+ * explicitly defined then it's automatically guessed from available PSA keys
+ * enabled in the build through PSA_WANT_xxx symbols.
+ * If required by the application this parameter can be set to higher values
+ * in order to store larger objects (ex: raw keys), but please note that this
+ * will increase RAM usage.
+ */
+//#define MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE       256
+
 /* RSA OPTIONS */
 //#define MBEDTLS_RSA_GEN_KEY_MIN_BITS            1024 /**<  Minimum RSA key size that can be generated in bits (Minimum possible value is 128 bits) */
 
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/net_sockets.h b/engine/thirdparty/mbedtls/include/mbedtls/net_sockets.h
index 85c11971..8e69bc0f 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/net_sockets.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/net_sockets.h
@@ -229,7 +229,7 @@ int mbedtls_net_recv(void *ctx, unsigned char *buf, size_t len);
 
 /**
  * \brief          Write at most 'len' characters. If no error occurs,
- *                 the actual amount read is returned.
+ *                 the actual amount written is returned.
  *
  * \param ctx      Socket
  * \param buf      The buffer to read from
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/psa_util.h b/engine/thirdparty/mbedtls/include/mbedtls/psa_util.h
index c78cc233..b898f1f8 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/psa_util.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/psa_util.h
@@ -161,6 +161,16 @@ static inline mbedtls_md_type_t mbedtls_md_type_from_psa_alg(psa_algorithm_t psa
  * \param[out]  der_len     On success it contains the amount of valid data
  *                          (in bytes) written to \p der. It's undefined
  *                          in case of failure.
+ *
+ * \note                    The behavior is undefined if \p der is null,
+ *                          even if \p der_size is 0.
+ *
+ * \return                  0 if successful.
+ * \return                  #MBEDTLS_ERR_ASN1_BUF_TOO_SMALL if \p der_size
+ *                          is too small or if \p bits is larger than the
+ *                          largest supported curve.
+ * \return                  #MBEDTLS_ERR_ASN1_INVALID_DATA if one of the
+ *                          numbers in the signature is 0.
  */
 int mbedtls_ecdsa_raw_to_der(size_t bits, const unsigned char *raw, size_t raw_len,
                              unsigned char *der, size_t der_size, size_t *der_len);
@@ -177,6 +187,15 @@ int mbedtls_ecdsa_raw_to_der(size_t bits, const unsigned char *raw, size_t raw_l
  * \param[out]  raw_len     On success it is updated with the amount of valid
  *                          data (in bytes) written to \p raw. It's undefined
  *                          in case of failure.
+ *
+ * \return                  0 if successful.
+ * \return                  #MBEDTLS_ERR_ASN1_BUF_TOO_SMALL if \p raw_size
+ *                          is too small or if \p bits is larger than the
+ *                          largest supported curve.
+ * \return                  #MBEDTLS_ERR_ASN1_INVALID_DATA if the data in
+ *                          \p der is inconsistent with \p bits.
+ * \return                  An \c MBEDTLS_ERR_ASN1_xxx error code if
+ *                          \p der is malformed.
  */
 int mbedtls_ecdsa_der_to_raw(size_t bits, const unsigned char *der, size_t der_len,
                              unsigned char *raw, size_t raw_size, size_t *raw_len);
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/ssl.h b/engine/thirdparty/mbedtls/include/mbedtls/ssl.h
index 597da257..f9b103e3 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/ssl.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/ssl.h
@@ -166,6 +166,42 @@
 #define MBEDTLS_ERR_SSL_VERSION_MISMATCH                  -0x5F00
 /** Invalid value in SSL config */
 #define MBEDTLS_ERR_SSL_BAD_CONFIG                        -0x5E80
+/* Error space gap */
+/** Attempt to verify a certificate without an expected hostname.
+ * This is usually insecure.
+ *
+ * In TLS clients, when a client authenticates a server through its
+ * certificate, the client normally checks three things:
+ * - the certificate chain must be valid;
+ * - the chain must start from a trusted CA;
+ * - the certificate must cover the server name that is expected by the client.
+ *
+ * Omitting any of these checks is generally insecure, and can allow a
+ * malicious server to impersonate a legitimate server.
+ *
+ * The third check may be safely skipped in some unusual scenarios,
+ * such as networks where eavesdropping is a risk but not active attacks,
+ * or a private PKI where the client equally trusts all servers that are
+ * accredited by the root CA.
+ *
+ * You should call mbedtls_ssl_set_hostname() with the expected server name
+ * before starting a TLS handshake on a client (unless the client is
+ * set up to only use PSK-based authentication, which does not rely on the
+ * host name). If you have determined that server name verification is not
+ * required for security in your scenario, call mbedtls_ssl_set_hostname()
+ * with \p NULL as the server name.
+ *
+ * This error is raised if all of the following conditions are met:
+ *
+ * - A TLS client is configured with the authentication mode
+ *   #MBEDTLS_SSL_VERIFY_REQUIRED (default).
+ * - Certificate authentication is enabled.
+ * - The client does not call mbedtls_ssl_set_hostname().
+ * - The configuration option
+ *   #MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+ *   is not enabled.
+ */
+#define MBEDTLS_ERR_SSL_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME  -0x5D80
 
 /*
  * Constants from RFC 8446 for TLS 1.3 PSK modes
@@ -1893,8 +1929,35 @@ struct mbedtls_ssl_context {
      * User settings
      */
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    char *MBEDTLS_PRIVATE(hostname);             /*!< expected peer CN for verification
-                                                    (and SNI if available)                 */
+    /** Expected peer CN for verification.
+     *
+     * Also used on clients for SNI,
+     * and for TLS 1.3 session resumption using tickets.
+     *
+     * The value of this field can be:
+     * - \p NULL in a newly initialized or reset context.
+     * - A heap-allocated copy of the last value passed to
+     *   mbedtls_ssl_set_hostname(), if the last call had a non-null
+     *  \p hostname argument.
+     * - A special value to indicate that mbedtls_ssl_set_hostname()
+     *   was called with \p NULL (as opposed to never having been called).
+     *   See `mbedtls_ssl_get_hostname_pointer()` in `ssl_tls.c`.
+     *
+     * If this field contains the value \p NULL and the configuration option
+     * #MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+     * is unset, on a TLS client, attempting to verify a server certificate
+     * results in the error
+     * #MBEDTLS_ERR_SSL_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME.
+     *
+     * If this field contains the special value described above, or if
+     * the value is \p NULL and the configuration option
+     * #MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+     * is set, then the peer name verification is skipped, which may be
+     * insecure, especially on a client. Furthermore, on a client, the
+     * server_name extension is not sent, and the server name is ignored
+     * in TLS 1.3 session resumption using tickets.
+     */
+    char *MBEDTLS_PRIVATE(hostname);
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 
 #if defined(MBEDTLS_SSL_ALPN)
@@ -2002,6 +2065,14 @@ void mbedtls_ssl_init(mbedtls_ssl_context *ssl);
  *                 Calling mbedtls_ssl_setup again is not supported, even
  *                 if no session is active.
  *
+ * \warning        After setting up a client context, if certificate-based
+ *                 authentication is enabled, you should call
+ *                 mbedtls_ssl_set_hostname() to specifiy the expected
+ *                 name of the server. Without this, in most scenarios,
+ *                 the TLS connection is insecure. See
+ *                 #MBEDTLS_ERR_SSL_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+ *                 for more information.
+ *
  * \note           If #MBEDTLS_USE_PSA_CRYPTO is enabled, the PSA crypto
  *                 subsystem must have been initialized by calling
  *                 psa_crypto_init() before calling this function.
@@ -3976,16 +4047,29 @@ void mbedtls_ssl_conf_sig_algs(mbedtls_ssl_config *conf,
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
 /**
  * \brief          Set or reset the hostname to check against the received
- *                 server certificate. It sets the ServerName TLS extension,
- *                 too, if that extension is enabled. (client-side only)
+ *                 peer certificate. On a client, this also sets the
+ *                 ServerName TLS extension, if that extension is enabled.
+ *                 On a TLS 1.3 client, this also sets the server name in
+ *                 the session resumption ticket, if that feature is enabled.
  *
  * \param ssl      SSL context
- * \param hostname the server hostname, may be NULL to clear hostname
-
- * \note           Maximum hostname length MBEDTLS_SSL_MAX_HOST_NAME_LEN.
+ * \param hostname The server hostname. This may be \c NULL to clear
+ *                 the hostname.
  *
- * \return         0 if successful, MBEDTLS_ERR_SSL_ALLOC_FAILED on
- *                 allocation failure, MBEDTLS_ERR_SSL_BAD_INPUT_DATA on
+ * \note           Maximum hostname length #MBEDTLS_SSL_MAX_HOST_NAME_LEN.
+ *
+ * \note           If the hostname is \c NULL on a client, then the server
+ *                 is not authenticated: it only needs to have a valid
+ *                 certificate, not a certificate matching its name.
+ *                 Therefore you should always call this function on a client,
+ *                 unless the connection is set up to only allow
+ *                 pre-shared keys, or in scenarios where server
+ *                 impersonation is not a concern. See the documentation of
+ *                 #MBEDTLS_ERR_SSL_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME
+ *                 for more details.
+ *
+ * \return         0 if successful, #MBEDTLS_ERR_SSL_ALLOC_FAILED on
+ *                 allocation failure, #MBEDTLS_ERR_SSL_BAD_INPUT_DATA on
  *                 too long input hostname.
  *
  *                 Hostname set to the one provided on success (cleared
@@ -4449,6 +4533,10 @@ void mbedtls_ssl_conf_cert_req_ca_list(mbedtls_ssl_config *conf,
  *                 with \c mbedtls_ssl_read()), not handshake messages.
  *                 With DTLS, this affects both ApplicationData and handshake.
  *
+ * \note           Defragmentation of TLS handshake messages is supported
+ *                 with some limitations. See the documentation of
+ *                 mbedtls_ssl_handshake() for details.
+ *
  * \note           This sets the maximum length for a record's payload,
  *                 excluding record overhead that will be added to it, see
  *                 \c mbedtls_ssl_get_record_expansion().
@@ -4979,6 +5067,24 @@ int mbedtls_ssl_get_session(const mbedtls_ssl_context *ssl,
  *                 if a negotiation involving TLS 1.3 takes place (this may
  *                 be the case even if TLS 1.3 is offered but eventually
  *                 not selected).
+ *
+ * \note           In TLS, reception of fragmented handshake messages is
+ *                 supported with some limitations (those limitations do
+ *                 not apply to DTLS, where defragmentation is fully
+ *                 supported):
+ *                 - On an Mbed TLS server that only accepts TLS 1.2,
+ *                   the initial ClientHello message must not be fragmented.
+ *                   A TLS 1.2 ClientHello may be fragmented if the server
+ *                   also accepts TLS 1.3 connections (meaning
+ *                   that #MBEDTLS_SSL_PROTO_TLS1_3 enabled, and the
+ *                   accepted versions have not been restricted with
+ *                   mbedtls_ssl_conf_max_tls_version() or the like).
+ *                 - The first fragment of a handshake message must be
+ *                   at least 4 bytes long.
+ *                 - Non-handshake records must not be interleaved between
+ *                   the fragments of a handshake message. (This is permitted
+ *                   in TLS 1.2 but not in TLS 1.3, but Mbed TLS rejects it
+ *                   even in TLS 1.2.)
  */
 int mbedtls_ssl_handshake(mbedtls_ssl_context *ssl);
 
diff --git a/engine/thirdparty/mbedtls/include/mbedtls/threading.h b/engine/thirdparty/mbedtls/include/mbedtls/threading.h
index d50d04ea..b4df0e38 100644
--- a/engine/thirdparty/mbedtls/include/mbedtls/threading.h
+++ b/engine/thirdparty/mbedtls/include/mbedtls/threading.h
@@ -30,7 +30,7 @@ typedef struct mbedtls_threading_mutex_t {
     pthread_mutex_t MBEDTLS_PRIVATE(mutex);
 
     /* WARNING - state should only be accessed when holding the mutex lock in
-     * tests/src/threading_helpers.c, otherwise corruption can occur.
+     * framework/tests/src/threading_helpers.c, otherwise corruption can occur.
      * state will be 0 after a failed init or a free, and nonzero after a
      * successful init. This field is for testing only and thus not considered
      * part of the public API of Mbed TLS and may change without notice.*/
diff --git a/engine/thirdparty/mbedtls/include/psa/crypto_config.h b/engine/thirdparty/mbedtls/include/psa/crypto_config.h
index 36e937ad..e0a8d606 100644
--- a/engine/thirdparty/mbedtls/include/psa/crypto_config.h
+++ b/engine/thirdparty/mbedtls/include/psa/crypto_config.h
@@ -38,10 +38,6 @@
 #ifndef PSA_CRYPTO_CONFIG_H
 #define PSA_CRYPTO_CONFIG_H
 
-/*
- * CBC-MAC is not yet supported via the PSA API in Mbed TLS.
- */
-//#define PSA_WANT_ALG_CBC_MAC                    1
 #define PSA_WANT_ALG_CBC_NO_PADDING             1
 #define PSA_WANT_ALG_CBC_PKCS7                  1
 #define PSA_WANT_ALG_CCM                        1
@@ -84,22 +80,12 @@
 #define PSA_WANT_ALG_TLS12_PSK_TO_MS            1
 #define PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS       1
 
-/* XTS is not yet supported via the PSA API in Mbed TLS.
- * Note: when adding support, also adjust include/mbedtls/config_psa.h */
-//#define PSA_WANT_ALG_XTS                        1
-
 #define PSA_WANT_ECC_BRAINPOOL_P_R1_256         1
 #define PSA_WANT_ECC_BRAINPOOL_P_R1_384         1
 #define PSA_WANT_ECC_BRAINPOOL_P_R1_512         1
 #define PSA_WANT_ECC_MONTGOMERY_255             1
 #define PSA_WANT_ECC_MONTGOMERY_448             1
 #define PSA_WANT_ECC_SECP_K1_192                1
-/*
- * SECP224K1 is buggy via the PSA API in Mbed TLS
- * (https://github.com/Mbed-TLS/mbedtls/issues/3541). Thus, do not enable it by
- * default.
- */
-//#define PSA_WANT_ECC_SECP_K1_224                1
 #define PSA_WANT_ECC_SECP_K1_256                1
 #define PSA_WANT_ECC_SECP_R1_192                1
 #define PSA_WANT_ECC_SECP_R1_224                1
diff --git a/engine/thirdparty/mbedtls/include/psa/crypto_extra.h b/engine/thirdparty/mbedtls/include/psa/crypto_extra.h
index d276cd4c..e6c0f715 100644
--- a/engine/thirdparty/mbedtls/include/psa/crypto_extra.h
+++ b/engine/thirdparty/mbedtls/include/psa/crypto_extra.h
@@ -32,6 +32,16 @@ extern "C" {
 #define MBEDTLS_PSA_KEY_SLOT_COUNT 32
 #endif
 
+/* If the size of static key slots is not explicitly defined by the user, then
+ * set it to the maximum between PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE and
+ * PSA_CIPHER_MAX_KEY_LENGTH.
+ * See mbedtls_config.h for the definition. */
+#if !defined(MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE)
+#define MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE  \
+    ((PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE > PSA_CIPHER_MAX_KEY_LENGTH) ? \
+     PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE : PSA_CIPHER_MAX_KEY_LENGTH)
+#endif /* !MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE*/
+
 /** \addtogroup attributes
  * @{
  */
@@ -573,6 +583,35 @@ psa_status_t mbedtls_psa_platform_get_builtin_key(
 
 /** @} */
 
+/** \defgroup psa_crypto_client Functions defined by a client provider
+ *
+ * The functions in this group are meant to be implemented by providers of
+ * the PSA Crypto client interface. They are provided by the library when
+ * #MBEDTLS_PSA_CRYPTO_C is enabled.
+ *
+ * \note All functions in this group are experimental, as using
+ *       alternative client interface providers is experimental.
+ *
+ * @{
+ */
+
+/** Check if PSA is capable of handling the specified hash algorithm.
+ *
+ * This means that PSA core was built with the corresponding PSA_WANT_ALG_xxx
+ * set and that psa_crypto_init has already been called.
+ *
+ * \note When using Mbed TLS version of PSA core (i.e. MBEDTLS_PSA_CRYPTO_C is
+ *       set) for now this function only checks the state of the driver
+ *       subsystem, not the algorithm. This might be improved in the future.
+ *
+ * \param hash_alg  The hash algorithm.
+ *
+ * \return 1 if the PSA can handle \p hash_alg, 0 otherwise.
+ */
+int psa_can_do_hash(psa_algorithm_t hash_alg);
+
+/**@}*/
+
 /** \addtogroup crypto_types
  * @{
  */
diff --git a/engine/thirdparty/mbedtls/include/psa/crypto_sizes.h b/engine/thirdparty/mbedtls/include/psa/crypto_sizes.h
index 635ee98f..87b8c39f 100644
--- a/engine/thirdparty/mbedtls/include/psa/crypto_sizes.h
+++ b/engine/thirdparty/mbedtls/include/psa/crypto_sizes.h
@@ -1038,6 +1038,10 @@
     PSA_KEY_EXPORT_FFDH_PUBLIC_KEY_MAX_SIZE(PSA_VENDOR_FFDH_MAX_KEY_BITS)
 #endif
 
+#define PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE \
+    ((PSA_EXPORT_KEY_PAIR_MAX_SIZE > PSA_EXPORT_PUBLIC_KEY_MAX_SIZE) ? \
+     PSA_EXPORT_KEY_PAIR_MAX_SIZE : PSA_EXPORT_PUBLIC_KEY_MAX_SIZE)
+
 /** Sufficient output buffer size for psa_raw_key_agreement().
  *
  * This macro returns a compile-time constant if its arguments are
@@ -1085,6 +1089,27 @@
 #define PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE    PSA_BITS_TO_BYTES(PSA_VENDOR_FFDH_MAX_KEY_BITS)
 #endif
 
+/** Maximum key length for ciphers.
+ *
+ * Since there is no additional PSA_WANT_xxx symbol to specifiy the size of
+ * the key once a cipher is enabled (as it happens for asymmetric keys for
+ * example), the maximum key length is taken into account for each cipher.
+ * The resulting value will be the maximum cipher's key length given depending
+ * on which ciphers are enabled.
+ *
+ * Note: max value for AES used below would be doubled if XTS were enabled, but
+ *       this mode is currently not supported in Mbed TLS implementation of PSA
+ *       APIs.
+ */
+#if (defined(PSA_WANT_KEY_TYPE_AES) || defined(PSA_WANT_KEY_TYPE_ARIA) || \
+    defined(PSA_WANT_KEY_TYPE_CAMELLIA) || defined(PSA_WANT_KEY_TYPE_CHACHA20))
+#define PSA_CIPHER_MAX_KEY_LENGTH       32u
+#elif defined(PSA_WANT_KEY_TYPE_DES)
+#define PSA_CIPHER_MAX_KEY_LENGTH       24u
+#else
+#define PSA_CIPHER_MAX_KEY_LENGTH       0u
+#endif
+
 /** The default IV size for a cipher algorithm, in bytes.
  *
  * The IV that is generated as part of a call to #psa_cipher_encrypt() is always
diff --git a/engine/thirdparty/mbedtls/library/aesni.c b/engine/thirdparty/mbedtls/library/aesni.c
index 8e5bd55a..4fc1cb91 100644
--- a/engine/thirdparty/mbedtls/library/aesni.c
+++ b/engine/thirdparty/mbedtls/library/aesni.c
@@ -489,7 +489,7 @@ int mbedtls_aesni_crypt_ecb(mbedtls_aes_context *ctx,
          "movdqu    %%xmm0, (%4)    \n\t" // export output
          :
          : "r" (ctx->nr), "r" (ctx->buf + ctx->rk_offset), "r" (mode), "r" (input), "r" (output)
-         : "memory", "cc", "xmm0", "xmm1");
+         : "memory", "cc", "xmm0", "xmm1", "0", "1");
 
 
     return 0;
@@ -679,7 +679,7 @@ static void aesni_setkey_enc_128(unsigned char *rk,
          AESKEYGENA(xmm0_xmm1, "0x36")      "call 1b \n\t"
          :
          : "r" (rk), "r" (key)
-         : "memory", "cc", "0");
+         : "memory", "cc", "xmm0", "xmm1", "0");
 }
 
 /*
@@ -737,7 +737,7 @@ static void aesni_setkey_enc_192(unsigned char *rk,
 
          :
          : "r" (rk), "r" (key)
-         : "memory", "cc", "0");
+         : "memory", "cc", "xmm0", "xmm1", "xmm2", "0");
 }
 #endif /* !MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */
 
@@ -805,7 +805,7 @@ static void aesni_setkey_enc_256(unsigned char *rk,
          AESKEYGENA(xmm1_xmm2, "0x40")      "call 1b \n\t"
          :
          : "r" (rk), "r" (key)
-         : "memory", "cc", "0");
+         : "memory", "cc", "xmm0", "xmm1", "xmm2", "0");
 }
 #endif /* !MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH */
 
diff --git a/engine/thirdparty/mbedtls/library/bignum_core.c b/engine/thirdparty/mbedtls/library/bignum_core.c
index 4231554b..88582c2d 100644
--- a/engine/thirdparty/mbedtls/library/bignum_core.c
+++ b/engine/thirdparty/mbedtls/library/bignum_core.c
@@ -747,8 +747,8 @@ static void exp_mod_precompute_window(const mbedtls_mpi_uint *A,
 }
 
 #if defined(MBEDTLS_TEST_HOOKS) && !defined(MBEDTLS_THREADING_C)
-// Set to a default that is neither MBEDTLS_MPI_IS_PUBLIC nor MBEDTLS_MPI_IS_SECRET
-int mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_PUBLIC + MBEDTLS_MPI_IS_SECRET + 1;
+void (*mbedtls_safe_codepath_hook)(void) = NULL;
+void (*mbedtls_unsafe_codepath_hook)(void) = NULL;
 #endif
 
 /*
@@ -781,7 +781,9 @@ static inline void exp_mod_calc_first_bit_optionally_safe(const mbedtls_mpi_uint
         *E_bit_index = E_bits % biL;
 
 #if defined(MBEDTLS_TEST_HOOKS) && !defined(MBEDTLS_THREADING_C)
-        mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_PUBLIC;
+        if (mbedtls_unsafe_codepath_hook != NULL) {
+            mbedtls_unsafe_codepath_hook();
+        }
 #endif
     } else {
         /*
@@ -791,9 +793,8 @@ static inline void exp_mod_calc_first_bit_optionally_safe(const mbedtls_mpi_uint
         *E_limb_index = E_limbs;
         *E_bit_index = 0;
 #if defined(MBEDTLS_TEST_HOOKS) && !defined(MBEDTLS_THREADING_C)
-        // Only mark the codepath safe if there wasn't an unsafe codepath before
-        if (mbedtls_mpi_optionally_safe_codepath != MBEDTLS_MPI_IS_PUBLIC) {
-            mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_SECRET;
+        if (mbedtls_safe_codepath_hook != NULL) {
+            mbedtls_safe_codepath_hook();
         }
 #endif
     }
@@ -813,7 +814,9 @@ static inline void exp_mod_table_lookup_optionally_safe(mbedtls_mpi_uint *Wselec
     if (window_public == MBEDTLS_MPI_IS_PUBLIC) {
         memcpy(Wselect, Wtable + window * AN_limbs, AN_limbs * ciL);
 #if defined(MBEDTLS_TEST_HOOKS) && !defined(MBEDTLS_THREADING_C)
-        mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_PUBLIC;
+        if (mbedtls_unsafe_codepath_hook != NULL) {
+            mbedtls_unsafe_codepath_hook();
+        }
 #endif
     } else {
         /* Select Wtable[window] without leaking window through
@@ -821,9 +824,8 @@ static inline void exp_mod_table_lookup_optionally_safe(mbedtls_mpi_uint *Wselec
         mbedtls_mpi_core_ct_uint_table_lookup(Wselect, Wtable,
                                               AN_limbs, welem, window);
 #if defined(MBEDTLS_TEST_HOOKS) && !defined(MBEDTLS_THREADING_C)
-        // Only mark the codepath safe if there wasn't an unsafe codepath before
-        if (mbedtls_mpi_optionally_safe_codepath != MBEDTLS_MPI_IS_PUBLIC) {
-            mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_SECRET;
+        if (mbedtls_safe_codepath_hook != NULL) {
+            mbedtls_safe_codepath_hook();
         }
 #endif
     }
@@ -857,8 +859,8 @@ static void mbedtls_mpi_core_exp_mod_optionally_safe(mbedtls_mpi_uint *X,
     /* We'll process the bits of E from most significant
      * (limb_index=E_limbs-1, E_bit_index=biL-1) to least significant
      * (limb_index=0, E_bit_index=0). */
-    size_t E_limb_index;
-    size_t E_bit_index;
+    size_t E_limb_index = E_limbs;
+    size_t E_bit_index = 0;
     exp_mod_calc_first_bit_optionally_safe(E, E_limbs, E_public,
                                            &E_limb_index, &E_bit_index);
 
diff --git a/engine/thirdparty/mbedtls/library/bignum_core.h b/engine/thirdparty/mbedtls/library/bignum_core.h
index cf6485a1..264ee635 100644
--- a/engine/thirdparty/mbedtls/library/bignum_core.h
+++ b/engine/thirdparty/mbedtls/library/bignum_core.h
@@ -70,9 +70,7 @@
 
 #include "common.h"
 
-#if defined(MBEDTLS_BIGNUM_C)
 #include "mbedtls/bignum.h"
-#endif
 
 #include "constant_time_internal.h"
 
@@ -106,10 +104,17 @@
  *  } else {
  *      // safe path
  *  }
- * not the other way round, in order to prevent misuse. (This is, if a value
- * other than the two below is passed, default to the safe path.) */
+ * not the other way round, in order to prevent misuse. (That is, if a value
+ * other than the two below is passed, default to the safe path.)
+ *
+ * The value of MBEDTLS_MPI_IS_PUBLIC is chosen in a way that is unlikely to happen by accident, but
+ * which can be used as an immediate value in a Thumb2 comparison (for code size). */
 #define MBEDTLS_MPI_IS_PUBLIC  0x2a2a2a2a
 #define MBEDTLS_MPI_IS_SECRET  0
+#if defined(MBEDTLS_TEST_HOOKS) && !defined(MBEDTLS_THREADING_C)
+// Default value for testing that is neither MBEDTLS_MPI_IS_PUBLIC nor MBEDTLS_MPI_IS_SECRET
+#define MBEDTLS_MPI_IS_TEST  1
+#endif
 
 /** Count leading zero bits in a given integer.
  *
@@ -817,17 +822,4 @@ void mbedtls_mpi_core_from_mont_rep(mbedtls_mpi_uint *X,
                                     mbedtls_mpi_uint mm,
                                     mbedtls_mpi_uint *T);
 
-/*
- * Can't define thread local variables with our abstraction layer: do nothing if threading is on.
- */
-#if defined(MBEDTLS_TEST_HOOKS) && !defined(MBEDTLS_THREADING_C)
-extern int mbedtls_mpi_optionally_safe_codepath;
-
-static inline void mbedtls_mpi_optionally_safe_codepath_reset(void)
-{
-    // Set to a default that is neither MBEDTLS_MPI_IS_PUBLIC nor MBEDTLS_MPI_IS_SECRET
-    mbedtls_mpi_optionally_safe_codepath = MBEDTLS_MPI_IS_PUBLIC + MBEDTLS_MPI_IS_SECRET + 1;
-}
-#endif
-
 #endif /* MBEDTLS_BIGNUM_CORE_H */
diff --git a/engine/thirdparty/mbedtls/library/ccm.c b/engine/thirdparty/mbedtls/library/ccm.c
index 45ed697d..969c6c78 100644
--- a/engine/thirdparty/mbedtls/library/ccm.c
+++ b/engine/thirdparty/mbedtls/library/ccm.c
@@ -170,11 +170,12 @@ static int ccm_calculate_first_block_if_ready(mbedtls_ccm_context *ctx)
     }
 
     /* CCM expects non-empty tag.
-     * CCM* allows empty tag. For CCM* without tag, ignore plaintext length.
+     * CCM* allows empty tag. For CCM* without tag, the tag calculation is skipped.
      */
     if (ctx->tag_len == 0) {
         if (ctx->mode == MBEDTLS_CCM_STAR_ENCRYPT || ctx->mode == MBEDTLS_CCM_STAR_DECRYPT) {
             ctx->plaintext_len = 0;
+            return 0;
         } else {
             return MBEDTLS_ERR_CCM_BAD_INPUT;
         }
diff --git a/engine/thirdparty/mbedtls/library/constant_time_impl.h b/engine/thirdparty/mbedtls/library/constant_time_impl.h
index 2a4574ba..aeaeecb7 100644
--- a/engine/thirdparty/mbedtls/library/constant_time_impl.h
+++ b/engine/thirdparty/mbedtls/library/constant_time_impl.h
@@ -36,24 +36,9 @@
     #pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
 
-/* Disable asm under Memsan because it confuses Memsan and generates false errors.
- *
- * We also disable under Valgrind by default, because it's more useful
- * for Valgrind to test the plain C implementation. MBEDTLS_TEST_CONSTANT_FLOW_ASM //no-check-names
- * may be set to permit building asm under Valgrind.
- */
-#if defined(MBEDTLS_TEST_CONSTANT_FLOW_MEMSAN) || \
-    (defined(MBEDTLS_TEST_CONSTANT_FLOW_VALGRIND) && !defined(MBEDTLS_TEST_CONSTANT_FLOW_ASM)) //no-check-names
-#define MBEDTLS_CT_NO_ASM
-#elif defined(__has_feature)
-#if __has_feature(memory_sanitizer)
-#define MBEDTLS_CT_NO_ASM
-#endif
-#endif
-
 /* armcc5 --gnu defines __GNUC__ but doesn't support GNU's extended asm */
 #if defined(MBEDTLS_HAVE_ASM) && defined(__GNUC__) && (!defined(__ARMCC_VERSION) || \
-    __ARMCC_VERSION >= 6000000) && !defined(MBEDTLS_CT_NO_ASM)
+    __ARMCC_VERSION >= 6000000)
 #define MBEDTLS_CT_ASM
 #if (defined(__arm__) || defined(__thumb__) || defined(__thumb2__))
 #define MBEDTLS_CT_ARM_ASM
diff --git a/engine/thirdparty/mbedtls/library/ecp.c b/engine/thirdparty/mbedtls/library/ecp.c
index 427059bb..fdd00a59 100644
--- a/engine/thirdparty/mbedtls/library/ecp.c
+++ b/engine/thirdparty/mbedtls/library/ecp.c
@@ -3056,7 +3056,7 @@ int mbedtls_ecp_check_privkey(const mbedtls_ecp_group *grp,
         /* see RFC 7748 sec. 5 para. 5 */
         if (mbedtls_mpi_get_bit(d, 0) != 0 ||
             mbedtls_mpi_get_bit(d, 1) != 0 ||
-            mbedtls_mpi_bitlen(d) - 1 != grp->nbits) {  /* mbedtls_mpi_bitlen is one-based! */
+            mbedtls_mpi_bitlen(d) != grp->nbits + 1) {  /* mbedtls_mpi_bitlen is one-based! */
             return MBEDTLS_ERR_ECP_INVALID_KEY;
         }
 
diff --git a/engine/thirdparty/mbedtls/library/error.c b/engine/thirdparty/mbedtls/library/error.c
index 6ad7162a..297eccd0 100644
--- a/engine/thirdparty/mbedtls/library/error.c
+++ b/engine/thirdparty/mbedtls/library/error.c
@@ -479,6 +479,8 @@ const char *mbedtls_high_level_strerr(int error_code)
             return( "SSL - An operation failed due to an unexpected version or configuration" );
         case -(MBEDTLS_ERR_SSL_BAD_CONFIG):
             return( "SSL - Invalid value in SSL config" );
+        case -(MBEDTLS_ERR_SSL_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME):
+            return( "SSL - Attempt to verify a certificate without an expected hostname. This is usually insecure.  In TLS clients, when a client authenticates a server through its certificate, the client normally checks three things: - the certificate chain must be valid; - the chain must start from a trusted CA; - the certificate must cover the server name that is expected by the client.  Omitting any of these checks is generally insecure, and can allow a malicious server to impersonate a legitimate server.  The third check may be safely skipped in some unusual scenarios, such as networks where eavesdropping is a risk but not active attacks, or a private PKI where the client equally trusts all servers that are accredited by the root CA.  You should call mbedtls_ssl_set_hostname() with the expected server name before starting a TLS handshake on a client (unless the client is set up to only use PSK-based authentication, which does not rely on the host name). If you have determined that server name verification is not required for security in your scenario, call mbedtls_ssl_set_hostname() with \\p NULL as the server name.  This error is raised if all of the following conditions are met:  - A TLS client is configured with the authentication mode #MBEDTLS_SSL_VERIFY_REQUIRED (default). - Certificate authentication is enabled. - The client does not call mbedtls_ssl_set_hostname(). - The configuration option #MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME is not enabled" );
 #endif /* MBEDTLS_SSL_TLS_C */
 
 #if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
@@ -873,8 +875,4 @@ void mbedtls_strerror(int ret, char *buf, size_t buflen)
 
 #endif /* MBEDTLS_ERROR_C */
 
-#if defined(MBEDTLS_TEST_HOOKS)
-void (*mbedtls_test_hook_error_add)(int, int, const char *, int);
-#endif
-
 #endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */
diff --git a/engine/thirdparty/mbedtls/library/net_sockets.c b/engine/thirdparty/mbedtls/library/net_sockets.c
index ef89a88e..1419c787 100644
--- a/engine/thirdparty/mbedtls/library/net_sockets.c
+++ b/engine/thirdparty/mbedtls/library/net_sockets.c
@@ -190,7 +190,7 @@ int mbedtls_net_connect(mbedtls_net_context *ctx, const char *host,
             break;
         }
 
-        close(ctx->fd);
+        mbedtls_net_close(ctx);
         ret = MBEDTLS_ERR_NET_CONNECT_FAILED;
     }
 
@@ -237,13 +237,13 @@ int mbedtls_net_bind(mbedtls_net_context *ctx, const char *bind_ip, const char *
         n = 1;
         if (setsockopt(ctx->fd, SOL_SOCKET, SO_REUSEADDR,
                        (const char *) &n, sizeof(n)) != 0) {
-            close(ctx->fd);
+            mbedtls_net_close(ctx);
             ret = MBEDTLS_ERR_NET_SOCKET_FAILED;
             continue;
         }
 
         if (bind(ctx->fd, cur->ai_addr, MSVC_INT_CAST cur->ai_addrlen) != 0) {
-            close(ctx->fd);
+            mbedtls_net_close(ctx);
             ret = MBEDTLS_ERR_NET_BIND_FAILED;
             continue;
         }
@@ -251,7 +251,7 @@ int mbedtls_net_bind(mbedtls_net_context *ctx, const char *bind_ip, const char *
         /* Listen only makes sense for TCP */
         if (proto == MBEDTLS_NET_PROTO_TCP) {
             if (listen(ctx->fd, MBEDTLS_NET_LISTEN_BACKLOG) != 0) {
-                close(ctx->fd);
+                mbedtls_net_close(ctx);
                 ret = MBEDTLS_ERR_NET_LISTEN_FAILED;
                 continue;
             }
@@ -524,8 +524,8 @@ void mbedtls_net_usleep(unsigned long usec)
 #else
     struct timeval tv;
     tv.tv_sec  = usec / 1000000;
-#if defined(__unix__) || defined(__unix) || \
-    (defined(__APPLE__) && defined(__MACH__))
+#if (defined(__unix__) || defined(__unix) || \
+    (defined(__APPLE__) && defined(__MACH__))) && !defined(__DJGPP__)
     tv.tv_usec = (suseconds_t) usec % 1000000;
 #else
     tv.tv_usec = usec % 1000000;
diff --git a/engine/thirdparty/mbedtls/library/pk.c b/engine/thirdparty/mbedtls/library/pk.c
index 3fe51ea3..51f0c240 100644
--- a/engine/thirdparty/mbedtls/library/pk.c
+++ b/engine/thirdparty/mbedtls/library/pk.c
@@ -35,10 +35,6 @@
 #include <limits.h>
 #include <stdint.h>
 
-#define PSA_EXPORT_KEY_PAIR_OR_PUBLIC_MAX_SIZE \
-    (PSA_EXPORT_KEY_PAIR_MAX_SIZE > PSA_EXPORT_PUBLIC_KEY_MAX_SIZE) ? \
-    PSA_EXPORT_KEY_PAIR_MAX_SIZE : PSA_EXPORT_PUBLIC_KEY_MAX_SIZE
-
 /*
  * Initialise a mbedtls_pk_context
  */
diff --git a/engine/thirdparty/mbedtls/library/psa_crypto.c b/engine/thirdparty/mbedtls/library/psa_crypto.c
index c4f41db1..348c79cf 100644
--- a/engine/thirdparty/mbedtls/library/psa_crypto.c
+++ b/engine/thirdparty/mbedtls/library/psa_crypto.c
@@ -705,6 +705,11 @@ MBEDTLS_STATIC_TESTABLE psa_status_t psa_mac_key_can_do(
 psa_status_t psa_allocate_buffer_to_slot(psa_key_slot_t *slot,
                                          size_t buffer_length)
 {
+#if defined(MBEDTLS_PSA_STATIC_KEY_SLOTS)
+    if (buffer_length > ((size_t) MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE)) {
+        return PSA_ERROR_NOT_SUPPORTED;
+    }
+#else
     if (slot->key.data != NULL) {
         return PSA_ERROR_ALREADY_EXISTS;
     }
@@ -713,6 +718,7 @@ psa_status_t psa_allocate_buffer_to_slot(psa_key_slot_t *slot,
     if (slot->key.data == NULL) {
         return PSA_ERROR_INSUFFICIENT_MEMORY;
     }
+#endif
 
     slot->key.bytes = buffer_length;
     return PSA_SUCCESS;
@@ -1177,11 +1183,18 @@ static psa_status_t psa_get_and_lock_transparent_key_slot_with_policy(
 
 psa_status_t psa_remove_key_data_from_memory(psa_key_slot_t *slot)
 {
+#if defined(MBEDTLS_PSA_STATIC_KEY_SLOTS)
+    if (slot->key.bytes > 0) {
+        mbedtls_platform_zeroize(slot->key.data, MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE);
+    }
+#else
     if (slot->key.data != NULL) {
         mbedtls_zeroize_and_free(slot->key.data, slot->key.bytes);
     }
 
     slot->key.data = NULL;
+#endif /* MBEDTLS_PSA_STATIC_KEY_SLOTS */
+
     slot->key.bytes = 0;
 
     return PSA_SUCCESS;
@@ -2096,7 +2109,7 @@ psa_status_t psa_import_key(const psa_key_attributes_t *attributes,
      * storage ( thus not in the case of importing a key in a secure element
      * with storage ( MBEDTLS_PSA_CRYPTO_SE_C ) ),we have to allocate a
      * buffer to hold the imported key material. */
-    if (slot->key.data == NULL) {
+    if (slot->key.bytes == 0) {
         if (psa_key_lifetime_is_external(attributes->lifetime)) {
             status = psa_driver_wrapper_get_key_buffer_size_from_key_data(
                 attributes, data, data_length, &storage_size);
@@ -2306,6 +2319,58 @@ exit:
 /* Message digests */
 /****************************************************************/
 
+static int is_hash_supported(psa_algorithm_t alg)
+{
+    switch (alg) {
+#if defined(PSA_WANT_ALG_MD5)
+        case PSA_ALG_MD5:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_RIPEMD160)
+        case PSA_ALG_RIPEMD160:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA_1)
+        case PSA_ALG_SHA_1:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA_224)
+        case PSA_ALG_SHA_224:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA_256)
+        case PSA_ALG_SHA_256:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA_384)
+        case PSA_ALG_SHA_384:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA_512)
+        case PSA_ALG_SHA_512:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA3_224)
+        case PSA_ALG_SHA3_224:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA3_256)
+        case PSA_ALG_SHA3_256:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA3_384)
+        case PSA_ALG_SHA3_384:
+            return 1;
+#endif
+#if defined(PSA_WANT_ALG_SHA3_512)
+        case PSA_ALG_SHA3_512:
+            return 1;
+#endif
+        default:
+            return 0;
+    }
+}
+
 psa_status_t psa_hash_abort(psa_hash_operation_t *operation)
 {
     /* Aborting a non-active operation is allowed */
@@ -2949,16 +3014,44 @@ static psa_status_t psa_sign_verify_check_alg(int input_is_message,
         if (!PSA_ALG_IS_SIGN_MESSAGE(alg)) {
             return PSA_ERROR_INVALID_ARGUMENT;
         }
+    }
 
-        if (PSA_ALG_IS_SIGN_HASH(alg)) {
-            if (!PSA_ALG_IS_HASH(PSA_ALG_SIGN_GET_HASH(alg))) {
-                return PSA_ERROR_INVALID_ARGUMENT;
-            }
-        }
-    } else {
-        if (!PSA_ALG_IS_SIGN_HASH(alg)) {
-            return PSA_ERROR_INVALID_ARGUMENT;
-        }
+    psa_algorithm_t hash_alg = 0;
+    if (PSA_ALG_IS_SIGN_HASH(alg)) {
+        hash_alg = PSA_ALG_SIGN_GET_HASH(alg);
+    }
+
+    /* Now hash_alg==0 if alg by itself doesn't need a hash.
+     * This is good enough for sign-hash, but a guaranteed failure for
+     * sign-message which needs to hash first for all algorithms
+     * supported at the moment. */
+
+    if (hash_alg == 0 && input_is_message) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
+    if (hash_alg == PSA_ALG_ANY_HASH) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
+    /* Give up immediately if the hash is not supported. This has
+     * several advantages:
+     * - For mechanisms that don't use the hash at all (e.g.
+     *   ECDSA verification, randomized ECDSA signature), without
+     *   this check, the operation would succeed even though it has
+     *   been given an invalid argument. This would not be insecure
+     *   since the hash was not necessary, but it would be weird.
+     * - For mechanisms that do use the hash, we avoid an error
+     *   deep inside the execution. In principle this doesn't matter,
+     *   but there is a little more risk of a bug in error handling
+     *   deep inside than in this preliminary check.
+     * - When calling a driver, the driver might be capable of using
+     *   a hash that the core doesn't support. This could potentially
+     *   result in a buffer overflow if the hash is larger than the
+     *   maximum hash size assumed by the core.
+     * - Returning a consistent error makes it possible to test
+     *   not-supported hashes in a consistent way.
+     */
+    if (hash_alg != 0 && !is_hash_supported(hash_alg)) {
+        return PSA_ERROR_NOT_SUPPORTED;
     }
 
     return PSA_SUCCESS;
@@ -3839,6 +3932,34 @@ uint32_t mbedtls_psa_verify_hash_get_num_ops(
         * defined( MBEDTLS_ECP_RESTARTABLE ) */
 }
 
+/* Detect supported interruptible sign/verify mechanisms precisely.
+ * This is not strictly needed: we could accept everything, and let the
+ * code fail later during complete() if the mechanism is unsupported
+ * (e.g. attempting deterministic ECDSA when only the randomized variant
+ * is available). But it's easier for applications and especially for our
+ * test code to detect all not-supported errors during start().
+ *
+ * Note that this function ignores the hash component. The core code
+ * is supposed to check the hash part by calling is_hash_supported().
+ */
+static inline int can_do_interruptible_sign_verify(psa_algorithm_t alg)
+{
+#if defined(MBEDTLS_ECP_RESTARTABLE)
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA)
+    if (PSA_ALG_IS_DETERMINISTIC_ECDSA(alg)) {
+        return 1;
+    }
+#endif
+#if defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA)
+    if (PSA_ALG_IS_RANDOMIZED_ECDSA(alg)) {
+        return 1;
+    }
+#endif
+#endif /* defined(MBEDTLS_ECP_RESTARTABLE) */
+    (void) alg;
+    return 0;
+}
+
 psa_status_t mbedtls_psa_sign_hash_start(
     mbedtls_psa_sign_hash_interruptible_operation_t *operation,
     const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
@@ -3848,11 +3969,15 @@ psa_status_t mbedtls_psa_sign_hash_start(
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
     size_t required_hash_length;
 
-    if (!PSA_KEY_TYPE_IS_ECC(attributes->type)) {
+    if (!PSA_KEY_TYPE_IS_ECC_KEY_PAIR(attributes->type)) {
         return PSA_ERROR_NOT_SUPPORTED;
     }
+    psa_ecc_family_t curve = PSA_KEY_TYPE_ECC_GET_FAMILY(attributes->type);
+    if (!PSA_ECC_FAMILY_IS_WEIERSTRASS(curve)) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
 
-    if (!PSA_ALG_IS_ECDSA(alg)) {
+    if (!can_do_interruptible_sign_verify(alg)) {
         return PSA_ERROR_NOT_SUPPORTED;
     }
 
@@ -4067,8 +4192,12 @@ psa_status_t mbedtls_psa_verify_hash_start(
     if (!PSA_KEY_TYPE_IS_ECC(attributes->type)) {
         return PSA_ERROR_NOT_SUPPORTED;
     }
+    psa_ecc_family_t curve = PSA_KEY_TYPE_ECC_GET_FAMILY(attributes->type);
+    if (!PSA_ECC_FAMILY_IS_WEIERSTRASS(curve)) {
+        return PSA_ERROR_INVALID_ARGUMENT;
+    }
 
-    if (!PSA_ALG_IS_ECDSA(alg)) {
+    if (!can_do_interruptible_sign_verify(alg)) {
         return PSA_ERROR_NOT_SUPPORTED;
     }
 
@@ -6187,7 +6316,7 @@ static psa_status_t psa_generate_derived_ecc_key_weierstrass_helper(
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
     size_t m;
-    size_t m_bytes;
+    size_t m_bytes = 0;
 
     mbedtls_mpi_init(&k);
     mbedtls_mpi_init(&diff_N_2);
@@ -6260,7 +6389,7 @@ cleanup:
         status = mbedtls_to_psa_error(ret);
     }
     if (status != PSA_SUCCESS) {
-        mbedtls_free(*data);
+        mbedtls_zeroize_and_free(*data, m_bytes);
         *data = NULL;
     }
     mbedtls_mpi_free(&k);
@@ -6435,7 +6564,7 @@ static psa_status_t psa_generate_derived_key_internal(
     }
 
 exit:
-    mbedtls_free(data);
+    mbedtls_zeroize_and_free(data, bytes);
     return status;
 }
 
@@ -7359,6 +7488,12 @@ static psa_status_t psa_key_derivation_input_internal(
     psa_status_t status;
     psa_algorithm_t kdf_alg = psa_key_derivation_get_kdf_alg(operation);
 
+    if (kdf_alg == PSA_ALG_NONE) {
+        /* This is a blank or aborted operation. */
+        status = PSA_ERROR_BAD_STATE;
+        goto exit;
+    }
+
     status = psa_key_derivation_check_input_type(step, key_type);
     if (status != PSA_SUCCESS) {
         goto exit;
@@ -7417,6 +7552,12 @@ static psa_status_t psa_key_derivation_input_integer_internal(
     psa_status_t status;
     psa_algorithm_t kdf_alg = psa_key_derivation_get_kdf_alg(operation);
 
+    if (kdf_alg == PSA_ALG_NONE) {
+        /* This is a blank or aborted operation. */
+        status = PSA_ERROR_BAD_STATE;
+        goto exit;
+    }
+
 #if defined(PSA_HAVE_SOFT_PBKDF2)
     if (PSA_ALG_IS_PBKDF2(kdf_alg)) {
         status = psa_pbkdf2_set_input_cost(
@@ -7430,6 +7571,7 @@ static psa_status_t psa_key_derivation_input_integer_internal(
         status = PSA_ERROR_INVALID_ARGUMENT;
     }
 
+exit:
     if (status != PSA_SUCCESS) {
         psa_key_derivation_abort(operation);
     }
@@ -8013,7 +8155,7 @@ psa_status_t psa_generate_key_custom(const psa_key_attributes_t *attributes,
      * storage ( thus not in the case of generating a key in a secure element
      * with storage ( MBEDTLS_PSA_CRYPTO_SE_C ) ),we have to allocate a
      * buffer to hold the generated key material. */
-    if (slot->key.data == NULL) {
+    if (slot->key.bytes == 0) {
         if (PSA_KEY_LIFETIME_GET_LOCATION(attributes->lifetime) ==
             PSA_KEY_LOCATION_LOCAL_STORAGE) {
             status = psa_validate_key_type_and_size_for_key_generation(
@@ -9171,7 +9313,7 @@ psa_status_t psa_crypto_local_input_alloc(const uint8_t *input, size_t input_len
     return PSA_SUCCESS;
 
 error:
-    mbedtls_free(local_input->buffer);
+    mbedtls_zeroize_and_free(local_input->buffer, local_input->length);
     local_input->buffer = NULL;
     local_input->length = 0;
     return status;
@@ -9179,7 +9321,7 @@ error:
 
 void psa_crypto_local_input_free(psa_crypto_local_input_t *local_input)
 {
-    mbedtls_free(local_input->buffer);
+    mbedtls_zeroize_and_free(local_input->buffer, local_input->length);
     local_input->buffer = NULL;
     local_input->length = 0;
 }
@@ -9223,7 +9365,7 @@ psa_status_t psa_crypto_local_output_free(psa_crypto_local_output_t *local_outpu
         return status;
     }
 
-    mbedtls_free(local_output->buffer);
+    mbedtls_zeroize_and_free(local_output->buffer, local_output->length);
     local_output->buffer = NULL;
     local_output->length = 0;
 
diff --git a/engine/thirdparty/mbedtls/library/psa_crypto_cipher.c b/engine/thirdparty/mbedtls/library/psa_crypto_cipher.c
index 3216c948..efc5813f 100644
--- a/engine/thirdparty/mbedtls/library/psa_crypto_cipher.c
+++ b/engine/thirdparty/mbedtls/library/psa_crypto_cipher.c
@@ -71,9 +71,6 @@ static psa_status_t mbedtls_cipher_validate_values(
 #if !defined(PSA_WANT_ALG_OFB)
     MBEDTLS_ASSUME(alg != PSA_ALG_OFB);
 #endif
-#if !defined(PSA_WANT_ALG_XTS)
-    MBEDTLS_ASSUME(alg != PSA_ALG_XTS);
-#endif
 #if !defined(PSA_WANT_ALG_ECB_NO_PADDING)
     MBEDTLS_ASSUME(alg != PSA_ALG_ECB_NO_PADDING);
 #endif
diff --git a/engine/thirdparty/mbedtls/library/psa_crypto_core.h b/engine/thirdparty/mbedtls/library/psa_crypto_core.h
index 21e7559f..c3c07701 100644
--- a/engine/thirdparty/mbedtls/library/psa_crypto_core.h
+++ b/engine/thirdparty/mbedtls/library/psa_crypto_core.h
@@ -24,18 +24,6 @@
 #include "mbedtls/threading.h"
 #endif
 
-/**
- * Tell if PSA is ready for this hash.
- *
- * \note            For now, only checks the state of the driver subsystem,
- *                  not the algorithm. Might do more in the future.
- *
- * \param hash_alg  The hash algorithm (ignored for now).
- *
- * \return 1 if the driver subsytem is ready, 0 otherwise.
- */
-int psa_can_do_hash(psa_algorithm_t hash_alg);
-
 /**
  * Tell if PSA is ready for this cipher.
  *
@@ -155,7 +143,11 @@ typedef struct {
     /* Dynamically allocated key data buffer.
      * Format as specified in psa_export_key(). */
     struct key_data {
+#if defined(MBEDTLS_PSA_STATIC_KEY_SLOTS)
+        uint8_t data[MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE];
+#else
         uint8_t *data;
+#endif
         size_t bytes;
     } key;
 } psa_key_slot_t;
diff --git a/engine/thirdparty/mbedtls/library/psa_crypto_driver_wrappers.h b/engine/thirdparty/mbedtls/library/psa_crypto_driver_wrappers.h
index b9015572..0ed221b5 100644
--- a/engine/thirdparty/mbedtls/library/psa_crypto_driver_wrappers.h
+++ b/engine/thirdparty/mbedtls/library/psa_crypto_driver_wrappers.h
@@ -306,8 +306,7 @@ static inline psa_status_t psa_driver_wrapper_sign_hash(
 #endif /* PSA_CRYPTO_DRIVER_TEST */
 #if defined (MBEDTLS_PSA_P256M_DRIVER_ENABLED)
             if( PSA_KEY_TYPE_IS_ECC( psa_get_key_type(attributes) ) &&
-                PSA_ALG_IS_ECDSA(alg) &&
-                !PSA_ALG_ECDSA_IS_DETERMINISTIC( alg ) &&
+                PSA_ALG_IS_RANDOMIZED_ECDSA(alg) &&
                 PSA_KEY_TYPE_ECC_GET_FAMILY(psa_get_key_type(attributes)) == PSA_ECC_FAMILY_SECP_R1 &&
                 psa_get_key_bits(attributes) == 256 )
             {
@@ -411,7 +410,6 @@ static inline psa_status_t psa_driver_wrapper_verify_hash(
 #if defined (MBEDTLS_PSA_P256M_DRIVER_ENABLED)
             if( PSA_KEY_TYPE_IS_ECC( psa_get_key_type(attributes) ) &&
                 PSA_ALG_IS_ECDSA(alg) &&
-                !PSA_ALG_ECDSA_IS_DETERMINISTIC( alg ) &&
                 PSA_KEY_TYPE_ECC_GET_FAMILY(psa_get_key_type(attributes)) == PSA_ECC_FAMILY_SECP_R1 &&
                 psa_get_key_bits(attributes) == 256 )
             {
diff --git a/engine/thirdparty/mbedtls/library/psa_crypto_ecp.c b/engine/thirdparty/mbedtls/library/psa_crypto_ecp.c
index 95baff6a..48b90ef5 100644
--- a/engine/thirdparty/mbedtls/library/psa_crypto_ecp.c
+++ b/engine/thirdparty/mbedtls/library/psa_crypto_ecp.c
@@ -321,38 +321,36 @@ psa_status_t mbedtls_psa_ecp_generate_key(
     const psa_key_attributes_t *attributes,
     uint8_t *key_buffer, size_t key_buffer_size, size_t *key_buffer_length)
 {
-    psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
-    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
-
     psa_ecc_family_t curve = PSA_KEY_TYPE_ECC_GET_FAMILY(
         attributes->type);
     mbedtls_ecp_group_id grp_id =
         mbedtls_ecc_group_from_psa(curve, attributes->bits);
-
-    const mbedtls_ecp_curve_info *curve_info =
-        mbedtls_ecp_curve_info_from_grp_id(grp_id);
-    mbedtls_ecp_keypair ecp;
-
-    if (grp_id == MBEDTLS_ECP_DP_NONE || curve_info == NULL) {
+    if (grp_id == MBEDTLS_ECP_DP_NONE) {
         return PSA_ERROR_NOT_SUPPORTED;
     }
 
+    mbedtls_ecp_keypair ecp;
     mbedtls_ecp_keypair_init(&ecp);
-    ret = mbedtls_ecp_gen_key(grp_id, &ecp,
-                              mbedtls_psa_get_random,
-                              MBEDTLS_PSA_RANDOM_STATE);
+    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
+
+    ret = mbedtls_ecp_group_load(&ecp.grp, grp_id);
     if (ret != 0) {
-        mbedtls_ecp_keypair_free(&ecp);
-        return mbedtls_to_psa_error(ret);
+        goto exit;
     }
 
-    status = mbedtls_to_psa_error(
-        mbedtls_ecp_write_key_ext(&ecp, key_buffer_length,
-                                  key_buffer, key_buffer_size));
+    ret = mbedtls_ecp_gen_privkey(&ecp.grp, &ecp.d,
+                                  mbedtls_psa_get_random,
+                                  MBEDTLS_PSA_RANDOM_STATE);
+    if (ret != 0) {
+        goto exit;
+    }
 
+    ret = mbedtls_ecp_write_key_ext(&ecp, key_buffer_length,
+                                    key_buffer, key_buffer_size);
+
+exit:
     mbedtls_ecp_keypair_free(&ecp);
-
-    return status;
+    return mbedtls_to_psa_error(ret);
 }
 #endif /* MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_GENERATE */
 
diff --git a/engine/thirdparty/mbedtls/library/psa_crypto_slot_management.c b/engine/thirdparty/mbedtls/library/psa_crypto_slot_management.c
index 9850d8c7..358c7a2f 100644
--- a/engine/thirdparty/mbedtls/library/psa_crypto_slot_management.c
+++ b/engine/thirdparty/mbedtls/library/psa_crypto_slot_management.c
@@ -35,9 +35,9 @@ MBEDTLS_STATIC_ASSERT(PSA_KEY_ID_USER_MIN < PSA_KEY_ID_USER_MAX,
                       "Empty user key ID range");
 MBEDTLS_STATIC_ASSERT(PSA_KEY_ID_VENDOR_MIN < PSA_KEY_ID_VENDOR_MAX,
                       "Empty vendor key ID range");
-MBEDTLS_STATIC_ASSERT(MBEDTLS_PSA_KEY_ID_BUILTIN_MIN < MBEDTLS_PSA_KEY_ID_BUILTIN_MAX,
+MBEDTLS_STATIC_ASSERT(MBEDTLS_PSA_KEY_ID_BUILTIN_MIN <= MBEDTLS_PSA_KEY_ID_BUILTIN_MAX,
                       "Empty builtin key ID range");
-MBEDTLS_STATIC_ASSERT(PSA_KEY_ID_VOLATILE_MIN < PSA_KEY_ID_VOLATILE_MAX,
+MBEDTLS_STATIC_ASSERT(PSA_KEY_ID_VOLATILE_MIN <= PSA_KEY_ID_VOLATILE_MAX,
                       "Empty volatile key ID range");
 
 MBEDTLS_STATIC_ASSERT(PSA_KEY_ID_USER_MAX < PSA_KEY_ID_VENDOR_MIN ||
diff --git a/engine/thirdparty/mbedtls/library/psa_crypto_storage.h b/engine/thirdparty/mbedtls/library/psa_crypto_storage.h
index d7f5b189..433ecdca 100644
--- a/engine/thirdparty/mbedtls/library/psa_crypto_storage.h
+++ b/engine/thirdparty/mbedtls/library/psa_crypto_storage.h
@@ -21,9 +21,16 @@ extern "C" {
 #include <stdint.h>
 #include <string.h>
 
-/* Limit the maximum key size in storage. This should have no effect
- * since the key size is limited in memory. */
+/* Limit the maximum key size in storage. */
+#if defined(MBEDTLS_PSA_STATIC_KEY_SLOTS)
+/* Reflect the maximum size for the key buffer. */
+#define PSA_CRYPTO_MAX_STORAGE_SIZE (MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE)
+#else
+/* Just set an upper boundary but it should have no effect since the key size
+ * is limited in memory. */
 #define PSA_CRYPTO_MAX_STORAGE_SIZE (PSA_BITS_TO_BYTES(PSA_MAX_KEY_BITS))
+#endif
+
 /* Sanity check: a file size must fit in 32 bits. Allow a generous
  * 64kB of metadata. */
 #if PSA_CRYPTO_MAX_STORAGE_SIZE > 0xffff0000
diff --git a/engine/thirdparty/mbedtls/library/psa_util.c b/engine/thirdparty/mbedtls/library/psa_util.c
index 679d00ea..014e648a 100644
--- a/engine/thirdparty/mbedtls/library/psa_util.c
+++ b/engine/thirdparty/mbedtls/library/psa_util.c
@@ -440,6 +440,9 @@ int mbedtls_ecdsa_raw_to_der(size_t bits, const unsigned char *raw, size_t raw_l
     unsigned char *p = der + der_size;
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
+    if (bits == 0) {
+        return MBEDTLS_ERR_ASN1_INVALID_DATA;
+    }
     if (raw_len != (2 * coordinate_len)) {
         return MBEDTLS_ERR_ASN1_INVALID_DATA;
     }
@@ -559,6 +562,9 @@ int mbedtls_ecdsa_der_to_raw(size_t bits, const unsigned char *der, size_t der_l
     size_t coordinate_size = PSA_BITS_TO_BYTES(bits);
     int ret;
 
+    if (bits == 0) {
+        return MBEDTLS_ERR_ASN1_INVALID_DATA;
+    }
     /* The output raw buffer should be at least twice the size of a raw
      * coordinate in order to store r and s. */
     if (raw_size < coordinate_size * 2) {
diff --git a/engine/thirdparty/mbedtls/library/ssl_client.c b/engine/thirdparty/mbedtls/library/ssl_client.c
index 345e6089..0bd00cd9 100644
--- a/engine/thirdparty/mbedtls/library/ssl_client.c
+++ b/engine/thirdparty/mbedtls/library/ssl_client.c
@@ -29,19 +29,20 @@ static int ssl_write_hostname_ext(mbedtls_ssl_context *ssl,
                                   size_t *olen)
 {
     unsigned char *p = buf;
+    const char *hostname = mbedtls_ssl_get_hostname_pointer(ssl);
     size_t hostname_len;
 
     *olen = 0;
 
-    if (ssl->hostname == NULL) {
+    if (hostname == NULL) {
         return 0;
     }
 
     MBEDTLS_SSL_DEBUG_MSG(3,
                           ("client hello, adding server name extension: %s",
-                           ssl->hostname));
+                           hostname));
 
-    hostname_len = strlen(ssl->hostname);
+    hostname_len = strlen(hostname);
 
     MBEDTLS_SSL_CHK_BUF_PTR(p, end, hostname_len + 9);
 
@@ -85,7 +86,7 @@ static int ssl_write_hostname_ext(mbedtls_ssl_context *ssl,
     MBEDTLS_PUT_UINT16_BE(hostname_len, p, 0);
     p += 2;
 
-    memcpy(p, ssl->hostname, hostname_len);
+    memcpy(p, hostname, hostname_len);
 
     *olen = hostname_len + 9;
 
@@ -881,13 +882,14 @@ static int ssl_prepare_client_hello(mbedtls_ssl_context *ssl)
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \
     defined(MBEDTLS_SSL_SESSION_TICKETS) && \
     defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
+    const char *context_hostname = mbedtls_ssl_get_hostname_pointer(ssl);
     if (ssl->tls_version == MBEDTLS_SSL_VERSION_TLS1_3  &&
         ssl->handshake->resume) {
-        int hostname_mismatch = ssl->hostname != NULL ||
+        int hostname_mismatch = context_hostname != NULL ||
                                 session_negotiate->hostname != NULL;
-        if (ssl->hostname != NULL && session_negotiate->hostname != NULL) {
+        if (context_hostname != NULL && session_negotiate->hostname != NULL) {
             hostname_mismatch = strcmp(
-                ssl->hostname, session_negotiate->hostname) != 0;
+                context_hostname, session_negotiate->hostname) != 0;
         }
 
         if (hostname_mismatch) {
@@ -898,7 +900,7 @@ static int ssl_prepare_client_hello(mbedtls_ssl_context *ssl)
         }
     } else {
         return mbedtls_ssl_session_set_hostname(session_negotiate,
-                                                ssl->hostname);
+                                                context_hostname);
     }
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 &&
           MBEDTLS_SSL_SESSION_TICKETS &&
diff --git a/engine/thirdparty/mbedtls/library/ssl_debug_helpers_generated.c b/engine/thirdparty/mbedtls/library/ssl_debug_helpers_generated.c
index 734c417b..808fce73 100644
--- a/engine/thirdparty/mbedtls/library/ssl_debug_helpers_generated.c
+++ b/engine/thirdparty/mbedtls/library/ssl_debug_helpers_generated.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include "common.h"
+#include "ssl_misc.h"
 
 #if defined(MBEDTLS_DEBUG_C)
 
diff --git a/engine/thirdparty/mbedtls/library/ssl_misc.h b/engine/thirdparty/mbedtls/library/ssl_misc.h
index bfadac7b..2afcaf97 100644
--- a/engine/thirdparty/mbedtls/library/ssl_misc.h
+++ b/engine/thirdparty/mbedtls/library/ssl_misc.h
@@ -11,6 +11,7 @@
 #define MBEDTLS_SSL_MISC_H
 
 #include "mbedtls/build_info.h"
+#include "common.h"
 
 #include "mbedtls/error.h"
 
@@ -47,7 +48,7 @@
 #include "ssl_ciphersuites_internal.h"
 #include "x509_internal.h"
 #include "pk_internal.h"
-#include "common.h"
+
 
 /* Shorthand for restartable ECC */
 #if defined(MBEDTLS_ECP_RESTARTABLE) && \
@@ -2899,6 +2900,18 @@ int mbedtls_ssl_tls13_write_binders_of_pre_shared_key_ext(
     unsigned char *buf, unsigned char *end);
 #endif /* MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_SOME_PSK_ENABLED */
 
+#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
+/** Get the host name from the SSL context.
+ *
+ * \param[in]   ssl     SSL context
+ *
+ * \return The \p hostname pointer from the SSL context.
+ *         \c NULL if mbedtls_ssl_set_hostname() has never been called on
+ *         \p ssl or if it was last called with \p NULL.
+ */
+const char *mbedtls_ssl_get_hostname_pointer(const mbedtls_ssl_context *ssl);
+#endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION */
+
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \
     defined(MBEDTLS_SSL_SESSION_TICKETS) && \
     defined(MBEDTLS_SSL_SERVER_NAME_INDICATION) && \
@@ -2982,6 +2995,7 @@ static inline void mbedtls_ssl_tls13_session_clear_ticket_flags(
 #define MBEDTLS_SSL_SESSION_TICKETS_TLS1_3_MASK \
     (1 << MBEDTLS_SSL_SESSION_TICKETS_TLS1_3_BIT)
 
+#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
 static inline int mbedtls_ssl_conf_get_session_tickets(
     const mbedtls_ssl_config *conf)
 {
@@ -2989,6 +3003,7 @@ static inline int mbedtls_ssl_conf_get_session_tickets(
            MBEDTLS_SSL_SESSION_TICKETS_ENABLED :
            MBEDTLS_SSL_SESSION_TICKETS_DISABLED;
 }
+#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
 static inline int mbedtls_ssl_conf_is_signal_new_session_tickets_enabled(
diff --git a/engine/thirdparty/mbedtls/library/ssl_msg.c b/engine/thirdparty/mbedtls/library/ssl_msg.c
index 08d197e0..4adaf7dc 100644
--- a/engine/thirdparty/mbedtls/library/ssl_msg.c
+++ b/engine/thirdparty/mbedtls/library/ssl_msg.c
@@ -3221,16 +3221,19 @@ static uint32_t ssl_get_hs_total_len(mbedtls_ssl_context const *ssl)
 
 int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
 {
-    /* First handshake fragment must at least include the header. */
-    if (ssl->in_msglen < mbedtls_ssl_hs_hdr_len(ssl) && ssl->in_hslen == 0) {
-        MBEDTLS_SSL_DEBUG_MSG(1, ("handshake message too short: %" MBEDTLS_PRINTF_SIZET,
-                                  ssl->in_msglen));
-        return MBEDTLS_ERR_SSL_INVALID_RECORD;
-    }
+    if (ssl->badmac_seen_or_in_hsfraglen == 0) {
+        /* The handshake message must at least include the header.
+         * We may not have the full message yet in case of fragmentation.
+         * To simplify the code, we insist on having the header (and in
+         * particular the handshake message length) in the first
+         * fragment. */
+        if (ssl->in_msglen < mbedtls_ssl_hs_hdr_len(ssl)) {
+            MBEDTLS_SSL_DEBUG_MSG(1, ("handshake message too short: %" MBEDTLS_PRINTF_SIZET,
+                                      ssl->in_msglen));
+            return MBEDTLS_ERR_SSL_INVALID_RECORD;
+        }
 
-    if (ssl->in_hslen == 0) {
         ssl->in_hslen = mbedtls_ssl_hs_hdr_len(ssl) + ssl_get_hs_total_len(ssl);
-        ssl->badmac_seen_or_in_hsfraglen = 0;
     }
 
     MBEDTLS_SSL_DEBUG_MSG(3, ("handshake message: msglen ="
@@ -3238,6 +3241,14 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
                               MBEDTLS_PRINTF_SIZET,
                               ssl->in_msglen, ssl->in_msg[0], ssl->in_hslen));
 
+    if (ssl->transform_in != NULL) {
+        MBEDTLS_SSL_DEBUG_MSG(4, ("decrypted handshake message:"
+                                  " iv-buf=%d hdr-buf=%d hdr-buf=%d",
+                                  (int) (ssl->in_iv - ssl->in_buf),
+                                  (int) (ssl->in_hdr - ssl->in_buf),
+                                  (int) (ssl->in_msg - ssl->in_buf)));
+    }
+
 #if defined(MBEDTLS_SSL_PROTO_DTLS)
     if (ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM) {
         int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@@ -3297,67 +3308,103 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
         }
     } else
 #endif /* MBEDTLS_SSL_PROTO_DTLS */
-    if (ssl->badmac_seen_or_in_hsfraglen <= ssl->in_hslen) {
-        int ret;
+    {
+        unsigned char *const reassembled_record_start =
+            ssl->in_buf + MBEDTLS_SSL_SEQUENCE_NUMBER_LEN;
+        unsigned char *const payload_start =
+            reassembled_record_start + mbedtls_ssl_in_hdr_len(ssl);
+        unsigned char *payload_end = payload_start + ssl->badmac_seen_or_in_hsfraglen;
+        /* How many more bytes we want to have a complete handshake message. */
         const size_t hs_remain = ssl->in_hslen - ssl->badmac_seen_or_in_hsfraglen;
+        /* How many bytes of the current record are part of the first
+         * handshake message. There may be more handshake messages (possibly
+         * incomplete) in the same record; if so, we leave them after the
+         * current record, and ssl_consume_current_message() will take
+         * care of consuming the next handshake message. */
+        const size_t hs_this_fragment_len =
+            ssl->in_msglen > hs_remain ? hs_remain : ssl->in_msglen;
+        (void) hs_this_fragment_len;
+
         MBEDTLS_SSL_DEBUG_MSG(3,
-                              ("handshake fragment: %u .. %"
-                               MBEDTLS_PRINTF_SIZET " of %"
-                               MBEDTLS_PRINTF_SIZET " msglen %" MBEDTLS_PRINTF_SIZET,
+                              ("%s handshake fragment: %" MBEDTLS_PRINTF_SIZET
+                               ", %u..%u of %" MBEDTLS_PRINTF_SIZET,
+                               (ssl->badmac_seen_or_in_hsfraglen != 0 ?
+                                "subsequent" :
+                                hs_this_fragment_len == ssl->in_hslen ?
+                                "sole" :
+                                "initial"),
+                               ssl->in_msglen,
                                ssl->badmac_seen_or_in_hsfraglen,
-                               (size_t) ssl->badmac_seen_or_in_hsfraglen +
-                               (hs_remain <= ssl->in_msglen ? hs_remain : ssl->in_msglen),
-                               ssl->in_hslen, ssl->in_msglen));
-        if (ssl->in_msglen < hs_remain) {
-            /* ssl->in_msglen is a 25-bit value since it is the sum of the
-             * header length plus the payload length, the header length is 4
-             * and the payload length was received on the wire encoded as
-             * 3 octets. We don't support 16-bit platforms; more specifically,
-             * we assume that both unsigned and size_t are at least 32 bits.
-             * Therefore there is no possible integer overflow here.
-             */
-            ssl->badmac_seen_or_in_hsfraglen += (unsigned) ssl->in_msglen;
-            ssl->in_hdr = ssl->in_msg + ssl->in_msglen;
+                               ssl->badmac_seen_or_in_hsfraglen +
+                               (unsigned) hs_this_fragment_len,
+                               ssl->in_hslen));
+
+        /* Move the received handshake fragment to have the whole message
+         * (at least the part received so far) in a single segment at a
+         * known offset in the input buffer.
+         * - When receiving a non-initial handshake fragment, append it to
+         *   the initial segment.
+         * - Even the initial handshake fragment is moved, if it was
+         *   encrypted with an explicit IV: decryption leaves the payload
+         *   after the explicit IV, but here we move it to start where the
+         *   IV was.
+         */
+#if defined(MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH)
+        size_t const in_buf_len = ssl->in_buf_len;
+#else
+        size_t const in_buf_len = MBEDTLS_SSL_IN_BUFFER_LEN;
+#endif
+        if (payload_end + ssl->in_msglen > ssl->in_buf + in_buf_len) {
+            MBEDTLS_SSL_DEBUG_MSG(1,
+                                  ("Shouldn't happen: no room to move handshake fragment %"
+                                   MBEDTLS_PRINTF_SIZET " from %p to %p (buf=%p len=%"
+                                   MBEDTLS_PRINTF_SIZET ")",
+                                   ssl->in_msglen,
+                                   (void *) ssl->in_msg, (void *) payload_end,
+                                   (void *) ssl->in_buf, in_buf_len));
+            return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
+        }
+        memmove(payload_end, ssl->in_msg, ssl->in_msglen);
+
+        ssl->badmac_seen_or_in_hsfraglen += (unsigned) ssl->in_msglen;
+        payload_end += ssl->in_msglen;
+
+        if (ssl->badmac_seen_or_in_hsfraglen < ssl->in_hslen) {
+            MBEDTLS_SSL_DEBUG_MSG(3, ("Prepare: waiting for more handshake fragments "
+                                      "%u/%" MBEDTLS_PRINTF_SIZET,
+                                      ssl->badmac_seen_or_in_hsfraglen, ssl->in_hslen));
+            ssl->in_hdr = payload_end;
             ssl->in_msglen = 0;
             mbedtls_ssl_update_in_pointers(ssl);
             return MBEDTLS_ERR_SSL_CONTINUE_PROCESSING;
-        }
-        if (ssl->badmac_seen_or_in_hsfraglen > 0) {
-            /*
-             * At in_first_hdr we have a sequence of records that cover the next handshake
-             * record, each with its own record header that we need to remove.
-             * Note that the reassembled record size may not equal the size of the message,
-             * there may be more messages after it, complete or partial.
-             */
-            unsigned char *in_first_hdr = ssl->in_buf + MBEDTLS_SSL_SEQUENCE_NUMBER_LEN;
-            unsigned char *p = in_first_hdr, *q = NULL;
-            size_t merged_rec_len = 0;
-            do {
-                mbedtls_record rec;
-                ret = ssl_parse_record_header(ssl, p, mbedtls_ssl_in_hdr_len(ssl), &rec);
-                if (ret != 0) {
-                    return ret;
-                }
-                merged_rec_len += rec.data_len;
-                p = rec.buf + rec.buf_len;
-                if (q != NULL) {
-                    memmove(q, rec.buf + rec.data_offset, rec.data_len);
-                    q += rec.data_len;
-                } else {
-                    q = p;
-                }
-            } while (merged_rec_len < ssl->in_hslen);
-            ssl->in_hdr = in_first_hdr;
-            mbedtls_ssl_update_in_pointers(ssl);
-            ssl->in_msglen = merged_rec_len;
-            /* Adjust message length. */
-            MBEDTLS_PUT_UINT16_BE(merged_rec_len, ssl->in_len, 0);
+        } else {
+            ssl->in_msglen = ssl->badmac_seen_or_in_hsfraglen;
             ssl->badmac_seen_or_in_hsfraglen = 0;
+            ssl->in_hdr = reassembled_record_start;
+            mbedtls_ssl_update_in_pointers(ssl);
+
+            /* Update the record length in the fully reassembled record */
+            if (ssl->in_msglen > 0xffff) {
+                MBEDTLS_SSL_DEBUG_MSG(1,
+                                      ("Shouldn't happen: in_msglen=%"
+                                       MBEDTLS_PRINTF_SIZET " > 0xffff",
+                                       ssl->in_msglen));
+                return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
+            }
+            MBEDTLS_PUT_UINT16_BE(ssl->in_msglen, ssl->in_len, 0);
+
+            size_t record_len = mbedtls_ssl_in_hdr_len(ssl) + ssl->in_msglen;
+            (void) record_len;
             MBEDTLS_SSL_DEBUG_BUF(4, "reassembled record",
-                                  ssl->in_hdr, mbedtls_ssl_in_hdr_len(ssl) + merged_rec_len);
+                                  ssl->in_hdr, record_len);
+            if (ssl->in_hslen < ssl->in_msglen) {
+                MBEDTLS_SSL_DEBUG_MSG(3,
+                                      ("More handshake messages in the record: "
+                                       "%" MBEDTLS_PRINTF_SIZET " + %" MBEDTLS_PRINTF_SIZET,
+                                       ssl->in_hslen,
+                                       ssl->in_msglen - ssl->in_hslen));
+            }
         }
-    } else {
-        return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     }
 
     return 0;
@@ -4704,11 +4751,9 @@ static int ssl_consume_current_message(mbedtls_ssl_context *ssl)
 
         if (ssl->badmac_seen_or_in_hsfraglen != 0) {
             /* Not all handshake fragments have arrived, do not consume. */
-            MBEDTLS_SSL_DEBUG_MSG(3,
-                                  ("waiting for more fragments (%u of %"
-                                   MBEDTLS_PRINTF_SIZET ", %" MBEDTLS_PRINTF_SIZET " left)",
-                                   ssl->badmac_seen_or_in_hsfraglen, ssl->in_hslen,
-                                   ssl->in_hslen - ssl->badmac_seen_or_in_hsfraglen));
+            MBEDTLS_SSL_DEBUG_MSG(3, ("Consume: waiting for more handshake fragments "
+                                      "%u/%" MBEDTLS_PRINTF_SIZET,
+                                      ssl->badmac_seen_or_in_hsfraglen, ssl->in_hslen));
             return 0;
         }
 
@@ -5103,6 +5148,18 @@ int mbedtls_ssl_handle_message_type(mbedtls_ssl_context *ssl)
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
 
+    /* If we're in the middle of a fragmented TLS handshake message,
+     * we don't accept any other message type. For TLS 1.3, the spec forbids
+     * interleaving other message types between handshake fragments. For TLS
+     * 1.2, the spec does not forbid it but we do. */
+    if (ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_STREAM &&
+        ssl->badmac_seen_or_in_hsfraglen != 0 &&
+        ssl->in_msgtype != MBEDTLS_SSL_MSG_HANDSHAKE) {
+        MBEDTLS_SSL_DEBUG_MSG(1, ("non-handshake message in the middle"
+                                  " of a fragmented handshake message"));
+        return MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE;
+    }
+
     /*
      * Handle particular types of records
      */
@@ -5141,15 +5198,9 @@ int mbedtls_ssl_handle_message_type(mbedtls_ssl_context *ssl)
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
         if (ssl->tls_version == MBEDTLS_SSL_VERSION_TLS1_3) {
-#if defined(MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE)
-            MBEDTLS_SSL_DEBUG_MSG(1,
+            MBEDTLS_SSL_DEBUG_MSG(2,
                                   ("Ignore ChangeCipherSpec in TLS 1.3 compatibility mode"));
             return MBEDTLS_ERR_SSL_CONTINUE_PROCESSING;
-#else
-            MBEDTLS_SSL_DEBUG_MSG(1,
-                                  ("ChangeCipherSpec invalid in TLS 1.3 without compatibility mode"));
-            return MBEDTLS_ERR_SSL_INVALID_RECORD;
-#endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */
         }
 #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
     }
diff --git a/engine/thirdparty/mbedtls/library/ssl_tls.c b/engine/thirdparty/mbedtls/library/ssl_tls.c
index 7f742482..3633cd40 100644
--- a/engine/thirdparty/mbedtls/library/ssl_tls.c
+++ b/engine/thirdparty/mbedtls/library/ssl_tls.c
@@ -2769,6 +2769,51 @@ void mbedtls_ssl_conf_groups(mbedtls_ssl_config *conf,
 }
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
+
+/* A magic value for `ssl->hostname` indicating that
+ * mbedtls_ssl_set_hostname() has been called with `NULL`.
+ * If mbedtls_ssl_set_hostname() has never been called on `ssl`, then
+ * `ssl->hostname == NULL`. */
+static const char *const ssl_hostname_skip_cn_verification = "";
+
+#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
+/** Whether mbedtls_ssl_set_hostname() has been called.
+ *
+ * \param[in]   ssl     SSL context
+ *
+ * \return \c 1 if mbedtls_ssl_set_hostname() has been called on \p ssl
+ *         (including `mbedtls_ssl_set_hostname(ssl, NULL)`),
+ *         otherwise \c 0.
+ */
+static int mbedtls_ssl_has_set_hostname_been_called(
+    const mbedtls_ssl_context *ssl)
+{
+    return ssl->hostname != NULL;
+}
+#endif
+
+/* Micro-optimization: don't export this function if it isn't needed outside
+ * of this source file. */
+#if !defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
+static
+#endif
+const char *mbedtls_ssl_get_hostname_pointer(const mbedtls_ssl_context *ssl)
+{
+    if (ssl->hostname == ssl_hostname_skip_cn_verification) {
+        return NULL;
+    }
+    return ssl->hostname;
+}
+
+static void mbedtls_ssl_free_hostname(mbedtls_ssl_context *ssl)
+{
+    if (ssl->hostname != NULL &&
+        ssl->hostname != ssl_hostname_skip_cn_verification) {
+        mbedtls_zeroize_and_free(ssl->hostname, strlen(ssl->hostname));
+    }
+    ssl->hostname = NULL;
+}
+
 int mbedtls_ssl_set_hostname(mbedtls_ssl_context *ssl, const char *hostname)
 {
     /* Initialize to suppress unnecessary compiler warning */
@@ -2786,18 +2831,21 @@ int mbedtls_ssl_set_hostname(mbedtls_ssl_context *ssl, const char *hostname)
 
     /* Now it's clear that we will overwrite the old hostname,
      * so we can free it safely */
-
-    if (ssl->hostname != NULL) {
-        mbedtls_zeroize_and_free(ssl->hostname, strlen(ssl->hostname));
-    }
-
-    /* Passing NULL as hostname shall clear the old one */
+    mbedtls_ssl_free_hostname(ssl);
 
     if (hostname == NULL) {
-        ssl->hostname = NULL;
+        /* Passing NULL as hostname clears the old one, but leaves a
+         * special marker to indicate that mbedtls_ssl_set_hostname()
+         * has been called. */
+        /* ssl->hostname should be const, but isn't. We won't actually
+         * write to the buffer, so it's ok to cast away the const. */
+        ssl->hostname = (char *) ssl_hostname_skip_cn_verification;
     } else {
         ssl->hostname = mbedtls_calloc(1, hostname_len + 1);
         if (ssl->hostname == NULL) {
+            /* mbedtls_ssl_set_hostname() has been called, but unsuccessfully.
+             * Leave ssl->hostname in the same state as if the function had
+             * not been called, i.e. a null pointer. */
             return MBEDTLS_ERR_SSL_ALLOC_FAILED;
         }
 
@@ -5583,9 +5631,7 @@ void mbedtls_ssl_free(mbedtls_ssl_context *ssl)
     }
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
-    if (ssl->hostname != NULL) {
-        mbedtls_zeroize_and_free(ssl->hostname, strlen(ssl->hostname));
-    }
+    mbedtls_ssl_free_hostname(ssl);
 #endif
 
 #if defined(MBEDTLS_SSL_DTLS_HELLO_VERIFY) && defined(MBEDTLS_SSL_SRV_C)
@@ -8323,6 +8369,7 @@ int mbedtls_ssl_write_finished(mbedtls_ssl_context *ssl)
     ret = ssl->handshake->calc_finished(ssl, ssl->out_msg + 4, ssl->conf->endpoint);
     if (ret != 0) {
         MBEDTLS_SSL_DEBUG_RET(1, "calc_finished", ret);
+        return ret;
     }
 
     /*
@@ -8436,6 +8483,7 @@ int mbedtls_ssl_parse_finished(mbedtls_ssl_context *ssl)
     ret = ssl->handshake->calc_finished(ssl, buf, ssl->conf->endpoint ^ 1);
     if (ret != 0) {
         MBEDTLS_SSL_DEBUG_RET(1, "calc_finished", ret);
+        return ret;
     }
 
     if ((ret = mbedtls_ssl_read_record(ssl, 1)) != 0) {
@@ -9796,6 +9844,27 @@ int mbedtls_ssl_check_cert_usage(const mbedtls_x509_crt *cert,
     return ret;
 }
 
+static int get_hostname_for_verification(mbedtls_ssl_context *ssl,
+                                         const char **hostname)
+{
+    if (!mbedtls_ssl_has_set_hostname_been_called(ssl)) {
+        MBEDTLS_SSL_DEBUG_MSG(1, ("Certificate verification without having set hostname"));
+#if !defined(MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME)
+        if (mbedtls_ssl_conf_get_endpoint(ssl->conf) == MBEDTLS_SSL_IS_CLIENT &&
+            ssl->conf->authmode == MBEDTLS_SSL_VERIFY_REQUIRED) {
+            return MBEDTLS_ERR_SSL_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME;
+        }
+#endif
+    }
+
+    *hostname = mbedtls_ssl_get_hostname_pointer(ssl);
+    if (*hostname == NULL) {
+        MBEDTLS_SSL_DEBUG_MSG(2, ("Certificate verification without CN verification"));
+    }
+
+    return 0;
+}
+
 int mbedtls_ssl_verify_certificate(mbedtls_ssl_context *ssl,
                                    int authmode,
                                    mbedtls_x509_crt *chain,
@@ -9821,7 +9890,13 @@ int mbedtls_ssl_verify_certificate(mbedtls_ssl_context *ssl,
         p_vrfy = ssl->conf->p_vrfy;
     }
 
-    int ret = 0;
+    const char *hostname = "";
+    int ret = get_hostname_for_verification(ssl, &hostname);
+    if (ret != 0) {
+        MBEDTLS_SSL_DEBUG_RET(1, "get_hostname_for_verification", ret);
+        return ret;
+    }
+
     int have_ca_chain_or_callback = 0;
 #if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK)
     if (ssl->conf->f_ca_cb != NULL) {
@@ -9834,7 +9909,7 @@ int mbedtls_ssl_verify_certificate(mbedtls_ssl_context *ssl,
             ssl->conf->f_ca_cb,
             ssl->conf->p_ca_cb,
             ssl->conf->cert_profile,
-            ssl->hostname,
+            hostname,
             &ssl->session_negotiate->verify_result,
             f_vrfy, p_vrfy);
     } else
@@ -9861,7 +9936,7 @@ int mbedtls_ssl_verify_certificate(mbedtls_ssl_context *ssl,
             chain,
             ca_chain, ca_crl,
             ssl->conf->cert_profile,
-            ssl->hostname,
+            hostname,
             &ssl->session_negotiate->verify_result,
             f_vrfy, p_vrfy, rs_ctx);
     }
diff --git a/engine/thirdparty/mbedtls/library/ssl_tls12_client.c b/engine/thirdparty/mbedtls/library/ssl_tls12_client.c
index 9b2da5a3..75783d08 100644
--- a/engine/thirdparty/mbedtls/library/ssl_tls12_client.c
+++ b/engine/thirdparty/mbedtls/library/ssl_tls12_client.c
@@ -1964,7 +1964,7 @@ static int ssl_write_encrypted_pms(mbedtls_ssl_context *ssl,
                                   ssl->out_msg + offset + len_bytes, olen,
                                   MBEDTLS_SSL_OUT_CONTENT_LEN - offset - len_bytes,
                                   ssl->conf->f_rng, ssl->conf->p_rng)) != 0) {
-        MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_rsa_pkcs1_encrypt", ret);
+        MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_pk_encrypt", ret);
         return ret;
     }
 
diff --git a/engine/thirdparty/mbedtls/library/ssl_tls13_client.c b/engine/thirdparty/mbedtls/library/ssl_tls13_client.c
index b63b5e63..78a069f7 100644
--- a/engine/thirdparty/mbedtls/library/ssl_tls13_client.c
+++ b/engine/thirdparty/mbedtls/library/ssl_tls13_client.c
@@ -319,6 +319,7 @@ static int ssl_tls13_write_key_share_ext(mbedtls_ssl_context *ssl,
             ssl, group_id, p, end, &key_exchange_len);
         p += key_exchange_len;
         if (ret != 0) {
+            MBEDTLS_SSL_DEBUG_MSG(1, ("client hello: failed generating xxdh key exchange"));
             return ret;
         }
 
diff --git a/engine/thirdparty/mbedtls/library/ssl_tls13_server.c b/engine/thirdparty/mbedtls/library/ssl_tls13_server.c
index 693edc7b..5757d201 100644
--- a/engine/thirdparty/mbedtls/library/ssl_tls13_server.c
+++ b/engine/thirdparty/mbedtls/library/ssl_tls13_server.c
@@ -92,7 +92,7 @@ static void ssl_tls13_select_ciphersuite(
         return;
     }
 
-    MBEDTLS_SSL_DEBUG_MSG(2, ("No matched ciphersuite, psk_ciphersuite_id=%x, psk_hash_alg=%lx",
+    MBEDTLS_SSL_DEBUG_MSG(1, ("No matched ciphersuite, psk_ciphersuite_id=%x, psk_hash_alg=%lx",
                               (unsigned) psk_ciphersuite_id,
                               (unsigned long) psk_hash_alg));
 }
@@ -1380,6 +1380,7 @@ static int ssl_tls13_parse_client_hello(mbedtls_ssl_context *ssl,
     }
 
     if (ret == 0) {
+        MBEDTLS_SSL_DEBUG_MSG(2, ("no supported_versions extension"));
         return SSL_CLIENT_HELLO_TLS1_2;
     }
 
@@ -1401,6 +1402,7 @@ static int ssl_tls13_parse_client_hello(mbedtls_ssl_context *ssl,
          * the TLS version to negotiate.
          */
         if (MBEDTLS_SSL_VERSION_TLS1_2 == ret) {
+            MBEDTLS_SSL_DEBUG_MSG(2, ("supported_versions without 1.3"));
             return SSL_CLIENT_HELLO_TLS1_2;
         }
     }
@@ -1985,6 +1987,7 @@ static int ssl_tls13_process_client_hello(mbedtls_ssl_context *ssl)
         }
         ssl->keep_current_message = 1;
         ssl->tls_version = MBEDTLS_SSL_VERSION_TLS1_2;
+        MBEDTLS_SSL_DEBUG_MSG(1, ("non-1.3 ClientHello left for later processing"));
         return 0;
     }
 
diff --git a/engine/thirdparty/mbedtls/library/threading.c b/engine/thirdparty/mbedtls/library/threading.c
index 85db243f..fde7cea1 100644
--- a/engine/thirdparty/mbedtls/library/threading.c
+++ b/engine/thirdparty/mbedtls/library/threading.c
@@ -61,7 +61,7 @@ static void threading_mutex_init_pthread(mbedtls_threading_mutex_t *mutex)
      * this here in a thread safe manner without a significant performance
      * hit, so state transitions are checked in tests only via the state
      * variable. Please make sure any new mutex that gets added is exercised in
-     * tests; see tests/src/threading_helpers.c for more details. */
+     * tests; see framework/tests/src/threading_helpers.c for more details. */
     (void) pthread_mutex_init(&mutex->mutex, NULL);
 }
 
diff --git a/engine/thirdparty/mbedtls/library/version_features.c b/engine/thirdparty/mbedtls/library/version_features.c
index f542d980..646cde23 100644
--- a/engine/thirdparty/mbedtls/library/version_features.c
+++ b/engine/thirdparty/mbedtls/library/version_features.c
@@ -459,6 +459,9 @@ static const char * const features[] = {
 #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)
     "SSL_ASYNC_PRIVATE", //no-check-names
 #endif /* MBEDTLS_SSL_ASYNC_PRIVATE */
+#if defined(MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME)
+    "SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME", //no-check-names
+#endif /* MBEDTLS_SSL_CLI_ALLOW_WEAK_CERTIFICATE_VERIFICATION_WITHOUT_HOSTNAME */
 #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
     "SSL_CONTEXT_SERIALIZATION", //no-check-names
 #endif /* MBEDTLS_SSL_CONTEXT_SERIALIZATION */
@@ -720,6 +723,9 @@ static const char * const features[] = {
 #if defined(MBEDTLS_PSA_ITS_FILE_C)
     "PSA_ITS_FILE_C", //no-check-names
 #endif /* MBEDTLS_PSA_ITS_FILE_C */
+#if defined(MBEDTLS_PSA_STATIC_KEY_SLOTS)
+    "PSA_STATIC_KEY_SLOTS", //no-check-names
+#endif /* MBEDTLS_PSA_STATIC_KEY_SLOTS */
 #if defined(MBEDTLS_RIPEMD160_C)
     "RIPEMD160_C", //no-check-names
 #endif /* MBEDTLS_RIPEMD160_C */
diff --git a/engine/thirdparty/mbedtls/patches/0002-pr-9981-defragment-incoming-tls-handshake-messages.patch b/engine/thirdparty/mbedtls/patches/0002-pr-9981-defragment-incoming-tls-handshake-messages.patch
deleted file mode 100644
index 406bb14f..00000000
--- a/engine/thirdparty/mbedtls/patches/0002-pr-9981-defragment-incoming-tls-handshake-messages.patch
+++ /dev/null
@@ -1,373 +0,0 @@
-diff --git a/thirdparty/README.md b/thirdparty/README.md
-index 16a7661f5b..7ad8524e1a 100644
---- a/thirdparty/README.md
-+++ b/thirdparty/README.md
-@@ -627,6 +627,7 @@ File extracted from upstream release tarball:
- Patches:
- 
- - `0001-msvc-2019-psa-redeclaration.patch` (GH-90535)
-+- `0002-pr-9981-defragment-incoming-tls-handshake-messages.patch` (GH-102770)
- 
- 
- ## meshoptimizer
-diff --git a/thirdparty/mbedtls/include/mbedtls/ssl.h b/thirdparty/mbedtls/include/mbedtls/ssl.h
-index 42fffbf860..597da2571f 100644
---- a/thirdparty/mbedtls/include/mbedtls/ssl.h
-+++ b/thirdparty/mbedtls/include/mbedtls/ssl.h
-@@ -1724,7 +1724,16 @@ struct mbedtls_ssl_context {
-     int MBEDTLS_PRIVATE(early_data_state);
- #endif
- 
--    unsigned MBEDTLS_PRIVATE(badmac_seen);       /*!< records with a bad MAC received    */
-+    /** Multipurpose field.
-+     *
-+     * - DTLS: records with a bad MAC received.
-+     * - TLS: accumulated length of handshake fragments (up to \c in_hslen).
-+     *
-+     * This field is multipurpose in order to preserve the ABI in the
-+     * Mbed TLS 3.6 LTS branch. Until 3.6.2, it was only used in DTLS
-+     * and called `badmac_seen`.
-+     */
-+    unsigned MBEDTLS_PRIVATE(badmac_seen_or_in_hsfraglen);
- 
- #if defined(MBEDTLS_X509_CRT_PARSE_C)
-     /** Callback to customize X.509 certificate chain verification          */
-diff --git a/thirdparty/mbedtls/library/ssl_misc.h b/thirdparty/mbedtls/library/ssl_misc.h
-index 98668798a8..bfadac7be3 100644
---- a/thirdparty/mbedtls/library/ssl_misc.h
-+++ b/thirdparty/mbedtls/library/ssl_misc.h
-@@ -1829,10 +1829,11 @@ void mbedtls_ssl_set_timer(mbedtls_ssl_context *ssl, uint32_t millisecs);
- MBEDTLS_CHECK_RETURN_CRITICAL
- int mbedtls_ssl_check_timer(mbedtls_ssl_context *ssl);
- 
--void mbedtls_ssl_reset_in_out_pointers(mbedtls_ssl_context *ssl);
-+void mbedtls_ssl_reset_in_pointers(mbedtls_ssl_context *ssl);
-+void mbedtls_ssl_update_in_pointers(mbedtls_ssl_context *ssl);
-+void mbedtls_ssl_reset_out_pointers(mbedtls_ssl_context *ssl);
- void mbedtls_ssl_update_out_pointers(mbedtls_ssl_context *ssl,
-                                      mbedtls_ssl_transform *transform);
--void mbedtls_ssl_update_in_pointers(mbedtls_ssl_context *ssl);
- 
- MBEDTLS_CHECK_RETURN_CRITICAL
- int mbedtls_ssl_session_reset_int(mbedtls_ssl_context *ssl, int partial);
-diff --git a/thirdparty/mbedtls/library/ssl_msg.c b/thirdparty/mbedtls/library/ssl_msg.c
-index ef722d7bdc..08d197e08c 100644
---- a/thirdparty/mbedtls/library/ssl_msg.c
-+++ b/thirdparty/mbedtls/library/ssl_msg.c
-@@ -25,6 +25,7 @@
- #include "constant_time_internal.h"
- #include "mbedtls/constant_time.h"
- 
-+#include <limits.h>
- #include <string.h>
- 
- #if defined(MBEDTLS_USE_PSA_CRYPTO)
-@@ -3220,13 +3221,17 @@ static uint32_t ssl_get_hs_total_len(mbedtls_ssl_context const *ssl)
- 
- int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
- {
--    if (ssl->in_msglen < mbedtls_ssl_hs_hdr_len(ssl)) {
-+    /* First handshake fragment must at least include the header. */
-+    if (ssl->in_msglen < mbedtls_ssl_hs_hdr_len(ssl) && ssl->in_hslen == 0) {
-         MBEDTLS_SSL_DEBUG_MSG(1, ("handshake message too short: %" MBEDTLS_PRINTF_SIZET,
-                                   ssl->in_msglen));
-         return MBEDTLS_ERR_SSL_INVALID_RECORD;
-     }
- 
--    ssl->in_hslen = mbedtls_ssl_hs_hdr_len(ssl) + ssl_get_hs_total_len(ssl);
-+    if (ssl->in_hslen == 0) {
-+        ssl->in_hslen = mbedtls_ssl_hs_hdr_len(ssl) + ssl_get_hs_total_len(ssl);
-+        ssl->badmac_seen_or_in_hsfraglen = 0;
-+    }
- 
-     MBEDTLS_SSL_DEBUG_MSG(3, ("handshake message: msglen ="
-                               " %" MBEDTLS_PRINTF_SIZET ", type = %u, hslen = %"
-@@ -3292,10 +3297,67 @@ int mbedtls_ssl_prepare_handshake_record(mbedtls_ssl_context *ssl)
-         }
-     } else
- #endif /* MBEDTLS_SSL_PROTO_DTLS */
--    /* With TLS we don't handle fragmentation (for now) */
--    if (ssl->in_msglen < ssl->in_hslen) {
--        MBEDTLS_SSL_DEBUG_MSG(1, ("TLS handshake fragmentation not supported"));
--        return MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE;
-+    if (ssl->badmac_seen_or_in_hsfraglen <= ssl->in_hslen) {
-+        int ret;
-+        const size_t hs_remain = ssl->in_hslen - ssl->badmac_seen_or_in_hsfraglen;
-+        MBEDTLS_SSL_DEBUG_MSG(3,
-+                              ("handshake fragment: %u .. %"
-+                               MBEDTLS_PRINTF_SIZET " of %"
-+                               MBEDTLS_PRINTF_SIZET " msglen %" MBEDTLS_PRINTF_SIZET,
-+                               ssl->badmac_seen_or_in_hsfraglen,
-+                               (size_t) ssl->badmac_seen_or_in_hsfraglen +
-+                               (hs_remain <= ssl->in_msglen ? hs_remain : ssl->in_msglen),
-+                               ssl->in_hslen, ssl->in_msglen));
-+        if (ssl->in_msglen < hs_remain) {
-+            /* ssl->in_msglen is a 25-bit value since it is the sum of the
-+             * header length plus the payload length, the header length is 4
-+             * and the payload length was received on the wire encoded as
-+             * 3 octets. We don't support 16-bit platforms; more specifically,
-+             * we assume that both unsigned and size_t are at least 32 bits.
-+             * Therefore there is no possible integer overflow here.
-+             */
-+            ssl->badmac_seen_or_in_hsfraglen += (unsigned) ssl->in_msglen;
-+            ssl->in_hdr = ssl->in_msg + ssl->in_msglen;
-+            ssl->in_msglen = 0;
-+            mbedtls_ssl_update_in_pointers(ssl);
-+            return MBEDTLS_ERR_SSL_CONTINUE_PROCESSING;
-+        }
-+        if (ssl->badmac_seen_or_in_hsfraglen > 0) {
-+            /*
-+             * At in_first_hdr we have a sequence of records that cover the next handshake
-+             * record, each with its own record header that we need to remove.
-+             * Note that the reassembled record size may not equal the size of the message,
-+             * there may be more messages after it, complete or partial.
-+             */
-+            unsigned char *in_first_hdr = ssl->in_buf + MBEDTLS_SSL_SEQUENCE_NUMBER_LEN;
-+            unsigned char *p = in_first_hdr, *q = NULL;
-+            size_t merged_rec_len = 0;
-+            do {
-+                mbedtls_record rec;
-+                ret = ssl_parse_record_header(ssl, p, mbedtls_ssl_in_hdr_len(ssl), &rec);
-+                if (ret != 0) {
-+                    return ret;
-+                }
-+                merged_rec_len += rec.data_len;
-+                p = rec.buf + rec.buf_len;
-+                if (q != NULL) {
-+                    memmove(q, rec.buf + rec.data_offset, rec.data_len);
-+                    q += rec.data_len;
-+                } else {
-+                    q = p;
-+                }
-+            } while (merged_rec_len < ssl->in_hslen);
-+            ssl->in_hdr = in_first_hdr;
-+            mbedtls_ssl_update_in_pointers(ssl);
-+            ssl->in_msglen = merged_rec_len;
-+            /* Adjust message length. */
-+            MBEDTLS_PUT_UINT16_BE(merged_rec_len, ssl->in_len, 0);
-+            ssl->badmac_seen_or_in_hsfraglen = 0;
-+            MBEDTLS_SSL_DEBUG_BUF(4, "reassembled record",
-+                                  ssl->in_hdr, mbedtls_ssl_in_hdr_len(ssl) + merged_rec_len);
-+        }
-+    } else {
-+        return MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
-     }
- 
-     return 0;
-@@ -4640,6 +4702,16 @@ static int ssl_consume_current_message(mbedtls_ssl_context *ssl)
-             return MBEDTLS_ERR_SSL_INTERNAL_ERROR;
-         }
- 
-+        if (ssl->badmac_seen_or_in_hsfraglen != 0) {
-+            /* Not all handshake fragments have arrived, do not consume. */
-+            MBEDTLS_SSL_DEBUG_MSG(3,
-+                                  ("waiting for more fragments (%u of %"
-+                                   MBEDTLS_PRINTF_SIZET ", %" MBEDTLS_PRINTF_SIZET " left)",
-+                                   ssl->badmac_seen_or_in_hsfraglen, ssl->in_hslen,
-+                                   ssl->in_hslen - ssl->badmac_seen_or_in_hsfraglen));
-+            return 0;
-+        }
-+
-         /*
-          * Get next Handshake message in the current record
-          */
-@@ -4665,6 +4737,7 @@ static int ssl_consume_current_message(mbedtls_ssl_context *ssl)
-             ssl->in_msglen -= ssl->in_hslen;
-             memmove(ssl->in_msg, ssl->in_msg + ssl->in_hslen,
-                     ssl->in_msglen);
-+            MBEDTLS_PUT_UINT16_BE(ssl->in_msglen, ssl->in_len, 0);
- 
-             MBEDTLS_SSL_DEBUG_BUF(4, "remaining content in record",
-                                   ssl->in_msg, ssl->in_msglen);
-@@ -4967,10 +5040,12 @@ static int ssl_get_next_record(mbedtls_ssl_context *ssl)
-                     return ret;
-                 }
- 
--                if (ssl->conf->badmac_limit != 0 &&
--                    ++ssl->badmac_seen >= ssl->conf->badmac_limit) {
--                    MBEDTLS_SSL_DEBUG_MSG(1, ("too many records with bad MAC"));
--                    return MBEDTLS_ERR_SSL_INVALID_MAC;
-+                if (ssl->conf->badmac_limit != 0) {
-+                    ++ssl->badmac_seen_or_in_hsfraglen;
-+                    if (ssl->badmac_seen_or_in_hsfraglen >= ssl->conf->badmac_limit) {
-+                        MBEDTLS_SSL_DEBUG_MSG(1, ("too many records with bad MAC"));
-+                        return MBEDTLS_ERR_SSL_INVALID_MAC;
-+                    }
-                 }
- 
-                 /* As above, invalid records cause
-@@ -5345,7 +5420,7 @@ void mbedtls_ssl_update_in_pointers(mbedtls_ssl_context *ssl)
-     } else
- #endif
-     {
--        ssl->in_ctr = ssl->in_hdr - MBEDTLS_SSL_SEQUENCE_NUMBER_LEN;
-+        ssl->in_ctr = ssl->in_buf;
-         ssl->in_len = ssl->in_hdr + 3;
- #if defined(MBEDTLS_SSL_DTLS_CONNECTION_ID)
-         ssl->in_cid = ssl->in_len;
-@@ -5361,24 +5436,35 @@ void mbedtls_ssl_update_in_pointers(mbedtls_ssl_context *ssl)
-  * Setup an SSL context
-  */
- 
--void mbedtls_ssl_reset_in_out_pointers(mbedtls_ssl_context *ssl)
-+void mbedtls_ssl_reset_in_pointers(mbedtls_ssl_context *ssl)
-+{
-+#if defined(MBEDTLS_SSL_PROTO_DTLS)
-+    if (ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM) {
-+        ssl->in_hdr = ssl->in_buf;
-+    } else
-+#endif  /* MBEDTLS_SSL_PROTO_DTLS */
-+    {
-+        ssl->in_hdr = ssl->in_buf + MBEDTLS_SSL_SEQUENCE_NUMBER_LEN;
-+    }
-+
-+    /* Derive other internal pointers. */
-+    mbedtls_ssl_update_in_pointers(ssl);
-+}
-+
-+void mbedtls_ssl_reset_out_pointers(mbedtls_ssl_context *ssl)
- {
-     /* Set the incoming and outgoing record pointers. */
- #if defined(MBEDTLS_SSL_PROTO_DTLS)
-     if (ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM) {
-         ssl->out_hdr = ssl->out_buf;
--        ssl->in_hdr  = ssl->in_buf;
-     } else
- #endif /* MBEDTLS_SSL_PROTO_DTLS */
-     {
-         ssl->out_ctr = ssl->out_buf;
--        ssl->out_hdr = ssl->out_buf + 8;
--        ssl->in_hdr  = ssl->in_buf  + 8;
-+        ssl->out_hdr = ssl->out_buf + MBEDTLS_SSL_SEQUENCE_NUMBER_LEN;
-     }
--
-     /* Derive other internal pointers. */
-     mbedtls_ssl_update_out_pointers(ssl, NULL /* no transform enabled */);
--    mbedtls_ssl_update_in_pointers(ssl);
- }
- 
- /*
-diff --git a/thirdparty/mbedtls/library/ssl_tls.c b/thirdparty/mbedtls/library/ssl_tls.c
-index c773365bf6..7f74248252 100644
---- a/thirdparty/mbedtls/library/ssl_tls.c
-+++ b/thirdparty/mbedtls/library/ssl_tls.c
-@@ -344,12 +344,13 @@ static void handle_buffer_resizing(mbedtls_ssl_context *ssl, int downsizing,
-                                    size_t out_buf_new_len)
- {
-     int modified = 0;
--    size_t written_in = 0, iv_offset_in = 0, len_offset_in = 0;
-+    size_t written_in = 0, iv_offset_in = 0, len_offset_in = 0, hdr_in = 0;
-     size_t written_out = 0, iv_offset_out = 0, len_offset_out = 0;
-     if (ssl->in_buf != NULL) {
-         written_in = ssl->in_msg - ssl->in_buf;
-         iv_offset_in = ssl->in_iv - ssl->in_buf;
-         len_offset_in = ssl->in_len - ssl->in_buf;
-+        hdr_in = ssl->in_hdr - ssl->in_buf;
-         if (downsizing ?
-             ssl->in_buf_len > in_buf_new_len && ssl->in_left < in_buf_new_len :
-             ssl->in_buf_len < in_buf_new_len) {
-@@ -381,7 +382,10 @@ static void handle_buffer_resizing(mbedtls_ssl_context *ssl, int downsizing,
-     }
-     if (modified) {
-         /* Update pointers here to avoid doing it twice. */
--        mbedtls_ssl_reset_in_out_pointers(ssl);
-+        ssl->in_hdr = ssl->in_buf + hdr_in;
-+        mbedtls_ssl_update_in_pointers(ssl);
-+        mbedtls_ssl_reset_out_pointers(ssl);
-+
-         /* Fields below might not be properly updated with record
-          * splitting or with CID, so they are manually updated here. */
-         ssl->out_msg = ssl->out_buf + written_out;
-@@ -1409,7 +1413,8 @@ int mbedtls_ssl_setup(mbedtls_ssl_context *ssl,
-         goto error;
-     }
- 
--    mbedtls_ssl_reset_in_out_pointers(ssl);
-+    mbedtls_ssl_reset_in_pointers(ssl);
-+    mbedtls_ssl_reset_out_pointers(ssl);
- 
- #if defined(MBEDTLS_SSL_DTLS_SRTP)
-     memset(&ssl->dtls_srtp_info, 0, sizeof(ssl->dtls_srtp_info));
-@@ -1474,7 +1479,8 @@ void mbedtls_ssl_session_reset_msg_layer(mbedtls_ssl_context *ssl,
-     /* Cancel any possibly running timer */
-     mbedtls_ssl_set_timer(ssl, 0);
- 
--    mbedtls_ssl_reset_in_out_pointers(ssl);
-+    mbedtls_ssl_reset_in_pointers(ssl);
-+    mbedtls_ssl_reset_out_pointers(ssl);
- 
-     /* Reset incoming message parsing */
-     ssl->in_offt    = NULL;
-@@ -1485,6 +1491,12 @@ void mbedtls_ssl_session_reset_msg_layer(mbedtls_ssl_context *ssl,
-     ssl->keep_current_message = 0;
-     ssl->transform_in  = NULL;
- 
-+    /* TLS: reset in_hsfraglen, which is part of message parsing.
-+     * DTLS: on a client reconnect, don't reset badmac_seen. */
-+    if (!partial) {
-+        ssl->badmac_seen_or_in_hsfraglen = 0;
-+    }
-+
- #if defined(MBEDTLS_SSL_PROTO_DTLS)
-     ssl->next_record_offset = 0;
-     ssl->in_epoch = 0;
-@@ -5014,7 +5026,7 @@ static const unsigned char ssl_serialized_context_header[] = {
-  *  uint8 in_cid<0..2^8-1>      // Connection ID: expected incoming value
-  *  uint8 out_cid<0..2^8-1>     // Connection ID: outgoing value to use
-  *  // fields from ssl_context
-- *  uint32 badmac_seen;         // DTLS: number of records with failing MAC
-+ *  uint32 badmac_seen_or_in_hsfraglen;         // DTLS: number of records with failing MAC
-  *  uint64 in_window_top;       // DTLS: last validated record seq_num
-  *  uint64 in_window;           // DTLS: bitmask for replay protection
-  *  uint8 disable_datagram_packing; // DTLS: only one record per datagram
-@@ -5156,7 +5168,7 @@ int mbedtls_ssl_context_save(mbedtls_ssl_context *ssl,
-      */
-     used += 4;
-     if (used <= buf_len) {
--        MBEDTLS_PUT_UINT32_BE(ssl->badmac_seen, p, 0);
-+        MBEDTLS_PUT_UINT32_BE(ssl->badmac_seen_or_in_hsfraglen, p, 0);
-         p += 4;
-     }
- 
-@@ -5386,7 +5398,7 @@ static int ssl_context_load(mbedtls_ssl_context *ssl,
-         return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
-     }
- 
--    ssl->badmac_seen = MBEDTLS_GET_UINT32_BE(p, 0);
-+    ssl->badmac_seen_or_in_hsfraglen = MBEDTLS_GET_UINT32_BE(p, 0);
-     p += 4;
- 
- #if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY)
-diff --git a/thirdparty/mbedtls/library/ssl_tls12_server.c b/thirdparty/mbedtls/library/ssl_tls12_server.c
-index 03722ac33c..67df4284a4 100644
---- a/thirdparty/mbedtls/library/ssl_tls12_server.c
-+++ b/thirdparty/mbedtls/library/ssl_tls12_server.c
-@@ -1057,28 +1057,6 @@ read_record_header:
-         MBEDTLS_SSL_DEBUG_MSG(1, ("bad client hello message"));
-         return MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE;
-     }
--    {
--        size_t handshake_len = MBEDTLS_GET_UINT24_BE(buf, 1);
--        MBEDTLS_SSL_DEBUG_MSG(3, ("client hello v3, handshake len.: %u",
--                                  (unsigned) handshake_len));
--
--        /* The record layer has a record size limit of 2^14 - 1 and
--         * fragmentation is not supported, so buf[1] should be zero. */
--        if (buf[1] != 0) {
--            MBEDTLS_SSL_DEBUG_MSG(1, ("bad client hello message: %u != 0",
--                                      (unsigned) buf[1]));
--            return MBEDTLS_ERR_SSL_DECODE_ERROR;
--        }
--
--        /* We don't support fragmentation of ClientHello (yet?) */
--        if (msg_len != mbedtls_ssl_hs_hdr_len(ssl) + handshake_len) {
--            MBEDTLS_SSL_DEBUG_MSG(1, ("bad client hello message: %u != %u + %u",
--                                      (unsigned) msg_len,
--                                      (unsigned) mbedtls_ssl_hs_hdr_len(ssl),
--                                      (unsigned) handshake_len));
--            return MBEDTLS_ERR_SSL_DECODE_ERROR;
--        }
--    }
- 
- #if defined(MBEDTLS_SSL_PROTO_DTLS)
-     if (ssl->conf->transport == MBEDTLS_SSL_TRANSPORT_DATAGRAM) {
diff --git a/engine/thirdparty/misc/yuv2rgb.h b/engine/thirdparty/misc/yuv2rgb.h
index d8f7fd6d..e8ccd427 100644
--- a/engine/thirdparty/misc/yuv2rgb.h
+++ b/engine/thirdparty/misc/yuv2rgb.h
@@ -30,6 +30,7 @@ ship it.
  * 2. At some point or another the code relied on the byte order of a uint32_t, this has been fixed
  * 3. Output has been reordered to struct { uint8_t r, g, b, a; } precisely in accordance with the function names
  * 4. Removing unused 'dither' parameter
+ * 5. Fix last line not being converted (and therefore was transparent)
  */
 
 #ifndef YUV2RGB_H
@@ -848,7 +849,6 @@ static void yuv422_2_rgb8888(uint8_t  *dst_ptr,
 		      int32_t   uv_span,
 		      int32_t   dst_span)
 {
-    height -= 1;
     while (height > 0)
     {
 	height -= width<<16;
@@ -1020,7 +1020,6 @@ static void yuv444_2_rgb8888(uint8_t  *dst_ptr,
 		      int32_t   uv_span,
 		      int32_t   dst_span)
 {
-    height -= 1;
     while (height > 0)
     {
 	height -= width<<16;
diff --git a/engine/thirdparty/pcre2/AUTHORS b/engine/thirdparty/pcre2/AUTHORS
deleted file mode 100644
index 9669f775..00000000
--- a/engine/thirdparty/pcre2/AUTHORS
+++ /dev/null
@@ -1,36 +0,0 @@
-THE MAIN PCRE2 LIBRARY CODE
----------------------------
-
-Written by:       Philip Hazel
-Email local part: Philip.Hazel
-Email domain:     gmail.com
-
-Retired from University of Cambridge Computing Service,
-Cambridge, England.
-
-Copyright (c) 1997-2024 University of Cambridge
-All rights reserved
-
-
-PCRE2 JUST-IN-TIME COMPILATION SUPPORT
---------------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Emain domain:     freemail.hu
-
-Copyright(c) 2010-2024 Zoltan Herczeg
-All rights reserved.
-
-
-STACK-LESS JUST-IN-TIME COMPILER
---------------------------------
-
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Emain domain:     freemail.hu
-
-Copyright(c) 2009-2024 Zoltan Herczeg
-All rights reserved.
-
-####
diff --git a/engine/thirdparty/pcre2/AUTHORS.md b/engine/thirdparty/pcre2/AUTHORS.md
new file mode 100644
index 00000000..708fc232
--- /dev/null
+++ b/engine/thirdparty/pcre2/AUTHORS.md
@@ -0,0 +1,200 @@
+PCRE2 Authorship and Contributors
+=================================
+
+COPYRIGHT
+---------
+
+Please see the file [LICENCE](./LICENCE.md) in the PCRE2 distribution for
+copyright details.
+
+
+MAINTAINERS
+-----------
+
+The PCRE and PCRE2 libraries were authored and maintained by Philip Hazel.
+
+Since 2024, the contributors with administrator access to the project are now
+Nicholas Wilson and Zoltán Herczeg. See the file [SECURITY](./SECURITY.md) for
+GPG keys.
+
+Both administrators are volunteers acting in a personal capacity.
+
+<table>
+<thead>
+<tr>
+  <th>Name</th>
+  <th>Role</th>
+<tr>
+</thead>
+<tbody>
+<tr>
+  <td>
+
+  Nicholas Wilson<br/>
+  `nicholas@nicholaswilson.me.uk`<br/>
+  Currently of Microsoft Research Cambridge, UK
+
+  </td>
+  <td>
+
+  * General project administration & maintenance
+  * Release management
+  * Code maintenance
+
+  </td>
+</tr>
+<tr>
+  <td>
+
+  Zoltán Herczeg<br/>
+  `hzmester@freemail.hu`<br/>
+  Currently of the University of Szeged, Hungary
+
+  </td>
+  <td>
+
+  * Code maintenance
+  * Ownership of `sljit` and PCRE2's JIT
+
+  </td>
+</tr>
+</tbody>
+</table>
+
+
+CONTRIBUTORS
+------------
+
+Many others have participated and contributed to PCRE2 over its history.
+
+The maintainers are grateful for all contributions and participation over the
+years. We apologise for any names we have forgotten.
+
+We are especially grateful to Philip Hazel, creator of PCRE and PCRE2, and
+maintainer from 1997 to 2024.
+
+All names listed alphabetically.
+
+### Contributors to PCRE2
+
+This list includes names up until the PCRE2 10.44 release. New names will be
+added from the Git history on each release.
+
+    Scott Bell
+    Carlo Marcelo Arenas Belón
+    Edward Betts
+    Jan-Willem Blokland
+    Ross Burton
+    Dmitry Cherniachenko
+    Alexey Chupahin
+    Jessica Clarke
+    Alejandro Colomar
+    Jeremie Courreges-Anglas
+    Addison Crump
+    Alex Dowad
+    Daniel Engberg
+    Daniel Richard G
+    David Gaussmann
+    Andrey Gorbachev
+    Jordan Griege
+    Jason Hood
+    Bumsu Hyeon
+    Roy Ivy
+    Martin Joerg
+    Guillem Jover
+    Ralf Junker
+    Ayesh Karunaratne
+    Michael Kaufmann
+    Yunho Kim
+    Joshua Kinard
+    David Korczynski
+    Uwe Korn
+    Jonas Kvinge
+    Kristian Larsson
+    Kai Lu
+    Behzod Mansurov
+    B. Scott Michel
+    Nathan Moinvaziri
+    Mike Munday
+    Marc Mutz
+    Fabio Pagani
+    Christian Persch
+    Tristan Ross
+    William A Rowe Jr
+    David Seifert
+    Yaakov Selkowitz
+    Rich Siegel
+    Karl Skomski
+    Maciej Sroczyński
+    Wolfgang Stöggl
+    Thomas Tempelmann
+    Greg Thain
+    Lucas Trzesniewski
+    Theodore Tsirpanis
+    Matthew Vernon
+    Rémi Verschelde
+    Thomas Voss
+    Ezekiel Warren
+    Carl Weaver
+    Chris Wilson
+    Amin Yahyaabadi
+    Joe Zhang
+
+### Contributors to PCRE1
+
+These people contributed either by sending patches or reporting serious issues.
+
+    Irfan Adilovic
+    Alexander Barkov
+    Daniel Bergström
+    David Burgess
+    Ross Burton
+    David Byron
+    Fred Cox
+    Christian Ehrlicher
+    Tom Fortmann
+    Lionel Fourquaux
+    Mike Frysinger
+    Daniel Richard G
+    Dair Gran
+    "Graycode" (Red Hat Product Security)
+    Viktor Griph
+    Wen Guanxing
+    Robin Houston
+    Martin Jerabek
+    Peter Kankowski
+    Stephen Kelly
+    Yunho Kim
+    Joshua Kinard
+    Carsten Klein
+    Evgeny Kotkov
+    Ronald Landheer-Cieslak
+    Alan Lehotsky
+    Dmitry V. Levin
+    Nuno Lopes
+    Kai Lu
+    Giuseppe Maxia
+    Dan Mooney
+    Marc Mutz
+    Markus Oberhumer
+    Sheri Pierce
+    Petr Pisar
+    Ari Pollak
+    Bob Rossi
+    Ruiger Rill
+    Michael Shigorin
+    Rich Siegel
+    Craig Silverstein (C++ wrapper)
+    Karl Skomski
+    Paul Sokolovsky
+    Stan Switzer
+    Ian Taylor
+    Mark Tetrode
+    Jeff Trawick
+    Steven Van Ingelgem
+    Lawrence Velazquez
+    Jiong Wang
+    Stefan Weber
+    Chris Wilson
+
+Thanks go to Jeffrey Friedl for testing and debugging assistance.
diff --git a/engine/thirdparty/pcre2/LICENCE b/engine/thirdparty/pcre2/LICENCE.md
similarity index 55%
rename from engine/thirdparty/pcre2/LICENCE
rename to engine/thirdparty/pcre2/LICENCE.md
index 3c1ef032..f58ceb75 100644
--- a/engine/thirdparty/pcre2/LICENCE
+++ b/engine/thirdparty/pcre2/LICENCE.md
@@ -1,5 +1,8 @@
-PCRE2 LICENCE
--------------
+PCRE2 License
+=============
+
+| SPDX-License-Identifier: | BSD-3-Clause WITH PCRE2-exception |
+|---------|-------|
 
 PCRE2 is a library of functions to support regular expressions whose syntax
 and semantics are as close as possible to those of the Perl 5 language.
@@ -16,40 +19,46 @@ optimize pattern matching. This is an optional feature that can be omitted when
 the library is built.
 
 
-THE BASIC LIBRARY FUNCTIONS
----------------------------
+COPYRIGHT
+---------
 
-Written by:       Philip Hazel
-Email local part: Philip.Hazel
-Email domain:     gmail.com
+### The basic library functions
 
-Retired from University of Cambridge Computing Service,
-Cambridge, England.
+    Written by:       Philip Hazel
+    Email local part: Philip.Hazel
+    Email domain:     gmail.com
 
-Copyright (c) 1997-2024 University of Cambridge
-All rights reserved.
+    Retired from University of Cambridge Computing Service,
+    Cambridge, England.
 
+    Copyright (c) 1997-2007 University of Cambridge
+    Copyright (c) 2007-2024 Philip Hazel
+    All rights reserved.
 
-PCRE2 JUST-IN-TIME COMPILATION SUPPORT
---------------------------------------
+### PCRE2 Just-In-Time compilation support
 
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Email domain:     freemail.hu
+    Written by:       Zoltan Herczeg
+    Email local part: hzmester
+    Email domain:     freemail.hu
 
-Copyright(c) 2010-2024 Zoltan Herczeg
-All rights reserved.
+    Copyright (c) 2010-2024 Zoltan Herczeg
+    All rights reserved.
 
+### Stack-less Just-In-Time compiler
 
-STACK-LESS JUST-IN-TIME COMPILER
---------------------------------
+    Written by:       Zoltan Herczeg
+    Email local part: hzmester
+    Email domain:     freemail.hu
 
-Written by:       Zoltan Herczeg
-Email local part: hzmester
-Email domain:     freemail.hu
+    Copyright (c) 2009-2024 Zoltan Herczeg
+    All rights reserved.
 
-Copyright(c) 2009-2024 Zoltan Herczeg
-All rights reserved.
+### All other contributions
+
+Many other contributors have participated in the authorship of PCRE2. As PCRE2
+has never required a Contributor Licensing Agreement, or other copyright
+assignment agreement, all contributions have copyright retained by each
+original contributor or their employer.
 
 
 THE "BSD" LICENCE
@@ -58,16 +67,16 @@ THE "BSD" LICENCE
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright notices,
-      this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notices,
+  this list of conditions and the following disclaimer.
 
-    * Redistributions in binary form must reproduce the above copyright
-      notices, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright
+  notices, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
 
-    * Neither the name of the University of Cambridge nor the names of any
-      contributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
+* Neither the name of the University of Cambridge nor the names of any
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorApple.c
similarity index 98%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorApple.c
index 95b9842f..9bd2094f 100644
--- a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorApple.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorApple.c
@@ -41,9 +41,10 @@
 #include <sys/utsname.h>
 #include <stdlib.h>
 
-#define SLJIT_MAP_JIT	(get_map_jit_flag())
 #define SLJIT_UPDATE_WX_FLAGS(from, to, enable_exec)
 
+#ifdef MAP_JIT
+#define SLJIT_MAP_JIT	(get_map_jit_flag())
 static SLJIT_INLINE int get_map_jit_flag(void)
 {
 	size_t page_size;
@@ -70,6 +71,9 @@ static SLJIT_INLINE int get_map_jit_flag(void)
 	}
 	return map_jit_flag;
 }
+#else /* !defined(MAP_JIT) */
+#define SLJIT_MAP_JIT	(0)
+#endif
 
 #elif defined(SLJIT_CONFIG_ARM) && SLJIT_CONFIG_ARM
 
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorCore.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorCore.c
similarity index 96%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorCore.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorCore.c
index 6cd39110..4e1119bc 100644
--- a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorCore.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorCore.c
@@ -181,8 +181,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_malloc_exec(sljit_uw size)
 				header->executable_offset = free_block->header.executable_offset;
 #endif /* SLJIT_HAS_EXECUTABLE_OFFSET */
 				AS_BLOCK_HEADER(header, size)->prev_size = size;
-			}
-			else {
+			} else {
 				sljit_remove_free_block(free_block);
 				header = (struct block_header*)free_block;
 				size = chunk_size;
@@ -230,26 +229,25 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_malloc_exec(sljit_uw size)
 #endif /* SLJIT_HAS_EXECUTABLE_OFFSET */
 		sljit_insert_free_block(free_block, chunk_size);
 		next_header = AS_BLOCK_HEADER(free_block, chunk_size);
-	}
-	else {
+	} else {
 		/* All space belongs to this allocation. */
 		allocated_size += chunk_size;
 		header->size = chunk_size;
 		next_header = AS_BLOCK_HEADER(header, chunk_size);
 	}
-	SLJIT_ALLOCATOR_UNLOCK();
 	next_header->size = 1;
 	next_header->prev_size = chunk_size;
 #ifdef SLJIT_HAS_EXECUTABLE_OFFSET
 	next_header->executable_offset = executable_offset;
 #endif /* SLJIT_HAS_EXECUTABLE_OFFSET */
+	SLJIT_ALLOCATOR_UNLOCK();
 	return MEM_START(header);
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_exec(void* ptr)
+SLJIT_API_FUNC_ATTRIBUTE void sljit_free_exec(void *ptr)
 {
 	struct block_header *header;
-	struct free_block* free_block;
+	struct free_block *free_block;
 
 	SLJIT_ALLOCATOR_LOCK();
 	header = AS_BLOCK_HEADER(ptr, -(sljit_sw)sizeof(struct block_header));
@@ -269,8 +267,7 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free_exec(void* ptr)
 		free_block->size += header->size;
 		header = AS_BLOCK_HEADER(free_block, free_block->size);
 		header->prev_size = free_block->size;
-	}
-	else {
+	} else {
 		free_block = (struct free_block*)header;
 		sljit_insert_free_block(free_block, header->size);
 	}
@@ -308,7 +305,7 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void)
 	free_block = free_blocks;
 	while (free_block) {
 		next_free_block = free_block->next;
-		if (!free_block->header.prev_size && 
+		if (!free_block->header.prev_size &&
 				AS_BLOCK_HEADER(free_block, free_block->size)->size == 1) {
 			total_size -= free_block->size;
 			sljit_remove_free_block(free_block);
@@ -317,14 +314,14 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void)
 		free_block = next_free_block;
 	}
 
-	SLJIT_ASSERT((total_size && free_blocks) || (!total_size && !free_blocks));
+	SLJIT_ASSERT(total_size || (!total_size && !free_blocks));
 	SLJIT_UPDATE_WX_FLAGS(NULL, NULL, 1);
 	SLJIT_ALLOCATOR_UNLOCK();
 }
 
 #ifdef SLJIT_HAS_EXECUTABLE_OFFSET
-SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr)
+SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void *code)
 {
-	return ((struct block_header *)(ptr))[-1].executable_offset;
+	return ((struct block_header*)SLJIT_CODE_TO_PTR(code))[-1].executable_offset;
 }
 #endif /* SLJIT_HAS_EXECUTABLE_OFFSET */
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorFreeBSD.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorFreeBSD.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorFreeBSD.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorFreeBSD.c
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorPosix.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorPosix.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorPosix.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorPosix.c
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorWindows.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorWindows.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitExecAllocatorWindows.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitExecAllocatorWindows.c
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitProtExecAllocatorNetBSD.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitProtExecAllocatorNetBSD.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitProtExecAllocatorNetBSD.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitProtExecAllocatorNetBSD.c
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitProtExecAllocatorPosix.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitProtExecAllocatorPosix.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitProtExecAllocatorPosix.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitProtExecAllocatorPosix.c
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitWXExecAllocatorPosix.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitWXExecAllocatorPosix.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitWXExecAllocatorPosix.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitWXExecAllocatorPosix.c
diff --git a/engine/thirdparty/pcre2/src/sljit/allocator_src/sljitWXExecAllocatorWindows.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitWXExecAllocatorWindows.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/allocator_src/sljitWXExecAllocatorWindows.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/allocator_src/sljitWXExecAllocatorWindows.c
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitConfig.h b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfig.h
similarity index 93%
rename from engine/thirdparty/pcre2/src/sljit/sljitConfig.h
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfig.h
index 364c8bb7..993f4fe2 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitConfig.h
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfig.h
@@ -29,7 +29,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
 
 /*
   This file contains the basic configuration options for the SLJIT compiler
@@ -47,19 +47,19 @@ extern "C" {
 #ifndef SLJIT_UTIL_STACK
 /* Enabled by default */
 #define SLJIT_UTIL_STACK 1
-#endif
+#endif /* SLJIT_UTIL_STACK */
 
 /* Uses user provided allocator to allocate the stack (see SLJIT_UTIL_STACK) */
 #ifndef SLJIT_UTIL_SIMPLE_STACK_ALLOCATION
 /* Disabled by default */
 #define SLJIT_UTIL_SIMPLE_STACK_ALLOCATION 0
-#endif
+#endif /* SLJIT_UTIL_SIMPLE_STACK_ALLOCATION */
 
 /* Single threaded application. Does not require any locks. */
 #ifndef SLJIT_SINGLE_THREADED
 /* Disabled by default. */
 #define SLJIT_SINGLE_THREADED 0
-#endif
+#endif /* SLJIT_SINGLE_THREADED */
 
 /* --------------------------------------------------------------------- */
 /*  Configuration                                                        */
@@ -70,7 +70,7 @@ extern "C" {
 #ifndef SLJIT_STD_MACROS_DEFINED
 /* Disabled by default. */
 #define SLJIT_STD_MACROS_DEFINED 0
-#endif
+#endif /* SLJIT_STD_MACROS_DEFINED */
 
 /* Executable code allocation:
    If SLJIT_EXECUTABLE_ALLOCATOR is not defined, the application should
@@ -93,7 +93,7 @@ extern "C" {
 #ifndef SLJIT_PROT_EXECUTABLE_ALLOCATOR
 /* Disabled by default. */
 #define SLJIT_PROT_EXECUTABLE_ALLOCATOR 0
-#endif
+#endif /* SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
 /* When SLJIT_WX_EXECUTABLE_ALLOCATOR is enabled SLJIT uses an
    allocator which does not set writable and executable permission
@@ -104,7 +104,7 @@ extern "C" {
 #ifndef SLJIT_WX_EXECUTABLE_ALLOCATOR
 /* Disabled by default. */
 #define SLJIT_WX_EXECUTABLE_ALLOCATOR 0
-#endif
+#endif /* SLJIT_WX_EXECUTABLE_ALLOCATOR */
 
 #endif /* !SLJIT_EXECUTABLE_ALLOCATOR */
 
@@ -112,19 +112,19 @@ extern "C" {
 #ifndef SLJIT_ARGUMENT_CHECKS
 /* Disabled by default */
 #define SLJIT_ARGUMENT_CHECKS 0
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 /* Debug checks (assertions, etc.). */
 #ifndef SLJIT_DEBUG
 /* Enabled by default */
 #define SLJIT_DEBUG 1
-#endif
+#endif /* SLJIT_DEBUG */
 
 /* Verbose operations. */
 #ifndef SLJIT_VERBOSE
 /* Enabled by default */
 #define SLJIT_VERBOSE 1
-#endif
+#endif /* SLJIT_VERBOSE */
 
 /*
   SLJIT_IS_FPU_AVAILABLE
@@ -137,6 +137,6 @@ extern "C" {
 
 #ifdef __cplusplus
 } /* extern "C" */
-#endif
+#endif /* __cplusplus */
 
 #endif /* SLJIT_CONFIG_H_ */
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitConfigCPU.h b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfigCPU.h
similarity index 98%
rename from engine/thirdparty/pcre2/src/sljit/sljitConfigCPU.h
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfigCPU.h
index 2720bdab..dcf88efb 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitConfigCPU.h
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfigCPU.h
@@ -169,7 +169,7 @@
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7) \
 	|| (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
 #define SLJIT_CONFIG_ARM_32 1
-#endif
+#endif /* SLJIT_CONFIG_ARM_V6 || SLJIT_CONFIG_ARM_V7 || SLJIT_CONFIG_ARM_THUMB2 */
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 #define SLJIT_CONFIG_X86 1
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitConfigInternal.h b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfigInternal.h
similarity index 82%
rename from engine/thirdparty/pcre2/src/sljit/sljitConfigInternal.h
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfigInternal.h
index ce4e7b04..3ae944ef 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitConfigInternal.h
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitConfigInternal.h
@@ -27,20 +27,6 @@
 #ifndef SLJIT_CONFIG_INTERNAL_H_
 #define SLJIT_CONFIG_INTERNAL_H_
 
-#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
-	|| (defined SLJIT_DEBUG && SLJIT_DEBUG && (!defined(SLJIT_ASSERT) || !defined(SLJIT_UNREACHABLE)))
-#include <stdio.h>
-#endif
-
-#if (defined SLJIT_DEBUG && SLJIT_DEBUG \
-	&& (!defined(SLJIT_ASSERT) || !defined(SLJIT_UNREACHABLE) || !defined(SLJIT_HALT_PROCESS)))
-#include <stdlib.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
    SLJIT defines the following architecture dependent types and macros:
 
@@ -49,8 +35,8 @@ extern "C" {
      sljit_s16, sljit_u16 : signed and unsigned 16 bit integer type
      sljit_s32, sljit_u32 : signed and unsigned 32 bit integer type
      sljit_sw, sljit_uw   : signed and unsigned machine word, enough to store a pointer
-     sljit_p              : unsgined pointer value (usually the same as sljit_uw, but
-                            some 64 bit ABIs may use 32 bit pointers)
+     sljit_sp, sljit_up   : signed and unsigned pointer value (usually the same as
+                            sljit_uw, but some 64 bit ABIs may use 32 bit pointers)
      sljit_f32            : 32 bit single precision floating point value
      sljit_f64            : 64 bit double precision floating point value
 
@@ -64,16 +50,26 @@ extern "C" {
      SLJIT_MASKED_SHIFT : all word shifts are always masked
      SLJIT_MASKED_SHIFT32 : all 32 bit shifts are always masked
      SLJIT_INDIRECT_CALL : see SLJIT_FUNC_ADDR() for more information
+     SLJIT_UPPER_BITS_IGNORED : 32 bit operations ignores the upper bits of source registers
+     SLJIT_UPPER_BITS_ZERO_EXTENDED : 32 bit operations clears the upper bits of destination registers
+     SLJIT_UPPER_BITS_SIGN_EXTENDED : 32 bit operations replicates the sign bit in the upper bits of destination registers
+     SLJIT_UPPER_BITS_PRESERVED : 32 bit operations preserves the upper bits of destination registers
 
    Constants:
      SLJIT_NUMBER_OF_REGISTERS : number of available registers
      SLJIT_NUMBER_OF_SCRATCH_REGISTERS : number of available scratch registers
      SLJIT_NUMBER_OF_SAVED_REGISTERS : number of available saved registers
      SLJIT_NUMBER_OF_FLOAT_REGISTERS : number of available floating point registers
-     SLJIT_NUMBER_OF_SCRATCH_FLOAT_REGISTERS : number of available floating point scratch registers
-     SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS : number of available floating point saved registers
+     SLJIT_NUMBER_OF_SCRATCH_FLOAT_REGISTERS : number of available scratch floating point registers
+     SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS : number of available saved floating point registers
+     SLJIT_NUMBER_OF_VECTOR_REGISTERS : number of available vector registers
+     SLJIT_NUMBER_OF_SCRATCH_VECTOR_REGISTERS : number of available scratch vector registers
+     SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS : number of available saved vector registers
      SLJIT_NUMBER_OF_TEMPORARY_REGISTERS : number of available temporary registers
      SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS : number of available temporary floating point registers
+     SLJIT_NUMBER_OF_TEMPORARY_VECTOR_REGISTERS : number of available temporary vector registers
+     SLJIT_SEPARATE_VECTOR_REGISTERS : if this macro is defined, the vector registers do not
+                                       overlap with floating point registers
      SLJIT_WORD_SHIFT : the shift required to apply when accessing a sljit_sw/sljit_uw array by index
      SLJIT_F32_SHIFT : the shift required to apply when accessing
                        a single precision floating point array by index
@@ -98,12 +94,33 @@ extern "C" {
      SLJIT_TMP_R(i) : accessing temporary registers
      SLJIT_TMP_FR0 .. FR9 : accessing temporary floating point registers
      SLJIT_TMP_FR(i) : accessing temporary floating point registers
+     SLJIT_TMP_VR0 .. VR9 : accessing temporary vector registers
+     SLJIT_TMP_VR(i) : accessing temporary vector registers
+     SLJIT_TMP_DEST_REG : a temporary register for results
+     SLJIT_TMP_MEM_REG : a temporary base register for accessing memory
+                         (can be the same as SLJIT_TMP_DEST_REG)
+     SLJIT_TMP_DEST_FREG : a temporary register for float results
+     SLJIT_TMP_DEST_VREG : a temporary register for vector results
      SLJIT_FUNC : calling convention attribute for both calling JIT from C and C calling back from JIT
      SLJIT_W(number) : defining 64 bit constants on 64 bit architectures (platform independent helper)
      SLJIT_F64_SECOND(reg) : provides the register index of the second 32 bit part of a 64 bit
                              floating point register when SLJIT_HAS_F64_AS_F32_PAIR returns non-zero
 */
 
+#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \
+	|| (defined SLJIT_DEBUG && SLJIT_DEBUG && (!defined(SLJIT_ASSERT) || !defined(SLJIT_UNREACHABLE)))
+#include <stdio.h>
+#endif
+
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG \
+	&& (!defined(SLJIT_ASSERT) || !defined(SLJIT_UNREACHABLE) || !defined(SLJIT_HALT_PROCESS)))
+#include <stdlib.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /***********************************************************/
 /* Intel Control-flow Enforcement Technology (CET) spport. */
 /***********************************************************/
@@ -132,23 +149,23 @@ extern "C" {
 */
 
 #ifndef SLJIT_MALLOC
-#define SLJIT_MALLOC(size, allocator_data) malloc(size)
+#define SLJIT_MALLOC(size, allocator_data) (malloc(size))
 #endif
 
 #ifndef SLJIT_FREE
-#define SLJIT_FREE(ptr, allocator_data) free(ptr)
+#define SLJIT_FREE(ptr, allocator_data) (free(ptr))
 #endif
 
 #ifndef SLJIT_MEMCPY
-#define SLJIT_MEMCPY(dest, src, len) memcpy(dest, src, len)
+#define SLJIT_MEMCPY(dest, src, len) (memcpy(dest, src, len))
 #endif
 
 #ifndef SLJIT_MEMMOVE
-#define SLJIT_MEMMOVE(dest, src, len) memmove(dest, src, len)
+#define SLJIT_MEMMOVE(dest, src, len) (memmove(dest, src, len))
 #endif
 
 #ifndef SLJIT_ZEROMEM
-#define SLJIT_ZEROMEM(dest, len) memset(dest, 0, len)
+#define SLJIT_ZEROMEM(dest, len) (memset(dest, 0, len))
 #endif
 
 /***************************/
@@ -198,7 +215,7 @@ extern "C" {
 /* Type of public API functions. */
 /*********************************/
 
-#ifndef SLJIT_API_FUNC_ATTRIBUTE 
+#ifndef SLJIT_API_FUNC_ATTRIBUTE
 #if (defined SLJIT_CONFIG_STATIC && SLJIT_CONFIG_STATIC)
 /* Static ABI functions. For all-in-one programs. */
 
@@ -281,7 +298,7 @@ extern "C" {
 #elif defined(_WIN32)
 
 #define SLJIT_CACHE_FLUSH(from, to) \
-	FlushInstructionCache(GetCurrentProcess(), (void*)(from), (char*)(to) - (char*)(from))
+	FlushInstructionCache(GetCurrentProcess(), (void*)(from), (size_t)((char*)(to) - (char*)(from)))
 
 #elif (defined(__GNUC__) && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))) || defined(__clang__)
 
@@ -358,7 +375,8 @@ typedef long int sljit_sw;
 #endif /* _WIN32 */
 #endif
 
-typedef sljit_uw sljit_p;
+typedef sljit_sw sljit_sp;
+typedef sljit_uw sljit_up;
 
 /* Floating point types. */
 typedef float sljit_f32;
@@ -399,6 +417,10 @@ typedef double sljit_f64;
 #define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT
 #define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT
 #define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_MIN_INT
+#elif (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH)
+#define SLJIT_CONV_MAX_FLOAT SLJIT_CONV_RESULT_MAX_INT
+#define SLJIT_CONV_MIN_FLOAT SLJIT_CONV_RESULT_MIN_INT
+#define SLJIT_CONV_NAN_FLOAT SLJIT_CONV_RESULT_ZERO
 #else
 #error "Result for float to integer conversion is not defined"
 #endif
@@ -522,19 +544,6 @@ typedef double sljit_f64;
 #define SLJIT_FUNC
 #endif /* !SLJIT_FUNC */
 
-/* Disable instrumentation for these functions as they may not be sound */
-#ifndef SLJIT_FUNC_ATTRIBUTE
-#if defined(__has_feature)
-#if __has_feature(memory_sanitizer)
-#define SLJIT_FUNC_ATTRIBUTE __attribute__((no_sanitize("memory")))
-#endif /* __has_feature(memory_sanitizer) */
-#endif /* defined(__has_feature) */
-#endif
-
-#ifndef SLJIT_FUNC_ATTRIBUTE
-#define SLJIT_FUNC_ATTRIBUTE
-#endif
-
 #ifndef SLJIT_INDIRECT_CALL
 #if ((defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) && (!defined _CALL_ELF || _CALL_ELF == 1)) \
 	|| ((defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32) && defined _AIX)
@@ -557,7 +566,7 @@ determine the next executed instruction after return. */
 #if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
 SLJIT_API_FUNC_ATTRIBUTE void* sljit_malloc_exec(sljit_uw size);
 SLJIT_API_FUNC_ATTRIBUTE void sljit_free_exec(void* ptr);
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void);
+/* Note: sljitLir.h also defines sljit_free_unused_memory_exec() function. */
 #define SLJIT_BUILTIN_MALLOC_EXEC(size, exec_allocator_data) sljit_malloc_exec(size)
 #define SLJIT_BUILTIN_FREE_EXEC(ptr, exec_allocator_data) sljit_free_exec(ptr)
 
@@ -570,9 +579,9 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void);
 #endif /* SLJIT_FREE_EXEC */
 
 #if (defined SLJIT_PROT_EXECUTABLE_ALLOCATOR && SLJIT_PROT_EXECUTABLE_ALLOCATOR)
-SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
-#define SLJIT_EXEC_OFFSET(ptr) sljit_exec_offset(ptr)
-#endif
+SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void *code);
+#define SLJIT_EXEC_OFFSET(code) sljit_exec_offset(code)
+#endif /* SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
 #endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 
@@ -592,10 +601,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 7
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 0
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 1
-#define SLJIT_LOCALS_OFFSET_BASE (8 * SSIZE_OF(sw))
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R0
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R0
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
+#define SLJIT_LOCALS_OFFSET_BASE (8 * (sljit_s32)sizeof(sljit_sw))
 #define SLJIT_PREF_SHIFT_REG SLJIT_R2
 #define SLJIT_MASKED_SHIFT 1
 #define SLJIT_MASKED_SHIFT32 1
+#define SLJIT_UPPER_BITS_IGNORED 1
+#define SLJIT_UPPER_BITS_ZERO_EXTENDED 1
 
 #elif (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 
@@ -610,11 +624,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #else /* _WIN64 */
 #define SLJIT_NUMBER_OF_SAVED_REGISTERS 8
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 10
-#define SLJIT_LOCALS_OFFSET_BASE (4 * SSIZE_OF(sw))
+#define SLJIT_LOCALS_OFFSET_BASE (4 * (sljit_s32)sizeof(sljit_sw))
 #endif /* !_WIN64 */
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R0
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R0
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
 #define SLJIT_PREF_SHIFT_REG SLJIT_R3
 #define SLJIT_MASKED_SHIFT 1
 #define SLJIT_MASKED_SHIFT32 1
+#define SLJIT_UPPER_BITS_IGNORED 1
+#define SLJIT_UPPER_BITS_ZERO_EXTENDED 1
 
 #elif (defined SLJIT_CONFIG_ARM_32 && SLJIT_CONFIG_ARM_32)
 
@@ -624,6 +643,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 14
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 8
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 2
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R1
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R1
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
 #define SLJIT_LOCALS_OFFSET_BASE 0
 
 #elif (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
@@ -634,9 +656,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 30
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 8
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 2
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R0
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R0
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
 #define SLJIT_LOCALS_OFFSET_BASE (2 * (sljit_s32)sizeof(sljit_sw))
 #define SLJIT_MASKED_SHIFT 1
 #define SLJIT_MASKED_SHIFT32 1
+#define SLJIT_UPPER_BITS_IGNORED 1
+#define SLJIT_UPPER_BITS_ZERO_EXTENDED 1
 
 #elif (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
 
@@ -646,6 +673,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 30
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 18
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 2
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R1
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R1
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64) || (defined _AIX)
 #define SLJIT_LOCALS_OFFSET_BASE ((6 + 8) * (sljit_s32)sizeof(sljit_sw))
 #elif (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
@@ -654,6 +684,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #else
 #define SLJIT_LOCALS_OFFSET_BASE (3 * (sljit_s32)sizeof(sljit_sw))
 #endif /* SLJIT_CONFIG_PPC_64 || _AIX */
+#define SLJIT_UPPER_BITS_IGNORED 1
 
 #elif (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
 
@@ -670,8 +701,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #endif
 #define SLJIT_NUMBER_OF_TEMPORARY_REGISTERS 5
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 3
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R1
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R1
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
 #define SLJIT_MASKED_SHIFT 1
 #define SLJIT_MASKED_SHIFT32 1
+#define SLJIT_UPPER_BITS_SIGN_EXTENDED 1
 
 #elif (defined SLJIT_CONFIG_RISCV && SLJIT_CONFIG_RISCV)
 
@@ -681,9 +716,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 30
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 12
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 2
+#define SLJIT_SEPARATE_VECTOR_REGISTERS 1
+#define SLJIT_NUMBER_OF_VECTOR_REGISTERS 30
+#define SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS 0
+#define SLJIT_NUMBER_OF_TEMPORARY_VECTOR_REGISTERS 2
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R1
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R1
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
+#define SLJIT_TMP_DEST_VREG SLJIT_TMP_VR0
 #define SLJIT_LOCALS_OFFSET_BASE 0
 #define SLJIT_MASKED_SHIFT 1
 #define SLJIT_MASKED_SHIFT32 1
+#define SLJIT_UPPER_BITS_IGNORED 1
+#define SLJIT_UPPER_BITS_SIGN_EXTENDED 1
 
 #elif (defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X)
 
@@ -714,8 +759,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 15
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 8
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 1
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R0
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R2
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
 #define SLJIT_LOCALS_OFFSET_BASE SLJIT_S390X_DEFAULT_STACK_FRAME_SIZE
 #define SLJIT_MASKED_SHIFT 1
+#define SLJIT_UPPER_BITS_IGNORED 1
+#define SLJIT_UPPER_BITS_PRESERVED 1
 
 #elif (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH)
 
@@ -725,9 +775,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 30
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 12
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 2
+#define SLJIT_TMP_DEST_REG SLJIT_TMP_R1
+#define SLJIT_TMP_MEM_REG SLJIT_TMP_R1
+#define SLJIT_TMP_DEST_FREG SLJIT_TMP_FR0
 #define SLJIT_LOCALS_OFFSET_BASE 0
 #define SLJIT_MASKED_SHIFT 1
 #define SLJIT_MASKED_SHIFT32 1
+#define SLJIT_UPPER_BITS_SIGN_EXTENDED 1
 
 #elif (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
 
@@ -738,10 +792,20 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_FLOAT_REGISTERS 0
 #define SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS 0
 #define SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS 0
+#define SLJIT_TMP_DEST_REG 0
+#define SLJIT_TMP_MEM_REG 0
+#define SLJIT_TMP_DEST_FREG 0
 #define SLJIT_LOCALS_OFFSET_BASE 0
 
 #endif
 
+#if !(defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
+#define SLJIT_NUMBER_OF_VECTOR_REGISTERS (SLJIT_NUMBER_OF_FLOAT_REGISTERS)
+#define SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS (SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS)
+#define SLJIT_NUMBER_OF_TEMPORARY_VECTOR_REGISTERS (SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS)
+#define SLJIT_TMP_DEST_VREG (SLJIT_TMP_DEST_FREG)
+#endif /* !SLJIT_SEPARATE_VECTOR_REGISTERS */
+
 #define SLJIT_LOCALS_OFFSET (SLJIT_LOCALS_OFFSET_BASE)
 
 #define SLJIT_NUMBER_OF_SCRATCH_REGISTERS \
@@ -750,12 +814,27 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_NUMBER_OF_SCRATCH_FLOAT_REGISTERS \
 	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS)
 
+#define SLJIT_NUMBER_OF_SCRATCH_VECTOR_REGISTERS \
+	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS)
+
+#if (defined SLJIT_UPPER_BITS_ZERO_EXTENDED && SLJIT_UPPER_BITS_ZERO_EXTENDED) \
+	+ (defined SLJIT_UPPER_BITS_SIGN_EXTENDED && SLJIT_UPPER_BITS_SIGN_EXTENDED) \
+	+ (defined SLJIT_UPPER_BITS_PRESERVED && SLJIT_UPPER_BITS_PRESERVED) > 1
+#error "Invalid upper bits defintion"
+#endif
+
+#if (defined SLJIT_UPPER_BITS_PRESERVED && SLJIT_UPPER_BITS_PRESERVED) \
+	&& !(defined SLJIT_UPPER_BITS_IGNORED && SLJIT_UPPER_BITS_IGNORED)
+#error "Upper bits preserved requires bits ignored"
+#endif
+
 /**********************************/
 /* Temporary register management. */
 /**********************************/
 
 #define SLJIT_TMP_REGISTER_BASE (SLJIT_NUMBER_OF_REGISTERS + 2)
 #define SLJIT_TMP_FREGISTER_BASE (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
+#define SLJIT_TMP_VREGISTER_BASE (SLJIT_NUMBER_OF_VECTOR_REGISTERS + 1)
 
 /* WARNING: Accessing temporary registers is not recommended, because they
    are also used by the JIT compiler for various computations. Using them
@@ -789,6 +868,18 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr);
 #define SLJIT_TMP_FR9		(SLJIT_TMP_FREGISTER_BASE + 9)
 #define SLJIT_TMP_FR(i)		(SLJIT_TMP_FREGISTER_BASE + (i))
 
+#define SLJIT_TMP_VR0		(SLJIT_TMP_VREGISTER_BASE + 0)
+#define SLJIT_TMP_VR1		(SLJIT_TMP_VREGISTER_BASE + 1)
+#define SLJIT_TMP_VR2		(SLJIT_TMP_VREGISTER_BASE + 2)
+#define SLJIT_TMP_VR3		(SLJIT_TMP_VREGISTER_BASE + 3)
+#define SLJIT_TMP_VR4		(SLJIT_TMP_VREGISTER_BASE + 4)
+#define SLJIT_TMP_VR5		(SLJIT_TMP_VREGISTER_BASE + 5)
+#define SLJIT_TMP_VR6		(SLJIT_TMP_VREGISTER_BASE + 6)
+#define SLJIT_TMP_VR7		(SLJIT_TMP_VREGISTER_BASE + 7)
+#define SLJIT_TMP_VR8		(SLJIT_TMP_VREGISTER_BASE + 8)
+#define SLJIT_TMP_VR9		(SLJIT_TMP_VREGISTER_BASE + 9)
+#define SLJIT_TMP_VR(i)		(SLJIT_TMP_VREGISTER_BASE + (i))
+
 /********************************/
 /* CPU status flags management. */
 /********************************/
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitLir.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitLir.c
similarity index 77%
rename from engine/thirdparty/pcre2/src/sljit/sljitLir.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitLir.c
index 6f193000..6b2d5564 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitLir.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitLir.c
@@ -96,9 +96,10 @@
 /* All variable flags are even. */
 #define VARIABLE_FLAG_MASK (0x3e << VARIABLE_FLAG_SHIFT)
 #define GET_FLAG_TYPE(op) ((op) >> VARIABLE_FLAG_SHIFT)
+#define GET_FLAG_TYPE_MASK(op) (((op) >> VARIABLE_FLAG_SHIFT) & 0x3e)
 
 #define GET_OPCODE(op) \
-	((op) & ~(SLJIT_32 | SLJIT_SET_Z | VARIABLE_FLAG_MASK))
+	((op) & 0xff)
 
 #define HAS_FLAGS(op) \
 	((op) & (SLJIT_SET_Z | VARIABLE_FLAG_MASK))
@@ -118,9 +119,9 @@
 
 #if (defined SLJIT_32BIT_ARCHITECTURE && SLJIT_32BIT_ARCHITECTURE)
 #define ABUF_SIZE	2048
-#else
+#else /* !SLJIT_32BIT_ARCHITECTURE */
 #define ABUF_SIZE	4096
-#endif
+#endif /* SLJIT_32BIT_ARCHITECTURE */
 
 /* Parameter parsing. */
 #define REG_MASK		0x7f
@@ -139,7 +140,10 @@
 #define REG_PAIR_SECOND(reg)	((reg) >> 8)
 
 /* Mask for sljit_emit_enter. */
-#define SLJIT_KEPT_SAVEDS_COUNT(options) ((options) & 0x3)
+#define ENTER_GET_REGS(regs)			((regs) & 0xff)
+#define ENTER_GET_FLOAT_REGS(regs)		(((regs) >> 8) & 0xff)
+#define ENTER_GET_VECTOR_REGS(regs)		(((regs) >> 16) & 0xff)
+#define SLJIT_KEPT_SAVEDS_COUNT(options)	((options) & 0x3)
 
 /* Getters for simd operations, which returns with log2(size). */
 #define SLJIT_SIMD_GET_OPCODE(type)		((type) & 0xff)
@@ -152,28 +156,43 @@
 #define SLJIT_SIMD_TYPE_MASK2(m) ((sljit_s32)0xc0000fff & ~(SLJIT_SIMD_FLOAT | SLJIT_SIMD_TEST | (m)))
 
 /* Jump flags. */
-#define JUMP_LABEL	0x1
-#define JUMP_ADDR	0x2
+#define JUMP_ADDR	0x1
+#define JUMP_MOV_ADDR	0x2
 /* SLJIT_REWRITABLE_JUMP is 0x1000. */
 
 #if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
-#	define PATCH_MB		0x4
-#	define PATCH_MW		0x8
+#	define PATCH_MB		0x04
+#	define PATCH_MW		0x08
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 #	define PATCH_MD		0x10
-#endif
+#	define MOV_ADDR_HI	0x20
+#	define JUMP_MAX_SIZE	((sljit_uw)(10 + 3))
+#	define CJUMP_MAX_SIZE	((sljit_uw)(2 + 10 + 3))
+#else /* !SLJIT_CONFIG_X86_64 */
+#	define JUMP_MAX_SIZE	((sljit_uw)5)
+#	define CJUMP_MAX_SIZE	((sljit_uw)6)
+#endif /* SLJIT_CONFIG_X86_64 */
 #	define TYPE_SHIFT	13
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+/* Bits 7..12 is for debug jump size, SLJIT_REWRITABLE_JUMP is 0x1000 */
+#	define JUMP_SIZE_SHIFT	7
+#endif /* SLJIT_DEBUG */
 #endif /* SLJIT_CONFIG_X86 */
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
-#	define IS_BL		0x4
-#	define PATCH_B		0x8
-#endif /* SLJIT_CONFIG_ARM_V6 || SLJIT_CONFIG_ARM_V6 */
+#	define IS_BL		0x04
+#	define PATCH_B		0x08
+#endif /* SLJIT_CONFIG_ARM_V6 || SLJIT_CONFIG_ARM_V7 */
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 #	define CPOOL_SIZE	512
 #endif /* SLJIT_CONFIG_ARM_V6 */
 
+#if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
+#	define JUMP_SIZE_SHIFT	26
+#	define JUMP_MAX_SIZE	((sljit_uw)3)
+#endif /* SLJIT_CONFIG_ARM_V7 */
+
 #if (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
 #	define IS_COND		0x04
 #	define IS_BL		0x08
@@ -181,25 +200,30 @@
 #	define PATCH_TYPE1	0x10
 	/* conditional + imm20 */
 #	define PATCH_TYPE2	0x20
-	/* IT + imm24 */
-#	define PATCH_TYPE3	0x30
 	/* imm11 */
-#	define PATCH_TYPE4	0x40
+#	define PATCH_TYPE3	0x30
 	/* imm24 */
-#	define PATCH_TYPE5	0x50
+#	define PATCH_TYPE4	0x40
 	/* BL + imm24 */
-#	define PATCH_BL		0x60
+#	define PATCH_TYPE5	0x50
+	/* addwi/subwi */
+#	define PATCH_TYPE6	0x60
 	/* 0xf00 cc code for branches */
+#	define JUMP_SIZE_SHIFT	26
+#	define JUMP_MAX_SIZE	((sljit_uw)5)
 #endif /* SLJIT_CONFIG_ARM_THUMB2 */
 
 #if (defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64)
 #	define IS_COND		0x004
 #	define IS_CBZ		0x008
 #	define IS_BL		0x010
-#	define PATCH_B		0x020
-#	define PATCH_COND	0x040
-#	define PATCH_ABS48	0x080
-#	define PATCH_ABS64	0x100
+#	define PATCH_COND	0x020
+#	define PATCH_B		0x040
+#	define PATCH_B32	0x080
+#	define PATCH_ABS48	0x100
+#	define PATCH_ABS64	0x200
+#	define JUMP_SIZE_SHIFT	58
+#	define JUMP_MAX_SIZE	((sljit_uw)5)
 #endif /* SLJIT_CONFIG_ARM_64 */
 
 #if (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
@@ -210,8 +234,12 @@
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
 #	define PATCH_ABS32	0x040
 #	define PATCH_ABS48	0x080
+#	define JUMP_SIZE_SHIFT	58
+#	define JUMP_MAX_SIZE	((sljit_uw)7)
+#else /* !SLJIT_CONFIG_PPC_64 */
+#	define JUMP_SIZE_SHIFT	26
+#	define JUMP_MAX_SIZE	((sljit_uw)4)
 #endif /* SLJIT_CONFIG_PPC_64 */
-#	define REMOVE_COND	0x100
 #endif /* SLJIT_CONFIG_PPC */
 
 #if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
@@ -253,8 +281,11 @@
 #	define PATCH_ABS32	0x080
 #	define PATCH_ABS44	0x100
 #	define PATCH_ABS52	0x200
+#	define JUMP_SIZE_SHIFT	58
+#	define JUMP_MAX_SIZE	((sljit_uw)6)
 #else /* !SLJIT_CONFIG_RISCV_64 */
-#	define PATCH_REL32	0x0
+#	define JUMP_SIZE_SHIFT	26
+#	define JUMP_MAX_SIZE	((sljit_uw)2)
 #endif /* SLJIT_CONFIG_RISCV_64 */
 #endif /* SLJIT_CONFIG_RISCV */
 
@@ -268,6 +299,8 @@
 #	define PATCH_REL32	0x040
 #	define PATCH_ABS32	0x080
 #	define PATCH_ABS52	0x100
+#	define JUMP_SIZE_SHIFT	58
+#	define JUMP_MAX_SIZE	((sljit_uw)4)
 
 #endif /* SLJIT_CONFIG_LOONGARCH */
 /* Stack management. */
@@ -289,6 +322,14 @@
 /* Utils can still be used even if SLJIT_CONFIG_UNSUPPORTED is set. */
 #include "sljitUtils.c"
 
+#if (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
+#define SLJIT_CODE_TO_PTR(code) ((void*)((sljit_up)(code) & ~(sljit_up)0x1))
+#elif (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
+#define SLJIT_CODE_TO_PTR(code) ((void*)(*(sljit_up*)code))
+#else /* !SLJIT_CONFIG_ARM_THUMB2 && !SLJIT_INDIRECT_CALL */
+#define SLJIT_CODE_TO_PTR(code) ((void*)(code))
+#endif /* SLJIT_CONFIG_ARM_THUMB2 || SLJIT_INDIRECT_CALL */
+
 #if !(defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
 
 #if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
@@ -297,19 +338,19 @@
 
 #if defined(__NetBSD__)
 #include "allocator_src/sljitProtExecAllocatorNetBSD.c"
-#else
+#else /* !__NetBSD__ */
 #include "allocator_src/sljitProtExecAllocatorPosix.c"
-#endif
+#endif /* __NetBSD__ */
 
 #elif (defined SLJIT_WX_EXECUTABLE_ALLOCATOR && SLJIT_WX_EXECUTABLE_ALLOCATOR)
 
 #if defined(_WIN32)
 #include "allocator_src/sljitWXExecAllocatorWindows.c"
-#else
+#else /* !_WIN32 */
 #include "allocator_src/sljitWXExecAllocatorPosix.c"
-#endif
+#endif /* _WIN32 */
 
-#else
+#else /* !SLJIT_PROT_EXECUTABLAE_ALLOCATOR && !SLJIT_WX_EXECUTABLE_ALLOCATOR */
 
 #if defined(_WIN32)
 #include "allocator_src/sljitExecAllocatorWindows.c"
@@ -317,25 +358,25 @@
 #include "allocator_src/sljitExecAllocatorApple.c"
 #elif defined(__FreeBSD__)
 #include "allocator_src/sljitExecAllocatorFreeBSD.c"
-#else
+#else /* !_WIN32 && !__APPLE__ && !__FreeBSD__ */
 #include "allocator_src/sljitExecAllocatorPosix.c"
-#endif
+#endif /* _WIN32 */
 
-#endif
+#endif /* SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
 #else /* !SLJIT_EXECUTABLE_ALLOCATOR */
 
 #ifndef SLJIT_UPDATE_WX_FLAGS
 #define SLJIT_UPDATE_WX_FLAGS(from, to, enable_exec)
-#endif
+#endif /* SLJIT_UPDATE_WX_FLAGS */
 
 #endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 
 #if (defined SLJIT_PROT_EXECUTABLE_ALLOCATOR && SLJIT_PROT_EXECUTABLE_ALLOCATOR)
 #define SLJIT_ADD_EXEC_OFFSET(ptr, exec_offset) ((sljit_u8 *)(ptr) + (exec_offset))
-#else
+#else /* !SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 #define SLJIT_ADD_EXEC_OFFSET(ptr, exec_offset) ((sljit_u8 *)(ptr))
-#endif
+#endif /* SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
 /* Argument checking features. */
 
@@ -397,7 +438,7 @@
 #define CHECK_PTR(x) x
 #define CHECK_REG_INDEX(x) x
 
-#else
+#else /* !SLJIT_ARGUMENT_CHECKS && !SLJIT_DEBUG && !SLJIT_VERBOSE */
 
 /* Arguments are not checked. */
 #define CHECK(x)
@@ -415,9 +456,9 @@
 static sljit_s32 compiler_initialized = 0;
 /* A thread safe initialization. */
 static void init_compiler(void);
-#endif
+#endif /* SLJIT_CONFIG_X86 */
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allocator_data, void *exec_allocator_data)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allocator_data)
 {
 	struct sljit_compiler *compiler = (struct sljit_compiler*)SLJIT_MALLOC(sizeof(struct sljit_compiler), allocator_data);
 	if (!compiler)
@@ -428,10 +469,11 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allo
 		sizeof(sljit_s8) == 1 && sizeof(sljit_u8) == 1
 		&& sizeof(sljit_s16) == 2 && sizeof(sljit_u16) == 2
 		&& sizeof(sljit_s32) == 4 && sizeof(sljit_u32) == 4
-		&& (sizeof(sljit_p) == 4 || sizeof(sljit_p) == 8)
-		&& sizeof(sljit_p) <= sizeof(sljit_sw)
+		&& (sizeof(sljit_up) == 4 || sizeof(sljit_up) == 8)
+		&& sizeof(sljit_up) <= sizeof(sljit_sw)
+		&& sizeof(sljit_up) == sizeof(sljit_sp)
 		&& (sizeof(sljit_sw) == 4 || sizeof(sljit_sw) == 8)
-		&& (sizeof(sljit_uw) == 4 || sizeof(sljit_uw) == 8),
+		&& (sizeof(sljit_uw) == sizeof(sljit_sw)),
 		invalid_integer_types);
 	SLJIT_COMPILE_ASSERT(SLJIT_REWRITABLE_JUMP != SLJIT_32,
 		rewritable_jump_and_single_op_must_not_be_the_same);
@@ -442,7 +484,6 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allo
 	compiler->error = SLJIT_SUCCESS;
 
 	compiler->allocator_data = allocator_data;
-	compiler->exec_allocator_data = exec_allocator_data;
 	compiler->buf = (struct sljit_memory_fragment*)SLJIT_MALLOC(BUF_SIZE, allocator_data);
 	compiler->abuf = (struct sljit_memory_fragment*)SLJIT_MALLOC(ABUF_SIZE, allocator_data);
 
@@ -464,6 +505,12 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allo
 	compiler->saveds = -1;
 	compiler->fscratches = -1;
 	compiler->fsaveds = -1;
+#if (defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS) \
+		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
+	compiler->vscratches = -1;
+	compiler->vsaveds = -1;
+#endif /* SLJIT_SEPARATE_VECTOR_REGISTERS || SLJIT_ARGUMENT_CHECKS || SLJIT_VERBOSE */
 	compiler->local_size = -1;
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
@@ -489,17 +536,25 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allo
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
 		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
-	compiler->last_flags = 0;
+	SLJIT_ASSERT(compiler->last_flags == 0 && compiler->logical_local_size == 0);
 	compiler->last_return = -1;
-	compiler->logical_local_size = 0;
 #endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
 
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
+#if !(defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
+	compiler->real_fscratches = -1;
+	compiler->real_fsaveds = -1;
+#endif /* !SLJIT_SEPARATE_VECTOR_REGISTERS */
+	SLJIT_ASSERT(compiler->skip_checks == 0);
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_VERBOSE */
+
 #if (defined SLJIT_NEEDS_COMPILER_INIT && SLJIT_NEEDS_COMPILER_INIT)
 	if (!compiler_initialized) {
 		init_compiler();
 		compiler_initialized = 1;
 	}
-#endif
+#endif /* SLJIT_NEEDS_COMPILER_INIT */
 
 	return compiler;
 }
@@ -527,7 +582,7 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free_compiler(struct sljit_compiler *compile
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	SLJIT_FREE(compiler->cpool, allocator_data);
-#endif
+#endif /* SLJIT_CONFIG_ARM_V6 */
 	SLJIT_FREE(compiler, allocator_data);
 }
 
@@ -537,37 +592,17 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_compiler_memory_error(struct sljit_compi
 		compiler->error = SLJIT_ERR_ALLOC_FAILED;
 }
 
-#if (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
 SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code, void *exec_allocator_data)
 {
 	SLJIT_UNUSED_ARG(exec_allocator_data);
 
-	/* Remove thumb mode flag. */
-	SLJIT_FREE_EXEC((void*)((sljit_uw)code & ~(sljit_uw)0x1), exec_allocator_data);
+	SLJIT_FREE_EXEC(SLJIT_CODE_TO_PTR(code), exec_allocator_data);
 }
-#elif (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code, void *exec_allocator_data)
-{
-	SLJIT_UNUSED_ARG(exec_allocator_data);
-
-	/* Resolve indirection. */
-	code = (void*)(*(sljit_uw*)code);
-	SLJIT_FREE_EXEC(code, exec_allocator_data);
-}
-#else
-SLJIT_API_FUNC_ATTRIBUTE void sljit_free_code(void* code, void *exec_allocator_data)
-{
-	SLJIT_UNUSED_ARG(exec_allocator_data);
-
-	SLJIT_FREE_EXEC(code, exec_allocator_data);
-}
-#endif
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_label(struct sljit_jump *jump, struct sljit_label* label)
 {
 	if (SLJIT_LIKELY(!!jump) && SLJIT_LIKELY(!!label)) {
 		jump->flags &= (sljit_uw)~JUMP_ADDR;
-		jump->flags |= JUMP_LABEL;
 		jump->u.label = label;
 	}
 }
@@ -575,18 +610,11 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_label(struct sljit_jump *jump, struct sl
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_target(struct sljit_jump *jump, sljit_uw target)
 {
 	if (SLJIT_LIKELY(!!jump)) {
-		jump->flags &= (sljit_uw)~JUMP_LABEL;
 		jump->flags |= JUMP_ADDR;
 		jump->u.target = target;
 	}
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_put_label(struct sljit_put_label *put_label, struct sljit_label *label)
-{
-	if (SLJIT_LIKELY(!!put_label))
-		put_label->label = label;
-}
-
 #define SLJIT_CURRENT_FLAGS_ALL \
 	(SLJIT_CURRENT_FLAGS_32 | SLJIT_CURRENT_FLAGS_ADD | SLJIT_CURRENT_FLAGS_SUB | SLJIT_CURRENT_FLAGS_COMPARE)
 
@@ -597,14 +625,14 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_current_flags(struct sljit_compiler *com
 
 #if (defined SLJIT_HAS_STATUS_FLAGS_STATE && SLJIT_HAS_STATUS_FLAGS_STATE)
 	compiler->status_flags_state = current_flags;
-#endif
+#endif /* SLJIT_HAS_STATUS_FLAGS_STATE */
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_flags = 0;
 	if ((current_flags & ~(VARIABLE_FLAG_MASK | SLJIT_SET_Z | SLJIT_CURRENT_FLAGS_ALL)) == 0) {
 		compiler->last_flags = GET_FLAG_TYPE(current_flags) | (current_flags & (SLJIT_32 | SLJIT_SET_Z));
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 }
 
 /* --------------------------------------------------------------------- */
@@ -657,11 +685,11 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_alloc_memory(struct sljit_compiler *compile
 	if (size <= 0 || size > 128)
 		return NULL;
 	size = (size + 7) & ~7;
-#else
+#else /* !SLJIT_64BIT_ARCHITECTURE */
 	if (size <= 0 || size > 64)
 		return NULL;
 	size = (size + 3) & ~3;
-#endif
+#endif /* SLJIT_64BIT_ARCHITECTURE */
 	return ensure_abuf(compiler, (sljit_uw)size);
 }
 
@@ -681,73 +709,124 @@ static SLJIT_INLINE void reverse_buf(struct sljit_compiler *compiler)
 	compiler->buf = prev;
 }
 
-/* Only used in RISC architectures where the instruction size is constant */
-#if !(defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) \
-	&& !(defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X)
-
-static SLJIT_INLINE sljit_uw compute_next_addr(struct sljit_label *label, struct sljit_jump *jump,
-	struct sljit_const *const_, struct sljit_put_label *put_label)
+static SLJIT_INLINE void* allocate_executable_memory(sljit_uw size, sljit_s32 options,
+	void *exec_allocator_data, sljit_sw *executable_offset)
 {
-	sljit_uw result = ~(sljit_uw)0;
+	void *code;
+	struct sljit_generate_code_buffer *buffer;
 
-	if (label)
-		result = label->size;
+	if (SLJIT_LIKELY(!(options & SLJIT_GENERATE_CODE_BUFFER))) {
+		code = SLJIT_MALLOC_EXEC(size, exec_allocator_data);
+		*executable_offset = SLJIT_EXEC_OFFSET(code);
+		return code;
+	}
 
-	if (jump && jump->addr < result)
-		result = jump->addr;
+	buffer = (struct sljit_generate_code_buffer*)exec_allocator_data;
 
-	if (const_ && const_->addr < result)
-		result = const_->addr;
+	if (size <= buffer->size) {
+		*executable_offset = buffer->executable_offset;
+		return buffer->buffer;
+	}
 
-	if (put_label && put_label->addr < result)
-		result = put_label->addr;
+	return NULL;
+}
+
+#define SLJIT_MAX_ADDRESS ~(sljit_uw)0
+
+#define SLJIT_GET_NEXT_SIZE(ptr) (ptr != NULL) ? ((ptr)->size) : SLJIT_MAX_ADDRESS
+#define SLJIT_GET_NEXT_ADDRESS(ptr) (ptr != NULL) ? ((ptr)->addr) : SLJIT_MAX_ADDRESS
+
+#if !(defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
+
+#define SLJIT_NEXT_DEFINE_TYPES \
+	sljit_uw next_label_size; \
+	sljit_uw next_jump_addr; \
+	sljit_uw next_const_addr; \
+	sljit_uw next_min_addr
+
+#define SLJIT_NEXT_INIT_TYPES() \
+	next_label_size = SLJIT_GET_NEXT_SIZE(label); \
+	next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump); \
+	next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+
+#define SLJIT_GET_NEXT_MIN() \
+	next_min_addr = sljit_get_next_min(next_label_size, next_jump_addr, next_const_addr);
+
+static SLJIT_INLINE sljit_uw sljit_get_next_min(sljit_uw next_label_size,
+	sljit_uw next_jump_addr, sljit_uw next_const_addr)
+{
+	sljit_uw result = next_jump_addr;
+
+	SLJIT_ASSERT(result == SLJIT_MAX_ADDRESS || result != next_const_addr);
+
+	if (next_const_addr < result)
+		result = next_const_addr;
+
+	if (next_label_size < result)
+		result = next_label_size;
 
 	return result;
 }
 
-#endif /* !SLJIT_CONFIG_X86 && !SLJIT_CONFIG_S390X */
+#endif /* !SLJIT_CONFIG_X86 */
 
-static SLJIT_INLINE void set_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 args, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+#if !(defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
+
+static void update_float_register_count(struct sljit_compiler *compiler, sljit_s32 scratches, sljit_s32 saveds)
 {
-	SLJIT_UNUSED_ARG(args);
-	SLJIT_UNUSED_ARG(local_size);
+	sljit_s32 vscratches = ENTER_GET_VECTOR_REGS(scratches);
+	sljit_s32 vsaveds = ENTER_GET_VECTOR_REGS(saveds);
 
-	compiler->options = options;
-	compiler->scratches = scratches;
-	compiler->saveds = saveds;
-	compiler->fscratches = fscratches;
-	compiler->fsaveds = fsaveds;
-#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	compiler->last_return = args & SLJIT_ARG_MASK;
-	compiler->logical_local_size = local_size;
-#endif
+	if (compiler->fscratches < vscratches)
+		compiler->fscratches = vscratches;
+
+	if (compiler->fsaveds < vsaveds)
+		compiler->fsaveds = vsaveds;
+
+	if (compiler->fsaveds + compiler->fscratches > SLJIT_NUMBER_OF_FLOAT_REGISTERS)
+		compiler->fscratches = SLJIT_NUMBER_OF_FLOAT_REGISTERS - compiler->fsaveds;
 }
 
-static SLJIT_INLINE void set_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 args, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+#endif /* !SLJIT_SEPARATE_VECTOR_REGISTERS */
+
+static SLJIT_INLINE void set_emit_enter(struct sljit_compiler *compiler,
+	sljit_s32 options, sljit_s32 args,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
 	SLJIT_UNUSED_ARG(args);
 	SLJIT_UNUSED_ARG(local_size);
 
 	compiler->options = options;
-	compiler->scratches = scratches;
-	compiler->saveds = saveds;
-	compiler->fscratches = fscratches;
-	compiler->fsaveds = fsaveds;
+	compiler->scratches = ENTER_GET_REGS(scratches);
+	compiler->saveds = ENTER_GET_REGS(saveds);
+	/* These members may be copied to real_* members below. */
+	compiler->fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	compiler->fsaveds = ENTER_GET_FLOAT_REGS(saveds);
+#if (defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
+	compiler->vscratches = ENTER_GET_VECTOR_REGS(scratches);
+	compiler->vsaveds = ENTER_GET_VECTOR_REGS(saveds);
+#else /* !SLJIT_SEPARATE_VECTOR_REGISTERS */
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
+	compiler->real_fscratches = compiler->fscratches;
+	compiler->real_fsaveds = compiler->fsaveds;
+	compiler->vscratches = ENTER_GET_VECTOR_REGS(scratches);
+	compiler->vsaveds = ENTER_GET_VECTOR_REGS(saveds);
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_VERBOSE */
+	update_float_register_count(compiler, scratches, saveds);
+#endif /* SLJIT_SEPARATE_VECTOR_REGISTERS */
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_return = args & SLJIT_ARG_MASK;
 	compiler->logical_local_size = local_size;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 }
 
 static SLJIT_INLINE void set_label(struct sljit_label *label, struct sljit_compiler *compiler)
 {
 	label->next = NULL;
+	label->u.index = compiler->label_count++;
 	label->size = compiler->size;
-	if (compiler->last_label)
+	if (compiler->last_label != NULL)
 		compiler->last_label->next = label;
 	else
 		compiler->labels = label;
@@ -758,7 +837,21 @@ static SLJIT_INLINE void set_jump(struct sljit_jump *jump, struct sljit_compiler
 {
 	jump->next = NULL;
 	jump->flags = flags;
-	if (compiler->last_jump)
+	jump->u.label = NULL;
+	if (compiler->last_jump != NULL)
+		compiler->last_jump->next = jump;
+	else
+		compiler->jumps = jump;
+	compiler->last_jump = jump;
+}
+
+static SLJIT_INLINE void set_mov_addr(struct sljit_jump *jump, struct sljit_compiler *compiler, sljit_uw offset)
+{
+	jump->next = NULL;
+	jump->addr = compiler->size - offset;
+	jump->flags = JUMP_MOV_ADDR;
+	jump->u.label = NULL;
+	if (compiler->last_jump != NULL)
 		compiler->last_jump->next = jump;
 	else
 		compiler->jumps = jump;
@@ -769,26 +862,13 @@ static SLJIT_INLINE void set_const(struct sljit_const *const_, struct sljit_comp
 {
 	const_->next = NULL;
 	const_->addr = compiler->size;
-	if (compiler->last_const)
+	if (compiler->last_const != NULL)
 		compiler->last_const->next = const_;
 	else
 		compiler->consts = const_;
 	compiler->last_const = const_;
 }
 
-static SLJIT_INLINE void set_put_label(struct sljit_put_label *put_label, struct sljit_compiler *compiler, sljit_uw offset)
-{
-	put_label->next = NULL;
-	put_label->label = NULL;
-	put_label->addr = compiler->size - offset;
-	put_label->flags = 0;
-	if (compiler->last_put_label)
-		compiler->last_put_label->next = put_label;
-	else
-		compiler->put_labels = put_label;
-	compiler->last_put_label = put_label;
-}
-
 #define ADDRESSING_DEPENDS_ON(exp, reg) \
 	(((exp) & SLJIT_MEM) && (((exp) & REG_MASK) == reg || OFFS_REG(exp) == reg))
 
@@ -853,9 +933,9 @@ static sljit_s32 function_check_arguments(sljit_s32 arg_types, sljit_s32 scratch
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 #define CHECK_IF_VIRTUAL_REGISTER(p) ((p) <= SLJIT_S3 && (p) >= SLJIT_S8)
-#else
+#else /* !SLJIT_CONFIG_X86_32 */
 #define CHECK_IF_VIRTUAL_REGISTER(p) 0
-#endif
+#endif /* SLJIT_CONFIG_X86_32 */
 
 static sljit_s32 function_check_src_mem(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i)
 {
@@ -947,17 +1027,47 @@ static sljit_s32 function_fcheck(struct sljit_compiler *compiler, sljit_s32 p, s
 	return function_check_src_mem(compiler, p, i);
 }
 
+static sljit_s32 function_check_is_vreg(struct sljit_compiler *compiler, sljit_s32 vr, sljit_s32 type);
+
+#define FUNCTION_CHECK_IS_VREG(vr, type) \
+	function_check_is_vreg(compiler, (vr), (type))
+
+#define FUNCTION_VCHECK(p, i, type) \
+	CHECK_ARGUMENT(function_vcheck(compiler, (p), (i), (type)))
+
+static sljit_s32 function_vcheck(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i, sljit_s32 type)
+{
+	if (compiler->scratches == -1)
+		return 0;
+
+	if (FUNCTION_CHECK_IS_VREG(p, type))
+		return (i == 0);
+
+	return function_check_src_mem(compiler, p, i);
+}
+
 #else /* !SLJIT_CONFIG_ARM_32 && !SLJIT_CONFIG_MIPS_32 */
+
 #define FUNCTION_CHECK_IS_FREG(fr, is_32) \
 	function_check_is_freg(compiler, (fr))
 
 static sljit_s32 function_check_is_freg(struct sljit_compiler *compiler, sljit_s32 fr)
 {
+	sljit_s32 fscratches, fsaveds;
+
 	if (compiler->scratches == -1)
 		return 0;
 
-	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + compiler->fscratches))
-		|| (fr > (SLJIT_FS0 - compiler->fsaveds) && fr <= SLJIT_FS0)
+#if (defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
+#else /* SLJIT_SEPARATE_VECTOR_REGISTERS */
+	fscratches = compiler->real_fscratches;
+	fsaveds = compiler->real_fsaveds;
+#endif /* !SLJIT_SEPARATE_VECTOR_REGISTERS */
+
+	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + fscratches))
+		|| (fr > (SLJIT_FS0 - fsaveds) && fr <= SLJIT_FS0)
 		|| (fr >= SLJIT_TMP_FREGISTER_BASE && fr < (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS));
 }
 
@@ -969,9 +1079,34 @@ static sljit_s32 function_fcheck(struct sljit_compiler *compiler, sljit_s32 p, s
 	if (compiler->scratches == -1)
 		return 0;
 
-	if ((p >= SLJIT_FR0 && p < (SLJIT_FR0 + compiler->fscratches))
-			|| (p > (SLJIT_FS0 - compiler->fsaveds) && p <= SLJIT_FS0)
-			|| (p >= SLJIT_TMP_FREGISTER_BASE && p < (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS)))
+	if (function_check_is_freg(compiler, p))
+		return (i == 0);
+
+	return function_check_src_mem(compiler, p, i);
+}
+
+#define FUNCTION_CHECK_IS_VREG(vr, type) \
+	function_check_is_vreg(compiler, (vr))
+
+static sljit_s32 function_check_is_vreg(struct sljit_compiler *compiler, sljit_s32 vr)
+{
+	if (compiler->scratches == -1)
+		return 0;
+
+	return (vr >= SLJIT_VR0 && vr < (SLJIT_VR0 + compiler->vscratches))
+		|| (vr > (SLJIT_VS0 - compiler->vsaveds) && vr <= SLJIT_VS0)
+		|| (vr >= SLJIT_TMP_VREGISTER_BASE && vr < (SLJIT_TMP_VREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_VECTOR_REGISTERS));
+}
+
+#define FUNCTION_VCHECK(p, i, type) \
+	CHECK_ARGUMENT(function_vcheck(compiler, (p), (i)))
+
+static sljit_s32 function_vcheck(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i)
+{
+	if (compiler->scratches == -1)
+		return 0;
+
+	if (function_check_is_vreg(compiler, p))
 		return (i == 0);
 
 	return function_check_src_mem(compiler, p, i);
@@ -992,15 +1127,15 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_compiler_verbose(struct sljit_compiler *comp
 #ifdef _WIN64
 #ifdef __GNUC__
 #	define SLJIT_PRINT_D	"ll"
-#else
+#else /* !__GNUC__ */
 #	define SLJIT_PRINT_D	"I64"
-#endif
-#else
+#endif  /* __GNUC__ */
+#else /* !_WIN64 */
 #	define SLJIT_PRINT_D	"l"
-#endif
-#else
+#endif /* _WIN64 */
+#else /* !SLJIT_64BIT_ARCHITECTURE */
 #	define SLJIT_PRINT_D	""
-#endif
+#endif /* SLJIT_64BIT_ARCHITECTURE */
 
 static void sljit_verbose_reg(struct sljit_compiler *compiler, sljit_s32 r)
 {
@@ -1032,57 +1167,73 @@ static void sljit_verbose_freg(struct sljit_compiler *compiler, sljit_s32 r)
 		fprintf(compiler->verbose, "ft%d", r - SLJIT_TMP_FREGISTER_BASE);
 }
 
+static void sljit_verbose_vreg(struct sljit_compiler *compiler, sljit_s32 r)
+{
+#if (defined SLJIT_CONFIG_ARM_32 && SLJIT_CONFIG_ARM_32) \
+		|| (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
+	if (r >= SLJIT_F64_SECOND(SLJIT_VR0)) {
+		fprintf(compiler->verbose, "^");
+		r -= SLJIT_F64_SECOND(0);
+	}
+#endif /* SLJIT_CONFIG_ARM_32 || SLJIT_CONFIG_MIPS_32 */
+
+	if (r < (SLJIT_VR0 + compiler->vscratches))
+		fprintf(compiler->verbose, "vr%d", r - SLJIT_VR0);
+	else if (r < SLJIT_TMP_VREGISTER_BASE)
+		fprintf(compiler->verbose, "vs%d", SLJIT_NUMBER_OF_VECTOR_REGISTERS - r);
+	else
+		fprintf(compiler->verbose, "vt%d", r - SLJIT_TMP_VREGISTER_BASE);
+}
+
+static void sljit_verbose_mem(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i)
+{
+	if (!(p & REG_MASK)) {
+		fprintf(compiler->verbose, "[%" SLJIT_PRINT_D "d]", i);
+		return;
+	}
+
+	fputc('[', compiler->verbose);
+	sljit_verbose_reg(compiler, (p) & REG_MASK);
+	if (p & OFFS_REG_MASK) {
+		fprintf(compiler->verbose, " + ");
+		sljit_verbose_reg(compiler, OFFS_REG(p));
+		if (i)
+			fprintf(compiler->verbose, " * %d", 1 << (i));
+	} else if (i)
+		fprintf(compiler->verbose, " + %" SLJIT_PRINT_D "d", (i));
+	fputc(']', compiler->verbose);
+}
+
 static void sljit_verbose_param(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i)
 {
-	if ((p) == SLJIT_IMM)
-		fprintf(compiler->verbose, "#%" SLJIT_PRINT_D "d", (i));
-	else if ((p) & SLJIT_MEM) {
-		if ((p) & REG_MASK) {
-			fputc('[', compiler->verbose);
-			sljit_verbose_reg(compiler, (p) & REG_MASK);
-			if ((p) & OFFS_REG_MASK) {
-				fprintf(compiler->verbose, " + ");
-				sljit_verbose_reg(compiler, OFFS_REG(p));
-				if (i)
-					fprintf(compiler->verbose, " * %d", 1 << (i));
-			}
-			else if (i)
-				fprintf(compiler->verbose, " + %" SLJIT_PRINT_D "d", (i));
-			fputc(']', compiler->verbose);
-		}
-		else
-			fprintf(compiler->verbose, "[#%" SLJIT_PRINT_D "d]", (i));
-	} else
+	if (p == SLJIT_IMM)
+		fprintf(compiler->verbose, "#%" SLJIT_PRINT_D "d", i);
+	else if (p & SLJIT_MEM)
+		sljit_verbose_mem(compiler, p, i);
+	else
 		sljit_verbose_reg(compiler, p);
 }
 
 static void sljit_verbose_fparam(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i)
 {
-	if ((p) & SLJIT_MEM) {
-		if ((p) & REG_MASK) {
-			fputc('[', compiler->verbose);
-			sljit_verbose_reg(compiler, (p) & REG_MASK);
-			if ((p) & OFFS_REG_MASK) {
-				fprintf(compiler->verbose, " + ");
-				sljit_verbose_reg(compiler, OFFS_REG(p));
-				if (i)
-					fprintf(compiler->verbose, "%d", 1 << (i));
-			}
-			else if (i)
-				fprintf(compiler->verbose, " + %" SLJIT_PRINT_D "d", (i));
-			fputc(']', compiler->verbose);
-		}
-		else
-			fprintf(compiler->verbose, "[#%" SLJIT_PRINT_D "d]", (i));
-	}
+	if (p & SLJIT_MEM)
+		sljit_verbose_mem(compiler, p, i);
 	else
 		sljit_verbose_freg(compiler, p);
 }
 
+static void sljit_verbose_vparam(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i)
+{
+	if (p & SLJIT_MEM)
+		sljit_verbose_mem(compiler, p, i);
+	else
+		sljit_verbose_vreg(compiler, p);
+}
+
 static const char* op0_names[] = {
 	"breakpoint", "nop", "lmul.uw", "lmul.sw",
 	"divmod.u", "divmod.s", "div.u", "div.s",
-	"endbr", "skip_frames_before_return"
+	"memory_barrier", "endbr", "skip_frames_before_return"
 };
 
 static const char* op1_names[] = {
@@ -1106,6 +1257,10 @@ static const char* op2_names[] = {
 	"ashr", "mashr", "rotl", "rotr"
 };
 
+static const char* op2r_names[] = {
+	"muladd"
+};
+
 static const char* op_src_dst_names[] = {
 	"fast_return", "skip_frames_before_fast_return",
 	"prefetch_l1", "prefetch_l2",
@@ -1133,7 +1288,7 @@ static const char* fop2r_names[] = {
 };
 
 static const char* simd_op2_names[] = {
-	"and", "or", "xor"
+	"and", "or", "xor", "shuffle"
 };
 
 static const char* jump_names[] = {
@@ -1173,12 +1328,13 @@ static const char* call_arg_names[] = {
 	|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 
 #define SLJIT_SKIP_CHECKS(compiler) (compiler)->skip_checks = 1
+#define SLJIT_CHECK_OPCODE(op, flags) ((op) & ~(SLJIT_32 | SLJIT_SET_Z | VARIABLE_FLAG_MASK | (flags)))
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_generate_code(struct sljit_compiler *compiler)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	struct sljit_jump *jump;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 	SLJIT_UNUSED_ARG(compiler);
 
@@ -1187,38 +1343,57 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_generate_code(struct sljit_com
 	jump = compiler->jumps;
 	while (jump) {
 		/* All jumps have target. */
-		CHECK_ARGUMENT(jump->flags & (JUMP_LABEL | JUMP_ADDR));
+		CHECK_ARGUMENT((jump->flags & JUMP_ADDR) || jump->u.label != NULL);
 		jump = jump->next;
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 	CHECK_RETURN_OK;
 }
 
+#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
+#define SLJIT_ENTER_CPU_SPECIFIC_OPTIONS (SLJIT_ENTER_USE_VEX)
+#else /* !SLJIT_CONFIG_X86 */
+#define SLJIT_ENTER_CPU_SPECIFIC_OPTIONS (0)
+#endif /* !SLJIT_CONFIG_X86 */
+
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
+	sljit_s32 real_scratches = ENTER_GET_REGS(scratches);
+	sljit_s32 real_saveds = ENTER_GET_REGS(saveds);
+	sljit_s32 real_fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 real_fsaveds = ENTER_GET_FLOAT_REGS(saveds);
+	sljit_s32 real_vscratches = ENTER_GET_VECTOR_REGS(scratches);
+	sljit_s32 real_vsaveds = ENTER_GET_VECTOR_REGS(saveds);
+#endif /* SLJIT_ARGUMENT_CHECKS */
 	SLJIT_UNUSED_ARG(compiler);
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	if (options & SLJIT_ENTER_REG_ARG) {
-		CHECK_ARGUMENT(!(options & ~(0x3 | SLJIT_ENTER_REG_ARG)));
+		CHECK_ARGUMENT(!(options & ~(0x3 | SLJIT_ENTER_REG_ARG | SLJIT_ENTER_CPU_SPECIFIC_OPTIONS)));
 	} else {
-		CHECK_ARGUMENT(options == 0);
+		CHECK_ARGUMENT((options & ~SLJIT_ENTER_CPU_SPECIFIC_OPTIONS) == 0);
 	}
 	CHECK_ARGUMENT(SLJIT_KEPT_SAVEDS_COUNT(options) <= 3 && SLJIT_KEPT_SAVEDS_COUNT(options) <= saveds);
-	CHECK_ARGUMENT(scratches >= 0 && scratches <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(saveds >= 0 && saveds <= SLJIT_NUMBER_OF_SAVED_REGISTERS);
-	CHECK_ARGUMENT(scratches + saveds <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(fscratches >= 0 && fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fsaveds >= 0 && fsaveds <= SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fscratches + fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
+	CHECK_ARGUMENT((scratches & ~0xffffff) == 0 && (saveds & ~0xffffff) == 0);
+	CHECK_ARGUMENT(real_scratches >= 0 && real_scratches <= SLJIT_NUMBER_OF_REGISTERS);
+	CHECK_ARGUMENT(real_saveds >= 0 && real_saveds <= SLJIT_NUMBER_OF_SAVED_REGISTERS);
+	CHECK_ARGUMENT(real_scratches + real_saveds <= SLJIT_NUMBER_OF_REGISTERS);
+	CHECK_ARGUMENT(real_fscratches >= 0 && real_fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
+	CHECK_ARGUMENT(real_fsaveds >= 0 && real_fsaveds <= SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS);
+	CHECK_ARGUMENT(real_fscratches + real_fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
+	CHECK_ARGUMENT(real_vscratches >= 0 && real_vscratches <= SLJIT_NUMBER_OF_VECTOR_REGISTERS);
+	CHECK_ARGUMENT(real_vsaveds >= 0 && real_vsaveds <= SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS);
+	CHECK_ARGUMENT(real_vscratches + real_vsaveds <= SLJIT_NUMBER_OF_VECTOR_REGISTERS);
 	CHECK_ARGUMENT(local_size >= 0 && local_size <= SLJIT_MAX_LOCAL_SIZE);
 	CHECK_ARGUMENT((arg_types & SLJIT_ARG_FULL_MASK) <= SLJIT_ARG_TYPE_F32);
-	CHECK_ARGUMENT(function_check_arguments(arg_types, scratches, (options & SLJIT_ENTER_REG_ARG) ? 0 : saveds, fscratches));
+	CHECK_ARGUMENT(function_check_arguments(arg_types, real_scratches,
+		(options & SLJIT_ENTER_REG_ARG) ? 0 : real_saveds, real_fscratches));
 
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  enter ret[%s", call_arg_names[arg_types & SLJIT_ARG_MASK]);
@@ -1238,44 +1413,64 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_enter(struct sljit_compil
 		fprintf(compiler->verbose, "],");
 
 		if (options & SLJIT_ENTER_REG_ARG) {
-			fprintf(compiler->verbose, " enter:reg_arg,");
-
 			if (SLJIT_KEPT_SAVEDS_COUNT(options) > 0)
-				fprintf(compiler->verbose, " keep:%d,", SLJIT_KEPT_SAVEDS_COUNT(options));
+				fprintf(compiler->verbose, " opt:reg_arg(%d),", SLJIT_KEPT_SAVEDS_COUNT(options));
+			else
+				fprintf(compiler->verbose, " opt:reg_arg,");
 		}
 
-		fprintf(compiler->verbose, " scratches:%d, saveds:%d, fscratches:%d, fsaveds:%d, local_size:%d\n",
-			scratches, saveds, fscratches, fsaveds, local_size);
+#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
+		if (options & SLJIT_ENTER_USE_VEX) {
+				fprintf(compiler->verbose, " opt:use_vex,");
+		}
+#endif /* !SLJIT_CONFIG_X86 */
+
+		fprintf(compiler->verbose, " scratches:%d, saveds:%d, fscratches:%d, fsaveds:%d, vscratches:%d, vsaveds:%d, local_size:%d\n",
+			ENTER_GET_REGS(scratches), ENTER_GET_REGS(saveds), ENTER_GET_FLOAT_REGS(scratches), ENTER_GET_FLOAT_REGS(saveds),
+			ENTER_GET_VECTOR_REGS(scratches), ENTER_GET_VECTOR_REGS(saveds), local_size);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
+	sljit_s32 real_scratches = ENTER_GET_REGS(scratches);
+	sljit_s32 real_saveds = ENTER_GET_REGS(saveds);
+	sljit_s32 real_fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 real_fsaveds = ENTER_GET_FLOAT_REGS(saveds);
+	sljit_s32 real_vscratches = ENTER_GET_VECTOR_REGS(scratches);
+	sljit_s32 real_vsaveds = ENTER_GET_VECTOR_REGS(saveds);
+#endif /* SLJIT_ARGUMENT_CHECKS */
 	SLJIT_UNUSED_ARG(compiler);
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	if (options & SLJIT_ENTER_REG_ARG) {
-		CHECK_ARGUMENT(!(options & ~(0x3 | SLJIT_ENTER_REG_ARG)));
+		CHECK_ARGUMENT(!(options & ~(0x3 | SLJIT_ENTER_REG_ARG | SLJIT_ENTER_CPU_SPECIFIC_OPTIONS)));
 	} else {
-		CHECK_ARGUMENT(options == 0);
+		CHECK_ARGUMENT((options & ~SLJIT_ENTER_CPU_SPECIFIC_OPTIONS) == 0);
 	}
 	CHECK_ARGUMENT(SLJIT_KEPT_SAVEDS_COUNT(options) <= 3 && SLJIT_KEPT_SAVEDS_COUNT(options) <= saveds);
-	CHECK_ARGUMENT(scratches >= 0 && scratches <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(saveds >= 0 && saveds <= SLJIT_NUMBER_OF_SAVED_REGISTERS);
-	CHECK_ARGUMENT(scratches + saveds <= SLJIT_NUMBER_OF_REGISTERS);
-	CHECK_ARGUMENT(fscratches >= 0 && fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fsaveds >= 0 && fsaveds <= SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS);
-	CHECK_ARGUMENT(fscratches + fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
+	CHECK_ARGUMENT((scratches & ~0xffffff) == 0 && (saveds & ~0xffffff) == 0);
+	CHECK_ARGUMENT(real_scratches >= 0 && real_scratches <= SLJIT_NUMBER_OF_REGISTERS);
+	CHECK_ARGUMENT(real_saveds >= 0 && real_saveds <= SLJIT_NUMBER_OF_SAVED_REGISTERS);
+	CHECK_ARGUMENT(real_scratches + real_saveds <= SLJIT_NUMBER_OF_REGISTERS);
+	CHECK_ARGUMENT(real_fscratches >= 0 && real_fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
+	CHECK_ARGUMENT(real_fsaveds >= 0 && real_fsaveds <= SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS);
+	CHECK_ARGUMENT(real_fscratches + real_fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS);
+	CHECK_ARGUMENT(real_vscratches >= 0 && real_vscratches <= SLJIT_NUMBER_OF_VECTOR_REGISTERS);
+	CHECK_ARGUMENT(real_vsaveds >= 0 && real_vsaveds <= SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS);
+	CHECK_ARGUMENT(real_vscratches + real_vsaveds <= SLJIT_NUMBER_OF_VECTOR_REGISTERS);
 	CHECK_ARGUMENT(local_size >= 0 && local_size <= SLJIT_MAX_LOCAL_SIZE);
 	CHECK_ARGUMENT((arg_types & SLJIT_ARG_FULL_MASK) < SLJIT_ARG_TYPE_F64);
-	CHECK_ARGUMENT(function_check_arguments(arg_types, scratches, (options & SLJIT_ENTER_REG_ARG) ? 0 : saveds, fscratches));
+	CHECK_ARGUMENT(function_check_arguments(arg_types, real_scratches,
+		(options & SLJIT_ENTER_REG_ARG) ? 0 : real_saveds, real_fscratches));
 
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  set_context ret[%s", call_arg_names[arg_types & SLJIT_ARG_MASK]);
@@ -1295,19 +1490,28 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_set_context(struct sljit_compi
 		fprintf(compiler->verbose, "],");
 
 		if (options & SLJIT_ENTER_REG_ARG) {
-			fprintf(compiler->verbose, " enter:reg_arg,");
-
 			if (SLJIT_KEPT_SAVEDS_COUNT(options) > 0)
-				fprintf(compiler->verbose, " keep:%d,", SLJIT_KEPT_SAVEDS_COUNT(options));
+				fprintf(compiler->verbose, " opt:reg_arg(%d),", SLJIT_KEPT_SAVEDS_COUNT(options));
+			else
+				fprintf(compiler->verbose, " opt:reg_arg,");
 		}
 
-		fprintf(compiler->verbose, " scratches:%d, saveds:%d, fscratches:%d, fsaveds:%d, local_size:%d\n",
-			scratches, saveds, fscratches, fsaveds, local_size);
+#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
+		if (options & SLJIT_ENTER_USE_VEX) {
+				fprintf(compiler->verbose, " opt:use_vex,");
+		}
+#endif /* !SLJIT_CONFIG_X86 */
+
+		fprintf(compiler->verbose, " scratches:%d, saveds:%d, fscratches:%d, fsaveds:%d, vscratches:%d, vsaveds:%d, local_size:%d\n",
+			ENTER_GET_REGS(scratches), ENTER_GET_REGS(saveds), ENTER_GET_FLOAT_REGS(scratches), ENTER_GET_FLOAT_REGS(saveds),
+			ENTER_GET_VECTOR_REGS(scratches), ENTER_GET_VECTOR_REGS(saveds), local_size);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
+#undef SLJIT_ENTER_CPU_SPECIFIC_OPTIONS
+
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return_void(struct sljit_compiler *compiler)
 {
 	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
@@ -1317,13 +1521,13 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return_void(struct sljit_
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(compiler->last_return == SLJIT_ARG_TYPE_RET_VOID);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  return_void\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1356,13 +1560,13 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return(struct sljit_compi
 		break;
 	}
 
-	if (GET_OPCODE(op) < SLJIT_MOV_F64) {
+	if (SLJIT_CHECK_OPCODE(op, 0) < SLJIT_MOV_F64) {
 		FUNCTION_CHECK_SRC(src, srcw);
 	} else {
 		FUNCTION_FCHECK(src, srcw, op & SLJIT_32);
 	}
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (GET_OPCODE(op) < SLJIT_MOV_F64) {
@@ -1375,7 +1579,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return(struct sljit_compi
 		}
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1384,14 +1588,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return_to(struct sljit_co
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_SRC(src, srcw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  return_to ");
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1400,11 +1604,11 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op0(struct sljit_compiler
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT((op >= SLJIT_BREAKPOINT && op <= SLJIT_LMUL_SW)
 		|| ((op & ~SLJIT_32) >= SLJIT_DIVMOD_UW && (op & ~SLJIT_32) <= SLJIT_DIV_SW)
-		|| (op >= SLJIT_ENDBR && op <= SLJIT_SKIP_FRAMES_BEFORE_RETURN));
-	CHECK_ARGUMENT(GET_OPCODE(op) < SLJIT_LMUL_UW || GET_OPCODE(op) >= SLJIT_ENDBR || compiler->scratches >= 2);
-	if ((GET_OPCODE(op) >= SLJIT_LMUL_UW && GET_OPCODE(op) <= SLJIT_DIV_SW) || op == SLJIT_SKIP_FRAMES_BEFORE_RETURN)
+		|| (op >= SLJIT_MEMORY_BARRIER && op <= SLJIT_SKIP_FRAMES_BEFORE_RETURN));
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) < SLJIT_LMUL_UW || SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_MEMORY_BARRIER || compiler->scratches >= 2);
+	if ((SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_LMUL_UW && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_DIV_SW) || op == SLJIT_SKIP_FRAMES_BEFORE_RETURN)
 		compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose))
 	{
@@ -1414,7 +1618,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op0(struct sljit_compiler
 		}
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1428,7 +1632,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op1(struct sljit_compiler
 	}
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_MOV && GET_OPCODE(op) <= SLJIT_REV_S32);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_MOV && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_REV_S32);
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV:
@@ -1449,7 +1653,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op1(struct sljit_compiler
 
 	FUNCTION_CHECK_DST(dst, dstw);
 	FUNCTION_CHECK_SRC(src, srcw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s%s ", op1_names[GET_OPCODE(op) - SLJIT_OP1_BASE],
@@ -1460,7 +1664,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op1(struct sljit_compiler
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1475,26 +1679,37 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_atomic_load(struct sljit_
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_ATOMIC));
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_MOV && GET_OPCODE(op) <= SLJIT_MOV_P);
-	CHECK_ARGUMENT(GET_OPCODE(op) != SLJIT_MOV_S8 && GET_OPCODE(op) != SLJIT_MOV_S16 && GET_OPCODE(op) != SLJIT_MOV_S32);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, SLJIT_ATOMIC_TEST | SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS | SLJIT_SET_Z | VARIABLE_FLAG_MASK) >= SLJIT_MOV
+		&& SLJIT_CHECK_OPCODE(op, SLJIT_ATOMIC_TEST | SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS | SLJIT_SET_Z | VARIABLE_FLAG_MASK) <= SLJIT_MOV_P);
+	CHECK_ARGUMENT((op & (SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS)) != (SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS));
 
 	/* All arguments must be valid registers. */
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(dst_reg));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(mem_reg) && !CHECK_IF_VIRTUAL_REGISTER(mem_reg));
 
-	if (op == SLJIT_MOV32_U8 || op == SLJIT_MOV32_U16) {
-		/* Only SLJIT_32 is allowed. */
-		CHECK_ARGUMENT(!(op & (VARIABLE_FLAG_MASK | SLJIT_SET_Z)));
-	} else {
+	if (GET_OPCODE(op) < SLJIT_MOV_U8 || GET_OPCODE(op) > SLJIT_MOV_S16) {
 		/* Nothing allowed. */
-		CHECK_ARGUMENT(!(op & (SLJIT_32 | SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
+		CHECK_ARGUMENT(!(op & SLJIT_32));
 	}
 
 	compiler->last_flags = 0;
 #endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  atomic_load%s%s ", !(op & SLJIT_32) ? "" : "32",
+		if (op & SLJIT_ATOMIC_TEST)
+			CHECK_RETURN_OK;
+		if (sljit_emit_atomic_load(compiler, op | SLJIT_ATOMIC_TEST, dst_reg, mem_reg)) {
+			fprintf(compiler->verbose, "    # atomic_load: unsupported form, no instructions are emitted\n");
+			CHECK_RETURN_OK;
+		}
+
+		fprintf(compiler->verbose, "  atomic_load");
+		if (op & SLJIT_ATOMIC_USE_CAS)
+			fprintf(compiler->verbose, "_cas");
+		if (op & SLJIT_ATOMIC_USE_LS)
+			fprintf(compiler->verbose, "_ls");
+
+		fprintf(compiler->verbose, "%s%s ", !(op & SLJIT_32) ? "" : "32",
 				op1_types[GET_OPCODE(op) - SLJIT_OP1_BASE]);
 		sljit_verbose_reg(compiler, dst_reg);
 		fprintf(compiler->verbose, ", [");
@@ -1517,29 +1732,40 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_atomic_store(struct sljit
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_ATOMIC));
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_MOV && GET_OPCODE(op) <= SLJIT_MOV_P);
-	CHECK_ARGUMENT(GET_OPCODE(op) != SLJIT_MOV_S8 && GET_OPCODE(op) != SLJIT_MOV_S16 && GET_OPCODE(op) != SLJIT_MOV_S32);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, SLJIT_ATOMIC_TEST | SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS | SLJIT_SET_Z) >= SLJIT_MOV
+		&& SLJIT_CHECK_OPCODE(op, SLJIT_ATOMIC_TEST | SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS | SLJIT_SET_Z) <= SLJIT_MOV_P);
+	CHECK_ARGUMENT((op & (SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS)) != (SLJIT_ATOMIC_USE_CAS | SLJIT_ATOMIC_USE_LS));
 
 	/* All arguments must be valid registers. */
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(src_reg));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(mem_reg) && !CHECK_IF_VIRTUAL_REGISTER(mem_reg));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(temp_reg) && src_reg != temp_reg);
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(temp_reg) && (src_reg != temp_reg || (op & SLJIT_ATOMIC_USE_LS)));
 
-	CHECK_ARGUMENT(!(op & VARIABLE_FLAG_MASK) || GET_FLAG_TYPE(op) == SLJIT_ATOMIC_STORED);
+	CHECK_ARGUMENT(!(op & VARIABLE_FLAG_MASK) || GET_FLAG_TYPE_MASK(op) == SLJIT_ATOMIC_STORED);
 
-	if (GET_OPCODE(op) == SLJIT_MOV_U8 || GET_OPCODE(op) == SLJIT_MOV_U16) {
-		/* Only SLJIT_32, SLJIT_ATOMIC_STORED are allowed. */
-		CHECK_ARGUMENT(!(op & SLJIT_SET_Z));
-	} else {
-		/* Only SLJIT_ATOMIC_STORED is allowed. */
-		CHECK_ARGUMENT(!(op & (SLJIT_32 | SLJIT_SET_Z)));
+	if (GET_OPCODE(op) < SLJIT_MOV_U8 || GET_OPCODE(op) > SLJIT_MOV_S16) {
+		/* Nothing allowed. */
+		CHECK_ARGUMENT(!(op & SLJIT_32));
 	}
 
-	compiler->last_flags = GET_FLAG_TYPE(op) | (op & SLJIT_32);
+	compiler->last_flags = GET_FLAG_TYPE_MASK(op) | (op & SLJIT_32);
 #endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  atomic_store%s%s%s ", !(op & SLJIT_32) ? "" : "32",
+		if (op & SLJIT_ATOMIC_TEST)
+			CHECK_RETURN_OK;
+		if (sljit_emit_atomic_store(compiler, op | SLJIT_ATOMIC_TEST, src_reg, mem_reg, temp_reg)) {
+			fprintf(compiler->verbose, "    # atomic_store: unsupported form, no instructions are emitted\n");
+			CHECK_RETURN_OK;
+		}
+
+		fprintf(compiler->verbose, "  atomic_store");
+		if (op & SLJIT_ATOMIC_USE_CAS)
+			fprintf(compiler->verbose, "_cas");
+		if (op & SLJIT_ATOMIC_USE_LS)
+			fprintf(compiler->verbose, "_ls");
+
+		fprintf(compiler->verbose, "%s%s%s ", !(op & SLJIT_32) ? "" : "32",
 				op1_types[GET_OPCODE(op) - SLJIT_OP1_BASE], !(op & VARIABLE_FLAG_MASK) ? "" : ".stored");
 		sljit_verbose_reg(compiler, src_reg);
 		fprintf(compiler->verbose, ", [");
@@ -1563,7 +1789,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2(struct sljit_compiler
 	}
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_ADD && GET_OPCODE(op) <= SLJIT_ROTR);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_ADD && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_ROTR);
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_AND:
@@ -1616,7 +1842,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2(struct sljit_compiler
 	FUNCTION_CHECK_SRC(src1, src1w);
 	FUNCTION_CHECK_SRC(src2, src2w);
 	compiler->last_flags = GET_FLAG_TYPE(op) | (op & (SLJIT_32 | SLJIT_SET_Z));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s%s%s%s ", op2_names[GET_OPCODE(op) - SLJIT_OP2_BASE], !(op & SLJIT_32) ? "" : "32",
@@ -1632,7 +1858,34 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2(struct sljit_compiler
 		sljit_verbose_param(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
+	CHECK_RETURN_OK;
+}
+
+static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
+	CHECK_ARGUMENT((op | SLJIT_32) == SLJIT_MULADD32);
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(dst_reg));
+	FUNCTION_CHECK_SRC(src1, src1w);
+	FUNCTION_CHECK_SRC(src2, src2w);
+	compiler->last_flags = 0;
+#endif /* SLJIT_ARGUMENT_CHECKS */
+#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
+	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
+		fprintf(compiler->verbose, "  %s%s ", op2r_names[GET_OPCODE(op) - SLJIT_OP2R_BASE], !(op & SLJIT_32) ? "" : "32");
+
+		sljit_verbose_reg(compiler, dst_reg);
+		fprintf(compiler->verbose, ", ");
+		sljit_verbose_param(compiler, src1, src1w);
+		fprintf(compiler->verbose, ", ");
+		sljit_verbose_param(compiler, src2, src2w);
+		fprintf(compiler->verbose, "\n");
+	}
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1643,15 +1896,15 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_shift_into(struct sljit_c
 	sljit_s32 src3, sljit_sw src3w)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
-	CHECK_ARGUMENT(GET_OPCODE(op) == SLJIT_SHL || GET_OPCODE(op) == SLJIT_LSHR
-		|| GET_OPCODE(op) == SLJIT_MSHL || GET_OPCODE(op) == SLJIT_MLSHR);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) == SLJIT_SHL || SLJIT_CHECK_OPCODE(op, 0) == SLJIT_LSHR
+		|| SLJIT_CHECK_OPCODE(op, 0) == SLJIT_MSHL || SLJIT_CHECK_OPCODE(op, 0) == SLJIT_MLSHR);
 	CHECK_ARGUMENT((op & ~(0xff | SLJIT_32 | SLJIT_SHIFT_INTO_NON_ZERO)) == 0);
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(dst_reg));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(src1_reg));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(src2_reg));
 	FUNCTION_CHECK_SRC(src3, src3w);
 	CHECK_ARGUMENT(dst_reg != src2_reg);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s.into%s ", op2_names[GET_OPCODE(op) - SLJIT_OP2_BASE], !(op & SLJIT_32) ? "" : "32",
@@ -1666,7 +1919,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_shift_into(struct sljit_c
 		sljit_verbose_param(compiler, src3, src3w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1683,14 +1936,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_src(struct sljit_compi
 	} else if (op >= SLJIT_PREFETCH_L1 && op <= SLJIT_PREFETCH_ONCE) {
 		CHECK_ARGUMENT(src & SLJIT_MEM);
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s ", op_src_dst_names[op - SLJIT_OP_SRC_DST_BASE]);
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1703,14 +1956,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_dst(struct sljit_compi
 
 	if (op == SLJIT_FAST_ENTER)
 		compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s ", op_src_dst_names[op - SLJIT_OP_SRC_DST_BASE]);
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1721,13 +1974,20 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_register_index(sljit_s32 t
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	if (type == SLJIT_GP_REGISTER) {
 		CHECK_ARGUMENT((reg > 0 && reg <= SLJIT_NUMBER_OF_REGISTERS)
-			|| (reg >= SLJIT_TMP_REGISTER_BASE && reg <= (SLJIT_TMP_REGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_REGISTERS)));
-	} else {
-		CHECK_ARGUMENT(type == SLJIT_FLOAT_REGISTER || ((type >> 12) == 0 || ((type >> 12) >= 3 && (type >> 12) <= 6)));
-		CHECK_ARGUMENT((reg > 0 && reg <= SLJIT_NUMBER_OF_FLOAT_REGISTERS)
-			|| (reg >= SLJIT_TMP_FREGISTER_BASE && reg <= (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS)));
+			|| (reg >= SLJIT_TMP_REGISTER_BASE && reg < (SLJIT_TMP_REGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_REGISTERS)));
 	}
-#endif
+#if (defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
+	else if (((type >> 12) == 0 || ((type >> 12) >= 3 && (type >> 12) <= 6))) {
+		CHECK_ARGUMENT((reg > 0 && reg <= SLJIT_NUMBER_OF_VECTOR_REGISTERS)
+			|| (reg >= SLJIT_TMP_VREGISTER_BASE && reg < (SLJIT_TMP_VREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_VECTOR_REGISTERS)));
+	}
+#endif /* SLJIT_SEPARATE_VECTOR_REGISTERS */
+	else {
+		CHECK_ARGUMENT(type == SLJIT_FLOAT_REGISTER || ((type >> 12) == 0 || ((type >> 12) >= 3 && (type >> 12) <= 6) || (type & (3 << 12)) || (type & (4 << 12)) || (type & (5 << 12)) || (type & (6 << 12))));
+		CHECK_ARGUMENT((reg > 0 && reg <= SLJIT_NUMBER_OF_FLOAT_REGISTERS)
+			|| (reg >= SLJIT_TMP_FREGISTER_BASE && reg < (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS)));
+	}
+#endif /* SLJIT_ARGUMENT_CHECKS */
 	CHECK_RETURN_OK;
 }
 
@@ -1736,7 +1996,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_custom(struct sljit_co
 {
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	sljit_u32 i;
-#endif
+#endif /* SLJIT_VERBOSE */
 
 	SLJIT_UNUSED_ARG(compiler);
 
@@ -1750,12 +2010,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_custom(struct sljit_co
 		|| (size == 4 && (((sljit_sw)instruction) & 0x3) == 0));
 #elif (defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X)
 	CHECK_ARGUMENT(size == 2 || size == 4 || size == 6);
-#else
+#else /* !SLJIT_CONFIG_X86 && !SLJIT_CONFIG_ARM_THUMB2 && !SLJIT_CONFIG_S390X */
 	CHECK_ARGUMENT(size == 4 && (((sljit_sw)instruction) & 0x3) == 0);
-#endif
+#endif /* SLJIT_CONFIG_X86 */
 
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  op_custom");
@@ -1763,7 +2023,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_custom(struct sljit_co
 			fprintf(compiler->verbose, " 0x%x", ((sljit_u8*)instruction)[i]);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1778,11 +2038,11 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1(struct sljit_compile
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_MOV_F64 && GET_OPCODE(op) <= SLJIT_ABS_F64);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_MOV_F64 && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_ABS_F64);
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	FUNCTION_FCHECK(src, srcw, op & SLJIT_32);
 	FUNCTION_FCHECK(dst, dstw, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (GET_OPCODE(op) == SLJIT_CONV_F64_FROM_F32)
@@ -1797,7 +2057,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1(struct sljit_compile
 		sljit_verbose_fparam(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1807,7 +2067,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_cmp(struct sljit_com
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_flags = GET_FLAG_TYPE(op) | (op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
 		compiler->skip_checks = 0;
@@ -1816,13 +2076,13 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_cmp(struct sljit_com
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
-	CHECK_ARGUMENT(GET_OPCODE(op) == SLJIT_CMP_F64);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) == SLJIT_CMP_F64);
 	CHECK_ARGUMENT(!(op & SLJIT_SET_Z));
 	CHECK_ARGUMENT((op & VARIABLE_FLAG_MASK)
 		|| (GET_FLAG_TYPE(op) >= SLJIT_F_EQUAL && GET_FLAG_TYPE(op) <= SLJIT_ORDERED_LESS_EQUAL));
 	FUNCTION_FCHECK(src1, src1w, op & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s", fop1_names[SLJIT_CMP_F64 - SLJIT_FOP1_BASE], (op & SLJIT_32) ? ".f32" : ".f64");
@@ -1835,7 +2095,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_cmp(struct sljit_com
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1853,7 +2113,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_sw_from_f64(str
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	FUNCTION_FCHECK(src, srcw, op & SLJIT_32);
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s.from%s ", fop1_names[GET_OPCODE(op) - SLJIT_FOP1_BASE],
@@ -1864,7 +2124,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_sw_from_f64(str
 		sljit_verbose_fparam(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1882,7 +2142,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_f64_from_w(stru
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	FUNCTION_CHECK_SRC(src, srcw);
 	FUNCTION_FCHECK(dst, dstw, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s.from.%s ", fop1_names[GET_OPCODE(op) - SLJIT_FOP1_BASE],
@@ -1893,7 +2153,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_f64_from_w(stru
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1909,12 +2169,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2(struct sljit_compile
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_ADD_F64 && GET_OPCODE(op) <= SLJIT_DIV_F64);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_ADD_F64 && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_DIV_F64);
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	FUNCTION_FCHECK(src1, src1w, op & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, op & SLJIT_32);
 	FUNCTION_FCHECK(dst, dstw, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s ", fop2_names[GET_OPCODE(op) - SLJIT_FOP2_BASE], (op & SLJIT_32) ? ".f32" : ".f64");
@@ -1925,7 +2185,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2(struct sljit_compile
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1936,11 +2196,11 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2r(struct sljit_compil
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
-	CHECK_ARGUMENT(GET_OPCODE(op) == SLJIT_COPYSIGN_F64);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) == SLJIT_COPYSIGN_F64);
 	FUNCTION_FCHECK(src1, src1w, op & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, op & SLJIT_32);
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(dst_freg, op & SLJIT_32));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s ", fop2r_names[GET_OPCODE(op) - SLJIT_FOP2R_BASE], (op & SLJIT_32) ? ".f32" : ".f64");
@@ -1951,7 +2211,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2r(struct sljit_compil
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1968,14 +2228,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fset32(struct sljit_compi
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 1));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fset32 ");
 		sljit_verbose_freg(compiler, freg);
 		fprintf(compiler->verbose, ", %f\n", value);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1992,14 +2252,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fset64(struct sljit_compi
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fset64 ");
 		sljit_verbose_freg(compiler, freg);
 		fprintf(compiler->verbose, ", %f\n", value);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2008,7 +2268,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcopy(struct sljit_compil
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
-	CHECK_ARGUMENT(GET_OPCODE(op) >= SLJIT_COPY_TO_F64 && GET_OPCODE(op) <= SLJIT_COPY_FROM_F64);
+	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_COPY_TO_F64 && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_COPY_FROM_F64);
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, op & SLJIT_32));
 
@@ -2037,7 +2297,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcopy(struct sljit_compil
 		break;
 	}
 #endif /* SLJIT_64BIT_ARCHITECTURE */
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  copy%s_%s_f%s ", (op & SLJIT_32) ? "32" : "",
@@ -2057,7 +2317,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcopy(struct sljit_compil
 			fprintf(compiler->verbose, "\n");
 		}
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2072,12 +2332,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_label(struct sljit_compil
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose))
 		fprintf(compiler->verbose, "label:\n");
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2087,9 +2347,9 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_label(struct sljit_compil
 #define CHECK_UNORDERED(type, last_flags) \
 	((((type) & 0xfe) == SLJIT_ORDERED) && \
 		((last_flags) & 0xff) >= SLJIT_UNORDERED && ((last_flags) & 0xff) <= SLJIT_ORDERED_LESS_EQUAL)
-#else
+#else /* !SLJIT_CONFIG_X86 || SLJIT_CONFIG_ARM */
 #define CHECK_UNORDERED(type, last_flags) 0
-#endif
+#endif /* SLJIT_CONFIG_X86 || SLJIT_CONFIG_ARM */
 #endif /* SLJIT_ARGUMENT_CHECKS */
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_jump(struct sljit_compiler *compiler, sljit_s32 type)
@@ -2113,12 +2373,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_jump(struct sljit_compile
 			CHECK_ARGUMENT((type & 0xfe) == (compiler->last_flags & 0xff)
 				|| CHECK_UNORDERED(type, compiler->last_flags));
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose))
 		fprintf(compiler->verbose, "  jump%s %s\n", !(type & SLJIT_REWRITABLE_JUMP) ? "" : ".r",
 			jump_names[type & 0xff]);
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2139,7 +2399,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_call(struct sljit_compile
 			CHECK_ARGUMENT((type & 0xff) != SLJIT_CALL_REG_ARG);
 		}
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s%s ret[%s", jump_names[type & 0xff],
@@ -2159,7 +2419,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_call(struct sljit_compile
 		}
 		fprintf(compiler->verbose, "]\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2173,7 +2433,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_cmp(struct sljit_compiler
 	FUNCTION_CHECK_SRC(src1, src1w);
 	FUNCTION_CHECK_SRC(src2, src2w);
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  cmp%s%s %s, ", (type & SLJIT_32) ? "32" : "",
@@ -2183,7 +2443,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_cmp(struct sljit_compiler
 		sljit_verbose_param(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2198,7 +2458,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcmp(struct sljit_compile
 	FUNCTION_FCHECK(src1, src1w, type & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, type & SLJIT_32);
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fcmp%s%s %s, ", (type & SLJIT_32) ? ".f32" : ".f64",
@@ -2208,7 +2468,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcmp(struct sljit_compile
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2223,14 +2483,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_ijump(struct sljit_compil
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(type >= SLJIT_JUMP && type <= SLJIT_FAST_CALL);
 	FUNCTION_CHECK_SRC(src, srcw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  ijump.%s ", jump_names[type]);
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2253,7 +2513,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_icall(struct sljit_compil
 			CHECK_ARGUMENT((type & 0xff) != SLJIT_CALL_REG_ARG);
 		}
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  i%s%s ret[%s", jump_names[type & 0xff],
@@ -2274,7 +2534,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_icall(struct sljit_compil
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2285,7 +2545,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_flags(struct sljit_com
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(type >= SLJIT_EQUAL && type <= SLJIT_ORDERED_LESS_EQUAL);
 	CHECK_ARGUMENT(op == SLJIT_MOV || op == SLJIT_MOV32
-		|| (GET_OPCODE(op) >= SLJIT_AND && GET_OPCODE(op) <= SLJIT_XOR));
+		|| (SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_AND && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_XOR));
 	CHECK_ARGUMENT(!(op & VARIABLE_FLAG_MASK));
 
 	if (type <= SLJIT_NOT_ZERO)
@@ -2298,7 +2558,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_flags(struct sljit_com
 
 	if (GET_OPCODE(op) >= SLJIT_ADD)
 		compiler->last_flags = GET_FLAG_TYPE(op) | (op & (SLJIT_32 | SLJIT_SET_Z));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  flags.%s%s%s ",
@@ -2308,7 +2568,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_flags(struct sljit_com
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, ", %s\n", jump_names[type]);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2335,7 +2595,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_select(struct sljit_compi
 	} else
 		CHECK_ARGUMENT((cond & 0xfe) == (compiler->last_flags & 0xff)
 			|| CHECK_UNORDERED(cond, compiler->last_flags));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  select%s %s, ",
@@ -2348,7 +2608,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_select(struct sljit_compi
 		sljit_verbose_reg(compiler, src2_reg);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2375,7 +2635,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fselect(struct sljit_comp
 	} else
 		CHECK_ARGUMENT((cond & 0xfe) == (compiler->last_flags & 0xff)
 			|| CHECK_UNORDERED(cond, compiler->last_flags));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fselect%s %s, ",
@@ -2388,7 +2648,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fselect(struct sljit_comp
 		sljit_verbose_freg(compiler, src2_freg);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2442,7 +2702,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem(struct sljit_compiler
 	}
 
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if ((type & 0xff) == SLJIT_MOV32)
@@ -2474,7 +2734,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem(struct sljit_compiler
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2493,7 +2753,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem_update(struct sljit_c
 	CHECK_ARGUMENT((mem & REG_MASK) != 0 && (mem & REG_MASK) != reg);
 
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_MEM_SUPP)
@@ -2519,7 +2779,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem_update(struct sljit_c
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2543,7 +2803,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem(struct sljit_compile
 	CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_32 | SLJIT_MEM_STORE | SLJIT_MEM_UNALIGNED | SLJIT_MEM_ALIGNED_16 | SLJIT_MEM_ALIGNED_32)));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, type & SLJIT_32));
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s.%s",
@@ -2563,7 +2823,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem(struct sljit_compile
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2577,7 +2837,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem_update(struct sljit_
 	CHECK_ARGUMENT((type & ~(0xff | SLJIT_32 | SLJIT_MEM_STORE | SLJIT_MEM_SUPP | SLJIT_MEM_POST)) == 0);
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, type & SLJIT_32));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_MEM_SUPP)
@@ -2597,12 +2857,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem_update(struct sljit_
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
@@ -2611,14 +2871,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_mov(struct sljit_com
 	CHECK_ARGUMENT(SLJIT_SIMD_CHECK_REG(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) <= SLJIT_SIMD_GET_REG_SIZE(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM2_SIZE(type) <= (srcdst & SLJIT_MEM) ? SLJIT_SIMD_GET_REG_SIZE(type) : 0);
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
-	FUNCTION_FCHECK(srcdst, srcdstw, 0);
-#endif
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, type));
+	FUNCTION_VCHECK(srcdst, srcdstw, type);
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
 			CHECK_RETURN_OK;
-		if (sljit_emit_simd_mov(compiler, type | SLJIT_SIMD_TEST, freg, srcdst, srcdstw) == SLJIT_ERR_UNSUPPORTED) {
+		if (sljit_emit_simd_mov(compiler, type | SLJIT_SIMD_TEST, vreg, srcdst, srcdstw) == SLJIT_ERR_UNSUPPORTED) {
 			fprintf(compiler->verbose, "    # simd_mem: unsupported form, no instructions are emitted\n");
 			CHECK_RETURN_OK;
 		}
@@ -2634,17 +2894,17 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_mov(struct sljit_com
 		else
 			fprintf(compiler->verbose, ".al%d ", (8 << SLJIT_SIMD_GET_ELEM2_SIZE(type)));
 
-		sljit_verbose_freg(compiler, freg);
+		sljit_verbose_vreg(compiler, vreg);
 		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, srcdst, srcdstw);
+		sljit_verbose_vparam(compiler, srcdst, srcdstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
@@ -2652,7 +2912,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_replicate(struct slj
 	CHECK_ARGUMENT((type & SLJIT_SIMD_TYPE_MASK(0)) == 0);
 	CHECK_ARGUMENT(SLJIT_SIMD_CHECK_REG(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) < SLJIT_SIMD_GET_REG_SIZE(type));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, type));
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		if (src == SLJIT_IMM) {
@@ -2663,12 +2923,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_replicate(struct slj
 	} else if (src != SLJIT_IMM) {
 		FUNCTION_CHECK_DST(src, srcw);
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
 			CHECK_RETURN_OK;
-		if (sljit_emit_simd_replicate(compiler, type | SLJIT_SIMD_TEST, freg, src, srcw) == SLJIT_ERR_UNSUPPORTED) {
+		if (sljit_emit_simd_replicate(compiler, type | SLJIT_SIMD_TEST, vreg, src, srcw) == SLJIT_ERR_UNSUPPORTED) {
 			fprintf(compiler->verbose, "    # simd_dup: unsupported form, no instructions are emitted\n");
 			CHECK_RETURN_OK;
 		}
@@ -2678,7 +2938,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_replicate(struct slj
 			(type & SLJIT_SIMD_FLOAT) ? "f" : "",
 			(8 << SLJIT_SIMD_GET_ELEM_SIZE(type)));
 
-		sljit_verbose_freg(compiler, freg);
+		sljit_verbose_vreg(compiler, vreg);
 		fprintf(compiler->verbose, ", ");
 		if (type & SLJIT_SIMD_FLOAT)
 			sljit_verbose_fparam(compiler, src, srcw);
@@ -2686,12 +2946,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_replicate(struct slj
 			sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
@@ -2703,7 +2963,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_mov(struct slji
 	CHECK_ARGUMENT(SLJIT_SIMD_CHECK_REG(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) < SLJIT_SIMD_GET_REG_SIZE(type));
 	CHECK_ARGUMENT(!(type & SLJIT_32) || SLJIT_SIMD_GET_ELEM_SIZE(type) <= 2);
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, type));
 	CHECK_ARGUMENT(lane_index >= 0 && lane_index < (1 << (SLJIT_SIMD_GET_REG_SIZE(type) - SLJIT_SIMD_GET_ELEM_SIZE(type))));
 
 	if (type & SLJIT_SIMD_FLOAT) {
@@ -2711,12 +2971,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_mov(struct slji
 	} else if ((type & SLJIT_SIMD_STORE) || srcdst != SLJIT_IMM) {
 		FUNCTION_CHECK_DST(srcdst, srcdstw);
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
 			CHECK_RETURN_OK;
-		if (sljit_emit_simd_lane_mov(compiler, type | SLJIT_SIMD_TEST, freg, lane_index, srcdst, srcdstw) == SLJIT_ERR_UNSUPPORTED) {
+		if (sljit_emit_simd_lane_mov(compiler, type | SLJIT_SIMD_TEST, vreg, lane_index, srcdst, srcdstw) == SLJIT_ERR_UNSUPPORTED) {
 			fprintf(compiler->verbose, "    # simd_move_lane: unsupported form, no instructions are emitted\n");
 			CHECK_RETURN_OK;
 		}
@@ -2730,7 +2990,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_mov(struct slji
 			(type & SLJIT_SIMD_FLOAT) ? "f" : "",
 			(8 << SLJIT_SIMD_GET_ELEM_SIZE(type)));
 
-		sljit_verbose_freg(compiler, freg);
+		sljit_verbose_vreg(compiler, vreg);
 		fprintf(compiler->verbose, "[%d], ", lane_index);
 		if (type & SLJIT_SIMD_FLOAT)
 			sljit_verbose_fparam(compiler, srcdst, srcdstw);
@@ -2738,12 +2998,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_mov(struct slji
 			sljit_verbose_param(compiler, srcdst, srcdstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
@@ -2751,15 +3011,15 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_replicate(struc
 	CHECK_ARGUMENT((type & SLJIT_SIMD_TYPE_MASK(0)) == 0);
 	CHECK_ARGUMENT(SLJIT_SIMD_CHECK_REG(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) < SLJIT_SIMD_GET_REG_SIZE(type));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(src, 0));
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, type));
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(src, type));
 	CHECK_ARGUMENT(src_lane_index >= 0 && src_lane_index < (1 << (SLJIT_SIMD_GET_REG_SIZE(type) - SLJIT_SIMD_GET_ELEM_SIZE(type))));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
 			CHECK_RETURN_OK;
-		if (sljit_emit_simd_lane_replicate(compiler, type | SLJIT_SIMD_TEST, freg, src, src_lane_index) == SLJIT_ERR_UNSUPPORTED) {
+		if (sljit_emit_simd_lane_replicate(compiler, type | SLJIT_SIMD_TEST, vreg, src, src_lane_index) == SLJIT_ERR_UNSUPPORTED) {
 			fprintf(compiler->verbose, "    # simd_lane_replicate: unsupported form, no instructions are emitted\n");
 			CHECK_RETURN_OK;
 		}
@@ -2769,17 +3029,17 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_replicate(struc
 			(type & SLJIT_SIMD_FLOAT) ? "f" : "",
 			(8 << SLJIT_SIMD_GET_ELEM_SIZE(type)));
 
-		sljit_verbose_freg(compiler, freg);
+		sljit_verbose_vreg(compiler, vreg);
 		fprintf(compiler->verbose, ", ");
-		sljit_verbose_freg(compiler, src);
+		sljit_verbose_vreg(compiler, src);
 		fprintf(compiler->verbose, "[%d]\n", src_lane_index);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
@@ -2789,14 +3049,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_extend(struct sljit_
 	CHECK_ARGUMENT(SLJIT_SIMD_CHECK_REG(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM2_SIZE(type) < SLJIT_SIMD_GET_REG_SIZE(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) < SLJIT_SIMD_GET_ELEM2_SIZE(type));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
-	FUNCTION_FCHECK(src, srcw, SLJIT_SIMD_GET_ELEM_SIZE(type) == 2);
-#endif
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, type));
+	FUNCTION_VCHECK(src, srcw, type);
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
 			CHECK_RETURN_OK;
-		if (sljit_emit_simd_extend(compiler, type | SLJIT_SIMD_TEST, freg, src, srcw) == SLJIT_ERR_UNSUPPORTED) {
+		if (sljit_emit_simd_extend(compiler, type | SLJIT_SIMD_TEST, vreg, src, srcw) == SLJIT_ERR_UNSUPPORTED) {
 			fprintf(compiler->verbose, "    # simd_extend: unsupported form, no instructions are emitted\n");
 			CHECK_RETURN_OK;
 		}
@@ -2809,17 +3069,17 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_extend(struct sljit_
 			(type & SLJIT_SIMD_FLOAT) ? "f" : "",
 			(8 << SLJIT_SIMD_GET_ELEM_SIZE(type)));
 
-		sljit_verbose_freg(compiler, freg);
+		sljit_verbose_vreg(compiler, vreg);
 		fprintf(compiler->verbose, ", ");
-		sljit_verbose_fparam(compiler, src, srcw);
+		sljit_verbose_vparam(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
@@ -2827,14 +3087,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_sign(struct sljit_co
 	CHECK_ARGUMENT((type & SLJIT_SIMD_TYPE_MASK(SLJIT_32)) == SLJIT_SIMD_STORE);
 	CHECK_ARGUMENT(SLJIT_SIMD_CHECK_REG(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) < SLJIT_SIMD_GET_REG_SIZE(type));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, type));
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
 			CHECK_RETURN_OK;
-		if (sljit_emit_simd_sign(compiler, type | SLJIT_SIMD_TEST, freg, dst, dstw) == SLJIT_ERR_UNSUPPORTED) {
+		if (sljit_emit_simd_sign(compiler, type | SLJIT_SIMD_TEST, vreg, dst, dstw) == SLJIT_ERR_UNSUPPORTED) {
 			fprintf(compiler->verbose, "    # simd_sign: unsupported form, no instructions are emitted\n");
 			CHECK_RETURN_OK;
 		}
@@ -2845,50 +3105,56 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_sign(struct sljit_co
 			(type & SLJIT_SIMD_FLOAT) ? "f" : "",
 			(8 << SLJIT_SIMD_GET_ELEM_SIZE(type)));
 
-		sljit_verbose_freg(compiler, freg);
+		sljit_verbose_vreg(compiler, vreg);
 		fprintf(compiler->verbose, ", ");
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg)
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_SIMD));
-	CHECK_ARGUMENT((type & SLJIT_SIMD_TYPE_MASK(0)) >= SLJIT_SIMD_OP2_AND && (type & SLJIT_SIMD_TYPE_MASK(0)) <= SLJIT_SIMD_OP2_XOR);
+	CHECK_ARGUMENT((type & SLJIT_SIMD_TYPE_MASK2(0)) >= SLJIT_SIMD_OP2_AND && (type & SLJIT_SIMD_TYPE_MASK2(0)) <= SLJIT_SIMD_OP2_SHUFFLE);
 	CHECK_ARGUMENT(SLJIT_SIMD_CHECK_REG(type));
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) <= SLJIT_SIMD_GET_REG_SIZE(type));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(dst_freg, 0));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(src1_freg, 0));
-	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(src2_freg, 0));
-#endif
+	CHECK_ARGUMENT(SLJIT_SIMD_GET_OPCODE(type) != SLJIT_SIMD_OP2_SHUFFLE || (SLJIT_SIMD_GET_ELEM_SIZE(type) == 0 && !(type & SLJIT_SIMD_FLOAT)));
+	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM2_SIZE(type) <= (src2 & SLJIT_MEM) ? SLJIT_SIMD_GET_REG_SIZE(type) : 0);
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(dst_vreg, type));
+	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(src1_vreg, type));
+	FUNCTION_VCHECK(src2, src2w, type);
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
 			CHECK_RETURN_OK;
-		if (sljit_emit_simd_op2(compiler, type | SLJIT_SIMD_TEST, dst_freg, src1_freg, src2_freg) == SLJIT_ERR_UNSUPPORTED) {
+		if (sljit_emit_simd_op2(compiler, type | SLJIT_SIMD_TEST, dst_vreg, src1_vreg, src2, src2w) == SLJIT_ERR_UNSUPPORTED) {
 			fprintf(compiler->verbose, "    # simd_op2: unsupported form, no instructions are emitted\n");
 			CHECK_RETURN_OK;
 		}
 
-		fprintf(compiler->verbose, "  simd_%s.%d.%s%d ",
+		fprintf(compiler->verbose, "  simd_%s.%d.%s%d",
 			simd_op2_names[SLJIT_SIMD_GET_OPCODE(type) - 1],
 			(8 << SLJIT_SIMD_GET_REG_SIZE(type)),
 			(type & SLJIT_SIMD_FLOAT) ? "f" : "",
 			(8 << SLJIT_SIMD_GET_ELEM_SIZE(type)));
 
-		sljit_verbose_freg(compiler, dst_freg);
+		if ((type & 0x3f000000) != SLJIT_SIMD_MEM_UNALIGNED)
+			fprintf(compiler->verbose, ".al%d", (8 << SLJIT_SIMD_GET_ELEM2_SIZE(type)));
+
+		fprintf(compiler->verbose, " ");
+		sljit_verbose_vreg(compiler, dst_vreg);
 		fprintf(compiler->verbose, ", ");
-		sljit_verbose_freg(compiler, src1_freg);
+		sljit_verbose_vreg(compiler, src1_vreg);
 		fprintf(compiler->verbose, ", ");
-		sljit_verbose_freg(compiler, src2_freg);
+		sljit_verbose_vparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2899,14 +3165,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_local_base(struct sljit_co
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  local_base ");
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, ", #%" SLJIT_PRINT_D "d\n", offset);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2916,29 +3182,29 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_const(struct sljit_compil
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  const ");
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, ", #%" SLJIT_PRINT_D "d\n", init_value);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
-static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
-		fprintf(compiler->verbose, "  put_label ");
+		fprintf(compiler->verbose, "  mov_addr ");
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3016,23 +3282,23 @@ static sljit_s32 sljit_emit_fmem_unaligned(struct sljit_compiler *compiler, slji
 #define SLJIT_CPUINFO_PART1 " 32bit ("
 #elif (defined SLJIT_64BIT_ARCHITECTURE && SLJIT_64BIT_ARCHITECTURE)
 #define SLJIT_CPUINFO_PART1 " 64bit ("
-#else
+#else /* !SLJIT_32BIT_ARCHITECTURE && !SLJIT_64BIT_ARCHITECTURE */
 #error "Internal error: CPU type info missing"
-#endif
+#endif /* SLJIT_32BIT_ARCHITECTURE */
 
 #if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
 #define SLJIT_CPUINFO_PART2 "little endian + "
 #elif (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)
 #define SLJIT_CPUINFO_PART2 "big endian + "
-#else
+#else /* !SLJIT_LITTLE_ENDIAN && !SLJIT_BIG_ENDIAN */
 #error "Internal error: CPU type info missing"
-#endif
+#endif /* SLJIT_LITTLE_ENDIAN */
 
 #if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED)
 #define SLJIT_CPUINFO_PART3 "unaligned)"
-#else
+#else /* !SLJIT_UNALIGNED */
 #define SLJIT_CPUINFO_PART3 "aligned)"
-#endif
+#endif /* SLJIT_UNALIGNED */
 
 #define SLJIT_CPUINFO SLJIT_CPUINFO_PART1 SLJIT_CPUINFO_PART2 SLJIT_CPUINFO_PART3
 
@@ -3056,7 +3322,9 @@ static sljit_s32 sljit_emit_fmem_unaligned(struct sljit_compiler *compiler, slji
 #	include "sljitNativeS390X.c"
 #elif (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH)
 #	include "sljitNativeLOONGARCH_64.c"
-#endif
+#endif /* SLJIT_CONFIG_X86 */
+
+#include "sljitSerialize.c"
 
 static SLJIT_INLINE sljit_s32 emit_mov_before_return(struct sljit_compiler *compiler, sljit_s32 op, sljit_s32 src, sljit_sw srcw)
 {
@@ -3064,10 +3332,10 @@ static SLJIT_INLINE sljit_s32 emit_mov_before_return(struct sljit_compiler *comp
 	/* At the moment the pointer size is always equal to sljit_sw. May be changed in the future. */
 	if (src == SLJIT_RETURN_REG && (op == SLJIT_MOV || op == SLJIT_MOV_P))
 		return SLJIT_SUCCESS;
-#else
+#else /* !SLJIT_64BIT_ARCHITECTURE */
 	if (src == SLJIT_RETURN_REG && (op == SLJIT_MOV || op == SLJIT_MOV_U32 || op == SLJIT_MOV_S32 || op == SLJIT_MOV_P))
 		return SLJIT_SUCCESS;
-#endif
+#endif /* SLJIT_64BIT_ARCHITECTURE */
 
 	SLJIT_SKIP_CHECKS(compiler);
 	return sljit_emit_op1(compiler, op, SLJIT_RETURN_REG, 0, src, srcw);
@@ -3149,7 +3417,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 		if (src2 == SLJIT_IMM && !src2w)
 			return emit_cmp_to0(compiler, type, src1, src1w);
 	}
-#endif
+#endif /* SLJIT_CONFIG_ARM_64 */
 
 	if (SLJIT_UNLIKELY(src1 == SLJIT_IMM && src2 != SLJIT_IMM)) {
 		/* Immediate is preferred as second argument by most architectures. */
@@ -3288,17 +3556,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem_update(struct sljit_compiler
 
 #if !(defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) \
 	&& !(defined SLJIT_CONFIG_ARM && SLJIT_CONFIG_ARM) \
-	&& !(defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X)
+	&& !(defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X) \
+	&& !(defined SLJIT_CONFIG_RISCV && SLJIT_CONFIG_RISCV) \
+	&& !(defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH)
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_mov(compiler, type, freg, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
 	SLJIT_UNUSED_ARG(compiler);
 	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(freg);
+	SLJIT_UNUSED_ARG(vreg);
 	SLJIT_UNUSED_ARG(srcdst);
 	SLJIT_UNUSED_ARG(srcdstw);
 
@@ -3306,14 +3576,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_replicate(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
 	SLJIT_UNUSED_ARG(compiler);
 	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(freg);
+	SLJIT_UNUSED_ARG(vreg);
 	SLJIT_UNUSED_ARG(src);
 	SLJIT_UNUSED_ARG(srcw);
 
@@ -3321,14 +3591,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, freg, lane_index, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
 	SLJIT_UNUSED_ARG(compiler);
 	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(freg);
+	SLJIT_UNUSED_ARG(vreg);
 	SLJIT_UNUSED_ARG(lane_index);
 	SLJIT_UNUSED_ARG(srcdst);
 	SLJIT_UNUSED_ARG(srcdstw);
@@ -3337,14 +3607,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, freg, src, src_lane_index));
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
 	SLJIT_UNUSED_ARG(compiler);
 	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(freg);
+	SLJIT_UNUSED_ARG(vreg);
 	SLJIT_UNUSED_ARG(src);
 	SLJIT_UNUSED_ARG(src_lane_index);
 
@@ -3352,14 +3622,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_extend(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
 	SLJIT_UNUSED_ARG(compiler);
 	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(freg);
+	SLJIT_UNUSED_ARG(vreg);
 	SLJIT_UNUSED_ARG(src);
 	SLJIT_UNUSED_ARG(srcw);
 
@@ -3367,14 +3637,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_sign(compiler, type, freg, dst, dstw));
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
 	SLJIT_UNUSED_ARG(compiler);
 	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(freg);
+	SLJIT_UNUSED_ARG(vreg);
 	SLJIT_UNUSED_ARG(dst);
 	SLJIT_UNUSED_ARG(dstw);
 
@@ -3382,56 +3652,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg)
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_freg, src1_freg, src2_freg));
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
 	SLJIT_UNUSED_ARG(compiler);
 	SLJIT_UNUSED_ARG(type);
-	SLJIT_UNUSED_ARG(dst_freg);
-	SLJIT_UNUSED_ARG(src1_freg);
-	SLJIT_UNUSED_ARG(src2_freg);
-
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-#endif /* !SLJIT_CONFIG_X86 && !SLJIT_CONFIG_ARM */
-
-#if !(defined(SLJIT_CONFIG_X86) && SLJIT_CONFIG_X86) \
-	&& !(defined(SLJIT_CONFIG_ARM) && SLJIT_CONFIG_ARM) \
-	&& !(defined(SLJIT_CONFIG_S390X) && SLJIT_CONFIG_S390X) \
-	&& !(defined(SLJIT_CONFIG_LOONGARCH) && SLJIT_CONFIG_LOONGARCH)
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler,
-	sljit_s32 op,
-	sljit_s32 dst_reg,
-	sljit_s32 mem_reg)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(dst_reg);
-	SLJIT_UNUSED_ARG(mem_reg);
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
-
-	return SLJIT_ERR_UNSUPPORTED;
-}
-
-SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler *compiler,
-	sljit_s32 op,
-	sljit_s32 src_reg,
-	sljit_s32 mem_reg,
-	sljit_s32 temp_reg)
-{
-	SLJIT_UNUSED_ARG(compiler);
-	SLJIT_UNUSED_ARG(op);
-	SLJIT_UNUSED_ARG(src_reg);
-	SLJIT_UNUSED_ARG(mem_reg);
-	SLJIT_UNUSED_ARG(temp_reg);
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
+	SLJIT_UNUSED_ARG(dst_vreg);
+	SLJIT_UNUSED_ARG(src1_vreg);
+	SLJIT_UNUSED_ARG(src2);
+	SLJIT_UNUSED_ARG(src2w);
 
 	return SLJIT_ERR_UNSUPPORTED;
 }
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitLir.h b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitLir.h
similarity index 83%
rename from engine/thirdparty/pcre2/src/sljit/sljitLir.h
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitLir.h
index 2ba6683c..60d34f15 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitLir.h
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitLir.h
@@ -87,7 +87,7 @@ of sljitConfigInternal.h */
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
 
 /* Version numbers. */
 #define SLJIT_MAJOR_VERSION	0
@@ -251,7 +251,7 @@ extern "C" {
 #define SLJIT_FS7	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 7)
 #define SLJIT_FS8	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 8)
 #define SLJIT_FS9	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - 9)
-/* All S registers provided by the architecture can be accessed by SLJIT_FS(i)
+/* All FS registers provided by the architecture can be accessed by SLJIT_FS(i)
    The i parameter must be >= 0 and < SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS. */
 #define SLJIT_FS(i)	(SLJIT_NUMBER_OF_FLOAT_REGISTERS - (i))
 
@@ -262,6 +262,52 @@ extern "C" {
 
 #define SLJIT_RETURN_FREG	SLJIT_FR0
 
+/* --------------------------------------------------------------------- */
+/*  Vector registers                                                     */
+/* --------------------------------------------------------------------- */
+
+/* Vector registers are storage areas, which are used for Single Instruction
+   Multiple Data (SIMD) computations. The VR and VS register sets overlap
+   in the same way as R and S register sets. See above.
+
+   The storage space of vector registers often overlap with floating point
+   registers. In this case setting the value of SLJIT_VR(i) destroys the
+   value of SLJIT_FR(i) and vice versa. See SLJIT_SEPARATE_VECTOR_REGISTERS
+   macro. */
+
+/* Vector scratch registers. */
+#define SLJIT_VR0	1
+#define SLJIT_VR1	2
+#define SLJIT_VR2	3
+#define SLJIT_VR3	4
+#define SLJIT_VR4	5
+#define SLJIT_VR5	6
+#define SLJIT_VR6	7
+#define SLJIT_VR7	8
+#define SLJIT_VR8	9
+#define SLJIT_VR9	10
+/* All VR registers provided by the architecture can be accessed by SLJIT_VR(i)
+   The i parameter must be >= 0 and < SLJIT_NUMBER_OF_VECTOR_REGISTERS. */
+#define SLJIT_VR(i)	(1 + (i))
+
+/* Vector saved registers. */
+#define SLJIT_VS0	(SLJIT_NUMBER_OF_VECTOR_REGISTERS)
+#define SLJIT_VS1	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 1)
+#define SLJIT_VS2	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 2)
+#define SLJIT_VS3	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 3)
+#define SLJIT_VS4	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 4)
+#define SLJIT_VS5	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 5)
+#define SLJIT_VS6	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 6)
+#define SLJIT_VS7	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 7)
+#define SLJIT_VS8	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 8)
+#define SLJIT_VS9	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - 9)
+/* All VS registers provided by the architecture can be accessed by SLJIT_VS(i)
+   The i parameter must be >= 0 and < SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS. */
+#define SLJIT_VS(i)	(SLJIT_NUMBER_OF_VECTOR_REGISTERS - (i))
+
+/* Vector registers >= SLJIT_FIRST_SAVED_VECTOR_REG are saved registers. */
+#define SLJIT_FIRST_SAVED_VECTOR_REG (SLJIT_VS0 - SLJIT_NUMBER_OF_SAVED_VECTOR_REGISTERS + 1)
+
 /* --------------------------------------------------------------------- */
 /*  Argument type definitions                                            */
 /* --------------------------------------------------------------------- */
@@ -427,7 +473,10 @@ struct sljit_memory_fragment {
 
 struct sljit_label {
 	struct sljit_label *next;
-	sljit_uw addr;
+	union {
+		sljit_uw index;
+		sljit_uw addr;
+	} u;
 	/* The maximum size difference. */
 	sljit_uw size;
 };
@@ -443,36 +492,35 @@ struct sljit_jump {
 	} u;
 };
 
-struct sljit_put_label {
-	struct sljit_put_label *next;
-	struct sljit_label *label;
-	sljit_uw addr;
-	sljit_uw flags;
-};
-
 struct sljit_const {
 	struct sljit_const *next;
 	sljit_uw addr;
 };
 
+struct sljit_generate_code_buffer {
+	void *buffer;
+	sljit_uw size;
+	sljit_sw executable_offset;
+};
+
 struct sljit_compiler {
 	sljit_s32 error;
 	sljit_s32 options;
 
 	struct sljit_label *labels;
 	struct sljit_jump *jumps;
-	struct sljit_put_label *put_labels;
 	struct sljit_const *consts;
 	struct sljit_label *last_label;
 	struct sljit_jump *last_jump;
 	struct sljit_const *last_const;
-	struct sljit_put_label *last_put_label;
 
 	void *allocator_data;
-	void *exec_allocator_data;
+	void *user_data;
 	struct sljit_memory_fragment *buf;
 	struct sljit_memory_fragment *abuf;
 
+	/* Number of labels created by the compiler. */
+	sljit_uw label_count;
 	/* Available scratch registers. */
 	sljit_s32 scratches;
 	/* Available saved registers. */
@@ -481,6 +529,15 @@ struct sljit_compiler {
 	sljit_s32 fscratches;
 	/* Available float saved registers. */
 	sljit_s32 fsaveds;
+#if (defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS) \
+		|| (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_DEBUG && SLJIT_DEBUG) \
+		|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
+	/* Available vector scratch registers. */
+	sljit_s32 vscratches;
+	/* Available vector saved registers. */
+	sljit_s32 vsaveds;
+#endif /* SLJIT_SEPARATE_VECTOR_REGISTERS || SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG || SLJIT_VERBOSE */
 	/* Local stack size. */
 	sljit_s32 local_size;
 	/* Maximum code size. */
@@ -492,15 +549,16 @@ struct sljit_compiler {
 
 #if (defined SLJIT_HAS_STATUS_FLAGS_STATE && SLJIT_HAS_STATUS_FLAGS_STATE)
 	sljit_s32 status_flags_state;
-#endif
+#endif /* SLJIT_HAS_STATUS_FLAGS_STATE */
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 	sljit_s32 args_size;
-#endif
+#endif /* SLJIT_CONFIG_X86_32 */
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+	/* Temporary fields. */
 	sljit_s32 mode32;
-#endif
+#endif /* SLJIT_CONFIG_X86_64 */
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	/* Constant pool handling. */
@@ -511,7 +569,7 @@ struct sljit_compiler {
 	/* Other members. */
 	/* Contains pointer, "ldr pc, [...]" pairs. */
 	sljit_uw patches;
-#endif
+#endif /* SLJIT_CONFIG_ARM_V6 */
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
 	/* Temporary fields. */
@@ -520,41 +578,47 @@ struct sljit_compiler {
 
 #if (defined SLJIT_CONFIG_ARM_32 && SLJIT_CONFIG_ARM_32) && (defined __SOFTFP__)
 	sljit_uw args_size;
-#endif
+#endif /* SLJIT_CONFIG_ARM_32 && __SOFTFP__ */
 
 #if (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC)
+	/* Temporary fields. */
 	sljit_u32 imm;
-#endif
+#endif /* SLJIT_CONFIG_PPC */
 
 #if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
 	sljit_s32 delay_slot;
+	/* Temporary fields. */
 	sljit_s32 cache_arg;
 	sljit_sw cache_argw;
-#endif
+#endif /* SLJIT_CONFIG_MIPS */
 
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
 	sljit_uw args_size;
-#endif
+#endif /* SLJIT_CONFIG_MIPS_32 */
 
 #if (defined SLJIT_CONFIG_RISCV && SLJIT_CONFIG_RISCV)
+	/* Temporary fields. */
 	sljit_s32 cache_arg;
 	sljit_sw cache_argw;
-#endif
+#endif /* SLJIT_CONFIG_RISCV */
 
 #if (defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X)
 	/* Need to allocate register save area to make calls. */
+	/* Temporary fields. */
 	sljit_s32 mode;
-#endif
+#endif /* SLJIT_CONFIG_S390X */
 
 #if (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH)
+	/* Temporary fields. */
 	sljit_s32 cache_arg;
 	sljit_sw cache_argw;
-#endif
+#endif /* SLJIT_CONFIG_LOONGARCH */
 
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	FILE* verbose;
-#endif
+#endif /* SLJIT_VERBOSE */
 
+	/* Note: SLJIT_DEBUG enables SLJIT_ARGUMENT_CHECKS. */
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
 		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
 	/* Flags specified by the last arithmetic instruction.
@@ -564,15 +628,22 @@ struct sljit_compiler {
 	sljit_s32 last_return;
 	/* Local size passed to entry functions. */
 	sljit_s32 logical_local_size;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
 		|| (defined SLJIT_DEBUG && SLJIT_DEBUG) \
 		|| (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
+#if !(defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
+	/* Available float scratch registers. */
+	sljit_s32 real_fscratches;
+	/* Available float saved registers. */
+	sljit_s32 real_fsaveds;
+#endif /* !SLJIT_SEPARATE_VECTOR_REGISTERS */
+
 	/* Trust arguments when an API function is called.
 	   Used internally for calling API functions. */
 	sljit_s32 skip_checks;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG || SLJIT_VERBOSE */
 };
 
 /* --------------------------------------------------------------------- */
@@ -583,12 +654,10 @@ struct sljit_compiler {
    custom memory managers. This pointer is passed to SLJIT_MALLOC
    and SLJIT_FREE macros. Most allocators (including the default
    one) ignores this value, and it is recommended to pass NULL
-   as a dummy value for allocator_data. The exec_allocator_data
-   has the same purpose but this one is passed to SLJIT_MALLOC_EXEC /
-   SLJIT_MALLOC_FREE functions.
+   as a dummy value for allocator_data.
 
    Returns NULL if failed. */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allocator_data, void *exec_allocator_data);
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allocator_data);
 
 /* Frees everything except the compiled machine code. */
 SLJIT_API_FUNC_ATTRIBUTE void sljit_free_compiler(struct sljit_compiler *compiler);
@@ -619,20 +688,31 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_compiler_memory_error(struct sljit_compi
    of the compiler to out-of-memory status). */
 SLJIT_API_FUNC_ATTRIBUTE void* sljit_alloc_memory(struct sljit_compiler *compiler, sljit_s32 size);
 
-/* Returns the allocator data passed to sljit_create_compiler. These pointers
-   may contain context data even if the normal/exec allocator ignores it. */
-static SLJIT_INLINE void* sljit_get_allocator_data(struct sljit_compiler *compiler) { return compiler->allocator_data; }
-static SLJIT_INLINE void* sljit_get_exec_allocator_data(struct sljit_compiler *compiler) { return compiler->exec_allocator_data; }
+/* Returns the allocator data passed to sljit_create_compiler. */
+static SLJIT_INLINE void* sljit_compiler_get_allocator_data(struct sljit_compiler *compiler) { return compiler->allocator_data; }
+/* Sets/get the user data for a compiler. */
+static SLJIT_INLINE void sljit_compiler_set_user_data(struct sljit_compiler *compiler, void *user_data) { compiler->user_data = user_data; }
+static SLJIT_INLINE void* sljit_compiler_get_user_data(struct sljit_compiler *compiler) { return compiler->user_data; }
 
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 /* Passing NULL disables verbose. */
 SLJIT_API_FUNC_ATTRIBUTE void sljit_compiler_verbose(struct sljit_compiler *compiler, FILE* verbose);
-#endif
+#endif /* SLJIT_VERBOSE */
+
+/* Option bits for sljit_generate_code. */
+
+/* The exec_allocator_data points to a pre-allocated
+   buffer which type is sljit_generate_code_buffer. */
+#define SLJIT_GENERATE_CODE_BUFFER		0x1
 
 /* Create executable code from the instruction stream. This is the final step
-   of the code generation so no more instructions can be emitted after this call. */
+   of the code generation, and no more instructions can be emitted after this call.
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler);
+   options is the combination of SLJIT_GENERATE_CODE_* bits
+   exec_allocator_data is passed to SLJIT_MALLOC_EXEC and
+                       SLJIT_MALLOC_FREE functions */
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data);
 
 /* Free executable code. */
 
@@ -663,7 +743,9 @@ static SLJIT_INLINE sljit_uw sljit_get_generated_code_size(struct sljit_compiler
    support while others (e.g. move with update) are emulated if not available.
    However, even when a feature is emulated, specialized code paths may be
    faster than the emulation. Some limitations are emulated as well so their
-   general case is supported but it has extra performance costs. */
+   general case is supported but it has extra performance costs.
+
+   Note: sljitConfigInternal.h also provides several feature detection macros. */
 
 /* [Not emulated] Floating-point support is available. */
 #define SLJIT_HAS_FPU			0
@@ -698,15 +780,22 @@ static SLJIT_INLINE sljit_uw sljit_get_generated_code_size(struct sljit_compiler
    a simd operation represents the same 128 bit register, and both SLJIT_FR0
    and SLJIT_FR1 are overwritten. */
 #define SLJIT_SIMD_REGS_ARE_PAIRS	13
-/* [Not emulated] Atomic support is available (fine-grained). */
-#define SLJIT_HAS_ATOMIC      14
+/* [Not emulated] Atomic support is available. */
+#define SLJIT_HAS_ATOMIC		14
+/* [Not emulated] Memory barrier support is available. */
+#define SLJIT_HAS_MEMORY_BARRIER		15
 
 #if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
 /* [Not emulated] AVX support is available on x86. */
 #define SLJIT_HAS_AVX			100
 /* [Not emulated] AVX2 support is available on x86. */
 #define SLJIT_HAS_AVX2			101
-#endif
+#endif /* SLJIT_CONFIG_X86 */
+
+#if (defined SLJIT_CONFIG_LOONGARCH)
+/* [Not emulated] LASX support is available on LoongArch */
+#define SLJIT_HAS_LASX        201
+#endif /* SLJIT_CONFIG_LOONGARCH */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type);
 
@@ -727,42 +816,65 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_cmp_info(sljit_s32 type);
    with an error code. */
 
 /*
-   The executable code is a function from the viewpoint of the C
-   language. The function calls must conform to the ABI (Application
-   Binary Interface) of the platform, which specify the purpose of
-   machine registers and stack handling among other things. The
-   sljit_emit_enter function emits the necessary instructions for
-   setting up a new context for the executable code. This is often
-   called as function prologue. Furthermore the options argument
-   can be used to pass configuration options to the compiler. The
+   The executable code is a callable function from the viewpoint
+   of the C language. Function calls must conform with the ABI
+   (Application Binary Interface) of the target platform, which
+   specify the purpose of machine registers and stack handling
+   among other things. The sljit_emit_enter function emits the
+   necessary instructions for setting up an entry point for the
+   executable code. This is often called as function prologue.
+
+   The "options" argument can be used to pass configuration options
+   to the sljit compiler which affects the generated code, until
+   another sljit_emit_enter or sljit_set_context is called. The
    available options are listed before sljit_emit_enter.
 
    The function argument list is specified by the SLJIT_ARGSx
    (SLJIT_ARGS0 .. SLJIT_ARGS4) macros. Currently maximum four
    arguments are supported. See the description of SLJIT_ARGSx
-   macros about argument passing. Furthermore the register set
-   used by the function must be declared as well. The number of
-   scratch and saved registers available to the function must
-   be passed to sljit_emit_enter. Only R registers between R0
-   and "scratches" argument can be used later. E.g. if "scratches"
-   is set to two, the scratch register set will be limited to
-   SLJIT_R0 and SLJIT_R1. The S registers and the floating point
-   registers ("fscratches" and "fsaveds") are specified in a
-   similar manner. The sljit_emit_enter is also capable of
-   allocating a stack space for local data. The "local_size"
-   argument contains the size in bytes of this local area, and
-   it can be accessed using SLJIT_MEM1(SLJIT_SP). The memory
-   area between SLJIT_SP (inclusive) and SLJIT_SP + local_size
-   (exclusive) can be modified freely until the function returns.
-   The stack space is not initialized to zero.
+   macros about argument passing.
+
+   The register set used by the function must be declared as well.
+   The number of scratch and saved registers available to the
+   function must be passed to sljit_emit_enter. Only R registers
+   between R0 and "scratches" argument can be used later. E.g.
+   if "scratches" is set to two, the scratch register set will
+   be limited to SLJIT_R0 and SLJIT_R1. The S registers are
+   declared in a similar manner, but their count is specified
+   by "saveds" argument. The floating point scratch and saved
+   registers can be set by using "scratches" and "saveds" argument
+   as well, but their value must be passed to the SLJIT_ENTER_FLOAT
+   macro, see below.
+
+   The sljit_emit_enter is also capable of allocating a stack
+   space for local data. The "local_size" argument contains the
+   size in bytes of this local area, and it can be accessed using
+   SLJIT_MEM1(SLJIT_SP). The memory area between SLJIT_SP (inclusive)
+   and SLJIT_SP + local_size (exclusive) can be modified freely
+   until the function returns. The alocated stack space is an
+   uninitialized memory area.
+
+   Floating point scratch and saved registers must be specified
+   by the SLJIT_ENTER_FLOAT macro, which result value should be
+   combined with scratches / saveds argument.
+
+   Examples:
+       To use three scratch and four floating point scratch
+       registers, the "scratches" argument must be set to:
+            3 | SLJIT_ENTER_FLOAT(4)
+
+       To use six saved and five floating point saved
+       registers, the "saveds" argument must be set to:
+            6 | SLJIT_ENTER_FLOAT(5)
 
    Note: the following conditions must met:
          0 <= scratches <= SLJIT_NUMBER_OF_REGISTERS
          0 <= saveds <= SLJIT_NUMBER_OF_SAVED_REGISTERS
          scratches + saveds <= SLJIT_NUMBER_OF_REGISTERS
-         0 <= fscratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS
-         0 <= fsaveds <= SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS
-         fscratches + fsaveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS
+
+         0 <= float scratches <= SLJIT_NUMBER_OF_FLOAT_REGISTERS
+         0 <= float saveds <= SLJIT_NUMBER_OF_SAVED_FLOAT_REGISTERS
+         float scratches + float saveds <= SLJIT_NUMBER_OF_FLOAT_REGISTERS
 
    Note: the compiler can use saved registers as scratch registers,
          but the opposite is not supported
@@ -771,27 +883,44 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_cmp_info(sljit_s32 type);
          overwrites the previous context.
 */
 
+/* The following options are available for sljit_emit_enter. */
+
 /* Saved registers between SLJIT_S0 and SLJIT_S(n - 1) (inclusive)
    are not saved / restored on function enter / return. Instead,
    these registers can be used to pass / return data (such as
    global / local context pointers) across function calls. The
    value of n must be between 1 and 3. This option is only
    supported by SLJIT_ENTER_REG_ARG calling convention. */
-#define SLJIT_ENTER_KEEP(n)	(n)
+#define SLJIT_ENTER_KEEP(n)		(n)
 
 /* The compiled function uses an SLJIT specific register argument
    calling convention. This is a lightweight function call type where
    both the caller and the called functions must be compiled by
    SLJIT. The type argument of the call must be SLJIT_CALL_REG_ARG
    and all arguments must be stored in scratch registers. */
-#define SLJIT_ENTER_REG_ARG	0x00000004
+#define SLJIT_ENTER_REG_ARG		0x00000004
+
+#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86)
+/* Use VEX prefix for all SIMD operations on x86. */
+#define SLJIT_ENTER_USE_VEX		0x00010000
+#endif /* !SLJIT_CONFIG_X86 */
+
+/* Macros for other sljit_emit_enter arguments. */
+
+/* Floating point scratch and saved registers can be
+   specified by SLJIT_ENTER_FLOAT. */
+#define SLJIT_ENTER_FLOAT(regs)		((regs) << 8)
+
+/* Vector scratch and saved registers can be specified
+   by SLJIT_ENTER_VECTOR. */
+#define SLJIT_ENTER_VECTOR(regs)	((regs) << 16)
 
 /* The local_size must be >= 0 and <= SLJIT_MAX_LOCAL_SIZE. */
-#define SLJIT_MAX_LOCAL_SIZE	1048576
+#define SLJIT_MAX_LOCAL_SIZE		1048576
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size);
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size);
 
 /* The SLJIT compiler has a current context (which contains the local
    stack space size, number of used registers, etc.) which is initialized
@@ -807,8 +936,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
          the previous context. */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size);
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size);
 
 /* Return to the caller function. The sljit_emit_return_void function
    does not return with any value. The sljit_emit_return function returns
@@ -855,7 +984,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
      int    | 4 byte (physical_address & 0x3 == 0)
      word   | 4 byte if SLJIT_32BIT_ARCHITECTURE is defined and its value is 1
             | 8 byte if SLJIT_64BIT_ARCHITECTURE is defined and its value is 1
-    pointer | size of sljit_p type (4 byte on 32 bit machines, 4 or 8 byte
+    pointer | size of sljit_up type (4 byte on 32 bit machines, 4 or 8 byte
             | on 64 bit machines)
 
    Note:   Different architectures have different addressing limitations.
@@ -913,6 +1042,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
 #define SLJIT_IS_IMM(arg)	((arg) == SLJIT_IMM)
 #define SLJIT_IS_REG_PAIR(arg)	(!((arg) & SLJIT_MEM) && (arg) >= (SLJIT_MEM << 1))
 
+/* Macros for extracting registers from operands. */
+/* Support operands which contains a single register or
+   constructed using SLJIT_MEM1, SLJIT_MEM2, or SLJIT_REG_PAIR. */
+#define SLJIT_EXTRACT_REG(arg)		((arg) & 0x7f)
+/* Support operands which constructed using SLJIT_MEM2, or SLJIT_REG_PAIR. */
+#define SLJIT_EXTRACT_SECOND_REG(arg)	((arg) >> 8)
+
 /* Sets 32 bit operation mode on 64 bit CPUs. This option is ignored on
    32 bit CPUs. When this option is set for an arithmetic operation, only
    the lower 32 bits of the input registers are used, and the CPU status
@@ -1058,16 +1194,21 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
          the behaviour is undefined. */
 #define SLJIT_DIV_SW			(SLJIT_OP0_BASE + 7)
 #define SLJIT_DIV_S32			(SLJIT_DIV_SW | SLJIT_32)
+/* Flags: - (does not modify flags)
+   May return with SLJIT_ERR_UNSUPPORTED if SLJIT_HAS_MEMORY_BARRIER
+   feature is not supported (calling sljit_has_cpu_feature() with
+   this feature option returns with 0). */
+#define SLJIT_MEMORY_BARRIER		(SLJIT_OP0_BASE + 8)
 /* Flags: - (does not modify flags)
    ENDBR32 instruction for x86-32 and ENDBR64 instruction for x86-64
    when Intel Control-flow Enforcement Technology (CET) is enabled.
    No instructions are emitted for other architectures. */
-#define SLJIT_ENDBR			(SLJIT_OP0_BASE + 8)
+#define SLJIT_ENDBR			(SLJIT_OP0_BASE + 9)
 /* Flags: - (may destroy flags)
    Skip stack frames before return when Intel Control-flow
    Enforcement Technology (CET) is enabled. No instructions
    are emitted for other architectures. */
-#define SLJIT_SKIP_FRAMES_BEFORE_RETURN	(SLJIT_OP0_BASE + 9)
+#define SLJIT_SKIP_FRAMES_BEFORE_RETURN	(SLJIT_OP0_BASE + 10)
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compiler, sljit_s32 op);
 
@@ -1084,7 +1225,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
    S16 - signed 16 bit data transfer
    U32 - unsigned int (32 bit) data transfer
    S32 - signed int (32 bit) data transfer
-   P   - pointer (sljit_p) data transfer
+   P   - pointer (sljit_up) data transfer
 */
 
 /* Flags: - (does not modify flags) */
@@ -1251,6 +1392,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	sljit_s32 src1, sljit_sw src1w,
 	sljit_s32 src2, sljit_sw src2w);
 
+/* Starting index of opcodes for sljit_emit_op2r. */
+#define SLJIT_OP2R_BASE			96
+
+/* Flags: - (may destroy flags) */
+#define SLJIT_MULADD			(SLJIT_OP2R_BASE + 0)
+#define SLJIT_MULADD32			(SLJIT_MULADD | SLJIT_32)
+
+/* Similar to sljit_emit_fop2, except the destination is always a register. */
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w);
+
 /* Emit a left or right shift operation, where the bits shifted
    in comes from a separate source operand. All operands are
    interpreted as unsigned integers.
@@ -1298,7 +1452,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *
 
 /* Starting index of opcodes for sljit_emit_op_src
    and sljit_emit_op_dst. */
-#define SLJIT_OP_SRC_DST_BASE		96
+#define SLJIT_OP_SRC_DST_BASE		112
 
 /* Fast return, see SLJIT_FAST_CALL for more details.
    Note: src cannot be an immedate value
@@ -1350,7 +1504,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_dst(struct sljit_compiler *comp
 	sljit_s32 dst, sljit_sw dstw);
 
 /* Starting index of opcodes for sljit_emit_fop1. */
-#define SLJIT_FOP1_BASE			128
+#define SLJIT_FOP1_BASE			144
 
 /* Flags: - (does not modify flags) */
 #define SLJIT_MOV_F64			(SLJIT_FOP1_BASE + 0)
@@ -1395,7 +1549,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 	sljit_s32 src, sljit_sw srcw);
 
 /* Starting index of opcodes for sljit_emit_fop2. */
-#define SLJIT_FOP2_BASE			160
+#define SLJIT_FOP2_BASE			176
 
 /* Flags: - (may destroy flags) */
 #define SLJIT_ADD_F64			(SLJIT_FOP2_BASE + 0)
@@ -1416,7 +1570,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 	sljit_s32 src2, sljit_sw src2w);
 
 /* Starting index of opcodes for sljit_emit_fop2r. */
-#define SLJIT_FOP2R_BASE		168
+#define SLJIT_FOP2R_BASE		192
 
 /* Flags: - (may destroy flags) */
 #define SLJIT_COPYSIGN_F64		(SLJIT_FOP2R_BASE + 0)
@@ -1843,21 +1997,21 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem_update(struct sljit_compiler
 
 /* The following options are used by several simd operations. */
 
-/* Load data into a simd register, this is the default */
+/* Load data into a vector register, this is the default */
 #define SLJIT_SIMD_LOAD			0x000000
-/* Store data from a simd register */
+/* Store data from a vector register */
 #define SLJIT_SIMD_STORE		0x000001
-/* The simd register contains floating point values */
+/* The vector register contains floating point values */
 #define SLJIT_SIMD_FLOAT		0x000400
 /* Tests whether the operation is available */
 #define SLJIT_SIMD_TEST			0x000800
-/* Move data to/from a 64 bit (8 byte) long SIMD register */
+/* Move data to/from a 64 bit (8 byte) long vector register */
 #define SLJIT_SIMD_REG_64		(3 << 12)
-/* Move data to/from a 128 bit (16 byte) long SIMD register */
+/* Move data to/from a 128 bit (16 byte) long vector register */
 #define SLJIT_SIMD_REG_128		(4 << 12)
-/* Move data to/from a 256 bit (32 byte) long SIMD register */
+/* Move data to/from a 256 bit (32 byte) long vector register */
 #define SLJIT_SIMD_REG_256		(5 << 12)
-/* Move data to/from a 512 bit (64 byte) long SIMD register */
+/* Move data to/from a 512 bit (64 byte) long vector register */
 #define SLJIT_SIMD_REG_512		(6 << 12)
 /* Element size is 8 bit long (this is the default), usually cannot be combined with SLJIT_SIMD_FLOAT */
 #define SLJIT_SIMD_ELEM_8		(0 << 18)
@@ -1872,7 +2026,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem_update(struct sljit_compiler
 /* Element size is 256 bit long */
 #define SLJIT_SIMD_ELEM_256		(5 << 18)
 
-/* The following options are used by sljit_emit_simd_mov(). */
+/* The following options are used by sljit_emit_simd_mov()
+   and sljit_emit_simd_op2(). */
 
 /* Memory address is unaligned (this is the default) */
 #define SLJIT_SIMD_MEM_UNALIGNED	(0 << 24)
@@ -1889,7 +2044,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem_update(struct sljit_compiler
 /* Memory address is 512 bit aligned */
 #define SLJIT_SIMD_MEM_ALIGNED_512	(6 << 24)
 
-/* Moves data between a simd register and memory.
+/* Moves data between a vector register and memory.
 
    If the operation is not supported, it returns with
    SLJIT_ERR_UNSUPPORTED. If SLJIT_SIMD_TEST is passed,
@@ -1897,21 +2052,21 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem_update(struct sljit_compiler
 
    type must be a combination of SLJIT_SIMD_* and
      SLJIT_SIMD_MEM_* options
-   freg is the source or destination simd register
+   vreg is the source or destination vector register
      of the operation
-   srcdst must be a memory operand or a simd register
+   srcdst must be a memory operand or a vector register
 
    Note:
        The alignment and element size must be
-       less or equal than simd register size.
+       less or equal than vector register size.
 
    Flags: - (does not modify flags) */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw);
 
-/* Replicates a scalar value to all lanes of a simd
+/* Replicates a scalar value to all lanes of a vector
    register.
 
    If the operation is not supported, it returns with
@@ -1920,7 +2075,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 
    type must be a combination of SLJIT_SIMD_* options
      except SLJIT_SIMD_STORE.
-   freg is the destination simd register of the operation
+   vreg is the destination vector register of the operation
    src is the value which is replicated
 
    Note:
@@ -1930,7 +2085,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
    Flags: - (does not modify flags) */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw);
 
 /* The following options are used by sljit_emit_simd_lane_mov(). */
@@ -1940,7 +2095,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 /* Sign extend the integer value stored from the lane. */
 #define SLJIT_SIMD_LANE_SIGNED		0x000004
 
-/* Moves data between a simd register lane and a register or
+/* Moves data between a vector register lane and a register or
    memory. If the srcdst argument is a register, it must be
    a floating point register when SLJIT_SIMD_FLOAT is specified,
    or a general purpose register otherwise.
@@ -1956,7 +2111,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
            is set and SLJIT_SIMD_FLOAT is not set
        SLJIT_SIMD_LANE_ZERO - when SLJIT_SIMD_LOAD
            is specified
-   freg is the source or destination simd register
+   vreg is the source or destination vector register
      of the operation
    lane_index is the index of the lane
    srcdst is the destination operand for loads, and
@@ -1968,11 +2123,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
    Flags: - (does not modify flags) */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw);
 
 /* Replicates a scalar value from a lane to all lanes
-   of a simd register.
+   of a vector register.
 
    If the operation is not supported, it returns with
    SLJIT_ERR_UNSUPPORTED. If SLJIT_SIMD_TEST is passed,
@@ -1980,14 +2135,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 
    type must be a combination of SLJIT_SIMD_* options
      except SLJIT_SIMD_STORE.
-   freg is the destination simd register of the operation
-   src is the simd register which lane is replicated
+   vreg is the destination vector register of the operation
+   src is the vector register which lane is replicated
    src_lane_index is the lane index of the src register
 
    Flags: - (does not modify flags) */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index);
 
 /* The following options are used by sljit_emit_simd_load_extend(). */
@@ -2001,7 +2156,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 /* Extend data to 64 bit */
 #define SLJIT_SIMD_EXTEND_64		(3 << 24)
 
-/* Extend elements and stores them in a simd register.
+/* Extend elements and stores them in a vector register.
    The extension operation increases the size of the
    elements (e.g. from 16 bit to 64 bit). For integer
    values, the extension can be signed or unsigned.
@@ -2012,15 +2167,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 
    type must be a combination of SLJIT_SIMD_*, and
      SLJIT_SIMD_EXTEND_* options except SLJIT_SIMD_STORE
-   freg is the destination simd register of the operation
-   src must be a memory operand or a simd register.
+   vreg is the destination vector register of the operation
+   src must be a memory operand or a vector register.
      In the latter case, the source elements are stored
      in the lower half of the register.
 
    Flags: - (does not modify flags) */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw);
 
 /* Extract the highest bit (usually the sign bit) from
@@ -2032,16 +2187,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 
    type must be a combination of SLJIT_SIMD_* and SLJIT_32
      options except SLJIT_SIMD_LOAD
-   freg is the source simd register of the operation
+   vreg is the source vector register of the operation
    dst is the destination operand
 
    Flags: - (does not modify flags) */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw);
 
-/* The following options are used by sljit_emit_simd_op2(). */
+/* The following operations are used by sljit_emit_simd_op2(). */
 
 /* Binary 'and' operation */
 #define SLJIT_SIMD_OP2_AND		0x000001
@@ -2049,23 +2204,40 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 #define SLJIT_SIMD_OP2_OR		0x000002
 /* Binary 'xor' operation */
 #define SLJIT_SIMD_OP2_XOR		0x000003
+/* Shuffle bytes of src1 using the indicies in src2 */
+#define SLJIT_SIMD_OP2_SHUFFLE		0x000004
 
-/* Perform simd operations using simd registers.
+/* Perform simd operations using vector registers.
 
    If the operation is not supported, it returns with
    SLJIT_ERR_UNSUPPORTED. If SLJIT_SIMD_TEST is passed,
    it does not emit any instructions.
 
-   type must be a combination of SLJIT_SIMD_* and SLJIT_SIMD_OP2_
-     options except SLJIT_SIMD_LOAD and SLJIT_SIMD_STORE
-   dst_freg is the destination register of the operation
-   src1_freg is the first source register of the operation
-   src1_freg is the second source register of the operation
+   type must be a combination of SLJIT_SIMD_*, SLJIT_SIMD_MEM_*
+     and SLJIT_SIMD_OP2_* options except SLJIT_SIMD_LOAD
+     and SLJIT_SIMD_STORE
+   dst_vreg is the destination register of the operation
+   src1_vreg is the first source register of the operation
+   src2 is the second source operand of the operation
 
    Flags: - (does not modify flags) */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg);
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w);
+
+/* The following operations are used by sljit_emit_atomic_load() and
+   sljit_emit_atomic_store() operations. */
+
+/* Tests whether the atomic operation is available (does not generate
+   any instructions). When a load from is allowed, its corresponding
+   store form is allowed and vice versa. */
+#define SLJIT_ATOMIC_TEST 0x10000
+/* The compiler must generate compare and swap instruction.
+   When this bit is set, calling sljit_emit_atomic_load() is optional. */
+#define SLJIT_ATOMIC_USE_CAS 0x20000
+/* The compiler must generate load-acquire and store-release instructions.
+   When this bit is set, the temp_reg for sljit_emit_atomic_store is not used. */
+#define SLJIT_ATOMIC_USE_LS 0x40000
 
 /* The sljit_emit_atomic_load and sljit_emit_atomic_store operation pair
    can perform an atomic read-modify-write operation. First, an unsigned
@@ -2074,23 +2246,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
    sljit_emit_atomic_store. A thread can only perform a single atomic
    operation at a time.
 
-   Note: atomic operations are experimental, and not implemented
-         for all cpus.
-
    The following conditions must be satisfied, or the operation
    is undefined:
      - the address provided in mem_reg must be divisible by the size of
        the value (only naturally aligned updates are supported)
-     - no memory writes are allowed between the load and store operations
-       regardless of its target address (currently read operations are
-       allowed, but this might change in the future)
+     - no memory operations are allowed between the load and store operations
      - the memory operation (op) and the base address (stored in mem_reg)
        passed to the load/store operations must be the same (the mem_reg
        can be a different register, only its value must be the same)
-     - an store must always follow a load for the same transaction.
+     - a store must always follow a load for the same transaction.
 
-   op must be between SLJIT_MOV and SLJIT_MOV_P, excluding all
-     signed loads such as SLJIT_MOV32_S16
+   op must be between SLJIT_MOV and SLJIT_MOV_P
    dst_reg is the register where the data will be loaded into
    mem_reg is the base address of the memory load (it cannot be
      SLJIT_SP or a virtual register on x86-32)
@@ -2104,18 +2270,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
    allows performing an atomic read-modify-write operation. See the
    description of sljit_emit_atomic_load.
 
-   op must be between SLJIT_MOV and SLJIT_MOV_P, excluding all signed
-     loads such as SLJIT_MOV32_S16
+   op must be between SLJIT_MOV and SLJIT_MOV_P
    src_reg is the register which value is stored into the memory
    mem_reg is the base address of the memory store (it cannot be
      SLJIT_SP or a virtual register on x86-32)
-   temp_reg is a not preserved scratch register, which must be
-     initialized with the value loaded into the dst_reg during the
-     corresponding sljit_emit_atomic_load operation, or the operation
-     is undefined
+   temp_reg is a scratch register, which must be initialized with
+     the value loaded into the dst_reg during the corresponding
+     sljit_emit_atomic_load operation, or the operation is undefined.
+     The temp_reg register preserves its value, if the memory store
+     is successful. Otherwise, its value is undefined.
 
-   Flags: ATOMIC_STORED is set if the operation is successful,
-     otherwise the memory remains unchanged. */
+   Flags: ATOMIC_STORED
+     if ATOMIC_STORED flag is set, it represents that the memory
+     is updated with a new value. Otherwise the memory is unchanged. */
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 src_reg,
 	sljit_s32 mem_reg,
@@ -2138,17 +2305,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_local_base(struct sljit_compiler *c
    Flags: - (does not modify flags) */
 SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw init_value);
 
-/* Store the value of a label (see: sljit_set_put_label)
+/* Store the value of a label (see: sljit_set_label / sljit_set_target)
    Flags: - (does not modify flags) */
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw);
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw);
 
-/* Set the value stored by put_label to this label. */
-SLJIT_API_FUNC_ATTRIBUTE void sljit_set_put_label(struct sljit_put_label *put_label, struct sljit_label *label);
-
-/* After the code generation the address for label, jump and const instructions
-   are computed. Since these structures are freed by sljit_free_compiler, the
-   addresses must be preserved by the user program elsewere. */
-static SLJIT_INLINE sljit_uw sljit_get_label_addr(struct sljit_label *label) { return label->addr; }
+/* Provides the address of label, jump and const instructions after sljit_generate_code
+   is called. The returned value is unspecified before the sljit_generate_code call.
+   Since these structures are freed by sljit_free_compiler, the addresses must be
+   preserved by the user program elsewere. */
+static SLJIT_INLINE sljit_uw sljit_get_label_addr(struct sljit_label *label) { return label->u.addr; }
 static SLJIT_INLINE sljit_uw sljit_get_jump_addr(struct sljit_jump *jump) { return jump->addr; }
 static SLJIT_INLINE sljit_uw sljit_get_const_addr(struct sljit_const *const_) { return const_->addr; }
 
@@ -2221,6 +2386,98 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_custom(struct sljit_compiler *c
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_current_flags(struct sljit_compiler *compiler,
 	sljit_s32 current_flags);
 
+/* --------------------------------------------------------------------- */
+/*  Serialization functions                                              */
+/* --------------------------------------------------------------------- */
+
+/* Label/jump/const enumeration functions. The items in each group
+   are enumerated in creation order. Serialization / deserialization
+   preserves this order for each group. For example the fifth label
+   after deserialization refers to the same machine code location as
+   the fifth label before the serialization. */
+static SLJIT_INLINE struct sljit_label *sljit_get_first_label(struct sljit_compiler *compiler) { return compiler->labels; }
+static SLJIT_INLINE struct sljit_jump *sljit_get_first_jump(struct sljit_compiler *compiler) { return compiler->jumps; }
+static SLJIT_INLINE struct sljit_const *sljit_get_first_const(struct sljit_compiler *compiler) { return compiler->consts; }
+
+static SLJIT_INLINE struct sljit_label *sljit_get_next_label(struct sljit_label *label) { return label->next; }
+static SLJIT_INLINE struct sljit_jump *sljit_get_next_jump(struct sljit_jump *jump) { return jump->next; }
+static SLJIT_INLINE struct sljit_const *sljit_get_next_const(struct sljit_const *const_) { return const_->next; }
+
+/* A number starting from 0 is assigned to each label, which
+represents its creation index. The first label created by the
+compiler has index 0, the second has index 1, the third has
+index 2, and so on. The returned value is unspecified after
+sljit_generate_code() is called. */
+static SLJIT_INLINE sljit_uw sljit_get_label_index(struct sljit_label *label) { return label->u.index; }
+
+/* The sljit_jump_has_label() and sljit_jump_has_target() functions
+returns non-zero value if a label or target is set for the jump
+respectively. Both may return with a zero value. The other two
+functions return the value assigned to the jump. */
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_jump_has_label(struct sljit_jump *jump);
+static SLJIT_INLINE struct sljit_label *sljit_jump_get_label(struct sljit_jump *jump) { return jump->u.label; }
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_jump_has_target(struct sljit_jump *jump);
+static SLJIT_INLINE sljit_uw sljit_jump_get_target(struct sljit_jump *jump) { return jump->u.target; }
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_jump_is_mov_addr(struct sljit_jump *jump);
+
+/* Option bits for sljit_serialize_compiler. */
+
+/* When debugging is enabled, the serialized buffer contains
+debugging information unless this option is specified. */
+#define SLJIT_SERIALIZE_IGNORE_DEBUG		0x1
+
+/* Serialize the internal structure of the compiler into a buffer.
+If the serialization is successful, the returned value is a newly
+allocated buffer which is allocated by the memory allocator assigned
+to the compiler. Otherwise the returned value is NULL. Unlike
+sljit_generate_code(), serialization does not modify the internal
+state of the compiler, so the code generation can be continued.
+
+  options must be the combination of SLJIT_SERIALIZE_* option bits
+  size is an output argument, which is set to the byte size of
+    the result buffer if the operation is successful
+
+Notes:
+  - This function is useful for ahead-of-time compilation (AOT).
+  - The returned buffer must be freed later by the caller.
+    The SLJIT_FREE() macro is suitable for this purpose:
+    SLJIT_FREE(returned_buffer, sljit_get_allocator_data(compiler))
+  - Memory allocated by sljit_alloc_memory() is not serialized.
+  - The type of the returned buffer is sljit_uw* to emphasize that
+    the buffer is word aligned. However, the 'size' output argument
+    contains the byte size, so this value is always divisible by
+    sizeof(sljit_uw).
+*/
+SLJIT_API_FUNC_ATTRIBUTE sljit_uw* sljit_serialize_compiler(struct sljit_compiler *compiler,
+	sljit_s32 options, sljit_uw *size);
+
+/* Construct a new compiler instance from a buffer produced by
+sljit_serialize_compiler(). If the operation is successful, the new
+compiler instance is returned. Otherwise the returned value is NULL.
+
+  buffer points to a word aligned memory data which was
+    created by sljit_serialize_compiler()
+  size is the byte size of the buffer
+  options must be 0
+  allocator_data specify an allocator specific data, see
+                 sljit_create_compiler() for further details
+
+Notes:
+  - Labels assigned to jumps are restored with their
+    corresponding label in the label set created by
+    the deserializer. Target addresses assigned to
+    jumps are also restored. Uninitialized jumps
+    remain uninitialized.
+  - After the deserialization, sljit_generate_code() does
+    not need to be the next operation on the returned
+    compiler, the code generation can be continued.
+    Even sljit_serialize_compiler() can be called again.
+  - When debugging is enabled, a buffers without debug
+    information cannot be deserialized.
+*/
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler *sljit_deserialize_compiler(sljit_uw* buffer, sljit_uw size,
+	sljit_s32 options, void *allocator_data);
+
 /* --------------------------------------------------------------------- */
 /*  Miscellaneous utility functions                                      */
 /* --------------------------------------------------------------------- */
@@ -2320,10 +2577,10 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_function_context(void** func_ptr, struct
    it is sometimes desired to free all unused memory regions, e.g.
    before the application terminates. */
 SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void);
-#endif
+#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 
 #ifdef __cplusplus
 } /* extern "C" */
-#endif
+#endif /* __cplusplus */
 
 #endif /* SLJIT_LIR_H_ */
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeARM_32.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_32.c
similarity index 86%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeARM_32.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_32.c
index d44616d8..327dc824 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeARM_32.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_32.c
@@ -114,12 +114,14 @@ static const sljit_u8 freg_ebit_map[((SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2) << 1)
 #define CLZ		0xe16f0f10
 #define CMN		0xe1600000
 #define CMP		0xe1400000
+#define DMB_SY		0xf57ff05f
 #define EOR		0xe0200000
 #define LDR		0xe5100000
 #define LDR_POST	0xe4100000
 #define LDREX		0xe1900f9f
 #define LDREXB		0xe1d00f9f
 #define LDREXH		0xe1f00f9f
+#define MLA		0xe0200090
 #define MOV		0xe1a00000
 #define MUL		0xe0000090
 #define MVN		0xe1e00000
@@ -179,6 +181,7 @@ static const sljit_u8 freg_ebit_map[((SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2) << 1)
 #define VST1_s		0xf4800000
 #define VSTR_F32	0xed000a00
 #define VSUB_F32	0xee300a40
+#define VTBL		0xf3b00800
 
 #if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
 /* Arm v7 specific instructions. */
@@ -197,11 +200,28 @@ static sljit_s32 function_check_is_freg(struct sljit_compiler *compiler, sljit_s
 	if (is_32 && fr >= SLJIT_F64_SECOND(SLJIT_FR0))
 		fr -= SLJIT_F64_SECOND(0);
 
-	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + compiler->fscratches))
-		|| (fr > (SLJIT_FS0 - compiler->fsaveds) && fr <= SLJIT_FS0)
+	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + compiler->real_fscratches))
+		|| (fr > (SLJIT_FS0 - compiler->real_fsaveds) && fr <= SLJIT_FS0)
 		|| (fr >= SLJIT_TMP_FREGISTER_BASE && fr < (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS));
 }
 
+static sljit_s32 function_check_is_vreg(struct sljit_compiler *compiler, sljit_s32 vr, sljit_s32 type)
+{
+	sljit_s32 vr_low = vr;
+
+	if (compiler->scratches == -1)
+		return 0;
+
+	if (SLJIT_SIMD_GET_REG_SIZE(type) == 4) {
+		vr += (vr & 0x1);
+		vr_low = vr - 1;
+	}
+
+	return (vr >= SLJIT_VR0 && vr < (SLJIT_VR0 + compiler->vscratches))
+		|| (vr_low > (SLJIT_VS0 - compiler->vsaveds) && vr_low <= SLJIT_VS0)
+		|| (vr >= SLJIT_TMP_VREGISTER_BASE && vr < (SLJIT_TMP_VREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_VECTOR_REGISTERS));
+}
+
 #endif /* SLJIT_ARGUMENT_CHECKS */
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
@@ -363,7 +383,7 @@ static sljit_uw patch_pc_relative_loads(sljit_uw *last_pc_patch, sljit_uw *code_
 
 	while (last_pc_patch < code_ptr) {
 		/* Data transfer instruction with Rn == r15. */
-		if ((*last_pc_patch & 0x0e0f0000) == 0x040f0000) {
+		if ((*last_pc_patch & 0x0e4f0000) == 0x040f0000) {
 			diff = (sljit_uw)(const_pool - last_pc_patch);
 			ind = (*last_pc_patch) & 0xfff;
 
@@ -475,6 +495,14 @@ static SLJIT_INLINE sljit_s32 emit_imm(struct sljit_compiler *compiler, sljit_s3
 static SLJIT_INLINE sljit_s32 detect_jump_type(struct sljit_jump *jump, sljit_uw *code_ptr, sljit_uw *code, sljit_sw executable_offset)
 {
 	sljit_sw diff;
+	sljit_uw target_addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_uw orig_addr = jump->addr;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+#if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
+	jump->addr = jump_addr;
+#endif
 
 	if (jump->flags & SLJIT_REWRITABLE_JUMP)
 		return 0;
@@ -482,46 +510,38 @@ static SLJIT_INLINE sljit_s32 detect_jump_type(struct sljit_jump *jump, sljit_uw
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	if (jump->flags & IS_BL)
 		code_ptr--;
+#endif /* SLJIT_CONFIG_ARM_V6 */
 
 	if (jump->flags & JUMP_ADDR)
-		diff = ((sljit_sw)jump->u.target - (sljit_sw)(code_ptr + 2) - executable_offset);
+		target_addr = jump->u.target;
 	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		diff = ((sljit_sw)(code + jump->u.label->size) - (sljit_sw)(code_ptr + 2));
+		SLJIT_ASSERT(jump->u.label != NULL);
+		target_addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > orig_addr)
+			jump_addr = (sljit_uw)(code + orig_addr);
 	}
 
+	diff = (sljit_sw)target_addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr + 8, executable_offset);
+
 	/* Branch to Thumb code has not been optimized yet. */
 	if (diff & 0x3)
 		return 0;
 
+#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	if (jump->flags & IS_BL) {
 		if (diff <= 0x01ffffff && diff >= -0x02000000) {
 			*code_ptr = (BL - CONDITIONAL) | (*(code_ptr + 1) & COND_MASK);
 			jump->flags |= PATCH_B;
 			return 1;
 		}
-	}
-	else {
-		if (diff <= 0x01ffffff && diff >= -0x02000000) {
-			*code_ptr = (B - CONDITIONAL) | (*code_ptr & COND_MASK);
-			jump->flags |= PATCH_B;
-		}
+	} else if (diff <= 0x01ffffff && diff >= -0x02000000) {
+		*code_ptr = (B - CONDITIONAL) | (*code_ptr & COND_MASK);
+		jump->flags |= PATCH_B;
 	}
 #else /* !SLJIT_CONFIG_ARM_V6 */
-	if (jump->flags & JUMP_ADDR)
-		diff = ((sljit_sw)jump->u.target - (sljit_sw)code_ptr - executable_offset);
-	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		diff = ((sljit_sw)(code + jump->u.label->size) - (sljit_sw)code_ptr);
-	}
-
-	/* Branch to Thumb code has not been optimized yet. */
-	if (diff & 0x3)
-		return 0;
-
 	if (diff <= 0x01ffffff && diff >= -0x02000000) {
-		code_ptr -= 2;
-		*code_ptr = ((jump->flags & IS_BL) ? (BL - CONDITIONAL) : (B - CONDITIONAL)) | (code_ptr[2] & COND_MASK);
+		*code_ptr = ((jump->flags & IS_BL) ? (BL - CONDITIONAL) : (B - CONDITIONAL)) | (*code_ptr & COND_MASK);
 		jump->flags |= PATCH_B;
 		return 1;
 	}
@@ -529,7 +549,7 @@ static SLJIT_INLINE sljit_s32 detect_jump_type(struct sljit_jump *jump, sljit_uw
 	return 0;
 }
 
-static SLJIT_INLINE void inline_set_jump_addr(sljit_uw jump_ptr, sljit_sw executable_offset, sljit_uw new_addr, sljit_s32 flush_cache)
+static void set_jump_addr(sljit_uw jump_ptr, sljit_sw executable_offset, sljit_uw new_addr, sljit_s32 flush_cache)
 {
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	sljit_ins *ptr = (sljit_ins*)jump_ptr;
@@ -628,7 +648,7 @@ static sljit_uw get_imm(sljit_uw imm);
 static sljit_s32 load_immediate(struct sljit_compiler *compiler, sljit_s32 reg, sljit_uw imm);
 static sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg, sljit_s32 arg, sljit_sw argw, sljit_s32 tmp_reg);
 
-static SLJIT_INLINE void inline_set_const(sljit_uw addr, sljit_sw executable_offset, sljit_uw new_constant, sljit_s32 flush_cache)
+static void set_const_value(sljit_uw addr, sljit_sw executable_offset, sljit_uw new_constant, sljit_s32 flush_cache)
 {
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	sljit_ins *ptr = (sljit_ins*)addr;
@@ -720,18 +740,134 @@ static SLJIT_INLINE void inline_set_const(sljit_uw addr, sljit_sw executable_off
 #endif /* SLJIT_CONFIG_ARM_V6 */
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+static SLJIT_INLINE sljit_sw mov_addr_get_length(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
+{
+	sljit_uw addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_sw diff;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else {
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > jump->addr)
+			jump_addr = (sljit_uw)(code + jump->addr);
+	}
+
+	/* The pc+8 offset is represented by the 2 * SSIZE_OF(ins) below. */
+	diff = (sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
+
+	if ((diff & 0x3) == 0 && diff <= (0x3fc + 2 * SSIZE_OF(ins)) && diff >= (-0x3fc + 2 * SSIZE_OF(ins))) {
+		jump->flags |= PATCH_B;
+		return 0;
+	}
+
+#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
+	return 0;
+#else /* !SLJIT_CONFIG_ARM_V6 */
+	return 1;
+#endif /* SLJIT_CONFIG_ARM_V6 */
+}
+
+#if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
+
+static void reduce_code_size(struct sljit_compiler *compiler)
+{
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	struct sljit_const *const_;
+	SLJIT_NEXT_DEFINE_TYPES;
+	sljit_uw total_size;
+	sljit_uw size_reduce = 0;
+	sljit_sw diff;
+
+	label = compiler->labels;
+	jump = compiler->jumps;
+	const_ = compiler->consts;
+	SLJIT_NEXT_INIT_TYPES();
+
+	while (1) {
+		SLJIT_GET_NEXT_MIN();
+
+		if (next_min_addr == SLJIT_MAX_ADDRESS)
+			break;
+
+		if (next_min_addr == next_label_size) {
+			label->size -= size_reduce;
+
+			label = label->next;
+			next_label_size = SLJIT_GET_NEXT_SIZE(label);
+		}
+
+		if (next_min_addr == next_const_addr) {
+			const_->addr -= size_reduce;
+			const_ = const_->next;
+			next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+			continue;
+		}
+
+		if (next_min_addr != next_jump_addr)
+			continue;
+
+		jump->addr -= size_reduce;
+		if (!(jump->flags & JUMP_MOV_ADDR)) {
+			total_size = JUMP_MAX_SIZE - 1;
+
+			if (!(jump->flags & (SLJIT_REWRITABLE_JUMP | JUMP_ADDR))) {
+				/* Unit size: instruction. */
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr - 2;
+				if (jump->u.label->size > jump->addr) {
+					SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+					diff -= (sljit_sw)size_reduce;
+				}
+
+				if (diff <= (0x01ffffff / SSIZE_OF(ins)) && diff >= (-0x02000000 / SSIZE_OF(ins)))
+					total_size = 1 - 1;
+			}
+
+			size_reduce += JUMP_MAX_SIZE - 1 - total_size;
+		} else {
+			/* Real size minus 1. Unit size: instruction. */
+			total_size = 1;
+
+			if (!(jump->flags & JUMP_ADDR)) {
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+				if (jump->u.label->size > jump->addr) {
+					SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+					diff -= (sljit_sw)size_reduce;
+				}
+
+				if (diff <= 0xff + 2 && diff >= -0xff + 2)
+					total_size = 0;
+			}
+
+			size_reduce += 1 - total_size;
+		}
+
+		jump->flags |= total_size << JUMP_SIZE_SHIFT;
+		jump = jump->next;
+		next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+	}
+
+	compiler->size -= size_reduce;
+}
+
+#endif /* SLJIT_CONFIG_ARM_V7 */
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_ins *code;
 	sljit_ins *code_ptr;
 	sljit_ins *buf_ptr;
 	sljit_ins *buf_end;
-	sljit_uw size;
 	sljit_uw word_count;
-	sljit_uw next_addr;
+	SLJIT_NEXT_DEFINE_TYPES;
 	sljit_sw executable_offset;
 	sljit_uw addr;
+	sljit_sw diff;
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	sljit_uw cpool_size;
 	sljit_uw cpool_skip_alignment;
@@ -744,22 +880,22 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
 
 	/* Second code generation pass. */
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
-	size = compiler->size + (compiler->patches << 1);
+	compiler->size += (compiler->patches << 1);
 	if (compiler->cpool_fill > 0)
-		size += compiler->cpool_fill + CONST_POOL_ALIGNMENT - 1;
+		compiler->size += compiler->cpool_fill + CONST_POOL_ALIGNMENT - 1;
 #else /* !SLJIT_CONFIG_ARM_V6 */
-	size = compiler->size;
+	reduce_code_size(compiler);
 #endif /* SLJIT_CONFIG_ARM_V6 */
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(size * sizeof(sljit_ins), compiler->exec_allocator_data);
+	code = (sljit_ins*)allocate_executable_memory(compiler->size * sizeof(sljit_ins), options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
+
+	reverse_buf(compiler);
 	buf = compiler->buf;
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
@@ -773,33 +909,24 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 
 	code_ptr = code;
 	word_count = 0;
-	next_addr = 1;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
-
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
-
-	if (label && label->size == 0) {
-		label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code, executable_offset);
-		label = label->next;
-	}
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
 
 	do {
 		buf_ptr = (sljit_ins*)buf->memory;
 		buf_end = buf_ptr + (buf->used_size >> 2);
 		do {
-			word_count++;
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 			if (cpool_size > 0) {
 				if (cpool_skip_alignment > 0) {
 					buf_ptr++;
 					cpool_skip_alignment--;
-				}
-				else {
+				} else {
 					if (SLJIT_UNLIKELY(resolve_const_pool_index(compiler, &first_patch, cpool_current_index, cpool_start_address, buf_ptr))) {
-						SLJIT_FREE_EXEC(code, compiler->exec_allocator_data);
+						SLJIT_FREE_EXEC(code, exec_allocator_data);
 						compiler->error = SLJIT_ERR_ALLOC_FAILED;
 						return NULL;
 					}
@@ -807,59 +934,58 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 					if (++cpool_current_index >= cpool_size) {
 						SLJIT_ASSERT(!first_patch);
 						cpool_size = 0;
-						if (label && label->size == word_count) {
-							/* Points after the current instruction. */
-							label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
-							label->size = (sljit_uw)(code_ptr - code);
-							label = label->next;
-
-							next_addr = compute_next_addr(label, jump, const_, put_label);
-						}
 					}
 				}
-			}
-			else if ((*buf_ptr & 0xff000000) != PUSH_POOL) {
+			} else if ((*buf_ptr & 0xff000000) != PUSH_POOL) {
 #endif /* SLJIT_CONFIG_ARM_V6 */
 				*code_ptr = *buf_ptr++;
-				if (next_addr == word_count) {
+				if (next_min_addr == word_count) {
 					SLJIT_ASSERT(!label || label->size >= word_count);
 					SLJIT_ASSERT(!jump || jump->addr >= word_count);
 					SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-					SLJIT_ASSERT(!put_label || put_label->addr >= word_count);
 
-				/* These structures are ordered by their address. */
-					if (jump && jump->addr == word_count) {
-#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
-						if (detect_jump_type(jump, code_ptr, code, executable_offset))
-							code_ptr--;
-						jump->addr = (sljit_uw)code_ptr;
-#else /* !SLJIT_CONFIG_ARM_V6 */
-						jump->addr = (sljit_uw)(code_ptr - 2);
-						if (detect_jump_type(jump, code_ptr, code, executable_offset))
-							code_ptr -= 2;
-#endif /* SLJIT_CONFIG_ARM_V6 */
-						jump = jump->next;
-					}
-					if (label && label->size == word_count) {
-						/* code_ptr can be affected above. */
-						label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr + 1, executable_offset);
-						label->size = (sljit_uw)((code_ptr + 1) - code);
+					if (next_min_addr == next_label_size) {
+						label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+						label->size = (sljit_uw)(code_ptr - code);
 						label = label->next;
+						next_label_size = SLJIT_GET_NEXT_SIZE(label);
 					}
-					if (const_ && const_->addr == word_count) {
+
+					/* These structures are ordered by their address. */
+					if (next_min_addr == next_jump_addr) {
+						if (!(jump->flags & JUMP_MOV_ADDR)) {
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
-						const_->addr = (sljit_uw)code_ptr;
+							if (detect_jump_type(jump, code_ptr, code, executable_offset))
+								code_ptr--;
+							jump->addr = (sljit_uw)code_ptr;
 #else /* !SLJIT_CONFIG_ARM_V6 */
-						const_->addr = (sljit_uw)(code_ptr - 1);
+							word_count += jump->flags >> JUMP_SIZE_SHIFT;
+							if (!detect_jump_type(jump, code_ptr, code, executable_offset)) {
+								code_ptr[2] = code_ptr[0];
+								addr = ((code_ptr[0] & 0xf) << 12);
+								code_ptr[0] = MOVW | addr;
+								code_ptr[1] = MOVT | addr;
+								code_ptr += 2;
+							}
+							SLJIT_ASSERT((sljit_uw)code_ptr - jump->addr <= (jump->flags >> JUMP_SIZE_SHIFT) * sizeof(sljit_ins));
 #endif /* SLJIT_CONFIG_ARM_V6 */
+						} else {
+#if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
+							word_count += jump->flags >> JUMP_SIZE_SHIFT;
+#endif /* SLJIT_CONFIG_ARM_V7 */
+							addr = (sljit_uw)code_ptr;
+							code_ptr += mov_addr_get_length(jump, code_ptr, code, executable_offset);
+							jump->addr = addr;
+						}
+						jump = jump->next;
+						next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+					} else if (next_min_addr == next_const_addr) {
+						const_->addr = (sljit_uw)code_ptr;
 						const_ = const_->next;
+						next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
 					}
-					if (put_label && put_label->addr == word_count) {
-						SLJIT_ASSERT(put_label->label);
-						put_label->addr = (sljit_uw)code_ptr;
-						put_label = put_label->next;
-					}
-					next_addr = compute_next_addr(label, jump, const_, put_label);
+
+					SLJIT_GET_NEXT_MIN();
 				}
 				code_ptr++;
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
@@ -879,14 +1005,20 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 				last_pc_patch = code_ptr;
 			}
 #endif /* SLJIT_CONFIG_ARM_V6 */
+			word_count++;
 		} while (buf_ptr < buf_end);
 		buf = buf->next;
 	} while (buf);
 
+	if (label && label->size == word_count) {
+		label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+		label->size = (sljit_uw)(code_ptr - code);
+		label = label->next;
+	}
+
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	SLJIT_ASSERT(cpool_size == 0);
@@ -901,7 +1033,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 		cpool_current_index = 0;
 		while (buf_ptr < buf_end) {
 			if (SLJIT_UNLIKELY(resolve_const_pool_index(compiler, &first_patch, cpool_current_index, cpool_start_address, buf_ptr))) {
-				SLJIT_FREE_EXEC(code, compiler->exec_allocator_data);
+				SLJIT_FREE_EXEC(code, exec_allocator_data);
 				compiler->error = SLJIT_ERR_ALLOC_FAILED;
 				return NULL;
 			}
@@ -914,43 +1046,64 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 
 	jump = compiler->jumps;
 	while (jump) {
+		addr = (jump->flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
 		buf_ptr = (sljit_ins*)jump->addr;
 
-		if (jump->flags & PATCH_B) {
-			addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(buf_ptr + 2, executable_offset);
-			if (!(jump->flags & JUMP_ADDR)) {
-				SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-				SLJIT_ASSERT((sljit_sw)(jump->u.label->addr - addr) <= 0x01ffffff && (sljit_sw)(jump->u.label->addr - addr) >= -0x02000000);
-				*buf_ptr |= ((jump->u.label->addr - addr) >> 2) & 0x00ffffff;
-			}
-			else {
-				SLJIT_ASSERT((sljit_sw)(jump->u.target - addr) <= 0x01ffffff && (sljit_sw)(jump->u.target - addr) >= -0x02000000);
-				*buf_ptr |= ((jump->u.target - addr) >> 2) & 0x00ffffff;
-			}
-		}
-		else if (jump->flags & SLJIT_REWRITABLE_JUMP) {
+		if (jump->flags & JUMP_MOV_ADDR) {
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
-			jump->addr = (sljit_uw)code_ptr;
-			code_ptr[0] = (sljit_ins)buf_ptr;
-			code_ptr[1] = *buf_ptr;
-			inline_set_jump_addr((sljit_uw)code_ptr, executable_offset, (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target, 0);
-			code_ptr += 2;
+			SLJIT_ASSERT((buf_ptr[0] & (sljit_ins)0xffff0000) == 0xe59f0000);
 #else /* !SLJIT_CONFIG_ARM_V6 */
-			inline_set_jump_addr((sljit_uw)buf_ptr, executable_offset, (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target, 0);
+			SLJIT_ASSERT((buf_ptr[0] & ~(sljit_ins)0xf000) == 0);
 #endif /* SLJIT_CONFIG_ARM_V6 */
+
+			if (jump->flags & PATCH_B) {
+				SLJIT_ASSERT((((sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr + 2, executable_offset)) & 0x3) == 0);
+				diff = ((sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr + 2, executable_offset)) >> 2;
+
+				SLJIT_ASSERT(diff <= 0xff && diff >= -0xff);
+
+				addr = ADD;
+				if (diff < 0) {
+					diff = -diff;
+					addr = SUB;
+				}
+
+				buf_ptr[0] = addr | (buf_ptr[0] & 0xf000) | RN(TMP_PC) | (1 << 25) | (0xf << 8) | (sljit_ins)(diff & 0xff);
+			} else {
+#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
+				buf_ptr[((buf_ptr[0] & 0xfff) >> 2) + 2] = addr;
+#else /* !SLJIT_CONFIG_ARM_V6 */
+				buf_ptr[1] = MOVT | buf_ptr[0] | ((addr >> 12) & 0xf0000) | ((addr >> 16) & 0xfff);
+				buf_ptr[0] = MOVW | buf_ptr[0] | ((addr << 4) & 0xf0000) | (addr & 0xfff);
+#endif /* SLJIT_CONFIG_ARM_V6 */
+			}
+		} else if (jump->flags & PATCH_B) {
+			diff = (sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr + 2, executable_offset);
+			SLJIT_ASSERT(diff <= 0x01ffffff && diff >= -0x02000000);
+			*buf_ptr |= (diff >> 2) & 0x00ffffff;
 		} else {
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 			if (jump->flags & IS_BL)
 				buf_ptr--;
-			if (*buf_ptr & (1 << 23))
-				buf_ptr += ((*buf_ptr & 0xfff) >> 2) + 2;
-			else
-				buf_ptr += 1;
-			*buf_ptr = (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
+
+			if (jump->flags & SLJIT_REWRITABLE_JUMP) {
+				jump->addr = (sljit_uw)code_ptr;
+				code_ptr[0] = (sljit_ins)buf_ptr;
+				code_ptr[1] = *buf_ptr;
+				set_jump_addr((sljit_uw)code_ptr, executable_offset, addr, 0);
+				code_ptr += 2;
+			} else {
+				if (*buf_ptr & (1 << 23))
+					buf_ptr += ((*buf_ptr & 0xfff) >> 2) + 2;
+				else
+					buf_ptr += 1;
+				*buf_ptr = addr;
+			}
 #else /* !SLJIT_CONFIG_ARM_V6 */
-			inline_set_jump_addr((sljit_uw)buf_ptr, executable_offset, (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target, 0);
+			set_jump_addr((sljit_uw)buf_ptr, executable_offset, addr, 0);
 #endif /* SLJIT_CONFIG_ARM_V6 */
 		}
+
 		jump = jump->next;
 	}
 
@@ -967,30 +1120,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 		else
 			buf_ptr += 1;
 		/* Set the value again (can be a simple constant). */
-		inline_set_const((sljit_uw)code_ptr, executable_offset, *buf_ptr, 0);
+		set_const_value((sljit_uw)code_ptr, executable_offset, *buf_ptr, 0);
 		code_ptr += 2;
 
 		const_ = const_->next;
 	}
 #endif /* SLJIT_CONFIG_ARM_V6 */
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-		addr = put_label->label->addr;
-		buf_ptr = (sljit_ins*)put_label->addr;
-
-#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
-		SLJIT_ASSERT((buf_ptr[0] & 0xffff0000) == 0xe59f0000);
-		buf_ptr[((buf_ptr[0] & 0xfff) >> 2) + 2] = addr;
-#else /* !SLJIT_CONFIG_ARM_V6 */
-		SLJIT_ASSERT((buf_ptr[-1] & 0xfff00000) == MOVW && (buf_ptr[0] & 0xfff00000) == MOVT);
-		buf_ptr[-1] |= ((addr << 4) & 0xf0000) | (addr & 0xfff);
-		buf_ptr[0] |= ((addr >> 12) & 0xf0000) | ((addr >> 16) & 0xfff);
-#endif /* SLJIT_CONFIG_ARM_V6 */
-		put_label = put_label->next;
-	}
-
-	SLJIT_ASSERT(code_ptr - code <= (sljit_s32)size);
+	SLJIT_ASSERT(code_ptr - code <= (sljit_s32)compiler->size);
 
 	compiler->error = SLJIT_ERR_COMPILED;
 	compiler->executable_offset = executable_offset;
@@ -1036,6 +1173,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_COPY_F32:
 	case SLJIT_HAS_COPY_F64:
 	case SLJIT_HAS_ATOMIC:
+#if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
+	case SLJIT_HAS_MEMORY_BARRIER:
+#endif /* SLJIT_CONFIG_ARM_V7 */
 		return 1;
 
 	case SLJIT_HAS_CTZ:
@@ -1113,7 +1253,7 @@ static const sljit_ins data_transfer_insts[16] = {
   /* Inverted immediate. */
 #define INV_IMM		0x02
   /* Source and destination is register. */
-#define MOVE_REG_CONV	0x04
+#define REGISTER_OP	0x04
   /* Unused return value. */
 #define UNUSED_RETURN	0x08
 /* SET_FLAGS must be (1 << 20) as it is also the value of S bit (can be used for optimization). */
@@ -1130,9 +1270,11 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	sljit_s32 src2, sljit_sw src2w);
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_uw imm, offset;
 	sljit_s32 i, tmp, size, word_arg_count;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
@@ -1145,11 +1287,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 #endif
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 
 	imm = 0;
-
 	tmp = SLJIT_S0 - saveds;
 	for (i = SLJIT_S0 - saved_arg_count; i > tmp; i--)
 		imm |= (sljit_uw)1 << reg_map[i];
@@ -1296,15 +1442,21 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 size;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 	size = GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 1);
 
 	/* Doubles are saved, so alignment is unaffected. */
@@ -1498,7 +1650,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
 static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s32 flags,
 	sljit_uw dst, sljit_uw src1, sljit_uw src2)
 {
-	sljit_s32 is_masked;
+	sljit_s32 reg, is_masked;
 	sljit_uw shift_type;
 
 	switch (op) {
@@ -1515,7 +1667,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 	case SLJIT_MOV_U8:
 	case SLJIT_MOV_S8:
 		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & ARGS_SWAPPED));
-		if (flags & MOVE_REG_CONV)
+		if (flags & REGISTER_OP)
 			return push_inst(compiler, (op == SLJIT_MOV_U8 ? UXTB : SXTB) | RD(dst) | RM(src2));
 
 		if (dst != src2) {
@@ -1527,7 +1679,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 	case SLJIT_MOV_U16:
 	case SLJIT_MOV_S16:
 		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & ARGS_SWAPPED));
-		if (flags & MOVE_REG_CONV)
+		if (flags & REGISTER_OP)
 			return push_inst(compiler, (op == SLJIT_MOV_U16 ? UXTH : SXTH) | RD(dst) | RM(src2));
 
 		if (dst != src2) {
@@ -1543,11 +1695,11 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 
 	case SLJIT_CTZ:
 		SLJIT_ASSERT(!(flags & INV_IMM) && !(src2 & SRC2_IMM));
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & ARGS_SWAPPED));
+		SLJIT_ASSERT(src1 == TMP_REG1 && src2 != TMP_REG2 && !(flags & ARGS_SWAPPED));
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
-		FAIL_IF(push_inst(compiler, RSB | SRC2_IMM | RD(TMP_REG1) | RN(src2) | 0));
-		FAIL_IF(push_inst(compiler, AND | RD(TMP_REG2) | RN(src2) | RM(TMP_REG1)));
-		FAIL_IF(push_inst(compiler, CLZ | RD(dst) | RM(TMP_REG2)));
+		FAIL_IF(push_inst(compiler, RSB | SRC2_IMM | RD(TMP_REG2) | RN(src2) | 0));
+		FAIL_IF(push_inst(compiler, AND | RD(TMP_REG1) | RN(src2) | RM(TMP_REG2)));
+		FAIL_IF(push_inst(compiler, CLZ | RD(dst) | RM(TMP_REG1)));
 		FAIL_IF(push_inst(compiler, CMP | SET_FLAGS | SRC2_IMM | RN(dst) | 32));
 		return push_inst(compiler, (EOR ^ 0xf0000000) | SRC2_IMM | RD(dst) | RN(dst) | 0x1f);
 #else /* !SLJIT_CONFIG_ARM_V6 */
@@ -1563,9 +1715,9 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 
 	case SLJIT_REV_U16:
 	case SLJIT_REV_S16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & ARGS_SWAPPED) && src2 != TMP_REG1 && dst != TMP_REG1);
+		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & ARGS_SWAPPED));
 		FAIL_IF(push_inst(compiler, REV16 | RD(dst) | RM(src2)));
-		if (dst == TMP_REG2 || (src2 == TMP_REG2 && op == SLJIT_REV_U16))
+		if (!(flags & REGISTER_OP))
 			return SLJIT_SUCCESS;
 		return push_inst(compiler, (op == SLJIT_REV_U16 ? UXTH : SXTH) | RD(dst) | RM(dst));
 	case SLJIT_ADD:
@@ -1601,10 +1753,11 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 		if (!(flags & SET_FLAGS))
 			return push_inst(compiler, MUL | RN(dst) | RM8(src2) | RM(src1));
 
-		FAIL_IF(push_inst(compiler, SMULL | RN(TMP_REG1) | RD(dst) | RM8(src2) | RM(src1)));
+		reg = dst == TMP_REG1 ? TMP_REG2 : TMP_REG1;
+		FAIL_IF(push_inst(compiler, SMULL | RN(reg) | RD(dst) | RM8(src2) | RM(src1)));
 
 		/* cmp TMP_REG1, dst asr #31. */
-		return push_inst(compiler, CMP | SET_FLAGS | RN(TMP_REG1) | RM(dst) | 0xfc0);
+		return push_inst(compiler, CMP | SET_FLAGS | RN(reg) | RM(dst) | 0xfc0);
 
 	case SLJIT_AND:
 		if ((flags & (UNUSED_RETURN | INV_IMM)) == UNUSED_RETURN)
@@ -1654,6 +1807,9 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 		is_masked = 0;
 		break;
 
+	case SLJIT_MULADD:
+		return push_inst(compiler, MLA | RN(dst) | RD(dst) | RM8(src2) | RM(src1));
+
 	default:
 		SLJIT_UNREACHABLE();
 		return SLJIT_SUCCESS;
@@ -1973,6 +2129,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	sljit_s32 dst_reg;
 	sljit_s32 src1_reg = 0;
 	sljit_s32 src2_reg = 0;
+	sljit_s32 src2_tmp_reg = 0;
 	sljit_s32 flags = HAS_FLAGS(op) ? SET_FLAGS : 0;
 	sljit_s32 neg_op = 0;
 	sljit_u32 imm2;
@@ -1982,7 +2139,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	if (flags & SET_FLAGS)
 		inp_flags &= ~ALLOW_DOUBLE_IMM;
 
-	if (dst == TMP_REG2)
+	if (dst == TMP_REG1)
 		flags |= UNUSED_RETURN;
 
 	SLJIT_ASSERT(!(inp_flags & ALLOW_INV_IMM) || (inp_flags & ALLOW_IMM));
@@ -2068,6 +2225,36 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		}
 	} while(0);
 
+	/* Destination. */
+	dst_reg = FAST_IS_REG(dst) ? dst : TMP_REG2;
+
+	if (op <= SLJIT_MOV_P) {
+		if (dst & SLJIT_MEM) {
+			if (inp_flags & BYTE_SIZE)
+				inp_flags &= ~SIGNED;
+
+			if (FAST_IS_REG(src2))
+				return emit_op_mem(compiler, inp_flags, src2, dst, dstw, TMP_REG1);
+		}
+
+		if (FAST_IS_REG(src2) && dst_reg != TMP_REG2)
+			flags |= REGISTER_OP;
+
+		src2_tmp_reg = dst_reg;
+	} else {
+		if (op == SLJIT_REV_U16 || op == SLJIT_REV_S16) {
+			if (!(dst & SLJIT_MEM) && (!(src2 & SLJIT_MEM) || op == SLJIT_REV_S16))
+				flags |= REGISTER_OP;
+		}
+
+		src2_tmp_reg = FAST_IS_REG(src1) ? TMP_REG1 : TMP_REG2;
+	}
+
+	if (src2_reg == 0 && (src2 & SLJIT_MEM)) {
+		src2_reg = src2_tmp_reg;
+		FAIL_IF(emit_op_mem(compiler, inp_flags | LOAD_DATA, src2_reg, src2, src2w, TMP_REG1));
+	}
+
 	/* Source 1. */
 	if (FAST_IS_REG(src1))
 		src1_reg = src1;
@@ -2079,30 +2266,12 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		src1_reg = TMP_REG1;
 	}
 
-	/* Destination. */
-	dst_reg = FAST_IS_REG(dst) ? dst : TMP_REG2;
-
-	if (op <= SLJIT_MOV_P) {
-		if (dst & SLJIT_MEM) {
-			if (inp_flags & BYTE_SIZE)
-				inp_flags &= ~SIGNED;
-
-			if (FAST_IS_REG(src2))
-				return emit_op_mem(compiler, inp_flags, src2, dst, dstw, TMP_REG2);
-		}
-
-		if (FAST_IS_REG(src2) && dst_reg != TMP_REG2)
-			flags |= MOVE_REG_CONV;
-	}
-
 	/* Source 2. */
 	if (src2_reg == 0) {
-		src2_reg = (op <= SLJIT_MOV_P) ? dst_reg : TMP_REG2;
+		src2_reg = src2_tmp_reg;
 
 		if (FAST_IS_REG(src2))
 			src2_reg = src2;
-		else if (src2 & SLJIT_MEM)
-			FAIL_IF(emit_op_mem(compiler, inp_flags | LOAD_DATA, src2_reg, src2, src2w, TMP_REG2));
 		else if (!(inp_flags & ALLOW_DOUBLE_IMM))
 			FAIL_IF(load_immediate(compiler, src2_reg, (sljit_uw)src2w));
 		else {
@@ -2122,8 +2291,8 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 			}
 
 			if (src2_reg == 0) {
-				FAIL_IF(load_immediate(compiler, TMP_REG2, (sljit_uw)src2w));
-				src2_reg = TMP_REG2;
+				FAIL_IF(load_immediate(compiler, src2_tmp_reg, (sljit_uw)src2w));
+				src2_reg = src2_tmp_reg;
 			} else {
 				FAIL_IF(emit_single_op(compiler, op, flags, (sljit_uw)dst_reg, (sljit_uw)src1_reg, (sljit_uw)src2_reg));
 				src1_reg = dst_reg;
@@ -2252,6 +2421,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 						| (saved_reg_list[0] << 12) /* ldr rX, [sp], #8/16 */);
 		}
 		return SLJIT_SUCCESS;
+	case SLJIT_MEMORY_BARRIER:
+#if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
+		return push_inst(compiler, DMB_SY);
+#else /* !SLJIT_CONFIG_ARM_V7 */
+		return SLJIT_ERR_UNSUPPORTED;
+#endif /* SLJIT_CONFIG_ARM_V7 */
 	case SLJIT_ENDBR:
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
 		return SLJIT_SUCCESS;
@@ -2368,7 +2543,25 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	CHECK(check_sljit_emit_op2(compiler, op, 1, 0, 0, src1, src1w, src2, src2w));
 
 	SLJIT_SKIP_CHECKS(compiler);
-	return sljit_emit_op2(compiler, op, TMP_REG2, 0, src1, src1w, src2, src2w);
+	return sljit_emit_op2(compiler, op, TMP_REG1, 0, src1, src1w, src2, src2w);
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src1, src1w);
+	ADJUST_LOCAL_OFFSET(src2, src2w);
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		return emit_op(compiler, op, 0, dst_reg, 0, src1, src1w, src2, src2w);
+	}
+
+	return SLJIT_SUCCESS;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
@@ -2500,7 +2693,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_register_index(sljit_s32 type, slji
 	if (type == SLJIT_FLOAT_REGISTER || type == SLJIT_SIMD_REG_64)
 		return freg_map[reg];
 
-	if (type != SLJIT_SIMD_REG_128)
+	if (type == SLJIT_SIMD_REG_128)
 		return freg_map[reg] & ~0x1;
 
 	return -1;
@@ -2533,8 +2726,8 @@ static sljit_s32 emit_fop_mem(struct sljit_compiler *compiler, sljit_s32 flags,
 	arg &= ~SLJIT_MEM;
 
 	if (SLJIT_UNLIKELY(arg & OFFS_REG_MASK)) {
-		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG2) | RN(arg & REG_MASK) | RM(OFFS_REG(arg)) | (((sljit_ins)argw & 0x3) << 7)));
-		arg = TMP_REG2;
+		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG1) | RN(arg & REG_MASK) | RM(OFFS_REG(arg)) | (((sljit_ins)argw & 0x3) << 7)));
+		arg = TMP_REG1;
 		argw = 0;
 	}
 
@@ -2547,25 +2740,25 @@ static sljit_s32 emit_fop_mem(struct sljit_compiler *compiler, sljit_s32 flags,
 
 		imm = get_imm((sljit_uw)argw & ~(sljit_uw)0x3fc);
 		if (imm) {
-			FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG2) | RN(arg & REG_MASK) | imm));
-			return push_inst(compiler, EMIT_FPU_DATA_TRANSFER(inst, 1, TMP_REG2, reg, (argw & 0x3fc) >> 2));
+			FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG1) | RN(arg & REG_MASK) | imm));
+			return push_inst(compiler, EMIT_FPU_DATA_TRANSFER(inst, 1, TMP_REG1, reg, (argw & 0x3fc) >> 2));
 		}
 		imm = get_imm((sljit_uw)-argw & ~(sljit_uw)0x3fc);
 		if (imm) {
 			argw = -argw;
-			FAIL_IF(push_inst(compiler, SUB | RD(TMP_REG2) | RN(arg & REG_MASK) | imm));
-			return push_inst(compiler, EMIT_FPU_DATA_TRANSFER(inst, 0, TMP_REG2, reg, (argw & 0x3fc) >> 2));
+			FAIL_IF(push_inst(compiler, SUB | RD(TMP_REG1) | RN(arg & REG_MASK) | imm));
+			return push_inst(compiler, EMIT_FPU_DATA_TRANSFER(inst, 0, TMP_REG1, reg, (argw & 0x3fc) >> 2));
 		}
 	}
 
 	if (arg) {
-		FAIL_IF(load_immediate(compiler, TMP_REG2, (sljit_uw)argw));
-		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG2) | RN(arg & REG_MASK) | RM(TMP_REG2)));
+		FAIL_IF(load_immediate(compiler, TMP_REG1, (sljit_uw)argw));
+		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG1) | RN(arg & REG_MASK) | RM(TMP_REG1)));
 	}
 	else
-		FAIL_IF(load_immediate(compiler, TMP_REG2, (sljit_uw)argw));
+		FAIL_IF(load_immediate(compiler, TMP_REG1, (sljit_uw)argw));
 
-	return push_inst(compiler, EMIT_FPU_DATA_TRANSFER(inst, 1, TMP_REG2, reg, 0));
+	return push_inst(compiler, EMIT_FPU_DATA_TRANSFER(inst, 1, TMP_REG1, reg, 0));
 }
 
 static SLJIT_INLINE sljit_s32 sljit_emit_fop1_conv_sw_from_f64(struct sljit_compiler *compiler, sljit_s32 op,
@@ -2675,7 +2868,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV_F64:
 		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
+			if (!(dst & SLJIT_MEM))
 				FAIL_IF(push_inst(compiler, EMIT_FPU_OPERATION(VMOV_F32, op & SLJIT_32, dst_r, src, 0)));
 			else
 				dst_r = src;
@@ -2745,7 +2938,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 		return push_inst(compiler, EMIT_FPU_OPERATION((VNEG_F32 & ~COND_MASK) | 0xb0000000, op & SLJIT_32, dst_r, dst_r, 0));
 	}
 
-	if (dst_r == TMP_FREG1)
+	if (dst_r != dst)
 		FAIL_IF(emit_fop_mem(compiler, (op & SLJIT_32), TMP_FREG1, dst, dstw));
 
 	return SLJIT_SUCCESS;
@@ -2974,27 +3167,25 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	if (type >= SLJIT_FAST_CALL)
 		PTR_FAIL_IF(prepare_blx(compiler));
+
 	PTR_FAIL_IF(push_inst_with_unique_literal(compiler, ((EMIT_DATA_TRANSFER(WORD_SIZE | LOAD_DATA, 1,
 		type <= SLJIT_JUMP ? TMP_PC : TMP_REG1, TMP_PC, 0)) & ~COND_MASK) | get_cc(compiler, type), 0));
+	jump->addr = compiler->size - 1;
 
-	if (jump->flags & SLJIT_REWRITABLE_JUMP) {
-		jump->addr = compiler->size;
+	if (jump->flags & SLJIT_REWRITABLE_JUMP)
 		compiler->patches++;
-	}
 
 	if (type >= SLJIT_FAST_CALL) {
 		jump->flags |= IS_BL;
+		jump->addr = compiler->size;
 		PTR_FAIL_IF(emit_blx(compiler));
 	}
-
-	if (!(jump->flags & SLJIT_REWRITABLE_JUMP))
-		jump->addr = compiler->size;
 #else /* !SLJIT_CONFIG_ARM_V6 */
+	jump->addr = compiler->size;
 	if (type >= SLJIT_FAST_CALL)
 		jump->flags |= IS_BL;
-	PTR_FAIL_IF(emit_imm(compiler, TMP_REG1, 0));
 	PTR_FAIL_IF(push_inst(compiler, (((type <= SLJIT_JUMP ? BX : BLX) | RM(TMP_REG1)) & ~COND_MASK) | get_cc(compiler, type)));
-	jump->addr = compiler->size;
+	compiler->size += JUMP_MAX_SIZE - 1;
 #endif /* SLJIT_CONFIG_ARM_V6 */
 	return jump;
 }
@@ -3264,14 +3455,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	if (type >= SLJIT_FAST_CALL)
 		FAIL_IF(prepare_blx(compiler));
-	FAIL_IF(push_inst_with_unique_literal(compiler, EMIT_DATA_TRANSFER(WORD_SIZE | LOAD_DATA, 1, type <= SLJIT_JUMP ? TMP_PC : TMP_REG1, TMP_PC, 0), 0));
-	if (type >= SLJIT_FAST_CALL)
-		FAIL_IF(emit_blx(compiler));
-#else /* !SLJIT_CONFIG_ARM_V6 */
-	FAIL_IF(emit_imm(compiler, TMP_REG1, 0));
-	FAIL_IF(push_inst(compiler, (type <= SLJIT_JUMP ? BX : BLX) | RM(TMP_REG1)));
-#endif /* SLJIT_CONFIG_ARM_V6 */
 	jump->addr = compiler->size;
+	FAIL_IF(push_inst_with_unique_literal(compiler, EMIT_DATA_TRANSFER(WORD_SIZE | LOAD_DATA, 1, type <= SLJIT_JUMP ? TMP_PC : TMP_REG1, TMP_PC, 0), 0));
+	if (type >= SLJIT_FAST_CALL) {
+		jump->addr = compiler->size;
+		FAIL_IF(emit_blx(compiler));
+	}
+#else /* !SLJIT_CONFIG_ARM_V6 */
+	jump->addr = compiler->size;
+	FAIL_IF(push_inst(compiler, (type <= SLJIT_JUMP ? BX : BLX) | RM(TMP_REG1)));
+	compiler->size += JUMP_MAX_SIZE - 1;
+#endif /* SLJIT_CONFIG_ARM_V6 */
 	return SLJIT_SUCCESS;
 }
 
@@ -3425,7 +3619,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 	}
 
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem(compiler, WORD_SIZE | LOAD_DATA, (src2_reg != dst_reg) ? dst_reg : TMP_REG1, src1, src1w, TMP_REG2));
+		FAIL_IF(emit_op_mem(compiler, WORD_SIZE | LOAD_DATA, (src2_reg != dst_reg) ? dst_reg : TMP_REG1, src1, src1w, TMP_REG1));
 
 		if (src2_reg != dst_reg) {
 			src1 = src2_reg;
@@ -3488,8 +3682,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *com
 	}
 
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_fop_mem(compiler, (type & SLJIT_32) | FPU_LOAD, TMP_FREG1, src1, src1w));
-		src1 = TMP_FREG1;
+		FAIL_IF(emit_fop_mem(compiler, (type & SLJIT_32) | FPU_LOAD, TMP_FREG2, src1, src1w));
+		src1 = TMP_FREG2;
 	}
 
 	cc = get_cc(compiler, type & ~SLJIT_32);
@@ -3776,7 +3970,7 @@ static SLJIT_INLINE sljit_s32 simd_get_quad_reg_index(sljit_s32 freg)
 #define SLJIT_QUAD_OTHER_HALF(freg) ((((freg) & 0x1) << 1) - 1)
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3785,7 +3979,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_mov(compiler, type, freg, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -3799,16 +3993,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (!(srcdst & SLJIT_MEM)) {
 		if (reg_size == 4)
 			srcdst = simd_get_quad_reg_index(srcdst);
 
 		if (type & SLJIT_SIMD_STORE)
-			ins = VD(srcdst) | VN(freg) | VM(freg);
+			ins = VD(srcdst) | VN(vreg) | VM(vreg);
 		else
-			ins = VD(freg) | VN(srcdst) | VM(srcdst);
+			ins = VD(vreg) | VN(srcdst) | VM(srcdst);
 
 		if (reg_size == 4)
 			ins |= (sljit_ins)1 << 6;
@@ -3821,7 +4015,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	if (elem_size > 3)
 		elem_size = 3;
 
-	ins = ((type & SLJIT_SIMD_STORE) ? VST1 : VLD1) | VD(freg)
+	ins = ((type & SLJIT_SIMD_STORE) ? VST1 : VLD1) | VD(vreg)
 		| (sljit_ins)((reg_size == 3) ? (0x7 << 8) : (0xa << 8));
 
 	SLJIT_ASSERT(reg_size >= alignment);
@@ -3929,7 +4123,7 @@ static sljit_ins simd_get_imm(sljit_s32 elem_size, sljit_uw value)
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3937,7 +4131,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 	sljit_ins ins, imm;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_replicate(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -3951,24 +4145,24 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (src == SLJIT_IMM && srcw == 0)
-		return push_inst(compiler, VMOV_i | ((reg_size == 4) ? (1 << 6) : 0) | VD(freg));
+		return push_inst(compiler, VMOV_i | ((reg_size == 4) ? (1 << 6) : 0) | VD(vreg));
 
 	if (SLJIT_UNLIKELY(elem_size == 3)) {
 		SLJIT_ASSERT(type & SLJIT_SIMD_FLOAT);
 
 		if (src & SLJIT_MEM) {
-			FAIL_IF(emit_fop_mem(compiler, FPU_LOAD | SLJIT_32, freg, src, srcw));
-			src = freg;
-		} else if (freg != src)
-			FAIL_IF(push_inst(compiler, VORR | VD(freg) | VN(src) | VM(src)));
+			FAIL_IF(emit_fop_mem(compiler, FPU_LOAD | SLJIT_32, vreg, src, srcw));
+			src = vreg;
+		} else if (vreg != src)
+			FAIL_IF(push_inst(compiler, VORR | VD(vreg) | VN(src) | VM(src)));
 
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 
-		if (freg != src)
-			return push_inst(compiler, VORR | VD(freg) | VN(src) | VM(src));
+		if (vreg != src)
+			return push_inst(compiler, VORR | VD(vreg) | VN(src) | VM(src));
 		return SLJIT_SUCCESS;
 	}
 
@@ -3980,7 +4174,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		if (reg_size == 4)
 			ins |= (sljit_ins)1 << 5;
 
-		return push_inst(compiler, VLD1_r | ins | VD(freg) | RN(src) | 0xf);
+		return push_inst(compiler, VLD1_r | ins | VD(vreg) | RN(src) | 0xf);
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
@@ -3990,7 +4184,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		if (reg_size == 4)
 			ins |= (sljit_ins)1 << 6;
 
-		return push_inst(compiler, VDUP_s | ins | VD(freg) | (sljit_ins)freg_map[src]);
+		return push_inst(compiler, VDUP_s | ins | VD(vreg) | (sljit_ins)freg_map[src]);
 	}
 
 	if (src == SLJIT_IMM) {
@@ -4003,7 +4197,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 			if (reg_size == 4)
 				imm |= (sljit_ins)1 << 6;
 
-			return push_inst(compiler, VMOV_i | imm | VD(freg));
+			return push_inst(compiler, VMOV_i | imm | VD(vreg));
 		}
 
 		FAIL_IF(load_immediate(compiler, TMP_REG1, (sljit_uw)srcw));
@@ -4025,11 +4219,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 	if (reg_size == 4)
 		ins |= (sljit_ins)1 << 21;
 
-	return push_inst(compiler, VDUP | ins | VN(freg) | RD(src));
+	return push_inst(compiler, VDUP | ins | VN(vreg) | RD(src));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4037,7 +4231,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, freg, lane_index, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -4051,7 +4245,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (type & SLJIT_SIMD_LANE_ZERO) {
 		ins = (reg_size == 3) ? 0 : ((sljit_ins)1 << 6);
@@ -4059,62 +4253,62 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		if (type & SLJIT_SIMD_FLOAT) {
 			if (elem_size == 3 && !(srcdst & SLJIT_MEM)) {
 				if (lane_index == 1)
-					freg += SLJIT_QUAD_OTHER_HALF(freg);
+					vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 
-				if (srcdst != freg)
-					FAIL_IF(push_inst(compiler, VORR | VD(freg) | VN(srcdst) | VM(srcdst)));
+				if (srcdst != vreg)
+					FAIL_IF(push_inst(compiler, VORR | VD(vreg) | VN(srcdst) | VM(srcdst)));
 
-				freg += SLJIT_QUAD_OTHER_HALF(freg);
-				return push_inst(compiler, VMOV_i | VD(freg));
+				vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+				return push_inst(compiler, VMOV_i | VD(vreg));
 			}
 
-			if (srcdst == freg || (elem_size == 3 && srcdst == (freg + SLJIT_QUAD_OTHER_HALF(freg)))) {
-				FAIL_IF(push_inst(compiler, VORR | ins | VD(TMP_FREG2) | VN(freg) | VM(freg)));
+			if (srcdst == vreg || (elem_size == 3 && srcdst == (vreg + SLJIT_QUAD_OTHER_HALF(vreg)))) {
+				FAIL_IF(push_inst(compiler, VORR | ins | VD(TMP_FREG2) | VN(vreg) | VM(vreg)));
 				srcdst = TMP_FREG2;
 				srcdstw = 0;
 			}
 		}
 
-		FAIL_IF(push_inst(compiler, VMOV_i | ins | VD(freg)));
+		FAIL_IF(push_inst(compiler, VMOV_i | ins | VD(vreg)));
 	}
 
 	if (reg_size == 4 && lane_index >= (0x8 >> elem_size)) {
 		lane_index -= (0x8 >> elem_size);
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 	}
 
 	if (srcdst & SLJIT_MEM) {
 		if (elem_size == 3)
-			return emit_fop_mem(compiler, ((type & SLJIT_SIMD_STORE) ? 0 : FPU_LOAD) | SLJIT_32, freg, srcdst, srcdstw);
+			return emit_fop_mem(compiler, ((type & SLJIT_SIMD_STORE) ? 0 : FPU_LOAD) | SLJIT_32, vreg, srcdst, srcdstw);
 
 		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &srcdst, srcdstw));
 
 		lane_index = lane_index << elem_size;
 		ins = (sljit_ins)((elem_size << 10) | (lane_index << 5));
-		return push_inst(compiler, ((type & SLJIT_SIMD_STORE) ? VST1_s : VLD1_s) | ins | VD(freg) | RN(srcdst) | 0xf);
+		return push_inst(compiler, ((type & SLJIT_SIMD_STORE) ? VST1_s : VLD1_s) | ins | VD(vreg) | RN(srcdst) | 0xf);
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		if (elem_size == 3) {
 			if (type & SLJIT_SIMD_STORE)
-				return push_inst(compiler, VORR | VD(srcdst) | VN(freg) | VM(freg));
-			return push_inst(compiler, VMOV_F32 | SLJIT_32 | VD(freg) | VM(srcdst));
+				return push_inst(compiler, VORR | VD(srcdst) | VN(vreg) | VM(vreg));
+			return push_inst(compiler, VMOV_F32 | SLJIT_32 | VD(vreg) | VM(srcdst));
 		}
 
 		if (type & SLJIT_SIMD_STORE) {
-			if (freg_ebit_map[freg] == 0) {
+			if (freg_ebit_map[vreg] == 0) {
 				if (lane_index == 1)
-					freg = SLJIT_F64_SECOND(freg);
+					vreg = SLJIT_F64_SECOND(vreg);
 
-				return push_inst(compiler, VMOV_F32 | VD(srcdst) | VM(freg));
+				return push_inst(compiler, VMOV_F32 | VD(srcdst) | VM(vreg));
 			}
 
-			FAIL_IF(push_inst(compiler, VMOV_s | (1 << 20) | ((sljit_ins)lane_index << 21) | VN(freg) | RD(TMP_REG1)));
+			FAIL_IF(push_inst(compiler, VMOV_s | (1 << 20) | ((sljit_ins)lane_index << 21) | VN(vreg) | RD(TMP_REG1)));
 			return push_inst(compiler, VMOV | VN(srcdst) | RD(TMP_REG1));
 		}
 
 		FAIL_IF(push_inst(compiler, VMOV | (1 << 20) | VN(srcdst) | RD(TMP_REG1)));
-		return push_inst(compiler, VMOV_s | ((sljit_ins)lane_index << 21) | VN(freg) | RD(TMP_REG1));
+		return push_inst(compiler, VMOV_s | ((sljit_ins)lane_index << 21) | VN(vreg) | RD(TMP_REG1));
 	}
 
 	if (srcdst == SLJIT_IMM) {
@@ -4142,11 +4336,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 			ins |= (1 << 23);
 	}
 
-	return push_inst(compiler, VMOV_s | ins | VN(freg) | RD(srcdst));
+	return push_inst(compiler, VMOV_s | ins | VN(vreg) | RD(srcdst));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4154,7 +4348,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, freg, src, src_lane_index));
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
 
 	if (reg_size != 3 && reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -4166,7 +4360,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4) {
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 		src = simd_get_quad_reg_index(src);
 
 		if (src_lane_index >= (0x8 >> elem_size)) {
@@ -4176,13 +4370,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	}
 
 	if (elem_size == 3) {
-		if (freg != src)
-			FAIL_IF(push_inst(compiler, VORR | VD(freg) | VN(src) | VM(src)));
+		if (vreg != src)
+			FAIL_IF(push_inst(compiler, VORR | VD(vreg) | VN(src) | VM(src)));
 
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 
-		if (freg != src)
-			return push_inst(compiler, VORR | VD(freg) | VN(src) | VM(src));
+		if (vreg != src)
+			return push_inst(compiler, VORR | VD(vreg) | VN(src) | VM(src));
 		return SLJIT_SUCCESS;
 	}
 
@@ -4191,11 +4385,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	if (reg_size == 4)
 		ins |= (sljit_ins)1 << 6;
 
-	return push_inst(compiler, VDUP_s | ins | VD(freg) | VM(src));
+	return push_inst(compiler, VDUP_s | ins | VD(vreg) | VM(src));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4204,7 +4398,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 	sljit_s32 dst_reg;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_extend(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -4218,20 +4412,20 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (src & SLJIT_MEM) {
 		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src, srcw));
 		if (reg_size == 4 && elem2_size - elem_size == 1)
-			FAIL_IF(push_inst(compiler, VLD1 | (0x7 << 8) | VD(freg) | RN(src) | 0xf));
+			FAIL_IF(push_inst(compiler, VLD1 | (0x7 << 8) | VD(vreg) | RN(src) | 0xf));
 		else
-			FAIL_IF(push_inst(compiler, VLD1_s | (sljit_ins)((reg_size - elem2_size + elem_size) << 10) | VD(freg) | RN(src) | 0xf));
-		src = freg;
+			FAIL_IF(push_inst(compiler, VLD1_s | (sljit_ins)((reg_size - elem2_size + elem_size) << 10) | VD(vreg) | RN(src) | 0xf));
+		src = vreg;
 	} else if (reg_size == 4)
 		src = simd_get_quad_reg_index(src);
 
 	if (!(type & SLJIT_SIMD_FLOAT)) {
-		dst_reg = (reg_size == 4) ? freg : TMP_FREG2;
+		dst_reg = (reg_size == 4) ? vreg : TMP_FREG2;
 
 		do {
 			FAIL_IF(push_inst(compiler, VSHLL | ((type & SLJIT_SIMD_EXTEND_SIGNED) ? 0 : (1 << 24))
@@ -4240,27 +4434,27 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 		} while (++elem_size < elem2_size);
 
 		if (dst_reg == TMP_FREG2)
-			return push_inst(compiler, VORR | VD(freg) | VN(TMP_FREG2) | VM(TMP_FREG2));
+			return push_inst(compiler, VORR | VD(vreg) | VN(TMP_FREG2) | VM(TMP_FREG2));
 		return SLJIT_SUCCESS;
 	}
 
 	/* No SIMD variant, must use VFP instead. */
 	SLJIT_ASSERT(reg_size == 4);
 
-	if (freg == src) {
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
-		FAIL_IF(push_inst(compiler, VCVT_F64_F32 | VD(freg) | VM(src) | 0x20));
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
-		return push_inst(compiler, VCVT_F64_F32 | VD(freg) | VM(src));
+	if (vreg == src) {
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+		FAIL_IF(push_inst(compiler, VCVT_F64_F32 | VD(vreg) | VM(src) | 0x20));
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+		return push_inst(compiler, VCVT_F64_F32 | VD(vreg) | VM(src));
 	}
 
-	FAIL_IF(push_inst(compiler, VCVT_F64_F32 | VD(freg) | VM(src)));
-	freg += SLJIT_QUAD_OTHER_HALF(freg);
-	return push_inst(compiler, VCVT_F64_F32 | VD(freg) | VM(src) | 0x20);
+	FAIL_IF(push_inst(compiler, VCVT_F64_F32 | VD(vreg) | VM(src)));
+	vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+	return push_inst(compiler, VCVT_F64_F32 | VD(vreg) | VM(src) | 0x20);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4269,7 +4463,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	sljit_s32 dst_r;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_sign(compiler, type, freg, dst, dstw));
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
 
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
@@ -4302,12 +4496,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	}
 
 	if (reg_size == 4) {
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 		ins |= (sljit_ins)1 << 6;
 	}
 
 	SLJIT_ASSERT((freg_map[TMP_FREG2] & 0x1) == 0);
-	FAIL_IF(push_inst(compiler, ins | VD(TMP_FREG2) | VM(freg)));
+	FAIL_IF(push_inst(compiler, ins | VD(TMP_FREG2) | VM(vreg)));
 
 	if (reg_size == 4 && elem_size > 0)
 		FAIL_IF(push_inst(compiler, VMOVN | ((sljit_ins)(elem_size - 1) << 18) | VD(TMP_FREG2) | VM(TMP_FREG2)));
@@ -4337,14 +4531,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg)
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
-	sljit_ins ins = 0;
+	sljit_s32 alignment;
+	sljit_ins ins = 0, load_ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_freg, src1_freg, src2_freg));
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src2, src2w);
 
 	if (reg_size != 3 && reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -4352,6 +4548,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 	if ((type & SLJIT_SIMD_FLOAT) && (elem_size < 2 || elem_size > 3))
 		return SLJIT_ERR_UNSUPPORTED;
 
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
 	switch (SLJIT_SIMD_GET_OPCODE(type)) {
 	case SLJIT_SIMD_OP2_AND:
 		ins = VAND;
@@ -4362,19 +4561,51 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 	case SLJIT_SIMD_OP2_XOR:
 		ins = VEOR;
 		break;
+	case SLJIT_SIMD_OP2_SHUFFLE:
+		ins = VTBL;
+		break;
 	}
 
-	if (type & SLJIT_SIMD_TEST)
-		return SLJIT_SUCCESS;
+	if (src2 & SLJIT_MEM) {
+		if (elem_size > 3)
+			elem_size = 3;
+
+		load_ins = VLD1 | (sljit_ins)((reg_size == 3) ? (0x7 << 8) : (0xa << 8));
+		alignment = SLJIT_SIMD_GET_ELEM2_SIZE(type);
+
+		SLJIT_ASSERT(reg_size >= alignment);
+
+		if (alignment == 3)
+			load_ins |= 0x10;
+		else if (alignment >= 4)
+			load_ins |= 0x20;
+
+		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src2, src2w));
+		FAIL_IF(push_inst(compiler, load_ins | VD(TMP_FREG2) | RN(src2) | ((sljit_ins)elem_size) << 6 | 0xf));
+		src2 = TMP_FREG2;
+	}
 
 	if (reg_size == 4) {
-		dst_freg = simd_get_quad_reg_index(dst_freg);
-		src1_freg = simd_get_quad_reg_index(src1_freg);
-		src2_freg = simd_get_quad_reg_index(src2_freg);
+		dst_vreg = simd_get_quad_reg_index(dst_vreg);
+		src1_vreg = simd_get_quad_reg_index(src1_vreg);
+		src2 = simd_get_quad_reg_index(src2);
+
+		if (SLJIT_SIMD_GET_OPCODE(type) == SLJIT_SIMD_OP2_SHUFFLE) {
+			ins |= (sljit_ins)1 << 8;
+
+			FAIL_IF(push_inst(compiler, ins | VD(dst_vreg != src1_vreg ? dst_vreg : TMP_FREG2) | VN(src1_vreg) | VM(src2)));
+			src2 += SLJIT_QUAD_OTHER_HALF(src2);
+			FAIL_IF(push_inst(compiler, ins | VD(dst_vreg + SLJIT_QUAD_OTHER_HALF(dst_vreg)) | VN(src1_vreg) | VM(src2)));
+
+			if (dst_vreg == src1_vreg)
+				return push_inst(compiler, VORR | VD(dst_vreg) | VN(TMP_FREG2) | VM(TMP_FREG2));
+			return SLJIT_SUCCESS;
+		}
+
 		ins |= (sljit_ins)1 << 6;
 	}
 
-	return push_inst(compiler, ins | VD(dst_freg) | VN(src1_freg) | VM(src2_freg));
+	return push_inst(compiler, ins | VD(dst_vreg) | VN(src1_vreg) | VM(src2));
 }
 
 #undef FPU_LOAD
@@ -4388,7 +4619,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
 
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
 	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+	case SLJIT_MOV_S16:
+	case SLJIT_MOV_S32:
+		return SLJIT_ERR_UNSUPPORTED;
+
 	case SLJIT_MOV_U8:
 		ins = LDREXB;
 		break;
@@ -4400,6 +4639,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 		break;
 	}
 
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	return push_inst(compiler, ins | RN(mem_reg) | RD(dst_reg));
 }
 
@@ -4416,7 +4658,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
 
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
 	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+	case SLJIT_MOV_S16:
+	case SLJIT_MOV_S32:
+		return SLJIT_ERR_UNSUPPORTED;
+
 	case SLJIT_MOV_U8:
 		ins = STREXB;
 		break;
@@ -4428,6 +4678,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 		break;
 	}
 
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	FAIL_IF(push_inst(compiler, ins | RN(mem_reg) | RD(TMP_REG1) | RM(src_reg)));
 	if (op & SLJIT_SET_ATOMIC_STORED)
 		return push_inst(compiler, CMP | SET_FLAGS | SRC2_IMM | RN(TMP_REG1));
@@ -4444,6 +4697,10 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	CHECK_PTR(check_sljit_emit_const(compiler, dst, dstw, init_value));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
+	const_ = (struct sljit_const*)ensure_abuf(compiler, sizeof(struct sljit_const));
+	PTR_FAIL_IF(!const_);
+	set_const(const_, compiler);
+
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
@@ -4454,22 +4711,18 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	PTR_FAIL_IF(emit_imm(compiler, dst_r, init_value));
 #endif /* SLJIT_CONFIG_ARM_V6 */
 
-	const_ = (struct sljit_const*)ensure_abuf(compiler, sizeof(struct sljit_const));
-	PTR_FAIL_IF(!const_);
-	set_const(const_, compiler);
-
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op_mem(compiler, WORD_SIZE, TMP_REG2, dst, dstw, TMP_REG1));
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_s32 dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
@@ -4478,24 +4731,28 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct slj
 	PTR_FAIL_IF(push_inst_with_unique_literal(compiler, EMIT_DATA_TRANSFER(WORD_SIZE | LOAD_DATA, 1, dst_r, TMP_PC, 0), 0));
 	compiler->patches++;
 #else /* !SLJIT_CONFIG_ARM_V6 */
-	PTR_FAIL_IF(emit_imm(compiler, dst_r, 0));
+	PTR_FAIL_IF(push_inst(compiler, RD(dst_r)));
 #endif /* SLJIT_CONFIG_ARM_V6 */
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 1);
+
+#if (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7)
+	compiler->size += 1;
+#endif /* SLJIT_CONFIG_ARM_V7 */
 
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op_mem(compiler, WORD_SIZE, TMP_REG2, dst, dstw, TMP_REG1));
-	return put_label;
+	return jump;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_target, sljit_sw executable_offset)
 {
-	inline_set_jump_addr(addr, executable_offset, new_target, 1);
+	set_jump_addr(addr, executable_offset, new_target, 1);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant, sljit_sw executable_offset)
 {
-	inline_set_const(addr, executable_offset, (sljit_uw)new_constant, 1);
+	set_const_value(addr, executable_offset, (sljit_uw)new_constant, 1);
 }
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeARM_64.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_64.c
similarity index 83%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeARM_64.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_64.c
index b268582f..d80c9e54 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeARM_64.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_64.c
@@ -71,6 +71,8 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define ADD		0x8b000000
 #define ADDE		0x8b200000
 #define ADDI		0x91000000
+#define ADR		0x10000000
+#define ADRP		0x90000000
 #define AND		0x8a000000
 #define ANDI		0x92000000
 #define AND_v		0x0e201c00
@@ -89,6 +91,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define CLZ		0xdac01000
 #define CSEL		0x9a800000
 #define CSINC		0x9a800400
+#define DMB_SY		0xd5033fbf
 #define DUP_e		0x0e000400
 #define DUP_g		0x0e000c00
 #define EOR		0xca000000
@@ -169,6 +172,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define SUBI		0xd1000000
 #define SUBS		0xeb000000
 #define TBZ		0x36000000
+#define TBL_v		0x0e000000
 #define UBFM		0xd3400000
 #define UCVTF		0x9e630000
 #define UDIV		0x9ac00800
@@ -202,77 +206,283 @@ static SLJIT_INLINE sljit_s32 emit_imm64_const(struct sljit_compiler *compiler,
 	return push_inst(compiler, MOVK | RD(dst) | ((sljit_ins)(imm >> 48) << 5) | (3 << 21));
 }
 
-static SLJIT_INLINE sljit_sw detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
+static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
 {
 	sljit_sw diff;
 	sljit_uw target_addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_uw orig_addr = jump->addr;
+	SLJIT_UNUSED_ARG(executable_offset);
 
-	if (jump->flags & SLJIT_REWRITABLE_JUMP) {
-		jump->flags |= PATCH_ABS64;
-		return 0;
-	}
+	jump->addr = jump_addr;
+	if (jump->flags & SLJIT_REWRITABLE_JUMP)
+		goto exit;
 
 	if (jump->flags & JUMP_ADDR)
 		target_addr = jump->u.target;
 	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		target_addr = (sljit_uw)(code + jump->u.label->size) + (sljit_uw)executable_offset;
+		SLJIT_ASSERT(jump->u.label != NULL);
+		target_addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > orig_addr)
+			jump_addr = (sljit_uw)(code + orig_addr);
 	}
 
-	diff = (sljit_sw)target_addr - (sljit_sw)(code_ptr - 4) - executable_offset;
+	diff = (sljit_sw)target_addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
 
 	if (jump->flags & IS_COND) {
 		diff += SSIZE_OF(ins);
 		if (diff <= 0xfffff && diff >= -0x100000) {
-			code_ptr[-5] ^= (jump->flags & IS_CBZ) ? (0x1 << 24) : 0x1;
-			jump->addr -= sizeof(sljit_ins);
+			*(--code_ptr) ^= (jump->flags & IS_CBZ) ? (0x1 << 24) : 0x1;
 			jump->flags |= PATCH_COND;
-			return 5;
+			jump->addr -= sizeof(sljit_ins);
+			return code_ptr;
 		}
 		diff -= SSIZE_OF(ins);
 	}
 
 	if (diff <= 0x7ffffff && diff >= -0x8000000) {
+		if (jump->flags & IS_COND)
+			code_ptr[-1] -= (4 << 5);
 		jump->flags |= PATCH_B;
-		return 4;
+		return code_ptr;
 	}
 
 	if (target_addr < 0x100000000l) {
 		if (jump->flags & IS_COND)
-			code_ptr[-5] -= (2 << 5);
-		code_ptr[-2] = code_ptr[0];
-		return 2;
+			code_ptr[-1] -= (2 << 5);
+		code_ptr[2] = code_ptr[0];
+		return code_ptr + 2;
+	}
+
+	if (diff <= 0xfffff000l && diff >= -0x100000000l) {
+		if (jump->flags & IS_COND)
+			code_ptr[-1] -= (2 << 5);
+		jump->flags |= PATCH_B32;
+		code_ptr[2] = code_ptr[0];
+		return code_ptr + 2;
 	}
 
 	if (target_addr < 0x1000000000000l) {
 		if (jump->flags & IS_COND)
-			code_ptr[-5] -= (1 << 5);
+			code_ptr[-1] -= (1 << 5);
 		jump->flags |= PATCH_ABS48;
-		code_ptr[-1] = code_ptr[0];
+		code_ptr[3] = code_ptr[0];
+		return code_ptr + 3;
+	}
+
+exit:
+	jump->flags |= PATCH_ABS64;
+	code_ptr[4] = code_ptr[0];
+	return code_ptr + 4;
+}
+
+static SLJIT_INLINE sljit_sw mov_addr_get_length(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
+{
+	sljit_uw addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_sw diff;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	SLJIT_ASSERT(jump->flags < ((sljit_uw)4 << JUMP_SIZE_SHIFT));
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else {
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > jump->addr)
+			jump_addr = (sljit_uw)(code + jump->addr);
+	}
+
+	diff = (sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
+
+	if (diff <= 0xfffff && diff >= -0x100000) {
+		jump->flags |= PATCH_B;
+		return 0;
+	}
+
+	if (diff <= 0xfffff000l && diff >= -0x100000000l) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)1 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_B32;
 		return 1;
 	}
 
-	jump->flags |= PATCH_ABS64;
-	return 0;
-}
+	if (addr < 0x100000000l) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)1 << JUMP_SIZE_SHIFT));
+		return 1;
+	}
 
-static SLJIT_INLINE sljit_sw put_label_get_length(struct sljit_put_label *put_label, sljit_uw max_label)
-{
-	if (max_label < 0x100000000l) {
-		put_label->flags = 0;
+	if (addr < 0x1000000000000l) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)2 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS48;
 		return 2;
 	}
 
-	if (max_label < 0x1000000000000l) {
-		put_label->flags = 1;
-		return 1;
-	}
-
-	put_label->flags = 2;
-	return 0;
+	SLJIT_ASSERT(jump->flags >= ((sljit_uw)3 << JUMP_SIZE_SHIFT));
+	jump->flags |= PATCH_ABS64;
+	return 3;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+static SLJIT_INLINE void generate_jump_or_mov_addr(struct sljit_jump *jump, sljit_sw executable_offset)
+{
+	sljit_sw addr = (sljit_sw)((jump->flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr);
+	sljit_ins* buf_ptr = (sljit_ins*)jump->addr;
+	sljit_u32 dst;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	if (!(jump->flags & JUMP_MOV_ADDR)) {
+		if (jump->flags & PATCH_COND) {
+			addr = (addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset)) >> 2;
+			SLJIT_ASSERT(addr <= 0x3ffff && addr >= -0x40000);
+			buf_ptr[0] = (buf_ptr[0] & ~(sljit_ins)0xffffe0) | (sljit_ins)((addr & 0x7ffff) << 5);
+			return;
+		}
+
+		if (jump->flags & PATCH_B) {
+			addr = (addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset)) >> 2;
+			SLJIT_ASSERT(addr <= 0x1ffffff && addr >= -0x2000000);
+			buf_ptr[0] = ((jump->flags & IS_BL) ? BL : B) | (sljit_ins)(addr & 0x3ffffff);
+			return;
+		}
+
+		dst = (buf_ptr[0] >> 5) & 0x1f;
+
+		if (jump->flags & PATCH_B32) {
+			addr -= (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset) & ~(sljit_sw)0xfff;
+			SLJIT_ASSERT(addr <= 0xfffff000l && addr >= -0x100000000l);
+			buf_ptr[0] = ADRP | (((sljit_ins)(addr >> 12) & 0x3) << 29) | (((sljit_ins)(addr >> 14) & 0x7ffff) << 5) | dst;
+			buf_ptr[1] = ADDI | dst | (dst << 5) | ((sljit_ins)(addr & 0xfff) << 10);
+			return;
+		}
+	} else {
+		dst = *buf_ptr;
+
+		if (jump->flags & PATCH_B) {
+			addr -= (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset);
+			SLJIT_ASSERT(addr <= 0xfffff && addr >= -0x100000);
+			buf_ptr[0] = ADR | (((sljit_ins)addr & 0x3) << 29) | (((sljit_ins)(addr >> 2) & 0x7ffff) << 5) | dst;
+			return;
+		}
+
+		if (jump->flags & PATCH_B32) {
+			addr -= ((sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset)) & ~(sljit_sw)0xfff;
+			SLJIT_ASSERT(addr <= 0xffffffffl && addr >= -0x100000000l);
+			buf_ptr[0] = ADRP | (((sljit_ins)(addr >> 12) & 0x3) << 29) | (((sljit_ins)(addr >> 14) & 0x7ffff) << 5) | dst;
+			buf_ptr[1] = ADDI | dst | (dst << 5) | ((sljit_ins)(addr & 0xfff) << 10);
+			return;
+		}
+	}
+
+	SLJIT_ASSERT((jump->flags & (PATCH_ABS48 | PATCH_ABS64)) || (sljit_uw)addr <= (sljit_uw)0xffffffff);
+	SLJIT_ASSERT((jump->flags & PATCH_ABS64) || (sljit_uw)addr <= (sljit_uw)0xffffffffffff);
+
+	buf_ptr[0] = MOVZ | (((sljit_ins)addr & 0xffff) << 5) | dst;
+	buf_ptr[1] = MOVK | (((sljit_ins)(addr >> 16) & 0xffff) << 5) | (1 << 21) | dst;
+	if (jump->flags & (PATCH_ABS48 | PATCH_ABS64))
+		buf_ptr[2] = MOVK | (((sljit_ins)(addr >> 32) & 0xffff) << 5) | (2 << 21) | dst;
+
+	if (jump->flags & PATCH_ABS64)
+		buf_ptr[3] = MOVK | ((sljit_ins)((sljit_uw)addr >> 48) << 5) | (3 << 21) | dst;
+}
+
+static void reduce_code_size(struct sljit_compiler *compiler)
+{
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	struct sljit_const *const_;
+	SLJIT_NEXT_DEFINE_TYPES;
+	sljit_uw total_size;
+	sljit_uw size_reduce = 0;
+	sljit_sw diff;
+
+	label = compiler->labels;
+	jump = compiler->jumps;
+	const_ = compiler->consts;
+	SLJIT_NEXT_INIT_TYPES();
+
+	while (1) {
+		SLJIT_GET_NEXT_MIN();
+
+		if (next_min_addr == SLJIT_MAX_ADDRESS)
+			break;
+
+		if (next_min_addr == next_label_size) {
+			label->size -= size_reduce;
+
+			label = label->next;
+			next_label_size = SLJIT_GET_NEXT_SIZE(label);
+		}
+
+		if (next_min_addr == next_const_addr) {
+			const_->addr -= size_reduce;
+			const_ = const_->next;
+			next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+			continue;
+		}
+
+		if (next_min_addr != next_jump_addr)
+			continue;
+
+		jump->addr -= size_reduce;
+		if (!(jump->flags & JUMP_MOV_ADDR)) {
+			total_size = JUMP_MAX_SIZE;
+
+			if (!(jump->flags & SLJIT_REWRITABLE_JUMP)) {
+				if (jump->flags & JUMP_ADDR) {
+					if (jump->u.target < 0x100000000l)
+						total_size = 3;
+					else if (jump->u.target < 0x1000000000000l)
+						total_size = 4;
+				} else {
+					/* Unit size: instruction. */
+					diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+					if (jump->u.label->size > jump->addr) {
+						SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+						diff -= (sljit_sw)size_reduce;
+					}
+
+					if ((jump->flags & IS_COND) && (diff + 1) <= (0xfffff / SSIZE_OF(ins)) && (diff + 1) >= (-0x100000 / SSIZE_OF(ins)))
+						total_size = 0;
+					else if (diff <= (0x7ffffff / SSIZE_OF(ins)) && diff >= (-0x8000000 / SSIZE_OF(ins)))
+						total_size = 1;
+					else if (diff <= (0xfffff000l / SSIZE_OF(ins)) && diff >= (-0x100000000l / SSIZE_OF(ins)))
+						total_size = 3;
+				}
+			}
+
+			size_reduce += JUMP_MAX_SIZE - total_size;
+		} else {
+			/* Real size minus 1. Unit size: instruction. */
+			total_size = 3;
+
+			if (!(jump->flags & JUMP_ADDR)) {
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+				if (jump->u.label->size > jump->addr) {
+					SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+					diff -= (sljit_sw)size_reduce;
+				}
+
+				if (diff <= (0xfffff / SSIZE_OF(ins)) && diff >= (-0x100000 / SSIZE_OF(ins)))
+					total_size = 0;
+				else if (diff <= (0xfffff000l / SSIZE_OF(ins)) && diff >= (-0x100000000l / SSIZE_OF(ins)))
+					total_size = 1;
+			} else if (jump->u.target < 0x100000000l)
+				total_size = 1;
+			else if (jump->u.target < 0x1000000000000l)
+				total_size = 2;
+
+			size_reduce += 3 - total_size;
+		}
+
+		jump->flags |= total_size << JUMP_SIZE_SHIFT;
+		jump = jump->next;
+		next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+	}
+
+	compiler->size -= size_reduce;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_ins *code;
@@ -280,67 +490,72 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	sljit_ins *buf_ptr;
 	sljit_ins *buf_end;
 	sljit_uw word_count;
-	sljit_uw next_addr;
+	SLJIT_NEXT_DEFINE_TYPES;
 	sljit_sw executable_offset;
 	sljit_sw addr;
-	sljit_u32 dst;
 
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
 
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins), compiler->exec_allocator_data);
+	reduce_code_size(compiler);
+
+	code = (sljit_ins*)allocate_executable_memory(compiler->size * sizeof(sljit_ins), options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
+
+	reverse_buf(compiler);
 	buf = compiler->buf;
 
 	code_ptr = code;
 	word_count = 0;
-	next_addr = 0;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
-
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
 
 	do {
 		buf_ptr = (sljit_ins*)buf->memory;
 		buf_end = buf_ptr + (buf->used_size >> 2);
 		do {
 			*code_ptr = *buf_ptr++;
-			if (next_addr == word_count) {
+			if (next_min_addr == word_count) {
 				SLJIT_ASSERT(!label || label->size >= word_count);
 				SLJIT_ASSERT(!jump || jump->addr >= word_count);
 				SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-				SLJIT_ASSERT(!put_label || put_label->addr >= word_count);
 
 				/* These structures are ordered by their address. */
-				if (label && label->size == word_count) {
-					label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+				if (next_min_addr == next_label_size) {
+					label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 					label->size = (sljit_uw)(code_ptr - code);
 					label = label->next;
+					next_label_size = SLJIT_GET_NEXT_SIZE(label);
 				}
-				if (jump && jump->addr == word_count) {
-						jump->addr = (sljit_uw)(code_ptr - 4);
-						code_ptr -= detect_jump_type(jump, code_ptr, code, executable_offset);
-						jump = jump->next;
-				}
-				if (const_ && const_->addr == word_count) {
+
+				if (next_min_addr == next_jump_addr) {
+					if (!(jump->flags & JUMP_MOV_ADDR)) {
+						word_count = word_count - 1 + (jump->flags >> JUMP_SIZE_SHIFT);
+						code_ptr = detect_jump_type(jump, code_ptr, code, executable_offset);
+						SLJIT_ASSERT((jump->flags & PATCH_COND) || ((sljit_uw)code_ptr - jump->addr < (jump->flags >> JUMP_SIZE_SHIFT) * sizeof(sljit_ins)));
+					} else {
+						word_count += jump->flags >> JUMP_SIZE_SHIFT;
+						addr = (sljit_sw)code_ptr;
+						code_ptr += mov_addr_get_length(jump, code_ptr, code, executable_offset);
+						jump->addr = (sljit_uw)addr;
+					}
+
+					jump = jump->next;
+					next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+				} else if (next_min_addr == next_const_addr) {
 					const_->addr = (sljit_uw)code_ptr;
 					const_ = const_->next;
+					next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
 				}
-				if (put_label && put_label->addr == word_count) {
-					SLJIT_ASSERT(put_label->label);
-					put_label->addr = (sljit_uw)(code_ptr - 3);
-					code_ptr -= put_label_get_length(put_label, (sljit_uw)(SLJIT_ADD_EXEC_OFFSET(code, executable_offset) + put_label->label->size));
-					put_label = put_label->next;
-				}
-				next_addr = compute_next_addr(label, jump, const_, put_label);
+
+				SLJIT_GET_NEXT_MIN();
 			}
 			code_ptr++;
 			word_count++;
@@ -350,7 +565,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	} while (buf);
 
 	if (label && label->size == word_count) {
-		label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+		label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 		label->size = (sljit_uw)(code_ptr - code);
 		label = label->next;
 	}
@@ -358,61 +573,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)compiler->size);
 
 	jump = compiler->jumps;
 	while (jump) {
-		do {
-			addr = (sljit_sw)((jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target);
-			buf_ptr = (sljit_ins *)jump->addr;
-
-			if (jump->flags & PATCH_B) {
-				addr = (addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset)) >> 2;
-				SLJIT_ASSERT(addr <= 0x1ffffff && addr >= -0x2000000);
-				buf_ptr[0] = ((jump->flags & IS_BL) ? BL : B) | (sljit_ins)(addr & 0x3ffffff);
-				if (jump->flags & IS_COND)
-					buf_ptr[-1] -= (4 << 5);
-				break;
-			}
-			if (jump->flags & PATCH_COND) {
-				addr = (addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset)) >> 2;
-				SLJIT_ASSERT(addr <= 0x3ffff && addr >= -0x40000);
-				buf_ptr[0] = (buf_ptr[0] & ~(sljit_ins)0xffffe0) | (sljit_ins)((addr & 0x7ffff) << 5);
-				break;
-			}
-
-			SLJIT_ASSERT((jump->flags & (PATCH_ABS48 | PATCH_ABS64)) || (sljit_uw)addr <= (sljit_uw)0xffffffff);
-			SLJIT_ASSERT((jump->flags & PATCH_ABS64) || (sljit_uw)addr <= (sljit_uw)0xffffffffffff);
-
-			dst = buf_ptr[0] & 0x1f;
-			buf_ptr[0] = MOVZ | dst | (((sljit_ins)addr & 0xffff) << 5);
-			buf_ptr[1] = MOVK | dst | (((sljit_ins)(addr >> 16) & 0xffff) << 5) | (1 << 21);
-			if (jump->flags & (PATCH_ABS48 | PATCH_ABS64))
-				buf_ptr[2] = MOVK | dst | (((sljit_ins)(addr >> 32) & 0xffff) << 5) | (2 << 21);
-			if (jump->flags & PATCH_ABS64)
-				buf_ptr[3] = MOVK | dst | ((sljit_ins)(addr >> 48) << 5) | (3 << 21);
-		} while (0);
+		generate_jump_or_mov_addr(jump, executable_offset);
 		jump = jump->next;
 	}
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-		addr = (sljit_sw)put_label->label->addr;
-		buf_ptr = (sljit_ins*)put_label->addr;
-
-		buf_ptr[0] |= ((sljit_ins)addr & 0xffff) << 5;
-		buf_ptr[1] |= ((sljit_ins)(addr >> 16) & 0xffff) << 5;
-
-		if (put_label->flags >= 1)
-			buf_ptr[2] |= ((sljit_ins)(addr >> 32) & 0xffff) << 5;
-
-		if (put_label->flags >= 2)
-			buf_ptr[3] |= (sljit_ins)(addr >> 48) << 5;
-
-		put_label = put_label->next;
-	}
-
 	compiler->error = SLJIT_ERR_COMPILED;
 	compiler->executable_offset = executable_offset;
 	compiler->executable_size = (sljit_uw)(code_ptr - code) * sizeof(sljit_ins);
@@ -446,6 +614,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_COPY_F32:
 	case SLJIT_HAS_COPY_F64:
 	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
 		return 1;
 
 	default:
@@ -693,7 +862,6 @@ static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, s
 		imm = (flags & ARG2_IMM) ? arg2 : arg1;
 
 		switch (op) {
-		case SLJIT_MUL:
 		case SLJIT_CLZ:
 		case SLJIT_CTZ:
 		case SLJIT_REV:
@@ -703,6 +871,8 @@ static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, s
 		case SLJIT_REV_S32:
 		case SLJIT_ADDC:
 		case SLJIT_SUBC:
+		case SLJIT_MUL:
+		case SLJIT_MULADD:
 			/* No form with immediate operand (except imm 0, which
 			is represented by a ZERO register). */
 			break;
@@ -957,6 +1127,9 @@ static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, s
 		/* fallthrough */
 	case SLJIT_ROTR:
 		return push_inst(compiler, (RORV ^ inv_bits) | RD(dst) | RN(arg1) | RM(arg2));
+	case SLJIT_MULADD:
+		compiler->status_flags_state = 0;
+		return push_inst(compiler, (MADD ^ inv_bits) | RD(dst) | RN(arg1) | RM(arg2) | RT2(dst));
 	default:
 		SLJIT_UNREACHABLE();
 		return SLJIT_SUCCESS;
@@ -1031,14 +1204,20 @@ static sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 flags, s
 	if (argw <= 0xff && argw >= -0x100)
 		return push_inst(compiler, STURBI | type | RT(reg) | RN(arg) | (((sljit_ins)argw & 0x1ff) << 12));
 
-	if (argw >= 0) {
-		if (argw <= 0xfff0ff && ((argw + 0x100) & 0xfff) <= 0x1ff) {
+	if (((argw + 0x100) & 0xfff) <= 0x1ff && argw <= 0xfff0ff && argw >= -0xfff100) {
+		if (argw >= 0) {
+			if (argw & 0x100)
+				argw += 0x1000;
+
 			FAIL_IF(push_inst(compiler, ADDI | (1 << 22) | RD(tmp_reg) | RN(arg) | (((sljit_ins)argw >> 12) << 10)));
 			return push_inst(compiler, STURBI | type | RT(reg) | RN(tmp_reg) | (((sljit_ins)argw & 0x1ff) << 12));
+		} else {
+			if (!(argw & 0x100))
+				argw -= 0x1000;
+
+			FAIL_IF(push_inst(compiler, SUBI | (1 << 22) | RD(tmp_reg) | RN(arg) | (((sljit_ins)-argw >> 12) << 10)));
+			return push_inst(compiler, STURBI | type | RT(reg) | RN(tmp_reg) | (((sljit_ins)argw & 0x1ff) << 12));
 		}
-	} else if (argw >= -0xfff100 && ((-argw + 0xff) & 0xfff) <= 0x1ff) {
-		FAIL_IF(push_inst(compiler, SUBI | (1 << 22) | RD(tmp_reg) | RN(arg) | (((sljit_ins)-argw >> 12) << 10)));
-		return push_inst(compiler, STURBI | type | RT(reg) | RN(tmp_reg) | (((sljit_ins)argw & 0x1ff) << 12));
 	}
 
 	FAIL_IF(load_immediate(compiler, tmp_reg, argw));
@@ -1051,16 +1230,23 @@ static sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 flags, s
 /* --------------------------------------------------------------------- */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 prev, fprev, saved_regs_size, i, tmp;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
 	sljit_ins offs;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 
 	saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds - saved_arg_count, 2);
 	saved_regs_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
@@ -1226,15 +1412,21 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 saved_regs_size;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 	saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 2);
 	saved_regs_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 
@@ -1380,7 +1572,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 	op = GET_OPCODE(op);
 	switch (op) {
 	case SLJIT_BREAKPOINT:
-		return push_inst(compiler, BRK);
+		return push_inst(compiler, BRK | (0xf000 << 5));
 	case SLJIT_NOP:
 		return push_inst(compiler, NOP);
 	case SLJIT_LMUL_UW:
@@ -1397,6 +1589,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 	case SLJIT_DIV_UW:
 	case SLJIT_DIV_SW:
 		return push_inst(compiler, ((op == SLJIT_DIV_UW ? UDIV : SDIV) ^ inv_bits) | RD(SLJIT_R0) | RN(SLJIT_R0) | RM(SLJIT_R1));
+	case SLJIT_MEMORY_BARRIER:
+		return push_inst(compiler, DMB_SY);
 	case SLJIT_ENDBR:
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
 		return SLJIT_SUCCESS;
@@ -1422,7 +1616,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 	op = GET_OPCODE(op);
 	if (op >= SLJIT_MOV && op <= SLJIT_MOV_P) {
 		/* Both operands are registers. */
-		if (dst_r != TMP_REG1 && FAST_IS_REG(src))
+		if (FAST_IS_REG(dst) && FAST_IS_REG(src))
 			return emit_op_imm(compiler, op | ((op_flags & SLJIT_32) ? INT_OP : 0), dst_r, TMP_REG1, src);
 
 		switch (op) {
@@ -1472,7 +1666,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 		else if (!(src & SLJIT_MEM))
 			dst_r = src;
 		else
-			FAIL_IF(emit_op_mem(compiler, mem_flags, dst_r, src, srcw, TMP_REG1));
+			FAIL_IF(emit_op_mem(compiler, mem_flags, dst_r, src, srcw, TMP_REG2));
 
 		if (dst & SLJIT_MEM)
 			return emit_op_mem(compiler, mem_flags | STORE, dst_r, dst, dstw, TMP_REG2);
@@ -1534,7 +1728,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 		mem_flags = INT_SIZE;
 	}
 
-	if (dst == TMP_REG1)
+	if (dst == TMP_REG2)
 		flags |= UNUSED_RETURN;
 
 	if (src1 & SLJIT_MEM) {
@@ -1572,7 +1766,24 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	CHECK(check_sljit_emit_op2(compiler, op, 1, 0, 0, src1, src1w, src2, src2w));
 
 	SLJIT_SKIP_CHECKS(compiler);
-	return sljit_emit_op2(compiler, op, TMP_REG1, 0, src1, src1w, src2, src2w);
+	return sljit_emit_op2(compiler, op, TMP_REG2, 0, src1, src1w, src2, src2w);
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		SLJIT_SKIP_CHECKS(compiler);
+		return sljit_emit_op2(compiler, op, dst_reg, 0, src1, src1w, src2, src2w);
+	}
+
+	return SLJIT_SUCCESS;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
@@ -1753,18 +1964,18 @@ static sljit_s32 emit_fop_mem(struct sljit_compiler *compiler, sljit_s32 flags,
 			return push_inst(compiler, STR_FR | type | VT(reg)
 				| RN(arg & REG_MASK) | RM(OFFS_REG(arg)) | (argw ? (1 << 12) : 0));
 
-		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG1) | RN(arg & REG_MASK) | RM(OFFS_REG(arg)) | ((sljit_ins)argw << 10)));
-		return push_inst(compiler, STR_FI | type | VT(reg) | RN(TMP_REG1));
+		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG2) | RN(arg & REG_MASK) | RM(OFFS_REG(arg)) | ((sljit_ins)argw << 10)));
+		return push_inst(compiler, STR_FI | type | VT(reg) | RN(TMP_REG2));
 	}
 
 	arg &= REG_MASK;
 
 	if (!arg) {
-		FAIL_IF(load_immediate(compiler, TMP_REG1, argw & ~(0xfff << shift)));
+		FAIL_IF(load_immediate(compiler, TMP_REG2, argw & ~(0xfff << shift)));
 
 		argw = (argw >> shift) & 0xfff;
 
-		return push_inst(compiler, STR_FI | type | VT(reg) | RN(TMP_REG1) | ((sljit_ins)argw << 10));
+		return push_inst(compiler, STR_FI | type | VT(reg) | RN(TMP_REG2) | ((sljit_ins)argw << 10));
 	}
 
 	if (argw >= 0 && (argw & ((1 << shift) - 1)) == 0) {
@@ -1772,18 +1983,18 @@ static sljit_s32 emit_fop_mem(struct sljit_compiler *compiler, sljit_s32 flags,
 			return push_inst(compiler, STR_FI | type | VT(reg) | RN(arg) | ((sljit_ins)argw << (10 - shift)));
 
 		if (argw <= 0xffffff) {
-			FAIL_IF(push_inst(compiler, ADDI | (1 << 22) | RD(TMP_REG1) | RN(arg) | (((sljit_ins)argw >> 12) << 10)));
+			FAIL_IF(push_inst(compiler, ADDI | (1 << 22) | RD(TMP_REG2) | RN(arg) | (((sljit_ins)argw >> 12) << 10)));
 
 			argw = ((argw & 0xfff) >> shift);
-			return push_inst(compiler, STR_FI | type | VT(reg) | RN(TMP_REG1) | ((sljit_ins)argw << 10));
+			return push_inst(compiler, STR_FI | type | VT(reg) | RN(TMP_REG2) | ((sljit_ins)argw << 10));
 		}
 	}
 
 	if (argw <= 255 && argw >= -256)
 		return push_inst(compiler, STUR_FI | type | VT(reg) | RN(arg) | (((sljit_ins)argw & 0x1ff) << 12));
 
-	FAIL_IF(load_immediate(compiler, TMP_REG1, argw));
-	return push_inst(compiler, STR_FR | type | VT(reg) | RN(arg) | RM(TMP_REG1));
+	FAIL_IF(load_immediate(compiler, TMP_REG2, argw));
+	return push_inst(compiler, STR_FR | type | VT(reg) | RN(arg) | RM(TMP_REG2));
 }
 
 static SLJIT_INLINE sljit_s32 sljit_emit_fop1_conv_sw_from_f64(struct sljit_compiler *compiler, sljit_s32 op,
@@ -1910,7 +2121,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV_F64:
 		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
+			if (!(dst & SLJIT_MEM))
 				FAIL_IF(push_inst(compiler, (FMOV ^ inv_bits) | VD(dst_r) | VN(src)));
 			else
 				dst_r = src;
@@ -2180,14 +2391,14 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	if (type < SLJIT_JUMP) {
 		jump->flags |= IS_COND;
 		PTR_FAIL_IF(push_inst(compiler, B_CC | (6 << 5) | get_cc(compiler, type)));
-	}
-	else if (type >= SLJIT_FAST_CALL)
+	} else if (type >= SLJIT_FAST_CALL)
 		jump->flags |= IS_BL;
 
-	PTR_FAIL_IF(emit_imm64_const(compiler, TMP_REG1, 0));
 	jump->addr = compiler->size;
-	PTR_FAIL_IF(push_inst(compiler, ((type >= SLJIT_FAST_CALL) ? BLR : BR) | RN(TMP_REG1)));
+	PTR_FAIL_IF(push_inst(compiler, ((type >= SLJIT_FAST_CALL) ? BLR : BR) | RN(TMP_REG2)));
 
+	/* Maximum number of instructions required for generating a constant. */
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return jump;
 }
 
@@ -2236,9 +2447,11 @@ static SLJIT_INLINE struct sljit_jump* emit_cmp_to0(struct sljit_compiler *compi
 		inv_bits |= 1 << 24;
 
 	PTR_FAIL_IF(push_inst(compiler, (CBZ ^ inv_bits) | (6 << 5) | RT(src)));
-	PTR_FAIL_IF(emit_imm64_const(compiler, TMP_REG1, 0));
 	jump->addr = compiler->size;
-	PTR_FAIL_IF(push_inst(compiler, BR | RN(TMP_REG1)));
+	PTR_FAIL_IF(push_inst(compiler, BR | RN(TMP_REG2)));
+
+	/* Maximum number of instructions required for generating a constant. */
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return jump;
 }
 
@@ -2252,8 +2465,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 	if (src != SLJIT_IMM) {
 		if (src & SLJIT_MEM) {
 			ADJUST_LOCAL_OFFSET(src, srcw);
-			FAIL_IF(emit_op_mem(compiler, WORD_SIZE, TMP_REG1, src, srcw, TMP_REG1));
-			src = TMP_REG1;
+			FAIL_IF(emit_op_mem(compiler, WORD_SIZE, TMP_REG2, src, srcw, TMP_REG2));
+			src = TMP_REG2;
 		}
 		return push_inst(compiler, ((type >= SLJIT_FAST_CALL) ? BLR : BR) | RN(src));
 	}
@@ -2264,9 +2477,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 	set_jump(jump, compiler, JUMP_ADDR | ((type >= SLJIT_FAST_CALL) ? IS_BL : 0));
 	jump->u.target = (sljit_uw)srcw;
 
-	FAIL_IF(emit_imm64_const(compiler, TMP_REG1, 0));
 	jump->addr = compiler->size;
-	return push_inst(compiler, ((type >= SLJIT_FAST_CALL) ? BLR : BR) | RN(TMP_REG1));
+	/* Maximum number of instructions required for generating a constant. */
+	compiler->size += JUMP_MAX_SIZE - 1;
+	return push_inst(compiler, ((type >= SLJIT_FAST_CALL) ? BLR : BR) | RN(TMP_REG2));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_icall(struct sljit_compiler *compiler, sljit_s32 type,
@@ -2314,7 +2528,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 	if (GET_OPCODE(op) < SLJIT_ADD) {
 		FAIL_IF(push_inst(compiler, CSINC | (cc << 12) | RD(dst_r) | RN(TMP_ZERO) | RM(TMP_ZERO)));
 
-		if (dst_r == TMP_REG1) {
+		if (dst & SLJIT_MEM) {
 			mem_flags = (GET_OPCODE(op) == SLJIT_MOV ? WORD_SIZE : INT_SIZE) | STORE;
 			return emit_op_mem(compiler, mem_flags, TMP_REG1, dst, dstw, TMP_REG2);
 		}
@@ -2361,11 +2575,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 	if (src1 == SLJIT_IMM) {
 		if (type & SLJIT_32)
 			src1w = (sljit_s32)src1w;
-		FAIL_IF(load_immediate(compiler, TMP_REG1, src1w));
-		src1 = TMP_REG1;
+		FAIL_IF(load_immediate(compiler, TMP_REG2, src1w));
+		src1 = TMP_REG2;
 	} else if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem(compiler, WORD_SIZE, TMP_REG1, src1, src1w, TMP_REG2));
-		src1 = TMP_REG1;
+		FAIL_IF(emit_op_mem(compiler, WORD_SIZE, TMP_REG2, src1, src1w, TMP_REG2));
+		src1 = TMP_REG2;
 	}
 
 	cc = get_cc(compiler, type & ~SLJIT_32);
@@ -2386,8 +2600,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *com
 	ADJUST_LOCAL_OFFSET(src1, src1w);
 
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_fop_mem(compiler, (type & SLJIT_32) ? INT_SIZE : WORD_SIZE, TMP_FREG1, src1, src1w));
-		src1 = TMP_FREG1;
+		FAIL_IF(emit_fop_mem(compiler, (type & SLJIT_32) ? INT_SIZE : WORD_SIZE, TMP_FREG2, src1, src1w));
+		src1 = TMP_FREG2;
 	}
 
 	cc = get_cc(compiler, type & ~SLJIT_32);
@@ -2554,13 +2768,13 @@ static sljit_s32 sljit_emit_simd_mem_offset(struct sljit_compiler *compiler, slj
 	sljit_s32 mem = *mem_ptr;
 
 	if (SLJIT_UNLIKELY(mem & OFFS_REG_MASK)) {
-		*mem_ptr = TMP_REG1;
-		return push_inst(compiler, ADD | RD(TMP_REG1) | RN(mem & REG_MASK) | RM(OFFS_REG(mem)) | ((sljit_ins)(memw & 0x3) << 10));
+		*mem_ptr = TMP_REG2;
+		return push_inst(compiler, ADD | RD(TMP_REG2) | RN(mem & REG_MASK) | RM(OFFS_REG(mem)) | ((sljit_ins)(memw & 0x3) << 10));
 	}
 
 	if (!(mem & REG_MASK)) {
-		*mem_ptr = TMP_REG1;
-		return load_immediate(compiler, TMP_REG1, memw);
+		*mem_ptr = TMP_REG2;
+		return load_immediate(compiler, TMP_REG2, memw);
 	}
 
 	mem &= REG_MASK;
@@ -2570,11 +2784,11 @@ static sljit_s32 sljit_emit_simd_mem_offset(struct sljit_compiler *compiler, slj
 		return SLJIT_SUCCESS;
 	}
 
-	*mem_ptr = TMP_REG1;
+	*mem_ptr = TMP_REG2;
 
 	if (memw < -0xffffff || memw > 0xffffff) {
-		FAIL_IF(load_immediate(compiler, TMP_REG1, memw));
-		return push_inst(compiler, ADD | RD(TMP_REG1) | RN(TMP_REG1) | RM(mem));
+		FAIL_IF(load_immediate(compiler, TMP_REG2, memw));
+		return push_inst(compiler, ADD | RD(TMP_REG2) | RN(TMP_REG2) | RM(mem));
 	}
 
 	ins = ADDI;
@@ -2585,20 +2799,20 @@ static sljit_s32 sljit_emit_simd_mem_offset(struct sljit_compiler *compiler, slj
 	}
 
 	if (memw > 0xfff) {
-		FAIL_IF(push_inst(compiler, ins | (1 << 22) | RD(TMP_REG1) | RN(mem) | ((sljit_ins)(memw >> 12) << 10)));
+		FAIL_IF(push_inst(compiler, ins | (1 << 22) | RD(TMP_REG2) | RN(mem) | ((sljit_ins)(memw >> 12) << 10)));
 
 		memw &= 0xfff;
 		if (memw == 0)
 			return SLJIT_SUCCESS;
 
-		mem = TMP_REG1;
+		mem = TMP_REG2;
 	}
 
-	return push_inst(compiler, ins | RD(TMP_REG1) | RN(mem) | ((sljit_ins)memw << 10));
+	return push_inst(compiler, ins | RD(TMP_REG2) | RN(mem) | ((sljit_ins)memw << 10));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -2606,7 +2820,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_mov(compiler, type, freg, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -2621,9 +2835,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 
 	if (!(srcdst & SLJIT_MEM)) {
 		if (type & SLJIT_SIMD_STORE)
-			ins = VD(srcdst) | VN(freg) | VM(freg);
+			ins = VD(srcdst) | VN(vreg) | VM(vreg);
 		else
-			ins = VD(freg) | VN(srcdst) | VM(srcdst);
+			ins = VD(vreg) | VN(srcdst) | VM(srcdst);
 
 		if (reg_size == 4)
 			ins |= (1 << 30);
@@ -2641,7 +2855,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	if (reg_size == 4)
 		ins |= (1 << 30);
 
-	return push_inst(compiler, ins | ((sljit_ins)elem_size << 10) | RN(srcdst) | VT(freg));
+	return push_inst(compiler, ins | ((sljit_ins)elem_size << 10) | RN(srcdst) | VT(vreg));
 }
 
 static sljit_ins simd_get_imm(sljit_s32 elem_size, sljit_uw value)
@@ -2746,7 +2960,7 @@ static sljit_ins simd_get_imm(sljit_s32 elem_size, sljit_uw value)
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -2754,7 +2968,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 	sljit_ins ins, imm;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_replicate(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -2775,7 +2989,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		if (reg_size == 4)
 			ins |= (sljit_ins)1 << 30;
 
-		return push_inst(compiler, LD1R | ins | RN(src) | VT(freg));
+		return push_inst(compiler, LD1R | ins | RN(src) | VT(vreg));
 	}
 
 	ins = (sljit_ins)1 << (16 + elem_size);
@@ -2785,9 +2999,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		if (src == SLJIT_IMM)
-			return push_inst(compiler, MOVI | (ins & ((sljit_ins)1 << 30)) | VD(freg));
+			return push_inst(compiler, MOVI | (ins & ((sljit_ins)1 << 30)) | VD(vreg));
 
-		return push_inst(compiler, DUP_e | ins | VD(freg) | VN(src));
+		return push_inst(compiler, DUP_e | ins | VD(vreg) | VN(src));
 	}
 
 	if (src == SLJIT_IMM) {
@@ -2799,18 +3013,18 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		if (imm != ~(sljit_ins)0) {
 			imm |= ins & ((sljit_ins)1 << 30);
 
-			return push_inst(compiler, MOVI | imm | VD(freg));
+			return push_inst(compiler, MOVI | imm | VD(vreg));
 		}
 
-		FAIL_IF(load_immediate(compiler, TMP_REG1, srcw));
-		src = TMP_REG1;
+		FAIL_IF(load_immediate(compiler, TMP_REG2, srcw));
+		src = TMP_REG2;
 	}
 
-	return push_inst(compiler, DUP_g | ins | VD(freg) | RN(src));
+	return push_inst(compiler, DUP_g | ins | VD(vreg) | RN(src));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -2818,7 +3032,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, freg, lane_index, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -2834,13 +3048,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 	if (type & SLJIT_SIMD_LANE_ZERO) {
 		ins = (reg_size == 3) ? 0 : ((sljit_ins)1 << 30);
 
-		if ((type & SLJIT_SIMD_FLOAT) && freg == srcdst) {
-			FAIL_IF(push_inst(compiler, ORR_v | ins | VD(TMP_FREG1) | VN(freg) | VM(freg)));
+		if ((type & SLJIT_SIMD_FLOAT) && vreg == srcdst) {
+			FAIL_IF(push_inst(compiler, ORR_v | ins | VD(TMP_FREG1) | VN(vreg) | VM(vreg)));
 			srcdst = TMP_FREG1;
 			srcdstw = 0;
 		}
 
-		FAIL_IF(push_inst(compiler, MOVI | ins | VD(freg)));
+		FAIL_IF(push_inst(compiler, MOVI | ins | VD(vreg)));
 	}
 
 	if (srcdst & SLJIT_MEM) {
@@ -2856,14 +3070,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		lane_index = lane_index << elem_size;
 		ins |= (sljit_ins)(((lane_index & 0x8) << 27) | ((lane_index & 0x7) << 10));
 
-		return push_inst(compiler, ((type & SLJIT_SIMD_STORE) ? ST1_s : LD1_s) | ins | RN(srcdst) | VT(freg));
+		return push_inst(compiler, ((type & SLJIT_SIMD_STORE) ? ST1_s : LD1_s) | ins | RN(srcdst) | VT(vreg));
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		if (type & SLJIT_SIMD_STORE)
-			ins = INS_e | ((sljit_ins)1 << (16 + elem_size)) | ((sljit_ins)lane_index << (11 + elem_size)) | VD(srcdst) | VN(freg);
+			ins = INS_e | ((sljit_ins)1 << (16 + elem_size)) | ((sljit_ins)lane_index << (11 + elem_size)) | VD(srcdst) | VN(vreg);
 		else
-			ins = INS_e | ((((sljit_ins)lane_index << 1) | 1) << (16 + elem_size)) | VD(freg) | VN(srcdst);
+			ins = INS_e | ((((sljit_ins)lane_index << 1) | 1) << (16 + elem_size)) | VD(vreg) | VN(srcdst);
 
 		return push_inst(compiler, ins);
 	}
@@ -2872,12 +3086,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		if (elem_size < 3)
 			srcdstw &= ((sljit_sw)1 << (((sljit_sw)1 << elem_size) << 3)) - 1;
 
-		FAIL_IF(load_immediate(compiler, TMP_REG1, srcdstw));
-		srcdst = TMP_REG1;
+		FAIL_IF(load_immediate(compiler, TMP_REG2, srcdstw));
+		srcdst = TMP_REG2;
 	}
 
 	if (type & SLJIT_SIMD_STORE) {
-		ins = RD(srcdst) | VN(freg);
+		ins = RD(srcdst) | VN(vreg);
 
 		if ((type & SLJIT_SIMD_LANE_SIGNED) && (elem_size < 2 || (elem_size == 2 && !(type & SLJIT_32)))) {
 			ins |= SMOV;
@@ -2887,7 +3101,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		} else
 			ins |= UMOV;
 	} else
-		ins = INS | VD(freg) | RN(srcdst);
+		ins = INS | VD(vreg) | RN(srcdst);
 
 	if (elem_size == 3)
 		ins |= (sljit_ins)1 << 30;
@@ -2896,7 +3110,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -2904,7 +3118,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, freg, src, src_lane_index));
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
 
 	if (reg_size != 3 && reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -2920,11 +3134,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	if (reg_size == 4)
 		ins |= (sljit_ins)1 << 30;
 
-	return push_inst(compiler, DUP_e | ins | VD(freg) | VN(src));
+	return push_inst(compiler, DUP_e | ins | VD(vreg) | VN(src));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -2932,7 +3146,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 	sljit_s32 elem2_size = SLJIT_SIMD_GET_ELEM2_SIZE(type);
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_extend(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -2949,28 +3163,28 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src, srcw));
 
 		if (reg_size == 4 && elem2_size - elem_size == 1)
-			FAIL_IF(push_inst(compiler, LD1 | ((sljit_ins)elem_size << 10) | RN(src) | VT(freg)));
+			FAIL_IF(push_inst(compiler, LD1 | ((sljit_ins)elem_size << 10) | RN(src) | VT(vreg)));
 		else
-			FAIL_IF(push_inst(compiler, LD1_s | ((sljit_ins)0x2000 << (reg_size - elem2_size + elem_size)) | RN(src) | VT(freg)));
-		src = freg;
+			FAIL_IF(push_inst(compiler, LD1_s | ((sljit_ins)0x2000 << (reg_size - elem2_size + elem_size)) | RN(src) | VT(vreg)));
+		src = vreg;
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		SLJIT_ASSERT(reg_size == 4);
-		return push_inst(compiler, FCVTL | (1 << 22) | VD(freg) | VN(src));
+		return push_inst(compiler, FCVTL | (1 << 22) | VD(vreg) | VN(src));
 	}
 
 	do {
 		FAIL_IF(push_inst(compiler, ((type & SLJIT_SIMD_EXTEND_SIGNED) ? SSHLL : USHLL)
-			| ((sljit_ins)1 << (19 + elem_size)) | VD(freg) | VN(src)));
-		src = freg;
+			| ((sljit_ins)1 << (19 + elem_size)) | VD(vreg) | VN(src)));
+		src = vreg;
 	} while (++elem_size < elem2_size);
 
 	return SLJIT_SUCCESS;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -2979,7 +3193,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	sljit_s32 dst_r;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_sign(compiler, type, freg, dst, dstw));
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
 
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
@@ -3014,7 +3228,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	if (reg_size == 4)
 		ins |= (1 << 30);
 
-	FAIL_IF(push_inst(compiler, ins | VD(TMP_FREG1) | VN(freg)));
+	FAIL_IF(push_inst(compiler, ins | VD(TMP_FREG1) | VN(vreg)));
 
 	if (reg_size == 4 && elem_size > 0)
 		FAIL_IF(push_inst(compiler, XTN | ((sljit_ins)(elem_size - 1) << 22) | VD(TMP_FREG1) | VN(TMP_FREG1)));
@@ -3030,7 +3244,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 
 	FAIL_IF(push_inst(compiler, USRA | (1 << 30) | (imms << 16) | VD(TMP_FREG1) | VN(TMP_FREG1)));
 
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
+	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 	ins = (0x1 << 16);
 
 	if (reg_size == 4 && elem_size == 0) {
@@ -3040,21 +3254,22 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 
 	FAIL_IF(push_inst(compiler, UMOV | ins | RD(dst_r) | VN(TMP_FREG1)));
 
-	if (dst_r == TMP_REG1)
-		return emit_op_mem(compiler, STORE | ((type & SLJIT_32) ? INT_SIZE : WORD_SIZE), TMP_REG1, dst, dstw, TMP_REG2);
+	if (dst_r == TMP_REG2)
+		return emit_op_mem(compiler, STORE | ((type & SLJIT_32) ? INT_SIZE : WORD_SIZE), TMP_REG2, dst, dstw, TMP_REG1);
 
 	return SLJIT_SUCCESS;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg)
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
 	sljit_ins ins = 0;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_freg, src1_freg, src2_freg));
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src2, src2w);
 
 	if (reg_size != 3 && reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -3062,6 +3277,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 	if ((type & SLJIT_SIMD_FLOAT) && (elem_size < 2 || elem_size > 3))
 		return SLJIT_ERR_UNSUPPORTED;
 
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
 	switch (SLJIT_SIMD_GET_OPCODE(type)) {
 	case SLJIT_SIMD_OP2_AND:
 		ins = AND_v;
@@ -3072,15 +3290,24 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 	case SLJIT_SIMD_OP2_XOR:
 		ins = EOR_v;
 		break;
+	case SLJIT_SIMD_OP2_SHUFFLE:
+		ins = TBL_v;
+		break;
 	}
 
-	if (type & SLJIT_SIMD_TEST)
-		return SLJIT_SUCCESS;
+	if (src2 & SLJIT_MEM) {
+		if (elem_size > 3)
+			elem_size = 3;
+
+		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src2, src2w));
+		push_inst(compiler,  LD1 | (reg_size == 4 ? (1 << 30) : 0) | ((sljit_ins)elem_size << 10) | RN(src2) | VT(TMP_FREG1));
+		src2 = TMP_FREG1;
+	}
 
 	if (reg_size == 4)
 		ins |= (sljit_ins)1 << 30;
 
-	return push_inst(compiler, ins | VD(dst_freg) | VN(src1_freg) | VM(src2_freg));
+	return push_inst(compiler, ins | VD(dst_vreg) | VN(src1_vreg) | VM(src2));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler, sljit_s32 op,
@@ -3092,39 +3319,55 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
 
-#ifdef __ARM_FEATURE_ATOMICS
-	switch (GET_OPCODE(op)) {
-	case SLJIT_MOV32:
-	case SLJIT_MOV_U32:
-		ins = LDR ^ (1 << 30);
-		break;
-	case SLJIT_MOV_U16:
-		ins = LDRH;
-		break;
-	case SLJIT_MOV_U8:
-		ins = LDRB;
-		break;
-	default:
-		ins = LDR;
-		break;
-	}
-#else /* !__ARM_FEATURE_ATOMICS */
-	switch (GET_OPCODE(op)) {
-	case SLJIT_MOV32:
-	case SLJIT_MOV_U32:
-		ins = LDXR ^ (1 << 30);
-		break;
-	case SLJIT_MOV_U8:
-		ins = LDXRB;
-		break;
-	case SLJIT_MOV_U16:
-		ins = LDXRH;
-		break;
-	default:
-		ins = LDXR;
-		break;
-	}
+#ifndef __ARM_FEATURE_ATOMICS
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
 #endif /* ARM_FEATURE_ATOMICS */
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+	case SLJIT_MOV_S16:
+	case SLJIT_MOV_S32:
+		return SLJIT_ERR_UNSUPPORTED;
+
+	case SLJIT_MOV32:
+	case SLJIT_MOV_U32:
+#ifdef __ARM_FEATURE_ATOMICS
+		if (!(op & SLJIT_ATOMIC_USE_LS))
+			ins = LDR ^ (1 << 30);
+		else
+#endif /* ARM_FEATURE_ATOMICS */
+			ins = LDXR ^ (1 << 30);
+		break;
+	case SLJIT_MOV_U8:
+#ifdef __ARM_FEATURE_ATOMICS
+		if (!(op & SLJIT_ATOMIC_USE_LS))
+			ins = LDRB;
+		else
+#endif /* ARM_FEATURE_ATOMICS */
+			ins = LDXRB;
+		break;
+	case SLJIT_MOV_U16:
+#ifdef __ARM_FEATURE_ATOMICS
+		if (!(op & SLJIT_ATOMIC_USE_LS))
+			ins = LDRH;
+		else
+#endif /* ARM_FEATURE_ATOMICS */
+			ins = LDXRH;
+		break;
+	default:
+#ifdef __ARM_FEATURE_ATOMICS
+		if (!(op & SLJIT_ATOMIC_USE_LS))
+			ins = LDR;
+		else
+#endif /* ARM_FEATURE_ATOMICS */
+			ins = LDXR;
+		break;
+	}
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	return push_inst(compiler, ins | RN(mem_reg) | RT(dst_reg));
 }
 
@@ -3134,55 +3377,65 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	sljit_s32 temp_reg)
 {
 	sljit_ins ins;
-	sljit_s32 tmp = temp_reg;
 	sljit_ins cmp = 0;
-	sljit_ins inv_bits = W_OP;
 
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
 
 #ifdef __ARM_FEATURE_ATOMICS
-	if (op & SLJIT_SET_ATOMIC_STORED)
-		cmp = (SUBS ^ W_OP) | RD(TMP_ZERO);
+	if (!(op & SLJIT_ATOMIC_USE_LS)) {
+		if (op & SLJIT_SET_ATOMIC_STORED)
+			cmp = (SUBS ^ W_OP) | RD(TMP_ZERO);
+
+		switch (GET_OPCODE(op)) {
+		case SLJIT_MOV_S8:
+		case SLJIT_MOV_S16:
+		case SLJIT_MOV_S32:
+			return SLJIT_ERR_UNSUPPORTED;
+
+		case SLJIT_MOV32:
+		case SLJIT_MOV_U32:
+			ins = CAS ^ (1 << 30);
+			break;
+		case SLJIT_MOV_U16:
+			ins = CASH;
+			break;
+		case SLJIT_MOV_U8:
+			ins = CASB;
+			break;
+		default:
+			ins = CAS;
+			if (cmp)
+				cmp ^= W_OP;
+			break;
+		}
+
+		if (op & SLJIT_ATOMIC_TEST)
+			return SLJIT_SUCCESS;
 
-	switch (GET_OPCODE(op)) {
-	case SLJIT_MOV32:
-	case SLJIT_MOV_U32:
-		ins = CAS ^ (1 << 30);
-		break;
-	case SLJIT_MOV_U16:
-		ins = CASH;
-		break;
-	case SLJIT_MOV_U8:
-		ins = CASB;
-		break;
-	default:
-		ins = CAS;
-		inv_bits = 0;
 		if (cmp)
-			cmp ^= W_OP;
-		break;
-	}
+			FAIL_IF(push_inst(compiler, ((MOV ^ W_OP) ^ (cmp & W_OP)) | RM(temp_reg) | RD(TMP_REG2)));
 
-	if (cmp) {
-		FAIL_IF(push_inst(compiler, (MOV ^ inv_bits) | RM(temp_reg) | RD(TMP_REG1)));
-		tmp = TMP_REG1;
-	}
-	FAIL_IF(push_inst(compiler, ins | RM(tmp) | RN(mem_reg) | RD(src_reg)));
-	if (!cmp)
-		return SLJIT_SUCCESS;
+		FAIL_IF(push_inst(compiler, ins | RM(temp_reg) | RN(mem_reg) | RD(src_reg)));
+		if (!cmp)
+			return SLJIT_SUCCESS;
 
-	FAIL_IF(push_inst(compiler, cmp | RM(tmp) | RN(temp_reg)));
-	FAIL_IF(push_inst(compiler, (CSET ^ inv_bits) | RD(tmp)));
-	return push_inst(compiler, cmp | RM(tmp) | RN(TMP_ZERO));
+		return push_inst(compiler, cmp | RM(TMP_REG2) | RN(temp_reg));
+	}
 #else /* !__ARM_FEATURE_ATOMICS */
-	SLJIT_UNUSED_ARG(tmp);
-	SLJIT_UNUSED_ARG(inv_bits);
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+#endif /* __ARM_FEATURE_ATOMICS */
 
 	if (op & SLJIT_SET_ATOMIC_STORED)
 		cmp = (SUBI ^ W_OP) | (1 << 29);
 
 	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+	case SLJIT_MOV_S16:
+	case SLJIT_MOV_S32:
+		return SLJIT_ERR_UNSUPPORTED;
+
 	case SLJIT_MOV32:
 	case SLJIT_MOV_U32:
 		ins = STXR ^ (1 << 30);
@@ -3198,9 +3451,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 		break;
 	}
 
-	FAIL_IF(push_inst(compiler, ins | RM(TMP_REG1) | RN(mem_reg) | RT(src_reg)));
-	return cmp ? push_inst(compiler, cmp | RD(TMP_ZERO) | RN(TMP_REG1)) : SLJIT_SUCCESS;
-#endif /* __ARM_FEATURE_ATOMICS */
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	FAIL_IF(push_inst(compiler, ins | RM(TMP_REG2) | RN(mem_reg) | RT(src_reg)));
+	if (!cmp)
+		return SLJIT_SUCCESS;
+	return push_inst(compiler, cmp | RD(TMP_ZERO) | RN(TMP_REG2));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_local_base(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw offset)
@@ -3264,26 +3521,28 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_s32 dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-	PTR_FAIL_IF(emit_imm64_const(compiler, dst_r, 0));
+	PTR_FAIL_IF(push_inst(compiler, RD(dst_r)));
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 1);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 1);
+
+	compiler->size += 3;
 
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op_mem(compiler, WORD_SIZE | STORE, dst_r, dst, dstw, TMP_REG2));
 
-	return put_label;
+	return jump;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_target, sljit_sw executable_offset)
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeARM_T2_32.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_T2_32.c
similarity index 86%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeARM_T2_32.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_T2_32.c
index c27c50dd..d8058ab6 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeARM_T2_32.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeARM_T2_32.c
@@ -138,6 +138,7 @@ static const sljit_u8 freg_ebit_map[((SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2) << 1)
 #define CMPI_W		0xf1b00f00
 #define CMP_X		0x4500
 #define CMP_W		0xebb00f00
+#define DMB_SY		0xf3bf8f5f
 #define EORI		0xf0800000
 #define EORS		0x4040
 #define EOR_W		0xea800000
@@ -157,6 +158,7 @@ static const sljit_u8 freg_ebit_map[((SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2) << 1)
 #define LSRSI		0x0800
 #define LSR_W		0xfa20f000
 #define LSR_WI		0xea4f0010
+#define MLA		0xfb000000
 #define MOV		0x4600
 #define MOVS		0x0000
 #define MOVSI		0x2000
@@ -252,6 +254,7 @@ static const sljit_u8 freg_ebit_map[((SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2) << 1)
 #define VST1_s		0xf9800000
 #define VSTR_F32	0xed000a00
 #define VSUB_F32	0xee300a40
+#define VTBL		0xffb00800
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 
@@ -263,11 +266,28 @@ static sljit_s32 function_check_is_freg(struct sljit_compiler *compiler, sljit_s
 	if (is_32 && fr >= SLJIT_F64_SECOND(SLJIT_FR0))
 		fr -= SLJIT_F64_SECOND(0);
 
-	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + compiler->fscratches))
-		|| (fr > (SLJIT_FS0 - compiler->fsaveds) && fr <= SLJIT_FS0)
+	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + compiler->real_fscratches))
+		|| (fr > (SLJIT_FS0 - compiler->real_fsaveds) && fr <= SLJIT_FS0)
 		|| (fr >= SLJIT_TMP_FREGISTER_BASE && fr < (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS));
 }
 
+static sljit_s32 function_check_is_vreg(struct sljit_compiler *compiler, sljit_s32 vr, sljit_s32 type)
+{
+	sljit_s32 vr_low = vr;
+
+	if (compiler->scratches == -1)
+		return 0;
+
+	if (SLJIT_SIMD_GET_REG_SIZE(type) == 4) {
+		vr += (vr & 0x1);
+		vr_low = vr - 1;
+	}
+
+	return (vr >= SLJIT_VR0 && vr < (SLJIT_VR0 + compiler->vscratches))
+		|| (vr_low > (SLJIT_VS0 - compiler->vsaveds) && vr_low <= SLJIT_VS0)
+		|| (vr >= SLJIT_TMP_VREGISTER_BASE && vr < (SLJIT_TMP_VREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_VECTOR_REGISTERS));
+}
+
 #endif /* SLJIT_ARGUMENT_CHECKS */
 
 static sljit_s32 push_inst16(struct sljit_compiler *compiler, sljit_ins inst)
@@ -292,7 +312,7 @@ static sljit_s32 push_inst32(struct sljit_compiler *compiler, sljit_ins inst)
 	return SLJIT_SUCCESS;
 }
 
-static SLJIT_INLINE sljit_s32 emit_imm32_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_uw imm)
+static sljit_s32 emit_imm32_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_uw imm)
 {
 	FAIL_IF(push_inst32(compiler, MOVW | RD4(dst)
 		| COPY_BITS(imm, 12, 16, 4) | COPY_BITS(imm, 11, 26, 1) | COPY_BITS(imm, 8, 12, 3) | (imm & 0xff)));
@@ -300,137 +320,285 @@ static SLJIT_INLINE sljit_s32 emit_imm32_const(struct sljit_compiler *compiler,
 		| COPY_BITS(imm, 12 + 16, 16, 4) | COPY_BITS(imm, 11 + 16, 26, 1) | COPY_BITS(imm, 8 + 16, 12, 3) | ((imm & 0xff0000) >> 16));
 }
 
-static SLJIT_INLINE void modify_imm32_const(sljit_u16 *inst, sljit_uw new_imm)
+/* Dst must be in bits[11-8] */
+static void set_imm32_const(sljit_u16 *inst, sljit_ins dst, sljit_uw new_imm)
 {
-	sljit_ins dst = inst[1] & 0x0f00;
-	SLJIT_ASSERT(((inst[0] & 0xfbf0) == (MOVW >> 16)) && ((inst[2] & 0xfbf0) == (MOVT >> 16)) && dst == (inst[3] & 0x0f00));
 	inst[0] = (sljit_u16)((MOVW >> 16) | COPY_BITS(new_imm, 12, 0, 4) | COPY_BITS(new_imm, 11, 10, 1));
 	inst[1] = (sljit_u16)(dst | COPY_BITS(new_imm, 8, 12, 3) | (new_imm & 0xff));
 	inst[2] = (sljit_u16)((MOVT >> 16) | COPY_BITS(new_imm, 12 + 16, 0, 4) | COPY_BITS(new_imm, 11 + 16, 10, 1));
 	inst[3] = (sljit_u16)(dst | COPY_BITS(new_imm, 8 + 16, 12, 3) | ((new_imm & 0xff0000) >> 16));
 }
 
-static SLJIT_INLINE sljit_s32 detect_jump_type(struct sljit_jump *jump, sljit_u16 *code_ptr, sljit_u16 *code, sljit_sw executable_offset)
+static SLJIT_INLINE void modify_imm32_const(sljit_u16 *inst, sljit_uw new_imm)
+{
+	sljit_ins dst = inst[1] & 0x0f00;
+	SLJIT_ASSERT(((inst[0] & 0xfbf0) == (MOVW >> 16)) && ((inst[2] & 0xfbf0) == (MOVT >> 16)) && dst == (inst[3] & 0x0f00));
+	set_imm32_const(inst, dst, new_imm);
+}
+
+static SLJIT_INLINE sljit_u16* detect_jump_type(struct sljit_jump *jump, sljit_u16 *code_ptr, sljit_u16 *code, sljit_sw executable_offset)
 {
 	sljit_sw diff;
+	sljit_uw target_addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_uw orig_addr = jump->addr;
+	SLJIT_UNUSED_ARG(executable_offset);
 
+	jump->addr = jump_addr;
 	if (jump->flags & SLJIT_REWRITABLE_JUMP)
-		return 0;
+		goto exit;
 
 	if (jump->flags & JUMP_ADDR) {
 		/* Branch to ARM code is not optimized yet. */
 		if (!(jump->u.target & 0x1))
-			return 0;
-		diff = ((sljit_sw)jump->u.target - (sljit_sw)(code_ptr + 2) - executable_offset) >> 1;
-	}
-	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		diff = ((sljit_sw)(code + jump->u.label->size) - (sljit_sw)(code_ptr + 2)) >> 1;
+			goto exit;
+		target_addr = jump->u.target;
+	} else {
+		SLJIT_ASSERT(jump->u.label != NULL);
+		target_addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > orig_addr)
+			jump_addr = (sljit_uw)(code + orig_addr);
 	}
 
+	diff = (sljit_sw)target_addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr + 4, executable_offset);
+
 	if (jump->flags & IS_COND) {
 		SLJIT_ASSERT(!(jump->flags & IS_BL));
-		if (diff <= 127 && diff >= -128) {
+		/* Size of the prefix IT instruction. */
+		diff += SSIZE_OF(u16);
+		if (diff <= 0xff && diff >= -0x100) {
 			jump->flags |= PATCH_TYPE1;
-			return 5;
+			jump->addr = (sljit_uw)(code_ptr - 1);
+			return code_ptr - 1;
 		}
-		if (diff <= 524287 && diff >= -524288) {
+		if (diff <= 0xfffff && diff >= -0x100000) {
 			jump->flags |= PATCH_TYPE2;
-			return 4;
+			jump->addr = (sljit_uw)(code_ptr - 1);
+			return code_ptr;
 		}
-		/* +1 comes from the prefix IT instruction. */
-		diff--;
-		if (diff <= 8388607 && diff >= -8388608) {
-			jump->flags |= PATCH_TYPE3;
-			return 3;
-		}
-	}
-	else if (jump->flags & IS_BL) {
-		if (diff <= 8388607 && diff >= -8388608) {
-			jump->flags |= PATCH_BL;
-			return 3;
-		}
-	}
-	else {
-		if (diff <= 1023 && diff >= -1024) {
-			jump->flags |= PATCH_TYPE4;
-			return 4;
-		}
-		if (diff <= 8388607 && diff >= -8388608) {
+		diff -= SSIZE_OF(u16);
+	} else if (jump->flags & IS_BL) {
+		/* Branch and link. */
+		if (diff <= 0xffffff && diff >= -0x1000000) {
 			jump->flags |= PATCH_TYPE5;
-			return 3;
+			return code_ptr + 1;
 		}
+		goto exit;
+	} else if (diff <= 0x7ff && diff >= -0x800) {
+		jump->flags |= PATCH_TYPE3;
+		return code_ptr;
 	}
 
-	return 0;
+	if (diff <= 0xffffff && diff >= -0x1000000) {
+		jump->flags |= PATCH_TYPE4;
+		return code_ptr + 1;
+	}
+
+exit:
+	code_ptr[4] = code_ptr[0];
+
+	if (jump->flags & IS_COND) {
+		code_ptr[3] = code_ptr[-1];
+		jump->addr = (sljit_uw)(code_ptr - 1);
+	}
+
+	return code_ptr + 4;
 }
 
-static SLJIT_INLINE void set_jump_instruction(struct sljit_jump *jump, sljit_sw executable_offset)
+static SLJIT_INLINE sljit_sw mov_addr_get_length(struct sljit_jump *jump, sljit_u16 *code_ptr, sljit_u16 *code, sljit_sw executable_offset)
+{
+	sljit_uw addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_sw diff;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else {
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > jump->addr)
+			jump_addr = (sljit_uw)(code + jump->addr);
+	}
+
+	/* The pc+4 offset is represented by the 2 * SSIZE_OF(sljit_u16) below. */
+	diff = (sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
+
+	/* Note: ADR with imm8 does not set the last bit (Thumb2 flag). */
+
+	if (diff <= 0xffd + 2 * SSIZE_OF(u16) && diff >= -0xfff + 2 * SSIZE_OF(u16)) {
+		jump->flags |= PATCH_TYPE6;
+		return 1;
+	}
+
+	return 3;
+}
+
+static SLJIT_INLINE void generate_jump_or_mov_addr(struct sljit_jump *jump, sljit_sw executable_offset)
 {
 	sljit_s32 type = (jump->flags >> 4) & 0xf;
+	sljit_u16 *jump_inst = (sljit_u16*)jump->addr;
 	sljit_sw diff;
-	sljit_u16 *jump_inst;
-	sljit_s32 s, j1, j2;
+	sljit_ins ins;
+
+	diff = (sljit_sw)((jump->flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr);
 
 	if (SLJIT_UNLIKELY(type == 0)) {
-		modify_imm32_const((sljit_u16*)jump->addr, (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target);
+		ins = (jump->flags & JUMP_MOV_ADDR) ? *jump_inst : RDN3(TMP_REG1);
+		set_imm32_const((sljit_u16*)jump->addr, ins, (sljit_uw)diff);
 		return;
 	}
 
-	if (jump->flags & JUMP_ADDR) {
-		SLJIT_ASSERT(jump->u.target & 0x1);
-		diff = ((sljit_sw)jump->u.target - (sljit_sw)(jump->addr + sizeof(sljit_u32)) - executable_offset) >> 1;
+	if (SLJIT_UNLIKELY(type == 6)) {
+		SLJIT_ASSERT(jump->flags & JUMP_MOV_ADDR);
+		diff -= (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_inst + 2, executable_offset) & ~(sljit_sw)0x3;
+
+		SLJIT_ASSERT(diff <= 0xfff && diff >= -0xfff);
+
+		ins = ADDWI >> 16;
+		if (diff <= 0) {
+			diff = -diff;
+			ins = SUBWI >> 16;
+		}
+
+		jump_inst[1] = (sljit_u16)(jump_inst[0] | COPY_BITS(diff, 8, 12, 3) | (diff & 0xff));
+		jump_inst[0] = (sljit_u16)(ins | 0xf | COPY_BITS(diff, 11, 10, 1));
+		return;
 	}
-	else {
-		SLJIT_ASSERT(jump->u.label->addr & 0x1);
-		diff = ((sljit_sw)(jump->u.label->addr) - (sljit_sw)(jump->addr + sizeof(sljit_u32)) - executable_offset) >> 1;
-	}
-	jump_inst = (sljit_u16*)jump->addr;
+
+	SLJIT_ASSERT((diff & 0x1) != 0 && !(jump->flags & JUMP_MOV_ADDR));
+	diff = (diff - (sljit_sw)(jump->addr + sizeof(sljit_u32)) - executable_offset) >> 1;
 
 	switch (type) {
 	case 1:
 		/* Encoding T1 of 'B' instruction */
-		SLJIT_ASSERT(diff <= 127 && diff >= -128 && (jump->flags & IS_COND));
+		SLJIT_ASSERT(diff <= 0x7f && diff >= -0x80 && (jump->flags & IS_COND));
 		jump_inst[0] = (sljit_u16)(0xd000 | (jump->flags & 0xf00) | ((sljit_ins)diff & 0xff));
 		return;
 	case 2:
 		/* Encoding T3 of 'B' instruction */
-		SLJIT_ASSERT(diff <= 524287 && diff >= -524288 && (jump->flags & IS_COND));
+		SLJIT_ASSERT(diff <= 0x7ffff && diff >= -0x80000 && (jump->flags & IS_COND));
 		jump_inst[0] = (sljit_u16)(0xf000 | COPY_BITS(jump->flags, 8, 6, 4) | COPY_BITS(diff, 11, 0, 6) | COPY_BITS(diff, 19, 10, 1));
 		jump_inst[1] = (sljit_u16)(0x8000 | COPY_BITS(diff, 17, 13, 1) | COPY_BITS(diff, 18, 11, 1) | ((sljit_ins)diff & 0x7ff));
 		return;
 	case 3:
-		SLJIT_ASSERT(jump->flags & IS_COND);
-		*jump_inst++ = (sljit_u16)(IT | ((jump->flags >> 4) & 0xf0) | 0x8);
-		diff--;
-		type = 5;
-		break;
-	case 4:
 		/* Encoding T2 of 'B' instruction */
-		SLJIT_ASSERT(diff <= 1023 && diff >= -1024 && !(jump->flags & IS_COND));
+		SLJIT_ASSERT(diff <= 0x3ff && diff >= -0x400 && !(jump->flags & IS_COND));
 		jump_inst[0] = (sljit_u16)(0xe000 | (diff & 0x7ff));
 		return;
 	}
 
-	SLJIT_ASSERT(diff <= 8388607 && diff >= -8388608);
+	SLJIT_ASSERT(diff <= 0x7fffff && diff >= -0x800000);
 
-	/* Really complex instruction form for branches. */
-	s = (diff >> 23) & 0x1;
-	j1 = (~(diff >> 22) ^ s) & 0x1;
-	j2 = (~(diff >> 21) ^ s) & 0x1;
-	jump_inst[0] = (sljit_u16)(0xf000 | ((sljit_ins)s << 10) | COPY_BITS(diff, 11, 0, 10));
-	jump_inst[1] = (sljit_u16)((j1 << 13) | (j2 << 11) | (diff & 0x7ff));
+	/* Really complex instruction form for branches. Negate with sign bit. */
+	diff ^= ((diff >> 2) & 0x600000) ^ 0x600000;
+
+	jump_inst[0] = (sljit_u16)(0xf000 | COPY_BITS(diff, 11, 0, 10) | COPY_BITS(diff, 23, 10, 1));
+	jump_inst[1] = (sljit_u16)((diff & 0x7ff) | COPY_BITS(diff, 22, 13, 1) | COPY_BITS(diff, 21, 11, 1));
+
+	SLJIT_ASSERT(type == 4 || type == 5);
 
 	/* The others have a common form. */
-	if (type == 5) /* Encoding T4 of 'B' instruction */
+	if (type == 4) /* Encoding T4 of 'B' instruction */
 		jump_inst[1] |= 0x9000;
-	else if (type == 6) /* Encoding T1 of 'BL' instruction */
+	else /* Encoding T1 of 'BL' instruction */
 		jump_inst[1] |= 0xd000;
-	else
-		SLJIT_UNREACHABLE();
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+static void reduce_code_size(struct sljit_compiler *compiler)
+{
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	struct sljit_const *const_;
+	SLJIT_NEXT_DEFINE_TYPES;
+	sljit_uw total_size;
+	sljit_uw size_reduce = 0;
+	sljit_sw diff;
+
+	label = compiler->labels;
+	jump = compiler->jumps;
+	const_ = compiler->consts;
+	SLJIT_NEXT_INIT_TYPES();
+
+	while (1) {
+		SLJIT_GET_NEXT_MIN();
+
+		if (next_min_addr == SLJIT_MAX_ADDRESS)
+			break;
+
+		if (next_min_addr == next_label_size) {
+			label->size -= size_reduce;
+
+			label = label->next;
+			next_label_size = SLJIT_GET_NEXT_SIZE(label);
+		}
+
+		if (next_min_addr == next_const_addr) {
+			const_->addr -= size_reduce;
+			const_ = const_->next;
+			next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+			continue;
+		}
+
+		if (next_min_addr != next_jump_addr)
+			continue;
+
+		jump->addr -= size_reduce;
+		if (!(jump->flags & JUMP_MOV_ADDR)) {
+			total_size = JUMP_MAX_SIZE;
+
+			if (!(jump->flags & (SLJIT_REWRITABLE_JUMP | JUMP_ADDR))) {
+				/* Unit size: instruction. */
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr - 2;
+				if (jump->u.label->size > jump->addr) {
+					SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+					diff -= (sljit_sw)size_reduce;
+				}
+
+				if (jump->flags & IS_COND) {
+					diff++;
+
+					if (diff <= (0xff / SSIZE_OF(u16)) && diff >= (-0x100 / SSIZE_OF(u16)))
+						total_size = 0;
+					else if (diff <= (0xfffff / SSIZE_OF(u16)) && diff >= (-0x100000 / SSIZE_OF(u16)))
+						total_size = 1;
+					diff--;
+				} else if (!(jump->flags & IS_BL) && diff <= (0x7ff / SSIZE_OF(u16)) && diff >= (-0x800 / SSIZE_OF(u16)))
+					total_size = 1;
+
+				if (total_size == JUMP_MAX_SIZE && diff <= (0xffffff / SSIZE_OF(u16)) && diff >= (-0x1000000 / SSIZE_OF(u16)))
+					total_size = 2;
+			}
+
+			size_reduce += JUMP_MAX_SIZE - total_size;
+		} else {
+			/* Real size minus 1. Unit size: instruction. */
+			total_size = 3;
+
+			if (!(jump->flags & JUMP_ADDR)) {
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+				if (jump->u.label->size > jump->addr) {
+					SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+					diff -= (sljit_sw)size_reduce;
+				}
+
+				if (diff <= (0xffd / SSIZE_OF(u16)) && diff >= (-0xfff / SSIZE_OF(u16)))
+					total_size = 1;
+			}
+
+			size_reduce += 3 - total_size;
+		}
+
+		jump->flags |= total_size << JUMP_SIZE_SHIFT;
+		jump = jump->next;
+		next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+	}
+
+	compiler->size -= size_reduce;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_u16 *code;
@@ -438,64 +606,73 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	sljit_u16 *buf_ptr;
 	sljit_u16 *buf_end;
 	sljit_uw half_count;
-	sljit_uw next_addr;
+	SLJIT_NEXT_DEFINE_TYPES;
+	sljit_sw addr;
 	sljit_sw executable_offset;
 
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
 
-	code = (sljit_u16*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_u16), compiler->exec_allocator_data);
+	reduce_code_size(compiler);
+
+	code = (sljit_u16*)allocate_executable_memory(compiler->size * sizeof(sljit_u16), options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
+
+	reverse_buf(compiler);
 	buf = compiler->buf;
 
 	code_ptr = code;
 	half_count = 0;
-	next_addr = 0;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
-
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
 
 	do {
 		buf_ptr = (sljit_u16*)buf->memory;
 		buf_end = buf_ptr + (buf->used_size >> 1);
 		do {
 			*code_ptr = *buf_ptr++;
-			if (next_addr == half_count) {
+			if (next_min_addr == half_count) {
 				SLJIT_ASSERT(!label || label->size >= half_count);
 				SLJIT_ASSERT(!jump || jump->addr >= half_count);
 				SLJIT_ASSERT(!const_ || const_->addr >= half_count);
-				SLJIT_ASSERT(!put_label || put_label->addr >= half_count);
 
 				/* These structures are ordered by their address. */
-				if (label && label->size == half_count) {
-					label->addr = ((sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset)) | 0x1;
+				if (next_min_addr == next_label_size) {
+					label->u.addr = ((sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset)) | 0x1;
 					label->size = (sljit_uw)(code_ptr - code);
 					label = label->next;
+					next_label_size = SLJIT_GET_NEXT_SIZE(label);
 				}
-				if (jump && jump->addr == half_count) {
-						jump->addr = (sljit_uw)code_ptr - ((jump->flags & IS_COND) ? 10 : 8);
-						code_ptr -= detect_jump_type(jump, code_ptr, code, executable_offset);
-						jump = jump->next;
-				}
-				if (const_ && const_->addr == half_count) {
+
+				if (next_min_addr == next_jump_addr) {
+					if (!(jump->flags & JUMP_MOV_ADDR)) {
+						half_count = half_count - 1 + (jump->flags >> JUMP_SIZE_SHIFT);
+						code_ptr = detect_jump_type(jump, code_ptr, code, executable_offset);
+						SLJIT_ASSERT((sljit_uw)code_ptr - jump->addr <
+							((jump->flags >> JUMP_SIZE_SHIFT) + ((jump->flags & 0xf0) <= PATCH_TYPE2)) * sizeof(sljit_u16));
+					} else {
+						half_count += jump->flags >> JUMP_SIZE_SHIFT;
+						addr = (sljit_sw)code_ptr;
+						code_ptr += mov_addr_get_length(jump, code_ptr, code, executable_offset);
+						jump->addr = (sljit_uw)addr;
+					}
+
+					jump = jump->next;
+					next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+				} else if (next_min_addr == next_const_addr) {
 					const_->addr = (sljit_uw)code_ptr;
 					const_ = const_->next;
+					next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
 				}
-				if (put_label && put_label->addr == half_count) {
-					SLJIT_ASSERT(put_label->label);
-					put_label->addr = (sljit_uw)code_ptr;
-					put_label = put_label->next;
-				}
-				next_addr = compute_next_addr(label, jump, const_, put_label);
+
+				SLJIT_GET_NEXT_MIN();
 			}
 			code_ptr++;
 			half_count++;
@@ -505,7 +682,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	} while (buf);
 
 	if (label && label->size == half_count) {
-		label->addr = ((sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset)) | 0x1;
+		label->u.addr = ((sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset)) | 0x1;
 		label->size = (sljit_uw)(code_ptr - code);
 		label = label->next;
 	}
@@ -513,21 +690,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)compiler->size);
 
 	jump = compiler->jumps;
 	while (jump) {
-		set_jump_instruction(jump, executable_offset);
+		generate_jump_or_mov_addr(jump, executable_offset);
 		jump = jump->next;
 	}
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-		modify_imm32_const((sljit_u16 *)put_label->addr, put_label->label->addr);
-		put_label = put_label->next;
-	}
-
 	compiler->error = SLJIT_ERR_COMPILED;
 	compiler->executable_offset = executable_offset;
 	compiler->executable_size = (sljit_uw)(code_ptr - code) * sizeof(sljit_u16);
@@ -565,6 +735,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_COPY_F32:
 	case SLJIT_HAS_COPY_F64:
 	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
 		return 1;
 
 	default:
@@ -657,10 +828,11 @@ static sljit_s32 load_immediate(struct sljit_compiler *compiler, sljit_s32 dst,
 /* SET_FLAGS must be 0x100000 as it is also the value of S bit (can be used for optimization). */
 #define SET_FLAGS	0x0100000
 #define UNUSED_RETURN	0x0200000
+#define REGISTER_OP	0x0400000
 
 static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 dst, sljit_uw arg1, sljit_uw arg2)
 {
-	/* dst must be register, TMP_REG1
+	/* dst must be register
 	   arg1 must be register, imm
 	   arg2 must be register, imm */
 	sljit_s32 reg;
@@ -686,6 +858,7 @@ static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, s
 		case SLJIT_REV_U32:
 		case SLJIT_REV_S32:
 		case SLJIT_MUL:
+		case SLJIT_MULADD:
 			/* No form with immediate operand. */
 			break;
 		case SLJIT_MOV:
@@ -921,17 +1094,17 @@ static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, s
 		return push_inst32(compiler, REV_W | RN4(arg2) | RD4(dst) | RM4(arg2));
 	case SLJIT_REV_U16:
 	case SLJIT_REV_S16:
-		SLJIT_ASSERT(arg1 == TMP_REG2 && dst != TMP_REG2);
+		SLJIT_ASSERT(arg1 == TMP_REG2);
 
-		flags &= 0xffff;
 		if (IS_2_LO_REGS(dst, arg2))
 			FAIL_IF(push_inst16(compiler, REV16 | RD3(dst) | RN3(arg2)));
 		else
 			FAIL_IF(push_inst32(compiler, REV16_W | RN4(arg2) | RD4(dst) | RM4(arg2)));
 
-		if (dst == TMP_REG1 || (arg2 == TMP_REG1 && flags == SLJIT_REV_U16))
+		if (!(flags & REGISTER_OP))
 			return SLJIT_SUCCESS;
 
+		flags &= 0xffff;
 		if (reg_map[dst] <= 7)
 			return push_inst16(compiler, (flags == SLJIT_REV_U16 ? UXTH : SXTH) | RD3(dst) | RN3(dst));
 		return push_inst32(compiler, (flags == SLJIT_REV_U16 ? UXTH_W : SXTH_W) | RD4(dst) | RM4(dst));
@@ -966,10 +1139,10 @@ static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, s
 		compiler->status_flags_state = 0;
 		if (!(flags & SET_FLAGS))
 			return push_inst32(compiler, MUL | RD4(dst) | RN4(arg1) | RM4(arg2));
-		SLJIT_ASSERT(dst != TMP_REG2);
-		FAIL_IF(push_inst32(compiler, SMULL | RT4(dst) | RD4(TMP_REG2) | RN4(arg1) | RM4(arg2)));
+		reg = (dst == TMP_REG2) ? TMP_REG1 : TMP_REG2;
+		FAIL_IF(push_inst32(compiler, SMULL | RT4(dst) | RD4(reg) | RN4(arg1) | RM4(arg2)));
 		/* cmp TMP_REG2, dst asr #31. */
-		return push_inst32(compiler, CMP_W | RN4(TMP_REG2) | 0x70e0 | RM4(dst));
+		return push_inst32(compiler, CMP_W | RN4(reg) | 0x70e0 | RM4(dst));
 	case SLJIT_AND:
 		if (dst == (sljit_s32)arg1 && IS_2_LO_REGS(dst, arg2))
 			return push_inst16(compiler, ANDS | RD3(dst) | RN3(arg2));
@@ -985,37 +1158,44 @@ static sljit_s32 emit_op_imm(struct sljit_compiler *compiler, sljit_s32 flags, s
 			return push_inst16(compiler, EORS | RD3(dst) | RN3(arg2));
 		return push_inst32(compiler, EOR_W | (flags & SET_FLAGS) | RD4(dst) | RN4(arg1) | RM4(arg2));
 	case SLJIT_MSHL:
-		FAIL_IF(push_inst32(compiler, ANDI | RD4(TMP_REG2) | RN4(arg2) | 0x1f));
-		arg2 = TMP_REG2;
+		reg = (arg2 == TMP_REG1) ? TMP_REG1 : TMP_REG2;
+		FAIL_IF(push_inst32(compiler, ANDI | RD4(reg) | RN4(arg2) | 0x1f));
+		arg2 = (sljit_uw)reg;
 		/* fallthrough */
 	case SLJIT_SHL:
 		if (dst == (sljit_s32)arg1 && IS_2_LO_REGS(dst, arg2))
 			return push_inst16(compiler, LSLS | RD3(dst) | RN3(arg2));
 		return push_inst32(compiler, LSL_W | (flags & SET_FLAGS) | RD4(dst) | RN4(arg1) | RM4(arg2));
 	case SLJIT_MLSHR:
-		FAIL_IF(push_inst32(compiler, ANDI | RD4(TMP_REG2) | RN4(arg2) | 0x1f));
-		arg2 = TMP_REG2;
+		reg = (arg2 == TMP_REG1) ? TMP_REG1 : TMP_REG2;
+		FAIL_IF(push_inst32(compiler, ANDI | RD4(reg) | RN4(arg2) | 0x1f));
+		arg2 = (sljit_uw)reg;
 		/* fallthrough */
 	case SLJIT_LSHR:
 		if (dst == (sljit_s32)arg1 && IS_2_LO_REGS(dst, arg2))
 			return push_inst16(compiler, LSRS | RD3(dst) | RN3(arg2));
 		return push_inst32(compiler, LSR_W | (flags & SET_FLAGS) | RD4(dst) | RN4(arg1) | RM4(arg2));
 	case SLJIT_MASHR:
-		FAIL_IF(push_inst32(compiler, ANDI | RD4(TMP_REG2) | RN4(arg2) | 0x1f));
-		arg2 = TMP_REG2;
+		reg = (arg2 == TMP_REG1) ? TMP_REG1 : TMP_REG2;
+		FAIL_IF(push_inst32(compiler, ANDI | RD4(reg) | RN4(arg2) | 0x1f));
+		arg2 = (sljit_uw)reg;
 		/* fallthrough */
 	case SLJIT_ASHR:
 		if (dst == (sljit_s32)arg1 && IS_2_LO_REGS(dst, arg2))
 			return push_inst16(compiler, ASRS | RD3(dst) | RN3(arg2));
 		return push_inst32(compiler, ASR_W | (flags & SET_FLAGS) | RD4(dst) | RN4(arg1) | RM4(arg2));
 	case SLJIT_ROTL:
-		FAIL_IF(push_inst32(compiler, RSB_WI | RD4(TMP_REG2) | RN4(arg2) | 0));
-		arg2 = TMP_REG2;
+		reg = (arg2 == TMP_REG1) ? TMP_REG1 : TMP_REG2;
+		FAIL_IF(push_inst32(compiler, RSB_WI | RD4(reg) | RN4(arg2) | 0));
+		arg2 = (sljit_uw)reg;
 		/* fallthrough */
 	case SLJIT_ROTR:
 		if (dst == (sljit_s32)arg1 && IS_2_LO_REGS(dst, arg2))
 			return push_inst16(compiler, RORS | RD3(dst) | RN3(arg2));
 		return push_inst32(compiler, ROR_W | RD4(dst) | RN4(arg1) | RM4(arg2));
+	case SLJIT_MULADD:
+		compiler->status_flags_state = 0;
+		return push_inst32(compiler, MLA | RD4(dst) | RN4(arg1) | RM4(arg2) | RT4(dst));
 	}
 
 	SLJIT_UNREACHABLE();
@@ -1229,9 +1409,11 @@ static SLJIT_INLINE sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit
 /* --------------------------------------------------------------------- */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 size, i, tmp, word_arg_count;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
 	sljit_uw offset;
@@ -1245,8 +1427,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 #endif
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 
 	tmp = SLJIT_S0 - saveds;
 	for (i = SLJIT_S0 - saved_arg_count; i > tmp; i--)
@@ -1439,15 +1626,21 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 size;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 	size = GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 1);
 
 	/* Doubles are saved, so alignment is unaffected. */
@@ -1766,6 +1959,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 		}
 		return SLJIT_SUCCESS;
 #endif /* __ARM_FEATURE_IDIV || __ARM_ARCH_EXT_IDIV__ */
+	case SLJIT_MEMORY_BARRIER:
+		return push_inst32(compiler, DMB_SY);
 	case SLJIT_ENDBR:
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
 		return SLJIT_SUCCESS;
@@ -1779,14 +1974,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 dst_r, flags;
-	sljit_s32 op_flags = GET_ALL_FLAGS(op);
 
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_op1(compiler, op, dst, dstw, src, srcw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
-	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
+	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 
 	op = GET_OPCODE(op);
 	if (op >= SLJIT_MOV && op <= SLJIT_MOV_P) {
@@ -1826,35 +2020,37 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 
 		if (src == SLJIT_IMM)
 			FAIL_IF(emit_op_imm(compiler, SLJIT_MOV | ARG2_IMM, dst_r, TMP_REG2, (sljit_uw)srcw));
-		else if (src & SLJIT_MEM) {
+		else if (src & SLJIT_MEM)
 			FAIL_IF(emit_op_mem(compiler, flags, dst_r, src, srcw, TMP_REG1));
-		} else {
-			if (dst_r != TMP_REG1)
-				return emit_op_imm(compiler, op, dst_r, TMP_REG2, (sljit_uw)src);
+		else if (FAST_IS_REG(dst))
+			return emit_op_imm(compiler, op, dst_r, TMP_REG2, (sljit_uw)src);
+		else
 			dst_r = src;
-		}
 
 		if (!(dst & SLJIT_MEM))
 			return SLJIT_SUCCESS;
 
-		return emit_op_mem(compiler, flags | STORE, dst_r, dst, dstw, TMP_REG2);
+		return emit_op_mem(compiler, flags | STORE, dst_r, dst, dstw, TMP_REG1);
 	}
 
 	SLJIT_COMPILE_ASSERT(WORD_SIZE == 0, word_size_must_be_0);
-	flags = HAS_FLAGS(op_flags) ? SET_FLAGS : 0;
+	flags = WORD_SIZE;
 
-	if (op == SLJIT_REV_U16 || op == SLJIT_REV_S16)
+	if (op == SLJIT_REV_U16 || op == SLJIT_REV_S16) {
+		if (!(dst & SLJIT_MEM) && (!(src & SLJIT_MEM) || op == SLJIT_REV_S16))
+			op |= REGISTER_OP;
 		flags |= HALF_SIZE;
+	}
 
 	if (src & SLJIT_MEM) {
 		FAIL_IF(emit_op_mem(compiler, flags, TMP_REG1, src, srcw, TMP_REG1));
 		src = TMP_REG1;
 	}
 
-	emit_op_imm(compiler, flags | op, dst_r, TMP_REG2, (sljit_uw)src);
+	emit_op_imm(compiler, op, dst_r, TMP_REG2, (sljit_uw)src);
 
 	if (SLJIT_UNLIKELY(dst & SLJIT_MEM))
-		return emit_op_mem(compiler, flags | STORE, dst_r, dst, dstw, TMP_REG2);
+		return emit_op_mem(compiler, flags | STORE, dst_r, dst, dstw, TMP_REG1);
 	return SLJIT_SUCCESS;
 }
 
@@ -1863,7 +2059,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 	sljit_s32 src1, sljit_sw src1w,
 	sljit_s32 src2, sljit_sw src2w)
 {
-	sljit_s32 dst_reg, flags, src2_reg;
+	sljit_s32 dst_reg, src2_tmp_reg, flags;
 
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_op2(compiler, op, 0, dst, dstw, src1, src1w, src2, src2w));
@@ -1871,36 +2067,34 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 	ADJUST_LOCAL_OFFSET(src1, src1w);
 	ADJUST_LOCAL_OFFSET(src2, src2w);
 
-	dst_reg = FAST_IS_REG(dst) ? dst : TMP_REG1;
+	dst_reg = FAST_IS_REG(dst) ? dst : TMP_REG2;
 	flags = HAS_FLAGS(op) ? SET_FLAGS : 0;
 
 	if (dst == TMP_REG1)
 		flags |= UNUSED_RETURN;
 
+	if (src2 == SLJIT_IMM)
+		flags |= ARG2_IMM;
+	else if (src2 & SLJIT_MEM) {
+		src2_tmp_reg = FAST_IS_REG(src1) ? TMP_REG1 : TMP_REG2;
+		emit_op_mem(compiler, WORD_SIZE, src2_tmp_reg, src2, src2w, TMP_REG1);
+		src2w = src2_tmp_reg;
+	} else
+		src2w = src2;
+
 	if (src1 == SLJIT_IMM)
 		flags |= ARG1_IMM;
 	else if (src1 & SLJIT_MEM) {
 		emit_op_mem(compiler, WORD_SIZE, TMP_REG1, src1, src1w, TMP_REG1);
 		src1w = TMP_REG1;
-	}
-	else
+	} else
 		src1w = src1;
 
-	if (src2 == SLJIT_IMM)
-		flags |= ARG2_IMM;
-	else if (src2 & SLJIT_MEM) {
-		src2_reg = (!(flags & ARG1_IMM) && (src1w == TMP_REG1)) ? TMP_REG2 : TMP_REG1;
-		emit_op_mem(compiler, WORD_SIZE, src2_reg, src2, src2w, src2_reg);
-		src2w = src2_reg;
-	}
-	else
-		src2w = src2;
-
 	emit_op_imm(compiler, flags | GET_OPCODE(op), dst_reg, (sljit_uw)src1w, (sljit_uw)src2w);
 
 	if (!(dst & SLJIT_MEM))
 		return SLJIT_SUCCESS;
-	return emit_op_mem(compiler, WORD_SIZE | STORE, dst_reg, dst, dstw, TMP_REG2);
+	return emit_op_mem(compiler, WORD_SIZE | STORE, dst_reg, dst, dstw, TMP_REG1);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compiler, sljit_s32 op,
@@ -1914,6 +2108,23 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	return sljit_emit_op2(compiler, op, TMP_REG1, 0, src1, src1w, src2, src2w);
 }
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		SLJIT_SKIP_CHECKS(compiler);
+		return sljit_emit_op2(compiler, op, dst_reg, 0, src1, src1w, src2, src2w);
+	}
+
+	return SLJIT_SUCCESS;
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 dst_reg,
 	sljit_s32 src1_reg,
@@ -2050,7 +2261,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_register_index(sljit_s32 type, slji
 	if (type == SLJIT_FLOAT_REGISTER || type == SLJIT_SIMD_REG_64)
 		return freg_map[reg];
 
-	if (type != SLJIT_SIMD_REG_128)
+	if (type == SLJIT_SIMD_REG_128)
 		return freg_map[reg] & ~0x1;
 
 	return -1;
@@ -2228,7 +2439,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV_F64:
 		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
+			if (!(dst & SLJIT_MEM))
 				FAIL_IF(push_inst32(compiler, VMOV_F32 | (op & SLJIT_32) | VD4(dst_r) | VM4(src)));
 			else
 				dst_r = src;
@@ -2519,7 +2730,6 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	set_jump(jump, compiler, type & SLJIT_REWRITABLE_JUMP);
 	type &= 0xff;
 
-	PTR_FAIL_IF(emit_imm32_const(compiler, TMP_REG1, 0));
 	if (type < SLJIT_JUMP) {
 		jump->flags |= IS_COND;
 		cc = get_cc(compiler, type);
@@ -2535,6 +2745,8 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 		PTR_FAIL_IF(push_inst16(compiler, BLX | RN3(TMP_REG1)));
 	}
 
+	/* Maximum number of instructions required for generating a constant. */
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return jump;
 }
 
@@ -2800,8 +3012,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 	set_jump(jump, compiler, JUMP_ADDR | ((type >= SLJIT_FAST_CALL) ? IS_BL : 0));
 	jump->u.target = (sljit_uw)srcw;
 
-	FAIL_IF(emit_imm32_const(compiler, TMP_REG1, 0));
 	jump->addr = compiler->size;
+	/* Maximum number of instructions required for generating a constant. */
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return push_inst16(compiler, (type <= SLJIT_JUMP ? BX : BLX) | RN3(TMP_REG1));
 }
 
@@ -2968,7 +3181,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 	}
 
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem(compiler, WORD_SIZE, (src2_reg != dst_reg) ? dst_reg : TMP_REG1, src1, src1w, TMP_REG2));
+		FAIL_IF(emit_op_mem(compiler, WORD_SIZE, (src2_reg != dst_reg) ? dst_reg : TMP_REG1, src1, src1w, TMP_REG1));
 
 		if (src2_reg != dst_reg) {
 			src1 = src2_reg;
@@ -3040,8 +3253,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *com
 	}
 
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_fop_mem(compiler, (type & SLJIT_32) | FPU_LOAD, TMP_FREG1, src1, src1w));
-		src1 = TMP_FREG1;
+		FAIL_IF(emit_fop_mem(compiler, (type & SLJIT_32) | FPU_LOAD, TMP_FREG2, src1, src1w));
+		src1 = TMP_FREG2;
 	}
 
 	FAIL_IF(push_inst16(compiler, IT | (get_cc(compiler, type & ~SLJIT_32) << 4) | 0x8));
@@ -3426,7 +3639,7 @@ static SLJIT_INLINE sljit_s32 simd_get_quad_reg_index(sljit_s32 freg)
 #define SLJIT_QUAD_OTHER_HALF(freg) ((((freg) & 0x1) << 1) - 1)
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3435,7 +3648,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_mov(compiler, type, freg, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -3449,16 +3662,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (!(srcdst & SLJIT_MEM)) {
 		if (reg_size == 4)
 			srcdst = simd_get_quad_reg_index(srcdst);
 
 		if (type & SLJIT_SIMD_STORE)
-			ins = VD4(srcdst) | VN4(freg) | VM4(freg);
+			ins = VD4(srcdst) | VN4(vreg) | VM4(vreg);
 		else
-			ins = VD4(freg) | VN4(srcdst) | VM4(srcdst);
+			ins = VD4(vreg) | VN4(srcdst) | VM4(srcdst);
 
 		if (reg_size == 4)
 			ins |= (sljit_ins)1 << 6;
@@ -3471,7 +3684,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	if (elem_size > 3)
 		elem_size = 3;
 
-	ins = ((type & SLJIT_SIMD_STORE) ? VST1 : VLD1) | VD4(freg)
+	ins = ((type & SLJIT_SIMD_STORE) ? VST1 : VLD1) | VD4(vreg)
 		| (sljit_ins)((reg_size == 3) ? (0x7 << 8) : (0xa << 8));
 
 	SLJIT_ASSERT(reg_size >= alignment);
@@ -3579,7 +3792,7 @@ static sljit_ins simd_get_imm(sljit_s32 elem_size, sljit_uw value)
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3587,7 +3800,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 	sljit_ins ins, imm;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_replicate(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -3601,24 +3814,24 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (src == SLJIT_IMM && srcw == 0)
-		return push_inst32(compiler, VMOV_i | ((reg_size == 4) ? (1 << 6) : 0) | VD4(freg));
+		return push_inst32(compiler, VMOV_i | ((reg_size == 4) ? (1 << 6) : 0) | VD4(vreg));
 
 	if (SLJIT_UNLIKELY(elem_size == 3)) {
 		SLJIT_ASSERT(type & SLJIT_SIMD_FLOAT);
 
 		if (src & SLJIT_MEM) {
-			FAIL_IF(emit_fop_mem(compiler, FPU_LOAD | SLJIT_32, freg, src, srcw));
-			src = freg;
-		} else if (freg != src)
-			FAIL_IF(push_inst32(compiler, VORR | VD4(freg) | VN4(src) | VM4(src)));
+			FAIL_IF(emit_fop_mem(compiler, FPU_LOAD | SLJIT_32, vreg, src, srcw));
+			src = vreg;
+		} else if (vreg != src)
+			FAIL_IF(push_inst32(compiler, VORR | VD4(vreg) | VN4(src) | VM4(src)));
 
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 
-		if (freg != src)
-			return push_inst32(compiler, VORR | VD4(freg) | VN4(src) | VM4(src));
+		if (vreg != src)
+			return push_inst32(compiler, VORR | VD4(vreg) | VN4(src) | VM4(src));
 		return SLJIT_SUCCESS;
 	}
 
@@ -3630,7 +3843,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		if (reg_size == 4)
 			ins |= 1 << 5;
 
-		return push_inst32(compiler, VLD1_r | ins | VD4(freg) | RN4(src) | 0xf);
+		return push_inst32(compiler, VLD1_r | ins | VD4(vreg) | RN4(src) | 0xf);
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
@@ -3640,7 +3853,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		if (reg_size == 4)
 			ins |= (sljit_ins)1 << 6;
 
-		return push_inst32(compiler, VDUP_s | ins | VD4(freg) | (sljit_ins)freg_map[src]);
+		return push_inst32(compiler, VDUP_s | ins | VD4(vreg) | (sljit_ins)freg_map[src]);
 	}
 
 	if (src == SLJIT_IMM) {
@@ -3653,7 +3866,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 			if (reg_size == 4)
 				imm |= (sljit_ins)1 << 6;
 
-			return push_inst32(compiler, VMOV_i | imm | VD4(freg));
+			return push_inst32(compiler, VMOV_i | imm | VD4(vreg));
 		}
 
 		FAIL_IF(load_immediate(compiler, TMP_REG1, (sljit_uw)srcw));
@@ -3675,11 +3888,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 	if (reg_size == 4)
 		ins |= (sljit_ins)1 << 21;
 
-	return push_inst32(compiler, VDUP | ins | VN4(freg) | RT4(src));
+	return push_inst32(compiler, VDUP | ins | VN4(vreg) | RT4(src));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3687,7 +3900,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, freg, lane_index, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -3701,7 +3914,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (type & SLJIT_SIMD_LANE_ZERO) {
 		ins = (reg_size == 3) ? 0 : ((sljit_ins)1 << 6);
@@ -3709,62 +3922,62 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		if (type & SLJIT_SIMD_FLOAT) {
 			if (elem_size == 3 && !(srcdst & SLJIT_MEM)) {
 				if (lane_index == 1)
-					freg += SLJIT_QUAD_OTHER_HALF(freg);
+					vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 
-				if (srcdst != freg)
-					FAIL_IF(push_inst32(compiler, VORR | VD4(freg) | VN4(srcdst) | VM4(srcdst)));
+				if (srcdst != vreg)
+					FAIL_IF(push_inst32(compiler, VORR | VD4(vreg) | VN4(srcdst) | VM4(srcdst)));
 
-				freg += SLJIT_QUAD_OTHER_HALF(freg);
-				return push_inst32(compiler, VMOV_i | VD4(freg));
+				vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+				return push_inst32(compiler, VMOV_i | VD4(vreg));
 			}
 
-			if (srcdst == freg || (elem_size == 3 && srcdst == (freg + SLJIT_QUAD_OTHER_HALF(freg)))) {
-				FAIL_IF(push_inst32(compiler, VORR | ins | VD4(TMP_FREG2) | VN4(freg) | VM4(freg)));
+			if (srcdst == vreg || (elem_size == 3 && srcdst == (vreg + SLJIT_QUAD_OTHER_HALF(vreg)))) {
+				FAIL_IF(push_inst32(compiler, VORR | ins | VD4(TMP_FREG2) | VN4(vreg) | VM4(vreg)));
 				srcdst = TMP_FREG2;
 				srcdstw = 0;
 			}
 		}
 
-		FAIL_IF(push_inst32(compiler, VMOV_i | ins | VD4(freg)));
+		FAIL_IF(push_inst32(compiler, VMOV_i | ins | VD4(vreg)));
 	}
 
 	if (reg_size == 4 && lane_index >= (0x8 >> elem_size)) {
 		lane_index -= (0x8 >> elem_size);
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 	}
 
 	if (srcdst & SLJIT_MEM) {
 		if (elem_size == 3)
-			return emit_fop_mem(compiler, ((type & SLJIT_SIMD_STORE) ? 0 : FPU_LOAD) | SLJIT_32, freg, srcdst, srcdstw);
+			return emit_fop_mem(compiler, ((type & SLJIT_SIMD_STORE) ? 0 : FPU_LOAD) | SLJIT_32, vreg, srcdst, srcdstw);
 
 		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &srcdst, srcdstw));
 
 		lane_index = lane_index << elem_size;
 		ins = (sljit_ins)((elem_size << 10) | (lane_index << 5));
-		return push_inst32(compiler, ((type & SLJIT_SIMD_STORE) ? VST1_s : VLD1_s) | ins | VD4(freg) | RN4(srcdst) | 0xf);
+		return push_inst32(compiler, ((type & SLJIT_SIMD_STORE) ? VST1_s : VLD1_s) | ins | VD4(vreg) | RN4(srcdst) | 0xf);
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		if (elem_size == 3) {
 			if (type & SLJIT_SIMD_STORE)
-				return push_inst32(compiler, VORR | VD4(srcdst) | VN4(freg) | VM4(freg));
-			return push_inst32(compiler, VMOV_F32 | SLJIT_32 | VD4(freg) | VM4(srcdst));
+				return push_inst32(compiler, VORR | VD4(srcdst) | VN4(vreg) | VM4(vreg));
+			return push_inst32(compiler, VMOV_F32 | SLJIT_32 | VD4(vreg) | VM4(srcdst));
 		}
 
 		if (type & SLJIT_SIMD_STORE) {
-			if (freg_ebit_map[freg] == 0) {
+			if (freg_ebit_map[vreg] == 0) {
 				if (lane_index == 1)
-					freg = SLJIT_F64_SECOND(freg);
+					vreg = SLJIT_F64_SECOND(vreg);
 
-				return push_inst32(compiler, VMOV_F32 | VD4(srcdst) | VM4(freg));
+				return push_inst32(compiler, VMOV_F32 | VD4(srcdst) | VM4(vreg));
 			}
 
-			FAIL_IF(push_inst32(compiler, VMOV_s | (1 << 20) | ((sljit_ins)lane_index << 21) | VN4(freg) | RT4(TMP_REG1)));
+			FAIL_IF(push_inst32(compiler, VMOV_s | (1 << 20) | ((sljit_ins)lane_index << 21) | VN4(vreg) | RT4(TMP_REG1)));
 			return push_inst32(compiler, VMOV | VN4(srcdst) | RT4(TMP_REG1));
 		}
 
 		FAIL_IF(push_inst32(compiler, VMOV | (1 << 20) | VN4(srcdst) | RT4(TMP_REG1)));
-		return push_inst32(compiler, VMOV_s | ((sljit_ins)lane_index << 21) | VN4(freg) | RT4(TMP_REG1));
+		return push_inst32(compiler, VMOV_s | ((sljit_ins)lane_index << 21) | VN4(vreg) | RT4(TMP_REG1));
 	}
 
 	if (srcdst == SLJIT_IMM) {
@@ -3792,11 +4005,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 			ins |= (1 << 23);
 	}
 
-	return push_inst32(compiler, VMOV_s | ins | VN4(freg) | RT4(srcdst));
+	return push_inst32(compiler, VMOV_s | ins | VN4(vreg) | RT4(srcdst));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3804,7 +4017,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, freg, src, src_lane_index));
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
 
 	if (reg_size != 3 && reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -3816,7 +4029,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4) {
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 		src = simd_get_quad_reg_index(src);
 
 		if (src_lane_index >= (0x8 >> elem_size)) {
@@ -3826,13 +4039,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	}
 
 	if (elem_size == 3) {
-		if (freg != src)
-			FAIL_IF(push_inst32(compiler, VORR | VD4(freg) | VN4(src) | VM4(src)));
+		if (vreg != src)
+			FAIL_IF(push_inst32(compiler, VORR | VD4(vreg) | VN4(src) | VM4(src)));
 
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
 
-		if (freg != src)
-			return push_inst32(compiler, VORR | VD4(freg) | VN4(src) | VM4(src));
+		if (vreg != src)
+			return push_inst32(compiler, VORR | VD4(vreg) | VN4(src) | VM4(src));
 		return SLJIT_SUCCESS;
 	}
 
@@ -3841,11 +4054,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	if (reg_size == 4)
 		ins |= (sljit_ins)1 << 6;
 
-	return push_inst32(compiler, VDUP_s | ins | VD4(freg) | VM4(src));
+	return push_inst32(compiler, VDUP_s | ins | VD4(vreg) | VM4(src));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3854,7 +4067,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 	sljit_s32 dst_reg;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_extend(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -3868,20 +4081,20 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 		return SLJIT_SUCCESS;
 
 	if (reg_size == 4)
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 
 	if (src & SLJIT_MEM) {
 		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src, srcw));
 		if (reg_size == 4 && elem2_size - elem_size == 1)
-			FAIL_IF(push_inst32(compiler, VLD1 | (0x7 << 8) | VD4(freg) | RN4(src) | 0xf));
+			FAIL_IF(push_inst32(compiler, VLD1 | (0x7 << 8) | VD4(vreg) | RN4(src) | 0xf));
 		else
-			FAIL_IF(push_inst32(compiler, VLD1_s | (sljit_ins)((reg_size - elem2_size + elem_size) << 10) | VD4(freg) | RN4(src) | 0xf));
-		src = freg;
+			FAIL_IF(push_inst32(compiler, VLD1_s | (sljit_ins)((reg_size - elem2_size + elem_size) << 10) | VD4(vreg) | RN4(src) | 0xf));
+		src = vreg;
 	} else if (reg_size == 4)
 		src = simd_get_quad_reg_index(src);
 
 	if (!(type & SLJIT_SIMD_FLOAT)) {
-		dst_reg = (reg_size == 4) ? freg : TMP_FREG2;
+		dst_reg = (reg_size == 4) ? vreg : TMP_FREG2;
 
 		do {
 			FAIL_IF(push_inst32(compiler, VSHLL | ((type & SLJIT_SIMD_EXTEND_SIGNED) ? 0 : (1 << 28))
@@ -3890,27 +4103,27 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 		} while (++elem_size < elem2_size);
 
 		if (dst_reg == TMP_FREG2)
-			return push_inst32(compiler, VORR | VD4(freg) | VN4(TMP_FREG2) | VM4(TMP_FREG2));
+			return push_inst32(compiler, VORR | VD4(vreg) | VN4(TMP_FREG2) | VM4(TMP_FREG2));
 		return SLJIT_SUCCESS;
 	}
 
 	/* No SIMD variant, must use VFP instead. */
 	SLJIT_ASSERT(reg_size == 4);
 
-	if (freg == src) {
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
-		FAIL_IF(push_inst32(compiler, VCVT_F64_F32 | VD4(freg) | VM4(src) | 0x20));
-		freg += SLJIT_QUAD_OTHER_HALF(freg);
-		return push_inst32(compiler, VCVT_F64_F32 | VD4(freg) | VM4(src));
+	if (vreg == src) {
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+		FAIL_IF(push_inst32(compiler, VCVT_F64_F32 | VD4(vreg) | VM4(src) | 0x20));
+		vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+		return push_inst32(compiler, VCVT_F64_F32 | VD4(vreg) | VM4(src));
 	}
 
-	FAIL_IF(push_inst32(compiler, VCVT_F64_F32 | VD4(freg) | VM4(src)));
-	freg += SLJIT_QUAD_OTHER_HALF(freg);
-	return push_inst32(compiler, VCVT_F64_F32 | VD4(freg) | VM4(src) | 0x20);
+	FAIL_IF(push_inst32(compiler, VCVT_F64_F32 | VD4(vreg) | VM4(src)));
+	vreg += SLJIT_QUAD_OTHER_HALF(vreg);
+	return push_inst32(compiler, VCVT_F64_F32 | VD4(vreg) | VM4(src) | 0x20);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3919,7 +4132,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	sljit_s32 dst_r;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_sign(compiler, type, freg, dst, dstw));
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
 
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
@@ -3952,12 +4165,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	}
 
 	if (reg_size == 4) {
-		freg = simd_get_quad_reg_index(freg);
+		vreg = simd_get_quad_reg_index(vreg);
 		ins |= (sljit_ins)1 << 6;
 	}
 
 	SLJIT_ASSERT((freg_map[TMP_FREG2] & 0x1) == 0);
-	FAIL_IF(push_inst32(compiler, ins | VD4(TMP_FREG2) | VM4(freg)));
+	FAIL_IF(push_inst32(compiler, ins | VD4(TMP_FREG2) | VM4(vreg)));
 
 	if (reg_size == 4 && elem_size > 0)
 		FAIL_IF(push_inst32(compiler, VMOVN | ((sljit_ins)(elem_size - 1) << 18) | VD4(TMP_FREG2) | VM4(TMP_FREG2)));
@@ -3987,14 +4200,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg)
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
-	sljit_ins ins = 0;
+	sljit_s32 alignment;
+	sljit_ins ins = 0, load_ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_freg, src1_freg, src2_freg));
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src2, src2w);
 
 	if (reg_size != 3 && reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -4002,6 +4217,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 	if ((type & SLJIT_SIMD_FLOAT) && (elem_size < 2 || elem_size > 3))
 		return SLJIT_ERR_UNSUPPORTED;
 
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
 	switch (SLJIT_SIMD_GET_OPCODE(type)) {
 	case SLJIT_SIMD_OP2_AND:
 		ins = VAND;
@@ -4012,19 +4230,51 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 	case SLJIT_SIMD_OP2_XOR:
 		ins = VEOR;
 		break;
+	case SLJIT_SIMD_OP2_SHUFFLE:
+		ins = VTBL;
+		break;
 	}
 
-	if (type & SLJIT_SIMD_TEST)
-		return SLJIT_SUCCESS;
+	if (src2 & SLJIT_MEM) {
+		if (elem_size > 3)
+			elem_size = 3;
+
+		load_ins = VLD1 | (sljit_ins)((reg_size == 3) ? (0x7 << 8) : (0xa << 8));
+		alignment = SLJIT_SIMD_GET_ELEM2_SIZE(type);
+
+		SLJIT_ASSERT(reg_size >= alignment);
+
+		if (alignment == 3)
+			load_ins |= 0x10;
+		else if (alignment >= 4)
+			load_ins |= 0x20;
+
+		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src2, src2w));
+		FAIL_IF(push_inst32(compiler, load_ins | VD4(TMP_FREG2) | RN4(src2) | ((sljit_ins)elem_size) << 6 | 0xf));
+		src2 = TMP_FREG2;
+	}
 
 	if (reg_size == 4) {
-		dst_freg = simd_get_quad_reg_index(dst_freg);
-		src1_freg = simd_get_quad_reg_index(src1_freg);
-		src2_freg = simd_get_quad_reg_index(src2_freg);
+		dst_vreg = simd_get_quad_reg_index(dst_vreg);
+		src1_vreg = simd_get_quad_reg_index(src1_vreg);
+		src2 = simd_get_quad_reg_index(src2);
+
+		if (SLJIT_SIMD_GET_OPCODE(type) == SLJIT_SIMD_OP2_SHUFFLE) {
+			ins |= (sljit_ins)1 << 8;
+
+			FAIL_IF(push_inst32(compiler, ins | VD4(dst_vreg != src1_vreg ? dst_vreg : TMP_FREG2) | VN4(src1_vreg) | VM4(src2)));
+			src2 += SLJIT_QUAD_OTHER_HALF(src2);
+			FAIL_IF(push_inst32(compiler, ins | VD4(dst_vreg + SLJIT_QUAD_OTHER_HALF(dst_vreg)) | VN4(src1_vreg) | VM4(src2)));
+
+			if (dst_vreg == src1_vreg)
+				return push_inst32(compiler, VORR | VD4(dst_vreg) | VN4(TMP_FREG2) | VM4(TMP_FREG2));
+			return SLJIT_SUCCESS;
+		}
+
 		ins |= (sljit_ins)1 << 6;
 	}
 
-	return push_inst32(compiler, ins | VD4(dst_freg) | VN4(src1_freg) | VM4(src2_freg));
+	return push_inst32(compiler, ins | VD4(dst_vreg) | VN4(src1_vreg) | VM4(src2));
 }
 
 #undef FPU_LOAD
@@ -4038,7 +4288,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
 
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
 	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+	case SLJIT_MOV_S16:
+	case SLJIT_MOV_S32:
+		return SLJIT_ERR_UNSUPPORTED;
+
 	case SLJIT_MOV_U8:
 		ins = LDREXB;
 		break;
@@ -4050,6 +4308,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 		break;
 	}
 
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	return push_inst32(compiler, ins | RN4(mem_reg) | RT4(dst_reg));
 }
 
@@ -4066,7 +4327,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
 
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
 	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+	case SLJIT_MOV_S16:
+	case SLJIT_MOV_S32:
+		return SLJIT_ERR_UNSUPPORTED;
+
 	case SLJIT_MOV_U8:
 		ins = STREXB | RM4(TMP_REG1);
 		break;
@@ -4078,6 +4347,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 		break;
 	}
 
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	FAIL_IF(push_inst32(compiler, ins | RN4(mem_reg) | RT4(src_reg)));
 	if (op & SLJIT_SET_ATOMIC_STORED)
 		return push_inst32(compiler, CMPI_W | RN4(TMP_REG1));
@@ -4106,25 +4378,26 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_s32 dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 0);
 
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-	PTR_FAIL_IF(emit_imm32_const(compiler, dst_r, 0));
+	PTR_FAIL_IF(push_inst16(compiler, RDN3(dst_r)));
+	compiler->size += 3;
 
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op_mem(compiler, WORD_SIZE | STORE, dst_r, dst, dstw, TMP_REG2));
-	return put_label;
+	return jump;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_target, sljit_sw executable_offset)
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeLOONGARCH_64.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeLOONGARCH_64.c
similarity index 73%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeLOONGARCH_64.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeLOONGARCH_64.c
index dbd76054..73868ca1 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeLOONGARCH_64.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeLOONGARCH_64.c
@@ -85,10 +85,12 @@ lower parts in the instruction word, denoted by the “L” and “H” suffixes
 #define FRK(fk) ((sljit_ins)freg_map[fk] << 10)
 #define FRA(fa) ((sljit_ins)freg_map[fa] << 15)
 
+#define IMM_V(imm) ((sljit_ins)(imm) << 10)
 #define IMM_I8(imm) (((sljit_ins)(imm)&0xff) << 10)
 #define IMM_I12(imm) (((sljit_ins)(imm)&0xfff) << 10)
 #define IMM_I14(imm) (((sljit_ins)(imm)&0xfff3) << 10)
 #define IMM_I16(imm) (((sljit_ins)(imm)&0xffff) << 10)
+#define IMM_I20(imm) (((sljit_ins)(imm)&0xffffffff) >> 12 << 5)
 #define IMM_I21(imm) ((((sljit_ins)(imm)&0xffff) << 10) | (((sljit_ins)(imm) >> 16) & 0x1f))
 #define IMM_I26(imm) ((((sljit_ins)(imm)&0xffff) << 10) | (((sljit_ins)(imm) >> 16) & 0x3ff))
 
@@ -248,6 +250,9 @@ lower parts in the instruction word, denoted by the “L” and “H” suffixes
 #define AMCAS_W OPC_3R(0x70B2)
 #define AMCAS_D OPC_3R(0x70B3)
 
+/* Memory barrier instructions */
+#define DBAR OPC_3R(0x70e4)
+
 /* Other instructions */
 #define BREAK OPC_3R(0x54)
 #define DBGCALL OPC_3R(0x55)
@@ -318,6 +323,37 @@ lower parts in the instruction word, denoted by the “L” and “H” suffixes
 #define FSTX_S OPC_3R(0x7070)
 #define FSTX_D OPC_3R(0x7078)
 
+/* Vector Instructions */
+
+/* Vector Arithmetic Instructions */
+#define VOR_V OPC_3R(0xe24d)
+#define VXOR_V OPC_3R(0xe24e)
+#define VAND_V OPC_3R(0xe24c)
+#define VMSKLTZ OPC_2R(0x1ca710)
+
+/* Vector Memory Access Instructions */
+#define VLD OPC_2RI12(0xb0)
+#define VST OPC_2RI12(0xb1)
+#define XVLD OPC_2RI12(0xb2)
+#define XVST OPC_2RI12(0xb3)
+#define VSTELM OPC_2RI8(0xc40)
+
+/* Vector Float Conversion Instructions */
+#define VFCVTL_D_S OPC_2R(0x1ca77c)
+
+/* Vector Bit Manipulate Instructions */
+#define VSLLWIL OPC_2R(0x1cc200)
+
+/* Vector Move And Shuffle Instructions */
+#define VLDREPL OPC_2R(0xc0000)
+#define VINSGR2VR OPC_2R(0x1cbac0)
+#define VPICKVE2GR_U OPC_2R(0x1cbce0)
+#define VREPLGR2VR OPC_2R(0x1ca7c0)
+#define VREPLVE OPC_3R(0xe244)
+#define VREPLVEI OPC_2R(0x1cbde0)
+#define VSHUF_B OPC_4R(0xd5)
+#define XVPERMI OPC_2RI8(0x1dfa)
+
 #define I12_MAX (0x7ff)
 #define I12_MIN (-0x800)
 #define BRANCH16_MAX (0x7fff << 2)
@@ -337,16 +373,34 @@ lower parts in the instruction word, denoted by the “L” and “H” suffixes
 
 /* LoongArch CPUCFG register for feature detection */
 #define LOONGARCH_CFG2			0x02
-#define LOONGARCH_FEATURE_LAMCAS	(1 << 28)
+#define LOONGARCH_CFG2_LAMCAS	(1 << 28)
 
-static sljit_u32 cpu_feature_list = 0;
+static sljit_u32 cfg2_feature_list = 0;
 
-static SLJIT_INLINE sljit_u32 get_cpu_features(void)
-{
-	if (cpu_feature_list == 0)
-		__asm__ ("cpucfg %0, %1" : "+&r"(cpu_feature_list) : "r"(LOONGARCH_CFG2));
-	return cpu_feature_list;
-}
+/* According to Software Development and Build Convention for LoongArch Architectures,
++   the status of LSX and LASX extension must be checked through HWCAP */
+#include <sys/auxv.h>
+
+#define LOONGARCH_HWCAP_LSX		(1 << 4)
+#define LOONGARCH_HWCAP_LASX	(1 << 5)
+
+static sljit_u32 hwcap_feature_list = 0;
+
+/* Feature type */
+#define GET_CFG2 	0
+#define GET_HWCAP	1
+
+#define LOONGARCH_SUPPORT_AMCAS (LOONGARCH_CFG2_LAMCAS & get_cpu_features(GET_CFG2))
+
+static SLJIT_INLINE sljit_u32 get_cpu_features(sljit_u32 feature_type)
+ {
+ 	if (cfg2_feature_list == 0)
+ 		__asm__ ("cpucfg %0, %1" : "+&r"(cfg2_feature_list) : "r"(LOONGARCH_CFG2));
+	if (hwcap_feature_list == 0)
+		hwcap_feature_list = (sljit_u32)getauxval(AT_HWCAP);
+
+	return feature_type ? hwcap_feature_list : cfg2_feature_list;
+ }
 
 static sljit_s32 push_inst(struct sljit_compiler *compiler, sljit_ins ins)
 {
@@ -357,143 +411,273 @@ static sljit_s32 push_inst(struct sljit_compiler *compiler, sljit_ins ins)
 	return SLJIT_SUCCESS;
 }
 
-static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_ins *code, sljit_sw executable_offset)
+static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
 {
 	sljit_sw diff;
 	sljit_uw target_addr;
-	sljit_ins *inst;
-
-	inst = (sljit_ins *)jump->addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_uw orig_addr = jump->addr;
+	SLJIT_UNUSED_ARG(executable_offset);
 
+	jump->addr = jump_addr;
 	if (jump->flags & SLJIT_REWRITABLE_JUMP)
 		goto exit;
 
 	if (jump->flags & JUMP_ADDR)
 		target_addr = jump->u.target;
 	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		target_addr = (sljit_uw)(code + jump->u.label->size) + (sljit_uw)executable_offset;
+		SLJIT_ASSERT(jump->u.label != NULL);
+		target_addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > orig_addr)
+			jump_addr = (sljit_uw)(code + orig_addr);
 	}
 
-	diff = (sljit_sw)target_addr - (sljit_sw)inst - executable_offset;
+	diff = (sljit_sw)target_addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
 
 	if (jump->flags & IS_COND) {
-		inst--;
 		diff += SSIZE_OF(ins);
 
 		if (diff >= BRANCH16_MIN && diff <= BRANCH16_MAX) {
+			code_ptr--;
+			code_ptr[0] = (code_ptr[0] & 0xfc0003ff) ^ 0x4000000;
 			jump->flags |= PATCH_B;
-			inst[0] = (inst[0] & 0xfc0003ff) ^ 0x4000000;
-			jump->addr = (sljit_uw)inst;
-			return inst;
+			jump->addr = (sljit_uw)code_ptr;
+			return code_ptr;
 		}
 
-		inst++;
 		diff -= SSIZE_OF(ins);
 	}
 
 	if (diff >= JUMP_MIN && diff <= JUMP_MAX) {
 		if (jump->flags & IS_COND) {
-			inst[-1] |= (sljit_ins)IMM_I16(2);
+			code_ptr[-1] |= (sljit_ins)IMM_I16(2);
 		}
 
 		jump->flags |= PATCH_J;
-		return inst;
+		return code_ptr;
 	}
 
 	if (diff >= S32_MIN && diff <= S32_MAX) {
 		if (jump->flags & IS_COND)
-			inst[-1] |= (sljit_ins)IMM_I16(3);
+			code_ptr[-1] |= (sljit_ins)IMM_I16(3);
 
 		jump->flags |= PATCH_REL32;
-		inst[1] = inst[0];
-		return inst + 1;
+		code_ptr[1] = code_ptr[0];
+		return code_ptr + 1;
 	}
 
 	if (target_addr <= (sljit_uw)S32_MAX) {
 		if (jump->flags & IS_COND)
-			inst[-1] |= (sljit_ins)IMM_I16(3);
+			code_ptr[-1] |= (sljit_ins)IMM_I16(3);
 
 		jump->flags |= PATCH_ABS32;
-		inst[1] = inst[0];
-		return inst + 1;
+		code_ptr[1] = code_ptr[0];
+		return code_ptr + 1;
 	}
 
 	if (target_addr <= S52_MAX) {
 		if (jump->flags & IS_COND)
-			inst[-1] |= (sljit_ins)IMM_I16(4);
+			code_ptr[-1] |= (sljit_ins)IMM_I16(4);
 
 		jump->flags |= PATCH_ABS52;
-		inst[2] = inst[0];
-		return inst + 2;
+		code_ptr[2] = code_ptr[0];
+		return code_ptr + 2;
 	}
 
 exit:
 	if (jump->flags & IS_COND)
-		inst[-1] |= (sljit_ins)IMM_I16(5);
-	inst[3] = inst[0];
-	return inst + 3;
+		code_ptr[-1] |= (sljit_ins)IMM_I16(5);
+	code_ptr[3] = code_ptr[0];
+	return code_ptr + 3;
 }
 
-static SLJIT_INLINE sljit_sw put_label_get_length(struct sljit_put_label *put_label, sljit_uw max_label)
+static SLJIT_INLINE sljit_sw mov_addr_get_length(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
 {
-	if (max_label <= (sljit_uw)S32_MAX) {
-		put_label->flags = PATCH_ABS32;
+	sljit_uw addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_sw diff;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	SLJIT_ASSERT(jump->flags < ((sljit_uw)6 << JUMP_SIZE_SHIFT));
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else {
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > jump->addr)
+			jump_addr = (sljit_uw)(code + jump->addr);
+	}
+
+	diff = (sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
+
+	if (diff >= S32_MIN && diff <= S32_MAX) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)1 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_REL32;
 		return 1;
 	}
 
-	if (max_label <= S52_MAX) {
-		put_label->flags = PATCH_ABS52;
+	if (addr <= S32_MAX) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)1 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS32;
+		return 1;
+	}
+
+	if (addr <= S52_MAX) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)2 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS52;
 		return 2;
 	}
 
-	put_label->flags = 0;
+	SLJIT_ASSERT(jump->flags >= ((sljit_uw)3 << JUMP_SIZE_SHIFT));
 	return 3;
 }
 
-static SLJIT_INLINE void load_addr_to_reg(void *dst, sljit_u32 reg)
+static SLJIT_INLINE void load_addr_to_reg(struct sljit_jump *jump, sljit_sw executable_offset)
 {
-	struct sljit_jump *jump = NULL;
-	struct sljit_put_label *put_label;
-	sljit_uw flags;
-	sljit_ins *inst;
-	sljit_uw addr;
+	sljit_uw flags = jump->flags;
+	sljit_uw addr = (flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
+	sljit_ins *ins = (sljit_ins*)jump->addr;
+	sljit_u32 reg = (flags & JUMP_MOV_ADDR) ? *ins : TMP_REG1;
+	SLJIT_UNUSED_ARG(executable_offset);
 
-	if (reg != 0) {
-		jump = (struct sljit_jump*)dst;
-		flags = jump->flags;
-		inst = (sljit_ins*)jump->addr;
-		addr = (flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
-	} else {
-		put_label = (struct sljit_put_label*)dst;
-		flags = put_label->flags;
-		inst = (sljit_ins*)put_label->addr;
-		addr = put_label->label->addr;
-		reg = *inst;
+	if (flags & PATCH_REL32) {
+		addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(ins, executable_offset);
+
+		SLJIT_ASSERT((sljit_sw)addr >= S32_MIN && (sljit_sw)addr <= S32_MAX);
+
+		if ((addr & 0x800) != 0)
+			addr += 0x1000;
+
+		ins[0] = PCADDU12I | RD(reg) | IMM_I20(addr);
+
+		if (!(flags & JUMP_MOV_ADDR)) {
+			SLJIT_ASSERT((ins[1] & OPC_2RI16(0x3f)) == JIRL);
+			ins[1] = (ins[1] & (OPC_2RI16(0x3f) | 0x3ff)) | IMM_I16((addr & 0xfff) >> 2);
+		} else
+			ins[1] = ADDI_D | RD(reg) | RJ(reg) | IMM_I12(addr);
+		return;
 	}
 
 	if (flags & PATCH_ABS32) {
 		SLJIT_ASSERT(addr <= S32_MAX);
-		inst[0] = LU12I_W | RD(reg) | (sljit_ins)(((addr & 0xffffffff) >> 12) << 5);
+		ins[0] = LU12I_W | RD(reg) | (sljit_ins)(((addr & 0xffffffff) >> 12) << 5);
 	} else if (flags & PATCH_ABS52) {
-		inst[0] = LU12I_W | RD(reg) | (sljit_ins)(((addr & 0xffffffff) >> 12) << 5);
-		inst[1] = LU32I_D | RD(reg) | (sljit_ins)(((addr >> 32) & 0xfffff) << 5);
-		inst += 1;
+		ins[0] = LU12I_W | RD(reg) | (sljit_ins)(((addr & 0xffffffff) >> 12) << 5);
+		ins[1] = LU32I_D | RD(reg) | (sljit_ins)(((addr >> 32) & 0xfffff) << 5);
+		ins += 1;
 	} else {
-		inst[0] = LU12I_W | RD(reg) | (sljit_ins)(((addr & 0xffffffff) >> 12) << 5);
-		inst[1] = LU32I_D | RD(reg) | (sljit_ins)(((addr >> 32) & 0xfffff) << 5);
-		inst[2] = LU52I_D | RD(reg) | RJ(reg) | IMM_I12(addr >> 52);
-		inst += 2;
+		ins[0] = LU12I_W | RD(reg) | (sljit_ins)(((addr & 0xffffffff) >> 12) << 5);
+		ins[1] = LU32I_D | RD(reg) | (sljit_ins)(((addr >> 32) & 0xfffff) << 5);
+		ins[2] = LU52I_D | RD(reg) | RJ(reg) | IMM_I12(addr >> 52);
+		ins += 2;
 	}
 
-	if (jump != NULL) {
-		SLJIT_ASSERT((inst[1] & OPC_2RI16(0x3f)) == JIRL);
-		inst[1] = (inst[1] & (OPC_2RI16(0x3f) | 0x3ff)) | IMM_I16((addr & 0xfff) >> 2);
+	if (!(flags & JUMP_MOV_ADDR)) {
+		SLJIT_ASSERT((ins[1] & OPC_2RI16(0x3f)) == JIRL);
+		ins[1] = (ins[1] & (OPC_2RI16(0x3f) | 0x3ff)) | IMM_I16((addr & 0xfff) >> 2);
 	} else
-		inst[1] = ORI | RD(reg) | RJ(reg) | IMM_I12(addr);
+		ins[1] = ORI | RD(reg) | RJ(reg) | IMM_I12(addr);
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+static void reduce_code_size(struct sljit_compiler *compiler)
+{
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	struct sljit_const *const_;
+	SLJIT_NEXT_DEFINE_TYPES;
+	sljit_uw total_size;
+	sljit_uw size_reduce = 0;
+	sljit_sw diff;
+
+	label = compiler->labels;
+	jump = compiler->jumps;
+	const_ = compiler->consts;
+
+	SLJIT_NEXT_INIT_TYPES();
+
+	while (1) {
+		SLJIT_GET_NEXT_MIN();
+
+		if (next_min_addr == SLJIT_MAX_ADDRESS)
+			break;
+
+		if (next_min_addr == next_label_size) {
+			label->size -= size_reduce;
+
+			label = label->next;
+			next_label_size = SLJIT_GET_NEXT_SIZE(label);
+		}
+
+		if (next_min_addr == next_const_addr) {
+			const_->addr -= size_reduce;
+			const_ = const_->next;
+			next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+			continue;
+		}
+
+		if (next_min_addr != next_jump_addr)
+			continue;
+
+		jump->addr -= size_reduce;
+		if (!(jump->flags & JUMP_MOV_ADDR)) {
+			total_size = JUMP_MAX_SIZE;
+
+			if (!(jump->flags & SLJIT_REWRITABLE_JUMP)) {
+				if (jump->flags & JUMP_ADDR) {
+					if (jump->u.target <= S32_MAX)
+							total_size = 2;
+					else if (jump->u.target <= S52_MAX)
+							total_size = 3;
+				} else {
+					/* Unit size: instruction. */
+					diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+					if (jump->u.label->size > jump->addr) {
+						SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+						diff -= (sljit_sw)size_reduce;
+					}
+
+					if ((jump->flags & IS_COND) && (diff + 1) <= (BRANCH16_MAX / SSIZE_OF(ins)) && (diff + 1) >= (BRANCH16_MIN / SSIZE_OF(ins)))
+						total_size = 0;
+					else if (diff >= (JUMP_MIN / SSIZE_OF(ins)) && diff <= (JUMP_MAX / SSIZE_OF(ins)))
+						total_size = 1;
+					else if (diff >= (S32_MIN / SSIZE_OF(ins)) && diff <= (S32_MAX / SSIZE_OF(ins)))
+						total_size = 2;
+				}
+			}
+
+			size_reduce += JUMP_MAX_SIZE - total_size;
+			jump->flags |= total_size << JUMP_SIZE_SHIFT;
+		} else {
+			total_size = 3;
+
+			if (!(jump->flags & JUMP_ADDR)) {
+				/* Real size minus 1. Unit size: instruction. */
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+				if (jump->u.label->size > jump->addr) {
+					SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+					diff -= (sljit_sw)size_reduce;
+				}
+
+				if (diff >= (S32_MIN / SSIZE_OF(ins)) && diff <= (S32_MAX / SSIZE_OF(ins)))
+					total_size = 1;
+			} else if (jump->u.target < S32_MAX)
+				total_size = 1;
+			else if (jump->u.target <= S52_MAX)
+				total_size = 2;
+
+			size_reduce += 3 - total_size;
+			jump->flags |= total_size << JUMP_SIZE_SHIFT;
+		}
+
+		jump = jump->next;
+		next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+	}
+
+	compiler->size -= size_reduce;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_ins *code;
@@ -501,70 +685,71 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	sljit_ins *buf_ptr;
 	sljit_ins *buf_end;
 	sljit_uw word_count;
-	sljit_uw next_addr;
+	SLJIT_NEXT_DEFINE_TYPES;
 	sljit_sw executable_offset;
 	sljit_uw addr;
 
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
 
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins), compiler->exec_allocator_data);
+	reduce_code_size(compiler);
+
+	code = (sljit_ins*)allocate_executable_memory(compiler->size * sizeof(sljit_ins), options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
+
+	reverse_buf(compiler);
 	buf = compiler->buf;
 
 	code_ptr = code;
 	word_count = 0;
-	next_addr = 0;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
-
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
 
 	do {
 		buf_ptr = (sljit_ins*)buf->memory;
 		buf_end = buf_ptr + (buf->used_size >> 2);
 		do {
 			*code_ptr = *buf_ptr++;
-			if (next_addr == word_count) {
+			if (next_min_addr == word_count) {
 				SLJIT_ASSERT(!label || label->size >= word_count);
 				SLJIT_ASSERT(!jump || jump->addr >= word_count);
 				SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-				SLJIT_ASSERT(!put_label || put_label->addr >= word_count);
 
 				/* These structures are ordered by their address. */
-				if (label && label->size == word_count) {
-					label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+				if (next_min_addr == next_label_size) {
+					label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 					label->size = (sljit_uw)(code_ptr - code);
 					label = label->next;
+					next_label_size = SLJIT_GET_NEXT_SIZE(label);
 				}
-				if (jump && jump->addr == word_count) {
-					word_count += 3;
-					jump->addr = (sljit_uw)code_ptr;
-					code_ptr = detect_jump_type(jump, code, executable_offset);
+
+				if (next_min_addr == next_jump_addr) {
+					if (!(jump->flags & JUMP_MOV_ADDR)) {
+						word_count = word_count - 1 + (jump->flags >> JUMP_SIZE_SHIFT);
+						code_ptr = detect_jump_type(jump, code_ptr, code, executable_offset);
+						SLJIT_ASSERT((jump->flags & PATCH_B) || ((sljit_uw)code_ptr - jump->addr < (jump->flags >> JUMP_SIZE_SHIFT) * sizeof(sljit_ins)));
+					} else {
+						word_count += jump->flags >> JUMP_SIZE_SHIFT;
+						addr = (sljit_uw)code_ptr;
+						code_ptr += mov_addr_get_length(jump, code_ptr, code, executable_offset);
+						jump->addr = addr;
+					}
 					jump = jump->next;
-				}
-				if (const_ && const_->addr == word_count) {
+					next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+				} else if (next_min_addr == next_const_addr) {
 					const_->addr = (sljit_uw)code_ptr;
 					const_ = const_->next;
+					next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
 				}
-				if (put_label && put_label->addr == word_count) {
-					SLJIT_ASSERT(put_label->label);
-					put_label->addr = (sljit_uw)code_ptr;
 
-					code_ptr += put_label_get_length(put_label, (sljit_uw)(SLJIT_ADD_EXEC_OFFSET(code, executable_offset) + put_label->label->size));
-					word_count += 3;
-
-					put_label = put_label->next;
-				}
-				next_addr = compute_next_addr(label, jump, const_, put_label);
+				SLJIT_GET_NEXT_MIN();
 			}
 			code_ptr++;
 			word_count++;
@@ -574,7 +759,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	} while (buf);
 
 	if (label && label->size == word_count) {
-		label->addr = (sljit_uw)code_ptr;
+		label->u.addr = (sljit_uw)code_ptr;
 		label->size = (sljit_uw)(code_ptr - code);
 		label = label->next;
 	}
@@ -582,18 +767,17 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)compiler->size);
 
 	jump = compiler->jumps;
 	while (jump) {
 		do {
-			if (!(jump->flags & (PATCH_B | PATCH_J | PATCH_REL32))) {
-				load_addr_to_reg(jump, TMP_REG1);
+			if (!(jump->flags & (PATCH_B | PATCH_J)) || (jump->flags & JUMP_MOV_ADDR)) {
+				load_addr_to_reg(jump, executable_offset);
 				break;
 			}
 
-			addr = (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
+			addr = (jump->flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
 			buf_ptr = (sljit_ins *)jump->addr;
 			addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset);
 
@@ -603,15 +787,6 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 				break;
 			}
 
-			if (jump->flags & PATCH_REL32) {
-				SLJIT_ASSERT((sljit_sw)addr >= S32_MIN && (sljit_sw)addr <= S32_MAX);
-
-				buf_ptr[0] = PCADDU12I | RD(TMP_REG1) | (sljit_ins)((sljit_sw)addr & ~0xfff);
-				SLJIT_ASSERT((buf_ptr[1] & OPC_2RI16(0x3f)) == JIRL);
-				buf_ptr[1] |= IMM_I16((addr & 0xfff) >> 2);
-				break;
-			}
-
 			SLJIT_ASSERT((sljit_sw)addr >= JUMP_MIN && (sljit_sw)addr <= JUMP_MAX);
 			if (jump->flags & IS_CALL)
 				buf_ptr[0] = BL | (sljit_ins)IMM_I26(addr >> 2);
@@ -621,12 +796,6 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 		jump = jump->next;
 	}
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-		load_addr_to_reg(put_label, 0);
-		put_label = put_label->next;
-	}
-
 	compiler->error = SLJIT_ERR_COMPILED;
 	compiler->executable_offset = executable_offset;
 	compiler->executable_size = (sljit_uw)(code_ptr - code) * sizeof(sljit_ins);
@@ -651,8 +820,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 		return 1;
 #endif
 
-	case SLJIT_HAS_ATOMIC:
-		return (LOONGARCH_FEATURE_LAMCAS & get_cpu_features());
+	case SLJIT_HAS_LASX:
+		return (LOONGARCH_HWCAP_LASX & get_cpu_features(GET_HWCAP));
+
+	case SLJIT_HAS_SIMD:
+		return (LOONGARCH_HWCAP_LSX & get_cpu_features(GET_HWCAP));
 
 	case SLJIT_HAS_CLZ:
 	case SLJIT_HAS_CTZ:
@@ -661,6 +833,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_PREFETCH:
 	case SLJIT_HAS_COPY_F32:
 	case SLJIT_HAS_COPY_F64:
+	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
 		return 1;
 
 	default:
@@ -707,6 +881,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_cmp_info(sljit_s32 type)
 #define SLOW_SRC1	0x08000
 #define SLOW_SRC2	0x10000
 #define SLOW_DEST	0x20000
+#define MEM_USE_TMP2	0x40000
 
 #define STACK_STORE	ST_D
 #define STACK_LOAD	LD_D
@@ -735,16 +910,22 @@ static sljit_s32 load_immediate(struct sljit_compiler *compiler, sljit_s32 dst_r
 static sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg, sljit_s32 arg, sljit_sw argw);
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 i, tmp, offset;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - saved_arg_count, 1);
 	local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 
@@ -819,13 +1000,20 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 #undef STACK_MAX_DISTANCE
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
-	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 
+	CHECK_ERROR();
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 1);
 	local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 
@@ -1039,7 +1227,7 @@ static sljit_s32 can_cache(sljit_s32 arg, sljit_sw argw, sljit_s32 next_arg, slj
 static sljit_s32 getput_arg(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg, sljit_s32 arg, sljit_sw argw, sljit_s32 next_arg, sljit_sw next_argw)
 {
 	sljit_s32 base = arg & REG_MASK;
-	sljit_s32 tmp_r = TMP_REG1;
+	sljit_s32 tmp_r = (flags & MEM_USE_TMP2) ? TMP_REG2 : TMP_REG1;
 	sljit_sw offset;
 
 	SLJIT_ASSERT(arg & SLJIT_MEM);
@@ -1048,11 +1236,6 @@ static sljit_s32 getput_arg(struct sljit_compiler *compiler, sljit_s32 flags, sl
 		next_argw = 0;
 	}
 
-	/* Since tmp can be the same as base or offset registers,
-	 * these might be unavailable after modifying tmp. */
-	if ((flags & MEM_MASK) <= GPR_REG && (flags & LOAD_DATA))
-		tmp_r = reg;
-
 	if (SLJIT_UNLIKELY(arg & OFFS_REG_MASK)) {
 		argw &= 0x3;
 
@@ -1149,8 +1332,7 @@ static SLJIT_INLINE sljit_s32 emit_op_mem2(struct sljit_compiler *compiler, slji
 				FAIL_IF(push_inst(compiler, op_reg | RD(dst) | RJ(src1) | RK(dst))); \
 			} \
 		} \
-	} \
-	else { \
+	} else { \
 		if (op & SLJIT_SET_Z) \
 			FAIL_IF(push_inst(compiler, op_reg | RD(EQUAL_FLAG) | RJ(src1) | RK(src2))); \
 		if (!(flags & UNUSED_DEST)) \
@@ -1165,88 +1347,88 @@ static SLJIT_INLINE sljit_s32 emit_op_mem2(struct sljit_compiler *compiler, slji
 static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s32 flags,
 	sljit_s32 dst, sljit_s32 src1, sljit_sw src2)
 {
-	sljit_s32 is_overflow, is_carry, carry_src_r, is_handled;
+	sljit_s32 is_overflow, is_carry, carry_src_r, is_handled, reg;
 	sljit_ins op_imm, op_reg;
 	sljit_ins word_size = ((op & SLJIT_32) ? 32 : 64);
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if (dst != src2)
 			return push_inst(compiler, INST(ADD, op) | RD(dst) | RJ(src2) | IMM_I12(0));
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_U8:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, ANDI | RD(dst) | RJ(src2) | IMM_I12(0xff));
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_S8:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, EXT_W_B | RD(dst) | RJ(src2));
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_U16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, INST(BSTRPICK, op) | RD(dst) | RJ(src2) | (15 << 16));
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_S16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, EXT_W_H | RD(dst) | RJ(src2));
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_U32:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, BSTRPICK_D | RD(dst) | RJ(src2) | (31 << 16));
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_S32:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, SLLI_W | RD(dst) | RJ(src2) | IMM_I12(0));
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
 
 	case SLJIT_CLZ:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		return push_inst(compiler, INST(CLZ, op) | RD(dst) | RJ(src2));
 
 	case SLJIT_CTZ:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		return push_inst(compiler, INST(CTZ, op) | RD(dst) | RJ(src2));
 
 	case SLJIT_REV:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		return push_inst(compiler, ((op & SLJIT_32) ? REVB_2W : REVB_D) | RD(dst) | RJ(src2));
 
 	case SLJIT_REV_S16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		FAIL_IF(push_inst(compiler, REVB_2H | RD(dst) | RJ(src2)));
 		return push_inst(compiler, EXT_W_H | RD(dst) | RJ(dst));
 
 	case SLJIT_REV_U16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		FAIL_IF(push_inst(compiler, REVB_2H | RD(dst) | RJ(src2)));
 		return push_inst(compiler, INST(BSTRPICK, op) | RD(dst) | RJ(dst) | (15 << 16));
 
 	case SLJIT_REV_S32:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM) && dst != TMP_REG1);
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM) && dst != TMP_REG1);
 		FAIL_IF(push_inst(compiler, REVB_2W | RD(dst) | RJ(src2)));
 		return push_inst(compiler, SLLI_W | RD(dst) | RJ(dst) | IMM_I12(0));
 
 	case SLJIT_REV_U32:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM) && dst != TMP_REG1);
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM) && dst != TMP_REG1);
 		FAIL_IF(push_inst(compiler, REVB_2W | RD(dst) | RJ(src2)));
 		return push_inst(compiler, BSTRPICK_D | RD(dst) | RJ(dst) | (31 << 16));
 
@@ -1263,15 +1445,13 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 					FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(EQUAL_FLAG) | RJ(TMP_ZERO) | IMM_I12(-1)));
 					FAIL_IF(push_inst(compiler, XOR | RD(EQUAL_FLAG) | RJ(src1) | RK(EQUAL_FLAG)));
 				}
-			}
-			else if (op & SLJIT_SET_Z)
+			} else if (op & SLJIT_SET_Z)
 				FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(EQUAL_FLAG) | RJ(src1) | IMM_I12(src2)));
 
 			/* Only the zero flag is needed. */
 			if (!(flags & UNUSED_DEST) || (op & VARIABLE_FLAG_MASK))
 				FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(dst) | RJ(src1) | IMM_I12(src2)));
-		}
-		else {
+		} else {
 			if (is_overflow)
 				FAIL_IF(push_inst(compiler, XOR | RD(EQUAL_FLAG) | RJ(src1) | RK(src2)));
 			else if (op & SLJIT_SET_Z)
@@ -1361,8 +1541,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 			if (GET_FLAG_TYPE(op) == SLJIT_LESS) {
 				FAIL_IF(push_inst(compiler, SLTUI | RD(OTHER_FLAG) | RJ(src1) | IMM_I12(src2)));
 				is_handled = 1;
-			}
-			else if (GET_FLAG_TYPE(op) == SLJIT_SIG_LESS) {
+			} else if (GET_FLAG_TYPE(op) == SLJIT_SIG_LESS) {
 				FAIL_IF(push_inst(compiler, SLTI | RD(OTHER_FLAG) | RJ(src1) | IMM_I12(src2)));
 				is_handled = 1;
 			}
@@ -1372,8 +1551,9 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 			is_handled = 1;
 
 			if (flags & SRC2_IMM) {
-				FAIL_IF(push_inst(compiler, ADDI_D | RD(TMP_REG2) | RJ(TMP_ZERO) | IMM_I12(src2)));
-				src2 = TMP_REG2;
+				reg = (src1 == TMP_REG1) ? TMP_REG2 : TMP_REG1;
+				FAIL_IF(push_inst(compiler, ADDI_D | RD(reg) | RJ(TMP_ZERO) | IMM_I12(src2)));
+				src2 = reg;
 				flags &= ~SRC2_IMM;
 			}
 
@@ -1399,8 +1579,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 					FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(EQUAL_FLAG) | RJ(src1) | IMM_I12(-src2)));
 				if (!(flags & UNUSED_DEST))
 					return push_inst(compiler, INST(ADDI, op) | RD(dst) | RJ(src1) | IMM_I12(-src2));
-			}
-			else {
+			} else {
 				if (op & SLJIT_SET_Z)
 					FAIL_IF(push_inst(compiler, INST(SUB, op) | RD(EQUAL_FLAG) | RJ(src1) | RK(src2)));
 				if (!(flags & UNUSED_DEST))
@@ -1420,8 +1599,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 					FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(EQUAL_FLAG) | RJ(src1) | IMM_I12(-1)));
 					FAIL_IF(push_inst(compiler, XOR | RD(EQUAL_FLAG) | RJ(src1) | RK(EQUAL_FLAG)));
 				}
-			}
-			else if (op & SLJIT_SET_Z)
+			} else if (op & SLJIT_SET_Z)
 				FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(EQUAL_FLAG) | RJ(src1) | IMM_I12(-src2)));
 
 			if (is_overflow || is_carry)
@@ -1430,8 +1608,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 			/* Only the zero flag is needed. */
 			if (!(flags & UNUSED_DEST) || (op & VARIABLE_FLAG_MASK))
 				FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(dst) | RJ(src1) | IMM_I12(-src2)));
-		}
-		else {
+		} else {
 			if (is_overflow)
 				FAIL_IF(push_inst(compiler, XOR | RD(EQUAL_FLAG) | RJ(src1) | RK(src2)));
 			else if (op & SLJIT_SET_Z)
@@ -1468,8 +1645,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 				FAIL_IF(push_inst(compiler, SLTUI | RD(EQUAL_FLAG) | RJ(src1) | IMM_I12(src2)));
 
 			FAIL_IF(push_inst(compiler, INST(ADDI, op) | RD(dst) | RJ(src1) | IMM_I12(-src2)));
-		}
-		else {
+		} else {
 			if (is_carry)
 				FAIL_IF(push_inst(compiler, SLTU | RD(EQUAL_FLAG) | RJ(src1) | RK(src2)));
 
@@ -1550,7 +1726,6 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 			if (GET_OPCODE(op) == SLJIT_ROTL)
 				src2 = word_size - src2;
 			return push_inst(compiler, INST(ROTRI, op) | RD(dst) | RJ(src1) | IMM_I12(src2));
-
 		}
 
 		if (src2 == TMP_ZERO) {
@@ -1601,7 +1776,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	sljit_s32 dst_r = TMP_REG2;
 	sljit_s32 src1_r;
 	sljit_sw src2_r = 0;
-	sljit_s32 sugg_src2_r = TMP_REG2;
+	sljit_s32 src2_tmp_reg = (GET_OPCODE(op) >= SLJIT_OP2_BASE && FAST_IS_REG(src1)) ? TMP_REG1 : TMP_REG2;
 
 	if (!(flags & ALT_KEEP_CACHE)) {
 		compiler->cache_arg = 0;
@@ -1612,22 +1787,19 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		SLJIT_ASSERT(HAS_FLAGS(op));
 		flags |= UNUSED_DEST;
 		dst = TMP_REG2;
-	}
-	else if (FAST_IS_REG(dst)) {
+	} else if (FAST_IS_REG(dst)) {
 		dst_r = dst;
 		flags |= REG_DEST;
 		if (flags & MOVE_OP)
-			sugg_src2_r = dst_r;
-	}
-	else if ((dst & SLJIT_MEM) && !getput_arg_fast(compiler, flags | ARG_TEST, TMP_REG1, dst, dstw))
+			src2_tmp_reg = dst_r;
+	} else if ((dst & SLJIT_MEM) && !getput_arg_fast(compiler, flags | ARG_TEST, TMP_REG1, dst, dstw))
 		flags |= SLOW_DEST;
 
 	if (flags & IMM_OP) {
 		if (src2 == SLJIT_IMM && src2w != 0 && src2w <= I12_MAX && src2w >= I12_MIN) {
 			flags |= SRC2_IMM;
 			src2_r = src2w;
-		}
-		else if ((flags & CUMULATIVE_OP) && src1 == SLJIT_IMM && src1w != 0 && src1w <= I12_MAX && src1w >= I12_MIN) {
+		} else if ((flags & CUMULATIVE_OP) && src1 == SLJIT_IMM && src1w != 0 && src1w <= I12_MAX && src1w >= I12_MIN) {
 			flags |= SRC2_IMM;
 			src2_r = src1w;
 
@@ -1643,16 +1815,14 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	if (FAST_IS_REG(src1)) {
 		src1_r = src1;
 		flags |= REG1_SOURCE;
-	}
-	else if (src1 == SLJIT_IMM) {
+	} else if (src1 == SLJIT_IMM) {
 		if (src1w) {
 			FAIL_IF(load_immediate(compiler, TMP_REG1, src1w));
 			src1_r = TMP_REG1;
 		}
 		else
 			src1_r = TMP_ZERO;
-	}
-	else {
+	} else {
 		if (getput_arg_fast(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w))
 			FAIL_IF(compiler->error);
 		else
@@ -1666,14 +1836,12 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		flags |= REG2_SOURCE;
 		if ((flags & (REG_DEST | MOVE_OP)) == MOVE_OP)
 			dst_r = (sljit_s32)src2_r;
-	}
-	else if (src2 == SLJIT_IMM) {
+	} else if (src2 == SLJIT_IMM) {
 		if (!(flags & SRC2_IMM)) {
 			if (src2w) {
-				FAIL_IF(load_immediate(compiler, sugg_src2_r, src2w));
-				src2_r = sugg_src2_r;
-			}
-			else {
+				FAIL_IF(load_immediate(compiler, src2_tmp_reg, src2w));
+				src2_r = src2_tmp_reg;
+			} else {
 				src2_r = TMP_ZERO;
 				if (flags & MOVE_OP) {
 					if (dst & SLJIT_MEM)
@@ -1683,31 +1851,29 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 				}
 			}
 		}
-	}
-	else {
-		if (getput_arg_fast(compiler, flags | LOAD_DATA, sugg_src2_r, src2, src2w))
+	} else {
+		if (getput_arg_fast(compiler, flags | LOAD_DATA, src2_tmp_reg, src2, src2w))
 			FAIL_IF(compiler->error);
 		else
 			flags |= SLOW_SRC2;
 
-		src2_r = sugg_src2_r;
+		src2_r = src2_tmp_reg;
 	}
 
 	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
 		SLJIT_ASSERT(src2_r == TMP_REG2);
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
+		if ((flags & SLOW_DEST) && !can_cache(src2, src2w, src1, src1w) && can_cache(src2, src2w, dst, dstw)) {
+			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, src2, src2w));
+			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA | MEM_USE_TMP2, TMP_REG2, src2, src2w, dst, dstw));
+		} else {
 			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG2, src2, src2w, src1, src1w));
 			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
 		}
-		else {
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, src2, src2w));
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG2, src2, src2w, dst, dstw));
-		}
 	}
 	else if (flags & SLOW_SRC1)
 		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
 	else if (flags & SLOW_SRC2)
-		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, sugg_src2_r, src2, src2w, dst, dstw));
+		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA | ((src1_r == TMP_REG1) ? MEM_USE_TMP2 : 0), src2_tmp_reg, src2, src2w, dst, dstw));
 
 	FAIL_IF(emit_single_op(compiler, op, flags, dst_r, src1_r, src2_r));
 
@@ -1752,6 +1918,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 		return push_inst(compiler, ((op & SLJIT_32)? DIV_WU: DIV_DU) | RD(SLJIT_R0) | RJ(SLJIT_R0) | RK(SLJIT_R1));
 	case SLJIT_DIV_SW:
 		return push_inst(compiler, INST(DIV, op) | RD(SLJIT_R0) | RJ(SLJIT_R0) | RK(SLJIT_R1));
+	case SLJIT_MEMORY_BARRIER:
+		return push_inst(compiler, DBAR);
 	case SLJIT_ENDBR:
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
 		return SLJIT_SUCCESS;
@@ -1778,40 +1946,40 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV:
 	case SLJIT_MOV_P:
-		return emit_op(compiler, SLJIT_MOV, WORD_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, SLJIT_MOV, WORD_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, srcw);
 
 	case SLJIT_MOV_U32:
-		return emit_op(compiler, SLJIT_MOV_U32, INT_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_u32)srcw : srcw);
+		return emit_op(compiler, SLJIT_MOV_U32, INT_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_u32)srcw : srcw);
 
 	case SLJIT_MOV_S32:
 	/* Logical operators have no W variant, so sign extended input is necessary for them. */
 	case SLJIT_MOV32:
-		return emit_op(compiler, SLJIT_MOV_S32, INT_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_s32)srcw : srcw);
+		return emit_op(compiler, SLJIT_MOV_S32, INT_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_s32)srcw : srcw);
 
 	case SLJIT_MOV_U8:
-		return emit_op(compiler, op, BYTE_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_u8)srcw : srcw);
+		return emit_op(compiler, op, BYTE_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_u8)srcw : srcw);
 
 	case SLJIT_MOV_S8:
-		return emit_op(compiler, op, BYTE_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_s8)srcw : srcw);
+		return emit_op(compiler, op, BYTE_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_s8)srcw : srcw);
 
 	case SLJIT_MOV_U16:
-		return emit_op(compiler, op, HALF_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_u16)srcw : srcw);
+		return emit_op(compiler, op, HALF_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_u16)srcw : srcw);
 
 	case SLJIT_MOV_S16:
-		return emit_op(compiler, op, HALF_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_s16)srcw : srcw);
+		return emit_op(compiler, op, HALF_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_s16)srcw : srcw);
 
 	case SLJIT_CLZ:
 	case SLJIT_CTZ:
 	case SLJIT_REV:
-		return emit_op(compiler, op, flags, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, op, flags, dst, dstw, TMP_ZERO, 0, src, srcw);
 
 	case SLJIT_REV_U16:
 	case SLJIT_REV_S16:
-		return emit_op(compiler, op, HALF_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, op, HALF_DATA, dst, dstw, TMP_ZERO, 0, src, srcw);
 
 	case SLJIT_REV_U32:
 	case SLJIT_REV_S32:
-		return emit_op(compiler, op | SLJIT_32, INT_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, op | SLJIT_32, INT_DATA, dst, dstw, TMP_ZERO, 0, src, srcw);
 	}
 
 	SLJIT_UNREACHABLE();
@@ -1893,6 +2061,24 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	return sljit_emit_op2(compiler, op, 0, 0, src1, src1w, src2, src2w);
 }
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		SLJIT_SKIP_CHECKS(compiler);
+		FAIL_IF(sljit_emit_op2(compiler, SLJIT_MUL | (op & SLJIT_32), TMP_REG2, 0, src1, src1w, src2, src2w));
+		return push_inst(compiler, ADD_D | RD(dst_reg) | RJ(dst_reg) | RK(TMP_REG2));
+	}
+
+	return SLJIT_SUCCESS;
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 dst_reg,
 	sljit_s32 src1_reg,
@@ -2045,7 +2231,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_register_index(sljit_s32 type, slji
 	if (type == SLJIT_GP_REGISTER)
 		return reg_map[reg];
 
-	if (type != SLJIT_FLOAT_REGISTER)
+	if (type != SLJIT_FLOAT_REGISTER && type != SLJIT_SIMD_REG_128 && type != SLJIT_SIMD_REG_256)
 		return -1;
 
 	return freg_map[reg];
@@ -2292,7 +2478,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV_F64:
 		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
+			if (!(dst & SLJIT_MEM))
 				FAIL_IF(push_inst(compiler, FINST(FMOV, op) | FRD(dst_r) | FRJ(src)));
 			else
 				dst_r = src;
@@ -2351,11 +2537,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 	}
 
 	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
+		if ((dst & SLJIT_MEM) && !can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, src1, src1w));
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, dst, dstw));
-		}
-		else {
+		} else {
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, src2, src2w));
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, dst, dstw));
 		}
@@ -2385,7 +2570,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 		break;
 	}
 
-	if (dst_r == TMP_FREG2)
+	if (dst_r != dst)
 		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op), TMP_FREG2, dst, dstw, 0, 0));
 	return SLJIT_SUCCESS;
 }
@@ -2495,10 +2680,8 @@ static sljit_ins get_jump_instruction(sljit_s32 type)
 {
 	switch (type) {
 	case SLJIT_EQUAL:
-	case SLJIT_ATOMIC_NOT_STORED:
 		return BNE | RJ(EQUAL_FLAG) | RD(TMP_ZERO);
 	case SLJIT_NOT_EQUAL:
-	case SLJIT_ATOMIC_STORED:
 		return BEQ | RJ(EQUAL_FLAG) | RD(TMP_ZERO);
 	case SLJIT_LESS:
 	case SLJIT_GREATER:
@@ -2506,6 +2689,7 @@ static sljit_ins get_jump_instruction(sljit_s32 type)
 	case SLJIT_SIG_GREATER:
 	case SLJIT_OVERFLOW:
 	case SLJIT_CARRY:
+	case SLJIT_ATOMIC_STORED:
 		return BEQ | RJ(OTHER_FLAG) | RD(TMP_ZERO);
 	case SLJIT_GREATER_EQUAL:
 	case SLJIT_LESS_EQUAL:
@@ -2513,6 +2697,7 @@ static sljit_ins get_jump_instruction(sljit_s32 type)
 	case SLJIT_SIG_LESS_EQUAL:
 	case SLJIT_NOT_OVERFLOW:
 	case SLJIT_NOT_CARRY:
+	case SLJIT_ATOMIC_NOT_STORED:
 		return BNE | RJ(OTHER_FLAG) | RD(TMP_ZERO);
 	case SLJIT_F_EQUAL:
 	case SLJIT_ORDERED_EQUAL:
@@ -2573,8 +2758,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	PTR_FAIL_IF(push_inst(compiler, inst));
 
 	/* Maximum number of instructions required for generating a constant. */
-	compiler->size += 3;
-
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return jump;
 }
 
@@ -2601,6 +2785,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	struct sljit_jump *jump;
 	sljit_s32 flags;
 	sljit_ins inst;
+	sljit_s32 src2_tmp_reg = FAST_IS_REG(src1) ? TMP_REG1 : TMP_REG2;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_emit_cmp(compiler, type, src1, src1w, src2, src2w));
@@ -2618,8 +2803,8 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	}
 
 	if (src2 & SLJIT_MEM) {
-		PTR_FAIL_IF(emit_op_mem2(compiler, flags, TMP_REG2, src2, src2w, 0, 0));
-		src2 = TMP_REG2;
+		PTR_FAIL_IF(emit_op_mem2(compiler, flags, src2_tmp_reg, src2, src2w, 0, 0));
+		src2 = src2_tmp_reg;
 	}
 
 	if (src1 == SLJIT_IMM) {
@@ -2633,8 +2818,8 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 
 	if (src2 == SLJIT_IMM) {
 		if (src2w != 0) {
-			PTR_FAIL_IF(load_immediate(compiler, TMP_REG2, src2w));
-			src2 = TMP_REG2;
+			PTR_FAIL_IF(load_immediate(compiler, src2_tmp_reg, src2w));
+			src2 = src2_tmp_reg;
 		}
 		else
 			src2 = TMP_ZERO;
@@ -2687,7 +2872,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	PTR_FAIL_IF(push_inst(compiler, JIRL | RD(TMP_ZERO) | RJ(TMP_REG1) | IMM_I12(0)));
 
 	/* Maximum number of instructions required for generating a constant. */
-	compiler->size += 3;
+	compiler->size += JUMP_MAX_SIZE - 1;
 
 	return jump;
 }
@@ -2718,7 +2903,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 	FAIL_IF(push_inst(compiler, JIRL | RD((type >= SLJIT_FAST_CALL) ? RETURN_ADDR_REG : TMP_ZERO) | RJ(TMP_REG1) | IMM_I12(0)));
 
 	/* Maximum number of instructions required for generating a constant. */
-	compiler->size += 3;
+	compiler->size += JUMP_MAX_SIZE - 1;
 
 	return SLJIT_SUCCESS;
 }
@@ -2784,7 +2969,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 			break;
 		case SLJIT_ATOMIC_STORED:
 		case SLJIT_ATOMIC_NOT_STORED:
-			FAIL_IF(push_inst(compiler, SLTUI | RD(dst_r) | RJ(EQUAL_FLAG) | IMM_I12(1)));
+			FAIL_IF(push_inst(compiler, SLTUI | RD(dst_r) | RJ(OTHER_FLAG) | IMM_I12(1)));
 			src_r = dst_r;
 			invert ^= 0x1;
 			break;
@@ -2860,13 +3045,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 			type ^= 0x1;
 		} else {
 			if (ADDRESSING_DEPENDS_ON(src1, dst_reg)) {
-				FAIL_IF(push_inst(compiler, ADDI_D | RD(TMP_REG2) | RJ(dst_reg) | IMM_I12(0)));
+				FAIL_IF(push_inst(compiler, ADDI_D | RD(TMP_REG1) | RJ(dst_reg) | IMM_I12(0)));
 
 				if ((src1 & REG_MASK) == dst_reg)
-					src1 = (src1 & ~REG_MASK) | TMP_REG2;
+					src1 = (src1 & ~REG_MASK) | TMP_REG1;
 
 				if (OFFS_REG(src1) == dst_reg)
-					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG2);
+					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG1);
 			}
 
 			FAIL_IF(push_inst(compiler, ADDI_D | RD(dst_reg) | RJ(src2_reg) | IMM_I12(0)));
@@ -2908,15 +3093,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *com
 		if ((type & ~SLJIT_32) == SLJIT_EQUAL)
 			invert = 1;
 		FAIL_IF(push_inst(compiler, MOVGR2CF | FCD(F_OTHER_FLAG) | RJ(EQUAL_FLAG)));
-	}
-	else
+	} else {
+		if (get_jump_instruction(type & ~SLJIT_32) == (BNE | RJ(OTHER_FLAG) | RD(TMP_ZERO)))
+			invert = 1;
 		FAIL_IF(push_inst(compiler, MOVGR2CF | FCD(F_OTHER_FLAG) | RJ(OTHER_FLAG)));
+	}
 
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem(compiler, FLOAT_DATA(type) | LOAD_DATA, dst_freg, src1, src1w));
+		FAIL_IF(emit_op_mem(compiler, FLOAT_DATA(type) | LOAD_DATA, TMP_FREG2, src1, src1w));
 		if (invert)
-			return push_inst(compiler, FSEL | FRD(dst_freg) | FRJ(dst_freg) | FRK(src2_freg) | FCA(F_OTHER_FLAG));
-		return push_inst(compiler, FSEL | FRD(dst_freg) | FRJ(src2_freg) | FRK(dst_freg) | FCA(F_OTHER_FLAG));
+			return push_inst(compiler, FSEL | FRD(dst_freg) | FRJ(TMP_FREG2) | FRK(src2_freg) | FCA(F_OTHER_FLAG));
+		return push_inst(compiler, FSEL | FRD(dst_freg) | FRJ(src2_freg) | FRK(TMP_FREG2) | FCA(F_OTHER_FLAG));
 	} else {
 		if (invert)
 			return push_inst(compiler, FSEL | FRD(dst_freg) | FRJ(src1) | FRK(src2_freg) | FCA(F_OTHER_FLAG));
@@ -2982,6 +3169,480 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_mem(struct sljit_compiler *compile
 
 #undef TO_ARGW_HI
 
+static sljit_s32 sljit_emit_simd_mem_offset(struct sljit_compiler *compiler, sljit_s32 *mem_ptr, sljit_sw memw)
+{
+	sljit_s32 mem = *mem_ptr;
+
+	if (SLJIT_UNLIKELY(mem & OFFS_REG_MASK)) {
+		*mem_ptr = TMP_REG3;
+		FAIL_IF(push_inst(compiler, SLLI_D | RD(TMP_REG3) | RJ(OFFS_REG(mem)) | IMM_I12(memw & 0x3)));
+		return push_inst(compiler, ADD_D | RD(TMP_REG3) | RJ(TMP_REG3) | RK(mem & REG_MASK));
+	}
+
+	if (!(mem & REG_MASK)) {
+		*mem_ptr = TMP_REG3;
+		return load_immediate(compiler, TMP_REG3, memw);
+	}
+
+	mem &= REG_MASK;
+
+	if (memw == 0) {
+		*mem_ptr = mem;
+		return SLJIT_SUCCESS;
+	}
+
+	*mem_ptr = TMP_REG3;
+
+	FAIL_IF(load_immediate(compiler, TMP_REG3, memw));
+	return push_inst(compiler, ADD_D | RD(TMP_REG3) | RJ(TMP_REG3) | RK(mem));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 srcdst, sljit_sw srcdstw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_ins ins = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
+
+	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
+
+	if (reg_size != 5 && reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (reg_size == 5 && !(get_cpu_features(GET_HWCAP) & LOONGARCH_HWCAP_LASX))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if (!(srcdst & SLJIT_MEM)) {
+		if (type & SLJIT_SIMD_STORE)
+			ins = FRD(srcdst) | FRJ(vreg) | FRK(vreg);
+		else
+			ins = FRD(vreg) | FRJ(srcdst) | FRK(srcdst);
+
+		if (reg_size == 5)
+			ins |= VOR_V | (sljit_ins)1 << 26;
+		else
+			ins |= VOR_V;
+
+		return push_inst(compiler, ins);
+	}
+
+	ins = (type & SLJIT_SIMD_STORE) ? VST : VLD;
+
+	if (reg_size == 5)
+		ins = (type & SLJIT_SIMD_STORE) ? XVST : XVLD;
+
+	if (FAST_IS_REG(srcdst) && srcdst >= 0 && (srcdstw >= I12_MIN && srcdstw <= I12_MAX))
+		return push_inst(compiler, ins | FRD(vreg) | RJ((sljit_u8)srcdst) | IMM_I12(srcdstw));
+	else {
+		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &srcdst, srcdstw));
+		return push_inst(compiler, ins | FRD(vreg) | RJ(srcdst) | IMM_I12(0));
+	}
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 src, sljit_sw srcw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins ins = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
+
+	ADJUST_LOCAL_OFFSET(src, srcw);
+
+	if (reg_size != 5 && reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (reg_size == 5 && !(get_cpu_features(GET_HWCAP) & LOONGARCH_HWCAP_LASX))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if (src & SLJIT_MEM) {
+		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src, srcw));
+
+		if (reg_size == 5)
+			ins = (sljit_ins)1 << 25;
+
+		return push_inst(compiler, VLDREPL | ins | FRD(vreg) | RJ(src) | (sljit_ins)1 << (23 - elem_size));
+	}
+
+	if (reg_size == 5)
+		ins = (sljit_ins)1 << 26;
+
+	if (type & SLJIT_SIMD_FLOAT) {
+		if (src == SLJIT_IMM)
+			return push_inst(compiler, VREPLGR2VR | ins | FRD(vreg) | RJ(TMP_ZERO) | (sljit_ins)elem_size << 10);
+
+		FAIL_IF(push_inst(compiler, VREPLVE | ins | FRD(vreg) | FRJ(src) | RK(TMP_ZERO) | (sljit_ins)elem_size << 15));
+
+		if (reg_size == 5) {
+			ins = (sljit_ins)(0x44 << 10);
+			return push_inst(compiler, XVPERMI | ins | FRD(vreg) | FRJ(vreg));
+		}
+
+		return SLJIT_SUCCESS;
+	}
+
+	ins |= VREPLGR2VR | (sljit_ins)elem_size << 10;
+
+	if (src == SLJIT_IMM) {
+		FAIL_IF(load_immediate(compiler, TMP_REG2, srcw));
+		src = TMP_REG2;
+	}
+
+	return push_inst(compiler, ins | FRD(vreg) | RJ(src));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg, sljit_s32 lane_index,
+	sljit_s32 srcdst, sljit_sw srcdstw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins ins = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
+
+	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
+
+	if (reg_size != 5 && reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (reg_size == 5 && !(get_cpu_features(GET_HWCAP) & LOONGARCH_HWCAP_LASX))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if ((type & SLJIT_SIMD_FLOAT) && (elem_size < 2 || elem_size > 3))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if ((type & SLJIT_SIMD_FLOAT) && (elem_size < 2 || elem_size > 3))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if (type & SLJIT_SIMD_LANE_ZERO) {
+		ins = (reg_size == 5) ? ((sljit_ins)1 << 26) : 0;
+
+		if ((type & SLJIT_SIMD_FLOAT) && vreg == srcdst) {
+			FAIL_IF(push_inst(compiler, VOR_V | ins | FRD(TMP_FREG1) | FRJ(vreg) | FRK(vreg)));
+			srcdst = TMP_FREG1;
+			srcdstw = 0;
+		}
+
+		FAIL_IF(push_inst(compiler, VXOR_V | ins | FRD(vreg) | FRJ(vreg) | FRK(vreg)));
+	}
+
+	if (srcdst & SLJIT_MEM) {
+		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &srcdst, srcdstw));
+
+		if (reg_size == 5)
+			ins = (sljit_ins)1 << 25;
+
+		if (type & SLJIT_SIMD_STORE) {
+			ins |= (sljit_ins)lane_index << 18 | (sljit_ins)(1 << (23 - elem_size));
+			return push_inst(compiler, VSTELM | ins | FRD(vreg) | RJ(srcdst));
+		} else {
+			emit_op_mem(compiler, (elem_size == 3 ? WORD_DATA : (elem_size == 2 ? INT_DATA : (elem_size == 1 ? HALF_DATA : BYTE_DATA))) | LOAD_DATA, TMP_REG1, srcdst | SLJIT_MEM, 0);
+			srcdst = TMP_REG1;
+			ins = (sljit_ins)(0x3f ^ (0x1f >> elem_size)) << 10;
+
+			if (reg_size == 5) {
+				if (elem_size < 2) {
+					FAIL_IF(push_inst(compiler, VOR_V | (sljit_ins)1 << 26 | FRD(TMP_FREG1) | FRJ(vreg) | FRK(vreg)));
+					if (lane_index >= (2 << (3 - elem_size))) {
+						FAIL_IF(push_inst(compiler, XVPERMI | (sljit_ins)1 << 18 | FRD(TMP_FREG1) | FRJ(vreg) | IMM_I8(1)));
+						FAIL_IF(push_inst(compiler, VINSGR2VR | ins | FRD(TMP_FREG1) | RJ(srcdst) | IMM_V(lane_index % (2 << (3 - elem_size)))));
+						return push_inst(compiler, XVPERMI | (sljit_ins)1 << 18 | FRD(vreg) | FRJ(TMP_FREG1) | IMM_I8(2));
+					} else {
+						FAIL_IF(push_inst(compiler, VINSGR2VR | ins | FRD(vreg) | RJ(srcdst) | IMM_V(lane_index)));
+						return push_inst(compiler, XVPERMI | (sljit_ins)1 << 18 | FRD(vreg) | FRJ(TMP_FREG1) | IMM_I8(18));
+					}
+				} else
+					ins = (sljit_ins)(0x3f ^ (0x3f >> elem_size)) << 10 | (sljit_ins)1 << 26;
+			}
+
+			return push_inst(compiler, VINSGR2VR | ins | FRD(vreg) | RJ(srcdst) | IMM_V(lane_index));
+		}
+	}
+
+	if (type & SLJIT_SIMD_FLOAT) {
+		ins = (reg_size == 5) ? (sljit_ins)(0x3f ^ (0x3f >> elem_size)) << 10 | (sljit_ins)1 << 26 : (sljit_ins)(0x3f ^ (0x1f >> elem_size)) << 10;
+
+		if (type & SLJIT_SIMD_STORE) {
+			FAIL_IF(push_inst(compiler, VPICKVE2GR_U | ins | RD(TMP_REG1) | FRJ(vreg) | IMM_V(lane_index)));
+			return push_inst(compiler, VINSGR2VR | ins | FRD(srcdst) | RJ(TMP_REG1) | IMM_V(0));
+		} else {
+			FAIL_IF(push_inst(compiler, VPICKVE2GR_U | ins | RD(TMP_REG1) | FRJ(srcdst) | IMM_V(0)));
+			return push_inst(compiler, VINSGR2VR | ins | FRD(vreg) | RJ(TMP_REG1) | IMM_V(lane_index));
+		}
+	}
+
+	if (srcdst == SLJIT_IMM) {
+		FAIL_IF(load_immediate(compiler, TMP_REG1, srcdstw));
+		srcdst = TMP_REG1;
+	}
+
+	if (type & SLJIT_SIMD_STORE) {
+		ins = (sljit_ins)(0x3f ^ (0x1f >> elem_size)) << 10;
+
+		if (type & SLJIT_SIMD_LANE_SIGNED)
+			ins |= (sljit_ins)(VPICKVE2GR_U ^ (0x7 << 18));
+		else
+			ins |= VPICKVE2GR_U;
+
+		if (reg_size == 5) {
+			if (elem_size < 2) {
+				if (lane_index >= (2 << (3 - elem_size))) {
+					if (type & SLJIT_SIMD_LANE_SIGNED)
+						ins |= (sljit_ins)(VPICKVE2GR_U ^ (0x7 << 18));
+					else
+						ins |= VPICKVE2GR_U;
+
+					FAIL_IF(push_inst(compiler, VOR_V | (sljit_ins)1 << 26 | FRD(TMP_FREG1) | FRJ(vreg) | FRK(vreg)));
+					FAIL_IF(push_inst(compiler, XVPERMI | (sljit_ins)1 << 18 | FRD(TMP_FREG1) | FRJ(vreg) | IMM_I8(1)));
+					return push_inst(compiler, ins | RD(srcdst) | FRJ(TMP_FREG1) | IMM_V(lane_index % (2 << (3 - elem_size))));
+				}
+			} else {
+				ins ^= (sljit_ins)1 << (15 - elem_size);
+				ins |= (sljit_ins)1 << 26;
+			}
+		}
+
+		return push_inst(compiler, ins | RD(srcdst) | FRJ(vreg) | IMM_V(lane_index));
+	} else {
+		ins = (sljit_ins)(0x3f ^ (0x1f >> elem_size)) << 10;
+
+		if (reg_size == 5) {
+			if (elem_size < 2) {
+				FAIL_IF(push_inst(compiler, VOR_V | (sljit_ins)1 << 26 | FRD(TMP_FREG1) | FRJ(vreg) | FRK(vreg)));
+				if (lane_index >= (2 << (3 - elem_size))) {
+					FAIL_IF(push_inst(compiler, XVPERMI | (sljit_ins)1 << 18 | FRD(TMP_FREG1) | FRJ(vreg) | IMM_I8(1)));
+					FAIL_IF(push_inst(compiler, VINSGR2VR | ins | FRD(TMP_FREG1) | RJ(srcdst) | IMM_V(lane_index % (2 << (3 - elem_size)))));
+					return push_inst(compiler, XVPERMI | (sljit_ins)1 << 18 | FRD(vreg) | FRJ(TMP_FREG1) | IMM_I8(2));
+				} else {
+					FAIL_IF(push_inst(compiler, VINSGR2VR | ins | FRD(vreg) | RJ(srcdst) | IMM_V(lane_index)));
+					return push_inst(compiler, XVPERMI | (sljit_ins)1 << 18 | FRD(vreg) | FRJ(TMP_FREG1) | IMM_I8(18));
+				}
+			} else
+				ins = (sljit_ins)(0x3f ^ (0x3f >> elem_size)) << 10 | (sljit_ins)1 << 26;
+		}
+
+		return push_inst(compiler, VINSGR2VR | ins | FRD(vreg) | RJ(srcdst) | IMM_V(lane_index));
+	}
+
+	return SLJIT_ERR_UNSUPPORTED;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 src, sljit_s32 src_lane_index)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins ins = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
+
+	if (reg_size != 5 && reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (reg_size == 5 && !(get_cpu_features(GET_HWCAP) & LOONGARCH_HWCAP_LASX))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	ins = (sljit_ins)(0x3f ^ (0x1f >> elem_size)) << 10;
+
+	if (reg_size == 5) {
+		FAIL_IF(push_inst(compiler, VREPLVEI | (sljit_ins)1 << 26 | ins | FRD(vreg) | FRJ(src) | IMM_V(src_lane_index % (2 << (3 - elem_size)))));
+
+		ins = (src_lane_index < (2 << (3 - elem_size))) ? (sljit_ins)(0x44 << 10) : (sljit_ins)(0xee << 10);
+
+		return push_inst(compiler, XVPERMI | ins | FRD(vreg) | FRJ(vreg));
+	}
+
+	return push_inst(compiler, VREPLVEI | ins | FRD(vreg) | FRJ(src) | IMM_V(src_lane_index));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 src, sljit_sw srcw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 elem2_size = SLJIT_SIMD_GET_ELEM2_SIZE(type);
+	sljit_ins ins = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
+
+	ADJUST_LOCAL_OFFSET(src, srcw);
+
+	if (reg_size != 5 && reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (reg_size == 5 && !(get_cpu_features(GET_HWCAP) & LOONGARCH_HWCAP_LASX))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if (src & SLJIT_MEM) {
+		ins = (type & SLJIT_SIMD_STORE) ? VST : VLD;
+
+		if (reg_size == 5)
+			ins = (type & SLJIT_SIMD_STORE) ? XVST : XVLD;
+
+		if (FAST_IS_REG(src) && src >= 0 && (srcw >= I12_MIN && srcw <= I12_MAX))
+			FAIL_IF(push_inst(compiler, ins | FRD(vreg) | RJ(src) | IMM_I12(srcw)));
+		else {
+			FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src, srcw));
+			FAIL_IF(push_inst(compiler, ins | FRD(vreg) | RJ(src) | IMM_I12(0)));
+		}
+		src = vreg;
+	}
+
+	if (type & SLJIT_SIMD_FLOAT) {
+		if (elem_size != 2 || elem2_size != 3)
+			return SLJIT_ERR_UNSUPPORTED;
+
+		ins = 0;
+		if (reg_size == 5) {
+			ins = (sljit_ins)1 << 26;
+			FAIL_IF(push_inst(compiler, XVPERMI | FRD(src) | FRJ(src) | IMM_I8(16)));
+		}
+
+		return push_inst(compiler, VFCVTL_D_S | ins | FRD(vreg) | FRJ(src));
+	}
+
+	ins = (type & SLJIT_SIMD_EXTEND_SIGNED) ? VSLLWIL : (VSLLWIL | (sljit_ins)1 << 18);
+
+	if (reg_size == 5)
+		ins |= (sljit_ins)1 << 26;
+
+	do {
+		if (reg_size == 5)
+			FAIL_IF(push_inst(compiler, XVPERMI | FRD(src) | FRJ(src) | IMM_I8(16)));
+
+		FAIL_IF(push_inst(compiler, ins | ((sljit_ins)1 << (13 + elem_size)) | FRD(vreg) | FRJ(src)));
+		src = vreg;
+	} while (++elem_size < elem2_size);
+
+	return SLJIT_SUCCESS;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 dst, sljit_sw dstw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins ins = 0;
+	sljit_s32 dst_r;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
+
+	ADJUST_LOCAL_OFFSET(dst, dstw);
+
+	if (reg_size != 5 && reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (reg_size == 5 && !(get_cpu_features(GET_HWCAP) & LOONGARCH_HWCAP_LASX))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (elem_size > 3 || ((type & SLJIT_SIMD_FLOAT) && elem_size < 2))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
+
+	if (reg_size == 5)
+		ins = (sljit_ins)1 << 26;
+
+	FAIL_IF(push_inst(compiler, VMSKLTZ | ins | (sljit_ins)(elem_size << 10) | FRD(TMP_FREG1) | FRJ(vreg)));
+
+	FAIL_IF(push_inst(compiler, VPICKVE2GR_U | (sljit_ins)(0x3c << 10) | RD(dst_r) | FRJ(TMP_FREG1)));
+
+	if (reg_size == 5) {
+		FAIL_IF(push_inst(compiler, VPICKVE2GR_U | (sljit_ins)(0x38 << 10) | ins | RD(TMP_REG3) | FRJ(TMP_FREG1) | IMM_V(2)));
+		FAIL_IF(push_inst(compiler, SLLI_W | RD(TMP_REG3) | RJ(TMP_REG3) | IMM_I12(2 << (3 - elem_size))));
+		FAIL_IF(push_inst(compiler, OR | RD(dst_r) | RJ(dst_r) | RK(TMP_REG3)));
+	}
+
+	if (dst_r == TMP_REG2)
+		return emit_op_mem(compiler, ((type & SLJIT_32) ? INT_DATA : WORD_DATA), TMP_REG2, dst, dstw);
+
+	return SLJIT_SUCCESS;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins ins = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src2, src2w);
+
+	if (reg_size != 5 && reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (reg_size == 5 && !(get_cpu_features(GET_HWCAP) & LOONGARCH_HWCAP_LASX))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if ((type & SLJIT_SIMD_FLOAT) && (elem_size < 2 || elem_size > 3))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if (src2 & SLJIT_MEM) {
+		FAIL_IF(sljit_emit_simd_mem_offset(compiler, &src2, src2w));
+		FAIL_IF(push_inst(compiler, (reg_size == 4 ? VLD : XVLD) | FRD(TMP_FREG1) | RJ(src2) | IMM_I12(0)));
+		src2 = TMP_FREG1;
+	}
+
+	switch (SLJIT_SIMD_GET_OPCODE(type)) {
+	case SLJIT_SIMD_OP2_AND:
+		ins = VAND_V;
+		break;
+	case SLJIT_SIMD_OP2_OR:
+		ins = VOR_V;
+		break;
+	case SLJIT_SIMD_OP2_XOR:
+		ins = VXOR_V;
+		break;
+	case SLJIT_SIMD_OP2_SHUFFLE:
+		if (reg_size != 4)
+			return SLJIT_ERR_UNSUPPORTED;
+
+		return push_inst(compiler, VSHUF_B | FRD(dst_vreg) | FRJ(src1_vreg) | FRK(src1_vreg) | FRA(src2));
+	}
+
+	if (reg_size == 5)
+		ins |= (sljit_ins)1 << 26;
+
+	return push_inst(compiler, ins | FRD(dst_vreg) | FRJ(src1_vreg) | FRK(src2));
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler,
 	sljit_s32 op,
 	sljit_s32 dst_reg,
@@ -2992,17 +3653,45 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
 
-	if (!(LOONGARCH_FEATURE_LAMCAS & get_cpu_features()))
-		return SLJIT_ERR_UNSUPPORTED;
+	if ((op & SLJIT_ATOMIC_USE_LS) || !LOONGARCH_SUPPORT_AMCAS) {
+		if (op & SLJIT_ATOMIC_USE_CAS)
+			return SLJIT_ERR_UNSUPPORTED;
+
+		switch (GET_OPCODE(op)) {
+		case SLJIT_MOV:
+		case SLJIT_MOV_P:
+			ins = LL_D;
+			break;
+		case SLJIT_MOV_S32:
+		case SLJIT_MOV32:
+			ins = LL_W;
+			break;
+
+		default:
+			return SLJIT_ERR_UNSUPPORTED;
+		}
+
+		if (op & SLJIT_ATOMIC_TEST)
+			return SLJIT_SUCCESS;
+
+		return push_inst(compiler, ins | RD(dst_reg) | RJ(mem_reg));
+	}
 
 	switch(GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+		ins = LD_B;
+		break;
 	case SLJIT_MOV_U8:
 		ins = LD_BU;
 		break;
+	case SLJIT_MOV_S16:
+		ins = LD_H;
+		break;
 	case SLJIT_MOV_U16:
 		ins = LD_HU;
 		break;
 	case SLJIT_MOV32:
+	case SLJIT_MOV_S32:
 		ins = LD_W;
 		break;
 	case SLJIT_MOV_U32:
@@ -3013,6 +3702,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 		break;
 	}
 
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	return push_inst(compiler, ins | RD(dst_reg) | RJ(mem_reg) | IMM_I12(0));
 }
 
@@ -3029,19 +3721,48 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
 
-	if (!(LOONGARCH_FEATURE_LAMCAS & get_cpu_features()))
-		return SLJIT_ERR_UNSUPPORTED;
+	if ((op & SLJIT_ATOMIC_USE_LS) || !LOONGARCH_SUPPORT_AMCAS) {
+		if (op & SLJIT_ATOMIC_USE_CAS)
+			return SLJIT_ERR_UNSUPPORTED;
+
+		switch (GET_OPCODE(op)) {
+		case SLJIT_MOV:
+		case SLJIT_MOV_P:
+			ins = SC_D;
+			break;
+		case SLJIT_MOV_S32:
+		case SLJIT_MOV32:
+			ins = SC_W;
+			break;
+
+		default:
+			return SLJIT_ERR_UNSUPPORTED;
+		}
+
+		if (op & SLJIT_ATOMIC_TEST)
+			return SLJIT_SUCCESS;
+
+		FAIL_IF(push_inst(compiler, ADD_D | RD(OTHER_FLAG) | RJ(src_reg) | RK(TMP_ZERO)));
+		return push_inst(compiler, ins | RD(OTHER_FLAG) | RJ(mem_reg));
+	}
 
 	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV_S8:
+		ins = AMCAS_B;
+		break;
 	case SLJIT_MOV_U8:
 		ins = AMCAS_B;
 		unsign = BSTRPICK_D | (7 << 16);
 		break;
+	case SLJIT_MOV_S16:
+		ins = AMCAS_H;
+		break;
 	case SLJIT_MOV_U16:
 		ins = AMCAS_H;
 		unsign = BSTRPICK_D | (15 << 16);
 		break;
 	case SLJIT_MOV32:
+	case SLJIT_MOV_S32:
 		ins = AMCAS_W;
 		break;
 	case SLJIT_MOV_U32:
@@ -3053,9 +3774,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 		break;
 	}
 
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	if (op & SLJIT_SET_ATOMIC_STORED) {
-		FAIL_IF(push_inst(compiler, XOR | RD(TMP_REG1) | RJ(temp_reg) | RK(TMP_ZERO)));
-		tmp = TMP_REG1;
+		FAIL_IF(push_inst(compiler, XOR | RD(TMP_REG3) | RJ(temp_reg) | RK(TMP_ZERO)));
+		tmp = TMP_REG3;
 	}
 	FAIL_IF(push_inst(compiler, ins | RD(tmp) | RJ(mem_reg) | RK(src_reg)));
 	if (!(op & SLJIT_SET_ATOMIC_STORED))
@@ -3064,8 +3788,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	if (unsign)
 		FAIL_IF(push_inst(compiler, unsign | RD(tmp) | RJ(tmp)));
 
-	FAIL_IF(push_inst(compiler, XOR | RD(EQUAL_FLAG) | RJ(tmp) | RK(temp_reg)));
-	return push_inst(compiler, SLTUI | RD(EQUAL_FLAG) | RJ(EQUAL_FLAG) | IMM_I12(1));
+	FAIL_IF(push_inst(compiler, XOR | RD(OTHER_FLAG) | RJ(tmp) | RK(temp_reg)));
+	return push_inst(compiler, SLTUI | RD(OTHER_FLAG) | RJ(OTHER_FLAG) | IMM_I12(1));
 }
 
 static SLJIT_INLINE sljit_s32 emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw init_value, sljit_ins last_ins)
@@ -3128,28 +3852,28 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_s32 dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 0);
 
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 	PTR_FAIL_IF(push_inst(compiler, (sljit_ins)dst_r));
 
-	compiler->size += 3;
+	compiler->size += JUMP_MAX_SIZE - 1;
 
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op_mem(compiler, WORD_DATA, TMP_REG2, dst, dstw));
 
-	return put_label;
+	return jump;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant, sljit_sw executable_offset)
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_32.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_32.c
similarity index 98%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_32.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_32.c
index 9620b945..91153e5f 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_32.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_32.c
@@ -225,7 +225,7 @@ static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_t
 	sljit_ins f64_hi = TA(6), f64_lo = TA(7);
 #endif /* SLJIT_LITTLE_ENDIAN */
 
-	SLJIT_ASSERT(reg_map[TMP_REG1] == 4 && freg_map[TMP_FREG1] == 12);
+	SLJIT_ASSERT(reg_map[TMP_REG2] == 4 && freg_map[TMP_FREG1] == 12);
 
 	arg_types >>= SLJIT_ARG_SHIFT;
 
@@ -370,7 +370,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_call(struct sljit_compile
 	} else if (type & SLJIT_CALL_RETURN)
 		PTR_FAIL_IF(emit_stack_frame_release(compiler, 0, &ins));
 
-	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25 && PIC_ADDR_REG == TMP_REG2);
+	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25);
 
 	if (ins == NOP && compiler->delay_slot != UNMOVABLE_INS)
 		jump->flags |= IS_MOVABLE;
@@ -441,7 +441,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_icall(struct sljit_compiler *compi
 		return sljit_emit_ijump(compiler, type, src, srcw);
 	}
 
-	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25 && PIC_ADDR_REG == TMP_REG2);
+	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25);
 
 	if (src == SLJIT_IMM)
 		FAIL_IF(load_immediate(compiler, DR(PIC_ADDR_REG), srcw));
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_64.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_64.c
similarity index 98%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_64.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_64.c
index 52a0d3fb..b9f03a7b 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_64.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_64.c
@@ -225,7 +225,7 @@ static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_t
 	sljit_ins prev_ins = *ins_ptr;
 	sljit_ins ins = NOP;
 
-	SLJIT_ASSERT(reg_map[TMP_REG1] == 4 && freg_map[TMP_FREG1] == 12);
+	SLJIT_ASSERT(reg_map[TMP_REG2] == 4 && freg_map[TMP_FREG1] == 12);
 
 	arg_types >>= SLJIT_ARG_SHIFT;
 
@@ -309,7 +309,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_call(struct sljit_compile
 	if ((type & 0xff) != SLJIT_CALL_REG_ARG)
 		PTR_FAIL_IF(call_with_args(compiler, arg_types, &ins));
 
-	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25 && PIC_ADDR_REG == TMP_REG2);
+	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25);
 
 	if (ins == NOP && compiler->delay_slot != UNMOVABLE_INS)
 		jump->flags |= IS_MOVABLE;
@@ -366,7 +366,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_icall(struct sljit_compiler *compi
 		return sljit_emit_ijump(compiler, type, src, srcw);
 	}
 
-	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25 && PIC_ADDR_REG == TMP_REG2);
+	SLJIT_ASSERT(DR(PIC_ADDR_REG) == 25 && PIC_ADDR_REG == TMP_REG1);
 
 	if (src == SLJIT_IMM)
 		FAIL_IF(load_immediate(compiler, DR(PIC_ADDR_REG), srcw));
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_common.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_common.c
similarity index 93%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_common.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_common.c
index 807b3474..1b951fe1 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeMIPS_common.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeMIPS_common.c
@@ -83,7 +83,7 @@ typedef sljit_u32 sljit_ins;
 #define TMP_REG3	(SLJIT_NUMBER_OF_REGISTERS + 4)
 
 /* For position independent code, t9 must contain the function address. */
-#define PIC_ADDR_REG	TMP_REG2
+#define PIC_ADDR_REG	TMP_REG1
 
 /* Floating point status register. */
 #define FCSR_REG	31
@@ -95,7 +95,7 @@ typedef sljit_u32 sljit_ins;
 #define OTHER_FLAG	1
 
 static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 7] = {
-	0, 2, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 24, 23, 22, 21, 20, 19, 18, 17, 16, 29, 4, 25, 31, 3, 1
+	0, 2, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 24, 23, 22, 21, 20, 19, 18, 17, 16, 29, 25, 4, 31, 3, 1
 };
 
 #define TMP_FREG1	(SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
@@ -249,6 +249,8 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 4] = {
 #define LDL		(HI(26))
 #define LDR		(HI(27))
 #define LDC1		(HI(53))
+#define LL		(HI(48))
+#define LLD		(HI(52))
 #define LUI		(HI(15))
 #define LW		(HI(35))
 #define LWL		(HI(34))
@@ -288,6 +290,8 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 4] = {
 #define ROTR		(HI(0) | (1 << 21) | LO(2))
 #define ROTRV		(HI(0) | (1 << 6) | LO(6))
 #endif /* SLJIT_MIPS_REV >= 2 */
+#define SC		(HI(56))
+#define SCD		(HI(60))
 #define SD		(HI(63))
 #define SDL		(HI(44))
 #define SDR		(HI(45))
@@ -308,6 +312,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 4] = {
 #define SWL		(HI(42))
 #define SWR		(HI(46))
 #define SWC1		(HI(57))
+#define SYNC		(HI(0) | LO(15))
 #define TRUNC_W_S	(HI(17) | FMT_S | LO(13))
 #if defined(SLJIT_MIPS_REV) && SLJIT_MIPS_REV >= 2
 #define WSBH		(HI(31) | (2 << 6) | LO(32))
@@ -381,11 +386,21 @@ static sljit_s32 function_check_is_freg(struct sljit_compiler *compiler, sljit_s
 	if (is_32 && fr >= SLJIT_F64_SECOND(SLJIT_FR0))
 		fr -= SLJIT_F64_SECOND(0);
 
-	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + compiler->fscratches))
-		|| (fr > (SLJIT_FS0 - compiler->fsaveds) && fr <= SLJIT_FS0)
+	return (fr >= SLJIT_FR0 && fr < (SLJIT_FR0 + compiler->real_fscratches))
+		|| (fr > (SLJIT_FS0 - compiler->real_fsaveds) && fr <= SLJIT_FS0)
 		|| (fr >= SLJIT_TMP_FREGISTER_BASE && fr < (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS));
 }
 
+static sljit_s32 function_check_is_vreg(struct sljit_compiler *compiler, sljit_s32 vr, sljit_s32 type)
+{
+	SLJIT_UNUSED_ARG(compiler);
+	SLJIT_UNUSED_ARG(vr);
+	SLJIT_UNUSED_ARG(type);
+
+	/* SIMD is not supported. */
+	return 0;
+}
+
 #endif /* SLJIT_CONFIG_MIPS_32 && SLJIT_ARGUMENT_CHECKS */
 
 static void get_cpu_features(void)
@@ -504,7 +519,7 @@ static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_i
 	if (jump->flags & JUMP_ADDR)
 		target_addr = jump->u.target;
 	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
+		SLJIT_ASSERT(jump->u.label != NULL);
 		target_addr = (sljit_uw)(code + jump->u.label->size) + (sljit_uw)executable_offset;
 	}
 
@@ -635,75 +650,66 @@ static __attribute__ ((noinline)) void sljit_cache_flush(void* code, void* code_
 
 #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
 
-static SLJIT_INLINE sljit_sw put_label_get_length(struct sljit_put_label *put_label, sljit_uw max_label)
+static SLJIT_INLINE sljit_sw mov_addr_get_length(struct sljit_jump *jump, sljit_ins *code, sljit_sw executable_offset)
 {
-	if (max_label < 0x80000000l) {
-		put_label->flags = PATCH_ABS32;
+	sljit_uw addr;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+	if (addr < 0x80000000l) {
+		jump->flags |= PATCH_ABS32;
 		return 1;
 	}
 
-	if (max_label < 0x800000000000l) {
-		put_label->flags = PATCH_ABS48;
+	if (addr < 0x800000000000l) {
+		jump->flags |= PATCH_ABS48;
 		return 3;
 	}
 
-	put_label->flags = 0;
 	return 5;
 }
 
 #endif /* SLJIT_CONFIG_MIPS_64 */
 
-static SLJIT_INLINE void load_addr_to_reg(void *dst, sljit_u32 reg)
+static SLJIT_INLINE void load_addr_to_reg(struct sljit_jump *jump)
 {
-	struct sljit_jump *jump;
-	struct sljit_put_label *put_label;
-	sljit_uw flags;
-	sljit_ins *inst;
-	sljit_uw addr;
-
-	if (reg != 0) {
-		jump = (struct sljit_jump*)dst;
-		flags = jump->flags;
-		inst = (sljit_ins*)jump->addr;
-		addr = (flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
-	} else {
-		put_label = (struct sljit_put_label*)dst;
-#if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
-		flags = put_label->flags;
-#endif
-		inst = (sljit_ins*)put_label->addr;
-		addr = put_label->label->addr;
-		reg = *inst;
-	}
+	sljit_uw flags = jump->flags;
+	sljit_ins *ins = (sljit_ins*)jump->addr;
+	sljit_uw addr = (flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
+	sljit_u32 reg = (flags & JUMP_MOV_ADDR) ? *ins : PIC_ADDR_REG;
 
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
-	inst[0] = LUI | T(reg) | IMM(addr >> 16);
+	ins[0] = LUI | T(reg) | IMM(addr >> 16);
 #else /* !SLJIT_CONFIG_MIPS_32 */
 	if (flags & PATCH_ABS32) {
 		SLJIT_ASSERT(addr < 0x80000000l);
-		inst[0] = LUI | T(reg) | IMM(addr >> 16);
+		ins[0] = LUI | T(reg) | IMM(addr >> 16);
 	}
 	else if (flags & PATCH_ABS48) {
 		SLJIT_ASSERT(addr < 0x800000000000l);
-		inst[0] = LUI | T(reg) | IMM(addr >> 32);
-		inst[1] = ORI | S(reg) | T(reg) | IMM((addr >> 16) & 0xffff);
-		inst[2] = DSLL | T(reg) | D(reg) | SH_IMM(16);
-		inst += 2;
+		ins[0] = LUI | T(reg) | IMM(addr >> 32);
+		ins[1] = ORI | S(reg) | T(reg) | IMM((addr >> 16) & 0xffff);
+		ins[2] = DSLL | T(reg) | D(reg) | SH_IMM(16);
+		ins += 2;
 	}
 	else {
-		inst[0] = LUI | T(reg) | IMM(addr >> 48);
-		inst[1] = ORI | S(reg) | T(reg) | IMM((addr >> 32) & 0xffff);
-		inst[2] = DSLL | T(reg) | D(reg) | SH_IMM(16);
-		inst[3] = ORI | S(reg) | T(reg) | IMM((addr >> 16) & 0xffff);
-		inst[4] = DSLL | T(reg) | D(reg) | SH_IMM(16);
-		inst += 4;
+		ins[0] = LUI | T(reg) | IMM(addr >> 48);
+		ins[1] = ORI | S(reg) | T(reg) | IMM((addr >> 32) & 0xffff);
+		ins[2] = DSLL | T(reg) | D(reg) | SH_IMM(16);
+		ins[3] = ORI | S(reg) | T(reg) | IMM((addr >> 16) & 0xffff);
+		ins[4] = DSLL | T(reg) | D(reg) | SH_IMM(16);
+		ins += 4;
 	}
 #endif /* SLJIT_CONFIG_MIPS_32 */
 
-	inst[1] = ORI | S(reg) | T(reg) | IMM(addr & 0xffff);
+	ins[1] = ORI | S(reg) | T(reg) | IMM(addr & 0xffff);
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_ins *code;
@@ -711,77 +717,76 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	sljit_ins *buf_ptr;
 	sljit_ins *buf_end;
 	sljit_uw word_count;
-	sljit_uw next_addr;
+	SLJIT_NEXT_DEFINE_TYPES;
 	sljit_sw executable_offset;
 	sljit_uw addr;
-
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
 	reverse_buf(compiler);
 
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins), compiler->exec_allocator_data);
+	code = (sljit_ins*)allocate_executable_memory(compiler->size * sizeof(sljit_ins), options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
 	buf = compiler->buf;
 
 	code_ptr = code;
 	word_count = 0;
-	next_addr = 0;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
-
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
 
 	do {
 		buf_ptr = (sljit_ins*)buf->memory;
 		buf_end = buf_ptr + (buf->used_size >> 2);
 		do {
 			*code_ptr = *buf_ptr++;
-			if (next_addr == word_count) {
+			if (next_min_addr == word_count) {
 				SLJIT_ASSERT(!label || label->size >= word_count);
 				SLJIT_ASSERT(!jump || jump->addr >= word_count);
 				SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-				SLJIT_ASSERT(!put_label || put_label->addr >= word_count);
 
 				/* These structures are ordered by their address. */
-				if (label && label->size == word_count) {
-					label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+				if (next_min_addr == next_label_size) {
+					label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 					label->size = (sljit_uw)(code_ptr - code);
 					label = label->next;
+					next_label_size = SLJIT_GET_NEXT_SIZE(label);
 				}
-				if (jump && jump->addr == word_count) {
+
+				if (next_min_addr == next_jump_addr) {
+					if (!(jump->flags & JUMP_MOV_ADDR)) {
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
-					word_count += 2;
-#else
-					word_count += 6;
-#endif
-					jump->addr = (sljit_uw)(code_ptr - 1);
-					code_ptr = detect_jump_type(jump, code, executable_offset);
+						word_count += 2;
+#else /* !SLJIT_CONFIG_MIPS_32 */
+						word_count += 6;
+#endif /* SLJIT_CONFIG_MIPS_32 */
+						jump->addr = (sljit_uw)(code_ptr - 1);
+						code_ptr = detect_jump_type(jump, code, executable_offset);
+					} else {
+						jump->addr = (sljit_uw)code_ptr;
+#if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
+						code_ptr += 1;
+						word_count += 1;
+#else /* !SLJIT_CONFIG_MIPS_32 */
+						code_ptr += mov_addr_get_length(jump, code, executable_offset);
+						word_count += 5;
+#endif /* SLJIT_CONFIG_MIPS_32 */
+					}
+
 					jump = jump->next;
-				}
-				if (const_ && const_->addr == word_count) {
+					next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+				} else if (next_min_addr == next_const_addr) {
 					const_->addr = (sljit_uw)code_ptr;
 					const_ = const_->next;
+					next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
 				}
-				if (put_label && put_label->addr == word_count) {
-					SLJIT_ASSERT(put_label->label);
-					put_label->addr = (sljit_uw)code_ptr;
-#if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
-					code_ptr += 1;
-					word_count += 1;
-#else
-					code_ptr += put_label_get_length(put_label, (sljit_uw)(SLJIT_ADD_EXEC_OFFSET(code, executable_offset) + put_label->label->size));
-					word_count += 5;
-#endif
-					put_label = put_label->next;
-				}
-				next_addr = compute_next_addr(label, jump, const_, put_label);
+
+				SLJIT_GET_NEXT_MIN();
 			}
 			code_ptr++;
 			word_count++;
@@ -791,7 +796,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	} while (buf);
 
 	if (label && label->size == word_count) {
-		label->addr = (sljit_uw)code_ptr;
+		label->u.addr = (sljit_uw)code_ptr;
 		label->size = (sljit_uw)(code_ptr - code);
 		label = label->next;
 	}
@@ -799,13 +804,12 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)compiler->size);
 
 	jump = compiler->jumps;
 	while (jump) {
 		do {
-			addr = (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
+			addr = (jump->flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
 			buf_ptr = (sljit_ins *)jump->addr;
 
 			if (jump->flags & PATCH_B) {
@@ -821,15 +825,10 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 				break;
 			}
 
-			load_addr_to_reg(jump, PIC_ADDR_REG);
+			load_addr_to_reg(jump);
 		} while (0);
-		jump = jump->next;
-	}
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-		load_addr_to_reg(put_label, 0);
-		put_label = put_label->next;
+		jump = jump->next;
 	}
 
 	compiler->error = SLJIT_ERR_COMPILED;
@@ -873,6 +872,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_CLZ:
 	case SLJIT_HAS_CMOV:
 	case SLJIT_HAS_PREFETCH:
+	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
 		return 1;
 
 	case SLJIT_HAS_CTZ:
@@ -932,9 +933,9 @@ static sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 flags, s
 static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit_s32 frame_size, sljit_ins *ins_ptr);
 
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
-#define SELECT_OP(a, b)	(b)
+#define SELECT_OP(d, w)	(w)
 #else
-#define SELECT_OP(a, b)	(!(op & SLJIT_32) ? a : b)
+#define SELECT_OP(d, w)	(!(op & SLJIT_32) ? (d) : (w))
 #endif
 
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
@@ -944,17 +945,22 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
 #endif
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 fsaveds = ENTER_GET_FLOAT_REGS(saveds);
 	sljit_ins base;
 	sljit_s32 i, tmp, offset;
 	sljit_s32 arg_count, word_arg_count, float_arg_count;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
 
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - saved_arg_count, 1);
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
@@ -1001,9 +1007,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 		offset = local_size - SSIZE_OF(sw);
 	} else {
 		FAIL_IF(load_immediate(compiler, OTHER_FLAG, local_size));
-		FAIL_IF(push_inst(compiler, ADDU_W | S(SLJIT_SP) | TA(0) | D(TMP_REG2), DR(TMP_REG2)));
+		FAIL_IF(push_inst(compiler, ADDU_W | S(SLJIT_SP) | TA(0) | D(TMP_REG1), DR(TMP_REG1)));
 		FAIL_IF(push_inst(compiler, SUBU_W | S(SLJIT_SP) | TA(OTHER_FLAG) | D(SLJIT_SP), DR(SLJIT_SP)));
-		base = S(TMP_REG2);
+		base = S(TMP_REG1);
 		offset = -SSIZE_OF(sw);
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
 		local_size = 0;
@@ -1154,12 +1160,18 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 fsaveds = ENTER_GET_FLOAT_REGS(saveds);
+
 	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
 
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 1);
 #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
@@ -1212,8 +1224,8 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
 		if (tmp < frame_size)
 			tmp = frame_size;
 
-		FAIL_IF(load_immediate(compiler, DR(TMP_REG1), local_size - tmp));
-		FAIL_IF(push_inst(compiler, ADDU_W | S(SLJIT_SP) | T(TMP_REG1) | D(SLJIT_SP), DR(SLJIT_SP)));
+		FAIL_IF(load_immediate(compiler, DR(TMP_REG2), local_size - tmp));
+		FAIL_IF(push_inst(compiler, ADDU_W | S(SLJIT_SP) | T(TMP_REG2) | D(SLJIT_SP), DR(SLJIT_SP)));
 		local_size = tmp;
 	}
 
@@ -1711,7 +1723,7 @@ static sljit_s32 emit_rev16(struct sljit_compiler *compiler, sljit_s32 op, sljit
 static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s32 flags,
 	sljit_s32 dst, sljit_s32 src1, sljit_sw src2)
 {
-	sljit_s32 is_overflow, is_carry, carry_src_ar, is_handled;
+	sljit_s32 is_overflow, is_carry, carry_src_ar, is_handled, reg;
 	sljit_ins op_imm, op_v;
 #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
 	sljit_ins ins, op_dimm, op_dimm32, op_dv;
@@ -1963,8 +1975,9 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 			is_handled = 1;
 
 			if (flags & SRC2_IMM) {
-				FAIL_IF(push_inst(compiler, ADDIU | SA(0) | T(TMP_REG2) | IMM(src2), DR(TMP_REG2)));
-				src2 = TMP_REG2;
+				reg = (src1 == TMP_REG1) ? TMP_REG2 : TMP_REG1;
+				FAIL_IF(push_inst(compiler, ADDIU | SA(0) | T(reg) | IMM(src2), DR(reg)));
+				src2 = reg;
 				flags &= ~SRC2_IMM;
 			}
 
@@ -2283,7 +2296,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	sljit_s32 dst_r = TMP_REG2;
 	sljit_s32 src1_r;
 	sljit_sw src2_r = 0;
-	sljit_s32 sugg_src2_r = TMP_REG2;
+	sljit_s32 src2_tmp_reg = (GET_OPCODE(op) >= SLJIT_OP2_BASE && FAST_IS_REG(src1)) ? TMP_REG1 : TMP_REG2;
 
 	if (!(flags & ALT_KEEP_CACHE)) {
 		compiler->cache_arg = 0;
@@ -2299,7 +2312,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		dst_r = dst;
 		flags |= REG_DEST;
 		if (flags & MOVE_OP)
-			sugg_src2_r = dst_r;
+			src2_tmp_reg = dst_r;
 	}
 	else if ((dst & SLJIT_MEM) && !getput_arg_fast(compiler, flags | ARG_TEST, DR(TMP_REG1), dst, dstw))
 		flags |= SLOW_DEST;
@@ -2351,8 +2364,8 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	else if (src2 == SLJIT_IMM) {
 		if (!(flags & SRC2_IMM)) {
 			if (src2w) {
-				FAIL_IF(load_immediate(compiler, DR(sugg_src2_r), src2w));
-				src2_r = sugg_src2_r;
+				FAIL_IF(load_immediate(compiler, DR(src2_tmp_reg), src2w));
+				src2_r = src2_tmp_reg;
 			}
 			else {
 				src2_r = 0;
@@ -2366,16 +2379,16 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		}
 	}
 	else {
-		if (getput_arg_fast(compiler, flags | LOAD_DATA, DR(sugg_src2_r), src2, src2w))
+		if (getput_arg_fast(compiler, flags | LOAD_DATA, DR(src2_tmp_reg), src2, src2w))
 			FAIL_IF(compiler->error);
 		else
 			flags |= SLOW_SRC2;
-		src2_r = sugg_src2_r;
+		src2_r = src2_tmp_reg;
 	}
 
 	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
 		SLJIT_ASSERT(src2_r == TMP_REG2);
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
+		if ((flags & SLOW_DEST) && !can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
 			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, DR(TMP_REG2), src2, src2w, src1, src1w));
 			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, DR(TMP_REG1), src1, src1w, dst, dstw));
 		}
@@ -2387,7 +2400,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	else if (flags & SLOW_SRC1)
 		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, DR(TMP_REG1), src1, src1w, dst, dstw));
 	else if (flags & SLOW_SRC2)
-		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, DR(sugg_src2_r), src2, src2w, dst, dstw));
+		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, DR(src2_tmp_reg), src2, src2w, dst, dstw));
 
 	FAIL_IF(emit_single_op(compiler, op, flags, dst_r, src1_r, src2_r));
 
@@ -2477,6 +2490,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 		FAIL_IF(push_inst(compiler, MFLO | D(SLJIT_R0), DR(SLJIT_R0)));
 		return (op >= SLJIT_DIV_UW) ? SLJIT_SUCCESS : push_inst(compiler, MFHI | D(SLJIT_R1), DR(SLJIT_R1));
 #endif /* SLJIT_MIPS_REV >= 6 */
+	case SLJIT_MEMORY_BARRIER:
+#if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1)
+		return push_inst(compiler, SYNC, UNMOVABLE_INS);
+#else /* SLJIT_MIPS_REV < 1 */
+		return SLJIT_ERR_UNSUPPORTED;
+#endif /* SLJIT_MIPS_REV >= 1 */
 	case SLJIT_ENDBR:
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
 		return SLJIT_SUCCESS;
@@ -2659,12 +2678,28 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 
 #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
 #define SELECT_OP3(op, src2w, D, D32, W) (((op & SLJIT_32) ? (W) : ((src2w) < 32) ? (D) : (D32)) | (((sljit_ins)src2w & 0x1f) << 6))
-#define SELECT_OP2(op, D, W) ((op & SLJIT_32) ? (W) : (D))
 #else /* !SLJIT_CONFIG_MIPS_64 */
 #define SELECT_OP3(op, src2w, D, D32, W) ((W) | ((sljit_ins)(src2w) << 6))
-#define SELECT_OP2(op, D, W) (W)
 #endif /* SLJIT_CONFIG_MIPS_64 */
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		SLJIT_SKIP_CHECKS(compiler);
+		FAIL_IF(sljit_emit_op2(compiler, SLJIT_MUL | (op & SLJIT_32), TMP_REG2, 0, src1, src1w, src2, src2w));
+		return push_inst(compiler, SELECT_OP(DADDU, ADDU) | S(dst_reg) | T(TMP_REG2) | D(dst_reg), DR(dst_reg));
+	}
+
+	return SLJIT_SUCCESS;
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 dst_reg,
 	sljit_s32 src1_reg,
@@ -2718,18 +2753,18 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *
 		FAIL_IF(emit_op_mem(compiler, inp_flags, DR(TMP_REG2), src3, src3w));
 		src3 = TMP_REG2;
 	} else if (dst_reg == src3) {
-		FAIL_IF(push_inst(compiler, SELECT_OP2(op, DADDU, ADDU) | S(src3) | TA(0) | D(TMP_REG2), DR(TMP_REG2)));
+		FAIL_IF(push_inst(compiler, SELECT_OP(DADDU, ADDU) | S(src3) | TA(0) | D(TMP_REG2), DR(TMP_REG2)));
 		src3 = TMP_REG2;
 	}
 
 	if (is_left) {
-		ins1 = SELECT_OP2(op, DSRL, SRL);
-		ins2 = SELECT_OP2(op, DSLLV, SLLV);
-		ins3 = SELECT_OP2(op, DSRLV, SRLV);
+		ins1 = SELECT_OP(DSRL, SRL);
+		ins2 = SELECT_OP(DSLLV, SLLV);
+		ins3 = SELECT_OP(DSRLV, SRLV);
 	} else {
-		ins1 = SELECT_OP2(op, DSLL, SLL);
-		ins2 = SELECT_OP2(op, DSRLV, SRLV);
-		ins3 = SELECT_OP2(op, DSLLV, SLLV);
+		ins1 = SELECT_OP(DSLL, SLL);
+		ins2 = SELECT_OP(DSRLV, SRLV);
+		ins3 = SELECT_OP(DSLLV, SLLV);
 	}
 
 	FAIL_IF(push_inst(compiler, ins2 | S(src3) | T(src1_reg) | D(dst_reg), DR(dst_reg)));
@@ -2739,14 +2774,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *
 		FAIL_IF(push_inst(compiler, XORI | S(src3) | T(TMP_REG2) | ((sljit_ins)bit_length - 1), DR(TMP_REG2)));
 		src2_reg = TMP_REG1;
 	} else
-		FAIL_IF(push_inst(compiler, SELECT_OP2(op, DSUBU, SUBU) | SA(0) | T(src3) | D(TMP_REG2), DR(TMP_REG2)));
+		FAIL_IF(push_inst(compiler, SELECT_OP(DSUBU, SUBU) | SA(0) | T(src3) | D(TMP_REG2), DR(TMP_REG2)));
 
 	FAIL_IF(push_inst(compiler, ins3 | S(TMP_REG2) | T(src2_reg) | D(TMP_REG1), DR(TMP_REG1)));
 	return push_inst(compiler, OR | S(dst_reg) | T(TMP_REG1) | D(dst_reg), DR(dst_reg));
 }
 
 #undef SELECT_OP3
-#undef SELECT_OP2
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_src(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 src, sljit_sw srcw)
@@ -3103,7 +3137,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV_F64:
 		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
+			if (!(dst & SLJIT_MEM))
 				FAIL_IF(push_inst(compiler, MOV_fmt(FMT(op)) | FS(src) | FD(dst_r), MOVABLE_INS));
 			else
 				dst_r = src;
@@ -3162,11 +3196,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 	}
 
 	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
+		if ((dst & SLJIT_MEM) && !can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, FR(TMP_FREG2), src2, src2w, src1, src1w));
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, FR(TMP_FREG1), src1, src1w, dst, dstw));
-		}
-		else {
+		} else {
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, FR(TMP_FREG1), src1, src1w, src2, src2w));
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, FR(TMP_FREG2), src2, src2w, dst, dstw));
 		}
@@ -3313,6 +3346,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	case SLJIT_SIG_GREATER:
 	case SLJIT_OVERFLOW:
 	case SLJIT_CARRY:
+	case SLJIT_ATOMIC_STORED:
 		BR_Z(OTHER_FLAG);
 		break;
 	case SLJIT_GREATER_EQUAL:
@@ -3321,6 +3355,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	case SLJIT_SIG_LESS_EQUAL:
 	case SLJIT_NOT_OVERFLOW:
 	case SLJIT_NOT_CARRY:
+	case SLJIT_ATOMIC_NOT_STORED:
 		BR_NZ(OTHER_FLAG);
 		break;
 	case SLJIT_F_NOT_EQUAL:
@@ -3361,10 +3396,10 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 		PTR_FAIL_IF(push_inst(compiler, inst, UNMOVABLE_INS));
 
 	if (type <= SLJIT_JUMP)
-		PTR_FAIL_IF(push_inst(compiler, JR | S(TMP_REG2), UNMOVABLE_INS));
+		PTR_FAIL_IF(push_inst(compiler, JR | S(PIC_ADDR_REG), UNMOVABLE_INS));
 	else {
 		jump->flags |= IS_JAL;
-		PTR_FAIL_IF(push_inst(compiler, JALR | S(TMP_REG2) | DA(RETURN_ADDR_REG), UNMOVABLE_INS));
+		PTR_FAIL_IF(push_inst(compiler, JALR | S(PIC_ADDR_REG) | DA(RETURN_ADDR_REG), UNMOVABLE_INS));
 	}
 
 	jump->addr = compiler->size;
@@ -3392,8 +3427,8 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 #define RESOLVE_IMM2() \
 	if (src2 == SLJIT_IMM) { \
 		if (src2w) { \
-			PTR_FAIL_IF(load_immediate(compiler, DR(TMP_REG2), src2w)); \
-			src2 = TMP_REG2; \
+			PTR_FAIL_IF(load_immediate(compiler, DR(src2_tmp_reg), src2w)); \
+			src2 = src2_tmp_reg; \
 		} \
 		else \
 			src2 = 0; \
@@ -3406,6 +3441,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	struct sljit_jump *jump;
 	sljit_s32 flags;
 	sljit_ins inst;
+	sljit_s32 src2_tmp_reg = FAST_IS_REG(src1) ? TMP_REG1 : TMP_REG2;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_emit_cmp(compiler, type, src1, src1w, src2, src2w));
@@ -3426,8 +3462,8 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	}
 
 	if (src2 & SLJIT_MEM) {
-		PTR_FAIL_IF(emit_op_mem2(compiler, flags, DR(TMP_REG2), src2, src2w, 0, 0));
-		src2 = TMP_REG2;
+		PTR_FAIL_IF(emit_op_mem2(compiler, flags, DR(src2_tmp_reg), src2, src2w, 0, 0));
+		src2 = src2_tmp_reg;
 	}
 
 	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
@@ -3515,7 +3551,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 		PTR_FAIL_IF(push_inst(compiler, (type == SLJIT_EQUAL ? BNE : BEQ) | S(TMP_REG1) | TA(0) | BRANCH_LENGTH, UNMOVABLE_INS));
 	}
 
-	PTR_FAIL_IF(push_inst(compiler, JR | S(TMP_REG2), UNMOVABLE_INS));
+	PTR_FAIL_IF(push_inst(compiler, JR | S(PIC_ADDR_REG), UNMOVABLE_INS));
 	jump->addr = compiler->size;
 	PTR_FAIL_IF(push_inst(compiler, NOP, UNMOVABLE_INS));
 
@@ -3553,11 +3589,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 		if (compiler->delay_slot != UNMOVABLE_INS)
 			jump->flags |= IS_MOVABLE;
 
-		src = TMP_REG2;
+		src = PIC_ADDR_REG;
 	} else if (src & SLJIT_MEM) {
 		ADJUST_LOCAL_OFFSET(src, srcw);
-		FAIL_IF(emit_op_mem(compiler, WORD_DATA | LOAD_DATA, DR(TMP_REG2), src, srcw));
-		src = TMP_REG2;
+		FAIL_IF(emit_op_mem(compiler, WORD_DATA | LOAD_DATA, DR(PIC_ADDR_REG), src, srcw));
+		src = PIC_ADDR_REG;
 	}
 
 	if (type <= SLJIT_JUMP)
@@ -3755,8 +3791,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 
 #if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6)
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem(compiler, inp_flags, DR(TMP_REG2), src1, src1w));
-		src1 = TMP_REG2;
+		FAIL_IF(emit_op_mem(compiler, inp_flags, DR(TMP_REG1), src1, src1w));
+		src1 = TMP_REG1;
 	} else if (src1 == SLJIT_IMM) {
 #if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
 		if (type & SLJIT_32)
@@ -3784,13 +3820,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 			type ^= 0x1;
 		} else {
 			if (ADDRESSING_DEPENDS_ON(src1, dst_reg)) {
-				FAIL_IF(push_inst(compiler, ADDU_W | S(dst_reg) | TA(0) | D(TMP_REG2), DR(TMP_REG2)));
+				FAIL_IF(push_inst(compiler, ADDU_W | S(dst_reg) | TA(0) | D(TMP_REG1), DR(TMP_REG1)));
 
 				if ((src1 & REG_MASK) == dst_reg)
-					src1 = (src1 & ~REG_MASK) | TMP_REG2;
+					src1 = (src1 & ~REG_MASK) | TMP_REG1;
 
 				if (OFFS_REG(src1) == dst_reg)
-					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG2);
+					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG1);
 			}
 
 			FAIL_IF(push_inst(compiler, mov_ins | S(src2_reg) | TA(0) | D(dst_reg), DR(dst_reg)));
@@ -3847,8 +3883,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *com
 
 #if (defined SLJIT_MIPS_REV && SLJIT_MIPS_REV >= 1 && SLJIT_MIPS_REV < 6)
 	if (src1 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem(compiler, FLOAT_DATA(type) | LOAD_DATA, FR(TMP_FREG1), src1, src1w));
-		src1 = TMP_FREG1;
+		FAIL_IF(emit_op_mem(compiler, FLOAT_DATA(type) | LOAD_DATA, FR(TMP_FREG2), src1, src1w));
+		src1 = TMP_FREG2;
 	}
 
 	return push_inst(compiler, get_select_cc(type, 1) | FMT(type) | FS(src1) | FD(dst_freg), MOVABLE_INS);
@@ -4209,6 +4245,80 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem(struct sljit_compiler *compil
 
 #undef TO_ARGW_HI
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 mem_reg)
+{
+	sljit_ins ins;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
+
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+#if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
+		ins = LLD;
+		break;
+#endif /* SLJIT_CONFIG_MIPS_64 */
+	case SLJIT_MOV_S32:
+	case SLJIT_MOV32:
+		ins = LL;
+		break;
+
+	default:
+		return SLJIT_ERR_UNSUPPORTED;
+	}
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	return push_inst(compiler, ins | T(dst_reg) | S(mem_reg), DR(dst_reg));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 src_reg,
+	sljit_s32 mem_reg,
+	sljit_s32 temp_reg)
+{
+	sljit_ins ins;
+
+	/* temp_reg == mem_reg is undefined so use another temp register */
+	SLJIT_UNUSED_ARG(temp_reg);
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
+
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+#if (defined SLJIT_CONFIG_MIPS_64 && SLJIT_CONFIG_MIPS_64)
+		ins = SCD;
+		break;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	case SLJIT_MOV_S32:
+	case SLJIT_MOV32:
+		op |= SLJIT_32;
+		ins = SC;
+		break;
+
+	default:
+		return SLJIT_ERR_UNSUPPORTED;
+	}
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	FAIL_IF(push_inst(compiler, SELECT_OP(DADDU, ADDU) | S(src_reg) | TA(0) | DA(OTHER_FLAG), OTHER_FLAG));
+	return push_inst(compiler, ins | TA(OTHER_FLAG) | S(mem_reg), OTHER_FLAG);
+}
+
 SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw init_value)
 {
 	struct sljit_const *const_;
@@ -4231,18 +4341,18 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_s32 dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 0);
 
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 	PTR_FAIL_IF(push_inst(compiler, (sljit_ins)dst_r, UNMOVABLE_INS));
@@ -4255,5 +4365,5 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct slj
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op_mem(compiler, WORD_DATA, DR(TMP_REG2), dst, dstw));
 
-	return put_label;
+	return jump;
 }
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativePPC_32.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativePPC_32.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativePPC_32.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativePPC_32.c
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativePPC_64.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativePPC_64.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativePPC_64.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativePPC_64.c
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativePPC_common.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativePPC_common.c
similarity index 86%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativePPC_common.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativePPC_common.c
index 54977f02..3d2268e8 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativePPC_common.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativePPC_common.c
@@ -98,7 +98,7 @@ static void ppc_cache_flush(sljit_ins *from, sljit_ins *to)
 #if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
 #define TMP_CALL_REG	(SLJIT_NUMBER_OF_REGISTERS + 5)
 #else
-#define TMP_CALL_REG	TMP_REG2
+#define TMP_CALL_REG	TMP_REG1
 #endif
 
 #define TMP_FREG1	(SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
@@ -187,10 +187,12 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define LD		(HI(58) | 0)
 #define LFD		(HI(50))
 #define LFS		(HI(48))
+#define LDARX		(HI(31) | LO(84))
 #if defined(_ARCH_PWR7) && _ARCH_PWR7
 #define LDBRX		(HI(31) | LO(532))
 #endif /* POWER7 */
 #define LHBRX		(HI(31) | LO(790))
+#define LWARX		(HI(31) | LO(20))
 #define LWBRX		(HI(31) | LO(534))
 #define LWZ		(HI(32))
 #define MFCR		(HI(31) | LO(19))
@@ -231,6 +233,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #if defined(_ARCH_PWR7) && _ARCH_PWR7
 #define STDBRX		(HI(31) | LO(660))
 #endif /* POWER7 */
+#define STDCX		(HI(31) | LO(214))
 #define STDU		(HI(62) | 1)
 #define STDUX		(HI(31) | LO(181))
 #define STFD		(HI(54))
@@ -239,12 +242,14 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define STHBRX		(HI(31) | LO(918))
 #define STW		(HI(36))
 #define STWBRX		(HI(31) | LO(662))
+#define STWCX		(HI(31) | LO(150))
 #define STWU		(HI(37))
 #define STWUX		(HI(31) | LO(183))
 #define SUBF		(HI(31) | LO(40))
 #define SUBFC		(HI(31) | LO(8))
 #define SUBFE		(HI(31) | LO(136))
 #define SUBFIC		(HI(8))
+#define SYNC		(HI(31) | LO(598))
 #define XOR		(HI(31) | LO(316))
 #define XORI		(HI(26))
 #define XORIS		(HI(27))
@@ -310,25 +315,31 @@ static sljit_s32 push_inst(struct sljit_compiler *compiler, sljit_ins ins)
 	return SLJIT_SUCCESS;
 }
 
-static SLJIT_INLINE sljit_s32 detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
+static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
 {
 	sljit_sw diff;
 	sljit_uw target_addr;
-	sljit_uw extra_jump_flags;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_uw orig_addr = jump->addr;
+	SLJIT_UNUSED_ARG(executable_offset);
 
+	jump->addr = jump_addr;
 #if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL) && (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
 	if (jump->flags & (SLJIT_REWRITABLE_JUMP | IS_CALL))
-		return 0;
+		goto exit;
 #else
 	if (jump->flags & SLJIT_REWRITABLE_JUMP)
-		return 0;
+		goto exit;
 #endif
 
 	if (jump->flags & JUMP_ADDR)
 		target_addr = jump->u.target;
 	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
+		SLJIT_ASSERT(jump->u.label != NULL);
 		target_addr = (sljit_uw)(code + jump->u.label->size) + (sljit_uw)executable_offset;
+
+		if (jump->u.label->size > orig_addr)
+			jump_addr = (sljit_uw)(code + orig_addr);
 	}
 
 #if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL) && (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
@@ -336,101 +347,260 @@ static SLJIT_INLINE sljit_s32 detect_jump_type(struct sljit_jump *jump, sljit_in
 		goto keep_address;
 #endif
 
-	diff = ((sljit_sw)target_addr - (sljit_sw)(code_ptr) - executable_offset) & ~0x3l;
+	diff = (sljit_sw)target_addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
 
-	extra_jump_flags = 0;
 	if (jump->flags & IS_COND) {
 		if (diff <= 0x7fff && diff >= -0x8000) {
 			jump->flags |= PATCH_B;
-			return 1;
+			return code_ptr;
 		}
 		if (target_addr <= 0xffff) {
 			jump->flags |= PATCH_B | PATCH_ABS_B;
-			return 1;
+			return code_ptr;
 		}
-		extra_jump_flags = REMOVE_COND;
 
 		diff -= SSIZE_OF(ins);
 	}
 
 	if (diff <= 0x01ffffff && diff >= -0x02000000) {
-		jump->flags |= PATCH_B | extra_jump_flags;
-		return 1;
+		jump->flags |= PATCH_B;
+	} else if (target_addr <= 0x01ffffff) {
+		jump->flags |= PATCH_B | PATCH_ABS_B;
 	}
 
-	if (target_addr <= 0x03ffffff) {
-		jump->flags |= PATCH_B | PATCH_ABS_B | extra_jump_flags;
-		return 1;
+	if (jump->flags & PATCH_B) {
+		if (!(jump->flags & IS_COND))
+			return code_ptr;
+
+		code_ptr[0] = BCx | (2 << 2) | ((code_ptr[0] ^ (8 << 21)) & 0x03ff0001);
+		code_ptr[1] = Bx;
+		jump->addr += sizeof(sljit_ins);
+		jump->flags -= IS_COND;
+		return code_ptr + 1;
 	}
 
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
 #if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
 keep_address:
-#endif
-	if (target_addr <= 0x7fffffff) {
+#endif /* SLJIT_PASS_ENTRY_ADDR_TO_CALL */
+	if (target_addr < 0x80000000l) {
 		jump->flags |= PATCH_ABS32;
-		return 1;
+		code_ptr[2] = MTCTR | S(TMP_CALL_REG);
+		code_ptr[3] = code_ptr[0];
+		return code_ptr + 3;
 	}
 
-	if (target_addr <= 0x7fffffffffffl) {
+	if (target_addr < 0x800000000000l) {
 		jump->flags |= PATCH_ABS48;
-		return 1;
+		code_ptr[4] = MTCTR | S(TMP_CALL_REG);
+		code_ptr[5] = code_ptr[0];
+		return code_ptr + 5;
 	}
-#endif
+#endif /* SLJIT_CONFIG_PPC_64 */
 
-	return 0;
+exit:
+#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
+	code_ptr[2] = MTCTR | S(TMP_CALL_REG);
+	code_ptr[3] = code_ptr[0];
+#else /* !SLJIT_CONFIG_PPC_32 */
+	code_ptr[5] = MTCTR | S(TMP_CALL_REG);
+	code_ptr[6] = code_ptr[0];
+#endif /* SLJIT_CONFIG_PPC_32 */
+	return code_ptr + JUMP_MAX_SIZE - 1;
 }
 
 #if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
 
-static SLJIT_INLINE sljit_sw put_label_get_length(struct sljit_put_label *put_label, sljit_uw max_label)
+static SLJIT_INLINE sljit_sw mov_addr_get_length(struct sljit_jump *jump, sljit_ins *code, sljit_sw executable_offset)
 {
-	if (max_label < 0x100000000l) {
-		put_label->flags = 0;
+	sljit_uw addr;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	SLJIT_ASSERT(jump->flags < ((sljit_uw)5 << JUMP_SIZE_SHIFT));
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+	if (addr < 0x80000000l) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)1 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS32;
 		return 1;
 	}
 
-	if (max_label < 0x1000000000000l) {
-		put_label->flags = 1;
+	if (addr < 0x800000000000l) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)3 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS48;
 		return 3;
 	}
 
-	put_label->flags = 2;
+	SLJIT_ASSERT(jump->flags >= ((sljit_uw)4 << JUMP_SIZE_SHIFT));
 	return 4;
 }
 
-static SLJIT_INLINE void put_label_set(struct sljit_put_label *put_label)
-{
-	sljit_uw addr = put_label->label->addr;
-	sljit_ins *inst = (sljit_ins *)put_label->addr;
-	sljit_u32 reg = *inst;
-
-	if (put_label->flags == 0) {
-		SLJIT_ASSERT(addr < 0x100000000l);
-		inst[0] = ORIS | S(TMP_ZERO) | A(reg) | IMM(addr >> 16);
-	}
-	else {
-		if (put_label->flags == 1) {
-			SLJIT_ASSERT(addr < 0x1000000000000l);
-			inst[0] = ORI | S(TMP_ZERO) | A(reg) | IMM(addr >> 32);
-		}
-		else {
-			inst[0] = ORIS | S(TMP_ZERO) | A(reg) | IMM(addr >> 48);
-			inst[1] = ORI | S(reg) | A(reg) | IMM((addr >> 32) & 0xffff);
-			inst++;
-		}
-
-		inst[1] = SLDI(32) | S(reg) | A(reg);
-		inst[2] = ORIS | S(reg) | A(reg) | IMM((addr >> 16) & 0xffff);
-		inst += 2;
-	}
-
-	inst[1] = ORI | S(reg) | A(reg) | IMM(addr & 0xffff);
-}
-
 #endif /* SLJIT_CONFIG_PPC_64 */
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+static void generate_jump_or_mov_addr(struct sljit_jump *jump, sljit_sw executable_offset)
+{
+	sljit_uw flags = jump->flags;
+	sljit_uw addr = (flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
+	sljit_ins *ins = (sljit_ins*)jump->addr;
+	sljit_s32 reg;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	if (flags & PATCH_B) {
+		if (flags & IS_COND) {
+			if (!(flags & PATCH_ABS_B)) {
+				addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(ins, executable_offset);
+				SLJIT_ASSERT((sljit_sw)addr <= 0x7fff && (sljit_sw)addr >= -0x8000);
+				ins[0] = BCx | ((sljit_ins)addr & 0xfffc) | (ins[0] & 0x03ff0001);
+			} else {
+				SLJIT_ASSERT(addr <= 0xffff);
+				ins[0] = BCx | ((sljit_ins)addr & 0xfffc) | 0x2 | ((*ins) & 0x03ff0001);
+			}
+			return;
+		}
+
+		if (!(flags & PATCH_ABS_B)) {
+			addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(ins, executable_offset);
+			SLJIT_ASSERT((sljit_sw)addr <= 0x01ffffff && (sljit_sw)addr >= -0x02000000);
+			ins[0] = Bx | ((sljit_ins)addr & 0x03fffffc) | (ins[0] & 0x1);
+		} else {
+			SLJIT_ASSERT(addr <= 0x03ffffff);
+			ins[0] = Bx | ((sljit_ins)addr & 0x03fffffc) | 0x2 | (ins[0] & 0x1);
+		}
+		return;
+	}
+
+	reg = (flags & JUMP_MOV_ADDR) ? (sljit_s32)ins[0] : TMP_CALL_REG;
+
+#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
+	ins[0] = ADDIS | D(reg) | A(0) | IMM(addr >> 16);
+	ins[1] = ORI | S(reg) | A(reg) | IMM(addr);
+#else /* !SLJIT_CONFIG_PPC_32 */
+
+	/* The TMP_ZERO cannot be used because it is restored for tail calls. */
+	if (flags & PATCH_ABS32) {
+		SLJIT_ASSERT(addr < 0x80000000l);
+		ins[0] = ADDIS | D(reg) | A(0) | IMM(addr >> 16);
+		ins[1] = ORI | S(reg) | A(reg) | IMM(addr);
+		return;
+	}
+
+	if (flags & PATCH_ABS48) {
+		SLJIT_ASSERT(addr < 0x800000000000l);
+		ins[0] = ADDIS | D(reg) | A(0) | IMM(addr >> 32);
+		ins[1] = ORI | S(reg) | A(reg) | IMM(addr >> 16);
+		ins[2] = SLDI(16) | S(reg) | A(reg);
+		ins[3] = ORI | S(reg) | A(reg) | IMM(addr);
+		return;
+	}
+
+	ins[0] = ADDIS | D(reg) | A(0) | IMM(addr >> 48);
+	ins[1] = ORI | S(reg) | A(reg) | IMM(addr >> 32);
+	ins[2] = SLDI(32) | S(reg) | A(reg);
+	ins[3] = ORIS | S(reg) | A(reg) | IMM(addr >> 16);
+	ins[4] = ORI | S(reg) | A(reg) | IMM(addr);
+#endif /* SLJIT_CONFIG_PPC_32 */
+}
+
+static void reduce_code_size(struct sljit_compiler *compiler)
+{
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	struct sljit_const *const_;
+	SLJIT_NEXT_DEFINE_TYPES;
+	sljit_uw total_size;
+	sljit_uw size_reduce = 0;
+	sljit_sw diff;
+
+	label = compiler->labels;
+	jump = compiler->jumps;
+	const_ = compiler->consts;
+	SLJIT_NEXT_INIT_TYPES();
+
+	while (1) {
+		SLJIT_GET_NEXT_MIN();
+
+		if (next_min_addr == SLJIT_MAX_ADDRESS)
+			break;
+
+		if (next_min_addr == next_label_size) {
+			label->size -= size_reduce;
+
+			label = label->next;
+			next_label_size = SLJIT_GET_NEXT_SIZE(label);
+		}
+
+		if (next_min_addr == next_const_addr) {
+			const_->addr -= size_reduce;
+			const_ = const_->next;
+			next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+			continue;
+		}
+
+		if (next_min_addr != next_jump_addr)
+			continue;
+
+		jump->addr -= size_reduce;
+		if (!(jump->flags & JUMP_MOV_ADDR)) {
+			total_size = JUMP_MAX_SIZE - 1;
+
+			if (!(jump->flags & SLJIT_REWRITABLE_JUMP)) {
+				if (jump->flags & JUMP_ADDR) {
+					if (jump->u.target <= 0x01ffffff)
+						total_size = 1 - 1;
+#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
+					else if (jump->u.target < 0x80000000l)
+						total_size = 4 - 1;
+					else if (jump->u.target < 0x800000000000l)
+						total_size = 6 - 1;
+#endif /* SLJIT_CONFIG_PPC_64 */
+				} else {
+					/* Unit size: instruction. */
+					diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+					if (jump->u.label->size > jump->addr) {
+						SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+						diff -= (sljit_sw)size_reduce;
+					}
+
+					if (jump->flags & IS_COND) {
+						if (diff <= (0x7fff / SSIZE_OF(ins)) && diff >= (-0x8000 / SSIZE_OF(ins)))
+							total_size = 1 - 1;
+						else if ((diff - 1) <= (0x01ffffff / SSIZE_OF(ins)) && (diff - 1) >= (-0x02000000 / SSIZE_OF(ins)))
+							total_size = 2 - 1;
+					} else if (diff <= (0x01ffffff / SSIZE_OF(ins)) && diff >= (-0x02000000 / SSIZE_OF(ins)))
+						total_size = 1 - 1;
+				}
+			}
+
+			size_reduce += (JUMP_MAX_SIZE - 1) - total_size;
+			jump->flags |= total_size << JUMP_SIZE_SHIFT;
+#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
+		} else {
+			total_size = (sljit_uw)4 << JUMP_SIZE_SHIFT;
+
+			if (jump->flags & JUMP_ADDR) {
+				if (jump->u.target < 0x80000000l) {
+					total_size = (sljit_uw)1 << JUMP_SIZE_SHIFT;
+					size_reduce += 3;
+				} else if (jump->u.target < 0x800000000000l) {
+					total_size = (sljit_uw)3 << JUMP_SIZE_SHIFT;
+					size_reduce += 1;
+				}
+			}
+			jump->flags |= total_size;
+#endif /* SLJIT_CONFIG_PPC_64 */
+		}
+
+		jump = jump->next;
+		next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+	}
+
+	compiler->size -= size_reduce;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_ins *code;
@@ -438,18 +608,20 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	sljit_ins *buf_ptr;
 	sljit_ins *buf_end;
 	sljit_uw word_count;
-	sljit_uw next_addr;
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	sljit_uw jump_addr;
+#endif
+	SLJIT_NEXT_DEFINE_TYPES;
 	sljit_sw executable_offset;
-	sljit_uw addr;
 
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
+
+	reduce_code_size(compiler);
 
 #if (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
 	/* add to compiler->size additional instruction space to hold the trampoline and padding */
@@ -459,93 +631,66 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	compiler->size += (sizeof(struct sljit_function_context) / sizeof(sljit_ins));
 #endif
 #endif
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins), compiler->exec_allocator_data);
+	code = (sljit_ins*)allocate_executable_memory(compiler->size * sizeof(sljit_ins), options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
+
+	reverse_buf(compiler);
 	buf = compiler->buf;
 
 	code_ptr = code;
 	word_count = 0;
-	next_addr = 0;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
-
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
 
 	do {
 		buf_ptr = (sljit_ins*)buf->memory;
 		buf_end = buf_ptr + (buf->used_size >> 2);
 		do {
 			*code_ptr = *buf_ptr++;
-			if (next_addr == word_count) {
+			if (next_min_addr == word_count) {
 				SLJIT_ASSERT(!label || label->size >= word_count);
 				SLJIT_ASSERT(!jump || jump->addr >= word_count);
 				SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-				SLJIT_ASSERT(!put_label || put_label->addr >= word_count);
 
 				/* These structures are ordered by their address. */
-				if (label && label->size == word_count) {
+				if (next_min_addr == next_label_size) {
 					/* Just recording the address. */
-					label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+					label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 					label->size = (sljit_uw)(code_ptr - code);
 					label = label->next;
+					next_label_size = SLJIT_GET_NEXT_SIZE(label);
 				}
-				if (jump && jump->addr == word_count) {
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-					jump->addr = (sljit_uw)(code_ptr - 3);
-#else
-					jump->addr = (sljit_uw)(code_ptr - 6);
+
+				if (next_min_addr == next_jump_addr) {
+					if (!(jump->flags & JUMP_MOV_ADDR)) {
+						word_count += jump->flags >> JUMP_SIZE_SHIFT;
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+						jump_addr = (sljit_uw)code_ptr;
 #endif
-					if (detect_jump_type(jump, code_ptr, code, executable_offset)) {
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-						code_ptr[-3] = code_ptr[0];
-						code_ptr -= 3;
-#else
-						if (jump->flags & PATCH_ABS32) {
-							code_ptr -= 3;
-							code_ptr[-1] = code_ptr[2];
-							code_ptr[0] = code_ptr[3];
-						}
-						else if (jump->flags & PATCH_ABS48) {
-							code_ptr--;
-							code_ptr[-1] = code_ptr[0];
-							code_ptr[0] = code_ptr[1];
-							/* rldicr rX,rX,32,31 -> rX,rX,16,47 */
-							SLJIT_ASSERT((code_ptr[-3] & 0xfc00ffff) == 0x780007c6);
-							code_ptr[-3] ^= 0x8422;
-							/* oris -> ori */
-							code_ptr[-2] ^= 0x4000000;
-						}
-						else {
-							code_ptr[-6] = code_ptr[0];
-							code_ptr -= 6;
-						}
-#endif
-						if (jump->flags & REMOVE_COND) {
-							code_ptr[0] = BCx | (2 << 2) | ((code_ptr[0] ^ (8 << 21)) & 0x03ff0001);
-							code_ptr++;
-							jump->addr += sizeof(sljit_ins);
-							code_ptr[0] = Bx;
-							jump->flags -= IS_COND;
-						}
+						code_ptr = detect_jump_type(jump, code_ptr, code, executable_offset);
+						SLJIT_ASSERT(((sljit_uw)code_ptr - jump_addr <= (jump->flags >> JUMP_SIZE_SHIFT) * sizeof(sljit_ins)));
+					} else {
+						jump->addr = (sljit_uw)code_ptr;
+#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
+						word_count += jump->flags >> JUMP_SIZE_SHIFT;
+						code_ptr += mov_addr_get_length(jump, code, executable_offset);
+#else /* !SLJIT_CONFIG_PPC_64 */
+						word_count++;
+						code_ptr++;
+#endif /* SLJIT_CONFIG_PPC_64 */
 					}
 					jump = jump->next;
-				}
-				if (const_ && const_->addr == word_count) {
+					next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+				} else if (next_min_addr == next_const_addr) {
 					const_->addr = (sljit_uw)code_ptr;
 					const_ = const_->next;
+					next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
 				}
-				if (put_label && put_label->addr == word_count) {
-					SLJIT_ASSERT(put_label->label);
-					put_label->addr = (sljit_uw)code_ptr;
-#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
-					code_ptr += put_label_get_length(put_label, (sljit_uw)(SLJIT_ADD_EXEC_OFFSET(code, executable_offset) + put_label->label->size));
-					word_count += 4;
-#endif
-					put_label = put_label->next;
-				}
-				next_addr = compute_next_addr(label, jump, const_, put_label);
+
+				SLJIT_GET_NEXT_MIN();
 			}
 			code_ptr++;
 			word_count++;
@@ -555,7 +700,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	} while (buf);
 
 	if (label && label->size == word_count) {
-		label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+		label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 		label->size = (sljit_uw)(code_ptr - code);
 		label = label->next;
 	}
@@ -563,7 +708,6 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 
 #if (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
 	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)(compiler->size - (sizeof(struct sljit_function_context) / sizeof(sljit_ins))));
@@ -573,84 +717,10 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 
 	jump = compiler->jumps;
 	while (jump) {
-		do {
-			addr = (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
-			buf_ptr = (sljit_ins *)jump->addr;
-
-			if (jump->flags & PATCH_B) {
-				if (jump->flags & IS_COND) {
-					if (!(jump->flags & PATCH_ABS_B)) {
-						addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset);
-						SLJIT_ASSERT((sljit_sw)addr <= 0x7fff && (sljit_sw)addr >= -0x8000);
-						*buf_ptr = BCx | ((sljit_ins)addr & 0xfffc) | ((*buf_ptr) & 0x03ff0001);
-					}
-					else {
-						SLJIT_ASSERT(addr <= 0xffff);
-						*buf_ptr = BCx | ((sljit_ins)addr & 0xfffc) | 0x2 | ((*buf_ptr) & 0x03ff0001);
-					}
-				}
-				else {
-					if (!(jump->flags & PATCH_ABS_B)) {
-						addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset);
-						SLJIT_ASSERT((sljit_sw)addr <= 0x01ffffff && (sljit_sw)addr >= -0x02000000);
-						*buf_ptr = Bx | ((sljit_ins)addr & 0x03fffffc) | ((*buf_ptr) & 0x1);
-					}
-					else {
-						SLJIT_ASSERT(addr <= 0x03ffffff);
-						*buf_ptr = Bx | ((sljit_ins)addr & 0x03fffffc) | 0x2 | ((*buf_ptr) & 0x1);
-					}
-				}
-				break;
-			}
-
-			/* Set the fields of immediate loads. */
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-			SLJIT_ASSERT(((buf_ptr[0] | buf_ptr[1]) & 0xffff) == 0);
-			buf_ptr[0] |= (sljit_ins)(addr >> 16) & 0xffff;
-			buf_ptr[1] |= (sljit_ins)addr & 0xffff;
-#else
-			if (jump->flags & PATCH_ABS32) {
-				SLJIT_ASSERT(addr <= 0x7fffffff);
-				SLJIT_ASSERT(((buf_ptr[0] | buf_ptr[1]) & 0xffff) == 0);
-				buf_ptr[0] |= (sljit_ins)(addr >> 16) & 0xffff;
-				buf_ptr[1] |= (sljit_ins)addr & 0xffff;
-				break;
-			}
-
-			if (jump->flags & PATCH_ABS48) {
-				SLJIT_ASSERT(addr <= 0x7fffffffffff);
-				SLJIT_ASSERT(((buf_ptr[0] | buf_ptr[1] | buf_ptr[3]) & 0xffff) == 0);
-				buf_ptr[0] |= (sljit_ins)(addr >> 32) & 0xffff;
-				buf_ptr[1] |= (sljit_ins)(addr >> 16) & 0xffff;
-				buf_ptr[3] |= (sljit_ins)addr & 0xffff;
-				break;
-			}
-
-			SLJIT_ASSERT(((buf_ptr[0] | buf_ptr[1] | buf_ptr[3] | buf_ptr[4]) & 0xffff) == 0);
-			buf_ptr[0] |= (sljit_ins)(addr >> 48) & 0xffff;
-			buf_ptr[1] |= (sljit_ins)(addr >> 32) & 0xffff;
-			buf_ptr[3] |= (sljit_ins)(addr >> 16) & 0xffff;
-			buf_ptr[4] |= (sljit_ins)addr & 0xffff;
-#endif
-		} while (0);
+		generate_jump_or_mov_addr(jump, executable_offset);
 		jump = jump->next;
 	}
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-		addr = put_label->label->addr;
-		buf_ptr = (sljit_ins *)put_label->addr;
-
-		SLJIT_ASSERT((buf_ptr[0] & 0xfc1f0000) == ADDIS && (buf_ptr[1] & 0xfc000000) == ORI);
-		buf_ptr[0] |= (addr >> 16) & 0xffff;
-		buf_ptr[1] |= addr & 0xffff;
-#else
-		put_label_set(put_label);
-#endif
-		put_label = put_label->next;
-	}
-
 	compiler->error = SLJIT_ERR_COMPILED;
 	compiler->executable_offset = executable_offset;
 
@@ -671,11 +741,9 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 
 #if (defined SLJIT_INDIRECT_CALL && SLJIT_INDIRECT_CALL)
 	compiler->executable_size = (sljit_uw)(code_ptr - code) * sizeof(sljit_ins) + sizeof(struct sljit_function_context);
-
 	return code_ptr;
 #else
 	compiler->executable_size = (sljit_uw)(code_ptr - code) * sizeof(sljit_ins);
-
 	return code;
 #endif
 }
@@ -701,6 +769,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_CLZ:
 	case SLJIT_HAS_ROT:
 	case SLJIT_HAS_PREFETCH:
+	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
 		return 1;
 
 	case SLJIT_HAS_CTZ:
@@ -798,9 +868,11 @@ static sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 inp_flag
 #define STACK_MAX_DISTANCE	(0x8000 - SSIZE_OF(sw) - LR_SAVE_OFFSET)
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 fsaveds = ENTER_GET_FLOAT_REGS(saveds);
 	sljit_s32 i, tmp, base, offset;
 	sljit_s32 word_arg_count = 0;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
@@ -809,9 +881,11 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 #endif
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - saved_arg_count, 0)
 		+ GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 
@@ -915,13 +989,18 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
-	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	sljit_s32 fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 fsaveds = ENTER_GET_FLOAT_REGS(saveds);
 
+	CHECK_ERROR();
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 0)
 		+ GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 
@@ -937,14 +1016,16 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
 	sljit_s32 i, tmp, base, offset;
 	sljit_s32 local_size = compiler->local_size;
 
+	SLJIT_ASSERT(TMP_CALL_REG != TMP_REG2);
+
 	base = SLJIT_SP;
 	if (local_size > STACK_MAX_DISTANCE) {
-		base = TMP_REG1;
+		base = TMP_REG2;
 		if (local_size > 2 * STACK_MAX_DISTANCE + LR_SAVE_OFFSET) {
 			FAIL_IF(push_inst(compiler, STACK_LOAD | D(base) | A(SLJIT_SP) | IMM(0)));
 			local_size = 0;
 		} else {
-			FAIL_IF(push_inst(compiler, ADDI | D(TMP_REG1) | A(SLJIT_SP) | IMM(local_size - STACK_MAX_DISTANCE)));
+			FAIL_IF(push_inst(compiler, ADDI | D(TMP_REG2) | A(SLJIT_SP) | IMM(local_size - STACK_MAX_DISTANCE)));
 			local_size = STACK_MAX_DISTANCE;
 		}
 	}
@@ -986,7 +1067,7 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
 	if (local_size > 0)
 		return push_inst(compiler, ADDI | D(SLJIT_SP) | A(base) | IMM(local_size));
 
-	SLJIT_ASSERT(base == TMP_REG1);
+	SLJIT_ASSERT(base == TMP_REG2);
 	return push_inst(compiler, OR | S(base) | A(SLJIT_SP) | B(base));
 }
 
@@ -1253,7 +1334,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	sljit_s32 dst_r = TMP_REG2;
 	sljit_s32 src1_r;
 	sljit_s32 src2_r;
-	sljit_s32 sugg_src2_r = TMP_REG2;
+	sljit_s32 src2_tmp_reg = (!(input_flags & ALT_SIGN_EXT) && GET_OPCODE(op) >= SLJIT_OP2_BASE && FAST_IS_REG(src1)) ? TMP_REG1 : TMP_REG2;
 	sljit_s32 flags = input_flags & (ALT_FORM1 | ALT_FORM2 | ALT_FORM3 | ALT_FORM4 | ALT_FORM5 | ALT_SIGN_EXT | ALT_SET_FLAGS);
 
 	/* Destination check. */
@@ -1264,24 +1345,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		flags |= REG_DEST;
 
 		if (op >= SLJIT_MOV && op <= SLJIT_MOV_P)
-			sugg_src2_r = dst_r;
-	}
-
-	/* Source 1. */
-	if (FAST_IS_REG(src1)) {
-		src1_r = src1;
-		flags |= REG1_SOURCE;
-	}
-	else if (src1 == SLJIT_IMM) {
-		src1_r = TMP_ZERO;
-		if (src1w != 0) {
-			FAIL_IF(load_immediate(compiler, TMP_REG1, src1w));
-			src1_r = TMP_REG1;
-		}
-	}
-	else {
-		FAIL_IF(emit_op_mem(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w, TMP_REG1));
-		src1_r = TMP_REG1;
+			src2_tmp_reg = dst_r;
 	}
 
 	/* Source 2. */
@@ -1291,17 +1355,30 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 
 		if (!(flags & REG_DEST) && op >= SLJIT_MOV && op <= SLJIT_MOV_P)
 			dst_r = src2_r;
-	}
-	else if (src2 == SLJIT_IMM) {
+	} else if (src2 == SLJIT_IMM) {
 		src2_r = TMP_ZERO;
 		if (src2w != 0) {
-			FAIL_IF(load_immediate(compiler, sugg_src2_r, src2w));
-			src2_r = sugg_src2_r;
+			FAIL_IF(load_immediate(compiler, src2_tmp_reg, src2w));
+			src2_r = src2_tmp_reg;
 		}
+	} else {
+		FAIL_IF(emit_op_mem(compiler, input_flags | LOAD_DATA, src2_tmp_reg, src2, src2w, TMP_REG1));
+		src2_r = src2_tmp_reg;
 	}
-	else {
-		FAIL_IF(emit_op_mem(compiler, input_flags | LOAD_DATA, sugg_src2_r, src2, src2w, TMP_REG2));
-		src2_r = sugg_src2_r;
+
+	/* Source 1. */
+	if (FAST_IS_REG(src1)) {
+		src1_r = src1;
+		flags |= REG1_SOURCE;
+	} else if (src1 == SLJIT_IMM) {
+		src1_r = TMP_ZERO;
+		if (src1w != 0) {
+			FAIL_IF(load_immediate(compiler, TMP_REG1, src1w));
+			src1_r = TMP_REG1;
+		}
+	} else {
+		FAIL_IF(emit_op_mem(compiler, input_flags | LOAD_DATA, TMP_REG1, src1, src1w, TMP_REG1));
+		src1_r = TMP_REG1;
 	}
 
 	FAIL_IF(emit_single_op(compiler, op, flags, dst_r, src1_r, src2_r));
@@ -1354,6 +1431,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 #else
 		return push_inst(compiler, (op == SLJIT_DIV_UW ? DIVWU : DIVW) | D(SLJIT_R0) | A(SLJIT_R0) | B(SLJIT_R1));
 #endif
+	case SLJIT_MEMORY_BARRIER:
+		return push_inst(compiler, SYNC);
 	case SLJIT_ENDBR:
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
 		return SLJIT_SUCCESS;
@@ -1757,7 +1836,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 		compiler->status_flags_state = SLJIT_CURRENT_FLAGS_SUB;
 
 		if (GET_FLAG_TYPE(op) >= SLJIT_LESS && GET_FLAG_TYPE(op) <= SLJIT_LESS_EQUAL) {
-			if (dst == TMP_REG2) {
+			if (dst == TMP_REG1) {
 				if (TEST_UL_IMM(src2, src2w)) {
 					compiler->imm = (sljit_ins)src2w & 0xffff;
 					return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM1 | ALT_FORM2, dst, dstw, src1, src1w, TMP_REG2, 0);
@@ -1772,7 +1851,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 			return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM1 | ALT_FORM3, dst, dstw, src1, src1w, src2, src2w);
 		}
 
-		if (dst == TMP_REG2 && GET_FLAG_TYPE(op) <= SLJIT_SIG_LESS_EQUAL) {
+		if (dst == TMP_REG1 && GET_FLAG_TYPE(op) <= SLJIT_SIG_LESS_EQUAL) {
 			if (TEST_SL_IMM(src2, src2w)) {
 				compiler->imm = (sljit_ins)src2w & 0xffff;
 				return emit_op(compiler, SLJIT_SUB, flags | ALT_FORM2 | ALT_FORM3, dst, dstw, src1, src1w, TMP_REG2, 0);
@@ -1911,13 +1990,31 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	CHECK(check_sljit_emit_op2(compiler, op, 1, 0, 0, src1, src1w, src2, src2w));
 
 	SLJIT_SKIP_CHECKS(compiler);
-	return sljit_emit_op2(compiler, op, TMP_REG2, 0, src1, src1w, src2, src2w);
+	return sljit_emit_op2(compiler, op, TMP_REG1, 0, src1, src1w, src2, src2w);
 }
 
 #undef TEST_ADD_FORM1
 #undef TEST_SUB_FORM2
 #undef TEST_SUB_FORM3
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		SLJIT_SKIP_CHECKS(compiler);
+		FAIL_IF(sljit_emit_op2(compiler, SLJIT_MUL | (op & SLJIT_32), TMP_REG2, 0, src1, src1w, src2, src2w));
+		return push_inst(compiler, ADD | D(dst_reg) | A(dst_reg) | B(TMP_REG2));
+	}
+
+	return SLJIT_SUCCESS;
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 dst_reg,
 	sljit_s32 src1_reg,
@@ -2228,7 +2325,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 		/* Fall through. */
 	case SLJIT_MOV_F64:
 		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
+			if (!(dst & SLJIT_MEM))
 				FAIL_IF(push_inst(compiler, FMR | FD(dst_r) | FB(src)));
 			else
 				dst_r = src;
@@ -2268,7 +2365,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 	}
 
 	if (src2 & SLJIT_MEM) {
-		FAIL_IF(emit_op_mem(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, TMP_REG2));
+		FAIL_IF(emit_op_mem(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, TMP_REG1));
 		src2 = TMP_FREG2;
 	}
 
@@ -2359,6 +2456,7 @@ static sljit_ins get_bo_bi_flags(struct sljit_compiler *compiler, sljit_s32 type
 		/* fallthrough */
 
 	case SLJIT_EQUAL:
+	case SLJIT_ATOMIC_STORED:
 		return (12 << 21) | (2 << 16);
 
 	case SLJIT_CARRY:
@@ -2367,6 +2465,7 @@ static sljit_ins get_bo_bi_flags(struct sljit_compiler *compiler, sljit_s32 type
 		/* fallthrough */
 
 	case SLJIT_NOT_EQUAL:
+	case SLJIT_ATOMIC_NOT_STORED:
 		return (4 << 21) | (2 << 16);
 
 	case SLJIT_LESS:
@@ -2451,7 +2550,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	type &= 0xff;
 
 	if ((type | 0x1) == SLJIT_NOT_CARRY)
-		PTR_FAIL_IF(push_inst(compiler, ADDE | RC(ALT_SET_FLAGS) | D(TMP_REG1) | A(TMP_ZERO) | B(TMP_ZERO)));
+		PTR_FAIL_IF(push_inst(compiler, ADDE | RC(ALT_SET_FLAGS) | D(TMP_REG2) | A(TMP_ZERO) | B(TMP_ZERO)));
 
 	/* In PPC, we don't need to touch the arguments. */
 	if (type < SLJIT_JUMP)
@@ -2461,10 +2560,11 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 		jump->flags |= IS_CALL;
 #endif
 
-	PTR_FAIL_IF(emit_const(compiler, TMP_CALL_REG, 0));
-	PTR_FAIL_IF(push_inst(compiler, MTCTR | S(TMP_CALL_REG)));
 	jump->addr = compiler->size;
 	PTR_FAIL_IF(push_inst(compiler, BCCTR | bo_bi_flags | (type >= SLJIT_FAST_CALL ? 1 : 0)));
+
+	/* Maximum number of instructions required for generating a constant. */
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return jump;
 }
 
@@ -2498,18 +2598,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_ijump(compiler, type, src, srcw));
 
-	if (FAST_IS_REG(src)) {
-#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
-		if (type >= SLJIT_CALL && src != TMP_CALL_REG) {
-			FAIL_IF(push_inst(compiler, OR | S(src) | A(TMP_CALL_REG) | B(src)));
-			src_r = TMP_CALL_REG;
-		}
-		else
-			src_r = src;
-#else /* SLJIT_PASS_ENTRY_ADDR_TO_CALL */
-		src_r = src;
-#endif /* SLJIT_PASS_ENTRY_ADDR_TO_CALL */
-	} else if (src == SLJIT_IMM) {
+	if (src == SLJIT_IMM) {
 		/* These jumps are converted to jump/call instructions when possible. */
 		jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
 		FAIL_IF(!jump);
@@ -2521,8 +2610,24 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 			jump->flags |= IS_CALL;
 #endif /* SLJIT_PASS_ENTRY_ADDR_TO_CALL */
 
-		FAIL_IF(emit_const(compiler, TMP_CALL_REG, 0));
-		src_r = TMP_CALL_REG;
+		jump->addr = compiler->size;
+		FAIL_IF(push_inst(compiler, BCCTR | (20 << 21) | (type >= SLJIT_FAST_CALL ? 1 : 0)));
+
+		/* Maximum number of instructions required for generating a constant. */
+		compiler->size += JUMP_MAX_SIZE - 1;
+		return SLJIT_SUCCESS;
+	}
+
+	if (FAST_IS_REG(src)) {
+#if (defined SLJIT_PASS_ENTRY_ADDR_TO_CALL && SLJIT_PASS_ENTRY_ADDR_TO_CALL)
+		if (type >= SLJIT_CALL && src != TMP_CALL_REG) {
+			FAIL_IF(push_inst(compiler, OR | S(src) | A(TMP_CALL_REG) | B(src)));
+			src_r = TMP_CALL_REG;
+		} else
+			src_r = src;
+#else /* SLJIT_PASS_ENTRY_ADDR_TO_CALL */
+		src_r = src;
+#endif /* SLJIT_PASS_ENTRY_ADDR_TO_CALL */
 	} else {
 		ADJUST_LOCAL_OFFSET(src, srcw);
 		FAIL_IF(emit_op_mem(compiler, WORD_DATA | LOAD_DATA, TMP_CALL_REG, src, srcw, TMP_CALL_REG));
@@ -2530,8 +2635,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 	}
 
 	FAIL_IF(push_inst(compiler, MTCTR | S(src_r)));
-	if (jump)
-		jump->addr = compiler->size;
 	return push_inst(compiler, BCCTR | (20 << 21) | (type >= SLJIT_FAST_CALL ? 1 : 0));
 }
 
@@ -2619,10 +2722,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 		break;
 
 	case SLJIT_EQUAL:
+	case SLJIT_ATOMIC_STORED:
 		bit = 2;
 		break;
 
 	case SLJIT_NOT_EQUAL:
+	case SLJIT_ATOMIC_NOT_STORED:
 		bit = 2;
 		invert = 1;
 		break;
@@ -2748,13 +2853,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 				type ^= 0x1;
 		} else {
 			if (ADDRESSING_DEPENDS_ON(src1, dst_reg)) {
-				FAIL_IF(push_inst(compiler, OR | S(dst_reg) | A(TMP_REG2) | B(dst_reg)));
+				FAIL_IF(push_inst(compiler, OR | S(dst_reg) | A(TMP_REG1) | B(dst_reg)));
 
 				if ((src1 & REG_MASK) == dst_reg)
-					src1 = (src1 & ~REG_MASK) | TMP_REG2;
+					src1 = (src1 & ~REG_MASK) | TMP_REG1;
 
 				if (OFFS_REG(src1) == dst_reg)
-					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG2);
+					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG1);
 			}
 
 			FAIL_IF(push_inst(compiler, OR | S(src2_reg) | A(dst_reg) | B(src2_reg)));
@@ -3039,6 +3144,78 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem_update(struct sljit_compiler
 	return push_inst(compiler, INST_CODE_AND_DST(inst, DOUBLE_DATA, freg) | A(mem & REG_MASK) | IMM(memw));
 }
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 mem_reg)
+{
+	sljit_ins ins;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
+
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
+		ins = LDARX;
+		break;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	case SLJIT_MOV_U32:
+	case SLJIT_MOV32:
+		ins = LWARX;
+		break;
+
+	default:
+		return SLJIT_ERR_UNSUPPORTED;
+	}
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	return push_inst(compiler, ins | D(dst_reg) | B(mem_reg));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 src_reg,
+	sljit_s32 mem_reg,
+	sljit_s32 temp_reg)
+{
+	sljit_ins ins;
+
+	/* temp_reg == mem_reg is undefined so use another temp register */
+	SLJIT_UNUSED_ARG(temp_reg);
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
+
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+#if (defined SLJIT_CONFIG_PPC_64 && SLJIT_CONFIG_PPC_64)
+		ins = STDCX | 0x1;
+		break;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	case SLJIT_MOV_U32:
+	case SLJIT_MOV32:
+		ins = STWCX | 0x1;
+		break;
+
+	default:
+		return SLJIT_ERR_UNSUPPORTED;
+	}
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	return push_inst(compiler, ins | D(src_reg) | B(mem_reg));
+}
+
 SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw init_value)
 {
 	struct sljit_const *const_;
@@ -3061,31 +3238,31 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_s32 dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 0);
 
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
-#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
-	PTR_FAIL_IF(emit_const(compiler, dst_r, 0));
-#else
 	PTR_FAIL_IF(push_inst(compiler, (sljit_ins)dst_r));
+#if (defined SLJIT_CONFIG_PPC_32 && SLJIT_CONFIG_PPC_32)
+	compiler->size++;
+#else
 	compiler->size += 4;
 #endif
 
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op(compiler, SLJIT_MOV, WORD_DATA, dst, dstw, TMP_REG1, 0, TMP_REG2, 0));
 
-	return put_label;
+	return jump;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant, sljit_sw executable_offset)
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeRISCV_32.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeRISCV_32.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeRISCV_32.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeRISCV_32.c
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeRISCV_64.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeRISCV_64.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeRISCV_64.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeRISCV_64.c
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeRISCV_common.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeRISCV_common.c
similarity index 69%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeRISCV_common.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeRISCV_common.c
index 64bd411d..d3ba46db 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeRISCV_common.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeRISCV_common.c
@@ -50,6 +50,9 @@ typedef sljit_u32 sljit_ins;
 #define TMP_FREG1	(SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1)
 #define TMP_FREG2	(SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2)
 
+#define TMP_VREG1	(SLJIT_NUMBER_OF_VECTOR_REGISTERS + 1)
+#define TMP_VREG2	(SLJIT_NUMBER_OF_VECTOR_REGISTERS + 2)
+
 static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 7] = {
 	0, 10, 11, 12, 13, 14, 15, 16, 17, 29, 30, 31, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 9, 8, 2, 6, 1, 7, 5, 28
 };
@@ -58,6 +61,10 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 	0, 10, 11, 12, 13, 14, 15, 16, 17, 2, 3, 4, 5, 6, 7, 28, 29, 30, 31, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 9, 8, 0, 1,
 };
 
+static const sljit_u8 vreg_map[SLJIT_NUMBER_OF_VECTOR_REGISTERS + 3] = {
+	0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
+};
+
 /* --------------------------------------------------------------------- */
 /*  Instrucion forms                                                     */
 /* --------------------------------------------------------------------- */
@@ -68,6 +75,9 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define FRD(rd)		((sljit_ins)freg_map[rd] << 7)
 #define FRS1(rs1)	((sljit_ins)freg_map[rs1] << 15)
 #define FRS2(rs2)	((sljit_ins)freg_map[rs2] << 20)
+#define VRD(rd)		((sljit_ins)vreg_map[rd] << 7)
+#define VRS1(rs1)	((sljit_ins)vreg_map[rs1] << 15)
+#define VRS2(rs2)	((sljit_ins)vreg_map[rs2] << 20)
 #define IMM_I(imm)	((sljit_ins)(imm) << 20)
 #define IMM_S(imm)	((((sljit_ins)(imm) & 0xfe0) << 20) | (((sljit_ins)(imm) & 0x1f) << 7))
 
@@ -77,6 +87,15 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define F12(f)		((sljit_ins)(f) << 20)
 #define F7(f)		((sljit_ins)(f) << 25)
 
+/* Vector instruction types. */
+#define OPFVF		(F3(0x5) | OPC(0x57))
+#define OPFVV		(F3(0x1) | OPC(0x57))
+#define OPIVI		(F3(0x3) | OPC(0x57))
+#define OPIVV		(F3(0x0) | OPC(0x57))
+#define OPIVX		(F3(0x4) | OPC(0x57))
+#define OPMVV		(F3(0x2) | OPC(0x57))
+#define OPMVX		(F3(0x6) | OPC(0x57))
+
 #define ADD		(F7(0x0) | F3(0x0) | OPC(0x33))
 #define ADDI		(F3(0x0) | OPC(0x13))
 #define AND		(F7(0x0) | F3(0x7) | OPC(0x33))
@@ -88,11 +107,16 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define BGE		(F3(0x5) | OPC(0x63))
 #define BLTU		(F3(0x6) | OPC(0x63))
 #define BGEU		(F3(0x7) | OPC(0x63))
+#if defined __riscv_zbb
+#define CLZ		(F7(0x30) | F3(0x1) | OPC(0x13))
+#define CTZ		(F7(0x30) | F12(0x1) | F3(0x1) | OPC(0x13))
+#endif /* __riscv_zbb */
 #define DIV		(F7(0x1) | F3(0x4) | OPC(0x33))
 #define DIVU		(F7(0x1) | F3(0x5) | OPC(0x33))
 #define EBREAK		(F12(0x1) | F3(0x0) | OPC(0x73))
 #define FADD_S		(F7(0x0) | F3(0x7) | OPC(0x53))
 #define FDIV_S		(F7(0xc) | F3(0x7) | OPC(0x53))
+#define FENCE		(F3(0x0) | OPC(0xf))
 #define FEQ_S		(F7(0x50) | F3(0x2) | OPC(0x53))
 #define FLD		(F3(0x3) | OPC(0x7))
 #define FLE_S		(F7(0x50) | F3(0x0) | OPC(0x53))
@@ -116,6 +140,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define LD		(F3(0x3) | OPC(0x3))
 #define LUI		(OPC(0x37))
 #define LW		(F3(0x2) | OPC(0x3))
+#define LR		(F7(0x8) | OPC(0x2f))
 #define MUL		(F7(0x1) | F3(0x0) | OPC(0x33))
 #define MULH		(F7(0x1) | F3(0x1) | OPC(0x33))
 #define MULHU		(F7(0x1) | F3(0x3) | OPC(0x33))
@@ -123,21 +148,73 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define ORI		(F3(0x6) | OPC(0x13))
 #define REM		(F7(0x1) | F3(0x6) | OPC(0x33))
 #define REMU		(F7(0x1) | F3(0x7) | OPC(0x33))
+#if defined __riscv_zbb
+#if defined SLJIT_CONFIG_RISCV_32
+#define REV8		(F12(0x698) | F3(0x5) | OPC(0x13))
+#elif defined SLJIT_CONFIG_RISCV_64
+#define REV8		(F12(0x6b8) | F3(0x5) | OPC(0x13))
+#endif /* SLJIT_CONFIG_RISCV_32 */
+#define ROL		(F7(0x30) | F3(0x1) | OPC(0x33))
+#define ROR		(F7(0x30) | F3(0x5) | OPC(0x33))
+#define RORI		(F7(0x30) | F3(0x5) | OPC(0x13))
+#endif /* __riscv_zbb */
+#define SC		(F7(0xc) | OPC(0x2f))
 #define SD		(F3(0x3) | OPC(0x23))
+#if defined __riscv_zbb
+#define SEXTB		(F7(0x30) | F12(0x4) | F3(0x1) | OPC(0x13))
+#define SEXTH		(F7(0x30) | F12(0x5) | F3(0x1) | OPC(0x13))
+#endif /* __riscv_zbb */
+#if defined __riscv_zba
+#define SH1ADD		(F7(0x10) | F3(0x2) | OPC(0x33))
+#define SH2ADD		(F7(0x10) | F3(0x4) | OPC(0x33))
+#define SH3ADD		(F7(0x10) | F3(0x6) | OPC(0x33))
+#endif /* __riscv_zba */
 #define SLL		(F7(0x0) | F3(0x1) | OPC(0x33))
-#define SLLI		(IMM_I(0x0) | F3(0x1) | OPC(0x13))
+#define SLLI		(F3(0x1) | OPC(0x13))
 #define SLT		(F7(0x0) | F3(0x2) | OPC(0x33))
 #define SLTI		(F3(0x2) | OPC(0x13))
 #define SLTU		(F7(0x0) | F3(0x3) | OPC(0x33))
 #define SLTUI		(F3(0x3) | OPC(0x13))
 #define SRL		(F7(0x0) | F3(0x5) | OPC(0x33))
-#define SRLI		(IMM_I(0x0) | F3(0x5) | OPC(0x13))
+#define SRLI		(F3(0x5) | OPC(0x13))
 #define SRA		(F7(0x20) | F3(0x5) | OPC(0x33))
-#define SRAI		(IMM_I(0x400) | F3(0x5) | OPC(0x13))
+#define SRAI		(F7(0x20) | F3(0x5) | OPC(0x13))
 #define SUB		(F7(0x20) | F3(0x0) | OPC(0x33))
 #define SW		(F3(0x2) | OPC(0x23))
+#define VAND_VV		(F7(0x13) | OPIVV)
+#define VFMV_FS		(F7(0x21) | OPFVV)
+#define VFMV_SF		(F7(0x21) | OPFVF)
+#define VFMV_VF		(F7(0x2f) | OPFVF)
+#define VFWCVT_FFV	(F7(0x25) | (0xc << 15) | OPFVV)
+#define VL		(F7(0x1) | OPC(0x7))
+#define VMSLE_VI	(F7(0x3b) | OPIVI)
+#define VMV_SX		(F7(0x21) | OPMVX)
+#define VMV_VI		(F7(0x2f) | OPIVI)
+#define VMV_VV		(F7(0x2f) | OPIVV)
+#define VMV_VX		(F7(0x2f) | OPIVX)
+#define VMV_XS		(F7(0x21) | OPMVV)
+#define VOR_VV		(F7(0x15) | OPIVV)
+#define VSETIVLI	(F7(0x60) | F3(0x7) | OPC(0x57))
+#define VS		(F7(0x1) | OPC(0x27))
+#define VSLIDEDOWN_VX	(F7(0x1f) | OPIVX)
+#define VSLIDEDOWN_VI	(F7(0x1f) | OPIVI)
+#define VSLIDEUP_VX	(F7(0x1d) | OPIVX)
+#define VSLIDEUP_VI	(F7(0x1d) | OPIVI)
+#define VRGATHER_VI	(F7(0x19) | OPIVI)
+#define VRGATHER_VV	(F7(0x19) | OPIVV)
+#define VXOR_VV		(F7(0x17) | OPIVV)
+#define VZEXT_VF2	(F7(0x25) | (0x6 << 15) | OPMVV)
+#define VZEXT_VF4	(F7(0x25) | (0x4 << 15) | OPMVV)
+#define VZEXT_VF8	(F7(0x25) | (0x2 << 15) | OPMVV)
 #define XOR		(F7(0x0) | F3(0x4) | OPC(0x33))
 #define XORI		(F3(0x4) | OPC(0x13))
+#if defined __riscv_zbb
+#if defined SLJIT_CONFIG_RISCV_32
+#define ZEXTH		(F7(0x4) | F3(0x4) | OPC(0x33))
+#elif defined SLJIT_CONFIG_RISCV_64
+#define ZEXTH		(F7(0x4) | F3(0x4) | OPC(0x3B))
+#endif /* SLJIT_CONFIG_RISCV_32 */
+#endif /* __riscv_zbb */
 
 #define SIMM_MAX	(0x7ff)
 #define SIMM_MIN	(-0x800)
@@ -151,7 +228,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = {
 #define S32_MIN		(-0x80000000l)
 #define S44_MAX		(0x7fffffff7ffl)
 #define S52_MAX		(0x7ffffffffffffl)
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 static sljit_s32 push_inst(struct sljit_compiler *compiler, sljit_ins ins)
 {
@@ -167,181 +244,215 @@ static sljit_s32 push_imm_s_inst(struct sljit_compiler *compiler, sljit_ins ins,
 	return push_inst(compiler, ins | IMM_S(imm));
 }
 
-static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_ins *code, sljit_sw executable_offset)
+static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
 {
 	sljit_sw diff;
 	sljit_uw target_addr;
-	sljit_ins *inst;
-
-	inst = (sljit_ins *)jump->addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_uw orig_addr = jump->addr;
+	SLJIT_UNUSED_ARG(executable_offset);
 
+	jump->addr = jump_addr;
 	if (jump->flags & SLJIT_REWRITABLE_JUMP)
 		goto exit;
 
 	if (jump->flags & JUMP_ADDR)
 		target_addr = jump->u.target;
 	else {
-		SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-		target_addr = (sljit_uw)(code + jump->u.label->size) + (sljit_uw)executable_offset;
+		SLJIT_ASSERT(jump->u.label != NULL);
+		target_addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > orig_addr)
+			jump_addr = (sljit_uw)(code + orig_addr);
 	}
 
-	diff = (sljit_sw)target_addr - (sljit_sw)inst - executable_offset;
+	diff = (sljit_sw)target_addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
 
 	if (jump->flags & IS_COND) {
-		inst--;
 		diff += SSIZE_OF(ins);
 
 		if (diff >= BRANCH_MIN && diff <= BRANCH_MAX) {
+			code_ptr--;
+			code_ptr[0] = (code_ptr[0] & 0x1fff07f) ^ 0x1000;
 			jump->flags |= PATCH_B;
-			inst[0] = (inst[0] & 0x1fff07f) ^ 0x1000;
-			jump->addr = (sljit_uw)inst;
-			return inst;
+			jump->addr = (sljit_uw)code_ptr;
+			return code_ptr;
 		}
 
-		inst++;
 		diff -= SSIZE_OF(ins);
 	}
 
 	if (diff >= JUMP_MIN && diff <= JUMP_MAX) {
 		if (jump->flags & IS_COND) {
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-			inst[-1] -= (sljit_ins)(1 * sizeof(sljit_ins)) << 7;
-#else
-			inst[-1] -= (sljit_ins)(5 * sizeof(sljit_ins)) << 7;
-#endif
+			code_ptr[-1] -= (sljit_ins)(1 * sizeof(sljit_ins)) << 7;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+			code_ptr[-1] -= (sljit_ins)(5 * sizeof(sljit_ins)) << 7;
+#endif /* SLJIT_CONFIG_RISCV_32 */
 		}
 
 		jump->flags |= PATCH_J;
-		return inst;
+		return code_ptr;
 	}
 
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	if (diff >= S32_MIN && diff <= S32_MAX) {
 		if (jump->flags & IS_COND)
-			inst[-1] -= (sljit_ins)(4 * sizeof(sljit_ins)) << 7;
+			code_ptr[-1] -= (sljit_ins)(4 * sizeof(sljit_ins)) << 7;
 
 		jump->flags |= PATCH_REL32;
-		inst[1] = inst[0];
-		return inst + 1;
+		code_ptr[1] = code_ptr[0];
+		return code_ptr + 1;
 	}
 
 	if (target_addr <= (sljit_uw)S32_MAX) {
 		if (jump->flags & IS_COND)
-			inst[-1] -= (sljit_ins)(4 * sizeof(sljit_ins)) << 7;
+			code_ptr[-1] -= (sljit_ins)(4 * sizeof(sljit_ins)) << 7;
 
 		jump->flags |= PATCH_ABS32;
-		inst[1] = inst[0];
-		return inst + 1;
+		code_ptr[1] = code_ptr[0];
+		return code_ptr + 1;
 	}
 
 	if (target_addr <= S44_MAX) {
 		if (jump->flags & IS_COND)
-			inst[-1] -= (sljit_ins)(2 * sizeof(sljit_ins)) << 7;
+			code_ptr[-1] -= (sljit_ins)(2 * sizeof(sljit_ins)) << 7;
 
 		jump->flags |= PATCH_ABS44;
-		inst[3] = inst[0];
-		return inst + 3;
+		code_ptr[3] = code_ptr[0];
+		return code_ptr + 3;
 	}
 
 	if (target_addr <= S52_MAX) {
 		if (jump->flags & IS_COND)
-			inst[-1] -= (sljit_ins)(1 * sizeof(sljit_ins)) << 7;
+			code_ptr[-1] -= (sljit_ins)(1 * sizeof(sljit_ins)) << 7;
 
 		jump->flags |= PATCH_ABS52;
-		inst[4] = inst[0];
-		return inst + 4;
+		code_ptr[4] = code_ptr[0];
+		return code_ptr + 4;
 	}
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 exit:
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-	inst[1] = inst[0];
-	return inst + 1;
-#else
-	inst[5] = inst[0];
-	return inst + 5;
-#endif
+	code_ptr[1] = code_ptr[0];
+	return code_ptr + 1;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+	code_ptr[5] = code_ptr[0];
+	return code_ptr + 5;
+#endif /* SLJIT_CONFIG_RISCV_32 */
 }
 
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 
-static SLJIT_INLINE sljit_sw put_label_get_length(struct sljit_put_label *put_label, sljit_uw max_label)
+static SLJIT_INLINE sljit_sw mov_addr_get_length(struct sljit_jump *jump, sljit_ins *code_ptr, sljit_ins *code, sljit_sw executable_offset)
 {
-	if (max_label <= (sljit_uw)S32_MAX) {
-		put_label->flags = PATCH_ABS32;
+	sljit_uw addr;
+	sljit_uw jump_addr = (sljit_uw)code_ptr;
+	sljit_sw diff;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	SLJIT_ASSERT(jump->flags < ((sljit_uw)6 << JUMP_SIZE_SHIFT));
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else {
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code + jump->u.label->size, executable_offset);
+
+		if (jump->u.label->size > jump->addr)
+			jump_addr = (sljit_uw)(code + jump->addr);
+	}
+
+	diff = (sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(jump_addr, executable_offset);
+
+	if (diff >= S32_MIN && diff <= S32_MAX) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)1 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_REL32;
 		return 1;
 	}
 
-	if (max_label <= S44_MAX) {
-		put_label->flags = PATCH_ABS44;
+	if (addr <= S32_MAX) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)1 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS32;
+		return 1;
+	}
+
+	if (addr <= S44_MAX) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)3 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS44;
 		return 3;
 	}
 
-	if (max_label <= S52_MAX) {
-		put_label->flags = PATCH_ABS52;
+	if (addr <= S52_MAX) {
+		SLJIT_ASSERT(jump->flags >= ((sljit_uw)4 << JUMP_SIZE_SHIFT));
+		jump->flags |= PATCH_ABS52;
 		return 4;
 	}
 
-	put_label->flags = 0;
+	SLJIT_ASSERT(jump->flags >= ((sljit_uw)5 << JUMP_SIZE_SHIFT));
 	return 5;
 }
 
 #endif /* SLJIT_CONFIG_RISCV_64 */
 
-static SLJIT_INLINE void load_addr_to_reg(void *dst, sljit_u32 reg)
+static SLJIT_INLINE void load_addr_to_reg(struct sljit_jump *jump, sljit_sw executable_offset)
 {
-	struct sljit_jump *jump = NULL;
-	struct sljit_put_label *put_label;
-	sljit_uw flags;
-	sljit_ins *inst;
+	sljit_uw flags = jump->flags;
+	sljit_uw addr = (flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
+	sljit_ins *ins = (sljit_ins*)jump->addr;
+	sljit_u32 reg = (flags & JUMP_MOV_ADDR) ? *ins : TMP_REG1;
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	sljit_sw high;
-#endif
-	sljit_uw addr;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	SLJIT_UNUSED_ARG(executable_offset);
 
-	if (reg != 0) {
-		jump = (struct sljit_jump*)dst;
-		flags = jump->flags;
-		inst = (sljit_ins*)jump->addr;
-		addr = (flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
-	} else {
-		put_label = (struct sljit_put_label*)dst;
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
-		flags = put_label->flags;
-#endif
-		inst = (sljit_ins*)put_label->addr;
-		addr = put_label->label->addr;
-		reg = *inst;
+	if (flags & PATCH_REL32) {
+		addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(ins, executable_offset);
+
+		SLJIT_ASSERT((sljit_sw)addr >= S32_MIN && (sljit_sw)addr <= S32_MAX);
+
+		if ((addr & 0x800) != 0)
+			addr += 0x1000;
+
+		ins[0] = AUIPC | RD(reg) | (sljit_ins)((sljit_sw)addr & ~0xfff);
+
+		if (!(flags & JUMP_MOV_ADDR)) {
+			SLJIT_ASSERT((ins[1] & 0x707f) == JALR);
+			ins[1] = (ins[1] & 0xfffff) | IMM_I(addr);
+		} else
+			ins[1] = ADDI | RD(reg) | RS1(reg) | IMM_I(addr);
+		return;
 	}
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	if ((addr & 0x800) != 0)
 		addr += 0x1000;
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-	inst[0] = LUI | RD(reg) | (sljit_ins)((sljit_sw)addr & ~0xfff);
+	ins[0] = LUI | RD(reg) | (sljit_ins)((sljit_sw)addr & ~0xfff);
 #else /* !SLJIT_CONFIG_RISCV_32 */
 
 	if (flags & PATCH_ABS32) {
 		SLJIT_ASSERT(addr <= S32_MAX);
-		inst[0] = LUI | RD(reg) | (sljit_ins)((sljit_sw)addr & ~0xfff);
+		ins[0] = LUI | RD(reg) | (sljit_ins)((sljit_sw)addr & ~0xfff);
 	} else if (flags & PATCH_ABS44) {
 		high = (sljit_sw)addr >> 12;
 		SLJIT_ASSERT((sljit_uw)high <= 0x7fffffff);
 
 		if (high > S32_MAX) {
 			SLJIT_ASSERT((high & 0x800) != 0);
-			inst[0] = LUI | RD(reg) | (sljit_ins)0x80000000u;
-			inst[1] = XORI | RD(reg) | RS1(reg) | IMM_I(high);
+			ins[0] = LUI | RD(reg) | (sljit_ins)0x80000000u;
+			ins[1] = XORI | RD(reg) | RS1(reg) | IMM_I(high);
 		} else {
 			if ((high & 0x800) != 0)
 				high += 0x1000;
 
-			inst[0] = LUI | RD(reg) | (sljit_ins)(high & ~0xfff);
-			inst[1] = ADDI | RD(reg) | RS1(reg) | IMM_I(high);
+			ins[0] = LUI | RD(reg) | (sljit_ins)(high & ~0xfff);
+			ins[1] = ADDI | RD(reg) | RS1(reg) | IMM_I(high);
 		}
 
-		inst[2] = SLLI | RD(reg) | RS1(reg) | IMM_I(12);
-		inst += 2;
+		ins[2] = SLLI | RD(reg) | RS1(reg) | IMM_I(12);
+		ins += 2;
 	} else {
 		high = (sljit_sw)addr >> 32;
 
@@ -350,30 +461,136 @@ static SLJIT_INLINE void load_addr_to_reg(void *dst, sljit_u32 reg)
 
 		if (flags & PATCH_ABS52) {
 			SLJIT_ASSERT(addr <= S52_MAX);
-			inst[0] = LUI | RD(TMP_REG3) | (sljit_ins)(high << 12);
+			ins[0] = LUI | RD(TMP_REG3) | (sljit_ins)(high << 12);
 		} else {
 			if ((high & 0x800) != 0)
 				high += 0x1000;
-			inst[0] = LUI | RD(TMP_REG3) | (sljit_ins)(high & ~0xfff);
-			inst[1] = ADDI | RD(TMP_REG3) | RS1(TMP_REG3) | IMM_I(high);
-			inst++;
+			ins[0] = LUI | RD(TMP_REG3) | (sljit_ins)(high & ~0xfff);
+			ins[1] = ADDI | RD(TMP_REG3) | RS1(TMP_REG3) | IMM_I(high);
+			ins++;
 		}
 
-		inst[1] = LUI | RD(reg) | (sljit_ins)((sljit_sw)addr & ~0xfff);
-		inst[2] = SLLI | RD(TMP_REG3) | RS1(TMP_REG3) | IMM_I((flags & PATCH_ABS52) ? 20 : 32);
-		inst[3] = XOR | RD(reg) | RS1(reg) | RS2(TMP_REG3);
-		inst += 3;
+		ins[1] = LUI | RD(reg) | (sljit_ins)((sljit_sw)addr & ~0xfff);
+		ins[2] = SLLI | RD(TMP_REG3) | RS1(TMP_REG3) | IMM_I((flags & PATCH_ABS52) ? 20 : 32);
+		ins[3] = XOR | RD(reg) | RS1(reg) | RS2(TMP_REG3);
+		ins += 3;
 	}
 #endif /* !SLJIT_CONFIG_RISCV_32 */
 
-	if (jump != NULL) {
-		SLJIT_ASSERT((inst[1] & 0x707f) == JALR);
-		inst[1] = (inst[1] & 0xfffff) | IMM_I(addr);
+	if (!(flags & JUMP_MOV_ADDR)) {
+		SLJIT_ASSERT((ins[1] & 0x707f) == JALR);
+		ins[1] = (ins[1] & 0xfffff) | IMM_I(addr);
 	} else
-		inst[1] = ADDI | RD(reg) | RS1(reg) | IMM_I(addr);
+		ins[1] = ADDI | RD(reg) | RS1(reg) | IMM_I(addr);
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+static void reduce_code_size(struct sljit_compiler *compiler)
+{
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	struct sljit_const *const_;
+	SLJIT_NEXT_DEFINE_TYPES;
+	sljit_uw total_size;
+	sljit_uw size_reduce = 0;
+	sljit_sw diff;
+
+	label = compiler->labels;
+	jump = compiler->jumps;
+	const_ = compiler->consts;
+	SLJIT_NEXT_INIT_TYPES();
+
+	while (1) {
+		SLJIT_GET_NEXT_MIN();
+
+		if (next_min_addr == SLJIT_MAX_ADDRESS)
+			break;
+
+		if (next_min_addr == next_label_size) {
+			label->size -= size_reduce;
+
+			label = label->next;
+			next_label_size = SLJIT_GET_NEXT_SIZE(label);
+		}
+
+		if (next_min_addr == next_const_addr) {
+			const_->addr -= size_reduce;
+			const_ = const_->next;
+			next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+			continue;
+		}
+
+		if (next_min_addr != next_jump_addr)
+			continue;
+
+		jump->addr -= size_reduce;
+		if (!(jump->flags & JUMP_MOV_ADDR)) {
+			total_size = JUMP_MAX_SIZE;
+
+			if (!(jump->flags & SLJIT_REWRITABLE_JUMP)) {
+				if (jump->flags & JUMP_ADDR) {
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+					if (jump->u.target <= S32_MAX)
+						total_size = 2;
+					else if (jump->u.target <= S44_MAX)
+						total_size = 4;
+					else if (jump->u.target <= S52_MAX)
+						total_size = 5;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+				} else {
+					/* Unit size: instruction. */
+					diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+					if (jump->u.label->size > jump->addr) {
+						SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+						diff -= (sljit_sw)size_reduce;
+					}
+
+					if ((jump->flags & IS_COND) && (diff + 1) <= (BRANCH_MAX / SSIZE_OF(ins)) && (diff + 1) >= (BRANCH_MIN / SSIZE_OF(ins)))
+						total_size = 0;
+					else if (diff >= (JUMP_MIN / SSIZE_OF(ins)) && diff <= (JUMP_MAX / SSIZE_OF(ins)))
+						total_size = 1;
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+					else if (diff >= (S32_MIN / SSIZE_OF(ins)) && diff <= (S32_MAX / SSIZE_OF(ins)))
+						total_size = 2;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+				}
+			}
+
+			size_reduce += JUMP_MAX_SIZE - total_size;
+			jump->flags |= total_size << JUMP_SIZE_SHIFT;
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+		} else {
+			total_size = 5;
+
+			if (!(jump->flags & JUMP_ADDR)) {
+				/* Real size minus 1. Unit size: instruction. */
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+				if (jump->u.label->size > jump->addr) {
+					SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+					diff -= (sljit_sw)size_reduce;
+				}
+
+				if (diff >= (S32_MIN / SSIZE_OF(ins)) && diff <= (S32_MAX / SSIZE_OF(ins)))
+					total_size = 1;
+			} else if (jump->u.target < S32_MAX)
+				total_size = 1;
+			else if (jump->u.target < S44_MAX)
+				total_size = 3;
+			else if (jump->u.target <= S52_MAX)
+				total_size = 4;
+
+			size_reduce += 5 - total_size;
+			jump->flags |= total_size << JUMP_SIZE_SHIFT;
+#endif /* !SLJIT_CONFIG_RISCV_64 */
+		}
+
+		jump = jump->next;
+		next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+	}
+
+	compiler->size -= size_reduce;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_ins *code;
@@ -381,77 +598,77 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	sljit_ins *buf_ptr;
 	sljit_ins *buf_end;
 	sljit_uw word_count;
-	sljit_uw next_addr;
+	SLJIT_NEXT_DEFINE_TYPES;
 	sljit_sw executable_offset;
 	sljit_uw addr;
 
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
 
-	code = (sljit_ins*)SLJIT_MALLOC_EXEC(compiler->size * sizeof(sljit_ins), compiler->exec_allocator_data);
+	reduce_code_size(compiler);
+
+	code = (sljit_ins*)allocate_executable_memory(compiler->size * sizeof(sljit_ins), options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
+
+	reverse_buf(compiler);
 	buf = compiler->buf;
 
 	code_ptr = code;
 	word_count = 0;
-	next_addr = 0;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
-
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
 
 	do {
 		buf_ptr = (sljit_ins*)buf->memory;
 		buf_end = buf_ptr + (buf->used_size >> 2);
 		do {
 			*code_ptr = *buf_ptr++;
-			if (next_addr == word_count) {
+			if (next_min_addr == word_count) {
 				SLJIT_ASSERT(!label || label->size >= word_count);
 				SLJIT_ASSERT(!jump || jump->addr >= word_count);
 				SLJIT_ASSERT(!const_ || const_->addr >= word_count);
-				SLJIT_ASSERT(!put_label || put_label->addr >= word_count);
 
 				/* These structures are ordered by their address. */
-				if (label && label->size == word_count) {
-					label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+				if (next_min_addr == next_label_size) {
+					label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 					label->size = (sljit_uw)(code_ptr - code);
 					label = label->next;
+					next_label_size = SLJIT_GET_NEXT_SIZE(label);
 				}
-				if (jump && jump->addr == word_count) {
+
+				if (next_min_addr == next_jump_addr) {
+					if (!(jump->flags & JUMP_MOV_ADDR)) {
+						word_count = word_count - 1 + (jump->flags >> JUMP_SIZE_SHIFT);
+						code_ptr = detect_jump_type(jump, code_ptr, code, executable_offset);
+						SLJIT_ASSERT((jump->flags & PATCH_B) || ((sljit_uw)code_ptr - jump->addr < (jump->flags >> JUMP_SIZE_SHIFT) * sizeof(sljit_ins)));
+					} else {
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-					word_count += 1;
-#else
-					word_count += 5;
-#endif
-					jump->addr = (sljit_uw)code_ptr;
-					code_ptr = detect_jump_type(jump, code, executable_offset);
+						word_count += 1;
+						jump->addr = (sljit_uw)code_ptr;
+						code_ptr += 1;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+						word_count += jump->flags >> JUMP_SIZE_SHIFT;
+						addr = (sljit_uw)code_ptr;
+						code_ptr += mov_addr_get_length(jump, code_ptr, code, executable_offset);
+						jump->addr = addr;
+#endif /* SLJIT_CONFIG_RISCV_32 */
+					}
 					jump = jump->next;
-				}
-				if (const_ && const_->addr == word_count) {
+					next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+				} else if (next_min_addr == next_const_addr) {
 					const_->addr = (sljit_uw)code_ptr;
 					const_ = const_->next;
+					next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
 				}
-				if (put_label && put_label->addr == word_count) {
-					SLJIT_ASSERT(put_label->label);
-					put_label->addr = (sljit_uw)code_ptr;
-#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-					code_ptr += 1;
-					word_count += 1;
-#else
-					code_ptr += put_label_get_length(put_label, (sljit_uw)(SLJIT_ADD_EXEC_OFFSET(code, executable_offset) + put_label->label->size));
-					word_count += 5;
-#endif
-					put_label = put_label->next;
-				}
-				next_addr = compute_next_addr(label, jump, const_, put_label);
+
+				SLJIT_GET_NEXT_MIN();
 			}
 			code_ptr++;
 			word_count++;
@@ -461,7 +678,7 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	} while (buf);
 
 	if (label && label->size == word_count) {
-		label->addr = (sljit_uw)code_ptr;
+		label->u.addr = (sljit_uw)code_ptr;
 		label->size = (sljit_uw)(code_ptr - code);
 		label = label->next;
 	}
@@ -469,18 +686,17 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 	SLJIT_ASSERT(code_ptr - code <= (sljit_sw)compiler->size);
 
 	jump = compiler->jumps;
 	while (jump) {
 		do {
-			if (!(jump->flags & (PATCH_B | PATCH_J | PATCH_REL32))) {
-				load_addr_to_reg(jump, TMP_REG1);
+			if (!(jump->flags & (PATCH_B | PATCH_J)) || (jump->flags & JUMP_MOV_ADDR)) {
+				load_addr_to_reg(jump, executable_offset);
 				break;
 			}
 
-			addr = (jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target;
+			addr = (jump->flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
 			buf_ptr = (sljit_ins *)jump->addr;
 			addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET(buf_ptr, executable_offset);
 
@@ -491,31 +707,12 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 				break;
 			}
 
-#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
-			if (jump->flags & PATCH_REL32) {
-				SLJIT_ASSERT((sljit_sw)addr >= S32_MIN && (sljit_sw)addr <= S32_MAX);
-
-				if ((addr & 0x800) != 0)
-					addr += 0x1000;
-
-				buf_ptr[0] = AUIPC | RD(TMP_REG1) | (sljit_ins)((sljit_sw)addr & ~0xfff);
-				SLJIT_ASSERT((buf_ptr[1] & 0x707f) == JALR);
-				buf_ptr[1] |= IMM_I(addr);
-				break;
-			}
-#endif
-
 			SLJIT_ASSERT((sljit_sw)addr >= JUMP_MIN && (sljit_sw)addr <= JUMP_MAX);
 			addr = (addr & 0xff000) | ((addr & 0x800) << 9) | ((addr & 0x7fe) << 20) | ((addr & 0x100000) << 11);
 			buf_ptr[0] = JAL | RD((jump->flags & IS_CALL) ? RETURN_ADDR_REG : TMP_ZERO) | (sljit_ins)addr;
 		} while (0);
-		jump = jump->next;
-	}
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-		load_addr_to_reg(put_label, 0);
-		put_label = put_label->next;
+		jump = jump->next;
 	}
 
 	compiler->error = SLJIT_ERR_COMPILED;
@@ -538,7 +735,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 		return (SLJIT_IS_FPU_AVAILABLE) != 0;
 #elif defined(__riscv_float_abi_soft)
 		return 0;
-#else
+#else /* !SLJIT_IS_FPU_AVAILABLE && !__riscv_float_abi_soft */
 		return 1;
 #endif /* SLJIT_IS_FPU_AVAILABLE */
 	case SLJIT_HAS_ZERO_REGISTER:
@@ -546,7 +743,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	case SLJIT_HAS_COPY_F64:
 #endif /* !SLJIT_CONFIG_RISCV_64 */
+	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
+#ifdef __riscv_vector
+	case SLJIT_HAS_SIMD:
+#endif /* __riscv_vector */
 		return 1;
+#ifdef __riscv_zbb
+	case SLJIT_HAS_CLZ:
+	case SLJIT_HAS_CTZ:
+	case SLJIT_HAS_REV:
+	case SLJIT_HAS_ROT:
+		return 1;
+#endif /* __riscv_zbb */
 	default:
 		return 0;
 	}
@@ -599,36 +808,41 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_cmp_info(sljit_s32 type)
 #define SLOW_SRC1	0x08000
 #define SLOW_SRC2	0x10000
 #define SLOW_DEST	0x20000
+#define MEM_USE_TMP2	0x40000
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #define STACK_STORE	SW
 #define STACK_LOAD	LW
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #define STACK_STORE	SD
 #define STACK_LOAD	LD
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #include "sljitNativeRISCV_32.c"
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #include "sljitNativeRISCV_64.c"
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 #define STACK_MAX_DISTANCE (-SIMM_MIN)
 
 static sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg, sljit_s32 arg, sljit_sw argw);
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 fsaveds = ENTER_GET_FLOAT_REGS(saveds);
 	sljit_s32 i, tmp, offset;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - saved_arg_count, 1);
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 	if (fsaveds > 0 || fscratches >= SLJIT_FIRST_SAVED_FLOAT_REG) {
@@ -636,9 +850,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 			local_size += SSIZE_OF(sw);
 		local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 	}
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	local_size = (local_size + SLJIT_LOCALS_OFFSET + 15) & ~0xf;
 	compiler->local_size = local_size;
 
@@ -673,7 +887,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 	/* This alignment is valid because offset is not used after storing FPU regs. */
 	if ((offset & SSIZE_OF(sw)) != 0)
 		offset -= SSIZE_OF(sw);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 	tmp = SLJIT_FS0 - fsaveds;
 	for (i = SLJIT_FS0; i > tmp; i--) {
@@ -716,13 +930,18 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 #undef STACK_MAX_DISTANCE
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
-	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	sljit_s32 fscratches = ENTER_GET_FLOAT_REGS(scratches);
+	sljit_s32 fsaveds = ENTER_GET_FLOAT_REGS(saveds);
 
+	CHECK_ERROR();
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
 	local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds - SLJIT_KEPT_SAVEDS_COUNT(options), 1);
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 	if (fsaveds > 0 || fscratches >= SLJIT_FIRST_SAVED_FLOAT_REG) {
@@ -730,9 +949,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp
 			local_size += SSIZE_OF(sw);
 		local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 	}
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	compiler->local_size = (local_size + SLJIT_LOCALS_OFFSET + 15) & ~0xf;
 
 	return SLJIT_SUCCESS;
@@ -778,7 +997,7 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
 	/* This alignment is valid because offset is not used after storing FPU regs. */
 	if ((offset & SSIZE_OF(sw)) != 0)
 		offset -= SSIZE_OF(sw);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 	tmp = SLJIT_FS0 - compiler->fsaveds;
 	for (i = SLJIT_FS0; i > tmp; i--) {
@@ -834,9 +1053,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #define ARCH_32_64(a, b)	a
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #define ARCH_32_64(a, b)	b
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 static const sljit_ins data_transfer_insts[16 + 4] = {
 /* u w s */ ARCH_32_64(F3(0x2) | OPC(0x23) /* sw */, F3(0x3) | OPC(0x23) /* sd */),
@@ -883,7 +1102,6 @@ static sljit_s32 push_mem_inst(struct sljit_compiler *compiler, sljit_s32 flags,
 /* Can perform an operation using at most 1 instruction. */
 static sljit_s32 getput_arg_fast(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg, sljit_s32 arg, sljit_sw argw)
 {
-
 	SLJIT_ASSERT(arg & SLJIT_MEM);
 
 	if (!(arg & OFFS_REG_MASK) && argw <= SIMM_MAX && argw >= SIMM_MIN) {
@@ -928,8 +1146,11 @@ static sljit_s32 can_cache(sljit_s32 arg, sljit_sw argw, sljit_s32 next_arg, slj
 static sljit_s32 getput_arg(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg, sljit_s32 arg, sljit_sw argw, sljit_s32 next_arg, sljit_sw next_argw)
 {
 	sljit_s32 base = arg & REG_MASK;
-	sljit_s32 tmp_r = TMP_REG1;
+	sljit_s32 tmp_r = (flags & MEM_USE_TMP2) ? TMP_REG2 : TMP_REG1;
 	sljit_sw offset, argw_hi;
+#if defined __riscv_zba
+	sljit_ins ins = ADD;
+#endif /* __riscv_zba */
 
 	SLJIT_ASSERT(arg & SLJIT_MEM);
 	if (!(next_arg & SLJIT_MEM)) {
@@ -937,14 +1158,23 @@ static sljit_s32 getput_arg(struct sljit_compiler *compiler, sljit_s32 flags, sl
 		next_argw = 0;
 	}
 
-	/* Since tmp can be the same as base or offset registers,
-	 * these might be unavailable after modifying tmp. */
-	if ((flags & MEM_MASK) <= GPR_REG && (flags & LOAD_DATA) && reg == TMP_REG2)
-		tmp_r = reg;
-
 	if (SLJIT_UNLIKELY(arg & OFFS_REG_MASK)) {
 		argw &= 0x3;
 
+#if defined __riscv_zba
+		switch (argw) {
+			case 1:
+				ins = SH1ADD;
+				break;
+			case 2:
+				ins = SH2ADD;
+				break;
+			case 3:
+				ins = SH3ADD;
+				break;
+		}
+		FAIL_IF(push_inst(compiler, ins | RD(tmp_r) | RS1(OFFS_REG(arg)) | RS2(base)));
+#else /* !__riscv_zba */
 		/* Using the cache. */
 		if (argw == compiler->cache_argw) {
 			if (arg == compiler->cache_arg)
@@ -976,6 +1206,8 @@ static sljit_s32 getput_arg(struct sljit_compiler *compiler, sljit_s32 flags, sl
 		}
 		else
 			FAIL_IF(push_inst(compiler, ADD | RD(tmp_r) | RS1(base) | RS2(!argw ? OFFS_REG(arg) : TMP_REG3)));
+#endif /* __riscv_zba */
+
 		return push_mem_inst(compiler, flags, reg, tmp_r, 0);
 	}
 
@@ -1062,7 +1294,7 @@ static SLJIT_INLINE sljit_s32 emit_op_mem2(struct sljit_compiler *compiler, slji
 #define WORD_32 0x08
 #define IMM_EXTEND(v) (IMM_I((op & SLJIT_32) ? (v) : (32 + (v))))
 #endif /* SLJIT_CONFIG_RISCV_32 */
-
+#ifndef __riscv_zbb
 static sljit_s32 emit_clz_ctz(struct sljit_compiler *compiler, sljit_s32 op, sljit_s32 dst, sljit_sw src)
 {
 	sljit_s32 is_clz = (GET_OPCODE(op) == SLJIT_CLZ);
@@ -1165,6 +1397,7 @@ static sljit_s32 emit_rev16(struct sljit_compiler *compiler, sljit_s32 op, sljit
 	FAIL_IF(push_inst(compiler, (GET_OPCODE(op) == SLJIT_REV_U16 ? SRLI : SRAI) | WORD | RD(dst) | RS1(dst) | IMM_I(word_size - 16)));
 	return push_inst(compiler, OR | RD(dst) | RS1(dst) | RS2(TMP_REG1));
 }
+#endif /* !__riscv_zbb */
 
 #define EMIT_LOGICAL(op_imm, op_reg) \
 	if (flags & SRC2_IMM) { \
@@ -1187,7 +1420,7 @@ static sljit_s32 emit_rev16(struct sljit_compiler *compiler, sljit_s32 op, sljit
 static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s32 flags,
 	sljit_s32 dst, sljit_s32 src1, sljit_sw src2)
 {
-	sljit_s32 is_overflow, is_carry, carry_src_r, is_handled;
+	sljit_s32 is_overflow, is_carry, carry_src_r, is_handled, reg;
 	sljit_ins op_imm, op_reg;
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	sljit_ins word = (sljit_ins)(op & SLJIT_32) >> 5;
@@ -1197,48 +1430,60 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if (dst != src2)
 			return push_inst(compiler, ADDI | RD(dst) | RS1(src2) | IMM_I(0));
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_U8:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, ANDI | RD(dst) | RS1(src2) | IMM_I(0xff));
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_S8:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+#if defined __riscv_zbb
+		return push_inst(compiler, SEXTB | RD(dst) | RS1(src2));
+#else /* !__riscv_zbb */
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
 			FAIL_IF(push_inst(compiler, SLLI | WORD | RD(dst) | RS1(src2) | IMM_EXTEND(24)));
 			return push_inst(compiler, SRAI | WORD | RD(dst) | RS1(dst) | IMM_EXTEND(24));
 		}
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
+#endif /* __riscv_zbb */
 
 	case SLJIT_MOV_U16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+#if defined __riscv_zbb
+		return push_inst(compiler, ZEXTH | RD(dst) | RS1(src2));
+#else /* !__riscv_zbb */
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
 			FAIL_IF(push_inst(compiler, SLLI | WORD | RD(dst) | RS1(src2) | IMM_EXTEND(16)));
 			return push_inst(compiler, SRLI | WORD | RD(dst) | RS1(dst) | IMM_EXTEND(16));
 		}
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
+#endif /* __riscv_zbb */
 
 	case SLJIT_MOV_S16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+#if defined __riscv_zbb
+		return push_inst(compiler, SEXTH | RD(dst) | RS1(src2));
+#else /* !__riscv_zbb */
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
 			FAIL_IF(push_inst(compiler, SLLI | WORD | RD(dst) | RS1(src2) | IMM_EXTEND(16)));
 			return push_inst(compiler, SRAI | WORD | RD(dst) | RS1(dst) | IMM_EXTEND(16));
 		}
 		SLJIT_ASSERT(dst == src2);
 		return SLJIT_SUCCESS;
+#endif /* !__riscv_zbb */
 
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	case SLJIT_MOV_U32:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE)) {
 			FAIL_IF(push_inst(compiler, SLLI | RD(dst) | RS1(src2) | IMM_I(32)));
 			return push_inst(compiler, SRLI | RD(dst) | RS1(dst) | IMM_I(32));
@@ -1247,7 +1492,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 		return SLJIT_SUCCESS;
 
 	case SLJIT_MOV_S32:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		if ((flags & (REG_DEST | REG2_SOURCE)) == (REG_DEST | REG2_SOURCE))
 			return push_inst(compiler, ADDI | 0x8 | RD(dst) | RS1(src2) | IMM_I(0));
 		SLJIT_ASSERT(dst == src2);
@@ -1255,33 +1500,67 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 #endif /* SLJIT_CONFIG_RISCV_64 */
 
 	case SLJIT_CLZ:
+#if defined __riscv_zbb
+		return push_inst(compiler, CLZ | WORD | RD(dst) | RS1(src2));
+#endif /* __riscv_zbb */
 	case SLJIT_CTZ:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+#if defined __riscv_zbb
+		return push_inst(compiler, CTZ | WORD | RD(dst) | RS1(src2));
+#else /* !__riscv_zbb */
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
 		return emit_clz_ctz(compiler, op, dst, src2);
+#endif /* __riscv_zbb */
 
 	case SLJIT_REV:
+#if defined __riscv_zbb
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
+		FAIL_IF(push_inst(compiler, REV8 | RD(dst) | RS1(src2)));
+#if defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64
+		if (op & SLJIT_32)
+			return push_inst(compiler, SRAI | RD(dst) | RS1(dst) | IMM_I(32));
+		return SLJIT_SUCCESS;
+#else /* !SLJIT_CONFIG_RISCV_64 */
+		return SLJIT_SUCCESS;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+#endif /* __riscv_zbb */
 	case SLJIT_REV_S32:
-#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
+#if ((defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32) || defined __riscv_zbb)
 	case SLJIT_REV_U32:
-#endif /* SLJIT_CONFIG_RISCV_32 */
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+#endif /* SLJIT_CONFIG_RISCV_32 || __riscv_zbb */
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
+#if defined __riscv_zbb
+		FAIL_IF(push_inst(compiler, REV8 | RD(dst) | RS1(src2)));
+#if defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64
+		return push_inst(compiler, (GET_OPCODE(op) == SLJIT_REV_U32 ? SRLI : SRAI )| RD(dst) | RS1(dst) | IMM_I(32));
+#else /* !SLJIT_CONFIG_RISCV_64 */
+		return SLJIT_SUCCESS;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+#else /* !__riscv_zbb */
 		return emit_rev(compiler, op, dst, src2);
-
+#endif /* __riscv_zbb */
 	case SLJIT_REV_U16:
 	case SLJIT_REV_S16:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM));
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM));
+#if defined __riscv_zbb
+		FAIL_IF(push_inst(compiler, REV8 | RD(dst) | RS1(src2)));
+#if defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64
+		return push_inst(compiler, (GET_OPCODE(op) == SLJIT_REV_U16 ? SRLI : SRAI )| RD(dst) | RS1(dst) | IMM_I(48));
+#else /* !SLJIT_CONFIG_RISCV_64 */
+		return push_inst(compiler, (GET_OPCODE(op) == SLJIT_REV_U16 ? SRLI : SRAI) | RD(dst) | RS1(dst) | IMM_I(16));
+#endif /* SLJIT_CONFIG_RISCV_64 */
+#else /* !__riscv_zbb */
 		return emit_rev16(compiler, op, dst, src2);
+#endif /* __riscv_zbb */
 
-#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+#if ((defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64) && !defined __riscv_zbb)
 	case SLJIT_REV_U32:
-		SLJIT_ASSERT(src1 == TMP_REG1 && !(flags & SRC2_IMM) && dst != TMP_REG1);
+		SLJIT_ASSERT(src1 == TMP_ZERO && !(flags & SRC2_IMM) && dst != TMP_REG1);
 		FAIL_IF(emit_rev(compiler, op, dst, src2));
 		if (dst == TMP_REG2)
 			return SLJIT_SUCCESS;
 		FAIL_IF(push_inst(compiler, SLLI | RD(dst) | RS1(dst) | IMM_I(32)));
 		return push_inst(compiler, SRLI | RD(dst) | RS1(dst) | IMM_I(32));
-#endif /* SLJIT_CONFIG_RISCV_32 */
-
+#endif /* SLJIT_CONFIG_RISCV_64 && !__riscv_zbb */
 	case SLJIT_ADD:
 		/* Overflow computation (both add and sub): overflow = src1_sign ^ src2_sign ^ result_sign ^ carry_flag */
 		is_overflow = GET_FLAG_TYPE(op) == SLJIT_OVERFLOW;
@@ -1402,8 +1681,9 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 			is_handled = 1;
 
 			if (flags & SRC2_IMM) {
-				FAIL_IF(push_inst(compiler, ADDI | RD(TMP_REG2) | RS1(TMP_ZERO) | IMM_I(src2)));
-				src2 = TMP_REG2;
+				reg = (src1 == TMP_REG1) ? TMP_REG2 : TMP_REG1;
+				FAIL_IF(push_inst(compiler, ADDI | RD(reg) | RS1(TMP_ZERO) | IMM_I(src2)));
+				src2 = reg;
 				flags &= ~SRC2_IMM;
 			}
 
@@ -1568,7 +1848,16 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 	case SLJIT_ROTR:
 		if (flags & SRC2_IMM) {
 			SLJIT_ASSERT(src2 != 0);
-
+#if defined __riscv_zbb
+			if (GET_OPCODE(op) == SLJIT_ROTL) {
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+				src2 = ((op & SLJIT_32) ? 32 : 64) - src2;
+#else /* !SLJIT_CONFIG_RISCV_64 */
+				src2 = 32 - src2;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+			}
+			return push_inst(compiler, RORI | WORD | RD(dst) | RS1(src1) | IMM_I(src2));
+#else /* !__riscv_zbb */
 			op_imm = (GET_OPCODE(op) == SLJIT_ROTL) ? SLLI : SRLI;
 			FAIL_IF(push_inst(compiler, op_imm | WORD | RD(OTHER_FLAG) | RS1(src1) | IMM_I(src2)));
 
@@ -1580,8 +1869,12 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 			op_imm = (GET_OPCODE(op) == SLJIT_ROTL) ? SRLI : SLLI;
 			FAIL_IF(push_inst(compiler, op_imm | WORD | RD(dst) | RS1(src1) | IMM_I(src2)));
 			return push_inst(compiler, OR | RD(dst) | RS1(dst) | RS2(OTHER_FLAG));
+#endif /* !__riscv_zbb */
 		}
 
+#if defined __riscv_zbb
+		return push_inst(compiler, (GET_OPCODE(op) == SLJIT_ROTL ? ROL : ROR) | WORD | RD(dst) | RS1(src1) | RS2(src2));
+#else /* !__riscv_zbb */
 		if (src2 == TMP_ZERO) {
 			if (dst != src1)
 				return push_inst(compiler, ADDI | WORD | RD(dst) | RS1(src1) | IMM_I(0));
@@ -1594,7 +1887,7 @@ static SLJIT_INLINE sljit_s32 emit_single_op(struct sljit_compiler *compiler, sl
 		op_reg = (GET_OPCODE(op) == SLJIT_ROTL) ? SRL : SLL;
 		FAIL_IF(push_inst(compiler, op_reg | WORD | RD(dst) | RS1(src1) | RS2(EQUAL_FLAG)));
 		return push_inst(compiler, OR | RD(dst) | RS1(dst) | RS2(OTHER_FLAG));
-
+#endif /* !riscv_zbb */
 	default:
 		SLJIT_UNREACHABLE();
 		return SLJIT_SUCCESS;
@@ -1631,7 +1924,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	sljit_s32 dst_r = TMP_REG2;
 	sljit_s32 src1_r;
 	sljit_sw src2_r = 0;
-	sljit_s32 sugg_src2_r = TMP_REG2;
+	sljit_s32 src2_tmp_reg = (GET_OPCODE(op) >= SLJIT_OP2_BASE && FAST_IS_REG(src1)) ? TMP_REG1 : TMP_REG2;
 
 	if (!(flags & ALT_KEEP_CACHE)) {
 		compiler->cache_arg = 0;
@@ -1647,7 +1940,7 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		dst_r = dst;
 		flags |= REG_DEST;
 		if (flags & MOVE_OP)
-			sugg_src2_r = dst_r;
+			src2_tmp_reg = dst_r;
 	}
 	else if ((dst & SLJIT_MEM) && !getput_arg_fast(compiler, flags | ARG_TEST, TMP_REG1, dst, dstw))
 		flags |= SLOW_DEST;
@@ -1673,16 +1966,14 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 	if (FAST_IS_REG(src1)) {
 		src1_r = src1;
 		flags |= REG1_SOURCE;
-	}
-	else if (src1 == SLJIT_IMM) {
+	} else if (src1 == SLJIT_IMM) {
 		if (src1w) {
 			FAIL_IF(load_immediate(compiler, TMP_REG1, src1w, TMP_REG3));
 			src1_r = TMP_REG1;
 		}
 		else
 			src1_r = TMP_ZERO;
-	}
-	else {
+	} else {
 		if (getput_arg_fast(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w))
 			FAIL_IF(compiler->error);
 		else
@@ -1696,14 +1987,12 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 		flags |= REG2_SOURCE;
 		if ((flags & (REG_DEST | MOVE_OP)) == MOVE_OP)
 			dst_r = (sljit_s32)src2_r;
-	}
-	else if (src2 == SLJIT_IMM) {
+	} else if (src2 == SLJIT_IMM) {
 		if (!(flags & SRC2_IMM)) {
 			if (src2w) {
-				FAIL_IF(load_immediate(compiler, sugg_src2_r, src2w, TMP_REG3));
-				src2_r = sugg_src2_r;
-			}
-			else {
+				FAIL_IF(load_immediate(compiler, src2_tmp_reg, src2w, TMP_REG3));
+				src2_r = src2_tmp_reg;
+			} else {
 				src2_r = TMP_ZERO;
 				if (flags & MOVE_OP) {
 					if (dst & SLJIT_MEM)
@@ -1713,30 +2002,28 @@ static sljit_s32 emit_op(struct sljit_compiler *compiler, sljit_s32 op, sljit_s3
 				}
 			}
 		}
-	}
-	else {
-		if (getput_arg_fast(compiler, flags | LOAD_DATA, sugg_src2_r, src2, src2w))
+	} else {
+		if (getput_arg_fast(compiler, flags | LOAD_DATA, src2_tmp_reg, src2, src2w))
 			FAIL_IF(compiler->error);
 		else
 			flags |= SLOW_SRC2;
-		src2_r = sugg_src2_r;
+		src2_r = src2_tmp_reg;
 	}
 
 	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
 		SLJIT_ASSERT(src2_r == TMP_REG2);
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
+		if ((flags & SLOW_DEST) && !can_cache(src2, src2w, src1, src1w) && can_cache(src2, src2w, dst, dstw)) {
+			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, src2, src2w));
+			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA | MEM_USE_TMP2, TMP_REG2, src2, src2w, dst, dstw));
+		} else {
 			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG2, src2, src2w, src1, src1w));
 			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
 		}
-		else {
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, src2, src2w));
-			FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG2, src2, src2w, dst, dstw));
-		}
 	}
 	else if (flags & SLOW_SRC1)
 		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, TMP_REG1, src1, src1w, dst, dstw));
 	else if (flags & SLOW_SRC2)
-		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA, sugg_src2_r, src2, src2w, dst, dstw));
+		FAIL_IF(getput_arg(compiler, flags | LOAD_DATA | ((src1_r == TMP_REG1) ? MEM_USE_TMP2 : 0), src2_tmp_reg, src2, src2w, dst, dstw));
 
 	FAIL_IF(emit_single_op(compiler, op, flags, dst_r, src1_r, src2_r));
 
@@ -1787,6 +2074,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 		return push_inst(compiler, DIVU | WORD | RD(SLJIT_R0) | RS1(SLJIT_R0) | RS2(SLJIT_R1));
 	case SLJIT_DIV_SW:
 		return push_inst(compiler, DIV | WORD | RD(SLJIT_R0) | RS1(SLJIT_R0) | RS2(SLJIT_R1));
+	case SLJIT_MEMORY_BARRIER:
+		return push_inst(compiler, FENCE | 0x0ff00000);
 	case SLJIT_ENDBR:
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
 		return SLJIT_SUCCESS;
@@ -1809,7 +2098,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	if (op & SLJIT_32)
 		flags = INT_DATA | SIGNED_DATA;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV:
@@ -1817,44 +2106,44 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 	case SLJIT_MOV_U32:
 	case SLJIT_MOV_S32:
 	case SLJIT_MOV32:
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	case SLJIT_MOV_P:
-		return emit_op(compiler, SLJIT_MOV, WORD_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, SLJIT_MOV, WORD_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, srcw);
 
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	case SLJIT_MOV_U32:
-		return emit_op(compiler, SLJIT_MOV_U32, INT_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_u32)srcw : srcw);
+		return emit_op(compiler, SLJIT_MOV_U32, INT_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_u32)srcw : srcw);
 
 	case SLJIT_MOV_S32:
 	/* Logical operators have no W variant, so sign extended input is necessary for them. */
 	case SLJIT_MOV32:
-		return emit_op(compiler, SLJIT_MOV_S32, INT_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_s32)srcw : srcw);
-#endif
+		return emit_op(compiler, SLJIT_MOV_S32, INT_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_s32)srcw : srcw);
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	case SLJIT_MOV_U8:
-		return emit_op(compiler, op, BYTE_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_u8)srcw : srcw);
+		return emit_op(compiler, op, BYTE_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_u8)srcw : srcw);
 
 	case SLJIT_MOV_S8:
-		return emit_op(compiler, op, BYTE_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_s8)srcw : srcw);
+		return emit_op(compiler, op, BYTE_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_s8)srcw : srcw);
 
 	case SLJIT_MOV_U16:
-		return emit_op(compiler, op, HALF_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_u16)srcw : srcw);
+		return emit_op(compiler, op, HALF_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_u16)srcw : srcw);
 
 	case SLJIT_MOV_S16:
-		return emit_op(compiler, op, HALF_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_REG1, 0, src, (src == SLJIT_IMM) ? (sljit_s16)srcw : srcw);
+		return emit_op(compiler, op, HALF_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_s16)srcw : srcw);
 
 	case SLJIT_CLZ:
 	case SLJIT_CTZ:
 	case SLJIT_REV:
-		return emit_op(compiler, op, flags, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, op, flags, dst, dstw, TMP_ZERO, 0, src, srcw);
 
 	case SLJIT_REV_U16:
 	case SLJIT_REV_S16:
-		return emit_op(compiler, op, HALF_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, op, HALF_DATA, dst, dstw, TMP_ZERO, 0, src, srcw);
 
 	case SLJIT_REV_U32:
 	case SLJIT_REV_S32:
-		return emit_op(compiler, op | SLJIT_32, INT_DATA, dst, dstw, TMP_REG1, 0, src, srcw);
+		return emit_op(compiler, op | SLJIT_32, INT_DATA, dst, dstw, TMP_ZERO, 0, src, srcw);
 	}
 
 	SLJIT_UNREACHABLE();
@@ -1882,7 +2171,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 		if (src2 == SLJIT_IMM)
 			src2w = (sljit_s32)src2w;
 	}
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_ADD:
@@ -1941,6 +2230,30 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	return sljit_emit_op2(compiler, op, 0, 0, src1, src1w, src2, src2w);
 }
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+	sljit_ins word = (sljit_ins)(op & SLJIT_32) >> 5;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+
+	SLJIT_ASSERT(WORD == 0 || WORD == 0x8);
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		SLJIT_SKIP_CHECKS(compiler);
+		FAIL_IF(sljit_emit_op2(compiler, SLJIT_MUL | (op & SLJIT_32), TMP_REG2, 0, src1, src1w, src2, src2w));
+		return push_inst(compiler, ADD | WORD | RD(dst_reg) | RS1(dst_reg) | RS2(TMP_REG2));
+	}
+
+	return SLJIT_SUCCESS;
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 dst_reg,
 	sljit_s32 src1_reg,
@@ -2086,10 +2399,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_register_index(sljit_s32 type, slji
 	if (type == SLJIT_GP_REGISTER)
 		return reg_map[reg];
 
-	if (type != SLJIT_FLOAT_REGISTER)
-		return -1;
+	if (type == SLJIT_FLOAT_REGISTER)
+		return freg_map[reg];
 
-	return freg_map[reg];
+	return vreg_map[reg];
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_custom(struct sljit_compiler *compiler,
@@ -2116,9 +2429,9 @@ static SLJIT_INLINE sljit_s32 sljit_emit_fop1_conv_sw_from_f64(struct sljit_comp
 {
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #	define flags (sljit_u32)0
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	sljit_u32 flags = ((sljit_u32)(GET_OPCODE(op) == SLJIT_CONV_SW_FROM_F64)) << 21;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	sljit_s32 dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 
 	if (src & SLJIT_MEM) {
@@ -2132,15 +2445,15 @@ static SLJIT_INLINE sljit_s32 sljit_emit_fop1_conv_sw_from_f64(struct sljit_comp
 	if (dst & SLJIT_MEM) {
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 		return emit_op_mem2(compiler, WORD_DATA, TMP_REG2, dst, dstw, 0, 0);
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 		return emit_op_mem2(compiler, flags ? WORD_DATA : INT_DATA, TMP_REG2, dst, dstw, 0, 0);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	}
 	return SLJIT_SUCCESS;
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #	undef flags
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 }
 
 static sljit_s32 sljit_emit_fop1_conv_f64_from_w(struct sljit_compiler *compiler, sljit_ins ins,
@@ -2292,7 +2605,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV_F64:
 		if (src != dst_r) {
-			if (dst_r != TMP_FREG1)
+			if (!(dst & SLJIT_MEM))
 				FAIL_IF(push_inst(compiler, FSGNJ_S | FMT(op) | FRD(dst_r) | FRS1(src) | FRS2(src)));
 			else
 				dst_r = src;
@@ -2351,11 +2664,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 	}
 
 	if ((flags & (SLOW_SRC1 | SLOW_SRC2)) == (SLOW_SRC1 | SLOW_SRC2)) {
-		if (!can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
+		if ((dst & SLJIT_MEM) && !can_cache(src1, src1w, src2, src2w) && can_cache(src1, src1w, dst, dstw)) {
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, src1, src1w));
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, dst, dstw));
-		}
-		else {
+		} else {
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG1, src1, src1w, src2, src2w));
 			FAIL_IF(getput_arg(compiler, FLOAT_DATA(op) | LOAD_DATA, TMP_FREG2, src2, src2w, dst, dstw));
 		}
@@ -2391,7 +2703,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 		return push_inst(compiler, FSGNJ_S | FMT(op) | FRD(dst_r) | FRS1(src1) | FRS2(src2));
 	}
 
-	if (dst_r == TMP_FREG2)
+	if (dst_r != dst)
 		FAIL_IF(emit_op_mem2(compiler, FLOAT_DATA(op), TMP_FREG2, dst, dstw, 0, 0));
 
 	return SLJIT_SUCCESS;
@@ -2439,9 +2751,9 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compi
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #define BRANCH_LENGTH	((sljit_ins)(3 * sizeof(sljit_ins)) << 7)
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #define BRANCH_LENGTH	((sljit_ins)(7 * sizeof(sljit_ins)) << 7)
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 static sljit_ins get_jump_instruction(sljit_s32 type)
 {
@@ -2456,6 +2768,7 @@ static sljit_ins get_jump_instruction(sljit_s32 type)
 	case SLJIT_SIG_GREATER:
 	case SLJIT_OVERFLOW:
 	case SLJIT_CARRY:
+	case SLJIT_ATOMIC_NOT_STORED:
 	case SLJIT_F_EQUAL:
 	case SLJIT_ORDERED_EQUAL:
 	case SLJIT_ORDERED_NOT_EQUAL:
@@ -2474,6 +2787,7 @@ static sljit_ins get_jump_instruction(sljit_s32 type)
 	case SLJIT_SIG_LESS_EQUAL:
 	case SLJIT_NOT_OVERFLOW:
 	case SLJIT_NOT_CARRY:
+	case SLJIT_ATOMIC_STORED:
 	case SLJIT_F_NOT_EQUAL:
 	case SLJIT_UNORDERED_OR_NOT_EQUAL:
 	case SLJIT_UNORDERED_OR_EQUAL:
@@ -2522,11 +2836,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	PTR_FAIL_IF(push_inst(compiler, inst));
 
 	/* Maximum number of instructions required for generating a constant. */
-#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-	compiler->size += 1;
-#else
-	compiler->size += 5;
-#endif
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return jump;
 }
 
@@ -2553,6 +2863,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	struct sljit_jump *jump;
 	sljit_s32 flags;
 	sljit_ins inst;
+	sljit_s32 src2_tmp_reg = FAST_IS_REG(src1) ? TMP_REG1 : TMP_REG2;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_emit_cmp(compiler, type, src1, src1w, src2, src2w));
@@ -2573,8 +2884,8 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	}
 
 	if (src2 & SLJIT_MEM) {
-		PTR_FAIL_IF(emit_op_mem2(compiler, flags, TMP_REG2, src2, src2w, 0, 0));
-		src2 = TMP_REG2;
+		PTR_FAIL_IF(emit_op_mem2(compiler, flags | (src1 == TMP_REG1 ? MEM_USE_TMP2 : 0), src2_tmp_reg, src2, src2w, 0, 0));
+		src2 = src2_tmp_reg;
 	}
 
 	if (src1 == SLJIT_IMM) {
@@ -2588,8 +2899,8 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 
 	if (src2 == SLJIT_IMM) {
 		if (src2w != 0) {
-			PTR_FAIL_IF(load_immediate(compiler, TMP_REG2, src2w, TMP_REG3));
-			src2 = TMP_REG2;
+			PTR_FAIL_IF(load_immediate(compiler, src2_tmp_reg, src2w, TMP_REG3));
+			src2 = src2_tmp_reg;
 		}
 		else
 			src2 = TMP_ZERO;
@@ -2639,11 +2950,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 	PTR_FAIL_IF(push_inst(compiler, JALR | RD(TMP_ZERO) | RS1(TMP_REG1) | IMM_I(0)));
 
 	/* Maximum number of instructions required for generating a constant. */
-#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-	compiler->size += 1;
-#else
-	compiler->size += 5;
-#endif
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return jump;
 }
 
@@ -2675,11 +2982,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 	FAIL_IF(push_inst(compiler, JALR | RD((type >= SLJIT_FAST_CALL) ? RETURN_ADDR_REG : TMP_ZERO) | RS1(TMP_REG1) | IMM_I(0)));
 
 	/* Maximum number of instructions required for generating a constant. */
-#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
-	compiler->size += 1;
-#else
-	compiler->size += 5;
-#endif
+	compiler->size += JUMP_MAX_SIZE - 1;
 	return SLJIT_SUCCESS;
 }
 
@@ -2719,9 +3022,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 	sljit_s32 saved_op = op;
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 	sljit_s32 mem_type = WORD_DATA;
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	sljit_s32 mem_type = ((op & SLJIT_32) || op == SLJIT_MOV32) ? (INT_DATA | SIGNED_DATA) : WORD_DATA;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_op_flags(compiler, op, dst, dstw, type));
@@ -2756,6 +3059,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 			src_r = dst_r;
 			invert ^= 0x1;
 			break;
+		case SLJIT_ATOMIC_STORED:
+		case SLJIT_ATOMIC_NOT_STORED:
+			invert ^= 0x1;
+			break;
 		}
 	} else {
 		invert = 0;
@@ -2826,13 +3133,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 			type ^= 0x1;
 		} else {
 			if (ADDRESSING_DEPENDS_ON(src1, dst_reg)) {
-				FAIL_IF(push_inst(compiler, ADDI | RD(TMP_REG2) | RS1(dst_reg) | IMM_I(0)));
+				FAIL_IF(push_inst(compiler, ADDI | RD(TMP_REG1) | RS1(dst_reg) | IMM_I(0)));
 
 				if ((src1 & REG_MASK) == dst_reg)
-					src1 = (src1 & ~REG_MASK) | TMP_REG2;
+					src1 = (src1 & ~REG_MASK) | TMP_REG1;
 
 				if (OFFS_REG(src1) == dst_reg)
-					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG2);
+					src1 = (src1 & ~OFFS_REG_MASK) | TO_OFFS_REG(TMP_REG1);
 			}
 
 			FAIL_IF(push_inst(compiler, ADDI | WORD | RD(dst_reg) | RS1(src2_reg) | IMM_I(0)));
@@ -2856,7 +3163,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 	} else
 		FAIL_IF(push_inst(compiler, ADDI | WORD | RD(dst_reg) | RS1(src1) | IMM_I(0)));
 
-	*ptr = get_jump_instruction(type & ~SLJIT_32) | (sljit_ins)((compiler->size - size) << 9);
+	size = compiler->size - size;
+	*ptr = get_jump_instruction(type & ~SLJIT_32) | (sljit_ins)((size & 0x7) << 9) | (sljit_ins)((size >> 3) << 25);
 	return SLJIT_SUCCESS;
 }
 
@@ -2895,7 +3203,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *com
 	else
 		FAIL_IF(push_inst(compiler, FSGNJ_S | FMT(type) | FRD(dst_freg) | FRS1(src1) | FRS2(src1)));
 
-	*ptr = get_jump_instruction(type & ~SLJIT_32) | (sljit_ins)((compiler->size - size) << 9);
+	size = compiler->size - size;
+	*ptr = get_jump_instruction(type & ~SLJIT_32) | (sljit_ins)((size & 0x7) << 9) | (sljit_ins)((size >> 3) << 25);
 	return SLJIT_SUCCESS;
 }
 
@@ -2958,6 +3267,561 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_mem(struct sljit_compiler *compile
 
 #undef TO_ARGW_HI
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 mem_reg)
+{
+	sljit_ins ins;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
+
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+		ins = LR | (3 << 12);
+		break;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	case SLJIT_MOV_S32:
+	case SLJIT_MOV32:
+		ins = LR | (2 << 12);
+		break;
+
+	default:
+		return SLJIT_ERR_UNSUPPORTED;
+	}
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	return push_inst(compiler, ins | RD(dst_reg) | RS1(mem_reg));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 src_reg,
+	sljit_s32 mem_reg,
+	sljit_s32 temp_reg)
+{
+	sljit_ins ins;
+
+	/* temp_reg == mem_reg is undefined so use another temp register */
+	SLJIT_UNUSED_ARG(temp_reg);
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
+
+	if (op & SLJIT_ATOMIC_USE_CAS)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+		ins = SC | (3 << 12);
+		break;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	case SLJIT_MOV_S32:
+	case SLJIT_MOV32:
+		ins = SC | (2 << 12);
+		break;
+
+	default:
+		return SLJIT_ERR_UNSUPPORTED;
+	}
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	return push_inst(compiler, ins | RD(OTHER_FLAG) | RS1(mem_reg) | RS2(src_reg));
+}
+
+/*
+  SEW = Selected element width
+  LMUL = Vector register group multiplier
+
+  VLMUL values (in binary):
+    100 : reserved
+    101 : 1/8
+    110 : 1/4
+    111 : 1/2
+    000 : 1
+    001 : 2
+    010 : 4
+    011 : 8
+*/
+
+static SLJIT_INLINE sljit_s32 sljit_emit_vsetivli(struct sljit_compiler *compiler, sljit_s32 type, sljit_ins vlmul)
+{
+	sljit_ins elem_size = (sljit_ins)SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins avl = (sljit_ins)1 << (SLJIT_SIMD_GET_REG_SIZE(type) - elem_size);
+
+	return push_inst(compiler, VSETIVLI | RD(TMP_REG1) | (elem_size << 23) | (vlmul << 20) | (avl << 15));
+}
+
+static SLJIT_INLINE sljit_s32 sljit_emit_vsetivli_size(struct sljit_compiler *compiler, sljit_s32 reg_size, sljit_s32 elem_size)
+{
+	sljit_ins avl = (sljit_ins)1 << (reg_size - elem_size);
+	return push_inst(compiler, VSETIVLI | RD(TMP_REG1) | ((sljit_ins)elem_size << 23) | (avl << 15));
+}
+
+static sljit_s32 sljit_emit_vmem(struct sljit_compiler *compiler, sljit_ins ins, sljit_s32 elem_size, sljit_s32 mem, sljit_sw memw)
+{
+	sljit_s32 base = mem & REG_MASK;
+
+	if (elem_size > 0)
+		ins |= (1 << 14) | ((sljit_ins)elem_size << 12);
+
+	if (SLJIT_UNLIKELY(mem & OFFS_REG_MASK)) {
+		memw &= 0x3;
+
+		if (SLJIT_UNLIKELY(memw)) {
+			FAIL_IF(push_inst(compiler, SLLI | RD(TMP_REG1) | RS1(OFFS_REG(mem)) | IMM_I(memw)));
+		}
+
+		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG1) | RS1(base) | RS2(!memw ? OFFS_REG(mem) : TMP_REG1)));
+		return push_inst(compiler, ins | RS1(TMP_REG1));
+	}
+
+	if (memw == 0)
+		return push_inst(compiler, ins | RS1(base));
+
+	if (memw <= SIMM_MAX && memw >= SIMM_MIN) {
+		FAIL_IF(push_inst(compiler, ADDI | RD(TMP_REG1) | RS1(base) | IMM_I(memw)));
+		return push_inst(compiler, ins | RS1(TMP_REG1));
+	}
+
+	FAIL_IF(load_immediate(compiler, TMP_REG1, memw, TMP_REG3));
+
+	if (base != 0)
+		FAIL_IF(push_inst(compiler, ADD | RD(TMP_REG1) | RS1(TMP_REG1) | RS2(base)));
+
+	return push_inst(compiler, ins | RS1(TMP_REG1));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 srcdst, sljit_sw srcdstw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins ins;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
+
+	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
+
+	if (reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if (elem_size > 3)
+		elem_size = 3;
+
+	FAIL_IF(sljit_emit_vsetivli_size(compiler, reg_size, elem_size));
+
+	if (srcdst & SLJIT_MEM) {
+		ins = (type & SLJIT_SIMD_STORE) ? VS : VL;
+		return sljit_emit_vmem(compiler, ins | VRD(vreg), elem_size, srcdst, srcdstw);
+	}
+
+	if (type & SLJIT_SIMD_STORE)
+		ins = VRD(srcdst) | VRS1(vreg);
+	else
+		ins = VRD(vreg) | VRS1(srcdst);
+
+	return push_inst(compiler, VMV_VV | ins);
+}
+
+static sljit_s32 sljit_simd_get_mem_flags(sljit_s32 elem_size)
+{
+	switch (elem_size) {
+	case 0:
+		return BYTE_DATA;
+	case 1:
+		return HALF_DATA;
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+	case 2:
+		return INT_DATA;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	default:
+		return WORD_DATA;
+	}
+}
+
+static sljit_sw sljit_simd_get_imm(sljit_s32 elem_size, sljit_sw imm)
+{
+	switch (elem_size) {
+	case 0:
+		return (sljit_s8)imm;
+	case 1:
+		return (sljit_s16)imm;
+#if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
+	case 2:
+		return (sljit_s32)imm;
+#endif /* SLJIT_CONFIG_RISCV_64 */
+	default:
+		return imm;
+	}
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 src, sljit_sw srcw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 flags;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
+
+	ADJUST_LOCAL_OFFSET(src, srcw);
+
+	if (reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
+	if ((type & SLJIT_SIMD_FLOAT) ? (elem_size < 2 || elem_size > 3) : elem_size > 2)
+		return SLJIT_ERR_UNSUPPORTED;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+	if (((type & SLJIT_SIMD_FLOAT) && elem_size < 2) || elem_size > 3)
+		return SLJIT_ERR_UNSUPPORTED;
+#endif /* SLJIT_CONFIG_RISCV_32 */
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	FAIL_IF(sljit_emit_vsetivli(compiler, type, 0));
+
+	if (type & SLJIT_SIMD_FLOAT) {
+		if (src == SLJIT_IMM)
+			return push_inst(compiler, VMV_VI | VRD(vreg) | ((sljit_ins)(srcw & 0x1f) << 15));
+
+		if (src & SLJIT_MEM) {
+			flags = (elem_size == 2) ? SINGLE_DATA : DOUBLE_DATA;
+			FAIL_IF(emit_op_mem(compiler, flags | LOAD_DATA, TMP_FREG1, src, srcw));
+			src = TMP_FREG1;
+		}
+
+		return push_inst(compiler, VFMV_VF | VRD(vreg) | FRS1(src));
+	}
+
+	if (src == SLJIT_IMM) {
+		srcw = sljit_simd_get_imm(elem_size, srcw);
+
+		if (srcw >= -0x10 && srcw <= 0xf)
+			return push_inst(compiler, VMV_VI | VRD(vreg) | ((sljit_ins)(srcw & 0x1f) << 15));
+
+		FAIL_IF(load_immediate(compiler, TMP_REG1, srcw, TMP_REG3));
+		src = TMP_REG1;
+	} else if (src & SLJIT_MEM) {
+		FAIL_IF(emit_op_mem(compiler, sljit_simd_get_mem_flags(elem_size) | LOAD_DATA, TMP_REG1, src, srcw));
+		src = TMP_REG1;
+	}
+
+	return push_inst(compiler, VMV_VX | VRD(vreg) | RS1(src));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg, sljit_s32 lane_index,
+	sljit_s32 srcdst, sljit_sw srcdstw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 flags;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
+
+	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
+
+	if (reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
+	if ((type & SLJIT_SIMD_FLOAT) ? (elem_size < 2 || elem_size > 3) : elem_size > 2)
+		return SLJIT_ERR_UNSUPPORTED;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+	if (((type & SLJIT_SIMD_FLOAT) && elem_size < 2) || elem_size > 3)
+		return SLJIT_ERR_UNSUPPORTED;
+#endif /* SLJIT_CONFIG_RISCV_32 */
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if (type & SLJIT_SIMD_STORE) {
+		FAIL_IF(push_inst(compiler, VSETIVLI | RD(TMP_REG1) | ((sljit_ins)elem_size << 23) | (1 << 15)));
+
+		if (lane_index > 0) {
+			FAIL_IF(push_inst(compiler, VSLIDEDOWN_VI | VRD(TMP_VREG1) | ((sljit_ins)lane_index << 15) | VRS2(vreg)));
+			vreg = TMP_VREG1;
+		}
+
+		if (srcdst & SLJIT_MEM)
+			return sljit_emit_vmem(compiler, VS | VRD(vreg), elem_size, srcdst, srcdstw);
+
+		if (type & SLJIT_SIMD_FLOAT)
+			return push_inst(compiler, VFMV_FS | FRD(srcdst) | VRS2(vreg));
+
+		FAIL_IF(push_inst(compiler, VMV_XS | RD(srcdst) | VRS2(vreg)));
+
+#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
+		if ((type & SLJIT_SIMD_LANE_SIGNED) || elem_size >= 2)
+			return SLJIT_SUCCESS;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+		if ((type & SLJIT_SIMD_LANE_SIGNED) || elem_size >= 3 || (elem_size == 2 && (type & SLJIT_32)))
+			return SLJIT_SUCCESS;
+#endif /* SLJIT_CONFIG_RISCV_32 */
+
+		if (elem_size == 0)
+			return push_inst(compiler, ANDI | RD(srcdst) | RS1(srcdst) | IMM_I(0xff));
+
+#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
+		flags = 16;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+		flags = (elem_size == 1) ? 48 : 32;
+#endif /* SLJIT_CONFIG_RISCV_32 */
+
+		FAIL_IF(push_inst(compiler, SLLI | RD(srcdst) | RS1(srcdst) | IMM_I(flags)));
+		return push_inst(compiler, SRLI | RD(srcdst) | RS1(srcdst) | IMM_I(flags));
+	}
+
+	if (type & SLJIT_SIMD_LANE_ZERO) {
+		FAIL_IF(sljit_emit_vsetivli(compiler, type, 0));
+		FAIL_IF(push_inst(compiler, VMV_VI | VRD(vreg)));
+	}
+
+	if (srcdst & SLJIT_MEM) {
+		FAIL_IF(push_inst(compiler, VSETIVLI | RD(TMP_REG1) | ((sljit_ins)elem_size << 23) | (1 << 15)));
+		FAIL_IF(sljit_emit_vmem(compiler, VL | VRD(lane_index > 0 ? TMP_VREG1 : vreg), elem_size, srcdst, srcdstw));
+
+		if (lane_index == 0)
+			return SLJIT_SUCCESS;
+
+		FAIL_IF(push_inst(compiler, VSETIVLI | RD(TMP_REG1) | ((sljit_ins)elem_size << 23) | ((sljit_ins)(lane_index + 1) << 15)));
+		return push_inst(compiler, VSLIDEUP_VI | VRD(vreg) | ((sljit_ins)lane_index << 15) | VRS2(TMP_VREG1));
+	}
+
+	if (!(type & SLJIT_SIMD_LANE_ZERO) || lane_index > 0)
+		FAIL_IF(push_inst(compiler, VSETIVLI | RD(TMP_REG1) | ((sljit_ins)elem_size << 23) | ((sljit_ins)(lane_index + 1) << 15)));
+
+	if (type & SLJIT_SIMD_FLOAT) {
+		FAIL_IF(push_inst(compiler, VFMV_SF | VRD(lane_index > 0 ? TMP_VREG1 : vreg) | FRS1(srcdst)));
+
+		if (lane_index == 0)
+			return SLJIT_SUCCESS;
+
+		return push_inst(compiler, VSLIDEUP_VI | VRD(vreg) | ((sljit_ins)lane_index << 15) | VRS2(TMP_VREG1));
+	}
+
+	if (srcdst == SLJIT_IMM) {
+		srcdstw = sljit_simd_get_imm(elem_size, srcdstw);
+		FAIL_IF(load_immediate(compiler, TMP_REG1, srcdstw, TMP_REG3));
+		srcdst = TMP_REG1;
+	}
+
+	FAIL_IF(push_inst(compiler, VMV_SX | VRD(lane_index > 0 ? TMP_VREG1 : vreg) | RS1(srcdst)));
+
+	if (lane_index == 0)
+		return SLJIT_SUCCESS;
+
+	return push_inst(compiler, VSLIDEUP_VI | VRD(vreg) | ((sljit_ins)lane_index << 15) | VRS2(TMP_VREG1));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 src, sljit_s32 src_lane_index)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
+
+	if (reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (((type & SLJIT_SIMD_FLOAT) && elem_size < 2) || elem_size > 3)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	FAIL_IF(sljit_emit_vsetivli(compiler, type, 0));
+
+	FAIL_IF(push_inst(compiler, VRGATHER_VI | VRD(vreg != src ? vreg : TMP_VREG1) | ((sljit_ins)src_lane_index << 15) | VRS2(src)));
+	if (vreg == src)
+		return push_inst(compiler, VMV_VV | VRD(vreg) | VRS1(TMP_VREG1));
+	return SLJIT_SUCCESS;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 src, sljit_sw srcw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 elem2_size = SLJIT_SIMD_GET_ELEM2_SIZE(type);
+	sljit_ins ins;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
+
+	ADJUST_LOCAL_OFFSET(src, srcw);
+
+	if (reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+#if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
+	if ((type & SLJIT_SIMD_FLOAT) ? (elem_size < 2 || elem_size > 3) : elem_size > 2)
+		return SLJIT_ERR_UNSUPPORTED;
+#else /* !SLJIT_CONFIG_RISCV_32 */
+	if (((type & SLJIT_SIMD_FLOAT) && elem_size < 2) || elem_size > 3)
+		return SLJIT_ERR_UNSUPPORTED;
+#endif /* SLJIT_CONFIG_RISCV_32 */
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	if ((src & SLJIT_MEM) || vreg == src) {
+		ins = (sljit_ins)1 << (reg_size - elem2_size);
+		FAIL_IF(push_inst(compiler, VSETIVLI | RD(TMP_REG1) | ((sljit_ins)elem_size << 23) | (ins << 15)));
+
+		if (src & SLJIT_MEM)
+			FAIL_IF(sljit_emit_vmem(compiler, VL | VRD(TMP_VREG1), elem_size, src, srcw));
+		else
+			FAIL_IF(push_inst(compiler, VMV_VV | VRD(TMP_VREG1) | VRS1(src)));
+
+		src = TMP_VREG1;
+	}
+
+	if (type & SLJIT_SIMD_FLOAT) {
+		FAIL_IF(sljit_emit_vsetivli(compiler, type, 0x7));
+		return push_inst(compiler, VFWCVT_FFV | VRD(vreg) | VRS2(src));
+	}
+
+	ins = (sljit_ins)1 << (reg_size - elem2_size);
+	FAIL_IF(push_inst(compiler, VSETIVLI | RD(TMP_REG1) | ((sljit_ins)elem2_size << 23) | (ins << 15)));
+
+	switch (elem2_size - elem_size) {
+	case 1:
+		ins = VZEXT_VF2;
+		break;
+	case 2:
+		ins = VZEXT_VF4;
+		break;
+	default:
+		ins = VZEXT_VF8;
+		break;
+	}
+
+	if (type & SLJIT_SIMD_EXTEND_SIGNED)
+		ins |= 1 << 15;
+
+	return push_inst(compiler, ins | VRD(vreg) | VRS2(src));
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 vreg,
+	sljit_s32 dst, sljit_sw dstw)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
+
+	ADJUST_LOCAL_OFFSET(dst, dstw);
+
+	if (reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (((type & SLJIT_SIMD_FLOAT) && elem_size < 2) || elem_size > 3)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	FAIL_IF(sljit_emit_vsetivli(compiler, type, 0));
+	FAIL_IF(push_inst(compiler, VMV_VI | VRD(TMP_VREG1) | (0x0 << 15)));
+	FAIL_IF(push_inst(compiler, VMSLE_VI | VRD(TMP_VREG1) | (0x0 << 15) | VRS2(vreg)));
+
+	FAIL_IF(sljit_emit_vsetivli_size(compiler, 2, 2));
+	FAIL_IF(push_inst(compiler, VMV_XS | RD(dst_r) | VRS2(TMP_VREG1)));
+
+	if (dst & SLJIT_MEM)
+		return emit_op_mem(compiler, (type & SLJIT_32) ? INT_DATA : WORD_DATA, dst_r, dst, dstw);
+	return SLJIT_SUCCESS;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
+{
+	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
+	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_ins ins = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
+
+	ADJUST_LOCAL_OFFSET(src2, src2w);
+
+	if (reg_size != 4)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if ((type & SLJIT_SIMD_FLOAT) && (elem_size < 2 || elem_size > 3))
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (type & SLJIT_SIMD_TEST)
+		return SLJIT_SUCCESS;
+
+	switch (SLJIT_SIMD_GET_OPCODE(type)) {
+	case SLJIT_SIMD_OP2_AND:
+		ins = VAND_VV;
+		break;
+	case SLJIT_SIMD_OP2_OR:
+		ins = VOR_VV;
+		break;
+	case SLJIT_SIMD_OP2_XOR:
+		ins = VXOR_VV;
+		break;
+	case SLJIT_SIMD_OP2_SHUFFLE:
+		ins = VRGATHER_VV;
+		elem_size = 0;
+		break;
+	}
+
+	if (elem_size > 3)
+		elem_size = 3;
+
+	FAIL_IF(sljit_emit_vsetivli_size(compiler, reg_size, elem_size));
+
+	if (src2 & SLJIT_MEM) {
+		FAIL_IF(sljit_emit_vmem(compiler, VL | VRD(TMP_VREG1), elem_size, src2, src2w));
+		src2 = TMP_VREG1;
+	}
+
+	if (SLJIT_SIMD_GET_OPCODE(type) != SLJIT_SIMD_OP2_SHUFFLE)
+		return push_inst(compiler, ins | VRD(dst_vreg) | VRS1(src1_vreg) | VRS2(src2));
+
+	if (dst_vreg == src2) {
+		FAIL_IF(push_inst(compiler, VMV_VV | VRD(TMP_VREG1) | VRS1(src2)));
+		src2 = TMP_VREG1;
+	}
+
+	if (dst_vreg == src1_vreg) {
+		FAIL_IF(push_inst(compiler, VMV_VV | VRD(TMP_VREG2) | VRS1(src1_vreg)));
+		src1_vreg = TMP_VREG2;
+	}
+
+	return push_inst(compiler, ins | VRD(dst_vreg) | VRS1(src2) | VRS2(src1_vreg));
+}
+
 SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw init_value)
 {
 	struct sljit_const *const_;
@@ -2980,31 +3844,31 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_s32 dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 0);
 
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 	PTR_FAIL_IF(push_inst(compiler, (sljit_ins)dst_r));
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 	compiler->size += 1;
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	compiler->size += 5;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(emit_op_mem(compiler, WORD_DATA, TMP_REG2, dst, dstw));
 
-	return put_label;
+	return jump;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_constant, sljit_sw executable_offset)
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeS390X.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeS390X.c
similarity index 90%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeS390X.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeS390X.c
index 67516f9b..7ce9f9fc 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeS390X.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeS390X.c
@@ -38,12 +38,9 @@ SLJIT_API_FUNC_ATTRIBUTE const char* sljit_get_platform_name(void)
 	return "s390x" SLJIT_CPUINFO;
 }
 
-/* Instructions. */
+/* Instructions are stored as 64 bit values regardless their size. */
 typedef sljit_uw sljit_ins;
 
-/* Instruction tags (most significant halfword). */
-static const sljit_ins sljit_ins_const = (sljit_ins)1 << 48;
-
 #define TMP_REG1	(SLJIT_NUMBER_OF_REGISTERS + 2)
 #define TMP_REG2	(SLJIT_NUMBER_OF_REGISTERS + 3)
 
@@ -140,50 +137,21 @@ static SLJIT_INLINE sljit_gpr gpr(sljit_s32 r)
 	return reg_map[r];
 }
 
-/* Size of instruction in bytes. Tags must already be cleared. */
-static SLJIT_INLINE sljit_uw sizeof_ins(sljit_ins ins)
-{
-	/* keep faulting instructions */
-	if (ins == 0)
-		return 2;
-
-	if ((ins & 0x00000000ffffL) == ins)
-		return 2;
-	if ((ins & 0x0000ffffffffL) == ins)
-		return 4;
-	if ((ins & 0xffffffffffffL) == ins)
-		return 6;
-
-	SLJIT_UNREACHABLE();
-	return (sljit_uw)-1;
-}
-
 static sljit_s32 push_inst(struct sljit_compiler *compiler, sljit_ins ins)
 {
 	sljit_ins *ibuf = (sljit_ins *)ensure_buf(compiler, sizeof(sljit_ins));
 	FAIL_IF(!ibuf);
 	*ibuf = ins;
+
+	SLJIT_ASSERT(ins <= 0xffffffffffffL);
+
 	compiler->size++;
-	return SLJIT_SUCCESS;
-}
+	if (ins & 0xffff00000000L)
+		compiler->size++;
 
-static sljit_s32 encode_inst(void **ptr, sljit_ins ins)
-{
-	sljit_u16 *ibuf = (sljit_u16 *)*ptr;
-	sljit_uw size = sizeof_ins(ins);
+	if (ins & 0xffffffff0000L)
+		compiler->size++;
 
-	SLJIT_ASSERT((size & 6) == size);
-	switch (size) {
-	case 6:
-		*ibuf++ = (sljit_u16)(ins >> 32);
-		/* fallthrough */
-	case 4:
-		*ibuf++ = (sljit_u16)(ins >> 16);
-		/* fallthrough */
-	case 2:
-		*ibuf++ = (sljit_u16)(ins);
-	}
-	*ptr = (void*)ibuf;
 	return SLJIT_SUCCESS;
 }
 
@@ -1424,97 +1392,60 @@ static sljit_s32 emit_non_commutative(struct sljit_compiler *compiler, const str
 	return emit_rrf(compiler, ins, dst, src1, src1w, src2, src2w);
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_label *label;
 	struct sljit_jump *jump;
-	struct sljit_s390x_const *const_;
-	struct sljit_put_label *put_label;
+	struct sljit_const *const_;
 	sljit_sw executable_offset;
-	sljit_uw ins_size = 0; /* instructions */
+	sljit_uw ins_size = compiler->size << 1;
 	sljit_uw pool_size = 0; /* literal pool */
 	sljit_uw pad_size;
-	sljit_uw i, j = 0;
+	sljit_uw half_count;
+	SLJIT_NEXT_DEFINE_TYPES;
 	struct sljit_memory_fragment *buf;
-	void *code, *code_ptr;
+	sljit_ins *buf_ptr;
+	sljit_ins *buf_end;
+	sljit_u16 *code;
+	sljit_u16 *code_ptr;
 	sljit_uw *pool, *pool_ptr;
-	sljit_sw source, offset; /* TODO(carenas): only need 32 bit */
+	sljit_ins ins;
+	sljit_sw source, offset;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
 	reverse_buf(compiler);
 
-	/* branch handling */
-	label = compiler->labels;
 	jump = compiler->jumps;
-	put_label = compiler->put_labels;
-
-	/* TODO(carenas): compiler->executable_size could be calculated
-         *                before to avoid the following loop (except for
-         *                pool_size)
-         */
-	/* calculate the size of the code */
-	for (buf = compiler->buf; buf != NULL; buf = buf->next) {
-		sljit_uw len = buf->used_size / sizeof(sljit_ins);
-		sljit_ins *ibuf = (sljit_ins *)buf->memory;
-		for (i = 0; i < len; ++i, ++j) {
-			sljit_ins ins = ibuf[i];
-
-			/* TODO(carenas): instruction tag vs size/addr == j
-			 * using instruction tags for const is creative
-			 * but unlike all other architectures, and is not
-			 * done consistently for all other objects.
-			 * This might need reviewing later.
-			 */
-			if (ins & sljit_ins_const) {
-				pool_size += sizeof(*pool);
-				ins &= ~sljit_ins_const;
-			}
-			if (label && label->size == j) {
-				label->size = ins_size;
-				label = label->next;
-			}
-			if (jump && jump->addr == j) {
-				if ((jump->flags & SLJIT_REWRITABLE_JUMP) || (jump->flags & JUMP_ADDR)) {
-					/* encoded: */
-					/*   brasl %r14, <rel_addr> (or brcl <mask>, <rel_addr>) */
-					/* replace with: */
-					/*   lgrl %r1, <pool_addr> */
-					/*   bras %r14, %r1 (or bcr <mask>, %r1) */
-					pool_size += sizeof(*pool);
-					ins_size += 2;
-				}
-				jump = jump->next;
-			}
-			if (put_label && put_label->addr == j) {
-				pool_size += sizeof(*pool);
-				put_label = put_label->next;
-			}
-			ins_size += sizeof_ins(ins);
+	while (jump != NULL) {
+		if (jump->flags & (SLJIT_REWRITABLE_JUMP | JUMP_ADDR | JUMP_MOV_ADDR)) {
+			/* encoded: */
+			/*   brasl %r14, <rel_addr> (or brcl <mask>, <rel_addr>) */
+			/* replace with: */
+			/*   lgrl %r1, <pool_addr> */
+			/*   bras %r14, %r1 (or bcr <mask>, %r1) */
+			pool_size += sizeof(*pool);
+			if (!(jump->flags & JUMP_MOV_ADDR))
+				ins_size += 2;
 		}
+		jump = jump->next;
 	}
 
-	/* emit trailing label */
-	if (label && label->size == j) {
-		label->size = ins_size;
-		label = label->next;
+	const_ = compiler->consts;
+	while (const_) {
+		pool_size += sizeof(*pool);
+		const_ = const_->next;
 	}
 
-	SLJIT_ASSERT(!label);
-	SLJIT_ASSERT(!jump);
-	SLJIT_ASSERT(!put_label);
-
 	/* pad code size to 8 bytes so is accessible with half word offsets */
 	/* the literal pool needs to be doubleword aligned */
 	pad_size = ((ins_size + 7UL) & ~7UL) - ins_size;
 	SLJIT_ASSERT(pad_size < 8UL);
 
 	/* allocate target buffer */
-	code = SLJIT_MALLOC_EXEC(ins_size + pad_size + pool_size,
-					compiler->exec_allocator_data);
+	code = (sljit_u16*)allocate_executable_memory(ins_size + pad_size + pool_size, options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
 	code_ptr = code;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
 
 	/* TODO(carenas): pool is optional, and the ABI recommends it to
          *                be created before the function code, instead of
@@ -1523,130 +1454,166 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
          */
 	pool = (sljit_uw *)((sljit_uw)code + ins_size + pad_size);
 	pool_ptr = pool;
-	const_ = (struct sljit_s390x_const *)compiler->consts;
+	buf = compiler->buf;
+	half_count = 0;
 
-	/* update label addresses */
 	label = compiler->labels;
-	while (label) {
-		label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(
-			(sljit_uw)code_ptr + label->size, executable_offset);
+	jump = compiler->jumps;
+	const_ = compiler->consts;
+	SLJIT_NEXT_INIT_TYPES();
+	SLJIT_GET_NEXT_MIN();
+
+	do {
+		buf_ptr = (sljit_ins*)buf->memory;
+		buf_end = buf_ptr + (buf->used_size >> 3);
+		do {
+			ins = *buf_ptr++;
+
+			if (next_min_addr == half_count) {
+				SLJIT_ASSERT(!label || label->size >= half_count);
+				SLJIT_ASSERT(!jump || jump->addr >= half_count);
+				SLJIT_ASSERT(!const_ || const_->addr >= half_count);
+
+				if (next_min_addr == next_label_size) {
+					label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+					label = label->next;
+					next_label_size = SLJIT_GET_NEXT_SIZE(label);
+				}
+
+				if (next_min_addr == next_jump_addr) {
+					if (SLJIT_UNLIKELY(jump->flags & JUMP_MOV_ADDR)) {
+						source = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+
+						jump->addr = (sljit_uw)pool_ptr;
+
+						/* store target into pool */
+						offset = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(pool_ptr, executable_offset) - source;
+						pool_ptr++;
+
+						SLJIT_ASSERT(!(offset & 1));
+						offset >>= 1;
+						SLJIT_ASSERT(is_s32(offset));
+						ins |= (sljit_ins)offset & 0xffffffff;
+					} else if (jump->flags & (SLJIT_REWRITABLE_JUMP | JUMP_ADDR)) {
+						sljit_ins arg;
+
+						jump->addr = (sljit_uw)pool_ptr;
+
+						/* load address into tmp1 */
+						source = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+						offset = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(pool_ptr, executable_offset) - source;
+
+						SLJIT_ASSERT(!(offset & 1));
+						offset >>= 1;
+						SLJIT_ASSERT(is_s32(offset));
+
+						code_ptr[0] = (sljit_u16)(0xc408 | R4A(tmp1) /* lgrl */);
+						code_ptr[1] = (sljit_u16)(offset >> 16);
+						code_ptr[2] = (sljit_u16)offset;
+						code_ptr += 3;
+						pool_ptr++;
+
+						/* branch to tmp1 */
+						arg = (ins >> 36) & 0xf;
+						if (((ins >> 32) & 0xf) == 4) {
+							/* brcl -> bcr */
+							ins = bcr(arg, tmp1);
+						} else {
+							SLJIT_ASSERT(((ins >> 32) & 0xf) == 5);
+							/* brasl -> basr */
+							ins = basr(arg, tmp1);
+						}
+
+						/* Adjust half_count. */
+						half_count += 2;
+					} else
+						jump->addr = (sljit_uw)code_ptr;
+
+					jump = jump->next;
+					next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+				} else  if (next_min_addr == next_const_addr) {
+					/* update instruction with relative address of constant */
+					source = (sljit_sw)code_ptr;
+					offset = (sljit_sw)pool_ptr - source;
+
+					SLJIT_ASSERT(!(offset & 0x1));
+					offset >>= 1; /* halfword (not byte) offset */
+					SLJIT_ASSERT(is_s32(offset));
+
+					ins |= (sljit_ins)offset & 0xffffffff;
+
+					/* update address */
+					const_->addr = (sljit_uw)pool_ptr;
+
+					/* store initial value into pool and update pool address */
+					*(pool_ptr++) = (sljit_uw)(((struct sljit_s390x_const*)const_)->init_value);
+
+					/* move to next constant */
+					const_ = const_->next;
+					next_const_addr = SLJIT_GET_NEXT_ADDRESS(const_);
+				}
+
+				SLJIT_GET_NEXT_MIN();
+			}
+
+			if (ins & 0xffff00000000L) {
+				*code_ptr++ = (sljit_u16)(ins >> 32);
+				half_count++;
+			}
+
+			if (ins & 0xffffffff0000L) {
+				*code_ptr++ = (sljit_u16)(ins >> 16);
+				half_count++;
+			}
+
+			*code_ptr++ = (sljit_u16)ins;
+			half_count++;
+		} while (buf_ptr < buf_end);
+
+		buf = buf->next;
+	} while (buf);
+
+	if (next_label_size == half_count) {
+		label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 		label = label->next;
 	}
 
-	/* reset jumps */
-	jump = compiler->jumps;
-	put_label = compiler->put_labels;
-
-	/* emit the code */
-	j = 0;
-	for (buf = compiler->buf; buf != NULL; buf = buf->next) {
-		sljit_uw len = buf->used_size / sizeof(sljit_ins);
-		sljit_ins *ibuf = (sljit_ins *)buf->memory;
-		for (i = 0; i < len; ++i, ++j) {
-			sljit_ins ins = ibuf[i];
-			if (ins & sljit_ins_const) {
-				/* clear the const tag */
-				ins &= ~sljit_ins_const;
-
-				/* update instruction with relative address of constant */
-				source = (sljit_sw)code_ptr;
-				offset = (sljit_sw)pool_ptr - source;
-
-				SLJIT_ASSERT(!(offset & 1));
-				offset >>= 1; /* halfword (not byte) offset */
-				SLJIT_ASSERT(is_s32(offset));
-
-				ins |= (sljit_ins)offset & 0xffffffff;
-
-				/* update address */
-				const_->const_.addr = (sljit_uw)pool_ptr;
-
-				/* store initial value into pool and update pool address */
-				*(pool_ptr++) = (sljit_uw)const_->init_value;
-
-				/* move to next constant */
-				const_ = (struct sljit_s390x_const *)const_->const_.next;
-			}
-			if (jump && jump->addr == j) {
-				sljit_sw target = (sljit_sw)((jump->flags & JUMP_LABEL) ? jump->u.label->addr : jump->u.target);
-				if ((jump->flags & SLJIT_REWRITABLE_JUMP) || (jump->flags & JUMP_ADDR)) {
-					sljit_ins op, arg;
-
-					jump->addr = (sljit_uw)pool_ptr;
-
-					/* load address into tmp1 */
-					source = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
-					offset = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(pool_ptr, executable_offset) - source;
-
-					SLJIT_ASSERT(!(offset & 1));
-					offset >>= 1;
-					SLJIT_ASSERT(is_s32(offset));
-
-					encode_inst(&code_ptr, lgrl(tmp1, offset & 0xffffffff));
-
-					/* store jump target into pool and update pool address */
-					*(pool_ptr++) = (sljit_uw)target;
-
-					/* branch to tmp1 */
-					op = (ins >> 32) & 0xf;
-					arg = (ins >> 36) & 0xf;
-					switch (op) {
-					case 4: /* brcl -> bcr */
-						ins = bcr(arg, tmp1);
-						break;
-					case 5: /* brasl -> basr */
-						ins = basr(arg, tmp1);
-						break;
-					default:
-						abort();
-					}
-				}
-				else {
-					jump->addr = (sljit_uw)code_ptr + 2;
-					source = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
-					offset = target - source;
-
-					/* offset must be halfword aligned */
-					SLJIT_ASSERT(!(offset & 1));
-					offset >>= 1;
-					SLJIT_ASSERT(is_s32(offset)); /* TODO(mundaym): handle arbitrary offsets */
-
-					/* patch jump target */
-					ins |= (sljit_ins)offset & 0xffffffff;
-				}
-				jump = jump->next;
-			}
-			if (put_label && put_label->addr == j) {
-				source = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
-
-				SLJIT_ASSERT(put_label->label);
-				put_label->addr = (sljit_uw)code_ptr;
-
-				/* store target into pool */
-				*pool_ptr = put_label->label->addr;
-				offset = (sljit_sw)SLJIT_ADD_EXEC_OFFSET(pool_ptr, executable_offset) - source;
-				pool_ptr++;
-
-				SLJIT_ASSERT(!(offset & 1));
-				offset >>= 1;
-				SLJIT_ASSERT(is_s32(offset));
-				ins |= (sljit_ins)offset & 0xffffffff;
-
-				put_label = put_label->next;
-			}
-			encode_inst(&code_ptr, ins);
-		}
-	}
-	SLJIT_ASSERT((sljit_u8 *)code + ins_size == code_ptr);
+	SLJIT_ASSERT(!label);
+	SLJIT_ASSERT(!jump);
+	SLJIT_ASSERT(!const_);
+	SLJIT_ASSERT(code + (ins_size >> 1) == code_ptr);
 	SLJIT_ASSERT((sljit_u8 *)pool + pool_size == (sljit_u8 *)pool_ptr);
 
+	jump = compiler->jumps;
+	while (jump != NULL) {
+		offset = (sljit_sw)((jump->flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr);
+
+		if (jump->flags & (SLJIT_REWRITABLE_JUMP | JUMP_ADDR | JUMP_MOV_ADDR)) {
+			/* Store jump target into pool. */
+			*(sljit_uw*)(jump->addr) = (sljit_uw)offset;
+		} else {
+			code_ptr = (sljit_u16*)jump->addr;
+			offset -= (sljit_sw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+
+			/* offset must be halfword aligned */
+			SLJIT_ASSERT(!(offset & 1));
+			offset >>= 1;
+			SLJIT_ASSERT(is_s32(offset)); /* TODO(mundaym): handle arbitrary offsets */
+
+			code_ptr[1] = (sljit_u16)(offset >> 16);
+			code_ptr[2] = (sljit_u16)offset;
+		}
+		jump = jump->next;
+	}
+
 	compiler->error = SLJIT_ERR_COMPILED;
 	compiler->executable_offset = executable_offset;
 	compiler->executable_size = ins_size;
 	if (pool_size)
 		compiler->executable_size += (pad_size + pool_size);
-	code = SLJIT_ADD_EXEC_OFFSET(code, executable_offset);
-	code_ptr = SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+
+	code = (sljit_u16 *)SLJIT_ADD_EXEC_OFFSET(code, executable_offset);
+	code_ptr = (sljit_u16 *)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 	SLJIT_CACHE_FLUSH(code, code_ptr);
 	SLJIT_UPDATE_WX_FLAGS(code, code_ptr, 1);
 	return code;
@@ -1671,6 +1638,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_COPY_F64:
 	case SLJIT_HAS_SIMD:
 	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
 		return 1;
 
 	case SLJIT_HAS_CTZ:
@@ -1693,19 +1661,26 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_cmp_info(sljit_s32 type)
 /* --------------------------------------------------------------------- */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
 	sljit_s32 offset, i, tmp;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
 	/* Saved registers are stored in callee allocated save area. */
 	SLJIT_ASSERT(gpr(SLJIT_FIRST_SAVED_REG) == r6 && gpr(SLJIT_S0) == r13);
 
+	scratches = ENTER_GET_REGS(scratches);
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
+
 	offset = 2 * SSIZE_OF(sw);
 	if (saveds + scratches >= SLJIT_NUMBER_OF_REGISTERS) {
 		if (saved_arg_count == 0) {
@@ -1789,12 +1764,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
 	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
 
 	compiler->local_size = (local_size + SLJIT_S390X_DEFAULT_STACK_FRAME_SIZE + 0xf) & ~0xf;
 	return SLJIT_SUCCESS;
@@ -1956,7 +1931,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 		return SLJIT_SUCCESS;
 	case SLJIT_DIV_S32:
 	case SLJIT_DIVMOD_S32:
-		FAIL_IF(push_inst(compiler, lhi(tmp0, 0)));
+		FAIL_IF(push_inst(compiler, 0xeb00000000dc /* srak */ | R36A(tmp0) | R32A(arg0) | (31 << 16)));
 		FAIL_IF(push_inst(compiler, lr(tmp1, arg0)));
 		FAIL_IF(push_inst(compiler, dr(tmp0, arg1)));
 		FAIL_IF(push_inst(compiler, lr(arg0, tmp1))); /* quotient */
@@ -1983,6 +1958,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 			return push_inst(compiler, lgr(arg1, tmp0)); /* remainder */
 
 		return SLJIT_SUCCESS;
+	case SLJIT_MEMORY_BARRIER:
+		return push_inst(compiler, 0x0700 /* bcr */ | (0xe << 4) | 0);
 	case SLJIT_ENDBR:
 		return SLJIT_SUCCESS;
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
@@ -2497,7 +2474,7 @@ static sljit_s32 sljit_emit_sub(struct sljit_compiler *compiler, sljit_s32 op,
 	const struct ins_forms *forms;
 	sljit_ins ins;
 
-	if (dst == (sljit_s32)tmp0 && flag_type <= SLJIT_SIG_LESS_EQUAL) {
+	if (dst == TMP_REG2 && flag_type <= SLJIT_SIG_LESS_EQUAL) {
 		int compare_signed = flag_type >= SLJIT_SIG_LESS;
 
 		compiler->status_flags_state |= SLJIT_CURRENT_FLAGS_COMPARE;
@@ -2508,14 +2485,9 @@ static sljit_s32 sljit_emit_sub(struct sljit_compiler *compiler, sljit_s32 op,
 					ins = (op & SLJIT_32) ? 0xc20d00000000 /* cfi */ : 0xc20c00000000 /* cgfi */;
 					return emit_ri(compiler, ins, src1, src1, src1w, src2w, RIL_A);
 				}
-			}
-			else {
-				if ((op & SLJIT_32) || is_u32(src2w)) {
-					ins = (op & SLJIT_32) ? 0xc20f00000000 /* clfi */ : 0xc20e00000000 /* clgfi */;
-					return emit_ri(compiler, ins, src1, src1, src1w, src2w, RIL_A);
-				}
-				if (is_s16(src2w))
-					return emit_rie_d(compiler, 0xec00000000db /* alghsik */, (sljit_s32)tmp0, src1, src1w, src2w);
+			} else if ((op & SLJIT_32) || is_u32(src2w)) {
+				ins = (op & SLJIT_32) ? 0xc20f00000000 /* clfi */ : 0xc20e00000000 /* clgfi */;
+				return emit_ri(compiler, ins, src1, src1, src1w, src2w, RIL_A);
 			}
 		}
 		else if (src2 & SLJIT_MEM) {
@@ -2597,7 +2569,7 @@ done:
 			     - the first operand is less if the sign bit of the result is not set
 			   The -result operation sets the corrent sign, because the result cannot be zero.
 			   The overflow is considered greater, since the result must be equal to INT_MIN so its sign bit is set. */
-			FAIL_IF(push_inst(compiler, brc(0xe, 2 + 2)));
+			FAIL_IF(push_inst(compiler, brc(0xe, (op & SLJIT_32) ? (2 + 1) : (2 + 2))));
 			FAIL_IF(push_inst(compiler, (op & SLJIT_32) ? lcr(tmp1, dst_r) : lcgr(tmp1, dst_r)));
 		}
 		else if (op & SLJIT_SET_Z)
@@ -2759,7 +2731,7 @@ static sljit_s32 sljit_emit_bitwise(struct sljit_compiler *compiler, sljit_s32 o
 	sljit_s32 type = GET_OPCODE(op);
 	const struct ins_forms *forms;
 
-	if (src2 == SLJIT_IMM && (!(op & SLJIT_SET_Z) || (type == SLJIT_AND && dst == (sljit_s32)tmp0))) {
+	if (src2 == SLJIT_IMM && (!(op & SLJIT_SET_Z) || (type == SLJIT_AND && dst == TMP_REG2))) {
 		sljit_s32 count16 = 0;
 		sljit_uw imm = (sljit_uw)src2w;
 
@@ -2775,13 +2747,13 @@ static sljit_s32 sljit_emit_bitwise(struct sljit_compiler *compiler, sljit_s32 o
 		if ((imm & 0xffff000000000000ull) != 0)
 			count16++;
 
-		if (type == SLJIT_AND && dst == (sljit_s32)tmp0 && count16 == 1) {
-			sljit_gpr src_r = tmp0;
+		if (type == SLJIT_AND && dst == TMP_REG2 && count16 == 1) {
+			sljit_gpr src_r = tmp1;
 
 			if (FAST_IS_REG(src1))
 				src_r = gpr(src1 & REG_MASK);
 			else
-				FAIL_IF(emit_move(compiler, tmp0, src1, src1w));
+				FAIL_IF(emit_move(compiler, tmp1, src1, src1w));
 
 			if ((imm & 0x000000000000ffffull) != 0 || imm == 0)
 				return push_inst(compiler, 0xa7010000 /* tmll */ | R20A(src_r) | imm);
@@ -3002,11 +2974,31 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	sljit_s32 src1, sljit_sw src1w,
 	sljit_s32 src2, sljit_sw src2w)
 {
+	sljit_s32 dst_reg = (GET_OPCODE(op) == SLJIT_SUB || GET_OPCODE(op) == SLJIT_AND) ? TMP_REG2 : TMP_REG1;
+
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_op2(compiler, op, 1, 0, 0, src1, src1w, src2, src2w));
 
 	SLJIT_SKIP_CHECKS(compiler);
-	return sljit_emit_op2(compiler, op, (sljit_s32)tmp0, 0, src1, src1w, src2, src2w);
+	return sljit_emit_op2(compiler, op, dst_reg, 0, src1, src1w, src2, src2w);
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		SLJIT_SKIP_CHECKS(compiler);
+		FAIL_IF(sljit_emit_op2(compiler, SLJIT_MUL | (op & SLJIT_32), 0 /* tmp0 */, 0, src1, src1w, src2, src2w));
+		return push_inst(compiler, ((op & SLJIT_32) ? 0x1a00 /* ar */ : 0xb9080000 /* agr */) | R4A(gpr(dst_reg)) | R0A(tmp0));
+	}
+
+	return SLJIT_SUCCESS;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
@@ -3195,7 +3187,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_register_index(sljit_s32 type, slji
 	if (type == SLJIT_GP_REGISTER)
 		return (sljit_s32)gpr(reg);
 
-	if (type != SLJIT_FLOAT_REGISTER)
+	if (type != SLJIT_FLOAT_REGISTER && type != SLJIT_SIMD_REG_128)
 		return -1;
 
 	return (sljit_s32)freg_map[reg];
@@ -3415,12 +3407,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop1(struct sljit_compiler *compil
 		FAIL_IF(push_inst(compiler, ins | F4(dst_r) | F0(src)));
 	}
 
-	if (!(dst & SLJIT_MEM))
-		return SLJIT_SUCCESS;
+	if (dst & SLJIT_MEM)
+		return float_mem(compiler, FLOAT_STORE | (op & SLJIT_32), TMP_FREG1, dst, dstw);
 
-	SLJIT_ASSERT(dst_r == TMP_FREG1);
-
-	return float_mem(compiler, FLOAT_STORE | (op & SLJIT_32), TMP_FREG1, dst, dstw);
+	return SLJIT_SUCCESS;
 }
 
 #define FLOAT_MOV(op, dst_r, src_r) \
@@ -3491,7 +3481,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 	if (dst & SLJIT_MEM)
 		return float_mem(compiler, FLOAT_STORE | (op & SLJIT_32), TMP_FREG1, dst, dstw);
 
-	SLJIT_ASSERT(dst_r != TMP_FREG1);
 	return SLJIT_SUCCESS;
 }
 
@@ -3738,8 +3727,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 		FAIL_IF(push_inst(compiler,
 			WHEN2(op & SLJIT_32, lochi, locghi)));
 	} else {
-		/* TODO(mundaym): no load/store-on-condition 2 facility (ipm? branch-and-set?) */
-		abort();
+		FAIL_IF(push_load_imm_inst(compiler, loc_r, 1));
+		FAIL_IF(push_inst(compiler, brc(mask, 2 + 2)));
+		FAIL_IF(push_load_imm_inst(compiler, loc_r, 0));
 	}
 	#undef LEVAL
 
@@ -3837,8 +3827,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *comp
 			return push_inst(compiler, ins | R36A(dst_r) | (mask << 32) | (sljit_ins)(src1w & 0xffff) << 16);
 		}
 
-		FAIL_IF(push_load_imm_inst(compiler, tmp0, src1w));
-		src_r = tmp0;
+		FAIL_IF(push_load_imm_inst(compiler, tmp1, src1w));
+		src_r = tmp1;
 	} else
 		src_r = gpr(src1);
 
@@ -3949,7 +3939,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_mem(struct sljit_compiler *compile
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3959,7 +3949,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_mov(compiler, type, freg, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -3974,15 +3964,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 
 	if (!(srcdst & SLJIT_MEM)) {
 		if (type & SLJIT_SIMD_STORE)
-			ins = F36(srcdst) | F32(freg);
+			ins = F36(srcdst) | F32(vreg);
 		else
-			ins = F36(freg) | F32(srcdst);
+			ins = F36(vreg) | F32(srcdst);
 
 		return push_inst(compiler, 0xe70000000056 /* vlr */ | ins);
 	}
 
 	FAIL_IF(make_addr_bx(compiler, &addr, srcdst, srcdstw, tmp1));
-	ins = F36(freg) | R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset);
+	ins = F36(vreg) | R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset);
 
 	if (alignment >= 4)
 		ins |= 4 << 12;
@@ -3993,7 +3983,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4003,7 +3993,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 	sljit_sw sign_ext;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_replicate(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -4018,15 +4008,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 
 	if (src & SLJIT_MEM) {
 		FAIL_IF(make_addr_bx(compiler, &addr, src, srcw, tmp1));
-		return push_inst(compiler, 0xe70000000005 /* vlrep */ | F36(freg)
+		return push_inst(compiler, 0xe70000000005 /* vlrep */ | F36(vreg)
 			| R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset) | ((sljit_ins)elem_size << 12));
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		if (src == SLJIT_IMM)
-			return push_inst(compiler, 0xe70000000044 /* vgbm */ | F36(freg));
+			return push_inst(compiler, 0xe70000000044 /* vgbm */ | F36(vreg));
 
-		return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(freg) | F32(src) | ((sljit_ins)elem_size << 12));
+		return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(vreg) | F32(src) | ((sljit_ins)elem_size << 12));
 	}
 
 	if (src == SLJIT_IMM) {
@@ -4058,10 +4048,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 
 		if (sign_ext != 0x10000) {
 			if (sign_ext == 0 || sign_ext == -1)
-				return push_inst(compiler, 0xe70000000044 /* vgbm */ | F36(freg)
+				return push_inst(compiler, 0xe70000000044 /* vgbm */ | F36(vreg)
 					| (sign_ext == 0 ? 0 : ((sljit_ins)0xffff << 16)));
 
-			return push_inst(compiler, 0xe70000000045 /* vrepi */ | F36(freg)
+			return push_inst(compiler, 0xe70000000045 /* vrepi */ | F36(vreg)
 				| ((sljit_ins)srcw << 16) | ((sljit_ins)elem_size << 12));
 		}
 
@@ -4070,12 +4060,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 	} else
 		reg = gpr(src);
 
-	FAIL_IF(push_inst(compiler, 0xe70000000022 /* vlvg */ | F36(freg) | R32A(reg) | ((sljit_ins)elem_size << 12)));
-	return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(freg) | F32(freg) | ((sljit_ins)elem_size << 12));
+	FAIL_IF(push_inst(compiler, 0xe70000000022 /* vlvg */ | F36(vreg) | R32A(reg) | ((sljit_ins)elem_size << 12)));
+	return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(vreg) | F32(vreg) | ((sljit_ins)elem_size << 12));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4085,7 +4075,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 	sljit_ins ins = 0;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, freg, lane_index, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -4100,20 +4090,20 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 
 	if (srcdst & SLJIT_MEM) {
 		FAIL_IF(make_addr_bx(compiler, &addr, srcdst, srcdstw, tmp1));
-		ins = F36(freg) | R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset);
+		ins = F36(vreg) | R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset);
 	}
 
 	if (type & SLJIT_SIMD_LANE_ZERO) {
 		if ((srcdst & SLJIT_MEM) && lane_index == ((1 << (3 - elem_size)) - 1))
 			return push_inst(compiler, 0xe70000000004 /* vllez */ | ins | ((sljit_ins)elem_size << 12));
 
-		if ((type & SLJIT_SIMD_FLOAT) && freg == srcdst) {
-			FAIL_IF(push_inst(compiler, 0xe70000000056 /* vlr */ | F36(TMP_FREG1) | F32(freg)));
+		if ((type & SLJIT_SIMD_FLOAT) && vreg == srcdst) {
+			FAIL_IF(push_inst(compiler, 0xe70000000056 /* vlr */ | F36(TMP_FREG1) | F32(vreg)));
 			srcdst = TMP_FREG1;
 			srcdstw = 0;
 		}
 
-		FAIL_IF(push_inst(compiler, 0xe70000000044 /* vgbm */ | F36(freg)));
+		FAIL_IF(push_inst(compiler, 0xe70000000044 /* vgbm */ | F36(vreg)));
 	}
 
 	if (srcdst & SLJIT_MEM) {
@@ -4141,19 +4131,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 
 	if (type & SLJIT_SIMD_FLOAT) {
 		if (type & SLJIT_SIMD_STORE)
-			return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(srcdst) | F32(freg) | ((sljit_ins)lane_index << 16) | ((sljit_ins)elem_size << 12));
+			return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(srcdst) | F32(vreg) | ((sljit_ins)lane_index << 16) | ((sljit_ins)elem_size << 12));
 
 		if (elem_size == 3) {
 			if (lane_index == 0)
-				ins = F32(srcdst) | F28(freg) | (1 << 12);
+				ins = F32(srcdst) | F28(vreg) | (1 << 12);
 			else
-				ins = F32(freg) | F28(srcdst);
+				ins = F32(vreg) | F28(srcdst);
 
-			return push_inst(compiler, 0xe70000000084 /* vpdi */ | F36(freg) | ins);
+			return push_inst(compiler, 0xe70000000084 /* vpdi */ | F36(vreg) | ins);
 		}
 
 		FAIL_IF(push_inst(compiler, 0xe70000000021 /* vlgv */ | R36A(tmp0) | F32(srcdst) | ((sljit_ins)2 << 12)));
-		return push_inst(compiler, 0xe70000000022 /* vlvg */ | F36(freg) | R32A(tmp0) | ((sljit_ins)lane_index << 16) | ((sljit_ins)2 << 12));
+		return push_inst(compiler, 0xe70000000022 /* vlvg */ | F36(vreg) | R32A(tmp0) | ((sljit_ins)lane_index << 16) | ((sljit_ins)2 << 12));
 	}
 
 	if (srcdst == SLJIT_IMM) {
@@ -4182,7 +4172,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		}
 
 		if (ins != 0)
-			return push_inst(compiler, ins | F36(freg) | ((sljit_ins)srcdstw << 16) | ((sljit_ins)lane_index << 12));
+			return push_inst(compiler, ins | F36(vreg) | ((sljit_ins)srcdstw << 16) | ((sljit_ins)lane_index << 12));
 
 		push_load_imm_inst(compiler, tmp0, srcdstw);
 		reg = tmp0;
@@ -4192,9 +4182,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 	ins = ((sljit_ins)lane_index << 16) | ((sljit_ins)elem_size << 12);
 
 	if (!(type & SLJIT_SIMD_STORE))
-		return push_inst(compiler, 0xe70000000022 /* vlvg */ | F36(freg) | R32A(reg) | ins);
+		return push_inst(compiler, 0xe70000000022 /* vlvg */ | F36(vreg) | R32A(reg) | ins);
 
-	FAIL_IF(push_inst(compiler, 0xe70000000021 /* vlgv */ | R36A(reg) | F32(freg) | ins));
+	FAIL_IF(push_inst(compiler, 0xe70000000021 /* vlgv */ | R36A(reg) | F32(vreg) | ins));
 
 	if (!(type & SLJIT_SIMD_LANE_SIGNED) || elem_size >= 3)
 		return SLJIT_SUCCESS;
@@ -4215,14 +4205,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, freg, src, src_lane_index));
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
 
 	if (reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -4233,12 +4223,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	if (type & SLJIT_SIMD_TEST)
 		return SLJIT_SUCCESS;
 
-	return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(freg) | F32(src)
+	return push_inst(compiler, 0xe7000000004d /* vrep */ | F36(vreg) | F32(src)
 		| ((sljit_ins)src_lane_index << 16) | ((sljit_ins)elem_size << 12));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4248,7 +4238,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 	sljit_ins ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_extend(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -4263,7 +4253,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 
 	if (src & SLJIT_MEM) {
 		FAIL_IF(make_addr_bx(compiler, &addr, src, srcw, tmp1));
-		ins = F36(freg) | R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset);
+		ins = F36(vreg) | R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset);
 
 		switch (elem2_size - elem_size) {
 		case 1:
@@ -4278,27 +4268,27 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 		}
 
 		FAIL_IF(push_inst(compiler, ins));
-		src = freg;
+		src = vreg;
 	}
 
 	if (type & SLJIT_SIMD_FLOAT) {
-		FAIL_IF(push_inst(compiler, 0xe700000000d5 /* vuplh */ | F36(freg) | F32(src) | (2 << 12)));
-		FAIL_IF(push_inst(compiler, 0xe70000000030 /* vesl */ | F36(freg) | F32(freg) | (32 << 16) | (3 << 12)));
-		return push_inst(compiler, 0xe700000000c4 /* vfll */ | F36(freg) | F32(freg) | (2 << 12));
+		FAIL_IF(push_inst(compiler, 0xe700000000d5 /* vuplh */ | F36(vreg) | F32(src) | (2 << 12)));
+		FAIL_IF(push_inst(compiler, 0xe70000000030 /* vesl */ | F36(vreg) | F32(vreg) | (32 << 16) | (3 << 12)));
+		return push_inst(compiler, 0xe700000000c4 /* vfll */ | F36(vreg) | F32(vreg) | (2 << 12));
 	}
 
-	ins = ((type & SLJIT_SIMD_EXTEND_SIGNED) ? 0xe700000000d7 /* vuph */ : 0xe700000000d5 /* vuplh */) | F36(freg);
+	ins = ((type & SLJIT_SIMD_EXTEND_SIGNED) ? 0xe700000000d7 /* vuph */ : 0xe700000000d5 /* vuplh */) | F36(vreg);
 
 	do {
 		FAIL_IF(push_inst(compiler, ins | F32(src) | ((sljit_ins)elem_size << 12)));
-		src = freg;
+		src = vreg;
 	} while (++elem_size < elem2_size);
 
 	return SLJIT_SUCCESS;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -4306,7 +4296,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	sljit_gpr dst_r;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_sign(compiler, type, freg, dst, dstw));
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
 
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
@@ -4339,7 +4329,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	if (elem_size != 0)
 		FAIL_IF(push_inst(compiler, 0xe70000000022 /* vlvg */ | F36(TMP_FREG1) | R32A(tmp0) | (1 << 16) | (3 << 12)));
 
-	FAIL_IF(push_inst(compiler, 0xe70000000085 /* vbperm */ | F36(TMP_FREG1) | F32(freg) | F28(TMP_FREG1)));
+	FAIL_IF(push_inst(compiler, 0xe70000000085 /* vbperm */ | F36(TMP_FREG1) | F32(vreg) | F28(TMP_FREG1)));
 
 	dst_r = FAST_IS_REG(dst) ? gpr(dst) : tmp0;
 	FAIL_IF(push_inst(compiler, 0xe70000000021 /* vlgv */ | R36A(dst_r) | F32(TMP_FREG1)
@@ -4352,14 +4342,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg)
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
-	sljit_ins ins = 0;
+	sljit_s32 alignment;
+	struct addr addr;
+	sljit_ins ins = 0, load_ins;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_freg, src1_freg, src2_freg));
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src2, src2w);
 
 	if (reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
@@ -4380,12 +4373,29 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 	case SLJIT_SIMD_OP2_XOR:
 		ins = 0xe7000000006d /* vx */;
 		break;
+	case SLJIT_SIMD_OP2_SHUFFLE:
+		ins = 0xe7000000008c /* vperm */;
+		break;
 	}
 
-	if (type & SLJIT_SIMD_TEST)
-		return SLJIT_SUCCESS;
+	if (src2 & SLJIT_MEM) {
+		FAIL_IF(make_addr_bx(compiler, &addr, src2, src2w, tmp1));
+		load_ins = 0xe70000000006 /* vl */ | F36(TMP_FREG1) | R32A(addr.index) | R28A(addr.base) | disp_s20(addr.offset);
+		alignment = SLJIT_SIMD_GET_ELEM2_SIZE(type);
 
-	return push_inst(compiler, ins | F36(dst_freg) | F32(src1_freg) | F28(src2_freg));
+		if (alignment >= 4)
+			load_ins |= 4 << 12;
+		else if (alignment == 3)
+			load_ins |= 3 << 12;
+
+		FAIL_IF(push_inst(compiler, load_ins));
+		src2 = TMP_FREG1;
+	}
+
+	if (SLJIT_SIMD_GET_OPCODE(type) == SLJIT_SIMD_OP2_SHUFFLE)
+		return push_inst(compiler, ins | F36(dst_vreg) | F32(src1_vreg) | F28(src1_vreg) | F12(src2));
+
+	return push_inst(compiler, ins | F36(dst_vreg) | F32(src1_vreg) | F28(src2));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler, sljit_s32 op,
@@ -4395,8 +4405,22 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
 
-	SLJIT_SKIP_CHECKS(compiler);
-	return sljit_emit_op1(compiler, op, dst_reg, 0, SLJIT_MEM1(mem_reg), 0);
+	if (op & SLJIT_ATOMIC_USE_LS)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MOV32:
+	case SLJIT_MOV_U32:
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+		if (op & SLJIT_ATOMIC_TEST)
+			return SLJIT_SUCCESS;
+
+		SLJIT_SKIP_CHECKS(compiler);
+		return sljit_emit_op1(compiler, op & ~SLJIT_ATOMIC_USE_CAS, dst_reg, 0, SLJIT_MEM1(mem_reg), 0);
+	default:
+		return SLJIT_ERR_UNSUPPORTED;
+	}
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler *compiler, sljit_s32 op,
@@ -4404,44 +4428,33 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	sljit_s32 mem_reg,
 	sljit_s32 temp_reg)
 {
-	sljit_ins mask;
+	sljit_ins ins;
 	sljit_gpr tmp_r = gpr(temp_reg);
 	sljit_gpr mem_r = gpr(mem_reg);
 
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_store(compiler, op, src_reg, mem_reg, temp_reg));
 
+	if (op & SLJIT_ATOMIC_USE_LS)
+		return SLJIT_ERR_UNSUPPORTED;
+
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV32:
 	case SLJIT_MOV_U32:
-		return push_inst(compiler, 0xba000000 /* cs */ | R20A(tmp_r) | R16A(gpr(src_reg)) | R12A(mem_r));
-	case SLJIT_MOV_U8:
-		mask = 0xff;
+		ins = 0xba000000 /* cs */ | R20A(tmp_r) | R16A(gpr(src_reg)) | R12A(mem_r);
 		break;
-	case SLJIT_MOV_U16:
-		mask = 0xffff;
+	case SLJIT_MOV:
+	case SLJIT_MOV_P:
+		ins = 0xeb0000000030 /* csg */ | R36A(tmp_r) | R32A(gpr(src_reg)) | R28A(mem_r);
 		break;
 	default:
-		return push_inst(compiler, 0xeb0000000030 /* csg */ | R36A(tmp_r) | R32A(gpr(src_reg)) | R28A(mem_r));
+		return SLJIT_ERR_UNSUPPORTED;
 	}
 
-	/* tmp0 = (src_reg ^ tmp_r) & mask */
-	FAIL_IF(push_inst(compiler, 0xa50f0000 /* llill */ | R20A(tmp1) | mask));
-	FAIL_IF(push_inst(compiler, 0xb9e70000 /* xgrk */ | R4A(tmp0) | R0A(gpr(src_reg)) | R12A(tmp_r)));
-	FAIL_IF(push_inst(compiler, 0xa7090000 /* lghi */ | R20A(tmp_r) | 0xfffc));
-	FAIL_IF(push_inst(compiler, 0xb9800000 /* ngr */ | R4A(tmp0) | R0A(tmp1)));
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
 
-	/* tmp0 = tmp0 << (((mem_r ^ 0x3) & 0x3) << 3) */
-	FAIL_IF(push_inst(compiler, 0xa50f0000 /* llill */ | R20A(tmp1) | (sljit_ins)((mask == 0xff) ? 0x18 : 0x10)));
-	FAIL_IF(push_inst(compiler, 0xb9800000 /* ngr */ | R4A(tmp_r) | R0A(mem_r)));
-	FAIL_IF(push_inst(compiler, 0xec0000000057 /* rxsbg */ | R36A(tmp1) | R32A(mem_r) | (59 << 24) | (60 << 16) | (3 << 8)));
-	FAIL_IF(push_inst(compiler, 0xeb000000000d /* sllg */ | R36A(tmp0) | R32A(tmp0) | R28A(tmp1)));
-
-	/* Already computed: tmp_r = mem_r & ~0x3 */
-
-	FAIL_IF(push_inst(compiler, 0x58000000 /* l */ | R20A(tmp1) | R12A(tmp_r)));
-	FAIL_IF(push_inst(compiler, 0x1700 /* x */ | R4A(tmp0) | R0A(tmp1)));
-	return push_inst(compiler, 0xba000000 /* cs */ | R20A(tmp1) | R16A(tmp0) | R12A(tmp_r));
+	return push_inst(compiler, ins);
 }
 
 /* --------------------------------------------------------------------- */
@@ -4474,9 +4487,9 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 
 	dst_r = FAST_IS_REG(dst) ? gpr(dst & REG_MASK) : tmp0;
 	if (have_genext())
-		PTR_FAIL_IF(push_inst(compiler, sljit_ins_const | lgrl(dst_r, 0)));
+		PTR_FAIL_IF(push_inst(compiler, lgrl(dst_r, 0)));
 	else {
-		PTR_FAIL_IF(push_inst(compiler, sljit_ins_const | larl(tmp1, 0)));
+		PTR_FAIL_IF(push_inst(compiler, larl(tmp1, 0)));
 		PTR_FAIL_IF(push_inst(compiler, lg(dst_r, 0, r0, tmp1)));
 	}
 
@@ -4503,20 +4516,18 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_const(sljit_uw addr, sljit_sw new_consta
 	sljit_set_jump_addr(addr, (sljit_uw)new_constant, executable_offset);
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label *sljit_emit_put_label(
-	struct sljit_compiler *compiler,
-	sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_gpr dst_r;
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 0);
 
 	dst_r = FAST_IS_REG(dst) ? gpr(dst & REG_MASK) : tmp0;
 
@@ -4530,7 +4541,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label *sljit_emit_put_label(
 	if (dst & SLJIT_MEM)
 		PTR_FAIL_IF(store_word(compiler, dst_r, dst, dstw, 0));
 
-	return put_label;
+	return jump;
 }
 
 /* TODO(carenas): EVAL probably should move up or be refactored */
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeX86_32.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_32.c
similarity index 92%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeX86_32.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_32.c
index ba4a1ebb..217a1498 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeX86_32.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_32.c
@@ -283,28 +283,25 @@ static sljit_s32 emit_vex_instruction(struct sljit_compiler *compiler, sljit_uw
 /*  Enter / return                                                       */
 /* --------------------------------------------------------------------- */
 
-static sljit_u8* generate_far_jump_code(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_sw executable_offset)
+static sljit_u8* detect_far_jump_type(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_sw executable_offset)
 {
 	sljit_uw type = jump->flags >> TYPE_SHIFT;
 
 	if (type == SLJIT_JUMP) {
 		*code_ptr++ = JMP_i32;
-		jump->addr++;
-	}
-	else if (type >= SLJIT_FAST_CALL) {
+	} else if (type >= SLJIT_FAST_CALL) {
 		*code_ptr++ = CALL_i32;
-		jump->addr++;
-	}
-	else {
+	} else {
 		*code_ptr++ = GROUP_0F;
 		*code_ptr++ = get_jump_code(type);
-		jump->addr += 2;
 	}
 
-	if (jump->flags & JUMP_LABEL)
-		jump->flags |= PATCH_MW;
-	else
+	jump->addr = (sljit_uw)code_ptr;
+
+	if (jump->flags & JUMP_ADDR)
 		sljit_unaligned_store_sw(code_ptr, (sljit_sw)(jump->u.target - (jump->addr + 4) - (sljit_uw)executable_offset));
+	else
+		jump->flags |= PATCH_MW;
 	code_ptr += 4;
 
 	return code_ptr;
@@ -314,8 +311,8 @@ static sljit_u8* generate_far_jump_code(struct sljit_jump *jump, sljit_u8 *code_
 #define ENTER_TMP_TO_S		0x00002
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
 	sljit_s32 word_arg_count, saved_arg_count, float_arg_count;
 	sljit_s32 size, args_size, types, status;
@@ -326,8 +323,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 #endif
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
 
 	/* Emit ENDBR32 at function entry if needed.  */
 	FAIL_IF(emit_endbranch(compiler));
@@ -539,14 +538,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
 	sljit_s32 args_size;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
 
 	arg_types >>= SLJIT_ARG_SHIFT;
 	args_size = 0;
@@ -1249,6 +1250,68 @@ static sljit_s32 sljit_emit_get_return_address(struct sljit_compiler *compiler,
 /*  Other operations                                                     */
 /* --------------------------------------------------------------------- */
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2_reg)
+{
+	sljit_s32 dst = dst_reg;
+	sljit_sw dstw = 0;
+	sljit_sw src2w = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_select(compiler, type, dst_reg, src1, src1w, src2_reg));
+
+	ADJUST_LOCAL_OFFSET(src1, src1w);
+
+	CHECK_EXTRA_REGS(dst, dstw, (void)0);
+	CHECK_EXTRA_REGS(src1, src1w, (void)0);
+	CHECK_EXTRA_REGS(src2_reg, src2w, (void)0);
+
+	type &= ~SLJIT_32;
+
+	if (dst & SLJIT_MEM) {
+		if (src1 == SLJIT_IMM || (!(src1 & SLJIT_MEM) && (src2_reg & SLJIT_MEM))) {
+			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
+			src1 = src2_reg;
+			src1w = src2w;
+			type ^= 0x1;
+		} else
+			EMIT_MOV(compiler, TMP_REG1, 0, src2_reg, src2w);
+
+		dst_reg = TMP_REG1;
+	} else {
+		if (dst_reg != src2_reg) {
+			if (dst_reg == src1) {
+				src1 = src2_reg;
+				src1w = src2w;
+				type ^= 0x1;
+			} else if (ADDRESSING_DEPENDS_ON(src1, dst_reg)) {
+				EMIT_MOV(compiler, dst_reg, 0, src1, src1w);
+				src1 = src2_reg;
+				src1w = src2w;
+				type ^= 0x1;
+			} else
+				EMIT_MOV(compiler, dst_reg, 0, src2_reg, src2w);
+		}
+	}
+
+	if (sljit_has_cpu_feature(SLJIT_HAS_CMOV) && (src1 != SLJIT_IMM || dst_reg != TMP_REG1)) {
+		if (SLJIT_UNLIKELY(src1 == SLJIT_IMM)) {
+			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
+			src1 = TMP_REG1;
+			src1w = 0;
+		}
+
+		FAIL_IF(emit_groupf(compiler, U8(get_jump_code((sljit_uw)type) - 0x40), dst_reg, src1, src1w));
+	} else
+		FAIL_IF(emit_cmov_generic(compiler, type, dst_reg, src1, src1w));
+
+	if (dst & SLJIT_MEM)
+		return emit_mov(compiler, dst, dstw, TMP_REG1, 0);
+	return SLJIT_SUCCESS;
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_mem(struct sljit_compiler *compiler, sljit_s32 type,
 	sljit_s32 reg,
 	sljit_s32 mem, sljit_sw memw)
@@ -1449,10 +1512,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fset32(struct sljit_compiler *comp
 
 	if (u.imm == 0) {
 		inst[2] = PXOR_x_xm;
-		inst[3] = U8(freg | (freg << 3) | MOD_REG);
+		inst[3] = U8(freg_map[freg] | (freg_map[freg] << 3) | MOD_REG);
 	} else {
 		inst[2] = MOVD_x_rm;
-		inst[3] = U8(reg_map[TMP_REG1] | (freg << 3) | MOD_REG);
+		inst[3] = U8(reg_map[TMP_REG1] | (freg_map[freg] << 3) | MOD_REG);
 	}
 
 	return SLJIT_SUCCESS;
@@ -1462,7 +1525,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fset64(struct sljit_compiler *comp
 	sljit_s32 freg, sljit_f64 value)
 {
 	sljit_u8 *inst;
-	sljit_s32 tmp_freg = freg;
 	union {
 		sljit_s32 imm[2];
 		sljit_f64 value;
@@ -1478,8 +1540,18 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fset64(struct sljit_compiler *comp
 			return emit_groupf(compiler, PXOR_x_xm | EX86_PREF_66 | EX86_SSE2, freg, freg, 0);
 
 		EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, u.imm[1]);
-	} else
+	} else {
+		SLJIT_ASSERT(cpu_feature_list != 0);
+
+		if (!(cpu_feature_list & CPU_FEATURE_SSE41) && u.imm[1] != 0 && u.imm[0] != u.imm[1]) {
+			EMIT_MOV(compiler, SLJIT_MEM1(SLJIT_SP), 0, SLJIT_IMM, u.imm[0]);
+			EMIT_MOV(compiler, SLJIT_MEM1(SLJIT_SP), sizeof(sljit_sw), SLJIT_IMM, u.imm[1]);
+
+			return emit_groupf(compiler, MOVLPD_x_m | EX86_SSE2, freg, SLJIT_MEM1(SLJIT_SP), 0);
+		}
+
 		EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, u.imm[0]);
+	}
 
 	FAIL_IF(emit_groupf(compiler, MOVD_x_rm | EX86_PREF_66 | EX86_SSE2_OP1, freg, TMP_REG1, 0));
 
@@ -1493,23 +1565,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fset64(struct sljit_compiler *comp
 
 		inst[0] = GROUP_0F;
 		inst[1] = SHUFPS_x_xm;
-		inst[2] = U8(MOD_REG | (freg << 3) | freg);
+		inst[2] = U8(MOD_REG | (freg_map[freg] << 3) | freg_map[freg]);
 		inst[3] = 0x51;
 		return SLJIT_SUCCESS;
 	}
 
 	if (u.imm[0] != u.imm[1]) {
-		SLJIT_ASSERT(u.imm[1] != 0 && cpu_feature_list != 0);
-
+		SLJIT_ASSERT(cpu_feature_list & CPU_FEATURE_SSE41);
 		EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, u.imm[1]);
 
-		if (cpu_feature_list & CPU_FEATURE_SSE41) {
-			FAIL_IF(emit_groupf_ext(compiler, PINSRD_x_rm_i8 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2_OP1, freg, TMP_REG1, 0));
-			return emit_byte(compiler, 1);
-		}
-
-		FAIL_IF(emit_groupf(compiler, MOVD_x_rm | EX86_PREF_66 | EX86_SSE2_OP1, TMP_FREG, TMP_REG1, 0));
-		tmp_freg = TMP_FREG;
+		FAIL_IF(emit_groupf_ext(compiler, PINSRD_x_rm_i8 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2_OP1, freg, TMP_REG1, 0));
+		return emit_byte(compiler, 1);
 	}
 
 	inst = (sljit_u8*)ensure_buf(compiler, 1 + 3);
@@ -1518,7 +1584,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fset64(struct sljit_compiler *comp
 
 	inst[0] = GROUP_0F;
 	inst[1] = UNPCKLPS_x_xm;
-	inst[2] = U8(MOD_REG | (freg << 3) | tmp_freg);
+	inst[2] = U8(MOD_REG | (freg_map[freg] << 3) | freg_map[freg]);
 	return SLJIT_SUCCESS;
 }
 
@@ -1581,7 +1647,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fcopy(struct sljit_compiler *compi
 		inst[0] = GROUP_66;
 		inst[1] = GROUP_0F;
 		inst[2] = PSHUFD_x_xm;
-		inst[3] = U8(MOD_REG | (TMP_FREG << 3) | freg);
+		inst[3] = U8(MOD_REG | (TMP_FREG << 3) | freg_map[freg]);
 		inst[4] = 1;
 	} else if (reg != 0)
 		FAIL_IF(emit_groupf(compiler, MOVD_x_rm | EX86_PREF_66 | EX86_SSE2_OP1, TMP_FREG, reg, regw));
@@ -1597,7 +1663,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fcopy(struct sljit_compiler *compi
 
 		inst[0] = GROUP_0F;
 		inst[1] = UNPCKLPS_x_xm;
-		inst[2] = U8(MOD_REG | (freg << 3) | (reg == 0 ? freg : TMP_FREG));
+		inst[2] = U8(MOD_REG | (freg_map[freg] << 3) | freg_map[reg == 0 ? freg : TMP_FREG]);
 	} else
 		FAIL_IF(emit_groupf(compiler, MOVD_rm_x | EX86_PREF_66 | EX86_SSE2_OP1, TMP_FREG, reg, regw));
 
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeX86_64.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_64.c
similarity index 89%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeX86_64.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_64.c
index f313f3f0..e4d3db82 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeX86_64.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_64.c
@@ -358,26 +358,28 @@ static sljit_s32 emit_vex_instruction(struct sljit_compiler *compiler, sljit_uw
 /*  Enter / return                                                       */
 /* --------------------------------------------------------------------- */
 
-static sljit_u8* generate_far_jump_code(struct sljit_jump *jump, sljit_u8 *code_ptr)
+static sljit_u8* detect_far_jump_type(struct sljit_jump *jump, sljit_u8 *code_ptr)
 {
 	sljit_uw type = jump->flags >> TYPE_SHIFT;
 
-	int short_addr = !(jump->flags & SLJIT_REWRITABLE_JUMP) && !(jump->flags & JUMP_LABEL) && (jump->u.target <= 0xffffffff);
+	int short_addr = !(jump->flags & SLJIT_REWRITABLE_JUMP) && (jump->flags & JUMP_ADDR) && (jump->u.target <= 0xffffffff);
 
 	/* The relative jump below specialized for this case. */
-	SLJIT_ASSERT(reg_map[TMP_REG2] >= 8);
+	SLJIT_ASSERT(reg_map[TMP_REG2] >= 8 && TMP_REG2 != SLJIT_TMP_DEST_REG);
 
 	if (type < SLJIT_JUMP) {
 		/* Invert type. */
-		*code_ptr++ = U8(get_jump_code(type ^ 0x1) - 0x10);
-		*code_ptr++ = short_addr ? (6 + 3) : (10 + 3);
+		code_ptr[0] = U8(get_jump_code(type ^ 0x1) - 0x10);
+		code_ptr[1] = short_addr ? (6 + 3) : (10 + 3);
+		code_ptr += 2;
 	}
 
-	*code_ptr++ = short_addr ? REX_B : (REX_W | REX_B);
-	*code_ptr++ = MOV_r_i32 | reg_lmap[TMP_REG2];
+	code_ptr[0] = short_addr ? REX_B : (REX_W | REX_B);
+	code_ptr[1] = MOV_r_i32 | reg_lmap[TMP_REG2];
+	code_ptr += 2;
 	jump->addr = (sljit_uw)code_ptr;
 
-	if (jump->flags & JUMP_LABEL)
+	if (!(jump->flags & JUMP_ADDR))
 		jump->flags |= PATCH_MD;
 	else if (short_addr)
 		sljit_unaligned_store_s32(code_ptr, (sljit_s32)jump->u.target);
@@ -386,60 +388,62 @@ static sljit_u8* generate_far_jump_code(struct sljit_jump *jump, sljit_u8 *code_
 
 	code_ptr += short_addr ? sizeof(sljit_s32) : sizeof(sljit_sw);
 
-	*code_ptr++ = REX_B;
-	*code_ptr++ = GROUP_FF;
-	*code_ptr++ = U8(MOD_REG | (type >= SLJIT_FAST_CALL ? CALL_rm : JMP_rm) | reg_lmap[TMP_REG2]);
+	code_ptr[0] = REX_B;
+	code_ptr[1] = GROUP_FF;
+	code_ptr[2] = U8(MOD_REG | (type >= SLJIT_FAST_CALL ? CALL_rm : JMP_rm) | reg_lmap[TMP_REG2]);
 
-	return code_ptr;
+	return code_ptr + 3;
 }
 
-static sljit_u8* generate_put_label_code(struct sljit_put_label *put_label, sljit_u8 *code_ptr, sljit_uw max_label)
+static sljit_u8* generate_mov_addr_code(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_u8 *code, sljit_sw executable_offset)
 {
-	if (max_label > HALFWORD_MAX) {
-		put_label->addr -= put_label->flags;
-		put_label->flags = PATCH_MD;
+	sljit_uw addr;
+	sljit_sw diff;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	SLJIT_ASSERT(((jump->flags >> JUMP_SIZE_SHIFT) & 0x1f) <= 10);
+	if (jump->flags & JUMP_ADDR)
+		addr = jump->u.target;
+	else
+		addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code, executable_offset) + jump->u.label->size;
+
+	if (addr > 0xffffffffl) {
+		diff = (sljit_sw)addr - (sljit_sw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+
+		if (diff <= HALFWORD_MAX && diff >= HALFWORD_MIN) {
+			SLJIT_ASSERT(((jump->flags >> JUMP_SIZE_SHIFT) & 0x1f) >= 7);
+			code_ptr -= SSIZE_OF(s32) - 1;
+
+			SLJIT_ASSERT((code_ptr[-3 - SSIZE_OF(s32)] & 0xf8) == REX_W);
+			SLJIT_ASSERT((code_ptr[-2 - SSIZE_OF(s32)] & 0xf8) == MOV_r_i32);
+
+			code_ptr[-3 - SSIZE_OF(s32)] = U8(REX_W | ((code_ptr[-3 - SSIZE_OF(s32)] & 0x1) << 2));
+			code_ptr[-1 - SSIZE_OF(s32)] = U8(((code_ptr[-2 - SSIZE_OF(s32)] & 0x7) << 3) | 0x5);
+			code_ptr[-2 - SSIZE_OF(s32)] = LEA_r_m;
+
+			jump->flags |= PATCH_MW;
+			return code_ptr;
+		}
+
+		jump->flags |= PATCH_MD;
 		return code_ptr;
 	}
 
-	if (put_label->flags == 0) {
-		/* Destination is register. */
-		code_ptr = (sljit_u8*)put_label->addr - 2 - sizeof(sljit_uw);
-
-		SLJIT_ASSERT((code_ptr[0] & 0xf8) == REX_W);
-		SLJIT_ASSERT((code_ptr[1] & 0xf8) == MOV_r_i32);
-
-		if ((code_ptr[0] & 0x07) != 0) {
-			code_ptr[0] = U8(code_ptr[0] & ~0x08);
-			code_ptr += 2 + sizeof(sljit_s32);
-		}
-		else {
-			code_ptr[0] = code_ptr[1];
-			code_ptr += 1 + sizeof(sljit_s32);
-		}
-
-		put_label->addr = (sljit_uw)code_ptr;
-		return code_ptr;
-	}
-
-	code_ptr -= put_label->flags + (2 + sizeof(sljit_uw));
-	SLJIT_MEMMOVE(code_ptr, code_ptr + (2 + sizeof(sljit_uw)), put_label->flags);
+	code_ptr -= 2 + sizeof(sljit_uw);
 
 	SLJIT_ASSERT((code_ptr[0] & 0xf8) == REX_W);
+	SLJIT_ASSERT((code_ptr[1] & 0xf8) == MOV_r_i32);
 
-	if ((code_ptr[1] & 0xf8) == MOV_r_i32) {
-		code_ptr += 2 + sizeof(sljit_uw);
-		SLJIT_ASSERT((code_ptr[0] & 0xf8) == REX_W);
+	if ((code_ptr[0] & 0x07) != 0) {
+		SLJIT_ASSERT(((jump->flags >> JUMP_SIZE_SHIFT) & 0x1f) >= 6);
+		code_ptr[0] = U8(code_ptr[0] & ~0x08);
+		code_ptr += 2 + sizeof(sljit_s32);
+	} else {
+		SLJIT_ASSERT(((jump->flags >> JUMP_SIZE_SHIFT) & 0x1f) >= 5);
+		code_ptr[0] = code_ptr[1];
+		code_ptr += 1 + sizeof(sljit_s32);
 	}
 
-	SLJIT_ASSERT(code_ptr[1] == MOV_rm_r);
-
-	code_ptr[0] = U8(code_ptr[0] & ~0x4);
-	code_ptr[1] = MOV_rm_i32;
-	code_ptr[2] = U8(code_ptr[2] & ~(0x7 << 3));
-
-	code_ptr = (sljit_u8*)(put_label->addr - (2 + sizeof(sljit_uw)) + sizeof(sljit_s32));
-	put_label->addr = (sljit_uw)code_ptr;
-	put_label->flags = 0;
 	return code_ptr;
 }
 
@@ -450,14 +454,16 @@ typedef struct {
 #endif /* _WIN64 */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
 	sljit_uw size;
 	sljit_s32 word_arg_count = 0;
 	sljit_s32 saved_arg_count = SLJIT_KEPT_SAVEDS_COUNT(options);
 	sljit_s32 saved_regs_size, tmp, i;
 #ifdef _WIN64
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 saved_float_regs_size;
 	sljit_s32 saved_float_regs_offset = 0;
 	sljit_s32 float_arg_count = 0;
@@ -465,8 +471,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 	sljit_u8 *inst;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
+#ifdef _WIN64
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
+#endif /* _WIN64 */
 
 	if (options & SLJIT_ENTER_REG_ARG)
 		arg_types = 0;
@@ -626,19 +639,27 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *compiler,
-	sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds,
-	sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size)
+	sljit_s32 options, sljit_s32 arg_types,
+	sljit_s32 scratches, sljit_s32 saveds, sljit_s32 local_size)
 {
 	sljit_s32 saved_regs_size;
 #ifdef _WIN64
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
 	sljit_s32 saved_float_regs_size;
 #endif /* _WIN64 */
 
 	CHECK_ERROR();
-	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size));
-	set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size);
+	CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, local_size));
+	set_emit_enter(compiler, options, arg_types, scratches, saveds, local_size);
+
+	scratches = ENTER_GET_REGS(scratches);
 
 #ifdef _WIN64
+	saveds = ENTER_GET_REGS(saveds);
+	fscratches = compiler->fscratches;
+	fsaveds = compiler->fsaveds;
+
 	local_size += SLJIT_LOCALS_OFFSET;
 	saved_float_regs_size = GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, sse2_reg);
 
@@ -1003,6 +1024,46 @@ static sljit_s32 sljit_emit_get_return_address(struct sljit_compiler *compiler,
 /*  Other operations                                                     */
 /* --------------------------------------------------------------------- */
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *compiler, sljit_s32 type,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2_reg)
+{
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_select(compiler, type, dst_reg, src1, src1w, src2_reg));
+
+	ADJUST_LOCAL_OFFSET(src1, src1w);
+
+	compiler->mode32 = type & SLJIT_32;
+	type &= ~SLJIT_32;
+
+	if (dst_reg != src2_reg) {
+		if (dst_reg == src1) {
+			src1 = src2_reg;
+			src1w = 0;
+			type ^= 0x1;
+		} else if (ADDRESSING_DEPENDS_ON(src1, dst_reg)) {
+			EMIT_MOV(compiler, dst_reg, 0, src1, src1w);
+			src1 = src2_reg;
+			src1w = 0;
+			type ^= 0x1;
+		} else
+			EMIT_MOV(compiler, dst_reg, 0, src2_reg, 0);
+	}
+
+	if (sljit_has_cpu_feature(SLJIT_HAS_CMOV)) {
+		if (SLJIT_UNLIKELY(src1 == SLJIT_IMM)) {
+			EMIT_MOV(compiler, TMP_REG2, 0, src1, src1w);
+			src1 = TMP_REG2;
+			src1w = 0;
+		}
+
+		return emit_groupf(compiler, U8(get_jump_code((sljit_uw)type) - 0x40), dst_reg, src1, src1w);
+	}
+
+	return emit_cmov_generic(compiler, type, dst_reg, src1, src1w);
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_mem(struct sljit_compiler *compiler, sljit_s32 type,
 	sljit_s32 reg,
 	sljit_s32 mem, sljit_sw memw)
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitNativeX86_common.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_common.c
similarity index 79%
rename from engine/thirdparty/pcre2/src/sljit/sljitNativeX86_common.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_common.c
index c2c04213..9f599d5f 100644
--- a/engine/thirdparty/pcre2/src/sljit/sljitNativeX86_common.c
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitNativeX86_common.c
@@ -24,12 +24,6 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(__has_feature)
-#if __has_feature(memory_sanitizer)
-#include <sanitizer/msan_interface.h>
-#endif /* __has_feature(memory_sanitizer) */
-#endif /* defined(__has_feature) */
-
 SLJIT_API_FUNC_ATTRIBUTE const char* sljit_get_platform_name(void)
 {
 	return "x86" SLJIT_CPUINFO;
@@ -72,7 +66,6 @@ SLJIT_API_FUNC_ATTRIBUTE const char* sljit_get_platform_name(void)
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 
-
 static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 3] = {
 	0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 5, 7, 6, 4, 3
 };
@@ -246,6 +239,7 @@ static const sljit_u8 freg_lmap[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2] = {
 #define MOVDDUP_x_xm		0x12
 #define MOVDQA_x_xm		0x6f
 #define MOVDQA_xm_x		0x7f
+#define MOVDQU_x_xm		0x6f
 #define MOVHLPS_x_x		0x12
 #define MOVHPD_m_x		0x17
 #define MOVHPD_x_m		0x16
@@ -379,6 +373,11 @@ static const sljit_u8 freg_lmap[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2] = {
 #define RET()			(*inst++ = RET_near)
 #define RET_I16(n)		(*inst++ = RET_i16, *inst++ = U8(n), *inst++ = 0)
 
+#define SLJIT_INST_LABEL	255
+#define SLJIT_INST_JUMP		254
+#define SLJIT_INST_MOV_ADDR	253
+#define SLJIT_INST_CONST	252
+
 /* Multithreading does not affect these static variables, since they store
    built-in CPU features. Therefore they can be overwritten by different threads
    if they detect the CPU features in the same time. */
@@ -392,6 +391,7 @@ static const sljit_u8 freg_lmap[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2] = {
 #define CPU_FEATURE_CMOV		0x020
 #define CPU_FEATURE_AVX			0x040
 #define CPU_FEATURE_AVX2		0x080
+#define CPU_FEATURE_OSXSAVE		0x100
 
 static sljit_u32 cpu_feature_list = 0;
 
@@ -399,6 +399,13 @@ static sljit_u32 cpu_feature_list = 0;
 #include <cmnintrin.h>
 #elif defined(_MSC_VER) && _MSC_VER >= 1400
 #include <intrin.h>
+#elif defined(__INTEL_COMPILER)
+#include <cpuid.h>
+#endif
+
+#if (defined(_MSC_VER) && _MSC_VER >= 1400) || defined(__INTEL_COMPILER) \
+	|| (defined(__INTEL_LLVM_COMPILER) && defined(__XSAVE__))
+#include <immintrin.h>
 #endif
 
 /******************************************************/
@@ -426,49 +433,20 @@ static SLJIT_INLINE void sljit_unaligned_store_sw(void *addr, sljit_sw value)
 
 static void execute_cpu_id(sljit_u32 info[4])
 {
-#if defined(_MSC_VER) && _MSC_VER >= 1400
+#if (defined(_MSC_VER) && _MSC_VER >= 1400) \
+	|| (defined(__INTEL_COMPILER) && __INTEL_COMPILER == 2021 && __INTEL_COMPILER_UPDATE >= 7)
 
 	__cpuidex((int*)info, (int)info[0], (int)info[2]);
 
-#elif defined(__GNUC__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__TINYC__)
+#elif (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900)
 
-	/* AT&T syntax. */
-	__asm__ (
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		"movl %0, %%esi\n"
-		"movl (%%esi), %%eax\n"
-		"movl 8(%%esi), %%ecx\n"
-		"pushl %%ebx\n"
-		"cpuid\n"
-		"movl %%eax, (%%esi)\n"
-		"movl %%ebx, 4(%%esi)\n"
-		"popl %%ebx\n"
-		"movl %%ecx, 8(%%esi)\n"
-		"movl %%edx, 12(%%esi)\n"
-#else /* !SLJIT_CONFIG_X86_32 */
-		"movq %0, %%rsi\n"
-		"movl (%%rsi), %%eax\n"
-		"movl 8(%%rsi), %%ecx\n"
-		"cpuid\n"
-		"movl %%eax, (%%rsi)\n"
-		"movl %%ebx, 4(%%rsi)\n"
-		"movl %%ecx, 8(%%rsi)\n"
-		"movl %%edx, 12(%%rsi)\n"
-#endif /* SLJIT_CONFIG_X86_32 */
-		:
-		: "r" (info)
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		: "memory", "eax", "ecx", "edx", "esi"
-#else /* !SLJIT_CONFIG_X86_32 */
-		: "memory", "rax", "rbx", "rcx", "rdx", "rsi"
-#endif /* SLJIT_CONFIG_X86_32 */
-	);
+	__get_cpuid_count(info[0], info[2], info, info + 1, info + 2, info + 3);
 
-#else /* _MSC_VER < 1400 */
+#elif (defined(_MSC_VER) || defined(__INTEL_COMPILER)) \
+	&& (defined(SLJIT_CONFIG_X86_32) && SLJIT_CONFIG_X86_32)
 
 	/* Intel syntax. */
 	__asm {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 		mov esi, info
 		mov eax, [esi]
 		mov ecx, [esi + 8]
@@ -477,35 +455,95 @@ static void execute_cpu_id(sljit_u32 info[4])
 		mov [esi + 4], ebx
 		mov [esi + 8], ecx
 		mov [esi + 12], edx
-#else /* !SLJIT_CONFIG_X86_32 */
-		mov rsi, info
-		mov eax, [rsi]
-		mov ecx, [rsi + 8]
-		cpuid
-		mov [rsi], eax
-		mov [rsi + 4], ebx
-		mov [rsi + 8], ecx
-		mov [rsi + 12], edx
-#endif /* SLJIT_CONFIG_X86_32 */
 	}
 
-#endif /* _MSC_VER && _MSC_VER >= 1400 */
+#else
 
-#if defined(__has_feature)
-#if __has_feature(memory_sanitizer)
-__msan_unpoison(info, 4 * sizeof(sljit_u32));
-#endif /* __has_feature(memory_sanitizer) */
-#endif /* defined(__has_feature) */
+	__asm__ __volatile__ (
+		"cpuid\n"
+		: "=a" (info[0]), "=b" (info[1]), "=c" (info[2]), "=d" (info[3])
+		: "0" (info[0]), "2" (info[2])
+	);
 
+#endif
+}
+
+static sljit_u32 execute_get_xcr0_low(void)
+{
+	sljit_u32 xcr0;
+
+#if (defined(_MSC_VER) && _MSC_VER >= 1400) || defined(__INTEL_COMPILER) \
+	|| (defined(__INTEL_LLVM_COMPILER) && defined(__XSAVE__))
+
+	xcr0 = (sljit_u32)_xgetbv(0);
+
+#elif defined(__TINYC__)
+
+	__asm__ (
+		"xorl %%ecx, %%ecx\n"
+		".byte 0x0f\n"
+		".byte 0x01\n"
+		".byte 0xd0\n"
+		: "=a" (xcr0)
+		:
+#if defined(SLJIT_CONFIG_X86_32) && SLJIT_CONFIG_X86_32
+		: "ecx", "edx"
+#else /* !SLJIT_CONFIG_X86_32 */
+		: "rcx", "rdx"
+#endif /* SLJIT_CONFIG_X86_32 */
+	);
+
+#elif (defined(__INTEL_LLVM_COMPILER) && __INTEL_LLVM_COMPILER < 20220100) \
+	|| (defined(__clang__) && __clang_major__ < 14) \
+	|| (defined(__GNUC__) && __GNUC__ < 3) \
+	|| defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+
+	/* AT&T syntax. */
+	__asm__ (
+		"xorl %%ecx, %%ecx\n"
+		"xgetbv\n"
+		: "=a" (xcr0)
+		:
+#if defined(SLJIT_CONFIG_X86_32) && SLJIT_CONFIG_X86_32
+		: "ecx", "edx"
+#else /* !SLJIT_CONFIG_X86_32 */
+		: "rcx", "rdx"
+#endif /* SLJIT_CONFIG_X86_32 */
+	);
+
+#elif defined(_MSC_VER)
+
+	/* Intel syntax. */
+	__asm {
+		xor ecx, ecx
+		xgetbv
+		mov xcr0, eax
+	}
+
+#else
+
+	__asm__ (
+		"xor{l %%ecx, %%ecx | ecx, ecx}\n"
+		"xgetbv\n"
+		: "=a" (xcr0)
+		:
+#if defined(SLJIT_CONFIG_X86_32) && SLJIT_CONFIG_X86_32
+		: "ecx", "edx"
+#else /* !SLJIT_CONFIG_X86_32 */
+		: "rcx", "rdx"
+#endif /* SLJIT_CONFIG_X86_32 */
+	);
+
+#endif
+	return xcr0;
 }
 
 static void get_cpu_features(void)
 {
 	sljit_u32 feature_list = CPU_FEATURE_DETECTED;
-	sljit_u32 info[4];
+	sljit_u32 info[4] = {0};
 	sljit_u32 max_id;
 
-	info[0] = 0;
 	execute_cpu_id(info);
 	max_id = info[0];
 
@@ -522,10 +560,16 @@ static void get_cpu_features(void)
 
 	if (max_id >= 1) {
 		info[0] = 1;
+#if defined(SLJIT_CONFIG_X86_32) && SLJIT_CONFIG_X86_32
+		/* Winchip 2 and Cyrix MII bugs */
+		info[1] = info[2] = 0;
+#endif
 		execute_cpu_id(info);
 
 		if (info[2] & 0x80000)
 			feature_list |= CPU_FEATURE_SSE41;
+		if (info[2] & 0x8000000)
+			feature_list |= CPU_FEATURE_OSXSAVE;
 		if (info[2] & 0x10000000)
 			feature_list |= CPU_FEATURE_AVX;
 #if (defined SLJIT_DETECT_SSE2 && SLJIT_DETECT_SSE2)
@@ -536,12 +580,20 @@ static void get_cpu_features(void)
 			feature_list |= CPU_FEATURE_CMOV;
 	}
 
-	info[0] = 0x80000001;
-	info[2] = 0; /* Silences an incorrect compiler warning. */
+	info[0] = 0x80000000;
 	execute_cpu_id(info);
+	max_id = info[0];
 
-	if (info[2] & 0x20)
-		feature_list |= CPU_FEATURE_LZCNT;
+	if (max_id >= 0x80000001) {
+		info[0] = 0x80000001;
+		execute_cpu_id(info);
+
+		if (info[2] & 0x20)
+			feature_list |= CPU_FEATURE_LZCNT;
+	}
+
+	if ((feature_list & CPU_FEATURE_OSXSAVE) && (execute_get_xcr0_low() & 0x4) == 0)
+		feature_list &= ~(sljit_u32)(CPU_FEATURE_AVX | CPU_FEATURE_AVX2);
 
 	cpu_feature_list = feature_list;
 }
@@ -617,52 +669,52 @@ static sljit_u8 get_jump_code(sljit_uw type)
 }
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-static sljit_u8* generate_far_jump_code(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_sw executable_offset);
-#else
-static sljit_u8* generate_far_jump_code(struct sljit_jump *jump, sljit_u8 *code_ptr);
-static sljit_u8* generate_put_label_code(struct sljit_put_label *put_label, sljit_u8 *code_ptr, sljit_uw max_label);
-#endif
+static sljit_u8* detect_far_jump_type(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_sw executable_offset);
+#else /* !SLJIT_CONFIG_X86_32 */
+static sljit_u8* detect_far_jump_type(struct sljit_jump *jump, sljit_u8 *code_ptr);
+static sljit_u8* generate_mov_addr_code(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_u8 *code, sljit_sw executable_offset);
+#endif /* SLJIT_CONFIG_X86_32 */
 
-static sljit_u8* generate_near_jump_code(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_u8 *code, sljit_sw executable_offset)
+static sljit_u8* detect_near_jump_type(struct sljit_jump *jump, sljit_u8 *code_ptr, sljit_u8 *code, sljit_sw executable_offset)
 {
 	sljit_uw type = jump->flags >> TYPE_SHIFT;
 	sljit_s32 short_jump;
 	sljit_uw label_addr;
+	sljit_uw jump_addr;
 
-	if (jump->flags & JUMP_LABEL)
+	jump_addr = (sljit_uw)code_ptr;
+	if (!(jump->flags & JUMP_ADDR)) {
 		label_addr = (sljit_uw)(code + jump->u.label->size);
-	else
+
+		if (jump->u.label->size > jump->addr)
+			jump_addr = (sljit_uw)(code + jump->addr);
+	} else
 		label_addr = jump->u.target - (sljit_uw)executable_offset;
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if ((sljit_sw)(label_addr - (jump->addr + 2)) > HALFWORD_MAX || (sljit_sw)(label_addr - (jump->addr + 6)) < HALFWORD_MIN)
-		return generate_far_jump_code(jump, code_ptr);
-#endif
+	if ((sljit_sw)(label_addr - (jump_addr + 6)) > HALFWORD_MAX || (sljit_sw)(label_addr - (jump_addr + 5)) < HALFWORD_MIN)
+		return detect_far_jump_type(jump, code_ptr);
+#endif /* SLJIT_CONFIG_X86_64 */
 
-	short_jump = (sljit_sw)(label_addr - (jump->addr + 2)) >= -128 && (sljit_sw)(label_addr - (jump->addr + 2)) <= 127;
+	short_jump = (sljit_sw)(label_addr - (jump_addr + 2)) >= -0x80 && (sljit_sw)(label_addr - (jump_addr + 2)) <= 0x7f;
 
 	if (type == SLJIT_JUMP) {
 		if (short_jump)
 			*code_ptr++ = JMP_i8;
 		else
 			*code_ptr++ = JMP_i32;
-		jump->addr++;
-	}
-	else if (type >= SLJIT_FAST_CALL) {
+	} else if (type > SLJIT_JUMP) {
 		short_jump = 0;
 		*code_ptr++ = CALL_i32;
-		jump->addr++;
-	}
-	else if (short_jump) {
+	} else if (short_jump) {
 		*code_ptr++ = U8(get_jump_code(type) - 0x10);
-		jump->addr++;
-	}
-	else {
+	} else {
 		*code_ptr++ = GROUP_0F;
 		*code_ptr++ = get_jump_code(type);
-		jump->addr += 2;
 	}
 
+	jump->addr = (sljit_uw)code_ptr;
+
 	if (short_jump) {
 		jump->flags |= PATCH_MB;
 		code_ptr += sizeof(sljit_s8);
@@ -674,7 +726,177 @@ static sljit_u8* generate_near_jump_code(struct sljit_jump *jump, sljit_u8 *code
 	return code_ptr;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler)
+static void generate_jump_or_mov_addr(struct sljit_jump *jump, sljit_sw executable_offset)
+{
+	sljit_uw flags = jump->flags;
+	sljit_uw addr = (flags & JUMP_ADDR) ? jump->u.target : jump->u.label->u.addr;
+	sljit_uw jump_addr = jump->addr;
+	SLJIT_UNUSED_ARG(executable_offset);
+
+	if (SLJIT_UNLIKELY(flags & JUMP_MOV_ADDR)) {
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
+		sljit_unaligned_store_sw((void*)(jump_addr - sizeof(sljit_sw)), (sljit_sw)addr);
+#else /* SLJIT_CONFIG_X86_32 */
+		if (flags & PATCH_MD) {
+			SLJIT_ASSERT(addr > HALFWORD_MAX);
+			sljit_unaligned_store_sw((void*)(jump_addr - sizeof(sljit_sw)), (sljit_sw)addr);
+			return;
+		}
+
+		if (flags & PATCH_MW) {
+			addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET((sljit_u8*)jump_addr, executable_offset);
+			SLJIT_ASSERT((sljit_sw)addr <= HALFWORD_MAX && (sljit_sw)addr >= HALFWORD_MIN);
+		} else {
+			SLJIT_ASSERT(addr <= HALFWORD_MAX);
+		}
+		sljit_unaligned_store_s32((void*)(jump_addr - sizeof(sljit_s32)), (sljit_s32)addr);
+#endif /* !SLJIT_CONFIG_X86_32 */
+		return;
+	}
+
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+	if (SLJIT_UNLIKELY(flags & PATCH_MD)) {
+		SLJIT_ASSERT(!(flags & JUMP_ADDR));
+		sljit_unaligned_store_sw((void*)jump_addr, (sljit_sw)addr);
+		return;
+	}
+#endif /* SLJIT_CONFIG_X86_64 */
+
+	addr -= (sljit_uw)SLJIT_ADD_EXEC_OFFSET((sljit_u8*)jump_addr, executable_offset);
+
+	if (flags & PATCH_MB) {
+		addr -= sizeof(sljit_s8);
+		SLJIT_ASSERT((sljit_sw)addr <= 0x7f && (sljit_sw)addr >= -0x80);
+		*(sljit_u8*)jump_addr = U8(addr);
+		return;
+	} else if (flags & PATCH_MW) {
+		addr -= sizeof(sljit_s32);
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
+		sljit_unaligned_store_sw((void*)jump_addr, (sljit_sw)addr);
+#else /* !SLJIT_CONFIG_X86_32 */
+		SLJIT_ASSERT((sljit_sw)addr <= HALFWORD_MAX && (sljit_sw)addr >= HALFWORD_MIN);
+		sljit_unaligned_store_s32((void*)jump_addr, (sljit_s32)addr);
+#endif /* SLJIT_CONFIG_X86_32 */
+	}
+}
+
+static void reduce_code_size(struct sljit_compiler *compiler)
+{
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	sljit_uw next_label_size;
+	sljit_uw next_jump_addr;
+	sljit_uw next_min_addr;
+	sljit_uw size_reduce = 0;
+	sljit_sw diff;
+	sljit_uw type;
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	sljit_uw size_reduce_max;
+#endif /* SLJIT_DEBUG */
+
+	label = compiler->labels;
+	jump = compiler->jumps;
+
+	next_label_size = SLJIT_GET_NEXT_SIZE(label);
+	next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+
+	while (1) {
+		next_min_addr = next_label_size;
+		if (next_jump_addr < next_min_addr)
+			next_min_addr = next_jump_addr;
+
+		if (next_min_addr == SLJIT_MAX_ADDRESS)
+			break;
+
+		if (next_min_addr == next_label_size) {
+			label->size -= size_reduce;
+
+			label = label->next;
+			next_label_size = SLJIT_GET_NEXT_SIZE(label);
+		}
+
+		if (next_min_addr != next_jump_addr)
+			continue;
+
+		jump->addr -= size_reduce;
+		if (!(jump->flags & JUMP_MOV_ADDR)) {
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+			size_reduce_max = size_reduce + (((jump->flags >> TYPE_SHIFT) < SLJIT_JUMP) ? CJUMP_MAX_SIZE : JUMP_MAX_SIZE);
+#endif /* SLJIT_DEBUG */
+
+			if (!(jump->flags & SLJIT_REWRITABLE_JUMP)) {
+				if (jump->flags & JUMP_ADDR) {
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+					if (jump->u.target <= 0xffffffffl)
+						size_reduce += sizeof(sljit_s32);
+#endif /* SLJIT_CONFIG_X86_64 */
+				} else {
+					/* Unit size: instruction. */
+					diff = (sljit_sw)jump->u.label->size - (sljit_sw)jump->addr;
+					if (jump->u.label->size > jump->addr) {
+						SLJIT_ASSERT(jump->u.label->size - size_reduce >= jump->addr);
+						diff -= (sljit_sw)size_reduce;
+					}
+					type = jump->flags >> TYPE_SHIFT;
+
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+					if (type == SLJIT_JUMP) {
+						if (diff <= 0x7f + 2 && diff >= -0x80 + 2)
+							size_reduce += JUMP_MAX_SIZE - 2;
+						else if (diff <= HALFWORD_MAX + 5 && diff >= HALFWORD_MIN + 5)
+							size_reduce += JUMP_MAX_SIZE - 5;
+					} else if (type < SLJIT_JUMP) {
+						if (diff <= 0x7f + 2 && diff >= -0x80 + 2)
+							size_reduce += CJUMP_MAX_SIZE - 2;
+						else if (diff <= HALFWORD_MAX + 6 && diff >= HALFWORD_MIN + 6)
+							size_reduce += CJUMP_MAX_SIZE - 6;
+					} else  {
+						if (diff <= HALFWORD_MAX + 5 && diff >= HALFWORD_MIN + 5)
+							size_reduce += JUMP_MAX_SIZE - 5;
+					}
+#else /* !SLJIT_CONFIG_X86_64 */
+					if (type == SLJIT_JUMP) {
+						if (diff <= 0x7f + 2 && diff >= -0x80 + 2)
+							size_reduce += JUMP_MAX_SIZE - 2;
+					} else if (type < SLJIT_JUMP) {
+						if (diff <= 0x7f + 2 && diff >= -0x80 + 2)
+							size_reduce += CJUMP_MAX_SIZE - 2;
+					}
+#endif /* SLJIT_CONFIG_X86_64 */
+				}
+			}
+
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+			jump->flags |= (size_reduce_max - size_reduce) << JUMP_SIZE_SHIFT;
+#endif /* SLJIT_DEBUG */
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+		} else {
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+			size_reduce_max = size_reduce + 10;
+#endif /* SLJIT_DEBUG */
+
+			if (!(jump->flags & JUMP_ADDR)) {
+				diff = (sljit_sw)jump->u.label->size - (sljit_sw)(jump->addr - 3);
+
+				if (diff <= HALFWORD_MAX && diff >= HALFWORD_MIN)
+					size_reduce += 3;
+			} else if (jump->u.target <= 0xffffffffl)
+				size_reduce += (jump->flags & MOV_ADDR_HI) ? 4 : 5;
+
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+			jump->flags |= (size_reduce_max - size_reduce) << JUMP_SIZE_SHIFT;
+#endif /* SLJIT_DEBUG */
+#endif /* SLJIT_CONFIG_X86_64 */
+		}
+
+		jump = jump->next;
+		next_jump_addr = SLJIT_GET_NEXT_ADDRESS(jump);
+	}
+
+	compiler->size -= size_reduce;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compiler, sljit_s32 options, void *exec_allocator_data)
 {
 	struct sljit_memory_fragment *buf;
 	sljit_u8 *code;
@@ -683,77 +905,82 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	sljit_u8 *buf_end;
 	sljit_u8 len;
 	sljit_sw executable_offset;
-	sljit_uw jump_addr;
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	sljit_uw addr;
+#endif /* SLJIT_DEBUG */
 
 	struct sljit_label *label;
 	struct sljit_jump *jump;
 	struct sljit_const *const_;
-	struct sljit_put_label *put_label;
 
 	CHECK_ERROR_PTR();
 	CHECK_PTR(check_sljit_generate_code(compiler));
-	reverse_buf(compiler);
+
+	reduce_code_size(compiler);
 
 	/* Second code generation pass. */
-	code = (sljit_u8*)SLJIT_MALLOC_EXEC(compiler->size, compiler->exec_allocator_data);
+	code = (sljit_u8*)allocate_executable_memory(compiler->size, options, exec_allocator_data, &executable_offset);
 	PTR_FAIL_WITH_EXEC_IF(code);
+
+	reverse_buf(compiler);
 	buf = compiler->buf;
 
 	code_ptr = code;
 	label = compiler->labels;
 	jump = compiler->jumps;
 	const_ = compiler->consts;
-	put_label = compiler->put_labels;
-	executable_offset = SLJIT_EXEC_OFFSET(code);
 
 	do {
 		buf_ptr = buf->memory;
 		buf_end = buf_ptr + buf->used_size;
 		do {
 			len = *buf_ptr++;
-			if (len > 0) {
+			SLJIT_ASSERT(len > 0);
+			if (len < SLJIT_INST_CONST) {
 				/* The code is already generated. */
 				SLJIT_MEMCPY(code_ptr, buf_ptr, len);
 				code_ptr += len;
 				buf_ptr += len;
-			}
-			else {
-				switch (*buf_ptr) {
-				case 0:
-					label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
+			} else {
+				switch (len) {
+				case SLJIT_INST_LABEL:
+					label->u.addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset);
 					label->size = (sljit_uw)(code_ptr - code);
 					label = label->next;
 					break;
-				case 1:
-					jump->addr = (sljit_uw)code_ptr;
+				case SLJIT_INST_JUMP:
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+					addr = (sljit_uw)code_ptr;
+#endif /* SLJIT_DEBUG */
 					if (!(jump->flags & SLJIT_REWRITABLE_JUMP))
-						code_ptr = generate_near_jump_code(jump, code_ptr, code, executable_offset);
+						code_ptr = detect_near_jump_type(jump, code_ptr, code, executable_offset);
 					else {
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-						code_ptr = generate_far_jump_code(jump, code_ptr, executable_offset);
-#else
-						code_ptr = generate_far_jump_code(jump, code_ptr);
-#endif
+						code_ptr = detect_far_jump_type(jump, code_ptr, executable_offset);
+#else /* !SLJIT_CONFIG_X86_32 */
+						code_ptr = detect_far_jump_type(jump, code_ptr);
+#endif /* SLJIT_CONFIG_X86_32 */
 					}
+
+					SLJIT_ASSERT((sljit_uw)code_ptr - addr <= ((jump->flags >> JUMP_SIZE_SHIFT) & 0x1f));
 					jump = jump->next;
 					break;
-				case 2:
+				case SLJIT_INST_MOV_ADDR:
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+					code_ptr = generate_mov_addr_code(jump, code_ptr, code, executable_offset);
+#endif /* SLJIT_CONFIG_X86_64 */
+					jump->addr = (sljit_uw)code_ptr;
+					jump = jump->next;
+					break;
+				default:
+					SLJIT_ASSERT(len == SLJIT_INST_CONST);
 					const_->addr = ((sljit_uw)code_ptr) - sizeof(sljit_sw);
 					const_ = const_->next;
 					break;
-				default:
-					SLJIT_ASSERT(*buf_ptr == 3);
-					SLJIT_ASSERT(put_label->label);
-					put_label->addr = (sljit_uw)code_ptr;
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-					code_ptr = generate_put_label_code(put_label, code_ptr, (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code, executable_offset) + put_label->label->size);
-#endif
-					put_label = put_label->next;
-					break;
 				}
-				buf_ptr++;
 			}
 		} while (buf_ptr < buf_end);
+
 		SLJIT_ASSERT(buf_ptr == buf_end);
 		buf = buf->next;
 	} while (buf);
@@ -761,61 +988,14 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil
 	SLJIT_ASSERT(!label);
 	SLJIT_ASSERT(!jump);
 	SLJIT_ASSERT(!const_);
-	SLJIT_ASSERT(!put_label);
 	SLJIT_ASSERT(code_ptr <= code + compiler->size);
 
 	jump = compiler->jumps;
 	while (jump) {
-		if (jump->flags & (PATCH_MB | PATCH_MW)) {
-			if (jump->flags & JUMP_LABEL)
-				jump_addr = jump->u.label->addr;
-			else
-				jump_addr = jump->u.target;
-
-			jump_addr -= jump->addr + (sljit_uw)executable_offset;
-
-			if (jump->flags & PATCH_MB) {
-				jump_addr -= sizeof(sljit_s8);
-				SLJIT_ASSERT((sljit_sw)jump_addr >= -128 && (sljit_sw)jump_addr <= 127);
-				*(sljit_u8*)jump->addr = U8(jump_addr);
-			} else {
-				jump_addr -= sizeof(sljit_s32);
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-				sljit_unaligned_store_sw((void*)jump->addr, (sljit_sw)jump_addr);
-#else
-				SLJIT_ASSERT((sljit_sw)jump_addr >= HALFWORD_MIN && (sljit_sw)jump_addr <= HALFWORD_MAX);
-				sljit_unaligned_store_s32((void*)jump->addr, (sljit_s32)jump_addr);
-#endif
-			}
-		}
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-		else if (jump->flags & PATCH_MD) {
-				SLJIT_ASSERT(jump->flags & JUMP_LABEL);
-				sljit_unaligned_store_sw((void*)jump->addr, (sljit_sw)jump->u.label->addr);
-		}
-#endif
-
+		generate_jump_or_mov_addr(jump, executable_offset);
 		jump = jump->next;
 	}
 
-	put_label = compiler->put_labels;
-	while (put_label) {
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		sljit_unaligned_store_sw((void*)(put_label->addr - sizeof(sljit_sw)), (sljit_sw)put_label->label->addr);
-#else
-		if (put_label->flags & PATCH_MD) {
-			SLJIT_ASSERT(put_label->label->addr > HALFWORD_MAX);
-			sljit_unaligned_store_sw((void*)(put_label->addr - sizeof(sljit_sw)), (sljit_sw)put_label->label->addr);
-		}
-		else {
-			SLJIT_ASSERT(put_label->label->addr <= HALFWORD_MAX);
-			sljit_unaligned_store_s32((void*)(put_label->addr - sizeof(sljit_s32)), (sljit_s32)put_label->label->addr);
-		}
-#endif
-
-		put_label = put_label->next;
-	}
-
 	compiler->error = SLJIT_ERR_COMPILED;
 	compiler->executable_offset = executable_offset;
 	compiler->executable_size = (sljit_uw)(code_ptr - code);
@@ -868,6 +1048,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_COPY_F32:
 	case SLJIT_HAS_COPY_F64:
 	case SLJIT_HAS_ATOMIC:
+	case SLJIT_HAS_MEMORY_BARRIER:
 		return 1;
 
 #if !(defined SLJIT_IS_FPU_AVAILABLE) || SLJIT_IS_FPU_AVAILABLE
@@ -921,8 +1102,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_cmp_info(sljit_s32 type)
 			BINARY_IMM32(op_imm, immw, arg, argw); \
 		} \
 		else { \
-			FAIL_IF(emit_load_imm64(compiler, (arg == TMP_REG1) ? TMP_REG2 : TMP_REG1, immw)); \
-			inst = emit_x86_instruction(compiler, 1, (arg == TMP_REG1) ? TMP_REG2 : TMP_REG1, 0, arg, argw); \
+			FAIL_IF(emit_load_imm64(compiler, FAST_IS_REG(arg) ? TMP_REG2 : TMP_REG1, immw)); \
+			inst = emit_x86_instruction(compiler, 1, FAST_IS_REG(arg) ? TMP_REG2 : TMP_REG1, 0, arg, argw); \
 			FAIL_IF(!inst); \
 			*inst = (op_mr); \
 		} \
@@ -1327,6 +1508,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile
 			EMIT_MOV(compiler, SLJIT_R1, 0, TMP_REG1, 0);
 #endif
 		break;
+	case SLJIT_MEMORY_BARRIER:
+		inst = (sljit_u8*)ensure_buf(compiler, 1 + 3);
+		FAIL_IF(!inst);
+		INC_SIZE(3);
+		inst[0] = GROUP_0F;
+		inst[1] = 0xae;
+		inst[2] = 0xf0;
+		return SLJIT_SUCCESS;
 	case SLJIT_ENDBR:
 		return emit_endbranch(compiler);
 	case SLJIT_SKIP_FRAMES_BEFORE_RETURN:
@@ -2248,10 +2437,9 @@ static sljit_s32 emit_test_binary(struct sljit_compiler *compiler,
 				inst = emit_x86_instruction(compiler, 1, SLJIT_IMM, src2w, src1, src1w);
 				FAIL_IF(!inst);
 				*inst = GROUP_F7;
-			}
-			else {
-				FAIL_IF(emit_load_imm64(compiler, TMP_REG1, src2w));
-				inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, src1, src1w);
+			} else {
+				FAIL_IF(emit_load_imm64(compiler, FAST_IS_REG(src1) ? TMP_REG2 : TMP_REG1, src2w));
+				inst = emit_x86_instruction(compiler, 1, FAST_IS_REG(src1) ? TMP_REG2 : TMP_REG1, 0, src1, src1w);
 				FAIL_IF(!inst);
 				*inst = TEST_rm_r;
 			}
@@ -2488,8 +2676,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 	compiler->mode32 = op & SLJIT_32;
 #endif
 
-	SLJIT_ASSERT(dst != TMP_REG1 || HAS_FLAGS(op));
-
 	switch (GET_OPCODE(op)) {
 	case SLJIT_ADD:
 		if (!HAS_FLAGS(op)) {
@@ -2583,12 +2769,44 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2u(struct sljit_compiler *compil
 	compiler->mode32 = op & SLJIT_32;
 #endif
 
-	if (opcode == SLJIT_SUB) {
+	if (opcode == SLJIT_SUB)
 		return emit_cmp_binary(compiler, src1, src1w, src2, src2w);
-	}
+
 	return emit_test_binary(compiler, src1, src1w, src2, src2w);
 }
 
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2r(struct sljit_compiler *compiler, sljit_s32 op,
+	sljit_s32 dst_reg,
+	sljit_s32 src1, sljit_sw src1w,
+	sljit_s32 src2, sljit_sw src2w)
+{
+	sljit_u8* inst;
+	sljit_sw dstw = 0;
+
+	CHECK_ERROR();
+	CHECK(check_sljit_emit_op2r(compiler, op, dst_reg, src1, src1w, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src1, src1w);
+	ADJUST_LOCAL_OFFSET(src2, src2w);
+
+	CHECK_EXTRA_REGS(dst_reg, dstw, (void)0);
+	CHECK_EXTRA_REGS(src1, src1w, (void)0);
+	CHECK_EXTRA_REGS(src2, src2w, (void)0);
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+	compiler->mode32 = op & SLJIT_32;
+#endif
+
+	switch (GET_OPCODE(op)) {
+	case SLJIT_MULADD:
+		FAIL_IF(emit_mul(compiler, TMP_REG1, 0, src1, src1w, src2, src2w));
+		inst = emit_x86_instruction(compiler, 1, TMP_REG1, 0, dst_reg, dstw);
+		FAIL_IF(!inst);
+		*inst = ADD_rm_r;
+		return SLJIT_SUCCESS;
+	}
+
+	return SLJIT_SUCCESS;
+}
+
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_shift_into(struct sljit_compiler *compiler, sljit_s32 op,
 	sljit_s32 dst_reg,
 	sljit_s32 src1_reg,
@@ -3117,19 +3335,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 		dst_r = dst;
 		if (dst == src1)
 			; /* Do nothing here. */
-		else if (dst == src2 && (op == SLJIT_ADD_F64 || op == SLJIT_MUL_F64)) {
+		else if (dst == src2 && (GET_OPCODE(op) == SLJIT_ADD_F64 || GET_OPCODE(op) == SLJIT_MUL_F64)) {
 			/* Swap arguments. */
 			src2 = src1;
 			src2w = src1w;
-		}
-		else if (dst != src2)
+		} else if (dst != src2)
 			FAIL_IF(emit_sse2_load(compiler, op & SLJIT_32, dst_r, src1, src1w));
 		else {
 			dst_r = TMP_FREG;
 			FAIL_IF(emit_sse2_load(compiler, op & SLJIT_32, TMP_FREG, src1, src1w));
 		}
-	}
-	else {
+	} else {
 		dst_r = TMP_FREG;
 		FAIL_IF(emit_sse2_load(compiler, op & SLJIT_32, TMP_FREG, src1, src1w));
 	}
@@ -3152,7 +3368,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fop2(struct sljit_compiler *compil
 		break;
 	}
 
-	if (dst_r == TMP_FREG)
+	if (dst_r != dst)
 		return emit_sse2_store(compiler, op & SLJIT_32, dst, dstw, TMP_FREG);
 	return SLJIT_SUCCESS;
 }
@@ -3215,10 +3431,9 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compi
 	PTR_FAIL_IF(!label);
 	set_label(label, compiler);
 
-	inst = (sljit_u8*)ensure_buf(compiler, 2);
+	inst = (sljit_u8*)ensure_buf(compiler, 1);
 	PTR_FAIL_IF(!inst);
-	inst[0] = 0;
-	inst[1] = 0;
+	inst[0] = SLJIT_INST_LABEL;
 
 	return label;
 }
@@ -3236,18 +3451,13 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_jump(struct sljit_compile
 	set_jump(jump, compiler, (sljit_u32)((type & SLJIT_REWRITABLE_JUMP) | ((type & 0xff) << TYPE_SHIFT)));
 	type &= 0xff;
 
+	jump->addr = compiler->size;
 	/* Worst case size. */
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	compiler->size += (type >= SLJIT_JUMP) ? 5 : 6;
-#else
-	compiler->size += (type >= SLJIT_JUMP) ? (10 + 3) : (2 + 10 + 3);
-#endif
-
-	inst = (sljit_u8*)ensure_buf(compiler, 2);
+	compiler->size += (type >= SLJIT_JUMP) ? JUMP_MAX_SIZE : CJUMP_MAX_SIZE;
+	inst = (sljit_u8*)ensure_buf(compiler, 1);
 	PTR_FAIL_IF_NULL(inst);
 
-	inst[0] = 0;
-	inst[1] = 1;
+	inst[0] = SLJIT_INST_JUMP;
 	return jump;
 }
 
@@ -3268,20 +3478,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_ijump(struct sljit_compiler *compi
 		set_jump(jump, compiler, (sljit_u32)(JUMP_ADDR | (type << TYPE_SHIFT)));
 		jump->u.target = (sljit_uw)srcw;
 
+		jump->addr = compiler->size;
 		/* Worst case size. */
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		compiler->size += 5;
-#else
-		compiler->size += 10 + 3;
-#endif
-
-		inst = (sljit_u8*)ensure_buf(compiler, 2);
+		compiler->size += JUMP_MAX_SIZE;
+		inst = (sljit_u8*)ensure_buf(compiler, 1);
 		FAIL_IF_NULL(inst);
 
-		inst[0] = 0;
-		inst[1] = 1;
-	}
-	else {
+		inst[0] = SLJIT_INST_JUMP;
+	} else {
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 		/* REX_W is not necessary (src is not immediate). */
 		compiler->mode32 = 1;
@@ -3302,6 +3506,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 	sljit_u8 cond_set;
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	sljit_s32 reg;
+	sljit_uw size;
 #endif /* !SLJIT_CONFIG_X86_64 */
 	/* ADJUST_LOCAL_OFFSET and CHECK_EXTRA_REGS might overwrite these values. */
 	sljit_s32 dst_save = dst;
@@ -3318,35 +3523,52 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	if (GET_OPCODE(op) == SLJIT_OR && !GET_ALL_FLAGS(op) && FAST_IS_REG(dst)) {
-		inst = (sljit_u8*)ensure_buf(compiler, 1 + 4 + 3);
+		size = 3 + 2;
+		if (reg_map[TMP_REG1] >= 4)
+			size += 1 + 1;
+		else if (reg_map[dst] >= 4)
+			size++;
+
+		inst = (sljit_u8*)ensure_buf(compiler, 1 + size);
 		FAIL_IF(!inst);
-		INC_SIZE(4 + 3);
+		INC_SIZE(size);
 		/* Set low register to conditional flag. */
-		inst[0] = (reg_map[TMP_REG1] <= 7) ? REX : REX_B;
-		inst[1] = GROUP_0F;
-		inst[2] = cond_set;
-		inst[3] = MOD_REG | reg_lmap[TMP_REG1];
-		inst[4] = U8(REX | (reg_map[TMP_REG1] <= 7 ? 0 : REX_R) | (reg_map[dst] <= 7 ? 0 : REX_B));
-		inst[5] = OR_rm8_r8;
-		inst[6] = U8(MOD_REG | (reg_lmap[TMP_REG1] << 3) | reg_lmap[dst]);
+		if (reg_map[TMP_REG1] >= 4)
+			*inst++ = (reg_map[TMP_REG1] <= 7) ? REX : REX_B;
+
+		inst[0] = GROUP_0F;
+		inst[1] = cond_set;
+		inst[2] = MOD_REG | reg_lmap[TMP_REG1];
+		inst += 3;
+
+		if (reg_map[TMP_REG1] >= 4 || reg_map[dst] >= 4)
+			*inst++ = U8(REX | (reg_map[TMP_REG1] <= 7 ? 0 : REX_R) | (reg_map[dst] <= 7 ? 0 : REX_B));
+
+		inst[0] = OR_rm8_r8;
+		inst[1] = U8(MOD_REG | (reg_lmap[TMP_REG1] << 3) | reg_lmap[dst]);
 		return SLJIT_SUCCESS;
 	}
 
 	reg = (GET_OPCODE(op) < SLJIT_ADD && FAST_IS_REG(dst)) ? dst : TMP_REG1;
 
-	inst = (sljit_u8*)ensure_buf(compiler, 1 + 4 + 4);
+	size = 3 + (reg_map[reg] >= 4) + 4;
+	inst = (sljit_u8*)ensure_buf(compiler, 1 + size);
 	FAIL_IF(!inst);
-	INC_SIZE(4 + 4);
+	INC_SIZE(size);
 	/* Set low register to conditional flag. */
-	inst[0] = (reg_map[reg] <= 7) ? REX : REX_B;
-	inst[1] = GROUP_0F;
-	inst[2] = cond_set;
-	inst[3] = MOD_REG | reg_lmap[reg];
-	inst[4] = REX_W | (reg_map[reg] <= 7 ? 0 : (REX_B | REX_R));
+
+	if (reg_map[reg] >= 4)
+		*inst++ = (reg_map[reg] <= 7) ? REX : REX_B;
+
+	inst[0] = GROUP_0F;
+	inst[1] = cond_set;
+	inst[2] = MOD_REG | reg_lmap[reg];
+
+	inst[3] = REX_W | (reg_map[reg] <= 7 ? 0 : (REX_B | REX_R));
 	/* The movzx instruction does not affect flags. */
-	inst[5] = GROUP_0F;
-	inst[6] = MOVZX_r_rm8;
-	inst[7] = U8(MOD_REG | (reg_lmap[reg] << 3) | reg_lmap[reg]);
+	inst[4] = GROUP_0F;
+	inst[5] = MOVZX_r_rm8;
+	inst[6] = U8(MOD_REG | (reg_lmap[reg] << 3) | reg_lmap[reg]);
 
 	if (reg != TMP_REG1)
 		return SLJIT_SUCCESS;
@@ -3414,82 +3636,6 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 #endif /* SLJIT_CONFIG_X86_64 */
 }
 
-SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_select(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_reg,
-	sljit_s32 src1, sljit_sw src1w,
-	sljit_s32 src2_reg)
-{
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	sljit_s32 dst = dst_reg;
-	sljit_sw dstw = 0;
-#endif /* SLJIT_CONFIG_X86_32 */
-	sljit_sw src2w = 0;
-
-	CHECK_ERROR();
-	CHECK(check_sljit_emit_select(compiler, type, dst_reg, src1, src1w, src2_reg));
-
-	ADJUST_LOCAL_OFFSET(src1, src1w);
-
-	CHECK_EXTRA_REGS(dst, dstw, (void)0);
-	CHECK_EXTRA_REGS(src1, src1w, (void)0);
-	CHECK_EXTRA_REGS(src2_reg, src2w, (void)0);
-
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	compiler->mode32 = type & SLJIT_32;
-#endif /* SLJIT_CONFIG_X86_64 */
-	type &= ~SLJIT_32;
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	if (dst & SLJIT_MEM) {
-		if (src1 == SLJIT_IMM || (!(src1 & SLJIT_MEM) && (src2_reg & SLJIT_MEM))) {
-			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-			src1 = src2_reg;
-			src1w = src2w;
-			type ^= 0x1;
-		} else
-			EMIT_MOV(compiler, TMP_REG1, 0, src2_reg, src2w);
-
-		dst_reg = TMP_REG1;
-	} else {
-#endif /* SLJIT_CONFIG_X86_32 */
-		if (dst_reg != src2_reg) {
-			if (dst_reg == src1) {
-				src1 = src2_reg;
-				src1w = src2w;
-				type ^= 0x1;
-			} else {
-				if (ADDRESSING_DEPENDS_ON(src1, dst_reg)) {
-					EMIT_MOV(compiler, dst_reg, 0, src1, src1w);
-					src1 = src2_reg;
-					src1w = src2w;
-					type ^= 0x1;
-				} else
-					EMIT_MOV(compiler, dst_reg, 0, src2_reg, src2w);
-			}
-		}
-
-		if (SLJIT_UNLIKELY(src1 == SLJIT_IMM)) {
-			SLJIT_ASSERT(dst_reg != TMP_REG1);
-			EMIT_MOV(compiler, TMP_REG1, 0, src1, src1w);
-			src1 = TMP_REG1;
-			src1w = 0;
-		}
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	}
-#endif /* SLJIT_CONFIG_X86_32 */
-
-	if (sljit_has_cpu_feature(SLJIT_HAS_CMOV))
-		FAIL_IF(emit_groupf(compiler, U8(get_jump_code((sljit_uw)type) - 0x40), dst_reg, src1, src1w));
-	else
-		FAIL_IF(emit_cmov_generic(compiler, type, dst_reg, src1, src1w));
-
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	if (dst_reg == TMP_REG1)
-		return emit_mov(compiler, dst, dstw, TMP_REG1, 0);
-#endif /* SLJIT_CONFIG_X86_32 */
-	return SLJIT_SUCCESS;
-}
-
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *compiler, sljit_s32 type,
 	sljit_s32 dst_freg,
 	sljit_s32 src1, sljit_sw src1w,
@@ -3529,7 +3675,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fselect(struct sljit_compiler *com
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
@@ -3538,7 +3684,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	sljit_uw op;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_mov(compiler, type, freg, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_mov(compiler, type, vreg, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
@@ -3581,24 +3727,25 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_mov(struct sljit_compiler *co
 	if (type & SLJIT_SIMD_TEST)
 		return SLJIT_SUCCESS;
 
-	if (op & VEX_256)
-		return emit_vex_instruction(compiler, op, freg, 0, srcdst, srcdstw);
+	if ((op & VEX_256) || ((cpu_feature_list & CPU_FEATURE_AVX) && (compiler->options & SLJIT_ENTER_USE_VEX)))
+		return emit_vex_instruction(compiler, op, vreg, 0, srcdst, srcdstw);
 
-	return emit_groupf(compiler, op, freg, srcdst, srcdstw);
+	return emit_groupf(compiler, op, vreg, srcdst, srcdstw);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 use_vex = (cpu_feature_list & CPU_FEATURE_AVX) && (compiler->options & SLJIT_ENTER_USE_VEX);
 	sljit_u8 *inst;
 	sljit_u8 opcode = 0;
-	sljit_uw size;
+	sljit_uw op;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_replicate(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_replicate(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -3616,72 +3763,96 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 		return SLJIT_ERR_UNSUPPORTED;
 #endif /* SLJIT_CONFIG_X86_32 */
 
-	if (cpu_feature_list & CPU_FEATURE_AVX2) {
-		if (reg_size < 4 || reg_size > 5)
-			return SLJIT_ERR_UNSUPPORTED;
-
-		if (src != SLJIT_IMM && (reg_size == 5 || elem_size < 3 || !(type & SLJIT_SIMD_FLOAT))) {
-			if (type & SLJIT_SIMD_TEST)
-				return SLJIT_SUCCESS;
-
-			if (!(src & SLJIT_MEM) && !(type & SLJIT_SIMD_FLOAT)) {
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-				if (elem_size >= 3)
-					compiler->mode32 = 0;
-#endif /* SLJIT_CONFIG_X86_64 */
-				FAIL_IF(emit_groupf(compiler, MOVD_x_rm | EX86_PREF_66 | EX86_SSE2_OP1, freg, src, srcw));
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-				compiler->mode32 = 1;
-#endif /* SLJIT_CONFIG_X86_64 */
-				src = freg;
-				srcw = 0;
-			}
-
-			switch (elem_size) {
-			case 0:
-				size = VPBROADCASTB_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
-				break;
-			case 1:
-				size = VPBROADCASTW_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
-				break;
-			case 2:
-				size = ((type & SLJIT_SIMD_FLOAT) ? VBROADCASTSS_x_xm : VPBROADCASTD_x_xm) | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
-				break;
-			default:
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-				size = VBROADCASTSD_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
-#else /* !SLJIT_CONFIG_X86_32 */
-				size = ((type & SLJIT_SIMD_FLOAT) ? VBROADCASTSD_x_xm : VPBROADCASTQ_x_xm) | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
-#endif /* SLJIT_CONFIG_X86_32 */
-				break;
-			}
-
-			if (reg_size == 5)
-				size |= VEX_256;
-
-			return emit_vex_instruction(compiler, size, freg, 0, src, srcw);
-		}
-	} else if (reg_size != 4)
+	if (reg_size != 4 && (reg_size != 5 || !(cpu_feature_list & CPU_FEATURE_AVX2)))
 		return SLJIT_ERR_UNSUPPORTED;
 
 	if (type & SLJIT_SIMD_TEST)
 		return SLJIT_SUCCESS;
 
-	if (type & SLJIT_SIMD_FLOAT) {
-		if (src == SLJIT_IMM) {
-			if (reg_size == 5)
-				return emit_vex_instruction(compiler, XORPD_x_xm | VEX_256 | (elem_size == 3 ? EX86_PREF_66 : 0) | EX86_SSE2 | VEX_SSE2_OPV, freg, freg, freg, 0);
+	if (reg_size == 5)
+		use_vex = 1;
 
-			return emit_groupf(compiler, XORPD_x_xm | (elem_size == 3 ? EX86_PREF_66 : 0) | EX86_SSE2, freg, freg, 0);
+	if (use_vex && src != SLJIT_IMM) {
+		op = 0;
+
+		switch (elem_size) {
+		case 0:
+			if (cpu_feature_list & CPU_FEATURE_AVX2)
+				op = VPBROADCASTB_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
+			break;
+		case 1:
+			if (cpu_feature_list & CPU_FEATURE_AVX2)
+				op = VPBROADCASTW_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
+			break;
+		case 2:
+			if (type & SLJIT_SIMD_FLOAT) {
+				if ((cpu_feature_list & CPU_FEATURE_AVX2) || ((cpu_feature_list & CPU_FEATURE_AVX) && (src & SLJIT_MEM)))
+					op = VBROADCASTSS_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
+			} else if (cpu_feature_list & CPU_FEATURE_AVX2)
+				op = VPBROADCASTD_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
+			break;
+		default:
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+			if (!(type & SLJIT_SIMD_FLOAT)) {
+				if (cpu_feature_list & CPU_FEATURE_AVX2)
+					op = VPBROADCASTQ_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
+				break;
+			}
+#endif /* SLJIT_CONFIG_X86_64 */
+
+			if (reg_size == 5)
+				op = VBROADCASTSD_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
+			break;
 		}
 
-		if (elem_size == 2 && freg != src) {
-			FAIL_IF(emit_sse2_load(compiler, 1, freg, src, srcw));
-			src = freg;
+		if (op != 0) {
+			if (!(src & SLJIT_MEM) && !(type & SLJIT_SIMD_FLOAT)) {
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+				if (elem_size >= 3)
+					compiler->mode32 = 0;
+#endif /* SLJIT_CONFIG_X86_64 */
+				FAIL_IF(emit_vex_instruction(compiler, MOVD_x_rm | VEX_AUTO_W | EX86_PREF_66 | EX86_SSE2_OP1, vreg, 0, src, srcw));
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+				compiler->mode32 = 1;
+#endif /* SLJIT_CONFIG_X86_64 */
+				src = vreg;
+				srcw = 0;
+			}
+
+			if (reg_size == 5)
+				op |= VEX_256;
+
+			return emit_vex_instruction(compiler, op, vreg, 0, src, srcw);
+		}
+	}
+
+	if (type & SLJIT_SIMD_FLOAT) {
+		if (src == SLJIT_IMM) {
+			if (use_vex)
+				return emit_vex_instruction(compiler, XORPD_x_xm | (reg_size == 5 ? VEX_256 : 0) | (elem_size == 3 ? EX86_PREF_66 : 0) | EX86_SSE2 | VEX_SSE2_OPV, vreg, vreg, vreg, 0);
+
+			return emit_groupf(compiler, XORPD_x_xm | (elem_size == 3 ? EX86_PREF_66 : 0) | EX86_SSE2, vreg, vreg, 0);
+		}
+
+		SLJIT_ASSERT(reg_size == 4);
+
+		if (use_vex) {
+			if (elem_size == 3)
+				return emit_vex_instruction(compiler, MOVDDUP_x_xm | EX86_PREF_F2 | EX86_SSE2, vreg, 0, src, srcw);
+
+			SLJIT_ASSERT(!(src & SLJIT_MEM));
+			FAIL_IF(emit_vex_instruction(compiler, SHUFPS_x_xm | EX86_SSE2 | VEX_SSE2_OPV, vreg, src, src, 0));
+			return emit_byte(compiler, 0);
+		}
+
+		if (elem_size == 2 && vreg != src) {
+			FAIL_IF(emit_sse2_load(compiler, 1, vreg, src, srcw));
+			src = vreg;
 			srcw = 0;
 		}
 
-		FAIL_IF(emit_groupf(compiler, (elem_size == 2 ? SHUFPS_x_xm : MOVDDUP_x_xm) | (elem_size == 2 ? 0 : EX86_PREF_F2) | EX86_SSE2, freg, src, srcw));
+		op = (elem_size == 2 ? SHUFPS_x_xm : MOVDDUP_x_xm) | (elem_size == 2 ? 0 : EX86_PREF_F2) | EX86_SSE2;
+		FAIL_IF(emit_groupf(compiler, op, vreg, src, srcw));
 
 		if (elem_size == 2)
 			return emit_byte(compiler, 0);
@@ -3706,10 +3877,10 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 #endif /* SLJIT_CONFIG_X86_64 */
 
 		if (srcw == 0 || srcw == -1) {
-			if (reg_size == 5)
-				return emit_vex_instruction(compiler, (srcw == 0 ? PXOR_x_xm : PCMPEQD_x_xm) | VEX_256 | EX86_PREF_66 | EX86_SSE2 | VEX_SSE2_OPV, freg, freg, freg, 0);
+			if (use_vex)
+				return emit_vex_instruction(compiler, (srcw == 0 ? PXOR_x_xm : PCMPEQD_x_xm) | (reg_size == 5 ? VEX_256 : 0) | EX86_PREF_66 | EX86_SSE2 | VEX_SSE2_OPV, vreg, vreg, vreg, 0);
 
-			return emit_groupf(compiler, (srcw == 0 ? PXOR_x_xm : PCMPEQD_x_xm) | EX86_PREF_66 | EX86_SSE2, freg, freg, 0);
+			return emit_groupf(compiler, (srcw == 0 ? PXOR_x_xm : PCMPEQD_x_xm) | EX86_PREF_66 | EX86_SSE2, vreg, vreg, 0);
 		}
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
@@ -3721,16 +3892,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 
 		src = TMP_REG1;
 		srcw = 0;
+
 	}
 
-	size = 2;
+	op = 2;
 	opcode = MOVD_x_rm;
 
 	switch (elem_size) {
 	case 0:
 		if (!FAST_IS_REG(src)) {
 			opcode = 0x3a /* Prefix of PINSRB_x_rm_i8. */;
-			size = 3;
+			op = 3;
 		}
 		break;
 	case 1:
@@ -3747,59 +3919,82 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_replicate(struct sljit_compil
 #endif /* SLJIT_CONFIG_X86_64 */
 	}
 
-	inst = emit_x86_instruction(compiler, size | EX86_PREF_66 | EX86_SSE2_OP1, freg, 0, src, srcw);
-	FAIL_IF(!inst);
-	inst[0] = GROUP_0F;
-	inst[1] = opcode;
+	if (use_vex) {
+		if (opcode != MOVD_x_rm) {
+			op = (opcode == 0x3a) ? (PINSRB_x_rm_i8 | VEX_OP_0F3A) : opcode;
+			FAIL_IF(emit_vex_instruction(compiler, op | EX86_PREF_66 | EX86_SSE2_OP1 | VEX_SSE2_OPV, vreg, vreg, src, srcw));
+		} else
+			FAIL_IF(emit_vex_instruction(compiler, MOVD_x_rm | VEX_AUTO_W | EX86_PREF_66 | EX86_SSE2_OP1, vreg, 0, src, srcw));
+	} else {
+		inst = emit_x86_instruction(compiler, op | EX86_PREF_66 | EX86_SSE2_OP1, vreg, 0, src, srcw);
+		FAIL_IF(!inst);
+		inst[0] = GROUP_0F;
+		inst[1] = opcode;
 
-	if (reg_size == 5) {
-		SLJIT_ASSERT(opcode == MOVD_x_rm);
+		if (op == 3) {
+			SLJIT_ASSERT(opcode == 0x3a);
+			inst[2] = PINSRB_x_rm_i8;
+		}
+	}
+
+	if ((cpu_feature_list & CPU_FEATURE_AVX2) && use_vex && elem_size >= 2) {
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-		size = VPBROADCASTD_x_xm;
+		op = VPBROADCASTD_x_xm;
 #else /* !SLJIT_CONFIG_X86_32 */
-		size = (elem_size == 3) ? VPBROADCASTQ_x_xm : VPBROADCASTD_x_xm;
+		op = (elem_size == 3) ? VPBROADCASTQ_x_xm : VPBROADCASTD_x_xm;
 #endif /* SLJIT_CONFIG_X86_32 */
-		return emit_vex_instruction(compiler, size | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, 0, freg, 0);
+		return emit_vex_instruction(compiler, op | ((reg_size == 5) ? VEX_256 : 0) | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, 0, vreg, 0);
 	}
 
-	if (size == 3) {
-		SLJIT_ASSERT(opcode == 0x3a);
-		inst[2] = PINSRB_x_rm_i8;
-	}
+	SLJIT_ASSERT(reg_size == 4);
 
 	if (opcode != MOVD_x_rm)
 		FAIL_IF(emit_byte(compiler, 0));
 
 	switch (elem_size) {
 	case 0:
+		if (use_vex) {
+			FAIL_IF(emit_vex_instruction(compiler, PXOR_x_xm | EX86_PREF_66 | EX86_SSE2 | VEX_SSE2_OPV, TMP_FREG, TMP_FREG, TMP_FREG, 0));
+			return emit_vex_instruction(compiler, PSHUFB_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2 | VEX_SSE2_OPV, vreg, vreg, TMP_FREG, 0);
+		}
 		FAIL_IF(emit_groupf(compiler, PXOR_x_xm | EX86_PREF_66 | EX86_SSE2, TMP_FREG, TMP_FREG, 0));
-		return emit_groupf_ext(compiler, PSHUFB_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, TMP_FREG, 0);
+		return emit_groupf_ext(compiler, PSHUFB_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, TMP_FREG, 0);
 	case 1:
-		FAIL_IF(emit_groupf(compiler, PSHUFLW_x_xm | EX86_PREF_F2 | EX86_SSE2, freg, freg, 0));
+		if (use_vex)
+			FAIL_IF(emit_vex_instruction(compiler, PSHUFLW_x_xm | EX86_PREF_F2 | EX86_SSE2, vreg, 0, vreg, 0));
+		else
+			FAIL_IF(emit_groupf(compiler, PSHUFLW_x_xm | EX86_PREF_F2 | EX86_SSE2, vreg, vreg, 0));
 		FAIL_IF(emit_byte(compiler, 0));
 		/* fallthrough */
 	default:
-		FAIL_IF(emit_groupf(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, freg, freg, 0));
+		if (use_vex)
+			FAIL_IF(emit_vex_instruction(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, vreg, 0, vreg, 0));
+		else
+			FAIL_IF(emit_groupf(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, vreg, vreg, 0));
 		return emit_byte(compiler, 0);
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	case 3:
 		compiler->mode32 = 1;
-		FAIL_IF(emit_groupf(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, freg, freg, 0));
+		if (use_vex)
+			FAIL_IF(emit_vex_instruction(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, vreg, 0, vreg, 0));
+		else
+			FAIL_IF(emit_groupf(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, vreg, vreg, 0));
 		return emit_byte(compiler, 0x44);
 #endif /* SLJIT_CONFIG_X86_64 */
 	}
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg, sljit_s32 lane_index,
+	sljit_s32 vreg, sljit_s32 lane_index,
 	sljit_s32 srcdst, sljit_sw srcdstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 use_vex = (cpu_feature_list & CPU_FEATURE_AVX) && (compiler->options & SLJIT_ENTER_USE_VEX);
 	sljit_u8 *inst;
 	sljit_u8 opcode = 0;
-	sljit_uw size;
-	sljit_s32 freg_orig = freg;
+	sljit_uw op;
+	sljit_s32 vreg_orig = vreg;
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 	sljit_s32 srcdst_is_ereg = 0;
 	sljit_s32 srcdst_orig = 0;
@@ -3807,13 +4002,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 #endif /* SLJIT_CONFIG_X86_32 */
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, freg, lane_index, srcdst, srcdstw));
+	CHECK(check_sljit_emit_simd_lane_mov(compiler, type, vreg, lane_index, srcdst, srcdstw));
 
 	ADJUST_LOCAL_OFFSET(srcdst, srcdstw);
 
 	if (reg_size == 5) {
 		if (!(cpu_feature_list & CPU_FEATURE_AVX2))
 			return SLJIT_ERR_UNSUPPORTED;
+		use_vex = 1;
 	} else if (reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
 
@@ -3865,44 +4061,50 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 				}
 
 				if (elem_size == 2) {
-					if (reg_size == 4)
-						return emit_groupf(compiler, MOVD_x_rm | EX86_PREF_66 | EX86_SSE2_OP1, freg, srcdst, srcdstw);
-					return emit_vex_instruction(compiler, MOVD_x_rm | VEX_AUTO_W | EX86_PREF_66 | EX86_SSE2_OP1, freg, 0, srcdst, srcdstw);
+					if (use_vex)
+						return emit_vex_instruction(compiler, MOVD_x_rm | VEX_AUTO_W | EX86_PREF_66 | EX86_SSE2_OP1, vreg, 0, srcdst, srcdstw);
+					return emit_groupf(compiler, MOVD_x_rm | EX86_PREF_66 | EX86_SSE2_OP1, vreg, srcdst, srcdstw);
 				}
 			} else if (srcdst & SLJIT_MEM) {
 				SLJIT_ASSERT(elem_size == 2 || elem_size == 3);
 
-				if (reg_size == 4)
-					return emit_groupf(compiler, MOVSD_x_xm | (elem_size == 2 ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2, freg, srcdst, srcdstw);
-				return emit_vex_instruction(compiler, MOVSD_x_xm | (elem_size == 2 ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2, freg, 0, srcdst, srcdstw);
+				if (use_vex)
+					return emit_vex_instruction(compiler, MOVSD_x_xm | (elem_size == 2 ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2, vreg, 0, srcdst, srcdstw);
+				return emit_groupf(compiler, MOVSD_x_xm | (elem_size == 2 ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2, vreg, srcdst, srcdstw);
 			} else if (elem_size == 3) {
-				if (reg_size == 4)
-					return emit_groupf(compiler, MOVQ_x_xm | EX86_PREF_F3 | EX86_SSE2, freg, srcdst, 0);
-				return emit_vex_instruction(compiler, MOVQ_x_xm | EX86_PREF_F3 | EX86_SSE2, freg, 0, srcdst, 0);
+				if (use_vex)
+					return emit_vex_instruction(compiler, MOVQ_x_xm | EX86_PREF_F3 | EX86_SSE2, vreg, 0, srcdst, 0);
+				return emit_groupf(compiler, MOVQ_x_xm | EX86_PREF_F3 | EX86_SSE2, vreg, srcdst, 0);
+			} else if (use_vex) {
+				FAIL_IF(emit_vex_instruction(compiler, XORPD_x_xm | EX86_SSE2 | VEX_SSE2_OPV, TMP_FREG, TMP_FREG, TMP_FREG, 0));
+				return emit_vex_instruction(compiler, MOVSD_x_xm | EX86_PREF_F3 | EX86_SSE2 | VEX_SSE2_OPV, vreg, TMP_FREG, srcdst, 0);
 			}
 		}
 
 		if (reg_size == 5 && lane_index >= (1 << (4 - elem_size))) {
-			freg = TMP_FREG;
+			vreg = TMP_FREG;
 			lane_index -= (1 << (4 - elem_size));
-		} else if ((type & SLJIT_SIMD_FLOAT) && freg == srcdst) {
-			FAIL_IF(emit_sse2_load(compiler, elem_size == 2, TMP_FREG, srcdst, srcdstw));
+		} else if ((type & SLJIT_SIMD_FLOAT) && vreg == srcdst) {
+			if (use_vex)
+				FAIL_IF(emit_vex_instruction(compiler, MOVSD_x_xm | (elem_size == 2 ? EX86_PREF_F3 : EX86_PREF_F2) | EX86_SSE2 | VEX_SSE2_OPV, TMP_FREG, TMP_FREG, srcdst, srcdstw));
+			else
+				FAIL_IF(emit_sse2_load(compiler, elem_size == 2, TMP_FREG, srcdst, srcdstw));
 			srcdst = TMP_FREG;
 			srcdstw = 0;
 		}
 
-		size = ((!(type & SLJIT_SIMD_FLOAT) || elem_size != 2) ? EX86_PREF_66 : 0)
+		op = ((!(type & SLJIT_SIMD_FLOAT) || elem_size != 2) ? EX86_PREF_66 : 0)
 			| ((type & SLJIT_SIMD_FLOAT) ? XORPD_x_xm : PXOR_x_xm) | EX86_SSE2;
 
-		if (reg_size == 5)
-			FAIL_IF(emit_vex_instruction(compiler,  size | VEX_256 | VEX_SSE2_OPV, freg, freg, freg, 0));
+		if (use_vex)
+			FAIL_IF(emit_vex_instruction(compiler, op | (reg_size == 5 ? VEX_256 : 0) | VEX_SSE2_OPV, vreg, vreg, vreg, 0));
 		else
-			FAIL_IF(emit_groupf(compiler, size, freg, freg, 0));
+			FAIL_IF(emit_groupf(compiler, op, vreg, vreg, 0));
 	} else if (reg_size == 5 && lane_index >= (1 << (4 - elem_size))) {
-		FAIL_IF(emit_vex_instruction(compiler, ((type & SLJIT_SIMD_FLOAT) ? VEXTRACTF128_x_ym : VEXTRACTI128_x_ym) | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, freg, 0, TMP_FREG, 0));
+		FAIL_IF(emit_vex_instruction(compiler, ((type & SLJIT_SIMD_FLOAT) ? VEXTRACTF128_x_ym : VEXTRACTI128_x_ym) | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, vreg, 0, TMP_FREG, 0));
 		FAIL_IF(emit_byte(compiler, 1));
 
-		freg = TMP_FREG;
+		vreg = TMP_FREG;
 		lane_index -= (1 << (4 - elem_size));
 	}
 
@@ -3910,80 +4112,102 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		if (elem_size == 3) {
 			if (srcdst & SLJIT_MEM) {
 				if (type & SLJIT_SIMD_STORE)
-					size = lane_index == 0 ? MOVLPD_m_x : MOVHPD_m_x;
+					op = lane_index == 0 ? MOVLPD_m_x : MOVHPD_m_x;
 				else
-					size = lane_index == 0 ? MOVLPD_x_m : MOVHPD_x_m;
+					op = lane_index == 0 ? MOVLPD_x_m : MOVHPD_x_m;
 
-				FAIL_IF(emit_groupf(compiler, size | EX86_PREF_66 | EX86_SSE2, freg, srcdst, srcdstw));
+				/* VEX prefix clears upper bits of the target register. */
+				if (use_vex && ((type & SLJIT_SIMD_STORE) || reg_size == 4 || vreg == TMP_FREG))
+					FAIL_IF(emit_vex_instruction(compiler, op | EX86_PREF_66 | EX86_SSE2
+						| ((type & SLJIT_SIMD_STORE) ? 0 : VEX_SSE2_OPV), vreg, (type & SLJIT_SIMD_STORE) ? 0 : vreg, srcdst, srcdstw));
+				else
+					FAIL_IF(emit_groupf(compiler, op | EX86_PREF_66 | EX86_SSE2, vreg, srcdst, srcdstw));
 
-				/* In case of store, freg is not TMP_FREG. */
+				/* In case of store, vreg is not TMP_FREG. */
 			} else if (type & SLJIT_SIMD_STORE) {
+				if (lane_index == 1) {
+					if (use_vex)
+						return emit_vex_instruction(compiler, MOVHLPS_x_x | EX86_SSE2 | VEX_SSE2_OPV, srcdst, srcdst, vreg, 0);
+					return emit_groupf(compiler, MOVHLPS_x_x | EX86_SSE2, srcdst, vreg, 0);
+				}
+				if (use_vex)
+					return emit_vex_instruction(compiler, MOVSD_x_xm | EX86_PREF_F2 | EX86_SSE2 | VEX_SSE2_OPV, srcdst, srcdst, vreg, 0);
+				return emit_sse2_load(compiler, 0, srcdst, vreg, 0);
+			} else if (use_vex && (reg_size == 4 || vreg == TMP_FREG)) {
 				if (lane_index == 1)
-					return emit_groupf(compiler, MOVHLPS_x_x | EX86_SSE2, srcdst, freg, 0);
-				return emit_sse2_load(compiler, 0, srcdst, freg, 0);
+					FAIL_IF(emit_vex_instruction(compiler, MOVLHPS_x_x | EX86_SSE2 | VEX_SSE2_OPV, vreg, vreg, srcdst, 0));
+				else
+					FAIL_IF(emit_vex_instruction(compiler, MOVSD_x_xm | EX86_PREF_F2 | EX86_SSE2 | VEX_SSE2_OPV, vreg, vreg, srcdst, 0));
 			} else {
 				if (lane_index == 1)
-					FAIL_IF(emit_groupf(compiler, MOVLHPS_x_x | EX86_SSE2, freg, srcdst, 0));
+					FAIL_IF(emit_groupf(compiler, MOVLHPS_x_x | EX86_SSE2, vreg, srcdst, 0));
 				else
-					FAIL_IF(emit_sse2_store(compiler, 0, freg, 0, srcdst));
+					FAIL_IF(emit_sse2_load(compiler, 0, vreg, srcdst, 0));
 			}
 		} else if (type & SLJIT_SIMD_STORE) {
-			if (lane_index == 0)
-				return emit_sse2_store(compiler, 1, srcdst, srcdstw, freg);
+			if (lane_index == 0) {
+				if (use_vex)
+					return emit_vex_instruction(compiler, MOVSD_xm_x | EX86_PREF_F3 | EX86_SSE2 | ((srcdst & SLJIT_MEM) ? 0 : VEX_SSE2_OPV),
+						vreg, ((srcdst & SLJIT_MEM) ? 0 : srcdst), srcdst, srcdstw);
+				return emit_sse2_store(compiler, 1, srcdst, srcdstw, vreg);
+			}
 
 			if (srcdst & SLJIT_MEM) {
-				FAIL_IF(emit_groupf_ext(compiler, EXTRACTPS_x_xm | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, freg, srcdst, srcdstw));
+				if (use_vex)
+					FAIL_IF(emit_vex_instruction(compiler, EXTRACTPS_x_xm | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, vreg, 0, srcdst, srcdstw));
+				else
+					FAIL_IF(emit_groupf_ext(compiler, EXTRACTPS_x_xm | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, vreg, srcdst, srcdstw));
 				return emit_byte(compiler, U8(lane_index));
 			}
 
-			if (srcdst == freg)
-				size = SHUFPS_x_xm | EX86_SSE2;
-			else {
-				if (cpu_feature_list & CPU_FEATURE_AVX) {
-					FAIL_IF(emit_vex_instruction(compiler, SHUFPS_x_xm | EX86_SSE2 | VEX_SSE2_OPV, srcdst, freg, freg, 0));
-					return emit_byte(compiler, U8(lane_index));
-				}
+			if (use_vex) {
+				FAIL_IF(emit_vex_instruction(compiler, SHUFPS_x_xm | EX86_SSE2 | VEX_SSE2_OPV, srcdst, vreg, vreg, 0));
+				return emit_byte(compiler, U8(lane_index));
+			}
 
+			if (srcdst == vreg)
+				op = SHUFPS_x_xm | EX86_SSE2;
+			else {
 				switch (lane_index) {
 				case 1:
-					size = MOVSHDUP_x_xm | EX86_PREF_F3 | EX86_SSE2;
+					op = MOVSHDUP_x_xm | EX86_PREF_F3 | EX86_SSE2;
 					break;
 				case 2:
-					size = MOVHLPS_x_x | EX86_SSE2;
+					op = MOVHLPS_x_x | EX86_SSE2;
 					break;
 				default:
 					SLJIT_ASSERT(lane_index == 3);
-					size = PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2;
+					op = PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2;
 					break;
 				}
 			}
 
-			FAIL_IF(emit_groupf(compiler, size, srcdst, freg, 0));
+			FAIL_IF(emit_groupf(compiler, op, srcdst, vreg, 0));
 
-			size &= 0xff;
-			if (size == SHUFPS_x_xm || size == PSHUFD_x_xm)
+			op &= 0xff;
+			if (op == SHUFPS_x_xm || op == PSHUFD_x_xm)
 				return emit_byte(compiler, U8(lane_index));
 
 			return SLJIT_SUCCESS;
 		} else {
 			if (lane_index != 0 || (srcdst & SLJIT_MEM)) {
-				FAIL_IF(emit_groupf_ext(compiler, INSERTPS_x_xm | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, freg, srcdst, srcdstw));
+				FAIL_IF(emit_groupf_ext(compiler, INSERTPS_x_xm | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, vreg, srcdst, srcdstw));
 				FAIL_IF(emit_byte(compiler, U8(lane_index << 4)));
 			} else
-				FAIL_IF(emit_sse2_store(compiler, 1, freg, 0, srcdst));
+				FAIL_IF(emit_sse2_store(compiler, 1, vreg, 0, srcdst));
 		}
 
-		if (freg != TMP_FREG || (type & SLJIT_SIMD_STORE))
+		if (vreg != TMP_FREG || (type & SLJIT_SIMD_STORE))
 			return SLJIT_SUCCESS;
 
 		SLJIT_ASSERT(reg_size == 5);
 
 		if (type & SLJIT_SIMD_LANE_ZERO) {
-			FAIL_IF(emit_vex_instruction(compiler, VPERMPD_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, freg_orig, 0, TMP_FREG, 0));
+			FAIL_IF(emit_vex_instruction(compiler, VPERMPD_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, vreg_orig, 0, TMP_FREG, 0));
 			return emit_byte(compiler, 0x4e);
 		}
 
-		FAIL_IF(emit_vex_instruction(compiler, VINSERTF128_y_y_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2 | VEX_SSE2_OPV, freg_orig, freg_orig, TMP_FREG, 0));
+		FAIL_IF(emit_vex_instruction(compiler, VINSERTF128_y_y_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2 | VEX_SSE2_OPV, vreg_orig, vreg_orig, TMP_FREG, 0));
 		return emit_byte(compiler, 1);
 	}
 
@@ -3993,7 +4217,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		srcdstw = 0;
 	}
 
-	size = 3;
+	op = 3;
 
 	switch (elem_size) {
 	case 0:
@@ -4001,7 +4225,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 		break;
 	case 1:
 		if (!(type & SLJIT_SIMD_STORE)) {
-			size = 2;
+			op = 2;
 			opcode = PINSRW_x_rm_i8;
 		} else
 			opcode = PEXTRW_rm_x_i8;
@@ -4018,28 +4242,33 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 #endif /* SLJIT_CONFIG_X86_64 */
 	}
 
-	inst = emit_x86_instruction(compiler, size | EX86_PREF_66 | EX86_SSE2_OP1, freg, 0, srcdst, srcdstw);
-	FAIL_IF(!inst);
-	inst[0] = GROUP_0F;
+	if (use_vex && (type & SLJIT_SIMD_STORE)) {
+		op = opcode | ((op == 3) ? VEX_OP_0F3A : 0);
+		FAIL_IF(emit_vex_instruction(compiler, op | EX86_PREF_66 | VEX_AUTO_W | EX86_SSE2_OP1 | VEX_SSE2_OPV, vreg, 0, srcdst, srcdstw));
+	} else {
+		inst = emit_x86_instruction(compiler, op | EX86_PREF_66 | EX86_SSE2_OP1, vreg, 0, srcdst, srcdstw);
+		FAIL_IF(!inst);
+		inst[0] = GROUP_0F;
 
-	if (size == 3) {
-		inst[1] = 0x3a;
-		inst[2] = opcode;
-	} else
-		inst[1] = opcode;
+		if (op == 3) {
+			inst[1] = 0x3a;
+			inst[2] = opcode;
+		} else
+			inst[1] = opcode;
+	}
 
 	FAIL_IF(emit_byte(compiler, U8(lane_index)));
 
 	if (!(type & SLJIT_SIMD_LANE_SIGNED) || (srcdst & SLJIT_MEM)) {
-		if (freg == TMP_FREG && !(type & SLJIT_SIMD_STORE)) {
+		if (vreg == TMP_FREG && !(type & SLJIT_SIMD_STORE)) {
 			SLJIT_ASSERT(reg_size == 5);
 
 			if (type & SLJIT_SIMD_LANE_ZERO) {
-				FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, freg_orig, 0, TMP_FREG, 0));
+				FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, vreg_orig, 0, TMP_FREG, 0));
 				return emit_byte(compiler, 0x4e);
 			}
 
-			FAIL_IF(emit_vex_instruction(compiler, VINSERTI128_y_y_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2 | VEX_SSE2_OPV, freg_orig, freg_orig, TMP_FREG, 0));
+			FAIL_IF(emit_vex_instruction(compiler, VINSERTI128_y_y_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2 | VEX_SSE2_OPV, vreg_orig, vreg_orig, TMP_FREG, 0));
 			return emit_byte(compiler, 1);
 		}
 
@@ -4056,23 +4285,23 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 
 	compiler->mode32 = (type & SLJIT_32);
 
-	size = 2;
+	op = 2;
 
 	if (elem_size == 0)
-		size |= EX86_REX;
+		op |= EX86_REX;
 
 	if (elem_size == 2) {
 		if (type & SLJIT_32)
 			return SLJIT_SUCCESS;
 
 		SLJIT_ASSERT(!(compiler->mode32));
-		size = 1;
+		op = 1;
 	}
 
-	inst = emit_x86_instruction(compiler, size, srcdst, 0, srcdst, 0);
+	inst = emit_x86_instruction(compiler, op, srcdst, 0, srcdst, 0);
 	FAIL_IF(!inst);
 
-	if (size != 1) {
+	if (op != 1) {
 		inst[0] = GROUP_0F;
 		inst[1] = U8((elem_size == 0) ? MOVSX_r_rm8 : MOVSX_r_rm16);
 	} else
@@ -4091,11 +4320,12 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_mov(struct sljit_compile
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_s32 src_lane_index)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 use_vex = (cpu_feature_list & CPU_FEATURE_AVX) && (compiler->options & SLJIT_ENTER_USE_VEX);
 	sljit_uw pref;
 	sljit_u8 byte;
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
@@ -4105,7 +4335,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 #endif /* SLJIT_CONFIG_X86_32 */
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, freg, src, src_lane_index));
+	CHECK(check_sljit_emit_simd_lane_replicate(compiler, type, vreg, src, src_lane_index));
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	compiler->mode32 = 1;
@@ -4115,6 +4345,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 	if (reg_size == 5) {
 		if (!(cpu_feature_list & CPU_FEATURE_AVX2))
 			return SLJIT_ERR_UNSUPPORTED;
+		use_vex = 1;
 	} else if (reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
 
@@ -4128,16 +4359,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 
 			if (reg_size == 5) {
 				if (src_lane_index == 0)
-					return emit_vex_instruction(compiler, VBROADCASTSD_x_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, 0, src, 0);
+					return emit_vex_instruction(compiler, VBROADCASTSD_x_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, 0, src, 0);
 
-				FAIL_IF(emit_vex_instruction(compiler, VPERMPD_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, freg, 0, src, 0));
+				FAIL_IF(emit_vex_instruction(compiler, VPERMPD_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, vreg, 0, src, 0));
 
 				byte = U8(byte | (byte << 2));
 				return emit_byte(compiler, U8(byte | (byte << 4)));
 			}
 
-			if (src_lane_index == 0)
-				return emit_groupf(compiler, MOVDDUP_x_xm | EX86_PREF_F2 | EX86_SSE2, freg, src, 0);
+			if (src_lane_index == 0) {
+				if (use_vex)
+					return emit_vex_instruction(compiler, MOVDDUP_x_xm | EX86_PREF_F2 | EX86_SSE2, vreg, 0, src, 0);
+				return emit_groupf(compiler, MOVDDUP_x_xm | EX86_PREF_F2 | EX86_SSE2, vreg, src, 0);
+			}
 
 			/* Changes it to SHUFPD_x_xm. */
 			pref = EX86_PREF_66;
@@ -4150,9 +4384,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 			SLJIT_ASSERT(elem_size == 2);
 
 			if (src_lane_index == 0)
-				return emit_vex_instruction(compiler, VBROADCASTSS_x_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, 0, src, 0);
+				return emit_vex_instruction(compiler, VBROADCASTSS_x_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, 0, src, 0);
 
-			FAIL_IF(emit_vex_instruction(compiler, VPERMPD_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, freg, 0, src, 0));
+			FAIL_IF(emit_vex_instruction(compiler, VPERMPD_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, vreg, 0, src, 0));
 
 			byte = 0x44;
 			if (src_lane_index >= 4) {
@@ -4161,15 +4395,15 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 			}
 
 			FAIL_IF(emit_byte(compiler, byte));
-			FAIL_IF(emit_vex_instruction(compiler, SHUFPS_x_xm | VEX_256 | pref | EX86_SSE2 | VEX_SSE2_OPV, freg, freg, freg, 0));
+			FAIL_IF(emit_vex_instruction(compiler, SHUFPS_x_xm | VEX_256 | pref | EX86_SSE2 | VEX_SSE2_OPV, vreg, vreg, vreg, 0));
 			byte = U8(src_lane_index);
-		} else if (freg != src && (cpu_feature_list & CPU_FEATURE_AVX)) {
-			FAIL_IF(emit_vex_instruction(compiler, SHUFPS_x_xm | pref | EX86_SSE2 | VEX_SSE2_OPV, freg, src, src, 0));
+		} else if (use_vex) {
+			FAIL_IF(emit_vex_instruction(compiler, SHUFPS_x_xm | pref | EX86_SSE2 | VEX_SSE2_OPV, vreg, src, src, 0));
 		} else {
-			if (freg != src)
-				FAIL_IF(emit_groupf(compiler, MOVAPS_x_xm | pref | EX86_SSE2, freg, src, 0));
+			if (vreg != src)
+				FAIL_IF(emit_groupf(compiler, MOVAPS_x_xm | pref | EX86_SSE2, vreg, src, 0));
 
-			FAIL_IF(emit_groupf(compiler, SHUFPS_x_xm | pref | EX86_SSE2, freg, freg, 0));
+			FAIL_IF(emit_groupf(compiler, SHUFPS_x_xm | pref | EX86_SSE2, vreg, vreg, 0));
 		}
 
 		if (elem_size == 2) {
@@ -4186,13 +4420,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 
 	if (elem_size == 0) {
 		if (reg_size == 5 && src_lane_index >= 16) {
-			FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, freg, 0, src, 0));
+			FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, vreg, 0, src, 0));
 			FAIL_IF(emit_byte(compiler, src_lane_index >= 24 ? 0xff : 0xaa));
 			src_lane_index &= 0x7;
-			src = freg;
+			src = vreg;
 		}
 
-		if ((freg != src && !(cpu_feature_list & CPU_FEATURE_AVX2)) || src_lane_index != 0) {
+		if (src_lane_index != 0 || (vreg != src && (!(cpu_feature_list & CPU_FEATURE_AVX2) || !use_vex))) {
 			pref = 0;
 
 			if ((src_lane_index & 0x3) == 0) {
@@ -4202,34 +4436,37 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 				pref = EX86_PREF_F2;
 				byte = U8(src_lane_index >> 1);
 			} else {
-				if (freg == src || !(cpu_feature_list & CPU_FEATURE_AVX2)) {
-					if (freg != src)
-						FAIL_IF(emit_groupf(compiler, MOVDQA_x_xm | EX86_PREF_66 | EX86_SSE2, freg, src, 0));
+				if (!use_vex) {
+					if (vreg != src)
+						FAIL_IF(emit_groupf(compiler, MOVDQA_x_xm | EX86_PREF_66 | EX86_SSE2, vreg, src, 0));
 
-					FAIL_IF(emit_groupf(compiler, PSRLDQ_x | EX86_PREF_66 | EX86_SSE2_OP2, opcode3, freg, 0));
+					FAIL_IF(emit_groupf(compiler, PSRLDQ_x | EX86_PREF_66 | EX86_SSE2_OP2, opcode3, vreg, 0));
 				} else
-					FAIL_IF(emit_vex_instruction(compiler, PSRLDQ_x | EX86_PREF_66 | EX86_SSE2_OP2 | VEX_SSE2_OPV, opcode3, freg, src, 0));
+					FAIL_IF(emit_vex_instruction(compiler, PSRLDQ_x | EX86_PREF_66 | EX86_SSE2_OP2 | VEX_SSE2_OPV, opcode3, vreg, src, 0));
 
 				FAIL_IF(emit_byte(compiler, U8(src_lane_index)));
 			}
 
 			if (pref != 0) {
-				FAIL_IF(emit_groupf(compiler, PSHUFLW_x_xm | pref | EX86_SSE2, freg, src, 0));
+				if (use_vex)
+					FAIL_IF(emit_vex_instruction(compiler, PSHUFLW_x_xm | pref | EX86_SSE2, vreg, 0, src, 0));
+				else
+					FAIL_IF(emit_groupf(compiler, PSHUFLW_x_xm | pref | EX86_SSE2, vreg, src, 0));
 				FAIL_IF(emit_byte(compiler, byte));
 			}
 
-			src = freg;
+			src = vreg;
 		}
 
-		if (cpu_feature_list & CPU_FEATURE_AVX2)
-			return emit_vex_instruction(compiler, VPBROADCASTB_x_xm | (reg_size == 5 ? VEX_256 : 0) | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, 0, src, 0);
+		if (use_vex && (cpu_feature_list & CPU_FEATURE_AVX2))
+			return emit_vex_instruction(compiler, VPBROADCASTB_x_xm | (reg_size == 5 ? VEX_256 : 0) | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, 0, src, 0);
 
 		SLJIT_ASSERT(reg_size == 4);
 		FAIL_IF(emit_groupf(compiler, PXOR_x_xm | EX86_PREF_66 | EX86_SSE2, TMP_FREG, TMP_FREG, 0));
-		return emit_groupf_ext(compiler, PSHUFB_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, TMP_FREG, 0);
+		return emit_groupf_ext(compiler, PSHUFB_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, TMP_FREG, 0);
 	}
 
-	if ((cpu_feature_list & CPU_FEATURE_AVX2) && src_lane_index == 0 && elem_size <= 3) {
+	if ((cpu_feature_list & CPU_FEATURE_AVX2) && use_vex && src_lane_index == 0 && elem_size <= 3) {
 		switch (elem_size) {
 		case 1:
 			pref = VPBROADCASTW_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2;
@@ -4245,7 +4482,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 		if (reg_size == 5)
 			pref |= VEX_256;
 
-		return emit_vex_instruction(compiler, pref, freg, 0, src, 0);
+		return emit_vex_instruction(compiler, pref, vreg, 0, src, 0);
 	}
 
 	if (reg_size == 5) {
@@ -4264,22 +4501,22 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 			pref = 0;
 			break;
 		default:
-			FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, freg, 0, src, 0));
+			FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, vreg, 0, src, 0));
 			return emit_byte(compiler, U8(src_lane_index == 0 ? 0x44 : 0xee));
 		}
 
 		if (pref != 0) {
-			FAIL_IF(emit_vex_instruction(compiler, pref, freg, 0, src, 0));
+			FAIL_IF(emit_vex_instruction(compiler, pref, vreg, 0, src, 0));
 			byte = U8(byte | (byte << 2));
 			FAIL_IF(emit_byte(compiler, U8(byte | (byte << 4))));
 
 			if (src_lane_index == 0)
-				return emit_vex_instruction(compiler, VPBROADCASTQ_x_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, 0, freg, 0);
+				return emit_vex_instruction(compiler, VPBROADCASTQ_x_xm | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, 0, vreg, 0);
 
-			src = freg;
+			src = vreg;
 		}
 
-		FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, freg, 0, src, 0));
+		FAIL_IF(emit_vex_instruction(compiler, VPERMQ_y_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | VEX_W | EX86_SSE2, vreg, 0, src, 0));
 		byte = U8(src_lane_index);
 		byte = U8(byte | (byte << 2));
 		return emit_byte(compiler, U8(byte | (byte << 4)));
@@ -4291,14 +4528,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 		src_lane_index >>= 1;
 		pref = (src_lane_index & 2) == 0 ? EX86_PREF_F2 : EX86_PREF_F3;
 
-		FAIL_IF(emit_groupf(compiler, PSHUFLW_x_xm | pref | EX86_SSE2, freg, src, 0));
+		if (use_vex)
+			FAIL_IF(emit_vex_instruction(compiler, PSHUFLW_x_xm | pref | EX86_SSE2, vreg, 0, src, 0));
+		else
+			FAIL_IF(emit_groupf(compiler, PSHUFLW_x_xm | pref | EX86_SSE2, vreg, src, 0));
 		byte = U8(byte | (byte << 2));
 		FAIL_IF(emit_byte(compiler, U8(byte | (byte << 4))));
 
-		if ((cpu_feature_list & CPU_FEATURE_AVX2) && pref == EX86_PREF_F2)
-			return emit_vex_instruction(compiler, VPBROADCASTD_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, 0, freg, 0);
+		if ((cpu_feature_list & CPU_FEATURE_AVX2) && use_vex && pref == EX86_PREF_F2)
+			return emit_vex_instruction(compiler, VPBROADCASTD_x_xm | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, 0, vreg, 0);
 
-		src = freg;
+		src = vreg;
 		/* fallthrough */
 	case 2:
 		byte = U8(src_lane_index);
@@ -4310,21 +4550,25 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_lane_replicate(struct sljit_c
 		break;
 	}
 
-	FAIL_IF(emit_groupf(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, freg, src, 0));
+	if (use_vex)
+		FAIL_IF(emit_vex_instruction(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, vreg, 0, src, 0));
+	else
+		FAIL_IF(emit_groupf(compiler, PSHUFD_x_xm | EX86_PREF_66 | EX86_SSE2, vreg, src, 0));
 	return emit_byte(compiler, U8(byte | (byte << 4)));
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 src, sljit_sw srcw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
 	sljit_s32 elem2_size = SLJIT_SIMD_GET_ELEM2_SIZE(type);
+	sljit_s32 use_vex = (cpu_feature_list & CPU_FEATURE_AVX) && (compiler->options & SLJIT_ENTER_USE_VEX);
 	sljit_u8 opcode;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_extend(compiler, type, freg, src, srcw));
+	CHECK(check_sljit_emit_simd_extend(compiler, type, vreg, src, srcw));
 
 	ADJUST_LOCAL_OFFSET(src, srcw);
 
@@ -4335,6 +4579,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 	if (reg_size == 5) {
 		if (!(cpu_feature_list & CPU_FEATURE_AVX2))
 			return SLJIT_ERR_UNSUPPORTED;
+		use_vex = 1;
 	} else if (reg_size != 4)
 		return SLJIT_ERR_UNSUPPORTED;
 
@@ -4345,9 +4590,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 		if (type & SLJIT_SIMD_TEST)
 			return SLJIT_SUCCESS;
 
-		if (reg_size == 4)
-			return emit_groupf(compiler, CVTPS2PD_x_xm | EX86_SSE2, freg, src, srcw);
-		return emit_vex_instruction(compiler, CVTPS2PD_x_xm | VEX_256 | EX86_SSE2, freg, 0, src, srcw);
+		if (use_vex)
+			return emit_vex_instruction(compiler, CVTPS2PD_x_xm | ((reg_size == 5) ? VEX_256 : 0) | EX86_SSE2, vreg, 0, src, srcw);
+		return emit_groupf(compiler, CVTPS2PD_x_xm | EX86_SSE2, vreg, src, srcw);
 	}
 
 	switch (elem_size) {
@@ -4382,23 +4627,24 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_extend(struct sljit_compiler
 	if (type & SLJIT_SIMD_TEST)
 		return SLJIT_SUCCESS;
 
-	if (reg_size == 4)
-		return emit_groupf_ext(compiler, opcode | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, src, srcw);
-	return emit_vex_instruction(compiler, opcode | VEX_256 | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, freg, 0, src, srcw);
+	if (use_vex)
+		return emit_vex_instruction(compiler, opcode | ((reg_size == 5) ? VEX_256 : 0) | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, 0, src, srcw);
+	return emit_groupf_ext(compiler, opcode | EX86_PREF_66 | VEX_OP_0F38 | EX86_SSE2, vreg, src, srcw);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 freg,
+	sljit_s32 vreg,
 	sljit_s32 dst, sljit_sw dstw)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
+	sljit_s32 use_vex = (cpu_feature_list & CPU_FEATURE_AVX) && (compiler->options & SLJIT_ENTER_USE_VEX);
 	sljit_s32 dst_r;
-	sljit_uw pref;
+	sljit_uw op;
 	sljit_u8 *inst;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_sign(compiler, type, freg, dst, dstw));
+	CHECK(check_sljit_emit_simd_sign(compiler, type, vreg, dst, dstw));
 
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
@@ -4414,20 +4660,28 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 		if (type & SLJIT_SIMD_TEST)
 			return SLJIT_SUCCESS;
 
-		pref = EX86_PREF_66 | EX86_SSE2_OP2;
+		op = EX86_PREF_66 | EX86_SSE2_OP2;
 
 		switch (elem_size) {
 		case 1:
-			FAIL_IF(emit_groupf(compiler, PACKSSWB_x_xm | EX86_PREF_66 | EX86_SSE2, TMP_FREG, freg, 0));
-			freg = TMP_FREG;
+			if (use_vex)
+				FAIL_IF(emit_vex_instruction(compiler, PACKSSWB_x_xm | EX86_PREF_66 | EX86_SSE2 | VEX_SSE2_OPV, TMP_FREG, vreg, vreg, 0));
+			else
+				FAIL_IF(emit_groupf(compiler, PACKSSWB_x_xm | EX86_PREF_66 | EX86_SSE2, TMP_FREG, vreg, 0));
+			vreg = TMP_FREG;
 			break;
 		case 2:
-			pref = EX86_SSE2_OP2;
+			op = EX86_SSE2_OP2;
 			break;
 		}
 
 		dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
-		FAIL_IF(emit_groupf(compiler, (elem_size < 2 ? PMOVMSKB_r_x : MOVMSKPS_r_x) | pref, dst_r, freg, 0));
+		op |= (elem_size < 2) ? PMOVMSKB_r_x : MOVMSKPS_r_x;
+
+		if (use_vex)
+			FAIL_IF(emit_vex_instruction(compiler, op, dst_r, 0, vreg, 0));
+		else
+			FAIL_IF(emit_groupf(compiler, op, dst_r, vreg, 0));
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 		compiler->mode32 = type & SLJIT_32;
@@ -4454,19 +4708,19 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 	dst_r = FAST_IS_REG(dst) ? dst : TMP_REG1;
 
 	if (elem_size == 1) {
-		FAIL_IF(emit_vex_instruction(compiler, VEXTRACTI128_x_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, freg, 0, TMP_FREG, 0));
+		FAIL_IF(emit_vex_instruction(compiler, VEXTRACTI128_x_ym | VEX_256 | EX86_PREF_66 | VEX_OP_0F3A | EX86_SSE2, vreg, 0, TMP_FREG, 0));
 		FAIL_IF(emit_byte(compiler, 1));
-		FAIL_IF(emit_vex_instruction(compiler, PACKSSWB_x_xm | VEX_256 | EX86_PREF_66 | EX86_SSE2 | VEX_SSE2_OPV, TMP_FREG, freg, TMP_FREG, 0));
+		FAIL_IF(emit_vex_instruction(compiler, PACKSSWB_x_xm | VEX_256 | EX86_PREF_66 | EX86_SSE2 | VEX_SSE2_OPV, TMP_FREG, vreg, TMP_FREG, 0));
 		FAIL_IF(emit_groupf(compiler, PMOVMSKB_r_x | EX86_PREF_66 | EX86_SSE2_OP2, dst_r, TMP_FREG, 0));
 	} else {
-		pref = MOVMSKPS_r_x | VEX_256 | EX86_SSE2_OP2;
+		op = MOVMSKPS_r_x | VEX_256 | EX86_SSE2_OP2;
 
 		if (elem_size == 0)
-			pref = PMOVMSKB_r_x | VEX_256 | EX86_PREF_66 | EX86_SSE2_OP2;
+			op = PMOVMSKB_r_x | VEX_256 | EX86_PREF_66 | EX86_SSE2_OP2;
 		else if (elem_size == 3)
-			pref |= EX86_PREF_66;
+			op |= EX86_PREF_66;
 
-		FAIL_IF(emit_vex_instruction(compiler, pref, dst_r, 0, freg, 0));
+		FAIL_IF(emit_vex_instruction(compiler, op, dst_r, 0, vreg, 0));
 	}
 
 	if (dst_r == TMP_REG1) {
@@ -4480,7 +4734,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_sign(struct sljit_compiler *c
 }
 
 static sljit_s32 emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src_freg)
+	sljit_s32 dst_vreg, sljit_s32 src_vreg)
 {
 	sljit_uw op = ((type & SLJIT_SIMD_FLOAT) ? MOVAPS_x_xm : MOVDQA_x_xm) | EX86_SSE2;
 
@@ -4489,19 +4743,21 @@ static sljit_s32 emit_simd_mov(struct sljit_compiler *compiler, sljit_s32 type,
 	if (!(type & SLJIT_SIMD_FLOAT) || SLJIT_SIMD_GET_ELEM_SIZE(type) == 3)
 		op |= EX86_PREF_66;
 
-	return emit_groupf(compiler, op, dst_freg, src_freg, 0);
+	return emit_groupf(compiler, op, dst_vreg, src_vreg, 0);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *compiler, sljit_s32 type,
-	sljit_s32 dst_freg, sljit_s32 src1_freg, sljit_s32 src2_freg)
+	sljit_s32 dst_vreg, sljit_s32 src1_vreg, sljit_s32 src2, sljit_sw src2w)
 {
 	sljit_s32 reg_size = SLJIT_SIMD_GET_REG_SIZE(type);
 	sljit_s32 elem_size = SLJIT_SIMD_GET_ELEM_SIZE(type);
-	sljit_s32 needs_move = 0;
+	sljit_s32 use_vex = (cpu_feature_list & CPU_FEATURE_AVX) && (compiler->options & SLJIT_ENTER_USE_VEX);
 	sljit_uw op = 0;
+	sljit_uw mov_op = 0;
 
 	CHECK_ERROR();
-	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_freg, src1_freg, src2_freg));
+	CHECK(check_sljit_emit_simd_op2(compiler, type, dst_vreg, src1_vreg, src2, src2w));
+	ADJUST_LOCAL_OFFSET(src2, src2w);
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	compiler->mode32 = 1;
@@ -4535,29 +4791,52 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_simd_op2(struct sljit_compiler *co
 		if (!(type & SLJIT_SIMD_FLOAT) || elem_size == 3)
 			op |= EX86_PREF_66;
 		break;
+
+	case SLJIT_SIMD_OP2_SHUFFLE:
+		if (reg_size != 4)
+			return SLJIT_ERR_UNSUPPORTED;
+
+		op = PSHUFB_x_xm | EX86_PREF_66 | VEX_OP_0F38;
+		break;
 	}
 
 	if (type & SLJIT_SIMD_TEST)
 		return SLJIT_SUCCESS;
 
-	needs_move = dst_freg != src1_freg && dst_freg != src2_freg;
+	if ((src2 & SLJIT_MEM) && SLJIT_SIMD_GET_ELEM2_SIZE(type) < reg_size) {
+		mov_op = ((type & SLJIT_SIMD_FLOAT) ? (MOVUPS_x_xm | (elem_size == 3 ? EX86_PREF_66 : 0)) : (MOVDQU_x_xm | EX86_PREF_F3)) | EX86_SSE2;
+		if (use_vex)
+			FAIL_IF(emit_vex_instruction(compiler, mov_op, TMP_FREG, 0, src2, src2w));
+		else
+			FAIL_IF(emit_groupf(compiler, mov_op, TMP_FREG, src2, src2w));
 
-	if (reg_size == 5 || (needs_move && (cpu_feature_list & CPU_FEATURE_AVX2))) {
+		src2 = TMP_FREG;
+		src2w = 0;
+	}
+
+	if (reg_size == 5 || use_vex) {
 		if (reg_size == 5)
 			op |= VEX_256;
 
-		return emit_vex_instruction(compiler, op | EX86_SSE2 | VEX_SSE2_OPV, dst_freg, src1_freg, src2_freg, 0);
+		return emit_vex_instruction(compiler, op | EX86_SSE2 | VEX_SSE2_OPV, dst_vreg, src1_vreg, src2, src2w);
 	}
 
-	if (needs_move) {
-		FAIL_IF(emit_simd_mov(compiler, type, dst_freg, src1_freg));
-	} else if (dst_freg != src1_freg) {
-		SLJIT_ASSERT(dst_freg == src2_freg);
-		src2_freg = src1_freg;
+	if (dst_vreg != src1_vreg) {
+		if (dst_vreg == src2) {
+			if (SLJIT_SIMD_GET_OPCODE(type) == SLJIT_SIMD_OP2_SHUFFLE) {
+				FAIL_IF(emit_simd_mov(compiler, type, TMP_FREG, src2));
+				FAIL_IF(emit_simd_mov(compiler, type, dst_vreg, src1_vreg));
+				src2 = TMP_FREG;
+				src2w = 0;
+			} else
+				src2 = src1_vreg;
+		} else
+			FAIL_IF(emit_simd_mov(compiler, type, dst_vreg, src1_vreg));
 	}
 
-	FAIL_IF(emit_groupf(compiler, op | EX86_SSE2, dst_freg, src2_freg, 0));
-	return SLJIT_SUCCESS;
+	if (op & (VEX_OP_0F38 | VEX_OP_0F3A))
+		return emit_groupf_ext(compiler, op | EX86_SSE2, dst_vreg, src2, src2w);
+	return emit_groupf(compiler, op | EX86_SSE2, dst_vreg, src2, src2w);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler *compiler, sljit_s32 op,
@@ -4567,8 +4846,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_load(struct sljit_compiler
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_atomic_load(compiler, op, dst_reg, mem_reg));
 
+	if ((op & SLJIT_ATOMIC_USE_LS) || GET_OPCODE(op) == SLJIT_MOV_S8 || GET_OPCODE(op) == SLJIT_MOV_S16 || GET_OPCODE(op) == SLJIT_MOV_S32)
+		return SLJIT_ERR_UNSUPPORTED;
+
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
 	SLJIT_SKIP_CHECKS(compiler);
-	return sljit_emit_op1(compiler, op, dst_reg, 0, SLJIT_MEM1(mem_reg), 0);
+	return sljit_emit_op1(compiler, op & ~SLJIT_ATOMIC_USE_CAS, dst_reg, 0, SLJIT_MEM1(mem_reg), 0);
 }
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler *compiler, sljit_s32 op,
@@ -4577,8 +4862,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	sljit_s32 temp_reg)
 {
 	sljit_uw pref;
-	sljit_s32 free_reg = TMP_REG1;
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
+	sljit_s32 saved_reg = TMP_REG1;
+	sljit_s32 swap_tmp = 0;
 	sljit_sw srcw = 0;
 	sljit_sw tempw = 0;
 #endif /* SLJIT_CONFIG_X86_32 */
@@ -4591,18 +4877,43 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 	SLJIT_ASSERT(FAST_IS_REG(src_reg) || src_reg == SLJIT_MEM1(SLJIT_SP));
 	SLJIT_ASSERT(FAST_IS_REG(temp_reg) || temp_reg == SLJIT_MEM1(SLJIT_SP));
 
-	op = GET_OPCODE(op);
-#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
-	if ((src_reg & SLJIT_MEM) || (op == SLJIT_MOV_U8 && reg_map[src_reg] >= 4)) {
-		/* Src is virtual register or its low byte is not accessible. */
-		SLJIT_ASSERT(src_reg != SLJIT_R1);
-		free_reg = src_reg;
+	if ((op & SLJIT_ATOMIC_USE_LS) || GET_OPCODE(op) == SLJIT_MOV_S8 || GET_OPCODE(op) == SLJIT_MOV_S16 || GET_OPCODE(op) == SLJIT_MOV_S32)
+		return SLJIT_ERR_UNSUPPORTED;
 
-		EMIT_MOV(compiler, TMP_REG1, 0, src_reg, srcw);
-		src_reg = TMP_REG1;
+	if (op & SLJIT_ATOMIC_TEST)
+		return SLJIT_SUCCESS;
+
+	op = GET_OPCODE(op);
+
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
+	if (temp_reg == SLJIT_TMP_DEST_REG) {
+		FAIL_IF(emit_byte(compiler, XCHG_EAX_r | reg_map[TMP_REG1]));
+
+		if (src_reg == SLJIT_R0)
+			src_reg = TMP_REG1;
+		if (mem_reg == SLJIT_R0)
+			mem_reg = TMP_REG1;
+
+		temp_reg = SLJIT_R0;
+		swap_tmp = 1;
+	}
+
+	/* Src is virtual register or its low byte is not accessible. */
+	if ((src_reg & SLJIT_MEM) || (op == SLJIT_MOV_U8 && reg_map[src_reg] >= 4)) {
+		SLJIT_ASSERT(src_reg != SLJIT_R1 && temp_reg != SLJIT_TMP_DEST_REG);
+
+		if (swap_tmp) {
+			saved_reg = (mem_reg != SLJIT_R1) ? SLJIT_R1 : SLJIT_R2;
+
+			EMIT_MOV(compiler, SLJIT_MEM1(SLJIT_SP), 0, saved_reg, 0);
+			EMIT_MOV(compiler, saved_reg, 0, src_reg, srcw);
+		} else
+			EMIT_MOV(compiler, TMP_REG1, 0, src_reg, srcw);
+
+		src_reg = saved_reg;
 
 		if (mem_reg == src_reg)
-			mem_reg = TMP_REG1;
+			mem_reg = saved_reg;
 	}
 #endif /* SLJIT_CONFIG_X86_32 */
 
@@ -4610,29 +4921,37 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 		compiler->mode32 = 0;
 
-		EMIT_MOV(compiler, free_reg, 0, SLJIT_R0, 0);
+		EMIT_MOV(compiler, TMP_REG2, 0, SLJIT_R0, 0);
 		EMIT_MOV(compiler, SLJIT_R0, 0, temp_reg, 0);
 
 		if (src_reg == SLJIT_R0)
-			src_reg = free_reg;
+			src_reg = TMP_REG2;
 		if (mem_reg == SLJIT_R0)
-			mem_reg = free_reg;
+			mem_reg = TMP_REG2;
 #else /* !SLJIT_CONFIG_X86_64 */
-		if (src_reg == TMP_REG1 && mem_reg == SLJIT_R0 && (free_reg & SLJIT_MEM)) {
-			EMIT_MOV(compiler, SLJIT_MEM1(SLJIT_SP), 0, SLJIT_R1, 0);
-			EMIT_MOV(compiler, SLJIT_R1, 0, SLJIT_R0, 0);
-			EMIT_MOV(compiler, SLJIT_R0, 0, temp_reg, tempw);
+		SLJIT_ASSERT(!swap_tmp);
 
-			mem_reg = SLJIT_R1;
-			free_reg = SLJIT_R1;
+		if (src_reg == TMP_REG1) {
+			if (mem_reg == SLJIT_R0) {
+				EMIT_MOV(compiler, SLJIT_MEM1(SLJIT_SP), 0, SLJIT_R1, 0);
+				EMIT_MOV(compiler, SLJIT_R1, 0, SLJIT_R0, 0);
+				EMIT_MOV(compiler, SLJIT_R0, 0, temp_reg, tempw);
+
+				mem_reg = SLJIT_R1;
+				saved_reg = SLJIT_R1;
+			} else {
+				EMIT_MOV(compiler, SLJIT_MEM1(SLJIT_SP), 0, SLJIT_R0, 0);
+				EMIT_MOV(compiler, SLJIT_R0, 0, temp_reg, tempw);
+				saved_reg = SLJIT_R0;
+			}
 		} else {
-			EMIT_MOV(compiler, free_reg, 0, SLJIT_R0, 0);
+			EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_R0, 0);
 			EMIT_MOV(compiler, SLJIT_R0, 0, temp_reg, tempw);
 
 			if (src_reg == SLJIT_R0)
-				src_reg = free_reg;
+				src_reg = TMP_REG1;
 			if (mem_reg == SLJIT_R0)
-				mem_reg = free_reg;
+				mem_reg = TMP_REG1;
 		}
 #endif /* SLJIT_CONFIG_X86_64 */
 	}
@@ -4654,14 +4973,25 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_atomic_store(struct sljit_compiler
 
 	FAIL_IF(emit_groupf(compiler, (op == SLJIT_MOV_U8 ? CMPXCHG_rm8_r : CMPXCHG_rm_r) | pref, src_reg, SLJIT_MEM1(mem_reg), 0));
 
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
+	if (swap_tmp) {
+		SLJIT_ASSERT(temp_reg == SLJIT_R0);
+		FAIL_IF(emit_byte(compiler, XCHG_EAX_r | reg_map[TMP_REG1]));
+
+		if (saved_reg != TMP_REG1)
+			return emit_mov(compiler, saved_reg, 0, SLJIT_MEM1(SLJIT_SP), 0);
+		return SLJIT_SUCCESS;
+	}
+#endif /* SLJIT_CONFIG_X86_32 */
+
 	if (temp_reg != SLJIT_R0) {
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 		compiler->mode32 = 0;
-		return emit_mov(compiler, SLJIT_R0, 0, TMP_REG1, 0);
+		return emit_mov(compiler, SLJIT_R0, 0, TMP_REG2, 0);
 #else /* !SLJIT_CONFIG_X86_64 */
-		EMIT_MOV(compiler, SLJIT_R0, 0, free_reg, 0);
-		if (free_reg != TMP_REG1)
-			return emit_mov(compiler, free_reg, 0, (free_reg == SLJIT_R1) ? SLJIT_MEM1(SLJIT_SP) : TMP_REG1, 0);
+		EMIT_MOV(compiler, SLJIT_R0, 0, (saved_reg == SLJIT_R0) ? SLJIT_MEM1(SLJIT_SP) : saved_reg, 0);
+		if (saved_reg == SLJIT_R1)
+			return emit_mov(compiler, SLJIT_R1, 0, SLJIT_MEM1(SLJIT_SP), 0);
 #endif /* SLJIT_CONFIG_X86_64 */
 	}
 	return SLJIT_SUCCESS;
@@ -4727,11 +5057,10 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 		return NULL;
 #endif
 
-	inst = (sljit_u8*)ensure_buf(compiler, 2);
+	inst = (sljit_u8*)ensure_buf(compiler, 1);
 	PTR_FAIL_IF(!inst);
 
-	inst[0] = 0;
-	inst[1] = 2;
+	inst[0] = SLJIT_INST_CONST;
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	if (dst & SLJIT_MEM)
@@ -4742,52 +5071,48 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compi
 	return const_;
 }
 
-SLJIT_API_FUNC_ATTRIBUTE struct sljit_put_label* sljit_emit_put_label(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_mov_addr(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw)
 {
-	struct sljit_put_label *put_label;
+	struct sljit_jump *jump;
 	sljit_u8 *inst;
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	sljit_s32 reg;
-	sljit_uw start_size;
-#endif
+#endif /* SLJIT_CONFIG_X86_64 */
 
 	CHECK_ERROR_PTR();
-	CHECK_PTR(check_sljit_emit_put_label(compiler, dst, dstw));
+	CHECK_PTR(check_sljit_emit_mov_addr(compiler, dst, dstw));
 	ADJUST_LOCAL_OFFSET(dst, dstw);
 
 	CHECK_EXTRA_REGS(dst, dstw, (void)0);
 
-	put_label = (struct sljit_put_label*)ensure_abuf(compiler, sizeof(struct sljit_put_label));
-	PTR_FAIL_IF(!put_label);
-	set_put_label(put_label, compiler, 0);
+	jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+	PTR_FAIL_IF(!jump);
+	set_mov_addr(jump, compiler, 0);
 
 #if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	compiler->mode32 = 0;
 	reg = FAST_IS_REG(dst) ? dst : TMP_REG1;
 
-	if (emit_load_imm64(compiler, reg, 0))
-		return NULL;
-#else
-	if (emit_mov(compiler, dst, dstw, SLJIT_IMM, 0))
-		return NULL;
-#endif
+	PTR_FAIL_IF(emit_load_imm64(compiler, reg, 0));
+	jump->addr = compiler->size;
 
-#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
-	if (dst & SLJIT_MEM) {
-		start_size = compiler->size;
-		if (emit_mov(compiler, dst, dstw, TMP_REG1, 0))
-			return NULL;
-		put_label->flags = compiler->size - start_size;
-	}
-#endif
+	if (reg_map[reg] >= 8)
+		jump->flags |= MOV_ADDR_HI;
+#else /* !SLJIT_CONFIG_X86_64 */
+	PTR_FAIL_IF(emit_mov(compiler, dst, dstw, SLJIT_IMM, 0));
+#endif /* SLJIT_CONFIG_X86_64 */
 
-	inst = (sljit_u8*)ensure_buf(compiler, 2);
+	inst = (sljit_u8*)ensure_buf(compiler, 1);
 	PTR_FAIL_IF(!inst);
 
-	inst[0] = 0;
-	inst[1] = 3;
+	inst[0] = SLJIT_INST_MOV_ADDR;
 
-	return put_label;
+#if (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
+	if (dst & SLJIT_MEM)
+		PTR_FAIL_IF(emit_mov(compiler, dst, dstw, TMP_REG1, 0));
+#endif /* SLJIT_CONFIG_X86_64 */
+
+	return jump;
 }
 
 SLJIT_API_FUNC_ATTRIBUTE void sljit_set_jump_addr(sljit_uw addr, sljit_uw new_target, sljit_sw executable_offset)
diff --git a/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitSerialize.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitSerialize.c
new file mode 100644
index 00000000..6ef161fd
--- /dev/null
+++ b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitSerialize.c
@@ -0,0 +1,516 @@
+/*
+ *    Stack-less Just-In-Time compiler
+ *
+ *    Copyright Zoltan Herczeg (hzmester@freemail.hu). All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice, this list of
+ *      conditions and the following disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *      of conditions and the following disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDER(S) OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_jump_has_label(struct sljit_jump *jump)
+{
+	return !(jump->flags & JUMP_ADDR) && (jump->u.label != NULL);
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_jump_has_target(struct sljit_jump *jump)
+{
+	return (jump->flags & JUMP_ADDR) != 0;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_jump_is_mov_addr(struct sljit_jump *jump)
+{
+	return (jump->flags & JUMP_MOV_ADDR) != 0;
+}
+
+#define SLJIT_SERIALIZE_DEBUG ((sljit_u16)0x1)
+
+struct sljit_serialized_compiler {
+	sljit_u32 signature;
+	sljit_u16 version;
+	sljit_u16 cpu_type;
+
+	sljit_uw buf_segment_count;
+	sljit_uw label_count;
+	sljit_uw jump_count;
+	sljit_uw const_count;
+
+	sljit_s32 options;
+	sljit_s32 scratches;
+	sljit_s32 saveds;
+	sljit_s32 fscratches;
+	sljit_s32 fsaveds;
+	sljit_s32 local_size;
+	sljit_uw size;
+
+#if (defined SLJIT_HAS_STATUS_FLAGS_STATE && SLJIT_HAS_STATUS_FLAGS_STATE)
+	sljit_s32 status_flags_state;
+#endif /* SLJIT_HAS_STATUS_FLAGS_STATE */
+
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
+	sljit_s32 args_size;
+#endif /* SLJIT_CONFIG_X86_32 */
+
+#if ((defined SLJIT_CONFIG_ARM_32 && SLJIT_CONFIG_ARM_32) && (defined __SOFTFP__)) \
+		|| (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
+	sljit_uw args_size;
+#endif /* (SLJIT_CONFIG_ARM_32 && __SOFTFP__) || SLJIT_CONFIG_MIPS_32 */
+
+#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
+	sljit_uw cpool_diff;
+	sljit_uw cpool_fill;
+	sljit_uw patches;
+#endif /* SLJIT_CONFIG_ARM_V6 */
+
+#if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
+	sljit_s32 delay_slot;
+#endif /* SLJIT_CONFIG_MIPS */
+
+};
+
+struct sljit_serialized_debug_info {
+	sljit_sw last_flags;
+	sljit_s32 last_return;
+	sljit_s32 logical_local_size;
+};
+
+struct sljit_serialized_label {
+	sljit_uw size;
+};
+
+struct sljit_serialized_jump {
+	sljit_uw addr;
+	sljit_uw flags;
+	sljit_uw value;
+};
+
+struct sljit_serialized_const {
+	sljit_uw addr;
+};
+
+#define SLJIT_SERIALIZE_ALIGN(v) (((v) + sizeof(sljit_uw) - 1) & ~(sljit_uw)(sizeof(sljit_uw) - 1))
+#if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
+#define SLJIT_SERIALIZE_SIGNATURE 0x534c4a54
+#else /* !SLJIT_LITTLE_ENDIAN */
+#define SLJIT_SERIALIZE_SIGNATURE 0x544a4c53
+#endif /* SLJIT_LITTLE_ENDIAN */
+#define SLJIT_SERIALIZE_VERSION 1
+
+SLJIT_API_FUNC_ATTRIBUTE sljit_uw* sljit_serialize_compiler(struct sljit_compiler *compiler,
+	sljit_s32 options, sljit_uw *size)
+{
+	sljit_uw serialized_size = sizeof(struct sljit_serialized_compiler);
+	struct sljit_memory_fragment *buf;
+	struct sljit_label *label;
+	struct sljit_jump *jump;
+	struct sljit_const *const_;
+	struct sljit_serialized_compiler *serialized_compiler;
+	struct sljit_serialized_label *serialized_label;
+	struct sljit_serialized_jump *serialized_jump;
+	struct sljit_serialized_const *serialized_const;
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	struct sljit_serialized_debug_info *serialized_debug_info;
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
+	sljit_uw counter, used_size;
+	sljit_u8 *result;
+	sljit_u8 *ptr;
+	SLJIT_UNUSED_ARG(options);
+
+	if (size != NULL)
+		*size = 0;
+
+	PTR_FAIL_IF(compiler->error);
+
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	if (!(options & SLJIT_SERIALIZE_IGNORE_DEBUG))
+		serialized_size += sizeof(struct sljit_serialized_debug_info);
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
+
+#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
+	serialized_size += SLJIT_SERIALIZE_ALIGN(compiler->cpool_fill * (sizeof(sljit_uw) + 1));
+#endif /* SLJIT_CONFIG_ARM_V6 */
+
+	/* Compute the size of the data. */
+	buf = compiler->buf;
+	while (buf != NULL) {
+		serialized_size += sizeof(sljit_uw) + SLJIT_SERIALIZE_ALIGN(buf->used_size);
+		buf = buf->next;
+	}
+
+	serialized_size += compiler->label_count * sizeof(struct sljit_serialized_label);
+
+	jump = compiler->jumps;
+	while (jump != NULL) {
+		serialized_size += sizeof(struct sljit_serialized_jump);
+		jump = jump->next;
+	}
+
+	const_ = compiler->consts;
+	while (const_ != NULL) {
+		serialized_size += sizeof(struct sljit_serialized_const);
+		const_ = const_->next;
+	}
+
+	result = (sljit_u8*)SLJIT_MALLOC(serialized_size, compiler->allocator_data);
+	PTR_FAIL_IF_NULL(result);
+
+	if (size != NULL)
+		*size = serialized_size;
+
+	ptr = result;
+	serialized_compiler = (struct sljit_serialized_compiler*)ptr;
+	ptr += sizeof(struct sljit_serialized_compiler);
+
+	serialized_compiler->signature = SLJIT_SERIALIZE_SIGNATURE;
+	serialized_compiler->version = SLJIT_SERIALIZE_VERSION;
+	serialized_compiler->cpu_type = 0;
+	serialized_compiler->label_count = compiler->label_count;
+	serialized_compiler->options = compiler->options;
+	serialized_compiler->scratches = compiler->scratches;
+	serialized_compiler->saveds = compiler->saveds;
+	serialized_compiler->fscratches = compiler->fscratches;
+	serialized_compiler->fsaveds = compiler->fsaveds;
+	serialized_compiler->local_size = compiler->local_size;
+	serialized_compiler->size = compiler->size;
+
+#if (defined SLJIT_HAS_STATUS_FLAGS_STATE && SLJIT_HAS_STATUS_FLAGS_STATE)
+	serialized_compiler->status_flags_state = compiler->status_flags_state;
+#endif /* SLJIT_HAS_STATUS_FLAGS_STATE */
+
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) \
+		|| ((defined SLJIT_CONFIG_ARM_32 && SLJIT_CONFIG_ARM_32) && (defined __SOFTFP__)) \
+		|| (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
+	serialized_compiler->args_size = compiler->args_size;
+#endif /* SLJIT_CONFIG_X86_32 || (SLJIT_CONFIG_ARM_32 && __SOFTFP__) || SLJIT_CONFIG_MIPS_32 */
+
+#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
+	serialized_compiler->cpool_diff = compiler->cpool_diff;
+	serialized_compiler->cpool_fill = compiler->cpool_fill;
+	serialized_compiler->patches = compiler->patches;
+
+	SLJIT_MEMCPY(ptr, compiler->cpool, compiler->cpool_fill * sizeof(sljit_uw));
+	SLJIT_MEMCPY(ptr + compiler->cpool_fill * sizeof(sljit_uw), compiler->cpool_unique, compiler->cpool_fill);
+	ptr += SLJIT_SERIALIZE_ALIGN(compiler->cpool_fill * (sizeof(sljit_uw) + 1));
+#endif /* SLJIT_CONFIG_ARM_V6 */
+
+#if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
+	serialized_compiler->delay_slot = compiler->delay_slot;
+#endif /* SLJIT_CONFIG_MIPS */
+
+	buf = compiler->buf;
+	counter = 0;
+	while (buf != NULL) {
+		used_size = buf->used_size;
+		*(sljit_uw*)ptr = used_size;
+		ptr += sizeof(sljit_uw);
+		SLJIT_MEMCPY(ptr, buf->memory, used_size);
+		ptr += SLJIT_SERIALIZE_ALIGN(used_size);
+		buf = buf->next;
+		counter++;
+	}
+	serialized_compiler->buf_segment_count = counter;
+
+	label = compiler->labels;
+	while (label != NULL) {
+		serialized_label = (struct sljit_serialized_label*)ptr;
+		serialized_label->size = label->size;
+		ptr += sizeof(struct sljit_serialized_label);
+		label = label->next;
+	}
+
+	jump = compiler->jumps;
+	counter = 0;
+	while (jump != NULL) {
+		serialized_jump = (struct sljit_serialized_jump*)ptr;
+		serialized_jump->addr = jump->addr;
+		serialized_jump->flags = jump->flags;
+
+		if (jump->flags & JUMP_ADDR)
+			serialized_jump->value = jump->u.target;
+		else if (jump->u.label != NULL)
+			serialized_jump->value = jump->u.label->u.index;
+		else
+			serialized_jump->value = SLJIT_MAX_ADDRESS;
+
+		ptr += sizeof(struct sljit_serialized_jump);
+		jump = jump->next;
+		counter++;
+	}
+	serialized_compiler->jump_count = counter;
+
+	const_ = compiler->consts;
+	counter = 0;
+	while (const_ != NULL) {
+		serialized_const = (struct sljit_serialized_const*)ptr;
+		serialized_const->addr = const_->addr;
+		ptr += sizeof(struct sljit_serialized_const);
+		const_ = const_->next;
+		counter++;
+	}
+	serialized_compiler->const_count = counter;
+
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	if (!(options & SLJIT_SERIALIZE_IGNORE_DEBUG)) {
+		serialized_debug_info = (struct sljit_serialized_debug_info*)ptr;
+		serialized_debug_info->last_flags = compiler->last_flags;
+		serialized_debug_info->last_return = compiler->last_return;
+		serialized_debug_info->logical_local_size = compiler->logical_local_size;
+		serialized_compiler->cpu_type |= SLJIT_SERIALIZE_DEBUG;
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG)
+		ptr += sizeof(struct sljit_serialized_debug_info);
+#endif /* SLJIT_DEBUG */
+	}
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
+
+	SLJIT_ASSERT((sljit_uw)(ptr - result) == serialized_size);
+	return (sljit_uw*)result;
+}
+
+SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler *sljit_deserialize_compiler(sljit_uw* buffer, sljit_uw size,
+	sljit_s32 options, void *allocator_data)
+{
+	struct sljit_compiler *compiler;
+	struct sljit_serialized_compiler *serialized_compiler;
+	struct sljit_serialized_label *serialized_label;
+	struct sljit_serialized_jump *serialized_jump;
+	struct sljit_serialized_const *serialized_const;
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	struct sljit_serialized_debug_info *serialized_debug_info;
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
+	struct sljit_memory_fragment *buf;
+	struct sljit_memory_fragment *last_buf;
+	struct sljit_label *label;
+	struct sljit_label *last_label;
+	struct sljit_label **label_list = NULL;
+	struct sljit_jump *jump;
+	struct sljit_jump *last_jump;
+	struct sljit_const *const_;
+	struct sljit_const *last_const;
+	sljit_u8 *ptr = (sljit_u8*)buffer;
+	sljit_u8 *end = ptr + size;
+	sljit_uw i, used_size, aligned_size, label_count;
+	SLJIT_UNUSED_ARG(options);
+
+	if (size < sizeof(struct sljit_serialized_compiler) || (size & (sizeof(sljit_uw) - 1)) != 0)
+		return NULL;
+
+	serialized_compiler = (struct sljit_serialized_compiler*)ptr;
+
+	if (serialized_compiler->signature != SLJIT_SERIALIZE_SIGNATURE || serialized_compiler->version != SLJIT_SERIALIZE_VERSION)
+		return NULL;
+
+	compiler = sljit_create_compiler(allocator_data);
+	PTR_FAIL_IF(compiler == NULL);
+
+	compiler->label_count = serialized_compiler->label_count;
+	compiler->options = serialized_compiler->options;
+	compiler->scratches = serialized_compiler->scratches;
+	compiler->saveds = serialized_compiler->saveds;
+	compiler->fscratches = serialized_compiler->fscratches;
+	compiler->fsaveds = serialized_compiler->fsaveds;
+	compiler->local_size = serialized_compiler->local_size;
+	compiler->size = serialized_compiler->size;
+
+#if (defined SLJIT_HAS_STATUS_FLAGS_STATE && SLJIT_HAS_STATUS_FLAGS_STATE)
+	compiler->status_flags_state = serialized_compiler->status_flags_state;
+#endif /* SLJIT_HAS_STATUS_FLAGS_STATE */
+
+#if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) \
+		|| ((defined SLJIT_CONFIG_ARM_32 && SLJIT_CONFIG_ARM_32) && (defined __SOFTFP__)) \
+		|| (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32)
+	compiler->args_size = serialized_compiler->args_size;
+#endif /* SLJIT_CONFIG_X86_32 || (SLJIT_CONFIG_ARM_32 && __SOFTFP__) || SLJIT_CONFIG_MIPS_32 */
+
+#if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
+	used_size = serialized_compiler->cpool_fill;
+	aligned_size = SLJIT_SERIALIZE_ALIGN(used_size * (sizeof(sljit_uw) + 1));
+	compiler->cpool_diff = serialized_compiler->cpool_diff;
+	compiler->cpool_fill = used_size;
+	compiler->patches = serialized_compiler->patches;
+
+	if ((sljit_uw)(end - ptr) < aligned_size)
+		goto error;
+
+	SLJIT_MEMCPY(compiler->cpool, ptr, used_size * sizeof(sljit_uw));
+	SLJIT_MEMCPY(compiler->cpool_unique, ptr + used_size * sizeof(sljit_uw), used_size);
+	ptr += aligned_size;
+#endif /* SLJIT_CONFIG_ARM_V6 */
+
+#if (defined SLJIT_CONFIG_MIPS && SLJIT_CONFIG_MIPS)
+	compiler->delay_slot = serialized_compiler->delay_slot;
+#endif /* SLJIT_CONFIG_MIPS */
+
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	if (!(serialized_compiler->cpu_type & SLJIT_SERIALIZE_DEBUG))
+		goto error;
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
+
+	ptr += sizeof(struct sljit_serialized_compiler);
+	i = serialized_compiler->buf_segment_count;
+	last_buf = NULL;
+	while (i > 0) {
+		if ((sljit_uw)(end - ptr) < sizeof(sljit_uw))
+			goto error;
+
+		used_size = *(sljit_uw*)ptr;
+		aligned_size = SLJIT_SERIALIZE_ALIGN(used_size);
+		ptr += sizeof(sljit_uw);
+
+		if ((sljit_uw)(end - ptr) < aligned_size)
+			goto error;
+
+		if (last_buf == NULL) {
+			SLJIT_ASSERT(compiler->buf != NULL && compiler->buf->next == NULL);
+			buf = compiler->buf;
+		} else {
+			buf = (struct sljit_memory_fragment*)SLJIT_MALLOC(BUF_SIZE, allocator_data);
+			if (!buf)
+				goto error;
+			buf->next = NULL;
+		}
+
+		buf->used_size = used_size;
+		SLJIT_MEMCPY(buf->memory, ptr, used_size);
+
+		if (last_buf != NULL)
+			last_buf->next = buf;
+		last_buf = buf;
+
+		ptr += aligned_size;
+		i--;
+	}
+
+	last_label = NULL;
+	label_count = serialized_compiler->label_count;
+	if ((sljit_uw)(end - ptr) < label_count * sizeof(struct sljit_serialized_label))
+		goto error;
+
+	label_list = (struct sljit_label **)SLJIT_MALLOC(label_count * sizeof(struct sljit_label*), allocator_data);
+	if (label_list == NULL)
+		goto error;
+
+	for (i = 0; i < label_count; i++) {
+		label = (struct sljit_label*)ensure_abuf(compiler, sizeof(struct sljit_label));
+		if (label == NULL)
+			goto error;
+
+		serialized_label = (struct sljit_serialized_label*)ptr;
+		label->next = NULL;
+		label->u.index = i;
+		label->size = serialized_label->size;
+
+		if (last_label != NULL)
+			last_label->next = label;
+		else
+			compiler->labels = label;
+		last_label = label;
+
+		label_list[i] = label;
+		ptr += sizeof(struct sljit_serialized_label);
+	}
+	compiler->last_label = last_label;
+
+	last_jump = NULL;
+	i = serialized_compiler->jump_count;
+	if ((sljit_uw)(end - ptr) < i * sizeof(struct sljit_serialized_jump))
+		goto error;
+
+	while (i > 0) {
+		jump = (struct sljit_jump*)ensure_abuf(compiler, sizeof(struct sljit_jump));
+		if (jump == NULL)
+			goto error;
+
+		serialized_jump = (struct sljit_serialized_jump*)ptr;
+		jump->next = NULL;
+		jump->addr = serialized_jump->addr;
+		jump->flags = serialized_jump->flags;
+
+		if (!(serialized_jump->flags & JUMP_ADDR)) {
+			if (serialized_jump->value != SLJIT_MAX_ADDRESS) {
+				if (serialized_jump->value >= label_count)
+					goto error;
+				jump->u.label = label_list[serialized_jump->value];
+			} else
+				jump->u.label = NULL;
+		} else
+			jump->u.target = serialized_jump->value;
+
+		if (last_jump != NULL)
+			last_jump->next = jump;
+		else
+			compiler->jumps = jump;
+		last_jump = jump;
+
+		ptr += sizeof(struct sljit_serialized_jump);
+		i--;
+	}
+	compiler->last_jump = last_jump;
+
+	SLJIT_FREE(label_list, allocator_data);
+	label_list = NULL;
+
+	last_const = NULL;
+	i = serialized_compiler->const_count;
+	if ((sljit_uw)(end - ptr) < i * sizeof(struct sljit_serialized_const))
+		goto error;
+
+	while (i > 0) {
+		const_ = (struct sljit_const*)ensure_abuf(compiler, sizeof(struct sljit_const));
+		if (const_ == NULL)
+			goto error;
+
+		serialized_const = (struct sljit_serialized_const*)ptr;
+		const_->next = NULL;
+		const_->addr = serialized_const->addr;
+
+		if (last_const != NULL)
+			last_const->next = const_;
+		else
+			compiler->consts = const_;
+		last_const = const_;
+
+		ptr += sizeof(struct sljit_serialized_const);
+		i--;
+	}
+	compiler->last_const = last_const;
+
+#if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) \
+		|| (defined SLJIT_DEBUG && SLJIT_DEBUG)
+	if ((sljit_uw)(end - ptr) < sizeof(struct sljit_serialized_debug_info))
+		goto error;
+
+	serialized_debug_info = (struct sljit_serialized_debug_info*)ptr;
+	compiler->last_flags = (sljit_s32)serialized_debug_info->last_flags;
+	compiler->last_return = serialized_debug_info->last_return;
+	compiler->logical_local_size = serialized_debug_info->logical_local_size;
+#endif /* SLJIT_ARGUMENT_CHECKS || SLJIT_DEBUG */
+
+	return compiler;
+
+error:
+	sljit_free_compiler(compiler);
+	if (label_list != NULL)
+		SLJIT_FREE(label_list, allocator_data);
+	return NULL;
+}
diff --git a/engine/thirdparty/pcre2/src/sljit/sljitUtils.c b/engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitUtils.c
similarity index 100%
rename from engine/thirdparty/pcre2/src/sljit/sljitUtils.c
rename to engine/thirdparty/pcre2/deps/sljit/sljit_src/sljitUtils.c
diff --git a/engine/thirdparty/pcre2/src/config.h b/engine/thirdparty/pcre2/src/config.h
index e8779b55..380a0890 100644
--- a/engine/thirdparty/pcre2/src/config.h
+++ b/engine/thirdparty/pcre2/src/config.h
@@ -52,15 +52,24 @@ sure both macros are undefined; an emulation function will then be used. */
    LF does in an ASCII/Unicode environment. */
 /* #undef EBCDIC_NL25 */
 
+/* Define to 1 if you have the <assert.h> header file. */
+/* #undef HAVE_ASSERT_H */
+
 /* Define this if your compiler supports __attribute__((uninitialized)) */
 /* #undef HAVE_ATTRIBUTE_UNINITIALIZED */
 
-/* Define to 1 if you have the 'bcopy' function. */
+/* Define to 1 if you have the `bcopy' function. */
 /* #undef HAVE_BCOPY */
 
+/* Define this if your compiler provides __assume() */
+/* #undef HAVE_BUILTIN_ASSUME */
+
 /* Define this if your compiler provides __builtin_mul_overflow() */
 /* #undef HAVE_BUILTIN_MUL_OVERFLOW */
 
+/* Define this if your compiler provides __builtin_unreachable() */
+/* #undef HAVE_BUILTIN_UNREACHABLE */
+
 /* Define to 1 if you have the <bzlib.h> header file. */
 /* #undef HAVE_BZLIB_H */
 
@@ -82,16 +91,16 @@ sure both macros are undefined; an emulation function will then be used. */
 /* Define to 1 if you have the <limits.h> header file. */
 /* #undef HAVE_LIMITS_H */
 
-/* Define to 1 if you have the 'memfd_create' function. */
+/* Define to 1 if you have the `memfd_create' function. */
 /* #undef HAVE_MEMFD_CREATE */
 
-/* Define to 1 if you have the 'memmove' function. */
+/* Define to 1 if you have the `memmove' function. */
 /* #undef HAVE_MEMMOVE */
 
 /* Define to 1 if you have the <minix/config.h> header file. */
 /* #undef HAVE_MINIX_CONFIG_H */
 
-/* Define to 1 if you have the 'mkostemp' function. */
+/* Define to 1 if you have the `mkostemp' function. */
 /* #undef HAVE_MKOSTEMP */
 
 /* Define if you have POSIX threads libraries and header files. */
@@ -112,7 +121,7 @@ sure both macros are undefined; an emulation function will then be used. */
 /* Define to 1 if you have the `realpath' function. */
 /* #undef HAVE_REALPATH */
 
-/* Define to 1 if you have the 'secure_getenv' function. */
+/* Define to 1 if you have the `secure_getenv' function. */
 /* #undef HAVE_SECURE_GETENV */
 
 /* Define to 1 if you have the <stdint.h> header file. */
@@ -124,7 +133,7 @@ sure both macros are undefined; an emulation function will then be used. */
 /* Define to 1 if you have the <stdlib.h> header file. */
 /* #undef HAVE_STDLIB_H */
 
-/* Define to 1 if you have the 'strerror' function. */
+/* Define to 1 if you have the `strerror' function. */
 /* #undef HAVE_STRERROR */
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -145,7 +154,8 @@ sure both macros are undefined; an emulation function will then be used. */
 /* Define to 1 if you have the <unistd.h> header file. */
 /* #undef HAVE_UNISTD_H */
 
-/* Define to 1 if the compiler supports simple visibility declarations. */
+/* Define to 1 if the compiler supports GCC compatible visibility
+   declarations. */
 /* #undef HAVE_VISIBILITY */
 
 /* Define to 1 if you have the <wchar.h> header file. */
@@ -215,7 +225,7 @@ sure both macros are undefined; an emulation function will then be used. */
    Care must be taken if it is increased, because it guards against integer
    overflow caused by enormously large patterns. */
 #ifndef MAX_NAME_SIZE
-#define MAX_NAME_SIZE 32
+#define MAX_NAME_SIZE 128
 #endif
 
 /* The value of MAX_VARLOOKBEHIND specifies the default maximum length, in
@@ -245,7 +255,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_NAME "PCRE2"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PCRE2 10.43"
+#define PACKAGE_STRING "PCRE2 10.45"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pcre2"
@@ -254,7 +264,7 @@ sure both macros are undefined; an emulation function will then be used. */
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "10.43"
+#define PACKAGE_VERSION "10.45"
 
 /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
    parentheses (of any kind) in a pattern. This limits the amount of system
@@ -311,7 +321,7 @@ sure both macros are undefined; an emulation function will then be used. */
    unless SUPPORT_JIT is also defined. */
 /* #undef SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
-/* Define to 1 if all of the C89 standard headers exist (not just the ones
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 /* #undef STDC_HEADERS */
@@ -366,7 +376,7 @@ sure both macros are undefined; an emulation function will then be used. */
 /* Define to any value for valgrind support to find invalid memory reads. */
 /* #undef SUPPORT_VALGRIND */
 
-/* Enable extensions on AIX, Interix, z/OS.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # define _ALL_SOURCE 1
 #endif
@@ -427,15 +437,11 @@ sure both macros are undefined; an emulation function will then be used. */
 #ifndef __STDC_WANT_IEC_60559_DFP_EXT__
 # define __STDC_WANT_IEC_60559_DFP_EXT__ 1
 #endif
-/* Enable extensions specified by C23 Annex F.  */
-#ifndef __STDC_WANT_IEC_60559_EXT__
-# define __STDC_WANT_IEC_60559_EXT__ 1
-#endif
 /* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
 #ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
 # define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
 #endif
-/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
+/* Enable extensions specified by ISO/IEC TS 18661-3:2015.  */
 #ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
 # define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
 #endif
@@ -458,26 +464,20 @@ sure both macros are undefined; an emulation function will then be used. */
 #endif
 
 /* Version number of package */
-#define VERSION "10.43"
+#define VERSION "10.45"
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 /* #undef _FILE_OFFSET_BITS */
 
-/* Define to 1 on platforms where this makes off_t a 64-bit type. */
+/* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
-/* Number of bits in time_t, on hosts where this is settable. */
-/* #undef _TIME_BITS */
-
-/* Define to 1 on platforms where this makes time_t a 64-bit type. */
-/* #undef __MINGW_USE_VC2005_COMPAT */
-
-/* Define to empty if 'const' does not conform to ANSI C. */
+/* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
 /* Define to the type of a signed integer type of width exactly 64 bits if
    such a type exists and the standard includes do not define it. */
 /* #undef int64_t */
 
-/* Define as 'unsigned int' if <stddef.h> doesn't define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
diff --git a/engine/thirdparty/pcre2/src/pcre2.h b/engine/thirdparty/pcre2/src/pcre2.h
index d7a8ff52..061f3db0 100644
--- a/engine/thirdparty/pcre2/src/pcre2.h
+++ b/engine/thirdparty/pcre2/src/pcre2.h
@@ -42,9 +42,9 @@ POSSIBILITY OF SUCH DAMAGE.
 /* The current PCRE version information. */
 
 #define PCRE2_MAJOR           10
-#define PCRE2_MINOR           43
+#define PCRE2_MINOR           45
 #define PCRE2_PRERELEASE      
-#define PCRE2_DATE            2024-02-16
+#define PCRE2_DATE            2025-02-05
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE2, the appropriate
@@ -143,6 +143,7 @@ D   is inspected during pcre2_dfa_match() execution
 #define PCRE2_EXTENDED_MORE       0x01000000u  /* C       */
 #define PCRE2_LITERAL             0x02000000u  /* C       */
 #define PCRE2_MATCH_INVALID_UTF   0x04000000u  /*   J M D */
+#define PCRE2_ALT_EXTENDED_CLASS  0x08000000u  /* C       */
 
 /* An additional compile options word is available in the compile context. */
 
@@ -159,6 +160,10 @@ D   is inspected during pcre2_dfa_match() execution
 #define PCRE2_EXTRA_ASCII_BSW                0x00000400u  /* C */
 #define PCRE2_EXTRA_ASCII_POSIX              0x00000800u  /* C */
 #define PCRE2_EXTRA_ASCII_DIGIT              0x00001000u  /* C */
+#define PCRE2_EXTRA_PYTHON_OCTAL             0x00002000u  /* C */
+#define PCRE2_EXTRA_NO_BS0                   0x00004000u  /* C */
+#define PCRE2_EXTRA_NEVER_CALLOUT            0x00008000u  /* C */
+#define PCRE2_EXTRA_TURKISH_CASING           0x00010000u  /* C */
 
 /* These are for pcre2_jit_compile(). */
 
@@ -166,6 +171,7 @@ D   is inspected during pcre2_dfa_match() execution
 #define PCRE2_JIT_PARTIAL_SOFT    0x00000002u
 #define PCRE2_JIT_PARTIAL_HARD    0x00000004u
 #define PCRE2_JIT_INVALID_UTF     0x00000100u
+#define PCRE2_JIT_TEST_ALLOC      0x00000200u
 
 /* These are for pcre2_match(), pcre2_dfa_match(), pcre2_jit_match(), and
 pcre2_substitute(). Some are allowed only for one of the functions, and in
@@ -318,9 +324,25 @@ pcre2_pattern_convert(). */
 #define PCRE2_ERROR_ALPHA_ASSERTION_UNKNOWN        195
 #define PCRE2_ERROR_SCRIPT_RUN_NOT_AVAILABLE       196
 #define PCRE2_ERROR_TOO_MANY_CAPTURES              197
-#define PCRE2_ERROR_CONDITION_ATOMIC_ASSERTION_EXPECTED  198
+#define PCRE2_ERROR_MISSING_OCTAL_DIGIT            198
 #define PCRE2_ERROR_BACKSLASH_K_IN_LOOKAROUND      199
-
+#define PCRE2_ERROR_MAX_VAR_LOOKBEHIND_EXCEEDED    200
+#define PCRE2_ERROR_PATTERN_COMPILED_SIZE_TOO_BIG  201
+#define PCRE2_ERROR_OVERSIZE_PYTHON_OCTAL          202
+#define PCRE2_ERROR_CALLOUT_CALLER_DISABLED        203
+#define PCRE2_ERROR_EXTRA_CASING_REQUIRES_UNICODE  204
+#define PCRE2_ERROR_TURKISH_CASING_REQUIRES_UTF    205
+#define PCRE2_ERROR_EXTRA_CASING_INCOMPATIBLE      206
+#define PCRE2_ERROR_ECLASS_NEST_TOO_DEEP           207
+#define PCRE2_ERROR_ECLASS_INVALID_OPERATOR        208
+#define PCRE2_ERROR_ECLASS_UNEXPECTED_OPERATOR     209
+#define PCRE2_ERROR_ECLASS_EXPECTED_OPERAND        210
+#define PCRE2_ERROR_ECLASS_MIXED_OPERATORS         211
+#define PCRE2_ERROR_ECLASS_HINT_SQUARE_BRACKET     212
+#define PCRE2_ERROR_PERL_ECLASS_UNEXPECTED_EXPR    213
+#define PCRE2_ERROR_PERL_ECLASS_EMPTY_EXPR         214
+#define PCRE2_ERROR_PERL_ECLASS_MISSING_CLOSE      215
+#define PCRE2_ERROR_PERL_ECLASS_UNEXPECTED_CHAR    216
 
 /* "Expected" matching error codes: no match and partial match. */
 
@@ -407,6 +429,9 @@ released, the numbers must not be changed. */
 #define PCRE2_ERROR_INTERNAL_DUPMATCH (-65)
 #define PCRE2_ERROR_DFA_UINVALID_UTF  (-66)
 #define PCRE2_ERROR_INVALIDOFFSET     (-67)
+#define PCRE2_ERROR_JIT_UNSUPPORTED   (-68)
+#define PCRE2_ERROR_REPLACECASE       (-69)
+#define PCRE2_ERROR_TOOLARGEREPLACE   (-70)
 
 
 /* Request types for pcre2_pattern_info() */
@@ -460,6 +485,30 @@ released, the numbers must not be changed. */
 #define PCRE2_CONFIG_COMPILED_WIDTHS        14
 #define PCRE2_CONFIG_TABLES_LENGTH          15
 
+/* Optimization directives for pcre2_set_optimize().
+For binary compatibility, only add to this list; do not renumber. */
+
+#define PCRE2_OPTIMIZATION_NONE    0
+#define PCRE2_OPTIMIZATION_FULL    1
+
+#define PCRE2_AUTO_POSSESS         64
+#define PCRE2_AUTO_POSSESS_OFF     65
+#define PCRE2_DOTSTAR_ANCHOR       66
+#define PCRE2_DOTSTAR_ANCHOR_OFF   67
+#define PCRE2_START_OPTIMIZE       68
+#define PCRE2_START_OPTIMIZE_OFF   69
+
+/* Types used in pcre2_set_substitute_case_callout().
+
+PCRE2_SUBSTITUTE_CASE_LOWER and PCRE2_SUBSTITUTE_CASE_UPPER are passed to the
+callout to indicate that the case of the entire callout input should be
+case-transformed. PCRE2_SUBSTITUTE_CASE_TITLE_FIRST is passed to indicate that
+only the first character or glyph should be transformed to Unicode titlecase,
+and the rest to lowercase. */
+
+#define PCRE2_SUBSTITUTE_CASE_LOWER        1
+#define PCRE2_SUBSTITUTE_CASE_UPPER        2
+#define PCRE2_SUBSTITUTE_CASE_TITLE_FIRST  3
 
 /* Types for code units in patterns and subject strings. */
 
@@ -603,6 +652,8 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_set_compile_extra_options(pcre2_compile_context *, uint32_t); \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_set_max_pattern_length(pcre2_compile_context *, PCRE2_SIZE); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_max_pattern_compiled_length(pcre2_compile_context *, PCRE2_SIZE); \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_set_max_varlookbehind(pcre2_compile_context *, uint32_t); \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
@@ -611,7 +662,9 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_set_parens_nest_limit(pcre2_compile_context *, uint32_t); \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_set_compile_recursion_guard(pcre2_compile_context *, \
-    int (*)(uint32_t, void *), void *);
+    int (*)(uint32_t, void *), void *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_optimize(pcre2_compile_context *, uint32_t);
 
 #define PCRE2_MATCH_CONTEXT_FUNCTIONS \
 PCRE2_EXP_DECL pcre2_match_context *PCRE2_CALL_CONVENTION \
@@ -626,6 +679,11 @@ PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_set_substitute_callout(pcre2_match_context *, \
     int (*)(pcre2_substitute_callout_block *, void *), void *); \
+PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
+  pcre2_set_substitute_case_callout(pcre2_match_context *, \
+    PCRE2_SIZE (*)(PCRE2_SPTR, PCRE2_SIZE, PCRE2_UCHAR *, PCRE2_SIZE, int, \
+                   void *), \
+    void *); \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_set_depth_limit(pcre2_match_context *, uint32_t); \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
@@ -738,6 +796,7 @@ PCRE2_EXP_DECL void PCRE2_CALL_CONVENTION \
 PCRE2_EXP_DECL int PCRE2_CALL_CONVENTION \
   pcre2_substring_list_get(pcre2_match_data *, PCRE2_UCHAR ***, PCRE2_SIZE **);
 
+
 /* Functions for serializing / deserializing compiled patterns. */
 
 #define PCRE2_SERIALIZE_FUNCTIONS \
@@ -901,10 +960,13 @@ pcre2_compile are called by application code. */
 #define pcre2_set_match_limit                 PCRE2_SUFFIX(pcre2_set_match_limit_)
 #define pcre2_set_max_varlookbehind           PCRE2_SUFFIX(pcre2_set_max_varlookbehind_)
 #define pcre2_set_max_pattern_length          PCRE2_SUFFIX(pcre2_set_max_pattern_length_)
+#define pcre2_set_max_pattern_compiled_length PCRE2_SUFFIX(pcre2_set_max_pattern_compiled_length_)
 #define pcre2_set_newline                     PCRE2_SUFFIX(pcre2_set_newline_)
 #define pcre2_set_parens_nest_limit           PCRE2_SUFFIX(pcre2_set_parens_nest_limit_)
 #define pcre2_set_offset_limit                PCRE2_SUFFIX(pcre2_set_offset_limit_)
+#define pcre2_set_optimize                    PCRE2_SUFFIX(pcre2_set_optimize_)
 #define pcre2_set_substitute_callout          PCRE2_SUFFIX(pcre2_set_substitute_callout_)
+#define pcre2_set_substitute_case_callout     PCRE2_SUFFIX(pcre2_set_substitute_case_callout_)
 #define pcre2_substitute                      PCRE2_SUFFIX(pcre2_substitute_)
 #define pcre2_substring_copy_byname           PCRE2_SUFFIX(pcre2_substring_copy_byname_)
 #define pcre2_substring_copy_bynumber         PCRE2_SUFFIX(pcre2_substring_copy_bynumber_)
diff --git a/engine/thirdparty/pcre2/src/pcre2_auto_possess.c b/engine/thirdparty/pcre2/src/pcre2_auto_possess.c
index 210d13d3..6d7f27b6 100644
--- a/engine/thirdparty/pcre2/src/pcre2_auto_possess.c
+++ b/engine/thirdparty/pcre2/src/pcre2_auto_possess.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2022 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -49,6 +49,10 @@ repeats into possessive repeats where possible. */
 
 #include "pcre2_internal.h"
 
+/* This macro represents the max size of list[] and that is used to keep
+track of UCD info in several places, it should be kept on sync with the
+value used by GenerateUcd.py */
+#define MAX_LIST 8
 
 /*************************************************
 *        Tables for auto-possessification        *
@@ -64,7 +68,7 @@ The Unicode property types (\P and \p) have to be present to fill out the table
 because of what their opcode values are, but the table values should always be
 zero because property types are handled separately in the code. The last four
 columns apply to items that cannot be repeated, so there is no need to have
-rows for them. Note that OP_DIGIT etc. are generated only when PCRE_UCP is
+rows for them. Note that OP_DIGIT etc. are generated only when PCRE2_UCP is
 *not* set. When it is set, \d etc. are converted into OP_(NOT_)PROP codes. */
 
 #define APTROWS (LAST_AUTOTAB_LEFT_OP - FIRST_AUTOTAB_OP + 1)
@@ -123,21 +127,21 @@ opcode is used to select the column. The values are as follows:
 */
 
 static const uint8_t propposstab[PT_TABSIZE][PT_TABSIZE] = {
-/* ANY LAMP GC  PC  SC  SCX ALNUM SPACE PXSPACE WORD CLIST UCNC BIDICL BOOL */
-  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_ANY */
-  { 0,  3,  0,  0,  0,   0,    3,    1,      1,   0,    0,   0,    0,    0 },  /* PT_LAMP */
-  { 0,  0,  2,  4,  0,   0,    9,   10,     10,  11,    0,   0,    0,    0 },  /* PT_GC */
-  { 0,  0,  5,  2,  0,   0,   15,   16,     16,  17,    0,   0,    0,    0 },  /* PT_PC */
-  { 0,  0,  0,  0,  2,   2,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_SC */
-  { 0,  0,  0,  0,  2,   2,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_SCX */
-  { 0,  3,  6, 12,  0,   0,    3,    1,      1,   0,    0,   0,    0,    0 },  /* PT_ALNUM */
-  { 0,  1,  7, 13,  0,   0,    1,    3,      3,   1,    0,   0,    0,    0 },  /* PT_SPACE */
-  { 0,  1,  7, 13,  0,   0,    1,    3,      3,   1,    0,   0,    0,    0 },  /* PT_PXSPACE */
-  { 0,  0,  8, 14,  0,   0,    0,    1,      1,   3,    0,   0,    0,    0 },  /* PT_WORD */
-  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_CLIST */
-  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   3,    0,    0 },  /* PT_UCNC */
-  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_BIDICL */
-  { 0,  0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 }   /* PT_BOOL */
+/* LAMP GC  PC  SC  SCX ALNUM SPACE PXSPACE WORD CLIST UCNC BIDICL BOOL */
+  { 3,  0,  0,  0,   0,    3,    1,      1,   0,    0,   0,    0,    0 },  /* PT_LAMP */
+  { 0,  2,  4,  0,   0,    9,   10,     10,  11,    0,   0,    0,    0 },  /* PT_GC */
+  { 0,  5,  2,  0,   0,   15,   16,     16,  17,    0,   0,    0,    0 },  /* PT_PC */
+  { 0,  0,  0,  2,   2,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_SC */
+  { 0,  0,  0,  2,   2,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_SCX */
+  { 3,  6, 12,  0,   0,    3,    1,      1,   0,    0,   0,    0,    0 },  /* PT_ALNUM */
+  { 1,  7, 13,  0,   0,    1,    3,      3,   1,    0,   0,    0,    0 },  /* PT_SPACE */
+  { 1,  7, 13,  0,   0,    1,    3,      3,   1,    0,   0,    0,    0 },  /* PT_PXSPACE */
+  { 0,  8, 14,  0,   0,    0,    1,      1,   3,    0,   0,    0,    0 },  /* PT_WORD */
+  { 0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_CLIST */
+  { 0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   3,    0,    0 },  /* PT_UCNC */
+  { 0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 },  /* PT_BIDICL */
+  { 0,  0,  0,  0,   0,    0,    0,      0,   0,    0,   0,    0,    0 }   /* PT_BOOL */
+  /* PT_ANY does not need a record. */
 };
 
 /* This table is used to check whether auto-possessification is possible
@@ -199,7 +203,7 @@ static BOOL
 check_char_prop(uint32_t c, unsigned int ptype, unsigned int pdata,
   BOOL negated)
 {
-BOOL ok;
+BOOL ok, rc;
 const uint32_t *p;
 const ucd_record *prop = GET_UCD(c);
 
@@ -240,12 +244,13 @@ switch(ptype)
     {
     HSPACE_CASES:
     VSPACE_CASES:
-    return negated;
+    rc = negated;
+    break;
 
     default:
-    return (PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == negated;
+    rc = (PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == negated;
     }
-  break;  /* Control never reaches here */
+  return rc;
 
   case PT_WORD:
   return (PRIV(ucp_gentype)[prop->chartype] == ucp_L ||
@@ -259,7 +264,8 @@ switch(ptype)
     if (c < *p) return !negated;
     if (c == *p++) return negated;
     }
-  break;  /* Control never reaches here */
+  PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
+  break;
 
   /* Haven't yet thought these through. */
 
@@ -328,6 +334,7 @@ get_chr_property_list(PCRE2_SPTR code, BOOL utf, BOOL ucp, const uint8_t *fcc,
 PCRE2_UCHAR c = *code;
 PCRE2_UCHAR base;
 PCRE2_SPTR end;
+PCRE2_SPTR class_end;
 uint32_t chr;
 
 #ifdef SUPPORT_UNICODE
@@ -450,10 +457,12 @@ switch(c)
   code += 2;
 
   do {
-     if (clist_dest >= list + 8)
+     if (clist_dest >= list + MAX_LIST)
        {
-       /* Early return if there is not enough space. This should never
-       happen, since all clists are shorter than 5 character now. */
+       /* Early return if there is not enough space. GenerateUcd.py
+       generated a list with more than 5 characters and something
+       must be done about that going forward. */
+       PCRE2_DEBUG_UNREACHABLE();   /* Remove if it ever triggers */
        list[2] = code[0];
        list[3] = code[1];
        return code;
@@ -473,11 +482,13 @@ switch(c)
   case OP_CLASS:
 #ifdef SUPPORT_WIDE_CHARS
   case OP_XCLASS:
-  if (c == OP_XCLASS)
+  case OP_ECLASS:
+  if (c == OP_XCLASS || c == OP_ECLASS)
     end = code + GET(code, 0) - 1;
   else
 #endif
     end = code + 32 / sizeof(PCRE2_UCHAR);
+  class_end = end;
 
   switch(*end)
     {
@@ -505,6 +516,7 @@ switch(c)
     break;
     }
   list[2] = (uint32_t)(end - code);
+  list[3] = (uint32_t)(end - class_end);
   return end;
   }
 
@@ -537,7 +549,7 @@ compare_opcodes(PCRE2_SPTR code, BOOL utf, BOOL ucp, const compile_block *cb,
   const uint32_t *base_list, PCRE2_SPTR base_end, int *rec_limit)
 {
 PCRE2_UCHAR c;
-uint32_t list[8];
+uint32_t list[MAX_LIST];
 const uint32_t *chr_ptr;
 const uint32_t *ochr_ptr;
 const uint32_t *list_ptr;
@@ -581,7 +593,7 @@ for(;;)
     continue;
     }
 
-  /* At the end of a branch, skip to the end of the group. */
+  /* At the end of a branch, skip to the end of the group and process it. */
 
   if (c == OP_ALT)
     {
@@ -638,19 +650,29 @@ for(;;)
         return FALSE;
       break;
 
-      /* Atomic sub-patterns and assertions can always auto-possessify their
-      last iterator except for variable length lookbehinds. However, if the
-      group was entered as a result of checking a previous iterator, this is
-      not possible. */
+      /* Atomic sub-patterns and forward assertions can always auto-possessify
+      their last iterator. However, if the group was entered as a result of
+      checking a previous iterator, this is not possible. */
 
       case OP_ASSERT:
       case OP_ASSERT_NOT:
       case OP_ONCE:
       return !entered_a_group;
 
+      /* Fixed-length lookbehinds can be treated the same way, but variable
+      length lookbehinds must not auto-possessify their last iterator. Note
+      that in order to identify a variable length lookbehind we must check
+      through all branches, because some may be of fixed length. */
+
       case OP_ASSERTBACK:
       case OP_ASSERTBACK_NOT:
-      return (bracode[1+LINK_SIZE] == OP_VREVERSE)? FALSE : !entered_a_group;
+      do
+        {
+        if (bracode[1+LINK_SIZE] == OP_VREVERSE) return FALSE;  /* Variable */
+        bracode += GET(bracode, 1);
+        }
+      while (*bracode == OP_ALT);
+      return !entered_a_group;  /* Not variable length */
 
       /* Non-atomic assertions - don't possessify last iterator. This needs
       more thought. */
@@ -748,12 +770,12 @@ for(;;)
     if (base_list[0] == OP_CLASS)
 #endif
       {
-      set1 = (uint8_t *)(base_end - base_list[2]);
+      set1 = (const uint8_t *)(base_end - base_list[2]);
       list_ptr = list;
       }
     else
       {
-      set1 = (uint8_t *)(code - list[2]);
+      set1 = (const uint8_t *)(code - list[2]);
       list_ptr = base_list;
       }
 
@@ -762,13 +784,14 @@ for(;;)
       {
       case OP_CLASS:
       case OP_NCLASS:
-      set2 = (uint8_t *)
+      set2 = (const uint8_t *)
         ((list_ptr == list ? code : base_end) - list_ptr[2]);
       break;
 
 #ifdef SUPPORT_WIDE_CHARS
       case OP_XCLASS:
-      xclass_flags = (list_ptr == list ? code : base_end) - list_ptr[2] + LINK_SIZE;
+      xclass_flags = (list_ptr == list ? code : base_end) -
+        list_ptr[2] + LINK_SIZE;
       if ((*xclass_flags & XCL_HASPROP) != 0) return FALSE;
       if ((*xclass_flags & XCL_MAP) == 0)
         {
@@ -777,7 +800,7 @@ for(;;)
         /* Might be an empty repeat. */
         continue;
         }
-      set2 = (uint8_t *)(xclass_flags + 1);
+      set2 = (const uint8_t *)(xclass_flags + 1);
       break;
 #endif
 
@@ -785,21 +808,21 @@ for(;;)
       invert_bits = TRUE;
       /* Fall through */
       case OP_DIGIT:
-      set2 = (uint8_t *)(cb->cbits + cbit_digit);
+      set2 = (const uint8_t *)(cb->cbits + cbit_digit);
       break;
 
       case OP_NOT_WHITESPACE:
       invert_bits = TRUE;
       /* Fall through */
       case OP_WHITESPACE:
-      set2 = (uint8_t *)(cb->cbits + cbit_space);
+      set2 = (const uint8_t *)(cb->cbits + cbit_space);
       break;
 
       case OP_NOT_WORDCHAR:
       invert_bits = TRUE;
       /* Fall through */
       case OP_WORDCHAR:
-      set2 = (uint8_t *)(cb->cbits + cbit_word);
+      set2 = (const uint8_t *)(cb->cbits + cbit_word);
       break;
 
       default:
@@ -1084,7 +1107,7 @@ for(;;)
 
       case OP_CLASS:
       if (chr > 255) break;
-      class_bitset = (uint8_t *)
+      class_bitset = (const uint8_t *)
         ((list_ptr == list ? code : base_end) - list_ptr[2]);
       if ((class_bitset[chr >> 3] & (1u << (chr & 7))) != 0) return FALSE;
       break;
@@ -1092,9 +1115,18 @@ for(;;)
 #ifdef SUPPORT_WIDE_CHARS
       case OP_XCLASS:
       if (PRIV(xclass)(chr, (list_ptr == list ? code : base_end) -
-          list_ptr[2] + LINK_SIZE, utf)) return FALSE;
+          list_ptr[2] + LINK_SIZE, (const uint8_t*)cb->start_code, utf))
+        return FALSE;
       break;
-#endif
+
+      case OP_ECLASS:
+      if (PRIV(eclass)(chr,
+          (list_ptr == list ? code : base_end) - list_ptr[2] + LINK_SIZE,
+          (list_ptr == list ? code : base_end) - list_ptr[3],
+          (const uint8_t*)cb->start_code, utf))
+        return FALSE;
+      break;
+#endif /* SUPPORT_WIDE_CHARS */
 
       default:
       return FALSE;
@@ -1109,8 +1141,8 @@ for(;;)
   if (list[1] == 0) return TRUE;
   }
 
-/* Control never reaches here. There used to be a fail-save return FALSE; here,
-but some compilers complain about an unreachable statement. */
+PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
+return FALSE;              /* Avoid compiler warnings */
 }
 
 
@@ -1140,7 +1172,7 @@ PRIV(auto_possessify)(PCRE2_UCHAR *code, const compile_block *cb)
 PCRE2_UCHAR c;
 PCRE2_SPTR end;
 PCRE2_UCHAR *repeat_opcode;
-uint32_t list[8];
+uint32_t list[MAX_LIST];
 int rec_limit = 1000;  /* Was 10,000 but clang+ASAN uses a lot of stack. */
 BOOL utf = (cb->external_options & PCRE2_UTF) != 0;
 BOOL ucp = (cb->external_options & PCRE2_UCP) != 0;
@@ -1149,7 +1181,11 @@ for (;;)
   {
   c = *code;
 
-  if (c >= OP_TABLE_LENGTH) return -1;   /* Something gone wrong */
+  if (c >= OP_TABLE_LENGTH)
+    {
+    PCRE2_DEBUG_UNREACHABLE();
+    return -1;   /* Something gone wrong */
+    }
 
   if (c >= OP_STAR && c <= OP_TYPEPOSUPTO)
     {
@@ -1198,10 +1234,14 @@ for (;;)
       }
     c = *code;
     }
-  else if (c == OP_CLASS || c == OP_NCLASS || c == OP_XCLASS)
+  else if (c == OP_CLASS || c == OP_NCLASS
+#ifdef SUPPORT_WIDE_CHARS
+           || c == OP_XCLASS || c == OP_ECLASS
+#endif
+           )
     {
 #ifdef SUPPORT_WIDE_CHARS
-    if (c == OP_XCLASS)
+    if (c == OP_XCLASS || c == OP_ECLASS)
       repeat_opcode = code + GET(code, 1);
     else
 #endif
@@ -1211,7 +1251,7 @@ for (;;)
     if (c >= OP_CRSTAR && c <= OP_CRMINRANGE)
       {
       /* The return from get_chr_property_list() will never be NULL when
-      *code (aka c) is one of the three class opcodes. However, gcc with
+      *code (aka c) is one of the four class opcodes. However, gcc with
       -fanalyzer notes that a NULL return is possible, and grumbles. Hence we
       put in a check. */
 
@@ -1279,6 +1319,7 @@ for (;;)
 
 #ifdef SUPPORT_WIDE_CHARS
     case OP_XCLASS:
+    case OP_ECLASS:
     code += GET(code, 1);
     break;
 #endif
diff --git a/engine/thirdparty/pcre2/src/pcre2_chkdint.c b/engine/thirdparty/pcre2/src/pcre2_chkdint.c
index d04f6f8c..70830236 100644
--- a/engine/thirdparty/pcre2/src/pcre2_chkdint.c
+++ b/engine/thirdparty/pcre2/src/pcre2_chkdint.c
@@ -74,9 +74,7 @@ if (__builtin_mul_overflow(a, b, &m)) return TRUE;
 #else
 INT64_OR_DOUBLE m;
 
-#ifdef PCRE2_DEBUG
-if (a < 0 || b < 0) abort();
-#endif
+PCRE2_ASSERT(a >= 0 && b >= 0);
 
 m = (INT64_OR_DOUBLE)a * (INT64_OR_DOUBLE)b;
 
@@ -93,4 +91,4 @@ if (m > PCRE2_SIZE_MAX) return TRUE;
 return FALSE;
 }
 
-/* End of pcre_chkdint.c */
+/* End of pcre2_chkdint.c */
diff --git a/engine/thirdparty/pcre2/src/pcre2_compile.c b/engine/thirdparty/pcre2/src/pcre2_compile.c
index 8b364977..0ffac893 100644
--- a/engine/thirdparty/pcre2/src/pcre2_compile.c
+++ b/engine/thirdparty/pcre2/src/pcre2_compile.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define PSSTART start_pattern  /* Field containing processed string start */
 #define PSEND   end_pattern    /* Field containing processed string end */
 
-#include "pcre2_internal.h"
+#include "pcre2_compile.h"
 
 /* In rare error cases debugging might require calling pcre2_printint(). */
 
@@ -108,20 +108,8 @@ them will be able to (i.e. assume a 64-bit world). */
 #define SIZEOFFSET 2
 #endif
 
-/* Macros for manipulating elements of the parsed pattern vector. */
-
-#define META_CODE(x)   (x & 0xffff0000u)
-#define META_DATA(x)   (x & 0x0000ffffu)
-#define META_DIFF(x,y) ((x-y)>>16)
-
 /* Function definitions to allow mutual recursion */
 
-#ifdef SUPPORT_UNICODE
-static unsigned int
-  add_list_to_class_internal(uint8_t *, PCRE2_UCHAR **, uint32_t, uint32_t,
-    compile_block *, const uint32_t *, unsigned int);
-#endif
-
 static int
   compile_regex(uint32_t, uint32_t, PCRE2_UCHAR **, uint32_t **, int *,
     uint32_t, uint32_t *, uint32_t *, uint32_t *, uint32_t *, branch_chain *,
@@ -199,106 +187,6 @@ don't have to check them every time. */
 
 #define OFLOW_MAX (INT_MAX - 20)
 
-/* Code values for parsed patterns, which are stored in a vector of 32-bit
-unsigned ints. Values less than META_END are literal data values. The coding
-for identifying the item is in the top 16-bits, leaving 16 bits for the
-additional data that some of them need. The META_CODE, META_DATA, and META_DIFF
-macros are used to manipulate parsed pattern elements.
-
-NOTE: When these definitions are changed, the table of extra lengths for each
-code (meta_extra_lengths, just below) must be updated to remain in step. */
-
-#define META_END              0x80000000u  /* End of pattern */
-
-#define META_ALT              0x80010000u  /* alternation */
-#define META_ATOMIC           0x80020000u  /* atomic group */
-#define META_BACKREF          0x80030000u  /* Back ref */
-#define META_BACKREF_BYNAME   0x80040000u  /* \k'name' */
-#define META_BIGVALUE         0x80050000u  /* Next is a literal > META_END */
-#define META_CALLOUT_NUMBER   0x80060000u  /* (?C with numerical argument */
-#define META_CALLOUT_STRING   0x80070000u  /* (?C with string argument */
-#define META_CAPTURE          0x80080000u  /* Capturing parenthesis */
-#define META_CIRCUMFLEX       0x80090000u  /* ^ metacharacter */
-#define META_CLASS            0x800a0000u  /* start non-empty class */
-#define META_CLASS_EMPTY      0x800b0000u  /* empty class */
-#define META_CLASS_EMPTY_NOT  0x800c0000u  /* negative empty class */
-#define META_CLASS_END        0x800d0000u  /* end of non-empty class */
-#define META_CLASS_NOT        0x800e0000u  /* start non-empty negative class */
-#define META_COND_ASSERT      0x800f0000u  /* (?(?assertion)... */
-#define META_COND_DEFINE      0x80100000u  /* (?(DEFINE)... */
-#define META_COND_NAME        0x80110000u  /* (?(<name>)... */
-#define META_COND_NUMBER      0x80120000u  /* (?(digits)... */
-#define META_COND_RNAME       0x80130000u  /* (?(R&name)... */
-#define META_COND_RNUMBER     0x80140000u  /* (?(Rdigits)... */
-#define META_COND_VERSION     0x80150000u  /* (?(VERSION<op>x.y)... */
-#define META_DOLLAR           0x80160000u  /* $ metacharacter */
-#define META_DOT              0x80170000u  /* . metacharacter */
-#define META_ESCAPE           0x80180000u  /* \d and friends */
-#define META_KET              0x80190000u  /* closing parenthesis */
-#define META_NOCAPTURE        0x801a0000u  /* no capture parens */
-#define META_OPTIONS          0x801b0000u  /* (?i) and friends */
-#define META_POSIX            0x801c0000u  /* POSIX class item */
-#define META_POSIX_NEG        0x801d0000u  /* negative POSIX class item */
-#define META_RANGE_ESCAPED    0x801e0000u  /* range with at least one escape */
-#define META_RANGE_LITERAL    0x801f0000u  /* range defined literally */
-#define META_RECURSE          0x80200000u  /* Recursion */
-#define META_RECURSE_BYNAME   0x80210000u  /* (?&name) */
-#define META_SCRIPT_RUN       0x80220000u  /* (*script_run:...) */
-
-/* These must be kept together to make it easy to check that an assertion
-is present where expected in a conditional group. */
-
-#define META_LOOKAHEAD        0x80230000u  /* (?= */
-#define META_LOOKAHEADNOT     0x80240000u  /* (?! */
-#define META_LOOKBEHIND       0x80250000u  /* (?<= */
-#define META_LOOKBEHINDNOT    0x80260000u  /* (?<! */
-
-/* These cannot be conditions */
-
-#define META_LOOKAHEAD_NA     0x80270000u  /* (*napla: */
-#define META_LOOKBEHIND_NA    0x80280000u  /* (*naplb: */
-
-/* These must be kept in this order, with consecutive values, and the _ARG
-versions of COMMIT, PRUNE, SKIP, and THEN immediately after their non-argument
-versions. */
-
-#define META_MARK             0x80290000u  /* (*MARK) */
-#define META_ACCEPT           0x802a0000u  /* (*ACCEPT) */
-#define META_FAIL             0x802b0000u  /* (*FAIL) */
-#define META_COMMIT           0x802c0000u  /* These               */
-#define META_COMMIT_ARG       0x802d0000u  /*   pairs             */
-#define META_PRUNE            0x802e0000u  /*     must            */
-#define META_PRUNE_ARG        0x802f0000u  /*       be            */
-#define META_SKIP             0x80300000u  /*         kept        */
-#define META_SKIP_ARG         0x80310000u  /*           in        */
-#define META_THEN             0x80320000u  /*             this    */
-#define META_THEN_ARG         0x80330000u  /*               order */
-
-/* These must be kept in groups of adjacent 3 values, and all together. */
-
-#define META_ASTERISK         0x80340000u  /* *  */
-#define META_ASTERISK_PLUS    0x80350000u  /* *+ */
-#define META_ASTERISK_QUERY   0x80360000u  /* *? */
-#define META_PLUS             0x80370000u  /* +  */
-#define META_PLUS_PLUS        0x80380000u  /* ++ */
-#define META_PLUS_QUERY       0x80390000u  /* +? */
-#define META_QUERY            0x803a0000u  /* ?  */
-#define META_QUERY_PLUS       0x803b0000u  /* ?+ */
-#define META_QUERY_QUERY      0x803c0000u  /* ?? */
-#define META_MINMAX           0x803d0000u  /* {n,m}  repeat */
-#define META_MINMAX_PLUS      0x803e0000u  /* {n,m}+ repeat */
-#define META_MINMAX_QUERY     0x803f0000u  /* {n,m}? repeat */
-
-#define META_FIRST_QUANTIFIER META_ASTERISK
-#define META_LAST_QUANTIFIER  META_MINMAX_QUERY
-
-/* This is a special "meta code" that is used only to distinguish (*asr: from
-(*sr: in the table of aphabetic assertions. It is never stored in the parsed
-pattern because (*asr: is turned into (*sr:(*atomic: at that stage. There is
-therefore no need for it to have a length entry, so use a high value. */
-
-#define META_ATOMIC_SCRIPT_RUN 0x8fff0000u
-
 /* Table of extra lengths for each of the meta codes. Must be kept in step with
 the definitions above. For some items these values are a basic length to which
 a variable amount has to be added. */
@@ -326,12 +214,16 @@ static unsigned char meta_extra_lengths[] = {
   1+SIZEOFFSET,  /* META_COND_RNAME */
   1+SIZEOFFSET,  /* META_COND_RNUMBER */
   3,             /* META_COND_VERSION */
+  SIZEOFFSET,    /* META_OFFSET */
+  0,             /* META_SCS */
+  1,             /* META_SCS_NAME */
+  1,             /* META_SCS_NUMBER */
   0,             /* META_DOLLAR */
   0,             /* META_DOT */
-  0,             /* META_ESCAPE - more for ESC_P, ESC_p, ESC_g, ESC_k */
+  0,             /* META_ESCAPE - one more for ESC_P and ESC_p */
   0,             /* META_KET */
   0,             /* META_NOCAPTURE */
-  1,             /* META_OPTIONS */
+  2,             /* META_OPTIONS */
   1,             /* META_POSIX */
   1,             /* META_POSIX_NEG */
   0,             /* META_RANGE_ESCAPED */
@@ -367,24 +259,18 @@ static unsigned char meta_extra_lengths[] = {
   0,             /* META_QUERY_QUERY */
   2,             /* META_MINMAX */
   2,             /* META_MINMAX_PLUS */
-  2              /* META_MINMAX_QUERY */
+  2,             /* META_MINMAX_QUERY */
+  0,             /* META_ECLASS_AND */
+  0,             /* META_ECLASS_OR */
+  0,             /* META_ECLASS_SUB */
+  0,             /* META_ECLASS_XOR */
+  0              /* META_ECLASS_NOT */
 };
 
 /* Types for skipping parts of a parsed pattern. */
 
 enum { PSKIP_ALT, PSKIP_CLASS, PSKIP_KET };
 
-/* Macro for setting individual bits in class bitmaps. It took some
-experimenting to figure out how to stop gcc 5.3.0 from warning with
--Wconversion. This version gets a warning:
-
-  #define SETBIT(a,b) a[(b)/8] |= (uint8_t)(1u << ((b)&7))
-
-Let's hope the apparently less efficient version isn't actually so bad if the
-compiler is clever with identical subexpressions. */
-
-#define SETBIT(a,b) a[(b)/8] = (uint8_t)(a[(b)/8] | (1u << ((b)&7)))
-
 /* Values and flags for the unsigned xxcuflags variables that accompany xxcu
 variables, which are concerned with first and required code units. A value
 greater than or equal to REQ_NONE means "no code unit set"; otherwise the
@@ -509,44 +395,44 @@ in UTF-8 mode. It runs from '0' to 'z'. */
 #define UPPER_CASE(c)       (c-32)
 
 static const short int escapes[] = {
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     0,                       0,
-     CHAR_COLON,              CHAR_SEMICOLON,
-     CHAR_LESS_THAN_SIGN,     CHAR_EQUALS_SIGN,
-     CHAR_GREATER_THAN_SIGN,  CHAR_QUESTION_MARK,
-     CHAR_COMMERCIAL_AT,      -ESC_A,
-     -ESC_B,                  -ESC_C,
-     -ESC_D,                  -ESC_E,
-     0,                       -ESC_G,
-     -ESC_H,                  0,
-     0,                       -ESC_K,
-     0,                       0,
-     -ESC_N,                  0,
-     -ESC_P,                  -ESC_Q,
-     -ESC_R,                  -ESC_S,
-     0,                       0,
-     -ESC_V,                  -ESC_W,
-     -ESC_X,                  0,
-     -ESC_Z,                  CHAR_LEFT_SQUARE_BRACKET,
-     CHAR_BACKSLASH,          CHAR_RIGHT_SQUARE_BRACKET,
-     CHAR_CIRCUMFLEX_ACCENT,  CHAR_UNDERSCORE,
-     CHAR_GRAVE_ACCENT,       CHAR_BEL,
-     -ESC_b,                  0,
-     -ESC_d,                  CHAR_ESC,
-     CHAR_FF,                 0,
-     -ESC_h,                  0,
-     0,                       -ESC_k,
-     0,                       0,
-     CHAR_LF,                 0,
-     -ESC_p,                  0,
-     CHAR_CR,                 -ESC_s,
-     CHAR_HT,                 0,
-     -ESC_v,                  -ESC_w,
-     0,                       0,
-     -ESC_z
+    /* 0 */ 0,                       /* 1 */ 0,
+    /* 2 */ 0,                       /* 3 */ 0,
+    /* 4 */ 0,                       /* 5 */ 0,
+    /* 6 */ 0,                       /* 7 */ 0,
+    /* 8 */ 0,                       /* 9 */ 0,
+    /* : */ CHAR_COLON,              /* ; */ CHAR_SEMICOLON,
+    /* < */ CHAR_LESS_THAN_SIGN,     /* = */ CHAR_EQUALS_SIGN,
+    /* > */ CHAR_GREATER_THAN_SIGN,  /* ? */ CHAR_QUESTION_MARK,
+    /* @ */ CHAR_COMMERCIAL_AT,      /* A */ -ESC_A,
+    /* B */ -ESC_B,                  /* C */ -ESC_C,
+    /* D */ -ESC_D,                  /* E */ -ESC_E,
+    /* F */ 0,                       /* G */ -ESC_G,
+    /* H */ -ESC_H,                  /* I */ 0,
+    /* J */ 0,                       /* K */ -ESC_K,
+    /* L */ 0,                       /* M */ 0,
+    /* N */ -ESC_N,                  /* O */ 0,
+    /* P */ -ESC_P,                  /* Q */ -ESC_Q,
+    /* R */ -ESC_R,                  /* S */ -ESC_S,
+    /* T */ 0,                       /* U */ 0,
+    /* V */ -ESC_V,                  /* W */ -ESC_W,
+    /* X */ -ESC_X,                  /* Y */ 0,
+    /* Z */ -ESC_Z,                  /* [ */ CHAR_LEFT_SQUARE_BRACKET,
+    /* \ */ CHAR_BACKSLASH,          /* ] */ CHAR_RIGHT_SQUARE_BRACKET,
+    /* ^ */ CHAR_CIRCUMFLEX_ACCENT,  /* _ */ CHAR_UNDERSCORE,
+    /* ` */ CHAR_GRAVE_ACCENT,       /* a */ CHAR_BEL,
+    /* b */ -ESC_b,                  /* c */ 0,
+    /* d */ -ESC_d,                  /* e */ CHAR_ESC,
+    /* f */ CHAR_FF,                 /* g */ 0,
+    /* h */ -ESC_h,                  /* i */ 0,
+    /* j */ 0,                       /* k */ -ESC_k,
+    /* l */ 0,                       /* m */ 0,
+    /* n */ CHAR_LF,                 /* o */ 0,
+    /* p */ -ESC_p,                  /* q */ 0,
+    /* r */ CHAR_CR,                 /* s */ -ESC_s,
+    /* t */ CHAR_HT,                 /* u */ 0,
+    /* v */ -ESC_v,                  /* w */ -ESC_w,
+    /* x */ 0,                       /* y */ 0,
+    /* z */ -ESC_z
 };
 
 #else
@@ -656,6 +542,8 @@ static const char alasnames[] =
   STRING_non_atomic_positive_lookbehind0
   STRING_negative_lookahead0
   STRING_negative_lookbehind0
+  STRING_scs0
+  STRING_scan_substring0
   STRING_atomic0
   STRING_sr0
   STRING_asr0
@@ -675,6 +563,8 @@ static const alasitem alasmeta[] = {
   { 30, META_LOOKBEHIND_NA     },
   { 18, META_LOOKAHEADNOT      },
   { 19, META_LOOKBEHINDNOT     },
+  {  3, META_SCS               },
+  { 14, META_SCS               },
   {  6, META_ATOMIC            },
   {  2, META_SCRIPT_RUN        }, /* sr = script run */
   {  3, META_ATOMIC_SCRIPT_RUN }, /* asr = atomic script run */
@@ -694,8 +584,11 @@ static uint32_t chartypeoffset[] = {
 now all in a single string, to reduce the number of relocations when a shared
 library is dynamically loaded. The list of lengths is terminated by a zero
 length entry. The first three must be alpha, lower, upper, as this is assumed
-for handling case independence. The indices for several classes are needed, so
-identify them. */
+for handling case independence.
+
+The indices for several classes are stored in pcre2_compile.h - these must
+be kept in sync with posix_names, posix_name_lengths, posix_class_maps,
+and posix_substitutes. */
 
 static const char posix_names[] =
   STRING_alpha0 STRING_lower0 STRING_upper0 STRING_alnum0
@@ -706,12 +599,6 @@ static const char posix_names[] =
 static const uint8_t posix_name_lengths[] = {
   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 6, 0 };
 
-#define PC_DIGIT   7
-#define PC_GRAPH   8
-#define PC_PRINT   9
-#define PC_PUNCT  10
-#define PC_XDIGIT 13
-
 /* Table of class bit maps for each POSIX class. Each class is formed from a
 base map, with an optional addition or removal of another map. Then, for some
 classes, there is some additional tweaking: for [:blank:] the vertical space
@@ -722,7 +609,7 @@ addition or a negative value for map subtraction (if there are two maps). The
 absolute value of the third field has these meanings: 0 => no tweaking, 1 =>
 remove vertical space characters, 2 => remove underscore. */
 
-static const int posix_class_maps[] = {
+const int PRIV(posix_class_maps)[] = {
   cbit_word,   cbit_digit, -2,            /* alpha */
   cbit_lower,  -1,          0,            /* lower */
   cbit_upper,  -1,          0,            /* upper */
@@ -760,7 +647,6 @@ static int posix_substitutes[] = {
   PT_WORD, 0,       /* word  */   /* Perl and POSIX space are the same */
   PT_PXXDIGIT, 0    /* xdigit */  /* Perl has additional hex digits */
 };
-#define POSIX_SUBSIZE (sizeof(posix_substitutes) / (2*sizeof(uint32_t)))
 #endif  /* SUPPORT_UNICODE */
 
 /* Masks for checking option settings. When PCRE2_LITERAL is set, only a subset
@@ -778,10 +664,11 @@ are allowed. */
    PCRE2_EXTENDED|PCRE2_EXTENDED_MORE|PCRE2_MATCH_UNSET_BACKREF| \
    PCRE2_MULTILINE|PCRE2_NEVER_BACKSLASH_C|PCRE2_NEVER_UCP| \
    PCRE2_NEVER_UTF|PCRE2_NO_AUTO_CAPTURE|PCRE2_NO_AUTO_POSSESS| \
-   PCRE2_NO_DOTSTAR_ANCHOR|PCRE2_UCP|PCRE2_UNGREEDY)
+   PCRE2_NO_DOTSTAR_ANCHOR|PCRE2_UCP|PCRE2_UNGREEDY|PCRE2_ALT_EXTENDED_CLASS)
 
 #define PUBLIC_LITERAL_COMPILE_EXTRA_OPTIONS \
-   (PCRE2_EXTRA_MATCH_LINE|PCRE2_EXTRA_MATCH_WORD|PCRE2_EXTRA_CASELESS_RESTRICT)
+   (PCRE2_EXTRA_MATCH_LINE|PCRE2_EXTRA_MATCH_WORD| \
+    PCRE2_EXTRA_CASELESS_RESTRICT|PCRE2_EXTRA_TURKISH_CASING)
 
 #define PUBLIC_COMPILE_EXTRA_OPTIONS \
    (PUBLIC_LITERAL_COMPILE_EXTRA_OPTIONS| \
@@ -789,26 +676,8 @@ are allowed. */
     PCRE2_EXTRA_ESCAPED_CR_IS_LF|PCRE2_EXTRA_ALT_BSUX| \
     PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK|PCRE2_EXTRA_ASCII_BSD| \
     PCRE2_EXTRA_ASCII_BSS|PCRE2_EXTRA_ASCII_BSW|PCRE2_EXTRA_ASCII_POSIX| \
-    PCRE2_EXTRA_ASCII_DIGIT)
-
-/* Compile time error code numbers. They are given names so that they can more
-easily be tracked. When a new number is added, the tables called eint1 and
-eint2 in pcre2posix.c may need to be updated, and a new error text must be
-added to compile_error_texts in pcre2_error.c. Also, the error codes in
-pcre2.h.in must be updated - their values are exactly 100 greater than these
-values. */
-
-enum { ERR0 = COMPILE_ERROR_BASE,
-       ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,
-       ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,
-       ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29, ERR30,
-       ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39, ERR40,
-       ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49, ERR50,
-       ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, ERR60,
-       ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, ERR70,
-       ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, ERR80,
-       ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERR88, ERR89, ERR90,
-       ERR91, ERR92, ERR93, ERR94, ERR95, ERR96, ERR97, ERR98, ERR99, ERR100 };
+    PCRE2_EXTRA_ASCII_DIGIT|PCRE2_EXTRA_PYTHON_OCTAL|PCRE2_EXTRA_NO_BS0| \
+    PCRE2_EXTRA_NEVER_CALLOUT)
 
 /* This is a table of start-of-pattern options such as (*UTF) and settings such
 as (*LIMIT_MATCH=nnnn) and (*CRLF). For completeness and backward
@@ -816,16 +685,18 @@ compatibility, (*UTFn) is supported in the relevant libraries, but (*UTF) is
 generic and always supported. */
 
 enum { PSO_OPT,     /* Value is an option bit */
+       PSO_XOPT,    /* Value is an xoption bit */
        PSO_FLG,     /* Value is a flag bit */
        PSO_NL,      /* Value is a newline type */
        PSO_BSR,     /* Value is a \R type */
        PSO_LIMH,    /* Read integer value for heap limit */
        PSO_LIMM,    /* Read integer value for match limit */
-       PSO_LIMD     /* Read integer value for depth limit */
+       PSO_LIMD,    /* Read integer value for depth limit */
+       PSO_OPTMZ    /* Value is an optimization bit */
      };
 
 typedef struct pso {
-  const uint8_t *name;
+  const char *name;
   uint16_t length;
   uint16_t type;
   uint32_t value;
@@ -834,27 +705,29 @@ typedef struct pso {
 /* NB: STRING_UTFn_RIGHTPAR contains the length as well */
 
 static const pso pso_list[] = {
-  { (uint8_t *)STRING_UTFn_RIGHTPAR,                  PSO_OPT, PCRE2_UTF },
-  { (uint8_t *)STRING_UTF_RIGHTPAR,                4, PSO_OPT, PCRE2_UTF },
-  { (uint8_t *)STRING_UCP_RIGHTPAR,                4, PSO_OPT, PCRE2_UCP },
-  { (uint8_t *)STRING_NOTEMPTY_RIGHTPAR,           9, PSO_FLG, PCRE2_NOTEMPTY_SET },
-  { (uint8_t *)STRING_NOTEMPTY_ATSTART_RIGHTPAR,  17, PSO_FLG, PCRE2_NE_ATST_SET },
-  { (uint8_t *)STRING_NO_AUTO_POSSESS_RIGHTPAR,   16, PSO_OPT, PCRE2_NO_AUTO_POSSESS },
-  { (uint8_t *)STRING_NO_DOTSTAR_ANCHOR_RIGHTPAR, 18, PSO_OPT, PCRE2_NO_DOTSTAR_ANCHOR },
-  { (uint8_t *)STRING_NO_JIT_RIGHTPAR,             7, PSO_FLG, PCRE2_NOJIT },
-  { (uint8_t *)STRING_NO_START_OPT_RIGHTPAR,      13, PSO_OPT, PCRE2_NO_START_OPTIMIZE },
-  { (uint8_t *)STRING_LIMIT_HEAP_EQ,              11, PSO_LIMH, 0 },
-  { (uint8_t *)STRING_LIMIT_MATCH_EQ,             12, PSO_LIMM, 0 },
-  { (uint8_t *)STRING_LIMIT_DEPTH_EQ,             12, PSO_LIMD, 0 },
-  { (uint8_t *)STRING_LIMIT_RECURSION_EQ,         16, PSO_LIMD, 0 },
-  { (uint8_t *)STRING_CR_RIGHTPAR,                 3, PSO_NL,  PCRE2_NEWLINE_CR },
-  { (uint8_t *)STRING_LF_RIGHTPAR,                 3, PSO_NL,  PCRE2_NEWLINE_LF },
-  { (uint8_t *)STRING_CRLF_RIGHTPAR,               5, PSO_NL,  PCRE2_NEWLINE_CRLF },
-  { (uint8_t *)STRING_ANY_RIGHTPAR,                4, PSO_NL,  PCRE2_NEWLINE_ANY },
-  { (uint8_t *)STRING_NUL_RIGHTPAR,                4, PSO_NL,  PCRE2_NEWLINE_NUL },
-  { (uint8_t *)STRING_ANYCRLF_RIGHTPAR,            8, PSO_NL,  PCRE2_NEWLINE_ANYCRLF },
-  { (uint8_t *)STRING_BSR_ANYCRLF_RIGHTPAR,       12, PSO_BSR, PCRE2_BSR_ANYCRLF },
-  { (uint8_t *)STRING_BSR_UNICODE_RIGHTPAR,       12, PSO_BSR, PCRE2_BSR_UNICODE }
+  { STRING_UTFn_RIGHTPAR,                  PSO_OPT, PCRE2_UTF },
+  { STRING_UTF_RIGHTPAR,                4, PSO_OPT, PCRE2_UTF },
+  { STRING_UCP_RIGHTPAR,                4, PSO_OPT, PCRE2_UCP },
+  { STRING_NOTEMPTY_RIGHTPAR,           9, PSO_FLG, PCRE2_NOTEMPTY_SET },
+  { STRING_NOTEMPTY_ATSTART_RIGHTPAR,  17, PSO_FLG, PCRE2_NE_ATST_SET },
+  { STRING_NO_AUTO_POSSESS_RIGHTPAR,   16, PSO_OPTMZ, PCRE2_OPTIM_AUTO_POSSESS },
+  { STRING_NO_DOTSTAR_ANCHOR_RIGHTPAR, 18, PSO_OPTMZ, PCRE2_OPTIM_DOTSTAR_ANCHOR },
+  { STRING_NO_JIT_RIGHTPAR,             7, PSO_FLG, PCRE2_NOJIT },
+  { STRING_NO_START_OPT_RIGHTPAR,      13, PSO_OPTMZ, PCRE2_OPTIM_START_OPTIMIZE },
+  { STRING_CASELESS_RESTRICT_RIGHTPAR, 18, PSO_XOPT, PCRE2_EXTRA_CASELESS_RESTRICT },
+  { STRING_TURKISH_CASING_RIGHTPAR,    15, PSO_XOPT, PCRE2_EXTRA_TURKISH_CASING },
+  { STRING_LIMIT_HEAP_EQ,              11, PSO_LIMH, 0 },
+  { STRING_LIMIT_MATCH_EQ,             12, PSO_LIMM, 0 },
+  { STRING_LIMIT_DEPTH_EQ,             12, PSO_LIMD, 0 },
+  { STRING_LIMIT_RECURSION_EQ,         16, PSO_LIMD, 0 },
+  { STRING_CR_RIGHTPAR,                 3, PSO_NL,  PCRE2_NEWLINE_CR },
+  { STRING_LF_RIGHTPAR,                 3, PSO_NL,  PCRE2_NEWLINE_LF },
+  { STRING_CRLF_RIGHTPAR,               5, PSO_NL,  PCRE2_NEWLINE_CRLF },
+  { STRING_ANY_RIGHTPAR,                4, PSO_NL,  PCRE2_NEWLINE_ANY },
+  { STRING_NUL_RIGHTPAR,                4, PSO_NL,  PCRE2_NEWLINE_NUL },
+  { STRING_ANYCRLF_RIGHTPAR,            8, PSO_NL,  PCRE2_NEWLINE_ANYCRLF },
+  { STRING_BSR_ANYCRLF_RIGHTPAR,       12, PSO_BSR, PCRE2_BSR_ANYCRLF },
+  { STRING_BSR_UNICODE_RIGHTPAR,       12, PSO_BSR, PCRE2_BSR_UNICODE }
 };
 
 /* This table is used when converting repeating opcodes into possessified
@@ -909,12 +782,15 @@ static const uint8_t opcode_possessify[] = {
   OP_CRPOSRANGE, 0,        /* CRRANGE, CRMINRANGE */
   0, 0, 0, 0,              /* CRPOS{STAR,PLUS,QUERY,RANGE} */
 
-  0, 0, 0,                 /* CLASS, NCLASS, XCLASS */
+  0, 0, 0, 0,              /* CLASS, NCLASS, XCLASS, ECLASS */
   0, 0,                    /* REF, REFI */
   0, 0,                    /* DNREF, DNREFI */
-  0, 0                     /* RECURSE, CALLOUT */
+  0, 0,                    /* RECURSE, CALLOUT */
 };
 
+/* Compile-time check that the table has the correct size. */
+STATIC_ASSERT(sizeof(opcode_possessify) == OP_CALLOUT+1, opcode_possessify);
+
 
 #ifdef DEBUG_SHOW_PARSED
 /*************************************************
@@ -976,7 +852,7 @@ for (;;)
       {
       uint32_t ptype = *pptr >> 16;
       uint32_t pvalue = *pptr++ & 0xffff;
-      fprintf(stderr, "META \\%c %d %d", (meta_arg == ESC_P)? 'P':'p',
+      fprintf(stderr, "META \\%c %d %d", (meta_arg == ESC_P)? CHAR_P:CHAR_p,
         ptype, pvalue);
       }
     else
@@ -1151,6 +1027,24 @@ for (;;)
     fprintf(stderr, "%zd", offset);
     break;
 
+    case META_OFFSET:
+    fprintf(stderr, "META_OFFSET offset=");
+    GETOFFSET(offset, pptr);
+    fprintf(stderr, "%zd", offset);
+    break;
+
+    case META_SCS:
+    fprintf(stderr, "META (*scan_substring:");
+    break;
+
+    case META_SCS_NAME:
+    fprintf(stderr, "META_SCS_NAME length=%d relative_offset=%d", *pptr++, (int)meta_arg);
+    break;
+
+    case META_SCS_NUMBER:
+    fprintf(stderr, "META_SCS_NUMBER %d relative_offset=%d", *pptr++, (int)meta_arg);
+    break;
+
     case META_MARK:
     fprintf(stderr, "META (*MARK:");
     goto SHOWARG;
@@ -1179,6 +1073,12 @@ for (;;)
       }
     fprintf(stderr, ") length=%u", length);
     break;
+
+    case META_ECLASS_AND: fprintf(stderr, "META_ECLASS_AND"); break;
+    case META_ECLASS_OR: fprintf(stderr, "META_ECLASS_OR"); break;
+    case META_ECLASS_SUB: fprintf(stderr, "META_ECLASS_SUB"); break;
+    case META_ECLASS_XOR: fprintf(stderr, "META_ECLASS_XOR"); break;
+    case META_ECLASS_NOT: fprintf(stderr, "META_ECLASS_NOT"); break;
     }
   fprintf(stderr, "\n");
   }
@@ -1198,7 +1098,7 @@ associated JIT data. */
 PCRE2_EXP_DEFN pcre2_code * PCRE2_CALL_CONVENTION
 pcre2_code_copy(const pcre2_code *code)
 {
-PCRE2_SIZE* ref_count;
+PCRE2_SIZE *ref_count;
 pcre2_code *newcode;
 
 if (code == NULL) return NULL;
@@ -1310,7 +1210,10 @@ Arguments:
   ptrptr      points to the character pointer variable
   ptrend      points to the end of the input string
   allow_sign  if < 0, sign not allowed; if >= 0, sign is relative to this
-  max_value   the largest number allowed
+  max_value   the largest number allowed;
+              you must not pass a value for max_value larger than
+              INT_MAX/10 - 1 because this function relies on max_value to
+              avoid integer overflow
   max_error   the error to give for an over-large number
   intptr      where to put the result
   errcodeptr  where to put an error code
@@ -1329,6 +1232,8 @@ uint32_t n = 0;
 PCRE2_SPTR ptr = *ptrptr;
 BOOL yield = FALSE;
 
+PCRE2_ASSERT(max_value <= INT_MAX/10 - 1);
+
 *errorcodeptr = 0;
 
 if (allow_sign >= 0 && ptr < ptrend)
@@ -1349,10 +1254,11 @@ if (allow_sign >= 0 && ptr < ptrend)
 if (ptr >= ptrend || !IS_DIGIT(*ptr)) return FALSE;
 while (ptr < ptrend && IS_DIGIT(*ptr))
   {
-  n = n * 10 + *ptr++ - CHAR_0;
+  n = n * 10 + (*ptr++ - CHAR_0);
   if (n > max_value)
     {
     *errorcodeptr = max_error;
+    while (ptr < ptrend && IS_DIGIT(*ptr)) ptr++;
     goto EXIT;
     }
   }
@@ -1366,7 +1272,7 @@ if (allow_sign >= 0 && sign != 0)
     }
 
   if (sign > 0) n += allow_sign;
-  else if ((int)n > allow_sign)
+  else if (n > (uint32_t)allow_sign)
     {
     *errorcodeptr = ERR15;  /* Non-existent subpattern */
     goto EXIT;
@@ -1453,7 +1359,7 @@ else
   if (pp >= ptrend || *pp != CHAR_RIGHT_CURLY_BRACKET) return FALSE;
   }
 
-/* Now process the quantifier for real. We know it must be {n} or (n,} or {,m}
+/* Now process the quantifier for real. We know it must be {n} or {n,} or {,m}
 or {n,m}. The only error that read_number() can return is for a number that is
 too big. If *errorcodeptr is returned as zero it means no number was found. */
 
@@ -1520,15 +1426,15 @@ return yield;
 
 /* This function is called when a \ has been encountered. It either returns a
 positive value for a simple escape such as \d, or 0 for a data character, which
-is placed in chptr. A backreference to group n is returned as negative n. On
+is placed in chptr. A backreference to group n is returned as -(n+1). On
 entry, ptr is pointing at the character after \. On exit, it points after the
 final code unit of the escape sequence.
 
 This function is also called from pcre2_substitute() to handle escape sequences
 in replacement strings. In this case, the cb argument is NULL, and in the case
 of escapes that have further processing, only sequences that define a data
-character are recognised. The isclass argument is not relevant; the options
-argument is the final value of the compiled pattern's options.
+character are recognised. The options argument is the final value of the
+compiled pattern's options.
 
 Arguments:
   ptrptr         points to the input position pointer
@@ -1537,7 +1443,8 @@ Arguments:
   errorcodeptr   points to the errorcode variable (containing zero)
   options        the current options bits
   xoptions       the current extra options bits
-  isclass        TRUE if inside a character class
+  bracount       the number of capturing parentheses encountered so far
+  isclass        TRUE if in a character class
   cb             compile data block or NULL when called from pcre2_substitute()
 
 Returns:         zero => a data character
@@ -1548,8 +1455,8 @@ Returns:         zero => a data character
 
 int
 PRIV(check_escape)(PCRE2_SPTR *ptrptr, PCRE2_SPTR ptrend, uint32_t *chptr,
-  int *errorcodeptr, uint32_t options, uint32_t xoptions, BOOL isclass,
-  compile_block *cb)
+  int *errorcodeptr, uint32_t options, uint32_t xoptions, uint32_t bracount,
+  BOOL isclass, compile_block *cb)
 {
 BOOL utf = (options & PCRE2_UTF) != 0;
 BOOL alt_bsux =
@@ -1618,17 +1525,23 @@ else if ((i = escapes[c - ESCAPES_FIRST]) != 0)
 
       if (ptrend - p > 1 && *p == CHAR_U && p[1] == CHAR_PLUS)
         {
-#ifdef EBCDIC
-        *errorcodeptr = ERR93;
-#else
+#ifndef EBCDIC
         if (utf)
           {
           ptr = p + 2;
           escape = 0;   /* Not a fancy escape after all */
           goto COME_FROM_NU;
           }
-        else *errorcodeptr = ERR93;
 #endif
+        *errorcodeptr = ERR93;
+        }
+
+      /* Give an error in contexts where quantifiers are not allowed
+      (character classes; substitution strings). */
+
+      else if (isclass || cb == NULL)
+        {
+        *errorcodeptr = ERR37;
         }
 
       /* Give an error if what follows is not a quantifier, but don't override
@@ -1659,7 +1572,8 @@ else
 
   if (cb == NULL)
     {
-    if (c != CHAR_c && c != CHAR_o && c != CHAR_x)
+    if (c < CHAR_0 ||
+       (c > CHAR_9 && (c != CHAR_c && c != CHAR_o && c != CHAR_x && c != CHAR_g)))
       {
       *errorcodeptr = ERR3;
       return 0;
@@ -1714,6 +1628,7 @@ else
             hptr >= ptrend ||    /* Hit end of input */
             *hptr != CHAR_RIGHT_CURLY_BRACKET)  /* No } terminator */
           {
+          if (isclass) break; /* In a class, just treat as '\u' literal */
           escape = ESC_ub;    /* Special return */
           ptr++;              /* Skip { */
           break;              /* Hex escape not recognized */
@@ -1772,8 +1687,14 @@ else
     (possibly recursive) subroutine calls, _not_ backreferences. We return
     the ESC_g code.
 
-    Summary: Return a negative number for a numerical back reference, ESC_k for
-    a named back reference, and ESC_g for a named or numbered subroutine call.
+    Summary: Return a negative number for a numerical back reference (offset
+    by 1), ESC_k for a named back reference, and ESC_g for a named or
+    numbered subroutine call.
+
+    The above describes the \g behaviour inside patterns. Inside replacement
+    strings (pcre2_substitute) we support only \g<nameornum> for Python
+    compatibility. Return ESG_g for the named case, and -(num+1) for the
+    numbered case.
     */
 
     case CHAR_g:
@@ -1785,6 +1706,40 @@ else
       break;
       }
 
+    if (cb == NULL)
+      {
+      PCRE2_SPTR p;
+      /* Substitution strings */
+      if (*ptr != CHAR_LESS_THAN_SIGN)
+        {
+        *errorcodeptr = ERR57;
+        break;
+        }
+
+      p = ptr + 1;
+
+      if (!read_number(&p, ptrend, -1, MAX_GROUP_NUMBER, ERR61, &s,
+          errorcodeptr))
+        {
+        if (*errorcodeptr == 0) escape = ESC_g;  /* No number found */
+        break;
+        }
+
+      if (p >= ptrend || *p != CHAR_GREATER_THAN_SIGN)
+        {
+        /* not advancing ptr; report error at the \g character */
+        *errorcodeptr = ERR57;
+        break;
+        }
+
+      /* This is the reason that back references are returned as -(s+1) rather
+      than just -s. In a pattern, \0 is not a back reference, but \g<0> is
+      valid in a substitution string, so this must be representable. */
+      ptr = p + 1;
+      escape = -(s+1);
+      break;
+      }
+
     if (*ptr == CHAR_LESS_THAN_SIGN || *ptr == CHAR_APOSTROPHE)
       {
       escape = ESC_g;
@@ -1799,7 +1754,7 @@ else
       PCRE2_SPTR p = ptr + 1;
 
       while (p < ptrend && (*p == CHAR_SPACE || *p == CHAR_HT)) p++;
-      if (!read_number(&p, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61, &s,
+      if (!read_number(&p, ptrend, bracount, MAX_GROUP_NUMBER, ERR61, &s,
           errorcodeptr))
         {
         if (*errorcodeptr == 0) escape = ESC_k;  /* No number found */
@@ -1809,6 +1764,7 @@ else
 
       if (p >= ptrend || *p != CHAR_RIGHT_CURLY_BRACKET)
         {
+        /* not advancing ptr; report error at the \g character */
         *errorcodeptr = ERR57;
         break;
         }
@@ -1819,7 +1775,7 @@ else
 
     else
       {
-      if (!read_number(&ptr, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61, &s,
+      if (!read_number(&ptr, ptrend, bracount, MAX_GROUP_NUMBER, ERR61, &s,
           errorcodeptr))
         {
         if (*errorcodeptr == 0) *errorcodeptr = ERR57;  /* No number found */
@@ -1833,7 +1789,7 @@ else
       break;
       }
 
-    escape = -s;
+    escape = -(s+1);
     break;
 
     /* The handling of escape sequences consisting of a string of digits
@@ -1845,7 +1801,16 @@ else
     number is less than 10, or if there are that many previous extracting left
     brackets, it is a back reference. Otherwise, up to three octal digits are
     read to form an escaped character code. Thus \123 is likely to be octal 123
-    (cf \0123, which is octal 012 followed by the literal 3).
+    (cf \0123, which is octal 012 followed by the literal 3). This is the "Perl
+    style" of handling ambiguous octal/backrefences such as \12.
+
+    There is an alternative disambiguation strategy, selected by
+    PCRE2_EXTRA_PYTHON_OCTAL, which follows Python's behaviour. An octal must
+    have either a leading zero, or exactly three octal digits; otherwise it's
+    a backreference. The disambiguation is stable, and does not depend on how
+    many capture groups are defined (it's simply an invalid backreference if
+    there is no corresponding capture group). Additionally, octal values above
+    \377 (\xff) are rejected.
 
     Inside a character class, \ followed by a digit is always either a literal
     8 or 9 or an octal number. */
@@ -1853,24 +1818,65 @@ else
     case CHAR_1: case CHAR_2: case CHAR_3: case CHAR_4: case CHAR_5:
     case CHAR_6: case CHAR_7: case CHAR_8: case CHAR_9:
 
-    if (!isclass)
+    if (isclass)
       {
+      /* Fall through to octal handling; never a backreference inside a class. */
+      }
+    else if ((xoptions & PCRE2_EXTRA_PYTHON_OCTAL) != 0)
+      {
+      /* Python-style disambiguation. */
+      if (ptr[-1] <= CHAR_7 && ptr + 1 < ptrend && ptr[0] >= CHAR_0 &&
+          ptr[0] <= CHAR_7 && ptr[1] >= CHAR_0 && ptr[1] <= CHAR_7)
+        {
+        /* We peeked a three-digit octal, so fall through */
+        }
+      else
+        {
+        /* We are at a digit, so the only possible error from read_number() is
+        a number that is too large. */
+        ptr--;   /* Back to the digit */
+
+        if (!read_number(&ptr, ptrend, -1, MAX_GROUP_NUMBER, 0, &s, errorcodeptr))
+          {
+          *errorcodeptr = ERR61;
+          break;
+          }
+
+        escape = -(s+1);
+        break;
+        }
+      }
+    else
+      {
+      /* Perl-style disambiguation. */
       oldptr = ptr;
       ptr--;   /* Back to the digit */
 
       /* As we know we are at a digit, the only possible error from
-      read_number() is a number that is too large to be a group number. In this
-      case we fall through handle this as not a group reference. If we have
-      read a small enough number, check for a back reference.
+      read_number() is a number that is too large to be a group number. Because
+      that number might be still valid if read as an octal, errorcodeptr is not
+      set on failure and therefore a sentinel value of INT_MAX is used instead
+      of the original value, and will be used later to properly set the error,
+      if not falling through. */
 
-      \1 to \9 are always back references. \8x and \9x are too; \1x to \7x
+      if (!read_number(&ptr, ptrend, -1, MAX_GROUP_NUMBER, 0, &s, errorcodeptr))
+        s = INT_MAX;
+
+      /* \1 to \9 are always back references. \8x and \9x are too; \1x to \7x
       are octal escapes if there are not that many previous captures. */
 
-      if (read_number(&ptr, ptrend, -1, INT_MAX/10 - 1, 0, &s, errorcodeptr) &&
-          (s < 10 || oldptr[-1] >= CHAR_8 || s <= (int)cb->bracount))
+      if (s < 10 || c >= CHAR_8 || (unsigned)s <= bracount)
         {
-        if (s > (int)MAX_GROUP_NUMBER) *errorcodeptr = ERR61;
-          else escape = -s;     /* Indicates a back reference */
+        /* s > MAX_GROUP_NUMBER should not be possible because of read_number(),
+        but we keep it just to be safe and because it will also catch the
+        sentinel value that was set on failure by that function. */
+
+        if ((unsigned)s > MAX_GROUP_NUMBER)
+          {
+          PCRE2_ASSERT(s == INT_MAX);
+          *errorcodeptr = ERR61;
+          }
+        else escape = -(s+1);     /* Indicates a back reference */
         break;
         }
 
@@ -1889,16 +1895,26 @@ else
     /* \0 always starts an octal number, but we may drop through to here with a
     larger first octal digit. The original code used just to take the least
     significant 8 bits of octal numbers (I think this is what early Perls used
-    to do). Nowadays we allow for larger numbers in UTF-8 mode and 16-bit mode,
+    to do). Nowadays we allow for larger numbers in UTF-8 mode and 16/32-bit mode,
     but no more than 3 octal digits. */
 
     case CHAR_0:
     c -= CHAR_0;
     while(i++ < 2 && ptr < ptrend && *ptr >= CHAR_0 && *ptr <= CHAR_7)
         c = c * 8 + *ptr++ - CHAR_0;
+    if (c > 0xff)
+      {
+      if ((xoptions & PCRE2_EXTRA_PYTHON_OCTAL) != 0) *errorcodeptr = ERR102;
 #if PCRE2_CODE_UNIT_WIDTH == 8
-    if (!utf && c > 0xff) *errorcodeptr = ERR51;
+      else if (!utf) *errorcodeptr = ERR51;
 #endif
+      }
+
+    /* PCRE2_EXTRA_NO_BS0 disables the NUL escape '\0' but doesn't affect
+    two- or three-character octal escapes \00 and \000, nor \x00. */
+
+    if ((xoptions & PCRE2_EXTRA_NO_BS0) != 0 && c == 0 && i == 1)
+        *errorcodeptr = ERR98;
     break;
 
     /* \o is a relatively new Perl feature, supporting a more general way of
@@ -1927,7 +1943,7 @@ else
       cc = *ptr++;
       if (c == 0 && cc == CHAR_0) continue;     /* Leading zeroes */
 #if PCRE2_CODE_UNIT_WIDTH == 32
-      if (c >= 0x20000000l) { overflow = TRUE; break; }
+      if (c >= 0x20000000u) { overflow = TRUE; break; }
 #endif
       c = (c << 3) + (cc - CHAR_0);
 #if PCRE2_CODE_UNIT_WIDTH == 8
@@ -2053,10 +2069,29 @@ else
 
       else
         {
-        c = 0;
-        if (ptr >= ptrend || (cc = XDIGIT(*ptr)) == 0xff) break;  /* Not a hex digit */
+        /* Perl has the surprising/broken behaviour that \x without following
+        hex digits is treated as an escape for NUL. Their source code laments
+        this but keeps it for backwards compatibility. A warning is printed
+        when "use warnings" is enabled. Because we don't have warnings, we
+        simply forbid it. */
+        if (ptr >= ptrend || (cc = XDIGIT(*ptr)) == 0xff)
+          {
+          /* Not a hex digit */
+          *errorcodeptr = ERR78;
+          break;
+          }
         ptr++;
         c = cc;
+
+        /* With "use re 'strict'" Perl actually requires exactly two digits (error
+        for \x, \xA and \xAAA). While \x was already rejected, this seems overly
+        strict, and there seems little incentive to align with that, given the
+        backwards-compatibility cost.
+
+        For comparison, note that other engines disagree. For example:
+          - Java allows 1 or 2 hex digits. Error if 0 digits. No error if >2 digits
+          - .NET requires 2 hex digits. Error if 0, 1 digits. No error if >2 digits.
+        */
         if (ptr >= ptrend || (cc = XDIGIT(*ptr)) == 0xff) break;  /* Not a hex digit */
         ptr++;
         c = (c << 4) | cc;
@@ -2178,37 +2213,65 @@ c = *ptr++;
 *negptr = FALSE;
 
 /* \P or \p can be followed by a name in {}, optionally preceded by ^ for
-negation. */
+negation. We must be handling Unicode encoding here, though we may be compiling
+for UTF-8 input in an EBCDIC environment. (PCRE2 does not support both EBCDIC
+input and Unicode input in the same build.) In accordance with Unicode's "loose
+matching" rules, ASCII white space, hyphens, and underscores are ignored. We
+don't use isspace() or tolower() because (a) code points may be greater than
+255, and (b) they wouldn't work when compiling for Unicode in an EBCDIC
+environment. */
 
 if (c == CHAR_LEFT_CURLY_BRACKET)
   {
   if (ptr >= cb->end_pattern) goto ERROR_RETURN;
 
-  if (*ptr == CHAR_CIRCUMFLEX_ACCENT)
-    {
-    *negptr = TRUE;
-    ptr++;
-    }
-
   for (i = 0; i < (int)(sizeof(name) / sizeof(PCRE2_UCHAR)) - 1; i++)
     {
+    REDO:
+
     if (ptr >= cb->end_pattern) goto ERROR_RETURN;
     c = *ptr++;
-#if PCRE2_CODE_UNIT_WIDTH != 8
-    while (c == '_' || c == '-' || (c <= 0xff && isspace(c)))
-#else
-    while (c == '_' || c == '-' || isspace(c))
-#endif
+
+    /* Skip ignorable Unicode characters. */
+
+    while (c == CHAR_UNDERSCORE || c == CHAR_MINUS || c == CHAR_SPACE ||
+          (c >= CHAR_HT && c <= CHAR_CR))
       {
       if (ptr >= cb->end_pattern) goto ERROR_RETURN;
       c = *ptr++;
       }
-    if (c == CHAR_NUL) goto ERROR_RETURN;
+
+    /* The first significant character being circumflex negates the meaning of
+    the item. */
+
+    if (i == 0 && !*negptr && c == CHAR_CIRCUMFLEX_ACCENT)
+      {
+      *negptr = TRUE;
+      goto REDO;
+      }
+
     if (c == CHAR_RIGHT_CURLY_BRACKET) break;
-    name[i] = tolower(c);
-    if ((c == ':' || c == '=') && vptr == NULL) vptr = name + i;
+
+    /* Names consist of ASCII letters and digits, but equals and colon may also
+    occur as a name/value separator. We must also allow for \p{L&}. A simple
+    check for a value between '&' and 'z' suffices because anything else in a
+    name or value will cause an "unknown property" error anyway. */
+
+    if (c < CHAR_AMPERSAND || c > CHAR_z) goto ERROR_RETURN;
+
+    /* Lower case a capital letter or remember where the name/value separator
+    is. */
+
+    if (c >= CHAR_A && c <= CHAR_Z) c |= 0x20;
+    else if ((c == CHAR_COLON || c == CHAR_EQUALS_SIGN) && vptr == NULL)
+      vptr = name + i;
+
+    name[i] = c;
     }
 
+  /* Error if the loop didn't end with '}' - either we hit the end of the
+  pattern or the name was longer than any legal property name. */
+
   if (c != CHAR_RIGHT_CURLY_BRACKET) goto ERROR_RETURN;
   name[i] = 0;
   }
@@ -2216,14 +2279,19 @@ if (c == CHAR_LEFT_CURLY_BRACKET)
 /* If { doesn't follow \p or \P there is just one following character, which
 must be an ASCII letter. */
 
-else if (MAX_255(c) && (cb->ctypes[c] & ctype_letter) != 0)
+else if (c >= CHAR_A && c <= CHAR_Z)
   {
-  name[0] = tolower(c);
+  name[0] = c | 0x20;  /* Lower case */
+  name[1] = 0;
+  }
+else if (c >= CHAR_a && c <= CHAR_z)
+  {
+  name[0] = c;
   name[1] = 0;
   }
 else goto ERROR_RETURN;
 
-*ptrptr = ptr;
+*ptrptr = ptr;   /* Update pattern pointer */
 
 /* If the property contains ':' or '=' we have class name and value separately
 specified. The following are supported:
@@ -2481,6 +2549,9 @@ if (ptr >= ptrend)                 /* No characters in name */
 *nameptr = ptr;
 *offsetptr = (PCRE2_SIZE)(ptr - cb->start_pattern);
 
+/* If this logic were ever to change, the matching function in pcre2_substitute.c
+ought to be updated to match. */
+
 /* In UTF mode, a group name may contain letters and decimal digits as defined
 by Unicode properties, and underscores, but must not start with a digit. */
 
@@ -2699,6 +2770,60 @@ return parsed_pattern;
 
 
 
+/*************************************************
+* Maximum size of parsed_pattern for given input *
+*************************************************/
+
+/* This function is called from parse_regex() below, to determine the amount
+of memory to allocate for parsed_pattern. It is also called to check whether
+the amount of data written respects the amount of memory allocated.
+
+Arguments:
+  ptr             points to the start of the pattern
+  ptrend          points to the end of the pattern
+  utf             TRUE in UTF mode
+  options         the options bits
+
+Returns:          the number of uint32_t units for parsed_pattern
+*/
+static ptrdiff_t
+max_parsed_pattern(PCRE2_SPTR ptr, PCRE2_SPTR ptrend, BOOL utf,
+  uint32_t options)
+{
+PCRE2_SIZE big32count = 0;
+ptrdiff_t parsed_size_needed;
+
+/* When PCRE2_AUTO_CALLOUT is not set, in all but one case the number of
+unsigned 32-bit ints written out to the parsed pattern is bounded by the length
+of the pattern. The exceptional case is when running in 32-bit, non-UTF mode,
+when literal characters greater than META_END (0x80000000) have to be coded as
+two units. In this case, therefore, we scan the pattern to check for such
+values. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+if (!utf)
+  {
+  PCRE2_SPTR p;
+  for (p = ptr; p < ptrend; p++) if (*p >= META_END) big32count++;
+  }
+#else
+(void)utf;  /* Avoid compiler warning */
+#endif
+
+parsed_size_needed = (ptrend - ptr) + big32count;
+
+/* When PCRE2_AUTO_CALLOUT is set we have to assume a numerical callout (4
+elements) for each character. This is overkill, but memory is plentiful these
+days. */
+
+if ((options & PCRE2_AUTO_CALLOUT) != 0)
+  parsed_size_needed += (ptrend - ptr) * 4;
+
+return parsed_size_needed;
+}
+
+
+
 /*************************************************
 *      Parse regex and identify named groups     *
 *************************************************/
@@ -2750,7 +2875,33 @@ the main compiling phase. */
 /* States used for analyzing ranges in character classes. The two OK values
 must be last. */
 
-enum { RANGE_NO, RANGE_STARTED, RANGE_OK_ESCAPED, RANGE_OK_LITERAL };
+enum {
+  RANGE_NO, /* State after '[' (initial), or '[a-z'; hyphen is literal */
+  RANGE_STARTED, /* State after '[1-'; last-emitted code is META_RANGE_XYZ */
+  RANGE_FORBID_NO, /* State after '[\d'; '-]' is allowed but not '-1]' */
+  RANGE_FORBID_STARTED, /* State after '[\d-'*/
+  RANGE_OK_ESCAPED, /* State after '[\1'; hyphen may be a range */
+  RANGE_OK_LITERAL /* State after '[1'; hyphen may be a range */
+};
+
+/* States used for analyzing operators and operands in extended character
+classes. */
+
+enum {
+  CLASS_OP_EMPTY, /* At start of an expression; empty previous contents */
+  CLASS_OP_OPERAND, /* Have preceding operand; after "z" a "--" can follow */
+  CLASS_OP_OPERATOR /* Have preceding operator; after "--" operand must follow */
+};
+
+/* States used for determining the parse mode in character classes. The two
+PERL_EXT values must be last. */
+
+enum {
+  CLASS_MODE_NORMAL, /* Ordinary PCRE2 '[...]' class. */
+  CLASS_MODE_ALT_EXT, /* UTS#18-style extended '[...]' class. */
+  CLASS_MODE_PERL_EXT, /* Perl extended '(?[...])' class. */
+  CLASS_MODE_PERL_EXT_LEAF /* Leaf within extended '(?[ [...] ])' class. */
+};
 
 /* Only in 32-bit mode can there be literals > META_END. A macro encapsulates
 the storing of literal values in the main parsed pattern, where they can always
@@ -2769,13 +2920,16 @@ be quantified. */
 
 /* Here's the actual function. */
 
-static int parse_regex(PCRE2_SPTR ptr, uint32_t options, BOOL *has_lookbehind,
-  compile_block *cb)
+static int parse_regex(PCRE2_SPTR ptr, uint32_t options, uint32_t xoptions,
+  BOOL *has_lookbehind, compile_block *cb)
 {
 uint32_t c;
 uint32_t delimiter;
 uint32_t namelen;
 uint32_t class_range_state;
+uint32_t class_op_state;
+uint32_t class_mode_state;
+uint32_t *class_start;
 uint32_t *verblengthptr = NULL;     /* Value avoids compiler warning */
 uint32_t *verbstartptr = NULL;
 uint32_t *previous_callout = NULL;
@@ -2785,8 +2939,9 @@ uint32_t *this_parsed_item = NULL;
 uint32_t *prev_parsed_item = NULL;
 uint32_t meta_quantifier = 0;
 uint32_t add_after_mark = 0;
-uint32_t xoptions = cb->cx->extra_options;
 uint16_t nest_depth = 0;
+int16_t class_depth_m1 = -1; /* The m1 means minus 1. */
+int16_t class_maxdepth_m1 = -1;
 int after_manual_callout = 0;
 int expect_cond_assert = 0;
 int errorcode = 0;
@@ -2803,8 +2958,17 @@ PCRE2_SPTR thisptr;
 PCRE2_SPTR name;
 PCRE2_SPTR ptrend = cb->end_pattern;
 PCRE2_SPTR verbnamestart = NULL;    /* Value avoids compiler warning */
+PCRE2_SPTR class_range_forbid_ptr = NULL;
 named_group *ng;
 nest_save *top_nest, *end_nests;
+#ifdef PCRE2_DEBUG
+uint32_t *parsed_pattern_check;
+ptrdiff_t parsed_pattern_extra = 0;
+ptrdiff_t parsed_pattern_extra_check = 0;
+PCRE2_SPTR ptr_check;
+#endif
+
+PCRE2_ASSERT(parsed_pattern != NULL);
 
 /* Insert leading items for word and line matching (features provided for the
 benefit of pcre2grep). */
@@ -2820,6 +2984,11 @@ else if ((xoptions & PCRE2_EXTRA_MATCH_WORD) != 0)
   *parsed_pattern++ = META_NOCAPTURE;
   }
 
+#ifdef PCRE2_DEBUG
+parsed_pattern_check = parsed_pattern;
+ptr_check = ptr;
+#endif
+
 /* If the pattern is actually a literal string, process it separately to avoid
 cluttering up the main loop. */
 
@@ -2829,6 +2998,7 @@ if ((options & PCRE2_LITERAL) != 0)
     {
     if (parsed_pattern >= parsed_pattern_end)
       {
+      PCRE2_DEBUG_UNREACHABLE();
       errorcode = ERR63;  /* Internal error (parsed pattern overflow) */
       goto FAILED;
       }
@@ -2872,18 +3042,40 @@ while (ptr < ptrend)
   PCRE2_SPTR tempptr;
   PCRE2_SIZE offset;
 
-  if (parsed_pattern >= parsed_pattern_end)
-    {
-    errorcode = ERR63;  /* Internal error (parsed pattern overflow) */
-    goto FAILED;
-    }
-
   if (nest_depth > cb->cx->parens_nest_limit)
     {
     errorcode = ERR19;
     goto FAILED;        /* Parentheses too deeply nested */
     }
 
+  /* Check that we haven't emitted too much into parsed_pattern. We allocate
+  a suitably-sized buffer upfront, then do unchecked writes to it. If we only
+  write a little bit too much, everything will appear to be OK, because the
+  upfront size is an overestimate... but a malicious pattern could end up
+  forcing a write past the buffer end. We must catch this during
+  development. */
+
+#ifdef PCRE2_DEBUG
+  /* Strong post-write check. Won't help in release builds - at this point
+  the write has already occurred so it's too late. However, should stop us
+  committing unsafe code. */
+  PCRE2_ASSERT((parsed_pattern - parsed_pattern_check) +
+               (parsed_pattern_extra - parsed_pattern_extra_check) <=
+                 max_parsed_pattern(ptr_check, ptr, utf, options));
+  parsed_pattern_check = parsed_pattern;
+  parsed_pattern_extra_check = parsed_pattern_extra;
+  ptr_check = ptr;
+#endif
+
+  if (parsed_pattern >= parsed_pattern_end)
+    {
+    /* Weak pre-write check; only ensures parsed_pattern[0] is writeable
+    (but the code below can write many chars). Better than nothing. */
+    PCRE2_DEBUG_UNREACHABLE();
+    errorcode = ERR63;  /* Internal error (parsed pattern overflow) */
+    goto FAILED;
+    }
+
   /* If the last time round this loop something was added, parsed_pattern will
   no longer be equal to this_parsed_item. Remember where the previous item
   started and reset for the next item. Note that sometimes round the loop,
@@ -3003,7 +3195,7 @@ while (ptr < ptrend)
       if ((options & PCRE2_ALT_VERBNAMES) != 0)
         {
         escape = PRIV(check_escape)(&ptr, ptrend, &c, &errorcode, options,
-          xoptions, FALSE, cb);
+          xoptions, cb->bracount, FALSE, cb);
         if (errorcode != 0) goto FAILED;
         }
       else escape = 0;   /* Treat all as literal */
@@ -3203,7 +3395,7 @@ while (ptr < ptrend)
     case CHAR_BACKSLASH:
     tempptr = ptr;
     escape = PRIV(check_escape)(&ptr, ptrend, &c, &errorcode, options,
-      xoptions, FALSE, cb);
+      xoptions, cb->bracount, FALSE, cb);
     if (errorcode != 0)
       {
       ESCAPE_FAILED:
@@ -3234,7 +3426,7 @@ while (ptr < ptrend)
     else if (escape < 0)
       {
       offset = (PCRE2_SIZE)(ptr - cb->start_pattern - 1);
-      escape = -escape;
+      escape = -escape - 1;
       *parsed_pattern++ = META_BACKREF | (uint32_t)escape;
       if (escape < 10)
         {
@@ -3346,7 +3538,7 @@ while (ptr < ptrend)
 
       /* When \g is used with quotes or angle brackets as delimiters, it is a
       numerical or named subroutine call, and control comes here. When used
-      with brace delimiters it is a numberical back reference and does not come
+      with brace delimiters it is a numerical back reference and does not come
       here because check_escape() returns it directly as a reference. \k is
       always a named back reference. */
 
@@ -3457,7 +3649,7 @@ while (ptr < ptrend)
     if (!prev_okquantifier)
       {
       errorcode = ERR9;
-      goto FAILED_BACK;
+      goto FAILED_BACK;  // TODO https://github.com/PCRE2Project/pcre2/issues/549
       }
 
     /* Most (*VERB)s are not allowed to be quantified, but an ungreedy
@@ -3473,6 +3665,11 @@ while (ptr < ptrend)
       *verbstartptr = META_NOCAPTURE;
       parsed_pattern[1] = META_KET;
       parsed_pattern += 2;
+
+#ifdef PCRE2_DEBUG
+      PCRE2_ASSERT(parsed_pattern_extra >= 2);
+      parsed_pattern_extra -= 2;
+#endif
       }
 
     /* Now we can put the quantifier into the parsed pattern vector. At this
@@ -3492,7 +3689,6 @@ while (ptr < ptrend)
     /* ---- Character class ---- */
 
     case CHAR_LEFT_SQUARE_BRACKET:
-    okquantifier = TRUE;
 
     /* In another (POSIX) regex library, the ugly syntax [[:<:]] and [[:>:]] is
     used for "start of word" and "end of word". As these are otherwise illegal
@@ -3530,6 +3726,7 @@ while (ptr < ptrend)
         }
       *parsed_pattern++ = META_KET;
       ptr += 6;
+      okquantifier = TRUE;
       break;
       }
 
@@ -3544,46 +3741,14 @@ while (ptr < ptrend)
       goto FAILED;
       }
 
-    /* Process a regular character class. If the first character is '^', set
-    the negation flag. If the first few characters (either before or after ^)
-    are \Q\E or \E or space or tab in extended-more mode, we skip them too.
-    This makes for compatibility with Perl. */
+    class_mode_state = ((options & PCRE2_ALT_EXTENDED_CLASS) != 0)?
+        CLASS_MODE_ALT_EXT : CLASS_MODE_NORMAL;
 
-    negate_class = FALSE;
-    while (ptr < ptrend)
-      {
-      GETCHARINCTEST(c, ptr);
-      if (c == CHAR_BACKSLASH)
-        {
-        if (ptr < ptrend && *ptr == CHAR_E) ptr++;
-        else if (ptrend - ptr >= 3 &&
-             PRIV(strncmp_c8)(ptr, STR_Q STR_BACKSLASH STR_E, 3) == 0)
-          ptr += 3;
-        else
-          break;
-        }
-      else if ((options & PCRE2_EXTENDED_MORE) != 0 &&
-               (c == CHAR_SPACE || c == CHAR_HT))  /* Note: just these two */
-        continue;
-      else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
-        negate_class = TRUE;
-      else break;
-      }
+    /* Jump here from '(?[...])'. That jump must initialize class_mode_state,
+    set c to the '[' character, and ptr to just after the '['. */
 
-    /* Now the real contents of the class; c has the first "real" character.
-    Empty classes are permitted only if the option is set. */
-
-    if (c == CHAR_RIGHT_SQUARE_BRACKET &&
-        (cb->external_options & PCRE2_ALLOW_EMPTY_CLASS) != 0)
-      {
-      *parsed_pattern++ = negate_class? META_CLASS_EMPTY_NOT : META_CLASS_EMPTY;
-      break;  /* End of class processing */
-      }
-
-    /* Process a non-empty class. */
-
-    *parsed_pattern++ = negate_class? META_CLASS_NOT : META_CLASS;
-    class_range_state = RANGE_NO;
+    FROM_PERL_EXTENDED_CLASS:
+    okquantifier = TRUE;
 
     /* In an EBCDIC environment, Perl treats alphabetic ranges specially
     because there are holes in the encoding, and simply using the range A-Z
@@ -3593,7 +3758,16 @@ while (ptr < ptrend)
     character values are literal or not, and a state variable for handling
     ranges. */
 
-    /* Loop for the contents of the class */
+    /* Loop for the contents of the class. Classes may be nested, if
+    PCRE2_ALT_EXTENDED_CLASS is set, or the class is of the form (?[...]). */
+
+    /* c is still set to '[' so the loop will handle the start of the class. */
+
+    class_depth_m1 = -1;
+    class_maxdepth_m1 = -1;
+    class_range_state = RANGE_NO;
+    class_op_state = CLASS_OP_EMPTY;
+    class_start = NULL;
 
     for (;;)
       {
@@ -3609,13 +3783,26 @@ while (ptr < ptrend)
           ptr++;                            /* Skip the 'E' */
           goto CLASS_CONTINUE;
           }
+
+        /* Surprisingly, you cannot use \Q..\E to escape a character inside a
+        Perl extended class. However, empty \Q\E sequences are allowed, so here
+        were're only giving an error if the \Q..\E is non-empty. */
+
+        if (class_mode_state == CLASS_MODE_PERL_EXT)
+          {
+          errorcode = ERR116;
+          goto FAILED;
+          }
+
         goto CLASS_LITERAL;
         }
 
-      /* Skip over space and tab (only) in extended-more mode. */
+      /* Skip over space and tab (only) in extended-more mode, or anywhere
+      inside a Perl extended class (which implies /xx). */
 
-      if ((options & PCRE2_EXTENDED_MORE) != 0 &&
-          (c == CHAR_SPACE || c == CHAR_HT))
+      if ((c == CHAR_SPACE || c == CHAR_HT) &&
+          ((options & PCRE2_EXTENDED_MORE) != 0 ||
+           class_mode_state >= CLASS_MODE_PERL_EXT))
         goto CLASS_CONTINUE;
 
       /* Handle POSIX class names. Perl allows a negation extension of the
@@ -3624,7 +3811,8 @@ while (ptr < ptrend)
       [.ch.] and [=ch=] ("collating elements") and fault them, as Perl
       5.6 and 5.8 do. */
 
-      if (c == CHAR_LEFT_SQUARE_BRACKET &&
+      if (class_depth_m1 >= 0 &&
+          c == CHAR_LEFT_SQUARE_BRACKET &&
           ptrend - ptr >= 3 &&
           (*ptr == CHAR_COLON || *ptr == CHAR_DOT ||
            *ptr == CHAR_EQUALS_SIGN) &&
@@ -3640,14 +3828,41 @@ while (ptr < ptrend)
 
         if (class_range_state == RANGE_STARTED)
           {
+          ptr = tempptr + 2;
           errorcode = ERR50;
           goto FAILED;
           }
 
+        /* Perl treats a hyphen after a POSIX class as a literal, not the
+        start of a range. However, it gives a warning in its warning mode
+        unless the hyphen is the last character in the class. PCRE does not
+        have a warning mode, so we give an error, because this is likely an
+        error on the user's part.
+
+        Roll back to the hyphen for the error position. */
+
+        if (class_range_state == RANGE_FORBID_STARTED)
+          {
+          ptr = class_range_forbid_ptr;
+          errorcode = ERR50;
+          goto FAILED;
+          }
+
+        /* Disallow implicit union in Perl extended classes. */
+
+        if (class_op_state == CLASS_OP_OPERAND &&
+            class_mode_state == CLASS_MODE_PERL_EXT)
+          {
+          ptr = tempptr + 2;
+          errorcode = ERR113;
+          goto FAILED;
+          }
+
         if (*ptr != CHAR_COLON)
           {
+          ptr = tempptr + 2;
           errorcode = ERR13;
-          goto FAILED_BACK;
+          goto FAILED;
           }
 
         if (*(++ptr) == CHAR_CIRCUMFLEX_ACCENT)
@@ -3657,33 +3872,19 @@ while (ptr < ptrend)
           }
 
         posix_class = check_posix_name(ptr, (int)(tempptr - ptr));
+        ptr = tempptr + 2;
         if (posix_class < 0)
           {
           errorcode = ERR30;
           goto FAILED;
           }
-        ptr = tempptr + 2;
 
-        /* Perl treats a hyphen after a POSIX class as a literal, not the
-        start of a range. However, it gives a warning in its warning mode
-        unless the hyphen is the last character in the class. PCRE does not
-        have a warning mode, so we give an error, because this is likely an
-        error on the user's part. */
+        /* Set "a hyphen is forbidden to be the start of a range". For the '-]'
+        case, the hyphen is treated as a literal, but for '-1' it is disallowed
+        (because it would be interpreted as range). */
 
-        if (ptr < ptrend - 1 && *ptr == CHAR_MINUS &&
-            ptr[1] != CHAR_RIGHT_SQUARE_BRACKET)
-          {
-          errorcode = ERR50;
-          goto FAILED;
-          }
-
-        /* Set "a hyphen is not the start of a range" for the -] case, and also
-        in case the POSIX class is followed by \E or \Q\E (possibly repeated -
-        fuzzers do that kind of thing) and *then* a hyphen. This causes that
-        hyphen to be treated as a literal. I don't think it's worth setting up
-        special apparatus to do otherwise. */
-
-        class_range_state = RANGE_NO;
+        class_range_state = RANGE_FORBID_NO;
+        class_op_state = CLASS_OP_OPERAND;
 
         /* When PCRE2_UCP is set, unless PCRE2_EXTRA_ASCII_POSIX is set, some
         of the POSIX classes are converted to use Unicode properties \p or \P
@@ -3726,56 +3927,344 @@ while (ptr < ptrend)
         *parsed_pattern++ = posix_class;
         }
 
-      /* Handle potential start of range */
+      /* Check for the start of the outermost class, or the start of a nested class. */
 
-      else if (c == CHAR_MINUS && class_range_state >= RANGE_OK_ESCAPED)
+      else if ((c == CHAR_LEFT_SQUARE_BRACKET &&
+                (class_depth_m1 < 0 || class_mode_state == CLASS_MODE_ALT_EXT ||
+                 class_mode_state == CLASS_MODE_PERL_EXT)) ||
+               (c == CHAR_LEFT_PARENTHESIS &&
+                class_mode_state == CLASS_MODE_PERL_EXT))
         {
-        *parsed_pattern++ = (class_range_state == RANGE_OK_LITERAL)?
-          META_RANGE_LITERAL : META_RANGE_ESCAPED;
-        class_range_state = RANGE_STARTED;
+        uint32_t start_c = c;
+        uint32_t new_class_mode_state;
+
+        /* Update the class mode, if moving into a 'leaf' inside a Perl extended
+        class. */
+
+        if (start_c == CHAR_LEFT_SQUARE_BRACKET &&
+            class_mode_state == CLASS_MODE_PERL_EXT && class_depth_m1 >= 0)
+          new_class_mode_state = CLASS_MODE_PERL_EXT_LEAF;
+        else
+          new_class_mode_state = class_mode_state;
+
+        /* Tidy up the other class before starting the nested class. */
+        /* -[ beginning a nested class is a literal '-' */
+
+        if (class_range_state == RANGE_STARTED)
+          parsed_pattern[-1] = CHAR_MINUS;
+
+        /* Disallow implicit union in Perl extended classes. */
+
+        if (class_op_state == CLASS_OP_OPERAND &&
+            class_mode_state == CLASS_MODE_PERL_EXT)
+          {
+          errorcode = ERR113;
+          goto FAILED;
+          }
+
+        /* Validate nesting depth */
+        if (class_depth_m1 >= ECLASS_NEST_LIMIT - 1)
+          {
+          errorcode = ERR107;
+          goto FAILED;        /* Classes too deeply nested */
+          }
+
+        /* Process the character class start. If the first character is '^', set
+        the negation flag. If the first few characters (either before or after ^)
+        are \Q\E or \E or space or tab in extended-more mode, we skip them too.
+        This makes for compatibility with Perl. */
+
+        negate_class = FALSE;
+        for (;;)
+          {
+          if (ptr >= ptrend)
+            {
+            if (start_c == CHAR_LEFT_PARENTHESIS)
+              errorcode = ERR14;  /* Missing terminating ')' */
+            else
+              errorcode = ERR6;   /* Missing terminating ']' */
+            goto FAILED;
+            }
+
+          GETCHARINCTEST(c, ptr);
+          if (new_class_mode_state == CLASS_MODE_PERL_EXT) break;
+          else if (c == CHAR_BACKSLASH)
+            {
+            if (ptr < ptrend && *ptr == CHAR_E) ptr++;
+            else if (ptrend - ptr >= 3 &&
+                PRIV(strncmp_c8)(ptr, STR_Q STR_BACKSLASH STR_E, 3) == 0)
+              ptr += 3;
+            else
+              break;
+            }
+          else if ((c == CHAR_SPACE || c == CHAR_HT) &&  /* Note: just these two */
+                   ((options & PCRE2_EXTENDED_MORE) != 0 ||
+                    new_class_mode_state >= CLASS_MODE_PERL_EXT))
+            continue;
+          else if (!negate_class && c == CHAR_CIRCUMFLEX_ACCENT)
+            negate_class = TRUE;
+          else break;
+          }
+
+        /* Now the real contents of the class; c has the first "real" character.
+        Empty classes are permitted only if the option is set, and if it's not
+        a Perl-extended class. */
+
+        if (c == CHAR_RIGHT_SQUARE_BRACKET &&
+            (cb->external_options & PCRE2_ALLOW_EMPTY_CLASS) != 0 &&
+            new_class_mode_state < CLASS_MODE_PERL_EXT)
+          {
+          PCRE2_ASSERT(start_c == CHAR_LEFT_SQUARE_BRACKET);
+
+          if (class_start != NULL)
+            {
+            PCRE2_ASSERT(class_depth_m1 >= 0);
+            /* Represents that the class is an extended class. */
+            *class_start |= CLASS_IS_ECLASS;
+            class_start = NULL;
+            }
+
+          *parsed_pattern++ = negate_class? META_CLASS_EMPTY_NOT : META_CLASS_EMPTY;
+
+          /* Leave nesting depth unchanged; but check for zero depth to handle the
+          very first (top-level) class being empty. */
+          if (class_depth_m1 < 0) break;
+
+          class_range_state = RANGE_NO; /* for processing the containing class */
+          class_op_state = CLASS_OP_OPERAND;
+          goto CLASS_CONTINUE;
+          }
+
+        /* Enter a non-empty class. */
+
+        if (class_start != NULL)
+          {
+          PCRE2_ASSERT(class_depth_m1 >= 0);
+          /* Represents that the class is an extended class. */
+          *class_start |= CLASS_IS_ECLASS;
+          class_start = NULL;
+          }
+
+        class_start = parsed_pattern;
+        *parsed_pattern++ = negate_class? META_CLASS_NOT : META_CLASS;
+        class_range_state = RANGE_NO;
+        class_op_state = CLASS_OP_EMPTY;
+        class_mode_state = new_class_mode_state;
+        ++class_depth_m1;
+        if (class_maxdepth_m1 < class_depth_m1)
+          class_maxdepth_m1 = class_depth_m1;
+        /* Reset; no op seen yet at new depth. */
+        cb->class_op_used[class_depth_m1] = 0;
+
+        /* Implement the special start-of-class literal meaning of ']'. */
+        if (c == CHAR_RIGHT_SQUARE_BRACKET &&
+            new_class_mode_state != CLASS_MODE_PERL_EXT)
+          {
+          class_range_state = RANGE_OK_LITERAL;
+          class_op_state = CLASS_OP_OPERAND;
+          PARSED_LITERAL(c, parsed_pattern);
+          goto CLASS_CONTINUE;
+          }
+
+        continue;  /* We have already loaded c with the next character */
         }
 
-      /* Handle a literal character */
+      /* Check for the end of the class. */
 
-      else if (c != CHAR_BACKSLASH)
+      else if (c == CHAR_RIGHT_SQUARE_BRACKET ||
+               (c == CHAR_RIGHT_PARENTHESIS && class_mode_state == CLASS_MODE_PERL_EXT))
         {
-        CLASS_LITERAL:
-        if (class_range_state == RANGE_STARTED)
+        /* In Perl extended mode, the ']' can only be used to match the
+        opening '[', and ')' must match an opening parenthesis. */
+        if (class_mode_state == CLASS_MODE_PERL_EXT)
           {
-          if (c == parsed_pattern[-2])       /* Optimize one-char range */
-            parsed_pattern--;
-          else if (parsed_pattern[-2] > c)   /* Check range is in order */
+          if (c == CHAR_RIGHT_SQUARE_BRACKET && class_depth_m1 != 0)
             {
-            errorcode = ERR8;
+            errorcode = ERR14;
             goto FAILED_BACK;
             }
-          else
+          if (c == CHAR_RIGHT_PARENTHESIS && class_depth_m1 < 1)
             {
-            if (!char_is_literal && parsed_pattern[-1] == META_RANGE_LITERAL)
-              parsed_pattern[-1] = META_RANGE_ESCAPED;
-            PARSED_LITERAL(c, parsed_pattern);
+            errorcode = ERR22;
+            goto FAILED;
             }
-          class_range_state = RANGE_NO;
           }
-        else  /* Potential start of range */
+
+        /* Check no trailing operator. */
+        if (class_op_state == CLASS_OP_OPERATOR)
           {
-          class_range_state = char_is_literal?
-            RANGE_OK_LITERAL : RANGE_OK_ESCAPED;
-          PARSED_LITERAL(c, parsed_pattern);
+          errorcode = ERR110;
+          goto FAILED;
           }
+
+        /* Check no empty expression for Perl extended expressions. */
+        if (class_mode_state == CLASS_MODE_PERL_EXT &&
+            class_op_state == CLASS_OP_EMPTY)
+          {
+          errorcode = ERR114;
+          goto FAILED;
+          }
+
+        /* -] at the end of a class is a literal '-' */
+        if (class_range_state == RANGE_STARTED)
+          parsed_pattern[-1] = CHAR_MINUS;
+
+        *parsed_pattern++ = META_CLASS_END;
+
+        if (--class_depth_m1 < 0)
+          {
+          /* Check for and consume ')' after '(?[...]'. */
+          PCRE2_ASSERT(class_mode_state != CLASS_MODE_PERL_EXT_LEAF);
+          if (class_mode_state == CLASS_MODE_PERL_EXT)
+            {
+            if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
+              {
+              errorcode = ERR115;
+              goto FAILED;
+              }
+
+            ptr++;
+            }
+
+          break;
+          }
+
+        class_range_state = RANGE_NO; /* for processing the containing class */
+        class_op_state = CLASS_OP_OPERAND;
+        if (class_mode_state == CLASS_MODE_PERL_EXT_LEAF)
+          class_mode_state = CLASS_MODE_PERL_EXT;
+        /* The extended class flag has already
+        been set for the parent class. */
+        class_start = NULL;
+        }
+
+      /* Handle a Perl set binary operator */
+
+      else if (class_mode_state == CLASS_MODE_PERL_EXT &&
+               (c == CHAR_PLUS || c == CHAR_VERTICAL_LINE || c == CHAR_MINUS ||
+                c == CHAR_AMPERSAND || c == CHAR_CIRCUMFLEX_ACCENT))
+        {
+        /* Check that there was a preceding operand. */
+        if (class_op_state != CLASS_OP_OPERAND)
+          {
+          errorcode = ERR109;
+          goto FAILED;
+          }
+
+        if (class_start != NULL)
+          {
+          PCRE2_ASSERT(class_depth_m1 >= 0);
+          /* Represents that the class is an extended class. */
+          *class_start |= CLASS_IS_ECLASS;
+          class_start = NULL;
+          }
+
+        PCRE2_ASSERT(class_range_state != RANGE_STARTED &&
+                     class_range_state != RANGE_FORBID_STARTED);
+
+        *parsed_pattern++ = c == CHAR_PLUS? META_ECLASS_OR :
+                            c == CHAR_VERTICAL_LINE? META_ECLASS_OR :
+                            c == CHAR_MINUS? META_ECLASS_SUB :
+                            c == CHAR_AMPERSAND? META_ECLASS_AND :
+                            META_ECLASS_XOR;
+        class_range_state = RANGE_NO;
+        class_op_state = CLASS_OP_OPERATOR;
+        }
+
+      /* Handle a Perl set unary operator */
+
+      else if (class_mode_state == CLASS_MODE_PERL_EXT &&
+               c == CHAR_EXCLAMATION_MARK)
+        {
+        /* Check that the "!" has not got a preceding operand (i.e. it's the
+        start of the class, or follows an operator). */
+        if (class_op_state == CLASS_OP_OPERAND)
+          {
+          errorcode = ERR113;
+          goto FAILED;
+          }
+
+        if (class_start != NULL)
+          {
+          PCRE2_ASSERT(class_depth_m1 >= 0);
+          /* Represents that the class is an extended class. */
+          *class_start |= CLASS_IS_ECLASS;
+          class_start = NULL;
+          }
+
+        PCRE2_ASSERT(class_range_state != RANGE_STARTED &&
+                     class_range_state != RANGE_FORBID_STARTED);
+
+        *parsed_pattern++ = META_ECLASS_NOT;
+        class_range_state = RANGE_NO;
+        class_op_state = CLASS_OP_OPERATOR;
+        }
+
+      /* Handle a UTS#18 set operator */
+
+      else if (class_mode_state == CLASS_MODE_ALT_EXT &&
+               (c == CHAR_VERTICAL_LINE || c == CHAR_MINUS ||
+                c == CHAR_AMPERSAND || c == CHAR_TILDE) &&
+               ptr < ptrend && *ptr == c)
+        {
+        ++ptr;
+
+        /* Check there isn't a triple-repetition. */
+        if (ptr < ptrend && *ptr == c)
+          {
+          while (ptr < ptrend && *ptr == c) ++ptr;  /* Improve error offset. */
+          errorcode = ERR108;
+          goto FAILED;
+          }
+
+        /* Check for a preceding operand. */
+        if (class_op_state != CLASS_OP_OPERAND)
+          {
+          errorcode = ERR109;
+          goto FAILED;
+          }
+
+        /* Check for mixed precedence. Forbid [A--B&&C]. */
+        if (cb->class_op_used[class_depth_m1] != 0 &&
+            cb->class_op_used[class_depth_m1] != (uint8_t)c)
+          {
+          errorcode = ERR111;
+          goto FAILED;
+          }
+
+        if (class_start != NULL)
+          {
+          PCRE2_ASSERT(class_depth_m1 >= 0);
+          /* Represents that the class is an extended class. */
+          *class_start |= CLASS_IS_ECLASS;
+          class_start = NULL;
+          }
+
+        /* Dangling '-' before an operator is a literal */
+        if (class_range_state == RANGE_STARTED)
+          parsed_pattern[-1] = CHAR_MINUS;
+
+        *parsed_pattern++ = c == CHAR_VERTICAL_LINE? META_ECLASS_OR :
+                            c == CHAR_MINUS? META_ECLASS_SUB :
+                            c == CHAR_AMPERSAND? META_ECLASS_AND :
+                            META_ECLASS_XOR;
+        class_range_state = RANGE_NO;
+        class_op_state = CLASS_OP_OPERATOR;
+        cb->class_op_used[class_depth_m1] = (uint8_t)c;
         }
 
       /* Handle escapes in a class */
 
-      else
+      else if (c == CHAR_BACKSLASH)
         {
         tempptr = ptr;
         escape = PRIV(check_escape)(&ptr, ptrend, &c, &errorcode, options,
-          xoptions, TRUE, cb);
+          xoptions, cb->bracount, TRUE, cb);
 
         if (errorcode != 0)
           {
-          if ((xoptions & PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL) == 0)
+          if ((xoptions & PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL) == 0 ||
+              class_mode_state >= CLASS_MODE_PERL_EXT)
             goto FAILED;
           ptr = tempptr;
           if (ptr >= ptrend) c = CHAR_BACKSLASH; else
@@ -3796,6 +4285,11 @@ while (ptr < ptrend)
           char_is_literal = FALSE;
           goto CLASS_LITERAL;
 
+          case ESC_k:
+          c = CHAR_k;     /* \k is not special in a class, just like \g */
+          char_is_literal = FALSE;
+          goto CLASS_LITERAL;
+
           case ESC_Q:
           inescq = TRUE;  /* Enter literal mode */
           goto CLASS_CONTINUE;
@@ -3807,29 +4301,10 @@ while (ptr < ptrend)
           case ESC_R:
           case ESC_X:
           errorcode = ERR7;
-          ptr--;
+          ptr--;  // TODO https://github.com/PCRE2Project/pcre2/issues/549
           goto FAILED;
-          }
 
-        /* The second part of a range can be a single-character escape
-        sequence (detected above), but not any of the other escapes. Perl
-        treats a hyphen as a literal in such circumstances. However, in Perl's
-        warning mode, a warning is given, so PCRE now faults it, as it is
-        almost certainly a mistake on the user's part. */
-
-        if (class_range_state == RANGE_STARTED)
-          {
-          errorcode = ERR50;
-          goto FAILED;  /* Not CLASS_ESCAPE_FAILED; always an error */
-          }
-
-        /* Of the remaining escapes, only those that define characters are
-        allowed in a class. None may start a range. */
-
-        class_range_state = RANGE_NO;
-        switch(escape)
-          {
-          case ESC_N:
+          case ESC_N:     /* Not permitted by Perl either */
           errorcode = ERR71;
           goto FAILED;
 
@@ -3863,6 +4338,18 @@ while (ptr < ptrend)
             uint16_t ptype = 0, pdata = 0;
             if (!get_ucp(&ptr, &negated, &ptype, &pdata, &errorcode, cb))
               goto FAILED;
+
+            /* In caseless matching, particular characteristics Lu, Ll, and Lt
+            get converted to the general characteristic L&. That is, upper,
+            lower, and title case letters are all conflated. */
+
+            if ((options & PCRE2_CASELESS) != 0 && ptype == PT_PC &&
+                (pdata == ucp_Lu || pdata == ucp_Ll || pdata == ucp_Lt))
+              {
+              ptype = PT_LAMP;
+              pdata = 0;
+              }
+
             if (negated) escape = (escape == ESC_P)? ESC_p : ESC_P;
             *parsed_pattern++ = META_ESCAPE + escape;
             *parsed_pattern++ = (ptype << 16) | pdata;
@@ -3873,21 +4360,134 @@ while (ptr < ptrend)
 #endif
           break;  /* End \P and \p */
 
-          default:    /* All others are not allowed in a class */
+          /* All others are not allowed in a class */
+
+          default:
+          PCRE2_DEBUG_UNREACHABLE();
+          /* Fall through */
+
+          case ESC_A:
+          case ESC_Z:
+          case ESC_z:
+          case ESC_G:
+          case ESC_K:
+          case ESC_C:
           errorcode = ERR7;
-          ptr--;
+          ptr--;  // TODO https://github.com/PCRE2Project/pcre2/issues/549
           goto FAILED;
           }
 
-        /* Perl gives a warning unless a following hyphen is the last character
-        in the class. PCRE throws an error. */
+        /* All the switch-cases above which end in "break" describe a set
+        of characters. None may start a range. */
 
-        if (ptr < ptrend - 1 && *ptr == CHAR_MINUS &&
-            ptr[1] != CHAR_RIGHT_SQUARE_BRACKET)
+        /* The second part of a range can be a single-character escape
+        sequence (detected above), but not any of the other escapes. Perl
+        treats a hyphen as a literal in such circumstances. However, in Perl's
+        warning mode, a warning is given, so PCRE now faults it, as it is
+        almost certainly a mistake on the user's part. */
+
+        if (class_range_state == RANGE_STARTED)
           {
           errorcode = ERR50;
           goto FAILED;
           }
+
+        /* Perl gives a warning unless the hyphen following a multi-character
+        escape is the last character in the class. PCRE throws an error. */
+
+        if (class_range_state == RANGE_FORBID_STARTED)
+          {
+          ptr = class_range_forbid_ptr;
+          errorcode = ERR50;
+          goto FAILED;
+          }
+
+        /* Disallow implicit union in Perl extended classes. */
+
+        if (class_op_state == CLASS_OP_OPERAND &&
+            class_mode_state == CLASS_MODE_PERL_EXT)
+          {
+          errorcode = ERR113;
+          goto FAILED;
+          }
+
+        class_range_state = RANGE_FORBID_NO;
+        class_op_state = CLASS_OP_OPERAND;
+        }
+
+      /* Forbid unescaped literals, and the special meaning of '-', inside a
+      Perl extended class. */
+
+      else if (class_mode_state == CLASS_MODE_PERL_EXT)
+        {
+        errorcode = ERR116;
+        goto FAILED;
+        }
+
+      /* Handle potential start of range */
+
+      else if (c == CHAR_MINUS && class_range_state >= RANGE_OK_ESCAPED)
+        {
+        *parsed_pattern++ = (class_range_state == RANGE_OK_LITERAL)?
+          META_RANGE_LITERAL : META_RANGE_ESCAPED;
+        class_range_state = RANGE_STARTED;
+        }
+
+      /* Handle forbidden start of range */
+
+      else if (c == CHAR_MINUS && class_range_state == RANGE_FORBID_NO)
+        {
+        *parsed_pattern++ = CHAR_MINUS;
+        class_range_state = RANGE_FORBID_STARTED;
+        class_range_forbid_ptr = ptr;
+        }
+
+      /* Handle a literal character */
+
+      else
+        {
+        CLASS_LITERAL:
+
+        /* Disallow implicit union in Perl extended classes. */
+
+        if (class_op_state == CLASS_OP_OPERAND &&
+            class_mode_state == CLASS_MODE_PERL_EXT)
+          {
+          errorcode = ERR113;
+          goto FAILED;
+          }
+
+        if (class_range_state == RANGE_STARTED)
+          {
+          if (c == parsed_pattern[-2])       /* Optimize one-char range */
+            parsed_pattern--;
+          else if (parsed_pattern[-2] > c)   /* Check range is in order */
+            {
+            errorcode = ERR8;
+            goto FAILED_BACK;  // TODO https://github.com/PCRE2Project/pcre2/issues/549
+            }
+          else
+            {
+            if (!char_is_literal && parsed_pattern[-1] == META_RANGE_LITERAL)
+              parsed_pattern[-1] = META_RANGE_ESCAPED;
+            PARSED_LITERAL(c, parsed_pattern);
+            }
+          class_range_state = RANGE_NO;
+          class_op_state = CLASS_OP_OPERAND;
+          }
+        else if (class_range_state == RANGE_FORBID_STARTED)
+          {
+          ptr = class_range_forbid_ptr;
+          errorcode = ERR50;
+          goto FAILED;
+          }
+        else  /* Potential start of range */
+          {
+          class_range_state = char_is_literal?
+            RANGE_OK_LITERAL : RANGE_OK_ESCAPED;
+          class_op_state = CLASS_OP_OPERAND;
+          PARSED_LITERAL(c, parsed_pattern);
+          }
         }
 
       /* Proceed to next thing in the class. */
@@ -3895,22 +4495,18 @@ while (ptr < ptrend)
       CLASS_CONTINUE:
       if (ptr >= ptrend)
         {
-        errorcode = ERR6;  /* Missing terminating ']' */
+        if (class_mode_state == CLASS_MODE_PERL_EXT && class_depth_m1 > 0)
+          errorcode = ERR14;   /* Missing terminating ')' */
+        if (class_mode_state == CLASS_MODE_ALT_EXT &&
+            class_depth_m1 == 0 && class_maxdepth_m1 == 1)
+          errorcode = ERR112;  /* Missing terminating ']', but we saw '[ [ ]...' */
+        else
+          errorcode = ERR6;    /* Missing terminating ']' */
         goto FAILED;
         }
       GETCHARINCTEST(c, ptr);
-      if (c == CHAR_RIGHT_SQUARE_BRACKET && !inescq) break;
       }     /* End of class-processing loop */
 
-    /* -] at the end of a class is a literal '-' */
-
-    if (class_range_state == RANGE_STARTED)
-      {
-      parsed_pattern[-1] = CHAR_MINUS;
-      class_range_state = RANGE_NO;
-      }
-
-    *parsed_pattern++ = META_CLASS_END;
     break;  /* End of character class */
 
 
@@ -3993,8 +4589,7 @@ while (ptr < ptrend)
         if (prev_expect_cond_assert > 0 &&
             (meta < META_LOOKAHEAD || meta > META_LOOKBEHINDNOT))
           {
-          errorcode = (meta == META_LOOKAHEAD_NA || meta == META_LOOKBEHIND_NA)?
-            ERR98 : ERR28;  /* (Atomic) assertion expected */
+          errorcode = ERR28;  /* Atomic assertion expected */
           goto FAILED;
           }
 
@@ -4004,6 +4599,7 @@ while (ptr < ptrend)
         switch(meta)
           {
           default:
+          PCRE2_DEBUG_UNREACHABLE();
           errorcode = ERR89;  /* Unknown code; should never occur because */
           goto FAILED;        /* the meta values come from a table above. */
 
@@ -4019,6 +4615,90 @@ while (ptr < ptrend)
           case META_LOOKAHEADNOT:
           goto NEGATIVE_LOOK_AHEAD;
 
+          case META_SCS:
+          if (++ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+
+          if (*ptr != CHAR_LEFT_PARENTHESIS)
+            {
+            errorcode = ERR15;
+            goto FAILED;
+            }
+
+          ptr++;
+          *parsed_pattern++ = META_SCS;
+          /* Temporary variable, zero in the first iteration. */
+          offset = 0;
+
+          for (;;)
+            {
+            PCRE2_SIZE next_offset = (PCRE2_SIZE)(ptr - cb->start_pattern);
+
+            /* Handle (scan_substring:([+-]number)... */
+            if (read_number(&ptr, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61,
+                &i, &errorcode))
+              {
+              PCRE2_ASSERT(i >= 0);
+              if (i <= 0)
+                {
+                errorcode = ERR15;
+                goto FAILED;
+                }
+              meta = META_SCS_NUMBER;
+              namelen = (uint32_t)i;
+              }
+            else if (errorcode != 0) goto FAILED;   /* Number too big */
+            else
+              {
+              if (ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+
+              /* Handle (*scan_substring:('name') or (*scan_substring:(<name>) */
+              if (*ptr == CHAR_LESS_THAN_SIGN)
+                terminator = CHAR_GREATER_THAN_SIGN;
+              else if (*ptr == CHAR_APOSTROPHE)
+                terminator = CHAR_APOSTROPHE;
+              else
+                {
+                errorcode = ERR15;
+                goto FAILED;
+                }
+
+              if (!read_name(&ptr, ptrend, utf, terminator, &next_offset,
+                  &name, &namelen, &errorcode, cb)) goto FAILED;
+
+              meta = META_SCS_NAME;
+              }
+
+            PCRE2_ASSERT(next_offset > 0);
+            if (offset == 0 || (next_offset - offset) >= 0x10000)
+              {
+              *parsed_pattern++ = META_OFFSET;
+              PUTOFFSET(next_offset, parsed_pattern);
+              offset = next_offset;
+              }
+
+            /* The offset is encoded as a relative offset, because for some
+            inputs such as ",2" in (*scs:(1,2,3)...), we only have space for
+            two uint32_t values, and an opcode and absolute offset may require
+            three uint32_t values. */
+            *parsed_pattern++ = meta | (uint32_t)(next_offset - offset);
+            *parsed_pattern++ = namelen;
+            offset = next_offset;
+
+            if (ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
+
+            if (*ptr == CHAR_RIGHT_PARENTHESIS) break;
+
+            if (*ptr != CHAR_COMMA)
+              {
+              errorcode = ERR24;
+              goto FAILED;
+              }
+
+            ptr++;
+            }
+          ptr++;
+          goto POST_ASSERTION;
+
           case META_LOOKBEHIND:
           case META_LOOKBEHINDNOT:
           case META_LOOKBEHIND_NA:
@@ -4050,6 +4730,12 @@ while (ptr < ptrend)
             top_nest->flags = NSF_ATOMICSR;
             top_nest->options = options & PARSE_TRACKED_OPTIONS;
             top_nest->xoptions = xoptions & PARSE_TRACKED_EXTRA_OPTIONS;
+
+#ifdef PCRE2_DEBUG
+            /* We'll write out two META_KETs for a single ")" in the input
+            pattern, so we reserve space for that in our bounds check. */
+            parsed_pattern_extra++;
+#endif
             }
           break;
 #else  /* SUPPORT_UNICODE */
@@ -4109,6 +4795,11 @@ while (ptr < ptrend)
 
         verbstartptr = parsed_pattern;
         okquantifier = (verbs[i].meta == META_ACCEPT);
+#ifdef PCRE2_DEBUG
+        /* Reserve space in our bounds check for optionally wrapping the (*ACCEPT)
+        with a non-capturing bracket, if there is a following quantifier. */
+        if (okquantifier) parsed_pattern_extra += 2;
+#endif
 
         /* It appears that Perl allows any characters whatsoever, other than a
         closing parenthesis, to appear in arguments ("names"), so we no longer
@@ -4416,11 +5107,7 @@ while (ptr < ptrend)
           (IS_DIGIT(*ptr))? -1:(int)(cb->bracount), /* + and - are relative */
           MAX_GROUP_NUMBER, ERR61,
           &i, &errorcode)) goto FAILED;
-      if (i < 0)  /* NB (?0) is permitted */
-        {
-        errorcode = ERR15;   /* Unknown group */
-        goto FAILED_BACK;
-        }
+      PCRE2_ASSERT(i >= 0);  /* NB (?0) is permitted, represented by i=0 */
       if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
         goto UNCLOSED_PARENTHESIS;
 
@@ -4448,6 +5135,12 @@ while (ptr < ptrend)
       /* ---- Callout with numerical or string argument ---- */
 
       case CHAR_C:
+      if ((xoptions & PCRE2_EXTRA_NEVER_CALLOUT) != 0)
+        {
+        errorcode = ERR103;
+        goto FAILED;
+        }
+
       if (++ptr >= ptrend) goto UNCLOSED_PARENTHESIS;
 
       /* If the previous item was a condition starting (?(? an assertion,
@@ -4535,7 +5228,7 @@ while (ptr < ptrend)
         parsed_pattern += 3;                       /* Skip pattern info */
         while (ptr < ptrend && IS_DIGIT(*ptr))
           {
-          n = n * 10 + *ptr++ - CHAR_0;
+          n = n * 10 + (*ptr++ - CHAR_0);
           if (n > 255)
             {
             errorcode = ERR38;
@@ -4606,6 +5299,7 @@ while (ptr < ptrend)
       if (read_number(&ptr, ptrend, cb->bracount, MAX_GROUP_NUMBER, ERR61, &i,
           &errorcode))
         {
+        PCRE2_ASSERT(i >= 0);
         if (i <= 0)
           {
           errorcode = ERR15;
@@ -4756,7 +5450,7 @@ while (ptr < ptrend)
       goto POST_ASSERTION;
 
       case CHAR_ASTERISK:
-      POSITIVE_NONATOMIC_LOOK_AHEAD:         /* Come from (?* */
+      POSITIVE_NONATOMIC_LOOK_AHEAD:         /* Come from (*napla: */
       *parsed_pattern++ = META_LOOKAHEAD_NA;
       ptr++;
       goto POST_ASSERTION;
@@ -4921,6 +5615,18 @@ while (ptr < ptrend)
       cb->named_groups[cb->names_found].isdup = (uint16_t)isdupname;
       cb->names_found++;
       break;
+
+
+      /* ---- Perl extended character class ---- */
+
+      /* These are of the form '(?[...])'. We handle these via the same parser
+      that consumes ordinary '[...]' classes, but with a flag set to activate
+      the extended behaviour. */
+
+      case CHAR_LEFT_SQUARE_BRACKET:
+      class_mode_state = CLASS_MODE_PERL_EXT;
+      c = *ptr++;
+      goto FROM_PERL_EXTENDED_CLASS;
       }        /* End of (? switch */
     break;     /* End of ( handling */
 
@@ -4959,6 +5665,11 @@ while (ptr < ptrend)
       if ((top_nest->flags & NSF_ATOMICSR) != 0)
         {
         *parsed_pattern++ = META_KET;
+
+#ifdef PCRE2_DEBUG
+        PCRE2_ASSERT(parsed_pattern_extra > 0);
+        parsed_pattern_extra--;
+#endif
         }
 
       if (top_nest == (nest_save *)(cb->start_workspace)) top_nest = NULL;
@@ -4967,7 +5678,7 @@ while (ptr < ptrend)
     if (nest_depth == 0)    /* Unmatched closing parenthesis */
       {
       errorcode = ERR22;
-      goto FAILED_BACK;
+      goto FAILED_BACK;  // TODO https://github.com/PCRE2Project/pcre2/issues/549
       }
     nest_depth--;
     *parsed_pattern++ = META_KET;
@@ -4983,9 +5694,15 @@ if (inverbname && ptr >= ptrend)
   goto FAILED;
   }
 
-/* Manage callout for the final item */
 
 PARSED_END:
+
+PCRE2_ASSERT((parsed_pattern - parsed_pattern_check) +
+             (parsed_pattern_extra - parsed_pattern_extra_check) <=
+               max_parsed_pattern(ptr_check, ptr, utf, options));
+
+/* Manage callout for the final item */
+
 parsed_pattern = manage_callouts(ptr, &previous_callout, auto_callout,
   parsed_pattern, cb);
 
@@ -5008,6 +5725,7 @@ Otherwise we have unclosed parentheses. */
 
 if (parsed_pattern >= parsed_pattern_end)
   {
+  PCRE2_DEBUG_UNREACHABLE();
   errorcode = ERR63;  /* Internal error (parsed pattern overflow) */
   goto FAILED;
   }
@@ -5117,415 +5835,8 @@ for (;;)
     return code;
     }
   }
-/* Control never reaches here */
-}
 
-
-
-#ifdef SUPPORT_UNICODE
-/*************************************************
-*           Get othercase range                  *
-*************************************************/
-
-/* This function is passed the start and end of a class range in UCP mode. For
-single characters the range may be just one character long. The function
-searches up the characters, looking for ranges of characters in the "other"
-case. Each call returns the next one, updating the start address. A character
-with multiple other cases is returned on its own with a special return value.
-
-Arguments:
-  cptr        points to starting character value; updated
-  d           end value
-  ocptr       where to put start of othercase range
-  odptr       where to put end of othercase range
-  restricted  TRUE if caseless restriction applies
-
-Yield:        -1 when no more
-               0 when a range is returned
-              >0 the CASESET offset for char with multiple other cases;
-                 for this return, *ocptr contains the original
-*/
-
-static int
-get_othercase_range(uint32_t *cptr, uint32_t d, uint32_t *ocptr,
-  uint32_t *odptr, BOOL restricted)
-{
-uint32_t c, othercase, next;
-unsigned int co;
-
-/* Find the first character that has an other case. If it has multiple other
-cases, return its case offset value. When CASELESS_RESTRICT is set, ignore the
-multi-case entries that begin with ASCII values. In 32-bit mode, a value
-greater than the Unicode maximum ends the range. */
-
-for (c = *cptr; c <= d; c++)
-  {
-#if PCRE2_CODE_UNIT_WIDTH == 32
-  if (c > MAX_UTF_CODE_POINT) return -1;
-#endif
-  if ((co = UCD_CASESET(c)) != 0 &&
-      (!restricted || PRIV(ucd_caseless_sets)[co] > 127))
-    {
-    *ocptr = c++;   /* Character that has the set */
-    *cptr = c;      /* Rest of input range */
-    return (int)co;
-    }
-
-   /* This is not a valid multiple-case character. Check that the single other
-   case is different to the original. We don't need to check "restricted" here
-   because the non-ASCII characters with multiple cases that include an ASCII
-   character don't have a different "othercase". */
-
-  if ((othercase = UCD_OTHERCASE(c)) != c) break;
-  }
-
-if (c > d) return -1;  /* Reached end of range */
-
-/* Found a character that has a single other case. Search for the end of the
-range, which is either the end of the input range, or a character that has zero
-or more than one other cases. */
-
-*ocptr = othercase;
-next = othercase + 1;
-
-for (++c; c <= d; c++)
-  {
-  if ((co = UCD_CASESET(c)) != 0 || UCD_OTHERCASE(c) != next) break;
-  next++;
-  }
-
-*odptr = next - 1;     /* End of othercase range */
-*cptr = c;             /* Rest of input range */
-return 0;
-}
-#endif  /* SUPPORT_UNICODE */
-
-
-
-/*************************************************
-* Add a character or range to a class (internal) *
-*************************************************/
-
-/* This function packages up the logic of adding a character or range of
-characters to a class. The character values in the arguments will be within the
-valid values for the current mode (8-bit, 16-bit, UTF, etc). This function is
-called only from within the "add to class" group of functions, some of which
-are recursive and mutually recursive. The external entry point is
-add_to_class().
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options bits
-  xoptions      the extra options bits
-  cb            compile data
-  start         start of range character
-  end           end of range character
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static unsigned int
-add_to_class_internal(uint8_t *classbits, PCRE2_UCHAR **uchardptr,
-  uint32_t options, uint32_t xoptions, compile_block *cb, uint32_t start,
-  uint32_t end)
-{
-uint32_t c;
-uint32_t classbits_end = (end <= 0xff ? end : 0xff);
-unsigned int n8 = 0;
-
-/* If caseless matching is required, scan the range and process alternate
-cases. In Unicode, there are 8-bit characters that have alternate cases that
-are greater than 255 and vice-versa (though these may be ignored if caseless
-restriction is in force). Sometimes we can just extend the original range. */
-
-if ((options & PCRE2_CASELESS) != 0)
-  {
-#ifdef SUPPORT_UNICODE
-  if ((options & (PCRE2_UTF|PCRE2_UCP)) != 0)
-    {
-    int rc;
-    uint32_t oc, od;
-
-    options &= ~PCRE2_CASELESS;   /* Remove for recursive calls */
-    c = start;
-
-    while ((rc = get_othercase_range(&c, end, &oc, &od,
-             (xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0)) >= 0)
-      {
-      /* Handle a single character that has more than one other case. */
-
-      if (rc > 0) n8 += add_list_to_class_internal(classbits, uchardptr,
-        options, xoptions, cb, PRIV(ucd_caseless_sets) + rc, oc);
-
-      /* Do nothing if the other case range is within the original range. */
-
-      else if (oc >= cb->class_range_start && od <= cb->class_range_end)
-        continue;
-
-      /* Extend the original range if there is overlap, noting that if oc < c,
-      we can't have od > end because a subrange is always shorter than the
-      basic range. Otherwise, use a recursive call to add the additional range.
-      */
-
-      else if (oc < start && od >= start - 1) start = oc; /* Extend downwards */
-      else if (od > end && oc <= end + 1)
-        {
-        end = od;       /* Extend upwards */
-        if (end > classbits_end) classbits_end = (end <= 0xff ? end : 0xff);
-        }
-      else n8 += add_to_class_internal(classbits, uchardptr, options, xoptions,
-        cb, oc, od);
-      }
-    }
-  else
-#else
-  (void)xoptions;   /* Avoid compiler warning */
-#endif  /* SUPPORT_UNICODE */
-
-  /* Not UTF mode */
-
-  for (c = start; c <= classbits_end; c++)
-    {
-    SETBIT(classbits, cb->fcc[c]);
-    n8++;
-    }
-  }
-
-/* Now handle the originally supplied range. Adjust the final value according
-to the bit length - this means that the same lists of (e.g.) horizontal spaces
-can be used in all cases. */
-
-if ((options & PCRE2_UTF) == 0 && end > MAX_NON_UTF_CHAR)
-  end = MAX_NON_UTF_CHAR;
-
-if (start > cb->class_range_start && end < cb->class_range_end) return n8;
-
-/* Use the bitmap for characters < 256. Otherwise use extra data.*/
-
-for (c = start; c <= classbits_end; c++)
-  {
-  /* Regardless of start, c will always be <= 255. */
-  SETBIT(classbits, c);
-  n8++;
-  }
-
-#ifdef SUPPORT_WIDE_CHARS
-if (start <= 0xff) start = 0xff + 1;
-
-if (end >= start)
-  {
-  PCRE2_UCHAR *uchardata = *uchardptr;
-
-#ifdef SUPPORT_UNICODE
-  if ((options & PCRE2_UTF) != 0)
-    {
-    if (start < end)
-      {
-      *uchardata++ = XCL_RANGE;
-      uchardata += PRIV(ord2utf)(start, uchardata);
-      uchardata += PRIV(ord2utf)(end, uchardata);
-      }
-    else if (start == end)
-      {
-      *uchardata++ = XCL_SINGLE;
-      uchardata += PRIV(ord2utf)(start, uchardata);
-      }
-    }
-  else
-#endif  /* SUPPORT_UNICODE */
-
-  /* Without UTF support, character values are constrained by the bit length,
-  and can only be > 256 for 16-bit and 32-bit libraries. */
-
-#if PCRE2_CODE_UNIT_WIDTH == 8
-    {}
-#else
-  if (start < end)
-    {
-    *uchardata++ = XCL_RANGE;
-    *uchardata++ = start;
-    *uchardata++ = end;
-    }
-  else if (start == end)
-    {
-    *uchardata++ = XCL_SINGLE;
-    *uchardata++ = start;
-    }
-#endif  /* PCRE2_CODE_UNIT_WIDTH == 8 */
-  *uchardptr = uchardata;   /* Updata extra data pointer */
-  }
-#else  /* SUPPORT_WIDE_CHARS */
-  (void)uchardptr;          /* Avoid compiler warning */
-#endif /* SUPPORT_WIDE_CHARS */
-
-return n8;    /* Number of 8-bit characters */
-}
-
-
-
-#ifdef SUPPORT_UNICODE
-/*************************************************
-* Add a list of characters to a class (internal) *
-*************************************************/
-
-/* This function is used for adding a list of case-equivalent characters to a
-class when in UTF mode. This function is called only from within
-add_to_class_internal(), with which it is mutually recursive.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options bits
-  xoptions      the extra options bits
-  cb            contains pointers to tables etc.
-  p             points to row of 32-bit values, terminated by NOTACHAR
-  except        character to omit; this is used when adding lists of
-                  case-equivalent characters to avoid including the one we
-                  already know about
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static unsigned int
-add_list_to_class_internal(uint8_t *classbits, PCRE2_UCHAR **uchardptr,
-  uint32_t options, uint32_t xoptions, compile_block *cb, const uint32_t *p,
-  unsigned int except)
-{
-unsigned int n8 = 0;
-while (p[0] < NOTACHAR)
-  {
-  unsigned int n = 0;
-  if (p[0] != except)
-    {
-    while(p[n+1] == p[0] + n + 1) n++;
-    n8 += add_to_class_internal(classbits, uchardptr, options, xoptions, cb,
-      p[0], p[n]);
-    }
-  p += n + 1;
-  }
-return n8;
-}
-#endif
-
-
-
-/*************************************************
-*   External entry point for add range to class  *
-*************************************************/
-
-/* This function sets the overall range so that the internal functions can try
-to avoid duplication when handling case-independence.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options bits
-  xoptions      the extra options bits
-  cb            compile data
-  start         start of range character
-  end           end of range character
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static unsigned int
-add_to_class(uint8_t *classbits, PCRE2_UCHAR **uchardptr, uint32_t options,
-  uint32_t xoptions, compile_block *cb, uint32_t start, uint32_t end)
-{
-cb->class_range_start = start;
-cb->class_range_end = end;
-return add_to_class_internal(classbits, uchardptr, options, xoptions, cb,
-  start, end);
-}
-
-
-/*************************************************
-*   External entry point for add list to class   *
-*************************************************/
-
-/* This function is used for adding a list of horizontal or vertical whitespace
-characters to a class. The list must be in order so that ranges of characters
-can be detected and handled appropriately. This function sets the overall range
-so that the internal functions can try to avoid duplication when handling
-case-independence.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options bits
-  xoptions      the extra options bits
-  cb            contains pointers to tables etc.
-  p             points to row of 32-bit values, terminated by NOTACHAR
-  except        character to omit; this is used when adding lists of
-                  case-equivalent characters to avoid including the one we
-                  already know about
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static unsigned int
-add_list_to_class(uint8_t *classbits, PCRE2_UCHAR **uchardptr, uint32_t options,
-  uint32_t xoptions, compile_block *cb, const uint32_t *p, unsigned int except)
-{
-unsigned int n8 = 0;
-while (p[0] < NOTACHAR)
-  {
-  unsigned int n = 0;
-  if (p[0] != except)
-    {
-    while(p[n+1] == p[0] + n + 1) n++;
-    cb->class_range_start = p[0];
-    cb->class_range_end = p[n];
-    n8 += add_to_class_internal(classbits, uchardptr, options, xoptions, cb,
-      p[0], p[n]);
-    }
-  p += n + 1;
-  }
-return n8;
-}
-
-
-
-/*************************************************
-*    Add characters not in a list to a class     *
-*************************************************/
-
-/* This function is used for adding the complement of a list of horizontal or
-vertical whitespace to a class. The list must be in order.
-
-Arguments:
-  classbits     the bit map for characters < 256
-  uchardptr     points to the pointer for extra data
-  options       the options bits
-  xoptions      the extra options bits
-  cb            contains pointers to tables etc.
-  p             points to row of 32-bit values, terminated by NOTACHAR
-
-Returns:        the number of < 256 characters added
-                the pointer to extra data is updated
-*/
-
-static unsigned int
-add_not_list_to_class(uint8_t *classbits, PCRE2_UCHAR **uchardptr,
-  uint32_t options, uint32_t xoptions, compile_block *cb, const uint32_t *p)
-{
-BOOL utf = (options & PCRE2_UTF) != 0;
-unsigned int n8 = 0;
-if (p[0] > 0)
-  n8 += add_to_class(classbits, uchardptr, options, xoptions, cb, 0, p[0] - 1);
-while (p[0] < NOTACHAR)
-  {
-  while (p[1] == p[0] + 1) p++;
-  n8 += add_to_class(classbits, uchardptr, options, xoptions, cb, p[0] + 1,
-    (p[1] == NOTACHAR) ? (utf ? 0x10ffffu : 0xffffffffu) : p[1] - 1);
-  p++;
-  }
-return n8;
+PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
 }
 
 
@@ -5571,6 +5882,7 @@ have duplicate names. Give an internal error. */
 
 if (i >= cb->names_found)
   {
+  PCRE2_DEBUG_UNREACHABLE();
   *errorcodeptr = ERR53;
   cb->erroroffset = name - cb->start_pattern;
   return FALSE;
@@ -5648,12 +5960,13 @@ uint32_t options = *optionsptr;               /* May change dynamically */
 uint32_t xoptions = *xoptionsptr;             /* May change dynamically */
 uint32_t firstcu, reqcu;
 uint32_t zeroreqcu, zerofirstcu;
-uint32_t escape;
 uint32_t *pptr = *pptrptr;
 uint32_t meta, meta_arg;
 uint32_t firstcuflags, reqcuflags;
 uint32_t zeroreqcuflags, zerofirstcuflags;
 uint32_t req_caseopt, reqvary, tempreqvary;
+/* Some opcodes, such as META_SCS_NUMBER or META_SCS_NAME,
+depends on the previous value of offset. */
 PCRE2_SIZE offset = 0;
 PCRE2_SIZE length_prevgroup = 0;
 PCRE2_UCHAR *code = *codeptr;
@@ -5667,8 +5980,6 @@ BOOL had_accept = FALSE;
 BOOL matched_char = FALSE;
 BOOL previous_matched_char = FALSE;
 BOOL reset_caseful = FALSE;
-const uint8_t *cbits = cb->cbits;
-uint8_t classbits[32];
 
 /* We can fish out the UTF setting once and for all into a BOOL, but we must
 not do this for other options (e.g. PCRE2_EXTENDED) that may change dynamically
@@ -5681,17 +5992,6 @@ BOOL ucp = (options & PCRE2_UCP) != 0;
 BOOL utf = FALSE;
 #endif
 
-/* Helper variables for OP_XCLASS opcode (for characters > 255). We define
-class_uchardata always so that it can be passed to add_to_class() always,
-though it will not be used in non-UTF 8-bit cases. This avoids having to supply
-alternative calls for the different cases. */
-
-PCRE2_UCHAR *class_uchardata;
-#ifdef SUPPORT_WIDE_CHARS
-BOOL xclass;
-PCRE2_UCHAR *class_uchardata_base;
-#endif
-
 /* Set up the default and non-default settings for greediness */
 
 greedy_default = ((options & PCRE2_UNGREEDY) != 0);
@@ -5721,15 +6021,8 @@ req_caseopt = ((options & PCRE2_CASELESS) != 0)? REQ_CASELESS : 0;
 
 for (;; pptr++)
   {
-#ifdef SUPPORT_WIDE_CHARS
-  BOOL xclass_has_prop;
-#endif
-  BOOL negate_class;
-  BOOL should_flip_negation;
-  BOOL match_all_or_no_wide_chars;
   BOOL possessive_quantifier;
   BOOL note_group_empty;
-  int class_has_8bitchar;
   uint32_t mclength;
   uint32_t skipunits;
   uint32_t subreqcu, subfirstcu;
@@ -5752,8 +6045,13 @@ for (;; pptr++)
     if (code > cb->start_workspace + cb->workspace_size -
         WORK_SIZE_SAFETY_MARGIN)                       /* Check for overrun */
       {
-      *errorcodeptr = (code >= cb->start_workspace + cb->workspace_size)?
-        ERR52 : ERR86;
+      if (code >= cb->start_workspace + cb->workspace_size)
+        {
+        PCRE2_DEBUG_UNREACHABLE();
+        *errorcodeptr = ERR52;  /* Over-ran workspace - internal error */
+        }
+      else
+        *errorcodeptr = ERR86;
       return 0;
       }
 
@@ -5859,13 +6157,24 @@ for (;; pptr++)
     /* ===================================================================*/
     /* Empty character classes are allowed if PCRE2_ALLOW_EMPTY_CLASS is set.
     Otherwise, an initial ']' is taken as a data character. When empty classes
-    are allowed, [] must always fail, so generate OP_FAIL, whereas [^] must
-    match any character, so generate OP_ALLANY. */
+    are allowed, [] must generate an empty class - we have no dedicated opcode
+    to optimise the representation, but it's a rare case (the '(*FAIL)'
+    construct would be a clearer way for a pattern author to represent a
+    non-matching branch, but it does have different semantics to '[]' if both
+    are followed by a quantifier). The empty-negated [^] matches any character,
+    so is useful: generate OP_ALLANY for this. */
 
     case META_CLASS_EMPTY:
     case META_CLASS_EMPTY_NOT:
     matched_char = TRUE;
-    *code++ = (meta == META_CLASS_EMPTY_NOT)? OP_ALLANY : OP_FAIL;
+    if (meta == META_CLASS_EMPTY_NOT) *code++ = OP_ALLANY;
+    else
+      {
+      *code++ = OP_CLASS;
+      memset(code, 0, 32);
+      code += 32 / sizeof(PCRE2_UCHAR);
+      }
+
     if (firstcuflags == REQ_UNSET) firstcuflags = REQ_NONE;
     zerofirstcu = firstcu;
     zerofirstcuflags = firstcuflags;
@@ -5888,7 +6197,16 @@ for (;; pptr++)
     case META_CLASS_NOT:
     case META_CLASS:
     matched_char = TRUE;
-    negate_class = meta == META_CLASS_NOT;
+
+    /* Check for complex extended classes and handle them separately. */
+
+    if ((*pptr & CLASS_IS_ECLASS) != 0)
+      {
+      if (!PRIV(compile_class_nested)(options, xoptions, &pptr, &code,
+                                      errorcodeptr, cb, lengthptr))
+        return 0;
+      goto CLASS_END_PROCESSING;
+      }
 
     /* We can optimize the case of a single character in a class by generating
     OP_CHAR or OP_CHARI if it's positive, or OP_NOT or OP_NOTI if it's
@@ -5901,9 +6219,6 @@ for (;; pptr++)
 
     if (pptr[1] < META_END && pptr[2] == META_CLASS_END)
       {
-#ifdef SUPPORT_UNICODE
-      uint32_t d;
-#endif
       uint32_t c = pptr[1];
 
       pptr += 2;                 /* Move on to class end */
@@ -5924,18 +6239,35 @@ for (;; pptr++)
       /* For caseless UTF or UCP mode, check whether this character has more
       than one other case. If so, generate a special OP_NOTPROP item instead of
       OP_NOTI. When restricted by PCRE2_EXTRA_CASELESS_RESTRICT, ignore any
-      caseless set that starts with an ASCII character. */
+      caseless set that starts with an ASCII character. If the character is
+      affected by the special Turkish rules, hardcode the not-matching
+      characters using a caseset. */
 
 #ifdef SUPPORT_UNICODE
-      if ((utf||ucp) && (options & PCRE2_CASELESS) != 0 &&
-          (d = UCD_CASESET(c)) != 0 &&
-          ((xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) == 0 ||
-          PRIV(ucd_caseless_sets)[d] > 127))
+      if ((utf||ucp) && (options & PCRE2_CASELESS) != 0)
         {
-        *code++ = OP_NOTPROP;
-        *code++ = PT_CLIST;
-        *code++ = d;
-        break;   /* We are finished with this class */
+        uint32_t caseset;
+
+        if ((xoptions & (PCRE2_EXTRA_TURKISH_CASING|PCRE2_EXTRA_CASELESS_RESTRICT)) ==
+              PCRE2_EXTRA_TURKISH_CASING &&
+            UCD_ANY_I(c))
+          {
+          caseset = PRIV(ucd_turkish_dotted_i_caseset) + (UCD_DOTTED_I(c)? 0 : 3);
+          }
+        else if ((caseset = UCD_CASESET(c)) != 0 &&
+                 (xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0 &&
+                 PRIV(ucd_caseless_sets)[caseset] < 128)
+          {
+          caseset = 0;  /* Ignore the caseless set if it's restricted. */
+          }
+
+        if (caseset != 0)
+          {
+          *code++ = OP_NOTPROP;
+          *code++ = PT_CLIST;
+          *code++ = caseset;
+          break;   /* We are finished with this class */
+          }
         }
 #endif
       /* Char has only one other (usable) case, or UCP not available */
@@ -5950,7 +6282,8 @@ for (;; pptr++)
     they are case partners. This can be optimized to generate a caseless single
     character match (which also sets first/required code units if relevant).
     When casing restrictions apply, ignore a caseless set if both characters
-    are ASCII. */
+    are ASCII. When Turkish casing applies, an 'i' does not match its normal
+    Unicode "othercase". */
 
     if (meta == META_CLASS && pptr[1] < META_END && pptr[2] < META_END &&
         pptr[3] == META_CLASS_END)
@@ -5958,9 +6291,12 @@ for (;; pptr++)
       uint32_t c = pptr[1];
 
 #ifdef SUPPORT_UNICODE
-      if (UCD_CASESET(c) == 0 ||
-         ((xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0 &&
-         c < 128 && pptr[2] < 128))
+      if ((UCD_CASESET(c) == 0 ||
+           ((xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0 &&
+            c < 128 && pptr[2] < 128)) &&
+          !((xoptions & (PCRE2_EXTRA_TURKISH_CASING|PCRE2_EXTRA_CASELESS_RESTRICT)) ==
+              PCRE2_EXTRA_TURKISH_CASING &&
+            UCD_ANY_I(c)))
 #endif
         {
         uint32_t d;
@@ -5990,384 +6326,15 @@ for (;; pptr++)
         }
       }
 
-    /* If a non-extended class contains a negative special such as \S, we need
-    to flip the negation flag at the end, so that support for characters > 255
-    works correctly (they are all included in the class). An extended class may
-    need to insert specific matching or non-matching code for wide characters.
-    */
+    /* Now emit the OP_CLASS/OP_NCLASS/OP_XCLASS/OP_ALLANY opcode. */
 
-    should_flip_negation = match_all_or_no_wide_chars = FALSE;
+    pptr = PRIV(compile_class_not_nested)(options, xoptions, pptr + 1,
+                                          &code, meta == META_CLASS_NOT, NULL,
+                                          errorcodeptr, cb, lengthptr);
+    if (pptr == NULL) return 0;
+    PCRE2_ASSERT(*pptr == META_CLASS_END);
 
-    /* Extended class (xclass) will be used when characters > 255
-    might match. */
-
-#ifdef SUPPORT_WIDE_CHARS
-    xclass = FALSE;
-    class_uchardata = code + LINK_SIZE + 2;   /* For XCLASS items */
-    class_uchardata_base = class_uchardata;   /* Save the start */
-#endif
-
-    /* For optimization purposes, we track some properties of the class:
-    class_has_8bitchar will be non-zero if the class contains at least one
-    character with a code point less than 256; xclass_has_prop will be TRUE if
-    Unicode property checks are present in the class. */
-
-    class_has_8bitchar = 0;
-#ifdef SUPPORT_WIDE_CHARS
-    xclass_has_prop = FALSE;
-#endif
-
-    /* Initialize the 256-bit (32-byte) bit map to all zeros. We build the map
-    in a temporary bit of memory, in case the class contains fewer than two
-    8-bit characters because in that case the compiled code doesn't use the bit
-    map. */
-
-    memset(classbits, 0, 32 * sizeof(uint8_t));
-
-    /* Process items until META_CLASS_END is reached. */
-
-    while ((meta = *(++pptr)) != META_CLASS_END)
-      {
-      /* Handle POSIX classes such as [:alpha:] etc. */
-
-      if (meta == META_POSIX || meta == META_POSIX_NEG)
-        {
-        BOOL local_negate = (meta == META_POSIX_NEG);
-        int posix_class = *(++pptr);
-        int taboffset, tabopt;
-        uint8_t pbits[32];
-
-        should_flip_negation = local_negate;  /* Note negative special */
-
-        /* If matching is caseless, upper and lower are converted to alpha.
-        This relies on the fact that the class table starts with alpha,
-        lower, upper as the first 3 entries. */
-
-        if ((options & PCRE2_CASELESS) != 0 && posix_class <= 2)
-          posix_class = 0;
-
-        /* When PCRE2_UCP is set, some of the POSIX classes are converted to
-        different escape sequences that use Unicode properties \p or \P.
-        Others that are not available via \p or \P have to generate
-        XCL_PROP/XCL_NOTPROP directly, which is done here. */
-
-#ifdef SUPPORT_UNICODE
-        if ((options & PCRE2_UCP) != 0 &&
-            (xoptions & PCRE2_EXTRA_ASCII_POSIX) == 0)
-          {
-          switch(posix_class)
-            {
-            case PC_GRAPH:
-            case PC_PRINT:
-            case PC_PUNCT:
-            *class_uchardata++ = local_negate? XCL_NOTPROP : XCL_PROP;
-            *class_uchardata++ = (PCRE2_UCHAR)
-              ((posix_class == PC_GRAPH)? PT_PXGRAPH :
-               (posix_class == PC_PRINT)? PT_PXPRINT : PT_PXPUNCT);
-            *class_uchardata++ = 0;
-            xclass_has_prop = TRUE;
-            goto CONTINUE_CLASS;
-
-            /* For the other POSIX classes (ex: ascii) we are going to
-            fall through to the non-UCP case and build a bit map for
-            characters with code points less than 256. However, if we are in
-            a negated POSIX class, characters with code points greater than
-            255 must either all match or all not match, depending on whether
-            the whole class is not or is negated. For example, for
-            [[:^ascii:]... they must all match, whereas for [^[:^ascii:]...
-            they must not.
-
-            In the special case where there are no xclass items, this is
-            automatically handled by the use of OP_CLASS or OP_NCLASS, but an
-            explicit range is needed for OP_XCLASS. Setting a flag here
-            causes the range to be generated later when it is known that
-            OP_XCLASS is required. In the 8-bit library this is relevant only in
-            utf mode, since no wide characters can exist otherwise. */
-
-            default:
-#if PCRE2_CODE_UNIT_WIDTH == 8
-            if (utf)
-#endif
-            match_all_or_no_wide_chars |= local_negate;
-            break;
-            }
-          }
-#endif  /* SUPPORT_UNICODE */
-
-        /* In the non-UCP case, or when UCP makes no difference, we build the
-        bit map for the POSIX class in a chunk of local store because we may
-        be adding and subtracting from it, and we don't want to subtract bits
-        that may be in the main map already. At the end we or the result into
-        the bit map that is being built. */
-
-        posix_class *= 3;
-
-        /* Copy in the first table (always present) */
-
-        memcpy(pbits, cbits + posix_class_maps[posix_class],
-          32 * sizeof(uint8_t));
-
-        /* If there is a second table, add or remove it as required. */
-
-        taboffset = posix_class_maps[posix_class + 1];
-        tabopt = posix_class_maps[posix_class + 2];
-
-        if (taboffset >= 0)
-          {
-          if (tabopt >= 0)
-            for (int i = 0; i < 32; i++) pbits[i] |= cbits[(int)i + taboffset];
-          else
-            for (int i = 0; i < 32; i++) pbits[i] &= ~cbits[(int)i + taboffset];
-          }
-
-        /* Now see if we need to remove any special characters. An option
-        value of 1 removes vertical space and 2 removes underscore. */
-
-        if (tabopt < 0) tabopt = -tabopt;
-        if (tabopt == 1) pbits[1] &= ~0x3c;
-          else if (tabopt == 2) pbits[11] &= 0x7f;
-
-        /* Add the POSIX table or its complement into the main table that is
-        being built and we are done. */
-
-        if (local_negate)
-          for (int i = 0; i < 32; i++) classbits[i] |= (uint8_t)(~pbits[i]);
-        else
-          for (int i = 0; i < 32; i++) classbits[i] |= pbits[i];
-
-        /* Every class contains at least one < 256 character. */
-
-        class_has_8bitchar = 1;
-        goto CONTINUE_CLASS;    /* End of POSIX handling */
-        }
-
-      /* Other than POSIX classes, the only items we should encounter are
-      \d-type escapes and literal characters (possibly as ranges). */
-
-      if (meta == META_BIGVALUE)
-        {
-        meta = *(++pptr);
-        goto CLASS_LITERAL;
-        }
-
-      /* Any other non-literal must be an escape */
-
-      if (meta >= META_END)
-        {
-        if (META_CODE(meta) != META_ESCAPE)
-          {
-#ifdef DEBUG_SHOW_PARSED
-          fprintf(stderr, "** Unrecognized parsed pattern item 0x%.8x "
-                          "in character class\n", meta);
-#endif
-          *errorcodeptr = ERR89;  /* Internal error - unrecognized. */
-          return 0;
-          }
-        escape = META_DATA(meta);
-
-        /* Every class contains at least one < 256 character. */
-
-        class_has_8bitchar++;
-
-        switch(escape)
-          {
-          case ESC_d:
-          for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_digit];
-          break;
-
-          case ESC_D:
-          should_flip_negation = TRUE;
-          for (int i = 0; i < 32; i++)
-            classbits[i] |= (uint8_t)(~cbits[i+cbit_digit]);
-          break;
-
-          case ESC_w:
-          for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_word];
-          break;
-
-          case ESC_W:
-          should_flip_negation = TRUE;
-          for (int i = 0; i < 32; i++)
-            classbits[i] |= (uint8_t)(~cbits[i+cbit_word]);
-          break;
-
-          /* Perl 5.004 onwards omitted VT from \s, but restored it at Perl
-          5.18. Before PCRE 8.34, we had to preserve the VT bit if it was
-          previously set by something earlier in the character class.
-          Luckily, the value of CHAR_VT is 0x0b in both ASCII and EBCDIC, so
-          we could just adjust the appropriate bit. From PCRE 8.34 we no
-          longer treat \s and \S specially. */
-
-          case ESC_s:
-          for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_space];
-          break;
-
-          case ESC_S:
-          should_flip_negation = TRUE;
-          for (int i = 0; i < 32; i++)
-            classbits[i] |= (uint8_t)(~cbits[i+cbit_space]);
-          break;
-
-          /* When adding the horizontal or vertical space lists to a class, or
-          their complements, disable PCRE2_CASELESS, because it justs wastes
-          time, and in the "not-x" UTF cases can create unwanted duplicates in
-          the XCLASS list (provoked by characters that have more than one other
-          case and by both cases being in the same "not-x" sublist). */
-
-          case ESC_h:
-          (void)add_list_to_class(classbits, &class_uchardata,
-            options & ~PCRE2_CASELESS, xoptions, cb, PRIV(hspace_list),
-              NOTACHAR);
-          break;
-
-          case ESC_H:
-          (void)add_not_list_to_class(classbits, &class_uchardata,
-            options & ~PCRE2_CASELESS, xoptions, cb, PRIV(hspace_list));
-          break;
-
-          case ESC_v:
-          (void)add_list_to_class(classbits, &class_uchardata,
-            options & ~PCRE2_CASELESS, xoptions, cb, PRIV(vspace_list),
-              NOTACHAR);
-          break;
-
-          case ESC_V:
-          (void)add_not_list_to_class(classbits, &class_uchardata,
-            options & ~PCRE2_CASELESS, xoptions, cb, PRIV(vspace_list));
-          break;
-
-          /* If Unicode is not supported, \P and \p are not allowed and are
-          faulted at parse time, so will never appear here. */
-
-#ifdef SUPPORT_UNICODE
-          case ESC_p:
-          case ESC_P:
-            {
-            uint32_t ptype = *(++pptr) >> 16;
-            uint32_t pdata = *pptr & 0xffff;
-            *class_uchardata++ = (escape == ESC_p)? XCL_PROP : XCL_NOTPROP;
-            *class_uchardata++ = ptype;
-            *class_uchardata++ = pdata;
-            xclass_has_prop = TRUE;
-            class_has_8bitchar--;                /* Undo! */
-            }
-          break;
-#endif
-          }
-
-        goto CONTINUE_CLASS;
-        }  /* End handling \d-type escapes */
-
-      /* A literal character may be followed by a range meta. At parse time
-      there are checks for out-of-order characters, for ranges where the two
-      characters are equal, and for hyphens that cannot indicate a range. At
-      this point, therefore, no checking is needed. */
-
-      else
-        {
-        uint32_t c, d;
-
-        CLASS_LITERAL:
-        c = d = meta;
-
-        /* Remember if \r or \n were explicitly used */
-
-        if (c == CHAR_CR || c == CHAR_NL) cb->external_flags |= PCRE2_HASCRORLF;
-
-        /* Process a character range */
-
-        if (pptr[1] == META_RANGE_LITERAL || pptr[1] == META_RANGE_ESCAPED)
-          {
-#ifdef EBCDIC
-          BOOL range_is_literal = (pptr[1] == META_RANGE_LITERAL);
-#endif
-          pptr += 2;
-          d = *pptr;
-          if (d == META_BIGVALUE) d = *(++pptr);
-
-          /* Remember an explicit \r or \n, and add the range to the class. */
-
-          if (d == CHAR_CR || d == CHAR_NL) cb->external_flags |= PCRE2_HASCRORLF;
-
-          /* In an EBCDIC environment, Perl treats alphabetic ranges specially
-          because there are holes in the encoding, and simply using the range
-          A-Z (for example) would include the characters in the holes. This
-          applies only to literal ranges; [\xC1-\xE9] is different to [A-Z]. */
-
-#ifdef EBCDIC
-          if (range_is_literal &&
-               (cb->ctypes[c] & ctype_letter) != 0 &&
-               (cb->ctypes[d] & ctype_letter) != 0 &&
-               (c <= CHAR_z) == (d <= CHAR_z))
-            {
-            uint32_t uc = (d <= CHAR_z)? 0 : 64;
-            uint32_t C = c - uc;
-            uint32_t D = d - uc;
-
-            if (C <= CHAR_i)
-              {
-              class_has_8bitchar +=
-                add_to_class(classbits, &class_uchardata, options, xoptions,
-                  cb, C + uc, ((D < CHAR_i)? D : CHAR_i) + uc);
-              C = CHAR_j;
-              }
-
-            if (C <= D && C <= CHAR_r)
-              {
-              class_has_8bitchar +=
-                add_to_class(classbits, &class_uchardata, options, xoptions,
-                  cb, C + uc, ((D < CHAR_r)? D : CHAR_r) + uc);
-              C = CHAR_s;
-              }
-
-            if (C <= D)
-              {
-              class_has_8bitchar +=
-                add_to_class(classbits, &class_uchardata, options, xoptions,
-                  cb, C + uc, D + uc);
-              }
-            }
-          else
-#endif
-          /* Not an EBCDIC special range */
-
-          class_has_8bitchar += add_to_class(classbits, &class_uchardata,
-            options, xoptions, cb, c, d);
-          goto CONTINUE_CLASS;   /* Go get the next char in the class */
-          }  /* End of range handling */
-
-
-        /* Handle a single character. */
-
-        class_has_8bitchar +=
-          add_to_class(classbits, &class_uchardata, options, xoptions, cb,
-            meta, meta);
-        }
-
-      /* Continue to the next item in the class. */
-
-      CONTINUE_CLASS:
-
-#ifdef SUPPORT_WIDE_CHARS
-      /* If any wide characters or Unicode properties have been encountered,
-      set xclass = TRUE. Then, in the pre-compile phase, accumulate the length
-      of the extra data and reset the pointer. This is so that very large
-      classes that contain a zillion wide characters or Unicode property tests
-      do not overwrite the workspace (which is on the stack). */
-
-      if (class_uchardata > class_uchardata_base)
-        {
-        xclass = TRUE;
-        if (lengthptr != NULL)
-          {
-          *lengthptr += class_uchardata - class_uchardata_base;
-          class_uchardata = class_uchardata_base;
-          }
-        }
-#endif
-
-      continue;  /* Needed to avoid error when not supporting wide chars */
-      }   /* End of main class-processing loop */
+    CLASS_END_PROCESSING:
 
     /* If this class is the first thing in the branch, there can be no first
     char setting, whatever the repeat count. Any reqcu setting must remain
@@ -6378,108 +6345,6 @@ for (;; pptr++)
     zerofirstcuflags = firstcuflags;
     zeroreqcu = reqcu;
     zeroreqcuflags = reqcuflags;
-
-    /* If there are characters with values > 255, or Unicode property settings
-    (\p or \P), we have to compile an extended class, with its own opcode,
-    unless there were no property settings and there was a negated special such
-    as \S in the class, and PCRE2_UCP is not set, because in that case all
-    characters > 255 are in or not in the class, so any that were explicitly
-    given as well can be ignored.
-
-    In the UCP case, if certain negated POSIX classes (ex: [:^ascii:]) were
-    were present in a class, we either have to match or not match all wide
-    characters (depending on whether the whole class is or is not negated).
-    This requirement is indicated by match_all_or_no_wide_chars being true.
-    We do this by including an explicit range, which works in both cases.
-    This applies only in UTF and 16-bit and 32-bit non-UTF modes, since there
-    cannot be any wide characters in 8-bit non-UTF mode.
-
-    When there *are* properties in a positive UTF-8 or any 16-bit or 32_bit
-    class where \S etc is present without PCRE2_UCP, causing an extended class
-    to be compiled, we make sure that all characters > 255 are included by
-    forcing match_all_or_no_wide_chars to be true.
-
-    If, when generating an xclass, there are no characters < 256, we can omit
-    the bitmap in the actual compiled code. */
-
-#ifdef SUPPORT_WIDE_CHARS  /* Defined for 16/32 bits, or 8-bit with Unicode */
-    if (xclass && (
-#ifdef SUPPORT_UNICODE
-        (options & PCRE2_UCP) != 0 ||
-#endif
-        xclass_has_prop || !should_flip_negation))
-      {
-      if (match_all_or_no_wide_chars || (
-#if PCRE2_CODE_UNIT_WIDTH == 8
-           utf &&
-#endif
-           should_flip_negation && !negate_class && (options & PCRE2_UCP) == 0))
-        {
-        *class_uchardata++ = XCL_RANGE;
-        if (utf)   /* Will always be utf in the 8-bit library */
-          {
-          class_uchardata += PRIV(ord2utf)(0x100, class_uchardata);
-          class_uchardata += PRIV(ord2utf)(MAX_UTF_CODE_POINT, class_uchardata);
-          }
-        else       /* Can only happen for the 16-bit & 32-bit libraries */
-          {
-#if PCRE2_CODE_UNIT_WIDTH == 16
-          *class_uchardata++ = 0x100;
-          *class_uchardata++ = 0xffffu;
-#elif PCRE2_CODE_UNIT_WIDTH == 32
-          *class_uchardata++ = 0x100;
-          *class_uchardata++ = 0xffffffffu;
-#endif
-          }
-        }
-      *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
-      *code++ = OP_XCLASS;
-      code += LINK_SIZE;
-      *code = negate_class? XCL_NOT:0;
-      if (xclass_has_prop) *code |= XCL_HASPROP;
-
-      /* If the map is required, move up the extra data to make room for it;
-      otherwise just move the code pointer to the end of the extra data. */
-
-      if (class_has_8bitchar > 0)
-        {
-        *code++ |= XCL_MAP;
-        (void)memmove(code + (32 / sizeof(PCRE2_UCHAR)), code,
-          CU2BYTES(class_uchardata - code));
-        if (negate_class && !xclass_has_prop)
-          {
-          /* Using 255 ^ instead of ~ avoids clang sanitize warning. */
-          for (int i = 0; i < 32; i++) classbits[i] = 255 ^ classbits[i];
-          }
-        memcpy(code, classbits, 32);
-        code = class_uchardata + (32 / sizeof(PCRE2_UCHAR));
-        }
-      else code = class_uchardata;
-
-      /* Now fill in the complete length of the item */
-
-      PUT(previous, 1, (int)(code - previous));
-      break;   /* End of class handling */
-      }
-#endif  /* SUPPORT_WIDE_CHARS */
-
-    /* If there are no characters > 255, or they are all to be included or
-    excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
-    whole class was negated and whether there were negative specials such as \S
-    (non-UCP) in the class. Then copy the 32-byte map into the code vector,
-    negating it if necessary. */
-
-    *code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
-    if (lengthptr == NULL)    /* Save time in the pre-compile phase */
-      {
-      if (negate_class)
-        {
-       /* Using 255 ^ instead of ~ avoids clang sanitize warning. */
-       for (int i = 0; i < 32; i++) classbits[i] = 255 ^ classbits[i];
-       }
-      memcpy(code, classbits, 32);
-      }
-    code += 32 / sizeof(PCRE2_UCHAR);
     break;  /* End of class processing */
 
 
@@ -6585,6 +6450,15 @@ for (;; pptr++)
     req_caseopt = ((options & PCRE2_CASELESS) != 0)? REQ_CASELESS : 0;
     break;
 
+    case META_OFFSET:
+    GETPLUSOFFSET(offset, pptr);
+    break;
+
+    case META_SCS:
+    bravalue = OP_ASSERT_SCS;
+    cb->assert_depth += 1;
+    goto GROUP_PROCESS;
+
 
     /* ===================================================================*/
     /* Handle conditional subpatterns. The case of (?(Rdigits) is ambiguous
@@ -6596,6 +6470,7 @@ for (;; pptr++)
     case META_COND_RNUMBER:   /* (?(Rdigits) */
     case META_COND_NAME:      /* (?(name) or (?'name') or ?(<name>) */
     case META_COND_RNAME:     /* (?(R&name) - test for recursion */
+    case META_SCS_NAME:       /* Name of scan substring */
     bravalue = OP_COND;
       {
       int count, index;
@@ -6604,7 +6479,10 @@ for (;; pptr++)
       named_group *ng = cb->named_groups;
       uint32_t length = *(++pptr);
 
-      GETPLUSOFFSET(offset, pptr);
+      if (meta == META_SCS_NAME)
+        offset += meta_arg;
+      else
+        GETPLUSOFFSET(offset, pptr);
       name = cb->start_pattern + offset;
 
       /* In the first pass, the names generated in the pre-pass are available,
@@ -6614,34 +6492,21 @@ for (;; pptr++)
       numerical group. */
 
       for (i = 0; i < cb->names_found; i++, ng++)
-        {
         if (length == ng->length &&
-            PRIV(strncmp)(name, ng->name, length) == 0)
-          {
-          if (!ng->isdup)
-            {
-            code[1+LINK_SIZE] = (meta == META_COND_RNAME)? OP_RREF : OP_CREF;
-            PUT2(code, 2+LINK_SIZE, ng->number);
-            if (ng->number > cb->top_backref) cb->top_backref = ng->number;
-            skipunits = 1+IMM2_SIZE;
-            goto GROUP_PROCESS_NOTE_EMPTY;
-            }
-          break;  /* Found a duplicated name */
-          }
-        }
-
-      /* If the name was not found we have a bad reference, unless we are
-      dealing with R<digits>, which is treated as a recursion test by number.
-      */
+            PRIV(strncmp)(name, ng->name, length) == 0) break;
 
       if (i >= cb->names_found)
         {
+        /* If the name was not found we have a bad reference, unless we are
+        dealing with R<digits>, which is treated as a recursion test by
+        number. */
+
         groupnumber = 0;
         if (meta == META_COND_RNUMBER)
           {
           for (i = 1; i < length; i++)
             {
-            groupnumber = groupnumber * 10 + name[i] - CHAR_0;
+            groupnumber = groupnumber * 10 + (name[i] - CHAR_0);
             if (groupnumber > MAX_GROUP_NUMBER)
               {
               *errorcodeptr = ERR61;
@@ -6668,11 +6533,26 @@ for (;; pptr++)
         skipunits = 1+IMM2_SIZE;
         goto GROUP_PROCESS_NOTE_EMPTY;
         }
+      else if (!ng->isdup)
+        {
+        /* Otherwise found a duplicated name */
+        if (ng->number > cb->top_backref) cb->top_backref = ng->number;
 
-      /* A duplicated name was found. Note that if an R<digits> name is found
-      (META_COND_RNUMBER), it is a reference test, not a recursion test. */
+        if (meta == META_SCS_NAME)
+          {
+          code[0] = OP_CREF;
+          PUT2(code, 1, ng->number);
+          code += 1+IMM2_SIZE;
+          break;
+          }
 
-      code[1+LINK_SIZE] = (meta == META_COND_RNAME)? OP_RREF : OP_CREF;
+        code[1+LINK_SIZE] = (meta == META_COND_RNAME)? OP_RREF : OP_CREF;
+        PUT2(code, 2+LINK_SIZE, ng->number);
+        skipunits = 1+IMM2_SIZE;
+        if (meta != META_SCS_NAME) goto GROUP_PROCESS_NOTE_EMPTY;
+        cb->assert_depth += 1;
+        goto GROUP_PROCESS;
+        }
 
       /* We have a duplicated name. In the compile pass we have to search the
       main table in order to get the index and count values. */
@@ -6682,14 +6562,27 @@ for (;; pptr++)
       if (lengthptr == NULL && !find_dupname_details(name, length, &index,
             &count, errorcodeptr, cb)) return 0;
 
-      /* Add one to the opcode to change CREF/RREF into DNCREF/DNRREF and
-      insert appropriate data values. */
+      if (meta == META_SCS_NAME)
+        {
+        code[0] = OP_DNCREF;
+        PUT2(code, 1, index);
+        PUT2(code, 1+IMM2_SIZE, count);
+        code += 1+2*IMM2_SIZE;
+        break;
+        }
 
-      code[1+LINK_SIZE]++;
+      /* A duplicated name was found. Note that if an R<digits> name is found
+      (META_COND_RNUMBER), it is a reference test, not a recursion test. */
+
+      code[1+LINK_SIZE] = (meta == META_COND_RNAME)? OP_DNRREF : OP_DNCREF;
+
+      /* Insert appropriate data values. */
       skipunits = 1+2*IMM2_SIZE;
       PUT2(code, 2+LINK_SIZE, index);
       PUT2(code, 2+LINK_SIZE+IMM2_SIZE, count);
       }
+
+    PCRE2_ASSERT(meta != META_SCS_NAME);
     goto GROUP_PROCESS_NOTE_EMPTY;
 
     /* The DEFINE condition is always false. Its internal groups may never
@@ -6706,8 +6599,13 @@ for (;; pptr++)
     /* Conditional test of a group's being set. */
 
     case META_COND_NUMBER:
+    case META_SCS_NUMBER:
     bravalue = OP_COND;
-    GETPLUSOFFSET(offset, pptr);
+    if (meta == META_SCS_NUMBER)
+      offset += meta_arg;
+    else
+      GETPLUSOFFSET(offset, pptr);
+
     groupnumber = *(++pptr);
     if (groupnumber > cb->bracount)
       {
@@ -6716,7 +6614,17 @@ for (;; pptr++)
       return 0;
       }
     if (groupnumber > cb->top_backref) cb->top_backref = groupnumber;
-    offset -= 2;   /* Point at initial ( for too many branches error */
+
+    if (meta == META_SCS_NUMBER)
+      {
+      code[0] = OP_CREF;
+      PUT2(code, 1, groupnumber);
+      code += 1+IMM2_SIZE;
+      break;
+      }
+
+    /* Point at initial ( for too many branches error */
+    offset -= 2;
     code[1+LINK_SIZE] = OP_CREF;
     skipunits = 1+IMM2_SIZE;
     PUT2(code, 2+LINK_SIZE, groupnumber);
@@ -6854,7 +6762,7 @@ for (;; pptr++)
 
     /* If we've just compiled an assertion, pop the assert depth. */
 
-    if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERTBACK_NA)
+    if (bravalue >= OP_ASSERT && bravalue <= OP_ASSERT_SCS)
       cb->assert_depth -= 1;
 
     /* At the end of compiling, code is still pointing to the start of the
@@ -7093,6 +7001,11 @@ for (;; pptr++)
       *code++ = ((options & PCRE2_CASELESS) != 0)? OP_DNREFI : OP_DNREF;
       PUT2INC(code, 0, index);
       PUT2INC(code, 0, count);
+      if ((options & PCRE2_CASELESS) != 0)
+        *code++ = (((xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0)?
+                   REFI_FLAG_CASELESS_RESTRICT : 0) |
+                  (((xoptions & PCRE2_EXTRA_TURKISH_CASING) != 0)?
+                   REFI_FLAG_TURKISH_CASING : 0);
       }
     break;
 
@@ -7212,7 +7125,6 @@ for (;; pptr++)
     single-char opcodes. */
 
     reqvary = (repeat_min == repeat_max)? 0 : REQ_VARY;
-    op_type = 0;
 
     /* Adjust first and required code units for a zero repeat. */
 
@@ -7253,6 +7165,7 @@ for (;; pptr++)
     /* Save start of previous item, in case we have to move it up in order to
     insert something before it, and remember what it was. */
 
+    PCRE2_ASSERT(previous != NULL);
     tempcode = previous;
     op_previous = *previous;
 
@@ -7312,6 +7225,7 @@ for (;; pptr++)
 
 #ifdef SUPPORT_WIDE_CHARS
       case OP_XCLASS:
+      case OP_ECLASS:
 #endif
       case OP_CLASS:
       case OP_NCLASS:
@@ -7342,14 +7256,6 @@ for (;; pptr++)
         }
       break;
 
-      /* If previous is OP_FAIL, it was generated by an empty class []
-      (PCRE2_ALLOW_EMPTY_CLASS is set). The other ways in which OP_FAIL can be
-      generated, that is by (*FAIL) or (?!), disallow a quantifier at parse
-      time. We can just ignore this repeat. */
-
-      case OP_FAIL:
-      goto END_REPEAT;
-
       /* Prior to 10.30, repeated recursions were wrapped in OP_ONCE brackets
       because pcre2_match() could not handle backtracking into recursively
       called groups. Now that this backtracking is available, we no longer need
@@ -7433,6 +7339,7 @@ for (;; pptr++)
       case OP_ASSERTBACK:
       case OP_ASSERTBACK_NOT:
       case OP_ASSERTBACK_NA:
+      case OP_ASSERT_SCS:
       case OP_ONCE:
       case OP_SCRIPT_RUN:
       case OP_BRA:
@@ -7549,7 +7456,8 @@ for (;; pptr++)
             if (lengthptr != NULL)
               {
               PCRE2_SIZE delta;
-              if (PRIV(ckd_smul)(&delta, repeat_min - 1, length_prevgroup) ||
+              if (PRIV(ckd_smul)(&delta, repeat_min - 1,
+                                 (int)length_prevgroup) ||
                   OFLOW_MAX - *lengthptr < delta)
                 {
                 *errorcodeptr = ERR20;
@@ -7599,7 +7507,7 @@ for (;; pptr++)
             {
             PCRE2_SIZE delta;
             if (PRIV(ckd_smul)(&delta, repeat_max,
-                               length_prevgroup + 1 + 2 + 2*LINK_SIZE) ||
+                               (int)length_prevgroup + 1 + 2 + 2*LINK_SIZE) ||
                 OFLOW_MAX + (2 + 2*LINK_SIZE) - *lengthptr < delta)
               {
               *errorcodeptr = ERR20;
@@ -7756,9 +7664,10 @@ for (;; pptr++)
       here because it just makes it horribly messy. */
 
       default:
-      if (op_previous >= OP_EODN)   /* Not a character type - internal error */
+      if (op_previous >= OP_EODN || op_previous <= OP_WORD_BOUNDARY)
         {
-        *errorcodeptr = ERR10;
+        PCRE2_DEBUG_UNREACHABLE();
+        *errorcodeptr = ERR10;  /* Not a character type - internal error */
         return 0;
         }
       else
@@ -7778,7 +7687,8 @@ for (;; pptr++)
           }
         else
           {
-          /* Come here from just above with a character in mcbuffer/mclength. */
+          /* Come here from just above with a character in mcbuffer/mclength.
+          You must also set op_type before the jump. */
           OUTPUT_SINGLE_REPEAT:
           prop_type = prop_value = -1;
           }
@@ -7961,6 +7871,7 @@ for (;; pptr++)
 
 #ifdef SUPPORT_WIDE_CHARS
         case OP_XCLASS:
+        case OP_ECLASS:
         tempcode += GET(tempcode, 1);
         break;
 #endif
@@ -8045,6 +7956,11 @@ for (;; pptr++)
     if (firstcuflags == REQ_UNSET) zerofirstcuflags = firstcuflags = REQ_NONE;
     *code++ = ((options & PCRE2_CASELESS) != 0)? OP_REFI : OP_REF;
     PUT2INC(code, 0, meta_arg);
+    if ((options & PCRE2_CASELESS) != 0)
+      *code++ = (((xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0)?
+                 REFI_FLAG_CASELESS_RESTRICT : 0) |
+                (((xoptions & PCRE2_EXTRA_TURKISH_CASING) != 0)?
+                 REFI_FLAG_TURKISH_CASING : 0);
 
     /* Update the map of back references, and keep the highest one. We
     could do this in parse_regex() for numerical back references, but not
@@ -8137,12 +8053,30 @@ for (;; pptr++)
       uint32_t ptype = *(++pptr) >> 16;
       uint32_t pdata = *pptr & 0xffff;
 
-      /* The special case of \p{Any} is compiled to OP_ALLANY so as to benefit
-      from the auto-anchoring code. */
+      /* In caseless matching, particular characteristics Lu, Ll, and Lt get
+      converted to the general characteristic L&. That is, upper, lower, and
+      title case letters are all conflated. */
 
-      if (meta_arg == ESC_p && ptype == PT_ANY)
+      if ((options & PCRE2_CASELESS) != 0 && ptype == PT_PC &&
+          (pdata == ucp_Lu || pdata == ucp_Ll || pdata == ucp_Lt))
         {
-        *code++ = OP_ALLANY;
+        ptype = PT_LAMP;
+        pdata = 0;
+        }
+
+      /* The special case of \p{Any} is compiled to OP_ALLANY and \P{Any}
+      is compiled to [] so as to benefit from the auto-anchoring code. */
+
+      if (ptype == PT_ANY)
+        {
+        if (meta_arg == ESC_P)
+          {
+          *code++ = OP_CLASS;
+          memset(code, 0, 32);
+          code += 32 / sizeof(PCRE2_UCHAR);
+          }
+        else
+          *code++ = OP_ALLANY;
         }
       else
         {
@@ -8211,9 +8145,7 @@ for (;; pptr++)
     default:
     if (meta >= META_END)
       {
-#ifdef DEBUG_SHOW_PARSED
-      fprintf(stderr, "** Unrecognized parsed pattern item 0x%.8x\n", *pptr);
-#endif
+      PCRE2_DEBUG_UNREACHABLE();
       *errorcodeptr = ERR89;  /* Internal error - unrecognized. */
       return 0;
       }
@@ -8229,15 +8161,28 @@ for (;; pptr++)
     /* For caseless UTF or UCP mode, check whether this character has more than
     one other case. If so, generate a special OP_PROP item instead of OP_CHARI.
     When casing restrictions apply, ignore caseless sets that start with an
-    ASCII character. */
+    ASCII character. If the character is affected by the special Turkish rules,
+    hardcode the matching characters using a caseset. */
 
 #ifdef SUPPORT_UNICODE
     if ((utf||ucp) && (options & PCRE2_CASELESS) != 0)
       {
-      uint32_t caseset = UCD_CASESET(meta);
-      if (caseset != 0 &&
-           ((xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) == 0 ||
-           PRIV(ucd_caseless_sets)[caseset] > 127))
+      uint32_t caseset;
+
+      if ((xoptions & (PCRE2_EXTRA_TURKISH_CASING|PCRE2_EXTRA_CASELESS_RESTRICT)) ==
+            PCRE2_EXTRA_TURKISH_CASING &&
+          UCD_ANY_I(meta))
+        {
+        caseset = PRIV(ucd_turkish_dotted_i_caseset) + (UCD_DOTTED_I(meta)? 0 : 3);
+        }
+      else if ((caseset = UCD_CASESET(meta)) != 0 &&
+               (xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0 &&
+               PRIV(ucd_caseless_sets)[caseset] < 128)
+        {
+        caseset = 0;  /* Ignore the caseless set if it's restricted. */
+        }
+
+      if (caseset != 0)
         {
         *code++ = OP_PROP;
         *code++ = PT_CLIST;
@@ -8335,7 +8280,8 @@ for (;; pptr++)
     }         /* End of big switch */
   }           /* End of big loop */
 
-/* Control never reaches here. */
+PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
+return 0;                  /* Avoid compiler warnings */
 }
 
 
@@ -8391,8 +8337,6 @@ uint32_t firstcu, reqcu;
 uint32_t lookbehindlength;
 uint32_t lookbehindminlength;
 uint32_t firstcuflags, reqcuflags;
-uint32_t branchfirstcu, branchreqcu;
-uint32_t branchfirstcuflags, branchreqcuflags;
 PCRE2_SIZE length;
 branch_chain bc;
 
@@ -8461,9 +8405,11 @@ code += 1 + LINK_SIZE + skipunits;
 for (;;)
   {
   int branch_return;
+  uint32_t branchfirstcu = 0, branchreqcu = 0;
+  uint32_t branchfirstcuflags = REQ_UNSET, branchreqcuflags = REQ_UNSET;
 
   /* Insert OP_REVERSE or OP_VREVERSE if this is a lookbehind assertion. There
-  is only a single mimimum length for the whole assertion. When the mimimum
+  is only a single minimum length for the whole assertion. When the minimum
   length is LOOKBEHIND_MAX it means that all branches are of fixed length,
   though not necessarily the same length. In this case, the original OP_REVERSE
   can be used. It can also be used if a branch in a variable length lookbehind
@@ -8575,10 +8521,10 @@ for (;;)
     {
     if (lengthptr == NULL)
       {
-      PCRE2_SIZE branch_length = code - last_branch;
+      uint32_t branch_length = (uint32_t)(code - last_branch);
       do
         {
-        PCRE2_SIZE prev_length = GET(last_branch, 1);
+        uint32_t prev_length = GET(last_branch, 1);
         PUT(last_branch, 1, branch_length);
         branch_length = prev_length;
         last_branch -= branch_length;
@@ -8589,7 +8535,7 @@ for (;;)
     /* Fill in the ket */
 
     *code = OP_KET;
-    PUT(code, 1, (int)(code - start_bracket));
+    PUT(code, 1, (uint32_t)(code - start_bracket));
     code += 1 + LINK_SIZE;
 
     /* Set values to pass back */
@@ -8640,7 +8586,9 @@ for (;;)
   lookbehindlength = META_DATA(*pptr);
   pptr++;
   }
-/* Control never reaches here */
+
+PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
+return 0;                  /* Avoid compiler warnings */
 }
 
 
@@ -8683,13 +8631,14 @@ Arguments:
   cb             points to the compile data block
   atomcount      atomic group level
   inassert       TRUE if in an assertion
+  dotstar_anchor TRUE if automatic anchoring optimization is enabled
 
 Returns:     TRUE or FALSE
 */
 
 static BOOL
 is_anchored(PCRE2_SPTR code, uint32_t bracket_map, compile_block *cb,
-  int atomcount, BOOL inassert)
+  int atomcount, BOOL inassert, BOOL dotstar_anchor)
 {
 do {
    PCRE2_SPTR scode = first_significant_code(
@@ -8701,7 +8650,7 @@ do {
    if (op == OP_BRA  || op == OP_BRAPOS ||
        op == OP_SBRA || op == OP_SBRAPOS)
      {
-     if (!is_anchored(scode, bracket_map, cb, atomcount, inassert))
+     if (!is_anchored(scode, bracket_map, cb, atomcount, inassert, dotstar_anchor))
        return FALSE;
      }
 
@@ -8712,14 +8661,14 @@ do {
      {
      int n = GET2(scode, 1+LINK_SIZE);
      uint32_t new_map = bracket_map | ((n < 32)? (1u << n) : 1);
-     if (!is_anchored(scode, new_map, cb, atomcount, inassert)) return FALSE;
+     if (!is_anchored(scode, new_map, cb, atomcount, inassert, dotstar_anchor)) return FALSE;
      }
 
    /* Positive forward assertion */
 
    else if (op == OP_ASSERT || op == OP_ASSERT_NA)
      {
-     if (!is_anchored(scode, bracket_map, cb, atomcount, TRUE)) return FALSE;
+     if (!is_anchored(scode, bracket_map, cb, atomcount, TRUE, dotstar_anchor)) return FALSE;
      }
 
    /* Condition. If there is no second branch, it can't be anchored. */
@@ -8727,7 +8676,7 @@ do {
    else if (op == OP_COND || op == OP_SCOND)
      {
      if (scode[GET(scode,1)] != OP_ALT) return FALSE;
-     if (!is_anchored(scode, bracket_map, cb, atomcount, inassert))
+     if (!is_anchored(scode, bracket_map, cb, atomcount, inassert, dotstar_anchor))
        return FALSE;
      }
 
@@ -8735,7 +8684,7 @@ do {
 
    else if (op == OP_ONCE)
      {
-     if (!is_anchored(scode, bracket_map, cb, atomcount + 1, inassert))
+     if (!is_anchored(scode, bracket_map, cb, atomcount + 1, inassert, dotstar_anchor))
        return FALSE;
      }
 
@@ -8750,8 +8699,7 @@ do {
              op == OP_TYPEPOSSTAR))
      {
      if (scode[1] != OP_ALLANY || (bracket_map & cb->backref_map) != 0 ||
-         atomcount > 0 || cb->had_pruneorskip || inassert ||
-         (cb->external_options & PCRE2_NO_DOTSTAR_ANCHOR) != 0)
+         atomcount > 0 || cb->had_pruneorskip || inassert || !dotstar_anchor)
        return FALSE;
      }
 
@@ -8788,13 +8736,14 @@ Arguments:
   cb             points to the compile data
   atomcount      atomic group level
   inassert       TRUE if in an assertion
+  dotstar_anchor TRUE if automatic anchoring optimization is enabled
 
 Returns:         TRUE or FALSE
 */
 
 static BOOL
 is_startline(PCRE2_SPTR code, unsigned int bracket_map, compile_block *cb,
-  int atomcount, BOOL inassert)
+  int atomcount, BOOL inassert, BOOL dotstar_anchor)
 {
 do {
    PCRE2_SPTR scode = first_significant_code(
@@ -8825,7 +8774,8 @@ do {
        return FALSE;
 
        default:     /* Assertion */
-       if (!is_startline(scode, bracket_map, cb, atomcount, TRUE)) return FALSE;
+       if (!is_startline(scode, bracket_map, cb, atomcount, TRUE, dotstar_anchor))
+         return FALSE;
        do scode += GET(scode, 1); while (*scode == OP_ALT);
        scode += 1 + LINK_SIZE;
        break;
@@ -8839,7 +8789,7 @@ do {
    if (op == OP_BRA  || op == OP_BRAPOS ||
        op == OP_SBRA || op == OP_SBRAPOS)
      {
-     if (!is_startline(scode, bracket_map, cb, atomcount, inassert))
+     if (!is_startline(scode, bracket_map, cb, atomcount, inassert, dotstar_anchor))
        return FALSE;
      }
 
@@ -8850,14 +8800,15 @@ do {
      {
      int n = GET2(scode, 1+LINK_SIZE);
      unsigned int new_map = bracket_map | ((n < 32)? (1u << n) : 1);
-     if (!is_startline(scode, new_map, cb, atomcount, inassert)) return FALSE;
+     if (!is_startline(scode, new_map, cb, atomcount, inassert, dotstar_anchor))
+       return FALSE;
      }
 
    /* Positive forward assertions */
 
    else if (op == OP_ASSERT || op == OP_ASSERT_NA)
      {
-     if (!is_startline(scode, bracket_map, cb, atomcount, TRUE))
+     if (!is_startline(scode, bracket_map, cb, atomcount, TRUE, dotstar_anchor))
        return FALSE;
      }
 
@@ -8865,7 +8816,7 @@ do {
 
    else if (op == OP_ONCE)
      {
-     if (!is_startline(scode, bracket_map, cb, atomcount + 1, inassert))
+     if (!is_startline(scode, bracket_map, cb, atomcount + 1, inassert, dotstar_anchor))
        return FALSE;
      }
 
@@ -8879,8 +8830,7 @@ do {
    else if (op == OP_TYPESTAR || op == OP_TYPEMINSTAR || op == OP_TYPEPOSSTAR)
      {
      if (scode[1] != OP_ANY || (bracket_map & cb->backref_map) != 0 ||
-         atomcount > 0 || cb->had_pruneorskip || inassert ||
-         (cb->external_options & PCRE2_NO_DOTSTAR_ANCHOR) != 0)
+         atomcount > 0 || cb->had_pruneorskip || inassert || !dotstar_anchor)
        return FALSE;
      }
 
@@ -8914,8 +8864,8 @@ Arguments:
 Returns:      pointer to the opcode for OP_RECURSE, or NULL if not found
 */
 
-static PCRE2_SPTR
-find_recurse(PCRE2_SPTR code, BOOL utf)
+static PCRE2_UCHAR *
+find_recurse(PCRE2_UCHAR *code, BOOL utf)
 {
 for (;;)
   {
@@ -8924,12 +8874,13 @@ for (;;)
   if (c == OP_RECURSE) return code;
 
   /* XCLASS is used for classes that cannot be represented just by a bit map.
-  This includes negated single high-valued characters. CALLOUT_STR is used for
-  callouts with string arguments. In both cases the length in the table is
+  This includes negated single high-valued characters. ECLASS is used for
+  classes that use set operations internally. CALLOUT_STR is used for
+  callouts with string arguments. In each case the length in the table is
   zero; the actual length is stored in the compiled code. */
 
-  if (c == OP_XCLASS) code += GET(code, 1);
-    else if (c == OP_CALLOUT_STR) code += GET(code, 1 + 2*LINK_SIZE);
+  if (c == OP_XCLASS || c == OP_ECLASS) code += GET(code, 1);
+  else if (c == OP_CALLOUT_STR) code += GET(code, 1 + 2*LINK_SIZE);
 
   /* Otherwise, we can get the item's length from the table, except that for
   repeated character types, we have to test for \p and \P, which have an extra
@@ -9259,9 +9210,12 @@ for (;; pptr++)
     if (meta < META_END) continue;  /* Literal */
     break;
 
-    /* This should never occur. */
-
     case META_END:
+
+    /* The parsed regex is malformed; we have reached the end and did
+    not find the end of the construct which we are skipping over. */
+
+    PCRE2_DEBUG_UNREACHABLE();
     return NULL;
 
     /* The data for these items is variable in length. */
@@ -9270,19 +9224,9 @@ for (;; pptr++)
     if (META_DATA(*pptr) >= 10) pptr += SIZEOFFSET;
     break;
 
-    case META_ESCAPE:   /* A few escapes are followed by data items. */
-    switch (META_DATA(*pptr))
-      {
-      case ESC_P:
-      case ESC_p:
-      pptr += 1;
-      break;
-
-      case ESC_g:
-      case ESC_k:
-      pptr += 1 + SIZEOFFSET;
-      break;
-      }
+    case META_ESCAPE:
+    if (*pptr - META_ESCAPE == ESC_P || *pptr - META_ESCAPE == ESC_p)
+      pptr += 1;     /* Skip prop data */
     break;
 
     case META_MARK:     /* Add the length of the name. */
@@ -9308,6 +9252,7 @@ for (;; pptr++)
     case META_COND_RNAME:
     case META_COND_RNUMBER:
     case META_COND_VERSION:
+    case META_SCS:
     case META_LOOKAHEAD:
     case META_LOOKAHEADNOT:
     case META_LOOKAHEAD_NA:
@@ -9335,8 +9280,8 @@ for (;; pptr++)
   if (meta >= sizeof(meta_extra_lengths)) return NULL;
   pptr += meta_extra_lengths[meta];
   }
-/* Control never reaches here */
-return pptr;
+
+PCRE2_UNREACHABLE(); /* Control never reaches here */
 }
 
 
@@ -9467,10 +9412,10 @@ for (;; pptr++)
   parsed_recurse_check *r;
   uint32_t *gptr, *gptrend;
   uint32_t escape;
+  uint32_t min, max;
   uint32_t group = 0;
   uint32_t itemlength = 0;
   uint32_t itemminlength = 0;
-  uint32_t min, max;
 
   if (*pptr < META_END)
     {
@@ -9569,6 +9514,7 @@ for (;; pptr++)
     case META_LOOKAHEAD:
     case META_LOOKAHEADNOT:
     case META_LOOKAHEAD_NA:
+    case META_SCS:
     *errcodeptr = check_lookbehinds(pptr + 1, &pptr, recurses, cb, lcptr);
     if (*errcodeptr != 0) return -1;
 
@@ -9600,7 +9546,9 @@ for (;; pptr++)
     break;
 
     /* A nested lookbehind does not contribute any length to this lookbehind,
-    but must itself be checked and have its lengths set. */
+    but must itself be checked and have its lengths set. Note that
+    set_lookbehind_lengths() updates pptr, leaving it pointing to the final ket
+    of the group, so no need to update it here. */
 
     case META_LOOKBEHIND:
     case META_LOOKBEHINDNOT:
@@ -9836,7 +9784,8 @@ EXIT:
 return branchlength;
 
 PARSED_SKIP_FAILED:
-*errcodeptr = ERR90;
+PCRE2_DEBUG_UNREACHABLE();
+*errcodeptr = ERR90;  /* Unhandled META code - internal error */
 return -1;
 }
 
@@ -9908,7 +9857,7 @@ do
   *bptr |= branchlength;  /* branchlength never more than 65535 */
   bptr = *pptrptr;
   }
-while (*bptr == META_ALT);
+while (META_CODE(*bptr) == META_ALT);
 
 /* If any branch is of variable length, the whole lookbehind is of variable
 length. If the maximum length of any branch exceeds the maximum for variable
@@ -9920,7 +9869,7 @@ possibly different) length. */
 if (variable)
   {
   gbptr[1] = minlength;
-  if ((uint32_t)maxlength > cb->max_varlookbehind)
+  if ((PCRE2_SIZE)maxlength > cb->max_varlookbehind)
     {
     *errcodeptr = ERR100;
     cb->erroroffset = offset;
@@ -9929,8 +9878,6 @@ if (variable)
   }
 else gbptr[1] = LOOKBEHIND_MAX;
 
-
-gbptr[1] = variable? minlength : LOOKBEHIND_MAX;
 return TRUE;
 }
 
@@ -9976,11 +9923,18 @@ for (; *pptr != META_END; pptr++)
   switch (META_CODE(*pptr))
     {
     default:
+
+    /* The following erroroffset is a bogus but safe value. This branch should
+    be avoided by providing a proper implementation for all supported cases
+    below. */
+
+    PCRE2_DEBUG_UNREACHABLE();
+    cb->erroroffset = 0;
     return ERR70;  /* Unrecognized meta code */
 
     case META_ESCAPE:
     if (*pptr - META_ESCAPE == ESC_P || *pptr - META_ESCAPE == ESC_p)
-      pptr += 1;
+      pptr += 1;    /* Skip prop data */
     break;
 
     case META_KET:
@@ -9994,6 +9948,7 @@ for (; *pptr != META_END; pptr++)
     case META_ATOMIC:
     case META_CAPTURE:
     case META_COND_ASSERT:
+    case META_SCS:
     case META_LOOKAHEAD:
     case META_LOOKAHEADNOT:
     case META_LOOKAHEAD_NA:
@@ -10031,6 +9986,7 @@ for (; *pptr != META_END; pptr++)
     case META_THEN:
     break;
 
+    case META_OFFSET:
     case META_RECURSE:
     pptr += SIZEOFFSET;
     break;
@@ -10065,6 +10021,8 @@ for (; *pptr != META_END; pptr++)
     case META_BIGVALUE:
     case META_POSIX:
     case META_POSIX_NEG:
+    case META_SCS_NAME:
+    case META_SCS_NUMBER:
     pptr += 1;
     break;
 
@@ -10087,6 +10045,9 @@ for (; *pptr != META_END; pptr++)
     pptr += 1 + pptr[1];
     break;
 
+    /* Note that set_lookbehind_lengths() updates pptr, leaving it pointing to
+    the final ket of the group, so no need to update it here. */
+
     case META_LOOKBEHIND:
     case META_LOOKBEHINDNOT:
     case META_LOOKBEHIND_NA:
@@ -10133,19 +10094,19 @@ compile_block cb;                     /* "Static" compile-time data */
 const uint8_t *tables;                /* Char tables base pointer */
 
 PCRE2_UCHAR *code;                    /* Current pointer in compiled code */
-PCRE2_SPTR codestart;                 /* Start of compiled code */
+PCRE2_UCHAR * codestart;              /* Start of compiled code */
 PCRE2_SPTR ptr;                       /* Current pointer in pattern */
 uint32_t *pptr;                       /* Current pointer in parsed pattern */
 
 PCRE2_SIZE length = 1;                /* Allow for final END opcode */
 PCRE2_SIZE usedlength;                /* Actual length used */
 PCRE2_SIZE re_blocksize;              /* Size of memory block */
-PCRE2_SIZE big32count = 0;            /* 32-bit literals >= 0x80000000 */
 PCRE2_SIZE parsed_size_needed;        /* Needed for parsed pattern */
 
 uint32_t firstcuflags, reqcuflags;    /* Type of first/req code unit */
 uint32_t firstcu, reqcu;              /* Value of first/req code unit */
 uint32_t setflags = 0;                /* NL and BSR set flags */
+uint32_t xoptions;                    /* Flags from context, modified */
 
 uint32_t skipatstart;                 /* When checking (*UTF) etc */
 uint32_t limit_heap  = UINT32_MAX;
@@ -10159,6 +10120,10 @@ int regexrc;                          /* Return from compile */
 
 uint32_t i;                           /* Local loop counter */
 
+/* Enable all optimizations by default. */
+uint32_t optim_flags = ccontext != NULL ? ccontext->optimization_flags :
+                                          PCRE2_OPTIMIZATION_ALL;
+
 /* Comments at the head of this file explain about these variables. */
 
 uint32_t stack_groupinfo[GROUPINFO_DEFAULT_SIZE];
@@ -10222,6 +10187,7 @@ PCRE2_ZERO_TERMINATED. Check for an overlong pattern. */
 
 if ((zero_terminated = (patlen == PCRE2_ZERO_TERMINATED)))
   patlen = PRIV(strlen)(pattern);
+(void)zero_terminated; /* Silence compiler; only used if Valgrind enabled */
 
 if (patlen > ccontext->max_pattern_length)
   {
@@ -10229,6 +10195,18 @@ if (patlen > ccontext->max_pattern_length)
   return NULL;
   }
 
+/* Optimization flags in 'options' can override those in the compile context.
+This is because some options to disable optimizations were added before the
+optimization flags word existed, and we need to continue supporting them
+for backwards compatibility. */
+
+if ((options & PCRE2_NO_AUTO_POSSESS) != 0)
+  optim_flags &= ~PCRE2_OPTIM_AUTO_POSSESS;
+if ((options & PCRE2_NO_DOTSTAR_ANCHOR) != 0)
+  optim_flags &= ~PCRE2_OPTIM_DOTSTAR_ANCHOR;
+if ((options & PCRE2_NO_START_OPTIMIZE) != 0)
+  optim_flags &= ~PCRE2_OPTIM_START_OPTIMIZE;
+
 /* From here on, all returns from this function should end up going via the
 EXIT label. */
 
@@ -10267,6 +10245,11 @@ cb.start_code = cworkspace;
 cb.start_pattern = pattern;
 cb.start_workspace = cworkspace;
 cb.workspace_size = COMPILE_WORK_SIZE;
+#ifdef SUPPORT_WIDE_CHARS
+cb.cranges = NULL;
+cb.next_cranges = NULL;
+cb.char_lists_size = 0;
+#endif
 
 /* Maximum back reference and backref bitmap. The bitmap records up to 31 back
 references to help in deciding whether (.*) can be treated as anchored or not.
@@ -10300,6 +10283,7 @@ non-zero-terminated patterns. */
 if (zero_terminated) VALGRIND_MAKE_MEM_NOACCESS(pattern + patlen, CU2BYTES(1));
 #endif
 
+xoptions = ccontext->extra_options;
 ptr = pattern;
 skipatstart = 0;
 
@@ -10311,13 +10295,13 @@ if ((options & PCRE2_LITERAL) == 0)
     {
     for (i = 0; i < sizeof(pso_list)/sizeof(pso); i++)
       {
-      uint32_t c, pp;
       const pso *p = pso_list + i;
 
       if (patlen - skipatstart - 2 >= p->length &&
-          PRIV(strncmp_c8)(ptr + skipatstart + 2, (char *)(p->name),
-            p->length) == 0)
+          PRIV(strncmp_c8)(ptr + skipatstart + 2, p->name, p->length) == 0)
         {
+        uint32_t c, pp;
+
         skipatstart += p->length + 2;
         switch(p->type)
           {
@@ -10325,6 +10309,10 @@ if ((options & PCRE2_LITERAL) == 0)
           cb.external_options |= p->value;
           break;
 
+          case PSO_XOPT:
+          xoptions |= p->value;
+          break;
+
           case PSO_FLG:
           setflags |= p->value;
           break;
@@ -10344,18 +10332,12 @@ if ((options & PCRE2_LITERAL) == 0)
           case PSO_LIMH:
           c = 0;
           pp = skipatstart;
-          if (!IS_DIGIT(ptr[pp]))
-            {
-            errorcode = ERR60;
-            ptr += pp;
-            goto HAD_EARLY_ERROR;
-            }
-          while (IS_DIGIT(ptr[pp]))
+          while (pp < patlen && IS_DIGIT(ptr[pp]))
             {
             if (c > UINT32_MAX / 10 - 1) break;   /* Integer overflow */
             c = c*10 + (ptr[pp++] - CHAR_0);
             }
-          if (ptr[pp++] != CHAR_RIGHT_PARENTHESIS)
+          if (pp >= patlen || pp == skipatstart || ptr[pp] != CHAR_RIGHT_PARENTHESIS)
             {
             errorcode = ERR60;
             ptr += pp;
@@ -10364,14 +10346,45 @@ if ((options & PCRE2_LITERAL) == 0)
           if (p->type == PSO_LIMH) limit_heap = c;
             else if (p->type == PSO_LIMM) limit_match = c;
             else limit_depth = c;
-          skipatstart += pp - skipatstart;
+          skipatstart = ++pp;
           break;
+
+          case PSO_OPTMZ:
+          optim_flags &= ~(p->value);
+
+          /* For backward compatibility the three original VERBs to disable
+          optimizations need to also update the corresponding bit in the
+          external options. */
+
+          switch(p->value)
+            {
+            case PCRE2_OPTIM_AUTO_POSSESS:
+            cb.external_options |= PCRE2_NO_AUTO_POSSESS;
+            break;
+
+            case PCRE2_OPTIM_DOTSTAR_ANCHOR:
+            cb.external_options |= PCRE2_NO_DOTSTAR_ANCHOR;
+            break;
+
+            case PCRE2_OPTIM_START_OPTIMIZE:
+            cb.external_options |= PCRE2_NO_START_OPTIMIZE;
+            break;
+            }
+
+          break;
+
+          default:
+          /* All values in the enum need an explicit entry for this switch
+          but until a better way to prevent coding mistakes is invented keep
+          a catch all that triggers a debug build assert as a failsafe */
+          PCRE2_DEBUG_UNREACHABLE();
           }
         break;   /* Out of the table scan loop */
         }
       }
     if (i >= sizeof(pso_list)/sizeof(pso)) break;   /* Out of pso loop */
     }
+    PCRE2_ASSERT(skipatstart <= patlen);
   }
 
 /* End of pattern-start options; advance to start of real regex. */
@@ -10423,6 +10436,31 @@ if (ucp && (cb.external_options & PCRE2_NEVER_UCP) != 0)
   goto HAD_EARLY_ERROR;
   }
 
+/* PCRE2_EXTRA_TURKISH_CASING checks */
+
+if ((xoptions & PCRE2_EXTRA_TURKISH_CASING) != 0)
+  {
+  if (!utf && !ucp)
+    {
+    errorcode = ERR104;
+    goto HAD_EARLY_ERROR;
+    }
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+  if (!utf)
+    {
+    errorcode = ERR105;
+    goto HAD_EARLY_ERROR;
+    }
+#endif
+
+  if ((xoptions & PCRE2_EXTRA_CASELESS_RESTRICT) != 0)
+    {
+    errorcode = ERR106;
+    goto HAD_EARLY_ERROR;
+    }
+  }
+
 /* Process the BSR setting. */
 
 if (bsr == 0) bsr = ccontext->bsr_convention;
@@ -10463,6 +10501,7 @@ switch(newline)
   break;
 
   default:
+  PCRE2_DEBUG_UNREACHABLE();
   errorcode = ERR56;
   goto HAD_EARLY_ERROR;
   }
@@ -10471,42 +10510,31 @@ switch(newline)
 their numerical equivalents, so that this information is always available for
 the remaining processing. (2) At the same time, parse the pattern and put a
 processed version into the parsed_pattern vector. This has escapes interpreted
-and comments removed (amongst other things).
+and comments removed (amongst other things). */
 
-In all but one case, when PCRE2_AUTO_CALLOUT is not set, the number of unsigned
-32-bit ints in the parsed pattern is bounded by the length of the pattern plus
-one (for the terminator) plus four if PCRE2_EXTRA_WORD or PCRE2_EXTRA_LINE is
-set. The exceptional case is when running in 32-bit, non-UTF mode, when literal
-characters greater than META_END (0x80000000) have to be coded as two units. In
-this case, therefore, we scan the pattern to check for such values. */
+/* Ensure that the parsed pattern buffer is big enough. For many smaller
+patterns the vector on the stack (which was set up above) can be used. */
 
-#if PCRE2_CODE_UNIT_WIDTH == 32
-if (!utf)
-  {
-  PCRE2_SPTR p;
-  for (p = ptr; p < cb.end_pattern; p++) if (*p >= META_END) big32count++;
-  }
-#endif
+parsed_size_needed = max_parsed_pattern(ptr, cb.end_pattern, utf, options);
 
-/* Ensure that the parsed pattern buffer is big enough. When PCRE2_AUTO_CALLOUT
-is set we have to assume a numerical callout (4 elements) for each character
-plus one at the end. This is overkill, but memory is plentiful these days. For
-many smaller patterns the vector on the stack (which was set up above) can be
-used. */
-
-parsed_size_needed = patlen - skipatstart + big32count;
+/* Allow for 2x uint32_t at the start and 2 at the end, for
+PCRE2_EXTRA_MATCH_WORD or PCRE2_EXTRA_MATCH_LINE (which are exclusive). */
 
 if ((ccontext->extra_options &
      (PCRE2_EXTRA_MATCH_WORD|PCRE2_EXTRA_MATCH_LINE)) != 0)
   parsed_size_needed += 4;
 
-if ((options & PCRE2_AUTO_CALLOUT) != 0)
-  parsed_size_needed = (parsed_size_needed + 1) * 5;
+/* When PCRE2_AUTO_CALLOUT is set we allow for one callout at the end. */
 
-if (parsed_size_needed >= PARSED_PATTERN_DEFAULT_SIZE)
+if ((options & PCRE2_AUTO_CALLOUT) != 0)
+  parsed_size_needed += 4;
+
+parsed_size_needed += 1;  /* For the final META_END */
+
+if (parsed_size_needed > PARSED_PATTERN_DEFAULT_SIZE)
   {
   uint32_t *heap_parsed_pattern = ccontext->memctl.malloc(
-    (parsed_size_needed + 1) * sizeof(uint32_t), ccontext->memctl.memory_data);
+    parsed_size_needed * sizeof(uint32_t), ccontext->memctl.memory_data);
   if (heap_parsed_pattern == NULL)
     {
     *errorptr = ERR21;
@@ -10514,11 +10542,11 @@ if (parsed_size_needed >= PARSED_PATTERN_DEFAULT_SIZE)
     }
   cb.parsed_pattern = heap_parsed_pattern;
   }
-cb.parsed_pattern_end = cb.parsed_pattern + parsed_size_needed + 1;
+cb.parsed_pattern_end = cb.parsed_pattern + parsed_size_needed;
 
 /* Do the parsing scan. */
 
-errorcode = parse_regex(ptr, cb.external_options, &has_lookbehind, &cb);
+errorcode = parse_regex(ptr, cb.external_options, xoptions, &has_lookbehind, &cb);
 if (errorcode != 0) goto HAD_CB_ERROR;
 
 /* If there are any lookbehinds, scan the parsed pattern to figure out their
@@ -10587,7 +10615,7 @@ pptr = cb.parsed_pattern;
 code = cworkspace;
 *code = OP_BRA;
 
-(void)compile_regex(cb.external_options, ccontext->extra_options, &code, &pptr,
+(void)compile_regex(cb.external_options, xoptions, &code, &pptr,
    &errorcode, 0, &firstcu, &firstcuflags, &reqcu, &reqcuflags, NULL, NULL,
    &cb, &length);
 
@@ -10595,20 +10623,47 @@ if (errorcode != 0) goto HAD_CB_ERROR;  /* Offset is in cb.erroroffset */
 
 /* This should be caught in compile_regex(), but just in case... */
 
+#if defined SUPPORT_WIDE_CHARS
+PCRE2_ASSERT((cb.char_lists_size & 0x3) == 0);
+if (length > MAX_PATTERN_SIZE ||
+    MAX_PATTERN_SIZE - length < (cb.char_lists_size / sizeof(PCRE2_UCHAR)))
+#else
 if (length > MAX_PATTERN_SIZE)
+#endif
   {
   errorcode = ERR20;
   goto HAD_CB_ERROR;
   }
 
-/* Compute the size of, and then get and initialize, the data block for storing
-the compiled pattern and names table. Integer overflow should no longer be
-possible because nowadays we limit the maximum value of cb.names_found and
-cb.name_entry_size. */
+/* Compute the size of, then, if not too large, get and initialize the data
+block for storing the compiled pattern and names table. Integer overflow should
+no longer be possible because nowadays we limit the maximum value of
+cb.names_found and cb.name_entry_size. */
 
-re_blocksize = sizeof(pcre2_real_code) +
-  CU2BYTES(length +
-  (PCRE2_SIZE)cb.names_found * (PCRE2_SIZE)cb.name_entry_size);
+re_blocksize =
+  CU2BYTES((PCRE2_SIZE)cb.names_found * (PCRE2_SIZE)cb.name_entry_size);
+
+#if defined SUPPORT_WIDE_CHARS
+if (cb.char_lists_size != 0)
+  {
+#if PCRE2_CODE_UNIT_WIDTH != 32
+  /* Align to 32 bit first. This ensures the
+  allocated area will also be 32 bit aligned. */
+  re_blocksize = (PCRE2_SIZE)CLIST_ALIGN_TO(re_blocksize, sizeof(uint32_t));
+#endif
+  re_blocksize += cb.char_lists_size;
+  }
+#endif
+
+re_blocksize += CU2BYTES(length);
+
+if (re_blocksize > ccontext->max_pattern_compiled_length)
+  {
+  errorcode = ERR101;
+  goto HAD_CB_ERROR;
+  }
+
+re_blocksize += sizeof(pcre2_real_code);
 re = (pcre2_real_code *)
   ccontext->memctl.malloc(re_blocksize, ccontext->memctl.memory_data);
 if (re == NULL)
@@ -10629,10 +10684,11 @@ re->tables = tables;
 re->executable_jit = NULL;
 memset(re->start_bitmap, 0, 32 * sizeof(uint8_t));
 re->blocksize = re_blocksize;
+re->code_start = re_blocksize - CU2BYTES(length);
 re->magic_number = MAGIC_NUMBER;
 re->compile_options = options;
 re->overall_options = cb.external_options;
-re->extra_options = ccontext->extra_options;
+re->extra_options = xoptions;
 re->flags = PCRE2_CODE_UNIT_WIDTH/8 | cb.external_flags | setflags;
 re->limit_heap = limit_heap;
 re->limit_match = limit_match;
@@ -10647,12 +10703,12 @@ re->top_bracket = 0;
 re->top_backref = 0;
 re->name_entry_size = cb.name_entry_size;
 re->name_count = cb.names_found;
+re->optimization_flags = optim_flags;
 
 /* The basic block is immediately followed by the name table, and the compiled
 code follows after that. */
 
-codestart = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code)) +
-  re->name_entry_size * re->name_count;
+codestart = (PCRE2_UCHAR *)((uint8_t *)re + re->code_start);
 
 /* Update the compile data block for the actual compile. The starting points of
 the name/number translation table and of the code are passed around in the
@@ -10667,6 +10723,10 @@ cb.start_code = codestart;
 cb.req_varyopt = 0;
 cb.had_accept = FALSE;
 cb.had_pruneorskip = FALSE;
+#ifdef SUPPORT_WIDE_CHARS
+cb.char_lists_size = 0;
+#endif
+
 
 /* If any named groups were found, create the name/number table from the list
 created in the pre-pass. */
@@ -10685,7 +10745,7 @@ of the function here. */
 pptr = cb.parsed_pattern;
 code = (PCRE2_UCHAR *)codestart;
 *code = OP_BRA;
-regexrc = compile_regex(re->overall_options, ccontext->extra_options, &code,
+regexrc = compile_regex(re->overall_options, re->extra_options, &code,
   &pptr, &errorcode, 0, &firstcu, &firstcuflags, &reqcu, &reqcuflags, NULL,
   NULL, &cb, NULL);
 if (regexrc < 0) re->flags |= PCRE2_MATCH_EMPTY;
@@ -10707,7 +10767,12 @@ memory as unaddressable, so that any out-of-bound reads can be detected. */
 
 *code++ = OP_END;
 usedlength = code - codestart;
-if (usedlength > length) errorcode = ERR23; else
+if (usedlength > length)
+  {
+  PCRE2_DEBUG_UNREACHABLE();
+  errorcode = ERR23;  /* Overflow of code block - internal error */
+  }
+else
   {
   re->blocksize -= CU2BYTES(length - usedlength);
 #ifdef SUPPORT_VALGRIND
@@ -10729,9 +10794,9 @@ if (errorcode == 0 && cb.had_recurse)
   int start = RSCAN_CACHE_SIZE;
   recurse_cache rc[RSCAN_CACHE_SIZE];
 
-  for (rcode = (PCRE2_UCHAR *)find_recurse(codestart, utf);
+  for (rcode = find_recurse(codestart, utf);
        rcode != NULL;
-       rcode = (PCRE2_UCHAR *)find_recurse(rcode + 1 + LINK_SIZE, utf))
+       rcode = find_recurse(rcode + 1 + LINK_SIZE, utf))
     {
     int p, groupnumber;
 
@@ -10760,6 +10825,7 @@ if (errorcode == 0 && cb.had_recurse)
         rgroup = PRIV(find_bracket)(search_from, utf, groupnumber);
         if (rgroup == NULL)
           {
+          PCRE2_DEBUG_UNREACHABLE();
           errorcode = ERR53;
           break;
           }
@@ -10770,7 +10836,7 @@ if (errorcode == 0 && cb.had_recurse)
         }
       }
 
-    PUT(rcode, 1, rgroup - codestart);
+    PUT(rcode, 1, (uint32_t)(rgroup - codestart));
     }
   }
 
@@ -10789,10 +10855,14 @@ used in this code because at least one compiler gives a warning about loss of
 "const" attribute if the cast (PCRE2_UCHAR *)codestart is used directly in the
 function call. */
 
-if (errorcode == 0 && (re->overall_options & PCRE2_NO_AUTO_POSSESS) == 0)
+if (errorcode == 0 && (optim_flags & PCRE2_OPTIM_AUTO_POSSESS) != 0)
   {
   PCRE2_UCHAR *temp = (PCRE2_UCHAR *)codestart;
-  if (PRIV(auto_possessify)(temp, &cb) != 0) errorcode = ERR80;
+  if (PRIV(auto_possessify)(temp, &cb) != 0)
+    {
+    PCRE2_DEBUG_UNREACHABLE();
+    errorcode = ERR80;
+    }
   }
 
 /* Failed to compile, or error while post-processing. */
@@ -10805,18 +10875,21 @@ or anything else, such as starting with non-atomic .* when DOTALL is set and
 there are no occurrences of *PRUNE or *SKIP (though there is an option to
 disable this case). */
 
-if ((re->overall_options & PCRE2_ANCHORED) == 0 &&
-     is_anchored(codestart, 0, &cb, 0, FALSE))
-  re->overall_options |= PCRE2_ANCHORED;
+if ((re->overall_options & PCRE2_ANCHORED) == 0)
+  {
+  BOOL dotstar_anchor = ((optim_flags & PCRE2_OPTIM_DOTSTAR_ANCHOR) != 0);
+  if (is_anchored(codestart, 0, &cb, 0, FALSE, dotstar_anchor))
+    re->overall_options |= PCRE2_ANCHORED;
+  }
 
 /* Set up the first code unit or startline flag, the required code unit, and
-then study the pattern. This code need not be obeyed if PCRE2_NO_START_OPTIMIZE
-is set, as the data it would create will not be used. Note that a first code
+then study the pattern. This code need not be obeyed if PCRE2_OPTIM_START_OPTIMIZE
+is disabled, as the data it would create will not be used. Note that a first code
 unit (but not the startline flag) is useful for anchored patterns because it
 can still give a quick "no match" and also avoid searching for a last code
 unit. */
 
-if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
+if ((optim_flags & PCRE2_OPTIM_START_OPTIMIZE) != 0)
   {
   int minminlength = 0;  /* For minimal minlength from first/required CU */
 
@@ -10824,8 +10897,19 @@ if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
   (these are not saved during the compile because they can cause conflicts with
   actual literals that follow). */
 
-  if (firstcuflags >= REQ_NONE)
-    firstcu = find_firstassertedcu(codestart, &firstcuflags, 0);
+  if (firstcuflags >= REQ_NONE) {
+    uint32_t assertedcuflags = 0;
+    uint32_t assertedcu = find_firstassertedcu(codestart, &assertedcuflags, 0);
+    /* It would be wrong to use the asserted first code unit as `firstcu` for
+     * regexes which are able to match a 1-character string (e.g. /(?=a)b?a/)
+     * For that example, if we set both firstcu and reqcu to 'a', it would mean
+     * the subject string needs to be at least 2 characters long, which is wrong.
+     * With more analysis, we would be able to set firstcu in more cases. */
+    if (assertedcuflags < REQ_NONE && assertedcu != reqcu) {
+      firstcu = assertedcu;
+      firstcuflags = assertedcuflags;
+    }
+  }
 
   /* Save the data for a first code unit. The existence of one means the
   minimum length must be at least 1. */
@@ -10846,8 +10930,8 @@ if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
         }
 
       /* The first code unit is > 128 in UTF or UCP mode, or > 255 otherwise.
-      In 8-bit UTF mode, codepoints in the range 128-255 are introductory code
-      points and cannot have another case, but if UCP is set they may do. */
+      In 8-bit UTF mode, code units in the range 128-255 are introductory code
+      units and cannot have another case, but if UCP is set they may do. */
 
 #ifdef SUPPORT_UNICODE
 #if PCRE2_CODE_UNIT_WIDTH == 8
@@ -10868,9 +10952,12 @@ if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
   non-DOTALL matches when *PRUNE and SKIP are not present. (There is an option
   that disables this case.) */
 
-  else if ((re->overall_options & PCRE2_ANCHORED) == 0 &&
-           is_startline(codestart, 0, &cb, 0, FALSE))
-    re->flags |= PCRE2_STARTLINE;
+  else if ((re->overall_options & PCRE2_ANCHORED) == 0)
+    {
+    BOOL dotstar_anchor = ((optim_flags & PCRE2_OPTIM_DOTSTAR_ANCHOR) != 0);
+    if (is_startline(codestart, 0, &cb, 0, FALSE, dotstar_anchor))
+      re->flags |= PCRE2_STARTLINE;
+    }
 
   /* Handle the "required code unit", if one is set. In the UTF case we can
   increment the minimum minimum length only if we are sure this really is a
@@ -10930,6 +11017,7 @@ if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
 
   if (PRIV(study)(re) != 0)
     {
+    PCRE2_DEBUG_UNREACHABLE();
     errorcode = ERR31;
     goto HAD_CB_ERROR;
     }
@@ -10952,6 +11040,10 @@ version of the pattern, free it before returning. Also free the list of named
 groups if a larger one had to be obtained, and likewise the group information
 vector. */
 
+#ifdef SUPPORT_UNICODE
+PCRE2_ASSERT(cb.cranges == NULL);
+#endif
+
 EXIT:
 #ifdef SUPPORT_VALGRIND
 if (zero_terminated) VALGRIND_MAKE_MEM_DEFINED(pattern + patlen, CU2BYTES(1));
@@ -10962,6 +11054,7 @@ if (cb.named_group_list_size > NAMED_GROUP_LIST_SIZE)
   ccontext->memctl.free((void *)cb.named_groups, ccontext->memctl.memory_data);
 if (cb.groupinfo != stack_groupinfo)
   ccontext->memctl.free((void *)cb.groupinfo, ccontext->memctl.memory_data);
+
 return re;    /* Will be NULL after an error */
 
 /* Errors discovered in parse_regex() set the offset value in the compile
@@ -10974,12 +11067,28 @@ HAD_CB_ERROR:
 ptr = pattern + cb.erroroffset;
 
 HAD_EARLY_ERROR:
+PCRE2_ASSERT(ptr >= pattern); /* Ensure we don't return invalid erroroffset */
+PCRE2_ASSERT(ptr <= (pattern + patlen));
 *erroroffset = ptr - pattern;
 
 HAD_ERROR:
 *errorptr = errorcode;
 pcre2_code_free(re);
 re = NULL;
+
+#ifdef SUPPORT_WIDE_CHARS
+if (cb.cranges != NULL)
+  {
+  class_ranges* cranges = cb.cranges;
+  do
+    {
+    class_ranges* next_cranges = cranges->next;
+    cb.cx->memctl.free(cranges, cb.cx->memctl.memory_data);
+    cranges = next_cranges;
+    }
+  while (cranges != NULL);
+  }
+#endif
 goto EXIT;
 }
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_compile.h b/engine/thirdparty/pcre2/src/pcre2_compile.h
new file mode 100644
index 00000000..c8bf610b
--- /dev/null
+++ b/engine/thirdparty/pcre2/src/pcre2_compile.h
@@ -0,0 +1,280 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE2 is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef PCRE2_COMPILE_H_IDEMPOTENT_GUARD
+#define PCRE2_COMPILE_H_IDEMPOTENT_GUARD
+
+#include "pcre2_internal.h"
+
+/* Compile time error code numbers. They are given names so that they can more
+easily be tracked. When a new number is added, the tables called eint1 and
+eint2 in pcre2posix.c may need to be updated, and a new error text must be
+added to compile_error_texts in pcre2_error.c. Also, the error codes in
+pcre2.h.in must be updated - their values are exactly 100 greater than these
+values. */
+
+enum { ERR0 = COMPILE_ERROR_BASE,
+       ERR1,  ERR2,  ERR3,  ERR4,  ERR5,  ERR6,  ERR7,  ERR8,  ERR9,  ERR10,
+       ERR11, ERR12, ERR13, ERR14, ERR15, ERR16, ERR17, ERR18, ERR19, ERR20,
+       ERR21, ERR22, ERR23, ERR24, ERR25, ERR26, ERR27, ERR28, ERR29, ERR30,
+       ERR31, ERR32, ERR33, ERR34, ERR35, ERR36, ERR37, ERR38, ERR39, ERR40,
+       ERR41, ERR42, ERR43, ERR44, ERR45, ERR46, ERR47, ERR48, ERR49, ERR50,
+       ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, ERR60,
+       ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, ERR70,
+       ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, ERR80,
+       ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERR88, ERR89, ERR90,
+       ERR91, ERR92, ERR93, ERR94, ERR95, ERR96, ERR97, ERR98, ERR99, ERR100,
+       ERR101,ERR102,ERR103,ERR104,ERR105,ERR106,ERR107,ERR108,ERR109,ERR110,
+       ERR111,ERR112,ERR113,ERR114,ERR115,ERR116 };
+
+/* Code values for parsed patterns, which are stored in a vector of 32-bit
+unsigned ints. Values less than META_END are literal data values. The coding
+for identifying the item is in the top 16-bits, leaving 16 bits for the
+additional data that some of them need. The META_CODE, META_DATA, and META_DIFF
+macros are used to manipulate parsed pattern elements.
+
+NOTE: When these definitions are changed, the table of extra lengths for each
+code (meta_extra_lengths) must be updated to remain in step. */
+
+#define META_END              0x80000000u  /* End of pattern */
+
+#define META_ALT              0x80010000u  /* alternation */
+#define META_ATOMIC           0x80020000u  /* atomic group */
+#define META_BACKREF          0x80030000u  /* Back ref */
+#define META_BACKREF_BYNAME   0x80040000u  /* \k'name' */
+#define META_BIGVALUE         0x80050000u  /* Next is a literal > META_END */
+#define META_CALLOUT_NUMBER   0x80060000u  /* (?C with numerical argument */
+#define META_CALLOUT_STRING   0x80070000u  /* (?C with string argument */
+#define META_CAPTURE          0x80080000u  /* Capturing parenthesis */
+#define META_CIRCUMFLEX       0x80090000u  /* ^ metacharacter */
+#define META_CLASS            0x800a0000u  /* start non-empty class */
+#define META_CLASS_EMPTY      0x800b0000u  /* empty class */
+#define META_CLASS_EMPTY_NOT  0x800c0000u  /* negative empty class */
+#define META_CLASS_END        0x800d0000u  /* end of non-empty class */
+#define META_CLASS_NOT        0x800e0000u  /* start non-empty negative class */
+#define META_COND_ASSERT      0x800f0000u  /* (?(?assertion)... */
+#define META_COND_DEFINE      0x80100000u  /* (?(DEFINE)... */
+#define META_COND_NAME        0x80110000u  /* (?(<name>)... */
+#define META_COND_NUMBER      0x80120000u  /* (?(digits)... */
+#define META_COND_RNAME       0x80130000u  /* (?(R&name)... */
+#define META_COND_RNUMBER     0x80140000u  /* (?(Rdigits)... */
+#define META_COND_VERSION     0x80150000u  /* (?(VERSION<op>x.y)... */
+#define META_OFFSET           0x80160000u  /* Setting offset for various
+                                              META codes (e.g. META_SCS_NAME) */
+#define META_SCS              0x80170000u  /* (*scan_substring:... */
+#define META_SCS_NAME         0x80180000u  /* Next <name> of scan_substring */
+#define META_SCS_NUMBER       0x80190000u  /* Next digits of scan_substring */
+#define META_DOLLAR           0x801a0000u  /* $ metacharacter */
+#define META_DOT              0x801b0000u  /* . metacharacter */
+#define META_ESCAPE           0x801c0000u  /* \d and friends */
+#define META_KET              0x801d0000u  /* closing parenthesis */
+#define META_NOCAPTURE        0x801e0000u  /* no capture parens */
+#define META_OPTIONS          0x801f0000u  /* (?i) and friends */
+#define META_POSIX            0x80200000u  /* POSIX class item */
+#define META_POSIX_NEG        0x80210000u  /* negative POSIX class item */
+#define META_RANGE_ESCAPED    0x80220000u  /* range with at least one escape */
+#define META_RANGE_LITERAL    0x80230000u  /* range defined literally */
+#define META_RECURSE          0x80240000u  /* Recursion */
+#define META_RECURSE_BYNAME   0x80250000u  /* (?&name) */
+#define META_SCRIPT_RUN       0x80260000u  /* (*script_run:...) */
+
+/* These must be kept together to make it easy to check that an assertion
+is present where expected in a conditional group. */
+
+#define META_LOOKAHEAD        0x80270000u  /* (?= */
+#define META_LOOKAHEADNOT     0x80280000u  /* (?! */
+#define META_LOOKBEHIND       0x80290000u  /* (?<= */
+#define META_LOOKBEHINDNOT    0x802a0000u  /* (?<! */
+
+/* These cannot be conditions */
+
+#define META_LOOKAHEAD_NA     0x802b0000u  /* (*napla: */
+#define META_LOOKBEHIND_NA    0x802c0000u  /* (*naplb: */
+
+/* These must be kept in this order, with consecutive values, and the _ARG
+versions of COMMIT, PRUNE, SKIP, and THEN immediately after their non-argument
+versions. */
+
+#define META_MARK             0x802d0000u  /* (*MARK) */
+#define META_ACCEPT           0x802e0000u  /* (*ACCEPT) */
+#define META_FAIL             0x802f0000u  /* (*FAIL) */
+#define META_COMMIT           0x80300000u  /* These               */
+#define META_COMMIT_ARG       0x80310000u  /*   pairs             */
+#define META_PRUNE            0x80320000u  /*     must            */
+#define META_PRUNE_ARG        0x80330000u  /*       be            */
+#define META_SKIP             0x80340000u  /*         kept        */
+#define META_SKIP_ARG         0x80350000u  /*           in        */
+#define META_THEN             0x80360000u  /*             this    */
+#define META_THEN_ARG         0x80370000u  /*               order */
+
+/* These must be kept in groups of adjacent 3 values, and all together. */
+
+#define META_ASTERISK         0x80380000u  /* *  */
+#define META_ASTERISK_PLUS    0x80390000u  /* *+ */
+#define META_ASTERISK_QUERY   0x803a0000u  /* *? */
+#define META_PLUS             0x803b0000u  /* +  */
+#define META_PLUS_PLUS        0x803c0000u  /* ++ */
+#define META_PLUS_QUERY       0x803d0000u  /* +? */
+#define META_QUERY            0x803e0000u  /* ?  */
+#define META_QUERY_PLUS       0x803f0000u  /* ?+ */
+#define META_QUERY_QUERY      0x80400000u  /* ?? */
+#define META_MINMAX           0x80410000u  /* {n,m}  repeat */
+#define META_MINMAX_PLUS      0x80420000u  /* {n,m}+ repeat */
+#define META_MINMAX_QUERY     0x80430000u  /* {n,m}? repeat */
+
+/* These meta codes must be kept in a group, with the OR/SUB/XOR in
+this order, and AND/NOT at the start/end. */
+
+#define META_ECLASS_AND       0x80440000u  /* && (or &) in a class */
+#define META_ECLASS_OR        0x80450000u  /* || (or |, +) in a class */
+#define META_ECLASS_SUB       0x80460000u  /* -- (or -) in a class */
+#define META_ECLASS_XOR       0x80470000u  /* ~~ (or ^) in a class */
+#define META_ECLASS_NOT       0x80480000u  /* ! in a class */
+
+/* Convenience aliases. */
+
+#define META_FIRST_QUANTIFIER META_ASTERISK
+#define META_LAST_QUANTIFIER  META_MINMAX_QUERY
+
+/* This is a special "meta code" that is used only to distinguish (*asr: from
+(*sr: in the table of alphabetic assertions. It is never stored in the parsed
+pattern because (*asr: is turned into (*sr:(*atomic: at that stage. There is
+therefore no need for it to have a length entry, so use a high value. */
+
+#define META_ATOMIC_SCRIPT_RUN 0x8fff0000u
+
+/* Macros for manipulating elements of the parsed pattern vector. */
+
+#define META_CODE(x)   (x & 0xffff0000u)
+#define META_DATA(x)   (x & 0x0000ffffu)
+#define META_DIFF(x,y) ((x-y)>>16)
+
+/* Extended class management flags. */
+
+#define CLASS_IS_ECLASS 0x1
+
+/* Macro for the highest character value. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#define MAX_UCHAR_VALUE 0xffu
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+#define MAX_UCHAR_VALUE 0xffffu
+#else
+#define MAX_UCHAR_VALUE 0xffffffffu
+#endif
+
+#define GET_MAX_CHAR_VALUE(utf) \
+  ((utf) ? MAX_UTF_CODE_POINT : MAX_UCHAR_VALUE)
+
+/* Macro for setting individual bits in class bitmaps. */
+
+#define SETBIT(a,b) a[(b) >> 3] |= (uint8_t)(1u << ((b) & 0x7))
+
+/* Macro for 8 bit specific checks. */
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#define SELECT_VALUE8(value8, value) (value8)
+#else
+#define SELECT_VALUE8(value8, value) (value)
+#endif
+
+/* Macro for aligning data. */
+#define CLIST_ALIGN_TO(base, align) \
+  ((base + ((size_t)(align) - 1)) & ~((size_t)(align) - 1))
+
+/* Structure for holding information about an OP_ECLASS internal operand.
+An "operand" here could be just a single OP_[X]CLASS, or it could be some
+complex expression; but it's some sequence of ECL_* codes which pushes one
+value to the stack. */
+typedef struct {
+  /* The position of the operand - or NULL if (lengthptr != NULL). */
+  PCRE2_UCHAR *code_start;
+  PCRE2_SIZE length;
+  /* The operand's type if it is a single code (ECL_XCLASS, ECL_ANY, ECL_NONE);
+  otherwise zero if the operand is not atomic. */
+  uint8_t op_single_type;
+  /* Regardless of whether it's a single code or not, we fully constant-fold
+  the bitmap for code points < 256. */
+  class_bits_storage bits;
+} eclass_op_info;
+
+/* Macros for the definitions below, to prevent name collisions. */
+
+#define _pcre2_posix_class_maps          PCRE2_SUFFIX(_pcre2_posix_class_maps)
+#define _pcre2_update_classbits          PCRE2_SUFFIX(_pcre2_update_classbits_)
+#define _pcre2_compile_class_nested      PCRE2_SUFFIX(_pcre2_compile_class_nested_)
+#define _pcre2_compile_class_not_nested  PCRE2_SUFFIX(_pcre2_compile_class_not_nested_)
+
+
+/* Indices of the POSIX classes in posix_names, posix_name_lengths,
+posix_class_maps, and posix_substitutes. They must be kept in sync. */
+
+#define PC_DIGIT   7
+#define PC_GRAPH   8
+#define PC_PRINT   9
+#define PC_PUNCT  10
+#define PC_XDIGIT 13
+
+extern const int PRIV(posix_class_maps)[];
+
+
+/* Set bits in classbits according to the property type */
+
+void PRIV(update_classbits)(uint32_t ptype, uint32_t pdata, BOOL negated,
+  uint8_t *classbits);
+
+/* Compile the META codes from start_ptr...end_ptr, writing a single OP_CLASS
+OP_CLASS, OP_NCLASS, OP_XCLASS, or OP_ALLANY into pcode. */
+
+uint32_t *PRIV(compile_class_not_nested)(uint32_t options, uint32_t xoptions,
+  uint32_t *start_ptr, PCRE2_UCHAR **pcode, BOOL negate_class, BOOL* has_bitmap,
+  int *errorcodeptr, compile_block *cb, PCRE2_SIZE *lengthptr);
+
+/* Compile the META codes in pptr into opcodes written to pcode. The pptr must
+start at a META_CLASS or META_CLASS_NOT.
+
+The pptr will be left pointing at the matching META_CLASS_END. */
+
+BOOL PRIV(compile_class_nested)(uint32_t options, uint32_t xoptions,
+  uint32_t **pptr, PCRE2_UCHAR **pcode, int *errorcodeptr,
+  compile_block *cb, PCRE2_SIZE *lengthptr);
+
+#endif  /* PCRE2_COMPILE_H_IDEMPOTENT_GUARD */
+
+/* End of pcre2_compile.h */
diff --git a/engine/thirdparty/pcre2/src/pcre2_compile_class.c b/engine/thirdparty/pcre2/src/pcre2_compile_class.c
new file mode 100644
index 00000000..6a73bb9a
--- /dev/null
+++ b/engine/thirdparty/pcre2/src/pcre2_compile_class.c
@@ -0,0 +1,2737 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pcre2_compile.h"
+
+typedef struct {
+  /* Option bits for eclass. */
+  uint32_t options;
+  uint32_t xoptions;
+  /* Rarely used members. */
+  int *errorcodeptr;
+  compile_block *cb;
+  /* Bitmap is needed. */
+  BOOL needs_bitmap;
+} eclass_context;
+
+/* Checks the allowed tokens at the end of a class structure in debug mode.
+When a new token is not processed by all loops, and the token is equals to
+a) one of the cases here:
+   the compiler will complain about a duplicated case value.
+b) none of the cases here:
+   the loop without the handler will stop with an assertion failure. */
+
+#ifdef PCRE2_DEBUG
+#define CLASS_END_CASES(meta) \
+  default: \
+  PCRE2_ASSERT((meta) <= META_END); \
+  /* Fall through */ \
+  case META_CLASS: \
+  case META_CLASS_NOT: \
+  case META_CLASS_EMPTY: \
+  case META_CLASS_EMPTY_NOT: \
+  case META_CLASS_END: \
+  case META_ECLASS_AND: \
+  case META_ECLASS_OR: \
+  case META_ECLASS_SUB: \
+  case META_ECLASS_XOR: \
+  case META_ECLASS_NOT:
+#else
+#define CLASS_END_CASES(meta) \
+  default:
+#endif
+
+#ifdef SUPPORT_WIDE_CHARS
+
+/* Heapsort algorithm. */
+
+static void do_heapify(uint32_t *buffer, size_t size, size_t i)
+{
+size_t max;
+size_t left;
+size_t right;
+uint32_t tmp1, tmp2;
+
+while (TRUE)
+  {
+  max = i;
+  left = (i << 1) + 2;
+  right = left + 2;
+
+  if (left < size && buffer[left] > buffer[max]) max = left;
+  if (right < size && buffer[right] > buffer[max]) max = right;
+  if (i == max) return;
+
+  /* Swap items. */
+  tmp1 = buffer[i];
+  tmp2 = buffer[i + 1];
+  buffer[i] = buffer[max];
+  buffer[i + 1] = buffer[max + 1];
+  buffer[max] = tmp1;
+  buffer[max + 1] = tmp2;
+  i = max;
+  }
+}
+
+#ifdef SUPPORT_UNICODE
+
+#define PARSE_CLASS_UTF               0x1
+#define PARSE_CLASS_CASELESS_UTF      0x2
+#define PARSE_CLASS_RESTRICTED_UTF    0x4
+#define PARSE_CLASS_TURKISH_UTF       0x8
+
+/* Get the range of nocase characters which includes the
+'c' character passed as argument, or directly follows 'c'. */
+
+static const uint32_t*
+get_nocase_range(uint32_t c)
+{
+uint32_t left = 0;
+uint32_t right = PRIV(ucd_nocase_ranges_size);
+uint32_t middle;
+
+if (c > MAX_UTF_CODE_POINT) return PRIV(ucd_nocase_ranges) + right;
+
+while (TRUE)
+  {
+  /* Range end of the middle element. */
+  middle = ((left + right) >> 1) | 0x1;
+
+  if (PRIV(ucd_nocase_ranges)[middle] <= c)
+    left = middle + 1;
+  else if (middle > 1 && PRIV(ucd_nocase_ranges)[middle - 2] > c)
+    right = middle - 1;
+  else
+    return PRIV(ucd_nocase_ranges) + (middle - 1);
+  }
+}
+
+/* Get the list of othercase characters, which belongs to the passed range.
+Create ranges from these characters, and append them to the buffer argument. */
+
+static size_t
+utf_caseless_extend(uint32_t start, uint32_t end, uint32_t options,
+  uint32_t *buffer)
+{
+uint32_t new_start = start;
+uint32_t new_end = end;
+uint32_t c = start;
+const uint32_t *list;
+uint32_t tmp[3];
+size_t result = 2;
+const uint32_t *skip_range = get_nocase_range(c);
+uint32_t skip_start = skip_range[0];
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+PCRE2_ASSERT(options & PARSE_CLASS_UTF);
+#endif
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+if (end > MAX_UTF_CODE_POINT) end = MAX_UTF_CODE_POINT;
+#endif
+
+while (c <= end)
+  {
+  uint32_t co;
+
+  if (c > skip_start)
+    {
+    c = skip_range[1];
+    skip_range += 2;
+    skip_start = skip_range[0];
+    continue;
+    }
+
+  /* Compute caseless set. */
+
+  if ((options & (PARSE_CLASS_TURKISH_UTF|PARSE_CLASS_RESTRICTED_UTF)) ==
+        PARSE_CLASS_TURKISH_UTF &&
+      UCD_ANY_I(c))
+    {
+    co = PRIV(ucd_turkish_dotted_i_caseset) + (UCD_DOTTED_I(c)? 0 : 3);
+    }
+  else if ((co = UCD_CASESET(c)) != 0 &&
+           (options & PARSE_CLASS_RESTRICTED_UTF) != 0 &&
+           PRIV(ucd_caseless_sets)[co] < 128)
+    {
+    co = 0;  /* Ignore the caseless set if it's restricted. */
+    }
+
+  if (co != 0)
+    list = PRIV(ucd_caseless_sets) + co;
+  else
+    {
+    co = UCD_OTHERCASE(c);
+    list = tmp;
+    tmp[0] = c;
+    tmp[1] = NOTACHAR;
+
+    if (co != c)
+      {
+      tmp[1] = co;
+      tmp[2] = NOTACHAR;
+      }
+    }
+  c++;
+
+  /* Add characters. */
+  do
+    {
+#if PCRE2_CODE_UNIT_WIDTH == 16
+    if (!(options & PARSE_CLASS_UTF) && *list > 0xffff) continue;
+#endif
+
+    if (*list < new_start)
+      {
+      if (*list + 1 == new_start)
+        {
+        new_start--;
+        continue;
+        }
+      }
+    else if (*list > new_end)
+      {
+      if (*list - 1 == new_end)
+        {
+        new_end++;
+        continue;
+        }
+      }
+    else continue;
+
+    result += 2;
+    if (buffer != NULL)
+      {
+      buffer[0] = *list;
+      buffer[1] = *list;
+      buffer += 2;
+      }
+    }
+  while (*(++list) != NOTACHAR);
+  }
+
+  if (buffer != NULL)
+    {
+    buffer[0] = new_start;
+    buffer[1] = new_end;
+    buffer += 2;
+    (void)buffer;
+    }
+  return result;
+}
+
+#endif
+
+/* Add a character list to a buffer. */
+
+static size_t
+append_char_list(const uint32_t *p, uint32_t *buffer)
+{
+const uint32_t *n;
+size_t result = 0;
+
+while (*p != NOTACHAR)
+  {
+  n = p;
+  while (n[0] == n[1] - 1) n++;
+
+  PCRE2_ASSERT(*p < 0xffff);
+
+  if (buffer != NULL)
+    {
+    buffer[0] = *p;
+    buffer[1] = *n;
+    buffer += 2;
+    }
+
+  result += 2;
+  p = n + 1;
+  }
+
+  return result;
+}
+
+static uint32_t
+get_highest_char(uint32_t options)
+{
+(void)options; /* Avoid compiler warning. */
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+return MAX_UTF_CODE_POINT;
+#else
+#ifdef SUPPORT_UNICODE
+return GET_MAX_CHAR_VALUE((options & PARSE_CLASS_UTF) != 0);
+#else
+return MAX_UCHAR_VALUE;
+#endif
+#endif
+}
+
+/* Add a negated character list to a buffer. */
+static size_t
+append_negated_char_list(const uint32_t *p, uint32_t options, uint32_t *buffer)
+{
+const uint32_t *n;
+uint32_t start = 0;
+size_t result = 2;
+
+PCRE2_ASSERT(*p > 0);
+
+while (*p != NOTACHAR)
+  {
+  n = p;
+  while (n[0] == n[1] - 1) n++;
+
+  PCRE2_ASSERT(*p < 0xffff);
+
+  if (buffer != NULL)
+    {
+    buffer[0] = start;
+    buffer[1] = *p - 1;
+    buffer += 2;
+    }
+
+  result += 2;
+  start = *n + 1;
+  p = n + 1;
+  }
+
+  if (buffer != NULL)
+    {
+    buffer[0] = start;
+    buffer[1] = get_highest_char(options);
+    buffer += 2;
+    (void)buffer;
+    }
+
+  return result;
+}
+
+static uint32_t *
+append_non_ascii_range(uint32_t options, uint32_t *buffer)
+{
+  if (buffer == NULL) return NULL;
+
+  buffer[0] = 0x100;
+  buffer[1] = get_highest_char(options);
+  return buffer + 2;
+}
+
+static size_t
+parse_class(uint32_t *ptr, uint32_t options, uint32_t *buffer)
+{
+size_t total_size = 0;
+size_t size;
+uint32_t meta_arg;
+uint32_t start_char;
+
+while (TRUE)
+  {
+  switch (META_CODE(*ptr))
+    {
+    case META_ESCAPE:
+      meta_arg = META_DATA(*ptr);
+      switch (meta_arg)
+        {
+        case ESC_D:
+        case ESC_W:
+        case ESC_S:
+        buffer = append_non_ascii_range(options, buffer);
+        total_size += 2;
+        break;
+
+        case ESC_h:
+        size = append_char_list(PRIV(hspace_list), buffer);
+        total_size += size;
+        if (buffer != NULL) buffer += size;
+        break;
+
+        case ESC_H:
+        size = append_negated_char_list(PRIV(hspace_list), options, buffer);
+        total_size += size;
+        if (buffer != NULL) buffer += size;
+        break;
+
+        case ESC_v:
+        size = append_char_list(PRIV(vspace_list), buffer);
+        total_size += size;
+        if (buffer != NULL) buffer += size;
+        break;
+
+        case ESC_V:
+        size = append_negated_char_list(PRIV(vspace_list), options, buffer);
+        total_size += size;
+        if (buffer != NULL) buffer += size;
+        break;
+
+        case ESC_p:
+        case ESC_P:
+        ptr++;
+        if (meta_arg == ESC_p && (*ptr >> 16) == PT_ANY)
+          {
+          if (buffer != NULL)
+            {
+            buffer[0] = 0;
+            buffer[1] = get_highest_char(options);
+            buffer += 2;
+            }
+          total_size += 2;
+          }
+        break;
+        }
+      ptr++;
+      continue;
+    case META_POSIX_NEG:
+      buffer = append_non_ascii_range(options, buffer);
+      total_size += 2;
+      ptr += 2;
+      continue;
+    case META_POSIX:
+      ptr += 2;
+      continue;
+    case META_BIGVALUE:
+      /* Character literal */
+      ptr++;
+      break;
+    CLASS_END_CASES(*ptr)
+      if (*ptr >= META_END) return total_size;
+      break;
+    }
+
+    start_char = *ptr;
+
+    if (ptr[1] == META_RANGE_LITERAL || ptr[1] == META_RANGE_ESCAPED)
+      {
+      ptr += 2;
+      PCRE2_ASSERT(*ptr < META_END || *ptr == META_BIGVALUE);
+
+      if (*ptr == META_BIGVALUE) ptr++;
+
+#ifdef EBCDIC
+#error "Missing EBCDIC support"
+#endif
+      }
+
+#ifdef SUPPORT_UNICODE
+    if (options & PARSE_CLASS_CASELESS_UTF)
+      {
+      size = utf_caseless_extend(start_char, *ptr++, options, buffer);
+      if (buffer != NULL) buffer += size;
+      total_size += size;
+      continue;
+      }
+#endif
+
+    if (buffer != NULL)
+      {
+      buffer[0] = start_char;
+      buffer[1] = *ptr;
+      buffer += 2;
+      }
+
+    ptr++;
+    total_size += 2;
+  }
+
+  return total_size;
+}
+
+/* Extra uint32_t values for storing the lengths of range lists in
+the worst case. Two uint32_t lengths and a range end for a range
+starting before 255 */
+#define CHAR_LIST_EXTRA_SIZE 3
+
+/* Starting character values for each character list. */
+
+static const uint32_t char_list_starts[] = {
+#if PCRE2_CODE_UNIT_WIDTH == 32
+  XCL_CHAR_LIST_HIGH_32_START,
+#endif
+#if PCRE2_CODE_UNIT_WIDTH == 32 || defined SUPPORT_UNICODE
+  XCL_CHAR_LIST_LOW_32_START,
+#endif
+  XCL_CHAR_LIST_HIGH_16_START,
+  /* Must be terminated by XCL_CHAR_LIST_LOW_16_START,
+  which also represents the end of the bitset. */
+  XCL_CHAR_LIST_LOW_16_START,
+};
+
+static class_ranges *
+compile_optimize_class(uint32_t *start_ptr, uint32_t options,
+  uint32_t xoptions, compile_block *cb)
+{
+class_ranges* cranges;
+uint32_t *ptr;
+uint32_t *buffer;
+uint32_t *dst;
+uint32_t class_options = 0;
+size_t range_list_size = 0, total_size, i;
+uint32_t tmp1, tmp2;
+const uint32_t *char_list_next;
+uint16_t *next_char;
+uint32_t char_list_start, char_list_end;
+uint32_t range_start, range_end;
+
+#ifdef SUPPORT_UNICODE
+if (options & PCRE2_UTF)
+  class_options |= PARSE_CLASS_UTF;
+
+if ((options & PCRE2_CASELESS) && (options & (PCRE2_UTF|PCRE2_UCP)))
+  class_options |= PARSE_CLASS_CASELESS_UTF;
+
+if (xoptions & PCRE2_EXTRA_CASELESS_RESTRICT)
+  class_options |= PARSE_CLASS_RESTRICTED_UTF;
+
+if (xoptions & PCRE2_EXTRA_TURKISH_CASING)
+  class_options |= PARSE_CLASS_TURKISH_UTF;
+#endif
+
+/* Compute required space for the range. */
+
+range_list_size = parse_class(start_ptr, class_options, NULL);
+PCRE2_ASSERT((range_list_size & 0x1) == 0);
+
+/* Allocate buffer. The total_size also represents the end of the buffer. */
+
+total_size = range_list_size +
+   ((range_list_size >= 2) ? CHAR_LIST_EXTRA_SIZE : 0);
+
+cranges = cb->cx->memctl.malloc(
+  sizeof(class_ranges) + total_size * sizeof(uint32_t),
+  cb->cx->memctl.memory_data);
+
+if (cranges == NULL) return NULL;
+
+cranges->next = NULL;
+cranges->range_list_size = (uint16_t)range_list_size;
+cranges->char_lists_types = 0;
+cranges->char_lists_size = 0;
+cranges->char_lists_start = 0;
+
+if (range_list_size == 0) return cranges;
+
+buffer = (uint32_t*)(cranges + 1);
+parse_class(start_ptr, class_options, buffer);
+
+/* Using <= instead of == to help static analysis. */
+if (range_list_size <= 2) return cranges;
+
+/* In-place sorting of ranges. */
+
+i = (((range_list_size >> 2) - 1) << 1);
+while (TRUE)
+  {
+  do_heapify(buffer, range_list_size, i);
+  if (i == 0) break;
+  i -= 2;
+  }
+
+i = range_list_size - 2;
+while (TRUE)
+  {
+  tmp1 = buffer[i];
+  tmp2 = buffer[i + 1];
+  buffer[i] = buffer[0];
+  buffer[i + 1] = buffer[1];
+  buffer[0] = tmp1;
+  buffer[1] = tmp2;
+
+  do_heapify(buffer, i, 0);
+  if (i == 0) break;
+  i -= 2;
+  }
+
+/* Merge ranges whenever possible. */
+dst = buffer;
+ptr = buffer + 2;
+range_list_size -= 2;
+
+/* The second condition is a very rare corner case, where the end of the last
+range is the maximum character. This range cannot be extended further. */
+
+while (range_list_size > 0 && dst[1] != ~(uint32_t)0)
+  {
+  if (dst[1] + 1 < ptr[0])
+    {
+    dst += 2;
+    dst[0] = ptr[0];
+    dst[1] = ptr[1];
+    }
+  else if (dst[1] < ptr[1]) dst[1] = ptr[1];
+
+  ptr += 2;
+  range_list_size -= 2;
+  }
+
+PCRE2_ASSERT(dst[1] <= get_highest_char(class_options));
+
+/* When the number of ranges are less than six,
+they are not converted to range lists. */
+
+ptr = buffer;
+while (ptr < dst && ptr[1] < 0x100) ptr += 2;
+if (dst - ptr < (2 * (6 - 1)))
+  {
+  cranges->range_list_size = (uint16_t)(dst + 2 - buffer);
+  return cranges;
+  }
+
+/* Compute character lists structures. */
+
+char_list_next = char_list_starts;
+char_list_start = *char_list_next++;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+char_list_end = XCL_CHAR_LIST_HIGH_32_END;
+#elif defined SUPPORT_UNICODE
+char_list_end = XCL_CHAR_LIST_LOW_32_END;
+#else
+char_list_end = XCL_CHAR_LIST_HIGH_16_END;
+#endif
+next_char = (uint16_t*)(buffer + total_size);
+
+tmp1 = 0;
+tmp2 = ((sizeof(char_list_starts) / sizeof(uint32_t)) - 1) * XCL_TYPE_BIT_LEN;
+PCRE2_ASSERT(tmp2 <= 3 * XCL_TYPE_BIT_LEN && tmp2 >= XCL_TYPE_BIT_LEN);
+range_start = dst[0];
+range_end = dst[1];
+
+while (TRUE)
+  {
+  if (range_start >= char_list_start)
+    {
+    if (range_start == range_end || range_end < char_list_end)
+      {
+      tmp1++;
+      next_char--;
+
+      if (char_list_start < XCL_CHAR_LIST_LOW_32_START)
+        *next_char = (uint16_t)((range_end << XCL_CHAR_SHIFT) | XCL_CHAR_END);
+      else
+        *(uint32_t*)(--next_char) =
+          (range_end << XCL_CHAR_SHIFT) | XCL_CHAR_END;
+      }
+
+    if (range_start < range_end)
+      {
+      if (range_start > char_list_start)
+        {
+        tmp1++;
+        next_char--;
+
+        if (char_list_start < XCL_CHAR_LIST_LOW_32_START)
+          *next_char = (uint16_t)(range_start << XCL_CHAR_SHIFT);
+        else
+          *(uint32_t*)(--next_char) = (range_start << XCL_CHAR_SHIFT);
+        }
+      else
+        cranges->char_lists_types |= XCL_BEGIN_WITH_RANGE << tmp2;
+      }
+
+    PCRE2_ASSERT((uint32_t*)next_char >= dst + 2);
+
+    if (dst > buffer)
+      {
+      dst -= 2;
+      range_start = dst[0];
+      range_end = dst[1];
+      continue;
+      }
+
+    range_start = 0;
+    range_end = 0;
+    }
+
+  if (range_end >= char_list_start)
+    {
+    PCRE2_ASSERT(range_start < char_list_start);
+
+    if (range_end < char_list_end)
+      {
+      tmp1++;
+      next_char--;
+
+      if (char_list_start < XCL_CHAR_LIST_LOW_32_START)
+        *next_char = (uint16_t)((range_end << XCL_CHAR_SHIFT) | XCL_CHAR_END);
+      else
+        *(uint32_t*)(--next_char) =
+          (range_end << XCL_CHAR_SHIFT) | XCL_CHAR_END;
+
+      PCRE2_ASSERT((uint32_t*)next_char >= dst + 2);
+      }
+
+    cranges->char_lists_types |= XCL_BEGIN_WITH_RANGE << tmp2;
+    }
+
+  if (tmp1 >= XCL_ITEM_COUNT_MASK)
+    {
+    cranges->char_lists_types |= XCL_ITEM_COUNT_MASK << tmp2;
+    next_char--;
+
+    if (char_list_start < XCL_CHAR_LIST_LOW_32_START)
+      *next_char = (uint16_t)tmp1;
+    else
+      *(uint32_t*)(--next_char) = tmp1;
+    }
+  else
+    cranges->char_lists_types |= tmp1 << tmp2;
+
+  if (range_start < XCL_CHAR_LIST_LOW_16_START) break;
+
+  PCRE2_ASSERT(tmp2 >= XCL_TYPE_BIT_LEN);
+  char_list_end = char_list_start - 1;
+  char_list_start = *char_list_next++;
+  tmp1 = 0;
+  tmp2 -= XCL_TYPE_BIT_LEN;
+  }
+
+if (dst[0] < XCL_CHAR_LIST_LOW_16_START) dst += 2;
+PCRE2_ASSERT((uint16_t*)dst <= next_char);
+
+cranges->char_lists_size =
+  (size_t)((uint8_t*)(buffer + total_size) - (uint8_t*)next_char);
+cranges->char_lists_start = (size_t)((uint8_t*)next_char - (uint8_t*)buffer);
+cranges->range_list_size = (uint16_t)(dst - buffer);
+return cranges;
+}
+
+#endif /* SUPPORT_WIDE_CHARS */
+
+#ifdef SUPPORT_UNICODE
+
+void PRIV(update_classbits)(uint32_t ptype, uint32_t pdata, BOOL negated,
+  uint8_t *classbits)
+{
+/* Update PRIV(xclass) when this function is changed. */
+int c, chartype;
+const ucd_record *prop;
+uint32_t gentype;
+BOOL set_bit;
+
+if (ptype == PT_ANY)
+  {
+  if (!negated) memset(classbits, 0xff, 32);
+  return;
+  }
+
+for (c = 0; c < 256; c++)
+  {
+  prop = GET_UCD(c);
+  set_bit = FALSE;
+  (void)set_bit;
+
+  switch (ptype)
+    {
+    case PT_LAMP:
+    chartype = prop->chartype;
+    set_bit = (chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt);
+    break;
+
+    case PT_GC:
+    set_bit = (PRIV(ucp_gentype)[prop->chartype] == pdata);
+    break;
+
+    case PT_PC:
+    set_bit = (prop->chartype == pdata);
+    break;
+
+    case PT_SC:
+    set_bit = (prop->script == pdata);
+    break;
+
+    case PT_SCX:
+    set_bit = (prop->script == pdata ||
+      MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), pdata) != 0);
+    break;
+
+    case PT_ALNUM:
+    gentype = PRIV(ucp_gentype)[prop->chartype];
+    set_bit = (gentype == ucp_L || gentype == ucp_N);
+    break;
+
+    case PT_SPACE:    /* Perl space */
+    case PT_PXSPACE:  /* POSIX space */
+    switch(c)
+      {
+      HSPACE_BYTE_CASES:
+      VSPACE_BYTE_CASES:
+      set_bit = TRUE;
+      break;
+
+      default:
+      set_bit = (PRIV(ucp_gentype)[prop->chartype] == ucp_Z);
+      break;
+      }
+    break;
+
+    case PT_WORD:
+    chartype = prop->chartype;
+    gentype = PRIV(ucp_gentype)[chartype];
+    set_bit = (gentype == ucp_L || gentype == ucp_N ||
+               chartype == ucp_Mn || chartype == ucp_Pc);
+    break;
+
+    case PT_UCNC:
+    set_bit = (c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
+               c == CHAR_GRAVE_ACCENT || c >= 0xa0);
+    break;
+
+    case PT_BIDICL:
+    set_bit = (UCD_BIDICLASS_PROP(prop) == pdata);
+    break;
+
+    case PT_BOOL:
+    set_bit = MAPBIT(PRIV(ucd_boolprop_sets) +
+                     UCD_BPROPS_PROP(prop), pdata) != 0;
+    break;
+
+    case PT_PXGRAPH:
+    chartype = prop->chartype;
+    gentype = PRIV(ucp_gentype)[chartype];
+    set_bit = (gentype != ucp_Z && (gentype != ucp_C || chartype == ucp_Cf));
+    break;
+
+    case PT_PXPRINT:
+    chartype = prop->chartype;
+    set_bit = (chartype != ucp_Zl && chartype != ucp_Zp &&
+       (PRIV(ucp_gentype)[chartype] != ucp_C || chartype == ucp_Cf));
+    break;
+
+    case PT_PXPUNCT:
+    gentype = PRIV(ucp_gentype)[prop->chartype];
+    set_bit = (gentype == ucp_P || (c < 128 && gentype == ucp_S));
+    break;
+
+    default:
+    PCRE2_ASSERT(ptype == PT_PXXDIGIT);
+    set_bit = (c >= CHAR_0 && c <= CHAR_9) ||
+              (c >= CHAR_A && c <= CHAR_F) ||
+              (c >= CHAR_a && c <= CHAR_f);
+    break;
+    }
+
+  if (negated) set_bit = !set_bit;
+  if (set_bit) *classbits |= (uint8_t)(1 << (c & 0x7));
+  if ((c & 0x7) == 0x7) classbits++;
+  }
+}
+
+#endif /* SUPPORT_UNICODE */
+
+
+
+#ifdef SUPPORT_WIDE_CHARS
+
+/*************************************************
+*           XClass related properties            *
+*************************************************/
+
+/* XClass needs to be generated. */
+#define XCLASS_REQUIRED 0x1
+/* XClass has 8 bit character. */
+#define XCLASS_HAS_8BIT_CHARS 0x2
+/* XClass has properties. */
+#define XCLASS_HAS_PROPS 0x4
+/* XClass has character lists. */
+#define XCLASS_HAS_CHAR_LISTS 0x8
+/* XClass matches to all >= 256 characters. */
+#define XCLASS_HIGH_ANY 0x10
+
+#endif
+
+
+/*************************************************
+*   Internal entry point for add range to class  *
+*************************************************/
+
+/* This function sets the overall range for characters < 256.
+It also handles non-utf case folding.
+
+Arguments:
+  options       the options bits
+  xoptions      the extra options bits
+  cb            compile data
+  start         start of range character
+  end           end of range character
+
+Returns:        cb->classbits is updated
+*/
+
+static void
+add_to_class(uint32_t options, uint32_t xoptions, compile_block *cb,
+  uint32_t start, uint32_t end)
+{
+uint8_t *classbits = cb->classbits.classbits;
+uint32_t c, byte_start, byte_end;
+uint32_t classbits_end = (end <= 0xff ? end : 0xff);
+
+/* If caseless matching is required, scan the range and process alternate
+cases. In Unicode, there are 8-bit characters that have alternate cases that
+are greater than 255 and vice-versa (though these may be ignored if caseless
+restriction is in force). Sometimes we can just extend the original range. */
+
+if ((options & PCRE2_CASELESS) != 0)
+  {
+#ifdef SUPPORT_UNICODE
+  /* UTF mode. This branch is taken if we don't support wide characters (e.g.
+  8-bit library, without UTF), but we do treat those characters as Unicode
+  (if UCP flag is set). In this case, we only need to expand the character class
+  set to include the case pairs which are in the 0-255 codepoint range. */
+  if ((options & (PCRE2_UTF|PCRE2_UCP)) != 0)
+    {
+      BOOL turkish_i = (xoptions & (PCRE2_EXTRA_TURKISH_CASING|PCRE2_EXTRA_CASELESS_RESTRICT)) ==
+        PCRE2_EXTRA_TURKISH_CASING;
+      if (start < 128)
+        {
+        uint32_t lo_end = (classbits_end < 127 ? classbits_end : 127);
+        for (c = start; c <= lo_end; c++)
+          {
+          if (turkish_i && UCD_ANY_I(c)) continue;
+          SETBIT(classbits, cb->fcc[c]);
+          }
+        }
+      if (classbits_end >= 128)
+        {
+        uint32_t hi_start = (start > 128 ? start : 128);
+        for (c = hi_start; c <= classbits_end; c++)
+          {
+          uint32_t co = UCD_OTHERCASE(c);
+          if (co <= 0xff) SETBIT(classbits, co);
+          }
+        }
+    }
+
+  else
+#endif  /* SUPPORT_UNICODE */
+
+  /* Not UTF mode */
+    {
+    for (c = start; c <= classbits_end; c++)
+      SETBIT(classbits, cb->fcc[c]);
+    }
+  }
+
+/* Use the bitmap for characters < 256. Otherwise use extra data. */
+
+byte_start = (start + 7) >> 3;
+byte_end = (classbits_end + 1) >> 3;
+
+if (byte_start >= byte_end)
+  {
+  for (c = start; c <= classbits_end; c++)
+    /* Regardless of start, c will always be <= 255. */
+    SETBIT(classbits, c);
+  return;
+  }
+
+for (c = byte_start; c < byte_end; c++)
+  classbits[c] = 0xff;
+
+byte_start <<= 3;
+byte_end <<= 3;
+
+for (c = start; c < byte_start; c++)
+  SETBIT(classbits, c);
+
+for (c = byte_end; c <= classbits_end; c++)
+  SETBIT(classbits, c);
+}
+
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+/*************************************************
+*   Internal entry point for add list to class   *
+*************************************************/
+
+/* This function is used for adding a list of horizontal or vertical whitespace
+characters to a class. The list must be in order so that ranges of characters
+can be detected and handled appropriately. This function sets the overall range
+so that the internal functions can try to avoid duplication when handling
+case-independence.
+
+Arguments:
+  options       the options bits
+  xoptions      the extra options bits
+  cb            contains pointers to tables etc.
+  p             points to row of 32-bit values, terminated by NOTACHAR
+
+Returns:        cb->classbits is updated
+*/
+
+static void
+add_list_to_class(uint32_t options, uint32_t xoptions, compile_block *cb,
+  const uint32_t *p)
+{
+while (p[0] < 256)
+  {
+  unsigned int n = 0;
+
+  while(p[n+1] == p[0] + n + 1) n++;
+  add_to_class(options, xoptions, cb, p[0], p[n]);
+
+  p += n + 1;
+  }
+}
+
+
+
+/*************************************************
+*    Add characters not in a list to a class     *
+*************************************************/
+
+/* This function is used for adding the complement of a list of horizontal or
+vertical whitespace to a class. The list must be in order.
+
+Arguments:
+  options       the options bits
+  xoptions      the extra options bits
+  cb            contains pointers to tables etc.
+  p             points to row of 32-bit values, terminated by NOTACHAR
+
+Returns:        cb->classbits is updated
+*/
+
+static void
+add_not_list_to_class(uint32_t options, uint32_t xoptions, compile_block *cb,
+  const uint32_t *p)
+{
+if (p[0] > 0)
+  add_to_class(options, xoptions, cb, 0, p[0] - 1);
+while (p[0] < 256)
+  {
+  while (p[1] == p[0] + 1) p++;
+  add_to_class(options, xoptions, cb, p[0] + 1, (p[1] > 255) ? 255 : p[1] - 1);
+  p++;
+  }
+}
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
+
+
+
+/*************************************************
+*  Main entry-point to compile a character class *
+*************************************************/
+
+/* This function consumes a "leaf", which is a set of characters that will
+become a single OP_CLASS OP_NCLASS, OP_XCLASS, or OP_ALLANY. */
+
+uint32_t *
+PRIV(compile_class_not_nested)(uint32_t options, uint32_t xoptions,
+  uint32_t *start_ptr, PCRE2_UCHAR **pcode, BOOL negate_class, BOOL* has_bitmap,
+  int *errorcodeptr, compile_block *cb, PCRE2_SIZE *lengthptr)
+{
+uint32_t *pptr = start_ptr;
+PCRE2_UCHAR *code = *pcode;
+BOOL should_flip_negation;
+const uint8_t *cbits = cb->cbits;
+/* Some functions such as add_to_class() or eclass processing
+expects that the bitset is stored in cb->classbits.classbits. */
+uint8_t *const classbits = cb->classbits.classbits;
+
+#ifdef SUPPORT_UNICODE
+BOOL utf = (options & PCRE2_UTF) != 0;
+#else  /* No Unicode support */
+BOOL utf = FALSE;
+#endif
+
+/* Helper variables for OP_XCLASS opcode (for characters > 255). */
+
+#ifdef SUPPORT_WIDE_CHARS
+uint32_t xclass_props;
+PCRE2_UCHAR *class_uchardata;
+class_ranges* cranges;
+#endif
+
+/* If an XClass contains a negative special such as \S, we need to flip the
+negation flag at the end, so that support for characters > 255 works correctly
+(they are all included in the class). An XClass may need to insert specific
+matching or non-matching code for wide characters.
+*/
+
+should_flip_negation = FALSE;
+
+/* XClass will be used when characters > 255 might match. */
+
+#ifdef SUPPORT_WIDE_CHARS
+xclass_props = 0;
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+cranges = NULL;
+
+if (utf)
+#endif
+  {
+  if (lengthptr != NULL)
+    {
+    cranges = compile_optimize_class(pptr, options, xoptions, cb);
+
+    if (cranges == NULL)
+      {
+      *errorcodeptr = ERR21;
+      return NULL;
+      }
+
+    /* Caching the pre-processed character ranges. */
+    if (cb->next_cranges != NULL)
+      cb->next_cranges->next = cranges;
+    else
+      cb->cranges = cranges;
+
+    cb->next_cranges = cranges;
+    }
+  else
+    {
+    /* Reuse the pre-processed character ranges. */
+    cranges = cb->cranges;
+    PCRE2_ASSERT(cranges != NULL);
+    cb->cranges = cranges->next;
+    }
+
+  if (cranges->range_list_size > 0)
+    {
+    const uint32_t *ranges = (const uint32_t*)(cranges + 1);
+
+    if (ranges[0] <= 255)
+      xclass_props |= XCLASS_HAS_8BIT_CHARS;
+
+    if (ranges[cranges->range_list_size - 1] == GET_MAX_CHAR_VALUE(utf) &&
+        ranges[cranges->range_list_size - 2] <= 256)
+      xclass_props |= XCLASS_HIGH_ANY;
+    }
+  }
+
+class_uchardata = code + LINK_SIZE + 2;   /* For XCLASS items */
+#endif /* SUPPORT_WIDE_CHARS */
+
+/* Initialize the 256-bit (32-byte) bit map to all zeros. We build the map
+in a temporary bit of memory, in case the class contains fewer than two
+8-bit characters because in that case the compiled code doesn't use the bit
+map. */
+
+memset(classbits, 0, 32);
+
+/* Process items until end_ptr is reached. */
+
+while (TRUE)
+  {
+  uint32_t meta = *(pptr++);
+  BOOL local_negate;
+  int posix_class;
+  int taboffset, tabopt;
+  class_bits_storage pbits;
+  uint32_t escape, c;
+
+  /* Handle POSIX classes such as [:alpha:] etc. */
+  switch (META_CODE(meta))
+    {
+    case META_POSIX:
+    case META_POSIX_NEG:
+
+    local_negate = (meta == META_POSIX_NEG);
+    posix_class = *(pptr++);
+
+    if (local_negate) should_flip_negation = TRUE;  /* Note negative special */
+
+    /* If matching is caseless, upper and lower are converted to alpha.
+    This relies on the fact that the class table starts with alpha,
+    lower, upper as the first 3 entries. */
+
+    if ((options & PCRE2_CASELESS) != 0 && posix_class <= 2)
+      posix_class = 0;
+
+    /* When PCRE2_UCP is set, some of the POSIX classes are converted to
+    different escape sequences that use Unicode properties \p or \P.
+    Others that are not available via \p or \P have to generate
+    XCL_PROP/XCL_NOTPROP directly, which is done here. */
+
+#ifdef SUPPORT_UNICODE
+    /* TODO This entire block of code here appears to be unreachable!? I simply
+    can't see how it can be hit, given that the frontend parser doesn't emit
+    META_POSIX for GRAPH/PRINT/PUNCT when UCP is set. */
+    if ((options & PCRE2_UCP) != 0 &&
+        (xoptions & PCRE2_EXTRA_ASCII_POSIX) == 0)
+      {
+      uint32_t ptype;
+
+      switch(posix_class)
+        {
+        case PC_GRAPH:
+        case PC_PRINT:
+        case PC_PUNCT:
+        ptype = (posix_class == PC_GRAPH)? PT_PXGRAPH :
+                (posix_class == PC_PRINT)? PT_PXPRINT : PT_PXPUNCT;
+
+        PRIV(update_classbits)(ptype, 0, local_negate, classbits);
+
+        if ((xclass_props & XCLASS_HIGH_ANY) == 0)
+          {
+          if (lengthptr != NULL)
+            *lengthptr += 3;
+          else
+            {
+            *class_uchardata++ = local_negate? XCL_NOTPROP : XCL_PROP;
+            *class_uchardata++ = (PCRE2_UCHAR)ptype;
+            *class_uchardata++ = 0;
+            }
+          xclass_props |= XCLASS_REQUIRED | XCLASS_HAS_PROPS;
+          }
+        continue;
+
+        /* For the other POSIX classes (ex: ascii) we are going to
+        fall through to the non-UCP case and build a bit map for
+        characters with code points less than 256. However, if we are in
+        a negated POSIX class, characters with code points greater than
+        255 must either all match or all not match, depending on whether
+        the whole class is not or is negated. For example, for
+        [[:^ascii:]... they must all match, whereas for [^[:^ascii:]...
+        they must not.
+
+        In the special case where there are no xclass items, this is
+        automatically handled by the use of OP_CLASS or OP_NCLASS, but an
+        explicit range is needed for OP_XCLASS. Setting a flag here
+        causes the range to be generated later when it is known that
+        OP_XCLASS is required. In the 8-bit library this is relevant only in
+        utf mode, since no wide characters can exist otherwise. */
+
+        default:
+        break;
+        }
+      }
+#endif  /* SUPPORT_UNICODE */
+
+    /* In the non-UCP case, or when UCP makes no difference, we build the
+    bit map for the POSIX class in a chunk of local store because we may
+    be adding and subtracting from it, and we don't want to subtract bits
+    that may be in the main map already. At the end we or the result into
+    the bit map that is being built. */
+
+    posix_class *= 3;
+
+    /* Copy in the first table (always present) */
+
+    memcpy(pbits.classbits, cbits + PRIV(posix_class_maps)[posix_class], 32);
+
+    /* If there is a second table, add or remove it as required. */
+
+    taboffset = PRIV(posix_class_maps)[posix_class + 1];
+    tabopt = PRIV(posix_class_maps)[posix_class + 2];
+
+    if (taboffset >= 0)
+      {
+      if (tabopt >= 0)
+        for (int i = 0; i < 32; i++)
+          pbits.classbits[i] |= cbits[i + taboffset];
+      else
+        for (int i = 0; i < 32; i++)
+          pbits.classbits[i] &= (uint8_t)(~cbits[i + taboffset]);
+      }
+
+    /* Now see if we need to remove any special characters. An option
+    value of 1 removes vertical space and 2 removes underscore. */
+
+    if (tabopt < 0) tabopt = -tabopt;
+    if (tabopt == 1) pbits.classbits[1] &= ~0x3c;
+      else if (tabopt == 2) pbits.classbits[11] &= 0x7f;
+
+    /* Add the POSIX table or its complement into the main table that is
+    being built and we are done. */
+
+      {
+      uint32_t *classwords = cb->classbits.classwords;
+
+      if (local_negate)
+        for (int i = 0; i < 8; i++)
+          classwords[i] |= (uint32_t)(~pbits.classwords[i]);
+      else
+        for (int i = 0; i < 8; i++)
+          classwords[i] |= pbits.classwords[i];
+      }
+
+#ifdef SUPPORT_WIDE_CHARS
+    /* Every class contains at least one < 256 character. */
+    xclass_props |= XCLASS_HAS_8BIT_CHARS;
+#endif
+    continue;               /* End of POSIX handling */
+
+    /* Other than POSIX classes, the only items we should encounter are
+    \d-type escapes and literal characters (possibly as ranges). */
+    case META_BIGVALUE:
+    meta = *(pptr++);
+    break;
+
+    case META_ESCAPE:
+    escape = META_DATA(meta);
+
+    switch(escape)
+      {
+      case ESC_d:
+      for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_digit];
+      break;
+
+      case ESC_D:
+      should_flip_negation = TRUE;
+      for (int i = 0; i < 32; i++)
+        classbits[i] |= (uint8_t)(~cbits[i+cbit_digit]);
+      break;
+
+      case ESC_w:
+      for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_word];
+      break;
+
+      case ESC_W:
+      should_flip_negation = TRUE;
+      for (int i = 0; i < 32; i++)
+        classbits[i] |= (uint8_t)(~cbits[i+cbit_word]);
+      break;
+
+      /* Perl 5.004 onwards omitted VT from \s, but restored it at Perl
+      5.18. Before PCRE 8.34, we had to preserve the VT bit if it was
+      previously set by something earlier in the character class.
+      Luckily, the value of CHAR_VT is 0x0b in both ASCII and EBCDIC, so
+      we could just adjust the appropriate bit. From PCRE 8.34 we no
+      longer treat \s and \S specially. */
+
+      case ESC_s:
+      for (int i = 0; i < 32; i++) classbits[i] |= cbits[i+cbit_space];
+      break;
+
+      case ESC_S:
+      should_flip_negation = TRUE;
+      for (int i = 0; i < 32; i++)
+        classbits[i] |= (uint8_t)(~cbits[i+cbit_space]);
+      break;
+
+      /* When adding the horizontal or vertical space lists to a class, or
+      their complements, disable PCRE2_CASELESS, because it justs wastes
+      time, and in the "not-x" UTF cases can create unwanted duplicates in
+      the XCLASS list (provoked by characters that have more than one other
+      case and by both cases being in the same "not-x" sublist). */
+
+      case ESC_h:
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#ifdef SUPPORT_UNICODE
+      if (cranges != NULL) break;
+#endif
+      add_list_to_class(options & ~PCRE2_CASELESS, xoptions,
+        cb, PRIV(hspace_list));
+#else
+      PCRE2_ASSERT(cranges != NULL);
+#endif
+      break;
+
+      case ESC_H:
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#ifdef SUPPORT_UNICODE
+      if (cranges != NULL) break;
+#endif
+      add_not_list_to_class(options & ~PCRE2_CASELESS, xoptions,
+        cb, PRIV(hspace_list));
+#else
+      PCRE2_ASSERT(cranges != NULL);
+#endif
+      break;
+
+      case ESC_v:
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#ifdef SUPPORT_UNICODE
+      if (cranges != NULL) break;
+#endif
+      add_list_to_class(options & ~PCRE2_CASELESS, xoptions,
+        cb, PRIV(vspace_list));
+#else
+      PCRE2_ASSERT(cranges != NULL);
+#endif
+      break;
+
+      case ESC_V:
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#ifdef SUPPORT_UNICODE
+      if (cranges != NULL) break;
+#endif
+      add_not_list_to_class(options & ~PCRE2_CASELESS, xoptions,
+        cb, PRIV(vspace_list));
+#else
+      PCRE2_ASSERT(cranges != NULL);
+#endif
+      break;
+
+      /* If Unicode is not supported, \P and \p are not allowed and are
+      faulted at parse time, so will never appear here. */
+
+#ifdef SUPPORT_UNICODE
+      case ESC_p:
+      case ESC_P:
+        {
+        uint32_t ptype = *pptr >> 16;
+        uint32_t pdata = *(pptr++) & 0xffff;
+
+        /* The "Any" is processed by PRIV(update_classbits)(). */
+        if (ptype == PT_ANY)
+          {
+#if PCRE2_CODE_UNIT_WIDTH == 8
+          if (!utf && escape == ESC_p) memset(classbits, 0xff, 32);
+#endif
+          continue;
+          }
+
+        PRIV(update_classbits)(ptype, pdata, (escape == ESC_P), classbits);
+
+        if ((xclass_props & XCLASS_HIGH_ANY) == 0)
+          {
+          if (lengthptr != NULL)
+            *lengthptr += 3;
+          else
+            {
+            *class_uchardata++ = (escape == ESC_p)? XCL_PROP : XCL_NOTPROP;
+            *class_uchardata++ = ptype;
+            *class_uchardata++ = pdata;
+            }
+          xclass_props |= XCLASS_REQUIRED | XCLASS_HAS_PROPS;
+          }
+        }
+      continue;
+#endif
+      }
+
+#ifdef SUPPORT_WIDE_CHARS
+    /* Every non-property class contains at least one < 256 character. */
+    xclass_props |= XCLASS_HAS_8BIT_CHARS;
+#endif
+    /* End handling \d-type escapes */
+    continue;
+
+    CLASS_END_CASES(meta)
+    /* Literals. */
+    if (meta < META_END) break;
+    /* Non-literals: end of class contents. */
+    goto END_PROCESSING;
+    }
+
+  /* A literal character may be followed by a range meta. At parse time
+  there are checks for out-of-order characters, for ranges where the two
+  characters are equal, and for hyphens that cannot indicate a range. At
+  this point, therefore, no checking is needed. */
+
+  c = meta;
+
+  /* Remember if \r or \n were explicitly used */
+
+  if (c == CHAR_CR || c == CHAR_NL) cb->external_flags |= PCRE2_HASCRORLF;
+
+  /* Process a character range */
+
+  if (*pptr == META_RANGE_LITERAL || *pptr == META_RANGE_ESCAPED)
+    {
+    uint32_t d;
+
+#ifdef EBCDIC
+    BOOL range_is_literal = (*pptr == META_RANGE_LITERAL);
+#endif
+    ++pptr;
+    d = *(pptr++);
+    if (d == META_BIGVALUE) d = *(pptr++);
+
+    /* Remember an explicit \r or \n, and add the range to the class. */
+
+    if (d == CHAR_CR || d == CHAR_NL) cb->external_flags |= PCRE2_HASCRORLF;
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#ifdef SUPPORT_UNICODE
+    if (cranges != NULL) continue;
+    xclass_props |= XCLASS_HAS_8BIT_CHARS;
+#endif
+
+    /* In an EBCDIC environment, Perl treats alphabetic ranges specially
+    because there are holes in the encoding, and simply using the range
+    A-Z (for example) would include the characters in the holes. This
+    applies only to literal ranges; [\xC1-\xE9] is different to [A-Z]. */
+
+#ifdef EBCDIC
+    if (range_is_literal &&
+         (cb->ctypes[c] & ctype_letter) != 0 &&
+         (cb->ctypes[d] & ctype_letter) != 0 &&
+         (c <= CHAR_z) == (d <= CHAR_z))
+      {
+      uint32_t uc = (d <= CHAR_z)? 0 : 64;
+      uint32_t C = c - uc;
+      uint32_t D = d - uc;
+
+      if (C <= CHAR_i)
+        {
+        add_to_class(options, xoptions, cb, C + uc,
+          ((D < CHAR_i)? D : CHAR_i) + uc);
+        C = CHAR_j;
+        }
+
+      if (C <= D && C <= CHAR_r)
+        {
+        add_to_class(options, xoptions, cb, C + uc,
+          ((D < CHAR_r)? D : CHAR_r) + uc);
+        C = CHAR_s;
+        }
+
+      if (C <= D)
+        add_to_class(options, xoptions, cb, C + uc, D + uc);
+      }
+    else
+#endif
+    /* Not an EBCDIC special range */
+
+    add_to_class(options, xoptions, cb, c, d);
+#else
+    PCRE2_ASSERT(cranges != NULL);
+#endif
+    continue;
+    }  /* End of range handling */
+
+  /* Character ranges are ignored when class_ranges is present. */
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#ifdef SUPPORT_UNICODE
+  if (cranges != NULL) continue;
+  xclass_props |= XCLASS_HAS_8BIT_CHARS;
+#endif
+  /* Handle a single character. */
+
+  add_to_class(options, xoptions, cb, meta, meta);
+#else
+  PCRE2_ASSERT(cranges != NULL);
+#endif
+  }   /* End of main class-processing loop */
+
+END_PROCESSING:
+
+#ifdef SUPPORT_WIDE_CHARS
+PCRE2_ASSERT((xclass_props & XCLASS_HAS_PROPS) == 0 ||
+             (xclass_props & XCLASS_HIGH_ANY) == 0);
+
+if (cranges != NULL)
+  {
+  uint32_t *range = (uint32_t*)(cranges + 1);
+  uint32_t *end = range + cranges->range_list_size;
+
+  while (range < end && range[0] < 256)
+    {
+    PCRE2_ASSERT((xclass_props & XCLASS_HAS_8BIT_CHARS) != 0);
+    /* Add range to bitset. If we are in UTF or UCP mode, then clear the
+    caseless bit, because the cranges handle caselessness (only) in this
+    condition; see the condition for PARSE_CLASS_CASELESS_UTF in
+    compile_optimize_class(). */
+    add_to_class(((options & (PCRE2_UTF|PCRE2_UCP)) != 0)?
+        (options & ~PCRE2_CASELESS) : options, xoptions, cb, range[0], range[1]);
+
+    if (range[1] > 255) break;
+    range += 2;
+    }
+
+  if (cranges->char_lists_size > 0)
+    {
+    /* The cranges structure is still used and freed later. */
+    PCRE2_ASSERT((xclass_props & XCLASS_HIGH_ANY) == 0);
+    xclass_props |= XCLASS_REQUIRED | XCLASS_HAS_CHAR_LISTS;
+    }
+  else
+    {
+    if ((xclass_props & XCLASS_HIGH_ANY) != 0)
+      {
+      PCRE2_ASSERT(range + 2 == end && range[0] <= 256 &&
+        range[1] >= GET_MAX_CHAR_VALUE(utf));
+      should_flip_negation = TRUE;
+      range = end;
+      }
+
+    while (range < end)
+      {
+      uint32_t range_start = range[0];
+      uint32_t range_end = range[1];
+
+      range += 2;
+      xclass_props |= XCLASS_REQUIRED;
+
+      if (range_start < 256) range_start = 256;
+
+      if (lengthptr != NULL)
+        {
+#ifdef SUPPORT_UNICODE
+        if (utf)
+          {
+          *lengthptr += 1;
+
+          if (range_start < range_end)
+            *lengthptr += PRIV(ord2utf)(range_start, class_uchardata);
+
+          *lengthptr += PRIV(ord2utf)(range_end, class_uchardata);
+          continue;
+          }
+#endif  /* SUPPORT_UNICODE */
+
+        *lengthptr += range_start < range_end ? 3 : 2;
+        continue;
+        }
+
+#ifdef SUPPORT_UNICODE
+      if (utf)
+        {
+        if (range_start < range_end)
+          {
+          *class_uchardata++ = XCL_RANGE;
+          class_uchardata += PRIV(ord2utf)(range_start, class_uchardata);
+          }
+        else
+          *class_uchardata++ = XCL_SINGLE;
+
+        class_uchardata += PRIV(ord2utf)(range_end, class_uchardata);
+        continue;
+        }
+#endif  /* SUPPORT_UNICODE */
+
+      /* Without UTF support, character values are constrained
+      by the bit length, and can only be > 256 for 16-bit and
+      32-bit libraries. */
+#if PCRE2_CODE_UNIT_WIDTH != 8
+      if (range_start < range_end)
+        {
+        *class_uchardata++ = XCL_RANGE;
+        *class_uchardata++ = range_start;
+        }
+      else
+        *class_uchardata++ = XCL_SINGLE;
+
+      *class_uchardata++ = range_end;
+#endif  /* PCRE2_CODE_UNIT_WIDTH == 8 */
+      }
+
+    if (lengthptr == NULL)
+      cb->cx->memctl.free(cranges, cb->cx->memctl.memory_data);
+    }
+  }
+#endif /* SUPPORT_WIDE_CHARS */
+
+/* If there are characters with values > 255, or Unicode property settings
+(\p or \P), we have to compile an extended class, with its own opcode,
+unless there were no property settings and there was a negated special such
+as \S in the class, and PCRE2_UCP is not set, because in that case all
+characters > 255 are in or not in the class, so any that were explicitly
+given as well can be ignored.
+
+In the UCP case, if certain negated POSIX classes (ex: [:^ascii:]) were
+were present in a class, we either have to match or not match all wide
+characters (depending on whether the whole class is or is not negated).
+This requirement is indicated by match_all_or_no_wide_chars being true.
+We do this by including an explicit range, which works in both cases.
+This applies only in UTF and 16-bit and 32-bit non-UTF modes, since there
+cannot be any wide characters in 8-bit non-UTF mode.
+
+When there *are* properties in a positive UTF-8 or any 16-bit or 32_bit
+class where \S etc is present without PCRE2_UCP, causing an extended class
+to be compiled, we make sure that all characters > 255 are included by
+forcing match_all_or_no_wide_chars to be true.
+
+If, when generating an xclass, there are no characters < 256, we can omit
+the bitmap in the actual compiled code. */
+
+#ifdef SUPPORT_WIDE_CHARS  /* Defined for 16/32 bits, or 8-bit with Unicode */
+if ((xclass_props & XCLASS_REQUIRED) != 0)
+  {
+  PCRE2_UCHAR *previous = code;
+
+  if ((xclass_props & XCLASS_HAS_CHAR_LISTS) == 0)
+    *class_uchardata++ = XCL_END;    /* Marks the end of extra data */
+  *code++ = OP_XCLASS;
+  code += LINK_SIZE;
+  *code = negate_class? XCL_NOT:0;
+  if ((xclass_props & XCLASS_HAS_PROPS) != 0) *code |= XCL_HASPROP;
+
+  /* If the map is required, move up the extra data to make room for it;
+  otherwise just move the code pointer to the end of the extra data. */
+
+  if ((xclass_props & XCLASS_HAS_8BIT_CHARS) != 0 || has_bitmap != NULL)
+    {
+    if (negate_class)
+      {
+      uint32_t *classwords = cb->classbits.classwords;
+      for (int i = 0; i < 8; i++) classwords[i] = ~classwords[i];
+      }
+
+    if (has_bitmap == NULL)
+      {
+      *code++ |= XCL_MAP;
+      (void)memmove(code + (32 / sizeof(PCRE2_UCHAR)), code,
+        CU2BYTES(class_uchardata - code));
+      memcpy(code, classbits, 32);
+      code = class_uchardata + (32 / sizeof(PCRE2_UCHAR));
+      }
+    else
+      {
+      code = class_uchardata;
+      if ((xclass_props & XCLASS_HAS_8BIT_CHARS) != 0)
+        *has_bitmap = TRUE;
+      }
+    }
+  else code = class_uchardata;
+
+  if ((xclass_props & XCLASS_HAS_CHAR_LISTS) != 0)
+    {
+    /* Char lists size is an even number, because all items are 16 or 32
+    bit values. The character list data is always aligned to 32 bits. */
+    size_t char_lists_size = cranges->char_lists_size;
+    PCRE2_ASSERT((char_lists_size & 0x1) == 0 &&
+                 (cb->char_lists_size & 0x3) == 0);
+
+    if (lengthptr != NULL)
+      {
+      char_lists_size = CLIST_ALIGN_TO(char_lists_size, sizeof(uint32_t));
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      *lengthptr += 2 + LINK_SIZE;
+#else
+      *lengthptr += 1 + LINK_SIZE;
+#endif
+
+      cb->char_lists_size += char_lists_size;
+
+      char_lists_size /= sizeof(PCRE2_UCHAR);
+
+      /* Storage space for character lists is included
+      in the maximum pattern size. */
+      if (*lengthptr > MAX_PATTERN_SIZE ||
+          MAX_PATTERN_SIZE - *lengthptr < char_lists_size)
+        {
+        *errorcodeptr = ERR20;   /* Pattern is too large */
+        return NULL;
+        }
+      }
+    else
+      {
+      uint8_t *data;
+
+      PCRE2_ASSERT(cranges->char_lists_types <= XCL_TYPE_MASK);
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      /* Encode as high / low bytes. */
+      code[0] = (uint8_t)(XCL_LIST |
+        (cranges->char_lists_types >> 8));
+      code[1] = (uint8_t)cranges->char_lists_types;
+      code += 2;
+#else
+      *code++ = (PCRE2_UCHAR)(XCL_LIST | cranges->char_lists_types);
+#endif
+
+      /* Character lists are stored in backwards direction from
+      byte code start. The non-dfa/dfa matchers can access these
+      lists using the byte code start stored in match blocks.
+      Each list is aligned to 32 bit with an optional unused
+      16 bit value at the beginning of the character list. */
+
+      cb->char_lists_size += char_lists_size;
+      data = (uint8_t*)cb->start_code - cb->char_lists_size;
+
+      memcpy(data, (uint8_t*)(cranges + 1) + cranges->char_lists_start,
+        char_lists_size);
+
+      /* Since character lists total size is less than MAX_PATTERN_SIZE,
+      their starting offset fits into a value which size is LINK_SIZE. */
+
+      char_lists_size = cb->char_lists_size;
+      PUT(code, 0, (uint32_t)(char_lists_size >> 1));
+      code += LINK_SIZE;
+
+#if defined PCRE2_DEBUG || defined SUPPORT_VALGRIND
+      if ((char_lists_size & 0x2) != 0)
+        {
+        /* In debug the unused 16 bit value is set
+        to a fixed value and marked unused. */
+        ((uint16_t*)data)[-1] = 0x5555;
+#ifdef SUPPORT_VALGRIND
+        VALGRIND_MAKE_MEM_NOACCESS(data - 2, 2);
+#endif
+        }
+#endif
+
+      cb->char_lists_size =
+        CLIST_ALIGN_TO(char_lists_size, sizeof(uint32_t));
+
+      cb->cx->memctl.free(cranges, cb->cx->memctl.memory_data);
+      }
+    }
+
+  /* Now fill in the complete length of the item */
+
+  PUT(previous, 1, (int)(code - previous));
+  goto DONE;   /* End of class handling */
+  }
+#endif  /* SUPPORT_WIDE_CHARS */
+
+/* If there are no characters > 255, or they are all to be included or
+excluded, set the opcode to OP_CLASS or OP_NCLASS, depending on whether the
+whole class was negated and whether there were negative specials such as \S
+(non-UCP) in the class. Then copy the 32-byte map into the code vector,
+negating it if necessary. */
+
+if (negate_class)
+  {
+  uint32_t *classwords = cb->classbits.classwords;
+
+  for (int i = 0; i < 8; i++) classwords[i] = ~classwords[i];
+  }
+
+if ((SELECT_VALUE8(!utf, 0) || negate_class != should_flip_negation) &&
+    cb->classbits.classwords[0] == ~(uint32_t)0)
+  {
+  const uint32_t *classwords = cb->classbits.classwords;
+  int i;
+
+  for (i = 0; i < 8; i++)
+    if (classwords[i] != ~(uint32_t)0) break;
+
+  if (i == 8)
+    {
+    *code++ = OP_ALLANY;
+    goto DONE;   /* End of class handling */
+    }
+  }
+
+*code++ = (negate_class == should_flip_negation) ? OP_CLASS : OP_NCLASS;
+memcpy(code, classbits, 32);
+code += 32 / sizeof(PCRE2_UCHAR);
+
+DONE:
+*pcode = code;
+return pptr - 1;
+}
+
+
+
+/* ===================================================================*/
+/* Here follows a block of ECLASS-compiling functions. You may well want to
+read them from top to bottom; they are ordered from leafmost (at the top) to
+outermost parser (at the bottom of the file). */
+
+/* This function folds one operand using the negation operator.
+The new, combined chunk of stack code is written out to *pop_info. */
+
+static void
+fold_negation(eclass_op_info *pop_info, PCRE2_SIZE *lengthptr,
+  BOOL preserve_classbits)
+{
+/* If the chunk of stack code is already composed of multiple ops, we won't
+descend in and try and propagate the negation down the tree. (That would lead
+to O(n^2) compile-time, which could be exploitable with a malicious regex -
+although maybe that's not really too much of a worry in a library that offers
+an exponential-time matching function!) */
+
+if (pop_info->op_single_type == 0)
+  {
+  if (lengthptr != NULL)
+    *lengthptr += 1;
+  else
+    pop_info->code_start[pop_info->length] = ECL_NOT;
+  pop_info->length += 1;
+  }
+
+/* Otherwise, it's a nice single-op item, so we can easily fold in the negation
+without needing to produce an ECL_NOT. */
+
+else if (pop_info->op_single_type == ECL_ANY ||
+         pop_info->op_single_type == ECL_NONE)
+  {
+  pop_info->op_single_type = (pop_info->op_single_type == ECL_NONE)?
+      ECL_ANY : ECL_NONE;
+  if (lengthptr == NULL)
+    *(pop_info->code_start) = pop_info->op_single_type;
+  }
+else
+  {
+  PCRE2_ASSERT(pop_info->op_single_type == ECL_XCLASS &&
+               pop_info->length >= 1 + LINK_SIZE + 1);
+  if (lengthptr == NULL)
+    pop_info->code_start[1 + LINK_SIZE] ^= XCL_NOT;
+  }
+
+if (!preserve_classbits)
+  {
+  for (int i = 0; i < 8; i++)
+    pop_info->bits.classwords[i] = ~pop_info->bits.classwords[i];
+  }
+}
+
+
+
+/* This function folds together two operands using a binary operator.
+The new, combined chunk of stack code is written out to *lhs_op_info. */
+
+static void
+fold_binary(int op, eclass_op_info *lhs_op_info, eclass_op_info *rhs_op_info,
+  PCRE2_SIZE *lengthptr)
+{
+switch (op)
+  {
+  /* ECL_AND truth table:
+
+     LHS  RHS  RESULT
+     ----------------
+     ANY  *    RHS
+     *    ANY  LHS
+     NONE *    NONE
+     *    NONE NONE
+     X    Y    X & Y
+  */
+
+  case ECL_AND:
+  if (rhs_op_info->op_single_type == ECL_ANY)
+    {
+    /* no-op: drop the RHS */
+    }
+  else if (lhs_op_info->op_single_type == ECL_ANY)
+    {
+    /* no-op: drop the LHS, and memmove the RHS into its place */
+    if (lengthptr == NULL)
+      memmove(lhs_op_info->code_start, rhs_op_info->code_start,
+              CU2BYTES(rhs_op_info->length));
+    lhs_op_info->length = rhs_op_info->length;
+    lhs_op_info->op_single_type = rhs_op_info->op_single_type;
+    }
+  else if (rhs_op_info->op_single_type == ECL_NONE)
+    {
+    /* the result is ECL_NONE: write into the LHS */
+    if (lengthptr == NULL)
+      lhs_op_info->code_start[0] = ECL_NONE;
+    lhs_op_info->length = 1;
+    lhs_op_info->op_single_type = ECL_NONE;
+    }
+  else if (lhs_op_info->op_single_type == ECL_NONE)
+    {
+    /* the result is ECL_NONE: drop the RHS */
+    }
+  else
+    {
+    /* Both of LHS & RHS are either ECL_XCLASS, or compound operations. */
+    if (lengthptr != NULL)
+      *lengthptr += 1;
+    else
+      {
+      PCRE2_ASSERT(rhs_op_info->code_start ==
+          lhs_op_info->code_start + lhs_op_info->length);
+      rhs_op_info->code_start[rhs_op_info->length] = ECL_AND;
+      }
+    lhs_op_info->length += rhs_op_info->length + 1;
+    lhs_op_info->op_single_type = 0;
+    }
+
+  for (int i = 0; i < 8; i++)
+    lhs_op_info->bits.classwords[i] &= rhs_op_info->bits.classwords[i];
+  break;
+
+  /* ECL_OR truth table:
+
+     LHS  RHS  RESULT
+     ----------------
+     ANY  *    ANY
+     *    ANY  ANY
+     NONE *    RHS
+     *    NONE LHS
+     X    Y    X | Y
+  */
+
+  case ECL_OR:
+  if (rhs_op_info->op_single_type == ECL_NONE)
+    {
+    /* no-op: drop the RHS */
+    }
+  else if (lhs_op_info->op_single_type == ECL_NONE)
+    {
+    /* no-op: drop the LHS, and memmove the RHS into its place */
+    if (lengthptr == NULL)
+      memmove(lhs_op_info->code_start, rhs_op_info->code_start,
+              CU2BYTES(rhs_op_info->length));
+    lhs_op_info->length = rhs_op_info->length;
+    lhs_op_info->op_single_type = rhs_op_info->op_single_type;
+    }
+  else if (rhs_op_info->op_single_type == ECL_ANY)
+    {
+    /* the result is ECL_ANY: write into the LHS */
+    if (lengthptr == NULL)
+      lhs_op_info->code_start[0] = ECL_ANY;
+    lhs_op_info->length = 1;
+    lhs_op_info->op_single_type = ECL_ANY;
+    }
+  else if (lhs_op_info->op_single_type == ECL_ANY)
+    {
+    /* the result is ECL_ANY: drop the RHS */
+    }
+  else
+    {
+    /* Both of LHS & RHS are either ECL_XCLASS, or compound operations. */
+    if (lengthptr != NULL)
+      *lengthptr += 1;
+    else
+      {
+      PCRE2_ASSERT(rhs_op_info->code_start ==
+          lhs_op_info->code_start + lhs_op_info->length);
+      rhs_op_info->code_start[rhs_op_info->length] = ECL_OR;
+      }
+    lhs_op_info->length += rhs_op_info->length + 1;
+    lhs_op_info->op_single_type = 0;
+    }
+
+  for (int i = 0; i < 8; i++)
+    lhs_op_info->bits.classwords[i] |= rhs_op_info->bits.classwords[i];
+  break;
+
+  /* ECL_XOR truth table:
+
+     LHS  RHS  RESULT
+     ----------------
+     ANY  *    !RHS
+     *    ANY  !LHS
+     NONE *    RHS
+     *    NONE LHS
+     X    Y    X ^ Y
+  */
+
+  case ECL_XOR:
+  if (rhs_op_info->op_single_type == ECL_NONE)
+    {
+    /* no-op: drop the RHS */
+    }
+  else if (lhs_op_info->op_single_type == ECL_NONE)
+    {
+    /* no-op: drop the LHS, and memmove the RHS into its place */
+    if (lengthptr == NULL)
+      memmove(lhs_op_info->code_start, rhs_op_info->code_start,
+              CU2BYTES(rhs_op_info->length));
+    lhs_op_info->length = rhs_op_info->length;
+    lhs_op_info->op_single_type = rhs_op_info->op_single_type;
+    }
+  else if (rhs_op_info->op_single_type == ECL_ANY)
+    {
+    /* the result is !LHS: fold in the negation, and drop the RHS */
+    /* Preserve the classbits, because we promise to deal with them later. */
+    fold_negation(lhs_op_info, lengthptr, TRUE);
+    }
+  else if (lhs_op_info->op_single_type == ECL_ANY)
+    {
+    /* the result is !RHS: drop the LHS, memmove the RHS into its place, and
+    fold in the negation */
+    if (lengthptr == NULL)
+      memmove(lhs_op_info->code_start, rhs_op_info->code_start,
+              CU2BYTES(rhs_op_info->length));
+    lhs_op_info->length = rhs_op_info->length;
+    lhs_op_info->op_single_type = rhs_op_info->op_single_type;
+
+    /* Preserve the classbits, because we promise to deal with them later. */
+    fold_negation(lhs_op_info, lengthptr, TRUE);
+    }
+  else
+    {
+    /* Both of LHS & RHS are either ECL_XCLASS, or compound operations. */
+    if (lengthptr != NULL)
+      *lengthptr += 1;
+    else
+      {
+      PCRE2_ASSERT(rhs_op_info->code_start ==
+          lhs_op_info->code_start + lhs_op_info->length);
+      rhs_op_info->code_start[rhs_op_info->length] = ECL_XOR;
+      }
+    lhs_op_info->length += rhs_op_info->length + 1;
+    lhs_op_info->op_single_type = 0;
+    }
+
+  for (int i = 0; i < 8; i++)
+    lhs_op_info->bits.classwords[i] ^= rhs_op_info->bits.classwords[i];
+  break;
+
+  default:
+  PCRE2_DEBUG_UNREACHABLE();
+  break;
+  }
+}
+
+
+
+static BOOL
+compile_eclass_nested(eclass_context *context, BOOL negated,
+  uint32_t **pptr, PCRE2_UCHAR **pcode,
+  eclass_op_info *pop_info, PCRE2_SIZE *lengthptr);
+
+/* This function consumes a group of implicitly-unioned class elements.
+These can be characters, ranges, properties, or nested classes, as long
+as they are all joined by being placed adjacently. */
+
+static BOOL
+compile_class_operand(eclass_context *context, BOOL negated,
+  uint32_t **pptr, PCRE2_UCHAR **pcode, eclass_op_info *pop_info,
+  PCRE2_SIZE *lengthptr)
+{
+uint32_t *ptr = *pptr;
+uint32_t *prev_ptr;
+PCRE2_UCHAR *code = *pcode;
+PCRE2_UCHAR *code_start = code;
+PCRE2_SIZE prev_length = (lengthptr != NULL)? *lengthptr : 0;
+PCRE2_SIZE extra_length;
+uint32_t meta = META_CODE(*ptr);
+
+switch (meta)
+  {
+  case META_CLASS_EMPTY_NOT:
+  case META_CLASS_EMPTY:
+  ++ptr;
+  pop_info->length = 1;
+  if ((meta == META_CLASS_EMPTY) == negated)
+    {
+    *code++ = pop_info->op_single_type = ECL_ANY;
+    memset(pop_info->bits.classbits, 0xff, 32);
+    }
+  else
+    {
+    *code++ = pop_info->op_single_type = ECL_NONE;
+    memset(pop_info->bits.classbits, 0, 32);
+    }
+  break;
+
+  case META_CLASS:
+  case META_CLASS_NOT:
+  if ((*ptr & CLASS_IS_ECLASS) != 0)
+    {
+    if (!compile_eclass_nested(context, negated, &ptr, &code,
+                               pop_info, lengthptr))
+      return FALSE;
+
+    PCRE2_ASSERT(*ptr == META_CLASS_END);
+    ptr++;
+    goto DONE;
+    }
+
+  ptr++;
+  /* Fall through */
+
+  default:
+  /* Scan forward characters, ranges, and properties.
+  For example: inside [a-z_ -- m] we don't have brackets around "a-z_" but
+  we still need to collect that fragment up into a "leaf" OP_CLASS. */
+
+  prev_ptr = ptr;
+  ptr = PRIV(compile_class_not_nested)(
+    context->options, context->xoptions, ptr, &code,
+    (meta != META_CLASS_NOT) == negated, &context->needs_bitmap,
+    context->errorcodeptr, context->cb, lengthptr);
+  if (ptr == NULL) return FALSE;
+
+  /* We must have a 100% guarantee that ptr increases when
+  compile_class_operand() returns, even on Release builds, so that we can
+  statically prove our loops terminate. */
+  if (ptr <= prev_ptr)
+    {
+    PCRE2_DEBUG_UNREACHABLE();
+    return FALSE;
+    }
+
+  /* If we fell through above, consume the closing ']'. */
+  if (meta == META_CLASS || meta == META_CLASS_NOT)
+    {
+    PCRE2_ASSERT(*ptr == META_CLASS_END);
+    ptr++;
+    }
+
+  /* Regardless of whether (lengthptr == NULL), some data will still be written
+  out to *pcode, which we need: we have to peek at it, to transform the opcode
+  into the ECLASS version (since we need to hoist up the bitmaps). */
+  PCRE2_ASSERT(code > code_start);
+  extra_length = (lengthptr != NULL)? *lengthptr - prev_length : 0;
+
+  /* Easiest case: convert OP_ALLANY to ECL_ANY */
+
+  if (*code_start == OP_ALLANY)
+    {
+    PCRE2_ASSERT(code - code_start == 1 && extra_length == 0);
+    pop_info->length = 1;
+    *code_start = pop_info->op_single_type = ECL_ANY;
+    memset(pop_info->bits.classbits, 0xff, 32);
+    }
+
+  /* For OP_CLASS and OP_NCLASS, we hoist out the bitmap and convert to
+  ECL_NONE / ECL_ANY respectively. */
+
+  else if (*code_start == OP_CLASS || *code_start == OP_NCLASS)
+    {
+    PCRE2_ASSERT(code - code_start == 1 + 32 / sizeof(PCRE2_UCHAR) &&
+                 extra_length == 0);
+    pop_info->length = 1;
+    *code_start = pop_info->op_single_type =
+        (*code_start == OP_CLASS)? ECL_NONE : ECL_ANY;
+    memcpy(pop_info->bits.classbits, code_start + 1, 32);
+    /* Rewind the code pointer, but make sure we adjust *lengthptr, because we
+    do need to reserve that space (even though we only use it temporarily). */
+    if (lengthptr != NULL)
+      *lengthptr += code - (code_start + 1);
+    code = code_start + 1;
+
+    if (!context->needs_bitmap && *code_start == ECL_NONE)
+      {
+      uint32_t *classwords = pop_info->bits.classwords;
+
+      for (int i = 0; i < 8; i++)
+        if (classwords[i] != 0)
+          {
+          context->needs_bitmap = TRUE;
+          break;
+          }
+      }
+    else
+      context->needs_bitmap = TRUE;
+    }
+
+  /* Finally, for OP_XCLASS we hoist out the bitmap (if any), and convert to
+  ECL_XCLASS. */
+
+  else
+    {
+    PCRE2_ASSERT(*code_start == OP_XCLASS);
+    *code_start = pop_info->op_single_type = ECL_XCLASS;
+
+    PCRE2_ASSERT(code - code_start >= 1 + LINK_SIZE + 1);
+
+    memcpy(pop_info->bits.classbits, context->cb->classbits.classbits, 32);
+    pop_info->length = (code - code_start) + extra_length;
+    }
+
+  break;
+  }  /* End of switch(meta) */
+
+pop_info->code_start = (lengthptr == NULL)? code_start : NULL;
+
+if (lengthptr != NULL)
+  {
+  *lengthptr += code - code_start;
+  code = code_start;
+  }
+
+DONE:
+PCRE2_ASSERT(lengthptr == NULL || (code == code_start));
+
+*pptr = ptr;
+*pcode = code;
+return TRUE;
+}
+
+
+
+/* This function consumes a group of implicitly-unioned class elements.
+These can be characters, ranges, properties, or nested classes, as long
+as they are all joined by being placed adjacently. */
+
+static BOOL
+compile_class_juxtaposition(eclass_context *context, BOOL negated,
+  uint32_t **pptr, PCRE2_UCHAR **pcode, eclass_op_info *pop_info,
+  PCRE2_SIZE *lengthptr)
+{
+uint32_t *ptr = *pptr;
+PCRE2_UCHAR *code = *pcode;
+#ifdef PCRE2_DEBUG
+PCRE2_UCHAR *start_code = *pcode;
+#endif
+
+/* See compile_class_binary_loose() for comments on compile-time folding of
+the "negated" flag. */
+
+/* Because it's a non-empty class, there must be an operand at the start. */
+if (!compile_class_operand(context, negated, &ptr, &code, pop_info, lengthptr))
+  return FALSE;
+
+while (*ptr != META_CLASS_END &&
+       !(*ptr >= META_ECLASS_AND && *ptr <= META_ECLASS_NOT))
+  {
+  uint32_t op;
+  BOOL rhs_negated;
+  eclass_op_info rhs_op_info;
+
+  if (negated)
+    {
+    /* !(A juxtapose B)  ->  !A && !B */
+    op = ECL_AND;
+    rhs_negated = TRUE;
+    }
+  else
+    {
+    /* A juxtapose B  ->  A || B */
+    op = ECL_OR;
+    rhs_negated = FALSE;
+    }
+
+  /* An operand must follow the operator. */
+  if (!compile_class_operand(context, rhs_negated, &ptr, &code,
+                             &rhs_op_info, lengthptr))
+    return FALSE;
+
+  /* Convert infix to postfix (RPN). */
+  fold_binary(op, pop_info, &rhs_op_info, lengthptr);
+  if (lengthptr == NULL)
+    code = pop_info->code_start + pop_info->length;
+  }
+
+PCRE2_ASSERT(lengthptr == NULL || code == start_code);
+
+*pptr = ptr;
+*pcode = code;
+return TRUE;
+}
+
+
+
+/* This function consumes unary prefix operators. */
+
+static BOOL
+compile_class_unary(eclass_context *context, BOOL negated,
+  uint32_t **pptr, PCRE2_UCHAR **pcode, eclass_op_info *pop_info,
+  PCRE2_SIZE *lengthptr)
+{
+uint32_t *ptr = *pptr;
+#ifdef PCRE2_DEBUG
+PCRE2_UCHAR *start_code = *pcode;
+#endif
+
+while (*ptr == META_ECLASS_NOT)
+  {
+  ++ptr;
+  negated = !negated;
+  }
+
+*pptr = ptr;
+/* Because it's a non-empty class, there must be an operand. */
+if (!compile_class_juxtaposition(context, negated, pptr, pcode,
+                                 pop_info, lengthptr))
+  return FALSE;
+
+PCRE2_ASSERT(lengthptr == NULL || *pcode == start_code);
+return TRUE;
+}
+
+
+
+/* This function consumes tightly-binding binary operators. */
+
+static BOOL
+compile_class_binary_tight(eclass_context *context, BOOL negated,
+  uint32_t **pptr, PCRE2_UCHAR **pcode, eclass_op_info *pop_info,
+  PCRE2_SIZE *lengthptr)
+{
+uint32_t *ptr = *pptr;
+PCRE2_UCHAR *code = *pcode;
+#ifdef PCRE2_DEBUG
+PCRE2_UCHAR *start_code = *pcode;
+#endif
+
+/* See compile_class_binary_loose() for comments on compile-time folding of
+the "negated" flag. */
+
+/* Because it's a non-empty class, there must be an operand at the start. */
+if (!compile_class_unary(context, negated, &ptr, &code, pop_info, lengthptr))
+  return FALSE;
+
+while (*ptr == META_ECLASS_AND)
+  {
+  uint32_t op;
+  BOOL rhs_negated;
+  eclass_op_info rhs_op_info;
+
+  if (negated)
+    {
+    /* !(A && B)  ->  !A || !B */
+    op = ECL_OR;
+    rhs_negated = TRUE;
+    }
+  else
+    {
+    /* A && B  ->  A && B */
+    op = ECL_AND;
+    rhs_negated = FALSE;
+    }
+
+  ++ptr;
+
+  /* An operand must follow the operator. */
+  if (!compile_class_unary(context, rhs_negated, &ptr, &code,
+                           &rhs_op_info, lengthptr))
+    return FALSE;
+
+  /* Convert infix to postfix (RPN). */
+  fold_binary(op, pop_info, &rhs_op_info, lengthptr);
+  if (lengthptr == NULL)
+    code = pop_info->code_start + pop_info->length;
+  }
+
+PCRE2_ASSERT(lengthptr == NULL || code == start_code);
+
+*pptr = ptr;
+*pcode = code;
+return TRUE;
+}
+
+
+
+/* This function consumes loosely-binding binary operators. */
+
+static BOOL
+compile_class_binary_loose(eclass_context *context, BOOL negated,
+  uint32_t **pptr, PCRE2_UCHAR **pcode, eclass_op_info *pop_info,
+  PCRE2_SIZE *lengthptr)
+{
+uint32_t *ptr = *pptr;
+PCRE2_UCHAR *code = *pcode;
+#ifdef PCRE2_DEBUG
+PCRE2_UCHAR *start_code = *pcode;
+#endif
+
+/* We really want to fold the negation operator, if at all possible, so that
+simple cases can be reduced down. In particular, in 8-bit no-UTF mode, we want
+to produce a fully-folded expression, so that we can guarantee not to emit any
+OP_ECLASS codes (in the same way that we never emit OP_XCLASS in this mode).
+
+This has the consequence that with a little ingenuity, we can in fact avoid
+emitting (nearly...) all cases of the "NOT" operator. Imagine that we have:
+    !(A ...
+We have parsed the preceding "!", and we are about to parse the "A" operand. We
+don't know yet whether there will even be a following binary operand! Both of
+these are possibilities for what follows:
+    !(A && B)
+    !(A)
+However, we can still fold the "!" into the "A" operand, because no matter what
+the following binary operator will be, we can produce an expression which is
+equivalent. */
+
+/* Because it's a non-empty class, there must be an operand at the start. */
+if (!compile_class_binary_tight(context, negated, &ptr, &code,
+                                pop_info, lengthptr))
+  return FALSE;
+
+while (*ptr >= META_ECLASS_OR && *ptr <= META_ECLASS_XOR)
+  {
+  uint32_t op;
+  BOOL op_neg;
+  BOOL rhs_negated;
+  eclass_op_info rhs_op_info;
+
+  if (negated)
+    {
+    /* The whole expression is being negated; we respond by unconditionally
+    negating the LHS A, before seeing what follows. And hooray! We can recover,
+    no matter what follows. */
+    /* !(A || B)   ->  !A && !B                     */
+    /* !(A -- B)   ->  !(A && !B)    ->  !A || B    */
+    /* !(A XOR B)  ->  !(!A XOR !B)  ->  !A XNOR !B */
+    op = (*ptr == META_ECLASS_OR )? ECL_AND :
+         (*ptr == META_ECLASS_SUB)? ECL_OR  :
+         /*ptr == META_ECLASS_XOR*/ ECL_XOR;
+    op_neg = (*ptr == META_ECLASS_XOR);
+    rhs_negated = *ptr != META_ECLASS_SUB;
+    }
+  else
+    {
+    /* A || B   ->  A || B  */
+    /* A -- B   ->  A && !B */
+    /* A XOR B  ->  A XOR B */
+    op = (*ptr == META_ECLASS_OR )? ECL_OR  :
+         (*ptr == META_ECLASS_SUB)? ECL_AND :
+         /*ptr == META_ECLASS_XOR*/ ECL_XOR;
+    op_neg = FALSE;
+    rhs_negated = *ptr == META_ECLASS_SUB;
+    }
+
+  ++ptr;
+
+  /* An operand must follow the operator. */
+  if (!compile_class_binary_tight(context, rhs_negated, &ptr, &code,
+                                  &rhs_op_info, lengthptr))
+    return FALSE;
+
+  /* Convert infix to postfix (RPN). */
+  fold_binary(op, pop_info, &rhs_op_info, lengthptr);
+  if (op_neg) fold_negation(pop_info, lengthptr, FALSE);
+  if (lengthptr == NULL)
+    code = pop_info->code_start + pop_info->length;
+  }
+
+PCRE2_ASSERT(lengthptr == NULL || code == start_code);
+
+*pptr = ptr;
+*pcode = code;
+return TRUE;
+}
+
+
+
+/* This function converts the META codes in pptr into opcodes written to
+pcode. The pptr must start at a META_CLASS or META_CLASS_NOT.
+
+The class is compiled as a left-associative sequence of operator
+applications.
+
+The pptr will be left pointing at the matching META_CLASS_END. */
+
+static BOOL
+compile_eclass_nested(eclass_context *context, BOOL negated,
+  uint32_t **pptr, PCRE2_UCHAR **pcode,
+  eclass_op_info *pop_info, PCRE2_SIZE *lengthptr)
+{
+uint32_t *ptr = *pptr;
+#ifdef PCRE2_DEBUG
+PCRE2_UCHAR *start_code = *pcode;
+#endif
+
+/* The CLASS_IS_ECLASS bit must be set since it is a nested class. */
+PCRE2_ASSERT(*ptr == (META_CLASS | CLASS_IS_ECLASS) ||
+             *ptr == (META_CLASS_NOT | CLASS_IS_ECLASS));
+
+if (*ptr++ == (META_CLASS_NOT | CLASS_IS_ECLASS))
+  negated = !negated;
+
+(*pptr)++;
+
+/* Because it's a non-empty class, there must be an operand at the start. */
+if (!compile_class_binary_loose(context, negated, pptr, pcode,
+                                pop_info, lengthptr))
+  return FALSE;
+
+PCRE2_ASSERT(**pptr == META_CLASS_END);
+PCRE2_ASSERT(lengthptr == NULL || *pcode == start_code);
+return TRUE;
+}
+
+BOOL
+PRIV(compile_class_nested)(uint32_t options, uint32_t xoptions,
+  uint32_t **pptr, PCRE2_UCHAR **pcode, int *errorcodeptr,
+  compile_block *cb, PCRE2_SIZE *lengthptr)
+{
+eclass_context context;
+eclass_op_info op_info;
+PCRE2_SIZE previous_length = (lengthptr != NULL)? *lengthptr : 0;
+PCRE2_UCHAR *code = *pcode;
+PCRE2_UCHAR *previous;
+BOOL allbitsone = TRUE;
+
+context.needs_bitmap = FALSE;
+context.options = options;
+context.xoptions = xoptions;
+context.errorcodeptr = errorcodeptr;
+context.cb = cb;
+
+previous = code;
+*code++ = OP_ECLASS;
+code += LINK_SIZE;
+*code++ = 0;  /* Flags, currently zero. */
+if (!compile_eclass_nested(&context, FALSE, pptr, &code, &op_info, lengthptr))
+  return FALSE;
+
+if (lengthptr != NULL)
+  {
+  *lengthptr += code - previous;
+  code = previous;
+  /* (*lengthptr - previous_length) now holds the amount of buffer that
+  we require to make the call to compile_class_nested() with
+  lengthptr = NULL, and including the (1+LINK_SIZE+1) that we write out
+  before that call. */
+  }
+
+/* Do some useful counting of what's in the bitmap. */
+for (int i = 0; i < 8; i++)
+  if (op_info.bits.classwords[i] != 0xffffffff)
+    {
+    allbitsone = FALSE;
+    break;
+    }
+
+/* After constant-folding the extended class syntax, it may turn out to be
+a simple class after all. In that case, we can unwrap it from the
+OP_ECLASS container - and in fact, we must do so, because in 8-bit
+no-Unicode mode the matcher is compiled without support for OP_ECLASS. */
+
+#ifndef SUPPORT_WIDE_CHARS
+PCRE2_ASSERT(op_info.op_single_type != 0);
+#else
+if (op_info.op_single_type != 0)
+#endif
+  {
+  /* Rewind back over the OP_ECLASS. */
+  code = previous;
+
+  /* If the bits are all ones, and the "high characters" are all matched
+  too, we use a special-cased encoding of OP_ALLANY. */
+
+  if (op_info.op_single_type == ECL_ANY && allbitsone)
+    {
+    /* Advancing code means rewinding lengthptr, at this point. */
+    if (lengthptr != NULL) *lengthptr -= 1;
+    *code++ = OP_ALLANY;
+    }
+
+  /* If the high bits are all matched / all not-matched, then we emit an
+  OP_NCLASS/OP_CLASS respectively. */
+
+  else if (op_info.op_single_type == ECL_ANY ||
+           op_info.op_single_type == ECL_NONE)
+    {
+    PCRE2_SIZE required_len = 1 + (32 / sizeof(PCRE2_UCHAR));
+
+    if (lengthptr != NULL)
+      {
+      if (required_len > (*lengthptr - previous_length))
+      *lengthptr = previous_length + required_len;
+      }
+
+    /* Advancing code means rewinding lengthptr, at this point. */
+    if (lengthptr != NULL) *lengthptr -= required_len;
+    *code++ = (op_info.op_single_type == ECL_ANY)? OP_NCLASS : OP_CLASS;
+    memcpy(code, op_info.bits.classbits, 32);
+    code += 32 / sizeof(PCRE2_UCHAR);
+    }
+
+  /* Otherwise, we have an ECL_XCLASS, so we have the OP_XCLASS data
+  there, but, we pulled out its bitmap into op_info, so now we have to
+  put that back into the OP_XCLASS. */
+
+  else
+    {
+#ifndef SUPPORT_WIDE_CHARS
+    PCRE2_DEBUG_UNREACHABLE();
+#else
+    BOOL need_map = context.needs_bitmap;
+    PCRE2_SIZE required_len;
+
+    PCRE2_ASSERT(op_info.op_single_type == ECL_XCLASS);
+    required_len = op_info.length + (need_map? 32/sizeof(PCRE2_UCHAR) : 0);
+
+    if (lengthptr != NULL)
+      {
+      /* Don't unconditionally request all the space we need - we may
+      already have asked for more during processing of the ECLASS. */
+      if (required_len > (*lengthptr - previous_length))
+        *lengthptr = previous_length + required_len;
+
+      /* The code we write out here won't be ignored, even during the
+      (lengthptr != NULL) phase, because if there's a following quantifier
+      it will peek backwards. So we do have to write out a (truncated)
+      OP_XCLASS, even on this branch. */
+      *lengthptr -= 1 + LINK_SIZE + 1;
+      *code++ = OP_XCLASS;
+      PUT(code, 0, 1 + LINK_SIZE + 1);
+      code += LINK_SIZE;
+      *code++ = 0;
+      }
+    else
+      {
+      PCRE2_UCHAR *rest;
+      PCRE2_SIZE rest_len;
+      PCRE2_UCHAR flags;
+
+      /* 1 unit: OP_XCLASS | LINK_SIZE units | 1 unit: flags | ...rest */
+      PCRE2_ASSERT(op_info.length >= 1 + LINK_SIZE + 1);
+      rest = op_info.code_start + 1 + LINK_SIZE + 1;
+      rest_len = (op_info.code_start + op_info.length) - rest;
+
+      /* First read any data we use, before memmove splats it. */
+      flags = op_info.code_start[1 + LINK_SIZE];
+      PCRE2_ASSERT((flags & XCL_MAP) == 0);
+
+      /* Next do the memmove before any writes. */
+      memmove(code + 1 + LINK_SIZE + 1 + (need_map? 32/sizeof(PCRE2_UCHAR) : 0),
+              rest, CU2BYTES(rest_len));
+
+      /* Finally write the header data. */
+      *code++ = OP_XCLASS;
+      PUT(code, 0, (int)required_len);
+      code += LINK_SIZE;
+      *code++ = flags | (need_map? XCL_MAP : 0);
+      if (need_map)
+        {
+        memcpy(code, op_info.bits.classbits, 32);
+        code += 32 / sizeof(PCRE2_UCHAR);
+        }
+      code += rest_len;
+      }
+#endif /* SUPPORT_WIDE_CHARS */
+    }
+  }
+
+/* Otherwise, we're going to keep the OP_ECLASS. However, again we need
+to do some adjustment to insert the bitmap if we have one. */
+
+#ifdef SUPPORT_WIDE_CHARS
+else
+  {
+  BOOL need_map = context.needs_bitmap;
+  PCRE2_SIZE required_len =
+    1 + LINK_SIZE + 1 + (need_map? 32/sizeof(PCRE2_UCHAR) : 0) + op_info.length;
+
+  if (lengthptr != NULL)
+    {
+    if (required_len > (*lengthptr - previous_length))
+      *lengthptr = previous_length + required_len;
+
+    /* As for the XCLASS branch above, we do have to write out a dummy
+    OP_ECLASS, because of the backwards peek by the quantifier code. Write
+    out a (truncated) OP_ECLASS, even on this branch. */
+    *lengthptr -= 1 + LINK_SIZE + 1;
+    *code++ = OP_ECLASS;
+    PUT(code, 0, 1 + LINK_SIZE + 1);
+    code += LINK_SIZE;
+    *code++ = 0;
+    }
+  else
+    {
+    if (need_map)
+      {
+      PCRE2_UCHAR *map_start = previous + 1 + LINK_SIZE + 1;
+      previous[1 + LINK_SIZE] |= ECL_MAP;
+      memmove(map_start + 32/sizeof(PCRE2_UCHAR), map_start,
+              CU2BYTES(code - map_start));
+      memcpy(map_start, op_info.bits.classbits, 32);
+      code += 32 / sizeof(PCRE2_UCHAR);
+      }
+    PUT(previous, 1, (int)(code - previous));
+    }
+  }
+#endif /* SUPPORT_WIDE_CHARS */
+
+*pcode = code;
+return TRUE;
+}
+
+/* End of pcre2_compile_class.c */
diff --git a/engine/thirdparty/pcre2/src/pcre2_config.c b/engine/thirdparty/pcre2/src/pcre2_config.c
index 5ef103ca..031981b0 100644
--- a/engine/thirdparty/pcre2/src/pcre2_config.c
+++ b/engine/thirdparty/pcre2/src/pcre2_config.c
@@ -224,8 +224,8 @@ switch (what)
   XSTRING when PCRE2_PRERELEASE is not empty, an unwanted space is inserted.
   There are problems using an "obvious" approach like this:
 
-     XSTRING(PCRE2_MAJOR) "." XSTRING(PCRE_MINOR)
-     XSTRING(PCRE2_PRERELEASE) " " XSTRING(PCRE_DATE)
+     XSTRING(PCRE2_MAJOR) "." XSTRING(PCRE2_MINOR)
+     XSTRING(PCRE2_PRERELEASE) " " XSTRING(PCRE2_DATE)
 
   because, when PCRE2_PRERELEASE is empty, this leads to an attempted expansion
   of STRING(). The C standard states: "If (before argument substitution) any
diff --git a/engine/thirdparty/pcre2/src/pcre2_context.c b/engine/thirdparty/pcre2/src/pcre2_context.c
index 0bc2ea0b..2345145d 100644
--- a/engine/thirdparty/pcre2/src/pcre2_context.c
+++ b/engine/thirdparty/pcre2/src/pcre2_context.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -130,17 +130,19 @@ return gcontext;
 /* A default compile context is set up to save having to initialize at run time
 when no context is supplied to the compile function. */
 
-const pcre2_compile_context PRIV(default_compile_context) = {
+pcre2_compile_context PRIV(default_compile_context) = {
   { default_malloc, default_free, NULL },    /* Default memory handling */
   NULL,                                      /* Stack guard */
   NULL,                                      /* Stack guard data */
   PRIV(default_tables),                      /* Character tables */
   PCRE2_UNSET,                               /* Max pattern length */
+  PCRE2_UNSET,                               /* Max pattern compiled length */
   BSR_DEFAULT,                               /* Backslash R default */
   NEWLINE_DEFAULT,                           /* Newline convention */
   PARENS_NEST_LIMIT,                         /* As it says */
   0,                                         /* Extra options */
-  MAX_VARLOOKBEHIND                          /* As it says */
+  MAX_VARLOOKBEHIND,                         /* As it says */
+  PCRE2_OPTIMIZATION_ALL                     /* All optimizations enabled */
   };
 
 /* The create function copies the default into the new memory, but must
@@ -162,7 +164,7 @@ return ccontext;
 /* A default match context is set up to save having to initialize at run time
 when no context is supplied to a match function. */
 
-const pcre2_match_context PRIV(default_match_context) = {
+pcre2_match_context PRIV(default_match_context) = {
   { default_malloc, default_free, NULL },
 #ifdef SUPPORT_JIT
   NULL,          /* JIT callback */
@@ -172,6 +174,8 @@ const pcre2_match_context PRIV(default_match_context) = {
   NULL,          /* Callout data */
   NULL,          /* Substitute callout function */
   NULL,          /* Substitute callout data */
+  NULL,          /* Substitute case callout function */
+  NULL,          /* Substitute case callout data */
   PCRE2_UNSET,   /* Offset limit */
   HEAP_LIMIT,
   MATCH_LIMIT,
@@ -196,7 +200,7 @@ return mcontext;
 /* A default convert context is set up to save having to initialize at run time
 when no context is supplied to the convert function. */
 
-const pcre2_convert_context PRIV(default_convert_context) = {
+pcre2_convert_context PRIV(default_convert_context) = {
   { default_malloc, default_free, NULL },    /* Default memory handling */
 #ifdef _WIN32
   CHAR_BACKSLASH,                            /* Default path separator */
@@ -352,6 +356,13 @@ ccontext->max_pattern_length = length;
 return 0;
 }
 
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_max_pattern_compiled_length(pcre2_compile_context *ccontext, PCRE2_SIZE length)
+{
+ccontext->max_pattern_compiled_length = length;
+return 0;
+}
+
 PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
 pcre2_set_newline(pcre2_compile_context *ccontext, uint32_t newline)
 {
@@ -401,6 +412,38 @@ ccontext->stack_guard_data = user_data;
 return 0;
 }
 
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_optimize(pcre2_compile_context *ccontext, uint32_t directive)
+{
+if (ccontext == NULL)
+  return PCRE2_ERROR_NULL;
+
+switch (directive)
+  {
+  case PCRE2_OPTIMIZATION_NONE:
+  ccontext->optimization_flags = 0;
+  break;
+
+  case PCRE2_OPTIMIZATION_FULL:
+  ccontext->optimization_flags = PCRE2_OPTIMIZATION_ALL;
+  break;
+
+  default:
+  if (directive >= PCRE2_AUTO_POSSESS && directive <= PCRE2_START_OPTIMIZE_OFF)
+    {
+    /* Even directive numbers starting from 64 switch a bit on;
+     * Odd directive numbers starting from 65 switch a bit off */
+    if ((directive & 1) != 0)
+      ccontext->optimization_flags &= ~(1u << ((directive >> 1) - 32));
+    else
+      ccontext->optimization_flags |= 1u << ((directive >> 1) - 32);
+    return 0;
+    }
+  return PCRE2_ERROR_BADOPTION;
+  }
+
+return 0;
+}
 
 /* ------------ Match context ------------ */
 
@@ -416,13 +459,24 @@ return 0;
 PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
 pcre2_set_substitute_callout(pcre2_match_context *mcontext,
   int (*substitute_callout)(pcre2_substitute_callout_block *, void *),
-    void *substitute_callout_data)
+  void *substitute_callout_data)
 {
 mcontext->substitute_callout = substitute_callout;
 mcontext->substitute_callout_data = substitute_callout_data;
 return 0;
 }
 
+PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
+pcre2_set_substitute_case_callout(pcre2_match_context *mcontext,
+  PCRE2_SIZE (*substitute_case_callout)(PCRE2_SPTR, PCRE2_SIZE, PCRE2_UCHAR *,
+                                        PCRE2_SIZE, int, void *),
+  void *substitute_case_callout_data)
+{
+mcontext->substitute_case_callout = substitute_case_callout;
+mcontext->substitute_case_callout_data = substitute_case_callout_data;
+return 0;
+}
+
 PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
 pcre2_set_heap_limit(pcre2_match_context *mcontext, uint32_t limit)
 {
diff --git a/engine/thirdparty/pcre2/src/pcre2_convert.c b/engine/thirdparty/pcre2/src/pcre2_convert.c
index fe396ae4..d2b238ca 100644
--- a/engine/thirdparty/pcre2/src/pcre2_convert.c
+++ b/engine/thirdparty/pcre2/src/pcre2_convert.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2022 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@ enum { POSIX_START_REGEX, POSIX_ANCHORED, POSIX_NOT_BRACKET,
 
 #define PUTCHARS(string) \
   { \
-  for (s = (char *)(string); *s != 0; s++) \
+  for (const char *s = string; *s != 0; s++) \
     { \
     if (p >= endp) return PCRE2_ERROR_NOMEMORY; \
     *p++ = *s; \
@@ -125,7 +125,6 @@ convert_posix(uint32_t pattype, PCRE2_SPTR pattern, PCRE2_SIZE plength,
   BOOL utf, PCRE2_UCHAR *use_buffer, PCRE2_SIZE use_length,
   PCRE2_SIZE *bufflenptr, BOOL dummyrun, pcre2_convert_context *ccontext)
 {
-char *s;
 PCRE2_SPTR posix = pattern;
 PCRE2_UCHAR *p = use_buffer;
 PCRE2_UCHAR *pp = p;
@@ -1065,7 +1064,7 @@ pcre2_pattern_convert(PCRE2_SPTR pattern, PCRE2_SIZE plength, uint32_t options,
   PCRE2_UCHAR **buffptr, PCRE2_SIZE *bufflenptr,
   pcre2_convert_context *ccontext)
 {
-int i, rc;
+int rc;
 PCRE2_UCHAR dummy_buffer[DUMMY_BUFFER_SIZE];
 PCRE2_UCHAR *use_buffer = dummy_buffer;
 PCRE2_SIZE use_length = DUMMY_BUFFER_SIZE;
@@ -1119,7 +1118,7 @@ if (buffptr != NULL && *buffptr != NULL)
 /* Call an individual converter, either just once (if a buffer was provided or
 just the length is needed), or twice (if a memory allocation is required). */
 
-for (i = 0; i < 2; i++)
+for (int i = 0; i < 2; i++)
   {
   PCRE2_UCHAR *allocated;
   BOOL dummyrun = buffptr == NULL || *buffptr == NULL;
@@ -1138,8 +1137,7 @@ for (i = 0; i < 2; i++)
     break;
 
     default:
-    *bufflenptr = 0;  /* Error offset */
-    return PCRE2_ERROR_INTERNAL;
+    goto EXIT;
     }
 
   if (rc != 0 ||           /* Error */
@@ -1159,8 +1157,12 @@ for (i = 0; i < 2; i++)
   use_length = *bufflenptr + 1;
   }
 
-/* Control should never get here. */
+/* Something went terribly wrong. Trigger an assert and return an error */
+PCRE2_DEBUG_UNREACHABLE();
 
+EXIT:
+
+*bufflenptr = 0;  /* Error offset */
 return PCRE2_ERROR_INTERNAL;
 }
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_dfa_match.c b/engine/thirdparty/pcre2/src/pcre2_dfa_match.c
index caae6524..ebf31d28 100644
--- a/engine/thirdparty/pcre2/src/pcre2_dfa_match.c
+++ b/engine/thirdparty/pcre2/src/pcre2_dfa_match.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -156,6 +156,7 @@ static const uint8_t coptable[] = {
   0,                             /* CLASS                                  */
   0,                             /* NCLASS                                 */
   0,                             /* XCLASS - variable length               */
+  0,                             /* ECLASS - variable length               */
   0,                             /* REF                                    */
   0,                             /* REFI                                   */
   0,                             /* DNREF                                  */
@@ -175,6 +176,7 @@ static const uint8_t coptable[] = {
   0,                             /* Assert behind not                      */
   0,                             /* NA assert                              */
   0,                             /* NA assert behind                       */
+  0,                             /* Assert scan substring                  */
   0,                             /* ONCE                                   */
   0,                             /* SCRIPT_RUN                             */
   0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
@@ -188,7 +190,7 @@ static const uint8_t coptable[] = {
   0, 0,                          /* COMMIT, COMMIT_ARG                     */
   0, 0, 0,                       /* FAIL, ACCEPT, ASSERT_ACCEPT            */
   0, 0, 0,                       /* CLOSE, SKIPZERO, DEFINE                */
-  0, 0                           /* \B and \b in UCP mode                  */
+  0, 0,                          /* \B and \b in UCP mode                  */
 };
 
 /* This table identifies those opcodes that inspect a character. It is used to
@@ -234,6 +236,7 @@ static const uint8_t poptable[] = {
   1,                             /* CLASS                                  */
   1,                             /* NCLASS                                 */
   1,                             /* XCLASS - variable length               */
+  1,                             /* ECLASS - variable length               */
   0,                             /* REF                                    */
   0,                             /* REFI                                   */
   0,                             /* DNREF                                  */
@@ -253,6 +256,7 @@ static const uint8_t poptable[] = {
   0,                             /* Assert behind not                      */
   0,                             /* NA assert                              */
   0,                             /* NA assert behind                       */
+  0,                             /* Assert scan substring                  */
   0,                             /* ONCE                                   */
   0,                             /* SCRIPT_RUN                             */
   0, 0, 0, 0, 0,                 /* BRA, BRAPOS, CBRA, CBRAPOS, COND       */
@@ -266,9 +270,13 @@ static const uint8_t poptable[] = {
   0, 0,                          /* COMMIT, COMMIT_ARG                     */
   0, 0, 0,                       /* FAIL, ACCEPT, ASSERT_ACCEPT            */
   0, 0, 0,                       /* CLOSE, SKIPZERO, DEFINE                */
-  1, 1                           /* \B and \b in UCP mode                  */
+  1, 1,                          /* \B and \b in UCP mode                  */
 };
 
+/* Compile-time check that these tables have the correct size. */
+STATIC_ASSERT(sizeof(coptable) == OP_TABLE_LENGTH, coptable);
+STATIC_ASSERT(sizeof(poptable) == OP_TABLE_LENGTH, poptable);
+
 /* These 2 tables allow for compact code for testing for \D, \d, \S, \s, \W,
 and \w */
 
@@ -695,7 +703,6 @@ for (;;)
   int i, j;
   int clen, dlen;
   uint32_t c, d;
-  int forced_fail = 0;
   BOOL partial_newline = FALSE;
   BOOL could_continue = reset_could_continue;
   reset_could_continue = FALSE;
@@ -841,19 +848,6 @@ for (;;)
 
     switch (codevalue)
       {
-/* ========================================================================== */
-      /* These cases are never obeyed. This is a fudge that causes a compile-
-      time error if the vectors coptable or poptable, which are indexed by
-      opcode, are not the correct length. It seems to be the only way to do
-      such a check at compile time, as the sizeof() operator does not work
-      in the C preprocessor. */
-
-      case OP_TABLE_LENGTH:
-      case OP_TABLE_LENGTH +
-        ((sizeof(coptable) == OP_TABLE_LENGTH) &&
-         (sizeof(poptable) == OP_TABLE_LENGTH)):
-      return 0;
-
 /* ========================================================================== */
       /* Reached a closing bracket. If not at the end of the pattern, carry
       on with the next opcode. For repeating opcodes, also add the repeat
@@ -1179,10 +1173,6 @@ for (;;)
         const ucd_record * prop = GET_UCD(c);
         switch(code[1])
           {
-          case PT_ANY:
-          OK = TRUE;
-          break;
-
           case PT_LAMP:
           chartype = prop->chartype;
           OK = chartype == ucp_Lu || chartype == ucp_Ll ||
@@ -1462,10 +1452,6 @@ for (;;)
         const ucd_record * prop = GET_UCD(c);
         switch(code[2])
           {
-          case PT_ANY:
-          OK = TRUE;
-          break;
-
           case PT_LAMP:
           chartype = prop->chartype;
           OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
@@ -1727,10 +1713,6 @@ for (;;)
         const ucd_record * prop = GET_UCD(c);
         switch(code[2])
           {
-          case PT_ANY:
-          OK = TRUE;
-          break;
-
           case PT_LAMP:
           chartype = prop->chartype;
           OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
@@ -2017,10 +1999,6 @@ for (;;)
         const ucd_record * prop = GET_UCD(c);
         switch(code[1 + IMM2_SIZE + 1])
           {
-          case PT_ANY:
-          OK = TRUE;
-          break;
-
           case PT_LAMP:
           chartype = prop->chartype;
           OK = chartype == ucp_Lu || chartype == ucp_Ll || chartype == ucp_Lt;
@@ -2663,35 +2641,54 @@ for (;;)
 
       case OP_CLASS:
       case OP_NCLASS:
+#ifdef SUPPORT_WIDE_CHARS
       case OP_XCLASS:
+      case OP_ECLASS:
+#endif
         {
         BOOL isinclass = FALSE;
         int next_state_offset;
         PCRE2_SPTR ecode;
 
+#ifdef SUPPORT_WIDE_CHARS
+        /* An extended class may have a table or a list of single characters,
+        ranges, or both, and it may be positive or negative. There's a
+        function that sorts all this out. */
+
+        if (codevalue == OP_XCLASS)
+         {
+         ecode = code + GET(code, 1);
+         if (clen > 0)
+           isinclass = PRIV(xclass)(c, code + 1 + LINK_SIZE,
+             (const uint8_t*)mb->start_code, utf);
+         }
+
+        /* A nested set-based class has internal opcodes for performing
+        set operations. */
+
+        else if (codevalue == OP_ECLASS)
+         {
+         ecode = code + GET(code, 1);
+         if (clen > 0)
+           isinclass = PRIV(eclass)(c, code + 1 + LINK_SIZE, ecode,
+             (const uint8_t*)mb->start_code, utf);
+         }
+
+        else
+#endif /* SUPPORT_WIDE_CHARS */
+
         /* For a simple class, there is always just a 32-byte table, and we
         can set isinclass from it. */
 
-        if (codevalue != OP_XCLASS)
           {
           ecode = code + 1 + (32 / sizeof(PCRE2_UCHAR));
           if (clen > 0)
             {
             isinclass = (c > 255)? (codevalue == OP_NCLASS) :
-              ((((uint8_t *)(code + 1))[c/8] & (1u << (c&7))) != 0);
+              ((((const uint8_t *)(code + 1))[c/8] & (1u << (c&7))) != 0);
             }
           }
 
-        /* An extended class may have a table or a list of single characters,
-        ranges, or both, and it may be positive or negative. There's a
-        function that sorts all this out. */
-
-        else
-         {
-         ecode = code + GET(code, 1);
-         if (clen > 0) isinclass = PRIV(xclass)(c, code + 1 + LINK_SIZE, utf);
-         }
-
         /* At this point, isinclass is set for all kinds of class, and ecode
         points to the byte after the end of the class. If there is a
         quantifier, this is where it will be. */
@@ -2784,7 +2781,6 @@ for (;;)
       though the other "backtracking verbs" are not supported. */
 
       case OP_FAIL:
-      forced_fail++;    /* Count FAILs for multiple states */
       break;
 
       case OP_ASSERT:
@@ -3058,7 +3054,7 @@ for (;;)
         if (codevalue == OP_BRAPOSZERO)
           {
           allow_zero = TRUE;
-          codevalue = *(++code);  /* Codevalue will be one of above BRAs */
+          ++code;  /* The following opcode will be one of the above BRAs */
           }
         else allow_zero = FALSE;
 
@@ -3271,18 +3267,12 @@ for (;;)
   matches that we are going to find. If partial matching has been requested,
   check for appropriate conditions.
 
-  The "forced_ fail" variable counts the number of (*F) encountered for the
-  character. If it is equal to the original active_count (saved in
-  workspace[1]) it means that (*F) was found on every active state. In this
-  case we don't want to give a partial match.
-
   The "could_continue" variable is true if a state could have continued but
   for the fact that the end of the subject was reached. */
 
   if (new_count <= 0)
     {
     if (could_continue &&                            /* Some could go on, and */
-        forced_fail != workspace[1] &&               /* Not all forced fail & */
         (                                            /* either... */
         (mb->moptions & PCRE2_PARTIAL_HARD) != 0      /* Hard partial */
         ||                                           /* or... */
@@ -3438,7 +3428,7 @@ if ((re->flags & PCRE2_MODE_MASK) != PCRE2_CODE_UNIT_WIDTH/8)
 /* PCRE2_NOTEMPTY and PCRE2_NOTEMPTY_ATSTART are match-time flags in the
 options variable for this function. Users of PCRE2 who are not calling the
 function directly would like to have a way of setting these flags, in the same
-way that they can set pcre2_compile() flags like PCRE2_NO_AUTOPOSSESS with
+way that they can set pcre2_compile() flags like PCRE2_NO_AUTO_POSSESS with
 constructions like (*NO_AUTOPOSSESS). To enable this, (*NOTEMPTY) and
 (*NOTEMPTY_ATSTART) set bits in the pattern's "flag" function which can now be
 transferred to the options for this function. The bits are guaranteed to be
@@ -3528,8 +3518,7 @@ if (mb->match_limit_depth > re->limit_depth)
 if (mb->heap_limit > re->limit_heap)
   mb->heap_limit = re->limit_heap;
 
-mb->start_code = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) +
-  re->name_count * re->name_entry_size;
+mb->start_code = (PCRE2_SPTR)((const uint8_t *)re + re->code_start);
 mb->tables = re->tables;
 mb->start_subject = subject;
 mb->end_subject = end_subject;
@@ -3576,7 +3565,9 @@ switch(re->newline_convention)
   mb->nltype = NLTYPE_ANYCRLF;
   break;
 
-  default: return PCRE2_ERROR_INTERNAL;
+  default:
+  PCRE2_DEBUG_UNREACHABLE();
+  return PCRE2_ERROR_INTERNAL;
   }
 
 /* Check a UTF string for validity if required. For 8-bit and 16-bit strings,
@@ -3705,7 +3696,7 @@ for (;;)
   these, for testing and for ensuring that all callouts do actually occur.
   The optimizations must also be avoided when restarting a DFA match. */
 
-  if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 &&
+  if ((re->optimization_flags & PCRE2_OPTIM_START_OPTIMIZE) != 0 &&
       (options & PCRE2_DFA_RESTART) == 0)
     {
     /* If firstline is TRUE, the start of the match is constrained to the first
diff --git a/engine/thirdparty/pcre2/src/pcre2_error.c b/engine/thirdparty/pcre2/src/pcre2_error.c
index 1569f631..8b7423c6 100644
--- a/engine/thirdparty/pcre2/src/pcre2_error.c
+++ b/engine/thirdparty/pcre2/src/pcre2_error.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -96,7 +96,7 @@ static const unsigned char compile_error_texts[] =
   "length of lookbehind assertion is not limited\0"
   "a relative value of zero is not allowed\0"
   "conditional subpattern contains more than two branches\0"
-  "assertion expected after (?( or (?(?C)\0"
+  "atomic assertion expected after (?( or (?(?C)\0"
   "digit expected after (?+ or (?-\0"
   /* 30 */
   "unknown POSIX class name\0"
@@ -161,7 +161,7 @@ static const unsigned char compile_error_texts[] =
   "using UCP is disabled by the application\0"
   "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0"
   "character code point value in \\u.... sequence is too large\0"
-  "digits missing in \\x{} or \\o{} or \\N{U+}\0"
+  "digits missing after \\x or in \\x{} or \\o{} or \\N{U+}\0"
   "syntax error or number too big in (?(VERSION condition\0"
   /* 80 */
   "internal error: unknown opcode in auto_possessify()\0"
@@ -185,10 +185,29 @@ static const unsigned char compile_error_texts[] =
   "(*alpha_assertion) not recognized\0"
   "script runs require Unicode support, which this version of PCRE2 does not have\0"
   "too many capturing groups (maximum 65535)\0"
-  "atomic assertion expected after (?( or (?(?C)\0"
+  "octal digit missing after \\0 (PCRE2_EXTRA_NO_BS0 is set)\0"
   "\\K is not allowed in lookarounds (but see PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK)\0"
   /* 100 */
   "branch too long in variable-length lookbehind assertion\0"
+  "compiled pattern would be longer than the limit set by the application\0"
+  "octal value given by \\ddd is greater than \\377 (forbidden by PCRE2_EXTRA_PYTHON_OCTAL)\0"
+  "using callouts is disabled by the application\0"
+  "PCRE2_EXTRA_TURKISH_CASING require Unicode (UTF or UCP) mode\0"
+  /* 105 */
+  "PCRE2_EXTRA_TURKISH_CASING requires UTF in 8-bit mode\0"
+  "PCRE2_EXTRA_TURKISH_CASING and PCRE2_EXTRA_CASELESS_RESTRICT are not compatible\0"
+  "extended character class nesting is too deep\0"
+  "invalid operator in extended character class\0"
+  "unexpected operator in extended character class (no preceding operand)\0"
+  /* 110 */
+  "expected operand after operator in extended character class\0"
+  "square brackets needed to clarify operator precedence in extended character class\0"
+  "missing terminating ] for extended character class (note '[' must be escaped under PCRE2_ALT_EXTENDED_CLASS)\0"
+  "unexpected expression in extended character class (no preceding operator)\0"
+  "empty expression in extended character class\0"
+  /* 115 */
+  "terminating ] with no following closing parenthesis in (?[...]\0"
+  "unexpected character in (?[...]) extended character class\0"
   ;
 
 /* Match-time and UTF error texts are in the same format. */
@@ -275,6 +294,10 @@ static const unsigned char match_error_texts[] =
   "internal error - duplicate substitution match\0"
   "PCRE2_MATCH_INVALID_UTF is not supported for DFA matching\0"
   "INTERNAL ERROR: invalid substring offset\0"
+  "feature is not supported by the JIT compiler\0"
+  "error performing replacement case transformation\0"
+  /* 70 */
+  "replacement too large (longer than PCRE2_SIZE)\0"
   ;
 
 
@@ -317,7 +340,7 @@ else if (enumber < 0)               /* Match or UTF error */
   }
 else                                /* Invalid error number */
   {
-  message = (unsigned char *)"\0";  /* Empty message list */
+  message = (const unsigned char *)"\0";  /* Empty message list */
   n = 1;
   }
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_extuni.c b/engine/thirdparty/pcre2/src/pcre2_extuni.c
index b23946b0..91d839e2 100644
--- a/engine/thirdparty/pcre2/src/pcre2_extuni.c
+++ b/engine/thirdparty/pcre2/src/pcre2_extuni.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2021 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /* This module contains an internal function that is used to match a Unicode
 extended grapheme sequence. It is used by both pcre2_match() and
-pcre2_def_match(). However, it is called only when Unicode support is being
+pcre2_dfa_match(). However, it is called only when Unicode support is being
 compiled. Nevertheless, we provide a dummy function when there is no Unicode
 support, because some compilers do not like functionless source files. */
 
@@ -75,7 +75,11 @@ return NULL;
 *      Match an extended grapheme sequence       *
 *************************************************/
 
-/*
+/* NOTE: The logic contained in this function is replicated in three special-
+purpose functions in the pcre2_jit_compile.c module. If the logic below is
+changed, they must be kept in step so that the interpreter and the JIT have the
+same behaviour.
+
 Arguments:
   c              the first character
   eptr           pointer to next character
@@ -92,6 +96,7 @@ PCRE2_SPTR
 PRIV(extuni)(uint32_t c, PCRE2_SPTR eptr, PCRE2_SPTR start_subject,
   PCRE2_SPTR end_subject, BOOL utf, int *xcount)
 {
+BOOL was_ep_ZWJ = FALSE;
 int lgb = UCD_GRAPHBREAK(c);
 
 while (eptr < end_subject)
@@ -102,6 +107,12 @@ while (eptr < end_subject)
   rgb = UCD_GRAPHBREAK(c);
   if ((PRIV(ucp_gbtable)[lgb] & (1u << rgb)) == 0) break;
 
+  /* ZWJ followed by Extended Pictographic is allowed only if the ZWJ was
+  preceded by Extended Pictographic. */
+
+  if (lgb == ucp_gbZWJ && rgb == ucp_gbExtended_Pictographic && !was_ep_ZWJ)
+    break;
+
   /* Not breaking between Regional Indicators is allowed only if there
   are an even number of preceding RIs. */
 
@@ -129,12 +140,15 @@ while (eptr < end_subject)
     if ((ricount & 1) != 0) break;  /* Grapheme break required */
     }
 
-  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
-  allows any number of them before a following Extended_Pictographic. */
+  /* Set a flag when ZWJ follows Extended Pictographic (with optional Extend in
+  between; see next statement). */
 
-  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
-       lgb != ucp_gbExtended_Pictographic)
-    lgb = rgb;
+  was_ep_ZWJ = (lgb == ucp_gbExtended_Pictographic && rgb == ucp_gbZWJ);
+
+  /* If Extend follows Extended_Pictographic, do not update lgb; this allows
+  any number of them before a following ZWJ. */
+
+  if (rgb != ucp_gbExtend || lgb != ucp_gbExtended_Pictographic) lgb = rgb;
 
   eptr += len;
   if (xcount != NULL) *xcount += 1;
diff --git a/engine/thirdparty/pcre2/src/pcre2_find_bracket.c b/engine/thirdparty/pcre2/src/pcre2_find_bracket.c
index 1290c5e9..486f4539 100644
--- a/engine/thirdparty/pcre2/src/pcre2_find_bracket.c
+++ b/engine/thirdparty/pcre2/src/pcre2_find_bracket.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -76,18 +76,19 @@ for (;;)
   if (c == OP_END) return NULL;
 
   /* XCLASS is used for classes that cannot be represented just by a bit map.
-  This includes negated single high-valued characters. CALLOUT_STR is used for
-  callouts with string arguments. In both cases the length in the table is
+  This includes negated single high-valued characters. ECLASS is used for
+  classes that use set operations internally. CALLOUT_STR is used for
+  callouts with string arguments. In each case the length in the table is
   zero; the actual length is stored in the compiled code. */
 
-  if (c == OP_XCLASS) code += GET(code, 1);
-    else if (c == OP_CALLOUT_STR) code += GET(code, 1 + 2*LINK_SIZE);
+  if (c == OP_XCLASS || c == OP_ECLASS) code += GET(code, 1);
+  else if (c == OP_CALLOUT_STR) code += GET(code, 1 + 2*LINK_SIZE);
 
   /* Handle lookbehind */
 
   else if (c == OP_REVERSE || c == OP_VREVERSE)
     {
-    if (number < 0) return (PCRE2_UCHAR *)code;
+    if (number < 0) return code;
     code += PRIV(OP_lengths)[c];
     }
 
@@ -97,7 +98,7 @@ for (;;)
            c == OP_CBRAPOS || c == OP_SCBRAPOS)
     {
     int n = (int)GET2(code, 1+LINK_SIZE);
-    if (n == number) return (PCRE2_UCHAR *)code;
+    if (n == number) return code;
     code += PRIV(OP_lengths)[c];
     }
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_internal.h b/engine/thirdparty/pcre2/src/pcre2_internal.h
index e5808182..6e0a5e05 100644
--- a/engine/thirdparty/pcre2/src/pcre2_internal.h
+++ b/engine/thirdparty/pcre2/src/pcre2_internal.h
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,12 @@ typedef int BOOL;
 #define TRUE    1
 #endif
 
+/* Helper macro for static (compile-time) assertions. Can be used inside
+functions, or at the top-level of a file. */
+#define STATIC_ASSERT_JOIN(a,b) a ## b
+#define STATIC_ASSERT(cond, msg) \
+  typedef int STATIC_ASSERT_JOIN(static_assertion_,msg)[(cond)?1:-1]
+
 /* Valgrind (memcheck) support */
 
 #ifdef SUPPORT_VALGRIND
@@ -523,29 +529,29 @@ start/end of string field names are. */
 three must not be changed, because whichever is set is actually the number of
 bytes in a code unit in that mode. */
 
-#define PCRE2_MODE8         0x00000001  /* compiled in 8 bit mode */
-#define PCRE2_MODE16        0x00000002  /* compiled in 16 bit mode */
-#define PCRE2_MODE32        0x00000004  /* compiled in 32 bit mode */
-#define PCRE2_FIRSTSET      0x00000010  /* first_code unit is set */
-#define PCRE2_FIRSTCASELESS 0x00000020  /* caseless first code unit */
-#define PCRE2_FIRSTMAPSET   0x00000040  /* bitmap of first code units is set */
-#define PCRE2_LASTSET       0x00000080  /* last code unit is set */
-#define PCRE2_LASTCASELESS  0x00000100  /* caseless last code unit */
-#define PCRE2_STARTLINE     0x00000200  /* start after \n for multiline */
-#define PCRE2_JCHANGED      0x00000400  /* j option used in pattern */
-#define PCRE2_HASCRORLF     0x00000800  /* explicit \r or \n in pattern */
-#define PCRE2_HASTHEN       0x00001000  /* pattern contains (*THEN) */
-#define PCRE2_MATCH_EMPTY   0x00002000  /* pattern can match empty string */
-#define PCRE2_BSR_SET       0x00004000  /* BSR was set in the pattern */
-#define PCRE2_NL_SET        0x00008000  /* newline was set in the pattern */
-#define PCRE2_NOTEMPTY_SET  0x00010000  /* (*NOTEMPTY) used        ) keep */
-#define PCRE2_NE_ATST_SET   0x00020000  /* (*NOTEMPTY_ATSTART) used) together */
-#define PCRE2_DEREF_TABLES  0x00040000  /* release character tables */
-#define PCRE2_NOJIT         0x00080000  /* (*NOJIT) used */
-#define PCRE2_HASBKPORX     0x00100000  /* contains \P, \p, or \X */
-#define PCRE2_DUPCAPUSED    0x00200000  /* contains (?| */
-#define PCRE2_HASBKC        0x00400000  /* contains \C */
-#define PCRE2_HASACCEPT     0x00800000  /* contains (*ACCEPT) */
+#define PCRE2_MODE8         0x00000001u /* compiled in 8 bit mode */
+#define PCRE2_MODE16        0x00000002u /* compiled in 16 bit mode */
+#define PCRE2_MODE32        0x00000004u /* compiled in 32 bit mode */
+#define PCRE2_FIRSTSET      0x00000010u /* first_code unit is set */
+#define PCRE2_FIRSTCASELESS 0x00000020u /* caseless first code unit */
+#define PCRE2_FIRSTMAPSET   0x00000040u /* bitmap of first code units is set */
+#define PCRE2_LASTSET       0x00000080u /* last code unit is set */
+#define PCRE2_LASTCASELESS  0x00000100u /* caseless last code unit */
+#define PCRE2_STARTLINE     0x00000200u /* start after \n for multiline */
+#define PCRE2_JCHANGED      0x00000400u /* j option used in pattern */
+#define PCRE2_HASCRORLF     0x00000800u /* explicit \r or \n in pattern */
+#define PCRE2_HASTHEN       0x00001000u /* pattern contains (*THEN) */
+#define PCRE2_MATCH_EMPTY   0x00002000u /* pattern can match empty string */
+#define PCRE2_BSR_SET       0x00004000u /* BSR was set in the pattern */
+#define PCRE2_NL_SET        0x00008000u /* newline was set in the pattern */
+#define PCRE2_NOTEMPTY_SET  0x00010000u /* (*NOTEMPTY) used        ) keep */
+#define PCRE2_NE_ATST_SET   0x00020000u /* (*NOTEMPTY_ATSTART) used) together */
+#define PCRE2_DEREF_TABLES  0x00040000u /* release character tables */
+#define PCRE2_NOJIT         0x00080000u /* (*NOJIT) used */
+#define PCRE2_HASBKPORX     0x00100000u /* contains \P, \p, or \X */
+#define PCRE2_DUPCAPUSED    0x00200000u /* contains (?| */
+#define PCRE2_HASBKC        0x00400000u /* contains \C */
+#define PCRE2_HASACCEPT     0x00800000u /* contains (*ACCEPT) */
 
 #define PCRE2_MODE_MASK     (PCRE2_MODE8 | PCRE2_MODE16 | PCRE2_MODE32)
 
@@ -574,6 +580,16 @@ modes. */
 #define REQ_CU_MAX       2000
 #endif
 
+/* The maximum nesting depth for Unicode character class sets.
+Currently fixed. Warning: the interpreter relies on this so it can encode
+the operand stack in a uint32_t. A nesting limit of 15 implies (15*2+1)=31
+stack operands required, due to the fact that we have two (and only two)
+levels of operator precedence. In the UTS#18 syntax, you can write 'x&&y[z]'
+and in Perl syntax you can write '(?[ x - y & (z) ])', both of which imply
+pushing the match results for x & y to the stack. */
+
+#define ECLASS_NEST_LIMIT  15
+
 /* Offsets for the bitmap tables in the cbits set of tables. Each table
 contains a set of bits for a class map. Some classes are built by combining
 these tables. */
@@ -609,6 +625,13 @@ total length of the tables. */
 #define ctypes_offset (cbits_offset + cbit_length)  /* Character types */
 #define TABLES_LENGTH (ctypes_offset + 256)
 
+/* Private flags used in compile_context.optimization_flags */
+
+#define PCRE2_OPTIM_AUTO_POSSESS    0x00000001u
+#define PCRE2_OPTIM_DOTSTAR_ANCHOR  0x00000002u
+#define PCRE2_OPTIM_START_OPTIMIZE  0x00000004u
+
+#define PCRE2_OPTIMIZATION_ALL      0x00000007u
 
 /* -------------------- Character and string names ------------------------ */
 
@@ -915,6 +938,7 @@ a positive value. */
 #define STRING_naplb0                "naplb\0"
 #define STRING_nla0                  "nla\0"
 #define STRING_nlb0                  "nlb\0"
+#define STRING_scs0                  "scs\0"
 #define STRING_sr0                   "sr\0"
 #define STRING_asr0                  "asr\0"
 #define STRING_positive_lookahead0   "positive_lookahead\0"
@@ -925,6 +949,7 @@ a positive value. */
 #define STRING_negative_lookbehind0  "negative_lookbehind\0"
 #define STRING_script_run0           "script_run\0"
 #define STRING_atomic_script_run     "atomic_script_run"
+#define STRING_scan_substring0       "scan_substring\0"
 
 #define STRING_alpha0                "alpha\0"
 #define STRING_lower0                "lower\0"
@@ -965,6 +990,8 @@ a positive value. */
 #define STRING_NO_START_OPT_RIGHTPAR      "NO_START_OPT)"
 #define STRING_NOTEMPTY_RIGHTPAR          "NOTEMPTY)"
 #define STRING_NOTEMPTY_ATSTART_RIGHTPAR  "NOTEMPTY_ATSTART)"
+#define STRING_CASELESS_RESTRICT_RIGHTPAR "CASELESS_RESTRICT)"
+#define STRING_TURKISH_CASING_RIGHTPAR    "TURKISH_CASING)"
 #define STRING_LIMIT_HEAP_EQ              "LIMIT_HEAP="
 #define STRING_LIMIT_MATCH_EQ             "LIMIT_MATCH="
 #define STRING_LIMIT_DEPTH_EQ             "LIMIT_DEPTH="
@@ -1216,6 +1243,7 @@ only. */
 #define STRING_naplb0                STR_n STR_a STR_p STR_l STR_b "\0"
 #define STRING_nla0                  STR_n STR_l STR_a "\0"
 #define STRING_nlb0                  STR_n STR_l STR_b "\0"
+#define STRING_scs0                  STR_s STR_c STR_s "\0"
 #define STRING_sr0                   STR_s STR_r "\0"
 #define STRING_asr0                  STR_a STR_s STR_r "\0"
 #define STRING_positive_lookahead0   STR_p STR_o STR_s STR_i STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_a STR_h STR_e STR_a STR_d "\0"
@@ -1226,6 +1254,7 @@ only. */
 #define STRING_negative_lookbehind0  STR_n STR_e STR_g STR_a STR_t STR_i STR_v STR_e STR_UNDERSCORE STR_l STR_o STR_o STR_k STR_b STR_e STR_h STR_i STR_n STR_d "\0"
 #define STRING_script_run0           STR_s STR_c STR_r STR_i STR_p STR_t STR_UNDERSCORE STR_r STR_u STR_n "\0"
 #define STRING_atomic_script_run     STR_a STR_t STR_o STR_m STR_i STR_c STR_UNDERSCORE STR_s STR_c STR_r STR_i STR_p STR_t STR_UNDERSCORE STR_r STR_u STR_n
+#define STRING_scan_substring0       STR_s STR_c STR_a STR_n STR_UNDERSCORE STR_s STR_u STR_b STR_s STR_t STR_r STR_i STR_n STR_g "\0"
 
 #define STRING_alpha0                STR_a STR_l STR_p STR_h STR_a "\0"
 #define STRING_lower0                STR_l STR_o STR_w STR_e STR_r "\0"
@@ -1266,6 +1295,8 @@ only. */
 #define STRING_NO_START_OPT_RIGHTPAR      STR_N STR_O STR_UNDERSCORE STR_S STR_T STR_A STR_R STR_T STR_UNDERSCORE STR_O STR_P STR_T STR_RIGHT_PARENTHESIS
 #define STRING_NOTEMPTY_RIGHTPAR          STR_N STR_O STR_T STR_E STR_M STR_P STR_T STR_Y STR_RIGHT_PARENTHESIS
 #define STRING_NOTEMPTY_ATSTART_RIGHTPAR  STR_N STR_O STR_T STR_E STR_M STR_P STR_T STR_Y STR_UNDERSCORE STR_A STR_T STR_S STR_T STR_A STR_R STR_T STR_RIGHT_PARENTHESIS
+#define STRING_CASELESS_RESTRICT_RIGHTPAR STR_C STR_A STR_S STR_E STR_L STR_E STR_S STR_S STR_UNDERSCORE STR_R STR_E STR_S STR_T STR_R STR_I STR_C STR_T STR_RIGHT_PARENTHESIS
+#define STRING_TURKISH_CASING_RIGHTPAR    STR_T STR_U STR_R STR_K STR_I STR_S STR_H STR_UNDERSCORE STR_C STR_A STR_S STR_I STR_N STR_G STR_RIGHT_PARENTHESIS
 #define STRING_LIMIT_HEAP_EQ              STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_H STR_E STR_A STR_P STR_EQUALS_SIGN
 #define STRING_LIMIT_MATCH_EQ             STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_M STR_A STR_T STR_C STR_H STR_EQUALS_SIGN
 #define STRING_LIMIT_DEPTH_EQ             STR_L STR_I STR_M STR_I STR_T STR_UNDERSCORE STR_D STR_E STR_P STR_T STR_H STR_EQUALS_SIGN
@@ -1290,21 +1321,22 @@ only. */
 changed, the autopossessifying table in pcre2_auto_possess.c must be updated to
 match. */
 
-#define PT_ANY        0    /* Any property - matches all chars */
-#define PT_LAMP       1    /* L& - the union of Lu, Ll, Lt */
-#define PT_GC         2    /* Specified general characteristic (e.g. L) */
-#define PT_PC         3    /* Specified particular characteristic (e.g. Lu) */
-#define PT_SC         4    /* Script only (e.g. Han) */
-#define PT_SCX        5    /* Script extensions (includes SC) */
-#define PT_ALNUM      6    /* Alphanumeric - the union of L and N */
-#define PT_SPACE      7    /* Perl space - general category Z plus 9,10,12,13 */
-#define PT_PXSPACE    8    /* POSIX space - Z plus 9,10,11,12,13 */
-#define PT_WORD       9    /* Word - L, N, Mn, or Pc */
-#define PT_CLIST     10    /* Pseudo-property: match character list */
-#define PT_UCNC      11    /* Universal Character nameable character */
-#define PT_BIDICL    12    /* Specified bidi class */
-#define PT_BOOL      13    /* Boolean property */
-#define PT_TABSIZE   14    /* Size of square table for autopossessify tests */
+#define PT_LAMP       0    /* L& - the union of Lu, Ll, Lt */
+#define PT_GC         1    /* Specified general characteristic (e.g. L) */
+#define PT_PC         2    /* Specified particular characteristic (e.g. Lu) */
+#define PT_SC         3    /* Script only (e.g. Han) */
+#define PT_SCX        4    /* Script extensions (includes SC) */
+#define PT_ALNUM      5    /* Alphanumeric - the union of L and N */
+#define PT_SPACE      6    /* Perl space - general category Z plus 9,10,12,13 */
+#define PT_PXSPACE    7    /* POSIX space - Z plus 9,10,11,12,13 */
+#define PT_WORD       8    /* Word - L, N, Mn, or Pc */
+#define PT_CLIST      9    /* Pseudo-property: match character list */
+#define PT_UCNC      10    /* Universal Character nameable character */
+#define PT_BIDICL    11    /* Specified bidi class */
+#define PT_BOOL      12    /* Boolean property */
+#define PT_ANY       13    /* Must be the last entry!
+                              Any property - matches all chars */
+#define PT_TABSIZE PT_ANY  /* Size of square table for autopossessify tests */
 
 /* The following special properties are used only in XCLASS items, when POSIX
 classes are specified and PCRE2_UCP is set - in other words, for Unicode
@@ -1334,6 +1366,94 @@ contain characters with values greater than 255. */
 #define XCL_RANGE    2     /* A range (two multibyte chars) follows */
 #define XCL_PROP     3     /* Unicode property (2-byte property code follows) */
 #define XCL_NOTPROP  4     /* Unicode inverted property (ditto) */
+/* This value represents the beginning of character lists. The value
+is 16 bit long, and stored as a high and low byte pair in 8 bit mode.
+The lower 12 bit contains information about character lists (see later). */
+#define XCL_LIST     (sizeof(PCRE2_UCHAR) == 1 ? 0x10 : 0x1000)
+
+/* When a character class contains many characters/ranges,
+they are stored in character lists. There are four character
+lists which contain characters/ranges within a given range.
+
+The name, character range and item size for each list:
+Low16    [0x100 - 0x7fff]            16 bit items
+High16   [0x8000 - 0xffff]           16 bit items
+Low32    [0x10000 - 0x7fffffff]      32 bit items
+High32   [0x80000000 - 0xffffffff]   32 bit items
+
+The Low32 character list is used only when utf encoding or 32 bit
+character width is enabled, and the High32 character is used only
+when 32 bit character width is enabled.
+
+Each character list contain items. The lowest bit represents that
+an item is the beginning of a range (bit is cleared), or not (bit
+is set). The other bits represent the character shifted left by
+one, so its highest bit is discarded. Due to the layout of character
+lists, the highest bit of a character is always known:
+
+Low16 and Low32: the highest bit is always zero
+High16 and High32: the highest bit is always one
+
+The items are ordered in increasing order, so binary search can be
+used to find the lower bound of an input character. The lower bound
+is the highest item, which value is less or equal than the input
+character. If the lower bit of the item is cleard, or the character
+stored in the item equals to the input character, the input
+character is in the character list. */
+
+/* Character list constants. */
+#define XCL_CHAR_LIST_LOW_16_START 0x100
+#define XCL_CHAR_LIST_LOW_16_END 0x7fff
+#define XCL_CHAR_LIST_LOW_16_ADD 0x0
+
+#define XCL_CHAR_LIST_HIGH_16_START 0x8000
+#define XCL_CHAR_LIST_HIGH_16_END 0xffff
+#define XCL_CHAR_LIST_HIGH_16_ADD 0x8000
+
+#define XCL_CHAR_LIST_LOW_32_START 0x10000
+#define XCL_CHAR_LIST_LOW_32_END 0x7fffffff
+#define XCL_CHAR_LIST_LOW_32_ADD 0x0
+
+#define XCL_CHAR_LIST_HIGH_32_START 0x80000000
+#define XCL_CHAR_LIST_HIGH_32_END 0xffffffff
+#define XCL_CHAR_LIST_HIGH_32_ADD 0x80000000
+
+/* Mask for getting the descriptors of character list ranges.
+Each descriptor has XCL_TYPE_BIT_LEN bits, and can be processed
+by XCL_BEGIN_WITH_RANGE and XCL_ITEM_COUNT_MASK macros. */
+#define XCL_TYPE_MASK 0xfff
+#define XCL_TYPE_BIT_LEN 3
+/* If this bit is set, the first item of the character list is the
+end of a range, which started before the starting character of the
+character list. */
+#define XCL_BEGIN_WITH_RANGE 0x4
+/* Number of items in the character list: 0, 1, or 2. The value 3
+represents that the item count is stored at the begining of the
+character list. The item count has the same width as the items
+in the character list (e.g. 16 bit for Low16 and High16 lists). */
+#define XCL_ITEM_COUNT_MASK 0x3
+/* Shift and flag for constructing character list items. The XCL_CHAR_END
+is set, when the item is not the beginning of a range. The XCL_CHAR_SHIFT
+can be used to encode / decode the character value stored in an item. */
+#define XCL_CHAR_END 0x1
+#define XCL_CHAR_SHIFT 1
+
+/* Flag bits for an extended class (OP_ECLASS), which is used for complex
+character matches such as [\p{Greek} && \p{Ll}]. */
+
+#define ECL_MAP     0x01  /* Flag: a 32-byte map is present */
+
+/* Type tags for the items stored in an extended class (OP_ECLASS). These items
+follow the OP_ECLASS's flag char and bitmap, and represent a Reverse Polish
+Notation list of operands and operators manipulating a stack of bits. */
+
+#define ECL_AND     1 /* Pop two from the stack, AND, and push result. */
+#define ECL_OR      2 /* Pop two from the stack, OR, and push result. */
+#define ECL_XOR     3 /* Pop two from the stack, XOR, and push result. */
+#define ECL_NOT     4 /* Pop one from the stack, NOT, and push result. */
+#define ECL_XCLASS  5 /* XCLASS nested within ECLASS; match and push result. */
+#define ECL_ANY     6 /* Temporary, only used during compilation. */
+#define ECL_NONE    7 /* Temporary, only used during compilation. */
 
 /* These are escaped items that aren't just an encoding of a particular data
 value such as \n. They must have non-zero values, as check_escape() returns 0
@@ -1555,102 +1675,105 @@ enum {
                               character > 255 is encountered. */
   OP_XCLASS,         /* 112 Extended class for handling > 255 chars within the
                               class. This does both positive and negative. */
-  OP_REF,            /* 113 Match a back reference, casefully */
-  OP_REFI,           /* 114 Match a back reference, caselessly */
-  OP_DNREF,          /* 115 Match a duplicate name backref, casefully */
-  OP_DNREFI,         /* 116 Match a duplicate name backref, caselessly */
-  OP_RECURSE,        /* 117 Match a numbered subpattern (possibly recursive) */
-  OP_CALLOUT,        /* 118 Call out to external function if provided */
-  OP_CALLOUT_STR,    /* 119 Call out with string argument */
+  OP_ECLASS,         /* 113 Really-extended class, for handling logical
+                              expressions computed over characters. */
+  OP_REF,            /* 114 Match a back reference, casefully */
+  OP_REFI,           /* 115 Match a back reference, caselessly */
+  OP_DNREF,          /* 116 Match a duplicate name backref, casefully */
+  OP_DNREFI,         /* 117 Match a duplicate name backref, caselessly */
+  OP_RECURSE,        /* 118 Match a numbered subpattern (possibly recursive) */
+  OP_CALLOUT,        /* 119 Call out to external function if provided */
+  OP_CALLOUT_STR,    /* 120 Call out with string argument */
 
-  OP_ALT,            /* 120 Start of alternation */
-  OP_KET,            /* 121 End of group that doesn't have an unbounded repeat */
-  OP_KETRMAX,        /* 122 These two must remain together and in this */
-  OP_KETRMIN,        /* 123 order. They are for groups the repeat for ever. */
-  OP_KETRPOS,        /* 124 Possessive unlimited repeat. */
+  OP_ALT,            /* 121 Start of alternation */
+  OP_KET,            /* 122 End of group that doesn't have an unbounded repeat */
+  OP_KETRMAX,        /* 123 These two must remain together and in this */
+  OP_KETRMIN,        /* 124 order. They are for groups the repeat for ever. */
+  OP_KETRPOS,        /* 125 Possessive unlimited repeat. */
 
   /* The assertions must come before BRA, CBRA, ONCE, and COND. */
 
-  OP_REVERSE,        /* 125 Move pointer back - used in lookbehind assertions */
-  OP_VREVERSE,       /* 126 Move pointer back - variable */
-  OP_ASSERT,         /* 127 Positive lookahead */
-  OP_ASSERT_NOT,     /* 128 Negative lookahead */
-  OP_ASSERTBACK,     /* 129 Positive lookbehind */
-  OP_ASSERTBACK_NOT, /* 130 Negative lookbehind */
-  OP_ASSERT_NA,      /* 131 Positive non-atomic lookahead */
-  OP_ASSERTBACK_NA,  /* 132 Positive non-atomic lookbehind */
+  OP_REVERSE,        /* 126 Move pointer back - used in lookbehind assertions */
+  OP_VREVERSE,       /* 127 Move pointer back - variable */
+  OP_ASSERT,         /* 128 Positive lookahead */
+  OP_ASSERT_NOT,     /* 129 Negative lookahead */
+  OP_ASSERTBACK,     /* 130 Positive lookbehind */
+  OP_ASSERTBACK_NOT, /* 131 Negative lookbehind */
+  OP_ASSERT_NA,      /* 132 Positive non-atomic lookahead */
+  OP_ASSERTBACK_NA,  /* 133 Positive non-atomic lookbehind */
+  OP_ASSERT_SCS,     /* 134 Scan substring */
 
   /* ONCE, SCRIPT_RUN, BRA, BRAPOS, CBRA, CBRAPOS, and COND must come
   immediately after the assertions, with ONCE first, as there's a test for >=
   ONCE for a subpattern that isn't an assertion. The POS versions must
   immediately follow the non-POS versions in each case. */
 
-  OP_ONCE,           /* 133 Atomic group, contains captures */
-  OP_SCRIPT_RUN,     /* 134 Non-capture, but check characters' scripts */
-  OP_BRA,            /* 135 Start of non-capturing bracket */
-  OP_BRAPOS,         /* 136 Ditto, with unlimited, possessive repeat */
-  OP_CBRA,           /* 137 Start of capturing bracket */
-  OP_CBRAPOS,        /* 138 Ditto, with unlimited, possessive repeat */
-  OP_COND,           /* 139 Conditional group */
+  OP_ONCE,           /* 135 Atomic group, contains captures */
+  OP_SCRIPT_RUN,     /* 136 Non-capture, but check characters' scripts */
+  OP_BRA,            /* 137 Start of non-capturing bracket */
+  OP_BRAPOS,         /* 138 Ditto, with unlimited, possessive repeat */
+  OP_CBRA,           /* 139 Start of capturing bracket */
+  OP_CBRAPOS,        /* 140 Ditto, with unlimited, possessive repeat */
+  OP_COND,           /* 141 Conditional group */
 
   /* These five must follow the previous five, in the same order. There's a
   check for >= SBRA to distinguish the two sets. */
 
-  OP_SBRA,           /* 140 Start of non-capturing bracket, check empty  */
-  OP_SBRAPOS,        /* 141 Ditto, with unlimited, possessive repeat */
-  OP_SCBRA,          /* 142 Start of capturing bracket, check empty */
-  OP_SCBRAPOS,       /* 143 Ditto, with unlimited, possessive repeat */
-  OP_SCOND,          /* 144 Conditional group, check empty */
+  OP_SBRA,           /* 142 Start of non-capturing bracket, check empty  */
+  OP_SBRAPOS,        /* 143 Ditto, with unlimited, possessive repeat */
+  OP_SCBRA,          /* 144 Start of capturing bracket, check empty */
+  OP_SCBRAPOS,       /* 145 Ditto, with unlimited, possessive repeat */
+  OP_SCOND,          /* 146 Conditional group, check empty */
 
   /* The next two pairs must (respectively) be kept together. */
 
-  OP_CREF,           /* 145 Used to hold a capture number as condition */
-  OP_DNCREF,         /* 146 Used to point to duplicate names as a condition */
-  OP_RREF,           /* 147 Used to hold a recursion number as condition */
-  OP_DNRREF,         /* 148 Used to point to duplicate names as a condition */
-  OP_FALSE,          /* 149 Always false (used by DEFINE and VERSION) */
-  OP_TRUE,           /* 150 Always true (used by VERSION) */
+  OP_CREF,           /* 147 Used to hold a capture number as condition */
+  OP_DNCREF,         /* 148 Used to point to duplicate names as a condition */
+  OP_RREF,           /* 149 Used to hold a recursion number as condition */
+  OP_DNRREF,         /* 150 Used to point to duplicate names as a condition */
+  OP_FALSE,          /* 151 Always false (used by DEFINE and VERSION) */
+  OP_TRUE,           /* 152 Always true (used by VERSION) */
 
-  OP_BRAZERO,        /* 151 These two must remain together and in this */
-  OP_BRAMINZERO,     /* 152 order. */
-  OP_BRAPOSZERO,     /* 153 */
+  OP_BRAZERO,        /* 153 These two must remain together and in this */
+  OP_BRAMINZERO,     /* 154 order. */
+  OP_BRAPOSZERO,     /* 155 */
 
   /* These are backtracking control verbs */
 
-  OP_MARK,           /* 154 always has an argument */
-  OP_PRUNE,          /* 155 */
-  OP_PRUNE_ARG,      /* 156 same, but with argument */
-  OP_SKIP,           /* 157 */
-  OP_SKIP_ARG,       /* 158 same, but with argument */
-  OP_THEN,           /* 159 */
-  OP_THEN_ARG,       /* 160 same, but with argument */
-  OP_COMMIT,         /* 161 */
-  OP_COMMIT_ARG,     /* 162 same, but with argument */
+  OP_MARK,           /* 156 always has an argument */
+  OP_PRUNE,          /* 157 */
+  OP_PRUNE_ARG,      /* 158 same, but with argument */
+  OP_SKIP,           /* 159 */
+  OP_SKIP_ARG,       /* 160 same, but with argument */
+  OP_THEN,           /* 161 */
+  OP_THEN_ARG,       /* 162 same, but with argument */
+  OP_COMMIT,         /* 163 */
+  OP_COMMIT_ARG,     /* 164 same, but with argument */
 
   /* These are forced failure and success verbs. FAIL and ACCEPT do accept an
   argument, but these cases can be compiled as, for example, (*MARK:X)(*FAIL)
   without the need for a special opcode. */
 
-  OP_FAIL,           /* 163 */
-  OP_ACCEPT,         /* 164 */
-  OP_ASSERT_ACCEPT,  /* 165 Used inside assertions */
-  OP_CLOSE,          /* 166 Used before OP_ACCEPT to close open captures */
+  OP_FAIL,           /* 165 */
+  OP_ACCEPT,         /* 166 */
+  OP_ASSERT_ACCEPT,  /* 167 Used inside assertions */
+  OP_CLOSE,          /* 168 Used before OP_ACCEPT to close open captures */
 
   /* This is used to skip a subpattern with a {0} quantifier */
 
-  OP_SKIPZERO,       /* 167 */
+  OP_SKIPZERO,       /* 169 */
 
   /* This is used to identify a DEFINE group during compilation so that it can
   be checked for having only one branch. It is changed to OP_FALSE before
   compilation finishes. */
 
-  OP_DEFINE,         /* 168 */
+  OP_DEFINE,         /* 170 */
 
   /* These opcodes replace their normal counterparts in UCP mode when
   PCRE2_EXTRA_ASCII_BSW is not set. */
 
-  OP_NOT_UCP_WORD_BOUNDARY, /* 169 */
-  OP_UCP_WORD_BOUNDARY,     /* 170 */
+  OP_NOT_UCP_WORD_BOUNDARY, /* 171 */
+  OP_UCP_WORD_BOUNDARY,     /* 172 */
 
   /* This is not an opcode, but is used to check that tables indexed by opcode
   are the correct length, in order to catch updating errors - there have been
@@ -1693,19 +1816,21 @@ some cases doesn't actually use these names at all). */
   "*+","++", "?+", "{",                                           \
   "*", "*?", "+", "+?", "?", "??", "{", "{",                      \
   "*+","++", "?+", "{",                                           \
-  "class", "nclass", "xclass", "Ref", "Refi", "DnRef", "DnRefi",  \
+  "class", "nclass", "xclass", "eclass",                          \
+  "Ref", "Refi", "DnRef", "DnRefi",                               \
   "Recurse", "Callout", "CalloutStr",                             \
   "Alt", "Ket", "KetRmax", "KetRmin", "KetRpos",                  \
   "Reverse", "VReverse", "Assert", "Assert not",                  \
   "Assert back", "Assert back not",                               \
   "Non-atomic assert", "Non-atomic assert back",                  \
+  "Scan substring",                                               \
   "Once",                                                         \
   "Script run",                                                   \
   "Bra", "BraPos", "CBra", "CBraPos",                             \
   "Cond",                                                         \
   "SBra", "SBraPos", "SCBra", "SCBraPos",                         \
   "SCond",                                                        \
-  "Cond ref", "Cond dnref", "Cond rec", "Cond dnrec",             \
+  "Capture ref", "Capture dnref", "Cond rec", "Cond dnrec",       \
   "Cond false", "Cond true",                                      \
   "Brazero", "Braminzero", "Braposzero",                          \
   "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP",                  \
@@ -1766,10 +1891,11 @@ in UTF-8 mode. The code that uses this table must know about such things. */
   1+(32/sizeof(PCRE2_UCHAR)),    /* CLASS                                  */ \
   1+(32/sizeof(PCRE2_UCHAR)),    /* NCLASS                                 */ \
   0,                             /* XCLASS - variable length               */ \
+  0,                             /* ECLASS - variable length               */ \
   1+IMM2_SIZE,                   /* REF                                    */ \
-  1+IMM2_SIZE,                   /* REFI                                   */ \
+  1+IMM2_SIZE+1,                 /* REFI                                   */ \
   1+2*IMM2_SIZE,                 /* DNREF                                  */ \
-  1+2*IMM2_SIZE,                 /* DNREFI                                 */ \
+  1+2*IMM2_SIZE+1,               /* DNREFI                                 */ \
   1+LINK_SIZE,                   /* RECURSE                                */ \
   1+2*LINK_SIZE+1,               /* CALLOUT                                */ \
   0,                             /* CALLOUT_STR - variable length          */ \
@@ -1786,6 +1912,7 @@ in UTF-8 mode. The code that uses this table must know about such things. */
   1+LINK_SIZE,                   /* Assert behind not                      */ \
   1+LINK_SIZE,                   /* NA Assert                              */ \
   1+LINK_SIZE,                   /* NA Assert behind                       */ \
+  1+LINK_SIZE,                   /* Scan substring                         */ \
   1+LINK_SIZE,                   /* ONCE                                   */ \
   1+LINK_SIZE,                   /* SCRIPT_RUN                             */ \
   1+LINK_SIZE,                   /* BRA                                    */ \
@@ -1815,6 +1942,11 @@ in UTF-8 mode. The code that uses this table must know about such things. */
 
 #define RREF_ANY  0xffff
 
+/* Constants used by OP_REFI and OP_DNREFI to control matching behaviour. */
+
+#define REFI_FLAG_CASELESS_RESTRICT  0x1
+#define REFI_FLAG_TURKISH_CASING     0x2
+
 
 /* ---------- Private structures that are mode-independent. ---------- */
 
@@ -1890,6 +2022,14 @@ typedef struct {
 #define UCD_SCRIPTX(ch)     UCD_SCRIPTX_PROP(GET_UCD(ch))
 #define UCD_BPROPS(ch)      UCD_BPROPS_PROP(GET_UCD(ch))
 #define UCD_BIDICLASS(ch)   UCD_BIDICLASS_PROP(GET_UCD(ch))
+#define UCD_ANY_I(ch) \
+  /* match any of the four characters 'i', 'I', U+0130, U+0131 */ \
+  (((uint32_t)(ch) | 0x20u) == 0x69u || ((uint32_t)(ch) | 1u) == 0x0131u)
+#define UCD_DOTTED_I(ch) \
+  ((uint32_t)(ch) == 0x69u || (uint32_t)(ch) == 0x0130u)
+#define UCD_FOLD_I_TURKISH(ch) \
+  ((uint32_t)(ch) == 0x0130u ?   0x69u : \
+   (uint32_t)(ch) ==   0x49u ? 0x0131u : (uint32_t)(ch))
 
 /* The "scriptx" and bprops fields contain offsets into vectors of 32-bit words
 that form a bitmap representing a list of scripts or boolean properties. These
@@ -1955,6 +2095,9 @@ extern const uint8_t          PRIV(utf8_table4)[];
 #define _pcre2_vspace_list             PCRE2_SUFFIX(_pcre2_vspace_list_)
 #define _pcre2_ucd_boolprop_sets       PCRE2_SUFFIX(_pcre2_ucd_boolprop_sets_)
 #define _pcre2_ucd_caseless_sets       PCRE2_SUFFIX(_pcre2_ucd_caseless_sets_)
+#define _pcre2_ucd_turkish_dotted_i_caseset  PCRE2_SUFFIX(_pcre2_ucd_turkish_dotted_i_caseset_)
+#define _pcre2_ucd_nocase_ranges       PCRE2_SUFFIX(_pcre2_ucd_nocase_ranges_)
+#define _pcre2_ucd_nocase_ranges_size  PCRE2_SUFFIX(_pcre2_ucd_nocase_ranges_size_)
 #define _pcre2_ucd_digit_sets          PCRE2_SUFFIX(_pcre2_ucd_digit_sets_)
 #define _pcre2_ucd_script_sets         PCRE2_SUFFIX(_pcre2_ucd_script_sets_)
 #define _pcre2_ucd_records             PCRE2_SUFFIX(_pcre2_ucd_records_)
@@ -1971,14 +2114,17 @@ extern const uint8_t          PRIV(utf8_table4)[];
 extern const uint8_t                   PRIV(OP_lengths)[];
 extern const uint32_t                  PRIV(callout_end_delims)[];
 extern const uint32_t                  PRIV(callout_start_delims)[];
-extern const pcre2_compile_context     PRIV(default_compile_context);
-extern const pcre2_convert_context     PRIV(default_convert_context);
-extern const pcre2_match_context       PRIV(default_match_context);
+extern pcre2_compile_context           PRIV(default_compile_context);
+extern pcre2_convert_context           PRIV(default_convert_context);
+extern pcre2_match_context             PRIV(default_match_context);
 extern const uint8_t                   PRIV(default_tables)[];
 extern const uint32_t                  PRIV(hspace_list)[];
 extern const uint32_t                  PRIV(vspace_list)[];
 extern const uint32_t                  PRIV(ucd_boolprop_sets)[];
 extern const uint32_t                  PRIV(ucd_caseless_sets)[];
+extern const uint32_t                  PRIV(ucd_turkish_dotted_i_caseset);
+extern const uint32_t                  PRIV(ucd_nocase_ranges)[];
+extern const uint32_t                  PRIV(ucd_nocase_ranges_size);
 extern const uint32_t                  PRIV(ucd_digit_sets)[];
 extern const uint32_t                  PRIV(ucd_script_sets)[];
 extern const ucd_record                PRIV(ucd_records)[];
@@ -2039,11 +2185,12 @@ is available. */
 #define _pcre2_valid_utf             PCRE2_SUFFIX(_pcre2_valid_utf_)
 #define _pcre2_was_newline           PCRE2_SUFFIX(_pcre2_was_newline_)
 #define _pcre2_xclass                PCRE2_SUFFIX(_pcre2_xclass_)
+#define _pcre2_eclass                PCRE2_SUFFIX(_pcre2_eclass_)
 
 extern int          _pcre2_auto_possessify(PCRE2_UCHAR *,
                       const compile_block *);
 extern int          _pcre2_check_escape(PCRE2_SPTR *, PCRE2_SPTR, uint32_t *,
-                      int *, uint32_t, uint32_t, BOOL, compile_block *);
+                      int *, uint32_t, uint32_t, uint32_t, BOOL, compile_block *);
 extern PCRE2_SPTR   _pcre2_extuni(uint32_t, PCRE2_SPTR, PCRE2_SPTR, PCRE2_SPTR,
                       BOOL, int *);
 extern PCRE2_SPTR   _pcre2_find_bracket(PCRE2_SPTR, BOOL, int);
@@ -2066,7 +2213,9 @@ extern int          _pcre2_study(pcre2_real_code *);
 extern int          _pcre2_valid_utf(PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE *);
 extern BOOL         _pcre2_was_newline(PCRE2_SPTR, uint32_t, PCRE2_SPTR,
                       uint32_t *, BOOL);
-extern BOOL         _pcre2_xclass(uint32_t, PCRE2_SPTR, BOOL);
+extern BOOL         _pcre2_xclass(uint32_t, PCRE2_SPTR, const uint8_t *, BOOL);
+extern BOOL         _pcre2_eclass(uint32_t, PCRE2_SPTR, PCRE2_SPTR,
+                      const uint8_t *, BOOL);
 
 /* This function is needed only when memmove() is not available. */
 
@@ -2079,6 +2228,8 @@ extern void *       _pcre2_memmove(void *, const void *, size_t);
 
 extern BOOL         PRIV(ckd_smul)(PCRE2_SIZE *, int, int);
 
+#include "pcre2_util.h"
+
 #endif  /* PCRE2_INTERNAL_H_IDEMPOTENT_GUARD */
 
 /* End of pcre2_internal.h */
diff --git a/engine/thirdparty/pcre2/src/pcre2_intmodedep.h b/engine/thirdparty/pcre2/src/pcre2_intmodedep.h
index 5fcddce5..6b858139 100644
--- a/engine/thirdparty/pcre2/src/pcre2_intmodedep.h
+++ b/engine/thirdparty/pcre2/src/pcre2_intmodedep.h
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,7 @@ to have access to the hidden structures at all supported widths.
 
 Some of the mode-dependent macros are required at different widths for
 different parts of the pcre2test code (in particular, the included
-pcre_printint.c file). We undefine them here so that they can be re-defined for
+pcre2_printint.c file). We undefine them here so that they can be re-defined for
 multiple inclusions. Not all of these are used in pcre2test, but it's easier
 just to undefine them all. */
 
@@ -435,7 +435,7 @@ UTF-16 mode. */
   c = *eptr; \
   if ((c & 0xfc00u) == 0xd800u) GETUTF16LEN(c, eptr, len);
 
-/* Get the next UTF-816character, testing for UTF-16 mode, not advancing the
+/* Get the next UTF-16 character, testing for UTF-16 mode, not advancing the
 pointer, incrementing length if there is a low surrogate. This is called when
 we do not know if we are in UTF-16 mode. */
 
@@ -556,6 +556,11 @@ code that uses them is simpler because it assumes this. */
 /* The real general context structure. At present it holds only data for custom
 memory control. */
 
+/* WARNING: if this is ever changed, code in pcre2_substitute.c will have to be
+changed because it builds a general context "by hand" in order to avoid the
+malloc() call in pcre2_general_context)_create(). There is also code in
+pcre2_match.c that makes the same assumption. */
+
 typedef struct pcre2_real_general_context {
   pcre2_memctl memctl;
 } pcre2_real_general_context;
@@ -568,11 +573,13 @@ typedef struct pcre2_real_compile_context {
   void *stack_guard_data;
   const uint8_t *tables;
   PCRE2_SIZE max_pattern_length;
+  PCRE2_SIZE max_pattern_compiled_length;
   uint16_t bsr_convention;
   uint16_t newline_convention;
   uint32_t parens_nest_limit;
   uint32_t extra_options;
   uint32_t max_varlookbehind;
+  uint32_t optimization_flags;
 } pcre2_real_compile_context;
 
 /* The real match context structure. */
@@ -583,10 +590,13 @@ typedef struct pcre2_real_match_context {
   pcre2_jit_callback jit_callback;
   void *jit_callback_data;
 #endif
-  int    (*callout)(pcre2_callout_block *, void *);
-  void    *callout_data;
-  int    (*substitute_callout)(pcre2_substitute_callout_block *, void *);
-  void    *substitute_callout_data;
+  int        (*callout)(pcre2_callout_block *, void *);
+  void        *callout_data;
+  int        (*substitute_callout)(pcre2_substitute_callout_block *, void *);
+  void        *substitute_callout_data;
+  PCRE2_SIZE (*substitute_case_callout)(PCRE2_SPTR, PCRE2_SIZE, PCRE2_UCHAR *,
+                                        PCRE2_SIZE, int, void *);
+  void        *substitute_case_callout_data;
   PCRE2_SIZE offset_limit;
   uint32_t heap_limit;
   uint32_t match_limit;
@@ -622,6 +632,7 @@ typedef struct pcre2_real_code {
   void    *executable_jit;        /* Pointer to JIT code */
   uint8_t  start_bitmap[32];      /* Bitmap for starting code unit < 256 */
   CODE_BLOCKSIZE_TYPE blocksize;  /* Total (bytes) that was malloc-ed */
+  CODE_BLOCKSIZE_TYPE code_start; /* Byte code start offset */
   uint32_t magic_number;          /* Paranoid and endianness check */
   uint32_t compile_options;       /* Options passed to pcre2_compile() */
   uint32_t overall_options;       /* Options after processing the pattern */
@@ -640,6 +651,7 @@ typedef struct pcre2_real_code {
   uint16_t top_backref;           /* Highest numbered back reference */
   uint16_t name_entry_size;       /* Size (code units) of table entries */
   uint16_t name_count;            /* Number of name entries in the table */
+  uint32_t optimization_flags;    /* Optimizations enabled at compile time */
 } pcre2_real_code;
 
 /* The real match data structure. Define ovector as large as it can ever
@@ -715,6 +727,23 @@ typedef struct named_group {
   uint16_t     isdup;         /* TRUE if a duplicate */
 } named_group;
 
+/* Structure for caching sorted ranges. This improves the performance
+of translating META code to byte code. */
+
+typedef struct class_ranges {
+  struct class_ranges *next;       /* Next class ranges */
+  size_t char_lists_size;          /* Total size of encoded char lists */
+  size_t char_lists_start;         /* Start offset of encoded char lists */
+  uint16_t range_list_size;        /* Size of ranges array */
+  uint16_t char_lists_types;       /* The XCL_LIST header of char lists */
+  /* Followed by the list of ranges (start/end pairs) */
+} class_ranges;
+
+typedef union class_bits_storage {
+  uint8_t classbits[32];
+  uint32_t classwords[8];
+} class_bits_storage;
+
 /* Structure for passing "static" information around between the functions
 doing the compiling, so that they are thread-safe. */
 
@@ -724,14 +753,15 @@ typedef struct compile_block {
   const uint8_t *fcc;              /* Points to case-flipping table */
   const uint8_t *cbits;            /* Points to character type table */
   const uint8_t *ctypes;           /* Points to table of type maps */
-  PCRE2_SPTR start_workspace;      /* The start of working space */
-  PCRE2_SPTR start_code;           /* The start of the compiled code */
+  PCRE2_UCHAR *start_workspace;    /* The start of working space */
+  PCRE2_UCHAR *start_code;         /* The start of the compiled code */
   PCRE2_SPTR start_pattern;        /* The start of the pattern */
   PCRE2_SPTR end_pattern;          /* The end of the pattern */
   PCRE2_UCHAR *name_table;         /* The name/number table */
   PCRE2_SIZE workspace_size;       /* Size of workspace */
   PCRE2_SIZE small_ref_offset[10]; /* Offsets for \1 to \9 */
   PCRE2_SIZE erroroffset;          /* Offset of error in pattern */
+  class_bits_storage classbits;    /* Temporary store for classbits */
   uint16_t names_found;            /* Number of entries so far */
   uint16_t name_entry_size;        /* Size of each entry */
   uint16_t parens_depth;           /* Depth of nested parentheses */
@@ -749,9 +779,9 @@ typedef struct compile_block {
   uint32_t backref_map;            /* Bitmap of low back refs */
   uint32_t nltype;                 /* Newline type */
   uint32_t nllen;                  /* Newline string length */
-  uint32_t class_range_start;      /* Overall class range start */
-  uint32_t class_range_end;        /* Overall class range end */
   PCRE2_UCHAR nl[4];               /* Newline string when fixed length */
+  uint8_t class_op_used[ECLASS_NEST_LIMIT]; /* Operation used for
+                                               extended classes */
   uint32_t req_varyopt;            /* "After variable item" flag for reqbyte */
   uint32_t max_varlookbehind;      /* Limit for variable lookbehinds */
   int  max_lookbehind;             /* Maximum lookbehind encountered (characters) */
@@ -759,6 +789,11 @@ typedef struct compile_block {
   BOOL had_pruneorskip;            /* (*PRUNE) or (*SKIP) encountered */
   BOOL had_recurse;                /* Had a pattern recursion or subroutine call */
   BOOL dupnames;                   /* Duplicate names exist */
+#ifdef SUPPORT_WIDE_CHARS
+  class_ranges *cranges;           /* First class range. */
+  class_ranges *next_cranges;      /* Next class range. */
+  size_t char_lists_size;          /* Current size of character lists */
+#endif
 } compile_block;
 
 /* Structure for keeping the properties of the in-memory stack used
@@ -792,7 +827,7 @@ typedef struct heapframe {
   to RRMATCH(), but which do not need to be copied to new frames. */
 
   PCRE2_SPTR ecode;          /* The current position in the pattern */
-  PCRE2_SPTR temp_sptr[2];   /* Used for short-term PCRE_SPTR values */
+  PCRE2_SPTR temp_sptr[2];   /* Used for short-term PCRE2_SPTR values */
   PCRE2_SIZE length;         /* Used for character, string, or code lengths */
   PCRE2_SIZE back_frame;     /* Amount to subtract on RRETURN */
   PCRE2_SIZE temp_size;      /* Used for short-term PCRE2_SIZE values */
@@ -840,11 +875,10 @@ typedef struct heapframe {
   PCRE2_SIZE ovector[131072];   /* Must be last in the structure */
 } heapframe;
 
-/* This typedef is a check that the size of the heapframe structure is a
-multiple of PCRE2_SIZE. See various comments above. */
+/* Assert that the size of the heapframe structure is a multiple of PCRE2_SIZE.
+See various comments above. */
 
-typedef char check_heapframe_size[
-  ((sizeof(heapframe) % sizeof(PCRE2_SIZE)) == 0)? (+1):(-1)];
+STATIC_ASSERT((sizeof(heapframe) % sizeof(PCRE2_SIZE)) == 0, heapframe_size);
 
 /* Structure for computing the alignment of heapframe. */
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_jit_char_inc.h b/engine/thirdparty/pcre2/src/pcre2_jit_char_inc.h
new file mode 100644
index 00000000..69fe938f
--- /dev/null
+++ b/engine/thirdparty/pcre2/src/pcre2_jit_char_inc.h
@@ -0,0 +1,2280 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+                    This module by Zoltan Herczeg
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+/* XClass matching code. */
+
+#ifdef SUPPORT_WIDE_CHARS
+
+#define ECLASS_CHAR_DATA STACK_TOP
+#define ECLASS_STACK_DATA STACK_LIMIT
+
+#define SET_CHAR_OFFSET(value) \
+  if ((value) != charoffset) \
+    { \
+    if ((value) < charoffset) \
+      OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(charoffset - (value))); \
+    else \
+      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)((value) - charoffset)); \
+    } \
+  charoffset = (value);
+
+#define READ_FROM_CHAR_LIST(destination) \
+  if (list_ind <= 1) \
+    { \
+    destination = *(const uint16_t*)next_char; \
+    next_char += 2; \
+    } \
+  else \
+    { \
+    destination = *(const uint32_t*)next_char; \
+    next_char += 4; \
+    }
+
+#define XCLASS_LOCAL_RANGES_SIZE 32
+#define XCLASS_LOCAL_RANGES_LOG2_SIZE 5
+
+typedef struct xclass_stack_item {
+  sljit_u32 first_item;
+  sljit_u32 last_item;
+  struct sljit_jump *jump;
+} xclass_stack_item;
+
+typedef struct xclass_ranges {
+  size_t range_count;
+  /* Pointer to ranges. A stack area is provided when a small buffer is enough. */
+  uint32_t *ranges;
+  uint32_t local_ranges[XCLASS_LOCAL_RANGES_SIZE * 2];
+  /* Stack size must be log2(ranges / 2). */
+  xclass_stack_item *stack;
+  xclass_stack_item local_stack[XCLASS_LOCAL_RANGES_LOG2_SIZE];
+} xclass_ranges;
+
+static void xclass_compute_ranges(compiler_common *common, PCRE2_SPTR cc, xclass_ranges *ranges)
+{
+DEFINE_COMPILER;
+size_t range_count = 0, est_range_count;
+size_t est_stack_size, tmp;
+uint32_t type, list_ind;
+uint32_t est_type;
+uint32_t char_list_add, range_start, range_end;
+const uint8_t *next_char;
+const uint8_t *est_next_char;
+#if defined SUPPORT_UNICODE && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
+BOOL utf = common->utf;
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == [8|16] */
+
+if (*cc == XCL_SINGLE || *cc == XCL_RANGE)
+  {
+  /* Only a few ranges are present. */
+  do
+    {
+    type = *cc++;
+    SLJIT_ASSERT(type == XCL_SINGLE || type == XCL_RANGE);
+    GETCHARINCTEST(range_end, cc);
+    ranges->ranges[range_count] = range_end;
+
+    if (type == XCL_RANGE)
+      {
+      GETCHARINCTEST(range_end, cc);
+      }
+
+    ranges->ranges[range_count + 1] = range_end;
+    range_count += 2;
+    }
+  while (*cc != XCL_END);
+
+  SLJIT_ASSERT(range_count <= XCLASS_LOCAL_RANGES_SIZE);
+  ranges->range_count = range_count;
+  return;
+  }
+
+SLJIT_ASSERT(cc[0] >= XCL_LIST);
+#if PCRE2_CODE_UNIT_WIDTH == 8
+type = (uint32_t)(cc[0] << 8) | cc[1];
+cc += 2;
+#else
+type = cc[0];
+cc++;
+#endif  /* CODE_UNIT_WIDTH */
+
+/* Align characters. */
+next_char = (const uint8_t*)common->start - (GET(cc, 0) << 1);
+type &= XCL_TYPE_MASK;
+
+/* Estimate size. */
+est_next_char = next_char;
+est_type = type;
+est_range_count = 0;
+list_ind = 0;
+
+while (est_type > 0)
+  {
+  uint32_t item_count = est_type & XCL_ITEM_COUNT_MASK;
+
+  if (item_count == XCL_ITEM_COUNT_MASK)
+    {
+    if (list_ind <= 1)
+      {
+      item_count = *(const uint16_t*)est_next_char;
+      est_next_char += 2;
+      }
+    else
+      {
+      item_count = *(const uint32_t*)est_next_char;
+      est_next_char += 4;
+      }
+    }
+
+  est_type >>= XCL_TYPE_BIT_LEN;
+  est_next_char += (size_t)item_count << (list_ind <= 1 ? 1 : 2);
+  list_ind++;
+  est_range_count += item_count + 1;
+  }
+
+if (est_range_count > XCLASS_LOCAL_RANGES_SIZE)
+  {
+  est_stack_size = 0;
+  tmp = est_range_count - 1;
+
+  /* Compute log2(est_range_count) */
+  while (tmp > 0)
+    {
+    est_stack_size++;
+    tmp >>= 1;
+    }
+
+  ranges->stack = (xclass_stack_item*)SLJIT_MALLOC((sizeof(xclass_stack_item) * est_stack_size)
+    + ((sizeof(uint32_t) << 1) * (size_t)est_range_count), compiler->allocator_data);
+
+  if (ranges->stack == NULL)
+    {
+    sljit_set_compiler_memory_error(compiler);
+    ranges->ranges = NULL;
+    return;
+    }
+
+  ranges->ranges = (uint32_t*)(ranges->stack + est_stack_size);
+  }
+
+char_list_add = XCL_CHAR_LIST_LOW_16_ADD;
+range_start = ~(uint32_t)0;
+list_ind = 0;
+
+if ((type & XCL_BEGIN_WITH_RANGE) != 0)
+  range_start = XCL_CHAR_LIST_LOW_16_START;
+
+while (type > 0)
+  {
+  uint32_t item_count = type & XCL_ITEM_COUNT_MASK;
+
+  if (item_count == XCL_ITEM_COUNT_MASK)
+    {
+    READ_FROM_CHAR_LIST(item_count);
+    SLJIT_ASSERT(item_count >= XCL_ITEM_COUNT_MASK);
+    }
+
+  while (item_count > 0)
+    {
+    READ_FROM_CHAR_LIST(range_end);
+
+    if ((range_end & XCL_CHAR_END) != 0)
+      {
+      range_end = char_list_add + (range_end >> XCL_CHAR_SHIFT);
+
+      if (range_start == ~(uint32_t)0)
+        range_start = range_end;
+
+      ranges->ranges[range_count] = range_start;
+      ranges->ranges[range_count + 1] = range_end;
+      range_count += 2;
+      range_start = ~(uint32_t)0;
+      }
+    else
+      range_start = char_list_add + (range_end >> XCL_CHAR_SHIFT);
+
+    item_count--;
+    }
+
+  list_ind++;
+  type >>= XCL_TYPE_BIT_LEN;
+
+  if (range_start == ~(uint32_t)0)
+    {
+    if ((type & XCL_BEGIN_WITH_RANGE) != 0)
+      {
+      if (list_ind == 1) range_start = XCL_CHAR_LIST_HIGH_16_START;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+      else if (list_ind == 2) range_start = XCL_CHAR_LIST_LOW_32_START;
+      else range_start = XCL_CHAR_LIST_HIGH_32_START;
+#else
+      else range_start = XCL_CHAR_LIST_LOW_32_START;
+#endif
+      }
+    }
+  else if ((type & XCL_BEGIN_WITH_RANGE) == 0)
+    {
+    if (list_ind == 1) range_end = XCL_CHAR_LIST_LOW_16_END;
+    else if (list_ind == 2) range_end = XCL_CHAR_LIST_HIGH_16_END;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+    else if (list_ind == 3) range_end = XCL_CHAR_LIST_LOW_32_END;
+    else range_end = XCL_CHAR_LIST_HIGH_32_END;
+#else
+    else range_end = XCL_CHAR_LIST_LOW_32_END;
+#endif
+
+    ranges->ranges[range_count] = range_start;
+    ranges->ranges[range_count + 1] = range_end;
+    range_count += 2;
+    range_start = ~(uint32_t)0;
+    }
+
+  if (list_ind == 1) char_list_add = XCL_CHAR_LIST_HIGH_16_ADD;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+  else if (list_ind == 2) char_list_add = XCL_CHAR_LIST_LOW_32_ADD;
+  else char_list_add = XCL_CHAR_LIST_HIGH_32_ADD;
+#else
+  else char_list_add = XCL_CHAR_LIST_LOW_32_ADD;
+#endif
+  }
+
+SLJIT_ASSERT(range_count > 0 && range_count <= (est_range_count << 1));
+SLJIT_ASSERT(next_char <= (const uint8_t*)common->start);
+ranges->range_count = range_count;
+}
+
+static void xclass_check_bitset(compiler_common *common, const sljit_u8 *bitset, jump_list **found, jump_list **backtracks)
+{
+DEFINE_COMPILER;
+struct sljit_jump *jump;
+
+jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
+if (!optimize_class(common, bitset, (bitset[31] & 0x80) != 0, TRUE, found))
+  {
+  OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
+  OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
+  OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)bitset);
+  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
+  add_jump(compiler, found, JUMP(SLJIT_NOT_ZERO));
+  }
+
+add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
+JUMPHERE(jump);
+}
+
+#if defined SUPPORT_UNICODE && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
+
+static void xclass_update_min_max(compiler_common *common, PCRE2_SPTR cc, sljit_u32 *min_ptr, sljit_u32 *max_ptr)
+{
+uint32_t type, list_ind, c;
+sljit_u32 min = *min_ptr;
+sljit_u32 max = *max_ptr;
+uint32_t char_list_add;
+const uint8_t *next_char;
+BOOL utf = TRUE;
+
+/* This function is pointless without utf 8/16. */
+SLJIT_ASSERT(common->utf);
+if (*cc == XCL_SINGLE || *cc == XCL_RANGE)
+  {
+  /* Only a few ranges are present. */
+  do
+    {
+    type = *cc++;
+    SLJIT_ASSERT(type == XCL_SINGLE || type == XCL_RANGE);
+    GETCHARINCTEST(c, cc);
+
+    if (c < min)
+      min = c;
+
+    if (type == XCL_RANGE)
+      {
+      GETCHARINCTEST(c, cc);
+      }
+
+    if (c > max)
+      max = c;
+    }
+  while (*cc != XCL_END);
+
+  SLJIT_ASSERT(min <= MAX_UTF_CODE_POINT && max <= MAX_UTF_CODE_POINT && min <= max);
+  *min_ptr = min;
+  *max_ptr = max;
+  return;
+  }
+
+SLJIT_ASSERT(cc[0] >= XCL_LIST);
+#if PCRE2_CODE_UNIT_WIDTH == 8
+type = (uint32_t)(cc[0] << 8) | cc[1];
+cc += 2;
+#else
+type = cc[0];
+cc++;
+#endif  /* CODE_UNIT_WIDTH */
+
+/* Align characters. */
+next_char = (const uint8_t*)common->start - (GET(cc, 0) << 1);
+type &= XCL_TYPE_MASK;
+
+SLJIT_ASSERT(type != 0);
+
+/* Detect minimum. */
+
+/* Skip unused ranges. */
+list_ind = 0;
+while ((type & (XCL_BEGIN_WITH_RANGE | XCL_ITEM_COUNT_MASK)) == 0)
+  {
+  type >>= XCL_TYPE_BIT_LEN;
+  list_ind++;
+  }
+
+SLJIT_ASSERT(list_ind <= 2);
+switch (list_ind)
+  {
+  case 0:
+  char_list_add = XCL_CHAR_LIST_LOW_16_ADD;
+  c = XCL_CHAR_LIST_LOW_16_START;
+  break;
+
+  case 1:
+  char_list_add = XCL_CHAR_LIST_HIGH_16_ADD;
+  c = XCL_CHAR_LIST_HIGH_16_START;
+  break;
+
+  default:
+  char_list_add = XCL_CHAR_LIST_LOW_32_ADD;
+  c = XCL_CHAR_LIST_LOW_32_START;
+  break;
+  }
+
+if ((type & XCL_BEGIN_WITH_RANGE) != 0)
+  {
+  if (c < min)
+    min = c;
+  }
+else
+  {
+  if ((type & XCL_ITEM_COUNT_MASK) == XCL_ITEM_COUNT_MASK)
+    {
+    if (list_ind <= 1)
+      c = *(const uint16_t*)(next_char + 2);
+    else
+      c = *(const uint32_t*)(next_char + 4);
+    }
+  else
+    {
+    if (list_ind <= 1)
+      c = *(const uint16_t*)next_char;
+    else
+      c = *(const uint32_t*)next_char;
+    }
+
+  c = char_list_add + (c >> XCL_CHAR_SHIFT);
+  if (c < min)
+    min = c;
+  }
+
+/* Detect maximum. */
+
+/* Skip intermediate ranges. */
+while (TRUE)
+  {
+  if ((type & XCL_ITEM_COUNT_MASK) == XCL_ITEM_COUNT_MASK)
+    {
+    if (list_ind <= 1)
+      {
+      c = *(const uint16_t*)next_char;
+      next_char += (c + 1) << 1;
+      }
+    else
+      {
+      c = *(const uint32_t*)next_char;
+      next_char += (c + 1) << 2;
+      }
+    }
+  else
+    next_char += (type & XCL_ITEM_COUNT_MASK) << (list_ind <= 1 ? 1 : 2);
+
+  if ((type >> XCL_TYPE_BIT_LEN) == 0)
+    break;
+
+  list_ind++;
+  type >>= XCL_TYPE_BIT_LEN;
+  }
+
+SLJIT_ASSERT(list_ind <= 2 && type != 0);
+switch (list_ind)
+  {
+  case 0:
+  char_list_add = XCL_CHAR_LIST_LOW_16_ADD;
+  c = XCL_CHAR_LIST_LOW_16_END;
+  break;
+
+  case 1:
+  char_list_add = XCL_CHAR_LIST_HIGH_16_ADD;
+  c = XCL_CHAR_LIST_HIGH_16_END;
+  break;
+
+  default:
+  char_list_add = XCL_CHAR_LIST_LOW_32_ADD;
+  c = XCL_CHAR_LIST_LOW_32_END;
+  break;
+  }
+
+if ((type & XCL_ITEM_COUNT_MASK) != 0)
+  {
+  /* Type is reused as temporary. */
+  if (list_ind <= 1)
+    type = *(const uint16_t*)(next_char - 2);
+  else
+    type = *(const uint32_t*)(next_char - 4);
+
+  if (type & XCL_CHAR_END)
+    c = char_list_add + (type >> XCL_CHAR_SHIFT);
+  }
+
+if (c > max)
+  max = c;
+
+SLJIT_ASSERT(min <= MAX_UTF_CODE_POINT && max <= MAX_UTF_CODE_POINT && min <= max);
+*min_ptr = min;
+*max_ptr = max;
+}
+
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == [8|16] */
+
+#define XCLASS_IS_ECLASS 0x001
+#ifdef SUPPORT_UNICODE
+#define XCLASS_SAVE_CHAR 0x002
+#define XCLASS_HAS_TYPE 0x004
+#define XCLASS_HAS_SCRIPT 0x008
+#define XCLASS_HAS_SCRIPT_EXTENSION 0x010
+#define XCLASS_HAS_BOOL 0x020
+#define XCLASS_HAS_BIDICL 0x040
+#define XCLASS_NEEDS_UCD (XCLASS_HAS_TYPE | XCLASS_HAS_SCRIPT | XCLASS_HAS_SCRIPT_EXTENSION | XCLASS_HAS_BOOL | XCLASS_HAS_BIDICL)
+#define XCLASS_SCRIPT_EXTENSION_NOTPROP 0x080
+#define XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR 0x100
+#define XCLASS_SCRIPT_EXTENSION_RESTORE_LOCAL0 0x200
+#endif /* SUPPORT_UNICODE */
+
+static PCRE2_SPTR compile_char1_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks, BOOL check_str_ptr);
+
+/* TMP3 must be preserved because it is used by compile_iterator_matchingpath. */
+static void compile_xclass_matchingpath(compiler_common *common, PCRE2_SPTR cc, jump_list **backtracks, sljit_u32 status)
+{
+DEFINE_COMPILER;
+jump_list *found = NULL;
+jump_list *check_result = NULL;
+jump_list **list = (cc[0] & XCL_NOT) == 0 ? &found : backtracks;
+sljit_uw c, charoffset;
+sljit_u32 max = READ_CHAR_MAX, min = 0;
+struct sljit_jump *jump = NULL;
+PCRE2_UCHAR flags;
+PCRE2_SPTR ccbegin;
+sljit_u32 compares, invertcmp, depth;
+sljit_u32 first_item, last_item, mid_item;
+sljit_u32 range_start, range_end;
+xclass_ranges ranges;
+BOOL has_cmov, last_range_set;
+
+#ifdef SUPPORT_UNICODE
+sljit_u32 category_list = 0;
+sljit_u32 items;
+int typereg = TMP1;
+#endif /* SUPPORT_UNICODE */
+
+SLJIT_ASSERT(common->locals_size >= SSIZE_OF(sw));
+/* Scanning the necessary info. */
+flags = *cc++;
+ccbegin = cc;
+compares = 0;
+
+if (flags & XCL_MAP)
+  cc += 32 / sizeof(PCRE2_UCHAR);
+
+#ifdef SUPPORT_UNICODE
+while (*cc == XCL_PROP || *cc == XCL_NOTPROP)
+  {
+  compares++;
+  cc++;
+
+  items = 0;
+
+  switch(*cc)
+    {
+    case PT_LAMP:
+    items = UCPCAT3(ucp_Lu, ucp_Ll, ucp_Lt);
+    break;
+
+    case PT_GC:
+    items = UCPCAT_RANGE(PRIV(ucp_typerange)[(int)cc[1] * 2], PRIV(ucp_typerange)[(int)cc[1] * 2 + 1]);
+    break;
+
+    case PT_PC:
+    items = UCPCAT(cc[1]);
+    break;
+
+    case PT_WORD:
+    items = UCPCAT2(ucp_Mn, ucp_Pc) | UCPCAT_L | UCPCAT_N;
+    break;
+
+    case PT_ALNUM:
+    items = UCPCAT_L | UCPCAT_N;
+    break;
+
+    case PT_SCX:
+    status |= XCLASS_HAS_SCRIPT_EXTENSION;
+    if (cc[-1] == XCL_NOTPROP)
+      {
+      status |= XCLASS_SCRIPT_EXTENSION_NOTPROP;
+      break;
+      }
+    compares++;
+    /* Fall through */
+
+    case PT_SC:
+    status |= XCLASS_HAS_SCRIPT;
+    break;
+
+    case PT_SPACE:
+    case PT_PXSPACE:
+    case PT_PXGRAPH:
+    case PT_PXPRINT:
+    case PT_PXPUNCT:
+    status |= XCLASS_SAVE_CHAR | XCLASS_HAS_TYPE;
+    break;
+
+    case PT_UCNC:
+    case PT_PXXDIGIT:
+    status |= XCLASS_SAVE_CHAR;
+    break;
+
+    case PT_BOOL:
+    status |= XCLASS_HAS_BOOL;
+    break;
+
+    case PT_BIDICL:
+    status |= XCLASS_HAS_BIDICL;
+    break;
+
+    default:
+    SLJIT_UNREACHABLE();
+    break;
+    }
+
+  if (items > 0)
+    {
+    if (cc[-1] == XCL_NOTPROP)
+      items ^= UCPCAT_ALL;
+    category_list |= items;
+    status |= XCLASS_HAS_TYPE;
+    compares--;
+    }
+
+  cc += 2;
+  }
+
+if (category_list == UCPCAT_ALL)
+  {
+  /* All or no characters are accepted, same as dotall. */
+  if (status & XCLASS_IS_ECLASS)
+    {
+    if (list != backtracks)
+      OP2(SLJIT_OR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+    return;
+    }
+
+  compile_char1_matchingpath(common, OP_ALLANY, cc, backtracks, FALSE);
+  if (list == backtracks)
+    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
+  return;
+  }
+
+if (category_list != 0)
+  compares++;
+#endif
+
+if (*cc != XCL_END)
+  {
+#if defined SUPPORT_UNICODE && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
+  if (common->utf && compares == 0 && !(status & XCLASS_IS_ECLASS))
+    {
+    SLJIT_ASSERT(category_list == 0);
+    max = 0;
+    min = (flags & XCL_MAP) != 0 ? 0 : READ_CHAR_MAX;
+    xclass_update_min_max(common, cc, &min, &max);
+    }
+#endif
+  compares++;
+#ifdef SUPPORT_UNICODE
+  status |= XCLASS_SAVE_CHAR;
+#endif /* SUPPORT_UNICODE */
+  }
+
+#ifdef SUPPORT_UNICODE
+SLJIT_ASSERT(compares > 0 || category_list != 0);
+#else /* !SUPPORT_UNICODE */
+SLJIT_ASSERT(compares > 0);
+#endif /* SUPPORT_UNICODE */
+
+/* We are not necessary in utf mode even in 8 bit mode. */
+cc = ccbegin;
+if (!(status & XCLASS_IS_ECLASS))
+  {
+  if ((flags & XCL_NOT) != 0)
+    read_char(common, min, max, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    {
+#ifdef SUPPORT_UNICODE
+    read_char(common, min, max, (status & XCLASS_NEEDS_UCD) ? backtracks : NULL, 0);
+#else /* !SUPPORT_UNICODE */
+    read_char(common, min, max, NULL, 0);
+#endif /* SUPPORT_UNICODE */
+    }
+  }
+
+if ((flags & XCL_MAP) != 0)
+  {
+  SLJIT_ASSERT(!(status & XCLASS_IS_ECLASS));
+  xclass_check_bitset(common, (const sljit_u8 *)cc, &found, backtracks);
+  cc += 32 / sizeof(PCRE2_UCHAR);
+  }
+
+#ifdef SUPPORT_UNICODE
+if (status & XCLASS_NEEDS_UCD)
+  {
+  if ((status & (XCLASS_SAVE_CHAR | XCLASS_IS_ECLASS)) == XCLASS_SAVE_CHAR)
+    OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+  if (!common->utf)
+    {
+    OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, MAX_UTF_CODE_POINT + 1);
+    SELECT(SLJIT_GREATER_EQUAL, TMP1, SLJIT_IMM, UNASSIGNED_UTF_CHAR, TMP1);
+    }
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
+
+  OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
+  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
+  OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
+  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
+  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
+  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
+  OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
+  OP2(SLJIT_SHL, TMP1, 0, TMP2, 0, SLJIT_IMM, 3);
+  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 2);
+  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
+
+  ccbegin = cc;
+
+  if (status & XCLASS_HAS_BIDICL)
+    {
+    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, scriptx_bidiclass));
+    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BIDICLASS_SHIFT);
+
+    while (*cc == XCL_PROP || *cc == XCL_NOTPROP)
+      {
+      cc++;
+
+      if (*cc == PT_BIDICL)
+        {
+        compares--;
+        invertcmp = (compares == 0 && list != backtracks);
+        if (cc[-1] == XCL_NOTPROP)
+          invertcmp ^= 0x1;
+        jump = CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (int)cc[1]);
+        add_jump(compiler, compares > 0 ? list : backtracks, jump);
+        }
+      cc += 2;
+      }
+
+    cc = ccbegin;
+    }
+
+  if (status & XCLASS_HAS_BOOL)
+    {
+    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, bprops));
+    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BPROPS_MASK);
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 2);
+
+    while (*cc == XCL_PROP || *cc == XCL_NOTPROP)
+      {
+      cc++;
+      if (*cc == PT_BOOL)
+        {
+        compares--;
+        invertcmp = (compares == 0 && list != backtracks);
+        if (cc[-1] == XCL_NOTPROP)
+          invertcmp ^= 0x1;
+
+        OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP1), (sljit_sw)(PRIV(ucd_boolprop_sets) + (cc[1] >> 5)), SLJIT_IMM, (sljit_sw)(1u << (cc[1] & 0x1f)));
+        add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
+        }
+      cc += 2;
+      }
+
+    cc = ccbegin;
+    }
+
+  if (status & XCLASS_HAS_SCRIPT)
+    {
+    OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
+
+    while (*cc == XCL_PROP || *cc == XCL_NOTPROP)
+      {
+      cc++;
+
+      switch (*cc)
+        {
+        case PT_SCX:
+        if (cc[-1] == XCL_NOTPROP)
+          break;
+        /* Fall through */
+
+        case PT_SC:
+        compares--;
+        invertcmp = (compares == 0 && list != backtracks);
+        if (cc[-1] == XCL_NOTPROP)
+          invertcmp ^= 0x1;
+
+        add_jump(compiler, compares > 0 ? list : backtracks, CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (int)cc[1]));
+        }
+      cc += 2;
+      }
+
+    cc = ccbegin;
+    }
+
+  if (status & XCLASS_HAS_SCRIPT_EXTENSION)
+    {
+    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, scriptx_bidiclass));
+    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_SCRIPTX_MASK);
+    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 2);
+
+    if (status & XCLASS_SCRIPT_EXTENSION_NOTPROP)
+      {
+      if (status & XCLASS_HAS_TYPE)
+        {
+        if ((status & (XCLASS_SAVE_CHAR | XCLASS_IS_ECLASS)) == XCLASS_SAVE_CHAR)
+          {
+          OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL0, TMP2, 0);
+          status |= XCLASS_SCRIPT_EXTENSION_RESTORE_LOCAL0;
+          }
+        else
+          {
+          OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP2, 0);
+          status |= XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR;
+          }
+        }
+      OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
+      }
+
+    while (*cc == XCL_PROP || *cc == XCL_NOTPROP)
+      {
+      cc++;
+
+      if (*cc == PT_SCX)
+        {
+        compares--;
+        invertcmp = (compares == 0 && list != backtracks);
+
+        jump = NULL;
+        if (cc[-1] == XCL_NOTPROP)
+          {
+          jump = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, (int)cc[1]);
+          if (invertcmp)
+            {
+            add_jump(compiler, backtracks, jump);
+            jump = NULL;
+            }
+          invertcmp ^= 0x1;
+          }
+
+        OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP1), (sljit_sw)(PRIV(ucd_script_sets) + (cc[1] >> 5)), SLJIT_IMM, (sljit_sw)(1u << (cc[1] & 0x1f)));
+        add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
+
+        if (jump != NULL)
+          JUMPHERE(jump);
+        }
+      cc += 2;
+      }
+
+    if (status & XCLASS_SCRIPT_EXTENSION_RESTORE_LOCAL0)
+      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
+    else if (status & XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR)
+      OP1(SLJIT_MOV, TMP2, 0, RETURN_ADDR, 0);
+    cc = ccbegin;
+    }
+
+  if (status & XCLASS_SAVE_CHAR)
+    OP1(SLJIT_MOV, TMP1, 0, (status & XCLASS_IS_ECLASS) ? ECLASS_CHAR_DATA : RETURN_ADDR, 0);
+
+  if (status & XCLASS_HAS_TYPE)
+    {
+    if (status & XCLASS_SAVE_CHAR)
+      typereg = RETURN_ADDR;
+
+    OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
+    OP2(SLJIT_SHL, typereg, 0, SLJIT_IMM, 1, TMP2, 0);
+
+    if (category_list > 0)
+      {
+      compares--;
+      invertcmp = (compares == 0 && list != backtracks);
+      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, category_list);
+      add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
+      }
+    }
+  }
+#endif /* SUPPORT_UNICODE */
+
+/* Generating code. */
+charoffset = 0;
+
+#ifdef SUPPORT_UNICODE
+while (*cc == XCL_PROP || *cc == XCL_NOTPROP)
+  {
+  compares--;
+  invertcmp = (compares == 0 && list != backtracks);
+  jump = NULL;
+
+  if (*cc == XCL_NOTPROP)
+    invertcmp ^= 0x1;
+  cc++;
+  switch(*cc)
+    {
+    case PT_LAMP:
+    case PT_GC:
+    case PT_PC:
+    case PT_SC:
+    case PT_SCX:
+    case PT_BOOL:
+    case PT_BIDICL:
+    case PT_WORD:
+    case PT_ALNUM:
+    compares++;
+    /* Already handled. */
+    break;
+
+    case PT_SPACE:
+    case PT_PXSPACE:
+    SET_CHAR_OFFSET(9);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xd - 0x9);
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x85 - 0x9);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
+
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x180e - 0x9);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
+
+    OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Zl, ucp_Zs));
+    OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_NOT_ZERO);
+    jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
+    break;
+
+    case PT_UCNC:
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_DOLLAR_SIGN - charoffset));
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_COMMERCIAL_AT - charoffset));
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_GRAVE_ACCENT - charoffset));
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
+
+    SET_CHAR_OFFSET(0xa0);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(0xd7ff - charoffset));
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
+    SET_CHAR_OFFSET(0);
+    OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xe000 - 0);
+    OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_GREATER_EQUAL);
+    jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
+    break;
+
+    case PT_PXGRAPH:
+    OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Cc, ucp_Cs) | UCPCAT_RANGE(ucp_Zl, ucp_Zs));
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_NOT_ZERO);
+
+    OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT(ucp_Cf));
+    jump = JUMP(SLJIT_ZERO);
+
+    c = charoffset;
+    /* In case of ucp_Cf, we overwrite the result. */
+    SET_CHAR_OFFSET(0x2066);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
+
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x180e - 0x2066);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
+
+    /* Restore charoffset. */
+    SET_CHAR_OFFSET(c);
+
+    JUMPHERE(jump);
+    jump = CMP(SLJIT_ZERO ^ invertcmp, TMP2, 0, SLJIT_IMM, 0);
+    break;
+
+    case PT_PXPRINT:
+    OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Cc, ucp_Cs) | UCPCAT2(ucp_Zl, ucp_Zp));
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_NOT_ZERO);
+
+    OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT(ucp_Cf));
+    jump = JUMP(SLJIT_ZERO);
+
+    c = charoffset;
+    /* In case of ucp_Cf, we overwrite the result. */
+    SET_CHAR_OFFSET(0x2066);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
+
+    /* Restore charoffset. */
+    SET_CHAR_OFFSET(c);
+
+    JUMPHERE(jump);
+    jump = CMP(SLJIT_ZERO ^ invertcmp, TMP2, 0, SLJIT_IMM, 0);
+    break;
+
+    case PT_PXPUNCT:
+    OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Sc, ucp_So));
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_NOT_ZERO);
+
+    SET_CHAR_OFFSET(0);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x7f);
+    OP_FLAGS(SLJIT_AND, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Pc, ucp_Ps));
+    OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_NOT_ZERO);
+    jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
+    break;
+
+    case PT_PXXDIGIT:
+    SET_CHAR_OFFSET(CHAR_A);
+    OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, ~0x20);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP2, 0, SLJIT_IMM, CHAR_F - CHAR_A);
+    OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    SET_CHAR_OFFSET(CHAR_0);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_9 - CHAR_0);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    SET_CHAR_OFFSET(0xff10);
+    jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 0xff46 - 0xff10);
+
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xff19 - 0xff10);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    SET_CHAR_OFFSET(0xff21);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xff26 - 0xff21);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    SET_CHAR_OFFSET(0xff41);
+    OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xff46 - 0xff41);
+    OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
+
+    SET_CHAR_OFFSET(0xff10);
+
+    JUMPHERE(jump);
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, 0);
+    jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
+    break;
+
+    default:
+    SLJIT_UNREACHABLE();
+    break;
+    }
+
+  cc += 2;
+
+  if (jump != NULL)
+    add_jump(compiler, compares > 0 ? list : backtracks, jump);
+  }
+
+if (compares == 0)
+  {
+  if (found != NULL)
+    set_jumps(found, LABEL());
+
+  if (status & XCLASS_IS_ECLASS)
+    OP2(SLJIT_OR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+  return;
+  }
+#endif /* SUPPORT_UNICODE */
+
+SLJIT_ASSERT(compares == 1);
+ranges.range_count = 0;
+ranges.ranges = ranges.local_ranges;
+ranges.stack = ranges.local_stack;
+
+xclass_compute_ranges(common, cc, &ranges);
+
+/* Memory error is set for the compiler. */
+if (ranges.stack == NULL)
+  return;
+
+#if (defined SLJIT_DEBUG && SLJIT_DEBUG) && \
+  defined SUPPORT_UNICODE && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
+if (common->utf)
+  {
+  min = READ_CHAR_MAX;
+  max = 0;
+  xclass_update_min_max(common, cc, &min, &max);
+  SLJIT_ASSERT(ranges.ranges[0] == min && ranges.ranges[ranges.range_count - 1] == max);
+  }
+#endif /* SLJIT_DEBUG && SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == [8|16] */
+
+invertcmp = (list != backtracks);
+
+if (ranges.range_count == 2)
+  {
+  range_start = ranges.ranges[0];
+  range_end = ranges.ranges[1];
+
+  if (range_start < range_end)
+    {
+    SET_CHAR_OFFSET(range_start);
+    jump = CMP(SLJIT_LESS_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_end - range_start));
+    }
+  else
+    jump = CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_start - charoffset));
+
+  add_jump(compiler, backtracks, jump);
+
+  SLJIT_ASSERT(ranges.stack == ranges.local_stack);
+  if (found != NULL)
+    set_jumps(found, LABEL());
+
+  if (status & XCLASS_IS_ECLASS)
+    OP2(SLJIT_OR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+  return;
+  }
+
+range_start = ranges.ranges[0];
+SET_CHAR_OFFSET(range_start);
+if (ranges.range_count >= 6)
+  {
+  /* Early fail. */
+  range_end = ranges.ranges[ranges.range_count - 1];
+  add_jump(compiler, (flags & XCL_NOT) == 0 ? backtracks : &found,
+    CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_end - range_start)));
+  }
+
+depth = 0;
+first_item = 0;
+last_item = ranges.range_count - 2;
+has_cmov = sljit_has_cpu_feature(SLJIT_HAS_CMOV) != 0;
+
+while (TRUE)
+  {
+  /* At least two items are present. */
+  SLJIT_ASSERT(first_item < last_item && charoffset == ranges.ranges[0]);
+  last_range_set = FALSE;
+
+  if (first_item + 6 <= last_item)
+    {
+    mid_item = ((first_item + last_item) >> 1) & ~(sljit_u32)1;
+    SLJIT_ASSERT(last_item >= mid_item + 4);
+
+    range_end = ranges.ranges[mid_item + 1];
+    if (first_item + 6 > mid_item && ranges.ranges[mid_item] == range_end)
+      {
+      OP2U(SLJIT_SUB | SLJIT_SET_GREATER | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_end - charoffset));
+      ranges.stack[depth].jump = JUMP(SLJIT_GREATER);
+      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
+      last_range_set = TRUE;
+      }
+    else
+      ranges.stack[depth].jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_end - charoffset));
+
+    ranges.stack[depth].first_item = (sljit_u32)(mid_item + 2);
+    ranges.stack[depth].last_item = (sljit_u32)last_item;
+
+    depth++;
+    SLJIT_ASSERT(ranges.stack == ranges.local_stack ?
+      depth <= XCLASS_LOCAL_RANGES_LOG2_SIZE : (ranges.stack + depth) <= (xclass_stack_item*)ranges.ranges);
+
+    last_item = mid_item;
+    if (!last_range_set)
+      continue;
+
+    last_item -= 2;
+    }
+
+  if (!last_range_set)
+    {
+    range_start = ranges.ranges[first_item];
+    range_end = ranges.ranges[first_item + 1];
+
+    if (range_start < range_end)
+      {
+      SET_CHAR_OFFSET(range_start);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_end - range_start));
+      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
+      }
+    else
+      {
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_start - charoffset));
+      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
+      }
+    first_item += 2;
+    }
+
+  SLJIT_ASSERT(first_item <= last_item);
+
+  do
+    {
+    range_start = ranges.ranges[first_item];
+    range_end = ranges.ranges[first_item + 1];
+
+    if (range_start < range_end)
+      {
+      SET_CHAR_OFFSET(range_start);
+      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_end - range_start));
+
+      if (has_cmov)
+        SELECT(SLJIT_LESS_EQUAL, TMP2, STR_END, 0, TMP2);
+      else
+        OP_FLAGS(SLJIT_OR | ((first_item == last_item) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_LESS_EQUAL);
+      }
+    else
+      {
+      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(range_start - charoffset));
+
+      if (has_cmov)
+        SELECT(SLJIT_EQUAL, TMP2, STR_END, 0, TMP2);
+      else
+        OP_FLAGS(SLJIT_OR | ((first_item == last_item) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_EQUAL);
+      }
+
+    first_item += 2;
+    }
+  while (first_item <= last_item);
+
+  if (depth == 0) break;
+
+  add_jump(compiler, &check_result, JUMP(SLJIT_JUMP));
+
+  /* The charoffset resets after the end of a branch is reached. */
+  charoffset = ranges.ranges[0];
+  depth--;
+  first_item = ranges.stack[depth].first_item;
+  last_item = ranges.stack[depth].last_item;
+  JUMPHERE(ranges.stack[depth].jump);
+  }
+
+if (check_result != NULL)
+  set_jumps(check_result, LABEL());
+
+if (has_cmov)
+  jump = CMP(SLJIT_NOT_EQUAL ^ invertcmp, TMP2, 0, SLJIT_IMM, 0);
+else
+  {
+  sljit_set_current_flags(compiler, SLJIT_SET_Z);
+  jump = JUMP(SLJIT_NOT_EQUAL ^ invertcmp);
+  }
+
+add_jump(compiler, backtracks, jump);
+
+if (found != NULL)
+  set_jumps(found, LABEL());
+
+if (status & XCLASS_IS_ECLASS)
+  OP2(SLJIT_OR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+
+if (ranges.stack != ranges.local_stack)
+  SLJIT_FREE(ranges.stack, compiler->allocator_data);
+}
+
+static PCRE2_SPTR compile_eclass_matchingpath(compiler_common *common, PCRE2_SPTR cc, jump_list **backtracks)
+{
+DEFINE_COMPILER;
+PCRE2_SPTR end = cc + GET(cc, 0) - 1;
+PCRE2_SPTR begin;
+jump_list *not_found;
+jump_list *found = NULL;
+
+cc += LINK_SIZE;
+
+/* Should be optimized later. */
+read_char(common, 0, READ_CHAR_MAX, backtracks, 0);
+
+if (((*cc++) & ECL_MAP) != 0)
+  {
+  xclass_check_bitset(common, (const sljit_u8 *)cc, &found, backtracks);
+  cc += 32 / sizeof(PCRE2_UCHAR);
+  }
+
+begin = cc;
+
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL0, ECLASS_CHAR_DATA, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL1, ECLASS_STACK_DATA, 0);
+OP1(SLJIT_MOV, ECLASS_STACK_DATA, 0, SLJIT_IMM, 0);
+OP1(SLJIT_MOV, ECLASS_CHAR_DATA, 0, TMP1, 0);
+
+/* All eclass must start with an xclass. */
+SLJIT_ASSERT(*cc == ECL_XCLASS);
+
+while (cc < end)
+  {
+  switch (*cc)
+    {
+    case ECL_AND:
+    ++cc;
+    OP2(SLJIT_OR, TMP2, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, ~(sljit_sw)1);
+    OP2(SLJIT_LSHR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_AND, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, TMP2, 0);
+    break;
+
+    case ECL_OR:
+    ++cc;
+    OP2(SLJIT_AND, TMP2, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_LSHR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_OR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, TMP2, 0);
+    break;
+
+    case ECL_XOR:
+    ++cc;
+    OP2(SLJIT_AND, TMP2, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_LSHR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_XOR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, TMP2, 0);
+    break;
+
+    case ECL_NOT:
+    ++cc;
+    OP2(SLJIT_XOR, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+    break;
+
+    default:
+    SLJIT_ASSERT(*cc == ECL_XCLASS);
+    if (cc != begin)
+      {
+      OP1(SLJIT_MOV, TMP1, 0, ECLASS_CHAR_DATA, 0);
+      OP2(SLJIT_SHL, ECLASS_STACK_DATA, 0, ECLASS_STACK_DATA, 0, SLJIT_IMM, 1);
+      }
+
+    not_found = NULL;
+    compile_xclass_matchingpath(common, cc + 1 + LINK_SIZE, &not_found, XCLASS_IS_ECLASS);
+    set_jumps(not_found, LABEL());
+
+    cc += GET(cc, 1);
+    break;
+    }
+  }
+
+OP2U(SLJIT_SUB | SLJIT_SET_Z, ECLASS_STACK_DATA, 0, SLJIT_IMM, 0);
+OP1(SLJIT_MOV, ECLASS_CHAR_DATA, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
+OP1(SLJIT_MOV, ECLASS_STACK_DATA, 0, SLJIT_MEM1(SLJIT_SP), LOCAL1);
+add_jump(compiler, backtracks, JUMP(SLJIT_EQUAL));
+set_jumps(found, LABEL());
+return end;
+}
+
+/* Generic character matching code. */
+
+#undef SET_CHAR_OFFSET
+#undef READ_FROM_CHAR_LIST
+#undef XCLASS_LOCAL_RANGES_SIZE
+#undef XCLASS_LOCAL_RANGES_LOG2_SIZE
+
+#endif /* SUPPORT_WIDE_CHARS */
+
+static PCRE2_SPTR byte_sequence_compare(compiler_common *common, BOOL caseless, PCRE2_SPTR cc,
+    compare_context *context, jump_list **backtracks)
+{
+DEFINE_COMPILER;
+unsigned int othercasebit = 0;
+PCRE2_SPTR othercasechar = NULL;
+#ifdef SUPPORT_UNICODE
+int utflength;
+#endif
+
+if (caseless && char_has_othercase(common, cc))
+  {
+  othercasebit = char_get_othercase_bit(common, cc);
+  SLJIT_ASSERT(othercasebit);
+  /* Extracting bit difference info. */
+#if PCRE2_CODE_UNIT_WIDTH == 8
+  othercasechar = cc + (othercasebit >> 8);
+  othercasebit &= 0xff;
+#elif PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+  /* Note that this code only handles characters in the BMP. If there
+  ever are characters outside the BMP whose othercase differs in only one
+  bit from itself (there currently are none), this code will need to be
+  revised for PCRE2_CODE_UNIT_WIDTH == 32. */
+  othercasechar = cc + (othercasebit >> 9);
+  if ((othercasebit & 0x100) != 0)
+    othercasebit = (othercasebit & 0xff) << 8;
+  else
+    othercasebit &= 0xff;
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
+  }
+
+if (context->sourcereg == -1)
+  {
+#if PCRE2_CODE_UNIT_WIDTH == 8
+#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
+  if (context->length >= 4)
+    OP1(SLJIT_MOV_S32, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
+  else if (context->length >= 2)
+    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
+  else
+#endif
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
+#elif PCRE2_CODE_UNIT_WIDTH == 16
+#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
+  if (context->length >= 4)
+    OP1(SLJIT_MOV_S32, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
+  else
+#endif
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
+#elif PCRE2_CODE_UNIT_WIDTH == 32
+  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
+#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
+  context->sourcereg = TMP2;
+  }
+
+#ifdef SUPPORT_UNICODE
+utflength = 1;
+if (common->utf && HAS_EXTRALEN(*cc))
+  utflength += GET_EXTRALEN(*cc);
+
+do
+  {
+#endif
+
+  context->length -= IN_UCHARS(1);
+#if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED) && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
+
+  /* Unaligned read is supported. */
+  if (othercasebit != 0 && othercasechar == cc)
+    {
+    context->c.asuchars[context->ucharptr] = *cc | othercasebit;
+    context->oc.asuchars[context->ucharptr] = othercasebit;
+    }
+  else
+    {
+    context->c.asuchars[context->ucharptr] = *cc;
+    context->oc.asuchars[context->ucharptr] = 0;
+    }
+  context->ucharptr++;
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+  if (context->ucharptr >= 4 || context->length == 0 || (context->ucharptr == 2 && context->length == 1))
+#else
+  if (context->ucharptr >= 2 || context->length == 0)
+#endif
+    {
+    if (context->length >= 4)
+      OP1(SLJIT_MOV_S32, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
+    else if (context->length >= 2)
+      OP1(SLJIT_MOV_U16, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    else if (context->length >= 1)
+      OP1(SLJIT_MOV_U8, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
+    context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
+
+    switch(context->ucharptr)
+      {
+      case 4 / sizeof(PCRE2_UCHAR):
+      if (context->oc.asint != 0)
+        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asint);
+      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asint | context->oc.asint));
+      break;
+
+      case 2 / sizeof(PCRE2_UCHAR):
+      if (context->oc.asushort != 0)
+        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asushort);
+      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asushort | context->oc.asushort));
+      break;
+
+#if PCRE2_CODE_UNIT_WIDTH == 8
+      case 1:
+      if (context->oc.asbyte != 0)
+        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asbyte);
+      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asbyte | context->oc.asbyte));
+      break;
+#endif
+
+      default:
+      SLJIT_UNREACHABLE();
+      break;
+      }
+    context->ucharptr = 0;
+    }
+
+#else
+
+  /* Unaligned read is unsupported or in 32 bit mode. */
+  if (context->length >= 1)
+    OP1(MOV_UCHAR, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
+
+  context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
+
+  if (othercasebit != 0 && othercasechar == cc)
+    {
+    OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, othercasebit);
+    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, *cc | othercasebit));
+    }
+  else
+    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, *cc));
+
+#endif
+
+  cc++;
+#ifdef SUPPORT_UNICODE
+  utflength--;
+  }
+while (utflength > 0);
+#endif
+
+return cc;
+}
+
+#ifdef SUPPORT_UNICODE
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+
+/* The code in this function copies the logic of the interpreter function that
+is defined in the pcre2_extuni.c source. If that code is updated, this
+function, and those below it, must be kept in step (note by PH, June 2024). */
+
+static PCRE2_SPTR SLJIT_FUNC do_extuni_utf(jit_arguments *args, PCRE2_SPTR cc)
+{
+PCRE2_SPTR start_subject = args->begin;
+PCRE2_SPTR end_subject = args->end;
+int lgb, rgb, ricount;
+PCRE2_SPTR prevcc, endcc, bptr;
+BOOL first = TRUE;
+BOOL was_ep_ZWJ = FALSE;
+uint32_t c;
+
+prevcc = cc;
+endcc = NULL;
+do
+  {
+  GETCHARINC(c, cc);
+  rgb = UCD_GRAPHBREAK(c);
+
+  if (first)
+    {
+    lgb = rgb;
+    endcc = cc;
+    first = FALSE;
+    continue;
+    }
+
+  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
+    break;
+
+  /* ZWJ followed by Extended Pictographic is allowed only if the ZWJ was
+  preceded by Extended Pictographic. */
+
+  if (lgb == ucp_gbZWJ && rgb == ucp_gbExtended_Pictographic && !was_ep_ZWJ)
+    break;
+
+  /* Not breaking between Regional Indicators is allowed only if there
+  are an even number of preceding RIs. */
+
+  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
+    {
+    ricount = 0;
+    bptr = prevcc;
+
+    /* bptr is pointing to the left-hand character */
+    while (bptr > start_subject)
+      {
+      bptr--;
+      BACKCHAR(bptr);
+      GETCHAR(c, bptr);
+
+      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator)
+        break;
+
+      ricount++;
+      }
+
+    if ((ricount & 1) != 0) break;  /* Grapheme break required */
+    }
+
+  /* Set a flag when ZWJ follows Extended Pictographic (with optional Extend in
+  between; see next statement). */
+
+  was_ep_ZWJ = (lgb == ucp_gbExtended_Pictographic && rgb == ucp_gbZWJ);
+
+  /* If Extend follows Extended_Pictographic, do not update lgb; this allows
+  any number of them before a following ZWJ. */
+
+  if (rgb != ucp_gbExtend || lgb != ucp_gbExtended_Pictographic)
+    lgb = rgb;
+
+  prevcc = endcc;
+  endcc = cc;
+  }
+while (cc < end_subject);
+
+return endcc;
+}
+
+#endif /* PCRE2_CODE_UNIT_WIDTH != 32 */
+
+/* The code in this function copies the logic of the interpreter function that
+is defined in the pcre2_extuni.c source. If that code is updated, this
+function, and the one below it, must be kept in step (note by PH, June 2024). */
+
+static PCRE2_SPTR SLJIT_FUNC do_extuni_utf_invalid(jit_arguments *args, PCRE2_SPTR cc)
+{
+PCRE2_SPTR start_subject = args->begin;
+PCRE2_SPTR end_subject = args->end;
+int lgb, rgb, ricount;
+PCRE2_SPTR prevcc, endcc, bptr;
+BOOL first = TRUE;
+BOOL was_ep_ZWJ = FALSE;
+uint32_t c;
+
+prevcc = cc;
+endcc = NULL;
+do
+  {
+  GETCHARINC_INVALID(c, cc, end_subject, break);
+  rgb = UCD_GRAPHBREAK(c);
+
+  if (first)
+    {
+    lgb = rgb;
+    endcc = cc;
+    first = FALSE;
+    continue;
+    }
+
+  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
+    break;
+
+  /* ZWJ followed by Extended Pictographic is allowed only if the ZWJ was
+  preceded by Extended Pictographic. */
+
+  if (lgb == ucp_gbZWJ && rgb == ucp_gbExtended_Pictographic && !was_ep_ZWJ)
+    break;
+
+  /* Not breaking between Regional Indicators is allowed only if there
+  are an even number of preceding RIs. */
+
+  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
+    {
+    ricount = 0;
+    bptr = prevcc;
+
+    /* bptr is pointing to the left-hand character */
+    while (bptr > start_subject)
+      {
+      GETCHARBACK_INVALID(c, bptr, start_subject, break);
+
+      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator)
+        break;
+
+      ricount++;
+      }
+
+    if ((ricount & 1) != 0)
+      break;  /* Grapheme break required */
+    }
+
+  /* Set a flag when ZWJ follows Extended Pictographic (with optional Extend in
+  between; see next statement). */
+
+  was_ep_ZWJ = (lgb == ucp_gbExtended_Pictographic && rgb == ucp_gbZWJ);
+
+  /* If Extend follows Extended_Pictographic, do not update lgb; this allows
+  any number of them before a following ZWJ. */
+
+  if (rgb != ucp_gbExtend || lgb != ucp_gbExtended_Pictographic)
+    lgb = rgb;
+
+  prevcc = endcc;
+  endcc = cc;
+  }
+while (cc < end_subject);
+
+return endcc;
+}
+
+/* The code in this function copies the logic of the interpreter function that
+is defined in the pcre2_extuni.c source. If that code is updated, this
+function must be kept in step (note by PH, June 2024). */
+
+static PCRE2_SPTR SLJIT_FUNC do_extuni_no_utf(jit_arguments *args, PCRE2_SPTR cc)
+{
+PCRE2_SPTR start_subject = args->begin;
+PCRE2_SPTR end_subject = args->end;
+int lgb, rgb, ricount;
+PCRE2_SPTR bptr;
+uint32_t c;
+BOOL was_ep_ZWJ = FALSE;
+
+/* Patch by PH */
+/* GETCHARINC(c, cc); */
+c = *cc++;
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+if (c >= 0x110000)
+  return cc;
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
+lgb = UCD_GRAPHBREAK(c);
+
+while (cc < end_subject)
+  {
+  c = *cc;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+  if (c >= 0x110000)
+    break;
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
+  rgb = UCD_GRAPHBREAK(c);
+
+  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
+    break;
+
+  /* ZWJ followed by Extended Pictographic is allowed only if the ZWJ was
+  preceded by Extended Pictographic. */
+
+  if (lgb == ucp_gbZWJ && rgb == ucp_gbExtended_Pictographic && !was_ep_ZWJ)
+    break;
+
+  /* Not breaking between Regional Indicators is allowed only if there
+  are an even number of preceding RIs. */
+
+  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
+    {
+    ricount = 0;
+    bptr = cc - 1;
+
+    /* bptr is pointing to the left-hand character */
+    while (bptr > start_subject)
+      {
+      bptr--;
+      c = *bptr;
+#if PCRE2_CODE_UNIT_WIDTH == 32
+      if (c >= 0x110000)
+        break;
+#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
+
+      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator) break;
+
+      ricount++;
+      }
+
+    if ((ricount & 1) != 0)
+      break;  /* Grapheme break required */
+    }
+
+  /* Set a flag when ZWJ follows Extended Pictographic (with optional Extend in
+  between; see next statement). */
+
+  was_ep_ZWJ = (lgb == ucp_gbExtended_Pictographic && rgb == ucp_gbZWJ);
+
+  /* If Extend follows Extended_Pictographic, do not update lgb; this allows
+  any number of them before a following ZWJ. */
+
+  if (rgb != ucp_gbExtend || lgb != ucp_gbExtended_Pictographic)
+    lgb = rgb;
+
+  cc++;
+  }
+
+return cc;
+}
+
+static void compile_clist(compiler_common *common, PCRE2_SPTR cc, jump_list **backtracks)
+{
+DEFINE_COMPILER;
+const sljit_u32 *other_cases;
+struct sljit_jump *jump;
+sljit_u32 min = 0, max = READ_CHAR_MAX;
+BOOL has_cmov = sljit_has_cpu_feature(SLJIT_HAS_CMOV) != 0;
+
+SLJIT_ASSERT(cc[1] == PT_CLIST);
+
+if (cc[0] == OP_PROP)
+  {
+  other_cases = PRIV(ucd_caseless_sets) + cc[2];
+
+  min = *other_cases++;
+  max = min;
+
+  while (*other_cases != NOTACHAR)
+    {
+    if (*other_cases > max) max = *other_cases;
+    if (*other_cases < min) min = *other_cases;
+    other_cases++;
+    }
+  }
+
+other_cases = PRIV(ucd_caseless_sets) + cc[2];
+SLJIT_ASSERT(other_cases[0] != NOTACHAR && other_cases[1] != NOTACHAR);
+/* The NOTACHAR is higher than any character. */
+SLJIT_ASSERT(other_cases[0] < other_cases[1] && other_cases[1] < other_cases[2]);
+
+read_char(common, min, max, backtracks, READ_CHAR_UPDATE_STR_PTR);
+
+/* At least two characters are required.
+   Otherwise this case would be handled by the normal code path. */
+/* NOTACHAR is the unsigned maximum. */
+
+/* Optimizing character pairs, if their difference is power of 2. */
+if (is_powerof2(other_cases[1] ^ other_cases[0]))
+  {
+  OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(other_cases[1] ^ other_cases[0]));
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, other_cases[1]);
+  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
+  other_cases += 2;
+  }
+else if (is_powerof2(other_cases[2] ^ other_cases[1]))
+  {
+  SLJIT_ASSERT(other_cases[2] != NOTACHAR);
+
+  OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(other_cases[2] ^ other_cases[1]));
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, other_cases[2]);
+  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
+
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)other_cases[0]);
+
+  if (has_cmov)
+    SELECT(SLJIT_EQUAL, TMP2, STR_END, 0, TMP2);
+  else
+    OP_FLAGS(SLJIT_OR | ((other_cases[3] == NOTACHAR) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_EQUAL);
+
+  other_cases += 3;
+  }
+else
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++));
+  OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
+  }
+
+while (*other_cases != NOTACHAR)
+  {
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++));
+
+  if (has_cmov)
+    SELECT(SLJIT_EQUAL, TMP2, STR_END, 0, TMP2);
+  else
+    OP_FLAGS(SLJIT_OR | ((*other_cases == NOTACHAR) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_EQUAL);
+  }
+
+if (has_cmov)
+  jump = CMP(cc[0] == OP_PROP ? SLJIT_EQUAL : SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0);
+else
+  jump = JUMP(cc[0] == OP_PROP ? SLJIT_ZERO : SLJIT_NOT_ZERO);
+
+add_jump(compiler, backtracks, jump);
+}
+
+#endif /* SUPPORT_UNICODE */
+
+static PCRE2_SPTR compile_char1_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks, BOOL check_str_ptr)
+{
+DEFINE_COMPILER;
+int length;
+unsigned int c, oc, bit;
+compare_context context;
+struct sljit_jump *jump[3];
+jump_list *end_list;
+#ifdef SUPPORT_UNICODE
+PCRE2_UCHAR propdata[5];
+#endif /* SUPPORT_UNICODE */
+
+switch(type)
+  {
+  case OP_NOT_DIGIT:
+  case OP_DIGIT:
+  /* Digits are usually 0-9, so it is worth to optimize them. */
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_digit, FALSE))
+    read_char7_type(common, backtracks, type == OP_NOT_DIGIT);
+  else
+#endif
+    read_char8_type(common, backtracks, type == OP_NOT_DIGIT);
+    /* Flip the starting bit in the negative case. */
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_digit);
+  add_jump(compiler, backtracks, JUMP(type == OP_DIGIT ? SLJIT_ZERO : SLJIT_NOT_ZERO));
+  return cc;
+
+  case OP_NOT_WHITESPACE:
+  case OP_WHITESPACE:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_space, FALSE))
+    read_char7_type(common, backtracks, type == OP_NOT_WHITESPACE);
+  else
+#endif
+    read_char8_type(common, backtracks, type == OP_NOT_WHITESPACE);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_space);
+  add_jump(compiler, backtracks, JUMP(type == OP_WHITESPACE ? SLJIT_ZERO : SLJIT_NOT_ZERO));
+  return cc;
+
+  case OP_NOT_WORDCHAR:
+  case OP_WORDCHAR:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_word, FALSE))
+    read_char7_type(common, backtracks, type == OP_NOT_WORDCHAR);
+  else
+#endif
+    read_char8_type(common, backtracks, type == OP_NOT_WORDCHAR);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_word);
+  add_jump(compiler, backtracks, JUMP(type == OP_WORDCHAR ? SLJIT_ZERO : SLJIT_NOT_ZERO));
+  return cc;
+
+  case OP_ANY:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+  read_char(common, common->nlmin, common->nlmax, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
+    {
+    jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
+    end_list = NULL;
+    if (common->mode != PCRE2_JIT_PARTIAL_HARD)
+      add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+    else
+      check_str_end(common, &end_list);
+
+    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, common->newline & 0xff));
+    set_jumps(end_list, LABEL());
+    JUMPHERE(jump[0]);
+    }
+  else
+    check_newlinechar(common, common->nltype, backtracks, TRUE);
+  return cc;
+
+  case OP_ALLANY:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+#ifdef SUPPORT_UNICODE
+  if (common->utf && common->invalid_utf)
+    {
+    read_char(common, 0, READ_CHAR_MAX, backtracks, READ_CHAR_UPDATE_STR_PTR);
+    return cc;
+    }
+#endif /* SUPPORT_UNICODE */
+
+  skip_valid_char(common);
+  return cc;
+
+  case OP_ANYBYTE:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  return cc;
+
+#ifdef SUPPORT_UNICODE
+  case OP_NOTPROP:
+  case OP_PROP:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+  if (cc[0] == PT_CLIST)
+    {
+    compile_clist(common, cc - 1, backtracks);
+    return cc + 2;
+    }
+
+  propdata[0] = 0;
+  propdata[1] = type == OP_NOTPROP ? XCL_NOTPROP : XCL_PROP;
+  propdata[2] = cc[0];
+  propdata[3] = cc[1];
+  propdata[4] = XCL_END;
+  compile_xclass_matchingpath(common, propdata, backtracks, 0);
+  return cc + 2;
+#endif
+
+  case OP_ANYNL:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+  read_char(common, common->bsr_nlmin, common->bsr_nlmax, NULL, 0);
+  jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
+  /* We don't need to handle soft partial matching case. */
+  end_list = NULL;
+  if (common->mode != PCRE2_JIT_PARTIAL_HARD)
+    add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+  else
+    check_str_end(common, &end_list);
+  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+  OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, CHAR_NL);
+  OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+  OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
+#endif
+  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+  jump[1] = JUMP(SLJIT_JUMP);
+  JUMPHERE(jump[0]);
+  check_newlinechar(common, common->bsr_nltype, backtracks, FALSE);
+  set_jumps(end_list, LABEL());
+  JUMPHERE(jump[1]);
+  return cc;
+
+  case OP_NOT_HSPACE:
+  case OP_HSPACE:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+
+  if (type == OP_NOT_HSPACE)
+    read_char(common, 0x9, 0x3000, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0x9, 0x3000, NULL, 0);
+
+  add_jump(compiler, &common->hspace, JUMP(SLJIT_FAST_CALL));
+  sljit_set_current_flags(compiler, SLJIT_SET_Z);
+  add_jump(compiler, backtracks, JUMP(type == OP_NOT_HSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
+  return cc;
+
+  case OP_NOT_VSPACE:
+  case OP_VSPACE:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+
+  if (type == OP_NOT_VSPACE)
+    read_char(common, 0xa, 0x2029, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0xa, 0x2029, NULL, 0);
+
+  add_jump(compiler, &common->vspace, JUMP(SLJIT_FAST_CALL));
+  sljit_set_current_flags(compiler, SLJIT_SET_Z);
+  add_jump(compiler, backtracks, JUMP(type == OP_NOT_VSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
+  return cc;
+
+#ifdef SUPPORT_UNICODE
+  case OP_EXTUNI:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+
+  SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
+  OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
+
+#if PCRE2_CODE_UNIT_WIDTH != 32
+  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM,
+    common->utf ? (common->invalid_utf ? SLJIT_FUNC_ADDR(do_extuni_utf_invalid) : SLJIT_FUNC_ADDR(do_extuni_utf)) : SLJIT_FUNC_ADDR(do_extuni_no_utf));
+  if (common->invalid_utf)
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
+#else
+  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM,
+    common->invalid_utf ? SLJIT_FUNC_ADDR(do_extuni_utf_invalid) : SLJIT_FUNC_ADDR(do_extuni_no_utf));
+  if (common->invalid_utf)
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
+#endif
+
+  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_RETURN_REG, 0);
+
+  if (common->mode == PCRE2_JIT_PARTIAL_HARD)
+    {
+    jump[0] = CMP(SLJIT_LESS, SLJIT_RETURN_REG, 0, STR_END, 0);
+    /* Since we successfully read a char above, partial matching must occur. */
+    check_partial(common, TRUE);
+    JUMPHERE(jump[0]);
+    }
+  return cc;
+#endif
+
+  case OP_CHAR:
+  case OP_CHARI:
+  length = 1;
+#ifdef SUPPORT_UNICODE
+  if (common->utf && HAS_EXTRALEN(*cc)) length += GET_EXTRALEN(*cc);
+#endif
+
+  if (check_str_ptr && common->mode != PCRE2_JIT_COMPLETE)
+    detect_partial_match(common, backtracks);
+
+  if (type == OP_CHAR || !char_has_othercase(common, cc) || char_get_othercase_bit(common, cc) != 0)
+    {
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(length));
+    if (length > 1 || (check_str_ptr && common->mode == PCRE2_JIT_COMPLETE))
+      add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
+
+    context.length = IN_UCHARS(length);
+    context.sourcereg = -1;
+#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
+    context.ucharptr = 0;
+#endif
+    return byte_sequence_compare(common, type == OP_CHARI, cc, &context, backtracks);
+    }
+
+#ifdef SUPPORT_UNICODE
+  if (common->utf)
+    {
+    GETCHAR(c, cc);
+    }
+  else
+#endif
+    c = *cc;
+
+  SLJIT_ASSERT(type == OP_CHARI && char_has_othercase(common, cc));
+
+  if (check_str_ptr && common->mode == PCRE2_JIT_COMPLETE)
+    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
+
+  oc = char_othercase(common, c);
+  read_char(common, c < oc ? c : oc, c > oc ? c : oc, NULL, 0);
+
+  SLJIT_ASSERT(!is_powerof2(c ^ oc));
+
+  if (sljit_has_cpu_feature(SLJIT_HAS_CMOV))
+    {
+    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, oc);
+    SELECT(SLJIT_EQUAL, TMP1, SLJIT_IMM, c, TMP1);
+    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c));
+    }
+  else
+    {
+    jump[0] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c);
+    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
+    JUMPHERE(jump[0]);
+    }
+  return cc + length;
+
+  case OP_NOT:
+  case OP_NOTI:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+
+  length = 1;
+#ifdef SUPPORT_UNICODE
+  if (common->utf)
+    {
+#if PCRE2_CODE_UNIT_WIDTH == 8
+    c = *cc;
+    if (c < 128 && !common->invalid_utf)
+      {
+      OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
+      if (type == OP_NOT || !char_has_othercase(common, cc))
+        add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
+      else
+        {
+        /* Since UTF8 code page is fixed, we know that c is in [a-z] or [A-Z] range. */
+        OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x20);
+        add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, c | 0x20));
+        }
+      /* Skip the variable-length character. */
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+      jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
+      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+      JUMPHERE(jump[0]);
+      return cc + 1;
+      }
+    else
+#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
+      {
+      GETCHARLEN(c, cc, length);
+      }
+    }
+  else
+#endif /* SUPPORT_UNICODE */
+    c = *cc;
+
+  if (type == OP_NOT || !char_has_othercase(common, cc))
+    {
+    read_char(common, c, c, backtracks, READ_CHAR_UPDATE_STR_PTR);
+    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
+    }
+  else
+    {
+    oc = char_othercase(common, c);
+    read_char(common, c < oc ? c : oc, c > oc ? c : oc, backtracks, READ_CHAR_UPDATE_STR_PTR);
+    bit = c ^ oc;
+    if (is_powerof2(bit))
+      {
+      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));
+      }
+    else
+      {
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
+      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
+      }
+    }
+  return cc + length;
+
+  case OP_CLASS:
+  case OP_NCLASS:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  bit = (common->utf && is_char7_bitset((const sljit_u8 *)cc, type == OP_NCLASS)) ? 127 : 255;
+  if (type == OP_NCLASS)
+    read_char(common, 0, bit, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0, bit, NULL, 0);
+#else
+  if (type == OP_NCLASS)
+    read_char(common, 0, 255, backtracks, READ_CHAR_UPDATE_STR_PTR);
+  else
+    read_char(common, 0, 255, NULL, 0);
+#endif
+
+  if (optimize_class(common, (const sljit_u8 *)cc, type == OP_NCLASS, FALSE, backtracks))
+    return cc + 32 / sizeof(PCRE2_UCHAR);
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+  jump[0] = NULL;
+  if (common->utf)
+    {
+    jump[0] = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, bit);
+    if (type == OP_CLASS)
+      {
+      add_jump(compiler, backtracks, jump[0]);
+      jump[0] = NULL;
+      }
+    }
+#elif PCRE2_CODE_UNIT_WIDTH != 8
+  jump[0] = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
+  if (type == OP_CLASS)
+    {
+    add_jump(compiler, backtracks, jump[0]);
+    jump[0] = NULL;
+    }
+#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8 */
+
+  OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
+  OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
+  OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
+  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
+  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
+  add_jump(compiler, backtracks, JUMP(SLJIT_ZERO));
+
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
+  if (jump[0] != NULL)
+    JUMPHERE(jump[0]);
+#endif
+  return cc + 32 / sizeof(PCRE2_UCHAR);
+
+#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+  case OP_XCLASS:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+  compile_xclass_matchingpath(common, cc + LINK_SIZE, backtracks, 0);
+  return cc + GET(cc, 0) - 1;
+
+  case OP_ECLASS:
+  if (check_str_ptr)
+    detect_partial_match(common, backtracks);
+  return compile_eclass_matchingpath(common, cc, backtracks);
+#endif
+  }
+SLJIT_UNREACHABLE();
+return cc;
+}
+
+static SLJIT_INLINE PCRE2_SPTR compile_charn_matchingpath(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, jump_list **backtracks)
+{
+/* This function consumes at least one input character. */
+/* To decrease the number of length checks, we try to concatenate the fixed length character sequences. */
+DEFINE_COMPILER;
+PCRE2_SPTR ccbegin = cc;
+compare_context context;
+int size;
+
+context.length = 0;
+do
+  {
+  if (cc >= ccend)
+    break;
+
+  if (*cc == OP_CHAR)
+    {
+    size = 1;
+#ifdef SUPPORT_UNICODE
+    if (common->utf && HAS_EXTRALEN(cc[1]))
+      size += GET_EXTRALEN(cc[1]);
+#endif
+    }
+  else if (*cc == OP_CHARI)
+    {
+    size = 1;
+#ifdef SUPPORT_UNICODE
+    if (common->utf)
+      {
+      if (char_has_othercase(common, cc + 1) && char_get_othercase_bit(common, cc + 1) == 0)
+        size = 0;
+      else if (HAS_EXTRALEN(cc[1]))
+        size += GET_EXTRALEN(cc[1]);
+      }
+    else
+#endif
+    if (char_has_othercase(common, cc + 1) && char_get_othercase_bit(common, cc + 1) == 0)
+      size = 0;
+    }
+  else
+    size = 0;
+
+  cc += 1 + size;
+  context.length += IN_UCHARS(size);
+  }
+while (size > 0 && context.length <= 128);
+
+cc = ccbegin;
+if (context.length > 0)
+  {
+  /* We have a fixed-length byte sequence. */
+  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, context.length);
+  add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
+
+  context.sourcereg = -1;
+#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
+  context.ucharptr = 0;
+#endif
+  do cc = byte_sequence_compare(common, *cc == OP_CHARI, cc + 1, &context, backtracks); while (context.length > 0);
+  return cc;
+  }
+
+/* A non-fixed length character will be checked if length == 0. */
+return compile_char1_matchingpath(common, *cc, cc + 1, backtracks, TRUE);
+}
+
+
diff --git a/engine/thirdparty/pcre2/src/pcre2_jit_compile.c b/engine/thirdparty/pcre2/src/pcre2_jit_compile.c
index 050063ec..175eb685 100644
--- a/engine/thirdparty/pcre2/src/pcre2_jit_compile.c
+++ b/engine/thirdparty/pcre2/src/pcre2_jit_compile.c
@@ -8,7 +8,7 @@ and semantics are as close as possible to those of the Perl 5 language.
                        Written by Philip Hazel
                     This module by Zoltan Herczeg
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2021 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -82,7 +82,7 @@ pcre2_memctl *allocator = ((pcre2_memctl*)allocator_data);
 allocator->free(ptr, allocator->memory_data);
 }
 
-#include "sljit/sljitLir.c"
+#include "../deps/sljit/sljit_src/sljitLir.c"
 
 #if defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED
 #error Unsupported architecture
@@ -282,14 +282,14 @@ typedef struct bracket_backtrack {
   struct sljit_label *zero_matchingpath;
   /* Contains the branches of a failed condition. */
   union {
-    /* Both for OP_COND, OP_SCOND. */
-    jump_list *condfailed;
+    /* Both for OP_COND, OP_SCOND, OP_ASSERT_SCS. */
+    jump_list *no_capture;
     assert_backtrack *assert;
     /* For OP_ONCE. Less than 0 if not needed. */
     int framesize;
-    /* For brackets with >3 alternatives. */
-    struct sljit_put_label *matching_put_label;
   } u;
+  /* For brackets with >3 alternatives. */
+  struct sljit_jump *matching_mov_addr;
   /* Points to our private memory word on the stack. */
   int private_data_ptr;
 } bracket_backtrack;
@@ -313,14 +313,12 @@ typedef struct char_iterator_backtrack {
   backtrack_common common;
   /* Next iteration. */
   struct sljit_label *matchingpath;
-  union {
-    jump_list *backtracks;
-    struct {
-      unsigned int othercasebit;
-      PCRE2_UCHAR chr;
-      BOOL enabled;
-    } charpos;
-  } u;
+  /* Creating a range based on the next character. */
+  struct {
+    unsigned int othercasebit;
+    PCRE2_UCHAR chr;
+    BOOL charpos_enabled;
+  } charpos;
 } char_iterator_backtrack;
 
 typedef struct ref_iterator_backtrack {
@@ -408,6 +406,10 @@ typedef struct compiler_common {
   then_trap_backtrack *then_trap;
   /* Starting offset of private data for capturing brackets. */
   sljit_s32 cbra_ptr;
+#if defined SLJIT_DEBUG && SLJIT_DEBUG
+  /* End offset of locals for assertions. */
+  sljit_s32 locals_size;
+#endif
   /* Output vector starting point. Must be divisible by 2. */
   sljit_s32 ovector_start;
   /* Points to the starting character of the current match. */
@@ -429,6 +431,11 @@ typedef struct compiler_common {
      Each item must have a previous offset and type
      (see control_types) values. See do_search_mark. */
   sljit_s32 control_head_ptr;
+  /* The offset of the saved STR_END in the outermost
+     scan substring block. Since scan substring restores
+     STR_END after a match, it is enough to restore
+     STR_END inside a scan substring block. */
+  sljit_s32 restore_end_ptr;
   /* Points to the last matched capture block index. */
   sljit_s32 capture_last_ptr;
   /* Fast forward skipping byte code pointer. */
@@ -513,7 +520,6 @@ typedef struct compiler_common {
   BOOL invalid_utf;
   BOOL ucp;
   /* Points to saving area for iref. */
-  sljit_s32 iref_ptr;
   jump_list *getucd;
   jump_list *getucdtype;
 #if PCRE2_CODE_UNIT_WIDTH == 8
@@ -603,14 +609,14 @@ typedef struct compare_context {
 #endif
 
 /* Local space layout. */
-/* These two locals can be used by the current opcode. */
-#define LOCALS0          (0 * sizeof(sljit_sw))
-#define LOCALS1          (1 * sizeof(sljit_sw))
-/* Two local variables for possessive quantifiers (char1 cannot use them). */
-#define POSSESSIVE0      (2 * sizeof(sljit_sw))
-#define POSSESSIVE1      (3 * sizeof(sljit_sw))
 /* Max limit of recursions. */
-#define LIMIT_MATCH      (4 * sizeof(sljit_sw))
+#define LIMIT_MATCH      (0 * sizeof(sljit_sw))
+/* Local variables. Their number is computed by check_opcode_types. */
+#define LOCAL0           (1 * sizeof(sljit_sw))
+#define LOCAL1           (2 * sizeof(sljit_sw))
+#define LOCAL2           (3 * sizeof(sljit_sw))
+#define LOCAL3           (4 * sizeof(sljit_sw))
+#define LOCAL4           (5 * sizeof(sljit_sw))
 /* The output vector is stored on the stack, and contains pointers
 to characters. The vector data is divided into two groups: the first
 group contains the start / end character pointers, and the second is
@@ -667,7 +673,7 @@ the start pointers when the end of the capturing group has not yet reached. */
 #define GET_LOCAL_BASE(dst, dstw, offset) \
   sljit_get_local_base(compiler, (dst), (dstw), (offset))
 
-#define READ_CHAR_MAX 0x7fffffff
+#define READ_CHAR_MAX ((sljit_u32)0xffffffff)
 
 #define INVALID_UTF_CHAR -1
 #define UNASSIGNED_UTF_CHAR 888
@@ -862,7 +868,7 @@ the start pointers when the end of the capturing group has not yet reached. */
 
 static PCRE2_SPTR bracketend(PCRE2_SPTR cc)
 {
-SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
+SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERT_SCS) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
 do cc += GET(cc, 1); while (*cc == OP_ALT);
 SLJIT_ASSERT(*cc >= OP_KET && *cc <= OP_KETRPOS);
 cc += 1 + LINK_SIZE;
@@ -872,7 +878,7 @@ return cc;
 static int no_alternatives(PCRE2_SPTR cc)
 {
 int count = 0;
-SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
+SLJIT_ASSERT((*cc >= OP_ASSERT && *cc <= OP_ASSERT_SCS) || (*cc >= OP_ONCE && *cc <= OP_SCOND));
 do
   {
   cc += GET(cc, 1);
@@ -975,6 +981,7 @@ switch(*cc)
   case OP_ASSERTBACK_NOT:
   case OP_ASSERT_NA:
   case OP_ASSERTBACK_NA:
+  case OP_ASSERT_SCS:
   case OP_ONCE:
   case OP_SCRIPT_RUN:
   case OP_BRA:
@@ -1097,7 +1104,9 @@ switch(*cc)
   return cc + GET(cc, 1 + 2*LINK_SIZE);
 
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
+  case OP_ECLASS:
   case OP_XCLASS:
+  SLJIT_COMPILE_ASSERT(OP_XCLASS + 1 == OP_ECLASS && OP_CLASS + 1 == OP_NCLASS && OP_NCLASS < OP_XCLASS, class_byte_code_order);
   return cc + GET(cc, 1);
 #endif
 
@@ -1114,12 +1123,36 @@ switch(*cc)
   }
 }
 
+static sljit_s32 ref_update_local_size(compiler_common *common, PCRE2_SPTR cc, sljit_s32 current_locals_size)
+{
+/* Depends on do_casefulcmp(), do_caselesscmp(), and compile_ref_matchingpath() */
+int locals_size = 2 * SSIZE_OF(sw);
+SLJIT_UNUSED_ARG(common);
+
+#ifdef SUPPORT_UNICODE
+if ((*cc == OP_REFI || *cc == OP_DNREFI) && (common->utf || common->ucp))
+  locals_size = 3 * SSIZE_OF(sw);
+#endif
+
+cc += PRIV(OP_lengths)[*cc];
+/* Although do_casefulcmp() uses only one local, the allocate_stack()
+calls during the repeat destroys LOCAL1 variables. */
+if (*cc >= OP_CRSTAR && *cc <= OP_CRPOSRANGE)
+  locals_size += 2 * SSIZE_OF(sw);
+
+return (current_locals_size >= locals_size) ? current_locals_size : locals_size;
+}
+
 static BOOL check_opcode_types(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend)
 {
 int count;
 PCRE2_SPTR slot;
 PCRE2_SPTR assert_back_end = cc - 1;
 PCRE2_SPTR assert_na_end = cc - 1;
+sljit_s32 locals_size = 2 * SSIZE_OF(sw);
+BOOL set_recursive_head = FALSE;
+BOOL set_capture_last = FALSE;
+BOOL set_mark = FALSE;
 
 /* Calculate important variables (like stack size) and checks whether all opcodes are supported. */
 while (cc < ccend)
@@ -1132,22 +1165,41 @@ while (cc < ccend)
     cc += 1;
     break;
 
+    case OP_TYPEUPTO:
+    case OP_TYPEEXACT:
+    if (cc[1 + IMM2_SIZE] == OP_EXTUNI && locals_size <= 3 * SSIZE_OF(sw))
+      locals_size = 3 * SSIZE_OF(sw);
+    cc += (2 + IMM2_SIZE) - 1;
+    break;
+
+    case OP_TYPEPOSSTAR:
+    case OP_TYPEPOSPLUS:
+    case OP_TYPEPOSQUERY:
+    if (cc[1] == OP_EXTUNI && locals_size <= 3 * SSIZE_OF(sw))
+      locals_size = 3 * SSIZE_OF(sw);
+    cc += 2 - 1;
+    break;
+
+    case OP_TYPEPOSUPTO:
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+    if (common->utf && locals_size <= 3 * SSIZE_OF(sw))
+      locals_size = 3 * SSIZE_OF(sw);
+#endif
+    if (cc[1 + IMM2_SIZE] == OP_EXTUNI && locals_size <= 3 * SSIZE_OF(sw))
+      locals_size = 3 * SSIZE_OF(sw);
+    cc += (2 + IMM2_SIZE) - 1;
+    break;
+
     case OP_REFI:
-#ifdef SUPPORT_UNICODE
-    if (common->iref_ptr == 0)
-      {
-      common->iref_ptr = common->ovector_start;
-      common->ovector_start += 3 * sizeof(sljit_sw);
-      }
-#endif /* SUPPORT_UNICODE */
-    /* Fall through. */
     case OP_REF:
+    locals_size = ref_update_local_size(common, cc, locals_size);
     common->optimized_cbracket[GET2(cc, 1)] = 0;
-    cc += 1 + IMM2_SIZE;
+    cc += PRIV(OP_lengths)[*cc];
     break;
 
     case OP_ASSERT_NA:
     case OP_ASSERTBACK_NA:
+    case OP_ASSERT_SCS:
     slot = bracketend(cc);
     if (slot > assert_na_end)
       assert_na_end = slot;
@@ -1174,8 +1226,10 @@ while (cc < ccend)
     cc += 1 + IMM2_SIZE;
     break;
 
-    case OP_DNREF:
     case OP_DNREFI:
+    case OP_DNREF:
+    locals_size = ref_update_local_size(common, cc, locals_size);
+    /* Fall through */
     case OP_DNCREF:
     count = GET2(cc, 1 + IMM2_SIZE);
     slot = common->name_table + GET2(cc, 1) * common->name_entry_size;
@@ -1184,26 +1238,18 @@ while (cc < ccend)
       common->optimized_cbracket[GET2(slot, 0)] = 0;
       slot += common->name_entry_size;
       }
-    cc += 1 + 2 * IMM2_SIZE;
+    cc += PRIV(OP_lengths)[*cc];
     break;
 
     case OP_RECURSE:
     /* Set its value only once. */
-    if (common->recursive_head_ptr == 0)
-      {
-      common->recursive_head_ptr = common->ovector_start;
-      common->ovector_start += sizeof(sljit_sw);
-      }
+    set_recursive_head = TRUE;
     cc += 1 + LINK_SIZE;
     break;
 
     case OP_CALLOUT:
     case OP_CALLOUT_STR:
-    if (common->capture_last_ptr == 0)
-      {
-      common->capture_last_ptr = common->ovector_start;
-      common->ovector_start += sizeof(sljit_sw);
-      }
+    set_capture_last = TRUE;
     cc += (*cc == OP_CALLOUT) ? PRIV(OP_lengths)[OP_CALLOUT] : GET(cc, 1 + 2*LINK_SIZE);
     break;
 
@@ -1221,15 +1267,8 @@ while (cc < ccend)
 
     case OP_COMMIT_ARG:
     case OP_PRUNE_ARG:
-    if (cc < assert_na_end)
-      return FALSE;
-    /* Fall through */
     case OP_MARK:
-    if (common->mark_ptr == 0)
-      {
-      common->mark_ptr = common->ovector_start;
-      common->ovector_start += sizeof(sljit_sw);
-      }
+    set_mark = TRUE;
     cc += 1 + 2 + cc[1];
     break;
 
@@ -1242,8 +1281,6 @@ while (cc < ccend)
     case OP_SKIP:
     if (cc < assert_back_end)
       common->has_skip_in_assert_back = TRUE;
-    if (cc < assert_na_end)
-      return FALSE;
     cc += 1;
     break;
 
@@ -1252,19 +1289,31 @@ while (cc < ccend)
     common->has_skip_arg = TRUE;
     if (cc < assert_back_end)
       common->has_skip_in_assert_back = TRUE;
-    if (cc < assert_na_end)
-      return FALSE;
     cc += 1 + 2 + cc[1];
     break;
 
-    case OP_PRUNE:
-    case OP_COMMIT:
     case OP_ASSERT_ACCEPT:
     if (cc < assert_na_end)
       return FALSE;
     cc++;
     break;
 
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+    case OP_CRPOSRANGE:
+    /* The second value can be 0 for infinite repeats. */
+    if (common->utf && GET2(cc, 1) != GET2(cc, 1 + IMM2_SIZE) && locals_size <= 3 * SSIZE_OF(sw))
+      locals_size = 3 * SSIZE_OF(sw);
+    cc += 1 + 2 * IMM2_SIZE;
+    break;
+
+    case OP_POSUPTO:
+    case OP_POSUPTOI:
+    case OP_NOTPOSUPTO:
+    case OP_NOTPOSUPTOI:
+    if (common->utf && locals_size <= 3 * SSIZE_OF(sw))
+      locals_size = 3 * SSIZE_OF(sw);
+#endif
+    /* Fall through */
     default:
     cc = next_opcode(common, cc);
     if (cc == NULL)
@@ -1272,6 +1321,36 @@ while (cc < ccend)
     break;
     }
   }
+
+SLJIT_ASSERT((locals_size & (SSIZE_OF(sw) - 1)) == 0);
+#if defined SLJIT_DEBUG && SLJIT_DEBUG
+common->locals_size = locals_size;
+#endif
+
+if (locals_size > 0)
+  common->ovector_start += locals_size;
+
+if (set_mark)
+  {
+  SLJIT_ASSERT(common->mark_ptr == 0);
+  common->mark_ptr = common->ovector_start;
+  common->ovector_start += sizeof(sljit_sw);
+  }
+
+if (set_recursive_head)
+  {
+  SLJIT_ASSERT(common->recursive_head_ptr == 0);
+  common->recursive_head_ptr = common->ovector_start;
+  common->ovector_start += sizeof(sljit_sw);
+  }
+
+if (set_capture_last)
+  {
+  SLJIT_ASSERT(common->capture_last_ptr == 0);
+  common->capture_last_ptr = common->ovector_start;
+  common->ovector_start += sizeof(sljit_sw);
+  }
+
 return TRUE;
 }
 
@@ -1512,8 +1591,9 @@ do
       case OP_NCLASS:
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
       case OP_XCLASS:
+      case OP_ECLASS:
       accelerated_start = cc;
-      cc += ((*cc == OP_XCLASS) ? GET(cc, 1) : (unsigned int)(1 + (32 / sizeof(PCRE2_UCHAR))));
+      cc += (*cc >= OP_XCLASS) ? GET(cc, 1) : (unsigned int)(1 + (32 / sizeof(PCRE2_UCHAR)));
 #else
       accelerated_start = cc;
       cc += (1 + (32 / sizeof(PCRE2_UCHAR)));
@@ -1687,7 +1767,7 @@ switch(*cc)
   if (max == 0)
     return (*cc == OP_CRRANGE) ? 2 : 1;
   max -= min;
-  if (max > 2)
+  if (max > (sljit_u32)(*cc == OP_CRRANGE ? 0 : 1))
     max = 2;
   return max;
 
@@ -1905,6 +1985,12 @@ while (cc < ccend)
     bracketlen = 1 + LINK_SIZE;
     break;
 
+    case OP_ASSERT_SCS:
+    common->private_data_ptrs[cc - common->start] = private_data_ptr;
+    private_data_ptr += 2 * sizeof(sljit_sw);
+    bracketlen = 1 + LINK_SIZE;
+    break;
+
     case OP_CBRAPOS:
     case OP_SCBRAPOS:
     common->private_data_ptrs[cc - common->start] = private_data_ptr;
@@ -1962,13 +2048,13 @@ while (cc < ccend)
 
     CASE_ITERATOR_TYPE_PRIVATE_DATA_2A
     size = 1;
-    if (cc[1] != OP_ANYNL && cc[1] != OP_EXTUNI)
+    if (cc[1] != OP_EXTUNI)
       space = 2;
     break;
 
     case OP_TYPEUPTO:
     size = 1 + IMM2_SIZE;
-    if (cc[1 + IMM2_SIZE] != OP_ANYNL && cc[1 + IMM2_SIZE] != OP_EXTUNI)
+    if (cc[1 + IMM2_SIZE] != OP_EXTUNI)
       space = 2;
     break;
 
@@ -1985,6 +2071,7 @@ while (cc < ccend)
 
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
+    case OP_ECLASS:
     size = GET(cc, 1);
     space = get_class_iterator_size(cc + size);
     break;
@@ -2200,6 +2287,7 @@ while (cc < ccend)
     case OP_CLASS:
     case OP_NCLASS:
     case OP_XCLASS:
+    case OP_ECLASS:
 
     case OP_CALLOUT:
     case OP_CALLOUT_STR:
@@ -2242,6 +2330,7 @@ if (ccend == NULL)
     cc = next_opcode(common, cc);
   }
 
+/* The data is restored by do_revertframes(). */
 SLJIT_ASSERT(cc != NULL);
 while (cc < ccend)
   switch(*cc)
@@ -2516,6 +2605,13 @@ while (cc < ccend)
     cc += 1 + LINK_SIZE;
     break;
 
+    case OP_ASSERT_SCS:
+    SLJIT_ASSERT(PRIVATE_DATA(cc) != 0);
+    if (recurse_check_bit(common, PRIVATE_DATA(cc)))
+      length += 2;
+    cc += 1 + LINK_SIZE;
+    break;
+
     case OP_CBRA:
     case OP_SCBRA:
     offset = GET2(cc, 1 + LINK_SIZE);
@@ -2623,7 +2719,8 @@ while (cc < ccend)
     case OP_NCLASS:
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
-    size = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(PCRE2_UCHAR);
+    case OP_ECLASS:
+    size = (*cc >= OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #else
     size = 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #endif
@@ -2865,6 +2962,14 @@ while (cc < ccend)
     cc += 1 + LINK_SIZE;
     break;
 
+    case OP_ASSERT_SCS:
+    private_srcw[0] = PRIVATE_DATA(cc);
+    private_srcw[1] = private_srcw[0] + sizeof(sljit_sw);
+    if (recurse_check_bit(common, private_srcw[0]))
+      private_count = 2;
+    cc += 1 + LINK_SIZE;
+    break;
+
     case OP_CBRA:
     case OP_SCBRA:
     offset = GET2(cc, 1 + LINK_SIZE);
@@ -3005,7 +3110,8 @@ while (cc < ccend)
     case OP_NCLASS:
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
-    i = (*cc == OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(PCRE2_UCHAR);
+    case OP_ECLASS:
+    i = (*cc >= OP_XCLASS) ? GET(cc, 1) : 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #else
     i = 1 + 32 / (int)sizeof(PCRE2_UCHAR);
 #endif
@@ -3140,50 +3246,66 @@ static SLJIT_INLINE PCRE2_SPTR set_then_offsets(compiler_common *common, PCRE2_S
 PCRE2_SPTR end = bracketend(cc);
 BOOL has_alternatives = cc[GET(cc, 1)] == OP_ALT;
 
-/* Assert captures then. */
-if (*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA)
+/* Assert captures *THEN verb even if it has no alternatives. */
+if (*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NOT)
   current_offset = NULL;
-/* Conditional block does not. */
-if (*cc == OP_COND || *cc == OP_SCOND)
+else if (*cc >= OP_ASSERT_NA && *cc <= OP_ASSERT_SCS)
+  has_alternatives = TRUE;
+/* Conditional block does never capture. */
+else if (*cc == OP_COND || *cc == OP_SCOND)
   has_alternatives = FALSE;
 
 cc = next_opcode(common, cc);
 
 if (has_alternatives)
   {
-  if (*cc == OP_REVERSE)
-    cc += 1 + IMM2_SIZE;
-  else if (*cc == OP_VREVERSE)
-    cc += 1 + 2 * IMM2_SIZE;
+  switch (*cc)
+    {
+    case OP_REVERSE:
+    case OP_CREF:
+      cc += 1 + IMM2_SIZE;
+      break;
+    case OP_VREVERSE:
+    case OP_DNCREF:
+      cc += 1 + 2 * IMM2_SIZE;
+      break;
+    }
 
   current_offset = common->then_offsets + (cc - common->start);
   }
 
 while (cc < end)
   {
-  if ((*cc >= OP_ASSERT && *cc <= OP_ASSERTBACK_NA) || (*cc >= OP_ONCE && *cc <= OP_SCOND))
-    cc = set_then_offsets(common, cc, current_offset);
-  else
+  if (*cc >= OP_ASSERT && *cc <= OP_SCOND)
     {
-    if (*cc == OP_ALT && has_alternatives)
-      {
-      cc += 1 + LINK_SIZE;
-
-      if (*cc == OP_REVERSE)
-        cc += 1 + IMM2_SIZE;
-      else if (*cc == OP_VREVERSE)
-        cc += 1 + 2 * IMM2_SIZE;
-
-      current_offset = common->then_offsets + (cc - common->start);
-      continue;
-      }
-
-    if (*cc >= OP_THEN && *cc <= OP_THEN_ARG && current_offset != NULL)
-      *current_offset = 1;
-    cc = next_opcode(common, cc);
+    cc = set_then_offsets(common, cc, current_offset);
+    continue;
     }
+
+  if (*cc == OP_ALT && has_alternatives)
+    {
+    cc += 1 + LINK_SIZE;
+
+    if (*cc == OP_REVERSE)
+      cc += 1 + IMM2_SIZE;
+    else if (*cc == OP_VREVERSE)
+      cc += 1 + 2 * IMM2_SIZE;
+
+    current_offset = common->then_offsets + (cc - common->start);
+    continue;
+    }
+
+  if (*cc >= OP_THEN && *cc <= OP_THEN_ARG && current_offset != NULL)
+    *current_offset = 1;
+  cc = next_opcode(common, cc);
   }
 
+cc = end - 1 - LINK_SIZE;
+
+/* Ignore repeats. */
+if (*cc == OP_KET && PRIVATE_DATA(cc) != 0)
+  end += PRIVATE_DATA(cc + 1);
+
 return end;
 }
 
@@ -3269,8 +3391,12 @@ OP2(SLJIT_SUB, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, size * SSIZE_OF(sw));
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, 12345);
 OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
 OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, TMP1, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP1, 0);
+#if defined SLJIT_DEBUG && SLJIT_DEBUG
+SLJIT_ASSERT(common->locals_size >= 2 * SSIZE_OF(sw));
+/* These two are also used by the stackalloc calls. */
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL0, TMP1, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL1, TMP1, 0);
+#endif
 #endif
 add_stub(common, CMP(SLJIT_LESS, STACK_TOP, 0, STACK_LIMIT, 0));
 }
@@ -5589,11 +5715,38 @@ if (last)
   chars->last_count++;
 }
 
-static int scan_prefix(compiler_common *common, PCRE2_SPTR cc, fast_forward_char_data *chars, int max_chars, sljit_u32 *rec_count)
+/* Value can be increased if needed. Patterns
+such as /(a|){33}b/ can exhaust the stack.
+
+Note: /(a|){29}b/ already stops scan_prefix()
+because it reaches the maximum step_count. */
+#define SCAN_PREFIX_STACK_END 32
+
+/*
+Scan prefix stores the prefix string in the chars array.
+The elements of the chars array is either small character
+sets or "any" (count is set to 255).
+
+Examples (the chars array is represented by a simple regex):
+
+/(abc|xbyd)/ prefix: /[ax]b[cy]/ (length: 3)
+/a[a-z]b+c/ prefix: a.b (length: 3)
+/ab?cd/ prefix: a[bc][cd] (length: 3)
+/(ab|cd)|(ef|gh)/ prefix: [aceg][bdfh] (length: 2)
+
+The length is returned by scan_prefix(). The length is
+less than or equal than the minimum length of the pattern.
+*/
+
+static int scan_prefix(compiler_common *common, PCRE2_SPTR cc, fast_forward_char_data *chars)
 {
-/* Recursive function, which scans prefix literals. */
+fast_forward_char_data *chars_start = chars;
+fast_forward_char_data *chars_end = chars + MAX_N_CHARS;
+PCRE2_SPTR cc_stack[SCAN_PREFIX_STACK_END];
+fast_forward_char_data *chars_stack[SCAN_PREFIX_STACK_END];
+sljit_u8 next_alternative_stack[SCAN_PREFIX_STACK_END];
 BOOL last, any, class, caseless;
-int len, repeat, len_save, consumed = 0;
+int stack_ptr, step_count, repeat, len, len_save;
 sljit_u32 chr; /* Any unicode character. */
 sljit_u8 *bytes, *bytes_end, byte;
 PCRE2_SPTR alternative, cc_save, oc;
@@ -5606,11 +5759,44 @@ PCRE2_UCHAR othercase[1];
 #endif
 
 repeat = 1;
+stack_ptr = 0;
+step_count = 10000;
 while (TRUE)
   {
-  if (*rec_count == 0)
+  if (--step_count == 0)
     return 0;
-  (*rec_count)--;
+
+  SLJIT_ASSERT(chars <= chars_start + MAX_N_CHARS);
+
+  if (chars >= chars_end)
+    {
+    if (stack_ptr == 0)
+      return (int)(chars_end - chars_start);
+
+    --stack_ptr;
+    cc = cc_stack[stack_ptr];
+    chars = chars_stack[stack_ptr];
+
+    if (chars >= chars_end)
+      continue;
+
+    if (next_alternative_stack[stack_ptr] != 0)
+      {
+      /* When an alternative is processed, the
+      next alternative is pushed onto the stack. */
+      SLJIT_ASSERT(*cc == OP_ALT);
+      alternative = cc + GET(cc, 1);
+      if (*alternative == OP_ALT)
+        {
+        SLJIT_ASSERT(stack_ptr < SCAN_PREFIX_STACK_END);
+        SLJIT_ASSERT(chars_stack[stack_ptr] == chars);
+        SLJIT_ASSERT(next_alternative_stack[stack_ptr] == 1);
+        cc_stack[stack_ptr] = alternative;
+        stack_ptr++;
+        }
+      cc += 1 + LINK_SIZE;
+      }
+    }
 
   last = TRUE;
   any = FALSE;
@@ -5650,6 +5836,7 @@ while (TRUE)
     case OP_ASSERTBACK_NOT:
     case OP_ASSERT_NA:
     case OP_ASSERTBACK_NA:
+    case OP_ASSERT_SCS:
     cc = bracketend(cc);
     continue;
 
@@ -5686,9 +5873,17 @@ while (TRUE)
 #ifdef SUPPORT_UNICODE
     if (common->utf && HAS_EXTRALEN(*cc)) len += GET_EXTRALEN(*cc);
 #endif
-    max_chars = scan_prefix(common, cc + len, chars, max_chars, rec_count);
-    if (max_chars == 0)
-      return consumed;
+    if (stack_ptr >= SCAN_PREFIX_STACK_END)
+      {
+      chars_end = chars;
+      continue;
+      }
+
+    cc_stack[stack_ptr] = cc + len;
+    chars_stack[stack_ptr] = chars;
+    next_alternative_stack[stack_ptr] = 0;
+    stack_ptr++;
+
     last = FALSE;
     break;
 
@@ -5706,12 +5901,18 @@ while (TRUE)
     case OP_CBRA:
     case OP_CBRAPOS:
     alternative = cc + GET(cc, 1);
-    while (*alternative == OP_ALT)
+    if (*alternative == OP_ALT)
       {
-      max_chars = scan_prefix(common, alternative + 1 + LINK_SIZE, chars, max_chars, rec_count);
-      if (max_chars == 0)
-        return consumed;
-      alternative += GET(alternative, 1);
+      if (stack_ptr >= SCAN_PREFIX_STACK_END)
+        {
+        chars_end = chars;
+        continue;
+        }
+
+      cc_stack[stack_ptr] = alternative;
+      chars_stack[stack_ptr] = chars;
+      next_alternative_stack[stack_ptr] = 1;
+      stack_ptr++;
       }
 
     if (*cc == OP_CBRA || *cc == OP_CBRAPOS)
@@ -5722,22 +5923,34 @@ while (TRUE)
     case OP_CLASS:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)(cc + 1), FALSE))
-      return consumed;
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     class = TRUE;
     break;
 
     case OP_NCLASS:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-    if (common->utf) return consumed;
+    if (common->utf)
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     class = TRUE;
     break;
 
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
+    case OP_ECLASS:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-    if (common->utf) return consumed;
+    if (common->utf)
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     any = TRUE;
     cc += GET(cc, 1);
@@ -5747,7 +5960,10 @@ while (TRUE)
     case OP_DIGIT:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_digit, FALSE))
-      return consumed;
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     any = TRUE;
     cc++;
@@ -5756,7 +5972,10 @@ while (TRUE)
     case OP_WHITESPACE:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_space, FALSE))
-      return consumed;
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     any = TRUE;
     cc++;
@@ -5765,7 +5984,10 @@ while (TRUE)
     case OP_WORDCHAR:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
     if (common->utf && !is_char7_bitset((const sljit_u8 *)common->ctypes - cbit_length + cbit_word, FALSE))
-      return consumed;
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     any = TRUE;
     cc++;
@@ -5781,7 +6003,11 @@ while (TRUE)
     case OP_ANY:
     case OP_ALLANY:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-    if (common->utf) return consumed;
+    if (common->utf)
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     any = TRUE;
     cc++;
@@ -5791,7 +6017,11 @@ while (TRUE)
     case OP_NOTPROP:
     case OP_PROP:
 #if PCRE2_CODE_UNIT_WIDTH != 32
-    if (common->utf) return consumed;
+    if (common->utf)
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     any = TRUE;
     cc += 1 + 2;
@@ -5806,7 +6036,11 @@ while (TRUE)
     case OP_NOTEXACT:
     case OP_NOTEXACTI:
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-    if (common->utf) return consumed;
+    if (common->utf)
+      {
+      chars_end = chars;
+      continue;
+      }
 #endif
     any = TRUE;
     repeat = GET2(cc, 1);
@@ -5814,21 +6048,20 @@ while (TRUE)
     break;
 
     default:
-    return consumed;
+    chars_end = chars;
+    continue;
     }
 
+  SLJIT_ASSERT(chars < chars_end);
+
   if (any)
     {
     do
       {
       chars->count = 255;
-
-      consumed++;
-      if (--max_chars == 0)
-        return consumed;
       chars++;
       }
-    while (--repeat > 0);
+    while (--repeat > 0 && chars < chars_end);
 
     repeat = 1;
     continue;
@@ -5839,17 +6072,27 @@ while (TRUE)
     bytes = (sljit_u8*) (cc + 1);
     cc += 1 + 32 / sizeof(PCRE2_UCHAR);
 
+    SLJIT_ASSERT(last == TRUE && repeat == 1);
     switch (*cc)
       {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRPOSSTAR:
       case OP_CRQUERY:
       case OP_CRMINQUERY:
       case OP_CRPOSQUERY:
-      max_chars = scan_prefix(common, cc + 1, chars, max_chars, rec_count);
-      if (max_chars == 0)
-        return consumed;
+      last = FALSE;
+      /* Fall through */
+      case OP_CRSTAR:
+      case OP_CRMINSTAR:
+      case OP_CRPOSSTAR:
+      if (stack_ptr >= SCAN_PREFIX_STACK_END)
+        {
+        chars_end = chars;
+        continue;
+        }
+
+      cc_stack[stack_ptr] = ++cc;
+      chars_stack[stack_ptr] = chars;
+      next_alternative_stack[stack_ptr] = 0;
+      stack_ptr++;
       break;
 
       default:
@@ -5863,7 +6106,13 @@ while (TRUE)
       case OP_CRPOSRANGE:
       repeat = GET2(cc, 1);
       if (repeat <= 0)
-        return consumed;
+        {
+        chars_end = chars;
+        continue;
+        }
+
+      last = (repeat != (int)GET2(cc, 1 + IMM2_SIZE));
+      cc += 1 + 2 * IMM2_SIZE;
       break;
       }
 
@@ -5891,43 +6140,20 @@ while (TRUE)
               chr++;
               }
             while (byte != 0);
-            chr = (chr + 7) & ~7;
+            chr = (chr + 7) & (sljit_u32)(~7);
             }
           }
         while (chars->count != 255 && bytes < bytes_end);
         bytes = bytes_end - 32;
         }
 
-      consumed++;
-      if (--max_chars == 0)
-        return consumed;
       chars++;
       }
-    while (--repeat > 0);
-
-    switch (*cc)
-      {
-      case OP_CRSTAR:
-      case OP_CRMINSTAR:
-      case OP_CRPOSSTAR:
-      return consumed;
-
-      case OP_CRQUERY:
-      case OP_CRMINQUERY:
-      case OP_CRPOSQUERY:
-      cc++;
-      break;
-
-      case OP_CRRANGE:
-      case OP_CRMINRANGE:
-      case OP_CRPOSRANGE:
-      if (GET2(cc, 1) != GET2(cc, 1 + IMM2_SIZE))
-        return consumed;
-      cc += 1 + 2 * IMM2_SIZE;
-      break;
-      }
+    while (--repeat > 0 && chars < chars_end);
 
     repeat = 1;
+    if (last)
+      chars_end = chars;
     continue;
     }
 
@@ -5943,7 +6169,10 @@ while (TRUE)
       {
       GETCHAR(chr, cc);
       if ((int)PRIV(ord2utf)(char_othercase(common, chr), othercase) != len)
-        return consumed;
+        {
+        chars_end = chars;
+        continue;
+        }
       }
     else
 #endif
@@ -5951,7 +6180,10 @@ while (TRUE)
       chr = *cc;
 #ifdef SUPPORT_UNICODE
       if (common->ucp && chr > 127)
-        othercase[0] = UCD_OTHERCASE(chr);
+        {
+        chr = UCD_OTHERCASE(chr);
+        othercase[0] = (chr == (PCRE2_UCHAR)chr) ? chr : *cc;
+        }
       else
 #endif
         othercase[0] = TABLE_GET(chr, common->fcc, chr);
@@ -5971,7 +6203,6 @@ while (TRUE)
     do
       {
       len--;
-      consumed++;
 
       chr = *cc;
       add_prefix_char(*cc, chars, len == 0);
@@ -5979,15 +6210,13 @@ while (TRUE)
       if (caseless)
         add_prefix_char(*oc, chars, len == 0);
 
-      if (--max_chars == 0)
-        return consumed;
       chars++;
       cc++;
       oc++;
       }
-    while (len > 0);
+    while (len > 0 && chars < chars_end);
 
-    if (--repeat == 0)
+    if (--repeat == 0 || chars >= chars_end)
       break;
 
     len = len_save;
@@ -5996,7 +6225,7 @@ while (TRUE)
 
   repeat = 1;
   if (last)
-    return consumed;
+    chars_end = chars;
   }
 }
 
@@ -6166,7 +6395,6 @@ int i, max, from;
 int range_right = -1, range_len;
 sljit_u8 *update_table = NULL;
 BOOL in_range;
-sljit_u32 rec_count;
 
 for (i = 0; i < MAX_N_CHARS; i++)
   {
@@ -6174,8 +6402,7 @@ for (i = 0; i < MAX_N_CHARS; i++)
   chars[i].last_count = 0;
   }
 
-rec_count = 10000;
-max = scan_prefix(common, common->start, chars, MAX_N_CHARS, &rec_count);
+max = scan_prefix(common, common->start, chars);
 
 if (max < 1)
   return FALSE;
@@ -6183,25 +6410,34 @@ if (max < 1)
 /* Convert last_count to priority. */
 for (i = 0; i < max; i++)
   {
-  SLJIT_ASSERT(chars[i].count > 0 && chars[i].last_count <= chars[i].count);
+  SLJIT_ASSERT(chars[i].last_count <= chars[i].count);
 
-  if (chars[i].count == 1)
+  switch (chars[i].count)
     {
+    case 0:
+    chars[i].count = 255;
+    chars[i].last_count = 0;
+    break;
+
+    case 1:
     chars[i].last_count = (chars[i].last_count == 1) ? 7 : 5;
     /* Simplifies algorithms later. */
     chars[i].chars[1] = chars[i].chars[0];
-    }
-  else if (chars[i].count == 2)
-    {
+    break;
+
+    case 2:
     SLJIT_ASSERT(chars[i].chars[0] != chars[i].chars[1]);
 
     if (is_powerof2(chars[i].chars[0] ^ chars[i].chars[1]))
       chars[i].last_count = (chars[i].last_count == 2) ? 6 : 4;
     else
       chars[i].last_count = (chars[i].last_count == 2) ? 3 : 2;
-    }
-  else
+    break;
+
+    default:
     chars[i].last_count = (chars[i].count == 255) ? 0 : 1;
+    break;
+    }
   }
 
 #ifdef JIT_HAS_FAST_FORWARD_CHAR_PAIR_SIMD
@@ -6756,8 +6992,7 @@ jump = JUMP(SLJIT_NOT_ZERO /* SIG_LESS */);
 OP_SRC(SLJIT_FAST_RETURN, RETURN_ADDR, 0);
 
 JUMPHERE(jump);
-OP2(SLJIT_SUB, TMP2, 0, SLJIT_IMM, 0, TMP2, 0);
-OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
+OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, TMP2, 0);
 if (HAS_VIRTUAL_REGISTERS)
   {
   OP1(SLJIT_MOV, SLJIT_MEM1(TMP2), 0, SLJIT_MEM1(STACK_TOP), -(2 * SSIZE_OF(sw)));
@@ -6799,7 +7034,8 @@ struct sljit_jump *jump;
 SLJIT_UNUSED_ARG(ucp);
 SLJIT_COMPILE_ASSERT(ctype_word == 0x10, ctype_word_must_be_16);
 
-sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+SLJIT_ASSERT(common->locals_size >= 2 * SSIZE_OF(sw));
+sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 /* Get type of the previous char, and put it to TMP3. */
 OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
 OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
@@ -6868,7 +7104,7 @@ JUMPHERE(skipread);
 
 OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, 0);
 check_str_end(common, &skipread_list);
-peek_char(common, READ_CHAR_MAX, SLJIT_MEM1(SLJIT_SP), LOCALS1, &invalid_utf2);
+peek_char(common, READ_CHAR_MAX, SLJIT_MEM1(SLJIT_SP), LOCAL1, &invalid_utf2);
 
 /* Testing char type. This is a code duplication. */
 #ifdef SUPPORT_UNICODE
@@ -6907,7 +7143,7 @@ else
   }
 set_jumps(skipread_list, LABEL());
 
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 OP2(SLJIT_XOR | SLJIT_SET_Z, TMP2, 0, TMP2, 0, TMP3, 0);
 OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
 
@@ -6916,15 +7152,15 @@ if (common->invalid_utf)
   {
   set_jumps(invalid_utf1, LABEL());
 
-  peek_char(common, READ_CHAR_MAX, SLJIT_MEM1(SLJIT_SP), LOCALS1, NULL);
+  peek_char(common, READ_CHAR_MAX, SLJIT_MEM1(SLJIT_SP), LOCAL1, NULL);
   CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, INVALID_UTF_CHAR, valid_utf);
 
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, -1);
   OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
 
   set_jumps(invalid_utf2, LABEL());
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
   OP1(SLJIT_MOV, TMP2, 0, TMP3, 0);
   OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
   }
@@ -6941,7 +7177,7 @@ int i, byte, length = 0;
 
 bit = bits[0] & 0x1;
 /* All bits will be zero or one (since bit is zero or one). */
-all = -bit;
+all = (sljit_u8)-bit;
 
 for (i = 0; i < 256; )
   {
@@ -6958,7 +7194,7 @@ for (i = 0; i < 256; )
       ranges[length] = i;
       length++;
       bit = cbit;
-      all = -cbit;
+      all = (sljit_u8)-cbit; /* sign extend bit into byte */
       }
     i++;
     }
@@ -7102,7 +7338,7 @@ for (i = 0; i < 32; i++)
   byte = bits[i];
 
   if (nclass)
-    byte = ~byte;
+    byte = (sljit_u8)~byte;
 
   j = 0;
   while (byte != 0)
@@ -7305,7 +7541,9 @@ else
   char2_reg = RETURN_ADDR;
   }
 
-sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+/* Update ref_update_local_size() when this changes. */
+SLJIT_ASSERT(common->locals_size >= SSIZE_OF(sw));
+sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
 
 if (char1_reg == STR_END)
@@ -7324,7 +7562,7 @@ if (sljit_emit_mem_update(compiler, MOV_UCHAR | SLJIT_MEM_SUPP | SLJIT_MEM_POST,
   JUMPTO(SLJIT_NOT_ZERO, label);
 
   JUMPHERE(jump);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
   }
 else if (sljit_emit_mem_update(compiler, MOV_UCHAR | SLJIT_MEM_SUPP | SLJIT_MEM_PRE, char1_reg, SLJIT_MEM1(TMP1), IN_UCHARS(1)) == SLJIT_SUCCESS)
   {
@@ -7339,7 +7577,7 @@ else if (sljit_emit_mem_update(compiler, MOV_UCHAR | SLJIT_MEM_SUPP | SLJIT_MEM_
   JUMPTO(SLJIT_NOT_ZERO, label);
 
   JUMPHERE(jump);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   }
 else
@@ -7354,7 +7592,7 @@ else
   JUMPTO(SLJIT_NOT_ZERO, label);
 
   JUMPHERE(jump);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
   }
 
 if (char1_reg == STR_END)
@@ -7392,10 +7630,12 @@ if (sljit_emit_mem_update(compiler, MOV_UCHAR | SLJIT_MEM_SUPP | SLJIT_MEM_POST,
 else if (sljit_emit_mem_update(compiler, MOV_UCHAR | SLJIT_MEM_SUPP | SLJIT_MEM_PRE, char1_reg, SLJIT_MEM1(TMP1), IN_UCHARS(1)) == SLJIT_SUCCESS)
   opt_type = 2;
 
-sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+/* Update ref_update_local_size() when this changes. */
+SLJIT_ASSERT(common->locals_size >= 2 * SSIZE_OF(sw));
+sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
 
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, char1_reg, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL1, char1_reg, 0);
 
 if (char2_reg == STACK_TOP)
   {
@@ -7449,7 +7689,7 @@ OP2(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, TMP2, 0, SLJIT_IMM, IN_UCHARS(1));
 JUMPTO(SLJIT_NOT_ZERO, label);
 
 JUMPHERE(jump);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 
 if (opt_type == 2)
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
@@ -7460,983 +7700,11 @@ if (char2_reg == STACK_TOP)
   OP1(SLJIT_MOV, lcc_table, 0, RETURN_ADDR, 0);
   }
 
-OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
+OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL1);
 OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
 }
 
-static PCRE2_SPTR byte_sequence_compare(compiler_common *common, BOOL caseless, PCRE2_SPTR cc,
-    compare_context *context, jump_list **backtracks)
-{
-DEFINE_COMPILER;
-unsigned int othercasebit = 0;
-PCRE2_SPTR othercasechar = NULL;
-#ifdef SUPPORT_UNICODE
-int utflength;
-#endif
-
-if (caseless && char_has_othercase(common, cc))
-  {
-  othercasebit = char_get_othercase_bit(common, cc);
-  SLJIT_ASSERT(othercasebit);
-  /* Extracting bit difference info. */
-#if PCRE2_CODE_UNIT_WIDTH == 8
-  othercasechar = cc + (othercasebit >> 8);
-  othercasebit &= 0xff;
-#elif PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
-  /* Note that this code only handles characters in the BMP. If there
-  ever are characters outside the BMP whose othercase differs in only one
-  bit from itself (there currently are none), this code will need to be
-  revised for PCRE2_CODE_UNIT_WIDTH == 32. */
-  othercasechar = cc + (othercasebit >> 9);
-  if ((othercasebit & 0x100) != 0)
-    othercasebit = (othercasebit & 0xff) << 8;
-  else
-    othercasebit &= 0xff;
-#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
-  }
-
-if (context->sourcereg == -1)
-  {
-#if PCRE2_CODE_UNIT_WIDTH == 8
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-  if (context->length >= 4)
-    OP1(SLJIT_MOV_S32, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-  else if (context->length >= 2)
-    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-  else
-#endif
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#elif PCRE2_CODE_UNIT_WIDTH == 16
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-  if (context->length >= 4)
-    OP1(SLJIT_MOV_S32, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-  else
-#endif
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#elif PCRE2_CODE_UNIT_WIDTH == 32
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#endif /* PCRE2_CODE_UNIT_WIDTH == [8|16|32] */
-  context->sourcereg = TMP2;
-  }
-
-#ifdef SUPPORT_UNICODE
-utflength = 1;
-if (common->utf && HAS_EXTRALEN(*cc))
-  utflength += GET_EXTRALEN(*cc);
-
-do
-  {
-#endif
-
-  context->length -= IN_UCHARS(1);
-#if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED) && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
-
-  /* Unaligned read is supported. */
-  if (othercasebit != 0 && othercasechar == cc)
-    {
-    context->c.asuchars[context->ucharptr] = *cc | othercasebit;
-    context->oc.asuchars[context->ucharptr] = othercasebit;
-    }
-  else
-    {
-    context->c.asuchars[context->ucharptr] = *cc;
-    context->oc.asuchars[context->ucharptr] = 0;
-    }
-  context->ucharptr++;
-
-#if PCRE2_CODE_UNIT_WIDTH == 8
-  if (context->ucharptr >= 4 || context->length == 0 || (context->ucharptr == 2 && context->length == 1))
-#else
-  if (context->ucharptr >= 2 || context->length == 0)
-#endif
-    {
-    if (context->length >= 4)
-      OP1(SLJIT_MOV_S32, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-    else if (context->length >= 2)
-      OP1(SLJIT_MOV_U16, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#if PCRE2_CODE_UNIT_WIDTH == 8
-    else if (context->length >= 1)
-      OP1(SLJIT_MOV_U8, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
-    context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
-
-    switch(context->ucharptr)
-      {
-      case 4 / sizeof(PCRE2_UCHAR):
-      if (context->oc.asint != 0)
-        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asint);
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asint | context->oc.asint));
-      break;
-
-      case 2 / sizeof(PCRE2_UCHAR):
-      if (context->oc.asushort != 0)
-        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asushort);
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asushort | context->oc.asushort));
-      break;
-
-#if PCRE2_CODE_UNIT_WIDTH == 8
-      case 1:
-      if (context->oc.asbyte != 0)
-        OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, context->oc.asbyte);
-      add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, context->c.asbyte | context->oc.asbyte));
-      break;
-#endif
-
-      default:
-      SLJIT_UNREACHABLE();
-      break;
-      }
-    context->ucharptr = 0;
-    }
-
-#else
-
-  /* Unaligned read is unsupported or in 32 bit mode. */
-  if (context->length >= 1)
-    OP1(MOV_UCHAR, context->sourcereg, 0, SLJIT_MEM1(STR_PTR), -context->length);
-
-  context->sourcereg = context->sourcereg == TMP1 ? TMP2 : TMP1;
-
-  if (othercasebit != 0 && othercasechar == cc)
-    {
-    OP2(SLJIT_OR, context->sourcereg, 0, context->sourcereg, 0, SLJIT_IMM, othercasebit);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, *cc | othercasebit));
-    }
-  else
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, context->sourcereg, 0, SLJIT_IMM, *cc));
-
-#endif
-
-  cc++;
-#ifdef SUPPORT_UNICODE
-  utflength--;
-  }
-while (utflength > 0);
-#endif
-
-return cc;
-}
-
-#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
-
-#define SET_CHAR_OFFSET(value) \
-  if ((value) != charoffset) \
-    { \
-    if ((value) < charoffset) \
-      OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)(charoffset - (value))); \
-    else \
-      OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)((value) - charoffset)); \
-    } \
-  charoffset = (value);
-
-static PCRE2_SPTR compile_char1_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks, BOOL check_str_ptr);
-
-#ifdef SUPPORT_UNICODE
-#define XCLASS_SAVE_CHAR 0x001
-#define XCLASS_CHAR_SAVED 0x002
-#define XCLASS_HAS_TYPE 0x004
-#define XCLASS_HAS_SCRIPT 0x008
-#define XCLASS_HAS_SCRIPT_EXTENSION 0x010
-#define XCLASS_HAS_BOOL 0x020
-#define XCLASS_HAS_BIDICL 0x040
-#define XCLASS_NEEDS_UCD (XCLASS_HAS_TYPE | XCLASS_HAS_SCRIPT | XCLASS_HAS_SCRIPT_EXTENSION | XCLASS_HAS_BOOL | XCLASS_HAS_BIDICL)
-#define XCLASS_SCRIPT_EXTENSION_NOTPROP 0x080
-#define XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR 0x100
-#define XCLASS_SCRIPT_EXTENSION_RESTORE_LOCALS0 0x200
-#endif /* SUPPORT_UNICODE */
-
-static void compile_xclass_matchingpath(compiler_common *common, PCRE2_SPTR cc, jump_list **backtracks)
-{
-DEFINE_COMPILER;
-jump_list *found = NULL;
-jump_list **list = (cc[0] & XCL_NOT) == 0 ? &found : backtracks;
-sljit_uw c, charoffset, max = 256, min = READ_CHAR_MAX;
-struct sljit_jump *jump = NULL;
-PCRE2_SPTR ccbegin;
-int compares, invertcmp, numberofcmps;
-#if defined SUPPORT_UNICODE && (PCRE2_CODE_UNIT_WIDTH == 8 || PCRE2_CODE_UNIT_WIDTH == 16)
-BOOL utf = common->utf;
-#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == [8|16] */
-
-#ifdef SUPPORT_UNICODE
-sljit_u32 unicode_status = 0;
-sljit_u32 category_list = 0;
-sljit_u32 items;
-int typereg = TMP1;
-const sljit_u32 *other_cases;
-#endif /* SUPPORT_UNICODE */
-
-/* Scanning the necessary info. */
-cc++;
-ccbegin = cc;
-compares = 0;
-
-if (cc[-1] & XCL_MAP)
-  {
-  min = 0;
-  cc += 32 / sizeof(PCRE2_UCHAR);
-  }
-
-while (*cc != XCL_END)
-  {
-  compares++;
-
-  if (*cc == XCL_SINGLE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-    if (c > max) max = c;
-    if (c < min) min = c;
-#ifdef SUPPORT_UNICODE
-    unicode_status |= XCLASS_SAVE_CHAR;
-#endif /* SUPPORT_UNICODE */
-    }
-  else if (*cc == XCL_RANGE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-    if (c < min) min = c;
-    GETCHARINCTEST(c, cc);
-    if (c > max) max = c;
-#ifdef SUPPORT_UNICODE
-    unicode_status |= XCLASS_SAVE_CHAR;
-#endif /* SUPPORT_UNICODE */
-    }
-#ifdef SUPPORT_UNICODE
-  else
-    {
-    SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
-    cc++;
-
-    if (*cc == PT_CLIST && cc[-1] == XCL_PROP)
-      {
-      other_cases = PRIV(ucd_caseless_sets) + cc[1];
-      while (*other_cases != NOTACHAR)
-        {
-        if (*other_cases > max) max = *other_cases;
-        if (*other_cases < min) min = *other_cases;
-        other_cases++;
-        }
-      }
-    else
-      {
-      max = READ_CHAR_MAX;
-      min = 0;
-      }
-
-    items = 0;
-
-    switch(*cc)
-      {
-      case PT_ANY:
-      /* Any either accepts everything or ignored. */
-      if (cc[-1] == XCL_PROP)
-        items = UCPCAT_ALL;
-      else
-        compares--;
-      break;
-
-      case PT_LAMP:
-      items = UCPCAT3(ucp_Lu, ucp_Ll, ucp_Lt);
-      break;
-
-      case PT_GC:
-      items = UCPCAT_RANGE(PRIV(ucp_typerange)[(int)cc[1] * 2], PRIV(ucp_typerange)[(int)cc[1] * 2 + 1]);
-      break;
-
-      case PT_PC:
-      items = UCPCAT(cc[1]);
-      break;
-
-      case PT_WORD:
-      items = UCPCAT2(ucp_Mn, ucp_Pc) | UCPCAT_L | UCPCAT_N;
-      break;
-
-      case PT_ALNUM:
-      items = UCPCAT_L | UCPCAT_N;
-      break;
-
-      case PT_SCX:
-      unicode_status |= XCLASS_HAS_SCRIPT_EXTENSION;
-      if (cc[-1] == XCL_NOTPROP)
-        {
-        unicode_status |= XCLASS_SCRIPT_EXTENSION_NOTPROP;
-        break;
-        }
-      compares++;
-      /* Fall through */
-
-      case PT_SC:
-      unicode_status |= XCLASS_HAS_SCRIPT;
-      break;
-
-      case PT_SPACE:
-      case PT_PXSPACE:
-      case PT_PXGRAPH:
-      case PT_PXPRINT:
-      case PT_PXPUNCT:
-      unicode_status |= XCLASS_SAVE_CHAR | XCLASS_HAS_TYPE;
-      break;
-
-      case PT_CLIST:
-      case PT_UCNC:
-      case PT_PXXDIGIT:
-      unicode_status |= XCLASS_SAVE_CHAR;
-      break;
-
-      case PT_BOOL:
-      unicode_status |= XCLASS_HAS_BOOL;
-      break;
-
-      case PT_BIDICL:
-      unicode_status |= XCLASS_HAS_BIDICL;
-      break;
-
-      default:
-      SLJIT_UNREACHABLE();
-      break;
-      }
-
-    if (items > 0)
-      {
-      if (cc[-1] == XCL_NOTPROP)
-        items ^= UCPCAT_ALL;
-      category_list |= items;
-      unicode_status |= XCLASS_HAS_TYPE;
-      compares--;
-      }
-
-    cc += 2;
-    }
-#endif /* SUPPORT_UNICODE */
-  }
-
-#ifdef SUPPORT_UNICODE
-if (category_list == UCPCAT_ALL)
-  {
-  /* All characters are accepted, same as dotall. */
-  compile_char1_matchingpath(common, OP_ALLANY, cc, backtracks, FALSE);
-  if (list == backtracks)
-    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-  return;
-  }
-
-if (compares == 0 && category_list == 0)
-  {
-  /* No characters are accepted, same as (*F) or dotall. */
-  compile_char1_matchingpath(common, OP_ALLANY, cc, backtracks, FALSE);
-  if (list != backtracks)
-    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-  return;
-  }
-#else /* !SUPPORT_UNICODE */
-SLJIT_ASSERT(compares > 0);
-#endif /* SUPPORT_UNICODE */
-
-/* We are not necessary in utf mode even in 8 bit mode. */
-cc = ccbegin;
-if ((cc[-1] & XCL_NOT) != 0)
-  read_char(common, min, max, backtracks, READ_CHAR_UPDATE_STR_PTR);
-else
-  {
-#ifdef SUPPORT_UNICODE
-  read_char(common, min, max, (unicode_status & XCLASS_NEEDS_UCD) ? backtracks : NULL, 0);
-#else /* !SUPPORT_UNICODE */
-  read_char(common, min, max, NULL, 0);
-#endif /* SUPPORT_UNICODE */
-  }
-
-if ((cc[-1] & XCL_HASPROP) == 0)
-  {
-  if ((cc[-1] & XCL_MAP) != 0)
-    {
-    jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-    if (!optimize_class(common, (const sljit_u8 *)cc, (((const sljit_u8 *)cc)[31] & 0x80) != 0, TRUE, &found))
-      {
-      OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-      OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
-      OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
-      OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-      OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
-      add_jump(compiler, &found, JUMP(SLJIT_NOT_ZERO));
-      }
-
-    add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
-    JUMPHERE(jump);
-
-    cc += 32 / sizeof(PCRE2_UCHAR);
-    }
-  else
-    {
-    OP2(SLJIT_SUB, TMP2, 0, TMP1, 0, SLJIT_IMM, min);
-    add_jump(compiler, (cc[-1] & XCL_NOT) == 0 ? backtracks : &found, CMP(SLJIT_GREATER, TMP2, 0, SLJIT_IMM, max - min));
-    }
-  }
-else if ((cc[-1] & XCL_MAP) != 0)
-  {
-  OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
-#ifdef SUPPORT_UNICODE
-  unicode_status |= XCLASS_CHAR_SAVED;
-#endif /* SUPPORT_UNICODE */
-  if (!optimize_class(common, (const sljit_u8 *)cc, FALSE, TRUE, list))
-    {
-#if PCRE2_CODE_UNIT_WIDTH == 8
-    jump = NULL;
-    if (common->utf)
-#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
-      jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-
-    OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
-    OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
-    OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-    OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
-    add_jump(compiler, list, JUMP(SLJIT_NOT_ZERO));
-
-#if PCRE2_CODE_UNIT_WIDTH == 8
-    if (common->utf)
-#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
-      JUMPHERE(jump);
-    }
-
-  OP1(SLJIT_MOV, TMP1, 0, RETURN_ADDR, 0);
-  cc += 32 / sizeof(PCRE2_UCHAR);
-  }
-
-#ifdef SUPPORT_UNICODE
-if (unicode_status & XCLASS_NEEDS_UCD)
-  {
-  if ((unicode_status & (XCLASS_SAVE_CHAR | XCLASS_CHAR_SAVED)) == XCLASS_SAVE_CHAR)
-    OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP1, 0);
-
-#if PCRE2_CODE_UNIT_WIDTH == 32
-  if (!common->utf)
-    {
-    jump = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, MAX_UTF_CODE_POINT + 1);
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, UNASSIGNED_UTF_CHAR);
-    JUMPHERE(jump);
-    }
-#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
-
-  OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
-  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
-  OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1));
-  OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK);
-  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT);
-  OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0);
-  OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_stage2));
-  OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM2(TMP2, TMP1), 1);
-  OP2(SLJIT_SHL, TMP1, 0, TMP2, 0, SLJIT_IMM, 3);
-  OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 2);
-  OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, TMP1, 0);
-
-  ccbegin = cc;
-
-  if (category_list != 0)
-    compares++;
-
-  if (unicode_status & XCLASS_HAS_BIDICL)
-    {
-    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, scriptx_bidiclass));
-    OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BIDICLASS_SHIFT);
-
-    while (*cc != XCL_END)
-      {
-      if (*cc == XCL_SINGLE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        }
-      else if (*cc == XCL_RANGE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        GETCHARINCTEST(c, cc);
-        }
-      else
-        {
-        SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
-        cc++;
-        if (*cc == PT_BIDICL)
-          {
-          compares--;
-          invertcmp = (compares == 0 && list != backtracks);
-          if (cc[-1] == XCL_NOTPROP)
-            invertcmp ^= 0x1;
-          jump = CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (int)cc[1]);
-          add_jump(compiler, compares > 0 ? list : backtracks, jump);
-          }
-        cc += 2;
-        }
-      }
-
-    cc = ccbegin;
-    }
-
-  if (unicode_status & XCLASS_HAS_BOOL)
-    {
-    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, bprops));
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BPROPS_MASK);
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 2);
-
-    while (*cc != XCL_END)
-      {
-      if (*cc == XCL_SINGLE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        }
-      else if (*cc == XCL_RANGE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        GETCHARINCTEST(c, cc);
-        }
-      else
-        {
-        SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
-        cc++;
-        if (*cc == PT_BOOL)
-          {
-          compares--;
-          invertcmp = (compares == 0 && list != backtracks);
-          if (cc[-1] == XCL_NOTPROP)
-            invertcmp ^= 0x1;
-
-          OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP1), (sljit_sw)(PRIV(ucd_boolprop_sets) + (cc[1] >> 5)), SLJIT_IMM, (sljit_sw)1 << (cc[1] & 0x1f));
-          add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
-          }
-        cc += 2;
-        }
-      }
-
-    cc = ccbegin;
-    }
-
-  if (unicode_status & XCLASS_HAS_SCRIPT)
-    {
-    OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
-
-    while (*cc != XCL_END)
-      {
-      if (*cc == XCL_SINGLE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        }
-      else if (*cc == XCL_RANGE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        GETCHARINCTEST(c, cc);
-        }
-      else
-        {
-        SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
-        cc++;
-        switch (*cc)
-          {
-          case PT_SCX:
-          if (cc[-1] == XCL_NOTPROP)
-            break;
-          /* Fall through */
-
-          case PT_SC:
-          compares--;
-          invertcmp = (compares == 0 && list != backtracks);
-          if (cc[-1] == XCL_NOTPROP)
-            invertcmp ^= 0x1;
-
-          add_jump(compiler, compares > 0 ? list : backtracks, CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (int)cc[1]));
-          }
-        cc += 2;
-        }
-      }
-
-    cc = ccbegin;
-    }
-
-  if (unicode_status & XCLASS_HAS_SCRIPT_EXTENSION)
-    {
-    OP1(SLJIT_MOV_U16, TMP1, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, scriptx_bidiclass));
-    OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_SCRIPTX_MASK);
-    OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, 2);
-
-    if (unicode_status & XCLASS_SCRIPT_EXTENSION_NOTPROP)
-      {
-      if (unicode_status & XCLASS_HAS_TYPE)
-        {
-        if (unicode_status & XCLASS_SAVE_CHAR)
-          {
-          OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, TMP2, 0);
-          unicode_status |= XCLASS_SCRIPT_EXTENSION_RESTORE_LOCALS0;
-          }
-        else
-          {
-          OP1(SLJIT_MOV, RETURN_ADDR, 0, TMP2, 0);
-          unicode_status |= XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR;
-          }
-        }
-      OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, script));
-      }
-
-    while (*cc != XCL_END)
-      {
-      if (*cc == XCL_SINGLE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        }
-      else if (*cc == XCL_RANGE)
-        {
-        cc ++;
-        GETCHARINCTEST(c, cc);
-        GETCHARINCTEST(c, cc);
-        }
-      else
-        {
-        SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
-        cc++;
-        if (*cc == PT_SCX)
-          {
-          compares--;
-          invertcmp = (compares == 0 && list != backtracks);
-
-          jump = NULL;
-          if (cc[-1] == XCL_NOTPROP)
-            {
-            jump = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, (int)cc[1]);
-            if (invertcmp)
-              {
-              add_jump(compiler, backtracks, jump);
-              jump = NULL;
-              }
-            invertcmp ^= 0x1;
-            }
-
-          OP2U(SLJIT_AND32 | SLJIT_SET_Z, SLJIT_MEM1(TMP1), (sljit_sw)(PRIV(ucd_script_sets) + (cc[1] >> 5)), SLJIT_IMM, (sljit_sw)1 << (cc[1] & 0x1f));
-          add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
-
-          if (jump != NULL)
-            JUMPHERE(jump);
-          }
-        cc += 2;
-        }
-      }
-
-    if (unicode_status & XCLASS_SCRIPT_EXTENSION_RESTORE_LOCALS0)
-      OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-    else if (unicode_status & XCLASS_SCRIPT_EXTENSION_RESTORE_RETURN_ADDR)
-      OP1(SLJIT_MOV, TMP2, 0, RETURN_ADDR, 0);
-    cc = ccbegin;
-    }
-
-  if (unicode_status & XCLASS_SAVE_CHAR)
-    OP1(SLJIT_MOV, TMP1, 0, RETURN_ADDR, 0);
-
-  if (unicode_status & XCLASS_HAS_TYPE)
-    {
-    if (unicode_status & XCLASS_SAVE_CHAR)
-      typereg = RETURN_ADDR;
-
-    OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_records) + SLJIT_OFFSETOF(ucd_record, chartype));
-    OP2(SLJIT_SHL, typereg, 0, SLJIT_IMM, 1, TMP2, 0);
-
-    if (category_list > 0)
-      {
-      compares--;
-      invertcmp = (compares == 0 && list != backtracks);
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, category_list);
-      add_jump(compiler, compares > 0 ? list : backtracks, JUMP(SLJIT_NOT_ZERO ^ invertcmp));
-      }
-    }
-  }
-#endif /* SUPPORT_UNICODE */
-
-/* Generating code. */
-charoffset = 0;
-numberofcmps = 0;
-
-while (*cc != XCL_END)
-  {
-  compares--;
-  invertcmp = (compares == 0 && list != backtracks);
-  jump = NULL;
-
-  if (*cc == XCL_SINGLE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-
-    if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
-      {
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-      numberofcmps++;
-      }
-    else if (numberofcmps > 0)
-      {
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      numberofcmps = 0;
-      }
-    else
-      {
-      jump = CMP(SLJIT_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      numberofcmps = 0;
-      }
-    }
-  else if (*cc == XCL_RANGE)
-    {
-    cc ++;
-    GETCHARINCTEST(c, cc);
-    SET_CHAR_OFFSET(c);
-    GETCHARINCTEST(c, cc);
-
-    if (numberofcmps < 3 && (*cc == XCL_SINGLE || *cc == XCL_RANGE))
-      {
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(numberofcmps == 0 ? SLJIT_MOV : SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
-      numberofcmps++;
-      }
-    else if (numberofcmps > 0)
-      {
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_LESS_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      numberofcmps = 0;
-      }
-    else
-      {
-      jump = CMP(SLJIT_LESS_EQUAL ^ invertcmp, TMP1, 0, SLJIT_IMM, (sljit_sw)(c - charoffset));
-      numberofcmps = 0;
-      }
-    }
-#ifdef SUPPORT_UNICODE
-  else
-    {
-    SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
-    if (*cc == XCL_NOTPROP)
-      invertcmp ^= 0x1;
-    cc++;
-    switch(*cc)
-      {
-      case PT_ANY:
-      case PT_LAMP:
-      case PT_GC:
-      case PT_PC:
-      case PT_SC:
-      case PT_SCX:
-      case PT_BOOL:
-      case PT_BIDICL:
-      case PT_WORD:
-      case PT_ALNUM:
-      compares++;
-      /* Already handled. */
-      break;
-
-      case PT_SPACE:
-      case PT_PXSPACE:
-      SET_CHAR_OFFSET(9);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xd - 0x9);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x85 - 0x9);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x180e - 0x9);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Zl, ucp_Zs));
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_NOT_ZERO);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_CLIST:
-      other_cases = PRIV(ucd_caseless_sets) + cc[1];
-
-      /* At least three characters are required.
-         Otherwise this case would be handled by the normal code path. */
-      SLJIT_ASSERT(other_cases[0] != NOTACHAR && other_cases[1] != NOTACHAR && other_cases[2] != NOTACHAR);
-      SLJIT_ASSERT(other_cases[0] < other_cases[1] && other_cases[1] < other_cases[2]);
-
-      /* Optimizing character pairs, if their difference is power of 2. */
-      if (is_powerof2(other_cases[1] ^ other_cases[0]))
-        {
-        if (charoffset == 0)
-          OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
-        else
-          {
-          OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
-          OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
-          }
-        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, other_cases[1]);
-        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-        other_cases += 2;
-        }
-      else if (is_powerof2(other_cases[2] ^ other_cases[1]))
-        {
-        if (charoffset == 0)
-          OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, other_cases[2] ^ other_cases[1]);
-        else
-          {
-          OP2(SLJIT_ADD, TMP2, 0, TMP1, 0, SLJIT_IMM, (sljit_sw)charoffset);
-          OP2(SLJIT_OR, TMP2, 0, TMP2, 0, SLJIT_IMM, other_cases[1] ^ other_cases[0]);
-          }
-        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, other_cases[2]);
-        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-
-        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(other_cases[0] - charoffset));
-        OP_FLAGS(SLJIT_OR | ((other_cases[3] == NOTACHAR) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_EQUAL);
-
-        other_cases += 3;
-        }
-      else
-        {
-        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
-        OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-        }
-
-      while (*other_cases != NOTACHAR)
-        {
-        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(*other_cases++ - charoffset));
-        OP_FLAGS(SLJIT_OR | ((*other_cases == NOTACHAR) ? SLJIT_SET_Z : 0), TMP2, 0, SLJIT_EQUAL);
-        }
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_UCNC:
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_DOLLAR_SIGN - charoffset));
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_EQUAL);
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_COMMERCIAL_AT - charoffset));
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, (sljit_sw)(CHAR_GRAVE_ACCENT - charoffset));
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-
-      SET_CHAR_OFFSET(0xa0);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, (sljit_sw)(0xd7ff - charoffset));
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
-      SET_CHAR_OFFSET(0);
-      OP2U(SLJIT_SUB | SLJIT_SET_GREATER_EQUAL, TMP1, 0, SLJIT_IMM, 0xe000 - 0);
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_GREATER_EQUAL);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_PXGRAPH:
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Cc, ucp_Cs) | UCPCAT_RANGE(ucp_Zl, ucp_Zs));
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_NOT_ZERO);
-
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT(ucp_Cf));
-      jump = JUMP(SLJIT_ZERO);
-
-      c = charoffset;
-      /* In case of ucp_Cf, we overwrite the result. */
-      SET_CHAR_OFFSET(0x2066);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x180e - 0x2066);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-
-      /* Restore charoffset. */
-      SET_CHAR_OFFSET(c);
-
-      JUMPHERE(jump);
-      jump = CMP(SLJIT_ZERO ^ invertcmp, TMP2, 0, SLJIT_IMM, 0);
-      break;
-
-      case PT_PXPRINT:
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Cc, ucp_Cs) | UCPCAT2(ucp_Zl, ucp_Zp));
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_NOT_ZERO);
-
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT(ucp_Cf));
-      jump = JUMP(SLJIT_ZERO);
-
-      c = charoffset;
-      /* In case of ucp_Cf, we overwrite the result. */
-      SET_CHAR_OFFSET(0x2066);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x2069 - 0x2066);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, 0x061c - 0x2066);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_EQUAL);
-
-      /* Restore charoffset. */
-      SET_CHAR_OFFSET(c);
-
-      JUMPHERE(jump);
-      jump = CMP(SLJIT_ZERO ^ invertcmp, TMP2, 0, SLJIT_IMM, 0);
-      break;
-
-      case PT_PXPUNCT:
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Sc, ucp_So));
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_NOT_ZERO);
-
-      SET_CHAR_OFFSET(0);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0x7f);
-      OP_FLAGS(SLJIT_AND, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      OP2U(SLJIT_AND | SLJIT_SET_Z, typereg, 0, SLJIT_IMM, UCPCAT_RANGE(ucp_Pc, ucp_Ps));
-      OP_FLAGS(SLJIT_OR | SLJIT_SET_Z, TMP2, 0, SLJIT_NOT_ZERO);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      case PT_PXXDIGIT:
-      SET_CHAR_OFFSET(CHAR_A);
-      OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, ~0x20);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP2, 0, SLJIT_IMM, CHAR_F - CHAR_A);
-      OP_FLAGS(SLJIT_MOV, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      SET_CHAR_OFFSET(CHAR_0);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_9 - CHAR_0);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      SET_CHAR_OFFSET(0xff10);
-      jump = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 0xff46 - 0xff10);
-
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xff19 - 0xff10);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      SET_CHAR_OFFSET(0xff21);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xff26 - 0xff21);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      SET_CHAR_OFFSET(0xff41);
-      OP2U(SLJIT_SUB | SLJIT_SET_LESS_EQUAL, TMP1, 0, SLJIT_IMM, 0xff46 - 0xff41);
-      OP_FLAGS(SLJIT_OR, TMP2, 0, SLJIT_LESS_EQUAL);
-
-      SET_CHAR_OFFSET(0xff10);
-
-      JUMPHERE(jump);
-      OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP2, 0, SLJIT_IMM, 0);
-      jump = JUMP(SLJIT_NOT_ZERO ^ invertcmp);
-      break;
-
-      default:
-      SLJIT_UNREACHABLE();
-      break;
-      }
-    cc += 2;
-    }
-#endif /* SUPPORT_UNICODE */
-
-  if (jump != NULL)
-    add_jump(compiler, compares > 0 ? list : backtracks, jump);
-  }
-
-SLJIT_ASSERT(compares == 0);
-if (found != NULL)
-  set_jumps(found, LABEL());
-}
-
-#undef SET_TYPE_OFFSET
-#undef SET_CHAR_OFFSET
-
-#endif
+#include "pcre2_jit_char_inc.h"
 
 static PCRE2_SPTR compile_simple_assertion_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks)
 {
@@ -8681,665 +7949,6 @@ SLJIT_UNREACHABLE();
 return cc;
 }
 
-#ifdef SUPPORT_UNICODE
-
-#if PCRE2_CODE_UNIT_WIDTH != 32
-
-static PCRE2_SPTR SLJIT_FUNC do_extuni_utf(jit_arguments *args, PCRE2_SPTR cc)
-{
-PCRE2_SPTR start_subject = args->begin;
-PCRE2_SPTR end_subject = args->end;
-int lgb, rgb, ricount;
-PCRE2_SPTR prevcc, endcc, bptr;
-BOOL first = TRUE;
-uint32_t c;
-
-prevcc = cc;
-endcc = NULL;
-do
-  {
-  GETCHARINC(c, cc);
-  rgb = UCD_GRAPHBREAK(c);
-
-  if (first)
-    {
-    lgb = rgb;
-    endcc = cc;
-    first = FALSE;
-    continue;
-    }
-
-  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
-    break;
-
-  /* Not breaking between Regional Indicators is allowed only if there
-  are an even number of preceding RIs. */
-
-  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
-    {
-    ricount = 0;
-    bptr = prevcc;
-
-    /* bptr is pointing to the left-hand character */
-    while (bptr > start_subject)
-      {
-      bptr--;
-      BACKCHAR(bptr);
-      GETCHAR(c, bptr);
-
-      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator)
-        break;
-
-      ricount++;
-      }
-
-    if ((ricount & 1) != 0) break;  /* Grapheme break required */
-    }
-
-  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
-  allows any number of them before a following Extended_Pictographic. */
-
-  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
-       lgb != ucp_gbExtended_Pictographic)
-    lgb = rgb;
-
-  prevcc = endcc;
-  endcc = cc;
-  }
-while (cc < end_subject);
-
-return endcc;
-}
-
-#endif /* PCRE2_CODE_UNIT_WIDTH != 32 */
-
-static PCRE2_SPTR SLJIT_FUNC do_extuni_utf_invalid(jit_arguments *args, PCRE2_SPTR cc)
-{
-PCRE2_SPTR start_subject = args->begin;
-PCRE2_SPTR end_subject = args->end;
-int lgb, rgb, ricount;
-PCRE2_SPTR prevcc, endcc, bptr;
-BOOL first = TRUE;
-uint32_t c;
-
-prevcc = cc;
-endcc = NULL;
-do
-  {
-  GETCHARINC_INVALID(c, cc, end_subject, break);
-  rgb = UCD_GRAPHBREAK(c);
-
-  if (first)
-    {
-    lgb = rgb;
-    endcc = cc;
-    first = FALSE;
-    continue;
-    }
-
-  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
-    break;
-
-  /* Not breaking between Regional Indicators is allowed only if there
-  are an even number of preceding RIs. */
-
-  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
-    {
-    ricount = 0;
-    bptr = prevcc;
-
-    /* bptr is pointing to the left-hand character */
-    while (bptr > start_subject)
-      {
-      GETCHARBACK_INVALID(c, bptr, start_subject, break);
-
-      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator)
-        break;
-
-      ricount++;
-      }
-
-    if ((ricount & 1) != 0)
-      break;  /* Grapheme break required */
-    }
-
-  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
-  allows any number of them before a following Extended_Pictographic. */
-
-  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
-       lgb != ucp_gbExtended_Pictographic)
-    lgb = rgb;
-
-  prevcc = endcc;
-  endcc = cc;
-  }
-while (cc < end_subject);
-
-return endcc;
-}
-
-static PCRE2_SPTR SLJIT_FUNC do_extuni_no_utf(jit_arguments *args, PCRE2_SPTR cc)
-{
-PCRE2_SPTR start_subject = args->begin;
-PCRE2_SPTR end_subject = args->end;
-int lgb, rgb, ricount;
-PCRE2_SPTR bptr;
-uint32_t c;
-
-/* Patch by PH */
-/* GETCHARINC(c, cc); */
-c = *cc++;
-
-#if PCRE2_CODE_UNIT_WIDTH == 32
-if (c >= 0x110000)
-  return cc;
-#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
-lgb = UCD_GRAPHBREAK(c);
-
-while (cc < end_subject)
-  {
-  c = *cc;
-#if PCRE2_CODE_UNIT_WIDTH == 32
-  if (c >= 0x110000)
-    break;
-#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
-  rgb = UCD_GRAPHBREAK(c);
-
-  if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0)
-    break;
-
-  /* Not breaking between Regional Indicators is allowed only if there
-  are an even number of preceding RIs. */
-
-  if (lgb == ucp_gbRegional_Indicator && rgb == ucp_gbRegional_Indicator)
-    {
-    ricount = 0;
-    bptr = cc - 1;
-
-    /* bptr is pointing to the left-hand character */
-    while (bptr > start_subject)
-      {
-      bptr--;
-      c = *bptr;
-#if PCRE2_CODE_UNIT_WIDTH == 32
-      if (c >= 0x110000)
-        break;
-#endif /* PCRE2_CODE_UNIT_WIDTH == 32 */
-
-      if (UCD_GRAPHBREAK(c) != ucp_gbRegional_Indicator) break;
-
-      ricount++;
-      }
-
-    if ((ricount & 1) != 0)
-      break;  /* Grapheme break required */
-    }
-
-  /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this
-  allows any number of them before a following Extended_Pictographic. */
-
-  if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) ||
-       lgb != ucp_gbExtended_Pictographic)
-    lgb = rgb;
-
-  cc++;
-  }
-
-return cc;
-}
-
-#endif /* SUPPORT_UNICODE */
-
-static PCRE2_SPTR compile_char1_matchingpath(compiler_common *common, PCRE2_UCHAR type, PCRE2_SPTR cc, jump_list **backtracks, BOOL check_str_ptr)
-{
-DEFINE_COMPILER;
-int length;
-unsigned int c, oc, bit;
-compare_context context;
-struct sljit_jump *jump[3];
-jump_list *end_list;
-#ifdef SUPPORT_UNICODE
-PCRE2_UCHAR propdata[5];
-#endif /* SUPPORT_UNICODE */
-
-switch(type)
-  {
-  case OP_NOT_DIGIT:
-  case OP_DIGIT:
-  /* Digits are usually 0-9, so it is worth to optimize them. */
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
-  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_digit, FALSE))
-    read_char7_type(common, backtracks, type == OP_NOT_DIGIT);
-  else
-#endif
-    read_char8_type(common, backtracks, type == OP_NOT_DIGIT);
-    /* Flip the starting bit in the negative case. */
-  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_digit);
-  add_jump(compiler, backtracks, JUMP(type == OP_DIGIT ? SLJIT_ZERO : SLJIT_NOT_ZERO));
-  return cc;
-
-  case OP_NOT_WHITESPACE:
-  case OP_WHITESPACE:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
-  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_space, FALSE))
-    read_char7_type(common, backtracks, type == OP_NOT_WHITESPACE);
-  else
-#endif
-    read_char8_type(common, backtracks, type == OP_NOT_WHITESPACE);
-  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_space);
-  add_jump(compiler, backtracks, JUMP(type == OP_WHITESPACE ? SLJIT_ZERO : SLJIT_NOT_ZERO));
-  return cc;
-
-  case OP_NOT_WORDCHAR:
-  case OP_WORDCHAR:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
-  if (common->utf && is_char7_bitset((const sljit_u8*)common->ctypes - cbit_length + cbit_word, FALSE))
-    read_char7_type(common, backtracks, type == OP_NOT_WORDCHAR);
-  else
-#endif
-    read_char8_type(common, backtracks, type == OP_NOT_WORDCHAR);
-  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, ctype_word);
-  add_jump(compiler, backtracks, JUMP(type == OP_WORDCHAR ? SLJIT_ZERO : SLJIT_NOT_ZERO));
-  return cc;
-
-  case OP_ANY:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-  read_char(common, common->nlmin, common->nlmax, backtracks, READ_CHAR_UPDATE_STR_PTR);
-  if (common->nltype == NLTYPE_FIXED && common->newline > 255)
-    {
-    jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, (common->newline >> 8) & 0xff);
-    end_list = NULL;
-    if (common->mode != PCRE2_JIT_PARTIAL_HARD)
-      add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-    else
-      check_str_end(common, &end_list);
-
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, common->newline & 0xff));
-    set_jumps(end_list, LABEL());
-    JUMPHERE(jump[0]);
-    }
-  else
-    check_newlinechar(common, common->nltype, backtracks, TRUE);
-  return cc;
-
-  case OP_ALLANY:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-#ifdef SUPPORT_UNICODE
-  if (common->utf && common->invalid_utf)
-    {
-    read_char(common, 0, READ_CHAR_MAX, backtracks, READ_CHAR_UPDATE_STR_PTR);
-    return cc;
-    }
-#endif /* SUPPORT_UNICODE */
-
-  skip_valid_char(common);
-  return cc;
-
-  case OP_ANYBYTE:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  return cc;
-
-#ifdef SUPPORT_UNICODE
-  case OP_NOTPROP:
-  case OP_PROP:
-  propdata[0] = XCL_HASPROP;
-  propdata[1] = type == OP_NOTPROP ? XCL_NOTPROP : XCL_PROP;
-  propdata[2] = cc[0];
-  propdata[3] = cc[1];
-  propdata[4] = XCL_END;
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-  compile_xclass_matchingpath(common, propdata, backtracks);
-  return cc + 2;
-#endif
-
-  case OP_ANYNL:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-  read_char(common, common->bsr_nlmin, common->bsr_nlmax, NULL, 0);
-  jump[0] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_CR);
-  /* We don't need to handle soft partial matching case. */
-  end_list = NULL;
-  if (common->mode != PCRE2_JIT_PARTIAL_HARD)
-    add_jump(compiler, &end_list, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-  else
-    check_str_end(common, &end_list);
-  OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-  jump[1] = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, CHAR_NL);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-  jump[2] = JUMP(SLJIT_JUMP);
-  JUMPHERE(jump[0]);
-  check_newlinechar(common, common->bsr_nltype, backtracks, FALSE);
-  set_jumps(end_list, LABEL());
-  JUMPHERE(jump[1]);
-  JUMPHERE(jump[2]);
-  return cc;
-
-  case OP_NOT_HSPACE:
-  case OP_HSPACE:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-
-  if (type == OP_NOT_HSPACE)
-    read_char(common, 0x9, 0x3000, backtracks, READ_CHAR_UPDATE_STR_PTR);
-  else
-    read_char(common, 0x9, 0x3000, NULL, 0);
-
-  add_jump(compiler, &common->hspace, JUMP(SLJIT_FAST_CALL));
-  sljit_set_current_flags(compiler, SLJIT_SET_Z);
-  add_jump(compiler, backtracks, JUMP(type == OP_NOT_HSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
-  return cc;
-
-  case OP_NOT_VSPACE:
-  case OP_VSPACE:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-
-  if (type == OP_NOT_VSPACE)
-    read_char(common, 0xa, 0x2029, backtracks, READ_CHAR_UPDATE_STR_PTR);
-  else
-    read_char(common, 0xa, 0x2029, NULL, 0);
-
-  add_jump(compiler, &common->vspace, JUMP(SLJIT_FAST_CALL));
-  sljit_set_current_flags(compiler, SLJIT_SET_Z);
-  add_jump(compiler, backtracks, JUMP(type == OP_NOT_VSPACE ? SLJIT_NOT_ZERO : SLJIT_ZERO));
-  return cc;
-
-#ifdef SUPPORT_UNICODE
-  case OP_EXTUNI:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-
-  SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
-  OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
-
-#if PCRE2_CODE_UNIT_WIDTH != 32
-  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM,
-    common->utf ? (common->invalid_utf ? SLJIT_FUNC_ADDR(do_extuni_utf_invalid) : SLJIT_FUNC_ADDR(do_extuni_utf)) : SLJIT_FUNC_ADDR(do_extuni_no_utf));
-  if (common->invalid_utf)
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
-#else
-  sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM,
-    common->invalid_utf ? SLJIT_FUNC_ADDR(do_extuni_utf_invalid) : SLJIT_FUNC_ADDR(do_extuni_no_utf));
-  if (common->invalid_utf)
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0));
-#endif
-
-  OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_RETURN_REG, 0);
-
-  if (common->mode == PCRE2_JIT_PARTIAL_HARD)
-    {
-    jump[0] = CMP(SLJIT_LESS, SLJIT_RETURN_REG, 0, STR_END, 0);
-    /* Since we successfully read a char above, partial matching must occure. */
-    check_partial(common, TRUE);
-    JUMPHERE(jump[0]);
-    }
-  return cc;
-#endif
-
-  case OP_CHAR:
-  case OP_CHARI:
-  length = 1;
-#ifdef SUPPORT_UNICODE
-  if (common->utf && HAS_EXTRALEN(*cc)) length += GET_EXTRALEN(*cc);
-#endif
-
-  if (check_str_ptr && common->mode != PCRE2_JIT_COMPLETE)
-    detect_partial_match(common, backtracks);
-
-  if (type == OP_CHAR || !char_has_othercase(common, cc) || char_get_othercase_bit(common, cc) != 0)
-    {
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(length));
-    if (length > 1 || (check_str_ptr && common->mode == PCRE2_JIT_COMPLETE))
-      add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
-
-    context.length = IN_UCHARS(length);
-    context.sourcereg = -1;
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-    context.ucharptr = 0;
-#endif
-    return byte_sequence_compare(common, type == OP_CHARI, cc, &context, backtracks);
-    }
-
-#ifdef SUPPORT_UNICODE
-  if (common->utf)
-    {
-    GETCHAR(c, cc);
-    }
-  else
-#endif
-    c = *cc;
-
-  SLJIT_ASSERT(type == OP_CHARI && char_has_othercase(common, cc));
-
-  if (check_str_ptr && common->mode == PCRE2_JIT_COMPLETE)
-    add_jump(compiler, backtracks, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
-
-  oc = char_othercase(common, c);
-  read_char(common, c < oc ? c : oc, c > oc ? c : oc, NULL, 0);
-
-  SLJIT_ASSERT(!is_powerof2(c ^ oc));
-
-  if (sljit_has_cpu_feature(SLJIT_HAS_CMOV))
-    {
-    OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, oc);
-    SELECT(SLJIT_EQUAL, TMP1, SLJIT_IMM, c, TMP1);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-    }
-  else
-    {
-    jump[0] = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c);
-    add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
-    JUMPHERE(jump[0]);
-    }
-  return cc + length;
-
-  case OP_NOT:
-  case OP_NOTI:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-
-  length = 1;
-#ifdef SUPPORT_UNICODE
-  if (common->utf)
-    {
-#if PCRE2_CODE_UNIT_WIDTH == 8
-    c = *cc;
-    if (c < 128 && !common->invalid_utf)
-      {
-      OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(STR_PTR), 0);
-      if (type == OP_NOT || !char_has_othercase(common, cc))
-        add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-      else
-        {
-        /* Since UTF8 code page is fixed, we know that c is in [a-z] or [A-Z] range. */
-        OP2(SLJIT_OR, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x20);
-        add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, c | 0x20));
-        }
-      /* Skip the variable-length character. */
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-      jump[0] = CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, 0xc0);
-      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)PRIV(utf8_table4) - 0xc0);
-      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
-      JUMPHERE(jump[0]);
-      return cc + 1;
-      }
-    else
-#endif /* PCRE2_CODE_UNIT_WIDTH == 8 */
-      {
-      GETCHARLEN(c, cc, length);
-      }
-    }
-  else
-#endif /* SUPPORT_UNICODE */
-    c = *cc;
-
-  if (type == OP_NOT || !char_has_othercase(common, cc))
-    {
-    read_char(common, c, c, backtracks, READ_CHAR_UPDATE_STR_PTR);
-    add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-    }
-  else
-    {
-    oc = char_othercase(common, c);
-    read_char(common, c < oc ? c : oc, c > oc ? c : oc, backtracks, READ_CHAR_UPDATE_STR_PTR);
-    bit = c ^ oc;
-    if (is_powerof2(bit))
-      {
-      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, bit);
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c | bit));
-      }
-    else
-      {
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, c));
-      add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, oc));
-      }
-    }
-  return cc + length;
-
-  case OP_CLASS:
-  case OP_NCLASS:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-
-#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
-  bit = (common->utf && is_char7_bitset((const sljit_u8 *)cc, type == OP_NCLASS)) ? 127 : 255;
-  if (type == OP_NCLASS)
-    read_char(common, 0, bit, backtracks, READ_CHAR_UPDATE_STR_PTR);
-  else
-    read_char(common, 0, bit, NULL, 0);
-#else
-  if (type == OP_NCLASS)
-    read_char(common, 0, 255, backtracks, READ_CHAR_UPDATE_STR_PTR);
-  else
-    read_char(common, 0, 255, NULL, 0);
-#endif
-
-  if (optimize_class(common, (const sljit_u8 *)cc, type == OP_NCLASS, FALSE, backtracks))
-    return cc + 32 / sizeof(PCRE2_UCHAR);
-
-#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
-  jump[0] = NULL;
-  if (common->utf)
-    {
-    jump[0] = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, bit);
-    if (type == OP_CLASS)
-      {
-      add_jump(compiler, backtracks, jump[0]);
-      jump[0] = NULL;
-      }
-    }
-#elif PCRE2_CODE_UNIT_WIDTH != 8
-  jump[0] = CMP(SLJIT_GREATER, TMP1, 0, SLJIT_IMM, 255);
-  if (type == OP_CLASS)
-    {
-    add_jump(compiler, backtracks, jump[0]);
-    jump[0] = NULL;
-    }
-#endif /* SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8 */
-
-  OP2(SLJIT_AND, TMP2, 0, TMP1, 0, SLJIT_IMM, 0x7);
-  OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, SLJIT_IMM, 3);
-  OP1(SLJIT_MOV_U8, TMP1, 0, SLJIT_MEM1(TMP1), (sljit_sw)cc);
-  OP2(SLJIT_SHL, TMP2, 0, SLJIT_IMM, 1, TMP2, 0);
-  OP2U(SLJIT_AND | SLJIT_SET_Z, TMP1, 0, TMP2, 0);
-  add_jump(compiler, backtracks, JUMP(SLJIT_ZERO));
-
-#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
-  if (jump[0] != NULL)
-    JUMPHERE(jump[0]);
-#endif
-  return cc + 32 / sizeof(PCRE2_UCHAR);
-
-#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
-  case OP_XCLASS:
-  if (check_str_ptr)
-    detect_partial_match(common, backtracks);
-  compile_xclass_matchingpath(common, cc + LINK_SIZE, backtracks);
-  return cc + GET(cc, 0) - 1;
-#endif
-  }
-SLJIT_UNREACHABLE();
-return cc;
-}
-
-static SLJIT_INLINE PCRE2_SPTR compile_charn_matchingpath(compiler_common *common, PCRE2_SPTR cc, PCRE2_SPTR ccend, jump_list **backtracks)
-{
-/* This function consumes at least one input character. */
-/* To decrease the number of length checks, we try to concatenate the fixed length character sequences. */
-DEFINE_COMPILER;
-PCRE2_SPTR ccbegin = cc;
-compare_context context;
-int size;
-
-context.length = 0;
-do
-  {
-  if (cc >= ccend)
-    break;
-
-  if (*cc == OP_CHAR)
-    {
-    size = 1;
-#ifdef SUPPORT_UNICODE
-    if (common->utf && HAS_EXTRALEN(cc[1]))
-      size += GET_EXTRALEN(cc[1]);
-#endif
-    }
-  else if (*cc == OP_CHARI)
-    {
-    size = 1;
-#ifdef SUPPORT_UNICODE
-    if (common->utf)
-      {
-      if (char_has_othercase(common, cc + 1) && char_get_othercase_bit(common, cc + 1) == 0)
-        size = 0;
-      else if (HAS_EXTRALEN(cc[1]))
-        size += GET_EXTRALEN(cc[1]);
-      }
-    else
-#endif
-    if (char_has_othercase(common, cc + 1) && char_get_othercase_bit(common, cc + 1) == 0)
-      size = 0;
-    }
-  else
-    size = 0;
-
-  cc += 1 + size;
-  context.length += IN_UCHARS(size);
-  }
-while (size > 0 && context.length <= 128);
-
-cc = ccbegin;
-if (context.length > 0)
-  {
-  /* We have a fixed-length byte sequence. */
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, context.length);
-  add_jump(compiler, backtracks, CMP(SLJIT_GREATER, STR_PTR, 0, STR_END, 0));
-
-  context.sourcereg = -1;
-#if defined SLJIT_UNALIGNED && SLJIT_UNALIGNED
-  context.ucharptr = 0;
-#endif
-  do cc = byte_sequence_compare(common, *cc == OP_CHARI, cc + 1, &context, backtracks); while (context.length > 0);
-  return cc;
-  }
-
-/* A non-fixed length character will be checked if length == 0. */
-return compile_char1_matchingpath(common, *cc, cc + 1, backtracks, TRUE);
-}
-
 /* Forward definitions. */
 static void compile_matchingpath(compiler_common *, PCRE2_SPTR, PCRE2_SPTR, backtrack_common *);
 static void compile_backtrackingpath(compiler_common *, struct backtrack_common *);
@@ -9413,10 +8022,16 @@ struct sljit_jump *nopartial;
 #if defined SUPPORT_UNICODE
 struct sljit_label *loop;
 struct sljit_label *caseless_loop;
+struct sljit_jump *turkish_ascii_i = NULL;
+struct sljit_jump *turkish_non_ascii_i = NULL;
 jump_list *no_match = NULL;
 int source_reg = COUNT_MATCH;
 int source_end_reg = ARGUMENTS;
 int char1_reg = STACK_LIMIT;
+PCRE2_UCHAR refi_flag = 0;
+
+if (*cc == OP_REFI || *cc == OP_DNREFI)
+  refi_flag = cc[PRIV(OP_lengths)[*cc] - 1];
 #endif /* SUPPORT_UNICODE */
 
 if (ref)
@@ -9431,9 +8046,10 @@ else
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
 
 #if defined SUPPORT_UNICODE
-if (common->utf && *cc == OP_REFI)
+if ((common->utf || common->ucp) && (*cc == OP_REFI || *cc == OP_DNREFI))
   {
-  SLJIT_ASSERT(common->iref_ptr != 0);
+  /* Update ref_update_local_size() when this changes. */
+  SLJIT_ASSERT(common->locals_size >= 3 * SSIZE_OF(sw));
 
   if (ref)
     OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1));
@@ -9443,9 +8059,9 @@ if (common->utf && *cc == OP_REFI)
   if (withchecks && emptyfail)
     add_jump(compiler, backtracks, CMP(SLJIT_EQUAL, TMP1, 0, TMP2, 0));
 
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->iref_ptr, source_reg, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw), source_end_reg, 0);
-  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2, char1_reg, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL0, source_reg, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL1, source_end_reg, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL2, char1_reg, 0);
 
   OP1(SLJIT_MOV, source_reg, 0, TMP1, 0);
   OP1(SLJIT_MOV, source_end_reg, 0, TMP2, 0);
@@ -9469,6 +8085,16 @@ if (common->utf && *cc == OP_REFI)
 
   CMPTO(SLJIT_EQUAL, TMP1, 0, char1_reg, 0, loop);
 
+  if ((refi_flag & (REFI_FLAG_TURKISH_CASING|REFI_FLAG_CASELESS_RESTRICT)) ==
+        REFI_FLAG_TURKISH_CASING)
+    {
+    OP2(SLJIT_OR, SLJIT_TMP_DEST_REG, 0, char1_reg, 0, SLJIT_IMM, 0x20);
+    turkish_ascii_i = CMP(SLJIT_EQUAL, SLJIT_TMP_DEST_REG, 0, SLJIT_IMM, 0x69);
+
+    OP2(SLJIT_OR, SLJIT_TMP_DEST_REG, 0, char1_reg, 0, SLJIT_IMM, 0x1);
+    turkish_non_ascii_i = CMP(SLJIT_EQUAL, SLJIT_TMP_DEST_REG, 0, SLJIT_IMM, 0x131);
+    }
+
   OP1(SLJIT_MOV, TMP3, 0, TMP1, 0);
 
   add_jump(compiler, &common->getucd, JUMP(SLJIT_FAST_CALL));
@@ -9488,6 +8114,9 @@ if (common->utf && *cc == OP_REFI)
   OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 2);
   OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, (sljit_sw)PRIV(ucd_caseless_sets));
 
+  if (refi_flag & REFI_FLAG_CASELESS_RESTRICT)
+    add_jump(compiler, &no_match, CMP(SLJIT_LESS | SLJIT_32, SLJIT_MEM1(TMP2), 0, SLJIT_IMM, 128));
+
   caseless_loop = LABEL();
   OP1(SLJIT_MOV_U32, TMP1, 0, SLJIT_MEM1(TMP2), 0);
   OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, SLJIT_IMM, sizeof(uint32_t));
@@ -9495,30 +8124,52 @@ if (common->utf && *cc == OP_REFI)
   JUMPTO(SLJIT_EQUAL, loop);
   JUMPTO(SLJIT_LESS, caseless_loop);
 
+  if ((refi_flag & (REFI_FLAG_TURKISH_CASING|REFI_FLAG_CASELESS_RESTRICT)) ==
+        REFI_FLAG_TURKISH_CASING)
+    {
+    add_jump(compiler, &no_match, JUMP(SLJIT_JUMP));
+    JUMPHERE(turkish_ascii_i);
+
+    OP2(SLJIT_LSHR, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 5);
+    OP2(SLJIT_AND, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_XOR, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_ADD, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 0x130);
+    CMPTO(SLJIT_EQUAL, TMP1, 0, char1_reg, 0, loop);
+
+    add_jump(compiler, &no_match, JUMP(SLJIT_JUMP));
+    JUMPHERE(turkish_non_ascii_i);
+
+    OP2(SLJIT_AND, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_XOR, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 1);
+    OP2(SLJIT_SHL, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 5);
+    OP2(SLJIT_ADD, char1_reg, 0, char1_reg, 0, SLJIT_IMM, 0x49);
+    CMPTO(SLJIT_EQUAL, TMP1, 0, char1_reg, 0, loop);
+    }
+
   set_jumps(no_match, LABEL());
   if (common->mode == PCRE2_JIT_COMPLETE)
     JUMPHERE(partial);
 
-  OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr);
-  OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw));
-  OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2);
+  OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
+  OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL1);
+  OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL2);
   add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
 
   if (common->mode != PCRE2_JIT_COMPLETE)
     {
     JUMPHERE(partial);
-    OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr);
-    OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw));
-    OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2);
+    OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
+    OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL1);
+    OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL2);
 
     check_partial(common, FALSE);
     add_jump(compiler, backtracks, JUMP(SLJIT_JUMP));
     }
 
   JUMPHERE(jump);
-  OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr);
-  OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw));
-  OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), common->iref_ptr + sizeof(sljit_sw) * 2);
+  OP1(SLJIT_MOV, source_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
+  OP1(SLJIT_MOV, source_end_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL1);
+  OP1(SLJIT_MOV, char1_reg, 0, SLJIT_MEM1(SLJIT_SP), LOCAL2);
   return;
   }
 else
@@ -9537,7 +8188,7 @@ else
   if (common->mode == PCRE2_JIT_COMPLETE)
     add_jump(compiler, backtracks, partial);
 
-  add_jump(compiler, *cc == OP_REF ? &common->casefulcmp : &common->caselesscmp, JUMP(SLJIT_FAST_CALL));
+  add_jump(compiler, (*cc == OP_REF || *cc == OP_DNREF) ? &common->casefulcmp : &common->caselesscmp, JUMP(SLJIT_FAST_CALL));
   add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
 
   if (common->mode != PCRE2_JIT_COMPLETE)
@@ -9549,7 +8200,7 @@ else
     OP2(SLJIT_ADD, TMP2, 0, TMP2, 0, STR_END, 0);
     partial = CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_IMM, 0);
     OP1(SLJIT_MOV, STR_PTR, 0, STR_END, 0);
-    add_jump(compiler, *cc == OP_REF ? &common->casefulcmp : &common->caselesscmp, JUMP(SLJIT_FAST_CALL));
+    add_jump(compiler, (*cc == OP_REF || *cc == OP_DNREF) ? &common->casefulcmp : &common->caselesscmp, JUMP(SLJIT_FAST_CALL));
     add_jump(compiler, backtracks, CMP(SLJIT_NOT_EQUAL, TMP2, 0, SLJIT_IMM, 0));
     JUMPHERE(partial);
     check_partial(common, FALSE);
@@ -9573,6 +8224,7 @@ DEFINE_COMPILER;
 BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
 backtrack_common *backtrack;
 PCRE2_UCHAR type;
+int local_start = LOCAL2;
 int offset = 0;
 struct sljit_label *label;
 struct sljit_jump *zerolength;
@@ -9587,9 +8239,21 @@ if (ref)
   offset = GET2(cc, 1) << 1;
 else
   cc += IMM2_SIZE;
+
+if (*ccbegin == OP_REFI || *ccbegin == OP_DNREFI)
+  {
+  cc += 1;
+#ifdef SUPPORT_UNICODE
+  if (common->utf || common->ucp)
+    local_start = LOCAL3;
+#endif
+  }
+
 type = cc[1 + IMM2_SIZE];
 
 SLJIT_COMPILE_ASSERT((OP_CRSTAR & 0x1) == 0, crstar_opcode_must_be_even);
+/* Update ref_update_local_size() when this changes. */
+SLJIT_ASSERT(local_start + 2 * SSIZE_OF(sw) <= (int)LOCAL0 + common->locals_size);
 minimize = (type & 0x1) != 0;
 switch(type)
   {
@@ -9641,7 +8305,7 @@ if (!minimize)
       {
       compile_dnref_search(common, ccbegin, NULL);
       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, TMP2, 0);
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), local_start + SSIZE_OF(sw), TMP2, 0);
       zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
       }
     /* Restore if not zero length. */
@@ -9664,24 +8328,24 @@ if (!minimize)
       {
       compile_dnref_search(common, ccbegin, &backtrack->own_backtracks);
       OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP2), 0);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, TMP2, 0);
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), local_start + SSIZE_OF(sw), TMP2, 0);
       zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
       }
     }
 
   if (min > 1 || max > 1)
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, SLJIT_IMM, 0);
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), local_start, SLJIT_IMM, 0);
 
   label = LABEL();
   if (!ref)
-    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1);
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), local_start + SSIZE_OF(sw));
   compile_ref_matchingpath(common, ccbegin, &backtrack->own_backtracks, FALSE, FALSE);
 
   if (min > 1 || max > 1)
     {
-    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0);
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), local_start);
     OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, TMP1, 0);
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), local_start, TMP1, 0);
     if (min > 1)
       CMPTO(SLJIT_LESS, TMP1, 0, SLJIT_IMM, min, label);
     if (max > 1)
@@ -9836,7 +8500,7 @@ BACKTRACK_AS(recurse_backtrack)->matchingpath = LABEL();
 return cc + 1 + LINK_SIZE;
 }
 
-static sljit_s32 SLJIT_FUNC SLJIT_FUNC_ATTRIBUTE do_callout_jit(struct jit_arguments *arguments, pcre2_callout_block *callout_block, PCRE2_SPTR *jit_ovector)
+static sljit_s32 SLJIT_FUNC do_callout_jit(struct jit_arguments *arguments, pcre2_callout_block *callout_block, PCRE2_SPTR *jit_ovector)
 {
 PCRE2_SPTR begin;
 PCRE2_SIZE *ovector;
@@ -9949,12 +8613,13 @@ OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), CALLOUT_ARG_OFFSET(mark), (common->mark_pt
 SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
 
 /* Needed to save important temporary registers. */
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STR_PTR, 0);
+SLJIT_ASSERT(common->locals_size >= SSIZE_OF(sw));
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL0, STR_PTR, 0);
 /* SLJIT_R0 = arguments */
 OP1(SLJIT_MOV, SLJIT_R1, 0, STACK_TOP, 0);
 GET_LOCAL_BASE(SLJIT_R2, 0, OVECTOR_START);
 sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS3(32, W, W, W), SLJIT_IMM, SLJIT_FUNC_ADDR(do_callout_jit));
-OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 free_stack(common, callout_arg_size);
 
 /* Check return value. */
@@ -10122,6 +8787,7 @@ jump_list **found;
 /* Saving previous accept variables. */
 BOOL save_local_quit_available = common->local_quit_available;
 BOOL save_in_positive_assertion = common->in_positive_assertion;
+sljit_s32 save_restore_end_ptr = common->restore_end_ptr;
 then_trap_backtrack *save_then_trap = common->then_trap;
 struct sljit_label *save_quit_label = common->quit_label;
 struct sljit_label *save_accept_label = common->accept_label;
@@ -10229,6 +8895,7 @@ if (conditional || (opcode == OP_ASSERT_NOT || opcode == OP_ASSERTBACK_NOT))
   {
   /* Control verbs cannot escape from these asserts. */
   local_quit_available = TRUE;
+  common->restore_end_ptr = 0;
   common->local_quit_available = TRUE;
   common->quit_label = NULL;
   common->quit = NULL;
@@ -10264,6 +8931,7 @@ while (1)
       common->quit = save_quit;
       }
     common->in_positive_assertion = save_in_positive_assertion;
+    common->restore_end_ptr = save_restore_end_ptr;
     common->then_trap = save_then_trap;
     common->accept_label = save_accept_label;
     common->positive_assertion_quit = save_positive_assertion_quit;
@@ -10361,6 +9029,7 @@ while (1)
       common->quit = save_quit;
       }
     common->in_positive_assertion = save_in_positive_assertion;
+    common->restore_end_ptr = save_restore_end_ptr;
     common->then_trap = save_then_trap;
     common->accept_label = save_accept_label;
     common->positive_assertion_quit = save_positive_assertion_quit;
@@ -10500,7 +9169,8 @@ if (opcode == OP_ASSERT || opcode == OP_ASSERTBACK)
     {
     JUMPTO(SLJIT_JUMP, backtrack->matchingpath);
     JUMPHERE(brajump);
-    if (framesize >= 0)
+    SLJIT_ASSERT(framesize != 0);
+    if (framesize > 0)
       {
       OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
       add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
@@ -10565,7 +9235,9 @@ if (local_quit_available)
   common->quit_label = save_quit_label;
   common->quit = save_quit;
   }
+
 common->in_positive_assertion = save_in_positive_assertion;
+common->restore_end_ptr = save_restore_end_ptr;
 common->then_trap = save_then_trap;
 common->accept_label = save_accept_label;
 common->positive_assertion_quit = save_positive_assertion_quit;
@@ -10756,6 +9428,7 @@ BOOL needs_control_head = FALSE;
 BOOL has_vreverse = FALSE;
 struct sljit_jump *jump;
 struct sljit_jump *skip;
+jump_list *jumplist;
 struct sljit_label *rmax_label = NULL;
 struct sljit_jump *braminzero = NULL;
 
@@ -10818,7 +9491,8 @@ if (opcode == OP_CBRA || opcode == OP_SCBRA)
   BACKTRACK_AS(bracket_backtrack)->private_data_ptr = private_data_ptr;
   matchingpath += IMM2_SIZE;
   }
-else if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA || opcode == OP_ONCE || opcode == OP_SCRIPT_RUN || opcode == OP_SBRA || opcode == OP_SCOND)
+else if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA || opcode == OP_ONCE
+         || opcode == OP_ASSERT_SCS || opcode == OP_SCRIPT_RUN || opcode == OP_SBRA || opcode == OP_SCOND)
   {
   /* Other brackets simply allocate the next entry. */
   private_data_ptr = PRIVATE_DATA(ccbegin);
@@ -11029,6 +9703,88 @@ else if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA || opcode == OP_SC
   if (*matchingpath == OP_REVERSE)
     matchingpath = compile_reverse_matchingpath(common, matchingpath, backtrack);
   }
+else if (opcode == OP_ASSERT_SCS)
+  {
+  /* Nested scs blocks will not update this variable. */
+  if (common->restore_end_ptr == 0)
+    common->restore_end_ptr = private_data_ptr + sizeof(sljit_sw);
+
+  if (*matchingpath == OP_CREF && (matchingpath[1 + IMM2_SIZE] != OP_CREF && matchingpath[1 + IMM2_SIZE] != OP_DNCREF))
+    {
+    /* Optimized case for a single capture reference. */
+    i = OVECTOR(GET2(matchingpath, 1) << 1);
+
+    OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), i);
+
+    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.no_capture), CMP(SLJIT_EQUAL, TMP2, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1)));
+    matchingpath += 1 + IMM2_SIZE;
+
+    allocate_stack(common, has_alternatives ? 3 : 2);
+
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+    OP1(SLJIT_MOV, SLJIT_TMP_DEST_REG, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw));
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw), STR_END, 0);
+    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), i + sizeof(sljit_sw));
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STR_PTR, 0);
+    OP1(SLJIT_MOV, STR_PTR, 0, TMP2, 0);
+    }
+  else
+    {
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1));
+    jumplist = NULL;
+
+    while (TRUE)
+      {
+      if (*matchingpath == OP_CREF)
+        {
+        sljit_get_local_base(compiler, TMP2, 0, OVECTOR(GET2(matchingpath, 1) << 1));
+        matchingpath += 1 + IMM2_SIZE;
+        }
+      else
+        {
+        SLJIT_ASSERT(*matchingpath == OP_DNCREF);
+
+        i = GET2(matchingpath, 1 + IMM2_SIZE);
+        slot = common->name_table + GET2(matchingpath, 1) * common->name_entry_size;
+
+        while (i-- > 1)
+          {
+          sljit_get_local_base(compiler, TMP2, 0, OVECTOR(GET2(slot, 0) << 1));
+          add_jump(compiler, &jumplist, CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(TMP2), 0, TMP1, 0));
+          slot += common->name_entry_size;
+          }
+
+        sljit_get_local_base(compiler, TMP2, 0, OVECTOR(GET2(slot, 0) << 1));
+        matchingpath += 1 + 2 * IMM2_SIZE;
+        }
+
+      if (*matchingpath != OP_CREF && *matchingpath != OP_DNCREF)
+        break;
+
+      add_jump(compiler, &jumplist, CMP(SLJIT_NOT_EQUAL, SLJIT_MEM1(TMP2), 0, TMP1, 0));
+      }
+
+    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.no_capture),
+      CMP(SLJIT_EQUAL, SLJIT_MEM1(TMP2), 0, TMP1, 0));
+
+    set_jumps(jumplist, LABEL());
+
+    allocate_stack(common, has_alternatives ? 3 : 2);
+
+    OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+    OP1(SLJIT_MOV, SLJIT_TMP_DEST_REG, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw));
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, STR_PTR, 0);
+    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(TMP2), 0);
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw), STR_END, 0);
+    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(TMP2), sizeof(sljit_sw));
+    }
+
+  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), TMP1, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_TMP_DEST_REG, 0);
+
+  if (has_alternatives)
+    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(2), STR_PTR, 0);
+  }
 else if (has_alternatives)
   {
   /* Pushing the starting string pointer. */
@@ -11042,7 +9798,7 @@ if (opcode == OP_COND || opcode == OP_SCOND)
   if (*matchingpath == OP_CREF)
     {
     SLJIT_ASSERT(has_alternatives);
-    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.condfailed),
+    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.no_capture),
       CMP(SLJIT_EQUAL, SLJIT_MEM1(SLJIT_SP), OVECTOR(GET2(matchingpath, 1) << 1), SLJIT_MEM1(SLJIT_SP), OVECTOR(1)));
     matchingpath += 1 + IMM2_SIZE;
     }
@@ -11064,13 +9820,13 @@ if (opcode == OP_COND || opcode == OP_SCOND)
       slot += common->name_entry_size;
       }
     OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
-    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.condfailed), JUMP(SLJIT_ZERO));
+    add_jump(compiler, &(BACKTRACK_AS(bracket_backtrack)->u.no_capture), JUMP(SLJIT_ZERO));
     matchingpath += 1 + 2 * IMM2_SIZE;
     }
   else if ((*matchingpath >= OP_RREF && *matchingpath <= OP_TRUE) || *matchingpath == OP_FAIL)
     {
     /* Never has other case. */
-    BACKTRACK_AS(bracket_backtrack)->u.condfailed = NULL;
+    BACKTRACK_AS(bracket_backtrack)->u.no_capture = NULL;
     SLJIT_ASSERT(!has_alternatives);
 
     if (*matchingpath == OP_TRUE)
@@ -11159,9 +9915,6 @@ switch (opcode)
     if (PRIVATE_DATA(ccbegin + 1))
       OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw));
     break;
-  case OP_ASSERT_NA:
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-    break;
   case OP_ONCE:
     match_once_common(common, ket, BACKTRACK_AS(bracket_backtrack)->u.framesize, private_data_ptr, has_alternatives, needs_control_head);
     break;
@@ -11227,7 +9980,7 @@ if (has_alternatives)
     if (i <= 3)
       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, 0);
     else
-      BACKTRACK_AS(bracket_backtrack)->u.matching_put_label = sljit_emit_put_label(compiler, SLJIT_MEM1(STACK_TOP), STACK(stacksize));
+      BACKTRACK_AS(bracket_backtrack)->matching_mov_addr = sljit_emit_mov_addr(compiler, SLJIT_MEM1(STACK_TOP), STACK(stacksize));
     }
   if (ket != OP_KETRMAX)
     BACKTRACK_AS(bracket_backtrack)->alternative_matchingpath = LABEL();
@@ -11239,6 +9992,22 @@ if (offset != 0 && common->optimized_cbracket[offset >> 1] != 0)
   SLJIT_ASSERT(private_data_ptr == OVECTOR(offset + 0));
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), STR_PTR, 0);
   }
+else switch (opcode)
+  {
+  case OP_ASSERT_NA:
+    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+    break;
+  case OP_ASSERT_SCS:
+    OP1(SLJIT_MOV, TMP1, 0, STR_END, 0);
+    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+    OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw));
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw), TMP1, 0);
+
+    /* Nested scs blocks will not update this variable. */
+    if (common->restore_end_ptr == private_data_ptr + SSIZE_OF(sw))
+      common->restore_end_ptr = 0;
+    break;
+  }
 
 if (ket == OP_KETRMAX)
   {
@@ -11302,29 +10071,40 @@ if (bra == OP_BRAMINZERO)
     /* We need to release the end pointer to perform the
     backtrack for the zero-length iteration. When
     framesize is < 0, OP_ONCE will do the release itself. */
-    if (opcode == OP_ONCE && BACKTRACK_AS(bracket_backtrack)->u.framesize >= 0)
+    if (opcode == OP_ONCE)
       {
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
-      add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (BACKTRACK_AS(bracket_backtrack)->u.framesize - 1) * sizeof(sljit_sw));
+      int framesize = BACKTRACK_AS(bracket_backtrack)->u.framesize;
+
+      SLJIT_ASSERT(framesize != 0);
+      if (framesize > 0)
+        {
+        OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+        add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
+        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize - 1) * sizeof(sljit_sw));
+        }
       }
-    else if (ket == OP_KETRMIN && opcode != OP_ONCE)
+    else if (ket == OP_KETRMIN)
       free_stack(common, 1);
     }
   /* Continue to the normal backtrack. */
   }
 
-if ((ket != OP_KET && bra != OP_BRAMINZERO) || bra == OP_BRAZERO)
+if ((ket != OP_KET && bra != OP_BRAMINZERO) || bra == OP_BRAZERO || (has_alternatives && repeat_type != OP_EXACT))
   count_match(common);
 
 cc += 1 + LINK_SIZE;
 
 if (opcode == OP_ONCE)
   {
+  int data;
+  int framesize = BACKTRACK_AS(bracket_backtrack)->u.framesize;
+
+  SLJIT_ASSERT(SHRT_MIN <= framesize && framesize < SHRT_MAX/2);
   /* We temporarily encode the needs_control_head in the lowest bit.
-     Note: on the target architectures of SLJIT the ((x << 1) >> 1) returns
-     the same value for small signed numbers (including negative numbers). */
-  BACKTRACK_AS(bracket_backtrack)->u.framesize = (int)((unsigned)BACKTRACK_AS(bracket_backtrack)->u.framesize << 1) | (needs_control_head ? 1 : 0);
+     The real value should be short enough for this operation to work
+     without triggering Undefined Behaviour. */
+  data = (int)((short)((unsigned short)framesize << 1) | (needs_control_head ? 1 : 0));
+  BACKTRACK_AS(bracket_backtrack)->u.framesize = data;
   }
 return cc + repeat_length;
 }
@@ -11551,12 +10331,7 @@ while (*cc != OP_KETRPOS)
       add_jump(compiler, &emptymatch, CMP(SLJIT_EQUAL, TMP1, 0, STR_PTR, 0));
 
     if (!zero)
-      {
-      if (framesize < 0)
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize - 1), SLJIT_IMM, 0);
-      else
-        OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
-      }
+      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
     }
 
   JUMPTO(SLJIT_JUMP, loop);
@@ -11650,11 +10425,11 @@ else if (*opcode >= OP_TYPESTAR && *opcode <= OP_TYPEPOSUPTO)
   }
 else
   {
-  SLJIT_ASSERT(*opcode == OP_CLASS || *opcode == OP_NCLASS || *opcode == OP_XCLASS);
+  SLJIT_ASSERT(*opcode == OP_CLASS || *opcode == OP_NCLASS || *opcode == OP_XCLASS || *opcode == OP_ECLASS);
   *type = *opcode;
+  class_len = (*type < OP_XCLASS) ? (int)(1 + (32 / sizeof(PCRE2_UCHAR))) : GET(cc, 1);
+  *opcode = cc[class_len];
   cc++;
-  class_len = (*type < OP_XCLASS) ? (int)(1 + (32 / sizeof(PCRE2_UCHAR))) : GET(cc, 0);
-  *opcode = cc[class_len - 1];
 
   if (*opcode >= OP_CRSTAR && *opcode <= OP_CRMINQUERY)
     {
@@ -11666,8 +10441,10 @@ else
       *exact = 1;
       *opcode -= OP_PLUS - OP_STAR;
       }
+    return cc;
     }
-  else if (*opcode >= OP_CRPOSSTAR && *opcode <= OP_CRPOSQUERY)
+
+  if (*opcode >= OP_CRPOSSTAR && *opcode <= OP_CRPOSQUERY)
     {
     *opcode -= OP_CRPOSSTAR - OP_POSSTAR;
     *end = cc + class_len;
@@ -11677,41 +10454,40 @@ else
       *exact = 1;
       *opcode = OP_POSSTAR;
       }
+    return cc;
     }
+
+  SLJIT_ASSERT(*opcode == OP_CRRANGE || *opcode == OP_CRMINRANGE || *opcode == OP_CRPOSRANGE);
+  *max = GET2(cc, (class_len + IMM2_SIZE));
+  *exact = GET2(cc, class_len);
+  *end = cc + class_len + 2 * IMM2_SIZE;
+
+  if (*max == 0)
+    {
+    SLJIT_ASSERT(*exact > 1);
+    if (*opcode == OP_CRRANGE)
+      *opcode = OP_UPTO;
+    else if (*opcode == OP_CRPOSRANGE)
+      *opcode = OP_POSUPTO;
+    else
+      *opcode = OP_MINSTAR;
+    return cc;
+    }
+
+  *max -= *exact;
+  if (*max == 0)
+    *opcode = OP_EXACT;
   else
     {
-    SLJIT_ASSERT(*opcode == OP_CRRANGE || *opcode == OP_CRMINRANGE || *opcode == OP_CRPOSRANGE);
-    *max = GET2(cc, (class_len + IMM2_SIZE));
-    *exact = GET2(cc, class_len);
-
-    if (*max == 0)
-      {
-      if (*opcode == OP_CRPOSRANGE)
-        *opcode = OP_POSSTAR;
-      else
-        *opcode -= OP_CRRANGE - OP_STAR;
-      }
+    SLJIT_ASSERT(*exact > 0 || *max > 1);
+    if (*opcode == OP_CRRANGE)
+      *opcode = OP_UPTO;
+    else if (*opcode == OP_CRPOSRANGE)
+      *opcode = OP_POSUPTO;
+    else if (*max == 1)
+      *opcode = OP_MINQUERY;
     else
-      {
-      *max -= *exact;
-      if (*max == 0)
-        *opcode = OP_EXACT;
-      else if (*max == 1)
-        {
-        if (*opcode == OP_CRPOSRANGE)
-          *opcode = OP_POSQUERY;
-        else
-          *opcode -= OP_CRRANGE - OP_QUERY;
-        }
-      else
-        {
-        if (*opcode == OP_CRPOSRANGE)
-          *opcode = OP_POSUPTO;
-        else
-          *opcode -= OP_CRRANGE - OP_UPTO;
-        }
-      }
-    *end = cc + class_len + 2 * IMM2_SIZE;
+      *opcode = OP_MINUPTO;
     }
   return cc;
   }
@@ -11757,16 +10533,17 @@ if (common->utf && HAS_EXTRALEN(*cc)) *end += GET_EXTRALEN(*cc);
 return cc;
 }
 
-static PCRE2_SPTR compile_iterator_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent)
+static PCRE2_SPTR compile_iterator_matchingpath(compiler_common *common, PCRE2_SPTR cc, backtrack_common *parent, jump_list **prev_backtracks)
 {
 DEFINE_COMPILER;
-backtrack_common *backtrack;
+backtrack_common *backtrack = NULL;
+PCRE2_SPTR begin = cc;
 PCRE2_UCHAR opcode;
 PCRE2_UCHAR type;
 sljit_u32 max = 0, exact;
 sljit_s32 early_fail_ptr = PRIVATE_DATA(cc + 1);
 sljit_s32 early_fail_type;
-BOOL charpos_enabled;
+BOOL charpos_enabled, use_tmp;
 PCRE2_UCHAR charpos_char;
 unsigned int charpos_othercasebit;
 PCRE2_SPTR end;
@@ -11779,11 +10556,6 @@ int base = (private_data_ptr == 0) ? SLJIT_MEM1(STACK_TOP) : SLJIT_MEM1(SLJIT_SP
 int offset0 = (private_data_ptr == 0) ? STACK(0) : private_data_ptr;
 int offset1 = (private_data_ptr == 0) ? STACK(1) : private_data_ptr + SSIZE_OF(sw);
 int tmp_base, tmp_offset;
-#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-BOOL use_tmp;
-#endif
-
-PUSH_BACKTRACK(sizeof(char_iterator_backtrack), cc, NULL);
 
 early_fail_type = (early_fail_ptr & 0x7);
 early_fail_ptr >>= 3;
@@ -11799,7 +10571,7 @@ SLJIT_ASSERT(common->fast_forward_bc_ptr != NULL || early_fail_ptr == 0
   || (early_fail_ptr >= common->early_fail_start_ptr && early_fail_ptr <= common->early_fail_end_ptr));
 
 if (early_fail_type == type_fail)
-  add_jump(compiler, &backtrack->own_backtracks, CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr));
+  add_jump(compiler, prev_backtracks, CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr));
 
 cc = get_iterator_parameters(common, cc, &opcode, &type, &max, &exact, &end);
 
@@ -11811,39 +10583,47 @@ if (type != OP_EXTUNI)
 else
   {
   tmp_base = SLJIT_MEM1(SLJIT_SP);
-  tmp_offset = POSSESSIVE0;
+  tmp_offset = LOCAL2;
   }
 
-/* Handle fixed part first. */
-if (exact > 1)
+if (opcode == OP_EXACT)
   {
-  SLJIT_ASSERT(early_fail_ptr == 0);
+  SLJIT_ASSERT(early_fail_ptr == 0 && exact >= 2);
 
   if (common->mode == PCRE2_JIT_COMPLETE
-#ifdef SUPPORT_UNICODE
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
       && !common->utf
 #endif
       && type != OP_ANYNL && type != OP_EXTUNI)
     {
-    OP2(SLJIT_ADD, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(exact));
-    add_jump(compiler, &backtrack->own_backtracks, CMP(SLJIT_GREATER, TMP1, 0, STR_END, 0));
-    OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, exact);
-    label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, FALSE);
-    OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-    JUMPTO(SLJIT_NOT_ZERO, label);
+    OP2(SLJIT_SUB, TMP1, 0, STR_END, 0, STR_PTR, 0);
+    add_jump(compiler, prev_backtracks, CMP(SLJIT_LESS, TMP1, 0, SLJIT_IMM, IN_UCHARS(exact)));
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 32
+    if (type == OP_ALLANY && !common->invalid_utf)
+#else
+    if (type == OP_ALLANY)
+#endif
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(exact));
+    else
+      {
+      OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, exact);
+      label = LABEL();
+      compile_char1_matchingpath(common, type, cc, prev_backtracks, FALSE);
+      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
+      JUMPTO(SLJIT_NOT_ZERO, label);
+      }
     }
   else
     {
+    SLJIT_ASSERT(tmp_base == TMP3 || common->locals_size >= 3 * SSIZE_OF(sw));
     OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, exact);
     label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, TRUE);
+    compile_char1_matchingpath(common, type, cc, prev_backtracks, TRUE);
     OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
     JUMPTO(SLJIT_NOT_ZERO, label);
     }
   }
-else if (exact == 1)
-  compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, TRUE);
 
 if (early_fail_type == type_fail_range)
   {
@@ -11852,38 +10632,57 @@ if (early_fail_type == type_fail_range)
   OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + SSIZE_OF(sw));
   OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, TMP2, 0);
   OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, TMP2, 0);
-  add_jump(compiler, &backtrack->own_backtracks, CMP(SLJIT_LESS_EQUAL, TMP2, 0, TMP1, 0));
+  add_jump(compiler, prev_backtracks, CMP(SLJIT_LESS_EQUAL, TMP2, 0, TMP1, 0));
 
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + SSIZE_OF(sw), STR_PTR, 0);
   }
 
+if (opcode < OP_EXACT)
+  PUSH_BACKTRACK(sizeof(char_iterator_backtrack), begin, NULL);
+
 switch(opcode)
   {
   case OP_STAR:
   case OP_UPTO:
-  SLJIT_ASSERT(early_fail_ptr == 0 || opcode == OP_STAR);
+  SLJIT_ASSERT(backtrack != NULL && (early_fail_ptr == 0 || opcode == OP_STAR));
+  max += exact;
 
-  if (type == OP_ANYNL || type == OP_EXTUNI)
+  if (type == OP_EXTUNI)
     {
     SLJIT_ASSERT(private_data_ptr == 0);
     SLJIT_ASSERT(early_fail_ptr == 0);
 
-    allocate_stack(common, 2);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
-    OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 0);
+    if (exact == 1)
+      {
+      SLJIT_ASSERT(opcode == OP_STAR);
+      allocate_stack(common, 1);
+      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), SLJIT_IMM, 0);
+      }
+    else
+      {
+      /* If OP_EXTUNI is present, it has a separate EXACT opcode. */
+      SLJIT_ASSERT(exact == 0);
 
-    if (opcode == OP_UPTO)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, SLJIT_IMM, max);
+      allocate_stack(common, 2);
+      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(0), STR_PTR, 0);
+      OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, 0);
+      }
 
-    label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &BACKTRACK_AS(char_iterator_backtrack)->u.backtracks, TRUE);
     if (opcode == OP_UPTO)
       {
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0);
+      SLJIT_ASSERT(common->locals_size >= 3 * SSIZE_OF(sw));
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL2, SLJIT_IMM, max);
+      }
+
+    label = LABEL();
+    compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, TRUE);
+    if (opcode == OP_UPTO)
+      {
+      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL2);
       OP2(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
       jump = JUMP(SLJIT_ZERO);
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE0, TMP1, 0);
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL2, TMP1, 0);
       }
 
     /* We cannot use TMP3 because of allocate_stack. */
@@ -11903,6 +10702,9 @@ switch(opcode)
     {
     if (opcode == OP_STAR)
       {
+      if (exact == 1)
+        detect_partial_match(common, prev_backtracks);
+
       if (private_data_ptr == 0)
         allocate_stack(common, 2);
 
@@ -11923,6 +10725,9 @@ switch(opcode)
     else
 #endif
       {
+      /* If OP_ALLANY is present, it has a separate EXACT opcode. */
+      SLJIT_ASSERT(exact == 0);
+
       if (private_data_ptr == 0)
         allocate_stack(common, 2);
 
@@ -11954,6 +10759,7 @@ switch(opcode)
   charpos_char = 0;
   charpos_othercasebit = 0;
 
+  SLJIT_ASSERT(tmp_base == TMP3);
   if ((type != OP_CHAR && type != OP_CHARI) && (*end == OP_CHAR || *end == OP_CHARI))
     {
 #ifdef SUPPORT_UNICODE
@@ -11983,176 +10789,320 @@ switch(opcode)
       if (charpos_othercasebit != 0)
         charpos_char |= charpos_othercasebit;
 
-      BACKTRACK_AS(char_iterator_backtrack)->u.charpos.enabled = TRUE;
-      BACKTRACK_AS(char_iterator_backtrack)->u.charpos.chr = charpos_char;
-      BACKTRACK_AS(char_iterator_backtrack)->u.charpos.othercasebit = charpos_othercasebit;
+      BACKTRACK_AS(char_iterator_backtrack)->charpos.charpos_enabled = TRUE;
+      BACKTRACK_AS(char_iterator_backtrack)->charpos.chr = charpos_char;
+      BACKTRACK_AS(char_iterator_backtrack)->charpos.othercasebit = charpos_othercasebit;
+
+      if (private_data_ptr == 0)
+        allocate_stack(common, 2);
+
+      use_tmp = (opcode == OP_STAR);
+
+      if (use_tmp)
+        {
+        OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 0);
+        OP1(SLJIT_MOV, base, offset0, TMP3, 0);
+        }
+      else
+        {
+        OP1(SLJIT_MOV, base, offset1, COUNT_MATCH, 0);
+        OP1(SLJIT_MOV, COUNT_MATCH, 0, SLJIT_IMM, 0);
+        OP1(SLJIT_MOV, base, offset0, COUNT_MATCH, 0);
+        OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, exact == max ? 0 : (max + 1));
+        }
+
+      /* Search the first instance of charpos_char. */
+      if (exact > 0)
+        detect_partial_match(common, &no_match);
+      else
+        jump = JUMP(SLJIT_JUMP);
+
+      label = LABEL();
+
+      if (opcode == OP_UPTO)
+        {
+        if (exact == max)
+          OP2(SLJIT_ADD, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+        else
+          {
+          OP2(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+          add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+          }
+        }
+
+      compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
+
+      if (early_fail_ptr != 0)
+        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
+
+      if (exact == 0)
+        JUMPHERE(jump);
+
+      detect_partial_match(common, &no_match);
+
+      if (opcode == OP_UPTO && exact > 0)
+        {
+        if (exact == max)
+          CMPTO(SLJIT_LESS, TMP3, 0, SLJIT_IMM, exact, label);
+        else
+          CMPTO(SLJIT_GREATER, TMP3, 0, SLJIT_IMM, (max + 1) - exact, label);
+        }
+
+      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+      if (charpos_othercasebit != 0)
+        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, charpos_othercasebit);
+      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char, label);
+
+      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+      if (use_tmp)
+        {
+        OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, SLJIT_IMM, 0);
+        SELECT(SLJIT_EQUAL, TMP3, STR_PTR, 0, TMP3);
+        }
+      else
+        {
+        OP2U(SLJIT_SUB | SLJIT_SET_Z, COUNT_MATCH, 0, SLJIT_IMM, 0);
+        SELECT(SLJIT_EQUAL, COUNT_MATCH, STR_PTR, 0, COUNT_MATCH);
+        }
+      JUMPTO(SLJIT_JUMP, label);
+
+      set_jumps(no_match, LABEL());
+      OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
+      if (use_tmp)
+        OP1(SLJIT_MOV, base, offset1, TMP3, 0);
+      else
+        {
+        OP1(SLJIT_MOV, TMP1, 0, base, offset1);
+        OP1(SLJIT_MOV, base, offset1, COUNT_MATCH, 0);
+        OP1(SLJIT_MOV, COUNT_MATCH, 0, TMP1, 0);
+        }
+
+      add_jump(compiler, &backtrack->own_backtracks, CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0));
+
+      BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
+      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+      break;
       }
     }
 
-  if (charpos_enabled)
+  if (private_data_ptr == 0)
+    allocate_stack(common, 2);
+
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+  use_tmp = (opcode == OP_STAR);
+
+  if (common->utf)
     {
-    if (opcode == OP_UPTO)
-      OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max + 1);
+    if (!use_tmp)
+      OP1(SLJIT_MOV, base, offset0, COUNT_MATCH, 0);
 
-    /* Search the first instance of charpos_char. */
-    jump = JUMP(SLJIT_JUMP);
+    OP1(SLJIT_MOV, use_tmp ? TMP3 : COUNT_MATCH, 0, STR_PTR, 0);
+    }
+#endif
+
+  if (opcode == OP_UPTO)
+    OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, exact == max ? -(sljit_sw)exact : (sljit_sw)max);
+
+  if (opcode == OP_UPTO && exact > 0)
+    {
     label = LABEL();
-    if (opcode == OP_UPTO)
-      {
-      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-      add_jump(compiler, &backtrack->own_backtracks, JUMP(SLJIT_ZERO));
-      }
-    compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, FALSE);
-    if (early_fail_ptr != 0)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
-    JUMPHERE(jump);
-
-    detect_partial_match(common, &backtrack->own_backtracks);
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (charpos_othercasebit != 0)
-      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, charpos_othercasebit);
-    CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char, label);
-
-    if (private_data_ptr == 0)
-      allocate_stack(common, 2);
-    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-    OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
-
-    if (opcode == OP_UPTO)
-      {
-      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-      add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
-      }
-
-    /* Search the last instance of charpos_char. */
-    label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
-    if (early_fail_ptr != 0)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
     detect_partial_match(common, &no_match);
-    OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
-    if (charpos_othercasebit != 0)
-      OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, charpos_othercasebit);
+    compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
+    if (common->utf)
+      OP1(SLJIT_MOV, use_tmp ? TMP3 : COUNT_MATCH, 0, STR_PTR, 0);
+#endif
 
-    if (opcode == OP_STAR)
+    if (exact == max)
       {
-      CMPTO(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char, label);
-      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-      JUMPTO(SLJIT_JUMP, label);
+      OP2(SLJIT_ADD | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+      JUMPTO(SLJIT_NOT_ZERO, label);
       }
     else
       {
-      jump = CMP(SLJIT_NOT_EQUAL, TMP1, 0, SLJIT_IMM, charpos_char);
-      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-      JUMPHERE(jump);
-      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-      JUMPTO(SLJIT_NOT_ZERO, label);
+      OP2(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+      add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+      CMPTO(SLJIT_NOT_EQUAL, TMP3, 0, SLJIT_IMM, max - exact, label);
       }
 
-    set_jumps(no_match, LABEL());
-    OP2(SLJIT_ADD, STR_PTR, 0, base, offset0, SLJIT_IMM, IN_UCHARS(1));
-    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
+    JUMPTO(SLJIT_JUMP, label);
     }
   else
     {
-    if (private_data_ptr == 0)
-      allocate_stack(common, 2);
-
     OP1(SLJIT_MOV, base, offset1, STR_PTR, 0);
-#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-    use_tmp = (!HAS_VIRTUAL_REGISTERS && opcode == OP_STAR);
-    SLJIT_ASSERT(!use_tmp || tmp_base == TMP3);
-
-    if (common->utf)
-      OP1(SLJIT_MOV, use_tmp ? TMP3 : base, use_tmp ? 0 : offset0, STR_PTR, 0);
-#endif
-    if (opcode == OP_UPTO)
-      OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
 
     detect_partial_match(common, &no_match);
     label = LABEL();
     compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
     if (common->utf)
-      OP1(SLJIT_MOV, use_tmp ? TMP3 : base, use_tmp ? 0 : offset0, STR_PTR, 0);
+      OP1(SLJIT_MOV, use_tmp ? TMP3 : COUNT_MATCH, 0, STR_PTR, 0);
 #endif
 
     if (opcode == OP_UPTO)
       {
-      OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
+      OP2(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
       add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
       }
 
     detect_partial_match_to(common, label);
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    }
 
-    set_jumps(no_char1_match, LABEL());
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-    if (common->utf)
+  if (common->utf)
+    {
+    set_jumps(no_char1_match, LABEL());
+    set_jumps(no_match, LABEL());
+    if (use_tmp)
       {
-      set_jumps(no_match, LABEL());
-      if (use_tmp)
-        {
-        OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
-        OP1(SLJIT_MOV, base, offset0, TMP3, 0);
-        }
-      else
-        OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
+      OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
+      OP1(SLJIT_MOV, base, offset0, TMP3, 0);
       }
     else
-#endif
       {
-      OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
-      set_jumps(no_match, LABEL());
+      OP1(SLJIT_MOV, STR_PTR, 0, COUNT_MATCH, 0);
+      OP1(SLJIT_MOV, COUNT_MATCH, 0, base, offset0);
       OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
       }
-
-    if (early_fail_ptr != 0)
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
     }
+  else
+#endif
+    {
+    if (opcode != OP_UPTO || exact == 0)
+      OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    set_jumps(no_char1_match, LABEL());
+
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+    set_jumps(no_match, LABEL());
+    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    }
+
+  if (opcode == OP_UPTO)
+    {
+    if (exact > 0)
+      {
+      if (max == exact)
+        jump = CMP(SLJIT_GREATER_EQUAL, TMP3, 0, SLJIT_IMM, -(sljit_sw)exact);
+      else
+        jump = CMP(SLJIT_GREATER, TMP3, 0, SLJIT_IMM, max - exact);
+
+      add_jump(compiler, &backtrack->own_backtracks, jump);
+      }
+    }
+  else if (exact == 1)
+    add_jump(compiler, &backtrack->own_backtracks, CMP(SLJIT_EQUAL, base, offset1, STR_PTR, 0));
+
+  if (early_fail_ptr != 0)
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
 
   BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
   break;
 
-  case OP_MINSTAR:
+  case OP_QUERY:
+  SLJIT_ASSERT(backtrack != NULL && early_fail_ptr == 0);
   if (private_data_ptr == 0)
     allocate_stack(common, 1);
   OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+  compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, TRUE);
   BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
+  break;
+
+  case OP_MINSTAR:
+  case OP_MINQUERY:
+  SLJIT_ASSERT(backtrack != NULL && (opcode == OP_MINSTAR || early_fail_ptr == 0));
+  if (private_data_ptr == 0)
+    allocate_stack(common, 1);
+
+  if (exact >= 1)
+    {
+    if (exact >= 2)
+      {
+      /* Extuni has a separate exact opcode. */
+      SLJIT_ASSERT(tmp_base == TMP3 && early_fail_ptr == 0);
+      OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, exact);
+      }
+
+    if (opcode == OP_MINQUERY)
+      OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, -1);
+
+    label = LABEL();
+    BACKTRACK_AS(char_iterator_backtrack)->matchingpath = label;
+
+    compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, TRUE);
+
+    if (exact >= 2)
+      {
+      OP2(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+      JUMPTO(SLJIT_NOT_ZERO, label);
+      }
+
+    if (opcode == OP_MINQUERY)
+      OP2(SLJIT_AND, base, offset0, base, offset0, STR_PTR, 0);
+    else
+      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    }
+  else
+    {
+    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
+    }
+
   if (early_fail_ptr != 0)
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
   break;
 
   case OP_MINUPTO:
-  SLJIT_ASSERT(early_fail_ptr == 0);
+  SLJIT_ASSERT(backtrack != NULL && early_fail_ptr == 0);
   if (private_data_ptr == 0)
     allocate_stack(common, 2);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  OP1(SLJIT_MOV, base, offset1, SLJIT_IMM, max + 1);
-  BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
-  break;
 
-  case OP_QUERY:
-  case OP_MINQUERY:
-  SLJIT_ASSERT(early_fail_ptr == 0);
-  if (private_data_ptr == 0)
-    allocate_stack(common, 1);
+  OP1(SLJIT_MOV, base, offset1, SLJIT_IMM, max + 1);
+
+  if (exact == 0)
+    {
+    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
+    break;
+    }
+
+  if (exact >= 2)
+    {
+    /* Extuni has a separate exact opcode. */
+    SLJIT_ASSERT(tmp_base == TMP3);
+    OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, exact);
+    }
+
+  label = LABEL();
+  BACKTRACK_AS(char_iterator_backtrack)->matchingpath = label;
+
+  compile_char1_matchingpath(common, type, cc, &backtrack->own_backtracks, TRUE);
+
+  if (exact >= 2)
+    {
+    OP2(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+    JUMPTO(SLJIT_NOT_ZERO, label);
+    }
+
   OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  if (opcode == OP_QUERY)
-    compile_char1_matchingpath(common, type, cc, &BACKTRACK_AS(char_iterator_backtrack)->u.backtracks, TRUE);
-  BACKTRACK_AS(char_iterator_backtrack)->matchingpath = LABEL();
   break;
 
   case OP_EXACT:
+  SLJIT_ASSERT(backtrack == NULL);
   break;
 
   case OP_POSSTAR:
+  SLJIT_ASSERT(backtrack == NULL);
 #if defined SUPPORT_UNICODE
   if (type == OP_ALLANY && !common->invalid_utf)
 #else
   if (type == OP_ALLANY)
 #endif
     {
+    if (exact == 1)
+      detect_partial_match(common, prev_backtracks);
+
     OP1(SLJIT_MOV, STR_PTR, 0, STR_END, 0);
     process_partial_match(common);
     if (early_fail_ptr != 0)
@@ -12161,98 +11111,150 @@ switch(opcode)
     }
 
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-  if (type == OP_EXTUNI || common->utf)
+  if (common->utf)
     {
-    OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
+    SLJIT_ASSERT(tmp_base == TMP3 || common->locals_size >= 3 * SSIZE_OF(sw));
+
+    if (tmp_base != TMP3)
+      {
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL2, COUNT_MATCH, 0);
+      tmp_base = COUNT_MATCH;
+      }
+
+    OP1(SLJIT_MOV, tmp_base, 0, exact == 1 ? SLJIT_IMM : STR_PTR, 0);
     detect_partial_match(common, &no_match);
     label = LABEL();
     compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
-    OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
+    OP1(SLJIT_MOV, tmp_base, 0, STR_PTR, 0);
     detect_partial_match_to(common, label);
 
     set_jumps(no_match, LABEL());
-    OP1(SLJIT_MOV, STR_PTR, 0, tmp_base, tmp_offset);
+    OP1(SLJIT_MOV, STR_PTR, 0, tmp_base, 0);
+
+    if (tmp_base != TMP3)
+      OP1(SLJIT_MOV, COUNT_MATCH, 0, SLJIT_MEM1(SLJIT_SP), LOCAL2);
+
+    if (exact == 1)
+      add_jump(compiler, prev_backtracks, CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0));
+
     if (early_fail_ptr != 0)
-      {
-      if (!HAS_VIRTUAL_REGISTERS && tmp_base == TMP3)
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, TMP3, 0);
-      else
-        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
-      }
+      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
     break;
     }
 #endif
 
+  if (exact == 1)
+    OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
+
   detect_partial_match(common, &no_match);
   label = LABEL();
+  /* Extuni never fails, so no_char1_match is not used in that case.
+     Anynl optionally reads an extra character on success. */
   compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
   detect_partial_match_to(common, label);
-  OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  if (type != OP_EXTUNI)
+    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
   set_jumps(no_char1_match, LABEL());
-  OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+  if (type != OP_EXTUNI)
+    OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+
   set_jumps(no_match, LABEL());
+
+  if (exact == 1)
+    add_jump(compiler, prev_backtracks, CMP(SLJIT_EQUAL, tmp_base, tmp_offset, STR_PTR, 0));
+
   if (early_fail_ptr != 0)
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
   break;
 
   case OP_POSUPTO:
-  SLJIT_ASSERT(early_fail_ptr == 0);
+  SLJIT_ASSERT(backtrack == NULL && early_fail_ptr == 0);
+  max += exact;
+
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
-  if (common->utf)
-    {
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, STR_PTR, 0);
-    OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
-
-    detect_partial_match(common, &no_match);
-    label = LABEL();
-    compile_char1_matchingpath(common, type, cc, &no_match, FALSE);
-    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1, STR_PTR, 0);
-    OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-    add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
-    detect_partial_match_to(common, label);
-
-    set_jumps(no_match, LABEL());
-    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), POSSESSIVE1);
-    break;
-    }
+  if (type == OP_EXTUNI || common->utf)
+#else
+  if (type == OP_EXTUNI)
 #endif
-
-  if (type == OP_ALLANY)
     {
-    OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(max));
+    SLJIT_ASSERT(common->locals_size >= 3 * SSIZE_OF(sw));
 
-    if (common->mode == PCRE2_JIT_COMPLETE)
+    /* Count match is not modified by compile_char1_matchingpath. */
+    OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL2, COUNT_MATCH, 0);
+    OP1(SLJIT_MOV, COUNT_MATCH, 0, SLJIT_IMM, exact == max ? 0 : max);
+
+    label = LABEL();
+    /* Extuni only modifies TMP3 on successful match. */
+    OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
+    compile_char1_matchingpath(common, type, cc, &no_match, TRUE);
+
+    if (exact == max)
       {
-      OP2U(SLJIT_SUB | SLJIT_SET_GREATER, STR_PTR, 0, STR_END, 0);
-      SELECT(SLJIT_GREATER, STR_PTR, STR_END, 0, STR_PTR);
+      OP2(SLJIT_ADD, COUNT_MATCH, 0, COUNT_MATCH, 0, SLJIT_IMM, 1);
+      JUMPTO(SLJIT_JUMP, label);
       }
     else
       {
-      jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, STR_END, 0);
-      process_partial_match(common);
-      JUMPHERE(jump);
+      OP2(SLJIT_SUB | SLJIT_SET_Z, COUNT_MATCH, 0, COUNT_MATCH, 0, SLJIT_IMM, 1);
+      JUMPTO(SLJIT_NOT_ZERO, label);
+      OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
       }
+
+    set_jumps(no_match, LABEL());
+
+    if (exact > 0)
+      {
+      if (exact == max)
+        OP2U(SLJIT_SUB | SLJIT_SET_LESS, COUNT_MATCH, 0, SLJIT_IMM, exact);
+      else
+        OP2U(SLJIT_SUB | SLJIT_SET_GREATER, COUNT_MATCH, 0, SLJIT_IMM, max - exact);
+      }
+
+    OP1(SLJIT_MOV, COUNT_MATCH, 0, SLJIT_MEM1(SLJIT_SP), LOCAL2);
+
+    if (exact > 0)
+      add_jump(compiler, prev_backtracks, JUMP(exact == max ? SLJIT_LESS : SLJIT_GREATER));
+    OP1(SLJIT_MOV, STR_PTR, 0, TMP3, 0);
     break;
     }
 
-  OP1(SLJIT_MOV, tmp_base, tmp_offset, SLJIT_IMM, max);
+  SLJIT_ASSERT(tmp_base == TMP3);
+
+  OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, exact == max ? 0 : max);
 
   detect_partial_match(common, &no_match);
   label = LABEL();
   compile_char1_matchingpath(common, type, cc, &no_char1_match, FALSE);
-  OP2(SLJIT_SUB | SLJIT_SET_Z, tmp_base, tmp_offset, tmp_base, tmp_offset, SLJIT_IMM, 1);
-  add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+
+  if (exact == max)
+    OP2(SLJIT_ADD, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+  else
+    {
+    OP2(SLJIT_SUB | SLJIT_SET_Z, TMP3, 0, TMP3, 0, SLJIT_IMM, 1);
+    add_jump(compiler, &no_match, JUMP(SLJIT_ZERO));
+    }
   detect_partial_match_to(common, label);
   OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
   set_jumps(no_char1_match, LABEL());
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
   set_jumps(no_match, LABEL());
+
+  if (exact > 0)
+    {
+    if (exact == max)
+      jump = CMP(SLJIT_LESS, TMP3, 0, SLJIT_IMM, exact);
+    else
+      jump = CMP(SLJIT_GREATER, TMP3, 0, SLJIT_IMM, max - exact);
+
+    add_jump(compiler, prev_backtracks, jump);
+    }
   break;
 
   case OP_POSQUERY:
-  SLJIT_ASSERT(early_fail_ptr == 0);
+  SLJIT_ASSERT(backtrack == NULL && early_fail_ptr == 0);
+  SLJIT_ASSERT(tmp_base == TMP3 || common->locals_size >= 3 * SSIZE_OF(sw));
   OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
   compile_char1_matchingpath(common, type, cc, &no_match, TRUE);
   OP1(SLJIT_MOV, tmp_base, tmp_offset, STR_PTR, 0);
@@ -12415,6 +11417,7 @@ DEFINE_COMPILER;
 backtrack_common *backtrack;
 BOOL has_then_trap = FALSE;
 then_trap_backtrack *save_then_trap = NULL;
+size_t op_len;
 
 SLJIT_ASSERT(*ccend == OP_END || (*ccend >= OP_ALT && *ccend <= OP_KETRPOS));
 
@@ -12550,21 +11553,23 @@ while (cc < ccend)
     case OP_TYPEPOSPLUS:
     case OP_TYPEPOSQUERY:
     case OP_TYPEPOSUPTO:
-    cc = compile_iterator_matchingpath(common, cc, parent);
+    cc = compile_iterator_matchingpath(common, cc, parent, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks);
     break;
 
     case OP_CLASS:
     case OP_NCLASS:
     if (cc[1 + (32 / sizeof(PCRE2_UCHAR))] >= OP_CRSTAR && cc[1 + (32 / sizeof(PCRE2_UCHAR))] <= OP_CRPOSRANGE)
-      cc = compile_iterator_matchingpath(common, cc, parent);
+      cc = compile_iterator_matchingpath(common, cc, parent, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks);
     else
       cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks, TRUE);
     break;
 
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
     case OP_XCLASS:
-    if (*(cc + GET(cc, 1)) >= OP_CRSTAR && *(cc + GET(cc, 1)) <= OP_CRPOSRANGE)
-      cc = compile_iterator_matchingpath(common, cc, parent);
+    case OP_ECLASS:
+    op_len = GET(cc, 1);
+    if (cc[op_len] >= OP_CRSTAR && cc[op_len] <= OP_CRPOSRANGE)
+      cc = compile_iterator_matchingpath(common, cc, parent, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks);
     else
       cc = compile_char1_matchingpath(common, *cc, cc + 1, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks, TRUE);
     break;
@@ -12572,24 +11577,26 @@ while (cc < ccend)
 
     case OP_REF:
     case OP_REFI:
-    if (cc[1 + IMM2_SIZE] >= OP_CRSTAR && cc[1 + IMM2_SIZE] <= OP_CRPOSRANGE)
+    op_len = PRIV(OP_lengths)[*cc];
+    if (cc[op_len] >= OP_CRSTAR && cc[op_len] <= OP_CRPOSRANGE)
       cc = compile_ref_iterator_matchingpath(common, cc, parent);
     else
       {
       compile_ref_matchingpath(common, cc, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks, TRUE, FALSE);
-      cc += 1 + IMM2_SIZE;
+      cc += op_len;
       }
     break;
 
     case OP_DNREF:
     case OP_DNREFI:
-    if (cc[1 + 2 * IMM2_SIZE] >= OP_CRSTAR && cc[1 + 2 * IMM2_SIZE] <= OP_CRPOSRANGE)
+    op_len = PRIV(OP_lengths)[*cc];
+    if (cc[op_len] >= OP_CRSTAR && cc[op_len] <= OP_CRPOSRANGE)
       cc = compile_ref_iterator_matchingpath(common, cc, parent);
     else
       {
       compile_dnref_search(common, cc, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks);
       compile_ref_matchingpath(common, cc, parent->top != NULL ? &parent->top->simple_backtracks : &parent->own_backtracks, TRUE, FALSE);
-      cc += 1 + 2 * IMM2_SIZE;
+      cc += op_len;
       }
     break;
 
@@ -12630,6 +11637,7 @@ while (cc < ccend)
 
     case OP_ASSERT_NA:
     case OP_ASSERTBACK_NA:
+    case OP_ASSERT_SCS:
     case OP_ONCE:
     case OP_SCRIPT_RUN:
     case OP_BRA:
@@ -12741,6 +11749,28 @@ SLJIT_ASSERT(cc == ccend);
 
 #define CURRENT_AS(type) ((type *)current)
 
+static void compile_newline_move_back(compiler_common *common)
+{
+DEFINE_COMPILER;
+struct sljit_jump *jump;
+
+OP2(SLJIT_SUB, TMP1, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
+jump = CMP(SLJIT_LESS_EQUAL, TMP1, 0, TMP2, 0);
+/* All newlines are single byte, or their last byte
+is not equal to CHAR_NL/CHAR_CR even if UTF is enabled. */
+OP1(MOV_UCHAR, SLJIT_TMP_DEST_REG, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-2));
+OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
+OP2(SLJIT_SHL, SLJIT_TMP_DEST_REG, 0, SLJIT_TMP_DEST_REG, 0, SLJIT_IMM, 8);
+OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_TMP_DEST_REG, 0);
+OP2U(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, SLJIT_IMM, CHAR_CR << 8 | CHAR_NL);
+OP_FLAGS(SLJIT_MOV, TMP1, 0, SLJIT_EQUAL);
+#if PCRE2_CODE_UNIT_WIDTH == 16 || PCRE2_CODE_UNIT_WIDTH == 32
+OP2(SLJIT_SHL, TMP1, 0, TMP1, 0, SLJIT_IMM, UCHAR_SHIFT);
+#endif
+OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, TMP1, 0);
+JUMPHERE(jump);
+}
+
 static void compile_iterator_backtrackingpath(compiler_common *common, struct backtrack_common *current)
 {
 DEFINE_COMPILER;
@@ -12763,52 +11793,104 @@ switch(opcode)
   {
   case OP_STAR:
   case OP_UPTO:
-  if (type == OP_ANYNL || type == OP_EXTUNI)
+  if (type == OP_EXTUNI)
     {
     SLJIT_ASSERT(private_data_ptr == 0);
-    set_jumps(CURRENT_AS(char_iterator_backtrack)->u.backtracks, LABEL());
+    set_jumps(current->own_backtracks, LABEL());
     OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
     free_stack(common, 1);
     CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(char_iterator_backtrack)->matchingpath);
     }
   else
     {
-    if (CURRENT_AS(char_iterator_backtrack)->u.charpos.enabled)
+    if (CURRENT_AS(char_iterator_backtrack)->charpos.charpos_enabled)
       {
       OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
       OP1(SLJIT_MOV, TMP2, 0, base, offset1);
-      OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(1));
 
       jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
       label = LABEL();
-      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(-1));
-      OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-      if (CURRENT_AS(char_iterator_backtrack)->u.charpos.othercasebit != 0)
-        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, CURRENT_AS(char_iterator_backtrack)->u.charpos.othercasebit);
-      CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CURRENT_AS(char_iterator_backtrack)->u.charpos.chr, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+      if (type == OP_ANYNL)
+        compile_newline_move_back(common);
       move_back(common, NULL, TRUE);
-      CMPTO(SLJIT_GREATER, STR_PTR, 0, TMP2, 0, label);
+
+      OP1(MOV_UCHAR, TMP1, 0, SLJIT_MEM1(STR_PTR), IN_UCHARS(0));
+      if (CURRENT_AS(char_iterator_backtrack)->charpos.othercasebit != 0)
+        OP2(SLJIT_OR, TMP1, 0, TMP1, 0, SLJIT_IMM, CURRENT_AS(char_iterator_backtrack)->charpos.othercasebit);
+      CMPTO(SLJIT_EQUAL, TMP1, 0, SLJIT_IMM, CURRENT_AS(char_iterator_backtrack)->charpos.chr, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+      /* The range beginning must match, no need to compare. */
+      JUMPTO(SLJIT_JUMP, label);
+
+      set_jumps(current->own_backtracks, LABEL());
+      current->own_backtracks = NULL;
       }
     else
       {
       OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-      jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, base, offset1);
-      move_back(common, NULL, TRUE);
+
+      if (opcode == OP_STAR && exact == 1)
+        {
+        if (type == OP_ANYNL)
+          {
+          OP1(SLJIT_MOV, TMP2, 0, base, offset1);
+          compile_newline_move_back(common);
+          }
+
+        move_back(common, NULL, TRUE);
+        jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, base, offset1);
+        }
+      else
+        {
+        if (type == OP_ANYNL)
+          {
+          OP1(SLJIT_MOV, TMP2, 0, base, offset1);
+          jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, TMP2, 0);
+          compile_newline_move_back(common);
+          }
+        else
+          jump = CMP(SLJIT_LESS_EQUAL, STR_PTR, 0, base, offset1);
+
+        move_back(common, NULL, TRUE);
+        }
+
       OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
       JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+
+      set_jumps(current->own_backtracks, LABEL());
       }
+
     JUMPHERE(jump);
     if (private_data_ptr == 0)
       free_stack(common, 2);
     }
   break;
 
+  case OP_QUERY:
+  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
+  OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
+  CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+  jump = JUMP(SLJIT_JUMP);
+  set_jumps(current->own_backtracks, LABEL());
+  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
+  OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
+  JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+  JUMPHERE(jump);
+  if (private_data_ptr == 0)
+    free_stack(common, 1);
+  break;
+
   case OP_MINSTAR:
   OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  compile_char1_matchingpath(common, type, cc, &jumplist, TRUE);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+  if (exact == 0)
+    {
+    compile_char1_matchingpath(common, type, cc, &jumplist, TRUE);
+    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    }
+  else if (exact > 1)
+    OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 1);
+
   JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
-  set_jumps(jumplist, LABEL());
+  set_jumps(exact > 0 ? current->own_backtracks : jumplist, LABEL());
   if (private_data_ptr == 0)
     free_stack(common, 1);
   break;
@@ -12817,56 +11899,60 @@ switch(opcode)
   OP1(SLJIT_MOV, TMP1, 0, base, offset1);
   OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
   OP2(SLJIT_SUB | SLJIT_SET_Z, TMP1, 0, TMP1, 0, SLJIT_IMM, 1);
-  add_jump(compiler, &jumplist, JUMP(SLJIT_ZERO));
 
-  OP1(SLJIT_MOV, base, offset1, TMP1, 0);
-  compile_char1_matchingpath(common, type, cc, &jumplist, TRUE);
-  OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+  if (exact == 0)
+    {
+    add_jump(compiler, &jumplist, JUMP(SLJIT_ZERO));
+
+    OP1(SLJIT_MOV, base, offset1, TMP1, 0);
+    compile_char1_matchingpath(common, type, cc, &jumplist, TRUE);
+    OP1(SLJIT_MOV, base, offset0, STR_PTR, 0);
+    JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+
+    set_jumps(jumplist, LABEL());
+    }
+  else
+    {
+    if (exact > 1)
+      OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 1);
+    OP1(SLJIT_MOV, base, offset1, TMP1, 0);
+    JUMPTO(SLJIT_NOT_ZERO, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+
+    set_jumps(current->own_backtracks, LABEL());
+    }
 
-  set_jumps(jumplist, LABEL());
   if (private_data_ptr == 0)
     free_stack(common, 2);
   break;
 
-  case OP_QUERY:
-  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
-  CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(char_iterator_backtrack)->matchingpath);
-  jump = JUMP(SLJIT_JUMP);
-  set_jumps(CURRENT_AS(char_iterator_backtrack)->u.backtracks, LABEL());
-  OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
-  OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
-  JUMPHERE(jump);
-  if (private_data_ptr == 0)
-    free_stack(common, 1);
-  break;
-
   case OP_MINQUERY:
   OP1(SLJIT_MOV, STR_PTR, 0, base, offset0);
   OP1(SLJIT_MOV, base, offset0, SLJIT_IMM, 0);
-  jump = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
-  compile_char1_matchingpath(common, type, cc, &jumplist, TRUE);
-  JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
-  set_jumps(jumplist, LABEL());
-  JUMPHERE(jump);
+
+  if (exact >= 1)
+    {
+    if (exact >= 2)
+      OP1(SLJIT_MOV, TMP3, 0, SLJIT_IMM, 1);
+    CMPTO(SLJIT_NOT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+    set_jumps(current->own_backtracks, LABEL());
+    }
+  else
+    {
+    jump = CMP(SLJIT_EQUAL, STR_PTR, 0, SLJIT_IMM, 0);
+    compile_char1_matchingpath(common, type, cc, &jumplist, TRUE);
+    JUMPTO(SLJIT_JUMP, CURRENT_AS(char_iterator_backtrack)->matchingpath);
+    set_jumps(jumplist, LABEL());
+    JUMPHERE(jump);
+    }
+
   if (private_data_ptr == 0)
     free_stack(common, 1);
   break;
 
-  case OP_EXACT:
-  case OP_POSSTAR:
-  case OP_POSQUERY:
-  case OP_POSUPTO:
-  break;
-
   default:
   SLJIT_UNREACHABLE();
   break;
   }
-
-set_jumps(current->own_backtracks, LABEL());
 }
 
 static SLJIT_INLINE void compile_ref_iterator_backtrackingpath(compiler_common *common, struct backtrack_common *current)
@@ -12876,7 +11962,7 @@ PCRE2_SPTR cc = current->cc;
 BOOL ref = (*cc == OP_REF || *cc == OP_REFI);
 PCRE2_UCHAR type;
 
-type = cc[ref ? 1 + IMM2_SIZE : 1 + 2 * IMM2_SIZE];
+type = cc[PRIV(OP_lengths)[*cc]];
 
 if ((type & 0x1) == 0)
   {
@@ -12995,7 +12081,7 @@ PCRE2_SPTR ccbegin;
 PCRE2_SPTR ccprev;
 PCRE2_UCHAR bra = OP_BRA;
 PCRE2_UCHAR ket;
-assert_backtrack *assert;
+const assert_backtrack *assert;
 BOOL has_alternatives;
 BOOL needs_control_head = FALSE;
 BOOL has_vreverse;
@@ -13005,7 +12091,7 @@ struct sljit_jump *once = NULL;
 struct sljit_jump *cond = NULL;
 struct sljit_label *rmin_label = NULL;
 struct sljit_label *exact_label = NULL;
-struct sljit_put_label *put_label = NULL;
+struct sljit_jump *mov_addr = NULL;
 
 if (*cc == OP_BRAZERO || *cc == OP_BRAMINZERO)
   {
@@ -13031,7 +12117,7 @@ ccbegin = cc;
 cc += GET(cc, 1);
 has_alternatives = *cc == OP_ALT;
 if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
-  has_alternatives = (ccbegin[1 + LINK_SIZE] >= OP_ASSERT && ccbegin[1 + LINK_SIZE] <= OP_ASSERTBACK_NOT) || CURRENT_AS(bracket_backtrack)->u.condfailed != NULL;
+  has_alternatives = (ccbegin[1 + LINK_SIZE] >= OP_ASSERT && ccbegin[1 + LINK_SIZE] <= OP_ASSERTBACK_NOT) || CURRENT_AS(bracket_backtrack)->u.no_capture != NULL;
 if (opcode == OP_CBRA || opcode == OP_SCBRA)
   offset = (GET2(ccbegin, 1 + LINK_SIZE)) << 1;
 if (SLJIT_UNLIKELY(opcode == OP_COND) && (*cc == OP_KETRMAX || *cc == OP_KETRMIN))
@@ -13134,14 +12220,27 @@ if (offset != 0)
     OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1), TMP2, 0);
     }
   }
+else if (SLJIT_UNLIKELY(opcode == OP_ASSERT_SCS))
+  {
+  OP1(SLJIT_MOV, TMP1, 0, STR_END, 0);
+  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw));
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw), TMP1, 0);
+
+  /* Nested scs blocks will not update this variable. */
+  if (common->restore_end_ptr == 0)
+    common->restore_end_ptr = private_data_ptr + sizeof(sljit_sw);
+  }
 
 if (SLJIT_UNLIKELY(opcode == OP_ONCE))
   {
-  if (CURRENT_AS(bracket_backtrack)->u.framesize >= 0)
+  int framesize = CURRENT_AS(bracket_backtrack)->u.framesize;
+
+  SLJIT_ASSERT(framesize != 0);
+  if (framesize > 0)
     {
     OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
     add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-    OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (CURRENT_AS(bracket_backtrack)->u.framesize - 1) * sizeof(sljit_sw));
+    OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize - 1) * sizeof(sljit_sw));
     }
   once = JUMP(SLJIT_JUMP);
   }
@@ -13166,8 +12265,8 @@ else if (has_alternatives)
     {
     sljit_emit_ijump(compiler, SLJIT_JUMP, TMP1, 0);
 
-    SLJIT_ASSERT(CURRENT_AS(bracket_backtrack)->u.matching_put_label);
-    sljit_set_put_label(CURRENT_AS(bracket_backtrack)->u.matching_put_label, LABEL());
+    SLJIT_ASSERT(CURRENT_AS(bracket_backtrack)->matching_mov_addr != NULL);
+    sljit_set_label(CURRENT_AS(bracket_backtrack)->matching_mov_addr, LABEL());
     sljit_emit_op0(compiler, SLJIT_ENDBR);
     }
   else
@@ -13185,7 +12284,8 @@ if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
     {
     SLJIT_ASSERT(has_alternatives);
     assert = CURRENT_AS(bracket_backtrack)->u.assert;
-    if (assert->framesize >= 0 && (ccbegin[1 + LINK_SIZE] == OP_ASSERT || ccbegin[1 + LINK_SIZE] == OP_ASSERTBACK))
+    SLJIT_ASSERT(assert->framesize != 0);
+    if (assert->framesize > 0 && (ccbegin[1 + LINK_SIZE] == OP_ASSERT || ccbegin[1 + LINK_SIZE] == OP_ASSERTBACK))
       {
       OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr);
       add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
@@ -13196,11 +12296,11 @@ if (SLJIT_UNLIKELY(opcode == OP_COND) || SLJIT_UNLIKELY(opcode == OP_SCOND))
     cond = JUMP(SLJIT_JUMP);
     set_jumps(CURRENT_AS(bracket_backtrack)->u.assert->condfailed, LABEL());
     }
-  else if (CURRENT_AS(bracket_backtrack)->u.condfailed != NULL)
+  else if (CURRENT_AS(bracket_backtrack)->u.no_capture != NULL)
     {
     SLJIT_ASSERT(has_alternatives);
     cond = JUMP(SLJIT_JUMP);
-    set_jumps(CURRENT_AS(bracket_backtrack)->u.condfailed, LABEL());
+    set_jumps(CURRENT_AS(bracket_backtrack)->u.no_capture, LABEL());
     }
   else
     SLJIT_ASSERT(!has_alternatives);
@@ -13221,26 +12321,33 @@ if (has_alternatives)
       cc += GET(cc, 1);
 
       has_vreverse = FALSE;
-      if (opcode == OP_ASSERTBACK || opcode == OP_ASSERTBACK_NA)
-        {
-        SLJIT_ASSERT(private_data_ptr != 0);
-        OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
 
-        has_vreverse = (*ccprev == OP_VREVERSE);
-        if (*ccprev == OP_REVERSE || has_vreverse)
-          ccprev = compile_reverse_matchingpath(common, ccprev, current);
-        }
-      else if (opcode != OP_COND && opcode != OP_SCOND)
+      switch (opcode)
         {
-        if (opcode != OP_ONCE)
-          {
+        case OP_ASSERTBACK:
+        case OP_ASSERTBACK_NA:
+          SLJIT_ASSERT(private_data_ptr != 0);
+          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
+
+          has_vreverse = (*ccprev == OP_VREVERSE);
+          if (*ccprev == OP_REVERSE || has_vreverse)
+            ccprev = compile_reverse_matchingpath(common, ccprev, current);
+          break;
+        case OP_ASSERT_SCS:
+          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(2));
+          break;
+        case OP_ONCE:
+          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(needs_control_head ? 1 : 0));
+          break;
+        case OP_COND:
+        case OP_SCOND:
+          break;
+        default:
           if (private_data_ptr != 0)
             OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr);
           else
             OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
-          }
-        else
-          OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(STACK_TOP), STACK(needs_control_head ? 1 : 0));
+          break;
         }
 
       compile_matchingpath(common, ccprev, cc, current);
@@ -13320,7 +12427,7 @@ if (has_alternatives)
       if (alt_max <= 3)
         OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(stacksize), SLJIT_IMM, alt_count);
       else
-        put_label = sljit_emit_put_label(compiler, SLJIT_MEM1(STACK_TOP), STACK(stacksize));
+        mov_addr = sljit_emit_mov_addr(compiler, SLJIT_MEM1(STACK_TOP), STACK(stacksize));
       }
 
     if (offset != 0 && ket == OP_KETRMAX && common->optimized_cbracket[offset >> 1] != 0)
@@ -13346,7 +12453,7 @@ if (has_alternatives)
         }
       else
         {
-        sljit_set_put_label(put_label, LABEL());
+        sljit_set_label(mov_addr, LABEL());
         sljit_emit_op0(compiler, SLJIT_ENDBR);
         }
       }
@@ -13361,14 +12468,18 @@ if (has_alternatives)
   if (cond != NULL)
     {
     SLJIT_ASSERT(opcode == OP_COND || opcode == OP_SCOND);
-    assert = CURRENT_AS(bracket_backtrack)->u.assert;
-    if ((ccbegin[1 + LINK_SIZE] == OP_ASSERT_NOT || ccbegin[1 + LINK_SIZE] == OP_ASSERTBACK_NOT) && assert->framesize >= 0)
+    if (ccbegin[1 + LINK_SIZE] == OP_ASSERT_NOT || ccbegin[1 + LINK_SIZE] == OP_ASSERTBACK_NOT)
       {
-      OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr);
-      add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-      OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
-      OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (assert->framesize - 1) * sizeof(sljit_sw));
-      OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, TMP1, 0);
+      assert = CURRENT_AS(bracket_backtrack)->u.assert;
+      SLJIT_ASSERT(assert->framesize != 0);
+      if (assert->framesize > 0)
+        {
+        OP1(SLJIT_MOV, STACK_TOP, 0, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr);
+        add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
+        OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(-2));
+        OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (assert->framesize - 1) * sizeof(sljit_sw));
+        OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), assert->private_data_ptr, TMP1, 0);
+        }
       }
     JUMPHERE(cond);
     }
@@ -13410,6 +12521,21 @@ else if (opcode == OP_ASSERT_NA || opcode == OP_ASSERTBACK_NA || opcode == OP_SC
   OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, SLJIT_MEM1(STACK_TOP), STACK(0));
   free_stack(common, 1);
   }
+else if (opcode == OP_ASSERT_SCS)
+  {
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
+  OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(STACK_TOP), STACK(1));
+  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw));
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr, TMP1, 0);
+  OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), private_data_ptr + sizeof(sljit_sw), TMP2, 0);
+  free_stack(common, has_alternatives ? 3 : 2);
+
+  set_jumps(CURRENT_AS(bracket_backtrack)->u.no_capture, LABEL());
+
+  /* Nested scs blocks will not update this variable. */
+  if (common->restore_end_ptr == private_data_ptr + SSIZE_OF(sw))
+    common->restore_end_ptr = 0;
+  }
 else if (opcode == OP_ONCE)
   {
   cc = ccbegin + GET(ccbegin, 1);
@@ -13590,6 +12716,9 @@ if (opcode == OP_THEN || opcode == OP_THEN_ARG)
     }
   }
 
+if (common->restore_end_ptr != 0 && opcode != OP_SKIP_ARG)
+  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->restore_end_ptr);
+
 if (common->local_quit_available)
   {
   /* Abort match with a fail. */
@@ -13607,8 +12736,18 @@ if (opcode == OP_SKIP_ARG)
   OP1(SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, (sljit_sw)(current->cc + 2));
   sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM, SLJIT_FUNC_ADDR(do_search_mark));
 
+  if (common->restore_end_ptr == 0)
+    {
+    OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_R0, 0);
+    add_jump(compiler, &common->reset_match, CMP(SLJIT_NOT_EQUAL, SLJIT_R0, 0, SLJIT_IMM, 0));
+    return;
+    }
+
+  jump = CMP(SLJIT_EQUAL, SLJIT_R0, 0, SLJIT_IMM, 0);
   OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_R0, 0);
-  add_jump(compiler, &common->reset_match, CMP(SLJIT_NOT_EQUAL, SLJIT_R0, 0, SLJIT_IMM, 0));
+  OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->restore_end_ptr);
+  add_jump(compiler, &common->reset_match, JUMP(SLJIT_JUMP));
+  JUMPHERE(jump);
   return;
   }
 
@@ -13640,6 +12779,7 @@ static SLJIT_INLINE void compile_then_trap_backtrackingpath(compiler_common *com
 {
 DEFINE_COMPILER;
 struct sljit_jump *jump;
+int framesize;
 int size;
 
 if (CURRENT_AS(then_trap_backtrack)->then_trap)
@@ -13656,11 +12796,15 @@ free_stack(common, size);
 jump = JUMP(SLJIT_JUMP);
 
 set_jumps(CURRENT_AS(then_trap_backtrack)->quit, LABEL());
+
+framesize = CURRENT_AS(then_trap_backtrack)->framesize;
+SLJIT_ASSERT(framesize != 0);
+
 /* STACK_TOP is set by THEN. */
-if (CURRENT_AS(then_trap_backtrack)->framesize >= 0)
+if (framesize > 0)
   {
   add_jump(compiler, &common->revertframes, JUMP(SLJIT_FAST_CALL));
-  OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (CURRENT_AS(then_trap_backtrack)->framesize - 1) * sizeof(sljit_sw));
+  OP2(SLJIT_ADD, STACK_TOP, 0, STACK_TOP, 0, SLJIT_IMM, (framesize - 1) * sizeof(sljit_sw));
   }
 OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(STACK_TOP), STACK(0));
 free_stack(common, 3);
@@ -13751,10 +12895,13 @@ while (current)
     case OP_TYPEPOSPLUS:
     case OP_TYPEPOSQUERY:
     case OP_TYPEPOSUPTO:
+    /* Since classes has no backtracking path, this
+    backtrackingpath was pushed by an iterator. */
     case OP_CLASS:
     case OP_NCLASS:
 #if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
     case OP_XCLASS:
+    case OP_ECLASS:
 #endif
     compile_iterator_backtrackingpath(common, current);
     break;
@@ -13779,6 +12926,7 @@ while (current)
 
     case OP_ASSERT_NA:
     case OP_ASSERTBACK_NA:
+    case OP_ASSERT_SCS:
     case OP_ONCE:
     case OP_SCRIPT_RUN:
     case OP_BRA:
@@ -13830,8 +12978,12 @@ while (current)
 
     case OP_COMMIT:
     case OP_COMMIT_ARG:
+    if (common->restore_end_ptr != 0)
+      OP1(SLJIT_MOV, STR_END, 0, SLJIT_MEM1(SLJIT_SP), common->restore_end_ptr);
+
     if (!common->local_quit_available)
       OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH);
+
     if (common->quit_label == NULL)
       add_jump(compiler, &common->quit, JUMP(SLJIT_JUMP));
     else
@@ -13878,7 +13030,7 @@ jump_list *match = NULL;
 struct sljit_jump *next_alt = NULL;
 struct sljit_jump *accept_exit = NULL;
 struct sljit_label *quit;
-struct sljit_put_label *put_label = NULL;
+struct sljit_jump *mov_addr = NULL;
 
 /* Recurse captures then. */
 common->then_trap = NULL;
@@ -13941,7 +13093,7 @@ while (1)
   if (alt_max > 1 || (recurse_flags & recurse_flag_accept_found))
     {
     if (alt_max > 3)
-      put_label = sljit_emit_put_label(compiler, SLJIT_MEM1(STACK_TOP), STACK(1));
+      mov_addr = sljit_emit_mov_addr(compiler, SLJIT_MEM1(STACK_TOP), STACK(1));
     else
       OP1(SLJIT_MOV, SLJIT_MEM1(STACK_TOP), STACK(1), SLJIT_IMM, alt_count);
     }
@@ -13974,7 +13126,7 @@ while (1)
       if (alt_max > 3)
         {
         sljit_emit_ijump(compiler, SLJIT_JUMP, TMP1, 0);
-        sljit_set_put_label(put_label, LABEL());
+        sljit_set_label(mov_addr, LABEL());
         sljit_emit_op0(compiler, SLJIT_ENDBR);
         }
       else
@@ -13985,7 +13137,7 @@ while (1)
     }
   else if (alt_max > 3)
     {
-    sljit_set_put_label(put_label, LABEL());
+    sljit_set_label(mov_addr, LABEL());
     sljit_emit_op0(compiler, SLJIT_ENDBR);
     }
   else
@@ -14092,8 +13244,7 @@ int private_data_size;
 PCRE2_SPTR ccend;
 executable_functions *functions;
 void *executable_func;
-sljit_uw executable_size;
-sljit_uw total_length;
+sljit_uw executable_size, private_data_length, total_length;
 struct sljit_label *mainloop_label = NULL;
 struct sljit_label *continue_match_label;
 struct sljit_label *empty_match_found_label = NULL;
@@ -14120,7 +13271,7 @@ memset(&rootbacktrack, 0, sizeof(backtrack_common));
 memset(common, 0, sizeof(compiler_common));
 common->re = re;
 common->name_table = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code));
-rootbacktrack.cc = common->name_table + re->name_count * re->name_entry_size;
+rootbacktrack.cc = (PCRE2_SPTR)((uint8_t *)re + re->code_start);
 
 #ifdef SUPPORT_UNICODE
 common->invalid_utf = (mode & PCRE2_JIT_INVALID_UTF) != 0;
@@ -14168,7 +13319,7 @@ common->name_entry_size = re->name_entry_size;
 common->unset_backref = (re->overall_options & PCRE2_MATCH_UNSET_BACKREF) != 0;
 common->alt_circumflex = (re->overall_options & PCRE2_ALT_CIRCUMFLEX) != 0;
 #ifdef SUPPORT_UNICODE
-/* PCRE_UTF[16|32] have the same value as PCRE_UTF8. */
+/* PCRE2_UTF[16|32] have the same value as PCRE2_UTF8. */
 common->utf = (re->overall_options & PCRE2_UTF) != 0;
 common->ucp = (re->overall_options & PCRE2_UCP) != 0;
 if (common->utf)
@@ -14200,10 +13351,26 @@ else
 ccend = bracketend(common->start);
 
 /* Calculate the local space size on the stack. */
-common->ovector_start = LIMIT_MATCH + sizeof(sljit_sw);
-common->optimized_cbracket = (sljit_u8 *)SLJIT_MALLOC(re->top_bracket + 1, allocator_data);
-if (!common->optimized_cbracket)
+common->ovector_start = LOCAL0;
+/* Allocate space for temporary data structures. */
+private_data_length = ccend - common->start;
+/* The chance of overflow is very low, but might happen on 32 bit. */
+if (private_data_length > ~(sljit_uw)0 / sizeof(sljit_s32))
   return PCRE2_ERROR_NOMEMORY;
+
+private_data_length *= sizeof(sljit_s32);
+/* Align to 32 bit. */
+total_length = ((re->top_bracket + 1) + (sljit_uw)(sizeof(sljit_s32) - 1)) & ~(sljit_uw)(sizeof(sljit_s32) - 1);
+if (~(sljit_uw)0 - private_data_length < total_length)
+  return PCRE2_ERROR_NOMEMORY;
+
+total_length += private_data_length;
+common->private_data_ptrs = (sljit_s32*)SLJIT_MALLOC(total_length, allocator_data);
+if (!common->private_data_ptrs)
+  return PCRE2_ERROR_NOMEMORY;
+
+memset(common->private_data_ptrs, 0, private_data_length);
+common->optimized_cbracket = ((sljit_u8 *)common->private_data_ptrs) + private_data_length;
 #if defined DEBUG_FORCE_UNOPTIMIZED_CBRAS && DEBUG_FORCE_UNOPTIMIZED_CBRAS == 1
 memset(common->optimized_cbracket, 0, re->top_bracket + 1);
 #else
@@ -14217,16 +13384,19 @@ common->ovector_start += sizeof(sljit_sw);
 #endif
 if (!check_opcode_types(common, common->start, ccend))
   {
-  SLJIT_FREE(common->optimized_cbracket, allocator_data);
-  return PCRE2_ERROR_NOMEMORY;
+  SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  return PCRE2_ERROR_JIT_UNSUPPORTED;
   }
 
 /* Checking flags and updating ovector_start. */
-if (mode == PCRE2_JIT_COMPLETE && (re->flags & PCRE2_LASTSET) != 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
+if (mode == PCRE2_JIT_COMPLETE &&
+    (re->flags & PCRE2_LASTSET) != 0 &&
+    (re->optimization_flags & PCRE2_OPTIM_START_OPTIMIZE) != 0)
   {
   common->req_char_ptr = common->ovector_start;
   common->ovector_start += sizeof(sljit_sw);
   }
+
 if (mode != PCRE2_JIT_COMPLETE)
   {
   common->start_used_ptr = common->ovector_start;
@@ -14237,19 +13407,23 @@ if (mode != PCRE2_JIT_COMPLETE)
     common->ovector_start += sizeof(sljit_sw);
     }
   }
+
 if ((re->overall_options & (PCRE2_FIRSTLINE | PCRE2_USE_OFFSET_LIMIT)) != 0)
   {
   common->match_end_ptr = common->ovector_start;
   common->ovector_start += sizeof(sljit_sw);
   }
+
 #if defined DEBUG_FORCE_CONTROL_HEAD && DEBUG_FORCE_CONTROL_HEAD
 common->control_head_ptr = 1;
 #endif
+
 if (common->control_head_ptr != 0)
   {
   common->control_head_ptr = common->ovector_start;
   common->ovector_start += sizeof(sljit_sw);
   }
+
 if (common->has_set_som)
   {
   /* Saving the real start pointer is necessary. */
@@ -14270,19 +13444,11 @@ if (common->capture_last_ptr != 0)
 
 SLJIT_ASSERT(!(common->req_char_ptr != 0 && common->start_used_ptr != 0));
 common->cbra_ptr = OVECTOR_START + (re->top_bracket + 1) * 2 * sizeof(sljit_sw);
-
-total_length = ccend - common->start;
-common->private_data_ptrs = (sljit_s32*)SLJIT_MALLOC(total_length * (sizeof(sljit_s32) + (common->has_then ? 1 : 0)), allocator_data);
-if (!common->private_data_ptrs)
-  {
-  SLJIT_FREE(common->optimized_cbracket, allocator_data);
-  return PCRE2_ERROR_NOMEMORY;
-  }
-memset(common->private_data_ptrs, 0, total_length * sizeof(sljit_s32));
-
 private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
 
-if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back)
+if ((re->overall_options & PCRE2_ANCHORED) == 0 &&
+    (re->optimization_flags & PCRE2_OPTIM_START_OPTIMIZE) != 0 &&
+    !common->has_skip_in_assert_back)
   detect_early_fail(common, common->start, &private_data_size, 0, 0);
 
 set_private_data_ptrs(common, &private_data_size, ccend);
@@ -14292,29 +13458,35 @@ SLJIT_ASSERT(common->early_fail_start_ptr <= common->early_fail_end_ptr);
 if (private_data_size > 65536)
   {
   SLJIT_FREE(common->private_data_ptrs, allocator_data);
-  SLJIT_FREE(common->optimized_cbracket, allocator_data);
-  return PCRE2_ERROR_NOMEMORY;
+  return PCRE2_ERROR_JIT_UNSUPPORTED;
   }
 
 if (common->has_then)
   {
-  common->then_offsets = (sljit_u8 *)(common->private_data_ptrs + total_length);
+  total_length = ccend - common->start;
+  common->then_offsets = (sljit_u8 *)SLJIT_MALLOC(total_length, allocator_data);
+  if (!common->then_offsets)
+    {
+    SLJIT_FREE(common->private_data_ptrs, allocator_data);
+    return PCRE2_ERROR_NOMEMORY;
+    }
   memset(common->then_offsets, 0, total_length);
   set_then_offsets(common, common->start, NULL);
   }
 
-compiler = sljit_create_compiler(allocator_data, NULL);
+compiler = sljit_create_compiler(allocator_data);
 if (!compiler)
   {
-  SLJIT_FREE(common->optimized_cbracket, allocator_data);
   SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  if (common->has_then)
+    SLJIT_FREE(common->then_offsets, allocator_data);
   return PCRE2_ERROR_NOMEMORY;
   }
 common->compiler = compiler;
 
 /* Main pcre2_jit_exec entry. */
 SLJIT_ASSERT((private_data_size & (sizeof(sljit_sw) - 1)) == 0);
-sljit_emit_enter(compiler, 0, SLJIT_ARGS1(W, W), 5, 5, SLJIT_NUMBER_OF_SCRATCH_FLOAT_REGISTERS, 0, private_data_size);
+sljit_emit_enter(compiler, 0, SLJIT_ARGS1(W, W), 5 | SLJIT_ENTER_VECTOR(SLJIT_NUMBER_OF_SCRATCH_VECTOR_REGISTERS), 5, private_data_size);
 
 /* Register init. */
 reset_ovector(common, (re->top_bracket + 1) * 2);
@@ -14348,7 +13520,7 @@ if ((re->overall_options & PCRE2_ANCHORED) == 0)
   mainloop_label = mainloop_entry(common);
   continue_match_label = LABEL();
   /* Forward search if possible. */
-  if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
+  if ((re->optimization_flags & PCRE2_OPTIM_START_OPTIMIZE) != 0)
     {
     if (mode == PCRE2_JIT_COMPLETE && fast_forward_first_n_chars(common))
       ;
@@ -14363,7 +13535,8 @@ if ((re->overall_options & PCRE2_ANCHORED) == 0)
 else
   continue_match_label = LABEL();
 
-if (mode == PCRE2_JIT_COMPLETE && re->minlength > 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
+if (mode == PCRE2_JIT_COMPLETE && re->minlength > 0 &&
+    (re->optimization_flags & PCRE2_OPTIM_START_OPTIMIZE) != 0)
   {
   OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH);
   OP2(SLJIT_ADD, TMP2, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(re->minlength));
@@ -14398,8 +13571,9 @@ compile_matchingpath(common, common->start, ccend, &rootbacktrack);
 if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
   {
   sljit_free_compiler(compiler);
-  SLJIT_FREE(common->optimized_cbracket, allocator_data);
   SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  if (common->has_then)
+    SLJIT_FREE(common->then_offsets, allocator_data);
   PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
   return PCRE2_ERROR_NOMEMORY;
   }
@@ -14454,8 +13628,9 @@ compile_backtrackingpath(common, rootbacktrack.top);
 if (SLJIT_UNLIKELY(sljit_get_compiler_error(compiler)))
   {
   sljit_free_compiler(compiler);
-  SLJIT_FREE(common->optimized_cbracket, allocator_data);
   SLJIT_FREE(common->private_data_ptrs, allocator_data);
+  if (common->has_then)
+    SLJIT_FREE(common->then_offsets, allocator_data);
   PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
   return PCRE2_ERROR_NOMEMORY;
   }
@@ -14536,6 +13711,8 @@ common->early_fail_end_ptr = 0;
 common->currententry = common->entries;
 common->local_quit_available = TRUE;
 quit_label = common->quit_label;
+SLJIT_ASSERT(common->restore_end_ptr == 0);
+
 if (common->currententry != NULL)
   {
   /* A free bit for each private data. */
@@ -14565,24 +13742,28 @@ if (common->currententry != NULL)
     SLJIT_ASSERT(sljit_get_compiler_error(compiler) || common->recurse_bitset == NULL);
 
     sljit_free_compiler(compiler);
-    SLJIT_FREE(common->optimized_cbracket, allocator_data);
     SLJIT_FREE(common->private_data_ptrs, allocator_data);
+    if (common->has_then)
+      SLJIT_FREE(common->then_offsets, allocator_data);
     PRIV(jit_free_rodata)(common->read_only_data_head, allocator_data);
     return PCRE2_ERROR_NOMEMORY;
     }
   }
+
 common->local_quit_available = FALSE;
 common->quit_label = quit_label;
+SLJIT_ASSERT(common->restore_end_ptr == 0);
 
-/* Allocating stack, returns with PCRE_ERROR_JIT_STACKLIMIT if fails. */
+/* Allocating stack, returns with PCRE2_ERROR_JIT_STACKLIMIT if fails. */
 /* This is a (really) rare case. */
 set_jumps(common->stackalloc, LABEL());
 /* RETURN_ADDR is not a saved register. */
-sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+SLJIT_ASSERT(common->locals_size >= 2 * SSIZE_OF(sw));
+sljit_emit_op_dst(compiler, SLJIT_FAST_ENTER, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 
 SLJIT_ASSERT(TMP1 == SLJIT_R0 && STR_PTR == SLJIT_R1);
 
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, STR_PTR, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL1, STR_PTR, 0);
 OP1(SLJIT_MOV, SLJIT_R0, 0, ARGUMENTS, 0);
 OP2(SLJIT_SUB, SLJIT_R1, 0, STACK_LIMIT, 0, SLJIT_IMM, STACK_GROWTH_RATE);
 OP1(SLJIT_MOV, SLJIT_R0, 0, SLJIT_MEM1(SLJIT_R0), SLJIT_OFFSETOF(jit_arguments, stack));
@@ -14593,8 +13774,8 @@ sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARGS2(W, W, W), SLJIT_IMM, SLJIT_FU
 jump = CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
 OP1(SLJIT_MOV, TMP2, 0, STACK_LIMIT, 0);
 OP1(SLJIT_MOV, STACK_LIMIT, 0, SLJIT_RETURN_REG, 0);
-OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
+OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCAL1);
 OP_SRC(SLJIT_FAST_RETURN, TMP1, 0);
 
 /* Allocation failed. */
@@ -14715,10 +13896,11 @@ if (common->getucdtype != NULL)
   }
 #endif /* SUPPORT_UNICODE */
 
-SLJIT_FREE(common->optimized_cbracket, allocator_data);
 SLJIT_FREE(common->private_data_ptrs, allocator_data);
+if (common->has_then)
+  SLJIT_FREE(common->then_offsets, allocator_data);
 
-executable_func = sljit_generate_code(compiler);
+executable_func = sljit_generate_code(compiler, 0, NULL);
 executable_size = sljit_get_generated_code_size(compiler);
 sljit_free_compiler(compiler);
 
@@ -14786,10 +13968,37 @@ pcre2_jit_compile(pcre2_code *code, uint32_t options)
 {
 pcre2_real_code *re = (pcre2_real_code *)code;
 #ifdef SUPPORT_JIT
+void *exec_memory;
 executable_functions *functions;
 static int executable_allocator_is_working = -1;
+
+if (executable_allocator_is_working == -1)
+  {
+  /* Checks whether the executable allocator is working. This check
+     might run multiple times in multi-threaded environments, but the
+     result should not be affected by it. */
+  exec_memory = SLJIT_MALLOC_EXEC(32, NULL);
+  if (exec_memory != NULL)
+    {
+    SLJIT_FREE_EXEC(((sljit_u8*)(exec_memory)) + SLJIT_EXEC_OFFSET(exec_memory), NULL);
+    executable_allocator_is_working = 1;
+    }
+  else executable_allocator_is_working = 0;
+  }
 #endif
 
+if (options & PCRE2_JIT_TEST_ALLOC)
+  {
+  if (options != PCRE2_JIT_TEST_ALLOC)
+    return PCRE2_ERROR_JIT_BADOPTION;
+
+#ifdef SUPPORT_JIT
+  return executable_allocator_is_working ? 0 : PCRE2_ERROR_NOMEMORY;
+#else
+  return PCRE2_ERROR_JIT_UNSUPPORTED;
+#endif
+  }
+
 if (code == NULL)
   return PCRE2_ERROR_NULL;
 
@@ -14850,20 +14059,6 @@ return PCRE2_ERROR_JIT_BADOPTION;
 
 if ((re->flags & PCRE2_NOJIT) != 0) return 0;
 
-if (executable_allocator_is_working == -1)
-  {
-  /* Checks whether the executable allocator is working. This check
-     might run multiple times in multi-threaded environments, but the
-     result should not be affected by it. */
-  void *ptr = SLJIT_MALLOC_EXEC(32, NULL);
-  if (ptr != NULL)
-    {
-    SLJIT_FREE_EXEC(((sljit_u8*)(ptr)) + SLJIT_EXEC_OFFSET(ptr), NULL);
-    executable_allocator_is_working = 1;
-    }
-  else executable_allocator_is_working = 0;
-  }
-
 if (!executable_allocator_is_working)
   return PCRE2_ERROR_NOMEMORY;
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_jit_match.c b/engine/thirdparty/pcre2/src/pcre2_jit_match.c
index ae5903e2..8867f768 100644
--- a/engine/thirdparty/pcre2/src/pcre2_jit_match.c
+++ b/engine/thirdparty/pcre2/src/pcre2_jit_match.c
@@ -83,7 +83,7 @@ Arguments:
 
 Returns:          > 0 => success; value is the number of ovector pairs filled
                   = 0 => success, but ovector is not big enough
-                   -1 => failed to match (PCRE_ERROR_NOMATCH)
+                   -1 => failed to match (PCRE2_ERROR_NOMATCH)
                  < -1 => some kind of unexpected problem
 */
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_jit_misc.c b/engine/thirdparty/pcre2/src/pcre2_jit_misc.c
index bb6a5589..c3abc0b3 100644
--- a/engine/thirdparty/pcre2/src/pcre2_jit_misc.c
+++ b/engine/thirdparty/pcre2/src/pcre2_jit_misc.c
@@ -141,8 +141,8 @@ if (startsize == 0 || maxsize == 0 || maxsize > SIZE_MAX - STACK_GROWTH_RATE)
   return NULL;
 if (startsize > maxsize)
   startsize = maxsize;
-startsize = (startsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
-maxsize = (maxsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1);
+startsize = (startsize + STACK_GROWTH_RATE - 1) & (size_t)(~(STACK_GROWTH_RATE - 1));
+maxsize = (maxsize + STACK_GROWTH_RATE - 1) & (size_t)(~(STACK_GROWTH_RATE - 1));
 
 jit_stack = PRIV(memctl_malloc)(sizeof(pcre2_real_jit_stack), (pcre2_memctl *)gcontext);
 if (jit_stack == NULL) return NULL;
diff --git a/engine/thirdparty/pcre2/src/pcre2_jit_neon_inc.h b/engine/thirdparty/pcre2/src/pcre2_jit_neon_inc.h
index 4a718b67..1389a165 100644
--- a/engine/thirdparty/pcre2/src/pcre2_jit_neon_inc.h
+++ b/engine/thirdparty/pcre2/src/pcre2_jit_neon_inc.h
@@ -82,7 +82,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #  endif
 # endif
 
-#if (defined(__GNUC__) && __SANITIZE_ADDRESS__) \
+#if (defined(__GNUC__) && defined(__SANITIZE_ADDRESS__) && __SANITIZE_ADDRESS__ ) \
 	|| (defined(__clang__) \
 	&& ((__clang_major__ == 3 && __clang_minor__ >= 3) || (__clang_major__ > 3)))
 __attribute__((no_sanitize_address))
@@ -198,14 +198,14 @@ vect_t data = VLD1Q(*str_ptr);
 #if PCRE2_CODE_UNIT_WIDTH != 8
 data = VANDQ(data, char_mask);
 #endif
- 
+
 #if defined(FFCS)
 vect_t eq = VCEQQ(data, vc1);
 
 #elif defined(FFCS_2)
 vect_t eq1 = VCEQQ(data, vc1);
 vect_t eq2 = VCEQQ(data, vc2);
-vect_t eq = VORRQ(eq1, eq2);    
+vect_t eq = VORRQ(eq1, eq2);
 
 #elif defined(FFCS_MASK)
 vect_t eq = VORRQ(data, vmask);
@@ -226,7 +226,7 @@ if (p1 < *str_ptr)
   }
 else
   data2 = shift_left_n_lanes(data, offs1 - offs2);
- 
+
 if (compare1_type == compare_match1)
   data = VCEQQ(data, cmp1a);
 else
@@ -281,7 +281,7 @@ while (*str_ptr < str_end)
 #elif defined(FFCS_2)
   eq1 = VCEQQ(data, vc1);
   eq2 = VCEQQ(data, vc2);
-  eq = VORRQ(eq1, eq2);    
+  eq = VORRQ(eq1, eq2);
 
 #elif defined(FFCS_MASK)
   eq = VORRQ(data, vmask);
diff --git a/engine/thirdparty/pcre2/src/pcre2_jit_simd_inc.h b/engine/thirdparty/pcre2/src/pcre2_jit_simd_inc.h
index 783a85f5..66e93cd5 100644
--- a/engine/thirdparty/pcre2/src/pcre2_jit_simd_inc.h
+++ b/engine/thirdparty/pcre2/src/pcre2_jit_simd_inc.h
@@ -246,10 +246,10 @@ struct sljit_jump *quit;
 struct sljit_jump *partial_quit[2];
 vector_compare_type compare_type = vector_compare_match1;
 sljit_s32 tmp1_reg_ind = sljit_get_register_index(SLJIT_GP_REGISTER, TMP1);
-sljit_s32 data_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR0);
-sljit_s32 cmp1_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR1);
-sljit_s32 cmp2_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR2);
-sljit_s32 tmp_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR3);
+sljit_s32 data_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR0);
+sljit_s32 cmp1_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR1);
+sljit_s32 cmp2_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR2);
+sljit_s32 tmp_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR3);
 sljit_u32 bit = 0;
 int i;
 
@@ -273,17 +273,17 @@ if (common->mode == PCRE2_JIT_COMPLETE)
 
 /* First part (unaligned start) */
 value = SLJIT_SIMD_REG_128 | SLJIT_SIMD_ELEM_32 | SLJIT_SIMD_LANE_ZERO;
-sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR1, 0, SLJIT_IMM, character_to_int32(char1 | bit));
+sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR1, 0, SLJIT_IMM, character_to_int32(char1 | bit));
 
 if (char1 != char2)
-  sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR2, 0, SLJIT_IMM, character_to_int32(bit != 0 ? bit : char2));
+  sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR2, 0, SLJIT_IMM, character_to_int32(bit != 0 ? bit : char2));
 
 OP1(SLJIT_MOV, TMP2, 0, STR_PTR, 0);
 
-sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR1, SLJIT_FR1, 0);
+sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR1, SLJIT_VR1, 0);
 
 if (char1 != char2)
-  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR2, SLJIT_FR2, 0);
+  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR2, SLJIT_VR2, 0);
 
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
 restart = LABEL();
@@ -294,12 +294,12 @@ OP2(SLJIT_AND, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, ~value);
 OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, value);
 
 value = (reg_type == SLJIT_SIMD_REG_256) ? SLJIT_SIMD_MEM_ALIGNED_256 : SLJIT_SIMD_MEM_ALIGNED_128;
-sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_FR0, SLJIT_MEM1(STR_PTR), 0);
+sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_VR0, SLJIT_MEM1(STR_PTR), 0);
 
 for (i = 0; i < 4; i++)
   fast_forward_char_pair_sse2_compare(compiler, compare_type, reg_type, i, data_ind, cmp1_ind, cmp2_ind, tmp_ind);
 
-sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_FR0, TMP1, 0);
+sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_VR0, TMP1, 0);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
 OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, TMP2, 0);
 
@@ -318,11 +318,11 @@ if (common->mode == PCRE2_JIT_COMPLETE)
   add_jump(compiler, &common->failed_match, partial_quit[1]);
 
 value = (reg_type == SLJIT_SIMD_REG_256) ? SLJIT_SIMD_MEM_ALIGNED_256 : SLJIT_SIMD_MEM_ALIGNED_128;
-sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_FR0, SLJIT_MEM1(STR_PTR), 0);
+sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_VR0, SLJIT_MEM1(STR_PTR), 0);
 for (i = 0; i < 4; i++)
   fast_forward_char_pair_sse2_compare(compiler, compare_type, reg_type, i, data_ind, cmp1_ind, cmp2_ind, tmp_ind);
 
-sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_FR0, TMP1, 0);
+sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_VR0, TMP1, 0);
 CMPTO(SLJIT_ZERO, TMP1, 0, SLJIT_IMM, 0, start);
 
 JUMPHERE(quit);
@@ -380,10 +380,10 @@ struct sljit_jump *quit;
 jump_list *not_found = NULL;
 vector_compare_type compare_type = vector_compare_match1;
 sljit_s32 tmp1_reg_ind = sljit_get_register_index(SLJIT_GP_REGISTER, TMP1);
-sljit_s32 data_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR0);
-sljit_s32 cmp1_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR1);
-sljit_s32 cmp2_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR2);
-sljit_s32 tmp_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR3);
+sljit_s32 data_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR0);
+sljit_s32 cmp1_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR1);
+sljit_s32 cmp2_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR2);
+sljit_s32 tmp_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR3);
 sljit_u32 bit = 0;
 int i;
 
@@ -406,29 +406,29 @@ OP1(SLJIT_MOV, TMP3, 0, STR_PTR, 0);
 /* First part (unaligned start) */
 
 value = SLJIT_SIMD_REG_128 | SLJIT_SIMD_ELEM_32 | SLJIT_SIMD_LANE_ZERO;
-sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR1, 0, SLJIT_IMM, character_to_int32(char1 | bit));
+sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR1, 0, SLJIT_IMM, character_to_int32(char1 | bit));
 
 if (char1 != char2)
-  sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR2, 0, SLJIT_IMM, character_to_int32(bit != 0 ? bit : char2));
+  sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR2, 0, SLJIT_IMM, character_to_int32(bit != 0 ? bit : char2));
 
 OP1(SLJIT_MOV, STR_PTR, 0, TMP2, 0);
 
-sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR1, SLJIT_FR1, 0);
+sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR1, SLJIT_VR1, 0);
 
 if (char1 != char2)
-  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR2, SLJIT_FR2, 0);
+  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR2, SLJIT_VR2, 0);
 
 value = (reg_type == SLJIT_SIMD_REG_256) ? 0x1f : 0xf;
 OP2(SLJIT_AND, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, ~value);
 OP2(SLJIT_AND, TMP2, 0, TMP2, 0, SLJIT_IMM, value);
 
 value = (reg_type == SLJIT_SIMD_REG_256) ? SLJIT_SIMD_MEM_ALIGNED_256 : SLJIT_SIMD_MEM_ALIGNED_128;
-sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_FR0, SLJIT_MEM1(STR_PTR), 0);
+sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_VR0, SLJIT_MEM1(STR_PTR), 0);
 
 for (i = 0; i < 4; i++)
   fast_forward_char_pair_sse2_compare(compiler, compare_type, reg_type, i, data_ind, cmp1_ind, cmp2_ind, tmp_ind);
 
-sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_FR0, TMP1, 0);
+sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_VR0, TMP1, 0);
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
 OP2(SLJIT_LSHR, TMP1, 0, TMP1, 0, TMP2, 0);
 
@@ -445,12 +445,12 @@ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, value);
 add_jump(compiler, &not_found, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
 
 value = (reg_type == SLJIT_SIMD_REG_256) ? SLJIT_SIMD_MEM_ALIGNED_256 : SLJIT_SIMD_MEM_ALIGNED_128;
-sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_FR0, SLJIT_MEM1(STR_PTR), 0);
+sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_VR0, SLJIT_MEM1(STR_PTR), 0);
 
 for (i = 0; i < 4; i++)
   fast_forward_char_pair_sse2_compare(compiler, compare_type, reg_type, i, data_ind, cmp1_ind, cmp2_ind, tmp_ind);
 
-sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_FR0, TMP1, 0);
+sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_VR0, TMP1, 0);
 CMPTO(SLJIT_ZERO, TMP1, 0, SLJIT_IMM, 0, start);
 
 JUMPHERE(quit);
@@ -488,14 +488,14 @@ sljit_u32 bit1 = 0;
 sljit_u32 bit2 = 0;
 sljit_u32 diff = IN_UCHARS(offs1 - offs2);
 sljit_s32 tmp1_reg_ind = sljit_get_register_index(SLJIT_GP_REGISTER, TMP1);
-sljit_s32 data1_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR0);
-sljit_s32 data2_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR1);
-sljit_s32 cmp1a_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR2);
-sljit_s32 cmp2a_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR3);
-sljit_s32 cmp1b_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR4);
-sljit_s32 cmp2b_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR5);
-sljit_s32 tmp1_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_FR6);
-sljit_s32 tmp2_ind = sljit_get_register_index(SLJIT_FLOAT_REGISTER, SLJIT_TMP_FR0);
+sljit_s32 data1_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR0);
+sljit_s32 data2_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR1);
+sljit_s32 cmp1a_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR2);
+sljit_s32 cmp2a_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR3);
+sljit_s32 cmp1b_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR4);
+sljit_s32 cmp2b_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR5);
+sljit_s32 tmp1_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_VR6);
+sljit_s32 tmp2_ind = sljit_get_register_index(SLJIT_SIMD_REG_128, SLJIT_TMP_DEST_VREG);
 struct sljit_label *start;
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
 struct sljit_label *restart;
@@ -541,10 +541,10 @@ else
   }
 
 value = SLJIT_SIMD_REG_128 | SLJIT_SIMD_ELEM_32 | SLJIT_SIMD_LANE_ZERO;
-sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR2, 0, TMP1, 0);
+sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR2, 0, TMP1, 0);
 
 if (char1a != char1b)
-  sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR4, 0, TMP2, 0);
+  sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR4, 0, TMP2, 0);
 
 if (char2a == char2b)
   OP1(SLJIT_MOV, TMP1, 0, SLJIT_IMM, character_to_int32(char2a));
@@ -566,18 +566,18 @@ else
     }
   }
 
-sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR3, 0, TMP1, 0);
+sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR3, 0, TMP1, 0);
 
 if (char2a != char2b)
-  sljit_emit_simd_lane_mov(compiler, value, SLJIT_FR5, 0, TMP2, 0);
+  sljit_emit_simd_lane_mov(compiler, value, SLJIT_VR5, 0, TMP2, 0);
 
-sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR2, SLJIT_FR2, 0);
+sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR2, SLJIT_VR2, 0);
 if (char1a != char1b)
-  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR4, SLJIT_FR4, 0);
+  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR4, SLJIT_VR4, 0);
 
-sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR3, SLJIT_FR3, 0);
+sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR3, SLJIT_VR3, 0);
 if (char2a != char2b)
-  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_FR5, SLJIT_FR5, 0);
+  sljit_emit_simd_lane_replicate(compiler, reg_type | SLJIT_SIMD_ELEM_32, SLJIT_VR5, SLJIT_VR5, 0);
 
 #if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH != 32
 restart = LABEL();
@@ -589,11 +589,11 @@ value = (reg_type == SLJIT_SIMD_REG_256) ? ~0x1f : ~0xf;
 OP2(SLJIT_AND, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, value);
 
 value = (reg_type == SLJIT_SIMD_REG_256) ? SLJIT_SIMD_MEM_ALIGNED_256 : SLJIT_SIMD_MEM_ALIGNED_128;
-sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_FR0, SLJIT_MEM1(STR_PTR), 0);
+sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_VR0, SLJIT_MEM1(STR_PTR), 0);
 
 jump[0] = CMP(SLJIT_GREATER_EQUAL, TMP1, 0, STR_PTR, 0);
 
-sljit_emit_simd_mov(compiler, reg_type, SLJIT_FR1, SLJIT_MEM1(STR_PTR), -(sljit_sw)diff);
+sljit_emit_simd_mov(compiler, reg_type, SLJIT_VR1, SLJIT_MEM1(STR_PTR), -(sljit_sw)diff);
 jump[1] = JUMP(SLJIT_JUMP);
 
 JUMPHERE(jump[0]);
@@ -668,8 +668,8 @@ for (i = 0; i < 4; i++)
   fast_forward_char_pair_sse2_compare(compiler, compare1_type, reg_type, i, data1_ind, cmp1a_ind, cmp1b_ind, tmp1_ind);
   }
 
-sljit_emit_simd_op2(compiler, SLJIT_SIMD_OP2_AND | reg_type, SLJIT_FR0, SLJIT_FR0, SLJIT_FR1);
-sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_FR0, TMP1, 0);
+sljit_emit_simd_op2(compiler, SLJIT_SIMD_OP2_AND | reg_type, SLJIT_VR0, SLJIT_VR0, SLJIT_VR1, 0);
+sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_VR0, TMP1, 0);
 
 /* Ignore matches before the first STR_PTR. */
 OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, TMP2, 0);
@@ -687,8 +687,8 @@ OP2(SLJIT_ADD, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, value);
 add_jump(compiler, &common->failed_match, CMP(SLJIT_GREATER_EQUAL, STR_PTR, 0, STR_END, 0));
 
 value = (reg_type == SLJIT_SIMD_REG_256) ? SLJIT_SIMD_MEM_ALIGNED_256 : SLJIT_SIMD_MEM_ALIGNED_128;
-sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_FR0, SLJIT_MEM1(STR_PTR), 0);
-sljit_emit_simd_mov(compiler, reg_type, SLJIT_FR1, SLJIT_MEM1(STR_PTR), -(sljit_sw)diff);
+sljit_emit_simd_mov(compiler, reg_type | value, SLJIT_VR0, SLJIT_MEM1(STR_PTR), 0);
+sljit_emit_simd_mov(compiler, reg_type, SLJIT_VR1, SLJIT_MEM1(STR_PTR), -(sljit_sw)diff);
 
 for (i = 0; i < 4; i++)
   {
@@ -696,8 +696,8 @@ for (i = 0; i < 4; i++)
   fast_forward_char_pair_sse2_compare(compiler, compare2_type, reg_type, i, data2_ind, cmp2a_ind, cmp2b_ind, tmp1_ind);
   }
 
-sljit_emit_simd_op2(compiler, SLJIT_SIMD_OP2_AND | reg_type, SLJIT_FR0, SLJIT_FR0, SLJIT_FR1);
-sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_FR0, TMP1, 0);
+sljit_emit_simd_op2(compiler, SLJIT_SIMD_OP2_AND | reg_type, SLJIT_VR0, SLJIT_VR0, SLJIT_VR1, 0);
+sljit_emit_simd_sign(compiler, SLJIT_SIMD_STORE | reg_type | SLJIT_SIMD_ELEM_8, SLJIT_VR0, TMP1, 0);
 
 CMPTO(SLJIT_ZERO, TMP1, 0, SLJIT_IMM, 0, start);
 
@@ -843,12 +843,13 @@ DEFINE_COMPILER;
 int_char ic;
 struct sljit_jump *partial_quit, *quit;
 /* Save temporary registers. */
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STR_PTR, 0);
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS1, TMP3, 0);
+SLJIT_ASSERT(common->locals_size >= 2 * (int)sizeof(sljit_sw));
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL0, STR_PTR, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL1, TMP3, 0);
 
 /* Prepare function arguments */
 OP1(SLJIT_MOV, SLJIT_R0, 0, STR_END, 0);
-GET_LOCAL_BASE(SLJIT_R1, 0, LOCALS0);
+GET_LOCAL_BASE(SLJIT_R1, 0, LOCAL0);
 OP1(SLJIT_MOV, SLJIT_R2, 0, SLJIT_IMM, offset);
 
 if (char1 == char2)
@@ -910,8 +911,8 @@ else
     }
   }
 /* Restore registers. */
-OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
-OP1(SLJIT_MOV, TMP3, 0, SLJIT_MEM1(SLJIT_SP), LOCALS1);
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
+OP1(SLJIT_MOV, TMP3, 0, SLJIT_MEM1(SLJIT_SP), LOCAL1);
 
 /* Check return value. */
 partial_quit = CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
@@ -1038,7 +1039,7 @@ SLJIT_ASSERT(diff <= IN_UCHARS(max_fast_forward_char_pair_offset()));
 SLJIT_ASSERT(compiler->scratches == 5);
 
 /* Save temporary register STR_PTR. */
-OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCALS0, STR_PTR, 0);
+OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), LOCAL0, STR_PTR, 0);
 
 /* Prepare arguments for the function call. */
 if (common->match_end_ptr == 0)
@@ -1052,7 +1053,7 @@ else
   SELECT(SLJIT_LESS, SLJIT_R0, STR_END, 0, SLJIT_R0);
   }
 
-GET_LOCAL_BASE(SLJIT_R1, 0, LOCALS0);
+GET_LOCAL_BASE(SLJIT_R1, 0, LOCAL0);
 OP1(SLJIT_MOV_S32, SLJIT_R2, 0, SLJIT_IMM, offs1);
 OP1(SLJIT_MOV_S32, SLJIT_R3, 0, SLJIT_IMM, offs2);
 ic.c.c1 = char1a;
@@ -1093,7 +1094,7 @@ if (diff == 1) {
 }
 
 /* Restore STR_PTR register. */
-OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCALS0);
+OP1(SLJIT_MOV, STR_PTR, 0, SLJIT_MEM1(SLJIT_SP), LOCAL0);
 
 /* Check return value. */
 partial_quit = CMP(SLJIT_EQUAL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 0);
@@ -2176,7 +2177,7 @@ struct sljit_label *restart;
 struct sljit_jump *jump[2];
 
 SLJIT_ASSERT(common->mode == PCRE2_JIT_COMPLETE && offs1 > offs2);
-SLJIT_ASSERT(diff <= IN_UCHARS(max_fast_forward_char_pair_offset()));
+SLJIT_ASSERT(diff <= (unsigned)IN_UCHARS(max_fast_forward_char_pair_offset()));
 
 /* Initialize. */
 if (common->match_end_ptr != 0)
diff --git a/engine/thirdparty/pcre2/src/pcre2_maketables.c b/engine/thirdparty/pcre2/src/pcre2_maketables.c
index ac8b63b8..0474cc7d 100644
--- a/engine/thirdparty/pcre2/src/pcre2_maketables.c
+++ b/engine/thirdparty/pcre2/src/pcre2_maketables.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2020 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -155,10 +155,10 @@ return yield;
 PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION
 pcre2_maketables_free(pcre2_general_context *gcontext, const uint8_t *tables)
 {
-  if (gcontext)
-    gcontext->memctl.free((void *)tables, gcontext->memctl.memory_data);
-  else
-    free((void *)tables);
+if (gcontext != NULL)
+  gcontext->memctl.free((void *)tables, gcontext->memctl.memory_data);
+else
+  free((void *)tables);
 }
 #endif
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_match.c b/engine/thirdparty/pcre2/src/pcre2_match.c
index b4a97031..5adc0348 100644
--- a/engine/thirdparty/pcre2/src/pcre2_match.c
+++ b/engine/thirdparty/pcre2/src/pcre2_match.c
@@ -155,17 +155,17 @@ changed, the code at RETURN_SWITCH below must be updated in sync.  */
 enum { RM1=1, RM2,  RM3,  RM4,  RM5,  RM6,  RM7,  RM8,  RM9,  RM10,
        RM11,  RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20,
        RM21,  RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30,
-       RM31,  RM32, RM33, RM34, RM35, RM36, RM37 };
+       RM31,  RM32, RM33, RM34, RM35, RM36, RM37, RM38, RM39 };
 
 #ifdef SUPPORT_WIDE_CHARS
-enum { RM100=100, RM101 };
+enum { RM100=100, RM101, RM102, RM103 };
 #endif
 
 #ifdef SUPPORT_UNICODE
 enum { RM200=200, RM201, RM202, RM203, RM204, RM205, RM206, RM207,
        RM208,     RM209, RM210, RM211, RM212, RM213, RM214, RM215,
        RM216,     RM217, RM218, RM219, RM220, RM221, RM222, RM223,
-       RM224,     RM225 };
+       RM224 };
 #endif
 
 /* Define short names for general fields in the current backtrack frame, which
@@ -348,6 +348,7 @@ seems unlikely.)
 Arguments:
   offset      index into the offset vector
   caseless    TRUE if caseless
+  caseopts    bitmask of REFI_FLAG_XYZ values
   F           the current backtracking frame pointer
   mb          points to match block
   lengthptr   pointer for returning the length matched
@@ -358,8 +359,8 @@ Returns:      = 0 sucessful match; number of code units matched is set
 */
 
 static int
-match_ref(PCRE2_SIZE offset, BOOL caseless, heapframe *F, match_block *mb,
-  PCRE2_SIZE *lengthptr)
+match_ref(PCRE2_SIZE offset, BOOL caseless, int caseopts, heapframe *F,
+  match_block *mb, PCRE2_SIZE *lengthptr)
 {
 PCRE2_SPTR p;
 PCRE2_SIZE length;
@@ -389,6 +390,8 @@ if (caseless)
   {
 #if defined SUPPORT_UNICODE
   BOOL utf = (mb->poptions & PCRE2_UTF) != 0;
+  BOOL caseless_restrict = (caseopts & REFI_FLAG_CASELESS_RESTRICT) != 0;
+  BOOL turkish_casing = !caseless_restrict && (caseopts & REFI_FLAG_TURKISH_CASING) != 0;
 
   if (utf || (mb->poptions & PCRE2_UCP) != 0)
     {
@@ -420,10 +423,20 @@ if (caseless)
         d = *p++;
         }
 
-      ur = GET_UCD(d);
-      if (c != d && c != (uint32_t)((int)d + ur->other_case))
+      if (turkish_casing && UCD_ANY_I(d))
+        {
+        c = UCD_FOLD_I_TURKISH(c);
+        d = UCD_FOLD_I_TURKISH(d);
+        if (c != d) return -1;  /* No match */
+        }
+      else if (c != d && c != (uint32_t)((int)d + (ur = GET_UCD(d))->other_case))
         {
         const uint32_t *pp = PRIV(ucd_caseless_sets) + ur->caseset;
+
+        /* When PCRE2_EXTRA_CASELESS_RESTRICT is set, ignore any caseless sets
+        that start with an ASCII character. */
+        if (caseless_restrict && *pp < 128) return -1;  /* No match */
+
         for (;;)
           {
           if (c < *pp) return -1;  /* No match */
@@ -528,38 +541,46 @@ For hard partial matching, we immediately return a partial match. Otherwise,
 carrying on means that a complete match on the current subject will be sought.
 A partial match is returned only if no complete match can be found. */
 
-#define CHECK_PARTIAL()\
-  if (Feptr >= mb->end_subject) \
-    { \
-    SCHECK_PARTIAL(); \
-    }
+#define CHECK_PARTIAL() \
+  do { \
+     if (Feptr >= mb->end_subject) \
+       { \
+       SCHECK_PARTIAL(); \
+       } \
+     } \
+  while (0)
 
-#define SCHECK_PARTIAL()\
-  if (mb->partial != 0 && \
-      (Feptr > mb->start_used_ptr || mb->allowemptypartial)) \
-    { \
-    mb->hitend = TRUE; \
-    if (mb->partial > 1) return PCRE2_ERROR_PARTIAL; \
-    }
+#define SCHECK_PARTIAL() \
+  do { \
+     if (mb->partial != 0 && \
+         (Feptr > mb->start_used_ptr || mb->allowemptypartial)) \
+       { \
+       mb->hitend = TRUE; \
+       if (mb->partial > 1) return PCRE2_ERROR_PARTIAL; \
+       } \
+     } \
+  while (0)
 
 
 /* These macros are used to implement backtracking. They simulate a recursive
 call to the match() function by means of a local vector of frames which
 remember the backtracking points. */
 
-#define RMATCH(ra,rb)\
-  {\
-  start_ecode = ra;\
-  Freturn_id = rb;\
-  goto MATCH_RECURSE;\
-  L_##rb:;\
-  }
+#define RMATCH(ra,rb) \
+  do { \
+     start_ecode = ra; \
+     Freturn_id = rb; \
+     goto MATCH_RECURSE; \
+     L_##rb:; \
+     } \
+  while (0)
 
-#define RRETURN(ra)\
-  {\
-  rrc = ra;\
-  goto RETURN_SWITCH;\
-  }
+#define RRETURN(ra) \
+  do { \
+     rrc = ra; \
+     goto RETURN_SWITCH; \
+     } \
+  while (0)
 
 
 
@@ -813,7 +834,10 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       offset = Flast_group_offset;
       for(;;)
         {
+        /* Corrupted heapframes?. Trigger an assert and return an error */
+        PCRE2_ASSERT(offset != PCRE2_UNSET);
         if (offset == PCRE2_UNSET) return PCRE2_ERROR_INTERNAL;
+
         N = (heapframe *)((char *)match_data->heapframes + offset);
         P = (heapframe *)((char *)N - frame_size);
         if (N->group_frame_type == (GF_CAPTURE | number)) break;
@@ -852,7 +876,10 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       offset = Flast_group_offset;
       for(;;)
         {
+        /* Corrupted heapframes?. Trigger an assert and return an error */
+        PCRE2_ASSERT(offset != PCRE2_UNSET);
         if (offset == PCRE2_UNSET) return PCRE2_ERROR_INTERNAL;
+
         N = (heapframe *)((char *)match_data->heapframes + offset);
         P = (heapframe *)((char *)N - frame_size);
         if (GF_IDMASK(N->group_frame_type) == GF_RECURSE) break;
@@ -1329,7 +1356,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
               RRETURN(MATCH_NOMATCH);
               }
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
           }
 
         else  /* Maximize */
@@ -1430,7 +1457,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           if (Lc != cc && Loc != cc) RRETURN(MATCH_NOMATCH);
           Feptr++;
           }
-        /* Control never gets here */
+        PCRE2_UNREACHABLE(); /* Control never reaches here */
         }
 
       else  /* Maximize */
@@ -1488,7 +1515,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             }
           if (Lc != UCHAR21INCTEST(Feptr)) RRETURN(MATCH_NOMATCH);
           }
-        /* Control never gets here */
+        PCRE2_UNREACHABLE(); /* Control never reaches here */
         }
       else  /* Maximize */
         {
@@ -1706,7 +1733,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             Feptr++;
             }
           }
-        /* Control never gets here */
+        PCRE2_UNREACHABLE(); /* Control never reaches here */
         }
 
       /* Maximize case */
@@ -1844,7 +1871,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if (Lc == *Feptr++) RRETURN(MATCH_NOMATCH);
             }
           }
-        /* Control never gets here */
+        PCRE2_UNREACHABLE(); /* Control never reaches here */
         }
 
       /* Maximize case */
@@ -1928,7 +1955,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 #define Lmax               F->temp_32[1]
 #define Lstart_eptr        F->temp_sptr[0]
 #define Lbyte_map_address  F->temp_sptr[1]
-#define Lbyte_map          ((unsigned char *)Lbyte_map_address)
+#define Lbyte_map          ((const unsigned char *)Lbyte_map_address)
 
     case OP_NCLASS:
     case OP_CLASS:
@@ -2071,7 +2098,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if ((Lbyte_map[fc/8] & (1u << (fc&7))) == 0) RRETURN(MATCH_NOMATCH);
             }
           }
-        /* Control never gets here */
+        PCRE2_UNREACHABLE(); /* Control never reaches here */
         }
 
       /* If maximizing, find the longest possible run, then work backwards. */
@@ -2151,7 +2178,8 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         RRETURN(MATCH_NOMATCH);
         }
       }
-    /* Control never gets here */
+
+    PCRE2_UNREACHABLE(); /* Control never reaches here */
 
 #undef Lbyte_map_address
 #undef Lbyte_map
@@ -2219,7 +2247,9 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           RRETURN(MATCH_NOMATCH);
           }
         GETCHARINCTEST(fc, Feptr);
-        if (!PRIV(xclass)(fc, Lxclass_data, utf)) RRETURN(MATCH_NOMATCH);
+        if (!PRIV(xclass)(fc, Lxclass_data,
+            (const uint8_t*)mb->start_code, utf))
+          RRETURN(MATCH_NOMATCH);
         }
 
       /* If Lmax == Lmin we can just continue with the main loop. */
@@ -2242,9 +2272,11 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             RRETURN(MATCH_NOMATCH);
             }
           GETCHARINCTEST(fc, Feptr);
-          if (!PRIV(xclass)(fc, Lxclass_data, utf)) RRETURN(MATCH_NOMATCH);
+          if (!PRIV(xclass)(fc, Lxclass_data,
+              (const uint8_t*)mb->start_code, utf))
+            RRETURN(MATCH_NOMATCH);
           }
-        /* Control never gets here */
+        PCRE2_UNREACHABLE(); /* Control never reaches here */
         }
 
       /* If maximizing, find the longest possible run, then work backwards. */
@@ -2265,7 +2297,8 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 #else
           fc = *Feptr;
 #endif
-          if (!PRIV(xclass)(fc, Lxclass_data, utf)) break;
+          if (!PRIV(xclass)(fc, Lxclass_data,
+              (const uint8_t*)mb->start_code, utf)) break;
           Feptr += len;
           }
 
@@ -2287,7 +2320,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         RRETURN(MATCH_NOMATCH);
         }
 
-      /* Control never gets here */
+      PCRE2_UNREACHABLE(); /* Control never reaches here */
       }
 #endif  /* SUPPORT_WIDE_CHARS: end of XCLASS */
 
@@ -2297,6 +2330,151 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 #undef Lmax
 
 
+    /* ===================================================================== */
+    /* Match a complex, set-based character class. This opcodes are used when
+    there is complex nesting or logical operations within the character
+    class. */
+
+#define Lstart_eptr  F->temp_sptr[0]
+#define Leclass_data F->temp_sptr[1]
+#define Leclass_len  F->temp_size
+#define Lmin         F->temp_32[0]
+#define Lmax         F->temp_32[1]
+
+#ifdef SUPPORT_WIDE_CHARS
+    case OP_ECLASS:
+      {
+      Leclass_data = Fecode + 1 + LINK_SIZE;  /* Save for matching */
+      Fecode += GET(Fecode, 1);               /* Advance past the item */
+      Leclass_len = (PCRE2_SIZE)(Fecode - Leclass_data);
+
+      switch (*Fecode)
+        {
+        case OP_CRSTAR:
+        case OP_CRMINSTAR:
+        case OP_CRPLUS:
+        case OP_CRMINPLUS:
+        case OP_CRQUERY:
+        case OP_CRMINQUERY:
+        case OP_CRPOSSTAR:
+        case OP_CRPOSPLUS:
+        case OP_CRPOSQUERY:
+        fc = *Fecode++ - OP_CRSTAR;
+        Lmin = rep_min[fc];
+        Lmax = rep_max[fc];
+        reptype = rep_typ[fc];
+        break;
+
+        case OP_CRRANGE:
+        case OP_CRMINRANGE:
+        case OP_CRPOSRANGE:
+        Lmin = GET2(Fecode, 1);
+        Lmax = GET2(Fecode, 1 + IMM2_SIZE);
+        if (Lmax == 0) Lmax = UINT32_MAX;  /* Max 0 => infinity */
+        reptype = rep_typ[*Fecode - OP_CRSTAR];
+        Fecode += 1 + 2 * IMM2_SIZE;
+        break;
+
+        default:               /* No repeat follows */
+        Lmin = Lmax = 1;
+        break;
+        }
+
+      /* First, ensure the minimum number of matches are present. */
+
+      for (i = 1; i <= Lmin; i++)
+        {
+        if (Feptr >= mb->end_subject)
+          {
+          SCHECK_PARTIAL();
+          RRETURN(MATCH_NOMATCH);
+          }
+        GETCHARINCTEST(fc, Feptr);
+        if (!PRIV(eclass)(fc, Leclass_data, Leclass_data + Leclass_len,
+                          (const uint8_t*)mb->start_code, utf))
+          RRETURN(MATCH_NOMATCH);
+        }
+
+      /* If Lmax == Lmin we can just continue with the main loop. */
+
+      if (Lmin == Lmax) continue;
+
+      /* If minimizing, keep testing the rest of the expression and advancing
+      the pointer while it matches the class. */
+
+      if (reptype == REPTYPE_MIN)
+        {
+        for (;;)
+          {
+          RMATCH(Fecode, RM102);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            RRETURN(MATCH_NOMATCH);
+            }
+          GETCHARINCTEST(fc, Feptr);
+          if (!PRIV(eclass)(fc, Leclass_data, Leclass_data + Leclass_len,
+                            (const uint8_t*)mb->start_code, utf))
+            RRETURN(MATCH_NOMATCH);
+          }
+        PCRE2_UNREACHABLE(); /* Control never reaches here */
+        }
+
+      /* If maximizing, find the longest possible run, then work backwards. */
+
+      else
+        {
+        Lstart_eptr = Feptr;
+        for (i = Lmin; i < Lmax; i++)
+          {
+          int len = 1;
+          if (Feptr >= mb->end_subject)
+            {
+            SCHECK_PARTIAL();
+            break;
+            }
+#ifdef SUPPORT_UNICODE
+          GETCHARLENTEST(fc, Feptr, len);
+#else
+          fc = *Feptr;
+#endif
+          if (!PRIV(eclass)(fc, Leclass_data, Leclass_data + Leclass_len,
+                            (const uint8_t*)mb->start_code, utf))
+            break;
+          Feptr += len;
+          }
+
+        if (reptype == REPTYPE_POS) continue;    /* No backtracking */
+
+        /* After \C in UTF mode, Lstart_eptr might be in the middle of a
+        Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't
+        go too far. */
+
+        for(;;)
+          {
+          RMATCH(Fecode, RM103);
+          if (rrc != MATCH_NOMATCH) RRETURN(rrc);
+          if (Feptr-- <= Lstart_eptr) break;  /* Tried at original position */
+#ifdef SUPPORT_UNICODE
+          if (utf) BACKCHAR(Feptr);
+#endif
+          }
+        RRETURN(MATCH_NOMATCH);
+        }
+
+      PCRE2_UNREACHABLE(); /* Control never reaches here */
+      }
+#endif  /* SUPPORT_WIDE_CHARS: end of ECLASS */
+
+#undef Lstart_eptr
+#undef Leclass_data
+#undef Leclass_len
+#undef Lmin
+#undef Lmax
+
+
     /* ===================================================================== */
     /* Match various character types when PCRE2_UCP is not set. These opcodes
     are not generated when PCRE2_UCP is set - instead appropriate property
@@ -2492,10 +2670,6 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 
       switch(Fecode[1])
         {
-        case PT_ANY:
-        if (notmatch) RRETURN(MATCH_NOMATCH);
-        break;
-
         case PT_LAMP:
         chartype = prop->chartype;
         if ((chartype == ucp_Lu ||
@@ -2606,6 +2780,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         /* This should never occur */
 
         default:
+        PCRE2_DEBUG_UNREACHABLE();
         return PCRE2_ERROR_INTERNAL;
         }
 
@@ -2728,19 +2903,6 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         BOOL notmatch = Lctype == OP_NOTPROP;
         switch(proptype)
           {
-          case PT_ANY:
-          if (notmatch) RRETURN(MATCH_NOMATCH);
-          for (i = 1; i <= Lmin; i++)
-            {
-            if (Feptr >= mb->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(fc, Feptr);
-            }
-          break;
-
           case PT_LAMP:
           for (i = 1; i <= Lmin; i++)
             {
@@ -2969,6 +3131,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           /* This should not occur */
 
           default:
+          PCRE2_DEBUG_UNREACHABLE();
           return PCRE2_ERROR_INTERNAL;
           }
         }
@@ -3244,6 +3407,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         break;
 
         default:
+        PCRE2_DEBUG_UNREACHABLE();
         return PCRE2_ERROR_INTERNAL;
         }  /* End switch(Lctype) */
 
@@ -3496,6 +3660,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         break;
 
         default:
+        PCRE2_DEBUG_UNREACHABLE();
         return PCRE2_ERROR_INTERNAL;
         }
       }
@@ -3516,27 +3681,11 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         {
         switch(proptype)
           {
-          case PT_ANY:
-          for (;;)
-            {
-            RMATCH(Fecode, RM208);
-            if (rrc != MATCH_NOMATCH) RRETURN(rrc);
-            if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
-            if (Feptr >= mb->end_subject)
-              {
-              SCHECK_PARTIAL();
-              RRETURN(MATCH_NOMATCH);
-              }
-            GETCHARINCTEST(fc, Feptr);
-            if (Lctype == OP_NOTPROP) RRETURN(MATCH_NOMATCH);
-            }
-          /* Control never gets here */
-
           case PT_LAMP:
           for (;;)
             {
             int chartype;
-            RMATCH(Fecode, RM209);
+            RMATCH(Fecode, RM208);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3551,12 +3700,12 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
                  chartype == ucp_Lt) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_GC:
           for (;;)
             {
-            RMATCH(Fecode, RM210);
+            RMATCH(Fecode, RM209);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3568,12 +3717,12 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if ((UCD_CATEGORY(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_PC:
           for (;;)
             {
-            RMATCH(Fecode, RM211);
+            RMATCH(Fecode, RM210);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3585,12 +3734,12 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if ((UCD_CHARTYPE(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_SC:
           for (;;)
             {
-            RMATCH(Fecode, RM212);
+            RMATCH(Fecode, RM211);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3602,14 +3751,14 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if ((UCD_SCRIPT(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_SCX:
           for (;;)
             {
             BOOL ok;
             const ucd_record *prop;
-            RMATCH(Fecode, RM225);
+            RMATCH(Fecode, RM224);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3624,13 +3773,13 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if (ok == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_ALNUM:
           for (;;)
             {
             int category;
-            RMATCH(Fecode, RM213);
+            RMATCH(Fecode, RM212);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3643,7 +3792,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if ((category == ucp_L || category == ucp_N) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           /* Perl space used to exclude VT, but from Perl 5.18 it is included,
           which means that Perl space and POSIX space are now identical. PCRE
@@ -3653,7 +3802,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           case PT_PXSPACE:  /* POSIX space */
           for (;;)
             {
-            RMATCH(Fecode, RM214);
+            RMATCH(Fecode, RM213);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3675,13 +3824,13 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
               break;
               }
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_WORD:
           for (;;)
             {
             int chartype, category;
-            RMATCH(Fecode, RM215);
+            RMATCH(Fecode, RM214);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3698,13 +3847,13 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
                  chartype == ucp_Pc) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_CLIST:
           for (;;)
             {
             const uint32_t *cp;
-            RMATCH(Fecode, RM216);
+            RMATCH(Fecode, RM215);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3735,12 +3884,12 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
                 }
               }
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_UCNC:
           for (;;)
             {
-            RMATCH(Fecode, RM217);
+            RMATCH(Fecode, RM216);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3754,12 +3903,12 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
                  fc >= 0xe000) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_BIDICL:
           for (;;)
             {
-            RMATCH(Fecode, RM224);
+            RMATCH(Fecode, RM223);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3771,14 +3920,14 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if ((UCD_BIDICLASS(fc) == Lpropvalue) == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           case PT_BOOL:
           for (;;)
             {
             BOOL ok;
             const ucd_record *prop;
-            RMATCH(Fecode, RM223);
+            RMATCH(Fecode, RM222);
             if (rrc != MATCH_NOMATCH) RRETURN(rrc);
             if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
             if (Feptr >= mb->end_subject)
@@ -3793,10 +3942,11 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             if (ok == (Lctype == OP_NOTPROP))
               RRETURN(MATCH_NOMATCH);
             }
-          /* Control never gets here */
+          PCRE2_UNREACHABLE(); /* Control never reaches here */
 
           /* This should never occur */
           default:
+          PCRE2_DEBUG_UNREACHABLE();
           return PCRE2_ERROR_INTERNAL;
           }
         }
@@ -3808,7 +3958,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         {
         for (;;)
           {
-          RMATCH(Fecode, RM218);
+          RMATCH(Fecode, RM217);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
           if (Feptr >= mb->end_subject)
@@ -3835,7 +3985,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         {
         for (;;)
           {
-          RMATCH(Fecode, RM219);
+          RMATCH(Fecode, RM218);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
           if (Feptr >= mb->end_subject)
@@ -3951,6 +4101,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             break;
 
             default:
+            PCRE2_DEBUG_UNREACHABLE();
             return PCRE2_ERROR_INTERNAL;
             }
           }
@@ -4095,11 +4246,13 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
             break;
 
             default:
+            PCRE2_DEBUG_UNREACHABLE();
             return PCRE2_ERROR_INTERNAL;
             }
           }
         }
-      /* Control never gets here */
+
+      PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
       }
 
     /* If maximizing, it is worth using inline code for speed, doing the type
@@ -4117,21 +4270,6 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         BOOL notmatch = Lctype == OP_NOTPROP;
         switch(proptype)
           {
-          case PT_ANY:
-          for (i = Lmin; i < Lmax; i++)
-            {
-            int len = 1;
-            if (Feptr >= mb->end_subject)
-              {
-              SCHECK_PARTIAL();
-              break;
-              }
-            GETCHARLENTEST(fc, Feptr, len);
-            if (notmatch) break;
-            Feptr+= len;
-            }
-          break;
-
           case PT_LAMP:
           for (i = Lmin; i < Lmax; i++)
             {
@@ -4377,6 +4515,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           break;
 
           default:
+          PCRE2_DEBUG_UNREACHABLE();
           return PCRE2_ERROR_INTERNAL;
           }
 
@@ -4391,7 +4530,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         for(;;)
           {
           if (Feptr <= Lstart_eptr) break;
-          RMATCH(Fecode, RM222);
+          RMATCH(Fecode, RM221);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           Feptr--;
           if (utf) BACKCHAR(Feptr);
@@ -4434,7 +4573,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           PCRE2_SPTR fptr;
 
           if (Feptr <= Lstart_eptr) break;   /* At start of char run */
-          RMATCH(Fecode, RM220);
+          RMATCH(Fecode, RM219);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
 
           /* Backtracking over an extended grapheme cluster involves inspecting
@@ -4695,6 +4834,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           break;
 
           default:
+          PCRE2_DEBUG_UNREACHABLE();
           return PCRE2_ERROR_INTERNAL;
           }
 
@@ -4707,7 +4847,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         for(;;)
           {
           if (Feptr <= Lstart_eptr) break;
-          RMATCH(Fecode, RM221);
+          RMATCH(Fecode, RM220);
           if (rrc != MATCH_NOMATCH) RRETURN(rrc);
           Feptr--;
           BACKCHAR(Feptr);
@@ -4952,6 +5092,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           break;
 
           default:
+          PCRE2_DEBUG_UNREACHABLE();
           return PCRE2_ERROR_INTERNAL;
           }
 
@@ -4988,16 +5129,18 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 #define Lmin      F->temp_32[0]
 #define Lmax      F->temp_32[1]
 #define Lcaseless F->temp_32[2]
+#define Lcaseopts F->temp_32[3]
 #define Lstart    F->temp_sptr[0]
 #define Loffset   F->temp_size
 
     case OP_DNREF:
     case OP_DNREFI:
     Lcaseless = (Fop == OP_DNREFI);
+    Lcaseopts = (Fop == OP_DNREFI)? Fecode[1 + 2*IMM2_SIZE] : 0;
       {
       int count = GET2(Fecode, 1+IMM2_SIZE);
       PCRE2_SPTR slot = mb->name_table + GET2(Fecode, 1) * mb->name_entry_size;
-      Fecode += 1 + 2*IMM2_SIZE;
+      Fecode += 1 + 2*IMM2_SIZE + (Fop == OP_DNREFI? 1 : 0);
 
       while (count-- > 0)
         {
@@ -5011,8 +5154,9 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
     case OP_REF:
     case OP_REFI:
     Lcaseless = (Fop == OP_REFI);
+    Lcaseopts = (Fop == OP_REFI)? Fecode[1 + IMM2_SIZE] : 0;
     Loffset = (GET2(Fecode, 1) << 1) - 2;
-    Fecode += 1 + IMM2_SIZE;
+    Fecode += 1 + IMM2_SIZE + (Fop == OP_REFI? 1 : 0);
 
     /* Set up for repetition, or handle the non-repeated case. The maximum and
     minimum must be in the heap frame, but as they are short-term values, we
@@ -5044,7 +5188,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 
       default:                  /* No repeat follows */
         {
-        rrc = match_ref(Loffset, Lcaseless, F, mb, &length);
+        rrc = match_ref(Loffset, Lcaseless, Lcaseopts, F, mb, &length);
         if (rrc != 0)
           {
           if (rrc > 0) Feptr = mb->end_subject;   /* Partial match */
@@ -5078,7 +5222,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
     for (i = 1; i <= Lmin; i++)
       {
       PCRE2_SIZE slength;
-      rrc = match_ref(Loffset, Lcaseless, F, mb, &slength);
+      rrc = match_ref(Loffset, Lcaseless, Lcaseopts, F, mb, &slength);
       if (rrc != 0)
         {
         if (rrc > 0) Feptr = mb->end_subject;   /* Partial match */
@@ -5102,7 +5246,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         RMATCH(Fecode, RM20);
         if (rrc != MATCH_NOMATCH) RRETURN(rrc);
         if (Lmin++ >= Lmax) RRETURN(MATCH_NOMATCH);
-        rrc = match_ref(Loffset, Lcaseless, F, mb, &slength);
+        rrc = match_ref(Loffset, Lcaseless, Lcaseopts, F, mb, &slength);
         if (rrc != 0)
           {
           if (rrc > 0) Feptr = mb->end_subject;   /* Partial match */
@@ -5111,7 +5255,8 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           }
         Feptr += slength;
         }
-      /* Control never gets here */
+
+      PCRE2_UNREACHABLE(); /* Control never reaches here */
       }
 
     /* If maximizing, find the longest string and work backwards, as long as
@@ -5126,7 +5271,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       for (i = Lmin; i < Lmax; i++)
         {
         PCRE2_SIZE slength;
-        rrc = match_ref(Loffset, Lcaseless, F, mb, &slength);
+        rrc = match_ref(Loffset, Lcaseless, Lcaseopts, F, mb, &slength);
         if (rrc != 0)
           {
           /* Can't use CHECK_PARTIAL because we don't want to update Feptr in
@@ -5177,7 +5322,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
           for (i = Lmin; i < Lmax; i++)
             {
             PCRE2_SIZE slength;
-            (void)match_ref(Loffset, Lcaseless, F, mb, &slength);
+            (void)match_ref(Loffset, Lcaseless, Lcaseopts, F, mb, &slength);
             Feptr += slength;
             }
           }
@@ -5185,7 +5330,8 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 
       RRETURN(MATCH_NOMATCH);
       }
-    /* Control never gets here */
+
+    PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
 
 #undef Lcaseless
 #undef Lmin
@@ -5409,7 +5555,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       Fecode += GET(Fecode, 1);
       if (*Fecode != OP_ALT) RRETURN(MATCH_NOMATCH);
       }
-    /* Control never reaches here. */
+    PCRE2_UNREACHABLE(); /* Control never reaches here */
 
 #undef Lframe_type
 
@@ -5494,7 +5640,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       Lstart_branch = next_ecode;
       if (*Lstart_branch != OP_ALT) RRETURN(MATCH_NOMATCH);
       }
-    /* Control never reaches here. */
+    PCRE2_UNREACHABLE(); /* Control never reaches here */
 
 #undef Lframe_type
 #undef Lstart_branch
@@ -5585,6 +5731,132 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 
 #undef Lframe_type
 
+    /* ===================================================================== */
+    /* Handle scan substring operation. */
+
+#define Lframe_type          F->temp_32[0]
+#define Lextra_size          F->temp_32[1]
+#define Lsaved_moptions      F->temp_32[2]
+#define Lsaved_end_subject   F->temp_sptr[0]
+#define Lsaved_eptr          F->temp_sptr[1]
+#define Ltrue_end_extra      F->temp_size
+
+    case OP_ASSERT_SCS:
+      {
+      PCRE2_SPTR ecode = Fecode + 1 + LINK_SIZE;
+      uint32_t extra_size = 0;
+      int count;
+      PCRE2_SPTR slot;
+
+      /* Disable compiler warning. */
+      offset = 0;
+      (void)offset;
+
+      for (;;)
+        {
+        if (*ecode == OP_CREF)
+          {
+          extra_size += 1+IMM2_SIZE;
+          offset = (GET2(ecode, 1) << 1) - 2;
+          ecode += 1+IMM2_SIZE;
+          if (offset < Foffset_top && Fovector[offset] != PCRE2_UNSET)
+            goto SCS_OFFSET_FOUND;
+          continue;
+          }
+
+        if (*ecode != OP_DNCREF) RRETURN(MATCH_NOMATCH);
+
+        count = GET2(ecode, 1 + IMM2_SIZE);
+        slot = mb->name_table + GET2(ecode, 1) * mb->name_entry_size;
+        extra_size += 1+2*IMM2_SIZE;
+        ecode += 1+2*IMM2_SIZE;
+
+        while (count > 0)
+          {
+          offset = (GET2(slot, 0) << 1) - 2;
+          if (offset < Foffset_top && Fovector[offset] != PCRE2_UNSET)
+            goto SCS_OFFSET_FOUND;
+          slot += mb->name_entry_size;
+          count--;
+          }
+        }
+
+      SCS_OFFSET_FOUND:
+
+      /* Skip remaining options. */
+      for (;;)
+        {
+        if (*ecode == OP_CREF)
+          {
+          extra_size += 1+IMM2_SIZE;
+          ecode += 1+IMM2_SIZE;
+          }
+        else if (*ecode == OP_DNCREF)
+          {
+          extra_size += 1+2*IMM2_SIZE;
+          ecode += 1+2*IMM2_SIZE;
+          }
+        else break;
+        }
+
+      Lextra_size = extra_size;
+      }
+
+    Lsaved_end_subject = mb->end_subject;
+    Ltrue_end_extra = mb->true_end_subject - mb->end_subject;
+    Lsaved_eptr = Feptr;
+    Lsaved_moptions = mb->moptions;
+
+    Feptr = mb->start_subject + Fovector[offset];
+    mb->true_end_subject = mb->end_subject =
+      mb->start_subject + Fovector[offset + 1];
+    mb->moptions &= ~PCRE2_NOTEOL;
+
+    Lframe_type = GF_NOCAPTURE | Fop;
+    for (;;)
+      {
+      group_frame_type = Lframe_type;
+      RMATCH(Fecode + 1 + LINK_SIZE + Lextra_size, RM38);
+      if (rrc == MATCH_ACCEPT)
+        {
+        memcpy(Fovector,
+              (char *)assert_accept_frame + offsetof(heapframe, ovector),
+              assert_accept_frame->offset_top * sizeof(PCRE2_SIZE));
+        Foffset_top = assert_accept_frame->offset_top;
+        Fmark = assert_accept_frame->mark;
+        break;
+        }
+
+      if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN)
+        {
+        mb->end_subject = Lsaved_end_subject;
+        mb->true_end_subject = mb->end_subject + Ltrue_end_extra;
+        mb->moptions = Lsaved_moptions;
+        RRETURN(rrc);
+        }
+
+      Fecode += GET(Fecode, 1);
+      if (*Fecode != OP_ALT)
+        {
+        mb->end_subject = Lsaved_end_subject;
+        mb->true_end_subject = mb->end_subject + Ltrue_end_extra;
+        mb->moptions = Lsaved_moptions;
+        RRETURN(MATCH_NOMATCH);
+        }
+      Lextra_size = 0;
+      }
+
+    do Fecode += GET(Fecode, 1); while (*Fecode == OP_ALT);
+    Fecode += 1 + LINK_SIZE;
+    Feptr = Lsaved_eptr;
+    break;
+
+#undef Lframe_type
+#undef Lextra_size
+#undef Lsaved_end_subject
+#undef Lsaved_eptr
+#undef Ltrue_end_extra
+#undef Lsave_moptions
 
     /* ===================================================================== */
     /* The callout item calls an external function, if one is provided, passing
@@ -5795,8 +6067,11 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 #ifdef SUPPORT_UNICODE
     if (utf)
       {
-      while (number-- > 0)
+      /* We used to do a simpler `while (number-- > 0)` but that triggers
+      clang's unsigned integer overflow sanitizer. */
+      while (number > 0)
         {
+        --number;
         if (Feptr <= mb->check_subject) RRETURN(MATCH_NOMATCH);
         Feptr--;
         BACKCHAR(Feptr);
@@ -5862,14 +6137,14 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 
       {
       ptrdiff_t diff = Feptr - mb->start_subject;
-      uint32_t available = (diff > 65535)? 65535 : ((diff > 0)? diff : 0);
+      uint32_t available = (diff > 65535)? 65535 : ((diff > 0)? (int)diff : 0);
       if (Lmin > available) RRETURN(MATCH_NOMATCH);
       if (Lmax > available) Lmax = available;
       Feptr -= Lmax;
       }
 
     /* Now try matching, moving forward one character on failure, until we
-    reach the mimimum back length. */
+    reach the minimum back length. */
 
     for (;;)
       {
@@ -5881,7 +6156,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       if (utf) { FORWARDCHARTEST(Feptr, mb->end_subject); }
 #endif
       }
-    /* Control never reaches here */
+    PCRE2_UNREACHABLE(); /* Control never reaches here */
 
 #undef Lmin
 #undef Lmax
@@ -5931,14 +6206,20 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
         (char *)P->eptr - (char *)mb->start_subject);
 #endif
 
-      /* If we are at the end of an assertion that is a condition, return a
-      match, discarding any intermediate backtracking points. Copy back the
-      mark setting and the captures into the frame before N so that they are
-      set on return. Doing this for all assertions, both positive and negative,
-      seems to match what Perl does. */
+      /* If we are at the end of an assertion that is a condition, first check
+      to see if we are at the end of a variable-length branch in a lookbehind.
+      If this is the case and we have not landed on the current character,
+      return no match. Compare code below for non-condition lookbehinds. In
+      other cases, return a match, discarding any intermediate backtracking
+      points. Copy back the mark setting and the captures into the frame before
+      N so that they are set on return. Doing this for all assertions, both
+      positive and negative, seems to match what Perl does. */
 
       if (GF_IDMASK(N->group_frame_type) == GF_CONDASSERT)
         {
+        if ((*bracode == OP_ASSERTBACK || *bracode == OP_ASSERTBACK_NOT) &&
+            branch_start[1 + LINK_SIZE] == OP_VREVERSE && Feptr != P->eptr)
+          RRETURN(MATCH_NOMATCH);
         memcpy((char *)P + offsetof(heapframe, ovector), Fovector,
           Foffset_top * sizeof(PCRE2_SIZE));
         P->offset_top = Foffset_top;
@@ -5967,7 +6248,11 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       /* It is the end of whole-pattern recursion. */
 
       offset = Flast_group_offset;
+
+      /* Corrupted heapframes?. Trigger an assert and return an error */
+      PCRE2_ASSERT(offset != PCRE2_UNSET);
       if (offset == PCRE2_UNSET) return PCRE2_ERROR_INTERNAL;
+
       N = (heapframe *)((char *)match_data->heapframes + offset);
       P = (heapframe *)((char *)N - frame_size);
       Flast_group_offset = P->last_group_offset;
@@ -6042,6 +6327,23 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
       case OP_ASSERT_NOT:
       RRETURN(MATCH_MATCH);
 
+      /* A scan substring group must preserve the current end_subject,
+      and restore it before the backtracking is performed into its sub
+      pattern. */
+
+      case OP_ASSERT_SCS:
+      F->temp_sptr[0] = mb->end_subject;
+      mb->end_subject = P->temp_sptr[0];
+      mb->true_end_subject = mb->end_subject + P->temp_size;
+      Feptr = P->temp_sptr[1];
+
+      RMATCH(Fecode + 1 + LINK_SIZE, RM39);
+
+      mb->end_subject = F->temp_sptr[0];
+      mb->true_end_subject = mb->end_subject;
+      RRETURN(rrc);
+      break;
+
       /* At the end of a script run, apply the script-checking rules. This code
       will never by exercised if Unicode support it not compiled, because in
       that environment script runs cause an error at compile time. */
@@ -6165,8 +6467,8 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
 
     case OP_EODN:
     ASSERT_NL_OR_EOS:
-    if (Feptr < mb->end_subject &&
-        (!IS_NEWLINE(Feptr) || Feptr != mb->end_subject - mb->nllen))
+    if (Feptr < mb->true_end_subject &&
+        (!IS_NEWLINE(Feptr) || Feptr != mb->true_end_subject - mb->nllen))
       {
       if (mb->partial != 0 &&
           Feptr + 1 >= mb->end_subject &&
@@ -6447,6 +6749,7 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
     something seriously wrong in the code above or the OP_xxx definitions. */
 
     default:
+    PCRE2_DEBUG_UNREACHABLE();
     return PCRE2_ERROR_INTERNAL;
     }
 
@@ -6455,8 +6758,8 @@ fprintf(stderr, "++ %2ld op=%3d %s\n", Fecode - mb->start_code, *Fecode,
   loop. */
 
   }  /* End of main loop */
-/* Control never reaches here */
 
+PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
 
 /* ========================================================================= */
 /* The RRETURN() macro jumps here. The number that is saved in Freturn_id
@@ -6482,20 +6785,21 @@ switch (Freturn_id)
   LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(16)
   LBL(17) LBL(18) LBL(19) LBL(20) LBL(21) LBL(22) LBL(23) LBL(24)
   LBL(25) LBL(26) LBL(27) LBL(28) LBL(29) LBL(30) LBL(31) LBL(32)
-  LBL(33) LBL(34) LBL(35) LBL(36) LBL(37)
+  LBL(33) LBL(34) LBL(35) LBL(36) LBL(37) LBL(38) LBL(39)
 
 #ifdef SUPPORT_WIDE_CHARS
-  LBL(100) LBL(101)
+  LBL(100) LBL(101) LBL(102) LBL(103)
 #endif
 
 #ifdef SUPPORT_UNICODE
   LBL(200) LBL(201) LBL(202) LBL(203) LBL(204) LBL(205) LBL(206)
   LBL(207) LBL(208) LBL(209) LBL(210) LBL(211) LBL(212) LBL(213)
   LBL(214) LBL(215) LBL(216) LBL(217) LBL(218) LBL(219) LBL(220)
-  LBL(221) LBL(222) LBL(223) LBL(224) LBL(225)
+  LBL(221) LBL(222) LBL(223) LBL(224)
 #endif
 
   default:
+  PCRE2_DEBUG_UNREACHABLE();
   return PCRE2_ERROR_INTERNAL;
   }
 #undef LBL
@@ -6621,7 +6925,7 @@ if ((re->flags & PCRE2_MODE_MASK) != PCRE2_CODE_UNIT_WIDTH/8)
 /* PCRE2_NOTEMPTY and PCRE2_NOTEMPTY_ATSTART are match-time flags in the
 options variable for this function. Users of PCRE2 who are not calling the
 function directly would like to have a way of setting these flags, in the same
-way that they can set pcre2_compile() flags like PCRE2_NO_AUTOPOSSESS with
+way that they can set pcre2_compile() flags like PCRE2_NO_AUTO_POSSESS with
 constructions like (*NO_AUTOPOSSESS). To enable this, (*NOTEMPTY) and
 (*NOTEMPTY_ATSTART) set bits in the pattern's "flag" function which we now
 transfer to the options for this function. The bits are guaranteed to be
@@ -6703,9 +7007,6 @@ if (use_jit)
 #ifdef SUPPORT_UNICODE
   if (utf && (options & PCRE2_NO_UTF_CHECK) == 0 && !allow_invalid)
     {
-#if PCRE2_CODE_UNIT_WIDTH != 32
-    unsigned int i;
-#endif
 
     /* For 8-bit and 16-bit UTF, check that the first code unit is a valid
     character start. */
@@ -6726,7 +7027,7 @@ if (use_jit)
     start of matching. */
 
 #if PCRE2_CODE_UNIT_WIDTH != 32
-    for (i = re->max_lookbehind; i > 0 && start_match > subject; i--)
+    for (unsigned int i = re->max_lookbehind; i > 0 && start_match > subject; i--)
       {
       start_match--;
       while (start_match > subject &&
@@ -6973,10 +7274,10 @@ mb->mark = mb->nomatch_mark = NULL;          /* In case never set */
 /* The name table is needed for finding all the numbers associated with a
 given name, for condition testing. The code follows the name table. */
 
-mb->name_table = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code));
+mb->name_table = (PCRE2_SPTR)((const uint8_t *)re + sizeof(pcre2_real_code));
 mb->name_count = re->name_count;
 mb->name_entry_size = re->name_entry_size;
-mb->start_code = mb->name_table + re->name_count * re->name_entry_size;
+mb->start_code = (PCRE2_SPTR)((const uint8_t *)re + re->code_start);
 
 /* Process the \R and newline settings. */
 
@@ -7013,7 +7314,9 @@ switch(re->newline_convention)
   mb->nltype = NLTYPE_ANYCRLF;
   break;
 
-  default: return PCRE2_ERROR_INTERNAL;
+  default:
+  PCRE2_DEBUG_UNREACHABLE();
+  return PCRE2_ERROR_INTERNAL;
   }
 
 /* The backtracking frames have fixed data at the front, and a PCRE2_SIZE
@@ -7159,7 +7462,7 @@ for(;;)
   However, there is an option (settable at compile time) that disables these,
   for testing and for ensuring that all callouts do actually occur. */
 
-  if ((re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0)
+  if ((re->optimization_flags & PCRE2_OPTIM_START_OPTIMIZE) != 0)
     {
     /* If firstline is TRUE, the start of the match is constrained to the first
     line of a multiline string. That is, the match must be before or at the
diff --git a/engine/thirdparty/pcre2/src/pcre2_match_data.c b/engine/thirdparty/pcre2/src/pcre2_match_data.c
index 757dab9d..100e7c9d 100644
--- a/engine/thirdparty/pcre2/src/pcre2_match_data.c
+++ b/engine/thirdparty/pcre2/src/pcre2_match_data.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2022 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -77,14 +77,16 @@ return yield;
 *  Create a match data block using pattern data  *
 *************************************************/
 
-/* If no context is supplied, use the memory allocator from the code. */
+/* If no context is supplied, use the memory allocator from the code. This code
+assumes that a general context contains nothing other than a memory allocator.
+If that ever changes, this code will need fixing. */
 
 PCRE2_EXP_DEFN pcre2_match_data * PCRE2_CALL_CONVENTION
 pcre2_match_data_create_from_pattern(const pcre2_code *code,
   pcre2_general_context *gcontext)
 {
 if (gcontext == NULL) gcontext = (pcre2_general_context *)code;
-return pcre2_match_data_create(((pcre2_real_code *)code)->top_bracket + 1,
+return pcre2_match_data_create(((const pcre2_real_code *)code)->top_bracket + 1,
   gcontext);
 }
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_ord2utf.c b/engine/thirdparty/pcre2/src/pcre2_ord2utf.c
index 14037309..a1e9e088 100644
--- a/engine/thirdparty/pcre2/src/pcre2_ord2utf.c
+++ b/engine/thirdparty/pcre2/src/pcre2_ord2utf.c
@@ -117,4 +117,4 @@ return 1;
 }
 #endif  /* SUPPORT_UNICODE */
 
-/* End of pcre_ord2utf.c */
+/* End of pcre2_ord2utf.c */
diff --git a/engine/thirdparty/pcre2/src/pcre2_pattern_info.c b/engine/thirdparty/pcre2/src/pcre2_pattern_info.c
index a29f5eff..fe4d3c66 100644
--- a/engine/thirdparty/pcre2/src/pcre2_pattern_info.c
+++ b/engine/thirdparty/pcre2/src/pcre2_pattern_info.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2018 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@ Returns:        0 when data returned
 PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
 pcre2_pattern_info(const pcre2_code *code, uint32_t what, void *where)
 {
-const pcre2_real_code *re = (pcre2_real_code *)code;
+const pcre2_real_code *re = (const pcre2_real_code *)code;
 
 if (where == NULL)   /* Requests field length */
   {
@@ -230,7 +230,8 @@ switch(what)
   break;
 
   case PCRE2_INFO_NAMETABLE:
-  *((PCRE2_SPTR *)where) = (PCRE2_SPTR)((char *)re + sizeof(pcre2_real_code));
+  *((PCRE2_SPTR *)where) = (PCRE2_SPTR)((const char *)re +
+    sizeof(pcre2_real_code));
   break;
 
   case PCRE2_INFO_NEWLINE:
@@ -268,7 +269,7 @@ PCRE2_EXP_DEFN int PCRE2_CALL_CONVENTION
 pcre2_callout_enumerate(const pcre2_code *code,
   int (*callback)(pcre2_callout_enumerate_block *, void *), void *callout_data)
 {
-pcre2_real_code *re = (pcre2_real_code *)code;
+const pcre2_real_code *re = (const pcre2_real_code *)code;
 pcre2_callout_enumerate_block cb;
 PCRE2_SPTR cc;
 #ifdef SUPPORT_UNICODE
@@ -291,7 +292,7 @@ if (re->magic_number != MAGIC_NUMBER) return PCRE2_ERROR_BADMAGIC;
 if ((re->flags & (PCRE2_CODE_UNIT_WIDTH/8)) == 0) return PCRE2_ERROR_BADMODE;
 
 cb.version = 0;
-cc = (PCRE2_SPTR)((uint8_t *)re + sizeof(pcre2_real_code))
+cc = (PCRE2_SPTR)((const uint8_t *)re + sizeof(pcre2_real_code))
      + re->name_count * re->name_entry_size;
 
 while (TRUE)
@@ -383,8 +384,9 @@ while (TRUE)
 #endif
     break;
 
-#if defined SUPPORT_UNICODE || PCRE2_CODE_UNIT_WIDTH != 8
+#ifdef SUPPORT_WIDE_CHARS
     case OP_XCLASS:
+    case OP_ECLASS:
     cc += GET(cc, 1);
     break;
 #endif
diff --git a/engine/thirdparty/pcre2/src/pcre2_serialize.c b/engine/thirdparty/pcre2/src/pcre2_serialize.c
index ba17a26d..a10e3020 100644
--- a/engine/thirdparty/pcre2/src/pcre2_serialize.c
+++ b/engine/thirdparty/pcre2/src/pcre2_serialize.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2020 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -127,25 +127,25 @@ dst_bytes += TABLES_LENGTH;
 for (i = 0; i < number_of_codes; i++)
   {
   re = (const pcre2_real_code *)(codes[i]);
-  (void)memcpy(dst_bytes, (char *)re, re->blocksize);
-  
-  /* Certain fields in the compiled code block are re-set during 
-  deserialization. In order to ensure that the serialized data stream is always 
-  the same for the same pattern, set them to zero here. We can't assume the 
-  copy of the pattern is correctly aligned for accessing the fields as part of 
+  (void)memcpy(dst_bytes, (const char *)re, re->blocksize);
+
+  /* Certain fields in the compiled code block are re-set during
+  deserialization. In order to ensure that the serialized data stream is always
+  the same for the same pattern, set them to zero here. We can't assume the
+  copy of the pattern is correctly aligned for accessing the fields as part of
   a structure. Note the use of sizeof(void *) in the second of these, to
-  specify the size of a pointer. If sizeof(uint8_t *) is used (tables is a 
-  pointer to uint8_t), gcc gives a warning because the first argument is also a 
-  pointer to uint8_t. Casting the first argument to (void *) can stop this, but 
+  specify the size of a pointer. If sizeof(uint8_t *) is used (tables is a
+  pointer to uint8_t), gcc gives a warning because the first argument is also a
+  pointer to uint8_t. Casting the first argument to (void *) can stop this, but
   it didn't stop Coverity giving the same complaint. */
-  
-  (void)memset(dst_bytes + offsetof(pcre2_real_code, memctl), 0, 
+
+  (void)memset(dst_bytes + offsetof(pcre2_real_code, memctl), 0,
     sizeof(pcre2_memctl));
-  (void)memset(dst_bytes + offsetof(pcre2_real_code, tables), 0, 
+  (void)memset(dst_bytes + offsetof(pcre2_real_code, tables), 0,
     sizeof(void *));
   (void)memset(dst_bytes + offsetof(pcre2_real_code, executable_jit), 0,
-    sizeof(void *));        
- 
+    sizeof(void *));
+
   dst_bytes += re->blocksize;
   }
 
@@ -232,10 +232,10 @@ for (i = 0; i < number_of_codes; i++)
   if (dst_re->magic_number != MAGIC_NUMBER ||
       dst_re->name_entry_size > MAX_NAME_SIZE + IMM2_SIZE + 1 ||
       dst_re->name_count > MAX_NAME_COUNT)
-    {   
-    memctl->free(dst_re, memctl->memory_data); 
+    {
+    memctl->free(dst_re, memctl->memory_data);
     return PCRE2_ERROR_BADSERIALIZEDDATA;
-    } 
+    }
 
   /* At the moment only one table is supported. */
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_study.c b/engine/thirdparty/pcre2/src/pcre2_study.c
index 792e696d..85764cea 100644
--- a/engine/thirdparty/pcre2/src/pcre2_study.c
+++ b/engine/thirdparty/pcre2/src/pcre2_study.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -114,7 +114,7 @@ uint32_t once_fudge = 0;
 BOOL had_recurse = FALSE;
 BOOL dupcapused = (re->flags & PCRE2_DUPCAPUSED) != 0;
 PCRE2_SPTR nextbranch = code + GET(code, 1);
-PCRE2_UCHAR *cc = (PCRE2_UCHAR *)code + 1 + LINK_SIZE;
+PCRE2_SPTR cc = code + 1 + LINK_SIZE;
 recurse_check this_recurse;
 
 /* If this is a "could be empty" group, its minimum length is 0. */
@@ -136,12 +136,13 @@ passes 16-bits, reset to that value and skip the rest of the branch. */
 for (;;)
   {
   int d, min, recno;
-  PCRE2_UCHAR op, *cs, *ce;
+  PCRE2_UCHAR op;
+  PCRE2_SPTR cs, ce;
 
   if (branchlength >= UINT16_MAX)
     {
     branchlength = UINT16_MAX;
-    cc = (PCRE2_UCHAR *)nextbranch;
+    cc = nextbranch;
     }
 
   op = *cc;
@@ -249,6 +250,7 @@ for (;;)
     case OP_ASSERTBACK:
     case OP_ASSERTBACK_NOT:
     case OP_ASSERT_NA:
+    case OP_ASSERT_SCS:
     case OP_ASSERTBACK_NA:
     do cc += GET(cc, 1); while (*cc == OP_ALT);
     /* Fall through */
@@ -417,15 +419,14 @@ for (;;)
     case OP_NCLASS:
 #ifdef SUPPORT_WIDE_CHARS
     case OP_XCLASS:
+    case OP_ECLASS:
     /* The original code caused an unsigned overflow in 64 bit systems,
     so now we use a conditional statement. */
-    if (op == OP_XCLASS)
+    if (op == OP_XCLASS || op == OP_ECLASS)
       cc += GET(cc, 1);
     else
-      cc += PRIV(OP_lengths)[OP_CLASS];
-#else
-    cc += PRIV(OP_lengths)[OP_CLASS];
 #endif
+      cc += PRIV(OP_lengths)[OP_CLASS];
 
     switch (*cc)
       {
@@ -479,8 +480,8 @@ for (;;)
     if (!dupcapused && (re->overall_options & PCRE2_MATCH_UNSET_BACKREF) == 0)
       {
       int count = GET2(cc, 1+IMM2_SIZE);
-      PCRE2_UCHAR *slot =
-        (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) +
+      PCRE2_SPTR slot =
+        (PCRE2_SPTR)((const uint8_t *)re + sizeof(pcre2_real_code)) +
           GET2(cc, 1) * re->name_entry_size;
 
       d = INT_MAX;
@@ -496,13 +497,12 @@ for (;;)
           dd = backref_cache[recno];
         else
           {
-          ce = cs = (PCRE2_UCHAR *)PRIV(find_bracket)(startcode, utf, recno);
+          ce = cs = PRIV(find_bracket)(startcode, utf, recno);
           if (cs == NULL) return -2;
           do ce += GET(ce, 1); while (*ce == OP_ALT);
 
           dd = 0;
-          if (!dupcapused ||
-              (PCRE2_UCHAR *)PRIV(find_bracket)(ce, utf, recno) == NULL)
+          if (!dupcapused || PRIV(find_bracket)(ce, utf, recno) == NULL)
             {
             if (cc > cs && cc < ce)    /* Simple recursion */
               {
@@ -539,7 +539,7 @@ for (;;)
         }
       }
     else d = 0;
-    cc += 1 + 2*IMM2_SIZE;
+    cc += PRIV(OP_lengths)[*cc];
     goto REPEAT_BACK_REFERENCE;
 
     /* Single back reference by number. References by name are converted to by
@@ -557,12 +557,11 @@ for (;;)
 
       if ((re->overall_options & PCRE2_MATCH_UNSET_BACKREF) == 0)
         {
-        ce = cs = (PCRE2_UCHAR *)PRIV(find_bracket)(startcode, utf, recno);
+        ce = cs = PRIV(find_bracket)(startcode, utf, recno);
         if (cs == NULL) return -2;
         do ce += GET(ce, 1); while (*ce == OP_ALT);
 
-        if (!dupcapused ||
-            (PCRE2_UCHAR *)PRIV(find_bracket)(ce, utf, recno) == NULL)
+        if (!dupcapused || PRIV(find_bracket)(ce, utf, recno) == NULL)
           {
           if (cc > cs && cc < ce)    /* Simple recursion */
             {
@@ -593,7 +592,7 @@ for (;;)
       backref_cache[0] = recno;
       }
 
-    cc += 1 + IMM2_SIZE;
+    cc += PRIV(OP_lengths)[*cc];
 
     /* Handle repeated back references */
 
@@ -643,7 +642,7 @@ for (;;)
     pattern contains multiple subpatterns with the same number. */
 
     case OP_RECURSE:
-    cs = ce = (PCRE2_UCHAR *)startcode + GET(cc, 1);
+    cs = ce = startcode + GET(cc, 1);
     recno = GET2(cs, 1+LINK_SIZE);
     if (recno == prev_recurse_recno)
       {
@@ -755,10 +754,13 @@ for (;;)
     new ones get added they are properly considered. */
 
     default:
+    PCRE2_DEBUG_UNREACHABLE();
     return -3;
     }
   }
-/* Control never gets here */
+
+PCRE2_DEBUG_UNREACHABLE(); /* Control should never reach here */
+return -3;                 /* Avoid compiler warnings */
 }
 
 
@@ -919,6 +921,138 @@ if (table_limit != 32) for (c = 24; c < 32; c++) re->start_bitmap[c] = 0xff;
 
 
 
+#if defined SUPPORT_UNICODE && PCRE2_CODE_UNIT_WIDTH == 8
+/*************************************************
+*     Set starting bits for a character list.    *
+*************************************************/
+
+/* This function sets starting bits for a character list. It enumerates
+all characters and character ranges in the character list, and sets
+the starting bits accordingly.
+
+Arguments:
+  code           pointer to the code
+  start_bitmap   pointer to the starting bitmap
+
+Returns:         nothing
+*/
+static void
+study_char_list(PCRE2_SPTR code, uint8_t *start_bitmap,
+  const uint8_t *char_lists_end)
+{
+uint32_t type, list_ind;
+uint32_t char_list_add = XCL_CHAR_LIST_LOW_16_ADD;
+uint32_t range_start = ~(uint32_t)0, range_end = 0;
+const uint8_t *next_char;
+PCRE2_UCHAR start_buffer[6], end_buffer[6];
+PCRE2_UCHAR start, end;
+
+/* Only needed in 8-bit mode at the moment. */
+type = (uint32_t)(code[0] << 8) | code[1];
+code += 2;
+
+/* Align characters. */
+next_char = char_lists_end - (GET(code, 0) << 1);
+type &= XCL_TYPE_MASK;
+list_ind = 0;
+
+if ((type & XCL_BEGIN_WITH_RANGE) != 0)
+  range_start = XCL_CHAR_LIST_LOW_16_START;
+
+while (type > 0)
+  {
+  uint32_t item_count = type & XCL_ITEM_COUNT_MASK;
+
+  if (item_count == XCL_ITEM_COUNT_MASK)
+    {
+    if (list_ind <= 1)
+      {
+      item_count = *(const uint16_t*)next_char;
+      next_char += 2;
+      }
+    else
+      {
+      item_count = *(const uint32_t*)next_char;
+      next_char += 4;
+      }
+    }
+
+  while (item_count > 0)
+    {
+    if (list_ind <= 1)
+      {
+      range_end = *(const uint16_t*)next_char;
+      next_char += 2;
+      }
+    else
+      {
+      range_end = *(const uint32_t*)next_char;
+      next_char += 4;
+      }
+
+    if ((range_end & XCL_CHAR_END) != 0)
+      {
+      range_end = char_list_add + (range_end >> XCL_CHAR_SHIFT);
+
+      PRIV(ord2utf)(range_end, end_buffer);
+      end = end_buffer[0];
+
+      if (range_start < range_end)
+        {
+        PRIV(ord2utf)(range_start, start_buffer);
+        for (start = start_buffer[0]; start <= end; start++)
+          start_bitmap[start / 8] |= (1u << (start & 7));
+        }
+      else
+        start_bitmap[end / 8] |= (1u << (end & 7));
+
+      range_start = ~(uint32_t)0;
+      }
+    else
+      range_start = char_list_add + (range_end >> XCL_CHAR_SHIFT);
+
+    item_count--;
+    }
+
+  list_ind++;
+  type >>= XCL_TYPE_BIT_LEN;
+
+  if (range_start == ~(uint32_t)0)
+    {
+    if ((type & XCL_BEGIN_WITH_RANGE) != 0)
+      {
+      /* In 8 bit mode XCL_CHAR_LIST_HIGH_32_START is not possible. */
+      if (list_ind == 1) range_start = XCL_CHAR_LIST_HIGH_16_START;
+      else range_start = XCL_CHAR_LIST_LOW_32_START;
+      }
+    }
+  else if ((type & XCL_BEGIN_WITH_RANGE) == 0)
+    {
+    PRIV(ord2utf)(range_start, start_buffer);
+
+    /* In 8 bit mode XCL_CHAR_LIST_LOW_32_END and
+    XCL_CHAR_LIST_HIGH_32_END are not possible. */
+    if (list_ind == 1) range_end = XCL_CHAR_LIST_LOW_16_END;
+    else range_end = XCL_CHAR_LIST_HIGH_16_END;
+
+    PRIV(ord2utf)(range_end, end_buffer);
+    end = end_buffer[0];
+
+    for (start = start_buffer[0]; start <= end; start++)
+      start_bitmap[start / 8] |= (1u << (start & 7));
+
+    range_start = ~(uint32_t)0;
+    }
+
+  /* In 8 bit mode XCL_CHAR_LIST_HIGH_32_ADD is not possible. */
+  if (list_ind == 1) char_list_add = XCL_CHAR_LIST_HIGH_16_ADD;
+  else char_list_add = XCL_CHAR_LIST_LOW_32_ADD;
+  }
+}
+#endif
+
+
+
 /*************************************************
 *      Create bitmap of starting code units      *
 *************************************************/
@@ -980,7 +1114,7 @@ do
     {
     int rc;
     PCRE2_SPTR ncode;
-    uint8_t *classmap = NULL;
+    const uint8_t *classmap = NULL;
 #ifdef SUPPORT_WIDE_CHARS
     PCRE2_UCHAR xclassflags;
 #endif
@@ -1134,6 +1268,7 @@ do
           case OP_ASSERTBACK_NOT:
           case OP_ASSERT_NA:
           case OP_ASSERTBACK_NA:
+          case OP_ASSERT_SCS:
           ncode += GET(ncode, 1);
           while (*ncode == OP_ALT) ncode += GET(ncode, 1);
           ncode += 1 + LINK_SIZE;
@@ -1252,12 +1387,14 @@ do
       tcode += GET(tcode, 1 + 2*LINK_SIZE);
       break;
 
-      /* Skip over lookbehind and negative lookahead assertions */
+      /* Skip over lookbehind, negative lookahead, and scan substring
+      assertions */
 
       case OP_ASSERT_NOT:
       case OP_ASSERTBACK:
       case OP_ASSERTBACK_NOT:
       case OP_ASSERTBACK_NA:
+      case OP_ASSERT_SCS:
       do tcode += GET(tcode, 1); while (*tcode == OP_ALT);
       tcode += 1 + LINK_SIZE;
       break;
@@ -1578,6 +1715,13 @@ do
       tcode += 2;
       break;
 
+      /* Set-based ECLASS: treat it the same as a "complex" XCLASS; give up. */
+
+#ifdef SUPPORT_WIDE_CHARS
+      case OP_ECLASS:
+      return SSB_FAIL;
+#endif
+
       /* Extended class: if there are any property checks, or if this is a
       negative XCLASS without a map, give up. If there are no property checks,
       there must be wide characters on the XCLASS list, because otherwise an
@@ -1596,7 +1740,7 @@ do
       map pointer if there is one, and fall through. */
 
       classmap = ((xclassflags & XCL_MAP) == 0)? NULL :
-        (uint8_t *)(tcode + 1 + LINK_SIZE + 1);
+        (const uint8_t *)(tcode + 1 + LINK_SIZE + 1);
 
       /* In UTF-8 mode, scan the character list and set bits for leading bytes,
       then jump to handle the map. */
@@ -1608,6 +1752,13 @@ do
         PCRE2_SPTR p = tcode + 1 + LINK_SIZE + 1 + ((classmap == NULL)? 0:32);
         tcode += GET(tcode, 1);
 
+        if (*p >= XCL_LIST)
+          {
+          study_char_list(p, re->start_bitmap,
+            ((const uint8_t *)re + re->code_start));
+          goto HANDLE_CLASSMAP;
+          }
+
         for (;;) switch (*p++)
           {
           case XCL_SINGLE:
@@ -1629,6 +1780,7 @@ do
           goto HANDLE_CLASSMAP;
 
           default:
+          PCRE2_DEBUG_UNREACHABLE();
           return SSB_UNKNOWN;   /* Internal error, should not occur */
           }
         }
@@ -1665,7 +1817,7 @@ do
       case OP_CLASS:
       if (*tcode == OP_XCLASS) tcode += GET(tcode, 1); else
         {
-        classmap = (uint8_t *)(++tcode);
+        classmap = (const uint8_t *)(++tcode);
         tcode += 32 / sizeof(PCRE2_UCHAR);
         }
 
@@ -1768,8 +1920,7 @@ BOOL ucp = (re->overall_options & PCRE2_UCP) != 0;
 
 /* Find start of compiled code */
 
-code = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) +
-  re->name_entry_size * re->name_count;
+code = (PCRE2_UCHAR *)((uint8_t *)re + re->code_start);
 
 /* For a pattern that has a first code unit, or a multiline pattern that
 matches only at "line start", there is no point in seeking a list of starting
@@ -1779,7 +1930,11 @@ if ((re->flags & (PCRE2_FIRSTSET|PCRE2_STARTLINE)) == 0)
   {
   int depth = 0;
   int rc = set_start_bits(re, code, utf, ucp, &depth);
-  if (rc == SSB_UNKNOWN) return 1;
+  if (rc == SSB_UNKNOWN)
+    {
+    PCRE2_DEBUG_UNREACHABLE();
+    return 1;
+    }
 
   /* If a list of starting code units was set up, scan the list to see if only
   one or two were listed. Having only one listed is rare because usually a
@@ -1852,25 +2007,22 @@ if ((re->flags & (PCRE2_FIRSTSET|PCRE2_STARTLINE)) == 0)
         }
       }
 
-    /* Replace the start code unit bits with a first code unit, but only if it
-    is not the same as a required later code unit. This is because a search for
-    a required code unit starts after an explicit first code unit, but at a
-    code unit found from the bitmap. Patterns such as /a*a/ don't work
-    if both the start unit and required unit are the same. */
+    /* Replace the start code unit bits with a first code unit. If it is the
+    same as a required later code unit, then clear the required later code
+    unit. This is because a search for a required code unit starts after an
+    explicit first code unit, but at a code unit found from the bitmap.
+    Patterns such as /a*a/ don't work if both the start unit and required
+    unit are the same. */
 
-    if (a >= 0 &&
-        (
-        (re->flags & PCRE2_LASTSET) == 0 ||
-          (
-          re->last_codeunit != (uint32_t)a &&
-          (b < 0 || re->last_codeunit != (uint32_t)b)
-          )
-        ))
-      {
+    if (a >= 0) {
+      if ((re->flags & PCRE2_LASTSET) && (re->last_codeunit == (uint32_t)a || (b >= 0 && re->last_codeunit == (uint32_t)b))) {
+        re->flags &= ~(PCRE2_LASTSET | PCRE2_LASTCASELESS);
+        re->last_codeunit = 0;
+      }
       re->first_codeunit = a;
       flags = PCRE2_FIRSTSET;
       if (b >= 0) flags |= PCRE2_FIRSTCASELESS;
-      }
+    }
 
     DONE:
     re->flags |= flags;
@@ -1898,9 +2050,11 @@ if ((re->flags & (PCRE2_MATCH_EMPTY|PCRE2_HASACCEPT)) == 0 &&
     break;    /* Leave minlength unchanged (will be zero) */
 
     case -2:
+    PCRE2_DEBUG_UNREACHABLE();
     return 2; /* missing capturing bracket */
 
     case -3:
+    PCRE2_DEBUG_UNREACHABLE();
     return 3; /* unrecognized opcode */
 
     default:
diff --git a/engine/thirdparty/pcre2/src/pcre2_substitute.c b/engine/thirdparty/pcre2/src/pcre2_substitute.c
index edbb78c6..17040ce5 100644
--- a/engine/thirdparty/pcre2/src/pcre2_substitute.c
+++ b/engine/thirdparty/pcre2/src/pcre2_substitute.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2022 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -130,17 +130,21 @@ for (; ptr < ptrend; ptr++)
 
     ptr += 1;  /* Must point after \ */
     erc = PRIV(check_escape)(&ptr, ptrend, &ch, &errorcode,
-      code->overall_options, code->extra_options, FALSE, NULL);
+      code->overall_options, code->extra_options, code->top_bracket, FALSE, NULL);
     ptr -= 1;  /* Back to last code unit of escape */
     if (errorcode != 0)
       {
-      rc = errorcode;
+      /* errorcode from check_escape is positive, so must not be returned by
+      pcre2_substitute(). */
+      rc = PCRE2_ERROR_BADREPESCAPE;
       goto EXIT;
       }
 
     switch(erc)
       {
       case 0:      /* Data character */
+      case ESC_b:  /* Data character */
+      case ESC_v:  /* Data character */
       case ESC_E:  /* Isolated \E is ignored */
       break;
 
@@ -148,7 +152,18 @@ for (; ptr < ptrend; ptr++)
       literal = TRUE;
       break;
 
+      case ESC_g:
+      /* The \g<name> form (\g<number> already handled by check_escape)
+
+      Don't worry about finding the matching ">". We are super, super lenient
+      about validating ${} replacements inside find_text_end(), so we certainly
+      don't need to worry about other syntax. Importantly, a \g<..> or $<...>
+      sequence can't contain a '}' character. */
+      break;
+
       default:
+      if (erc < 0)
+          break;  /* capture group reference */
       rc = PCRE2_ERROR_BADREPESCAPE;
       goto EXIT;
       }
@@ -163,6 +178,426 @@ return rc;
 }
 
 
+/*************************************************
+*           Validate group name                  *
+*************************************************/
+
+/* This function scans for a capture group name, validating it
+consists of legal characters, is not empty, and does not exceed
+MAX_NAME_SIZE.
+
+Arguments:
+  ptrptr    points to the pointer to the start of the text (updated)
+  ptrend    end of the whole string
+  utf       true if the input is UTF-encoded
+  ctypes    pointer to the character types table
+
+Returns:    TRUE if a name was read
+            FALSE otherwise
+*/
+
+static BOOL
+read_name_subst(PCRE2_SPTR *ptrptr, PCRE2_SPTR ptrend, BOOL utf,
+    const uint8_t* ctypes)
+{
+PCRE2_SPTR ptr = *ptrptr;
+PCRE2_SPTR nameptr = ptr;
+
+if (ptr >= ptrend)                 /* No characters in name */
+  goto FAILED;
+
+/* We do not need to check whether the name starts with a non-digit.
+We are simply referencing names here, not defining them. */
+
+/* See read_name in the pcre2_compile.c for the corresponding logic
+restricting group names inside the pattern itself. */
+
+#ifdef SUPPORT_UNICODE
+if (utf)
+  {
+  uint32_t c, type;
+
+  while (ptr < ptrend)
+    {
+    GETCHAR(c, ptr);
+    type = UCD_CHARTYPE(c);
+    if (type != ucp_Nd && PRIV(ucp_gentype)[type] != ucp_L &&
+        c != CHAR_UNDERSCORE) break;
+    ptr++;
+    FORWARDCHARTEST(ptr, ptrend);
+    }
+  }
+else
+#else
+(void)utf;  /* Avoid compiler warning */
+#endif      /* SUPPORT_UNICODE */
+
+/* Handle group names in non-UTF modes. */
+
+  {
+  while (ptr < ptrend && MAX_255(*ptr) && (ctypes[*ptr] & ctype_word) != 0)
+    {
+    ptr++;
+    }
+  }
+
+/* Check name length */
+
+if (ptr - nameptr > MAX_NAME_SIZE)
+  goto FAILED;
+
+/* Subpattern names must not be empty */
+if (ptr == nameptr)
+  goto FAILED;
+
+*ptrptr = ptr;
+return TRUE;
+
+FAILED:
+*ptrptr = ptr;
+return FALSE;
+}
+
+
+/*************************************************
+*              Case transformations              *
+*************************************************/
+
+#define PCRE2_SUBSTITUTE_CASE_NONE                 0
+// 1, 2, 3 are PCRE2_SUBSTITUTE_CASE_LOWER, UPPER, TITLE_FIRST.
+#define PCRE2_SUBSTITUTE_CASE_REVERSE_TITLE_FIRST  4
+
+typedef struct {
+  int to_case; /* One of PCRE2_SUBSTITUTE_CASE_xyz */
+  BOOL single_char;
+} case_state;
+
+/* Helper to guess how much a string is likely to increase in size when
+case-transformed. Usually, strings don't change size at all, but some rare
+characters do grow. Estimate +10%, plus another few characters.
+
+Performing this estimation is unfortunate, but inevitable, since we can't call
+the callout if we ran out of buffer space to prepare its input.
+
+Because this estimate is inexact (and in pathological cases, underestimates the
+required buffer size) we must document that when you have a
+substitute_case_callout, and you are using PCRE2_SUBSTITUTE_OVERFLOW_LENGTH, you
+may need more than two calls to determine the final buffer size. */
+
+static PCRE2_SIZE
+pessimistic_case_inflation(PCRE2_SIZE len)
+{
+return (len >> 3u) + 10;
+}
+
+/* Case transformation behaviour if no callout is passed. */
+
+static PCRE2_SIZE
+default_substitute_case_callout(
+  PCRE2_SPTR input, PCRE2_SIZE input_len,
+  PCRE2_UCHAR *output, PCRE2_SIZE output_cap,
+  case_state *state, const pcre2_code *code)
+{
+PCRE2_SPTR input_end = input + input_len;
+#ifdef SUPPORT_UNICODE
+BOOL utf;
+BOOL ucp;
+#endif
+PCRE2_UCHAR temp[6];
+BOOL next_to_upper;
+BOOL rest_to_upper;
+BOOL single_char;
+BOOL overflow = FALSE;
+PCRE2_SIZE written = 0;
+
+/* Helpful simplifying invariant: input and output are disjoint buffers.
+I believe that this code is technically undefined behaviour, because the two
+pointers input/output are "unrelated" pointers and hence not comparable. Casting
+via char* bypasses some but not all of those technical rules. It is not included
+in release builds, in any case. */
+PCRE2_ASSERT((char *)(input + input_len) <= (char *)output ||
+             (char *)(output + output_cap) <= (char *)input);
+
+#ifdef SUPPORT_UNICODE
+utf = (code->overall_options & PCRE2_UTF) != 0;
+ucp = (code->overall_options & PCRE2_UCP) != 0;
+#endif
+
+if (input_len == 0) return 0;
+
+switch (state->to_case)
+  {
+  default:
+  PCRE2_DEBUG_UNREACHABLE();
+  return 0;
+
+  case PCRE2_SUBSTITUTE_CASE_LOWER: // Can be single_char TRUE or FALSE
+  case PCRE2_SUBSTITUTE_CASE_UPPER: // Can only be single_char FALSE
+  next_to_upper = rest_to_upper = (state->to_case == PCRE2_SUBSTITUTE_CASE_UPPER);
+  break;
+
+  case PCRE2_SUBSTITUTE_CASE_TITLE_FIRST: // Can be single_char TRUE or FALSE
+  next_to_upper = TRUE;
+  rest_to_upper = FALSE;
+  state->to_case = PCRE2_SUBSTITUTE_CASE_LOWER;
+  break;
+
+  case PCRE2_SUBSTITUTE_CASE_REVERSE_TITLE_FIRST: // Can only be single_char FALSE
+  next_to_upper = FALSE;
+  rest_to_upper = TRUE;
+  state->to_case = PCRE2_SUBSTITUTE_CASE_UPPER;
+  break;
+  }
+
+single_char = state->single_char;
+if (single_char)
+  state->to_case = PCRE2_SUBSTITUTE_CASE_NONE;
+
+while (input < input_end)
+  {
+  uint32_t ch;
+  unsigned int chlen;
+
+  GETCHARINCTEST(ch, input);
+
+#ifdef SUPPORT_UNICODE
+  if ((utf || ucp) && ch >= 128)
+    {
+    uint32_t type = UCD_CHARTYPE(ch);
+    if (PRIV(ucp_gentype)[type] == ucp_L &&
+        type != (next_to_upper? ucp_Lu : ucp_Ll))
+      ch = UCD_OTHERCASE(ch);
+
+    /* TODO This is far from correct... it doesn't support the SpecialCasing.txt
+    mappings, but worse, it's not even correct for all the ordinary case
+    mappings. We should add support for those (at least), and then add the
+    SpecialCasing.txt mappings for Esszet and ligatures, and finally use the
+    Turkish casing flag on the match context. */
+    }
+  else
+#endif
+  if (MAX_255(ch))
+    {
+    if (((code->tables + cbits_offset +
+        (next_to_upper? cbit_upper:cbit_lower)
+        )[ch/8] & (1u << (ch%8))) == 0)
+      ch = (code->tables + fcc_offset)[ch];
+    }
+
+#ifdef SUPPORT_UNICODE
+  if (utf) chlen = PRIV(ord2utf)(ch, temp); else
+#endif
+    {
+    temp[0] = ch;
+    chlen = 1;
+    }
+
+  if (!overflow && chlen <= output_cap)
+    {
+    memcpy(output, temp, CU2BYTES(chlen));
+    output += chlen;
+    output_cap -= chlen;
+    }
+  else
+    {
+    overflow = TRUE;
+    }
+
+  if (chlen > ~(PCRE2_SIZE)0 - written)  /* Integer overflow */
+    return ~(PCRE2_SIZE)0;
+  written += chlen;
+
+  next_to_upper = rest_to_upper;
+
+  /* memcpy the remainder, if only transforming a single character. */
+
+  if (single_char)
+    {
+    PCRE2_SIZE rest_len = input_end - input;
+
+    if (!overflow && rest_len <= output_cap)
+      memcpy(output, input, CU2BYTES(rest_len));
+
+    if (rest_len > ~(PCRE2_SIZE)0 - written)  /* Integer overflow */
+      return ~(PCRE2_SIZE)0;
+    written += rest_len;
+
+    return written;
+    }
+  }
+
+return written;
+}
+
+/* Helper to perform the call to the substitute_case_callout. We wrap the
+user-provided callout because our internal arguments are slightly extended. We
+don't want the user callout to handle the case of "\l" (first character only to
+lowercase) or "\l\U" (first character to lowercase, rest to uppercase) because
+those are not operations defined by Unicode. Instead the user callout simply
+needs to provide the three Unicode primitives: lower, upper, titlecase. */
+
+static PCRE2_SIZE
+do_case_copy(
+  PCRE2_UCHAR *input_output, PCRE2_SIZE input_len, PCRE2_SIZE output_cap,
+  case_state *state, BOOL utf,
+  PCRE2_SIZE (*substitute_case_callout)(PCRE2_SPTR, PCRE2_SIZE, PCRE2_UCHAR *,
+                                        PCRE2_SIZE, int, void *),
+  void *substitute_case_callout_data)
+{
+PCRE2_SPTR input = input_output;
+PCRE2_UCHAR *output = input_output;
+PCRE2_SIZE rc;
+PCRE2_SIZE rc2;
+int ch1_to_case;
+int rest_to_case;
+PCRE2_UCHAR ch1[6];
+PCRE2_SIZE ch1_len;
+PCRE2_SPTR rest;
+PCRE2_SIZE rest_len;
+BOOL ch1_overflow = FALSE;
+BOOL rest_overflow = FALSE;
+
+#if PCRE2_CODE_UNIT_WIDTH == 32 || !defined(SUPPORT_UNICODE)
+(void)utf; /* Avoid compiler warning. */
+#endif
+
+PCRE2_ASSERT(input_len != 0);
+
+switch (state->to_case)
+  {
+  default:
+  PCRE2_DEBUG_UNREACHABLE();
+  return 0;
+
+  case PCRE2_SUBSTITUTE_CASE_LOWER: // Can be single_char TRUE or FALSE
+  case PCRE2_SUBSTITUTE_CASE_UPPER: // Can only be single_char FALSE
+  case PCRE2_SUBSTITUTE_CASE_TITLE_FIRST: // Can be single_char TRUE or FALSE
+
+  /* The easy case, where our internal casing operations align with those of
+  the callout. */
+
+  if (state->single_char == FALSE)
+    {
+    rc = substitute_case_callout(input, input_len, output, output_cap,
+                                 state->to_case, substitute_case_callout_data);
+
+    if (state->to_case == PCRE2_SUBSTITUTE_CASE_TITLE_FIRST)
+      state->to_case = PCRE2_SUBSTITUTE_CASE_LOWER;
+
+    return rc;
+    }
+
+  ch1_to_case = state->to_case;
+  rest_to_case = PCRE2_SUBSTITUTE_CASE_NONE;
+  break;
+
+  case PCRE2_SUBSTITUTE_CASE_REVERSE_TITLE_FIRST: // Can only be single_char FALSE
+  ch1_to_case = PCRE2_SUBSTITUTE_CASE_LOWER;
+  rest_to_case = PCRE2_SUBSTITUTE_CASE_UPPER;
+  break;
+  }
+
+/* Identify the leading character. Take copy, because its storage overlaps with
+`output`, and hence may be scrambled by the callout. */
+
+  {
+  PCRE2_SPTR ch_end = input;
+  uint32_t ch;
+
+  GETCHARINCTEST(ch, ch_end);
+  (void) ch;
+  PCRE2_ASSERT(ch_end <= input + input_len && ch_end - input <= 6);
+  ch1_len = ch_end - input;
+  memcpy(ch1, input, CU2BYTES(ch1_len));
+  }
+
+rest = input + ch1_len;
+rest_len = input_len - ch1_len;
+
+/* Transform just ch1. The buffers are always in-place (input == output). With a
+custom callout, we need a loop to discover its required buffer size. The loop
+wouldn't be required if the callout were well-behaved, but it might be naughty
+and return "5" the first time, then "10" the next time we call it using the
+exact same input! */
+
+  {
+  PCRE2_SIZE ch1_cap;
+  PCRE2_SIZE max_ch1_cap;
+
+  ch1_cap = ch1_len;  /* First attempt uses the space vacated by ch1. */
+  PCRE2_ASSERT(output_cap >= input_len && input_len >= rest_len);
+  max_ch1_cap = output_cap - rest_len;
+
+  while (TRUE)
+    {
+    rc = substitute_case_callout(ch1, ch1_len, output, ch1_cap, ch1_to_case,
+                                 substitute_case_callout_data);
+    if (rc == ~(PCRE2_SIZE)0) return rc;
+
+    if (rc <= ch1_cap) break;
+
+    if (rc > max_ch1_cap)
+      {
+      ch1_overflow = TRUE;
+      break;
+      }
+
+    /* Move the rest to the right, to make room for expanding ch1. */
+
+    memmove(input_output + rc, rest, CU2BYTES(rest_len));
+    rest = input + rc;
+
+    ch1_cap = rc;
+
+    /* Proof of loop termination: `ch1_cap` is growing on each iteration, but
+    the loop ends if `rc` reaches the (unchanging) upper bound of output_cap. */
+    }
+  }
+
+if (rest_to_case == PCRE2_SUBSTITUTE_CASE_NONE)
+  {
+  if (!ch1_overflow)
+    {
+    PCRE2_ASSERT(rest_len <= output_cap - rc);
+    memmove(output + rc, rest, CU2BYTES(rest_len));
+    }
+  rc2 = rest_len;
+
+  state->to_case = PCRE2_SUBSTITUTE_CASE_NONE;
+  }
+else
+  {
+  PCRE2_UCHAR dummy[1];
+
+  rc2 = substitute_case_callout(rest, rest_len,
+                                ch1_overflow? dummy : output + rc,
+                                ch1_overflow? 0u : output_cap - rc,
+                                rest_to_case, substitute_case_callout_data);
+  if (rc2 == ~(PCRE2_SIZE)0) return rc2;
+
+  if (!ch1_overflow && rc2 > output_cap - rc) rest_overflow = TRUE;
+
+  /* If ch1 grows so that `xform(ch1)+rest` can't fit in the buffer, but then
+  `rest` shrinks, it's actually possible for the total calculated length of
+  `xform(ch1)+xform(rest)` to come out at less than output_cap. But we can't
+  report that, because it would make it seem that the operation succeeded.
+  If either of xform(ch1) or xform(rest) won't fit in the buffer, our final
+  result must be > output_cap. */
+  if (ch1_overflow && rc2 < rest_len)
+    rc2 = rest_len;
+
+  state->to_case = PCRE2_SUBSTITUTE_CASE_UPPER;
+  }
+
+if (rc2 > ~(PCRE2_SIZE)0 - rc)  /* Integer overflow */
+  return ~(PCRE2_SIZE)0;
+
+PCRE2_ASSERT(!(ch1_overflow || rest_overflow) || rc + rc2 > output_cap);
+(void)rest_overflow;
+
+return rc + rc2;
+}
+
 
 /*************************************************
 *              Match and substitute              *
@@ -194,25 +629,107 @@ Returns:          >= 0 number of substitutions made
 overflow, either give an error immediately, or keep on, accumulating the
 length. */
 
-#define CHECKMEMCPY(from,length) \
-  { \
-  if (!overflowed && lengthleft < length) \
-    { \
-    if ((suboptions & PCRE2_SUBSTITUTE_OVERFLOW_LENGTH) == 0) goto NOROOM; \
-    overflowed = TRUE; \
-    extra_needed = length - lengthleft; \
-    } \
-  else if (overflowed) \
-    { \
-    extra_needed += length; \
-    }  \
-  else \
-    {  \
-    memcpy(buffer + buff_offset, from, CU2BYTES(length)); \
-    buff_offset += length; \
-    lengthleft -= length; \
-    } \
-  }
+#define CHECKMEMCPY(from, length_) \
+  do {    \
+     PCRE2_SIZE chkmc_length = length_; \
+     if (overflowed) \
+       {  \
+       if (chkmc_length > ~(PCRE2_SIZE)0 - extra_needed)  /* Integer overflow */ \
+         goto TOOLARGEREPLACE; \
+       extra_needed += chkmc_length; \
+       }  \
+     else if (lengthleft < chkmc_length) \
+       {  \
+       if ((suboptions & PCRE2_SUBSTITUTE_OVERFLOW_LENGTH) == 0) goto NOROOM; \
+       overflowed = TRUE; \
+       extra_needed = chkmc_length - lengthleft; \
+       }  \
+     else \
+       {  \
+       memcpy(buffer + buff_offset, from, CU2BYTES(chkmc_length)); \
+       buff_offset += chkmc_length; \
+       lengthleft -= chkmc_length; \
+       }  \
+     }    \
+  while (0)
+
+/* This macro checks for space and copies characters with casing modifications.
+On overflow, it behaves as for CHECKMEMCPY().
+
+When substitute_case_callout is NULL, the source and destination buffers must
+not overlap, because our default handler does not support this. */
+
+#define CHECKCASECPY_BASE(length_, do_call) \
+  do {    \
+     PCRE2_SIZE chkcc_length = (PCRE2_SIZE)(length_); \
+     PCRE2_SIZE chkcc_rc; \
+     do_call \
+     if (lengthleft < chkcc_rc) \
+       {  \
+       if ((suboptions & PCRE2_SUBSTITUTE_OVERFLOW_LENGTH) == 0) goto NOROOM; \
+       overflowed = TRUE; \
+       extra_needed = chkcc_rc - lengthleft; \
+       }  \
+     else \
+       {  \
+       buff_offset += chkcc_rc; \
+       lengthleft -= chkcc_rc; \
+       }  \
+     }    \
+  while (0)
+
+#define CHECKCASECPY_DEFAULT(from, length_) \
+  CHECKCASECPY_BASE(length_, { \
+    chkcc_rc = default_substitute_case_callout(from, chkcc_length,         \
+                                               buffer + buff_offset,       \
+                                               overflowed? 0 : lengthleft, \
+                                               &forcecase, code);          \
+    if (overflowed) \
+      { \
+      if (chkcc_rc > ~(PCRE2_SIZE)0 - extra_needed)  /* Integer overflow */ \
+        goto TOOLARGEREPLACE; \
+      extra_needed += chkcc_rc; \
+      break; \
+      } \
+  })
+
+#define CHECKCASECPY_CALLOUT(length_) \
+  CHECKCASECPY_BASE(length_, { \
+    chkcc_rc = do_case_copy(buffer + buff_offset, chkcc_length, \
+                            lengthleft, &forcecase, utf,        \
+                            substitute_case_callout,            \
+                            substitute_case_callout_data);      \
+    if (chkcc_rc == ~(PCRE2_SIZE)0) goto CASEERROR; \
+  })
+
+/* This macro does a delayed case transformation, for the situation when we have
+a case-forcing callout. */
+
+#define DELAYEDFORCECASE() \
+  do {      \
+     PCRE2_SIZE chars_outstanding = (buff_offset - casestart_offset) + \
+            (extra_needed - casestart_extra_needed); \
+     if (chars_outstanding > 0) \
+       {    \
+       if (overflowed) \
+         {  \
+         PCRE2_SIZE guess = pessimistic_case_inflation(chars_outstanding); \
+         if (guess > ~(PCRE2_SIZE)0 - extra_needed)  /* Integer overflow */ \
+           goto TOOLARGEREPLACE; \
+         extra_needed += guess; \
+         }  \
+       else \
+         {  \
+         /* Rewind the buffer */ \
+         lengthleft += (buff_offset - casestart_offset); \
+         buff_offset = casestart_offset; \
+         /* Care! In-place case transformation */ \
+         CHECKCASECPY_CALLOUT(chars_outstanding); \
+         }  \
+       }    \
+     }      \
+  while (0)
+
 
 /* Here's the function */
 
@@ -224,8 +741,6 @@ pcre2_substitute(const pcre2_code *code, PCRE2_SPTR subject, PCRE2_SIZE length,
 {
 int rc;
 int subs;
-int forcecase = 0;
-int forcecasereset = 0;
 uint32_t ovector_count;
 uint32_t goptions = 0;
 uint32_t suboptions;
@@ -234,18 +749,19 @@ BOOL escaped_literal = FALSE;
 BOOL overflowed = FALSE;
 BOOL use_existing_match;
 BOOL replacement_only;
-#ifdef SUPPORT_UNICODE
 BOOL utf = (code->overall_options & PCRE2_UTF) != 0;
-BOOL ucp = (code->overall_options & PCRE2_UCP) != 0;
-#endif
 PCRE2_UCHAR temp[6];
 PCRE2_SPTR ptr;
-PCRE2_SPTR repend;
+PCRE2_SPTR repend = NULL;
 PCRE2_SIZE extra_needed = 0;
 PCRE2_SIZE buff_offset, buff_length, lengthleft, fraglength;
 PCRE2_SIZE *ovector;
 PCRE2_SIZE ovecsave[3];
 pcre2_substitute_callout_block scb;
+PCRE2_SIZE sub_start_extra_needed;
+PCRE2_SIZE (*substitute_case_callout)(PCRE2_SPTR, PCRE2_SIZE, PCRE2_UCHAR *,
+                                      PCRE2_SIZE, int, void *) = NULL;
+void *substitute_case_callout_data = NULL;
 
 /* General initialization */
 
@@ -254,6 +770,12 @@ lengthleft = buff_length = *blength;
 *blength = PCRE2_UNSET;
 ovecsave[0] = ovecsave[1] = ovecsave[2] = PCRE2_UNSET;
 
+if (mcontext != NULL)
+  {
+  substitute_case_callout = mcontext->substitute_case_callout;
+  substitute_case_callout_data = mcontext->substitute_case_callout_data;
+  }
+
 /* Partial matching is not valid. This must come after setting *blength to
 PCRE2_UNSET, so as not to imply an offset in the replacement. */
 
@@ -286,27 +808,34 @@ case, we copy the existing match into the internal block, except for any cached
 heap frame size and pointer. This ensures that no changes are made to the
 external match data block. */
 
+/* WARNING: In both cases below a general context is constructed "by hand"
+because calling pcre2_general_context_create() involves a memory allocation. If
+the contents of a general context control block are ever changed there will
+have to be changes below. */
+
 if (match_data == NULL)
   {
-  pcre2_general_context *gcontext;
+  pcre2_general_context gcontext;
   if (use_existing_match) return PCRE2_ERROR_NULL;
-  gcontext = (mcontext == NULL)?
-    (pcre2_general_context *)code :
-    (pcre2_general_context *)mcontext;
+  gcontext.memctl = (mcontext == NULL)?
+    ((const pcre2_real_code *)code)->memctl :
+    ((pcre2_real_match_context *)mcontext)->memctl;
   match_data = internal_match_data =
-    pcre2_match_data_create_from_pattern(code, gcontext);
+    pcre2_match_data_create_from_pattern(code, &gcontext);
   if (internal_match_data == NULL) return PCRE2_ERROR_NOMEMORY;
   }
 
 else if (use_existing_match)
   {
-  pcre2_general_context *gcontext = (mcontext == NULL)?
-    (pcre2_general_context *)code :
-    (pcre2_general_context *)mcontext;
-  int pairs = (code->top_bracket + 1 < match_data->oveccount)?
+  int pairs;
+  pcre2_general_context gcontext;
+  gcontext.memctl = (mcontext == NULL)?
+    ((const pcre2_real_code *)code)->memctl :
+    ((pcre2_real_match_context *)mcontext)->memctl;
+  pairs = (code->top_bracket + 1 < match_data->oveccount)?
     code->top_bracket + 1 : match_data->oveccount;
   internal_match_data = pcre2_match_data_create(match_data->oveccount,
-    gcontext);
+    &gcontext);
   if (internal_match_data == NULL) return PCRE2_ERROR_NOMEMORY;
   memcpy(internal_match_data, match_data, offsetof(pcre2_match_data, ovector)
     + 2*pairs*sizeof(PCRE2_SIZE));
@@ -380,6 +909,9 @@ do
   {
   PCRE2_SPTR ptrstack[PTR_STACK_SIZE];
   uint32_t ptrstackptr = 0;
+  case_state forcecase = { PCRE2_SUBSTITUTE_CASE_NONE, FALSE };
+  PCRE2_SIZE casestart_offset = 0;
+  PCRE2_SIZE casestart_extra_needed = 0;
 
   if (use_existing_match)
     {
@@ -412,8 +944,9 @@ do
 
     save_start = start_offset++;
     if (subject[start_offset-1] == CHAR_CR &&
-        code->newline_convention != PCRE2_NEWLINE_CR &&
-        code->newline_convention != PCRE2_NEWLINE_LF &&
+        (code->newline_convention == PCRE2_NEWLINE_CRLF ||
+         code->newline_convention == PCRE2_NEWLINE_ANY ||
+         code->newline_convention == PCRE2_NEWLINE_ANYCRLF) &&
         start_offset < length &&
         subject[start_offset] == CHAR_LF)
       start_offset++;
@@ -480,14 +1013,16 @@ do
     }
   subs++;
 
-  /* Copy the text leading up to the match (unless not required), and remember
-  where the insert begins and how many ovector pairs are set. */
+  /* Copy the text leading up to the match (unless not required); remember
+  where the insert begins and how many ovector pairs are set; and remember how
+  much space we have requested in extra_needed. */
 
   if (rc == 0) rc = ovector_count;
   fraglength = ovector[0] - start_offset;
   if (!replacement_only) CHECKMEMCPY(subject + start_offset, fraglength);
   scb.output_offsets[0] = buff_offset;
   scb.oveccount = rc;
+  sub_start_extra_needed = extra_needed;
 
   /* Process the replacement string. If the entire replacement is literal, just
   copy it with length check. */
@@ -507,6 +1042,13 @@ do
     {
     uint32_t ch;
     unsigned int chlen;
+    int group;
+    uint32_t special;
+    PCRE2_SPTR text1_start = NULL;
+    PCRE2_SPTR text1_end = NULL;
+    PCRE2_SPTR text2_start = NULL;
+    PCRE2_SPTR text2_end = NULL;
+    PCRE2_UCHAR name[MAX_NAME_SIZE + 1];
 
     /* If at the end of a nested substring, pop the stack. */
 
@@ -535,25 +1077,62 @@ do
 
     if (*ptr == CHAR_DOLLAR_SIGN)
       {
-      int group, n;
-      uint32_t special = 0;
       BOOL inparens;
+      BOOL inangle;
       BOOL star;
       PCRE2_SIZE sublength;
-      PCRE2_SPTR text1_start = NULL;
-      PCRE2_SPTR text1_end = NULL;
-      PCRE2_SPTR text2_start = NULL;
-      PCRE2_SPTR text2_end = NULL;
       PCRE2_UCHAR next;
-      PCRE2_UCHAR name[33];
+      PCRE2_SPTR subptr, subptrend;
 
       if (++ptr >= repend) goto BAD;
       if ((next = *ptr) == CHAR_DOLLAR_SIGN) goto LOADLITERAL;
 
+      special = 0;
+      text1_start = NULL;
+      text1_end = NULL;
+      text2_start = NULL;
+      text2_end = NULL;
       group = -1;
-      n = 0;
       inparens = FALSE;
+      inangle = FALSE;
       star = FALSE;
+      subptr = NULL;
+      subptrend = NULL;
+
+      /* Special $ sequences, as supported by Perl, JavaScript, .NET and others. */
+      if (next == CHAR_AMPERSAND)
+        {
+        ++ptr;
+        group = 0;
+        goto GROUP_SUBSTITUTE;
+        }
+      if (next == CHAR_GRAVE_ACCENT || next == CHAR_APOSTROPHE)
+        {
+        ++ptr;
+        rc = pcre2_substring_length_bynumber(match_data, 0, &sublength);
+        if (rc < 0) goto PTREXIT; /* (Sanity-check ovector before reading from it.) */
+
+        if (next == CHAR_GRAVE_ACCENT)
+          {
+          subptr = subject;
+          subptrend = subject + ovector[0];
+          }
+        else
+          {
+          subptr = subject + ovector[1];
+          subptrend = subject + length;
+          }
+
+        goto SUBPTR_SUBSTITUTE;
+        }
+      if (next == CHAR_UNDERSCORE)
+        {
+        /* Java, .NET support $_ for "entire input string". */
+        ++ptr;
+        subptr = subject;
+        subptrend = subject + length;
+        goto SUBPTR_SUBSTITUTE;
+        }
 
       if (next == CHAR_LEFT_CURLY_BRACKET)
         {
@@ -561,22 +1140,31 @@ do
         next = *ptr;
         inparens = TRUE;
         }
+      else if (next == CHAR_LESS_THAN_SIGN)
+        {
+        /* JavaScript compatibility syntax, $<name>. Processes only named
+        groups (not numbered) and does not support extensions such as star
+        (you can do ${name} and ${*name}, but not $<*name>). */
+        if (++ptr >= repend) goto BAD;
+        next = *ptr;
+        inangle = TRUE;
+        }
 
-      if (next == CHAR_ASTERISK)
+      if (!inangle && next == CHAR_ASTERISK)
         {
         if (++ptr >= repend) goto BAD;
         next = *ptr;
         star = TRUE;
         }
 
-      if (!star && next >= CHAR_0 && next <= CHAR_9)
+      if (!star && !inangle && next >= CHAR_0 && next <= CHAR_9)
         {
         group = next - CHAR_0;
         while (++ptr < repend)
           {
           next = *ptr;
           if (next < CHAR_0 || next > CHAR_9) break;
-          group = group * 10 + next - CHAR_0;
+          group = group * 10 + (next - CHAR_0);
 
           /* A check for a number greater than the hightest captured group
           is sufficient here; no need for a separate overflow check. If unknown
@@ -600,25 +1188,25 @@ do
         }
       else
         {
-        const uint8_t *ctypes = code->tables + ctypes_offset;
-        while (MAX_255(next) && (ctypes[next] & ctype_word) != 0)
-          {
-          name[n++] = next;
-          if (n > 32) goto BAD;
-          if (++ptr >= repend) break;
-          next = *ptr;
-          }
-        if (n == 0) goto BAD;
-        name[n] = 0;
+        PCRE2_SIZE name_len;
+        PCRE2_SPTR name_start = ptr;
+        if (!read_name_subst(&ptr, repend, utf, code->tables + ctypes_offset))
+          goto BAD;
+        name_len = ptr - name_start;
+        memcpy(name, name_start, CU2BYTES(name_len));
+        name[name_len] = 0;
         }
 
+      next = 0; /* not used or updated after this point */
+      (void)next;
+
       /* In extended mode we recognize ${name:+set text:unset text} and
       ${name:-default text}. */
 
       if (inparens)
         {
         if ((suboptions & PCRE2_SUBSTITUTE_EXTENDED) != 0 &&
-             !star && ptr < repend - 2 && next == CHAR_COLON)
+             !star && ptr < repend - 2 && *ptr == CHAR_COLON)
           {
           special = *(++ptr);
           if (special != CHAR_PLUS && special != CHAR_MINUS)
@@ -653,6 +1241,13 @@ do
         ptr++;
         }
 
+      if (inangle)
+        {
+        if (ptr >= repend || *ptr != CHAR_GREATER_THAN_SIGN)
+          goto BAD;
+        ptr++;
+        }
+
       /* Have found a syntactically correct group number or name, or *name.
       Only *MARK is currently recognized. */
 
@@ -663,10 +1258,14 @@ do
           PCRE2_SPTR mark = pcre2_get_mark(match_data);
           if (mark != NULL)
             {
-            PCRE2_SPTR mark_start = mark;
-            while (*mark != 0) mark++;
-            fraglength = mark - mark_start;
-            CHECKMEMCPY(mark_start, fraglength);
+            /* Peek backwards one code unit to obtain the length of the mark.
+            It can (theoretically) contain an embedded NUL. */
+            fraglength = mark[-1];
+            if (forcecase.to_case != PCRE2_SUBSTITUTE_CASE_NONE &&
+                substitute_case_callout == NULL)
+              CHECKCASECPY_DEFAULT(mark, fraglength);
+            else
+              CHECKMEMCPY(mark, fraglength);
             }
           }
         else goto BAD;
@@ -677,8 +1276,7 @@ do
 
       else
         {
-        PCRE2_SPTR subptr, subptrend;
-
+        GROUP_SUBSTITUTE:
         /* Find a number for a named group. In case there are duplicate names,
         search for the first one that is set. If the name is not found when
         PCRE2_SUBSTITUTE_UNKNOWN_EMPTY is set, set the group number to a
@@ -775,41 +1373,14 @@ do
 
         /* Substitute a literal string, possibly forcing alphabetic case. */
 
-        while (subptr < subptrend)
-          {
-          GETCHARINCTEST(ch, subptr);
-          if (forcecase != 0)
-            {
-#ifdef SUPPORT_UNICODE
-            if (utf || ucp)
-              {
-              uint32_t type = UCD_CHARTYPE(ch);
-              if (PRIV(ucp_gentype)[type] == ucp_L &&
-                  type != ((forcecase > 0)? ucp_Lu : ucp_Ll))
-                ch = UCD_OTHERCASE(ch);
-              }
-            else
-#endif
-              {
-              if (((code->tables + cbits_offset +
-                  ((forcecase > 0)? cbit_upper:cbit_lower)
-                  )[ch/8] & (1u << (ch%8))) == 0)
-                ch = (code->tables + fcc_offset)[ch];
-              }
-            forcecase = forcecasereset;
-            }
-
-#ifdef SUPPORT_UNICODE
-          if (utf) chlen = PRIV(ord2utf)(ch, temp); else
-#endif
-            {
-            temp[0] = ch;
-            chlen = 1;
-            }
-          CHECKMEMCPY(temp, chlen);
-          }
+        SUBPTR_SUBSTITUTE:
+        if (forcecase.to_case != PCRE2_SUBSTITUTE_CASE_NONE &&
+            substitute_case_callout == NULL)
+          CHECKCASECPY_DEFAULT(subptr, subptrend - subptr);
+        else
+          CHECKMEMCPY(subptr, subptrend - subptr);
         }
-      }
+      }   /* End of $ processing */
 
     /* Handle an escape sequence in extended mode. We can use check_escape()
     to process \Q, \E, \c, \o, \x and \ followed by non-alphanumerics, but
@@ -820,123 +1391,239 @@ do
               *ptr == CHAR_BACKSLASH)
       {
       int errorcode;
+      case_state new_forcecase = { PCRE2_SUBSTITUTE_CASE_NONE, FALSE };
 
       if (ptr < repend - 1) switch (ptr[1])
         {
         case CHAR_L:
-        forcecase = forcecasereset = -1;
+        new_forcecase.to_case = PCRE2_SUBSTITUTE_CASE_LOWER;
+        new_forcecase.single_char = FALSE;
         ptr += 2;
-        continue;
+        break;
 
         case CHAR_l:
-        forcecase = -1;
-        forcecasereset = 0;
+        new_forcecase.to_case = PCRE2_SUBSTITUTE_CASE_LOWER;
+        new_forcecase.single_char = TRUE;
         ptr += 2;
-        continue;
+        if (ptr + 2 < repend && ptr[0] == CHAR_BACKSLASH && ptr[1] == CHAR_U)
+          {
+          /* Perl reverse-title-casing feature for \l\U */
+          new_forcecase.to_case = PCRE2_SUBSTITUTE_CASE_REVERSE_TITLE_FIRST;
+          new_forcecase.single_char = FALSE;
+          ptr += 2;
+          }
+        break;
 
         case CHAR_U:
-        forcecase = forcecasereset = 1;
+        new_forcecase.to_case = PCRE2_SUBSTITUTE_CASE_UPPER;
+        new_forcecase.single_char = FALSE;
         ptr += 2;
-        continue;
+        break;
 
         case CHAR_u:
-        forcecase = 1;
-        forcecasereset = 0;
+        new_forcecase.to_case = PCRE2_SUBSTITUTE_CASE_TITLE_FIRST;
+        new_forcecase.single_char = TRUE;
         ptr += 2;
-        continue;
+        if (ptr + 2 < repend && ptr[0] == CHAR_BACKSLASH && ptr[1] == CHAR_L)
+          {
+          /* Perl title-casing feature for \u\L */
+          new_forcecase.to_case = PCRE2_SUBSTITUTE_CASE_TITLE_FIRST;
+          new_forcecase.single_char = FALSE;
+          ptr += 2;
+          }
+        break;
 
         default:
         break;
         }
 
+      if (new_forcecase.to_case != PCRE2_SUBSTITUTE_CASE_NONE)
+        {
+        SETFORCECASE:
+
+        /* If the substitute_case_callout is unset, our case-forcing is done
+        immediately. If there is a callout however, then its action is delayed
+        until all the characters have been collected.
+
+        Apply the callout now, before we set the new casing mode. */
+
+        if (substitute_case_callout != NULL &&
+            forcecase.to_case != PCRE2_SUBSTITUTE_CASE_NONE)
+          DELAYEDFORCECASE();
+
+        forcecase = new_forcecase;
+        casestart_offset = buff_offset;
+        casestart_extra_needed = extra_needed;
+        continue;
+        }
+
       ptr++;  /* Point after \ */
       rc = PRIV(check_escape)(&ptr, repend, &ch, &errorcode,
-        code->overall_options, code->extra_options, FALSE, NULL);
+        code->overall_options, code->extra_options, code->top_bracket, FALSE, NULL);
       if (errorcode != 0) goto BADESCAPE;
 
       switch(rc)
         {
         case ESC_E:
-        forcecase = forcecasereset = 0;
-        continue;
+        goto SETFORCECASE;
 
         case ESC_Q:
         escaped_literal = TRUE;
         continue;
 
         case 0:      /* Data character */
-        goto LITERAL;
+        case ESC_b:  /* \b is backspace in a substitution */
+        case ESC_v:  /* \v is vertical tab in a substitution */
+
+        if (rc == ESC_b) ch = CHAR_BS;
+        if (rc == ESC_v) ch = CHAR_VT;
+
+#ifdef SUPPORT_UNICODE
+        if (utf) chlen = PRIV(ord2utf)(ch, temp); else
+#endif
+          {
+          temp[0] = ch;
+          chlen = 1;
+          }
+
+        if (forcecase.to_case != PCRE2_SUBSTITUTE_CASE_NONE &&
+            substitute_case_callout == NULL)
+          CHECKCASECPY_DEFAULT(temp, chlen);
+        else
+          CHECKMEMCPY(temp, chlen);
+        continue;
+
+        case ESC_g:
+          {
+          PCRE2_SIZE name_len;
+          PCRE2_SPTR name_start;
+
+          /* Parse the \g<name> form (\g<number> already handled by check_escape) */
+          if (ptr >= repend || *ptr != CHAR_LESS_THAN_SIGN)
+            goto BADESCAPE;
+          ++ptr;
+
+          name_start = ptr;
+          if (!read_name_subst(&ptr, repend, utf, code->tables + ctypes_offset))
+            goto BADESCAPE;
+          name_len = ptr - name_start;
+
+          if (ptr >= repend || *ptr != CHAR_GREATER_THAN_SIGN)
+            goto BADESCAPE;
+          ++ptr;
+
+          special = 0;
+          group = -1;
+          memcpy(name, name_start, CU2BYTES(name_len));
+          name[name_len] = 0;
+          goto GROUP_SUBSTITUTE;
+          }
 
         default:
+        if (rc < 0)
+          {
+          special = 0;
+          group = -rc - 1;
+          goto GROUP_SUBSTITUTE;
+          }
         goto BADESCAPE;
         }
-      }
+      }   /* End of backslash processing */
 
     /* Handle a literal code unit */
 
     else
       {
+      PCRE2_SPTR ch_start;
+
       LOADLITERAL:
+      ch_start = ptr;
       GETCHARINCTEST(ch, ptr);    /* Get character value, increment pointer */
+      (void) ch;
 
-      LITERAL:
-      if (forcecase != 0)
-        {
-#ifdef SUPPORT_UNICODE
-        if (utf || ucp)
-          {
-          uint32_t type = UCD_CHARTYPE(ch);
-          if (PRIV(ucp_gentype)[type] == ucp_L &&
-              type != ((forcecase > 0)? ucp_Lu : ucp_Ll))
-            ch = UCD_OTHERCASE(ch);
-          }
-        else
-#endif
-          {
-          if (((code->tables + cbits_offset +
-              ((forcecase > 0)? cbit_upper:cbit_lower)
-              )[ch/8] & (1u << (ch%8))) == 0)
-            ch = (code->tables + fcc_offset)[ch];
-          }
-        forcecase = forcecasereset;
-        }
-
-#ifdef SUPPORT_UNICODE
-      if (utf) chlen = PRIV(ord2utf)(ch, temp); else
-#endif
-        {
-        temp[0] = ch;
-        chlen = 1;
-        }
-      CHECKMEMCPY(temp, chlen);
+      if (forcecase.to_case != PCRE2_SUBSTITUTE_CASE_NONE &&
+          substitute_case_callout == NULL)
+        CHECKCASECPY_DEFAULT(ch_start, ptr - ch_start);
+      else
+        CHECKMEMCPY(ch_start, ptr - ch_start);
       } /* End handling a literal code unit */
     }   /* End of loop for scanning the replacement. */
 
+  /* If the substitute_case_callout is unset, our case-forcing is done
+  immediately. If there is a callout however, then its action is delayed
+  until all the characters have been collected.
+
+  We now clean up any trailing section of the replacement for which we deferred
+  the case-forcing. */
+
+  if (substitute_case_callout != NULL &&
+      forcecase.to_case != PCRE2_SUBSTITUTE_CASE_NONE)
+    DELAYEDFORCECASE();
+
   /* The replacement has been copied to the output, or its size has been
-  remembered. Do the callout if there is one and we have done an actual
-  replacement. */
+  remembered. Handle the callout if there is one. */
 
-  if (!overflowed && mcontext != NULL && mcontext->substitute_callout != NULL)
+  if (mcontext != NULL && mcontext->substitute_callout != NULL)
     {
-    scb.subscount = subs;
-    scb.output_offsets[1] = buff_offset;
-    rc = mcontext->substitute_callout(&scb, mcontext->substitute_callout_data);
+    /* If we an actual (non-simulated) replacement, do the callout. */
 
-    /* A non-zero return means cancel this substitution. Instead, copy the
-    matched string fragment. */
-
-    if (rc != 0)
+    if (!overflowed)
       {
-      PCRE2_SIZE newlength = scb.output_offsets[1] - scb.output_offsets[0];
+      scb.subscount = subs;
+      scb.output_offsets[1] = buff_offset;
+      rc = mcontext->substitute_callout(&scb,
+                                        mcontext->substitute_callout_data);
+
+      /* A non-zero return means cancel this substitution. Instead, copy the
+      matched string fragment. */
+
+      if (rc != 0)
+        {
+        PCRE2_SIZE newlength = scb.output_offsets[1] - scb.output_offsets[0];
+        PCRE2_SIZE oldlength = ovector[1] - ovector[0];
+
+        buff_offset -= newlength;
+        lengthleft += newlength;
+        if (!replacement_only) CHECKMEMCPY(subject + ovector[0], oldlength);
+
+        /* A negative return means do not do any more. */
+
+        if (rc < 0) suboptions &= (~PCRE2_SUBSTITUTE_GLOBAL);
+        }
+      }
+
+    /* In this interesting case, we cannot do the callout, so it's hard to
+    estimate the required buffer size. What callers want is to be able to make
+    two calls to pcre2_substitute(), once with PCRE2_SUBSTITUTE_OVERFLOW_LENGTH
+    to discover the buffer size, and then a second and final call. Older
+    versions of PCRE2 violated this assumption, by proceding as if the callout
+    had returned zero - but on the second call to pcre2_substitute() it could
+    return non-zero and then overflow the buffer again. Callers probably don't
+    want to keep on looping to incrementally discover the buffer size. */
+
+    else
+      {
+      PCRE2_SIZE newlength_buf = buff_offset - scb.output_offsets[0];
+      PCRE2_SIZE newlength_extra = extra_needed - sub_start_extra_needed;
+      PCRE2_SIZE newlength =
+        (newlength_extra > ~(PCRE2_SIZE)0 - newlength_buf)?  /* Integer overflow */
+        ~(PCRE2_SIZE)0 : newlength_buf + newlength_extra;    /* Cap the addition */
       PCRE2_SIZE oldlength = ovector[1] - ovector[0];
 
-      buff_offset -= newlength;
-      lengthleft += newlength;
-      if (!replacement_only) CHECKMEMCPY(subject + ovector[0], oldlength);
+      /* Be pessimistic: request whichever buffer size is larger out of
+      accepting or rejecting the substitution. */
 
-      /* A negative return means do not do any more. */
+      if (oldlength > newlength)
+        {
+        PCRE2_SIZE additional = oldlength - newlength;
+        if (additional > ~(PCRE2_SIZE)0 - extra_needed)  /* Integer overflow */
+          goto TOOLARGEREPLACE;
+        extra_needed += additional;
+        }
 
-      if (rc < 0) suboptions &= (~PCRE2_SUBSTITUTE_GLOBAL);
+      /* Proceed as if the callout did not return a negative. A negative
+      effectively rejects all future substitutions, but we want to examine them
+      pessimistically. */
       }
     }
 
@@ -973,6 +1660,9 @@ needed. Otherwise, an overflow generates an immediate error return. */
 if (overflowed)
   {
   rc = PCRE2_ERROR_NOMEMORY;
+
+  if (extra_needed > ~(PCRE2_SIZE)0 - buff_length)  /* Integer overflow */
+    goto TOOLARGEREPLACE;
   *blength = buff_length + extra_needed;
   }
 
@@ -994,6 +1684,14 @@ NOROOM:
 rc = PCRE2_ERROR_NOMEMORY;
 goto EXIT;
 
+CASEERROR:
+rc = PCRE2_ERROR_REPLACECASE;
+goto EXIT;
+
+TOOLARGEREPLACE:
+rc = PCRE2_ERROR_TOOLARGEREPLACE;
+goto EXIT;
+
 BAD:
 rc = PCRE2_ERROR_BADREPLACEMENT;
 goto PTREXIT;
diff --git a/engine/thirdparty/pcre2/src/pcre2_substring.c b/engine/thirdparty/pcre2/src/pcre2_substring.c
index 14e919dc..88afd234 100644
--- a/engine/thirdparty/pcre2/src/pcre2_substring.c
+++ b/engine/thirdparty/pcre2/src/pcre2_substring.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -486,7 +486,7 @@ pcre2_substring_nametable_scan(const pcre2_code *code, PCRE2_SPTR stringname,
 uint16_t bot = 0;
 uint16_t top = code->name_count;
 uint16_t entrysize = code->name_entry_size;
-PCRE2_SPTR nametable = (PCRE2_SPTR)((char *)code + sizeof(pcre2_real_code));
+PCRE2_SPTR nametable = (PCRE2_SPTR)((const char *)code + sizeof(pcre2_real_code));
 
 while (top > bot)
   {
diff --git a/engine/thirdparty/pcre2/src/pcre2_tables.c b/engine/thirdparty/pcre2/src/pcre2_tables.c
index e00252f1..097a1acc 100644
--- a/engine/thirdparty/pcre2/src/pcre2_tables.c
+++ b/engine/thirdparty/pcre2/src/pcre2_tables.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2021 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -171,9 +171,9 @@ are implementing).
 6. Do not break after Prepend characters.
 
 7. Do not break within emoji modifier sequences or emoji zwj sequences. That
-   is, do not break between characters with the Extended_Pictographic property.
-   Extend and ZWJ characters are allowed between the characters; this cannot be
-   represented in this table, the code has to deal with it.
+   is, do not break between characters with the Extended_Pictographic property
+   if a ZWJ intervenes. Extend characters are allowed between the characters;
+   this cannot be represented in this table, the code has to deal with it.
 
 8. Do not break within emoji flag sequences. That is, do not break between
    regional indicator (RI) symbols if there are an odd number of RI characters
@@ -203,8 +203,8 @@ const uint32_t PRIV(ucp_gbtable)[] = {
    ESZ|(1u<<ucp_gbT),                                   /* 10 LVT */
    (1u<<ucp_gbRegional_Indicator),                      /* 11 Regional Indicator */
    ESZ,                                                 /* 12 Other */
-   ESZ,                                                 /* 13 ZWJ */
-   ESZ|(1u<<ucp_gbExtended_Pictographic)                /* 14 Extended Pictographic */
+   ESZ|(1u<<ucp_gbExtended_Pictographic),               /* 13 ZWJ */
+   ESZ                                                  /* 14 Extended Pictographic */
 };
 
 #undef ESZ
diff --git a/engine/thirdparty/pcre2/src/pcre2_ucd.c b/engine/thirdparty/pcre2/src/pcre2_ucd.c
index 97dbc8b2..4c5e5163 100644
--- a/engine/thirdparty/pcre2/src/pcre2_ucd.c
+++ b/engine/thirdparty/pcre2/src/pcre2_ucd.c
@@ -72,11 +72,13 @@ const ucd_record PRIV(ucd_records)[] = {{0,0,0,0,0,0,0}};
 const uint16_t PRIV(ucd_stage1)[] = {0};
 const uint16_t PRIV(ucd_stage2)[] = {0};
 const uint32_t PRIV(ucd_caseless_sets)[] = {0};
+const uint32_t PRIV(ucd_nocase_ranges)[] = {0};
+const uint32_t PRIV(ucd_nocase_ranges_size) = 0;
 #else
 
-/* Total size: 112564 bytes, block size: 128. */
+/* Total size: 116564 bytes, block size: 128. */
 
-const char *PRIV(unicode_version) = "15.0.0";
+const char *PRIV(unicode_version) = "16.0.0";
 
 /* When recompiling tables with a new Unicode version, please check the types
 in this structure definition with those in pcre2_internal.h (the actual field
@@ -140,28 +142,87 @@ const uint32_t PRIV(ucd_caseless_sets)[] = {
   0x004b,  0x006b,  0x212a,  NOTACHAR,
   0x00c5,  0x00e5,  0x212b,  NOTACHAR,
   0x1c88,  0xa64a,  0xa64b,  NOTACHAR,
+  0x0069,  0x0130,  NOTACHAR,
+  0x0049,  0x0131,  NOTACHAR,
 };
 
+/* This is the index, within ucd_caseless_sets, of the additional
+Turkish case-equivalences. The dotted I ones are this offset; the
+dotless I are +3 from here. */
+
+const uint32_t PRIV(ucd_turkish_dotted_i_caseset) = 112;
+
 /* When #included in pcre2test, we don't need the table of digit sets, nor the
 the large main UCD tables. */
 
 #ifndef PCRE2_PCRE2TEST
 
+/* This table contains character ranges, where the characters in the range have
+no other case. Both start and end values are excluded from the range. */
+
+const uint32_t PRIV(ucd_nocase_ranges)[] = {
+  0x0000, 0x0041, /* 64 */
+  0x007a, 0x00b5, /* 58 */
+  0x00b5, 0x00c0, /* 10 */
+  0x0292, 0x029d, /* 10 */
+  0x029e, 0x0345, /* 166 */
+  0x0345, 0x0370, /* 42 */
+  0x0481, 0x048a, /* 8 */
+  0x0556, 0x0561, /* 10 */
+  0x0586, 0x10a0, /* 2841 */
+  0x10ff, 0x13a0, /* 672 */
+  0x13fd, 0x1c80, /* 2178 */
+  0x1cbf, 0x1d79, /* 185 */
+  0x1d7d, 0x1d8e, /* 16 */
+  0x1d8e, 0x1e00, /* 113 */
+  0x1ffc, 0x2126, /* 297 */
+  0x2132, 0x214e, /* 27 */
+  0x214e, 0x2160, /* 17 */
+  0x2184, 0x24b6, /* 817 */
+  0x24e9, 0x2c00, /* 1814 */
+  0x2cf3, 0x2d00, /* 12 */
+  0x2d2d, 0xa640, /* 30994 */
+  0xa66d, 0xa680, /* 18 */
+  0xa69b, 0xa722, /* 134 */
+  0xa76f, 0xa779, /* 9 */
+  0xa7dc, 0xa7f5, /* 24 */
+  0xa7f6, 0xab53, /* 860 */
+  0xab53, 0xab70, /* 28 */
+  0xabbf, 0xfb05, /* 20293 */
+  0xfb06, 0xff21, /* 1050 */
+  0xff5a, 0x10400, /* 1189 */
+  0x1044f, 0x104b0, /* 96 */
+  0x104fb, 0x10570, /* 116 */
+  0x105bc, 0x10c80, /* 1731 */
+  0x10cb2, 0x10cc0, /* 13 */
+  0x10cf2, 0x10d50, /* 93 */
+  0x10d65, 0x10d70, /* 10 */
+  0x10d85, 0x118a0, /* 2842 */
+  0x118df, 0x16e40, /* 21856 */
+  0x16e7f, 0x1e900, /* 31360 */
+  0x1e943, 0x110000, /* 988860 */
+  0xffffffff, 0xffffffff /* terminator */
+};
+
+/* Total: 1110933 characters. */
+const uint32_t PRIV(ucd_nocase_ranges_size) = 80;
+
 /* This table lists the code points for the '9' characters in each set of
 decimal digits. It is used to ensure that all the digits in a script run come
 from the same set. */
 
 const uint32_t PRIV(ucd_digit_sets)[] = {
-  68,  /* Number of subsequent values */
+  76,  /* Number of subsequent values */
   0x00039, 0x00669, 0x006f9, 0x007c9, 0x0096f, 0x009ef, 0x00a6f, 0x00aef,
   0x00b6f, 0x00bef, 0x00c6f, 0x00cef, 0x00d6f, 0x00def, 0x00e59, 0x00ed9,
   0x00f29, 0x01049, 0x01099, 0x017e9, 0x01819, 0x0194f, 0x019d9, 0x01a89,
   0x01a99, 0x01b59, 0x01bb9, 0x01c49, 0x01c59, 0x0a629, 0x0a8d9, 0x0a909,
-  0x0a9d9, 0x0a9f9, 0x0aa59, 0x0abf9, 0x0ff19, 0x104a9, 0x10d39, 0x1106f,
-  0x110f9, 0x1113f, 0x111d9, 0x112f9, 0x11459, 0x114d9, 0x11659, 0x116c9,
-  0x11739, 0x118e9, 0x11959, 0x11c59, 0x11d59, 0x11da9, 0x11f59, 0x16a69,
-  0x16ac9, 0x16b59, 0x1d7d7, 0x1d7e1, 0x1d7eb, 0x1d7f5, 0x1d7ff, 0x1e149,
-  0x1e2f9, 0x1e4f9, 0x1e959, 0x1fbf9,
+  0x0a9d9, 0x0a9f9, 0x0aa59, 0x0abf9, 0x0ff19, 0x104a9, 0x10d39, 0x10d49,
+  0x1106f, 0x110f9, 0x1113f, 0x111d9, 0x112f9, 0x11459, 0x114d9, 0x11659,
+  0x116c9, 0x116d9, 0x116e3, 0x11739, 0x118e9, 0x11959, 0x11bf9, 0x11c59,
+  0x11d59, 0x11da9, 0x11f59, 0x16139, 0x16a69, 0x16ac9, 0x16b59, 0x16d79,
+  0x1ccf9, 0x1d7d7, 0x1d7e1, 0x1d7eb, 0x1d7f5, 0x1d7ff, 0x1e149, 0x1e2f9,
+  0x1e4f9, 0x1e5fa, 0x1e959, 0x1fbf9,
 };
 
 /* This vector is a list of script bitsets for the Script Extension property.
@@ -169,69 +230,117 @@ The number of 32-bit words in each bitset is #defined in pcre2_ucp.h as
 ucd_script_sets_item_size. */
 
 const uint32_t PRIV(ucd_script_sets)[] = {
- 0x00000000u, 0x00000000u, 0x00000000u,
- 0x00000080u, 0x00000000u, 0x00000000u,
- 0x00000040u, 0x00000000u, 0x00000000u,
- 0x00000000u, 0x00004000u, 0x00000000u,
- 0x00000002u, 0x00000000u, 0x00000000u,
- 0x00800000u, 0x00000000u, 0x00000000u,
- 0x00000001u, 0x00000000u, 0x00000000u,
- 0x00000000u, 0x00000000u, 0x00000001u,
- 0x00000010u, 0x00000000u, 0x00000000u,
- 0x00000008u, 0x00000004u, 0x00000000u,
- 0x00000008u, 0x40000000u, 0x00000000u,
- 0x00000008u, 0x00000040u, 0x00000000u,
- 0x00000018u, 0x00000000u, 0x00000000u,
- 0x00000028u, 0x00000000u, 0x00000000u,
- 0x000000c0u, 0x00000000u, 0x00000000u,
- 0x00c00000u, 0x00000000u, 0x00000000u,
- 0x00000000u, 0x00000102u, 0x00000000u,
- 0x80000000u, 0x00000001u, 0x00000000u,
- 0x00000004u, 0x00000008u, 0x00000000u,
- 0x00000005u, 0x00000000u, 0x00000000u,
- 0x00000004u, 0x00200000u, 0x00000000u,
- 0x00000014u, 0x00000000u, 0x00000000u,
- 0x00000040u, 0x00008000u, 0x00000000u,
- 0x00000040u, 0x00000000u, 0x00000001u,
- 0x00000040u, 0x00001000u, 0x00000000u,
- 0x00000840u, 0x00000000u, 0x00000000u,
- 0x00020001u, 0x00000000u, 0x00000000u,
- 0x00000800u, 0x00008000u, 0x00000000u,
- 0x00000200u, 0x00010000u, 0x00000000u,
- 0x00000100u, 0x02000000u, 0x00000000u,
- 0x00800001u, 0x00000000u, 0x00000000u,
- 0x00300000u, 0x00000000u, 0x00000000u,
- 0x00002000u, 0x00000000u, 0x00000001u,
- 0x00080001u, 0x00000000u, 0x00000000u,
- 0x00000000u, 0x00080000u, 0x00000008u,
- 0x00080000u, 0x00000020u, 0x00000000u,
- 0x00000038u, 0x00000000u, 0x00000000u,
- 0x00000028u, 0x00000000u, 0x00000002u,
- 0x00000080u, 0x00000810u, 0x00000000u,
- 0x40010000u, 0x00000800u, 0x00000000u,
- 0x80000000u, 0x00000001u, 0x00000004u,
- 0x80000000u, 0x00020001u, 0x00000000u,
- 0x00002040u, 0x00008000u, 0x00000000u,
- 0x00000041u, 0x00008000u, 0x00000000u,
- 0x00b00000u, 0x00000000u, 0x00000000u,
- 0x00010001u, 0x00000080u, 0x00000000u,
- 0x000020c0u, 0x00008000u, 0x00000000u,
- 0x1e000000u, 0x00000000u, 0x00000000u,
- 0x00000040u, 0x10040200u, 0x00000000u,
- 0x00f40000u, 0x00000000u, 0x00000000u,
- 0x00000038u, 0x40000040u, 0x00000002u,
- 0x01f40000u, 0x00000000u, 0x00000000u,
- 0x00007c40u, 0x00000000u, 0x00000000u,
- 0x00000038u, 0x44000040u, 0x00000002u,
- 0x000034c0u, 0x01008000u, 0x00000001u,
- 0x00000018u, 0xc4480400u, 0x00000008u,
- 0x00000340u, 0x11952200u, 0x00000000u,
- 0x00007fc1u, 0x01008000u, 0x00000000u,
- 0x00007fc1u, 0x01009000u, 0x00000000u,
- 0x00002340u, 0x11952200u, 0x00000001u,
- 0x00006340u, 0x11952200u, 0x00000001u,
- 0x0000ffc0u, 0x3984a010u, 0x00000001u,
- 0x2000ffc0u, 0x3984a010u, 0x00000001u,
+ 0x00000000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x40200003u, 0x00381901u, 0x00100246u, 0x00000000u,
+ 0x00040305u, 0x00800000u, 0x08000000u, 0x00000000u,
+ 0x20000001u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000001u, 0x00800000u, 0x00000000u, 0x00000000u,
+ 0x00040001u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x01000007u, 0x00000840u, 0x80000200u, 0x00000000u,
+ 0x01000007u, 0x00000040u, 0x80010000u, 0x00000001u,
+ 0x01000005u, 0x00002000u, 0x00000000u, 0x00000000u,
+ 0x00040041u, 0x00001000u, 0x80000000u, 0x00000000u,
+ 0x01000047u, 0x00002801u, 0x00010001u, 0x00000001u,
+ 0x10000001u, 0x00001801u, 0x00000004u, 0x00000000u,
+ 0x00000007u, 0x00000000u, 0x00000200u, 0x00000000u,
+ 0x00000051u, 0x00002840u, 0x00000202u, 0x00000001u,
+ 0x0000005fu, 0x00000041u, 0x00000202u, 0x00000000u,
+ 0x00000001u, 0x00002000u, 0x00000000u, 0x00000000u,
+ 0x00000041u, 0x00000000u, 0x00000002u, 0x00000000u,
+ 0x01000005u, 0x00000000u, 0x00010000u, 0x00000000u,
+ 0x01000001u, 0x00000040u, 0x00000000u, 0x00000000u,
+ 0x00000001u, 0x00000000u, 0x80000000u, 0x00000000u,
+ 0x00800001u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000005u, 0x00000000u, 0x00000000u, 0x00000001u,
+ 0x00000003u, 0x00000000u, 0x00000200u, 0x00000001u,
+ 0x00000041u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x11000041u, 0x00000000u, 0x00000002u, 0x00000000u,
+ 0x01000041u, 0x00000000u, 0x00000002u, 0x00000000u,
+ 0x00000041u, 0x00000000u, 0x80000000u, 0x00000000u,
+ 0x01000041u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x01040001u, 0x00000001u, 0x80000001u, 0x00000000u,
+ 0x00000002u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000001u, 0x00000000u, 0x00010000u, 0x00000000u,
+ 0x00000001u, 0x00000000u, 0x00000001u, 0x00000001u,
+ 0x00000001u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000002u, 0x00000800u, 0x00000000u, 0x00000000u,
+ 0x00000004u, 0x00000000u, 0x00000200u, 0x00000000u,
+ 0x00000004u, 0x00001000u, 0x00000000u, 0x00000000u,
+ 0x00000005u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00200008u, 0x00001000u, 0x00000000u, 0x00000000u,
+ 0x000000e0u, 0x00010000u, 0x11200000u, 0x00000000u,
+ 0x000000e0u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x000000e0u, 0x00010000u, 0x11208000u, 0x00000000u,
+ 0x00000060u, 0x08000000u, 0x04608480u, 0x00000000u,
+ 0x00000060u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x000000a0u, 0x00000000u, 0x01000000u, 0x00000000u,
+ 0x00000020u, 0x00000000u, 0x00200000u, 0x00000000u,
+ 0x0001ff01u, 0x40000000u, 0x00001008u, 0x00000000u,
+ 0x0001ff01u, 0x00000000u, 0x00001008u, 0x00000000u,
+ 0x0003ff00u, 0x80004000u, 0x409c1848u, 0x00000000u,
+ 0x0003ff00u, 0x80004020u, 0x609c1848u, 0x00000000u,
+ 0x00000100u, 0x04000000u, 0x00080040u, 0x00000000u,
+ 0x00000200u, 0x10004000u, 0x00000000u, 0x00000000u,
+ 0x00000400u, 0x00000000u, 0x00002000u, 0x00000000u,
+ 0x00000800u, 0x00000000u, 0x00000010u, 0x00000000u,
+ 0x00002000u, 0x00000000u, 0x00000008u, 0x00000000u,
+ 0x00008000u, 0x00000000u, 0x00800000u, 0x00000002u,
+ 0x00100000u, 0x10000040u, 0x00000000u, 0x00000000u,
+ 0x00200001u, 0x00001000u, 0x00000000u, 0x00000000u,
+ 0x02000000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x0000001eu, 0x00000000u, 0x00000000u,
+ 0x04000000u, 0x00008000u, 0x00000000u, 0x00000000u,
+ 0x00008300u, 0x00000000u, 0x00000008u, 0x00000000u,
+ 0x00000100u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00008100u, 0x00000000u, 0x00000008u, 0x00000000u,
+ 0x00000300u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000100u, 0x40000000u, 0x00000000u, 0x00000000u,
+ 0x0001f100u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000100u, 0x00000000u, 0x00800000u, 0x00000000u,
+ 0x0003d300u, 0x00000000u, 0x00801008u, 0x00000002u,
+ 0x00000100u, 0x00000000u, 0x00000008u, 0x00000000u,
+ 0x00008100u, 0x00000000u, 0x00000008u, 0x00000002u,
+ 0x00000200u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00000000u, 0x00800000u, 0x00000000u,
+ 0x00000045u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000040u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x04000001u, 0x00008000u, 0x00000000u, 0x00000000u,
+ 0x00000020u, 0x00000000u, 0x00008000u, 0x00000000u,
+ 0x00200000u, 0x020c1000u, 0x00004000u, 0x00000000u,
+ 0x00000002u, 0x20080000u, 0x00004000u, 0x00000000u,
+ 0x00000101u, 0x00000000u, 0x00000008u, 0x00000000u,
+ 0x00000001u, 0x00000800u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x02200000u, 0x00000000u, 0x00000000u,
+ 0x00200000u, 0x04780000u, 0x00004000u, 0x00000000u,
+ 0x00000000u, 0x00000000u, 0x00000002u, 0x00000000u,
+ 0x00000020u, 0x00000000u, 0x0000c000u, 0x00000000u,
+ 0x40000000u, 0x00000000u, 0x00020000u, 0x00000000u,
+ 0xfc400000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0xfc400000u, 0x00008000u, 0x00000000u, 0x00000000u,
+ 0x78400000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x40000000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0xfc480000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0xfc480000u, 0x00800000u, 0x00000000u, 0x00000000u,
+ 0xf8400000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x60000000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x18000000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x58000000u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x40000001u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00018d00u, 0xc4000000u, 0x00881950u, 0x00000002u,
+ 0x00008d00u, 0xc4000000u, 0x00881950u, 0x00000002u,
+ 0x00000d00u, 0x84000000u, 0x00081950u, 0x00000000u,
+ 0x00000d00u, 0xc4000000u, 0x00081950u, 0x00000000u,
+ 0x00000300u, 0x00000000u, 0x00000000u, 0x00000002u,
+ 0x00002100u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00100001u, 0x00020000u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x01000400u, 0x00000000u, 0x00000000u,
+ 0x00000020u, 0x00010000u, 0x00000000u, 0x00000000u,
+ 0x000000a0u, 0x00000000u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00000280u, 0x02000000u, 0x00000000u,
+ 0x00000000u, 0x00000280u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00000280u, 0x00000020u, 0x00000000u,
+ 0x00000020u, 0x00000800u, 0x00000000u, 0x00000000u,
+ 0x00000000u, 0x00000000u, 0x04000080u, 0x00000000u,
 };
 
 /* This vector is a list of bitsets for Boolean properties. The number of
@@ -241,181 +350,196 @@ pcre2_ucp.h. */
 const uint32_t PRIV(ucd_boolprop_sets)[] = {
  0x00000000u, 0x00000000u,
  0x00000001u, 0x00000000u,
- 0x00000001u, 0x00020040u,
- 0x00800001u, 0x00020040u,
- 0x00800001u, 0x00002820u,
- 0x00800001u, 0x00000120u,
- 0x00830001u, 0x00000020u,
- 0x00800001u, 0x00000020u,
- 0x00800021u, 0x00000120u,
- 0x00800011u, 0x00000020u,
- 0x00800001u, 0x00000028u,
- 0x00800001u, 0x00002020u,
- 0x00801001u, 0x00000020u,
- 0x00800021u, 0x00002820u,
- 0x24830003u, 0x00040000u,
- 0x00800021u, 0x00002020u,
- 0x00800011u, 0x00000028u,
- 0x648003c7u, 0x000c8000u,
- 0x608003c5u, 0x000c8000u,
- 0x00808021u, 0x00000028u,
- 0x20800001u, 0x00040000u,
- 0x00808021u, 0x00000020u,
- 0x64800d47u, 0x000c0004u,
- 0x60800d45u, 0x000c0004u,
- 0x60800d45u, 0x000c1004u,
- 0x00000000u, 0x00020040u,
- 0x00800000u, 0x00020000u,
- 0x00800000u, 0x00000020u,
+ 0x00000001u, 0x00400800u,
+ 0x00800001u, 0x00400800u,
+ 0x00800001u, 0x00050400u,
+ 0x00800001u, 0x00002400u,
+ 0x00830001u, 0x00000400u,
+ 0x00800001u, 0x00000400u,
+ 0x00800021u, 0x00002400u,
+ 0x00800011u, 0x00000400u,
+ 0x00800001u, 0x00000480u,
+ 0x00800001u, 0x00040400u,
+ 0x00801001u, 0x00000400u,
+ 0x00800021u, 0x00050400u,
+ 0x04830003u, 0x00800001u,
+ 0x00800021u, 0x00040400u,
+ 0x00800011u, 0x00000480u,
+ 0x048003c7u, 0x01900003u,
+ 0x008003c5u, 0x01900003u,
+ 0x00808021u, 0x00000480u,
+ 0x00800001u, 0x00800001u,
+ 0x00808021u, 0x00000400u,
+ 0x04800d47u, 0x01800043u,
+ 0x00800d45u, 0x01800043u,
+ 0x00800d45u, 0x01820043u,
+ 0x00000000u, 0x00400800u,
+ 0x00800000u, 0x00400000u,
+ 0x00800000u, 0x00000400u,
  0x00808020u, 0x00000000u,
- 0x00a10000u, 0x00000020u,
- 0x60800044u, 0x000c0004u,
- 0x00800010u, 0x00000120u,
- 0x00800000u, 0x00000028u,
+ 0x00a10000u, 0x00000400u,
+ 0x00800044u, 0x01800043u,
+ 0x00800010u, 0x00002400u,
+ 0x00800000u, 0x00000480u,
  0x00002020u, 0x00000000u,
+ 0x40800000u, 0x00000000u,
+ 0x00800dc4u, 0x01800043u,
+ 0x00c08020u, 0x00800001u,
  0x00800000u, 0x00000000u,
- 0x60800dc4u, 0x000c0004u,
- 0x20c08020u, 0x00040000u,
- 0x608003c4u, 0x000c8000u,
- 0x60800d44u, 0x000c0004u,
- 0x60800d44u, 0x000c1004u,
- 0x60804dc4u, 0x000c0004u,
- 0x60800004u, 0x000c0000u,
- 0x608007c4u, 0x000c8000u,
- 0x60800bc4u, 0x000c0000u,
- 0x60808064u, 0x000c0004u,
- 0x60808064u, 0x000c1004u,
- 0x60808024u, 0x000c0000u,
- 0x60c08024u, 0x000c0000u,
- 0x21008020u, 0x00040000u,
- 0x21008de4u, 0x00040004u,
- 0x21002020u, 0x00040000u,
- 0x21000020u, 0x00040000u,
- 0x60808064u, 0x00000004u,
- 0x00800000u, 0x00002000u,
- 0x20800020u, 0x00042000u,
- 0x60800dc4u, 0x000c000cu,
- 0x60800044u, 0x000c8008u,
- 0x60800044u, 0x000c8000u,
- 0x608003c4u, 0x000c8008u,
- 0x00800000u, 0x00000008u,
- 0x01000020u, 0x00000000u,
+ 0x008003c4u, 0x01900003u,
+ 0x00800d44u, 0x01800043u,
+ 0x00800d44u, 0x01820043u,
+ 0x00804dc4u, 0x01800043u,
+ 0x00800004u, 0x01800003u,
+ 0x008007c4u, 0x01900003u,
+ 0x00800bc4u, 0x01800003u,
+ 0x00808064u, 0x01800043u,
+ 0x00808064u, 0x01820043u,
+ 0x00808024u, 0x01800003u,
+ 0x00c08024u, 0x01800003u,
+ 0x01008020u, 0x00800009u,
+ 0x01008de4u, 0x00800049u,
+ 0x01002020u, 0x00800009u,
+ 0x01000020u, 0x00800009u,
+ 0x01000024u, 0x00800009u,
+ 0x00808064u, 0x00000043u,
+ 0x00800000u, 0x00040000u,
+ 0x00800020u, 0x00840001u,
+ 0x00800dc4u, 0x018000c3u,
+ 0x00800044u, 0x01900083u,
+ 0x00800044u, 0x01900003u,
+ 0x008003c4u, 0x01900083u,
+ 0x00800000u, 0x00000080u,
+ 0x01000020u, 0x00000008u,
  0x00800020u, 0x00000000u,
- 0x00800000u, 0x00002800u,
+ 0x00800000u, 0x00050000u,
  0x00801000u, 0x00000000u,
- 0x21008024u, 0x00040000u,
- 0x21000024u, 0x00040000u,
- 0x00000020u, 0x00000080u,
+ 0x01008024u, 0x00800009u,
+ 0x00000020u, 0x00001000u,
  0x00002028u, 0x00000000u,
- 0x60c00024u, 0x000c0000u,
- 0x20800000u, 0x00040000u,
- 0x60804004u, 0x000c0000u,
- 0x60800024u, 0x000c0000u,
- 0x20800004u, 0x00040000u,
- 0x23008020u, 0x00040000u,
- 0x21000004u, 0x00040000u,
- 0x21408020u, 0x00040000u,
- 0x60800004u, 0x00040000u,
- 0x23000024u, 0x00040000u,
- 0x60800004u, 0x000c0002u,
+ 0x00c00024u, 0x01800003u,
+ 0x01000024u, 0x00800109u,
+ 0x01008020u, 0x00800109u,
+ 0x00800000u, 0x00800001u,
+ 0x00804004u, 0x01800003u,
+ 0x00800024u, 0x01800003u,
+ 0x01000020u, 0x00800109u,
+ 0x01008024u, 0x00800109u,
+ 0x00800004u, 0x00800001u,
+ 0x00800004u, 0x0180000bu,
+ 0x03008020u, 0x00800009u,
+ 0x01000004u, 0x00800009u,
+ 0x01400024u, 0x00800009u,
+ 0x01408020u, 0x00800009u,
+ 0x00800004u, 0x00800003u,
+ 0x03008024u, 0x00800009u,
+ 0x00800004u, 0x01800023u,
  0x00800010u, 0x00000000u,
- 0x20808000u, 0x00040000u,
- 0x21004024u, 0x00040000u,
- 0x20808004u, 0x00040000u,
- 0x60800944u, 0x000c0004u,
- 0x60800064u, 0x000c0004u,
- 0x60802004u, 0x000c0000u,
- 0x60800344u, 0x000c8000u,
- 0x22808000u, 0x00040000u,
- 0x22800000u, 0x00040000u,
+ 0x00808000u, 0x00800001u,
+ 0x01004024u, 0x00800009u,
+ 0x00808004u, 0x00800001u,
+ 0x00800944u, 0x01800043u,
+ 0x00800064u, 0x01800043u,
+ 0x00802004u, 0x01800003u,
+ 0x00800344u, 0x01900003u,
+ 0x03008000u, 0x00800009u,
  0x00c00000u, 0x00000000u,
- 0x21002020u, 0x00050000u,
- 0x61000024u, 0x000c0000u,
- 0x23000020u, 0x00040000u,
- 0x01008020u, 0x00000000u,
- 0x21408024u, 0x00040000u,
+ 0x01002020u, 0x00a00009u,
+ 0x01000024u, 0x0180000bu,
+ 0x01008020u, 0x00000008u,
+ 0x01408024u, 0x00800009u,
  0x00808000u, 0x00000000u,
- 0x60800044u, 0x000c1004u,
- 0x60800064u, 0x000c1004u,
- 0x01002020u, 0x00000001u,
- 0x00022020u, 0x00000001u,
- 0x00002028u, 0x00000040u,
- 0x00801000u, 0x00000020u,
- 0x00800020u, 0x00000120u,
- 0x00800000u, 0x00000120u,
- 0x00800020u, 0x00000020u,
- 0x00a10000u, 0x00002820u,
- 0x00800000u, 0x00002820u,
- 0x20800000u, 0x00040008u,
- 0x00800010u, 0x00000020u,
- 0x00002020u, 0x00000008u,
+ 0x00800044u, 0x01820043u,
+ 0x00800064u, 0x01820043u,
+ 0x01002020u, 0x00800011u,
+ 0x00022020u, 0x00800019u,
+ 0x00002028u, 0x00000800u,
+ 0x00801000u, 0x00000400u,
+ 0x00800020u, 0x00002400u,
+ 0x00800000u, 0x00002400u,
+ 0x00800020u, 0x00050400u,
+ 0x00800020u, 0x00000400u,
+ 0x00a10000u, 0x00050400u,
+ 0x00800000u, 0x00050400u,
+ 0x00800000u, 0x00800081u,
+ 0x00800010u, 0x00000400u,
+ 0x00002020u, 0x00000080u,
  0x00002000u, 0x00000000u,
  0x00006020u, 0x00000000u,
- 0x00801000u, 0x00000008u,
- 0x00800010u, 0x00000008u,
- 0x21000020u, 0x00040008u,
- 0x01020020u, 0x00000000u,
- 0x60800044u, 0x000c000cu,
- 0x60800000u, 0x000c0008u,
+ 0x40800000u, 0x00000080u,
+ 0x40801000u, 0x00000080u,
+ 0x40800010u, 0x00000080u,
+ 0x01000020u, 0x00800089u,
+ 0x01020020u, 0x00000008u,
+ 0x00800044u, 0x018000c3u,
+ 0x00800000u, 0x01800083u,
  0x00a10000u, 0x00000000u,
- 0x60800000u, 0x000c0000u,
- 0x60800004u, 0x000c0008u,
- 0x60a10044u, 0x000c0004u,
- 0x60800044u, 0x000c100cu,
- 0x00a10000u, 0x00000028u,
- 0x00800010u, 0x00000028u,
- 0x00801000u, 0x00000028u,
- 0x00b10000u, 0x00000020u,
- 0x00804010u, 0x00000020u,
- 0x00a00000u, 0x00000020u,
- 0x00000000u, 0x00000020u,
- 0x008003c4u, 0x00008000u,
- 0x00a103c4u, 0x00008000u,
- 0x00800d44u, 0x00000004u,
- 0x00b10000u, 0x00000028u,
- 0x00a00000u, 0x00000028u,
- 0x00a90000u, 0x00000020u,
- 0x00b90000u, 0x00000020u,
- 0x00808024u, 0x00000020u,
- 0x00800000u, 0x00002020u,
- 0x00800000u, 0x00000200u,
+ 0x00800000u, 0x01800003u,
+ 0x00800004u, 0x01800083u,
+ 0x00a10044u, 0x01800043u,
+ 0x00800044u, 0x018200c3u,
+ 0x00a10000u, 0x00000480u,
+ 0xc0800000u, 0x00000480u,
+ 0x00800010u, 0x00000480u,
+ 0x00801000u, 0x00000480u,
+ 0x00b10000u, 0x00000400u,
+ 0x00804010u, 0x00000400u,
+ 0x00a00000u, 0x00000400u,
+ 0x00000000u, 0x00000400u,
+ 0x008003c4u, 0x00100000u,
+ 0x00a103c4u, 0x00100000u,
+ 0x00800d44u, 0x00000040u,
+ 0x00b10000u, 0x00000480u,
+ 0x00a00000u, 0x00000480u,
+ 0x00a90000u, 0x00000400u,
+ 0x00b90000u, 0x00000400u,
+ 0x03000020u, 0x00800009u,
+ 0x00808024u, 0x00000400u,
+ 0x00800000u, 0x00040400u,
+ 0x00800000u, 0x00004000u,
  0x08800000u, 0x00000000u,
  0x10800000u, 0x00000000u,
- 0xe0800004u, 0x000c0000u,
- 0x21008000u, 0x00040000u,
- 0x00a11000u, 0x00000020u,
- 0x60808020u, 0x00000000u,
- 0xe0800004u, 0x000c4000u,
- 0x60808004u, 0x000c0000u,
- 0x60800004u, 0x00000000u,
- 0x00000000u, 0x00000010u,
- 0x21022020u, 0x00050000u,
- 0x00800000u, 0x00000100u,
- 0x00800020u, 0x00002800u,
+ 0x20800000u, 0x00000000u,
+ 0x00800004u, 0x01800007u,
+ 0x01008000u, 0x00800009u,
+ 0x00a11000u, 0x00000400u,
+ 0x00808020u, 0x00000003u,
+ 0x00800004u, 0x01880007u,
+ 0x00808004u, 0x01800003u,
+ 0x00800004u, 0x00000003u,
+ 0x00000000u, 0x00000200u,
+ 0x01022020u, 0x00a00009u,
+ 0x00800000u, 0x00002000u,
+ 0x00800020u, 0x00050000u,
+ 0x00800020u, 0x00040000u,
+ 0x00801000u, 0x00000080u,
+ 0x00800010u, 0x00000080u,
  0x00800020u, 0x00002000u,
- 0x00800020u, 0x00000100u,
- 0x24800000u, 0x00040000u,
- 0x648003c4u, 0x000c8000u,
- 0x00808020u, 0x00000008u,
- 0x64800d44u, 0x000c0004u,
- 0x00800010u, 0x00000100u,
- 0x61008024u, 0x00040000u,
+ 0x04800000u, 0x00800001u,
+ 0x048003c4u, 0x01900003u,
+ 0x00808020u, 0x00000080u,
+ 0x04800d44u, 0x01800043u,
+ 0x00800010u, 0x00002000u,
+ 0x01008024u, 0x0080000bu,
  0x00000020u, 0x00000000u,
- 0x60c00004u, 0x000c0000u,
- 0x21400020u, 0x00040000u,
- 0xa1000020u, 0x00040000u,
- 0x21000000u, 0x00040000u,
+ 0x00c00004u, 0x01800003u,
+ 0x00c08004u, 0x01800003u,
+ 0x01400020u, 0x00800009u,
+ 0x01000020u, 0x0080000du,
+ 0x01008004u, 0x00800009u,
+ 0x01000000u, 0x00800009u,
+ 0xc0800000u, 0x00000080u,
  0x00a00000u, 0x00000000u,
  0x00b10000u, 0x00000000u,
  0x00200000u, 0x00000000u,
- 0x00800044u, 0x00008000u,
- 0x00a10044u, 0x00008000u,
- 0x00930000u, 0x00000400u,
+ 0x00800044u, 0x00100000u,
+ 0x00a10044u, 0x00100000u,
+ 0x00930000u, 0x00008000u,
  0x00b90000u, 0x00000000u,
  0x00a90000u, 0x00000000u,
- 0x00970020u, 0x00000000u,
+ 0x00970020u, 0x00000008u,
  0x00b30000u, 0x00000000u,
- 0x01022020u, 0x00000000u,
+ 0x01022020u, 0x00000008u,
 };
 
 /* These are the main two-stage UCD tables. The fields in each record are:
@@ -424,1430 +548,1550 @@ offset to multichar other cases or zero (8 bits), offset to other case or zero
 (32 bits, signed), bidi class (5 bits) and script extension (11 bits) packed
 into a 16-bit field, and offset in binary properties table (16 bits). */
 
-const ucd_record PRIV(ucd_records)[] = { /* 17076 bytes, record size 12 */
-  {    69,      0,      2,      0,      0,   6144,      2, }, /*   0 */
-  {    69,      0,      2,      0,      0,  43008,      4, }, /*   1 */
-  {    69,      0,      1,      0,      0,   4096,      4, }, /*   2 */
-  {    69,      0,      2,      0,      0,  45056,      4, }, /*   3 */
-  {    69,      0,      0,      0,      0,   4096,      4, }, /*   4 */
-  {    69,      0,      2,      0,      0,   4096,      2, }, /*   5 */
-  {    69,      0,      2,      0,      0,  43008,      2, }, /*   6 */
-  {    69,     29,     12,      0,      0,  45056,      6, }, /*   7 */
-  {    69,     21,     12,      0,      0,  28672,      8, }, /*   8 */
-  {    69,     21,     12,      0,      0,  28672,     10, }, /*   9 */
-  {    69,     21,     12,      0,      0,  14336,     12, }, /*  10 */
-  {    69,     23,     12,      0,      0,  14336,     14, }, /*  11 */
-  {    69,     21,     12,      0,      0,  14336,     14, }, /*  12 */
-  {    69,     21,     12,      0,      0,  28672,     14, }, /*  13 */
-  {    69,     21,     12,      0,      0,  28672,     16, }, /*  14 */
-  {    69,     22,     12,      0,      0,  28672,     18, }, /*  15 */
-  {    69,     18,     12,      0,      0,  28672,     18, }, /*  16 */
-  {    69,     21,     12,      0,      0,  28672,     12, }, /*  17 */
-  {    69,     25,     12,      0,      0,  12288,     20, }, /*  18 */
-  {    69,     21,     12,      0,      0,   8192,     22, }, /*  19 */
-  {    69,     17,     12,      0,      0,  12288,     24, }, /*  20 */
-  {    69,     21,     12,      0,      0,   8192,     26, }, /*  21 */
-  {    69,     21,     12,      0,      0,   8192,     14, }, /*  22 */
-  {    69,     13,     12,      0,      0,  10240,     28, }, /*  23 */
-  {    69,     21,     12,      0,      0,   8192,     30, }, /*  24 */
-  {    69,     21,     12,      0,      0,  28672,     22, }, /*  25 */
-  {    69,     25,     12,      0,      0,  28672,     32, }, /*  26 */
-  {    69,     25,     12,      0,      0,  28672,     20, }, /*  27 */
+const ucd_record PRIV(ucd_records)[] = { /* 18516 bytes, record size 12 */
+  {    99,      0,      2,      0,      0,   6144,      2, }, /*   0 */
+  {    99,      0,      2,      0,      0,  43008,      4, }, /*   1 */
+  {    99,      0,      1,      0,      0,   4096,      4, }, /*   2 */
+  {    99,      0,      2,      0,      0,  45056,      4, }, /*   3 */
+  {    99,      0,      0,      0,      0,   4096,      4, }, /*   4 */
+  {    99,      0,      2,      0,      0,   4096,      2, }, /*   5 */
+  {    99,      0,      2,      0,      0,  43008,      2, }, /*   6 */
+  {    99,     29,     12,      0,      0,  45056,      6, }, /*   7 */
+  {    99,     21,     12,      0,      0,  28672,      8, }, /*   8 */
+  {    99,     21,     12,      0,      0,  28672,     10, }, /*   9 */
+  {    99,     21,     12,      0,      0,  14336,     12, }, /*  10 */
+  {    99,     23,     12,      0,      0,  14336,     14, }, /*  11 */
+  {    99,     21,     12,      0,      0,  14336,     14, }, /*  12 */
+  {    99,     21,     12,      0,      0,  28672,     14, }, /*  13 */
+  {    99,     21,     12,      0,      0,  28672,     16, }, /*  14 */
+  {    99,     22,     12,      0,      0,  28672,     18, }, /*  15 */
+  {    99,     18,     12,      0,      0,  28672,     18, }, /*  16 */
+  {    99,     21,     12,      0,      0,  28672,     12, }, /*  17 */
+  {    99,     25,     12,      0,      0,  12288,     20, }, /*  18 */
+  {    99,     21,     12,      0,      0,   8192,     22, }, /*  19 */
+  {    99,     17,     12,      0,      0,  12288,     24, }, /*  20 */
+  {    99,     21,     12,      0,      0,   8192,     26, }, /*  21 */
+  {    99,     21,     12,      0,      0,   8192,     14, }, /*  22 */
+  {    99,     13,     12,      0,      0,  10240,     28, }, /*  23 */
+  {    99,     21,     12,      0,      0,   8192,     30, }, /*  24 */
+  {    99,     21,     12,      0,      0,  28672,     22, }, /*  25 */
+  {    99,     25,     12,      0,      0,  28672,     32, }, /*  26 */
+  {    99,     25,     12,      0,      0,  28672,     20, }, /*  27 */
   {     0,      9,     12,      0,     32,  18432,     34, }, /*  28 */
   {     0,      9,     12,      0,     32,  18432,     36, }, /*  29 */
   {     0,      9,     12,    100,     32,  18432,     36, }, /*  30 */
   {     0,      9,     12,      1,     32,  18432,     36, }, /*  31 */
-  {    69,     24,     12,      0,      0,  28672,     38, }, /*  32 */
-  {    69,     16,     12,      0,      0,  28672,     40, }, /*  33 */
-  {    69,     24,     12,      0,      0,  28672,     42, }, /*  34 */
+  {    99,     24,     12,      0,      0,  28672,     38, }, /*  32 */
+  {    99,     16,     12,      0,      0,  28672,     40, }, /*  33 */
+  {    99,     24,     12,      0,      0,  28672,     42, }, /*  34 */
   {     0,      5,     12,      0,    -32,  18432,     44, }, /*  35 */
   {     0,      5,     12,      0,    -32,  18432,     46, }, /*  36 */
   {     0,      5,     12,      0,    -32,  18432,     48, }, /*  37 */
   {     0,      5,     12,    100,    -32,  18432,     46, }, /*  38 */
   {     0,      5,     12,      1,    -32,  18432,     46, }, /*  39 */
-  {    69,      0,      2,      0,      0,   6144,      0, }, /*  40 */
-  {    69,      0,      2,      0,      0,   4096,     50, }, /*  41 */
-  {    69,     29,     12,      0,      0,   8192,     52, }, /*  42 */
-  {    69,     21,     12,      0,      0,  28672,     54, }, /*  43 */
-  {    69,     23,     12,      0,      0,  14336,     54, }, /*  44 */
-  {    69,     26,     12,      0,      0,  28672,     54, }, /*  45 */
-  {    69,     24,     12,      0,      0,  28672,     56, }, /*  46 */
-  {    69,     26,     14,      0,      0,  28672,     58, }, /*  47 */
+  {    99,      0,      2,      0,      0,   6144,      0, }, /*  40 */
+  {    99,      0,      2,      0,      0,   4096,     50, }, /*  41 */
+  {    99,     29,     12,      0,      0,   8192,     52, }, /*  42 */
+  {    99,     21,     12,      0,      0,  28672,     54, }, /*  43 */
+  {    99,     23,     12,      0,      0,  14336,     54, }, /*  44 */
+  {    99,     26,     12,      0,      0,  28672,     54, }, /*  45 */
+  {    99,     24,     12,      0,      0,  28672,     56, }, /*  46 */
+  {    99,     26,     14,      0,      0,  28672,     58, }, /*  47 */
   {     0,      7,     12,      0,      0,  18432,     60, }, /*  48 */
-  {    69,     20,     12,      0,      0,  28672,     62, }, /*  49 */
-  {    69,     25,     12,      0,      0,  28672,     64, }, /*  50 */
-  {    69,      1,      2,      0,      0,   6144,     66, }, /*  51 */
-  {    69,     26,     12,      0,      0,  14336,     54, }, /*  52 */
-  {    69,     25,     12,      0,      0,  14336,     64, }, /*  53 */
-  {    69,     15,     12,      0,      0,  10240,     68, }, /*  54 */
-  {    69,      5,     12,     26,    775,  18432,     70, }, /*  55 */
-  {    69,     21,     12,      0,      0,  28672,     72, }, /*  56 */
-  {    69,     19,     12,      0,      0,  28672,     62, }, /*  57 */
-  {    69,     15,     12,      0,      0,  28672,     68, }, /*  58 */
-  {     0,      9,     12,      0,     32,  18432,     74, }, /*  59 */
-  {     0,      9,     12,    104,     32,  18432,     74, }, /*  60 */
+  {    99,     20,     12,      0,      0,  28672,     62, }, /*  49 */
+  {    99,     25,     12,      0,      0,  28672,     64, }, /*  50 */
+  {    99,      1,      2,      0,      0,   6144,     66, }, /*  51 */
+  {    99,     26,     12,      0,      0,  14336,     54, }, /*  52 */
+  {    99,     25,     12,      0,      0,  14336,     64, }, /*  53 */
+  {    99,     15,     12,      0,      0,  10240,     68, }, /*  54 */
+  {    99,      5,     12,     26,    775,  18432,     70, }, /*  55 */
+  {    99,     21,     12,      0,      0,  28676,     72, }, /*  56 */
+  {    99,     19,     12,      0,      0,  28672,     62, }, /*  57 */
+  {    99,     15,     12,      0,      0,  28672,     74, }, /*  58 */
+  {     0,      9,     12,      0,     32,  18432,     76, }, /*  59 */
+  {     0,      9,     12,    104,     32,  18432,     76, }, /*  60 */
   {     0,      5,     12,      0,   7615,  18432,     70, }, /*  61 */
-  {     0,      5,     12,      0,    -32,  18432,     76, }, /*  62 */
-  {     0,      5,     12,    104,    -32,  18432,     76, }, /*  63 */
-  {     0,      5,     12,      0,    121,  18432,     76, }, /*  64 */
-  {     0,      9,     12,      0,      1,  18432,     74, }, /*  65 */
-  {     0,      5,     12,      0,     -1,  18432,     76, }, /*  66 */
-  {     0,      5,     12,      0,     -1,  18432,     78, }, /*  67 */
-  {     0,      9,     12,      0,      0,  18432,     74, }, /*  68 */
-  {     0,      5,     12,      0,      0,  18432,     76, }, /*  69 */
+  {     0,      5,     12,      0,    -32,  18432,     78, }, /*  62 */
+  {     0,      5,     12,    104,    -32,  18432,     78, }, /*  63 */
+  {     0,      5,     12,      0,    121,  18432,     78, }, /*  64 */
+  {     0,      9,     12,      0,      1,  18432,     76, }, /*  65 */
+  {     0,      5,     12,      0,     -1,  18432,     78, }, /*  66 */
+  {     0,      5,     12,      0,     -1,  18432,     80, }, /*  67 */
+  {     0,      9,     12,      0,      0,  18432,     76, }, /*  68 */
+  {     0,      5,     12,      0,      0,  18432,     78, }, /*  69 */
   {     0,      5,     12,      0,      0,  18432,     60, }, /*  70 */
-  {     0,      5,     12,      0,      0,  18432,     80, }, /*  71 */
-  {     0,      9,     12,      0,   -121,  18432,     74, }, /*  72 */
+  {     0,      5,     12,      0,      0,  18432,     82, }, /*  71 */
+  {     0,      9,     12,      0,   -121,  18432,     76, }, /*  72 */
   {     0,      5,     12,      1,      0,  18432,     70, }, /*  73 */
-  {     0,      5,     12,      0,    195,  18432,     76, }, /*  74 */
-  {     0,      9,     12,      0,    210,  18432,     74, }, /*  75 */
-  {     0,      9,     12,      0,    206,  18432,     74, }, /*  76 */
-  {     0,      9,     12,      0,    205,  18432,     74, }, /*  77 */
-  {     0,      9,     12,      0,     79,  18432,     74, }, /*  78 */
-  {     0,      9,     12,      0,    202,  18432,     74, }, /*  79 */
-  {     0,      9,     12,      0,    203,  18432,     74, }, /*  80 */
-  {     0,      9,     12,      0,    207,  18432,     74, }, /*  81 */
-  {     0,      5,     12,      0,     97,  18432,     76, }, /*  82 */
-  {     0,      9,     12,      0,    211,  18432,     74, }, /*  83 */
-  {     0,      9,     12,      0,    209,  18432,     74, }, /*  84 */
-  {     0,      5,     12,      0,    163,  18432,     76, }, /*  85 */
-  {     0,      9,     12,      0,    213,  18432,     74, }, /*  86 */
-  {     0,      5,     12,      0,    130,  18432,     76, }, /*  87 */
-  {     0,      9,     12,      0,    214,  18432,     74, }, /*  88 */
-  {     0,      9,     12,      0,    218,  18432,     74, }, /*  89 */
-  {     0,      9,     12,      0,    217,  18432,     74, }, /*  90 */
-  {     0,      9,     12,      0,    219,  18432,     74, }, /*  91 */
-  {     0,      7,     12,      0,      0,  18432,     82, }, /*  92 */
-  {     0,      5,     12,      0,     56,  18432,     76, }, /*  93 */
-  {     0,      9,     12,      5,      2,  18432,     84, }, /*  94 */
-  {     0,      8,     12,      5,      1,  18432,     86, }, /*  95 */
-  {     0,      5,     12,      5,     -2,  18432,     76, }, /*  96 */
-  {     0,      9,     12,      9,      2,  18432,     84, }, /*  97 */
-  {     0,      8,     12,      9,      1,  18432,     86, }, /*  98 */
-  {     0,      5,     12,      9,     -2,  18432,     76, }, /*  99 */
-  {     0,      9,     12,     13,      2,  18432,     84, }, /* 100 */
-  {     0,      8,     12,     13,      1,  18432,     86, }, /* 101 */
-  {     0,      5,     12,     13,     -2,  18432,     76, }, /* 102 */
-  {     0,      5,     12,      0,    -79,  18432,     76, }, /* 103 */
-  {     0,      9,     12,     17,      2,  18432,     84, }, /* 104 */
-  {     0,      8,     12,     17,      1,  18432,     86, }, /* 105 */
-  {     0,      5,     12,     17,     -2,  18432,     76, }, /* 106 */
-  {     0,      9,     12,      0,    -97,  18432,     74, }, /* 107 */
-  {     0,      9,     12,      0,    -56,  18432,     74, }, /* 108 */
-  {     0,      9,     12,      0,   -130,  18432,     74, }, /* 109 */
-  {     0,      9,     12,      0,  10795,  18432,     74, }, /* 110 */
-  {     0,      9,     12,      0,   -163,  18432,     74, }, /* 111 */
-  {     0,      9,     12,      0,  10792,  18432,     74, }, /* 112 */
-  {     0,      5,     12,      0,  10815,  18432,     76, }, /* 113 */
-  {     0,      9,     12,      0,   -195,  18432,     74, }, /* 114 */
-  {     0,      9,     12,      0,     69,  18432,     74, }, /* 115 */
-  {     0,      9,     12,      0,     71,  18432,     74, }, /* 116 */
-  {     0,      5,     12,      0,  10783,  18432,     76, }, /* 117 */
-  {     0,      5,     12,      0,  10780,  18432,     76, }, /* 118 */
-  {     0,      5,     12,      0,  10782,  18432,     76, }, /* 119 */
-  {     0,      5,     12,      0,   -210,  18432,     76, }, /* 120 */
-  {     0,      5,     12,      0,   -206,  18432,     76, }, /* 121 */
-  {     0,      5,     12,      0,   -205,  18432,     76, }, /* 122 */
-  {     0,      5,     12,      0,   -202,  18432,     76, }, /* 123 */
-  {     0,      5,     12,      0,   -203,  18432,     76, }, /* 124 */
-  {     0,      5,     12,      0,  42319,  18432,     76, }, /* 125 */
-  {     0,      5,     12,      0,  42315,  18432,     76, }, /* 126 */
-  {     0,      5,     12,      0,   -207,  18432,     76, }, /* 127 */
-  {     0,      5,     12,      0,  42280,  18432,     76, }, /* 128 */
-  {     0,      5,     12,      0,  42308,  18432,     76, }, /* 129 */
-  {     0,      5,     12,      0,   -209,  18432,     78, }, /* 130 */
-  {     0,      5,     12,      0,   -211,  18432,     76, }, /* 131 */
-  {     0,      5,     12,      0,  10743,  18432,     76, }, /* 132 */
-  {     0,      5,     12,      0,  42305,  18432,     76, }, /* 133 */
-  {     0,      5,     12,      0,  10749,  18432,     76, }, /* 134 */
-  {     0,      5,     12,      0,   -213,  18432,     76, }, /* 135 */
-  {     0,      5,     12,      0,   -214,  18432,     76, }, /* 136 */
-  {     0,      5,     12,      0,  10727,  18432,     76, }, /* 137 */
-  {     0,      5,     12,      0,   -218,  18432,     76, }, /* 138 */
-  {     0,      5,     12,      0,  42307,  18432,     76, }, /* 139 */
-  {     0,      5,     12,      0,  42282,  18432,     76, }, /* 140 */
-  {     0,      5,     12,      0,    -69,  18432,     76, }, /* 141 */
-  {     0,      5,     12,      0,   -217,  18432,     76, }, /* 142 */
-  {     0,      5,     12,      0,    -71,  18432,     76, }, /* 143 */
-  {     0,      5,     12,      0,   -219,  18432,     76, }, /* 144 */
-  {     0,      5,     12,      0,  42261,  18432,     78, }, /* 145 */
-  {     0,      5,     12,      0,  42258,  18432,     76, }, /* 146 */
-  {     0,      6,     12,      0,      0,  18432,     88, }, /* 147 */
-  {     0,      6,     12,      0,      0,  18432,     90, }, /* 148 */
-  {    69,      6,     12,      0,      0,  28672,     92, }, /* 149 */
-  {    69,      6,     12,      0,      0,  18432,     92, }, /* 150 */
-  {    69,      6,     12,      0,      0,  18432,     88, }, /* 151 */
-  {    69,      6,     12,      0,      0,  18432,     94, }, /* 152 */
-  {    22,     24,     12,      0,      0,  28672,     56, }, /* 153 */
-  {    84,     12,      3,      0,      0,  26624,     96, }, /* 154 */
-  {    84,     12,      3,      0,      0,  26636,     96, }, /* 155 */
-  {    84,     12,      3,     21,    116,  26636,     98, }, /* 156 */
-  {    84,     12,      3,      0,      0,  26624,    100, }, /* 157 */
-  {    84,     12,      3,      0,      0,  26624,    102, }, /* 158 */
-  {    84,     12,      3,      0,      0,  26642,    102, }, /* 159 */
-  {     1,      9,     12,      0,      1,  18432,     74, }, /* 160 */
-  {     1,      5,     12,      0,     -1,  18432,     76, }, /* 161 */
-  {     1,     24,     12,      0,      0,  28672,     56, }, /* 162 */
-  {    68,      2,     12,      0,      0,  18432,      0, }, /* 163 */
-  {     1,      6,     12,      0,      0,  18432,    104, }, /* 164 */
-  {     1,      5,     12,      0,    130,  18432,     76, }, /* 165 */
-  {    69,     21,     12,      0,      0,  28672,    106, }, /* 166 */
-  {     1,      9,     12,      0,    116,  18432,     74, }, /* 167 */
-  {     1,      9,     12,      0,     38,  18432,     74, }, /* 168 */
-  {    69,     21,     12,      0,      0,  28672,    108, }, /* 169 */
-  {     1,      9,     12,      0,     37,  18432,     74, }, /* 170 */
-  {     1,      9,     12,      0,     64,  18432,     74, }, /* 171 */
-  {     1,      9,     12,      0,     63,  18432,     74, }, /* 172 */
-  {     1,      5,     12,      0,      0,  18432,     76, }, /* 173 */
-  {     1,      9,     12,      0,     32,  18432,     74, }, /* 174 */
-  {     1,      9,     12,     34,     32,  18432,     74, }, /* 175 */
-  {     1,      9,     12,     59,     32,  18432,     74, }, /* 176 */
-  {     1,      9,     12,     38,     32,  18432,     74, }, /* 177 */
-  {     1,      9,     12,     21,     32,  18432,     74, }, /* 178 */
-  {     1,      9,     12,     51,     32,  18432,     74, }, /* 179 */
-  {     1,      9,     12,     26,     32,  18432,     74, }, /* 180 */
-  {     1,      9,     12,     47,     32,  18432,     74, }, /* 181 */
-  {     1,      9,     12,     55,     32,  18432,     74, }, /* 182 */
-  {     1,      9,     12,     30,     32,  18432,     74, }, /* 183 */
-  {     1,      9,     12,     43,     32,  18432,     74, }, /* 184 */
-  {     1,      9,     12,     96,     32,  18432,     74, }, /* 185 */
-  {     1,      5,     12,      0,    -38,  18432,     76, }, /* 186 */
-  {     1,      5,     12,      0,    -37,  18432,     76, }, /* 187 */
-  {     1,      5,     12,      0,    -32,  18432,     76, }, /* 188 */
-  {     1,      5,     12,     34,    -32,  18432,     76, }, /* 189 */
-  {     1,      5,     12,     59,    -32,  18432,     76, }, /* 190 */
-  {     1,      5,     12,     38,    -32,  18432,     76, }, /* 191 */
-  {     1,      5,     12,     21,   -116,  18432,     76, }, /* 192 */
-  {     1,      5,     12,     51,    -32,  18432,     76, }, /* 193 */
-  {     1,      5,     12,     26,   -775,  18432,     76, }, /* 194 */
-  {     1,      5,     12,     47,    -32,  18432,     76, }, /* 195 */
-  {     1,      5,     12,     55,    -32,  18432,     76, }, /* 196 */
-  {     1,      5,     12,     30,      1,  18432,     70, }, /* 197 */
-  {     1,      5,     12,     30,    -32,  18432,     76, }, /* 198 */
-  {     1,      5,     12,     43,    -32,  18432,     76, }, /* 199 */
-  {     1,      5,     12,     96,    -32,  18432,     76, }, /* 200 */
-  {     1,      5,     12,      0,    -64,  18432,     76, }, /* 201 */
-  {     1,      5,     12,      0,    -63,  18432,     76, }, /* 202 */
-  {     1,      9,     12,      0,      8,  18432,     74, }, /* 203 */
-  {     1,      5,     12,     34,    -30,  18432,    110, }, /* 204 */
-  {     1,      5,     12,     38,    -25,  18432,    110, }, /* 205 */
-  {     1,      9,     12,      0,      0,  18432,    112, }, /* 206 */
-  {     1,      9,     12,      0,      0,  18432,    114, }, /* 207 */
-  {     1,      5,     12,     43,    -15,  18432,    110, }, /* 208 */
-  {     1,      5,     12,     47,    -22,  18432,     70, }, /* 209 */
-  {     1,      5,     12,      0,     -8,  18432,     76, }, /* 210 */
-  {    34,      9,     12,      0,      1,  18432,     74, }, /* 211 */
-  {    34,      5,     12,      0,     -1,  18432,     76, }, /* 212 */
-  {     1,      5,     12,     51,    -54,  18432,    110, }, /* 213 */
-  {     1,      5,     12,     55,    -48,  18432,    110, }, /* 214 */
-  {     1,      5,     12,      0,      7,  18432,     76, }, /* 215 */
-  {     1,      5,     12,      0,   -116,  18432,     78, }, /* 216 */
-  {     1,      9,     12,     38,    -60,  18432,    116, }, /* 217 */
-  {     1,      5,     12,     59,    -64,  18432,    110, }, /* 218 */
-  {     1,     25,     12,      0,      0,  28672,    118, }, /* 219 */
-  {     1,      9,     12,      0,     -7,  18432,     74, }, /* 220 */
-  {     1,      5,     12,      0,      0,  18432,     60, }, /* 221 */
-  {     1,      9,     12,      0,   -130,  18432,     74, }, /* 222 */
-  {     2,      9,     12,      0,     80,  18432,     74, }, /* 223 */
-  {     2,      9,     12,      0,     32,  18432,     74, }, /* 224 */
-  {     2,      9,     12,     63,     32,  18432,     74, }, /* 225 */
-  {     2,      9,     12,     67,     32,  18432,     74, }, /* 226 */
-  {     2,      9,     12,     71,     32,  18432,     74, }, /* 227 */
-  {     2,      9,     12,     75,     32,  18432,     74, }, /* 228 */
-  {     2,      9,     12,     79,     32,  18432,     74, }, /* 229 */
-  {     2,      9,     12,     84,     32,  18432,     74, }, /* 230 */
-  {     2,      5,     12,      0,    -32,  18432,     76, }, /* 231 */
-  {     2,      5,     12,     63,    -32,  18432,     76, }, /* 232 */
-  {     2,      5,     12,     67,    -32,  18432,     76, }, /* 233 */
-  {     2,      5,     12,     71,    -32,  18432,     76, }, /* 234 */
-  {     2,      5,     12,     75,    -32,  18432,     76, }, /* 235 */
-  {     2,      5,     12,     79,    -32,  18432,     76, }, /* 236 */
-  {     2,      5,     12,     84,    -32,  18432,     76, }, /* 237 */
-  {     2,      5,     12,      0,    -80,  18432,     76, }, /* 238 */
-  {     2,      5,     12,      0,    -80,  18432,     78, }, /* 239 */
-  {     2,      9,     12,      0,      1,  18432,     74, }, /* 240 */
-  {     2,      5,     12,      0,     -1,  18432,     76, }, /* 241 */
-  {     2,      9,     12,     88,      1,  18432,     74, }, /* 242 */
-  {     2,      5,     12,     88,     -1,  18432,     76, }, /* 243 */
-  {     2,     26,     12,      0,      0,  18432,     68, }, /* 244 */
-  {     2,     12,      3,      0,      0,  26684,     96, }, /* 245 */
-  {     2,     12,      3,      0,      0,  26678,     96, }, /* 246 */
-  {    84,     12,      3,      0,      0,  26681,     96, }, /* 247 */
-  {     2,     11,      3,      0,      0,  26624,    120, }, /* 248 */
-  {     2,      9,     12,      0,     15,  18432,     74, }, /* 249 */
-  {     2,      5,     12,      0,    -15,  18432,     76, }, /* 250 */
-  {    70,      9,     12,      0,     48,  18432,     74, }, /* 251 */
-  {    70,      6,     12,      0,      0,  18432,     92, }, /* 252 */
-  {    70,     21,     12,      0,      0,  18432,     68, }, /* 253 */
-  {    70,     21,     12,      0,      0,  18432,    122, }, /* 254 */
-  {    70,      5,     12,      0,      0,  18432,     60, }, /* 255 */
-  {    70,      5,     12,      0,    -48,  18432,     76, }, /* 256 */
-  {    70,      5,     12,      0,      0,  18432,     70, }, /* 257 */
-  {    70,     21,     12,      0,      0,  18432,    124, }, /* 258 */
-  {    70,     17,     12,      0,      0,  28672,    126, }, /* 259 */
-  {    70,     26,     12,      0,      0,  28672,     68, }, /* 260 */
-  {    70,     23,     12,      0,      0,  14336,     68, }, /* 261 */
-  {    68,      2,     12,      0,      0,  34816,      0, }, /* 262 */
-  {    71,     12,      3,      0,      0,  26624,     96, }, /* 263 */
-  {    71,     12,      3,      0,      0,  26624,    102, }, /* 264 */
-  {    71,     12,      3,      0,      0,  26624,    128, }, /* 265 */
-  {    71,     17,     12,      0,      0,  34816,    126, }, /* 266 */
-  {    71,     21,     12,      0,      0,  34816,     68, }, /* 267 */
-  {    71,     21,     12,      0,      0,  34816,    106, }, /* 268 */
-  {    71,     12,      3,      0,      0,  26624,    130, }, /* 269 */
-  {    71,      7,     12,      0,      0,  34816,     82, }, /* 270 */
-  {    71,     21,     12,      0,      0,  34816,    122, }, /* 271 */
-  {     3,      1,      4,      0,      0,   2048,    132, }, /* 272 */
-  {    69,      1,      4,      0,      0,   2048,    132, }, /* 273 */
-  {     3,     25,     12,      0,      0,  28672,    118, }, /* 274 */
-  {     3,     25,     12,      0,      0,      0,    118, }, /* 275 */
-  {     3,     21,     12,      0,      0,  14336,     68, }, /* 276 */
-  {     3,     23,     12,      0,      0,      0,     68, }, /* 277 */
-  {    69,     21,     12,      0,      0,   8342,    106, }, /* 278 */
-  {     3,     21,     12,      0,      0,      0,     68, }, /* 279 */
-  {     3,     26,     12,      0,      0,  28672,     68, }, /* 280 */
-  {     3,     12,      3,      0,      0,  26624,    130, }, /* 281 */
-  {    69,     21,     12,      0,      0,    150,    106, }, /* 282 */
-  {     3,      1,      2,      0,      0,    108,    134, }, /* 283 */
-  {     3,     21,     12,      0,      0,      0,    124, }, /* 284 */
-  {    69,     21,     12,      0,      0,    159,    124, }, /* 285 */
-  {     3,      7,     12,      0,      0,      0,     82, }, /* 286 */
-  {    69,      6,     12,      0,      0,    165,    136, }, /* 287 */
-  {    84,     12,      3,      0,      0,  26660,    128, }, /* 288 */
-  {    84,     12,      3,      0,      0,  26660,    130, }, /* 289 */
-  {     3,     12,      3,      0,      0,  26624,    128, }, /* 290 */
-  {     3,     12,      3,      0,      0,  26624,     96, }, /* 291 */
-  {     3,     13,     12,      0,      0,   2159,    138, }, /* 292 */
-  {     3,     21,     12,      0,      0,   2048,     68, }, /* 293 */
-  {     3,      7,     12,      0,      0,      0,    140, }, /* 294 */
-  {     3,     21,     12,      0,      0,     30,    124, }, /* 295 */
-  {     3,      6,     12,      0,      0,      0,     92, }, /* 296 */
-  {     3,     13,     12,      0,      0,  10240,    138, }, /* 297 */
-  {     3,     26,     12,      0,      0,      0,     68, }, /* 298 */
-  {     4,     21,     12,      0,      0,      0,    124, }, /* 299 */
-  {     4,     21,     12,      0,      0,      0,    106, }, /* 300 */
-  {     4,     21,     12,      0,      0,      0,     68, }, /* 301 */
-  {    68,      2,     12,      0,      0,      0,      0, }, /* 302 */
-  {     4,      1,      4,      0,      0,      0,    132, }, /* 303 */
-  {     4,      7,     12,      0,      0,      0,     82, }, /* 304 */
-  {     4,     12,      3,      0,      0,  26624,    130, }, /* 305 */
-  {     4,     12,      3,      0,      0,  26624,    128, }, /* 306 */
-  {     4,     12,      3,      0,      0,  26624,     96, }, /* 307 */
-  {     5,      7,     12,      0,      0,      0,     82, }, /* 308 */
-  {     5,     12,      3,      0,      0,  26624,    128, }, /* 309 */
-  {    38,     13,     12,      0,      0,  34816,    138, }, /* 310 */
-  {    38,      7,     12,      0,      0,  34816,     82, }, /* 311 */
-  {    38,     12,      3,      0,      0,  26624,     96, }, /* 312 */
-  {    38,      6,     12,      0,      0,  34816,     92, }, /* 313 */
-  {    38,     26,     12,      0,      0,  28672,     68, }, /* 314 */
-  {    38,     21,     12,      0,      0,  28672,     68, }, /* 315 */
-  {    38,     21,     12,      0,      0,  28672,    106, }, /* 316 */
-  {    38,     21,     12,      0,      0,  28672,    124, }, /* 317 */
-  {    38,      6,     12,      0,      0,  34816,    136, }, /* 318 */
-  {    38,     12,      3,      0,      0,  26624,    102, }, /* 319 */
-  {    38,     23,     12,      0,      0,  34816,     68, }, /* 320 */
-  {   110,      7,     12,      0,      0,  34816,     82, }, /* 321 */
-  {   110,     12,      3,      0,      0,  26624,    130, }, /* 322 */
-  {   110,     12,      3,      0,      0,  26624,     96, }, /* 323 */
-  {   110,      6,     12,      0,      0,  34816,    142, }, /* 324 */
-  {   110,     12,      3,      0,      0,  26624,    102, }, /* 325 */
-  {   110,     21,     12,      0,      0,  34816,    106, }, /* 326 */
-  {   110,     21,     12,      0,      0,  34816,    124, }, /* 327 */
-  {    42,      7,     12,      0,      0,  34816,     82, }, /* 328 */
-  {    42,     12,      3,      0,      0,  26624,    102, }, /* 329 */
-  {    42,     21,     12,      0,      0,  34816,    106, }, /* 330 */
-  {     3,     24,     12,      0,      0,      0,    122, }, /* 331 */
-  {     3,     12,      3,      0,      0,  26624,    102, }, /* 332 */
-  {     6,     12,      3,      0,      0,  26624,    130, }, /* 333 */
-  {     6,     10,      5,      0,      0,  18432,    144, }, /* 334 */
-  {     6,      7,     12,      0,      0,  18432,     82, }, /* 335 */
-  {     6,     12,      3,      0,      0,  26624,     96, }, /* 336 */
-  {     6,     12,      3,      0,      0,  26624,    146, }, /* 337 */
-  {    84,     12,      3,      0,      0,  26798,     96, }, /* 338 */
-  {    84,     12,      3,      0,      0,  26795,     96, }, /* 339 */
-  {    69,     21,     12,      0,      0,  18615,    124, }, /* 340 */
-  {    69,     21,     12,      0,      0,  18618,    124, }, /* 341 */
-  {     6,     13,     12,      0,      0,  18576,    138, }, /* 342 */
-  {     6,     21,     12,      0,      0,  18432,     68, }, /* 343 */
-  {     6,      6,     12,      0,      0,  18432,     92, }, /* 344 */
-  {     7,      7,     12,      0,      0,  18432,     82, }, /* 345 */
-  {     7,     12,      3,      0,      0,  26624,    130, }, /* 346 */
-  {     7,     10,      5,      0,      0,  18432,    144, }, /* 347 */
-  {     7,     12,      3,      0,      0,  26624,     96, }, /* 348 */
-  {     7,     10,      3,      0,      0,  18432,    148, }, /* 349 */
-  {     7,     12,      3,      0,      0,  26624,    146, }, /* 350 */
-  {     7,     13,     12,      0,      0,  18546,    138, }, /* 351 */
-  {     7,     23,     12,      0,      0,  14336,     68, }, /* 352 */
-  {     7,     15,     12,      0,      0,  18432,     68, }, /* 353 */
-  {     7,     26,     12,      0,      0,  18432,     68, }, /* 354 */
-  {     7,     21,     12,      0,      0,  18432,     68, }, /* 355 */
-  {     7,     12,      3,      0,      0,  26624,    102, }, /* 356 */
-  {     8,     12,      3,      0,      0,  26624,    130, }, /* 357 */
-  {     8,     10,      5,      0,      0,  18432,    144, }, /* 358 */
-  {     8,      7,     12,      0,      0,  18432,     82, }, /* 359 */
-  {     8,     12,      3,      0,      0,  26624,     96, }, /* 360 */
-  {     8,     12,      3,      0,      0,  26624,    146, }, /* 361 */
-  {     8,     13,     12,      0,      0,  18519,    138, }, /* 362 */
-  {     8,     21,     12,      0,      0,  18432,     68, }, /* 363 */
-  {     9,     12,      3,      0,      0,  26624,    130, }, /* 364 */
-  {     9,     10,      5,      0,      0,  18432,    144, }, /* 365 */
-  {     9,      7,     12,      0,      0,  18432,     82, }, /* 366 */
-  {     9,     12,      3,      0,      0,  26624,     96, }, /* 367 */
-  {     9,     12,      3,      0,      0,  26624,    146, }, /* 368 */
-  {     9,     13,     12,      0,      0,  18516,    138, }, /* 369 */
-  {     9,     21,     12,      0,      0,  18432,     68, }, /* 370 */
-  {     9,     23,     12,      0,      0,  14336,     68, }, /* 371 */
-  {    10,     12,      3,      0,      0,  26624,    130, }, /* 372 */
-  {    10,     10,      5,      0,      0,  18432,    144, }, /* 373 */
-  {    10,      7,     12,      0,      0,  18432,     82, }, /* 374 */
-  {    10,     12,      3,      0,      0,  26624,     96, }, /* 375 */
-  {    10,     10,      3,      0,      0,  18432,    148, }, /* 376 */
-  {    10,     12,      3,      0,      0,  26624,    146, }, /* 377 */
-  {    10,     12,      3,      0,      0,  26624,    150, }, /* 378 */
-  {    10,     13,     12,      0,      0,  18432,    138, }, /* 379 */
-  {    10,     26,     12,      0,      0,  18432,     68, }, /* 380 */
-  {    10,     15,     12,      0,      0,  18432,     68, }, /* 381 */
-  {    11,     12,      3,      0,      0,  26624,    130, }, /* 382 */
-  {    11,      7,     12,      0,      0,  18432,     82, }, /* 383 */
-  {    11,     10,      3,      0,      0,  18432,    148, }, /* 384 */
-  {    11,     10,      5,      0,      0,  18432,    144, }, /* 385 */
-  {    11,     12,      3,      0,      0,  26624,    146, }, /* 386 */
-  {    11,     13,     12,      0,      0,  18513,    138, }, /* 387 */
-  {    11,     15,     12,      0,      0,  18513,     68, }, /* 388 */
-  {    11,     26,     12,      0,      0,  28753,     68, }, /* 389 */
-  {    11,     26,     12,      0,      0,  28672,     68, }, /* 390 */
-  {    11,     23,     12,      0,      0,  14336,     68, }, /* 391 */
-  {    12,     12,      3,      0,      0,  26624,    130, }, /* 392 */
-  {    12,     10,      5,      0,      0,  18432,    144, }, /* 393 */
-  {    12,      7,     12,      0,      0,  18432,     82, }, /* 394 */
-  {    12,     12,      3,      0,      0,  26624,     96, }, /* 395 */
-  {    12,     12,      3,      0,      0,  26624,    146, }, /* 396 */
-  {    12,     13,     12,      0,      0,  18432,    138, }, /* 397 */
-  {    12,     21,     12,      0,      0,  18432,     68, }, /* 398 */
-  {    12,     15,     12,      0,      0,  28672,     68, }, /* 399 */
-  {    12,     26,     12,      0,      0,  18432,     68, }, /* 400 */
-  {    13,      7,     12,      0,      0,  18432,     82, }, /* 401 */
-  {    13,     12,      3,      0,      0,  26624,    130, }, /* 402 */
-  {    13,     10,      5,      0,      0,  18432,    144, }, /* 403 */
-  {    13,     21,     12,      0,      0,  18432,     68, }, /* 404 */
-  {    13,     12,      3,      0,      0,  26624,     96, }, /* 405 */
-  {    13,     12,      3,      0,      0,  18432,    130, }, /* 406 */
-  {    13,     10,      3,      0,      0,  18432,    148, }, /* 407 */
-  {    13,     12,      3,      0,      0,  26624,    146, }, /* 408 */
-  {    13,     13,     12,      0,      0,  18528,    138, }, /* 409 */
-  {    14,     12,      3,      0,      0,  26624,    130, }, /* 410 */
-  {    14,     10,      5,      0,      0,  18432,    144, }, /* 411 */
-  {    14,      7,     12,      0,      0,  18432,     82, }, /* 412 */
-  {    14,     12,      3,      0,      0,  26624,    146, }, /* 413 */
-  {    14,     10,      3,      0,      0,  18432,    148, }, /* 414 */
-  {    14,      7,      4,      0,      0,  18432,     82, }, /* 415 */
-  {    14,     26,     12,      0,      0,  18432,     68, }, /* 416 */
-  {    14,     15,     12,      0,      0,  18432,     68, }, /* 417 */
-  {    14,     13,     12,      0,      0,  18432,    138, }, /* 418 */
-  {    15,     12,      3,      0,      0,  26624,    130, }, /* 419 */
-  {    15,     10,      5,      0,      0,  18432,    144, }, /* 420 */
-  {    15,      7,     12,      0,      0,  18432,     82, }, /* 421 */
-  {    15,     12,      3,      0,      0,  26624,    146, }, /* 422 */
-  {    15,     10,      3,      0,      0,  18432,    148, }, /* 423 */
-  {    15,     13,     12,      0,      0,  18432,    138, }, /* 424 */
-  {    15,     21,     12,      0,      0,  18432,     68, }, /* 425 */
-  {    72,      7,     12,      0,      0,  18432,     82, }, /* 426 */
-  {    72,     12,      3,      0,      0,  26624,    130, }, /* 427 */
-  {    72,      7,      5,      0,      0,  18432,    152, }, /* 428 */
-  {    72,     12,      3,      0,      0,  26624,    154, }, /* 429 */
-  {    69,     23,     12,      0,      0,  14336,     68, }, /* 430 */
-  {    72,      7,     12,      0,      0,  18432,    156, }, /* 431 */
-  {    72,      6,     12,      0,      0,  18432,    136, }, /* 432 */
-  {    72,     12,      3,      0,      0,  26624,     96, }, /* 433 */
-  {    72,     21,     12,      0,      0,  18432,     68, }, /* 434 */
-  {    72,     13,     12,      0,      0,  18432,    138, }, /* 435 */
-  {    72,     21,     12,      0,      0,  18432,    106, }, /* 436 */
-  {    73,      7,     12,      0,      0,  18432,     82, }, /* 437 */
-  {    73,     12,      3,      0,      0,  26624,    130, }, /* 438 */
-  {    73,      7,      5,      0,      0,  18432,    152, }, /* 439 */
-  {    73,     12,      3,      0,      0,  26624,    146, }, /* 440 */
-  {    73,      7,     12,      0,      0,  18432,    156, }, /* 441 */
-  {    73,      6,     12,      0,      0,  18432,    136, }, /* 442 */
-  {    73,     12,      3,      0,      0,  26624,     96, }, /* 443 */
-  {    73,     12,      3,      0,      0,  26624,    102, }, /* 444 */
-  {    73,     13,     12,      0,      0,  18432,    138, }, /* 445 */
-  {    74,      7,     12,      0,      0,  18432,     82, }, /* 446 */
-  {    74,     26,     12,      0,      0,  18432,     68, }, /* 447 */
-  {    74,     21,     12,      0,      0,  18432,     68, }, /* 448 */
-  {    74,     21,     12,      0,      0,  18432,    106, }, /* 449 */
-  {    74,     12,      3,      0,      0,  26624,     96, }, /* 450 */
-  {    74,     13,     12,      0,      0,  18432,    138, }, /* 451 */
-  {    74,     15,     12,      0,      0,  18432,     68, }, /* 452 */
-  {    74,     22,     12,      0,      0,  28672,    158, }, /* 453 */
-  {    74,     18,     12,      0,      0,  28672,    158, }, /* 454 */
-  {    74,     10,      5,      0,      0,  18432,    160, }, /* 455 */
-  {    74,     12,      3,      0,      0,  26624,    130, }, /* 456 */
-  {    74,     12,      3,      0,      0,  26624,    162, }, /* 457 */
-  {    74,     10,      5,      0,      0,  18432,    144, }, /* 458 */
-  {    74,     12,      3,      0,      0,  26624,    128, }, /* 459 */
-  {    74,     12,      3,      0,      0,  26624,    146, }, /* 460 */
-  {    69,     26,     12,      0,      0,  18432,     68, }, /* 461 */
-  {    16,      7,     12,      0,      0,  18432,     82, }, /* 462 */
-  {    16,     10,     12,      0,      0,  18432,    144, }, /* 463 */
-  {    16,     12,      3,      0,      0,  26624,    130, }, /* 464 */
-  {    16,     10,      5,      0,      0,  18432,    144, }, /* 465 */
-  {    16,     12,      3,      0,      0,  26624,     96, }, /* 466 */
-  {    16,     12,      3,      0,      0,  26624,    146, }, /* 467 */
-  {    16,     13,     12,      0,      0,  18549,    138, }, /* 468 */
-  {    16,     21,     12,      0,      0,  18432,    124, }, /* 469 */
-  {    16,     21,     12,      0,      0,  18432,     68, }, /* 470 */
-  {    16,     10,     12,      0,      0,  18432,    164, }, /* 471 */
-  {    16,     12,      3,      0,      0,  26624,    128, }, /* 472 */
-  {    16,     13,     12,      0,      0,  18432,    138, }, /* 473 */
-  {    16,     26,     12,      0,      0,  18432,     68, }, /* 474 */
-  {    17,      9,     12,      0,   7264,  18432,     74, }, /* 475 */
-  {    17,      5,     12,      0,   3008,  18432,    166, }, /* 476 */
-  {    69,     21,     12,      0,      0,  18510,     68, }, /* 477 */
-  {    17,      6,     12,      0,      0,  18432,    168, }, /* 478 */
-  {    18,      7,      6,      0,      0,  18432,     82, }, /* 479 */
-  {    18,      7,      6,      0,      0,  18432,    170, }, /* 480 */
-  {    18,      7,      7,      0,      0,  18432,    170, }, /* 481 */
-  {    18,      7,      7,      0,      0,  18432,     82, }, /* 482 */
-  {    18,      7,      8,      0,      0,  18432,     82, }, /* 483 */
-  {    75,      7,     12,      0,      0,  18432,     82, }, /* 484 */
-  {    75,     12,      3,      0,      0,  26624,     96, }, /* 485 */
-  {    75,     21,     12,      0,      0,  18432,     68, }, /* 486 */
-  {    75,     21,     12,      0,      0,  18432,    106, }, /* 487 */
-  {    75,     21,     12,      0,      0,  18432,    124, }, /* 488 */
-  {    75,     15,     12,      0,      0,  18432,    138, }, /* 489 */
-  {    75,     15,     12,      0,      0,  18432,     68, }, /* 490 */
-  {    75,     26,     12,      0,      0,  28672,     68, }, /* 491 */
-  {    76,      9,     12,      0,  38864,  18432,    172, }, /* 492 */
-  {    76,      9,     12,      0,      8,  18432,    172, }, /* 493 */
-  {    76,      5,     12,      0,     -8,  18432,     70, }, /* 494 */
-  {    77,     17,     12,      0,      0,  28672,    126, }, /* 495 */
-  {    77,      7,     12,      0,      0,  18432,     82, }, /* 496 */
-  {    77,     26,     12,      0,      0,  18432,     68, }, /* 497 */
-  {    77,     21,     12,      0,      0,  18432,    124, }, /* 498 */
-  {    78,     29,     12,      0,      0,  45056,     52, }, /* 499 */
-  {    78,      7,     12,      0,      0,  18432,     82, }, /* 500 */
-  {    78,     22,     12,      0,      0,  28672,    158, }, /* 501 */
-  {    78,     18,     12,      0,      0,  28672,    158, }, /* 502 */
-  {    79,      7,     12,      0,      0,  18432,     82, }, /* 503 */
-  {    69,     21,     12,      0,      0,  18432,    106, }, /* 504 */
-  {    79,     14,     12,      0,      0,  18432,     82, }, /* 505 */
-  {    25,      7,     12,      0,      0,  18432,     82, }, /* 506 */
-  {    25,     12,      3,      0,      0,  26624,    130, }, /* 507 */
-  {    25,     12,      3,      0,      0,  26624,    146, }, /* 508 */
-  {    25,     10,      5,      0,      0,  18432,    174, }, /* 509 */
-  {    26,      7,     12,      0,      0,  18432,     82, }, /* 510 */
-  {    26,     12,      3,      0,      0,  26624,    130, }, /* 511 */
-  {    26,     10,      5,      0,      0,  18432,    176, }, /* 512 */
-  {    69,     21,     12,      0,      0,  18573,    124, }, /* 513 */
-  {    27,      7,     12,      0,      0,  18432,     82, }, /* 514 */
-  {    27,     12,      3,      0,      0,  26624,    130, }, /* 515 */
-  {    28,      7,     12,      0,      0,  18432,     82, }, /* 516 */
-  {    28,     12,      3,      0,      0,  26624,    130, }, /* 517 */
-  {    80,      7,     12,      0,      0,  18432,     82, }, /* 518 */
-  {    80,      7,     12,      0,      0,  18432,    140, }, /* 519 */
-  {    80,     12,      3,      0,      0,  26624,    100, }, /* 520 */
-  {    80,     10,      5,      0,      0,  18432,    144, }, /* 521 */
-  {    80,     12,      3,      0,      0,  26624,    130, }, /* 522 */
-  {    80,     12,      3,      0,      0,  26624,     96, }, /* 523 */
-  {    80,     12,      3,      0,      0,  26624,    146, }, /* 524 */
-  {    80,     21,     12,      0,      0,  18432,    106, }, /* 525 */
-  {    80,      6,     12,      0,      0,  18432,    142, }, /* 526 */
-  {    80,     21,     12,      0,      0,  18432,     68, }, /* 527 */
-  {    80,     23,     12,      0,      0,  14336,     68, }, /* 528 */
-  {    80,     13,     12,      0,      0,  18432,    138, }, /* 529 */
-  {    80,     15,     12,      0,      0,  28672,     68, }, /* 530 */
-  {    19,     21,     12,      0,      0,  28672,     68, }, /* 531 */
-  {    69,     21,     12,      0,      0,  28777,    106, }, /* 532 */
-  {    69,     21,     12,      0,      0,  28777,    124, }, /* 533 */
-  {    19,     21,     12,      0,      0,  28672,    106, }, /* 534 */
-  {    19,     17,     12,      0,      0,  28672,    126, }, /* 535 */
-  {    19,     21,     12,      0,      0,  28672,    124, }, /* 536 */
-  {    19,     21,     12,      0,      0,  28672,    178, }, /* 537 */
-  {    19,     12,      3,      0,      0,  26624,    180, }, /* 538 */
-  {    19,      1,      2,      0,      0,   6144,     66, }, /* 539 */
-  {    19,     13,     12,      0,      0,  18432,    138, }, /* 540 */
-  {    19,      7,     12,      0,      0,  18432,     82, }, /* 541 */
-  {    19,      6,     12,      0,      0,  18432,    136, }, /* 542 */
-  {    19,     12,      3,      0,      0,  26624,    182, }, /* 543 */
-  {    19,     12,      3,      0,      0,  26624,    130, }, /* 544 */
-  {    29,      7,     12,      0,      0,  18432,     82, }, /* 545 */
-  {    29,     12,      3,      0,      0,  26624,    130, }, /* 546 */
-  {    29,     10,      5,      0,      0,  18432,    144, }, /* 547 */
-  {    29,     12,      3,      0,      0,  26624,     96, }, /* 548 */
-  {    29,     26,     12,      0,      0,  28672,     68, }, /* 549 */
-  {    29,     21,     12,      0,      0,  28672,    124, }, /* 550 */
-  {    29,     13,     12,      0,      0,  18432,    138, }, /* 551 */
-  {    30,      7,     12,      0,      0,  18432,     82, }, /* 552 */
-  {    89,      7,     12,      0,      0,  18432,     82, }, /* 553 */
-  {    89,      7,     12,      0,      0,  18432,    156, }, /* 554 */
-  {    89,     13,     12,      0,      0,  18432,    138, }, /* 555 */
-  {    89,     15,     12,      0,      0,  18432,    138, }, /* 556 */
-  {    89,     26,     12,      0,      0,  28672,     68, }, /* 557 */
-  {    80,     26,     12,      0,      0,  28672,     68, }, /* 558 */
-  {    33,      7,     12,      0,      0,  18432,     82, }, /* 559 */
-  {    33,     12,      3,      0,      0,  26624,    130, }, /* 560 */
-  {    33,     10,      5,      0,      0,  18432,    144, }, /* 561 */
-  {    33,     21,     12,      0,      0,  18432,     68, }, /* 562 */
-  {   106,      7,     12,      0,      0,  18432,     82, }, /* 563 */
-  {   106,     10,      5,      0,      0,  18432,    144, }, /* 564 */
-  {   106,     12,      3,      0,      0,  26624,    130, }, /* 565 */
-  {   106,     12,      3,      0,      0,  26624,    184, }, /* 566 */
-  {   106,     10,     12,      0,      0,  18432,    144, }, /* 567 */
-  {   106,     12,      3,      0,      0,  26624,     96, }, /* 568 */
-  {   106,     13,     12,      0,      0,  18432,    138, }, /* 569 */
-  {   106,     21,     12,      0,      0,  18432,     68, }, /* 570 */
-  {   106,      6,     12,      0,      0,  18432,    136, }, /* 571 */
-  {   106,     21,     12,      0,      0,  18432,    124, }, /* 572 */
-  {    84,     11,      3,      0,      0,  26624,    186, }, /* 573 */
-  {    84,     12,      3,      0,      0,  26624,    130, }, /* 574 */
-  {    93,     12,      3,      0,      0,  26624,    130, }, /* 575 */
-  {    93,     10,      5,      0,      0,  18432,    144, }, /* 576 */
-  {    93,      7,     12,      0,      0,  18432,     82, }, /* 577 */
-  {    93,     12,      3,      0,      0,  26624,     96, }, /* 578 */
-  {    93,     10,      3,      0,      0,  18432,    148, }, /* 579 */
-  {    93,     10,      5,      0,      0,  18432,    174, }, /* 580 */
-  {    93,     13,     12,      0,      0,  18432,    138, }, /* 581 */
-  {    93,     21,     12,      0,      0,  18432,    124, }, /* 582 */
-  {    93,     21,     12,      0,      0,  18432,     68, }, /* 583 */
-  {    93,     21,     12,      0,      0,  18432,    106, }, /* 584 */
-  {    93,     26,     12,      0,      0,  18432,     68, }, /* 585 */
-  {    96,     12,      3,      0,      0,  26624,    130, }, /* 586 */
-  {    96,     10,      5,      0,      0,  18432,    144, }, /* 587 */
-  {    96,      7,     12,      0,      0,  18432,     82, }, /* 588 */
-  {    96,     10,      5,      0,      0,  18432,    174, }, /* 589 */
-  {    96,     12,      3,      0,      0,  26624,    146, }, /* 590 */
-  {    96,     13,     12,      0,      0,  18432,    138, }, /* 591 */
-  {   119,      7,     12,      0,      0,  18432,     82, }, /* 592 */
-  {   119,     12,      3,      0,      0,  26624,    102, }, /* 593 */
-  {   119,     10,      5,      0,      0,  18432,    144, }, /* 594 */
-  {   119,     12,      3,      0,      0,  26624,    130, }, /* 595 */
-  {   119,     10,      5,      0,      0,  18432,    176, }, /* 596 */
-  {   119,     21,     12,      0,      0,  18432,     68, }, /* 597 */
-  {    97,      7,     12,      0,      0,  18432,     82, }, /* 598 */
-  {    97,     10,      5,      0,      0,  18432,    144, }, /* 599 */
-  {    97,     12,      3,      0,      0,  26624,    130, }, /* 600 */
-  {    97,     12,      3,      0,      0,  26624,    188, }, /* 601 */
-  {    97,     12,      3,      0,      0,  26624,     96, }, /* 602 */
-  {    97,     21,     12,      0,      0,  18432,    124, }, /* 603 */
-  {    97,     21,     12,      0,      0,  18432,    106, }, /* 604 */
-  {    97,     13,     12,      0,      0,  18432,    138, }, /* 605 */
-  {    98,     13,     12,      0,      0,  18432,    138, }, /* 606 */
-  {    98,      7,     12,      0,      0,  18432,     82, }, /* 607 */
-  {    98,      6,     12,      0,      0,  18432,     92, }, /* 608 */
-  {    98,      6,     12,      0,      0,  18432,     94, }, /* 609 */
-  {    98,     21,     12,      0,      0,  18432,    124, }, /* 610 */
-  {     2,      5,     12,     63,  -6222,  18432,     70, }, /* 611 */
-  {     2,      5,     12,     67,  -6221,  18432,     70, }, /* 612 */
-  {     2,      5,     12,     71,  -6212,  18432,     70, }, /* 613 */
-  {     2,      5,     12,     75,  -6210,  18432,     70, }, /* 614 */
-  {     2,      5,     12,     79,  -6210,  18432,     70, }, /* 615 */
-  {     2,      5,     12,     79,  -6211,  18432,     70, }, /* 616 */
-  {     2,      5,     12,     84,  -6204,  18432,     70, }, /* 617 */
-  {     2,      5,     12,     88,  -6180,  18432,     70, }, /* 618 */
-  {     2,      5,     12,    108,  35267,  18432,     70, }, /* 619 */
-  {    17,      9,     12,      0,  -3008,  18432,     74, }, /* 620 */
-  {    96,     21,     12,      0,      0,  18432,     68, }, /* 621 */
-  {    84,     12,      3,      0,      0,  26762,     96, }, /* 622 */
-  {    84,     12,      3,      0,      0,  26630,     96, }, /* 623 */
-  {    69,     21,     12,      0,      0,  18498,    190, }, /* 624 */
-  {    84,     12,      3,      0,      0,  26666,     96, }, /* 625 */
-  {    84,     12,      3,      0,      0,  26696,     96, }, /* 626 */
-  {    84,     12,      3,      0,      0,  26780,     96, }, /* 627 */
-  {    69,     10,      5,      0,      0,  18474,    160, }, /* 628 */
-  {    69,      7,     12,      0,      0,  18501,     82, }, /* 629 */
-  {    69,      7,     12,      0,      0,  18474,     82, }, /* 630 */
-  {    69,      7,     12,      0,      0,  18438,     82, }, /* 631 */
-  {    69,      7,     12,      0,      0,  18594,     82, }, /* 632 */
-  {    69,      7,     12,      0,      0,  18498,     82, }, /* 633 */
-  {    84,     12,      3,      0,      0,  26750,     96, }, /* 634 */
-  {    69,     10,      5,      0,      0,  18435,    160, }, /* 635 */
-  {    84,     12,      3,      0,      0,  26690,     96, }, /* 636 */
-  {    69,      7,     12,      0,      0,  18453,     82, }, /* 637 */
-  {     2,      5,     12,      0,      0,  18432,     60, }, /* 638 */
-  {     1,      6,     12,      0,      0,  18432,     88, }, /* 639 */
-  {     2,      6,     12,      0,      0,  18432,    168, }, /* 640 */
-  {     0,      5,     12,      0,  35332,  18432,     76, }, /* 641 */
-  {     0,      5,     12,      0,   3814,  18432,     76, }, /* 642 */
-  {     0,      5,     12,      0,  35384,  18432,     76, }, /* 643 */
-  {     0,      5,     12,      0,      0,  18432,    192, }, /* 644 */
-  {     0,      6,     12,      0,      0,  18432,    168, }, /* 645 */
-  {     0,      6,     12,      0,      0,  18432,    194, }, /* 646 */
-  {     1,      6,     12,      0,      0,  18432,    168, }, /* 647 */
-  {    84,     12,      3,      0,      0,  26636,    102, }, /* 648 */
-  {    84,     12,      3,      0,      0,  26687,     96, }, /* 649 */
-  {    84,     12,      3,      0,      0,  26648,     96, }, /* 650 */
-  {     0,      9,     12,     92,      1,  18432,     74, }, /* 651 */
-  {     0,      5,     12,     92,     -1,  18432,     76, }, /* 652 */
-  {     0,      5,     12,      0,      0,  18432,     70, }, /* 653 */
-  {     0,      5,     12,     92,    -58,  18432,     70, }, /* 654 */
-  {     0,      9,     12,      0,  -7615,  18432,     74, }, /* 655 */
-  {     1,      5,     12,      0,      8,  18432,     76, }, /* 656 */
-  {     1,      9,     12,      0,     -8,  18432,     74, }, /* 657 */
-  {     1,      5,     12,      0,     74,  18432,     76, }, /* 658 */
-  {     1,      5,     12,      0,     86,  18432,     76, }, /* 659 */
-  {     1,      5,     12,      0,    100,  18432,     76, }, /* 660 */
-  {     1,      5,     12,      0,    128,  18432,     76, }, /* 661 */
-  {     1,      5,     12,      0,    112,  18432,     76, }, /* 662 */
-  {     1,      5,     12,      0,    126,  18432,     76, }, /* 663 */
-  {     1,      5,     12,      0,      8,  18432,     70, }, /* 664 */
-  {     1,      8,     12,      0,     -8,  18432,     86, }, /* 665 */
-  {     1,      5,     12,      0,      0,  18432,     70, }, /* 666 */
-  {     1,      5,     12,      0,      9,  18432,     70, }, /* 667 */
-  {     1,      9,     12,      0,    -74,  18432,     74, }, /* 668 */
-  {     1,      8,     12,      0,     -9,  18432,     86, }, /* 669 */
-  {     1,      5,     12,     21,  -7173,  18432,     76, }, /* 670 */
-  {     1,      9,     12,      0,    -86,  18432,     74, }, /* 671 */
-  {     1,      9,     12,      0,   -100,  18432,     74, }, /* 672 */
-  {     1,      9,     12,      0,   -112,  18432,     74, }, /* 673 */
-  {     1,      9,     12,      0,   -128,  18432,     74, }, /* 674 */
-  {     1,      9,     12,      0,   -126,  18432,     74, }, /* 675 */
-  {    69,     29,     12,      0,      0,  45056,     52, }, /* 676 */
-  {    84,      1,      3,      0,      0,   6144,    196, }, /* 677 */
-  {    84,      1,     13,      0,      0,   6144,    198, }, /* 678 */
-  {    69,      1,      2,      0,      0,  18432,    200, }, /* 679 */
-  {    69,      1,      2,      0,      0,  34816,    200, }, /* 680 */
-  {    69,     17,     12,      0,      0,  28672,    202, }, /* 681 */
-  {    69,     21,     12,      0,      0,  28672,     64, }, /* 682 */
-  {    69,     20,     12,      0,      0,  28672,    204, }, /* 683 */
-  {    69,     19,     12,      0,      0,  28672,    204, }, /* 684 */
-  {    69,     22,     12,      0,      0,  28672,    206, }, /* 685 */
-  {    69,     20,     12,      0,      0,  28672,    206, }, /* 686 */
-  {    69,     19,     12,      0,      0,  28672,    206, }, /* 687 */
-  {    69,     21,     12,      0,      0,  28672,    208, }, /* 688 */
-  {    69,     27,      2,      0,      0,  45056,     50, }, /* 689 */
-  {    69,     28,      2,      0,      0,   4096,     50, }, /* 690 */
-  {    69,      1,      2,      0,      0,  20480,    134, }, /* 691 */
-  {    69,      1,      2,      0,      0,  36864,    134, }, /* 692 */
-  {    69,      1,      2,      0,      0,  30720,    134, }, /* 693 */
-  {    69,      1,      2,      0,      0,  24576,    134, }, /* 694 */
-  {    69,      1,      2,      0,      0,  40960,    134, }, /* 695 */
-  {    69,     29,     12,      0,      0,   8291,     52, }, /* 696 */
-  {    69,     21,     12,      0,      0,  14336,     54, }, /* 697 */
-  {    69,     21,     12,      0,      0,  14336,     64, }, /* 698 */
-  {    69,     21,     14,      0,      0,  28672,    210, }, /* 699 */
-  {    69,     21,     12,      0,      0,  28672,    212, }, /* 700 */
-  {    69,     16,     12,      0,      0,  28672,    138, }, /* 701 */
-  {    69,     16,     12,      0,      0,  28672,    214, }, /* 702 */
-  {    69,     25,     12,      0,      0,   8192,     64, }, /* 703 */
-  {    69,     22,     12,      0,      0,  28672,    216, }, /* 704 */
-  {    69,     18,     12,      0,      0,  28672,    216, }, /* 705 */
-  {    69,     21,     12,      0,      0,  28672,    202, }, /* 706 */
-  {    69,      1,      2,      0,      0,   6144,    218, }, /* 707 */
-  {    68,      2,      2,      0,      0,   6144,    220, }, /* 708 */
-  {    69,      1,      2,      0,      0,  22528,    134, }, /* 709 */
-  {    69,      1,      2,      0,      0,  38912,    134, }, /* 710 */
-  {    69,      1,      2,      0,      0,  16384,    134, }, /* 711 */
-  {    69,      1,      2,      0,      0,  32768,    134, }, /* 712 */
-  {    69,      1,      2,      0,      0,   6144,    222, }, /* 713 */
-  {    69,     25,     12,      0,      0,  12288,    118, }, /* 714 */
-  {    69,     25,     12,      0,      0,  12288,    224, }, /* 715 */
-  {    69,     25,     12,      0,      0,  28672,    118, }, /* 716 */
-  {    69,     22,     12,      0,      0,  28672,    226, }, /* 717 */
-  {    69,     18,     12,      0,      0,  28672,    226, }, /* 718 */
-  {    68,      2,     12,      0,      0,  14336,      0, }, /* 719 */
-  {    84,     12,      3,      0,      0,  26624,    228, }, /* 720 */
-  {    84,     11,      3,      0,      0,  26624,    120, }, /* 721 */
-  {    84,     11,      3,      0,      0,  26624,    230, }, /* 722 */
-  {    84,     12,      3,      0,      0,  26753,    102, }, /* 723 */
-  {    69,     26,     12,      0,      0,  28672,     68, }, /* 724 */
-  {    69,      9,     12,      0,      0,  18432,    112, }, /* 725 */
-  {    69,      5,     12,      0,      0,  18432,    232, }, /* 726 */
-  {    69,     25,     12,      0,      0,  28672,    234, }, /* 727 */
-  {    69,     26,     14,      0,      0,  28672,    236, }, /* 728 */
-  {     1,      9,     12,     96,  -7517,  18432,     74, }, /* 729 */
-  {    69,     26,     12,      0,      0,  28672,    118, }, /* 730 */
-  {     0,      9,     12,    100,      0,  18432,     74, }, /* 731 */
-  {     0,      9,     12,    104,  -8262,  18432,     74, }, /* 732 */
-  {    69,     26,     12,      0,      0,  14336,    238, }, /* 733 */
-  {     0,      9,     12,      0,     28,  18432,     74, }, /* 734 */
-  {    69,      7,     12,      0,      0,  18432,    240, }, /* 735 */
-  {    69,      5,     14,      0,      0,  18432,    242, }, /* 736 */
-  {    69,      5,     12,      0,      0,  18432,    244, }, /* 737 */
-  {     0,      5,     12,      0,    -28,  18432,     76, }, /* 738 */
-  {     0,     14,     12,      0,     16,  18432,     74, }, /* 739 */
-  {     0,     14,     12,      0,    -16,  18432,     76, }, /* 740 */
-  {     0,     14,     12,      0,      0,  18432,     82, }, /* 741 */
-  {    69,     25,     14,      0,      0,  28672,    246, }, /* 742 */
-  {    69,     26,     14,      0,      0,  28672,    246, }, /* 743 */
-  {    69,     26,     12,      0,      0,  28672,     64, }, /* 744 */
-  {    69,     25,     12,      0,      0,  28672,    248, }, /* 745 */
-  {    69,     25,     12,      0,      0,  12288,    250, }, /* 746 */
-  {    69,     22,     12,      0,      0,  28672,    248, }, /* 747 */
-  {    69,     18,     12,      0,      0,  28672,    248, }, /* 748 */
-  {    69,     26,     14,      0,      0,  28672,    252, }, /* 749 */
-  {    69,     22,     12,      0,      0,  28672,    254, }, /* 750 */
-  {    69,     18,     12,      0,      0,  28672,    254, }, /* 751 */
-  {    69,     26,     12,      0,      0,  18432,     54, }, /* 752 */
-  {    69,     26,     14,      0,      0,  28672,    256, }, /* 753 */
-  {    68,      2,     12,      0,      0,  18432,    258, }, /* 754 */
-  {    69,     26,     12,      0,     26,  18432,    260, }, /* 755 */
-  {    69,     26,     14,      0,     26,  18432,    262, }, /* 756 */
-  {    69,     26,     12,      0,    -26,  18432,    264, }, /* 757 */
-  {    69,     25,     14,      0,      0,  28672,    266, }, /* 758 */
-  {    69,     26,     14,      0,      0,  28672,    268, }, /* 759 */
-  {    69,     26,     14,      0,      0,  28672,    270, }, /* 760 */
-  {    69,     25,     14,      0,      0,  28672,    268, }, /* 761 */
-  {    69,     26,     14,      0,      0,  18432,    256, }, /* 762 */
-  {    69,     26,     14,      0,      0,  28672,    272, }, /* 763 */
-  {    88,     26,     12,      0,      0,  18432,     54, }, /* 764 */
-  {    69,     26,     12,      0,      0,  28672,    216, }, /* 765 */
-  {    35,      9,     12,      0,     48,  18432,     74, }, /* 766 */
-  {    35,      5,     12,      0,    -48,  18432,     76, }, /* 767 */
-  {     0,      9,     12,      0, -10743,  18432,     74, }, /* 768 */
-  {     0,      9,     12,      0,  -3814,  18432,     74, }, /* 769 */
-  {     0,      9,     12,      0, -10727,  18432,     74, }, /* 770 */
-  {     0,      5,     12,      0, -10795,  18432,     76, }, /* 771 */
-  {     0,      5,     12,      0, -10792,  18432,     76, }, /* 772 */
-  {     0,      9,     12,      0, -10780,  18432,     74, }, /* 773 */
-  {     0,      9,     12,      0, -10749,  18432,     74, }, /* 774 */
-  {     0,      9,     12,      0, -10783,  18432,     74, }, /* 775 */
-  {     0,      9,     12,      0, -10782,  18432,     74, }, /* 776 */
-  {     0,      9,     12,      0, -10815,  18432,     74, }, /* 777 */
-  {    34,      5,     12,      0,      0,  18432,     60, }, /* 778 */
-  {    34,     26,     12,      0,      0,  28672,     68, }, /* 779 */
-  {    34,     12,      3,      0,      0,  26624,     96, }, /* 780 */
-  {    34,     21,     12,      0,      0,  28672,     68, }, /* 781 */
-  {    34,     15,     12,      0,      0,  28672,     68, }, /* 782 */
-  {    17,      5,     12,      0,  -7264,  18432,     76, }, /* 783 */
-  {    90,      7,     12,      0,      0,  18432,     82, }, /* 784 */
-  {    90,      6,     12,      0,      0,  18432,    142, }, /* 785 */
-  {    90,     21,     12,      0,      0,  18432,     68, }, /* 786 */
-  {    90,     12,      3,      0,      0,  26624,    184, }, /* 787 */
-  {     2,     12,      3,      0,      0,  26624,    130, }, /* 788 */
-  {    69,     20,     12,      0,      0,  28672,    216, }, /* 789 */
-  {    69,     19,     12,      0,      0,  28672,    216, }, /* 790 */
-  {    69,      6,     12,      0,      0,  28672,    274, }, /* 791 */
-  {    69,     21,     12,      0,      0,  28672,    276, }, /* 792 */
-  {    69,     21,     12,      0,      0,  28726,     54, }, /* 793 */
-  {    23,     26,     12,      0,      0,  28672,    278, }, /* 794 */
-  {    69,     26,     12,      0,      0,  28672,    280, }, /* 795 */
-  {    69,     26,     12,      0,      0,  28672,    282, }, /* 796 */
-  {    69,     21,     12,      0,      0,  28825,    276, }, /* 797 */
-  {    69,     21,     12,      0,      0,  28825,    212, }, /* 798 */
-  {    69,     21,     12,      0,      0,  28819,     54, }, /* 799 */
-  {    23,      6,     12,      0,      0,  18432,    136, }, /* 800 */
-  {    69,      7,     12,      0,      0,  18447,    284, }, /* 801 */
-  {    23,     14,     12,      0,      0,  18432,    284, }, /* 802 */
-  {    69,     22,     12,      0,      0,  28825,    216, }, /* 803 */
-  {    69,     18,     12,      0,      0,  28825,    216, }, /* 804 */
-  {    69,     22,     12,      0,      0,  28825,     62, }, /* 805 */
-  {    69,     18,     12,      0,      0,  28825,     62, }, /* 806 */
-  {    69,     26,     12,      0,      0,  28819,     54, }, /* 807 */
-  {    69,     17,     12,      0,      0,  28819,    202, }, /* 808 */
-  {    69,     22,     12,      0,      0,  28819,    206, }, /* 809 */
-  {    69,     18,     12,      0,      0,  28819,    206, }, /* 810 */
-  {    84,     12,      3,      0,      0,  26669,     96, }, /* 811 */
-  {    18,     10,      3,      0,      0,  18432,    286, }, /* 812 */
-  {    69,     17,     14,      0,      0,  28819,    288, }, /* 813 */
-  {    69,      6,     12,      0,      0,  18525,    136, }, /* 814 */
-  {    69,     26,     12,      0,      0,  28819,     68, }, /* 815 */
-  {    23,      6,     12,      0,      0,  18432,    142, }, /* 816 */
-  {    69,      7,     12,      0,      0,  18564,     82, }, /* 817 */
-  {    69,     21,     14,      0,      0,  28804,    236, }, /* 818 */
-  {    69,     26,     12,      0,      0,  28687,     68, }, /* 819 */
-  {    20,      7,     12,      0,      0,  18432,     82, }, /* 820 */
-  {    84,     12,      3,      0,      0,  26717,     96, }, /* 821 */
-  {    69,     24,     12,      0,      0,  28765,    290, }, /* 822 */
-  {    20,      6,     12,      0,      0,  18432,    136, }, /* 823 */
-  {    69,     17,     12,      0,      0,  28765,    126, }, /* 824 */
-  {    21,      7,     12,      0,      0,  18432,     82, }, /* 825 */
-  {    69,     21,     12,      0,      0,  28825,     68, }, /* 826 */
-  {    69,      6,     12,      0,      0,  18525,     94, }, /* 827 */
-  {    21,      6,     12,      0,      0,  18432,    136, }, /* 828 */
-  {    22,      7,     12,      0,      0,  18432,     82, }, /* 829 */
-  {    18,      7,     12,      0,      0,  18432,     82, }, /* 830 */
-  {    18,      7,     12,      0,      0,  18432,    170, }, /* 831 */
-  {    69,     26,     12,      0,      0,  18447,     68, }, /* 832 */
-  {    69,     15,     12,      0,      0,  18447,     68, }, /* 833 */
-  {    18,     26,     12,      0,      0,  18432,     68, }, /* 834 */
-  {    18,     26,     12,      0,      0,  28672,     68, }, /* 835 */
-  {    69,     15,     12,      0,      0,  18432,     68, }, /* 836 */
-  {    69,     26,     14,      0,      0,  18447,    236, }, /* 837 */
-  {    21,     26,     12,      0,      0,  18432,     68, }, /* 838 */
-  {    23,      7,     12,      0,      0,  18432,    292, }, /* 839 */
-  {    24,      7,     12,      0,      0,  18432,     82, }, /* 840 */
-  {    24,      6,     12,      0,      0,  18432,    136, }, /* 841 */
-  {    24,     26,     12,      0,      0,  28672,     68, }, /* 842 */
-  {   111,      7,     12,      0,      0,  18432,     82, }, /* 843 */
-  {   111,      6,     12,      0,      0,  18432,    142, }, /* 844 */
-  {   111,     21,     12,      0,      0,  18432,    106, }, /* 845 */
-  {   111,     21,     12,      0,      0,  18432,    124, }, /* 846 */
-  {    99,      7,     12,      0,      0,  18432,     82, }, /* 847 */
-  {    99,      6,     12,      0,      0,  18432,    136, }, /* 848 */
-  {    99,     21,     12,      0,      0,  28672,    106, }, /* 849 */
-  {    99,     21,     12,      0,      0,  28672,    124, }, /* 850 */
-  {    99,     13,     12,      0,      0,  18432,    138, }, /* 851 */
-  {     2,      9,     12,    108,      1,  18432,     74, }, /* 852 */
-  {     2,      5,     12,    108, -35267,  18432,     76, }, /* 853 */
-  {     2,      7,     12,      0,      0,  18432,     82, }, /* 854 */
-  {     2,     21,     12,      0,      0,  28672,     68, }, /* 855 */
-  {     2,     12,      3,      0,      0,  26624,     96, }, /* 856 */
-  {     2,      6,     12,      0,      0,  28672,     92, }, /* 857 */
-  {     2,      6,     12,      0,      0,  18432,     88, }, /* 858 */
-  {   112,      7,     12,      0,      0,  18432,     82, }, /* 859 */
-  {   112,     14,     12,      0,      0,  18432,     82, }, /* 860 */
-  {   112,     12,      3,      0,      0,  26624,     96, }, /* 861 */
-  {   112,     21,     12,      0,      0,  18432,     68, }, /* 862 */
-  {   112,     21,     12,      0,      0,  18432,    124, }, /* 863 */
-  {   112,     21,     12,      0,      0,  18432,    106, }, /* 864 */
-  {    69,     24,     12,      0,      0,  28762,     56, }, /* 865 */
-  {     0,      9,     12,      0, -35332,  18432,     74, }, /* 866 */
-  {    69,     24,     12,      0,      0,  18432,     56, }, /* 867 */
-  {     0,      9,     12,      0, -42280,  18432,     74, }, /* 868 */
-  {     0,      5,     12,      0,     48,  18432,     76, }, /* 869 */
-  {     0,      9,     12,      0, -42308,  18432,     74, }, /* 870 */
-  {     0,      9,     12,      0, -42319,  18432,     74, }, /* 871 */
-  {     0,      9,     12,      0, -42315,  18432,     74, }, /* 872 */
-  {     0,      9,     12,      0, -42305,  18432,     74, }, /* 873 */
-  {     0,      9,     12,      0, -42258,  18432,     74, }, /* 874 */
-  {     0,      9,     12,      0, -42282,  18432,     74, }, /* 875 */
-  {     0,      9,     12,      0, -42261,  18432,     74, }, /* 876 */
-  {     0,      9,     12,      0,    928,  18432,     74, }, /* 877 */
-  {     0,      9,     12,      0,    -48,  18432,     74, }, /* 878 */
-  {     0,      9,     12,      0, -42307,  18432,     74, }, /* 879 */
-  {     0,      9,     12,      0, -35384,  18432,     74, }, /* 880 */
-  {    36,      7,     12,      0,      0,  18432,     82, }, /* 881 */
-  {    36,     12,      3,      0,      0,  26624,    130, }, /* 882 */
-  {    36,     12,      3,      0,      0,  26624,    184, }, /* 883 */
-  {    36,     10,      5,      0,      0,  18432,    144, }, /* 884 */
-  {    36,     26,     12,      0,      0,  28672,     68, }, /* 885 */
-  {    69,     15,     12,      0,      0,  18612,     68, }, /* 886 */
-  {    69,     15,     12,      0,      0,  18609,     68, }, /* 887 */
-  {    69,     26,     12,      0,      0,  18600,     68, }, /* 888 */
-  {    69,     23,     12,      0,      0,  14504,     68, }, /* 889 */
-  {    69,     26,     12,      0,      0,  14504,     68, }, /* 890 */
-  {    37,      7,     12,      0,      0,  18432,     82, }, /* 891 */
-  {    37,     21,     12,      0,      0,  28672,     68, }, /* 892 */
-  {    37,     21,     12,      0,      0,  28672,    124, }, /* 893 */
-  {   100,     10,      5,      0,      0,  18432,    144, }, /* 894 */
-  {   100,      7,     12,      0,      0,  18432,     82, }, /* 895 */
-  {   100,     12,      3,      0,      0,  26624,    146, }, /* 896 */
-  {   100,     12,      3,      0,      0,  26624,    130, }, /* 897 */
-  {   100,     21,     12,      0,      0,  18432,    124, }, /* 898 */
-  {   100,     13,     12,      0,      0,  18432,    138, }, /* 899 */
-  {     6,     12,      3,      0,      0,  26666,     96, }, /* 900 */
-  {     6,      7,     12,      0,      0,  18507,     82, }, /* 901 */
-  {    39,     13,     12,      0,      0,  18432,    138, }, /* 902 */
-  {    39,      7,     12,      0,      0,  18432,     82, }, /* 903 */
-  {    39,     12,      3,      0,      0,  26624,    130, }, /* 904 */
-  {    39,     12,      3,      0,      0,  26624,     96, }, /* 905 */
-  {    69,     21,     12,      0,      0,  18567,    190, }, /* 906 */
-  {    39,     21,     12,      0,      0,  18432,    124, }, /* 907 */
-  {   101,      7,     12,      0,      0,  18432,     82, }, /* 908 */
-  {   101,     12,      3,      0,      0,  26624,    130, }, /* 909 */
-  {   101,     10,      5,      0,      0,  18432,    144, }, /* 910 */
-  {   101,     10,      5,      0,      0,  18432,    174, }, /* 911 */
-  {   101,     21,     12,      0,      0,  18432,     68, }, /* 912 */
-  {    40,     12,      3,      0,      0,  26624,    130, }, /* 913 */
-  {    40,     10,      5,      0,      0,  18432,    144, }, /* 914 */
-  {    40,      7,     12,      0,      0,  18432,     82, }, /* 915 */
-  {    40,     12,      3,      0,      0,  26624,     96, }, /* 916 */
-  {    40,     10,      5,      0,      0,  18432,    174, }, /* 917 */
-  {    40,     21,     12,      0,      0,  18432,     68, }, /* 918 */
-  {    40,     21,     12,      0,      0,  18432,    106, }, /* 919 */
-  {    40,     21,     12,      0,      0,  18432,    124, }, /* 920 */
-  {    69,      6,     12,      0,      0,  18480,    136, }, /* 921 */
-  {    40,     13,     12,      0,      0,  18432,    138, }, /* 922 */
-  {    16,      6,     12,      0,      0,  18432,    136, }, /* 923 */
-  {   105,      7,     12,      0,      0,  18432,     82, }, /* 924 */
-  {   105,     12,      3,      0,      0,  26624,    130, }, /* 925 */
-  {   105,     10,      5,      0,      0,  18432,    144, }, /* 926 */
-  {   105,     13,     12,      0,      0,  18432,    138, }, /* 927 */
-  {   105,     21,     12,      0,      0,  18432,     68, }, /* 928 */
-  {   105,     21,     12,      0,      0,  18432,    124, }, /* 929 */
-  {   107,      7,     12,      0,      0,  18432,     82, }, /* 930 */
-  {   107,     12,      3,      0,      0,  26624,    130, }, /* 931 */
-  {   107,      7,     12,      0,      0,  18432,    156, }, /* 932 */
-  {   107,     12,      3,      0,      0,  26624,     96, }, /* 933 */
-  {   107,      7,     12,      0,      0,  18432,    294, }, /* 934 */
-  {   107,      6,     12,      0,      0,  18432,    136, }, /* 935 */
-  {   107,     21,     12,      0,      0,  18432,     68, }, /* 936 */
-  {   107,     21,     12,      0,      0,  18432,    106, }, /* 937 */
-  {   113,      7,     12,      0,      0,  18432,     82, }, /* 938 */
-  {   113,     10,      5,      0,      0,  18432,    144, }, /* 939 */
-  {   113,     12,      3,      0,      0,  26624,    130, }, /* 940 */
-  {   113,     21,     12,      0,      0,  18432,    124, }, /* 941 */
-  {   113,      6,     12,      0,      0,  18432,    136, }, /* 942 */
-  {   113,     12,      3,      0,      0,  26624,    146, }, /* 943 */
-  {     0,      5,     12,      0,   -928,  18432,     76, }, /* 944 */
-  {    76,      5,     12,      0, -38864,  18432,     70, }, /* 945 */
-  {   113,     10,      5,      0,      0,  18432,    160, }, /* 946 */
-  {   113,     13,     12,      0,      0,  18432,    138, }, /* 947 */
-  {    18,      7,      9,      0,      0,  18432,     82, }, /* 948 */
-  {    18,      7,     10,      0,      0,  18432,     82, }, /* 949 */
-  {    68,      4,     12,      0,      0,  18432,      0, }, /* 950 */
-  {    68,      3,     12,      0,      0,  18432,      0, }, /* 951 */
-  {    23,      7,     12,      0,      0,  18432,    284, }, /* 952 */
-  {    71,     25,     12,      0,      0,  12288,    118, }, /* 953 */
-  {     3,      7,     12,      0,      0,      0,    296, }, /* 954 */
-  {    69,     18,     12,      0,      0,  28705,     54, }, /* 955 */
-  {    69,     22,     12,      0,      0,  28705,     54, }, /* 956 */
-  {    68,      2,     12,      0,      0,   6144,    298, }, /* 957 */
-  {     3,      7,     12,      0,      0,     39,     82, }, /* 958 */
-  {     3,     26,     12,      0,      0,  28711,     68, }, /* 959 */
-  {    84,     12,      3,      0,      0,  26624,    180, }, /* 960 */
-  {    84,     12,      3,      0,      0,  26624,    300, }, /* 961 */
-  {    69,     21,     12,      0,      0,  28672,     68, }, /* 962 */
-  {    69,     21,     12,      0,      0,  28672,    122, }, /* 963 */
-  {    69,     22,     12,      0,      0,  28672,     68, }, /* 964 */
-  {    69,     18,     12,      0,      0,  28672,     68, }, /* 965 */
-  {    69,     17,     12,      0,      0,  28672,    126, }, /* 966 */
-  {    69,     22,     12,      0,      0,  28672,    302, }, /* 967 */
-  {    69,     18,     12,      0,      0,  28672,    302, }, /* 968 */
-  {    69,     21,     12,      0,      0,   8192,    106, }, /* 969 */
-  {    69,     21,     12,      0,      0,   8192,    304, }, /* 970 */
-  {    69,     21,     12,      0,      0,   8192,    306, }, /* 971 */
-  {    69,     21,     12,      0,      0,  28672,    124, }, /* 972 */
-  {    69,     22,     12,      0,      0,  28672,    158, }, /* 973 */
-  {    69,     18,     12,      0,      0,  28672,    158, }, /* 974 */
-  {    69,     21,     12,      0,      0,  14336,     68, }, /* 975 */
-  {    69,     21,     12,      0,      0,  28672,    118, }, /* 976 */
-  {    69,     17,     12,      0,      0,  12288,    224, }, /* 977 */
-  {    69,     25,     12,      0,      0,  28672,    226, }, /* 978 */
-  {    69,     21,     12,      0,      0,  28672,    302, }, /* 979 */
-  {    69,     21,     12,      0,      0,  28672,    308, }, /* 980 */
-  {    69,     17,     12,      0,      0,  12288,    126, }, /* 981 */
-  {    69,     21,     12,      0,      0,   8192,     68, }, /* 982 */
-  {    69,     13,     12,      0,      0,  10240,    310, }, /* 983 */
-  {     0,      9,     12,      0,     32,  18432,    312, }, /* 984 */
-  {    69,     24,     12,      0,      0,  28672,    314, }, /* 985 */
-  {     0,      5,     12,      0,    -32,  18432,    316, }, /* 986 */
-  {    69,     21,     12,      0,      0,  28825,    124, }, /* 987 */
-  {    69,     22,     12,      0,      0,  28825,    318, }, /* 988 */
-  {    69,     18,     12,      0,      0,  28825,    318, }, /* 989 */
-  {    69,     21,     12,      0,      0,  28825,    106, }, /* 990 */
-  {    69,      6,      3,      0,      0,  18525,    320, }, /* 991 */
-  {    69,      1,      2,      0,      0,  28672,    322, }, /* 992 */
-  {    31,      7,     12,      0,      0,  18432,     82, }, /* 993 */
-  {    69,     21,     12,      0,      0,  18552,     68, }, /* 994 */
-  {    69,     21,     12,      0,      0,  28792,     68, }, /* 995 */
-  {    69,     21,     12,      0,      0,  18483,     68, }, /* 996 */
-  {    69,     15,     12,      0,      0,  18555,     68, }, /* 997 */
-  {    69,     26,     12,      0,      0,  18483,     68, }, /* 998 */
-  {     1,     14,     12,      0,      0,  28672,     82, }, /* 999 */
-  {     1,     15,     12,      0,      0,  28672,     68, }, /* 1000 */
-  {     1,     26,     12,      0,      0,  28672,     68, }, /* 1001 */
-  {     1,     26,     12,      0,      0,  18432,     68, }, /* 1002 */
-  {   102,      7,     12,      0,      0,  18432,     82, }, /* 1003 */
-  {   103,      7,     12,      0,      0,  18432,     82, }, /* 1004 */
-  {    84,     12,      3,      0,      0,  26651,     96, }, /* 1005 */
-  {    69,     15,     12,      0,      0,  10267,     68, }, /* 1006 */
-  {    81,      7,     12,      0,      0,  18432,     82, }, /* 1007 */
-  {    81,     15,     12,      0,      0,  18432,     68, }, /* 1008 */
-  {    82,      7,     12,      0,      0,  18432,     82, }, /* 1009 */
-  {    82,     14,     12,      0,      0,  18432,     82, }, /* 1010 */
-  {    53,      7,     12,      0,      0,  18432,     82, }, /* 1011 */
-  {    53,     12,      3,      0,      0,  26624,    130, }, /* 1012 */
-  {    85,      7,     12,      0,      0,  18432,     82, }, /* 1013 */
-  {    85,     21,     12,      0,      0,  18432,    106, }, /* 1014 */
-  {    91,      7,     12,      0,      0,  18432,     82, }, /* 1015 */
-  {    91,     21,     12,      0,      0,  18432,    106, }, /* 1016 */
-  {    91,     14,     12,      0,      0,  18432,     82, }, /* 1017 */
-  {    83,      9,     12,      0,     40,  18432,     74, }, /* 1018 */
-  {    83,      5,     12,      0,    -40,  18432,     76, }, /* 1019 */
-  {    86,      7,     12,      0,      0,  18432,     82, }, /* 1020 */
-  {    87,      7,     12,      0,      0,  18432,     82, }, /* 1021 */
-  {    87,     13,     12,      0,      0,  18432,    138, }, /* 1022 */
-  {   145,      9,     12,      0,     40,  18432,     74, }, /* 1023 */
-  {   145,      5,     12,      0,    -40,  18432,     76, }, /* 1024 */
-  {   127,      7,     12,      0,      0,  18432,     82, }, /* 1025 */
-  {   125,      7,     12,      0,      0,  18432,     82, }, /* 1026 */
-  {   125,     21,     12,      0,      0,  18432,     68, }, /* 1027 */
-  {   161,      9,     12,      0,     39,  18432,     74, }, /* 1028 */
-  {   161,      5,     12,      0,    -39,  18432,     76, }, /* 1029 */
-  {    49,      7,     12,      0,      0,  18432,     82, }, /* 1030 */
-  {     0,      6,     12,      0,      0,  18432,     94, }, /* 1031 */
-  {    32,      7,     12,      0,      0,  34816,     82, }, /* 1032 */
-  {   114,      7,     12,      0,      0,  34816,     82, }, /* 1033 */
-  {   114,     21,     12,      0,      0,  34816,    106, }, /* 1034 */
-  {   114,     15,     12,      0,      0,  34816,     68, }, /* 1035 */
-  {   133,      7,     12,      0,      0,  34816,     82, }, /* 1036 */
-  {   133,     26,     12,      0,      0,  34816,     68, }, /* 1037 */
-  {   133,     15,     12,      0,      0,  34816,     68, }, /* 1038 */
-  {   132,      7,     12,      0,      0,  34816,     82, }, /* 1039 */
-  {   132,     15,     12,      0,      0,  34816,     68, }, /* 1040 */
-  {   139,      7,     12,      0,      0,  34816,     82, }, /* 1041 */
-  {   139,     15,     12,      0,      0,  34816,     68, }, /* 1042 */
-  {    95,      7,     12,      0,      0,  34816,     82, }, /* 1043 */
-  {    95,     15,     12,      0,      0,  34816,     68, }, /* 1044 */
-  {    95,     21,     12,      0,      0,  28672,    106, }, /* 1045 */
-  {   104,      7,     12,      0,      0,  34816,     82, }, /* 1046 */
-  {   104,     21,     12,      0,      0,  34816,     68, }, /* 1047 */
-  {   122,      7,     12,      0,      0,  34816,     82, }, /* 1048 */
-  {   121,      7,     12,      0,      0,  34816,     82, }, /* 1049 */
-  {   121,     15,     12,      0,      0,  34816,     68, }, /* 1050 */
-  {    92,      7,     12,      0,      0,  34816,     82, }, /* 1051 */
-  {    92,     12,      3,      0,      0,  26624,    130, }, /* 1052 */
-  {    92,     12,      3,      0,      0,  26624,    102, }, /* 1053 */
-  {    92,     12,      3,      0,      0,  26624,    184, }, /* 1054 */
-  {    92,     15,     12,      0,      0,  34816,     68, }, /* 1055 */
-  {    92,     21,     12,      0,      0,  34816,     68, }, /* 1056 */
-  {    92,     21,     12,      0,      0,  34816,    124, }, /* 1057 */
-  {   115,      7,     12,      0,      0,  34816,     82, }, /* 1058 */
-  {   115,     15,     12,      0,      0,  34816,     68, }, /* 1059 */
-  {   115,     21,     12,      0,      0,  34816,     68, }, /* 1060 */
-  {   131,      7,     12,      0,      0,  34816,     82, }, /* 1061 */
-  {   131,     15,     12,      0,      0,  34816,     68, }, /* 1062 */
-  {    51,      7,     12,      0,      0,  34816,     82, }, /* 1063 */
-  {    51,     26,     12,      0,      0,  34816,     68, }, /* 1064 */
-  {    51,     12,      3,      0,      0,  26624,     96, }, /* 1065 */
-  {    51,     15,     12,      0,      0,  34816,     68, }, /* 1066 */
-  {    51,     21,     12,      0,      0,  34816,    106, }, /* 1067 */
-  {    51,     21,     12,      0,      0,  34918,    106, }, /* 1068 */
-  {    51,     21,     12,      0,      0,  34816,     68, }, /* 1069 */
-  {   108,      7,     12,      0,      0,  34816,     82, }, /* 1070 */
-  {   108,     21,     12,      0,      0,  28672,     68, }, /* 1071 */
-  {   108,     21,     12,      0,      0,  28672,    106, }, /* 1072 */
-  {   116,      7,     12,      0,      0,  34816,     82, }, /* 1073 */
-  {   116,     15,     12,      0,      0,  34816,     68, }, /* 1074 */
-  {   117,      7,     12,      0,      0,  34816,     82, }, /* 1075 */
-  {   117,     15,     12,      0,      0,  34816,     68, }, /* 1076 */
-  {    54,      7,     12,      0,      0,  34816,     82, }, /* 1077 */
-  {    54,     21,     12,      0,      0,  34816,    106, }, /* 1078 */
-  {    54,     15,     12,      0,      0,  34816,     68, }, /* 1079 */
-  {   118,      7,     12,      0,      0,  34816,     82, }, /* 1080 */
-  {   140,      9,     12,      0,     64,  34816,     74, }, /* 1081 */
-  {   140,      5,     12,      0,    -64,  34816,     76, }, /* 1082 */
-  {   140,     15,     12,      0,      0,  34816,     68, }, /* 1083 */
-  {    62,      7,     12,      0,      0,      0,     82, }, /* 1084 */
-  {    62,      7,     12,      0,      0,      0,    294, }, /* 1085 */
-  {    62,     12,      3,      0,      0,  26624,    128, }, /* 1086 */
-  {    62,     13,     12,      0,      0,   2048,    138, }, /* 1087 */
-  {     3,     15,     12,      0,      0,   2048,     68, }, /* 1088 */
-  {    65,      7,     12,      0,      0,  34816,     82, }, /* 1089 */
-  {    65,     12,      3,      0,      0,  26624,    130, }, /* 1090 */
-  {    65,     17,     12,      0,      0,  34816,    126, }, /* 1091 */
-  {   152,      7,     12,      0,      0,  34816,     82, }, /* 1092 */
-  {   152,     15,     12,      0,      0,  34816,     68, }, /* 1093 */
-  {    63,      7,     12,      0,      0,      0,     82, }, /* 1094 */
-  {    63,     12,      3,      0,      0,  26624,     96, }, /* 1095 */
-  {    63,     15,     12,      0,      0,      0,     68, }, /* 1096 */
-  {    63,     21,     12,      0,      0,      0,    124, }, /* 1097 */
-  {    67,      7,     12,      0,      0,  34816,     82, }, /* 1098 */
-  {    67,     12,      3,      0,      0,  26624,     96, }, /* 1099 */
-  {    67,     21,     12,      0,      0,  34816,    124, }, /* 1100 */
-  {   156,      7,     12,      0,      0,  34816,     82, }, /* 1101 */
-  {   156,     15,     12,      0,      0,  34816,     68, }, /* 1102 */
-  {   153,      7,     12,      0,      0,  34816,     82, }, /* 1103 */
-  {   120,     10,      5,      0,      0,  18432,    144, }, /* 1104 */
-  {   120,     12,      3,      0,      0,  26624,    130, }, /* 1105 */
-  {   120,      7,     12,      0,      0,  18432,     82, }, /* 1106 */
-  {   120,     12,      3,      0,      0,  26624,    146, }, /* 1107 */
-  {   120,     21,     12,      0,      0,  18432,    124, }, /* 1108 */
-  {   120,     21,     12,      0,      0,  18432,    106, }, /* 1109 */
-  {   120,     15,     12,      0,      0,  28672,     68, }, /* 1110 */
-  {   120,     13,     12,      0,      0,  18432,    138, }, /* 1111 */
-  {   120,     12,      3,      0,      0,  26624,    184, }, /* 1112 */
-  {    41,     12,      3,      0,      0,  26624,    130, }, /* 1113 */
-  {    41,     10,      5,      0,      0,  18432,    144, }, /* 1114 */
-  {    41,      7,     12,      0,      0,  18432,     82, }, /* 1115 */
-  {    41,     12,      3,      0,      0,  26624,    146, }, /* 1116 */
-  {    41,     12,      3,      0,      0,  26624,     96, }, /* 1117 */
-  {    41,     21,     12,      0,      0,  18432,     68, }, /* 1118 */
-  {    41,      1,      4,      0,      0,  18432,    132, }, /* 1119 */
-  {    41,     21,     12,      0,      0,  18432,    124, }, /* 1120 */
-  {   124,      7,     12,      0,      0,  18432,     82, }, /* 1121 */
-  {   124,     13,     12,      0,      0,  18432,    138, }, /* 1122 */
-  {    43,     12,      3,      0,      0,  26624,    130, }, /* 1123 */
-  {    43,      7,     12,      0,      0,  18432,     82, }, /* 1124 */
-  {    43,     10,      5,      0,      0,  18432,    144, }, /* 1125 */
-  {    43,     12,      3,      0,      0,  26624,    146, }, /* 1126 */
-  {    43,     13,     12,      0,      0,  18432,    138, }, /* 1127 */
-  {    43,     21,     12,      0,      0,  18432,     68, }, /* 1128 */
-  {    43,     21,     12,      0,      0,  18432,    124, }, /* 1129 */
-  {    50,      7,     12,      0,      0,  18432,     82, }, /* 1130 */
-  {    50,     12,      3,      0,      0,  26624,     96, }, /* 1131 */
-  {    50,     21,     12,      0,      0,  18432,     68, }, /* 1132 */
-  {    44,     12,      3,      0,      0,  26624,    130, }, /* 1133 */
-  {    44,     10,      5,      0,      0,  18432,    144, }, /* 1134 */
-  {    44,      7,     12,      0,      0,  18432,     82, }, /* 1135 */
-  {    44,     10,      5,      0,      0,  18432,    174, }, /* 1136 */
-  {    44,      7,      4,      0,      0,  18432,     82, }, /* 1137 */
-  {    44,     21,     12,      0,      0,  18432,    124, }, /* 1138 */
-  {    44,     21,     12,      0,      0,  18432,     68, }, /* 1139 */
-  {    44,     12,      3,      0,      0,  26624,    102, }, /* 1140 */
-  {    44,     12,      3,      0,      0,  26624,     96, }, /* 1141 */
-  {    44,     13,     12,      0,      0,  18432,    138, }, /* 1142 */
-  {    15,     15,     12,      0,      0,  18432,     68, }, /* 1143 */
-  {    48,      7,     12,      0,      0,  18432,     82, }, /* 1144 */
-  {    48,     10,      5,      0,      0,  18432,    144, }, /* 1145 */
-  {    48,     12,      3,      0,      0,  26624,    130, }, /* 1146 */
-  {    48,     10,      5,      0,      0,  18432,    174, }, /* 1147 */
-  {    48,     12,      3,      0,      0,  26624,     96, }, /* 1148 */
-  {    48,     21,     12,      0,      0,  18432,    124, }, /* 1149 */
-  {    48,     21,     12,      0,      0,  18432,    106, }, /* 1150 */
-  {    48,     21,     12,      0,      0,  18432,     68, }, /* 1151 */
-  {    57,      7,     12,      0,      0,  18432,     82, }, /* 1152 */
-  {    57,     21,     12,      0,      0,  18432,    124, }, /* 1153 */
-  {    55,      7,     12,      0,      0,  18432,     82, }, /* 1154 */
-  {    55,     12,      3,      0,      0,  26624,    130, }, /* 1155 */
-  {    55,     10,      5,      0,      0,  18432,    144, }, /* 1156 */
-  {    55,     12,      3,      0,      0,  26624,     96, }, /* 1157 */
-  {    55,     12,      3,      0,      0,  26624,    146, }, /* 1158 */
-  {    55,     13,     12,      0,      0,  18432,    138, }, /* 1159 */
-  {    47,     12,      3,      0,      0,  26624,    130, }, /* 1160 */
-  {    47,     12,      3,      0,      0,  26705,    130, }, /* 1161 */
-  {    47,     10,      5,      0,      0,  18432,    144, }, /* 1162 */
-  {    47,     10,      5,      0,      0,  18513,    144, }, /* 1163 */
-  {    47,      7,     12,      0,      0,  18432,     82, }, /* 1164 */
-  {    84,     12,      3,      0,      0,  26705,    102, }, /* 1165 */
-  {    47,     12,      3,      0,      0,  26705,     96, }, /* 1166 */
-  {    47,     10,      3,      0,      0,  18432,    148, }, /* 1167 */
-  {    47,     10,      5,      0,      0,  18432,    174, }, /* 1168 */
-  {    47,      7,     12,      0,      0,  18432,    324, }, /* 1169 */
-  {    47,     12,      3,      0,      0,  26624,     96, }, /* 1170 */
-  {   144,      7,     12,      0,      0,  18432,     82, }, /* 1171 */
-  {   144,     10,      5,      0,      0,  18432,    144, }, /* 1172 */
-  {   144,     12,      3,      0,      0,  26624,    130, }, /* 1173 */
-  {   144,     12,      3,      0,      0,  26624,    146, }, /* 1174 */
-  {   144,     12,      3,      0,      0,  26624,     96, }, /* 1175 */
-  {   144,     21,     12,      0,      0,  18432,    124, }, /* 1176 */
-  {   144,     21,     12,      0,      0,  18432,    106, }, /* 1177 */
-  {   144,     21,     12,      0,      0,  18432,     68, }, /* 1178 */
-  {   144,     13,     12,      0,      0,  18432,    138, }, /* 1179 */
-  {   144,     12,      3,      0,      0,  26624,    102, }, /* 1180 */
-  {    56,      7,     12,      0,      0,  18432,     82, }, /* 1181 */
-  {    56,     10,      3,      0,      0,  18432,    148, }, /* 1182 */
-  {    56,     10,      5,      0,      0,  18432,    144, }, /* 1183 */
-  {    56,     12,      3,      0,      0,  26624,    130, }, /* 1184 */
-  {    56,     12,      3,      0,      0,  26624,    146, }, /* 1185 */
-  {    56,     12,      3,      0,      0,  26624,     96, }, /* 1186 */
-  {    56,     21,     12,      0,      0,  18432,     68, }, /* 1187 */
-  {    56,     13,     12,      0,      0,  18432,    138, }, /* 1188 */
-  {   135,      7,     12,      0,      0,  18432,     82, }, /* 1189 */
-  {   135,     10,      3,      0,      0,  18432,    148, }, /* 1190 */
-  {   135,     10,      5,      0,      0,  18432,    144, }, /* 1191 */
-  {   135,     12,      3,      0,      0,  26624,    130, }, /* 1192 */
-  {   135,     12,      3,      0,      0,  26624,    146, }, /* 1193 */
-  {   135,     12,      3,      0,      0,  26624,     96, }, /* 1194 */
-  {   135,     21,     12,      0,      0,  18432,     68, }, /* 1195 */
-  {   135,     21,     12,      0,      0,  18432,    124, }, /* 1196 */
-  {   135,     21,     12,      0,      0,  18432,    106, }, /* 1197 */
-  {   135,     21,     12,      0,      0,  18432,    178, }, /* 1198 */
-  {    52,      7,     12,      0,      0,  18432,     82, }, /* 1199 */
-  {    52,     10,      5,      0,      0,  18432,    144, }, /* 1200 */
-  {    52,     12,      3,      0,      0,  26624,    130, }, /* 1201 */
-  {    52,     12,      3,      0,      0,  26624,    146, }, /* 1202 */
-  {    52,     21,     12,      0,      0,  18432,    124, }, /* 1203 */
-  {    52,     21,     12,      0,      0,  18432,     68, }, /* 1204 */
-  {    52,     13,     12,      0,      0,  18432,    138, }, /* 1205 */
-  {    45,      7,     12,      0,      0,  18432,     82, }, /* 1206 */
-  {    45,     12,      3,      0,      0,  26624,    130, }, /* 1207 */
-  {    45,     10,      5,      0,      0,  18432,    144, }, /* 1208 */
-  {    45,     10,      5,      0,      0,  18432,    174, }, /* 1209 */
-  {    45,     12,      3,      0,      0,  26624,     96, }, /* 1210 */
-  {    45,     21,     12,      0,      0,  18432,     68, }, /* 1211 */
-  {    45,     13,     12,      0,      0,  18432,    138, }, /* 1212 */
-  {   137,      7,     12,      0,      0,  18432,     82, }, /* 1213 */
-  {   137,     12,      3,      0,      0,  26624,    130, }, /* 1214 */
-  {   137,     10,     12,      0,      0,  18432,    144, }, /* 1215 */
-  {   137,     10,      5,      0,      0,  18432,    144, }, /* 1216 */
-  {   137,     12,      3,      0,      0,  26624,    146, }, /* 1217 */
-  {   137,     13,     12,      0,      0,  18432,    138, }, /* 1218 */
-  {   137,     15,     12,      0,      0,  18432,     68, }, /* 1219 */
-  {   137,     21,     12,      0,      0,  18432,    124, }, /* 1220 */
-  {   137,     26,     12,      0,      0,  18432,     68, }, /* 1221 */
-  {    60,      7,     12,      0,      0,  18432,     82, }, /* 1222 */
-  {    60,     10,      5,      0,      0,  18432,    144, }, /* 1223 */
-  {    60,     12,      3,      0,      0,  26624,    130, }, /* 1224 */
-  {    60,     12,      3,      0,      0,  26624,    146, }, /* 1225 */
-  {    60,     12,      3,      0,      0,  26624,     96, }, /* 1226 */
-  {    60,     21,     12,      0,      0,  18432,     68, }, /* 1227 */
-  {   136,      9,     12,      0,     32,  18432,     74, }, /* 1228 */
-  {   136,      5,     12,      0,    -32,  18432,     76, }, /* 1229 */
-  {   136,     13,     12,      0,      0,  18432,    138, }, /* 1230 */
-  {   136,     15,     12,      0,      0,  18432,     68, }, /* 1231 */
-  {   136,      7,     12,      0,      0,  18432,     82, }, /* 1232 */
-  {   157,      7,     12,      0,      0,  18432,     82, }, /* 1233 */
-  {   157,     10,      3,      0,      0,  18432,    148, }, /* 1234 */
-  {   157,     10,      5,      0,      0,  18432,    144, }, /* 1235 */
-  {   157,     12,      3,      0,      0,  26624,    130, }, /* 1236 */
-  {   157,     10,      5,      0,      0,  18432,    174, }, /* 1237 */
-  {   157,     12,      3,      0,      0,  26624,    146, }, /* 1238 */
-  {   157,      7,      4,      0,      0,  18432,     82, }, /* 1239 */
-  {   157,     12,      3,      0,      0,  26624,     96, }, /* 1240 */
-  {   157,     21,     12,      0,      0,  18432,    124, }, /* 1241 */
-  {   157,     21,     12,      0,      0,  18432,     68, }, /* 1242 */
-  {   157,     13,     12,      0,      0,  18432,    138, }, /* 1243 */
-  {    64,      7,     12,      0,      0,  18432,     82, }, /* 1244 */
-  {    64,     10,      5,      0,      0,  18432,    144, }, /* 1245 */
-  {    64,     12,      3,      0,      0,  26624,    130, }, /* 1246 */
-  {    64,     12,      3,      0,      0,  26624,    146, }, /* 1247 */
-  {    64,     21,     12,      0,      0,  18432,     68, }, /* 1248 */
-  {   149,      7,     12,      0,      0,  18432,     82, }, /* 1249 */
-  {   149,     12,      3,      0,      0,  26624,    130, }, /* 1250 */
-  {   149,     12,      3,      0,      0,  18432,    130, }, /* 1251 */
-  {   149,     12,      3,      0,      0,  26624,    102, }, /* 1252 */
-  {   149,     12,      3,      0,      0,  26624,    146, }, /* 1253 */
-  {   149,     10,      5,      0,      0,  18432,    144, }, /* 1254 */
-  {   149,      7,      4,      0,      0,  18432,     82, }, /* 1255 */
-  {   149,     21,     12,      0,      0,  18432,     68, }, /* 1256 */
-  {   149,     21,     12,      0,      0,  18432,    124, }, /* 1257 */
-  {   148,      7,     12,      0,      0,  18432,     82, }, /* 1258 */
-  {   148,     12,      3,      0,      0,  26624,    130, }, /* 1259 */
-  {   148,     10,      5,      0,      0,  18432,    144, }, /* 1260 */
-  {   148,      7,      4,      0,      0,  18432,     82, }, /* 1261 */
-  {   148,     12,      3,      0,      0,  26624,    326, }, /* 1262 */
-  {   148,     12,      3,      0,      0,  26624,    146, }, /* 1263 */
-  {   148,     21,     12,      0,      0,  18432,     68, }, /* 1264 */
-  {   148,     21,     12,      0,      0,  18432,    124, }, /* 1265 */
-  {   148,     21,     12,      0,      0,  18432,    106, }, /* 1266 */
-  {   134,      7,     12,      0,      0,  18432,     82, }, /* 1267 */
-  {   142,      7,     12,      0,      0,  18432,     82, }, /* 1268 */
-  {   142,     10,      5,      0,      0,  18432,    144, }, /* 1269 */
-  {   142,     12,      3,      0,      0,  26624,    130, }, /* 1270 */
-  {   142,     12,      3,      0,      0,  18432,    146, }, /* 1271 */
-  {   142,     21,     12,      0,      0,  18432,    124, }, /* 1272 */
-  {   142,     21,     12,      0,      0,  18432,    106, }, /* 1273 */
-  {   142,     21,     12,      0,      0,  18432,     68, }, /* 1274 */
-  {   142,     13,     12,      0,      0,  18432,    138, }, /* 1275 */
-  {   142,     15,     12,      0,      0,  18432,     68, }, /* 1276 */
-  {   143,     21,     12,      0,      0,  18432,     68, }, /* 1277 */
-  {   143,     21,     12,      0,      0,  18432,    106, }, /* 1278 */
-  {   143,      7,     12,      0,      0,  18432,     82, }, /* 1279 */
-  {   143,     12,      3,      0,      0,  26624,    130, }, /* 1280 */
-  {   143,     10,      5,      0,      0,  18432,    144, }, /* 1281 */
-  {    59,      7,     12,      0,      0,  18432,     82, }, /* 1282 */
-  {    59,     12,      3,      0,      0,  26624,    130, }, /* 1283 */
-  {    59,     12,      3,      0,      0,  26624,     96, }, /* 1284 */
-  {    59,     12,      3,      0,      0,  26624,    146, }, /* 1285 */
-  {    59,      7,      4,      0,      0,  18432,     82, }, /* 1286 */
-  {    59,     13,     12,      0,      0,  18432,    138, }, /* 1287 */
-  {    61,      7,     12,      0,      0,  18432,     82, }, /* 1288 */
-  {    61,     10,      5,      0,      0,  18432,    144, }, /* 1289 */
-  {    61,     12,      3,      0,      0,  26624,    130, }, /* 1290 */
-  {    61,     12,      3,      0,      0,  26624,    146, }, /* 1291 */
-  {    61,     13,     12,      0,      0,  18432,    138, }, /* 1292 */
-  {   150,      7,     12,      0,      0,  18432,     82, }, /* 1293 */
-  {   150,     12,      3,      0,      0,  26624,    130, }, /* 1294 */
-  {   150,     10,      5,      0,      0,  18432,    144, }, /* 1295 */
-  {   150,     21,     12,      0,      0,  18432,    124, }, /* 1296 */
-  {   162,     12,      3,      0,      0,  26624,    130, }, /* 1297 */
-  {   162,      7,      4,      0,      0,  18432,     82, }, /* 1298 */
-  {   162,     10,      5,      0,      0,  18432,    144, }, /* 1299 */
-  {   162,      7,     12,      0,      0,  18432,     82, }, /* 1300 */
-  {   162,     10,      5,      0,      0,  18432,    176, }, /* 1301 */
-  {   162,     12,      3,      0,      0,  26624,    184, }, /* 1302 */
-  {   162,     21,     12,      0,      0,  18432,    124, }, /* 1303 */
-  {   162,     21,     12,      0,      0,  18432,     68, }, /* 1304 */
-  {   162,     13,     12,      0,      0,  18432,    138, }, /* 1305 */
-  {    11,     15,     12,      0,      0,  18432,     68, }, /* 1306 */
-  {    11,     21,     12,      0,      0,  18432,     68, }, /* 1307 */
-  {    94,      7,     12,      0,      0,  18432,     82, }, /* 1308 */
-  {    94,     14,     12,      0,      0,  18432,     82, }, /* 1309 */
-  {    94,     21,     12,      0,      0,  18432,    106, }, /* 1310 */
-  {    66,      7,     12,      0,      0,  18432,     82, }, /* 1311 */
-  {    66,     21,     12,      0,      0,  18432,     68, }, /* 1312 */
-  {   109,      7,     12,      0,      0,  18432,     82, }, /* 1313 */
-  {   109,      1,      2,      0,      0,  18432,    322, }, /* 1314 */
-  {   109,     12,      3,      0,      0,  26624,    102, }, /* 1315 */
-  {   109,     12,      3,      0,      0,  26624,     96, }, /* 1316 */
-  {   138,      7,     12,      0,      0,  18432,     82, }, /* 1317 */
-  {   130,      7,     12,      0,      0,  18432,     82, }, /* 1318 */
-  {   130,     13,     12,      0,      0,  18432,    138, }, /* 1319 */
-  {   130,     21,     12,      0,      0,  18432,    124, }, /* 1320 */
-  {   159,      7,     12,      0,      0,  18432,     82, }, /* 1321 */
-  {   159,     13,     12,      0,      0,  18432,    138, }, /* 1322 */
-  {   126,      7,     12,      0,      0,  18432,     82, }, /* 1323 */
-  {   126,     12,      3,      0,      0,  26624,     96, }, /* 1324 */
-  {   126,     21,     12,      0,      0,  18432,    124, }, /* 1325 */
-  {   128,      7,     12,      0,      0,  18432,     82, }, /* 1326 */
-  {   128,     12,      3,      0,      0,  26624,     96, }, /* 1327 */
-  {   128,     21,     12,      0,      0,  18432,    124, }, /* 1328 */
-  {   128,     21,     12,      0,      0,  18432,    106, }, /* 1329 */
-  {   128,     21,     12,      0,      0,  18432,     68, }, /* 1330 */
-  {   128,     26,     12,      0,      0,  18432,     68, }, /* 1331 */
-  {   128,      6,     12,      0,      0,  18432,    142, }, /* 1332 */
-  {   128,      6,     12,      0,      0,  18432,    136, }, /* 1333 */
-  {   128,     13,     12,      0,      0,  18432,    138, }, /* 1334 */
-  {   128,     15,     12,      0,      0,  18432,     68, }, /* 1335 */
-  {   151,      9,     12,      0,     32,  18432,     74, }, /* 1336 */
-  {   151,      5,     12,      0,    -32,  18432,     76, }, /* 1337 */
-  {   151,     15,     12,      0,      0,  18432,     68, }, /* 1338 */
-  {   151,     21,     12,      0,      0,  18432,    106, }, /* 1339 */
-  {   151,     21,     12,      0,      0,  18432,    124, }, /* 1340 */
-  {   151,     21,     12,      0,      0,  18432,     68, }, /* 1341 */
-  {   123,      7,     12,      0,      0,  18432,     82, }, /* 1342 */
-  {   123,     12,      3,      0,      0,  26624,    130, }, /* 1343 */
-  {   123,     10,      5,      0,      0,  18432,    144, }, /* 1344 */
-  {   123,     12,      3,      0,      0,  26624,    128, }, /* 1345 */
-  {   123,      6,     12,      0,      0,  18432,     92, }, /* 1346 */
-  {   146,      6,     12,      0,      0,  18432,    136, }, /* 1347 */
-  {   147,      6,     12,      0,      0,  18432,    136, }, /* 1348 */
-  {    23,     21,     12,      0,      0,  28672,     68, }, /* 1349 */
-  {   158,     12,      3,      0,      0,  26624,    328, }, /* 1350 */
-  {    23,     10,      5,      0,      0,  18432,    164, }, /* 1351 */
-  {   146,      7,     12,      0,      0,  18432,    284, }, /* 1352 */
-  {   158,      7,     12,      0,      0,  18432,    284, }, /* 1353 */
-  {    21,      6,     12,      0,      0,  18432,     92, }, /* 1354 */
-  {   147,      7,     12,      0,      0,  18432,    284, }, /* 1355 */
-  {    46,      7,     12,      0,      0,  18432,     82, }, /* 1356 */
-  {    46,     26,     12,      0,      0,  18432,     68, }, /* 1357 */
-  {    46,     12,      3,      0,      0,  26624,    102, }, /* 1358 */
-  {    46,     12,      3,      0,      0,  26624,    130, }, /* 1359 */
-  {    46,     21,     12,      0,      0,  18432,    124, }, /* 1360 */
-  {    69,      1,      2,      0,      0,   6153,     66, }, /* 1361 */
-  {    69,     10,      3,      0,      0,  18432,    330, }, /* 1362 */
-  {    69,     10,      5,      0,      0,  18432,    138, }, /* 1363 */
-  {    69,     10,      5,      0,      0,  18432,    160, }, /* 1364 */
-  {    69,     10,      3,      0,      0,  18432,    286, }, /* 1365 */
-  {     1,     12,      3,      0,      0,  26624,    102, }, /* 1366 */
-  {    69,     25,     12,      0,      0,  18432,    118, }, /* 1367 */
-  {    69,     13,     12,      0,      0,  10240,    214, }, /* 1368 */
-  {   141,     26,     12,      0,      0,  18432,     68, }, /* 1369 */
-  {   141,     12,      3,      0,      0,  26624,    102, }, /* 1370 */
-  {   141,     21,     12,      0,      0,  18432,    106, }, /* 1371 */
-  {   141,     21,     12,      0,      0,  18432,    124, }, /* 1372 */
-  {   141,     21,     12,      0,      0,  18432,     68, }, /* 1373 */
-  {    35,     12,      3,      0,      0,  26624,    130, }, /* 1374 */
-  {     2,      6,     12,      0,      0,  18432,     90, }, /* 1375 */
-  {   154,      7,     12,      0,      0,  18432,     82, }, /* 1376 */
-  {   154,     12,      3,      0,      0,  26624,     96, }, /* 1377 */
-  {   154,      6,     12,      0,      0,  18432,    142, }, /* 1378 */
-  {   154,      6,     12,      0,      0,  18432,    136, }, /* 1379 */
-  {   154,     13,     12,      0,      0,  18432,    138, }, /* 1380 */
-  {   154,     26,     12,      0,      0,  18432,     68, }, /* 1381 */
-  {   160,      7,     12,      0,      0,  18432,     82, }, /* 1382 */
-  {   160,     12,      3,      0,      0,  26624,     96, }, /* 1383 */
-  {   155,      7,     12,      0,      0,  18432,     82, }, /* 1384 */
-  {   155,     12,      3,      0,      0,  26624,     96, }, /* 1385 */
-  {   155,     13,     12,      0,      0,  18432,    138, }, /* 1386 */
-  {   155,     23,     12,      0,      0,  14336,     68, }, /* 1387 */
-  {   163,      7,     12,      0,      0,  18432,     82, }, /* 1388 */
-  {   163,      6,     12,      0,      0,  18432,    142, }, /* 1389 */
-  {   163,     12,      3,      0,      0,  26624,    102, }, /* 1390 */
-  {   163,     13,     12,      0,      0,  18432,    138, }, /* 1391 */
-  {   129,      7,     12,      0,      0,  34816,     82, }, /* 1392 */
-  {   129,     15,     12,      0,      0,  34816,     68, }, /* 1393 */
-  {   129,     12,      3,      0,      0,  26624,     96, }, /* 1394 */
-  {    58,      9,     12,      0,     34,  34816,     74, }, /* 1395 */
-  {    58,      5,     12,      0,    -34,  34816,     76, }, /* 1396 */
-  {    58,     12,      3,      0,      0,  26624,    150, }, /* 1397 */
-  {    58,     12,      3,      0,      0,  26624,    130, }, /* 1398 */
-  {    58,     12,      3,      0,      0,  26624,     96, }, /* 1399 */
-  {    58,      6,     12,      0,      0,  34816,    142, }, /* 1400 */
-  {    58,     13,     12,      0,      0,  34816,    138, }, /* 1401 */
-  {    58,     21,     12,      0,      0,  34816,     68, }, /* 1402 */
-  {    69,     15,     12,      0,      0,      0,     68, }, /* 1403 */
-  {    69,     26,     12,      0,      0,      0,     68, }, /* 1404 */
-  {    69,     23,     12,      0,      0,      0,     68, }, /* 1405 */
-  {     3,      7,     12,      0,      0,      0,    240, }, /* 1406 */
-  {    69,     26,     14,      0,      0,  28672,    332, }, /* 1407 */
-  {    69,     26,     14,      0,      0,  28672,    334, }, /* 1408 */
-  {    68,      2,     14,      0,      0,  18432,    336, }, /* 1409 */
-  {    69,     26,     12,      0,      0,  18432,    338, }, /* 1410 */
-  {    69,     26,     14,      0,      0,  18432,    340, }, /* 1411 */
-  {    69,     26,     14,      0,      0,  18432,    334, }, /* 1412 */
-  {    69,     26,     11,      0,      0,  18432,    342, }, /* 1413 */
-  {    20,     26,     12,      0,      0,  18432,     68, }, /* 1414 */
-  {    69,     26,     14,      0,      0,  18432,    236, }, /* 1415 */
-  {    69,     26,     14,      0,      0,  18447,    334, }, /* 1416 */
-  {    69,     26,     14,      0,      0,  28672,    344, }, /* 1417 */
-  {    69,     26,     14,      0,      0,  28672,    346, }, /* 1418 */
-  {    69,     24,      3,      0,      0,  28672,    348, }, /* 1419 */
-  {    69,     26,     14,      0,      0,  28672,    350, }, /* 1420 */
-  {    69,     13,     12,      0,      0,  10240,    138, }, /* 1421 */
-  {    69,      1,      3,      0,      0,   6144,    352, }, /* 1422 */
+  {     0,      5,     12,      0,    195,  18432,     78, }, /*  74 */
+  {     0,      9,     12,      0,    210,  18432,     76, }, /*  75 */
+  {     0,      9,     12,      0,    206,  18432,     76, }, /*  76 */
+  {     0,      9,     12,      0,    205,  18432,     76, }, /*  77 */
+  {     0,      9,     12,      0,     79,  18432,     76, }, /*  78 */
+  {     0,      9,     12,      0,    202,  18432,     76, }, /*  79 */
+  {     0,      9,     12,      0,    203,  18432,     76, }, /*  80 */
+  {     0,      9,     12,      0,    207,  18432,     76, }, /*  81 */
+  {     0,      5,     12,      0,     97,  18432,     78, }, /*  82 */
+  {     0,      9,     12,      0,    211,  18432,     76, }, /*  83 */
+  {     0,      9,     12,      0,    209,  18432,     76, }, /*  84 */
+  {     0,      5,     12,      0,    163,  18432,     78, }, /*  85 */
+  {     0,      5,     12,      0,  42561,  18432,     78, }, /*  86 */
+  {     0,      9,     12,      0,    213,  18432,     76, }, /*  87 */
+  {     0,      5,     12,      0,    130,  18432,     78, }, /*  88 */
+  {     0,      9,     12,      0,    214,  18432,     76, }, /*  89 */
+  {     0,      9,     12,      0,    218,  18432,     76, }, /*  90 */
+  {     0,      9,     12,      0,    217,  18432,     76, }, /*  91 */
+  {     0,      9,     12,      0,    219,  18432,     76, }, /*  92 */
+  {     0,      7,     12,      0,      0,  18432,     84, }, /*  93 */
+  {     0,      5,     12,      0,     56,  18432,     78, }, /*  94 */
+  {     0,      9,     12,      5,      2,  18432,     86, }, /*  95 */
+  {     0,      8,     12,      5,      1,  18432,     88, }, /*  96 */
+  {     0,      5,     12,      5,     -2,  18432,     78, }, /*  97 */
+  {     0,      9,     12,      9,      2,  18432,     86, }, /*  98 */
+  {     0,      8,     12,      9,      1,  18432,     88, }, /*  99 */
+  {     0,      5,     12,      9,     -2,  18432,     78, }, /* 100 */
+  {     0,      9,     12,     13,      2,  18432,     86, }, /* 101 */
+  {     0,      8,     12,     13,      1,  18432,     88, }, /* 102 */
+  {     0,      5,     12,     13,     -2,  18432,     78, }, /* 103 */
+  {     0,      5,     12,      0,    -79,  18432,     78, }, /* 104 */
+  {     0,      9,     12,     17,      2,  18432,     86, }, /* 105 */
+  {     0,      8,     12,     17,      1,  18432,     88, }, /* 106 */
+  {     0,      5,     12,     17,     -2,  18432,     78, }, /* 107 */
+  {     0,      9,     12,      0,    -97,  18432,     76, }, /* 108 */
+  {     0,      9,     12,      0,    -56,  18432,     76, }, /* 109 */
+  {     0,      9,     12,      0,   -130,  18432,     76, }, /* 110 */
+  {     0,      9,     12,      0,  10795,  18432,     76, }, /* 111 */
+  {     0,      9,     12,      0,   -163,  18432,     76, }, /* 112 */
+  {     0,      9,     12,      0,  10792,  18432,     76, }, /* 113 */
+  {     0,      5,     12,      0,  10815,  18432,     78, }, /* 114 */
+  {     0,      9,     12,      0,   -195,  18432,     76, }, /* 115 */
+  {     0,      9,     12,      0,     69,  18432,     76, }, /* 116 */
+  {     0,      9,     12,      0,     71,  18432,     76, }, /* 117 */
+  {     0,      5,     12,      0,  10783,  18432,     78, }, /* 118 */
+  {     0,      5,     12,      0,  10780,  18432,     78, }, /* 119 */
+  {     0,      5,     12,      0,  10782,  18432,     78, }, /* 120 */
+  {     0,      5,     12,      0,   -210,  18432,     78, }, /* 121 */
+  {     0,      5,     12,      0,   -206,  18432,     78, }, /* 122 */
+  {     0,      5,     12,      0,   -205,  18432,     78, }, /* 123 */
+  {     0,      5,     12,      0,   -202,  18432,     78, }, /* 124 */
+  {     0,      5,     12,      0,   -203,  18432,     78, }, /* 125 */
+  {     0,      5,     12,      0,  42319,  18432,     78, }, /* 126 */
+  {     0,      5,     12,      0,  42315,  18432,     78, }, /* 127 */
+  {     0,      5,     12,      0,   -207,  18432,     78, }, /* 128 */
+  {     0,      5,     12,      0,  42343,  18432,     78, }, /* 129 */
+  {     0,      5,     12,      0,  42280,  18432,     78, }, /* 130 */
+  {     0,      5,     12,      0,  42308,  18432,     78, }, /* 131 */
+  {     0,      5,     12,      0,   -209,  18432,     80, }, /* 132 */
+  {     0,      5,     12,      0,   -211,  18432,     78, }, /* 133 */
+  {     0,      5,     12,      0,  10743,  18432,     78, }, /* 134 */
+  {     0,      5,     12,      0,  42305,  18432,     78, }, /* 135 */
+  {     0,      5,     12,      0,  10749,  18432,     78, }, /* 136 */
+  {     0,      5,     12,      0,   -213,  18432,     78, }, /* 137 */
+  {     0,      5,     12,      0,   -214,  18432,     78, }, /* 138 */
+  {     0,      5,     12,      0,  10727,  18432,     78, }, /* 139 */
+  {     0,      5,     12,      0,   -218,  18432,     78, }, /* 140 */
+  {     0,      5,     12,      0,  42307,  18432,     78, }, /* 141 */
+  {     0,      5,     12,      0,  42282,  18432,     78, }, /* 142 */
+  {     0,      5,     12,      0,    -69,  18432,     78, }, /* 143 */
+  {     0,      5,     12,      0,   -217,  18432,     78, }, /* 144 */
+  {     0,      5,     12,      0,    -71,  18432,     78, }, /* 145 */
+  {     0,      5,     12,      0,   -219,  18432,     78, }, /* 146 */
+  {     0,      5,     12,      0,  42261,  18432,     80, }, /* 147 */
+  {     0,      5,     12,      0,  42258,  18432,     78, }, /* 148 */
+  {     0,      6,     12,      0,      0,  18432,     90, }, /* 149 */
+  {     0,      6,     12,      0,      0,  18432,     92, }, /* 150 */
+  {    99,      6,     12,      0,      0,  28672,     94, }, /* 151 */
+  {    99,      6,     12,      0,      0,  18432,     94, }, /* 152 */
+  {    99,      6,     12,      0,      0,  18440,     94, }, /* 153 */
+  {    99,      6,     12,      0,      0,  18432,     90, }, /* 154 */
+  {    99,      6,     12,      0,      0,  28684,     94, }, /* 155 */
+  {    99,      6,     12,      0,      0,  28688,     94, }, /* 156 */
+  {    99,      6,     12,      0,      0,  18432,     96, }, /* 157 */
+  {    99,     24,     12,      0,      0,  28692,     56, }, /* 158 */
+  {    99,     24,     12,      0,      0,  28684,     56, }, /* 159 */
+  {    29,     24,     12,      0,      0,  28672,     56, }, /* 160 */
+  {   106,     12,      3,      0,      0,  26648,     98, }, /* 161 */
+  {   106,     12,      3,      0,      0,  26652,     98, }, /* 162 */
+  {   106,     12,      3,      0,      0,  26656,     98, }, /* 163 */
+  {   106,     12,      3,      0,      0,  26660,     98, }, /* 164 */
+  {   106,     12,      3,      0,      0,  26664,     98, }, /* 165 */
+  {   106,     12,      3,      0,      0,  26668,     98, }, /* 166 */
+  {   106,     12,      3,      0,      0,  26672,     98, }, /* 167 */
+  {   106,     12,      3,      0,      0,  26676,     98, }, /* 168 */
+  {   106,     12,      3,      0,      0,  26680,     98, }, /* 169 */
+  {   106,     12,      3,      0,      0,  26684,     98, }, /* 170 */
+  {   106,     12,      3,      0,      0,  26688,     98, }, /* 171 */
+  {   106,     12,      3,      0,      0,  26692,     98, }, /* 172 */
+  {   106,     12,      3,      0,      0,  26696,     98, }, /* 173 */
+  {   106,     12,      3,      0,      0,  26700,     98, }, /* 174 */
+  {   106,     12,      3,      0,      0,  26704,     98, }, /* 175 */
+  {   106,     12,      3,      0,      0,  26624,     98, }, /* 176 */
+  {   106,     12,      3,      0,      0,  26708,     98, }, /* 177 */
+  {   106,     12,      3,      0,      0,  26712,     98, }, /* 178 */
+  {   106,     12,      3,      0,      0,  26716,     98, }, /* 179 */
+  {   106,     12,      3,      0,      0,  26720,     98, }, /* 180 */
+  {   106,     12,      3,      0,      0,  26724,     98, }, /* 181 */
+  {   106,     12,      3,      0,      0,  26728,     98, }, /* 182 */
+  {   106,     12,      3,      0,      0,  26732,     98, }, /* 183 */
+  {   106,     12,      3,      0,      0,  26736,     98, }, /* 184 */
+  {   106,     12,      3,      0,      0,  26740,     98, }, /* 185 */
+  {   106,     12,      3,     21,    116,  26740,    100, }, /* 186 */
+  {   106,     12,      3,      0,      0,  26624,    102, }, /* 187 */
+  {   106,     12,      3,      0,      0,  26744,    104, }, /* 188 */
+  {   106,     12,      3,      0,      0,  26624,    104, }, /* 189 */
+  {   106,     12,      3,      0,      0,  26748,     98, }, /* 190 */
+  {   106,     12,      3,      0,      0,  26752,    106, }, /* 191 */
+  {     1,      9,     12,      0,      1,  18432,     76, }, /* 192 */
+  {     1,      5,     12,      0,     -1,  18432,     78, }, /* 193 */
+  {    99,      6,     12,      0,      0,  28804,     94, }, /* 194 */
+  {     1,     24,     12,      0,      0,  28804,     56, }, /* 195 */
+  {    98,      2,     12,      0,      0,  18432,      0, }, /* 196 */
+  {     1,      6,     12,      0,      0,  18432,    108, }, /* 197 */
+  {     1,      5,     12,      0,    130,  18432,     78, }, /* 198 */
+  {    99,     21,     12,      0,      0,  28672,    110, }, /* 199 */
+  {     1,      9,     12,      0,    116,  18432,     76, }, /* 200 */
+  {     1,     24,     12,      0,      0,  28672,     56, }, /* 201 */
+  {     1,      9,     12,      0,     38,  18432,     76, }, /* 202 */
+  {    99,     21,     12,      0,      0,  28672,    112, }, /* 203 */
+  {     1,      9,     12,      0,     37,  18432,     76, }, /* 204 */
+  {     1,      9,     12,      0,     64,  18432,     76, }, /* 205 */
+  {     1,      9,     12,      0,     63,  18432,     76, }, /* 206 */
+  {     1,      5,     12,      0,   7235,  18432,     78, }, /* 207 */
+  {     1,      9,     12,      0,     32,  18432,     76, }, /* 208 */
+  {     1,      9,     12,     34,     32,  18432,     76, }, /* 209 */
+  {     1,      9,     12,     59,     32,  18432,     76, }, /* 210 */
+  {     1,      9,     12,     38,     32,  18432,     76, }, /* 211 */
+  {     1,      9,     12,     21,     32,  18432,     76, }, /* 212 */
+  {     1,      9,     12,     51,     32,  18432,     76, }, /* 213 */
+  {     1,      9,     12,     26,     32,  18432,     76, }, /* 214 */
+  {     1,      9,     12,     47,     32,  18432,     76, }, /* 215 */
+  {     1,      9,     12,     55,     32,  18432,     76, }, /* 216 */
+  {     1,      9,     12,     30,     32,  18432,     76, }, /* 217 */
+  {     1,      9,     12,     43,     32,  18432,     76, }, /* 218 */
+  {     1,      9,     12,     96,     32,  18432,     76, }, /* 219 */
+  {     1,      5,     12,      0,    -38,  18432,     78, }, /* 220 */
+  {     1,      5,     12,      0,    -37,  18432,     78, }, /* 221 */
+  {     1,      5,     12,      0,   7219,  18432,     78, }, /* 222 */
+  {     1,      5,     12,      0,    -32,  18432,     78, }, /* 223 */
+  {     1,      5,     12,     34,    -32,  18432,     78, }, /* 224 */
+  {     1,      5,     12,     59,    -32,  18432,     78, }, /* 225 */
+  {     1,      5,     12,     38,    -32,  18432,     78, }, /* 226 */
+  {     1,      5,     12,     21,   -116,  18432,     78, }, /* 227 */
+  {     1,      5,     12,     51,    -32,  18432,     78, }, /* 228 */
+  {     1,      5,     12,     26,   -775,  18432,     78, }, /* 229 */
+  {     1,      5,     12,     47,    -32,  18432,     78, }, /* 230 */
+  {     1,      5,     12,     55,    -32,  18432,     78, }, /* 231 */
+  {     1,      5,     12,     30,      1,  18432,     70, }, /* 232 */
+  {     1,      5,     12,     30,    -32,  18432,     78, }, /* 233 */
+  {     1,      5,     12,     43,    -32,  18432,     78, }, /* 234 */
+  {     1,      5,     12,     96,    -32,  18432,     78, }, /* 235 */
+  {     1,      5,     12,      0,    -64,  18432,     78, }, /* 236 */
+  {     1,      5,     12,      0,    -63,  18432,     78, }, /* 237 */
+  {     1,      9,     12,      0,      8,  18432,     76, }, /* 238 */
+  {     1,      5,     12,     34,    -30,  18432,    114, }, /* 239 */
+  {     1,      5,     12,     38,    -25,  18432,    114, }, /* 240 */
+  {     1,      9,     12,      0,      0,  18432,    116, }, /* 241 */
+  {     1,      9,     12,      0,      0,  18432,    118, }, /* 242 */
+  {     1,      5,     12,     43,    -15,  18432,    114, }, /* 243 */
+  {     1,      5,     12,     47,    -22,  18432,     70, }, /* 244 */
+  {     1,      5,     12,      0,     -8,  18432,     78, }, /* 245 */
+  {    43,      9,     12,      0,      1,  18432,     76, }, /* 246 */
+  {    43,      5,     12,      0,     -1,  18432,     78, }, /* 247 */
+  {     1,      5,     12,     51,    -54,  18432,    114, }, /* 248 */
+  {     1,      5,     12,     55,    -48,  18432,    114, }, /* 249 */
+  {     1,      5,     12,      0,      7,  18432,     78, }, /* 250 */
+  {     1,      5,     12,      0,   -116,  18432,     80, }, /* 251 */
+  {     1,      9,     12,     38,    -60,  18432,    120, }, /* 252 */
+  {     1,      5,     12,     59,    -64,  18432,    114, }, /* 253 */
+  {     1,     25,     12,      0,      0,  28672,    122, }, /* 254 */
+  {     1,      9,     12,      0,     -7,  18432,     76, }, /* 255 */
+  {     1,      5,     12,      0,      0,  18432,     60, }, /* 256 */
+  {     1,      9,     12,      0,   -130,  18432,     76, }, /* 257 */
+  {     2,      9,     12,      0,     80,  18432,     76, }, /* 258 */
+  {     2,      9,     12,      0,     32,  18432,     76, }, /* 259 */
+  {     2,      9,     12,     63,     32,  18432,     76, }, /* 260 */
+  {     2,      9,     12,     67,     32,  18432,     76, }, /* 261 */
+  {     2,      9,     12,     71,     32,  18432,     76, }, /* 262 */
+  {     2,      9,     12,     75,     32,  18432,     76, }, /* 263 */
+  {     2,      9,     12,     79,     32,  18432,     76, }, /* 264 */
+  {     2,      9,     12,     84,     32,  18432,     76, }, /* 265 */
+  {     2,      5,     12,      0,    -32,  18432,     78, }, /* 266 */
+  {     2,      5,     12,     63,    -32,  18432,     78, }, /* 267 */
+  {     2,      5,     12,     67,    -32,  18432,     78, }, /* 268 */
+  {     2,      5,     12,     71,    -32,  18432,     78, }, /* 269 */
+  {     2,      5,     12,     75,    -32,  18432,     78, }, /* 270 */
+  {     2,      5,     12,     79,    -32,  18432,     78, }, /* 271 */
+  {     2,      5,     12,     84,    -32,  18432,     78, }, /* 272 */
+  {     2,      5,     12,      0,    -80,  18432,     78, }, /* 273 */
+  {     2,      5,     12,      0,    -80,  18432,     80, }, /* 274 */
+  {     2,      9,     12,      0,      1,  18432,     76, }, /* 275 */
+  {     2,      5,     12,      0,     -1,  18432,     78, }, /* 276 */
+  {     2,      9,     12,     88,      1,  18432,     76, }, /* 277 */
+  {     2,      5,     12,     88,     -1,  18432,     78, }, /* 278 */
+  {     2,     26,     12,      0,      0,  18432,     74, }, /* 279 */
+  {     2,     12,      3,      0,      0,  26760,     98, }, /* 280 */
+  {     2,     12,      3,      0,      0,  26764,     98, }, /* 281 */
+  {   106,     12,      3,      0,      0,  26768,     98, }, /* 282 */
+  {     2,     11,      3,      0,      0,  26624,    124, }, /* 283 */
+  {     2,      9,     12,      0,     15,  18432,     76, }, /* 284 */
+  {     2,      5,     12,      0,    -15,  18432,     78, }, /* 285 */
+  {     3,      9,     12,      0,     48,  18432,     76, }, /* 286 */
+  {     3,      6,     12,      0,      0,  18432,     94, }, /* 287 */
+  {     3,     21,     12,      0,      0,  18432,     74, }, /* 288 */
+  {     3,     21,     12,      0,      0,  18432,    126, }, /* 289 */
+  {     3,      5,     12,      0,      0,  18432,     60, }, /* 290 */
+  {     3,      5,     12,      0,    -48,  18432,     78, }, /* 291 */
+  {     3,      5,     12,      0,      0,  18432,     70, }, /* 292 */
+  {     3,     21,     12,      0,      0,  18580,    128, }, /* 293 */
+  {     3,     17,     12,      0,      0,  28672,    130, }, /* 294 */
+  {     3,     26,     12,      0,      0,  28672,     74, }, /* 295 */
+  {     3,     23,     12,      0,      0,  14336,     74, }, /* 296 */
+  {    98,      2,     12,      0,      0,  34816,      0, }, /* 297 */
+  {     4,     12,      3,      0,      0,  26624,     98, }, /* 298 */
+  {     4,     12,      3,      0,      0,  26624,    104, }, /* 299 */
+  {     4,     12,      3,      0,      0,  26624,    132, }, /* 300 */
+  {     4,     17,     12,      0,      0,  34816,    130, }, /* 301 */
+  {     4,     21,     12,      0,      0,  34816,     74, }, /* 302 */
+  {     4,     21,     12,      0,      0,  34816,    110, }, /* 303 */
+  {     4,     12,      3,      0,      0,  26624,    106, }, /* 304 */
+  {     4,      7,     12,      0,      0,  34816,     84, }, /* 305 */
+  {     4,     21,     12,      0,      0,  34816,    126, }, /* 306 */
+  {     5,      1,      4,      0,      0,   2048,    134, }, /* 307 */
+  {    99,      1,      4,      0,      0,   2048,    134, }, /* 308 */
+  {     5,     25,     12,      0,      0,  28672,    122, }, /* 309 */
+  {     5,     25,     12,      0,      0,      0,    122, }, /* 310 */
+  {     5,     21,     12,      0,      0,  14336,     74, }, /* 311 */
+  {     5,     23,     12,      0,      0,      0,     74, }, /* 312 */
+  {    99,     21,     12,      0,      0,   8344,    110, }, /* 313 */
+  {     5,     21,     12,      0,      0,      0,     74, }, /* 314 */
+  {     5,     26,     12,      0,      0,  28672,     74, }, /* 315 */
+  {     5,     12,      3,      0,      0,  26624,    106, }, /* 316 */
+  {    99,     21,     12,      0,      0,    152,    110, }, /* 317 */
+  {     5,      1,      2,      0,      0,    156,    136, }, /* 318 */
+  {     5,     21,     12,      0,      0,      0,    128, }, /* 319 */
+  {    99,     21,     12,      0,      0,    160,    128, }, /* 320 */
+  {     5,      7,     12,      0,      0,      0,     84, }, /* 321 */
+  {    99,      6,     12,      0,      0,    164,    138, }, /* 322 */
+  {   106,     12,      3,      0,      0,  26792,    132, }, /* 323 */
+  {   106,     12,      3,      0,      0,  26792,    106, }, /* 324 */
+  {   106,     12,      3,      0,      0,  26792,    140, }, /* 325 */
+  {     5,     12,      3,      0,      0,  26624,    132, }, /* 326 */
+  {     5,     12,      3,      0,      0,  26624,    142, }, /* 327 */
+  {     5,     13,     12,      0,      0,   2220,    144, }, /* 328 */
+  {     5,     21,     12,      0,      0,   2048,     74, }, /* 329 */
+  {     5,      7,     12,      0,      0,      0,    146, }, /* 330 */
+  {     5,     21,     12,      0,      0,    176,    128, }, /* 331 */
+  {     5,     12,      3,      0,      0,  26624,    140, }, /* 332 */
+  {     5,     12,      3,      0,      0,  26624,     98, }, /* 333 */
+  {     5,      6,     12,      0,      0,      0,     94, }, /* 334 */
+  {     5,     13,     12,      0,      0,  10240,    144, }, /* 335 */
+  {     5,     26,     12,      0,      0,      0,     74, }, /* 336 */
+  {     6,     21,     12,      0,      0,      0,    128, }, /* 337 */
+  {     6,     21,     12,      0,      0,      0,    110, }, /* 338 */
+  {     6,     21,     12,      0,      0,      0,     74, }, /* 339 */
+  {    98,      2,     12,      0,      0,      0,      0, }, /* 340 */
+  {     6,      1,      4,      0,      0,      0,    134, }, /* 341 */
+  {     6,      7,     12,      0,      0,      0,     84, }, /* 342 */
+  {     6,     12,      3,      0,      0,  26624,    106, }, /* 343 */
+  {     6,     12,      3,      0,      0,  26624,    132, }, /* 344 */
+  {     6,     12,      3,      0,      0,  26624,     98, }, /* 345 */
+  {     7,      7,     12,      0,      0,      0,     84, }, /* 346 */
+  {     7,     12,      3,      0,      0,  26624,    132, }, /* 347 */
+  {    48,     13,     12,      0,      0,  34816,    144, }, /* 348 */
+  {    48,      7,     12,      0,      0,  34816,     84, }, /* 349 */
+  {    48,     12,      3,      0,      0,  26624,     98, }, /* 350 */
+  {    48,      6,     12,      0,      0,  34816,     94, }, /* 351 */
+  {    48,     26,     12,      0,      0,  28672,     74, }, /* 352 */
+  {    48,     21,     12,      0,      0,  28672,     74, }, /* 353 */
+  {    48,     21,     12,      0,      0,  28672,    110, }, /* 354 */
+  {    48,     21,     12,      0,      0,  28672,    128, }, /* 355 */
+  {    48,      6,     12,      0,      0,  34816,    138, }, /* 356 */
+  {    48,     12,      3,      0,      0,  26624,    104, }, /* 357 */
+  {    48,     23,     12,      0,      0,  34816,     74, }, /* 358 */
+  {    54,      7,     12,      0,      0,  34816,     84, }, /* 359 */
+  {    54,     12,      3,      0,      0,  26624,    106, }, /* 360 */
+  {    54,     12,      3,      0,      0,  26624,     98, }, /* 361 */
+  {    54,      6,     12,      0,      0,  34816,    148, }, /* 362 */
+  {    54,     12,      3,      0,      0,  26624,    104, }, /* 363 */
+  {    54,     21,     12,      0,      0,  34816,    110, }, /* 364 */
+  {    54,     21,     12,      0,      0,  34816,     74, }, /* 365 */
+  {    54,     21,     12,      0,      0,  34816,    128, }, /* 366 */
+  {    59,      7,     12,      0,      0,  34816,     84, }, /* 367 */
+  {    59,     12,      3,      0,      0,  26624,    104, }, /* 368 */
+  {    59,     21,     12,      0,      0,  34816,    110, }, /* 369 */
+  {     5,     24,     12,      0,      0,      0,    126, }, /* 370 */
+  {     5,     12,      3,      0,      0,  26624,    150, }, /* 371 */
+  {     5,     12,      3,      0,      0,  26624,    104, }, /* 372 */
+  {     5,     12,      3,      0,      0,  26624,    152, }, /* 373 */
+  {     8,     12,      3,      0,      0,  26624,    106, }, /* 374 */
+  {     8,     10,      5,      0,      0,  18432,    154, }, /* 375 */
+  {     8,      7,     12,      0,      0,  18432,     84, }, /* 376 */
+  {     8,      7,     12,      0,      0,  18432,    156, }, /* 377 */
+  {     8,     12,      3,      0,      0,  26624,     98, }, /* 378 */
+  {     8,     12,      3,      0,      0,  26624,    158, }, /* 379 */
+  {   106,     12,      3,      0,      0,  26804,     98, }, /* 380 */
+  {   106,     12,      3,      0,      0,  26808,     98, }, /* 381 */
+  {    99,     21,     12,      0,      0,  18620,    128, }, /* 382 */
+  {    99,     21,     12,      0,      0,  18624,    128, }, /* 383 */
+  {     8,     13,     12,      0,      0,  18628,    144, }, /* 384 */
+  {     8,     21,     12,      0,      0,  18432,     74, }, /* 385 */
+  {     8,      6,     12,      0,      0,  18432,     94, }, /* 386 */
+  {     9,      7,     12,      0,      0,  18432,     84, }, /* 387 */
+  {     9,     12,      3,      0,      0,  26624,    106, }, /* 388 */
+  {     9,     10,      5,      0,      0,  18432,    154, }, /* 389 */
+  {     9,      7,     12,      0,      0,  18432,    156, }, /* 390 */
+  {     9,     12,      3,      0,      0,  26624,     98, }, /* 391 */
+  {     9,     10,      3,      0,      0,  18432,    160, }, /* 392 */
+  {     9,     12,      3,      0,      0,  26624,    158, }, /* 393 */
+  {     9,     13,     12,      0,      0,  18632,    144, }, /* 394 */
+  {     9,     23,     12,      0,      0,  14336,     74, }, /* 395 */
+  {     9,     15,     12,      0,      0,  18432,     74, }, /* 396 */
+  {     9,     26,     12,      0,      0,  18432,     74, }, /* 397 */
+  {     9,     21,     12,      0,      0,  18432,     74, }, /* 398 */
+  {     9,     12,      3,      0,      0,  26624,    104, }, /* 399 */
+  {    10,     12,      3,      0,      0,  26624,    106, }, /* 400 */
+  {    10,     10,      5,      0,      0,  18432,    154, }, /* 401 */
+  {    10,      7,     12,      0,      0,  18432,     84, }, /* 402 */
+  {    10,     12,      3,      0,      0,  26624,     98, }, /* 403 */
+  {    10,     12,      3,      0,      0,  26624,    158, }, /* 404 */
+  {    10,     13,     12,      0,      0,  18636,    144, }, /* 405 */
+  {    10,     12,      3,      0,      0,  26624,    162, }, /* 406 */
+  {    10,     21,     12,      0,      0,  18432,     74, }, /* 407 */
+  {    11,     12,      3,      0,      0,  26624,    106, }, /* 408 */
+  {    11,     10,      5,      0,      0,  18432,    154, }, /* 409 */
+  {    11,      7,     12,      0,      0,  18432,     84, }, /* 410 */
+  {    11,      7,     12,      0,      0,  18432,    156, }, /* 411 */
+  {    11,     12,      3,      0,      0,  26624,     98, }, /* 412 */
+  {    11,     12,      3,      0,      0,  26624,    158, }, /* 413 */
+  {    11,     13,     12,      0,      0,  18640,    144, }, /* 414 */
+  {    11,     21,     12,      0,      0,  18432,     74, }, /* 415 */
+  {    11,     23,     12,      0,      0,  14336,     74, }, /* 416 */
+  {    11,     12,      3,      0,      0,  26624,    162, }, /* 417 */
+  {    12,     12,      3,      0,      0,  26624,    106, }, /* 418 */
+  {    12,     10,      5,      0,      0,  18432,    154, }, /* 419 */
+  {    12,      7,     12,      0,      0,  18432,     84, }, /* 420 */
+  {    12,      7,     12,      0,      0,  18432,    156, }, /* 421 */
+  {    12,     12,      3,      0,      0,  26624,     98, }, /* 422 */
+  {    12,     10,      3,      0,      0,  18432,    160, }, /* 423 */
+  {    12,     12,      3,      0,      0,  26624,    158, }, /* 424 */
+  {    12,     12,      3,      0,      0,  26624,    164, }, /* 425 */
+  {    12,     13,     12,      0,      0,  18432,    144, }, /* 426 */
+  {    12,     26,     12,      0,      0,  18432,     74, }, /* 427 */
+  {    12,     15,     12,      0,      0,  18432,     74, }, /* 428 */
+  {    13,     12,      3,      0,      0,  26624,    106, }, /* 429 */
+  {    13,      7,     12,      0,      0,  18432,     84, }, /* 430 */
+  {    13,     10,      3,      0,      0,  18432,    160, }, /* 431 */
+  {    13,     10,      5,      0,      0,  18432,    154, }, /* 432 */
+  {    13,     12,      3,      0,      0,  26624,    158, }, /* 433 */
+  {    13,     13,     12,      0,      0,  18644,    144, }, /* 434 */
+  {    13,     15,     12,      0,      0,  18644,     74, }, /* 435 */
+  {    13,     26,     12,      0,      0,  28884,     74, }, /* 436 */
+  {    13,     26,     12,      0,      0,  28672,     74, }, /* 437 */
+  {    13,     23,     12,      0,      0,  14336,     74, }, /* 438 */
+  {    14,     12,      3,      0,      0,  26624,    106, }, /* 439 */
+  {    14,     10,      5,      0,      0,  18432,    154, }, /* 440 */
+  {    14,      7,     12,      0,      0,  18432,     84, }, /* 441 */
+  {    14,      7,     12,      0,      0,  18432,    156, }, /* 442 */
+  {    14,     12,      3,      0,      0,  26624,     98, }, /* 443 */
+  {    14,     12,      3,      0,      0,  26624,    158, }, /* 444 */
+  {    14,     13,     12,      0,      0,  18432,    144, }, /* 445 */
+  {    14,     21,     12,      0,      0,  18432,     74, }, /* 446 */
+  {    14,     15,     12,      0,      0,  28672,     74, }, /* 447 */
+  {    14,     26,     12,      0,      0,  18432,     74, }, /* 448 */
+  {    15,      7,     12,      0,      0,  18432,     84, }, /* 449 */
+  {    15,     12,      3,      0,      0,  26624,    106, }, /* 450 */
+  {    15,     10,      5,      0,      0,  18432,    154, }, /* 451 */
+  {    15,     21,     12,      0,      0,  18432,     74, }, /* 452 */
+  {    15,     12,      3,      0,      0,  26624,     98, }, /* 453 */
+  {    15,     12,      3,      0,      0,  18432,    106, }, /* 454 */
+  {    15,     10,      3,      0,      0,  18432,    160, }, /* 455 */
+  {    15,     12,      3,      0,      0,  26624,    158, }, /* 456 */
+  {    15,     13,     12,      0,      0,  18648,    144, }, /* 457 */
+  {    16,     12,      3,      0,      0,  26624,    106, }, /* 458 */
+  {    16,     10,      5,      0,      0,  18432,    154, }, /* 459 */
+  {    16,      7,     12,      0,      0,  18432,     84, }, /* 460 */
+  {    16,      7,     12,      0,      0,  18432,    156, }, /* 461 */
+  {    16,     12,      3,      0,      0,  26624,    158, }, /* 462 */
+  {    16,     10,      3,      0,      0,  18432,    160, }, /* 463 */
+  {    16,      7,      4,      0,      0,  18432,     84, }, /* 464 */
+  {    16,     26,     12,      0,      0,  18432,     74, }, /* 465 */
+  {    16,     15,     12,      0,      0,  18432,     74, }, /* 466 */
+  {    16,     13,     12,      0,      0,  18432,    144, }, /* 467 */
+  {    17,     12,      3,      0,      0,  26624,    106, }, /* 468 */
+  {    17,     10,      5,      0,      0,  18432,    154, }, /* 469 */
+  {    17,      7,     12,      0,      0,  18432,     84, }, /* 470 */
+  {    17,     12,      3,      0,      0,  26624,    158, }, /* 471 */
+  {    17,     10,      3,      0,      0,  18432,    160, }, /* 472 */
+  {    17,     13,     12,      0,      0,  18432,    144, }, /* 473 */
+  {    17,     21,     12,      0,      0,  18432,     74, }, /* 474 */
+  {    18,      7,     12,      0,      0,  18432,     84, }, /* 475 */
+  {    18,     12,      3,      0,      0,  26624,    106, }, /* 476 */
+  {    18,      7,      5,      0,      0,  18432,    166, }, /* 477 */
+  {    18,     12,      3,      0,      0,  26624,    168, }, /* 478 */
+  {    99,     23,     12,      0,      0,  14336,     74, }, /* 479 */
+  {    18,      7,     12,      0,      0,  18432,    170, }, /* 480 */
+  {    18,      6,     12,      0,      0,  18432,    138, }, /* 481 */
+  {    18,     12,      3,      0,      0,  26624,     98, }, /* 482 */
+  {    18,     21,     12,      0,      0,  18432,     74, }, /* 483 */
+  {    18,     13,     12,      0,      0,  18432,    144, }, /* 484 */
+  {    18,     21,     12,      0,      0,  18432,    110, }, /* 485 */
+  {   100,      7,     12,      0,      0,  18432,     84, }, /* 486 */
+  {   100,     12,      3,      0,      0,  26624,    106, }, /* 487 */
+  {   100,      7,      5,      0,      0,  18432,    166, }, /* 488 */
+  {   100,     12,      3,      0,      0,  26624,    158, }, /* 489 */
+  {   100,      7,     12,      0,      0,  18432,    170, }, /* 490 */
+  {   100,      6,     12,      0,      0,  18432,    138, }, /* 491 */
+  {   100,     12,      3,      0,      0,  26624,     98, }, /* 492 */
+  {   100,     12,      3,      0,      0,  26624,    104, }, /* 493 */
+  {   100,     13,     12,      0,      0,  18432,    144, }, /* 494 */
+  {    19,      7,     12,      0,      0,  18432,     84, }, /* 495 */
+  {    19,     26,     12,      0,      0,  18432,     74, }, /* 496 */
+  {    19,     21,     12,      0,      0,  18432,     74, }, /* 497 */
+  {    19,     21,     12,      0,      0,  18432,    110, }, /* 498 */
+  {    19,     12,      3,      0,      0,  26624,     98, }, /* 499 */
+  {    19,     13,     12,      0,      0,  18432,    144, }, /* 500 */
+  {    19,     15,     12,      0,      0,  18432,     74, }, /* 501 */
+  {    19,     22,     12,      0,      0,  28672,    172, }, /* 502 */
+  {    19,     18,     12,      0,      0,  28672,    172, }, /* 503 */
+  {    19,     10,      5,      0,      0,  18432,    174, }, /* 504 */
+  {    19,     12,      3,      0,      0,  26624,    106, }, /* 505 */
+  {    19,     12,      3,      0,      0,  26624,    176, }, /* 506 */
+  {    19,     10,      5,      0,      0,  18432,    154, }, /* 507 */
+  {    19,     12,      3,      0,      0,  26624,    132, }, /* 508 */
+  {    19,     12,      3,      0,      0,  26624,    158, }, /* 509 */
+  {    99,     26,     12,      0,      0,  18432,     74, }, /* 510 */
+  {    20,      7,     12,      0,      0,  18432,     84, }, /* 511 */
+  {    20,     10,     12,      0,      0,  18432,    154, }, /* 512 */
+  {    20,     12,      3,      0,      0,  26624,    106, }, /* 513 */
+  {    20,     10,      5,      0,      0,  18432,    154, }, /* 514 */
+  {    20,     12,      3,      0,      0,  26624,     98, }, /* 515 */
+  {    20,     12,      3,      0,      0,  26624,    158, }, /* 516 */
+  {    20,     13,     12,      0,      0,  18652,    144, }, /* 517 */
+  {    20,     21,     12,      0,      0,  18432,    128, }, /* 518 */
+  {    20,     21,     12,      0,      0,  18432,     74, }, /* 519 */
+  {    20,     10,     12,      0,      0,  18432,    178, }, /* 520 */
+  {    20,     12,      3,      0,      0,  26624,    132, }, /* 521 */
+  {    20,     13,     12,      0,      0,  18432,    144, }, /* 522 */
+  {    20,     26,     12,      0,      0,  18432,     74, }, /* 523 */
+  {    21,      9,     12,      0,   7264,  18432,     76, }, /* 524 */
+  {    21,      5,     12,      0,   3008,  18432,    180, }, /* 525 */
+  {    99,     21,     12,      0,      0,  18656,     74, }, /* 526 */
+  {    21,      6,     12,      0,      0,  18432,    182, }, /* 527 */
+  {    22,      7,      6,      0,      0,  18432,     84, }, /* 528 */
+  {    22,      7,      6,      0,      0,  18432,    184, }, /* 529 */
+  {    22,      7,      7,      0,      0,  18432,    184, }, /* 530 */
+  {    22,      7,      7,      0,      0,  18432,     84, }, /* 531 */
+  {    22,      7,      8,      0,      0,  18432,     84, }, /* 532 */
+  {    23,      7,     12,      0,      0,  18432,     84, }, /* 533 */
+  {    23,     12,      3,      0,      0,  26624,     98, }, /* 534 */
+  {    23,     21,     12,      0,      0,  18432,     74, }, /* 535 */
+  {    23,     21,     12,      0,      0,  18432,    110, }, /* 536 */
+  {    23,     21,     12,      0,      0,  18432,    128, }, /* 537 */
+  {    23,     15,     12,      0,      0,  18432,    144, }, /* 538 */
+  {    23,     15,     12,      0,      0,  18432,     74, }, /* 539 */
+  {    23,     26,     12,      0,      0,  28672,     74, }, /* 540 */
+  {    24,      9,     12,      0,  38864,  18432,    186, }, /* 541 */
+  {    24,      9,     12,      0,      8,  18432,    186, }, /* 542 */
+  {    24,      5,     12,      0,     -8,  18432,     70, }, /* 543 */
+  {   101,     17,     12,      0,      0,  28672,    130, }, /* 544 */
+  {   101,      7,     12,      0,      0,  18432,     84, }, /* 545 */
+  {   101,     26,     12,      0,      0,  18432,     74, }, /* 546 */
+  {   101,     21,     12,      0,      0,  18432,    128, }, /* 547 */
+  {   102,     29,     12,      0,      0,  45056,     52, }, /* 548 */
+  {   102,      7,     12,      0,      0,  18432,     84, }, /* 549 */
+  {   102,     22,     12,      0,      0,  28672,    172, }, /* 550 */
+  {   102,     18,     12,      0,      0,  28672,    172, }, /* 551 */
+  {    25,      7,     12,      0,      0,  18432,     84, }, /* 552 */
+  {    99,     21,     12,      0,      0,  18660,    110, }, /* 553 */
+  {    25,     14,     12,      0,      0,  18432,     84, }, /* 554 */
+  {    33,      7,     12,      0,      0,  18432,     84, }, /* 555 */
+  {    33,     12,      3,      0,      0,  26624,    106, }, /* 556 */
+  {    33,     12,      3,      0,      0,  26624,    158, }, /* 557 */
+  {    33,     10,      3,      0,      0,  18432,    188, }, /* 558 */
+  {    34,      7,     12,      0,      0,  18432,     84, }, /* 559 */
+  {    34,     12,      3,      0,      0,  26624,    106, }, /* 560 */
+  {    34,     10,      3,      0,      0,  18432,    188, }, /* 561 */
+  {    99,     21,     12,      0,      0,  18664,    128, }, /* 562 */
+  {    35,      7,     12,      0,      0,  18432,     84, }, /* 563 */
+  {    35,     12,      3,      0,      0,  26624,    106, }, /* 564 */
+  {    36,      7,     12,      0,      0,  18432,     84, }, /* 565 */
+  {    36,     12,      3,      0,      0,  26624,    106, }, /* 566 */
+  {   103,      7,     12,      0,      0,  18432,     84, }, /* 567 */
+  {   103,      7,     12,      0,      0,  18432,    146, }, /* 568 */
+  {   103,     12,      3,      0,      0,  26624,    102, }, /* 569 */
+  {   103,     10,      5,      0,      0,  18432,    154, }, /* 570 */
+  {   103,     12,      3,      0,      0,  26624,    106, }, /* 571 */
+  {   103,     12,      3,      0,      0,  26624,     98, }, /* 572 */
+  {   103,     12,      3,      0,      0,  26624,    158, }, /* 573 */
+  {   103,     21,     12,      0,      0,  18432,    128, }, /* 574 */
+  {   103,     21,     12,      0,      0,  18432,    110, }, /* 575 */
+  {   103,      6,     12,      0,      0,  18432,    148, }, /* 576 */
+  {   103,     21,     12,      0,      0,  18432,     74, }, /* 577 */
+  {   103,     23,     12,      0,      0,  14336,     74, }, /* 578 */
+  {   103,     13,     12,      0,      0,  18432,    144, }, /* 579 */
+  {   103,     15,     12,      0,      0,  28672,     74, }, /* 580 */
+  {    26,     21,     12,      0,      0,  28672,     74, }, /* 581 */
+  {    99,     21,     12,      0,      0,  28908,    110, }, /* 582 */
+  {    99,     21,     12,      0,      0,  28908,    128, }, /* 583 */
+  {    26,     21,     12,      0,      0,  28672,    110, }, /* 584 */
+  {    26,     17,     12,      0,      0,  28672,    130, }, /* 585 */
+  {    26,     21,     12,      0,      0,  28672,    128, }, /* 586 */
+  {    26,     21,     12,      0,      0,  28672,    190, }, /* 587 */
+  {    26,     12,      3,      0,      0,  26624,    192, }, /* 588 */
+  {    26,      1,      2,      0,      0,   6144,     66, }, /* 589 */
+  {    26,     13,     12,      0,      0,  18432,    144, }, /* 590 */
+  {    26,      7,     12,      0,      0,  18432,     84, }, /* 591 */
+  {    26,      6,     12,      0,      0,  18432,    138, }, /* 592 */
+  {    26,     12,      3,      0,      0,  26624,    194, }, /* 593 */
+  {    26,     12,      3,      0,      0,  26624,    106, }, /* 594 */
+  {    37,      7,     12,      0,      0,  18432,     84, }, /* 595 */
+  {    37,     12,      3,      0,      0,  26624,    106, }, /* 596 */
+  {    37,     10,      5,      0,      0,  18432,    154, }, /* 597 */
+  {    37,     12,      3,      0,      0,  26624,     98, }, /* 598 */
+  {    37,     26,     12,      0,      0,  28672,     74, }, /* 599 */
+  {    37,     21,     12,      0,      0,  28672,    128, }, /* 600 */
+  {    37,     13,     12,      0,      0,  18432,    144, }, /* 601 */
+  {    38,      7,     12,      0,      0,  18432,     84, }, /* 602 */
+  {   110,      7,     12,      0,      0,  18432,     84, }, /* 603 */
+  {   110,      7,     12,      0,      0,  18432,    170, }, /* 604 */
+  {   110,     13,     12,      0,      0,  18432,    144, }, /* 605 */
+  {   110,     15,     12,      0,      0,  18432,    144, }, /* 606 */
+  {   110,     26,     12,      0,      0,  28672,     74, }, /* 607 */
+  {   103,     26,     12,      0,      0,  28672,     74, }, /* 608 */
+  {    42,      7,     12,      0,      0,  18432,     84, }, /* 609 */
+  {    42,     12,      3,      0,      0,  26624,    106, }, /* 610 */
+  {    42,     10,      5,      0,      0,  18432,    154, }, /* 611 */
+  {    42,     21,     12,      0,      0,  18432,     74, }, /* 612 */
+  {   123,      7,     12,      0,      0,  18432,     84, }, /* 613 */
+  {   123,     10,      5,      0,      0,  18432,    154, }, /* 614 */
+  {   123,     12,      3,      0,      0,  26624,    106, }, /* 615 */
+  {   123,     12,      3,      0,      0,  26624,    158, }, /* 616 */
+  {   123,     10,     12,      0,      0,  18432,    154, }, /* 617 */
+  {   123,     12,      3,      0,      0,  26624,     98, }, /* 618 */
+  {   123,     13,     12,      0,      0,  18432,    144, }, /* 619 */
+  {   123,     21,     12,      0,      0,  18432,     74, }, /* 620 */
+  {   123,      6,     12,      0,      0,  18432,    138, }, /* 621 */
+  {   123,     21,     12,      0,      0,  18432,    128, }, /* 622 */
+  {   106,     11,      3,      0,      0,  26624,    196, }, /* 623 */
+  {   106,     12,      3,      0,      0,  26624,    106, }, /* 624 */
+  {   113,     12,      3,      0,      0,  26624,    106, }, /* 625 */
+  {   113,     10,      5,      0,      0,  18432,    154, }, /* 626 */
+  {   113,      7,     12,      0,      0,  18432,     84, }, /* 627 */
+  {   113,     12,      3,      0,      0,  26624,     98, }, /* 628 */
+  {   113,     10,      3,      0,      0,  18432,    160, }, /* 629 */
+  {   113,     10,      3,      0,      0,  18432,    188, }, /* 630 */
+  {   113,     21,     12,      0,      0,  18432,    128, }, /* 631 */
+  {   113,     13,     12,      0,      0,  18432,    144, }, /* 632 */
+  {   113,     21,     12,      0,      0,  18432,     74, }, /* 633 */
+  {   113,     21,     12,      0,      0,  18432,    110, }, /* 634 */
+  {   113,     26,     12,      0,      0,  18432,     74, }, /* 635 */
+  {   116,     12,      3,      0,      0,  26624,    106, }, /* 636 */
+  {   116,     10,      5,      0,      0,  18432,    154, }, /* 637 */
+  {   116,      7,     12,      0,      0,  18432,     84, }, /* 638 */
+  {   116,     10,      3,      0,      0,  18432,    188, }, /* 639 */
+  {   116,     12,      3,      0,      0,  26624,    158, }, /* 640 */
+  {   116,     13,     12,      0,      0,  18432,    144, }, /* 641 */
+  {   132,      7,     12,      0,      0,  18432,     84, }, /* 642 */
+  {   132,     12,      3,      0,      0,  26624,     98, }, /* 643 */
+  {   132,     10,      5,      0,      0,  18432,    154, }, /* 644 */
+  {   132,     12,      3,      0,      0,  26624,    106, }, /* 645 */
+  {   132,     10,      3,      0,      0,  18432,    188, }, /* 646 */
+  {   132,     21,     12,      0,      0,  18432,     74, }, /* 647 */
+  {   117,      7,     12,      0,      0,  18432,     84, }, /* 648 */
+  {   117,     10,      5,      0,      0,  18432,    154, }, /* 649 */
+  {   117,     12,      3,      0,      0,  26624,    106, }, /* 650 */
+  {   117,     12,      3,      0,      0,  26624,    198, }, /* 651 */
+  {   117,     12,      3,      0,      0,  26624,     98, }, /* 652 */
+  {   117,     21,     12,      0,      0,  18432,    128, }, /* 653 */
+  {   117,     21,     12,      0,      0,  18432,    110, }, /* 654 */
+  {   117,     13,     12,      0,      0,  18432,    144, }, /* 655 */
+  {   118,     13,     12,      0,      0,  18432,    144, }, /* 656 */
+  {   118,      7,     12,      0,      0,  18432,     84, }, /* 657 */
+  {   118,      6,     12,      0,      0,  18432,     94, }, /* 658 */
+  {   118,      6,     12,      0,      0,  18432,     96, }, /* 659 */
+  {   118,     21,     12,      0,      0,  18432,    128, }, /* 660 */
+  {     2,      5,     12,     63,  -6222,  18432,     70, }, /* 661 */
+  {     2,      5,     12,     67,  -6221,  18432,     70, }, /* 662 */
+  {     2,      5,     12,     71,  -6212,  18432,     70, }, /* 663 */
+  {     2,      5,     12,     75,  -6210,  18432,     70, }, /* 664 */
+  {     2,      5,     12,     79,  -6210,  18432,     70, }, /* 665 */
+  {     2,      5,     12,     79,  -6211,  18432,     70, }, /* 666 */
+  {     2,      5,     12,     84,  -6204,  18432,     70, }, /* 667 */
+  {     2,      5,     12,     88,  -6180,  18432,     70, }, /* 668 */
+  {     2,      5,     12,    108,  35267,  18432,     70, }, /* 669 */
+  {    21,      9,     12,      0,  -3008,  18432,     76, }, /* 670 */
+  {   116,     21,     12,      0,      0,  18432,     74, }, /* 671 */
+  {   106,     12,      3,      0,      0,  26864,     98, }, /* 672 */
+  {   106,     12,      3,      0,      0,  26868,     98, }, /* 673 */
+  {    99,     21,     12,      0,      0,  18680,    200, }, /* 674 */
+  {   106,     12,      3,      0,      0,  26876,     98, }, /* 675 */
+  {   106,     12,      3,      0,      0,  26880,     98, }, /* 676 */
+  {   106,     12,      3,      0,      0,  26884,     98, }, /* 677 */
+  {    99,     10,      5,      0,      0,  18684,    174, }, /* 678 */
+  {    99,      7,     12,      0,      0,  18696,     84, }, /* 679 */
+  {    99,      7,     12,      0,      0,  18684,     84, }, /* 680 */
+  {    99,      7,     12,      0,      0,  18676,     84, }, /* 681 */
+  {    99,      7,     12,      0,      0,  18700,     84, }, /* 682 */
+  {    99,      7,     12,      0,      0,  18704,     84, }, /* 683 */
+  {   106,     12,      3,      0,      0,  26900,     98, }, /* 684 */
+  {    99,     10,      5,      0,      0,  18712,    174, }, /* 685 */
+  {   106,     12,      3,      0,      0,  26896,     98, }, /* 686 */
+  {    99,      7,     12,      0,      0,  18716,     84, }, /* 687 */
+  {     2,      5,     12,      0,      0,  18432,     60, }, /* 688 */
+  {     1,      6,     12,      0,      0,  18432,     90, }, /* 689 */
+  {     2,      6,     12,      0,      0,  18432,    182, }, /* 690 */
+  {     0,      5,     12,      0,  35332,  18432,     78, }, /* 691 */
+  {     0,      5,     12,      0,   3814,  18432,     78, }, /* 692 */
+  {     0,      5,     12,      0,  35384,  18432,     78, }, /* 693 */
+  {     0,      5,     12,      0,      0,  18432,    202, }, /* 694 */
+  {     0,      6,     12,      0,      0,  18432,    182, }, /* 695 */
+  {     0,      6,     12,      0,      0,  18432,    204, }, /* 696 */
+  {     1,      6,     12,      0,      0,  18432,    182, }, /* 697 */
+  {   106,     12,      3,      0,      0,  26740,    104, }, /* 698 */
+  {   106,     12,      3,      0,      0,  26912,     98, }, /* 699 */
+  {   106,     12,      3,      0,      0,  26916,     98, }, /* 700 */
+  {     0,      9,     12,     92,      1,  18432,     76, }, /* 701 */
+  {     0,      5,     12,     92,     -1,  18432,     78, }, /* 702 */
+  {     0,      5,     12,      0,      0,  18432,     70, }, /* 703 */
+  {     0,      5,     12,     92,    -58,  18432,     70, }, /* 704 */
+  {     0,      9,     12,      0,  -7615,  18432,     76, }, /* 705 */
+  {     1,      5,     12,      0,      8,  18432,     78, }, /* 706 */
+  {     1,      9,     12,      0,     -8,  18432,     76, }, /* 707 */
+  {     1,      5,     12,      0,      0,  18432,     78, }, /* 708 */
+  {     1,      5,     12,      0,     74,  18432,     78, }, /* 709 */
+  {     1,      5,     12,      0,     86,  18432,     78, }, /* 710 */
+  {     1,      5,     12,      0,    100,  18432,     78, }, /* 711 */
+  {     1,      5,     12,      0,    128,  18432,     78, }, /* 712 */
+  {     1,      5,     12,      0,    112,  18432,     78, }, /* 713 */
+  {     1,      5,     12,      0,    126,  18432,     78, }, /* 714 */
+  {     1,      5,     12,      0,      8,  18432,     70, }, /* 715 */
+  {     1,      8,     12,      0,     -8,  18432,     88, }, /* 716 */
+  {     1,      5,     12,      0,      0,  18432,     70, }, /* 717 */
+  {     1,      5,     12,      0,      9,  18432,     70, }, /* 718 */
+  {     1,      9,     12,      0,    -74,  18432,     76, }, /* 719 */
+  {     1,      8,     12,      0,     -9,  18432,     88, }, /* 720 */
+  {     1,      5,     12,     21,  -7173,  18432,     78, }, /* 721 */
+  {     1,      9,     12,      0,    -86,  18432,     76, }, /* 722 */
+  {     1,      5,     12,      0,  -7235,  18432,     78, }, /* 723 */
+  {     1,      9,     12,      0,   -100,  18432,     76, }, /* 724 */
+  {     1,      5,     12,      0,  -7219,  18432,     78, }, /* 725 */
+  {     1,      9,     12,      0,   -112,  18432,     76, }, /* 726 */
+  {     1,      9,     12,      0,   -128,  18432,     76, }, /* 727 */
+  {     1,      9,     12,      0,   -126,  18432,     76, }, /* 728 */
+  {    99,     29,     12,      0,      0,  45056,     52, }, /* 729 */
+  {   106,      1,      3,      0,      0,   6144,    206, }, /* 730 */
+  {   106,      1,     13,      0,      0,   6144,    208, }, /* 731 */
+  {    99,      1,      2,      0,      0,  18432,    210, }, /* 732 */
+  {    99,      1,      2,      0,      0,  34816,    210, }, /* 733 */
+  {    99,     17,     12,      0,      0,  28672,    212, }, /* 734 */
+  {    99,     21,     12,      0,      0,  28672,     64, }, /* 735 */
+  {    99,     20,     12,      0,      0,  28672,    214, }, /* 736 */
+  {    99,     19,     12,      0,      0,  28672,    214, }, /* 737 */
+  {    99,     22,     12,      0,      0,  28672,    216, }, /* 738 */
+  {    99,     20,     12,      0,      0,  28672,    216, }, /* 739 */
+  {    99,     19,     12,      0,      0,  28672,    216, }, /* 740 */
+  {    99,     21,     12,      0,      0,  28672,    218, }, /* 741 */
+  {    99,     21,     12,      0,      0,  28672,    220, }, /* 742 */
+  {    99,     27,      2,      0,      0,  45056,     50, }, /* 743 */
+  {    99,     28,      2,      0,      0,   4096,     50, }, /* 744 */
+  {    99,      1,      2,      0,      0,  20480,    136, }, /* 745 */
+  {    99,      1,      2,      0,      0,  36864,    136, }, /* 746 */
+  {    99,      1,      2,      0,      0,  30720,    136, }, /* 747 */
+  {    99,      1,      2,      0,      0,  24576,    136, }, /* 748 */
+  {    99,      1,      2,      0,      0,  40960,    136, }, /* 749 */
+  {    99,     29,     12,      0,      0,   8488,     52, }, /* 750 */
+  {    99,     21,     12,      0,      0,  14336,     54, }, /* 751 */
+  {    99,     21,     12,      0,      0,  14336,     64, }, /* 752 */
+  {    99,     21,     14,      0,      0,  28672,    222, }, /* 753 */
+  {    99,     21,     12,      0,      0,  28672,    224, }, /* 754 */
+  {    99,     16,     12,      0,      0,  28672,    144, }, /* 755 */
+  {    99,     16,     12,      0,      0,  28672,    226, }, /* 756 */
+  {    99,     25,     12,      0,      0,   8192,     64, }, /* 757 */
+  {    99,     22,     12,      0,      0,  28672,    228, }, /* 758 */
+  {    99,     18,     12,      0,      0,  28672,    228, }, /* 759 */
+  {    99,     21,     12,      0,      0,  28972,     54, }, /* 760 */
+  {    99,     21,     12,      0,      0,  28672,    212, }, /* 761 */
+  {    99,     21,     12,      0,      0,  28976,     54, }, /* 762 */
+  {    99,     21,     12,      0,      0,  28980,     54, }, /* 763 */
+  {    99,      1,      2,      0,      0,   6144,    230, }, /* 764 */
+  {    98,      2,      2,      0,      0,   6144,    232, }, /* 765 */
+  {    99,      1,      2,      0,      0,  22528,    136, }, /* 766 */
+  {    99,      1,      2,      0,      0,  38912,    136, }, /* 767 */
+  {    99,      1,      2,      0,      0,  16384,    136, }, /* 768 */
+  {    99,      1,      2,      0,      0,  32768,    136, }, /* 769 */
+  {    99,      1,      2,      0,      0,   6144,    234, }, /* 770 */
+  {    99,     25,     12,      0,      0,  12288,    236, }, /* 771 */
+  {    99,     25,     12,      0,      0,  12288,    238, }, /* 772 */
+  {    99,     25,     12,      0,      0,  28672,    236, }, /* 773 */
+  {    99,     22,     12,      0,      0,  28672,    240, }, /* 774 */
+  {    99,     18,     12,      0,      0,  28672,    240, }, /* 775 */
+  {    98,      2,     12,      0,      0,  14336,      0, }, /* 776 */
+  {   106,     12,      3,      0,      0,  26624,    242, }, /* 777 */
+  {   106,     11,      3,      0,      0,  26624,    124, }, /* 778 */
+  {   106,     11,      3,      0,      0,  26624,    244, }, /* 779 */
+  {   106,     12,      3,      0,      0,  26936,    104, }, /* 780 */
+  {    99,     26,     12,      0,      0,  28672,     74, }, /* 781 */
+  {    99,      9,     12,      0,      0,  18432,    116, }, /* 782 */
+  {    99,      5,     12,      0,      0,  18432,    246, }, /* 783 */
+  {    99,     25,     12,      0,      0,  28672,    248, }, /* 784 */
+  {    99,     26,     14,      0,      0,  28672,    250, }, /* 785 */
+  {     1,      9,     12,     96,  -7517,  18432,     76, }, /* 786 */
+  {    99,     26,     12,      0,      0,  28672,    122, }, /* 787 */
+  {     0,      9,     12,    100,      0,  18432,     76, }, /* 788 */
+  {     0,      9,     12,    104,  -8262,  18432,     76, }, /* 789 */
+  {    99,     26,     12,      0,      0,  14336,    252, }, /* 790 */
+  {     0,      9,     12,      0,     28,  18432,     76, }, /* 791 */
+  {    99,      7,     12,      0,      0,  18432,    254, }, /* 792 */
+  {    99,      5,     14,      0,      0,  18432,    256, }, /* 793 */
+  {    99,     25,     12,      0,      0,  28672,    122, }, /* 794 */
+  {    99,      5,     12,      0,      0,  18432,    258, }, /* 795 */
+  {     0,      5,     12,      0,    -28,  18432,     78, }, /* 796 */
+  {     0,     14,     12,      0,     16,  18432,     76, }, /* 797 */
+  {     0,     14,     12,      0,    -16,  18432,     78, }, /* 798 */
+  {     0,     14,     12,      0,      0,  18432,     84, }, /* 799 */
+  {    99,     25,     14,      0,      0,  28672,    260, }, /* 800 */
+  {    99,     26,     14,      0,      0,  28672,    260, }, /* 801 */
+  {    99,     26,     12,      0,      0,  28672,     64, }, /* 802 */
+  {    99,     25,     12,      0,      0,  28672,    262, }, /* 803 */
+  {    99,     25,     12,      0,      0,  28672,    264, }, /* 804 */
+  {    99,     25,     12,      0,      0,  12288,    266, }, /* 805 */
+  {    99,     22,     12,      0,      0,  28672,    264, }, /* 806 */
+  {    99,     18,     12,      0,      0,  28672,    264, }, /* 807 */
+  {    99,     26,     14,      0,      0,  28672,    268, }, /* 808 */
+  {    99,     22,     12,      0,      0,  28672,    270, }, /* 809 */
+  {    99,     18,     12,      0,      0,  28672,    270, }, /* 810 */
+  {    99,     26,     12,      0,      0,  18432,     54, }, /* 811 */
+  {    99,     26,     14,      0,      0,  28672,    272, }, /* 812 */
+  {    98,      2,     12,      0,      0,  18432,    274, }, /* 813 */
+  {    99,     15,     12,      0,      0,  10240,     74, }, /* 814 */
+  {    99,     26,     12,      0,     26,  18432,    276, }, /* 815 */
+  {    99,     26,     14,      0,     26,  18432,    278, }, /* 816 */
+  {    99,     26,     12,      0,    -26,  18432,    280, }, /* 817 */
+  {    99,     25,     14,      0,      0,  28672,    282, }, /* 818 */
+  {    99,     26,     14,      0,      0,  28672,    284, }, /* 819 */
+  {    99,     26,     14,      0,      0,  28672,    286, }, /* 820 */
+  {    99,     25,     14,      0,      0,  28672,    284, }, /* 821 */
+  {    99,     26,     14,      0,      0,  18432,    272, }, /* 822 */
+  {    99,     26,     14,      0,      0,  28672,    288, }, /* 823 */
+  {   109,     26,     12,      0,      0,  18432,     54, }, /* 824 */
+  {    99,     26,     12,      0,      0,  28672,    228, }, /* 825 */
+  {    44,      9,     12,      0,     48,  18432,     76, }, /* 826 */
+  {    44,      5,     12,      0,    -48,  18432,     78, }, /* 827 */
+  {     0,      9,     12,      0, -10743,  18432,     76, }, /* 828 */
+  {     0,      9,     12,      0,  -3814,  18432,     76, }, /* 829 */
+  {     0,      9,     12,      0, -10727,  18432,     76, }, /* 830 */
+  {     0,      5,     12,      0, -10795,  18432,     78, }, /* 831 */
+  {     0,      5,     12,      0, -10792,  18432,     78, }, /* 832 */
+  {     0,      9,     12,      0, -10780,  18432,     76, }, /* 833 */
+  {     0,      9,     12,      0, -10749,  18432,     76, }, /* 834 */
+  {     0,      9,     12,      0, -10783,  18432,     76, }, /* 835 */
+  {     0,      9,     12,      0, -10782,  18432,     76, }, /* 836 */
+  {     0,      9,     12,      0, -10815,  18432,     76, }, /* 837 */
+  {    43,      5,     12,      0,      0,  18432,     60, }, /* 838 */
+  {    43,     26,     12,      0,      0,  28672,     74, }, /* 839 */
+  {    43,     12,      3,      0,      0,  26624,     98, }, /* 840 */
+  {    43,     21,     12,      0,      0,  28672,    128, }, /* 841 */
+  {    43,     21,     12,      0,      0,  28672,     74, }, /* 842 */
+  {    43,     15,     12,      0,      0,  28672,     74, }, /* 843 */
+  {    21,      5,     12,      0,  -7264,  18432,     78, }, /* 844 */
+  {    45,      7,     12,      0,      0,  18432,     84, }, /* 845 */
+  {    45,      6,     12,      0,      0,  18432,    148, }, /* 846 */
+  {    45,     21,     12,      0,      0,  18432,     74, }, /* 847 */
+  {    45,     12,      3,      0,      0,  26624,    290, }, /* 848 */
+  {     2,     12,      3,      0,      0,  26624,    106, }, /* 849 */
+  {    99,     20,     12,      0,      0,  28672,    228, }, /* 850 */
+  {    99,     19,     12,      0,      0,  28672,    228, }, /* 851 */
+  {    99,     17,     12,      0,      0,  28988,    212, }, /* 852 */
+  {    99,      6,     12,      0,      0,  28672,    292, }, /* 853 */
+  {    99,     21,     12,      0,      0,  28992,     54, }, /* 854 */
+  {    99,     21,     12,      0,      0,  28996,     54, }, /* 855 */
+  {    99,     21,     12,      0,      0,  29000,    224, }, /* 856 */
+  {    99,     21,     12,      0,      0,  29004,    294, }, /* 857 */
+  {    99,     21,     12,      0,      0,  28812,     54, }, /* 858 */
+  {    99,     21,     12,      0,      0,  28672,    294, }, /* 859 */
+  {    30,     26,     12,      0,      0,  28672,    296, }, /* 860 */
+  {    99,     26,     12,      0,      0,  29008,    298, }, /* 861 */
+  {    99,     26,     12,      0,      0,  29008,    300, }, /* 862 */
+  {    99,     26,     12,      0,      0,  29008,    302, }, /* 863 */
+  {    99,     21,     12,      0,      0,  29012,    294, }, /* 864 */
+  {    99,     21,     12,      0,      0,  29016,    224, }, /* 865 */
+  {    99,     21,     12,      0,      0,  29020,     54, }, /* 866 */
+  {    30,      6,     12,      0,      0,  18432,    138, }, /* 867 */
+  {    99,      7,     12,      0,      0,  18784,    304, }, /* 868 */
+  {    30,     14,     12,      0,      0,  18432,    304, }, /* 869 */
+  {    99,     22,     12,      0,      0,  29028,    228, }, /* 870 */
+  {    99,     18,     12,      0,      0,  29028,    228, }, /* 871 */
+  {    99,     22,     12,      0,      0,  29032,    228, }, /* 872 */
+  {    99,     18,     12,      0,      0,  29032,    228, }, /* 873 */
+  {    99,     22,     12,      0,      0,  29036,     62, }, /* 874 */
+  {    99,     18,     12,      0,      0,  29036,     62, }, /* 875 */
+  {    99,     22,     12,      0,      0,  29036,    228, }, /* 876 */
+  {    99,     18,     12,      0,      0,  29036,    228, }, /* 877 */
+  {    99,     26,     12,      0,      0,  29020,     54, }, /* 878 */
+  {    99,     17,     12,      0,      0,  29020,    212, }, /* 879 */
+  {    99,     22,     12,      0,      0,  29020,    216, }, /* 880 */
+  {    99,     18,     12,      0,      0,  29020,    216, }, /* 881 */
+  {   106,     12,      3,      0,      0,  26992,     98, }, /* 882 */
+  {    22,     10,      3,      0,      0,  18432,    306, }, /* 883 */
+  {    99,     17,     14,      0,      0,  29020,    308, }, /* 884 */
+  {    99,      6,     12,      0,      0,  18804,    138, }, /* 885 */
+  {    99,     26,     12,      0,      0,  29020,     74, }, /* 886 */
+  {    30,      6,     12,      0,      0,  18432,    148, }, /* 887 */
+  {    99,      7,     12,      0,      0,  18808,     84, }, /* 888 */
+  {    99,     21,     14,      0,      0,  29048,    250, }, /* 889 */
+  {    99,     26,     12,      0,      0,  29024,     74, }, /* 890 */
+  {    27,      7,     12,      0,      0,  18432,     84, }, /* 891 */
+  {   106,     12,      3,      0,      0,  26996,     98, }, /* 892 */
+  {    99,     24,     12,      0,      0,  29044,    310, }, /* 893 */
+  {    27,      6,     12,      0,      0,  18432,    138, }, /* 894 */
+  {    99,     17,     12,      0,      0,  29044,    130, }, /* 895 */
+  {    28,      7,     12,      0,      0,  18432,     84, }, /* 896 */
+  {    99,     21,     12,      0,      0,  29036,    144, }, /* 897 */
+  {    99,      6,     12,      0,      0,  18804,     96, }, /* 898 */
+  {    28,      6,     12,      0,      0,  18432,    138, }, /* 899 */
+  {    29,      7,     12,      0,      0,  18432,     84, }, /* 900 */
+  {    22,      7,     12,      0,      0,  18432,     84, }, /* 901 */
+  {    22,      7,     12,      0,      0,  18432,    184, }, /* 902 */
+  {    99,     26,     12,      0,      0,  18784,     74, }, /* 903 */
+  {    99,     15,     12,      0,      0,  18784,     74, }, /* 904 */
+  {    22,     26,     12,      0,      0,  18432,     74, }, /* 905 */
+  {    22,     26,     12,      0,      0,  28672,     74, }, /* 906 */
+  {    99,     15,     12,      0,      0,  18432,     74, }, /* 907 */
+  {    99,     26,     14,      0,      0,  18784,    250, }, /* 908 */
+  {    28,     26,     12,      0,      0,  18432,     74, }, /* 909 */
+  {    30,      7,     12,      0,      0,  18432,    312, }, /* 910 */
+  {    31,      7,     12,      0,      0,  18432,     84, }, /* 911 */
+  {    31,      6,     12,      0,      0,  18432,    138, }, /* 912 */
+  {    31,     26,     12,      0,      0,  28672,     74, }, /* 913 */
+  {    55,      7,     12,      0,      0,  18432,     84, }, /* 914 */
+  {    55,      6,     12,      0,      0,  18432,    148, }, /* 915 */
+  {    55,     21,     12,      0,      0,  18432,    110, }, /* 916 */
+  {    55,     21,     12,      0,      0,  18432,    128, }, /* 917 */
+  {   119,      7,     12,      0,      0,  18432,     84, }, /* 918 */
+  {   119,      6,     12,      0,      0,  18432,    138, }, /* 919 */
+  {   119,     21,     12,      0,      0,  28672,    110, }, /* 920 */
+  {   119,     21,     12,      0,      0,  28672,    128, }, /* 921 */
+  {   119,     13,     12,      0,      0,  18432,    144, }, /* 922 */
+  {     2,      9,     12,    108,      1,  18432,     76, }, /* 923 */
+  {     2,      5,     12,    108, -35267,  18432,     78, }, /* 924 */
+  {     2,      7,     12,      0,      0,  18432,     84, }, /* 925 */
+  {     2,     21,     12,      0,      0,  28672,     74, }, /* 926 */
+  {     2,     12,      3,      0,      0,  26624,     98, }, /* 927 */
+  {     2,      6,     12,      0,      0,  28672,     94, }, /* 928 */
+  {     2,      6,     12,      0,      0,  18432,     90, }, /* 929 */
+  {   126,      7,     12,      0,      0,  18432,     84, }, /* 930 */
+  {   126,     14,     12,      0,      0,  18432,     84, }, /* 931 */
+  {   126,     12,      3,      0,      0,  26624,     98, }, /* 932 */
+  {   126,     21,     12,      0,      0,  18432,     74, }, /* 933 */
+  {   126,     21,     12,      0,      0,  18432,    128, }, /* 934 */
+  {   126,     21,     12,      0,      0,  18432,    110, }, /* 935 */
+  {    99,     24,     12,      0,      0,  29052,     56, }, /* 936 */
+  {     0,      9,     12,      0, -35332,  18432,     76, }, /* 937 */
+  {    99,     24,     12,      0,      0,  18432,     56, }, /* 938 */
+  {     0,      9,     12,      0, -42280,  18432,     76, }, /* 939 */
+  {     0,      5,     12,      0,     48,  18432,     78, }, /* 940 */
+  {     0,      9,     12,      0, -42308,  18432,     76, }, /* 941 */
+  {     0,      9,     12,      0, -42319,  18432,     76, }, /* 942 */
+  {     0,      9,     12,      0, -42315,  18432,     76, }, /* 943 */
+  {     0,      9,     12,      0, -42305,  18432,     76, }, /* 944 */
+  {     0,      9,     12,      0, -42258,  18432,     76, }, /* 945 */
+  {     0,      9,     12,      0, -42282,  18432,     76, }, /* 946 */
+  {     0,      9,     12,      0, -42261,  18432,     76, }, /* 947 */
+  {     0,      9,     12,      0,    928,  18432,     76, }, /* 948 */
+  {     0,      9,     12,      0,    -48,  18432,     76, }, /* 949 */
+  {     0,      9,     12,      0, -42307,  18432,     76, }, /* 950 */
+  {     0,      9,     12,      0, -35384,  18432,     76, }, /* 951 */
+  {     0,      9,     12,      0, -42343,  18432,     76, }, /* 952 */
+  {     0,      9,     12,      0, -42561,  18432,     76, }, /* 953 */
+  {    46,      7,     12,      0,      0,  18432,     84, }, /* 954 */
+  {    46,     12,      3,      0,      0,  26624,    106, }, /* 955 */
+  {    46,     12,      3,      0,      0,  26624,    158, }, /* 956 */
+  {    46,     10,      5,      0,      0,  18432,    154, }, /* 957 */
+  {    46,     26,     12,      0,      0,  28672,     74, }, /* 958 */
+  {    99,     15,     12,      0,      0,  18816,     74, }, /* 959 */
+  {    99,     15,     12,      0,      0,  18820,     74, }, /* 960 */
+  {    99,     26,     12,      0,      0,  18824,     74, }, /* 961 */
+  {    99,     23,     12,      0,      0,  14732,     74, }, /* 962 */
+  {    99,     26,     12,      0,      0,  14728,     74, }, /* 963 */
+  {    47,      7,     12,      0,      0,  18432,     84, }, /* 964 */
+  {    47,     21,     12,      0,      0,  28672,     74, }, /* 965 */
+  {    47,     21,     12,      0,      0,  28672,    128, }, /* 966 */
+  {   120,     10,      5,      0,      0,  18432,    154, }, /* 967 */
+  {   120,      7,     12,      0,      0,  18432,     84, }, /* 968 */
+  {   120,     12,      3,      0,      0,  26624,    158, }, /* 969 */
+  {   120,     12,      3,      0,      0,  26624,    106, }, /* 970 */
+  {   120,     21,     12,      0,      0,  18432,    128, }, /* 971 */
+  {   120,     13,     12,      0,      0,  18432,    144, }, /* 972 */
+  {     8,     12,      3,      0,      0,  27024,     98, }, /* 973 */
+  {     8,      7,     12,      0,      0,  18836,     84, }, /* 974 */
+  {    49,     13,     12,      0,      0,  18432,    144, }, /* 975 */
+  {    49,      7,     12,      0,      0,  18432,     84, }, /* 976 */
+  {    49,     12,      3,      0,      0,  26624,    106, }, /* 977 */
+  {    49,     12,      3,      0,      0,  26624,     98, }, /* 978 */
+  {    99,     21,     12,      0,      0,  18840,    200, }, /* 979 */
+  {    49,     21,     12,      0,      0,  18432,    128, }, /* 980 */
+  {   121,      7,     12,      0,      0,  18432,     84, }, /* 981 */
+  {   121,     12,      3,      0,      0,  26624,    106, }, /* 982 */
+  {   121,     10,      5,      0,      0,  18432,    154, }, /* 983 */
+  {   121,     10,      3,      0,      0,  18432,    188, }, /* 984 */
+  {   121,     21,     12,      0,      0,  18432,     74, }, /* 985 */
+  {    56,     12,      3,      0,      0,  26624,    106, }, /* 986 */
+  {    56,     10,      5,      0,      0,  18432,    154, }, /* 987 */
+  {    56,      7,     12,      0,      0,  18432,     84, }, /* 988 */
+  {    56,     12,      3,      0,      0,  26624,     98, }, /* 989 */
+  {    56,     10,      3,      0,      0,  18432,    188, }, /* 990 */
+  {    56,     21,     12,      0,      0,  18432,     74, }, /* 991 */
+  {    56,     21,     12,      0,      0,  18432,    110, }, /* 992 */
+  {    56,     21,     12,      0,      0,  18432,    128, }, /* 993 */
+  {    99,      6,     12,      0,      0,  18844,    138, }, /* 994 */
+  {    56,     13,     12,      0,      0,  18432,    144, }, /* 995 */
+  {    20,      6,     12,      0,      0,  18432,    138, }, /* 996 */
+  {   122,      7,     12,      0,      0,  18432,     84, }, /* 997 */
+  {   122,     12,      3,      0,      0,  26624,    106, }, /* 998 */
+  {   122,     10,      5,      0,      0,  18432,    154, }, /* 999 */
+  {   122,     13,     12,      0,      0,  18432,    144, }, /* 1000 */
+  {   122,     21,     12,      0,      0,  18432,     74, }, /* 1001 */
+  {   122,     21,     12,      0,      0,  18432,    128, }, /* 1002 */
+  {   124,      7,     12,      0,      0,  18432,     84, }, /* 1003 */
+  {   124,     12,      3,      0,      0,  26624,    106, }, /* 1004 */
+  {   124,      7,     12,      0,      0,  18432,    170, }, /* 1005 */
+  {   124,     12,      3,      0,      0,  26624,     98, }, /* 1006 */
+  {   124,      7,     12,      0,      0,  18432,    314, }, /* 1007 */
+  {   124,      6,     12,      0,      0,  18432,    138, }, /* 1008 */
+  {   124,     21,     12,      0,      0,  18432,     74, }, /* 1009 */
+  {   124,     21,     12,      0,      0,  18432,    110, }, /* 1010 */
+  {   127,      7,     12,      0,      0,  18432,     84, }, /* 1011 */
+  {   127,     10,      5,      0,      0,  18432,    154, }, /* 1012 */
+  {   127,     12,      3,      0,      0,  26624,    106, }, /* 1013 */
+  {   127,     21,     12,      0,      0,  18432,    128, }, /* 1014 */
+  {   127,      6,     12,      0,      0,  18432,    138, }, /* 1015 */
+  {   127,     12,      3,      0,      0,  26624,    158, }, /* 1016 */
+  {     0,      5,     12,      0,   -928,  18432,     78, }, /* 1017 */
+  {    24,      5,     12,      0, -38864,  18432,     70, }, /* 1018 */
+  {   127,     10,      5,      0,      0,  18432,    174, }, /* 1019 */
+  {   127,     13,     12,      0,      0,  18432,    144, }, /* 1020 */
+  {    22,      7,      9,      0,      0,  18432,     84, }, /* 1021 */
+  {    22,      7,     10,      0,      0,  18432,     84, }, /* 1022 */
+  {    98,      4,     12,      0,      0,  18432,      0, }, /* 1023 */
+  {    98,      3,     12,      0,      0,  18432,      0, }, /* 1024 */
+  {    30,      7,     12,      0,      0,  18432,    304, }, /* 1025 */
+  {     0,      5,     12,      0,      1,  18432,     70, }, /* 1026 */
+  {     0,      5,     12,      0,     -1,  18432,     70, }, /* 1027 */
+  {     4,     25,     12,      0,      0,  12288,    122, }, /* 1028 */
+  {     5,      7,     12,      0,      0,      0,    316, }, /* 1029 */
+  {    99,     18,     12,      0,      0,  29088,     54, }, /* 1030 */
+  {    99,     22,     12,      0,      0,  29088,     54, }, /* 1031 */
+  {    98,      2,     12,      0,      0,   6144,    318, }, /* 1032 */
+  {     5,      7,     12,      0,      0,    420,     84, }, /* 1033 */
+  {     5,     26,     12,      0,      0,  29092,     74, }, /* 1034 */
+  {   106,     12,      3,      0,      0,  26624,    192, }, /* 1035 */
+  {   106,     12,      3,      0,      0,  26624,    320, }, /* 1036 */
+  {    99,     21,     12,      0,      0,  28672,     74, }, /* 1037 */
+  {    99,     21,     12,      0,      0,  28672,    128, }, /* 1038 */
+  {    99,     21,     12,      0,      0,  28672,    126, }, /* 1039 */
+  {    99,     22,     12,      0,      0,  28672,     74, }, /* 1040 */
+  {    99,     18,     12,      0,      0,  28672,     74, }, /* 1041 */
+  {    99,     17,     12,      0,      0,  28672,    130, }, /* 1042 */
+  {    99,     22,     12,      0,      0,  28672,    322, }, /* 1043 */
+  {    99,     18,     12,      0,      0,  28672,    322, }, /* 1044 */
+  {    99,     21,     12,      0,      0,   8192,    110, }, /* 1045 */
+  {    99,     21,     12,      0,      0,   8192,    324, }, /* 1046 */
+  {    99,     21,     12,      0,      0,   8192,    326, }, /* 1047 */
+  {    99,     22,     12,      0,      0,  28672,    172, }, /* 1048 */
+  {    99,     18,     12,      0,      0,  28672,    172, }, /* 1049 */
+  {    99,     21,     12,      0,      0,  14336,     74, }, /* 1050 */
+  {    99,     21,     12,      0,      0,  28672,    122, }, /* 1051 */
+  {    99,     25,     12,      0,      0,  12288,    122, }, /* 1052 */
+  {    99,     17,     12,      0,      0,  12288,    328, }, /* 1053 */
+  {    99,     25,     12,      0,      0,  28672,    330, }, /* 1054 */
+  {    99,     21,     12,      0,      0,  28672,    322, }, /* 1055 */
+  {    99,     21,     12,      0,      0,  28672,    332, }, /* 1056 */
+  {    99,     17,     12,      0,      0,  12288,    130, }, /* 1057 */
+  {    99,     21,     12,      0,      0,   8192,     74, }, /* 1058 */
+  {    99,     13,     12,      0,      0,  10240,    334, }, /* 1059 */
+  {     0,      9,     12,      0,     32,  18432,    336, }, /* 1060 */
+  {    99,     24,     12,      0,      0,  28672,    338, }, /* 1061 */
+  {     0,      5,     12,      0,    -32,  18432,    340, }, /* 1062 */
+  {    99,     21,     12,      0,      0,  29036,    128, }, /* 1063 */
+  {    99,     22,     12,      0,      0,  29036,    342, }, /* 1064 */
+  {    99,     18,     12,      0,      0,  29036,    342, }, /* 1065 */
+  {    99,     21,     12,      0,      0,  29036,    110, }, /* 1066 */
+  {    99,      6,      3,      0,      0,  18804,    344, }, /* 1067 */
+  {    99,      1,      2,      0,      0,  28672,    346, }, /* 1068 */
+  {    39,      7,     12,      0,      0,  18432,     84, }, /* 1069 */
+  {    99,     21,     12,      0,      0,  18856,     74, }, /* 1070 */
+  {    99,     21,     12,      0,      0,  29096,     74, }, /* 1071 */
+  {    99,     21,     12,      0,      0,  18860,     74, }, /* 1072 */
+  {    99,     15,     12,      0,      0,  18864,     74, }, /* 1073 */
+  {    99,     26,     12,      0,      0,  18860,     74, }, /* 1074 */
+  {     1,     14,     12,      0,      0,  28672,     84, }, /* 1075 */
+  {     1,     15,     12,      0,      0,  28672,     74, }, /* 1076 */
+  {     1,     26,     12,      0,      0,  28672,     74, }, /* 1077 */
+  {     1,     26,     12,      0,      0,  18432,     74, }, /* 1078 */
+  {    50,      7,     12,      0,      0,  18432,     84, }, /* 1079 */
+  {    51,      7,     12,      0,      0,  18432,     84, }, /* 1080 */
+  {   106,     12,      3,      0,      0,  27060,     98, }, /* 1081 */
+  {    99,     15,     12,      0,      0,  10676,     74, }, /* 1082 */
+  {   104,      7,     12,      0,      0,  18432,     84, }, /* 1083 */
+  {   104,     15,     12,      0,      0,  18432,     74, }, /* 1084 */
+  {    32,      7,     12,      0,      0,  18432,     84, }, /* 1085 */
+  {    32,     14,     12,      0,      0,  18432,     84, }, /* 1086 */
+  {    73,      7,     12,      0,      0,  18432,     84, }, /* 1087 */
+  {    73,     12,      3,      0,      0,  26624,    106, }, /* 1088 */
+  {   107,      7,     12,      0,      0,  18432,     84, }, /* 1089 */
+  {   107,     21,     12,      0,      0,  18432,    110, }, /* 1090 */
+  {   111,      7,     12,      0,      0,  18432,     84, }, /* 1091 */
+  {   111,     21,     12,      0,      0,  18432,    110, }, /* 1092 */
+  {   111,     14,     12,      0,      0,  18432,     84, }, /* 1093 */
+  {   105,      9,     12,      0,     40,  18432,     76, }, /* 1094 */
+  {   105,      5,     12,      0,    -40,  18432,     78, }, /* 1095 */
+  {    40,      7,     12,      0,      0,  18432,     84, }, /* 1096 */
+  {   108,      7,     12,      0,      0,  18432,     84, }, /* 1097 */
+  {   108,     13,     12,      0,      0,  18432,    144, }, /* 1098 */
+  {    80,      9,     12,      0,     40,  18432,     76, }, /* 1099 */
+  {    80,      5,     12,      0,    -40,  18432,     78, }, /* 1100 */
+  {    66,      7,     12,      0,      0,  18432,     84, }, /* 1101 */
+  {    64,      7,     12,      0,      0,  18432,     84, }, /* 1102 */
+  {    64,     21,     12,      0,      0,  18432,     74, }, /* 1103 */
+  {   167,      9,     12,      0,     39,  18432,     76, }, /* 1104 */
+  {   167,      5,     12,      0,    -39,  18432,     78, }, /* 1105 */
+  {    96,      7,     12,      0,      0,  18432,     84, }, /* 1106 */
+  {    69,      7,     12,      0,      0,  18432,     84, }, /* 1107 */
+  {     0,      6,     12,      0,      0,  18432,     96, }, /* 1108 */
+  {    41,      7,     12,      0,      0,  34816,     84, }, /* 1109 */
+  {   128,      7,     12,      0,      0,  34816,     84, }, /* 1110 */
+  {   128,     21,     12,      0,      0,  34816,    110, }, /* 1111 */
+  {   128,     15,     12,      0,      0,  34816,     74, }, /* 1112 */
+  {   143,      7,     12,      0,      0,  34816,     84, }, /* 1113 */
+  {   143,     26,     12,      0,      0,  34816,     74, }, /* 1114 */
+  {   143,     15,     12,      0,      0,  34816,     74, }, /* 1115 */
+  {   142,      7,     12,      0,      0,  34816,     84, }, /* 1116 */
+  {   142,     15,     12,      0,      0,  34816,     74, }, /* 1117 */
+  {   149,      7,     12,      0,      0,  34816,     84, }, /* 1118 */
+  {   149,     15,     12,      0,      0,  34816,     74, }, /* 1119 */
+  {   115,      7,     12,      0,      0,  34816,     84, }, /* 1120 */
+  {   115,     15,     12,      0,      0,  34816,     74, }, /* 1121 */
+  {   115,     21,     12,      0,      0,  28672,    110, }, /* 1122 */
+  {    52,      7,     12,      0,      0,  34816,     84, }, /* 1123 */
+  {    52,     21,     12,      0,      0,  34816,     74, }, /* 1124 */
+  {    61,      7,     12,      0,      0,  34816,     84, }, /* 1125 */
+  {   134,      7,     12,      0,      0,  34816,     84, }, /* 1126 */
+  {   134,     15,     12,      0,      0,  34816,     74, }, /* 1127 */
+  {   112,      7,     12,      0,      0,  34816,     84, }, /* 1128 */
+  {   112,     12,      3,      0,      0,  26624,    106, }, /* 1129 */
+  {   112,     12,      3,      0,      0,  26624,     98, }, /* 1130 */
+  {   112,     12,      3,      0,      0,  26624,    158, }, /* 1131 */
+  {   112,     15,     12,      0,      0,  34816,     74, }, /* 1132 */
+  {   112,     21,     12,      0,      0,  34816,     74, }, /* 1133 */
+  {   112,     21,     12,      0,      0,  34816,    128, }, /* 1134 */
+  {   129,      7,     12,      0,      0,  34816,     84, }, /* 1135 */
+  {   129,     15,     12,      0,      0,  34816,     74, }, /* 1136 */
+  {   129,     21,     12,      0,      0,  34816,     74, }, /* 1137 */
+  {   141,      7,     12,      0,      0,  34816,     84, }, /* 1138 */
+  {   141,     15,     12,      0,      0,  34816,     74, }, /* 1139 */
+  {    71,      7,     12,      0,      0,  34816,     84, }, /* 1140 */
+  {    71,     26,     12,      0,      0,  34816,     74, }, /* 1141 */
+  {    71,     12,      3,      0,      0,  26624,     98, }, /* 1142 */
+  {    71,     15,     12,      0,      0,  34816,     74, }, /* 1143 */
+  {    71,     21,     12,      0,      0,  34816,    110, }, /* 1144 */
+  {    71,     21,     12,      0,      0,  35256,    110, }, /* 1145 */
+  {    71,     21,     12,      0,      0,  34816,     74, }, /* 1146 */
+  {    53,      7,     12,      0,      0,  34816,     84, }, /* 1147 */
+  {    53,     21,     12,      0,      0,  28672,     74, }, /* 1148 */
+  {    53,     21,     12,      0,      0,  28672,    110, }, /* 1149 */
+  {   130,      7,     12,      0,      0,  34816,     84, }, /* 1150 */
+  {   130,     15,     12,      0,      0,  34816,     74, }, /* 1151 */
+  {   131,      7,     12,      0,      0,  34816,     84, }, /* 1152 */
+  {   131,     15,     12,      0,      0,  34816,     74, }, /* 1153 */
+  {    74,      7,     12,      0,      0,  34816,     84, }, /* 1154 */
+  {    74,     21,     12,      0,      0,  34816,    110, }, /* 1155 */
+  {    74,     15,     12,      0,      0,  34816,     74, }, /* 1156 */
+  {    57,      7,     12,      0,      0,  34816,     84, }, /* 1157 */
+  {    78,      9,     12,      0,     64,  34816,     76, }, /* 1158 */
+  {    78,      5,     12,      0,    -64,  34816,     78, }, /* 1159 */
+  {    78,     15,     12,      0,      0,  34816,     74, }, /* 1160 */
+  {    85,      7,     12,      0,      0,      0,     84, }, /* 1161 */
+  {    85,      7,     12,      0,      0,      0,    314, }, /* 1162 */
+  {    85,     12,      3,      0,      0,  26624,    132, }, /* 1163 */
+  {    85,     13,     12,      0,      0,   2048,    144, }, /* 1164 */
+  {    92,     13,     12,      0,      0,   2048,    144, }, /* 1165 */
+  {    92,      7,     12,      0,      0,  34816,     84, }, /* 1166 */
+  {    92,      6,     12,      0,      0,  34816,     96, }, /* 1167 */
+  {    92,      9,     12,      0,     32,  34816,     76, }, /* 1168 */
+  {    92,     12,      3,      0,      0,  26624,    132, }, /* 1169 */
+  {    92,     12,      3,      0,      0,  26624,    164, }, /* 1170 */
+  {    92,     12,      3,      0,      0,  26624,     98, }, /* 1171 */
+  {    92,     17,     12,      0,      0,  28672,    130, }, /* 1172 */
+  {    92,      6,     12,      0,      0,  34816,    138, }, /* 1173 */
+  {    92,      5,     12,      0,    -32,  34816,     78, }, /* 1174 */
+  {    92,     25,     12,      0,      0,  34816,    122, }, /* 1175 */
+  {     5,     15,     12,      0,      0,   2048,     74, }, /* 1176 */
+  {    88,      7,     12,      0,      0,  34816,     84, }, /* 1177 */
+  {    88,     12,      3,      0,      0,  26624,    106, }, /* 1178 */
+  {    88,     17,     12,      0,      0,  34816,    130, }, /* 1179 */
+  {   159,      7,     12,      0,      0,  34816,     84, }, /* 1180 */
+  {   159,     15,     12,      0,      0,  34816,     74, }, /* 1181 */
+  {    86,      7,     12,      0,      0,      0,     84, }, /* 1182 */
+  {    86,     12,      3,      0,      0,  26624,     98, }, /* 1183 */
+  {    86,     15,     12,      0,      0,      0,     74, }, /* 1184 */
+  {    86,     21,     12,      0,      0,      0,    128, }, /* 1185 */
+  {    90,      7,     12,      0,      0,  34816,     84, }, /* 1186 */
+  {    90,     12,      3,      0,      0,  26624,     98, }, /* 1187 */
+  {    90,     21,     12,      0,      0,  34816,    128, }, /* 1188 */
+  {   163,      7,     12,      0,      0,  34816,     84, }, /* 1189 */
+  {   163,     15,     12,      0,      0,  34816,     74, }, /* 1190 */
+  {   160,      7,     12,      0,      0,  34816,     84, }, /* 1191 */
+  {   133,     10,      5,      0,      0,  18432,    154, }, /* 1192 */
+  {   133,     12,      3,      0,      0,  26624,    106, }, /* 1193 */
+  {   133,      7,     12,      0,      0,  18432,     84, }, /* 1194 */
+  {   133,     12,      3,      0,      0,  26624,    158, }, /* 1195 */
+  {   133,     21,     12,      0,      0,  18432,    128, }, /* 1196 */
+  {   133,     21,     12,      0,      0,  18432,    110, }, /* 1197 */
+  {   133,     15,     12,      0,      0,  28672,     74, }, /* 1198 */
+  {   133,     13,     12,      0,      0,  18432,    144, }, /* 1199 */
+  {   133,     12,      3,      0,      0,  26624,    290, }, /* 1200 */
+  {    58,     12,      3,      0,      0,  26624,    106, }, /* 1201 */
+  {    58,     10,      5,      0,      0,  18432,    154, }, /* 1202 */
+  {    58,      7,     12,      0,      0,  18432,     84, }, /* 1203 */
+  {    58,     12,      3,      0,      0,  26624,    158, }, /* 1204 */
+  {    58,     12,      3,      0,      0,  26624,     98, }, /* 1205 */
+  {    58,     21,     12,      0,      0,  18432,     74, }, /* 1206 */
+  {    58,      1,      4,      0,      0,  18432,    134, }, /* 1207 */
+  {    58,     21,     12,      0,      0,  18432,    128, }, /* 1208 */
+  {   136,      7,     12,      0,      0,  18432,     84, }, /* 1209 */
+  {   136,     13,     12,      0,      0,  18432,    144, }, /* 1210 */
+  {    60,     12,      3,      0,      0,  26624,    106, }, /* 1211 */
+  {    60,      7,     12,      0,      0,  18432,     84, }, /* 1212 */
+  {    60,     10,      5,      0,      0,  18432,    154, }, /* 1213 */
+  {    60,     12,      3,      0,      0,  26624,    158, }, /* 1214 */
+  {    60,     13,     12,      0,      0,  18432,    144, }, /* 1215 */
+  {    60,     21,     12,      0,      0,  18432,     74, }, /* 1216 */
+  {    60,     21,     12,      0,      0,  18432,    128, }, /* 1217 */
+  {    70,      7,     12,      0,      0,  18432,     84, }, /* 1218 */
+  {    70,     12,      3,      0,      0,  26624,     98, }, /* 1219 */
+  {    70,     21,     12,      0,      0,  18432,     74, }, /* 1220 */
+  {    62,     12,      3,      0,      0,  26624,    106, }, /* 1221 */
+  {    62,     10,      5,      0,      0,  18432,    154, }, /* 1222 */
+  {    62,      7,     12,      0,      0,  18432,     84, }, /* 1223 */
+  {    62,     10,      3,      0,      0,  18432,    188, }, /* 1224 */
+  {    62,      7,      4,      0,      0,  18432,     84, }, /* 1225 */
+  {    62,     21,     12,      0,      0,  18432,    128, }, /* 1226 */
+  {    62,     21,     12,      0,      0,  18432,     74, }, /* 1227 */
+  {    62,     12,      3,      0,      0,  26624,    104, }, /* 1228 */
+  {    62,     12,      3,      0,      0,  26624,     98, }, /* 1229 */
+  {    62,     13,     12,      0,      0,  18432,    144, }, /* 1230 */
+  {    17,     15,     12,      0,      0,  18432,     74, }, /* 1231 */
+  {    68,      7,     12,      0,      0,  18432,     84, }, /* 1232 */
+  {    68,     10,      5,      0,      0,  18432,    154, }, /* 1233 */
+  {    68,     12,      3,      0,      0,  26624,    106, }, /* 1234 */
+  {    68,     10,      3,      0,      0,  18432,    188, }, /* 1235 */
+  {    68,     12,      3,      0,      0,  26624,     98, }, /* 1236 */
+  {    68,     12,      3,      0,      0,  26624,    162, }, /* 1237 */
+  {    68,     21,     12,      0,      0,  18432,    128, }, /* 1238 */
+  {    68,     21,     12,      0,      0,  18432,    110, }, /* 1239 */
+  {    68,     21,     12,      0,      0,  18432,     74, }, /* 1240 */
+  {    77,      7,     12,      0,      0,  18432,     84, }, /* 1241 */
+  {    77,     21,     12,      0,      0,  18432,    128, }, /* 1242 */
+  {    75,      7,     12,      0,      0,  18432,     84, }, /* 1243 */
+  {    75,     12,      3,      0,      0,  26624,    106, }, /* 1244 */
+  {    75,     10,      5,      0,      0,  18432,    154, }, /* 1245 */
+  {    75,     12,      3,      0,      0,  26624,     98, }, /* 1246 */
+  {    75,     12,      3,      0,      0,  26624,    158, }, /* 1247 */
+  {    75,     13,     12,      0,      0,  18432,    144, }, /* 1248 */
+  {    67,     12,      3,      0,      0,  26624,    106, }, /* 1249 */
+  {    67,     12,      3,      0,      0,  26836,    106, }, /* 1250 */
+  {    67,     10,      5,      0,      0,  18432,    154, }, /* 1251 */
+  {    67,     10,      5,      0,      0,  18644,    154, }, /* 1252 */
+  {    67,      7,     12,      0,      0,  18432,     84, }, /* 1253 */
+  {   106,     12,      3,      0,      0,  26836,     98, }, /* 1254 */
+  {    67,     12,      3,      0,      0,  26836,     98, }, /* 1255 */
+  {    67,     10,      3,      0,      0,  18432,    160, }, /* 1256 */
+  {    67,     10,      3,      0,      0,  18432,    188, }, /* 1257 */
+  {    67,      7,     12,      0,      0,  18432,    348, }, /* 1258 */
+  {    67,     12,      3,      0,      0,  26624,     98, }, /* 1259 */
+  {    97,      7,     12,      0,      0,  18432,     84, }, /* 1260 */
+  {    97,     10,      3,      0,      0,  18432,    160, }, /* 1261 */
+  {    97,     10,      5,      0,      0,  18432,    154, }, /* 1262 */
+  {    97,     12,      3,      0,      0,  26624,    106, }, /* 1263 */
+  {    97,     12,      3,      0,      0,  26624,    158, }, /* 1264 */
+  {    97,     10,      3,      0,      0,  18432,    188, }, /* 1265 */
+  {    97,      7,      4,      0,      0,  18432,     84, }, /* 1266 */
+  {    97,     12,      3,      0,      0,  26624,    164, }, /* 1267 */
+  {    97,      7,     12,      0,      0,  18432,    350, }, /* 1268 */
+  {    97,     21,     12,      0,      0,  18432,    128, }, /* 1269 */
+  {    97,     21,     12,      0,      0,  18432,     74, }, /* 1270 */
+  {    97,     12,      3,      0,      0,  26624,     98, }, /* 1271 */
+  {   153,      7,     12,      0,      0,  18432,     84, }, /* 1272 */
+  {   153,     10,      5,      0,      0,  18432,    154, }, /* 1273 */
+  {   153,     12,      3,      0,      0,  26624,    106, }, /* 1274 */
+  {   153,     12,      3,      0,      0,  26624,    158, }, /* 1275 */
+  {   153,     12,      3,      0,      0,  26624,     98, }, /* 1276 */
+  {   153,     21,     12,      0,      0,  18432,    128, }, /* 1277 */
+  {   153,     21,     12,      0,      0,  18432,    110, }, /* 1278 */
+  {   153,     21,     12,      0,      0,  18432,     74, }, /* 1279 */
+  {   153,     13,     12,      0,      0,  18432,    144, }, /* 1280 */
+  {   153,     12,      3,      0,      0,  26624,    104, }, /* 1281 */
+  {    76,      7,     12,      0,      0,  18432,     84, }, /* 1282 */
+  {    76,     10,      3,      0,      0,  18432,    160, }, /* 1283 */
+  {    76,     10,      5,      0,      0,  18432,    154, }, /* 1284 */
+  {    76,     12,      3,      0,      0,  26624,    106, }, /* 1285 */
+  {    76,     12,      3,      0,      0,  26624,    158, }, /* 1286 */
+  {    76,     12,      3,      0,      0,  26624,     98, }, /* 1287 */
+  {    76,     21,     12,      0,      0,  18432,     74, }, /* 1288 */
+  {    76,     13,     12,      0,      0,  18432,    144, }, /* 1289 */
+  {   145,      7,     12,      0,      0,  18432,     84, }, /* 1290 */
+  {   145,     10,      3,      0,      0,  18432,    160, }, /* 1291 */
+  {   145,     10,      5,      0,      0,  18432,    154, }, /* 1292 */
+  {   145,     12,      3,      0,      0,  26624,    106, }, /* 1293 */
+  {   145,     12,      3,      0,      0,  26624,    158, }, /* 1294 */
+  {   145,     12,      3,      0,      0,  26624,     98, }, /* 1295 */
+  {   145,     21,     12,      0,      0,  18432,     74, }, /* 1296 */
+  {   145,     21,     12,      0,      0,  18432,    128, }, /* 1297 */
+  {   145,     21,     12,      0,      0,  18432,    110, }, /* 1298 */
+  {   145,     21,     12,      0,      0,  18432,    190, }, /* 1299 */
+  {    72,      7,     12,      0,      0,  18432,     84, }, /* 1300 */
+  {    72,     10,      5,      0,      0,  18432,    154, }, /* 1301 */
+  {    72,     12,      3,      0,      0,  26624,    106, }, /* 1302 */
+  {    72,     12,      3,      0,      0,  26624,    158, }, /* 1303 */
+  {    72,     21,     12,      0,      0,  18432,    128, }, /* 1304 */
+  {    72,     21,     12,      0,      0,  18432,     74, }, /* 1305 */
+  {    72,     13,     12,      0,      0,  18432,    144, }, /* 1306 */
+  {    63,      7,     12,      0,      0,  18432,     84, }, /* 1307 */
+  {    63,     12,      3,      0,      0,  26624,    106, }, /* 1308 */
+  {    63,     10,      5,      0,      0,  18432,    154, }, /* 1309 */
+  {    63,     10,      3,      0,      0,  18432,    188, }, /* 1310 */
+  {    63,     12,      3,      0,      0,  26624,     98, }, /* 1311 */
+  {    63,     21,     12,      0,      0,  18432,     74, }, /* 1312 */
+  {    63,     13,     12,      0,      0,  18432,    144, }, /* 1313 */
+  {   147,      7,     12,      0,      0,  18432,     84, }, /* 1314 */
+  {   147,     12,      3,      0,      0,  26624,    106, }, /* 1315 */
+  {   147,     10,      5,      0,      0,  18432,    154, }, /* 1316 */
+  {   147,     10,     12,      0,      0,  18432,    154, }, /* 1317 */
+  {   147,     12,      3,      0,      0,  26624,    158, }, /* 1318 */
+  {   147,     13,     12,      0,      0,  18432,    144, }, /* 1319 */
+  {   147,     15,     12,      0,      0,  18432,     74, }, /* 1320 */
+  {   147,     21,     12,      0,      0,  18432,    128, }, /* 1321 */
+  {   147,     26,     12,      0,      0,  18432,     74, }, /* 1322 */
+  {    83,      7,     12,      0,      0,  18432,     84, }, /* 1323 */
+  {    83,     10,      5,      0,      0,  18432,    154, }, /* 1324 */
+  {    83,     12,      3,      0,      0,  26624,    106, }, /* 1325 */
+  {    83,     12,      3,      0,      0,  26624,    158, }, /* 1326 */
+  {    83,     12,      3,      0,      0,  26624,     98, }, /* 1327 */
+  {    83,     21,     12,      0,      0,  18432,     74, }, /* 1328 */
+  {   146,      9,     12,      0,     32,  18432,     76, }, /* 1329 */
+  {   146,      5,     12,      0,    -32,  18432,     78, }, /* 1330 */
+  {   146,     13,     12,      0,      0,  18432,    144, }, /* 1331 */
+  {   146,     15,     12,      0,      0,  18432,     74, }, /* 1332 */
+  {   146,      7,     12,      0,      0,  18432,     84, }, /* 1333 */
+  {   164,      7,     12,      0,      0,  18432,     84, }, /* 1334 */
+  {   164,     10,      3,      0,      0,  18432,    160, }, /* 1335 */
+  {   164,     10,      5,      0,      0,  18432,    154, }, /* 1336 */
+  {   164,     12,      3,      0,      0,  26624,    106, }, /* 1337 */
+  {   164,     10,      3,      0,      0,  18432,    188, }, /* 1338 */
+  {   164,     12,      3,      0,      0,  26624,    158, }, /* 1339 */
+  {   164,      7,      4,      0,      0,  18432,     84, }, /* 1340 */
+  {   164,     12,      3,      0,      0,  26624,     98, }, /* 1341 */
+  {   164,     21,     12,      0,      0,  18432,    128, }, /* 1342 */
+  {   164,     21,     12,      0,      0,  18432,     74, }, /* 1343 */
+  {   164,     13,     12,      0,      0,  18432,    144, }, /* 1344 */
+  {    87,      7,     12,      0,      0,  18432,     84, }, /* 1345 */
+  {    87,     10,      5,      0,      0,  18432,    154, }, /* 1346 */
+  {    87,     12,      3,      0,      0,  26624,    106, }, /* 1347 */
+  {    87,     12,      3,      0,      0,  26624,    158, }, /* 1348 */
+  {    87,     21,     12,      0,      0,  18432,     74, }, /* 1349 */
+  {   156,      7,     12,      0,      0,  18432,     84, }, /* 1350 */
+  {   156,     12,      3,      0,      0,  26624,    106, }, /* 1351 */
+  {   156,     12,      3,      0,      0,  18432,    106, }, /* 1352 */
+  {   156,     12,      3,      0,      0,  26624,    104, }, /* 1353 */
+  {   156,     12,      3,      0,      0,  26624,    158, }, /* 1354 */
+  {   156,     10,      5,      0,      0,  18432,    154, }, /* 1355 */
+  {   156,      7,      4,      0,      0,  18432,     84, }, /* 1356 */
+  {   156,     21,     12,      0,      0,  18432,     74, }, /* 1357 */
+  {   156,     21,     12,      0,      0,  18432,    128, }, /* 1358 */
+  {   155,      7,     12,      0,      0,  18432,     84, }, /* 1359 */
+  {   155,     12,      3,      0,      0,  26624,    106, }, /* 1360 */
+  {   155,     10,      5,      0,      0,  18432,    154, }, /* 1361 */
+  {   155,      7,      4,      0,      0,  18432,     84, }, /* 1362 */
+  {   155,     12,      3,      0,      0,  26624,    352, }, /* 1363 */
+  {   155,     12,      3,      0,      0,  26624,    158, }, /* 1364 */
+  {   155,     21,     12,      0,      0,  18432,     74, }, /* 1365 */
+  {   155,     21,     12,      0,      0,  18432,    128, }, /* 1366 */
+  {   155,     21,     12,      0,      0,  18432,    110, }, /* 1367 */
+  {   144,      7,     12,      0,      0,  18432,     84, }, /* 1368 */
+  {    95,      7,     12,      0,      0,  18432,     84, }, /* 1369 */
+  {    95,     21,     12,      0,      0,  18432,     74, }, /* 1370 */
+  {    95,     13,     12,      0,      0,  18432,    144, }, /* 1371 */
+  {   151,      7,     12,      0,      0,  18432,     84, }, /* 1372 */
+  {   151,     10,      5,      0,      0,  18432,    154, }, /* 1373 */
+  {   151,     12,      3,      0,      0,  26624,    106, }, /* 1374 */
+  {   151,     12,      3,      0,      0,  18432,    158, }, /* 1375 */
+  {   151,     21,     12,      0,      0,  18432,    128, }, /* 1376 */
+  {   151,     21,     12,      0,      0,  18432,    110, }, /* 1377 */
+  {   151,     21,     12,      0,      0,  18432,     74, }, /* 1378 */
+  {   151,     13,     12,      0,      0,  18432,    144, }, /* 1379 */
+  {   151,     15,     12,      0,      0,  18432,     74, }, /* 1380 */
+  {   152,     21,     12,      0,      0,  18432,     74, }, /* 1381 */
+  {   152,     21,     12,      0,      0,  18432,    110, }, /* 1382 */
+  {   152,      7,     12,      0,      0,  18432,     84, }, /* 1383 */
+  {   152,     12,      3,      0,      0,  26624,    106, }, /* 1384 */
+  {   152,     10,      5,      0,      0,  18432,    154, }, /* 1385 */
+  {    82,      7,     12,      0,      0,  18432,     84, }, /* 1386 */
+  {    82,     12,      3,      0,      0,  26624,    106, }, /* 1387 */
+  {    82,     12,      3,      0,      0,  26624,     98, }, /* 1388 */
+  {    82,     12,      3,      0,      0,  26624,    158, }, /* 1389 */
+  {    82,      7,      4,      0,      0,  18432,     84, }, /* 1390 */
+  {    82,     13,     12,      0,      0,  18432,    144, }, /* 1391 */
+  {    84,      7,     12,      0,      0,  18432,     84, }, /* 1392 */
+  {    84,     10,      5,      0,      0,  18432,    154, }, /* 1393 */
+  {    84,     12,      3,      0,      0,  26624,    106, }, /* 1394 */
+  {    84,     12,      3,      0,      0,  26624,    158, }, /* 1395 */
+  {    84,     13,     12,      0,      0,  18432,    144, }, /* 1396 */
+  {   157,      7,     12,      0,      0,  18432,     84, }, /* 1397 */
+  {   157,     12,      3,      0,      0,  26624,    106, }, /* 1398 */
+  {   157,     10,      5,      0,      0,  18432,    154, }, /* 1399 */
+  {   157,     21,     12,      0,      0,  18432,    128, }, /* 1400 */
+  {   168,     12,      3,      0,      0,  26624,    106, }, /* 1401 */
+  {   168,      7,      4,      0,      0,  18432,     84, }, /* 1402 */
+  {   168,     10,      5,      0,      0,  18432,    154, }, /* 1403 */
+  {   168,      7,     12,      0,      0,  18432,     84, }, /* 1404 */
+  {   168,     10,      3,      0,      0,  18432,    188, }, /* 1405 */
+  {   168,     12,      3,      0,      0,  26624,    158, }, /* 1406 */
+  {   168,     21,     12,      0,      0,  18432,    128, }, /* 1407 */
+  {   168,     21,     12,      0,      0,  18432,     74, }, /* 1408 */
+  {   168,     13,     12,      0,      0,  18432,    144, }, /* 1409 */
+  {   168,     12,      3,      0,      0,  26624,     98, }, /* 1410 */
+  {    13,     15,     12,      0,      0,  18432,     74, }, /* 1411 */
+  {    13,     21,     12,      0,      0,  18432,     74, }, /* 1412 */
+  {   114,      7,     12,      0,      0,  18432,     84, }, /* 1413 */
+  {   114,     14,     12,      0,      0,  18432,     84, }, /* 1414 */
+  {   114,     21,     12,      0,      0,  18432,    110, }, /* 1415 */
+  {    89,      7,     12,      0,      0,  18432,     84, }, /* 1416 */
+  {    89,     21,     12,      0,      0,  18432,     74, }, /* 1417 */
+  {   125,      7,     12,      0,      0,  18432,     84, }, /* 1418 */
+  {   125,      1,      2,      0,      0,  18432,    346, }, /* 1419 */
+  {   125,     12,      3,      0,      0,  26624,    104, }, /* 1420 */
+  {   125,     12,      3,      0,      0,  26624,     98, }, /* 1421 */
+  {   148,      7,     12,      0,      0,  18432,     84, }, /* 1422 */
+  {    93,      7,     12,      0,      0,  18432,     84, }, /* 1423 */
+  {    93,     12,      3,      0,      0,  26624,    106, }, /* 1424 */
+  {    93,     10,      5,      0,      0,  18432,    154, }, /* 1425 */
+  {    93,     12,      3,      0,      0,  26624,    158, }, /* 1426 */
+  {    93,     13,     12,      0,      0,  18432,    144, }, /* 1427 */
+  {   140,      7,     12,      0,      0,  18432,     84, }, /* 1428 */
+  {   140,     13,     12,      0,      0,  18432,    144, }, /* 1429 */
+  {   140,     21,     12,      0,      0,  18432,    128, }, /* 1430 */
+  {   166,      7,     12,      0,      0,  18432,     84, }, /* 1431 */
+  {   166,     13,     12,      0,      0,  18432,    144, }, /* 1432 */
+  {   137,      7,     12,      0,      0,  18432,     84, }, /* 1433 */
+  {   137,     12,      3,      0,      0,  26624,     98, }, /* 1434 */
+  {   137,     21,     12,      0,      0,  18432,    128, }, /* 1435 */
+  {   138,      7,     12,      0,      0,  18432,     84, }, /* 1436 */
+  {   138,     12,      3,      0,      0,  26624,     98, }, /* 1437 */
+  {   138,     21,     12,      0,      0,  18432,    128, }, /* 1438 */
+  {   138,     21,     12,      0,      0,  18432,    110, }, /* 1439 */
+  {   138,     21,     12,      0,      0,  18432,     74, }, /* 1440 */
+  {   138,     26,     12,      0,      0,  18432,     74, }, /* 1441 */
+  {   138,      6,     12,      0,      0,  18432,    148, }, /* 1442 */
+  {   138,      6,     12,      0,      0,  18432,    138, }, /* 1443 */
+  {   138,     13,     12,      0,      0,  18432,    144, }, /* 1444 */
+  {   138,     15,     12,      0,      0,  18432,     74, }, /* 1445 */
+  {   170,      6,     12,      0,      0,  18432,    148, }, /* 1446 */
+  {   170,      7,     12,      0,      0,  18432,     84, }, /* 1447 */
+  {   170,      7,      7,      0,      0,  18432,     84, }, /* 1448 */
+  {   170,      6,     12,      0,      0,  18432,     94, }, /* 1449 */
+  {   170,     21,     12,      0,      0,  18432,     74, }, /* 1450 */
+  {   170,     21,     12,      0,      0,  18432,    128, }, /* 1451 */
+  {   170,     13,     12,      0,      0,  18432,    144, }, /* 1452 */
+  {   158,      9,     12,      0,     32,  18432,     76, }, /* 1453 */
+  {   158,      5,     12,      0,    -32,  18432,     78, }, /* 1454 */
+  {   158,     15,     12,      0,      0,  18432,     74, }, /* 1455 */
+  {   158,     21,     12,      0,      0,  18432,    110, }, /* 1456 */
+  {   158,     21,     12,      0,      0,  18432,    128, }, /* 1457 */
+  {   158,     21,     12,      0,      0,  18432,     74, }, /* 1458 */
+  {   135,      7,     12,      0,      0,  18432,     84, }, /* 1459 */
+  {   135,     12,      3,      0,      0,  26624,    106, }, /* 1460 */
+  {   135,     10,      5,      0,      0,  18432,    154, }, /* 1461 */
+  {   135,     12,      3,      0,      0,  26624,    132, }, /* 1462 */
+  {   135,      6,     12,      0,      0,  18432,     94, }, /* 1463 */
+  {    81,      6,     12,      0,      0,  18432,    138, }, /* 1464 */
+  {   154,      6,     12,      0,      0,  18432,    138, }, /* 1465 */
+  {    30,     21,     12,      0,      0,  28672,     74, }, /* 1466 */
+  {   165,     12,      3,      0,      0,  26624,    354, }, /* 1467 */
+  {    30,     10,      3,      0,      0,  18432,    356, }, /* 1468 */
+  {    81,      7,     12,      0,      0,  18432,    304, }, /* 1469 */
+  {   165,      7,     12,      0,      0,  18432,    304, }, /* 1470 */
+  {    28,      6,     12,      0,      0,  18432,     94, }, /* 1471 */
+  {   154,      7,     12,      0,      0,  18432,    304, }, /* 1472 */
+  {    65,      7,     12,      0,      0,  18432,     84, }, /* 1473 */
+  {    65,     26,     12,      0,      0,  18432,     74, }, /* 1474 */
+  {    65,     12,      3,      0,      0,  26624,    104, }, /* 1475 */
+  {    65,     12,      3,      0,      0,  26624,    106, }, /* 1476 */
+  {    65,     21,     12,      0,      0,  18432,    128, }, /* 1477 */
+  {    99,      1,      2,      0,      0,   6472,     66, }, /* 1478 */
+  {    99,     13,     12,      0,      0,  10240,    144, }, /* 1479 */
+  {    99,     10,      3,      0,      0,  18432,    358, }, /* 1480 */
+  {    99,     10,      3,      0,      0,  18432,    306, }, /* 1481 */
+  {     1,     12,      3,      0,      0,  26624,    104, }, /* 1482 */
+  {    99,     25,     12,      0,      0,  28672,    360, }, /* 1483 */
+  {    99,     13,     12,      0,      0,  10240,    226, }, /* 1484 */
+  {   150,     26,     12,      0,      0,  18432,     74, }, /* 1485 */
+  {   150,     12,      3,      0,      0,  26624,    104, }, /* 1486 */
+  {   150,     21,     12,      0,      0,  18432,    110, }, /* 1487 */
+  {   150,     21,     12,      0,      0,  18432,    128, }, /* 1488 */
+  {   150,     21,     12,      0,      0,  18432,     74, }, /* 1489 */
+  {    44,     12,      3,      0,      0,  26624,    106, }, /* 1490 */
+  {     2,      6,     12,      0,      0,  18432,     92, }, /* 1491 */
+  {   161,      7,     12,      0,      0,  18432,     84, }, /* 1492 */
+  {   161,     12,      3,      0,      0,  26624,     98, }, /* 1493 */
+  {   161,      6,     12,      0,      0,  18432,    148, }, /* 1494 */
+  {   161,      6,     12,      0,      0,  18432,    138, }, /* 1495 */
+  {   161,     13,     12,      0,      0,  18432,    144, }, /* 1496 */
+  {   161,     26,     12,      0,      0,  18432,     74, }, /* 1497 */
+  {    91,      7,     12,      0,      0,  18432,     84, }, /* 1498 */
+  {    91,     12,      3,      0,      0,  26624,     98, }, /* 1499 */
+  {   162,      7,     12,      0,      0,  18432,     84, }, /* 1500 */
+  {   162,     12,      3,      0,      0,  26624,     98, }, /* 1501 */
+  {   162,     13,     12,      0,      0,  18432,    144, }, /* 1502 */
+  {   162,     23,     12,      0,      0,  14336,     74, }, /* 1503 */
+  {   169,      7,     12,      0,      0,  18432,     84, }, /* 1504 */
+  {   169,      6,     12,      0,      0,  18432,    148, }, /* 1505 */
+  {   169,     12,      3,      0,      0,  26624,    104, }, /* 1506 */
+  {   169,     13,     12,      0,      0,  18432,    144, }, /* 1507 */
+  {    94,      7,     12,      0,      0,  18432,     84, }, /* 1508 */
+  {    94,     12,      3,      0,      0,  26624,     98, }, /* 1509 */
+  {    94,     12,      3,      0,      0,  26624,    164, }, /* 1510 */
+  {    94,     13,     12,      0,      0,  18432,    144, }, /* 1511 */
+  {    94,     21,     12,      0,      0,  18432,     74, }, /* 1512 */
+  {   139,      7,     12,      0,      0,  34816,     84, }, /* 1513 */
+  {   139,     15,     12,      0,      0,  34816,     74, }, /* 1514 */
+  {   139,     12,      3,      0,      0,  26624,     98, }, /* 1515 */
+  {    79,      9,     12,      0,     34,  34816,     76, }, /* 1516 */
+  {    79,      5,     12,      0,    -34,  34816,     78, }, /* 1517 */
+  {    79,     12,      3,      0,      0,  26624,    164, }, /* 1518 */
+  {    79,     12,      3,      0,      0,  26624,    106, }, /* 1519 */
+  {    79,     12,      3,      0,      0,  26624,     98, }, /* 1520 */
+  {    79,      6,     12,      0,      0,  34816,    148, }, /* 1521 */
+  {    79,     13,     12,      0,      0,  34816,    144, }, /* 1522 */
+  {    79,     21,     12,      0,      0,  34816,     74, }, /* 1523 */
+  {    99,     15,     12,      0,      0,      0,     74, }, /* 1524 */
+  {    99,     26,     12,      0,      0,      0,     74, }, /* 1525 */
+  {    99,     23,     12,      0,      0,      0,     74, }, /* 1526 */
+  {     5,      7,     12,      0,      0,      0,    254, }, /* 1527 */
+  {    99,     26,     14,      0,      0,  28672,    362, }, /* 1528 */
+  {    99,     26,     14,      0,      0,  28672,    364, }, /* 1529 */
+  {    98,      2,     14,      0,      0,  18432,    366, }, /* 1530 */
+  {    99,     26,     12,      0,      0,  18432,    368, }, /* 1531 */
+  {    99,     26,     14,      0,      0,  18432,    370, }, /* 1532 */
+  {    99,     26,     14,      0,      0,  18432,    364, }, /* 1533 */
+  {    99,     26,     11,      0,      0,  18432,    372, }, /* 1534 */
+  {    27,     26,     12,      0,      0,  18432,     74, }, /* 1535 */
+  {    99,     26,     14,      0,      0,  18432,    250, }, /* 1536 */
+  {    99,     26,     14,      0,      0,  18784,    364, }, /* 1537 */
+  {    99,     26,     14,      0,      0,  28672,    374, }, /* 1538 */
+  {    99,     26,     14,      0,      0,  28672,    376, }, /* 1539 */
+  {    99,     24,      3,      0,      0,  28672,    378, }, /* 1540 */
+  {    99,     26,     14,      0,      0,  28672,    380, }, /* 1541 */
+  {    99,      1,      3,      0,      0,   6144,    382, }, /* 1542 */
 };
 
 const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
@@ -1885,36 +2129,36 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 128,128,129,129,130,131,132,133,134,135,136,137,138,139,140,141, /* U+F800 */
 142,143,144,145,146,147,148,149,150,151,152,153,154,154,155,156, /* U+10000 */
 157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172, /* U+10800 */
-173,174,175,176,177,178,179,146,180,181,146,182,183,184,185,146, /* U+11000 */
-186,187,188,189,190,191,192,146,193,194,195,196,146,197,198,199, /* U+11800 */
-200,200,200,200,200,200,200,201,202,200,203,146,146,146,146,146, /* U+12000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,204, /* U+12800 */
-205,205,205,205,205,205,205,205,206,146,146,146,146,146,146,146, /* U+13000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+13800 */
-146,146,146,146,146,146,146,146,207,207,207,207,208,146,146,146, /* U+14000 */
+173,174,175,176,177,178,179,180,181,182,146,183,184,185,186,146, /* U+11000 */
+187,188,189,190,191,192,193,194,195,196,197,198,146,199,200,201, /* U+11800 */
+202,202,202,202,202,202,202,203,204,202,205,146,146,146,146,146, /* U+12000 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,206, /* U+12800 */
+207,207,207,207,207,207,207,207,208,207,207,207,207,207,207,207, /* U+13000 */
+207,207,207,207,207,207,207,207,207,207,207,207,207,207,207,207, /* U+13800 */
+207,207,207,207,207,207,207,209,210,210,210,210,211,146,146,146, /* U+14000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+14800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+15000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+15800 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+16000 */
-209,209,209,209,210,211,212,213,146,146,146,146,214,215,216,217, /* U+16800 */
-218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218, /* U+17000 */
-218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218, /* U+17800 */
-218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,219, /* U+18000 */
-218,218,218,218,218,218,220,220,220,221,222,146,146,146,146,146, /* U+18800 */
+146,146,212,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+16000 */
+213,213,213,213,214,215,216,217,146,146,218,146,219,220,221,222, /* U+16800 */
+223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223, /* U+17000 */
+223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223, /* U+17800 */
+223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,224, /* U+18000 */
+223,223,223,223,223,223,225,225,225,226,227,146,146,146,146,146, /* U+18800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+19000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+19800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+1A000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,223, /* U+1A800 */
-224,225,226,227,227,228,146,146,146,146,146,146,146,146,146,146, /* U+1B000 */
-146,146,146,146,146,146,146,146,229,230,146,146,146,146,146,146, /* U+1B800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,228, /* U+1A800 */
+229,230,231,232,232,233,146,146,146,146,146,146,146,146,146,146, /* U+1B000 */
+146,146,146,146,146,146,146,146,234,235,146,146,146,146,146,146, /* U+1B800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+1C000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,231,232, /* U+1C800 */
-233,234,235,236,237,238,239,146,240,241,242,243,244,245,246,247, /* U+1D000 */
-248,248,248,248,249,250,146,146,146,146,146,146,146,146,251,146, /* U+1D800 */
-252,253,254,146,146,255,146,146,146,256,146,146,146,146,146,257, /* U+1E000 */
-258,259,260,168,168,168,168,168,261,262,263,168,264,265,168,168, /* U+1E800 */
-266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281, /* U+1F000 */
-282,283,284,285,286,287,288,289,271,271,271,271,271,271,271,290, /* U+1F800 */
+146,146,146,146,146,146,146,146,236,237,236,236,236,238,239,240, /* U+1C800 */
+241,242,243,244,245,246,247,146,248,249,250,251,252,253,254,255, /* U+1D000 */
+256,256,256,256,257,258,146,146,146,146,146,146,146,146,259,146, /* U+1D800 */
+260,261,262,146,146,263,146,146,146,264,146,265,146,146,146,266, /* U+1E000 */
+267,268,269,270,270,270,270,270,271,272,273,270,274,275,270,270, /* U+1E800 */
+276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291, /* U+1F000 */
+292,293,294,295,296,297,236,298,281,281,281,281,281,281,281,299, /* U+1F800 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+20000 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+20800 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+21000 */
@@ -1935,23 +2179,23 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+28800 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+29000 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+29800 */
-101,101,101,101,101,101,101,101,101,101,101,101,101,291,101,101, /* U+2A000 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,300,101,101, /* U+2A000 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2A800 */
-101,101,101,101,101,101,101,101,101,101,101,101,101,101,292,101, /* U+2B000 */
-293,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2B800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,101,301,101, /* U+2B000 */
+302,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2B800 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2C000 */
-101,101,101,101,101,101,101,101,101,101,101,101,101,294,101,101, /* U+2C800 */
+101,101,101,101,101,101,101,101,101,101,101,101,101,303,101,101, /* U+2C800 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2D000 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2D800 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+2E000 */
-101,101,101,101,101,101,101,295,146,146,146,146,146,146,146,146, /* U+2E800 */
+101,101,101,101,101,101,101,304,101,101,101,101,305,146,146,146, /* U+2E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+2F000 */
-129,129,129,129,296,146,146,146,146,146,146,146,146,146,146,297, /* U+2F800 */
+129,129,129,129,306,146,146,146,146,146,146,146,146,146,146,307, /* U+2F800 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+30000 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+30800 */
-101,101,101,101,101,101,298,101,101,101,101,101,101,101,101,101, /* U+31000 */
+101,101,101,101,101,101,308,101,101,101,101,101,101,101,101,101, /* U+31000 */
 101,101,101,101,101,101,101,101,101,101,101,101,101,101,101,101, /* U+31800 */
-101,101,101,101,101,101,101,299,146,146,146,146,146,146,146,146, /* U+32000 */
+101,101,101,101,101,101,101,309,146,146,146,146,146,146,146,146, /* U+32000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+32800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+33000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+33800 */
@@ -1978,7 +2222,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3E000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+3F000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+3F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+3F800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+40000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+40800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+41000 */
@@ -2010,7 +2254,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4E000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+4F000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+4F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+4F800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+50000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+50800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+51000 */
@@ -2042,7 +2286,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5E000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+5F000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+5F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+5F800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+60000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+60800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+61000 */
@@ -2074,7 +2318,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6E000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+6F000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+6F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+6F800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+70000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+70800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+71000 */
@@ -2106,7 +2350,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7E000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+7F000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+7F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+7F800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+80000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+80800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+81000 */
@@ -2138,7 +2382,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8E000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+8F000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+8F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+8F800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+90000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+90800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+91000 */
@@ -2170,7 +2414,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9E000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9E800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+9F000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+9F800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+9F800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A0000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A0800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+A1000 */
@@ -2202,7 +2446,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AE000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AE800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+AF000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+AF800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+AF800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B0000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B0800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+B1000 */
@@ -2234,7 +2478,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BE000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BE800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+BF000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+BF800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+BF800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C0000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C0800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+C1000 */
@@ -2266,7 +2510,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CE000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CE800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+CF000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+CF800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+CF800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D0000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D0800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+D1000 */
@@ -2298,9 +2542,9 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DE000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DE800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+DF000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+DF800 */
-300,301,302,303,301,301,301,301,301,301,301,301,301,301,301,301, /* U+E0000 */
-301,301,301,301,301,301,301,301,301,301,301,301,301,301,301,301, /* U+E0800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+DF800 */
+310,311,312,313,311,311,311,311,311,311,311,311,311,311,311,311, /* U+E0000 */
+311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311, /* U+E0800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E1000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E1800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+E2000 */
@@ -2330,7 +2574,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EE000 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EE800 */
 146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,146, /* U+EF000 */
-146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,297, /* U+EF800 */
+146,146,146,146,146,146,146,146,146,146,146,146,146,146,146,307, /* U+EF800 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F0000 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F0800 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+F1000 */
@@ -2362,7 +2606,7 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FE000 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FE800 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+FF000 */
-128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,304, /* U+FF800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,314, /* U+FF800 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+100000 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+100800 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+101000 */
@@ -2394,10 +2638,10 @@ const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10E000 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10E800 */
 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, /* U+10F000 */
-128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,304, /* U+10F800 */
+128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,314, /* U+10F800 */
 };
 
-const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */
+const uint16_t PRIV(ucd_stage2)[] = { /* 80640 bytes, block = 128 */
 
 /* block 0 */
   0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  1,  3,  4,  0,  0,
@@ -2431,553 +2675,553 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */
 
 /* block 3 */
  74, 75, 65, 66, 65, 66, 76, 65, 66, 77, 77, 65, 66, 70, 78, 79,
- 80, 65, 66, 77, 81, 82, 83, 84, 65, 66, 85, 70, 83, 86, 87, 88,
- 65, 66, 65, 66, 65, 66, 89, 65, 66, 89, 70, 70, 65, 66, 89, 65,
- 66, 90, 90, 65, 66, 65, 66, 91, 65, 66, 70, 92, 65, 66, 70, 93,
- 92, 92, 92, 92, 94, 95, 96, 97, 98, 99,100,101,102, 65, 66, 65,
- 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,103, 65, 66,
+ 80, 65, 66, 77, 81, 82, 83, 84, 65, 66, 85, 86, 83, 87, 88, 89,
+ 65, 66, 65, 66, 65, 66, 90, 65, 66, 90, 70, 70, 65, 66, 90, 65,
+ 66, 91, 91, 65, 66, 65, 66, 92, 65, 66, 70, 93, 65, 66, 70, 94,
+ 93, 93, 93, 93, 95, 96, 97, 98, 99,100,101,102,103, 65, 66, 65,
+ 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,104, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
- 69,104,105,106, 65, 66,107,108, 65, 66, 65, 66, 65, 66, 65, 66,
+ 69,105,106,107, 65, 66,108,109, 65, 66, 65, 66, 65, 66, 65, 66,
 
 /* block 4 */
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
-109, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
- 65, 66, 65, 66, 70, 70, 70, 70, 70, 70,110, 65, 66,111,112,113,
-113, 65, 66,114,115,116, 65, 66, 65, 67, 65, 66, 65, 66, 65, 66,
-117,118,119,120,121, 70,122,122, 70,123, 70,124,125, 70, 70, 70,
-122,126, 70,127, 70,128,129, 70,130,131,129,132,133, 70, 70,131,
- 70,134,135, 70, 70,136, 70, 70, 70, 70, 70, 70, 70,137, 70, 70,
+110, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 70, 70, 70, 70, 70, 70,111, 65, 66,112,113,114,
+114, 65, 66,115,116,117, 65, 66, 65, 67, 65, 66, 65, 66, 65, 66,
+118,119,120,121,122, 70,123,123, 70,124, 70,125,126, 70, 70, 70,
+123,127, 70,128,129,130,131, 70,132,133,131,134,135, 70, 70,133,
+ 70,136,137, 70, 70,138, 70, 70, 70, 70, 70, 70, 70,139, 70, 70,
 
 /* block 5 */
-138, 70,139,138, 70, 70, 70,140,138,141,142,142,143, 70, 70, 70,
- 70, 70,144, 70, 92, 70, 70, 70, 70, 70, 70, 70, 70,145,146, 70,
+140, 70,141,140, 70, 70, 70,142,140,143,144,144,145, 70, 70, 70,
+ 70, 70,146, 70, 93, 70, 70, 70, 70, 70, 70, 70, 70,147,148, 70,
  70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
-147,147,148,147,147,147,147,147,147,149,149,150,150,150,150,150,
-151,151, 46, 46, 46, 46,149,149,149,149,149,149,149,149,149,149,
-152,152, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
-147,147,147,147,147, 46, 46, 46, 46, 46,153,153,149, 46,150, 46,
+149,149,150,149,149,149,149,149,149,151,151,152,153,152,152,152,
+154,154, 46, 46, 46, 46,151,155,151,155,155,155,151,156,151,151,
+157,157, 46, 46, 46, 46, 46,158, 46,159, 46, 46, 46, 46, 46, 46,
+149,149,149,149,149, 46, 46, 46, 46, 46,160,160,151, 46,152, 46,
  46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, 46,
 
 /* block 6 */
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-154,154,155,154,154,156,154,154,154,154,154,154,154,154,154,157,
-154,154,154,154,154,154,154,154,158,158,158,158,158,154,154,154,
-154,154,154,159,159,159,159,159,159,159,159,159,159,159,159,159,
-160,161,160,161,149,162,160,161,163,163,164,165,165,165,166,167,
+161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,
+174,177,176,178,176,176,176,176,176,176,176,176,176,176,176,176,
+179,176,176,180,181,179,176,176,176,176,176,176,176,182,179,176,
+183,184,176,176,176,176,176,176,176,176,176,176,176,176,176,176,
+176,176,185,176,176,186,176,176,176,176,176,176,176,176,176,187,
+176,176,176,176,176,176,176,176,188,189,189,189,189,176,190,176,
+176,176,176,191,191,191,191,191,191,191,191,191,191,191,191,191,
+192,193,192,193,194,195,192,193,196,196,197,198,198,198,199,200,
 
 /* block 7 */
-163,163,163,163,162, 46,168,169,170,170,170,163,171,163,172,172,
-173,174,175,174,174,176,174,174,177,178,179,174,180,174,174,174,
-181,182,163,183,174,174,184,174,174,185,174,174,186,187,187,187,
-173,188,189,188,188,190,188,188,191,192,193,188,194,188,188,188,
-195,196,197,198,188,188,199,188,188,200,188,188,201,202,202,203,
-204,205,206,207,207,208,209,210,160,161,160,161,160,161,160,161,
-160,161,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
-213,214,215,216,217,218,219,160,161,220,160,161,221,222,222,222,
+196,196,196,196,201, 46,202,203,204,204,204,196,205,196,206,206,
+207,208,209,208,208,210,208,208,211,212,213,208,214,208,208,208,
+215,216,196,217,208,208,218,208,208,219,208,208,220,221,221,221,
+222,223,224,223,223,225,223,223,226,227,228,223,229,223,223,223,
+230,231,232,233,223,223,234,223,223,235,223,223,236,237,237,238,
+239,240,241,242,242,243,244,245,192,193,192,193,192,193,192,193,
+192,193,246,247,246,247,246,247,246,247,246,247,246,247,246,247,
+248,249,250,251,252,253,254,192,193,255,192,193,256,257,257,257,
 
 /* block 8 */
-223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,
-224,224,225,224,226,224,224,224,224,224,224,224,224,224,227,224,
-224,228,229,224,224,224,224,224,224,224,230,224,224,224,224,224,
-231,231,232,231,233,231,231,231,231,231,231,231,231,231,234,231,
-231,235,236,231,231,231,231,231,231,231,237,231,231,231,231,231,
-238,238,238,238,238,238,239,238,239,238,238,238,238,238,238,238,
-240,241,242,243,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,258,
+259,259,260,259,261,259,259,259,259,259,259,259,259,259,262,259,
+259,263,264,259,259,259,259,259,259,259,265,259,259,259,259,259,
+266,266,267,266,268,266,266,266,266,266,266,266,266,266,269,266,
+266,270,271,266,266,266,266,266,266,266,272,266,266,266,266,266,
+273,273,273,273,273,273,274,273,274,273,273,273,273,273,273,273,
+275,276,277,278,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
 
 /* block 9 */
-240,241,244,245,246,247,247,246,248,248,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-249,240,241,240,241,240,241,240,241,240,241,240,241,240,241,250,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
+275,276,279,280,281,282,282,281,283,283,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+284,275,276,275,276,275,276,275,276,275,276,275,276,275,276,285,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
 
 /* block 10 */
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-163,251,251,251,251,251,251,251,251,251,251,251,251,251,251,251,
-251,251,251,251,251,251,251,251,251,251,251,251,251,251,251,251,
-251,251,251,251,251,251,251,163,163,252,253,253,253,253,253,254,
-255,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
-256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,256,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+196,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+286,286,286,286,286,286,286,196,196,287,288,288,288,288,288,289,
+290,291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,
+291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,
 
 /* block 11 */
-256,256,256,256,256,256,256,257,255,258,259,163,163,260,260,261,
-262,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,
-263,263,264,263,263,263,263,263,263,263,263,263,263,263,263,263,
-265,265,265,265,265,265,265,265,265,265,265,265,265,265,266,265,
-267,265,265,268,265,269,267,269,262,262,262,262,262,262,262,262,
-270,270,270,270,270,270,270,270,270,270,270,270,270,270,270,270,
-270,270,270,270,270,270,270,270,270,270,270,262,262,262,262,270,
-270,270,270,267,271,262,262,262,262,262,262,262,262,262,262,262,
+291,291,291,291,291,291,291,292,290,293,294,196,196,295,295,296,
+297,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,
+298,298,299,298,298,298,298,298,298,298,298,298,298,298,298,298,
+300,300,300,300,300,300,300,300,300,300,300,300,300,300,301,300,
+302,300,300,303,300,304,302,304,297,297,297,297,297,297,297,297,
+305,305,305,305,305,305,305,305,305,305,305,305,305,305,305,305,
+305,305,305,305,305,305,305,305,305,305,305,297,297,297,297,305,
+305,305,305,302,306,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 12 */
-272,272,272,272,272,273,274,274,275,276,276,277,278,279,280,280,
-281,281,281,281,281,281,281,281,281,281,281,282,283,284,284,285,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-287,286,286,286,286,286,286,286,286,286,286,288,288,288,288,288,
-288,288,288,289,289,289,281,290,291,281,281,281,281,281,281,281,
-292,292,292,292,292,292,292,292,292,292,276,293,293,279,286,286,
-289,286,286,294,286,286,286,286,286,286,286,286,286,286,286,286,
+307,307,307,307,307,308,309,309,310,311,311,312,313,314,315,315,
+316,316,316,316,316,316,316,316,316,316,316,317,318,319,319,320,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+322,321,321,321,321,321,321,321,321,321,321,323,323,323,323,323,
+323,323,323,324,325,325,316,326,327,316,316,316,316,316,316,316,
+328,328,328,328,328,328,328,328,328,328,311,329,329,314,321,321,
+324,321,321,330,321,321,321,321,321,321,321,321,321,321,321,321,
 
 /* block 13 */
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,295,286,281,281,281,281,281,281,281,273,280,291,
-291,281,281,281,281,296,296,281,281,280,291,291,291,281,286,286,
-297,297,297,297,297,297,297,297,297,297,286,286,286,298,298,286,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,331,321,316,316,316,316,316,316,332,308,315,333,
+333,316,316,332,316,334,334,332,332,315,333,333,333,316,321,321,
+335,335,335,335,335,335,335,335,335,335,321,321,321,336,336,321,
 
 /* block 14 */
-299,299,299,300,300,300,300,300,300,300,300,301,300,301,302,303,
-304,305,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,304,
-306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,306,
-307,307,307,307,307,307,307,307,307,307,307,302,302,304,304,304,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+337,337,337,338,338,338,338,338,338,338,338,339,338,339,340,341,
+342,343,342,342,342,342,342,342,342,342,342,342,342,342,342,342,
+342,342,342,342,342,342,342,342,342,342,342,342,342,342,342,342,
+344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,344,
+345,345,345,345,345,345,345,345,345,345,345,340,340,342,342,342,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
 
 /* block 15 */
-308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,
-308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,308,
-308,308,308,308,308,308,309,309,309,309,309,309,309,309,309,309,
-309,308,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-310,310,310,310,310,310,310,310,310,310,311,311,311,311,311,311,
-311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,311,
-311,311,311,311,311,311,311,311,311,311,311,312,312,312,312,312,
-312,312,312,312,313,313,314,315,316,317,318,262,262,319,320,320,
+346,346,346,346,346,346,346,346,346,346,346,346,346,346,346,346,
+346,346,346,346,346,346,346,346,346,346,346,346,346,346,346,346,
+346,346,346,346,346,346,347,347,347,347,347,347,347,347,347,347,
+347,346,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+348,348,348,348,348,348,348,348,348,348,349,349,349,349,349,349,
+349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,
+349,349,349,349,349,349,349,349,349,349,349,350,350,350,350,350,
+350,350,350,350,351,351,352,353,354,355,356,297,297,357,358,358,
 
 /* block 16 */
+359,359,359,359,359,359,359,359,359,359,359,359,359,359,359,359,
+359,359,359,359,359,359,360,360,361,361,362,360,360,360,360,360,
+360,360,360,360,362,360,360,360,362,360,360,360,360,363,297,297,
+364,364,364,364,364,364,365,366,364,366,364,364,364,366,366,297,
+367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,367,
+367,367,367,367,367,367,367,367,367,368,368,368,297,297,369,297,
+342,342,342,342,342,342,342,342,342,342,342,340,340,340,340,340,
 321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
-321,321,321,321,321,321,322,322,323,323,324,322,322,322,322,322,
-322,322,322,322,324,322,322,322,324,322,322,322,322,325,262,262,
-326,326,326,326,326,326,326,327,326,327,326,326,326,327,327,262,
-328,328,328,328,328,328,328,328,328,328,328,328,328,328,328,328,
-328,328,328,328,328,328,328,328,328,329,329,329,262,262,330,262,
-304,304,304,304,304,304,304,304,304,304,304,302,302,302,302,302,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
 
 /* block 17 */
-286,286,286,286,286,286,286,286,331,286,286,286,286,286,286,302,
-272,272,302,302,302,302,302,302,291,291,291,291,291,291,291,291,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,296,291,291,291,291,291,291,
-291,291,291,332,281,281,281,281,281,281,281,281,281,281,281,281,
-332,332,273,290,290,290,290,290,290,290,291,291,291,291,291,291,
-290,290,290,290,290,290,290,290,290,290,290,290,290,290,290,281,
+321,321,321,321,321,321,321,321,370,321,321,321,321,321,321,340,
+307,307,340,340,340,340,340,316,333,333,333,333,333,333,333,333,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,334,327,327,333,327,327,327,
+333,333,333,371,316,316,316,316,316,316,316,316,316,316,316,316,
+372,372,308,326,326,326,326,326,326,326,333,333,333,333,333,333,
+326,326,326,373,326,326,326,326,326,326,326,326,326,326,326,316,
 
 /* block 18 */
-333,333,333,334,335,335,335,335,335,335,335,335,335,335,335,335,
-335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,
-335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,
-335,335,335,335,335,335,335,335,335,335,333,334,336,335,334,334,
-334,333,333,333,333,333,333,333,333,334,334,334,334,337,334,334,
-335,338,339,154,154,333,333,333,335,335,335,335,335,335,335,335,
-335,335,333,333,340,341,342,342,342,342,342,342,342,342,342,342,
-343,344,335,335,335,335,335,335,335,335,335,335,335,335,335,335,
+374,374,374,375,376,376,376,376,376,376,376,376,376,376,376,376,
+376,376,376,376,376,377,377,377,377,377,377,377,377,377,377,377,
+377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,377,
+377,377,377,377,377,377,377,377,377,377,374,375,378,376,375,375,
+375,374,374,374,374,374,374,374,374,375,375,375,375,379,375,375,
+376,380,381,176,176,374,374,374,377,377,377,377,377,377,377,377,
+376,376,374,374,382,383,384,384,384,384,384,384,384,384,384,384,
+385,386,376,376,376,376,376,376,377,377,377,377,377,377,377,377,
 
 /* block 19 */
-345,346,347,347,163,345,345,345,345,345,345,345,345,163,163,345,
-345,163,163,345,345,345,345,345,345,345,345,345,345,345,345,345,
-345,345,345,345,345,345,345,345,345,163,345,345,345,345,345,345,
-345,163,345,163,163,163,345,345,345,345,163,163,348,345,349,347,
-347,346,346,346,346,163,163,347,347,163,163,347,347,350,345,163,
-163,163,163,163,163,163,163,349,163,163,163,163,345,345,163,345,
-345,345,346,346,163,163,351,351,351,351,351,351,351,351,351,351,
-345,345,352,352,353,353,353,353,353,353,354,352,345,355,356,163,
+387,388,389,389,196,387,387,387,387,387,387,387,387,196,196,387,
+387,196,196,387,387,390,390,390,390,390,390,390,390,390,390,390,
+390,390,390,390,390,390,390,390,390,196,390,390,390,390,390,390,
+390,196,390,196,196,196,390,390,390,390,196,196,391,387,392,389,
+389,388,388,388,388,196,196,389,389,196,196,389,389,393,387,196,
+196,196,196,196,196,196,196,392,196,196,196,196,390,390,196,390,
+387,387,388,388,196,196,394,394,394,394,394,394,394,394,394,394,
+390,390,395,395,396,396,396,396,396,396,397,395,387,398,399,196,
 
 /* block 20 */
-163,357,357,358,163,359,359,359,359,359,359,163,163,163,163,359,
-359,163,163,359,359,359,359,359,359,359,359,359,359,359,359,359,
-359,359,359,359,359,359,359,359,359,163,359,359,359,359,359,359,
-359,163,359,359,163,359,359,163,359,359,163,163,360,163,358,358,
-358,357,357,163,163,163,163,357,357,163,163,357,357,361,163,163,
-163,357,163,163,163,163,163,163,163,359,359,359,359,163,359,163,
-163,163,163,163,163,163,362,362,362,362,362,362,362,362,362,362,
-357,357,359,359,359,357,363,163,163,163,163,163,163,163,163,163,
+196,400,400,401,196,402,402,402,402,402,402,196,196,196,196,402,
+402,196,196,402,402,402,402,402,402,402,402,402,402,402,402,402,
+402,402,402,402,402,402,402,402,402,196,402,402,402,402,402,402,
+402,196,402,402,196,402,402,196,402,402,196,196,403,196,401,401,
+401,400,400,196,196,196,196,400,400,196,196,400,400,404,196,196,
+196,400,196,196,196,196,196,196,196,402,402,402,402,196,402,196,
+196,196,196,196,196,196,405,405,405,405,405,405,405,405,405,405,
+400,406,402,402,402,400,407,196,196,196,196,196,196,196,196,196,
 
 /* block 21 */
-163,364,364,365,163,366,366,366,366,366,366,366,366,366,163,366,
-366,366,163,366,366,366,366,366,366,366,366,366,366,366,366,366,
-366,366,366,366,366,366,366,366,366,163,366,366,366,366,366,366,
-366,163,366,366,163,366,366,366,366,366,163,163,367,366,365,365,
-365,364,364,364,364,364,163,364,364,365,163,365,365,368,163,163,
-366,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-366,366,364,364,163,163,369,369,369,369,369,369,369,369,369,369,
-370,371,163,163,163,163,163,163,163,366,364,364,364,367,367,367,
+196,408,408,409,196,410,410,410,410,410,410,410,410,410,196,410,
+410,410,196,410,410,411,411,411,411,411,411,411,411,411,411,411,
+411,411,411,411,411,411,411,411,411,196,411,411,411,411,411,411,
+411,196,411,411,196,411,411,411,411,411,196,196,412,410,409,409,
+409,408,408,408,408,408,196,408,408,409,196,409,409,413,196,196,
+410,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+410,410,408,408,196,196,414,414,414,414,414,414,414,414,414,414,
+415,416,196,196,196,196,196,196,196,411,408,417,408,412,412,412,
 
 /* block 22 */
-163,372,373,373,163,374,374,374,374,374,374,374,374,163,163,374,
-374,163,163,374,374,374,374,374,374,374,374,374,374,374,374,374,
-374,374,374,374,374,374,374,374,374,163,374,374,374,374,374,374,
-374,163,374,374,163,374,374,374,374,374,163,163,375,374,376,372,
-373,372,372,372,372,163,163,373,373,163,163,373,373,377,163,163,
-163,163,163,163,163,378,372,376,163,163,163,163,374,374,163,374,
-374,374,372,372,163,163,379,379,379,379,379,379,379,379,379,379,
-380,374,381,381,381,381,381,381,163,163,163,163,163,163,163,163,
+196,418,419,419,196,420,420,420,420,420,420,420,420,196,196,420,
+420,196,196,420,420,421,421,421,421,421,421,421,421,421,421,421,
+421,421,421,421,421,421,421,421,421,196,421,421,421,421,421,421,
+421,196,421,421,196,421,421,421,421,421,196,196,422,420,423,418,
+419,418,418,418,418,196,196,419,419,196,196,419,419,424,196,196,
+196,196,196,196,196,425,418,423,196,196,196,196,421,421,196,421,
+420,420,418,418,196,196,426,426,426,426,426,426,426,426,426,426,
+427,421,428,428,428,428,428,428,196,196,196,196,196,196,196,196,
 
 /* block 23 */
-163,163,382,383,163,383,383,383,383,383,383,163,163,163,383,383,
-383,163,383,383,383,383,163,163,163,383,383,163,383,163,383,383,
-163,163,163,383,383,163,163,163,383,383,383,163,163,163,383,383,
-383,383,383,383,383,383,383,383,383,383,163,163,163,163,384,385,
-382,385,385,163,163,163,385,385,385,163,385,385,385,386,163,163,
-383,163,163,163,163,163,163,384,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,387,387,387,387,387,387,387,387,387,387,
-388,388,388,389,390,390,390,390,390,391,390,163,163,163,163,163,
+196,196,429,430,196,430,430,430,430,430,430,196,196,196,430,430,
+430,196,430,430,430,430,196,196,196,430,430,196,430,196,430,430,
+196,196,196,430,430,196,196,196,430,430,430,196,196,196,430,430,
+430,430,430,430,430,430,430,430,430,430,196,196,196,196,431,432,
+429,432,432,196,196,196,432,432,432,196,432,432,432,433,196,196,
+430,196,196,196,196,196,196,431,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,434,434,434,434,434,434,434,434,434,434,
+435,435,435,436,437,437,437,437,437,438,437,196,196,196,196,196,
 
 /* block 24 */
-392,393,393,393,392,394,394,394,394,394,394,394,394,163,394,394,
-394,163,394,394,394,394,394,394,394,394,394,394,394,394,394,394,
-394,394,394,394,394,394,394,394,394,163,394,394,394,394,394,394,
-394,394,394,394,394,394,394,394,394,394,163,163,395,394,392,392,
-392,393,393,393,393,163,392,392,392,163,392,392,392,396,163,163,
-163,163,163,163,163,392,392,163,394,394,394,163,163,394,163,163,
-394,394,392,392,163,163,397,397,397,397,397,397,397,397,397,397,
-163,163,163,163,163,163,163,398,399,399,399,399,399,399,399,400,
+439,440,440,440,439,441,441,441,441,441,441,441,441,196,441,441,
+441,196,441,441,441,442,442,442,442,442,442,442,442,442,442,442,
+442,442,442,442,442,442,442,442,442,196,442,442,442,442,442,442,
+442,442,442,442,442,442,442,442,442,442,196,196,443,441,439,439,
+439,440,440,440,440,196,439,439,439,196,439,439,439,444,196,196,
+196,196,196,196,196,439,439,196,442,442,442,196,196,441,196,196,
+441,441,439,439,196,196,445,445,445,445,445,445,445,445,445,445,
+196,196,196,196,196,196,196,446,447,447,447,447,447,447,447,448,
 
 /* block 25 */
-401,402,403,403,404,401,401,401,401,401,401,401,401,163,401,401,
-401,163,401,401,401,401,401,401,401,401,401,401,401,401,401,401,
-401,401,401,401,401,401,401,401,401,163,401,401,401,401,401,401,
-401,401,401,401,163,401,401,401,401,401,163,163,405,401,403,406,
-403,403,407,403,403,163,406,403,403,163,403,403,402,408,163,163,
-163,163,163,163,163,407,407,163,163,163,163,163,163,401,401,163,
-401,401,402,402,163,163,409,409,409,409,409,409,409,409,409,409,
-163,401,401,403,163,163,163,163,163,163,163,163,163,163,163,163,
+449,450,451,451,452,449,449,449,449,449,449,449,449,196,449,449,
+449,196,449,449,449,449,449,449,449,449,449,449,449,449,449,449,
+449,449,449,449,449,449,449,449,449,196,449,449,449,449,449,449,
+449,449,449,449,196,449,449,449,449,449,196,196,453,449,451,454,
+455,451,455,451,451,196,454,455,455,196,455,455,450,456,196,196,
+196,196,196,196,196,455,455,196,196,196,196,196,196,449,449,196,
+449,449,450,450,196,196,457,457,457,457,457,457,457,457,457,457,
+196,449,449,451,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 26 */
-410,410,411,411,412,412,412,412,412,412,412,412,412,163,412,412,
-412,163,412,412,412,412,412,412,412,412,412,412,412,412,412,412,
-412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,
-412,412,412,412,412,412,412,412,412,412,412,413,413,412,414,411,
-411,410,410,410,410,163,411,411,411,163,411,411,411,413,415,416,
-163,163,163,163,412,412,412,414,417,417,417,417,417,417,417,412,
-412,412,410,410,163,163,418,418,418,418,418,418,418,418,418,418,
-417,417,417,417,417,417,417,417,417,416,412,412,412,412,412,412,
+458,458,459,459,460,460,460,460,460,460,460,460,460,196,460,460,
+460,196,460,460,460,461,461,461,461,461,461,461,461,461,461,461,
+461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
+461,461,461,461,461,461,461,461,461,461,461,462,462,460,463,459,
+459,458,458,458,458,196,459,459,459,196,459,459,459,462,464,465,
+196,196,196,196,460,460,460,463,466,466,466,466,466,466,466,460,
+460,460,458,458,196,196,467,467,467,467,467,467,467,467,467,467,
+466,466,466,466,466,466,466,466,466,465,460,460,460,460,460,460,
 
 /* block 27 */
-163,419,420,420,163,421,421,421,421,421,421,421,421,421,421,421,
-421,421,421,421,421,421,421,163,163,163,421,421,421,421,421,421,
-421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,421,
-421,421,163,421,421,421,421,421,421,421,421,421,163,421,163,163,
-421,421,421,421,421,421,421,163,163,163,422,163,163,163,163,423,
-420,420,419,419,419,163,419,163,420,420,420,420,420,420,420,423,
-163,163,163,163,163,163,424,424,424,424,424,424,424,424,424,424,
-163,163,420,420,425,163,163,163,163,163,163,163,163,163,163,163,
+196,468,469,469,196,470,470,470,470,470,470,470,470,470,470,470,
+470,470,470,470,470,470,470,196,196,196,470,470,470,470,470,470,
+470,470,470,470,470,470,470,470,470,470,470,470,470,470,470,470,
+470,470,196,470,470,470,470,470,470,470,470,470,196,470,196,196,
+470,470,470,470,470,470,470,196,196,196,471,196,196,196,196,472,
+469,469,468,468,468,196,468,196,469,469,469,469,469,469,469,472,
+196,196,196,196,196,196,473,473,473,473,473,473,473,473,473,473,
+196,196,469,469,474,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 28 */
-163,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,
-426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,
-426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,426,
-426,427,426,428,427,427,427,427,427,427,429,163,163,163,163,430,
-431,431,431,431,431,426,432,433,433,433,433,433,433,427,433,434,
-435,435,435,435,435,435,435,435,435,435,436,436,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+196,475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,
+475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,
+475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,
+475,476,475,477,476,476,476,476,476,476,478,196,196,196,196,479,
+480,480,480,480,480,475,481,482,482,482,482,482,482,476,482,483,
+484,484,484,484,484,484,484,484,484,484,485,485,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 29 */
-163,437,437,163,437,163,437,437,437,437,437,163,437,437,437,437,
-437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
-437,437,437,437,163,437,163,437,437,437,437,437,437,437,437,437,
-437,438,437,439,438,438,438,438,438,438,440,438,438,437,163,163,
-441,441,441,441,441,163,442,163,443,443,443,443,443,438,444,163,
-445,445,445,445,445,445,445,445,445,445,163,163,437,437,437,437,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+196,486,486,196,486,196,486,486,486,486,486,196,486,486,486,486,
+486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,
+486,486,486,486,196,486,196,486,486,486,486,486,486,486,486,486,
+486,487,486,488,487,487,487,487,487,487,489,487,487,486,196,196,
+490,490,490,490,490,196,491,196,492,492,492,492,492,487,493,196,
+494,494,494,494,494,494,494,494,494,494,196,196,486,486,486,486,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 30 */
-446,447,447,447,448,448,448,448,449,448,448,448,448,449,449,449,
-449,449,449,447,448,447,447,447,450,450,447,447,447,447,447,447,
-451,451,451,451,451,451,451,451,451,451,452,452,452,452,452,452,
-452,452,452,452,447,450,447,450,447,450,453,454,453,454,455,455,
-446,446,446,446,446,446,446,446,163,446,446,446,446,446,446,446,
-446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,446,
-446,446,446,446,446,446,446,446,446,446,446,446,446,163,163,163,
-163,456,456,456,456,456,456,457,456,457,456,456,456,456,456,458,
+495,496,496,496,497,497,497,497,498,497,497,497,497,498,498,498,
+498,498,498,496,497,496,496,496,499,499,496,496,496,496,496,496,
+500,500,500,500,500,500,500,500,500,500,501,501,501,501,501,501,
+501,501,501,501,496,499,496,499,496,499,502,503,502,503,504,504,
+495,495,495,495,495,495,495,495,196,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,495,
+495,495,495,495,495,495,495,495,495,495,495,495,495,196,196,196,
+196,505,505,505,505,505,505,506,505,506,505,505,505,505,505,507,
 
 /* block 31 */
-456,456,459,459,460,448,450,450,446,446,446,446,446,456,456,456,
-456,456,456,456,456,456,456,456,163,456,456,456,456,456,456,456,
-456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,456,
-456,456,456,456,456,456,456,456,456,456,456,456,456,163,447,447,
-447,447,447,447,447,447,450,447,447,447,447,447,447,163,447,447,
-448,448,448,448,448,461,461,461,461,448,448,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+505,505,508,508,509,497,499,499,495,495,495,495,495,505,505,505,
+505,505,505,505,505,505,505,505,196,505,505,505,505,505,505,505,
+505,505,505,505,505,505,505,505,505,505,505,505,505,505,505,505,
+505,505,505,505,505,505,505,505,505,505,505,505,505,196,496,496,
+496,496,496,496,496,496,499,496,496,496,496,496,496,196,496,496,
+497,497,497,497,497,510,510,510,510,497,497,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 32 */
-462,462,462,462,462,462,462,462,462,462,462,462,462,462,462,462,
-462,462,462,462,462,462,462,462,462,462,462,462,462,462,462,462,
-462,462,462,462,462,462,462,462,462,462,462,463,463,464,464,464,
-464,465,464,464,464,464,464,466,463,467,467,465,465,464,464,462,
-468,468,468,468,468,468,468,468,468,468,469,469,470,470,470,470,
-462,462,462,462,462,462,465,465,464,464,462,462,462,462,464,464,
-464,462,463,471,471,462,462,463,463,471,471,471,471,471,462,462,
-462,464,464,464,464,462,462,462,462,462,462,462,462,462,462,462,
+511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,
+511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,
+511,511,511,511,511,511,511,511,511,511,511,512,512,513,513,513,
+513,514,513,513,513,513,513,515,512,516,516,514,514,513,513,511,
+517,517,517,517,517,517,517,517,517,517,518,518,519,519,519,519,
+511,511,511,511,511,511,514,514,513,513,511,511,511,511,513,513,
+513,511,512,520,520,511,511,512,512,520,520,520,520,520,511,511,
+511,513,513,513,513,511,511,511,511,511,511,511,511,511,511,511,
 
 /* block 33 */
-462,462,464,463,465,464,464,471,471,471,471,471,471,472,462,471,
-473,473,473,473,473,473,473,473,473,473,471,471,463,464,474,474,
-475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,
-475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,475,
-475,475,475,475,475,475,163,475,163,163,163,163,163,475,163,163,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,
-476,476,476,476,476,476,476,476,476,476,476,477,478,476,476,476,
+511,511,513,512,514,513,513,520,520,520,520,520,520,521,511,520,
+522,522,522,522,522,522,522,522,522,522,520,520,512,513,523,523,
+524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,
+524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,
+524,524,524,524,524,524,196,524,196,196,196,196,196,524,196,196,
+525,525,525,525,525,525,525,525,525,525,525,525,525,525,525,525,
+525,525,525,525,525,525,525,525,525,525,525,525,525,525,525,525,
+525,525,525,525,525,525,525,525,525,525,525,526,527,525,525,525,
 
 /* block 34 */
-479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
-479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
-479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
-479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
-479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
-479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,480,
-481,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
+528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,
+528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,
+528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,
+528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,
+528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,
+528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,529,
+530,531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,
+531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,
 
 /* block 35 */
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,482,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
+531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,
+531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,
+531,531,531,531,531,531,531,531,532,532,532,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,
 
 /* block 36 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,163,484,484,484,484,163,163,
-484,484,484,484,484,484,484,163,484,163,484,484,484,484,163,163,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,196,533,533,533,533,196,196,
+533,533,533,533,533,533,533,196,533,196,533,533,533,533,196,196,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
 
 /* block 37 */
-484,484,484,484,484,484,484,484,484,163,484,484,484,484,163,163,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,163,484,484,484,484,163,163,484,484,484,484,484,484,484,163,
-484,163,484,484,484,484,163,163,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,163,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
+533,533,533,533,533,533,533,533,533,196,533,533,533,533,196,196,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,196,533,533,533,533,196,196,533,533,533,533,533,533,533,196,
+533,196,533,533,533,533,196,196,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,196,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
 
 /* block 38 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,163,484,484,484,484,163,163,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,484,484,484,484,163,163,485,485,485,
-486,487,488,487,487,487,487,488,488,489,489,489,489,489,489,489,
-489,489,490,490,490,490,490,490,490,490,490,490,490,163,163,163,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,196,533,533,533,533,196,196,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,533,533,533,533,196,196,534,534,534,
+535,536,537,536,536,536,536,537,537,538,538,538,538,538,538,538,
+538,538,539,539,539,539,539,539,539,539,539,539,539,196,196,196,
 
 /* block 39 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-491,491,491,491,491,491,491,491,491,491,163,163,163,163,163,163,
-492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
-492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
-492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
-492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
-492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,492,
-493,493,493,493,493,493,163,163,494,494,494,494,494,494,163,163,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+540,540,540,540,540,540,540,540,540,540,196,196,196,196,196,196,
+541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
+541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
+541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
+541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
+541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
+542,542,542,542,542,542,196,196,543,543,543,543,543,543,196,196,
 
 /* block 40 */
-495,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
+544,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
 
 /* block 41 */
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
 
 /* block 42 */
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,497,498,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,546,547,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
 
 /* block 43 */
-499,500,500,500,500,500,500,500,500,500,500,500,500,500,500,500,
-500,500,500,500,500,500,500,500,500,500,500,501,502,163,163,163,
-503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,
-503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,
-503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,
-503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,
-503,503,503,503,503,503,503,503,503,503,503,504,504,504,505,505,
-505,503,503,503,503,503,503,503,503,163,163,163,163,163,163,163,
+548,549,549,549,549,549,549,549,549,549,549,549,549,549,549,549,
+549,549,549,549,549,549,549,549,549,549,549,550,551,196,196,196,
+552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
+552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
+552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
+552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
+552,552,552,552,552,552,552,552,552,552,552,553,553,553,554,554,
+554,552,552,552,552,552,552,552,552,196,196,196,196,196,196,196,
 
 /* block 44 */
-506,506,506,506,506,506,506,506,506,506,506,506,506,506,506,506,
-506,506,507,507,508,509,163,163,163,163,163,163,163,163,163,506,
-510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
-510,510,511,511,512,513,513,163,163,163,163,163,163,163,163,163,
-514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,
-514,514,515,515,163,163,163,163,163,163,163,163,163,163,163,163,
-516,516,516,516,516,516,516,516,516,516,516,516,516,163,516,516,
-516,163,517,517,163,163,163,163,163,163,163,163,163,163,163,163,
+555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,
+555,555,556,556,557,558,196,196,196,196,196,196,196,196,196,555,
+559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
+559,559,560,560,561,562,562,196,196,196,196,196,196,196,196,196,
+563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
+563,563,564,564,196,196,196,196,196,196,196,196,196,196,196,196,
+565,565,565,565,565,565,565,565,565,565,565,565,565,196,565,565,
+565,196,566,566,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 45 */
-518,518,518,518,518,518,518,518,518,518,518,518,518,518,518,518,
-518,518,518,518,518,518,518,518,518,518,518,518,518,518,518,518,
-518,518,518,519,519,518,518,518,518,518,518,518,518,518,518,518,
-518,518,518,518,520,520,521,522,522,522,522,522,522,522,521,521,
-521,521,521,521,521,521,522,521,521,523,523,523,523,523,523,523,
-523,523,524,523,525,525,525,526,527,527,525,528,518,523,163,163,
-529,529,529,529,529,529,529,529,529,529,163,163,163,163,163,163,
-530,530,530,530,530,530,530,530,530,530,163,163,163,163,163,163,
+567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,
+567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,
+567,567,567,568,568,567,567,567,567,567,567,567,567,567,567,567,
+567,567,567,567,569,569,570,571,571,571,571,571,571,571,570,570,
+570,570,570,570,570,570,571,570,570,572,572,572,572,572,572,572,
+572,572,573,572,574,574,575,576,577,577,575,578,567,572,196,196,
+579,579,579,579,579,579,579,579,579,579,196,196,196,196,196,196,
+580,580,580,580,580,580,580,580,580,580,196,196,196,196,196,196,
 
 /* block 46 */
-531,531,532,533,534,532,535,531,534,536,537,538,538,538,539,538,
-540,540,540,540,540,540,540,540,540,540,163,163,163,163,163,163,
-541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
-541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
-541,541,541,542,541,541,541,541,541,541,541,541,541,541,541,541,
-541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
-541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
-541,541,541,541,541,541,541,541,541,163,163,163,163,163,163,163,
+581,581,582,583,584,582,585,581,584,586,587,588,588,588,589,588,
+590,590,590,590,590,590,590,590,590,590,196,196,196,196,196,196,
+591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,592,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,591,591,591,196,196,196,196,196,196,196,
 
 /* block 47 */
-541,541,541,541,541,543,543,541,541,541,541,541,541,541,541,541,
-541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,541,
-541,541,541,541,541,541,541,541,541,544,541,163,163,163,163,163,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-496,496,496,496,496,496,163,163,163,163,163,163,163,163,163,163,
+591,591,591,591,591,593,593,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,591,
+591,591,591,591,591,591,591,591,591,594,591,196,196,196,196,196,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+545,545,545,545,545,545,196,196,196,196,196,196,196,196,196,196,
 
 /* block 48 */
-545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
-545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,163,
-546,546,546,547,547,547,547,546,546,547,547,547,163,163,163,163,
-547,547,546,547,547,547,547,547,547,548,548,548,163,163,163,163,
-549,163,163,163,550,550,551,551,551,551,551,551,551,551,551,551,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,
-552,552,552,552,552,552,552,552,552,552,552,552,552,552,163,163,
-552,552,552,552,552,163,163,163,163,163,163,163,163,163,163,163,
+595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,
+595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,196,
+596,596,596,597,597,597,597,596,596,597,597,597,196,196,196,196,
+597,597,596,597,597,597,597,597,597,598,598,598,196,196,196,196,
+599,196,196,196,600,600,601,601,601,601,601,601,601,601,601,601,
+602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,
+602,602,602,602,602,602,602,602,602,602,602,602,602,602,196,196,
+602,602,602,602,602,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 49 */
-553,553,553,553,553,553,553,553,553,553,553,553,553,553,553,553,
-553,553,553,553,553,553,553,553,553,553,553,553,553,553,553,553,
-553,553,553,553,553,553,553,553,553,553,553,553,163,163,163,163,
-553,553,553,553,553,554,554,554,553,553,554,553,553,553,553,553,
-553,553,553,553,553,553,553,553,553,553,163,163,163,163,163,163,
-555,555,555,555,555,555,555,555,555,555,556,163,163,163,557,557,
-558,558,558,558,558,558,558,558,558,558,558,558,558,558,558,558,
-558,558,558,558,558,558,558,558,558,558,558,558,558,558,558,558,
+603,603,603,603,603,603,603,603,603,603,603,603,603,603,603,603,
+603,603,603,603,603,603,603,603,603,603,603,603,603,603,603,603,
+603,603,603,603,603,603,603,603,603,603,603,603,196,196,196,196,
+603,603,603,603,603,604,604,604,603,603,604,603,603,603,603,603,
+603,603,603,603,603,603,603,603,603,603,196,196,196,196,196,196,
+605,605,605,605,605,605,605,605,605,605,606,196,196,196,607,607,
+608,608,608,608,608,608,608,608,608,608,608,608,608,608,608,608,
+608,608,608,608,608,608,608,608,608,608,608,608,608,608,608,608,
 
 /* block 50 */
-559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,
-559,559,559,559,559,559,559,560,560,561,561,560,163,163,562,562,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
-563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,563,
-563,563,563,563,563,564,565,564,565,565,565,565,565,565,565,163,
-566,567,565,567,567,565,565,565,565,565,565,565,565,564,564,564,
-564,564,564,565,565,568,568,568,568,568,568,568,568,163,163,568,
+609,609,609,609,609,609,609,609,609,609,609,609,609,609,609,609,
+609,609,609,609,609,609,609,610,610,611,611,610,196,196,612,612,
+613,613,613,613,613,613,613,613,613,613,613,613,613,613,613,613,
+613,613,613,613,613,613,613,613,613,613,613,613,613,613,613,613,
+613,613,613,613,613,613,613,613,613,613,613,613,613,613,613,613,
+613,613,613,613,613,614,615,614,615,615,615,615,615,615,615,196,
+616,617,615,617,617,615,615,615,615,615,615,615,615,614,614,614,
+614,614,614,615,615,618,618,618,618,618,618,618,618,196,196,618,
 
 /* block 51 */
-569,569,569,569,569,569,569,569,569,569,163,163,163,163,163,163,
-569,569,569,569,569,569,569,569,569,569,163,163,163,163,163,163,
-570,570,570,570,570,570,570,571,572,572,572,572,570,570,163,163,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,573,574,
-574,154,154,154,154,154,154,154,154,154,154,154,574,574,574,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+619,619,619,619,619,619,619,619,619,619,196,196,196,196,196,196,
+619,619,619,619,619,619,619,619,619,619,196,196,196,196,196,196,
+620,620,620,620,620,620,620,621,622,622,622,622,620,620,196,196,
+176,176,176,176,176,176,176,176,176,176,176,176,176,176,623,624,
+624,176,176,176,176,176,176,176,176,176,176,176,624,624,624,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 52 */
-575,575,575,575,576,577,577,577,577,577,577,577,577,577,577,577,
-577,577,577,577,577,577,577,577,577,577,577,577,577,577,577,577,
-577,577,577,577,577,577,577,577,577,577,577,577,577,577,577,577,
-577,577,577,577,578,579,575,575,575,575,575,576,575,576,576,576,
-576,576,575,576,580,577,577,577,577,577,577,577,577,163,163,163,
-581,581,581,581,581,581,581,581,581,581,582,582,583,584,582,582,
-583,585,585,585,585,585,585,585,585,585,585,578,578,578,578,578,
-578,578,578,578,585,585,585,585,585,585,585,585,585,582,582,163,
+625,625,625,625,626,627,627,627,627,627,627,627,627,627,627,627,
+627,627,627,627,627,627,627,627,627,627,627,627,627,627,627,627,
+627,627,627,627,627,627,627,627,627,627,627,627,627,627,627,627,
+627,627,627,627,628,629,625,625,625,625,625,629,625,629,626,626,
+626,626,625,629,630,627,627,627,627,627,627,627,627,196,631,631,
+632,632,632,632,632,632,632,632,632,632,631,631,633,634,631,631,
+633,635,635,635,635,635,635,635,635,635,635,628,628,628,628,628,
+628,628,628,628,635,635,635,635,635,635,635,635,635,631,631,631,
 
 /* block 53 */
-586,586,587,588,588,588,588,588,588,588,588,588,588,588,588,588,
-588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,
-588,587,586,586,586,586,587,587,586,586,589,590,586,586,588,588,
-591,591,591,591,591,591,591,591,591,591,588,588,588,588,588,588,
-592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,
-592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,
-592,592,592,592,592,592,593,594,595,595,594,594,594,595,594,595,
-595,595,596,596,163,163,163,163,163,163,163,163,597,597,597,597,
+636,636,637,638,638,638,638,638,638,638,638,638,638,638,638,638,
+638,638,638,638,638,638,638,638,638,638,638,638,638,638,638,638,
+638,637,636,636,636,636,637,637,636,636,639,640,636,636,638,638,
+641,641,641,641,641,641,641,641,641,641,638,638,638,638,638,638,
+642,642,642,642,642,642,642,642,642,642,642,642,642,642,642,642,
+642,642,642,642,642,642,642,642,642,642,642,642,642,642,642,642,
+642,642,642,642,642,642,643,644,645,645,644,644,644,645,644,645,
+645,645,646,646,196,196,196,196,196,196,196,196,647,647,647,647,
 
 /* block 54 */
-598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,
-598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,
-598,598,598,598,599,599,599,599,599,599,599,599,600,600,600,600,
-600,600,600,600,599,599,601,602,163,163,163,603,603,604,604,604,
-605,605,605,605,605,605,605,605,605,605,163,163,163,598,598,598,
-606,606,606,606,606,606,606,606,606,606,607,607,607,607,607,607,
-607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,
-607,607,607,607,607,607,607,607,608,608,608,609,608,608,610,610,
+648,648,648,648,648,648,648,648,648,648,648,648,648,648,648,648,
+648,648,648,648,648,648,648,648,648,648,648,648,648,648,648,648,
+648,648,648,648,649,649,649,649,649,649,649,649,650,650,650,650,
+650,650,650,650,649,649,651,652,196,196,196,653,653,654,654,654,
+655,655,655,655,655,655,655,655,655,655,196,196,196,648,648,648,
+656,656,656,656,656,656,656,656,656,656,657,657,657,657,657,657,
+657,657,657,657,657,657,657,657,657,657,657,657,657,657,657,657,
+657,657,657,657,657,657,657,657,658,658,658,659,658,658,660,660,
 
 /* block 55 */
-611,612,613,614,615,616,617,618,619,163,163,163,163,163,163,163,
-620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,
-620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,
-620,620,620,620,620,620,620,620,620,620,620,163,163,620,620,620,
-621,621,621,621,621,621,621,621,163,163,163,163,163,163,163,163,
-622,623,622,624,623,625,625,626,625,626,627,623,626,626,623,623,
-626,628,623,623,623,623,623,623,623,629,630,631,631,625,631,631,
-631,631,632,633,634,630,630,635,636,636,637,163,163,163,163,163,
+661,662,663,664,665,666,667,668,669,275,276,196,196,196,196,196,
+670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,
+670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,
+670,670,670,670,670,670,670,670,670,670,670,196,196,670,670,670,
+671,671,671,671,671,671,671,671,196,196,196,196,196,196,196,196,
+672,673,672,674,673,675,675,676,675,676,677,673,676,676,673,673,
+676,678,673,673,673,673,673,673,673,679,680,681,681,675,681,681,
+681,681,682,683,684,680,680,685,686,686,687,196,196,196,196,196,
 
 /* block 56 */
  70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
  70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
- 70, 70, 70, 70, 70, 70,221,221,221,221,221,638,147,147,147,147,
-147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
-147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
-147,147,147,147,147,147,147,147,147,147,147,147,147,639,639,639,
-639,639,148,147,147,147,639,639,639,639,639, 70, 70, 70, 70, 70,
- 70, 70, 70, 70, 70, 70, 70, 70,640,641, 70, 70, 70,642, 70, 70,
+ 70, 70, 70, 70, 70, 70,256,256,256,256,256,688,149,149,149,149,
+149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+149,149,149,149,149,149,149,149,149,149,149,149,149,689,689,689,
+689,689,150,149,149,149,689,689,689,689,689, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70,690,691, 70, 70, 70,692, 70, 70,
 
 /* block 57 */
- 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,643, 70,
- 70, 70, 70, 70, 70, 70,644, 70, 70, 70, 70,645,645,645,645,645,
-645,645,645,645,646,645,645,645,646,645,645,645,645,645,645,645,
-645,645,645,645,645,645,645,645,645,645,645,645,645,645,645,647,
-648,648,158,158,154,154,154,154,154,154,154,154,154,154,154,154,
-158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,158,
-158,158,158,158,158,158,158,574,574,574,574,574,574,574,574,574,
-574,574,574,574,574,154,154,154,649,154,650,154,154,154,154,154,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,693, 70,
+ 70, 70, 70, 70, 70, 70,694, 70, 70, 70, 70,695,695,695,695,695,
+695,695,695,695,696,695,695,695,696,695,695,695,695,695,695,695,
+695,695,695,695,695,695,695,695,695,695,695,695,695,695,695,697,
+698,698,189,189,176,176,176,176,176,176,176,176,176,176,176,176,
+189,189,189,624,624,624,624,624,624,624,624,624,624,624,624,624,
+624,624,624,624,624,624,624,624,624,624,624,624,624,624,624,624,
+624,624,624,624,624,176,176,176,699,176,700,176,176,176,176,176,
 
 /* block 58 */
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
@@ -2986,12 +3230,12 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
-651,652, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+701,702, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
 
 /* block 59 */
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
- 65, 66, 65, 66, 65, 66, 69, 69, 69, 69,653,654, 70, 70,655, 70,
+ 65, 66, 65, 66, 65, 66, 69, 69, 69, 69,703,704, 70, 70,705, 70,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 67, 65, 66, 65, 66,
@@ -3000,123 +3244,123 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
 
 /* block 60 */
-656,656,656,656,656,656,656,656,657,657,657,657,657,657,657,657,
-656,656,656,656,656,656,163,163,657,657,657,657,657,657,163,163,
-656,656,656,656,656,656,656,656,657,657,657,657,657,657,657,657,
-656,656,656,656,656,656,656,656,657,657,657,657,657,657,657,657,
-656,656,656,656,656,656,163,163,657,657,657,657,657,657,163,163,
-173,656,173,656,173,656,173,656,163,657,163,657,163,657,163,657,
-656,656,656,656,656,656,656,656,657,657,657,657,657,657,657,657,
-658,658,659,659,659,659,660,660,661,661,662,662,663,663,163,163,
+706,706,706,706,706,706,706,706,707,707,707,707,707,707,707,707,
+706,706,706,706,706,706,196,196,707,707,707,707,707,707,196,196,
+706,706,706,706,706,706,706,706,707,707,707,707,707,707,707,707,
+706,706,706,706,706,706,706,706,707,707,707,707,707,707,707,707,
+706,706,706,706,706,706,196,196,707,707,707,707,707,707,196,196,
+708,706,708,706,708,706,708,706,196,707,196,707,196,707,196,707,
+706,706,706,706,706,706,706,706,707,707,707,707,707,707,707,707,
+709,709,710,710,710,710,711,711,712,712,713,713,714,714,196,196,
 
 /* block 61 */
-664,664,664,664,664,664,664,664,665,665,665,665,665,665,665,665,
-664,664,664,664,664,664,664,664,665,665,665,665,665,665,665,665,
-664,664,664,664,664,664,664,664,665,665,665,665,665,665,665,665,
-656,656,666,667,666,163,173,666,657,657,668,668,669,162,670,162,
-162,162,666,667,666,163,173,666,671,671,671,671,669,162,162,162,
-656,656,173,173,163,163,173,173,657,657,672,672,163,162,162,162,
-656,656,173,173,173,215,173,173,657,657,673,673,220,162,162,162,
-163,163,666,667,666,163,173,666,674,674,675,675,669,162,162,163,
+715,715,715,715,715,715,715,715,716,716,716,716,716,716,716,716,
+715,715,715,715,715,715,715,715,716,716,716,716,716,716,716,716,
+715,715,715,715,715,715,715,715,716,716,716,716,716,716,716,716,
+706,706,717,718,717,196,708,717,707,707,719,719,720,201,721,201,
+201,201,717,718,717,196,708,717,722,722,722,722,720,201,201,201,
+706,706,708,723,196,196,708,708,707,707,724,724,196,201,201,201,
+706,706,708,725,708,250,708,708,707,707,726,726,255,201,201,201,
+196,196,717,718,717,196,708,717,727,727,728,728,720,201,201,196,
 
 /* block 62 */
-676,676,676,676,676,676,676,676,676,676,676, 51,677,678,679,680,
-681,681,681,681,681,681,682, 43,683,684,685,686,686,687,685,686,
- 43, 43, 43, 43,688, 43, 43,688,689,690,691,692,693,694,695,696,
-697,697,698,698,698, 43, 43, 43, 43, 49, 57, 43,699,700, 43,701,
-702, 43, 43, 43,703,704,705,700,700,699, 43, 43, 43, 43, 43, 43,
- 43, 43, 50,706,701, 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,676,
- 51,707,707,707,707,708,709,710,711,712,713,713,713,713,713,713,
- 54,646,163,163, 54, 54, 54, 54, 54, 54,714,715,716,717,718,645,
+729,729,729,729,729,729,729,729,729,729,729, 51,730,731,732,733,
+734,734,734,734,734,734,735, 43,736,737,738,739,739,740,738,739,
+ 43, 43, 43, 43,741, 43, 43,742,743,744,745,746,747,748,749,750,
+751,751,752,752,752, 43, 43, 43, 43, 49, 57, 43,753,754, 43,755,
+756, 43, 43, 43,757,758,759,754,754,753, 43, 43, 43, 43, 43,760,
+ 43, 43, 50,761,755, 43, 43, 43, 43, 43,762, 43, 43,763, 43,729,
+ 51,764,764,764,764,765,766,767,768,769,770,770,770,770,770,770,
+ 54,696,196,196, 54, 54, 54, 54, 54, 54,771,772,773,774,775,695,
 
 /* block 63 */
- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,714,715,716,717,718,163,
-645,645,645,645,645,645,645,645,645,645,645,645,645,163,163,163,
-430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,
-430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,
-430,719,719,719,719,719,719,719,719,719,719,719,719,719,719,719,
-720,720,720,720,720,720,720,720,720,720,720,720,720,721,721,721,
-721,720,721,722,721,720,720,158,158,158,158,720,720,720,720,720,
-723,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,771,772,773,774,775,196,
+695,695,695,695,695,695,695,695,695,695,695,695,695,196,196,196,
+479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
+479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
+479,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,
+777,777,777,777,777,777,777,777,777,777,777,777,777,778,778,778,
+778,777,778,779,778,777,777,189,189,189,189,777,777,777,777,777,
+780,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 64 */
-724,724,725,724,724,724,724,725,724,724,726,725,725,725,726,726,
-725,725,725,726,724,725,724,724,727,725,725,725,725,725,724,724,
-724,724,728,724,725,724,729,724,725,730,731,732,725,725,733,726,
-725,725,734,725,726,735,735,735,735,736,724,724,726,726,725,725,
-716,716,716,716,716,725,726,726,737,737,724,716,724,724,738,461,
+781,781,782,781,781,781,781,782,781,781,783,782,782,782,783,783,
+782,782,782,783,781,782,781,781,784,782,782,782,782,782,781,781,
+781,781,785,781,782,781,786,781,782,787,788,789,782,782,790,783,
+782,782,791,782,783,792,792,792,792,793,781,781,783,783,782,782,
+794,794,794,794,794,782,783,783,795,795,781,794,781,781,796,510,
  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-739,739,739,739,739,739,739,739,739,739,739,739,739,739,739,739,
-740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,740,
+797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,
+798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,
 
 /* block 65 */
-741,741,741, 65, 66,741,741,741,741, 58,724,724,163,163,163,163,
- 50, 50, 50, 50,742,743,743,743,743,743, 50, 50,744,744,744,744,
- 50,744,744, 50,744,744, 50,744, 45,743,743,744,744,744, 50, 45,
-744,744, 45, 45, 45, 45,744,744, 45, 45, 45, 45,744,744,744,744,
-744,744,744,744,744,744,744,744,744,744,744,744,744,744, 50, 50,
-744,744, 50,744, 50,744,744,744,744,744,744,744, 45,744, 45, 45,
- 45, 45, 45, 45,744,744, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+799,799,799, 65, 66,799,799,799,799, 58,781,781,196,196,196,196,
+ 50, 50, 50, 50,800,801,801,801,801,801, 50, 50,802,802,802,802,
+ 50,802,802, 50,802,802, 50,802, 45,801,801,802,802,802, 50, 45,
+802,802, 45, 45, 45, 45,802,802, 45, 45, 45, 45,802,802,802,802,
+802,802,802,802,802,802,802,802,802,802,802,802,802,802, 50, 50,
+802,802, 50,802, 50,802,802,802,802,802,802,802, 45,802, 45, 45,
+ 45, 45, 45, 45,802,802, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
 
 /* block 66 */
- 50, 50, 50, 50, 50, 50, 50, 50,745,745,745,745,745,745, 50, 50,
- 50, 50,746, 53, 50,745, 50, 50, 50, 50, 50, 50, 50, 50, 50,745,
-745,745,745, 50,745, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,745,745, 50, 50,
- 50, 50, 50,745, 50,745, 50, 50, 50, 50, 50, 50,745, 50, 50, 50,
- 50, 50,745,745,745,745, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50,745,745,745,745,745,745,745,745, 50, 50,745,745,
-745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,
+ 50, 50,803, 50, 50, 50, 50,803,804,804,804,804,804,804, 50, 50,
+ 50, 50,805, 53, 50,804, 50, 50, 50, 50, 50, 50, 50, 50,803,804,
+804,804,804, 50,804, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,804,804, 50, 50,
+ 50, 50, 50,804, 50,804, 50, 50, 50, 50, 50, 50,804, 50, 50, 50,
+ 50, 50,804,804,804,804, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50,804,804,804,804,804,804,804,804, 50, 50,804,804,
+804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,
 
 /* block 67 */
-745,745,745,745,745,745,745,745,745,745,745,745, 50, 50, 50,745,
-745,745,745, 50, 50, 50, 50, 50,745, 50, 50, 50, 50, 50, 50, 50,
- 50, 50,745,745, 50, 50,745, 50,745,745, 50,745, 50, 50, 50, 50,
-745,745,745,745,745,745,745,745,745, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 50, 50,745,745,745,745,745, 50, 50,
-745,745, 50, 50, 50, 50,745,745,745,745,745,745,745,745,745,745,
-745,745,745,745,745,745,745,745,745,745,745,745,745,745, 50, 50,
-745,745,745,745,745, 50,745,745, 50, 50,745,745,745,745,745, 50,
+804,804,804,804,804,804,804,804,804,804,804,804, 50, 50, 50,804,
+804,804,804, 50, 50, 50, 50, 50,804, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50,804,804, 50, 50,804, 50,804,804, 50,804, 50, 50, 50, 50,
+804,804,804,804,804,804,804,804,804, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50,804,804,804,804,804, 50, 50,
+804,804, 50, 50, 50, 50,804,804,804,804,804,804,804,804,804,804,
+804,804,804,804,804,804,804,804,804,804,804,804,804,804, 50, 50,
+804,804,804,804,804, 50,804,804, 50, 50,804,804,804,804,804, 50,
 
 /* block 68 */
- 45, 45, 45, 45, 45, 45, 45, 45,747,748,747,748, 45, 45, 45, 45,
- 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,749,749, 45, 45, 45, 45,
- 50, 50, 45, 45, 45, 45, 45, 45, 47,750,751, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 45, 45,752,752,752,752,752,752,752,752,752,752,
-752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,
-752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,
-752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,
-752,752,752,752,752,752,752,752,752,752,752, 45, 50, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45,806,807,806,807, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,808,808, 45, 45, 45, 45,
+ 50, 50, 45, 45, 45, 45, 45, 45, 47,809,810, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45,811,811,811,811,811,811,811,811,811,811,
+811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,
+811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,
+811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,
+811,811,811,811,811,811,811,811,811,811,811, 45, 50, 45, 45, 45,
 
 /* block 69 */
- 45, 45, 45, 45, 45, 45, 45, 45,753, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 45,752, 45, 45, 45, 45, 45, 50, 50, 50, 50, 50,
+ 45, 45, 45, 45, 45, 45, 45, 45,812, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45,811, 45, 45, 45, 45, 45, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50,744,744, 45,744, 45, 45, 45, 45, 45, 45, 45, 45,
+ 50, 50, 50, 50,802,802, 45,802, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 47,
-744, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 50, 50, 50, 50,
- 50, 50,744, 45, 45, 45, 45, 45, 45,749,749,749,749, 47, 47, 47,
-749, 47, 47,749, 45, 45, 45, 45, 47, 47, 47, 45, 45, 45, 45, 45,
+802, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 50, 50, 50, 50,
+ 50, 50,802, 45, 45, 45, 45, 45, 45,808,808,808,808, 47, 47, 47,
+808, 47, 47,808, 45, 45, 45, 45, 47, 47, 47, 45, 45, 45, 45, 45,
 
 /* block 70 */
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 45, 45, 45,754,754,754,754,754,754,754,754,754,
-754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,
- 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,754,754,754,754,754,
-754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,813,813,813,813,813,813,
+813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,813,813,813,813,813,
+813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,
  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
 
 /* block 71 */
- 58, 58, 58, 58, 58, 58, 58, 58, 54, 54, 54, 54, 54, 54, 54, 54,
- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,755,755,755,755,755,755,755,755,755,755,
-755,755,756,755,755,755,755,755,755,755,755,755,755,755,755,755,
-757,757,757,757,757,757,757,757,757,757,757,757,757,757,757,757,
-757,757,757,757,757,757,757,757,757,757, 58, 58, 58, 58, 58, 58,
+ 58, 58, 58, 58, 58, 58, 58, 58,814,814,814,814,814,814,814,814,
+814,814,814,814,814,814,814,814,814,814,814,814,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,815,815,815,815,815,815,815,815,815,815,
+815,815,816,815,815,815,815,815,815,815,815,815,815,815,815,815,
+817,817,817,817,817,817,817,817,817,817,817,817,817,817,817,817,
+817,817,817,817,817,817,817,817,817,817, 58, 58, 58, 58, 58, 58,
  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
 
 /* block 72 */
@@ -3132,2322 +3376,2422 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */
 /* block 73 */
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
-744,744, 45, 45, 45, 45, 45, 45, 45, 45, 47, 47, 45, 45,744,744,
-744,744,744,744,744,744,743, 50, 45, 45, 45, 45,744,744,744,744,
-743, 50, 45, 45, 45, 45,744,744, 45, 45,744,744, 45, 45, 45,744,
-744,744,744,744, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45,744, 45,744, 45, 45,744,744,744,744,744,744, 45, 45, 45,
- 45, 45, 45, 45, 45, 45, 45, 45, 50, 50, 50,742,742,758,758, 50,
+802,802, 45, 45, 45, 45, 45, 45, 45, 45, 47, 47, 45, 45,802,802,
+802,802,802,802,802,802,801, 50, 45, 45, 45, 45,802,802,802,802,
+801, 50, 45, 45, 45, 45,802,802, 45, 45,802,802, 45, 45, 45,802,
+802,802,802,802, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45,802, 45,802, 45, 45,802,802,802,802,802,802, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 50, 50, 50,800,800,818,818, 50,
 
 /* block 74 */
- 47, 47, 47, 47, 47,759,744,753,753,753,753,753,753,753, 47,753,
-753, 47,753, 45,749,749,753,753, 47,753,753,753,753,760,753,753,
- 47,753, 47, 47,753,753, 47,753,753,753, 47,753,753,753, 47, 47,
-753,753,753,753,753,753,753,753, 47, 47, 47,753,753,753,753,753,
-743,753,743,753,753,753,753,753,749,749,749,749,749,749,749,749,
-749,749,749,749,753,753,753,753,753,753,753,753,753,753,753, 47,
-743,759,759,743,753, 47, 47,753, 47,753,753,753,753,759,759,761,
-753,753,753,753,753,753,753,753,753,753,753, 47,753,753, 47,749,
+ 47, 47, 47, 47, 47,819,802,812,812,812,812,812,812,812, 47,812,
+812, 47,812, 45,808,808,812,812, 47,812,812,812,812,820,812,812,
+ 47,812, 47, 47,812,812, 47,812,812,812, 47,812,812,812, 47, 47,
+812,812,812,812,812,812,812,812, 47, 47, 47,812,812,812,812,812,
+801,812,801,812,812,812,812,812,808,808,808,808,808,808,808,808,
+808,808,808,808,812,812,812,812,812,812,812,812,812,812,812, 47,
+801,819,819,801,812, 47, 47,812, 47,812,812,812,812,819,819,821,
+812,812,812,812,812,812,812,812,812,812,812, 47,812,812, 47,808,
 
 /* block 75 */
-753,753,753,753,753,753, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
-753,753, 47,749, 47, 47, 47, 47,753, 47,753, 47, 47,753,753,753,
- 47,749,753,753,753,753,753, 47,753,753,749,749,762,753,753,753,
- 47, 47,753,753,753,753,753,753,753,753,753,753,753,749,749,753,
-753,753,753,753,749,749,753,753, 47,753,753,753,753,753,749, 47,
-753, 47,753, 47,749,753,753,753,753,753,753,753,753,753,753,753,
-753,753,753,753,753,753,753,753,753, 47,749,753,753,753,753,753,
- 47, 47,749,749, 47,749,753, 47, 47,760,749,753,753,749,753,753,
+812,812,812,812,812,812, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+812,812, 47,808, 47, 47, 47, 47,812, 47,812, 47, 47,812,812,812,
+ 47,808,812,812,812,812,812, 47,812,812,808,808,822,812,812,812,
+ 47, 47,812,812,812,812,812,812,812,812,812,812,812,808,808,812,
+812,812,812,812,808,808,812,812, 47,812,812,812,812,812,808, 47,
+812, 47,812, 47,808,812,812,812,812,812,812,812,812,812,812,812,
+812,812,812,812,812,812,812,812,812, 47,808,812,812,812,812,812,
+ 47, 47,808,808, 47,808,812, 47, 47,820,808,812,812,808,812,812,
 
 /* block 76 */
-753,753, 47,753,753,749, 45, 45, 47, 47,763,763,760,760,753, 47,
-753,753, 47, 45, 47, 45, 47, 45, 45, 45, 45, 45, 45, 47, 45, 45,
- 45, 47, 45, 45, 45, 45, 45, 45,749, 45, 45, 45, 45, 45, 45, 45,
+812,812, 47,812,812,808, 45, 45, 47, 47,823,823,820,820,812, 47,
+812,812, 47, 45, 47, 45, 47, 45, 45, 45, 45, 45, 45, 47, 45, 45,
+ 45, 47, 45, 45, 45, 45, 45, 45,808, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 47, 47, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 47, 45, 45, 47, 45, 45, 45, 45,749, 45,749, 45,
- 45, 45, 45,749,749,749, 45,749, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 47, 47,753,753,753,704,705,704,705,704,705,704,705,
-704,705,704,705,704,705, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+ 45, 45, 45, 45, 47, 45, 45, 47, 45, 45, 45, 45,808, 45,808, 45,
+ 45, 45, 45,808,808,808, 45,808, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 47, 47,812,812,812,758,759,758,759,758,759,758,759,
+758,759,758,759,758,759, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
 
 /* block 77 */
  58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
- 58, 58, 58, 58, 45,749,749,749, 45, 45, 45, 45, 45, 45, 45, 45,
+ 58, 58, 58, 58, 45,808,808,808, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 47, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
-749, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,749,
- 50, 50, 50,745,745,747,748, 50,745,745, 50,745, 50,745, 50, 50,
- 50, 50, 50, 50, 50,745,745, 50, 50, 50, 50, 50,745,745,745, 50,
- 50, 50,745,745,745,745,747,748,747,748,747,748,747,748,747,748,
+808, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,808,
+ 50, 50, 50,804,804,806,807, 50,804,804, 50,804, 50,804, 50, 50,
+ 50, 50, 50, 50, 50,804,804, 50, 50, 50, 50, 50,804,804,804, 50,
+ 50, 50,804,804,804,804,806,807,806,807,806,807,806,807,806,807,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
 
 /* block 78 */
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
-764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
+824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,
 
 /* block 79 */
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50,742,742, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50,800,800, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
 
 /* block 80 */
- 50, 50, 50,747,748,747,748,747,748,747,748,747,748,747,748,747,
-748,747,748,747,748,747,748,747,748, 50, 50,745, 50, 50, 50, 50,
-745, 50, 50,745,745,745, 50, 50,745,745,745,745,745,745,745,745,
- 50, 50, 50, 50, 50, 50, 50, 50,745, 50, 50, 50, 50, 50, 50, 50,
-745,745, 50, 50,745,745, 50, 50, 50, 50, 50, 50, 50, 50, 50,745,
-745,745,745, 50,745,745, 50, 50,747,748,747,748, 50, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 50,745,745, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50, 50,745, 50, 50,745,745, 50, 50,747,748, 50, 50,
+ 50, 50, 50,806,807,806,807,806,807,806,807,806,807,806,807,806,
+807,806,807,806,807,806,807,806,807, 50, 50,804, 50, 50, 50, 50,
+804, 50, 50,804,804,804, 50, 50,804,804,804,804,804,804,804,804,
+ 50, 50, 50, 50, 50, 50, 50, 50,804, 50, 50, 50, 50, 50, 50, 50,
+804,804, 50, 50,804,804, 50, 50, 50, 50, 50, 50, 50, 50, 50,804,
+804,804,804, 50,804,804, 50, 50,806,807,806,807, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50,804,804, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50,804, 50, 50,804,804, 50, 50,806,807, 50, 50,
 
 /* block 81 */
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,745,745,745,745, 50,
- 50, 50, 50, 50,745,745, 50, 50, 50, 50, 50, 50,745,745, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,804,804,804,804, 50,
+ 50, 50, 50, 50,804,804, 50, 50, 50, 50, 50, 50,804,804, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50,745,745, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
- 50, 50, 50, 50, 50, 50, 50, 50, 50,745,745,745,745,745,745,745,
+ 50, 50, 50, 50,804,804, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
+ 50, 50, 50, 50, 50, 50, 50, 50, 50,804,804,804,804,804,804,804,
 
 /* block 82 */
-745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,
-745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,
-745,745,745, 50, 50, 50,745,745,745,745,745,745,745,745, 50,745,
-745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,
-745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,745,
-745,745,745,745,745,745,745, 50, 50, 50, 50, 50, 50, 50,745, 50,
- 50, 50, 50,745,745,745, 50, 50, 50, 50, 50, 50,745,745,745, 50,
- 50, 50, 50, 50, 50, 50, 50,745,745,745,745, 50, 50, 50, 50, 50,
+804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,
+804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,
+804,804,804, 50, 50, 50,804,804,804,804,804,804,804,804, 50,804,
+804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,
+804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,
+804,804,804,804,804,804,804, 50, 50, 50, 50, 50, 50, 50,804, 50,
+ 50, 50, 50,804,804,804, 50, 50, 50, 50, 50, 50,804,804,804, 50,
+ 50, 50, 50, 50, 50, 50, 50,804,804,804,804, 50, 50, 50, 50, 50,
 
 /* block 83 */
  45, 45, 45, 45, 45, 47, 47, 47, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,749,749, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,808,808, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,
  50, 50, 50, 50, 50, 45, 45, 50, 50, 50, 50, 50, 50, 45, 45, 45,
-749, 45, 45, 45, 45,749, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+808, 45, 45, 45, 45,808, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45,754,754, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45,813,813, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
 
 /* block 84 */
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 45, 45,754, 45, 45, 45, 45, 45, 45, 45, 45, 45,
+ 45, 45, 45, 45, 45, 45,813, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
  45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
- 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,765, 45,
+ 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45,825, 45,
 
 /* block 85 */
-766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,
-766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,
-766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,766,
-767,767,767,767,767,767,767,767,767,767,767,767,767,767,767,767,
-767,767,767,767,767,767,767,767,767,767,767,767,767,767,767,767,
-767,767,767,767,767,767,767,767,767,767,767,767,767,767,767,767,
- 65, 66,768,769,770,771,772, 65, 66, 65, 66, 65, 66,773,774,775,
-776, 70, 65, 66, 70, 65, 66, 70, 70, 70, 70, 70,646,645,777,777,
+826,826,826,826,826,826,826,826,826,826,826,826,826,826,826,826,
+826,826,826,826,826,826,826,826,826,826,826,826,826,826,826,826,
+826,826,826,826,826,826,826,826,826,826,826,826,826,826,826,826,
+827,827,827,827,827,827,827,827,827,827,827,827,827,827,827,827,
+827,827,827,827,827,827,827,827,827,827,827,827,827,827,827,827,
+827,827,827,827,827,827,827,827,827,827,827,827,827,827,827,827,
+ 65, 66,828,829,830,831,832, 65, 66, 65, 66, 65, 66,833,834,835,
+836, 70, 65, 66, 70, 65, 66, 70, 70, 70, 70, 70,696,695,837,837,
 
 /* block 86 */
-211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
-211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
-211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
-211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
-211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
-211,212,211,212,211,212,211,212,211,212,211,212,211,212,211,212,
-211,212,211,212,778,779,779,779,779,779,779,211,212,211,212,780,
-780,780,211,212,163,163,163,163,163,781,781,781,781,782,781,781,
+246,247,246,247,246,247,246,247,246,247,246,247,246,247,246,247,
+246,247,246,247,246,247,246,247,246,247,246,247,246,247,246,247,
+246,247,246,247,246,247,246,247,246,247,246,247,246,247,246,247,
+246,247,246,247,246,247,246,247,246,247,246,247,246,247,246,247,
+246,247,246,247,246,247,246,247,246,247,246,247,246,247,246,247,
+246,247,246,247,246,247,246,247,246,247,246,247,246,247,246,247,
+246,247,246,247,838,839,839,839,839,839,839,246,247,246,247,840,
+840,840,246,247,196,196,196,196,196,841,841,841,842,843,842,842,
 
 /* block 87 */
-783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
-783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
-783,783,783,783,783,783,163,783,163,163,163,163,163,783,163,163,
-784,784,784,784,784,784,784,784,784,784,784,784,784,784,784,784,
-784,784,784,784,784,784,784,784,784,784,784,784,784,784,784,784,
-784,784,784,784,784,784,784,784,784,784,784,784,784,784,784,784,
-784,784,784,784,784,784,784,784,163,163,163,163,163,163,163,785,
-786,163,163,163,163,163,163,163,163,163,163,163,163,163,163,787,
+844,844,844,844,844,844,844,844,844,844,844,844,844,844,844,844,
+844,844,844,844,844,844,844,844,844,844,844,844,844,844,844,844,
+844,844,844,844,844,844,196,844,196,196,196,196,196,844,196,196,
+845,845,845,845,845,845,845,845,845,845,845,845,845,845,845,845,
+845,845,845,845,845,845,845,845,845,845,845,845,845,845,845,845,
+845,845,845,845,845,845,845,845,845,845,845,845,845,845,845,845,
+845,845,845,845,845,845,845,845,196,196,196,196,196,196,196,846,
+847,196,196,196,196,196,196,196,196,196,196,196,196,196,196,848,
 
 /* block 88 */
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,
-484,484,484,484,484,484,484,163,163,163,163,163,163,163,163,163,
-484,484,484,484,484,484,484,163,484,484,484,484,484,484,484,163,
-484,484,484,484,484,484,484,163,484,484,484,484,484,484,484,163,
-484,484,484,484,484,484,484,163,484,484,484,484,484,484,484,163,
-484,484,484,484,484,484,484,163,484,484,484,484,484,484,484,163,
-788,788,788,788,788,788,788,788,788,788,788,788,788,788,788,788,
-788,788,788,788,788,788,788,788,788,788,788,788,788,788,788,788,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,
+533,533,533,533,533,533,533,196,196,196,196,196,196,196,196,196,
+533,533,533,533,533,533,533,196,533,533,533,533,533,533,533,196,
+533,533,533,533,533,533,533,196,533,533,533,533,533,533,533,196,
+533,533,533,533,533,533,533,196,533,533,533,533,533,533,533,196,
+533,533,533,533,533,533,533,196,533,533,533,533,533,533,533,196,
+849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,
+849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,
 
 /* block 89 */
- 43, 43,789,790,789,790, 43, 43, 43,789,790, 43,789,790, 43, 43,
- 43, 43, 43, 43, 43, 43, 43,681, 43, 43,681, 43,789,790, 43, 43,
-789,790,704,705,704,705,704,705,704,705, 43, 43, 43, 43,700,791,
- 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,681,681,700, 43, 43, 43,
-681,792,685,793, 43, 43, 43, 43, 43, 43, 43, 43,792, 43,792,792,
- 45, 45, 43,700,700,704,705,704,705,704,705,704,705,681,754,754,
-754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,
-754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,754,
+ 43, 43,850,851,850,851, 43, 43, 43,850,851, 43,850,851, 43, 43,
+ 43, 43, 43, 43, 43, 43, 43,852, 43, 43,734, 43,850,851, 43, 43,
+850,851,758,759,758,759,758,759,758,759, 43, 43, 43, 43,754,853,
+854,855, 43, 43, 43, 43, 43, 43, 43, 43,734,734,856, 43, 43, 43,
+734,857,738,858, 43, 43, 43, 43, 43, 43, 43, 43,859, 43,859,859,
+ 45, 45, 43,754,754,758,759,758,759,758,759,758,759,734,813,813,
+813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,
+813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,813,
 
 /* block 90 */
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,163,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,163,163,163,163,163,163,163,163,163,163,163,163,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,196,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 91 */
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
 
 /* block 92 */
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,794,
-794,794,794,794,794,794,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-795,795,796,796,795,795,795,795,795,795,795,795,163,163,163,163,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,860,
+860,860,860,860,860,860,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+861,861,862,862,861,861,861,861,861,861,861,861,861,861,863,863,
 
 /* block 93 */
-676,797,798,799,724,800,801,802,803,804,803,804,805,806,805,806,
-803,804, 45,807,803,804,803,804,803,804,803,804,808,809,810,810,
- 45,802,802,802,802,802,802,802,802,802,811,811,811,811,812,812,
-813,814,814,814,814,814,724,815,802,802,802,816,817,818,819,819,
-163,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
+729,864,865,866,781,867,868,869,870,871,872,873,874,875,874,875,
+876,877, 45,878,876,877,876,877,876,877,876,877,879,880,881,881,
+ 45,869,869,869,869,869,869,869,869,869,882,882,882,882,883,883,
+884,885,885,885,885,885,781,886,869,869,869,887,888,889,890,890,
+196,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
 
 /* block 94 */
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,163,163,821,821,822,822,823,823,820,
-824,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
-825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
-825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
-825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
-825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
-825,825,825,825,825,825,825,825,825,825,825,826,827,828,828,825,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,196,196,892,892,893,893,894,894,891,
+895,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
+896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
+896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
+896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
+896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
+896,896,896,896,896,896,896,896,896,896,896,897,898,899,899,896,
 
 /* block 95 */
-163,163,163,163,163,829,829,829,829,829,829,829,829,829,829,829,
-829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
-829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
-163,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,
-830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,
-830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,
-830,830,830,830,831,830,830,830,830,830,830,830,830,830,830,830,
-830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,
+196,196,196,196,196,900,900,900,900,900,900,900,900,900,900,900,
+900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,
+900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,
+196,901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,
+901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,
+901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,
+901,901,901,901,902,901,901,901,901,901,901,901,901,901,901,901,
+901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,
 
 /* block 96 */
-830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,163,
-832,832,833,833,833,833,832,832,832,832,832,832,832,832,832,832,
-829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
-829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,
-819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
-819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,
-819,819,819,819,163,163,163,163,163,163,163,163,163,163,163,163,
-825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
+901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,196,
+903,903,904,904,904,904,903,903,903,903,903,903,903,903,903,903,
+900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,
+900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,900,
+890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,
+890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,890,
+890,890,890,890,890,890,196,196,196,196,196,196,196,196,196,861,
+896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
 
 /* block 97 */
-834,834,834,834,834,834,834,834,834,834,834,834,834,834,834,834,
-834,834,834,834,834,834,834,834,834,834,834,834,834,835,835,163,
-833,833,833,833,833,833,833,833,833,833,832,832,832,832,832,832,
-832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,
-832,832,832,832,832,832,832,832,836,836,836,836,836,836,836,836,
-724, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-834,834,834,834,834,834,834,834,834,834,834,834,834,834,834,834,
-834,834,834,834,834,834,834,834,834,834,834,834,835,835,835,461,
+905,905,905,905,905,905,905,905,905,905,905,905,905,905,905,905,
+905,905,905,905,905,905,905,905,905,905,905,905,905,906,906,196,
+904,904,904,904,904,904,904,904,904,904,903,903,903,903,903,903,
+903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,
+903,903,903,903,903,903,903,903,907,907,907,907,907,907,907,907,
+781, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+905,905,905,905,905,905,905,905,905,905,905,905,905,905,905,905,
+905,905,905,905,905,905,905,905,905,905,905,905,906,906,906,510,
 
 /* block 98 */
-833,833,833,833,833,833,833,833,833,833,832,832,832,832,832,832,
-832,832,832,832,832,832,832,837,832,837,832,832,832,832,832,832,
-832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,
-832, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-832,832,832,832,832,832,832,832,832,832,832,832,724,724,724,724,
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,832,
+904,904,904,904,904,904,904,904,904,904,903,903,903,903,903,903,
+903,903,903,903,903,903,903,908,903,908,903,903,903,903,903,903,
+903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,
+903, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+903,903,903,903,903,903,903,903,903,903,903,903,781,781,781,781,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,903,
 
 /* block 99 */
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
-838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,
-838,838,838,838,838,838,838,838,832,832,832,832,832,832,832,832,
-832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,
-832,461,461,461,461,461,461,724,724,724,724,832,832,832,832,832,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,
+909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,909,
+909,909,909,909,909,909,909,909,903,903,903,903,903,903,903,903,
+903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,
+903,510,510,510,510,510,510,781,781,781,781,903,903,903,903,903,
 
 /* block 100 */
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,724,724,
-832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,
-832,832,832,832,832,832,832,832,832,832,832,832,832,832,832,724,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,781,781,
+903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,
+903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,781,
 
 /* block 101 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 
 /* block 102 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
 
 /* block 103 */
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,841,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,912,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
 
 /* block 104 */
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
-840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,840,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
+911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,911,
 
 /* block 105 */
-840,840,840,840,840,840,840,840,840,840,840,840,840,163,163,163,
-842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,
-842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,
-842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,842,
-842,842,842,842,842,842,842,163,163,163,163,163,163,163,163,163,
-843,843,843,843,843,843,843,843,843,843,843,843,843,843,843,843,
-843,843,843,843,843,843,843,843,843,843,843,843,843,843,843,843,
-843,843,843,843,843,843,843,843,844,844,844,844,844,844,845,846,
+911,911,911,911,911,911,911,911,911,911,911,911,911,196,196,196,
+913,913,913,913,913,913,913,913,913,913,913,913,913,913,913,913,
+913,913,913,913,913,913,913,913,913,913,913,913,913,913,913,913,
+913,913,913,913,913,913,913,913,913,913,913,913,913,913,913,913,
+913,913,913,913,913,913,913,196,196,196,196,196,196,196,196,196,
+914,914,914,914,914,914,914,914,914,914,914,914,914,914,914,914,
+914,914,914,914,914,914,914,914,914,914,914,914,914,914,914,914,
+914,914,914,914,914,914,914,914,915,915,915,915,915,915,916,917,
 
 /* block 106 */
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
 
 /* block 107 */
-847,847,847,847,847,847,847,847,847,847,847,847,848,849,850,850,
-847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,847,
-851,851,851,851,851,851,851,851,851,851,847,847,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-240,241,240,241,240,241,240,241,240,241,852,853,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,854,246,
-248,248,248,855,788,788,788,788,788,788,788,788,856,856,855,857,
+918,918,918,918,918,918,918,918,918,918,918,918,919,920,921,921,
+918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,
+922,922,922,922,922,922,922,922,922,922,918,918,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+275,276,275,276,275,276,275,276,275,276,923,924,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,925,281,
+283,283,283,926,849,849,849,849,849,849,849,849,927,927,926,928,
 
 /* block 108 */
-240,241,240,241,240,241,240,241,240,241,240,241,240,241,240,241,
-240,241,240,241,240,241,240,241,240,241,240,241,858,858,788,788,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,860,860,860,860,860,860,860,860,860,860,
-861,861,862,863,864,864,864,863,163,163,163,163,163,163,163,163,
+275,276,275,276,275,276,275,276,275,276,275,276,275,276,275,276,
+275,276,275,276,275,276,275,276,275,276,275,276,929,929,849,849,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,931,931,931,931,931,931,931,931,931,931,
+932,932,933,934,935,935,935,934,196,196,196,196,196,196,196,196,
 
 /* block 109 */
-865,865,865,865,865,865,865,865, 46, 46, 46, 46, 46, 46, 46, 46,
- 46, 46, 46, 46, 46, 46, 46,149,149,149,149,149,149,149,149,149,
+936,936,936,936,936,936,936,936, 46, 46, 46, 46, 46, 46, 46, 46,
+ 46, 46, 46, 46, 46, 46, 46,151,151,151,151,151,151,151,151,151,
  46, 46, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  70, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
  65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
-645, 70, 70, 70, 70, 70, 70, 70, 70, 65, 66, 65, 66,866, 65, 66,
+695, 70, 70, 70, 70, 70, 70, 70, 70, 65, 66, 65, 66,937, 65, 66,
 
 /* block 110 */
- 65, 66, 65, 66, 65, 66, 65, 66,149,867,867, 65, 66,868, 70, 92,
- 65, 66, 65, 66,869, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
- 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,870,871,872,873,870, 70,
-874,875,876,877, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
- 65, 66, 65, 66,878,879,880, 65, 66, 65, 66,163,163,163,163,163,
- 65, 66,163, 70,163, 70, 65, 66, 65, 66,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,645,645,645, 65, 66, 92,147,147, 70, 92, 92, 92, 92, 92,
+ 65, 66, 65, 66, 65, 66, 65, 66,151,938,938, 65, 66,939, 70, 93,
+ 65, 66, 65, 66,940, 70, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,941,942,943,944,941, 70,
+945,946,947,948, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66, 65, 66,
+ 65, 66, 65, 66,949,950,951, 65, 66, 65, 66,952, 65, 66,196,196,
+ 65, 66,196, 70,196, 70, 65, 66, 65, 66, 65, 66,953,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,695,695,695, 65, 66, 93,149,149, 70, 93, 93, 93, 93, 93,
 
 /* block 111 */
-881,881,882,881,881,881,883,881,881,881,881,882,881,881,881,881,
-881,881,881,881,881,881,881,881,881,881,881,881,881,881,881,881,
-881,881,881,884,884,882,882,884,885,885,885,885,883,163,163,163,
-886,886,886,887,887,887,888,888,889,890,163,163,163,163,163,163,
-891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
-891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
-891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
-891,891,891,891,892,892,893,893,163,163,163,163,163,163,163,163,
+954,954,955,954,954,954,956,954,954,954,954,955,954,954,954,954,
+954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,
+954,954,954,957,957,955,955,957,958,958,958,958,956,196,196,196,
+959,959,959,960,960,960,961,961,962,963,196,196,196,196,196,196,
+964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,
+964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,
+964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,
+964,964,964,964,965,965,966,966,196,196,196,196,196,196,196,196,
 
 /* block 112 */
-894,894,895,895,895,895,895,895,895,895,895,895,895,895,895,895,
-895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,
-895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,895,
-895,895,895,895,894,894,894,894,894,894,894,894,894,894,894,894,
-894,894,894,894,896,897,163,163,163,163,163,163,163,163,898,898,
-899,899,899,899,899,899,899,899,899,899,163,163,163,163,163,163,
-336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,
-336,900,335,901,335,335,335,335,343,343,343,335,343,335,335,333,
+967,967,968,968,968,968,968,968,968,968,968,968,968,968,968,968,
+968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,
+968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,
+968,968,968,968,967,967,967,967,967,967,967,967,967,967,967,967,
+967,967,967,967,969,970,196,196,196,196,196,196,196,196,971,971,
+972,972,972,972,972,972,972,972,972,972,196,196,196,196,196,196,
+378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,
+378,973,376,974,376,376,376,376,385,385,385,376,385,376,376,374,
 
 /* block 113 */
-902,902,902,902,902,902,902,902,902,902,903,903,903,903,903,903,
-903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,903,
-903,903,903,903,903,903,904,904,904,904,904,905,905,905,906,907,
-908,908,908,908,908,908,908,908,908,908,908,908,908,908,908,908,
-908,908,908,908,908,908,908,909,909,909,909,909,909,909,909,909,
-909,909,910,911,163,163,163,163,163,163,163,163,163,163,163,912,
-479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,479,
-479,479,479,479,479,479,479,479,479,479,479,479,479,163,163,163,
+975,975,975,975,975,975,975,975,975,975,976,976,976,976,976,976,
+976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,
+976,976,976,976,976,976,977,977,977,977,977,978,978,978,979,980,
+981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,
+981,981,981,981,981,981,981,982,982,982,982,982,982,982,982,982,
+982,982,983,984,196,196,196,196,196,196,196,196,196,196,196,985,
+528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,528,
+528,528,528,528,528,528,528,528,528,528,528,528,528,196,196,196,
 
 /* block 114 */
-913,913,913,914,915,915,915,915,915,915,915,915,915,915,915,915,
-915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,
-915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,915,
-915,915,915,916,914,914,913,913,913,913,914,914,913,913,914,914,
-917,918,918,918,918,918,918,919,920,920,918,918,918,918,163,921,
-922,922,922,922,922,922,922,922,922,922,163,163,163,163,918,918,
-462,462,462,462,462,472,923,462,462,462,462,462,462,462,462,462,
-473,473,473,473,473,473,473,473,473,473,462,462,462,462,462,163,
+986,986,986,987,988,988,988,988,988,988,988,988,988,988,988,988,
+988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,
+988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,
+988,988,988,989,987,987,986,986,986,986,987,987,986,986,987,987,
+990,991,991,991,991,991,991,992,993,993,991,991,991,991,196,994,
+995,995,995,995,995,995,995,995,995,995,196,196,196,196,991,991,
+511,511,511,511,511,521,996,511,511,511,511,511,511,511,511,511,
+522,522,522,522,522,522,522,522,522,522,511,511,511,511,511,196,
 
 /* block 115 */
-924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,
-924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,
-924,924,924,924,924,924,924,924,924,925,925,925,925,925,925,926,
-926,925,925,926,926,925,925,163,163,163,163,163,163,163,163,163,
-924,924,924,925,924,924,924,924,924,924,924,924,925,926,163,163,
-927,927,927,927,927,927,927,927,927,927,163,163,928,929,929,929,
-462,462,462,462,462,462,462,462,462,462,462,462,462,462,462,462,
-923,462,462,462,462,462,462,474,474,474,462,471,472,471,462,462,
+997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,
+997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,
+997,997,997,997,997,997,997,997,997,998,998,998,998,998,998,999,
+999,998,998,999,999,998,998,196,196,196,196,196,196,196,196,196,
+997,997,997,998,997,997,997,997,997,997,997,997,998,999,196,196,
+1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,196,196,1001,1002,1002,1002,
+511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,
+996,511,511,511,511,511,511,523,523,523,511,520,521,520,511,511,
 
 /* block 116 */
-930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
-930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
-930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
-931,930,931,931,931,932,932,931,931,932,930,932,932,930,931,933,
-934,933,934,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,930,930,935,936,937,
-938,938,938,938,938,938,938,938,938,938,938,939,940,940,939,939,
-941,941,938,942,942,939,943,163,163,163,163,163,163,163,163,163,
+1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,
+1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,
+1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,
+1004,1003,1004,1004,1004,1005,1005,1004,1004,1005,1003,1005,1005,1003,1004,1006,
+1007,1006,1007,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,1003,1003,1008,1009,1010,
+1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1012,1013,1013,1012,1012,
+1014,1014,1011,1015,1015,1012,1016,196,196,196,196,196,196,196,196,196,
 
 /* block 117 */
-163,484,484,484,484,484,484,163,163,484,484,484,484,484,484,163,
-163,484,484,484,484,484,484,163,163,163,163,163,163,163,163,163,
-484,484,484,484,484,484,484,163,484,484,484,484,484,484,484,163,
+196,533,533,533,533,533,533,196,196,533,533,533,533,533,533,196,
+196,533,533,533,533,533,533,196,196,196,196,196,196,196,196,196,
+533,533,533,533,533,533,533,196,533,533,533,533,533,533,533,196,
  70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
  70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,
- 70, 70, 70,944, 70, 70, 70, 70, 70, 70, 70,867,147,147,147,147,
- 70, 70, 70, 70, 70,221, 70, 70, 70,147, 46, 46,163,163,163,163,
-945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,
+ 70, 70, 70,1017, 70, 70, 70, 70, 70, 70, 70,938,149,149,149,149,
+ 70, 70, 70, 70, 70,256, 70, 70, 70,149, 46, 46,196,196,196,196,
+1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,
 
 /* block 118 */
-945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,
-945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,
-945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,
-945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,
-938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,
-938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,
-938,938,938,939,939,940,939,939,940,939,939,941,946,943,163,163,
-947,947,947,947,947,947,947,947,947,947,163,163,163,163,163,163,
+1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,
+1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,
+1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,
+1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,
+1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,
+1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,
+1011,1011,1011,1012,1012,1013,1012,1012,1013,1012,1012,1014,1019,1016,196,196,
+1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,196,196,196,196,196,196,
 
 /* block 119 */
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
 
 /* block 120 */
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
 
 /* block 121 */
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
 
 /* block 122 */
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
 
 /* block 123 */
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
 
 /* block 124 */
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
 
 /* block 125 */
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,948,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,948,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
 
 /* block 126 */
-949,949,949,949,949,949,949,949,948,949,949,949,949,949,949,949,
-949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,
-949,949,949,949,163,163,163,163,163,163,163,163,163,163,163,163,
-482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,
-482,482,482,482,482,482,482,163,163,163,163,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,483,
-483,483,483,483,483,483,483,483,483,483,483,483,163,163,163,163,
+1022,1022,1022,1022,1022,1022,1022,1022,1021,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,
+1022,1022,1022,1022,196,196,196,196,196,196,196,196,196,196,196,196,
+531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,531,
+531,531,531,531,531,531,531,196,196,196,196,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,532,
+532,532,532,532,532,532,532,532,532,532,532,532,196,196,196,196,
 
 /* block 127 */
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
-950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
+1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
 
 /* block 128 */
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
 
 /* block 129 */
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
 
 /* block 130 */
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,839,839,
-952,839,952,839,839,952,952,952,952,952,952,952,952,952,952,839,
-952,839,952,839,839,952,952,839,839,839,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,163,163,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,910,910,
+1025,910,1025,910,910,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,910,
+1025,910,1025,910,910,1025,1025,910,910,910,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,196,196,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
 
 /* block 131 */
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 132 */
-653,653,653,653,653,653,653,163,163,163,163,163,163,163,163,163,
-163,163,163,257,257,257,257,257,163,163,163,163,163,270,265,270,
-270,270,270,270,270,270,270,270,270,953,270,270,270,270,270,270,
-270,270,270,270,270,270,270,262,270,270,270,270,270,262,270,262,
-270,270,262,270,270,262,270,270,270,270,270,270,270,270,270,270,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+703,703,703,703,703,1026,1027,196,196,196,196,196,196,196,196,196,
+196,196,196,292,292,292,292,292,196,196,196,196,196,305,300,305,
+305,305,305,305,305,305,305,305,305,1028,305,305,305,305,305,305,
+305,305,305,305,305,305,305,297,305,305,305,305,305,297,305,297,
+305,305,297,305,305,297,305,305,305,305,305,305,305,305,305,305,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
 
 /* block 133 */
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,331,331,331,331,331,331,331,331,331,331,331,331,331,331,
-331,331,331,302,302,302,302,302,302,302,302,302,302,302,302,302,
-302,302,302,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,370,370,370,370,370,370,370,370,370,370,370,370,370,370,
+370,370,370,340,340,340,340,340,340,340,340,340,340,340,340,340,
+340,340,340,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
 
 /* block 134 */
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,954,954,
-954,954,954,954,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,1029,1029,
+1029,1029,1029,1029,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
 
 /* block 135 */
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
 
 /* block 136 */
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,955,956,
-280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,280,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,1030,1031,
+315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,315,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
 
 /* block 137 */
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-302,302,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,302,302,302,302,302,302,302,280,
-957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,
-957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,
-286,286,958,286,286,286,286,286,286,286,954,954,277,959,280,280,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+340,340,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,340,340,340,340,340,340,340,315,
+1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,
+1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,
+321,321,1033,321,321,321,321,321,321,321,1029,1029,312,1034,315,315,
 
 /* block 138 */
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,961,
-962,962,962,963,962,962,962,964,965,962,163,163,163,163,163,163,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,856,856,
-962,966,966,701,701,964,965,964,965,964,965,964,965,964,965,964,
-965,967,968,967,968,799,799,964,965,962,962,962,962,701,701,701,
-969,166,970,163,166,971,972,972,966,973,974,973,974,973,974,975,
-962,976,714,977,978,978,716,163,976,430,975,962,163,163,163,163,
-954,286,954,286,954,302,954,286,954,286,954,286,954,286,954,286,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1036,
+1037,1037,1038,1039,1037,1038,1038,1040,1041,1037,196,196,196,196,196,196,
+176,176,176,176,176,176,176,176,176,176,176,176,176,176,927,927,
+1037,1042,1042,755,755,1040,1041,1040,1041,1040,1041,1040,1041,1040,1041,1040,
+1041,1043,1044,1043,1044,866,866,1040,1041,1037,1037,1037,1037,755,755,755,
+1045,199,1046,196,199,1047,1038,1038,1042,1048,1049,1048,1049,1048,1049,1050,
+1037,1051,1052,1053,1054,1054,794,196,1051,479,1050,1037,196,196,196,196,
+1029,321,1029,321,1029,340,1029,321,1029,321,1029,321,1029,321,1029,321,
 
 /* block 139 */
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,286,
-286,286,286,286,286,286,286,286,286,286,286,286,286,302,302, 51,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,
+321,321,321,321,321,321,321,321,321,321,321,321,321,340,340, 51,
 
 /* block 140 */
-163,972,979,975,430,975,962,980,973,974,962,714,969,981,970,982,
-983,983,983,983,983,983,983,983,983,983,971,166,978,716,978,972,
-962,984,984,984,984,984,984, 59, 59, 59, 59, 59, 59, 59, 59, 59,
- 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,973,976,974,985,701,
- 46,986,986,986,986,986,986, 62, 62, 62, 62, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,973,716,974,716,973,
-974,987,988,989,990,826,825,825,825,825,825,825,825,825,825,825,
-827,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
+196,1038,1055,1050,479,1050,1037,1056,1048,1049,1037,1052,1045,1057,1046,1058,
+1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1047,199,1054,794,1054,1038,
+1037,1060,1060,1060,1060,1060,1060, 59, 59, 59, 59, 59, 59, 59, 59, 59,
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59,1048,1051,1049,1061,755,
+ 46,1062,1062,1062,1062,1062,1062, 62, 62, 62, 62, 62, 62, 62, 62, 62,
+ 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62,1048,794,1049,794,1048,
+1049,1063,1064,1065,1066,897,896,896,896,896,896,896,896,896,896,896,
+898,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
 
 /* block 141 */
-825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,825,
-825,825,825,825,825,825,825,825,825,825,825,825,825,825,991,991,
-831,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,
-830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,163,
-163,163,830,830,830,830,830,830,163,163,830,830,830,830,830,830,
-163,163,830,830,830,830,830,830,163,163,830,830,830,163,163,163,
-430,430,716, 46,724,430,430,163,724,716,716,716,716,724,724,163,
-708,708,708,708,708,708,708,708,708,992,992,992,724,724,957,957,
+896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,896,
+896,896,896,896,896,896,896,896,896,896,896,896,896,896,1067,1067,
+902,901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,
+901,901,901,901,901,901,901,901,901,901,901,901,901,901,901,196,
+196,196,901,901,901,901,901,901,196,196,901,901,901,901,901,901,
+196,196,901,901,901,901,901,901,196,196,901,901,901,196,196,196,
+479,479,794, 46,781,479,479,196,781,794,794,794,794,781,781,196,
+765,765,765,765,765,765,765,765,765,1068,1068,1068,781,781,1032,1032,
 
 /* block 142 */
-993,993,993,993,993,993,993,993,993,993,993,993,163,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,163,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,163,993,993,163,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,163,163,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,196,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,196,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,196,1069,1069,196,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,196,196,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 143 */
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,
-993,993,993,993,993,993,993,993,993,993,993,163,163,163,163,163,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,
+1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,196,196,196,196,196,
 
 /* block 144 */
-994,995,996,163,163,163,163,997,997,997,997,997,997,997,997,997,
-997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,
-997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,
-997,997,997,997,163,163,163,998,998,998,998,998,998,998,998,998,
-999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,
-999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,
-999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,
-999,999,999,999,999,1000,1000,1000,1000,1001,1001,1001,1001,1001,1001,1001,
+1070,1071,1072,196,196,196,196,1073,1073,1073,1073,1073,1073,1073,1073,1073,
+1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,
+1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,
+1073,1073,1073,1073,196,196,196,1074,1074,1074,1074,1074,1074,1074,1074,1074,
+1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,
+1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,
+1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,
+1075,1075,1075,1075,1075,1076,1076,1076,1076,1077,1077,1077,1077,1077,1077,1077,
 
 /* block 145 */
-1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1000,1000,1001,1002,1002,163,
-724,724,724,724,724,724,724,724,724,724,724,724,724,163,163,163,
-1001,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,158,163,163,
+1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1076,1076,1077,1078,1078,196,
+781,781,781,781,781,781,781,781,781,781,781,781,781,196,196,196,
+1077,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,189,196,196,
 
 /* block 146 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 147 */
-1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,
-1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,163,163,163,
-1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,
-1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,
-1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,
-1004,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1005,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,
-1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,163,163,163,163,
+1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,
+1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,196,196,196,
+1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,
+1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,
+1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,
+1080,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1081,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,
+1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,196,196,196,196,
 
 /* block 148 */
-1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
-1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,
-1008,1008,1008,1008,163,163,163,163,163,163,163,163,163,1007,1007,1007,
-1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,
-1009,1010,1009,1009,1009,1009,1009,1009,1009,1009,1010,163,163,163,163,163,
-1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,
-1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,
-1011,1011,1011,1011,1011,1011,1012,1012,1012,1012,1012,163,163,163,163,163,
+1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,
+1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,
+1084,1084,1084,1084,196,196,196,196,196,196,196,196,196,1083,1083,1083,
+1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,
+1085,1086,1085,1085,1085,1085,1085,1085,1085,1085,1086,196,196,196,196,196,
+1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,
+1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,
+1087,1087,1087,1087,1087,1087,1088,1088,1088,1088,1088,196,196,196,196,196,
 
 /* block 149 */
-1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,
-1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,163,1014,
-1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,
-1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,
-1015,1015,1015,1015,163,163,163,163,1015,1015,1015,1015,1015,1015,1015,1015,
-1016,1017,1017,1017,1017,1017,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,
+1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,196,1090,
+1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,
+1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,
+1091,1091,1091,1091,196,196,196,196,1091,1091,1091,1091,1091,1091,1091,1091,
+1092,1093,1093,1093,1093,1093,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 150 */
-1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,
-1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,
-1018,1018,1018,1018,1018,1018,1018,1018,1019,1019,1019,1019,1019,1019,1019,1019,
-1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,
-1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,
-1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,
-1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,
-1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,
+1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,
+1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,
+1094,1094,1094,1094,1094,1094,1094,1094,1095,1095,1095,1095,1095,1095,1095,1095,
+1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,
+1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,
+1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,
+1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,
+1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,
 
 /* block 151 */
-1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,
-1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,163,163,
-1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,163,163,163,163,163,163,
-1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
-1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,
-1023,1023,1023,1023,163,163,163,163,1024,1024,1024,1024,1024,1024,1024,1024,
-1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
-1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,163,163,163,163,
+1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,
+1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,196,196,
+1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,196,196,196,196,196,196,
+1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,
+1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,
+1099,1099,1099,1099,196,196,196,196,1100,1100,1100,1100,1100,1100,1100,1100,
+1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,
+1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,196,196,196,196,
 
 /* block 152 */
-1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
-1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
-1025,1025,1025,1025,1025,1025,1025,1025,163,163,163,163,163,163,163,163,
-1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,
-1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,
-1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,
-1026,1026,1026,1026,163,163,163,163,163,163,163,163,163,163,163,1027,
-1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,163,1028,1028,1028,1028,
+1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,
+1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,
+1101,1101,1101,1101,1101,1101,1101,1101,196,196,196,196,196,196,196,196,
+1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,
+1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,
+1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,
+1102,1102,1102,1102,196,196,196,196,196,196,196,196,196,196,196,1103,
+1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,196,1104,1104,1104,1104,
 
 /* block 153 */
-1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,163,1028,1028,1028,1028,
-1028,1028,1028,163,1028,1028,163,1029,1029,1029,1029,1029,1029,1029,1029,1029,
-1029,1029,163,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,
-1029,1029,163,1029,1029,1029,1029,1029,1029,1029,163,1029,1029,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,196,1104,1104,1104,1104,
+1104,1104,1104,196,1104,1104,196,1105,1105,1105,1105,1105,1105,1105,1105,1105,
+1105,1105,196,1105,1105,1105,1105,1105,1105,1105,1105,1105,1105,1105,1105,1105,
+1105,1105,196,1105,1105,1105,1105,1105,1105,1105,196,1105,1105,196,196,196,
+1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,
+1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,
+1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,
+1106,1106,1106,1106,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 154 */
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
 
 /* block 155 */
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,1030,163,163,163,163,163,163,163,163,163,
-1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,
-1030,1030,1030,1030,1030,1030,163,163,163,163,163,163,163,163,163,163,
-1030,1030,1030,1030,1030,1030,1030,1030,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,1107,196,196,196,196,196,196,196,196,196,
+1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,
+1107,1107,1107,1107,1107,1107,196,196,196,196,196,196,196,196,196,196,
+1107,1107,1107,1107,1107,1107,1107,1107,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 156 */
-147,1031,1031,147,147,147,163,147,147,147,147,147,147,147,147,147,
-147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
-147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,
-147,163,147,147,147,147,147,147,147,147,147,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+149,1108,1108,149,149,149,196,149,149,149,149,149,149,149,149,149,
+149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,149,
+149,196,149,149,149,149,149,149,149,149,149,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 157 */
-1032,1032,1032,1032,1032,1032,262,262,1032,262,1032,1032,1032,1032,1032,1032,
-1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,
-1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,
-1032,1032,1032,1032,1032,1032,262,1032,1032,262,262,262,1032,262,262,1032,
-1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,
-1033,1033,1033,1033,1033,1033,262,1034,1035,1035,1035,1035,1035,1035,1035,1035,
-1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,
-1036,1036,1036,1036,1036,1036,1036,1037,1037,1038,1038,1038,1038,1038,1038,1038,
+1109,1109,1109,1109,1109,1109,297,297,1109,297,1109,1109,1109,1109,1109,1109,
+1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,
+1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,
+1109,1109,1109,1109,1109,1109,297,1109,1109,297,297,297,1109,297,297,1109,
+1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,
+1110,1110,1110,1110,1110,1110,297,1111,1112,1112,1112,1112,1112,1112,1112,1112,
+1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,
+1113,1113,1113,1113,1113,1113,1113,1114,1114,1115,1115,1115,1115,1115,1115,1115,
 
 /* block 158 */
-1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,
-1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,262,
-262,262,262,262,262,262,262,1040,1040,1040,1040,1040,1040,1040,1040,1040,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,
-1041,1041,1041,262,1041,1041,262,262,262,262,262,1042,1042,1042,1042,1042,
+1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,
+1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,297,
+297,297,297,297,297,297,297,1117,1117,1117,1117,1117,1117,1117,1117,1117,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,
+1118,1118,1118,297,1118,1118,297,297,297,297,297,1119,1119,1119,1119,1119,
 
 /* block 159 */
-1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,
-1043,1043,1043,1043,1043,1043,1044,1044,1044,1044,1044,1044,262,262,262,1045,
-1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,
-1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,262,262,262,262,262,1047,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,
+1120,1120,1120,1120,1120,1120,1121,1121,1121,1121,1121,1121,297,297,297,1122,
+1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,
+1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,297,297,297,297,297,1124,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 160 */
-1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,
-1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,
-1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,
-1049,1049,1049,1049,1049,1049,1049,1049,262,262,262,262,1050,1050,1049,1049,
-1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,
-262,262,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,
-1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,
-1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,
+1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,
+1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,
+1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,
+1126,1126,1126,1126,1126,1126,1126,1126,297,297,297,297,1127,1127,1126,1126,
+1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,
+297,297,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,
+1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,
+1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,
 
 /* block 161 */
-1051,1052,1052,1052,262,1052,1052,262,262,262,262,262,1052,1052,1052,1052,
-1051,1051,1051,1051,262,1051,1051,1051,262,1051,1051,1051,1051,1051,1051,1051,
-1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,
-1051,1051,1051,1051,1051,1051,262,262,1053,1053,1053,262,262,262,262,1054,
-1055,1055,1055,1055,1055,1055,1055,1055,1055,262,262,262,262,262,262,262,
-1056,1056,1056,1056,1056,1056,1057,1057,1056,262,262,262,262,262,262,262,
-1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,
-1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1059,1059,1060,
+1128,1129,1129,1129,297,1129,1129,297,297,297,297,297,1129,1129,1129,1129,
+1128,1128,1128,1128,297,1128,1128,1128,297,1128,1128,1128,1128,1128,1128,1128,
+1128,1128,1128,1128,1128,1128,1128,1128,1128,1128,1128,1128,1128,1128,1128,1128,
+1128,1128,1128,1128,1128,1128,297,297,1130,1130,1130,297,297,297,297,1131,
+1132,1132,1132,1132,1132,1132,1132,1132,1132,297,297,297,297,297,297,297,
+1133,1133,1133,1133,1133,1133,1134,1134,1133,297,297,297,297,297,297,297,
+1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,
+1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1136,1136,1137,
 
 /* block 162 */
-1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,
-1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1062,1062,1062,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-1063,1063,1063,1063,1063,1063,1063,1063,1064,1063,1063,1063,1063,1063,1063,1063,
-1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,
-1063,1063,1063,1063,1063,1065,1065,262,262,262,262,1066,1066,1066,1066,1066,
-1067,1067,1068,1067,1067,1067,1069,262,262,262,262,262,262,262,262,262,
+1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,
+1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1139,1139,1139,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+1140,1140,1140,1140,1140,1140,1140,1140,1141,1140,1140,1140,1140,1140,1140,1140,
+1140,1140,1140,1140,1140,1140,1140,1140,1140,1140,1140,1140,1140,1140,1140,1140,
+1140,1140,1140,1140,1140,1142,1142,297,297,297,297,1143,1143,1143,1143,1143,
+1144,1144,1145,1144,1144,1144,1146,297,297,297,297,297,297,297,297,297,
 
 /* block 163 */
-1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,
-1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,
-1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,
-1070,1070,1070,1070,1070,1070,262,262,262,1071,1072,1072,1072,1072,1072,1072,
-1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,
-1073,1073,1073,1073,1073,1073,262,262,1074,1074,1074,1074,1074,1074,1074,1074,
-1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,
-1075,1075,1075,262,262,262,262,262,1076,1076,1076,1076,1076,1076,1076,1076,
+1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,
+1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,
+1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,1147,
+1147,1147,1147,1147,1147,1147,297,297,297,1148,1149,1149,1149,1149,1149,1149,
+1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,1150,
+1150,1150,1150,1150,1150,1150,297,297,1151,1151,1151,1151,1151,1151,1151,1151,
+1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,
+1152,1152,1152,297,297,297,297,297,1153,1153,1153,1153,1153,1153,1153,1153,
 
 /* block 164 */
-1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,
-1077,1077,262,262,262,262,262,262,262,1078,1078,1078,1078,262,262,262,
-262,262,262,262,262,262,262,262,262,1079,1079,1079,1079,1079,1079,1079,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,
+1154,1154,297,297,297,297,297,297,297,1155,1155,1155,1155,297,297,297,
+297,297,297,297,297,297,297,297,297,1156,1156,1156,1156,1156,1156,1156,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 165 */
-1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,
-1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,
-1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,
-1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,
-1080,1080,1080,1080,1080,1080,1080,1080,1080,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,
+1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,
+1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,
+1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,1157,
+1157,1157,1157,1157,1157,1157,1157,1157,1157,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 166 */
-1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,
-1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,
-1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,
-1081,1081,1081,262,262,262,262,262,262,262,262,262,262,262,262,262,
-1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,
-1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,
-1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,
-1082,1082,1082,262,262,262,262,262,262,262,1083,1083,1083,1083,1083,1083,
+1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,
+1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,
+1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,1158,
+1158,1158,1158,297,297,297,297,297,297,297,297,297,297,297,297,297,
+1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,
+1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,
+1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,
+1159,1159,1159,297,297,297,297,297,297,297,1160,1160,1160,1160,1160,1160,
 
 /* block 167 */
-1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,
-1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,
-1084,1084,1085,1085,1086,1086,1086,1086,302,302,302,302,302,302,302,302,
-1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,302,302,302,302,302,302,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,
+1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,1161,
+1161,1161,1162,1162,1163,1163,1163,1163,340,340,340,340,340,340,340,340,
+1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,340,340,340,340,340,340,
+1165,1165,1165,1165,1165,1165,1165,1165,1165,1165,1166,1166,1166,1166,1167,1166,
+1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,1168,
+1168,1168,1168,1168,1168,1168,297,297,297,1169,1170,1171,1171,1171,1172,1173,
+1174,1174,1174,1174,1174,1174,1174,1174,1174,1174,1174,1174,1174,1174,1174,1174,
 
 /* block 168 */
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
+1174,1174,1174,1174,1174,1174,297,297,297,297,297,297,297,297,1175,1175,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 169 */
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,
-1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,262,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,
+1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,1176,297,
 
 /* block 170 */
-1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,
-1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,
-1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,262,1090,1090,1091,262,262,
-1089,1089,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,291,291,291,
+1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,
+1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,
+1177,1177,1177,1177,1177,1177,1177,1177,1177,1177,297,1178,1178,1179,297,297,
+1177,1177,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+340,340,321,321,321,340,340,340,340,340,340,340,340,340,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,316,333,333,333,
 
 /* block 171 */
-1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,
-1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1093,1093,1093,
-1093,1093,1093,1093,1093,1093,1093,1092,262,262,262,262,262,262,262,262,
-1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,
-1094,1094,1094,1094,1094,1094,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,
-1095,1096,1096,1096,1096,1097,1097,1097,1097,1097,302,302,302,302,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,
+1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,
+1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1181,1181,1181,
+1181,1181,1181,1181,1181,1181,1181,1180,297,297,297,297,297,297,297,297,
+1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,
+1182,1182,1182,1182,1182,1182,1183,1183,1183,1183,1183,1183,1183,1183,1183,1183,
+1183,1184,1184,1184,1184,1185,1185,1185,1185,1185,340,340,340,340,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+1186,1186,1186,1186,1186,1186,1186,1186,1186,1186,1186,1186,1186,1186,1186,1186,
 
 /* block 172 */
-1098,1098,1099,1099,1099,1099,1100,1100,1100,1100,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,
-1101,1101,1101,1101,1101,1102,1102,1102,1102,1102,1102,1102,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,
-1103,1103,1103,1103,1103,1103,1103,262,262,262,262,262,262,262,262,262,
+1186,1186,1187,1187,1187,1187,1188,1188,1188,1188,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,
+1189,1189,1189,1189,1189,1190,1190,1190,1190,1190,1190,1190,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,1191,
+1191,1191,1191,1191,1191,1191,1191,297,297,297,297,297,297,297,297,297,
 
 /* block 173 */
-1104,1105,1104,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,
-1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,
-1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,
-1106,1106,1106,1106,1106,1106,1106,1106,1105,1105,1105,1105,1105,1105,1105,1105,
-1105,1105,1105,1105,1105,1105,1107,1108,1108,1109,1109,1109,1109,1109,163,163,
-163,163,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,
-1110,1110,1110,1110,1110,1110,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,
-1107,1106,1106,1105,1105,1106,163,163,163,163,163,163,163,163,163,1112,
+1192,1193,1192,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,
+1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,
+1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,1194,
+1194,1194,1194,1194,1194,1194,1194,1194,1193,1193,1193,1193,1193,1193,1193,1193,
+1193,1193,1193,1193,1193,1193,1195,1196,1196,1197,1197,1197,1197,1197,196,196,
+196,196,1198,1198,1198,1198,1198,1198,1198,1198,1198,1198,1198,1198,1198,1198,
+1198,1198,1198,1198,1198,1198,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,
+1195,1194,1194,1193,1193,1194,196,196,196,196,196,196,196,196,196,1200,
 
 /* block 174 */
-1113,1113,1114,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,
-1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,
-1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,
-1114,1114,1114,1113,1113,1113,1113,1114,1114,1116,1117,1118,1118,1119,1120,1120,
-1120,1120,1113,163,163,163,163,163,163,163,163,163,163,1119,163,163,
-1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,
-1121,1121,1121,1121,1121,1121,1121,1121,1121,163,163,163,163,163,163,163,
-1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,163,163,163,163,163,163,
+1201,1201,1202,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,
+1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,
+1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,1203,
+1202,1202,1202,1201,1201,1201,1201,1202,1202,1204,1205,1206,1206,1207,1208,1208,
+1208,1208,1201,196,196,196,196,196,196,196,196,196,196,1207,196,196,
+1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,1209,
+1209,1209,1209,1209,1209,1209,1209,1209,1209,196,196,196,196,196,196,196,
+1210,1210,1210,1210,1210,1210,1210,1210,1210,1210,196,196,196,196,196,196,
 
 /* block 175 */
-1123,1123,1123,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,
-1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,
-1124,1124,1124,1124,1124,1124,1124,1123,1123,1123,1123,1123,1125,1123,1123,1123,
-1123,1123,1123,1126,1126,163,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,
-1128,1129,1129,1129,1124,1125,1125,1124,163,163,163,163,163,163,163,163,
-1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,
-1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,
-1130,1130,1130,1131,1132,1132,1130,163,163,163,163,163,163,163,163,163,
+1211,1211,1211,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,
+1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,
+1212,1212,1212,1212,1212,1212,1212,1211,1211,1211,1211,1211,1213,1211,1211,1211,
+1211,1211,1211,1214,1214,196,1215,1215,1215,1215,1215,1215,1215,1215,1215,1215,
+1216,1217,1217,1217,1212,1213,1213,1212,196,196,196,196,196,196,196,196,
+1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,
+1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,
+1218,1218,1218,1219,1220,1220,1218,196,196,196,196,196,196,196,196,196,
 
 /* block 176 */
-1133,1133,1134,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,
-1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,
-1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,
-1135,1135,1135,1134,1134,1134,1133,1133,1133,1133,1133,1133,1133,1133,1133,1134,
-1136,1135,1137,1137,1135,1138,1138,1139,1139,1140,1141,1141,1141,1138,1134,1133,
-1142,1142,1142,1142,1142,1142,1142,1142,1142,1142,1135,1139,1135,1139,1138,1138,
-163,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,
-1143,1143,1143,1143,1143,163,163,163,163,163,163,163,163,163,163,163,
+1221,1221,1222,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,
+1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,
+1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,
+1223,1223,1223,1222,1222,1222,1221,1221,1221,1221,1221,1221,1221,1221,1221,1222,
+1224,1223,1225,1225,1223,1226,1226,1227,1227,1228,1229,1229,1229,1226,1222,1221,
+1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1223,1227,1223,1227,1226,1226,
+196,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,
+1231,1231,1231,1231,1231,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 177 */
-1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,
-1144,1144,163,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,
-1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1145,1145,1145,1146,
-1146,1146,1145,1145,1146,1147,1148,1146,1149,1149,1150,1149,1149,1151,1146,1144,
-1144,1146,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,
+1232,1232,196,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,
+1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1232,1233,1233,1233,1234,
+1234,1234,1233,1233,1234,1235,1236,1237,1238,1238,1239,1238,1238,1240,1234,1232,
+1232,1234,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 178 */
-1152,1152,1152,1152,1152,1152,1152,163,1152,163,1152,1152,1152,1152,163,1152,
-1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,163,1152,
-1152,1152,1152,1152,1152,1152,1152,1152,1152,1153,163,163,163,163,163,163,
-1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,
-1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,
-1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1155,
-1156,1156,1156,1155,1155,1155,1155,1155,1155,1157,1158,163,163,163,163,163,
-1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,163,163,163,163,163,163,
+1241,1241,1241,1241,1241,1241,1241,196,1241,196,1241,1241,1241,1241,196,1241,
+1241,1241,1241,1241,1241,1241,1241,1241,1241,1241,1241,1241,1241,1241,196,1241,
+1241,1241,1241,1241,1241,1241,1241,1241,1241,1242,196,196,196,196,196,196,
+1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,
+1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,
+1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,1244,
+1245,1245,1245,1244,1244,1244,1244,1244,1244,1246,1247,196,196,196,196,196,
+1248,1248,1248,1248,1248,1248,1248,1248,1248,1248,196,196,196,196,196,196,
 
 /* block 179 */
-1160,1161,1162,1163,163,1164,1164,1164,1164,1164,1164,1164,1164,163,163,1164,
-1164,163,163,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,
-1164,1164,1164,1164,1164,1164,1164,1164,1164,163,1164,1164,1164,1164,1164,1164,
-1164,163,1164,1164,163,1164,1164,1164,1164,1164,163,1165,1166,1164,1167,1162,
-1160,1162,1162,1162,1162,163,163,1162,1162,163,163,1162,1162,1168,163,163,
-1164,163,163,163,163,163,163,1167,163,163,163,163,163,1169,1164,1164,
-1164,1164,1162,1162,163,163,1170,1170,1170,1170,1170,1170,1170,163,163,163,
-1170,1170,1170,1170,1170,163,163,163,163,163,163,163,163,163,163,163,
+1249,1250,1251,1252,196,1253,1253,1253,1253,1253,1253,1253,1253,196,196,1253,
+1253,196,196,1253,1253,1253,1253,1253,1253,1253,1253,1253,1253,1253,1253,1253,
+1253,1253,1253,1253,1253,1253,1253,1253,1253,196,1253,1253,1253,1253,1253,1253,
+1253,196,1253,1253,196,1253,1253,1253,1253,1253,196,1254,1255,1253,1256,1251,
+1249,1251,1251,1251,1251,196,196,1251,1251,196,196,1251,1251,1257,196,196,
+1253,196,196,196,196,196,196,1256,196,196,196,196,196,1258,1253,1253,
+1253,1253,1251,1251,196,196,1259,1259,1259,1259,1259,1259,1259,196,196,196,
+1259,1259,1259,1259,1259,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 180 */
-1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,
-1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,
-1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,
-1171,1171,1171,1171,1171,1172,1172,1172,1173,1173,1173,1173,1173,1173,1173,1173,
-1172,1172,1174,1173,1173,1172,1175,1171,1171,1171,1171,1176,1176,1177,1178,1178,
-1179,1179,1179,1179,1179,1179,1179,1179,1179,1179,1177,1177,163,1178,1180,1171,
-1171,1171,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,196,1260,196,196,1260,196,
+1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,
+1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,1260,
+1260,1260,1260,1260,1260,1260,196,1260,1261,1262,1262,1263,1263,1263,1263,1263,
+1263,196,1261,196,196,1261,196,1261,1261,1261,1262,196,1262,1262,1264,1265,
+1264,1266,1267,1268,1269,1269,196,1270,1270,196,196,196,196,196,196,196,
+196,1271,1271,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 181 */
-1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,
-1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,
-1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,
-1182,1183,1183,1184,1184,1184,1184,1184,1184,1183,1184,1183,1183,1182,1183,1184,
-1184,1183,1185,1186,1181,1181,1187,1181,163,163,163,163,163,163,163,163,
-1188,1188,1188,1188,1188,1188,1188,1188,1188,1188,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,
+1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,
+1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,1272,
+1272,1272,1272,1272,1272,1273,1273,1273,1274,1274,1274,1274,1274,1274,1274,1274,
+1273,1273,1275,1274,1274,1273,1276,1272,1272,1272,1272,1277,1277,1278,1279,1279,
+1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1278,1278,196,1279,1281,1272,
+1272,1272,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 182 */
-1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,
-1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,
-1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1190,
-1191,1191,1192,1192,1192,1192,163,163,1191,1191,1191,1191,1192,1192,1191,1193,
-1194,1195,1196,1196,1197,1197,1198,1198,1198,1196,1196,1196,1196,1196,1196,1196,
-1196,1196,1196,1196,1196,1196,1196,1196,1189,1189,1189,1189,1192,1192,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,
+1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,
+1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,
+1283,1284,1284,1285,1285,1285,1285,1285,1285,1284,1285,1284,1284,1283,1284,1285,
+1285,1284,1286,1287,1282,1282,1288,1282,196,196,196,196,196,196,196,196,
+1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 183 */
-1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,
-1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,
-1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,
-1200,1200,1200,1201,1201,1201,1201,1201,1201,1201,1201,1200,1200,1201,1200,1202,
-1201,1203,1203,1204,1199,163,163,163,163,163,163,163,163,163,163,163,
-1205,1205,1205,1205,1205,1205,1205,1205,1205,1205,163,163,163,163,163,163,
-531,531,531,531,531,531,531,531,531,531,531,531,531,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,
+1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,
+1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1290,1291,
+1292,1292,1293,1293,1293,1293,196,196,1292,1292,1292,1292,1293,1293,1292,1294,
+1295,1296,1297,1297,1298,1298,1299,1299,1299,1297,1297,1297,1297,1297,1297,1297,
+1297,1297,1297,1297,1297,1297,1297,1297,1290,1290,1290,1290,1293,1293,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 184 */
-1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,
-1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,
-1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1207,1208,1207,1208,1208,
-1207,1207,1207,1207,1207,1207,1209,1210,1206,1211,163,163,163,163,163,163,
-1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,
+1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,
+1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,
+1301,1301,1301,1302,1302,1302,1302,1302,1302,1302,1302,1301,1301,1302,1301,1303,
+1302,1304,1304,1305,1300,196,196,196,196,196,196,196,196,196,196,196,
+1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,196,196,196,196,196,196,
+581,581,581,581,581,581,581,581,581,581,581,581,581,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 185 */
-1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,
-1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,163,163,1214,1214,1214,
-1215,1215,1214,1214,1214,1214,1216,1214,1214,1214,1214,1217,163,163,163,163,
-1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1219,1219,1220,1220,1220,1221,
-1213,1213,1213,1213,1213,1213,1213,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,
+1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,
+1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1308,1309,1308,1309,1309,
+1308,1308,1308,1308,1308,1308,1310,1311,1307,1312,196,196,196,196,196,196,
+1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,196,196,196,196,196,196,
+522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,
+522,522,522,522,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 186 */
-1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,
-1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,
-1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1223,1223,1223,1224,
-1224,1224,1224,1224,1224,1224,1224,1224,1223,1225,1226,1227,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,
+1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,196,196,1315,1316,1315,
+1317,1317,1315,1315,1315,1315,1316,1315,1315,1315,1315,1318,196,196,196,196,
+1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1320,1320,1321,1321,1321,1322,
+1314,1314,1314,1314,1314,1314,1314,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 187 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,
-1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,
-1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,
-1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,
-1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1231,1231,1231,1231,1231,1231,
-1231,1231,1231,163,163,163,163,163,163,163,163,163,163,163,163,1232,
+1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,
+1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,
+1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1324,1324,1324,1325,
+1325,1325,1325,1325,1325,1325,1325,1325,1324,1326,1327,1328,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 188 */
-1233,1233,1233,1233,1233,1233,1233,163,163,1233,163,163,1233,1233,1233,1233,
-1233,1233,1233,1233,163,1233,1233,163,1233,1233,1233,1233,1233,1233,1233,1233,
-1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,
-1234,1235,1235,1235,1235,1235,163,1235,1235,163,163,1236,1236,1237,1238,1239,
-1235,1239,1235,1240,1241,1242,1241,163,163,163,163,163,163,163,163,163,
-1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,
+1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,1329,
+1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,
+1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,1330,
+1331,1331,1331,1331,1331,1331,1331,1331,1331,1331,1332,1332,1332,1332,1332,1332,
+1332,1332,1332,196,196,196,196,196,196,196,196,196,196,196,196,1333,
 
 /* block 189 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1244,1244,1244,1244,1244,1244,1244,1244,163,163,1244,1244,1244,1244,1244,1244,
-1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,
-1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,
-1244,1245,1245,1245,1246,1246,1246,1246,163,163,1246,1246,1245,1245,1245,1245,
-1247,1244,1248,1244,1245,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1334,1334,1334,1334,1334,1334,1334,196,196,1334,196,196,1334,1334,1334,1334,
+1334,1334,1334,1334,196,1334,1334,196,1334,1334,1334,1334,1334,1334,1334,1334,
+1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,
+1335,1336,1336,1336,1336,1336,196,1336,1336,196,196,1337,1337,1338,1339,1340,
+1336,1340,1336,1341,1342,1343,1342,196,196,196,196,196,196,196,196,196,
+1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 190 */
-1249,1250,1250,1250,1250,1250,1250,1251,1251,1250,1250,1249,1249,1249,1249,1249,
-1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,
-1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,
-1249,1249,1249,1252,1253,1250,1250,1250,1250,1254,1255,1250,1250,1250,1250,1256,
-1256,1256,1257,1257,1256,1256,1256,1253,163,163,163,163,163,163,163,163,
-1258,1259,1259,1259,1259,1259,1259,1260,1260,1259,1259,1259,1258,1258,1258,1258,
-1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,
-1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1345,1345,1345,1345,1345,1345,1345,1345,196,196,1345,1345,1345,1345,1345,1345,
+1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,
+1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,
+1345,1346,1346,1346,1347,1347,1347,1347,196,196,1347,1347,1346,1346,1346,1346,
+1348,1345,1349,1345,1346,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 191 */
-1258,1258,1258,1258,1261,1261,1261,1261,1261,1261,1259,1259,1259,1259,1259,1259,
-1259,1259,1259,1259,1259,1259,1259,1260,1262,1263,1264,1265,1265,1258,1264,1264,
-1264,1266,1266,163,163,163,163,163,163,163,163,163,163,163,163,163,
-496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,
-1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,
-1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,
-1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,
-1267,1267,1267,1267,1267,1267,1267,1267,1267,163,163,163,163,163,163,163,
+1350,1351,1351,1351,1351,1351,1351,1352,1352,1351,1351,1350,1350,1350,1350,1350,
+1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,
+1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,1350,
+1350,1350,1350,1353,1354,1351,1351,1351,1351,1355,1356,1351,1351,1351,1351,1357,
+1357,1357,1358,1358,1357,1357,1357,1354,196,196,196,196,196,196,196,196,
+1359,1360,1360,1360,1360,1360,1360,1361,1361,1360,1360,1360,1359,1359,1359,1359,
+1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,
+1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,1359,
 
 /* block 192 */
-343,343,343,343,343,343,343,343,343,343,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1359,1359,1359,1359,1362,1362,1362,1362,1362,1362,1360,1360,1360,1360,1360,1360,
+1360,1360,1360,1360,1360,1360,1360,1361,1363,1364,1365,1366,1366,1359,1365,1365,
+1365,1367,1367,196,196,196,196,196,196,196,196,196,196,196,196,196,
+545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,545,
+1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,
+1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,
+1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,
+1368,1368,1368,1368,1368,1368,1368,1368,1368,196,196,196,196,196,196,196,
 
 /* block 193 */
-1268,1268,1268,1268,1268,1268,1268,1268,1268,163,1268,1268,1268,1268,1268,1268,
-1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,
-1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1269,
-1270,1270,1270,1270,1270,1270,1270,163,1270,1270,1270,1270,1270,1270,1269,1271,
-1268,1272,1272,1273,1274,1274,163,163,163,163,163,163,163,163,163,163,
-1275,1275,1275,1275,1275,1275,1275,1275,1275,1275,1276,1276,1276,1276,1276,1276,
-1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,163,163,163,
-1277,1278,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,
+385,385,385,385,385,385,385,385,385,385,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 194 */
-1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,
-163,163,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,
-1280,1280,1280,1280,1280,1280,1280,1280,163,1281,1280,1280,1280,1280,1280,1280,
-1280,1281,1280,1280,1281,1280,1280,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
+1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
+1369,1370,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,196,196,196,196,196,196,
 
 /* block 195 */
-1282,1282,1282,1282,1282,1282,1282,163,1282,1282,163,1282,1282,1282,1282,1282,
-1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,
-1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,
-1282,1283,1283,1283,1283,1283,1283,163,163,163,1283,163,1283,1283,163,1283,
-1283,1283,1284,1283,1285,1285,1286,1283,163,163,163,163,163,163,163,163,
-1287,1287,1287,1287,1287,1287,1287,1287,1287,1287,163,163,163,163,163,163,
-1288,1288,1288,1288,1288,1288,163,1288,1288,163,1288,1288,1288,1288,1288,1288,
-1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,
+1372,1372,1372,1372,1372,1372,1372,1372,1372,196,1372,1372,1372,1372,1372,1372,
+1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,
+1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1372,1373,
+1374,1374,1374,1374,1374,1374,1374,196,1374,1374,1374,1374,1374,1374,1373,1375,
+1372,1376,1376,1377,1378,1378,196,196,196,196,196,196,196,196,196,196,
+1379,1379,1379,1379,1379,1379,1379,1379,1379,1379,1380,1380,1380,1380,1380,1380,
+1380,1380,1380,1380,1380,1380,1380,1380,1380,1380,1380,1380,1380,196,196,196,
+1381,1382,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,
 
 /* block 196 */
-1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1289,1289,1289,1289,1289,163,
-1290,1290,163,1289,1289,1290,1289,1291,1288,163,163,163,163,163,163,163,
-1292,1292,1292,1292,1292,1292,1292,1292,1292,1292,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,
+196,196,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,
+1384,1384,1384,1384,1384,1384,1384,1384,196,1385,1384,1384,1384,1384,1384,1384,
+1384,1385,1384,1384,1385,1384,1384,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 197 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,
-1293,1293,1293,1294,1294,1295,1295,1296,1296,163,163,163,163,163,163,163,
+1386,1386,1386,1386,1386,1386,1386,196,1386,1386,196,1386,1386,1386,1386,1386,
+1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,
+1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,
+1386,1387,1387,1387,1387,1387,1387,196,196,196,1387,196,1387,1387,196,1387,
+1387,1387,1388,1387,1389,1389,1390,1387,196,196,196,196,196,196,196,196,
+1391,1391,1391,1391,1391,1391,1391,1391,1391,1391,196,196,196,196,196,196,
+1392,1392,1392,1392,1392,1392,196,1392,1392,196,1392,1392,1392,1392,1392,1392,
+1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
 
 /* block 198 */
-1297,1297,1298,1299,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,
-1300,163,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,
-1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,
-1300,1300,1300,1300,1299,1299,1297,1297,1297,1297,1297,163,163,163,1299,1299,
-1297,1301,1302,1303,1303,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,
-1305,1305,1305,1305,1305,1305,1305,1305,1305,1305,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1393,1393,1393,1393,1393,196,
+1394,1394,196,1393,1393,1394,1393,1395,1392,196,196,196,196,196,196,196,
+1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 199 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-843,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,
-388,388,1306,388,1306,390,390,390,390,390,390,390,390,391,391,391,
-391,390,390,390,390,390,390,390,390,390,390,390,390,390,390,390,
-390,390,163,163,163,163,163,163,163,163,163,163,163,163,163,1307,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,
+1397,1397,1397,1398,1398,1399,1399,1400,1400,196,196,196,196,196,196,196,
 
 /* block 200 */
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
+1401,1401,1402,1403,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,
+1404,196,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,
+1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,
+1404,1404,1404,1404,1403,1403,1401,1401,1401,1401,1401,196,196,196,1403,1403,
+1401,1405,1406,1407,1407,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 201 */
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+914,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,
+435,435,1411,435,1411,437,437,437,437,437,437,437,437,438,438,438,
+438,437,437,437,437,437,437,437,437,437,437,437,437,437,437,437,
+437,437,196,196,196,196,196,196,196,196,196,196,196,196,196,1412,
 
 /* block 202 */
-1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,
-1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,
-1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,
-1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,
-1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,
-1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,
-1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,163,
-1310,1310,1310,1310,1310,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 203 */
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,
-1308,1308,1308,1308,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 204 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,
-1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,
-1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,
-1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,
-1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,
-1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,
-1311,1312,1312,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 205 */
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-
-/* block 206 */
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,
-1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,
-1315,1313,1313,1313,1313,1313,1313,1316,1316,1316,1316,1316,1316,1316,1316,1316,
-1316,1316,1316,1316,1316,1316,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 207 */
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-
-/* block 208 */
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,
-1317,1317,1317,1317,1317,1317,1317,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 209 */
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-
-/* block 210 */
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,
-859,859,859,859,859,859,859,859,859,163,163,163,163,163,163,163,
-1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,
-1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,163,
-1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,163,163,163,163,1320,1320,
-1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,
-
-/* block 211 */
-1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,
-1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,
-1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,
-1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,163,
-1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,163,163,163,163,163,163,
-1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,
-1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,163,163,
-1324,1324,1324,1324,1324,1325,163,163,163,163,163,163,163,163,163,163,
-
-/* block 212 */
-1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,
-1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,
-1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,
-1327,1327,1327,1327,1327,1327,1327,1328,1328,1329,1330,1330,1331,1331,1331,1331,
-1332,1332,1333,1333,1328,1331,163,163,163,163,163,163,163,163,163,163,
-1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,163,1335,1335,1335,1335,1335,
-1335,1335,163,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,
-1326,1326,1326,1326,1326,1326,1326,1326,163,163,163,163,163,1326,1326,1326,
-
-/* block 213 */
-1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 214 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,
-1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,
-1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,
-1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,
-
-/* block 215 */
-1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,
-1338,1338,1338,1338,1338,1338,1338,1339,1340,1341,1341,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 216 */
-1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,
-1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,
-1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,
-1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,
-1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,163,163,163,163,1343,
-1342,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
-1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
-1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,
-
-/* block 217 */
-1344,1344,1344,1344,1344,1344,1344,1344,163,163,163,163,163,163,163,1345,
-1345,1345,1345,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1347,1348,1349,800,1350,163,163,163,163,163,163,163,163,163,163,163,
-1351,1351,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 218 */
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-
-/* block 219 */
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,
-1352,1352,1352,1352,1352,1352,1352,1352,163,163,163,163,163,163,163,163,
-
-/* block 220 */
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-
-/* block 221 */
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,
-1353,1353,1353,1353,1353,1353,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 222 */
-1352,1352,1352,1352,1352,1352,1352,1352,1352,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 223 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1354,1354,1354,1354,163,1354,1354,1354,1354,1354,1354,1354,163,1354,1354,163,
-
-/* block 224 */
-825,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-
-/* block 225 */
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-
-/* block 226 */
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,
-825,825,825,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,820,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-820,820,820,163,163,825,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,825,825,825,825,163,163,163,163,163,163,163,163,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-
-/* block 227 */
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-
-/* block 228 */
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,
-1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,163,163,163,163,
-
-/* block 229 */
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,163,163,163,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,163,
-
-/* block 230 */
-1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,163,163,163,163,163,
-1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,1357,1358,1359,1360,
-1361,1361,1361,1361,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 231 */
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,163,163,
-154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,
-154,154,154,154,154,154,154,163,163,163,163,163,163,163,163,163,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-
-/* block 232 */
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 233 */
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-
-/* block 234 */
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,163,163,163,163,163,163,163,163,163,163,
-
-/* block 235 */
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,163,163,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,1362,1363,154,154,154,461,461,461,1364,1365,1365,
-1365,1365,1365, 51, 51, 51, 51, 51, 51, 51, 51,154,154,154,154,154,
-
-/* block 236 */
-154,154,154,461,461,154,154,154,154,154,154,154,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,154,154,154,154,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,724,724,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 237 */
-1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,
-1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,
-1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,
-1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,
-1001,1001,1366,1366,1366,1001,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 238 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-836,836,836,836,836,836,836,836,836,836,836,836,836,836,836,836,
-836,836,836,836,163,163,163,163,163,163,163,163,163,163,163,163,
-836,836,836,836,836,836,836,836,836,836,836,836,836,836,836,836,
-836,836,836,836,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 239 */
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,163,163,163,163,163,163,163,163,163,
-833,833,833,833,833,833,833,833,833,833,833,833,833,833,833,833,
-833,833,836,836,836,836,836,836,836,163,163,163,163,163,163,163,
-
-/* block 240 */
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,726,726,726,726,726,726,
-726,726,737,737,726,726,726,726,726,726,726,726,726,726,726,726,
-726,726,726,726,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,726,726,
-726,726,726,726,726,163,737,737,726,726,726,726,726,726,726,726,
-726,726,726,726,726,726,726,726,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-
-/* block 241 */
-725,725,726,726,726,726,726,726,726,726,737,737,726,726,726,726,
-726,726,726,726,726,726,726,726,726,726,726,726,725,163,725,725,
-163,163,725,163,163,725,725,163,163,725,725,725,725,163,725,725,
-725,725,725,725,725,725,726,726,726,726,163,726,163,726,737,737,
-726,726,726,726,163,726,726,726,726,726,726,726,726,726,726,726,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,726,726,726,726,726,726,
-726,726,737,737,726,726,726,726,726,726,726,726,726,726,726,726,
-
-/* block 242 */
-726,726,726,726,725,725,163,725,725,725,725,163,163,725,725,725,
-725,725,725,725,725,163,725,725,725,725,725,725,725,163,726,726,
-726,726,726,726,726,726,737,737,726,726,726,726,726,726,726,726,
-726,726,726,726,726,726,726,726,725,725,163,725,725,725,725,163,
-725,725,725,725,725,163,725,163,163,163,725,725,725,725,725,725,
-725,163,726,726,726,726,726,726,726,726,737,737,726,726,726,726,
-726,726,726,726,726,726,726,726,726,726,726,726,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-
-/* block 243 */
-725,725,725,725,725,725,726,726,726,726,726,726,726,726,737,737,
-726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,726,726,726,726,726,726,
-726,726,737,737,726,726,726,726,726,726,726,726,726,726,726,726,
-726,726,726,726,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,726,726,
-726,726,726,726,726,726,737,737,726,726,726,726,726,726,726,726,
-
-/* block 244 */
-726,726,726,726,726,726,726,726,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,726,726,726,726,726,726,726,726,737,737,726,726,726,726,
-726,726,726,726,726,726,726,726,726,726,726,726,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,726,726,726,726,726,726,726,726,737,737,
-726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-
-/* block 245 */
-725,725,725,725,725,725,725,725,725,725,726,726,726,726,726,726,
-726,726,737,737,726,726,726,726,726,726,726,726,726,726,726,726,
-726,726,726,726,726,726,163,163,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,1367,726,726,726,726,726,726,726,726,726,726,726,726,726,726,
-726,726,726,726,726,726,726,726,726,726,726,716,726,726,726,726,
-726,726,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,1367,726,726,726,726,
-
-/* block 246 */
-726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,
-726,726,726,726,726,716,726,726,726,726,726,726,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,1367,726,726,726,726,726,726,726,726,726,726,
-726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,716,
-726,726,726,726,726,726,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,1367,
-726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,
-
-/* block 247 */
-726,726,726,726,726,726,726,726,726,716,726,726,726,726,726,726,
-725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,
-725,725,725,725,725,725,725,725,725,1367,726,726,726,726,726,726,
-726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,
-726,726,726,716,726,726,726,726,726,726,725,726,163,163,1368,1368,
-1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,
-1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,
-1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,
-
-/* block 248 */
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-
-/* block 249 */
-1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,
-1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,
-1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,
-1370,1370,1370,1370,1370,1370,1370,1369,1369,1369,1369,1370,1370,1370,1370,1370,
-1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,
-1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,
-1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1369,1369,1369,
-1369,1369,1369,1369,1369,1370,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,
-
-/* block 250 */
-1369,1369,1369,1369,1370,1369,1369,1371,1372,1371,1371,1373,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,1370,1370,1370,1370,1370,
-163,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 251 */
- 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 92, 70, 70, 70, 70, 70,
- 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,644, 70, 70, 70, 70,163,
-163,163,163,163,163, 70, 70, 70, 70, 70, 70,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 252 */
-1374,1374,1374,1374,1374,1374,1374,163,1374,1374,1374,1374,1374,1374,1374,1374,
-1374,1374,1374,1374,1374,1374,1374,1374,1374,163,163,1374,1374,1374,1374,1374,
-1374,1374,163,1374,1374,163,1374,1374,1374,1374,1374,163,163,163,163,163,
-858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
-858,858,858,858,858,858,858,858,858,858,858,858,1375,1375,858,858,
-858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,
-858,858,858,858,858,858,858,858,1375,858,858,858,858,858,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 253 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,788,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 254 */
-1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,
-1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,
-1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,163,163,163,
-1377,1377,1377,1377,1377,1377,1377,1378,1378,1378,1378,1378,1379,1379,163,163,
-1380,1380,1380,1380,1380,1380,1380,1380,1380,1380,163,163,163,163,1376,1381,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-
-/* block 255 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,
-1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1383,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,
-1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,
-1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1385,1385,1385,1385,
-1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,163,163,163,163,163,1387,
-
-/* block 256 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,
-1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1389,1390,1390,1390,1390,
-1391,1391,1391,1391,1391,1391,1391,1391,1391,1391,163,163,163,163,163,163,
-
-/* block 257 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-484,484,484,484,484,484,484,163,484,484,484,484,163,484,484,163,
-484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,163,
-
-/* block 258 */
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-
-/* block 259 */
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,
-1392,1392,1392,1392,1392,262,262,1393,1393,1393,1393,1393,1393,1393,1393,1393,
-1394,1394,1394,1394,1394,1394,1394,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-
-/* block 260 */
-1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
-1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,
-1395,1395,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,
-1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,
-1396,1396,1396,1396,1397,1397,1397,1398,1399,1399,1399,1400,262,262,262,262,
-1401,1401,1401,1401,1401,1401,1401,1401,1401,1401,262,262,262,262,1402,1402,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-
-/* block 261 */
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-302,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
-
-/* block 262 */
-1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
-1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
-1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1404,1403,1403,1403,
-1405,1403,1403,1403,1403,302,302,302,302,302,302,302,302,302,302,302,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-
-/* block 263 */
-302,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
-1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,
-1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1404,1403,
-1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,
-
-/* block 264 */
-1406,1406,1406,1406,302,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,
-1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,
-302,1406,1406,302,1406,302,302,1406,302,1406,1406,1406,1406,1406,1406,1406,
-1406,1406,1406,302,1406,1406,1406,1406,302,1406,302,1406,302,302,302,302,
-302,302,1406,302,302,302,302,1406,302,1406,302,1406,302,1406,1406,1406,
-302,1406,1406,302,1406,302,302,1406,302,1406,302,1406,302,1406,302,1406,
-302,1406,1406,302,1406,302,302,1406,1406,1406,1406,302,1406,1406,1406,1406,
-1406,1406,1406,302,1406,1406,1406,1406,302,1406,1406,1406,1406,302,1406,302,
-
-/* block 265 */
-1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,302,1406,1406,1406,1406,1406,
-1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,302,302,302,302,
-302,1406,1406,1406,302,1406,1406,1406,1406,1406,302,1406,1406,1406,1406,1406,
-1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,302,302,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-274,274,302,302,302,302,302,302,302,302,302,302,302,302,302,302,
-
-/* block 266 */
-1407,1407,1407,1407,1408,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1409,1409,1409,1409,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-
-/* block 267 */
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1409,
-1409,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1409,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1408,
-1409,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-
-/* block 268 */
- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 58, 58,1407,1407,1407,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,1407,
-1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,
-1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,461,461,461,461,461,461,
-1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,
-1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,724,724,1407,1407,1407,1407,
-1411,1411,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1411,1411,
-
-/* block 269 */
-1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,461,461,461,461,1412,461,
-461,1412,1412,1412,1412,1412,1412,1412,1412,1412,1412,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,1407,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
 1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
 
+/* block 203 */
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 204 */
+1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,
+1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,
+1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,
+1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,
+1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,
+1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,
+1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,196,
+1415,1415,1415,1415,1415,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 205 */
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,
+1413,1413,1413,1413,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 206 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,
+1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,
+1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,
+1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,
+1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,
+1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,1416,
+1416,1417,1417,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 207 */
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+
+/* block 208 */
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1419,1419,1419,1419,1419,1419,1419,1419,1419,1419,1419,1419,1419,1419,1419,1419,
+1420,1418,1418,1418,1418,1418,1418,1421,1421,1421,1421,1421,1421,1421,1421,1421,
+1421,1421,1421,1421,1421,1421,196,196,196,196,196,196,196,196,196,196,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+
+/* block 209 */
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,
+1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,196,196,196,196,196,
+
+/* block 210 */
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+
+/* block 211 */
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+1422,1422,1422,1422,1422,1422,1422,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 212 */
+1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,
+1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1424,1424,
+1424,1424,1424,1424,1424,1424,1424,1424,1424,1424,1425,1425,1425,1424,1424,1426,
+1427,1427,1427,1427,1427,1427,1427,1427,1427,1427,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 213 */
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+
+/* block 214 */
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,
+930,930,930,930,930,930,930,930,930,196,196,196,196,196,196,196,
+1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,
+1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,1428,196,
+1429,1429,1429,1429,1429,1429,1429,1429,1429,1429,196,196,196,196,1430,1430,
+1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,
+
+/* block 215 */
+1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,
+1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,
+1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,
+1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,1431,196,
+1432,1432,1432,1432,1432,1432,1432,1432,1432,1432,196,196,196,196,196,196,
+1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,
+1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,1433,196,196,
+1434,1434,1434,1434,1434,1435,196,196,196,196,196,196,196,196,196,196,
+
+/* block 216 */
+1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,
+1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,
+1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,
+1437,1437,1437,1437,1437,1437,1437,1438,1438,1439,1440,1440,1441,1441,1441,1441,
+1442,1442,1443,1443,1438,1441,196,196,196,196,196,196,196,196,196,196,
+1444,1444,1444,1444,1444,1444,1444,1444,1444,1444,196,1445,1445,1445,1445,1445,
+1445,1445,196,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,
+1436,1436,1436,1436,1436,1436,1436,1436,196,196,196,196,196,1436,1436,1436,
+
+/* block 217 */
+1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,1436,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 218 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1446,1446,1446,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,
+1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,1447,
+1447,1447,1447,1448,1447,1447,1447,1448,1448,1448,1448,1449,1449,1450,1451,1451,
+1452,1452,1452,1452,1452,1452,1452,1452,1452,1452,196,196,196,196,196,196,
+
+/* block 219 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,
+1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,1453,
+1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,
+1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,1454,
+
+/* block 220 */
+1455,1455,1455,1455,1455,1455,1455,1455,1455,1455,1455,1455,1455,1455,1455,1455,
+1455,1455,1455,1455,1455,1455,1455,1456,1457,1458,1458,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 221 */
+1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,
+1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,
+1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,
+1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,
+1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,1459,196,196,196,196,1460,
+1459,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,
+1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,
+1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,1461,
+
+/* block 222 */
+1461,1461,1461,1461,1461,1461,1461,1461,196,196,196,196,196,196,196,1462,
+1462,1462,1462,1463,1463,1463,1463,1463,1463,1463,1463,1463,1463,1463,1463,1463,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1464,1465,1466,867,1467,196,196,196,196,196,196,196,196,196,196,196,
+1468,1468,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 223 */
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+
+/* block 224 */
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,1469,
+1469,1469,1469,1469,1469,1469,1469,1469,196,196,196,196,196,196,196,196,
+
+/* block 225 */
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+
+/* block 226 */
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,1470,
+1470,1470,1470,1470,1470,1470,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,1470,
+
+/* block 227 */
+1469,1469,1469,1469,1469,1469,1469,1469,1469,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 228 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1471,1471,1471,1471,196,1471,1471,1471,1471,1471,1471,1471,196,1471,1471,196,
+
+/* block 229 */
+896,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+
+/* block 230 */
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+
+/* block 231 */
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,891,
+896,896,896,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,891,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+891,891,891,196,196,896,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,896,896,896,896,196,196,196,196,196,196,196,196,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+
+/* block 232 */
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+
+/* block 233 */
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,
+1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,1472,196,196,196,196,
+
+/* block 234 */
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,196,196,196,196,196,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,196,196,196,
+
+/* block 235 */
+1473,1473,1473,1473,1473,1473,1473,1473,1473,196,196,196,196,196,196,196,
+1473,1473,1473,1473,1473,1473,1473,1473,1473,1473,196,196,1474,1475,1476,1477,
+1478,1478,1478,1478,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 236 */
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+
+/* block 237 */
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+1479,1479,1479,1479,1479,1479,1479,1479,1479,1479,196,196,196,196,196,196,
+
+/* block 238 */
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 239 */
+176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,
+176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,
+176,176,176,176,176,176,176,176,176,176,176,176,176,176,196,196,
+176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,176,
+176,176,176,176,176,176,176,196,196,196,196,196,196,196,196,196,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+
+/* block 240 */
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 241 */
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+
+/* block 242 */
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,196,196,196,196,196,196,196,196,196,196,
+
+/* block 243 */
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,196,196,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,1480,1480,176,176,176,510,510,510,1481,1481,1481,
+1481,1481,1481, 51, 51, 51, 51, 51, 51, 51, 51,176,176,176,176,176,
+
+/* block 244 */
+176,176,176,510,510,176,176,176,176,176,176,176,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,176,176,176,176,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,781,781,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 245 */
+1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,
+1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,
+1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,
+1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,
+1077,1077,1482,1482,1482,1077,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 246 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+907,907,907,907,907,907,907,907,907,907,907,907,907,907,907,907,
+907,907,907,907,196,196,196,196,196,196,196,196,196,196,196,196,
+907,907,907,907,907,907,907,907,907,907,907,907,907,907,907,907,
+907,907,907,907,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 247 */
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,196,196,196,196,196,196,196,196,196,
+904,904,904,904,904,904,904,904,904,904,904,904,904,904,904,904,
+904,904,907,907,907,907,907,907,907,196,196,196,196,196,196,196,
+
+/* block 248 */
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,783,783,783,783,783,783,
+783,783,795,795,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,783,783,
+783,783,783,783,783,196,795,795,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+
+/* block 249 */
+782,782,783,783,783,783,783,783,783,783,795,795,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,783,782,196,782,782,
+196,196,782,196,196,782,782,196,196,782,782,782,782,196,782,782,
+782,782,782,782,782,782,783,783,783,783,196,783,196,783,795,795,
+783,783,783,783,196,783,783,783,783,783,783,783,783,783,783,783,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,783,783,783,783,783,783,
+783,783,795,795,783,783,783,783,783,783,783,783,783,783,783,783,
+
+/* block 250 */
+783,783,783,783,782,782,196,782,782,782,782,196,196,782,782,782,
+782,782,782,782,782,196,782,782,782,782,782,782,782,196,783,783,
+783,783,783,783,783,783,795,795,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,782,782,196,782,782,782,782,196,
+782,782,782,782,782,196,782,196,196,196,782,782,782,782,782,782,
+782,196,783,783,783,783,783,783,783,783,795,795,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,783,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+
+/* block 251 */
+782,782,782,782,782,782,783,783,783,783,783,783,783,783,795,795,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,783,783,783,783,783,783,
+783,783,795,795,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,783,783,
+783,783,783,783,783,783,795,795,783,783,783,783,783,783,783,783,
+
+/* block 252 */
+783,783,783,783,783,783,783,783,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,783,783,783,783,783,783,783,783,795,795,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,783,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,783,783,783,783,783,783,783,783,795,795,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+
+/* block 253 */
+782,782,782,782,782,782,782,782,782,782,783,783,783,783,783,783,
+783,783,795,795,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,196,196,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,1483,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,1483,783,783,783,783,
+783,783,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,1483,783,783,783,783,
+
+/* block 254 */
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,783,1483,783,783,783,783,783,783,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,1483,783,783,783,783,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,1483,
+783,783,783,783,783,783,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,1483,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+
+/* block 255 */
+783,783,783,783,783,783,783,783,783,1483,783,783,783,783,783,783,
+782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,782,
+782,782,782,782,782,782,782,782,782,1483,783,783,783,783,783,783,
+783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,
+783,783,783,1483,783,783,783,783,783,783,782,783,196,196,1484,1484,
+1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,
+1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,
+1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,1484,
+
+/* block 256 */
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+
+/* block 257 */
+1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,
+1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,
+1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,
+1486,1486,1486,1486,1486,1486,1486,1485,1485,1485,1485,1486,1486,1486,1486,1486,
+1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,
+1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,
+1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1485,1485,1485,
+1485,1485,1485,1485,1485,1486,1485,1485,1485,1485,1485,1485,1485,1485,1485,1485,
+
+/* block 258 */
+1485,1485,1485,1485,1486,1485,1485,1487,1488,1487,1487,1489,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,1486,1486,1486,1486,1486,
+196,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,1486,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 259 */
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 93, 70, 70, 70, 70, 70,
+ 70, 70, 70, 70, 70, 70, 70, 70, 70, 70,694, 70, 70, 70, 70,196,
+196,196,196,196,196, 70, 70, 70, 70, 70, 70,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 260 */
+1490,1490,1490,1490,1490,1490,1490,196,1490,1490,1490,1490,1490,1490,1490,1490,
+1490,1490,1490,1490,1490,1490,1490,1490,1490,196,196,1490,1490,1490,1490,1490,
+1490,1490,196,1490,1490,196,1490,1490,1490,1490,1490,196,196,196,196,196,
+929,929,929,929,929,929,929,929,929,929,929,929,929,929,929,929,
+929,929,929,929,929,929,929,929,929,929,929,929,1491,1491,929,929,
+929,929,929,929,929,929,929,929,929,929,929,929,929,929,929,929,
+929,929,929,929,929,929,929,929,1491,929,929,929,929,929,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 261 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,849,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 262 */
+1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,
+1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,
+1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,1492,196,196,196,
+1493,1493,1493,1493,1493,1493,1493,1494,1494,1494,1494,1494,1495,1495,196,196,
+1496,1496,1496,1496,1496,1496,1496,1496,1496,1496,196,196,196,196,1492,1497,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 263 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,
+1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1498,1499,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,
+1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,
+1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1500,1501,1501,1501,1501,
+1502,1502,1502,1502,1502,1502,1502,1502,1502,1502,196,196,196,196,196,1503,
+
+/* block 264 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,
+1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1504,1505,1506,1506,1506,1506,
+1507,1507,1507,1507,1507,1507,1507,1507,1507,1507,196,196,196,196,196,196,
+
+/* block 265 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,
+1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1508,1509,1510,
+1508,1511,1511,1511,1511,1511,1511,1511,1511,1511,1511,196,196,196,196,1512,
+
+/* block 266 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+533,533,533,533,533,533,533,196,533,533,533,533,196,533,533,196,
+533,533,533,533,533,533,533,533,533,533,533,533,533,533,533,196,
+
+/* block 267 */
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+
+/* block 268 */
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,1513,
+1513,1513,1513,1513,1513,297,297,1514,1514,1514,1514,1514,1514,1514,1514,1514,
+1515,1515,1515,1515,1515,1515,1515,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+
+/* block 269 */
+1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,
+1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,1516,
+1516,1516,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,
+1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,1517,
+1517,1517,1517,1517,1518,1518,1518,1519,1520,1520,1520,1521,297,297,297,297,
+1522,1522,1522,1522,1522,1522,1522,1522,1522,1522,297,297,297,297,1523,1523,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+
 /* block 270 */
-1414,1412,1415,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-461,461,461,461,461,461,461,461,461,461,1412,461,461,461,461,461,
-461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,1412,
-461,461,1412,1412,1412,1412,1412,1415,1412,1412,1412,461,1409,1409,1409,1409,
-461,461,461,461,461,461,461,461,461,1409,1409,1409,1409,1409,1409,1409,
-1416,1416,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1407,1407,1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 271 */
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+340,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,
 
 /* block 272 */
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,728,1407,1407,728,728,728,728,728,728,728,728,728,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,728,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,728,1408,1408,
+1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,
+1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,
+1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1525,1524,1524,1524,
+1526,1524,1524,1524,1524,340,340,340,340,340,340,340,340,340,340,340,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 273 */
-1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1407,1407,728,728,1407,728,728,728,1407,1407,728,728,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1417,1417,1417,1408,1408,1417,1408,1408,1417,1418,1418,728,728,1408,
-1408,1408,1408,1408,728,728,728,728,728,728,728,728,728,728,728,728,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1407,1407,728,1408,728,1407,728,1408,1408,1408,1419,1419,1419,1419,1419,
+340,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,
+1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,
+1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1525,1524,
+1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,1524,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
+297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,297,
 
 /* block 274 */
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,728,
-1408,728,1417,1417,1408,1408,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,
-1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,
-1417,1417,1417,1417,1417,1417,1417,1417,1417,1408,1408,1408,1417,1408,1408,1408,
+1527,1527,1527,1527,340,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,
+1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,
+340,1527,1527,340,1527,340,340,1527,340,1527,1527,1527,1527,1527,1527,1527,
+1527,1527,1527,340,1527,1527,1527,1527,340,1527,340,1527,340,340,340,340,
+340,340,1527,340,340,340,340,1527,340,1527,340,1527,340,1527,1527,1527,
+340,1527,1527,340,1527,340,340,1527,340,1527,340,1527,340,1527,340,1527,
+340,1527,1527,340,1527,340,340,1527,1527,1527,1527,340,1527,1527,1527,1527,
+1527,1527,1527,340,1527,1527,1527,1527,340,1527,1527,1527,1527,340,1527,340,
 
 /* block 275 */
-1408,1417,1417,1417,1408,1417,1417,1417,1408,1408,1408,1408,1408,1408,1408,1417,
-1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,728,1407,1408,
+1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,340,1527,1527,1527,1527,1527,
+1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,340,340,340,340,
+340,1527,1527,1527,340,1527,1527,1527,1527,1527,340,1527,1527,1527,1527,1527,
+1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,1527,340,340,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
+309,309,340,340,340,340,340,340,340,340,340,340,340,340,340,340,
 
 /* block 276 */
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,724,724,
-724,724,724,724,724,724,1407,1407,1407,728,728,1408,1408,1408,1408,1407,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1407,1407,1407,1407,1407,1407,1407,728,
-728,1407,1407,728,1418,1418,728,728,728,728,1417,1407,1407,1407,1407,1407,
+1528,1528,1528,1528,1529,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1530,1530,1530,1530,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
 
 /* block 277 */
-1407,1407,1407,1407,1407,1407,1407,728,1407,1407,728,728,728,728,1407,1407,
-1418,1407,1407,1407,1407,1417,1417,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1408,728,1407,1407,728,1407,1407,1407,1407,1407,1407,1407,
-1407,728,728,1407,1407,1407,1407,1407,1407,1407,1407,1407,728,1407,1407,1407,
-1407,1407,728,728,728,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,728,728,728,1407,1407,1407,1407,1407,1407,1407,1407,728,728,728,1407,
-1407,728,1407,728,1407,1407,1407,1407,728,1407,1407,1407,1407,1407,1407,728,
-1407,1407,1407,728,1407,1407,1407,1407,1407,1407,728,1408,1408,1408,1408,1408,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1530,
+1530,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1530,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1529,
+1530,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
 
 /* block 278 */
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1417,1417,1417,1408,1408,1408,1417,1417,1417,1417,1417,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+814,814,814,814,814,814,814,814,814,814,814, 58, 58,1528,1528,1528,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,1528,
+1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,
+1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,510,510,510,510,510,510,
+1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,
+1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,781,781,1528,1528,1528,1528,
+1532,1532,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,1532,1532,
 
 /* block 279 */
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1417,1417,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1417,1408,1408,1408,1408,1408,1407,1407,1407,1407,1407,728,1417,728,728,728,
-1408,1408,1408,1407,1407,1408,1408,1408,1409,1409,1409,1409,1408,1408,1408,1408,
-728,728,728,728,728,728,1407,1407,1407,728,1407,1408,1408,1409,1409,1409,
-728,1407,1407,728,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,
+1531,1531,1531,1531,1531,1531,1531,1531,1531,1531,510,510,510,510,1533,510,
+510,1533,1533,1533,1533,1533,1533,1533,1533,1533,1533,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,1528,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,
+1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,1534,
 
 /* block 280 */
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,1407,1407,1407,1409,1409,1409,1409,1407,1407,1407,1407,1407,
+1535,1533,1536,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+510,510,510,510,510,510,510,510,510,510,1533,510,510,510,510,510,
+510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,1533,
+510,510,1533,1533,1533,1533,1533,1536,1533,1533,1533,510,1530,1530,1530,1530,
+510,510,510,510,510,510,510,510,510,1530,1530,1530,1530,1530,1530,1530,
+1537,1537,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1528,1528,1528,1528,1528,1528,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
 
 /* block 281 */
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,1407,1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409,
-1408,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
 
 /* block 282 */
-724,724,724,724,724,724,724,724,724,724,724,724,1409,1409,1409,1409,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,1409,1409,1409,1409,1409,1409,1409,1409,
-724,724,724,724,724,724,724,724,724,724,1409,1409,1409,1409,1409,1409,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,785,1528,1528,785,785,785,785,785,785,785,785,785,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,785,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,785,1529,1529,
 
 /* block 283 */
-724,724,724,724,724,724,724,724,1409,1409,1409,1409,1409,1409,1409,1409,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,1409,1409,
-1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
+1529,1529,1529,1529,1529,1538,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1528,1528,785,785,1528,785,785,785,1528,1528,785,785,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1538,1538,1538,1529,1529,1538,1529,1529,1538,1539,1539,785,785,1529,
+1529,1529,1529,1529,785,785,785,785,785,785,785,785,785,785,785,785,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1528,1528,785,1529,785,1528,785,1529,1529,1529,1540,1540,1540,1540,1540,
 
 /* block 284 */
-724,724,724,724,724,724,724,724,724,724,724,724,1417,1408,1408,1417,
-1408,1408,1408,1408,1408,1408,1408,1408,1417,1417,1417,1417,1417,1417,1417,1417,
-1408,1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1408,724,1417,1417,1417,1408,
-1408,1408,1408,1408,1408,1408,724,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,785,
+1529,785,1538,1538,1529,1529,1538,1538,1538,1538,1538,1538,1538,1538,1538,1538,
+1538,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1538,1538,1538,1538,1538,1538,1538,1538,1538,1538,
+1538,1538,1538,1538,1538,1538,1538,1538,1538,1529,1529,1529,1538,1529,1529,1529,
 
 /* block 285 */
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1420,1420,1420,1420,1408,1417,1417,1408,1417,1417,1408,1417,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1417,1417,1417,
-1408,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
+1529,1538,1538,1538,1529,1538,1538,1538,1529,1529,1529,1529,1529,1529,1529,1538,
+1529,1538,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1538,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,785,1528,1529,
 
 /* block 286 */
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,
-1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1409,1409,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,781,781,
+781,781,781,781,781,781,1528,1528,1528,785,785,1529,1529,1529,1529,1528,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1528,1528,1528,1528,1528,1528,1528,785,
+785,1528,1528,785,1539,1539,785,785,785,785,1538,1528,1528,1528,1528,1528,
 
 /* block 287 */
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409,1409,1409,1409,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1408,
-1408,1408,1408,1417,1417,1417,1409,1409,1409,1409,1409,1409,1409,1409,1408,1408,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409,
-1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409,1409,1409,1409,
-1417,1417,1417,1417,1417,1417,1417,1417,1417,1409,1409,1409,1409,1409,1409,1409,
+1528,1528,1528,1528,1528,1528,1528,785,1528,1528,785,785,785,785,1528,1528,
+1539,1528,1528,1528,1528,1538,1538,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1529,785,1528,1528,785,1528,1528,1528,1528,1528,1528,1528,
+1528,785,785,1528,1528,1528,1528,1528,1528,1528,1528,1528,785,1528,1528,1528,
+1528,1528,785,785,785,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,785,785,785,1528,1528,1528,1528,1528,1528,1528,1528,785,785,785,1528,
+1528,785,1528,785,1528,1528,1528,1528,785,1528,1528,1528,1528,1528,1528,785,
+1528,1528,1528,785,1528,1528,1528,1528,1528,1528,785,1529,1529,1529,1529,1529,
 
 /* block 288 */
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1538,1538,1538,1529,1529,1529,1538,1538,1538,1538,1538,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
 
 /* block 289 */
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,163,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,
-724,724,724,724,724,724,724,724,724,724,724,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-1421,1421,1421,1421,1421,1421,1421,1421,1421,1421,163,163,163,163,163,163,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1538,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1538,1538,1538,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1538,1529,1529,1529,1529,1529,1528,1528,1528,1528,1528,785,1538,785,785,785,
+1529,1529,1529,1528,1528,1529,1529,1529,1530,1530,1530,1530,1529,1529,1529,1529,
+785,785,785,785,785,785,1528,1528,1528,785,1528,1529,1529,1530,1530,1530,
+785,1528,1528,785,1529,1529,1529,1529,1529,1529,1529,1529,1529,1530,1530,1530,
 
 /* block 290 */
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,
-1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,957,957,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,1528,1528,1528,1530,1530,1530,1530,1528,1528,1528,1528,1528,
 
 /* block 291 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,1528,1528,1528,1528,1528,1530,1530,1530,1530,1530,1530,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1530,1530,1530,1530,
+1529,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
 
 /* block 292 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,163,163,163,163,163,163,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+781,781,781,781,781,781,781,781,781,781,781,781,1530,1530,1530,1530,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,1530,1530,1530,1530,1530,1530,1530,1530,
+781,781,781,781,781,781,781,781,781,781,1530,1530,1530,1530,1530,1530,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
 
 /* block 293 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,163,163,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+781,781,781,781,781,781,781,781,1530,1530,1530,1530,1530,1530,1530,1530,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,1530,1530,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1530,1530,1530,1530,
+1528,1528,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
 
 /* block 294 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+781,781,781,781,781,781,781,781,781,781,781,781,1538,1529,1529,1538,
+1529,1529,1529,1529,1529,1529,1529,1529,1538,1538,1538,1538,1538,1538,1538,1538,
+1529,1529,1529,1529,1529,1529,1538,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1538,1538,1538,1538,1538,1538,1538,1538,1538,1538,1529,781,1538,1538,1538,1529,
+1529,1529,1529,1529,1529,1529,781,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1538,1529,1529,1529,1529,1529,1529,1529,1529,
 
 /* block 295 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1541,1541,1541,1541,1529,1538,1538,1529,1538,1538,1529,1538,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1538,1538,1538,
+1529,1538,1538,1538,1538,1538,1538,1538,1538,1538,1538,1538,1538,1538,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
 
 /* block 296 */
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,
-952,952,952,952,952,952,952,952,952,952,952,952,952,952,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,
+1528,1528,1528,1528,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1528,1530,1530,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1530,1530,1530,
 
 /* block 297 */
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,957,957,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1530,1530,1530,1530,1530,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,
+1529,1529,1529,1538,1538,1538,1529,1530,1530,1530,1530,1530,1530,1530,1529,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1530,1530,1529,
+1529,1529,1529,1529,1529,1529,1529,1529,1529,1529,1530,1530,1530,1530,1530,1530,
+1538,1538,1538,1538,1538,1538,1538,1538,1538,1530,1530,1530,1530,1530,1530,1530,
 
 /* block 298 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,163,163,163,163,163,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,196,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,781,
+1479,1479,1479,1479,1479,1479,1479,1479,1479,1479,196,196,196,196,196,196,
 
 /* block 299 */
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
-163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,
+1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1530,1032,1032,
 
 /* block 300 */
-708,713,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
-1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
-1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
-1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
-1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
-1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
 
 /* block 301 */
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,196,196,196,196,196,196,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 
 /* block 302 */
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,196,196,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 
 /* block 303 */
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,
-708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
 
 /* block 304 */
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,
-951,951,951,951,951,951,951,951,951,951,951,951,951,951,957,957,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+
+/* block 305 */
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 306 */
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,
+1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 307 */
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,1032,1032,
+
+/* block 308 */
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,196,196,196,196,196,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+
+/* block 309 */
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,910,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,
+
+/* block 310 */
+765,770,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,
+1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,
+1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,
+1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,
+1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,
+1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,1542,
+
+/* block 311 */
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+
+/* block 312 */
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+
+/* block 313 */
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,
+765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,
+
+/* block 314 */
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,
+1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1032,1032,
 };
 
 #if UCD_BLOCK_SIZE != 128
diff --git a/engine/thirdparty/pcre2/src/pcre2_ucp.h b/engine/thirdparty/pcre2/src/pcre2_ucp.h
index 9ccc8297..513c54e2 100644
--- a/engine/thirdparty/pcre2/src/pcre2_ucp.h
+++ b/engine/thirdparty/pcre2/src/pcre2_ucp.h
@@ -132,13 +132,18 @@ enum {
   ucp_Hex_Digit,
   ucp_IDS_Binary_Operator,
   ucp_IDS_Trinary_Operator,
+  ucp_IDS_Unary_Operator,
+  ucp_ID_Compat_Math_Continue,
+  ucp_ID_Compat_Math_Start,
   ucp_ID_Continue,
   ucp_ID_Start,
   ucp_Ideographic,
+  ucp_InCB,
   ucp_Join_Control,
   ucp_Logical_Order_Exception,
   ucp_Lowercase,
   ucp_Math,
+  ucp_Modifier_Combining_Mark,
   ucp_Noncharacter_Code_Point,
   ucp_Pattern_Syntax,
   ucp_Pattern_White_Space,
@@ -219,6 +224,8 @@ enum {
   ucp_Latin,
   ucp_Greek,
   ucp_Cyrillic,
+  ucp_Armenian,
+  ucp_Hebrew,
   ucp_Arabic,
   ucp_Syriac,
   ucp_Thaana,
@@ -232,15 +239,21 @@ enum {
   ucp_Kannada,
   ucp_Malayalam,
   ucp_Sinhala,
+  ucp_Thai,
+  ucp_Tibetan,
   ucp_Myanmar,
   ucp_Georgian,
   ucp_Hangul,
+  ucp_Ethiopic,
+  ucp_Cherokee,
+  ucp_Runic,
   ucp_Mongolian,
   ucp_Hiragana,
   ucp_Katakana,
   ucp_Bopomofo,
   ucp_Han,
   ucp_Yi,
+  ucp_Gothic,
   ucp_Tagalog,
   ucp_Hanunoo,
   ucp_Buhid,
@@ -248,21 +261,33 @@ enum {
   ucp_Limbu,
   ucp_Tai_Le,
   ucp_Linear_B,
+  ucp_Shavian,
   ucp_Cypriot,
   ucp_Buginese,
   ucp_Coptic,
   ucp_Glagolitic,
+  ucp_Tifinagh,
   ucp_Syloti_Nagri,
   ucp_Phags_Pa,
   ucp_Nko,
   ucp_Kayah_Li,
+  ucp_Lycian,
+  ucp_Carian,
+  ucp_Lydian,
+  ucp_Avestan,
+  ucp_Samaritan,
+  ucp_Lisu,
   ucp_Javanese,
+  ucp_Old_Turkic,
   ucp_Kaithi,
   ucp_Mandaic,
   ucp_Chakma,
+  ucp_Meroitic_Hieroglyphs,
   ucp_Sharada,
   ucp_Takri,
+  ucp_Caucasian_Albanian,
   ucp_Duployan,
+  ucp_Elbasan,
   ucp_Grantha,
   ucp_Khojki,
   ucp_Linear_A,
@@ -274,7 +299,10 @@ enum {
   ucp_Khudawadi,
   ucp_Tirhuta,
   ucp_Multani,
+  ucp_Old_Hungarian,
   ucp_Adlam,
+  ucp_Osage,
+  ucp_Tangut,
   ucp_Masaram_Gondi,
   ucp_Dogra,
   ucp_Gunjala_Gondi,
@@ -284,31 +312,28 @@ enum {
   ucp_Yezidi,
   ucp_Cypro_Minoan,
   ucp_Old_Uyghur,
+  ucp_Toto,
+  ucp_Garay,
+  ucp_Gurung_Khema,
+  ucp_Ol_Onal,
+  ucp_Sunuwar,
+  ucp_Todhri,
+  ucp_Tulu_Tigalari,
 
   /* Scripts which has no characters in other scripts. */
   ucp_Unknown,
   ucp_Common,
-  ucp_Armenian,
-  ucp_Hebrew,
-  ucp_Thai,
   ucp_Lao,
-  ucp_Tibetan,
-  ucp_Ethiopic,
-  ucp_Cherokee,
   ucp_Canadian_Aboriginal,
   ucp_Ogham,
-  ucp_Runic,
   ucp_Khmer,
   ucp_Old_Italic,
-  ucp_Gothic,
   ucp_Deseret,
   ucp_Inherited,
   ucp_Ugaritic,
-  ucp_Shavian,
   ucp_Osmanya,
   ucp_Braille,
   ucp_New_Tai_Lue,
-  ucp_Tifinagh,
   ucp_Old_Persian,
   ucp_Kharoshthi,
   ucp_Balinese,
@@ -320,32 +345,22 @@ enum {
   ucp_Vai,
   ucp_Saurashtra,
   ucp_Rejang,
-  ucp_Lycian,
-  ucp_Carian,
-  ucp_Lydian,
   ucp_Cham,
   ucp_Tai_Tham,
   ucp_Tai_Viet,
-  ucp_Avestan,
   ucp_Egyptian_Hieroglyphs,
-  ucp_Samaritan,
-  ucp_Lisu,
   ucp_Bamum,
   ucp_Meetei_Mayek,
   ucp_Imperial_Aramaic,
   ucp_Old_South_Arabian,
   ucp_Inscriptional_Parthian,
   ucp_Inscriptional_Pahlavi,
-  ucp_Old_Turkic,
   ucp_Batak,
   ucp_Brahmi,
   ucp_Meroitic_Cursive,
-  ucp_Meroitic_Hieroglyphs,
   ucp_Miao,
   ucp_Sora_Sompeng,
-  ucp_Caucasian_Albanian,
   ucp_Bassa_Vah,
-  ucp_Elbasan,
   ucp_Pahawh_Hmong,
   ucp_Mende_Kikakui,
   ucp_Mro,
@@ -358,13 +373,10 @@ enum {
   ucp_Ahom,
   ucp_Anatolian_Hieroglyphs,
   ucp_Hatran,
-  ucp_Old_Hungarian,
   ucp_SignWriting,
   ucp_Bhaiksuki,
   ucp_Marchen,
   ucp_Newa,
-  ucp_Osage,
-  ucp_Tangut,
   ucp_Nushu,
   ucp_Soyombo,
   ucp_Zanabazar_Square,
@@ -378,10 +390,10 @@ enum {
   ucp_Dives_Akuru,
   ucp_Khitan_Small_Script,
   ucp_Tangsa,
-  ucp_Toto,
   ucp_Vithkuqi,
   ucp_Kawi,
   ucp_Nag_Mundari,
+  ucp_Kirat_Rai,
 
   /* This must be last */
   ucp_Script_Count
@@ -389,7 +401,7 @@ enum {
 
 /* Size of entries in ucd_script_sets[] */
 
-#define ucd_script_sets_item_size 3
+#define ucd_script_sets_item_size 4
 
 #endif  /* PCRE2_UCP_H_IDEMPOTENT_GUARD */
 
diff --git a/engine/thirdparty/pcre2/src/pcre2_ucptables.c b/engine/thirdparty/pcre2/src/pcre2_ucptables.c
index 2110014c..d2b34037 100644
--- a/engine/thirdparty/pcre2/src/pcre2_ucptables.c
+++ b/engine/thirdparty/pcre2/src/pcre2_ucptables.c
@@ -199,6 +199,8 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_extendedpictographic0 STR_e STR_x STR_t STR_e STR_n STR_d STR_e STR_d STR_p STR_i STR_c STR_t STR_o STR_g STR_r STR_a STR_p STR_h STR_i STR_c "\0"
 #define STRING_extender0 STR_e STR_x STR_t STR_e STR_n STR_d STR_e STR_r "\0"
 #define STRING_extpict0 STR_e STR_x STR_t STR_p STR_i STR_c STR_t "\0"
+#define STRING_gara0 STR_g STR_a STR_r STR_a "\0"
+#define STRING_garay0 STR_g STR_a STR_r STR_a STR_y "\0"
 #define STRING_geor0 STR_g STR_e STR_o STR_r "\0"
 #define STRING_georgian0 STR_g STR_e STR_o STR_r STR_g STR_i STR_a STR_n "\0"
 #define STRING_glag0 STR_g STR_l STR_a STR_g "\0"
@@ -219,9 +221,11 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_grlink0 STR_g STR_r STR_l STR_i STR_n STR_k "\0"
 #define STRING_gujarati0 STR_g STR_u STR_j STR_a STR_r STR_a STR_t STR_i "\0"
 #define STRING_gujr0 STR_g STR_u STR_j STR_r "\0"
+#define STRING_gukh0 STR_g STR_u STR_k STR_h "\0"
 #define STRING_gunjalagondi0 STR_g STR_u STR_n STR_j STR_a STR_l STR_a STR_g STR_o STR_n STR_d STR_i "\0"
 #define STRING_gurmukhi0 STR_g STR_u STR_r STR_m STR_u STR_k STR_h STR_i "\0"
 #define STRING_guru0 STR_g STR_u STR_r STR_u "\0"
+#define STRING_gurungkhema0 STR_g STR_u STR_r STR_u STR_n STR_g STR_k STR_h STR_e STR_m STR_a "\0"
 #define STRING_han0 STR_h STR_a STR_n "\0"
 #define STRING_hang0 STR_h STR_a STR_n STR_g "\0"
 #define STRING_hangul0 STR_h STR_a STR_n STR_g STR_u STR_l "\0"
@@ -242,6 +246,8 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_hmnp0 STR_h STR_m STR_n STR_p "\0"
 #define STRING_hung0 STR_h STR_u STR_n STR_g "\0"
 #define STRING_idc0 STR_i STR_d STR_c "\0"
+#define STRING_idcompatmathcontinue0 STR_i STR_d STR_c STR_o STR_m STR_p STR_a STR_t STR_m STR_a STR_t STR_h STR_c STR_o STR_n STR_t STR_i STR_n STR_u STR_e "\0"
+#define STRING_idcompatmathstart0 STR_i STR_d STR_c STR_o STR_m STR_p STR_a STR_t STR_m STR_a STR_t STR_h STR_s STR_t STR_a STR_r STR_t "\0"
 #define STRING_idcontinue0 STR_i STR_d STR_c STR_o STR_n STR_t STR_i STR_n STR_u STR_e "\0"
 #define STRING_ideo0 STR_i STR_d STR_e STR_o "\0"
 #define STRING_ideographic0 STR_i STR_d STR_e STR_o STR_g STR_r STR_a STR_p STR_h STR_i STR_c "\0"
@@ -251,7 +257,10 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_idst0 STR_i STR_d STR_s STR_t "\0"
 #define STRING_idstart0 STR_i STR_d STR_s STR_t STR_a STR_r STR_t "\0"
 #define STRING_idstrinaryoperator0 STR_i STR_d STR_s STR_t STR_r STR_i STR_n STR_a STR_r STR_y STR_o STR_p STR_e STR_r STR_a STR_t STR_o STR_r "\0"
+#define STRING_idsu0 STR_i STR_d STR_s STR_u "\0"
+#define STRING_idsunaryoperator0 STR_i STR_d STR_s STR_u STR_n STR_a STR_r STR_y STR_o STR_p STR_e STR_r STR_a STR_t STR_o STR_r "\0"
 #define STRING_imperialaramaic0 STR_i STR_m STR_p STR_e STR_r STR_i STR_a STR_l STR_a STR_r STR_a STR_m STR_a STR_i STR_c "\0"
+#define STRING_incb0 STR_i STR_n STR_c STR_b "\0"
 #define STRING_inherited0 STR_i STR_n STR_h STR_e STR_r STR_i STR_t STR_e STR_d "\0"
 #define STRING_inscriptionalpahlavi0 STR_i STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_p STR_a STR_h STR_l STR_a STR_v STR_i "\0"
 #define STRING_inscriptionalparthian0 STR_i STR_n STR_s STR_c STR_r STR_i STR_p STR_t STR_i STR_o STR_n STR_a STR_l STR_p STR_a STR_r STR_t STR_h STR_i STR_a STR_n "\0"
@@ -275,8 +284,10 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_khoj0 STR_k STR_h STR_o STR_j "\0"
 #define STRING_khojki0 STR_k STR_h STR_o STR_j STR_k STR_i "\0"
 #define STRING_khudawadi0 STR_k STR_h STR_u STR_d STR_a STR_w STR_a STR_d STR_i "\0"
+#define STRING_kiratrai0 STR_k STR_i STR_r STR_a STR_t STR_r STR_a STR_i "\0"
 #define STRING_kits0 STR_k STR_i STR_t STR_s "\0"
 #define STRING_knda0 STR_k STR_n STR_d STR_a "\0"
+#define STRING_krai0 STR_k STR_r STR_a STR_i "\0"
 #define STRING_kthi0 STR_k STR_t STR_h STR_i "\0"
 #define STRING_l0 STR_l "\0"
 #define STRING_l_AMPERSAND0 STR_l STR_AMPERSAND "\0"
@@ -323,6 +334,7 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_masaramgondi0 STR_m STR_a STR_s STR_a STR_r STR_a STR_m STR_g STR_o STR_n STR_d STR_i "\0"
 #define STRING_math0 STR_m STR_a STR_t STR_h "\0"
 #define STRING_mc0 STR_m STR_c "\0"
+#define STRING_mcm0 STR_m STR_c STR_m "\0"
 #define STRING_me0 STR_m STR_e "\0"
 #define STRING_medefaidrin0 STR_m STR_e STR_d STR_e STR_f STR_a STR_i STR_d STR_r STR_i STR_n "\0"
 #define STRING_medf0 STR_m STR_e STR_d STR_f "\0"
@@ -337,6 +349,7 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_mlym0 STR_m STR_l STR_y STR_m "\0"
 #define STRING_mn0 STR_m STR_n "\0"
 #define STRING_modi0 STR_m STR_o STR_d STR_i "\0"
+#define STRING_modifiercombiningmark0 STR_m STR_o STR_d STR_i STR_f STR_i STR_e STR_r STR_c STR_o STR_m STR_b STR_i STR_n STR_i STR_n STR_g STR_m STR_a STR_r STR_k "\0"
 #define STRING_mong0 STR_m STR_o STR_n STR_g "\0"
 #define STRING_mongolian0 STR_m STR_o STR_n STR_g STR_o STR_l STR_i STR_a STR_n "\0"
 #define STRING_mro0 STR_m STR_r STR_o "\0"
@@ -379,6 +392,8 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_oldsoutharabian0 STR_o STR_l STR_d STR_s STR_o STR_u STR_t STR_h STR_a STR_r STR_a STR_b STR_i STR_a STR_n "\0"
 #define STRING_oldturkic0 STR_o STR_l STR_d STR_t STR_u STR_r STR_k STR_i STR_c "\0"
 #define STRING_olduyghur0 STR_o STR_l STR_d STR_u STR_y STR_g STR_h STR_u STR_r "\0"
+#define STRING_olonal0 STR_o STR_l STR_o STR_n STR_a STR_l "\0"
+#define STRING_onao0 STR_o STR_n STR_a STR_o "\0"
 #define STRING_oriya0 STR_o STR_r STR_i STR_y STR_a "\0"
 #define STRING_orkh0 STR_o STR_r STR_k STR_h "\0"
 #define STRING_orya0 STR_o STR_r STR_y STR_a "\0"
@@ -463,6 +478,8 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_sterm0 STR_s STR_t STR_e STR_r STR_m "\0"
 #define STRING_sund0 STR_s STR_u STR_n STR_d "\0"
 #define STRING_sundanese0 STR_s STR_u STR_n STR_d STR_a STR_n STR_e STR_s STR_e "\0"
+#define STRING_sunu0 STR_s STR_u STR_n STR_u "\0"
+#define STRING_sunuwar0 STR_s STR_u STR_n STR_u STR_w STR_a STR_r "\0"
 #define STRING_sylo0 STR_s STR_y STR_l STR_o "\0"
 #define STRING_sylotinagri0 STR_s STR_y STR_l STR_o STR_t STR_i STR_n STR_a STR_g STR_r STR_i "\0"
 #define STRING_syrc0 STR_s STR_y STR_r STR_c "\0"
@@ -498,7 +515,11 @@ the "loose matching" rules that Unicode advises and Perl uses. */
 #define STRING_tirh0 STR_t STR_i STR_r STR_h "\0"
 #define STRING_tirhuta0 STR_t STR_i STR_r STR_h STR_u STR_t STR_a "\0"
 #define STRING_tnsa0 STR_t STR_n STR_s STR_a "\0"
+#define STRING_todhri0 STR_t STR_o STR_d STR_h STR_r STR_i "\0"
+#define STRING_todr0 STR_t STR_o STR_d STR_r "\0"
 #define STRING_toto0 STR_t STR_o STR_t STR_o "\0"
+#define STRING_tulutigalari0 STR_t STR_u STR_l STR_u STR_t STR_i STR_g STR_a STR_l STR_a STR_r STR_i "\0"
+#define STRING_tutg0 STR_t STR_u STR_t STR_g "\0"
 #define STRING_ugar0 STR_u STR_g STR_a STR_r "\0"
 #define STRING_ugaritic0 STR_u STR_g STR_a STR_r STR_i STR_t STR_i STR_c "\0"
 #define STRING_uideo0 STR_u STR_i STR_d STR_e STR_o "\0"
@@ -690,6 +711,8 @@ const char PRIV(utt_names)[] =
   STRING_extendedpictographic0
   STRING_extender0
   STRING_extpict0
+  STRING_gara0
+  STRING_garay0
   STRING_geor0
   STRING_georgian0
   STRING_glag0
@@ -710,9 +733,11 @@ const char PRIV(utt_names)[] =
   STRING_grlink0
   STRING_gujarati0
   STRING_gujr0
+  STRING_gukh0
   STRING_gunjalagondi0
   STRING_gurmukhi0
   STRING_guru0
+  STRING_gurungkhema0
   STRING_han0
   STRING_hang0
   STRING_hangul0
@@ -733,6 +758,8 @@ const char PRIV(utt_names)[] =
   STRING_hmnp0
   STRING_hung0
   STRING_idc0
+  STRING_idcompatmathcontinue0
+  STRING_idcompatmathstart0
   STRING_idcontinue0
   STRING_ideo0
   STRING_ideographic0
@@ -742,7 +769,10 @@ const char PRIV(utt_names)[] =
   STRING_idst0
   STRING_idstart0
   STRING_idstrinaryoperator0
+  STRING_idsu0
+  STRING_idsunaryoperator0
   STRING_imperialaramaic0
+  STRING_incb0
   STRING_inherited0
   STRING_inscriptionalpahlavi0
   STRING_inscriptionalparthian0
@@ -766,8 +796,10 @@ const char PRIV(utt_names)[] =
   STRING_khoj0
   STRING_khojki0
   STRING_khudawadi0
+  STRING_kiratrai0
   STRING_kits0
   STRING_knda0
+  STRING_krai0
   STRING_kthi0
   STRING_l0
   STRING_l_AMPERSAND0
@@ -814,6 +846,7 @@ const char PRIV(utt_names)[] =
   STRING_masaramgondi0
   STRING_math0
   STRING_mc0
+  STRING_mcm0
   STRING_me0
   STRING_medefaidrin0
   STRING_medf0
@@ -828,6 +861,7 @@ const char PRIV(utt_names)[] =
   STRING_mlym0
   STRING_mn0
   STRING_modi0
+  STRING_modifiercombiningmark0
   STRING_mong0
   STRING_mongolian0
   STRING_mro0
@@ -870,6 +904,8 @@ const char PRIV(utt_names)[] =
   STRING_oldsoutharabian0
   STRING_oldturkic0
   STRING_olduyghur0
+  STRING_olonal0
+  STRING_onao0
   STRING_oriya0
   STRING_orkh0
   STRING_orya0
@@ -954,6 +990,8 @@ const char PRIV(utt_names)[] =
   STRING_sterm0
   STRING_sund0
   STRING_sundanese0
+  STRING_sunu0
+  STRING_sunuwar0
   STRING_sylo0
   STRING_sylotinagri0
   STRING_syrc0
@@ -989,7 +1027,11 @@ const char PRIV(utt_names)[] =
   STRING_tirh0
   STRING_tirhuta0
   STRING_tnsa0
+  STRING_todhri0
+  STRING_todr0
   STRING_toto0
+  STRING_tulutigalari0
+  STRING_tutg0
   STRING_ugar0
   STRING_ugaritic0
   STRING_uideo0
@@ -1037,7 +1079,7 @@ const char PRIV(utt_names)[] =
 const ucp_type_table PRIV(utt)[] = {
   {   0, PT_SCX, ucp_Adlam },
   {   6, PT_SCX, ucp_Adlam },
-  {  11, PT_SC, ucp_Caucasian_Albanian },
+  {  11, PT_SCX, ucp_Caucasian_Albanian },
   {  16, PT_BOOL, ucp_ASCII_Hex_Digit },
   {  21, PT_SC, ucp_Ahom },
   {  26, PT_BOOL, ucp_Alphabetic },
@@ -1046,13 +1088,13 @@ const ucp_type_table PRIV(utt)[] = {
   {  64, PT_ANY, 0 },
   {  68, PT_SCX, ucp_Arabic },
   {  73, PT_SCX, ucp_Arabic },
-  {  80, PT_SC, ucp_Armenian },
+  {  80, PT_SCX, ucp_Armenian },
   {  89, PT_SC, ucp_Imperial_Aramaic },
-  {  94, PT_SC, ucp_Armenian },
+  {  94, PT_SCX, ucp_Armenian },
   {  99, PT_BOOL, ucp_ASCII },
   { 105, PT_BOOL, ucp_ASCII_Hex_Digit },
-  { 119, PT_SC, ucp_Avestan },
-  { 127, PT_SC, ucp_Avestan },
+  { 119, PT_SCX, ucp_Avestan },
+  { 127, PT_SCX, ucp_Avestan },
   { 132, PT_SC, ucp_Balinese },
   { 137, PT_SC, ucp_Balinese },
   { 146, PT_SC, ucp_Bamum },
@@ -1106,11 +1148,11 @@ const ucp_type_table PRIV(utt)[] = {
   { 480, PT_SCX, ucp_Chakma },
   { 485, PT_SC, ucp_Canadian_Aboriginal },
   { 504, PT_SC, ucp_Canadian_Aboriginal },
-  { 509, PT_SC, ucp_Carian },
-  { 514, PT_SC, ucp_Carian },
+  { 509, PT_SCX, ucp_Carian },
+  { 514, PT_SCX, ucp_Carian },
   { 521, PT_BOOL, ucp_Cased },
   { 527, PT_BOOL, ucp_Case_Ignorable },
-  { 541, PT_SC, ucp_Caucasian_Albanian },
+  { 541, PT_SCX, ucp_Caucasian_Albanian },
   { 559, PT_PC, ucp_Cc },
   { 562, PT_PC, ucp_Cf },
   { 565, PT_SCX, ucp_Chakma },
@@ -1120,8 +1162,8 @@ const ucp_type_table PRIV(utt)[] = {
   { 621, PT_BOOL, ucp_Changes_When_Lowercased },
   { 643, PT_BOOL, ucp_Changes_When_Titlecased },
   { 665, PT_BOOL, ucp_Changes_When_Uppercased },
-  { 687, PT_SC, ucp_Cherokee },
-  { 692, PT_SC, ucp_Cherokee },
+  { 687, PT_SCX, ucp_Cherokee },
+  { 692, PT_SCX, ucp_Cherokee },
   { 701, PT_SC, ucp_Chorasmian },
   { 712, PT_SC, ucp_Chorasmian },
   { 717, PT_BOOL, ucp_Case_Ignorable },
@@ -1164,8 +1206,8 @@ const ucp_type_table PRIV(utt)[] = {
   { 963, PT_BOOL, ucp_Emoji_Component },
   { 969, PT_SC, ucp_Egyptian_Hieroglyphs },
   { 974, PT_SC, ucp_Egyptian_Hieroglyphs },
-  { 994, PT_SC, ucp_Elbasan },
-  { 999, PT_SC, ucp_Elbasan },
+  { 994, PT_SCX, ucp_Elbasan },
+  { 999, PT_SCX, ucp_Elbasan },
   { 1007, PT_SC, ucp_Elymaic },
   { 1012, PT_SC, ucp_Elymaic },
   { 1020, PT_BOOL, ucp_Emoji_Modifier },
@@ -1175,355 +1217,376 @@ const ucp_type_table PRIV(utt)[] = {
   { 1060, PT_BOOL, ucp_Emoji_Modifier_Base },
   { 1078, PT_BOOL, ucp_Emoji_Presentation },
   { 1096, PT_BOOL, ucp_Emoji_Presentation },
-  { 1102, PT_SC, ucp_Ethiopic },
-  { 1107, PT_SC, ucp_Ethiopic },
+  { 1102, PT_SCX, ucp_Ethiopic },
+  { 1107, PT_SCX, ucp_Ethiopic },
   { 1116, PT_BOOL, ucp_Extender },
   { 1120, PT_BOOL, ucp_Extended_Pictographic },
   { 1141, PT_BOOL, ucp_Extender },
   { 1150, PT_BOOL, ucp_Extended_Pictographic },
-  { 1158, PT_SCX, ucp_Georgian },
-  { 1163, PT_SCX, ucp_Georgian },
-  { 1172, PT_SCX, ucp_Glagolitic },
-  { 1177, PT_SCX, ucp_Glagolitic },
-  { 1188, PT_SCX, ucp_Gunjala_Gondi },
-  { 1193, PT_SCX, ucp_Masaram_Gondi },
-  { 1198, PT_SC, ucp_Gothic },
-  { 1203, PT_SC, ucp_Gothic },
-  { 1210, PT_SCX, ucp_Grantha },
-  { 1215, PT_SCX, ucp_Grantha },
-  { 1223, PT_BOOL, ucp_Grapheme_Base },
-  { 1236, PT_BOOL, ucp_Grapheme_Extend },
-  { 1251, PT_BOOL, ucp_Grapheme_Link },
-  { 1264, PT_BOOL, ucp_Grapheme_Base },
-  { 1271, PT_SCX, ucp_Greek },
-  { 1277, PT_SCX, ucp_Greek },
-  { 1282, PT_BOOL, ucp_Grapheme_Extend },
-  { 1288, PT_BOOL, ucp_Grapheme_Link },
-  { 1295, PT_SCX, ucp_Gujarati },
-  { 1304, PT_SCX, ucp_Gujarati },
-  { 1309, PT_SCX, ucp_Gunjala_Gondi },
-  { 1322, PT_SCX, ucp_Gurmukhi },
-  { 1331, PT_SCX, ucp_Gurmukhi },
-  { 1336, PT_SCX, ucp_Han },
-  { 1340, PT_SCX, ucp_Hangul },
-  { 1345, PT_SCX, ucp_Hangul },
-  { 1352, PT_SCX, ucp_Han },
-  { 1357, PT_SCX, ucp_Hanifi_Rohingya },
-  { 1372, PT_SCX, ucp_Hanunoo },
-  { 1377, PT_SCX, ucp_Hanunoo },
-  { 1385, PT_SC, ucp_Hatran },
-  { 1390, PT_SC, ucp_Hatran },
-  { 1397, PT_SC, ucp_Hebrew },
-  { 1402, PT_SC, ucp_Hebrew },
-  { 1409, PT_BOOL, ucp_Hex_Digit },
-  { 1413, PT_BOOL, ucp_Hex_Digit },
-  { 1422, PT_SCX, ucp_Hiragana },
-  { 1427, PT_SCX, ucp_Hiragana },
-  { 1436, PT_SC, ucp_Anatolian_Hieroglyphs },
-  { 1441, PT_SC, ucp_Pahawh_Hmong },
-  { 1446, PT_SC, ucp_Nyiakeng_Puachue_Hmong },
-  { 1451, PT_SC, ucp_Old_Hungarian },
-  { 1456, PT_BOOL, ucp_ID_Continue },
-  { 1460, PT_BOOL, ucp_ID_Continue },
-  { 1471, PT_BOOL, ucp_Ideographic },
-  { 1476, PT_BOOL, ucp_Ideographic },
-  { 1488, PT_BOOL, ucp_ID_Start },
-  { 1492, PT_BOOL, ucp_IDS_Binary_Operator },
-  { 1497, PT_BOOL, ucp_IDS_Binary_Operator },
-  { 1515, PT_BOOL, ucp_IDS_Trinary_Operator },
-  { 1520, PT_BOOL, ucp_ID_Start },
-  { 1528, PT_BOOL, ucp_IDS_Trinary_Operator },
-  { 1547, PT_SC, ucp_Imperial_Aramaic },
-  { 1563, PT_SC, ucp_Inherited },
-  { 1573, PT_SC, ucp_Inscriptional_Pahlavi },
-  { 1594, PT_SC, ucp_Inscriptional_Parthian },
-  { 1616, PT_SC, ucp_Old_Italic },
-  { 1621, PT_SCX, ucp_Javanese },
-  { 1626, PT_SCX, ucp_Javanese },
-  { 1635, PT_BOOL, ucp_Join_Control },
-  { 1641, PT_BOOL, ucp_Join_Control },
-  { 1653, PT_SCX, ucp_Kaithi },
-  { 1660, PT_SCX, ucp_Kayah_Li },
-  { 1665, PT_SCX, ucp_Katakana },
-  { 1670, PT_SCX, ucp_Kannada },
-  { 1678, PT_SCX, ucp_Katakana },
-  { 1687, PT_SC, ucp_Kawi },
-  { 1692, PT_SCX, ucp_Kayah_Li },
-  { 1700, PT_SC, ucp_Kharoshthi },
-  { 1705, PT_SC, ucp_Kharoshthi },
-  { 1716, PT_SC, ucp_Khitan_Small_Script },
-  { 1734, PT_SC, ucp_Khmer },
-  { 1740, PT_SC, ucp_Khmer },
-  { 1745, PT_SCX, ucp_Khojki },
-  { 1750, PT_SCX, ucp_Khojki },
-  { 1757, PT_SCX, ucp_Khudawadi },
-  { 1767, PT_SC, ucp_Khitan_Small_Script },
-  { 1772, PT_SCX, ucp_Kannada },
-  { 1777, PT_SCX, ucp_Kaithi },
-  { 1782, PT_GC, ucp_L },
-  { 1784, PT_LAMP, 0 },
-  { 1787, PT_SC, ucp_Tai_Tham },
-  { 1792, PT_SC, ucp_Lao },
-  { 1796, PT_SC, ucp_Lao },
-  { 1801, PT_SCX, ucp_Latin },
-  { 1807, PT_SCX, ucp_Latin },
-  { 1812, PT_LAMP, 0 },
-  { 1815, PT_SC, ucp_Lepcha },
-  { 1820, PT_SC, ucp_Lepcha },
-  { 1827, PT_SCX, ucp_Limbu },
-  { 1832, PT_SCX, ucp_Limbu },
-  { 1838, PT_SCX, ucp_Linear_A },
-  { 1843, PT_SCX, ucp_Linear_B },
-  { 1848, PT_SCX, ucp_Linear_A },
-  { 1856, PT_SCX, ucp_Linear_B },
-  { 1864, PT_SC, ucp_Lisu },
-  { 1869, PT_PC, ucp_Ll },
-  { 1872, PT_PC, ucp_Lm },
-  { 1875, PT_PC, ucp_Lo },
-  { 1878, PT_BOOL, ucp_Logical_Order_Exception },
-  { 1882, PT_BOOL, ucp_Logical_Order_Exception },
-  { 1904, PT_BOOL, ucp_Lowercase },
-  { 1910, PT_BOOL, ucp_Lowercase },
-  { 1920, PT_PC, ucp_Lt },
-  { 1923, PT_PC, ucp_Lu },
-  { 1926, PT_SC, ucp_Lycian },
-  { 1931, PT_SC, ucp_Lycian },
-  { 1938, PT_SC, ucp_Lydian },
-  { 1943, PT_SC, ucp_Lydian },
-  { 1950, PT_GC, ucp_M },
-  { 1952, PT_SCX, ucp_Mahajani },
-  { 1961, PT_SCX, ucp_Mahajani },
-  { 1966, PT_SC, ucp_Makasar },
-  { 1971, PT_SC, ucp_Makasar },
-  { 1979, PT_SCX, ucp_Malayalam },
-  { 1989, PT_SCX, ucp_Mandaic },
-  { 1994, PT_SCX, ucp_Mandaic },
-  { 2002, PT_SCX, ucp_Manichaean },
-  { 2007, PT_SCX, ucp_Manichaean },
-  { 2018, PT_SC, ucp_Marchen },
-  { 2023, PT_SC, ucp_Marchen },
-  { 2031, PT_SCX, ucp_Masaram_Gondi },
-  { 2044, PT_BOOL, ucp_Math },
-  { 2049, PT_PC, ucp_Mc },
-  { 2052, PT_PC, ucp_Me },
-  { 2055, PT_SC, ucp_Medefaidrin },
-  { 2067, PT_SC, ucp_Medefaidrin },
-  { 2072, PT_SC, ucp_Meetei_Mayek },
-  { 2084, PT_SC, ucp_Mende_Kikakui },
-  { 2089, PT_SC, ucp_Mende_Kikakui },
-  { 2102, PT_SC, ucp_Meroitic_Cursive },
-  { 2107, PT_SC, ucp_Meroitic_Hieroglyphs },
-  { 2112, PT_SC, ucp_Meroitic_Cursive },
-  { 2128, PT_SC, ucp_Meroitic_Hieroglyphs },
-  { 2148, PT_SC, ucp_Miao },
-  { 2153, PT_SCX, ucp_Malayalam },
-  { 2158, PT_PC, ucp_Mn },
-  { 2161, PT_SCX, ucp_Modi },
-  { 2166, PT_SCX, ucp_Mongolian },
-  { 2171, PT_SCX, ucp_Mongolian },
-  { 2181, PT_SC, ucp_Mro },
-  { 2185, PT_SC, ucp_Mro },
-  { 2190, PT_SC, ucp_Meetei_Mayek },
-  { 2195, PT_SCX, ucp_Multani },
-  { 2200, PT_SCX, ucp_Multani },
-  { 2208, PT_SCX, ucp_Myanmar },
-  { 2216, PT_SCX, ucp_Myanmar },
-  { 2221, PT_GC, ucp_N },
-  { 2223, PT_SC, ucp_Nabataean },
-  { 2233, PT_SC, ucp_Nag_Mundari },
-  { 2238, PT_SC, ucp_Nag_Mundari },
-  { 2249, PT_SCX, ucp_Nandinagari },
-  { 2254, PT_SCX, ucp_Nandinagari },
-  { 2266, PT_SC, ucp_Old_North_Arabian },
-  { 2271, PT_SC, ucp_Nabataean },
-  { 2276, PT_BOOL, ucp_Noncharacter_Code_Point },
-  { 2282, PT_PC, ucp_Nd },
-  { 2285, PT_SC, ucp_Newa },
-  { 2290, PT_SC, ucp_New_Tai_Lue },
-  { 2300, PT_SCX, ucp_Nko },
-  { 2304, PT_SCX, ucp_Nko },
-  { 2309, PT_PC, ucp_Nl },
-  { 2312, PT_PC, ucp_No },
-  { 2315, PT_BOOL, ucp_Noncharacter_Code_Point },
-  { 2337, PT_SC, ucp_Nushu },
-  { 2342, PT_SC, ucp_Nushu },
-  { 2348, PT_SC, ucp_Nyiakeng_Puachue_Hmong },
-  { 2369, PT_SC, ucp_Ogham },
-  { 2374, PT_SC, ucp_Ogham },
-  { 2380, PT_SC, ucp_Ol_Chiki },
-  { 2388, PT_SC, ucp_Ol_Chiki },
-  { 2393, PT_SC, ucp_Old_Hungarian },
-  { 2406, PT_SC, ucp_Old_Italic },
-  { 2416, PT_SC, ucp_Old_North_Arabian },
-  { 2432, PT_SCX, ucp_Old_Permic },
-  { 2442, PT_SC, ucp_Old_Persian },
-  { 2453, PT_SC, ucp_Old_Sogdian },
-  { 2464, PT_SC, ucp_Old_South_Arabian },
-  { 2480, PT_SC, ucp_Old_Turkic },
-  { 2490, PT_SCX, ucp_Old_Uyghur },
-  { 2500, PT_SCX, ucp_Oriya },
-  { 2506, PT_SC, ucp_Old_Turkic },
-  { 2511, PT_SCX, ucp_Oriya },
-  { 2516, PT_SC, ucp_Osage },
-  { 2522, PT_SC, ucp_Osage },
-  { 2527, PT_SC, ucp_Osmanya },
-  { 2532, PT_SC, ucp_Osmanya },
-  { 2540, PT_SCX, ucp_Old_Uyghur },
-  { 2545, PT_GC, ucp_P },
-  { 2547, PT_SC, ucp_Pahawh_Hmong },
-  { 2559, PT_SC, ucp_Palmyrene },
-  { 2564, PT_SC, ucp_Palmyrene },
-  { 2574, PT_BOOL, ucp_Pattern_Syntax },
-  { 2581, PT_BOOL, ucp_Pattern_Syntax },
-  { 2595, PT_BOOL, ucp_Pattern_White_Space },
-  { 2613, PT_BOOL, ucp_Pattern_White_Space },
-  { 2619, PT_SC, ucp_Pau_Cin_Hau },
-  { 2624, PT_SC, ucp_Pau_Cin_Hau },
-  { 2634, PT_PC, ucp_Pc },
-  { 2637, PT_BOOL, ucp_Prepended_Concatenation_Mark },
-  { 2641, PT_PC, ucp_Pd },
-  { 2644, PT_PC, ucp_Pe },
-  { 2647, PT_SCX, ucp_Old_Permic },
-  { 2652, PT_PC, ucp_Pf },
-  { 2655, PT_SCX, ucp_Phags_Pa },
-  { 2660, PT_SCX, ucp_Phags_Pa },
-  { 2668, PT_SC, ucp_Inscriptional_Pahlavi },
-  { 2673, PT_SCX, ucp_Psalter_Pahlavi },
-  { 2678, PT_SC, ucp_Phoenician },
-  { 2683, PT_SC, ucp_Phoenician },
-  { 2694, PT_PC, ucp_Pi },
-  { 2697, PT_SC, ucp_Miao },
-  { 2702, PT_PC, ucp_Po },
-  { 2705, PT_BOOL, ucp_Prepended_Concatenation_Mark },
-  { 2732, PT_SC, ucp_Inscriptional_Parthian },
-  { 2737, PT_PC, ucp_Ps },
-  { 2740, PT_SCX, ucp_Psalter_Pahlavi },
-  { 2755, PT_SCX, ucp_Coptic },
-  { 2760, PT_SC, ucp_Inherited },
-  { 2765, PT_BOOL, ucp_Quotation_Mark },
-  { 2771, PT_BOOL, ucp_Quotation_Mark },
-  { 2785, PT_BOOL, ucp_Radical },
-  { 2793, PT_BOOL, ucp_Regional_Indicator },
-  { 2811, PT_SC, ucp_Rejang },
-  { 2818, PT_BOOL, ucp_Regional_Indicator },
-  { 2821, PT_SC, ucp_Rejang },
-  { 2826, PT_SCX, ucp_Hanifi_Rohingya },
-  { 2831, PT_SC, ucp_Runic },
-  { 2837, PT_SC, ucp_Runic },
-  { 2842, PT_GC, ucp_S },
-  { 2844, PT_SC, ucp_Samaritan },
-  { 2854, PT_SC, ucp_Samaritan },
-  { 2859, PT_SC, ucp_Old_South_Arabian },
-  { 2864, PT_SC, ucp_Saurashtra },
-  { 2869, PT_SC, ucp_Saurashtra },
-  { 2880, PT_PC, ucp_Sc },
-  { 2883, PT_BOOL, ucp_Soft_Dotted },
-  { 2886, PT_BOOL, ucp_Sentence_Terminal },
-  { 2903, PT_SC, ucp_SignWriting },
-  { 2908, PT_SCX, ucp_Sharada },
-  { 2916, PT_SC, ucp_Shavian },
-  { 2924, PT_SC, ucp_Shavian },
-  { 2929, PT_SCX, ucp_Sharada },
-  { 2934, PT_SC, ucp_Siddham },
-  { 2939, PT_SC, ucp_Siddham },
-  { 2947, PT_SC, ucp_SignWriting },
-  { 2959, PT_SCX, ucp_Khudawadi },
-  { 2964, PT_SCX, ucp_Sinhala },
-  { 2969, PT_SCX, ucp_Sinhala },
-  { 2977, PT_PC, ucp_Sk },
-  { 2980, PT_PC, ucp_Sm },
-  { 2983, PT_PC, ucp_So },
-  { 2986, PT_BOOL, ucp_Soft_Dotted },
-  { 2997, PT_SCX, ucp_Sogdian },
-  { 3002, PT_SCX, ucp_Sogdian },
-  { 3010, PT_SC, ucp_Old_Sogdian },
-  { 3015, PT_SC, ucp_Sora_Sompeng },
-  { 3020, PT_SC, ucp_Sora_Sompeng },
-  { 3032, PT_SC, ucp_Soyombo },
-  { 3037, PT_SC, ucp_Soyombo },
-  { 3045, PT_BOOL, ucp_White_Space },
-  { 3051, PT_BOOL, ucp_Sentence_Terminal },
-  { 3057, PT_SC, ucp_Sundanese },
-  { 3062, PT_SC, ucp_Sundanese },
-  { 3072, PT_SCX, ucp_Syloti_Nagri },
-  { 3077, PT_SCX, ucp_Syloti_Nagri },
-  { 3089, PT_SCX, ucp_Syriac },
-  { 3094, PT_SCX, ucp_Syriac },
-  { 3101, PT_SCX, ucp_Tagalog },
-  { 3109, PT_SCX, ucp_Tagbanwa },
-  { 3114, PT_SCX, ucp_Tagbanwa },
-  { 3123, PT_SCX, ucp_Tai_Le },
-  { 3129, PT_SC, ucp_Tai_Tham },
-  { 3137, PT_SC, ucp_Tai_Viet },
-  { 3145, PT_SCX, ucp_Takri },
-  { 3150, PT_SCX, ucp_Takri },
-  { 3156, PT_SCX, ucp_Tai_Le },
-  { 3161, PT_SC, ucp_New_Tai_Lue },
-  { 3166, PT_SCX, ucp_Tamil },
-  { 3172, PT_SCX, ucp_Tamil },
-  { 3177, PT_SC, ucp_Tangut },
-  { 3182, PT_SC, ucp_Tangsa },
-  { 3189, PT_SC, ucp_Tangut },
-  { 3196, PT_SC, ucp_Tai_Viet },
-  { 3201, PT_SCX, ucp_Telugu },
-  { 3206, PT_SCX, ucp_Telugu },
-  { 3213, PT_BOOL, ucp_Terminal_Punctuation },
-  { 3218, PT_BOOL, ucp_Terminal_Punctuation },
-  { 3238, PT_SC, ucp_Tifinagh },
-  { 3243, PT_SCX, ucp_Tagalog },
-  { 3248, PT_SCX, ucp_Thaana },
-  { 3253, PT_SCX, ucp_Thaana },
-  { 3260, PT_SC, ucp_Thai },
-  { 3265, PT_SC, ucp_Tibetan },
-  { 3273, PT_SC, ucp_Tibetan },
-  { 3278, PT_SC, ucp_Tifinagh },
-  { 3287, PT_SCX, ucp_Tirhuta },
-  { 3292, PT_SCX, ucp_Tirhuta },
-  { 3300, PT_SC, ucp_Tangsa },
-  { 3305, PT_SC, ucp_Toto },
-  { 3310, PT_SC, ucp_Ugaritic },
-  { 3315, PT_SC, ucp_Ugaritic },
-  { 3324, PT_BOOL, ucp_Unified_Ideograph },
-  { 3330, PT_BOOL, ucp_Unified_Ideograph },
-  { 3347, PT_SC, ucp_Unknown },
-  { 3355, PT_BOOL, ucp_Uppercase },
-  { 3361, PT_BOOL, ucp_Uppercase },
-  { 3371, PT_SC, ucp_Vai },
-  { 3375, PT_SC, ucp_Vai },
-  { 3380, PT_BOOL, ucp_Variation_Selector },
-  { 3398, PT_SC, ucp_Vithkuqi },
-  { 3403, PT_SC, ucp_Vithkuqi },
-  { 3412, PT_BOOL, ucp_Variation_Selector },
-  { 3415, PT_SC, ucp_Wancho },
-  { 3422, PT_SC, ucp_Warang_Citi },
-  { 3427, PT_SC, ucp_Warang_Citi },
-  { 3438, PT_SC, ucp_Wancho },
-  { 3443, PT_BOOL, ucp_White_Space },
-  { 3454, PT_BOOL, ucp_White_Space },
-  { 3461, PT_ALNUM, 0 },
-  { 3465, PT_BOOL, ucp_XID_Continue },
-  { 3470, PT_BOOL, ucp_XID_Continue },
-  { 3482, PT_BOOL, ucp_XID_Start },
-  { 3487, PT_BOOL, ucp_XID_Start },
-  { 3496, PT_SC, ucp_Old_Persian },
-  { 3501, PT_PXSPACE, 0 },
-  { 3505, PT_SPACE, 0 },
-  { 3509, PT_SC, ucp_Cuneiform },
-  { 3514, PT_UCNC, 0 },
-  { 3518, PT_WORD, 0 },
-  { 3522, PT_SCX, ucp_Yezidi },
-  { 3527, PT_SCX, ucp_Yezidi },
-  { 3534, PT_SCX, ucp_Yi },
-  { 3537, PT_SCX, ucp_Yi },
-  { 3542, PT_GC, ucp_Z },
-  { 3544, PT_SC, ucp_Zanabazar_Square },
-  { 3560, PT_SC, ucp_Zanabazar_Square },
-  { 3565, PT_SC, ucp_Inherited },
-  { 3570, PT_PC, ucp_Zl },
-  { 3573, PT_PC, ucp_Zp },
-  { 3576, PT_PC, ucp_Zs },
-  { 3579, PT_SC, ucp_Common },
-  { 3584, PT_SC, ucp_Unknown }
+  { 1158, PT_SCX, ucp_Garay },
+  { 1163, PT_SCX, ucp_Garay },
+  { 1169, PT_SCX, ucp_Georgian },
+  { 1174, PT_SCX, ucp_Georgian },
+  { 1183, PT_SCX, ucp_Glagolitic },
+  { 1188, PT_SCX, ucp_Glagolitic },
+  { 1199, PT_SCX, ucp_Gunjala_Gondi },
+  { 1204, PT_SCX, ucp_Masaram_Gondi },
+  { 1209, PT_SCX, ucp_Gothic },
+  { 1214, PT_SCX, ucp_Gothic },
+  { 1221, PT_SCX, ucp_Grantha },
+  { 1226, PT_SCX, ucp_Grantha },
+  { 1234, PT_BOOL, ucp_Grapheme_Base },
+  { 1247, PT_BOOL, ucp_Grapheme_Extend },
+  { 1262, PT_BOOL, ucp_Grapheme_Link },
+  { 1275, PT_BOOL, ucp_Grapheme_Base },
+  { 1282, PT_SCX, ucp_Greek },
+  { 1288, PT_SCX, ucp_Greek },
+  { 1293, PT_BOOL, ucp_Grapheme_Extend },
+  { 1299, PT_BOOL, ucp_Grapheme_Link },
+  { 1306, PT_SCX, ucp_Gujarati },
+  { 1315, PT_SCX, ucp_Gujarati },
+  { 1320, PT_SCX, ucp_Gurung_Khema },
+  { 1325, PT_SCX, ucp_Gunjala_Gondi },
+  { 1338, PT_SCX, ucp_Gurmukhi },
+  { 1347, PT_SCX, ucp_Gurmukhi },
+  { 1352, PT_SCX, ucp_Gurung_Khema },
+  { 1364, PT_SCX, ucp_Han },
+  { 1368, PT_SCX, ucp_Hangul },
+  { 1373, PT_SCX, ucp_Hangul },
+  { 1380, PT_SCX, ucp_Han },
+  { 1385, PT_SCX, ucp_Hanifi_Rohingya },
+  { 1400, PT_SCX, ucp_Hanunoo },
+  { 1405, PT_SCX, ucp_Hanunoo },
+  { 1413, PT_SC, ucp_Hatran },
+  { 1418, PT_SC, ucp_Hatran },
+  { 1425, PT_SCX, ucp_Hebrew },
+  { 1430, PT_SCX, ucp_Hebrew },
+  { 1437, PT_BOOL, ucp_Hex_Digit },
+  { 1441, PT_BOOL, ucp_Hex_Digit },
+  { 1450, PT_SCX, ucp_Hiragana },
+  { 1455, PT_SCX, ucp_Hiragana },
+  { 1464, PT_SC, ucp_Anatolian_Hieroglyphs },
+  { 1469, PT_SC, ucp_Pahawh_Hmong },
+  { 1474, PT_SC, ucp_Nyiakeng_Puachue_Hmong },
+  { 1479, PT_SCX, ucp_Old_Hungarian },
+  { 1484, PT_BOOL, ucp_ID_Continue },
+  { 1488, PT_BOOL, ucp_ID_Compat_Math_Continue },
+  { 1509, PT_BOOL, ucp_ID_Compat_Math_Start },
+  { 1527, PT_BOOL, ucp_ID_Continue },
+  { 1538, PT_BOOL, ucp_Ideographic },
+  { 1543, PT_BOOL, ucp_Ideographic },
+  { 1555, PT_BOOL, ucp_ID_Start },
+  { 1559, PT_BOOL, ucp_IDS_Binary_Operator },
+  { 1564, PT_BOOL, ucp_IDS_Binary_Operator },
+  { 1582, PT_BOOL, ucp_IDS_Trinary_Operator },
+  { 1587, PT_BOOL, ucp_ID_Start },
+  { 1595, PT_BOOL, ucp_IDS_Trinary_Operator },
+  { 1614, PT_BOOL, ucp_IDS_Unary_Operator },
+  { 1619, PT_BOOL, ucp_IDS_Unary_Operator },
+  { 1636, PT_SC, ucp_Imperial_Aramaic },
+  { 1652, PT_BOOL, ucp_InCB },
+  { 1657, PT_SC, ucp_Inherited },
+  { 1667, PT_SC, ucp_Inscriptional_Pahlavi },
+  { 1688, PT_SC, ucp_Inscriptional_Parthian },
+  { 1710, PT_SC, ucp_Old_Italic },
+  { 1715, PT_SCX, ucp_Javanese },
+  { 1720, PT_SCX, ucp_Javanese },
+  { 1729, PT_BOOL, ucp_Join_Control },
+  { 1735, PT_BOOL, ucp_Join_Control },
+  { 1747, PT_SCX, ucp_Kaithi },
+  { 1754, PT_SCX, ucp_Kayah_Li },
+  { 1759, PT_SCX, ucp_Katakana },
+  { 1764, PT_SCX, ucp_Kannada },
+  { 1772, PT_SCX, ucp_Katakana },
+  { 1781, PT_SC, ucp_Kawi },
+  { 1786, PT_SCX, ucp_Kayah_Li },
+  { 1794, PT_SC, ucp_Kharoshthi },
+  { 1799, PT_SC, ucp_Kharoshthi },
+  { 1810, PT_SC, ucp_Khitan_Small_Script },
+  { 1828, PT_SC, ucp_Khmer },
+  { 1834, PT_SC, ucp_Khmer },
+  { 1839, PT_SCX, ucp_Khojki },
+  { 1844, PT_SCX, ucp_Khojki },
+  { 1851, PT_SCX, ucp_Khudawadi },
+  { 1861, PT_SC, ucp_Kirat_Rai },
+  { 1870, PT_SC, ucp_Khitan_Small_Script },
+  { 1875, PT_SCX, ucp_Kannada },
+  { 1880, PT_SC, ucp_Kirat_Rai },
+  { 1885, PT_SCX, ucp_Kaithi },
+  { 1890, PT_GC, ucp_L },
+  { 1892, PT_LAMP, 0 },
+  { 1895, PT_SC, ucp_Tai_Tham },
+  { 1900, PT_SC, ucp_Lao },
+  { 1904, PT_SC, ucp_Lao },
+  { 1909, PT_SCX, ucp_Latin },
+  { 1915, PT_SCX, ucp_Latin },
+  { 1920, PT_LAMP, 0 },
+  { 1923, PT_SC, ucp_Lepcha },
+  { 1928, PT_SC, ucp_Lepcha },
+  { 1935, PT_SCX, ucp_Limbu },
+  { 1940, PT_SCX, ucp_Limbu },
+  { 1946, PT_SCX, ucp_Linear_A },
+  { 1951, PT_SCX, ucp_Linear_B },
+  { 1956, PT_SCX, ucp_Linear_A },
+  { 1964, PT_SCX, ucp_Linear_B },
+  { 1972, PT_SCX, ucp_Lisu },
+  { 1977, PT_PC, ucp_Ll },
+  { 1980, PT_PC, ucp_Lm },
+  { 1983, PT_PC, ucp_Lo },
+  { 1986, PT_BOOL, ucp_Logical_Order_Exception },
+  { 1990, PT_BOOL, ucp_Logical_Order_Exception },
+  { 2012, PT_BOOL, ucp_Lowercase },
+  { 2018, PT_BOOL, ucp_Lowercase },
+  { 2028, PT_PC, ucp_Lt },
+  { 2031, PT_PC, ucp_Lu },
+  { 2034, PT_SCX, ucp_Lycian },
+  { 2039, PT_SCX, ucp_Lycian },
+  { 2046, PT_SCX, ucp_Lydian },
+  { 2051, PT_SCX, ucp_Lydian },
+  { 2058, PT_GC, ucp_M },
+  { 2060, PT_SCX, ucp_Mahajani },
+  { 2069, PT_SCX, ucp_Mahajani },
+  { 2074, PT_SC, ucp_Makasar },
+  { 2079, PT_SC, ucp_Makasar },
+  { 2087, PT_SCX, ucp_Malayalam },
+  { 2097, PT_SCX, ucp_Mandaic },
+  { 2102, PT_SCX, ucp_Mandaic },
+  { 2110, PT_SCX, ucp_Manichaean },
+  { 2115, PT_SCX, ucp_Manichaean },
+  { 2126, PT_SC, ucp_Marchen },
+  { 2131, PT_SC, ucp_Marchen },
+  { 2139, PT_SCX, ucp_Masaram_Gondi },
+  { 2152, PT_BOOL, ucp_Math },
+  { 2157, PT_PC, ucp_Mc },
+  { 2160, PT_BOOL, ucp_Modifier_Combining_Mark },
+  { 2164, PT_PC, ucp_Me },
+  { 2167, PT_SC, ucp_Medefaidrin },
+  { 2179, PT_SC, ucp_Medefaidrin },
+  { 2184, PT_SC, ucp_Meetei_Mayek },
+  { 2196, PT_SC, ucp_Mende_Kikakui },
+  { 2201, PT_SC, ucp_Mende_Kikakui },
+  { 2214, PT_SC, ucp_Meroitic_Cursive },
+  { 2219, PT_SCX, ucp_Meroitic_Hieroglyphs },
+  { 2224, PT_SC, ucp_Meroitic_Cursive },
+  { 2240, PT_SCX, ucp_Meroitic_Hieroglyphs },
+  { 2260, PT_SC, ucp_Miao },
+  { 2265, PT_SCX, ucp_Malayalam },
+  { 2270, PT_PC, ucp_Mn },
+  { 2273, PT_SCX, ucp_Modi },
+  { 2278, PT_BOOL, ucp_Modifier_Combining_Mark },
+  { 2300, PT_SCX, ucp_Mongolian },
+  { 2305, PT_SCX, ucp_Mongolian },
+  { 2315, PT_SC, ucp_Mro },
+  { 2319, PT_SC, ucp_Mro },
+  { 2324, PT_SC, ucp_Meetei_Mayek },
+  { 2329, PT_SCX, ucp_Multani },
+  { 2334, PT_SCX, ucp_Multani },
+  { 2342, PT_SCX, ucp_Myanmar },
+  { 2350, PT_SCX, ucp_Myanmar },
+  { 2355, PT_GC, ucp_N },
+  { 2357, PT_SC, ucp_Nabataean },
+  { 2367, PT_SC, ucp_Nag_Mundari },
+  { 2372, PT_SC, ucp_Nag_Mundari },
+  { 2383, PT_SCX, ucp_Nandinagari },
+  { 2388, PT_SCX, ucp_Nandinagari },
+  { 2400, PT_SC, ucp_Old_North_Arabian },
+  { 2405, PT_SC, ucp_Nabataean },
+  { 2410, PT_BOOL, ucp_Noncharacter_Code_Point },
+  { 2416, PT_PC, ucp_Nd },
+  { 2419, PT_SC, ucp_Newa },
+  { 2424, PT_SC, ucp_New_Tai_Lue },
+  { 2434, PT_SCX, ucp_Nko },
+  { 2438, PT_SCX, ucp_Nko },
+  { 2443, PT_PC, ucp_Nl },
+  { 2446, PT_PC, ucp_No },
+  { 2449, PT_BOOL, ucp_Noncharacter_Code_Point },
+  { 2471, PT_SC, ucp_Nushu },
+  { 2476, PT_SC, ucp_Nushu },
+  { 2482, PT_SC, ucp_Nyiakeng_Puachue_Hmong },
+  { 2503, PT_SC, ucp_Ogham },
+  { 2508, PT_SC, ucp_Ogham },
+  { 2514, PT_SC, ucp_Ol_Chiki },
+  { 2522, PT_SC, ucp_Ol_Chiki },
+  { 2527, PT_SCX, ucp_Old_Hungarian },
+  { 2540, PT_SC, ucp_Old_Italic },
+  { 2550, PT_SC, ucp_Old_North_Arabian },
+  { 2566, PT_SCX, ucp_Old_Permic },
+  { 2576, PT_SC, ucp_Old_Persian },
+  { 2587, PT_SC, ucp_Old_Sogdian },
+  { 2598, PT_SC, ucp_Old_South_Arabian },
+  { 2614, PT_SCX, ucp_Old_Turkic },
+  { 2624, PT_SCX, ucp_Old_Uyghur },
+  { 2634, PT_SCX, ucp_Ol_Onal },
+  { 2641, PT_SCX, ucp_Ol_Onal },
+  { 2646, PT_SCX, ucp_Oriya },
+  { 2652, PT_SCX, ucp_Old_Turkic },
+  { 2657, PT_SCX, ucp_Oriya },
+  { 2662, PT_SCX, ucp_Osage },
+  { 2668, PT_SCX, ucp_Osage },
+  { 2673, PT_SC, ucp_Osmanya },
+  { 2678, PT_SC, ucp_Osmanya },
+  { 2686, PT_SCX, ucp_Old_Uyghur },
+  { 2691, PT_GC, ucp_P },
+  { 2693, PT_SC, ucp_Pahawh_Hmong },
+  { 2705, PT_SC, ucp_Palmyrene },
+  { 2710, PT_SC, ucp_Palmyrene },
+  { 2720, PT_BOOL, ucp_Pattern_Syntax },
+  { 2727, PT_BOOL, ucp_Pattern_Syntax },
+  { 2741, PT_BOOL, ucp_Pattern_White_Space },
+  { 2759, PT_BOOL, ucp_Pattern_White_Space },
+  { 2765, PT_SC, ucp_Pau_Cin_Hau },
+  { 2770, PT_SC, ucp_Pau_Cin_Hau },
+  { 2780, PT_PC, ucp_Pc },
+  { 2783, PT_BOOL, ucp_Prepended_Concatenation_Mark },
+  { 2787, PT_PC, ucp_Pd },
+  { 2790, PT_PC, ucp_Pe },
+  { 2793, PT_SCX, ucp_Old_Permic },
+  { 2798, PT_PC, ucp_Pf },
+  { 2801, PT_SCX, ucp_Phags_Pa },
+  { 2806, PT_SCX, ucp_Phags_Pa },
+  { 2814, PT_SC, ucp_Inscriptional_Pahlavi },
+  { 2819, PT_SCX, ucp_Psalter_Pahlavi },
+  { 2824, PT_SC, ucp_Phoenician },
+  { 2829, PT_SC, ucp_Phoenician },
+  { 2840, PT_PC, ucp_Pi },
+  { 2843, PT_SC, ucp_Miao },
+  { 2848, PT_PC, ucp_Po },
+  { 2851, PT_BOOL, ucp_Prepended_Concatenation_Mark },
+  { 2878, PT_SC, ucp_Inscriptional_Parthian },
+  { 2883, PT_PC, ucp_Ps },
+  { 2886, PT_SCX, ucp_Psalter_Pahlavi },
+  { 2901, PT_SCX, ucp_Coptic },
+  { 2906, PT_SC, ucp_Inherited },
+  { 2911, PT_BOOL, ucp_Quotation_Mark },
+  { 2917, PT_BOOL, ucp_Quotation_Mark },
+  { 2931, PT_BOOL, ucp_Radical },
+  { 2939, PT_BOOL, ucp_Regional_Indicator },
+  { 2957, PT_SC, ucp_Rejang },
+  { 2964, PT_BOOL, ucp_Regional_Indicator },
+  { 2967, PT_SC, ucp_Rejang },
+  { 2972, PT_SCX, ucp_Hanifi_Rohingya },
+  { 2977, PT_SCX, ucp_Runic },
+  { 2983, PT_SCX, ucp_Runic },
+  { 2988, PT_GC, ucp_S },
+  { 2990, PT_SCX, ucp_Samaritan },
+  { 3000, PT_SCX, ucp_Samaritan },
+  { 3005, PT_SC, ucp_Old_South_Arabian },
+  { 3010, PT_SC, ucp_Saurashtra },
+  { 3015, PT_SC, ucp_Saurashtra },
+  { 3026, PT_PC, ucp_Sc },
+  { 3029, PT_BOOL, ucp_Soft_Dotted },
+  { 3032, PT_BOOL, ucp_Sentence_Terminal },
+  { 3049, PT_SC, ucp_SignWriting },
+  { 3054, PT_SCX, ucp_Sharada },
+  { 3062, PT_SCX, ucp_Shavian },
+  { 3070, PT_SCX, ucp_Shavian },
+  { 3075, PT_SCX, ucp_Sharada },
+  { 3080, PT_SC, ucp_Siddham },
+  { 3085, PT_SC, ucp_Siddham },
+  { 3093, PT_SC, ucp_SignWriting },
+  { 3105, PT_SCX, ucp_Khudawadi },
+  { 3110, PT_SCX, ucp_Sinhala },
+  { 3115, PT_SCX, ucp_Sinhala },
+  { 3123, PT_PC, ucp_Sk },
+  { 3126, PT_PC, ucp_Sm },
+  { 3129, PT_PC, ucp_So },
+  { 3132, PT_BOOL, ucp_Soft_Dotted },
+  { 3143, PT_SCX, ucp_Sogdian },
+  { 3148, PT_SCX, ucp_Sogdian },
+  { 3156, PT_SC, ucp_Old_Sogdian },
+  { 3161, PT_SC, ucp_Sora_Sompeng },
+  { 3166, PT_SC, ucp_Sora_Sompeng },
+  { 3178, PT_SC, ucp_Soyombo },
+  { 3183, PT_SC, ucp_Soyombo },
+  { 3191, PT_BOOL, ucp_White_Space },
+  { 3197, PT_BOOL, ucp_Sentence_Terminal },
+  { 3203, PT_SC, ucp_Sundanese },
+  { 3208, PT_SC, ucp_Sundanese },
+  { 3218, PT_SCX, ucp_Sunuwar },
+  { 3223, PT_SCX, ucp_Sunuwar },
+  { 3231, PT_SCX, ucp_Syloti_Nagri },
+  { 3236, PT_SCX, ucp_Syloti_Nagri },
+  { 3248, PT_SCX, ucp_Syriac },
+  { 3253, PT_SCX, ucp_Syriac },
+  { 3260, PT_SCX, ucp_Tagalog },
+  { 3268, PT_SCX, ucp_Tagbanwa },
+  { 3273, PT_SCX, ucp_Tagbanwa },
+  { 3282, PT_SCX, ucp_Tai_Le },
+  { 3288, PT_SC, ucp_Tai_Tham },
+  { 3296, PT_SC, ucp_Tai_Viet },
+  { 3304, PT_SCX, ucp_Takri },
+  { 3309, PT_SCX, ucp_Takri },
+  { 3315, PT_SCX, ucp_Tai_Le },
+  { 3320, PT_SC, ucp_New_Tai_Lue },
+  { 3325, PT_SCX, ucp_Tamil },
+  { 3331, PT_SCX, ucp_Tamil },
+  { 3336, PT_SCX, ucp_Tangut },
+  { 3341, PT_SC, ucp_Tangsa },
+  { 3348, PT_SCX, ucp_Tangut },
+  { 3355, PT_SC, ucp_Tai_Viet },
+  { 3360, PT_SCX, ucp_Telugu },
+  { 3365, PT_SCX, ucp_Telugu },
+  { 3372, PT_BOOL, ucp_Terminal_Punctuation },
+  { 3377, PT_BOOL, ucp_Terminal_Punctuation },
+  { 3397, PT_SCX, ucp_Tifinagh },
+  { 3402, PT_SCX, ucp_Tagalog },
+  { 3407, PT_SCX, ucp_Thaana },
+  { 3412, PT_SCX, ucp_Thaana },
+  { 3419, PT_SCX, ucp_Thai },
+  { 3424, PT_SCX, ucp_Tibetan },
+  { 3432, PT_SCX, ucp_Tibetan },
+  { 3437, PT_SCX, ucp_Tifinagh },
+  { 3446, PT_SCX, ucp_Tirhuta },
+  { 3451, PT_SCX, ucp_Tirhuta },
+  { 3459, PT_SC, ucp_Tangsa },
+  { 3464, PT_SCX, ucp_Todhri },
+  { 3471, PT_SCX, ucp_Todhri },
+  { 3476, PT_SCX, ucp_Toto },
+  { 3481, PT_SCX, ucp_Tulu_Tigalari },
+  { 3494, PT_SCX, ucp_Tulu_Tigalari },
+  { 3499, PT_SC, ucp_Ugaritic },
+  { 3504, PT_SC, ucp_Ugaritic },
+  { 3513, PT_BOOL, ucp_Unified_Ideograph },
+  { 3519, PT_BOOL, ucp_Unified_Ideograph },
+  { 3536, PT_SC, ucp_Unknown },
+  { 3544, PT_BOOL, ucp_Uppercase },
+  { 3550, PT_BOOL, ucp_Uppercase },
+  { 3560, PT_SC, ucp_Vai },
+  { 3564, PT_SC, ucp_Vai },
+  { 3569, PT_BOOL, ucp_Variation_Selector },
+  { 3587, PT_SC, ucp_Vithkuqi },
+  { 3592, PT_SC, ucp_Vithkuqi },
+  { 3601, PT_BOOL, ucp_Variation_Selector },
+  { 3604, PT_SC, ucp_Wancho },
+  { 3611, PT_SC, ucp_Warang_Citi },
+  { 3616, PT_SC, ucp_Warang_Citi },
+  { 3627, PT_SC, ucp_Wancho },
+  { 3632, PT_BOOL, ucp_White_Space },
+  { 3643, PT_BOOL, ucp_White_Space },
+  { 3650, PT_ALNUM, 0 },
+  { 3654, PT_BOOL, ucp_XID_Continue },
+  { 3659, PT_BOOL, ucp_XID_Continue },
+  { 3671, PT_BOOL, ucp_XID_Start },
+  { 3676, PT_BOOL, ucp_XID_Start },
+  { 3685, PT_SC, ucp_Old_Persian },
+  { 3690, PT_PXSPACE, 0 },
+  { 3694, PT_SPACE, 0 },
+  { 3698, PT_SC, ucp_Cuneiform },
+  { 3703, PT_UCNC, 0 },
+  { 3707, PT_WORD, 0 },
+  { 3711, PT_SCX, ucp_Yezidi },
+  { 3716, PT_SCX, ucp_Yezidi },
+  { 3723, PT_SCX, ucp_Yi },
+  { 3726, PT_SCX, ucp_Yi },
+  { 3731, PT_GC, ucp_Z },
+  { 3733, PT_SC, ucp_Zanabazar_Square },
+  { 3749, PT_SC, ucp_Zanabazar_Square },
+  { 3754, PT_SC, ucp_Inherited },
+  { 3759, PT_PC, ucp_Zl },
+  { 3762, PT_PC, ucp_Zp },
+  { 3765, PT_PC, ucp_Zs },
+  { 3768, PT_SC, ucp_Common },
+  { 3773, PT_SC, ucp_Unknown }
 };
 
 const size_t PRIV(utt_size) = sizeof(PRIV(utt)) / sizeof(ucp_type_table);
diff --git a/engine/thirdparty/pcre2/src/pcre2_util.h b/engine/thirdparty/pcre2/src/pcre2_util.h
new file mode 100644
index 00000000..ea863555
--- /dev/null
+++ b/engine/thirdparty/pcre2/src/pcre2_util.h
@@ -0,0 +1,132 @@
+/*************************************************
+*      Perl-Compatible Regular Expressions       *
+*************************************************/
+
+/* PCRE2 is a library of functions to support regular expressions whose syntax
+and semantics are as close as possible to those of the Perl 5 language.
+
+                       Written by Philip Hazel
+     Original API code Copyright (c) 1997-2012 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
+
+-----------------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    * Neither the name of the University of Cambridge nor the names of its
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-----------------------------------------------------------------------------
+*/
+
+#ifndef PCRE2_UTIL_H_IDEMPOTENT_GUARD
+#define PCRE2_UTIL_H_IDEMPOTENT_GUARD
+
+/* Assertion macros */
+
+#ifdef PCRE2_DEBUG
+
+#if defined(HAVE_ASSERT_H) && !defined(NDEBUG)
+#include <assert.h>
+#endif
+
+/* PCRE2_ASSERT(x) can be used to inject an assert() for conditions
+that the code below doesn't support. It is a NOP for non debug builds
+but in debug builds will print information about the location of the
+code where it triggered and crash.
+
+It is meant to work like assert(), and therefore the expression used
+should indicate what the expected state is, and shouldn't have any
+side-effects. */
+
+#if defined(HAVE_ASSERT_H) && !defined(NDEBUG)
+#define PCRE2_ASSERT(x) assert(x)
+#else
+#define PCRE2_ASSERT(x) do                                            \
+{                                                                     \
+  if (!(x))                                                           \
+  {                                                                   \
+  fprintf(stderr, "Assertion failed at " __FILE__ ":%d\n", __LINE__); \
+  abort();                                                            \
+  }                                                                   \
+} while(0)
+#endif
+
+/* PCRE2_UNREACHABLE() can be used to mark locations on the code that
+shouldn't be reached. In non debug builds is defined as a hint for
+the compiler to eliminate any code after it, so it is useful also for
+performance reasons, but should be used with care because if it is
+ever reached will trigger Undefined Behaviour and if you are lucky a
+crash. In debug builds it will report the location where it was triggered
+and crash. One important point to consider when using this macro, is
+that it is only implemented for a few compilers, and therefore can't
+be relied on to always be active either, so if it is followed by some
+code it is important to make sure that the whole thing is safe to
+use even if the macro is not there (ex: make sure there is a `break`
+after it if used at the end of a `case`) and to test your code also
+with a configuration where the macro will be a NOP. */
+
+#if defined(HAVE_ASSERT_H) && !defined(NDEBUG)
+#define PCRE2_UNREACHABLE()                                         \
+assert(((void)"Execution reached unexpected point", 0))
+#else
+#define PCRE2_UNREACHABLE() do                                      \
+{                                                                   \
+fprintf(stderr, "Execution reached unexpected point at " __FILE__   \
+                ":%d\n", __LINE__);                                 \
+abort();                                                            \
+} while(0)
+#endif
+
+/* PCRE2_DEBUG_UNREACHABLE() is a debug only version of the previous
+macro. It is meant to be used in places where the code is handling
+an error situation in code that shouldn't be reached, but that has
+some sort of fallback code to normally handle the error. When in
+doubt you should use this instead of the previous macro. Like in
+the previous case, it is a good idea to document as much as possible
+the reason and the actions that should be taken if it ever triggers. */
+
+#define PCRE2_DEBUG_UNREACHABLE() PCRE2_UNREACHABLE()
+
+#endif /* PCRE2_DEBUG */
+
+#ifndef PCRE2_DEBUG_UNREACHABLE
+#define PCRE2_DEBUG_UNREACHABLE() do {} while(0)
+#endif
+
+#ifndef PCRE2_UNREACHABLE
+#ifdef HAVE_BUILTIN_UNREACHABLE
+#define PCRE2_UNREACHABLE() __builtin_unreachable()
+#elif defined(HAVE_BUILTIN_ASSUME)
+#define PCRE2_UNREACHABLE() __assume(0)
+#else
+#define PCRE2_UNREACHABLE() do {} while(0)
+#endif
+#endif /* !PCRE2_UNREACHABLE */
+
+#ifndef PCRE2_ASSERT
+#define PCRE2_ASSERT(x) do {} while(0)
+#endif
+
+#endif /* PCRE2_UTIL_H_IDEMPOTENT_GUARD */
+
+/* End of pcre2_util.h */
diff --git a/engine/thirdparty/pcre2/src/pcre2_xclass.c b/engine/thirdparty/pcre2/src/pcre2_xclass.c
index 5df25d2c..25de7cbf 100644
--- a/engine/thirdparty/pcre2/src/pcre2_xclass.c
+++ b/engine/thirdparty/pcre2/src/pcre2_xclass.c
@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
 
                        Written by Philip Hazel
      Original API code Copyright (c) 1997-2012 University of Cambridge
-          New API code Copyright (c) 2016-2023 University of Cambridge
+          New API code Copyright (c) 2016-2024 University of Cambridge
 
 -----------------------------------------------------------------------------
 Redistribution and use in source and binary forms, with or without
@@ -38,9 +38,9 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */
 
-/* This module contains an internal function that is used to match an extended
-class. It is used by pcre2_auto_possessify() and by both pcre2_match() and
-pcre2_def_match(). */
+/* This module contains two internal functions that are used to match
+OP_XCLASS and OP_ECLASS. It is used by pcre2_auto_possessify() and by both
+pcre2_match() and pcre2_dfa_match(). */
 
 
 #ifdef HAVE_CONFIG_H
@@ -66,114 +66,75 @@ Returns:      TRUE if character matches, else FALSE
 */
 
 BOOL
-PRIV(xclass)(uint32_t c, PCRE2_SPTR data, BOOL utf)
+PRIV(xclass)(uint32_t c, PCRE2_SPTR data, const uint8_t *char_lists_end, BOOL utf)
 {
+/* Update PRIV(update_classbits) when this function is changed. */
 PCRE2_UCHAR t;
-BOOL negated = (*data & XCL_NOT) != 0;
+BOOL not_negated = (*data & XCL_NOT) == 0;
+uint32_t type, max_index, min_index, value;
+const uint8_t *next_char;
 
 #if PCRE2_CODE_UNIT_WIDTH == 8
 /* In 8 bit mode, this must always be TRUE. Help the compiler to know that. */
 utf = TRUE;
 #endif
 
-/* Code points < 256 are matched against a bitmap, if one is present. If not,
-we still carry on, because there may be ranges that start below 256 in the
-additional data. */
+/* Code points < 256 are matched against a bitmap, if one is present. */
 
-if (c < 256)
+if ((*data++ & XCL_MAP) != 0)
   {
-  if ((*data & XCL_HASPROP) == 0)
-    {
-    if ((*data & XCL_MAP) == 0) return negated;
-    return (((uint8_t *)(data + 1))[c/8] & (1u << (c&7))) != 0;
-    }
-  if ((*data & XCL_MAP) != 0 &&
-    (((uint8_t *)(data + 1))[c/8] & (1u << (c&7))) != 0)
-    return !negated; /* char found */
+  if (c < 256)
+    return (((const uint8_t *)data)[c/8] & (1u << (c&7))) != 0;
+  /* Skip bitmap. */
+  data += 32 / sizeof(PCRE2_UCHAR);
   }
 
-/* First skip the bit map if present. Then match against the list of Unicode
-properties or large chars or ranges that end with a large char. We won't ever
+/* Match against the list of Unicode properties. We won't ever
 encounter XCL_PROP or XCL_NOTPROP when UTF support is not compiled. */
-
-if ((*data++ & XCL_MAP) != 0) data += 32 / sizeof(PCRE2_UCHAR);
-
-while ((t = *data++) != XCL_END)
+#ifdef SUPPORT_UNICODE
+if (*data == XCL_PROP || *data == XCL_NOTPROP)
   {
-  uint32_t x, y;
-  if (t == XCL_SINGLE)
-    {
-#ifdef SUPPORT_UNICODE
-    if (utf)
-      {
-      GETCHARINC(x, data); /* macro generates multiple statements */
-      }
-    else
-#endif
-    x = *data++;
-    if (c == x) return !negated;
-    }
-  else if (t == XCL_RANGE)
-    {
-#ifdef SUPPORT_UNICODE
-    if (utf)
-      {
-      GETCHARINC(x, data); /* macro generates multiple statements */
-      GETCHARINC(y, data); /* macro generates multiple statements */
-      }
-    else
-#endif
-      {
-      x = *data++;
-      y = *data++;
-      }
-    if (c >= x && c <= y) return !negated;
-    }
+  /* The UCD record is the same for all properties. */
+  const ucd_record *prop = GET_UCD(c);
 
-#ifdef SUPPORT_UNICODE
-  else  /* XCL_PROP & XCL_NOTPROP */
+  do
     {
     int chartype;
-    const ucd_record *prop = GET_UCD(c);
-    BOOL isprop = t == XCL_PROP;
+    BOOL isprop = (*data++) == XCL_PROP;
     BOOL ok;
 
     switch(*data)
       {
-      case PT_ANY:
-      if (isprop) return !negated;
-      break;
-
       case PT_LAMP:
       chartype = prop->chartype;
       if ((chartype == ucp_Lu || chartype == ucp_Ll ||
-           chartype == ucp_Lt) == isprop) return !negated;
+           chartype == ucp_Lt) == isprop) return not_negated;
       break;
 
       case PT_GC:
       if ((data[1] == PRIV(ucp_gentype)[prop->chartype]) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       case PT_PC:
-      if ((data[1] == prop->chartype) == isprop) return !negated;
+      if ((data[1] == prop->chartype) == isprop) return not_negated;
       break;
 
       case PT_SC:
-      if ((data[1] == prop->script) == isprop) return !negated;
+      if ((data[1] == prop->script) == isprop) return not_negated;
       break;
 
       case PT_SCX:
       ok = (data[1] == prop->script ||
             MAPBIT(PRIV(ucd_script_sets) + UCD_SCRIPTX_PROP(prop), data[1]) != 0);
-      if (ok == isprop) return !negated;
+      if (ok == isprop) return not_negated;
       break;
 
       case PT_ALNUM:
       chartype = prop->chartype;
       if ((PRIV(ucp_gentype)[chartype] == ucp_L ||
            PRIV(ucp_gentype)[chartype] == ucp_N) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       /* Perl space used to exclude VT, but from Perl 5.18 it is included,
@@ -186,12 +147,12 @@ while ((t = *data++) != XCL_END)
         {
         HSPACE_CASES:
         VSPACE_CASES:
-        if (isprop) return !negated;
+        if (isprop) return not_negated;
         break;
 
         default:
         if ((PRIV(ucp_gentype)[prop->chartype] == ucp_Z) == isprop)
-          return !negated;
+          return not_negated;
         break;
         }
       break;
@@ -201,7 +162,7 @@ while ((t = *data++) != XCL_END)
       if ((PRIV(ucp_gentype)[chartype] == ucp_L ||
            PRIV(ucp_gentype)[chartype] == ucp_N ||
            chartype == ucp_Mn || chartype == ucp_Pc) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       case PT_UCNC:
@@ -209,24 +170,24 @@ while ((t = *data++) != XCL_END)
         {
         if ((c == CHAR_DOLLAR_SIGN || c == CHAR_COMMERCIAL_AT ||
              c == CHAR_GRAVE_ACCENT) == isprop)
-          return !negated;
+          return not_negated;
         }
       else
         {
         if ((c < 0xd800 || c > 0xdfff) == isprop)
-          return !negated;
+          return not_negated;
         }
       break;
 
       case PT_BIDICL:
       if ((UCD_BIDICLASS_PROP(prop) == data[1]) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       case PT_BOOL:
       ok = MAPBIT(PRIV(ucd_boolprop_sets) +
         UCD_BPROPS_PROP(prop), data[1]) != 0;
-      if (ok == isprop) return !negated;
+      if (ok == isprop) return not_negated;
       break;
 
       /* The following three properties can occur only in an XCLASS, as there
@@ -248,7 +209,7 @@ while ((t = *data++) != XCL_END)
               (chartype == ucp_Cf &&
                 c != 0x061c && c != 0x180e && (c < 0x2066 || c > 0x2069))
          )) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       /* Printable character: same as graphic, with the addition of Zs, i.e.
@@ -262,7 +223,7 @@ while ((t = *data++) != XCL_END)
               (chartype == ucp_Cf &&
                 c != 0x061c && (c < 0x2066 || c > 0x2069))
          )) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       /* Punctuation: all Unicode punctuation, plus ASCII characters that
@@ -273,7 +234,7 @@ while ((t = *data++) != XCL_END)
       chartype = prop->chartype;
       if ((PRIV(ucp_gentype)[chartype] == ucp_P ||
             (c < 128 && PRIV(ucp_gentype)[chartype] == ucp_S)) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       /* Perl has two sets of hex digits */
@@ -285,24 +246,300 @@ while ((t = *data++) != XCL_END)
            (c >= 0xff10 && c <= 0xff19) ||  /* Fullwidth digits */
            (c >= 0xff21 && c <= 0xff26) ||  /* Fullwidth letters */
            (c >= 0xff41 && c <= 0xff46)) == isprop)
-        return !negated;
+        return not_negated;
       break;
 
       /* This should never occur, but compilers may mutter if there is no
       default. */
 
       default:
+      PCRE2_DEBUG_UNREACHABLE();
       return FALSE;
       }
 
     data += 2;
     }
+  while (*data == XCL_PROP || *data == XCL_NOTPROP);
+  }
 #else
   (void)utf;  /* Avoid compiler warning */
 #endif  /* SUPPORT_UNICODE */
+
+/* Match against large chars or ranges that end with a large char. */
+if (*data < XCL_LIST)
+  {
+  while ((t = *data++) != XCL_END)
+    {
+    uint32_t x, y;
+
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      {
+      GETCHARINC(x, data); /* macro generates multiple statements */
+      }
+    else
+#endif
+      x = *data++;
+
+    if (t == XCL_SINGLE)
+      {
+      /* Since character ranges follow the properties, and they are
+      sorted, early return is possible for all characters <= x. */
+      if (c <= x) return (c == x) ? not_negated : !not_negated;
+      continue;
+      }
+
+    PCRE2_ASSERT(t == XCL_RANGE);
+#ifdef SUPPORT_UNICODE
+    if (utf)
+      {
+      GETCHARINC(y, data); /* macro generates multiple statements */
+      }
+    else
+#endif
+      y = *data++;
+
+    /* Since character ranges follow the properties, and they are
+    sorted, early return is possible for all characters <= y. */
+    if (c <= y) return (c >= x) ? not_negated : !not_negated;
+    }
+
+  return !not_negated;   /* char did not match */
   }
 
-return negated;   /* char did not match */
+#if PCRE2_CODE_UNIT_WIDTH == 8
+type = (uint32_t)(data[0] << 8) | data[1];
+data += 2;
+#else
+type = data[0];
+data++;
+#endif  /* CODE_UNIT_WIDTH */
+
+/* Align characters. */
+next_char = char_lists_end - (GET(data, 0) << 1);
+type &= XCL_TYPE_MASK;
+
+/* Alignment check. */
+PCRE2_ASSERT(((uintptr_t)next_char & 0x1) == 0);
+
+if (c >= XCL_CHAR_LIST_HIGH_16_START)
+  {
+  max_index = type & XCL_ITEM_COUNT_MASK;
+  if (max_index == XCL_ITEM_COUNT_MASK)
+    {
+    max_index = *(const uint16_t*)next_char;
+    PCRE2_ASSERT(max_index >= XCL_ITEM_COUNT_MASK);
+    next_char += 2;
+    }
+
+  next_char += max_index << 1;
+  type >>= XCL_TYPE_BIT_LEN;
+  }
+
+if (c < XCL_CHAR_LIST_LOW_32_START)
+  {
+  max_index = type & XCL_ITEM_COUNT_MASK;
+
+  c = (uint16_t)((c << XCL_CHAR_SHIFT) | XCL_CHAR_END);
+
+  if (max_index == XCL_ITEM_COUNT_MASK)
+    {
+    max_index = *(const uint16_t*)next_char;
+    PCRE2_ASSERT(max_index >= XCL_ITEM_COUNT_MASK);
+    next_char += 2;
+    }
+
+  if (max_index == 0 || c < *(const uint16_t*)next_char)
+    return ((type & XCL_BEGIN_WITH_RANGE) != 0) == not_negated;
+
+  min_index = 0;
+  value = ((const uint16_t*)next_char)[--max_index];
+  if (c >= value)
+    return (value == c || (value & XCL_CHAR_END) == 0) == not_negated;
+
+  max_index--;
+
+  /* Binary search of a range. */
+  while (TRUE)
+    {
+    uint32_t mid_index = (min_index + max_index) >> 1;
+    value = ((const uint16_t*)next_char)[mid_index];
+
+    if (c < value)
+      max_index = mid_index - 1;
+    else if (((const uint16_t*)next_char)[mid_index + 1] <= c)
+      min_index = mid_index + 1;
+    else
+      return (value == c || (value & XCL_CHAR_END) == 0) == not_negated;
+    }
+  }
+
+/* Skip the 16 bit ranges. */
+max_index = type & XCL_ITEM_COUNT_MASK;
+if (max_index == XCL_ITEM_COUNT_MASK)
+  {
+  max_index = *(const uint16_t*)next_char;
+  PCRE2_ASSERT(max_index >= XCL_ITEM_COUNT_MASK);
+  next_char += 2;
+  }
+
+next_char += (max_index << 1);
+type >>= XCL_TYPE_BIT_LEN;
+
+/* Alignment check. */
+PCRE2_ASSERT(((uintptr_t)next_char & 0x3) == 0);
+
+max_index = type & XCL_ITEM_COUNT_MASK;
+
+#if PCRE2_CODE_UNIT_WIDTH == 32
+if (c >= XCL_CHAR_LIST_HIGH_32_START)
+  {
+  if (max_index == XCL_ITEM_COUNT_MASK)
+    {
+    max_index = *(const uint32_t*)next_char;
+    PCRE2_ASSERT(max_index >= XCL_ITEM_COUNT_MASK);
+    next_char += 4;
+    }
+
+  next_char += max_index << 2;
+  type >>= XCL_TYPE_BIT_LEN;
+  max_index = type & XCL_ITEM_COUNT_MASK;
+  }
+#endif
+
+c = (uint32_t)((c << XCL_CHAR_SHIFT) | XCL_CHAR_END);
+
+if (max_index == XCL_ITEM_COUNT_MASK)
+  {
+  max_index = *(const uint32_t*)next_char;
+  next_char += 4;
+  }
+
+if (max_index == 0 || c < *(const uint32_t*)next_char)
+  return ((type & XCL_BEGIN_WITH_RANGE) != 0) == not_negated;
+
+min_index = 0;
+value = ((const uint32_t*)next_char)[--max_index];
+if (c >= value)
+  return (value == c || (value & XCL_CHAR_END) == 0) == not_negated;
+
+max_index--;
+
+/* Binary search of a range. */
+while (TRUE)
+  {
+  uint32_t mid_index = (min_index + max_index) >> 1;
+  value = ((const uint32_t*)next_char)[mid_index];
+
+  if (c < value)
+    max_index = mid_index - 1;
+  else if (((const uint32_t*)next_char)[mid_index + 1] <= c)
+    min_index = mid_index + 1;
+  else
+    return (value == c || (value & XCL_CHAR_END) == 0) == not_negated;
+  }
+}
+
+
+
+/*************************************************
+*       Match character against an ECLASS        *
+*************************************************/
+
+/* This function is called to match a character against an extended class
+used for describing characters using boolean operations on sets.
+
+Arguments:
+  c           the character
+  data_start  points to the start of the ECLASS data
+  data_end    points one-past-the-last of the ECLASS data
+  utf         TRUE if in UTF mode
+
+Returns:      TRUE if character matches, else FALSE
+*/
+
+BOOL
+PRIV(eclass)(uint32_t c, PCRE2_SPTR data_start, PCRE2_SPTR data_end,
+  const uint8_t *char_lists_end, BOOL utf)
+{
+PCRE2_SPTR ptr = data_start;
+PCRE2_UCHAR flags;
+uint32_t stack = 0;
+int stack_depth = 0;
+
+PCRE2_ASSERT(data_start < data_end);
+flags = *ptr++;
+PCRE2_ASSERT((flags & ECL_MAP) == 0 ||
+             (data_end - ptr) >= 32 / (int)sizeof(PCRE2_UCHAR));
+
+/* Code points < 256 are matched against a bitmap, if one is present.
+Otherwise all codepoints are checked later. */
+
+if ((flags & ECL_MAP) != 0)
+  {
+  if (c < 256)
+    return (((const uint8_t *)ptr)[c/8] & (1u << (c&7))) != 0;
+
+  /* Skip the bitmap. */
+  ptr += 32 / sizeof(PCRE2_UCHAR);
+  }
+
+/* Do a little loop, until we reach the end of the ECLASS. */
+while (ptr < data_end)
+  {
+  switch (*ptr)
+    {
+    case ECL_AND:
+    ++ptr;
+    stack = (stack >> 1) & (stack | ~(uint32_t)1u);
+    PCRE2_ASSERT(stack_depth >= 2);
+    --stack_depth;
+    break;
+
+    case ECL_OR:
+    ++ptr;
+    stack = (stack >> 1) | (stack & (uint32_t)1u);
+    PCRE2_ASSERT(stack_depth >= 2);
+    --stack_depth;
+    break;
+
+    case ECL_XOR:
+    ++ptr;
+    stack = (stack >> 1) ^ (stack & (uint32_t)1u);
+    PCRE2_ASSERT(stack_depth >= 2);
+    --stack_depth;
+    break;
+
+    case ECL_NOT:
+    ++ptr;
+    stack ^= (uint32_t)1u;
+    PCRE2_ASSERT(stack_depth >= 1);
+    break;
+
+    case ECL_XCLASS:
+      {
+      uint32_t matched = PRIV(xclass)(c, ptr + 1 + LINK_SIZE, char_lists_end, utf);
+
+      ptr += GET(ptr, 1);
+      stack = (stack << 1) | matched;
+      ++stack_depth;
+      break;
+      }
+
+    /* This should never occur, but compilers may mutter if there is no
+    default. */
+
+    default:
+    PCRE2_DEBUG_UNREACHABLE();
+    return FALSE;
+    }
+  }
+
+PCRE2_ASSERT(stack_depth == 1);
+(void)stack_depth;  /* Ignore unused variable, if assertions are disabled. */
+
+/* The final bit left on the stack now holds the match result. */
+return (stack & 1u) != 0;
 }
 
 /* End of pcre2_xclass.c */
diff --git a/engine/thirdparty/swappy-frame-pacing/common/gamesdk_common.h b/engine/thirdparty/swappy-frame-pacing/common/gamesdk_common.h
index d29ac01a..25ce8139 100644
--- a/engine/thirdparty/swappy-frame-pacing/common/gamesdk_common.h
+++ b/engine/thirdparty/swappy-frame-pacing/common/gamesdk_common.h
@@ -31,11 +31,12 @@
 
 // There are separate versions for each GameSDK component that use this format:
 #define ANDROID_GAMESDK_PACKED_VERSION(MAJOR, MINOR, BUGFIX) \
-    ((MAJOR << 16) | (MINOR << 8) | (BUGFIX))
+  ((MAJOR << 16) | (MINOR << 8) | (BUGFIX))
 // Accessors
 #define ANDROID_GAMESDK_MAJOR_VERSION(PACKED) ((PACKED) >> 16)
 #define ANDROID_GAMESDK_MINOR_VERSION(PACKED) (((PACKED) >> 8) & 0xff)
 #define ANDROID_GAMESDK_BUGFIX_VERSION(PACKED) ((PACKED) & 0xff)
 
-#define AGDK_STRING_VERSION(MAJOR, MINOR, BUGFIX, GIT) \
-#MAJOR "." #MINOR "." #BUGFIX "." #GIT
+#define AGDK_STRINGIFY(NUMBER) #NUMBER
+#define AGDK_STRING_VERSION(MAJOR, MINOR, BUGFIX) \
+  AGDK_STRINGIFY(MAJOR) "." AGDK_STRINGIFY(MINOR) "." AGDK_STRINGIFY(BUGFIX)
diff --git a/engine/thirdparty/swappy-frame-pacing/swappyVk.h b/engine/thirdparty/swappy-frame-pacing/swappyVk.h
index 020683cb..654fcbf4 100644
--- a/engine/thirdparty/swappy-frame-pacing/swappyVk.h
+++ b/engine/thirdparty/swappy-frame-pacing/swappyVk.h
@@ -281,30 +281,30 @@ void SwappyVk_uninjectTracer(const SwappyTracer* tracer);
  * Usage of this functionality is optional.
  */
 typedef struct SwappyVkFunctionProvider {
-    /**
-     * @brief Callback to initialize the function provider.
-     *
-     * This function is called by Swappy before any functions are requested.
-     * E.g. so you can call dlopen on the Vulkan library.
-     */
-    bool (*init)();
+  /**
+   * @brief Callback to initialize the function provider.
+   *
+   * This function is called by Swappy before any functions are requested.
+   * E.g. so you can call dlopen on the Vulkan library.
+   */
+  bool (*init)();
 
-    /**
-     * @brief Callback to get the address of a function.
-     *
-     * This function is called by Swappy to get the address of a Vulkan
-     * function.
-     * @param name The null-terminated name of the function.
-     */
-    void* (*getProcAddr)(const char* name);
+  /**
+   * @brief Callback to get the address of a function.
+   *
+   * This function is called by Swappy to get the address of a Vulkan
+   * function.
+   * @param name The null-terminated name of the function.
+   */
+  void* (*getProcAddr)(const char* name);
 
-    /**
-     * @brief Callback to close any resources owned by the function provider.
-     *
-     * This function is called by Swappy when no more functions will be
-     * requested, e.g. so you can call dlclose on the Vulkan library.
-     */
-    void (*close)();
+  /**
+   * @brief Callback to close any resources owned by the function provider.
+   *
+   * This function is called by Swappy when no more functions will be
+   * requested, e.g. so you can call dlclose on the Vulkan library.
+   */
+  void (*close)();
 } SwappyVkFunctionProvider;
 
 /**
@@ -384,7 +384,8 @@ void SwappyVk_enableStats(VkSwapchainKHR swapchain, bool enabled);
 
  * @see SwappyVk_enableStats.
  */
-void SwappyVk_recordFrameStart(VkQueue queue, VkSwapchainKHR swapchain, uint32_t image);
+void SwappyVk_recordFrameStart(VkQueue queue, VkSwapchainKHR swapchain,
+                               uint32_t image);
 
 /**
  * @brief Returns the stats collected, if statistics collection was toggled on.
@@ -396,11 +397,11 @@ void SwappyVk_recordFrameStart(VkQueue queue, VkSwapchainKHR swapchain, uint32_t
  * conditions.
  *
  * @param[in]  swapchain   - The swapchain for which stats are being queried.
- * @param      swappyStats - Pointer to a SwappyStats that will be populated with
- *                             the collected stats. Cannot be NULL.
+ * @param      swappyStats - Pointer to a SwappyStats that will be populated
+ * with the collected stats. Cannot be NULL.
  * @see SwappyStats
  */
-void SwappyVk_getStats(VkSwapchainKHR swapchain, SwappyStats *swappyStats);
+void SwappyVk_getStats(VkSwapchainKHR swapchain, SwappyStats* swappyStats);
 
 /**
  * @brief Clears the frame statistics collected so far.
@@ -413,6 +414,58 @@ void SwappyVk_getStats(VkSwapchainKHR swapchain, SwappyStats *swappyStats);
  */
 void SwappyVk_clearStats(VkSwapchainKHR swapchain);
 
+/**
+ * @brief Reset the swappy pacing mechanism
+ *
+ * In cases where the frame timing history is irrelevant (for example during
+ * scene/level transitions or after loading screens), calling this would
+ * remove all the history for frame pacing. Calling this entry point
+ * would reset the frame rate to the initial state at the end of the current
+ * frame. Then swappy would just pace as normal with fresh state from next
+ * frame. There are no error conditions associated with this call.
+ *
+ * @param[in]  swapchain   - The swapchain for which frame pacing is reset.
+ */
+void SwappyVk_resetFramePacing(VkSwapchainKHR swapchain);
+
+/**
+ * @brief Enable/Disable the swappy pacing mechanism
+ *
+ * By default frame pacing is enabled when swappy is used, however it can be
+ * disabled at runtime by calling `SwappyVk_enableFramePacing(swapchain,
+ * false)`. When the frame pacing is disabled, ::SwappyVk_enableBlockingWait
+ * will control whether
+ * ::SwappyVk_queuePresent will return immediately, or will block until the
+ * previous frame's GPU work is completed. All enabling/disabling effects take
+ * place from next frame. Once disabled, `SwappyVk_enableFramePacing(swapchain,
+ * true)` will enable frame pacing again with a fresh frame time state -
+ * equivalent of calling ::SwappyVk_resetFramePacing().
+ *
+ * @param[in]  swapchain   - The swapchain for which stats are being queried.
+ * @param      enable      - If true, enables frame pacing otherwise disables it
+ */
+void SwappyVk_enableFramePacing(VkSwapchainKHR swapchain, bool enable);
+
+/**
+ * @brief Enable/Disable blocking wait when frame-pacing is disabled
+ *
+ * By default ::SwappyVk_queuePresent will do a blocking wait until previous
+ * frame's GPU work is completed. However when frame pacing is disabled, calling
+ * `SwappyVk_enableBlockingWait(swapchain, false)` will ensure that
+ * ::SwappyVk_queuePresent returns without waiting for previous frame's GPU
+ * work. This behaviour impacts the GPU time returned in the
+ * ::SwappyPostWaitCallback callback. If the last frame's GPU work is done by
+ * the time ::SwappyVk_queuePresent for this frame is called, then the previous
+ * frame's GPU time will be returned otherwise `-1` will be delivered in the
+ * callback for the frame. This setting has no impact when frame pacing is
+ * enabled.
+ *
+ * @param[in]  swapchain   - The swapchain for which stats are being queried.
+ * @param      enable      - If true, ::SwappyVk_queuePresent will block until
+ * the previous frame's GPU work is complete.
+ */
+void SwappyVk_enableBlockingWait(VkSwapchainKHR swapchain, bool enable);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif
diff --git a/engine/thirdparty/swappy-frame-pacing/swappy_common.h b/engine/thirdparty/swappy-frame-pacing/swappy_common.h
index b711ca91..acceb424 100644
--- a/engine/thirdparty/swappy-frame-pacing/swappy_common.h
+++ b/engine/thirdparty/swappy-frame-pacing/swappy_common.h
@@ -48,22 +48,22 @@
 
 // Internal macros to track Swappy version, do not use directly.
 #define SWAPPY_MAJOR_VERSION 2
-#define SWAPPY_MINOR_VERSION 0
+#define SWAPPY_MINOR_VERSION 2
 #define SWAPPY_BUGFIX_VERSION 0
-#define SWAPPY_PACKED_VERSION                                                  \
-    ANDROID_GAMESDK_PACKED_VERSION(SWAPPY_MAJOR_VERSION, SWAPPY_MINOR_VERSION, \
-                                   SWAPPY_BUGFIX_VERSION)
+#define SWAPPY_PACKED_VERSION                                                \
+  ANDROID_GAMESDK_PACKED_VERSION(SWAPPY_MAJOR_VERSION, SWAPPY_MINOR_VERSION, \
+                                 SWAPPY_BUGFIX_VERSION)
 
 // Internal macros to generate a symbol to track Swappy version, do not use
 // directly.
 #define SWAPPY_VERSION_CONCAT_NX(PREFIX, MAJOR, MINOR, BUGFIX, GITCOMMIT) \
-    PREFIX##_##MAJOR##_##MINOR##_##BUGFIX##_##GITCOMMIT
+  PREFIX##_##MAJOR##_##MINOR##_##BUGFIX##_##GITCOMMIT
 #define SWAPPY_VERSION_CONCAT(PREFIX, MAJOR, MINOR, BUGFIX, GITCOMMIT) \
-    SWAPPY_VERSION_CONCAT_NX(PREFIX, MAJOR, MINOR, BUGFIX, GITCOMMIT)
-#define SWAPPY_VERSION_SYMBOL                                          \
-    SWAPPY_VERSION_CONCAT(Swappy_version, SWAPPY_MAJOR_VERSION,        \
-                          SWAPPY_MINOR_VERSION, SWAPPY_BUGFIX_VERSION, \
-                          AGDK_GIT_COMMIT)
+  SWAPPY_VERSION_CONCAT_NX(PREFIX, MAJOR, MINOR, BUGFIX, GITCOMMIT)
+#define SWAPPY_VERSION_SYMBOL                                        \
+  SWAPPY_VERSION_CONCAT(Swappy_version, SWAPPY_MAJOR_VERSION,        \
+                        SWAPPY_MINOR_VERSION, SWAPPY_BUGFIX_VERSION, \
+                        AGDK_GIT_COMMIT)
 
 // Define this to 1 to enable all logging from Swappy, by default it is
 // disabled in a release build and enabled in a debug build.
@@ -83,29 +83,29 @@ typedef uint64_t SwappyThreadId;
  * Usage of this functionality is optional.
  */
 typedef struct SwappyThreadFunctions {
-    /** @brief Thread start callback.
-     *
-     * This function is called by Swappy to start thread_func on a new thread.
-     * @param user_data A value to be passed the thread function.
-     * If the thread was started, this function should set the thread_id and
-     * return 0. If the thread was not started, this function should return a
-     * non-zero value.
-     */
-    int (*start)(SwappyThreadId* thread_id, void* (*thread_func)(void*),
-                 void* user_data);
+  /** @brief Thread start callback.
+   *
+   * This function is called by Swappy to start thread_func on a new thread.
+   * @param user_data A value to be passed the thread function.
+   * If the thread was started, this function should set the thread_id and
+   * return 0. If the thread was not started, this function should return a
+   * non-zero value.
+   */
+  int (*start)(SwappyThreadId* thread_id, void* (*thread_func)(void*),
+               void* user_data);
 
-    /** @brief Thread join callback.
-     *
-     * This function is called by Swappy to join the thread with given id.
-     */
-    void (*join)(SwappyThreadId thread_id);
+  /** @brief Thread join callback.
+   *
+   * This function is called by Swappy to join the thread with given id.
+   */
+  void (*join)(SwappyThreadId thread_id);
 
-    /** @brief Thread joinable callback.
-     *
-     * This function is called by Swappy to discover whether the thread with the
-     * given id is joinable.
-     */
-    bool (*joinable)(SwappyThreadId thread_id);
+  /** @brief Thread joinable callback.
+   *
+   * This function is called by Swappy to discover whether the thread with the
+   * given id is joinable.
+   */
+  bool (*joinable)(SwappyThreadId thread_id);
 } SwappyThreadFunctions;
 
 #ifdef __cplusplus
@@ -138,47 +138,46 @@ const char* Swappy_versionString();
  * ::SwappyGL_enableStats or ::SwappyVk_enableStats.
  */
 typedef struct SwappyStats {
-    /** @brief Total frames swapped by swappy */
-    uint64_t totalFrames;
+  /** @brief Total frames swapped by swappy */
+  uint64_t totalFrames;
 
-    /** @brief Histogram of the number of screen refreshes a frame waited in the
-     * compositor queue after rendering was completed.
-     *
-     * For example:
-     *     if a frame waited 2 refresh periods in the compositor queue after
-     * rendering was done, the frame will be counted in idleFrames[2]
-     */
-    uint64_t idleFrames[MAX_FRAME_BUCKETS];
+  /** @brief Histogram of the number of screen refreshes a frame waited in the
+   * compositor queue after rendering was completed.
+   *
+   * For example:
+   *     if a frame waited 2 refresh periods in the compositor queue after
+   * rendering was done, the frame will be counted in idleFrames[2]
+   */
+  uint64_t idleFrames[MAX_FRAME_BUCKETS];
 
-    /** @brief Histogram of the number of screen refreshes passed between the
-     * requested presentation time and the actual present time.
-     *
-     * For example:
-     *     if a frame was presented 2 refresh periods after the requested
-     * timestamp swappy set, the frame will be counted in lateFrames[2]
-     */
-    uint64_t lateFrames[MAX_FRAME_BUCKETS];
+  /** @brief Histogram of the number of screen refreshes passed between the
+   * requested presentation time and the actual present time.
+   *
+   * For example:
+   *     if a frame was presented 2 refresh periods after the requested
+   * timestamp swappy set, the frame will be counted in lateFrames[2]
+   */
+  uint64_t lateFrames[MAX_FRAME_BUCKETS];
 
-    /** @brief Histogram of the number of screen refreshes passed between two
-     * consecutive frames
-     *
-     * For example:
-     *     if frame N was presented 2 refresh periods after frame N-1
-     *     frame N will be counted in offsetFromPreviousFrame[2]
-     */
-    uint64_t offsetFromPreviousFrame[MAX_FRAME_BUCKETS];
+  /** @brief Histogram of the number of screen refreshes passed between two
+   * consecutive frames
+   *
+   * For example:
+   *     if frame N was presented 2 refresh periods after frame N-1
+   *     frame N will be counted in offsetFromPreviousFrame[2]
+   */
+  uint64_t offsetFromPreviousFrame[MAX_FRAME_BUCKETS];
 
-    /** @brief Histogram of the number of screen refreshes passed between the
-     * call to Swappy_recordFrameStart and the actual present time.
-     *
-     * For example:
-     *     if a frame was presented 2 refresh periods after the call to
-     * `Swappy_recordFrameStart` the frame will be counted in latencyFrames[2]
-     */
-    uint64_t latencyFrames[MAX_FRAME_BUCKETS];
+  /** @brief Histogram of the number of screen refreshes passed between the
+   * call to Swappy_recordFrameStart and the actual present time.
+   *
+   * For example:
+   *     if a frame was presented 2 refresh periods after the call to
+   * `Swappy_recordFrameStart` the frame will be counted in latencyFrames[2]
+   */
+  uint64_t latencyFrames[MAX_FRAME_BUCKETS];
 } SwappyStats;
 
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif
@@ -236,43 +235,43 @@ typedef void (*SwappySwapIntervalChangedCallback)(void*);
  * Injection of these is optional.
  */
 typedef struct SwappyTracer {
-    /**
-     * Callback called before waiting to queue the frame to the composer.
-     */
-    SwappyPreWaitCallback preWait;
+  /**
+   * Callback called before waiting to queue the frame to the composer.
+   */
+  SwappyPreWaitCallback preWait;
 
-    /**
-     * Callback called after wait to queue the frame to the composer is done.
-     */
-    SwappyPostWaitCallback postWait;
+  /**
+   * Callback called after wait to queue the frame to the composer is done.
+   */
+  SwappyPostWaitCallback postWait;
 
-    /**
-     * Callback called before calling the function to queue the frame to the
-     * composer.
-     */
-    SwappyPreSwapBuffersCallback preSwapBuffers;
+  /**
+   * Callback called before calling the function to queue the frame to the
+   * composer.
+   */
+  SwappyPreSwapBuffersCallback preSwapBuffers;
 
-    /**
-     * Callback called after calling the function to queue the frame to the
-     * composer.
-     */
-    SwappyPostSwapBuffersCallback postSwapBuffers;
+  /**
+   * Callback called after calling the function to queue the frame to the
+   * composer.
+   */
+  SwappyPostSwapBuffersCallback postSwapBuffers;
 
-    /**
-     * Callback called at the start of a frame.
-     */
-    SwappyStartFrameCallback startFrame;
+  /**
+   * Callback called at the start of a frame.
+   */
+  SwappyStartFrameCallback startFrame;
 
-    /**
-     * Pointer to some arbitrary data that will be passed as the first argument
-     * of callbacks.
-     */
-    void* userData;
+  /**
+   * Pointer to some arbitrary data that will be passed as the first argument
+   * of callbacks.
+   */
+  void* userData;
 
-    /**
-     * Callback called when the swap interval was changed.
-     */
-    SwappySwapIntervalChangedCallback swapIntervalChanged;
+  /**
+   * Callback called when the swap interval was changed.
+   */
+  SwappySwapIntervalChangedCallback swapIntervalChanged;
 } SwappyTracer;
 
 /** @} */
diff --git a/engine/thirdparty/thorvg/inc/config.h b/engine/thirdparty/thorvg/inc/config.h
index b2b1cb6b..6a54f805 100644
--- a/engine/thirdparty/thorvg/inc/config.h
+++ b/engine/thirdparty/thorvg/inc/config.h
@@ -15,5 +15,5 @@
 // For internal debugging:
 //#define THORVG_LOG_ENABLED
 
-#define THORVG_VERSION_STRING "0.15.10"
+#define THORVG_VERSION_STRING "0.15.12"
 #endif
diff --git a/engine/thirdparty/thorvg/patches/0002-png-explicit-variable-scope.patch b/engine/thirdparty/thorvg/patches/0002-png-explicit-variable-scope.patch
new file mode 100644
index 00000000..4a6a91e0
--- /dev/null
+++ b/engine/thirdparty/thorvg/patches/0002-png-explicit-variable-scope.patch
@@ -0,0 +1,13 @@
+diff --git a/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp b/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
+index 71bf25a62b..c362403125 100644
+--- a/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
++++ b/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
+@@ -88,7 +88,7 @@ bool PngLoader::read()
+ 
+     if (w == 0 || h == 0) return false;
+ 
+-    if (cs == ColorSpace::ARGB8888 || cs == ColorSpace::ARGB8888S) {
++    if (ImageLoader::cs == ColorSpace::ARGB8888 || ImageLoader::cs == ColorSpace::ARGB8888S) {
+         image->format = PNG_FORMAT_BGRA;
+         surface.cs = ColorSpace::ARGB8888S;
+     } else {
diff --git a/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp b/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
index 71bf25a6..c3624031 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp
@@ -88,7 +88,7 @@ bool PngLoader::read()
 
     if (w == 0 || h == 0) return false;
 
-    if (cs == ColorSpace::ARGB8888 || cs == ColorSpace::ARGB8888S) {
+    if (ImageLoader::cs == ColorSpace::ARGB8888 || ImageLoader::cs == ColorSpace::ARGB8888S) {
         image->format = PNG_FORMAT_BGRA;
         surface.cs = ColorSpace::ARGB8888S;
     } else {
diff --git a/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp b/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp
index 6aa497c8..ebf222b1 100644
--- a/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/external_webp/tvgWebpLoader.cpp
@@ -56,7 +56,7 @@ WebpLoader::WebpLoader() : ImageLoader(FileType::Webp)
 
 WebpLoader::~WebpLoader()
 {
-    this->done();
+    done();
 
     if (freeData) free(data);
     data = nullptr;
diff --git a/engine/thirdparty/thorvg/src/loaders/jpg/tvgJpgLoader.cpp b/engine/thirdparty/thorvg/src/loaders/jpg/tvgJpgLoader.cpp
index b676bebf..4ae4f120 100644
--- a/engine/thirdparty/thorvg/src/loaders/jpg/tvgJpgLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/jpg/tvgJpgLoader.cpp
@@ -63,6 +63,7 @@ JpgLoader::JpgLoader() : ImageLoader(FileType::Jpg)
 
 JpgLoader::~JpgLoader()
 {
+    done();
     clear();
     free(surface.buf8);
 }
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp
index b5e90e7b..7dac8264 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoader.cpp
@@ -405,6 +405,27 @@ static char* _idFromUrl(const char* url)
 }
 
 
+static size_t _srcFromUrl(const char* url, char*& src)
+{
+    src = (char*)strchr(url, '(');
+    auto close = strchr(url, ')');
+    if (!src || !close || src >= close) return 0;
+
+    src = strchr(src, '\'');
+    if (!src || src >= close) return 0;
+    ++src;
+
+    close = strchr(src, '\'');
+    if (!close || close == src) return 0;
+    --close;
+
+    while (src < close && *src == ' ') ++src;
+    while (src < close && *close == ' ') --close;
+
+    return close - src + 1;
+}
+
+
 static unsigned char _parseColor(const char* value, char** end)
 {
     float r;
@@ -2005,6 +2026,42 @@ static SvgNode* _createImageNode(SvgLoaderData* loader, SvgNode* parent, const c
 }
 
 
+static char* _unquote(const char* str)
+{
+    auto len = str ? strlen(str) : 0;
+    if (len >= 2 && str[0] == '\'' && str[len - 1] == '\'') return strDuplicate(str + 1, len - 2);
+    return strdup(str);
+}
+
+
+static bool _attrParseFontFace(void* data, const char* key, const char* value)
+{
+    if (!key || !value) return false;
+
+    key = _skipSpace(key, nullptr);
+    value = _skipSpace(value, nullptr);
+
+    auto loader = (SvgLoaderData*)data;
+    auto& font = loader->fonts.last();
+
+    if (!strcmp(key, "font-family")) {
+        if (font.name) free(font.name);
+        font.name = _unquote(value);
+    } else if (!strcmp(key, "src")) {
+        font.srcLen = _srcFromUrl(value, font.src);
+    }
+
+    return true;
+}
+
+
+static void _createFontFace(SvgLoaderData* loader, const char* buf, unsigned bufLength, parseAttributes func)
+{
+    loader->fonts.push(FontFace());
+    func(buf, bufLength, _attrParseFontFace, loader);
+}
+
+
 static SvgNode* _getDefsNode(SvgNode* node)
 {
     if (!node) return nullptr;
@@ -3382,6 +3439,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
         if (node->type != SvgNodeType::Defs || !empty) {
             loader->stack.push(node);
         }
+        loader->latestGradient = nullptr;
     } else if ((method = _findGraphicsFactory(tagName))) {
         if (loader->stack.count > 0) parent = loader->stack.last();
         else parent = loader->doc;
@@ -3392,6 +3450,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
             loader->stack.push(defs);
             loader->currentGraphicsNode = node;
         }
+        loader->latestGradient = nullptr;
     } else if ((gradientMethod = _findGradientFactory(tagName))) {
         SvgStyleGradient* gradient;
         gradient = gradientMethod(loader, attrs, attrsLength);
@@ -3417,8 +3476,9 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
         loader->svgParse->flags = SvgStopStyleFlags::StopDefault;
         simpleXmlParseAttributes(attrs, attrsLength, _attrParseStops, loader);
         loader->latestGradient->stops.push(loader->svgParse->gradStop);
-    } else if (!isIgnoreUnsupportedLogElements(tagName)) {
-        TVGLOG("SVG", "Unsupported elements used [Elements: %s]", tagName);
+    } else {
+        loader->latestGradient = nullptr;
+        if (!isIgnoreUnsupportedLogElements(tagName)) TVGLOG("SVG", "Unsupported elements used [Elements: %s]", tagName);
     }
 }
 
@@ -3452,6 +3512,8 @@ static void _svgLoaderParserXmlCssStyle(SvgLoaderData* loader, const char* conte
             TVGLOG("SVG", "Unsupported elements used in the internal CSS style sheets [Elements: %s]", tag);
         } else if (!strcmp(tag, "all")) {
             if ((node = _createCssStyleNode(loader, loader->cssStyle, attrs, attrsLength, simpleXmlParseW3CAttribute))) node->id = _copyId(name);
+        } else if (!strcmp(tag, "@font-face")) { //css at-rule specifying font
+            _createFontFace(loader, attrs, attrsLength, simpleXmlParseW3CAttribute);
         } else if (!isIgnoreUnsupportedLogElements(tag)) {
             TVGLOG("SVG", "Unsupported elements used in the internal CSS style sheets [Elements: %s]", tag);
         }
@@ -3826,7 +3888,7 @@ SvgLoader::SvgLoader() : ImageLoader(FileType::Svg)
 
 SvgLoader::~SvgLoader()
 {
-    this->done();
+    done();
     clear();
 }
 
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
index e64d7afb..c2fcc77d 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
@@ -555,6 +555,14 @@ struct SvgNodeIdPair
     char *id;
 };
 
+struct FontFace
+{
+    char* name = nullptr;
+    char* src = nullptr;
+    size_t srcLen = 0;
+    char* decoded = nullptr;
+};
+
 enum class OpenedTagType : uint8_t
 {
     Other = 0,
@@ -574,6 +582,7 @@ struct SvgLoaderData
     Array<SvgNodeIdPair> cloneNodes;
     Array<SvgNodeIdPair> nodesToStyle;
     Array<char*> images;        //embedded images
+    Array<FontFace> fonts;
     int level = 0;
     bool result = false;
     OpenedTagType openedTag = OpenedTagType::Other;
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
index 17573925..512b0ed4 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
@@ -573,8 +573,6 @@ static unique_ptr<Picture> _imageBuildHelper(SvgLoaderData& loaderData, SvgNode*
     if (!node->node.image.href || !strlen(node->node.image.href)) return nullptr;
     auto picture = Picture::gen();
 
-    TaskScheduler::async(false);    //force to load a picture on the same thread
-
     const char* href = node->node.image.href;
     if (!strncmp(href, "data:", sizeof("data:") - 1)) {
         href += sizeof("data:") - 1;
@@ -586,14 +584,12 @@ static unique_ptr<Picture> _imageBuildHelper(SvgLoaderData& loaderData, SvgNode*
             auto size = b64Decode(href, strlen(href), &decoded);
             if (picture->load(decoded, size, mimetype, false) != Result::Success) {
                 free(decoded);
-                TaskScheduler::async(true);
                 return nullptr;
             }
         } else {
             auto size = svgUtilURLDecode(href, &decoded);
             if (picture->load(decoded, size, mimetype, false) != Result::Success) {
                 free(decoded);
-                TaskScheduler::async(true);
                 return nullptr;
             }
         }
@@ -605,7 +601,6 @@ static unique_ptr<Picture> _imageBuildHelper(SvgLoaderData& loaderData, SvgNode*
         const char *dot = strrchr(href, '.');
         if (dot && !strcmp(dot, ".svg")) {
             TVGLOG("SVG", "Embedded svg file is disabled.");
-            TaskScheduler::async(true);
             return nullptr;
         }
         string imagePath = href;
@@ -614,13 +609,10 @@ static unique_ptr<Picture> _imageBuildHelper(SvgLoaderData& loaderData, SvgNode*
             imagePath = svgPath.substr(0, (last == string::npos ? 0 : last + 1)) + imagePath;
         }
         if (picture->load(imagePath) != Result::Success) {
-            TaskScheduler::async(true);
             return nullptr;
         }
     }
 
-    TaskScheduler::async(true);
-
     float w, h;
     Matrix m = {1, 0, 0, 0, 1, 0, 0, 0, 1};
     if (picture->size(&w, &h) == Result::Success && w  > 0 && h > 0) {
@@ -900,6 +892,41 @@ static void _updateInvalidViewSize(const Scene* scene, Box& vBox, float& w, floa
     if (!validHeight) h *= vBox.h;
 }
 
+
+static void _loadFonts(Array<FontFace>& fonts)
+{
+    if (fonts.empty()) return;
+
+    static constexpr struct {
+        const char* prefix;
+        size_t len;
+    } prefixes[] = {
+        {"data:font/ttf;base64,", sizeof("data:font/ttf;base64,") - 1},
+        {"data:application/font-ttf;base64,", sizeof("data:application/font-ttf;base64,") - 1}
+    };
+
+    for (uint32_t i = 0; i < fonts.count; ++i) {
+        auto p = &fonts[i];
+        if (!p->name) continue;
+
+        size_t shift = 0;
+        for (const auto& prefix : prefixes) {
+            if (p->srcLen > prefix.len && !memcmp(p->src, prefix.prefix, prefix.len)) {
+                shift = prefix.len;
+                break;
+            }
+        }
+        if (shift == 0) {
+            TVGLOG("SVG", "The embedded font \"%s\" data not loaded properly.", p->name);
+            continue;
+        }
+
+        auto size = b64Decode(p->src + shift, p->srcLen - shift, &p->decoded);
+
+        if (Text::load(p->name, p->decoded, size) != Result::Success) TVGERR("SVG", "Error while loading the ttf font named \"%s\".", p->name);
+    }
+}
+
 /************************************************************************/
 /* External Class Implementation                                        */
 /************************************************************************/
@@ -910,6 +937,8 @@ Scene* svgSceneBuild(SvgLoaderData& loaderData, Box vBox, float w, float h, Aspe
 
     if (!loaderData.doc || (loaderData.doc->type != SvgNodeType::Doc)) return nullptr;
 
+    _loadFonts(loaderData.fonts);
+
     auto docNode = _sceneBuildHelper(loaderData, loaderData.doc, vBox, svgPath, false, 0);
 
     if (!(viewFlag & SvgViewFlag::Viewbox)) _updateInvalidViewSize(docNode.get(), vBox, w, h, viewFlag);
diff --git a/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp b/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
index 4e763f24..81d5c098 100644
--- a/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
+++ b/engine/thirdparty/thorvg/src/loaders/svg/tvgXmlParser.cpp
@@ -483,6 +483,14 @@ bool simpleXmlParseW3CAttribute(const char* buf, unsigned bufLength, simpleXMLAt
     do {
         char* sep = (char*)strchr(buf, ':');
         next = (char*)strchr(buf, ';');
+
+        if (auto src = strstr(buf, "src")) {//src tag from css font-face contains extra semicolon
+            if (src < sep) {
+                if (next + 1 < end) next = (char*)strchr(next + 1, ';');
+                else return true;
+            }
+        }
+
         if (sep >= end) {
             next = nullptr;
             sep = nullptr;
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h
index a45a996a..53c28049 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwCommon.h
@@ -448,9 +448,9 @@ static inline uint32_t opBlendColorDodge(uint32_t s, uint32_t d, TVG_UNUSED uint
 {
     // d / (1 - s)
     s = 0xffffffff - s;
-    auto c1 = (C1(s) == 0) ? C1(d) : std::min(C1(d) * 255 / C1(s), 255);
-    auto c2 = (C2(s) == 0) ? C2(d) : std::min(C2(d) * 255 / C2(s), 255);
-    auto c3 = (C3(s) == 0) ? C3(d) : std::min(C3(d) * 255 / C3(s), 255);
+    auto c1 = C1(d) == 0 ? 0 : (C1(s) == 0 ? 255 : std::min(C1(d) * 255 / C1(s), 255));
+    auto c2 = C2(d) == 0 ? 0 : (C2(s) == 0 ? 255 : std::min(C2(d) * 255 / C2(s), 255));
+    auto c3 = C3(d) == 0 ? 0 : (C3(s) == 0 ? 255 : std::min(C3(d) * 255 / C3(s), 255));
     return JOIN(255, c1, c2, c3);
 }
 
@@ -458,9 +458,9 @@ static inline uint32_t opBlendColorBurn(uint32_t s, uint32_t d, TVG_UNUSED uint8
 {
     // 1 - (1 - d) / s
     auto id = 0xffffffff - d;
-    auto c1 = (C1(s) == 0) ? C1(d) : 255 - std::min(C1(id) * 255 / C1(s), 255);
-    auto c2 = (C2(s) == 0) ? C2(d) : 255 - std::min(C2(id) * 255 / C2(s), 255);
-    auto c3 = (C3(s) == 0) ? C3(d) : 255 - std::min(C3(id) * 255 / C3(s), 255);
+    auto c1 = C1(d) == 255 ? 255 : (C1(s) == 0 ? 0 : 255 - std::min(C1(id) * 255 / C1(s), 255));
+    auto c2 = C2(d) == 255 ? 255 : (C2(s) == 0 ? 0 : 255 - std::min(C2(id) * 255 / C2(s), 255));
+    auto c3 = C3(d) == 255 ? 255 : (C3(s) == 0 ? 0 : 255 - std::min(C3(id) * 255 / C3(s), 255));
 
     return JOIN(255, c1, c2, c3);
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp
index 1ff99f6a..442d5f8d 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwMath.cpp
@@ -314,10 +314,10 @@ bool mathUpdateOutlineBBox(const SwOutline* outline, const SwBBox& clipRegion, S
     }
 
     if (fastTrack) {
-        renderRegion.min.x = static_cast<SwCoord>(nearbyint(xMin / 64.0f));
-        renderRegion.max.x = static_cast<SwCoord>(nearbyint(xMax / 64.0f));
-        renderRegion.min.y = static_cast<SwCoord>(nearbyint(yMin / 64.0f));
-        renderRegion.max.y = static_cast<SwCoord>(nearbyint(yMax / 64.0f));
+        renderRegion.min.x = static_cast<SwCoord>(round(xMin / 64.0f));
+        renderRegion.max.x = static_cast<SwCoord>(round(xMax / 64.0f));
+        renderRegion.min.y = static_cast<SwCoord>(round(yMin / 64.0f));
+        renderRegion.max.y = static_cast<SwCoord>(round(yMax / 64.0f));
     } else {
         renderRegion.min.x = xMin >> 6;
         renderRegion.max.x = (xMax + 63) >> 6;
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp
index 4be40c88..fe311ef3 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwPostEffect.cpp
@@ -266,10 +266,10 @@ static void _dropShadowFilter(uint32_t* dst, uint32_t* src, int stride, int w, i
 }
 
 
-static void _dropShadowShift(uint32_t* dst, uint32_t* src, int stride, SwBBox& region, SwPoint& offset, uint8_t opacity, bool direct)
+static void _dropShadowShift(uint32_t* dst, uint32_t* src, int dstride, int sstride, SwBBox& region, SwPoint& offset, uint8_t opacity, bool direct)
 {
-    src += (region.min.y * stride + region.min.x);
-    dst += (region.min.y * stride + region.min.x);
+    src += (region.min.y * sstride + region.min.x);
+    dst += (region.min.y * dstride + region.min.x);
 
     auto w = region.max.x - region.min.x;
     auto h = region.max.y - region.min.y;
@@ -279,14 +279,14 @@ static void _dropShadowShift(uint32_t* dst, uint32_t* src, int stride, SwBBox& r
     if (region.min.x + offset.x < 0) src -= offset.x;
     else dst += offset.x;
 
-    if (region.min.y + offset.y < 0) src -= (offset.y * stride);
-    else dst += (offset.y * stride);
+    if (region.min.y + offset.y < 0) src -= (offset.y * sstride);
+    else dst += (offset.y * dstride);
 
     for (auto y = 0; y < h; ++y) {
         if (translucent) rasterTranslucentPixel32(dst, src, w, opacity);
         else rasterPixel32(dst, src, w, opacity);
-        src += stride;
-        dst += stride;
+        src += sstride;
+        dst += dstride;
     }
 }
 
@@ -389,14 +389,14 @@ bool effectDropShadow(SwCompositor* cmp, SwSurface* surface[2], const RenderEffe
 
     //draw to the main surface directly
     if (direct) {
-        _dropShadowShift(cmp->recoverSfc->buf32, cmp->image.buf32, stride, bbox, data->offset, opacity, direct);
+        _dropShadowShift(cmp->recoverSfc->buf32, cmp->image.buf32, cmp->recoverSfc->stride, stride, bbox, data->offset, opacity, direct);
         std::swap(cmp->image.buf32, buffer[0]->buf32);
         return true;
     }
 
     //draw to the intermediate surface
     rasterClear(surface[1], bbox.min.x, bbox.min.y, w, h);
-    _dropShadowShift(buffer[1]->buf32, cmp->image.buf32, stride, bbox, data->offset, opacity, direct);
+    _dropShadowShift(buffer[1]->buf32, cmp->image.buf32, stride, stride, bbox, data->offset, opacity, direct);
     std::swap(cmp->image.buf32, buffer[1]->buf32);
 
     //compositing shadow and body
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp
index cce97cff..5e29d2e2 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRaster.cpp
@@ -1813,7 +1813,7 @@ bool rasterConvertCS(RenderSurface* surface, ColorSpace to)
 //TODO: SIMD OPTIMIZATION?
 void rasterXYFlip(uint32_t* src, uint32_t* dst, int32_t stride, int32_t w, int32_t h, const SwBBox& bbox, bool flipped)
 {
-    constexpr int BLOCK = 8;  //experimental decision
+    constexpr int32_t BLOCK = 8;  //experimental decision
 
     if (flipped) {
         src += ((bbox.min.x * stride) + bbox.min.y);
@@ -1824,16 +1824,16 @@ void rasterXYFlip(uint32_t* src, uint32_t* dst, int32_t stride, int32_t w, int32
     }
 
     #pragma omp parallel for
-    for (int x = 0; x < w; x += BLOCK) {
+    for (int32_t x = 0; x < w; x += BLOCK) {
         auto bx = std::min(w, x + BLOCK) - x;
         auto in = &src[x];
         auto out = &dst[x * stride];
-        for (int y = 0; y < h; y += BLOCK) {
+        for (int32_t y = 0; y < h; y += BLOCK) {
             auto p = &in[y * stride];
             auto q = &out[y];
             auto by = std::min(h, y + BLOCK) - y;
-            for (int xx = 0; xx < bx; ++xx) {
-                for (int yy = 0; yy < by; ++yy) {
+            for (int32_t xx = 0; xx < bx; ++xx) {
+                for (int32_t yy = 0; yy < by; ++yy) {
                     *q = *p;
                     p += stride;
                     ++q;
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp
index 5b9719d2..c70fdcfa 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRenderer.cpp
@@ -121,8 +121,7 @@ struct SwShapeTask : SwTask
         auto visibleFill = false;
 
         //This checks also for the case, if the invisible shape turned to visible by alpha.
-        auto prepareShape = false;
-        if (!shapePrepared(&shape) && (flags & RenderUpdateFlag::Color)) prepareShape = true;
+        auto prepareShape = !shapePrepared(&shape) && flags & (RenderUpdateFlag::Color | RenderUpdateFlag::Gradient);
 
         //Shape
         if (flags & (RenderUpdateFlag::Path | RenderUpdateFlag::Transform) || prepareShape) {
@@ -186,6 +185,7 @@ struct SwShapeTask : SwTask
     err:
         bbox.reset();
         shapeReset(&shape);
+        rleReset(shape.strokeRle);
         shapeDelOutline(&shape, mpool, tid);
     }
 
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp
index cd9f4048..8290927a 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwRle.cpp
@@ -482,7 +482,7 @@ static bool _setCell(RleWorker& rw, SwPoint pos)
 static bool _startCell(RleWorker& rw, SwPoint pos)
 {
     if (pos.x > rw.cellMax.x) pos.x = rw.cellMax.x;
-    if (pos.x < rw.cellMin.x) pos.x = rw.cellMin.x;
+    if (pos.x < rw.cellMin.x) pos.x = rw.cellMin.x - 1;
 
     rw.area = 0;
     rw.cover = 0;
@@ -866,6 +866,8 @@ void _replaceClipSpan(SwRle *rle, SwSpan* clippedSpans, uint32_t size)
 
 SwRle* rleRender(SwRle* rle, const SwOutline* outline, const SwBBox& renderRegion, bool antiAlias)
 {
+    if (!outline) return nullptr;
+
     constexpr auto RENDER_POOL_SIZE = 16384L;
     constexpr auto BAND_SIZE = 40;
 
diff --git a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp
index 4408db0b..87c2da90 100644
--- a/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/sw_engine/tvgSwShape.cpp
@@ -102,7 +102,6 @@ static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& trans
 {
     Line cur = {dash.ptCur, *to};
     auto len = cur.length();
-
     if (tvg::zero(len)) {
         _outlineMoveTo(*dash.outline, &dash.ptCur, transform);
     //draw the current line fully
@@ -117,7 +116,7 @@ static void _dashLineTo(SwDashStroke& dash, const Point* to, const Matrix& trans
         }
     //draw the current line partially
     } else {
-        while (len - dash.curLen > 0.0001f) {
+        while (len - dash.curLen > DASH_PATTERN_THRESHOLD) {
             Line left, right;
             if (dash.curLen > 0) {
                 len -= dash.curLen;
@@ -178,7 +177,7 @@ static void _dashCubicTo(SwDashStroke& dash, const Point* ctrl1, const Point* ct
         }
     //draw the current line partially
     } else {
-        while ((len - dash.curLen) > 0.0001f) {
+        while ((len - dash.curLen) > DASH_PATTERN_THRESHOLD) {
             Bezier left, right;
             if (dash.curLen > 0) {
                 len -= dash.curLen;
@@ -543,7 +542,6 @@ void shapeDelOutline(SwShape* shape, SwMpool* mpool, uint32_t tid)
 void shapeReset(SwShape* shape)
 {
     rleReset(shape->rle);
-    rleReset(shape->strokeRle);
     shape->fastTrack = false;
     shape->bbox.reset();
 }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h b/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h
index a9c1a685..4d2fa1aa 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgLoadModule.h
@@ -23,6 +23,8 @@
 #ifndef _TVG_LOAD_MODULE_H_
 #define _TVG_LOAD_MODULE_H_
 
+#include <atomic>
+#include "tvgCommon.h"
 #include "tvgRender.h"
 #include "tvgInlist.h"
 
@@ -38,7 +40,7 @@ struct LoadModule
     };
 
     FileType type;                                  //current loader file type
-    uint16_t sharing = 0;                           //reference count
+    atomic<uint16_t> sharing{};                     //reference count
     bool readied = false;                           //read done already.
     bool pathcache = false;                         //cached by path
 
@@ -77,7 +79,7 @@ struct LoadModule
 
 struct ImageLoader : LoadModule
 {
-    static ColorSpace cs;                           //desired value
+    static atomic<ColorSpace> cs;                   //desired value
 
     float w = 0, h = 0;                             //default image size
     RenderSurface surface;
@@ -95,14 +97,21 @@ struct ImageLoader : LoadModule
 };
 
 
+struct FontMetrics
+{
+    //TODO: add necessary metrics
+    float minw;
+};
+
+
 struct FontLoader : LoadModule
 {
-    float scale = 1.0f;
-
     FontLoader(FileType type) : LoadModule(type) {}
 
-    virtual bool request(Shape* shape, char* text) = 0;
-    virtual bool transform(Paint* paint, float fontSize, bool italic) = 0;
+    using LoadModule::read;
+
+    virtual bool read(Shape* shape, char* text, FontMetrics& out) = 0;
+    virtual float transform(Paint* paint, FontMetrics& mertrics, float fontSize, bool italic) = 0;
 };
 
 #endif //_TVG_LOAD_MODULE_H_
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp b/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp
index e69fb678..7de6286c 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgLoader.cpp
@@ -22,6 +22,7 @@
 
 #include <string.h>
 
+#include <atomic>
 #include "tvgInlist.h"
 #include "tvgLoader.h"
 #include "tvgLock.h"
@@ -66,9 +67,10 @@ uintptr_t HASH_KEY(const char* data)
 /* Internal Class Implementation                                        */
 /************************************************************************/
 
-ColorSpace ImageLoader::cs = ColorSpace::ARGB8888;
+//TODO: remove it.
+atomic<ColorSpace> ImageLoader::cs{ColorSpace::ARGB8888};
 
-static Key key;
+static Key _key;
 static Inlist<LoadModule> _activeLoaders;
 
 
@@ -215,7 +217,7 @@ static LoadModule* _findByType(const string& mimeType)
 
 static LoadModule* _findFromCache(const string& path)
 {
-    ScopedLock lock(key);
+    ScopedLock lock(_key);
 
     auto loader = _activeLoaders.head;
 
@@ -235,11 +237,10 @@ static LoadModule* _findFromCache(const char* data, uint32_t size, const string&
     auto type = _convert(mimeType);
     if (type == FileType::Unknown) return nullptr;
 
-    ScopedLock lock(key);
-    auto loader = _activeLoaders.head;
-
     auto key = HASH_KEY(data);
+    ScopedLock lock(_key);
 
+    auto loader = _activeLoaders.head;
     while (loader) {
         if (loader->type == type && loader->hashkey == key) {
             ++loader->sharing;
@@ -267,7 +268,11 @@ bool LoaderMgr::term()
     auto loader = _activeLoaders.head;
 
     //clean up the remained font loaders which is globally used.
-    while (loader && loader->type == FileType::Ttf) {
+    while (loader) {
+        if (loader->type != FileType::Ttf) {
+            loader = loader->next;
+            continue;
+        }
         auto ret = loader->close();
         auto tmp = loader;
         loader = loader->next;
@@ -281,9 +286,9 @@ bool LoaderMgr::term()
 bool LoaderMgr::retrieve(LoadModule* loader)
 {
     if (!loader) return false;
+
     if (loader->close()) {
         if (loader->cached()) {
-            ScopedLock lock(key);
             _activeLoaders.remove(loader);
         }
         delete(loader);
@@ -312,7 +317,7 @@ LoadModule* LoaderMgr::loader(const string& path, bool* invalid)
                 loader->hashpath = strdup(path.c_str());
                 loader->pathcache = true;
                 {
-                    ScopedLock lock(key);
+                    ScopedLock lock(_key);
                     _activeLoaders.back(loader);
                 }
             }
@@ -328,7 +333,7 @@ LoadModule* LoaderMgr::loader(const string& path, bool* invalid)
                     loader->hashpath = strdup(path.c_str());
                     loader->pathcache = true;
                     {
-                        ScopedLock lock(key);
+                        ScopedLock lock(_key);
                         _activeLoaders.back(loader);
                     }
                 }
@@ -386,7 +391,7 @@ LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const string& mim
             if (loader->open(data, size, copy)) {
                 if (allowCache) {
                     loader->hashkey = HASH_KEY(data);
-                    ScopedLock lock(key);
+                    ScopedLock lock(_key);
                     _activeLoaders.back(loader);
                 }
                 return loader;
@@ -403,7 +408,7 @@ LoadModule* LoaderMgr::loader(const char* data, uint32_t size, const string& mim
             if (loader->open(data, size, copy)) {
                 if (allowCache) {
                     loader->hashkey = HASH_KEY(data);
-                    ScopedLock lock(key);
+                    ScopedLock lock(_key);
                     _activeLoaders.back(loader);
                 }
                 return loader;
@@ -429,7 +434,7 @@ LoadModule* LoaderMgr::loader(const uint32_t *data, uint32_t w, uint32_t h, bool
     if (loader->open(data, w, h, copy)) {
         if (!copy) {
             loader->hashkey = HASH_KEY((const char*)data);
-            ScopedLock lock(key);
+            ScopedLock lock(_key);
             _activeLoaders.back(loader);
         }
         return loader;
@@ -451,7 +456,7 @@ LoadModule* LoaderMgr::loader(const char* name, const char* data, uint32_t size,
     if (loader->open(data, size, copy)) {
         loader->hashpath = strdup(name);
         loader->pathcache = true;
-        ScopedLock lock(key);
+        ScopedLock lock(_key);
         _activeLoaders.back(loader);
         return loader;
     }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgRender.h b/engine/thirdparty/thorvg/src/renderer/tvgRender.h
index 7d432cac..ce4a1bc9 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgRender.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgRender.h
@@ -35,6 +35,8 @@ namespace tvg
 using RenderData = void*;
 using pixel_t = uint32_t;
 
+#define DASH_PATTERN_THRESHOLD 0.001f
+
 enum RenderUpdateFlag : uint8_t {None = 0, Path = 1, Color = 2, Gradient = 4, Stroke = 8, Transform = 16, Image = 32, GradientStroke = 64, Blend = 128, All = 255};
 enum CompositionFlag : uint8_t {Invalid = 0, Opacity = 1, Blending = 2, Masking = 4, PostProcessing = 8};  //Composition Purpose
 
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp
index fa7aadd7..069bdf2f 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.cpp
@@ -40,8 +40,6 @@ static TaskSchedulerImpl* inst = nullptr;
 
 #ifdef THORVG_THREAD_SUPPORT
 
-static thread_local bool _async = true;
-
 struct TaskQueue {
     Inlist<Task>             taskDeque;
     mutex                    mtx;
@@ -157,7 +155,7 @@ struct TaskSchedulerImpl
     void request(Task* task)
     {
         //Async
-        if (threads.count > 0 && _async) {
+        if (threads.count > 0) {
             task->prepare();
             auto i = idx++;
             for (uint32_t n = 0; n < threads.count; ++n) {
@@ -178,8 +176,6 @@ struct TaskSchedulerImpl
 
 #else //THORVG_THREAD_SUPPORT
 
-static bool _async = true;
-
 struct TaskSchedulerImpl
 {
     TaskSchedulerImpl(TVG_UNUSED uint32_t threadCnt) {}
@@ -220,10 +216,3 @@ uint32_t TaskScheduler::threads()
     if (inst) return inst->threadCnt();
     return 0;
 }
-
-
-void TaskScheduler::async(bool on)
-{
-    //toggle async tasking for each thread on/off
-    _async = on;
-}
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
index 58918e88..78120dfe 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgTaskScheduler.h
@@ -103,7 +103,6 @@ struct TaskScheduler
     static void init(uint32_t threads);
     static void term();
     static void request(Task* task);
-    static void async(bool on);
 };
 
 }  //namespace
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgText.cpp b/engine/thirdparty/thorvg/src/renderer/tvgText.cpp
index a09bb302..2b2aea31 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgText.cpp
+++ b/engine/thirdparty/thorvg/src/renderer/tvgText.cpp
@@ -62,7 +62,11 @@ Result Text::load(const std::string& path) noexcept
 {
 #ifdef THORVG_FILE_IO_SUPPORT
     bool invalid; //invalid path
-    if (!LoaderMgr::loader(path, &invalid)) {
+    auto loader = LoaderMgr::loader(path, &invalid);
+    if (loader) {
+        if (loader->sharing > 0) --loader->sharing;   //font loading doesn't mean sharing.
+        return Result::Success;
+    } else {
         if (invalid) return Result::InvalidArguments;
         else return Result::NonSupport;
     }
diff --git a/engine/thirdparty/thorvg/src/renderer/tvgText.h b/engine/thirdparty/thorvg/src/renderer/tvgText.h
index d92495ef..9d4529ab 100644
--- a/engine/thirdparty/thorvg/src/renderer/tvgText.h
+++ b/engine/thirdparty/thorvg/src/renderer/tvgText.h
@@ -24,6 +24,7 @@
 #define _TVG_TEXT_H
 
 #include <cstring>
+#include "tvgMath.h"
 #include "tvgShape.h"
 #include "tvgFill.h"
 #include "tvgLoader.h"
@@ -33,6 +34,7 @@ struct Text::Impl
     FontLoader* loader = nullptr;
     Text* paint;
     Shape* shape;
+    FontMetrics metrics;
     char* utf8 = nullptr;
     float fontSize;
     bool italic = false;
@@ -40,6 +42,7 @@ struct Text::Impl
 
     Impl(Text* p) : paint(p), shape(Shape::gen().release())
     {
+        shape->fill(FillRule::EvenOdd);
     }
 
     ~Impl()
@@ -94,27 +97,26 @@ struct Text::Impl
         return PP(shape)->render(renderer);
     }
 
-    bool load()
+    float load()
     {
-        if (!loader) return false;
+        if (!loader) return 0.0f;
 
-        loader->request(shape, utf8);
         //reload
         if (changed) {
-            loader->read();
+            loader->read(shape, utf8, metrics);
             changed = false;
         }
-        return loader->transform(shape, fontSize, italic);
+        return loader->transform(shape, metrics, fontSize, italic);
     }
 
     RenderData update(RenderMethod* renderer, const Matrix& transform, Array<RenderData>& clips, uint8_t opacity, RenderUpdateFlag pFlag, TVG_UNUSED bool clipper)
     {
-        if (!load()) return nullptr;
+        auto scale = 1.0f / load();
+        if (tvg::zero(scale)) return nullptr;
 
         //transform the gradient coordinates based on the final scaled font.
         auto fill = P(shape)->rs.fill;
         if (fill && P(shape)->rFlag & RenderUpdateFlag::Gradient) {
-            auto scale = 1.0f / loader->scale;
             if (fill->type() == Type::LinearGradient) {
                 P(static_cast<LinearGradient*>(fill))->x1 *= scale;
                 P(static_cast<LinearGradient*>(fill))->y1 *= scale;
@@ -134,7 +136,7 @@ struct Text::Impl
 
     bool bounds(float* x, float* y, float* w, float* h, TVG_UNUSED bool stroking)
     {
-        if (!load()) return false;
+        if (load() == 0.0f) return false;
         PP(shape)->bounds(x, y, w, h, true, true, false);
         return true;
     }
diff --git a/engine/thirdparty/thorvg/update-thorvg.sh b/engine/thirdparty/thorvg/update-thorvg.sh
index cd36e162..7c211f73 100755
--- a/engine/thirdparty/thorvg/update-thorvg.sh
+++ b/engine/thirdparty/thorvg/update-thorvg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-VERSION=0.15.10
+VERSION=0.15.12
 # Uncomment and set a git hash to use specific commit instead of tag.
 #GIT_COMMIT=
 
diff --git a/engine/thirdparty/ufbx/ufbx.c b/engine/thirdparty/ufbx/ufbx.c
index 77bd3dea..f5ce8474 100644
--- a/engine/thirdparty/ufbx/ufbx.c
+++ b/engine/thirdparty/ufbx/ufbx.c
@@ -270,6 +270,7 @@
 	#define ufbx_fmax ufbxi_math_fn(fmax)
 	#define ufbx_nextafter ufbxi_math_fn(nextafter)
 	#define ufbx_rint ufbxi_math_fn(rint)
+	#define ufbx_floor ufbxi_math_fn(floor)
 	#define ufbx_ceil ufbxi_math_fn(ceil)
 	#define ufbx_isnan ufbxi_math_fn(isnan)
 #endif
@@ -296,6 +297,7 @@ extern "C" {
 	ufbx_extern_abi double ufbx_copysign(double x, double y);
 	ufbx_extern_abi double ufbx_nextafter(double x, double y);
 	ufbx_extern_abi double ufbx_rint(double x);
+	ufbx_extern_abi double ufbx_floor(double x);
 	ufbx_extern_abi double ufbx_ceil(double x);
 	ufbx_extern_abi int ufbx_isnan(double x);
 #endif
@@ -532,6 +534,10 @@ extern "C" {
 			#pragma GCC diagnostic ignored "-Wc99-c11-compat"
 		#endif
 	#endif
+	// MSC isnan() definition triggers this error on MinGW GCC
+	#if defined(__MINGW32__)
+		#pragma GCC diagnostic ignored "-Wfloat-conversion"
+	#endif
 #endif
 
 #if !defined(ufbx_static_assert)
@@ -600,7 +606,7 @@ extern "C" {
 	#endif
 #endif
 
-#if !defined(UFBX_STANDARD_C) && !defined(UFBX_NO_SSE) && (defined(_MSC_VER) && defined(_M_X64) && !defined(_M_ARM64EC)) || ((defined(__GNUC__) || defined(__clang__)) && defined(__x86_64__)) || defined(UFBX_USE_SSE)
+#if defined(UFBX_USE_SSE) || (!defined(UFBX_STANDARD_C) && !defined(UFBX_NO_SSE) && ((defined(_MSC_VER) && defined(_M_X64) && !defined(_M_ARM64EC)) || ((defined(__GNUC__) || defined(__clang__)) && defined(__x86_64__))))
 	#define UFBXI_HAS_SSE 1
 	#include <xmmintrin.h>
 	#include <emmintrin.h>
@@ -830,7 +836,7 @@ ufbx_static_assert(sizeof_f64, sizeof(double) == 8);
 
 // -- Version
 
-#define UFBX_SOURCE_VERSION ufbx_pack_version(0, 15, 0)
+#define UFBX_SOURCE_VERSION ufbx_pack_version(0, 18, 0)
 ufbx_abi_data_def const uint32_t ufbx_source_version = UFBX_SOURCE_VERSION;
 
 ufbx_static_assert(source_header_version, UFBX_SOURCE_VERSION/1000u == UFBX_HEADER_VERSION/1000u);
@@ -968,7 +974,7 @@ ufbx_static_assert(source_header_version, UFBX_SOURCE_VERSION/1000u == UFBX_HEAD
 	#define ufbxi_regression_assert(cond) (void)0
 #endif
 
-#if defined(UFBX_REGRESSION) || defined(UFBX_DEV)
+#if defined(UFBX_REGRESSION) || defined(UFBX_DEV) || defined(UFBX_UBSAN)
 	#define ufbxi_dev_assert(cond) ufbx_assert(cond)
 #else
 	#define ufbxi_dev_assert(cond) (void)0
@@ -1400,7 +1406,7 @@ static ufbxi_noinline void ufbxi_bigint_shift_left(ufbxi_bigint *bigint, uint32_
 	bigint->length += words + (b.limbs[b.length - 1] >> 1 >> bits_down != 0 ? 1 : 0);
 	b.limbs[b.length] = 0;
 	if (b.length <= 3 && words <= 3) {
-		ufbxi_bigint_limb l0 = ufbxi_maybe_uninit(b.length >= 0, b.limbs[0], ~0u);
+		ufbxi_bigint_limb l0 = b.limbs[0];
 		ufbxi_bigint_limb l1 = ufbxi_maybe_uninit(b.length >= 1, b.limbs[1], ~0u);
 		ufbxi_bigint_limb l2 = ufbxi_maybe_uninit(b.length >= 2, b.limbs[2], ~0u);
 		b.limbs[0] = 0;
@@ -1491,6 +1497,7 @@ static ufbxi_noinline double ufbxi_parse_double(const char *str, size_t max_leng
 				digits = digits * 10 + (uint64_t)(c - '0');
 				num_digits++;
 				if (num_digits >= 18) {
+					ufbxi_dev_assert(num_digits < ufbxi_arraycount(ufbxi_pow5_tab));
 					ufbxi_bigint_mad(&big_mantissa, ufbxi_pow5_tab[num_digits] << num_digits, digits);
 					digits = 0;
 					num_digits = 0;
@@ -1553,6 +1560,7 @@ static ufbxi_noinline double ufbxi_parse_double(const char *str, size_t max_leng
 		big_mantissa.length = (digits >> 32u) ? 2 : digits ? 1 : 0;
 		if (big_mantissa.length == 0) return negative ? -0.0 : 0.0;
 	} else {
+		ufbxi_dev_assert(num_digits < ufbxi_arraycount(ufbxi_pow5_tab));
 		ufbxi_bigint_mad(&big_mantissa, ufbxi_pow5_tab[num_digits] << num_digits, digits);
 	}
 
@@ -1654,7 +1662,7 @@ static ufbxi_noinline double ufbxi_parse_double(const char *str, size_t max_leng
 	}
 }
 
-static ufbxi_noinline uint32_t ufbxi_parse_double_init_flags()
+static ufbxi_noinline uint32_t ufbxi_parse_double_init_flags(void)
 {
 	// We require evaluation in double precision, either for doubles (0) or always (1)
 	// and rounding to nearest, which we can check for with `1 + eps == 1 - eps`.
@@ -5196,6 +5204,7 @@ static const char ufbxi_Edges[] = "Edges";
 static const char ufbxi_EmissiveColor[] = "EmissiveColor";
 static const char ufbxi_Entry[] = "Entry";
 static const char ufbxi_FBXHeaderExtension[] = "FBXHeaderExtension";
+static const char ufbxi_FBXHeaderVersion[] = "FBXHeaderVersion";
 static const char ufbxi_FBXVersion[] = "FBXVersion";
 static const char ufbxi_FKEffector[] = "FKEffector";
 static const char ufbxi_FarPlane[] = "FarPlane";
@@ -5305,6 +5314,7 @@ static const char ufbxi_OriginalUnitScaleFactor[] = "OriginalUnitScaleFactor";
 static const char ufbxi_OriginalUpAxis[] = "OriginalUpAxis";
 static const char ufbxi_OriginalUpAxisSign[] = "OriginalUpAxisSign";
 static const char ufbxi_OrthoZoom[] = "OrthoZoom";
+static const char ufbxi_OtherFlags[] = "OtherFlags";
 static const char ufbxi_OuterAngle[] = "OuterAngle";
 static const char ufbxi_PO[] = "PO\0";
 static const char ufbxi_PP[] = "PP\0";
@@ -5315,7 +5325,9 @@ static const char ufbxi_PolygonIndexArray[] = "PolygonIndexArray";
 static const char ufbxi_PolygonVertexIndex[] = "PolygonVertexIndex";
 static const char ufbxi_PoseNode[] = "PoseNode";
 static const char ufbxi_Pose[] = "Pose";
+static const char ufbxi_Post_Extrapolation[] = "Post-Extrapolation";
 static const char ufbxi_PostRotation[] = "PostRotation";
+static const char ufbxi_Pre_Extrapolation[] = "Pre-Extrapolation";
 static const char ufbxi_PreRotation[] = "PreRotation";
 static const char ufbxi_PreviewDivisionLevels[] = "PreviewDivisionLevels";
 static const char ufbxi_Properties60[] = "Properties60";
@@ -5328,6 +5340,7 @@ static const char ufbxi_ReferenceTime[] = "ReferenceTime";
 static const char ufbxi_RelativeFileName[] = "RelativeFileName";
 static const char ufbxi_RelativeFilename[] = "RelativeFilename";
 static const char ufbxi_RenderDivisionLevels[] = "RenderDivisionLevels";
+static const char ufbxi_Repetition[] = "Repetition";
 static const char ufbxi_RightCamera[] = "RightCamera";
 static const char ufbxi_RootNode[] = "RootNode";
 static const char ufbxi_Root[] = "Root";
@@ -5358,6 +5371,7 @@ static const char ufbxi_SpecularColor[] = "SpecularColor";
 static const char ufbxi_Step[] = "Step";
 static const char ufbxi_SubDeformer[] = "SubDeformer";
 static const char ufbxi_T[] = "T\0\0";
+static const char ufbxi_TCDefinition[] = "TCDefinition";
 static const char ufbxi_Take[] = "Take";
 static const char ufbxi_Takes[] = "Takes";
 static const char ufbxi_Tangents[] = "Tangents";
@@ -5491,6 +5505,7 @@ static const ufbx_string ufbxi_strings[] = {
 	{ ufbxi_EmissiveColor, 13 },
 	{ ufbxi_Entry, 5 },
 	{ ufbxi_FBXHeaderExtension, 18 },
+	{ ufbxi_FBXHeaderVersion, 16 },
 	{ ufbxi_FBXVersion, 10 },
 	{ ufbxi_FKEffector, 10 },
 	{ ufbxi_FarPlane, 8 },
@@ -5600,6 +5615,7 @@ static const ufbx_string ufbxi_strings[] = {
 	{ ufbxi_OriginalUpAxis, 14 },
 	{ ufbxi_OriginalUpAxisSign, 18 },
 	{ ufbxi_OrthoZoom, 9 },
+	{ ufbxi_OtherFlags, 10 },
 	{ ufbxi_OuterAngle, 10 },
 	{ ufbxi_PO, 2 },
 	{ ufbxi_PP, 2 },
@@ -5610,7 +5626,9 @@ static const ufbx_string ufbxi_strings[] = {
 	{ ufbxi_PolygonVertexIndex, 18 },
 	{ ufbxi_Pose, 4 },
 	{ ufbxi_PoseNode, 8 },
+	{ ufbxi_Post_Extrapolation, 18 },
 	{ ufbxi_PostRotation, 12 },
+	{ ufbxi_Pre_Extrapolation, 17 },
 	{ ufbxi_PreRotation, 11 },
 	{ ufbxi_PreviewDivisionLevels, 21 },
 	{ ufbxi_Properties60, 12 },
@@ -5623,6 +5641,7 @@ static const ufbx_string ufbxi_strings[] = {
 	{ ufbxi_RelativeFileName, 16 },
 	{ ufbxi_RelativeFilename, 16 },
 	{ ufbxi_RenderDivisionLevels, 20 },
+	{ ufbxi_Repetition, 10 },
 	{ ufbxi_RightCamera, 11 },
 	{ ufbxi_Root, 4 },
 	{ ufbxi_RootNode, 8 },
@@ -5653,6 +5672,7 @@ static const ufbx_string ufbxi_strings[] = {
 	{ ufbxi_Step, 4 },
 	{ ufbxi_SubDeformer, 11 },
 	{ ufbxi_T, 1 },
+	{ ufbxi_TCDefinition, 12 },
 	{ ufbxi_Take, 4 },
 	{ ufbxi_Takes, 5 },
 	{ ufbxi_Tangents, 8 },
@@ -6438,6 +6458,8 @@ typedef struct {
 	bool parse_threaded;
 	ufbxi_thread_pool thread_pool;
 
+	uint8_t *base64_table;
+
 } ufbxi_context;
 
 static ufbxi_noinline int ufbxi_fail_imp(ufbxi_context *uc, const char *cond, const char *func, uint32_t line)
@@ -7502,11 +7524,16 @@ static ufbxi_noinline ufbxi_node *ufbxi_find_child(ufbxi_node *node, const char
 	return NULL;
 }
 
+// Retrieve the type of a given value
+ufbxi_forceinline static ufbxi_value_type ufbxi_get_val_type(ufbxi_node *node, size_t ix)
+{
+	return (ufbxi_value_type)((node->value_type_mask >> (ix*2)) & 0x3);
+}
+
 // Retrieve values from nodes with type codes:
 // Any: '_' (ignore)
 // NUMBER: 'I' int32_t 'L' int64_t 'F' float 'D' double 'R' ufbxi_real 'B' bool 'Z' size_t
 // STRING: 'S' ufbx_string 'C' const char* (checked) 's' ufbx_string 'c' const char * (unchecked) 'b' ufbx_blob
-
 ufbxi_nodiscard ufbxi_forceinline static int ufbxi_get_val_at(ufbxi_node *node, size_t ix, char fmt, void *v)
 {
 	ufbxi_dev_assert(ix < UFBXI_MAX_NON_ARRAY_VALUES);
@@ -9538,7 +9565,7 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_next_token(ufbxi_context *
 	if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_') {
 		token->type = UFBXI_ASCII_BARE_WORD;
 		while ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')
-			|| (c >= '0' && c <= '9') || c == '_') {
+			|| (c >= '0' && c <= '9') || c == '_' || c == '-') {
 			ufbxi_check(ufbxi_ascii_push_token_char(uc, token, c));
 			c = ufbxi_ascii_next(uc);
 		}
@@ -10009,6 +10036,66 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_ascii_read_float_array(ufbxi_con
 	return 1;
 }
 
+ufbxi_noinline static int ufbxi_setup_base64(ufbxi_context *uc)
+{
+	uint8_t *table = ufbxi_push(&uc->tmp, uint8_t, 256);
+	ufbxi_check(table);
+	uc->base64_table = table;
+
+	memset(table, 0x80, 256);
+	ufbxi_nounroll for (char c = 'A'; c <= 'Z'; c++) table[(size_t)c] = (uint8_t)(c - 'A');
+	ufbxi_nounroll for (char c = 'a'; c <= 'z'; c++) table[(size_t)c] = (uint8_t)(26 + (c - 'a'));
+	ufbxi_nounroll for (char c = '0'; c <= '9'; c++) table[(size_t)c] = (uint8_t)(52 + (c - '0'));
+	table[(size_t)'+'] = 62;
+	table[(size_t)'/'] = 63;
+	table[(size_t)'='] = 0x40;
+
+	return 1;
+}
+
+ufbxi_noinline static int ufbxi_decode_base64(ufbxi_context *uc, ufbx_string *p_result, const char *src, size_t src_length, bool *p_failed)
+{
+	if (!uc->base64_table) ufbxi_check(ufbxi_setup_base64(uc));
+
+	uint8_t *table = uc->base64_table;
+	uint32_t error_mask = 0, pad_error = 0;
+
+	char *p = (char*)p_result->data;
+	for (size_t i = 0; i + 4 <= src_length; i += 4) {
+		uint32_t a = table[(size_t)(uint8_t)src[i + 0]];
+		uint32_t b = table[(size_t)(uint8_t)src[i + 1]];
+		uint32_t c = table[(size_t)(uint8_t)src[i + 2]];
+		uint32_t d = table[(size_t)(uint8_t)src[i + 3]];
+		pad_error = error_mask;
+		error_mask |= a | b | c | d;
+
+		p[0] = (char)(uint8_t)(a << 2 | b >> 4);
+		p[1] = (char)(uint8_t)(b << 4 | c >> 2);
+		p[2] = (char)(uint8_t)(c << 6 | d);
+		p += 3;
+	}
+
+	if (src_length >= 4) {
+		const char *end = src + src_length - 4;
+		uint32_t padding = 0;
+		padding |= end[0] == '=' ? 0x8 : 0x0;
+		padding |= end[1] == '=' ? 0x4 : 0x0;
+		padding |= end[2] == '=' ? 0x2 : 0x0;
+		padding |= end[3] == '=' ? 0x1 : 0x0;
+		if (padding <= 0x1) p -= padding; // "xxx=" or "xxxx"
+		else if (padding == 0x3) p -= 2;  // "xx=="
+		else pad_error |= 0x40;           // anything else
+	}
+
+	if (((error_mask & 0x80) != 0 || (pad_error & 0x40) != 0 || src_length % 4 != 0) && !*p_failed) {
+		ufbxi_check(ufbxi_warnf(UFBX_WARNING_BAD_BASE64_CONTENT, "Ignored bad base64 embedded content"));
+		*p_failed = true;
+	}
+
+	p_result->length = ufbxi_to_size(p - p_result->data);
+	return 1;
+}
+
 // Recursion limited by check at the start
 ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *uc, uint32_t depth, ufbxi_parse_state parent_state, bool *p_end, ufbxi_buf *tmp_buf, bool recursive)
 	ufbxi_recursive_function(int, ufbxi_ascii_parse_node, (uc, depth, parent_state, p_end, tmp_buf, recursive), UFBXI_MAX_NODE_DEPTH + 1,
@@ -10054,6 +10141,7 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *
 	int arr_type = 0;
 	ufbxi_buf *arr_buf = NULL;
 	size_t arr_elem_size = 0;
+	bool arr_error = false;
 
 	// Check if the values of the node we're parsing currently should be
 	// treated as an array.
@@ -10134,13 +10222,16 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *
 					bool raw = arr_type == 's';
 					ufbx_string *v = ufbxi_push(&uc->tmp_stack, ufbx_string, 1);
 					ufbxi_check(v);
-					v->data = tok->str_data;
-					v->length = tok->str_len;
 					if (arr_type == 'C') {
 						ufbxi_buf *buf = uc->opts.retain_dom ? &uc->result : tmp_buf;
-						v->data = ufbxi_push_copy(buf, char, v->length, v->data);
+						size_t capacity = tok->str_len / 4 * 3 + 3;
+						v->data = ufbxi_push(buf, char, capacity);
 						ufbxi_check(v->data);
+						ufbxi_check(ufbxi_decode_base64(uc, v, tok->str_data, tok->str_len, &arr_error));
+						ufbx_assert(v->length <= capacity);
 					} else {
+						v->data = tok->str_data;
+						v->length = tok->str_len;
 						ufbxi_check(ufbxi_push_string_place_str(&uc->string_pool, v, raw));
 					}
 				} else {
@@ -10324,6 +10415,10 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_ascii_parse_node(ufbxi_context *
 				if (num_values > 0) {
 					ufbxi_pop_size(&uc->tmp_stack, arr_elem_size, num_values, arr_data, false);
 				}
+			} else if (arr_error) {
+				ufbxi_pop_size(&uc->tmp_stack, arr_elem_size, num_values, NULL, false);
+				num_values = 0;
+				arr_data = (void*)ufbxi_zero_size_buffer;
 			} else {
 				arr_data = ufbxi_push_pop_size(arr_buf, &uc->tmp_stack, arr_elem_size, num_values);
 			}
@@ -11144,6 +11239,7 @@ static const ufbxi_prop_type_name ufbxi_prop_type_names[] = {
 	{ "Integer", UFBX_PROP_INTEGER },
 	{ "int", UFBX_PROP_INTEGER },
 	{ "enum", UFBX_PROP_INTEGER },
+	{ "Enum", UFBX_PROP_INTEGER },
 	{ "Visibility", UFBX_PROP_INTEGER },
 	{ "Visibility Inheritance", UFBX_PROP_INTEGER },
 	{ "KTime", UFBX_PROP_INTEGER },
@@ -11426,7 +11522,7 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_init_node_prop_names(ufbxi_conte
 	return 1;
 }
 
-static bool ufbxi_is_node_property(ufbxi_context *uc, const char *name)
+static bool ufbxi_is_node_property_name(ufbxi_context *uc, const char *name)
 {
 	// You need to call `ufbxi_init_node_prop_names()` before calling this
 	ufbx_assert(uc->node_prop_set.size > 0);
@@ -11454,28 +11550,6 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_load_maps(ufbxi_context *uc)
 
 // -- Reading the parsed data
 
-ufbxi_noinline static void ufbxi_decode_base64(char *dst, const char *src, size_t src_length)
-{
-	uint8_t table[256] = { 0 };
-	for (char c = 'A'; c <= 'Z'; c++) table[(size_t)c] = (uint8_t)(c - 'A');
-	for (char c = 'a'; c <= 'z'; c++) table[(size_t)c] = (uint8_t)(26 + (c - 'a'));
-	for (char c = '0'; c <= '9'; c++) table[(size_t)c] = (uint8_t)(52 + (c - '0'));
-	table[(size_t)'+'] = 62;
-	table[(size_t)'/'] = 63;
-
-	for (size_t i = 0; i + 4 <= src_length; i += 4) {
-		uint32_t a = table[(size_t)(uint8_t)src[i + 0]];
-		uint32_t b = table[(size_t)(uint8_t)src[i + 1]];
-		uint32_t c = table[(size_t)(uint8_t)src[i + 2]];
-		uint32_t d = table[(size_t)(uint8_t)src[i + 3]];
-
-		dst[0] = (char)(uint8_t)(a << 2 | b >> 4);
-		dst[1] = (char)(uint8_t)(b << 4 | c >> 2);
-		dst[2] = (char)(uint8_t)(c << 6 | d);
-		dst += 3;
-	}
-}
-
 ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_embedded_blob(ufbxi_context *uc, ufbx_blob *dst_blob, ufbxi_node *node)
 {
 	if (!node) return 1;
@@ -11485,15 +11559,15 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_embedded_blob(ufbxi_context
 		ufbx_string content;
 		size_t num_parts = content_arr->size;
 		ufbx_string *parts = (ufbx_string*)content_arr->data;
-		if (num_parts == 1) {
+
+		if (num_parts == 1 && !uc->from_ascii) {
 			content = parts[0];
 		} else {
 			size_t total_size = 0;
 			ufbxi_for(ufbx_string, part, parts, num_parts) {
 				total_size += part->length;
 			}
-			ufbxi_buf *dst_buf = uc->from_ascii ? &uc->tmp_parse : &uc->result;
-			char *dst = ufbxi_push(dst_buf, char, total_size);
+			char *dst = ufbxi_push(&uc->result, char, total_size);
 			ufbxi_check(dst);
 			content.data = dst;
 			content.length = total_size;
@@ -11503,23 +11577,8 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_embedded_blob(ufbxi_context
 			}
 		}
 
-		if (uc->from_ascii) {
-			if (content.length % 4 == 0) {
-				size_t padding = 0;
-				while (padding < 2 && padding < content.length && content.data[content.length - 1 - padding] == '=') {
-					padding++;
-				}
-
-				dst_blob->size = content.length / 4 * 3 - padding;
-				dst_blob->data = ufbxi_push(&uc->result, char, dst_blob->size + 3);
-				ufbxi_check(dst_blob->data);
-
-				ufbxi_decode_base64((char*)dst_blob->data, content.data, content.length);
-			}
-		} else {
-			dst_blob->data = content.data;
-			dst_blob->size = content.length;
-		}
+		dst_blob->data = content.data;
+		dst_blob->size = content.length;
 	}
 
 	return 1;
@@ -11569,8 +11628,11 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_read_property(ufbxi_context *uc,
 		flags |= (uint32_t)UFBX_PROP_FLAG_VALUE_REAL << (real_ix - 1);
 	}
 
-	// Distance properties have a string unit _after_ the real value, eg. `10, "cm"`
-	if (prop->type == UFBX_PROP_DISTANCE) {
+	// Skip one value forward in case the current value is not a string, as some properties
+	// contain mixed numbers and strings. Currenltly known cases:
+	//   Lod Distance:    P: "Thresholds|Level0", "Distance", "", "",64, "cm"
+	//   User Enum:       P: "User_Enum", "Enum", "", "A+U",1, "ValueA~ValueB~ValueC"
+	if (ufbxi_get_val_type(node, val_ix) != UFBXI_VALUE_STRING) {
 		val_ix++;
 	}
 
@@ -11707,9 +11769,9 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_read_scene_info(ufbxi_context *u
 
 ufbxi_nodiscard static ufbxi_noinline int ufbxi_read_header_extension(ufbxi_context *uc)
 {
-	// TODO: Read TCDefinition and adjust timestamps
-	uc->ktime_sec = 46186158000;
-	uc->ktime_sec_double = (double)uc->ktime_sec;
+	bool has_tc_definition = false;
+	int32_t tc_definition = 0;
+	int32_t header_version = 0;
 
 	for (;;) {
 		ufbxi_node *child;
@@ -11729,12 +11791,33 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_read_header_extension(ufbxi_cont
 			}
 		}
 
+		if (child->name == ufbxi_FBXHeaderVersion) {
+			ufbxi_ignore(ufbxi_get_val1(child, "I", &header_version));
+		}
+
+		if (child->name == ufbxi_OtherFlags) {
+			if (ufbxi_find_val1(child, ufbxi_TCDefinition, "I", &tc_definition)) {
+				has_tc_definition = true;
+			}
+		}
+
 		if (child->name == ufbxi_SceneInfo) {
 			ufbxi_check(ufbxi_read_scene_info(uc, child));
 		}
 
 	}
 
+	// FBX 8000 will change the KTime units and the new units are opt-in currently via `TCDefinition`.
+	// `TCDefinition` seems be accounted in all versions, as long as `FBXHeaderVersion >= 1004`.
+	// The old KTime units are specified as the value `127` and all other values seem to use the new definition.
+	bool use_v7_ktime = uc->version < 8000;
+	if (header_version >= 1004 && has_tc_definition) {
+		use_v7_ktime = tc_definition == 127;
+	}
+
+	uc->ktime_sec = use_v7_ktime ? 46186158000 : 141120000;
+	uc->ktime_sec_double = (double)uc->ktime_sec;
+
 	return 1;
 }
 
@@ -13900,11 +13983,44 @@ static void ufbxi_solve_tcb(float *p_slope_left, float *p_slope_right, double te
 	*p_slope_right = (float)(d10 * slope_left + d11 * slope_right);
 }
 
+ufbxi_noinline static void ufbxi_read_extrapolation(ufbx_extrapolation *p_extrapolation, ufbxi_node *node, const char *name)
+{
+	ufbxi_node *child = ufbxi_find_child(node, name);
+	ufbx_extrapolation_mode mode = UFBX_EXTRAPOLATION_CONSTANT;
+	int32_t repeat_count = -1;
+
+	if (child) {
+		int32_t mode_ch;
+		if (ufbxi_find_val1(child, ufbxi_Type, "I", &mode_ch)) {
+
+			switch (mode_ch) {
+			case 'A': mode = UFBX_EXTRAPOLATION_REPEAT_RELATIVE; break;
+			case 'C': mode = UFBX_EXTRAPOLATION_CONSTANT; break;
+			case 'K': mode = UFBX_EXTRAPOLATION_SLOPE; break;
+			case 'M': mode = UFBX_EXTRAPOLATION_MIRROR; break;
+			case 'R': mode = UFBX_EXTRAPOLATION_REPEAT; break;
+			default: /* Unknown */ break;
+			}
+			if (ufbxi_find_val1(child, ufbxi_Repetition, "I", &repeat_count)) {
+				if (repeat_count < 0) {
+					repeat_count = -1;
+				}
+			}
+		}
+	}
+
+	p_extrapolation->mode = mode;
+	p_extrapolation->repeat_count = repeat_count;
+}
+
 ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_animation_curve(ufbxi_context *uc, ufbxi_node *node, ufbxi_element_info *info)
 {
 	ufbx_anim_curve *curve = ufbxi_push_element(uc, info, ufbx_anim_curve, UFBX_ELEMENT_ANIM_CURVE);
 	ufbxi_check(curve);
 
+	ufbxi_read_extrapolation(&curve->pre_extrapolation, node, ufbxi_Pre_Extrapolation);
+	ufbxi_read_extrapolation(&curve->post_extrapolation, node, ufbxi_Post_Extrapolation);
+
 	if (uc->opts.ignore_animation) return 1;
 
 	ufbxi_value_array *times, *values, *attr_flags, *attrs, *refs;
@@ -14502,27 +14618,26 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_synthetic_attribute(ufbxi_c
 
 	// 6x00: Link the node to the node attribute so property connections can be
 	// redirected from connections if necessary.
-	if (uc->version < 7000) {
-		ufbxi_check(ufbxi_insert_fbx_attr(uc, info->fbx_id, attrib_info.fbx_id));
+	ufbxi_check(ufbxi_insert_fbx_attr(uc, info->fbx_id, attrib_info.fbx_id));
 
-		// Split properties between the node and the attribute
-		ufbx_prop *ps = info->props.props.data;
-		size_t dst = 0, src = 0, end = info->props.props.count;
-		while (src < end) {
-			if (!ufbxi_is_node_property(uc, ps[src].name.data)) {
-				ufbxi_check(ufbxi_push_copy(&uc->tmp_stack, ufbx_prop, 1, &ps[src]));
-				src++;
-			} else if (dst != src) {
-				ps[dst++] = ps[src++];
-			} else {
-				dst++; src++;
-			}
+	// Split properties between the node and the attribute.
+	// Consider all user properties as node properties.
+	ufbx_prop *ps = info->props.props.data;
+	size_t dst = 0, src = 0, end = info->props.props.count;
+	while (src < end) {
+		if (!ufbxi_is_node_property_name(uc, ps[src].name.data) && (ps[src].flags & UFBX_PROP_FLAG_USER_DEFINED) == 0) {
+			ufbxi_check(ufbxi_push_copy(&uc->tmp_stack, ufbx_prop, 1, &ps[src]));
+			src++;
+		} else if (dst != src) {
+			ps[dst++] = ps[src++];
+		} else {
+			dst++; src++;
 		}
-		attrib_info.props.props.count = end - dst;
-		attrib_info.props.props.data = ufbxi_push_pop(&uc->result, &uc->tmp_stack, ufbx_prop, attrib_info.props.props.count);
-		ufbxi_check(attrib_info.props.props.data);
-		info->props.props.count = dst;
 	}
+	attrib_info.props.props.count = end - dst;
+	attrib_info.props.props.data = ufbxi_push_pop(&uc->result, &uc->tmp_stack, ufbx_prop, attrib_info.props.props.count);
+	ufbxi_check(attrib_info.props.props.data);
+	info->props.props.count = dst;
 
 	if (sub_type == ufbxi_Mesh) {
 		ufbxi_check(ufbxi_read_mesh(uc, node, &attrib_info));
@@ -14960,6 +15075,9 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_take_anim_channel(ufbxi_con
 
 	ufbxi_check(ufbxi_connect_op(uc, curve_fbx_id, value_fbx_id, curve->name));
 
+	ufbxi_read_extrapolation(&curve->pre_extrapolation, node, ufbxi_Pre_Extrapolation);
+	ufbxi_read_extrapolation(&curve->post_extrapolation, node, ufbxi_Post_Extrapolation);
+
 	if (uc->opts.ignore_animation) return 1;
 
 	size_t num_keys = 0;
@@ -15405,6 +15523,11 @@ ufbxi_noinline static void ufbxi_setup_root_node(ufbxi_context *uc, ufbx_node *r
 	root->is_root = true;
 }
 
+static ufbxi_forceinline bool ufbxi_supports_version(uint32_t version)
+{
+	return version >= 3000 && version <= 7700;
+}
+
 ufbxi_nodiscard ufbxi_noinline static int ufbxi_read_root(ufbxi_context *uc)
 {
 	// FBXHeaderExtension: Some metadata (optional)
@@ -17300,6 +17423,8 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_obj_parse_file(ufbxi_context *uc
 			uc->obj.mtllib_relative_path.size = lib.length;
 		} else if (ufbxi_str_equal(cmd, ufbxi_str_c("usemtl"))) {
 			ufbxi_check(ufbxi_obj_parse_material(uc));
+		} else if (!uc->opts.disable_quirks && key == 0) {
+			// ZBrush exporter seems to end the files with '\0', sometimes..
 		} else {
 			ufbxi_check(ufbxi_warnf(UFBX_WARNING_UNKNOWN_OBJ_DIRECTIVE, "Unknown .obj directive, skipped line"));
 		}
@@ -18133,15 +18258,21 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_resolve_connections(ufbxi_contex
 	uc->scene.connections_src.data = ufbxi_push(&uc->result, ufbx_connection, num_connections);
 	ufbxi_check(uc->scene.connections_src.data);
 
-	// HACK: Translate property connections from node to attribute if
-	// the property name is not included in the known node properties.
+	// HACK: Translate property connections from node to attribute if the property name is not included
+	// in the known node properties and is not a property of the node.
 	if (uc->version > 0 && uc->version < 7000) {
 		ufbxi_for(ufbxi_tmp_connection, tmp_conn, tmp_connections, num_connections) {
-			if (tmp_conn->src_prop.length > 0 && !ufbxi_is_node_property(uc, tmp_conn->src_prop.data)) {
-				tmp_conn->src = ufbxi_find_attribute_fbx_id(uc, tmp_conn->src);
+			if (tmp_conn->src_prop.length > 0 && !ufbxi_is_node_property_name(uc, tmp_conn->src_prop.data)) {
+				ufbx_element *src = ufbxi_find_element_by_fbx_id(uc, tmp_conn->src);
+				if (!src || !ufbx_find_prop_len(&src->props, tmp_conn->src_prop.data, tmp_conn->src_prop.length)) {
+					tmp_conn->src = ufbxi_find_attribute_fbx_id(uc, tmp_conn->src);
+				}
 			}
-			if (tmp_conn->dst_prop.length > 0 && !ufbxi_is_node_property(uc, tmp_conn->dst_prop.data)) {
-				tmp_conn->dst = ufbxi_find_attribute_fbx_id(uc, tmp_conn->dst);
+			if (tmp_conn->dst_prop.length > 0 && !ufbxi_is_node_property_name(uc, tmp_conn->dst_prop.data)) {
+				ufbx_element *dst = ufbxi_find_element_by_fbx_id(uc, tmp_conn->dst);
+				if (!dst || !ufbx_find_prop_len(&dst->props, tmp_conn->dst_prop.data, tmp_conn->dst_prop.length)) {
+					tmp_conn->dst = ufbxi_find_attribute_fbx_id(uc, tmp_conn->dst);
+				}
 			}
 		}
 	}
@@ -18847,6 +18978,8 @@ typedef enum {
 	UFBXI_SHADER_MAPPING_DEFAULT_W_1 = 0x1,
 	// Widen values to RGB if only a single value is present.
 	UFBXI_SHADER_MAPPING_WIDEN_TO_RGB = 0x2,
+	// Multiply the existing value.
+	UFBXI_SHADER_MAPPING_MULTIPLY_VALUE = 0x4,
 } ufbxi_shader_mapping_flag;
 
 typedef enum {
@@ -19152,6 +19285,56 @@ static const ufbxi_shader_mapping ufbxi_gltf_material_pbr_mapping[] = {
 	{ UFBX_MATERIAL_PBR_SPECULAR_IOR, 0, 0, ufbxi_mat_string("extension|indexOfRefraction") },
 };
 
+static const ufbxi_shader_mapping ufbxi_openpbr_material_pbr_mapping[] = {
+	{ UFBX_MATERIAL_PBR_BASE_FACTOR, 0, 0, ufbxi_mat_string("base_weight") },
+	{ UFBX_MATERIAL_PBR_BASE_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("base_color") },
+	{ UFBX_MATERIAL_PBR_ROUGHNESS, 0, 0, ufbxi_mat_string("specular_roughness") },
+	{ UFBX_MATERIAL_PBR_DIFFUSE_ROUGHNESS, 0, 0, ufbxi_mat_string("base_diffuse_roughness") },
+	{ UFBX_MATERIAL_PBR_METALNESS, 0, 0, ufbxi_mat_string("base_metalness") },
+	{ UFBX_MATERIAL_PBR_SPECULAR_FACTOR, 0, 0, ufbxi_mat_string("specular_weight") },
+	{ UFBX_MATERIAL_PBR_SPECULAR_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("specular_color") },
+	{ UFBX_MATERIAL_PBR_SPECULAR_ANISOTROPY, 0, 0, ufbxi_mat_string("specular_roughness_anisotropy") },
+	{ UFBX_MATERIAL_PBR_SPECULAR_IOR, 0, 0, ufbxi_mat_string("specular_ior") },
+	{ UFBX_MATERIAL_PBR_TRANSMISSION_FACTOR, 0, 0, ufbxi_mat_string("transmission_weight") },
+	{ UFBX_MATERIAL_PBR_TRANSMISSION_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("transmission_color") },
+	{ UFBX_MATERIAL_PBR_TRANSMISSION_DEPTH, 0, 0, ufbxi_mat_string("transmission_depth") },
+	{ UFBX_MATERIAL_PBR_TRANSMISSION_SCATTER, UFBXI_SHADER_MAPPING_WIDEN_TO_RGB, 0, ufbxi_mat_string("transmission_scatter") },
+	{ UFBX_MATERIAL_PBR_TRANSMISSION_SCATTER_ANISOTROPY, 0, 0, ufbxi_mat_string("transmission_scatter_anisotropy") },
+	{ UFBX_MATERIAL_PBR_TRANSMISSION_DISPERSION, 0, 0, ufbxi_mat_string("transmission_dispersion_scale") },
+	{ UFBX_MATERIAL_PBR_SUBSURFACE_FACTOR, 0, 0, ufbxi_mat_string("subsurface_weight") },
+	{ UFBX_MATERIAL_PBR_SUBSURFACE_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("subsurface_color") },
+	{ UFBX_MATERIAL_PBR_SUBSURFACE_RADIUS, UFBXI_SHADER_MAPPING_WIDEN_TO_RGB, 0, ufbxi_mat_string("subsurface_radius_scale") },
+	{ UFBX_MATERIAL_PBR_SUBSURFACE_SCALE, 0, 0, ufbxi_mat_string("subsurface_radius") },
+	{ UFBX_MATERIAL_PBR_SUBSURFACE_ANISOTROPY, 0, 0, ufbxi_mat_string("subsurface_scatter_anisotropy") },
+	{ UFBX_MATERIAL_PBR_COAT_FACTOR, 0, 0, ufbxi_mat_string("coat_weight") },
+	{ UFBX_MATERIAL_PBR_COAT_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("coat_color") },
+	{ UFBX_MATERIAL_PBR_COAT_ROUGHNESS, 0, 0, ufbxi_mat_string("coat_roughness") },
+	{ UFBX_MATERIAL_PBR_COAT_ANISOTROPY, 0, 0, ufbxi_mat_string("coat_roughness_anisotropy") },
+	{ UFBX_MATERIAL_PBR_COAT_IOR, 0, 0, ufbxi_mat_string("coat_ior") },
+	{ UFBX_MATERIAL_PBR_COAT_NORMAL, 0, 0, ufbxi_mat_string("coat_normal_map") },
+	{ UFBX_MATERIAL_PBR_SHEEN_FACTOR, 0, 0, ufbxi_mat_string("fuzz_weight") },
+	{ UFBX_MATERIAL_PBR_SHEEN_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("fuzz_color") },
+	{ UFBX_MATERIAL_PBR_SHEEN_ROUGHNESS, 0, 0, ufbxi_mat_string("fuzz_roughness") },
+	{ UFBX_MATERIAL_PBR_EMISSION_FACTOR, 0, 0, ufbxi_mat_string("emission_weight") },
+	{ UFBX_MATERIAL_PBR_EMISSION_FACTOR, UFBXI_SHADER_MAPPING_MULTIPLY_VALUE, 0, ufbxi_mat_string("emission_luminance") },
+	{ UFBX_MATERIAL_PBR_EMISSION_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("emission_color") },
+	{ UFBX_MATERIAL_PBR_THIN_FILM_FACTOR, 0, 0, ufbxi_mat_string("thin_film_weight") },
+	{ UFBX_MATERIAL_PBR_THIN_FILM_THICKNESS, 0, 0, ufbxi_mat_string("thin_film_thickness") },
+	{ UFBX_MATERIAL_PBR_THIN_FILM_IOR, 0, 0, ufbxi_mat_string("thin_film_ior") },
+	{ UFBX_MATERIAL_PBR_NORMAL_MAP, 0, 0, ufbxi_mat_string("bump") },
+	{ UFBX_MATERIAL_PBR_NORMAL_MAP, 0, 0, ufbxi_mat_string("bump_map_amt") },
+	{ UFBX_MATERIAL_PBR_DISPLACEMENT_MAP, 0, 0, ufbxi_mat_string("displacement") },
+	{ UFBX_MATERIAL_PBR_DISPLACEMENT_MAP, 0, 0, ufbxi_mat_string("displacement_map_amt") },
+	{ UFBX_MATERIAL_PBR_COAT_NORMAL, 0, 0, ufbxi_mat_string("coat_bump") },
+	{ UFBX_MATERIAL_PBR_COAT_NORMAL, 0, 0, ufbxi_mat_string("coat_bump_map_amt") },
+	{ UFBX_MATERIAL_PBR_TANGENT_MAP, 0, 0, ufbxi_mat_string("geometry_tangent_map") },
+	{ UFBX_MATERIAL_PBR_OPACITY, UFBXI_SHADER_MAPPING_WIDEN_TO_RGB, 0, ufbxi_mat_string("geometry_opacity") },
+};
+
+static const ufbxi_shader_mapping ufbxi_openpbr_material_features[] = {
+	{ UFBX_MATERIAL_FEATURE_THIN_WALLED, 0, 0, ufbxi_mat_string("geometry_thin_walled") },
+};
+
 static const ufbxi_shader_mapping ufbxi_3ds_max_pbr_metal_rough_pbr_mapping[] = {
 	{ UFBX_MATERIAL_PBR_BASE_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("base_color") },
 	{ UFBX_MATERIAL_PBR_BASE_COLOR, UFBXI_SHADER_MAPPING_DEFAULT_W_1, 0, ufbxi_mat_string("baseColor") },
@@ -19330,6 +19513,14 @@ static const ufbxi_shader_mapping_list ufbxi_shader_pbr_mappings[] = {
 		{ NULL, 0 }, ufbxi_string_literal("Map"), // texture_prefix/suffix
 		{ NULL, 0 }, { NULL, 0 }, // texture_enabled_prefix/suffix
 	},
+	{ // UFBX_SHADER_OPENPBR_MATERIAL
+		ufbxi_openpbr_material_pbr_mapping, ufbxi_arraycount(ufbxi_openpbr_material_pbr_mapping),
+		ufbxi_openpbr_material_features, ufbxi_arraycount(ufbxi_openpbr_material_features),
+		(uint32_t)(UFBXI_MAT_PBR | UFBXI_MAT_METALNESS | UFBXI_MAT_DIFFUSE | UFBXI_MAT_SPECULAR | UFBXI_MAT_COAT
+			| UFBXI_MAT_SHEEN | UFBXI_MAT_TRANSMISSION | UFBXI_MAT_OPACITY | UFBXI_MAT_IOR | UFBXI_MAT_DIFFUSE_ROUGHNESS),
+		{ NULL, 0 }, ufbxi_string_literal("_map"),    // texture_prefix/suffix
+		{ NULL, 0 }, ufbxi_string_literal("_map_on"), // texture_enabled_prefix/suffix
+	},
 	{ // UFBX_SHADER_SHADERFX_GRAPH
 		ufbxi_shaderfx_graph_pbr_mapping, ufbxi_arraycount(ufbxi_shaderfx_graph_pbr_mapping),
 		NULL, 0,
@@ -19433,8 +19624,13 @@ ufbxi_noinline static void ufbxi_fetch_mapping_maps(ufbx_material *material, ufb
 
 			if (flags & UFBXI_MAPPING_FETCH_VALUE) {
 				if (prop && prop->type != UFBX_PROP_REFERENCE) {
-					map->value_vec4 = prop->value_vec4;
-					map->value_int = prop->value_int;
+					if ((mapping->flags & UFBXI_SHADER_MAPPING_MULTIPLY_VALUE) != 0) {
+						map->value_vec4.x *= prop->value_vec4.x;
+						map->value_int = ufbxi_f64_to_i64(map->value_vec4.x);
+					} else {
+						map->value_vec4 = prop->value_vec4;
+						map->value_int = prop->value_int;
+					}
 					map->has_value = true;
 					if (mapping->transform) {
 						ufbxi_mat_transform_fn transform_fn = ufbxi_mat_transform_fns[mapping->transform];
@@ -19576,6 +19772,7 @@ ufbxi_noinline static void ufbxi_fetch_maps(ufbx_scene *scene, ufbx_material *ma
 	ufbxi_update_factor(&material->pbr.specular_factor, &material->pbr.specular_color);
 	ufbxi_update_factor(&material->pbr.emission_factor, &material->pbr.emission_color);
 	ufbxi_update_factor(&material->pbr.sheen_factor, &material->pbr.sheen_color);
+	ufbxi_update_factor(&material->pbr.thin_film_factor, &material->pbr.thin_film_thickness);
 	ufbxi_update_factor(&material->pbr.transmission_factor, &material->pbr.transmission_color);
 
 	// Patch transmission roughness if only extra roughness is defined
@@ -19874,6 +20071,7 @@ static const ufbxi_file_shader ufbxi_file_shaders[] = {
 	{ UINT64_C(0x7e73161fad53b12a), "ai_image", "filename" },
 	{ 0, "OSLBitmap", ufbxi_Filename },
 	{ 0, "OSLBitmap2", ufbxi_Filename },
+	{ 0, "OSLBitmap3", ufbxi_Filename },
 	{ 0, "UberBitmap", ufbxi_Filename },
 	{ 0, "UberBitmap2", ufbxi_Filename },
 };
@@ -21662,6 +21860,14 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_finalize_scene(ufbxi_context *uc
 		}
 	}
 
+	ufbxi_for_ptr_list(ufbx_anim_curve, p_curve, uc->scene.anim_curves) {
+		ufbx_anim_curve *curve = *p_curve;
+		if (curve->keyframes.count > 0) {
+			curve->min_time = curve->keyframes.data[0].time;
+			curve->max_time = curve->keyframes.data[curve->keyframes.count - 1].time;
+		}
+	}
+
 	ufbxi_for_ptr_list(ufbx_shader, p_shader, uc->scene.shaders) {
 		ufbx_shader *shader = *p_shader;
 		ufbxi_check(ufbxi_fetch_dst_elements(uc, &shader->bindings, &shader->element, false, false, NULL, UFBX_ELEMENT_SHADER_BINDING));
@@ -21703,6 +21909,10 @@ ufbxi_nodiscard ufbxi_noinline static int ufbxi_finalize_scene(ufbxi_context *uc
 					material->shader_type = UFBX_SHADER_3DS_MAX_PHYSICAL_MATERIAL;
 					material->shader_prop_prefix.data = "3dsMax|Parameters|";
 					material->shader_prop_prefix.length = strlen("3dsMax|Parameters|");
+				} else if (classid_a == 0xf1551e33u && classid_b == 0x37fb1337u) {
+					material->shader_type = UFBX_SHADER_OPENPBR_MATERIAL;
+					material->shader_prop_prefix.data = "3dsMax|Parameters|";
+					material->shader_prop_prefix.length = strlen("3dsMax|Parameters|");
 				} else if (classid_a == 0x38420192u && classid_b == 0x45fe4e1bu) {
 					material->shader_type = UFBX_SHADER_GLTF_MATERIAL;
 					material->shader_prop_prefix.data = "3dsMax|";
@@ -24636,6 +24846,9 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_load_imp(ufbxi_context *uc)
 		} else {
 			ufbxi_check(ufbxi_read_root(uc));
 		}
+		if (!ufbxi_supports_version(uc->version)) {
+			ufbxi_check(ufbxi_warnf(UFBX_WARNING_UNSUPPORTED_VERSION, "Unsupported FBX version (%u)", uc->version));
+		}
 		ufbxi_update_scene_metadata(&uc->scene.metadata);
 		ufbxi_check(ufbxi_init_file_paths(uc));
 	} else if (format == UFBX_FILE_FORMAT_OBJ) {
@@ -24943,6 +25156,12 @@ static ufbxi_noinline ufbx_scene *ufbxi_load(ufbxi_context *uc, const ufbx_load_
 		return &uc->scene_imp->scene;
 	} else {
 		ufbxi_fix_error_type(&uc->error, "Failed to load", p_error);
+		if (p_error && p_error->type == UFBX_ERROR_UNKNOWN && uc->scene.metadata.file_format == UFBX_FILE_FORMAT_FBX && !ufbxi_supports_version(uc->version)) {
+			p_error->description.data = "Unsupported version";
+			p_error->description.length = strlen("Unsupported version");
+			p_error->type = UFBX_ERROR_UNSUPPORTED_VERSION;
+			ufbxi_fmt_err_info(p_error, "%u", uc->version);
+		}
 		ufbxi_free_result(uc);
 		return NULL;
 	}
@@ -25080,7 +25299,7 @@ static ufbxi_forceinline bool ufbxi_anim_layer_might_contain_id(const ufbx_anim_
 	return ok;
 }
 
-static ufbxi_noinline void ufbxi_evaluate_props(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *props, size_t num_props)
+static ufbxi_noinline void ufbxi_evaluate_props(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *props, size_t num_props, uint32_t flags)
 {
 	ufbxi_anim_layer_combine_ctx combine_ctx = { anim, element, time };
 
@@ -25096,7 +25315,7 @@ static ufbxi_noinline void ufbxi_evaluate_props(const ufbx_anim *anim, const ufb
 		if (layer->weight_is_animated && layer->blended) {
 			ufbx_anim_prop *weight_aprop = ufbxi_find_anim_prop_start(layer, &layer->element);
 			if (weight_aprop) {
-				weight = ufbx_evaluate_anim_value_real(weight_aprop->anim_value, time) / (ufbx_real)100.0;
+				weight = ufbx_evaluate_anim_value_real_flags(weight_aprop->anim_value, time, flags) / (ufbx_real)100.0;
 				if (weight < 0.0f) weight = 0.0f;
 				if (weight > 0.99999f) weight = 1.0f;
 			}
@@ -25125,7 +25344,7 @@ static ufbxi_noinline void ufbxi_evaluate_props(const ufbx_anim *anim, const ufb
 			// This could be done by having `UFBX_PROP_FLAG_ANIMATION_EVALUATED`
 			// that gets set for the first layer of animation that is applied.
 			if (aprop->prop_name.data == prop->name.data) {
-				ufbx_vec3 v = ufbx_evaluate_anim_value_vec3(aprop->anim_value, time);
+				ufbx_vec3 v = ufbx_evaluate_anim_value_vec3_flags(aprop->anim_value, time, flags);
 				if (layer_ix == 0) {
 					prop->value_vec3 = v;
 				} else {
@@ -25143,9 +25362,9 @@ static ufbxi_noinline void ufbxi_evaluate_props(const ufbx_anim *anim, const ufb
 
 // Recursion limited by not calling `ufbx_evaluate_prop_len()` with a connected property,
 // meaning it will never call `ufbxi_evaluate_connected_prop()` again indirectly.
-static ufbxi_noinline void ufbxi_evaluate_connected_prop(ufbx_prop *prop, const ufbx_anim *anim, const ufbx_element *element, const char *name, double time)
-	ufbxi_recursive_function_void(ufbxi_evaluate_connected_prop, (prop, anim, element, name, time), 3,
-		(ufbx_prop *prop, const ufbx_anim *anim, const ufbx_element *element, const char *name, double time))
+static ufbxi_noinline void ufbxi_evaluate_connected_prop(ufbx_prop *prop, const ufbx_anim *anim, const ufbx_element *element, const char *name, double time, uint32_t flags)
+	ufbxi_recursive_function_void(ufbxi_evaluate_connected_prop, (prop, anim, element, name, time, flags), 3,
+		(ufbx_prop *prop, const ufbx_anim *anim, const ufbx_element *element, const char *name, double time, uint32_t flags))
 {
 	ufbx_connection *conn = ufbxi_find_prop_connection(element, name);
 
@@ -25157,7 +25376,7 @@ static ufbxi_noinline void ufbxi_evaluate_connected_prop(ufbx_prop *prop, const
 
 	// Found a non-cyclic connection
 	if (conn && !ufbxi_find_prop_connection(conn->src, conn->src_prop.data)) {
-		ufbx_prop ep = ufbx_evaluate_prop_len(anim, conn->src, conn->src_prop.data, conn->src_prop.length, time);
+		ufbx_prop ep = ufbx_evaluate_prop_len_flags(anim, conn->src, conn->src_prop.data, conn->src_prop.length, time, flags);
 		prop->value_vec4 = ep.value_vec4;
 		prop->value_int = ep.value_int;
 		prop->value_str = ep.value_str;
@@ -25247,7 +25466,7 @@ static ufbxi_forceinline const ufbx_prop *ufbxi_next_prop(ufbxi_prop_iter *iter)
 	}
 }
 
-static ufbxi_noinline ufbx_props ufbxi_evaluate_selected_props(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *props, const char *const *prop_names, size_t max_props)
+static ufbxi_noinline ufbx_props ufbxi_evaluate_selected_props(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *props, const char *const *prop_names, size_t max_props, uint32_t flags)
 {
 	const char *name = prop_names[0];
 	uint32_t key = ufbxi_get_name_key_c(name);
@@ -25271,7 +25490,7 @@ static ufbxi_noinline ufbx_props ufbxi_evaluate_selected_props(const ufbx_anim *
 				if ((prop->flags & UFBX_PROP_FLAG_CONNECTED) != 0 && !anim->ignore_connections) {
 					ufbx_prop *dst = &props[num_props++];
 					*dst = *prop;
-					ufbxi_evaluate_connected_prop(dst, anim, element, name, time);
+					ufbxi_evaluate_connected_prop(dst, anim, element, name, time, flags);
 				} else if ((prop->flags & (UFBX_PROP_FLAG_ANIMATED|UFBX_PROP_FLAG_OVERRIDDEN)) != 0) {
 					props[num_props++] = *prop;
 				}
@@ -25288,7 +25507,7 @@ static ufbxi_noinline ufbx_props ufbxi_evaluate_selected_props(const ufbx_anim *
 		}
 	}
 
-	ufbxi_evaluate_props(anim, element, time, props, num_props);
+	ufbxi_evaluate_props(anim, element, time, props, num_props, flags);
 
 	ufbx_props prop_list;
 	prop_list.props.data = props;
@@ -25297,6 +25516,74 @@ static ufbxi_noinline ufbx_props ufbxi_evaluate_selected_props(const ufbx_anim *
 	return prop_list;
 }
 
+// Recursion limited by not calling `ufbx_evaluate_curve()` with `UFBX_EVALUATE_FLAG_NO_EXTRAPOLATION`.
+static ufbxi_noinline ufbx_real ufbxi_extrapolate_curve(const ufbx_anim_curve *curve, double real_time, uint32_t flags)
+	ufbxi_recursive_function(ufbx_real, ufbxi_extrapolate_curve, (curve, real_time, flags), 3,
+		(const ufbx_anim_curve *curve, double real_time, uint32_t flags))
+{
+	bool pre = real_time < curve->min_time;
+	const ufbx_keyframe *key;
+	ufbx_extrapolation ext;
+	if (pre) {
+		key = &curve->keyframes.data[0];
+		ext = curve->pre_extrapolation;
+	} else {
+		key = &curve->keyframes.data[curve->keyframes.count - 1];
+		ext = curve->post_extrapolation;
+	}
+
+	if (ext.mode == UFBX_EXTRAPOLATION_CONSTANT) {
+		return key->value;
+	} else if (ext.mode == UFBX_EXTRAPOLATION_SLOPE) {
+		ufbx_tangent tangent = *(pre ? &key->right : &key->left);
+		return key->value + (ufbx_real)(tangent.dy * ((real_time - key->time) / tangent.dx));
+	} else if (ext.repeat_count == 0) {
+		return key->value;
+	}
+
+	// Perform all operations in KTime ticks to be frame perfect
+	double scale = (double)curve->element.scene->metadata.ktime_second;
+	double min_time = ufbx_rint(curve->min_time * scale);
+	double max_time = ufbx_rint(curve->max_time * scale);
+	double time = real_time * scale;
+
+	double delta = pre ? min_time - time : time - max_time;
+	double duration = max_time - min_time;
+
+	// Require at least one KTime unit
+	if (!(duration >= 1.0)) return key->value;
+
+	double rep = delta / duration;
+	double rep_n = ufbx_floor(rep);
+	double rep_d = delta - rep_n * duration;
+
+	if (ext.repeat_count > 0 && rep_n >= (double)ext.repeat_count) {
+		// Clamp to the repeat count to handle mirroring
+		rep_n = (double)(ext.repeat_count - 1);
+		rep_d = duration;
+	}
+
+	if (ext.mode == UFBX_EXTRAPOLATION_MIRROR) {
+		double rep_parity = rep_n*0.5 - ufbx_floor(rep_n*0.5);
+		if (rep_parity <= 0.25) {
+			rep_d = duration - rep_d;
+		}
+	}
+
+	if (pre) rep_d = duration - rep_d;
+	double new_time = (min_time + rep_d) / scale;
+
+	ufbx_real value = ufbx_evaluate_curve_flags(curve, new_time, key->value, flags | UFBX_EVALUATE_FLAG_NO_EXTRAPOLATION);
+
+	if (ext.mode == UFBX_EXTRAPOLATION_REPEAT_RELATIVE) {
+		ufbx_real val_delta = curve->keyframes.data[curve->keyframes.count - 1].value - curve->keyframes.data[0].value;
+		if (pre) val_delta = -val_delta;
+		value += val_delta * (ufbx_real)(rep_n + 1.0);
+	}
+
+	return value;
+}
+
 #if UFBXI_FEATURE_SCENE_EVALUATION
 
 typedef struct {
@@ -25651,7 +25938,7 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_evaluate_imp(ufbxi_eval_context
 		ufbx_prop *props = ufbxi_push(&ec->result, ufbx_prop, num_animated);
 		ufbxi_check_err(&ec->error, props);
 
-		elem->props = ufbx_evaluate_props(&anim, elem, ec->time, props, num_animated);
+		elem->props = ufbx_evaluate_props_flags(&anim, elem, ec->time, props, num_animated, ec->opts.evaluate_flags);
 		elem->props.defaults = &ec->src_scene.elements.data[elem->element_id]->props;
 	}
 
@@ -26658,6 +26945,9 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_bake_node_imp(ufbxi_bake_context
 		}
 
 		flags |= UFBX_TRANSFORM_FLAG_IGNORE_SCALE_HELPER|UFBX_TRANSFORM_FLAG_IGNORE_COMPONENTWISE_SCALE|UFBX_TRANSFORM_FLAG_EXPLICIT_INCLUDES;
+		if (bc->opts.evaluate_flags & UFBX_EVALUATE_FLAG_NO_EXTRAPOLATION) {
+			flags |= UFBX_TRANSFORM_FLAG_NO_EXTRAPOLATION;
+		}
 
 		double eval_time = ufbxi_bake_time_sample_time(bake_time);
 		ufbx_transform transform = ufbx_evaluate_transform_flags(bc->anim, node, eval_time, flags);
@@ -26778,7 +27068,7 @@ ufbxi_nodiscard static ufbxi_noinline int ufbxi_bake_anim_prop(ufbxi_bake_contex
 	for (size_t i = 0; i < times.count; i++) {
 		ufbxi_bake_time bake_time = times.data[i];
 		double eval_time = ufbxi_bake_time_sample_time(bake_time);
-		ufbx_prop prop = ufbx_evaluate_prop_len(bc->anim, element, name.data, name.length, eval_time);
+		ufbx_prop prop = ufbx_evaluate_prop_len_flags(bc->anim, element, name.data, name.length, eval_time, bc->opts.evaluate_flags);
 		keys.data[i].time = bake_time.time;
 		keys.data[i].value = prop.value_vec3;
 		keys.data[i].flags = (ufbx_baked_key_flags)bake_time.flags;
@@ -30078,6 +30368,11 @@ ufbx_abi ufbxi_noinline ufbx_matrix ufbx_get_compatible_matrix_for_normals(const
 }
 
 ufbx_abi ufbx_real ufbx_evaluate_curve(const ufbx_anim_curve *curve, double time, ufbx_real default_value)
+{
+	return ufbx_evaluate_curve_flags(curve, time, default_value, 0);
+}
+
+ufbx_abi ufbx_real ufbx_evaluate_curve_flags(const ufbx_anim_curve *curve, double time, ufbx_real default_value, uint32_t flags)
 {
 	if (!curve) return default_value;
 	if (curve->keyframes.count <= 1) {
@@ -30088,6 +30383,12 @@ ufbx_abi ufbx_real ufbx_evaluate_curve(const ufbx_anim_curve *curve, double time
 		}
 	}
 
+	if ((flags & UFBX_EVALUATE_FLAG_NO_EXTRAPOLATION) == 0) {
+		if (time < curve->min_time || time > curve->max_time) {
+			return ufbxi_extrapolate_curve(curve, time, flags);
+		}
+	}
+
 	size_t begin = 0;
 	size_t end = curve->keyframes.count;
 	const ufbx_keyframe *keys = curve->keyframes.data;
@@ -30156,17 +30457,27 @@ ufbx_abi ufbx_real ufbx_evaluate_curve(const ufbx_anim_curve *curve, double time
 }
 
 ufbx_abi ufbxi_noinline ufbx_real ufbx_evaluate_anim_value_real(const ufbx_anim_value *anim_value, double time)
+{
+	return ufbx_evaluate_anim_value_real_flags(anim_value, time, 0);
+}
+
+ufbx_abi ufbxi_noinline ufbx_vec3 ufbx_evaluate_anim_value_vec3(const ufbx_anim_value *anim_value, double time)
+{
+	return ufbx_evaluate_anim_value_vec3_flags(anim_value, time, 0);
+}
+
+ufbx_abi ufbxi_noinline ufbx_real ufbx_evaluate_anim_value_real_flags(const ufbx_anim_value *anim_value, double time, uint32_t flags)
 {
 	if (!anim_value) {
 		return 0.0f;
 	}
 
 	ufbx_real res = anim_value->default_value.x;
-	if (anim_value->curves[0]) res = ufbx_evaluate_curve(anim_value->curves[0], time, res);
+	if (anim_value->curves[0]) res = ufbx_evaluate_curve_flags(anim_value->curves[0], time, res, flags);
 	return res;
 }
 
-ufbx_abi ufbxi_noinline ufbx_vec3 ufbx_evaluate_anim_value_vec3(const ufbx_anim_value *anim_value, double time)
+ufbx_abi ufbxi_noinline ufbx_vec3 ufbx_evaluate_anim_value_vec3_flags(const ufbx_anim_value *anim_value, double time, uint32_t flags)
 {
 	if (!anim_value) {
 		ufbx_vec3 zero = { 0.0f };
@@ -30174,13 +30485,18 @@ ufbx_abi ufbxi_noinline ufbx_vec3 ufbx_evaluate_anim_value_vec3(const ufbx_anim_
 	}
 
 	ufbx_vec3 res = anim_value->default_value;
-	if (anim_value->curves[0]) res.x = ufbx_evaluate_curve(anim_value->curves[0], time, res.x);
-	if (anim_value->curves[1]) res.y = ufbx_evaluate_curve(anim_value->curves[1], time, res.y);
-	if (anim_value->curves[2]) res.z = ufbx_evaluate_curve(anim_value->curves[2], time, res.z);
+	if (anim_value->curves[0]) res.x = ufbx_evaluate_curve_flags(anim_value->curves[0], time, res.x, flags);
+	if (anim_value->curves[1]) res.y = ufbx_evaluate_curve_flags(anim_value->curves[1], time, res.y, flags);
+	if (anim_value->curves[2]) res.z = ufbx_evaluate_curve_flags(anim_value->curves[2], time, res.z, flags);
 	return res;
 }
 
 ufbx_abi ufbxi_noinline ufbx_prop ufbx_evaluate_prop_len(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time)
+{
+	return ufbx_evaluate_prop_len_flags(anim, element, name, name_len, time, 0);
+}
+
+ufbx_abi ufbxi_noinline ufbx_prop ufbx_evaluate_prop_len_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time, uint32_t flags)
 {
 	ufbx_prop result;
 
@@ -30207,15 +30523,20 @@ ufbx_abi ufbxi_noinline ufbx_prop ufbx_evaluate_prop_len(const ufbx_anim *anim,
 	if ((result.flags & (UFBX_PROP_FLAG_ANIMATED|UFBX_PROP_FLAG_CONNECTED)) == 0) return result;
 
 	if ((prop->flags & UFBX_PROP_FLAG_CONNECTED) != 0 && !anim->ignore_connections) {
-		ufbxi_evaluate_connected_prop(&result, anim, element, prop->name.data, time);
+		ufbxi_evaluate_connected_prop(&result, anim, element, prop->name.data, time, flags);
 	}
 
-	ufbxi_evaluate_props(anim, element, time, &result, 1);
+	ufbxi_evaluate_props(anim, element, time, &result, 1, flags);
 
 	return result;
 }
 
 ufbx_abi ufbxi_noinline ufbx_props ufbx_evaluate_props(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *buffer, size_t buffer_size)
+{
+	return ufbx_evaluate_props_flags(anim, element, time, buffer, buffer_size, 0);
+}
+
+ufbx_abi ufbxi_noinline ufbx_props ufbx_evaluate_props_flags(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *buffer, size_t buffer_size, uint32_t flags)
 {
 	ufbx_props ret = { NULL };
 	if (!element) return ret;
@@ -30232,11 +30553,11 @@ ufbx_abi ufbxi_noinline ufbx_props ufbx_evaluate_props(const ufbx_anim *anim, co
 		*dst = *prop;
 
 		if ((prop->flags & UFBX_PROP_FLAG_CONNECTED) != 0 && !anim->ignore_connections) {
-			ufbxi_evaluate_connected_prop(dst, anim, element, prop->name.data, time);
+			ufbxi_evaluate_connected_prop(dst, anim, element, prop->name.data, time, flags);
 		}
 	}
 
-	ufbxi_evaluate_props(anim, element, time, buffer, num_anim);
+	ufbxi_evaluate_props(anim, element, time, buffer, num_anim, flags);
 
 	ret.props.data = buffer;
 	ret.props.count = ret.num_animated = num_anim;
@@ -30347,8 +30668,13 @@ ufbx_abi ufbxi_noinline ufbx_transform ufbx_evaluate_transform_flags(const ufbx_
 		}
 	}
 
+	uint32_t eval_flags = 0;
+	if (flags & UFBX_TRANSFORM_FLAG_NO_EXTRAPOLATION) {
+		eval_flags |= UFBX_EVALUATE_FLAG_NO_EXTRAPOLATION;
+	}
+
 	ufbx_prop buf[ufbxi_arraycount(ufbxi_transform_props_all)]; // ufbxi_uninit
-	ufbx_props props = ufbxi_evaluate_selected_props(anim, &node->element, time, buf, prop_names, num_prop_names);
+	ufbx_props props = ufbxi_evaluate_selected_props(anim, &node->element, time, buf, prop_names, num_prop_names, eval_flags);
 	ufbx_rotation_order order = (ufbx_rotation_order)ufbxi_find_enum(&props, ufbxi_RotationOrder, UFBX_ROTATION_ORDER_XYZ, UFBX_ROTATION_ORDER_SPHERIC);
 
 	ufbx_transform transform; // ufbxi_uninit
@@ -30377,13 +30703,18 @@ ufbx_abi ufbxi_noinline ufbx_transform ufbx_evaluate_transform_flags(const ufbx_
 }
 
 ufbx_abi ufbx_real ufbx_evaluate_blend_weight(const ufbx_anim *anim, const ufbx_blend_channel *channel, double time)
+{
+	return ufbx_evaluate_blend_weight_flags(anim, channel, time, 0);
+}
+
+ufbx_abi ufbx_real ufbx_evaluate_blend_weight_flags(const ufbx_anim *anim, const ufbx_blend_channel *channel, double time, uint32_t flags)
 {
 	const char *prop_names[] = {
 		ufbxi_DeformPercent,
 	};
 
 	ufbx_prop buf[ufbxi_arraycount(prop_names)]; // ufbxi_uninit
-	ufbx_props props = ufbxi_evaluate_selected_props(anim, &channel->element, time, buf, prop_names, ufbxi_arraycount(prop_names));
+	ufbx_props props = ufbxi_evaluate_selected_props(anim, &channel->element, time, buf, prop_names, ufbxi_arraycount(prop_names), flags);
 	return ufbxi_find_real(&props, ufbxi_DeformPercent, channel->weight * (ufbx_real)100.0) * (ufbx_real)0.01;
 }
 
@@ -32297,6 +32628,7 @@ ufbx_abi ufbx_anim_stack *ufbx_find_anim_stack(const ufbx_scene *scene, const ch
 ufbx_abi ufbx_material *ufbx_find_material(const ufbx_scene *scene, const char *name) { return ufbx_find_material_len(scene, name, strlen(name)); }
 ufbx_abi ufbx_anim_prop *ufbx_find_anim_prop(const ufbx_anim_layer *layer, const ufbx_element *element, const char *prop) { return ufbx_find_anim_prop_len(layer, element, prop, strlen(prop)); }
 ufbx_abi ufbx_prop ufbx_evaluate_prop(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time) { return ufbx_evaluate_prop_len(anim, element, name, strlen(name), time); }
+ufbx_abi ufbx_prop ufbx_evaluate_prop_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time, uint32_t flags) { return ufbx_evaluate_prop_len_flags(anim, element, name, strlen(name), time, flags); }
 ufbx_abi ufbx_texture *ufbx_find_prop_texture(const ufbx_material *material, const char *name) { return ufbx_find_prop_texture_len(material, name, strlen(name)); }
 ufbx_abi ufbx_string ufbx_find_shader_prop(const ufbx_shader *shader, const char *name) { return ufbx_find_shader_prop_len(shader, name, strlen(name)); }
 ufbx_abi ufbx_shader_prop_binding_list ufbx_find_shader_prop_bindings(const ufbx_shader *shader, const char *name) { return ufbx_find_shader_prop_bindings_len(shader, name, strlen(name)); }
diff --git a/engine/thirdparty/ufbx/ufbx.h b/engine/thirdparty/ufbx/ufbx.h
index 1fc9a103..37a2e651 100644
--- a/engine/thirdparty/ufbx/ufbx.h
+++ b/engine/thirdparty/ufbx/ufbx.h
@@ -267,7 +267,7 @@ struct ufbx_converter { };
 // `ufbx_source_version` contains the version of the corresponding source file.
 // HINT: The version can be compared numerically to the result of `ufbx_pack_version()`,
 // for example `#if UFBX_VERSION >= ufbx_pack_version(0, 12, 0)`.
-#define UFBX_HEADER_VERSION ufbx_pack_version(0, 15, 0)
+#define UFBX_HEADER_VERSION ufbx_pack_version(0, 18, 0)
 #define UFBX_VERSION UFBX_HEADER_VERSION
 
 // -- Basic types
@@ -1354,7 +1354,7 @@ struct ufbx_mesh {
 	// The winding of the faces has been reversed.
 	bool reversed_winding;
 
-	// Normals have been generated instead of evalauted.
+	// Normals have been generated instead of evaluated.
 	// Either from missing normals (via `ufbx_load_opts.generate_missing_normals`), skinning,
 	// tessellation, or subdivision.
 	bool generated_normals;
@@ -1566,7 +1566,7 @@ struct ufbx_camera {
 	// Projection mode (perspective/orthographic).
 	ufbx_projection_mode projection_mode;
 
-	// If set to `true`, `resolution` reprensents actual pixel values, otherwise
+	// If set to `true`, `resolution` represents actual pixel values, otherwise
 	// it's only useful for its aspect ratio.
 	bool resolution_is_pixels;
 
@@ -2353,6 +2353,9 @@ typedef enum ufbx_shader_type UFBX_ENUM_REPR {
 	// 3ds glTF Material
 	// https://help.autodesk.com/view/3DSMAX/2023/ENU/?guid=GUID-7ABFB805-1D9F-417E-9C22-704BFDF160FA
 	UFBX_SHADER_GLTF_MATERIAL,
+	// 3ds OpenPBR Material
+	// https://help.autodesk.com/view/3DSMAX/2025/ENU/?guid=GUID-CD90329C-1E2B-4BBA-9285-3BB46253B9C2
+	UFBX_SHADER_OPENPBR_MATERIAL,
 	// Stingray ShaderFX shader graph.
 	// Contains a serialized `"ShaderGraph"` in `ufbx_props`.
 	UFBX_SHADER_SHADERFX_GRAPH,
@@ -2437,6 +2440,7 @@ typedef enum ufbx_material_pbr_map UFBX_ENUM_REPR {
 	UFBX_MATERIAL_PBR_COAT_NORMAL,
 	UFBX_MATERIAL_PBR_COAT_AFFECT_BASE_COLOR,
 	UFBX_MATERIAL_PBR_COAT_AFFECT_BASE_ROUGHNESS,
+	UFBX_MATERIAL_PBR_THIN_FILM_FACTOR,
 	UFBX_MATERIAL_PBR_THIN_FILM_THICKNESS,
 	UFBX_MATERIAL_PBR_THIN_FILM_IOR,
 	UFBX_MATERIAL_PBR_EMISSION_FACTOR,
@@ -2561,6 +2565,7 @@ typedef struct ufbx_material_pbr_maps {
 			ufbx_material_map coat_normal;
 			ufbx_material_map coat_affect_base_color;
 			ufbx_material_map coat_affect_base_roughness;
+			ufbx_material_map thin_film_factor;
 			ufbx_material_map thin_film_thickness;
 			ufbx_material_map thin_film_ior;
 			ufbx_material_map emission_factor;
@@ -3141,6 +3146,26 @@ typedef enum ufbx_interpolation UFBX_ENUM_REPR {
 
 UFBX_ENUM_TYPE(ufbx_interpolation, UFBX_INTERPOLATION, UFBX_INTERPOLATION_CUBIC);
 
+typedef enum ufbx_extrapolation_mode UFBX_ENUM_REPR {
+	UFBX_EXTRAPOLATION_CONSTANT,        // < Use the value of the first/last keyframe
+	UFBX_EXTRAPOLATION_REPEAT,          // < Repeat the whole animation curve
+	UFBX_EXTRAPOLATION_MIRROR,          // < Repeat with mirroring
+	UFBX_EXTRAPOLATION_SLOPE,           // < Use the tangent of the last keyframe to linearly extrapolate
+	UFBX_EXTRAPOLATION_REPEAT_RELATIVE, // < Repeat the animation curve but connect the first and last keyframe values
+
+	UFBX_ENUM_FORCE_WIDTH(UFBX_EXTRAPOLATION)
+} ufbx_extrapolation_mode;
+
+UFBX_ENUM_TYPE(ufbx_extrapolation_mode, UFBX_EXTRAPOLATION_MODE, UFBX_EXTRAPOLATION_REPEAT_RELATIVE);
+
+typedef struct ufbx_extrapolation {
+	ufbx_extrapolation_mode mode;
+
+	// Count used for repeating modes.
+	// Negative values mean infinite repetition.
+	int32_t repeat_count;
+} ufbx_extrapolation;
+
 // Tangent vector at a keyframe, may be split into left/right
 typedef struct ufbx_tangent {
 	float dx; // < Derivative in the time axis
@@ -3177,10 +3202,21 @@ struct ufbx_anim_curve {
 		uint32_t typed_id;
 	}; };
 
+	// List of keyframes that define the curve.
 	ufbx_keyframe_list keyframes;
 
+	// Extrapolation before the curve.
+	ufbx_extrapolation pre_extrapolation;
+	// Extrapolation after the curve.
+	ufbx_extrapolation post_extrapolation;
+
+	// Value range for all the keyframes.
 	ufbx_real min_value;
 	ufbx_real max_value;
+
+	// Time range for all the keyframes.
+	double min_time;
+	double max_time;
 };
 
 // -- Collections
@@ -3501,6 +3537,10 @@ typedef enum ufbx_warning_type UFBX_ENUM_REPR {
 	// Missing polygon mapping type.
 	UFBX_WARNING_MISSING_POLYGON_MAPPING,
 
+	// Unsupported version, loaded but may be incorrect.
+	// If the loading fails `UFBX_ERROR_UNSUPPORTED_VERSION` is issued instead.
+	UFBX_WARNING_UNSUPPORTED_VERSION,
+
 	// Out-of-bounds index has been clamped to be in-bounds.
 	// HINT: You can use `ufbx_index_error_handling` to adjust behavior.
 	UFBX_WARNING_INDEX_CLAMPED,
@@ -3509,6 +3549,9 @@ typedef enum ufbx_warning_type UFBX_ENUM_REPR {
 	// HINT: You can use `ufbx_unicode_error_handling` to adjust behavior.
 	UFBX_WARNING_BAD_UNICODE,
 
+	// Invalid base64-encoded embedded content ignored.
+	UFBX_WARNING_BAD_BASE64_CONTENT,
+
 	// Non-node element connected to root.
 	UFBX_WARNING_BAD_ELEMENT_CONNECTED_TO_ROOT,
 
@@ -4085,7 +4128,8 @@ typedef struct ufbx_open_memory_opts {
 	uint32_t _end_zero;
 } ufbx_open_memory_opts;
 
-// Detailed error stack frame
+// Detailed error stack frame.
+// NOTE: You must compile `ufbx.c` with `UFBX_ENABLE_ERROR_STACK` to enable the error stack.
 typedef struct ufbx_error_frame {
 	uint32_t source_line;
 	ufbx_string function;
@@ -4175,38 +4219,60 @@ typedef enum ufbx_error_type UFBX_ENUM_REPR {
 	// Duplicated override property in `ufbx_create_anim()`
 	UFBX_ERROR_DUPLICATE_OVERRIDE,
 
+	// Unsupported file format version.
+	// ufbx still tries to load files with unsupported versions, see `UFBX_WARNING_UNSUPPORTED_VERSION`.
+	UFBX_ERROR_UNSUPPORTED_VERSION,
+
 	UFBX_ENUM_FORCE_WIDTH(UFBX_ERROR_TYPE)
 } ufbx_error_type;
 
-UFBX_ENUM_TYPE(ufbx_error_type, UFBX_ERROR_TYPE, UFBX_ERROR_DUPLICATE_OVERRIDE);
+UFBX_ENUM_TYPE(ufbx_error_type, UFBX_ERROR_TYPE, UFBX_ERROR_UNSUPPORTED_VERSION);
 
 // Error description with detailed stack trace
 // HINT: You can use `ufbx_format_error()` for formatting the error
 typedef struct ufbx_error {
+
+	// Type of the error, or `UFBX_ERROR_NONE` if successful.
 	ufbx_error_type type;
+
+	// Description of the error type.
 	ufbx_string description;
+
+	// Internal error stack.
+	// NOTE: You must compile `ufbx.c` with `UFBX_ENABLE_ERROR_STACK` to enable the error stack.
 	uint32_t stack_size;
 	ufbx_error_frame stack[UFBX_ERROR_STACK_MAX_DEPTH];
+
+	// Additional error information, such as missing file filename.
+	// `info` is a NULL-terminated UTF-8 string containing `info_length` bytes, excluding the trailing `'\0'`.
 	size_t info_length;
 	char info[UFBX_ERROR_INFO_LENGTH];
+
 } ufbx_error;
 
 // -- Progress callbacks
 
+// Loading progress information.
 typedef struct ufbx_progress {
 	uint64_t bytes_read;
 	uint64_t bytes_total;
 } ufbx_progress;
 
+// Progress result returned from `ufbx_progress_fn()` callback.
+// Determines whether ufbx should continue or abort the loading.
 typedef enum ufbx_progress_result UFBX_ENUM_REPR {
+
+	// Continue loading the file.
 	UFBX_PROGRESS_CONTINUE = 0x100,
+
+	// Cancel loading and fail with `UFBX_ERROR_CANCELLED`.
 	UFBX_PROGRESS_CANCEL = 0x200,
 
 	UFBX_ENUM_FORCE_WIDTH(UFBX_PROGRESS_RESULT)
 } ufbx_progress_result;
 
-// Called periodically with the current progress
-// Return `false` to cancel further processing
+// Called periodically with the current progress.
+// Return `UFBX_PROGRESS_CANCEL` to cancel further processing.
 typedef ufbx_progress_result ufbx_progress_fn(void *user, const ufbx_progress *progress);
 
 typedef struct ufbx_progress_cb {
@@ -4509,35 +4575,82 @@ typedef struct ufbx_baked_anim {
 } ufbx_baked_anim;
 
 // -- Thread API
-//
-// NOTE: This API is still experimental and may change.
-// Documentation is currently missing on purpose.
 
+// Internal thread pool handle.
+// Passed to `ufbx_thread_pool_run_task()` from an user thread to run ufbx tasks.
+// HINT: This context can store a user pointer via `ufbx_thread_pool_set_user_ptr()`.
 typedef uintptr_t ufbx_thread_pool_context;
 
+// Thread pool creation information from ufbx.
 typedef struct ufbx_thread_pool_info {
 	uint32_t max_concurrent_tasks;
 } ufbx_thread_pool_info;
 
+// Initialize the thread pool.
+// Return `true` on success.
 typedef bool ufbx_thread_pool_init_fn(void *user, ufbx_thread_pool_context ctx, const ufbx_thread_pool_info *info);
-typedef bool ufbx_thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count);
-typedef bool ufbx_thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index);
+
+// Run tasks `count` tasks in threads.
+// You must call `ufbx_thread_pool_run_task()` with indices `[start_index, start_index + count)`.
+// The threads are launched in batches indicated by `group`, see `UFBX_THREAD_GROUP_COUNT` for more information.
+// Ideally, you should run all the task indices in parallel within each `ufbx_thread_pool_run_fn()` call.
+typedef void ufbx_thread_pool_run_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t start_index, uint32_t count);
+
+// Wait for previous tasks spawned in `ufbx_thread_pool_run_fn()` to finish.
+// `group` specifies the batch to wait for, `max_index` contains `start_index + count` from that group instance.
+typedef void ufbx_thread_pool_wait_fn(void *user, ufbx_thread_pool_context ctx, uint32_t group, uint32_t max_index);
+
+// Free the thread pool.
 typedef void ufbx_thread_pool_free_fn(void *user, ufbx_thread_pool_context ctx);
 
+// Thread pool interface.
+// See functions above for more information.
+//
+// Hypothetical example of calls, where `UFBX_THREAD_GROUP_COUNT=2` for simplicity:
+//
+//   run_fn(group=0, start_index=0, count=4)   -> t0 := threaded { ufbx_thread_pool_run_task(0..3) }
+//   run_fn(group=1, start_index=4, count=10)  -> t1 := threaded { ufbx_thread_pool_run_task(4..10) }
+//   wait_fn(group=0, max_index=4)             -> wait_threads(t0)
+//   run_fn(group=0, start_index=10, count=15) -> t0 := threaded { ufbx_thread_pool_run_task(10..14) }
+//   wait_fn(group=1, max_index=10)            -> wait_threads(t1)
+//   wait_fn(group=0, max_index=15)            -> wait_threads(t0)
+//
 typedef struct ufbx_thread_pool {
-	ufbx_thread_pool_init_fn *init_fn;
-	ufbx_thread_pool_run_fn *run_fn;
-	ufbx_thread_pool_wait_fn *wait_fn;
-	ufbx_thread_pool_free_fn *free_fn;
+	ufbx_thread_pool_init_fn *init_fn; // < Optional
+	ufbx_thread_pool_run_fn *run_fn;   // < Required
+	ufbx_thread_pool_wait_fn *wait_fn; // < Required
+	ufbx_thread_pool_free_fn *free_fn; // < Optional
 	void *user;
 } ufbx_thread_pool;
 
+// Thread pool options.
 typedef struct ufbx_thread_opts {
+
+	// Thread pool interface.
+	// HINT: You can use `extra/ufbx_os.h` to provide a thread pool.
 	ufbx_thread_pool pool;
+
+	// Maximum of tasks to have in-flight.
+	// Default: 2048
 	size_t num_tasks;
+
+	// Maximum amount of memory to use for batched threaded processing.
+	// Default: 32MB
+	// NOTE: The actual used memory usage might be higher, if there are individual tasks
+	// that rqeuire a high amount of memory.
 	size_t memory_limit;
+
 } ufbx_thread_opts;
 
+// Flags to control nanimation evaluation functions.
+typedef enum ufbx_evaluate_flags UFBX_FLAG_REPR {
+
+	// Do not extrapolate past the keyframes.
+	UFBX_EVALUATE_FLAG_NO_EXTRAPOLATION = 0x1,
+
+	UFBX_FLAG_FORCE_WIDTH(ufbx_evaluate_flags)
+} ufbx_evaluate_flags;
+
 // -- Main API
 
 // Options for `ufbx_load_file/memory/stream/stdio()`
@@ -4724,7 +4837,7 @@ typedef struct ufbx_load_opts {
 	bool use_root_transform;
 	ufbx_transform root_transform;
 
-	// Animation keyframe clamp threhsold, only applies to specific interpolation modes.
+	// Animation keyframe clamp threshold, only applies to specific interpolation modes.
 	double key_clamp_threshold;
 
 	// Specify how to handle Unicode errors in strings.
@@ -4800,6 +4913,10 @@ typedef struct ufbx_evaluate_opts {
 	bool evaluate_skinning; // < Evaluate skinning (see ufbx_mesh.skinned_vertices)
 	bool evaluate_caches;   // < Evaluate vertex caches (see ufbx_mesh.skinned_vertices)
 
+	// Evaluation flags.
+	// See `ufbx_evaluate_flags` for information.
+	uint32_t evaluate_flags;
+
 	// WARNING: Potentially unsafe! Try to open external files such as geometry caches
 	bool load_external_files;
 
@@ -4941,6 +5058,10 @@ typedef struct ufbx_bake_opts {
 	// `time / (1.0 + step_custom_epsilon)` and `time * (1.0 + step_custom_epsilon)`.
 	double step_custom_epsilon;
 
+	// Flags passed to animation evaluation functions.
+	// See `ufbx_evaluate_flags`.
+	uint32_t evaluate_flags;
+
 	// Enable key reduction.
 	bool key_reduction_enabled;
 
@@ -5202,7 +5323,7 @@ ufbx_abi ufbx_string ufbx_find_string(const ufbx_props *props, const char *name,
 ufbx_abi ufbx_blob ufbx_find_blob_len(const ufbx_props *props, const char *name, size_t name_len, ufbx_blob def);
 ufbx_abi ufbx_blob ufbx_find_blob(const ufbx_props *props, const char *name, ufbx_blob def);
 
-// Find property in `props` with concatendated `parts[num_parts]`.
+// Find property in `props` with concatenated `parts[num_parts]`.
 ufbx_abi ufbx_prop *ufbx_find_prop_concat(const ufbx_props *props, const ufbx_string *parts, size_t num_parts);
 
 // Get an element connected to a property.
@@ -5270,20 +5391,26 @@ ufbx_unsafe ufbx_abi bool ufbx_open_memory_ctx(ufbx_stream *stream, ufbx_open_fi
 // Evaluate a single animation `curve` at a `time`.
 // Returns `default_value` only if `curve == NULL` or it has no keyframes.
 ufbx_abi ufbx_real ufbx_evaluate_curve(const ufbx_anim_curve *curve, double time, ufbx_real default_value);
+ufbx_abi ufbx_real ufbx_evaluate_curve_flags(const ufbx_anim_curve *curve, double time, ufbx_real default_value, uint32_t flags);
 
 // Evaluate a value from bundled animation curves.
 ufbx_abi ufbx_real ufbx_evaluate_anim_value_real(const ufbx_anim_value *anim_value, double time);
 ufbx_abi ufbx_vec3 ufbx_evaluate_anim_value_vec3(const ufbx_anim_value *anim_value, double time);
+ufbx_abi ufbx_real ufbx_evaluate_anim_value_real_flags(const ufbx_anim_value *anim_value, double time, uint32_t flags);
+ufbx_abi ufbx_vec3 ufbx_evaluate_anim_value_vec3_flags(const ufbx_anim_value *anim_value, double time, uint32_t flags);
 
 // Evaluate an animated property `name` from `element` at `time`.
 // NOTE: If the property is not found it will have the flag `UFBX_PROP_FLAG_NOT_FOUND`.
 ufbx_abi ufbx_prop ufbx_evaluate_prop_len(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time);
 ufbx_abi ufbx_prop ufbx_evaluate_prop(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time);
+ufbx_abi ufbx_prop ufbx_evaluate_prop_len_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, size_t name_len, double time, uint32_t flags);
+ufbx_abi ufbx_prop ufbx_evaluate_prop_flags(const ufbx_anim *anim, const ufbx_element *element, const char *name, double time, uint32_t flags);
 
 // Evaluate all _animated_ properties of `element`.
 // HINT: This function returns an `ufbx_props` structure with the original properties as
 // `ufbx_props.defaults`. This lets you use `ufbx_find_prop/value()` for the results.
 ufbx_abi ufbx_props ufbx_evaluate_props(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *buffer, size_t buffer_size);
+ufbx_abi ufbx_props ufbx_evaluate_props_flags(const ufbx_anim *anim, const ufbx_element *element, double time, ufbx_prop *buffer, size_t buffer_size, uint32_t flags);
 
 // Flags to control `ufbx_evaluate_transform_flags()`.
 typedef enum ufbx_transform_flags UFBX_FLAG_REPR {
@@ -5306,6 +5433,10 @@ typedef enum ufbx_transform_flags UFBX_FLAG_REPR {
 	// If `UFBX_TRANSFORM_FLAG_EXPLICIT_INCLUDES`: Evaluate `ufbx_transform.scale`.
 	UFBX_TRANSFORM_FLAG_INCLUDE_SCALE = 0x40,
 
+	// Do not extrapolate keyframes.
+	// See `UFBX_EVALUATE_FLAG_NO_EXTRAPOLATION`.
+	UFBX_TRANSFORM_FLAG_NO_EXTRAPOLATION = 0x80,
+
 	UFBX_FLAG_FORCE_WIDTH(UFBX_TRANSFORM_FLAGS)
 } ufbx_transform_flags;
 
@@ -5318,6 +5449,7 @@ ufbx_abi ufbx_transform ufbx_evaluate_transform_flags(const ufbx_anim *anim, con
 // Evaluate the blend shape weight of a blend channel.
 // NOTE: Return value uses `1.0` for full weight, instead of `100.0` that the internal property `UFBX_Weight` uses.
 ufbx_abi ufbx_real ufbx_evaluate_blend_weight(const ufbx_anim *anim, const ufbx_blend_channel *channel, double time);
+ufbx_abi ufbx_real ufbx_evaluate_blend_weight_flags(const ufbx_anim *anim, const ufbx_blend_channel *channel, double time, uint32_t flags);
 
 // Evaluate the whole `scene` at a specific `time` in the animation `anim`.
 // The returned scene behaves as if it had been exported at a specific time
diff --git a/engine/version.py b/engine/version.py
index e08a28ec..7b3bd015 100644
--- a/engine/version.py
+++ b/engine/version.py
@@ -1,9 +1,9 @@
 short_name = "godot"
 name = "Godot Engine"
 major = 4
-minor = 4
+minor = 5
 patch = 0
-status = "stable"
+status = "dev"
 module_config = ""
 website = "https://godotengine.org"
-docs = "4.4"
+docs = "latest"
diff --git a/engine/modules/PROJECT/SCsub b/modules/PROJECT/SCsub
similarity index 100%
rename from engine/modules/PROJECT/SCsub
rename to modules/PROJECT/SCsub
diff --git a/engine/modules/PROJECT/config.py b/modules/PROJECT/config.py
similarity index 100%
rename from engine/modules/PROJECT/config.py
rename to modules/PROJECT/config.py
diff --git a/engine/modules/PROJECT/macros.h b/modules/PROJECT/macros.h
similarity index 100%
rename from engine/modules/PROJECT/macros.h
rename to modules/PROJECT/macros.h
diff --git a/engine/modules/PROJECT/register_types.cpp b/modules/PROJECT/register_types.cpp
similarity index 100%
rename from engine/modules/PROJECT/register_types.cpp
rename to modules/PROJECT/register_types.cpp
diff --git a/engine/modules/PROJECT/register_types.h b/modules/PROJECT/register_types.h
similarity index 100%
rename from engine/modules/PROJECT/register_types.h
rename to modules/PROJECT/register_types.h